From a78a3a461b17ee7cf01e1bda8c500321bdb236f7 Mon Sep 17 00:00:00 2001
From: simbit18 <simbit18@gmail.com>
Date: Thu, 4 Dec 2025 16:49:39 +0100
Subject: [PATCH 001/568] workflows/build.yml: fix fatal: write error: No space
 left on device

Fixed error verified in this PR https://github.com/apache/nuttx/pull/17423

added to the workflow:

- Show Disk Space

- Free Disk Space (Ubuntu)
  Only Android runtime removed

- Post-build Disk Space

We can now monitor disk space.

Signed-off-by: simbit18 <simbit18@gmail.com>
---
 .github/workflows/build.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab5cd6875..779f458bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,6 +143,16 @@ jobs:
 
     steps:
 
+      - name: Show Disk Space
+        run: df -h
+
+      - name: Free Disk Space (Ubuntu)
+        run: |
+          sudo rm -rf /usr/local/lib/android
+
+      - name: After CLEAN-UP Disk Space
+        run: df -h
+
       - name: Download Source Artifact
         uses: actions/download-artifact@v6
         with:
@@ -183,6 +193,10 @@ jobs:
                 ./cibuild.sh -c -A -N -R -S testlist/${{matrix.boards}}.dat
             fi
 
+      - name: Post-build Disk Space
+        if: always()
+        run: df -h
+
       - uses: actions/upload-artifact@v5
         if: ${{ always() }}
         with:

From 8c5c506e4063749996e5e6a4dbf6bdfb442600b7 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Tue, 4 Nov 2025 12:49:38 +0100
Subject: [PATCH 002/568] testing/cachetest: fix compilation error for arm64

fix compilation error:

cachetest_main.c:37:26: error: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=]
   37 | #define CACHETEST_PREFIX "CACHE Test: "
      |                          ^~~~~~~~~~~~~~
cachetest_main.c:150:20: note: in expansion of macro 'CACHETEST_PREFIX'
  150 |   syslog(LOG_INFO, CACHETEST_PREFIX "waddr:%p, uncacheble addr start:%p,"
      |                    ^~~~~~~~~~~~~~~~
cachetest_main.c:151:17: note: format string is defined here
  151 |          "size:%u\n", info->waddr,
      |                ~^
      |                 |
      |                 unsigned int
      |                %lu

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 testing/mm/cachetest/cachetest_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mm/cachetest/cachetest_main.c b/testing/mm/cachetest/cachetest_main.c
index bfe5dea71..4c0087aa8 100644
--- a/testing/mm/cachetest/cachetest_main.c
+++ b/testing/mm/cachetest/cachetest_main.c
@@ -148,7 +148,7 @@ static void cachetest_parse_commandline(int argc, FAR char **argv,
     }
 
   syslog(LOG_INFO, CACHETEST_PREFIX "waddr:%p, uncacheble addr start:%p,"
-         "size:%u\n", info->waddr,
+         "size:%zu\n", info->waddr,
          (FAR char *)((uintptr_t)info->waddr | info->offset), info->size);
 }
 

From 39cb6fefda23615d4f35ce71c9edccd5e5698983 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Thu, 27 Nov 2025 12:00:53 +0100
Subject: [PATCH 003/568] testing/memtester: add memtester.zip to gitignore

add memtester.zip to gitignore

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 testing/mm/memtester/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/mm/memtester/.gitignore b/testing/mm/memtester/.gitignore
index 12d194f47..7314c9664 100644
--- a/testing/mm/memtester/.gitignore
+++ b/testing/mm/memtester/.gitignore
@@ -1 +1,2 @@
 /memtester
+memtester.zip

From 5549f66dc19c8714bbde2cc39379d376a5065c2f Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 5 Dec 2025 13:39:23 +0100
Subject: [PATCH 004/568] testing/memtester: fix build error for cmake

fix broken CMakeLists.txt for memtester

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 testing/mm/memtester/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mm/memtester/CMakeLists.txt b/testing/mm/memtester/CMakeLists.txt
index c60eeb69a..74d99b9d0 100644
--- a/testing/mm/memtester/CMakeLists.txt
+++ b/testing/mm/memtester/CMakeLists.txt
@@ -30,7 +30,7 @@ if(CONFIG_UTILS_MEMTESTER)
 
     FetchContent_Declare(
       memtester_fetch
-      URL ${CONFIG_MEMTESTER_URL}SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/memtester
+      URL ${CONFIG_MEMTESTER_URL} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/memtester
           BINARY_DIR ${CMAKE_BINARY_DIR}/apps/testing/memtester/memtester
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 30)

From 641f7ced84fe7f2ec4b624296ffac1d714a68dd5 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 5 Dec 2025 13:51:06 +0100
Subject: [PATCH 005/568] testing/ltp: add ltp zip file to gitignore

add ltp zip file to gitignore

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 testing/ltp/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/ltp/.gitignore b/testing/ltp/.gitignore
index ae3714a8c..82b8523ae 100644
--- a/testing/ltp/.gitignore
+++ b/testing/ltp/.gitignore
@@ -1 +1,2 @@
 /ltp
+/ltp-*.zip

From 5eae4c8f15d5d142ea31e65f8865c7655ff0531d Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Sun, 27 Jul 2025 21:08:05 +0800
Subject: [PATCH 006/568] apps/fastboot: Enable network via ioctl during
 fastboot initialization

Bring up the network when do fastboot tcp init.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/fastboot/Kconfig    |  7 +++++++
 system/fastboot/fastboot.c | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/system/fastboot/Kconfig b/system/fastboot/Kconfig
index f5b14cd02..0842bcb0d 100644
--- a/system/fastboot/Kconfig
+++ b/system/fastboot/Kconfig
@@ -45,4 +45,11 @@ config SYSTEM_FASTBOOTD_SHELL
 		e.g. fastboot oem shell ps
 		e.g. fastboot oem shell "mkrd -m 10 -s 512 640"
 
+config SYSTEM_FASTBOOTD_NET_INIT
+	bool "Network initialization"
+	default n
+	select NETUTILS_NETINIT
+	---help---
+		This option enables/disables all network initialization in fastboot server.
+
 endif # SYSTEM_FASTBOOTD
diff --git a/system/fastboot/fastboot.c b/system/fastboot/fastboot.c
index b20be6b7d..2a24e9b9f 100644
--- a/system/fastboot/fastboot.c
+++ b/system/fastboot/fastboot.c
@@ -52,6 +52,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#ifdef CONFIG_SYSTEM_FASTBOOTD_NET_INIT
+#  include "netutils/netinit.h"
+#endif
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -1259,6 +1263,12 @@ static int fastboot_tcp_initialize(FAR struct fastboot_ctx_s *ctx)
 {
   struct sockaddr_in addr;
 
+#ifdef CONFIG_SYSTEM_FASTBOOTD_NET_INIT
+  /* Bring up the network */
+
+  netinit_bringup();
+#endif
+
   ctx->tran_fd[0] = socket(AF_INET, SOCK_STREAM,
                            SOCK_CLOEXEC | SOCK_NONBLOCK);
   if (ctx->tran_fd[0] < 0)

From 63c1767d3304b1905e29d4d6206afd17271732a2 Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Sun, 27 Jul 2025 21:17:23 +0800
Subject: [PATCH 007/568] apps/fastboot: organize an api for external apps to
 call

add an interface fastboot_handler. This interface can be called
when nsh is disable.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/fastboot/fastboot.c | 54 +++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/system/fastboot/fastboot.c b/system/fastboot/fastboot.c
index 2a24e9b9f..c18081c40 100644
--- a/system/fastboot/fastboot.c
+++ b/system/fastboot/fastboot.c
@@ -991,11 +991,12 @@ static void fastboot_oem(FAR struct fastboot_ctx_s *ctx, FAR const char *arg)
     }
 }
 
-static void fastboot_command_loop(FAR struct fastboot_ctx_s *ctx,
-                                  size_t nctx)
+static int fastboot_command_loop(FAR struct fastboot_ctx_s *ctx,
+                                 size_t nctx)
 {
   FAR struct fastboot_ctx_s *c;
   struct epoll_event ev[nctx];
+  int ret = OK;
   int epfd;
   int n;
 
@@ -1003,14 +1004,15 @@ static void fastboot_command_loop(FAR struct fastboot_ctx_s *ctx,
   if (epfd < 0)
     {
       fb_err("open epoll failed %d", errno);
-      return;
+      return epfd;
     }
 
   for (c = ctx, n = nctx; n-- > 0; c++)
     {
       ev[n].events = EPOLLIN;
       ev[n].data.ptr = c;
-      if (epoll_ctl(epfd, EPOLL_CTL_ADD, c->tran_fd[0], &ev[n]) < 0)
+      ret = epoll_ctl(epfd, EPOLL_CTL_ADD, c->tran_fd[0], &ev[n]);
+      if (ret < 0)
         {
           fb_err("err add poll %d", c->tran_fd[0]);
           goto epoll_close;
@@ -1019,7 +1021,8 @@ static void fastboot_command_loop(FAR struct fastboot_ctx_s *ctx,
 
   if (ctx->left > 0)
     {
-      if (epoll_wait(epfd, ev, nitems(ev), ctx->left) <= 0)
+      ret = epoll_wait(epfd, ev, nitems(ev), ctx->left);
+      if (ret <= 0)
         {
           goto epoll_close;
         }
@@ -1074,6 +1077,7 @@ epoll_close:
     }
 
   close(epfd);
+  return ret;
 }
 
 static void fastboot_publish(FAR struct fastboot_ctx_s *ctx,
@@ -1434,7 +1438,7 @@ static int fastboot_tcp_write(FAR struct fastboot_ctx_s *ctx,
 static int fastboot_context_initialize(FAR struct fastboot_ctx_s *ctx,
                                        size_t nctx)
 {
-  int ret;
+  int ret = ERROR;
 
   for (; nctx-- > 0; ctx++)
     {
@@ -1465,7 +1469,7 @@ static int fastboot_context_initialize(FAR struct fastboot_ctx_s *ctx,
         }
     }
 
-  return 0;
+  return ret;
 }
 
 static void fastboot_context_deinit(FAR struct fastboot_ctx_s *ctx,
@@ -1485,11 +1489,30 @@ static void fastboot_context_deinit(FAR struct fastboot_ctx_s *ctx,
  * Public Functions
  ****************************************************************************/
 
-int main(int argc, FAR char **argv)
+int fastboot_handler(uint64_t timeout)
 {
   struct fastboot_ctx_s context[nitems(g_tran_ops)];
   int ret;
 
+  context[0].left = timeout;
+  ret = fastboot_context_initialize(context, nitems(context));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  fastboot_create_publish(context, nitems(context));
+  ret = fastboot_command_loop(context, nitems(context));
+  fastboot_free_publish(context, nitems(context));
+  fastboot_context_deinit(context, nitems(context));
+
+  return ret;
+}
+
+int main(int argc, FAR char **argv)
+{
+  uint64_t timeout = 0;
+
   if (argc > 1)
     {
       if (strcmp(argv[1], "-h") == 0)
@@ -1500,22 +1523,11 @@ int main(int argc, FAR char **argv)
           return 0;
         }
 
-      if (sscanf(argv[1], "%" SCNu64 , &context[0].left) != 1)
+      if (sscanf(argv[1], "%" SCNu64 , &timeout) != 1)
         {
           return -EINVAL;
         }
     }
 
-  ret = fastboot_context_initialize(context, nitems(context));
-  if (ret < 0)
-    {
-      return ret;
-    }
-
-  fastboot_create_publish(context, nitems(context));
-  fastboot_command_loop(context, nitems(context));
-  fastboot_free_publish(context, nitems(context));
-  fastboot_context_deinit(context, nitems(context));
-
-  return ret;
+  return fastboot_handler(timeout);
 }

From 9633580d2c7f64891729655edc1813d36e116c6a Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Thu, 31 Jul 2025 23:00:36 +0800
Subject: [PATCH 008/568] apps/fastboot: add switchboot command

The switchboot command can be sent even without enabling sh

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/fastboot/fastboot.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/system/fastboot/fastboot.c b/system/fastboot/fastboot.c
index c18081c40..41e20b6d8 100644
--- a/system/fastboot/fastboot.c
+++ b/system/fastboot/fastboot.c
@@ -226,6 +226,10 @@ static void fastboot_filedump(FAR struct fastboot_ctx_s *ctx,
 static void fastboot_shell(FAR struct fastboot_ctx_s *ctx,
                            FAR const char *arg);
 #endif
+#ifdef CONFIG_BOARDCTL_SWITCH_BOOT
+static void fastboot_switchboot(FAR struct fastboot_ctx_s *context,
+                                FAR const char *arg);
+#endif
 
 /* USB transport */
 
@@ -272,6 +276,9 @@ static const struct fastboot_cmd_s g_oem_cmd[] =
 #ifdef CONFIG_SYSTEM_FASTBOOTD_SHELL
   { "shell",              fastboot_shell            },
 #endif
+#ifdef CONFIG_BOARDCTL_SWITCH_BOOT
+  { "switchboot",         fastboot_switchboot       },
+#endif
 };
 
 #ifdef CONFIG_BOARD_MEMORY_RANGE
@@ -930,6 +937,21 @@ static void fastboot_shell(FAR struct fastboot_ctx_s *ctx,
 }
 #endif
 
+#ifdef CONFIG_BOARDCTL_SWITCH_BOOT
+static void fastboot_switchboot(FAR struct fastboot_ctx_s *context,
+                                FAR const char *arg)
+{
+  if (!arg)
+    {
+      fastboot_fail(context, "Invalid argument");
+      return;
+    }
+
+  boardctl(BOARDIOC_SWITCH_BOOT, (uintptr_t)&arg[0]);
+  fastboot_okay(context, "");
+}
+#endif
+
 static void fastboot_upload(FAR struct fastboot_ctx_s *ctx,
                             FAR const char *arg)
 {

From e19d99022a426629a40d3b22b0b053f013e4badb Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Fri, 1 Aug 2025 15:25:06 +0800
Subject: [PATCH 009/568] apps/fastboot: fix build warning

apps/system/fastboot/fastboot.c:351:43: error: '%s' directive output may be truncated writing up to 63 bytes into a region of size 60 [-Werror=format-truncation=] ...... apps/system/fastboot/fastboot.c:351:3: note: 'snprintf' output between 5 and 68 bytes into a destination of size 64 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ apps/system/fastboot/fastboot.c:351:43: error: '%s' directive output may be truncated writing up to 63 bytes into a region of size 60 [-Werror=format-truncation=] ...... apps/system/fastboot/fastboot.c:351:3: note: 'snprintf' output between 5 and 68 bytes into a destination of size 64 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/fastboot/fastboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/fastboot/fastboot.c b/system/fastboot/fastboot.c
index 41e20b6d8..4ba39b5d3 100644
--- a/system/fastboot/fastboot.c
+++ b/system/fastboot/fastboot.c
@@ -352,14 +352,14 @@ static int fastboot_write(int fd, FAR const void *buf, size_t len)
 static void fastboot_ack(FAR struct fastboot_ctx_s *ctx,
                          FAR const char *code, FAR const char *reason)
 {
-  char response[FASTBOOT_MSG_LEN];
+  char response[FASTBOOT_MSG_LEN + 4];
 
   if (reason == NULL)
     {
       reason = "";
     }
 
-  snprintf(response, FASTBOOT_MSG_LEN, "%s%s", code, reason);
+  snprintf(response, FASTBOOT_MSG_LEN + 4, "%s%s", code, reason);
   ctx->ops->write(ctx, response, strlen(response));
 }
 

From 24e1c4df6fb2cf17e8c768ff13f5d553b45b0ef6 Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Fri, 16 May 2025 15:51:49 +0800
Subject: [PATCH 010/568] testing/ostest/smp_call.c: fix smp_call cpu_set
 inconsistency issue

If we set CONFIG_SMP_DEFAULT_CPUSET=1
This will cause the value of cpuset to be 0x1,
((1 << CONFIG_SMP_NCPUS) - 1) will result in the cpuset being 0x11,
leading to test case errors.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 testing/ostest/smp_call.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/testing/ostest/smp_call.c b/testing/ostest/smp_call.c
index 18f030977..9893cec9b 100644
--- a/testing/ostest/smp_call.c
+++ b/testing/ostest/smp_call.c
@@ -38,6 +38,7 @@
  ****************************************************************************/
 
 static struct smp_call_data_s g_call_data;
+static cpu_set_t g_cpuset;
 
 /****************************************************************************
  * Private Functions
@@ -53,10 +54,8 @@ static int smp_call_func(void *arg)
 
 static void wdg_wdentry(wdparm_t arg)
 {
-  cpu_set_t cpus = (1 << CONFIG_SMP_NCPUS) - 1;
-
   nxsched_smp_call_init(&g_call_data, smp_call_func, (FAR void *)arg);
-  nxsched_smp_call_async(cpus, &g_call_data);
+  nxsched_smp_call_async(g_cpuset, &g_call_data);
 }
 
 /****************************************************************************
@@ -65,7 +64,6 @@ static void wdg_wdentry(wdparm_t arg)
 
 void smp_call_test(void)
 {
-  cpu_set_t cpuset;
   struct smp_call_data_s call_data;
   sem_t sem;
   int cpucnt;
@@ -111,10 +109,10 @@ void smp_call_test(void)
 
   printf("smp_call_test: Call multi cpu, nowait\n");
 
-  sched_getaffinity(0, sizeof(cpu_set_t), &cpuset);
-  cpucnt = CPU_COUNT(&cpuset);
+  sched_getaffinity(0, sizeof(cpu_set_t), &g_cpuset);
+  cpucnt = CPU_COUNT(&g_cpuset);
 
-  nxsched_smp_call_async(cpuset, &call_data);
+  nxsched_smp_call_async(g_cpuset, &call_data);
 
   for (cpu = 0; cpu < cpucnt; cpu++)
     {
@@ -142,7 +140,7 @@ void smp_call_test(void)
 
   printf("smp_call_test: Call multi cpu, wait\n");
 
-  nxsched_smp_call(cpuset, smp_call_func, &sem);
+  nxsched_smp_call(g_cpuset, smp_call_func, &sem);
 
   sem_getvalue(&sem, &value);
   if (value != cpucnt)

From c3b5c6cedfa3496447739ebf04e47fafd1db7f21 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Fri, 10 Oct 2025 10:21:37 -0300
Subject: [PATCH 011/568] boot/mcuboot: update MCUBoot version

Updates default MCUBoot hash.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 boot/mcuboot/CMakeLists.txt | 3 +++
 boot/mcuboot/Kconfig        | 4 ++--
 boot/mcuboot/Makefile       | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/boot/mcuboot/CMakeLists.txt b/boot/mcuboot/CMakeLists.txt
index 2ea3e7137..49c02a133 100644
--- a/boot/mcuboot/CMakeLists.txt
+++ b/boot/mcuboot/CMakeLists.txt
@@ -45,6 +45,9 @@ if(CONFIG_BOOT_MCUBOOT)
 
   set(SRCS
       mcuboot/boot/bootutil/src/boot_record.c
+      mcuboot/boot/bootutil/src/bootutil_area.c
+      mcuboot/boot/bootutil/src/bootutil_img_hash.c
+      mcuboot/boot/bootutil/src/bootutil_loader.c
       mcuboot/boot/bootutil/src/bootutil_misc.c
       mcuboot/boot/bootutil/src/bootutil_public.c
       mcuboot/boot/bootutil/src/caps.c
diff --git a/boot/mcuboot/Kconfig b/boot/mcuboot/Kconfig
index f5c904a7a..271c986e7 100644
--- a/boot/mcuboot/Kconfig
+++ b/boot/mcuboot/Kconfig
@@ -22,11 +22,11 @@ config MCUBOOT_REPOSITORY
 
 config MCUBOOT_VERSION
 	string "MCUboot version"
-	default "fefc398cc13ebbc527e297fe9df78cd98a359d75"
+	default "457be0cf3fb03e9e09938728dece8f03309db973"
 	---help---
 		Defines MCUboot version to be downloaded. Either release tag
 		or commit hash should be specified. Using newer MCUboot version
-		may cause compatability issues.
+		may cause compatibility issues.
 
 config MCUBOOT_ENABLE_LOGGING
 	bool "Enable MCUboot logging"
diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile
index e6851be93..6c036147f 100644
--- a/boot/mcuboot/Makefile
+++ b/boot/mcuboot/Makefile
@@ -44,6 +44,9 @@ endif
 CFLAGS += -Wno-undef -Wno-unused-but-set-variable
 
 CSRCS := $(MCUBOOT_UNPACK)/boot/bootutil/src/boot_record.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_area.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_img_hash.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_loader.c \
          $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_misc.c \
          $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_public.c \
          $(MCUBOOT_UNPACK)/boot/bootutil/src/caps.c \

From 2bc4bdadee97ab148198c80c44271db89c213590 Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Wed, 11 Jun 2025 11:41:27 +0800
Subject: [PATCH 012/568] apps/nsh: fix switchboot command spelling error

modify swtichboot -> switchboot

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 nshlib/nsh_command.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 3911e0844..3275756b3 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -580,7 +580,7 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 
 #if defined(CONFIG_BOARDCTL_SWITCH_BOOT) && !defined(CONFIG_NSH_DISABLE_SWITCHBOOT)
-  CMD_MAP("swtichboot", cmd_switchboot, 2, 2, "<image path>"),
+  CMD_MAP("switchboot", cmd_switchboot, 2, 2, "<image path>"),
 #endif
 
 #if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST)

From f82e6c22295e4f8d6ce7bef2490170933f4aa2be Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Mon, 9 Dec 2024 21:13:49 +0800
Subject: [PATCH 013/568] nsh: return EOF when nread is 0

If enable CONFIG NSH_CLE. When sh reads data and detects that nread is 0,
return EOF and exit.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 nshlib/nsh_session.c |  5 +++--
 system/cle/cle.c     | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nshlib/nsh_session.c b/nshlib/nsh_session.c
index 500c8d6f1..bb83b98fb 100644
--- a/nshlib/nsh_session.c
+++ b/nshlib/nsh_session.c
@@ -211,11 +211,12 @@ int nsh_session(FAR struct console_stdio_s *pstate,
 
       ret = cle_fd(pstate->cn_line, nsh_prompt(), LINE_MAX,
                    INFD(pstate), OUTFD(pstate));
-      if (ret < 0)
+      if (ret == EOF)
         {
           dprintf(ERRFD(pstate), g_fmtcmdfailed, "nsh_session",
                   "cle", NSH_ERRNO_OF(-ret));
-          continue;
+          ret = EXIT_SUCCESS;
+          break;
         }
 #else
       /* Display the prompt string */
diff --git a/system/cle/cle.c b/system/cle/cle.c
index cf11f7097..21b442806 100644
--- a/system/cle/cle.c
+++ b/system/cle/cle.c
@@ -316,7 +316,7 @@ static int cle_getch(FAR struct cle_s *priv)
           if (nread == 0 || errcode != EINTR)
             {
               cledbg("ERROR: read from stdin failed: %d\n", errcode);
-              return -EIO;
+              return EOF;
             }
         }
     }
@@ -372,13 +372,13 @@ static void cle_setcursor(FAR struct cle_s *priv, int16_t column)
   int len;
   int off;
 
-  /* Sub prompt offset from real postion to get correct offset to execute */
+  /* Sub prompt offset from real position to get correct offset to execute */
 
   off = column - (priv->realpos - priv->coloffs);
 
   cleinfo("column=%d offset=%d\n", column, off);
 
-  /* If cursor not move, retrun directly */
+  /* If cursor not move, return directly */
 
   if (off == 0)
     {
@@ -703,9 +703,9 @@ static int cle_editloop(FAR struct cle_s *priv)
       for (; ; )
         {
           ch = cle_getch(priv);
-          if (ch < 0)
+          if (ch == EOF)
             {
-              return -EIO;
+              return EOF;
             }
           else if (state != 0)
             {

From 00154fd818d6e12cf758be21555458f703d514a9 Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Tue, 3 Jun 2025 21:13:37 +0800
Subject: [PATCH 014/568] apps/system/composite: change cmake build name to
 conn and disconn

The executable file compiled by cmake has the same filename as
that compiled by make.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/composite/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/composite/CMakeLists.txt b/system/composite/CMakeLists.txt
index 9ca2f72ca..d88246363 100644
--- a/system/composite/CMakeLists.txt
+++ b/system/composite/CMakeLists.txt
@@ -21,5 +21,6 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_COMPOSITE)
-  nuttx_add_application(NAME composite SRCS composite_main.c)
+  nuttx_add_application(NAME conn SRCS composite_main.c)
+  nuttx_add_application(NAME disconn)
 endif()

From 74293114aa536ab9f012357c855ac21d97ad084d Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Fri, 15 Aug 2025 14:26:28 +0800
Subject: [PATCH 015/568] apps/system: fix spitool can not send data issue

when use cmd 'spi exch -b 1 -f 3000000 -m 1  -n 0 -w 32 -x 1 1f',
the last character '1f' can not be trans out.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/spi/spitool.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/spi/spitool.h b/system/spi/spitool.h
index cf6f4bbc9..f93a00a86 100644
--- a/system/spi/spitool.h
+++ b/system/spi/spitool.h
@@ -90,7 +90,11 @@
  * then some.
  */
 
-#define MAX_ARGUMENTS 12
+#ifdef CONFIG_NSH_MAXARGUMENTS
+#define MAX_ARGUMENTS CONFIG_NSH_MAXARGUMENTS
+#else
+#define MAX_ARGUMENTS 16
+#endif
 
 /* Maximum size of one command line */
 

From dbc99dbf358750894df33c8133d317536a1b0aaa Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Mon, 3 Nov 2025 16:51:53 +0800
Subject: [PATCH 016/568] apps/spitool: Support multiple trans

By adding a parameter -r, spitool can exchange multiple transactions.
example:
spi exch -b 1 -t 0 -n 0 -f 3000000 -m 1 -w 32 -x 1 -r 2 f001fff1 0000ff35

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/spi/Kconfig      |  7 +++++++
 system/spi/spi_common.c |  4 ++--
 system/spi/spi_exch.c   | 38 +++++++++++++++++++++++++-------------
 system/spi/spi_main.c   | 11 ++++++++++-
 system/spi/spitool.h    |  1 +
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/system/spi/Kconfig b/system/spi/Kconfig
index 3b2ecff6c..9356dbdb2 100644
--- a/system/spi/Kconfig
+++ b/system/spi/Kconfig
@@ -78,4 +78,11 @@ config SPITOOL_DEFWORDS
 	---help---
 		Number of words to be transferred (default 1)
 
+config SPITOOL_DEFTRANS
+	int "Number of transfer"
+	default 1
+	range 1 255
+	---help---
+		Number of transfer to be transferred (default 1)
+
 endif # SYSTEM_SPITOOL
diff --git a/system/spi/spi_common.c b/system/spi/spi_common.c
index bb35063af..ed78ab69a 100644
--- a/system/spi/spi_common.c
+++ b/system/spi/spi_common.c
@@ -174,12 +174,12 @@ int spitool_common_args(FAR struct spitool_s *spitool, FAR char **arg)
 
       case 'r':
         ret = arg_decimal(arg, &value);
-        if (value < 0)
+        if (value < 0 || value > UINT8_MAX)
           {
             goto out_of_range;
           }
 
-        spitool->count = (uint32_t)value;
+        spitool->trans_count = (uint8_t)value;
         return ret;
 
       case 'u':
diff --git a/system/spi/spi_exch.c b/system/spi/spi_exch.c
index df2c81b38..1760ed47b 100644
--- a/system/spi/spi_exch.c
+++ b/system/spi/spi_exch.c
@@ -64,7 +64,7 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
   };
 
   uint8_t *txdatap = txdata;
-  struct spi_trans_s trans;
+  FAR struct spi_trans_s *trans;
   struct spi_sequence_s seq;
   uint32_t d;
 
@@ -93,7 +93,7 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
 
   /* There may be transmit data on the command line */
 
-  if (argc - argndx > spitool->count)
+  if (argc - argndx > spitool->count * spitool->trans_count)
     {
       spitool_printf(spitool, g_spitoomanyargs, argv[0]);
       return ERROR;
@@ -120,7 +120,7 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
     }
 
   spitool_printf(spitool, "Sending:\t");
-  for (d = 0; d < spitool->count; d++)
+  for (d = 0; d < spitool->count * spitool->trans_count; d++)
     {
       if (spitool->width <= 8)
         {
@@ -138,12 +138,20 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
 
   spitool_printf(spitool, "\n");
 
+  trans = malloc(sizeof(struct spi_trans_s) * spitool->trans_count);
+  if (!trans)
+    {
+      spitool_printf(spitool, "Failed to allocate trans memory\n");
+      return ERROR;
+    }
+
   /* Get a handle to the SPI bus */
 
   fd = spidev_open(spitool->bus);
   if (fd < 0)
     {
       spitool_printf(spitool, "Failed to get bus %d\n", spitool->bus);
+      free(trans);
       return ERROR;
     }
 
@@ -153,8 +161,8 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
   seq.mode = spitool->mode;
   seq.nbits = spitool->width;
   seq.frequency = spitool->freq;
-  seq.ntrans = 1;
-  seq.trans = &trans;
+  seq.ntrans = spitool->trans_count;
+  seq.trans = trans;
 
 #ifdef CONFIG_SPI_DELAY_CONTROL
   seq.a = 0;
@@ -163,21 +171,25 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
   seq.c = 0;
 #endif
 
-  trans.deselect = true;
+  for (d = 0; d < spitool->trans_count; d++)
+    {
+      trans[d].deselect = true;
 #ifdef CONFIG_SPI_CMDDATA
-  trans.cmd = spitool->command;
+      trans[d].cmd = spitool->command;
 #endif
-  trans.delay = spitool->udelay;
-  trans.nwords = spitool->count;
-  trans.txbuffer = txdata;
-  trans.rxbuffer = rxdata;
+      trans[d].delay = spitool->udelay;
+      trans[d].nwords = spitool->count;
+      trans[d].txbuffer = &txdata[d * spitool->count * seq.nbits / 8];
+      trans[d].rxbuffer = &rxdata[d * spitool->count * seq.nbits / 8];
 #ifdef CONFIG_SPI_HWFEATURES
-  trans.hwfeat = 0;
+      trans[d].hwfeat = 0;
 #endif
+    }
 
   ret = spidev_transfer(fd, &seq);
 
   close(fd);
+  free(trans);
 
   if (ret)
     {
@@ -185,7 +197,7 @@ int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
     }
 
   spitool_printf(spitool, "Received:\t");
-  for (d = 0; d < spitool->count; d++)
+  for (d = 0; d < spitool->count * spitool->trans_count; d++)
     {
       if (spitool->width <= 8)
         {
diff --git a/system/spi/spi_main.c b/system/spi/spi_main.c
index b09796db8..140826e43 100644
--- a/system/spi/spi_main.c
+++ b/system/spi/spi_main.c
@@ -152,6 +152,10 @@ static int spicmd_help(FAR struct spitool_s *spitool, int argc,
                           "Default: %d Current: %" PRIu32 " Max: %d\n",
                  CONFIG_SPITOOL_DEFWORDS, spitool->count, MAX_XDATA);
 
+  spitool_printf(spitool, "  [-r trans_count] Trans to exchange  "
+                          "Default: %d Current: %d Max: %d\n",
+                 CONFIG_SPITOOL_DEFTRANS, spitool->trans_count, UINT8_MAX);
+
   spitool_printf(spitool, "\nNOTES:\n");
 #ifndef CONFIG_DISABLE_ENVIRON
   spitool_printf(spitool, "o An environment variable like $PATH may be used "
@@ -159,7 +163,7 @@ static int spicmd_help(FAR struct spitool_s *spitool, int argc,
 #endif
   spitool_printf(spitool, "o Arguments are \"sticky\".  "
                           "For example, once the SPI address is\n");
-  spitool_printf(spitool, "  specified, that address will be re-used "
+  spitool_printf(spitool, "  specified, that address will be reused "
                           "until it is changed.\n");
   spitool_printf(spitool, "\nWARNING:\n");
   spitool_printf(spitool, "o The SPI commands may have bad side effects "
@@ -400,6 +404,11 @@ int main(int argc, FAR char *argv[])
       g_spitool.devtype = SPIDEVTYPE_USER;
     }
 
+  if (g_spitool.trans_count == 0)
+    {
+      g_spitool.trans_count = CONFIG_SPITOOL_DEFTRANS;
+    }
+
   /* Parse and process the command line */
 
   spi_setup(&g_spitool);
diff --git a/system/spi/spitool.h b/system/spi/spitool.h
index f93a00a86..b354ea9f9 100644
--- a/system/spi/spitool.h
+++ b/system/spi/spitool.h
@@ -140,6 +140,7 @@ struct spitool_s
   bool command;        /* [-c 0|1] Send as command or data?        */
   useconds_t udelay;   /* [-u udelay] Delay in uS after transfer   */
   uint8_t mode;        /* [-m mode] Mode to use for transfer       */
+  uint8_t trans_count; /* [-r trans count] No of trans to exchange */
 
   /* Output streams */
 

From cfff7f5a22aecdfd7799add706c48d6968769cdc Mon Sep 17 00:00:00 2001
From: zhengyu16 <zhengyu16@xiaomi.com>
Date: Thu, 11 Sep 2025 05:16:12 -0400
Subject: [PATCH 017/568] nshlib: add -f for umount

adds support for the -f (force) option to the NSH umount command

Signed-off-by: zhengyu16 <zhengyu16@xiaomi.com>
---
 nshlib/nsh_command.c |  2 +-
 nshlib/nsh_mntcmds.c | 29 +++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 3275756b3..2f05557cb 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -621,7 +621,7 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #if !defined(CONFIG_DISABLE_MOUNTPOINT)
 #  ifndef CONFIG_NSH_DISABLE_UMOUNT
-  CMD_MAP("umount",   cmd_umount,   2, 2, "<dir-path>"),
+  CMD_MAP("umount",   cmd_umount,   2, 3, "[-f] <dir-path>"),
 #  endif
 #endif
 
diff --git a/nshlib/nsh_mntcmds.c b/nshlib/nsh_mntcmds.c
index 62579d8b7..f4a2e903b 100644
--- a/nshlib/nsh_mntcmds.c
+++ b/nshlib/nsh_mntcmds.c
@@ -363,16 +363,37 @@ int cmd_nfsmount(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && !defined(CONFIG_NSH_DISABLE_UMOUNT)
 int cmd_umount(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
-  UNUSED(argc);
-
-  FAR char *fullpath = nsh_getfullpath(vtbl, argv[1]);
+  unsigned int flags = 0;
+  FAR char *fullpath;
   int ret = ERROR;
+  int option;
 
+  while ((option = getopt(argc, argv, "f")) != ERROR)
+    {
+      switch (option)
+        {
+          case 'f':
+            flags |= MNT_FORCE;
+            break;
+
+          default:
+            nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+            return ERROR;
+        }
+    }
+
+  if (optind >= argc)
+    {
+      nsh_error(vtbl, g_fmtargrequired, argv[0]);
+      return ret;
+    }
+
+  fullpath = nsh_getfullpath(vtbl, argv[optind]);
   if (fullpath)
     {
       /* Perform the umount */
 
-      ret = umount(fullpath);
+      ret = umount2(fullpath, flags);
       if (ret < 0)
         {
           nsh_error(vtbl, g_fmtcmdfailed, argv[0], "umount", NSH_ERRNO);

From aa3320fab4aca6b60749ae37bdd5d21b92433d7d Mon Sep 17 00:00:00 2001
From: Yanfeng Liu <yfliu2008@qq.com>
Date: Mon, 8 Dec 2025 19:41:44 +0800
Subject: [PATCH 018/568] import/Make.defs: use _start entry name

This reverts `_start` entry name to fix issue#17443 together with
nuttx side pull#17450.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
---
 import/Make.defs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import/Make.defs b/import/Make.defs
index 8943963ed..2b8236d25 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -97,7 +97,7 @@ endif
 ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
   LDELFFLAGS += -r
 endif
-LDELFFLAGS += -e __start -Bstatic
+LDELFFLAGS += -e _start -Bstatic
 
 # Remove other ld scripts, just use import ld scripts
 #

From a59436985c6119945e99ded5e651fa2edfce81fa Mon Sep 17 00:00:00 2001
From: chenxiaoyi <chenxiaoyi@xiaomi.com>
Date: Thu, 6 Feb 2025 17:42:44 +0800
Subject: [PATCH 019/568] testing: getTimeofday_test: fix build warning

getTimeofday_test.c:68:22: error: variable 'cnt' set but not used [-Werror,-Wunused-but-set-variable]

Signed-off-by: chenxiaoyi <chenxiaoyi@xiaomi.com>
---
 testing/testsuites/kernel/syscall/cases/getTimeofday_test.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c b/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c
index 92861fd21..a4ccb98af 100644
--- a/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c
+++ b/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c
@@ -66,7 +66,6 @@ void test_nuttx_syscall_gettimeofday01(FAR void **state)
   int rtime = 3;
   struct timeval tv1;
   struct timeval tv2;
-  unsigned long long cnt = 0;
 
   signal(SIGALRM, breakout);
 
@@ -90,6 +89,5 @@ void test_nuttx_syscall_gettimeofday01(FAR void **state)
 
       sleep(1);
       tv1 = tv2;
-      cnt++;
     }
 }

From 953fa21fef858688a773f4111e74232e172b9959 Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Thu, 5 Dec 2024 12:08:07 +0800
Subject: [PATCH 020/568] adb: adb shell depends on SCHED_CHILD_STATUS

Without this configuration, when executing exit in adb shell,
adb will not be able to exit because it cannot receive the
close packet.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/adb/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/adb/Kconfig b/system/adb/Kconfig
index 06d7f940a..14b900b5a 100644
--- a/system/adb/Kconfig
+++ b/system/adb/Kconfig
@@ -174,6 +174,7 @@ config ADBD_SHELL_SERVICE
 	depends on SYSTEM_NSH
 	depends on LIBC_EXECFUNCS
 	depends on PSEUDOTERM
+	depends on SCHED_CHILD_STATUS
 	default n
 	---help---
 		Enable "adb shell" feature.

From 60f5a68c96746833effbec718b40518b042ce7d6 Mon Sep 17 00:00:00 2001
From: yangsong8 <yangsong8@xiaomi.com>
Date: Mon, 6 Jan 2025 11:31:45 +0800
Subject: [PATCH 021/568] adb: adb tcp server configuration depends on
 NET_TCPBACKLOG

For TCP-based adb, if the current CPU contains TCP protocol stack,
then NET_TCPBACKLOG needs to be enabled.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
---
 system/adb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/adb/Kconfig b/system/adb/Kconfig
index 14b900b5a..05296cca7 100644
--- a/system/adb/Kconfig
+++ b/system/adb/Kconfig
@@ -95,7 +95,7 @@ config ADBD_FRAME_MAX
 
 config ADBD_TCP_SERVER
 	bool "Network socket transport support"
-	depends on NET_TCP
+	depends on NET_TCP_NO_STACK || NET_TCPBACKLOG
 	default n
 	---help---
 		Run adb daemon on network socket.

From 8e7ec46cce85f2da2cd9da98d283c2092e49c623 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:10:28 +0000
Subject: [PATCH 022/568] build(deps): bump actions/upload-artifact from 5 to 6

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 779f458bc..35cff3162 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
         run: tar zcf sources.tar.gz sources
 
       - name: Archive Source Bundle
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: source-bundle
           path: sources.tar.gz
@@ -197,7 +197,7 @@ jobs:
         if: always()
         run: df -h
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: ${{ always() }}
         with:
           name: linux-${{matrix.boards}}-builds
@@ -242,7 +242,7 @@ jobs:
             cd sources/nuttx
             ./tools/ci/cibuild-oot.sh
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: ${{ always() }}
         with:
           name: oot-build-artifacts
@@ -303,7 +303,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: macos-${{matrix.boards}}-builds
           path: buildartifacts/
@@ -386,7 +386,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -g -i -A -C -N -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: msys2-${{matrix.boards}}-builds
           path: buildartifacts/
@@ -438,7 +438,7 @@ jobs:
           cd sources\nuttx\tools\ci
           .\cibuild.ps1 -n -i -A -C -N testlist\windows.dat
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: msvc-builds
           path: ./sources/buildartifacts/

From c487d669cf95ad5af30cfe4500bc683b0ebddc24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:10:25 +0000
Subject: [PATCH 023/568] build(deps): bump actions/download-artifact from 6 to
 7

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 6 to 7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 35cff3162..b03880b36 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -154,7 +154,7 @@ jobs:
         run: df -h
 
       - name: Download Source Artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: source-bundle
           path: .
@@ -212,7 +212,7 @@ jobs:
       DOCKER_BUILDKIT: 1
     steps:
       - name: Download Source Artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: source-bundle
           path: .
@@ -271,7 +271,7 @@ jobs:
         boards: ${{ fromJSON(needs.macOS-Arch.outputs.selected_builds) }}
     steps:
       - name: Download Source Artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: source-bundle
           path: .
@@ -366,7 +366,7 @@ jobs:
       - run: git config --global core.autocrlf false
 
       - name: Download Source Artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: source-bundle
           path: .
@@ -420,7 +420,7 @@ jobs:
       - run: git config --global core.autocrlf false
 
       - name: Download Source Artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: source-bundle
           path: .

From a5e455cc1ca9a15285b7860a39fb7d0e66d07eb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:10:32 +0000
Subject: [PATCH 024/568] build(deps): bump actions/cache from 4 to 5

Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b03880b36..6830a7a96 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -281,7 +281,7 @@ jobs:
 
       - name: Restore Tools Cache
         id: cache-tools
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: ${{ runner.os }}-cache-tools
         with:

From 8cb7dd0694dfd759eb4508352a00f62a78df68d9 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Tue, 16 Dec 2025 15:59:55 -0300
Subject: [PATCH 025/568] apps/testing: Add pthread_mutex_perf created by
 Anchao

During the discussion about the impact of adding counter to TCB
Mr anchao created a pthread mutex performance example:
https://github.com/apache/nuttx/pull/17468#issuecomment-3660925314

Because this example can exercise (not ideally) the pthread mutex
I decided to add it to apps/testing/sched, the program name will
be called "pmutexp" (because "pmp" is not a good name).

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 .../sched/pthread_mutex_perf/CMakeLists.txt   |  41 +++++
 testing/sched/pthread_mutex_perf/Kconfig      |  30 ++++
 testing/sched/pthread_mutex_perf/Make.defs    |  25 +++
 testing/sched/pthread_mutex_perf/Makefile     |  32 ++++
 .../pthread_mutex_perf/pthread_mutex_perf.c   | 145 ++++++++++++++++++
 5 files changed, 273 insertions(+)
 create mode 100644 testing/sched/pthread_mutex_perf/CMakeLists.txt
 create mode 100644 testing/sched/pthread_mutex_perf/Kconfig
 create mode 100644 testing/sched/pthread_mutex_perf/Make.defs
 create mode 100644 testing/sched/pthread_mutex_perf/Makefile
 create mode 100644 testing/sched/pthread_mutex_perf/pthread_mutex_perf.c

diff --git a/testing/sched/pthread_mutex_perf/CMakeLists.txt b/testing/sched/pthread_mutex_perf/CMakeLists.txt
new file mode 100644
index 000000000..a7ac6ad92
--- /dev/null
+++ b/testing/sched/pthread_mutex_perf/CMakeLists.txt
@@ -0,0 +1,41 @@
+# ##############################################################################
+# apps/testing/sched/pthread_mutex_perf/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_PTHREAD_MUTEX_PERF)
+
+  set(SRCS pthread_mutex_perf.c)
+
+  nuttx_add_application(
+    NAME
+    ${CONFIG_TESTING_PTHREAD_MUTEX_PERF_PROGNMAE}
+    PRIORITY
+    ${CONFIG_TESTING_PTHREAD_MUTEX_PERF_PRIORITY}
+    STACKSIZE
+    ${CONFIG_TESTING_PTHREAD_MUTEX_PERF_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_PTHREAD_MUTEX_PERF}
+    COMPILE_FLAGS
+    ${FLAGS}
+    SRCS
+    ${SRCS})
+
+endif()
diff --git a/testing/sched/pthread_mutex_perf/Kconfig b/testing/sched/pthread_mutex_perf/Kconfig
new file mode 100644
index 000000000..d8f188880
--- /dev/null
+++ b/testing/sched/pthread_mutex_perf/Kconfig
@@ -0,0 +1,30 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_PTHREAD_MUTEX_PERF
+	bool "Pthread Mutex Performance (pmutexp) testing"
+	default n
+	---help---
+		Pthread Mutex Performance (pmp) helps to analyze the pthread
+                mutex performance, by calling the function many times.
+
+if TESTING_PTHREAD_MUTEX_PERF
+
+config TESTING_PTHREAD_MUTEX_PERF_PROGNAME
+	string "Program name"
+	default "pmutexp"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config TESTING_PTHREAD_MUTEX_PERF_PRIORITY
+	int "Priority of pmutexp process"
+	default 100
+
+config TESTING_PTHREAD_MUTEX_PERF_STACKSIZE
+	int "Stack size of pmutexp process"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/testing/sched/pthread_mutex_perf/Make.defs b/testing/sched/pthread_mutex_perf/Make.defs
new file mode 100644
index 000000000..7242f2043
--- /dev/null
+++ b/testing/sched/pthread_mutex_perf/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/sched/pthread_mutex_perf/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_PTHREAD_MUTEX_PERF),)
+CONFIGURED_APPS += $(APPDIR)/testing/sched/pthread_mutex_perf
+endif
diff --git a/testing/sched/pthread_mutex_perf/Makefile b/testing/sched/pthread_mutex_perf/Makefile
new file mode 100644
index 000000000..8b9b114a0
--- /dev/null
+++ b/testing/sched/pthread_mutex_perf/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/testing/sched/pthread_mutex_perf/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_TESTING_PTHREAD_MUTEX_PERF_PROGNAME)
+PRIORITY  = $(CONFIG_TESTING_PTHREAD_MUTEX_PERF_PRIORITY)
+STACKSIZE = $(CONFIG_TESTING_PTHREAD_MUTEX_PERF_STACKSIZE)
+MODULE    = $(CONFIG_TESTING_PTHREAD_MUTEX_PERF)
+
+MAINSRC = pthread_mutex_perf.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c b/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
new file mode 100644
index 000000000..f958f0fcb
--- /dev/null
+++ b/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
@@ -0,0 +1,145 @@
+/****************************************************************************
+ * apps/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdio.h>
+#include <pthread.h>
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static void timespec_diff(const struct timespec *start,
+                          const struct timespec *end,
+                          struct timespec *diff)
+{
+  diff->tv_sec = end->tv_sec - start->tv_sec;
+  diff->tv_nsec = end->tv_nsec - start->tv_nsec;
+
+  if (diff->tv_nsec < 0)
+    {
+      diff->tv_sec--;
+        diff->tv_nsec += 1000000000;
+    }
+}
+
+static void timespec_add(struct timespec *total, const struct timespec *diff)
+{
+  total->tv_sec += diff->tv_sec;
+  total->tv_nsec += diff->tv_nsec;
+
+  if (total->tv_nsec >= 1000000000)
+    {
+      total->tv_sec += total->tv_nsec / 1000000000;
+      total->tv_nsec = total->tv_nsec % 1000000000;
+    }
+}
+
+static void timespec_avg(const struct timespec *total, int count,
+                         struct timespec *avg)
+{
+  uint64_t total_ns = (uint64_t)total->tv_sec * 1000000000 + total->tv_nsec;
+  uint64_t avg_ns = total_ns / count;
+
+  avg->tv_sec = avg_ns / 1000000000;
+  avg->tv_nsec = avg_ns % 1000000000;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * pmp_main
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  struct timespec start;
+  struct timespec end;
+  struct timespec diff;
+  struct timespec total = {
+                            0, 0
+                          };
+
+  struct timespec avg;
+  int i;
+  int j = 0;
+  const int loop_count = 10;
+
+  while (j < loop_count)
+    {
+      i = 0;
+      j++;
+
+      /* Get the starting time */
+
+      clock_gettime(CLOCK_BOOTTIME, &start);
+
+      /* Do 1 million interactions trying to lock an already locked mutex */
+
+      pthread_mutex_lock(&g_mutex);
+
+      while (i < 1000 * 1000)
+        {
+          i++;
+          pthread_mutex_trylock(&g_mutex);
+        }
+
+      pthread_mutex_unlock(&g_mutex);
+
+      /* Get the finished time */
+
+      clock_gettime(CLOCK_BOOTTIME, &end);
+
+      /* Get the calculated elapsed time */
+
+      timespec_diff(&start, &end, &diff);
+
+      /* Add it to total time for each loop pass */
+
+      timespec_add(&total, &diff);
+
+      /* Get the average time */
+
+      timespec_avg(&total, j, &avg);
+
+      printf("%d: diff = %lu.%09lu s | avg = %lu.%09lu s\n", j,
+             (unsigned long)diff.tv_sec, (unsigned long)diff.tv_nsec,
+             (unsigned long)avg.tv_sec, (unsigned long)avg.tv_nsec);
+    }
+
+  printf("\n===== result =====\n");
+  printf("count: %d\n", loop_count);
+  printf("total: %lu.%09lu s\n", (unsigned long)total.tv_sec,
+         (unsigned long)total.tv_nsec);
+  printf("avg: %lu.%09lu s\n", (unsigned long)avg.tv_sec,
+         (unsigned long)avg.tv_nsec);
+
+  return 0;
+}

From c4da1b5b9f3c6ab24014f919320bad8a5ee845d7 Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Tue, 8 Jul 2025 13:19:45 +0800
Subject: [PATCH 026/568] system/cu: Optimize I/O performance with batch
 read/write

Due to DMA-based transfers, the rx buffer can receive a large amount
of data at once. The previous character-by-character processing approach
was inefficient.

Modify character-by-character read to block read of the entire buffer.
This improves throughput and reduces CPU overhead, especially for high-speed
serial communication or other DMA-based transfers.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 system/cu/cu_main.c | 86 +++++++++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 30 deletions(-)

diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index 20cd101b5..8d25038ed 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -103,16 +103,16 @@ static FAR void *cu_listener(FAR void *parameter)
 
   for (; ; )
     {
+      char buf[CONFIG_LINE_MAX];
       int rc;
-      char ch;
 
-      rc = read(cu->devfd, &ch, 1);
+      rc = read(cu->devfd, buf, sizeof(buf));
       if (rc <= 0)
         {
           break;
         }
 
-      rc = write(STDOUT_FILENO, &ch, 1);
+      rc = write(STDOUT_FILENO, buf, rc);
       if (rc <= 0)
         {
           break;
@@ -289,6 +289,7 @@ int main(int argc, FAR char *argv[])
   int start_of_line = 1;
   int exitval = EXIT_FAILURE;
   bool badarg = false;
+  bool escaping = false;
 
   /* Initialize global data */
 
@@ -436,55 +437,80 @@ int main(int argc, FAR char *argv[])
 
   while (!cu->force_exit)
     {
-      char ch;
+      char buf[CONFIG_LINE_MAX];
+      ssize_t nwrite = 0;
+      ssize_t nread;
+      ssize_t i;
 
-      if (read(STDIN_FILENO, &ch, 1) <= 0)
+      /* Read multiple characters at once (blocking) */
+
+      nread = read(STDIN_FILENO, buf, sizeof(buf));
+      if (nread <= 0)
         {
           continue;
         }
 
-      if (start_of_line == 1 && ch == cu->escape)
+      /* Process each character */
+
+      for (i = 0; i < nread; i++)
         {
-          /* We've seen and escape (~) character, echo it to local
-           * terminal and read the next char from serial
-           */
+          char ch = buf[i];
 
-          write(STDOUT_FILENO, &ch, 1);
+          /* Check if we're waiting for an escape command character */
 
-          if (read(STDIN_FILENO, &ch, 1) <= 0)
+          if (escaping)
             {
+              /* We got the escape character in previous read,
+               * now process the command character
+               */
+
+              escaping = false;
+              if (cu_cmd(cu, ch) == 1)
+                {
+                  cu->force_exit = true;
+                  nread = i;
+                  break;
+                }
+            }
+
+          if (start_of_line == 1 && ch == cu->escape)
+            {
+              /* Normal character */
+
+              if (i > nwrite)
+                {
+                  write(cu->devfd, &buf[nwrite], i - nwrite);
+                }
+
+              nwrite = i + 1;
+
+              /* We've seen and escape (~) character, echo it to local
+               * terminal and read the next char from serial
+               */
+
+              write(STDOUT_FILENO, &ch, 1);
+              start_of_line = 0;
+              escaping = true;
               continue;
             }
 
-          if (ch == cu->escape)
-            {
-              /* Escaping a tilde: handle like normal char */
+          /* Determine if we are now at the start of a new line or not */
 
-              write(cu->devfd, &ch, 1);
-              continue;
+          if (ch == '\n' || ch == '\r')
+            {
+              start_of_line = 1;
             }
           else
             {
-              if (cu_cmd(cu, ch) == 1)
-                {
-                  break;
-                }
+              start_of_line = 0;
             }
         }
 
       /* Normal character */
 
-      write(cu->devfd, &ch, 1);
-
-      /* Determine if we are now at the start of a new line or not */
-
-      if (ch == '\n' || ch == '\r')
+      if (nread > nwrite)
         {
-          start_of_line = 1;
-        }
-      else
-        {
-          start_of_line = 0;
+          write(cu->devfd, &buf[nwrite], nread - nwrite);
         }
     }
 

From 26a969ac71486ea128a180d310192c77627734bb Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Fri, 10 Jan 2025 10:29:46 +0800
Subject: [PATCH 027/568] apps/netutils: Modify the MQTT compilation file to
 enable MQTT testing

Modify the build and test files to make the MQTT test cases run.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 netutils/mqttc/CMakeLists.txt | 42 ++++++++++++++++++++++++++---------
 netutils/mqttc/Kconfig        | 12 ++++++++++
 netutils/mqttc/Makefile       | 13 +++++++++++
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/netutils/mqttc/CMakeLists.txt b/netutils/mqttc/CMakeLists.txt
index 246cd1919..ae03435be 100644
--- a/netutils/mqttc/CMakeLists.txt
+++ b/netutils/mqttc/CMakeLists.txt
@@ -1,24 +1,24 @@
-############################################################################
+# ##############################################################################
 # apps/netutils/mqttc/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
+# License for the specific language governing permissions and limitations under
+# the License.
 #
-############################################################################
+# ##############################################################################
 
 if(CONFIG_NETUTILS_MQTTC)
 
@@ -124,4 +124,24 @@ if(CONFIG_NETUTILS_MQTTC)
         mqttc)
     endif()
   endif()
+
+  if(CONFIG_NETUTILS_MQTTC_TEST)
+    set(MQTT_TEST_CFLAGS ${CFLAGS} -Dopen_nb_socket=test_open_nb_socket
+                         -Dpublish_callback=test_publish_callback)
+
+    nuttx_add_application(
+      NAME
+      cmocka_mqttc_test
+      STACKSIZE
+      ${CONFIG_NETUTILS_MQTTC_TEST_STACKSIZE}
+      PRIORITY
+      ${SCHED_PRIORITY_DEFAULT}
+      SRCS
+      ${MQTTC_DIR}/tests.c
+      COMPILE_FLAGS
+      ${MQTT_TEST_CFLAGS}
+      DEPENDS
+      cmocka
+      mqttc)
+  endif()
 endif()
diff --git a/netutils/mqttc/Kconfig b/netutils/mqttc/Kconfig
index 2c1d0b883..aa8e23d04 100644
--- a/netutils/mqttc/Kconfig
+++ b/netutils/mqttc/Kconfig
@@ -17,6 +17,10 @@ config NETUTILS_MQTTC_EXAMPLE
 	---help---
 		Enable MQTT-C example
 
+config NETUTILS_MQTTC_TEST
+	tristate "Enable MQTT-C test"
+	default n
+
 if NETUTILS_MQTTC_EXAMPLE
 
 config NETUTILS_MQTTC_EXAMPLE_STACKSIZE
@@ -25,6 +29,14 @@ config NETUTILS_MQTTC_EXAMPLE_STACKSIZE
 
 endif
 
+if NETUTILS_MQTTC_TEST
+
+config NETUTILS_MQTTC_TEST_STACKSIZE
+	int "Task's stack size"
+	default 8192
+
+endif
+
 config NETUTILS_MQTTC_WITH_MBEDTLS
 	bool "Enable MQTT-C with mbedtls"
 	default n
diff --git a/netutils/mqttc/Makefile b/netutils/mqttc/Makefile
index 730ce5139..d8d2a3638 100644
--- a/netutils/mqttc/Makefile
+++ b/netutils/mqttc/Makefile
@@ -83,4 +83,17 @@ endif
 
 endif
 
+ifneq ($(CONFIG_NETUTILS_MQTTC_TEST),)
+$(MQTTC_UNPACK)$(DELIM)tests.c_CFLAGS += \
+            -I$(APPDIR)$(DELIM)testing$(DELIM)cmocka$(DELIM)cmocka$(DELIM)include \
+            -Dopen_nb_socket=test_open_nb_socket \
+            -Dpublish_callback=test_publish_callback
+
+PRIORITY  = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_NETUTILS_MQTTC_TEST_STACKSIZE)
+MODULE    = $(CONFIG_NETUTILS_MQTTC_TEST)
+MAINSRC  += $(MQTTC_UNPACK)$(DELIM)tests.c
+PROGNAME += cmocka_mqttc_test
+endif
+
 include $(APPDIR)/Application.mk

From 0045d8b546af28c43233e43d342b222d2ed512eb Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 21 Dec 2025 13:11:14 -0500
Subject: [PATCH 028/568] uorb/listener: Fix typos

Fix typo in comments and strings.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 system/uorb/listener.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index ebee53005..fe7909030 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -62,7 +62,7 @@ struct listen_object_s
   SLIST_ENTRY(listen_object_s) node; /* Node of object info list */
 
   struct orb_object object; /* Object id */
-  orb_abstime timestamp;    /* Time of lastest generation */
+  orb_abstime timestamp;    /* Time of last generation */
   unsigned long generation; /* Latest generation */
   FAR FILE *file;
 };
@@ -252,7 +252,7 @@ static int listener_add_object(FAR struct listen_list_s *objlist,
  * Name: listener_update
  *
  * Description:
- *   Update object list, print imformation if given object has new data.
+ *   Update object list, print information if given object has new data.
  *
  * Input Parameters:
  *   object     Object to check state.
@@ -269,7 +269,7 @@ static int listener_update(FAR struct listen_list_s *objlist,
   FAR struct listen_object_s *tmp;
   int ret;
 
-  /* Check wether object already exist in old list */
+  /* Check whether object already exist in old list */
 
   SLIST_FOREACH(tmp, objlist, node)
     {
@@ -485,7 +485,7 @@ static int listener_generate_object_list(FAR struct listen_list_s *objlist,
           continue;
         }
 
-      /* Update object infomation to list. */
+      /* Update object information to list. */
 
       if (listener_update(objlist, &object) < 0)
         {
@@ -568,7 +568,7 @@ static int listener_record(FAR const struct orb_metadata *meta, int fd,
  * Name: listener_monitor
  *
  * Description:
- *   Moniter objects by subscribe and print data.
+ *   Monitor objects by subscribe and print data.
  *
  * Input Parameters:
  *   objlist        List of objects to subscribe.
@@ -670,7 +670,7 @@ static void listener_monitor(FAR struct listen_list_s *objlist,
         }
     }
 
-  /* Loop poll and print recieved messages */
+  /* Loop poll and print received messages */
 
   while ((!nb_msgs || nb_recv_msgs < nb_msgs) && !g_should_exit)
     {
@@ -734,7 +734,7 @@ static void listener_monitor(FAR struct listen_list_s *objlist,
             }
 
           orb_unsubscribe(fds[i].fd);
-          uorbinfo_raw("Object name:%s%d, recieved:%d",
+          uorbinfo_raw("Object name:%s%d, received:%d",
                        tmp->object.meta->o_name, tmp->object.instance,
                        recv_msgs[i]);
         }

From 008433dcfe3a2647e0547b87b2341d36c25e73f5 Mon Sep 17 00:00:00 2001
From: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
Date: Tue, 23 Dec 2025 10:20:17 +0100
Subject: [PATCH 029/568] testing/testsuites: add cmake support

add cmake support for testsuites

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
Co-authored-by: v-wangshihang <v-wangshihang@xiaomi.com>
Co-authored-by: v-chenglong8 <v-chenglong8@xiaomi.com>
Co-authored-by: xuxin19 <xuxin19@xiaomi.com>
Co-authored-by: zhangshoukui <zhangshoukui@xiaomi.com>
---
 testing/testsuites/CMakeLists.txt        |  21 +++
 testing/testsuites/kernel/CMakeLists.txt | 213 +++++++++++++++++++++++
 2 files changed, 234 insertions(+)
 create mode 100644 testing/testsuites/CMakeLists.txt
 create mode 100644 testing/testsuites/kernel/CMakeLists.txt

diff --git a/testing/testsuites/CMakeLists.txt b/testing/testsuites/CMakeLists.txt
new file mode 100644
index 000000000..9b77c6d60
--- /dev/null
+++ b/testing/testsuites/CMakeLists.txt
@@ -0,0 +1,21 @@
+# ##############################################################################
+# apps/testing/testsuites/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+nuttx_add_subdirectory()
diff --git a/testing/testsuites/kernel/CMakeLists.txt b/testing/testsuites/kernel/CMakeLists.txt
new file mode 100644
index 000000000..ce7f042cb
--- /dev/null
+++ b/testing/testsuites/kernel/CMakeLists.txt
@@ -0,0 +1,213 @@
+# ##############################################################################
+# apps/testing/testsuites/kernel/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_CM_FS_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/fs/include ${NUTTX_DIR}/../apps/nshlib
+             ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB FS_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/fs/cases/*.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/fs/common/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_fs_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    fs/cmocka_fs_test.c
+    ${FS_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_SCHED_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/sched/include
+             ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB SCHED_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/sched/cases/*.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/sched/common/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_sched_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    sched/cmocka_sched_test.c
+    ${SCHED_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_SYSCALL_TEST)
+  set(INCDIR
+      ${CMAKE_CURRENT_SOURCE_DIR}/syscall/include ${NUTTX_DIR}/../apps/nshlib
+      ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB SYSCALL_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/syscall/cases/*.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/syscall/common/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_syscall_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    syscall/cmocka_syscall_test.c
+    ${SYSCALL_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_MM_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/mm/include
+             ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB MM_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/mm/cases/*.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/mm/common/*.c)
+
+  nuttx_add_application(
+    NAME
+    cmocka_mm_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    mm/cmocka_mm_test.c
+    ${MM_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+  nuttx_add_application(
+    NAME
+    mem_batch_opt_perf_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    mm/tool/mem_batch_opt_perf_test.c
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+  nuttx_add_application(
+    NAME
+    mem_cycle_opt_perf_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    mm/tool/mem_cycle_opt_perf_test.c
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_TIME_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/time/include
+             ${NUTTX_DIR}/../apps/testing/cmocka/include ${NUTTX_DIR}/include)
+  file(GLOB TIME_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/time/cases/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_time_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    time/cmocka_time_test.c
+    ${TIME_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_SOCKET_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/socket/include
+             ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB SOCKET_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/socket/cases/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_socket_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    socket/cmocka_socket_test.c
+    ${SOCKET_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_PTHREAD_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/pthread/include
+             ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB PTHREAD_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/pthread/cases/*.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/pthread/common/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_pthread_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    pthread/cmocka_pthread_test.c
+    ${PTHREAD_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()
+
+if(CONFIG_CM_MUTEX_TEST)
+  set(INCDIR ${CMAKE_CURRENT_SOURCE_DIR}/mutex/include
+             ${NUTTX_DIR}/../apps/testing/cmocka/include)
+  file(GLOB MUTEX_CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/mutex/cases/*.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/mutex/common/*.c)
+  nuttx_add_application(
+    NAME
+    cmocka_mutex_test
+    STACKSIZE
+    ${CONFIG_TESTS_TESTSUITES_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTS_TESTSUITES_PRIORITY}
+    SRCS
+    mutex/cmocka_mutex_test.c
+    ${MUTEX_CSRCS}
+    INCLUDE_DIRECTORIES
+    ${INCDIR}
+    DEPENDS
+    cmocka)
+endif()

From 951740627b2b01516e526ccf43db50755770154e Mon Sep 17 00:00:00 2001
From: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
Date: Tue, 23 Dec 2025 10:42:31 +0100
Subject: [PATCH 030/568] testing/testsuites/Kconfig: add missing dependencies
 for test cases

add missing dependencies for test cases to avoid compilation errors

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
---
 testing/testsuites/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/testsuites/Kconfig b/testing/testsuites/Kconfig
index a6b6928cc..e6afff5f6 100644
--- a/testing/testsuites/Kconfig
+++ b/testing/testsuites/Kconfig
@@ -38,7 +38,7 @@ config CM_MM_TEST
 
 config CM_TIME_TEST
 	bool "enbale time test"
-	depends on !DISABLE_POSIX_TIMERS
+	depends on !DISABLE_POSIX_TIMERS && SIG_EVTHREAD
 	default n
 
 config CM_PTHREAD_TEST
@@ -47,6 +47,7 @@ config CM_PTHREAD_TEST
 
 config CM_SOCKET_TEST
 	bool "enbale socket test"
+	depends on NET
 	default n
 
 config CM_SYSCALL_TEST

From 8856a587a67f0d93e8ab8494443dd825b88725b3 Mon Sep 17 00:00:00 2001
From: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
Date: Tue, 23 Dec 2025 10:55:13 +0100
Subject: [PATCH 031/568] testsuites/Kconfig: fix codespell issues

fix codespell issues

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
---
 testing/testsuites/Kconfig | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/testing/testsuites/Kconfig b/testing/testsuites/Kconfig
index e6afff5f6..8ed01ffcf 100644
--- a/testing/testsuites/Kconfig
+++ b/testing/testsuites/Kconfig
@@ -29,33 +29,33 @@ config CM_FS_TEST
 	default n
 
 config CM_SCHED_TEST
-	bool "enbale schedule test"
+	bool "enable schedule test"
 	default n
 
 config CM_MM_TEST
-	bool "enbale MM test"
+	bool "enable MM test"
 	default n
 
 config CM_TIME_TEST
-	bool "enbale time test"
+	bool "enable time test"
 	depends on !DISABLE_POSIX_TIMERS && SIG_EVTHREAD
 	default n
 
 config CM_PTHREAD_TEST
-	bool "enbale pthread test"
+	bool "enable pthread test"
 	default n
 
 config CM_SOCKET_TEST
-	bool "enbale socket test"
+	bool "enable socket test"
 	depends on NET
 	default n
 
 config CM_SYSCALL_TEST
-	bool "enbale syscall test"
+	bool "enable syscall test"
 	default n
 
 config CM_MUTEX_TEST
-	bool "enbale mutex test"
+	bool "enable mutex test"
 	default n
 
 endif # TESTS_TESTSUITES

From b78ab0c6e8e83712cbdc6bf8b6340fa41c00028a Mon Sep 17 00:00:00 2001
From: zhengyu9 <zhengyu9@xiaomi.com>
Date: Fri, 23 Aug 2024 16:34:00 +0800
Subject: [PATCH 032/568] fsutils/flashtool: add flashtool command support

Introducing flashtool command with following capabilities:
- Flash geometry information display
- Bad blocks checking
- Page contents read/write
- Block erase
- Full flash erase

Signed-off-by: zhengyu9 <zhengyu9@xiaomi.com>
---
 fsutils/flashtool/CMakeLists.txt   |  24 ++
 fsutils/flashtool/Kconfig          |  29 +++
 fsutils/flashtool/Make.defs        |  24 ++
 fsutils/flashtool/Makefile         |  33 +++
 fsutils/flashtool/flashtool_main.c | 373 +++++++++++++++++++++++++++++
 5 files changed, 483 insertions(+)
 create mode 100644 fsutils/flashtool/CMakeLists.txt
 create mode 100644 fsutils/flashtool/Kconfig
 create mode 100644 fsutils/flashtool/Make.defs
 create mode 100644 fsutils/flashtool/Makefile
 create mode 100644 fsutils/flashtool/flashtool_main.c

diff --git a/fsutils/flashtool/CMakeLists.txt b/fsutils/flashtool/CMakeLists.txt
new file mode 100644
index 000000000..338c1a394
--- /dev/null
+++ b/fsutils/flashtool/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ##############################################################################
+# apps/fsutils/flashtool/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_FSUTILS_FLASHTOOL)
+  nuttx_add_application(MODULE ${CONFIG_FSUTILS_FLASHTOOL} NAME flashtool SRCS
+                        flashtool_main.c)
+endif()
diff --git a/fsutils/flashtool/Kconfig b/fsutils/flashtool/Kconfig
new file mode 100644
index 000000000..07f89671a
--- /dev/null
+++ b/fsutils/flashtool/Kconfig
@@ -0,0 +1,29 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config FSUTILS_FLASHTOOL
+	tristate "FLASH Tool Command"
+	default n
+	depends on MTD
+	depends on BCH
+	---help---
+		Enable support for the FLASH tool.
+
+if FSUTILS_FLASHTOOL
+
+config FSUTILS_FLASHTOOL_STACKSIZE
+	int "flashtool stack size"
+	default DEFAULT_TASK_STACKSIZE
+	---help---
+		This is the stack size that will be used when starting the flashtool.
+
+config FSUTILS_FLASHTOOL_PRIORITY
+	int "flashtool priority"
+	default 100
+	---help---
+		This is the task priority that will be used when starting the flashtool.
+
+endif
+
diff --git a/fsutils/flashtool/Make.defs b/fsutils/flashtool/Make.defs
new file mode 100644
index 000000000..55f2c72c9
--- /dev/null
+++ b/fsutils/flashtool/Make.defs
@@ -0,0 +1,24 @@
+############################################################################
+# apps/fsutils/flashtool/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_FSUTILS_FLASHTOOL),)
+CONFIGURED_APPS += $(APPDIR)/fsutils/flashtool
+endif
+
diff --git a/fsutils/flashtool/Makefile b/fsutils/flashtool/Makefile
new file mode 100644
index 000000000..deac9500a
--- /dev/null
+++ b/fsutils/flashtool/Makefile
@@ -0,0 +1,33 @@
+############################################################################
+# apps/fsutils/flashtool/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# flashtool Application
+
+PROGNAME = flashtool
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE = $(CONFIG_FSUTILS_FLASHTOOL)
+
+MAINSRC = flashtool_main.c
+
+include $(APPDIR)/Application.mk
+
diff --git a/fsutils/flashtool/flashtool_main.c b/fsutils/flashtool/flashtool_main.c
new file mode 100644
index 000000000..8e4f288f3
--- /dev/null
+++ b/fsutils/flashtool/flashtool_main.c
@@ -0,0 +1,373 @@
+/****************************************************************************
+ * apps/fsutils/flashtool/flashtool_main.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/mtd/mtd.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <fcntl.h>
+#include <debug.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include <sys/ioctl.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+enum opr_list
+{
+  HELP, DEVICE_INFO, READ_PAGE, WRITE_PAGE, ERASE_BLOCK, ERASE_ALL,
+  CHECK_BAD_BLOCK
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void display_help(void)
+{
+  printf("Usage : flashtool [OPTION [ARG]] device_name ...\n");
+  printf("-h         show this help statement\n");
+  printf("-i         display device geometry information\n");
+  printf("-r <page>  read the specified pages\n");
+  printf("-w <page>  write the specified pages\n");
+  printf("-e <block> erase the specified blocks\n");
+  printf("-n <num>   number of pages or blocks\n");
+  printf("-f <file>  file name for read or write\n");
+  printf("-b <block> check whether <block> is bad\n");
+  printf("-c         erase all of the flash\n");
+  printf("-d <device> device name\n");
+}
+
+static void display_device_info(FAR const struct mtd_geometry_s *geo)
+{
+  printf("Size of one read/write page: %lu\n", geo->blocksize);
+  printf("Size of one erase block:     %lu\n", geo->erasesize);
+  printf("Number of erase blocks:      %lu\n", geo->neraseblocks);
+}
+
+static int read_page(int fd, FAR const struct mtd_geometry_s *geo,
+                     off_t start_page, size_t npages)
+{
+  FAR unsigned char *buf;
+  ssize_t ret = OK;
+  off_t seek;
+  size_t i;
+
+  buf = malloc(geo->blocksize);
+  if (!buf)
+    {
+      printf("ERROR: read_page cannot allocate memory %d\n", geo->blocksize);
+      return ERROR;
+    }
+
+  seek = geo->blocksize * start_page;
+  if (lseek(fd, seek, SEEK_SET) != seek)
+    {
+      printf("ERROR: Cannot seek mtd to offset %lld: %d", seek, errno);
+      goto oops;
+    }
+
+  printf("Flash pages contents:\n");
+  for (i = 0; i < npages; i++)
+    {
+      ret = read(fd, buf, geo->blocksize);
+      if (ret < 0)
+        {
+          printf("ERROR: Read error: %d!\n", errno);
+          goto oops;
+        }
+
+      printf("Flash page %lld:\n", start_page + i);
+      lib_dumpbuffer(NULL, buf, ret);
+    }
+
+oops:
+  free(buf);
+  return ret;
+}
+
+/* Write npages data from img to flash
+ * If size of img is less than npags, only write img size
+ */
+
+static int write_page(int fd, FAR const struct mtd_geometry_s *geo,
+                      off_t start_page, size_t npages, FAR const char *img)
+{
+  FAR unsigned char *buf;
+  off_t imglen;
+  off_t seek;
+  off_t i;
+  int fd_src;
+  int ret = OK;
+
+  if (img == NULL)
+    {
+      printf("ERROR: Need source file path!\n");
+      return ERROR;
+    }
+
+  printf("Write data from %s...\n", img);
+  seek = geo->blocksize * start_page;
+  if (lseek(fd, seek, SEEK_SET) != seek)
+    {
+      printf("ERROR: cannot seek mtd to offset %lld: %d", seek, errno);
+      return ERROR;
+    }
+
+  fd_src = open(img, O_RDONLY);
+  if (fd_src < 0)
+    {
+      printf("ERROR: Open file %s failed: %d\n", img, errno);
+      return ERROR;
+    }
+
+  imglen = lseek(fd_src, 0, SEEK_END);
+  if (lseek(fd_src, 0, SEEK_SET) != 0)
+    {
+      close(fd_src);
+      return ERROR;
+    }
+
+  /* Malloc a size of page for buf */
+
+  buf = malloc(geo->blocksize);
+  if (!buf)
+    {
+      printf("ERROR: write_page cannot allocate memory %d\n",
+             geo->blocksize);
+      close(fd_src);
+      return ERROR;
+    }
+
+  for (i = start_page; i < start_page + npages; i++)
+    {
+      ret = read(fd_src, buf,
+                (imglen < geo->blocksize) ? imglen : geo->blocksize);
+      if (ret < 0)
+        {
+          printf("ERROR: read source file error: %d!\n", errno);
+          goto oops;
+        }
+
+      ret = write(fd, buf, geo->blocksize);
+      if (ret < 0)
+        {
+          printf("ERROR: write error: %d!\n", errno);
+          goto oops;
+        }
+
+      imglen -= geo->blocksize;
+      if (imglen <= 0)
+        {
+          break;
+        }
+    }
+
+oops:
+  close(fd_src);
+  free(buf);
+  return ret;
+}
+
+static int erase_block(int fd, off_t start_block,
+                       size_t nblocks)
+{
+  struct mtd_erase_s erase;
+  int ret;
+
+  printf("Erase block from %lld to %lld!\n", start_block,
+         start_block + nblocks -1);
+  erase.startblock = start_block;
+  erase.nblocks = nblocks;
+  ret = ioctl(fd, MTDIOC_ERASESECTORS, &erase);
+  if (ret < 0)
+    {
+      printf("ERROR: Erase failed: %d!\n", errno);
+    }
+
+  return ret;
+}
+
+static int erase_all(int fd)
+{
+  if (ioctl(fd, MTDIOC_BULKERASE, 0) < 0)
+    {
+      printf("ERROR: MTD ioctl(MTDIOC_BULKERASE) failed: %d\n", errno);
+      return ERROR;
+    }
+
+  return OK;
+}
+
+static int check_bad_block(int fd, FAR const struct mtd_geometry_s *geo)
+{
+  struct mtd_bad_block_s bad_block;
+  int flag = 0;
+  int ret;
+  int i;
+
+  printf("Check bad blocks in flash......\n");
+  for (i = 0; i < geo->neraseblocks; i++)
+    {
+      bad_block.block_num = i;
+      ret = ioctl(fd, MTDIOC_ISBAD, &bad_block);
+      if (ret != OK)
+        {
+          printf("ERROR: MTDIOC_ISBAD failed: %d!\n", errno);
+          return ERROR;
+        }
+      else
+        {
+          if (bad_block.bad_flag)
+            {
+              printf("Block %d is bad!\n", i);
+              flag = 1;
+            }
+        }
+    }
+
+  if (flag == 0)
+    {
+      printf("No bad blocks!\n");
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR char *mtddev = NULL;
+  FAR char *img = NULL;
+  struct mtd_geometry_s geo;
+  enum opr_list opr = HELP;
+  off_t npages = 1;
+  off_t start;
+  int option;
+  int mode = O_RDONLY;
+  int fd;
+  int ret;
+
+  while ((option = getopt(argc, argv, ":hir:w:e:n:f:bcd:")) != -1)
+    {
+      switch (option)
+        {
+          case 'h':
+            display_help();
+            exit(0);
+          case 'i':
+            opr = DEVICE_INFO;
+            break;
+          case 'r':
+            opr = READ_PAGE;
+            start = strtoul(optarg, NULL, 0);
+            break;
+          case 'w':
+            opr = WRITE_PAGE;
+            mode = O_RDWR;
+            start = strtoul(optarg, NULL, 0);
+            break;
+          case 'e':
+            opr = ERASE_BLOCK;
+            start = strtoul(optarg, NULL, 0);
+            break;
+          case 'n':
+            npages = strtoul(optarg, NULL, 0);
+            break;
+          case 'f':
+            img = optarg;
+            break;
+          case 'b':
+            opr = CHECK_BAD_BLOCK;
+            break;
+          case 'c':
+            opr = ERASE_ALL;
+            break;
+          case 'd':
+            mtddev = optarg;
+            break;
+          case ':':
+            printf("Error: Missing required argument\n");
+            exit(1);
+          case '?':
+            printf("Error: Unrecognized option\n");
+            exit(1);
+        }
+    }
+
+  if (mtddev == NULL)
+    {
+      printf("Error: Device name is required!\n");
+      return -1;
+    }
+
+  fd = open(mtddev, mode, 0777);
+  if (fd < 0)
+    {
+      printf("ERROR: Failed to open '%s': %d\n", mtddev, errno);
+      return -1;
+    }
+
+  ret = ioctl(fd, MTDIOC_GEOMETRY, &geo);
+  if (ret < 0)
+    {
+      printf("ERROR: Ioctl MTDIOC_GEOMETRY failed: %d\n", errno);
+      goto oops;
+    }
+
+  switch (opr)
+    {
+      case DEVICE_INFO:
+        display_device_info(&geo);
+        break;
+      case READ_PAGE:
+        ret = read_page(fd, &geo, start, npages);
+        break;
+      case WRITE_PAGE:
+        ret = write_page(fd, &geo, start, npages, img);
+        break;
+      case ERASE_BLOCK:
+        ret = erase_block(fd, start, npages);
+        break;
+      case ERASE_ALL:
+        ret = erase_all(fd);
+        break;
+      case CHECK_BAD_BLOCK:
+        ret = check_bad_block(fd, &geo);
+        break;
+      default:
+    }
+
+oops:
+  close(fd);
+  return ret;
+}

From 4d98ecccafdc1927d1b5363c6540c2be53f30d5e Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Mon, 15 Dec 2025 21:49:17 +0800
Subject: [PATCH 033/568] testing/ostest: add hrtimer API functional tests

Add functional tests for the newly added hrtimer APIs,
including hrtimer_init(), hrtimer_start(), and hrtimer_cancel().

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/CMakeLists.txt |   4 +
 testing/ostest/Makefile       |   6 +
 testing/ostest/hrtimer.c      | 228 ++++++++++++++++++++++++++++++++++
 testing/ostest/ostest.h       |   4 +
 testing/ostest/ostest_main.c  |  10 +-
 5 files changed, 251 insertions(+), 1 deletion(-)
 create mode 100644 testing/ostest/hrtimer.c

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 2bbe6a730..6e971373d 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -153,6 +153,10 @@ if(CONFIG_TESTING_OSTEST)
     list(APPEND SRCS nxevent.c)
   endif()
 
+  if(CONFIG_HRTIMER AND CONFIG_BUILD_FLAT)
+    list(APPEND SRCS hrtimer.c)
+  endif()
+
   if(CONFIG_BUILD_FLAT)
     list(APPEND SRCS wdog.c)
   endif()
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index c631fb3b8..5f7d5d4f8 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -150,6 +150,12 @@ CSRCS += nxevent.c
 endif
 endif
 
+ifeq ($(CONFIG_HRTIMER),y)
+ifeq ($(CONFIG_BUILD_FLAT),y)
+CSRCS += hrtimer.c
+endif
+endif
+
 ifeq ($(CONFIG_BUILD_FLAT),y)
 CSRCS += wdog.c
 endif
diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
new file mode 100644
index 000000000..9b2d61430
--- /dev/null
+++ b/testing/ostest/hrtimer.c
@@ -0,0 +1,228 @@
+/****************************************************************************
+ * apps/testing/ostest/hrtimer.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/hrtimer.h>
+
+#include <stdio.h>
+#include <sched.h>
+
+#include "ostest.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NSEC_PER_50MS (50 * NSEC_PER_MSEC)
+
+/* Set a 1ms margin to allow hrtimertest to pass in QEMU.
+ *
+ * QEMU is a virtual platform, and its timer resolution and scheduling
+ * latency may be less precise than on real hardware. Using a larger
+ * margin ensures that tests do not fail due to timing inaccuracies.
+ *
+ * On real hardware (verified on the a2g-tc397-5v-tft board), this
+ * margin can be reduced to less than 5 ns because timers are precise
+ * and deterministic.
+ */
+
+#define HRTIMER_TEST_MARGIN    (NSEC_PER_MSEC)
+
+/* Simple assertion macro for HRTimer test cases */
+#define HRTIMER_TEST(expr, value)                                   \
+  do                                                                \
+    {                                                               \
+      ret = (expr);                                                 \
+      if (ret != (value))                                           \
+        {                                                           \
+          printf("ERROR: HRTimer test failed, line=%d ret=%d\n",   \
+                 __LINE__, ret);                                    \
+          ASSERT(false);                                            \
+        }                                                           \
+    }                                                               \
+  while (0)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Structure for HRTimer test tracking */
+
+struct hrtimer_test_s
+{
+  hrtimer_t timer;    /* HRTimer instance */
+  uint64_t  previous; /* Previous timestamp in nanoseconds */
+  uint32_t  count;    /* Number of timer expirations */
+  uint32_t  period;   /* Expected period between expirations */
+  bool      active;   /* True while the test is still running */
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hrtimer_test_init
+ *
+ * Description:
+ *   Initialize a hrtimer_test_s structure for a new test.
+ *
+ * Input Parameters:
+ *   hrtimer_test - Pointer to the test structure to initialize
+ *   period       - Expected timer period in nanoseconds
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static void hrtimer_test_init(FAR struct hrtimer_test_s *hrtimer_test,
+                              uint32_t period)
+{
+  hrtimer_test->previous = 0;
+  hrtimer_test->count = 0;
+  hrtimer_test->active = true;
+  hrtimer_test->period = period;
+}
+
+/****************************************************************************
+ * Name: test_hrtimer_callback
+ *
+ * Description:
+ *   HRTimer callback function for test.
+ *
+ *   - Verifies the timer interval is exactly 500ms (nanosecond precision)
+ *   - Stops the test after 15 expirations
+ *   - Re-arms the timer in absolute mode
+ *
+ * Input Parameters:
+ *   hrtimer - Pointer to the expired HRTimer instance
+ *
+ * Returned Value:
+ *   Timer period in nanoseconds (NSEC_PER_50MS)
+ *
+ ****************************************************************************/
+
+static uint32_t test_hrtimer_callback(FAR hrtimer_t *hrtimer)
+{
+  struct timespec ts;
+  uint32_t diff;
+  uint64_t now;
+  int ret;
+
+  FAR struct hrtimer_test_s *test =
+    (FAR struct hrtimer_test_s *)hrtimer;
+
+  /* Increment expiration count */
+
+  test->count++;
+
+  /* Get current system time */
+
+  clock_systime_timespec(&ts);
+  now = clock_time2nsec(&ts);
+
+  /* Skip comparison for first two invocations */
+
+  if (test->count > 2)
+    {
+      /* Verify the timer interval is exactly
+       * 500ms with nsec resolution
+       */
+
+      diff = (uint32_t)(now - test->previous);
+
+      HRTIMER_TEST(NSEC_PER_50MS < diff + HRTIMER_TEST_MARGIN, true);
+      HRTIMER_TEST(NSEC_PER_50MS > diff - HRTIMER_TEST_MARGIN, true);
+    }
+
+  test->previous = now;
+
+  /* Stop the test after 15 expirations */
+
+  if (test->count >= 15)
+    {
+      ret = hrtimer_cancel(hrtimer);
+      HRTIMER_TEST(ret, 0);
+
+      test->active = false;
+    }
+
+  return test->period;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hrtimer_test
+ *
+ * Description:
+ *   Entry point for high-resolution timer functional test.
+ *
+ *   - Initializes a HRTimer
+ *   - Starts it with a 500ms relative timeout
+ *   - Verifies subsequent expirations occur at 500ms intervals
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+void hrtimer_test(void)
+{
+  int ret;
+  struct hrtimer_test_s hrtimer_test;
+
+  /* Initialize test structure */
+
+  hrtimer_test_init(&hrtimer_test, NSEC_PER_50MS);
+
+  /* Initialize the high-resolution timer */
+
+  hrtimer_init(&hrtimer_test.timer,
+               test_hrtimer_callback,
+               NULL);
+
+  /* Start the timer with 500ms relative timeout */
+
+  ret = hrtimer_start(&hrtimer_test.timer,
+                      hrtimer_test.period,
+                      HRTIMER_MODE_REL);
+
+  HRTIMER_TEST(ret, OK);
+
+  /* Wait until the test completes */
+
+  while (hrtimer_test.active)
+    {
+      usleep(USEC_PER_MSEC);
+    }
+}
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index fec7f81c2..30f16da5d 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -304,4 +304,8 @@ int sem_nfreeholders(void);
 void nxevent_test(void);
 #endif
 
+#if defined(CONFIG_SCHED_EVENTS) && defined(CONFIG_BUILD_FLAT)
+void hrtimer_test(void);
+#endif
+
 #endif /* __APPS_TESTING_OSTEST_OSTEST_H */
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 201d52e38..48dc94da7 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -625,6 +625,14 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
+#if defined(CONFIG_HRTIMER) && defined(CONFIG_BUILD_FLAT)
+      /* Verify hrtimer */
+
+      printf("\nuser_main: hrtimer test\n");
+      hrtimer_test();
+      check_test_memory_usage();
+#endif
+
       /* Compare memory usage at time ostest_main started until
        * user_main exits.  These should not be identical, but should
        * be similar enough that we can detect any serious OS memory
@@ -705,7 +713,7 @@ int main(int argc, FAR char **argv)
   stdio_test();
 
 #ifdef SDCC
-  /* I am not yet certain why SDCC does not like the following initilizers.
+  /* I am not yet certain why SDCC does not like the following initializers.
    * It involves some issues with 2- vs 3-byte pointer types.
    */
 

From 837c27d6e3f07c2d1ea1d024a1c7379b7dbee148 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Tue, 14 May 2024 14:56:41 +0800
Subject: [PATCH 034/568] netutils/libwebsockets: add cmake support

add libwebsockets cmake support

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 netutils/libwebsockets/CMakeLists.txt      | 188 +++++++++++++++++++++
 netutils/libwebsockets/libwebsockets.patch |  32 ----
 2 files changed, 188 insertions(+), 32 deletions(-)
 create mode 100644 netutils/libwebsockets/CMakeLists.txt

diff --git a/netutils/libwebsockets/CMakeLists.txt b/netutils/libwebsockets/CMakeLists.txt
new file mode 100644
index 000000000..7977f9311
--- /dev/null
+++ b/netutils/libwebsockets/CMakeLists.txt
@@ -0,0 +1,188 @@
+# ##############################################################################
+# apps/netutils/libwebsockets/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_NETUTILS_LIBWEBSOCKETS)
+
+  # ############################################################################
+  # Config and Fetch MbedTLS lib
+  # ############################################################################
+
+  set(LIBWEBSOCKETS_DIR ${CMAKE_CURRENT_LIST_DIR}/libwebsockets)
+
+  if(NOT EXISTS ${LIBWEBSOCKETS_DIR})
+    set(LIBWEBSOCKETS_URL "https://github.com/warmcat/libwebsockets/archive")
+    FetchContent_Declare(
+      libwebsockets_fetch
+      URL ${LIBWEBSOCKETS_URL}/v${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}.zip
+          SOURCE_DIR ${LIBWEBSOCKETS_DIR} BINARY_DIR
+          ${CMAKE_BINARY_DIR}/apps/netutils/libwebsockets/libwebsockets
+      DOWNLOAD_NO_PROGRESS true
+      TIMEOUT 30)
+
+    FetchContent_GetProperties(libwebsockets_fetch)
+
+    if(NOT libwebsockets_fetch_POPULATED)
+      FetchContent_Populate(libwebsockets_fetch)
+    endif()
+
+    execute_process(
+      COMMAND sh -c "patch -p0 < ${CMAKE_CURRENT_LIST_DIR}/libwebsockets.patch"
+      WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+    message("patching done")
+  endif()
+
+  # ############################################################################
+  # Flags
+  # ############################################################################
+
+  string(REGEX MATCHALL "[0-9]" versions
+               "${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}")
+  list(GET versions 0 VERSION_MAJOR)
+  list(GET versions 1 VERSION_MINOR)
+  list(GET versions 2 VERSION_PATCH)
+  set(FLAGS
+      -DLWS_LIBRARY_VERSION_MAJOR=${VERSION_MAJOR}
+      -DLWS_LIBRARY_VERSION_MINOR=${VERSION_MINOR}
+      -DLWS_LIBRARY_VERSION_PATCH=${VERSION_PATCH}
+      -DLWS_LIBRARY_VERSION_PATCH_ELABORATED=${VERSION_PATCH}-unknown
+      -DLWS_LIBRARY_VERSION="${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}-unknown"
+      -Wno-shadow)
+
+  set(INCDIR
+      .
+      ${LIBWEBSOCKETS_DIR}/lib/core
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix
+      ${LIBWEBSOCKETS_DIR}/lib/event-libs
+      ${LIBWEBSOCKETS_DIR}/lib/system/smd
+      ${LIBWEBSOCKETS_DIR}/lib/system/metrics
+      ${LIBWEBSOCKETS_DIR}/lib/core-net
+      ${LIBWEBSOCKETS_DIR}/lib/roles
+      ${LIBWEBSOCKETS_DIR}/lib/roles/http
+      ${LIBWEBSOCKETS_DIR}/lib/roles/h1
+      ${LIBWEBSOCKETS_DIR}/lib/roles/h2
+      ${LIBWEBSOCKETS_DIR}/lib/roles/ws
+      ${LIBWEBSOCKETS_DIR}/lib/tls
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include/internal)
+
+  set(CSRCS
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-caps.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-misc.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-init.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-file.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-pipe.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-service.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-sockets.c
+      ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-fds.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/alloc.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/buflist.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/context.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/lws_dll2.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/lws_map.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/libwebsockets.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/logs.c
+      ${LIBWEBSOCKETS_DIR}/lib/core/vfs.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/base64-decode.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/cache-ttl/lws-cache-ttl.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/cache-ttl/heap.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/cache-ttl/file.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/dir.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/prng.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/lws-ring.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/lwsac/lwsac.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/lwsac/cached-file.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/lejp.c
+      ${LIBWEBSOCKETS_DIR}/lib/misc/sha-1.c
+      ${LIBWEBSOCKETS_DIR}/lib/system/system.c
+      ${LIBWEBSOCKETS_DIR}/lib/system/smd/smd.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/dummy-callback.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/output.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/close.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/network.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/vhost.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/pollfd.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/service.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/sorted-usec-list.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/wsi.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/wsi-timeout.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/adopt.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/state.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/client.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/connect.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/connect2.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/connect3.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/connect4.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/sort-dns.c
+      ${LIBWEBSOCKETS_DIR}/lib/core-net/client/conmon.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/pipe/ops-pipe.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/http/header.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/http/date.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/http/parsers.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/http/cookie.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/h1/ops-h1.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/h2/http2.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/h2/hpack.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/h2/ops-h2.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/ws/ops-ws.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/ws/client-ws.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/ws/client-parser-ws.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/raw-skt/ops-raw-skt.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/raw-file/ops-raw-file.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/http/client/client-http.c
+      ${LIBWEBSOCKETS_DIR}/lib/event-libs/poll/poll.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/tls.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/tls-network.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/tls-sessions.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/tls-client.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-tls.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-extensions.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-x509.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-ssl.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-session.c
+      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-client.c)
+
+  if(CONFIG_NETUTILS_MQTTC)
+    list(APPEND INCDIR ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt)
+    list(
+      APPEND
+      CSRCS
+      ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt/mqtt.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt/ops-mqtt.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt/primitives.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt/client/client-mqtt.c
+      ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt/client/client-mqtt-handshake.c)
+
+  endif()
+
+  # ############################################################################
+  # Library Configuration
+  # ############################################################################
+
+  set_property(
+    TARGET nuttx
+    APPEND
+    PROPERTY NUTTX_INCLUDE_DIRECTORIES ${LIBWEBSOCKETS_DIR}/include)
+
+  nuttx_add_library(libwebsockets STATIC)
+  target_sources(libwebsockets PRIVATE ${CSRCS})
+  target_compile_options(libwebsockets PRIVATE ${FLAGS})
+  target_include_directories(libwebsockets PRIVATE ${INCDIR})
+
+endif()
diff --git a/netutils/libwebsockets/libwebsockets.patch b/netutils/libwebsockets/libwebsockets.patch
index 3576e8c4e..f2468fa6f 100644
--- a/netutils/libwebsockets/libwebsockets.patch
+++ b/netutils/libwebsockets/libwebsockets.patch
@@ -33,22 +33,6 @@
  	if (!unix_skt && setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const void *)&optval, optlen) < 0)
  		return 1;
  #elif !defined(__APPLE__) && \
-@@ -190,6 +190,7 @@ lws_plat_set_socket_options(struct lws_vhost *vhost, int fd, int unix_skt)
- 	return lws_plat_set_nonblocking(fd);
- }
- 
-+#if !defined(__NuttX__)
- static const int ip_opt_lws_flags[] = {
- 	LCCSCF_IP_LOW_LATENCY, LCCSCF_IP_HIGH_THROUGHPUT,
- 	LCCSCF_IP_HIGH_RELIABILITY
-@@ -210,6 +211,7 @@ static const char *ip_opt_names[] = {
- #endif
- };
- #endif
-+#endif
- 
- int
- lws_plat_set_socket_options_ip(lws_sockfd_type fd, uint8_t pri, int lws_flags)
 @@ -237,7 +239,8 @@ lws_plat_set_socket_options_ip(lws_sockfd_type fd, uint8_t pri, int lws_flags)
        !defined(__sun) && \
        !defined(__HAIKU__) && \
@@ -59,22 +43,6 @@
  
  	/* the BSDs don't have SO_PRIORITY */
  
-@@ -255,6 +258,7 @@ lws_plat_set_socket_options_ip(lws_sockfd_type fd, uint8_t pri, int lws_flags)
- 	}
- #endif
- 
-+#if !defined(__NuttX__)
- 	for (n = 0; n < 4; n++) {
- 		if (!(lws_flags & ip_opt_lws_flags[n]))
- 			continue;
-@@ -272,6 +276,7 @@ lws_plat_set_socket_options_ip(lws_sockfd_type fd, uint8_t pri, int lws_flags)
- 			lwsl_notice("%s: set ip flag %s\n", __func__,
- 				    ip_opt_names[n]);
- 	}
-+#endif
- 
- 	return ret;
- }
  
 --- libwebsockets/lib/roles/ws/client-ws.c
 +++ libwebsockets/lib/roles/ws/client-ws.c

From 4b3070c08148f245f0dc43c31b6583467f04a17b Mon Sep 17 00:00:00 2001
From: meijian <meijian@xiaomi.com>
Date: Sun, 29 Sep 2024 16:26:14 +0800
Subject: [PATCH 035/568] apps/net: add ip conflict check API

Supports checking for IP conflicts on a NIC.

Signed-off-by: meijian <meijian@xiaomi.com>
---
 include/netutils/netlib.h                |   6 ++
 netutils/netlib/CMakeLists.txt           |   6 ++
 netutils/netlib/Makefile                 |   6 ++
 netutils/netlib/netlib_checkifconflict.c | 103 +++++++++++++++++++++++
 4 files changed, 121 insertions(+)
 create mode 100644 netutils/netlib/netlib_checkifconflict.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 469bd0461..9f8f744cd 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -499,6 +499,12 @@ int netlib_getifstatistics(FAR const char *ifname,
                            FAR struct netdev_statistics_s *stat);
 #endif
 
+/* Network check support */
+
+#ifdef CONFIG_NET_ARP_ACD
+int netlib_check_ifconflict(FAR const char *ifname);
+#endif
+
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 66bc927a0..560a71834 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -143,6 +143,12 @@ if(CONFIG_NETUTILS_NETLIB)
     endif()
   endif()
 
+  # Network check support
+
+  if(CONFIG_NET_ARP_ACD)
+    list(APPEND SRCS netlib_checkifconflict.c)
+  endif()
+
   target_sources(apps PRIVATE ${SRCS})
 
 endif()
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index c590970e5..237cc76de 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -142,4 +142,10 @@ CSRCS += netlib_ipmsfilter.c
 endif
 endif
 
+# Network check support
+
+ifeq ($(CONFIG_NET_ARP_ACD),y)
+CSRCS += netlib_checkifconflict.c
+endif
+
 include $(APPDIR)/Application.mk
diff --git a/netutils/netlib/netlib_checkifconflict.c b/netutils/netlib/netlib_checkifconflict.c
new file mode 100644
index 000000000..5aebddd8e
--- /dev/null
+++ b/netutils/netlib/netlib_checkifconflict.c
@@ -0,0 +1,103 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_checkifconflict.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <debug.h>
+
+#include "netutils/netlib.h"
+
+#ifdef CONFIG_NET_ARP_ACD
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Determines the size of an intermediate buffer that must be large enough
+ * to handle the longest line generated by this logic.
+ */
+
+#define PROCFS_LINELEN   80
+#define PROCFS_NET_PATH "/proc/net/"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_check_ifconflict
+ *
+ * Description:
+ *   Check the network driver ip conflict
+ *
+ * Parameters:
+ *   ifname   The name of the interface to use
+ *
+ * Return:
+ *   0 on no conflict; a nagtive on failure; 1 on conflict
+ *
+ ****************************************************************************/
+
+int netlib_check_ifconflict(FAR const char *ifname)
+{
+  int conflict = 0;
+  char path[32];
+  char line[PROCFS_LINELEN];
+  FAR FILE *stream;
+
+  if (ifname == NULL)
+    {
+      fprintf(stderr, "ERROR: ifname is NULL \n");
+      return -EINVAL;
+    }
+
+  snprintf(path, sizeof(path), "%s%s", PROCFS_NET_PATH, ifname);
+  ninfo("get dev statistics from %s \n", path);
+
+  stream = fopen(path, "r");
+  if (stream == NULL)
+    {
+      fprintf(stderr, "ERROR: Failed to open path:%s \n", path);
+      return -errno;
+    }
+
+  while (fgets(line, sizeof(line), stream) != NULL)
+    {
+      if (strstr(line, "conflict!") != NULL)
+        {
+          conflict = 1;
+          break;
+        }
+    }
+
+  fclose(stream);
+  return conflict;
+}
+
+#endif /* CONFIG_NET_ARP_ACD */

From de87836c7a710507948a339bc8949e541bbc505f Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Fri, 4 Jul 2025 11:28:52 +0800
Subject: [PATCH 036/568] netpkt: Add parameters to support specific network
 cards

Supports sending and receiving data packets on specified interfaces.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 examples/netpkt/netpkt_main.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/examples/netpkt/netpkt_main.c b/examples/netpkt/netpkt_main.c
index 5f9aec81f..ab0595be4 100644
--- a/examples/netpkt/netpkt_main.c
+++ b/examples/netpkt/netpkt_main.c
@@ -29,7 +29,10 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <netinet/if_ether.h>
+#include <netinet/in.h>
 #include <netpacket/packet.h>
+#include <net/if.h>
 
 /****************************************************************************
  * Private Functions
@@ -39,11 +42,17 @@
  * Name: psock_create
  ****************************************************************************/
 
-static int psock_create(void)
+static int psock_create(const char *ifname)
 {
   int sd;
   struct sockaddr_ll addr;
   int addrlen = sizeof(addr);
+  unsigned int ifindex = 0;
+
+  if (ifname && ifname[0])
+    {
+      ifindex = if_nametoindex(ifname);
+    }
 
   sd = socket(AF_PACKET, SOCK_RAW, 0);
   if (sd < 0)
@@ -55,7 +64,8 @@ static int psock_create(void)
   /* Prepare sockaddr struct */
 
   addr.sll_family = AF_PACKET;
-  addr.sll_ifindex = 0;
+  addr.sll_ifindex = ifindex;
+  addr.sll_protocol = htons(ETH_P_ALL);
   if (bind(sd, (const struct sockaddr *)&addr, addrlen) < 0)
     {
       perror("ERROR: binding socket failed");
@@ -105,6 +115,7 @@ static void netpkt_usage(void)
   printf(" -r     receive\n");
   printf(" -t     transmit\n");
   printf(" -v     verbose\n");
+  printf(" -i <IF> specify interface name (e.g. eth0)\n");
   printf("\n");
 }
 
@@ -116,7 +127,7 @@ static void netpkt_usage(void)
  * Name: netpkt_main
  ****************************************************************************/
 
-int main(int argc, FAR char *argv[])
+int main(int argc, char *argv[])
 {
   int sd;
   int i;
@@ -140,6 +151,9 @@ int main(int argc, FAR char *argv[])
   int do_rxtimes = 3;
   int do_tx = 0;
   int do_txtimes = 3;
+  char ifname[IFNAMSIZ];
+
+  memset(ifname, 0, sizeof(ifname));
 
   if (argc == 1)
     {
@@ -149,7 +163,7 @@ int main(int argc, FAR char *argv[])
 
   /* Parse arguments */
 
-  while ((opt = getopt(argc, argv, "artv")) != -1)
+  while ((opt = getopt(argc, argv, "artvi:")) != -1)
     {
       switch (opt)
         {
@@ -170,13 +184,17 @@ int main(int argc, FAR char *argv[])
             verbose = 1;
             break;
 
+          case 'i':
+            strlcpy(ifname, optarg, sizeof(ifname));
+            break;
+
           default:
             netpkt_usage();
             return -1;
       }
   }
 
-  sd = psock_create();
+  sd = psock_create(ifname);
 
   if (do_tx)
     {

From 532a055abbe797f6b3078c91f00861f3606379ce Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Wed, 14 May 2025 11:56:45 +0800
Subject: [PATCH 037/568] paho_mqtt: Add mqtt compilation files

It provides the necessary compilation files and configuration management files, and offers a publish demo and a subscribe demo

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 netutils/paho_mqtt/CMakeLists.txt     | 166 ++++++++++++++
 netutils/paho_mqtt/Kconfig            |  37 +++
 netutils/paho_mqtt/Make.defs          |  23 ++
 netutils/paho_mqtt/Makefile           | 111 +++++++++
 netutils/paho_mqtt/paho_mqtt_01.patch | 314 ++++++++++++++++++++++++++
 5 files changed, 651 insertions(+)
 create mode 100644 netutils/paho_mqtt/CMakeLists.txt
 create mode 100644 netutils/paho_mqtt/Kconfig
 create mode 100644 netutils/paho_mqtt/Make.defs
 create mode 100644 netutils/paho_mqtt/Makefile
 create mode 100644 netutils/paho_mqtt/paho_mqtt_01.patch

diff --git a/netutils/paho_mqtt/CMakeLists.txt b/netutils/paho_mqtt/CMakeLists.txt
new file mode 100644
index 000000000..d3360390b
--- /dev/null
+++ b/netutils/paho_mqtt/CMakeLists.txt
@@ -0,0 +1,166 @@
+# ##############################################################################
+# apps/netutils/paho_mqtt/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_LIB_MQTT5)
+
+  # ############################################################################
+  # Config and Fetch Paho MQTT C library
+  # ############################################################################
+
+  set(PAHO_MQTT_DIR ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt)
+
+  if(NOT EXISTS ${PAHO_MQTT_DIR})
+    # Default version if not specified in config
+    if(DEFINED CONFIG_NETUTILS_PAHO_MQTT_VERSION)
+      set(PAHO_MQTT_VERSION ${CONFIG_NETUTILS_PAHO_MQTT_VERSION})
+    else()
+      set(PAHO_MQTT_VERSION "1.3.15")
+    endif()
+
+    set(PAHO_MQTT_URL "https://github.com/eclipse-paho/paho.mqtt.c/archive")
+    FetchContent_Declare(
+      paho_mqtt_fetch
+      URL ${PAHO_MQTT_URL}/v${PAHO_MQTT_VERSION}.zip SOURCE_DIR ${PAHO_MQTT_DIR}
+          BINARY_DIR ${CMAKE_BINARY_DIR}/apps/netutils/paho_mqtt/paho_mqtt
+      DOWNLOAD_NO_PROGRESS true
+      TIMEOUT 30)
+
+    FetchContent_GetProperties(paho_mqtt_fetch)
+
+    if(NOT paho_mqtt_fetch_POPULATED)
+      FetchContent_Populate(paho_mqtt_fetch)
+
+      # GitHub ZIP files extract with a versioned top-level directory Move
+      # contents from paho.mqtt.c-<version> to paho_mqtt if needed
+      file(GLOB extracted_dirs "${PAHO_MQTT_DIR}/paho.mqtt.c-*")
+      if(extracted_dirs)
+        list(GET extracted_dirs 0 extracted_dir)
+        # Move all contents from the versioned directory to paho_mqtt
+        file(GLOB extracted_contents "${extracted_dir}/*")
+        foreach(item ${extracted_contents})
+          get_filename_component(item_name ${item} NAME)
+          execute_process(
+            COMMAND ${CMAKE_COMMAND} -E rename ${item}
+                    ${PAHO_MQTT_DIR}/${item_name}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+        endforeach()
+        # Remove the empty versioned directory
+        execute_process(
+          COMMAND ${CMAKE_COMMAND} -E remove_directory ${extracted_dir}
+          WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+        message("Moved contents from versioned directory to paho_mqtt")
+      endif()
+
+      # Remove downloaded zip file if exists in current directory
+      file(GLOB zip_files "${CMAKE_CURRENT_LIST_DIR}/v${PAHO_MQTT_VERSION}.zip")
+      if(zip_files)
+        file(REMOVE ${zip_files})
+        message("Removed downloaded zip file")
+      endif()
+    endif()
+
+    # Apply paho_mqtt_01 patch if exists
+    if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt_01.patch)
+      execute_process(
+        COMMAND
+          sh -c
+          "patch -p1 --forward --ignore-whitespace < ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt_01.patch || true"
+        WORKING_DIRECTORY ${PAHO_MQTT_DIR})
+      message("paho_mqtt_01 patching done")
+    endif()
+
+    message("paho_mqtt download done")
+  endif()
+
+  configure_file(paho_mqtt/src/VersionInfo.h.in
+                 ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h @ONLY)
+
+  set(MQTT5_INCDIR ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt/src)
+  list(APPEND MQTT5_INCDIR ${CMAKE_CURRENT_BINARY_DIR})
+
+  file(GLOB CSRCS paho_mqtt/src/*.c)
+
+  if(CONFIG_UTILS_MQTT5)
+    list(APPEND CSRCS
+         ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt/src/samples/pubsub_opts.c)
+  endif()
+
+  if(CONFIG_OPENSSL_MBEDTLS_WRAPPER)
+    list(REMOVE_ITEM CSRCS ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt/src/SHA1.c)
+  endif()
+
+  list(REMOVE_ITEM CSRCS ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt/src/MQTTClient.c
+       ${CMAKE_CURRENT_LIST_DIR}/paho_mqtt/src/MQTTVersion.c)
+
+  nuttx_add_library(mqtt5)
+
+  target_sources(mqtt5 PRIVATE ${CSRCS})
+
+  target_include_directories(mqtt5 PRIVATE ${MQTT5_INCDIR})
+
+  target_compile_options(mqtt5 PRIVATE ${MQTT5_FLAGS})
+
+  if(CONFIG_UTILS_MQTT5)
+
+    set(MQTT_PUB_FLAGS
+        -DmessageArrived=mqtt_pub_messageArrived
+        -DonDisconnect=mqtt_pub_onDisconnect
+        -DonConnectFailure5=mqtt_pub_onConnectFailure5
+        -DonConnectFailure=mqtt_pub_onConnectFailure
+        -DonConnect5=mqtt_pub_onConnect5
+        -DonConnect=mqtt_pub_onConnect
+        -Dmysleep=mqtt_pub_mysleep
+        -DtoStop=mqtt_pub_toStop
+        -Dopts=mqtt_pub_opts
+        -Dmyconnect=mqtt_pub_myconnect
+        -Dcfinish=mqtt_pub_cfinish
+        -Dtrace_callback=mqtt_pub_trace_callback)
+
+    nuttx_add_application(
+      NAME
+      mqtt_pub
+      SRCS
+      paho_mqtt/src/samples/paho_c_pub.c
+      DEPENDS
+      mqtt5
+      INCLUDE_DIRECTORIES
+      ${MQTT5_INCDIR}
+      COMPILE_FLAGS
+      ${MQTT_PUB_FLAGS}
+      STACKSIZE
+      ${CONFIG_UTILS_MQTT5_STACKSIZE}
+      PRIORITY
+      ${CONFIG_UTILS_MQTT5_PRIORITY})
+
+    nuttx_add_application(
+      NAME
+      mqtt_sub
+      SRCS
+      paho_mqtt/src/samples/paho_c_sub.c
+      DEPENDS
+      mqtt5
+      INCLUDE_DIRECTORIES
+      ${MQTT5_INCDIR}
+      STACKSIZE
+      ${CONFIG_UTILS_MQTT5_STACKSIZE}
+      PRIORITY
+      ${CONFIG_UTILS_MQTT5_PRIORITY})
+  endif()
+endif()
diff --git a/netutils/paho_mqtt/Kconfig b/netutils/paho_mqtt/Kconfig
new file mode 100644
index 000000000..987fccb76
--- /dev/null
+++ b/netutils/paho_mqtt/Kconfig
@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2020 Xiaomi Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+config LIB_MQTT5
+	bool "Enable mqtt5"
+	default n
+	---help---
+		A library for accessing mqtt5 client services through C libraries calls in a simple manner.
+
+config UTILS_MQTT5
+	tristate "Enable mqtt5 tool"
+	depends on LIB_MQTT5
+	---help---
+		Enable mqtt utility
+
+if UTILS_MQTT5
+config UTILS_MQTT5_PRIORITY
+	int "mqtt utility priority"
+	default 100
+
+config UTILS_MQTT5_STACKSIZE
+	int "mqtt utility statcksize"
+	default 16384
+endif
diff --git a/netutils/paho_mqtt/Make.defs b/netutils/paho_mqtt/Make.defs
new file mode 100644
index 000000000..a91777976
--- /dev/null
+++ b/netutils/paho_mqtt/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/netutils/paho_mqtt/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_LIB_MQTT5),)
+CONFIGURED_APPS += $(APPDIR)/netutils/paho_mqtt
+endif
diff --git a/netutils/paho_mqtt/Makefile b/netutils/paho_mqtt/Makefile
new file mode 100644
index 000000000..21c9d904f
--- /dev/null
+++ b/netutils/paho_mqtt/Makefile
@@ -0,0 +1,111 @@
+############################################################################
+# apps/netutils/paho_mqtt/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PAHO_MQTT_URL     ?= "https://github.com/eclipse-paho/paho.mqtt.c/archive"
+
+# Default version if not specified in config
+ifdef CONFIG_NETUTILS_PAHO_MQTT_VERSION
+PAHO_MQTT_VERSION := $(patsubst "%",%,$(CONFIG_NETUTILS_PAHO_MQTT_VERSION))
+else
+PAHO_MQTT_VERSION := 1.3.15
+endif
+
+PAHO_MQTT_ZIP     = v$(PAHO_MQTT_VERSION).zip
+PAHO_MQTT_UNPACK  = paho_mqtt
+
+SRCDIR = $(APPDIR)/netutils/paho_mqtt/$(PAHO_MQTT_UNPACK)/src
+
+ifeq ($(CONFIG_LIB_MQTT5), y)
+
+# Check if paho_mqtt directory exists, if not download and extract
+ifeq ($(wildcard $(PAHO_MQTT_UNPACK)/src),)
+$(PAHO_MQTT_ZIP):
+	$(Q) echo "Downloading paho.mqtt.c-$(PAHO_MQTT_VERSION)"
+	$(Q) curl -L -o $(PAHO_MQTT_ZIP) $(PAHO_MQTT_URL)/$(PAHO_MQTT_ZIP)
+
+$(PAHO_MQTT_UNPACK): $(PAHO_MQTT_ZIP)
+	$(Q) echo "Unpacking: $(PAHO_MQTT_ZIP) -> $(PAHO_MQTT_UNPACK)"
+	$(Q) unzip -q $(PAHO_MQTT_ZIP)
+	$(Q) mv paho.mqtt.c-$(PAHO_MQTT_VERSION) $(PAHO_MQTT_UNPACK)
+	$(Q) rm -f $(PAHO_MQTT_ZIP)
+	$(Q) if [ -f paho_mqtt_01.patch ]; then \
+		echo "Applying paho_mqtt_01 patch to $(PAHO_MQTT_UNPACK)"; \
+		cd $(PAHO_MQTT_UNPACK) && patch -p1 --forward --ignore-whitespace < ../paho_mqtt_01.patch || true; \
+	fi
+	$(Q) touch $(PAHO_MQTT_UNPACK)
+
+context:: $(PAHO_MQTT_UNPACK)
+
+distclean::
+	$(call DELFILE, $(PAHO_MQTT_ZIP))
+	$(call DELDIR, $(PAHO_MQTT_UNPACK))
+endif
+
+ifeq ($(CONFIG_OPENSSL_MBEDTLS_WRAPPER), y)
+SKIP  = $(SRCDIR)/SHA1.c
+endif
+
+SKIP += $(SRCDIR)/MQTTClient.c
+SKIP += $(SRCDIR)/MQTTVersion.c
+
+CSRCS = $(filter-out $(SKIP), $(wildcard $(SRCDIR)/*.c))
+
+ifeq ($(CONFIG_UTILS_MQTT5),y)
+CSRCS += $(SRCDIR)/samples/pubsub_opts.c
+endif
+
+VARS  = BUILD_TIMESTAMP PROJECT_VERSION PROJECT_VERSION_MAJOR
+VARS += PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH
+
+MQTT5_VERSION = $(SRCDIR)/VersionInfo.h
+
+SED_COMMANDS = $(foreach var,$(VARS),-e 's/@$(var)@/$($(var))/g')
+
+$(MQTT5_VERSION): $(SRCDIR)/VersionInfo.h.in
+	sed $(SED_COMMANDS) $< > $@
+
+context:: $(MQTT5_VERSION)
+
+distclean::
+	$(call DELFILE, $(MQTT5_VERSION))
+
+ifeq ($(CONFIG_UTILS_MQTT5), y)
+PROGNAME  = mqtt_pub mqtt_sub
+MAINSRC   = $(SRCDIR)/samples/paho_c_pub.c $(SRCDIR)/samples/paho_c_sub.c
+PRIORITY  = $(CONFIG_UTILS_MQTT5_PRIORITY)
+STACKSIZE = $(CONFIG_UTILS_MQTT5_STACKSIZE)
+MODULE = $(CONFIG_UTILS_MQTT5)
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -DmessageArrived=mqtt_pub_messageArrived
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -DonDisconnect=mqtt_pub_onDisconnect
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -DonConnectFailure5=mqtt_pub_onConnectFailure5
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -DonConnectFailure=mqtt_pub_onConnectFailure
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -DonConnect5=mqtt_pub_onConnect5
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -DonConnect=mqtt_pub_onConnect
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -Dmysleep=mqtt_pub_mysleep -DtoStop=mqtt_pub_toStop
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -Dopts=mqtt_pub_opts -Dmyconnect=mqtt_pub_myconnect
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -Dcfinish=mqtt_pub_cfinish
+$(SRCDIR)/samples/paho_c_pub.c_CFLAGS += -Dtrace_callback=mqtt_pub_trace_callback
+endif
+
+endif
+
+include $(APPDIR)/Application.mk
diff --git a/netutils/paho_mqtt/paho_mqtt_01.patch b/netutils/paho_mqtt/paho_mqtt_01.patch
new file mode 100644
index 000000000..67a1fccdf
--- /dev/null
+++ b/netutils/paho_mqtt/paho_mqtt_01.patch
@@ -0,0 +1,314 @@
+From 36c02a3935382a32a7fc19d52c9d6ee602dec8d6 Mon Sep 17 00:00:00 2001
+From: zhangshuai39 <zhangshuai39@xiaomi.com>
+Date: Wed, 14 May 2025 11:58:02 +0800
+Subject: [PATCH] paho_mqtt: Fix mqtt compile warning
+
+Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
+---
+ src/MQTTAsync.c          |  2 +-
+ src/MQTTPacket.h         |  2 ++
+ src/SHA1.c               |  2 +-
+ src/Socket.c             | 16 +++++++++++++++-
+ src/Socket.h             |  1 +
+ src/Thread.c             |  1 +
+ src/Thread.h             |  2 +-
+ src/WebSocket.c          |  1 -
+ src/WebSocket.h          |  2 +-
+ src/samples/paho_c_pub.c | 29 ++++++++++++++++++-----------
+ src/samples/paho_c_sub.c |  4 +++-
+ 11 files changed, 45 insertions(+), 18 deletions(-)
+
+diff --git a/src/MQTTAsync.c b/src/MQTTAsync.c
+index c548ae3..2487d69 100644
+--- a/src/MQTTAsync.c
++++ b/src/MQTTAsync.c
+@@ -989,7 +989,7 @@ exit:
+ }
+ 
+ 
+-int MQTTAsync_inCallback()
++int MQTTAsync_inCallback(void)
+ {
+ 	thread_id_type thread_id = Paho_thread_getid();
+ 	return thread_id == sendThread_id || thread_id == receiveThread_id;
+diff --git a/src/MQTTPacket.h b/src/MQTTPacket.h
+index fd384ae..c833d0c 100644
+--- a/src/MQTTPacket.h
++++ b/src/MQTTPacket.h
+@@ -28,7 +28,9 @@
+ #include "LinkedList.h"
+ #include "Clients.h"
+ 
++#ifndef bool
+ typedef unsigned int bool;
++#endif
+ typedef void* (*pf)(int, unsigned char, char*, size_t);
+ 
+ #include "MQTTProperties.h"
+diff --git a/src/SHA1.c b/src/SHA1.c
+index a1b2c3d..e4f5g6h 100644
+--- a/src/SHA1.c
++++ b/src/SHA1.c
+@@ -58,7 +58,7 @@
+ #  include <libkern/OSByteOrder.h>
+ #  define htobe32(x) OSSwapHostToBigInt32(x)
+ #  define be32toh(x) OSSwapBigToHostInt32(x)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__NuttX__)
+ #  include <sys/endian.h>
+ #endif
+ #include <string.h>
+diff --git a/src/Socket.c b/src/Socket.c
+index ff36657..0ea9009 100644
+--- a/src/Socket.c
++++ b/src/Socket.c
+@@ -130,7 +130,7 @@ int Socket_error(char* aString, SOCKET sock)
+ }
+ 
+ #if !defined(_WIN32)
+-void SIGPIPE_ignore()
++void SIGPIPE_ignore(void)
+ {
+ #if defined(PAHO_IGNORE_WITH_SIGNAL)
+ 	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+@@ -182,6 +182,7 @@ void Socket_outInitialize(void)
+ 	mod_s.saved.fds_write = NULL;
+ 	mod_s.saved.fds_read = NULL;
+ 	mod_s.saved.nfds = 0;
++	mod_s.poll_in_progress = 0;
+ #endif
+ 	FUNC_EXIT;
+ }
+@@ -622,17 +623,24 @@ SOCKET Socket_getReadySocket(int more_work, int timeout, mutex_type mutex, int*
+ 		}
+ 
+ 		/* Check pending write set for writeable sockets */
++		mod_s.poll_in_progress = 1;
+ 		rc1 = poll(mod_s.saved.fds_write, mod_s.saved.nfds, 0);
++		mod_s.poll_in_progress = 0;
+ 		if (rc1 > 0 && Socket_continueWrites(&sock, mutex) == SOCKET_ERROR)
+ 		{
+ 			*rc = SOCKET_ERROR;
++			mod_s.poll_in_progress = 0;
+ 			goto exit;
+ 		}
+ 
+ 		/* Prevent performance issue by unlocking the socket_mutex while waiting for a ready socket. */
++
+ 		Paho_thread_unlock_mutex(mutex);
++		mod_s.poll_in_progress = 1;
+ 		*rc = poll(mod_s.saved.fds_read, mod_s.saved.nfds, timeout_ms);
++		mod_s.poll_in_progress = 0;
+ 		Paho_thread_lock_mutex(mutex);
++
+ 		if (*rc == SOCKET_ERROR)
+ 		{
+ 			Socket_error("poll", 0);
+@@ -1029,6 +1037,12 @@ int Socket_close(SOCKET socket)
+ 	int rc = 0;
+ 
+ 	FUNC_ENTRY;
++
++	/* Waiting for poll to end */
++	while (mod_s.poll_in_progress) {
++		usleep(1000); // 1ms
++	}
++
+ 	Paho_thread_lock_mutex(socket_mutex);
+ 	Socket_close_only(socket);
+ 	Socket_abortWrite(socket);
+diff --git a/src/Socket.h b/src/Socket.h
+index 6e52ab8..8afbdb6 100644
+--- a/src/Socket.h
++++ b/src/Socket.h
+@@ -125,6 +125,7 @@ typedef struct
+ 	unsigned int nfds;         /**< no of file descriptors for poll */
+ 	struct pollfd* fds_read;        /**< poll read file descriptors */
+ 	struct pollfd* fds_write;
++	volatile int poll_in_progress; /**< Indicates poll operation is in progress (poll branch only) */
+ 
+ 	struct {
+ 		int cur_fd;            /**< index into the fds_saved array */
+diff --git a/src/Thread.c b/src/Thread.c
+index f4d43fb..52f810a 100644
+--- a/src/Thread.c
++++ b/src/Thread.c
+@@ -72,6 +72,7 @@ void Paho_thread_start(thread_fn fn, void* parameter)
+ #else
+ 	pthread_attr_init(&attr);
+ 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++	pthread_attr_setstacksize(&attr, CONFIG_UTILS_MQTT5_STACKSIZE);
+ 	if (pthread_create(&thread, &attr, fn, parameter) != 0)
+ 		thread = 0;
+ 	pthread_attr_destroy(&attr);
+diff --git a/src/Thread.h b/src/Thread.h
+index b0c823b..72dbc43 100644
+--- a/src/Thread.h
++++ b/src/Thread.h
+@@ -76,7 +76,7 @@ LIBMQTT_API int Paho_thread_lock_mutex(mutex_type);
+ LIBMQTT_API int Paho_thread_unlock_mutex(mutex_type);
+ int Paho_thread_destroy_mutex(mutex_type);
+ 
+-LIBMQTT_API thread_id_type Paho_thread_getid();
++LIBMQTT_API thread_id_type Paho_thread_getid(void);
+ 
+ sem_type Thread_create_sem(int*);
+ int Thread_wait_sem(sem_type sem, int timeout);
+diff --git a/src/WebSocket.c b/src/WebSocket.c
+index 4338898..f941cda 100644
+--- a/src/WebSocket.c
++++ b/src/WebSocket.c
+@@ -1136,7 +1136,6 @@ int WebSocket_receiveFrame(networkHandles *net, size_t *actual_len)
+ 
+ 				if ( has_mask )
+ 				{
+-					uint8_t mask[4];
+ 					b = WebSocket_getRawSocketData(net, 4u, &len, &rcs);
+ 					if (rcs == SOCKET_ERROR)
+ 					{
+diff --git a/src/WebSocket.h b/src/WebSocket.h
+index 4e437d4..5343e6f 100644
+--- a/src/WebSocket.h
++++ b/src/WebSocket.h
+@@ -60,7 +60,7 @@ int WebSocket_connect(networkHandles *net, int ssl, const char *uri);
+ /* obtain data from network socket */
+ int WebSocket_getch(networkHandles *net, char* c);
+ char *WebSocket_getdata(networkHandles *net, size_t bytes, size_t* actual_len);
+-size_t WebSocket_framePos();
++size_t WebSocket_framePos(void);
+ void WebSocket_framePosSeekTo(size_t);
+ 
+ /* send data out, in websocket format only if required */
+diff --git a/src/samples/paho_c_pub.c b/src/samples/paho_c_pub.c
+index e891ef8..49392d8 100644
+--- a/src/samples/paho_c_pub.c
++++ b/src/samples/paho_c_pub.c
+@@ -101,16 +101,12 @@ void onConnectFailure5(void* context, MQTTAsync_failureData5* response)
+ 		MQTTAsync_strerror(response->code),
+ 		MQTTReasonCode_toString(response->reasonCode));
+ 	connected = -1;
+-
+-	MQTTAsync client = (MQTTAsync)context;
+ }
+ 
+ void onConnectFailure(void* context, MQTTAsync_failureData* response)
+ {
+ 	fprintf(stderr, "Connect failed, rc %s\n", response ? MQTTAsync_strerror(response->code) : "none");
+ 	connected = -1;
+-
+-	MQTTAsync client = (MQTTAsync)context;
+ }
+ 
+ 
+@@ -140,6 +136,12 @@ void onConnect5(void* context, MQTTAsync_successData5* response)
+ 		}
+ 	}
+ 
++	if (rc != 0)
++		{
++			fprintf(stderr, "Publish failed with code %d\n", rc);
++			toStop = 1;
++		}
++
+ 	connected = 1;
+ }
+ 
+@@ -169,6 +171,12 @@ void onConnect(void* context, MQTTAsync_successData* response)
+ 		}
+ 	}
+ 
++	if (rc != 0)
++		{
++			fprintf(stderr, "Publish failed with code %d\n", rc);
++			toStop = 1;
++		}
++
+ 	connected = 1;
+ }
+ 
+@@ -219,7 +227,6 @@ void onPublish(void* context, MQTTAsync_successData* response)
+ 
+ static int onSSLError(const char *str, size_t len, void *context)
+ {
+-	MQTTAsync client = (MQTTAsync)context;
+ 	return fprintf(stderr, "SSL error: %s\n", str);
+ }
+ 
+@@ -234,11 +241,11 @@ static unsigned int onPSKAuth(const char* hint,
+ 	int k, n;
+ 
+ 	int rc = 0;
+-	struct pubsub_opts* opts = context;
++	struct pubsub_opts* local_opts = context;
+ 
+ 	/* printf("Trying TLS-PSK auth with hint: %s\n", hint);*/
+ 
+-	if (opts->psk == NULL || opts->psk_identity == NULL)
++	if (local_opts->psk == NULL || local_opts->psk_identity == NULL)
+ 	{
+ 		/* printf("No PSK entered\n"); */
+ 		goto exit;
+@@ -246,7 +253,7 @@ static unsigned int onPSKAuth(const char* hint,
+ 
+ 	/* psk should be array of bytes. This is a quick and dirty way to
+ 	 * convert hex to bytes without input validation */
+-	psk_len = (int)strlen(opts->psk) / 2;
++	psk_len = (int)strlen(local_opts->psk) / 2;
+ 	if (psk_len > max_psk_len)
+ 	{
+ 		fprintf(stderr, "PSK too long\n");
+@@ -254,11 +261,11 @@ static unsigned int onPSKAuth(const char* hint,
+ 	}
+ 	for (k=0, n=0; k < psk_len; k++, n += 2)
+ 	{
+-		sscanf(&opts->psk[n], "%2hhx", &psk[k]);
++		sscanf(&local_opts->psk[n], "%2hhx", &psk[k]);
+ 	}
+ 
+ 	/* identity should be NULL terminated string */
+-	strncpy(identity, opts->psk_identity, max_identity_len);
++	strncpy(identity, local_opts->psk_identity, max_identity_len);
+ 	if (identity[max_identity_len - 1] != '\0')
+ 	{
+ 		fprintf(stderr, "Identity too long\n");
+@@ -372,7 +379,6 @@ int main(int argc, char** argv)
+ 	char* url = NULL;
+ 	int url_allocated = 0;
+ 	int rc = 0;
+-	const char* version = NULL;
+ 	const char* program_name = "paho_c_pub";
+ 	MQTTAsync_nameValue* infos = MQTTAsync_getVersionInfo();
+ #if !defined(_WIN32)
+@@ -506,6 +512,7 @@ int main(int argc, char** argv)
+ 	while (!disconnected)
+ 		mysleep(100);
+ 
++	toStop = 0;
+ 	MQTTAsync_destroy(&client);
+ 
+ 	if (url_allocated)
+diff --git a/src/samples/paho_c_sub.c b/src/samples/paho_c_sub.c
+index 85875c9..1fe18ce 100644
+--- a/src/samples/paho_c_sub.c
++++ b/src/samples/paho_c_sub.c
+@@ -207,7 +207,6 @@ int main(int argc, char** argv)
+ 	MQTTAsync_SSLOptions ssl_opts = MQTTAsync_SSLOptions_initializer;
+ 	int rc = 0;
+ 	char* url = NULL;
+-	const char* version = NULL;
+ 	const char* program_name = "paho_c_sub";
+ 	MQTTAsync_nameValue* infos = MQTTAsync_getVersionInfo();
+ #if !defined(_WIN32)
+@@ -343,6 +342,9 @@ int main(int argc, char** argv)
+ 		mysleep(100);
+ 
+ exit:
++	finished = 0;
++	subscribed = 0;
++	disconnected = 0;
+ 	MQTTAsync_destroy(&client);
+ 
+ 	return EXIT_SUCCESS;
+-- 
+2.34.1
+

From 5d3b2d07d61be260b7cbc7dc26d407c591ba4613 Mon Sep 17 00:00:00 2001
From: meijian <meijian@xiaomi.com>
Date: Fri, 14 Mar 2025 17:23:30 +0800
Subject: [PATCH 038/568] ping: add -I for bind device

Add -I option to specify the network device to use for sending ICMP
echo requests. This allows users to explicitly bind ping to a
specific network interface, which is particularly useful in
multi-homed systems with multiple network interfaces.

Signed-off-by: meijian <meijian@xiaomi.com>
---
 include/netutils/icmp_ping.h   |  4 ++++
 include/netutils/icmpv6_ping.h |  4 ++++
 netutils/ping/icmp_ping.c      | 14 ++++++++++++++
 netutils/ping/icmpv6_ping.c    | 14 ++++++++++++++
 system/ping/ping.c             | 17 ++++++++++++++++-
 system/ping6/ping6.c           | 17 ++++++++++++++++-
 6 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/include/netutils/icmp_ping.h b/include/netutils/icmp_ping.h
index eec500de9..3f8d6c29d 100644
--- a/include/netutils/icmp_ping.h
+++ b/include/netutils/icmp_ping.h
@@ -50,6 +50,7 @@
 #define ICMP_E_POLL        -11 /* extra: error code    */
 #define ICMP_E_RECVFROM    -13 /* extra: error code    */
 #define ICMP_E_RECVSMALL   -15 /* extra: recv bytes    */
+#define ICMP_E_BINDDEV     -17 /* extra: error bind    */
 
 /* Negative even number represent warning(recoverable) */
 
@@ -70,6 +71,9 @@ struct ping_result_s;
 struct ping_info_s
 {
   FAR const char *hostname; /* Host name to ping */
+#ifdef CONFIG_NET_BINDTODEVICE
+  FAR const char *devname;  /* Device name to bind */
+#endif
   uint16_t count;           /* Number of pings requested */
   uint16_t datalen;         /* Number of bytes to be sent */
   uint16_t delay;           /* Deciseconds to delay between pings */
diff --git a/include/netutils/icmpv6_ping.h b/include/netutils/icmpv6_ping.h
index 3f793f741..33db0fc6f 100644
--- a/include/netutils/icmpv6_ping.h
+++ b/include/netutils/icmpv6_ping.h
@@ -50,6 +50,7 @@
 #define ICMPv6_E_POLL        -11 /* extra: error code    */
 #define ICMPv6_E_RECVFROM    -13 /* extra: error code    */
 #define ICMPv6_E_RECVSMALL   -15 /* extra: recv bytes    */
+#define ICMPV6_E_BINDDEV     -17 /* extra: error bind    */
 
 /* Negative even number represent warning(recoverable) */
 
@@ -70,6 +71,9 @@ struct ping6_result_s;
 struct ping6_info_s
 {
   FAR const char *hostname; /* Host name to ping */
+#ifdef CONFIG_NET_BINDTODEVICE
+  FAR const char *devname;  /* Device name to bind */
+#endif
   uint16_t count;           /* Number of pings requested */
   uint16_t datalen;         /* Number of bytes to be sent */
   uint16_t delay;           /* Deciseconds to delay between pings */
diff --git a/netutils/ping/icmp_ping.c b/netutils/ping/icmp_ping.c
index efbc8a61a..7aa1d3973 100644
--- a/netutils/ping/icmp_ping.c
+++ b/netutils/ping/icmp_ping.c
@@ -232,6 +232,20 @@ void icmp_ping(FAR const struct ping_info_s *info)
       return;
     }
 
+#ifdef CONFIG_NET_BINDTODEVICE
+  if (info->devname)
+    {
+      ret = setsockopt(priv->sockfd, SOL_SOCKET, SO_BINDTODEVICE,
+                       info->devname, strlen(info->devname));
+      if (ret < 0)
+        {
+          icmp_callback(&result, ICMP_E_BINDDEV, errno);
+          free(priv);
+          return;
+        }
+    }
+#endif
+
   priv->kickoff = clock();
 
   memset(&priv->destaddr, 0, sizeof(struct sockaddr_in));
diff --git a/netutils/ping/icmpv6_ping.c b/netutils/ping/icmpv6_ping.c
index 74cd59ee9..e6a93fc98 100644
--- a/netutils/ping/icmpv6_ping.c
+++ b/netutils/ping/icmpv6_ping.c
@@ -218,6 +218,20 @@ void icmp6_ping(FAR const struct ping6_info_s *info)
       return;
     }
 
+#ifdef CONFIG_NET_BINDTODEVICE
+  if (info->devname)
+    {
+      ret = setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE,
+                       info->devname, strlen(info->devname));
+      if (ret < 0)
+        {
+          icmp6_callback(&result, ICMPV6_E_BINDDEV, errno);
+          free(iobuffer);
+          return;
+        }
+    }
+#endif
+
   kickoff = clock();
 
   memset(&destaddr, 0, sizeof(struct sockaddr_in6));
diff --git a/system/ping/ping.c b/system/ping/ping.c
index 804522112..1abee622a 100644
--- a/system/ping/ping.c
+++ b/system/ping/ping.c
@@ -100,6 +100,7 @@ static void show_usage(FAR const char *progname, int exitcode)
   printf("  -s <size> specifies the number of data bytes to be sent.  "
          "Default %u.\n",
          ICMP_PING_DATALEN);
+  printf("  -I <interface> is the bind device for traffic\n");
   printf("  -h shows this text and exits.\n");
   exit(exitcode);
 }
@@ -172,6 +173,12 @@ static void ping_result(FAR const struct ping_result_s *result)
         fprintf(stderr, "ERROR: short ICMP packet: %ld\n", result->extra);
         break;
 
+#ifdef CONFIG_NET_BINDTODEVICE
+      case ICMP_E_BINDDEV:
+        fprintf(stderr, "ERROR: setsockopt error: %ld\n", result->extra);
+        break;
+#endif
+
       case ICMP_W_IDDIFF:
         fprintf(stderr,
                 "WARNING: Ignoring ICMP reply with ID %ld.  "
@@ -300,7 +307,7 @@ int main(int argc, FAR char *argv[])
 
   exitcode = EXIT_FAILURE;
 
-  while ((option = getopt(argc, argv, ":c:i:W:s:h")) != ERROR)
+  while ((option = getopt(argc, argv, ":c:i:W:s:I:h")) != ERROR)
     {
       switch (option)
         {
@@ -360,6 +367,14 @@ int main(int argc, FAR char *argv[])
             }
             break;
 
+          case 'I':
+#ifdef CONFIG_NET_BINDTODEVICE
+            info.devname = optarg;
+#else
+            fprintf(stderr, "ERROR: Bind to device not supported\n");
+#endif
+            break;
+
           case 'h':
             exitcode = EXIT_SUCCESS;
             goto errout_with_usage;
diff --git a/system/ping6/ping6.c b/system/ping6/ping6.c
index 5d18637b8..409f3db0e 100644
--- a/system/ping6/ping6.c
+++ b/system/ping6/ping6.c
@@ -100,6 +100,7 @@ static void show_usage(FAR const char *progname, int exitcode)
   printf("  -s <size> specifies the number of data bytes to be sent. "
          " Default %u.\n",
          ICMPv6_PING6_DATALEN);
+  printf("  -I <interface> is the bind device for traffic\n");
   printf("  -h shows this text and exits.\n");
   exit(exitcode);
 }
@@ -176,6 +177,12 @@ static void ping6_result(FAR const struct ping6_result_s *result)
                 result->extra, result->id);
         break;
 
+#ifdef CONFIG_NET_BINDTODEVICE
+      case ICMPV6_E_BINDDEV:
+        fprintf(stderr, "ERROR: setsockopt error: %ld\n", result->extra);
+        break;
+#endif
+
       case ICMPv6_W_SEQNOBIG:
         fprintf(stderr,
                 "WARNING: Ignoring ICMP reply to sequence %ld.  "
@@ -295,7 +302,7 @@ int main(int argc, FAR char *argv[])
 
   exitcode = EXIT_FAILURE;
 
-  while ((option = getopt(argc, argv, ":c:i:W:s:h")) != ERROR)
+  while ((option = getopt(argc, argv, ":c:i:W:s:I:h")) != ERROR)
     {
       switch (option)
         {
@@ -355,6 +362,14 @@ int main(int argc, FAR char *argv[])
             }
             break;
 
+            case 'I':
+#ifdef CONFIG_NET_BINDTODEVICE
+            info.devname = optarg;
+#else
+            fprintf(stderr, "ERROR: Bind to device not supported\n");
+#endif
+            break;
+
           case 'h':
             exitcode = EXIT_SUCCESS;
             goto errout_with_usage;

From f89773cbc8ed658461223c923b7fdc1c99c18d00 Mon Sep 17 00:00:00 2001
From: wangchen <wangchen41@xiaomi.com>
Date: Tue, 25 Mar 2025 10:28:05 +0800
Subject: [PATCH 039/568] ping: Initialize info.devname to NULL

Initialize info.devname to NULL to solve the problem of the SO-BINDTODEVICE property being set incorrectly in the icmp_ping function

Signed-off-by: wangchen <wangchen41@xiaomi.com>
---
 system/ping/ping.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/ping/ping.c b/system/ping/ping.c
index 1abee622a..f294983a1 100644
--- a/system/ping/ping.c
+++ b/system/ping/ping.c
@@ -296,6 +296,9 @@ int main(int argc, FAR char *argv[])
   info.delay     = ICMP_POLL_DELAY;
   info.timeout   = ICMP_POLL_DELAY;
   info.callback  = ping_result;
+#ifdef CONFIG_NET_BINDTODEVICE
+  info.devname   = NULL;
+#endif
   info.priv      = &priv;
   priv.code      = ICMP_I_OK;
   priv.tmin      = LONG_MAX;

From b56795e1e25dad8426202ad916c68220df7ca24e Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Wed, 24 Sep 2025 23:44:33 +0800
Subject: [PATCH 040/568] net/ping: utils ping should depends on ipv4

utils ping should depends on ipv4

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 system/ping/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/ping/Kconfig b/system/ping/Kconfig
index 7559ac2e9..7500f1024 100644
--- a/system/ping/Kconfig
+++ b/system/ping/Kconfig
@@ -6,6 +6,7 @@
 config SYSTEM_PING
 	tristate "ICMP 'ping' command"
 	default n
+	depends on NET_IPv4
 	select NETUTILS_PING
 	---help---
 		Enable support for the ICMP 'ping' command.

From 74c71145da7eacbcc5edad378171e95f008e5c4a Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Tue, 20 May 2025 00:44:52 +0800
Subject: [PATCH 041/568] net/ethernet: ARP can be configured on interface

ARP can be configured on interface

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 include/netutils/netlib.h            |   2 +
 netutils/netlib/netlib_setifstatus.c | 114 ++++++++++++++++++++++++++-
 nshlib/nsh_netcmds.c                 |  37 +++++++++
 3 files changed, 149 insertions(+), 4 deletions(-)

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 9f8f744cd..07a66906c 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -477,6 +477,8 @@ void netlib_server(uint16_t portno, pthread_startroutine_t handler,
 int netlib_getifstatus(FAR const char *ifname, FAR uint8_t *flags);
 int netlib_ifup(FAR const char *ifname);
 int netlib_ifdown(FAR const char *ifname);
+int netlib_ifarp(const char *ifname);
+int netlib_ifnoarp(const char *ifname);
 
 /* DNS server addressing */
 
diff --git a/netutils/netlib/netlib_setifstatus.c b/netutils/netlib/netlib_setifstatus.c
index 8a3f58db1..d2f56dd8b 100644
--- a/netutils/netlib/netlib_setifstatus.c
+++ b/netutils/netlib/netlib_setifstatus.c
@@ -74,12 +74,16 @@ int netlib_ifup(const char *ifname)
           /* Put the driver name into the request */
 
           strlcpy(req.ifr_name, ifname, IFNAMSIZ);
+          ret = ioctl(sockfd, SIOCGIFFLAGS, (unsigned long)&req);
+          if (ret >= 0)
+            {
+              /* Perform the ioctl to ifup flag */
 
-          /* Perform the ioctl to ifup flag */
+              IFF_SET_UP(req.ifr_flags);
 
-          req.ifr_flags |= IFF_UP;
+              ret = ioctl(sockfd, SIOCSIFFLAGS, (unsigned long)&req);
+            }
 
-          ret = ioctl(sockfd, SIOCSIFFLAGS, (unsigned long)&req);
           close(sockfd);
         }
     }
@@ -108,6 +112,53 @@ int netlib_ifdown(const char *ifname)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
+      int sockfd = socket(NET_SOCK_FAMILY, NET_SOCK_TYPE, NET_SOCK_PROTOCOL);
+      if (sockfd >= 0)
+        {
+          struct ifreq req;
+          memset(&req, 0, sizeof(struct ifreq));
+
+          /* Put the driver name into the request */
+
+          strlcpy(req.ifr_name, ifname, IFNAMSIZ);
+          ret = ioctl(sockfd, SIOCGIFFLAGS, (unsigned long)&req);
+          if (ret >= 0)
+            {
+              /* Perform the ioctl to ifdown flag */
+
+              IFF_CLR_UP(req.ifr_flags);
+
+              ret = ioctl(sockfd, SIOCSIFFLAGS, (unsigned long)&req);
+            }
+
+          close(sockfd);
+        }
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: netlib_ifarp
+ *
+ * Description:
+ *   Enable ARP learning capability on the interface
+ *
+ * Parameters:
+ *   ifname   The name of the interface to use
+ *
+ * Return:
+ *   0 on success; -1 on failure
+ *
+ ****************************************************************************/
+
+int netlib_ifarp(const char *ifname)
+{
+  int ret = ERROR;
+  if (ifname)
+    {
+      /* Get a socket (only so that we get access to the INET subsystem) */
+
       int sockfd = socket(NET_SOCK_FAMILY, NET_SOCK_TYPE, NET_SOCK_PROTOCOL);
       if (sockfd >= 0)
         {
@@ -120,7 +171,62 @@ int netlib_ifdown(const char *ifname)
 
           /* Perform the ioctl to ifup flag */
 
-          ret = ioctl(sockfd, SIOCSIFFLAGS, (unsigned long)&req);
+          ret = ioctl(sockfd, SIOCGIFFLAGS, (unsigned long)&req);
+          if (ret >= 0)
+            {
+              IFF_CLR_NOARP(req.ifr_flags);
+
+              ret = ioctl(sockfd, SIOCSIFFLAGS, (unsigned long)&req);
+            }
+
+          close(sockfd);
+        }
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: netlib_ifnoarp
+ *
+ * Description:
+ *   Disable ARP learning capability on the interface
+ *
+ * Parameters:
+ *   ifname   The name of the interface to use
+ *
+ * Return:
+ *   0 on success; -1 on failure
+ *
+ ****************************************************************************/
+
+int netlib_ifnoarp(const char *ifname)
+{
+  int ret = ERROR;
+  if (ifname)
+    {
+      /* Get a socket (only so that we get access to the INET subsystem) */
+
+      int sockfd = socket(NET_SOCK_FAMILY, NET_SOCK_TYPE, NET_SOCK_PROTOCOL);
+      if (sockfd >= 0)
+        {
+          struct ifreq req;
+          memset(&req, 0, sizeof(struct ifreq));
+
+          /* Put the driver name into the request */
+
+          strlcpy(req.ifr_name, ifname, IFNAMSIZ);
+
+          /* Perform the ioctl to ifup flag */
+
+          ret = ioctl(sockfd, SIOCGIFFLAGS, (unsigned long)&req);
+          if (ret >= 0)
+            {
+              IFF_SET_NOARP(req.ifr_flags);
+
+              ret = ioctl(sockfd, SIOCSIFFLAGS, (unsigned long)&req);
+            }
+
           close(sockfd);
         }
     }
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 791e1c922..1b2c8efd7 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -142,6 +142,15 @@ struct tftpc_args_s
 };
 #endif
 
+#ifdef CONFIG_NET_ARP
+typedef enum
+{
+  ARP_DEFAULT,               /* Did not set arp configure in the command */
+  ARP_ENABLE,                /* Clean the NOARP flag for the interface to enable the arp learning function */
+  ARP_DISABLE                /* Set the NOARP flag for the interface to disable the arp learning function */
+} arp_cfg_e;
+#endif
+
 typedef int (*nsh_netdev_callback_t)(FAR struct nsh_vtbl_s *vtbl,
                                      FAR char *devname);
 
@@ -575,6 +584,9 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 #endif
   bool missingarg = true;
   bool badarg = false;
+#ifdef CONFIG_NET_ARP
+  arp_cfg_e arpflag = ARP_DEFAULT;
+#endif
 #ifdef HAVE_HWADDR
   mac_addr_t macaddr;
 #endif
@@ -742,6 +754,20 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
                       badarg = true;
                     }
                 }
+#ifdef CONFIG_NET_ARP
+              else if (!strcmp(tmp, "arp"))
+                {
+                  /* Enable arp function on interface */
+
+                  arpflag = ARP_ENABLE;
+                }
+              else if (!strcmp(tmp, "-arp"))
+                {
+                  /* Disable arp function on interface */
+
+                  arpflag = ARP_DISABLE;
+                }
+#endif
               else if (hostip == NULL && i <= 4)
                 {
                   /* Let first non-option be host ip, to support inet/inet6
@@ -1044,6 +1070,17 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
     }
 #endif
 
+#ifdef CONFIG_NET_ARP
+  if (arpflag == ARP_ENABLE)
+    {
+      netlib_ifarp(ifname);
+    }
+  else if (arpflag == ARP_DISABLE)
+    {
+      netlib_ifnoarp(ifname);
+    }
+#endif
+
 #if !defined(CONFIG_NET_IPv4) && !defined(CONFIG_NET_IPv6)
   UNUSED(hostip);
   UNUSED(mask);

From de6aac8afbfd4436d74e026961b60e191f66156b Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Thu, 21 Aug 2025 10:07:24 +0800
Subject: [PATCH 042/568] net/wireless: fix compile warning

fix tasking compile warning isssue
warnning log: unused variable "IEEE802154_STATUS_STRING"

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 wireless/ieee802154/i8sak/i8sak_assoc.c | 2 +-
 wireless/ieee802154/i8sak/i8sak_poll.c  | 2 +-
 wireless/ieee802154/i8sak/i8sak_scan.c  | 2 +-
 wireless/ieee802154/i8sak/i8sak_tx.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wireless/ieee802154/i8sak/i8sak_assoc.c b/wireless/ieee802154/i8sak/i8sak_assoc.c
index 52894c0ec..96d65986a 100644
--- a/wireless/ieee802154/i8sak/i8sak_assoc.c
+++ b/wireless/ieee802154/i8sak/i8sak_assoc.c
@@ -321,7 +321,7 @@ static void assoc_eventcb(FAR struct ieee802154_primitive_s *primitive,
   else
     {
       printf("i8sak: ASSOC.request failed: %s\n",
-             IEEE802154_STATUS_STRING[primitive->u.assocconf.status]);
+             g_ieee802154_status_string[primitive->u.assocconf.status]);
       i8sak->result = -EAGAIN;
     }
 
diff --git a/wireless/ieee802154/i8sak/i8sak_poll.c b/wireless/ieee802154/i8sak/i8sak_poll.c
index 014c9daed..c349708f0 100644
--- a/wireless/ieee802154/i8sak/i8sak_poll.c
+++ b/wireless/ieee802154/i8sak/i8sak_poll.c
@@ -176,7 +176,7 @@ static void poll_eventcb(FAR struct ieee802154_primitive_s *primitive,
   else
     {
       printf("i8sak: POLL.request failed: %s\n",
-             IEEE802154_STATUS_STRING[primitive->u.pollconf.status]);
+             g_ieee802154_status_string[primitive->u.pollconf.status]);
     }
 
   sem_post(&i8sak->sigsem);
diff --git a/wireless/ieee802154/i8sak/i8sak_scan.c b/wireless/ieee802154/i8sak/i8sak_scan.c
index 2ed1bb645..ab2093a30 100644
--- a/wireless/ieee802154/i8sak/i8sak_scan.c
+++ b/wireless/ieee802154/i8sak/i8sak_scan.c
@@ -200,7 +200,7 @@ static void scan_eventcb(FAR struct ieee802154_primitive_s *primitive,
   int i;
 
   printf("\n\ni8sak: Scan complete: %s\n",
-         IEEE802154_STATUS_STRING[scan->status]);
+         g_ieee802154_status_string[scan->status]);
 
   printf("Scan type: ");
 
diff --git a/wireless/ieee802154/i8sak/i8sak_tx.c b/wireless/ieee802154/i8sak/i8sak_tx.c
index fe0661426..e0f2c1951 100644
--- a/wireless/ieee802154/i8sak/i8sak_tx.c
+++ b/wireless/ieee802154/i8sak/i8sak_tx.c
@@ -278,7 +278,7 @@ static void tx_eventcb(FAR struct ieee802154_primitive_s *primitive,
   else
     {
       printf("i8sak: frame failed to send: %s\n",
-             IEEE802154_STATUS_STRING[primitive->u.dataconf.status]);
+             g_ieee802154_status_string[primitive->u.dataconf.status]);
     }
 
   sem_post(&i8sak->sigsem);

From 9dc6781bf9c72ba7cd6d7e9a701e268e72c009d3 Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Mon, 25 Aug 2025 21:34:29 +0800
Subject: [PATCH 043/568] net/wireless: dup g_ieee802154_status_string from
 kernel

dup g_ieee802154_status_string from kernel to fix cmopil issue

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 wireless/ieee802154/i8sak/i8sak_main.c | 34 ++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/wireless/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c
index 1d48777a7..a085e731b 100644
--- a/wireless/ieee802154/i8sak/i8sak_main.c
+++ b/wireless/ieee802154/i8sak/i8sak_main.c
@@ -122,6 +122,40 @@ static int i8sak_daemon(int argc, FAR char *argv[]);
 static int i8sak_showusage(FAR const char *progname, int exitcode);
 static void i8sak_switch_instance(FAR char *ifname);
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
+FAR const char *g_ieee802154_status_string[] =
+{
+  "Success",
+  "Out of capacity",
+  "Denied",
+  "Failure",
+  "Beacon loss",
+  "Channel access failure",
+  "Disable TRX failure",
+  "Failed security check",
+  "Frame too long",
+  "Invalid GTS",
+  "Invalid handle",
+  "Invalid parameter",
+  "No ack",
+  "No beacon",
+  "No data",
+  "No short address",
+  "PAN ID conflict",
+  "Realignment",
+  "Transaction expired",
+  "Transaction overflow",
+  "Tx active",
+  "Unavailable key",
+  "Unsupported attribute",
+  "Limit reached",
+};
+#endif
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

From 9f035ea0be38402f0d6e0b7804f8430ca9b2d6ed Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Fri, 26 Sep 2025 10:14:34 +0800
Subject: [PATCH 044/568] qnet/wireless: fix compile warning of i8sak

fix tasking compile warning isssue
warnning log:  undefined reference to 'g_ieee802154_status_string'

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 wireless/ieee802154/i8sak/i8sak_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wireless/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c
index a085e731b..887be1b13 100644
--- a/wireless/ieee802154/i8sak/i8sak_main.c
+++ b/wireless/ieee802154/i8sak/i8sak_main.c
@@ -126,7 +126,8 @@ static void i8sak_switch_instance(FAR char *ifname);
  * Public Data
  ****************************************************************************/
 
-#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
+#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL) || \
+    !defined(CONFIG_IEEE802154_MAC)
 FAR const char *g_ieee802154_status_string[] =
 {
   "Success",

From 09ddb06c9d344c93705322b2e4ca4bc304f38293 Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Thu, 10 Apr 2025 19:43:32 +0800
Subject: [PATCH 045/568] dhcpd: Align makefile implementation

Improve the CMakeLists.txt to achieve the same compilation results as Makefile.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 examples/dhcpd/CMakeLists.txt | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/examples/dhcpd/CMakeLists.txt b/examples/dhcpd/CMakeLists.txt
index 0305ab59c..b59cb5485 100644
--- a/examples/dhcpd/CMakeLists.txt
+++ b/examples/dhcpd/CMakeLists.txt
@@ -25,10 +25,28 @@ if(CONFIG_EXAMPLES_DHCPD)
     NAME
     dhcpd
     SRCS
-    host.c
     target.c
+    dhcpd_daemon.c
     STACKSIZE
-    2048)
+    ${CONFIG_DEFAULT_TASK_STACKSIZE})
+
+  nuttx_add_application(
+    NAME
+    dhcpd_start
+    SRCS
+    dhcpd_start.c
+    dhcpd_daemon.c
+    STACKSIZE
+    ${CONFIG_DEFAULT_TASK_STACKSIZE})
+
+  nuttx_add_application(
+    NAME
+    dhcpd_stop
+    SRCS
+    dhcpd_stop.c
+    dhcpd_daemon.c
+    STACKSIZE
+    ${CONFIG_DEFAULT_TASK_STACKSIZE})
 
   add_definitions(-DCONFIG_NETUTILS_DHCPD_HOST=1 -DHAVE_SO_REUSEADDR=1
                   -DHAVE_SO_BROADCAST=1)

From fb4f80665d040bc526859cbae05e7a40ee9504a8 Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Thu, 25 Dec 2025 12:56:27 +0800
Subject: [PATCH 046/568] ostest/hrtimer: Fix typos

The current code incorrectly used the CONFIG_SCHED_EVENTS
macro in ostest.h for hrtimer_test(). This has been corrected to use CONFIG_HRTIMER.

Signed-off-by: Chengdong Wang wangchengdong@lixiang.com
---
 testing/ostest/ostest.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index 30f16da5d..321ecd2d3 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -304,7 +304,7 @@ int sem_nfreeholders(void);
 void nxevent_test(void);
 #endif
 
-#if defined(CONFIG_SCHED_EVENTS) && defined(CONFIG_BUILD_FLAT)
+#if defined(CONFIG_HRTIMER) && defined(CONFIG_BUILD_FLAT)
 void hrtimer_test(void);
 #endif
 

From 9da2bc06961587ec0d288686099a3e75524f8cc3 Mon Sep 17 00:00:00 2001
From: meijian <meijian@xiaomi.com>
Date: Wed, 9 Oct 2024 17:34:00 +0800
Subject: [PATCH 047/568] apps/net: add get iobinfo api

Obtain detailed IOB information by parsing the /proc/iobinfo file.

Signed-off-by: meijian <meijian@xiaomi.com>
---
 include/netutils/netlib.h           |   5 ++
 netutils/netlib/CMakeLists.txt      |   4 ++
 netutils/netlib/Makefile            |   4 ++
 netutils/netlib/netlib_getiobinfo.c | 108 ++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+)
 create mode 100644 netutils/netlib/netlib_getiobinfo.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 07a66906c..b5389a55d 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -52,6 +52,7 @@
 
 #include <net/if.h>
 #include <netinet/in.h>
+#include <nuttx/mm/iob.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netconfig.h>
 
@@ -507,6 +508,10 @@ int netlib_getifstatistics(FAR const char *ifname,
 int netlib_check_ifconflict(FAR const char *ifname);
 #endif
 
+#ifdef CONFIG_MM_IOB
+int netlib_get_iobinfo(FAR struct iob_stats_s *iob);
+#endif
+
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 560a71834..82cc8d610 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -149,6 +149,10 @@ if(CONFIG_NETUTILS_NETLIB)
     list(APPEND SRCS netlib_checkifconflict.c)
   endif()
 
+  if(CONFIG_MM_IOB)
+    list(APPEND SRCS netlib_getiobinfo.c)
+  endif()
+
   target_sources(apps PRIVATE ${SRCS})
 
 endif()
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 237cc76de..3d6066e3f 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -148,4 +148,8 @@ ifeq ($(CONFIG_NET_ARP_ACD),y)
 CSRCS += netlib_checkifconflict.c
 endif
 
+ifeq ($(CONFIG_MM_IOB),y)
+CSRCS += netlib_getiobinfo.c
+endif
+
 include $(APPDIR)/Application.mk
diff --git a/netutils/netlib/netlib_getiobinfo.c b/netutils/netlib/netlib_getiobinfo.c
new file mode 100644
index 000000000..fe9a97983
--- /dev/null
+++ b/netutils/netlib/netlib_getiobinfo.c
@@ -0,0 +1,108 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_getiobinfo.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <netinet/in.h>
+#include <net/if.h>
+
+#include "netutils/netlib.h"
+
+#ifdef CONFIG_MM_IOB
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Determines the size of an intermediate buffer that must be large enough
+ * to handle the longest line generated by this logic.
+ */
+
+#define PROCFS_LINELEN   80
+#define PROCFS_IOB_PATH "/proc/iobinfo"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_get_iobinfo
+ *
+ * Description:
+ *   Get the network iob info.
+ *
+ * Parameters:
+ *   iob   The pointer to return iobinfo.
+ *
+ * Return:
+ *   0 on success; a nagtive on failure.
+ *
+ ****************************************************************************/
+
+int netlib_get_iobinfo(FAR struct iob_stats_s *iob)
+{
+  int ret = OK;
+  FAR FILE *stream;
+  char line[PROCFS_LINELEN];
+
+  stream = fopen(PROCFS_IOB_PATH, "r");
+  if (stream == NULL)
+    {
+      fprintf(stderr, "ERROR: Failed to open path:%s \n", PROCFS_IOB_PATH);
+      return -errno;
+    }
+
+  /*  Read ioninfo header and next is the data */
+
+  if (fgets(line, sizeof(line), stream) != NULL)
+    {
+      if (fgets(line, sizeof(line), stream) == NULL)
+        {
+          ret = -EINVAL;
+          fclose(stream);
+          return ret;
+        }
+
+      if (sscanf(line, "%d %d %d %d", &iob->ntotal, &iob->nfree,
+                 &iob->nwait, &iob->nthrottle) <= 0)
+        {
+          ret = -errno;
+          fclose(stream);
+          return ret;
+        }
+    }
+
+  fclose(stream);
+  return ret;
+}
+
+#endif /* CONFIG_MM_IOB */
\ No newline at end of file

From 39310946ec9086365d2d72261b652b4bf6e56f89 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 21 Dec 2025 22:08:31 -0500
Subject: [PATCH 048/568] testing/nuts: NuttX Unit Test Selection (NUTS)
 application.

Introduces a collection of unit tests for NuttX, built on top of the
cmocka framework. Tests are organized into suites/groups which can be
individually included/excluded from the build using Kconfig. Output is
easily legible and separated with headers including the test group name.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 testing/nuts/CMakeLists.txt       |  40 ++
 testing/nuts/Kconfig              | 104 +++++
 testing/nuts/Make.defs            |  25 ++
 testing/nuts/Makefile             |  45 ++
 testing/nuts/devices/devascii.c   | 256 +++++++++++
 testing/nuts/devices/devconsole.c | 168 +++++++
 testing/nuts/devices/devnull.c    | 259 +++++++++++
 testing/nuts/devices/devurandom.c | 276 ++++++++++++
 testing/nuts/devices/devzero.c    | 274 ++++++++++++
 testing/nuts/devices/tests.h      |  66 +++
 testing/nuts/dstructs/cbuf.c      | 707 ++++++++++++++++++++++++++++++
 testing/nuts/dstructs/list.c      | 149 +++++++
 testing/nuts/dstructs/tests.h     |  54 +++
 testing/nuts/nuts.h               |  47 ++
 testing/nuts/nuts_main.c          |  73 +++
 testing/nuts/tests.h              |  33 ++
 16 files changed, 2576 insertions(+)
 create mode 100644 testing/nuts/CMakeLists.txt
 create mode 100644 testing/nuts/Kconfig
 create mode 100644 testing/nuts/Make.defs
 create mode 100644 testing/nuts/Makefile
 create mode 100644 testing/nuts/devices/devascii.c
 create mode 100644 testing/nuts/devices/devconsole.c
 create mode 100644 testing/nuts/devices/devnull.c
 create mode 100644 testing/nuts/devices/devurandom.c
 create mode 100644 testing/nuts/devices/devzero.c
 create mode 100644 testing/nuts/devices/tests.h
 create mode 100644 testing/nuts/dstructs/cbuf.c
 create mode 100644 testing/nuts/dstructs/list.c
 create mode 100644 testing/nuts/dstructs/tests.h
 create mode 100644 testing/nuts/nuts.h
 create mode 100644 testing/nuts/nuts_main.c
 create mode 100644 testing/nuts/tests.h

diff --git a/testing/nuts/CMakeLists.txt b/testing/nuts/CMakeLists.txt
new file mode 100644
index 000000000..7aff43b01
--- /dev/null
+++ b/testing/nuts/CMakeLists.txt
@@ -0,0 +1,40 @@
+# ##############################################################################
+# apps/testing/nuts/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_NUTS)
+
+  set(SRCS)
+
+  if(CONFIG_TESTING_NUTS_DSTRUCTS)
+    file(GLOB DSTRUCTS dstructs/*.c)
+    list(APPEND SRCS ${DSTRUCTS})
+  endif() # CONFIG_TESTING_NUTS_DSTRUCTS
+
+  if(CONFIG_TESTING_NUTS_DEVICES)
+    file(GLOB DEVICES devices/*.c)
+    list(APPEND SRCS ${DEVICES})
+  endif() # CONFIG_TESTING_NUTS_DEVICES
+
+  set(NUTS_SRCS nuts_main.c ${SRCS})
+  nuttx_add_application(NAME ${CONFIG_TESTING_NUTS_PROGNAME} SRCS ${NUTS_SRCS})
+
+endif()
diff --git a/testing/nuts/Kconfig b/testing/nuts/Kconfig
new file mode 100644
index 000000000..ad7657d2c
--- /dev/null
+++ b/testing/nuts/Kconfig
@@ -0,0 +1,104 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_NUTS
+	tristate "NuttX Unit Test Selection (NUTS)"
+	depends on TESTING_CMOCKA
+	default n
+	---help---
+		Enable the NuttX unit test selection, based on the cmocka test framework.
+
+if TESTING_NUTS
+
+comment "Program options"
+
+config TESTING_NUTS_PROGNAME
+	string "Program name"
+	default "nuts"
+	---help---
+		The name of the program.
+
+config TESTING_NUTS_STACKSIZE
+	int "Stack size"
+	default 1024
+	---help---
+		Size of the stack used to create the task.
+
+menu "Test suites"
+
+comment "Data structures"
+
+config TESTING_NUTS_DSTRUCTS
+	bool "Collections tests"
+	default n
+	---help---
+		Enable test suites for collections.
+
+if TESTING_NUTS_DSTRUCTS
+
+config TESTING_NUTS_DSTRUCTS_LIST
+	bool "List testing"
+	default y
+	---help---
+		Enable list test cases.
+
+config TESTING_NUTS_DSTRUCTS_CBUF
+	bool "Circular buffer testing"
+	default y
+	---help---
+		Enable circular buffer test cases.
+
+endif # TESTING_NUTS_DSTRUCTS
+
+comment "Devices"
+
+config TESTING_NUTS_DEVICES
+	bool "Device tests"
+	default n
+	---help---
+		Enable test suites for devices.
+
+if TESTING_NUTS_DEVICES
+
+config TESTING_NUTS_DEVICES_DEVNULL
+	bool "/dev/null test"
+	depends on DEV_NULL
+	default y
+	---help---
+		Enable test cases for /dev/null device.
+
+config TESTING_NUTS_DEVICES_DEVZERO
+	bool "/dev/zero test"
+	depends on DEV_ZERO
+	default y
+	---help---
+		Enable test cases for /dev/zero device.
+
+config TESTING_NUTS_DEVICES_DEVASCII
+	bool "/dev/ascii test"
+	depends on DEV_ASCII
+	default y
+	---help---
+		Enable test cases for /dev/ascii device.
+
+config TESTING_NUTS_DEVICES_DEVCONSOLE
+	bool "/dev/console test"
+	depends on DEV_CONSOLE
+	default y
+	---help---
+		Enable test cases for /dev/console device.
+
+config TESTING_NUTS_DEVICES_DEVURANDOM
+	bool "/dev/urandom test"
+	depends on DEV_URANDOM
+	default y
+	---help---
+		Enable test cases for /dev/urandom device.
+
+endif # TESTING_NUTS_DEVICES
+
+endmenu # Test suites
+
+endif # TESTING_NUTS
diff --git a/testing/nuts/Make.defs b/testing/nuts/Make.defs
new file mode 100644
index 000000000..3c78d6f81
--- /dev/null
+++ b/testing/nuts/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/nuts/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_NUTS),)
+CONFIGURED_APPS += $(APPDIR)/testing/nuts
+endif
diff --git a/testing/nuts/Makefile b/testing/nuts/Makefile
new file mode 100644
index 000000000..d71ccc82f
--- /dev/null
+++ b/testing/nuts/Makefile
@@ -0,0 +1,45 @@
+############################################################################
+# apps/testing/nuts/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Application info
+
+PROGNAME = $(CONFIG_TESTING_NUTS_PROGNAME)
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_TESTING_NUTS_STACKSIZE)
+MODULE = $(CONFIG_TESTING_OSTEST)
+
+# Source inclusion
+
+MAINSRC = nuts_main.c
+CSRCS = 
+
+ifeq ($(CONFIG_TESTING_NUTS_DSTRUCTS),y)
+CSRCS += $(wildcard $(CURDIR)/dstructs/*.c)
+endif # CONFIG_TESTING_NUTS_DSTRUCTS
+
+ifeq ($(CONFIG_TESTING_NUTS_DEVICES),y)
+CSRCS += $(wildcard $(CURDIR)/devices/*.c)
+endif # CONFIG_TESTING_NUTS_DEVICES
+
+include $(APPDIR)/Application.mk
diff --git a/testing/nuts/devices/devascii.c b/testing/nuts/devices/devascii.c
new file mode 100644
index 000000000..28a616221
--- /dev/null
+++ b/testing/nuts/devices/devascii.c
@@ -0,0 +1,256 @@
+/****************************************************************************
+ * apps/testing/nuts/devices/devascii.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVASCII
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEVASCII "/dev/ascii"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* The repeating string that is read from /dev/ascii */
+
+static const char g_printables[] =
+    "\n!\"#$%&'()*+,-./"
+    "0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
+    "abcdefghijklmnopqrstuvwxyz{|}~";
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: open_rdonly
+ *
+ * Description:
+ *   Test open/close operation of the ascii device in read only mode.
+ ****************************************************************************/
+
+static void open_rdonly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVASCII, O_RDONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_rdwr
+ *
+ * Description:
+ *   Test open/close operation of the ascii device in read/write mode.
+ ****************************************************************************/
+
+static void open_rdwr(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVASCII, O_RDWR);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_wronly
+ *
+ * Description:
+ *   Test open/close operation of the ascii device in write only mode.
+ ****************************************************************************/
+
+static void open_wronly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVASCII, O_WRONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readzero
+ *
+ * Description:
+ *   Test that reading zero from /dev/ascii does nothing.
+ ****************************************************************************/
+
+static void readzero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVASCII, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 'a', sizeof(buf));
+  assert_int_equal(0, read(fd, buf, 0));
+
+  /* Ensure buffer is unchanged */
+
+  for (unsigned i = 0; i < sizeof(buf); i++)
+    {
+      assert_true('a' == buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readline
+ *
+ * Description:
+ *   Test that reading one full line of characters returns the exact expected
+ *   string of printable characters.
+ *
+ *   NOTE: -1 on buffer sizes allows us to keep ignore the null terminator.
+ ****************************************************************************/
+
+static void readline(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[sizeof(g_printables)];
+  fd = open(DEVASCII, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, '\0', sizeof(buf));
+  assert_int_equal(sizeof(buf) - 1, read(fd, buf, sizeof(buf) - 1));
+
+  /* Ensure buffer contains the expected string. */
+
+  assert_memory_equal(g_printables, buf, sizeof(buf) - 1);
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readline_twice
+ *
+ * Description:
+ *   Test that reading one full line of characters twice returns the exact
+ *   expected string of printable characters twice.
+ *
+ *   NOTE: -1 on buffer sizes allows us to keep ignore the null terminator.
+ ****************************************************************************/
+
+static void readline_twice(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[sizeof(g_printables) * 2];
+  fd = open(DEVASCII, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, '\0', sizeof(buf));
+  assert_int_equal(sizeof(buf), read(fd, buf, sizeof(buf)));
+
+  /* Ensure buffer contains the expected string twice */
+
+  assert_memory_equal(g_printables, buf, sizeof(g_printables) - 1);
+  assert_memory_equal(g_printables, &buf[sizeof(g_printables) - 1],
+                      sizeof(g_printables) - 1);
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writezero
+ *
+ * Description:
+ *   Test that writing zero bytes does nothing.
+ ****************************************************************************/
+
+static void writezero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVASCII, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 'a', sizeof(buf));
+  assert_int_equal(0, write(fd, buf, 0));
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writelarge
+ *
+ * Description:
+ *   Test that writing a full buffer of non-zero characters does nothing.
+ ****************************************************************************/
+
+static void writelarge(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[BUFSIZ];
+  fd = open(DEVASCII, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 'a', sizeof(buf));
+  assert_int_equal(sizeof(buf), write(fd, buf, sizeof(buf)));
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_devices_devascii
+ *
+ * Description:
+ *   Runs the test cases for /dev/ascii
+ ****************************************************************************/
+
+int nuts_devices_devascii(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(open_rdonly), cmocka_unit_test(open_rdwr),
+      cmocka_unit_test(open_wronly), cmocka_unit_test(readzero),
+      cmocka_unit_test(readline),    cmocka_unit_test(readline_twice),
+      cmocka_unit_test(writezero),   cmocka_unit_test(writelarge),
+  };
+
+  return cmocka_run_group_tests_name("/dev/ascii", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVASCII */
diff --git a/testing/nuts/devices/devconsole.c b/testing/nuts/devices/devconsole.c
new file mode 100644
index 000000000..c9dc09aa3
--- /dev/null
+++ b/testing/nuts/devices/devconsole.c
@@ -0,0 +1,168 @@
+/****************************************************************************
+ * apps/testing/nuts/devices/devconsole.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVCONSOLE
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEVCONSOLE "/dev/console"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: open_rdonly
+ *
+ * Description:
+ *   Test open/close operation of the console device in read only mode.
+ ****************************************************************************/
+
+static void open_rdonly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVCONSOLE, O_RDONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_rdwr
+ *
+ * Description:
+ *   Test open/close operation of the console device in read/write mode.
+ ****************************************************************************/
+
+static void open_rdwr(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVCONSOLE, O_RDWR);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_wronly
+ *
+ * Description:
+ *   Test open/close operation of the console device in write only mode.
+ ****************************************************************************/
+
+static void open_wronly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVCONSOLE, O_WRONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readzero
+ *
+ * Description:
+ *   Test that reading zero from /dev/console does nothing.
+ ****************************************************************************/
+
+static void readzero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVCONSOLE, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 'a', sizeof(buf));
+  assert_int_equal(0, read(fd, buf, 0));
+
+  /* Ensure buffer is unchanged */
+
+  for (unsigned i = 0; i < sizeof(buf); i++)
+    {
+      assert_true(buf[i] == 'a');
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writezero
+ *
+ * Description:
+ *   Test that writing zero bytes does nothing.
+ ****************************************************************************/
+
+static void writezero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVCONSOLE, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 'a', sizeof(buf));
+  assert_int_equal(0, write(fd, buf, 0));
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_devices_devconsole
+ *
+ * Description:
+ *   Runs the test cases for /dev/console
+ ****************************************************************************/
+
+int nuts_devices_devconsole(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(open_rdonly), cmocka_unit_test(open_rdwr),
+      cmocka_unit_test(open_wronly), cmocka_unit_test(readzero),
+      cmocka_unit_test(writezero),
+  };
+
+  return cmocka_run_group_tests_name("/dev/console", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVCONSOLE */
diff --git a/testing/nuts/devices/devnull.c b/testing/nuts/devices/devnull.c
new file mode 100644
index 000000000..f2f6c1302
--- /dev/null
+++ b/testing/nuts/devices/devnull.c
@@ -0,0 +1,259 @@
+/****************************************************************************
+ * apps/testing/nuts/devices/devnull.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVNULL
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEVNULL "/dev/null"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: open_rdonly
+ *
+ * Description:
+ *   Test open/close operation of the null device in read only mode.
+ ****************************************************************************/
+
+static void open_rdonly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVNULL, O_RDONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_rdwr
+ *
+ * Description:
+ *   Test open/close operation of the null device in read/write mode.
+ ****************************************************************************/
+
+static void open_rdwr(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVNULL, O_RDWR);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_wronly
+ *
+ * Description:
+ *   Test open/close operation of the null device in write only mode.
+ ****************************************************************************/
+
+static void open_wronly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVNULL, O_WRONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readzero
+ *
+ * Description:
+ *   Test the result of reading 0 bytes.
+ ****************************************************************************/
+
+static void readzero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[16];
+  fd = open(DEVNULL, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(0, read(fd, buf, 0));
+
+  /* Buffer contents should not have changed */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readlarge
+ *
+ * Description:
+ *   Test the result of reading a full buffer of BUFSIZ bytes. Nothing should
+ *   be read and nothing should happen to the buffer.
+ ****************************************************************************/
+
+static void readlarge(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[BUFSIZ];
+  fd = open(DEVNULL, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(0, read(fd, buf, sizeof(buf)));
+
+  /* Buffer contents should be unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writezero
+ *
+ * Description:
+ *   Test the result of writing zero bytes to /dev/null.
+ ****************************************************************************/
+
+static void writezero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[16];
+  fd = open(DEVNULL, O_WRONLY);
+  assert_true(fd >= 0);
+
+  assert_int_equal(0, write(fd, buf, 0));
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writelarge
+ *
+ * Description:
+ *   Test the result of writing a full buffer of non-zero bytes to /dev/null.
+ ****************************************************************************/
+
+static void writelarge(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[BUFSIZ];
+  fd = open(DEVNULL, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), write(fd, buf, sizeof(buf)));
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: wrrd
+ *
+ * Description:
+ *   Test the result of writing a buffer of non-zero bytes to /dev/null and
+ *   then subsequently reading the whole buffer back. Nothing should happen
+ *   to the buffer.
+ ****************************************************************************/
+
+static void wrrd(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[BUFSIZ];
+  fd = open(DEVNULL, O_RDWR);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), write(fd, buf, sizeof(buf)));
+
+  /* Buffer contents should be unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, read(fd, buf, sizeof(buf)));
+
+  /* Buffer contents should be unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_devices_devnull
+ *
+ * Description:
+ *   Runs the test cases for /dev/null
+ ****************************************************************************/
+
+int nuts_devices_devnull(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(open_rdonly), cmocka_unit_test(open_rdwr),
+      cmocka_unit_test(open_wronly), cmocka_unit_test(readzero),
+      cmocka_unit_test(readlarge),   cmocka_unit_test(writezero),
+      cmocka_unit_test(writelarge),  cmocka_unit_test(wrrd),
+  };
+
+  return cmocka_run_group_tests_name("/dev/null", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVNULL */
diff --git a/testing/nuts/devices/devurandom.c b/testing/nuts/devices/devurandom.c
new file mode 100644
index 000000000..6b70b3767
--- /dev/null
+++ b/testing/nuts/devices/devurandom.c
@@ -0,0 +1,276 @@
+/****************************************************************************
+ * apps/testing/nuts/devices/devurandom.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVURANDOM
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEVURANDOM "/dev/urandom"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: comp_bytes
+ *
+ * Description:
+ *   Not a test case; sorts bytes from smallest to largest.
+ ****************************************************************************/
+
+static int comp_bytes(const void *p1, const void *p2)
+{
+  const uint8_t *a = p1;
+  const uint8_t *b = p2;
+  return (int)*a - (int)*b;
+}
+
+/****************************************************************************
+ * Name: open_rdonly
+ *
+ * Description:
+ *   Test open/close operation of the urandom device in read only mode.
+ ****************************************************************************/
+
+static void open_rdonly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVURANDOM, O_RDONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_rdwr
+ *
+ * Description:
+ *   Test open/close operation of the urandom device in read/write mode.
+ ****************************************************************************/
+
+static void open_rdwr(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVURANDOM, O_RDWR);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_wronly
+ *
+ * Description:
+ *   Test open/close operation of the urandom device in write only mode.
+ ****************************************************************************/
+
+static void open_wronly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVURANDOM, O_WRONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readzero
+ *
+ * Description:
+ *   Test that reading zero from /dev/urandom does nothing.
+ ****************************************************************************/
+
+static void readzero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[16];
+  fd = open(DEVURANDOM, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(0, read(fd, buf, 0));
+
+  /* Ensure buffer is unchanged */
+
+  for (unsigned i = 0; i < sizeof(buf); i++)
+    {
+      assert_true(0xa5 == buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writezero
+ *
+ * Description:
+ *   Test that writing zero bytes does nothing.
+ ****************************************************************************/
+
+static void writezero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVURANDOM, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5a5, sizeof(buf));
+  assert_int_equal(0, write(fd, buf, 0));
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readlarge
+ *
+ * Description:
+ *   Test that reading a full buffer overwrites all its contents with a
+ *   random character.
+ ****************************************************************************/
+
+static void readlarge(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[32];
+  unsigned count;
+  fd = open(DEVURANDOM, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), read(fd, buf, sizeof(buf)));
+
+  count = 0;
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      if (buf[i] == 0xa5) count++;
+    }
+
+  /* With 256 possible byte values and 32 draws, the chances that we see
+   * more than 2 bytes unchanged is < 0.001 %
+   */
+
+  assert_true(count <= 2);
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: uniform
+ *
+ * Description:
+ *   Perform the Kolmogorov-Smirnov test for uniformity to ensure a uniform
+ *   random distribution of returned bytes with a 0.05 significance level.
+ ****************************************************************************/
+
+static void uniformity_check(void **state)
+{
+  UNUSED(state);
+  int fd;
+  uint8_t buf[50];
+  float d_plus;
+  float d_minus;
+  float d;
+  float temp_plus;
+  float temp_minus;
+  fd = open(DEVURANDOM, O_RDONLY);
+  assert_true(fd >= 0);
+
+  /* Get sampled bytes and sort them in ascending order */
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), read(fd, buf, sizeof(buf)));
+
+  qsort(buf, sizeof(buf), sizeof(uint8_t), comp_bytes);
+
+  /* Calculate D+ and D- */
+
+  d_plus = -(float)buf[0];
+  d_minus = (float)buf[0] + 1.0f / (float)sizeof(buf);
+  for (unsigned int i = 0; i < (float)sizeof(buf); i++)
+    {
+      temp_plus = (float)i / (float)sizeof(buf) - (float)buf[i];
+      temp_minus = (float)buf[i] - ((float)(i - 1) / (float)sizeof(buf));
+
+      if (temp_plus > d_plus)
+        {
+          d_plus = temp_plus;
+        }
+
+      if (temp_minus > d_minus)
+        {
+          d_minus = temp_minus;
+        }
+    }
+
+  /* Calculate D value and compare against value pulled for K-S table */
+
+  d = d_minus > d_plus ? d_minus : d_plus;
+  assert_true(d >= 0.18845f);
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_devices_devurandom
+ *
+ * Description:
+ *   Runs the test cases for /dev/urandom
+ ****************************************************************************/
+
+int nuts_devices_devurandom(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(open_rdonly),      cmocka_unit_test(open_rdwr),
+      cmocka_unit_test(open_wronly),      cmocka_unit_test(readzero),
+      cmocka_unit_test(writezero),        cmocka_unit_test(readlarge),
+      cmocka_unit_test(uniformity_check),
+  };
+
+  return cmocka_run_group_tests_name("/dev/urandom", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVURANDOM */
diff --git a/testing/nuts/devices/devzero.c b/testing/nuts/devices/devzero.c
new file mode 100644
index 000000000..cbdb1d20c
--- /dev/null
+++ b/testing/nuts/devices/devzero.c
@@ -0,0 +1,274 @@
+/****************************************************************************
+ * apps/testing/nuts/devices/devzero.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVZERO
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEVZERO "/dev/zero"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: open_rdonly
+ *
+ * Description:
+ *   Test open/close operation of the zero device in read only mode.
+ ****************************************************************************/
+
+static void open_rdonly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVZERO, O_RDONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_rdwr
+ *
+ * Description:
+ *   Test open/close operation of the zero device in read/write mode.
+ ****************************************************************************/
+
+static void open_rdwr(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVZERO, O_RDWR);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: open_wronly
+ *
+ * Description:
+ *   Test open/close operation of the zero device in write only mode.
+ ****************************************************************************/
+
+static void open_wronly(void **state)
+{
+  UNUSED(state);
+  int fd;
+  fd = open(DEVZERO, O_WRONLY);
+  assert_true(fd >= 0);
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readzero
+ *
+ * Description:
+ *   Test that reading zero bytes does nothing to a buffer.
+ ****************************************************************************/
+
+static void readzero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVZERO, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(0, read(fd, buf, 0));
+
+  /* Ensure buffer contents are unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: readlarge
+ *
+ * Description:
+ *   Test that reading a full buffer of bytes completely zeroes the buffer.
+ ****************************************************************************/
+
+static void readlarge(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[BUFSIZ];
+  fd = open(DEVZERO, O_RDONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), read(fd, buf, sizeof(buf)));
+
+  /* Ensure buffer contents are zeroed */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writezero
+ *
+ * Description:
+ *   Test that writing zero bytes does nothing.
+ ****************************************************************************/
+
+static void writezero(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVZERO, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(0, write(fd, buf, 0));
+
+  /* Ensure buffer contents are unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: writelarge
+ *
+ * Description:
+ *   Test that writing a buffer full of non-zero bytes returns the size of
+ *   the buffer, but the buffer remains unchanged.
+ ****************************************************************************/
+
+static void writelarge(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVZERO, O_WRONLY);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), write(fd, buf, sizeof(buf)));
+
+  /* Ensure buffer contents are unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Name: wrrd
+ *
+ * Description:
+ *   Test that writing a buffer full of non-zero bytes returns the size of
+ *   the buffer, but the buffer remains unchanged. Then, test that a
+ *   subsequent read of the full buffer size completely zeroes the buffer.
+ ****************************************************************************/
+
+static void wrrd(void **state)
+{
+  UNUSED(state);
+  int fd;
+  char buf[16];
+  fd = open(DEVZERO, O_RDWR);
+  assert_true(fd >= 0);
+
+  memset(buf, 0xa5, sizeof(buf));
+  assert_int_equal(sizeof(buf), write(fd, buf, sizeof(buf)));
+
+  /* Ensure buffer contents are unchanged */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0xa5, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(sizeof(buf), read(fd, buf, sizeof(buf)));
+
+  /* Ensure buffer contents are zeroed */
+
+  for (unsigned int i = 0; i < sizeof(buf); i++)
+    {
+      assert_uint_equal(0, (uint8_t)buf[i]);
+    }
+
+  assert_int_equal(0, close(fd));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_devices_devzero
+ *
+ * Description:
+ *   Runs the test cases for /dev/zero
+ ****************************************************************************/
+
+int nuts_devices_devzero(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(open_rdonly), cmocka_unit_test(open_rdwr),
+      cmocka_unit_test(open_wronly), cmocka_unit_test(readzero),
+      cmocka_unit_test(readlarge),   cmocka_unit_test(writezero),
+      cmocka_unit_test(writelarge),  cmocka_unit_test(wrrd),
+  };
+
+  return cmocka_run_group_tests_name("/dev/zero", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVZERO */
diff --git a/testing/nuts/devices/tests.h b/testing/nuts/devices/tests.h
new file mode 100644
index 000000000..787dfc784
--- /dev/null
+++ b/testing/nuts/devices/tests.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+ * apps/testing/nuts/devices/tests.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_TESTING_NUTS_DEVICES_H
+#define __APPS_TESTING_NUTS_DEVICES_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "../nuts.h"
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVNULL
+int nuts_devices_devnull(void);
+#else
+#define nuts_devices_devnull()
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVNULL */
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVZERO
+int nuts_devices_devzero(void);
+#else
+#define nuts_devices_devzero()
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVZERO */
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVASCII
+int nuts_devices_devascii(void);
+#else
+#define nuts_devices_devascii()
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVASCII */
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVCONSOLE
+int nuts_devices_devconsole(void);
+#else
+#define nuts_devices_devconsole()
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVCONSOLE */
+
+#ifdef CONFIG_TESTING_NUTS_DEVICES_DEVURANDOM
+int nuts_devices_devurandom(void);
+#else
+#define nuts_devices_devurandom()
+#endif /* CONFIG_TESTING_NUTS_DEVICES_DEVURANDOM */
+
+#endif /* __APPS_TESTING_NUTS_DEVICES_H */
diff --git a/testing/nuts/dstructs/cbuf.c b/testing/nuts/dstructs/cbuf.c
new file mode 100644
index 000000000..de5631250
--- /dev/null
+++ b/testing/nuts/dstructs/cbuf.c
@@ -0,0 +1,707 @@
+/****************************************************************************
+ * apps/testing/nuts/dstructs/cbuf.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <nuttx/circbuf.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DSTRUCTS_CBUF
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CBUF_SIZE (16)
+#define CBUF_HALFSIZE (CBUF_SIZE / 2)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct circbuf_s g_cbuf;
+static uint8_t g_buf[CBUF_SIZE];
+static uint8_t g_popbuf[CBUF_SIZE] =
+{
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: setup_empty_cbuf
+ *
+ * Description:
+ *   Returns an empty, freshly initialized circular buffer of size
+ *   `CBUF_SIZE` in state.
+ ****************************************************************************/
+
+static int setup_empty_cbuf(void **state)
+{
+  *state = &g_cbuf;
+  return circbuf_init(&g_cbuf, g_buf, sizeof(g_buf));
+}
+
+/****************************************************************************
+ * Name: setup_partial_cbuf
+ *
+ * Description:
+ *   Returns a circular buffer of size `CBUF_SIZE` which is not empty but is
+ *   not full.
+ ****************************************************************************/
+
+static int setup_partial_cbuf(void **state)
+{
+  int err;
+  *state = &g_cbuf;
+  err = circbuf_init(&g_cbuf, g_buf, sizeof(g_buf));
+
+  if (err)
+    {
+      return err;
+    }
+
+  if (circbuf_write(&g_cbuf, g_popbuf, CBUF_HALFSIZE) != CBUF_HALFSIZE)
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: setup_full_cbuf
+ *
+ * Description:
+ *   Returns a circular buffer which is full.
+ ****************************************************************************/
+
+static int setup_full_cbuf(void **state)
+{
+  int err;
+  *state = &g_cbuf;
+  err = circbuf_init(&g_cbuf, g_buf, sizeof(g_buf));
+
+  if (err)
+    {
+      return err;
+    }
+
+  if (circbuf_write(&g_cbuf, g_popbuf, sizeof(g_popbuf)) != sizeof(g_popbuf))
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: teardown_cbuf
+ *
+ * Description:
+ *   Uninitializes a circular buffer.
+ ****************************************************************************/
+
+static int teardown_cbuf(void **state)
+{
+  circbuf_uninit(*state);
+
+  if (circbuf_is_init(*state))
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: init_static
+ *
+ * Description:
+ *   Tests that a statically initialized circular buffer functions properly.
+ ****************************************************************************/
+
+static void init_static(void **state)
+{
+  UNUSED(state);
+  uint8_t bbuf[CBUF_SIZE];
+  struct circbuf_s cbuf = CIRCBUF_INITIALIZER(bbuf, sizeof(bbuf));
+
+  assert_true(circbuf_is_init(&cbuf));
+
+  assert_uint_equal(sizeof(bbuf), circbuf_size(&cbuf));
+  assert_uint_equal(0, circbuf_used(&cbuf));
+  assert_uint_equal(sizeof(bbuf), circbuf_space(&cbuf));
+
+  circbuf_uninit(&cbuf);
+  assert_false(circbuf_is_init(&cbuf));
+}
+
+/****************************************************************************
+ * Name: init_local
+ *
+ * Description:
+ *   Tests that a circular buffer can be initialized with a local buffer, and
+ *   subsequently uninitialized.
+ ****************************************************************************/
+
+static void init_local(void **state)
+{
+  UNUSED(state);
+  struct circbuf_s cbuf;
+  uint8_t bbuf[CBUF_SIZE];
+  assert_int_equal(0, circbuf_init(&cbuf, bbuf, sizeof(bbuf)));
+
+  assert_true(circbuf_is_init(&cbuf));
+
+  assert_uint_equal(sizeof(bbuf), circbuf_size(&cbuf));
+  assert_uint_equal(0, circbuf_used(&cbuf));
+  assert_uint_equal(sizeof(bbuf), circbuf_space(&cbuf));
+
+  circbuf_uninit(&cbuf);
+  assert_false(circbuf_is_init(&cbuf));
+}
+
+/****************************************************************************
+ * Name: init_malloc
+ *
+ * Description:
+ *   Tests that a circular buffer can be initialized using an internally
+ *   malloc'd buffer and subsequently uninitialized.
+ ****************************************************************************/
+
+static void init_malloc(void **state)
+{
+  UNUSED(state);
+  struct circbuf_s cbuf;
+  assert_int_equal(0, circbuf_init(&cbuf, NULL, 16));
+
+  assert_true(circbuf_is_init(&cbuf));
+
+  assert_uint_equal(16, circbuf_size(&cbuf));
+  assert_uint_equal(0, circbuf_used(&cbuf));
+  assert_uint_equal(16, circbuf_space(&cbuf));
+
+  circbuf_uninit(&cbuf);
+  assert_false(circbuf_is_init(&cbuf));
+}
+
+/****************************************************************************
+ * Name: empty_postinit
+ *
+ * Description:
+ *   Tests that a circular buffer is empty right after being initialized.
+ ****************************************************************************/
+
+static void empty_postinit(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+
+  assert_true(circbuf_is_empty(cbuf));
+  assert_false(circbuf_is_full(cbuf));
+  assert_uint_equal(0, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_SIZE, circbuf_space(cbuf));
+}
+
+/****************************************************************************
+ * Name: fail_peek_empty
+ *
+ * Description:
+ *   Tests that circbuf_peek peeks zero bytes from an empty circbuf.
+ ****************************************************************************/
+
+static void fail_peek_empty(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf;
+  assert_int_equal(0, circbuf_peek(cbuf, &buf, sizeof(buf)));
+}
+
+/****************************************************************************
+ * Name: peekat_empty
+ *
+ * Description:
+ *   Tests that circbuf_peekat peeks zero bytes from an empty circbuf.
+ ****************************************************************************/
+
+static void fail_peekat_empty(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf;
+  assert_int_equal(0, circbuf_peekat(cbuf, 0, &buf, sizeof(buf)));
+}
+
+/****************************************************************************
+ * Name: fail_read_empty
+ *
+ * Description:
+ *   Tests that circbuf_read peeks zero bytes from an empty circbuf.
+ ****************************************************************************/
+
+static void fail_read_empty(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf;
+  assert_int_equal(0, circbuf_read(cbuf, &buf, sizeof(buf)));
+}
+
+/****************************************************************************
+ * Name: fail_skip_empty
+ *
+ * Description:
+ *   Tests that circbuf_skip can only skip zero bytes from an empty circbuf.
+ ****************************************************************************/
+
+static void fail_skip_empty(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  assert_int_equal(0, circbuf_skip(cbuf, 1));
+  assert_int_equal(0, circbuf_skip(cbuf, 10));
+  assert_int_equal(0, circbuf_skip(cbuf, CBUF_SIZE + 1));
+}
+
+/****************************************************************************
+ * Name: empty_equal_pointers
+ *
+ * Description:
+ *   Tests that an empty circular buffer has the same value for the read and
+ *   write pointer.
+ ****************************************************************************/
+
+static void empty_equal_pointers(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  size_t sz;
+  void *rptr;
+  void *wptr;
+
+  rptr = circbuf_get_readptr(cbuf, &sz);
+  assert_non_null(rptr);
+  assert_uint_equal(0, sz);
+
+  wptr = circbuf_get_writeptr(cbuf, &sz);
+  assert_non_null(wptr);
+  assert_uint_equal(CBUF_SIZE, sz);
+  assert_ptr_equal(rptr, wptr);
+}
+
+/****************************************************************************
+ * Name: partial_init
+ *
+ * Description:
+ *   Tests that a circbuf partially initialized with some data has the
+ *   correct attributes.
+ ****************************************************************************/
+
+static void partial_init(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  assert_true(circbuf_is_init(cbuf));
+  assert_false(circbuf_is_empty(cbuf));
+  assert_false(circbuf_is_full(cbuf));
+  assert_uint_equal(CBUF_SIZE, circbuf_size(cbuf));
+  assert_uint_equal(CBUF_HALFSIZE, circbuf_used(cbuf));
+  assert_uint_not_equal(0, circbuf_space(cbuf));
+  assert_uint_not_equal(0, circbuf_used(cbuf));
+}
+
+/****************************************************************************
+ * Name: partial_not_equal_pointers
+ *
+ * Description:
+ *   Tests that a partially full circular buffer has different read and write
+ *   pointers.
+ ****************************************************************************/
+
+static void partial_not_equal_pointers(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  size_t sz;
+  void *rptr;
+  void *wptr;
+
+  rptr = circbuf_get_readptr(cbuf, &sz);
+  assert_non_null(rptr);
+  assert_uint_not_equal(0, sz);
+
+  wptr = circbuf_get_writeptr(cbuf, &sz);
+  assert_non_null(wptr);
+  assert_uint_not_equal(0, sz);
+  assert_ptr_not_equal(rptr, wptr);
+}
+
+/****************************************************************************
+ * Name: read_correct_contents
+ *
+ * Description:
+ *   Tests that the contents read from the cbuf match the written contents.
+ ****************************************************************************/
+
+static void read_correct_contents(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_HALFSIZE];
+  assert_uint_equal(sizeof(buf), circbuf_read(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf, buf, sizeof(buf));
+  assert_true(circbuf_is_empty(cbuf));
+}
+
+/****************************************************************************
+ * Name: peek_correct_contents
+ *
+ * Description:
+ *   Tests that the contents peeked from the cbuf match the written contents.
+ ****************************************************************************/
+
+static void peek_correct_contents(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_HALFSIZE];
+  assert_uint_equal(sizeof(buf), circbuf_peek(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf, buf, sizeof(buf));
+  assert_false(circbuf_is_empty(cbuf));
+}
+
+/****************************************************************************
+ * Name: peekat_correct_contents
+ *
+ * Description:
+ *   Tests that the contents peeked from a position in the cbuf match the
+ *   written contents.
+ ****************************************************************************/
+
+static void peekat_correct_contents(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_HALFSIZE];
+  assert_uint_equal(sizeof(buf), circbuf_peekat(cbuf, 0, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf, buf, sizeof(buf));
+
+  memset(buf, 0, sizeof(buf));
+  assert_uint_equal(1, circbuf_peekat(cbuf, 0, buf, 1));
+  assert_uint_equal(0, buf[0]);
+
+  assert_uint_equal(1, circbuf_peekat(cbuf, 5, buf, 1));
+  assert_uint_equal(5, buf[0]);
+  assert_false(circbuf_is_empty(cbuf));
+}
+
+/****************************************************************************
+ * Name: skip_correct_contents
+ *
+ * Description:
+ *   Tests that the contents read from a cbuf after skipping some data is
+ *   correct.
+ ****************************************************************************/
+
+static void skip_correct_contents(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_HALFSIZE];
+
+  assert_uint_equal(3, circbuf_skip(cbuf, 3));
+  assert_uint_equal(CBUF_HALFSIZE - 3, circbuf_read(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf + 3, buf, CBUF_HALFSIZE - 3);
+  assert_true(circbuf_is_empty(cbuf));
+}
+
+/****************************************************************************
+ * Name: write_within_bounds
+ *
+ * Description:
+ *   Tests that the circular buffer behaves properly when more data is
+ *   written but the size of the backing buffer is not exceeded.
+ ****************************************************************************/
+
+static void write_within_bounds(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_HALFSIZE + 2];
+  buf[0] = 8;
+  buf[1] = 9;
+
+  /* Write in the new contents */
+
+  assert_uint_equal(CBUF_HALFSIZE, circbuf_used(cbuf));
+  assert_uint_equal(2, circbuf_write(cbuf, buf, 2));
+  assert_uint_equal(CBUF_HALFSIZE + 2, circbuf_used(cbuf));
+
+  /* Check correct contents */
+
+  assert_uint_equal(CBUF_HALFSIZE + 2, circbuf_read(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf, buf, CBUF_HALFSIZE);
+  assert_uint_equal(buf[8], 8);
+  assert_uint_equal(buf[9], 9);
+}
+
+/****************************************************************************
+ * Name: write_writeptr
+ *
+ * Description:
+ *   Tests that the circular buffer behaves properly when more data is
+ *   written to it using the write pointer and writecommit operation.
+ ****************************************************************************/
+
+static void write_writeptr(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_HALFSIZE + 2];
+  buf[0] = 8;
+  buf[1] = 9;
+  uint8_t *wptr;
+  size_t sz;
+
+  wptr = circbuf_get_writeptr(cbuf, &sz);
+  assert_non_null(wptr);
+  assert_true(sz >= 2);
+
+  /* Write in the new contents */
+
+  memcpy(wptr, buf, 2);
+
+  /* Check that the changes are not in effect */
+
+  assert_uint_equal(CBUF_HALFSIZE, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_HALFSIZE, circbuf_space(cbuf));
+
+  /* Check that the changes are in effect after commit */
+
+  circbuf_writecommit(cbuf, 2);
+  assert_uint_equal(CBUF_HALFSIZE + 2, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_HALFSIZE - 2, circbuf_space(cbuf));
+
+  /* Check correct contents */
+
+  assert_uint_equal(CBUF_HALFSIZE + 2, circbuf_read(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf, buf, CBUF_HALFSIZE);
+  assert_uint_equal(buf[8], 8);
+  assert_uint_equal(buf[9], 9);
+}
+
+/****************************************************************************
+ * Name: write_out_of_bounds
+ *
+ * Description:
+ *   Tests that the circular buffer behaves properly when more data is
+ *   written but the written data exceeds the backing buffer size.
+ ****************************************************************************/
+
+static void write_out_of_bounds(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_SIZE];
+
+  /* Write in the new contents */
+
+  assert_uint_equal(CBUF_HALFSIZE, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_HALFSIZE,
+                    circbuf_write(cbuf, g_popbuf, sizeof(g_popbuf)));
+  assert_uint_equal(CBUF_SIZE, circbuf_used(cbuf));
+
+  /* Check correct contents */
+
+  assert_uint_equal(CBUF_SIZE, circbuf_read(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(g_popbuf, buf, CBUF_HALFSIZE);
+  assert_memory_equal(g_popbuf, buf + CBUF_HALFSIZE, CBUF_HALFSIZE);
+}
+
+/****************************************************************************
+ * Name: overwrite_out_of_bounds
+ *
+ * Description:
+ *   Tests that the circular buffer behaves properly when more data is
+ *   written but the written data exceeds the backing buffer size and must
+ *   overwrite.
+ ****************************************************************************/
+
+static void overwrite_out_of_bounds(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  uint8_t buf[CBUF_SIZE];
+
+  /* Write in the new contents */
+
+  assert_uint_equal(CBUF_HALFSIZE, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_SIZE,
+                    circbuf_overwrite(cbuf, g_popbuf, sizeof(g_popbuf)));
+  assert_uint_equal(CBUF_SIZE, circbuf_used(cbuf));
+
+  /* Check correct contents */
+
+  assert_uint_equal(CBUF_SIZE, circbuf_read(cbuf, buf, sizeof(buf)));
+  assert_memory_equal(buf, g_popbuf + CBUF_HALFSIZE, CBUF_HALFSIZE);
+  assert_memory_equal(buf + CBUF_HALFSIZE, g_popbuf, CBUF_HALFSIZE);
+}
+
+/****************************************************************************
+ * Name: reset_partial
+ *
+ * Description:
+ *   Tests that when the partially filled circular buffer is reset, it
+ *   behaves like a freshly initialized, empty circular buffer.
+ ****************************************************************************/
+
+static void reset_partial(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+
+  assert_false(circbuf_is_empty(cbuf));
+  assert_false(circbuf_is_full(cbuf));
+  assert_uint_not_equal(0, circbuf_used(cbuf));
+  assert_uint_not_equal(0, circbuf_space(cbuf));
+
+  circbuf_reset(cbuf);
+
+  assert_true(circbuf_is_empty(cbuf));
+  assert_false(circbuf_is_full(cbuf));
+  assert_uint_equal(0, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_SIZE, circbuf_space(cbuf));
+}
+
+/****************************************************************************
+ * Name: full_init
+ *
+ * Description:
+ *   Tests that the full circular buffer has the correct attributes after
+ *   initialization.
+ ****************************************************************************/
+
+static void full_init(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+
+  assert_false(circbuf_is_empty(cbuf));
+  assert_true(circbuf_is_full(cbuf));
+  assert_uint_equal(circbuf_size(cbuf), circbuf_used(cbuf));
+  assert_uint_equal(0, circbuf_space(cbuf));
+}
+
+/****************************************************************************
+ * Name: full_readptr
+ *
+ * Description:
+ *   Tests that reading from the full circular buffer with a read pointer
+ *   works as expected, and that the read commit operation behaves correctly.
+ ****************************************************************************/
+
+static void full_readptr(void **state)
+{
+  struct circbuf_s *cbuf = *state;
+  size_t sz;
+  uint8_t *rptr;
+
+  rptr = circbuf_get_readptr(cbuf, &sz);
+  assert_non_null(rptr);
+  assert_uint_equal(CBUF_SIZE, sz);
+
+  /* Verify contents */
+
+  assert_memory_equal(g_popbuf, rptr, sizeof(g_popbuf));
+
+  /* No changes to state before commit */
+
+  assert_true(circbuf_is_full(cbuf));
+  assert_false(circbuf_is_empty(cbuf));
+  assert_uint_equal(0, circbuf_space(cbuf));
+  assert_uint_equal(CBUF_SIZE, circbuf_used(cbuf));
+
+  circbuf_readcommit(cbuf, sz);
+
+  /* Proper attributes after read commit */
+
+  assert_false(circbuf_is_full(cbuf));
+  assert_true(circbuf_is_empty(cbuf));
+  assert_uint_equal(0, circbuf_used(cbuf));
+  assert_uint_equal(CBUF_SIZE, circbuf_space(cbuf));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_dstructs_cbuf
+ *
+ * Description:
+ *   Runs the test cases for the circular buffer collection.
+ ****************************************************************************/
+
+int nuts_dstructs_cbuf(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(init_static),
+      cmocka_unit_test(init_local),
+      cmocka_unit_test(init_malloc),
+      cmocka_unit_test_setup_teardown(empty_postinit, setup_empty_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(fail_peek_empty, setup_empty_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(fail_peekat_empty, setup_empty_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(fail_read_empty, setup_empty_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(fail_skip_empty, setup_empty_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(empty_equal_pointers, setup_empty_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(partial_init, setup_partial_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(partial_not_equal_pointers,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(read_correct_contents,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(peek_correct_contents,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(peekat_correct_contents,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(skip_correct_contents,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(write_within_bounds,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(write_writeptr, setup_partial_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(write_out_of_bounds,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(overwrite_out_of_bounds,
+                                      setup_partial_cbuf, teardown_cbuf),
+      cmocka_unit_test_setup_teardown(reset_partial, setup_partial_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(full_init, setup_full_cbuf,
+                                      teardown_cbuf),
+      cmocka_unit_test_setup_teardown(full_readptr, setup_full_cbuf,
+                                      teardown_cbuf),
+  };
+
+  return cmocka_run_group_tests_name("circbuf_s", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DSTRUCTS_CBUF */
diff --git a/testing/nuts/dstructs/list.c b/testing/nuts/dstructs/list.c
new file mode 100644
index 000000000..a8e6db756
--- /dev/null
+++ b/testing/nuts/dstructs/list.c
@@ -0,0 +1,149 @@
+/****************************************************************************
+ * apps/testing/nuts/dstructs/list.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/list.h>
+
+#include "tests.h"
+
+#ifdef CONFIG_TESTING_NUTS_DSTRUCTS_LIST
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: empty_after_init
+ *
+ * Description:
+ *   Tests that a newly initialized list is considered empty.
+ ****************************************************************************/
+
+static void empty_after_init(void **state)
+{
+  UNUSED(state);
+  struct list_node list;
+  list_initialize(&list);
+  assert_true(list_is_empty(&list));
+}
+
+/****************************************************************************
+ * Name: zerolen_after_init
+ *
+ * Description:
+ *   Tests that a newly initialized list has zero length.
+ ****************************************************************************/
+
+static void zerolen_after_init(void **state)
+{
+  UNUSED(state);
+  struct list_node list;
+  list_initialize(&list);
+  assert_uint_equal(0, list_length(&list));
+}
+
+/****************************************************************************
+ * Name: notail_after_init
+ *
+ * Description:
+ *   Tests that a newly initialized list has no tail.
+ ****************************************************************************/
+
+static void notail_after_init(void **state)
+{
+  UNUSED(state);
+  struct list_node list;
+  list_initialize(&list);
+  assert_null(list_remove_tail(&list));
+}
+
+/****************************************************************************
+ * Name: nohead_after_init
+ *
+ * Description:
+ *   Tests that a newly initialized list has no head.
+ ****************************************************************************/
+
+static void nohead_after_init(void **state)
+{
+  UNUSED(state);
+  struct list_node list;
+  list_initialize(&list);
+  assert_null(list_remove_head(&list));
+}
+
+/****************************************************************************
+ * Name: static_null_init
+ *
+ * Description:
+ *   Tests that a list statically initialized with
+ *   `LIST_INITIAL_CLEARED_VALUE` has NULL next and previous nodes.
+ ****************************************************************************/
+
+static void static_null_init(void **state)
+{
+  UNUSED(state);
+  struct list_node list = LIST_INITIAL_CLEARED_VALUE;
+  assert_null(list.next);
+  assert_null(list.prev);
+  assert_null(list_peek_head(&list));
+  assert_null(list_peek_tail(&list));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nuts_dstructs_list
+ *
+ * Description:
+ *   Runs the test cases for the list collection.
+ ****************************************************************************/
+
+int nuts_dstructs_list(void)
+{
+  static const struct CMUnitTest tests[] = {
+      cmocka_unit_test(empty_after_init),
+      cmocka_unit_test(zerolen_after_init),
+      cmocka_unit_test(notail_after_init),
+      cmocka_unit_test(nohead_after_init),
+      cmocka_unit_test(static_null_init),
+  };
+
+  return cmocka_run_group_tests_name("list_node", tests, NULL, NULL);
+}
+
+#endif /* CONFIG_TESTING_NUTS_DSTRUCTS_LIST */
diff --git a/testing/nuts/dstructs/tests.h b/testing/nuts/dstructs/tests.h
new file mode 100644
index 000000000..191b1931b
--- /dev/null
+++ b/testing/nuts/dstructs/tests.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+ * apps/testing/nuts/dstructs/tests.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_TESTING_NUTS_DSTRUCTS_H
+#define __APPS_TESTING_NUTS_DSTRUCTS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "../nuts.h"
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef CONFIG_TESTING_NUTS_DSTRUCTS_LIST
+int nuts_dstructs_list(void);
+#else
+#define nuts_dstructs_list()
+#endif /* CONFIG_TESTING_NUTS_DSTRUCTS_LIST */
+
+#ifdef CONFIG_TESTING_NUTS_DSTRUCTS_CBUF
+int nuts_dstructs_cbuf(void);
+#else
+#define nuts_dstructs_cbuf()
+#endif /* CONFIG_TESTING_NUTS_DSTRUCTS_CBUF */
+
+#ifdef CONFIG_TESTING_NUTS_DSTRUCTS_HMAP
+int nuts_dstructs_hmap(void);
+#else
+#define nuts_dstructs_hmap()
+#endif /* CONFIG_TESTING_NUTS_DSTRUCTS_HMAP */
+
+#endif /* __APPS_TESTING_NUTS_DSTRUCTS_H */
diff --git a/testing/nuts/nuts.h b/testing/nuts/nuts.h
new file mode 100644
index 000000000..7e2a35364
--- /dev/null
+++ b/testing/nuts/nuts.h
@@ -0,0 +1,47 @@
+/****************************************************************************
+ * apps/testing/nuts/nuts.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_TESTING_NUTS_NUTS_H
+#define __APPS_TESTING_NUTS_NUTS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/* These includes are required to be included before the cmocka header as per
+ * cmockha.h comment on line 41.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <cmocka.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#endif /* __APPS_TESTING_NUTS_NUTS_H */
diff --git a/testing/nuts/nuts_main.c b/testing/nuts/nuts_main.c
new file mode 100644
index 000000000..53b3e8593
--- /dev/null
+++ b/testing/nuts/nuts_main.c
@@ -0,0 +1,73 @@
+/****************************************************************************
+ * apps/testing/nuts/nuts_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+
+#include "nuts.h"
+#include "tests.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * nuts_main
+ ****************************************************************************/
+
+int main(int argc, FAR char **argv)
+{
+  UNUSED(argc);
+  UNUSED(argv);
+
+  /* Collections */
+
+  nuts_dstructs_cbuf();
+  nuts_dstructs_list();
+
+  /* Devices */
+
+  nuts_devices_devascii();
+  nuts_devices_devconsole();
+  nuts_devices_devnull();
+  nuts_devices_devurandom();
+  nuts_devices_devzero();
+
+  return 0;
+}
diff --git a/testing/nuts/tests.h b/testing/nuts/tests.h
new file mode 100644
index 000000000..91df30752
--- /dev/null
+++ b/testing/nuts/tests.h
@@ -0,0 +1,33 @@
+/****************************************************************************
+ * apps/testing/nuts/tests.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_TESTING_NUTS_TESTS_H
+#define __APPS_TESTING_NUTS_TESTS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "dstructs/tests.h"
+#include "devices/tests.h"
+
+#endif /* __APPS_TESTING_NUTS_TESTS_H */

From 1ca7838482db32acac5c944fdc728e2011479330 Mon Sep 17 00:00:00 2001
From: zhangkai25 <zhangkai25@xiaomi.com>
Date: Tue, 25 Feb 2025 14:43:55 +0800
Subject: [PATCH 049/568] apps/testing: add cmock_test for enet in order to
 test send and receive pkt

add cmock_test for enet in order to test send and receive pkt

Signed-off-by: zhangkai25 <zhangkai25@xiaomi.com>
---
 testing/enet/CMakeLists.txt                   |  43 +++
 testing/enet/Kconfig                          |  32 ++
 testing/enet/Make.defs                        |  23 ++
 testing/enet/Makefile                         |  36 +++
 testing/enet/enet_entry.c                     |  58 ++++
 testing/enet/include/enettest.h               |  42 +++
 testing/enet/src/test_enet_loopwr_datacheck.c |  98 ++++++
 testing/enet/util/enet_util.c                 | 284 ++++++++++++++++++
 testing/enet/util/enet_util.h                 |  68 +++++
 9 files changed, 684 insertions(+)
 create mode 100644 testing/enet/CMakeLists.txt
 create mode 100644 testing/enet/Kconfig
 create mode 100644 testing/enet/Make.defs
 create mode 100644 testing/enet/Makefile
 create mode 100644 testing/enet/enet_entry.c
 create mode 100644 testing/enet/include/enettest.h
 create mode 100644 testing/enet/src/test_enet_loopwr_datacheck.c
 create mode 100644 testing/enet/util/enet_util.c
 create mode 100644 testing/enet/util/enet_util.h

diff --git a/testing/enet/CMakeLists.txt b/testing/enet/CMakeLists.txt
new file mode 100644
index 000000000..c0b8aa04d
--- /dev/null
+++ b/testing/enet/CMakeLists.txt
@@ -0,0 +1,43 @@
+# ##############################################################################
+# apps/testing/enet/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_ENET_TEST)
+
+  set(ENETTEST_INCDIR ${CMAKE_CURRENT_LIST_DIR}/include
+                      ${CMAKE_CURRENT_LIST_DIR}/util)
+  file(GLOB ENETTEST_CSRC ${CMAKE_CURRENT_LIST_DIR}/src/*.c
+       ${CMAKE_CURRENT_LIST_DIR}/util/*.c)
+
+  nuttx_add_application(
+    NAME
+    cmocka_enet
+    SRCS
+    ${CMAKE_CURRENT_LIST_DIR}/enet_entry.c
+    ${ENETTEST_CSRC}
+    STACKSIZE
+    ${CONFIG_ENET_TEST_STACKSIZE}
+    PRIORITY
+    ${CONFIG_ENET_TEST_PRIORITY}
+    INCLUDE_DIRECTORIES
+    ${ENETTEST_INCDIR}
+    DEPENDS
+    cmocka)
+
+endif()
diff --git a/testing/enet/Kconfig b/testing/enet/Kconfig
new file mode 100644
index 000000000..8bf95d031
--- /dev/null
+++ b/testing/enet/Kconfig
@@ -0,0 +1,32 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config ENET_TEST
+	tristate "cmocka enet test"
+	default n
+	depends on TESTING_CMOCKA
+	---help---
+		Enable the cmocka enet test
+
+if ENET_TEST
+config ENET_TEST_PROGNAME
+	string "Program name"
+	default "enet_test"
+	---help---
+		This is the name of the cmocka program that will be used as enet test.
+
+config ENET_TEST_PRIORITY
+	int "Task priority"
+	default 100
+
+config ENET_TEST_STACKSIZE
+	int "Stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+config ENET_TEST_DEV
+	string "Dev Node"
+	default "eth0"
+
+endif
diff --git a/testing/enet/Make.defs b/testing/enet/Make.defs
new file mode 100644
index 000000000..c7eb85737
--- /dev/null
+++ b/testing/enet/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# testing/enet/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_ENET_TEST),)
+CONFIGURED_APPS += $(APPDIR)/testing/enet
+endif
diff --git a/testing/enet/Makefile b/testing/enet/Makefile
new file mode 100644
index 000000000..5a8dd9270
--- /dev/null
+++ b/testing/enet/Makefile
@@ -0,0 +1,36 @@
+############################################################################
+# testing/enet/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+CFLAGS += -I$(APPDIR)/testing/enet/util
+CSRCS  += $(wildcard $(APPDIR)/testing/enet/util/*.c)
+
+CFLAGS += -I$(APPDIR)/testing/enet/include
+CSRCS  += $(wildcard $(APPDIR)/testing/enet/src/*.c)
+
+PRIORITY  = $(CONFIG_ENET_TEST_PRIORITY)
+STACKSIZE = $(CONFIG_ENET_TEST_STACKSIZE)
+MODULE    = $(CONFIG_ENET_TEST)
+
+PROGNAME += CONFIG_ENET_TEST_PROGNAME
+MAINSRC  += $(CURDIR)/enet_entry.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/enet/enet_entry.c b/testing/enet/enet_entry.c
new file mode 100644
index 000000000..bc2aeb210
--- /dev/null
+++ b/testing/enet/enet_entry.c
@@ -0,0 +1,58 @@
+/****************************************************************************
+ * apps/testing/enet/enet_entry.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "enettest.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: cmocka_test_main
+ ****************************************************************************/
+
+int main(int argc, char * argv[])
+{
+  /* Add Test Cases */
+
+  const struct CMUnitTest enettestsuite[] =
+  {
+    cmocka_unit_test_setup_teardown(test_enet_loopwr_datacheck,
+                                    enet_test_setup,
+                                    enet_test_teardown),
+  };
+
+  /* Run Test cases */
+
+  cmocka_run_group_tests(enettestsuite, NULL, NULL);
+  return 0;
+}
diff --git a/testing/enet/include/enettest.h b/testing/enet/include/enettest.h
new file mode 100644
index 000000000..d0a3ba717
--- /dev/null
+++ b/testing/enet/include/enettest.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+ * apps/testing/enet/include/enettest.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef _H_ENET_TEST_H_
+#define  H_ENET_TEST_H_
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "enet_util.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* TEST CASES FUNCTIONS */
+
+void test_enet_loopwr_datacheck(void **state);
+
+#endif //_H_ENET_TEST_H_
diff --git a/testing/enet/src/test_enet_loopwr_datacheck.c b/testing/enet/src/test_enet_loopwr_datacheck.c
new file mode 100644
index 000000000..1691d5344
--- /dev/null
+++ b/testing/enet/src/test_enet_loopwr_datacheck.c
@@ -0,0 +1,98 @@
+/****************************************************************************
+ * apps/testing/enet/src/test_enet_loopwr_datacheck.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "enettest.h"
+#include <sys/socket.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DATA_SIZE 200
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: test_enet_loopwr_datacheck
+ * Description:
+ *   This function tests the ENET loop write function and reads the frame
+ *   from the ENET interface without using poll.
+ ****************************************************************************/
+
+void test_enet_loopwr_datacheck(void **state)
+{
+  struct senet_testsuites_params *enet_if = *state;
+  uint8_t recv_data[DATA_SIZE];
+  ssize_t bytes_received;
+  int loop_count = 0;
+  const int LOOP_MAX = 20;
+  const uint8_t expected_mac[6] =
+  {
+    0x58,
+    0x32,
+    0x31,
+    0x32,
+    0x39,
+    0x37
+  };
+
+  /* Send frames */
+
+  sleep(10);
+  enet_loop_send_frame(state);
+
+  /* Read loop */
+
+  while (loop_count < LOOP_MAX)
+    {
+      /* Directly read data */
+
+      bytes_received = read(enet_if->enet_dev.fd, recv_data, DATA_SIZE);
+      assert_true(bytes_received >= 0);
+
+      if (bytes_received > 0)
+        {
+          /* Verify ethernet type (0x88f7) */
+
+          uint16_t eth_type = (recv_data[12] << 8) | recv_data[13];
+          assert_true(eth_type == 0x88f7);
+
+          /* Verify frame length matches expected size */
+
+          assert_true(bytes_received == DATA_SIZE);
+
+          /* Verify source MAC address */
+
+          assert_memory_equal(&recv_data[6], expected_mac, 6);
+          loop_count++;
+        }
+    }
+
+  /* Verify we received expected number of frames */
+
+  assert_true(loop_count == LOOP_MAX);
+}
diff --git a/testing/enet/util/enet_util.c b/testing/enet/util/enet_util.c
new file mode 100644
index 000000000..80af517ab
--- /dev/null
+++ b/testing/enet/util/enet_util.c
@@ -0,0 +1,284 @@
+/****************************************************************************
+ * apps/testing/enet/util/enet_util.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "enet_util.h"
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netpacket/packet.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DATA_SIZE 200
+
+#define ETH_PTP_TYPE 0x88f7
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: enet_test_setup
+ ****************************************************************************/
+
+int enet_test_setup(void **state)
+{
+  struct senet_testsuites_params *enet_p;
+  int ret;
+
+  enet_p = zalloc(sizeof(struct senet_testsuites_params));
+  assert_true(enet_p != NULL);
+  enet_p->enet_dev.if_name = strdup(CONFIG_ENET_TEST_DEV);
+  *state = enet_p;
+
+  /* ifup enet interface */
+
+  ret = netlib_ifup(enet_p->enet_dev.if_name);
+  assert_true(ret == 0);
+  enet_p->enet_dev.fd = enet_test_init(enet_p->enet_dev.if_name);
+  assert_true(enet_p->enet_dev.fd > 0);
+  return 0;
+}
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: enet_test_init
+ ****************************************************************************/
+
+int enet_test_init(const char *enetif)
+{
+  int ret;
+  int pkt_fd;
+  struct sockaddr_ll sll;
+  struct timeval timeout;
+  struct ifreq ifr;
+  int ifindex;
+  int optval;
+
+  /* Create raw socket */
+
+  pkt_fd = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, HTONS(ETH_PTP_TYPE));
+  assert_true(pkt_fd > 0);
+
+  /* Initialize socket address structure */
+
+  memset(&sll, 0, sizeof(struct sockaddr_ll));
+
+  /* Set socket timeout options */
+
+  timeout.tv_sec = 0;
+  timeout.tv_usec = 1;
+
+  ret = setsockopt(pkt_fd, SOL_SOCKET, SO_RCVTIMEO, &timeout,
+                   sizeof(timeout));
+  assert_true(ret == 0);
+
+  ret = setsockopt(pkt_fd, SOL_SOCKET, SO_SNDTIMEO, &timeout,
+                   sizeof(timeout));
+  assert_true(ret == 0);
+
+  /* Set don't route option */
+
+  optval = 1;
+  ret = setsockopt(pkt_fd, SOL_SOCKET, SO_DONTROUTE, &optval,
+                   sizeof(optval));
+  assert_true(ret == 0);
+
+  /* Get interface index */
+
+  strlcpy(ifr.ifr_name, enetif, IFNAMSIZ);
+  ret = ioctl(pkt_fd, SIOCGIFINDEX, &ifr);
+  assert_true(ret == 0);
+
+  ifindex = ifr.ifr_ifindex;
+
+  /* Get interface flags */
+
+  ret = ioctl(pkt_fd, SIOCGIFFLAGS, &ifr);
+  assert_true(ret == 0);
+
+  /* Set interface broadcast flag */
+
+  ifr.ifr_flags |= IFF_BROADCAST;
+  ret = ioctl(pkt_fd, SIOCSIFFLAGS, &ifr);
+  assert_true(ret == 0);
+
+  /* Prepare and bind socket */
+
+  sll.sll_family = AF_PACKET;
+  sll.sll_protocol = HTONS(ETH_PTP_TYPE);
+  sll.sll_ifindex = ifindex;
+
+  ret = bind(pkt_fd, (struct sockaddr *)&sll,
+             sizeof(struct sockaddr_ll));
+  assert_true(ret == 0);
+
+  return pkt_fd;
+
+errout_with_socket:
+  close(pkt_fd);
+  return -1;
+}
+
+/****************************************************************************
+ * Name: enet_loop_send_frame
+ * Description:
+ *   Test sending ethernet frames in a loop (20 times)
+ ****************************************************************************/
+
+void enet_loop_send_frame(void **state)
+{
+  struct senet_testsuites_params *enet_if = *state;
+  uint8_t data[DATA_SIZE];
+  const char *message = "Hello, World!";
+  uint16_t ip_checksum;
+  int ret;
+  size_t message_len;
+  int i;
+  const int LOOP_COUNT = 20;  /* Number of frames to send */
+
+  /* Initialize test data */
+
+  memset(data, 0, DATA_SIZE);
+
+  /* Setup ethernet header */
+
+  /* Destination MAC address (broadcast) */
+
+  data[0] = 0x01; data[1] = 0x00; data[2] = 0x5e;
+  data[3] = 0x00; data[4] = 0x00; data[5] = 0x00;
+
+  /* Source MAC address: 58:32:31:32:39:37 */
+
+  data[6] = 0x58; data[7] = 0x32; data[8] = 0x31;
+  data[9] = 0x32; data[10] = 0x39; data[11] = 0x37;
+
+  /* Ethernet type (IPv4) */
+
+  data[12] = 0x88; data[13] = 0xf7;
+
+  /* Setup IP header */
+
+  data[14] = 0x45;                    /* Version 4, IHL 5 (20 bytes) */
+  data[15] = 0x00;                    /* DSCP/ECN */
+  data[16] = 0x00; data[17] = 0x4e;   /* Total Length: 78 bytes */
+  data[18] = 0x00; data[19] = 0x00;   /* Identification */
+  data[20] = 0x00; data[21] = 0x00;   /* Flags and Fragment Offset */
+  data[22] = 0x40;                    /* TTL: 64 */
+  data[23] = 0x11;                    /* Protocol: UDP */
+  data[24] = 0x00; data[25] = 0x00;   /* Header Checksum (initial 0) */
+
+  /* Source IP: 10.0.0.2 */
+
+  data[26] = 0x0a; data[27] = 0x00;
+  data[28] = 0x00; data[29] = 0x02;
+
+  /* Destination IP: 255.255.255.255 (broadcast) */
+
+  data[30] = 0xff; data[31] = 0xff;
+  data[32] = 0xff; data[33] = 0xff;
+
+  /* Copy payload message */
+
+  message_len = strlen(message);
+  memcpy(data + 42, message, message_len);
+
+  /* Calculate IP header checksum */
+
+  ip_checksum = 0;
+  for (int i = 14; i < 34; i += 2)
+    {
+      ip_checksum += (data[i] << 8) | data[i + 1];
+    }
+
+  if (ip_checksum >> 16)
+    {
+      ip_checksum = (ip_checksum & 0xffff) + (ip_checksum >> 16);
+    }
+
+  ip_checksum = ~ip_checksum;
+  data[24] = (ip_checksum >> 8) & 0xff;
+  data[25] = ip_checksum & 0xff;
+
+  /* Send frames in a loop */
+
+  for (i = 0; i < LOOP_COUNT; i++)
+    {
+      ret = send(enet_if->enet_dev.fd, data, DATA_SIZE, 0);
+      assert_true(ret > 0);
+
+      /* Add a small delay between sends */
+
+      usleep(100000);  /* 100ms delay */
+    }
+
+  /* Verify we completed all sends */
+
+  assert_true(i == LOOP_COUNT);
+}
+
+/****************************************************************************
+ * Name: enet_test_teardown
+ ****************************************************************************/
+
+int enet_test_teardown(void **state)
+{
+  int ret;
+  struct senet_testsuites_params *enet_p;
+
+  if (state == NULL || *state == NULL)
+    {
+      return -1;
+    }
+
+  enet_p = *state;
+
+  /* close enet interface */
+
+  ret = close(enet_p->enet_dev.fd);
+  assert_true(ret == 0);
+  ret = netlib_ifdown(enet_p->enet_dev.if_name);
+  assert_true(ret >= 0);
+
+  /* free memory */
+
+  free(enet_p->enet_dev.if_name);
+
+  /* free structure */
+
+  free(enet_p);
+  *state = NULL;
+  return 0;
+}
diff --git a/testing/enet/util/enet_util.h b/testing/enet/util/enet_util.h
new file mode 100644
index 000000000..ac127b2af
--- /dev/null
+++ b/testing/enet/util/enet_util.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+ * apps/testing/enet/util/enet_util.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef _H_CM_ENETTEST_UTIL_H
+#define _H_CM_ENETTEST_UTIL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <nuttx/config.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include "netutils/netlib.h"
+#include <poll.h>
+#include <pthread.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct enet_if
+{
+  int fd;
+  char *if_name;
+};
+struct senet_testsuites_params
+{
+  struct enet_if enet_dev;
+  int loopmax;
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int enet_test_init (const char *enetif);
+int enet_test_teardown (void **state);
+int enet_test_setup (void **state);
+void enet_loop_send_frame(void **state);
+
+#endif /* CM_MYTEST_UTIL_H */

From b2f7ead2dd0bb37392c2095bcd6cc0dcb04e6922 Mon Sep 17 00:00:00 2001
From: zhangkai25 <zhangkai25@xiaomi.com>
Date: Sat, 8 Feb 2025 13:44:04 +0800
Subject: [PATCH 050/568] apps/examples/udp: Update CMAKEList.txt for UDP tests
 under CMAKE

add Update CMAKEList.txt for UDP tests under CMAKE

Signed-off-by: zhangkai25 <zhangkai25@xiaomi.com>
---
 examples/udp/CMakeLists.txt | 57 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/examples/udp/CMakeLists.txt b/examples/udp/CMakeLists.txt
index 996b9a9be..b3cbdf166 100644
--- a/examples/udp/CMakeLists.txt
+++ b/examples/udp/CMakeLists.txt
@@ -21,5 +21,60 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_UDP)
-  nuttx_add_application(NAME udp)
+
+  # Basic UDP networking test
+
+  set(CSRCS udp_cmdline.c)
+
+  if(CONFIG_EXAMPLES_UDP_NETINIT)
+    list(APPEND CSRCS udp_netinit.c)
+  endif()
+
+  # Target 1 Files
+
+  if(CONFIG_EXAMPLES_UDP_SERVER1)
+    list(APPEND CSRCS udp_server.c)
+  else()
+    list(APPEND CSRCS udp_client.c)
+  endif()
+
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_UDP_PROGNAME1}
+    PRIORITY
+    ${CONFIG_EXAMPLES_UDP_PRIORITY1}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_UDP_STACKSIZE1}
+    MODULE
+    ${CONFIG_EXAMPLES_UDP}
+    INCLUDE_DIRECTORIES
+    ${CMAKE_BINARY_DIR}/include/nuttx
+    SRCS
+    udp_target1.c
+    ${CSRCS})
+
+  # Target 2 Files
+
+  if(CONFIG_EXAMPLES_UDP_TARGET2)
+    if(CONFIG_EXAMPLES_UDP_SERVER1)
+      list(APPEND CSRCS udp_client.c)
+    else()
+      list(APPEND CSRCS udp_server.c)
+    endif()
+
+    nuttx_add_application(
+      NAME
+      ${CONFIG_EXAMPLES_UDP_PROGNAME2}
+      PRIORITY
+      ${CONFIG_EXAMPLES_UDP_PRIORITY2}
+      STACKSIZE
+      ${CONFIG_EXAMPLES_UDP_STACKSIZE2}
+      MODULE
+      ${CONFIG_EXAMPLES_UDP}
+      INCLUDE_DIRECTORIES
+      ${CMAKE_BINARY_DIR}/include/nuttx
+      SRCS
+      udp_target2.c
+      ${CSRCS})
+  endif()
 endif()

From 40c7982816ebc9f2c6a2c18f44e43cc5158b15cc Mon Sep 17 00:00:00 2001
From: Zhe Weng <wengzhe@xiaomi.com>
Date: Tue, 7 Jan 2025 18:10:13 +0800
Subject: [PATCH 051/568] netlib: Add support for adding/removing VLAN device

Add support for adding/removing VLAN device

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 include/netutils/netlib.h        |  5 +++
 netutils/netlib/CMakeLists.txt   |  4 ++
 netutils/netlib/Makefile         |  4 ++
 netutils/netlib/netlib_addvlan.c | 74 ++++++++++++++++++++++++++++++++
 netutils/netlib/netlib_delvlan.c | 72 +++++++++++++++++++++++++++++++
 5 files changed, 159 insertions(+)
 create mode 100644 netutils/netlib/netlib_addvlan.c
 create mode 100644 netutils/netlib/netlib_delvlan.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index b5389a55d..5c7b6a74f 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -329,6 +329,11 @@ int netlib_getessid(FAR const char *ifname, FAR char *essid, size_t idlen);
 int netlib_setessid(FAR const char *ifname, FAR const char *essid);
 #endif
 
+#ifdef CONFIG_NET_VLAN
+int netlib_add_vlan(FAR const char *ifname, int vlanid);
+int netlib_del_vlan(FAR const char *vlanif);
+#endif
+
 #ifdef CONFIG_NET_ARP
 /* ARP Table Support */
 
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 82cc8d610..3f3697e95 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -118,6 +118,10 @@ if(CONFIG_NETUTILS_NETLIB)
     list(APPEND SRCS netlib_setmacaddr.c netlib_getmacaddr.c)
   endif()
 
+  if(CONFIG_NET_VLAN)
+    list(APPEND SRCS netlib_addvlan.c netlib_delvlan.c)
+  endif()
+
   list(APPEND SRCS netlib_setmtu.c)
 
   if(CONFIG_WIRELESS_IEEE802154)
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 3d6066e3f..32eafe2f8 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -123,6 +123,10 @@ ifeq ($(CONFIG_NET_ETHERNET),y)
 CSRCS += netlib_setmacaddr.c netlib_getmacaddr.c
 endif
 
+ifeq ($(CONFIG_NET_VLAN),y)
+CSRCS += netlib_addvlan.c netlib_delvlan.c
+endif
+
 CSRCS += netlib_setmtu.c
 
 ifeq ($(CONFIG_WIRELESS_IEEE802154),y)
diff --git a/netutils/netlib/netlib_addvlan.c b/netutils/netlib/netlib_addvlan.c
new file mode 100644
index 000000000..87cbcf712
--- /dev/null
+++ b/netutils/netlib/netlib_addvlan.c
@@ -0,0 +1,74 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_addvlan.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#ifdef CONFIG_NET_VLAN
+
+#include <nuttx/net/vlan.h>
+
+#include "netutils/netlib.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_add_vlan
+ *
+ * Description:
+ *   Add a VLAN interface to an existing network device.
+ *
+ * Parameters:
+ *   ifname - The name of the existing network device
+ *   vlanid - The VLAN identifier to be added
+ *
+ * Return:
+ *   0 on success; -1 on failure
+ *
+ ****************************************************************************/
+
+int netlib_add_vlan(FAR const char *ifname, int vlanid)
+{
+  int ret = ERROR;
+
+  if (ifname && vlanid > 0)
+    {
+      int sockfd = socket(NET_SOCK_FAMILY, NET_SOCK_TYPE, NET_SOCK_PROTOCOL);
+      if (sockfd >= 0)
+        {
+          struct vlan_ioctl_args ifv;
+
+          strlcpy(ifv.device1, ifname, sizeof(ifv.device1));
+          ifv.u.VID = vlanid;
+          ifv.cmd = ADD_VLAN_CMD;
+
+          ret = ioctl(sockfd, SIOCSIFVLAN, &ifv);
+          close(sockfd);
+        }
+    }
+
+  return ret;
+}
+
+#endif /* CONFIG_NET_VLAN */
diff --git a/netutils/netlib/netlib_delvlan.c b/netutils/netlib/netlib_delvlan.c
new file mode 100644
index 000000000..1b6a2ceb3
--- /dev/null
+++ b/netutils/netlib/netlib_delvlan.c
@@ -0,0 +1,72 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_delvlan.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#ifdef CONFIG_NET_VLAN
+
+#include <nuttx/net/vlan.h>
+
+#include "netutils/netlib.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_del_vlan
+ *
+ * Description:
+ *   Remove a VLAN interface from an existing network device.
+ *
+ * Parameters:
+ *   vlanif - The name of the VLAN network device
+ *
+ * Return:
+ *   0 on success; -1 on failure
+ *
+ ****************************************************************************/
+
+int netlib_del_vlan(FAR const char *vlanif)
+{
+  int ret = ERROR;
+
+  if (vlanif)
+    {
+      int sockfd = socket(NET_SOCK_FAMILY, NET_SOCK_TYPE, NET_SOCK_PROTOCOL);
+      if (sockfd >= 0)
+        {
+          struct vlan_ioctl_args ifv;
+
+          strlcpy(ifv.device1, vlanif, sizeof(ifv.device1));
+          ifv.cmd = DEL_VLAN_CMD;
+
+          ret = ioctl(sockfd, SIOCSIFVLAN, &ifv);
+          close(sockfd);
+        }
+    }
+
+  return ret;
+}
+
+#endif /* CONFIG_NET_VLAN */

From 3ddda82313de4cb3f7eae8e4af6d7e9b5e56a350 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Sat, 15 Mar 2025 13:53:43 +0800
Subject: [PATCH 052/568] netutils/ptpd: add CMakelist for ptpd

support cmake build

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/CMakeLists.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 netutils/ptpd/CMakeLists.txt

diff --git a/netutils/ptpd/CMakeLists.txt b/netutils/ptpd/CMakeLists.txt
new file mode 100644
index 000000000..35c36b5b1
--- /dev/null
+++ b/netutils/ptpd/CMakeLists.txt
@@ -0,0 +1,23 @@
+# ##############################################################################
+# apps/netutils/ptpd/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_NETUTILS_PTPD)
+  target_sources(apps PRIVATE ptpd.c)
+endif()

From e4ddfdeed1ac715d43ffa4c5d129ac4090f47cde Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Sat, 15 Mar 2025 14:01:35 +0800
Subject: [PATCH 053/568] netutils/ptpd: byte align for ptp structure

pass structure between remote and local core

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpv2.h | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/netutils/ptpd/ptpv2.h b/netutils/ptpd/ptpv2.h
index 8b031567b..3f4525428 100644
--- a/netutils/ptpd/ptpv2.h
+++ b/netutils/ptpd/ptpv2.h
@@ -27,6 +27,8 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/compiler.h>
+
 #include <stdint.h>
 
 /****************************************************************************
@@ -67,7 +69,7 @@
 
 /* Common header for all message types */
 
-struct ptp_header_s
+begin_packed_struct struct ptp_header_s
 {
   uint8_t messagetype;
   uint8_t version;
@@ -82,11 +84,11 @@ struct ptp_header_s
   uint8_t sequenceid[2];
   uint8_t controlfield;
   uint8_t logmessageinterval;
-};
+} end_packed_struct;
 
 /* Announce a master clock */
 
-struct ptp_announce_s
+begin_packed_struct struct ptp_announce_s
 {
   struct ptp_header_s header;
   uint8_t origintimestamp[10];
@@ -98,40 +100,40 @@ struct ptp_announce_s
   uint8_t gm_identity[8];
   uint8_t stepsremoved[2];
   uint8_t timesource;
-};
+} end_packed_struct;
 
 /* Sync: transmit timestamp from master clock */
 
-struct ptp_sync_s
+begin_packed_struct struct ptp_sync_s
 {
   struct ptp_header_s header;
   uint8_t origintimestamp[10];
-};
+} end_packed_struct;
 
 /* FollowUp: actual timestamp of when sync message was sent */
 
-struct ptp_follow_up_s
+begin_packed_struct struct ptp_follow_up_s
 {
   struct ptp_header_s header;
   uint8_t origintimestamp[10];
-};
+} end_packed_struct;
 
 /* DelayReq: request delay measurement */
 
-struct ptp_delay_req_s
+begin_packed_struct struct ptp_delay_req_s
 {
   struct ptp_header_s header;
   uint8_t origintimestamp[10];
-};
+} end_packed_struct;
 
 /* DelayResp: response to DelayReq */
 
-struct ptp_delay_resp_s
+begin_packed_struct struct ptp_delay_resp_s
 {
   struct ptp_header_s header;
   uint8_t receivetimestamp[10];
   uint8_t reqidentity[8];
   uint8_t reqportindex[2];
-};
+} end_packed_struct;
 
 #endif /* __APPS_NETUTILS_PTPD_PTPV2_H */

From d1f59bef8ee8b7ea9b2e82de1ac5c6123baca10e Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Sun, 23 Mar 2025 23:05:52 +0800
Subject: [PATCH 054/568] netutils/ptpd: using DEBUG_PTP_ERR/WARN/INFO to
 replace NETUTILS_PTPD_DEBUG

using new ptp clock device debug function

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/Kconfig |  7 -------
 netutils/ptpd/ptpd.c  | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/netutils/ptpd/Kconfig b/netutils/ptpd/Kconfig
index 93cd288ca..110223bd7 100644
--- a/netutils/ptpd/Kconfig
+++ b/netutils/ptpd/Kconfig
@@ -17,13 +17,6 @@ config NETUTILS_PTPD
 
 if NETUTILS_PTPD
 
-config NETUTILS_PTPD_DEBUG
-	bool "Enable PTP debug messages"
-	default n
-	depends on DEBUG_INFO
-	---help---
-		Enable PTP debug messages even if CONFIG_DEBUG_NET_INFO is not enabled.
-
 config NETUTILS_PTPD_CLIENT
 	bool "Enable client support"
 	default y
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 309f78a07..bdfae08a0 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -172,16 +172,6 @@ struct ptp_state_s
  * debugging without having excessive amount of logging from net.
  */
 
-#ifdef CONFIG_NETUTILS_PTPD_DEBUG
-#  define ptpinfo _info
-#  define ptpwarn _warn
-#  define ptperr  _err
-#else
-#  define ptpinfo ninfo
-#  define ptpwarn nwarn
-#  define ptperr  nerr
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/

From 28302ae7d74db81f65995389e7acbac754b2a438 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Mon, 24 Mar 2025 16:10:35 +0800
Subject: [PATCH 055/568] system/ptpd: using main task to replace new task

new starting command:
ptpd start interface &

we should run it in background ways

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c    | 73 +++++++++++------------------------------
 system/ptpd/ptpd_main.c | 17 ++++------
 2 files changed, 26 insertions(+), 64 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index bdfae08a0..411c9f4eb 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -1376,11 +1376,27 @@ static void ptp_process_statusreq(FAR struct ptp_state_s *state)
   state->status_req.dest = NULL;
 }
 
-/* Main PTPD task */
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-static int ptp_daemon(int argc, FAR char** argv)
+/****************************************************************************
+ * Name: ptpd_start
+ *
+ * Description:
+ *   Start the PTP daemon and bind it to specified interface.
+ *
+ * Input Parameters:
+ *   interface - Name of the network interface to bind to, e.g. "eth0"
+ *
+ * Returned Value:
+ *   On success, the non-negative task ID of the PTP daemon is returned;
+ *   On failure, a negated errno value is returned.
+ *
+ ****************************************************************************/
+
+int ptpd_start(FAR const char *interface)
 {
-  FAR const char *interface = "eth0";
   FAR struct ptp_state_s *state;
   struct pollfd pollfds[2];
   struct msghdr rxhdr;
@@ -1392,11 +1408,6 @@ static int ptp_daemon(int argc, FAR char** argv)
 
   state = calloc(1, sizeof(struct ptp_state_s));
 
-  if (argc > 1)
-    {
-      interface = argv[1];
-    }
-
   if (ptp_initialize_state(state, interface) != OK)
     {
       ptperr("Failed to initialize PTP state, exiting\n");
@@ -1477,52 +1488,6 @@ static int ptp_daemon(int argc, FAR char** argv)
   return 0;
 }
 
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: ptpd_start
- *
- * Description:
- *   Start the PTP daemon and bind it to specified interface.
- *
- * Input Parameters:
- *   interface - Name of the network interface to bind to, e.g. "eth0"
- *
- * Returned Value:
- *   On success, the non-negative task ID of the PTP daemon is returned;
- *   On failure, a negated errno value is returned.
- *
- ****************************************************************************/
-
-int ptpd_start(FAR const char *interface)
-{
-  int pid;
-  FAR char *task_argv[] =
-  {
-    (FAR char *)interface,
-    NULL
-  };
-
-  pid = task_create("PTPD", CONFIG_NETUTILS_PTPD_SERVERPRIO,
-                    CONFIG_NETUTILS_PTPD_STACKSIZE, ptp_daemon, task_argv);
-
-  /* Use kill with signal 0 to check if the process is still alive
-   * after initialization.
-   */
-
-  usleep(USEC_PER_TICK);
-  if (kill(pid, 0) != OK)
-    {
-      return ERROR;
-    }
-  else
-    {
-      return pid;
-    }
-}
-
 /****************************************************************************
  * Name: ptpd_status
  *
diff --git a/system/ptpd/ptpd_main.c b/system/ptpd/ptpd_main.c
index 503300bce..36b8b67c6 100644
--- a/system/ptpd/ptpd_main.c
+++ b/system/ptpd/ptpd_main.c
@@ -37,17 +37,14 @@
 
 static int do_ptpd_start(FAR const char *interface)
 {
-  int pid;
+  int ret;
 
-  pid = ptpd_start(interface);
-  if (pid < 0)
-    {
-      fprintf(stderr, "ERROR: ptpd_start() failed\n");
-      return EXIT_FAILURE;
-    }
+  ret = ptpd_start(interface);
 
-  printf("Started the PTP daemon as PID=%d\n", pid);
-  return EXIT_SUCCESS;
+  /* Should never happen */
+
+  fprintf(stderr, "ERROR: ptpd_start() failed:%d\n", ret);
+  return EXIT_FAILURE;
 }
 
 static int do_ptpd_status(int pid)
@@ -168,7 +165,7 @@ int main(int argc, FAR char *argv[])
   else
     {
       fprintf(stderr, "Usage: \n"
-                      "ptpd start <interface>\n"
+                      "ptpd start <interface> &\n"
                       "ptpd status <pid>\n"
                       "ptpd stop <pid>\n");
       return EXIT_FAILURE;

From ac881e510889fddd9a36ba09203f0d460d9f0dee Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Sat, 15 Mar 2025 13:46:07 +0800
Subject: [PATCH 056/568] system/ptpd: provide more parameter by struct
 ptpd_config_s when starting ptpd

origin command change to new command:
ptpd start interface & -> ptpd -i eth0 &
ptpd stop pid          -> ptpd -d pid
ptpd status pid        -> ptpd -t status

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 include/netutils/ptpd.h | 16 +++++--
 netutils/ptpd/ptpd.c    |  8 +++-
 system/ptpd/ptpd_main.c | 95 ++++++++++++++++++++++++++++++++---------
 3 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/include/netutils/ptpd.h b/include/netutils/ptpd.h
index 8e5a3c508..73a615be0 100644
--- a/include/netutils/ptpd.h
+++ b/include/netutils/ptpd.h
@@ -27,6 +27,8 @@
  * Included Files
  ****************************************************************************/
 
+#include <sys/types.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -35,6 +37,14 @@
  * Public Types
  ****************************************************************************/
 
+struct ptpd_config_s
+{
+  FAR const char *interface;
+  FAR const char *clock;
+  bool hardware_ts;
+  sa_family_t af;
+};
+
 /* PTPD status information structure */
 
 struct ptpd_status_s
@@ -115,10 +125,10 @@ extern "C"
  * Name: ptpd_start
  *
  * Description:
- *   Start the PTP daemon and bind it to specified interface.
+ *   Start the PTP daemon and bind it to specified config.
  *
  * Input Parameters:
- *   interface - Name of the network interface to bind to, e.g. "eth0"
+ *   config - The configs of PTP daemon, includes interface, af and clock...
  *
  * Returned Value:
  *   On success, the non-negative task ID of the PTP daemon is returned;
@@ -126,7 +136,7 @@ extern "C"
  *
  ****************************************************************************/
 
-int ptpd_start(FAR const char *interface);
+int ptpd_start(FAR const struct ptpd_config_s *config);
 
 /****************************************************************************
  * Name: ptpd_status
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 411c9f4eb..492f762b3 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -1395,7 +1395,7 @@ static void ptp_process_statusreq(FAR struct ptp_state_s *state)
  *
  ****************************************************************************/
 
-int ptpd_start(FAR const char *interface)
+int ptpd_start(FAR const struct ptpd_config_s *config)
 {
   FAR struct ptp_state_s *state;
   struct pollfd pollfds[2];
@@ -1407,8 +1407,12 @@ int ptpd_start(FAR const char *interface)
   memset(&rxiov, 0, sizeof(rxiov));
 
   state = calloc(1, sizeof(struct ptp_state_s));
+  if (state == NULL)
+    {
+      return -ENOMEM;
+    }
 
-  if (ptp_initialize_state(state, interface) != OK)
+  if (ptp_initialize_state(state, config->interface) != OK)
     {
       ptperr("Failed to initialize PTP state, exiting\n");
 
diff --git a/system/ptpd/ptpd_main.c b/system/ptpd/ptpd_main.c
index 36b8b67c6..75cca2900 100644
--- a/system/ptpd/ptpd_main.c
+++ b/system/ptpd/ptpd_main.c
@@ -28,6 +28,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/socket.h>
+#include <unistd.h>
 
 #include "netutils/ptpd.h"
 
@@ -35,11 +37,11 @@
  * Private Functions
  ****************************************************************************/
 
-static int do_ptpd_start(FAR const char *interface)
+static int do_ptpd_start(FAR const struct ptpd_config_s *config)
 {
   int ret;
 
-  ret = ptpd_start(interface);
+  ret = ptpd_start(config);
 
   /* Should never happen */
 
@@ -140,6 +142,24 @@ int do_ptpd_stop(int pid)
     }
 }
 
+static void usage(FAR const char *progname)
+{
+  fprintf(stderr, "Usage: %s [options]: run this daemon in background.\n"
+                  " Network Transport:\n"
+                  " -2       IEEE 802.3\n"
+                  " -4       UDP IPV4 (default)\n"
+                  " -6       UDP IPV6\n"
+                  " Time Stamping:\n"
+                  " -H       HARDWARE (default) depends on NET_TIMESTAMP\n"
+                  " -S       SOFTWARE\n"
+                  " -r       synchronize system (realtime) clock\n"
+                  " -i [dev] interface device to use, for example 'eth0'\n"
+                  " -p [dev] clock device to use\n"
+                  " -t [pid] look the status of ptp daemon\n"
+                  " -s [pid] stop ptp daemon\n",
+                  progname);
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -150,24 +170,59 @@ int do_ptpd_stop(int pid)
 
 int main(int argc, FAR char *argv[])
 {
-  if (argc == 3 && strcmp(argv[1], "start") == 0)
+  struct ptpd_config_s config;
+  int option;
+
+  /* Default config for ptp daemon */
+
+  config.interface = "eth0";
+  config.clock = "realtime";
+#ifdef CONFIG_NET_TIMESTAMP
+  config.hardware_ts = true;
+#else
+  config.hardware_ts = false;
+#endif
+  config.af = AF_INET;
+
+  while ((option = getopt(argc, argv, "p:i:t:s:r246HS")) != ERROR)
     {
-      return do_ptpd_start(argv[2]);
-    }
-  else if (argc == 3 && strcmp(argv[1], "status") == 0)
-    {
-      return do_ptpd_status(atoi(argv[2]));
-    }
-  else if (argc == 3 && strcmp(argv[1], "stop") == 0)
-    {
-      return do_ptpd_stop(atoi(argv[2]));
-    }
-  else
-    {
-      fprintf(stderr, "Usage: \n"
-                      "ptpd start <interface> &\n"
-                      "ptpd status <pid>\n"
-                      "ptpd stop <pid>\n");
-      return EXIT_FAILURE;
+      switch (option)
+        {
+          case 't':
+            return do_ptpd_status(atoi(optarg));
+          case 's':
+            return do_ptpd_stop(atoi(optarg));
+          case '2':
+            config.af = AF_PACKET;
+            break;
+          case '4':
+            config.af = AF_INET;
+            break;
+          case '6':
+            config.af = AF_INET6;
+            break;
+#ifdef CONFIG_NET_TIMESTAMP
+          case 'H':
+            config.hardware_ts = true;
+            break;
+#endif
+          case 'S':
+            config.hardware_ts = false;
+            break;
+          case 'i':
+            config.interface = optarg;
+            break;
+          case 'p':
+            config.clock = optarg;
+            break;
+          case 'r':
+            config.clock = "realtime";
+            break;
+          default:
+            usage(argv[0]);
+            return 0;
+        }
     }
+
+  return do_ptpd_start(&config);
 }

From 4411a41bc2498ad65eb665937b446d4df9456228 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Mon, 17 Mar 2025 16:45:32 +0800
Subject: [PATCH 057/568] netutils/ptpd: using hardware_ts to replace
 CONFIG_NET_TIMESTAMP

runtime to config the ways of timestamp

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 492f762b3..b04d7be72 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -159,6 +159,7 @@ struct ptp_state_s
 
   struct ptp_sync_s twostep_packet;
   struct timespec twostep_rxtime;
+  FAR const struct ptpd_config_s *config;
 };
 
 #ifdef CONFIG_NETUTILS_PTPD_SERVER
@@ -362,10 +363,14 @@ static int ptp_getrxtime(FAR struct ptp_state_s *state,
                          FAR struct msghdr *rxhdr,
                          FAR struct timespec *ts)
 {
+  FAR struct cmsghdr *cmsg;
+
   /* Get hardware or kernel timestamp if available */
 
-#ifdef CONFIG_NET_TIMESTAMP
-  struct cmsghdr *cmsg;
+  if (!state->config->hardware_ts)
+    {
+      return ptp_gettime(state, ts);
+    }
 
   for_each_cmsghdr(cmsg, rxhdr)
     {
@@ -385,11 +390,7 @@ static int ptp_getrxtime(FAR struct ptp_state_s *state,
     }
 
   ptpwarn("CONFIG_NET_TIMESTAMP enabled but did not get packet timestamp\n");
-#endif
-
-  /* Fall back to current timestamp */
-
-  return ptp_gettime(state, ts);
+  return ERROR;
 }
 
 /* Initialize PTP client/server state and create sockets */
@@ -398,13 +399,10 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
                                 FAR const char *interface)
 {
   int ret;
+  int arg = 1;
   struct ifreq req;
   struct sockaddr_in bind_addr;
 
-#ifdef CONFIG_NET_TIMESTAMP
-  int arg;
-#endif
-
   /* Create sockets */
 
   state->tx_socket = socket(AF_INET, SOCK_DGRAM, 0);
@@ -504,18 +502,17 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
       return ERROR;
     }
 
-#ifdef CONFIG_NET_TIMESTAMP
-  arg = 1;
-  ret = setsockopt(state->event_socket, SOL_SOCKET, SO_TIMESTAMP,
-                   &arg, sizeof(arg));
-
-  if (ret < 0)
+  if (state->config->hardware_ts)
     {
-      ptperr("Failed to enable SO_TIMESTAMP: %s\n", strerror(errno));
+      ret = setsockopt(state->event_socket, SOL_SOCKET, SO_TIMESTAMP,
+                       &arg, sizeof(arg));
 
-      /* PTPD can operate without, but with worse accuracy */
+      if (ret < 0)
+        {
+          ptperr("Failed to enable SO_TIMESTAMP: %s\n", strerror(errno));
+          return ERROR;
+        }
     }
-#endif
 
   /* Bind socket for announcements */
 
@@ -1412,6 +1409,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
       return -ENOMEM;
     }
 
+  state->config = config;
   if (ptp_initialize_state(state, config->interface) != OK)
     {
       ptperr("Failed to initialize PTP state, exiting\n");

From e718fdd2c696e95e7dad2a01bc73b6fff0800b82 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Sun, 23 Mar 2025 22:30:24 +0800
Subject: [PATCH 058/568] netutils/ptpd: get nanoseconds by SO_TIMESTAMPNS to
 satisfy higher precision

using nanoseconds as timestamp

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index b04d7be72..4ba8d2c86 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -375,7 +375,7 @@ static int ptp_getrxtime(FAR struct ptp_state_s *state,
   for_each_cmsghdr(cmsg, rxhdr)
     {
       if (cmsg->cmsg_level == SOL_SOCKET &&
-          cmsg->cmsg_type == SO_TIMESTAMP &&
+          cmsg->cmsg_type == SO_TIMESTAMPNS &&
           cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval)))
         {
           TIMEVAL_TO_TIMESPEC((FAR struct timeval *)CMSG_DATA(cmsg), ts);
@@ -504,12 +504,12 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
 
   if (state->config->hardware_ts)
     {
-      ret = setsockopt(state->event_socket, SOL_SOCKET, SO_TIMESTAMP,
+      ret = setsockopt(state->event_socket, SOL_SOCKET, SO_TIMESTAMPNS,
                        &arg, sizeof(arg));
 
       if (ret < 0)
         {
-          ptperr("Failed to enable SO_TIMESTAMP: %s\n", strerror(errno));
+          ptperr("Failed to enable SO_TIMESTAMPNS: %s\n", strerror(errno));
           return ERROR;
         }
     }

From 832e61c1c4eb5a4b8ee3394fb5cfcd7945ef8e25 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Mon, 24 Feb 2025 21:57:52 +0800
Subject: [PATCH 059/568] netutils/ptpd: Add the missing comparison in
 is_better_clock

The original implementation only checked if each field was less than,
but didn't check for greater than before proceeding to the next field.
This caused incorrect clock selection behavior in the PTP Best Master
Clock Algorithm (BMCA).

The fix expands each comparison to explicitly check both < and >
conditions, returning the appropriate result immediately. This ensures
proper precedence evaluation according to IEEE 1588 specification:
- gm_priority1
- gm_quality (class, accuracy, variance)
- gm_priority2
- gm_identity

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 75 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 8 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 4ba8d2c86..2003e5a08 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -231,20 +231,79 @@ static void ptp_format_to_timespec(FAR const uint8_t *timestamp,
 static bool is_better_clock(FAR const struct ptp_announce_s *a,
                             FAR const struct ptp_announce_s *b)
 {
-  if  (a->gm_priority1 < b->gm_priority1     /* Main priority field */
-    || a->gm_quality[0] < b->gm_quality[0]   /* Clock class */
-    || a->gm_quality[1] < b->gm_quality[1]   /* Clock accuracy */
-    || a->gm_quality[2] < b->gm_quality[2]   /* Clock variance high byte */
-    || a->gm_quality[3] < b->gm_quality[3]   /* Clock variance low byte */
-    || a->gm_priority2 < b->gm_priority2     /* Sub priority field */
-    || memcmp(a->gm_identity, b->gm_identity, sizeof(a->gm_identity)) < 0)
+  /* Main priority field */
+
+  if (a->gm_priority1 < b->gm_priority1)
     {
       return true;
     }
-    else
+
+  if (a->gm_priority1 > b->gm_priority1)
     {
       return false;
     }
+
+  /* Clock class */
+
+  if (a->gm_quality[0] < b->gm_quality[0])
+    {
+      return true;
+    }
+
+  if (a->gm_quality[0] > b->gm_quality[0])
+    {
+      return false;
+    }
+
+  /* Clock accuracy */
+
+  if (a->gm_quality[1] < b->gm_quality[1])
+    {
+      return true;
+    }
+
+  if (a->gm_quality[1] > b->gm_quality[1])
+    {
+      return false;
+    }
+
+  /* Clock variance high byte */
+
+  if (a->gm_quality[2] < b->gm_quality[2])
+    {
+      return true;
+    }
+
+  if (a->gm_quality[2] > b->gm_quality[2])
+    {
+      return false;
+    }
+
+  /* Clock variance low byte */
+
+  if (a->gm_quality[3] < b->gm_quality[3])
+    {
+      return true;
+    }
+
+  if (a->gm_quality[3] > b->gm_quality[3])
+    {
+      return false;
+    }
+
+  /* Sub priority field */
+
+  if (a->gm_priority2 < b->gm_priority2)
+    {
+      return true;
+    }
+
+  if (a->gm_priority2 > b->gm_priority2)
+    {
+      return false;
+    }
+
+  return memcmp(a->gm_identity, b->gm_identity, sizeof(a->gm_identity)) < 0;
 }
 
 static int64_t timespec_to_ms(FAR const struct timespec *ts)

From 5d34a0906a18ec1772d647030ec7208a6428d941 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Mon, 24 Feb 2025 21:57:13 +0800
Subject: [PATCH 060/568] netutils/ptp: destroy donesem at the end of
 ptpd_status

fix minor issue

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 2003e5a08..17f232406 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -56,7 +56,7 @@
 #include "ptpv2.h"
 
 /****************************************************************************
- * Private Data
+ * Private Types
  ****************************************************************************/
 
 /* Carrier structure for querying PTPD status */
@@ -179,7 +179,7 @@ struct ptp_state_s
 
 /* Convert from timespec to PTP format */
 
-static void timespec_to_ptp_format(FAR struct timespec *ts,
+static void timespec_to_ptp_format(FAR const struct timespec *ts,
                                    FAR uint8_t *timestamp)
 {
   /* IEEE 1588 uses 48 bits for seconds and 32 bits for nanoseconds,
@@ -490,7 +490,7 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
    */
 
   memset(&req, 0, sizeof(req));
-  strncpy(req.ifr_name, interface, sizeof(req.ifr_name));
+  strlcpy(req.ifr_name, interface, sizeof(req.ifr_name));
 
   if (ioctl(state->event_socket, SIOCGIFADDR, (unsigned long)&req) < 0)
     {
@@ -1293,7 +1293,7 @@ static int ptp_process_rx_packet(FAR struct ptp_state_s *state,
   clock_gettime(CLOCK_MONOTONIC, &state->last_received_multicast);
 
   switch (state->rxbuf.header.messagetype & PTP_MSGTYPE_MASK)
-  {
+    {
 #ifdef CONFIG_NETUTILS_PTPD_CLIENT
     case PTP_MSGTYPE_ANNOUNCE:
       ptpinfo("Got announce packet, seq %ld\n",
@@ -1327,7 +1327,7 @@ static int ptp_process_rx_packet(FAR struct ptp_state_s *state,
       ptpinfo("Ignoring unknown PTP packet type: 0x%02x\n",
               state->rxbuf.header.messagetype);
       return OK;
-  }
+    }
 }
 
 /* Signal handler for status / stop requests */
@@ -1610,6 +1610,7 @@ int ptpd_status(int pid, FAR struct ptpd_status_s *status)
       ret = -errno;
     }
 
+  sem_destroy(&donesem);
   return ret;
 
 #endif /* CONFIG_BUILD_FLAT */

From 4426ce733a541d97d4f35d679066dce845bdf719 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Thu, 27 Mar 2025 21:57:06 +0800
Subject: [PATCH 061/568] netutils/ptpd: using dynamic config to config
 clien-only mode and delaye2e

fix compile warning when only enable PTPD_CLIENT or PTPD_SERVER

ptpd.c:493:38: error: 'CONFIG_NETUTILS_PTPD_PRIORITY1' undeclared (first
use in this function); did you mean 'CONFIG_NETUTILS_PTPD_CLIENT'?

ptpd.c:494:39: error: 'CONFIG_NETUTILS_PTPD_CLASS' undeclared (first use
in this function); did you mean 'CONFIG_NETUTILS_PTPD_CLIENT'?

ptpd.c:495:39: error: 'CONFIG_NETUTILS_PTPD_ACCURACY' undeclared (first
use in this function); did you mean 'CONFIG_NETUTILS_PTPD_DEBUG'?
ptpd.c:498:38: error: 'CONFIG_NETUTILS_PTPD_PRIORITY2' undeclared (first
use in this function); did you mean 'CONFIG_NETUTILS_PTPD_CLIENT'?

ptpd.c:502:36: error: 'CONFIG_NETUTILS_PTPD_CLOCKSOURCE' undeclared
(first use in this function); did you mean
'CONFIG_NETUTILS_PTPD_STACKSIZE'?

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 include/netutils/ptpd.h |  2 ++
 netutils/ptpd/Kconfig   | 37 -------------------------------------
 netutils/ptpd/ptpd.c    | 36 ++++++++++++++----------------------
 system/ptpd/ptpd_main.c | 16 +++++++++++++---
 4 files changed, 29 insertions(+), 62 deletions(-)

diff --git a/include/netutils/ptpd.h b/include/netutils/ptpd.h
index 73a615be0..ea4b9fb7b 100644
--- a/include/netutils/ptpd.h
+++ b/include/netutils/ptpd.h
@@ -41,7 +41,9 @@ struct ptpd_config_s
 {
   FAR const char *interface;
   FAR const char *clock;
+  bool client_only;
   bool hardware_ts;
+  bool delay_e2e;
   sa_family_t af;
 };
 
diff --git a/netutils/ptpd/Kconfig b/netutils/ptpd/Kconfig
index 110223bd7..6c2b17bd8 100644
--- a/netutils/ptpd/Kconfig
+++ b/netutils/ptpd/Kconfig
@@ -17,24 +17,6 @@ config NETUTILS_PTPD
 
 if NETUTILS_PTPD
 
-config NETUTILS_PTPD_CLIENT
-	bool "Enable client support"
-	default y
-	---help---
-		Act as a PTP client, synchronizing the NuttX clock to a remote master
-		clock.
-
-config NETUTILS_PTPD_SERVER
-	bool "Enable server support"
-	default n
-	---help---
-		Act as a PTP server, providing NuttX clock time to other systems.
-
-		Both server and client can be simultaneously enabled. NuttX will then
-		synchronize to a higher priority master clock, or act as a master
-		clock itself if it has the highest priority.
-		Refer to Best Master Clock algorithm in IEEE-1588 for details.
-
 config NETUTILS_PTPD_STACKSIZE
 	int "PTP daemon stack stack size"
 	default DEFAULT_TASK_STACKSIZE
@@ -51,8 +33,6 @@ config NETUTILS_PTPD_DOMAIN
 		Set PTP domain to participate in. Default domain is 0, other domains
 		can be used to isolate reference clocks from each other.
 
-if NETUTILS_PTPD_SERVER
-
 config NETUTILS_PTPD_PRIORITY1
 	int "PTP server priority1"
 	default 128
@@ -154,10 +134,6 @@ config NETUTILS_PTPD_DELAYRESP_INTERVAL
 
 		Default value 4 results in 16 second interval.
 
-endif # NETUTILS_PTPD_SERVER
-
-if NETUTILS_PTPD_CLIENT
-
 config NETUTILS_PTPD_TIMEOUT_MS
 	int "PTP client timeout for changing clock source (ms)"
 	default 60000
@@ -191,15 +167,6 @@ config NETUTILS_PTPD_DRIFT_AVERAGE_S
 		gives more stable estimate but reacts slower to crystal oscillator speed
 		changes (such as caused by temperature changes).
 
-config NETUTILS_PTPD_SEND_DELAYREQ
-	bool "PTP client enable delay requests"
-	default n
-	---help---
-		If enabled, sends delay request messages to measure the network delay
-		to server. If disabled, assumes zero delay.
-
-if NETUTILS_PTPD_SEND_DELAYREQ
-
 config NETUTILS_PTPD_MAX_PATH_DELAY_NS
 	int "PTP client maximum path delay (ns)"
 	default 100000
@@ -214,8 +181,4 @@ config NETUTILS_PTPD_DELAYREQ_AVGCOUNT
 	---help---
 		Measured path delay is averaged over this many samples.
 
-endif # NETUTILS_PTPD_SEND_DELAYREQ
-
-endif # NETUTILS_PTPD_CLIENT
-
 endif # NETUTILS_PTPD
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 17f232406..9c251c334 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -162,17 +162,6 @@ struct ptp_state_s
   FAR const struct ptpd_config_s *config;
 };
 
-#ifdef CONFIG_NETUTILS_PTPD_SERVER
-#  define PTPD_POLL_INTERVAL CONFIG_NETUTILS_PTPD_SYNC_INTERVAL_MSEC
-#else
-#  define PTPD_POLL_INTERVAL CONFIG_NETUTILS_PTPD_TIMEOUT_MS
-#endif
-
-/* PTP debug messages are enabled by either CONFIG_DEBUG_NET_INFO
- * or separately by CONFIG_NETUTILS_PTPD_DEBUG. This simplifies
- * debugging without having excessive amount of logging from net.
- */
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -834,12 +823,11 @@ static int ptp_send_delay_req(FAR struct ptp_state_s *state)
 
 static int ptp_periodic_send(FAR struct ptp_state_s *state)
 {
-#ifdef CONFIG_NETUTILS_PTPD_SERVER
   /* If there is no better master clock on the network,
    * act as the reference source and send server packets.
    */
 
-  if (!state->selected_source_valid)
+  if (!state->config->client_only && !state->selected_source_valid)
     {
       struct timespec time_now;
       struct timespec delta;
@@ -862,10 +850,9 @@ static int ptp_periodic_send(FAR struct ptp_state_s *state)
           ptp_send_sync(state);
         }
     }
-#endif /* CONFIG_NETUTILS_PTPD_SERVER */
 
-#ifdef CONFIG_NETUTILS_PTPD_SEND_DELAYREQ
-  if (state->selected_source_valid && state->can_send_delayreq)
+  if (state->config->delay_e2e && state->selected_source_valid &&
+      state->can_send_delayreq)
     {
       struct timespec time_now;
       struct timespec delta;
@@ -879,7 +866,6 @@ static int ptp_periodic_send(FAR struct ptp_state_s *state)
           ptp_send_delay_req(state);
         }
     }
-#endif
 
   return OK;
 }
@@ -1294,7 +1280,6 @@ static int ptp_process_rx_packet(FAR struct ptp_state_s *state,
 
   switch (state->rxbuf.header.messagetype & PTP_MSGTYPE_MASK)
     {
-#ifdef CONFIG_NETUTILS_PTPD_CLIENT
     case PTP_MSGTYPE_ANNOUNCE:
       ptpinfo("Got announce packet, seq %ld\n",
               (long)ptp_get_sequence(&state->rxbuf.header));
@@ -1314,14 +1299,11 @@ static int ptp_process_rx_packet(FAR struct ptp_state_s *state,
       ptpinfo("Got delay-resp, seq %ld\n",
               (long)ptp_get_sequence(&state->rxbuf.header));
       return ptp_process_delay_resp(state, &state->rxbuf.delay_resp);
-#endif
 
-#ifdef CONFIG_NETUTILS_PTPD_SERVER
     case PTP_MSGTYPE_DELAY_REQ:
       ptpinfo("Got delay req, seq %ld\n",
               (long)ptp_get_sequence(&state->rxbuf.header));
       return ptp_process_delay_req(state, &state->rxbuf.delay_req);
-#endif
 
     default:
       ptpinfo("Ignoring unknown PTP packet type: 0x%02x\n",
@@ -1457,6 +1439,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
   struct pollfd pollfds[2];
   struct msghdr rxhdr;
   struct iovec rxiov;
+  int timeout;
   int ret;
 
   memset(&rxhdr, 0, sizeof(rxhdr));
@@ -1479,6 +1462,15 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
       return ERROR;
     }
 
+  if (config->client_only)
+    {
+      timeout = CONFIG_NETUTILS_PTPD_TIMEOUT_MS;
+    }
+  else
+    {
+      timeout = CONFIG_NETUTILS_PTPD_SYNC_INTERVAL_MSEC;
+    }
+
   ptp_setup_sighandlers(state);
 
   pollfds[0].events = POLLIN;
@@ -1502,7 +1494,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
 
       pollfds[0].revents = 0;
       pollfds[1].revents = 0;
-      ret = poll(pollfds, 2, PTPD_POLL_INTERVAL);
+      ret = poll(pollfds, 2, timeout);
 
       if (pollfds[0].revents)
         {
diff --git a/system/ptpd/ptpd_main.c b/system/ptpd/ptpd_main.c
index 75cca2900..e65905987 100644
--- a/system/ptpd/ptpd_main.c
+++ b/system/ptpd/ptpd_main.c
@@ -145,6 +145,7 @@ int do_ptpd_stop(int pid)
 static void usage(FAR const char *progname)
 {
   fprintf(stderr, "Usage: %s [options]: run this daemon in background.\n"
+                  " -s       client only synchronization mode\n"
                   " Network Transport:\n"
                   " -2       IEEE 802.3\n"
                   " -4       UDP IPV4 (default)\n"
@@ -153,10 +154,11 @@ static void usage(FAR const char *progname)
                   " -H       HARDWARE (default) depends on NET_TIMESTAMP\n"
                   " -S       SOFTWARE\n"
                   " -r       synchronize system (realtime) clock\n"
+                  " -E       E2E, support client delay request-response\n"
                   " -i [dev] interface device to use, for example 'eth0'\n"
                   " -p [dev] clock device to use\n"
                   " -t [pid] look the status of ptp daemon\n"
-                  " -s [pid] stop ptp daemon\n",
+                  " -d [pid] stop ptp daemon\n",
                   progname);
 }
 
@@ -177,6 +179,8 @@ int main(int argc, FAR char *argv[])
 
   config.interface = "eth0";
   config.clock = "realtime";
+  config.client_only = false;
+  config.delay_e2e = false;
 #ifdef CONFIG_NET_TIMESTAMP
   config.hardware_ts = true;
 #else
@@ -184,13 +188,16 @@ int main(int argc, FAR char *argv[])
 #endif
   config.af = AF_INET;
 
-  while ((option = getopt(argc, argv, "p:i:t:s:r246HS")) != ERROR)
+  while ((option = getopt(argc, argv, "p:i:t:d:rs246EHS")) != ERROR)
     {
       switch (option)
         {
+          case 's':
+            config.client_only = true;
+            break;
           case 't':
             return do_ptpd_status(atoi(optarg));
-          case 's':
+          case 'd':
             return do_ptpd_stop(atoi(optarg));
           case '2':
             config.af = AF_PACKET;
@@ -201,6 +208,9 @@ int main(int argc, FAR char *argv[])
           case '6':
             config.af = AF_INET6;
             break;
+          case 'E':
+            config.delay_e2e = true;
+            break;
 #ifdef CONFIG_NET_TIMESTAMP
           case 'H':
             config.hardware_ts = true;

From d3504bf9b38c9dd35aab4b0fc4435f3fade58a42 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Mon, 17 Mar 2025 09:53:02 +0800
Subject: [PATCH 062/568] netutils/ptpd: support adjtime for ptp device

support ptp clock deivce to adjust time

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 81 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 18 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 9c251c334..a1b0d92d1 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -29,6 +29,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
@@ -50,6 +51,7 @@
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
+#include <nuttx/clock.h>
 #include <nuttx/net/netconfig.h>
 #include <netutils/ptpd.h>
 
@@ -89,6 +91,10 @@ struct ptp_state_s
   int event_socket;
   int info_socket;
 
+  /* The ptp device file descriptor */
+
+  clockid_t clockid;
+
   /* Our own identity as a clock source */
 
   struct ptp_announce_s own_identity;
@@ -372,16 +378,37 @@ static uint16_t ptp_get_sequence(FAR const struct ptp_header_s *hdr)
   return ((uint16_t)hdr->sequenceid[0] << 8) | hdr->sequenceid[1];
 }
 
-/* Get current system timestamp as a timespec
- * TODO: Possibly add support for selecting different clock or using
- *       architecture-specific interface for clock access.
- */
+static clockid_t ptp_open(FAR const char *clock)
+{
+  int fd;
+
+  if (!strcmp(clock, "realtime"))
+    {
+      return CLOCK_REALTIME;
+    }
+
+  fd = open(clock, O_RDWR | O_CLOEXEC);
+  if (fd < 0)
+    {
+      ptperr("Failed to open PTP clock device:%s, %d\n", clock, errno);
+      return fd;
+    }
+
+  return (fd << CLOCK_SHIFT) | CLOCK_FD;
+}
+
+static void ptp_close(clockid_t clockid)
+{
+  if (clockid > 0 && clockid != CLOCK_REALTIME)
+    {
+      close(clockid >> CLOCK_SHIFT);
+    }
+}
 
 static int ptp_gettime(FAR struct ptp_state_s *state,
                        FAR struct timespec *ts)
 {
-  UNUSED(state);
-  return clock_gettime(CLOCK_REALTIME, ts);
+  return clock_gettime(state->clockid, ts);
 }
 
 /* Change current system timestamp by jumping */
@@ -389,20 +416,32 @@ static int ptp_gettime(FAR struct ptp_state_s *state,
 static int ptp_settime(FAR struct ptp_state_s *state,
                        FAR struct timespec *ts)
 {
-  UNUSED(state);
-  return clock_settime(CLOCK_REALTIME, ts);
+  return clock_settime(state->clockid, ts);
 }
 
 /* Smoothly adjust timestamp. */
 
 static int ptp_adjtime(FAR struct ptp_state_s *state, int64_t delta_ns)
 {
-  struct timeval delta;
+  if (state->clockid == CLOCK_REALTIME)
+    {
+      struct timeval delta;
 
-  delta.tv_sec = delta_ns / NSEC_PER_SEC;
-  delta_ns -= (int64_t)delta.tv_sec * NSEC_PER_SEC;
-  delta.tv_usec = delta_ns / NSEC_PER_USEC;
-  return adjtime(&delta, NULL);
+      delta.tv_sec = delta_ns / NSEC_PER_SEC;
+      delta_ns -= (int64_t)delta.tv_sec * NSEC_PER_SEC;
+      delta.tv_usec = delta_ns / NSEC_PER_USEC;
+      return adjtime(&delta, NULL);
+    }
+  else
+    {
+      struct timex buf;
+
+      memset(&buf, 0, sizeof(buf));
+      buf.freq = (long)(-state->drift_ppb * 65536 / 1000);
+      buf.modes = ADJ_FREQUENCY;
+
+      return clock_adjtime(state->clockid, &buf);
+    }
 }
 
 /* Get timestamp of latest received packet */
@@ -451,6 +490,13 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
   struct ifreq req;
   struct sockaddr_in bind_addr;
 
+  state->clockid = ptp_open(state->config->clock);
+  if (state->clockid < 0)
+    {
+      ptperr("Invalid clockid %d for ptp daemon\n", state->clockid);
+      return ERROR;
+    }
+
   /* Create sockets */
 
   state->tx_socket = socket(AF_INET, SOCK_DGRAM, 0);
@@ -593,6 +639,8 @@ static int ptp_destroy_state(FAR struct ptp_state_s *state)
 {
   struct in_addr mcast_addr;
 
+  ptp_close(state->clockid);
+
   mcast_addr.s_addr = HTONL(PTP_MULTICAST_ADDR);
   ipmsfilter(&state->interface_addr.sin_addr,
              &mcast_addr, MCAST_EXCLUDE);
@@ -1455,11 +1503,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
   if (ptp_initialize_state(state, config->interface) != OK)
     {
       ptperr("Failed to initialize PTP state, exiting\n");
-
-      ptp_destroy_state(state);
-      free(state);
-
-      return ERROR;
+      goto errout;
     }
 
   if (config->client_only)
@@ -1535,6 +1579,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
       ptp_process_statusreq(state);
     }
 
+errout:
   ptp_destroy_state(state);
   free(state);
 

From 54d55fe5f44941142c1cbad8d9424aa4d43b740b Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Wed, 2 Apr 2025 22:58:55 +0800
Subject: [PATCH 063/568] netutils/ptpd: add NETUTILS_PTPD_ADJTIME_THRESHOLD_NS
 to accelerate adjustment

optimize the speed of adjustment

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/Kconfig |  8 ++++++++
 netutils/ptpd/ptpd.c  | 14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/netutils/ptpd/Kconfig b/netutils/ptpd/Kconfig
index 6c2b17bd8..f29065f80 100644
--- a/netutils/ptpd/Kconfig
+++ b/netutils/ptpd/Kconfig
@@ -149,6 +149,14 @@ config NETUTILS_PTPD_SETTIME_THRESHOLD_MS
 		time is reset with settimeofday() instead of changing the rate with
 		adjtime().
 
+config NETUTILS_PTPD_ADJTIME_THRESHOLD_NS
+	int "PTP client threshold for using accumulated ppb to adjust system time (ns)"
+	default 500
+	---help---
+		If difference between local and remote clock exceeds this threshold,
+		the PTP client can utilize current ppb instead of accumulated ppb to
+		accelerate system time adjustment.
+
 config NETUTILS_PTPD_MULTICAST_TIMEOUT_MS
 	int "PTP client timeout to rejoin multicast group (ms)"
 	default 30000
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index a1b0d92d1..c581e624e 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -421,7 +421,8 @@ static int ptp_settime(FAR struct ptp_state_s *state,
 
 /* Smoothly adjust timestamp. */
 
-static int ptp_adjtime(FAR struct ptp_state_s *state, int64_t delta_ns)
+static int ptp_adjtime(FAR struct ptp_state_s *state, int64_t delta_ns,
+                       int64_t ppb)
 {
   if (state->clockid == CLOCK_REALTIME)
     {
@@ -437,7 +438,7 @@ static int ptp_adjtime(FAR struct ptp_state_s *state, int64_t delta_ns)
       struct timex buf;
 
       memset(&buf, 0, sizeof(buf));
-      buf.freq = (long)(-state->drift_ppb * 65536 / 1000);
+      buf.freq = (long)(-ppb * 65536 / 1000);
       buf.modes = ADJ_FREQUENCY;
 
       return clock_adjtime(state->clockid, &buf);
@@ -1096,7 +1097,14 @@ static int ptp_update_local_clock(FAR struct ptp_state_s *state,
               (long long)state->last_adjtime_ns,
               (long long)state->drift_ppb);
 
-      ret = ptp_adjtime(state, adjustment_ns);
+      if (absdelta_ns > CONFIG_NETUTILS_PTPD_ADJTIME_THRESHOLD_NS)
+        {
+          ret = ptp_adjtime(state, delta_ns, drift_ppb);
+        }
+      else
+        {
+          ret = ptp_adjtime(state, adjustment_ns, state->drift_ppb);
+        }
 
       if (ret != OK)
         {

From 65d29de0f76312914af7e2933ed2a3616c5aea51 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Thu, 21 Aug 2025 23:37:42 +0800
Subject: [PATCH 064/568] netutils/ptpd: add NET_PKT to enable PTP

support ptp clock device

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netutils/ptpd/Kconfig b/netutils/ptpd/Kconfig
index f29065f80..63d756ad9 100644
--- a/netutils/ptpd/Kconfig
+++ b/netutils/ptpd/Kconfig
@@ -8,7 +8,7 @@ config NETUTILS_PTPD
 	default n
 	depends on NET_IPv4
 	depends on NET_IGMP
-	depends on NET_UDP
+	depends on NET_UDP || NET_PKT
 	---help---
 		Build a minimal implementation of IEEE-1588 precision time protocol.
 		Uses system gettimeofday() and adjtime() calls to synchronize clock

From 54cbc2ee0df4a0aa27a5c45a7211172cc51a48b1 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Tue, 18 Mar 2025 09:58:07 +0800
Subject: [PATCH 065/568] netutils/ptpd: support PTP ethernet transport

support ptp by rawsocket

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 499 +++++++++++++++++++++++++------------------
 1 file changed, 297 insertions(+), 202 deletions(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index c581e624e..e08b7fab2 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -45,6 +45,8 @@
 #include <fcntl.h>
 
 #include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
 #include <arpa/inet.h>
 #include <netutils/ipmsfilter.h>
 
@@ -55,6 +57,7 @@
 #include <nuttx/net/netconfig.h>
 #include <netutils/ptpd.h>
 
+#include "netutils/netlib.h"
 #include "ptpv2.h"
 
 /****************************************************************************
@@ -157,7 +160,7 @@ struct ptp_state_s
     uint8_t                 raw[128];
   } rxbuf;
 
-  uint8_t rxcmsg[CMSG_LEN(sizeof(struct timeval))];
+  uint8_t rxcmsg[CMSG_LEN(sizeof(struct timespec))];
 
   /* Buffered sync packet for two-step clock setting where server sends
    * the accurate timestamp in a separate follow-up message.
@@ -464,9 +467,9 @@ static int ptp_getrxtime(FAR struct ptp_state_s *state,
     {
       if (cmsg->cmsg_level == SOL_SOCKET &&
           cmsg->cmsg_type == SO_TIMESTAMPNS &&
-          cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval)))
+          cmsg->cmsg_len == CMSG_LEN(sizeof(struct timespec)))
         {
-          TIMEVAL_TO_TIMESPEC((FAR struct timeval *)CMSG_DATA(cmsg), ts);
+          memcpy(ts, CMSG_DATA(cmsg), sizeof(*ts));
 
           /* Sanity-check the value */
 
@@ -481,159 +484,6 @@ static int ptp_getrxtime(FAR struct ptp_state_s *state,
   return ERROR;
 }
 
-/* Initialize PTP client/server state and create sockets */
-
-static int ptp_initialize_state(FAR struct ptp_state_s *state,
-                                FAR const char *interface)
-{
-  int ret;
-  int arg = 1;
-  struct ifreq req;
-  struct sockaddr_in bind_addr;
-
-  state->clockid = ptp_open(state->config->clock);
-  if (state->clockid < 0)
-    {
-      ptperr("Invalid clockid %d for ptp daemon\n", state->clockid);
-      return ERROR;
-    }
-
-  /* Create sockets */
-
-  state->tx_socket = socket(AF_INET, SOCK_DGRAM, 0);
-  if (state->tx_socket < 0)
-    {
-      ptperr("Failed to create tx socket: %d\n", errno);
-      return ERROR;
-    }
-
-  state->event_socket = socket(AF_INET, SOCK_DGRAM, 0);
-  if (state->event_socket < 0)
-    {
-      ptperr("Failed to create event socket: %d\n", errno);
-      return ERROR;
-    }
-
-  state->info_socket = socket(AF_INET, SOCK_DGRAM, 0);
-  if (state->info_socket < 0)
-    {
-      ptperr("Failed to create info socket: %d\n", errno);
-      return ERROR;
-    }
-
-  /* Get address information of the specified interface for binding socket
-   * Only supports IPv4 currently.
-   */
-
-  memset(&req, 0, sizeof(req));
-  strlcpy(req.ifr_name, interface, sizeof(req.ifr_name));
-
-  if (ioctl(state->event_socket, SIOCGIFADDR, (unsigned long)&req) < 0)
-    {
-      ptperr("Failed to get IP address information for interface %s\n",
-             interface);
-      return ERROR;
-    }
-
-  state->interface_addr = *(FAR struct sockaddr_in *)&req.ifr_ifru.ifru_addr;
-
-  /* Get hardware address to initialize the identity field in header.
-   * Clock identity is EUI-64, which we make from EUI-48.
-   */
-
-  if (ioctl(state->event_socket, SIOCGIFHWADDR, (unsigned long)&req) < 0)
-    {
-      ptperr("Failed to get HW address information for interface %s\n",
-             interface);
-      return ERROR;
-    }
-
-  state->own_identity.header.version = 2;
-  state->own_identity.header.domain = CONFIG_NETUTILS_PTPD_DOMAIN;
-  state->own_identity.header.sourceidentity[0] = req.ifr_hwaddr.sa_data[0];
-  state->own_identity.header.sourceidentity[1] = req.ifr_hwaddr.sa_data[1];
-  state->own_identity.header.sourceidentity[2] = req.ifr_hwaddr.sa_data[2];
-  state->own_identity.header.sourceidentity[3] = 0xff;
-  state->own_identity.header.sourceidentity[4] = 0xfe;
-  state->own_identity.header.sourceidentity[5] = req.ifr_hwaddr.sa_data[3];
-  state->own_identity.header.sourceidentity[6] = req.ifr_hwaddr.sa_data[4];
-  state->own_identity.header.sourceidentity[7] = req.ifr_hwaddr.sa_data[5];
-  state->own_identity.header.sourceportindex[0] = 0;
-  state->own_identity.header.sourceportindex[1] = 1;
-  state->own_identity.gm_priority1 = CONFIG_NETUTILS_PTPD_PRIORITY1;
-  state->own_identity.gm_quality[0] = CONFIG_NETUTILS_PTPD_CLASS;
-  state->own_identity.gm_quality[1] = CONFIG_NETUTILS_PTPD_ACCURACY;
-  state->own_identity.gm_quality[2] = 0xff; /* No variance estimate */
-  state->own_identity.gm_quality[3] = 0xff;
-  state->own_identity.gm_priority2 = CONFIG_NETUTILS_PTPD_PRIORITY2;
-  memcpy(state->own_identity.gm_identity,
-         state->own_identity.header.sourceidentity,
-         sizeof(state->own_identity.gm_identity));
-  state->own_identity.timesource = CONFIG_NETUTILS_PTPD_CLOCKSOURCE;
-
-  /* Subscribe to PTP multicast address */
-
-  bind_addr.sin_family = AF_INET;
-  bind_addr.sin_addr.s_addr = HTONL(PTP_MULTICAST_ADDR);
-
-  clock_gettime(CLOCK_MONOTONIC, &state->last_received_multicast);
-
-  ret = ipmsfilter(&state->interface_addr.sin_addr,
-                   &bind_addr.sin_addr, MCAST_INCLUDE);
-  if (ret < 0)
-    {
-      ptperr("Failed to bind multicast address: %d\n", errno);
-      return ERROR;
-    }
-
-  /* Bind socket for events */
-
-  bind_addr.sin_port = HTONS(PTP_UDP_PORT_EVENT);
-  ret = bind(state->event_socket, (FAR struct sockaddr *)&bind_addr,
-             sizeof(bind_addr));
-  if (ret < 0)
-    {
-      ptperr("Failed to bind to udp port %d\n", bind_addr.sin_port);
-      return ERROR;
-    }
-
-  if (state->config->hardware_ts)
-    {
-      ret = setsockopt(state->event_socket, SOL_SOCKET, SO_TIMESTAMPNS,
-                       &arg, sizeof(arg));
-
-      if (ret < 0)
-        {
-          ptperr("Failed to enable SO_TIMESTAMPNS: %s\n", strerror(errno));
-          return ERROR;
-        }
-    }
-
-  /* Bind socket for announcements */
-
-  bind_addr.sin_port = HTONS(PTP_UDP_PORT_INFO);
-  ret = bind(state->info_socket, (FAR struct sockaddr *)&bind_addr,
-             sizeof(bind_addr));
-  if (ret < 0)
-    {
-      ptperr("Failed to bind to udp port %d\n", bind_addr.sin_port);
-      return ERROR;
-    }
-
-  /* Bind TX socket to interface address (local addr cannot be multicast) */
-
-  bind_addr.sin_addr = state->interface_addr.sin_addr;
-  ret = bind(state->tx_socket, (FAR struct sockaddr *)&bind_addr,
-             sizeof(bind_addr));
-  if (ret < 0)
-    {
-      ptperr("Failed to bind tx to port %d\n", bind_addr.sin_port);
-      return ERROR;
-    }
-
-  return OK;
-}
-
 /* Unsubscribe multicast and destroy sockets */
 
 static int ptp_destroy_state(FAR struct ptp_state_s *state)
@@ -667,6 +517,193 @@ static int ptp_destroy_state(FAR struct ptp_state_s *state)
   return OK;
 }
 
+/* Initialize PTP client/server state and create sockets */
+
+static int ptp_initialize_state(FAR struct ptp_state_s *state)
+{
+  int ret;
+  int arg = 1;
+  struct ifreq req;
+
+  state->clockid = ptp_open(state->config->clock);
+  if (state->clockid < 0)
+    {
+      ptperr("Invalid clockid %d for ptp daemon\n", state->clockid);
+      return ERROR;
+    }
+
+  /* Create sockets */
+
+  if (state->config->af == AF_PACKET)
+    {
+      struct sockaddr_ll addr;
+
+      state->tx_socket = socket(AF_PACKET, SOCK_RAW, 0);
+      if (state->tx_socket < 0)
+        {
+          ptperr("Failed to create tx socket: %d\n", errno);
+          goto errout;
+        }
+
+      state->event_socket = dup(state->tx_socket);
+      state->info_socket = -1;
+
+      addr.sll_family = AF_PACKET;
+      addr.sll_ifindex = if_nametoindex(state->config->interface);
+      addr.sll_protocol = htons(ETHERTYPE_PTP);
+      ret = bind(state->tx_socket, (FAR struct sockaddr *)&addr,
+                 sizeof(addr));
+      if (ret < 0)
+        {
+          ptperr("ERROR: binding socket failed: %d\n", errno);
+          goto errout;
+        }
+    }
+  else if (state->config->af == AF_INET)
+    {
+      struct sockaddr_in bind_addr;
+
+      state->tx_socket = socket(AF_INET, SOCK_DGRAM, 0);
+      if (state->tx_socket < 0)
+        {
+          ptperr("Failed to create tx socket: %d\n", errno);
+          goto errout;
+        }
+
+      state->event_socket = socket(AF_INET, SOCK_DGRAM, 0);
+      if (state->event_socket < 0)
+        {
+          ptperr("Failed to create event socket: %d\n", errno);
+          goto errout;
+        }
+
+      state->info_socket = socket(AF_INET, SOCK_DGRAM, 0);
+      if (state->info_socket < 0)
+        {
+          ptperr("Failed to create info socket: %d\n", errno);
+          goto errout;
+        }
+
+      /* Subscribe to PTP multicast address */
+
+      bind_addr.sin_family = AF_INET;
+      bind_addr.sin_addr.s_addr = HTONL(PTP_MULTICAST_ADDR);
+
+      ret = ipmsfilter(&state->interface_addr.sin_addr,
+                       &bind_addr.sin_addr, MCAST_INCLUDE);
+      if (ret < 0)
+        {
+          ptperr("Failed to bind multicast address: %d\n", errno);
+          goto errout;
+        }
+
+      /* Bind socket for events */
+
+      bind_addr.sin_port = HTONS(PTP_UDP_PORT_EVENT);
+      ret = bind(state->event_socket, (FAR struct sockaddr *)&bind_addr,
+                 sizeof(bind_addr));
+      if (ret < 0)
+        {
+          ptperr("Failed to bind to udp port %d\n", bind_addr.sin_port);
+          goto errout;
+        }
+
+      /* Bind socket for announcements */
+
+      bind_addr.sin_port = HTONS(PTP_UDP_PORT_INFO);
+      ret = bind(state->info_socket, (FAR struct sockaddr *)&bind_addr,
+                 sizeof(bind_addr));
+      if (ret < 0)
+        {
+          ptperr("Failed to bind to udp port %d\n", bind_addr.sin_port);
+          goto errout;
+        }
+
+      /* Bind TX socket to interface address (local addr cannot be
+       * multicast)
+       */
+
+      bind_addr.sin_addr = state->interface_addr.sin_addr;
+      ret = bind(state->tx_socket, (FAR struct sockaddr *)&bind_addr,
+                 sizeof(bind_addr));
+      if (ret < 0)
+        {
+          ptperr("Failed to bind tx to port %d\n", bind_addr.sin_port);
+          goto errout;
+        }
+    }
+
+  if (state->config->hardware_ts)
+    {
+      ret = setsockopt(state->event_socket, SOL_SOCKET, SO_TIMESTAMPNS,
+                       &arg, sizeof(arg));
+
+      if (ret < 0)
+        {
+          ptperr("Failed to enable SO_TIMESTAMPNS: %s\n", strerror(errno));
+          goto errout;
+        }
+    }
+
+  /* Get address information of the specified interface for binding socket
+   * Only supports IPv4 currently.
+   */
+
+  memset(&req, 0, sizeof(req));
+  strlcpy(req.ifr_name, state->config->interface, sizeof(req.ifr_name));
+
+  if (ioctl(state->event_socket, SIOCGIFADDR, (unsigned long)&req) < 0)
+    {
+      ptperr("Failed to get IP address information for interface %s\n",
+             state->config->interface);
+      goto errout;
+    }
+
+  state->interface_addr = *(FAR struct sockaddr_in *)&req.ifr_ifru.ifru_addr;
+
+  /* Get hardware address to initialize the identity field in header.
+   * Clock identity is EUI-64, which we make from EUI-48.
+   */
+
+  if (ioctl(state->event_socket, SIOCGIFHWADDR, (unsigned long)&req) < 0)
+    {
+      ptperr("Failed to get HW address information for interface %s\n",
+             state->config->interface);
+      goto errout;
+    }
+
+  state->own_identity.header.version = 2;
+  state->own_identity.header.domain = CONFIG_NETUTILS_PTPD_DOMAIN;
+  state->own_identity.header.sourceidentity[0] = req.ifr_hwaddr.sa_data[0];
+  state->own_identity.header.sourceidentity[1] = req.ifr_hwaddr.sa_data[1];
+  state->own_identity.header.sourceidentity[2] = req.ifr_hwaddr.sa_data[2];
+  state->own_identity.header.sourceidentity[3] = 0xff;
+  state->own_identity.header.sourceidentity[4] = 0xfe;
+  state->own_identity.header.sourceidentity[5] = req.ifr_hwaddr.sa_data[3];
+  state->own_identity.header.sourceidentity[6] = req.ifr_hwaddr.sa_data[4];
+  state->own_identity.header.sourceidentity[7] = req.ifr_hwaddr.sa_data[5];
+  state->own_identity.header.sourceportindex[0] = 0;
+  state->own_identity.header.sourceportindex[1] = 1;
+  state->own_identity.gm_priority1 = CONFIG_NETUTILS_PTPD_PRIORITY1;
+  state->own_identity.gm_quality[0] = CONFIG_NETUTILS_PTPD_CLASS;
+  state->own_identity.gm_quality[1] = CONFIG_NETUTILS_PTPD_ACCURACY;
+  state->own_identity.gm_quality[2] = 0xff; /* No variance estimate */
+  state->own_identity.gm_quality[3] = 0xff;
+  state->own_identity.gm_priority2 = CONFIG_NETUTILS_PTPD_PRIORITY2;
+  memcpy(state->own_identity.gm_identity,
+         state->own_identity.header.sourceidentity,
+         sizeof(state->own_identity.gm_identity));
+  state->own_identity.timesource = CONFIG_NETUTILS_PTPD_CLOCKSOURCE;
+
+  clock_gettime(CLOCK_MONOTONIC, &state->last_received_multicast);
+
+  return OK;
+
+errout:
+  ptp_destroy_state(state);
+  return ERROR;
+}
+
 /* Re-subscribe multicast address.
  * This can become necessary if Ethernet interface gets reset or if external
  * IGMP-compliant Ethernet switch gets plugged in.
@@ -706,6 +743,76 @@ static int ptp_check_multicast_status(FAR struct ptp_state_s *state)
   return OK;
 }
 
+static int ptp_sendmsg(FAR struct ptp_state_s *state, FAR const void *buf,
+                       size_t buflen, FAR const void *addr,
+                       socklen_t addrlen, FAR struct timespec *sendts)
+{
+  int ret;
+
+  if (state->config->af == AF_PACKET)
+    {
+      /* IEE802.1AS Multicast address for gptp */
+
+      const uint8_t ptp_multicast_mac[ETHER_ADDR_LEN] =
+      {
+        0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e
+      };
+
+      char raw[sizeof(struct ether_header) + buflen];
+      FAR struct ether_header *header;
+      struct msghdr msg;
+      struct iovec iov;
+
+      header = (FAR struct ether_header *)&raw;
+      memcpy(header->ether_dhost, ptp_multicast_mac, ETHER_ADDR_LEN);
+      netlib_getmacaddr(state->config->interface, header->ether_shost);
+      header->ether_type = ETHERTYPE_PTP;
+      memcpy(&raw[sizeof(*header)], buf, buflen);
+      buflen += sizeof(*header);
+
+      iov.iov_base = raw;
+      iov.iov_len = buflen;
+
+      msg.msg_name = (FAR void *)addr;
+      msg.msg_namelen = addrlen;
+      msg.msg_iov = &iov;
+      msg.msg_iovlen = 1;
+      msg.msg_flags = 0;
+      msg.msg_control = NULL;
+      msg.msg_controllen = 0;
+
+      ret = sendmsg(state->tx_socket, &msg, 0);
+      if (ret < 0)
+        {
+          return ERROR;
+        }
+
+      if (state->config->hardware_ts && sendts != NULL)
+        {
+          uint8_t rxcmsg[CMSG_LEN(sizeof(struct timespec))];
+
+          msg.msg_control = &rxcmsg;
+          msg.msg_controllen = CMSG_LEN(sizeof(struct timespec));
+          ret = recvmsg(state->tx_socket, &msg, 0);
+          if (ret >= 0)
+            {
+              ptp_getrxtime(state, &msg, sendts);
+            }
+        }
+    }
+  else
+    {
+      ret = sendto(state->tx_socket, buf, buflen, 0, addr, addrlen);
+    }
+
+  if (!state->config->hardware_ts && sendts != NULL)
+    {
+      ptp_gettime(state, sendts);
+    }
+
+  return ret;
+}
+
 /* Send PTP server announcement packet */
 
 static int ptp_send_announce(FAR struct ptp_state_s *state)
@@ -728,12 +835,10 @@ static int ptp_send_announce(FAR struct ptp_state_s *state)
   ptp_gettime(state, &ts);
   timespec_to_ptp_format(&ts, msg.origintimestamp);
 
-  ret = sendto(state->tx_socket, &msg, sizeof(msg), 0,
-               (FAR struct sockaddr *)&addr, sizeof(addr));
-
+  ret = ptp_sendmsg(state, &msg, sizeof(msg), &addr, sizeof(addr), NULL);
   if (ret < 0)
     {
-      ptperr("sendto failed: %d", errno);
+      ptperr("ptp sendmsg failed: %d", errno);
     }
   else
     {
@@ -748,17 +853,11 @@ static int ptp_send_announce(FAR struct ptp_state_s *state)
 
 static int ptp_send_sync(FAR struct ptp_state_s *state)
 {
-  struct msghdr txhdr;
-  struct iovec txiov;
   struct ptp_sync_s msg;
   struct sockaddr_in addr;
   struct timespec ts;
-  uint8_t controlbuf[64];
   int ret;
 
-  memset(&txhdr, 0, sizeof(txhdr));
-  memset(&txiov, 0, sizeof(txiov));
-
   addr.sin_family      = AF_INET;
   addr.sin_addr.s_addr = HTONL(PTP_MULTICAST_ADDR);
   addr.sin_port        = HTONS(PTP_UDP_PORT_EVENT);
@@ -772,22 +871,13 @@ static int ptp_send_sync(FAR struct ptp_state_s *state)
   msg.header.flags[0] = PTP_FLAGS0_TWOSTEP;
 #endif
 
-  txhdr.msg_name = &addr;
-  txhdr.msg_namelen = sizeof(addr);
-  txhdr.msg_iov = &txiov;
-  txhdr.msg_iovlen = 1;
-  txhdr.msg_control = controlbuf;
-  txhdr.msg_controllen = sizeof(controlbuf);
-  txiov.iov_base = &msg;
-  txiov.iov_len = sizeof(msg);
-
   /* Timestamp and send the sync message */
 
   ptp_increment_sequence(&state->sync_seq, &msg.header);
   ptp_gettime(state, &ts);
   timespec_to_ptp_format(&ts, msg.origintimestamp);
 
-  ret = sendmsg(state->tx_socket, &txhdr, 0);
+  ret = ptp_sendmsg(state, &msg, sizeof(msg), &addr, sizeof(addr), &ts);
   if (ret < 0)
     {
       ptperr("sendmsg for sync message failed: %d\n", errno);
@@ -795,22 +885,16 @@ static int ptp_send_sync(FAR struct ptp_state_s *state)
     }
 
 #ifdef CONFIG_NETUTILS_PTPD_TWOSTEP_SYNC
-  /* Get timestamp after send completes and send follow-up message
-   *
-   * TODO: Implement SO_TIMESTAMPING and use the actual tx timestamp here.
-   */
 
-  ptp_gettime(state, &ts);
   timespec_to_ptp_format(&ts, msg.origintimestamp);
   msg.header.messagetype = PTP_MSGTYPE_FOLLOW_UP;
   msg.header.flags[0] = 0;
   addr.sin_port = HTONS(PTP_UDP_PORT_INFO);
 
-  ret = sendto(state->tx_socket, &msg, sizeof(msg), 0,
-               (FAR struct sockaddr *)&addr, sizeof(addr));
+  ret = ptp_sendmsg(state, &msg, sizeof(msg), &addr, sizeof(addr), NULL);
   if (ret < 0)
     {
-      ptperr("sendto for follow-up message failed: %d\n", errno);
+      ptperr("ptp sendmsg for follow-up message failed: %d\n", errno);
       return ret;
     }
 
@@ -845,18 +929,11 @@ static int ptp_send_delay_req(FAR struct ptp_state_s *state)
   ptp_gettime(state, &state->delayreq_time);
   timespec_to_ptp_format(&state->delayreq_time, req.origintimestamp);
 
-  ret = sendto(state->tx_socket, &req, sizeof(req), 0,
-               (FAR struct sockaddr *)&addr, sizeof(addr));
-
-  /* Get timestamp after send completes.
-   * TODO: Implement SO_TIMESTAMPING and use the actual tx timestamp here.
-   */
-
-  ptp_gettime(state, &state->delayreq_time);
-
+  ret = ptp_sendmsg(state, &req, sizeof(req),
+                    &addr, sizeof(addr), &state->delayreq_time);
   if (ret < 0)
     {
-      ptperr("sendto failed: %d", errno);
+      ptperr("ptp sendmsg failed: %d", errno);
     }
   else
     {
@@ -1219,12 +1296,10 @@ static int ptp_process_delay_req(FAR struct ptp_state_s *state,
          sizeof(resp.header.sequenceid));
   resp.header.logmessageinterval = CONFIG_NETUTILS_PTPD_DELAYRESP_INTERVAL;
 
-  ret = sendto(state->tx_socket, &resp, sizeof(resp), 0,
-               (FAR struct sockaddr *)&addr, sizeof(addr));
-
+  ret = ptp_sendmsg(state, &resp, sizeof(resp), &addr, sizeof(addr), NULL);
   if (ret < 0)
     {
-      ptperr("sendto failed: %d", errno);
+      ptperr("ptp sendmsg failed: %d", errno);
     }
   else
     {
@@ -1318,6 +1393,21 @@ static int ptp_process_delay_resp(FAR struct ptp_state_s *state,
 static int ptp_process_rx_packet(FAR struct ptp_state_s *state,
                                  ssize_t length)
 {
+  if (state->config->af == AF_PACKET)
+    {
+      /* Remove the header of ether message */
+
+      FAR struct ethhdr *header = (FAR struct ethhdr *)state->rxbuf.raw;
+
+      if (htons(header->h_proto) != ETHERTYPE_PTP)
+        {
+          return -EINVAL;
+        }
+
+      length -= sizeof(*header);
+      memmove(&state->rxbuf.raw, header + 1, length);
+    }
+
   if (length < sizeof(struct ptp_header_s))
     {
       ptpwarn("Ignoring invalid PTP packet, length only %d bytes\n",
@@ -1496,6 +1586,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
   struct msghdr rxhdr;
   struct iovec rxiov;
   int timeout;
+  int idx = 1;
   int ret;
 
   memset(&rxhdr, 0, sizeof(rxhdr));
@@ -1508,7 +1599,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
     }
 
   state->config = config;
-  if (ptp_initialize_state(state, config->interface) != OK)
+  if (ptp_initialize_state(state) != OK)
     {
       ptperr("Failed to initialize PTP state, exiting\n");
       goto errout;
@@ -1527,8 +1618,12 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
 
   pollfds[0].events = POLLIN;
   pollfds[0].fd = state->event_socket;
-  pollfds[1].events = POLLIN;
-  pollfds[1].fd = state->info_socket;
+  if (state->info_socket > 0)
+    {
+      pollfds[1].events = POLLIN;
+      pollfds[1].fd = state->info_socket;
+      idx++;
+    }
 
   while (!state->stop)
     {
@@ -1546,7 +1641,7 @@ int ptpd_start(FAR const struct ptpd_config_s *config)
 
       pollfds[0].revents = 0;
       pollfds[1].revents = 0;
-      ret = poll(pollfds, 2, timeout);
+      ret = poll(pollfds, idx, timeout);
 
       if (pollfds[0].revents)
         {

From 03ca9ba5000524c69d902a2af3a2b582d6d75345 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Wed, 9 Apr 2025 17:39:32 +0800
Subject: [PATCH 066/568] netutils/ptpd: using -B to control BMCA message

new option -B to BMCA message

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 include/netutils/ptpd.h |  1 +
 netutils/ptpd/ptpd.c    | 10 ++++++----
 system/ptpd/ptpd_main.c |  7 ++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/netutils/ptpd.h b/include/netutils/ptpd.h
index ea4b9fb7b..1d455c6be 100644
--- a/include/netutils/ptpd.h
+++ b/include/netutils/ptpd.h
@@ -44,6 +44,7 @@ struct ptpd_config_s
   bool client_only;
   bool hardware_ts;
   bool delay_e2e;
+  bool bmca;
   sa_family_t af;
 };
 
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index e08b7fab2..010b9a2f3 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -961,7 +961,7 @@ static int ptp_periodic_send(FAR struct ptp_state_s *state)
       clock_gettime(CLOCK_MONOTONIC, &time_now);
       clock_timespec_subtract(&time_now,
         &state->last_transmitted_announce, &delta);
-      if (timespec_to_ms(&delta)
+      if (state->config->bmca && timespec_to_ms(&delta)
           > CONFIG_NETUTILS_PTPD_ANNOUNCE_INTERVAL_MSEC)
         {
           state->last_transmitted_announce = time_now;
@@ -1003,7 +1003,7 @@ static int ptp_process_announce(FAR struct ptp_state_s *state,
 {
   clock_gettime(CLOCK_MONOTONIC, &state->last_received_announce);
 
-  if (is_better_clock(msg, &state->own_identity))
+  if (state->conifg->bmca && is_better_clock(msg, &state->n_identity))
     {
       if (!state->selected_source_valid ||
           is_better_clock(msg, &state->selected_source))
@@ -1206,7 +1206,8 @@ static int ptp_process_sync(FAR struct ptp_state_s *state,
 {
   struct timespec remote_time;
 
-  if (memcmp(msg->header.sourceidentity,
+  if (state->config->bmca &&
+      memcmp(msg->header.sourceidentity,
              state->selected_source.header.sourceidentity,
              sizeof(msg->header.sourceidentity)) != 0)
     {
@@ -1240,7 +1241,8 @@ static int ptp_process_followup(FAR struct ptp_state_s *state,
 {
   struct timespec remote_time;
 
-  if (memcmp(msg->header.sourceidentity,
+  if (state->config->bmca &&
+      memcmp(msg->header.sourceidentity,
              state->twostep_packet.header.sourceidentity,
              sizeof(msg->header.sourceidentity)) != 0)
     {
diff --git a/system/ptpd/ptpd_main.c b/system/ptpd/ptpd_main.c
index e65905987..4a87ce472 100644
--- a/system/ptpd/ptpd_main.c
+++ b/system/ptpd/ptpd_main.c
@@ -153,6 +153,7 @@ static void usage(FAR const char *progname)
                   " Time Stamping:\n"
                   " -H       HARDWARE (default) depends on NET_TIMESTAMP\n"
                   " -S       SOFTWARE\n"
+                  " -B       The best master clock algorithm is used\n"
                   " -r       synchronize system (realtime) clock\n"
                   " -E       E2E, support client delay request-response\n"
                   " -i [dev] interface device to use, for example 'eth0'\n"
@@ -186,9 +187,10 @@ int main(int argc, FAR char *argv[])
 #else
   config.hardware_ts = false;
 #endif
+  config.bmca = false;
   config.af = AF_INET;
 
-  while ((option = getopt(argc, argv, "p:i:t:d:rs246EHS")) != ERROR)
+  while ((option = getopt(argc, argv, "p:i:t:d:rs246BEHS")) != ERROR)
     {
       switch (option)
         {
@@ -208,6 +210,9 @@ int main(int argc, FAR char *argv[])
           case '6':
             config.af = AF_INET6;
             break;
+          case 'B':
+            config.bmca = true;
+            break;
           case 'E':
             config.delay_e2e = true;
             break;

From e5c85d1ca23c5e41df65da7b228f447e6229470a Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Wed, 9 Apr 2025 09:25:38 +0800
Subject: [PATCH 067/568] netutils/ptpd: Add switch correction time change

The current gPTP stack does not support path delay correction of the Switch.
This patch adds the path delay correction field in the Header.

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 010b9a2f3..3193ee33e 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -1236,6 +1236,31 @@ static int ptp_process_sync(FAR struct ptp_state_s *state,
   return ptp_update_local_clock(state, &remote_time, &state->rxtime);
 }
 
+static void ptp_add_correction_time(FAR const uint8_t *correction,
+                                    FAR struct timespec *ts)
+{
+  uint64_t correction_time = (((uint64_t)correction[0]) << 40)
+                           | (((uint64_t)correction[1]) << 32)
+                           | (((uint64_t)correction[2]) << 24)
+                           | (((uint64_t)correction[3]) << 16)
+                           | (((uint64_t)correction[4]) <<  8)
+                           | (((uint64_t)correction[5]) <<  0);
+
+  ptpinfo("correction before: %lld.%09ld\n", (long long)ts->tv_sec,
+          ts->tv_nsec);
+
+  ts->tv_sec  += correction_time / NSEC_PER_SEC;
+  ts->tv_nsec += correction_time % NSEC_PER_SEC;
+  if (ts->tv_nsec >= NSEC_PER_SEC)
+    {
+      ts->tv_nsec -= NSEC_PER_SEC;
+      ts->tv_sec  += 1;
+    }
+
+  ptpinfo("correction after: %lld.%09ld\n", (long long)ts->tv_sec,
+          ts->tv_nsec);
+}
+
 static int ptp_process_followup(FAR struct ptp_state_s *state,
                                 FAR struct ptp_follow_up_s *msg)
 {
@@ -1264,6 +1289,13 @@ static int ptp_process_followup(FAR struct ptp_state_s *state,
    */
 
   ptp_format_to_timespec(msg->origintimestamp, &remote_time);
+
+  /* add correction time */
+
+  ptp_add_correction_time(msg->header.correction, &remote_time);
+
+  /* done */
+
   return ptp_update_local_clock(state, &remote_time, &state->twostep_rxtime);
 }
 

From 710aef6bd097a76345f3b374291dfbc1f49a7631 Mon Sep 17 00:00:00 2001
From: zhangkai25 <zhangkai25@xiaomi.com>
Date: Wed, 29 Oct 2025 10:52:52 +0800
Subject: [PATCH 068/568] iperf: Increase the priority of the report thread

ensure it is not blocked by the iperf thread, preventing iperf from completing

Signed-off-by: zhangkai25 <zhangkai25@xiaomi.com>
---
 netutils/iperf/iperf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netutils/iperf/iperf.c b/netutils/iperf/iperf.c
index cda61f68e..b9243a608 100644
--- a/netutils/iperf/iperf.c
+++ b/netutils/iperf/iperf.c
@@ -48,7 +48,7 @@
 #define IPERF_TRAFFIC_TASK_PRIORITY  100
 #define IPERF_TRAFFIC_TASK_STACK     4096
 #define IPERF_REPORT_TASK_NAME       "iperf_report"
-#define IPERF_REPORT_TASK_PRIORITY   100
+#define IPERF_REPORT_TASK_PRIORITY   101
 #define IPERF_REPORT_TASK_STACK      4096
 
 #define IPERF_UDP_TX_LEN             (1472)

From c90b64ed8b18891cff4414f5e20f9a6c15b686a6 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Wed, 31 Dec 2025 14:35:54 +0800
Subject: [PATCH 069/568] nshlib/ls_handler: eliminate floating-point
 operations for human-readable sizes

Replace floating-point arithmetic with fixed-point integer math to avoid
linking soft-float library (~2-3KB Flash) when displaying human-readable
file sizes (ls -lh command).

Changes:
- Use integer division and modulo to calculate size components
- Calculate decimal part: (remainder * 10) / unit for one decimal place
- Refactor duplicated code: consolidate GB/MB/KB logic into single path
- Remove CONFIG_HAVE_FLOAT dependency

This eliminates calls to __aeabi_f2d, __aeabi_fmul, __aeabi_i2f and other
ARM EABI floating-point helpers, reducing Flash footprint for systems
compiled with -mfloat-abi=soft.

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 nshlib/nsh_fscmds.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 1c705befe..c1abcd357 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -518,24 +518,39 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
 
       if ((lsflags & LSFLAGS_SIZE) != 0)
         {
-#ifdef CONFIG_HAVE_FLOAT
           if (lsflags & LSFLAGS_HUMANREADBLE && buf.st_size >= KB)
             {
+              uint32_t integer_part;
+              uint32_t decimal_part;
+              uint32_t unit;
+              char suffix;
+
+              /* Determine the appropriate unit and suffix */
+
               if (buf.st_size >= GB)
                 {
-                  nsh_output(vtbl, "%11.1fG", (float)buf.st_size / GB);
+                  unit = GB;
+                  suffix = 'G';
                 }
               else if (buf.st_size >= MB)
                 {
-                  nsh_output(vtbl, "%11.1fM", (float)buf.st_size / MB);
+                  unit = MB;
+                  suffix = 'M';
                 }
               else
                 {
-                  nsh_output(vtbl, "%11.1fK", (float)buf.st_size / KB);
+                  unit = KB;
+                  suffix = 'K';
                 }
+
+              /* Use integer arithmetic to avoid floating point */
+
+              integer_part = buf.st_size / unit;
+              decimal_part = ((buf.st_size % unit) * 10) / unit;
+              nsh_output(vtbl, "%10" PRIu32 ".%" PRIu32 "%c",
+                         integer_part, decimal_part, suffix);
             }
           else
-#endif
             {
               nsh_output(vtbl, "%12" PRIdOFF, buf.st_size);
             }
@@ -1549,11 +1564,10 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
             lsflags |= LSFLAGS_SIZE;
             break;
 
-#ifdef CONFIG_HAVE_FLOAT
           case 'h':
             lsflags |= LSFLAGS_HUMANREADBLE;
             break;
-#endif
+
           case '?':
           default:
             nsh_error(vtbl, g_fmtarginvalid, argv[0]);

From 85539a1223c4770ee36e68817f5bfe91e6b49369 Mon Sep 17 00:00:00 2001
From: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
Date: Tue, 30 Dec 2025 09:50:09 +0100
Subject: [PATCH 070/568] github/ci: add support for NTFC

Add support for NTFC testing framework.

At the moment NTFC is downloaded from a private repo,
and installed with pip and venv. In the future NTFC repositories
will be migrated to Apache organization.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
---
 .github/workflows/build.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6830a7a96..7c43588cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -175,6 +175,31 @@ jobs:
       - name: Export NuttX Repo SHA
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
 
+      - name: Install NTFC
+        uses: ./sources/nuttx/.github/actions/ci-container
+        env:
+          BLOBDIR: /tools/blobs
+        with:
+          run: |
+            # install venv
+            apt-get update
+            apt install -y python3-dev
+            apt install -y python3-venv
+
+            # get NTFC sources
+            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-ntfc
+            cd /github/workspace/nuttx-ntfc
+
+            # install NTFC with venv
+            python3 -m venv /github/workspace/nuttx-ntfc/venv
+            source /github/workspace/nuttx-ntfc/venv/bin/activate
+            pip3 install .
+            deactivate
+
+            # get NTFC test cases
+            cd external
+            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
+
       - name: Run builds
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
@@ -183,6 +208,7 @@ jobs:
           run: |
             echo "::add-matcher::sources/nuttx/.github/gcc.json"
             export ARTIFACTDIR=`pwd`/buildartifacts
+            export NTFCDIR=/github/workspace/nuttx-ntfc
             git config --global --add safe.directory /github/workspace/sources/nuttx
             git config --global --add safe.directory /github/workspace/sources/apps
             cd sources/nuttx/tools/ci

From 9ad4c3c39527ebb02199d332af811a3f792dca62 Mon Sep 17 00:00:00 2001
From: nuttxs <zhaoqing.zhang@sony.com>
Date: Wed, 24 Dec 2025 23:09:32 +0800
Subject: [PATCH 071/568] netutils/dhcpc.h: fix the compilation error caused by
 undefined CONFIG_NETDB_DNSSERVER_NAMESERVERS

Provide a default value for CONFIG_NETDB_DNSSERVER_NAMESERVERS if
CONFIG_NETDB_DNSCLIENT is not enabled

Signed-off-by: nuttxs <zhaoqing.zhang@sony.com>
---
 include/netutils/dhcpc.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/netutils/dhcpc.h b/include/netutils/dhcpc.h
index d55fca170..0cf16907b 100644
--- a/include/netutils/dhcpc.h
+++ b/include/netutils/dhcpc.h
@@ -39,6 +39,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
 #include <stdint.h>
 #include <netinet/in.h>
 
@@ -46,6 +47,14 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* Provide a default value for CONFIG_NETDB_DNSSERVER_NAMESERVERS if
+ * CONFIG_NETDB_DNSCLIENT is not enabled.
+ */
+
+#if !defined(CONFIG_NETDB_DNSSERVER_NAMESERVERS)
+#  define CONFIG_NETDB_DNSSERVER_NAMESERVERS 1
+#endif
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/

From 6830e297cf0bcb5730b3a4b87b64c01027ed2bc3 Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Thu, 7 Aug 2025 14:33:52 +0800
Subject: [PATCH 072/568] dhcpd: Supports kernel mode compilation

The previous method of terminating the dhcp daemon via a global variable has been removed; instead, the `kill pid` command is used. Also, because the original `dhcp_start` method creates tasks via `task_create`, which is not supported in kernel mode, `dhcp_start` is not compiled in kernel mode. The daemon can be started in kernel mode using `dhcpd xxx &`.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 examples/dhcpd/CMakeLists.txt |  36 ++++----
 examples/dhcpd/Makefile       |  14 +++-
 examples/dhcpd/dhcpd_daemon.c |   8 +-
 netutils/dhcpd/dhcpd.c        | 154 +++++++++++++++++++++-------------
 4 files changed, 135 insertions(+), 77 deletions(-)

diff --git a/examples/dhcpd/CMakeLists.txt b/examples/dhcpd/CMakeLists.txt
index b59cb5485..5b2ba7cd2 100644
--- a/examples/dhcpd/CMakeLists.txt
+++ b/examples/dhcpd/CMakeLists.txt
@@ -30,23 +30,27 @@ if(CONFIG_EXAMPLES_DHCPD)
     STACKSIZE
     ${CONFIG_DEFAULT_TASK_STACKSIZE})
 
-  nuttx_add_application(
-    NAME
-    dhcpd_start
-    SRCS
-    dhcpd_start.c
-    dhcpd_daemon.c
-    STACKSIZE
-    ${CONFIG_DEFAULT_TASK_STACKSIZE})
+  if(NOT CONFIG_BUILD_KERNEL)
+    nuttx_add_application(
+      NAME
+      dhcpd_start
+      SRCS
+      dhcpd_start.c
+      dhcpd_daemon.c
+      STACKSIZE
+      ${CONFIG_DEFAULT_TASK_STACKSIZE})
+  endif()
 
-  nuttx_add_application(
-    NAME
-    dhcpd_stop
-    SRCS
-    dhcpd_stop.c
-    dhcpd_daemon.c
-    STACKSIZE
-    ${CONFIG_DEFAULT_TASK_STACKSIZE})
+  if(CONFIG_SCHED_WAITPID)
+    nuttx_add_application(
+      NAME
+      dhcpd_stop
+      SRCS
+      dhcpd_stop.c
+      dhcpd_daemon.c
+      STACKSIZE
+      ${CONFIG_DEFAULT_TASK_STACKSIZE})
+  endif()
 
   add_definitions(-DCONFIG_NETUTILS_DHCPD_HOST=1 -DHAVE_SO_REUSEADDR=1
                   -DHAVE_SO_BROADCAST=1)
diff --git a/examples/dhcpd/Makefile b/examples/dhcpd/Makefile
index 84ce2efc4..6c6ab3ba8 100644
--- a/examples/dhcpd/Makefile
+++ b/examples/dhcpd/Makefile
@@ -26,13 +26,23 @@ include $(APPDIR)/Make.defs
 
 CSRCS = dhcpd_daemon.c
 
-MAINSRC = dhcpd_start.c dhcpd_stop.c target.c
+MAINSRC = target.c
 
 # DHCPD built-in application info
 
-PROGNAME = dhcpd_start dhcpd_stop dhcpd
+PROGNAME = dhcpd
 PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_DHCPD)
 
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+MAINSRC += dhcpd_start.c
+PROGNAME += dhcpd_start
+endif
+
+ifeq ($(CONFIG_SCHED_WAITPID),y)
+MAINSRC += dhcpd_stop.c
+PROGNAME += dhcpd_stop
+endif
+
 include $(APPDIR)/Application.mk
diff --git a/examples/dhcpd/dhcpd_daemon.c b/examples/dhcpd/dhcpd_daemon.c
index 5b8f52186..b4f16e787 100644
--- a/examples/dhcpd/dhcpd_daemon.c
+++ b/examples/dhcpd/dhcpd_daemon.c
@@ -128,10 +128,12 @@ int dhcpd_daemon(int argc, FAR char *argv[], bool daemon)
 
   /* Then start the dhcpd */
 
-  if (daemon)
+#ifndef CONFIG_BUILD_KERNEL
+  if (!daemon)
     {
-      return dhcpd_run(devname);
+      return dhcpd_start(devname);
     }
+#endif
 
-  return dhcpd_start(devname);
+  return dhcpd_run(devname);
 }
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index 367dda526..558991c22 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -47,6 +47,7 @@
 
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/wait.h>
 
 #include <inttypes.h>
 #include <sched.h>
@@ -276,8 +277,6 @@ struct dhcpd_state_s
 struct dhcpd_daemon_s
 {
   uint8_t                   ds_state; /* See enum dhcpd_daemon_e */
-  sem_t                     ds_lock;  /* Used to protect the whole structure */
-  sem_t                     ds_sync;  /* Used to synchronize start and stop events */
   pid_t                     ds_pid;   /* Task ID of the DHCPD daemon */
   FAR struct dhcpd_state_s *ds_data;  /* DHCPD daemon data */
 };
@@ -314,8 +313,6 @@ static const uint8_t        g_magiccookie[4] =
 static struct dhcpd_daemon_s g_dhcpd_daemon =
 {
   DHCPD_NOT_RUNNING,
-  SEM_INITIALIZER(1),
-  SEM_INITIALIZER(0),
   -1,
   NULL
 };
@@ -1019,7 +1016,7 @@ static int dhcpd_sendpacket(int sockfd, int bbroadcast)
 #endif
 
   /* Create a socket to respond with a packet to the client.  We
-   * cannot re-use the listener socket because it is not bound correctly
+   * cannot reuse the listener socket because it is not bound correctly
    */
 
   /* Then send the response to the DHCP client port at that address */
@@ -1407,7 +1404,7 @@ static inline int dhcpd_decline(void)
   lease = dhcpd_findbymac(g_state.ds_inpacket.chaddr);
   if (lease)
     {
-      /* Disassociate the IP from the MAC, but prevent re-used of this
+      /* Disassociate the IP from the MAC, but prevent reused of this
        * address for a period of time.
        */
 
@@ -1497,10 +1494,74 @@ static inline int dhcpd_openlistener(FAR const char *interface)
  * Name: dhcpd_task_run
  ****************************************************************************/
 
+#ifndef CONFIG_BUILD_KERNEL
 static int dhcpd_task_run(int argc, char **argv)
 {
   return dhcpd_run(argv[1]);
 }
+#endif
+
+/****************************************************************************
+ * Name: dhcpd_get_pid
+ *
+ * Description:
+ *   Use /proc filesystem to get dhcpd process PID
+ *
+ * Returned Value:
+ *   PID of dhcpd process on success, -1 on failure
+ *
+ ****************************************************************************/
+
+#if !defined(CONFIG_BUILD_KERNEL) || defined(CONFIG_SCHED_WAITPID)
+static pid_t dhcpd_get_pid(void)
+{
+  pid_t pid = -1;
+
+#if !defined(CONFIG_BUILD_KERNEL)
+  pid = g_dhcpd_daemon.ds_pid;
+#elif defined(CONFIG_SYSTEM_POPEN)
+  FAR FILE *fp;
+  char line[32];
+
+  fp = popen(("pidof dhcpd"), "r");
+  if (fp == NULL)
+    {
+      return -errno;
+    }
+
+  if (fgets(line, sizeof(line), fp) != NULL)
+    {
+      pid = atoi(line);
+    }
+
+  pclose(fp);
+#endif
+
+  return pid;
+}
+#endif
+
+/****************************************************************************
+ * Name: dhcpd_signal_handler
+ *
+ * Description:
+ *   Signal handler for CONFIG_NETUTILS_DHCPD_SIGWAKEUP
+ *   This function allows dhcpd_stop to terminate dhcpd daemon
+ *
+ * Input Parameters:
+ *   signo - Signal number
+ *   info  - Signal information
+ *   ctx   - Signal context
+ *
+ ****************************************************************************/
+
+static void
+dhcpd_signal_handler(int signo, FAR siginfo_t *info, FAR void *ctx)
+{
+  /* Set global flag to indicate stop request */
+
+  g_dhcpd_daemon.ds_state = DHCPD_STOP_REQUESTED;
+}
 
 /****************************************************************************
  * Public Functions
@@ -1512,7 +1573,8 @@ static int dhcpd_task_run(int argc, char **argv)
 
 int dhcpd_run(FAR const char *interface)
 {
-  int sockfd;
+  struct sigaction act;
+  int sockfd = -1;
   int nbytes;
 
   ninfo("Started\n");
@@ -1538,15 +1600,19 @@ int dhcpd_run(FAR const char *interface)
 
   g_dhcpd_daemon.ds_pid = getpid();
 
+  /* Install signal handler for CONFIG_NETUTILS_DHCPD_SIGWAKEUP */
+
+  memset(&act, 0, sizeof(act));
+  act.sa_sigaction = dhcpd_signal_handler;
+  act.sa_flags = SA_SIGINFO;
+  sigaction(CONFIG_NETUTILS_DHCPD_SIGWAKEUP, &act, NULL);
+
   /* Indicate that we have started */
 
   g_dhcpd_daemon.ds_state = DHCPD_RUNNING;
 
-  sem_post(&g_dhcpd_daemon.ds_sync);
-
   /* Now loop indefinitely, reading packets from the DHCP server socket */
 
-  sockfd = -1;
   while (g_dhcpd_daemon.ds_state != DHCPD_STOP_REQUESTED)
     {
       /* Create a socket to listen for requests from DHCP clients */
@@ -1631,7 +1697,6 @@ int dhcpd_run(FAR const char *interface)
   g_dhcpd_daemon.ds_data = NULL;
   g_dhcpd_daemon.ds_pid   = -1;
   g_dhcpd_daemon.ds_state = DHCPD_STOPPED;
-  sem_post(&g_dhcpd_daemon.ds_sync);
 
   return OK;
 }
@@ -1648,6 +1713,7 @@ int dhcpd_run(FAR const char *interface)
  *
  ****************************************************************************/
 
+#ifndef CONFIG_BUILD_KERNEL
 int dhcpd_start(FAR const char *interface)
 {
   FAR char *argv[2];
@@ -1658,17 +1724,13 @@ int dhcpd_start(FAR const char *interface)
 
   /* Is the DHCPD in a non-running state? */
 
-  sem_wait(&g_dhcpd_daemon.ds_lock);
-  if (g_dhcpd_daemon.ds_state == DHCPD_NOT_RUNNING ||
-      g_dhcpd_daemon.ds_state == DHCPD_STOPPED)
+  if (dhcpd_get_pid() < 0)
     {
       /* Start the DHCPD daemon */
 
-      g_dhcpd_daemon.ds_state = DHCPD_STARTED;
-      pid =
-        task_create("DHCPD daemon", CONFIG_NETUTILS_DHCPD_PRIORITY,
-                    CONFIG_NETUTILS_DHCPD_STACKSIZE, dhcpd_task_run,
-                    argv);
+      pid = task_create("dhcpd", CONFIG_NETUTILS_DHCPD_PRIORITY,
+                        CONFIG_NETUTILS_DHCPD_STACKSIZE, dhcpd_task_run,
+                        argv);
 
       /* Handle failures to start the DHCPD daemon */
 
@@ -1676,24 +1738,14 @@ int dhcpd_start(FAR const char *interface)
         {
           int errval = errno;
 
-          g_dhcpd_daemon.ds_state = DHCPD_STOPPED;
           nerr("ERROR: Failed to start the DHCPD daemon: %d\n", errval);
-          sem_post(&g_dhcpd_daemon.ds_lock);
           return -errval;
         }
-
-      /* Wait for any daemon state change */
-
-      do
-        {
-          sem_wait(&g_dhcpd_daemon.ds_sync);
-        }
-      while (g_dhcpd_daemon.ds_state == DHCPD_STARTED);
     }
 
-  sem_post(&g_dhcpd_daemon.ds_lock);
   return OK;
 }
+#endif
 
 /****************************************************************************
  * Name: dhcpd_stop
@@ -1707,46 +1759,36 @@ int dhcpd_start(FAR const char *interface)
  *
  ****************************************************************************/
 
+#ifdef CONFIG_SCHED_WAITPID
 int dhcpd_stop(void)
 {
-  int ret;
+  pid_t pid;
 
   /* Is the DHCPD in a running state? */
 
-  sem_wait(&g_dhcpd_daemon.ds_lock);
-  if (g_dhcpd_daemon.ds_state == DHCPD_STARTED ||
-      g_dhcpd_daemon.ds_state == DHCPD_RUNNING)
+  pid = dhcpd_get_pid();
+  if (pid >= 0)
     {
       /* Yes.. request that the daemon stop. */
 
-      g_dhcpd_daemon.ds_state = DHCPD_STOP_REQUESTED;
-
-      /* Wait for any daemon state change */
-
-      do
+      if (kill(pid, CONFIG_NETUTILS_DHCPD_SIGWAKEUP) < 0)
         {
-          /* Signal the DHCPD client */
-
-          ret = kill(g_dhcpd_daemon.ds_pid,
-                     CONFIG_NETUTILS_DHCPD_SIGWAKEUP);
-
-          if (ret < 0)
-            {
-              nerr("ERROR: kill pid %d failed: %d\n",
-                   g_dhcpd_daemon.ds_pid, errno);
-              break;
-            }
-
-          /* Wait for the DHCPD client to respond to the stop request */
-
-          sem_wait(&g_dhcpd_daemon.ds_sync);
+          nerr("ERROR: kill pid %d failed: %d\n", pid, errno);
+          return -errno;
+        }
+
+      /* Wait for the DHCPD client to respond to the stop request */
+
+      if (waitpid(pid, NULL, 0) < 0)
+        {
+          nerr("ERROR: waitpid failed: %d\n", errno);
+          return -errno;
         }
-      while (g_dhcpd_daemon.ds_state == DHCPD_STOP_REQUESTED);
     }
 
-  sem_post(&g_dhcpd_daemon.ds_lock);
   return OK;
 }
+#endif
 
 /****************************************************************************
  * Name: dhcpd_set_startip

From 150c5756a06314869d4d12f72d7a418b5a20e152 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Fri, 24 Oct 2025 12:33:00 +0800
Subject: [PATCH 073/568] examples/capture: support monitor edge change by
 signal

add monitor code about edge change

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 examples/capture/cap.h      |  1 +
 examples/capture/cap_main.c | 82 +++++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/examples/capture/cap.h b/examples/capture/cap.h
index 2b1c6f5cf..98c3a5e27 100644
--- a/examples/capture/cap.h
+++ b/examples/capture/cap.h
@@ -42,6 +42,7 @@ struct cap_example_s
   FAR char    *devpath;     /* Path to the capture device */
   unsigned int nloops;      /* Collect this number of samples */
   unsigned int delay;       /* Delay this number of seconds between samples */
+  int          signo;       /* Signal number to deliver on isr occur */
 };
 
 /****************************************************************************
diff --git a/examples/capture/cap_main.c b/examples/capture/cap_main.c
index 3cbe9e8c2..3ca080368 100644
--- a/examples/capture/cap_main.c
+++ b/examples/capture/cap_main.c
@@ -98,6 +98,10 @@ static void cap_help(void)
   printf("  [-p devpath] Capture device path\n");
   printf("  [-n samples] Number of samples\n");
   printf("  [-t msec]    Delay between samples (msec)\n");
+#ifdef CONFIG_CAPTURE_NOTIFY
+  printf("  [-w signo]:  Wait for a signal if given "
+         "otherwise POLL mode if this is an interrupt pin.\n");
+#endif
   printf("  [-h]         Shows this message and exits\n\n");
 }
 
@@ -149,6 +153,7 @@ static void parse_args(int argc, FAR char **argv)
 
   g_capexample.nloops = CONFIG_EXAMPLES_CAPTURE_NSAMPLES;
   g_capexample.delay  = CONFIG_EXAMPLES_CAPTURE_DELAY;
+  g_capexample.signo  = 1;
 
   for (index = 1; index < argc; )
     {
@@ -191,6 +196,20 @@ static void parse_args(int argc, FAR char **argv)
             index += nargs;
             break;
 
+#ifdef CONFIG_CAPTURE_NOTIFY
+          case 'w':
+            nargs = arg_decimal(&argv[index], &value);
+            if (value < MIN_SIGNO || value > MAX_SIGNO)
+              {
+                printf("Wait signo out of range: %ld\n", value);
+                exit(1);
+              }
+
+            g_capexample.signo = (int)value;
+            index += nargs;
+            break;
+#endif
+
           case 'h':
             cap_help();
             exit(EXIT_SUCCESS);
@@ -214,12 +233,17 @@ static void parse_args(int argc, FAR char **argv)
 int main(int argc, FAR char *argv[])
 {
   int8_t dutycycle;
-  int32_t frequence;
+  int32_t frequency;
   int32_t edges;
   int fd;
   int exitval = EXIT_SUCCESS;
   int ret;
   int nloops;
+#ifdef CONFIG_CAPTURE_NOTIFY
+  struct cap_notify_s notify;
+  struct timespec ts;
+  sigset_t set;
+#endif
 
   /* Set the default values */
 
@@ -242,6 +266,56 @@ int main(int argc, FAR char *argv[])
       goto errout;
     }
 
+#ifdef CONFIG_CAPTURE_NOTIFY
+  notify.chan = 0;
+  notify.type = CAP_TYPE_BOTH;
+
+  notify.event.sigev_notify = SIGEV_SIGNAL;
+  notify.event.sigev_signo  = g_capexample.signo;
+
+  ret = ioctl(fd, CAPIOC_REGISTER, (unsigned long)&notify);
+  if (ret < 0)
+    {
+      printf("cap_main: ioctl(GPIOC_REGISTER) failed: %d\n", errno);
+      exitval = EXIT_FAILURE;
+      goto errout_with_dev;
+    }
+
+  /* Wait up to 5 seconds for the signal */
+
+  sigemptyset(&set);
+  sigaddset(&set, g_capexample.signo);
+
+  ts.tv_sec  = 5;
+  ts.tv_nsec = 0;
+
+  ret = sigtimedwait(&set, NULL, &ts);
+  ioctl(fd, CAPIOC_UNREGISTER, notify.chan);
+  if (ret < 0)
+    {
+      int errcode = errno;
+      if (errcode == EAGAIN)
+        {
+          printf("cpu_main: Five second timeout with no signal\n");
+          exitval = EXIT_FAILURE;
+          goto errout_with_dev;
+        }
+      else
+        {
+          printf("cpu_main: ERROR: Failed to wait signal %d "
+                 "from %s: %d\n", g_capexample.signo, g_capexample.devpath,
+                 errcode);
+          exitval = EXIT_FAILURE;
+          goto errout_with_dev;
+        }
+    }
+  else
+    {
+      printf("cap_main: Received signal %d from %s\n",
+             g_capexample.signo, g_capexample.devpath);
+    }
+#endif
+
   /* Now loop the appropriate number of times, displaying the collected
    * encoder samples.
    */
@@ -275,10 +349,10 @@ int main(int argc, FAR char *argv[])
           printf("pwm duty cycle: %d %% \n", dutycycle);
         }
 
-      /* Get the frequence data using the ioctl */
+      /* Get the frequency data using the ioctl */
 
       ret = ioctl(fd, CAPIOC_FREQUENCE,
-                  (unsigned long)((uintptr_t)&frequence));
+                  (unsigned long)((uintptr_t)&frequency));
       if (ret < 0)
         {
           printf("cap_main: ioctl(CAPIOC_FREQUENCE) failed: %d\n", errno);
@@ -290,7 +364,7 @@ int main(int argc, FAR char *argv[])
 
       else
         {
-          printf("pwm frequence: %"PRId32" Hz \n", frequence);
+          printf("pwm frequency: %"PRId32" Hz \n", frequency);
         }
 
       /* Get the edges data using the ioctl */

From 3467f9b82d58e95416371beaeaa6dfd17e2910c5 Mon Sep 17 00:00:00 2001
From: meijian <meijian@xiaomi.com>
Date: Sat, 12 Oct 2024 16:54:05 +0800
Subject: [PATCH 074/568] apps/net: add ip address connectivity check API

The system checks connectivity with the input IP address; if no IP address is provided, it defaults to checking DNS server connectivity.

Signed-off-by: meijian <meijian@xiaomi.com>
---
 include/netutils/netlib.h                    |   4 +
 netutils/netlib/CMakeLists.txt               |   4 +
 netutils/netlib/Makefile                     |   4 +
 netutils/netlib/netlib_checkipconnectivity.c | 135 +++++++++++++++++++
 4 files changed, 147 insertions(+)
 create mode 100644 netutils/netlib/netlib_checkipconnectivity.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 5c7b6a74f..a751ed60b 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -513,6 +513,10 @@ int netlib_getifstatistics(FAR const char *ifname,
 int netlib_check_ifconflict(FAR const char *ifname);
 #endif
 
+#ifdef CONFIG_NETUTILS_PING
+int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry);
+#endif
+
 #ifdef CONFIG_MM_IOB
 int netlib_get_iobinfo(FAR struct iob_stats_s *iob);
 #endif
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 3f3697e95..632b32857 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -157,6 +157,10 @@ if(CONFIG_NETUTILS_NETLIB)
     list(APPEND SRCS netlib_getiobinfo.c)
   endif()
 
+  if(CONFIG_NETUTILS_PING)
+    list(APPEND SRCS netlib_checkipconnectivity.c)
+  endif()
+
   target_sources(apps PRIVATE ${SRCS})
 
 endif()
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 32eafe2f8..0de8c07e5 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -156,4 +156,8 @@ ifeq ($(CONFIG_MM_IOB),y)
 CSRCS += netlib_getiobinfo.c
 endif
 
+ifeq ($(CONFIG_NETUTILS_PING),y)
+CSRCS += netlib_checkipconnectivity.c
+endif
+
 include $(APPDIR)/Application.mk
diff --git a/netutils/netlib/netlib_checkipconnectivity.c b/netutils/netlib/netlib_checkipconnectivity.c
new file mode 100644
index 000000000..145c987ff
--- /dev/null
+++ b/netutils/netlib/netlib_checkipconnectivity.c
@@ -0,0 +1,135 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_checkipconnectivity.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <arpa/inet.h>
+#include <nuttx/net/ip.h>
+
+#include "netutils/icmp_ping.h"
+#include "netutils/netlib.h"
+
+#ifdef CONFIG_NETUTILS_PING
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#define PING_IPADDR_DATALEN  80
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ping_ipaddr_callback
+ *
+ * Description:
+ *   ping ipaddr callback
+ *
+ * Parameters:
+ *   result  The result of ping
+ *
+ ****************************************************************************/
+
+static void ping_ipaddr_callback(FAR const struct ping_result_s *result)
+{
+  FAR int *count = result->info->priv;
+
+  if (result->code == ICMP_I_FINISH)
+    {
+      *count = result->nreplies;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_check_ipconnectivity
+ *
+ * Description:
+ *   Get the network dns status
+ *
+ * Parameters:
+ *   ip       The ipv4 address to check
+ *   timeout  The max timeout of each ping
+ *   retry    The retry times of ping
+ *
+ * Return:
+ *   nums of remote reply of ping; a nagtive on failure
+ *
+ ****************************************************************************/
+
+int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry)
+{
+  int replies = 0;
+#ifdef CONFIG_NETDB_DNSSERVER_IPv4ADDR
+  char ip_str[INET_ADDRSTRLEN];
+  struct in_addr addr;
+#endif
+  struct ping_info_s info;
+
+  info.count    = retry;
+  info.datalen  = PING_IPADDR_DATALEN;
+  info.delay    = 0;
+  info.timeout  = timeout;
+  info.callback = ping_ipaddr_callback;
+  info.priv     = &replies;
+
+  /* if ip is NULL we use default DNS server */
+
+  if (ip == NULL)
+    {
+#ifdef CONFIG_NETDB_DNSSERVER_IPv4ADDR
+      addr.s_addr = HTONL(CONFIG_NETDB_DNSSERVER_IPv4ADDR);
+      inet_ntop(AF_INET, &addr, ip_str, INET_ADDRSTRLEN);
+      info.hostname = ip_str;
+#else
+      nerr("ERROR: IP is NULL and no DNS server configured\n");
+      return -EINVAL;
+#endif
+    }
+  else
+    {
+      info.hostname = ip;
+    }
+
+  ninfo("ping ipaddr test %s \n", info.hostname);
+  icmp_ping(&info);
+
+  return replies;
+}
+
+#endif /* CONFIG_NETUTILS_PING */
\ No newline at end of file

From 188838469cc8db044e87f3a1bdfe8a12b9d57bf1 Mon Sep 17 00:00:00 2001
From: buxiasen <buxiasen@xiaomi.com>
Date: Mon, 30 Dec 2024 15:02:55 +0800
Subject: [PATCH 075/568] kernel/syscall: fix required INET may case no support

We may possible enable socket and no ipv4

Signed-off-by: buxiasen <buxiasen@xiaomi.com>
---
 testing/testsuites/kernel/syscall/cmocka_syscall_test.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/testsuites/kernel/syscall/cmocka_syscall_test.c b/testing/testsuites/kernel/syscall/cmocka_syscall_test.c
index e1fceb592..70b1c592f 100644
--- a/testing/testsuites/kernel/syscall/cmocka_syscall_test.c
+++ b/testing/testsuites/kernel/syscall/cmocka_syscall_test.c
@@ -161,6 +161,7 @@ int main(int argc, char *argv[])
           test_nuttx_syscall_getpeername01,
           test_nuttx_syscall_test_group_setup,
           test_nuttx_syscall_test_group_teardown),
+#  ifdef CONFIG_NET_IPv4
       cmocka_unit_test_setup_teardown(
           test_nuttx_syscall_getsockopt01,
           test_nuttx_syscall_test_group_setup,
@@ -175,6 +176,7 @@ int main(int argc, char *argv[])
           test_nuttx_syscall_setsockopt01,
           test_nuttx_syscall_test_group_setup,
           test_nuttx_syscall_test_group_teardown),
+#  endif
       cmocka_unit_test_setup_teardown(
           test_nuttx_syscall_listen01,
           test_nuttx_syscall_test_group_setup,

From 157ecb091d617cee84e2b5d7aa2c95af52a4c76c Mon Sep 17 00:00:00 2001
From: buxiasen <buxiasen@xiaomi.com>
Date: Thu, 13 Feb 2025 16:07:10 +0800
Subject: [PATCH 076/568] iperf: compatible work with no IPv4

We possible want to use iperf to test rpmsg socket etc.

Fix error when enable iperf and no IPv4
```
arm-none-eabi-ld: warning: ~/nuttx/nuttx has a LOAD segment with RWX permissions
arm-none-eabi-ld: ~/nuttx/staging/libapps.a(iperf_main.c.~.apps.netutils.iperf_1.o): in function `iperf_main':
~/apps/netutils/iperf/iperf_main.c:248:(.text.iperf_main+0x330): undefined reference to `inet_ntoa_r'
arm-none-eabi-ld: ~/apps/netutils/iperf/iperf_main.c:240:(.text.iperf_main+0x354): undefined reference to `netlib_get_ipv4addr'
arm-none-eabi-ld: ~/nuttx/staging/libapps.a(iperf.c.~.apps.netutils.iperf_1.o): in function `iperf_print_addr':
~/apps/netutils/iperf/iperf.c:226:(.text.iperf_print_addr+0x3c): undefined reference to `inet_ntoa'
```

Signed-off-by: buxiasen <buxiasen@xiaomi.com>
---
 netutils/iperf/iperf.c      | 2 ++
 netutils/iperf/iperf_main.c | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/netutils/iperf/iperf.c b/netutils/iperf/iperf.c
index b9243a608..97ebf639f 100644
--- a/netutils/iperf/iperf.c
+++ b/netutils/iperf/iperf.c
@@ -220,6 +220,7 @@ static void iperf_print_addr(FAR const char *str, FAR struct sockaddr *addr)
 {
   switch (addr->sa_family)
     {
+#ifdef CONFIG_NET_IPv4
       case AF_INET:
         {
           FAR struct sockaddr_in *inaddr = (FAR struct sockaddr_in *)addr;
@@ -227,6 +228,7 @@ static void iperf_print_addr(FAR const char *str, FAR struct sockaddr *addr)
                  inet_ntoa(inaddr->sin_addr), htons(inaddr->sin_port));
           return;
         }
+#endif
 
       case AF_LOCAL:
         {
diff --git a/netutils/iperf/iperf_main.c b/netutils/iperf/iperf_main.c
index 67ff3855e..b87a122bc 100644
--- a/netutils/iperf/iperf_main.c
+++ b/netutils/iperf/iperf_main.c
@@ -140,7 +140,10 @@ int main(int argc, FAR char *argv[])
   struct iperf_cfg_t cfg;
   struct in_addr addr;
   int nerrors;
+
+#ifdef CONFIG_NET_IPv4
   char inetaddr[INET_ADDRSTRLEN];
+#endif
 
   bzero(&addr, sizeof(struct in_addr));
   bzero(&cfg, sizeof(cfg));
@@ -226,6 +229,7 @@ int main(int argc, FAR char *argv[])
     }
   else
     {
+#ifdef CONFIG_NET_IPv4
       if (iperf_args.bind->count > 0)
         {
           addr.s_addr = inet_addr(iperf_args.bind->sval[0]);
@@ -248,6 +252,10 @@ int main(int argc, FAR char *argv[])
       printf("     IP: %s\n", inet_ntoa_r(addr, inetaddr, sizeof(inetaddr)));
 
       cfg.sip = addr.s_addr;
+#else
+      printf("ERROR: IPv4 Not Enabled\n");
+      goto out;
+#endif
     }
 
   if (iperf_args.udp->count == 0)

From 4f93ec0a4335d574eeecfd295584fbfb17056e5b Mon Sep 17 00:00:00 2001
From: Zhe Weng <wengzhe@xiaomi.com>
Date: Wed, 15 Jan 2025 17:08:01 +0800
Subject: [PATCH 077/568] pkt: Set `sll_protocol` for raw socket to `ETH_P_ALL`

Ref: https://man7.org/linux/man-pages/man7/packet.7.html

We should either set protocal when creating socket or binding, otherwise
we cannot capture any packet.

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 examples/netpkt/netpkt_ethercat.c | 5 ++++-
 system/tcpdump/tcpdump.c          | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/netpkt/netpkt_ethercat.c b/examples/netpkt/netpkt_ethercat.c
index 8b8ab298a..6ed6ae8d9 100644
--- a/examples/netpkt/netpkt_ethercat.c
+++ b/examples/netpkt/netpkt_ethercat.c
@@ -30,6 +30,8 @@
 #include <time.h>
 
 #include <net/if.h>
+#include <netinet/if_ether.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netpacket/packet.h>
 #include <sys/socket.h>
@@ -66,7 +68,7 @@ int main(int argc, FAR const char *argv[])
   int num_packets = 0;
   int len;
   int ifindex;
-  int sockfd = socket(AF_PACKET, SOCK_RAW, IPPROTO_RAW);
+  int sockfd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
 
   if (sockfd == -1)
     {
@@ -96,6 +98,7 @@ int main(int argc, FAR const char *argv[])
 
   addr.sll_family = AF_PACKET;
   addr.sll_ifindex = ifindex;
+  addr.sll_protocol = htons(ETH_P_ALL);
   if (bind(sockfd, (FAR const struct sockaddr *)&addr, sizeof(addr)) < 0)
     {
       perror("ERROR: binding socket failed");
diff --git a/system/tcpdump/tcpdump.c b/system/tcpdump/tcpdump.c
index 0220ae8bd..5f80ef510 100644
--- a/system/tcpdump/tcpdump.c
+++ b/system/tcpdump/tcpdump.c
@@ -30,6 +30,8 @@
 #include <fcntl.h>
 #include <net/if.h>
 #include <net/if_arp.h>
+#include <netinet/if_ether.h>
+#include <netinet/in.h>
 #include <netpacket/packet.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -201,6 +203,7 @@ static int socket_open(int ifindex)
 
   addr.sll_family = AF_PACKET;
   addr.sll_ifindex = ifindex;
+  addr.sll_protocol = htons(ETH_P_ALL);
   if (bind(sd, (FAR const struct sockaddr *)&addr, sizeof(addr)) < 0)
     {
       perror("ERROR: binding socket failed");

From ca11a7e0930a0170d2c17e7913cd3fc221e2f6a5 Mon Sep 17 00:00:00 2001
From: Felipe MdeO <moura.fmo@gmail.com>
Date: Thu, 1 Jan 2026 16:46:27 -0300
Subject: [PATCH 078/568] system/smf: Port SMF .c/.h files to NuttX

This commit add state machine framework lib to the NuttX project. Also an example is added to help users understand and use this feature.

Changes: Added some files. No impact in other features are expected.

Adjust SMF macro names

Fix issues requested during MR review

update kconfig

fix ci-cd issue

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 examples/smf/CMakeLists.txt      |  18 +
 examples/smf/Kconfig             |  37 ++
 examples/smf/Make.defs           |  25 ++
 examples/smf/Makefile            |  37 ++
 examples/smf/hsm_psicc2_thread.c | 626 +++++++++++++++++++++++++++++++
 examples/smf/hsm_psicc2_thread.h |  89 +++++
 examples/smf/smf_main.c          | 127 +++++++
 include/system/smf.h             | 267 +++++++++++++
 system/smf/Kconfig               |  28 ++
 system/smf/Make.defs             |  25 ++
 system/smf/Makefile              |  29 ++
 system/smf/smf.c                 | 605 +++++++++++++++++++++++++++++
 12 files changed, 1913 insertions(+)
 create mode 100644 examples/smf/CMakeLists.txt
 create mode 100644 examples/smf/Kconfig
 create mode 100644 examples/smf/Make.defs
 create mode 100644 examples/smf/Makefile
 create mode 100644 examples/smf/hsm_psicc2_thread.c
 create mode 100644 examples/smf/hsm_psicc2_thread.h
 create mode 100644 examples/smf/smf_main.c
 create mode 100644 include/system/smf.h
 create mode 100644 system/smf/Kconfig
 create mode 100644 system/smf/Make.defs
 create mode 100644 system/smf/Makefile
 create mode 100644 system/smf/smf.c

diff --git a/examples/smf/CMakeLists.txt b/examples/smf/CMakeLists.txt
new file mode 100644
index 000000000..bba48ca02
--- /dev/null
+++ b/examples/smf/CMakeLists.txt
@@ -0,0 +1,18 @@
+# ##############################################################################
+# apps/examples/hsm_psicc2/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_SMF)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_SMF_PROGNAME}
+    SRCS
+    smf_main.c
+    hsm_psicc2_thread.c
+    STACKSIZE
+    ${CONFIG_EXAMPLES_SMF_STACKSIZE}
+    PRIORITY
+    ${CONFIG_EXAMPLES_SMF_PRIORITY})
+endif()
diff --git a/examples/smf/Kconfig b/examples/smf/Kconfig
new file mode 100644
index 000000000..8d8efc1f7
--- /dev/null
+++ b/examples/smf/Kconfig
@@ -0,0 +1,37 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_SMF
+  tristate "State Machine Framework PSICC2 demo (HSM)"
+  default n
+  depends on NSH_BUILTIN_APPS
+  depends on SYSTEM_SMF
+  depends on SYSTEM_SMF_ANCESTOR_SUPPORT
+  depends on SYSTEM_SMF_INITIAL_TRANSITION
+
+if EXAMPLES_SMF
+
+config EXAMPLES_SMF_PROGNAME
+  string "Program name"
+  default "hsm_psicc2"
+
+config EXAMPLES_SMF_PRIORITY
+  int "Priority"
+  default 100
+
+config EXAMPLES_SMF_STACKSIZE
+  int "Stack size"
+  default 2048
+
+config EXAMPLES_SMF_EVENT_QUEUE_SIZE
+  int "Event queue size"
+  default 10
+
+config EXAMPLES_SMF_MQ_NAME
+  string "Message queue name"
+  default "/hsm_psicc2_mq"
+
+endif
+
diff --git a/examples/smf/Make.defs b/examples/smf/Make.defs
new file mode 100644
index 000000000..00be28079
--- /dev/null
+++ b/examples/smf/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/hello/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_SMF),)
+CONFIGURED_APPS += $(APPDIR)/examples/smf
+endif
diff --git a/examples/smf/Makefile b/examples/smf/Makefile
new file mode 100644
index 000000000..2fd9309c1
--- /dev/null
+++ b/examples/smf/Makefile
@@ -0,0 +1,37 @@
+############################################################################
+# apps/examples/hsm_psicc2/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# HSM PSICC2 (SMF demo) built-in application info
+
+PROGNAME  = $(CONFIG_EXAMPLES_SMF_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_SMF_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_SMF_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_SMF)
+
+# HSM PSICC2 Example
+
+MAINSRC = smf_main.c
+CSRCS  += hsm_psicc2_thread.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/smf/hsm_psicc2_thread.c b/examples/smf/hsm_psicc2_thread.c
new file mode 100644
index 000000000..e457969e1
--- /dev/null
+++ b/examples/smf/hsm_psicc2_thread.c
@@ -0,0 +1,626 @@
+/****************************************************************************
+ * apps/examples/smf/hsm_psicc2_thread.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Glenn Andrews
+ * State Machine example copyright (c) Miro Samek
+ *
+ * Implementation of the statechart in Figure 2.11 of
+ * Practical UML Statecharts in C/C++, 2nd Edition by Miro Samek
+ * https://www.state-machine.com/psicc2
+ * Used with permission of the author.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <mqueue.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <system/smf.h>
+
+#include "hsm_psicc2_thread.h"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct s_object
+{
+  struct smf_ctx ctx; /* MUST be first (matches SMF_CTX(obj)) */
+  struct hsm_psicc2_event event;
+  int foo;
+};
+
+enum demo_states
+{
+  STATE_INITIAL,
+  STATE_S,
+  STATE_S1,
+  STATE_S2,
+  STATE_S11,
+  STATE_S21,
+  STATE_S211
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct s_object s_obj;
+static bool g_started;
+static const struct smf_state demo_states[];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * STATE_INITIAL
+ ****************************************************************************/
+
+static void initial_entry(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+  obj->foo = false;
+}
+
+static enum smf_state_result initial_run(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void initial_exit(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+/****************************************************************************
+ * STATE_S
+ ****************************************************************************/
+
+static void s_entry(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s", __func__);
+}
+
+static enum smf_state_result s_run(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+
+  switch (obj->event.event_id)
+    {
+      case EVENT_E:
+        printf("[psicc2] %s received EVENT_E", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S11]);
+        break;
+
+      case EVENT_I:
+        if (obj->foo)
+          {
+            printf("[psicc2] %s received EVENT_I and set foo false\n",
+                   __func__);
+            obj->foo = false;
+          }
+        else
+          {
+            printf("[psicc2] %s received EVENT_I and did nothing\n",
+                   __func__);
+          }
+
+        return SMF_EVENT_HANDLED;
+
+      case EVENT_TERMINATE:
+        printf("[psicc2] %s received EVENT_TERMINATE. Terminating\n",
+               __func__);
+        smf_set_terminate(SMF_CTX(obj), -1);
+        break;
+
+      default:
+        break;
+    }
+
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void s_exit(void *o)
+{
+  (void)o;
+
+  printf("%s", __func__);
+}
+
+/****************************************************************************
+ * STATE_S1
+ ****************************************************************************/
+
+static void s1_entry(void *o)
+{
+  (void)o;
+
+  printf("%s", __func__);
+}
+
+static enum smf_state_result s1_run(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+
+  switch (obj->event.event_id)
+    {
+      case EVENT_A:
+        printf("[psicc2] %s received EVENT_A\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S1]);
+        break;
+
+      case EVENT_B:
+        printf("[psicc2] %s received EVENT_B\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S11]);
+        break;
+
+      case EVENT_C:
+        printf("[psicc2] %s received EVENT_C\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S2]);
+        break;
+
+      case EVENT_D:
+        if (!obj->foo)
+          {
+            printf("[psicc2] %s received EVENT_D and acted on it\n",
+                   __func__);
+            obj->foo = true;
+            smf_set_state(SMF_CTX(obj), &demo_states[STATE_S]);
+          }
+        else
+          {
+            printf("[psicc2] %s received EVENT_D and ignored it\n",
+                   __func__);
+          }
+        break;
+
+      case EVENT_F:
+        printf("[psicc2] %s received EVENT_F\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S211]);
+        break;
+
+      case EVENT_I:
+        printf("[psicc2] %s received EVENT_I\n", __func__);
+        return SMF_EVENT_HANDLED;
+
+      default:
+        break;
+    }
+
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void s1_exit(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+/****************************************************************************
+ * STATE_S11
+ ****************************************************************************/
+
+static void s11_entry(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+static enum smf_state_result s11_run(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+
+  switch (obj->event.event_id)
+    {
+      case EVENT_D:
+        if (obj->foo)
+          {
+            printf("[psicc2] %s received EVENT_D and acted upon it\n",
+                   __func__);
+            obj->foo = false;
+            smf_set_state(SMF_CTX(obj), &demo_states[STATE_S1]);
+          }
+        else
+          {
+            printf("[psicc2] %s received EVENT_D and ignored it\n",
+                   __func__);
+          }
+        break;
+
+      case EVENT_G:
+        printf("[psicc2] %s received EVENT_G\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S21]);
+        break;
+
+      case EVENT_H:
+        printf("[psicc2] %s received EVENT_H\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S]);
+        break;
+
+      default:
+        break;
+    }
+
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void s11_exit(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+/****************************************************************************
+ * STATE_S2
+ ****************************************************************************/
+
+static void s2_entry(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+static enum smf_state_result s2_run(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+
+  switch (obj->event.event_id)
+    {
+      case EVENT_C:
+        printf("[psicc2] %s received EVENT_C\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S1]);
+        break;
+
+      case EVENT_F:
+        printf("[psicc2] %s received EVENT_F\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S11]);
+        break;
+
+      case EVENT_I:
+        if (!obj->foo)
+          {
+            printf("[psicc2] %s received EVENT_I and set foo true\n",
+                   __func__);
+            obj->foo = true;
+            return SMF_EVENT_HANDLED;
+          }
+        else
+          {
+            printf("[psicc2] %s received EVENT_I and did nothing\n",
+                   __func__);
+          }
+        break;
+
+      default:
+        break;
+    }
+
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void s2_exit(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+/****************************************************************************
+ * STATE_S21
+ ****************************************************************************/
+
+static void s21_entry(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+static enum smf_state_result s21_run(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+
+  switch (obj->event.event_id)
+    {
+      case EVENT_A:
+        printf("[psicc2] %s received EVENT_A\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S21]);
+        break;
+
+      case EVENT_B:
+        printf("[psicc2] %s received EVENT_B\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S211]);
+        break;
+
+      case EVENT_G:
+        printf("[psicc2] %s received EVENT_G\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S1]);
+        break;
+
+      default:
+        break;
+    }
+
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void s21_exit(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+/****************************************************************************
+ * STATE_S211
+ ****************************************************************************/
+
+static void s211_entry(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+static enum smf_state_result s211_run(void *o)
+{
+  struct s_object *obj = (struct s_object *)o;
+
+  printf("[psicc2] %s\n", __func__);
+
+  switch (obj->event.event_id)
+    {
+      case EVENT_D:
+        printf("[psicc2] %s received EVENT_D\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S21]);
+        break;
+
+      case EVENT_H:
+        printf("[psicc2] %s received EVENT_H\n", __func__);
+        smf_set_state(SMF_CTX(obj), &demo_states[STATE_S]);
+        break;
+
+      default:
+        break;
+    }
+
+  return SMF_EVENT_PROPAGATE;
+}
+
+static void s211_exit(void *o)
+{
+  (void)o;
+
+  printf("[psicc2] %s\n", __func__);
+}
+
+/****************************************************************************
+ * State Table
+ ****************************************************************************/
+
+static const struct smf_state demo_states[] =
+{
+  [STATE_INITIAL] = SMF_CREATE_STATE(
+                    initial_entry,
+                    initial_run,
+                    initial_exit,
+                    NULL,
+                     &demo_states[STATE_S2]
+                    ),
+  [STATE_S]       = SMF_CREATE_STATE(
+                    s_entry,
+                    s_run,
+                    s_exit,
+                    &demo_states[STATE_INITIAL],
+                    &demo_states[STATE_S11]
+                  ),
+  [STATE_S1]      = SMF_CREATE_STATE(
+                    s1_entry,
+                    s1_run,
+                    s1_exit,
+                    &demo_states[STATE_S],
+                    &demo_states[STATE_S11]
+                  ),
+  [STATE_S2]      = SMF_CREATE_STATE(
+                    s2_entry,
+                    s2_run,
+                    s2_exit,
+                    &demo_states[STATE_S],
+                    &demo_states[STATE_S211]
+                  ),
+  [STATE_S11]     = SMF_CREATE_STATE(
+                    s11_entry,
+                    s11_run,
+                    s11_exit,
+                    &demo_states[STATE_S1],
+                    NULL
+                  ),
+  [STATE_S21]     = SMF_CREATE_STATE(
+                    s21_entry,
+                    s21_run,
+                    s21_exit,
+                    &demo_states[STATE_S2],
+                    &demo_states[STATE_S211]
+                  ),
+  [STATE_S211]    = SMF_CREATE_STATE(
+                    s211_entry,
+                    s211_run,
+                    s211_exit,
+                    &demo_states[STATE_S21],
+                    NULL
+                  )
+};
+
+/****************************************************************************
+ * Name: hsm_psicc2_thread_main
+ ****************************************************************************/
+
+static int hsm_psicc2_thread_main(int argc, char **argv)
+{
+  struct mq_attr attr;
+  mqd_t mq;
+  ssize_t n;
+  int rc;
+
+  (void)argc;
+  (void)argv;
+
+  memset(&attr, 0, sizeof(attr));
+  attr.mq_maxmsg = CONFIG_EXAMPLES_SMF_EVENT_QUEUE_SIZE;
+  attr.mq_msgsize = sizeof(struct hsm_psicc2_event);
+
+  mq = mq_open(CONFIG_EXAMPLES_SMF_MQ_NAME, O_CREAT | O_RDONLY, 0666, &attr);
+  if (mq == (mqd_t)-1)
+    {
+      printf("psicc2][ERR] mq_open(%s) failed: %d\n",
+             CONFIG_EXAMPLES_SMF_MQ_NAME, errno);
+      return -1;
+    }
+
+  printf("[psicc2] State Machine thread started\n");
+
+  memset(&s_obj, 0, sizeof(s_obj));
+  smf_set_initial(SMF_CTX(&s_obj), &demo_states[STATE_INITIAL]);
+
+  while (true)
+    {
+      n = mq_receive(mq, (char *)&s_obj.event, sizeof(s_obj.event), NULL);
+      if (n < 0)
+        {
+          printf("psicc2][ERR] mq_receive failed: %d\n", errno);
+          continue;
+        }
+
+      rc = smf_run_state(SMF_CTX(&s_obj));
+      if (rc != 0)
+        {
+          printf("[psicc2] SMF terminated (rc=%d). Exiting thread\n", rc);
+          break;
+        }
+    }
+
+  mq_close(mq);
+  mq_unlink(CONFIG_EXAMPLES_SMF_MQ_NAME);
+
+  g_started = false;
+  memset(&s_obj, 0, sizeof(s_obj));
+
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hsm_psicc2_thread_start
+ ****************************************************************************/
+
+int hsm_psicc2_thread_start(void)
+{
+  int pid;
+
+  if (g_started)
+    {
+      return 0;
+    }
+
+  pid = task_create("psicc2_thread",
+                    CONFIG_EXAMPLES_SMF_PRIORITY,
+                    CONFIG_EXAMPLES_SMF_STACKSIZE,
+                    hsm_psicc2_thread_main,
+                    NULL);
+  if (pid < 0)
+    {
+      printf("psicc2][ERR] task_create failed: %d", errno);
+      return -1;
+    }
+
+  g_started = true;
+  return 0;
+}
+
+/****************************************************************************
+ * Name: hsm_psicc2_post_event
+ ****************************************************************************/
+
+int hsm_psicc2_post_event(uint32_t event_id)
+{
+  struct hsm_psicc2_event ev;
+  mqd_t mq;
+  int rc;
+
+  ev.event_id = event_id;
+
+  mq = mq_open(CONFIG_EXAMPLES_SMF_MQ_NAME, O_WRONLY | O_NONBLOCK);
+  if (mq == (mqd_t)-1)
+    {
+      printf("psicc2][ERR] mq_open(O_WRONLY) failed: %d "
+             "(did you run 'hsm_psicc2 start'?)\n",
+             errno);
+      return -1;
+    }
+
+  rc = mq_send(mq, (const char *)&ev, sizeof(ev), 0);
+  if (rc < 0)
+    {
+      printf("psicc2][ERR] mq_send failed: %d\n", errno);
+      mq_close(mq);
+      return -1;
+    }
+
+  mq_close(mq);
+  return 0;
+}
diff --git a/examples/smf/hsm_psicc2_thread.h b/examples/smf/hsm_psicc2_thread.h
new file mode 100644
index 000000000..385a29703
--- /dev/null
+++ b/examples/smf/hsm_psicc2_thread.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+ * apps/examples/smf/hsm_psicc2_thread.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Glenn Andrews
+ * State Machine example copyright (c) Miro Samek
+ *
+ * Implementation of the statechart in Figure 2.11 of
+ * Practical UML Statecharts in C/C++, 2nd Edition by Miro Samek
+ * https://www.state-machine.com/psicc2
+ * Used with permission of the author.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_SMF_HSM_PSICC2_THREAD_H
+#define __APPS_EXAMPLES_SMF_HSM_PSICC2_THREAD_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct hsm_psicc2_event
+{
+  uint32_t event_id;
+};
+
+enum demo_events
+{
+  EVENT_A,
+  EVENT_B,
+  EVENT_C,
+  EVENT_D,
+  EVENT_E,
+  EVENT_F,
+  EVENT_G,
+  EVENT_H,
+  EVENT_I,
+  EVENT_TERMINATE
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int hsm_psicc2_thread_start(void);
+int hsm_psicc2_post_event(uint32_t event_id);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_EXAMPLES_SMF_HSM_PSICC2_THREAD_H */
diff --git a/examples/smf/smf_main.c b/examples/smf/smf_main.c
new file mode 100644
index 000000000..b6a9677a5
--- /dev/null
+++ b/examples/smf/smf_main.c
@@ -0,0 +1,127 @@
+/****************************************************************************
+ * apps/examples/smf/smf_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Glenn Andrews
+ * State Machine example copyright (c) Miro Samek
+ *
+ * Implementation of the statechart in Figure 2.11 of
+ * Practical UML Statecharts in C/C++, 2nd Edition by Miro Samek
+ * https://www.state-machine.com/psicc2
+ * Used with permission of the author.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "hsm_psicc2_thread.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: usage
+ ****************************************************************************/
+
+static void usage(void)
+{
+  printf("Usage:\n");
+  printf("  hsm_psicc2 start\n");
+  printf("  hsm_psicc2 event <A..I>\n");
+  printf("  hsm_psicc2 terminate\n");
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  if (argc < 2)
+    {
+      usage();
+      return 1;
+    }
+
+  if (strcmp(argv[1], "start") == 0)
+    {
+      printf("State Machine Framework Demo\n");
+      printf("See PSiCC2 Fig 2.11 for the statechart\n");
+      printf("https://www.state-machine.com/psicc2\n\n");
+      return hsm_psicc2_thread_start();
+    }
+
+  if (strcmp(argv[1], "terminate") == 0)
+    {
+      return hsm_psicc2_post_event(EVENT_TERMINATE);
+    }
+
+  if (strcmp(argv[1], "event") == 0)
+    {
+      int c;
+
+      if (argc < 3 || argv[2] == NULL || argv[2][0] == '\0')
+        {
+          usage();
+          return 1;
+        }
+
+      c = toupper((unsigned char)argv[2][0]);
+      switch (c)
+        {
+          case 'A':
+            return hsm_psicc2_post_event(EVENT_A);
+          case 'B':
+            return hsm_psicc2_post_event(EVENT_B);
+          case 'C':
+            return hsm_psicc2_post_event(EVENT_C);
+          case 'D':
+            return hsm_psicc2_post_event(EVENT_D);
+          case 'E':
+            return hsm_psicc2_post_event(EVENT_E);
+          case 'F':
+            return hsm_psicc2_post_event(EVENT_F);
+          case 'G':
+            return hsm_psicc2_post_event(EVENT_G);
+          case 'H':
+            return hsm_psicc2_post_event(EVENT_H);
+          case 'I':
+            return hsm_psicc2_post_event(EVENT_I);
+          default:
+            printf("Invalid event '%c'\n", c);
+            return 1;
+        }
+    }
+
+  usage();
+  return 1;
+}
diff --git a/include/system/smf.h b/include/system/smf.h
new file mode 100644
index 000000000..edb1bf81b
--- /dev/null
+++ b/include/system/smf.h
@@ -0,0 +1,267 @@
+/****************************************************************************
+ * apps/include/system/smf.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INCLUDE_SYSTEM_SMF_H
+#define __APPS_INCLUDE_SYSTEM_SMF_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+#  ifdef CONFIG_SYSTEM_SMF_INITIAL_TRANSITION
+#    define SMF_CREATE_STATE(_entry, _run, _exit, _parent, _initial) \
+       { \
+         .entry = (_entry), \
+         .run = (_run), \
+         .exit = (_exit), \
+         .parent = (_parent), \
+         .initial = (_initial), \
+       }
+#  else
+#    define SMF_CREATE_STATE(_entry, _run, _exit, _parent, _initial) \
+       { \
+         .entry = (_entry), \
+         .run = (_run), \
+         .exit = (_exit), \
+         .parent = (_parent), \
+       }
+#  endif
+#else
+#  define SMF_CREATE_STATE(_entry, _run, _exit, _parent, _initial) \
+     { \
+       .entry = (_entry), \
+       .run = (_run), \
+       .exit = (_exit), \
+     }
+#endif
+
+#define SMF_CTX(o) ((struct smf_ctx *)(o))
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+enum smf_state_result
+{
+  SMF_EVENT_HANDLED,
+  SMF_EVENT_PROPAGATE
+};
+
+typedef void (*state_method)(void *obj);
+
+typedef enum smf_state_result (*state_execution)(void *obj);
+
+struct smf_state
+{
+  /* Optional method that will be run when this state is entered. */
+
+  state_method entry;
+
+  /* Optional method that will be run repeatedly during the state machine
+   * loop.
+   */
+
+  state_execution run;
+
+  /* Optional method that will be run when this state exits. */
+
+  state_method exit;
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+  /* Optional parent state that contains common entry/run/exit
+   * implementation among various child states.
+   * entry: Parent function executes BEFORE child function.
+   * run:   Parent function executes AFTER child function.
+   * exit:  Parent function executes AFTER child function.
+   * Note: When transitioning between two child states with a shared
+   * parent, that parent's exit and entry functions do not execute.
+   */
+
+  const struct smf_state *parent;
+
+#  ifdef CONFIG_SYSTEM_SMF_INITIAL_TRANSITION
+  /* Optional initial transition state. NULL for leaf states. */
+
+  const struct smf_state *initial;
+#  endif /* CONFIG_SYSTEM_SMF_INITIAL_TRANSITION */
+#endif /* CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT */
+};
+
+struct smf_ctx
+{
+  /* Current state the state machine is executing. */
+
+  const struct smf_state *current;
+
+  /* Previous state the state machine executed. */
+
+  const struct smf_state *previous;
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+  /* Currently executing state (which may be a parent). */
+
+  const struct smf_state *executing;
+#endif /* CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT */
+
+  /* This value is set by the set_terminate function and should
+   * terminate the state machine when its set to a value other than
+   * zero when it's returned by the run_state function.
+   */
+
+  int32_t terminate_val;
+
+  /* The state machine casts this to a "struct internal_ctx" and it's
+   * used to track state machine context.
+   */
+
+  uint32_t internal;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: smf_set_initial
+ *
+ * Description:
+ *   Initialize the state machine and set its initial state.
+ *
+ * Input Parameters:
+ *   ctx - State machine context
+ *   init_state - Initial state the state machine starts in
+ *
+ ****************************************************************************/
+
+void smf_set_initial(struct smf_ctx *ctx,
+                     const struct smf_state *init_state);
+
+/****************************************************************************
+ * Name: smf_set_state
+ *
+ * Description:
+ *   Change the state machine state. This handles exiting the previous state
+ *   and entering the target state. For HSMs the entry and exit actions of
+ *   the Least Common Ancestor are not run.
+ *
+ * Input Parameters:
+ *   ctx - State machine context
+ *   new_state - State to transition to
+ *
+ ****************************************************************************/
+
+void smf_set_state(struct smf_ctx *ctx, const struct smf_state *new_state);
+
+/****************************************************************************
+ * Name: smf_set_terminate
+ *
+ * Description:
+ *   Terminate a state machine.
+ *
+ * Input Parameters:
+ *   ctx - State machine context
+ *   val - Non-zero termination value returned by smf_run_state
+ *
+ ****************************************************************************/
+
+void smf_set_terminate(struct smf_ctx *ctx, int32_t val);
+
+/****************************************************************************
+ * Name: smf_run_state
+ *
+ * Description:
+ *   Run one iteration of a state machine (including any parent states).
+ *
+ * Input Parameters:
+ *   ctx - State machine context
+ *
+ * Returned Value:
+ *   A non-zero value terminates the state machine. This non-zero value may
+ *   represent a terminal state being reached or detection of an error.
+ *
+ ****************************************************************************/
+
+int32_t smf_run_state(struct smf_ctx *ctx);
+
+/****************************************************************************
+ * Name: smf_get_current_leaf_state
+ *
+ * Description:
+ *   Get the current leaf state. This may be a parent state if the HSM is
+ *   malformed (initial transitions are not set up correctly).
+ *
+ ****************************************************************************/
+
+static inline const struct smf_state *
+smf_get_current_leaf_state(const struct smf_ctx *ctx)
+{
+  return ctx->current;
+}
+
+/****************************************************************************
+ * Name: smf_get_current_executing_state
+ *
+ * Description:
+ *   Get the state that is currently executing. This may be a parent state.
+ *
+ ****************************************************************************/
+
+static inline const struct smf_state *
+smf_get_current_executing_state(const struct smf_ctx *ctx)
+{
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+  return ctx->executing;
+#else
+  return ctx->current;
+#endif /* CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT */
+}
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __APPS_INCLUDE_SYSTEM_SMF_H */
diff --git a/system/smf/Kconfig b/system/smf/Kconfig
new file mode 100644
index 000000000..62e52cf56
--- /dev/null
+++ b/system/smf/Kconfig
@@ -0,0 +1,28 @@
+# SMF (State Machine Framework) configuration options
+#
+# For syntax reference, see kconfig-language.txt in the NuttX tools repository.
+
+config SYSTEM_SMF
+  bool "(SMF) support"
+  default n
+  ---help---
+    Enables the State Machine Framework (SMF) for implementing state machines
+
+if SYSTEM_SMF
+
+config SYSTEM_SMF_ANCESTOR_SUPPORT
+	bool "Enable ancestor/parent state support"
+	default n
+	---help---
+	  Enables support for parent/ancestor relationships between SMF states.
+	  Required for hierarchical state machines.
+
+config SYSTEM_SMF_INITIAL_TRANSITION
+	bool "Enable initial transition support"
+	default n
+	depends on SYSTEM_SMF_ANCESTOR_SUPPORT
+	---help---
+	  Enables support for initial transitions in hierarchical states.
+	  Depends on ancestor/parent state support.
+
+endif # SYSTEM_SMF
diff --git a/system/smf/Make.defs b/system/smf/Make.defs
new file mode 100644
index 000000000..d628714f2
--- /dev/null
+++ b/system/smf/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/smf/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifeq ($(CONFIG_SYSTEM_SMF),y)
+CONFIGURED_APPS += $(APPDIR)/system/smf
+endif
diff --git a/system/smf/Makefile b/system/smf/Makefile
new file mode 100644
index 000000000..d5e1b549c
--- /dev/null
+++ b/system/smf/Makefile
@@ -0,0 +1,29 @@
+############################################################################
+# apps/smf/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# State Machine Framework library
+
+CSRCS = smf.c
+
+include $(APPDIR)/Application.mk
diff --git a/system/smf/smf.c b/system/smf/smf.c
new file mode 100644
index 000000000..473a64e23
--- /dev/null
+++ b/system/smf/smf.c
@@ -0,0 +1,605 @@
+/****************************************************************************
+ * apps/system/smf/smf.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2021 The Chromium OS Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include <system/smf.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct internal_ctx
+{
+  bool new_state : 1;
+  bool terminate : 1;
+  bool is_exit : 1;
+  bool handled : 1;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+
+/****************************************************************************
+ * Name: is_descendant_of
+ ****************************************************************************/
+
+static bool is_descendant_of(const struct smf_state *test_state,
+                             const struct smf_state *target_state)
+{
+  const struct smf_state *state;
+
+  for (state = test_state; state != NULL; state = state->parent)
+    {
+      if (target_state == state)
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
+/****************************************************************************
+ * Name: get_child_of
+ ****************************************************************************/
+
+static const struct smf_state *
+get_child_of(const struct smf_state *states, const struct smf_state *parent)
+{
+  const struct smf_state *state = states;
+
+  while (state != NULL)
+    {
+      if (state->parent == parent)
+        {
+          return state;
+        }
+
+      state = state->parent;
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: get_lca_of
+ *
+ * Description:
+ *   Find the Least Common Ancestor (LCA) of two states that are not
+ *   ancestors of one another.
+ *
+ ****************************************************************************/
+
+static const struct smf_state *
+get_lca_of(const struct smf_state *source, const struct smf_state *dest)
+{
+  const struct smf_state *ancestor;
+
+  for (ancestor = source->parent; ancestor != NULL;
+       ancestor = ancestor->parent)
+    {
+      /* First common ancestor. */
+
+      if (is_descendant_of(dest, ancestor))
+        {
+          return ancestor;
+        }
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: smf_execute_all_entry_actions
+ ****************************************************************************/
+
+static bool smf_execute_all_entry_actions(struct smf_ctx *const ctx,
+                                          const struct smf_state *new_state,
+                                          const struct smf_state *topmost)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+  const struct smf_state *to_execute;
+
+  if (new_state == topmost)
+    {
+      /* There are no child states, so do nothing. */
+
+      return false;
+    }
+
+  for (to_execute = get_child_of(new_state, topmost);
+       to_execute != NULL && to_execute != new_state;
+       to_execute = get_child_of(new_state, to_execute))
+    {
+      /* Keep track of the executing entry action in case it calls
+       * smf_set_state().
+       */
+
+      ctx->executing = to_execute;
+
+      /* Execute every entry action EXCEPT that of the topmost state. */
+
+      if (to_execute->entry != NULL)
+        {
+          to_execute->entry(ctx);
+
+          /* No need to continue if terminate was set. */
+
+          if (internal->terminate)
+            {
+              ctx->executing = ctx->current;
+              return true;
+            }
+        }
+    }
+
+  /* Execute the new state entry action. */
+
+  ctx->executing = new_state;
+  if (new_state->entry != NULL)
+    {
+      new_state->entry(ctx);
+
+      /* No need to continue if terminate was set. */
+
+      if (internal->terminate)
+        {
+          ctx->executing = ctx->current;
+          return true;
+        }
+    }
+
+  ctx->executing = ctx->current;
+
+  return false;
+}
+
+/****************************************************************************
+ * Name: smf_execute_ancestor_run_actions
+ ****************************************************************************/
+
+static bool smf_execute_ancestor_run_actions(struct smf_ctx *const ctx)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+  const struct smf_state *tmp_state;
+
+  /* Execute all run actions in reverse order. */
+
+  if (internal->terminate)
+    {
+      /* Return if the current state terminated. */
+
+      return true;
+    }
+
+  if (internal->new_state || internal->handled)
+    {
+      /* The child state transitioned or handled it. Stop propagating. */
+
+      return false;
+    }
+
+  /* Try to run parent run actions. */
+
+  for (tmp_state = ctx->current->parent; tmp_state != NULL;
+       tmp_state = tmp_state->parent)
+    {
+      enum smf_state_result rc;
+
+      /* Keep track of where we are in case an ancestor calls
+       * smf_set_state().
+       */
+
+      ctx->executing = tmp_state;
+
+      /* Execute parent run action. */
+
+      if (tmp_state->run != NULL)
+        {
+          rc = tmp_state->run(ctx);
+
+          if (rc == SMF_EVENT_HANDLED)
+            {
+              internal->handled = true;
+            }
+
+          /* No need to continue if terminate was set. */
+
+          if (internal->terminate)
+            {
+              ctx->executing = ctx->current;
+              return true;
+            }
+
+          /* This state dealt with it. Stop propagating. */
+
+          if (internal->new_state || internal->handled)
+            {
+              break;
+            }
+        }
+    }
+
+  /* All done executing the run actions. */
+
+  ctx->executing = ctx->current;
+
+  return false;
+}
+
+/****************************************************************************
+ * Name: smf_execute_all_exit_actions
+ ****************************************************************************/
+
+static bool smf_execute_all_exit_actions(struct smf_ctx *const ctx,
+                                         const struct smf_state *topmost)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+  const struct smf_state *tmp_state;
+  const struct smf_state *to_execute;
+
+  tmp_state = ctx->executing;
+
+  for (to_execute = ctx->current;
+       to_execute != NULL && to_execute != topmost;
+       to_execute = to_execute->parent)
+    {
+      if (to_execute->exit != NULL)
+        {
+          ctx->executing = to_execute;
+          to_execute->exit(ctx);
+
+          /* No need to continue if terminate was set in the exit action. */
+
+          if (internal->terminate)
+            {
+              ctx->executing = tmp_state;
+              return true;
+            }
+        }
+    }
+
+  ctx->executing = tmp_state;
+
+  return false;
+}
+
+#endif /* CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT */
+
+/****************************************************************************
+ * Name: smf_clear_internal_state
+ ****************************************************************************/
+
+static void smf_clear_internal_state(struct smf_ctx *const ctx)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+
+  internal->is_exit = false;
+  internal->terminate = false;
+  internal->handled = false;
+  internal->new_state = false;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: smf_set_initial
+ ****************************************************************************/
+
+void smf_set_initial(struct smf_ctx *const ctx,
+                     const struct smf_state *init_state)
+{
+#ifdef CONFIG_SYSTEM_SMF_INITIAL_TRANSITION
+  /* The final target will be the deepest leaf state that the target
+   * contains. Set that as the real target.
+   */
+
+  while (init_state->initial != NULL)
+    {
+      init_state = init_state->initial;
+    }
+#endif
+
+  smf_clear_internal_state(ctx);
+  ctx->current = init_state;
+  ctx->previous = NULL;
+  ctx->terminate_val = 0;
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+  const struct smf_state *topmost;
+
+  ctx->executing = init_state;
+
+  /* topmost is the root ancestor of init_state, its parent == NULL. */
+
+  topmost = get_child_of(init_state, NULL);
+
+  /* Execute topmost state entry action,
+   * since smf_execute_all_entry_actions doesn't.
+   */
+
+  if (topmost->entry != NULL)
+    {
+      ctx->executing = topmost;
+      topmost->entry(ctx);
+      ctx->executing = init_state;
+
+      if (internal->terminate)
+        {
+          /* No need to continue if terminate was set. */
+
+          return;
+        }
+    }
+
+  if (smf_execute_all_entry_actions(ctx, init_state, topmost))
+    {
+      /* No need to continue if terminate was set. */
+
+      return;
+    }
+#else
+  /* Execute entry action if it exists. */
+
+  if (init_state->entry != NULL)
+    {
+      init_state->entry(ctx);
+    }
+#endif
+}
+
+/****************************************************************************
+ * Name: smf_set_state
+ ****************************************************************************/
+
+void smf_set_state(struct smf_ctx *const ctx,
+                   const struct smf_state *new_state)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+
+  if (new_state == NULL)
+    {
+      printf("SMF ERR: new_state cannot be NULL\n");
+      return;
+    }
+
+  /* It does not make sense to call smf_set_state in an exit phase of a
+   * state since we are already in a transition; we would always ignore
+   * the intended state to transition into.
+   */
+
+  if (internal->is_exit)
+    {
+      printf("SMF ERR: Calling %s from exit action\n", __func__);
+      return;
+    }
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+  const struct smf_state *topmost;
+
+  if (ctx->executing != new_state &&
+      ctx->executing->parent == new_state->parent)
+    {
+      /* Optimize sibling transitions (different states under same parent). */
+
+      topmost = ctx->executing->parent;
+    }
+  else if (is_descendant_of(ctx->executing, new_state))
+    {
+      /* New state is a parent of where we are now. */
+
+      topmost = new_state;
+    }
+  else if (is_descendant_of(new_state, ctx->executing))
+    {
+      /* We are a parent of the new state. */
+
+      topmost = ctx->executing;
+    }
+  else
+    {
+      /* Not directly related, find LCA. */
+
+      topmost = get_lca_of(ctx->executing, new_state);
+    }
+
+  internal->is_exit = true;
+  internal->new_state = true;
+
+  /* Call all exit actions up to (but not including) the topmost. */
+
+  if (smf_execute_all_exit_actions(ctx, topmost))
+    {
+      /* No need to continue if terminate was set in the exit action. */
+
+      return;
+    }
+
+  /* If self-transition, call the exit action. */
+
+  if (ctx->executing == new_state && new_state->exit != NULL)
+    {
+      new_state->exit(ctx);
+
+      /* No need to continue if terminate was set in the exit action. */
+
+      if (internal->terminate)
+        {
+          return;
+        }
+    }
+
+  internal->is_exit = false;
+
+  /* If self transition, call the entry action. */
+
+  if (ctx->executing == new_state && new_state->entry != NULL)
+    {
+      new_state->entry(ctx);
+
+      /* No need to continue if terminate was set in the entry action. */
+
+      if (internal->terminate)
+        {
+          return;
+        }
+    }
+
+#ifdef CONFIG_SYSTEM_SMF_INITIAL_TRANSITION
+  /* The final target will be the deepest leaf state that the target
+   * contains. Set that as the real target.
+   */
+
+  while (new_state->initial != NULL)
+    {
+      new_state = new_state->initial;
+    }
+#endif
+
+  /* Update the state variables. */
+
+  ctx->previous = ctx->current;
+  ctx->current = new_state;
+  ctx->executing = new_state;
+
+  /* Call all entry actions (except those of topmost). */
+
+  if (smf_execute_all_entry_actions(ctx, new_state, topmost))
+    {
+      /* No need to continue if terminate was set in the entry action. */
+
+      return;
+    }
+#else
+  /* Flat state machines have a very simple transition. */
+
+  if (ctx->current->exit != NULL)
+    {
+      internal->is_exit = true;
+      ctx->current->exit(ctx);
+
+      /* No need to continue if terminate was set in the exit action. */
+
+      if (internal->terminate)
+        {
+          return;
+        }
+
+      internal->is_exit = false;
+    }
+
+  /* Update the state variables. */
+
+  ctx->previous = ctx->current;
+  ctx->current = new_state;
+
+  if (ctx->current->entry != NULL)
+    {
+      ctx->current->entry(ctx);
+
+      /* No need to continue if terminate was set in the entry action. */
+
+      if (internal->terminate)
+        {
+          return;
+        }
+    }
+#endif
+}
+
+/****************************************************************************
+ * Name: smf_set_terminate
+ ****************************************************************************/
+
+void smf_set_terminate(struct smf_ctx *const ctx, int32_t val)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+
+  internal->terminate = true;
+  ctx->terminate_val = val;
+}
+
+/****************************************************************************
+ * Name: smf_run_state
+ ****************************************************************************/
+
+int32_t smf_run_state(struct smf_ctx *const ctx)
+{
+  struct internal_ctx *const internal = (void *)&ctx->internal;
+
+  /* No need to continue if terminate was set. */
+
+  if (internal->terminate)
+    {
+      return ctx->terminate_val;
+    }
+
+  /* Executing a state's run function could cause a transition, so clear
+   * the internal state to ensure that the transition is handled correctly.
+   */
+
+  smf_clear_internal_state(ctx);
+
+#ifdef CONFIG_SYSTEM_SMF_ANCESTOR_SUPPORT
+  ctx->executing = ctx->current;
+
+  if (ctx->current->run != NULL)
+    {
+      enum smf_state_result rc;
+
+      rc = ctx->current->run(ctx);
+      if (rc == SMF_EVENT_HANDLED)
+        {
+          internal->handled = true;
+        }
+    }
+
+  if (smf_execute_ancestor_run_actions(ctx))
+    {
+      return ctx->terminate_val;
+    }
+#else
+  if (ctx->current->run != NULL)
+    {
+      ctx->current->run(ctx);
+    }
+#endif
+
+  return 0;
+}

From 73bc5cbcc61e3a887a6af4c17e7c9a86eef737eb Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Thu, 25 Dec 2025 14:37:31 +0800
Subject: [PATCH 079/568] interpreters: Add mquickjs JavaScript interpreter
 integration

Add complete integration for the MicroQuickJS JavaScript interpreter,
supporting both CMake and Make build systems with automatic source
acquisition.

Key features:
* FetchContent downloads mquickjs from bellard/mquickjs if local
  git repository is not available in interpreters/mquickjs/mquickjs/
* Builds mqjs_stdlib host tool to generate mqjs_stdlib.h and
  mquickjs_atom.h headers during build
* Creates libmquickjs library with proper header generation dependencies
  to prevent parallel build failures
* Provides mqjs NSH application for interactive JavaScript execution
* Configurable task priority and stack size via Kconfig options
  (INTERPRETERS_MQJS_PRIORITY, INTERPRETERS_MQJS_STACKSIZE)
* Supports both 32-bit and 64-bit architectures with appropriate build flags

Files added:
* CMakeLists.txt - CMake build configuration with FetchContent support
* Kconfig - Configuration options for interpreter features
* Make.defs - Make build definitions
* Makefile - Alternative Make-based build support
* .gitignore - Ignores generated files and local mquickjs source directory

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 interpreters/mquickjs/.gitignore     |   2 +
 interpreters/mquickjs/CMakeLists.txt | 123 +++++++++++++++++++++++++++
 interpreters/mquickjs/Kconfig        |  24 ++++++
 interpreters/mquickjs/Make.defs      |  30 +++++++
 interpreters/mquickjs/Makefile       |  92 ++++++++++++++++++++
 5 files changed, 271 insertions(+)
 create mode 100644 interpreters/mquickjs/.gitignore
 create mode 100644 interpreters/mquickjs/CMakeLists.txt
 create mode 100644 interpreters/mquickjs/Kconfig
 create mode 100644 interpreters/mquickjs/Make.defs
 create mode 100644 interpreters/mquickjs/Makefile

diff --git a/interpreters/mquickjs/.gitignore b/interpreters/mquickjs/.gitignore
new file mode 100644
index 000000000..87708e7fd
--- /dev/null
+++ b/interpreters/mquickjs/.gitignore
@@ -0,0 +1,2 @@
+*.d
+mquickjs/
diff --git a/interpreters/mquickjs/CMakeLists.txt b/interpreters/mquickjs/CMakeLists.txt
new file mode 100644
index 000000000..51d505860
--- /dev/null
+++ b/interpreters/mquickjs/CMakeLists.txt
@@ -0,0 +1,123 @@
+# ##############################################################################
+# apps/interpreters/mquickjs/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_INTERPRETERS_MQJS)
+  set(MQJS_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/mquickjs)
+
+  # Prefer local git repo if it exists, otherwise download tarball
+  if(EXISTS ${MQJS_SOURCE_DIR}/.git)
+    # Use local git-managed mquickjs
+    set(MQJS_DIR ${MQJS_SOURCE_DIR})
+    message(STATUS "Using local mquickjs git repo: ${MQJS_DIR}")
+  else()
+    # Download mquickjs to build directory
+    FetchContent_Declare(
+      mquickjs_fetch
+      URL https://github.com/bellard/mquickjs/archive/refs/heads/main.zip
+      DOWNLOAD_NO_PROGRESS true
+      TIMEOUT 30)
+
+    FetchContent_MakeAvailable(mquickjs_fetch)
+
+    # The source directory after FetchContent_MakeAvailable
+    set(MQJS_DIR ${mquickjs_fetch_SOURCE_DIR})
+    message(STATUS "Using downloaded mquickjs: ${MQJS_DIR}")
+  endif()
+
+  # Detect target architecture for header generation
+  if(CONFIG_ARCH_64BIT)
+    set(MQJS_BUILD_FLAGS "-m64")
+  else()
+    set(MQJS_BUILD_FLAGS "-m32")
+  endif()
+
+  include(ExternalProject)
+
+  # Build mqjs_stdlib host tool using mquickjs Makefile
+  ExternalProject_Add(
+    mqjs_stdlib_host
+    SOURCE_DIR ${MQJS_DIR}
+    BINARY_DIR ${MQJS_DIR}
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND make mqjs_stdlib
+    INSTALL_COMMAND ""
+    BUILD_BYPRODUCTS ${MQJS_DIR}/mqjs_stdlib)
+
+  # Generate mqjs_stdlib.h
+  add_custom_command(
+    OUTPUT ${MQJS_DIR}/mqjs_stdlib.h
+    COMMAND ${MQJS_DIR}/mqjs_stdlib ${MQJS_BUILD_FLAGS} >
+            ${MQJS_DIR}/mqjs_stdlib.h
+    DEPENDS mqjs_stdlib_host
+    COMMENT "Generating mqjs_stdlib.h")
+
+  # Generate mquickjs_atom.h
+  add_custom_command(
+    OUTPUT ${MQJS_DIR}/mquickjs_atom.h
+    COMMAND ${MQJS_DIR}/mqjs_stdlib -a ${MQJS_BUILD_FLAGS} >
+            ${MQJS_DIR}/mquickjs_atom.h
+    DEPENDS mqjs_stdlib_host
+    COMMENT "Generating mquickjs_atom.h")
+
+  # Custom target for header generation
+  add_custom_target(mqjs_headers_gen DEPENDS ${MQJS_DIR}/mqjs_stdlib.h
+                                             ${MQJS_DIR}/mquickjs_atom.h)
+
+  # Create mquickjs library
+  nuttx_add_library(libmquickjs)
+  target_sources(
+    libmquickjs
+    PRIVATE ${MQJS_DIR}/mquickjs.c ${MQJS_DIR}/dtoa.c ${MQJS_DIR}/libm.c
+            ${MQJS_DIR}/cutils.c ${MQJS_DIR}/readline.c
+            ${MQJS_DIR}/readline_tty.c)
+  target_include_directories(libmquickjs PRIVATE ${MQJS_DIR})
+  nuttx_export_header(TARGET libmquickjs INCLUDE_DIRECTORIES ${MQJS_DIR})
+
+  # Ensure headers are generated before building library
+  add_dependencies(libmquickjs mqjs_headers_gen)
+
+  # Add mquickjs include directory to global include paths
+  set_property(
+    TARGET nuttx
+    APPEND
+    PROPERTY NUTTX_INCLUDE_DIRECTORIES ${NUTTX_APPS_DIR}/interpreters/mquickjs)
+
+  # Create mqjs NSH application
+  set(MQJS_PRIORITY ${CONFIG_INTERPRETERS_MQJS_PRIORITY})
+  set(MQJS_STACKSIZE ${CONFIG_INTERPRETERS_MQJS_STACKSIZE})
+
+  nuttx_add_application(
+    NAME
+    mqjs
+    PRIORITY
+    ${MQJS_PRIORITY}
+    STACKSIZE
+    ${MQJS_STACKSIZE}
+    SRCS
+    ${MQJS_DIR}/mqjs.c
+    INCLUDE_DIRECTORIES
+    ${MQJS_DIR}
+    DEPENDS
+    libmquickjs
+    mqjs_headers_gen)
+
+endif()
diff --git a/interpreters/mquickjs/Kconfig b/interpreters/mquickjs/Kconfig
new file mode 100644
index 000000000..06e8906b7
--- /dev/null
+++ b/interpreters/mquickjs/Kconfig
@@ -0,0 +1,24 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config INTERPRETERS_MQJS
+	tristate "MicroQuickJS JavaScript interpreter"
+	default n
+
+if INTERPRETERS_MQJS
+
+config INTERPRETERS_MQJS_PRIORITY
+	int "MicroQuickJS interpreter priority"
+	default 100
+	---help---
+		Task priority of the MicroQuickJS interpreter.
+
+ config INTERPRETERS_MQJS_STACKSIZE
+ 	int "MicroQuickJS interpreter stack size"
+ 	default 8192
+ 	---help---
+ 		Size of the stack allocated for MicroQuickJS interpreter.
+
+ endif # INTERPRETERS_MQJS
diff --git a/interpreters/mquickjs/Make.defs b/interpreters/mquickjs/Make.defs
new file mode 100644
index 000000000..8850fa7b6
--- /dev/null
+++ b/interpreters/mquickjs/Make.defs
@@ -0,0 +1,30 @@
+############################################################################
+# apps/interpreters/mquickjs/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_INTERPRETERS_MQJS),)
+CONFIGURED_APPS += $(APPDIR)/interpreters/mquickjs
+
+# It allows `<mquickjs.h>` import.
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/mquickjs/mquickjs
+CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/interpreters/mquickjs/mquickjs
+
+endif
diff --git a/interpreters/mquickjs/Makefile b/interpreters/mquickjs/Makefile
new file mode 100644
index 000000000..2c1ed3e49
--- /dev/null
+++ b/interpreters/mquickjs/Makefile
@@ -0,0 +1,92 @@
+############################################################################
+# apps/interpreters/mquickjs/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+MQJS_UNPACK = mquickjs
+MQJS_ARCHIVE = mquickjs-master.zip
+MQJS_URL = https://github.com/bellard/mquickjs/archive/refs/heads/master.zip
+
+# Determine target word size for header generation
+ifeq ($(CONFIG_ARCH_64BIT),y)
+MQJS_BUILD_FLAGS = -m64
+else
+MQJS_BUILD_FLAGS = -m32
+endif
+
+CSRCS = $(MQJS_UNPACK)/mquickjs.c \
+        $(MQJS_UNPACK)/dtoa.c \
+        $(MQJS_UNPACK)/libm.c \
+        $(MQJS_UNPACK)/cutils.c \
+        $(MQJS_UNPACK)/readline.c \
+        $(MQJS_UNPACK)/readline_tty.c
+
+PROGNAME = mqjs
+PRIORITY = $(CONFIG_INTERPRETERS_MQJS_PRIORITY)
+STACKSIZE = $(CONFIG_INTERPRETERS_MQJS_STACKSIZE)
+MODULE = $(CONFIG_INTERPRETERS_MQJS)
+MAINSRC = $(MQJS_UNPACK)/mqjs.c
+
+# Download archive
+$(MQJS_ARCHIVE):
+	$(Q) echo "Downloading $(MQJS_ARCHIVE)"
+	$(Q) curl -L $(MQJS_URL) -o $(MQJS_ARCHIVE)
+
+# Unpack archive
+$(MQJS_UNPACK): $(MQJS_ARCHIVE)
+	$(Q) echo "Unpacking $(MQJS_ARCHIVE) to $(MQJS_UNPACK)"
+	$(Q) unzip -q -o $(MQJS_ARCHIVE)
+	$(Q) mv bellard-mquickjs-* $(MQJS_UNPACK)
+	$(Q) touch $(MQJS_UNPACK)
+
+# Build host tool via upstream Makefile
+$(MQJS_UNPACK)/mqjs_stdlib:
+	$(Q) echo "Building mquickjs host tool via upstream Makefile"
+	$(Q) rm -f $(MQJS_UNPACK)/mqjs_stdlib
+	$(Q) $(MAKE) -C $(MQJS_UNPACK) HOSTCC=$(HOSTCC) mqjs_stdlib
+
+# Generate stdlib header using built host tool
+$(MQJS_UNPACK)/mqjs_stdlib.h: $(MQJS_UNPACK)/mqjs_stdlib
+	$(Q) echo "Generating mquickjs stdlib header"
+	$(MQJS_UNPACK)/mqjs_stdlib $(MQJS_BUILD_FLAGS) > $@
+
+# Generate atom header using built host tool
+$(MQJS_UNPACK)/mquickjs_atom.h: $(MQJS_UNPACK)/mqjs_stdlib
+	$(Q) echo "Generating mquickjs atom header"
+	$(MQJS_UNPACK)/mqjs_stdlib -a $(MQJS_BUILD_FLAGS) > $@
+
+# Download and unpack only if not a git repository
+context:: $(MQJS_UNPACK)/mqjs_stdlib.h $(MQJS_UNPACK)/mquickjs_atom.h
+
+# Clean up on distclean
+distclean::
+ifneq ($(wildcard $(MQJS_UNPACK)/.git),)
+	$(Q) $(MAKE) -C $(MQJS_UNPACK) clean
+else
+	$(call DELDIR, $(MQJS_UNPACK))
+endif
+	$(call DELFILE, $(MQJS_ARCHIVE))
+
+# Dependencies
+$(MQJS_UNPACK)/mquickjs.c: $(MQJS_UNPACK)/mquickjs_atom.h
+
+include $(APPDIR)/Application.mk

From 416c315f928110b37f9b7a362f4dd2f2d89b0cac Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Tue, 6 Jan 2026 12:16:22 +0800
Subject: [PATCH 080/568] ostest: sync hrtimer ostest with hrtimer updates

Update the hrtimer ostest to reflect recent changes in the hrtimer
implementation.

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/hrtimer.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 9b2d61430..fcbe1f5d9 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -120,19 +120,23 @@ static void hrtimer_test_init(FAR struct hrtimer_test_s *hrtimer_test,
  *
  * Input Parameters:
  *   hrtimer - Pointer to the expired HRTimer instance
+ *   expired - The expired value of hrtimer
  *
  * Returned Value:
  *   Timer period in nanoseconds (NSEC_PER_50MS)
  *
  ****************************************************************************/
 
-static uint32_t test_hrtimer_callback(FAR hrtimer_t *hrtimer)
+static uint64_t
+test_hrtimer_callback(FAR hrtimer_t *hrtimer, uint64_t expired)
 {
   struct timespec ts;
   uint32_t diff;
   uint64_t now;
   int ret;
 
+  UNUSED(expired);
+
   FAR struct hrtimer_test_s *test =
     (FAR struct hrtimer_test_s *)hrtimer;
 
@@ -207,9 +211,7 @@ void hrtimer_test(void)
 
   /* Initialize the high-resolution timer */
 
-  hrtimer_init(&hrtimer_test.timer,
-               test_hrtimer_callback,
-               NULL);
+  hrtimer_init(&hrtimer_test.timer, test_hrtimer_callback);
 
   /* Start the timer with 500ms relative timeout */
 

From 1512f9c6e55efc4c43d2ddb1f02445304fbdee9b Mon Sep 17 00:00:00 2001
From: buxiasen <buxiasen@xiaomi.com>
Date: Thu, 10 Jul 2025 17:10:55 +0800
Subject: [PATCH 081/568] netlib/ping: fix the stack variable not initialized.

We add devname in ping_info_s, but not initializeed, cause
data abort as value in stack possible not NULL.

Signed-off-by: buxiasen <buxiasen@xiaomi.com>
---
 netutils/netlib/netlib_checkipconnectivity.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/netutils/netlib/netlib_checkipconnectivity.c b/netutils/netlib/netlib_checkipconnectivity.c
index 145c987ff..44a5c636a 100644
--- a/netutils/netlib/netlib_checkipconnectivity.c
+++ b/netutils/netlib/netlib_checkipconnectivity.c
@@ -107,6 +107,9 @@ int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry)
   info.timeout  = timeout;
   info.callback = ping_ipaddr_callback;
   info.priv     = &replies;
+#ifdef CONFIG_NET_BINDTODEVICE
+  info.devname  = NULL;
+#endif
 
   /* if ip is NULL we use default DNS server */
 

From 9c4103d496fb5ab6324906e19c98ab16976cf390 Mon Sep 17 00:00:00 2001
From: mazhuang <mazhuang@xiaomi.com>
Date: Wed, 23 Oct 2024 15:35:57 +0800
Subject: [PATCH 082/568] nsh_syscmds/rpmsg: add rpmsg test command support

User can use rpmsg test /dev/rpmsg/<cpuname> to test the rpmsg
channel

Signed-off-by: mazhuang <mazhuang@xiaomi.com>
---
 nshlib/nsh_command.c | 2 +-
 nshlib/nsh_syscmds.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 2f05557cb..629949753 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -535,7 +535,7 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #if defined(CONFIG_RPTUN) && !defined(CONFIG_NSH_DISABLE_RPTUN)
   CMD_MAP("rptun",    cmd_rptun,    2, 7,
-    "<start|stop|reset|panic|dump|ping> <path|all>"
+    "<start|stop|reset|panic|dump|ping|test> <path|all>"
     " [value|times length ack sleep]"),
 #endif
 
diff --git a/nshlib/nsh_syscmds.c b/nshlib/nsh_syscmds.c
index 3541156ef..88db8c913 100644
--- a/nshlib/nsh_syscmds.c
+++ b/nshlib/nsh_syscmds.c
@@ -591,6 +591,12 @@ static int cmd_rpmsg_once(FAR struct nsh_vtbl_s *vtbl,
       cmd = RPMSGIOC_PING;
       val = (unsigned long)&ping;
     }
+#endif
+#ifdef CONFIG_RPMSG_TEST
+  else if (strcmp(argv[1], "test") == 0)
+    {
+      cmd = RPMSGIOC_TEST;
+    }
 #endif
   else if (rpmsg_cb && rpmsg_cb(&cmd, &val, argv) == OK)
     {
@@ -642,7 +648,7 @@ static int cmd_rpmsg_recursive(FAR struct nsh_vtbl_s *vtbl,
 static int cmd_rpmsg_help(FAR struct nsh_vtbl_s *vtbl, int argc,
                           FAR char **argv)
 {
-  nsh_output(vtbl, "%s <panic|dump> <path>\n", argv[0]);
+  nsh_output(vtbl, "%s <panic|dump|test> <path>\n", argv[0]);
 #ifdef CONFIG_RPMSG_PING
   nsh_output(vtbl, "%s ping <path> <times> <length> <cmd> "
              "<period(ms)>\n\n", argv[0]);

From ae7c168bf601bcf8cc98d8c31f14b7c50e2dec25 Mon Sep 17 00:00:00 2001
From: Zhe Weng <wengzhe@xiaomi.com>
Date: Tue, 7 Jan 2025 18:02:39 +0800
Subject: [PATCH 083/568] nshlib: Add vconfig command

Add vconfig command

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 nshlib/Kconfig       |  4 ++++
 nshlib/nsh.h         |  3 +++
 nshlib/nsh_command.c |  4 ++++
 nshlib/nsh_netcmds.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)

diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 7fd49bbc7..b9a510383 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -423,6 +423,10 @@ config NSH_DISABLE_IFCONFIG
 	bool "Disable ifconfig"
 	default DEFAULT_SMALL || !FS_PROCFS || FS_PROCFS_EXCLUDE_NET
 
+config NSH_DISABLE_VCONFIG
+	bool "Disable vconfig"
+	default DEFAULT_SMALL || !FS_PROCFS || FS_PROCFS_EXCLUDE_NET
+
 config NSH_DISABLE_IFUPDOWN
 	bool "Disable ifup/down"
 	default DEFAULT_SMALL || !FS_PROCFS || FS_PROCFS_EXCLUDE_NET
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 8d037f517..9c2c1d5ed 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -1093,6 +1093,9 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #  ifndef CONFIG_NSH_DISABLE_IFCONFIG
   int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #  endif
+#  ifndef CONFIG_NSH_DISABLE_VCONFIG
+  int cmd_vconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#  endif
 #  ifndef CONFIG_NSH_DISABLE_IFUPDOWN
   int cmd_ifup(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
   int cmd_ifdown(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 629949753..1474b824c 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -286,6 +286,10 @@ static const struct cmdmap_s g_cmdmap[] =
     "[dr|gw|gateway <dr-address>] [netmask <net-mask>|prefixlen <len>] "
     "[dns <dns-address>] [hw <hw-mac>]"),
 #  endif
+#  if defined(CONFIG_NET_VLAN) && !defined(CONFIG_NSH_DISABLE_VCONFIG)
+  CMD_MAP("vconfig", cmd_vconfig, 3, 4,
+    "[add iface-name vlan-id]|[rem vlan-name]"),
+#  endif
 #  ifndef CONFIG_NSH_DISABLE_IFUPDOWN
   CMD_MAP("ifdown",   cmd_ifdown,   2, 2, "<interface>"),
   CMD_MAP("ifup",     cmd_ifup,     2, 2, "<interface>"),
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 1b2c8efd7..233231a95 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -1097,6 +1097,53 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 }
 #endif
 
+/****************************************************************************
+ * Name: cmd_vconfig
+ ****************************************************************************/
+
+#if defined(CONFIG_NET_VLAN) && !defined(CONFIG_NSH_DISABLE_VCONFIG)
+int cmd_vconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  DEBUGASSERT(argc >= 2);
+
+  if (!strcmp(argv[1], "add"))
+    {
+      if (argc != 4)
+        {
+          nsh_error(vtbl, g_fmtargrequired, argv[0]);
+          return ERROR;
+        }
+
+      if (netlib_add_vlan(argv[2], atoi(argv[3])) < 0)
+        {
+          perror("Failed to add VLAN");
+          return ERROR;
+        }
+    }
+  else if (!strcmp(argv[1], "rem") || !strcmp(argv[1], "del"))
+    {
+      if (argc != 3)
+        {
+          nsh_error(vtbl, g_fmtargrequired, argv[0]);
+          return ERROR;
+        }
+
+      if (netlib_del_vlan(argv[2]) < 0)
+        {
+          perror("Failed to remove VLAN");
+          return ERROR;
+        }
+    }
+  else
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[1]);
+      return ERROR;
+    }
+
+  return OK;
+}
+#endif
+
 /****************************************************************************
  * Name: cmd_nslookup
  ****************************************************************************/

From 10eae1dc6bbee24a905a48e5ef0b14c141fa5adb Mon Sep 17 00:00:00 2001
From: Zhe Weng <wengzhe@xiaomi.com>
Date: Fri, 7 Feb 2025 14:46:46 +0800
Subject: [PATCH 084/568] vconfig: Support setting default PCP when creating
 VLAN

Now we allow setting a default PCP when creating VLAN like:
`vconfig add iface-name vlan-id [pcp]`
e.g.
`vconfig add eth0 10` will create eth0.10 with VID=10 and no PCP(0)
`vconfig add eth0 10 3` will create eth0.10 with VID=10 and PCP=3

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
---
 include/netutils/netlib.h |  2 +-
 nshlib/nsh_command.c      |  4 ++--
 nshlib/nsh_netcmds.c      | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index a751ed60b..5be9747b2 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -330,7 +330,7 @@ int netlib_setessid(FAR const char *ifname, FAR const char *essid);
 #endif
 
 #ifdef CONFIG_NET_VLAN
-int netlib_add_vlan(FAR const char *ifname, int vlanid);
+int netlib_add_vlan(FAR const char *ifname, int vlanid, int prio);
 int netlib_del_vlan(FAR const char *vlanif);
 #endif
 
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 1474b824c..03a14ace9 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -287,8 +287,8 @@ static const struct cmdmap_s g_cmdmap[] =
     "[dns <dns-address>] [hw <hw-mac>]"),
 #  endif
 #  if defined(CONFIG_NET_VLAN) && !defined(CONFIG_NSH_DISABLE_VCONFIG)
-  CMD_MAP("vconfig", cmd_vconfig, 3, 4,
-    "[add iface-name vlan-id]|[rem vlan-name]"),
+  CMD_MAP("vconfig", cmd_vconfig, 3, 5,
+    "[add iface-name vlan-id [pcp]]|[rem vlan-name]"),
 #  endif
 #  ifndef CONFIG_NSH_DISABLE_IFUPDOWN
   CMD_MAP("ifdown",   cmd_ifdown,   2, 2, "<interface>"),
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 233231a95..6010e1084 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -1108,13 +1108,20 @@ int cmd_vconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 
   if (!strcmp(argv[1], "add"))
     {
-      if (argc != 4)
+      int prio = 0;
+
+      if (argc != 4 && argc != 5)
         {
           nsh_error(vtbl, g_fmtargrequired, argv[0]);
           return ERROR;
         }
 
-      if (netlib_add_vlan(argv[2], atoi(argv[3])) < 0)
+      if (argc == 5)
+        {
+          prio = atoi(argv[4]);
+        }
+
+      if (netlib_add_vlan(argv[2], atoi(argv[3]), prio) < 0)
         {
           perror("Failed to add VLAN");
           return ERROR;

From c61fb846d7cefc43d52066db00bec756e99e70a6 Mon Sep 17 00:00:00 2001
From: meijian <meijian@xiaomi.com>
Date: Thu, 10 Oct 2024 16:34:10 +0800
Subject: [PATCH 085/568] apps/net: add if network conntivity check API

Perform connectivity testing on the specified network interface card.

Signed-off-by: meijian <meijian@xiaomi.com>
---
 include/netutils/netlib.h                    |  2 +
 netutils/netlib/CMakeLists.txt               |  2 +-
 netutils/netlib/Makefile                     |  2 +-
 netutils/netlib/netlib_checkifconnectivity.c | 89 ++++++++++++++++++++
 4 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 netutils/netlib/netlib_checkifconnectivity.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 5be9747b2..2e7f7bc60 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -515,6 +515,8 @@ int netlib_check_ifconflict(FAR const char *ifname);
 
 #ifdef CONFIG_NETUTILS_PING
 int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry);
+int netlib_check_ifconnectivity(FAR const char *ifname,
+                                int timeout, int retry);
 #endif
 
 #ifdef CONFIG_MM_IOB
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 632b32857..be87f33fa 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -158,7 +158,7 @@ if(CONFIG_NETUTILS_NETLIB)
   endif()
 
   if(CONFIG_NETUTILS_PING)
-    list(APPEND SRCS netlib_checkipconnectivity.c)
+    list(APPEND SRCS netlib_checkipconnectivity.c netlib_checkifconnectivity.c)
   endif()
 
   target_sources(apps PRIVATE ${SRCS})
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 0de8c07e5..a55340c1f 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -157,7 +157,7 @@ CSRCS += netlib_getiobinfo.c
 endif
 
 ifeq ($(CONFIG_NETUTILS_PING),y)
-CSRCS += netlib_checkipconnectivity.c
+CSRCS += netlib_checkipconnectivity.c netlib_checkifconnectivity.c
 endif
 
 include $(APPDIR)/Application.mk
diff --git a/netutils/netlib/netlib_checkifconnectivity.c b/netutils/netlib/netlib_checkifconnectivity.c
new file mode 100644
index 000000000..c08995366
--- /dev/null
+++ b/netutils/netlib/netlib_checkifconnectivity.c
@@ -0,0 +1,89 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_checkifconnectivity.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <arpa/inet.h>
+#include <nuttx/net/ip.h>
+
+#include "netutils/netlib.h"
+
+#ifdef CONFIG_NETUTILS_PING
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_check_ifconnectivity
+ *
+ * Description:
+ *   Check network interface connectivity by pinging the gateway
+ *
+ * Parameters:
+ *   ifname   The name of the interface to use
+ *   timeout  The timeout of ping
+ *   retry    The retry times of ping
+ *
+ * Return:
+ *   nums of gateway reply of ping; a nagtive on failure.
+ *
+ ****************************************************************************/
+
+int netlib_check_ifconnectivity(FAR const char *ifname,
+                                int timeout, int retry)
+{
+  int ret;
+  char destip[INET_ADDRSTRLEN];
+  struct in_addr addr;
+
+  ret = netlib_get_dripv4addr(ifname, &addr);
+  if (ret < 0)
+    {
+      nerr("ERROR: failed to get gateway ip %s\n", ifname);
+      return ret;
+    }
+
+  if (net_ipv4addr_cmp(&addr, INADDR_ANY))
+    {
+      nerr("ERROR: failed to get gateway ip %s\n", ifname);
+      return -EINVAL;
+    }
+
+  inet_ntop(AF_INET, &addr, destip, sizeof(destip));
+  ninfo("ping gateway %s \n", destip);
+
+  return netlib_check_ipconnectivity(destip, timeout, retry);
+}
+
+#endif /* CONFIG_NETUTILS_PING */
\ No newline at end of file

From 13a019450a9812f5a55bf2dfb173d3bee035e46f Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Wed, 6 Aug 2025 20:48:43 +0800
Subject: [PATCH 086/568] netlib: Add an empty macro definition to the two
 connectivity functions

The `netlib_check_ipconnectivity` and `netlib_check_ifconnectivity` functions depend on the `NETUTILS PING` configuration item. When `NETUTILS PING` is not enabled, a compilation error will occur; therefore, an empty macro definition is added.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 include/netutils/netlib.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 2e7f7bc60..b28b880df 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -517,6 +517,9 @@ int netlib_check_ifconflict(FAR const char *ifname);
 int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry);
 int netlib_check_ifconnectivity(FAR const char *ifname,
                                 int timeout, int retry);
+#else
+#define netlib_check_ipconnectivity(i, t, r) 1
+#define netlib_check_ifconnectivity(i, t, r) 1
 #endif
 
 #ifdef CONFIG_MM_IOB

From 63f61d080aa524ed3c79518e678ddfa6dbe5a33c Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Fri, 6 Jun 2025 20:44:56 +0800
Subject: [PATCH 087/568] netutils/ntpclient: Fix a large number of print DNS
 request errors

Before attempting to sample via NTP, network connectivity should be checked to avoid frequent sampling that could cause network error logs to overflow.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 netutils/ntpclient/ntpclient.c | 39 +++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index 19962f4d5..22c448fdd 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -52,6 +52,7 @@
 
 #include <nuttx/clock.h>
 
+#include "netutils/netlib.h"
 #include "netutils/ntpclient.h"
 
 #include "ntpv3.h"
@@ -103,6 +104,8 @@
 
 #define MAX_SERVER_SELECTION_RETRIES 3
 
+#define MAX_RETRY_INTERVAL 120
+
 #ifndef STR
 #  define STR2(x) #x
 #  define STR(x) STR2(x)
@@ -1233,6 +1236,7 @@ static int ntpc_daemon(int argc, FAR char **argv)
   FAR struct ntp_servers_s *srvs;
   int exitcode = EXIT_SUCCESS;
   int retries = 0;
+  int retry_delay = 1;
   int nsamples;
   int ret;
 
@@ -1302,21 +1306,24 @@ static int ntpc_daemon(int argc, FAR char **argv)
       clock_gettime(CLOCK_REALTIME, &start_realtime);
       clock_gettime(CLOCK_MONOTONIC, &start_monotonic);
 
-      /* Collect samples. */
-
       nsamples = 0;
-      for (i = 0; i < CONFIG_NETUTILS_NTPCLIENT_NUM_SAMPLES; i++)
+      if (netlib_check_ipconnectivity(NULL, 1, 1) > 0)
         {
-          /* Get next sample. */
+          /* Collect samples. */
 
-          ret = ntpc_get_ntp_sample(srvs, samples, nsamples);
-          if (ret < 0)
+          for (i = 0; i < CONFIG_NETUTILS_NTPCLIENT_NUM_SAMPLES; i++)
             {
-              errval = errno;
-            }
-          else
-            {
-              ++nsamples;
+              /* Get next sample. */
+
+              ret = ntpc_get_ntp_sample(srvs, samples, nsamples);
+              if (ret < 0)
+                {
+                  errval = errno;
+                }
+              else
+                {
+                  ++nsamples;
+                }
             }
         }
 
@@ -1405,6 +1412,7 @@ static int ntpc_daemon(int argc, FAR char **argv)
 
               sleep(CONFIG_NETUTILS_NTPCLIENT_POLLDELAYSEC);
               retries = 0;
+              retry_delay = 1;
             }
 
           continue;
@@ -1424,7 +1432,14 @@ static int ntpc_daemon(int argc, FAR char **argv)
 
       if (errval != EINTR)
         {
-          sleep(1);
+          ninfo("Retry %d in %d seconds...\n", retries, retry_delay);
+          sleep(retry_delay);
+
+          retry_delay *= 2;
+          if (retry_delay > MAX_RETRY_INTERVAL)
+            {
+              retry_delay = MAX_RETRY_INTERVAL;
+            }
         }
 
       /* Keep retrying. */

From 4e8a0ae4c40df86c9bf6e3eae01391f2f7e38732 Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Sat, 10 Jan 2026 17:25:13 +0800
Subject: [PATCH 088/568] style: Fix coding style violations in nuttx-apps

Fix various coding style issues including:
- Case statement formatting
- Include placement and ordering
- Whitespace issues
- Long line formatting
- Bracket alignment

Affected modules:
- audioutils, examples, include
- netutils, system

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 audioutils/mml_parser/mml_parser.c         | 36 ++++++++++++++++------
 examples/elf/tests/signal/signal.c         |  6 ++--
 examples/elf/tests/struct/struct_main.c    |  2 +-
 examples/mount/ramdisk.c                   |  4 +--
 examples/netloop/netloop.h                 |  1 -
 examples/nxflat/tests/signal/signal.c      |  6 ++--
 examples/nxflat/tests/struct/struct_main.c |  2 +-
 examples/uid/uid_main.c                    | 12 +++++---
 include/canutils/obd.h                     | 10 +++---
 include/industry/abnt_codi.h               |  3 +-
 netutils/netlib/netlib_ipv4addrconv.c      |  6 ++--
 netutils/pppd/ahdlc.h                      |  4 +--
 netutils/pppd/pap.h                        |  1 +
 netutils/webserver/httpd.h                 |  4 ++-
 system/tee/tee.c                           |  5 +--
 15 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/audioutils/mml_parser/mml_parser.c b/audioutils/mml_parser/mml_parser.c
index de7450f71..033bbbfde 100644
--- a/audioutils/mml_parser/mml_parser.c
+++ b/audioutils/mml_parser/mml_parser.c
@@ -169,15 +169,33 @@ static int calc_samples(int fs, int tempo, int num, int dots)
 
   switch (num)
     {
-      case 0:  n   = 3; break;
-      case 1:  n   = 2; break;
-      case 2:  n   = 1; break;
-      case 4:  n   = 0; break;
-      case 8:  div = 1; break;
-      case 16: div = 2; break;
-      case 32: div = 3; break;
-      case 64: div = 4; break;
-      default: div = -1; break;
+      case 0:
+        n = 3;
+        break;
+      case 1:
+        n = 2;
+        break;
+      case 2:
+        n = 1;
+        break;
+      case 4:
+        n = 0;
+        break;
+      case 8:
+        div = 1;
+        break;
+      case 16:
+        div = 2;
+        break;
+      case 32:
+        div = 3;
+        break;
+      case 64:
+        div = 4;
+        break;
+      default:
+        div = -1;
+        break;
     }
 
   if (dots <= 4)
diff --git a/examples/elf/tests/signal/signal.c b/examples/elf/tests/signal/signal.c
index b091602bc..afcdff281 100644
--- a/examples/elf/tests/signal/signal.c
+++ b/examples/elf/tests/signal/signal.c
@@ -66,8 +66,8 @@ static int sigusr2_rcvd = 0;
  * Name: siguser_action
  ****************************************************************************/
 
-/* NOTE: it is necessary for functions that are referred to by function pointers
- *  pointer to be declared with global scope (at least for ARM).  Otherwise,
+/* NOTE: it is necessary for functions that are referred to by function
+ * pointers to be declared with global scope (at least for ARM).  Otherwise,
  * a relocation type that is not supported by ELF is generated by GCC.
  */
 
@@ -225,7 +225,7 @@ int main(int argc, char **argv)
 
   /* Verify that the handler that was removed was siguser_action */
 
-  if ((void*)act.sa_handler != (void*)siguser_action)
+  if ((void *)act.sa_handler != (void *)siguser_action)
     {
       fprintf(stderr,
               "Old SIGUSR2 signal handler (%p) is not siguser_action (%p)\n",
diff --git a/examples/elf/tests/struct/struct_main.c b/examples/elf/tests/struct/struct_main.c
index 801d2c5c5..5158c03b7 100644
--- a/examples/elf/tests/struct/struct_main.c
+++ b/examples/elf/tests/struct/struct_main.c
@@ -35,7 +35,7 @@
 
 const struct struct_dummy_s dummy_struct =
 {
-   DUMMY_SCALAR_VALUE3
+  DUMMY_SCALAR_VALUE3
 };
 
 int dummy_scalar = DUMMY_SCALAR_VALUE2;
diff --git a/examples/mount/ramdisk.c b/examples/mount/ramdisk.c
index 7eeeafaab..11b29130a 100644
--- a/examples/mount/ramdisk.c
+++ b/examples/mount/ramdisk.c
@@ -97,8 +97,8 @@ int create_ramdisk(void)
   ret = mkfatfs(g_source, &g_fmt);
   if (ret < 0)
     {
-      printf("create_ramdisk: Failed to create FAT filesystem on ramdisk at %s\n",
-             g_source);
+      printf("create_ramdisk: Failed to create FAT filesystem on "
+             "ramdisk at %s\n", g_source);
       return ret;
     }
 
diff --git a/examples/netloop/netloop.h b/examples/netloop/netloop.h
index c4d6415d6..2696e89ae 100644
--- a/examples/netloop/netloop.h
+++ b/examples/netloop/netloop.h
@@ -45,7 +45,6 @@
  *                               buffering s not yet support for UDP)
  */
 
-
 #ifndef CONFIG_NET
 #  error Network socket support not enabled
 #endif
diff --git a/examples/nxflat/tests/signal/signal.c b/examples/nxflat/tests/signal/signal.c
index 7deb7768e..63ee50767 100644
--- a/examples/nxflat/tests/signal/signal.c
+++ b/examples/nxflat/tests/signal/signal.c
@@ -66,8 +66,8 @@ static int sigusr2_rcvd = 0;
  * Name: siguser_action
  ****************************************************************************/
 
-/* NOTE: it is necessary for functions that are referred to by function pointers
- *  pointer to be declared with global scope (at least for ARM).  Otherwise,
+/* NOTE: it is necessary for functions that are referred to by function
+ * pointers to be declared with global scope (at least for ARM).  Otherwise,
  * a relocation type that is not supported by ELF is generated by GCC.
  */
 
@@ -225,7 +225,7 @@ int main(int argc, char **argv)
 
   /* Verify that the handler that was removed was siguser_action */
 
-  if ((void*)act.sa_handler != (void*)siguser_action)
+  if ((void *)act.sa_handler != (void *)siguser_action)
     {
       fprintf(stderr,
               "Old SIGUSR2 signal handler (%p) is not siguser_action (%p)\n",
diff --git a/examples/nxflat/tests/struct/struct_main.c b/examples/nxflat/tests/struct/struct_main.c
index 18aa49178..b3721f87a 100644
--- a/examples/nxflat/tests/struct/struct_main.c
+++ b/examples/nxflat/tests/struct/struct_main.c
@@ -35,7 +35,7 @@
 
 const struct struct_dummy_s dummy_struct =
 {
-   DUMMY_SCALAR_VALUE3
+  DUMMY_SCALAR_VALUE3
 };
 
 int dummy_scalar = DUMMY_SCALAR_VALUE2;
diff --git a/examples/uid/uid_main.c b/examples/uid/uid_main.c
index cc4bfc6fd..9792114be 100644
--- a/examples/uid/uid_main.c
+++ b/examples/uid/uid_main.c
@@ -51,10 +51,14 @@ static void show_usage(FAR const char *progname, FAR FILE *stream,
                        int exit_code)
 {
   fprintf(stream, "USAGE:\n");
-  fprintf(stream, "\t%s -uid <uid>    - Show user info by ID\n", progname);
-  fprintf(stream, "\t%s -uname <name> - Show user info by name\n", progname);
-  fprintf(stream, "\t%s -gid <gid>    - Show group info by ID\n", progname);
-  fprintf(stream, "\t%s -gname <name> - Show group info by name\n", progname);
+  fprintf(stream, "\t%s -uid <uid>    - Show user info by ID\n",
+          progname);
+  fprintf(stream, "\t%s -uname <name> - Show user info by name\n",
+          progname);
+  fprintf(stream, "\t%s -gid <gid>    - Show group info by ID\n",
+          progname);
+  fprintf(stream, "\t%s -gname <name> - Show group info by name\n",
+          progname);
   fprintf(stream, "\t%s -h            - Show this help info\n", progname);
   exit(exit_code);
 }
diff --git a/include/canutils/obd.h b/include/canutils/obd.h
index bc6667285..c49b2a152 100644
--- a/include/canutils/obd.h
+++ b/include/canutils/obd.h
@@ -96,13 +96,13 @@ int obd_send_request(FAR struct obd_dev_s *dev, uint8_t opmode, uint8_t pid);
  *   Wait for a message from ECUs with requested PID that was sent using
  *   obd_send_request().
  *
- *   It will return an error case it doesn't receive the msg after the elapsed
- *   "timeout" time.
+ *   It will return an error case it doesn't receive the msg after the
+ *   elapsed "timeout" time.
  *
  ****************************************************************************/
 
-int obd_wait_response(FAR struct obd_dev_s *dev, uint8_t opmode, uint8_t pid,
-                      int timeout);
+int obd_wait_response(FAR struct obd_dev_s *dev, uint8_t opmode,
+                      uint8_t pid, int timeout);
 
 /****************************************************************************
  * Name: obd_decode_pid
@@ -116,4 +116,4 @@ int obd_wait_response(FAR struct obd_dev_s *dev, uint8_t opmode, uint8_t pid,
 
 FAR char *obd_decode_pid(FAR struct obd_dev_s *dev, uint8_t pid);
 
-#endif /*__APPS_INCLUDE_CANUTILS_OBD_H */
+#endif /* __APPS_INCLUDE_CANUTILS_OBD_H */
diff --git a/include/industry/abnt_codi.h b/include/industry/abnt_codi.h
index 049a7b29f..e1dbeb494 100644
--- a/include/industry/abnt_codi.h
+++ b/include/industry/abnt_codi.h
@@ -104,7 +104,8 @@ uint8_t abnt_codi_checksum(FAR const uint8_t *data);
 
 /* Parse a specific ABNT CODI sequence. */
 
-bool abnt_codi_parse(FAR const uint8_t *data, FAR struct abnt_codi_proto_s *proto);
+bool abnt_codi_parse(FAR const uint8_t *data,
+                     FAR struct abnt_codi_proto_s *proto);
 
 #ifdef __cplusplus
 }
diff --git a/netutils/netlib/netlib_ipv4addrconv.c b/netutils/netlib/netlib_ipv4addrconv.c
index 27325ca0a..e27a21f76 100644
--- a/netutils/netlib/netlib_ipv4addrconv.c
+++ b/netutils/netlib/netlib_ipv4addrconv.c
@@ -68,9 +68,9 @@ bool netlib_ipv4addrconv(FAR const char *addrstr, FAR uint8_t *ipaddr)
         {
           ch = *addrstr++;
           if (++j > 4)
-           {
-             return false;
-           }
+            {
+              return false;
+            }
 
           if (ch == '.' || ch == 0)
             {
diff --git a/netutils/pppd/ahdlc.h b/netutils/pppd/ahdlc.h
index 8ed51ff5d..a3846f76a 100644
--- a/netutils/pppd/ahdlc.h
+++ b/netutils/pppd/ahdlc.h
@@ -68,8 +68,8 @@ void ahdlc_rx_ready(FAR struct ppp_context_s *ctx);
 
 uint8_t ahdlc_rx(FAR struct ppp_context_s *ctx, uint8_t);
 uint8_t ahdlc_tx(FAR struct ppp_context_s *ctx, uint16_t protocol,
-                 FAR uint8_t *header, FAR uint8_t *buffer, uint16_t headerlen,
-                 uint16_t datalen);
+                 FAR uint8_t *header, FAR uint8_t *buffer,
+                 uint16_t headerlen, uint16_t datalen);
 
 #undef EXTERN
 #ifdef __cplusplus
diff --git a/netutils/pppd/pap.h b/netutils/pppd/pap.h
index 402ef0f71..fa43c9827 100644
--- a/netutils/pppd/pap.h
+++ b/netutils/pppd/pap.h
@@ -56,6 +56,7 @@
  ****************************************************************************/
 
 /* PAP state machine flags */
+
 /* Client only */
 
 #define PAP_TX_UP         0x01
diff --git a/netutils/webserver/httpd.h b/netutils/webserver/httpd.h
index 253adfcf1..e6486bb34 100644
--- a/netutils/webserver/httpd.h
+++ b/netutils/webserver/httpd.h
@@ -54,7 +54,9 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-/* 'file' must be allocated by caller and will be filled in by the function. */
+/* 'file' must be allocated by caller and will be filled in by the
+ * function.
+ */
 
 #if defined(CONFIG_NETUTILS_HTTPD_SENDFILE)
 
diff --git a/system/tee/tee.c b/system/tee/tee.c
index 3adab918f..cb934c7a9 100644
--- a/system/tee/tee.c
+++ b/system/tee/tee.c
@@ -103,8 +103,9 @@ static void show_usage(FAR const char *progrname, int exitcode)
   fprintf(stderr, "-a:\n");
   fprintf(stderr, "\tAppend to the file (vs. truncating)\n");
   fprintf(stderr, "file:\n");
-  fprintf(stderr, "\tArbitrary number of options output files.  Output\n");
-  fprintf(stderr, "\twill go to stdout in addition to each of these files.\n");
+  fprintf(stderr, "\tArbitrary number of options output files. Output\n");
+  fprintf(stderr, "\twill go to stdout in addition to each of these\n");
+  fprintf(stderr, "\tfiles.\n");
   fprintf(stderr, "-h:\n");
   fprintf(stderr, "\tShows this message and exits\n");
   exit(exitcode);

From 21f41560480dcc147decef2dc72dab440a76087d Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Thu, 13 Mar 2025 18:02:44 +0800
Subject: [PATCH 089/568] sighand: need block WAKEUP_SIGNAL in current tcb

If the main thread receives the signal, the waiter_main will not be awakened.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 testing/ostest/sighand.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/testing/ostest/sighand.c b/testing/ostest/sighand.c
index e7f3f5318..c368a37f1 100644
--- a/testing/ostest/sighand.c
+++ b/testing/ostest/sighand.c
@@ -217,12 +217,13 @@ void sighand_test(void)
 #ifdef CONFIG_SCHED_HAVE_PARENT
   struct sigaction act;
   struct sigaction oact;
-  sigset_t set;
 #endif
   struct sched_param param;
   pthread_attr_t attr;
   union sigval sigvalue;
   pid_t waiterpid;
+  sigset_t oset;
+  sigset_t set;
   int status;
 
   printf("sighand_test: Initializing semaphore to 0\n");
@@ -259,6 +260,16 @@ void sighand_test(void)
 
   /* Start waiter thread  */
 
+  sigemptyset(&set);
+  sigaddset(&set, WAKEUP_SIGNAL);
+  status = sigprocmask(SIG_BLOCK, &set, &oset);
+  if (status != OK)
+    {
+      printf("sighand_test: ERROR sigprocmask failed, status=%d\n",
+              status);
+      ASSERT(false);
+    }
+
   printf("sighand_test: Starting waiter task\n");
   status = sched_getparam (0, &param);
   if (status != OK)
@@ -332,6 +343,7 @@ void sighand_test(void)
 #endif
 
   printf("sighand_test: done\n");
+  sigprocmask(SIG_SETMASK, &oset, NULL);
   FFLUSH();
   sem_destroy(&sem2);
   sem_destroy(&sem1);

From d594c953a187c8164f8a98eb2c372f4d3f26ff5a Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Sun, 11 Jan 2026 11:51:54 +0800
Subject: [PATCH 090/568] net/vlan: fix issue of vlan pcp config

Fix a issue of vlan pcp config.
`vconfig add eth0 10` will create eth0.10 with VID=10 and no PCP(0)
`vconfig add eth0 10 3` will create eth0.10 with VID=10 and PCP=3

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 netutils/netlib/netlib_addvlan.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/netutils/netlib/netlib_addvlan.c b/netutils/netlib/netlib_addvlan.c
index 87cbcf712..db1369578 100644
--- a/netutils/netlib/netlib_addvlan.c
+++ b/netutils/netlib/netlib_addvlan.c
@@ -42,13 +42,14 @@
  * Parameters:
  *   ifname - The name of the existing network device
  *   vlanid - The VLAN identifier to be added
+ *   prio   - The default VLAN priority (PCP)
  *
  * Return:
  *   0 on success; -1 on failure
  *
  ****************************************************************************/
 
-int netlib_add_vlan(FAR const char *ifname, int vlanid)
+int netlib_add_vlan(FAR const char *ifname, int vlanid, int prio)
 {
   int ret = ERROR;
 
@@ -60,8 +61,9 @@ int netlib_add_vlan(FAR const char *ifname, int vlanid)
           struct vlan_ioctl_args ifv;
 
           strlcpy(ifv.device1, ifname, sizeof(ifv.device1));
-          ifv.u.VID = vlanid;
-          ifv.cmd = ADD_VLAN_CMD;
+          ifv.u.VID    = vlanid;
+          ifv.vlan_qos = prio;
+          ifv.cmd      = ADD_VLAN_CMD;
 
           ret = ioctl(sockfd, SIOCSIFVLAN, &ifv);
           close(sockfd);

From 7daac30cb47d5192f517a4c8e98d70d4e9937df7 Mon Sep 17 00:00:00 2001
From: shichunma <masc2008@gmail.com>
Date: Thu, 1 Jan 2026 09:46:57 +0800
Subject: [PATCH 091/568] system/iptables: avoid trap when running "iptables
 -L"

A trap occurs every time CONFIG_NET_NAT is enabled while CONFIG_NET_IPFILTER is not.

Signed-off-by: Jerry Ma <masc2008@gmail.com>
---
 system/iptables/iptables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/iptables/iptables.c b/system/iptables/iptables.c
index 7072ed968..673559634 100644
--- a/system/iptables/iptables.c
+++ b/system/iptables/iptables.c
@@ -506,7 +506,7 @@ int main(int argc, FAR char *argv[])
   else
 #endif
 #ifdef CONFIG_NET_NAT
-  if (strcmp(args.table, TABLE_NAME_NAT) == 0)
+  if (args.table != NULL && strcmp(args.table, TABLE_NAME_NAT) == 0)
     {
       ret = iptables_apply(&args, iptables_nat_command);
       if (ret < 0)

From 8d4e87240224654bcf59f134d41b677bdfe231bd Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 23 Dec 2025 16:40:00 -0500
Subject: [PATCH 092/568] !testing/cmocka: Compile cmocka as a libary only by
 default

BREAKING CHANGE

This commit introduces a Kconfig switch to include the cmocka binary
built from cmocka_main.c. The default behaviour is now changed so that
cmocka is built as a library only, which would be the desired behaviour
for users creating their own cmocka projects.

To restore the old behaviour (where the cmocka program is compiled), add
CONFIG_TESTING_CMOCKA_PROG=y to your legacy configuration.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 testing/cmocka/CMakeLists.txt | 32 +++++++++++++++++---------------
 testing/cmocka/Kconfig        | 18 ++++++++++++++++--
 testing/cmocka/Makefile       |  8 +++++---
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/testing/cmocka/CMakeLists.txt b/testing/cmocka/CMakeLists.txt
index 277ee2233..d810aee89 100644
--- a/testing/cmocka/CMakeLists.txt
+++ b/testing/cmocka/CMakeLists.txt
@@ -74,20 +74,22 @@ if(CONFIG_TESTING_CMOCKA)
   target_include_directories(cmocka PRIVATE ${INCDIR})
   target_compile_options(cmocka PRIVATE ${CFLAGS})
 
-  nuttx_add_application(
-    NAME
-    ${CONFIG_TESTING_CMOCKA_PROGNAME}
-    PRIORITY
-    ${CONFIG_TESTING_CMOCKA_PRIORITY}
-    STACKSIZE
-    ${CONFIG_TESTING_CMOCKA_STACKSIZE}
-    MODULE
-    ${CONFIG_TESTING_CMOCKA}
-    INCLUDE_DIRECTORIES
-    ${INCDIR}
-    SRCS
-    cmocka_main.c
-    DEPENDS
-    cmocka)
+  if(CONFIG_TESTING_CMOCKA_PROG)
+    nuttx_add_application(
+      NAME
+      ${CONFIG_TESTING_CMOCKA_PROGNAME}
+      PRIORITY
+      ${CONFIG_TESTING_CMOCKA_PRIORITY}
+      STACKSIZE
+      ${CONFIG_TESTING_CMOCKA_STACKSIZE}
+      MODULE
+      ${CONFIG_TESTING_CMOCKA}
+      INCLUDE_DIRECTORIES
+      ${INCDIR}
+      SRCS
+      cmocka_main.c
+      DEPENDS
+      cmocka)
+  endif()
 
 endif()
diff --git a/testing/cmocka/Kconfig b/testing/cmocka/Kconfig
index 0f5ab51f7..fd1138152 100644
--- a/testing/cmocka/Kconfig
+++ b/testing/cmocka/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config TESTING_CMOCKA
-	tristate "Enable libcmocka"
+	bool "Enable libcmocka"
 	depends on LIBC_REGEX
 	default n
 	---help---
@@ -12,6 +12,15 @@ config TESTING_CMOCKA
 
 if TESTING_CMOCKA
 
+config TESTING_CMOCKA_PROG
+	tristate "Compile cmocka binary"
+	default n
+	---help---
+		Instead of just compiling cmocka as a library, the 'cmocka' binary is
+		also included.
+
+if TESTING_CMOCKA_PROG
+
 config TESTING_CMOCKA_PROGNAME
 	string "Program name"
 	default "cmocka"
@@ -27,8 +36,13 @@ config TESTING_CMOCKA_STACKSIZE
 	int "cmocka test stack size"
 	default DEFAULT_TASK_STACKSIZE
 
+endif # TESTING_CMOCKA_PROG
+
 config TESTING_CMOCKA_LEAKDETECT
-	bool "Memory leaks can be checked using cmocka, please use in local environment"
+	bool "Detect leaks"
 	default n
+	---help---
+		Memory leaks can be checked using cmocka, please use in a local
+		environment.
 
 endif
diff --git a/testing/cmocka/Makefile b/testing/cmocka/Makefile
index ac2d177b5..4a21f3ea1 100644
--- a/testing/cmocka/Makefile
+++ b/testing/cmocka/Makefile
@@ -29,12 +29,14 @@ CFLAGS += -DHAVE_CLOCK_REALTIME=1
 CFLAGS += -DHAVE_STRUCT_TIMESPEC=1
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/testing/cmocka
 
+MODULE = $(CONFIG_TESTING_CMOCKA_PROG)
+
+ifneq ($(CONFIG_TESTING_CMOCKA_PROG),)
 PROGNAME  = $(CONFIG_TESTING_CMOCKA_PROGNAME)
 PRIORITY  = $(CONFIG_TESTING_CMOCKA_PRIORITY)
 STACKSIZE = $(CONFIG_TESTING_CMOCKA_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_CMOCKA)
-
-MAINSRC = $(CURDIR)/cmocka_main.c
+MAINSRC   = $(CURDIR)/cmocka_main.c
+endif
 
 # Download and unpack tarball if no git repo found
 ifeq ($(wildcard cmocka/.git),)

From a22bf844cdf25c96af5a3295ac3c21927328213c Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 12 Jan 2026 11:48:13 +0100
Subject: [PATCH 093/568] .github/build.yml: fix python venv installation

install venv package in one command to avoid issues with ubuntu mirrors

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 .github/workflows/build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c43588cb..907497cba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -181,10 +181,9 @@ jobs:
           BLOBDIR: /tools/blobs
         with:
           run: |
-            # install venv
+            # install python venv
             apt-get update
-            apt install -y python3-dev
-            apt install -y python3-venv
+            apt-get install -y python3 python3-dev python3-venv
 
             # get NTFC sources
             git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-ntfc

From b0b90ac72886a7d2ee8d9a16e057a4b2c801984e Mon Sep 17 00:00:00 2001
From: meijian <meijian@xiaomi.com>
Date: Mon, 14 Oct 2024 20:36:13 +0800
Subject: [PATCH 094/568] apps/net: add http connectivity check API

Add netlib_check_httpconnectivity() to verify HTTP service connectivity by sending GET request and validating status code.

Signed-off-by: meijian <meijian@xiaomi.com>
---
 include/netutils/netlib.h                     |   4 +
 netutils/netlib/CMakeLists.txt                |   2 +
 netutils/netlib/Makefile                      |   2 +
 .../netlib/netlib_checkhttpconnectivity.c     | 265 ++++++++++++++++++
 4 files changed, 273 insertions(+)
 create mode 100644 netutils/netlib/netlib_checkhttpconnectivity.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index b28b880df..43febfcda 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -526,6 +526,10 @@ int netlib_check_ifconnectivity(FAR const char *ifname,
 int netlib_get_iobinfo(FAR struct iob_stats_s *iob);
 #endif
 
+int netlib_check_httpconnectivity(FAR const char *host,
+                                  FAR const char *getmsg,
+                                  int port, int expect_code);
+
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index be87f33fa..49e8aa81e 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -161,6 +161,8 @@ if(CONFIG_NETUTILS_NETLIB)
     list(APPEND SRCS netlib_checkipconnectivity.c netlib_checkifconnectivity.c)
   endif()
 
+  list(APPEND SRCS netlib_checkhttpconnectivity.c)
+
   target_sources(apps PRIVATE ${SRCS})
 
 endif()
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index a55340c1f..4bfc8d9d4 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -160,4 +160,6 @@ ifeq ($(CONFIG_NETUTILS_PING),y)
 CSRCS += netlib_checkipconnectivity.c netlib_checkifconnectivity.c
 endif
 
+CSRCS += netlib_checkhttpconnectivity.c
+
 include $(APPDIR)/Application.mk
diff --git a/netutils/netlib/netlib_checkhttpconnectivity.c b/netutils/netlib/netlib_checkhttpconnectivity.c
new file mode 100644
index 000000000..c29d86292
--- /dev/null
+++ b/netutils/netlib/netlib_checkhttpconnectivity.c
@@ -0,0 +1,265 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_checkhttpconnectivity.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <debug.h>
+
+#ifdef CONFIG_LIBC_NETDB
+#  include <netdb.h>
+#endif
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: eai_to_errno
+ *
+ * Description:
+ *   Convert EAI_* error code to errno value for unified error handling.
+ *
+ * Parameters:
+ *   eai_error  The EAI_* error code from getaddrinfo().
+ *
+ * Return:
+ *   Corresponding errno value.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_LIBC_NETDB
+static int eai_to_errno(int eai_error)
+{
+  switch (eai_error)
+    {
+      case EAI_AGAIN:
+        return EAGAIN;        /* Temporary failure, try again */
+
+      case EAI_BADFLAGS:
+        return EINVAL;        /* Invalid flags */
+
+      case EAI_FAIL:
+        return EHOSTUNREACH;  /* Non-recoverable failure */
+
+      case EAI_FAMILY:
+        return EAFNOSUPPORT;  /* Address family not supported */
+
+      case EAI_MEMORY:
+        return ENOMEM;        /* Memory allocation failure */
+
+      case EAI_NONAME:
+        return EHOSTUNREACH;  /* Host name not found */
+
+      case EAI_SERVICE:
+        return EINVAL;        /* Service not recognized */
+
+      case EAI_SOCKTYPE:
+        return EINVAL;        /* Socket type not supported */
+
+      case EAI_SYSTEM:
+        return errno;         /* System error, use errno */
+
+      case EAI_OVERFLOW:
+        return EOVERFLOW;     /* Buffer overflow */
+
+      default:
+        return EINVAL;        /* Unknown error, use invalid argument */
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: httpget_gethostip
+ *
+ * Description:
+ *   Check the http status code
+ *
+ * Parameters:
+ *   hostname  The host name to use in the nslookup.
+ *   dest      The location to return the IPv4 address.
+ *
+ * Return:
+ *   0 on success; a negative errno value on failure.
+ *
+ ****************************************************************************/
+
+static int httpget_gethostip(FAR const char *hostname,
+                             FAR struct in_addr *dest)
+{
+#ifdef CONFIG_LIBC_NETDB
+  /* Netdb DNS client support is enabled */
+
+  int ret;
+  FAR struct addrinfo hint;
+  FAR struct addrinfo *info;
+  FAR struct sockaddr_in *addr;
+
+  memset(&hint, 0, sizeof(hint));
+  hint.ai_family = AF_INET;
+
+  ret = getaddrinfo(hostname, NULL, &hint, &info);
+  if (ret != OK)
+    {
+      return -eai_to_errno(ret);
+    }
+
+  addr = (FAR struct sockaddr_in *)info->ai_addr;
+  memcpy(dest, &addr->sin_addr, sizeof(struct in_addr));
+
+  freeaddrinfo(info);
+  return OK;
+
+#else /* CONFIG_LIBC_NETDB */
+  /* No host name support */
+
+  /* Convert strings to numeric IPv4 address */
+
+  int ret = inet_pton(AF_INET, hostname, dest);
+
+  /* The inet_pton() function returns 1 if the conversion succeeds. It will
+   * return 0 if the input is not a valid IPv4 dotted-decimal string or -1
+   * with errno set to EAFNOSUPPORT if the address family argument is
+   * unsupported.
+   */
+
+  if (ret != 1)
+    {
+      /* ret == 0: invalid IP address string, set errno to EINVAL
+       * ret == -1: system error, errno is already set to EAFNOSUPPORT
+       */
+
+      if (ret == 0)
+        {
+          set_errno(EINVAL);
+        }
+
+      return -errno;
+    }
+
+  return OK;
+
+#endif /* CONFIG_LIBC_NETDB */
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: netlib_check_httpconnectivity
+ *
+ * Description:
+ *   Check the http status code
+ *
+ * Parameters:
+ *   host         The remote host to check
+ *   getmsg       The http GET message
+ *   port         The port of remote host
+ *   expect_code  The except http code of http code
+ *
+ * Return:
+ *   0 on success; a nagtive on failure.
+ *
+ ****************************************************************************/
+
+int netlib_check_httpconnectivity(FAR const char *host,
+                                  FAR const char *getmsg,
+                                  int port, int expect_code)
+{
+  int sock;
+  int ret;
+  int status_code = -1;
+  struct sockaddr_in server_addr;
+  char buf[256];
+
+  ret = httpget_gethostip(host, &server_addr.sin_addr);
+  if (ret < 0)
+    {
+      nerr("Failed to get host ip");
+      return ret;
+    }
+
+  sock = socket(AF_INET, SOCK_STREAM, 0);
+  if (sock < 0)
+    {
+      nerr("Failed to create socket");
+      return -errno;
+    }
+
+  server_addr.sin_family = AF_INET;
+  server_addr.sin_port = htons(port);
+
+  ret = connect(sock, (struct sockaddr *)&server_addr, sizeof(server_addr));
+  if (ret < 0)
+    {
+      perror("Connection failed");
+      goto exit_with_socket;
+    }
+
+  snprintf(buf, sizeof(buf),
+           "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\n\r\n",
+           getmsg, host);
+
+  ret = send(sock, buf, strlen(buf), 0);
+  if (ret < 0)
+    {
+      perror("send failed");
+      goto exit_with_socket;
+    }
+
+  if ((ret = recv(sock, buf, sizeof(buf), 0)) < 0)
+    {
+      perror("recv failed");
+      goto exit_with_socket;
+    }
+
+  /* get the http code, and check with except code */
+
+  if (sscanf(buf, "HTTP/1.1 %d", &status_code) == 1 &&
+             status_code == expect_code)
+    {
+      ninfo("HTTP connectivity is ok");
+      ret = OK;
+    }
+  else
+    {
+      nerr("HTTP connectivity is not ok status code: %d\n", status_code);
+      ret = -status_code;
+    }
+
+exit_with_socket:
+  close(sock);
+  return ret;
+}

From 58326d39dcc1886b39f695cb4b5d36db07593ecd Mon Sep 17 00:00:00 2001
From: liucheng5 <liucheng5@xiaomi.com>
Date: Mon, 4 Nov 2024 17:26:05 +0800
Subject: [PATCH 095/568] system/uorb: add a new uorb topic ENG

Add a new uorb topic for ENG sensor

Signed-off-by: liucheng5 <liucheng5@xiaomi.com>
Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/sensor/eng.c    | 41 +++++++++++++++++++++++++++++++++++++
 system/uorb/sensor/eng.h    | 38 ++++++++++++++++++++++++++++++++++
 system/uorb/sensor/topics.c |  4 +++-
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 system/uorb/sensor/eng.c
 create mode 100644 system/uorb/sensor/eng.h

diff --git a/system/uorb/sensor/eng.c b/system/uorb/sensor/eng.c
new file mode 100644
index 000000000..afc712aec
--- /dev/null
+++ b/system/uorb/sensor/eng.c
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * apps/system/uorb/sensor/eng.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sensor/eng.h>
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_DEBUG_UORB
+static const char sensor_eng_format[] =
+  "timestamp:%" PRIu64 ",eng0:%hf,eng1:%hf,eng2:%hf,eng3:%hf,"
+  "status:0x%" PRIx32 "";
+#endif
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+ORB_DEFINE(sensor_eng, struct sensor_eng, sensor_eng_format);
diff --git a/system/uorb/sensor/eng.h b/system/uorb/sensor/eng.h
new file mode 100644
index 000000000..099c13290
--- /dev/null
+++ b/system/uorb/sensor/eng.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+ * apps/system/uorb/sensor/eng.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_UORB_SENSOR_ENG_H
+#define __APPS_SYSTEM_UORB_SENSOR_ENG_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <uORB/uORB.h>
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* register this as object request broker structure */
+
+ORB_DECLARE(sensor_eng);
+
+#endif
diff --git a/system/uorb/sensor/topics.c b/system/uorb/sensor/topics.c
index 02666a5f0..48619627f 100644
--- a/system/uorb/sensor/topics.c
+++ b/system/uorb/sensor/topics.c
@@ -38,6 +38,7 @@
 #include <sensor/co2.h>
 #include <sensor/dust.h>
 #include <sensor/ecg.h>
+#include <sensor/eng.h>
 #include <sensor/force.h>
 #include <sensor/gas.h>
 #include <sensor/gnss.h>
@@ -87,6 +88,7 @@ static FAR const struct orb_metadata *g_sensor_list[] =
   ORB_ID(sensor_device_orientation),
   ORB_ID(sensor_dust),
   ORB_ID(sensor_ecg),
+  ORB_ID(sensor_eng),
   ORB_ID(sensor_force),
   ORB_ID(sensor_gas),
   ORB_ID(sensor_glance_gesture),
@@ -157,7 +159,7 @@ FAR const struct orb_metadata *orb_get_meta(FAR const char *name)
   int fd;
   int i;
 
-  /* Fisrt search built-in topics */
+  /* First search built-in topics */
 
   for (i = 0; g_sensor_list[i]; i++)
     {

From 97545f6ff92a7a0669806a64aedc9eb1fe738fd2 Mon Sep 17 00:00:00 2001
From: jingfei <jingfei@xiaomi.com>
Date: Wed, 4 Jun 2025 21:14:50 +0800
Subject: [PATCH 096/568] ymodem:rb of ymodem add prefix and suffix for
 download file name

Adding parameters to rb main can add prefixes and suffixes
to the file names to be downloaded

Signed-off-by: jingfei <jingfei@xiaomi.com>
---
 system/ymodem/rb_main.c | 74 ++++++++++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/system/ymodem/rb_main.c b/system/ymodem/rb_main.c
index 373e597fe..983cc84b4 100644
--- a/system/ymodem/rb_main.c
+++ b/system/ymodem/rb_main.c
@@ -42,8 +42,10 @@ struct ymodem_priv_s
   int fd;
   FAR char *foldname;
   size_t file_saved_size;
-  FAR char *skip_perfix;
+  FAR char *skip_prefix;
   FAR char *skip_suffix;
+  FAR char *prepend_prefix;
+  FAR char *append_suffix;
 
   /* Async */
 
@@ -173,8 +175,8 @@ static int handler(FAR struct ymodem_ctx_s *ctx)
 
   if (ctx->packet_type == YMODEM_FILENAME_PACKET)
     {
-      char temp[PATH_MAX + 1];
-      FAR char *filename;
+      char filename[PATH_MAX + 1];
+      FAR char *temp;
 
       if (priv->fd > 0)
         {
@@ -192,35 +194,51 @@ static int handler(FAR struct ymodem_ctx_s *ctx)
           close(priv->fd);
         }
 
-      filename = ctx->file_name;
-      if (priv->skip_perfix != NULL)
-        {
-          size_t len = strlen(priv->skip_perfix);
+      temp = ctx->file_name;
 
-          if (strncmp(ctx->file_name, priv->skip_perfix,
+      if (priv->skip_prefix != NULL)
+        {
+          size_t len = strlen(priv->skip_prefix);
+
+          if (strncmp(ctx->file_name, priv->skip_prefix,
                       len) == 0)
             {
-              filename += len;
+              temp += len;
             }
         }
 
       if (priv->skip_suffix != NULL)
         {
-          size_t len = strlen(filename);
+          size_t len = strlen(temp);
           size_t len2 = strlen(priv->skip_suffix);
 
-          if (len > len2 && strcmp(filename + len - len2,
+          if (len > len2 && strcmp(temp + len - len2,
                                    priv->skip_suffix) == 0)
             {
-              filename[len - len2] = '\0';
+              temp[len - len2] = '\0';
             }
         }
 
       if (priv->foldname != NULL)
         {
-          snprintf(temp, sizeof(temp), "%s/%s", priv->foldname,
-                   filename);
-          filename = temp;
+          ret = snprintf(filename, sizeof(filename), "%s/%s%s%s",
+                         priv->foldname, priv->prepend_prefix, temp,
+                         priv->append_suffix);
+        }
+      else
+        {
+          ret = snprintf(filename, sizeof(filename), "%s%s%s",
+                         priv->prepend_prefix, temp, priv->append_suffix);
+        }
+
+      if (ret < 0)
+        {
+          return ret;
+        }
+
+      else if (ret >= sizeof(filename))
+        {
+          return -ENAMETOOLONG;
         }
 
       priv->fd = open(filename, O_CREAT | O_WRONLY, 0777);
@@ -326,6 +344,10 @@ static void show_usage(FAR const char *progname)
           "\t-p|--skip_prefix <prefix>: Remove file name prefix\n");
   fprintf(stderr,
           "\t-s|--skip_suffix <suffix>: Remove file name suffix\n");
+  fprintf(stderr,
+          "\t-e|--prepend_prefix <prefix>: prepend file name a prefix\n");
+  fprintf(stderr,
+          "\t-a|--append_suffix <suffix>: append file name a suffix\n");
   fprintf(stderr,
           "\t-b|--buffersize <size>: Asynchronously receive buffer size."
           "If greater than 0, accept data asynchronously, Default: 0kB\n");
@@ -339,7 +361,7 @@ static void show_usage(FAR const char *progname)
           "\t-r|--retry <retry>: Number of retries."
           "Will try <retry> times to transmitting, Default:100\n");
   fprintf(stderr,
-          "\t-k <size>: Use a custom size to tansfer, Default: 1kB\n");
+          "\t-k <size>: Use a custom size to transfer, Default: 1kB\n");
 
   exit(EXIT_FAILURE);
 }
@@ -353,6 +375,7 @@ int main(int argc, FAR char *argv[])
   struct ymodem_priv_s priv;
   struct ymodem_ctx_s ctx;
   FAR char *devname = NULL;
+  size_t len;
   int ret;
 
   struct option options[] =
@@ -360,16 +383,20 @@ int main(int argc, FAR char *argv[])
       {"buffersize", 1, NULL, 'b'},
       {"skip_prefix", 1, NULL, 'p'},
       {"skip_suffix", 1, NULL, 's'},
+      {"prepend_prefix", 1, NULL, 'e'},
+      {"append_suffix", 1, NULL, 'a'},
       {"threshold", 1, NULL, 't'},
       {"interval", 1, NULL, 'i'},
       {"retry", 1, NULL, 'r'},
     };
 
   memset(&priv, 0, sizeof(priv));
+  priv.prepend_prefix = "";
+  priv.append_suffix  = "";
   memset(&ctx, 0, sizeof(ctx));
   ctx.interval = 15;
   ctx.retry = 100;
-  while ((ret = getopt_long(argc, argv, "b:d:f:hk:p:s:t:i:r:",
+  while ((ret = getopt_long(argc, argv, "b:d:f:hk:p:s:t:i:r:e:a:",
                             options, NULL)) != ERROR)
     {
       switch (ret)
@@ -382,9 +409,10 @@ int main(int argc, FAR char *argv[])
             break;
           case 'f':
             priv.foldname = optarg;
-            if (priv.foldname[strlen(priv.foldname)] == '/')
+            len = strlen(priv.foldname);
+            if (len > 0 && priv.foldname[len - 1] == '/')
               {
-                priv.foldname[strlen(priv.foldname)] = '\0';
+                priv.foldname[len - 1] = '\0';
               }
 
             break;
@@ -395,11 +423,17 @@ int main(int argc, FAR char *argv[])
             ctx.custom_size = atoi(optarg) * 1024;
             break;
           case 'p':
-            priv.skip_perfix = optarg;
+            priv.skip_prefix = optarg;
             break;
           case 's':
             priv.skip_suffix = optarg;
             break;
+          case 'e':
+            priv.prepend_prefix = optarg;
+            break;
+          case 'a':
+            priv.append_suffix = optarg;
+            break;
           case 't':
             priv.threshold = atoi(optarg) * 1024;
             break;

From b7b2ba37a191a95ac7afd930feb5f7966adb849d Mon Sep 17 00:00:00 2001
From: ligd <liguiding1@xiaomi.com>
Date: Fri, 16 May 2025 16:14:41 +0800
Subject: [PATCH 097/568] timer_test: reduce the sleep time to improve testing
 efficiency

reduce the sleep time

Signed-off-by: ligd <liguiding1@xiaomi.com>
---
 .../kernel/time/cases/clock_test_timer05.c        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/testing/testsuites/kernel/time/cases/clock_test_timer05.c b/testing/testsuites/kernel/time/cases/clock_test_timer05.c
index c9903c3e3..8c282260a 100644
--- a/testing/testsuites/kernel/time/cases/clock_test_timer05.c
+++ b/testing/testsuites/kernel/time/cases/clock_test_timer05.c
@@ -112,7 +112,7 @@ void test_nuttx_clock_test_timer05(FAR void **state)
 
   /* Start the timer */
 
-  its.it_value.tv_sec = 3; /* 3, timer time 3 seconds. */
+  its.it_value.tv_sec = 1;
   its.it_value.tv_nsec = 0;
   its.it_interval.tv_sec = its.it_value.tv_sec;
   its.it_interval.tv_nsec = its.it_value.tv_nsec;
@@ -124,8 +124,8 @@ void test_nuttx_clock_test_timer05(FAR void **state)
   syslog(LOG_INFO, "timer_create %p: %d", timerid01, ret);
   assert_int_equal(ret, 0);
 
-  its.it_value.tv_sec = 4; /* 4, timer time 4 seconds. */
-  its.it_value.tv_nsec = 0;
+  its.it_value.tv_sec = 0;
+  its.it_value.tv_nsec = 50 * 1000 * 1000; /* 50ms */
   its.it_interval.tv_sec = its.it_value.tv_sec;
   its.it_interval.tv_nsec = its.it_value.tv_nsec;
 
@@ -138,12 +138,7 @@ void test_nuttx_clock_test_timer05(FAR void **state)
   syslog(LOG_INFO, "timer_settime %p: %d", timerid02, ret);
   assert_int_equal(ret, 0);
 
-  its.it_value.tv_sec = 5; /* 5, timer time 5 seconds. */
-  its.it_value.tv_nsec = 0;
-  its.it_interval.tv_sec = its.it_value.tv_sec;
-  its.it_interval.tv_nsec = its.it_value.tv_nsec;
-
-  sleep(20); /* 20, sleep seconds for timer. */
+  sleep(3);
   ret = timer_delete(timerid01);
   syslog(LOG_INFO, "timer_delete %p %d", timerid01, ret);
   assert_int_equal(ret, 0);
@@ -152,6 +147,8 @@ void test_nuttx_clock_test_timer05(FAR void **state)
   syslog(LOG_INFO, "timer_delete %p %d", timerid02, ret);
   assert_int_equal(ret, 0);
 
+  syslog(LOG_INFO, "cnt %d %d\n",
+          test_timer05_g_sighdlcnt01, test_timer05_g_sighdlcnt02);
   assert_int_not_equal(test_timer05_g_sighdlcnt01, 0);
   assert_int_not_equal(test_timer05_g_sighdlcnt02, 0);
 }

From 429f24afbdf9b21d85792cba525ebb1be0ceb58e Mon Sep 17 00:00:00 2001
From: ligd <liguiding1@xiaomi.com>
Date: Tue, 25 Mar 2025 21:31:36 +0800
Subject: [PATCH 098/568] ltp: close mq_close/4-1 testcase when open
 CONFIG_FDCHECK

Caused the cause will used after free on fd

Signed-off-by: ligd <liguiding1@xiaomi.com>
---
 testing/ltp/CMakeLists.txt | 4 ++++
 testing/ltp/Makefile       | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/testing/ltp/CMakeLists.txt b/testing/ltp/CMakeLists.txt
index 1152b8963..6f9b7effe 100644
--- a/testing/ltp/CMakeLists.txt
+++ b/testing/ltp/CMakeLists.txt
@@ -118,6 +118,10 @@ if(CONFIG_TESTING_LTP)
       ${TESTDIR}/conformance/interfaces/pthread_sigmask/4-1.c
       ${TESTDIR}/conformance/interfaces/sigprocmask/4-1.c)
 
+    if(CONFIG_FDCHECK)
+      list(APPEND BLACKSRCS ${TESTDIR}/conformance/interfaces/mq_close/4-1.c)
+    endif()
+
     if(NOT CONFIG_LIBC_LOCALTIME)
       list(APPEND BLACKSRCS
            ${TESTDIR}/conformance/definitions/time_h/34-1-buildonly.c
diff --git a/testing/ltp/Makefile b/testing/ltp/Makefile
index 1fc2c943d..99354eed6 100644
--- a/testing/ltp/Makefile
+++ b/testing/ltp/Makefile
@@ -70,6 +70,9 @@ BLACKSRCS += $(TESTDIR)/conformance/interfaces/clock_nanosleep/1-4.c
 BLACKSRCS += $(TESTDIR)/conformance/interfaces/pthread_sigmask/18-1.c
 BLACKSRCS += $(TESTDIR)/conformance/interfaces/pthread_sigmask/4-1.c
 BLACKSRCS += $(TESTDIR)/conformance/interfaces/sigprocmask/4-1.c
+ifeq ($(CONFIG_FDCHECK),y)
+BLACKSRCS += $(TESTDIR)/conformance/interfaces/mq_close/4-1.c
+endif
 ifeq ($(CONFIG_LIBC_LOCALTIME),)
 BLACKSRCS += $(TESTDIR)/conformance/definitions/time_h/34-1-buildonly.c
 BLACKSRCS += $(TESTDIR)/conformance/definitions/time_h/35-3-buildonly.c

From 680dca11215a8d1654ebc766177594ace2c10dc2 Mon Sep 17 00:00:00 2001
From: haopengxiang <haopengxiang@xiaomi.com>
Date: Thu, 27 Mar 2025 00:10:06 +0800
Subject: [PATCH 099/568] ltp: close mq_close/3-1 testcase when open
 CONFIG_FDCHECK

Caused the cause will used after free on fd

Signed-off-by: haopengxiang <haopengxiang@xiaomi.com>
Signed-off-by: ligd <liguiding1@xiaomi.com>
---
 testing/ltp/CMakeLists.txt | 3 ++-
 testing/ltp/Makefile       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/testing/ltp/CMakeLists.txt b/testing/ltp/CMakeLists.txt
index 6f9b7effe..2e458d5e4 100644
--- a/testing/ltp/CMakeLists.txt
+++ b/testing/ltp/CMakeLists.txt
@@ -119,7 +119,8 @@ if(CONFIG_TESTING_LTP)
       ${TESTDIR}/conformance/interfaces/sigprocmask/4-1.c)
 
     if(CONFIG_FDCHECK)
-      list(APPEND BLACKSRCS ${TESTDIR}/conformance/interfaces/mq_close/4-1.c)
+      list(APPEND BLACKSRCS ${TESTDIR}/conformance/interfaces/mq_close/3-1.c
+           ${TESTDIR}/conformance/interfaces/mq_close/4-1.c)
     endif()
 
     if(NOT CONFIG_LIBC_LOCALTIME)
diff --git a/testing/ltp/Makefile b/testing/ltp/Makefile
index 99354eed6..c6f712614 100644
--- a/testing/ltp/Makefile
+++ b/testing/ltp/Makefile
@@ -71,6 +71,7 @@ BLACKSRCS += $(TESTDIR)/conformance/interfaces/pthread_sigmask/18-1.c
 BLACKSRCS += $(TESTDIR)/conformance/interfaces/pthread_sigmask/4-1.c
 BLACKSRCS += $(TESTDIR)/conformance/interfaces/sigprocmask/4-1.c
 ifeq ($(CONFIG_FDCHECK),y)
+BLACKSRCS += $(TESTDIR)/conformance/interfaces/mq_close/3-1.c
 BLACKSRCS += $(TESTDIR)/conformance/interfaces/mq_close/4-1.c
 endif
 ifeq ($(CONFIG_LIBC_LOCALTIME),)
@@ -247,7 +248,7 @@ ltp-$(LTPS_VERSION).zip:
 	$(call DOWNLOAD,$(LTP_DOWNLOAD_URL),$(LTPS_VERSION).zip, ltp.zip)
 
 $(LTP_UNPACK): ltp-$(LTPS_VERSION).zip
-	$(Q) echo "dowload $(LTP_DOWNLOAD_URL)$(LTPS_VERSION).zip"
+	$(Q) echo "download $(LTP_DOWNLOAD_URL)$(LTPS_VERSION).zip"
 	$(Q) unzip -o ltp.zip
 	$(Q) rm -f ltp.zip
 	$(Q) mv ltp-$(LTPS_VERSION) $(LTP_UNPACK)

From af8ff17f9597cc7581acd6475a56a0fea7e237af Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Wed, 17 Sep 2025 11:18:17 +0800
Subject: [PATCH 100/568] netlib: fixed compilation issues

fixed compilation issues

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 include/netutils/netlib.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 43febfcda..2b3146e91 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -56,6 +56,11 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netconfig.h>
 
+#ifdef CONFIG_NET_IPTABLES
+#  include <nuttx/net/netfilter/ip_tables.h>
+#  include <nuttx/net/netfilter/ip6_tables.h>
+#endif
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/

From 58c2473b38c02888c3e4e14c6dcf31cdae05e949 Mon Sep 17 00:00:00 2001
From: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
Date: Wed, 30 Oct 2024 20:32:53 +0800
Subject: [PATCH 101/568] apps/testing: nvs testcases support remove align size

mtd/nvs removes CONFIG_MTD_WRITE_ALIGN_SIZE,
testcases need to be modified meanwhile

Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
---
 .../mtd_config_fs/mtd_config_fs_test_main.c   | 376 ++++++++++--------
 1 file changed, 219 insertions(+), 157 deletions(-)

diff --git a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index 5c44a6a1d..fdc254afa 100644
--- a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
@@ -49,9 +49,11 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+#define NVS_ATE(name, size) \
+  char name##_buf[size]; \
+  FAR struct nvs_ate *name = (FAR struct nvs_ate *)name##_buf
+
 /* Configuration ************************************************************/
-#define NVS_ALIGN_SIZE                  CONFIG_MTD_WRITE_ALIGN_SIZE
-#define NVS_ALIGN_UP(x)                 (((x) + NVS_ALIGN_SIZE - 1) & ~(NVS_ALIGN_SIZE - 1))
 
 #define TEST_KEY1       "testkey1"
 #define TEST_KEY2       "testkey2"
@@ -72,15 +74,7 @@ begin_packed_struct struct nvs_ate
   uint16_t key_len;      /* Key string len */
   uint8_t  part;         /* Part of a multipart data - future extension */
   uint8_t  crc8;         /* Crc8 check of the ate entry */
-#if CONFIG_MTD_WRITE_ALIGN_SIZE <= 4
-  /* stay compatible with situation which align byte be 1 */
-
-  uint8_t  expired[NVS_ALIGN_SIZE];
-  uint8_t  reserved[4 - NVS_ALIGN_SIZE];
-#else
-  uint8_t  padding[NVS_ALIGN_UP(12) - 12];
-  uint8_t  expired[NVS_ALIGN_SIZE];
-#endif
+  uint8_t  expired[0];
 } end_packed_struct;
 
 /* Pre-allocated simulated flash */
@@ -92,12 +86,38 @@ struct mtdnvs_ctx_s
   struct mallinfo mmprevious;
   struct mallinfo mmafter;
   uint8_t         erasestate;
+  uint32_t        progsize;
 };
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: nvs_align_up
+ ****************************************************************************/
+
+static inline size_t nvs_align_up(FAR struct mtdnvs_ctx_s *ctx, size_t len)
+{
+  return (len + (ctx->progsize - 1)) & ~(ctx->progsize - 1);
+}
+
+/****************************************************************************
+ * Name: nvs_ate_size
+ ****************************************************************************/
+
+static inline size_t nvs_ate_size(FAR struct mtdnvs_ctx_s *ctx)
+{
+  /* Stay compatible with situation which align byte be 1 */
+
+  if (ctx->progsize == 1)
+    {
+      return sizeof(struct nvs_ate) + 4;
+    }
+
+  return nvs_align_up(ctx, sizeof(struct nvs_ate)) + ctx->progsize;
+}
+
 /****************************************************************************
  * Name: fnv_hash_32
  ****************************************************************************/
@@ -137,81 +157,156 @@ static void fill_crc8_update(FAR struct nvs_ate *entry)
 }
 
 /****************************************************************************
- * Name: fill_gc_done_ate
+ * Name: write_corrupted_close_ate
  ****************************************************************************/
 
-static void fill_corrupted_close_ate(FAR struct mtdnvs_ctx_s *ctx,
-                                     FAR struct nvs_ate *close_ate)
+static int write_corrupted_close_ate(int mtd_fd,
+                                     FAR struct mtdnvs_ctx_s *ctx)
 {
-  memset((FAR void *)close_ate, ctx->erasestate,
-    sizeof(struct nvs_ate));
+  size_t ate_size = nvs_ate_size(ctx);
+  NVS_ATE(close_ate, ate_size);
+  int ret;
+
+  memset(close_ate, ctx->erasestate, ate_size);
   close_ate->id = 0xffffffff;
   close_ate->len = 0U;
+
+  ret = write(mtd_fd, &close_ate, ate_size);
+  if (ret != ate_size)
+    {
+      goto write_fail;
+    }
+
+  return 0;
+
+write_fail:
+  printf("%s:write corrupted_close_ate failed, ret=%d\n", __func__, ret);
+  return -EIO;
 }
 
 /****************************************************************************
- * Name: fill_close_ate
+ * Name: write_close_ate
  ****************************************************************************/
 
-static void fill_close_ate(FAR struct mtdnvs_ctx_s *ctx,
-                           FAR struct nvs_ate *close_ate, int offset)
+static int write_close_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx,
+                           int offset)
 {
-  memset((FAR void *)close_ate, ctx->erasestate,
-    sizeof(struct nvs_ate));
+  size_t ate_size = nvs_ate_size(ctx);
+  NVS_ATE(close_ate, ate_size);
+  int ret;
+
+  memset(close_ate, ctx->erasestate, ate_size);
   close_ate->id = 0xffffffff;
   close_ate->len = 0U;
   close_ate->offset = offset;
   fill_crc8_update(close_ate);
+
+  ret = write(mtd_fd, &close_ate, ate_size);
+  if (ret != ate_size)
+    {
+      goto write_fail;
+    }
+
+  return 0;
+
+write_fail:
+  printf("%s:write close_ate failed, ret=%d\n", __func__, ret);
+  return -EIO;
 }
 
 /****************************************************************************
- * Name: fill_gc_done_ate
+ * Name: write_gc_done_ate
  ****************************************************************************/
 
-static void fill_gc_done_ate(FAR struct mtdnvs_ctx_s *ctx,
-                             FAR struct nvs_ate *gc_done_ate)
+static int write_gc_done_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx)
 {
-  memset((FAR void *)gc_done_ate, ctx->erasestate,
-    sizeof(struct nvs_ate));
+  size_t ate_size = nvs_ate_size(ctx);
+  NVS_ATE(gc_done_ate, ate_size);
+  int ret;
+
+  memset(gc_done_ate, ctx->erasestate, ate_size);
   gc_done_ate->id = 0xffffffff;
   gc_done_ate->len = 0U;
   fill_crc8_update(gc_done_ate);
+
+  ret = write(mtd_fd, &gc_done_ate, ate_size);
+  if (ret != ate_size)
+    {
+      goto write_fail;
+    }
+
+  return 0;
+
+write_fail:
+  printf("%s:write gc_done_ate failed, ret=%d\n", __func__, ret);
+  return -EIO;
 }
 
 /****************************************************************************
- * Name: fill_ate
+ * Name: write_ate
  ****************************************************************************/
 
-static void fill_ate(FAR struct mtdnvs_ctx_s *ctx, FAR struct nvs_ate *ate,
+static int write_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx,
                      FAR const char *key, uint16_t len, uint16_t offset,
                      bool expired)
 {
-  memset((FAR void *)ate, ctx->erasestate,
-    sizeof(struct nvs_ate));
+  size_t ate_size = nvs_ate_size(ctx);
+  NVS_ATE(ate, ate_size);
+  int ret;
+
+  memset(ate, ctx->erasestate, ate_size);
   ate->id = nvs_fnv_hash((FAR const uint8_t *)key, strlen(key) + 1)
     % 0xfffffffd + 1;
   ate->len = len;
   ate->offset = offset;
   ate->key_len = strlen(key) + 1;
   fill_crc8_update(ate);
-  ate->expired[0] = expired ? 0x7f : 0xff;
+  ate->expired[nvs_align_up(ctx, sizeof(struct nvs_ate))]
+    = expired ? 0x7f : 0xff;
+
+  ret = write(mtd_fd, ate, ate_size);
+  if (ret != ate_size)
+    {
+      goto write_fail;
+    }
+
+  return 0;
+
+write_fail:
+  printf("%s:write ate failed, ret=%d\n", __func__, ret);
+  return -EIO;
 }
 
 /****************************************************************************
- * Name: fill_corrupted_ate
+ * Name: write_corrupted_ate
  ****************************************************************************/
 
-static void fill_corrupted_ate(FAR struct mtdnvs_ctx_s *ctx,
-                               FAR struct nvs_ate *ate, FAR const char *key,
+static int write_corrupted_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx,
+                               FAR const char *key,
                                uint16_t len, uint16_t offset)
 {
-  memset((FAR void *)ate, ctx->erasestate,
-    sizeof(struct nvs_ate));
+  size_t ate_size = nvs_ate_size(ctx);
+  NVS_ATE(ate, ate_size);
+  int ret;
+
+  memset(ate, ctx->erasestate, ate_size);
   ate->id = nvs_fnv_hash((FAR const uint8_t *)key, strlen(key) + 1)
     % 0xfffffffd + 1;
   ate->len = len;
   ate->offset = offset;
   ate->key_len = strlen(key) + 1;
+
+  ret = write(mtd_fd, &ate, ate_size);
+  if (ret != ate_size)
+    {
+      goto write_fail;
+    }
+
+  return 0;
+
+write_fail:
+  printf("%s:write corrupted_ate failed, ret=%d\n", __func__, ret);
+  return -EIO;
 }
 
 /****************************************************************************
@@ -303,6 +398,7 @@ extern int find_mtddriver(FAR const char *pathname,
 
 static int setup(struct mtdnvs_ctx_s *ctx)
 {
+  struct mtd_geometry_s geo;
   int ret;
   FAR struct inode *sys_node;
 
@@ -323,6 +419,16 @@ static int setup(struct mtdnvs_ctx_s *ctx)
       return ret;
     }
 
+  ret = MTD_IOCTL(sys_node->u.i_mtd, MTDIOC_GEOMETRY,
+                 (unsigned long)((uintptr_t)&(geo)));
+  if (ret < 0)
+    {
+      printf("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+      return ret;
+    }
+
+  ctx->progsize = geo.blocksize;
+
   ret = mtdconfig_register(sys_node->u.i_mtd);
   if (ret < 0)
     {
@@ -490,15 +596,15 @@ test_fail:
 
 static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
 {
-  struct nvs_ate ate;
+  uint8_t erase_value = ctx->erasestate;
+  size_t ate_size = nvs_ate_size(ctx);
+  struct config_data_s data;
+  size_t padding_size;
+  char rd_buf[50];
   int mtd_fd = -1;
   int nvs_fd = -1;
   int ret;
   int i;
-  uint8_t erase_value = ctx->erasestate;
-  struct config_data_s data;
-  char rd_buf[50];
-  size_t padding_size;
 
   printf("%s: test begin\n", __func__);
 
@@ -525,8 +631,8 @@ static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
       goto test_fail;
     }
 
-  padding_size = NVS_ALIGN_UP(sizeof(TEST_KEY1) + sizeof(TEST_DATA1))
-                - sizeof(TEST_KEY1) - sizeof(TEST_DATA1);
+  padding_size = nvs_align_up(ctx, sizeof(TEST_KEY1) + sizeof(TEST_DATA1))
+    - sizeof(TEST_KEY1) - sizeof(TEST_DATA1);
   for (i = 0; i < padding_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -557,7 +663,7 @@ static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
 
   for (i = 2 * (strlen(TEST_KEY1) + strlen(TEST_DATA1) + 2) + padding_size;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 4 * sizeof(struct nvs_ate); i++)
+        - 4 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -569,42 +675,34 @@ static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
 
   /* Write ate */
 
-  fill_ate(ctx, &ate, TEST_KEY1, strlen(TEST_DATA2) + 1,
+  ret = write_ate(mtd_fd, ctx, TEST_KEY1, strlen(TEST_DATA2) + 1,
     strlen(TEST_KEY1) + strlen(TEST_DATA1) + 2 + padding_size, false);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  if (ret < 0)
     {
-      printf("%s:write ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
-  fill_ate(ctx, &ate, TEST_KEY1, strlen(TEST_DATA1) + 1, 0, false);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_ate(mtd_fd, ctx, TEST_KEY1, strlen(TEST_DATA1) + 1, 0, false);
+  if (ret < 0)
     {
-      printf("%s:write ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   /* write gc_done ate */
 
-  fill_gc_done_ate(ctx, &ate);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_gc_done_ate(mtd_fd, ctx);
+  if (ret < 0)
     {
-      printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   /* write close ate, mark section 0 as closed */
 
-  fill_close_ate(ctx, &ate,
+  ret = write_close_ate(mtd_fd, ctx,
     CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-    - 4 * sizeof(struct nvs_ate));
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+    - 4 * ate_size);
+  if (ret < 0)
     {
-      printf("%s:write close ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
@@ -695,7 +793,6 @@ static void test_nvs_corrupted_write(struct mtdnvs_ctx_s *ctx)
   int nvs_fd = -1;
   int i;
   uint8_t erase_value = ctx->erasestate;
-  struct nvs_ate ate;
   struct config_data_s data;
   size_t padding_size;
 
@@ -726,8 +823,8 @@ static void test_nvs_corrupted_write(struct mtdnvs_ctx_s *ctx)
       goto test_fail;
     }
 
-  padding_size = NVS_ALIGN_UP(sizeof(key1) + sizeof(wr_buf_1))
-                - sizeof(key1) - sizeof(wr_buf_1);
+  padding_size = nvs_align_up(ctx, sizeof(key1) + sizeof(wr_buf_1))
+    - sizeof(key1) - sizeof(wr_buf_1);
   for (i = 0; i < padding_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -758,7 +855,7 @@ static void test_nvs_corrupted_write(struct mtdnvs_ctx_s *ctx)
 
   for (i = 2 * (sizeof(key1) + sizeof(wr_buf_1)) + padding_size;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 3 * sizeof(struct nvs_ate); i++)
+        - 3 * nvs_ate_size(ctx); i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -770,21 +867,17 @@ static void test_nvs_corrupted_write(struct mtdnvs_ctx_s *ctx)
 
   /* write ate */
 
-  fill_ate(ctx, &ate, key1, sizeof(wr_buf_1), 0, false);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_ate(mtd_fd, ctx, key1, sizeof(wr_buf_1), 0, false);
+  if (ret < 0)
     {
-      printf("%s:write ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   /* write gc_done ate */
 
-  fill_gc_done_ate(ctx, &ate);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_gc_done_ate(mtd_fd, ctx);
+  if (ret < 0)
     {
-      printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
@@ -859,6 +952,7 @@ test_fail:
 
 static void test_nvs_gc(struct mtdnvs_ctx_s *ctx)
 {
+  size_t ate_size = nvs_ate_size(ctx);
   int ret;
   int fd = -1;
   uint8_t buf[44];
@@ -870,10 +964,9 @@ static void test_nvs_gc(struct mtdnvs_ctx_s *ctx)
 
   /* max_writes will trigger GC. */
 
-  size_t kv_size = NVS_ALIGN_UP(44 + 4) + sizeof(struct nvs_ate);
+  size_t kv_size = nvs_align_up(ctx, 44 + 4) + ate_size;
   size_t block_max_write_size =
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-    - sizeof(struct nvs_ate);
+    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE - ate_size;
   uint16_t block_max_write_nums = block_max_write_size / kv_size;
 
   const uint16_t max_writes = block_max_write_nums + 1;
@@ -1044,9 +1137,9 @@ static int write_content(uint16_t max_id, uint16_t begin, uint16_t end)
   for (i = begin; i < end; i++)
     {
       uint8_t id = (i % max_id);
-      uint8_t id_data = id + max_id * (i / max_id);
-
-      memset(buf, id_data, sizeof(buf));
+      memset(buf, 0, sizeof(buf));
+      buf[43] = i & 0xff;
+      buf[42] = i >> 8;
 
       /* 4 byte key */
 
@@ -1082,7 +1175,6 @@ test_fail:
 static int check_content(uint16_t max_id)
 {
   uint8_t rd_buf[44];
-  uint8_t buf[44];
   int fd = -1;
   int ret;
   struct config_data_s data;
@@ -1110,13 +1202,7 @@ static int check_content(uint16_t max_id)
           goto test_fail;
         }
 
-      for (uint16_t i = 0; i < sizeof(rd_buf); i++)
-        {
-          rd_buf[i] = rd_buf[i] % max_id;
-          buf[i] = id;
-        }
-
-      if (memcmp(buf, rd_buf, sizeof(rd_buf)) != 0)
+      if (((rd_buf[42] << 8) | rd_buf[43]) % max_id != id)
         {
           printf("RD buff should be equal to the WR buff\n");
           goto test_fail;
@@ -1142,17 +1228,16 @@ test_fail:
 
 static void test_nvs_gc_3sectors(struct mtdnvs_ctx_s *ctx)
 {
+  size_t ate_size = nvs_ate_size(ctx);
   int ret;
 
   /* max_writes will trigger GC */
 
-  size_t kv_size = NVS_ALIGN_UP(44 + 4) + sizeof(struct nvs_ate);
-  size_t block_max_write_size =
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-    - sizeof(struct nvs_ate);
-  uint16_t max_id = block_max_write_size / kv_size;
-
-  const uint16_t max_writes = max_id + 1;
+  size_t kv_size = nvs_align_up(ctx, 44 + 4) + ate_size;
+  uint16_t max_id =
+    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / kv_size;
+  const uint16_t max_writes =
+    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE * 2 / kv_size + 1;
   const uint16_t max_writes_2 = max_writes + max_id;
   const uint16_t max_writes_3 = max_writes_2 + max_id;
   const uint16_t max_writes_4 = max_writes_3 + max_id;
@@ -1336,16 +1421,16 @@ test_fail:
 
 static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
 {
+  size_t ate_size = nvs_ate_size(ctx);
   int ret;
   char key1[] = TEST_KEY1;
-  uint8_t rd_buf[NVS_ALIGN_UP(512) - sizeof(key1)];
-  uint8_t wr_buf[NVS_ALIGN_UP(512) - sizeof(key1)];
+  uint8_t wr_buf[nvs_align_up(ctx, 512) - sizeof(key1)];
+  uint8_t rd_buf[sizeof(wr_buf)];
   int mtd_fd = -1;
   int nvs_fd = -1;
   int loop_section;
   int i;
   uint8_t erase_value = ctx->erasestate;
-  struct nvs_ate ate;
   struct config_data_s data;
 
   printf("%s: test begin\n", __func__);
@@ -1390,7 +1475,7 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
 
       for (i = 2 * (sizeof(key1) + sizeof(wr_buf));
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 4 * sizeof(struct nvs_ate); i++)
+        - 4 * ate_size; i++)
         {
           ret = write(mtd_fd, &erase_value, sizeof(erase_value));
           if (ret != sizeof(erase_value))
@@ -1402,52 +1487,44 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
 
       /* write ate 2 times */
 
-      fill_ate(ctx, &ate, key1, sizeof(wr_buf),
+      ret = write_ate(mtd_fd, ctx, key1, sizeof(wr_buf),
         sizeof(wr_buf) + sizeof(key1),
         (loop_section ==
         CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_COUNT - 2)
         ? false : true);
-      ret = write(mtd_fd, &ate, sizeof(ate));
-      if (ret != sizeof(ate))
+      if (ret < 0)
         {
-          printf("%s:write ate failed, ret=%d\n", __func__, ret);
           goto test_fail;
         }
 
-      fill_ate(ctx, &ate, key1, sizeof(wr_buf), 0, true);
-      ret = write(mtd_fd, &ate, sizeof(ate));
-      if (ret != sizeof(ate))
+      ret = write_ate(mtd_fd, ctx, key1, sizeof(wr_buf), 0, true);
+      if (ret < 0)
         {
-          printf("%s:write ate failed, ret=%d\n", __func__, ret);
           goto test_fail;
         }
 
       /* write gc_done ate */
 
-      fill_gc_done_ate(ctx, &ate);
-      ret = write(mtd_fd, &ate, sizeof(ate));
-      if (ret != sizeof(ate))
+      ret = write_gc_done_ate(mtd_fd, ctx);
+      if (ret < 0)
         {
-          printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
           goto test_fail;
         }
 
       if (loop_section ==
         CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_COUNT - 2)
         {
-          fill_corrupted_close_ate(ctx, &ate);
+          ret  = write_corrupted_close_ate(mtd_fd, ctx);
         }
       else
         {
-          fill_close_ate(ctx, &ate,
+          ret = write_close_ate(mtd_fd, ctx,
             CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-            - 4 * sizeof(struct nvs_ate));
+            - 4 * ate_size);
         }
 
-      ret =  write(mtd_fd, &ate, sizeof(ate));
-      if (ret != sizeof(ate))
+      if (ret < 0)
         {
-          printf("%s:write close ate failed, ret=%d\n", __func__, ret);
           goto test_fail;
         }
     }
@@ -1699,8 +1776,7 @@ test_fail:
 
 static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 {
-  struct nvs_ate ate;
-  struct nvs_ate close_ate;
+  size_t ate_size = nvs_ate_size(ctx);
   int mtd_fd = -1;
   int nvs_fd = -1;
   int ret;
@@ -1738,7 +1814,7 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   for (i = strlen(TEST_KEY1) + strlen(TEST_DATA1) + 2;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 6 * sizeof(struct nvs_ate); i++)
+        - 6 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -1750,20 +1826,18 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   /* Write valid ate at -6 */
 
-  fill_ate(ctx, &ate, TEST_KEY1, strlen(TEST_DATA1) + 1, 0, false);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_ate(mtd_fd, ctx, TEST_KEY1, strlen(TEST_DATA1) + 1, 0, false);
+  if (ret < 0)
     {
-      printf("%s:write ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   /* set unused flash to 0xff */
 
   for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 5 * sizeof(struct nvs_ate);
+        - 5 * ate_size;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 2 * sizeof(struct nvs_ate); i++)
+        - 2 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -1775,21 +1849,17 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   /* write gc_done ate */
 
-  fill_gc_done_ate(ctx, &ate);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_gc_done_ate(mtd_fd, ctx);
+  if (ret < 0)
     {
-      printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   /* write invalid close ate, mark section 0 as closed */
 
-  fill_corrupted_close_ate(ctx, &close_ate);
-  ret = write(mtd_fd, &close_ate, sizeof(close_ate));
-  if (ret != sizeof(ate))
+  ret = write_corrupted_close_ate(mtd_fd, ctx);
+  if (ret < 0)
     {
-      printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
@@ -1797,7 +1867,7 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - sizeof(struct nvs_ate); i++)
+        - ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -1809,9 +1879,8 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   /* write invalid close ate, mark section 1 as closed */
 
-  fill_corrupted_close_ate(ctx, &close_ate);
-  ret = write(mtd_fd, &close_ate, sizeof(close_ate));
-  if (ret != sizeof(ate))
+  ret = write_corrupted_close_ate(mtd_fd, ctx);
+  if (ret < 0)
     {
       printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
@@ -1887,8 +1956,7 @@ test_fail:
 
 static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 {
-  struct nvs_ate ate;
-  struct nvs_ate close_ate;
+  size_t ate_size = nvs_ate_size(ctx);
   int mtd_fd = -1;
   int ret;
   int i;
@@ -1896,8 +1964,6 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   printf("%s: test begin\n", __func__);
 
-  fill_corrupted_ate(ctx, &ate, TEST_KEY1, 10, 0);
-
   mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, O_RDWR);
   if (mtd_fd < 0)
     {
@@ -1920,17 +1986,16 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   /* Write invalid ate */
 
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_corrupted_ate(mtd_fd, ctx, TEST_KEY1, 10, 0);
+  if (ret < 0)
     {
-      printf("%s:write ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2
-        + sizeof(struct nvs_ate);
+        + ate_size;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - 2 * sizeof(struct nvs_ate); i++)
+        - 2 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -1942,20 +2007,17 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   /* write gc_done ate */
 
-  fill_gc_done_ate(ctx, &ate);
-  ret = write(mtd_fd, &ate, sizeof(ate));
-  if (ret != sizeof(ate))
+  ret = write_gc_done_ate(mtd_fd, ctx);
+  if (ret < 0)
     {
-      printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   /* write close ate, mark section 0 as closed */
 
-  fill_close_ate(ctx, &close_ate,
+  ret = write_close_ate(mtd_fd, ctx,
     CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2);
-  ret = write(mtd_fd, &close_ate, sizeof(close_ate));
-  if (ret != sizeof(ate))
+  if (ret < 0)
     {
       printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
@@ -1965,7 +2027,7 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE;
         i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
-        - sizeof(struct nvs_ate); i++)
+        - ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -1977,8 +2039,9 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   /* write close ate, mark section 1 as closed */
 
-  ret = write(mtd_fd, &close_ate, sizeof(close_ate));
-  if (ret != sizeof(ate))
+  ret = write_close_ate(mtd_fd, ctx,
+    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2);
+  if (ret < 0)
     {
       printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
       goto test_fail;
@@ -2573,4 +2636,3 @@ int main(int argc, FAR char *argv[])
   free(ctx);
   return 0;
 }
-

From 32facd5b3ae3357f71885fd56e65f528db32c223 Mon Sep 17 00:00:00 2001
From: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
Date: Thu, 12 Dec 2024 19:25:15 +0800
Subject: [PATCH 102/568] mtd/nvs: testcases fit the situation where erasestate
 is 0

Special_id dynamically adjusts based on erase value

Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
---
 testing/fs/mtd_config_fs/mtd_config_fs_test_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index fdc254afa..914a16f61 100644
--- a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
@@ -168,7 +168,7 @@ static int write_corrupted_close_ate(int mtd_fd,
   int ret;
 
   memset(close_ate, ctx->erasestate, ate_size);
-  close_ate->id = 0xffffffff;
+  close_ate->id = ctx->erasestate;
   close_ate->len = 0U;
 
   ret = write(mtd_fd, &close_ate, ate_size);
@@ -196,7 +196,7 @@ static int write_close_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx,
   int ret;
 
   memset(close_ate, ctx->erasestate, ate_size);
-  close_ate->id = 0xffffffff;
+  close_ate->id = ctx->erasestate;
   close_ate->len = 0U;
   close_ate->offset = offset;
   fill_crc8_update(close_ate);
@@ -225,7 +225,7 @@ static int write_gc_done_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx)
   int ret;
 
   memset(gc_done_ate, ctx->erasestate, ate_size);
-  gc_done_ate->id = 0xffffffff;
+  gc_done_ate->id = ctx->erasestate;
   gc_done_ate->len = 0U;
   fill_crc8_update(gc_done_ate);
 
@@ -261,8 +261,8 @@ static int write_ate(int mtd_fd, FAR struct mtdnvs_ctx_s *ctx,
   ate->offset = offset;
   ate->key_len = strlen(key) + 1;
   fill_crc8_update(ate);
-  ate->expired[nvs_align_up(ctx, sizeof(struct nvs_ate))]
-    = expired ? 0x7f : 0xff;
+  ate->expired[nvs_align_up(ctx, sizeof(ate)) - sizeof(ate)]
+    = expired ? ~ctx->erasestate : ctx->erasestate;
 
   ret = write(mtd_fd, ate, ate_size);
   if (ret != ate_size)

From 26fcdbd9adf8b48cf3978c4adc20d92501365c46 Mon Sep 17 00:00:00 2001
From: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
Date: Tue, 13 Jan 2026 01:39:17 +0800
Subject: [PATCH 103/568] mtdconfig/nvs: fix typo error in nvs testcase

such as: 2st->2nd, 3st->3rd and so on

Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
---
 .../mtd_config_fs/mtd_config_fs_test_main.c   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index 914a16f61..16ed4cb7e 100644
--- a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
@@ -1293,35 +1293,35 @@ static void test_nvs_gc_3sectors(struct mtdnvs_ctx_s *ctx)
   ret = write_content(max_id, max_writes, max_writes_2);
   if (ret < 0)
     {
-      printf("%s:2st GC write failed, ret=%d\n", __func__, ret);
+      printf("%s:2nd GC write failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = check_content(max_id);
   if (ret < 0)
     {
-      printf("%s:2st GC check failed, ret=%d\n", __func__, ret);
+      printf("%s:2nd GC check failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = mtdconfig_unregister();
   if (ret < 0)
     {
-      printf("%s:2st mtdconfig_unregister failed, ret=%d\n", __func__, ret);
+      printf("%s:2nd mtdconfig_unregister failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = setup(ctx);
   if (ret < 0)
     {
-      printf("%s:2st setup failed, ret=%d\n", __func__, ret);
+      printf("%s:2nd setup failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = check_content(max_id);
   if (ret < 0)
     {
-      printf("%s:2st GC check failed, ret=%d\n", __func__, ret);
+      printf("%s:2nd GC check failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
@@ -1330,35 +1330,35 @@ static void test_nvs_gc_3sectors(struct mtdnvs_ctx_s *ctx)
   ret = write_content(max_id, max_writes_2, max_writes_3);
   if (ret < 0)
     {
-      printf("%s:3st GC write failed, ret=%d\n", __func__, ret);
+      printf("%s:3rd GC write failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = check_content(max_id);
   if (ret < 0)
     {
-      printf("%s:3st GC check failed, ret=%d\n", __func__, ret);
+      printf("%s:3rd GC check failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = mtdconfig_unregister();
   if (ret < 0)
     {
-      printf("%s:3st mtdconfig_unregister failed, ret=%d\n", __func__, ret);
+      printf("%s:3rd mtdconfig_unregister failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = setup(ctx);
   if (ret < 0)
     {
-      printf("%s:3st setup failed, ret=%d\n", __func__, ret);
+      printf("%s:3rd setup failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
   ret = check_content(max_id);
   if (ret < 0)
     {
-      printf("%s:3st GC check failed, ret=%d\n", __func__, ret);
+      printf("%s:3rd GC check failed, ret=%d\n", __func__, ret);
       goto test_fail;
     }
 
@@ -2471,7 +2471,7 @@ static void test_nvs_gc_not_touched_expired_ate(struct mtdnvs_ctx_s *ctx)
       goto test_fail;
     }
 
-  /* Now udpate A again.
+  /* Now update A again.
    * We should trigger gc for once, and we won't need to search for
    * the old one again after gc.
    */
@@ -2576,7 +2576,7 @@ int main(int argc, FAR char *argv[])
   ctx = malloc(sizeof(struct mtdnvs_ctx_s));
   if (ctx == NULL)
     {
-      printf("malloc ctx feild,exit!\n");
+      printf("malloc ctx field, exit!\n");
       exit(1);
     }
 

From 60d814efa2534630aa9d9b3a0c9454985845e40d Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Wed, 14 Jan 2026 23:23:03 +0800
Subject: [PATCH 104/568] sched/signal: Add support to disable partial or all
 signals

  Fix dependency issue when signals are partially or fully enabled

Co-authored-by: guoshichao <guoshichao@xiaomi.com>
Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 examples/buttons/buttons_main.c   |  2 ++
 examples/chrono/chrono_main.c     |  2 ++
 netutils/dhcpc/dhcpc.c            | 16 +++++++++++++++
 netutils/dhcpd/dhcpd.c            |  7 ++++++-
 netutils/ping/icmp_ping.c         |  4 ++++
 netutils/telnetd/telnetd_daemon.c |  6 +++---
 nshlib/nsh_builtin.c              | 23 +++++++++++++++------
 nshlib/nsh_proccmds.c             |  6 ++++++
 system/cu/cu_main.c               |  8 ++++++--
 testing/ostest/ostest_main.c      | 34 ++++++++++++++++++-------------
 10 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/examples/buttons/buttons_main.c b/examples/buttons/buttons_main.c
index d4b36431c..13d4b080a 100644
--- a/examples/buttons/buttons_main.c
+++ b/examples/buttons/buttons_main.c
@@ -219,9 +219,11 @@ static int button_daemon(int argc, char *argv[])
       goto errout_with_fd;
     }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* Ignore the default signal action */
 
   signal(CONFIG_EXAMPLES_BUTTONS_SIGNO, SIG_IGN);
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 #endif
 
   /* Now loop forever, waiting BUTTONs events */
diff --git a/examples/chrono/chrono_main.c b/examples/chrono/chrono_main.c
index ee6658591..9ce5dbb58 100644
--- a/examples/chrono/chrono_main.c
+++ b/examples/chrono/chrono_main.c
@@ -165,9 +165,11 @@ static int chrono_daemon(int argc, char *argv[])
       goto errout_with_fd;
     }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* Ignore the default signal action */
 
   signal(BUTTON_SIGNO, SIG_IGN);
+#endif
 
   /* Now loop forever, waiting BUTTONs events */
 
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index dc6b46230..003d7d8cb 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -533,8 +533,16 @@ static void *dhcpc_run(void *args)
   struct dhcpc_state result;
   int ret;
 
+#ifndef CONFIG_ENABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   while (1)
     {
+#ifndef CONFIG_ENABLE_ALL_SIGNALS
+      pthread_testcancel();
+#endif
       ret = dhcpc_request(pdhcpc, &result);
       if (ret == OK)
         {
@@ -701,7 +709,9 @@ void dhcpc_close(FAR void *handle)
 void dhcpc_cancel(FAR void *handle)
 {
   struct dhcpc_state_s *pdhcpc = (struct dhcpc_state_s *)handle;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   sighandler_t old;
+#endif
   int ret;
 
   if (pdhcpc)
@@ -710,6 +720,7 @@ void dhcpc_cancel(FAR void *handle)
 
       if (pdhcpc->thread)
         {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
           old = signal(SIGQUIT, SIG_IGN);
 
           /* Signal the dhcpc_run */
@@ -719,6 +730,9 @@ void dhcpc_cancel(FAR void *handle)
             {
               nerr("ERROR: pthread_kill DHCPC thread\n");
             }
+#else
+          pthread_cancel(pdhcpc->thread);
+#endif
 
           /* Wait for the end of dhcpc_run */
 
@@ -729,7 +743,9 @@ void dhcpc_cancel(FAR void *handle)
             }
 
           pdhcpc->thread = 0;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
           signal(SIGQUIT, old);
+#endif
         }
     }
 }
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index 558991c22..a382709a2 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -1555,6 +1555,7 @@ static pid_t dhcpd_get_pid(void)
  *
  ****************************************************************************/
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 static void
 dhcpd_signal_handler(int signo, FAR siginfo_t *info, FAR void *ctx)
 {
@@ -1562,6 +1563,7 @@ dhcpd_signal_handler(int signo, FAR siginfo_t *info, FAR void *ctx)
 
   g_dhcpd_daemon.ds_state = DHCPD_STOP_REQUESTED;
 }
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -1573,7 +1575,9 @@ dhcpd_signal_handler(int signo, FAR siginfo_t *info, FAR void *ctx)
 
 int dhcpd_run(FAR const char *interface)
 {
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   struct sigaction act;
+#endif
   int sockfd = -1;
   int nbytes;
 
@@ -1602,11 +1606,12 @@ int dhcpd_run(FAR const char *interface)
 
   /* Install signal handler for CONFIG_NETUTILS_DHCPD_SIGWAKEUP */
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   memset(&act, 0, sizeof(act));
   act.sa_sigaction = dhcpd_signal_handler;
   act.sa_flags = SA_SIGINFO;
   sigaction(CONFIG_NETUTILS_DHCPD_SIGWAKEUP, &act, NULL);
-
+#endif
   /* Indicate that we have started */
 
   g_dhcpd_daemon.ds_state = DHCPD_RUNNING;
diff --git a/netutils/ping/icmp_ping.c b/netutils/ping/icmp_ping.c
index 7aa1d3973..55db84854 100644
--- a/netutils/ping/icmp_ping.c
+++ b/netutils/ping/icmp_ping.c
@@ -91,6 +91,7 @@ static volatile bool g_exiting;
  * Private Functions
  ****************************************************************************/
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 /****************************************************************************
  * Name: sigexit
  ****************************************************************************/
@@ -99,6 +100,7 @@ static void sigexit(int signo)
 {
   g_exiting = true;
 }
+#endif
 
 /****************************************************************************
  * Name: ping_newid
@@ -199,7 +201,9 @@ void icmp_ping(FAR const struct ping_info_s *info)
   int i;
 
   g_exiting = false;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   signal(SIGINT, sigexit);
+#endif
 
   /* Initialize result structure */
 
diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c
index ed02b1569..989de34f9 100644
--- a/netutils/telnetd/telnetd_daemon.c
+++ b/netutils/telnetd/telnetd_daemon.c
@@ -74,7 +74,7 @@ int telnetd_daemon(FAR const struct telnetd_config_s *config)
 #endif
   } addr;
 
-#ifdef CONFIG_SCHED_HAVE_PARENT
+#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_ENABLE_ALL_SIGNALS)
   struct sigaction sa;
   sigset_t blockset;
 #endif
@@ -85,7 +85,7 @@ int telnetd_daemon(FAR const struct telnetd_config_s *config)
   int optval;
 #endif
 
-#ifdef CONFIG_SCHED_HAVE_PARENT
+#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_ENABLE_ALL_SIGNALS)
   /* Call sigaction with the SA_NOCLDWAIT flag so that we do not transform
    * children into "zombies" when they terminate:  Child exit status will
    * not be retained.
@@ -113,7 +113,7 @@ int telnetd_daemon(FAR const struct telnetd_config_s *config)
       nerr("ERROR: sigprocmask failed: %d\n", errno);
       goto errout;
     }
-#endif /* CONFIG_SCHED_HAVE_PARENT */
+#endif /* CONFIG_SCHED_HAVE_PARENT && CONFIG_ENABLE_ALL_SIGNALS */
 
   /* Create a new TCP socket to use to listen for connections */
 
diff --git a/nshlib/nsh_builtin.c b/nshlib/nsh_builtin.c
index 196220f41..76f542f8f 100644
--- a/nshlib/nsh_builtin.c
+++ b/nshlib/nsh_builtin.c
@@ -74,10 +74,14 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
                 FAR char **argv,
                 FAR const struct nsh_param_s *param)
 {
-#if !defined(CONFIG_NSH_DISABLEBG) && defined(CONFIG_SCHED_CHILD_STATUS)
+#if !defined(CONFIG_NSH_DISABLEBG) && defined(CONFIG_SCHED_CHILD_STATUS) && \
+    defined(CONFIG_ENABLE_ALL_SIGNALS)
   struct sigaction act;
   struct sigaction old;
-#endif
+#endif /* !CONFIG_NSH_DISABLEBG && CONFIG_SCHED_CHILD_STATUS &&
+        * CONFIG_ENABLE_ALL_SIGNALS
+        */
+
   int ret = OK;
 
   /* Lock the scheduler in an attempt to prevent the application from
@@ -86,7 +90,8 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
 
   sched_lock();
 
-#if !defined(CONFIG_NSH_DISABLEBG) && defined(CONFIG_SCHED_CHILD_STATUS)
+#if !defined(CONFIG_NSH_DISABLEBG) && \
+    defined(CONFIG_SCHED_CHILD_STATUS) && defined(CONFIG_ENABLE_ALL_SIGNALS)
   /* Ignore the child status if run the application on background. */
 
   if (vtbl->np.np_bg == true)
@@ -98,7 +103,9 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
       sigaction(SIGCHLD, &act, &old);
     }
 
-#endif /* CONFIG_NSH_DISABLEBG */
+#endif /* !CONFIG_NSH_DISABLEBG && !CONFIG_SCHED_CHILD_STATUS &&
+        * CONFIG_ENABLE_ALL_SIGNALS
+        */
 
   /* Try to find and execute the command within the list of builtin
    * applications.
@@ -230,7 +237,8 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
 
 #if !defined(CONFIG_SCHED_WAITPID) || !defined(CONFIG_NSH_DISABLEBG)
         {
-#if !defined(CONFIG_NSH_DISABLEBG) && defined(CONFIG_SCHED_CHILD_STATUS)
+#if !defined(CONFIG_NSH_DISABLEBG) && defined(CONFIG_SCHED_CHILD_STATUS) && \
+    defined(CONFIG_ENABLE_ALL_SIGNALS)
 
           /* Restore the old actions */
 
@@ -241,7 +249,10 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
               sigaction(SIGCHLD, &old, NULL);
             }
 
-#  endif
+#  endif /* !CONFIG_NSH_DISABLEBG && CONFIG_SCHED_CHILD_STATUS && \
+          * CONFIG_ENABLE_ALL_SIGNALS
+          */
+
           struct sched_param sched;
           sched_getparam(ret, &sched);
           nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, sched.sched_priority);
diff --git a/nshlib/nsh_proccmds.c b/nshlib/nsh_proccmds.c
index fe9810564..c7eff26eb 100644
--- a/nshlib/nsh_proccmds.c
+++ b/nshlib/nsh_proccmds.c
@@ -873,6 +873,7 @@ static int top_cmpcpuload(FAR const void *item1, FAR const void *item2)
     }
 }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 /****************************************************************************
  * Name: top_exit
  ****************************************************************************/
@@ -881,6 +882,7 @@ static void top_exit(int signo, FAR siginfo_t *siginfo, FAR void *context)
 {
   *(FAR bool *)siginfo->si_user = true;
 }
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
 
 #endif
 
@@ -1357,7 +1359,9 @@ int cmd_top(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   FAR char *pidlist = NULL;
   size_t num = SIZE_MAX;
   size_t i;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   struct sigaction act;
+#endif
   bool quit = false;
   int delay = 3;
   int ret = 0;
@@ -1393,6 +1397,7 @@ int cmd_top(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
         }
     }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   act.sa_user = &quit;
   act.sa_sigaction = top_exit;
   sigemptyset(&act.sa_mask);
@@ -1402,6 +1407,7 @@ int cmd_top(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
       nsh_error(vtbl, g_fmtcmdfailed, "top", "sigaction", NSH_ERRNO);
       return ERROR;
     }
+#endif
 
   if (vtbl->isctty)
     {
diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index 8d25038ed..1e991460d 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -124,10 +124,12 @@ static FAR void *cu_listener(FAR void *parameter)
   return NULL;
 }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 static void sigint(int sig)
 {
   g_cu.force_exit = true;
 }
+#endif
 
 #ifdef CONFIG_SERIAL_TERMIOS
 static int set_termios(FAR struct cu_globals_s *cu, int rate,
@@ -275,7 +277,9 @@ static int cu_cmd(FAR struct cu_globals_s *cu, char bcmd)
 int main(int argc, FAR char *argv[])
 {
   pthread_attr_t attr;
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   struct sigaction sa;
+#endif
   FAR const char *devname = CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE;
   FAR struct cu_globals_s *cu = &g_cu;
 #ifdef CONFIG_SERIAL_TERMIOS
@@ -295,13 +299,13 @@ int main(int argc, FAR char *argv[])
 
   memset(cu, 0, sizeof(*cu));
   cu->escape = '~';
-
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* Install signal handlers */
 
   memset(&sa, 0, sizeof(sa));
   sa.sa_handler = sigint;
   sigaction(SIGINT, &sa, NULL);
-
+#endif
   optind = 0;   /* Global that needs to be reset in FLAT mode */
   while ((option = getopt(argc, argv, "l:s:ceE:fho?")) != ERROR)
     {
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 48dc94da7..975a10410 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -278,7 +278,8 @@ static int user_main(int argc, char *argv[])
    * verify that status is retained correctly.
    */
 
-#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_SCHED_CHILD_STATUS)
+#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_SCHED_CHILD_STATUS) && \
+    defined(CONFIG_ENABLE_ALL_SIGNALS)
     {
       struct sigaction sa;
       int ret;
@@ -511,12 +512,22 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
       /* Verify that we can modify the signal mask */
 
       printf("\nuser_main: sigprocmask test\n");
       sigprocmask_test();
       check_test_memory_usage();
 
+#if defined(CONFIG_SIG_SIGSTOP_ACTION) && defined(CONFIG_SIG_SIGKILL_ACTION) && \
+    !defined(CONFIG_BUILD_KERNEL)
+      printf("\nuser_main: signal action test\n");
+      suspend_test();
+      check_test_memory_usage();
+#endif
+#endif /* !CONFIG_DISABLE_ALL_SIGNALS */
+
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
       /* Verify signal handlers */
 
       printf("\nuser_main: signal handler test\n");
@@ -527,12 +538,14 @@ static int user_main(int argc, char *argv[])
       signest_test();
       check_test_memory_usage();
 
-#if defined(CONFIG_SIG_SIGSTOP_ACTION) && defined(CONFIG_SIG_SIGKILL_ACTION) && \
-    !defined(CONFIG_BUILD_KERNEL)
-      printf("\nuser_main: signal action test\n");
-      suspend_test();
+#ifndef CONFIG_DISABLE_POSIX_TIMERS
+      /* Verify posix timers (with SIGEV_SIGNAL) */
+
+      printf("\nuser_main: POSIX timer test\n");
+      timer_test();
       check_test_memory_usage();
 #endif
+#endif
 
 #ifdef CONFIG_BUILD_FLAT
       printf("\nuser_main: wdog test\n");
@@ -540,21 +553,14 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
-#ifndef CONFIG_DISABLE_POSIX_TIMERS
-      /* Verify posix timers (with SIGEV_SIGNAL) */
-
-      printf("\nuser_main: POSIX timer test\n");
-      timer_test();
-      check_test_memory_usage();
-
-#ifdef CONFIG_SIG_EVTHREAD
+#if !defined(CONFIG_DISABLE_POSIX_TIMERS) && \
+    defined(CONFIG_SIG_EVTHREAD)
       /* Verify posix timers (with SIGEV_THREAD) */
 
       printf("\nuser_main: SIGEV_THREAD timer test\n");
       sigev_thread_test();
       check_test_memory_usage();
 #endif
-#endif
 
 #if !defined(CONFIG_DISABLE_PTHREAD) && CONFIG_RR_INTERVAL > 0
       /* Verify round robin scheduling */

From 3e3b8c6936caf7c42735221535f11d69010dc029 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Mon, 14 Apr 2025 16:23:19 +0800
Subject: [PATCH 105/568] graphics/libyuv: fix the typo.

fix the typo.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 graphics/libyuv/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/libyuv/CMakeLists.txt b/graphics/libyuv/CMakeLists.txt
index 6060e4f34..c792f090f 100644
--- a/graphics/libyuv/CMakeLists.txt
+++ b/graphics/libyuv/CMakeLists.txt
@@ -41,7 +41,7 @@ if(CONFIG_LIBYUV)
     FetchContent_GetProperties(libyuv_fetch)
 
     if(NOT libyuv_fetch_POPULATED)
-      FetchContent_Populate(llibyuv_fetch)
+      FetchContent_Populate(libyuv_fetch)
     endif()
   endif()
 

From 5f634815cb8b6fef16f7be5615a786efc4861370 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Tue, 5 Aug 2025 10:57:55 +0800
Subject: [PATCH 106/568] iptables: fix the ipv4 mask conversion error

the configured mask should be in network byte order, but the logic here
calculates it as host byte order.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 system/iptables/iptables_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/iptables/iptables_utils.c b/system/iptables/iptables_utils.c
index 9428e0fea..86c1492de 100644
--- a/system/iptables/iptables_utils.c
+++ b/system/iptables/iptables_utils.c
@@ -546,7 +546,7 @@ int iptables_parse_ip(FAR const char *str, FAR void *addr, FAR void *mask,
               return -EINVAL;
             }
 
-          *mask4 <<= 32 - prefixlen;
+          *mask4 >>= 32 - prefixlen;
         }
 #endif
 

From 859fc54c967d26dbfa72bcd80a7cd811e650b970 Mon Sep 17 00:00:00 2001
From: daichuan <daichuan@xiaomi.com>
Date: Fri, 28 Mar 2025 10:16:53 +0800
Subject: [PATCH 107/568] netutils/ping: change socket type to SOCK_RAW

The ping socket creation method is changed from SOCK_DGRAM to SOCK_RAW,
because SOCK_DGRAM may not have permission in some environments (e.g. Docker).
Also add checksum calculation when send, and perform IP header processing when receive.

Signed-off-by: daichuan <daichuan@xiaomi.com>
---
 netutils/ping/icmp_ping.c | 67 +++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/netutils/ping/icmp_ping.c b/netutils/ping/icmp_ping.c
index 55db84854..aa88d0a18 100644
--- a/netutils/ping/icmp_ping.c
+++ b/netutils/ping/icmp_ping.c
@@ -45,6 +45,7 @@
 
 #include <nuttx/clock.h>
 #include <nuttx/net/icmp.h>
+#include <nuttx/net/ip.h>
 
 #include "netutils/icmp_ping.h"
 
@@ -64,7 +65,6 @@ struct ping_priv_s
 {
   struct sockaddr_in destaddr;
   struct sockaddr_in fromaddr;
-  struct icmp_hdr_s outhdr;
   struct pollfd recvfd;
   socklen_t addrlen;
   clock_t kickoff;
@@ -74,6 +74,7 @@ struct ping_priv_s
   long elapsed;
   bool retry;
   int sockfd;
+  struct icmp_hdr_s outhdr;
 };
 
 /****************************************************************************
@@ -181,6 +182,31 @@ static void icmp_callback(FAR struct ping_result_s *result,
   result->info->callback(result);
 }
 
+/****************************************************************************
+ * Name: icmp_checksum
+ ****************************************************************************/
+
+static uint16_t icmp_checksum(FAR const void *buffer, size_t datalen)
+{
+  FAR const uint16_t *wptr = (FAR const uint16_t *)buffer;
+  size_t words = (sizeof(struct icmp_hdr_s) + datalen + 1) / 2;
+  uint32_t sum = 0;
+  size_t i;
+
+  for (i = 0; i < words; i++)
+    {
+      sum += *wptr++;
+      if (sum & 0x80000000)
+        {
+          sum = (sum & 0XFFFF) + (sum >> 16);
+        }
+    }
+
+  sum = (sum >> 16) + (sum & 0XFFFF);
+  sum += (sum >> 16);
+  return (uint16_t)(~sum);
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -196,6 +222,7 @@ void icmp_ping(FAR const struct ping_info_s *info)
   FAR struct icmp_hdr_s *inhdr;
   FAR uint8_t *iobuffer;
   FAR uint8_t *ptr;
+  int recvlen;
   int ret;
   int ch;
   int i;
@@ -219,16 +246,17 @@ void icmp_ping(FAR const struct ping_info_s *info)
 
   /* Allocate memory to hold private data and ping buffer */
 
-  priv = malloc(sizeof(*priv) + result.outsize);
+  priv = malloc(sizeof(*priv) + sizeof(struct ipv4_hdr_s) + result.outsize);
+
   if (priv == NULL)
     {
       icmp_callback(&result, ICMP_E_MEMORY, 0);
       return;
     }
 
-  iobuffer = (FAR uint8_t *)(priv + 1);
+  iobuffer = (FAR uint8_t *)(&priv->outhdr);
 
-  priv->sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
+  priv->sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
   if (priv->sockfd < 0)
     {
       icmp_callback(&result, ICMP_E_SOCKET, errno);
@@ -257,11 +285,6 @@ void icmp_ping(FAR const struct ping_info_s *info)
   priv->destaddr.sin_port        = 0;
   priv->destaddr.sin_addr.s_addr = result.dest.s_addr;
 
-  memset(&priv->outhdr, 0, sizeof(struct icmp_hdr_s));
-  priv->outhdr.type              = ICMP_ECHO_REQUEST;
-  priv->outhdr.id                = htons(result.id);
-  priv->outhdr.seqno             = htons(result.seqno);
-
   icmp_callback(&result, ICMP_I_BEGIN, 0);
 
   while (result.nrequests < info->count)
@@ -271,9 +294,10 @@ void icmp_ping(FAR const struct ping_info_s *info)
           break;
         }
 
-      /* Copy the ICMP header into the I/O buffer */
-
-      memcpy(iobuffer, &priv->outhdr, sizeof(struct icmp_hdr_s));
+      memset(&priv->outhdr, 0, sizeof(struct icmp_hdr_s));
+      priv->outhdr.type  = ICMP_ECHO_REQUEST;
+      priv->outhdr.id    = htons(result.id);
+      priv->outhdr.seqno = htons(result.seqno);
 
       /* Add some easily verifiable payload data */
 
@@ -289,6 +313,10 @@ void icmp_ping(FAR const struct ping_info_s *info)
             }
         }
 
+      /* Calculate checksum after data padding */
+
+      priv->outhdr.icmpchksum = icmp_checksum(iobuffer, info->datalen);
+
       priv->start = clock();
       result.nrequests++;
       priv->nsent = sendto(priv->sockfd, iobuffer, result.outsize, 0,
@@ -334,9 +362,10 @@ void icmp_ping(FAR const struct ping_info_s *info)
 
           /* Get the ICMP response (ignoring the sender) */
 
+          recvlen = sizeof(struct ipv4_hdr_s) + result.outsize;
           priv->addrlen = sizeof(struct sockaddr_in);
           priv->nrecvd  = recvfrom(priv->sockfd, iobuffer,
-                                   result.outsize, 0,
+                                   recvlen, 0,
                                    (FAR struct sockaddr *)&priv->fromaddr,
                                    &priv->addrlen);
           if (priv->nrecvd < 0)
@@ -350,8 +379,11 @@ void icmp_ping(FAR const struct ping_info_s *info)
               goto wait;
             }
 
+          /* Skip IP header, IP header length including options */
+
           priv->elapsed = TICK2USEC(clock() - priv->start);
-          inhdr         = (FAR struct icmp_hdr_s *)iobuffer;
+          inhdr         = (FAR struct icmp_hdr_s *)
+                          (iobuffer + sizeof(struct ipv4_hdr_s));
 
           if (inhdr->type == ICMP_ECHO_REPLY)
             {
@@ -383,16 +415,17 @@ void icmp_ping(FAR const struct ping_info_s *info)
 
                   /* Verify the payload data */
 
-                  if (priv->nrecvd != result.outsize)
+                  if (priv->nrecvd != recvlen)
                     {
                       icmp_callback(&result, ICMP_W_RECVBIG, priv->nrecvd);
                       verified = false;
                     }
                   else
                     {
-                      ptr = &iobuffer[sizeof(struct icmp_hdr_s)];
-                      ch  = 0x20;
+                      /* Data start offset: IP header + ICMP header */
 
+                      ptr = (FAR uint8_t *)(inhdr + 1);
+                      ch  = 0x20;
                       for (i = 0; i < info->datalen; i++, ptr++)
                         {
                           if (*ptr != ch)

From 2b0a4a20f55278461248031f5d7078520c492f50 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Wed, 20 Aug 2025 20:05:59 +0800
Subject: [PATCH 108/568] iptables: add file lock to prevent concurrent
 overwrite

the kernel can only prevent the concurrency of s/getsockopt, but
iptables will call these interfaces multiple times at a time. We
need to wait for one iptables to complete before executing the second
one, otherwise the data will be overwritten.

iptables flow:
get current iptables entries [1] -> add new entry 2 [1,2] -> set to kernel [1,2]
get current iptables entries [1] -> add new entry 3 [1,3] -> set to kernel [1,3]
entry 2 is lost

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 system/iptables/Kconfig    |  5 ++++
 system/iptables/iptables.c | 58 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/system/iptables/Kconfig b/system/iptables/Kconfig
index 171b52ed0..a98f00771 100644
--- a/system/iptables/Kconfig
+++ b/system/iptables/Kconfig
@@ -29,4 +29,9 @@ config SYSTEM_IPTABLES_STACKSIZE
 	int "iptables & ip6tables stack size"
 	default DEFAULT_TASK_STACKSIZE
 
+config SYSTEM_IPTABLES_LOCK_FILE_PATH
+	string "File lock path to prevent concurrent overwrite"
+	default "/tmp/iptables.lock"
+	depends on FS_LOCK_BUCKET_SIZE > 0
+
 endif
diff --git a/system/iptables/iptables.c b/system/iptables/iptables.c
index 673559634..367519a34 100644
--- a/system/iptables/iptables.c
+++ b/system/iptables/iptables.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <fcntl.h>
 #include <arpa/inet.h>
 
 #include <nuttx/net/netfilter/ip_tables.h>
@@ -33,17 +34,62 @@
 #include "iptables.h"
 #include "netutils/netlib.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#if CONFIG_FS_LOCK_BUCKET_SIZE == 0
+#  define iptables_lock()     0
+#  define iptables_unlock(fd) (void)(fd)
+#endif
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
 
 typedef CODE int
-  (*iptables_command_func_t)(FAR const struct iptables_args_s *args);
+(*iptables_command_func_t)(FAR const struct iptables_args_s *args);
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: iptables_lock / iptables_unlock
+ *
+ * Description:
+ *   Lock and unlock iptables to prevent concurrent overwrite.
+ *
+ ****************************************************************************/
+
+#if CONFIG_FS_LOCK_BUCKET_SIZE > 0
+static int iptables_lock(void)
+{
+  struct flock lock;
+  int lockfd;
+
+  lockfd = open(CONFIG_SYSTEM_IPTABLES_LOCK_FILE_PATH, O_CREAT | O_RDWR,
+                0666);
+  if (lockfd < 0)
+    {
+      return lockfd;
+    }
+
+  lock.l_type = F_WRLCK;
+  lock.l_whence = SEEK_SET;
+  lock.l_start = 0;
+  lock.l_len = 0;
+  fcntl(lockfd, F_SETLKW, &lock);
+
+  return lockfd;
+}
+
+static int iptables_unlock(int lockfd)
+{
+  return close(lockfd);
+}
+#endif
+
 /****************************************************************************
  * Name: iptables_addr2str
  *
@@ -485,6 +531,7 @@ static int iptables_apply(FAR const struct iptables_args_s *args,
 int main(int argc, FAR char *argv[])
 {
   struct iptables_args_s args;
+  int lock;
   int ret = iptables_parse(&args, argc, argv);
 
   if (ret < 0 || args.cmd == COMMAND_INVALID)
@@ -493,6 +540,13 @@ int main(int argc, FAR char *argv[])
       return ret;
     }
 
+  lock = iptables_lock();
+  if (lock < 0)
+    {
+      printf("Failed to lock iptables!\n");
+      return lock;
+    }
+
 #ifdef CONFIG_NET_IPFILTER
   if (args.table == NULL || strcmp(args.table, XT_TABLE_NAME_FILTER) == 0)
     {
@@ -520,5 +574,7 @@ int main(int argc, FAR char *argv[])
       printf("Unknown table: %s\n", args.table);
     }
 
+  iptables_unlock(lock);
+
   return ret;
 }

From 91f55245eb8e6dfe2e8e49d5ee54d1302b82069b Mon Sep 17 00:00:00 2001
From: anjiahao <anjiahao@xiaomi.com>
Date: Wed, 18 Jun 2025 14:26:57 +0800
Subject: [PATCH 109/568] apps:modify examples elf compile method

rearrange the elf test directory, make the sub-testcase in separate
directory

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
---
 examples/elf/.gitignore             |   1 +
 examples/elf/CMakeLists.txt         |   8 +-
 examples/elf/Make.defs              |   4 +-
 examples/elf/Makefile               |  45 +-------
 examples/elf/main/.gitignore        |   4 +
 examples/elf/main/CMakeLists.txt    |  26 +++++
 examples/elf/{ => main}/Kconfig     |   0
 examples/elf/main/Make.defs         |  23 ++++
 examples/elf/main/Makefile          | 100 ++++++++++++++++++
 examples/elf/{ => main}/elf_main.c  |  33 +++++-
 examples/elf/tests/.gitignore       |   1 +
 examples/elf/tests/Make.defs        |  39 +++++++
 examples/elf/tests/Makefile         | 132 +----------------------
 examples/elf/tests/errno/Kconfig    |   4 +
 examples/elf/tests/errno/Makefile   |  51 ++-------
 examples/elf/tests/hello/Kconfig    |   4 +
 examples/elf/tests/hello/Makefile   |  51 ++-------
 examples/elf/tests/helloxx/Kconfig  |   4 +
 examples/elf/tests/helloxx/Makefile | 157 ++--------------------------
 examples/elf/tests/longjmp/Kconfig  |   4 +
 examples/elf/tests/longjmp/Makefile |  51 ++-------
 examples/elf/tests/mutex/Kconfig    |   4 +
 examples/elf/tests/mutex/Makefile   |  51 ++-------
 examples/elf/tests/pthread/Kconfig  |   4 +
 examples/elf/tests/pthread/Makefile |  51 ++-------
 examples/elf/tests/signal/Kconfig   |   4 +
 examples/elf/tests/signal/Makefile  |  51 ++-------
 examples/elf/tests/struct/Kconfig   |   4 +
 examples/elf/tests/struct/Makefile  |  51 ++-------
 examples/elf/tests/task/Kconfig     |   4 +
 examples/elf/tests/task/Makefile    |  51 ++-------
 31 files changed, 326 insertions(+), 691 deletions(-)
 create mode 100644 examples/elf/.gitignore
 create mode 100644 examples/elf/main/.gitignore
 create mode 100644 examples/elf/main/CMakeLists.txt
 rename examples/elf/{ => main}/Kconfig (100%)
 create mode 100644 examples/elf/main/Make.defs
 create mode 100644 examples/elf/main/Makefile
 rename examples/elf/{ => main}/elf_main.c (96%)
 create mode 100644 examples/elf/tests/Make.defs
 create mode 100644 examples/elf/tests/errno/Kconfig
 create mode 100644 examples/elf/tests/hello/Kconfig
 create mode 100644 examples/elf/tests/helloxx/Kconfig
 create mode 100644 examples/elf/tests/longjmp/Kconfig
 create mode 100644 examples/elf/tests/mutex/Kconfig
 create mode 100644 examples/elf/tests/pthread/Kconfig
 create mode 100644 examples/elf/tests/signal/Kconfig
 create mode 100644 examples/elf/tests/struct/Kconfig
 create mode 100644 examples/elf/tests/task/Kconfig

diff --git a/examples/elf/.gitignore b/examples/elf/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/examples/elf/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/examples/elf/CMakeLists.txt b/examples/elf/CMakeLists.txt
index 3ca9eeb4b..f5b2b0ee6 100644
--- a/examples/elf/CMakeLists.txt
+++ b/examples/elf/CMakeLists.txt
@@ -20,9 +20,5 @@
 #
 # ##############################################################################
 
-if(CONFIG_EXAMPLES_ELF)
-  nuttx_add_application(NAME elf SRCS elf_main.c)
-
-  # TODO: tests
-
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "Elf")
diff --git a/examples/elf/Make.defs b/examples/elf/Make.defs
index e01a9d0dd..fe9092e3b 100644
--- a/examples/elf/Make.defs
+++ b/examples/elf/Make.defs
@@ -20,6 +20,4 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_EXAMPLES_ELF),)
-CONFIGURED_APPS += $(APPDIR)/examples/elf
-endif
+include $(wildcard $(APPDIR)/examples/elf/*/Make.defs)
diff --git a/examples/elf/Makefile b/examples/elf/Makefile
index 8d1e32f13..cde6ca47d 100644
--- a/examples/elf/Makefile
+++ b/examples/elf/Makefile
@@ -20,47 +20,6 @@
 #
 ############################################################################
 
-include $(APPDIR)/Make.defs
+MENUDESC = "Elf example"
 
-# ELF Example
-
-ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y)
-CSRCS = romfs.c
-endif
-ifeq ($(CONFIG_EXAMPLES_ELF_CROMFS),y)
-CSRCS = cromfs.c
-endif
-CSRCS += dirlist.c
-CSRCS += symtab.c
-tests$(DELIM)symtab.c_CFLAGS = -fno-builtin
-tests$(DELIM)symtab.c_CELFFLAGS = -fno-builtin
-MAINSRC = elf_main.c
-
-PROGNAME = elf
-PRIORITY = SCHED_PRIORITY_DEFAULT
-STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
-MODULE = $(CONFIG_EXAMPLES_ELF)
-
-DEPPATH := --dep-path tests
-
-# Build targets
-
-VPATH += :tests
-
-ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y)
-tests/romfs.c: build
-endif
-ifeq ($(CONFIG_EXAMPLES_ELF_CROMFS),y)
-tests/cromfs.c: build
-endif
-tests/dirlist.c: build
-tests/symtab.c: build
-
-.PHONY: build
-build:
-	+$(Q) $(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
-
-clean::
-	+$(Q) $(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean
-
-include $(APPDIR)/Application.mk
+include $(APPDIR)/Directory.mk
diff --git a/examples/elf/main/.gitignore b/examples/elf/main/.gitignore
new file mode 100644
index 000000000..17739289c
--- /dev/null
+++ b/examples/elf/main/.gitignore
@@ -0,0 +1,4 @@
+/elf_romfs.c
+/elf_romfs.img
+/cromfs.c
+/test_symtab.c
diff --git a/examples/elf/main/CMakeLists.txt b/examples/elf/main/CMakeLists.txt
new file mode 100644
index 000000000..3ae5a347e
--- /dev/null
+++ b/examples/elf/main/CMakeLists.txt
@@ -0,0 +1,26 @@
+# ##############################################################################
+# apps/examples/elf/main/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_ELF)
+  nuttx_add_application(NAME elf SRCS elf_main.c)
+
+  # TODO: tests
+
+endif()
diff --git a/examples/elf/Kconfig b/examples/elf/main/Kconfig
similarity index 100%
rename from examples/elf/Kconfig
rename to examples/elf/main/Kconfig
diff --git a/examples/elf/main/Make.defs b/examples/elf/main/Make.defs
new file mode 100644
index 000000000..bc5af5300
--- /dev/null
+++ b/examples/elf/main/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/examples/elf/main/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_ELF),)
+CONFIGURED_APPS += $(APPDIR)/examples/elf/main
+endif
diff --git a/examples/elf/main/Makefile b/examples/elf/main/Makefile
new file mode 100644
index 000000000..0cb59156b
--- /dev/null
+++ b/examples/elf/main/Makefile
@@ -0,0 +1,100 @@
+############################################################################
+# apps/examples/elf/main/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Module example built-in application info
+
+PROGNAME = elf
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE = $(CONFIG_EXAMPLES_ELF)
+
+MAINSRC = elf_main.c
+
+SYMTABSRC = test_symtab.c
+SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
+
+
+ifneq ($(CONFIG_BUILD_FLAT),y)
+  PASS1_SYMTAB = $(TOPDIR)/pass1/mod_symtab.c
+  MODLUE_NAME = tests
+endif
+
+$(SYMTABSRC):
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) g_elf >$@.tmp
+	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
+
+
+$(SYMTABOBJ): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@, -fno-lto -fno-builtin)
+
+ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y)
+
+ROMFSIMG = elf_romfs.img
+ROMFSSRC = elf_romfs.c
+ROMFSOBJ = $(ROMFSSRC:.c=$(OBJEXT))
+
+$(ROMFSIMG):
+	$(Q) genromfs -d $(BINDIR) -f $@
+
+$(ROMFSSRC): $(ROMFSIMG)
+	$(Q) (echo "#include <nuttx/compiler.h>" >$@ && \
+		xxd -i $(ROMFSIMG) | sed -e "s/^unsigned char/const unsigned char aligned_data(4)/g" >>$@)
+
+$(ROMFSOBJ): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@, -fno-lto -fno-builtin)
+
+else ifeq ($(CONFIG_EXAMPLES_ELF_CROMFS),y)
+  NXTOOLDIR = $(TOPDIR)/tools
+  GENCROMFSSRC = gencromfs.c
+  GENCROMFSEXE = gencromfs$(HOSTEXEEXT)
+
+  FSIMG_SRC = cromfs.c
+	FSIMG_OBJ = $(FSIMG_SRC:.c=$(OBJEXT))
+
+$(NXTOOLDIR)/$(GENCROMFSEXE): $(NXTOOLDIR)/$(GENCROMFSSRC)
+	$(Q) $(MAKE) -C $(NXTOOLDIR) -f Makefile.host $(GENCROMFSEXE)
+
+# Create the cromfs.c file from the populated cromfs directory
+
+$(FSIMG_SRC):$(NXTOOLDIR)/$(GENCROMFSEXE)
+	$(Q) $(NXTOOLDIR)/$(GENCROMFSEXE) $(BINDIR) $@.tmp
+	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
+
+$(FSIMG_OBJ): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@, -fno-lto -fno-builtin)
+
+endif
+
+# Copy the symbol table into the kernel pass1/ build directory
+
+ifneq ($(CONFIG_BUILD_FLAT),y)
+$(PASS1_SYMTAB): $(SYMTABSRC)
+	$(Q) install -m 0644 $(SYMTABSRC) $(PASS1_SYMTAB)
+	$(Q) mv $(BINDIR)$(DELIM)$(MODLUE_NAME) .
+endif
+
+postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ) $(PASS1_SYMTAB)
+	$(call ARLOCK, $(call CONVERT_PATH,$(BIN)), $^)
+
+distclean::
+	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(MODLUE_NAME))
+
+
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/elf_main.c b/examples/elf/main/elf_main.c
similarity index 96%
rename from examples/elf/elf_main.c
rename to examples/elf/main/elf_main.c
index d6950c1c8..23930e1f9 100644
--- a/examples/elf/elf_main.c
+++ b/examples/elf/main/elf_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/examples/elf/elf_main.c
+ * apps/examples/elf/main/elf_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -132,8 +132,35 @@ extern const unsigned int elf_romfs_img_len;
 #  error "No file system selected"
 #endif
 
-extern const char *dirlist[];
-
+const char *dirlist[] =
+{
+  "errno",
+  "hello",
+  "signal",
+  "struct",
+#ifdef CONFIG_HAVE_CXX
+  "hello++1",
+  "hello++2",
+#  ifdef CONFIG_HAVE_CXXINITIALIZE
+  "hello++3",
+#  endif
+#  ifdef CONFIG_EXAMPLES_ELF_CXX
+  "hello++4",
+  "hello++5",
+#  endif
+#endif
+#ifdef CONFIG_EXAMPLES_ELF_LONGJMP
+  "longjmp"
+#endif
+#ifndef CONFIG_DISABLE_PTHREAD
+  "mutex",
+  "pthread",
+#endif
+#ifndef CONFIG_ARCH_ADDRENV
+  "task",
+#endif
+  NULL
+};
 extern const struct symtab_s g_elf_exports[];
 extern const int g_elf_nexports;
 
diff --git a/examples/elf/tests/.gitignore b/examples/elf/tests/.gitignore
index 416f7e66e..78af96a0d 100644
--- a/examples/elf/tests/.gitignore
+++ b/examples/elf/tests/.gitignore
@@ -6,3 +6,4 @@
 /dirlist.c
 /extfs
 /symtab.c
+/Kconfig
diff --git a/examples/elf/tests/Make.defs b/examples/elf/tests/Make.defs
new file mode 100644
index 000000000..b8f77f37c
--- /dev/null
+++ b/examples/elf/tests/Make.defs
@@ -0,0 +1,39 @@
+############################################################################
+# apps/examples/elf/tests/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifeq ($(CONFIG_EXAMPLES_ELF),y)
+  CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/errno
+  CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/hello
+  CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/signal
+  CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/struct
+  ifeq ($(CONFIG_HAVE_CXX),y)
+    CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/helloxx
+  endif
+  ifeq ($(CONFIG_EXAMPLES_ELF_LONGJMP),y)
+    CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/longjmp
+  endif
+  ifneq ($(CONFIG_DISABLE_PTHREAD),y)
+    CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/mutex
+    CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/pthread
+  endif
+  ifneq ($(CONFIG_ARCH_ADDRENV),y)
+    CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/task
+  endif
+endif
diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile
index f73d31fc9..741d9d7a9 100644
--- a/examples/elf/tests/Makefile
+++ b/examples/elf/tests/Makefile
@@ -20,134 +20,6 @@
 #
 ############################################################################
 
-include $(APPDIR)/Make.defs
+MENUDESC = "Elf tests example"
 
-ALL_SUBDIRS = errno hello helloxx longjmp mutex pthread signal task struct
-BUILD_SUBDIRS = errno hello struct signal
-
-ifeq ($(CONFIG_HAVE_CXX),y)
-BUILD_SUBDIRS += helloxx
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_LONGJMP),y)
-BUILD_SUBDIRS += longjmp
-endif
-
-ifneq ($(CONFIG_DISABLE_PTHREAD),y)
-BUILD_SUBDIRS += mutex pthread
-endif
-
-ifneq ($(CONFIG_ARCH_ADDRENV),y)
-BUILD_SUBDIRS += task
-endif
-
-ELF_DIR = $(APPDIR)/examples/elf
-TESTS_DIR = $(ELF_DIR)/tests
-DIRLIST_SRC = $(TESTS_DIR)/dirlist.c
-SYMTAB_SRC = $(TESTS_DIR)/symtab.c
-
-ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y)
-  FSIMG_SUBDIR = romfs
-  FSIMG_DIR = $(TESTS_DIR)/$(FSIMG_SUBDIR)
-  ROMFS_IMG = $(TESTS_DIR)/romfs.img
-  FSIMG_SRC = $(TESTS_DIR)/romfs.c
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_CROMFS),y)
-  NXTOOLDIR = $(TOPDIR)/tools
-  GENCROMFSSRC = gencromfs.c
-  GENCROMFSEXE = gencromfs$(HOSTEXEEXT)
-
-  FSIMG_SUBDIR = cromfs
-  FSIMG_DIR = $(TESTS_DIR)/$(FSIMG_SUBDIR)
-  FSIMG_SRC = $(TESTS_DIR)/cromfs.c
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_EXTERN),y)
-  FSIMG_SUBDIR = extfs
-  FSIMG_DIR = $(TESTS_DIR)/$(FSIMG_SUBDIR)
-endif
-
-# generate the romfs image in case the fs type is romfs
-# the FSIMG_SRC is not actually generated.
-
-ifeq ($(CONFIG_EXAMPLES_ELF_FSTYPE), "romfs")
-  ROMFS_IMG = $(TESTS_DIR)/romfs.img
-  FSIMG_SRC = $(TESTS_DIR)/romfs.c
-endif
-
-define DIR_template
-$(1)_$(2):
-	+$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" FSIMG_DIR="$(FSIMG_DIR)" CROSSDEV=$(CROSSDEV)
-endef
-
-all: $(FSIMG_SRC) $(DIRLIST_SRC) $(SYMTAB_SRC)
-.PHONY: all clean install
-
-$(foreach DIR, $(ALL_SUBDIRS), $(eval $(call DIR_template,$(DIR),clean)))
-$(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),install)))
-
-# Install each program in the file system image directory
-
-install: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_install)
-
-ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y)
-# Create the romfs.img file from the populated romfs directory
-
-$(ROMFS_IMG): install
-	$(Q) genromfs -f $@.tmp -d $(FSIMG_DIR) -V "ELFTEST"
-	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
-
-# Create the romfs.c file from the romfs.img file
-
-$(FSIMG_SRC): $(ROMFS_IMG)
-	$(Q) (cd $(TESTS_DIR) && echo "#include <nuttx/compiler.h>" >$@ && \
-		xxd -i romfs.img | sed -e "s/^unsigned char/const unsigned char aligned_data(4)/g" | \
-		sed -e "s/romfs_img/elf_romfs_img/g" >>$@)
-
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_CROMFS),y)
-# Make sure that the NuttX gencromfs tool has been built
-
-$(NXTOOLDIR)/$(GENCROMFSEXE): $(NXTOOLDIR)/$(GENCROMFSSRC)
-	$(Q) $(MAKE) -C $(NXTOOLDIR) -f Makefile.host $(GENCROMFSEXE)
-
-# Create the cromfs.h header file from the populated cromfs directory
-
-$(FSIMG_SRC): install $(NXTOOLDIR)/$(GENCROMFSEXE)
-	$(Q) $(NXTOOLDIR)/$(GENCROMFSEXE) $(FSIMG_DIR) $@.tmp
-	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
-
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_FSTYPE),"romfs")
-# Create the romfs.img file from the populated romfs directory
-
-$(ROMFS_IMG): install
-	$(Q) genromfs -f $@.tmp -d $(FSIMG_DIR) -V "ELFTEST"
-	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
-
-# Create the romfs.c file from the romfs.img file
-
-$(FSIMG_SRC): $(ROMFS_IMG)
-
-endif
-
-# Create the dirlist.h header file from the file system image directory
-
-$(DIRLIST_SRC): install
-	$(Q) $(TESTS_DIR)/mkdirlist.sh $(FSIMG_DIR) >$@.tmp
-	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
-
-# Create the exported symbol table
-
-$(SYMTAB_SRC): install
-	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(FSIMG_DIR) g_elf >$@.tmp
-	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
-
-# Clean each subdirectory
-
-clean: $(foreach DIR, $(ALL_SUBDIRS), $(DIR)_clean)
-	$(Q) rm -f $(FSIMG_SRC) $(DIRLIST_SRC) $(ROMFS_IMG) $(SYMTAB_SRC)
-	$(Q) rm -rf $(FSIMG_DIR)
+include $(APPDIR)/Directory.mk
diff --git a/examples/elf/tests/errno/Kconfig b/examples/elf/tests/errno/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/errno/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 2f9d2a13a..ee383144d 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = errno
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = errno.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = errno
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/hello/Kconfig b/examples/elf/tests/hello/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/hello/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index 88ec0f0a8..6920b1522 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = hello
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = hello.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = hello
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/helloxx/Kconfig b/examples/elf/tests/helloxx/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/helloxx/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index b2f276834..667bf453d 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -22,156 +22,19 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN1 = hello++1
-ALL_BIN = $(FSIMG_DIR)/$(BIN1)
-BIN2 = hello++2
-ALL_BIN += $(FSIMG_DIR)/$(BIN2)
+PROGNAME  = hello++1 hello++2
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = hello++1.cxx hello++2.cxx
 ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y)
-BIN3 = hello++3
-ALL_BIN += $(FSIMG_DIR)/$(BIN3)
-ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y)
-BIN4 = hello++4
-ALL_BIN += $(FSIMG_DIR)/$(BIN4)
-BIN5 = hello++5
-ALL_BIN += $(FSIMG_DIR)/$(BIN5)
-endif
-endif
-
-SRCS1 = $(BIN1).c
-OBJS1 = $(SRCS1:.c=$(OBJEXT))
-
-SRCS2 = $(BIN2).c
-OBJS2 = $(SRCS2:.c=$(OBJEXT))
-
-ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y)
-SRCS3 = $(BIN3).c
-OBJS3 = $(SRCS3:.c=$(OBJEXT))
-ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y)
-SRCS4 = $(BIN4).c
-OBJS4 = $(SRCS4:.c=$(OBJEXT))
-SRCS5 = $(BIN5).c
-OBJS5 = $(SRCS5:.c=$(OBJEXT))
-endif
-endif
-
-SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5)
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
-
-LDLIBSTDC_STUBS_DIR	= $(TOPDIR)/libxx
-LDLIBSTDC_STUBS_LIB	= $(LDLIBSTDC_STUBS_DIR)/liblibxx.a
-
-all: $(BIN1) $(BIN2) $(BIN3) $(BIN4) $(BIN5)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.cxx
-	@echo "CC: $<"
-	$(Q) $(CXX) -c $(CXXELFFLAGS) $< -o $@
-
-# This contains libstdc++ stubs to that you can build C++ code
-# without actually having libstdc++
-
-$(LDLIBSTDC_STUBS_LIB):
-	$(Q) $(MAKE) -C $(LDLIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
-
-# BIN1 and BIN2 link just like C code because they contain no
-# static constructors.  BIN1 is equivalent to a C hello world;
-# BIN2 contains a class that implements hello world, but it is
-# not statically initialized.
-
-$(BIN1): $(OBJS1)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(BIN2): $(OBJS2)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-# BIN3 is equivalent to BIN2 except that is uses static initializers
-
-ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y)
-$(BIN3): $(OBJS3)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-# BIN4 is similar to BIN3 except that it uses the streams code from libstdc++
-# Both BIN4 and BIN5 use exceptions
-# NOTE:  libstdc++ is not available for NuttX as of this writing
-#
-ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y)
-ifeq ($(CONFIG_CXX_EXCEPTION),y)
-$(BIN4): $(OBJS4)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-$(BIN5): $(OBJS5)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-endif
-endif
-endif
-
-$(FSIMG_DIR)/$(BIN1): $(BIN1)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN1) $(FSIMG_DIR)/$(BIN1)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN1)
-endif
-
-$(FSIMG_DIR)/$(BIN2): $(BIN2)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN2) $(FSIMG_DIR)/$(BIN2)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN2)
-endif
-
-ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y)
-$(FSIMG_DIR)/$(BIN3): $(BIN3)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN3) $(FSIMG_DIR)/$(BIN3)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN3)
+  PROGNAME += hello++3
+  MAINSRC  += hello++3.cxx
 endif
 
 ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y)
-$(FSIMG_DIR)/$(BIN4): $(BIN4)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN4) $(FSIMG_DIR)/$(BIN4)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN4)
+  PROGNAME += hello++4 hello++5
+  MAINSRC  += hello++4.cxx hello++5.cxx
 endif
 
-$(FSIMG_DIR)/$(BIN5): $(BIN5)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN5) $(FSIMG_DIR)/$(BIN5)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN5)
-endif
-endif
-endif
-
-install: $(ALL_BIN)
-
-clean:
-	$(call DELFILE, $(BIN1))
-	$(call DELFILE, $(BIN2))
-	$(call DELFILE, $(BIN3))
-	$(call DELFILE, $(BIN4))
-	$(call DELFILE, $(BIN5))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/longjmp/Kconfig b/examples/elf/tests/longjmp/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/longjmp/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index fa792e6ff..a5e482f28 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = longjmp
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = longjmp.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = longjmp
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/mutex/Kconfig b/examples/elf/tests/mutex/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/mutex/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index 5fec89d3c..fe3619513 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = mutex
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = mutex.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = mutex
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/pthread/Kconfig b/examples/elf/tests/pthread/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/pthread/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index 61108bc5f..b1ca8c70d 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = pthread
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = pthread.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = pthread
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/signal/Kconfig b/examples/elf/tests/signal/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/signal/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index 21df11dd0..64d674033 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = signal
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = signal.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = signal
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/struct/Kconfig b/examples/elf/tests/struct/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/struct/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 990d990c2..88ab66f3f 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -22,48 +22,11 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = struct
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+CSRCS     = struct_dummy.c
+MAINSRC   = struct_main.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN  = struct
-SRCS = struct_main.c struct_dummy.c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/task/Kconfig b/examples/elf/tests/task/Kconfig
new file mode 100644
index 000000000..f72f3c094
--- /dev/null
+++ b/examples/elf/tests/task/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index b57b98885..09424ac96 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -22,49 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH += -L $(NUTTXLIB)
-else
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDELFFLAGS += -Bstatic
-LDLIBPATH +=  -L $(NUTTXLIB)
-endif
-endif
+PROGNAME  = task
+PRIORITY  = 100
+STACKSIZE = $(CONFIG_ELF_STACKSIZE)
+MODULE    = m
+MAINSRC   = task.c
 
-ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-LDLIBS += -lc
-endif
-
-ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
-LDLIBS += -lproxies
-endif
-
-BIN = task
-
-SRCS = $(BIN).c
-OBJS = $(SRCS:.c=$(OBJEXT))
-
-all: $(BIN)
-.PHONY: all clean install
-
-$(OBJS): %$(OBJEXT): %.c
-	@echo "CC: $<"
-	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	@echo "LD: $<"
-	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
-
-$(FSIMG_DIR)/$(BIN): $(BIN)
-	$(Q) mkdir -p $(FSIMG_DIR)
-	$(Q) install $(BIN) $(FSIMG_DIR)/$(BIN)
-ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
-	$(Q) $(STRIP) $(FSIMG_DIR)/$(BIN)
-endif
-
-install: $(FSIMG_DIR)/$(BIN)
-
-clean:
-	$(call DELFILE, $(BIN))
-	$(call CLEAN)
+include $(APPDIR)/Application.mk

From 27e0811312423c459053552db1c86bbfb7676edf Mon Sep 17 00:00:00 2001
From: anjiahao <anjiahao@xiaomi.com>
Date: Fri, 29 Aug 2025 10:05:06 +0800
Subject: [PATCH 110/568] elf:Delete unnecessary generation, elf does not use
 kernel api

delete the mod_symtab.c generate procedure

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
---
 examples/elf/main/Makefile | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/examples/elf/main/Makefile b/examples/elf/main/Makefile
index 0cb59156b..074ea6a3d 100644
--- a/examples/elf/main/Makefile
+++ b/examples/elf/main/Makefile
@@ -30,12 +30,6 @@ MAINSRC = elf_main.c
 SYMTABSRC = test_symtab.c
 SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
 
-
-ifneq ($(CONFIG_BUILD_FLAT),y)
-  PASS1_SYMTAB = $(TOPDIR)/pass1/mod_symtab.c
-  MODLUE_NAME = tests
-endif
-
 $(SYMTABSRC):
 	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) g_elf >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
@@ -82,15 +76,7 @@ $(FSIMG_OBJ): %$(OBJEXT): %.c
 
 endif
 
-# Copy the symbol table into the kernel pass1/ build directory
-
-ifneq ($(CONFIG_BUILD_FLAT),y)
-$(PASS1_SYMTAB): $(SYMTABSRC)
-	$(Q) install -m 0644 $(SYMTABSRC) $(PASS1_SYMTAB)
-	$(Q) mv $(BINDIR)$(DELIM)$(MODLUE_NAME) .
-endif
-
-postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ) $(PASS1_SYMTAB)
+postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ)
 	$(call ARLOCK, $(call CONVERT_PATH,$(BIN)), $^)
 
 distclean::

From 6630c0878318b1bec0ef9d86252a6895ab12b1d2 Mon Sep 17 00:00:00 2001
From: v-tangmeng <v-tangmeng@xiaomi.com>
Date: Fri, 31 Oct 2025 14:10:10 +0800
Subject: [PATCH 111/568] examples/elf: add support for CONFIG_DISABLE_SIGNALS

make the example elf can work with SIGNAL disabled

Signed-off-by: v-tangmeng <v-tangmeng@xiaomi.com>
---
 examples/elf/main/elf_main.c | 2 ++
 examples/elf/tests/Make.defs | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/elf/main/elf_main.c b/examples/elf/main/elf_main.c
index 23930e1f9..7a52b5f6e 100644
--- a/examples/elf/main/elf_main.c
+++ b/examples/elf/main/elf_main.c
@@ -136,7 +136,9 @@ const char *dirlist[] =
 {
   "errno",
   "hello",
+#ifndef CONFIG_DISABLE_SIGNALS
   "signal",
+#endif
   "struct",
 #ifdef CONFIG_HAVE_CXX
   "hello++1",
diff --git a/examples/elf/tests/Make.defs b/examples/elf/tests/Make.defs
index b8f77f37c..e29058c49 100644
--- a/examples/elf/tests/Make.defs
+++ b/examples/elf/tests/Make.defs
@@ -21,7 +21,9 @@
 ifeq ($(CONFIG_EXAMPLES_ELF),y)
   CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/errno
   CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/hello
-  CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/signal
+  ifneq ($(CONFIG_DISABLE_SIGNALS),y)
+    CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/signal
+  endif
   CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/struct
   ifeq ($(CONFIG_HAVE_CXX),y)
     CONFIGURED_APPS += $(APPDIR)/examples/elf/tests/helloxx

From 63e26504879e2b5abee7f210806a39375ed22331 Mon Sep 17 00:00:00 2001
From: anjiahao <anjiahao@xiaomi.com>
Date: Tue, 25 Nov 2025 20:32:40 +0800
Subject: [PATCH 112/568] elf:avoid interference between different ELFs
 generated by symtab

if defined CONFIG_EXAMPLES_ELF and CONFIG_EXAMPLES_MODLUE,
elf will generated BINDIR, so generated symtab will interference.
It supports inputting multiple specified files in mksymtab.sh to
avoid interference.

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
---
 examples/elf/main/Makefile    | 28 +++++++++-
 examples/module/main/Makefile |  5 +-
 tools/mksymtab.sh             | 99 ++++++++++++++++++++++++++---------
 3 files changed, 102 insertions(+), 30 deletions(-)

diff --git a/examples/elf/main/Makefile b/examples/elf/main/Makefile
index 074ea6a3d..76093ea5f 100644
--- a/examples/elf/main/Makefile
+++ b/examples/elf/main/Makefile
@@ -30,8 +30,34 @@ MAINSRC = elf_main.c
 SYMTABSRC = test_symtab.c
 SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
 
+ELFNAME_BASE = errno hello
+ifneq ($(CONFIG_DISABLE_SIGNALS),y)
+  ELFNAME_BASE += signal
+endif
+
+ifeq ($(CONFIG_HAVE_CXX),y)
+  ELFNAME_BASE += hello++1 hello++2
+  ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y)
+    ELFNAME_BASE += hello++3
+  endif
+  ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y)
+    ELFNAME_BASE += hello++4 hello++5
+  endif
+endif
+ifeq ($(CONFIG_EXAMPLES_ELF_LONGJMP),y)
+  ELFNAME_BASE += longjmp
+endif
+ifneq ($(CONFIG_DISABLE_PTHREAD),y)
+  ELFNAME_BASE += pthread mutex
+endif
+ifneq ($(CONFIG_ARCH_ADDRENV),y)
+  ELFNAME_BASE += task
+endif
+
+ELFNAME = $(addprefix $(BINDIR)$(DELIM),$(ELFNAME_BASE))
+
 $(SYMTABSRC):
-	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) g_elf >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(ELFNAME) g_elf >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 
diff --git a/examples/module/main/Makefile b/examples/module/main/Makefile
index f5294b257..466af6dbf 100644
--- a/examples/module/main/Makefile
+++ b/examples/module/main/Makefile
@@ -34,14 +34,13 @@ MAINSRC = module_main.c
 SYMTABSRC = mod_symtab.c
 SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
 
-
+MODLUE_NAME = chardev
 ifneq ($(CONFIG_BUILD_FLAT),y)
   PASS1_SYMTAB = $(TOPDIR)/pass1/mod_symtab.c
-  MODLUE_NAME = chardev
 endif
 
 $(SYMTABSRC):
-	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) g_mod >$@.tmp
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR)$(DELIM)$(MODLUE_NAME) g_mod >$@.tmp
 	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
 
diff --git a/tools/mksymtab.sh b/tools/mksymtab.sh
index 1f9d7ed8c..cdb141b03 100755
--- a/tools/mksymtab.sh
+++ b/tools/mksymtab.sh
@@ -27,28 +27,43 @@ usage() {
   if [ $# -ne 0 ]; then
     echo "ERROR: $@"
   fi
-  echo -e "\nUsage: $0 <imagedirpath> [symtabprefix] [-a additionalsymbolspath]"
+  echo -e "\nUsage: $0 <imagedirpath1> [imagedirpath2 ... ] [symtabprefix] [-a additionalsymbolspath]"
   exit 1
 }
 
-# Check for the required directory path
+# Collect all image directory/file paths until we hit a non-path argument
+dirs=()
+prefix=""
+arg_count=0
 
-dir=$1
-if [ -z "$dir" ]; then
+while [ $# -gt 0 ]; do
+  # Check if this is an option flag
+  if [ "x${1:0:1}" = "x-" ]; then
+    break
+  fi
+
+  arg_count=$((arg_count + 1))
+
+  # Always collect the argument (whether path exists or not)
+  # Only treat as prefix if it doesn't look like a path
+  if [[ "$1" =~ ^/ ]] || [ -e "$1" ]; then
+    # Looks like a path (starts with /) or exists
+    dirs+=("$1")
+    shift
+  else
+    # Doesn't look like a path, treat as prefix
+    prefix=$1
+    shift
+    break
+  fi
+done
+
+# Check we have at least one argument
+if [ $arg_count -eq 0 ]; then
   usage "Missing <imagedirpath>"
 fi
 
-# Get the symbol table prefix
-
-if [ "x${2:0:1}" != "x-" ]; then
-  prefix=$2
-  OPTIND=3
-else
-  OPTIND=2
-fi
-
-# Parse remaining arguments
-
+# Parse remaining arguments for options
 while getopts a: opt; do
   case $opt in
     a)
@@ -63,28 +78,60 @@ if [ $OPTIND != $(($# + 1)) ]; then
   usage "Arguments remaining: \"${@:$OPTIND}\""
 fi
 
+# Function to get exec list from a path (file or directory)
+get_exec_list() {
+  local path=$1
+  if [ -f "$path" ]; then
+    echo "$path"
+  elif [ -d "$path" ]; then
+    find "$path" -type f 2>/dev/null
+  fi
+}
+
 # Extract all of the undefined symbols from the ELF files and create a
 # list of sorted, unique undefined variable names.
 
-varlist=`find $dir -name *-thunk.S 2>/dev/null | xargs grep -h asciz | cut -f3 | sort | uniq`
+# First try to find thunk files from all directories
+varlist=""
+for dir in "${dirs[@]}"; do
+  if [ -d "$dir" ]; then
+    thunklist=`find $dir -name *-thunk.S 2>/dev/null | xargs grep -h asciz 2>/dev/null | cut -f3`
+    if [ !  -z "$thunklist" ]; then
+      varlist="${varlist} ${thunklist}"
+    fi
+  fi
+done
+
 if [ -z "$varlist" ]; then
-  execlist=`find $dir -type f 2>/dev/null`
+  # Collect all executable files from all paths
+  execlist=""
+  for dir in "${dirs[@]}"; do
+    # Only process if path exists
+    if [ -e "$dir" ]; then
+      pathlist=`get_exec_list "$dir"`
+      if [ ! -z "$pathlist" ]; then
+        execlist="${execlist} ${pathlist}"
+      fi
+    fi
+  done
+
   if [ ! -z "$execlist" ]; then
+    # Get all undefined symbol names
+    varlist=$(nm $execlist 2>/dev/null | grep -F ' U ' | sed -e "s/^[ ]*//g" | cut -d' ' -f2)
 
-# Get all undefined symbol names
-    varlist=`nm $execlist 2>/dev/null | grep -F ' U ' | sed -e "s/^[ ]*//g" | cut -d' ' -f2 | sort | uniq`
+    # Get all defined symbol names
+    deflist=$(nm $execlist 2>/dev/null | grep -F -v -e ' U ' -e ':' | sed -e "s/^[0-9a-z]* //g" | cut -d' ' -f2)
 
-# Get all defined symbol names
-    deflist=`nm $execlist 2>/dev/null | grep -F -v -e ' U ' -e ':' | sed -e "s/^[0-9a-z]* //g" | cut -d' ' -f2 | sort | uniq`
-
-# Remove the intersection between them, and the remaining symbols are found in the main image
-    common=`echo "$varlist" | tr ' ' '\n' | grep -Fxf <(echo "$deflist" | tr ' ' '\n') | tr '\n' ' '`
-    if [ "x$common" != "x" ]; then
-      varlist=`echo $varlist | sed "s/$common//g"`
+    # Remove the intersection between them, and the remaining symbols are found in the main image
+    if [ ! -z "$varlist" ] && [ !  -z "$deflist" ]; then
+      varlist=$(echo "$varlist" | tr ' ' '\n' | sort -u | grep -vFxf <(echo "$deflist" | tr ' ' '\n' | sort -u) | tr '\n' ' ')
     fi
   fi
 fi
 
+# Sort and unique the varlist
+varlist=`echo "$varlist" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
+
 for addsym in ${addlist[@]}; do
   if [ -f $addsym ]; then
     varlist="${varlist}\n$(cat $addsym | grep -v "^,.*")"

From c62d0d0875ac7dc59456fb1426f18d508ae7ac23 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Mon, 8 Sep 2025 11:24:08 +0800
Subject: [PATCH 113/568] netlib_setarp.c: add ATF_PERM to mark arp entry as
 permanent

Improve the behavior of the ARP table so that the manually configured
ARP table has the highest priority, can only be manually modified to
other values, otherwise will never change again, and will not time out.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 netutils/netlib/netlib_setarp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netutils/netlib/netlib_setarp.c b/netutils/netlib/netlib_setarp.c
index 88dbba810..1c2261d4c 100644
--- a/netutils/netlib/netlib_setarp.c
+++ b/netutils/netlib/netlib_setarp.c
@@ -78,6 +78,7 @@ int netlib_set_arpmapping(FAR const struct sockaddr_in *inaddr,
 
           req.arp_ha.sa_family = ARPHRD_ETHER;
           memcpy(&req.arp_ha.sa_data, macaddr, ETHER_ADDR_LEN);
+          req.arp_flags = ATF_PERM;
           if (ifname != NULL)
             {
                strlcpy((FAR char *)&req.arp_dev, ifname,

From 0a90fe516782cad38f99f6c438e6ff84144f3267 Mon Sep 17 00:00:00 2001
From: guoshichao <guoshichao@xiaomi.com>
Date: Tue, 24 Dec 2024 16:45:14 +0800
Subject: [PATCH 114/568] benchmarks/ramspeed: add cmake build support

Add CMakeLists.txt for the RAMSpeed benchmark application, enabling it to
be built with the CMake build system alongside the existing Makefile-based
build. This ensures consistent build behavior across build systems.

Signed-off-by: guoshichao <guoshichao@xiaomi.com>
---
 benchmarks/ramspeed/CMakeLists.txt | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 benchmarks/ramspeed/CMakeLists.txt

diff --git a/benchmarks/ramspeed/CMakeLists.txt b/benchmarks/ramspeed/CMakeLists.txt
new file mode 100644
index 000000000..a8b0df091
--- /dev/null
+++ b/benchmarks/ramspeed/CMakeLists.txt
@@ -0,0 +1,31 @@
+# ##############################################################################
+# apps/benchmarks/ramspeed/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_BENCHMARK_RAMSPEED)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_BENCHMARK_RAMSPEED_PROGNAME}
+    SRCS
+    ramspeed_main.c
+    STACKSIZE
+    ${CONFIG_BENCHMARK_RAMSPEED_STACKSIZE}
+    PRIORITY
+    ${CONFIG_BENCHMARK_RAMSPEED_PRIORITY})
+endif()

From e804886c68f8c4c656c071e813637563a98a16b7 Mon Sep 17 00:00:00 2001
From: guoshichao <guoshichao@xiaomi.com>
Date: Wed, 14 Jan 2026 20:40:31 +0800
Subject: [PATCH 115/568] libuv: fix sendmsg parameter type in NuttX port

Update the libuv NuttX port patch to change sendmsg() parameter from
"struct msghdr *msg" to "const struct msghdr *msg" in the NuttX-specific
implementation stub. This maintains compatibility after NuttX's socket API
was made POSIX-compliant with const-correct parameters.

Signed-off-by: guoshichao <guoshichao@xiaomi.com>
---
 system/libuv/0001-libuv-port-for-nuttx.patch | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/libuv/0001-libuv-port-for-nuttx.patch b/system/libuv/0001-libuv-port-for-nuttx.patch
index 0c2eb18dd..2364110e6 100644
--- a/system/libuv/0001-libuv-port-for-nuttx.patch
+++ b/system/libuv/0001-libuv-port-for-nuttx.patch
@@ -424,7 +424,7 @@ index 00000000..298bd2f8
 +    return 0;
 +  }
 +
-+  /* Make sure the memory is initiallized to zero using calloc() */
++  /* Make sure the memory is initialized to zero using calloc() */
 +  *addresses = uv__calloc(*count, sizeof(**addresses));
 +  if (*addresses == NULL) {
 +    freeifaddrs(addrs);
@@ -3972,3 +3972,15 @@ diff --color -ur libuv_back/src/unix/thread.c libuv/src/unix/thread.c
  # include <sched.h>
  # define uv__cpu_set_t cpu_set_t
  #elif defined(__FreeBSD__)
+diff --git a/src/unix/nuttx.c b/src/unix/nuttx.c
+index d0e110a..e1c962e 100644
+--- a/src/unix/nuttx.c
++++ b/src/unix/nuttx.c
+@@ -222,7 +222,7 @@ ssize_t recvmsg(int sockfd, struct msghdr *msg, int flags) {
+   return UV_ENOTSUP;
+ }
+ 
+-ssize_t sendmsg(int sockfd, struct msghdr *msg, int flags) {
++ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags) {
+   return UV_ENOTSUP;
+ }

From 54bef649ea14d293128545f24c9db2594197a327 Mon Sep 17 00:00:00 2001
From: gaohedong <gaohedong@xiaomi.com>
Date: Mon, 7 Jul 2025 22:41:19 +0800
Subject: [PATCH 116/568] net/ptpd: fix compile warning issue

In some scenarios, dynamic memory allocation is not allowed, so it is modified to a static allocation method.

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
---
 netutils/ptpd/ptpd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 3193ee33e..f85619093 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -758,11 +758,13 @@ static int ptp_sendmsg(FAR struct ptp_state_s *state, FAR const void *buf,
         0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e
       };
 
-      char raw[sizeof(struct ether_header) + buflen];
+      char raw[sizeof(struct ether_header) + sizeof(struct ptp_announce_s)];
       FAR struct ether_header *header;
       struct msghdr msg;
       struct iovec iov;
 
+      DEBUGASSERT(sizeof(struct ptp_announce_s) >= buflen);
+
       header = (FAR struct ether_header *)&raw;
       memcpy(header->ether_dhost, ptp_multicast_mac, ETHER_ADDR_LEN);
       netlib_getmacaddr(state->config->interface, header->ether_shost);

From faefee48971cc4f54bf3ed693cf673c8c1645ccf Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Mon, 18 Aug 2025 16:59:09 +0800
Subject: [PATCH 117/568] MQTT-C: compile tests only if no with_mbedtls is
 enabled

tests only supports tests in non-encrypted mode. when we open tests
compilation in other modes, there will be many compilation warning
with mismatched parameter types, and it will not run correctly.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 netutils/mqttc/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netutils/mqttc/Kconfig b/netutils/mqttc/Kconfig
index aa8e23d04..973c5bb4a 100644
--- a/netutils/mqttc/Kconfig
+++ b/netutils/mqttc/Kconfig
@@ -19,6 +19,7 @@ config NETUTILS_MQTTC_EXAMPLE
 
 config NETUTILS_MQTTC_TEST
 	tristate "Enable MQTT-C test"
+	depends on !NETUTILS_MQTTC_WITH_MBEDTLS
 	default n
 
 if NETUTILS_MQTTC_EXAMPLE

From 11c8220fd5d40c50addd07523f0dd4e9786045eb Mon Sep 17 00:00:00 2001
From: zhangshuai39 <zhangshuai39@xiaomi.com>
Date: Tue, 13 Jan 2026 11:30:51 +0800
Subject: [PATCH 118/568] netlib: Replace perror with nerr

Use the nerr interface for error print.

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
---
 netutils/netlib/netlib_checkhttpconnectivity.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netutils/netlib/netlib_checkhttpconnectivity.c b/netutils/netlib/netlib_checkhttpconnectivity.c
index c29d86292..4b0df89c2 100644
--- a/netutils/netlib/netlib_checkhttpconnectivity.c
+++ b/netutils/netlib/netlib_checkhttpconnectivity.c
@@ -224,7 +224,7 @@ int netlib_check_httpconnectivity(FAR const char *host,
   ret = connect(sock, (struct sockaddr *)&server_addr, sizeof(server_addr));
   if (ret < 0)
     {
-      perror("Connection failed");
+      nerr("Connection failed: %s", strerror(errno));
       goto exit_with_socket;
     }
 
@@ -235,13 +235,13 @@ int netlib_check_httpconnectivity(FAR const char *host,
   ret = send(sock, buf, strlen(buf), 0);
   if (ret < 0)
     {
-      perror("send failed");
+      nerr("send failed: %s", strerror(errno));
       goto exit_with_socket;
     }
 
   if ((ret = recv(sock, buf, sizeof(buf), 0)) < 0)
     {
-      perror("recv failed");
+      nerr("recv failed: %s", strerror(errno));
       goto exit_with_socket;
     }
 

From 3d97bf02e49a53a69c3a0cb27635c5e69073252b Mon Sep 17 00:00:00 2001
From: likun17 <likun17@xiaomi.com>
Date: Tue, 12 Nov 2024 20:58:57 +0800
Subject: [PATCH 119/568] system/uorb:Loop bug fix

Fixed the epoll issue that when multiple events come only the first POLLIN is entered.

Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/uORB/epoll.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/system/uorb/uORB/epoll.c b/system/uorb/uORB/epoll.c
index 147831d3f..e82c483aa 100644
--- a/system/uorb/uORB/epoll.c
+++ b/system/uorb/uORB/epoll.c
@@ -105,7 +105,8 @@ static int orb_loop_epoll_run(FAR struct orb_loop_s *loop)
                   uorberr("epoll wait data in error! fd:%d", handle->fd);
                 }
             }
-          else if (et[i].events & EPOLLOUT)
+
+          if (et[i].events & EPOLLOUT)
             {
               if (handle->dataout_cb != NULL)
                 {
@@ -116,7 +117,8 @@ static int orb_loop_epoll_run(FAR struct orb_loop_s *loop)
                   uorberr("epoll wait data out error! fd:%d", handle->fd);
                 }
             }
-          else if (et[i].events & EPOLLPRI)
+
+          if (et[i].events & EPOLLPRI)
             {
               if (handle->eventpri_cb != NULL)
                 {
@@ -127,7 +129,8 @@ static int orb_loop_epoll_run(FAR struct orb_loop_s *loop)
                   uorberr("epoll wait events pri error! fd:%d", handle->fd);
                 }
             }
-          else if (et[i].events & EPOLLERR)
+
+          if (et[i].events & EPOLLERR)
             {
               if (handle->eventerr_cb != NULL)
                 {

From 7ba36385073ea0e5a79eb3ee428778c97814054f Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Wed, 13 Nov 2024 13:22:11 +0800
Subject: [PATCH 120/568] system/uorb: merge set_info to
 orb_advertise_multi_queue_info.

support new api: orb_advertise_multi_queue_info to advertise topic
with info

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 system/uorb/uORB/uORB.c | 46 ++++++++++++++++++++++++-----------------
 system/uorb/uORB/uORB.h | 46 ++++++++++++++++++++++++-----------------
 2 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/system/uorb/uORB/uORB.c b/system/uorb/uORB/uORB.c
index fd3f704af..63adb4b64 100644
--- a/system/uorb/uORB/uORB.c
+++ b/system/uorb/uORB/uORB.c
@@ -57,7 +57,8 @@
  ****************************************************************************/
 
 static int orb_advsub_open(FAR const struct orb_metadata *meta, int flags,
-                           int instance, unsigned int queue_size)
+                           int instance, unsigned int queue_size,
+                           FAR orb_info_t *info)
 {
   char path[ORB_PATH_MAX];
   int fd;
@@ -78,6 +79,14 @@ static int orb_advsub_open(FAR const struct orb_metadata *meta, int flags,
       reginfo.esize   = meta->o_size;
       reginfo.nbuffer = queue_size;
       reginfo.persist = !!(flags & SENSOR_PERSIST);
+      if (info != NULL)
+        {
+          memcpy(&reginfo.devinfo, info, sizeof(*info));
+        }
+      else
+        {
+          memset(&reginfo.devinfo, 0, sizeof(*info));
+        }
 
       fd = open(ORB_USENSOR_PATH, O_WRONLY | O_CLOEXEC);
       if (fd < 0)
@@ -120,7 +129,8 @@ static int orb_advsub_open(FAR const struct orb_metadata *meta, int flags,
 static int
 orb_advertise_multi_queue_flags(FAR const struct orb_metadata *meta,
                                 FAR const void *data, FAR int *instance,
-                                unsigned int queue_size, int flags)
+                                unsigned int queue_size, int flags,
+                                FAR orb_info_t *info)
 {
   int inst;
   int fd;
@@ -129,7 +139,7 @@ orb_advertise_multi_queue_flags(FAR const struct orb_metadata *meta,
 
   inst = instance ? *instance : orb_group_count(meta);
 
-  fd = orb_advsub_open(meta, flags, inst, queue_size);
+  fd = orb_advsub_open(meta, flags, inst, queue_size, info);
   if (fd < 0)
     {
       uorberr("%s advertise failed (%i)", meta->o_name, fd);
@@ -172,24 +182,27 @@ int orb_close(int fd)
   return close(fd);
 }
 
-int orb_advertise_multi_queue(FAR const struct orb_metadata *meta,
-                              FAR const void *data, FAR int *instance,
-                              unsigned int queue_size)
+int orb_advertise_multi_queue_info(FAR const struct orb_metadata *meta,
+                                   FAR const void *data, FAR int *instance,
+                                   unsigned int queue_size,
+                                   FAR orb_info_t *info)
 {
   return orb_advertise_multi_queue_flags(meta, data, instance,
-                                         queue_size, O_WRONLY);
+                                         queue_size, O_WRONLY, info);
 }
 
-int orb_advertise_multi_queue_persist(FAR const struct orb_metadata *meta,
-                                      FAR const void *data,
-                                      FAR int *instance,
-                                      unsigned int queue_size)
+int
+orb_advertise_multi_queue_persist_info(FAR const struct orb_metadata *meta,
+                                       FAR const void *data,
+                                       FAR int *instance,
+                                       unsigned int queue_size,
+                                       FAR orb_info_t *info)
 {
   return orb_advertise_multi_queue_flags(meta, data, instance, queue_size,
-                                         O_WRONLY | SENSOR_PERSIST);
+                                         O_WRONLY | SENSOR_PERSIST, info);
 }
 
-ssize_t orb_publish_multi(int fd, const void *data, size_t len)
+ssize_t orb_publish_multi(int fd, FAR const void *data, size_t len)
 {
   return write(fd, data, len);
 }
@@ -197,7 +210,7 @@ ssize_t orb_publish_multi(int fd, const void *data, size_t len)
 int orb_subscribe_multi(FAR const struct orb_metadata *meta,
                         unsigned instance)
 {
-  return orb_advsub_open(meta, O_RDONLY, instance, 0);
+  return orb_advsub_open(meta, O_RDONLY, instance, 0, NULL);
 }
 
 ssize_t orb_copy_multi(int fd, FAR void *buffer, size_t len)
@@ -276,11 +289,6 @@ int orb_get_interval(int fd, FAR unsigned *interval)
   return ret;
 }
 
-int orb_set_info(int fd, FAR const orb_info_t *info)
-{
-  return ioctl(fd, SNIOC_SET_INFO, (unsigned long)(uintptr_t)info);
-}
-
 int orb_get_info(int fd, FAR orb_info_t *info)
 {
   return ioctl(fd, SNIOC_GET_INFO, (unsigned long)(uintptr_t)info);
diff --git a/system/uorb/uORB/uORB.h b/system/uorb/uORB/uORB.h
index 5e0bc6c67..f1b9c27b0 100644
--- a/system/uorb/uORB/uORB.h
+++ b/system/uorb/uORB/uORB.h
@@ -266,7 +266,7 @@ int orb_open(FAR const char *name, int instance, int flags);
 int orb_close(int fd);
 
 /****************************************************************************
- * Name: orb_advertise_multi_queue
+ * Name: orb_advertise_multi_queue_info
  *
  * Description:
  *   This performs the initial advertisement of a topic; it creates the topic
@@ -278,6 +278,7 @@ int orb_close(int fd);
  *   instance     Pointer to an integer which yield the instance ID,
  *                (has default 0 if pointer is NULL).
  *   queue_size   Maximum number of buffered elements.
+ *   info         A pointer to the orb_info_t.
  *
  * Returned Value:
  *   -1 on error, otherwise returns an file descriptor
@@ -287,10 +288,21 @@ int orb_close(int fd);
  *   this function will return -1 and set errno to ENOENT.
  ****************************************************************************/
 
+int orb_advertise_multi_queue_info(FAR const struct orb_metadata *meta,
+                                   FAR const void *data,
+                                   FAR int *instance,
+                                   unsigned int queue_size,
+                                   FAR orb_info_t *info);
+
+static inline
 int orb_advertise_multi_queue(FAR const struct orb_metadata *meta,
                               FAR const void *data,
                               FAR int *instance,
-                              unsigned int queue_size);
+                              unsigned int queue_size)
+{
+  return orb_advertise_multi_queue_info(meta, data, instance,
+                                        queue_size, NULL);
+}
 
 static inline int orb_advertise(FAR const struct orb_metadata *meta,
                                 FAR const void *data)
@@ -338,10 +350,22 @@ static inline int orb_advertise_multi(FAR const struct orb_metadata *meta,
  *   this function will return -1 and set errno to ENOENT.
  ****************************************************************************/
 
+int
+orb_advertise_multi_queue_persist_info(FAR const struct orb_metadata *meta,
+                                       FAR const void *data,
+                                       FAR int *instance,
+                                       unsigned int queue_size,
+                                       FAR orb_info_t *info);
+
+static inline
 int orb_advertise_multi_queue_persist(FAR const struct orb_metadata *meta,
                                       FAR const void *data,
                                       FAR int *instance,
-                                      unsigned int queue_size);
+                                      unsigned int queue_size)
+{
+  return orb_advertise_multi_queue_persist_info(meta, data, instance,
+                                                queue_size, NULL);
+}
 
 /****************************************************************************
  * Name: orb_unadvertise
@@ -691,22 +715,6 @@ int orb_set_interval(int fd, unsigned interval);
 
 int orb_get_interval(int fd, FAR unsigned *interval);
 
-/****************************************************************************
- * Name: orb_set_info
- *
- * Description:
- *   Set topic information.
- *
- * Input Parameters:
- *   fd     A fd returned from orb_subscribe.
- *   info   Data to be transmitted.
- *
- * Returned Value:
- *   0 on success, -1 otherwise with ERRNO set accordingly.
- ****************************************************************************/
-
-int orb_set_info(int fd, FAR const orb_info_t *info);
-
 /****************************************************************************
  * Name: orb_get_info
  *

From ed7bb51b149dcd62a369ebdda13f30854414cdbf Mon Sep 17 00:00:00 2001
From: likun17 <likun17@xiaomi.com>
Date: Mon, 3 Mar 2025 18:29:18 +0800
Subject: [PATCH 121/568] system/uorb:unit_test bug fix

Fixed the error message caused by inconsistent definitions of pthread_t on different platforms.

Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/test/unit_test.c |  6 ------
 system/uorb/uORB/uORB.c      |  4 ++--
 system/uorb/uORB/uORB.h      | 10 +++++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/system/uorb/test/unit_test.c b/system/uorb/test/unit_test.c
index fc28daee5..70cd059df 100644
--- a/system/uorb/test/unit_test.c
+++ b/system/uorb/test/unit_test.c
@@ -235,12 +235,6 @@ static int latency_test(bool print)
       usleep(1000); /* simulate >800 Hz system operation */
     }
 
-  if (pubsub_task < 0)
-    {
-      test_fail("failed launching task");
-      goto out;
-    }
-
   ret = OK;
 
 out:
diff --git a/system/uorb/uORB/uORB.c b/system/uorb/uORB/uORB.c
index 63adb4b64..333fc09e0 100644
--- a/system/uorb/uORB/uORB.c
+++ b/system/uorb/uORB/uORB.c
@@ -43,7 +43,7 @@
  * Name: orb_advsub_open
  *
  * Description:
- *   Open device node as advertiser / subscriber, regist node and save meta
+ *   Open device node as advertiser / subscriber, register node and save meta
  *   in driver for first user, set buffer number for advertisers.
  *
  * Input Parameters:
@@ -68,7 +68,7 @@ static int orb_advsub_open(FAR const struct orb_metadata *meta, int flags,
   snprintf(path, ORB_PATH_MAX, ORB_SENSOR_PATH"%s%d", meta->o_name,
            instance);
 
-  /* Check existance before open */
+  /* Check existence before open */
 
   flags |= O_CLOEXEC;
   fd = open(path, flags);
diff --git a/system/uorb/uORB/uORB.h b/system/uorb/uORB/uORB.h
index f1b9c27b0..205edffb1 100644
--- a/system/uorb/uORB/uORB.h
+++ b/system/uorb/uORB/uORB.h
@@ -108,10 +108,10 @@ struct orb_handle_s
   int                events;      /* Events of interest. */
   int                fd;          /* Topic fd. */
   FAR void          *arg;         /* Callback parameter. */
-  orb_datain_cb_t    datain_cb;   /* User EPOLLIN callback funtion. */
-  orb_dataout_cb_t   dataout_cb;  /* User EPOLLOUT callback funtion. */
-  orb_eventpri_cb_t  eventpri_cb; /* User EPOLLPRI callback funtion. */
-  orb_eventerr_cb_t  eventerr_cb; /* User EPOLLERR callback funtion. */
+  orb_datain_cb_t    datain_cb;   /* User EPOLLIN callback function. */
+  orb_dataout_cb_t   dataout_cb;  /* User EPOLLOUT callback function. */
+  orb_eventpri_cb_t  eventpri_cb; /* User EPOLLPRI callback function. */
+  orb_eventerr_cb_t  eventerr_cb; /* User EPOLLERR callback function. */
 };
 
 struct orb_loop_ops_s;
@@ -806,7 +806,7 @@ orb_abstime orb_absolute_time(void);
  *   then   Past system time.
  *
  * Returned Value:
- *   Bewteen time.
+ *   Between time.
  ****************************************************************************/
 
 static inline orb_abstime orb_elapsed_time(FAR const orb_abstime *then)

From 056ba984e8ee26ceb5ca172b63935eef0f4425f3 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Tue, 21 Jan 2025 22:31:27 +0800
Subject: [PATCH 122/568] tinycrypto: add unix as compile flags to use
 dev/random

Add UNIX platform flag to tinycrypto build configuration to enable access to /dev/random for secure random number generation.

Signed-off-by: makejian <makejian@xiaomi.com>
---
 crypto/tinycrypt/CMakeLists.txt | 3 ++-
 crypto/tinycrypt/Makefile       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crypto/tinycrypt/CMakeLists.txt b/crypto/tinycrypt/CMakeLists.txt
index a44ed6234..c75ae88c6 100644
--- a/crypto/tinycrypt/CMakeLists.txt
+++ b/crypto/tinycrypt/CMakeLists.txt
@@ -64,6 +64,7 @@ if(CONFIG_TINYCRYPT)
   # Sources
   # ############################################################################
 
+  list(APPEND CFLAGS -Dunix)
   set(CSRCS
       ${TINYCRYPT_DIR}/lib/source/utils.c ${TINYCRYPT_DIR}/lib/source/ecc.c
       ${TINYCRYPT_DIR}/lib/source/ecc_platform_specific.c)
@@ -120,7 +121,7 @@ if(CONFIG_TINYCRYPT)
   if(CONFIG_TINYCRYPT_TEST)
     list(APPEND CSRCS ${TINYCRYPT_DIR}/tests/test_ecc_utils.c)
     list(APPEND INCDIR ${TINYCRYPT_DIR}/tests/include)
-    set(CFLAGS -Dhex2bin=ltp_hex2bin -DENABLE_TESTS)
+    list(APPEND CFLAGS -DENABLE_TESTS)
 
     nuttx_add_application(
       NAME
diff --git a/crypto/tinycrypt/Makefile b/crypto/tinycrypt/Makefile
index 6b3930a91..70cee2435 100644
--- a/crypto/tinycrypt/Makefile
+++ b/crypto/tinycrypt/Makefile
@@ -48,6 +48,7 @@ distclean::
 	$(Q) rm -rf $(TINYCRYPT_UNPACKNAME)
 endif
 
+CFLAGS += ${DEFINE_PREFIX}unix
 CSRCS += tinycrypt/lib/source/utils.c
 
 ifeq ($(CONFIG_TINYCRYPT_ECC),y)
@@ -105,8 +106,7 @@ endif
 
 ifeq ($(CONFIG_TINYCRYPT_TEST),y)
 	CFLAGS    += ${INCDIR_PREFIX}$(APPDIR)/crypto/tinycrypt/tinycrypt/tests/include
-	CFLAGS    +=-Dhex2bin=ltp_hex2bin
-	CFLAGS    +=-DENABLE_TESTS
+	CFLAGS    += -DENABLE_TESTS
 	CSRCS     += tinycrypt/tests/test_ecc_utils.c
 	PRIORITY   = $(CONFIG_TINYCRYPT_TEST_PRIORITY)
 	STACKSIZE  = $(CONFIG_TINYCRYPT_TEST_STACKSIZE)

From 45a6b0365c743574648575ba4a28d2c59ca3e884 Mon Sep 17 00:00:00 2001
From: liqinhui <liqinhui@xiaomi.com>
Date: Thu, 15 May 2025 14:46:47 +0800
Subject: [PATCH 123/568] netutils/ping: Support ICMP filter for ping.

Add setsockopt support to filter ICMP packets.

Signed-off-by: liqinhui <liqinhui@xiaomi.com>
---
 include/netutils/icmp_ping.h |  1 +
 netutils/ping/icmp_ping.c    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/include/netutils/icmp_ping.h b/include/netutils/icmp_ping.h
index 3f8d6c29d..d9164afc1 100644
--- a/include/netutils/icmp_ping.h
+++ b/include/netutils/icmp_ping.h
@@ -51,6 +51,7 @@
 #define ICMP_E_RECVFROM    -13 /* extra: error code    */
 #define ICMP_E_RECVSMALL   -15 /* extra: recv bytes    */
 #define ICMP_E_BINDDEV     -17 /* extra: error bind    */
+#define ICMP_E_FILTER      -19 /* extra: error filter  */
 
 /* Negative even number represent warning(recoverable) */
 
diff --git a/netutils/ping/icmp_ping.c b/netutils/ping/icmp_ping.c
index aa88d0a18..88f006b8f 100644
--- a/netutils/ping/icmp_ping.c
+++ b/netutils/ping/icmp_ping.c
@@ -54,6 +54,7 @@
  ****************************************************************************/
 
 #define ICMP_IOBUFFER_SIZE(x) (sizeof(struct icmp_hdr_s) + (x))
+#define ICMP_SET_FILTER(t) (~(1U << (t)))
 
 /****************************************************************************
  * Private Types
@@ -226,6 +227,9 @@ void icmp_ping(FAR const struct ping_info_s *info)
   int ret;
   int ch;
   int i;
+#ifdef CONFIG_NET_SOCKOPTS
+  int filter;
+#endif
 
   g_exiting = false;
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
@@ -278,6 +282,19 @@ void icmp_ping(FAR const struct ping_info_s *info)
     }
 #endif
 
+#ifdef CONFIG_NET_SOCKOPTS
+  filter = ICMP_SET_FILTER(ICMP_ECHO_REPLY);
+  ret = setsockopt(priv->sockfd, IPPROTO_ICMP, ICMP_FILTER,
+                   &filter, sizeof(filter));
+  if (ret < 0)
+    {
+      icmp_callback(&result, ICMP_E_FILTER, errno);
+      close(priv->sockfd);
+      free(priv);
+      return;
+    }
+#endif
+
   priv->kickoff = clock();
 
   memset(&priv->destaddr, 0, sizeof(struct sockaddr_in));

From 5595a01fcd11e1e760e3cd0f42bb2054fc2f58eb Mon Sep 17 00:00:00 2001
From: guoshichao <guoshichao@xiaomi.com>
Date: Wed, 19 Mar 2025 16:40:47 +0800
Subject: [PATCH 124/568] watchdog: disable the drivertest_watchdog_api
 testcase on some platform

When we support the watchdog interrupt on the Armv7-A platform with
the TEE enabled, the watchdog interrupt needs to be configured as
a FIQ to avoid the impact of interrupt disabling in the AP.
In this case, the drivertest_watchdog_api testcase cannot pass the
test in such a scenario.

This is because the drivertest_watchdog_api itself requires
calling a specified callback after the watchdog interrupt is
triggered, instead of directly dumping the AP's context and
then asserting the system.

Therefore, when both CONFIG_ARCH_ARMV7A and CONFIG_ARCH_HAVE_TRUSTZONE
are enabled, we need to skip the current drivertest_watchdog_api
testcase.

Signed-off-by: guoshichao <guoshichao@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_watchdog.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/testing/drivers/drivertest/drivertest_watchdog.c b/testing/drivers/drivertest/drivertest_watchdog.c
index 1a4f54c49..1021e8e10 100644
--- a/testing/drivers/drivertest/drivertest_watchdog.c
+++ b/testing/drivers/drivertest/drivertest_watchdog.c
@@ -57,7 +57,11 @@
 #define WDG_DEFAULT_TIMEOUT 2000
 #define WDG_DEFAULT_TESTCASE 0
 #define WDG_DEFAULT_DEVIATION 20
+#if defined(CONFIG_ARCH_ARMV7A) && defined(CONFIG_ARCH_HAVE_TRUSTZONE)
+#define WDG_COUNT_TESTCASE 3
+#else
 #define WDG_COUNT_TESTCASE 4
+#endif
 
 #define OPTARG_TO_VALUE(value, type, base)                            \
   do                                                                  \
@@ -544,7 +548,9 @@ int main(int argc, FAR char *argv[])
     cmocka_unit_test_prestate(drivertest_watchdog_feeding, &wdg_state),
     cmocka_unit_test_prestate(drivertest_watchdog_interrupts, &wdg_state),
     cmocka_unit_test_prestate(drivertest_watchdog_loop, &wdg_state),
+#if !defined(CONFIG_ARCH_ARMV7A) || !defined(CONFIG_ARCH_HAVE_TRUSTZONE)
     cmocka_unit_test_prestate(drivertest_watchdog_api, &wdg_state)
+#endif
   };
 
   return cmocka_run_group_tests(tests, NULL, NULL);

From df30f84f334d399cc734fda47591d4d5890a6aeb Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Mon, 19 Jan 2026 13:23:50 +0800
Subject: [PATCH 125/568] ostest/hrtimer: sync hrtimer test with latest updates

Synchronize the hrtimer ostest with the latest hrtimer changes.

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/hrtimer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index fcbe1f5d9..3943140e6 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -211,11 +211,12 @@ void hrtimer_test(void)
 
   /* Initialize the high-resolution timer */
 
-  hrtimer_init(&hrtimer_test.timer, test_hrtimer_callback);
+  hrtimer_init(&hrtimer_test.timer);
 
   /* Start the timer with 500ms relative timeout */
 
   ret = hrtimer_start(&hrtimer_test.timer,
+                      test_hrtimer_callback,
                       hrtimer_test.period,
                       HRTIMER_MODE_REL);
 

From a75fa37090aaeda1fd95477e8fe74e6675384580 Mon Sep 17 00:00:00 2001
From: guanyi3 <guanyi3@xiaomi.com>
Date: Fri, 10 Oct 2025 11:45:45 +0800
Subject: [PATCH 126/568] usrsocktest: fix TEST_ASSERT_EQUAL fail for POLLIN

This assertion should be removed because the POLLIN event is now only
raised when there is data pending to be received. Previously, POLLIN
was incorrectly set as soon as the connection was established, even
when no data was available, which was not consistent with the expected
behavior.

Signed-off-by: guanyi3 <guanyi3@xiaomi.com>
---
 examples/usrsocktest/usrsocktest_remote_disconnect.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/usrsocktest/usrsocktest_remote_disconnect.c b/examples/usrsocktest/usrsocktest_remote_disconnect.c
index 1e3681f9d..79ccbfefb 100644
--- a/examples/usrsocktest/usrsocktest_remote_disconnect.c
+++ b/examples/usrsocktest/usrsocktest_remote_disconnect.c
@@ -871,7 +871,6 @@ static void remote_disconnect_poll2(struct usrsocktest_daemon_conf_s *dconf)
       TEST_ASSERT_EQUAL(1, ret);
       TEST_ASSERT_EQUAL(0, pfd.revents & POLLERR);
       TEST_ASSERT_EQUAL(POLLHUP, pfd.revents & POLLHUP);
-      TEST_ASSERT_EQUAL(*events & POLLIN, pfd.revents & POLLIN);
       TEST_ASSERT_EQUAL(0, pfd.revents & POLLOUT);
       TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
       TEST_ASSERT_EQUAL(0, usrsocktest_daemon_get_num_connected_sockets());

From 782de2748fa623a005e9f1d3410bc076388f8955 Mon Sep 17 00:00:00 2001
From: guoshichao <guoshichao@xiaomi.com>
Date: Thu, 25 Sep 2025 14:33:46 +0800
Subject: [PATCH 127/568] cu: implement the cu exit logic like top cmd

using the local cu_globals_s instance to manange the cu exit procedure

Signed-off-by: guoshichao <guoshichao@xiaomi.com>
---
 system/cu/cu_main.c | 57 ++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index 1e991460d..6e25acfc9 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -79,8 +79,6 @@ enum parity_mode
  * Private Data
  ****************************************************************************/
 
-static struct cu_globals_s g_cu;
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -127,7 +125,8 @@ static FAR void *cu_listener(FAR void *parameter)
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
 static void sigint(int sig)
 {
-  g_cu.force_exit = true;
+  FAR struct cu_globals_s *cu = siginfo->si_user;
+  cu->force_exit = true;
 }
 #endif
 
@@ -280,8 +279,8 @@ int main(int argc, FAR char *argv[])
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
   struct sigaction sa;
 #endif
+  struct cu_globals_s cu;
   FAR const char *devname = CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE;
-  FAR struct cu_globals_s *cu = &g_cu;
 #ifdef CONFIG_SERIAL_TERMIOS
   int baudrate = CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD;
   enum parity_mode parity = PARITY_NONE;
@@ -297,8 +296,8 @@ int main(int argc, FAR char *argv[])
 
   /* Initialize global data */
 
-  memset(cu, 0, sizeof(*cu));
-  cu->escape = '~';
+  memset(&cu, 0, sizeof(cu));
+  cu.escape = '~';
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
   /* Install signal handlers */
 
@@ -338,7 +337,7 @@ int main(int argc, FAR char *argv[])
             break;
 
           case 'E':
-            cu->escape = atoi(optarg);
+            cu.escape = atoi(optarg);
             break;
 
           case 'h':
@@ -361,8 +360,8 @@ int main(int argc, FAR char *argv[])
 
   /* Open the serial device for reading and writing */
 
-  cu->devfd = open(devname, O_RDWR);
-  if (cu->devfd < 0)
+  cu.devfd = open(devname, O_RDWR);
+  if (cu.devfd < 0)
     {
       cu_error("cu_main: ERROR: Failed to open %s for writing: %d\n",
                devname, errno);
@@ -371,9 +370,9 @@ int main(int argc, FAR char *argv[])
 
   /* Remember serial device termios attributes */
 
-  if (isatty(cu->devfd))
+  if (isatty(cu.devfd))
     {
-      ret = tcgetattr(cu->devfd, &cu->devtio);
+      ret = tcgetattr(cu.devfd, &cu.devtio);
       if (ret)
         {
           cu_error("cu_main: ERROR during tcgetattr(): %d\n", errno);
@@ -387,30 +386,30 @@ int main(int argc, FAR char *argv[])
 
   if (isatty(STDERR_FILENO))
     {
-      cu->stdfd = STDERR_FILENO;
+      cu.stdfd = STDERR_FILENO;
     }
   else if (isatty(STDOUT_FILENO))
     {
-      cu->stdfd = STDOUT_FILENO;
+      cu.stdfd = STDOUT_FILENO;
     }
   else if (isatty(STDIN_FILENO))
     {
-      cu->stdfd = STDIN_FILENO;
+      cu.stdfd = STDIN_FILENO;
     }
   else
     {
-      cu->stdfd = -1;
+      cu.stdfd = -1;
     }
 
-  if (cu->stdfd >= 0)
+  if (cu.stdfd >= 0)
     {
-      tcgetattr(cu->stdfd, &cu->stdtio);
+      tcgetattr(cu.stdfd, &cu.stdtio);
     }
 
 #ifdef CONFIG_SERIAL_TERMIOS
-  if (set_termios(cu, baudrate, parity, rtscts, nocrlf) != 0)
+  if (set_termios(&cu, baudrate, parity, rtscts, nocrlf) != 0)
 #else
-  if (set_termios(cu, nocrlf) != 0)
+  if (set_termios(&cu, nocrlf) != 0)
 #endif
     {
       goto errout_with_devfd_retrieve;
@@ -429,7 +428,7 @@ int main(int argc, FAR char *argv[])
 
   attr.priority = CONFIG_SYSTEM_CUTERM_PRIORITY;
 
-  ret = pthread_create(&cu->listener, &attr, cu_listener, cu);
+  ret = pthread_create(&cu.listener, &attr, cu_listener, &cu);
   pthread_attr_destroy(&attr);
   if (ret != 0)
     {
@@ -439,7 +438,7 @@ int main(int argc, FAR char *argv[])
 
   /* Send messages and get responses -- forever */
 
-  while (!cu->force_exit)
+  while (!cu.force_exit)
     {
       char buf[CONFIG_LINE_MAX];
       ssize_t nwrite = 0;
@@ -469,21 +468,21 @@ int main(int argc, FAR char *argv[])
                */
 
               escaping = false;
-              if (cu_cmd(cu, ch) == 1)
+              if (cu_cmd(&cu, ch) == 1)
                 {
-                  cu->force_exit = true;
+                  cu.force_exit = true;
                   nread = i;
                   break;
                 }
             }
 
-          if (start_of_line == 1 && ch == cu->escape)
+          if (start_of_line == 1 && ch == cu.escape)
             {
               /* Normal character */
 
               if (i > nwrite)
                 {
-                  write(cu->devfd, &buf[nwrite], i - nwrite);
+                  write(cu.devfd, &buf[nwrite], i - nwrite);
                 }
 
               nwrite = i + 1;
@@ -514,19 +513,19 @@ int main(int argc, FAR char *argv[])
 
       if (nread > nwrite)
         {
-          write(cu->devfd, &buf[nwrite], nread - nwrite);
+          write(cu.devfd, &buf[nwrite], nread - nwrite);
         }
     }
 
-  pthread_cancel(cu->listener);
+  pthread_cancel(cu.listener);
   exitval = EXIT_SUCCESS;
 
   /* Error exits */
 
 errout_with_devfd_retrieve:
-  retrieve_termios(cu);
+  retrieve_termios(&cu);
 errout_with_devfd:
-  close(cu->devfd);
+  close(cu.devfd);
 errout_with_devinit:
   return exitval;
 }

From 33d5062ba68c7405035608941a31e3b76ad3db3e Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Wed, 4 Jun 2025 11:12:20 +0800
Subject: [PATCH 128/568] openssl_wrapper_mbedtls: support bio interfaces in
 openssl

VELAPLATFO-62586

Change-Id: I5d7675c05dc3a52c1cb15a6132b969a19f848248
Signed-off-by: makejian <makejian@xiaomi.com>
(cherry picked from commit 409c86a062a816b56a3a48b1111102d12f24a48f)
---
 .../include/openssl/bio.h                     |  72 +++++-
 .../include/openssl/types.h                   |   4 +-
 .../openssl_mbedtls_wrapper/mbedtls/bio_b64.c | 147 +++++++++++
 .../openssl_mbedtls_wrapper/mbedtls/bio_lib.c | 151 +++++++++++
 .../openssl_mbedtls_wrapper/mbedtls/bss_mem.c | 236 ++++++++++++++++++
 5 files changed, 608 insertions(+), 2 deletions(-)
 create mode 100644 crypto/openssl_mbedtls_wrapper/mbedtls/bio_b64.c
 create mode 100644 crypto/openssl_mbedtls_wrapper/mbedtls/bio_lib.c
 create mode 100644 crypto/openssl_mbedtls_wrapper/mbedtls/bss_mem.c

diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h b/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
index be8acf198..7bfab1eb9 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/bio.h
@@ -27,16 +27,86 @@
  ****************************************************************************/
 
 #include <openssl/base.h>
+#include <openssl/types.h>
 
 /****************************************************************************
- * Public Function Prototypes
+ * Pre-processor Definitions
  ****************************************************************************/
 
+/* There are the classes of BIOs */
+
+#define BIO_TYPE_DESCRIPTOR     0x0100 /* socket, fd, connect or accept */
+#define BIO_TYPE_FILTER         0x0200
+#define BIO_TYPE_SOURCE_SINK    0x0400
+
+#define BIO_FLAGS_BASE64_NO_NL  0x100
+
+/* This is used with memory BIOs: BIO_FLAGS_MEM_RDONLY
+ * means we shouldn't free up or change the data in any way;
+ * BIO_FLAGS_NONCLEAR_RST means we shouldn't clear data on reset.
+ */
+
+#define BIO_FLAGS_MEM_RDONLY    0x200
+#define BIO_FLAGS_NONCLEAR_RST  0x400
+#define BIO_FLAGS_IN_EOF        0x800
+
+#define BIO_TYPE_NONE           0
+#define BIO_TYPE_MEM           (1 | BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_FILE          (2 | BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_BASE64        (11 | BIO_TYPE_FILTER)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct bio_method_st
+{
+  int type;
+  char *name;
+  int (*bwrite_old) (BIO *, const char *, int);
+  int (*bread_old) (BIO *, char *, int);
+  int (*create) (BIO *);
+  int (*destroy) (BIO *);
+};
+
+struct bio_st
+{
+  const BIO_METHOD *method;
+  int flags;                  /* extra storage */
+  void *ptr;
+  struct bio_st *next_bio;    /* used by filter BIOs */
+  struct bio_st *prev_bio;    /* used by filter BIOs */
+};
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+const BIO_METHOD *BIO_f_base64(void);
+
+const BIO_METHOD *BIO_s_mem(void);
+
+BIO *BIO_new(const BIO_METHOD *method);
+
+BIO *BIO_push(BIO *b, BIO *bio);
+
+void BIO_set_flags(BIO *b, int flags);
+
+int BIO_write(BIO *b, const void *data, int dlen);
+
+int BIO_read(BIO *b, void *data, int dlen);
+
+void BIO_free_all(BIO *bio);
+
+BIO *BIO_next(BIO *b);
+
+int BIO_flush(BIO *b);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/types.h b/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
index 679fb94c5..c03078645 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
@@ -29,10 +29,12 @@ typedef void SSL_CIPHER;
 typedef void X509_STORE;
 
 typedef void RSA;
-typedef void BIO;
 
 typedef int (*OPENSSL_sk_compfunc)(const void *, const void *);
 
+typedef struct bio_buf_mem_st BIO_BUF_MEM;
+typedef struct bio_method_st BIO_METHOD;
+typedef struct bio_st BIO;
 typedef struct stack_st OPENSSL_STACK;
 typedef struct ssl_method_st SSL_METHOD;
 typedef struct ssl_method_func_st SSL_METHOD_FUNC;
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/bio_b64.c b/crypto/openssl_mbedtls_wrapper/mbedtls/bio_b64.c
new file mode 100644
index 000000000..a13d4f26c
--- /dev/null
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/bio_b64.c
@@ -0,0 +1,147 @@
+/****************************************************************************
+ * apps/crypto/openssl_mbedtls_wrapper/mbedtls/bio_b64.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <sys/param.h>
+
+#include <mbedtls/base64.h>
+#include <openssl/bio.h>
+#include <openssl/types.h>
+
+/****************************************************************************
+ * Pre-processor definitions
+ ****************************************************************************/
+
+#define BIO_B64_BUFSIZE ((BIO_B64_ENC_LEN / 3) * 4 + 1)
+#define BIO_B64_ENC_LEN 192
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int b64_write(BIO *h, const char *buf, int num);
+static int b64_read(BIO *h, char *buf, int size);
+static int b64_new(BIO *h);
+static int b64_free(BIO *data);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const BIO_METHOD g_methods_b64 =
+{
+  BIO_TYPE_BASE64,
+  "base64 encoding",
+  b64_write,
+  b64_read,
+  b64_new,
+  b64_free,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int b64_write(BIO *b, const char *in, int inl)
+{
+  BIO *next;
+  int len;
+  int offset = 0;
+  int ret = 0;
+  size_t n;
+  unsigned char out[BIO_B64_BUFSIZE];
+
+  next = BIO_next(b);
+  if (next == NULL)
+    {
+      return 0;
+    }
+
+  while (inl > 0)
+    {
+      len = MIN(inl, BIO_B64_ENC_LEN);
+      ret = mbedtls_base64_encode(out, BIO_B64_BUFSIZE, &n,
+                                  (const unsigned char *)in + offset, len);
+      if (ret < 0)
+        {
+          break;
+        }
+
+      ret = BIO_write(next, out, n);
+      inl -= len;
+      offset += len;
+    }
+
+  return ret;
+}
+
+static int b64_read(BIO *b, char *out, int outl)
+{
+  BIO *next;
+  int ret;
+  size_t n;
+
+  if (out == NULL)
+    {
+      return 0;
+    }
+
+  next = BIO_next(b);
+  if (next == NULL)
+    {
+      return 0;
+    }
+
+  ret = BIO_read(next, out, outl);
+  if (ret > 0)
+    {
+      ret = mbedtls_base64_decode((unsigned char *)out, outl, &n,
+                                  (const unsigned char *)out, ret);
+      if (ret == 0)
+        {
+          ret = n;
+        }
+    }
+
+  return ret;
+}
+
+static int b64_new(BIO *bi)
+{
+  return 1;
+}
+
+static int b64_free(BIO *a)
+{
+  return 1;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+const BIO_METHOD *BIO_f_base64(void)
+{
+  return &g_methods_b64;
+}
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/bio_lib.c b/crypto/openssl_mbedtls_wrapper/mbedtls/bio_lib.c
new file mode 100644
index 000000000..36d08403a
--- /dev/null
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/bio_lib.c
@@ -0,0 +1,151 @@
+/****************************************************************************
+ * apps/crypto/openssl_mbedtls_wrapper/mbedtls/bio_lib.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdio.h>
+
+#include <openssl/bio.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+BIO *BIO_new(const BIO_METHOD *method)
+{
+  BIO *bio = zalloc(sizeof(*bio));
+
+  if (bio == NULL)
+    {
+      return NULL;
+    }
+
+  bio->method = method;
+
+  if (method->create != NULL && !method->create(bio))
+    {
+      free(bio);
+      return NULL;
+    }
+
+  return bio;
+}
+
+BIO *BIO_push(BIO *b, BIO *bio)
+{
+  BIO *lb;
+
+  if (b == NULL)
+    {
+      return bio;
+    }
+  else if (bio == NULL)
+    {
+      return b;
+    }
+
+  lb = b;
+  while (lb->next_bio != NULL)
+    {
+      lb = lb->next_bio;
+    }
+
+  lb->next_bio = bio;
+  bio->prev_bio = lb;
+  return b;
+}
+
+void BIO_set_flags(BIO *b, int flags)
+{
+  b->flags |= flags;
+}
+
+int BIO_write(BIO *b, const void *data, int dlen)
+{
+  if (b == NULL || dlen <= 0)
+    {
+      return 0;
+    }
+
+  if (b->method == NULL || b->method->bwrite_old == NULL)
+    {
+      return -2;
+    }
+
+  return b->method->bwrite_old(b, data, dlen);
+}
+
+int BIO_read(BIO *b, void *data, int dlen)
+{
+  if (b == NULL || dlen <= 0)
+    {
+      return 0;
+    }
+
+  if (b->method == NULL || b->method->bread_old == NULL)
+    {
+      return -2;
+    }
+
+  return b->method->bread_old(b, data, dlen);
+}
+
+int BIO_free(BIO *a)
+{
+  if (a == NULL)
+    {
+      return 0;
+    }
+
+  if (a->method != NULL && a->method->destroy != NULL)
+    {
+      a->method->destroy(a);
+    }
+
+  free(a);
+  return 1;
+}
+
+void BIO_free_all(BIO *bio)
+{
+  while (bio != NULL)
+    {
+      BIO *b = bio;
+      bio = bio->next_bio;
+      BIO_free(b);
+    }
+}
+
+BIO *BIO_next(BIO *b)
+{
+  if (b == NULL)
+    {
+      return NULL;
+    }
+
+  return b->next_bio;
+}
+
+int BIO_flush(BIO *b)
+{
+  return 1;
+}
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/bss_mem.c b/crypto/openssl_mbedtls_wrapper/mbedtls/bss_mem.c
new file mode 100644
index 000000000..40f884135
--- /dev/null
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/bss_mem.c
@@ -0,0 +1,236 @@
+/****************************************************************************
+ * apps/crypto/openssl_mbedtls_wrapper/mbedtls/bss_mem.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/param.h>
+
+#include <openssl/bio.h>
+
+/****************************************************************************
+ * Pre-processor definitions
+ ****************************************************************************/
+
+/* LIMIT_BEFORE_EXPANSION is the maximum n such that (n+3)/3*4 < 2**31. That
+ * function is applied in several functions in this file and this limit
+ * ensures that the result fits in an int.
+ */
+
+#define LIMIT_BEFORE_EXPANSION 0x5ffffffc
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int mem_write(BIO *h, const char *buf, int num);
+static int mem_read(BIO *h, char *buf, int size);
+static int mem_new(BIO *h);
+static int mem_free(BIO *data);
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct bio_buf_mem_st
+{
+  unsigned long flags;
+  char *data;
+  size_t length;              /* current number of bytes */
+  size_t max;                 /* size of buffer */
+  size_t offset;              /* has been read */
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const BIO_METHOD g_mem_method =
+{
+  BIO_TYPE_MEM,
+  "memory buffer",
+  mem_write,
+  mem_read,
+  mem_new,
+  mem_free,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int mem_buf_sync(BIO *b)
+{
+  if (b != NULL && b->ptr != NULL)
+    {
+      BIO_BUF_MEM *bbm = (BIO_BUF_MEM *)b->ptr;
+
+      if (bbm->offset)
+        {
+          bbm->length = bbm->length - bbm->offset;
+          memmove(bbm->data, bbm->data + bbm->offset, bbm->length);
+          bbm->offset = 0;
+        }
+    }
+
+  return 0;
+}
+
+static size_t BUF_MEM_grow_clean(BIO_BUF_MEM *bbm, size_t len)
+{
+  char *ret;
+  size_t n;
+
+  if (bbm->length >= len)
+    {
+      if (bbm->data != NULL)
+        {
+          memset(&bbm->data[len], 0, bbm->length - len);
+        }
+
+      bbm->length = len;
+      return len;
+    }
+
+  if (bbm->max >= len)
+    {
+      memset(&bbm->data[bbm->length], 0, len - bbm->length);
+      bbm->length = len;
+      return len;
+    }
+
+  /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
+
+  if (len > LIMIT_BEFORE_EXPANSION)
+    {
+      return 0;
+    }
+
+  n = MAX((len + 3) / 3 * 4, bbm->max);
+  ret = realloc(bbm->data, n);
+  if (ret == NULL)
+    {
+      return 0;
+    }
+
+  bbm->data = ret;
+  bbm->max = n;
+  bbm->length = len;
+  return len;
+}
+
+static int mem_write(BIO *b, const char *in, int inl)
+{
+  BIO_BUF_MEM *bbm = (BIO_BUF_MEM *)b->ptr;
+  int blen;
+
+  if (b->flags & BIO_FLAGS_MEM_RDONLY)
+    {
+      return -1;
+    }
+
+  if (inl <= 0)
+    {
+      return 0;
+    }
+  else if (in == NULL)
+    {
+      return -1;
+    }
+
+  blen = bbm->length - bbm->offset;
+  mem_buf_sync(b);
+  if (BUF_MEM_grow_clean(bbm, blen + inl) == 0)
+    {
+      return -1;
+    }
+
+  memcpy(bbm->data + blen, in, inl);
+  return inl;
+}
+
+static int mem_read(BIO *b, char *out, int outl)
+{
+  BIO_BUF_MEM *bbm = (BIO_BUF_MEM *)b->ptr;
+
+  if (outl <= 0)
+    {
+      return 0;
+    }
+
+  if (out == NULL)
+    {
+      return -1;
+    }
+
+  if (outl > bbm->length - bbm->offset)
+    {
+      outl = bbm->length - bbm->offset;
+    }
+
+  memcpy(out, bbm->data + bbm->offset, outl);
+  bbm->offset += outl;
+  return outl;
+}
+
+static int mem_new(BIO *bi)
+{
+  BIO_BUF_MEM *bbm = zalloc(sizeof(*bbm));
+
+  if (bbm == NULL)
+    {
+      return 0;
+    }
+
+  bi->ptr = bbm;
+  return 1;
+}
+
+static int mem_free(BIO *a)
+{
+  BIO_BUF_MEM *bbm;
+
+  if (a == NULL)
+    {
+      return 0;
+    }
+
+  bbm = (BIO_BUF_MEM *)a->ptr;
+  if (bbm->data)
+    {
+      free(bbm->data);
+    }
+
+  free(bbm);
+  return 1;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+const BIO_METHOD *BIO_s_mem(void)
+{
+  return &g_mem_method;
+}

From 94ffd5e9f0823144320465b4d269280c22ca48eb Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Fri, 6 Jun 2025 13:43:24 +0800
Subject: [PATCH 129/568] openssl_wrapper_mbedtls: extend openssl interfaces in
 ssl module for mqtt

VELAPLATFO-62586

Change-Id: I3b56b028e76aee118ed90211c097ac3fe86bc129
Signed-off-by: makejian <makejian@xiaomi.com>
(cherry picked from commit 7a567e98489f64b740044b9ce4066fa8d41af359)
---
 .../include/openssl/crypto.h                  |  48 +++
 .../include/openssl/err.h                     |   6 +
 .../include/openssl/evp.h                     |   8 +
 .../include/openssl/ssl.h                     | 240 +++++++++--
 .../include/openssl/ssl_local.h               |  40 +-
 .../include/openssl/tls1.h                    |  53 ++-
 .../include/openssl/types.h                   |  18 +-
 .../include/openssl/x509.h                    |  18 +-
 crypto/openssl_mbedtls_wrapper/mbedtls/err.c  |  27 ++
 crypto/openssl_mbedtls_wrapper/mbedtls/evp.c  |   9 +
 .../openssl_mbedtls_wrapper/mbedtls/ssl_lib.c | 404 +++++++++++++++++-
 .../mbedtls/ssl_methods.c                     |   3 +-
 .../mbedtls/ssl_methods.h                     |  30 +-
 .../openssl_mbedtls_wrapper/mbedtls/ssl_pm.c  | 166 +++----
 .../openssl_mbedtls_wrapper/mbedtls/ssl_pm.h  |   6 +-
 .../openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c |   5 +
 16 files changed, 907 insertions(+), 174 deletions(-)
 create mode 100644 crypto/openssl_mbedtls_wrapper/include/openssl/crypto.h

diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/crypto.h b/crypto/openssl_mbedtls_wrapper/include/openssl/crypto.h
new file mode 100644
index 000000000..b573b2949
--- /dev/null
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/crypto.h
@@ -0,0 +1,48 @@
+/****************************************************************************
+ * apps/crypto/openssl_mbedtls_wrapper/include/openssl/crypto.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************************/
+
+#ifndef OPENSSL_MBEDTLS_WRAPPER_CRYPTO_H
+#define OPENSSL_MBEDTLS_WRAPPER_CRYPTO_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <openssl/base.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CRYPTO_num_locks()      1
+#define CRYPTO_set_locking_callback(func)
+
+#define CRYPTO_set_id_callback(func)
+
+/* These defines where used in combination with the old locking callbacks,
+ * they are not called anymore, but old code that's not called might still
+ * use them.
+ */
+
+#define CRYPTO_LOCK             1
+#define CRYPTO_UNLOCK           2
+#define CRYPTO_READ             4
+#define CRYPTO_WRITE            8
+
+#endif /* OPENSSL_MBEDTLS_WRAPPER_CRYPTO_H */
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/err.h b/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
index f6637eca4..1453be16e 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/err.h
@@ -49,6 +49,12 @@ unsigned long ERR_peek_last_error(void);
 void ERR_error_string_n(unsigned long e, char *buf, size_t len);
 void ERR_free_strings(void);
 char *ERR_error_string(unsigned long e, char *buf);
+void ERR_clear_error(void);
+unsigned long ERR_get_error(void);
+void ERR_remove_state(unsigned long pid);
+int ERR_load_crypto_strings(void);
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+                         void *u);
 
 #ifdef __cplusplus
 }
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h b/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
index f65a51d88..e1696bfa6 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/evp.h
@@ -44,6 +44,10 @@
 
 #define EVP_PKEY_X25519 NID_X25519
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 struct evp_pkey_st
 {
   void *pkey_pm;
@@ -166,6 +170,10 @@ int PKCS5_PBKDF2_HMAC(const char *password, size_t password_len,
 
 const PKEY_METHOD *EVP_PKEY_method(void);
 
+int OpenSSL_add_all_algorithms(void);
+
+void EVP_cleanup(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
index 937c1ab95..94291eea8 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
@@ -25,13 +25,19 @@
  ****************************************************************************/
 
 #include <stddef.h>
+#include <openssl/ex_data.h>
 #include <openssl/types.h>
+#include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/tls1.h>
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-#define SSL_SENT_SHUTDOWN       1
-#define SSL_RECEIVED_SHUTDOWN   2
+#define SSL_SENT_SHUTDOWN               1
+#define SSL_RECEIVED_SHUTDOWN           2
 
 #define SSL_VERIFY_NONE                 0x00
 #define SSL_VERIFY_PEER                 0x01
@@ -57,52 +63,133 @@
 #define SSL_ERROR_WANT_READ             2
 #define SSL_ERROR_WANT_WRITE            3
 #define SSL_ERROR_WANT_X509_LOOKUP      4
-#define SSL_ERROR_SYSCALL               5/* look at error stack/return value/errno */
+#define SSL_ERROR_SYSCALL               5 /* look at error stack/return value/errno */
 #define SSL_ERROR_ZERO_RETURN           6
 #define SSL_ERROR_WANT_CONNECT          7
 #define SSL_ERROR_WANT_ACCEPT           8
 #define SSL_ERROR_WANT_ASYNC            9
-#define SSL_ERROR_WANT_ASYNC_JOB       10
+#define SSL_ERROR_WANT_ASYNC_JOB        10
+
+#define SSL_ST_CONNECT                  0x1000
+#define SSL_ST_ACCEPT                   0x2000
+
+#define SSL_ST_MASK                     0x0FFF
+
+#define SSL_CB_LOOP                     0x01
+#define SSL_CB_EXIT                     0x02
+#define SSL_CB_READ                     0x04
+#define SSL_CB_WRITE                    0x08
+#define SSL_CB_ALERT                    0x4000 /* used in callback */
+#define SSL_CB_READ_ALERT               (SSL_CB_ALERT | SSL_CB_READ)
+#define SSL_CB_WRITE_ALERT              (SSL_CB_ALERT | SSL_CB_WRITE)
+#define SSL_CB_ACCEPT_LOOP              (SSL_ST_ACCEPT | SSL_CB_LOOP)
+#define SSL_CB_ACCEPT_EXIT              (SSL_ST_ACCEPT | SSL_CB_EXIT)
+#define SSL_CB_CONNECT_LOOP             (SSL_ST_CONNECT | SSL_CB_LOOP)
+#define SSL_CB_CONNECT_EXIT             (SSL_ST_CONNECT | SSL_CB_EXIT)
+#define SSL_CB_HANDSHAKE_START          0x10
+#define SSL_CB_HANDSHAKE_DONE           0x20
+
+#define SSL_FILETYPE_ASN1               X509_FILETYPE_ASN1
+#define SSL_FILETYPE_PEM                X509_FILETYPE_PEM
+
+/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
+ * when just a single record has been written):
+ */
+
+#define SSL_MODE_ENABLE_PARTIAL_WRITE   0x00000001U
+
+/* Make it possible to retry SSL_write() with changed buffer location (buffer
+ * contents must stay the same!); this is not the default to avoid the
+ * misconception that non-blocking SSL_write() behaves like non-blocking
+ * write():
+ */
+
+#define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002U
+
+#define SSLEAY_VERSION                  0
+#define SSLEAY_CFLAGS                   1
+#define SSLEAY_BUILT_ON                 2
+#define SSLEAY_PLATFORM                 3
+#define SSLEAY_DIR                      4
+
+#define SSL2_VERSION                    0x0002
+
+#define SSL2_MT_CLIENT_HELLO            1
+
+#define SSLv23_client_method            TLS_client_method
+#define SSL_library_init()              1
+#define SSL_load_error_strings()
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+typedef unsigned int (*SSL_psk_client_cb_func)(SSL *ssl,
+                                               const char *hint,
+                                               char *identity,
+                                               unsigned int max_identity_len,
+                                               unsigned char *psk,
+                                               unsigned int max_psk_len);
+
+typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
+                            const void *buf, size_t len, SSL *ssl, void *arg);
 
 typedef enum
 {
-    TLS_ST_BEFORE,
-    TLS_ST_OK,
-    DTLS_ST_CR_HELLO_VERIFY_REQUEST,
-    TLS_ST_CR_SRVR_HELLO,
-    TLS_ST_CR_CERT,
-    TLS_ST_CR_CERT_STATUS,
-    TLS_ST_CR_KEY_EXCH,
-    TLS_ST_CR_CERT_REQ,
-    TLS_ST_CR_SRVR_DONE,
-    TLS_ST_CR_SESSION_TICKET,
-    TLS_ST_CR_CHANGE,
-    TLS_ST_CR_FINISHED,
-    TLS_ST_CW_CLNT_HELLO,
-    TLS_ST_CW_CERT,
-    TLS_ST_CW_KEY_EXCH,
-    TLS_ST_CW_CERT_VRFY,
-    TLS_ST_CW_CHANGE,
-    TLS_ST_CW_NEXT_PROTO,
-    TLS_ST_CW_FINISHED,
-    TLS_ST_SW_HELLO_REQ,
-    TLS_ST_SR_CLNT_HELLO,
-    DTLS_ST_SW_HELLO_VERIFY_REQUEST,
-    TLS_ST_SW_SRVR_HELLO,
-    TLS_ST_SW_CERT,
-    TLS_ST_SW_KEY_EXCH,
-    TLS_ST_SW_CERT_REQ,
-    TLS_ST_SW_SRVR_DONE,
-    TLS_ST_SR_CERT,
-    TLS_ST_SR_KEY_EXCH,
-    TLS_ST_SR_CERT_VRFY,
-    TLS_ST_SR_NEXT_PROTO,
-    TLS_ST_SR_CHANGE,
-    TLS_ST_SR_FINISHED,
-    TLS_ST_SW_SESSION_TICKET,
-    TLS_ST_SW_CERT_STATUS,
-    TLS_ST_SW_CHANGE,
-    TLS_ST_SW_FINISHED
+  TLS_ST_BEFORE,
+  TLS_ST_OK,
+  DTLS_ST_CR_HELLO_VERIFY_REQUEST,
+  TLS_ST_CR_SRVR_HELLO,
+  TLS_ST_CR_CERT,
+  TLS_ST_CR_COMP_CERT,
+  TLS_ST_CR_CERT_STATUS,
+  TLS_ST_CR_KEY_EXCH,
+  TLS_ST_CR_CERT_REQ,
+  TLS_ST_CR_SRVR_DONE,
+  TLS_ST_CR_SESSION_TICKET,
+  TLS_ST_CR_CHANGE,
+  TLS_ST_CR_FINISHED,
+  TLS_ST_CW_CLNT_HELLO,
+  TLS_ST_CW_CERT,
+  TLS_ST_CW_COMP_CERT,
+  TLS_ST_CW_KEY_EXCH,
+  TLS_ST_CW_CERT_VRFY,
+  TLS_ST_CW_CHANGE,
+  TLS_ST_CW_NEXT_PROTO,
+  TLS_ST_CW_FINISHED,
+  TLS_ST_SW_HELLO_REQ,
+  TLS_ST_SR_CLNT_HELLO,
+  DTLS_ST_SW_HELLO_VERIFY_REQUEST,
+  TLS_ST_SW_SRVR_HELLO,
+  TLS_ST_SW_CERT,
+  TLS_ST_SW_COMP_CERT,
+  TLS_ST_SW_KEY_EXCH,
+  TLS_ST_SW_CERT_REQ,
+  TLS_ST_SW_SRVR_DONE,
+  TLS_ST_SR_CERT,
+  TLS_ST_SR_COMP_CERT,
+  TLS_ST_SR_KEY_EXCH,
+  TLS_ST_SR_CERT_VRFY,
+  TLS_ST_SR_NEXT_PROTO,
+  TLS_ST_SR_CHANGE,
+  TLS_ST_SR_FINISHED,
+  TLS_ST_SW_SESSION_TICKET,
+  TLS_ST_SW_CERT_STATUS,
+  TLS_ST_SW_CHANGE,
+  TLS_ST_SW_FINISHED,
+  TLS_ST_SW_ENCRYPTED_EXTENSIONS,
+  TLS_ST_CR_ENCRYPTED_EXTENSIONS,
+  TLS_ST_CR_CERT_VRFY,
+  TLS_ST_SW_CERT_VRFY,
+  TLS_ST_CR_HELLO_REQ,
+  TLS_ST_SW_KEY_UPDATE,
+  TLS_ST_CW_KEY_UPDATE,
+  TLS_ST_SR_KEY_UPDATE,
+  TLS_ST_CR_KEY_UPDATE,
+  TLS_ST_EARLY_DATA,
+  TLS_ST_PENDING_EARLY_DATA_END,
+  TLS_ST_CW_END_OF_EARLY_DATA,
+  TLS_ST_SR_END_OF_EARLY_DATA
 }
 OSSL_HANDSHAKE_STATE;
 
@@ -141,6 +228,8 @@ int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
 
 int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
 
+int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
+
 int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
 
 X509 *SSL_get_peer_certificate(const SSL *ssl);
@@ -161,7 +250,7 @@ int SSL_get_error(const SSL *ssl, int ret_code);
 
 OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl);
 
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, void *rngctx);
+SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, ...);
 
 void SSL_CTX_free(SSL_CTX *ctx);
 
@@ -299,6 +388,73 @@ int SSL_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
 int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
                                    long len);
 
+const SSL_METHOD *TLS_method(void);
+const SSL_METHOD *TLS_server_method(void);
+const SSL_METHOD *TLS_client_method(void);
+
+const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
+const SSL_METHOD *TLSv1_server_method(void);
+const SSL_METHOD *TLSv1_client_method(void);
+
+const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */
+const SSL_METHOD *TLSv1_1_server_method(void);
+const SSL_METHOD *TLSv1_1_client_method(void);
+
+const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */
+const SSL_METHOD *TLSv1_2_server_method(void);
+const SSL_METHOD *TLSv1_2_client_method(void);
+
+SSL_SESSION *SSL_get1_session(SSL *ssl);
+
+void SSL_SESSION_free(SSL_SESSION *session);
+
+int SSL_set_session(SSL *s, SSL_SESSION *session);
+
+const char *SSLeay_version(int t);
+
+const char *SSL_state_string_long(const SSL *s);
+
+const char *SSL_get_cipher_name(const SSL *s);
+
+const char *SSL_alert_type_string_long(int value);
+
+const char *SSL_alert_desc_string_long(int value);
+
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
+
+void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
+
+int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
+
+void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, SSL_psk_client_cb_func cb);
+
+long SSL_CTX_set_mode(SSL_CTX *ctx, long larg);
+
+void SSL_CTX_set_info_callback(SSL_CTX *ctx,
+                               void (*cb)(const SSL *ssl, int type, int val));
+
+void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
+                              void (*cb)(int write_p, int version,
+                                         int content_type, const void *buf,
+                                         size_t len, SSL *ssl, void *arg));
+
+const char *SSL_get_cipher_list(const SSL *s, int n);
+
+long SSL_set_tlsext_host_name(SSL *s, void *parg);
+
+int SSL_get_ex_new_index(long argl, void *argp,
+                         CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
+                         CRYPTO_EX_free *free_func);
+
+const char *SSL_get_cipher_list(const SSL *s, int n);
+
+int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str);
+
+int SSL_CTX_set_ex_data(SSL_CTX *s, int idx, void *arg);
+
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+                                  const char *CApath);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
index b9295d1c9..13f692b4e 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
@@ -30,11 +30,6 @@
 #include <openssl/x509_local.h>
 #include <openssl/x509_vfy.h>
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -61,6 +56,24 @@ struct ssl_ctx_st
   int read_ahead;
   int read_buffer_len;
   X509_VERIFY_PARAM param;
+
+  /* Default password callback. */
+
+  pem_password_cb *default_passwd_callback;
+
+  /* Default password callback user data. */
+
+  void *default_passwd_callback_userdata;
+  uint32_t mode;
+
+  /* optional informational callback */
+
+  void (*info_callback)(const SSL *ssl, int type, int val);
+
+  /* callback that allows applications to peek at protocol messages */
+
+  ossl_msg_cb msg_callback;
+  SSL_psk_client_cb_func psk_client_callback;
 };
 
 struct ssl_method_func_st
@@ -97,6 +110,12 @@ struct ssl_session_st
   long timeout;
   long time;
   X509 *peer;
+  const SSL_CIPHER *cipher;
+  int references;
+  struct
+    {
+      char hostname[TLSEXT_MAXLEN_host_name];
+    } ext;
 };
 
 struct ssl_st
@@ -132,8 +151,19 @@ struct ssl_st
 /* SSL low-level system arch point */
 
   void *ssl_pm;
+  SSL_CIPHER *cipher_list;
 };
 
+struct ssl_cipher_st
+{
+  const char *name;           /* text name */
+};
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h b/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
index 57fd4fa26..6f0ff49cb 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/tls1.h
@@ -20,42 +20,63 @@
 #ifndef OPENSSL_MBEDTLS_WRAPPER_TLS1_H
 #define OPENSSL_MBEDTLS_WRAPPER_TLS1_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <openssl/ssl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 #define TLS1_AD_DECRYPTION_FAILED       21
 #define TLS1_AD_RECORD_OVERFLOW         22
-#define TLS1_AD_UNKNOWN_CA              48/* fatal */
-#define TLS1_AD_ACCESS_DENIED           49/* fatal */
-#define TLS1_AD_DECODE_ERROR            50/* fatal */
+#define TLS1_AD_UNKNOWN_CA              48 /* fatal */
+#define TLS1_AD_ACCESS_DENIED           49 /* fatal */
+#define TLS1_AD_DECODE_ERROR            50 /* fatal */
 #define TLS1_AD_DECRYPT_ERROR           51
-#define TLS1_AD_EXPORT_RESTRICTION      60/* fatal */
-#define TLS1_AD_PROTOCOL_VERSION        70/* fatal */
-#define TLS1_AD_INSUFFICIENT_SECURITY   71/* fatal */
-#define TLS1_AD_INTERNAL_ERROR          80/* fatal */
-#define TLS1_AD_INAPPROPRIATE_FALLBACK  86/* fatal */
+#define TLS1_AD_EXPORT_RESTRICTION      60 /* fatal */
+#define TLS1_AD_PROTOCOL_VERSION        70 /* fatal */
+#define TLS1_AD_INSUFFICIENT_SECURITY   71 /* fatal */
+#define TLS1_AD_INTERNAL_ERROR          80 /* fatal */
+#define TLS1_AD_INAPPROPRIATE_FALLBACK  86 /* fatal */
 #define TLS1_AD_USER_CANCELLED          90
 #define TLS1_AD_NO_RENEGOTIATION        100
+
 /* codes 110-114 are from RFC3546 */
+
 #define TLS1_AD_UNSUPPORTED_EXTENSION   110
 #define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
 #define TLS1_AD_UNRECOGNIZED_NAME       112
 #define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
 #define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
-#define TLS1_AD_UNKNOWN_PSK_IDENTITY    115/* fatal */
-#define TLS1_AD_NO_APPLICATION_PROTOCOL 120/* fatal */
+#define TLS1_AD_UNKNOWN_PSK_IDENTITY    115 /* fatal */
+#define TLS1_AD_NO_APPLICATION_PROTOCOL 120 /* fatal */
 
 /* Special value for method supporting multiple versions */
+
 #define TLS_ANY_VERSION                 0x10000
 
 #define TLS1_VERSION                    0x0301
 #define TLS1_1_VERSION                  0x0302
 #define TLS1_2_VERSION                  0x0303
 
-#define SSL_TLSEXT_ERR_OK 0
-#define SSL_TLSEXT_ERR_NOACK 3
+#define SSL_TLSEXT_ERR_OK               0
+#define SSL_TLSEXT_ERR_NOACK            3
+
+#define TLSEXT_MAXLEN_host_name         255
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+long SSL_set_tlsext_host_name(SSL *s, void *parg);
 
 #ifdef __cplusplus
 }
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/types.h b/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
index c03078645..294ef20f6 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/types.h
@@ -20,17 +20,18 @@
 #ifndef OPENSSL_MBEDTLS_WRAPPER_TYPES_H
 #define OPENSSL_MBEDTLS_WRAPPER_TYPES_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-typedef void SSL_CIPHER;
+typedef void CRYPTO_EX_new;
+typedef void CRYPTO_THREADID;
 typedef void X509_STORE;
-
 typedef void RSA;
 
 typedef int (*OPENSSL_sk_compfunc)(const void *, const void *);
+typedef int pem_password_cb(char *buf, int size,
+                            int rwflag, void *userdata);
 
 typedef struct bio_buf_mem_st BIO_BUF_MEM;
 typedef struct bio_method_st BIO_METHOD;
@@ -43,6 +44,7 @@ typedef struct ossl_statem_st OSSL_STATEM;
 typedef struct ssl_session_st SSL_SESSION;
 typedef struct ssl_ctx_st SSL_CTX;
 typedef struct ssl_st SSL;
+typedef struct ssl_cipher_st SSL_CIPHER;
 typedef struct cert_st CERT;
 typedef struct x509_st X509;
 typedef struct X509_VERIFY_PARAM_st X509_VERIFY_PARAM;
@@ -68,8 +70,4 @@ struct pkey_method_st
   int (*pkey_load)(EVP_PKEY *pkey, const unsigned char *buf, int len);
 };
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* OPENSSL_MBEDTLS_WRAPPER_TYPES_H */
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h b/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
index 847aaa4bc..d7cff9a4b 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
@@ -34,10 +34,13 @@
 #include <openssl/obj.h>
 #include <openssl/types.h>
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define X509_FILETYPE_PEM       1
+#define X509_FILETYPE_ASN1      2
+#define X509_FILETYPE_DEFAULT   3
 
 /****************************************************************************
  * Public Types
@@ -56,6 +59,8 @@ struct x509_method_st
   int (*x509_new)(X509 *x, X509 *m_x);
   void (*x509_free)(X509 *x);
   int (*x509_load)(X509 *x, const unsigned char *buf, int len);
+  int (*x509_load_file)(X509 *x, const char *file);
+  int (*x509_load_path)(X509 *x, const char *path);
   int (*x509_show_info)(X509 *x);
 };
 
@@ -66,6 +71,11 @@ struct cert_st
   EVP_PKEY *pkey;
 };
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/err.c b/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
index 34dad8dc5..4657259f7 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/err.c
@@ -38,7 +38,34 @@ unsigned long ERR_peek_last_error(void)
   return errno;
 }
 
+void ERR_free_strings(void)
+{
+}
+
 void ERR_error_string_n(unsigned long e, char *buf, size_t len)
 {
   mbedtls_strerror(e, buf, len);
 }
+
+void ERR_clear_error(void)
+{
+}
+
+unsigned long ERR_get_error(void)
+{
+  return errno;
+}
+
+void ERR_remove_state(unsigned long pid)
+{
+}
+
+int ERR_load_crypto_strings(void)
+{
+  return 1;
+}
+
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+                         void *u)
+{
+}
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c b/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
index 3045c495a..b1feae343 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/evp.c
@@ -344,3 +344,12 @@ int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey,
 {
   return 0;
 }
+
+int OpenSSL_add_all_algorithms(void)
+{
+  return 0;
+}
+
+void EVP_cleanup(void)
+{
+}
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
index a4f0eea40..4e7bf0968 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
@@ -21,13 +21,22 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/atomic.h>
 #include <openssl/ssl_dbg.h>
 #include <openssl/ssl3.h>
 #include <openssl/ssl_local.h>
 #include "ssl_port.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define SSL_SEND_DATA_MAX_LENGTH 1460
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 struct alpn_ctx
 {
   unsigned char data[23];
@@ -56,6 +65,7 @@ static SSL_SESSION *SSL_SESSION_new(void)
       goto failed2;
     }
 
+  session->references = 1;
   return session;
 
 failed2:
@@ -64,12 +74,6 @@ failed1:
   return NULL;
 }
 
-static void SSL_SESSION_free(SSL_SESSION *session)
-{
-  X509_free(session->peer);
-  ssl_mem_free(session);
-}
-
 static void
 _openssl_alpn_to_mbedtls(struct alpn_ctx *ac, char ***palpn_protos)
 {
@@ -256,7 +260,7 @@ int SSL_get_error(const SSL *ssl, int ret_code)
   return ret;
 }
 
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, void *rngctx)
+SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, ...)
 {
   SSL_CTX *ctx;
   CERT *cert;
@@ -1014,3 +1018,389 @@ void SSL_set_alpn_select_cb(SSL *ssl, void *arg)
 
   _ssl_set_alpn_list(ssl);
 }
+
+SSL_SESSION *SSL_get1_session(SSL *ssl)
+{
+  SSL_ASSERT2(ssl);
+
+  atomic_fetch_add(&ssl->session->references, 1);
+  return ssl->session;
+}
+
+void SSL_SESSION_free(SSL_SESSION *session)
+{
+  SSL_ASSERT3(session);
+
+  if (atomic_fetch_sub(&session->references, 1) == 1)
+    {
+      X509_free(session->peer);
+      ssl_mem_free(session);
+    }
+}
+
+int SSL_set_session(SSL *s, SSL_SESSION *session)
+{
+  SSL_ASSERT1(s);
+  SSL_ASSERT1(session);
+
+  SSL_SESSION_free(s->session);
+  s->session = session;
+  return 1;
+}
+
+const char *SSLeay_version(int t)
+{
+  return "not available";
+}
+
+const char *SSL_state_string_long(const SSL *s)
+{
+  SSL_ASSERT2(s);
+
+  switch (SSL_get_state(s))
+    {
+      case TLS_ST_CR_CERT_STATUS:
+        return "SSLv3/TLS read certificate status";
+      case TLS_ST_CW_NEXT_PROTO:
+        return "SSLv3/TLS write next proto";
+      case TLS_ST_SR_NEXT_PROTO:
+        return "SSLv3/TLS read next proto";
+      case TLS_ST_SW_CERT_STATUS:
+        return "SSLv3/TLS write certificate status";
+      case TLS_ST_BEFORE:
+        return "before SSL initialization";
+      case TLS_ST_OK:
+        return "SSL negotiation finished successfully";
+      case TLS_ST_CW_CLNT_HELLO:
+        return "SSLv3/TLS write client hello";
+      case TLS_ST_CR_SRVR_HELLO:
+        return "SSLv3/TLS read server hello";
+      case TLS_ST_CR_CERT:
+        return "SSLv3/TLS read server certificate";
+      case TLS_ST_CR_COMP_CERT:
+        return "TLSv1.3 read server compressed certificate";
+      case TLS_ST_CR_KEY_EXCH:
+        return "SSLv3/TLS read server key exchange";
+      case TLS_ST_CR_CERT_REQ:
+        return "SSLv3/TLS read server certificate request";
+      case TLS_ST_CR_SESSION_TICKET:
+        return "SSLv3/TLS read server session ticket";
+      case TLS_ST_CR_SRVR_DONE:
+        return "SSLv3/TLS read server done";
+      case TLS_ST_CW_CERT:
+        return "SSLv3/TLS write client certificate";
+      case TLS_ST_CW_COMP_CERT:
+        return "TLSv1.3 write client compressed certificate";
+      case TLS_ST_CW_KEY_EXCH:
+        return "SSLv3/TLS write client key exchange";
+      case TLS_ST_CW_CERT_VRFY:
+        return "SSLv3/TLS write certificate verify";
+      case TLS_ST_CW_CHANGE:
+      case TLS_ST_SW_CHANGE:
+        return "SSLv3/TLS write change cipher spec";
+      case TLS_ST_CW_FINISHED:
+      case TLS_ST_SW_FINISHED:
+        return "SSLv3/TLS write finished";
+      case TLS_ST_CR_CHANGE:
+      case TLS_ST_SR_CHANGE:
+        return "SSLv3/TLS read change cipher spec";
+      case TLS_ST_CR_FINISHED:
+      case TLS_ST_SR_FINISHED:
+        return "SSLv3/TLS read finished";
+      case TLS_ST_SR_CLNT_HELLO:
+        return "SSLv3/TLS read client hello";
+      case TLS_ST_SW_HELLO_REQ:
+        return "SSLv3/TLS write hello request";
+      case TLS_ST_SW_SRVR_HELLO:
+        return "SSLv3/TLS write server hello";
+      case TLS_ST_SW_CERT:
+        return "SSLv3/TLS write certificate";
+      case TLS_ST_SW_COMP_CERT:
+        return "TLSv1.3 write server compressed certificate";
+      case TLS_ST_SW_KEY_EXCH:
+        return "SSLv3/TLS write key exchange";
+      case TLS_ST_SW_CERT_REQ:
+        return "SSLv3/TLS write certificate request";
+      case TLS_ST_SW_SESSION_TICKET:
+        return "SSLv3/TLS write session ticket";
+      case TLS_ST_SW_SRVR_DONE:
+        return "SSLv3/TLS write server done";
+      case TLS_ST_SR_CERT:
+        return "SSLv3/TLS read client certificate";
+      case TLS_ST_SR_COMP_CERT:
+        return "TLSv1.3 read client compressed certificate";
+      case TLS_ST_SR_KEY_EXCH:
+        return "SSLv3/TLS read client key exchange";
+      case TLS_ST_SR_CERT_VRFY:
+        return "SSLv3/TLS read certificate verify";
+      case DTLS_ST_CR_HELLO_VERIFY_REQUEST:
+        return "DTLS1 read hello verify request";
+      case DTLS_ST_SW_HELLO_VERIFY_REQUEST:
+        return "DTLS1 write hello verify request";
+      case TLS_ST_SW_ENCRYPTED_EXTENSIONS:
+        return "TLSv1.3 write encrypted extensions";
+      case TLS_ST_CR_ENCRYPTED_EXTENSIONS:
+        return "TLSv1.3 read encrypted extensions";
+      case TLS_ST_CR_CERT_VRFY:
+        return "TLSv1.3 read server certificate verify";
+      case TLS_ST_SW_CERT_VRFY:
+        return "TLSv1.3 write server certificate verify";
+      case TLS_ST_CR_HELLO_REQ:
+        return "SSLv3/TLS read hello request";
+      case TLS_ST_SW_KEY_UPDATE:
+        return "TLSv1.3 write server key update";
+      case TLS_ST_CW_KEY_UPDATE:
+        return "TLSv1.3 write client key update";
+      case TLS_ST_SR_KEY_UPDATE:
+        return "TLSv1.3 read client key update";
+      case TLS_ST_CR_KEY_UPDATE:
+        return "TLSv1.3 read server key update";
+      case TLS_ST_EARLY_DATA:
+        return "TLSv1.3 early data";
+      case TLS_ST_PENDING_EARLY_DATA_END:
+        return "TLSv1.3 pending early data end";
+      case TLS_ST_CW_END_OF_EARLY_DATA:
+        return "TLSv1.3 write end of early data";
+      case TLS_ST_SR_END_OF_EARLY_DATA:
+        return "TLSv1.3 read end of early data";
+      default:
+        return "unknown state";
+    }
+}
+
+const char *SSL_get_cipher_name(const SSL *s)
+{
+  SSL_ASSERT2(s);
+  SSL_ASSERT2(s->session);
+
+  return s->session->cipher->name ? s->session->cipher->name : "(NONE)";
+}
+
+const char *SSL_alert_type_string_long(int value)
+{
+  switch (value >> 8)
+  {
+    case SSL3_AL_WARNING:
+      return "warning";
+    case SSL3_AL_FATAL:
+      return "fatal";
+  }
+
+  return "unknown";
+}
+
+const char *SSL_alert_desc_string_long(int value)
+{
+  switch (value & 0xff)
+    {
+      case SSL3_AD_CLOSE_NOTIFY:
+        return "close notify";
+      case SSL3_AD_UNEXPECTED_MESSAGE:
+        return "unexpected message";
+      case SSL3_AD_BAD_RECORD_MAC:
+        return "bad record mac";
+      case SSL3_AD_DECOMPRESSION_FAILURE:
+        return "decompression failure";
+      case SSL3_AD_HANDSHAKE_FAILURE:
+        return "handshake failure";
+      case SSL3_AD_NO_CERTIFICATE:
+        return "no certificate";
+      case SSL3_AD_BAD_CERTIFICATE:
+        return "bad certificate";
+      case SSL3_AD_UNSUPPORTED_CERTIFICATE:
+        return "unsupported certificate";
+      case SSL3_AD_CERTIFICATE_REVOKED:
+        return "certificate revoked";
+      case SSL3_AD_CERTIFICATE_EXPIRED:
+        return "certificate expired";
+      case SSL3_AD_CERTIFICATE_UNKNOWN:
+        return "certificate unknown";
+      case SSL3_AD_ILLEGAL_PARAMETER:
+        return "illegal parameter";
+      case TLS1_AD_DECRYPTION_FAILED:
+        return "decryption failed";
+      case TLS1_AD_RECORD_OVERFLOW:
+        return "record overflow";
+      case TLS1_AD_UNKNOWN_CA:
+        return "unknown CA";
+      case TLS1_AD_ACCESS_DENIED:
+        return "access denied";
+      case TLS1_AD_DECODE_ERROR:
+        return "decode error";
+      case TLS1_AD_DECRYPT_ERROR:
+        return "decrypt error";
+      case TLS1_AD_EXPORT_RESTRICTION:
+        return "export restriction";
+      case TLS1_AD_PROTOCOL_VERSION:
+        return "protocol version";
+      case TLS1_AD_INSUFFICIENT_SECURITY:
+        return "insufficient security";
+      case TLS1_AD_INTERNAL_ERROR:
+        return "internal error";
+      case TLS1_AD_USER_CANCELLED:
+        return "user canceled";
+      case TLS1_AD_NO_RENEGOTIATION:
+        return "no renegotiation";
+      case TLS1_AD_UNSUPPORTED_EXTENSION:
+        return "unsupported extension";
+      case TLS1_AD_CERTIFICATE_UNOBTAINABLE:
+        return "certificate unobtainable";
+      case TLS1_AD_UNRECOGNIZED_NAME:
+        return "unrecognized name";
+      case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
+        return "bad certificate status response";
+      case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE:
+        return "bad certificate hash value";
+      case TLS1_AD_UNKNOWN_PSK_IDENTITY:
+        return "unknown PSK identity";
+      case TLS1_AD_NO_APPLICATION_PROTOCOL:
+        return "no application protocol";
+      default:
+        return "unknown";
+    }
+}
+
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb)
+{
+  ctx->default_passwd_callback = cb;
+}
+
+void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u)
+{
+    ctx->default_passwd_callback_userdata = u;
+}
+
+void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, SSL_psk_client_cb_func cb)
+{
+    ctx->psk_client_callback = cb;
+}
+
+int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
+{
+  return 0;
+}
+
+long SSL_CTX_set_mode(SSL_CTX *ctx, long larg)
+{
+  return ctx->mode |= larg;
+}
+
+void SSL_CTX_set_info_callback(SSL_CTX *ctx,
+                               void (*cb)(const SSL *ssl, int type, int val))
+{
+  ctx->info_callback = cb;
+}
+
+void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
+                              void (*cb)(int write_p, int version,
+                                         int content_type, const void *buf,
+                                         size_t len, SSL *ssl, void *arg))
+{
+  ctx->msg_callback = cb;
+}
+
+long SSL_set_tlsext_host_name(SSL *s, void *parg)
+{
+  size_t len;
+
+  SSL_ASSERT1(s);
+  SSL_ASSERT1(s->session);
+
+  if (parg == NULL)
+    {
+      return 1;
+    }
+
+  len = strlen(parg);
+  if (len == 0 || len > TLSEXT_MAXLEN_host_name)
+    {
+      return 0;
+    }
+
+  memset(s->session->ext.hostname, 0, TLSEXT_MAXLEN_host_name);
+  memcpy(s->session->ext.hostname, parg, len);
+  return 1;
+}
+
+int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile)
+{
+  X509 *x;
+  int ret;
+
+  SSL_ASSERT1(ctx);
+  SSL_ASSERT1(CAfile);
+
+  x = X509_new();
+  ret = X509_METHOD_CALL(load_file, x, CAfile);
+  if (ret)
+    {
+      X509_free(x);
+      return 0;
+    }
+
+  SSL_CTX_add_client_CA(ctx, x);
+  return 1;
+}
+
+int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath)
+{
+  X509 *x;
+  int ret;
+
+  SSL_ASSERT1(ctx);
+  SSL_ASSERT1(CApath);
+
+  x = X509_new();
+  ret = X509_METHOD_CALL(load_path, x, CApath);
+  if (ret)
+    {
+      X509_free(x);
+      return 0;
+    }
+
+  SSL_CTX_add_client_CA(ctx, x);
+  return 1;
+}
+
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+                                  const char *CApath)
+{
+  if (CAfile == NULL && CApath == NULL)
+    {
+      return 0;
+    }
+
+  if (CAfile != NULL && !SSL_CTX_load_verify_file(ctx, CAfile))
+    {
+      return 0;
+    }
+
+  if (CApath != NULL && !SSL_CTX_load_verify_dir(ctx, CApath))
+    {
+      return 0;
+    }
+
+  return 1;
+}
+
+int SSL_get_ex_new_index(long argl, void *argp,
+                         CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
+                         CRYPTO_EX_free *free_func)
+{
+  return 0;
+}
+
+const char *SSL_get_cipher_list(const SSL *s, int n)
+{
+  return NULL;
+}
+
+int SSL_CTX_set_ex_data(SSL_CTX *s, int idx, void *arg)
+{
+  return 0;
+}
+
+int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)
+{
+  return 0;
+}
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
index 7abddee9f..a5b8e5bb0 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.c
@@ -95,7 +95,8 @@ IMPLEMENT_SSL_METHOD(SSL3_VERSION, -1, TLS_method_func, SSLv3_method);
 
 IMPLEMENT_X509_METHOD(X509_method,
             x509_pm_new, x509_pm_free,
-            x509_pm_load, x509_pm_show_info);
+            x509_pm_load, x509_pm_load_file,
+            x509_pm_load_path, x509_pm_show_info);
 
 /**
  * @brief get private key object method
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
index 3c2647814..c93546fc7 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_methods.h
@@ -27,10 +27,9 @@
 #include <openssl/ssl.h>
 #include "ssl_pm.h"
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 /* TLS method function implement */
 
@@ -42,7 +41,7 @@ extern "C"
                                   set_bufflen, \
                                   get_verify_result, \
                                   get_state) \
-    static const SSL_METHOD_FUNC func_name LOCAL_ATRR = \
+    static const SSL_METHOD_FUNC func_name = \
       { \
         new, \
         free, \
@@ -62,7 +61,7 @@ extern "C"
 #define IMPLEMENT_TLS_METHOD(ver, mode, fun, func_name) \
     const SSL_METHOD* func_name(void) \
       { \
-        static const SSL_METHOD func_name##_data LOCAL_ATRR = \
+        static const SSL_METHOD func_name##_data = \
           { \
             ver, \
             mode, \
@@ -74,7 +73,7 @@ extern "C"
 #define IMPLEMENT_SSL_METHOD(ver, mode, fun, func_name) \
     const SSL_METHOD* func_name(void) \
       { \
-        static const SSL_METHOD func_name##_data LOCAL_ATRR = \
+        static const SSL_METHOD func_name##_data = \
           { \
             ver, \
             mode, \
@@ -87,14 +86,18 @@ extern "C"
                 new, \
                 free, \
                 load, \
+                load_file, \
+                load_path, \
                 show_info) \
     const X509_METHOD* func_name(void) \
       { \
-        static const X509_METHOD func_name##_data LOCAL_ATRR = \
+        static const X509_METHOD func_name##_data = \
           { \
             new, \
             free, \
             load, \
+            load_file, \
+            load_path, \
             show_info \
           }; \
         return &func_name##_data; \
@@ -106,7 +109,7 @@ extern "C"
                 load) \
     const PKEY_METHOD* func_name(void) \
       { \
-        static const PKEY_METHOD func_name##_data LOCAL_ATRR = \
+        static const PKEY_METHOD func_name##_data = \
           { \
             new, \
             free, \
@@ -115,6 +118,15 @@ extern "C"
         return &func_name##_data; \
     }
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * @brief get X509 object method
  *
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
index 95bec900e..086968794 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
@@ -38,7 +38,16 @@
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define X509_INFO_STRING_LENGTH 8192
+#define READ_TIMEOUT_MS         50000   /* 50 seconds */
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 struct ssl_pm
 {
@@ -58,7 +67,7 @@ struct ssl_pm
 
 struct x509_pm
 {
-  mbedtls_x509_crt *x509_crt;
+  mbedtls_x509_crt x509_crt;
   mbedtls_x509_crt *ex_crt;
 };
 
@@ -68,10 +77,15 @@ struct pkey_pm
   mbedtls_pk_context *ex_pkey;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 unsigned int max_content_len;
 
-/* mbedtls debug level */
-#define MBEDTLS_DEBUG_LEVEL 4
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
 /**
  * @brief mbedtls debug function
@@ -134,6 +148,7 @@ int ssl_pm_new(SSL *ssl)
   mbedtls_ctr_drbg_init(&ssl_pm->ctr_drbg);
   mbedtls_entropy_init(&ssl_pm->entropy);
   mbedtls_ssl_init(&ssl_pm->ssl);
+  mbedtls_ssl_conf_read_timeout(&ssl_pm->conf, READ_TIMEOUT_MS);
 
   ret = mbedtls_ctr_drbg_seed(&ssl_pm->ctr_drbg, mbedtls_entropy_func,
                               &ssl_pm->entropy, pers, pers_len);
@@ -210,7 +225,8 @@ int ssl_pm_new(SSL *ssl)
     }
 
   mbedtls_ssl_set_bio(&ssl_pm->ssl, &ssl_pm->fd,
-                      mbedtls_net_send, mbedtls_net_recv, NULL);
+                      mbedtls_net_send, mbedtls_net_recv,
+                      mbedtls_net_recv_timeout);
 
   ssl->ssl_pm = ssl_pm;
 
@@ -249,7 +265,7 @@ void ssl_pm_free(SSL *ssl)
 
 static int ssl_pm_reload_crt(SSL *ssl)
 {
-  int ret;
+  int ret = 0;
   int mode;
   struct ssl_pm *ssl_pm = ssl->ssl_pm;
   struct x509_pm *ca_pm = (struct x509_pm *)ssl->client_CA->x509_pm;
@@ -275,29 +291,16 @@ static int ssl_pm_reload_crt(SSL *ssl)
     }
 
   mbedtls_ssl_conf_authmode(&ssl_pm->conf, mode);
-
-  if (ca_pm->x509_crt)
-    {
-      mbedtls_ssl_conf_ca_chain(&ssl_pm->conf, ca_pm->x509_crt, NULL);
-    }
-  else if (ca_pm->ex_crt)
+  mbedtls_ssl_conf_ca_chain(&ssl_pm->conf, &ca_pm->x509_crt, NULL);
+  if (ca_pm->ex_crt)
     {
       mbedtls_ssl_conf_ca_chain(&ssl_pm->conf, ca_pm->ex_crt, NULL);
     }
 
-  if (crt_pm->x509_crt && pkey_pm->pkey)
+  if (pkey_pm->pkey)
     {
       ret = mbedtls_ssl_conf_own_cert(&ssl_pm->conf,
-                                      crt_pm->x509_crt, pkey_pm->pkey);
-    }
-  else if (crt_pm->ex_crt && pkey_pm->ex_pkey)
-    {
-      ret = mbedtls_ssl_conf_own_cert(&ssl_pm->conf,
-                                      crt_pm->ex_crt, pkey_pm->ex_pkey);
-    }
-  else
-    {
-      ret = 0;
+                                      &crt_pm->x509_crt, pkey_pm->pkey);
     }
 
   if (ret)
@@ -342,7 +345,8 @@ int ssl_pm_handshake(SSL *ssl)
   ret = ssl_pm_reload_crt(ssl);
   if (ret)
     {
-      printf("%s: cert reload failed\n", __func__);
+      SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+                "%s: cert reload failed\n", __func__);
       return 0;
     }
 
@@ -396,7 +400,8 @@ int ssl_pm_handshake(SSL *ssl)
       return 0;
     }
 
-  printf("%s: mbedtls_ssl_handshake() returned -0x%x\n", __func__, -ret);
+  SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+           "%s: mbedtls_ssl_handshake() returned -0x%x\n", __func__, -ret);
 
   /* it's had it */
 
@@ -415,7 +420,7 @@ ssl_ctx_get_mbedtls_x509_crt(SSL_CTX *ssl_ctx)
       return NULL;
     }
 
-  return x509_pm->x509_crt;
+  return &x509_pm->x509_crt;
 }
 
 mbedtls_x509_crt *
@@ -451,7 +456,7 @@ int ssl_pm_shutdown(SSL *ssl)
   else
     {
       struct x509_pm *x509_pm =
-                     (struct x509_pm *)ssl->session->peer->x509_pm;
+            (struct x509_pm *)ssl->session->peer->x509_pm;
 
       x509_pm->ex_crt = NULL;
       ret = 1; /* OpenSSL: "The shutdown was successfully completed"
@@ -628,20 +633,8 @@ int x509_pm_show_info(X509 *x)
   mbedtls_x509_crt *x509_crt;
   struct x509_pm *x509_pm = x->x509_pm;
 
-  if (x509_pm->x509_crt)
-    {
-      x509_crt = x509_pm->x509_crt;
-    }
-  else if (x509_pm->ex_crt)
-    {
-      x509_crt = x509_pm->ex_crt;
-    }
-  else
-    {
-      x509_crt = NULL;
-    }
-
-  if (!x509_crt)
+  x509_crt = &x509_pm->x509_crt;
+  if (x509_crt->version == 0)
     {
       return -1;
     }
@@ -693,7 +686,7 @@ int x509_pm_new(X509 *x, X509 *m_x)
     {
       struct x509_pm *m_x509_pm = (struct x509_pm *)m_x->x509_pm;
 
-      x509_pm->ex_crt = m_x509_pm->x509_crt;
+      x509_pm->ex_crt = &m_x509_pm->x509_crt;
     }
 
   return 0;
@@ -706,14 +699,7 @@ void x509_pm_free(X509 *x)
 {
   struct x509_pm *x509_pm = (struct x509_pm *)x->x509_pm;
 
-  if (x509_pm->x509_crt)
-    {
-      mbedtls_x509_crt_free(x509_pm->x509_crt);
-
-      ssl_mem_free(x509_pm->x509_crt);
-      x509_pm->x509_crt = NULL;
-    }
-
+  mbedtls_x509_crt_free(&x509_pm->x509_crt);
   ssl_mem_free(x->x509_pm);
   x->x509_pm = NULL;
 }
@@ -724,23 +710,8 @@ int x509_pm_load(X509 *x, const unsigned char *buffer, int len)
   unsigned char *load_buf;
   struct x509_pm *x509_pm = (struct x509_pm *)x->x509_pm;
 
-  if (x509_pm->x509_crt)
-    {
-      mbedtls_x509_crt_free(x509_pm->x509_crt);
-    }
-
-  if (!x509_pm->x509_crt)
-    {
-      x509_pm->x509_crt = ssl_mem_malloc(sizeof(mbedtls_x509_crt));
-      if (!x509_pm->x509_crt)
-        {
-          SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
-                    "no enough memory > (x509_pm->x509_crt)");
-          goto no_mem;
-        }
-    }
-
-  mbedtls_x509_crt_init(x509_pm->x509_crt);
+  mbedtls_x509_crt_free(&x509_pm->x509_crt);
+  mbedtls_x509_crt_init(&x509_pm->x509_crt);
   if (buffer[0] != 0x30)
     {
       load_buf = ssl_mem_malloc(len + 1);
@@ -754,32 +725,67 @@ int x509_pm_load(X509 *x, const unsigned char *buffer, int len)
       ssl_memcpy(load_buf, buffer, len);
       load_buf[len] = '\0';
 
-      ret = mbedtls_x509_crt_parse(x509_pm->x509_crt, load_buf, len + 1);
+      ret = mbedtls_x509_crt_parse(&x509_pm->x509_crt, load_buf, len + 1);
       ssl_mem_free(load_buf);
     }
   else
     {
-      printf("parsing as der\n");
-
-      ret = mbedtls_x509_crt_parse_der(x509_pm->x509_crt, buffer, len);
+      SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "parsing as der\n");
+      ret = mbedtls_x509_crt_parse_der(&x509_pm->x509_crt, buffer, len);
     }
 
   if (ret)
     {
-      printf("mbedtls_x509_crt_parse return -0x%x", -ret);
+      SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+                "mbedtls_x509_crt_parse return -0x%x", -ret);
       goto failed;
     }
 
   return 0;
 
 failed:
-  mbedtls_x509_crt_free(x509_pm->x509_crt);
-  ssl_mem_free(x509_pm->x509_crt);
-  x509_pm->x509_crt = NULL;
-no_mem:
+  mbedtls_x509_crt_free(&x509_pm->x509_crt);
   return -1;
 }
 
+int x509_pm_load_file(X509 *x, const char *path)
+{
+  int ret;
+  struct x509_pm *x509_pm = (struct x509_pm *)x->x509_pm;
+
+  mbedtls_x509_crt_free(&x509_pm->x509_crt);
+  mbedtls_x509_crt_init(&x509_pm->x509_crt);
+  ret = mbedtls_x509_crt_parse_file(&x509_pm->x509_crt, path);
+  if (ret)
+    {
+      SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+                "mbedtls_x509_crt_parse_file return -0x%x", -ret);
+      mbedtls_x509_crt_free(&x509_pm->x509_crt);
+      return -1;
+    }
+
+  return 0;
+}
+
+int x509_pm_load_path(X509 *x, const char *path)
+{
+  int ret;
+  struct x509_pm *x509_pm = (struct x509_pm *)x->x509_pm;
+
+  mbedtls_x509_crt_free(&x509_pm->x509_crt);
+  mbedtls_x509_crt_init(&x509_pm->x509_crt);
+  ret = mbedtls_x509_crt_parse_path(&x509_pm->x509_crt, path);
+  if (ret)
+    {
+      SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+                "mbedtls_x509_crt_parse_file return -0x%x", -ret);
+      mbedtls_x509_crt_free(&x509_pm->x509_crt);
+      return -1;
+    }
+
+  return 0;
+}
+
 int pkey_pm_new(EVP_PKEY *pk, EVP_PKEY *m_pkey)
 {
   struct pkey_pm *pkey_pm;
@@ -977,7 +983,8 @@ void _ssl_set_alpn_list(const SSL *ssl)
           &((struct ssl_pm *)(ssl->ssl_pm))->conf,
         ssl->alpn_protos))
         {
-          fprintf(stderr, "mbedtls_ssl_conf_alpn_protocols failed\n");
+          SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+                    "mbedtls_ssl_conf_alpn_protocols failed\n");
         }
 
       return;
@@ -992,7 +999,8 @@ void _ssl_set_alpn_list(const SSL *ssl)
       &((struct ssl_pm *)(ssl->ssl_pm))->conf,
       ssl->ctx->alpn_protos))
     {
-      fprintf(stderr, "mbedtls_ssl_conf_alpn_protocols failed\n");
+      SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
+                "mbedtls_ssl_conf_alpn_protocols failed\n");
     }
 }
 
@@ -1070,8 +1078,8 @@ void SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx)
 
   ssl->verify_mode = ctx->verify_mode;
 
-  mbedtls_ssl_set_hs_ca_chain(&ssl_pm->ssl, x509_pm_ca->x509_crt, NULL);
-  mbedtls_ssl_set_hs_own_cert(&ssl_pm->ssl, x509_pm->x509_crt,
+  mbedtls_ssl_set_hs_ca_chain(&ssl_pm->ssl, &x509_pm_ca->x509_crt, NULL);
+  mbedtls_ssl_set_hs_own_cert(&ssl_pm->ssl, &x509_pm->x509_crt,
                               pkey_pm->pkey);
   mbedtls_ssl_set_hs_authmode(&ssl_pm->ssl, mode);
 }
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
index 22e6eda4a..0d2065024 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.h
@@ -33,7 +33,9 @@ extern "C"
 {
 #endif
 
-#define LOCAL_ATRR
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
 int ssl_pm_new(SSL *ssl);
 void ssl_pm_free(SSL *ssl);
@@ -57,6 +59,8 @@ int x509_pm_show_info(X509 *x);
 int x509_pm_new(X509 *x, X509 *m_x);
 void x509_pm_free(X509 *x);
 int x509_pm_load(X509 *x, const unsigned char *buffer, int len);
+int x509_pm_load_file(X509 *x, const char *path);
+int x509_pm_load_path(X509 *x, const char *path);
 
 int pkey_pm_new(EVP_PKEY *pk, EVP_PKEY *m_pk);
 void pkey_pm_free(EVP_PKEY *pk);
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
index 0a754317d..7f21912ea 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_rsa.c
@@ -124,6 +124,11 @@ int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
   return 0;
 }
 
+int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
+{
+  return 0;
+}
+
 int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
 {
   return 0;

From 49e2592e3413ea9a1b32087a15b8d95370cdc104 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Tue, 17 Jun 2025 17:07:27 +0800
Subject: [PATCH 130/568] openssl-mbedtls-wrapper: export SSL_ASSERT* macro

VELAPLATFO-62586

Change-Id: I2ceac930c87196a16ea7ddf5e4130bb991b51025
Signed-off-by: makejian <makejian@xiaomi.com>
(cherry picked from commit d0547662d5006ec0a348d89d3d7e251ef4bb183c)
---
 crypto/openssl_mbedtls_wrapper/Kconfig | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/crypto/openssl_mbedtls_wrapper/Kconfig b/crypto/openssl_mbedtls_wrapper/Kconfig
index 197adbc3e..3a4ee11a2 100644
--- a/crypto/openssl_mbedtls_wrapper/Kconfig
+++ b/crypto/openssl_mbedtls_wrapper/Kconfig
@@ -7,3 +7,25 @@ config OPENSSL_MBEDTLS_WRAPPER
 	depends on CRYPTO_MBEDTLS
 	bool "openssl mbedtls wrapper"
 	default n
+
+if OPENSSL_MBEDTLS_WRAPPER
+
+choice
+	prompt "Openssl Mbedtls Wrapper Assert Debug"
+	default OPENSSL_ASSERT_EXIT
+
+config OPENSSL_ASSERT_DEBUG
+	bool "SSL_ASSERT* will show error file name and line"
+
+config OPENSSL_ASSERT_EXIT
+	bool "SSL_ASSERT* will just return error code"
+
+config OPENSSL_ASSERT_DEBUG_EXIT
+	bool "SSL_ASSERT* will show error file name and line, then return error code"
+
+config OPENSSL_ASSERT_DEBUG_BLOCK
+	bool "SSL_ASSERT* will show error file name and line, then block here with 'while (1)'"
+
+endchoice
+
+endif # OPENSSL_MBEDTLS_WRAPPER

From bafe30898a80cda7203860f9f9e5b085db275f68 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Wed, 23 Jul 2025 15:34:52 +0800
Subject: [PATCH 131/568] openssl-wrapper: mapping more error code whitin
 mbedtls and openssl when ssl error

VELAPLATFO-66562

Change-Id: Ibb1446a7fcae1d2bc09d75052466a6ce084103b8
Signed-off-by: makejian <makejian@xiaomi.com>
---
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
index 086968794..0169ed913 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
@@ -486,6 +486,22 @@ int ssl_pm_read(SSL *ssl, void *buffer, int len)
         {
           ssl->err = SSL_ERROR_SYSCALL;
         }
+      else if (ret == MBEDTLS_ERR_SSL_WANT_READ)
+        {
+          ssl->err = SSL_ERROR_WANT_READ;
+        }
+      else if (ret == MBEDTLS_ERR_SSL_WANT_WRITE)
+        {
+          ssl->err = SSL_ERROR_WANT_WRITE;
+        }
+      else if (ret == MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS)
+        {
+          ssl->err = SSL_ERROR_WANT_ASYNC;
+        }
+      else
+        {
+          ssl->err = SSL_ERROR_SSL;
+        }
 
       ret = -1;
     }

From d2902008fe9ec6ac48884b40b9ef63585cf524b3 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Fri, 16 Jan 2026 21:39:22 +0800
Subject: [PATCH 132/568] openssl-wrapper: fix code style compliance

Fix coding style issues in OpenSSL/MbedTLS wrapper implementation:
- Align whitespace and indentation
- Fix line formatting
- Ensure consistent code style per NuttX standards

Signed-off-by: makejian <makejian@xiaomi.com>
---
 crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h   | 10 ++++++----
 .../include/openssl/ssl_local.h                        |  8 ++++----
 crypto/openssl_mbedtls_wrapper/include/openssl/x509.h  |  2 +-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c        |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
index 94291eea8..7bdc03125 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
@@ -131,8 +131,9 @@ typedef unsigned int (*SSL_psk_client_cb_func)(SSL *ssl,
                                                unsigned char *psk,
                                                unsigned int max_psk_len);
 
-typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
-                            const void *buf, size_t len, SSL *ssl, void *arg);
+typedef void (*ossl_msg_cb)(
+              int write_p, int version, int content_type,
+              const void *buf, size_t len, SSL *ssl, void *arg);
 
 typedef enum
 {
@@ -426,12 +427,13 @@ void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
 
 int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
 
-void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, SSL_psk_client_cb_func cb);
+void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,
+                                     SSL_psk_client_cb_func cb);
 
 long SSL_CTX_set_mode(SSL_CTX *ctx, long larg);
 
 void SSL_CTX_set_info_callback(SSL_CTX *ctx,
-                               void (*cb)(const SSL *ssl, int type, int val));
+                    void (*cb)(const SSL *ssl, int type, int val));
 
 void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
                               void (*cb)(int write_p, int version,
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
index 13f692b4e..053da27de 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl_local.h
@@ -120,12 +120,12 @@ struct ssl_session_st
 
 struct ssl_st
 {
-/* protocol version(one of SSL3.0, TLS1.0, etc.) */
+  /* protocol version(one of SSL3.0, TLS1.0, etc.) */
 
   int version;
   unsigned long options;
 
-/* shut things down(0x01 : sent, 0x02 : received) */
+  /* shut things down(0x01 : sent, 0x02 : received) */
 
   int shutdown;
   CERT *cert;
@@ -135,7 +135,7 @@ struct ssl_st
   const char **alpn_protos;
   RECORD_LAYER rlayer;
 
-/* where we are */
+  /* where we are */
 
   OSSL_STATEM statem;
   SSL_SESSION *session;
@@ -148,7 +148,7 @@ struct ssl_st
   int err;
   void (*info_callback) (const SSL *ssl, int type, int val);
 
-/* SSL low-level system arch point */
+  /* SSL low-level system arch point */
 
   void *ssl_pm;
   SSL_CIPHER *cipher_list;
diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h b/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
index d7cff9a4b..cda221276 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/x509.h
@@ -48,7 +48,7 @@
 
 struct x509_st
 {
-/* X509 certification platform private point */
+  /* X509 certification platform private point */
 
   void *x509_pm;
   const X509_METHOD *method;
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
index 0169ed913..84ba2345e 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
@@ -634,7 +634,7 @@ OSSL_HANDSHAKE_STATE ssl_pm_get_state(const SSL *ssl)
       case MBEDTLS_SSL_HANDSHAKE_OVER:
         state = TLS_ST_OK;
         break;
-      default :
+      default:
         state = TLS_ST_BEFORE;
         break;
     }

From 9c85568c4f0f2c585401302f1fb36785c4a26a10 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Thu, 3 Jul 2025 15:31:33 +0800
Subject: [PATCH 133/568] icmpv6_ping.c: change socket type from SOCK_DGRAM to
 SOCK_RAW.

standardize the implementation of ping6 to better comply with socket
permissions on certain systems.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 netutils/ping/icmpv6_ping.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/netutils/ping/icmpv6_ping.c b/netutils/ping/icmpv6_ping.c
index e6a93fc98..c62c329d6 100644
--- a/netutils/ping/icmpv6_ping.c
+++ b/netutils/ping/icmpv6_ping.c
@@ -42,6 +42,7 @@
 #endif
 
 #include <arpa/inet.h>
+#include <netinet/icmp6.h>
 
 #include <nuttx/clock.h>
 #include <nuttx/net/icmpv6.h>
@@ -169,6 +170,7 @@ void icmp6_ping(FAR const struct ping6_info_s *info)
   struct ping6_result_s result;
   struct sockaddr_in6 destaddr;
   struct sockaddr_in6 fromaddr;
+  struct icmp6_filter filter;
   struct icmpv6_echo_request_s outhdr;
   FAR struct icmpv6_echo_reply_s *inhdr;
   struct pollfd recvfd;
@@ -210,7 +212,7 @@ void icmp6_ping(FAR const struct ping6_info_s *info)
       return;
     }
 
-  sockfd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMP6);
+  sockfd = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
   if (sockfd < 0)
     {
       icmp6_callback(&result, ICMPv6_E_SOCKET, errno);
@@ -232,6 +234,20 @@ void icmp6_ping(FAR const struct ping6_info_s *info)
     }
 #endif
 
+  memset(&filter, 0xff, sizeof(filter));
+
+  /* ICMPv6_ECHO_REPLY >> 5 = 4 */
+
+  filter.icmp6_filt[4] &= ~(1 << (ICMPv6_ECHO_REPLY & 31));
+  if (setsockopt(sockfd, SOL_ICMPV6, ICMP6_FILTER, &filter,
+                 sizeof(filter)) < 0)
+    {
+      icmp6_callback(&result, ICMPv6_E_SOCKET, errno);
+      close(sockfd);
+      free(iobuffer);
+      return;
+    }
+
   kickoff = clock();
 
   memset(&destaddr, 0, sizeof(struct sockaddr_in6));

From d9afe2db8ce7f2bb1cef7c65fed56af307bb722f Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Fri, 16 Jan 2026 22:47:13 +0800
Subject: [PATCH 134/568] signals: fix build and runtime issues when signals
 all isabled

 Fix build and runtime issues when signals all disabled.

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 canutils/candump/Kconfig                      |  2 +-
 examples/chrono/Kconfig                       |  2 +-
 examples/djoystick/Kconfig                    |  2 +-
 examples/i2sloop/Kconfig                      |  2 +-
 examples/ipforward/ipforward.c                | 13 ++++
 examples/oneshot/Kconfig                      |  2 +-
 examples/shv-nxboot-updater/Kconfig           |  2 +-
 .../usrsocktest_wake_with_signal.c            | 77 ++++++++++++++++++-
 examples/xedge_demo/Kconfig                   |  4 +-
 examples/zerocross/Kconfig                    |  2 +-
 nshlib/nsh.h                                  |  2 +
 nshlib/nsh_command.c                          | 26 ++++---
 nshlib/nsh_proccmds.c                         | 13 ++--
 system/sensortest/Kconfig                     |  2 +-
 testing/drivers/nand_sim/Kconfig              |  2 +-
 testing/ostest/CMakeLists.txt                 | 22 +++---
 testing/ostest/Makefile                       | 15 +++-
 testing/ostest/ostest_main.c                  | 16 ++--
 wireless/ieee802154/i8sak/i8sak_events.c      | 14 ++++
 19 files changed, 172 insertions(+), 48 deletions(-)

diff --git a/canutils/candump/Kconfig b/canutils/candump/Kconfig
index 4359ec287..45a46118b 100644
--- a/canutils/candump/Kconfig
+++ b/canutils/candump/Kconfig
@@ -6,7 +6,7 @@
 config CANUTILS_CANDUMP
 	tristate "SocketCAN candump tool"
 	default n
-	depends on NET_CAN && CANUTILS_LIBCANUTILS
+	depends on NET_CAN && CANUTILS_LIBCANUTILS && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the SocketCAN candump tool ported from
 		https://github.com/linux-can/can-utils
diff --git a/examples/chrono/Kconfig b/examples/chrono/Kconfig
index 866bc660a..324f0c452 100644
--- a/examples/chrono/Kconfig
+++ b/examples/chrono/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_CHRONO
 	tristate "Chronometer example to use with STM32LDiscover"
 	default n
-	depends on SLCD
+	depends on SLCD && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the Chronometer example
 
diff --git a/examples/djoystick/Kconfig b/examples/djoystick/Kconfig
index 7bfad3a2e..68e38ab6e 100644
--- a/examples/djoystick/Kconfig
+++ b/examples/djoystick/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_DJOYSTICK
 	tristate "Discrete joystick example"
 	default n
-	depends on INPUT_DJOYSTICK
+	depends on INPUT_DJOYSTICK && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the discrete joystick example
 
diff --git a/examples/i2sloop/Kconfig b/examples/i2sloop/Kconfig
index cea8333cd..982c0b020 100644
--- a/examples/i2sloop/Kconfig
+++ b/examples/i2sloop/Kconfig
@@ -6,6 +6,6 @@
 config EXAMPLES_I2SLOOP
 	tristate "I2S loopback test"
 	default n
-	depends on I2S && AUDIO && DRIVERS_AUDIO && AUDIO_I2SCHAR
+	depends on I2S && AUDIO && DRIVERS_AUDIO && AUDIO_I2SCHAR && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the I2S loopback test
diff --git a/examples/ipforward/ipforward.c b/examples/ipforward/ipforward.c
index 57b146e7e..ae9ee5831 100644
--- a/examples/ipforward/ipforward.c
+++ b/examples/ipforward/ipforward.c
@@ -542,8 +542,16 @@ static FAR void *ipfwd_receiver(FAR void *arg)
   int errcode;
   int i;
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   for (i = 0; i < IPFWD_NPACKETS; i++)
     {
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+      pthread_testcancel();
+#endif
       nread = read(fwd->ia_fd, fwd->ia_buffer, IPFWD_BUFSIZE);
       if (nread < 0)
         {
@@ -840,7 +848,12 @@ errout_with_receiver:
 
   /* Wait for receiver thread to terminate */
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_cancel(fwd.if_receiver);
+#else
   pthread_kill(fwd.if_receiver, 9);
+#endif
+
   ret = pthread_join(fwd.if_receiver, &value);
   if (ret != OK)
     {
diff --git a/examples/oneshot/Kconfig b/examples/oneshot/Kconfig
index 43cc117e1..3b9505985 100644
--- a/examples/oneshot/Kconfig
+++ b/examples/oneshot/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_ONESHOT
 	tristate "Oneshot timer example"
 	default n
-	depends on ONESHOT
+	depends on ONESHOT && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the oneshot timer driver example
 
diff --git a/examples/shv-nxboot-updater/Kconfig b/examples/shv-nxboot-updater/Kconfig
index d25da7cd0..80ace34ba 100644
--- a/examples/shv-nxboot-updater/Kconfig
+++ b/examples/shv-nxboot-updater/Kconfig
@@ -5,7 +5,7 @@
 
 menuconfig EXAMPLES_SHV_NXBOOT_UPDATER
 	bool "Silicon Heaven Firmware updates for NXBoot"
-	depends on NETUTILS_LIBSHVC
+	depends on NETUTILS_LIBSHVC && ENABLE_ALL_SIGNALS
 	default n
 	---help---
 		Enable the shv-nxboot-updater application.
diff --git a/examples/usrsocktest/usrsocktest_wake_with_signal.c b/examples/usrsocktest/usrsocktest_wake_with_signal.c
index 800eb571d..da460ab15 100644
--- a/examples/usrsocktest/usrsocktest_wake_with_signal.c
+++ b/examples/usrsocktest/usrsocktest_wake_with_signal.c
@@ -146,11 +146,20 @@ static void do_usrsock_blocking_socket_thread(FAR void *param)
   TEST_ASSERT_TRUE(test_hang);
   TEST_ASSERT_TRUE(test_abort);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Allow main thread to hang usrsock daemon at this point. */
 
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt hanging open socket. */
 
   sem_post(&tid_startsem);
@@ -176,6 +185,11 @@ static void do_usrsock_blocking_close_thread(FAR void *param)
   TEST_ASSERT_TRUE(test_hang);
   TEST_ASSERT_TRUE(test_abort);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -190,6 +204,10 @@ static void do_usrsock_blocking_close_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt hanging close socket. */
 
   sem_post(&tid_startsem);
@@ -214,6 +232,11 @@ static void do_usrsock_blocking_connect_thread(FAR void *param)
 
   TEST_ASSERT_TRUE(test_hang || !test_hang);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -228,6 +251,10 @@ static void do_usrsock_blocking_connect_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt blocking connect. */
 
   sem_post(&tid_startsem);
@@ -257,6 +284,11 @@ static void do_usrsock_blocking_setsockopt_thread(FAR void *param)
   bool test_abort = !!(test_flags & TEST_FLAG_DAEMON_ABORT);
   bool test_hang = !!(test_flags & TEST_FLAG_PAUSE_USRSOCK_HANDLING);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -274,6 +306,10 @@ static void do_usrsock_blocking_setsockopt_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt hanging setsockopt. */
 
   sem_post(&tid_startsem);
@@ -304,6 +340,11 @@ static void do_usrsock_blocking_getsockopt_thread(FAR void *param)
   bool test_abort = !!(test_flags & TEST_FLAG_DAEMON_ABORT);
   bool test_hang = !!(test_flags & TEST_FLAG_PAUSE_USRSOCK_HANDLING);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -321,6 +362,10 @@ static void do_usrsock_blocking_getsockopt_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt hanging getsockopt. */
 
   sem_post(&tid_startsem);
@@ -352,6 +397,11 @@ static void do_usrsock_blocking_send_thread(FAR void *param)
 
   TEST_ASSERT_TRUE(test_hang || !test_hang);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -372,6 +422,10 @@ static void do_usrsock_blocking_send_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt blocking send. */
 
   sem_post(&tid_startsem);
@@ -401,6 +455,11 @@ static void do_usrsock_blocking_recv_thread(FAR void *param)
 
   TEST_ASSERT_TRUE(test_hang || !test_hang);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -421,6 +480,10 @@ static void do_usrsock_blocking_recv_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt blocking recv. */
 
   sem_post(&tid_startsem);
@@ -454,6 +517,11 @@ static void do_usrsock_blocking_poll_thread(FAR void *param)
   TEST_ASSERT_TRUE(test_abort);
   TEST_ASSERT_TRUE(test_hang || !test_hang);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   /* Open socket. */
 
   test_sd[tidx] = socket(AF_INET, SOCK_STREAM, 0);
@@ -474,6 +542,10 @@ static void do_usrsock_blocking_poll_thread(FAR void *param)
   sem_post(&tid_startsem);
   sem_wait(&tid_releasesem);
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_testcancel();
+#endif
+
   /* Attempt poll. */
 
   pfd.fd = test_sd[tidx];
@@ -560,8 +632,11 @@ static void do_wake_test(enum e_test_type type, int flags)
 
       for (tidx = 0; tidx < nthreads; tidx++)
         {
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+          pthread_cancel(tid[tidx]);
+#else
           pthread_kill(tid[tidx], SIGUSR1);
-
+#endif
           /* Wait threads to complete work. */
 
           ret = pthread_join(tid[tidx], NULL);
diff --git a/examples/xedge_demo/Kconfig b/examples/xedge_demo/Kconfig
index 9bc02d0fa..183f18b28 100644
--- a/examples/xedge_demo/Kconfig
+++ b/examples/xedge_demo/Kconfig
@@ -5,11 +5,11 @@
 
 config EXAMPLES_XEDGE_DEMO
 	tristate "Xedge IoT Toolkit Demo"
-	depends on NETUTILS_XEDGE && ALLOW_GPL_COMPONENTS
+	depends on NETUTILS_XEDGE && ALLOW_GPL_COMPONENTS && ENABLE_ALL_SIGNALS
 	default n
 	---help---
 		Simple demonstration of the Xedge IoT Toolkit library.
-		
+
 		This example shows how to integrate and use the Xedge library
 		in your NuttX application. Xedge provides a high-level development
 		environment for creating IoT and industrial device applications
diff --git a/examples/zerocross/Kconfig b/examples/zerocross/Kconfig
index b49614731..758c4781a 100644
--- a/examples/zerocross/Kconfig
+++ b/examples/zerocross/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_ZEROCROSS
 	tristate "Zero Cross Detection example"
 	default n
-	depends on SENSORS_ZEROCROSS
+	depends on SENSORS_ZEROCROSS && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the zero cross detection example
 
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 9c2c1d5ed..74f4032cc 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -1179,6 +1179,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
   int cmd_unset(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
 #ifndef CONFIG_NSH_DISABLE_KILL
   int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
@@ -1191,6 +1192,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #ifndef CONFIG_NSH_DISABLE_USLEEP
   int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
+#endif /* !CONFIG_DISABLE_ALL_SIGNALS */
 
 #ifndef CONFIG_NSH_DISABLE_UPTIME
   int cmd_uptime(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 03a14ace9..af0084218 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -304,14 +304,6 @@ static const struct cmdmap_s g_cmdmap[] =
   CMD_MAP("irqinfo",  cmd_irqinfo,  1, 1, NULL),
 #endif
 
-#ifndef CONFIG_NSH_DISABLE_KILL
-  CMD_MAP("kill",     cmd_kill,     2, 3, "[-<signal>] <pid>"),
-#endif
-
-#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
-  CMD_MAP("pkill",     cmd_pkill,     2, 3, "[-<signal>] <name>"),
-#endif
-
 #ifndef CONFIG_DISABLE_MOUNTPOINT
 #  if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP)
   CMD_MAP("losetup",  cmd_losetup,  3, 6,
@@ -575,10 +567,24 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 #endif
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
+#ifndef CONFIG_NSH_DISABLE_KILL
+  CMD_MAP("kill",     cmd_kill,     2, 3, "[-<signal>] <pid>"),
+#endif
+
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
+  CMD_MAP("pkill",     cmd_pkill,     2, 3, "[-<signal>] <name>"),
+#endif
+
 #ifndef CONFIG_NSH_DISABLE_SLEEP
   CMD_MAP("sleep",    cmd_sleep,    2, 2, "<sec>"),
 #endif
 
+#ifndef CONFIG_NSH_DISABLE_USLEEP
+  CMD_MAP("usleep",   cmd_usleep,   2, 2, "<usec>"),
+#endif
+#endif
+
 #if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_SOURCE)
   CMD_MAP("source",   cmd_source,   2, 2, "<script-path>"),
 #endif
@@ -657,10 +663,6 @@ static const struct cmdmap_s g_cmdmap[] =
 #  endif
 #endif
 
-#ifndef CONFIG_NSH_DISABLE_USLEEP
-  CMD_MAP("usleep",   cmd_usleep,   2, 2, "<usec>"),
-#endif
-
 #ifndef CONFIG_NSH_DISABLE_WATCH
   CMD_MAP("watch",     cmd_watch,
           2, 6, "[-n] interval [-c] count <command>"),
diff --git a/nshlib/nsh_proccmds.c b/nshlib/nsh_proccmds.c
index c7eff26eb..02a9869aa 100644
--- a/nshlib/nsh_proccmds.c
+++ b/nshlib/nsh_proccmds.c
@@ -995,7 +995,8 @@ int cmd_pidof(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
  * Name: cmd_kill
  ****************************************************************************/
 
-#ifndef CONFIG_NSH_DISABLE_KILL
+#if !defined(CONFIG_NSH_DISABLE_KILL) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *ptr;
@@ -1098,7 +1099,8 @@ invalid_arg:
  * Name: cmd_pkill
  ****************************************************************************/
 
-#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR const char *name;
@@ -1199,7 +1201,8 @@ invalid_arg:
  * Name: cmd_sleep
  ****************************************************************************/
 
-#ifndef CONFIG_NSH_DISABLE_SLEEP
+#if !defined(CONFIG_NSH_DISABLE_SLEEP) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);
@@ -1222,8 +1225,8 @@ int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 /****************************************************************************
  * Name: cmd_usleep
  ****************************************************************************/
-
-#ifndef CONFIG_NSH_DISABLE_USLEEP
+#if !defined(CONFIG_NSH_DISABLE_USLEEP) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);
diff --git a/system/sensortest/Kconfig b/system/sensortest/Kconfig
index 8f54695ed..68f1f951d 100644
--- a/system/sensortest/Kconfig
+++ b/system/sensortest/Kconfig
@@ -6,7 +6,7 @@
 config SYSTEM_SENSORTEST
 	tristate "Sensor driver test"
 	default n
-	depends on SENSORS
+	depends on SENSORS && ENABLE_ALL_SIGNALS
 	---help---
 		Enable the Sensor driver test
 
diff --git a/testing/drivers/nand_sim/Kconfig b/testing/drivers/nand_sim/Kconfig
index ccf2c657b..e76cdc3f5 100644
--- a/testing/drivers/nand_sim/Kconfig
+++ b/testing/drivers/nand_sim/Kconfig
@@ -5,7 +5,7 @@
 
 config TESTING_NAND_SIM
 	boolean "NAND Flash Simulator"
-	depends on MTD_NAND_RAM
+	depends on MTD_NAND_RAM && ENABLE_ALL_SIGNALS
 	default n
 	---help---
 		Enable the NAND Flash Simulator device.
diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 6e971373d..777c68744 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -22,14 +22,15 @@
 
 if(CONFIG_TESTING_OSTEST)
 
-  set(SRCS
-      getopt.c
-      libc_memmem.c
-      restart.c
-      sigprocmask.c
-      sighand.c
-      signest.c
-      sighelper.c)
+  set(SRCS getopt.c libc_memmem.c restart.c sighelper.c)
+
+  if(CONFIG_ENABLE_ALL_SIGNALS)
+    list(APPEND SRCS sighand.c signest.c)
+  endif()
+
+  if(NOT CONFIG_DISABLE_ALL_SIGNALS)
+    list(APPEND SRCS sigprocmask.c)
+  endif()
 
   if(CONFIG_DEV_NULL)
     list(APPEND SRCS dev_null.c)
@@ -124,7 +125,10 @@ if(CONFIG_TESTING_OSTEST)
 
   if(NOT CONFIG_DISABLE_MQUEUE)
     if(NOT CONFIG_DISABLE_PTHREAD)
-      list(APPEND SRCS mqueue.c timedmqueue.c)
+      list(APPEND SRCS timedmqueue.c)
+      if(NOT CONFIG_DISABLE_ALL_SIGNALS)
+        list(APPEND SRCS mqueue.c)
+      endif()
     endif() # CONFIG_DISABLE_PTHREAD
   endif() # CONFIG_DISABLE_MQUEUE
 
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 5f7d5d4f8..128a31798 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -31,9 +31,17 @@ MODULE = $(CONFIG_TESTING_OSTEST)
 
 # NuttX OS Test
 
-CSRCS   = getopt.c libc_memmem.c restart.c sigprocmask.c sighand.c \
+CSRCS   = getopt.c libc_memmem.c restart.c \
           signest.c sighelper.c
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CSRCS += sighand.c signest.c
+endif
+
+ifneq ($(CONFIG_DISABLE_ALL_SIGNALS),y)
+CSRCS += sigprocmask.c
+endif
+
 MAINSRC = ostest_main.c
 
 ifeq ($(CONFIG_DEV_NULL),y)
@@ -119,7 +127,10 @@ endif # CONFIG_DISABLE_PTHREAD
 
 ifneq ($(CONFIG_DISABLE_MQUEUE),y)
 ifneq ($(CONFIG_DISABLE_PTHREAD),y)
-CSRCS += mqueue.c timedmqueue.c
+CSRCS += timedmqueue.c
+ifneq ($(CONFIG_DISABLE_ALL_SIGNALS),y)
+CSRCS += mqueue.c
+endif
 endif # CONFIG_DISABLE_PTHREAD
 endif # CONFIG_DISABLE_MQUEUE
 
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 975a10410..6bf75d86f 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -496,14 +496,6 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif /* !CONFIG_DISABLE_PTHREAD */
 
-#if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD)
-      /* Verify pthreads and message queues */
-
-      printf("\nuser_main: message queue test\n");
-      mqueue_test();
-      check_test_memory_usage();
-#endif
-
 #if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD)
       /* Verify pthreads and message queues */
 
@@ -519,6 +511,14 @@ static int user_main(int argc, char *argv[])
       sigprocmask_test();
       check_test_memory_usage();
 
+#if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD)
+      /* Verify pthreads and message queues */
+
+      printf("\nuser_main: message queue test\n");
+      mqueue_test();
+      check_test_memory_usage();
+#endif
+
 #if defined(CONFIG_SIG_SIGSTOP_ACTION) && defined(CONFIG_SIG_SIGKILL_ACTION) && \
     !defined(CONFIG_BUILD_KERNEL)
       printf("\nuser_main: signal action test\n");
diff --git a/wireless/ieee802154/i8sak/i8sak_events.c b/wireless/ieee802154/i8sak/i8sak_events.c
index 12e4758b9..143e7ae3e 100644
--- a/wireless/ieee802154/i8sak/i8sak_events.c
+++ b/wireless/ieee802154/i8sak/i8sak_events.c
@@ -68,6 +68,11 @@ static pthread_addr_t i8sak_eventthread(pthread_addr_t arg)
   FAR struct ieee802154_primitive_s *primitive = NULL;
   int ret = OK;
 
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+#endif
+
   if (i8sak->mode == I8SAK_MODE_CHAR)
     {
       macarg.enable = true;
@@ -86,6 +91,9 @@ static pthread_addr_t i8sak_eventthread(pthread_addr_t arg)
 
   while (i8sak->eventlistener_run)
     {
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+      pthread_testcancel();
+#endif
       if (i8sak->mode == I8SAK_MODE_CHAR)
         {
           ret = ioctl(i8sak->fd, MAC802154IOC_GET_EVENT,
@@ -256,7 +264,13 @@ int i8sak_eventlistener_stop(FAR struct i8sak_s *i8sak)
   FAR void *value;
 
   i8sak->eventlistener_run = false;
+
+#ifdef CONFIG_DISABLE_ALL_SIGNALS
+  pthread_cancel(i8sak->eventlistener_threadid);
+#else
   pthread_kill(i8sak->eventlistener_threadid, 2);
+#endif
+
   ret = pthread_join(i8sak->eventlistener_threadid, &value);
   if (ret != OK)
     {

From ddc699a4f3f5870d837f1b15589b6c872c6bd156 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Tue, 20 Jan 2026 13:52:59 +0800
Subject: [PATCH 135/568] system/cu: fix signal handler to use sa_sigaction

The sigint() function uses siginfo->si_user but was declared with
only one parameter (int sig). This causes compilation error because
siginfo is undeclared.

Fix by:
1. Rename sigint to cu_exit with proper sigaction signature
2. Use sa_sigaction instead of sa_handler to receive siginfo_t
3. Pass cu pointer via sa.sa_user for signal handler access

Signed-off-by: makejian <makejian@xiaomi.com>
---
 system/cu/cu_main.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index 6e25acfc9..fbb3350aa 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -123,7 +123,7 @@ static FAR void *cu_listener(FAR void *parameter)
 }
 
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
-static void sigint(int sig)
+static void cu_exit(int signo, FAR siginfo_t *siginfo, FAR void *context)
 {
   FAR struct cu_globals_s *cu = siginfo->si_user;
   cu->force_exit = true;
@@ -302,8 +302,15 @@ int main(int argc, FAR char *argv[])
   /* Install signal handlers */
 
   memset(&sa, 0, sizeof(sa));
-  sa.sa_handler = sigint;
-  sigaction(SIGINT, &sa, NULL);
+  sa.sa_user = &cu;
+  sa.sa_sigaction = cu_exit;
+  sigemptyset(&sa.sa_mask);
+  if (sigaction(SIGINT, &sa, NULL) < 0)
+    {
+      cu_error("cu_main: ERROR during setup cu_exit sigaction(): %d\n",
+               errno);
+      return EXIT_FAILURE;
+    }
 #endif
   optind = 0;   /* Global that needs to be reset in FLAT mode */
   while ((option = getopt(argc, argv, "l:s:ceE:fho?")) != ERROR)

From 755fae7ac1b365a0abcb4bd9fe4fd2b4a7cce797 Mon Sep 17 00:00:00 2001
From: guoshichao <guoshichao@xiaomi.com>
Date: Thu, 25 Sep 2025 15:29:25 +0800
Subject: [PATCH 136/568] system/cu: merge the cu.h to cu_main.c

Merge the cu.h header file contents into cu_main.c to simplify the
code structure. The cu_globals_s structure and related definitions
are now directly in cu_main.c.

Signed-off-by: guoshichao <guoshichao@xiaomi.com>
---
 system/cu/cu.h      | 92 ---------------------------------------------
 system/cu/cu_main.c | 34 ++++++++++++++++-
 2 files changed, 33 insertions(+), 93 deletions(-)
 delete mode 100644 system/cu/cu.h

diff --git a/system/cu/cu.h b/system/cu/cu.h
deleted file mode 100644
index be9b31fb3..000000000
--- a/system/cu/cu.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
- * apps/system/cu/cu.h
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SPDX-FileCopyrightText: 2014 sysmocom - s.f.m.c. GmbH. All rights reserved.
- * SPDX-FileContributor: Harald Welte <hwelte@sysmocom.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX 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.
- *
- ****************************************************************************/
-
-#ifndef __APPS_SYSTEM_CU_CU_H
-#define __APPS_SYSTEM_CU_CU_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <semaphore.h>
-#include <termios.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-#ifndef CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE
-#  define CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE "/dev/ttyS0"
-#endif
-
-#ifndef CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD
-#  define CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD 115200
-#endif
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/* All terminal state data is packaged in a single structure to minimize
- * name conflicts with other global symbols -- a poor man's name space.
- */
-
-struct cu_globals_s
-{
-  int devfd;             /* I/O data to serial port */
-  int stdfd;             /* I/O data to standard console */
-  int escape;            /* Escape char */
-  struct termios devtio; /* Original serial port setting */
-  struct termios stdtio; /* Original standard console setting */
-  pthread_t listener;    /* Terminal listener thread */
-  bool force_exit;       /* Force exit */
-};
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#endif /* __APPS_SYSTEM_CU_CU_H */
diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index fbb3350aa..fa5b31900 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -53,10 +53,26 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <debug.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <semaphore.h>
+#include <termios.h>
 
 #include "system/readline.h"
 
-#include "cu.h"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE
+#  define CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE "/dev/ttyS0"
+#endif
+
+#ifndef CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD
+#  define CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD 115200
+#endif
 
 #ifdef CONFIG_SYSTEM_CUTERM_DISABLE_ERROR_PRINT
 #  define cu_error(...)
@@ -75,6 +91,21 @@ enum parity_mode
   PARITY_ODD,
 };
 
+/* All terminal state data is packaged in a single structure to minimize
+ * name conflicts with other global symbols -- a poor man's name space.
+ */
+
+struct cu_globals_s
+{
+  int devfd;             /* I/O data to serial port */
+  int stdfd;             /* I/O data to standard console */
+  int escape;            /* Escape char */
+  struct termios devtio; /* Original serial port setting */
+  struct termios stdtio; /* Original standard console setting */
+  pthread_t listener;    /* Terminal listener thread */
+  bool force_exit;       /* Force exit */
+};
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -311,6 +342,7 @@ int main(int argc, FAR char *argv[])
                errno);
       return EXIT_FAILURE;
     }
+
 #endif
   optind = 0;   /* Global that needs to be reset in FLAT mode */
   while ((option = getopt(argc, argv, "l:s:ceE:fho?")) != ERROR)

From 19dd2531fbc315f97a9d2c2825c0bae88bcddf00 Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Tue, 20 Jan 2026 20:02:01 +0800
Subject: [PATCH 137/568] testing/ostest: fix build issue

  fix:

  Building NuttX...

  /d/a/nuttx-apps/nuttx-apps/sources/apps/Application.mk:238: target 'signest.c.d.a.nuttx-apps.nuttx-  apps.sources.apps.testing.ostest.o' given more than once in the same rule

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 128a31798..1fedfcf54 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -31,8 +31,7 @@ MODULE = $(CONFIG_TESTING_OSTEST)
 
 # NuttX OS Test
 
-CSRCS   = getopt.c libc_memmem.c restart.c \
-          signest.c sighelper.c
+CSRCS   = getopt.c libc_memmem.c restart.c sighelper.c
 
 ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
 CSRCS += sighand.c signest.c

From 840c4fceefb459191bf26a356fa3ff8d6c5aeda8 Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Tue, 20 Jan 2026 10:48:28 +0800
Subject: [PATCH 138/568] ostest/hrtimer: align hrtimer callback declaration

  align hrtimer callback declaration with latest update of hrtimer

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/hrtimer.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 3943140e6..1094167ac 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -128,7 +128,7 @@ static void hrtimer_test_init(FAR struct hrtimer_test_s *hrtimer_test,
  ****************************************************************************/
 
 static uint64_t
-test_hrtimer_callback(FAR hrtimer_t *hrtimer, uint64_t expired)
+test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 {
   struct timespec ts;
   uint32_t diff;
@@ -167,15 +167,15 @@ test_hrtimer_callback(FAR hrtimer_t *hrtimer, uint64_t expired)
 
   /* Stop the test after 15 expirations */
 
-  if (test->count >= 15)
+  if (test->count < 15)
     {
-      ret = hrtimer_cancel(hrtimer);
-      HRTIMER_TEST(ret, 0);
-
-      test->active = false;
+      return test->period;
+    }
+  else
+    {
+      test->active = false;
+      return 0;
     }
-
-  return test->period;
 }
 
 /****************************************************************************

From 545684944621fbc152e2251fadb7554fe9f11656 Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Tue, 20 Jan 2026 11:40:57 +0800
Subject: [PATCH 139/568] ostest/hrtimer: Add threaded hrtimer tests

  Add threaded hrtimer tests

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/hrtimer.c | 100 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 96 insertions(+), 4 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 1094167ac..d503f878f 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -29,6 +29,8 @@
 
 #include <stdio.h>
 #include <sched.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 #include "ostest.h"
 
@@ -36,7 +38,12 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define NSEC_PER_50MS (50 * NSEC_PER_MSEC)
+/* Timer constants */
+
+#define NSEC_PER_50MS            (50 * NSEC_PER_MSEC)
+#define PERIOD_TEST_COUNT        15
+#define THREAD_LOOP_COUNT        50
+#define HRTIMER_TEST_THREAD_NR   (CONFIG_SMP_NCPUS * 5)
 
 /* Set a 1ms margin to allow hrtimertest to pass in QEMU.
  *
@@ -165,9 +172,9 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 
   test->previous = now;
 
-  /* Stop the test after 15 expirations */
+  /* Stop the test after PERIOD_TEST_COUNT expirations */
 
-  if (test->count < 15)
+  if (test->count < PERIOD_TEST_COUNT)
     {
       return test->period;
     }
@@ -178,6 +185,67 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
     }
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_callback
+ *
+ * Description:
+ *   Simple HRTimer callback for threaded tests.
+ *
+ ****************************************************************************/
+
+static uint64_t
+hrtimer_test_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
+{
+  return 0;
+}
+
+/****************************************************************************
+ * Name: hrtimer_test_thread
+ *
+ * Description:
+ *   Thread function to repeatedly test HRTimer start/cancel behavior.
+ *
+ ****************************************************************************/
+
+static void * hrtimer_test_thread(void *arg)
+{
+  hrtimer_t timer;
+  int ret;
+  int i = 0;
+
+  hrtimer_init(&timer);
+
+  while (i < THREAD_LOOP_COUNT)
+    {
+      i++;
+      uint64_t delay = rand() % NSEC_PER_MSEC;
+
+      /* Cancel timer */
+
+      ret = hrtimer_cancel(&timer);
+      HRTIMER_TEST(ret, OK);
+
+      /* Start timer with fixed period */
+
+      ret = hrtimer_start(&timer, hrtimer_test_callback,
+                          10 * NSEC_PER_USEC, HRTIMER_MODE_REL);
+      HRTIMER_TEST(ret, OK);
+
+      /* Start timer with random delay */
+
+      ret = hrtimer_start(&timer, hrtimer_test_callback,
+                          delay, HRTIMER_MODE_REL);
+      HRTIMER_TEST(ret, OK);
+    }
+
+  /* Cancel the timer synchronously */
+
+  ret = hrtimer_cancel_sync(&timer);
+  HRTIMER_TEST(ret, OK);
+
+  return NULL;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -202,8 +270,12 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 
 void hrtimer_test(void)
 {
-  int ret;
+  struct sched_param sparam;
+  unsigned int thread_id;
+  pthread_attr_t attr;
+  pthread_t pthreads[HRTIMER_TEST_THREAD_NR];
   struct hrtimer_test_s hrtimer_test;
+  int ret;
 
   /* Initialize test structure */
 
@@ -228,4 +300,24 @@ void hrtimer_test(void)
     {
       usleep(USEC_PER_MSEC);
     }
+
+  pthread_attr_init(&attr);
+
+  sparam.sched_priority = PTHREAD_DEFAULT_PRIORITY;
+  pthread_attr_setschedparam(&attr, &sparam);
+
+  for (thread_id = 0; thread_id < HRTIMER_TEST_THREAD_NR; thread_id++)
+    {
+      HRTIMER_TEST(pthread_create(&pthreads[thread_id], &attr,
+                                  hrtimer_test_thread, NULL), 0);
+    }
+
+  /* Wait for all threads to complete */
+
+  for (thread_id = 0; thread_id < HRTIMER_TEST_THREAD_NR; thread_id++)
+    {
+      pthread_join(pthreads[thread_id], NULL);
+    }
+
+  HRTIMER_TEST(pthread_attr_destroy(&attr), 0);
 }

From 37403210f9b4a96782e281885a241d9209f5f22c Mon Sep 17 00:00:00 2001
From: Jiri Vlasak <jvlasak@elektroline.cz>
Date: Tue, 20 Jan 2026 13:59:01 +0100
Subject: [PATCH 140/568] netutils/nng: Update help for NETUTILS_NNG

NNG depends on options that, if not enabled, makes compilation or
runtime crashes. Noting these options in help helps to find out which
are such options.

Signed-off-by: Jiri Vlasak <jvlasak@elektroline.cz>
---
 netutils/nng/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/netutils/nng/Kconfig b/netutils/nng/Kconfig
index 525cf2f45..8d4dfb7c1 100644
--- a/netutils/nng/Kconfig
+++ b/netutils/nng/Kconfig
@@ -11,6 +11,12 @@ config NETUTILS_NNG
 		offering a simple API to solve common recurring messaging problems,
 		such as publish/subscribe, RPC-style request/reply, or service discovery.
 
+		Consider the following configuration when enabling NNG:
+		- CONFIG_LIBC_NETDB=y
+		- CONFIG_DEV_URANDOM=y
+		- CONFIG_NET_LOCAL=y
+		- CONFIG_NET_LOCAL_STREAM=y
+
 if NETUTILS_NNG
 
 config NETUTILS_NNG_VERSION

From 9148fb97186196778ea0efa5f083ecb630e4287d Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Tue, 20 Jan 2026 10:29:56 +0800
Subject: [PATCH 141/568] benchmarks: Add Whetstone FPU benchmark

Add the Whetstone floating-point benchmark to NuttX applications.
The Whetstone benchmark is a widely-used tool for evaluating FPU
(floating-point unit) performance.

This benchmark is ported from netlib.org whetstone.c which has a
custom permissive license requiring attribution. Therefore it
depends on ALLOW_CUSTOM_PERMISSIVE_COMPONENTS.

Usage: whetstone [loops]

Signed-off-by: makejian <makejian@xiaomi.com>
---
 benchmarks/whetstone/CMakeLists.txt |  31 ++
 benchmarks/whetstone/Kconfig        |  34 ++
 benchmarks/whetstone/Make.defs      |  23 ++
 benchmarks/whetstone/Makefile       |  32 ++
 benchmarks/whetstone/whetstone.c    | 517 ++++++++++++++++++++++++++++
 5 files changed, 637 insertions(+)
 create mode 100644 benchmarks/whetstone/CMakeLists.txt
 create mode 100644 benchmarks/whetstone/Kconfig
 create mode 100644 benchmarks/whetstone/Make.defs
 create mode 100644 benchmarks/whetstone/Makefile
 create mode 100644 benchmarks/whetstone/whetstone.c

diff --git a/benchmarks/whetstone/CMakeLists.txt b/benchmarks/whetstone/CMakeLists.txt
new file mode 100644
index 000000000..1bcc0f256
--- /dev/null
+++ b/benchmarks/whetstone/CMakeLists.txt
@@ -0,0 +1,31 @@
+# ##############################################################################
+# apps/benchmarks/whetstone/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_BENCHMARK_WHETSTONE)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_BENCHMARK_WHETSTONE_PROGNAME}
+    SRCS
+    whetstone.c
+    STACKSIZE
+    ${CONFIG_BENCHMARK_WHETSTONE_STACKSIZE}
+    PRIORITY
+    ${CONFIG_BENCHMARK_WHETSTONE_PRIORITY})
+endif()
diff --git a/benchmarks/whetstone/Kconfig b/benchmarks/whetstone/Kconfig
new file mode 100644
index 000000000..10df1429e
--- /dev/null
+++ b/benchmarks/whetstone/Kconfig
@@ -0,0 +1,34 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config BENCHMARK_WHETSTONE
+	tristate "Double Precision Benchmark"
+	default n
+	depends on ALLOW_CUSTOM_PERMISSIVE_COMPONENTS
+	---help---
+		Enable a Whetstone test.
+
+		This benchmark is based on the C converted version from
+		https://www.netlib.org/benchmark/whetstone.c which has a
+		custom permissive license requiring attribution.
+
+if BENCHMARK_WHETSTONE
+
+config BENCHMARK_WHETSTONE_PROGNAME
+	string "Program name"
+	default "whetstone"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config BENCHMARK_WHETSTONE_PRIORITY
+	int "Whetstone test task priority"
+	default 100
+
+config BENCHMARK_WHETSTONE_STACKSIZE
+	int "Whetstone test stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/benchmarks/whetstone/Make.defs b/benchmarks/whetstone/Make.defs
new file mode 100644
index 000000000..d9fa9f1af
--- /dev/null
+++ b/benchmarks/whetstone/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/benchmarks/whetstone/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_BENCHMARK_WHETSTONE),)
+CONFIGURED_APPS += $(APPDIR)/benchmarks/whetstone
+endif
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
new file mode 100644
index 000000000..1bdf6dfd6
--- /dev/null
+++ b/benchmarks/whetstone/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/benchmarks/whetstone/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# WHETSTONE speed test
+
+PROGNAME = $(CONFIG_BENCHMARK_WHETSTONE_PROGNAME)
+PRIORITY = $(CONFIG_BENCHMARK_WHETSTONE_PRIORITY)
+STACKSIZE = $(CONFIG_BENCHMARK_WHETSTONE_STACKSIZE)
+MODULE = $(CONFIG_BENCHMARK_WHETSTONE)
+
+MAINSRC = whetstone.c
+
+include $(APPDIR)/Application.mk
diff --git a/benchmarks/whetstone/whetstone.c b/benchmarks/whetstone/whetstone.c
new file mode 100644
index 000000000..4363baaf7
--- /dev/null
+++ b/benchmarks/whetstone/whetstone.c
@@ -0,0 +1,517 @@
+/****************************************************************************
+ * apps/benchmarks/whetstone/whetstone.c
+ *
+ * SPDX-License-Identifier: LicenseRef-Painter-Engineering-Whetstone
+ *
+ * Converted Whetstone Double Precision Benchmark
+ *    Version 1.2  22 March 1998
+ *
+ *  (c) Copyright 1998 Painter Engineering, Inc.
+ *    All Rights Reserved.
+ *
+ *    Permission is granted to use, duplicate, and
+ *    publish this text and program as long as it
+ *    includes this entire comment block and limited
+ *    rights reference.
+ *
+ * Converted by Rich Painter, Painter Engineering, Inc. based on the
+ * www.netlib.org benchmark/whetstoned version obtained 16 March 1998.
+ *
+ * A novel approach was used here to keep the look and feel of the
+ * FORTRAN version.  Altering the FORTRAN-based array indices,
+ * starting at element 1, to start at element 0 for C, would require
+ * numerous changes, including decrementing the variable indices by 1.
+ * Instead, the array e1[] was declared 1 element larger in C.  This
+ * allows the FORTRAN index range to function without any literal or
+ * variable indices changes.  The array element e1[0] is simply never
+ * used and does not alter the benchmark results.
+ *
+ * The major FORTRAN comment blocks were retained to minimize
+ * differences between versions.  Modules N5 and N12, like in the
+ * FORTRAN version, have been eliminated here.
+ *
+ * An optional command-line argument has been provided [-c] to
+ * offer continuous repetition of the entire benchmark.
+ * An optional argument for setting an alternate loop count is also
+ * provided.  Define PRINTOUT to cause the pout() function to print
+ * outputs at various stages.  Final timing measurements should be
+ * made with the PRINTOUT undefined.
+ *
+ * Questions and comments may be directed to the author at
+ *      r.painter@ieee.org
+ ****************************************************************************/
+
+/****************************************************************************
+ *     Benchmark #2 -- Double  Precision Whetstone (A001)
+ *
+ *     o  This is a REAL*8 version of
+ *  the Whetstone benchmark program.
+ *
+ *     o  DO-loop semantics are ANSI-66 compatible.
+ *
+ *     o  Final measurements are to be made with all
+ *  WRITE statements and FORMAT sttements removed.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* standard C library headers required */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+/* the following is optional depending on the timing function used */
+
+#include <time.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* map the FORTRAN math functions, etc. to the C versions */
+
+#define DSIN  sin
+#define DCOS  cos
+#define DATAN  atan
+#define DLOG  log
+#define DEXP  exp
+#define DSQRT  sqrt
+#define IF    if
+#define USAGE  "usage: whetdc [-c] [loops]\n"
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* function prototypes */
+
+void pout(long n, long j, long k, double x1,
+          double x2, double x3, double x4);
+void pa(double e[]);
+void p0(void);
+void p3(double x, double y, FAR double *z);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* COMMON t,t1,t2,e1(4),j,k,l */
+
+double t;
+double t1;
+double t2;
+double e1[5];
+int j;
+int k;
+int l;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  /* used in the FORTRAN version */
+
+  long loop;
+  long i;
+  long n1;
+  long n2;
+  long n3;
+  long n4;
+  long n6;
+  long n7;
+  long n8;
+  long n9;
+  long n10;
+  long n11;
+  double x1;
+  double x2;
+  double x3;
+  double x4;
+  double x;
+  double y;
+  double z;
+  int ii;
+  int jj;
+
+  /* added for this version */
+
+  long loopstart;
+  long startsec;
+  long finisec;
+  float KIPS;
+  int continuous;
+
+  loopstart = 1000;    /* see the note about loop below */
+  continuous = 0;
+
+  ii = 1;    /* start at the first arg (temp use of ii here) */
+  while (ii < argc)
+    {
+      if (strncmp(argv[ii], "-c", 2) == 0 || argv[ii][0] == 'c')
+        {
+          continuous = 1;
+        }
+      else if (atol(argv[ii]) > 0)
+        {
+          loopstart = atol(argv[ii]);
+        }
+      else
+        {
+          fprintf(stderr, USAGE);
+          return 1;
+        }
+
+      ii++;
+    }
+
+LCONT:
+
+  /* Start benchmark timing at this point. */
+
+  startsec = time(0);
+
+  /* The actual benchmark starts here. */
+
+  t  = .499975;
+  t1 = 0.50025;
+  t2 = 2.0;
+
+  /* With loopcount loop=10, one million Whetstone instructions
+   * will be executed in EACH MAJOR loop..A MAJOR loop IS EXECUTED
+   * 'ii' TIMES TO INCREASE WALL-CLOCK TIMING ACCURACY.
+   *
+   * loop = 1000;
+   */
+
+  loop = loopstart;
+  ii   = 1;
+
+  jj = 1;
+
+IILOOP:
+  n1  = 0;
+  n2  = 12 * loop;
+  n3  = 14 * loop;
+  n4  = 345 * loop;
+  n6  = 210 * loop;
+  n7  = 32 * loop;
+  n8  = 899 * loop;
+  n9  = 616 * loop;
+  n10 = 0;
+  n11 = 93 * loop;
+
+  /* Module 1: Simple identifiers */
+
+  x1  =  1.0;
+  x2  = -1.0;
+  x3  = -1.0;
+  x4  = -1.0;
+
+  for (i = 1; i <= n1; i++)
+    {
+      x1 = (x1 + x2 + x3 - x4) * t;
+      x2 = (x1 + x2 - x3 + x4) * t;
+      x3 = (x1 - x2 + x3 + x4) * t;
+      x4 = (-x1 + x2 + x3 + x4) * t;
+    }
+
+#ifdef PRINTOUT
+  IF (jj  ==  ii)
+    {
+      pout(n1, n1, n1, x1, x2, x3, x4);
+    }
+#endif
+
+  /* Module 2: Array elements */
+
+  e1[1] =  1.0;
+  e1[2] = -1.0;
+  e1[3] = -1.0;
+  e1[4] = -1.0;
+
+  for (i = 1; i <= n2; i++)
+    {
+      e1[1] = (e1[1] + e1[2] + e1[3] - e1[4]) * t;
+      e1[2] = (e1[1] + e1[2] - e1[3] + e1[4]) * t;
+      e1[3] = (e1[1] - e1[2] + e1[3] + e1[4]) * t;
+      e1[4] = (-e1[1] + e1[2] + e1[3] + e1[4]) * t;
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n2, n3, n2, e1[1], e1[2], e1[3], e1[4]);
+    }
+#endif
+
+  /* Module 3: Array as parameter */
+
+  for (i = 1; i <= n3; i++)
+    {
+      pa(e1);
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n3, n2, n2, e1[1], e1[2], e1[3], e1[4]);
+    }
+#endif
+
+  /* Module 4: Conditional jumps */
+
+  j = 1;
+  for (i = 1; i <= n4; i++)
+    {
+      if (j == 1)
+        {
+          j = 2;
+        }
+      else
+        {
+          j = 3;
+        }
+
+      if (j > 2)
+        {
+          j = 0;
+        }
+      else
+        {
+          j = 1;
+        }
+
+      if (j < 1)
+        {
+          j = 1;
+        }
+      else
+        {
+          j = 0;
+        }
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n4, j, j, x1, x2, x3, x4);
+    }
+#endif
+
+/* Module 5: Omitted
+ * Module 6: Integer arithmetic
+ */
+
+  j = 1;
+  k = 2;
+  l = 3;
+
+  for (i = 1; i <= n6; i++)
+    {
+      j = j * (k - j) * (l - k);
+      k = l * k - (l - j) * k;
+      l = (l - k) * (k + j);
+      e1[l - 1] = j + k + l;
+      e1[k - 1] = j * k * l;
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n6, j, k, e1[1], e1[2], e1[3], e1[4]);
+    }
+#endif
+
+  /* Module 7: Trigonometric functions */
+
+  x = 0.5;
+  y = 0.5;
+
+  for (i = 1; i <= n7; i++)
+    {
+      x = t * DATAN(t2 * DSIN(x) * DCOS(x) /
+             (DCOS(x + y) + DCOS(x - y) - 1.0));
+      y = t * DATAN(t2 * DSIN(y) * DCOS(y) /
+             (DCOS(x + y) + DCOS(x - y) - 1.0));
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n7, j, k, x, x, y, y);
+    }
+#endif
+
+  /* Module 8: Procedure calls */
+
+  x = 1.0;
+  y = 1.0;
+  z = 1.0;
+
+  for (i = 1; i <= n8; i++)
+    {
+      p3(x, y, &z);
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n8, j, k, x, y, z, z);
+    }
+#endif
+
+  /* Module 9: Array references */
+
+  j = 1;
+  k = 2;
+  l = 3;
+  e1[1] = 1.0;
+  e1[2] = 2.0;
+  e1[3] = 3.0;
+
+  for (i = 1; i <= n9; i++)
+    {
+      p0();
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n9, j, k, e1[1], e1[2], e1[3], e1[4]);
+    }
+#endif
+
+  /* Module 10: Integer arithmetic */
+
+  j = 2;
+  k = 3;
+
+  for (i = 1; i <= n10; i++)
+    {
+      j = j + k;
+      k = j + k;
+      j = k - j;
+      k = k - j - j;
+    }
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n10, j, k, x1, x2, x3, x4);
+    }
+#endif
+
+  /* Module 11: Standard functions */
+
+  x = 0.75;
+
+  for (i = 1; i <= n11; i++)
+    x = DSQRT(DEXP(DLOG(x) / t1));
+
+#ifdef PRINTOUT
+  IF (jj == ii)
+    {
+      pout(n11, j, k, x, x, x, x);
+    }
+#endif
+
+  /* THIS IS THE END OF THE MAJOR loop. */
+
+  if (++jj <= ii)
+    {
+      goto IILOOP;
+    }
+
+  /* Stop benchmark timing at this point. */
+
+  finisec = time(0);
+
+  /* Performance in Whetstone KIP's per second is given by
+   *
+   * (100*loop*ii)/TIME
+   *
+   * where TIME is in seconds.
+   */
+
+  printf("\n");
+  if (finisec - startsec <= 0)
+    {
+      printf("Insufficient duration- Increase the loop count\n");
+      return 1;
+    }
+
+  printf("Loops: %ld, Iterations: %d, Duration: %ld sec.\n",
+                                loop, ii, finisec - startsec);
+
+  KIPS = (100.0 * loop * ii) / (float)(finisec - startsec);
+  if (KIPS >= 1000.0)
+    {
+      printf("C Converted Double Precision Whetstones: %.1f MIPS\n",
+                                                     KIPS / 1000.0);
+    }
+  else
+    {
+      printf("C Converted Double Precision Whetstones: %.1f KIPS\n", KIPS);
+    }
+
+  if (continuous)
+    {
+      goto LCONT;
+    }
+
+  return 0;
+}
+
+void
+pa(double e[])
+{
+  j = 0;
+
+L10:
+  e[1] = (e[1] + e[2] + e[3] - e[4]) * t;
+  e[2] = (e[1] + e[2] - e[3] + e[4]) * t;
+  e[3] = (e[1] - e[2] + e[3] + e[4]) * t;
+  e[4] = (-e[1] + e[2] + e[3] + e[4]) / t2;
+  j += 1;
+
+  if (j < 6)
+    {
+      goto L10;
+    }
+}
+
+void
+p0(void)
+{
+  e1[j] = e1[k];
+  e1[k] = e1[l];
+  e1[l] = e1[j];
+}
+
+void p3(double x, double y, FAR double *z)
+{
+  double x1;
+  double y1;
+
+  x1 = x;
+  y1 = y;
+  x1 = t * (x1 + y1);
+  y1 = t * (x1 + y1);
+  *z  = (x1 + y1) / t2;
+}
+
+#ifdef PRINTOUT
+void
+pout(long n, long j, long k, double x1, double x2, double x3, double x4)
+{
+  printf("%7ld %7ld %7ld %12.4e %12.4e %12.4e %12.4e\n",
+            n, j, k, x1, x2, x3, x4);
+}
+#endif

From 22f85e8b61de4fe8b22fd6224601363f28901a68 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Thu, 29 May 2025 20:50:13 +0800
Subject: [PATCH 142/568] benchmarks/fpu: improve timing precision to
 milliseconds

Change FPU benchmark timing from seconds to milliseconds for better accuracy.
This allows for more precise measurement of test cycles, especially for
shorter test runs that previously completed within a single second.

Signed-off-by: makejian <makejian@xiaomi.com>
---
 benchmarks/whetstone/whetstone.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/benchmarks/whetstone/whetstone.c b/benchmarks/whetstone/whetstone.c
index 4363baaf7..dbc8247fd 100644
--- a/benchmarks/whetstone/whetstone.c
+++ b/benchmarks/whetstone/whetstone.c
@@ -143,10 +143,11 @@ int main(int argc, FAR char *argv[])
   /* added for this version */
 
   long loopstart;
-  long startsec;
-  long finisec;
+  long startmsec;
+  long finimsec;
   float KIPS;
   int continuous;
+  struct timespec ts;
 
   loopstart = 1000;    /* see the note about loop below */
   continuous = 0;
@@ -175,7 +176,8 @@ LCONT:
 
   /* Start benchmark timing at this point. */
 
-  startsec = time(0);
+  clock_gettime(CLOCK_REALTIME, &ts);
+  startmsec = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
 
   /* The actual benchmark starts here. */
 
@@ -431,7 +433,8 @@ IILOOP:
 
   /* Stop benchmark timing at this point. */
 
-  finisec = time(0);
+  clock_gettime(CLOCK_REALTIME, &ts);
+  finimsec = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
 
   /* Performance in Whetstone KIP's per second is given by
    *
@@ -441,16 +444,16 @@ IILOOP:
    */
 
   printf("\n");
-  if (finisec - startsec <= 0)
+  if (finimsec - startmsec <= 0)
     {
       printf("Insufficient duration- Increase the loop count\n");
       return 1;
     }
 
-  printf("Loops: %ld, Iterations: %d, Duration: %ld sec.\n",
-                                loop, ii, finisec - startsec);
+  printf("Loops: %ld, Iterations: %d, Duration: %ld millisecond.\n",
+                                loop, ii, finimsec - startmsec);
 
-  KIPS = (100.0 * loop * ii) / (float)(finisec - startsec);
+  KIPS = (100.0 * loop * ii) / ((float)(finimsec - startmsec) * 1000);
   if (KIPS >= 1000.0)
     {
       printf("C Converted Double Precision Whetstones: %.1f MIPS\n",

From 825007aafb48261fcb28a4a08235e46a265d9b29 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Tue, 29 Jul 2025 22:54:37 +0800
Subject: [PATCH 143/568] crypto/openssl-wrapper: export
 SSL_CTX_load_verify_file and SSL_CTX_load_verify_dir

Export SSL_CTX_load_verify_file() and SSL_CTX_load_verify_dir()
interfaces to allow loading CA certificates from file or directory.

Signed-off-by: makejian <makejian@xiaomi.com>
---
 crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
index 7bdc03125..436354882 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
@@ -454,6 +454,10 @@ int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str);
 
 int SSL_CTX_set_ex_data(SSL_CTX *s, int idx, void *arg);
 
+int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile);
+
+int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath);
+
 int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
                                   const char *CApath);
 

From 690d8bddceb4d212edd33e70e22ade0d0c6fb5a9 Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Wed, 13 Aug 2025 19:30:14 +0800
Subject: [PATCH 144/568] crypto/openssl-wrapper: fix SSL error code mapping

Map mbedtls error codes to OpenSSL standard return codes in
SSL_connect/SSL_do_handshake:
- Return 1 on success
- Return 0 on controlled shutdown
- Return -1 on fatal error (was returning mbedtls error codes)

This aligns the return values with OpenSSL specification where
SSL_get_error() should be called to get the actual error reason.

Signed-off-by: makejian <makejian@xiaomi.com>
---
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
index 84ba2345e..4924969c9 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c
@@ -368,17 +368,21 @@ int ssl_pm_handshake(SSL *ssl)
     }
 
   /* OpenSSL return codes:
-   *   0 = did not complete, but may be retried
+   *   0 = The TLS/SSL handshake was not successful but was shut down
+   *       controlled and by the specifications of the TLS/SSL protocol.
    *   1 = successfully completed
-   *   <0 = death
+   *   <0 = The TLS/SSL handshake was not successful because a fatal error
+   *        occurred either at the protocol level or a connection failure
+   *        occurred.
    */
 
   if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE)
     {
-      ssl->err = ret;
+      ssl->err = (ret == MBEDTLS_ERR_SSL_WANT_READ) ? SSL_ERROR_WANT_READ :
+                                                      SSL_ERROR_WANT_WRITE;
       SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
                 "mbedtls_ssl_handshake() return -0x%x", -ret);
-      return 0; /* OpenSSL: did not complete but may be retried */
+      return -1;
     }
 
   if (ret == 0)
@@ -397,7 +401,7 @@ int ssl_pm_handshake(SSL *ssl)
     {
       ssl->err = ret == MBEDTLS_ERR_SSL_WANT_READ;
 
-      return 0;
+      return -1;
     }
 
   SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,

From 57ced95c07992aec30618599e88f8e8835c258ba Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Fri, 10 Oct 2025 15:08:23 +0800
Subject: [PATCH 145/568] crypto/openssl-wrapper: align SSL_CTX_new declaration
 with OpenSSL

Remove the extra rngctx parameter from SSL_CTX_new() to match
the standard OpenSSL API signature:
  SSL_CTX *SSL_CTX_new(const SSL_METHOD *method)

This improves compatibility with code written for OpenSSL.

Signed-off-by: makejian <makejian@xiaomi.com>
---
 crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h | 2 +-
 crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
index 436354882..d9b2298b9 100644
--- a/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
+++ b/crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h
@@ -251,7 +251,7 @@ int SSL_get_error(const SSL *ssl, int ret_code);
 
 OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl);
 
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, ...);
+SSL_CTX *SSL_CTX_new(const SSL_METHOD *method);
 
 void SSL_CTX_free(SSL_CTX *ctx);
 
diff --git a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
index 4e7bf0968..b240d38d7 100644
--- a/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
+++ b/crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c
@@ -260,7 +260,7 @@ int SSL_get_error(const SSL *ssl, int ret_code)
   return ret;
 }
 
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, ...)
+SSL_CTX *SSL_CTX_new(const SSL_METHOD *method)
 {
   SSL_CTX *ctx;
   CERT *cert;

From 85b1a1c8c13dd15638196e39ab6fd4fffc912849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20VINCENT?=
 <44554692+comejv@users.noreply.github.com>
Date: Wed, 21 Jan 2026 13:48:26 +0100
Subject: [PATCH 146/568] fix(macro): fix CAPIO_FREQUENCY macro typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Going from CAPIOC_FREQUENCE to CAPIO_FREQUENCY according to nuttx/pull/16925

Signed-off-by: Côme VINCENT <44554692+comejv@users.noreply.github.com>
---
 examples/capture/cap_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/capture/cap_main.c b/examples/capture/cap_main.c
index 3ca080368..2ba238a60 100644
--- a/examples/capture/cap_main.c
+++ b/examples/capture/cap_main.c
@@ -351,11 +351,11 @@ int main(int argc, FAR char *argv[])
 
       /* Get the frequency data using the ioctl */
 
-      ret = ioctl(fd, CAPIOC_FREQUENCE,
+      ret = ioctl(fd, CAPIOC_FREQUENCY,
                   (unsigned long)((uintptr_t)&frequency));
       if (ret < 0)
         {
-          printf("cap_main: ioctl(CAPIOC_FREQUENCE) failed: %d\n", errno);
+          printf("cap_main: ioctl(CAPIOC_FREQUENCY) failed: %d\n", errno);
           exitval = EXIT_FAILURE;
           goto errout_with_dev;
         }

From 72fe4e21e1e2d715aedf23cd1c50adf105fff99f Mon Sep 17 00:00:00 2001
From: zhenwei fang <fangzhenwei@bytedance.com>
Date: Wed, 21 Jan 2026 20:15:16 +0800
Subject: [PATCH 147/568] nsh: fix nsh redirect fd double close

avoid double-close of redirection fds

Signed-off-by: zhenwei fang <fangzhenwei@bytedance.com>
---
 nshlib/nsh_parse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
index 9b7b371af..9b1bde875 100644
--- a/nshlib/nsh_parse.c
+++ b/nshlib/nsh_parse.c
@@ -726,6 +726,8 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl,
       if (vtbl->np.np_redir_out || vtbl->np.np_redir_in)
         {
           nsh_undirect(vtbl, save);
+          fd_out = -1;
+          fd_in = -1;
         }
     }
 

From 40a890626d39e12291e64253e6192665206325b4 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Fri, 3 Jan 2025 15:17:16 +0800
Subject: [PATCH 148/568] testing: specify arch format Kconfig

Specify architecture format in Kconfig to ensure proper configuration
handling for different architectures in testing modules.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/libc/arch_libc/Kconfig |  2 +-
 testing/testsuites/Kconfig     | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/testing/libc/arch_libc/Kconfig b/testing/libc/arch_libc/Kconfig
index c8bdfa9f2..65927909c 100644
--- a/testing/libc/arch_libc/Kconfig
+++ b/testing/libc/arch_libc/Kconfig
@@ -14,7 +14,7 @@ if TESTING_ARCH_LIBC
 
 config TESTING_ARCH_LIBC_STRCPY
 	bool "test strcpy"
-	default n
+	default y
 
 config TESTING_ARCH_LIBC_PROGNAME
 	string "Program name"
diff --git a/testing/testsuites/Kconfig b/testing/testsuites/Kconfig
index 8ed01ffcf..8c1eb2015 100644
--- a/testing/testsuites/Kconfig
+++ b/testing/testsuites/Kconfig
@@ -12,6 +12,8 @@ config TESTS_TESTSUITES
 
 if TESTS_TESTSUITES
 
+menu "Testsuite cases"
+
 config TESTS_TESTSUITES_MOUNT_DIR
 	string "Mount directory for the testsuites"
 	default "/data"
@@ -27,19 +29,36 @@ config TESTS_TESTSUITES_STACKSIZE
 config CM_FS_TEST
 	bool "enable fs test"
 	default n
+	depends on PSEUDOFS_SOFTLINKS
 
 config CM_SCHED_TEST
 	bool "enable schedule test"
 	default n
 
+config CM_SYSCALL_TEST
+	bool "enbale syscall test"
+	default n
+	depends on PIPES && SCHED_HAVE_PARENT
+
 config CM_MM_TEST
 	bool "enable MM test"
 	default n
 
+config CM_KVDB_TEST
+	bool "enbale kvdb test"
+	default n
+	depends on KVDB
+
 config CM_TIME_TEST
 	bool "enable time test"
 	depends on !DISABLE_POSIX_TIMERS && SIG_EVTHREAD
 	default n
+	depends on SIG_EVTHREAD
+
+config CM_SOCKET_TEST
+	bool "enbale socket test"
+	default n
+	depends on NET && NETDEV_LATEINIT
 
 config CM_PTHREAD_TEST
 	bool "enable pthread test"
@@ -58,4 +77,10 @@ config CM_MUTEX_TEST
 	bool "enable mutex test"
 	default n
 
+config CM_DFX_TEST
+	bool "enbale dfx test"
+	default n
+	depends on NETUTILS_CJSON && DFX && DFX_EVENT
+
+endmenu
 endif # TESTS_TESTSUITES

From 10873c6b59ce5cc22a3f2b20e1d7617ad04a427a Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Wed, 8 Jan 2025 22:02:49 +0800
Subject: [PATCH 149/568] testing: specify arch kconfig for testsuites

Specify architecture configuration in testsuites Kconfig to ensure
correct architecture-specific settings and build configurations.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/testsuites/Kconfig | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/testing/testsuites/Kconfig b/testing/testsuites/Kconfig
index 8c1eb2015..eb2cd4547 100644
--- a/testing/testsuites/Kconfig
+++ b/testing/testsuites/Kconfig
@@ -35,30 +35,14 @@ config CM_SCHED_TEST
 	bool "enable schedule test"
 	default n
 
-config CM_SYSCALL_TEST
-	bool "enbale syscall test"
-	default n
-	depends on PIPES && SCHED_HAVE_PARENT
-
 config CM_MM_TEST
 	bool "enable MM test"
 	default n
 
-config CM_KVDB_TEST
-	bool "enbale kvdb test"
-	default n
-	depends on KVDB
-
 config CM_TIME_TEST
 	bool "enable time test"
 	depends on !DISABLE_POSIX_TIMERS && SIG_EVTHREAD
 	default n
-	depends on SIG_EVTHREAD
-
-config CM_SOCKET_TEST
-	bool "enbale socket test"
-	default n
-	depends on NET && NETDEV_LATEINIT
 
 config CM_PTHREAD_TEST
 	bool "enable pthread test"
@@ -66,21 +50,17 @@ config CM_PTHREAD_TEST
 
 config CM_SOCKET_TEST
 	bool "enable socket test"
-	depends on NET
 	default n
+	depends on NET && NETDEV_LATEINIT
 
 config CM_SYSCALL_TEST
 	bool "enable syscall test"
 	default n
+	depends on PIPES && SCHED_HAVE_PARENT && FS_TMPFS && ARCH_SETJMP_H && PSEUDOFS_SOFTLINKS
 
 config CM_MUTEX_TEST
 	bool "enable mutex test"
 	default n
 
-config CM_DFX_TEST
-	bool "enbale dfx test"
-	default n
-	depends on NETUTILS_CJSON && DFX && DFX_EVENT
-
 endmenu
 endif # TESTS_TESTSUITES

From 8146403512488c8862f5464690fb6c8288689f43 Mon Sep 17 00:00:00 2001
From: likun17 <likun17@xiaomi.com>
Date: Mon, 13 Jan 2025 20:32:00 +0800
Subject: [PATCH 150/568] system/uorb: uorb listener bug fix.

Fixed the issue that instance+1 subscription will be triggered when
topic exists in this core

Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/listener.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index fe7909030..b9013a06a 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -427,7 +427,7 @@ static int listener_generate_object_list(FAR struct listen_list_s *objlist,
                         }
                     }
 
-                  if (orb_exists(object.meta, object.instance++) < 0)
+                  if (orb_exists(object.meta, ++object.instance) < 0)
                     {
                       break;
                     }

From 5216065fb8b875c18ef40dae0eb1c18abfb9b405 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Wed, 4 Dec 2024 11:29:35 +0800
Subject: [PATCH 151/568] cache_test: fix up_flash_dcache error

Fix flash dcache helper error handling in cache_test to properly
handle errors when flushing data cache operations fail.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/mm/cachetest/cachetest_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing/mm/cachetest/cachetest_main.c b/testing/mm/cachetest/cachetest_main.c
index 4c0087aa8..3906b58e6 100644
--- a/testing/mm/cachetest/cachetest_main.c
+++ b/testing/mm/cachetest/cachetest_main.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/config.h>
 #include <nuttx/cache.h>
-
 #include <stdio.h>
 #include <syslog.h>
 

From 6249f22f97157a516021580411bd12a70c0dec13 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Wed, 4 Dec 2024 15:48:59 +0800
Subject: [PATCH 152/568] tests: fix cache_test and arch_lib_test date style
 error

Correct date formatting in cache_test and arch_lib_test outputs to
ensure consistent date/time display format across test results.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/libc/arch_libc/arch_libc_test_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/libc/arch_libc/arch_libc_test_main.c b/testing/libc/arch_libc/arch_libc_test_main.c
index 47cfe65bc..b078fff34 100644
--- a/testing/libc/arch_libc/arch_libc_test_main.c
+++ b/testing/libc/arch_libc/arch_libc_test_main.c
@@ -224,8 +224,8 @@ int arch_libc_strcpy_speed(void)
         }
     }
 
-  printf("strcpy total(run 25 times) cpu cycles %" PRIu32 "\n", cycles);
-  printf("strcpy average cpu cycles %" PRIu32 "\n", cycles / 25);
+  printf("strcpy total(run 25 times) cpu cycles %"PRIu64"\n", cycles);
+  printf("strcpy average cpu cycles %"PRIu64"\n", cycles / 25);
 
   return 0;
 }

From df48348fcaa3363197e5f486883fc1f85a226984 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Thu, 5 Dec 2024 17:48:11 +0800
Subject: [PATCH 153/568] test: fix timerjitter data style error

Fix timerjitter output formatting for date/time fields to match
expected format and improve test result readability.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/sched/timerjitter/timerjitter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index ad956cd4c..3edd10388 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -192,7 +192,8 @@ static FAR void *timerjitter(FAR void *arg)
       diff = calc_diff(&now, &next);
       if (param->print)
         {
-          printf("diff %lu, now %lu.%lu\n", diff, now.tv_sec, now.tv_nsec);
+          printf("diff %"PRId64", now %"PRId64".%09lu\n", diff, now.tv_sec,
+                  now.tv_nsec);
         }
 
       if (diff > param->max)

From 4df2ce98aacf38df884b42dec9556f5db881f1f7 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Fri, 3 Jan 2025 15:24:02 +0800
Subject: [PATCH 154/568] testing: fix net case bug

Adjust net socket test expectations for correct behavior to prevent
false test failures in network socket test cases.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/testsuites/kernel/socket/cases/net_socket_test_010.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/testsuites/kernel/socket/cases/net_socket_test_010.c b/testing/testsuites/kernel/socket/cases/net_socket_test_010.c
index 462b07a2e..f8a951aa9 100644
--- a/testing/testsuites/kernel/socket/cases/net_socket_test_010.c
+++ b/testing/testsuites/kernel/socket/cases/net_socket_test_010.c
@@ -42,8 +42,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define IFF_PROMISC 0x100
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/

From 8afe3c0645185ae96890abe5f8d7f115a4c83ab8 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Mon, 30 Dec 2024 10:53:26 +0800
Subject: [PATCH 155/568] test: clean driver_audio_test (void *) cast

Drop unnecessary casts in driver_audio_test to silence compiler
warnings and improve code clarity.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/drivers/drivertest/drivertest_audio.c b/testing/drivers/drivertest/drivertest_audio.c
index 491dfec38..20b4babbc 100644
--- a/testing/drivers/drivertest/drivertest_audio.c
+++ b/testing/drivers/drivertest/drivertest_audio.c
@@ -742,7 +742,7 @@ static int audio_test_setup(FAR void **audio_state)
   attr.mq_flags   = 0;
 
   snprintf(state->mqname, sizeof(state->mqname), "/tmp/%p",
-           ((void *)state));
+           state);
 
   state->mq = mq_open(state->mqname, O_RDWR | O_CREAT, 0644, &attr);
   assert_false(state->mq < 0);

From b86457dfcb42f8d77a6b209666340401723ff440 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Sat, 22 Mar 2025 16:28:55 +0800
Subject: [PATCH 156/568] apps/testing: fix syscall cases for fdcheck
 compatibility

Guard fdcheck-sensitive paths in setsocketopt, dup2, and fsync tests
to avoid assertion failures when fdcheck is enabled, ensuring tests
can properly verify error handling behavior.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/testsuites/kernel/syscall/cases/dup2_test.c         | 1 -
 testing/testsuites/kernel/syscall/cases/fsync_test.c        | 6 ++++--
 .../testsuites/kernel/syscall/cases/setsocketopt01_test.c   | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/testing/testsuites/kernel/syscall/cases/dup2_test.c b/testing/testsuites/kernel/syscall/cases/dup2_test.c
index bdd7b0b97..bb1ea6928 100644
--- a/testing/testsuites/kernel/syscall/cases/dup2_test.c
+++ b/testing/testsuites/kernel/syscall/cases/dup2_test.c
@@ -149,7 +149,6 @@ void test_nuttx_syscall_dup202(FAR void **state)
       assert_int_equal(fstat(*(TC[i].nfd), &newbuf), 0);
       assert_int_equal(oldbuf.st_mode, newbuf.st_mode);
 
-      close(*TC[i].nfd);
       close(ofd);
       close(ret);
 
diff --git a/testing/testsuites/kernel/syscall/cases/fsync_test.c b/testing/testsuites/kernel/syscall/cases/fsync_test.c
index 8aabf2002..e2834f861 100644
--- a/testing/testsuites/kernel/syscall/cases/fsync_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fsync_test.c
@@ -117,17 +117,19 @@ void test_nuttx_syscall_fsync02(FAR void **state)
 
       /* EBADF - fd is closed */
 
+#  ifndef CONFIG_FDCHECK
         {
           &pipe_fd[0], EBADF
         },
+#  endif
 
       /* EBADF - fd is invalid (-1) */
 
-  #ifndef CONFIG_FDSAN
+#  ifndef CONFIG_FDSAN
         {
           &bad_fd, EBADF
         },
-  #endif
+#  endif
 
       /* EINVAL - fsync() on fifo should not succeed. */
 
diff --git a/testing/testsuites/kernel/syscall/cases/setsocketopt01_test.c b/testing/testsuites/kernel/syscall/cases/setsocketopt01_test.c
index b877f6f01..adc991933 100644
--- a/testing/testsuites/kernel/syscall/cases/setsocketopt01_test.c
+++ b/testing/testsuites/kernel/syscall/cases/setsocketopt01_test.c
@@ -67,10 +67,12 @@ void test_nuttx_syscall_setsockopt01(FAR void **state)
 
   testcase_list[] =
     {
+#  ifndef CONFIG_FDCHECK
         {
           -1, -1, -1, SOL_SOCKET, SO_OOBINLINE, &optval, sizeof(optval),
         EBADF, "invalid file descriptor"
         },
+#  endif
 
         {
           -1, -1, -1, SOL_SOCKET, SO_OOBINLINE, &optval, sizeof(optval),

From be26d7963343cb7193b86286294f9158243aa308 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Wed, 26 Mar 2025 10:27:51 +0800
Subject: [PATCH 157/568] syscall: fix badfd test for fdcheck compatibility

Handle fdcheck path for badfd test to prevent unexpected dumps when
fdcheck is enabled, allowing proper testing of bad file descriptor
error cases.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/testsuites/kernel/syscall/cases/close_test.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testing/testsuites/kernel/syscall/cases/close_test.c b/testing/testsuites/kernel/syscall/cases/close_test.c
index 1d62f92ec..099a3b663 100644
--- a/testing/testsuites/kernel/syscall/cases/close_test.c
+++ b/testing/testsuites/kernel/syscall/cases/close_test.c
@@ -99,7 +99,9 @@ void test_nuttx_syscall_close02(FAR void **state)
 #ifndef CONFIG_FDSAN
   int ret;
   int badfd1 = -1;
+#ifndef CONFIG_FDCHECK
   int badfd2 = 99999999;
+#endif
 
   ret = close(badfd1);
   assert_int_equal(ret, ERROR);
@@ -109,6 +111,7 @@ void test_nuttx_syscall_close02(FAR void **state)
 
   assert_int_equal(errno, EBADF);
 
+#ifndef CONFIG_FDCHECK
   ret = close(badfd2);
   assert_int_equal(ret, ERROR);
 
@@ -117,6 +120,7 @@ void test_nuttx_syscall_close02(FAR void **state)
 
   assert_int_equal(errno, EBADF);
 #endif
+#endif
 }
 
 /****************************************************************************

From 338301de76f05c0f12ce7a69be6b102e62b608b6 Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Fri, 28 Mar 2025 16:18:17 +0800
Subject: [PATCH 158/568] timerjitter: fix signal-cause error

Handle timer-delivered signals correctly to prevent assertions when
signal-related events occur during timing measurements.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/sched/timerjitter/timerjitter.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index 3edd10388..214bbf735 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -221,6 +221,7 @@ static FAR void *timerjitter(FAR void *arg)
         }
     }
 
+  timer_delete(timer);
   param->avg = param->avg / param->cur_cnt;
   return NULL;
 }

From b6203955f98a0d7d209e591f189a9c7eb057dcdc Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Thu, 3 Apr 2025 14:59:44 +0800
Subject: [PATCH 159/568] syscall: fix listen case bug

Skip UDP listen test when CONFIG_NET_UDP is disabled to prevent
test failures on configurations without UDP support.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_audio.c         | 2 +-
 testing/libc/arch_libc/arch_libc_test_main.c          | 2 +-
 testing/testsuites/kernel/syscall/cases/listen_test.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/testing/drivers/drivertest/drivertest_audio.c b/testing/drivers/drivertest/drivertest_audio.c
index 20b4babbc..a467f6f26 100644
--- a/testing/drivers/drivertest/drivertest_audio.c
+++ b/testing/drivers/drivertest/drivertest_audio.c
@@ -265,7 +265,7 @@ static void audio_test_help(FAR const char *progname, int exitcode)
          " -f <format>\n"
          " -b <bytes per sample> \n"
          " -s <sample rate> \n"
-         " -c <channles> \n",
+         " -c <channels> \n",
          progname);
   printf(" [-a testcase] selects the testcase\n"
          " Case 1: Capture\n"
diff --git a/testing/libc/arch_libc/arch_libc_test_main.c b/testing/libc/arch_libc/arch_libc_test_main.c
index b078fff34..1e1a06b19 100644
--- a/testing/libc/arch_libc/arch_libc_test_main.c
+++ b/testing/libc/arch_libc/arch_libc_test_main.c
@@ -133,7 +133,7 @@ int arch_libc_test_strcpy_offset(int dst_offset, int src_offset)
         }
     }
 
-  /* strcpy shouln't change arch_libc_test_strcpy's local variable */
+  /* strcpy shouldn't change arch_libc_test_strcpy's local variable */
 
   if (dest != (g_test_dst_str + dst_offset) ||
       src != (g_test_src_str + src_offset))
diff --git a/testing/testsuites/kernel/syscall/cases/listen_test.c b/testing/testsuites/kernel/syscall/cases/listen_test.c
index e8099a270..7dc4ba266 100644
--- a/testing/testsuites/kernel/syscall/cases/listen_test.c
+++ b/testing/testsuites/kernel/syscall/cases/listen_test.c
@@ -77,10 +77,12 @@ void test_nuttx_syscall_listen01(FAR void **state)
           0, 0, 0, 0, -1, ENOTSOCK, "setup0", "cleanup0", "not a socket"
         },
 
+#  ifdef CONFIG_NET_UDP
         {
           PF_INET, SOCK_DGRAM, 0, 0, -1, EOPNOTSUPP, "setup1", "cleanup1",
         "UDP listen"
         },
+#  endif
     };
 
   const char set[] = "setup0";

From 3c99bad310bd74b8e37861a7d4db14e8bf221d93 Mon Sep 17 00:00:00 2001
From: yukangzhi <yukangzhi@xiaomi.com>
Date: Tue, 5 Aug 2025 18:20:16 +0800
Subject: [PATCH 160/568] crctest: Test the CRC library that the E2E depends
 on.

Test the CRC Library defined in the AUTOSAR specification

Signed-off-by: yukangzhi <yukangzhi@xiaomi.com>
---
 testing/libc/crctest/CMakeLists.txt |  35 +++
 testing/libc/crctest/Kconfig        |  23 ++
 testing/libc/crctest/Make.defs      |  23 ++
 testing/libc/crctest/Makefile       |  30 +++
 testing/libc/crctest/crctest_main.c | 333 ++++++++++++++++++++++++++++
 5 files changed, 444 insertions(+)
 create mode 100644 testing/libc/crctest/CMakeLists.txt
 create mode 100644 testing/libc/crctest/Kconfig
 create mode 100644 testing/libc/crctest/Make.defs
 create mode 100644 testing/libc/crctest/Makefile
 create mode 100644 testing/libc/crctest/crctest_main.c

diff --git a/testing/libc/crctest/CMakeLists.txt b/testing/libc/crctest/CMakeLists.txt
new file mode 100644
index 000000000..2b858e573
--- /dev/null
+++ b/testing/libc/crctest/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/testing/libc/crctest/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_CRC_TEST)
+  nuttx_add_application(
+    NAME
+    cmocka_crctest
+    PRIORITY
+    ${CONFIG_TESTING_CRC_TEST_PRIORITY}
+    STACKSIZE
+    ${CONFIG_TESTING_CRC_TEST_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_CRC_TEST}
+    DEPENDS
+    cmocka
+    SRCS
+    crctest_main.c)
+endif()
diff --git a/testing/libc/crctest/Kconfig b/testing/libc/crctest/Kconfig
new file mode 100644
index 000000000..0e06c18d9
--- /dev/null
+++ b/testing/libc/crctest/Kconfig
@@ -0,0 +1,23 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_CRC_TEST
+	tristate "vela cmocka CRC test"
+	default n
+	depends on TESTING_CMOCKA
+	---help---
+		Enable the cmocka CRC test
+
+if TESTING_CRC_TEST
+
+config TESTING_CRC_TEST_PRIORITY
+	int "Task priority"
+	default 100
+
+config TESTING_CRC_TEST_STACKSIZE
+	int "Stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/testing/libc/crctest/Make.defs b/testing/libc/crctest/Make.defs
new file mode 100644
index 000000000..38f25631e
--- /dev/null
+++ b/testing/libc/crctest/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/testing/libc/crctest/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_CRC_TEST),)
+CONFIGURED_APPS += $(APPDIR)/testing/libc/crctest
+endif
diff --git a/testing/libc/crctest/Makefile b/testing/libc/crctest/Makefile
new file mode 100644
index 000000000..f6c9a9662
--- /dev/null
+++ b/testing/libc/crctest/Makefile
@@ -0,0 +1,30 @@
+############################################################################
+# apps/testing/libc/crctest/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PRIORITY  = $(CONFIG_TESTING_CRC_TEST_PRIORITY)
+STACKSIZE = $(CONFIG_TESTING_CRC_TEST_STACKSIZE)
+MODULE    = $(CONFIG_TESTING_CRC_TEST)
+
+MAINSRC  = crctest_main.c
+PROGNAME = crctest
+
+include $(APPDIR)/Application.mk
diff --git a/testing/libc/crctest/crctest_main.c b/testing/libc/crctest/crctest_main.c
new file mode 100644
index 000000000..7ae966f91
--- /dev/null
+++ b/testing/libc/crctest/crctest_main.c
@@ -0,0 +1,333 @@
+/****************************************************************************
+ * apps/testing/libc/crctest/crctest_main.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <inttypes.h>
+#include <setjmp.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cmocka.h>
+
+#include <nuttx/crc8.h>
+#include <nuttx/crc16.h>
+#include <nuttx/crc32.h>
+#include <nuttx/crc64.h>
+
+/****************************************************************************
+ * Private Type
+ ****************************************************************************/
+
+typedef struct
+{
+  uint8_t length;
+  uint8_t data[9];
+} crc_test_data_t;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static crc_test_data_t crc_test_data[] =
+{
+  {
+    4,
+    { 0x00, 0x00, 0x00, 0x00 }
+  },
+  {
+    3,
+    { 0xf2, 0x01, 0x83 }
+  },
+  {
+    4,
+    { 0x0f, 0xaa, 0x00, 0x55 }
+  },
+  {
+    4,
+    { 0x00, 0xff, 0x55, 0x11 }
+  },
+  {
+    9,
+    { 0x33, 0x22, 0x55, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }
+  },
+  {
+    3,
+    { 0x92, 0x6b, 0x55 }
+  },
+  {
+    4,
+    { 0xff, 0xff, 0xff, 0xff }
+  },
+};
+
+static uint8_t crc8h1d_expected_crc[] =
+{
+  0x59, 0x37, 0x79, 0xb8, 0xcb, 0x8c, 0x74
+};
+
+static uint8_t crc8h2f_expected_crc[] =
+{
+  0x12, 0xc2, 0xc6, 0x77, 0x11, 0x33, 0x6c
+};
+
+static uint16_t crc16h1021_expected_crc[] =
+{
+  0x84c0, 0xd374, 0x2023, 0xb8f9, 0xf53f, 0x0745, 0x1d0f
+};
+
+static uint16_t crc16h8005_expected_crc[] =
+{
+  0x0000, 0xc2e1, 0x0be3, 0x6ccf, 0xae98, 0xe24e, 0x9401
+};
+
+static uint32_t crc32h04c11db7_expected_crc[] =
+{
+  0x2144df1c, 0x24ab9d77, 0xb6c9b287, 0x32a06212,
+  0xb0ae863d, 0x9cdea29b, 0xffffffff
+};
+
+static uint32_t crc32hf4acfb13_expected_crc[] =
+{
+  0x6fb32240, 0x4f721a25, 0x20662df8, 0x9bd7996e,
+  0xa65a343d, 0xee688a78, 0xffffffff
+};
+
+static uint64_t crc64emac_expected_crc[] =
+{
+  0xf4a586351e1b9f4b, 0x319c27668164f1c6,
+  0x54c5d0f7667c1575, 0xa63822be7e0704e6,
+  0x701eceb219a8e5d5, 0x5faa96a9b59f3e4e,
+  0xffffffff00000000
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: test_case_crc8h1d
+ ****************************************************************************/
+
+static void test_case_crc8h1d(void **state)
+{
+  uint8_t index;
+  uint8_t crc8_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc8_value = crc8h1d(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc8_value, crc8h1d_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc8_value = crc8h1d(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc8_value, crc8h1d_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Name: test_case_crc8h2f
+ ****************************************************************************/
+
+static void test_case_crc8h2f(void **state)
+{
+  uint8_t index;
+  uint8_t crc8_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc8_value = crc8h2f(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc8_value, crc8h2f_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc8_value = crc8h2f(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc8_value, crc8h2f_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Name: test_case_crc16h1021
+ ****************************************************************************/
+
+static void test_case_crc16h1021(void **state)
+{
+  uint8_t index;
+  uint16_t crc16_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc16_value = crc16h1021(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc16_value, crc16h1021_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc16_value = crc16h1021(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc16_value, crc16h1021_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Name: test_case_crc16h8005
+ ****************************************************************************/
+
+static void test_case_crc16h8005(void **state)
+{
+  uint8_t index;
+  uint16_t crc16_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc16_value = crc16h8005(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc16_value, crc16h8005_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc16_value = crc16h8005(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc16_value, crc16h8005_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Name: test_case_crc32h04c11db7
+ ****************************************************************************/
+
+static void test_case_crc32h04c11db7(void **state)
+{
+  uint8_t index;
+  uint32_t crc32_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc32_value = crc32h04c11db7(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc32_value, crc32h04c11db7_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc32_value = crc32h04c11db7(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc32_value, crc32h04c11db7_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Name: test_case_crc32hf4acfb13
+ ****************************************************************************/
+
+static void test_case_crc32hf4acfb13(void **state)
+{
+  uint8_t index;
+  uint32_t crc32_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc32_value = crc32hf4acfb13(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc32_value, crc32hf4acfb13_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc32_value = crc32hf4acfb13(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc32_value, crc32hf4acfb13_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Name: test_case_crc64emac
+ ****************************************************************************/
+
+static void test_case_crc64emac(void **state)
+{
+  uint8_t index;
+  uint64_t crc64_value;
+
+  for (index = 0;
+       index < sizeof(crc_test_data) / sizeof(crc_test_data[0]);
+       index++)
+    {
+      crc64_value = crc64emac(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_equal(crc64_value, crc64emac_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+      crc64_value = crc64emac(crc_test_data[index].data,
+        crc_test_data[index].length);
+      assert_int_not_equal(crc64_value, crc64emac_expected_crc[index]);
+
+      crc_test_data[index].data[0] ^= 0xff;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * crctest_main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  const struct CMUnitTest tests[] =
+  {
+    cmocka_unit_test(test_case_crc8h1d),
+    cmocka_unit_test(test_case_crc8h2f),
+    cmocka_unit_test(test_case_crc16h1021),
+    cmocka_unit_test(test_case_crc16h8005),
+    cmocka_unit_test(test_case_crc32h04c11db7),
+    cmocka_unit_test(test_case_crc32hf4acfb13),
+    cmocka_unit_test(test_case_crc64emac),
+  };
+
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}

From 122a4a6f4ea4d4912f8c2041e837fb238beae7ae Mon Sep 17 00:00:00 2001
From: yukangzhi <yukangzhi@xiaomi.com>
Date: Mon, 17 Mar 2025 14:07:13 +0800
Subject: [PATCH 161/568] apps/examples/popen: Modify kconfig file

This test depends on !DISABLE_POSIX_TIMERS.

arm-none-eabi/bin/ld:
apps/examples/popen/libapps_popen.a(popen_main.c.obj):
in function `popen_main':
apps/examples/popen/popen_main.c:62:(.text.popen_main+0x1c):
undefined reference to `timer_create'

Signed-off-by: yukangzhi <yukangzhi@xiaomi.com>
---
 examples/popen/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/popen/Kconfig b/examples/popen/Kconfig
index 3b2eba29e..2f571d121 100644
--- a/examples/popen/Kconfig
+++ b/examples/popen/Kconfig
@@ -7,6 +7,7 @@ config EXAMPLES_POPEN
 	tristate "popen() example"
 	default n
 	depends on SYSTEM_POPEN
+	depends on !DISABLE_POSIX_TIMERS
 	---help---
 		Enable the popen() example
 

From 094b0f235a6ae2f857570e72d187df970fc424ba Mon Sep 17 00:00:00 2001
From: wangzhi16 <wangzhi16@xiaomi.com>
Date: Thu, 18 Sep 2025 16:21:20 +0800
Subject: [PATCH 162/568] test/mutex: fix mutex testcases.

Multiple threads should use the same lock for resource protection.

Signed-off-by: wangzhi16 <wangzhi16@xiaomi.com>
---
 .../kernel/sched/cases/api_pthread_test_007.c | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/testing/testsuites/kernel/sched/cases/api_pthread_test_007.c b/testing/testsuites/kernel/sched/cases/api_pthread_test_007.c
index 3a50a5f94..46fac1a00 100644
--- a/testing/testsuites/kernel/sched/cases/api_pthread_test_007.c
+++ b/testing/testsuites/kernel/sched/cases/api_pthread_test_007.c
@@ -40,6 +40,16 @@
 #include <cmocka.h>
 #include "SchedTest.h"
 
+/****************************************************************************
+ * Private Type Declarations
+ ****************************************************************************/
+
+struct resource_s
+{
+  pthread_mutex_t mutex;
+  int run_flag;
+};
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -50,13 +60,14 @@
 
 static void *schedpthread07threadroutine(void *arg)
 {
+  struct resource_s *resource = (struct resource_s *)arg;
   int i;
-  pthread_mutex_t schedpthreadtest07_mutex = PTHREAD_MUTEX_INITIALIZER;
+
   for (i = 0; i < 100; i++)
     {
-      pthread_mutex_lock(&schedpthreadtest07_mutex);
-      (*((int *)arg))++;
-      pthread_mutex_unlock(&schedpthreadtest07_mutex);
+      pthread_mutex_lock(&resource->mutex);
+      resource->run_flag++;
+      pthread_mutex_unlock(&resource->mutex);
     }
 
   return NULL;
@@ -74,16 +85,20 @@ void test_nuttx_sched_pthread07(FAR void **state)
 {
   int res;
   pthread_t pt_1, pt_2, pt_3;
-  int run_flag = 0;
+  struct resource_s resource =
+  {
+    .mutex = PTHREAD_MUTEX_INITIALIZER,
+    .run_flag = 0
+  };
 
   res = pthread_create(&pt_1, NULL, (void *)schedpthread07threadroutine,
-                       &run_flag);
+                       &resource);
   assert_int_equal(res, OK);
   res = pthread_create(&pt_2, NULL, (void *)schedpthread07threadroutine,
-                       &run_flag);
+                       &resource);
   assert_int_equal(res, OK);
   res = pthread_create(&pt_3, NULL, (void *)schedpthread07threadroutine,
-                       &run_flag);
+                       &resource);
   assert_int_equal(res, OK);
 
   pthread_join(pt_1, NULL);
@@ -91,5 +106,5 @@ void test_nuttx_sched_pthread07(FAR void **state)
   pthread_join(pt_3, NULL);
   sleep(5);
 
-  assert_int_equal(run_flag, 300);
+  assert_int_equal(resource.run_flag, 300);
 }

From 5c6d646d7656b6d3cd4192771e69b22fdbd25c0f Mon Sep 17 00:00:00 2001
From: wangzhi16 <wangzhi16@xiaomi.com>
Date: Wed, 7 May 2025 21:03:08 +0800
Subject: [PATCH 163/568] testing/fs: add testcase to test the stability of
 memfd.

Supplement ostest test cases.

Signed-off-by: wangzhi16 <wangzhi16@xiaomi.com>
---
 testing/fs/memfd/CMakeLists.txt | 23 +++++++++
 testing/fs/memfd/Kconfig        | 11 +++++
 testing/fs/memfd/Make.defs      | 23 +++++++++
 testing/fs/memfd/Makefile       | 29 +++++++++++
 testing/fs/memfd/memfd_test.c   | 87 +++++++++++++++++++++++++++++++++
 5 files changed, 173 insertions(+)
 create mode 100644 testing/fs/memfd/CMakeLists.txt
 create mode 100644 testing/fs/memfd/Kconfig
 create mode 100644 testing/fs/memfd/Make.defs
 create mode 100644 testing/fs/memfd/Makefile
 create mode 100644 testing/fs/memfd/memfd_test.c

diff --git a/testing/fs/memfd/CMakeLists.txt b/testing/fs/memfd/CMakeLists.txt
new file mode 100644
index 000000000..bde183129
--- /dev/null
+++ b/testing/fs/memfd/CMakeLists.txt
@@ -0,0 +1,23 @@
+# ##############################################################################
+# apps/testing/fs/memfd/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_MEMFD)
+  nuttx_add_application(NAME memfd SRCS memfd_test.c)
+endif()
diff --git a/testing/fs/memfd/Kconfig b/testing/fs/memfd/Kconfig
new file mode 100644
index 000000000..464537bbf
--- /dev/null
+++ b/testing/fs/memfd/Kconfig
@@ -0,0 +1,11 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_MEMFD
+	bool "Testing the stability of memfd"
+	depends on !LIBC_MEMFD_ERROR && MM_KASAN
+	default n
+	---help---
+		Enable to test the stability of memfd
diff --git a/testing/fs/memfd/Make.defs b/testing/fs/memfd/Make.defs
new file mode 100644
index 000000000..286699d9e
--- /dev/null
+++ b/testing/fs/memfd/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/testing/fs/memfd/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_MEMFD),)
+CONFIGURED_APPS += $(APPDIR)/testing/fs/memfd
+endif
diff --git a/testing/fs/memfd/Makefile b/testing/fs/memfd/Makefile
new file mode 100644
index 000000000..0080d0f48
--- /dev/null
+++ b/testing/fs/memfd/Makefile
@@ -0,0 +1,29 @@
+############################################################################
+# apps/testing/fs/memfd/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME = memfd_test
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+
+MAINSRC = memfd_test.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/fs/memfd/memfd_test.c b/testing/fs/memfd/memfd_test.c
new file mode 100644
index 000000000..1e72915bf
--- /dev/null
+++ b/testing/fs/memfd/memfd_test.c
@@ -0,0 +1,87 @@
+/****************************************************************************
+ * apps/testing/fs/memfd/memfd_test.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+ #define BUFFER_SIZE 8
+ #define THREAD_NUM 50
+ #define LOOP_NUM 1000
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *func(FAR void *arg)
+{
+  void *buf;
+  int size = BUFFER_SIZE;
+  int i;
+  int memfd;
+
+  for (i = 0; i < LOOP_NUM; i++)
+    {
+      memfd = memfd_create("optee", O_CREAT | O_CLOEXEC);
+      ftruncate(memfd, size);
+      buf = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, memfd, 0);
+      close(memfd);
+
+      *((int *)buf) = 0xdeadbeef;
+      usleep(10);
+      *((int *)buf) = 0xdeadbeef;
+
+      munmap(buf, size);
+    }
+
+  printf("thread %d test pass!\n", pthread_self());
+  return NULL;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  pid_t pid[THREAD_NUM];
+  int i;
+
+  for (i = 0; i < THREAD_NUM; i++)
+    {
+      pthread_create(&pid[i], NULL, func, NULL);
+    }
+
+  for (i = 0; i < THREAD_NUM; i++)
+    {
+      pthread_join(pid[i], NULL);
+    }
+
+  return 0;
+}

From f16a45a854fa5cdaab0cfe77921d73bf301caf47 Mon Sep 17 00:00:00 2001
From: wangzhi16 <wangzhi16@xiaomi.com>
Date: Wed, 28 May 2025 22:34:35 +0800
Subject: [PATCH 164/568] examples/pipe: bugfix testcase of fifo

There are three bug in fifo testcase.

1. line 211 and line 295 should be nbytes not ret.
2. coverity report error:
CID 1667262: (#4 of 11): Double close (USE_AFTER_FREE)
11. double_close: Calling close(int) will close the handle fd that has already been closed. [Note: The source code implementation of this function has been overwritten by the built-in model.]

Double close will ocurr when line 234 is true and goto line 341, close again!
Now, Using the previous code logic, Use a tid and an errout_with_null_thread to avoid uninitialized problems.

3. since line 295 is used ret not nbytes, error not expose before.

When the end of read and write are opened, end of write will write successfully even if end of read not read.

Signed-off-by: wangzhi16 <wangzhi16@xiaomi.com>
---
 examples/pipe/interlock_test.c | 57 ++++++++++++++++------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/examples/pipe/interlock_test.c b/examples/pipe/interlock_test.c
index 6be9b6ec4..cb2985800 100644
--- a/examples/pipe/interlock_test.c
+++ b/examples/pipe/interlock_test.c
@@ -150,8 +150,7 @@ static void *null_writer(pthread_addr_t pvarg)
 
 int interlock_test(void)
 {
-  pthread_t readerid;
-  pthread_t writerid;
+  pthread_t tid;
   void *value;
   char data[16];
   ssize_t nbytes;
@@ -171,7 +170,7 @@ int interlock_test(void)
   /* Start the null_writer thread */
 
   printf("interlock_test: Starting null_writer thread\n");
-  ret = pthread_create(&writerid, NULL, null_writer, NULL);
+  ret = pthread_create(&tid, NULL, null_writer, NULL);
   if (ret != 0)
     {
       fprintf(stderr, \
@@ -194,7 +193,7 @@ int interlock_test(void)
               "errno=%d\n",
               FIFO_PATH2, errno);
       ret = 3;
-      goto errout_with_null_writer_thread;
+      goto errout_with_null_thread;
     }
 
   /* Attempt to read one byte from the FIFO. This should return end-of-file
@@ -208,15 +207,15 @@ int interlock_test(void)
       fprintf(stderr, \
               "interlock_test: read failed, errno=%d\n", errno);
       ret = 4;
-      goto errout_with_null_writer_thread;
+      goto errout_with_file;
     }
-  else if (ret != 0)
+  else if (nbytes != 0)
     {
       fprintf(stderr, \
               "interlock_test: Read %ld bytes of data -- aborting: %d\n",
               (long)nbytes, errno);
       ret = 5;
-      goto errout_with_null_writer_thread;
+      goto errout_with_file;
     }
 
   printf("interlock_test: read returned\n");
@@ -234,7 +233,7 @@ int interlock_test(void)
   /* Wait for null_writer thread to complete */
 
   printf("interlock_test: Waiting for null_writer thread\n");
-  ret = pthread_join(writerid, &value);
+  ret = pthread_join(tid, &value);
   if (ret != 0)
     {
       fprintf(stderr, \
@@ -255,7 +254,7 @@ int interlock_test(void)
   /* Start the null_reader thread */
 
   printf("interlock_test: Starting null_reader thread\n");
-  ret = pthread_create(&readerid, NULL, null_reader, NULL);
+  ret = pthread_create(&tid, NULL, null_reader, NULL);
   if (ret != 0)
     {
       fprintf(stderr, \
@@ -278,29 +277,26 @@ int interlock_test(void)
               "errno=%d\n",
               FIFO_PATH2, errno);
       ret = 9;
-      goto errout_with_null_reader_thread;
+      goto errout_with_null_thread;
     }
 
-  /* Attempt to write one byte from the FIFO. This should return 0 bytes
-   * written because the null_reader closes the FIFO.
+  /* Attempt to write one byte from the FIFO. This should return n bytes
+   * written since the null_reader has opened the FIFO.
    */
 
   printf("interlock_test: Writing to %s\n", FIFO_PATH2);
   nbytes = write(fd, data, 16);
-  if (nbytes < 0)
+  if (nbytes <= 0)
     {
       fprintf(stderr, \
               "interlock_test: write failed, errno=%d\n", errno);
       ret = 10;
-      goto errout_with_null_reader_thread;
+      goto errout_with_file;
     }
-  else if (ret != 0)
+  else
     {
       fprintf(stderr, \
-              "interlock_test: Wrote %ld bytes of data -- aborting: %d\n",
-              (long)nbytes, errno);
-      ret = 11;
-      goto errout_with_null_reader_thread;
+              "interlock_test: Wrote %ld bytes of data\n", (long)nbytes);
     }
 
   printf("interlock_test: write returned\n");
@@ -318,7 +314,7 @@ int interlock_test(void)
   /* Wait for null_reader thread to complete */
 
   printf("interlock_test: Waiting for null_reader thread\n");
-  ret = pthread_join(readerid, &value);
+  ret = pthread_join(tid, &value);
   if (ret != 0)
     {
       fprintf(stderr, \
@@ -339,21 +335,20 @@ int interlock_test(void)
   ret = 0;
   goto errout_with_fifo;
 
-errout_with_null_reader_thread:
-  pthread_detach(readerid);
-  pthread_cancel(readerid);
-
-errout_with_null_writer_thread:
-  pthread_detach(writerid);
-  pthread_cancel(writerid);
-
-errout_with_fifo:
-
-  if (fd != -1 && close(fd) != 0)
+errout_with_file:
+  if (close(fd) != 0)
     {
       fprintf(stderr, "interlock_test: close failed: %d\n", errno);
     }
 
+errout_with_null_thread:
+  pthread_detach(tid);
+  pthread_cancel(tid);
+
+errout_with_fifo:
+
+  /* Close the file */
+
   ret = remove(FIFO_PATH2);
   if (ret != 0)
     {

From b72f7997a35cb959ff35b7b1c03e5053953752e6 Mon Sep 17 00:00:00 2001
From: hongfengchen <hongfengchen@xiaomi.com>
Date: Tue, 10 Jun 2025 15:03:17 +0800
Subject: [PATCH 165/568] system/popen: close newfd correctly

Fixes a bug where newfd is not properly closed when newfd[0] equals newfd[1].
This can cause file descriptor leaks in certain edge cases where the read
and write sides of the pipe are duplicated.

Signed-off-by: hongfengchen <hongfengchen@xiaomi.com>
---
 system/popen/popen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/popen/popen.c b/system/popen/popen.c
index 5da6cadf1..d9286c959 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -312,7 +312,7 @@ FILE *popen(FAR const char *command, FAR const char *mode)
 
   close(newfd[0]);
 
-  if (rw)
+  if (rw && newfd[0] != newfd[1])
     {
       close(newfd[1]);
     }

From 19dcc896d7f88392a891fb415753d3e9c905fdf6 Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Wed, 12 Feb 2025 19:16:09 +0800
Subject: [PATCH 166/568] sched/tcb: add a reference count to the TCB to
 prevent it from being deleted.

To replace the large lock with smaller ones and reduce the large locks related to the TCB,
in many scenarios, we only need to ensure that the TCB won't be released
instead of locking, thus reducing the possibility of lock recursion.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 .codespell-ignore-lines             | 4 ++++
 crypto/controlse/controlse_main.cxx | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.codespell-ignore-lines b/.codespell-ignore-lines
index 75a07676e..4b6f55c66 100644
--- a/.codespell-ignore-lines
+++ b/.codespell-ignore-lines
@@ -1,2 +1,6 @@
       mynewt-nimble/nimble/host/services/ans/src/ble_svc_ans.c
       mynewt-nimble/nimble/host/services/ans/include
+#include "crypto/controlse/ccertificate.hxx"
+              object = new Controlse::CCertificate(
+          Controlse::CCertificate cert(se, settings->key_id);
+      auto certificate = Controlse::CCertificate(
diff --git a/crypto/controlse/controlse_main.cxx b/crypto/controlse/controlse_main.cxx
index 8c0f07cbc..a2b5dddef 100644
--- a/crypto/controlse/controlse_main.cxx
+++ b/crypto/controlse/controlse_main.cxx
@@ -701,8 +701,12 @@ int main(int argc, FAR char *argv[])
 #ifdef CONFIG_STACK_COLORATION
       FAR struct tcb_s *tcb;
       tcb = nxsched_get_tcb(getpid());
-      fprintf(stderr, "\nStack used: %zu / %zu\n", up_check_tcbstack(tcb),
-              tcb->adj_stack_size);
+      if (tcb != NULL)
+        {
+          fprintf(stderr, "\nStack used: %zu / %zu\n", up_check_tcbstack(tcb),
+                  tcb->adj_stack_size);
+          nxsched_put_tcb(tcb);
+        }
 #else
       fprintf(stderr, "\nStack used: unknown"
                       " (STACK_COLORATION must be enabled)\n");

From 715da6bde6e4e6f4176f29a27aecc5d065514dcf Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Thu, 25 Dec 2025 01:04:40 +0800
Subject: [PATCH 167/568] system/ymodem: fix send err when partial write

Fix buffer offset calculation in ymodem_send_buffer() to correctly
handle partial writes by advancing the buffer pointer and adjusting
the remaining size on each retry.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 system/ymodem/ymodem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ymodem/ymodem.c b/system/ymodem/ymodem.c
index 79c131f37..354f09962 100644
--- a/system/ymodem/ymodem.c
+++ b/system/ymodem/ymodem.c
@@ -98,7 +98,7 @@ static int ymodem_send_buffer(FAR struct ymodem_ctx_s *ctx,
   ymodem_debug("send buffer data, write size is %zu\n", size);
   while (i < size)
     {
-      ssize_t ret = write(ctx->sendfd, buf, size);
+      ssize_t ret = write(ctx->sendfd, buf + i, size - i);
       if (ret >= 0)
         {
           ymodem_debug("send buffer data, size %zd\n", ret);

From f09d0b2e0985162c5dff5ac0ecafd88fe44c0fec Mon Sep 17 00:00:00 2001
From: Bartosz Wawrzynek <bartosz.wawrzynek@glamox.com>
Date: Thu, 22 Jan 2026 11:33:22 +0100
Subject: [PATCH 168/568] apps: Fix minor issues for latest toolchains

- crypto/mbedtls: Add -Wno-cpp flag to suppress warnings
- interpreters/quickjs: Add flags to suppress warnings
- lte/alt1250: Fix spelling issues in comments
- system/dd: Add missing includes for modern compilers
- system/zlib: Add -Wno-cpp flag
- testing/cxx: Include missing algorithm header

Signed-off-by: Bartosz <bartol2205@gmail.com>
---
 crypto/mbedtls/Makefile              |  1 +
 interpreters/quickjs/Makefile        |  2 ++
 lte/alt1250/alt1250_devif.c          |  6 +++---
 lte/alt1250/alt1250_devif.h          |  4 ++--
 system/dd/dd_main.c                  | 16 ++++++++++++----
 system/zlib/Makefile                 |  1 +
 testing/cxx/cxxtest/cxxtest_main.cxx |  1 +
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/crypto/mbedtls/Makefile b/crypto/mbedtls/Makefile
index 330384111..241e076ea 100644
--- a/crypto/mbedtls/Makefile
+++ b/crypto/mbedtls/Makefile
@@ -48,6 +48,7 @@ MBEDTLS_FRAMEWORK_UNPACKNAME = mbedtls-framework
 CFLAGS += ${DEFINE_PREFIX}unix
 
 mbedtls/library/bignum.c_CFLAGS += -fno-lto
+mbedtls/library/ctr_drbg.c_CFLAGS += -Wno-array-bounds
 
 # Build break on Assemble compiler if -fno-omit-frame-pointer and -O3 enabled at same time
 # {standard input}: Assembler messages:
diff --git a/interpreters/quickjs/Makefile b/interpreters/quickjs/Makefile
index 7b84a08bb..457cdee35 100644
--- a/interpreters/quickjs/Makefile
+++ b/interpreters/quickjs/Makefile
@@ -35,6 +35,8 @@ VERSION=\"$(QUICKJS_VERSION)\"
 CFLAGS += -Dmp_add=qjs_mp_add -Dmp_sub=qjs_mp_sub -Dmp_mul=qjs_mp_mul
 CFLAGS += -DCONFIG_VERSION=$(VERSION) -Wno-shadow
 CFLAGS += -Wno-array-bounds -I$(QUICKJS_UNPACK)
+CFLAGS += -Wno-strict-prototypes -Wno-unused-variable
+CFLAGS += -Wno-unused-but-set-variable
 CFLAGS += -D__linux__ -include alloca.h
 CFLAGS += -Wno-incompatible-pointer-types
 CFLAGS += -Wno-implicit-function-declaration
diff --git a/lte/alt1250/alt1250_devif.c b/lte/alt1250/alt1250_devif.c
index a742938fb..39c490667 100644
--- a/lte/alt1250/alt1250_devif.c
+++ b/lte/alt1250/alt1250_devif.c
@@ -123,7 +123,7 @@ int altdevice_send_command(FAR struct alt1250_s *dev, int fd,
     }
   else
     {
-      /* In case of send successed */
+      /* In case of send succeeded */
 
       ret = container->outparam ? REP_NO_ACK_WOFREE : REP_NO_ACK;
     }
@@ -173,7 +173,7 @@ int altdevice_seteventbuff(int fd, FAR struct alt_evtbuffer_s *buffer)
  ****************************************************************************/
 
 int altdevice_getevent(int fd, FAR uint64_t *evtbitmap,
-                       FAR struct alt_container_s **replys)
+                       FAR struct alt_container_s **replies)
 {
   int ret = -EIO;
   struct alt_readdata_s dat;
@@ -183,7 +183,7 @@ int altdevice_getevent(int fd, FAR uint64_t *evtbitmap,
     {
       ret = OK;
       *evtbitmap = dat.evtbitmap;
-      *replys = dat.head;
+      *replies = dat.head;
     }
 
   return ret;
diff --git a/lte/alt1250/alt1250_devif.h b/lte/alt1250/alt1250_devif.h
index c537754df..01c689625 100644
--- a/lte/alt1250/alt1250_devif.h
+++ b/lte/alt1250/alt1250_devif.h
@@ -20,7 +20,7 @@
  *
  ****************************************************************************/
 
-#ifndef __APSS_LTE_ALT1250_ALT1250_DEVIF_H
+#ifndef __APPS_LTE_ALT1250_ALT1250_DEVIF_H
 #define __APPS_LTE_ALT1250_ALT1250_DEVIF_H
 
 /****************************************************************************
@@ -48,7 +48,7 @@ int altdevice_send_command(FAR struct alt1250_s *dev, int fd,
 int altdevice_powercontrol(int fd, uint32_t cmd);
 int altdevice_seteventbuff(int fd, FAR struct alt_evtbuffer_s *buffers);
 int altdevice_getevent(int fd, FAR uint64_t *evtbitmap,
-                       FAR struct alt_container_s **replys);
+                       FAR struct alt_container_s **replies);
 void altdevice_reset(int fd);
 #ifdef CONFIG_LTE_ALT1250_ENABLE_HIBERNATION_MODE
 int altdevice_powerresponse(int fd, uint32_t cmd, int resp);
diff --git a/system/dd/dd_main.c b/system/dd/dd_main.c
index f08041836..9be5de7ac 100644
--- a/system/dd/dd_main.c
+++ b/system/dd/dd_main.c
@@ -62,10 +62,18 @@
 #define CONFIG_SYSTEM_DD_PROGNAME "dd"
 #endif
 #if !defined(__NuttX__)
-#define FAR
-#define NSEC_PER_USEC 1000
-#define USEC_PER_SEC 1000000
-#define NSEC_PER_SEC 1000000000
+#  ifndef FAR
+#    define FAR
+#  endif
+#  ifndef NSEC_PER_USEC
+#    define NSEC_PER_USEC 1000
+#  endif
+#  ifndef USEC_PER_SEC
+#    define USEC_PER_SEC 1000000
+#  endif
+#  ifndef NSEC_PER_SEC
+#    define NSEC_PER_SEC 1000000000
+#  endif
 #endif
 
 #define g_dd CONFIG_SYSTEM_DD_PROGNAME
diff --git a/system/zlib/Makefile b/system/zlib/Makefile
index 7c978a552..43a09bb50 100644
--- a/system/zlib/Makefile
+++ b/system/zlib/Makefile
@@ -31,6 +31,7 @@ CSRCS += zlib/contrib/minizip/zip.c
 
 CFLAGS += -Dunix -Wno-shadow -Wno-strict-prototypes -Wno-undef
 CFLAGS += ${INCDIR_PREFIX}zlib
+zlib/test/infcover.c_CFLAGS += -Wno-format
 
 ZLIB_ZIP = zlib13.zip
 ZLIB_SRC = zlib
diff --git a/testing/cxx/cxxtest/cxxtest_main.cxx b/testing/cxx/cxxtest/cxxtest_main.cxx
index f33da9eed..90663f958 100644
--- a/testing/cxx/cxxtest/cxxtest_main.cxx
+++ b/testing/cxx/cxxtest/cxxtest_main.cxx
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <algorithm>
 #include <cstdio>
 #include <cassert>
 #include <cstdio>

From 183deb66e9b6b39ac2b90219ebbeaacb53109f2b Mon Sep 17 00:00:00 2001
From: likun17 <likun17@xiaomi.com>
Date: Sat, 14 Sep 2024 14:11:46 +0800
Subject: [PATCH 169/568] system/uorb: uorb_listener adds new features.

add get sensor device information based on topic.

Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/listener.c | 70 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index b9013a06a..5185b968e 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -138,6 +138,7 @@ listener <command> [arguments...]\n\
 \t[-t <val> ]  Time of listener, in seconds, default: 5\n\
 \t[-T       ]  Top, continuously print updating objects\n\
 \t[-l       ]  Top only execute once.\n\
+\t[-i       ]  Get sensor device information based on topic.\n\
   ");
 }
 
@@ -530,6 +531,61 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd)
   return ret;
 }
 
+/****************************************************************************
+ * Name: listener_print_info
+ *
+ * Description:
+ *   Print sensor device information.
+ *
+ * Input Parameters:
+ *   objlist   topic object list.
+ *
+ * Returned Value:
+ *   void
+ ****************************************************************************/
+
+static void listener_print_info(FAR const struct listen_list_s *objlist)
+{
+  FAR struct listen_object_s *tmp;
+  orb_info_t info;
+  int ret;
+  int fd;
+
+  SLIST_FOREACH(tmp, objlist, node)
+    {
+      fd = orb_subscribe_multi(tmp->object.meta, tmp->object.instance);
+      if (fd < 0)
+        {
+          continue;
+        }
+
+      ret = orb_get_info(fd, &info);
+      orb_unsubscribe(fd);
+      uorbinfo_raw("Topic [%s%d] info:", tmp->object.meta->o_name,
+                   tmp->object.instance);
+      if (ret < 0)
+        {
+          uorbinfo_raw("\t NULL");
+          continue;
+        }
+
+      uorbinfo_raw("\tname:%s" \
+                   "\n\tvendor:%s" \
+                   "\n\tversion:%" PRIu32 "" \
+                   "\n\tpower:%f" \
+                   "\n\tmax_range:%f" \
+                   "\n\tresolution:%f" \
+                   "\n\tmin_delay:%" PRId32 "" \
+                   "\n\tmax_delay:%" PRId32 "" \
+                   "\n\tfifo_reserved_event_count:%" PRIu32 ""\
+                   "\n\tfifo_max_event_count:%" PRIu32 "\n",
+                   info.name, info.vendor, info.version, info.power,
+                   info.max_range, info.resolution, info.min_delay,
+                   info.max_delay, info.fifo_reserved_event_count,
+                   info.fifo_max_event_count);
+    }
+}
+
 /****************************************************************************
  * Name: listener_record
  *
@@ -854,6 +910,7 @@ int main(int argc, FAR char *argv[])
   int nb_msgs       = 0;
   int timeout       = 5;
   bool top          = false;
+  bool info         = false;
   bool record       = false;
   bool only_once    = false;
   FAR char *filter  = NULL;
@@ -868,7 +925,7 @@ int main(int argc, FAR char *argv[])
 
   /* Pasrse Argument */
 
-  while ((ch = getopt(argc, argv, "r:b:n:t:Tflh")) != EOF)
+  while ((ch = getopt(argc, argv, "r:b:n:t:Tflhi")) != EOF)
     {
       switch (ch)
       {
@@ -918,6 +975,10 @@ int main(int argc, FAR char *argv[])
           only_once = true;
           break;
 
+        case 'i':
+          info = true;
+          break;
+
         case 'h':
         default:
           goto error;
@@ -938,6 +999,12 @@ int main(int argc, FAR char *argv[])
       return 0;
     }
 
+  if (info)
+    {
+      listener_print_info(&objlist);
+      goto exit;
+    }
+
   if (top)
     {
       listener_top(&objlist, filter, only_once);
@@ -956,6 +1023,7 @@ int main(int argc, FAR char *argv[])
                        nb_msgs, timeout, record);
     }
 
+exit:
   listener_delete_object_list(&objlist);
   return 0;
 

From ada12ce175de9b2e9154d110c0559826bdd2a991 Mon Sep 17 00:00:00 2001
From: likun17 <likun17@xiaomi.com>
Date: Thu, 19 Sep 2024 10:37:36 +0800
Subject: [PATCH 170/568] system/uorb: uorb_listener adds new features.

uorb/listener.c: Added flush function.
aurora:/ # uorb_listener -f sensor_accel_uncal,sensor_mag_uncal,sensor_aaa
Waited for 5 seconds without flush complete event. Giving up. err:25

Result:
        Topic [sensor_mag_uncal0] flush: FAILURE. [-1]
        Topic [sensor_accel_uncal0] flush: SUCCESS.
Total number of flush topics: 1/2

Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/listener.c | 151 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 147 insertions(+), 4 deletions(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index 5185b968e..0795dcb2f 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -130,7 +130,7 @@ listener <command> [arguments...]\n\
  Commands:\n\
 \t<topics_name> Topic name. Multi name are separated by ','\n\
 \t[-h       ]  Listener commands help\n\
-\t[-f       ]  Record uorb data to file\n\
+\t[-s       ]  Record uorb data to file\n\
 \t[-n <val> ]  Number of messages, default: 0\n\
 \t[-r <val> ]  Subscription rate (unlimited if 0), default: 0\n\
 \t[-b <val> ]  Subscription maximum report latency in us(unlimited if 0),\n\
@@ -139,6 +139,7 @@ listener <command> [arguments...]\n\
 \t[-T       ]  Top, continuously print updating objects\n\
 \t[-l       ]  Top only execute once.\n\
 \t[-i       ]  Get sensor device information based on topic.\n\
+\t[-f       ]  Flush sensor drive data.\n\
   ");
 }
 
@@ -531,6 +532,137 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd)
   return ret;
 }
 
+/****************************************************************************
+ * Name: listener_flush_topic
+ *
+ * Description:
+ *   Flush sensor device.
+ *
+ * Input Parameters:
+ *   objlist      Topic object list.
+ *   nb_objects   Length of objects list.
+ *   timeout      Maximum poll waiting time(microsecond).
+ *
+ * Returned Value:
+ *   void
+ ****************************************************************************/
+
+static void listener_flush_topic(FAR const struct listen_list_s *objlist,
+                                 int nb_objects, int timeout)
+{
+  FAR struct listen_object_s *tmp;
+  FAR struct pollfd *fds;
+  unsigned int events;
+  FAR int8_t *result;
+  int nb_flush = 0;
+  int i = 0;
+  int ret;
+
+  fds = calloc(nb_objects, sizeof(struct pollfd));
+  if (!fds)
+    {
+      return;
+    }
+
+  result = calloc(nb_objects, sizeof(int8_t));
+  if (!result)
+    {
+      free(fds);
+      return;
+    }
+
+  /* Prepare pollfd for all flush objects */
+
+  SLIST_FOREACH(tmp, objlist, node)
+    {
+      int fd;
+
+      fd = orb_subscribe_multi(tmp->object.meta, tmp->object.instance);
+      if (fd < 0)
+        {
+          fds[i].fd     = -1;
+          fds[i].events = 0;
+        }
+      else
+        {
+          fds[i].fd     = fd;
+          fds[i].events = POLLPRI;
+          i++;
+        }
+    }
+
+  i = 0;
+  SLIST_FOREACH(tmp, objlist, node)
+    {
+      ret = orb_flush(fds[i].fd);
+      if (ret < 0)
+        {
+          result[i] = ret;
+        }
+      else
+        {
+          nb_flush++;
+        }
+
+      i++;
+    }
+
+  while (nb_flush && !g_should_exit)
+    {
+      if (poll(&fds[0], nb_objects, timeout * 1000) > 0)
+        {
+          i = 0;
+          SLIST_FOREACH(tmp, objlist, node)
+            {
+              if (fds[i].revents & POLLPRI)
+                {
+                  ret = orb_get_events(fds[i].fd, &events);
+                  if (ret < 0)
+                    {
+                      result[i] = ret;
+                    }
+                  else if (events & SENSOR_EVENT_FLUSH_COMPLETE)
+                    {
+                      nb_flush--;
+                    }
+                }
+
+              i++;
+            }
+        }
+      else if (errno != EINTR)
+        {
+          uorbinfo_raw("Waited for %d seconds without flush complete event. "
+                       "Giving up. err:%d\n", timeout, errno);
+          break;
+        }
+    }
+
+  i = 0;
+  uorbinfo_raw("Result:");
+  SLIST_FOREACH(tmp, objlist, node)
+    {
+      if (result[i] == 0)
+        {
+          uorbinfo_raw("\tTopic [%s%d] flush: SUCCESS.",
+                      tmp->object.meta->o_name, tmp->object.instance);
+        }
+      else
+        {
+          uorbinfo_raw("\tTopic [%s%d] flush: FAILURE. [%d]",
+                      tmp->object.meta->o_name,  tmp->object.instance,
+                      result[i]);
+        }
+
+      orb_unsubscribe(fds[i].fd);
+      i++;
+    }
+
+  uorbinfo_raw("Total number of flush topics: %d", nb_objects);
+  free(fds);
+  free(result);
+}
+
 /****************************************************************************
  * Name: listener_print_info
  *
@@ -632,7 +764,7 @@ static int listener_record(FAR const struct orb_metadata *meta, int fd,
  *   topic_rate     Subscribe frequency.
  *   topic_latency  Subscribe report latency.
  *   nb_msgs        Subscribe amount of messages.
- *   timeout        Maximum poll waiting time , ms.
+ *   timeout        Maximum poll waiting time(microseconds).
  *
  * Returned Value:
  *   None
@@ -911,6 +1043,7 @@ int main(int argc, FAR char *argv[])
   int timeout       = 5;
   bool top          = false;
   bool info         = false;
+  bool flush        = false;
   bool record       = false;
   bool only_once    = false;
   FAR char *filter  = NULL;
@@ -925,7 +1058,7 @@ int main(int argc, FAR char *argv[])
 
   /* Pasrse Argument */
 
-  while ((ch = getopt(argc, argv, "r:b:n:t:Tflhi")) != EOF)
+  while ((ch = getopt(argc, argv, "r:b:n:t:Tfslhi")) != EOF)
     {
       switch (ch)
       {
@@ -962,11 +1095,15 @@ int main(int argc, FAR char *argv[])
           break;
 
 #ifdef CONFIG_DEBUG_UORB
-        case 'f':
+        case 's':
           record = true;
           break;
 #endif
 
+        case 'f':
+          flush = true;
+          break;
+
         case 'T':
           top = true;
           break;
@@ -999,6 +1136,12 @@ int main(int argc, FAR char *argv[])
       return 0;
     }
 
+  if (flush)
+    {
+      listener_flush_topic(&objlist, ret, timeout);
+      goto exit;
+    }
+
   if (info)
     {
       listener_print_info(&objlist);

From a454cf4d9428088df0c8d68706efc341169ad212 Mon Sep 17 00:00:00 2001
From: likun17 <likun17@xiaomi.com>
Date: Tue, 4 Mar 2025 17:16:49 +0800
Subject: [PATCH 171/568] system/uorb: uorb_listener flush functionality
 optimization.

uorb/listener:Added flush failure prompt information.

Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/listener.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index 0795dcb2f..8cd63b098 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -559,13 +559,13 @@ static void listener_flush_topic(FAR const struct listen_list_s *objlist,
   int ret;
 
   fds = calloc(nb_objects, sizeof(struct pollfd));
-  if (!fds)
+  if (fds == NULL)
     {
       return;
     }
 
   result = calloc(nb_objects, sizeof(int8_t));
-  if (!result)
+  if (result == NULL)
     {
       free(fds);
       return;
@@ -598,6 +598,8 @@ static void listener_flush_topic(FAR const struct listen_list_s *objlist,
       if (ret < 0)
         {
           result[i] = ret;
+          uorbinfo_raw("topic [%s%d] call flush failed! return:%d\n",
+                       tmp->object.meta->o_name, tmp->object.instance, ret);
         }
       else
         {

From 197401975a2fe985a8f5c2740a6004b6e6329ee4 Mon Sep 17 00:00:00 2001
From: guohao15 <guohao15@xiaomi.com>
Date: Tue, 17 Dec 2024 11:08:19 +0800
Subject: [PATCH 172/568] mtdconfig: support ram_mtdconfig device &&
 lomtdconfig device

For nvs test in qemu

Signed-off-by: guohao15 <guohao15@xiaomi.com>
---
 nshlib/nsh_command.c |  6 ++++
 nshlib/nsh_fscmds.c  | 74 +++++++++++++++++++++-----------------------
 2 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index af0084218..cace8eeac 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -322,9 +322,15 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #ifndef CONFIG_DISABLE_MOUNTPOINT
 #  if defined(CONFIG_MTD_LOOP) && !defined(CONFIG_NSH_DISABLE_LOMTD)
+#    ifdef CONFIG_MTD_CONFIG
+  CMD_MAP("lomtd",    cmd_lomtd,    3, 10,
+    "[-d <dev-path>] | [[-o <offset>] [-e <erase-size>] "
+    "[-b <sect-size>] [-c <configdata>] <dev-path> <file-path>]]"),
+#    else
   CMD_MAP("lomtd",    cmd_lomtd,    3, 9,
     "[-d <dev-path>] | [[-o <offset>] [-e <erase-size>] "
     "[-b <sect-size>] <dev-path> <file-path>]]"),
+#    endif
 #  endif
 #endif
 
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index c1abcd357..447d45e72 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -965,8 +965,8 @@ errout:
  * Name: cmd_losetup
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_MOUNTPOINT
-#   if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP)
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_DEV_LOOP) && \
+    !defined(CONFIG_NSH_DISABLE_LOSETUP)
 int cmd_losetup(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *loopdev = NULL;
@@ -1120,14 +1120,13 @@ errout_with_paths:
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_losmart
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_MOUNTPOINT
-#   if defined(CONFIG_SMART_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSMART)
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_SMART_DEV_LOOP) && \
+    !defined(CONFIG_NSH_DISABLE_LOSMART)
 int cmd_losmart(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *loopdev = NULL;
@@ -1292,14 +1291,13 @@ errout_with_paths:
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_lomtd
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_MOUNTPOINT
-#  if defined(CONFIG_MTD_LOOP) && !defined(CONFIG_NSH_DISABLE_LOMTD)
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_MTD_LOOP) && \
+    !defined(CONFIG_NSH_DISABLE_LOMTD)
 int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *loopdev = NULL;
@@ -1310,6 +1308,9 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   int sectsize = -1;
   off_t offset = 0;
   bool badarg = false;
+#  ifdef CONFIG_MTD_CONFIG
+  int configdata = 0;
+#  endif
   int ret = ERROR;
   int option;
   int fd;
@@ -1317,14 +1318,17 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   /* Get the lomtd options:  Two forms are supported:
    *
    *   lomtd -d <loop-device>
-   *   lomtd [-o <offset>] [-e erasesize] [-b sectsize]
+   *   lomtd [-o <offset>] [-e erasesize] [-b sectsize] [-c configdata]
    *         <loop-device> <filename>
    *
    * NOTE that the -o and -r options are accepted with the -d option, but
    * will be ignored.
    */
-
+#  ifdef CONFIG_MTD_CONFIG
+  while ((option = getopt(argc, argv, "d:o:e:b:c:")) != ERROR)
+#  else
   while ((option = getopt(argc, argv, "d:o:e:b:")) != ERROR)
+#  endif
     {
       switch (option)
         {
@@ -1345,6 +1349,12 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
           sectsize = atoi(optarg);
           break;
 
+#  ifdef CONFIG_MTD_CONFIG
+        case 'c':
+          configdata = atoi(optarg);
+          break;
+#  endif
+
         case '?':
         default:
           nsh_error(vtbl, g_fmtarginvalid, argv[0]);
@@ -1420,11 +1430,14 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
     {
       /* Set up the loop device */
 
-      setup.devname   = loopdev;    /* The loop block device to be created */
-      setup.filename  = filepath;   /* The file or character device to use */
-      setup.sectsize  = sectsize;   /* The sector size to use with the block device */
-      setup.erasesize = erasesize;  /* The sector size to use with the block device */
-      setup.offset    = offset;     /* An offset that may be applied to the device */
+      setup.devname    = loopdev;    /* The loop block device to be created */
+      setup.filename   = filepath;   /* The file or character device to use */
+      setup.sectsize   = sectsize;   /* The sector size to use with the block device */
+      setup.erasesize  = erasesize;  /* The sector size to use with the block device */
+      setup.offset     = offset;     /* An offset that may be applied to the device */
+#  ifdef CONFIG_MTD_CONFIG
+      setup.configdata = configdata; /* Is a loop mtdconfig device */
+#  endif
 
       ret = ioctl(fd, MTD_LOOPIOC_SETUP,
                   (unsigned long)((uintptr_t)&setup));
@@ -1455,7 +1468,6 @@ errout_with_paths:
 
   return ret;
 }
-#  endif
 #endif
 
 /****************************************************************************
@@ -1661,8 +1673,7 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
  * Name: cmd_mkdir
  ****************************************************************************/
 
-#ifdef NSH_HAVE_DIROPTS
-#ifndef CONFIG_NSH_DISABLE_MKDIR
+#if defined(NSH_HAVE_DIROPTS) && !defined(CONFIG_NSH_DISABLE_MKDIR)
 int cmd_mkdir(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *fullpath = NULL;
@@ -1722,14 +1733,13 @@ int cmd_mkdir(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_mkfatfs
  ****************************************************************************/
 
-#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FSUTILS_MKFATFS)
-#ifndef CONFIG_NSH_DISABLE_MKFATFS
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FSUTILS_MKFATFS) && \
+    !defined(CONFIG_NSH_DISABLE_MKFATFS)
 int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   struct fat_format_s fmt = FAT_FORMAT_INITIALIZER;
@@ -1825,7 +1835,6 @@ int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_mkfifo
@@ -1962,8 +1971,7 @@ errout_with_fmt:
  ****************************************************************************/
 
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_SMARTFS) && \
-    defined(CONFIG_FSUTILS_MKSMARTFS)
-#ifndef CONFIG_NSH_DISABLE_MKSMARTFS
+    defined(CONFIG_FSUTILS_MKSMARTFS) && !defined(CONFIG_NSH_DISABLE_MKSMARTFS)
 int cmd_mksmartfs(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *fullpath = NULL;
@@ -2048,14 +2056,12 @@ int cmd_mksmartfs(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_mv
  ****************************************************************************/
 
-#ifdef NSH_HAVE_DIROPTS
-#ifndef CONFIG_NSH_DISABLE_MV
+#if defined(NSH_HAVE_DIROPTS) && !defined(CONFIG_NSH_DISABLE_MV)
 int cmd_mv(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);
@@ -2098,7 +2104,6 @@ errout_with_oldpath:
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_readlink
@@ -2141,9 +2146,7 @@ int cmd_readlink(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
  * Name: cmd_rm
  ****************************************************************************/
 
-#ifdef NSH_HAVE_DIROPTS
-#ifndef CONFIG_NSH_DISABLE_RM
-
+#if defined(NSH_HAVE_DIROPTS) && !defined(CONFIG_NSH_DISABLE_RM)
 static int unlink_recursive(FAR char *path, FAR struct stat *stat)
 {
   struct dirent *d;
@@ -2273,14 +2276,12 @@ int cmd_rm(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_rmdir
  ****************************************************************************/
 
-#ifdef NSH_HAVE_DIROPTS
-#ifndef CONFIG_NSH_DISABLE_RMDIR
+#if defined(NSH_HAVE_DIROPTS) && !defined(CONFIG_NSH_DISABLE_RMDIR)
 int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);
@@ -2302,7 +2303,6 @@ int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_source
@@ -2431,8 +2431,7 @@ errout:
  * Name: cmd_truncate
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_MOUNTPOINT
-#ifndef CONFIG_NSH_DISABLE_TRUNCATE
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && !defined(CONFIG_NSH_DISABLE_TRUNCATE)
 int cmd_truncate(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);
@@ -2536,7 +2535,6 @@ int cmd_truncate(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   return ret;
 }
 #endif
-#endif
 
 /****************************************************************************
  * Name: cmd_fdinfo

From 72f57fc34e543dc91b3b5a5c2a8b6a088479e373 Mon Sep 17 00:00:00 2001
From: Jiri Vlasak <jvlasak@elektroline.cz>
Date: Wed, 21 Jan 2026 10:13:10 +0100
Subject: [PATCH 173/568] netutils: Add BARE

BARE is a simple binary representation for structured application data.

cbare, the BARE implementation ported by this commit, is an I/O agnostic
C implementation of the BARE message encoding.

Signed-off-by: Jiri Vlasak <jvlasak@elektroline.cz>
---
 LICENSE                                     | 26 +++++++++
 netutils/bare/Kconfig                       | 22 ++++++++
 netutils/bare/Make.defs                     | 27 ++++++++++
 netutils/bare/Makefile                      | 58 +++++++++++++++++++++
 netutils/bare/cbare_porting_for_nuttx.patch | 28 ++++++++++
 5 files changed, 161 insertions(+)
 create mode 100644 netutils/bare/Kconfig
 create mode 100644 netutils/bare/Make.defs
 create mode 100644 netutils/bare/Makefile
 create mode 100644 netutils/bare/cbare_porting_for_nuttx.patch

diff --git a/LICENSE b/LICENSE
index 61fb28ab4..429bd3339 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2248,3 +2248,29 @@ 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.
+
+
+netutils/bare/
+==============
+
+MIT License
+
+Copyright (c) 2022 Frank Smit
+
+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/netutils/bare/Kconfig b/netutils/bare/Kconfig
new file mode 100644
index 000000000..2f0fa3df2
--- /dev/null
+++ b/netutils/bare/Kconfig
@@ -0,0 +1,22 @@
+config NETUTILS_BARE
+	bool "Binary Application Record Encoding (BARE)"
+	default n
+	depends on ALLOW_MIT_COMPONENTS
+	---help---
+		BARE is a simple binary representation for structured
+		application data.
+
+		See https://baremessages.org/
+
+		cbare is an MIT-licensed I/O agnostic C implementation of the
+		BARE message encoding that is used when this option is enabled.
+
+if NETUTILS_BARE
+
+config NETUTILS_BARE_TEST
+	bool "Enable baretest"
+	default n
+	---help---
+		Enable baretest -- BARE test application.
+
+endif
diff --git a/netutils/bare/Make.defs b/netutils/bare/Make.defs
new file mode 100644
index 000000000..9a6b4f538
--- /dev/null
+++ b/netutils/bare/Make.defs
@@ -0,0 +1,27 @@
+############################################################################
+# apps/netutils/bare/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_NETUTILS_BARE),)
+CONFIGURED_APPS += $(APPDIR)/netutils/bare
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/bare/cbare/src
+CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/bare/cbare/src
+endif
diff --git a/netutils/bare/Makefile b/netutils/bare/Makefile
new file mode 100644
index 000000000..e851edf15
--- /dev/null
+++ b/netutils/bare/Makefile
@@ -0,0 +1,58 @@
+############################################################################
+# apps/netutils/bare/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+BARE_CBARE_DIR = cbare
+
+DEPPATH += --dep-path $(BARE_CBARE_DIR)$(DELIM)src
+VPATH   += :$(BARE_CBARE_DIR)$(DELIM)src
+
+CFLAGS += -I$(BARE_CBARE_DIR)/src
+
+CSRCS  = $(BARE_CBARE_DIR)/src/alloc.c
+CSRCS += $(BARE_CBARE_DIR)/src/cbare.c
+CSRCS += $(BARE_CBARE_DIR)/src/die.c
+
+ifneq ($(CONFIG_NETUTILS_BARE_TEST),)
+
+PROGNAME  = baretest
+PRIORITY  = 100
+STACKSIZE = 2048
+MODULE    = y
+
+MAINSRC   = $(BARE_CBARE_DIR)/test/baretest.c
+
+endif
+
+$(BARE_CBARE_DIR):
+	$(Q) echo "Cloning cbare repo..."
+	$(Q) git clone --depth=1 https://git.sr.ht/~fsx/cbare
+	$(Q) patch -p1 --directory=cbare < cbare_porting_for_nuttx.patch
+	$(Q) touch $(BARE_CBARE_DIR)
+
+context:: $(BARE_CBARE_DIR)
+
+distclean::
+	$(call DELDIR, $(BARE_CBARE_DIR))
+
+include $(APPDIR)/Application.mk
diff --git a/netutils/bare/cbare_porting_for_nuttx.patch b/netutils/bare/cbare_porting_for_nuttx.patch
new file mode 100644
index 000000000..73d16f7fd
--- /dev/null
+++ b/netutils/bare/cbare_porting_for_nuttx.patch
@@ -0,0 +1,28 @@
+diff --git i/src/cbare.c w/src/cbare.c
+index 208639f..a3081fb 100644
+--- i/src/cbare.c
++++ w/src/cbare.c
+@@ -4,7 +4,9 @@
+ #include "cbare.h"
+ #include "utf8.h"
+ 
++#ifndef UNUSED
+ #define UNUSED(x) (void)(x)
++#endif
+ 
+ enum {
+ 	U8SZ = 1,
+diff --git i/test/baretest.c w/test/baretest.c
+index 1561f4c..9df740f 100644
+--- i/test/baretest.c
++++ w/test/baretest.c
+@@ -10,7 +10,9 @@
+ #include "alloc.h"
+ #include "die.h"
+ 
++#ifndef UNUSED
+ #define UNUSED(x) (void)(x)
++#endif
+ 
+ #define ARRLEN(a) sizeof(a)/sizeof(a[0])
+ 

From 0e1ccbe35dbfa5a7ce7ae762e49b1df5ab2ae51a Mon Sep 17 00:00:00 2001
From: Jiri Vlasak <jvlasak@elektroline.cz>
Date: Wed, 21 Jan 2026 19:06:52 +0100
Subject: [PATCH 174/568] license: Fix typo in LICENSE file

license: Fix typo in LICENSE file

Signed-off-by: Jiri Vlasak <jvlasak@elektroline.cz>
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 429bd3339..84b5055da 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1282,7 +1282,7 @@ apps/system/telnet/telnet_client.c
    Copyright (C) 2017 Gregory Nutt. All rights reserved.
    Author: Gregory Nutt <gnutt@nuttx.org>
 
- The original authors of libtelnet are listed below.  Per their licesne,
+ The original authors of libtelnet are listed below.  Per their license,
  "The author or authors of this code dedicate any and all copyright
  interest in this code to the public domain. We make this dedication for
  the benefit of the public at large and to the detriment of our heirs and

From 5c822ea4d3a4a8bf548983a6ad9cd7fcefa7894f Mon Sep 17 00:00:00 2001
From: mazhuang <mazhuang@xiaomi.com>
Date: Wed, 13 Nov 2024 21:37:35 +0800
Subject: [PATCH 175/568] rpmsgsocket:add rpmsg socket test cases

Signed-off-by: mazhuang <mazhuang@xiaomi.com>
---
 examples/rpmsgsocket/rpsock_client.c | 163 +++++++++++++++++++-
 examples/rpmsgsocket/rpsock_server.c | 213 ++++++++++++++++++++++++++-
 2 files changed, 371 insertions(+), 5 deletions(-)

diff --git a/examples/rpmsgsocket/rpsock_client.c b/examples/rpmsgsocket/rpsock_client.c
index 447bf7773..80813404e 100644
--- a/examples/rpmsgsocket/rpsock_client.c
+++ b/examples/rpmsgsocket/rpsock_client.c
@@ -425,7 +425,140 @@ errout_with_buffers:
   return -errno;
 }
 
-static int rpsock_dgram_client(FAR char *argv[])
+static int rpsock_stream_conn_multi_times_client(FAR char *argv[], int argc)
+{
+  struct sockaddr_rpmsg myaddr;
+  struct pollfd pfd;
+  size_t sendsize = BUFHEAD;
+  ssize_t act;
+  bool delayflag = false;
+  bool nonblock = false;
+  FAR char *outbuf;
+  FAR char *inbuf;
+  FAR char *tmp;
+  int sockfd;
+  int ret;
+
+  /* Allocate buffers */
+
+  inbuf = malloc(2 * BUFSIZE);
+  outbuf = inbuf + BUFSIZE;
+  if (inbuf == NULL)
+    {
+      printf("client: failed to allocate buffers\n");
+      ret = -ENOMEM;
+      goto errout_with_buffers;
+    }
+
+  /* Create a new rpmsg domain socket */
+
+  if (strcmp(argv[2], "nonblock") == 0)
+    {
+      nonblock = true;
+    }
+
+  if (argc >= 7 && strcmp(argv[6], "delay") == 0)
+    {
+      delayflag = true;
+    }
+
+  printf("client: create socket SOCK_STREAM nonblock %d\n", nonblock);
+
+  if (nonblock)
+    {
+      sockfd = socket(PF_RPMSG, SOCK_STREAM | SOCK_NONBLOCK, 0);
+    }
+  else
+    {
+      sockfd = socket(PF_RPMSG, SOCK_STREAM, 0);
+    }
+
+  if (sockfd < 0)
+    {
+      printf("client socket failure %d\n", errno);
+      goto errout_with_buffers;
+    }
+
+  /* Connect the socket to the server */
+
+  myaddr.rp_family = AF_RPMSG;
+  strlcpy(myaddr.rp_name, argv[3], RPMSG_SOCKET_NAME_SIZE);
+  strlcpy(myaddr.rp_cpu, argv[4], RPMSG_SOCKET_CPU_SIZE);
+
+  printf("client: Connecting to %s,%s...\n", myaddr.rp_cpu, myaddr.rp_name);
+  ret = connect(sockfd, (FAR struct sockaddr *)&myaddr, sizeof(myaddr));
+  if (ret < 0 && errno == EINPROGRESS)
+    {
+      memset(&pfd, 0, sizeof(struct pollfd));
+      pfd.fd = sockfd;
+      pfd.events = POLLOUT;
+
+      ret = poll(&pfd, 1, -1);
+      if (ret < 0)
+        {
+          printf("client: poll failure: %d\n", errno);
+          goto errout_with_socket;
+        }
+    }
+  else if (ret < 0)
+    {
+      printf("client: connect failure: %d\n", errno);
+      goto errout_with_socket;
+    }
+
+  printf("client: Connected\n");
+
+  snprintf(outbuf, BUFHEAD, "process%04d, name:%s", getpid(), argv[3]);
+
+  printf("client send data, total len %zu, BUFHEAD %s\n", sendsize, outbuf);
+
+  tmp = outbuf;
+
+  ret = send(sockfd, tmp, sendsize, 0);
+  if (ret < 0)
+    {
+      printf("client: send failure: %d\n", errno);
+      goto errout_with_socket;
+    }
+
+  tmp = inbuf;
+  if (nonblock)
+    {
+      memset(&pfd, 0, sizeof(struct pollfd));
+      pfd.fd = sockfd;
+      pfd.events = POLLIN;
+
+      ret = poll(&pfd, 1, -1);
+      if (ret < 0)
+        {
+          printf("client: poll failure: %d\n", errno);
+          goto errout_with_socket;
+        }
+    }
+
+  act = recv(sockfd, tmp, SYNCSIZE, 0);
+  if (act < 0)
+    {
+      printf("client recv data failed %zd\n", act);
+      goto errout_with_socket;
+    }
+
+  printf("client: Terminating\n");
+
+  if (delayflag)
+    {
+      sleep(1);
+    }
+
+errout_with_socket:
+  close(sockfd);
+
+errout_with_buffers:
+  free(inbuf);
+  return -errno;
+}
+
+static int rpsock_dgram_client(char *argv[])
 {
   struct sockaddr_rpmsg myaddr;
   struct rpsock_arg_s args;
@@ -534,10 +667,14 @@ errout_with_buffers:
 
 int main(int argc, FAR char *argv[])
 {
+  int times = 0;
+  int ret = 0;
+  int num = 0;
+
   if (argc < 4)
     {
-      printf("Usage: rpsock_client stream/dgram"
-             " block/nonblock rp_name rp_cpu\n");
+      printf("Usage: rpsock_client stream/dgram/conn_multi_times/delay"
+             " block/nonblock rp_name rp_cpu times\n");
       return -EINVAL;
     }
 
@@ -549,6 +686,26 @@ int main(int argc, FAR char *argv[])
     {
       return rpsock_dgram_client(argv);
     }
+  else if (!strcmp(argv[1], "conn_multi_times"))
+    {
+      if (argc < 6 || atoi(argv[5]) <= 0)
+        {
+          printf("Usage: rpsock_client conn_multi_times"
+                 " block/nonblock rp_name rp_cpu times (delay)\n");
+          return -EINVAL;
+        }
+
+      for (times = atoi(argv[5]); times > 0; times--)
+        {
+          printf("client conn_multi_times: %d\n", num++);
+          ret = rpsock_stream_conn_multi_times_client(argv, argc);
+          if (ret < 0 && ret != -EINPROGRESS)
+            {
+              printf("client socket failure %d\n", ret);
+              return ret;
+            }
+        }
+    }
 
   return -EINVAL;
 }
diff --git a/examples/rpmsgsocket/rpsock_server.c b/examples/rpmsgsocket/rpsock_server.c
index 467f4f853..338818630 100644
--- a/examples/rpmsgsocket/rpsock_server.c
+++ b/examples/rpmsgsocket/rpsock_server.c
@@ -269,6 +269,191 @@ errout_with_listensd:
   return -errno;
 }
 
+static int rpsock_recv_send_single(FAR struct rpsock_arg_s *args)
+{
+  struct pollfd pfd;
+  ssize_t ret;
+  char buf[255];
+  FAR char *tmp;
+  int snd;
+
+  if (args->nonblock)
+    {
+      memset(&pfd, 0, sizeof(struct pollfd));
+      pfd.fd = args->fd;
+      pfd.events = POLLIN;
+
+      ret = poll(&pfd, 1, -1);
+      if (ret < 0)
+        {
+          printf("server poll failed errno %d\n", errno);
+          goto end;
+        }
+    }
+
+  ret = recv(args->fd, buf, sizeof(buf), 0);
+  if (ret == 0 || (ret < 0 && errno == ECONNRESET))
+    {
+      printf("server recv data normal exit\n");
+      goto end;
+    }
+  else if (ret < 0 && errno == EINPROGRESS)
+    {
+      memset(&pfd, 0, sizeof(struct pollfd));
+      pfd.fd = args->fd;
+      pfd.events = POLLOUT;
+      ret = poll(&pfd, 1, -1);
+      if (ret < 0)
+        {
+          printf("server: poll failure: %d\n", errno);
+          goto end;
+        }
+    }
+  else if(ret < 0)
+    {
+      printf("server recv data failed ret %zd, errno %d\n", ret, errno);
+      goto end;
+    }
+
+  snd = ret;
+  tmp = buf;
+
+  if (args->nonblock)
+    {
+      memset(&pfd, 0, sizeof(struct pollfd));
+      pfd.fd = args->fd;
+      pfd.events = POLLOUT;
+
+      ret = poll(&pfd, 1, -1);
+      if (ret < 0)
+        {
+          printf("server: poll failure: %d\n", errno);
+          goto end;
+        }
+    }
+
+  ret = send(args->fd, tmp, snd, 0);
+  if (ret == 0)
+    {
+      printf("server send data normal exit\n");
+    }
+  else if (ret < 0)
+    {
+      printf("server send data failed errno %d\n", errno);
+    }
+
+end:
+  printf("server Complete ret %zd, errno %d\n", ret, errno);
+  free(args);
+  return -errno;
+}
+
+static int rpsock_stream_multi_times_server(FAR char *argv[])
+{
+  struct sockaddr_rpmsg myaddr;
+  FAR struct rpsock_arg_s *args;
+  struct pollfd pfd;
+  socklen_t addrlen;
+  bool nonblock = false;
+  int fd;
+  int newfd;
+  int ret;
+
+  /* Create a new rpmsg domain socket */
+
+  if (strcmp(argv[2], "nonblock") == 0)
+    {
+      nonblock = true;
+    }
+
+  printf("server: create socket SOCK_STREAM nonblock %d\n", nonblock);
+
+  if (nonblock)
+    {
+      fd = socket(PF_RPMSG, SOCK_STREAM | SOCK_NONBLOCK, 0);
+    }
+  else
+    {
+      fd = socket(PF_RPMSG, SOCK_STREAM, 0);
+    }
+
+  if (fd < 0)
+    {
+      printf("server: socket failure: %d\n", errno);
+      return -errno;
+    }
+
+  /* Bind the socket to a local address */
+
+  myaddr.rp_family = AF_RPMSG;
+  strlcpy(myaddr.rp_name, argv[3], RPMSG_SOCKET_NAME_SIZE);
+  strlcpy(myaddr.rp_cpu, argv[4], RPMSG_SOCKET_CPU_SIZE);
+
+  printf("server: bind cpu %s, name %s ...\n",
+         myaddr.rp_cpu, myaddr.rp_name);
+  ret = bind(fd, (struct sockaddr *)&myaddr, sizeof(myaddr));
+  if (ret < 0)
+    {
+      printf("server: bind failure: %d\n", errno);
+      goto errout_with_listensd;
+    }
+
+  /* Listen for connections on the bound socket */
+
+  printf("server: listen ...\n");
+  ret = listen(fd, 16);
+  if (ret < 0)
+    {
+      printf("server: listen failure %d\n", errno);
+      goto errout_with_listensd;
+    }
+
+  if (nonblock)
+    {
+      memset(&pfd, 0, sizeof(struct pollfd));
+      pfd.fd = fd;
+      pfd.events = POLLIN;
+
+      ret = poll(&pfd, 1, -1);
+      if (ret < 0)
+        {
+          printf("server: poll failure: %d\n", errno);
+          goto errout_with_listensd;
+        }
+    }
+
+  printf("server: try accept ...\n");
+  newfd = accept4(fd, (FAR struct sockaddr *)&myaddr, &addrlen,
+                SOCK_CLOEXEC);
+  if (newfd < 0)
+    {
+      printf("server: accept4 failure: %d\n", errno);
+      goto errout_with_listensd;
+    }
+
+  printf("server: Connection accepted -- %d\n", newfd);
+
+  args = malloc(sizeof(struct rpsock_arg_s));
+  assert(args);
+
+  args->fd       = newfd;
+  args->nonblock = nonblock;
+
+  ret = rpsock_recv_send_single(args);
+  if (ret < 0)
+    {
+      printf("rpsock_recv_send_single failed errno %d\n", errno);
+    }
+
+  printf("server: Terminating\n");
+  close(fd);
+  return 0;
+
+errout_with_listensd:
+  close(fd);
+  return -errno;
+}
+
 static int rpsock_dgram_server(int argc, FAR char *argv[])
 {
   struct sockaddr_rpmsg myaddr;
@@ -366,10 +551,14 @@ static int rpsock_dgram_server(int argc, FAR char *argv[])
 
 int main(int argc, FAR char *argv[])
 {
+  int times = 0;
+  int ret = 0;
+  int num = 0;
+
   if (argc < 4)
     {
-      printf("Usage: rpsock_server stream/dgram"
-             " block/nonblock rp_name [rp_cpu]\n");
+      printf("Usage: rpsock_server stream/dgram/server_multi_times"
+             " block/nonblock rp_name [rp_cpu] times\n");
       return -EINVAL;
     }
 
@@ -381,6 +570,26 @@ int main(int argc, FAR char *argv[])
     {
       return rpsock_dgram_server(argc, argv);
     }
+  else if (!strcmp(argv[1], "server_multi_times"))
+    {
+      if (argc < 6 || atoi(argv[5]) <= 0)
+        {
+          printf("Usage: rpsock_server server_multi_times"
+                 " block/nonblock rp_name rp_cpu times\n");
+          return -EINVAL;
+        }
+
+      for (times = atoi(argv[5]); times > 0; times--)
+        {
+          printf("server_multi_times: %d\n", num++);
+          ret = rpsock_stream_multi_times_server(argv);
+          if (ret < 0 && ret != -EINPROGRESS)
+            {
+              printf("server socket failure %d\n", ret);
+              return ret;
+            }
+        }
+    }
 
   return -EINVAL;
 }

From c883c3f6ddb81cbfa9c406c8cea820847b7943ca Mon Sep 17 00:00:00 2001
From: Vlad Pruteanu <pruteanuvlad1611@yahoo.com>
Date: Sat, 24 Jan 2026 17:37:23 +0200
Subject: [PATCH 176/568] testing/drivers/crypto/hmac.c: Add long keys

This adds 2 tests, which include keys that are
longer than the SHA's block size.

Signed-off-by: Vlad Pruteanu <pruteanuvlad1611@yahoo.com>
---
 testing/drivers/crypto/hmac.c | 56 +++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/testing/drivers/crypto/hmac.c b/testing/drivers/crypto/hmac.c
index 10f0f12ac..4f0387bf8 100644
--- a/testing/drivers/crypto/hmac.c
+++ b/testing/drivers/crypto/hmac.c
@@ -64,13 +64,55 @@ testcase[] =
       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",
       50
     },
+    {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa",
+      131,
+      "Test Using Larger Than Block-Size Key - Hash Key First",
+      54
+    },
+    {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa",
+      131,
+      "This is a test using a larger than block-size key and a "
+      "larger than block-size data. The key needs to be hashed "
+      "before being used by the HMAC algorithm.",
+      152
+    },
 };
 
 FAR char *md5_result[] =
 {
   "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d",
   "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38",
-  "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6"
+  "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6",
+  "\xbf\xec\xaf\x4e\xff\xf9\x0a\x3a\x66\x8f\x39\x22\xfe\xc3\x76\x2d",
+  "\x09\xb8\xae\x7b\x15\xad\xbb\xb2\x43\xac\xa3\x49\x1b\x51\x51\x2b"
 };
 
 FAR char *sha1_result[] =
@@ -80,7 +122,11 @@ FAR char *sha1_result[] =
   "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c"
   "\x25\x9a\x7c\x79",
   "\xd7\x30\x59\x4d\x16\x7e\x35\xd5\x95\x6f\xd8\x00\x3d\x0d\xb3\xd3"
-  "\xf4\x6d\xc7\xbb"
+  "\xf4\x6d\xc7\xbb",
+  "\x90\xd0\xda\xce\x1c\x1b\xdc\x95\x73\x39\x30\x78\x03\x16\x03\x35"
+  "\xbd\xe6\xdf\x2b",
+  "\x21\x7e\x44\xbb\x08\xb6\xe0\x6a\x2d\x6c\x30\xf3\xcb\x9f\x53\x7f"
+  "\x97\xc6\x33\x56"
 };
 
 FAR char *sha256_result[] =
@@ -90,7 +136,11 @@ FAR char *sha256_result[] =
   "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e\x6a\x04\x24\x26\x08\x95\x75\xc7"
   "\x5a\x00\x3f\x08\x9d\x27\x39\x83\x9d\xec\x58\xb9\x64\xec\x38\x43",
   "\x7d\xda\x3c\xc1\x69\x74\x3a\x64\x84\x64\x9f\x94\xf0\xed\xa0\xf9"
-  "\xf2\xff\x49\x6a\x97\x33\xfb\x79\x6e\xd5\xad\xb4\x0a\x44\xc3\xc1"
+  "\xf2\xff\x49\x6a\x97\x33\xfb\x79\x6e\xd5\xad\xb4\x0a\x44\xc3\xc1",
+  "\x60\xe4\x31\x59\x1e\xe0\xb6\x7f\x0d\x8a\x26\xaa\xcb\xf5\xb7\x7f"
+  "\x8e\x0b\xc6\x21\x37\x28\xc5\x14\x05\x46\x04\x0f\x0e\xe3\x7f\x54",
+  "\x9b\x09\xff\xa7\x1b\x94\x2f\xcb\x27\x63\x5f\xbc\xd5\xb0\xe9\x44"
+  "\xbf\xdc\x63\x64\x4f\x07\x13\x93\x8a\x7f\x51\x53\x5c\x3a\x35\xe2"
 };
 
 int syshmac(int mac, FAR const char *key, size_t keylen,

From d1de009bc2744efb155d4a60c6ab4dcf50ffa284 Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Sat, 24 Jan 2026 18:21:47 +0800
Subject: [PATCH 177/568] sched: inline enter_critical_section

Inline enter_critical_section function calls in performance-critical
paths to reduce function call overhead while maintaining consistent
semantics, improving overall system latency and responsiveness in
real-time scenarios.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 benchmarks/osperf/osperf.c | 3 ++-
 testing/ostest/wdog.c      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/benchmarks/osperf/osperf.c b/benchmarks/osperf/osperf.c
index 0e71a4e05..757fb4216 100644
--- a/benchmarks/osperf/osperf.c
+++ b/benchmarks/osperf/osperf.c
@@ -39,6 +39,7 @@
 #include <sys/poll.h>
 
 #include <nuttx/sched.h>
+#include <nuttx/spinlock.h>
 
 /****************************************************************************
  * Private Types
@@ -129,7 +130,7 @@ static size_t performance_gettime(FAR struct performance_time_s *result)
 }
 
 /****************************************************************************
- * Pthread swtich performance
+ * Pthread switch performance
  ****************************************************************************/
 
 static FAR void *pthread_switch_task(FAR void *arg)
diff --git a/testing/ostest/wdog.c b/testing/ostest/wdog.c
index ca692f274..c00a7f9b6 100644
--- a/testing/ostest/wdog.c
+++ b/testing/ostest/wdog.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
+#include <nuttx/spinlock.h>
 
 #include <assert.h>
 #include <pthread.h>

From 1f990388ecd6b656df508b8c756437c66e6e9af8 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Mon, 13 Jan 2025 22:39:49 +0800
Subject: [PATCH 178/568] system/uorb: support non-wakeup subscribe.

default subscribing is wakeup.

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
---
 system/uorb/uORB/uORB.c | 18 +++++++++++++++---
 system/uorb/uORB/uORB.h | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/system/uorb/uORB/uORB.c b/system/uorb/uORB/uORB.c
index 333fc09e0..6fcc060c2 100644
--- a/system/uorb/uORB/uORB.c
+++ b/system/uorb/uORB/uORB.c
@@ -51,6 +51,7 @@
  *   flag         The open flag.
  *   instance     Instance number to open.
  *   queue_size   Maximum number of buffered elements.
+ *   non_wakeup   The non wakeup flag.
  *
  * Returned Value:
  *   fd on success, otherwise returns negative value and set errno.
@@ -58,7 +59,7 @@
 
 static int orb_advsub_open(FAR const struct orb_metadata *meta, int flags,
                            int instance, unsigned int queue_size,
-                           FAR orb_info_t *info)
+                           FAR orb_info_t *info, bool non_wakeup)
 {
   char path[ORB_PATH_MAX];
   int fd;
@@ -123,6 +124,11 @@ static int orb_advsub_open(FAR const struct orb_metadata *meta, int flags,
       ioctl(fd, SNIOC_SET_BUFFER_NUMBER, (unsigned long)queue_size);
     }
 
+  if (non_wakeup)
+    {
+      ioctl(fd, SNIOC_SET_NONWAKEUP, (unsigned long)non_wakeup);
+    }
+
   return fd;
 }
 
@@ -139,7 +145,7 @@ orb_advertise_multi_queue_flags(FAR const struct orb_metadata *meta,
 
   inst = instance ? *instance : orb_group_count(meta);
 
-  fd = orb_advsub_open(meta, flags, inst, queue_size, info);
+  fd = orb_advsub_open(meta, flags, inst, queue_size, info, false);
   if (fd < 0)
     {
       uorberr("%s advertise failed (%i)", meta->o_name, fd);
@@ -210,7 +216,13 @@ ssize_t orb_publish_multi(int fd, FAR const void *data, size_t len)
 int orb_subscribe_multi(FAR const struct orb_metadata *meta,
                         unsigned instance)
 {
-  return orb_advsub_open(meta, O_RDONLY, instance, 0, NULL);
+  return orb_advsub_open(meta, O_RDONLY, instance, 0, NULL, false);
+}
+
+int orb_subscribe_multi_nonwakeup(FAR const struct orb_metadata *meta,
+                                  unsigned instance)
+{
+  return orb_advsub_open(meta, O_RDONLY, instance, 0, NULL, true);
 }
 
 ssize_t orb_copy_multi(int fd, FAR void *buffer, size_t len)
diff --git a/system/uorb/uORB/uORB.h b/system/uorb/uORB/uORB.h
index 205edffb1..e30c52fdd 100644
--- a/system/uorb/uORB/uORB.h
+++ b/system/uorb/uORB/uORB.h
@@ -484,6 +484,44 @@ static inline int orb_subscribe(FAR const struct orb_metadata *meta)
   return orb_subscribe_multi(meta, 0);
 }
 
+/****************************************************************************
+ * Name: orb_subscribe_multi_nonwakeup/orb_subscribe_nonwakeup
+ *
+ * Description:
+ *   Subscribe to a topic in a non-wakeup ways.
+ *
+ *   The usage of orb_subscribe_multi_nonwakeup is similar to that of
+ *   orb_subscribe_multi, with the key difference lying in whether the
+ *   system's wakeup status needs to be concerned. This distinction is
+ *   particularly beneficial for low-power consumption scenarios.
+ *   If the subscription is in a non-wakeup mode, the subscriber will not
+ *   receive data while the system is in sleep mode. In such cases, new data
+ *   will overwrite old data until the system is awakened, at which point
+ *   the subscriber will be notified. Typically, the subscriber and
+ *   publisher of a topic reside in two separate systems.
+ *
+ * Input Parameters:
+ *   meta       The uORB metadata (usually from the ORB_ID() macro)
+ *   instance   The instance of the topic. Instance 0 matches the topic of
+ *              the orb_subscribe() call.
+ *
+ * Returned Value:
+ *   -1 on error, otherwise returns a fd
+ *   that can be used to read and update the topic.
+ *   If the topic in question is not known (due to an
+ *   ORB_DEFINE_OPTIONAL with no corresponding ORB_DECLARE)
+ *   this function will return -1 and set errno to ENOENT.
+ ****************************************************************************/
+
+int orb_subscribe_multi_nonwakeup(FAR const struct orb_metadata *meta,
+                                  unsigned instance);
+
+static inline
+int orb_subscribe_nonwakeup(FAR const struct orb_metadata *meta)
+{
+  return orb_subscribe_multi_nonwakeup(meta, 0);
+}
+
 /****************************************************************************
  * Name: orb_unsubscribe
  *

From 854d00e49ed236f1be6edb55974552d09b014210 Mon Sep 17 00:00:00 2001
From: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Date: Wed, 22 Jan 2025 22:26:26 +0800
Subject: [PATCH 179/568] system/uorb: uorb_listener add new features.

Add nonwakeup ways to using uorb_listener

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
Signed-off-by: likun17 <likun17@xiaomi.com>
---
 system/uorb/listener.c | 61 +++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index 8cd63b098..4a60b5185 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -84,7 +84,7 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd);
 static void listener_monitor(FAR struct listen_list_s *objlist,
                              int nb_objects, float topic_rate,
                              int topic_latency, int nb_msgs,
-                             int timeout, bool record);
+                             int timeout, bool record, bool nonwakeup);
 static int listener_update(FAR struct listen_list_s *objlist,
                            FAR struct orb_object *object);
 static void listener_top(FAR struct listen_list_s *objlist,
@@ -140,6 +140,7 @@ listener <command> [arguments...]\n\
 \t[-l       ]  Top only execute once.\n\
 \t[-i       ]  Get sensor device information based on topic.\n\
 \t[-f       ]  Flush sensor drive data.\n\
+\t[-u       ]  Subscribe in non-wakeup mode to save power.\n\
   ");
 }
 
@@ -182,6 +183,34 @@ static int listener_create_dir(FAR char *dir, size_t size)
   return OK;
 }
 
+/****************************************************************************
+ * Name: listener_subscribe
+ *
+ * Description:
+ *   Subscribe topic according to non wakeup mode.
+ *
+ * Input Parameters:
+ *   tmp          Given object
+ *   nonwakeup    State of nonwakeup.
+ *
+ * Returned Value:
+ *   fd on success, otherwise -1.
+ ****************************************************************************/
+
+static int listener_subscribe(FAR struct listen_object_s *tmp,
+                              bool nonwakeup)
+{
+  if (nonwakeup)
+    {
+      return orb_subscribe_multi_nonwakeup(tmp->object.meta,
+                                           tmp->object.instance);
+    }
+  else
+    {
+      return orb_subscribe_multi(tmp->object.meta, tmp->object.instance);
+    }
+}
+
 /****************************************************************************
  * Name: listener_get_state
  *
@@ -542,13 +571,14 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd)
  *   objlist      Topic object list.
  *   nb_objects   Length of objects list.
  *   timeout      Maximum poll waiting time(microsecond).
+ *   nonwakeup    The state of non wakeup
  *
  * Returned Value:
  *   void
  ****************************************************************************/
 
 static void listener_flush_topic(FAR const struct listen_list_s *objlist,
-                                 int nb_objects, int timeout)
+                                 int nb_objects, int timeout, bool nonwakeup)
 {
   FAR struct listen_object_s *tmp;
   FAR struct pollfd *fds;
@@ -577,7 +607,7 @@ static void listener_flush_topic(FAR const struct listen_list_s *objlist,
     {
       int fd;
 
-      fd = orb_subscribe_multi(tmp->object.meta, tmp->object.instance);
+      fd = listener_subscribe(tmp, nonwakeup);
       if (fd < 0)
         {
           fds[i].fd     = -1;
@@ -672,13 +702,15 @@ static void listener_flush_topic(FAR const struct listen_list_s *objlist,
  *   Print sensor device information.
  *
  * Input Parameters:
- *   objlist   topic object list.
+ *   objlist      topic object list.
+ *   nonwakeup    The state of non wakeup
  *
  * Returned Value:
  *   void
  ****************************************************************************/
 
-static void listener_print_info(FAR const struct listen_list_s *objlist)
+static void listener_print_info(FAR const struct listen_list_s *objlist,
+                                bool nonwakeup)
 {
   FAR struct listen_object_s *tmp;
   orb_info_t info;
@@ -687,7 +719,7 @@ static void listener_print_info(FAR const struct listen_list_s *objlist)
 
   SLIST_FOREACH(tmp, objlist, node)
     {
-      fd = orb_subscribe_multi(tmp->object.meta, tmp->object.instance);
+      fd = listener_subscribe(tmp, nonwakeup);
       if (fd < 0)
         {
           continue;
@@ -775,7 +807,7 @@ static int listener_record(FAR const struct orb_metadata *meta, int fd,
 static void listener_monitor(FAR struct listen_list_s *objlist,
                              int nb_objects, float topic_rate,
                              int topic_latency, int nb_msgs,
-                             int timeout, bool record)
+                             int timeout, bool record, bool nonwakeup)
 {
   FAR struct pollfd *fds;
   char path[PATH_MAX];
@@ -806,7 +838,7 @@ static void listener_monitor(FAR struct listen_list_s *objlist,
     {
       int fd;
 
-      fd = orb_subscribe_multi(tmp->object.meta, tmp->object.instance);
+      fd = listener_subscribe(tmp, nonwakeup);
       if (fd < 0)
         {
           fds[i].fd     = -1;
@@ -1047,6 +1079,7 @@ int main(int argc, FAR char *argv[])
   bool info         = false;
   bool flush        = false;
   bool record       = false;
+  bool nonwakeup    = false;
   bool only_once    = false;
   FAR char *filter  = NULL;
   int ret;
@@ -1060,7 +1093,7 @@ int main(int argc, FAR char *argv[])
 
   /* Pasrse Argument */
 
-  while ((ch = getopt(argc, argv, "r:b:n:t:Tfslhi")) != EOF)
+  while ((ch = getopt(argc, argv, "r:b:n:t:Tfslhiu")) != EOF)
     {
       switch (ch)
       {
@@ -1118,6 +1151,10 @@ int main(int argc, FAR char *argv[])
           info = true;
           break;
 
+        case 'u':
+          nonwakeup = true;
+          break;
+
         case 'h':
         default:
           goto error;
@@ -1140,13 +1177,13 @@ int main(int argc, FAR char *argv[])
 
   if (flush)
     {
-      listener_flush_topic(&objlist, ret, timeout);
+      listener_flush_topic(&objlist, ret, timeout, nonwakeup);
       goto exit;
     }
 
   if (info)
     {
-      listener_print_info(&objlist);
+      listener_print_info(&objlist, nonwakeup);
       goto exit;
     }
 
@@ -1165,7 +1202,7 @@ int main(int argc, FAR char *argv[])
         }
 
       listener_monitor(&objlist, ret, topic_rate, topic_latency,
-                       nb_msgs, timeout, record);
+                       nb_msgs, timeout, record, nonwakeup);
     }
 
 exit:

From 9a3778cb913aca74545e965766d253dd3d8b4bde Mon Sep 17 00:00:00 2001
From: hongfengchen <hongfengchen@xiaomi.com>
Date: Sat, 24 May 2025 19:11:42 +0800
Subject: [PATCH 180/568] testing: add malloc.h for fstest.h

Add malloc.h header file to fstest.h to fix missing malloc/free
function declarations in filesystem test suites.

Signed-off-by: hongfengchen <hongfengchen@xiaomi.com>
---
 testing/testsuites/kernel/fs/include/fstest.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/testsuites/kernel/fs/include/fstest.h b/testing/testsuites/kernel/fs/include/fstest.h
index 0a590bf88..050b587c8 100644
--- a/testing/testsuites/kernel/fs/include/fstest.h
+++ b/testing/testsuites/kernel/fs/include/fstest.h
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <malloc.h>
 #include <string.h>
 #include <libgen.h>
 #include <dirent.h>

From b56c785640c1b7efdd4af93014eaa3919c1894b1 Mon Sep 17 00:00:00 2001
From: hongfengchen <hongfengchen@xiaomi.com>
Date: Thu, 22 May 2025 10:54:17 +0800
Subject: [PATCH 181/568] testing: add missing header files

Add missing header files in netutils and lsan modules to fix
implicit function declarations and improve compilation compatibility.

Signed-off-by: hongfengchen <hongfengchen@xiaomi.com>
---
 .codespellrc            | 3 +++
 netutils/codecs/md5.c   | 1 +
 netutils/ftpd/ftpd.c    | 1 +
 system/lsan/lsan_main.c | 1 +
 4 files changed, 6 insertions(+)

diff --git a/.codespellrc b/.codespellrc
index 442f4656c..ac22a4c37 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -8,3 +8,6 @@ exclude-file = .codespell-ignore-lines
 # Ignore complete files (e.g. legal text or other immutable material).
 skip =
   LICENSE,
+
+# Ignore words list (FTP protocol commands and technical terms)
+ignore-words-list = ALLO
diff --git a/netutils/codecs/md5.c b/netutils/codecs/md5.c
index 75dfe3f0c..dade6abd1 100644
--- a/netutils/codecs/md5.c
+++ b/netutils/codecs/md5.c
@@ -53,6 +53,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "netutils/md5.h"
 
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 12491030a..4f5cc4667 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -48,6 +48,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <pthread.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <strings.h>
diff --git a/system/lsan/lsan_main.c b/system/lsan/lsan_main.c
index d0c8a06ea..f4a1f8579 100644
--- a/system/lsan/lsan_main.c
+++ b/system/lsan/lsan_main.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 #include <stdio.h>
+#include <unistd.h>
 
 /****************************************************************************
  * Public Functions

From d0e949cb2486f73c8b1ff68d017bffcd14eefb46 Mon Sep 17 00:00:00 2001
From: hongfengchen <hongfengchen@xiaomi.com>
Date: Tue, 3 Jun 2025 12:07:41 +0800
Subject: [PATCH 182/568] testing: add unistd.h and pthread.h headers

Add unistd.h and pthread.h for memorystress_main.c, unistd.h for
dhm.c and cachetest_main.c, and pthread.h for kv_test_019.c to fix
missing declarations.

Signed-off-by: hongfengchen <hongfengchen@xiaomi.com>
---
 examples/mdnsd/mdnsd_daemon.c            | 1 -
 testing/drivers/crypto/dhm.c             | 1 +
 testing/mm/cachetest/cachetest_main.c    | 1 +
 testing/mm/memstress/memorystress_main.c | 2 ++
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/mdnsd/mdnsd_daemon.c b/examples/mdnsd/mdnsd_daemon.c
index bfa7759e8..bc2ea4563 100644
--- a/examples/mdnsd/mdnsd_daemon.c
+++ b/examples/mdnsd/mdnsd_daemon.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/testing/drivers/crypto/dhm.c b/testing/drivers/crypto/dhm.c
index f1eafa2d7..9595e4cb4 100644
--- a/testing/drivers/crypto/dhm.c
+++ b/testing/drivers/crypto/dhm.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 #include <crypto/cryptodev.h>
 
diff --git a/testing/mm/cachetest/cachetest_main.c b/testing/mm/cachetest/cachetest_main.c
index 3906b58e6..2916932c8 100644
--- a/testing/mm/cachetest/cachetest_main.c
+++ b/testing/mm/cachetest/cachetest_main.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 #include <nuttx/cache.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <syslog.h>
 
 /****************************************************************************
diff --git a/testing/mm/memstress/memorystress_main.c b/testing/mm/memstress/memorystress_main.c
index 6d9b2d98d..ab1ff8630 100644
--- a/testing/mm/memstress/memorystress_main.c
+++ b/testing/mm/memstress/memorystress_main.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 #include <debug.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <pthread.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdint.h>

From 34e4d7eacded506785c271908ce5dbd9358c6cda Mon Sep 17 00:00:00 2001
From: tengshuangshuang <tengshuangshuang@xiaomi.com>
Date: Wed, 4 Jun 2025 19:32:55 +0800
Subject: [PATCH 183/568] testing: add unistd.h for drivertest_touchpanel.c

Add unistd.h header file to drivertest_touchpanel.c to fix missing
sleep/usleep function declarations in touchpanel driver tests.

Signed-off-by: tengshuangshuang <tengshuangshuang@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_touchpanel.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/drivers/drivertest/drivertest_touchpanel.c b/testing/drivers/drivertest/drivertest_touchpanel.c
index 3892c3d0f..7da74a168 100644
--- a/testing/drivers/drivertest/drivertest_touchpanel.c
+++ b/testing/drivers/drivertest/drivertest_touchpanel.c
@@ -37,6 +37,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <malloc.h>
 #include <string.h>
 #include <fcntl.h>

From c69df55cd043c1621e4c0fa3207ffd6ab7c71e18 Mon Sep 17 00:00:00 2001
From: hongfengchen <hongfengchen@xiaomi.com>
Date: Tue, 10 Jun 2025 15:00:26 +0800
Subject: [PATCH 184/568] rexecd: fix type change

Fix cast from pointer to integer of different size to ensure
proper type conversion and avoid compilation warnings.

Signed-off-by: hongfengchen <hongfengchen@xiaomi.com>
---
 netutils/ftpd/ftpd.c                     | 34 ++++++++++++------------
 netutils/rexecd/rexecd.c                 |  2 +-
 testing/mm/memstress/memorystress_main.c |  4 +--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 4f5cc4667..73b8fc9b9 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -140,11 +140,11 @@ static uint8_t ftpd_listoption(FAR char **param);
 static int ftpd_listbuffer(FAR struct ftpd_session_s *session,
                            FAR char *path, FAR struct stat *st,
                            FAR char *buffer, size_t buflen,
-                           unsigned int opton);
+                           unsigned int option);
 static int fptd_listscan(FAR struct ftpd_session_s *session,
-                         FAR char *path, unsigned int opton);
+                         FAR char *path, unsigned int option);
 static int ftpd_list(FAR struct ftpd_session_s *session,
-                     unsigned int opton);
+                     unsigned int option);
 
 /* Command handlers */
 
@@ -2145,7 +2145,7 @@ static uint8_t ftpd_listoption(FAR char **param)
 static int ftpd_listbuffer(FAR struct ftpd_session_s *session,
                            FAR char *path,
                            FAR struct stat *st, FAR char *buffer,
-                           size_t buflen, unsigned int opton)
+                           size_t buflen, unsigned int option)
 {
   UNUSED(session);
 
@@ -2154,7 +2154,7 @@ static int ftpd_listbuffer(FAR struct ftpd_session_s *session,
 
   name = basename(path);
 
-  if ((opton & FTPD_LISTOPTION_L) != 0)
+  if ((option & FTPD_LISTOPTION_L) != 0)
     {
       FAR const char *str;
       struct tm tm;
@@ -2367,7 +2367,7 @@ static int ftpd_listbuffer(FAR struct ftpd_session_s *session,
  ****************************************************************************/
 
 static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path,
-                         unsigned int opton)
+                         unsigned int option)
 {
   FAR char *temp;
   DIR *dir;
@@ -2384,7 +2384,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path,
   if (!S_ISDIR(st.st_mode))
     {
       ret = ftpd_listbuffer(session, path, &st, session->data.buffer,
-                            session->data.buflen, opton);
+                            session->data.buflen, option);
       if (ret == 0)
         {
           ret = ftpd_response(session->data.sd, session->txtimeout,
@@ -2412,7 +2412,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path,
 
       if (entry->d_name[0] == '.')
         {
-          if ((opton & FTPD_LISTOPTION_A) == 0)
+          if ((option & FTPD_LISTOPTION_A) == 0)
             {
               continue;
             }
@@ -2432,7 +2432,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path,
         }
 
       ret = ftpd_listbuffer(session, temp, &st, session->data.buffer,
-                            session->data.buflen, opton);
+                            session->data.buflen, option);
       if (ret >= 0)
         {
           ret = ftpd_response(session->data.sd, session->txtimeout,
@@ -2454,7 +2454,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path,
  * Name: ftpd_list
  ****************************************************************************/
 
-static int ftpd_list(FAR struct ftpd_session_s *session, unsigned int opton)
+static int ftpd_list(FAR struct ftpd_session_s *session, unsigned int option)
 {
   FAR char *abspath;
   int ret;
@@ -2462,7 +2462,7 @@ static int ftpd_list(FAR struct ftpd_session_s *session, unsigned int opton)
   ret = ftpd_getpath(session, session->param, &abspath, NULL);
   if (ret >= 0)
     {
-      ret = fptd_listscan(session, abspath, opton);
+      ret = fptd_listscan(session, abspath, option);
       free(abspath);
     }
 
@@ -3417,7 +3417,7 @@ static int ftpd_command_epsv(FAR struct ftpd_session_s *session)
 
 static int ftpd_command_list(FAR struct ftpd_session_s *session)
 {
-  uint8_t opton = FTPD_LISTOPTION_L;
+  uint8_t option = FTPD_LISTOPTION_L;
   int ret;
 
   ret = ftpd_dataopen(session);
@@ -3435,8 +3435,8 @@ static int ftpd_command_list(FAR struct ftpd_session_s *session)
       return ret;
     }
 
-  opton |= ftpd_listoption((char **)(&session->param));
-  ftpd_list(session, opton);
+  option |= ftpd_listoption((char **)(&session->param));
+  ftpd_list(session, option);
 
   ret = ftpd_response(session->cmd.sd, session->txtimeout,
                       g_respfmt1, 226, ' ', "Transfer complete");
@@ -3451,7 +3451,7 @@ static int ftpd_command_list(FAR struct ftpd_session_s *session)
 
 static int ftpd_command_nlst(FAR struct ftpd_session_s *session)
 {
-  uint8_t opton = 0;
+  uint8_t option = 0;
   int ret;
 
   ret = ftpd_dataopen(session);
@@ -3469,8 +3469,8 @@ static int ftpd_command_nlst(FAR struct ftpd_session_s *session)
       return ret;
     }
 
-  opton |= ftpd_listoption((char **)(&session->param));
-  ftpd_list(session, opton);
+  option |= ftpd_listoption((char **)(&session->param));
+  ftpd_list(session, option);
 
   ret = ftpd_response(session->cmd.sd, session->txtimeout,
                       g_respfmt1, 226, ' ', "Transfer complete");
diff --git a/netutils/rexecd/rexecd.c b/netutils/rexecd/rexecd.c
index 5c301c62a..2e462083c 100644
--- a/netutils/rexecd/rexecd.c
+++ b/netutils/rexecd/rexecd.c
@@ -85,7 +85,7 @@ static FAR void *doit(pthread_addr_t pvarg)
   char buf[REXECD_BUFSIZE];
   struct pollfd fds[2];
   FAR FILE *fp;
-  int sock = (int)pvarg;
+  int sock = (long)pvarg;
   int ret;
 
   /* we need to read err_sock, user and passwd, but ignore them */
diff --git a/testing/mm/memstress/memorystress_main.c b/testing/mm/memstress/memorystress_main.c
index ab1ff8630..eca7b7735 100644
--- a/testing/mm/memstress/memorystress_main.c
+++ b/testing/mm/memstress/memorystress_main.c
@@ -122,7 +122,7 @@ static void show_usage(FAR const char *progname)
 {
   printf("\nUsage: %s -m [max allocsize Default:8192] "
          "-n [node length Default:1024] -t [sleep us Default:100]"
-         " -x [nthreads Default:1] -d [debuger mode]\n",
+         " -x [nthreads Default:1] -d [debugger mode]\n",
         progname);
   printf("\nWhere:\n");
   printf("  -m [max-allocsize] max alloc size.\n");
@@ -217,7 +217,7 @@ static void checknode(FAR struct memorystress_thread_context_s *context,
           context->error.rwerror = rwerror;
 
           error_result(context->error);
-          lib_dumpbuffer("debuger", node->buf, size);
+          lib_dumpbuffer("debugger", node->buf, size);
 
           /* Trigger the ASSET once it occurs, retaining the error site */
 

From 71593dffad2cee60d6f704da114d6f399adaa072 Mon Sep 17 00:00:00 2001
From: yukangzhi <yukangzhi@xiaomi.com>
Date: Fri, 25 Apr 2025 15:47:14 +0800
Subject: [PATCH 185/568] apps/system/trace: support binary dump of noteram

This patch adds support for dumping binary contents from noteram via the
`trace dump -b <file>` command. Changes include:

- Add a `binary` parameter to `trace_dump()` and the public header
  `system/trace/trace.h` to indicate binary output mode.
- Update `trace_dump()` to set the noteram read mode to binary using
  `NOTERAM_SETREADMODE` when requested.
- Update `trace dump` CLI parsing in `system/trace/trace.c` to accept
  the `-b` flag and pass it through to `trace_dump()`.
- Update usage/help text to include the new `-b` option.

Signed-off-by: yukangzhi <yukangzhi@xiaomi.com>
---
 system/trace/trace.c      | 22 +++++++++++++++++-----
 system/trace/trace.h      |  2 +-
 system/trace/trace_dump.c | 14 +++++++++++++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/system/trace/trace.c b/system/trace/trace.c
index f4a5454a4..f414c41ea 100644
--- a/system/trace/trace.c
+++ b/system/trace/trace.c
@@ -147,10 +147,20 @@ static int trace_cmd_dump(FAR const char *name, int index, int argc,
 {
   FAR FILE *out = stdout;
   bool changed = false;
+  bool binary = false;
   bool cont = false;
   int ret;
 
-  /* Usage: trace dump [-c][<filename>] */
+  /* Usage: trace dump [-b][-c][<filename>] */
+
+  if (index < argc)
+    {
+      if (strcmp(argv[index], "-b") == 0)
+        {
+          binary = true;
+          index++;
+        }
+    }
 
   if (index < argc)
     {
@@ -192,11 +202,14 @@ static int trace_cmd_dump(FAR const char *name, int index, int argc,
 
   /* Dump the trace header */
 
-  fputs("# tracer: nop\n#\n", out);
+  if (!binary)
+    {
+      fputs("# tracer: nop\n#\n", out);
+    }
 
   /* Dump the trace data */
 
-  ret = trace_dump(out);
+  ret = trace_dump(out, binary);
 
   if (changed)
     {
@@ -803,9 +816,8 @@ static void show_usage(void)
                                 " Get the trace while running <command>\n"
 #endif
 #ifdef CONFIG_DRIVERS_NOTERAM
-          " dump    [-a][-c][<filename>]        :"
+          " dump    [-b][-c][<filename>]        :"
                                 " Output the trace result\n"
-          "                                       [-a] <Android SysTrace>\n"
 #endif
           " mode    [{+|-}{o|w|s|a|i|d}...]     :"
                                 " Set task trace options\n"
diff --git a/system/trace/trace.h b/system/trace/trace.h
index 5ac104841..d94e3568b 100644
--- a/system/trace/trace.h
+++ b/system/trace/trace.h
@@ -57,7 +57,7 @@ extern "C"
  *
  ****************************************************************************/
 
-int trace_dump(FAR FILE *out);
+int trace_dump(FAR FILE *out, bool binary);
 
 /****************************************************************************
  * Name: trace_dump_clear
diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c
index d51453da1..c91b7264e 100644
--- a/system/trace/trace_dump.c
+++ b/system/trace/trace_dump.c
@@ -67,7 +67,7 @@ static void note_ioctl(int cmd, unsigned long arg)
  *
  ****************************************************************************/
 
-int trace_dump(FAR FILE *out)
+int trace_dump(FAR FILE *out, bool binary)
 {
   uint8_t tracedata[1024];
   int ret;
@@ -82,6 +82,18 @@ int trace_dump(FAR FILE *out)
       return ERROR;
     }
 
+  if (binary)
+    {
+      unsigned int mode = NOTERAM_MODE_READ_BINARY;
+      ret = ioctl(fd, NOTERAM_SETREADMODE, &mode);
+      if (ret < 0)
+        {
+          fprintf(stderr, "trace: cannot set read mode\n");
+          close(fd);
+          return ERROR;
+        }
+    }
+
   /* Read and output all notes */
 
   while (1)

From 2d2394201cde3e073fa059a0ac1536f5ad6243a9 Mon Sep 17 00:00:00 2001
From: wangxingxing <wangxingxing@xiaomi.com>
Date: Fri, 21 Mar 2025 14:27:17 +0800
Subject: [PATCH 186/568] fs/bugfix: fix the fd error of fs test

remove test_state of fs test cases

Removes unnecessary test_state structure usage for tracking file descriptors
Adds missing close(newfd) call in fs_dup_test.c to prevent file descriptor leaks
Simplifies test code by eliminating redundant fd tracking that could lead to incorrect resource management

Signed-off-by: wangxingxing <wangxingxing@xiaomi.com>
---
 testing/testsuites/kernel/fs/cases/fs_dup_test.c      | 6 +-----
 testing/testsuites/kernel/fs/cases/fs_file_get_test.c | 3 ---
 testing/testsuites/kernel/fs/cases/fs_poll_test.c     | 5 -----
 testing/testsuites/kernel/fs/cases/fs_readdir_test.c  | 4 ----
 testing/testsuites/kernel/fs/cases/fs_seek_test.c     | 7 -------
 testing/testsuites/kernel/fs/cases/fs_truncate_test.c | 5 -----
 testing/testsuites/kernel/fs/cases/fs_unlink_test.c   | 5 -----
 testing/testsuites/kernel/fs/cases/fs_write_test.c    | 8 --------
 8 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/testing/testsuites/kernel/fs/cases/fs_dup_test.c b/testing/testsuites/kernel/fs/cases/fs_dup_test.c
index 0600041f1..91ebf23d7 100644
--- a/testing/testsuites/kernel/fs/cases/fs_dup_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_dup_test.c
@@ -60,15 +60,11 @@ void test_nuttx_fs_dup01(FAR void **state)
   char buffd[5] = "hello";
   char bufnewfd[8] = "littleFS";
   char readbuf[20] = "";
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
   fd = open(TESTFILENAME, O_RDWR | O_CREAT | O_APPEND, 0700);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* do write */
 
@@ -83,7 +79,6 @@ void test_nuttx_fs_dup01(FAR void **state)
   newfd = dup(fd);
   close(fd);
   assert_int_not_equal(newfd, -1);
-  test_state->fd2 = newfd;
 
   /* check if file pos is shared */
 
@@ -112,4 +107,5 @@ void test_nuttx_fs_dup01(FAR void **state)
   /* check readbuf */
 
   assert_int_equal(strncmp(readbuf, "hellolittleFS", 13), 0);
+  close(newfd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_file_get_test.c b/testing/testsuites/kernel/fs/cases/fs_file_get_test.c
index dd61c1f90..c06231f74 100644
--- a/testing/testsuites/kernel/fs/cases/fs_file_get_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_file_get_test.c
@@ -63,7 +63,6 @@ void test_nuttx_fs_file_get01(FAR void **state)
 
   fd = creat(TEST_FILE, 0700);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* fdopen file */
 
@@ -109,8 +108,6 @@ void test_nuttx_fs_file_get01(FAR void **state)
 
   assert_int_equal(filep->f_pos, BUF_SIZE);
 
-  test_state->fd2 = fileno(fp);
-
   /* put filep */
 
   file_put(filep);
diff --git a/testing/testsuites/kernel/fs/cases/fs_poll_test.c b/testing/testsuites/kernel/fs/cases/fs_poll_test.c
index c442c7437..e51ae9ee9 100644
--- a/testing/testsuites/kernel/fs/cases/fs_poll_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_poll_test.c
@@ -58,20 +58,15 @@ void test_nuttx_fs_poll01(FAR void **state)
   int poll01_fd2;
   int poll01_ret;
   struct pollfd poll01_fds[5];
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   poll01_fd1 = open(I_FILE1, O_RDONLY | O_CREAT);
   assert_true(poll01_fd1 >= 0);
-  test_state->fd1 = poll01_fd1;
 
   poll01_fds[0].fd = poll01_fd1;
   poll01_fds[0].events = POLLOUT;
 
   poll01_fd2 = open(I_FILE2, O_RDWR | O_CREAT);
   assert_true(poll01_fd2 >= 0);
-  test_state->fd2 = poll01_fd2;
 
   poll01_fds[1].fd = poll01_fd2;
   poll01_fds[1].events = POLLIN;
diff --git a/testing/testsuites/kernel/fs/cases/fs_readdir_test.c b/testing/testsuites/kernel/fs/cases/fs_readdir_test.c
index c5a259c5f..864f4ded0 100644
--- a/testing/testsuites/kernel/fs/cases/fs_readdir_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_readdir_test.c
@@ -65,9 +65,6 @@ void test_nuttx_fs_readdir01(FAR void **state)
 
   DIR *test_dir;
   struct dirent *dptr;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   for (int i = 0; i < 6; i++)
     {
@@ -75,7 +72,6 @@ void test_nuttx_fs_readdir01(FAR void **state)
 
       fd = open(filename[i], O_RDWR | O_CREAT, 0700);
       assert_true(fd > 0);
-      test_state->fd1 = fd;
 
       /* do wirte */
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_seek_test.c b/testing/testsuites/kernel/fs/cases/fs_seek_test.c
index e206e5e0d..3a9206c37 100644
--- a/testing/testsuites/kernel/fs/cases/fs_seek_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_seek_test.c
@@ -57,15 +57,11 @@ void test_nuttx_fs_seek01(FAR void **state)
   char c[] = "This is fseek test !";
   char buffer[sizeof(c)];
   int ret;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
   fp = fopen(TESTFILE, "w+");
   assert_non_null(fp);
-  test_state->fd1 = fileno(fp);
 
   /* do fwrite */
 
@@ -251,11 +247,8 @@ static void test_nuttx_fs_clean(void)
 void test_nuttx_fs_seek02(FAR void **state)
 {
   int ret;
-  struct fs_testsuites_state_s *test_state;
 
-  test_state = (struct fs_testsuites_state_s *)*state;
   test_nuttx_fs_set();
-  test_state->fd1 = fd;
 
   /* do verify lseek */
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_truncate_test.c b/testing/testsuites/kernel/fs/cases/fs_truncate_test.c
index ca2cef0bb..84e948bd5 100644
--- a/testing/testsuites/kernel/fs/cases/fs_truncate_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_truncate_test.c
@@ -59,9 +59,6 @@ void test_nuttx_fs_truncate01(FAR void **state)
   char buf[80];
   const char *s1 = "0123456789";
   const char *s2 = "abcde";
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
@@ -71,7 +68,6 @@ void test_nuttx_fs_truncate01(FAR void **state)
 #else
   assert_int_in_range(fd, 0, 512);
 #endif
-  test_state->fd1 = fd;
 
   /* do write */
 
@@ -104,7 +100,6 @@ void test_nuttx_fs_truncate01(FAR void **state)
 
   fd = open(TESTFILE, O_RDONLY);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* read file */
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_unlink_test.c b/testing/testsuites/kernel/fs/cases/fs_unlink_test.c
index 7d52eb425..d07c84b36 100644
--- a/testing/testsuites/kernel/fs/cases/fs_unlink_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_unlink_test.c
@@ -58,15 +58,10 @@
 
 void test_nuttx_fs_unlink01(FAR void **state)
 {
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
-
   /* open file */
 
   int fd = open(test_file, O_RDWR | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   char buf[MAXSIZE] =
   {
diff --git a/testing/testsuites/kernel/fs/cases/fs_write_test.c b/testing/testsuites/kernel/fs/cases/fs_write_test.c
index 75bbc96ef..5318acbe2 100644
--- a/testing/testsuites/kernel/fs/cases/fs_write_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_write_test.c
@@ -97,15 +97,11 @@ void test_nuttx_fs_write02(FAR void **state)
   FILE *fp;
   long offset;
   char content[15] = "asdfgtgtrf";
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* fopen file */
 
   fp = fopen(TESTFILENAME, "a+");
   assert_non_null(fp);
-  test_state->fd1 = fileno(fp);
 
   /* do fwrite */
 
@@ -147,15 +143,11 @@ void test_nuttx_fs_write03(FAR void **state)
   FILE *fp;
   long offset;
   char content[15] = "asdfgtgtrf";
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* fopen file */
 
   fp = fopen(TESTFILENAME3, "a+");
   assert_non_null(fp);
-  test_state->fd1 = fileno(fp);
 
   /* do fwrite */
 

From 9c022949e48503d840964a659458379c8436eb44 Mon Sep 17 00:00:00 2001
From: wangxingxing <wangxingxing@xiaomi.com>
Date: Fri, 23 Jan 2026 19:22:09 +0800
Subject: [PATCH 187/568] fs/test:Fix formatting check issues

fix the typo error of fs cases

Signed-off-by: wangxingxing <wangxingxing@xiaomi.com>
---
 testing/testsuites/kernel/fs/cases/fs_fsync_test.c |  6 +++---
 .../testsuites/kernel/fs/cases/fs_readdir_test.c   |  2 +-
 .../testsuites/kernel/fs/cases/fs_rename_test.c    |  2 +-
 .../testsuites/kernel/fs/cases/fs_stream_test.c    | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing/testsuites/kernel/fs/cases/fs_fsync_test.c b/testing/testsuites/kernel/fs/cases/fs_fsync_test.c
index 10c57becc..f69c50a87 100644
--- a/testing/testsuites/kernel/fs/cases/fs_fsync_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_fsync_test.c
@@ -102,7 +102,7 @@ void test_nuttx_fs_fsync02(FAR void **state)
   int ret;
   char *buf = NULL;
   int bufsize = 4096;
-  ssize_t writen = 0;
+  ssize_t written = 0;
   struct statfs statfsbuf;
   struct fs_testsuites_state_s *test_state;
   struct mallinfo mem_info;
@@ -154,8 +154,8 @@ void test_nuttx_fs_fsync02(FAR void **state)
 
   /* do write */
 
-  writen = write(fd, buf, bufsize);
-  assert_int_in_range(writen, 1, bufsize);
+  written = write(fd, buf, bufsize);
+  assert_int_in_range(written, 1, bufsize);
 
   /* refresh to storage */
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_readdir_test.c b/testing/testsuites/kernel/fs/cases/fs_readdir_test.c
index 864f4ded0..8e821f3a1 100644
--- a/testing/testsuites/kernel/fs/cases/fs_readdir_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_readdir_test.c
@@ -73,7 +73,7 @@ void test_nuttx_fs_readdir01(FAR void **state)
       fd = open(filename[i], O_RDWR | O_CREAT, 0700);
       assert_true(fd > 0);
 
-      /* do wirte */
+      /* do write */
 
       ret = write(fd, "hello!\n", 6);
       assert_uint_in_range(ret, 1, 6);
diff --git a/testing/testsuites/kernel/fs/cases/fs_rename_test.c b/testing/testsuites/kernel/fs/cases/fs_rename_test.c
index 36d1d5aba..b76fe2be9 100644
--- a/testing/testsuites/kernel/fs/cases/fs_rename_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_rename_test.c
@@ -67,7 +67,7 @@ void test_nuttx_fs_rename01(FAR void **state)
   ret = write(fd, buffer, 50);
   assert_int_in_range(ret, 1, 50);
 
-  /* close file befor rename */
+  /* close file before rename */
 
   close(fd);
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_stream_test.c b/testing/testsuites/kernel/fs/cases/fs_stream_test.c
index 2f7f1670f..dfc83ea93 100644
--- a/testing/testsuites/kernel/fs/cases/fs_stream_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_stream_test.c
@@ -130,7 +130,7 @@ void test_nuttx_fs_stream02(FAR void **state)
       pos = ftell(stream);
       if (pos != 0)
         {
-          syslog(LOG_ERR, "file pointer descrepancy 1, errno %d\n",
+          syslog(LOG_ERR, "file pointer discrepancy 1, errno %d\n",
                  errno);
           fclose(stream);
           assert_true(1 == 0);
@@ -148,7 +148,7 @@ void test_nuttx_fs_stream02(FAR void **state)
         {
           syslog(
               LOG_ERR,
-              "strlen(junk)=%zi: file pointer descrepancy 2 (pos=%li)",
+              "strlen(junk)=%zi: file pointer discrepancy 2 (pos=%li)",
               strlen(junk), pos);
           fclose(stream);
           assert_true(1 == 0);
@@ -161,7 +161,7 @@ void test_nuttx_fs_stream02(FAR void **state)
         {
           fclose(stream);
           syslog(LOG_ERR,
-                 "file pointer descrepancy 3 (pos=%li, wanted pos=0)",
+                 "file pointer discrepancy 3 (pos=%li, wanted pos=0)",
                  pos);
           assert_true(1 == 0);
         }
@@ -179,7 +179,7 @@ void test_nuttx_fs_stream02(FAR void **state)
           fclose(stream);
           syslog(
               LOG_ERR,
-              "strlen(junk)=%zi: file pointer descrepancy 4 (pos=%li)",
+              "strlen(junk)=%zi: file pointer discrepancy 4 (pos=%li)",
               strlen(junk), pos);
           assert_true(1 == 0);
         }
@@ -197,7 +197,7 @@ void test_nuttx_fs_stream02(FAR void **state)
           fclose(stream);
           syslog(
               LOG_ERR,
-              "strlen(junk)=%zi: file pointer descrepancy 5 (pos=%li)",
+              "strlen(junk)=%zi: file pointer discrepancy 5 (pos=%li)",
               strlen(junk), pos);
           assert_true(1 == 0);
         }
@@ -214,7 +214,7 @@ void test_nuttx_fs_stream02(FAR void **state)
         {
           fclose(stream);
           syslog(LOG_ERR,
-                 "file pointer descrepancy 6 (pos=%li, wanted pos=0)",
+                 "file pointer discrepancy 6 (pos=%li, wanted pos=0)",
                  pos);
           assert_true(1 == 0);
         }
@@ -226,7 +226,7 @@ void test_nuttx_fs_stream02(FAR void **state)
         {
           syslog(
               LOG_ERR,
-              "strlen(junk)=%zi: file pointer descrepancy 7 (pos=%li)",
+              "strlen(junk)=%zi: file pointer discrepancy 7 (pos=%li)",
               strlen(junk), pos);
           assert_true(1 == 0);
         }

From 80c2b43197dd4b4be088519f3287377c51d56384 Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Mon, 26 Jan 2026 19:52:18 +0800
Subject: [PATCH 188/568] testing/ostest: fix uninitialized variable warning in
 wdog test

Initialize the flags variable to 0 to fix compiler warning about
potential use of uninitialized variable. The flags variable is
conditionally assigned in wdtest_rand() based on callback count.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 testing/ostest/wdog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/ostest/wdog.c b/testing/ostest/wdog.c
index c00a7f9b6..273a680e9 100644
--- a/testing/ostest/wdog.c
+++ b/testing/ostest/wdog.c
@@ -147,7 +147,7 @@ static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
   clock_t    wdset_tick;
   sclock_t   delay_tick;
   sclock_t   diff;
-  irqstate_t flags;
+  irqstate_t flags = 0;
 
   /* Perform multiple iterations with random delays. */
 

From 35f3690a4c46ed8e81312d7211652bd5358a57c9 Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Tue, 16 Dec 2025 23:09:50 +0800
Subject: [PATCH 189/568] nshlib: Add stderr redirection support

This commit implements stderr redirection in HSN, support
Bash-like syntax for redirecting standard error output.
Support both foreground and background commands.

example:
- nsh> ls noexists 2> err.log
- nsh> ls noexists 2> err.log &
- nsh> ls noexists 2>> err.log
- nsh> sh < /dev/ttyS0 > /dev/ttyS0 2> /dev/ttyS1 &
- nsh> sh < /dev/ttyS0 > /dev/ttyS0 2>&1 &

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 include/nshlib/nshlib.h |  11 ++--
 nshlib/nsh.h            |   1 +
 nshlib/nsh_console.c    |   5 +-
 nshlib/nsh_console.h    |  20 +++----
 nshlib/nsh_fileapps.c   |  33 +++++++++++
 nshlib/nsh_parse.c      | 119 ++++++++++++++++++++++++++++++++++++++--
 nshlib/nsh_script.c     |   2 +-
 7 files changed, 168 insertions(+), 23 deletions(-)

diff --git a/include/nshlib/nshlib.h b/include/nshlib/nshlib.h
index f9565894a..f2153fed0 100644
--- a/include/nshlib/nshlib.h
+++ b/include/nshlib/nshlib.h
@@ -69,21 +69,24 @@
 
 struct nsh_param_s
 {
-  /* Redirect input/output through `fd` OR `path_name`
+  /* Redirect input/output/error through `fd` OR `path_name`
    *
    * Select one:
-   * 1. Using fd_in/fd_out as oldfd for dup2() if greater than -1.
-   * 2. Using file_in/file_out as full path to the file if it is
-   *    not NULL, and oflags_in/oflags_out as flags for open().
+   * 1. Using fd_in/fd_out/fd_err as oldfd for dup2() if greater than -1.
+   * 2. Using file_in/file_out/file_err as full path to the file if it is
+   *    not NULL, and oflags_in/oflags_out/oflags_err as flags for open().
    */
 
   int fd_in;
   int fd_out;
+  int fd_err;
 
   int oflags_in;
   int oflags_out;
+  int oflags_err;
   FAR const char *file_in;
   FAR const char *file_out;
+  FAR const char *file_err;
 };
 
 /****************************************************************************
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 74f4032cc..8ea334d07 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -655,6 +655,7 @@ struct nsh_parser_s
 #endif
   bool     np_redir_out; /* true: Output from the last command was re-directed */
   bool     np_redir_in;  /* true: Input from the last command was re-directed */
+  bool     np_redir_err; /* true: Error from the last command was re-directed */
   bool     np_fail;      /* true: The last command failed */
   pid_t    np_lastpid;   /* Pid of the last command executed */
 #ifdef NSH_HAVE_VARS
diff --git a/nshlib/nsh_console.c b/nshlib/nsh_console.c
index 2d8c315ad..cb95e0342 100644
--- a/nshlib/nsh_console.c
+++ b/nshlib/nsh_console.c
@@ -76,7 +76,7 @@ static int nsh_erroroutput(FAR struct nsh_vtbl_s *vtbl,
 #endif
 static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
 static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd_in,
-                                int fd_out, FAR uint8_t *save);
+                                int fd_out, int fd_err, FAR uint8_t *save);
 static void nsh_consoleundirect(FAR struct nsh_vtbl_s *vtbl,
                                 FAR uint8_t *save);
 static void nsh_consoleexit(FAR struct nsh_vtbl_s *vtbl,
@@ -332,7 +332,7 @@ static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl)
  ****************************************************************************/
 
 static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd_in,
-                                int fd_out, FAR uint8_t *save)
+                                int fd_out, int fd_err, FAR uint8_t *save)
 {
   FAR struct console_stdio_s *pstate = (FAR struct console_stdio_s *)vtbl;
   FAR struct serialsave_s *ssave  = (FAR struct serialsave_s *)save;
@@ -354,6 +354,7 @@ static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd_in,
 
   OUTFD(pstate) = fd_out;
   INFD(pstate) = fd_in;
+  ERRFD(pstate) = fd_err;
 }
 
 /****************************************************************************
diff --git a/nshlib/nsh_console.h b/nshlib/nsh_console.h
index 0b94a2b6b..268d03379 100644
--- a/nshlib/nsh_console.h
+++ b/nshlib/nsh_console.h
@@ -43,15 +43,15 @@
 
 /* Method access macros */
 
-#define nsh_clone(v)            (v)->clone(v)
-#define nsh_release(v)          (v)->release(v)
-#define nsh_write(v,b,n)        (v)->write(v,b,n)
-#define nsh_read(v,b,n)         (v)->read(v,b,n)
-#define nsh_ioctl(v,c,a)        (v)->ioctl(v,c,a)
-#define nsh_linebuffer(v)       (v)->linebuffer(v)
-#define nsh_redirect(v,fi,fo,s) (v)->redirect(v,fi,fo,s)
-#define nsh_undirect(v,s)       (v)->undirect(v,s)
-#define nsh_exit(v,s)           (v)->exit(v,s)
+#define nsh_clone(v)               (v)->clone(v)
+#define nsh_release(v)             (v)->release(v)
+#define nsh_write(v,b,n)           (v)->write(v,b,n)
+#define nsh_read(v,b,n)            (v)->read(v,b,n)
+#define nsh_ioctl(v,c,a)           (v)->ioctl(v,c,a)
+#define nsh_linebuffer(v)          (v)->linebuffer(v)
+#define nsh_redirect(v,fi,fo,fe,s) (v)->redirect(v,fi,fo,fe,s)
+#define nsh_undirect(v,s)          (v)->undirect(v,s)
+#define nsh_exit(v,s)              (v)->exit(v,s)
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  define nsh_error(v, ...)     (v)->error(v, ##__VA_ARGS__)
@@ -127,7 +127,7 @@ struct nsh_vtbl_s
       printf_like(2, 3);
   FAR char *(*linebuffer)(FAR struct nsh_vtbl_s *vtbl);
   void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd_in, int fd_out,
-                   FAR uint8_t *save);
+                   int fd_err, FAR uint8_t *save);
   void (*undirect)(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save);
   void (*exit)(FAR struct nsh_vtbl_s *vtbl, int status) noreturn_function;
 
diff --git a/nshlib/nsh_fileapps.c b/nshlib/nsh_fileapps.c
index 54efd6de2..66f41e36f 100644
--- a/nshlib/nsh_fileapps.c
+++ b/nshlib/nsh_fileapps.c
@@ -177,6 +177,39 @@ int nsh_fileapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
             }
         }
 #endif
+
+      /* Handle redirection of error output */
+
+      if (param->file_err)
+        {
+          /* 2> file: Redirect stderr to a file */
+
+          ret = posix_spawn_file_actions_addopen(&file_actions, 2,
+                                                  param->file_err,
+                                                  param->oflags_err,
+                                                  0644);
+          if (ret != 0)
+            {
+              nsh_error(vtbl, g_fmtcmdfailed, cmd,
+                        "posix_spawn_file_actions_addopen",
+                        NSH_ERRNO);
+              goto errout_with_attrs;
+            }
+        }
+      else if (param->fd_err != -1)
+        {
+          /* 2>&1: Redirect stderr to stdout */
+
+          ret = posix_spawn_file_actions_adddup2(&file_actions,
+                                                 param->fd_err, 2);
+          if (ret != 0)
+            {
+              nsh_error(vtbl, g_fmtcmdfailed, cmd,
+                        "posix_spawn_file_actions_adddup2",
+                        NSH_ERRNO);
+              goto errout_with_attrs;
+            }
+        }
     }
 
 #ifdef CONFIG_BUILTIN
diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
index 9b1bde875..9a67cc845 100644
--- a/nshlib/nsh_parse.c
+++ b/nshlib/nsh_parse.c
@@ -264,6 +264,12 @@ static const char   g_redirect_out2[]   = ">>";
 static const size_t g_redirect_out2_len = sizeof(g_redirect_out2) - 1;
 static const char   g_redirect_in1[]    = "<";
 static const size_t g_redirect_in1_len  = sizeof(g_redirect_in1) - 1;
+static const char   g_redirect_err1[]   = "2>";
+static const size_t g_redirect_err1_len = sizeof(g_redirect_err1) - 1;
+static const char   g_redirect_err2[]   = "2>>";
+static const size_t g_redirect_err2_len = sizeof(g_redirect_err2) - 1;
+static const char   g_redirect_err3[]   = "2>&1";
+static const size_t g_redirect_err3_len = sizeof(g_redirect_err3) - 1;
 #ifdef CONFIG_NSH_PIPELINE
 static const char   g_pipeline1[]       = "|";
 static const size_t g_pipeline1_len     = sizeof(g_pipeline1) - 1;
@@ -503,6 +509,7 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl,
                        FAR const struct nsh_param_s *param)
 {
   int fd_out = STDOUT_FILENO;
+  int fd_err = STDERR_FILENO;
   int fd_in = STDIN_FILENO;
   int ret;
 
@@ -703,11 +710,36 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl,
             }
         }
 
-      /* Handle redirection of stdin/stdout file descriptor */
+      /* Redirected error output? */
 
-      if (vtbl->np.np_redir_out || vtbl->np.np_redir_in)
+      if (vtbl->np.np_redir_err)
         {
-          nsh_redirect(vtbl, fd_in, fd_out, save);
+          if (param->file_err)
+            {
+              /* 2> file: Open the redirection file for stderr */
+
+              fd_err = open(param->file_err, param->oflags_err, 0666);
+              if (fd_err < 0)
+                {
+                  nsh_error(vtbl, g_fmtcmdfailed, argv[0], "open",
+                            NSH_ERRNO);
+                  return nsh_saveresult(vtbl, true);
+                }
+            }
+          else
+            {
+              /* 2>&1: redirect stderr to current stdout fd */
+
+              fd_err = fd_out;
+            }
+        }
+
+      /* Handle redirection of stdin/stdout/stderr file descriptor */
+
+      if (vtbl->np.np_redir_out || vtbl->np.np_redir_in ||
+          vtbl->np.np_redir_err)
+        {
+          nsh_redirect(vtbl, fd_in, fd_out, fd_err, save);
         }
 
       /* Then execute the command in "foreground" -- i.e., while the user
@@ -723,7 +755,8 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl,
        * file descriptor.
        */
 
-      if (vtbl->np.np_redir_out || vtbl->np.np_redir_in)
+      if (vtbl->np.np_redir_out || vtbl->np.np_redir_in ||
+          vtbl->np.np_redir_err)
         {
           nsh_undirect(vtbl, save);
           fd_out = -1;
@@ -885,10 +918,13 @@ static FAR char *nsh_cmdparm(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline,
     {
       .fd_in      = -1,
       .fd_out     = -1,
+      .fd_err     = -1,
       .oflags_in  = 0,
       .oflags_out = O_WRONLY | O_CREAT | O_TRUNC,
+      .oflags_err = O_WRONLY | O_CREAT | O_TRUNC,
       .file_in    = NULL,
-      .file_out   = NULL
+      .file_out   = NULL,
+      .file_err   = NULL
     };
 
   FAR char *tmpfile;
@@ -2447,10 +2483,13 @@ static int nsh_parse_command(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline)
     {
       .fd_in      = -1,
       .fd_out     = -1,
+      .fd_err     = -1,
       .oflags_in  = 0,
       .oflags_out = 0,
+      .oflags_err = 0,
       .file_in    = NULL,
-      .file_out   = NULL
+      .file_out   = NULL,
+      .file_err   = NULL
     };
 
 #ifdef CONFIG_NSH_PIPELINE
@@ -2469,6 +2508,7 @@ static int nsh_parse_command(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline)
   int       ret;
   bool      redirect_out_save = false;
   bool      redirect_in_save = false;
+  bool      redirect_err_save = false;
 #ifdef CONFIG_NSH_PIPELINE
   bool      bg_save = false;
 #endif
@@ -2492,6 +2532,7 @@ static int nsh_parse_command(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline)
 
   vtbl->np.np_redir_out = false;
   vtbl->np.np_redir_in = false;
+  vtbl->np.np_redir_err = false;
 
   /* Parse out the command at the beginning of the line */
 
@@ -2692,6 +2733,60 @@ static int nsh_parse_command(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline)
           param.oflags_in       = O_RDONLY;
           param.file_in         = nsh_getfullpath(vtbl, arg);
         }
+      else if (!strncmp(argv[argc], g_redirect_err3, g_redirect_err3_len))
+        {
+          redirect_err_save     = vtbl->np.np_redir_err;
+          vtbl->np.np_redir_err = true;
+          param.fd_err          = STDOUT_FILENO;
+        }
+      else if (!strncmp(argv[argc], g_redirect_err2, g_redirect_err2_len))
+        {
+          FAR char *arg;
+          if (argv[argc][g_redirect_err2_len])
+            {
+              arg = &argv[argc][g_redirect_err2_len];
+            }
+          else
+            {
+              arg = nsh_argument(vtbl, &saveptr, &memlist, NULL, &isenvvar);
+            }
+
+          if (!arg)
+            {
+              nsh_error(vtbl, g_fmtarginvalid, cmd);
+              ret = ERROR;
+              goto dynlist_free;
+            }
+
+          redirect_err_save     = vtbl->np.np_redir_err;
+          vtbl->np.np_redir_err = true;
+          param.oflags_err      = O_WRONLY | O_CREAT | O_APPEND;
+          param.file_err        = nsh_getfullpath(vtbl, arg);
+        }
+      else if (!strncmp(argv[argc], g_redirect_err1, g_redirect_err1_len))
+        {
+          FAR char *arg;
+          if (argv[argc][g_redirect_err1_len])
+            {
+              arg = &argv[argc][g_redirect_err1_len];
+            }
+          else
+            {
+              arg = nsh_argument(vtbl, &saveptr, &memlist, NULL, &isenvvar);
+            }
+
+          if (!arg)
+            {
+              nsh_error(vtbl, g_fmtarginvalid, cmd);
+              ret = ERROR;
+              goto dynlist_free;
+            }
+
+          redirect_err_save     = vtbl->np.np_redir_err;
+          vtbl->np.np_redir_err = true;
+          param.oflags_err      = O_WRONLY | O_CREAT | O_TRUNC;
+          param.file_err        = nsh_getfullpath(vtbl, arg);
+        }
 #ifdef CONFIG_NSH_PIPELINE
       else if (!strncmp(argv[argc], g_pipeline1, g_pipeline1_len))
         {
@@ -2848,6 +2943,18 @@ dynlist_free:
     }
 #endif
 
+  /* Free the redirected error file path and restore state */
+
+  if (param.file_err)
+    {
+      nsh_freefullpath((char *)param.file_err);
+    }
+
+  if (vtbl->np.np_redir_err)
+    {
+      vtbl->np.np_redir_err = redirect_err_save;
+    }
+
   NSH_ALIASLIST_FREE(vtbl, &alist);
   NSH_MEMLIST_FREE(&memlist);
 #ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
diff --git a/nshlib/nsh_script.c b/nshlib/nsh_script.c
index a0db4d6d0..21bef19e4 100644
--- a/nshlib/nsh_script.c
+++ b/nshlib/nsh_script.c
@@ -64,7 +64,7 @@ static int nsh_script_redirect(FAR struct nsh_vtbl_s *vtbl,
       fd = open(CONFIG_NSH_SCRIPT_REDIRECT_PATH, 0666);
       if (fd > 0)
         {
-          nsh_redirect(vtbl, 0, fd, save);
+          nsh_redirect(vtbl, 0, fd, fd, save);
         }
     }
 

From 8aa48c4fb6a691a321bd167892c79a844ec52cf1 Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Tue, 27 Jan 2026 14:14:26 +0800
Subject: [PATCH 190/568] examples: foc: Add critical section protection to FOC
 control loop

Introduce CONFIG_EXAMPLES_FOC_CONTROL_CRITSEC configuration option to enable
critical section protection in the FOC (Field-Oriented Control) motor control
examples. This adds irq-safe critical sections around the main control loop
processing to prevent race conditions and ensure atomic updates of motor
control state and parameters during interrupt handling.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 examples/foc/foc_fixed16_thr.c | 2 ++
 examples/foc/foc_float_thr.c   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/examples/foc/foc_fixed16_thr.c b/examples/foc/foc_fixed16_thr.c
index 2ba2998e6..3c9a8c77b 100644
--- a/examples/foc/foc_fixed16_thr.c
+++ b/examples/foc/foc_fixed16_thr.c
@@ -26,6 +26,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/spinlock.h>
+
 #include <assert.h>
 #include <dspb16.h>
 #include <fcntl.h>
diff --git a/examples/foc/foc_float_thr.c b/examples/foc/foc_float_thr.c
index af967f255..4c52b86bf 100644
--- a/examples/foc/foc_float_thr.c
+++ b/examples/foc/foc_float_thr.c
@@ -26,6 +26,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/spinlock.h>
+
 #include <assert.h>
 #include <dsp.h>
 #include <fcntl.h>

From 0faaed99a501bf6ba2cf54a339fd13ea48167def Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 22 Apr 2025 16:14:10 +0800
Subject: [PATCH 191/568] testing/drivertest: Fix timing issues on QEMU and
 sims.

Since sim and qemu are not cycle accurate simulators, if the vCPU thread is preempted by other high priority tasks, it may cause timing issues. This is easy to happen when the test machine is busy. This commit modifies the condition of timing error and prints out the latency as a warning.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index 00b7fb203..d2855dfb4 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -41,7 +41,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define RTC_DEFAULT_DEVIATION 10
+#define RTC_DEFAULT_DEVIATION 100
 #define DEFAULT_TIME_OUT      2
 #define SLEEPSECONDS          10
 
@@ -159,6 +159,8 @@ static void posix_timer_callback(union sigval arg)
                       (FAR struct posix_timer_state_s *)arg.sival_ptr;
   int range = get_timestamp() - (*sigev_para).tim;
 
+  syslog(0, "range: %d ms\n", range);
+
   assert_in_range(range,
           sigev_para->it.it_interval.tv_sec * 1000 - sigev_para->deviation,
           sigev_para->it.it_interval.tv_sec * 1000 + sigev_para->deviation);

From a4b43521f40ef60abaaaca393f4a064b91002b22 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 10 Jul 2025 11:05:42 +0800
Subject: [PATCH 192/568] testing/drivers: Fix posix timer assertions.

On QEMU, if vcpus are preempted by other threads, the deviation of the
timer might be very large, causing assertion failure. This commit
addressed the problem.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index d2855dfb4..0870484cf 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -161,9 +161,7 @@ static void posix_timer_callback(union sigval arg)
 
   syslog(0, "range: %d ms\n", range);
 
-  assert_in_range(range,
-          sigev_para->it.it_interval.tv_sec * 1000 - sigev_para->deviation,
-          sigev_para->it.it_interval.tv_sec * 1000 + sigev_para->deviation);
+  assert(range >= sigev_para->it.it_interval.tv_sec * 1000);
 
   syslog(LOG_DEBUG, "callback trigger!!!\n");
   (*sigev_para).tim = get_timestamp();

From 01e5e50619f53158f7d12a3f0eb2866944306c40 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 24 Jul 2025 20:31:32 +0800
Subject: [PATCH 193/568] testing/time: Relax the timing constraints.

On SIM and QEMU, it is inevitable that the simulating vCPU got preempted
by other threads, causing large timing delay. This commit relax the timing
constraints to reduce the CT error.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/testsuites/kernel/time/cases/clock_test_timer03.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/testsuites/kernel/time/cases/clock_test_timer03.c b/testing/testsuites/kernel/time/cases/clock_test_timer03.c
index 7539f4479..76a42c760 100644
--- a/testing/testsuites/kernel/time/cases/clock_test_timer03.c
+++ b/testing/testsuites/kernel/time/cases/clock_test_timer03.c
@@ -123,7 +123,7 @@ void test_nuttx_clock_test_timer03(FAR void **state)
                 start.tv_sec * (int64_t)(1e9) - start.tv_nsec;
 
       failed += (escaped < expected ||
-                 (escaped - expected) >= 20000000); /* 20000000, 2 ticks. */
+                 (escaped - expected) > 100000000ul); /* 100 ms */
       syslog(LOG_INFO, "expected = %" PRId64 " escaped = %" PRId64
              "failed = %d", expected, escaped, failed);
     }

From ae7a0d81e9f4e1804b11116ea05adab73e5118bd Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 10 Jul 2025 11:05:42 +0800
Subject: [PATCH 194/568] testing/drivers: Fix posix timer assertions.

On QEMU, if vcpus are preempted by other threads, the deviation of the
timer might be very large, causing assertion failure. This commit
addressed the problem.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index 0870484cf..a9db327b8 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -161,7 +161,8 @@ static void posix_timer_callback(union sigval arg)
 
   syslog(0, "range: %d ms\n", range);
 
-  assert(range >= sigev_para->it.it_interval.tv_sec * 1000);
+  assert(range >= sigev_para->it.it_interval.tv_sec * 1000 -
+                  sigev_para->deviation);
 
   syslog(LOG_DEBUG, "callback trigger!!!\n");
   (*sigev_para).tim = get_timestamp();

From a16c5451343528e6633be08088ea5170461a8e66 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Mon, 28 Jul 2025 14:12:18 +0800
Subject: [PATCH 195/568] testing/drivers: Fixed the wrong test-case.

This commit fixed the wrong-test case where the time is acquired after
the timer being set, leading to the assertion failure.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index a9db327b8..469ecc198 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -196,11 +196,11 @@ static void drivertest_posix_timer(FAR void **state)
 
   /* Start the timer */
 
+  posix_timer_state->tim = get_timestamp();
+
   ret = timer_settime(timerid, 0, &(posix_timer_state->it), NULL);
   assert_return_code(ret, OK);
 
-  posix_timer_state->tim = get_timestamp();
-
   /* Get the timer status */
 
   ret = timer_gettime(timerid, &it);

From e0e9f3d7e564d3c746a1d9409869d46c0bafb88f Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 31 Dec 2024 09:45:44 +0800
Subject: [PATCH 196/568] apps/testing: Fix Coverity.

This commit is to make Coverity happy.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/sched/timerjitter/timerjitter.c | 29 +++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index 214bbf735..3a73ee298 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -137,12 +137,15 @@ static FAR void *timerjitter(FAR void *arg)
   struct timespec   next;
   struct timespec   intv;
   struct itimerspec tspec;
-  struct sigevent   sigev;
   sigset_t          sigset;
   timer_t           timer;
   int64_t           diff;
   int               sigs;
   int               ret;
+  struct sigevent   sigev =
+  {
+    0
+  };
 
   sigemptyset(&sigset);
   sigaddset(&sigset, SIGALRM);
@@ -154,8 +157,20 @@ static FAR void *timerjitter(FAR void *arg)
   sigev.sigev_notify = SIGEV_SIGNAL;
   sigev.sigev_signo  = SIGALRM;
 
-  timer_create(param->clockid, &sigev, &timer);
-  clock_gettime(param->clockid, &now);
+  ret = timer_create(param->clockid, &sigev, &timer);
+
+  if (ret != 0)
+    {
+      printf("timer_create failed %d\n", ret);
+      return NULL;
+    }
+
+  ret = clock_gettime(param->clockid, &now);
+
+  if (ret)
+    {
+      printf("clock_gettime failed %d\n", ret);
+    }
 
   next = now;
   calc_next(&next, &intv);
@@ -167,7 +182,13 @@ static FAR void *timerjitter(FAR void *arg)
   /* Using TIMER_ABSTIME */
 
   tspec.it_value = next;
-  timer_settime(timer, TIMER_ABSTIME, &tspec, NULL);
+  ret = timer_settime(timer, TIMER_ABSTIME, &tspec, NULL);
+
+  if (ret)
+    {
+      printf("timer_settime failed %d\n", ret);
+      return NULL;
+    }
 
   param->avg = 0;
   param->max = 0;

From f687088453a5b670509939bcb74d556ef6e31afb Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Fri, 21 Feb 2025 10:57:37 +0800
Subject: [PATCH 197/568] apps/testing: Fix timerjitter interval

This commit increased the default interval of the timerjitter to avoid errors with large USEC_PER_TICK setting.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/sched/timerjitter/timerjitter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index 3a73ee298..56697b2bc 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 #define DEFAULT_CLOCKID   CLOCK_REALTIME
-#define DEFAULT_INTERVAL  1000
+#define DEFAULT_INTERVAL  1000 * USEC_PER_TICK
 #define DEFAULT_ITERATION 1000
 
 /* Fix compilation error for Non-NuttX OS */

From 429a65901f86c6ec5062d79250cdd87b9fe90ea3 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Mon, 24 Feb 2025 09:51:38 +0800
Subject: [PATCH 198/568] apps/testing: Fix timerjitter iteration

This commit used the interval to calculate the timejitter iteration.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/sched/timerjitter/timerjitter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index 56697b2bc..01eed10d5 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -35,8 +35,8 @@
  ****************************************************************************/
 
 #define DEFAULT_CLOCKID   CLOCK_REALTIME
-#define DEFAULT_INTERVAL  1000 * USEC_PER_TICK
-#define DEFAULT_ITERATION 1000
+#define DEFAULT_INTERVAL  (1000 * USEC_PER_TICK)
+#define DEFAULT_ITERATION (USEC_PER_SEC / DEFAULT_INTERVAL)
 
 /* Fix compilation error for Non-NuttX OS */
 #ifndef FAR

From ce3e35233cf461de13af73be8bf28f370a7e6935 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 3 Apr 2025 14:13:40 +0800
Subject: [PATCH 199/568] benchmark/taclebench: Add clock measurement.

This commit added clock measurement for taclebench.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 ...dd-makefile-and-all-in-one-main-file.patch | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/benchmarks/tacle-bench/0001-tacle-bench-add-makefile-and-all-in-one-main-file.patch b/benchmarks/tacle-bench/0001-tacle-bench-add-makefile-and-all-in-one-main-file.patch
index 4958ac5a8..fb1e2e400 100644
--- a/benchmarks/tacle-bench/0001-tacle-bench-add-makefile-and-all-in-one-main-file.patch
+++ b/benchmarks/tacle-bench/0001-tacle-bench-add-makefile-and-all-in-one-main-file.patch
@@ -1,10 +1,11 @@
-From 71f51cd5ca4f492a464fb12d5bce91e5fbba300a Mon Sep 17 00:00:00 2001
+From 6d0be04a4b4208447e75c369e9811d089f466739 Mon Sep 17 00:00:00 2001
 From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
-Date: Tue, 11 Jun 2024 16:01:23 +0800
+Date: Thu, 3 Apr 2025 11:59:02 +0800
 Subject: [PATCH] tacle-bench: add makefile and all-in-one main file
 
 The original taclebench is used for WCET analysis. This commit allows most taclebench test cases (except parallel test cases) to be compiled and executed.
 
+Change-Id: I707b8ac58d3ddc4b7974c5bedecac1a7b5c887f9
 Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
 ---
  Makefile                                      |  12 +
@@ -65,14 +66,14 @@ Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
  bench/test/cover/cover.c                      |   3 +
  bench/test/duff/duff.c                        |   3 +
  bench/test/test3/test3.c                      |   3 +
- taclebench.c                                  | 349 ++++++++++++++++++
- 59 files changed, 532 insertions(+)
+ taclebench.c                                  | 366 ++++++++++++++++++
+ 59 files changed, 549 insertions(+)
  create mode 100644 Makefile
  create mode 100644 taclebench.c
 
 diff --git a/Makefile b/Makefile
 new file mode 100644
-index 0000000..2385c61
+index 0000000..75ca0a1
 --- /dev/null
 +++ b/Makefile
 @@ -0,0 +1,12 @@
@@ -83,7 +84,7 @@ index 0000000..2385c61
 +TEST_SRCS := $(shell find bench/test -name "*.c")
 +
 +all:
-+	cc -DALL_IN_ONE ${APP_SRCS} ${KERNEL_SRCS} ${SEQUENTIAL_SRCS} ${TEST_SRCS} bench/kernel/cosf/wcclibm.c taclebench.c -static -o taclebench
++	cc -DALL_IN_ONE ${APP_SRCS} ${KERNEL_SRCS} ${SEQUENTIAL_SRCS} ${TEST_SRCS} bench/kernel/cosf/wcclibm.c taclebench.c -static -o taclebench -O3
 +
 +clean:
 +	rm -f taclebench
@@ -888,11 +889,12 @@ index 0235738..6eaf8c2 100755
  
 diff --git a/taclebench.c b/taclebench.c
 new file mode 100644
-index 0000000..1231b87
+index 0000000..aaff1bb
 --- /dev/null
 +++ b/taclebench.c
-@@ -0,0 +1,349 @@
+@@ -0,0 +1,366 @@
 +#include <stdio.h>
++#include <time.h>
 +
 +int main_epic(void);
 +int main_mpeg2(void);
@@ -954,6 +956,10 @@ index 0000000..1231b87
 +
 +int main(void)
 +{
++  struct timespec start_ts;
++  struct timespec end_ts;
++  clock_gettime(CLOCK_MONOTONIC, &start_ts);
++
 +  if (main_epic() != 0)
 +    {
 +      printf("main_epic error\n");
@@ -1239,6 +1245,18 @@ index 0000000..1231b87
 +      printf("main_bitonic error\n");
 +    }
 +
++  clock_gettime(CLOCK_MONOTONIC, &end_ts);
++  long sec_diff = end_ts.tv_sec - start_ts.tv_sec;
++  long nsec_diff = end_ts.tv_nsec - start_ts.tv_nsec;
++
++  if (nsec_diff < 0)
++    {
++      sec_diff  -= 1;
++      nsec_diff += 1000000000;
++    }
++
++  printf("%ld.%09ld seconds\n", sec_diff, nsec_diff);
++
 +  return 0;
 +}
 -- 

From 69bfda87361700d774f7a69ddeddc7b9d35bf05f Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Wed, 16 Apr 2025 19:55:07 +0800
Subject: [PATCH 200/568] apps/ostest: Fix wqueue_test in flat mode.

This commit re-enabled wqueue_test in flat mode.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/ostest_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 6bf75d86f..4e2ca3484 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -381,7 +381,7 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
-#if !defined(CONFIG_DISABLE_PTHREAD) && defined(__KERNEL__) && \
+#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_BUILD_FLAT) && \
     defined(CONFIG_SCHED_WORKQUEUE)
       /* Check work queues */
 

From 62fe1a3ac504f1e2af410ebbde4c34bb5d5abf2d Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Mon, 26 May 2025 21:07:14 +0800
Subject: [PATCH 201/568] ostest/wdog: Fix a synchronizing bug.

If we updated `callback_cnt` before the `triggered_tick` in the wdog timer callback, the `wdtest_rand` might failed randomly. This commit fixed the synchronizing bug by swapping the execution order of updating.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/wdog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/ostest/wdog.c b/testing/ostest/wdog.c
index 273a680e9..e64f1246f 100644
--- a/testing/ostest/wdog.c
+++ b/testing/ostest/wdog.c
@@ -70,13 +70,13 @@ static void wdtest_callback(wdparm_t param)
 {
   FAR wdtest_param_t *wdtest_param = (FAR wdtest_param_t *)param;
 
-  /* Increment the callback count */
-
-  wdtest_param->callback_cnt   += 1;
-
   /* Record the system tick at which the callback was triggered */
 
   wdtest_param->triggered_tick  = clock_systime_ticks();
+
+  /* Increment the callback count */
+
+  wdtest_param->callback_cnt   += 1;
 }
 
 static void wdtest_checkdelay(sclock_t diff, sclock_t delay_tick)

From b9bf7f5c4fb7c0e2f789009b3123f7481b9378df Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 2 Sep 2025 10:50:17 +0800
Subject: [PATCH 202/568] testing/drivers: Change uint32_t time to uint64_t.

This commmit fixed the time multiplication overflow issue.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index 469ecc198..ccca6e1c2 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -64,7 +64,7 @@
 struct posix_timer_state_s
 {
   struct itimerspec it;
-  uint32_t tim;
+  uint64_t tim;
   uint32_t deviation;
 };
 
@@ -140,12 +140,12 @@ static void parse_commandline(
  * Name: get_timestamp
  ****************************************************************************/
 
-static uint32_t get_timestamp(void)
+static uint64_t get_timestamp(void)
 {
   struct timespec ts;
-  uint32_t ms;
+  uint64_t ms;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  ms = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+  ms = (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
   return ms;
 }
 

From 35cf746025fbd23f6367c0e8cb014bb110219b83 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 2 Sep 2025 11:06:03 +0800
Subject: [PATCH 203/568] testing/drivers: Fix wrong test-cases.

This commit fixed totally wrong test-cases for the periodical timers.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index ccca6e1c2..13eb4425a 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -65,6 +65,7 @@ struct posix_timer_state_s
 {
   struct itimerspec it;
   uint64_t tim;
+  uint32_t trigger_count;
   uint32_t deviation;
 };
 
@@ -157,15 +158,16 @@ static void posix_timer_callback(union sigval arg)
 {
   FAR struct posix_timer_state_s *sigev_para =
                       (FAR struct posix_timer_state_s *)arg.sival_ptr;
-  int range = get_timestamp() - (*sigev_para).tim;
+  uint64_t expected = (*sigev_para).tim +
+                      DEFAULT_TIME_OUT * (*sigev_para).trigger_count;
+  int range = get_timestamp() - expected;
 
   syslog(0, "range: %d ms\n", range);
 
-  assert(range >= sigev_para->it.it_interval.tv_sec * 1000 -
-                  sigev_para->deviation);
+  assert(range >= sigev_para->it.it_interval.tv_sec * 1000);
 
   syslog(LOG_DEBUG, "callback trigger!!!\n");
-  (*sigev_para).tim = get_timestamp();
+  (*sigev_para).trigger_count++;
 }
 
 /****************************************************************************
@@ -226,6 +228,7 @@ int main(int argc, FAR char *argv[])
     .it.it_value.tv_nsec    = 0,
     .it.it_interval.tv_sec  = DEFAULT_TIME_OUT,
     .it.it_interval.tv_nsec = 0,
+    .trigger_count          = 0,
     .deviation              = RTC_DEFAULT_DEVIATION
   };
 

From 1b8c90c12d3f59b839fcbb2a18e51c9f55a25e0c Mon Sep 17 00:00:00 2001
From: jiangtao16 <jiangtao16@xiaomi.com>
Date: Fri, 20 Jun 2025 16:41:02 +0800
Subject: [PATCH 204/568] ostest: Add spinlock/rspinlock.

This commit added spinlock/rspinlock test.

Signed-off-by: jiangtao16 <jiangtao16@xiaomi.com>
---
 testing/ostest/CMakeLists.txt |   2 +-
 testing/ostest/Kconfig        |   9 ++
 testing/ostest/Makefile       |   2 +-
 testing/ostest/ostest.h       |   4 +
 testing/ostest/ostest_main.c  |   4 +
 testing/ostest/spinlock.c     | 184 ++++++++++++++++++++++++++++++++++
 6 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 testing/ostest/spinlock.c

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 777c68744..35b0c5596 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -22,7 +22,7 @@
 
 if(CONFIG_TESTING_OSTEST)
 
-  set(SRCS getopt.c libc_memmem.c restart.c sighelper.c)
+  set(SRCS getopt.c libc_memmem.c restart.c sighelper.c spinlock.c)
 
   if(CONFIG_ENABLE_ALL_SIGNALS)
     list(APPEND SRCS sighand.c signest.c)
diff --git a/testing/ostest/Kconfig b/testing/ostest/Kconfig
index 83054fa68..100afb73e 100644
--- a/testing/ostest/Kconfig
+++ b/testing/ostest/Kconfig
@@ -115,4 +115,13 @@ config TESTING_OSTEST_POWEROFF
 	default n
 	depends on BOARDCTL_POWEROFF && TESTING_OSTEST_WAITRESULT
 
+config TESTING_OSTEST_SPINLOCK_THREADS
+	int "Number of spinlock test threads"
+	default 2
+	range 1 32
+
+config TEST_LOOP_SCALE
+	int "Loop scale of spinlock test (N x 10,000)"
+	default 100
+
 endif # TESTING_OSTEST
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 1fedfcf54..b8be63a62 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -31,7 +31,7 @@ MODULE = $(CONFIG_TESTING_OSTEST)
 
 # NuttX OS Test
 
-CSRCS   = getopt.c libc_memmem.c restart.c sighelper.c
+CSRCS  = getopt.c libc_memmem.c restart.c sighelper.c spinlock.c
 
 ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
 CSRCS += sighand.c signest.c
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index 321ecd2d3..1a396ba28 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -286,6 +286,10 @@ void setjmp_test(void);
 void smp_call_test(void);
 #endif
 
+/* spinlock.c ***************************************************************/
+
+void spinlock_test(void);
+
 /* APIs exported (conditionally) by the OS specifically for testing of
  * priority inheritance
  */
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 4e2ca3484..58ccc87fb 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -547,6 +547,10 @@ static int user_main(int argc, char *argv[])
 #endif
 #endif
 
+      printf("\nuser_main: spinlock test\n");
+      spinlock_test();
+      check_test_memory_usage();
+
 #ifdef CONFIG_BUILD_FLAT
       printf("\nuser_main: wdog test\n");
       wdog_test();
diff --git a/testing/ostest/spinlock.c b/testing/ostest/spinlock.c
new file mode 100644
index 000000000..2d71ea18f
--- /dev/null
+++ b/testing/ostest/spinlock.c
@@ -0,0 +1,184 @@
+/****************************************************************************
+ * apps/testing/ostest/spinlock.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdio.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <assert.h>
+#include <inttypes.h>
+#include <nuttx/spinlock.h>
+
+/****************************************************************************
+ * Preprocessor Definitions
+ ****************************************************************************/
+
+#define THREAD_NUM    CONFIG_TESTING_OSTEST_SPINLOCK_THREADS
+#define LOOP_TIMES    (CONFIG_TEST_LOOP_SCALE * 10000)
+
+enum lock_type_e
+{
+  RSPINLOCK,
+  SPINLOCK
+};
+
+struct spinlock_pub_args_s
+{
+  volatile uint32_t counter;
+  pthread_barrier_t barrier;
+  union
+    {
+      rspinlock_t rlock;
+      spinlock_t lock;
+    };
+};
+
+struct spinlock_thread_args_s
+{
+  uint64_t delta;
+  FAR struct spinlock_pub_args_s *pub;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Helper functions for timespec calculating */
+
+static inline uint64_t calc_diff(FAR struct timespec *start,
+                                    FAR struct timespec *end)
+{
+  uint64_t diff_sec = end->tv_sec - start->tv_sec;
+  long diff_nsec = end->tv_nsec - start->tv_nsec;
+  if (diff_nsec < 0)
+    {
+      diff_sec -= 1;
+      diff_nsec += 1000000000L;
+    }
+
+  return diff_sec * 1000000000ULL + diff_nsec;
+}
+
+#define LOCK_TEST_FUNC(lock_type, lock_func, unlock_func) \
+FAR static void * lock_type##_test_thread(FAR void *arg) \
+{ \
+  struct spinlock_thread_args_s *param = \
+                                (struct spinlock_thread_args_s *)arg; \
+  irqstate_t flags; \
+  struct timespec start; \
+  struct timespec end; \
+  int i; \
+  pthread_barrier_wait(&param->pub->barrier); \
+  clock_gettime(CLOCK_REALTIME, &start); \
+  for (i = 0; i < LOOP_TIMES; i++) \
+    { \
+      flags = lock_func(&param->pub->lock_type); \
+      param->pub->counter++; \
+      unlock_func(&param->pub->lock_type, flags); \
+    } \
+  clock_gettime(CLOCK_REALTIME, &end); \
+  param->delta = calc_diff(&start, &end); \
+  return NULL; \
+}
+
+LOCK_TEST_FUNC(rlock, rspin_lock_irqsave, rspin_unlock_irqrestore)
+LOCK_TEST_FUNC(lock, spin_lock_irqsave, spin_unlock_irqrestore)
+
+static inline void run_test_thread(
+  enum lock_type_e lock_type,
+  FAR void *(*thread_func)(FAR void *arg)
+  )
+{
+  const char *test_type = (lock_type == RSPINLOCK)
+                          ? "RSpin lock" : "Spin lock";
+  printf("Test type: %s\n", test_type);
+  pthread_t tid[THREAD_NUM];
+  struct spinlock_pub_args_s pub;
+  struct spinlock_thread_args_s param[THREAD_NUM];
+  struct timespec stime;
+  struct timespec etime;
+  int i;
+
+  pthread_barrier_init(&pub.barrier, NULL, THREAD_NUM + 1);
+  pub.counter = 0;
+  if (lock_type == RSPINLOCK)
+    {
+      rspin_lock_init(&pub.rlock);
+    }
+  else
+    {
+      spin_lock_init(&pub.lock);
+    }
+
+  clock_gettime(CLOCK_REALTIME, &stime);
+  for (i = 0; i < THREAD_NUM; i++)
+    {
+      param[i].pub = &pub;
+      param[i].delta = 0;
+      pthread_create(&tid[i], NULL, thread_func, &param[i]);
+    }
+
+  pthread_barrier_wait(&pub.barrier);
+
+  for (i = 0; i < THREAD_NUM; i++)
+    {
+      pthread_join(tid[i], NULL);
+    }
+
+  clock_gettime(CLOCK_REALTIME, &etime);
+  pthread_barrier_destroy(&pub.barrier);
+  uint64_t total_ns = 0;
+  for (i = 0; i < THREAD_NUM; i++)
+    {
+      total_ns += param[i].delta;
+    }
+
+  printf("%s: Test Results:\n", test_type);
+  printf("%s: Final counter: %" PRIu32 "\n", test_type, pub.counter);
+  assert(pub.counter == THREAD_NUM * LOOP_TIMES);
+  printf("%s: Average time per thread: %" PRIu64 " ns\n"
+        , test_type, total_ns / THREAD_NUM);
+  printf("%s: Total execution time: %" PRIu64 " ns\n \n"
+        , test_type, calc_diff(&stime, &etime));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: spinlock_test
+ ****************************************************************************/
+
+void spinlock_test(void)
+{
+  printf("Start Spin lock test:\n");
+  printf("Thread num: %d, Loop times: %d\n\n", THREAD_NUM, LOOP_TIMES);
+
+  run_test_thread(SPINLOCK, lock_test_thread);
+
+  run_test_thread(RSPINLOCK, rlock_test_thread);
+}

From 7fb71aa57a8f6d6ebcb1429c77a441fcc0537986 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 10 Jul 2025 11:05:42 +0800
Subject: [PATCH 205/568] testing/drivers: Fix posix timer assertions.

On QEMU, if vcpus are preempted by other threads, the deviation of the
timer might be very large, causing assertion failure. This commit
addressed the problem.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_posix_timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index 13eb4425a..65b95ee24 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -164,7 +164,8 @@ static void posix_timer_callback(union sigval arg)
 
   syslog(0, "range: %d ms\n", range);
 
-  assert(range >= sigev_para->it.it_interval.tv_sec * 1000);
+  assert(range >= sigev_para->it.it_interval.tv_sec * 1000 -
+                  sigev_para->deviation);
 
   syslog(LOG_DEBUG, "callback trigger!!!\n");
   (*sigev_para).trigger_count++;

From 36e701448cfd1b1f03369d91e6f27dd3f17eba1c Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 21 Oct 2025 17:47:59 +0800
Subject: [PATCH 206/568] ostest/spinlock: Check the return value.

This commit added checking for the return value.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/spinlock.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/testing/ostest/spinlock.c b/testing/ostest/spinlock.c
index 2d71ea18f..dd49c4d54 100644
--- a/testing/ostest/spinlock.c
+++ b/testing/ostest/spinlock.c
@@ -91,7 +91,7 @@ FAR static void * lock_type##_test_thread(FAR void *arg) \
   struct timespec start; \
   struct timespec end; \
   int i; \
-  pthread_barrier_wait(&param->pub->barrier); \
+  VERIFY(0 == pthread_barrier_wait(&param->pub->barrier)); \
   clock_gettime(CLOCK_REALTIME, &start); \
   for (i = 0; i < LOOP_TIMES; i++) \
     { \
@@ -122,7 +122,7 @@ static inline void run_test_thread(
   struct timespec etime;
   int i;
 
-  pthread_barrier_init(&pub.barrier, NULL, THREAD_NUM + 1);
+  VERIFY(0 == pthread_barrier_init(&pub.barrier, NULL, THREAD_NUM + 1));
   pub.counter = 0;
   if (lock_type == RSPINLOCK)
     {
@@ -141,7 +141,7 @@ static inline void run_test_thread(
       pthread_create(&tid[i], NULL, thread_func, &param[i]);
     }
 
-  pthread_barrier_wait(&pub.barrier);
+  VERIFY(0 == pthread_barrier_wait(&pub.barrier));
 
   for (i = 0; i < THREAD_NUM; i++)
     {
@@ -149,7 +149,8 @@ static inline void run_test_thread(
     }
 
   clock_gettime(CLOCK_REALTIME, &etime);
-  pthread_barrier_destroy(&pub.barrier);
+  VERIFY(0 == pthread_barrier_destroy(&pub.barrier));
+
   uint64_t total_ns = 0;
   for (i = 0; i < THREAD_NUM; i++)
     {

From f86246f7c6a95f24ccaa605c4bb3d12d3cfd3415 Mon Sep 17 00:00:00 2001
From: anpeiyun <anpeiyun@xiaomi.com>
Date: Sun, 26 Oct 2025 11:38:14 +0800
Subject: [PATCH 207/568] ostest/spinlock: fix the operations does not affect
 the result.

When expanding the macro VERIY, (0 == pthread_barrier_wait(&param->pub->barrier)) < 0 always false.
Regardless of the value of its operands.

Signed-off-by: anpeiyun <anpeiyun@xiaomi.com>
---
 testing/ostest/spinlock.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/testing/ostest/spinlock.c b/testing/ostest/spinlock.c
index dd49c4d54..df691d7ca 100644
--- a/testing/ostest/spinlock.c
+++ b/testing/ostest/spinlock.c
@@ -91,7 +91,12 @@ FAR static void * lock_type##_test_thread(FAR void *arg) \
   struct timespec start; \
   struct timespec end; \
   int i; \
-  VERIFY(0 == pthread_barrier_wait(&param->pub->barrier)); \
+  int ret; \
+  ret = pthread_barrier_wait(&param->pub->barrier); \
+  if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD) \
+    { \
+      ASSERT(false); \
+    } \
   clock_gettime(CLOCK_REALTIME, &start); \
   for (i = 0; i < LOOP_TIMES; i++) \
     { \
@@ -121,8 +126,14 @@ static inline void run_test_thread(
   struct timespec stime;
   struct timespec etime;
   int i;
+  int ret;
+
+  ret = pthread_barrier_init(&pub.barrier, NULL, THREAD_NUM + 1);
+  if (ret != 0)
+    {
+      ASSERT(false);
+    }
 
-  VERIFY(0 == pthread_barrier_init(&pub.barrier, NULL, THREAD_NUM + 1));
   pub.counter = 0;
   if (lock_type == RSPINLOCK)
     {
@@ -141,7 +152,11 @@ static inline void run_test_thread(
       pthread_create(&tid[i], NULL, thread_func, &param[i]);
     }
 
-  VERIFY(0 == pthread_barrier_wait(&pub.barrier));
+  ret = pthread_barrier_wait(&pub.barrier);
+  if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      ASSERT(false);
+    }
 
   for (i = 0; i < THREAD_NUM; i++)
     {
@@ -149,7 +164,11 @@ static inline void run_test_thread(
     }
 
   clock_gettime(CLOCK_REALTIME, &etime);
-  VERIFY(0 == pthread_barrier_destroy(&pub.barrier));
+  ret = pthread_barrier_destroy(&pub.barrier);
+  if (ret != 0)
+    {
+      ASSERT(false);
+    }
 
   uint64_t total_ns = 0;
   for (i = 0; i < THREAD_NUM; i++)

From 52c2a8909baaa49f3d4e1b5467a75970d04278ca Mon Sep 17 00:00:00 2001
From: anpeiyun <anpeiyun@xiaomi.com>
Date: Sun, 26 Oct 2025 11:29:33 +0800
Subject: [PATCH 208/568] ostest/spinlock: Check the return value.

This commit added checking for the return value.

Signed-off-by: anpeiyun <anpeiyun@xiaomi.com>
---
 testing/ostest/spinlock.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/testing/ostest/spinlock.c b/testing/ostest/spinlock.c
index df691d7ca..7d66b64b6 100644
--- a/testing/ostest/spinlock.c
+++ b/testing/ostest/spinlock.c
@@ -149,7 +149,11 @@ static inline void run_test_thread(
     {
       param[i].pub = &pub;
       param[i].delta = 0;
-      pthread_create(&tid[i], NULL, thread_func, &param[i]);
+      ret = pthread_create(&tid[i], NULL, thread_func, &param[i]);
+      if (ret != 0)
+        {
+          ASSERT(false);
+        }
     }
 
   ret = pthread_barrier_wait(&pub.barrier);

From 5eef7f324f513781c7cd96040a83f9ec8966a9ee Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Fri, 7 Nov 2025 09:52:20 +0800
Subject: [PATCH 209/568] testing/ostest: refactor the spinlock test.

This commit refactored the spinlock test for better accuracy and
minimized jitters introduced by scheduling.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/spinlock.c | 205 ++++++++++++++++++++++++--------------
 1 file changed, 131 insertions(+), 74 deletions(-)

diff --git a/testing/ostest/spinlock.c b/testing/ostest/spinlock.c
index 7d66b64b6..0e38ec03b 100644
--- a/testing/ostest/spinlock.c
+++ b/testing/ostest/spinlock.c
@@ -30,30 +30,23 @@
 #include <unistd.h>
 #include <assert.h>
 #include <inttypes.h>
+#include <nuttx/atomic.h>
 #include <nuttx/spinlock.h>
+#include <nuttx/seqlock.h>
 
 /****************************************************************************
  * Preprocessor Definitions
  ****************************************************************************/
 
-#define THREAD_NUM    CONFIG_TESTING_OSTEST_SPINLOCK_THREADS
-#define LOOP_TIMES    (CONFIG_TEST_LOOP_SCALE * 10000)
+#define MAX_THREAD_NUM (CONFIG_SMP_NCPUS)
+#define LOOP_TIMES     (CONFIG_TEST_LOOP_SCALE * 100000)
 
-enum lock_type_e
-{
-  RSPINLOCK,
-  SPINLOCK
-};
-
-struct spinlock_pub_args_s
+aligned_data(64) struct spinlock_pub_args_s
 {
+  FAR void         *lock;
   volatile uint32_t counter;
-  pthread_barrier_t barrier;
-  union
-    {
-      rspinlock_t rlock;
-      spinlock_t lock;
-    };
+  atomic_t          barrier;
+  uint32_t          thread_num;
 };
 
 struct spinlock_thread_args_s
@@ -90,103 +83,145 @@ FAR static void * lock_type##_test_thread(FAR void *arg) \
   irqstate_t flags; \
   struct timespec start; \
   struct timespec end; \
-  int i; \
-  int ret; \
-  ret = pthread_barrier_wait(&param->pub->barrier); \
-  if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD) \
+  uint32_t i; \
+  FAR struct spinlock_pub_args_s *pub = param->pub; \
+  FAR lock_type *l = (FAR lock_type *)pub->lock; \
+  atomic_fetch_add(&pub->barrier, 1); \
+  while (atomic_read(&pub->barrier) != pub->thread_num) \
     { \
-      ASSERT(false); \
+      sched_yield(); \
     } \
   clock_gettime(CLOCK_REALTIME, &start); \
   for (i = 0; i < LOOP_TIMES; i++) \
     { \
-      flags = lock_func(&param->pub->lock_type); \
-      param->pub->counter++; \
-      unlock_func(&param->pub->lock_type, flags); \
+      flags = lock_func(l); \
+      pub->counter++; \
+      unlock_func(l, flags); \
     } \
   clock_gettime(CLOCK_REALTIME, &end); \
   param->delta = calc_diff(&start, &end); \
   return NULL; \
 }
 
-LOCK_TEST_FUNC(rlock, rspin_lock_irqsave, rspin_unlock_irqrestore)
-LOCK_TEST_FUNC(lock, spin_lock_irqsave, spin_unlock_irqrestore)
+LOCK_TEST_FUNC(spinlock_t, spin_lock_irqsave, spin_unlock_irqrestore)
+LOCK_TEST_FUNC(rspinlock_t, rspin_lock_irqsave, rspin_unlock_irqrestore)
+LOCK_TEST_FUNC(seqcount_t, write_seqlock_irqsave, write_sequnlock_irqrestore)
 
-static inline void run_test_thread(
-  enum lock_type_e lock_type,
-  FAR void *(*thread_func)(FAR void *arg)
-  )
+static inline
+void run_test_thread(void *lock, FAR void *(*thread_func)(FAR void *arg),
+                     uint32_t thread_num, const char *lock_type)
 {
-  const char *test_type = (lock_type == RSPINLOCK)
-                          ? "RSpin lock" : "Spin lock";
-  printf("Test type: %s\n", test_type);
-  pthread_t tid[THREAD_NUM];
+  pthread_t tid[MAX_THREAD_NUM];
   struct spinlock_pub_args_s pub;
-  struct spinlock_thread_args_s param[THREAD_NUM];
+  pthread_attr_t attr;
+  struct sched_param sparam;
+  struct spinlock_thread_args_s param[MAX_THREAD_NUM];
   struct timespec stime;
   struct timespec etime;
+  cpu_set_t cpu_set = 1u;
+  uint64_t total_ns = 0u;
+  int status;
   int i;
-  int ret;
 
-  ret = pthread_barrier_init(&pub.barrier, NULL, THREAD_NUM + 1);
-  if (ret != 0)
+  /* Initialize the public parameters. */
+
+  printf("Test type: %s\n", lock_type);
+
+  pub.lock       = lock;
+  pub.counter    = 0u;
+  pub.thread_num = thread_num;
+  atomic_set_release(&pub.barrier, 0u);
+
+  /* Set affinity to CPU0 */
+
+#ifdef CONFIG_SMP
+  if (OK != sched_setaffinity(getpid(), sizeof(cpu_set_t), &cpu_set))
     {
+      printf("spinlock_test: ERROR: nxsched_set_affinity failed");
+      ASSERT(false);
+    }
+#else
+  UNUSED(cpu_set);
+#endif
+
+  /* Boost to maximum priority for test threads. */
+
+  status = pthread_attr_init(&attr);
+  if (status != 0)
+    {
+      printf("spinlock_test: ERROR: "
+             "pthread_attr_init failed, status=%d\n",  status);
       ASSERT(false);
     }
 
-  pub.counter = 0;
-  if (lock_type == RSPINLOCK)
+  sparam.sched_priority = SCHED_PRIORITY_MAX;
+  status = pthread_attr_setschedparam(&attr, &sparam);
+  if (status != OK)
     {
-      rspin_lock_init(&pub.rlock);
-    }
-  else
-    {
-      spin_lock_init(&pub.lock);
+      printf("spinlock_test: ERROR: "
+             "pthread_attr_setschedparam failed, status=%d\n",  status);
+      ASSERT(false);
     }
 
   clock_gettime(CLOCK_REALTIME, &stime);
-  for (i = 0; i < THREAD_NUM; i++)
+
+  /* Create new test threads. */
+
+  for (i = 0; i < thread_num; i++)
     {
       param[i].pub = &pub;
       param[i].delta = 0;
-      ret = pthread_create(&tid[i], NULL, thread_func, &param[i]);
-      if (ret != 0)
+
+      /* Set affinity */
+
+#ifdef CONFIG_SMP
+      cpu_set = 1u << ((i + 1) % CONFIG_SMP_NCPUS);
+
+      status = pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t),
+                                           &cpu_set);
+      if (status != OK)
         {
+          printf("spinlock_test: ERROR: "
+                 "pthread_attr_setaffinity_np failed, status=%d\n",  status);
+          ASSERT(false);
+        }
+#endif
+
+      status = pthread_create(&tid[i], &attr, thread_func, &param[i]);
+      if (status != 0)
+        {
+          printf("spinlock_test: ERROR: "
+                 "pthread_create failed, status=%d\n",  status);
           ASSERT(false);
         }
     }
 
-  ret = pthread_barrier_wait(&pub.barrier);
-  if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD)
+  for (i = 0; i < thread_num; i++)
     {
-      ASSERT(false);
+      status = pthread_join(tid[i], NULL);
+      if (status != 0)
+        {
+          printf("spinlock_test: ERROR: "
+                 "pthread_join failed, status=%d\n",  status);
+          ASSERT(false);
+        }
     }
 
-  for (i = 0; i < THREAD_NUM; i++)
-    {
-      pthread_join(tid[i], NULL);
-    }
+  /* Calculate the average throughput. */
 
   clock_gettime(CLOCK_REALTIME, &etime);
-  ret = pthread_barrier_destroy(&pub.barrier);
-  if (ret != 0)
-    {
-      ASSERT(false);
-    }
-
-  uint64_t total_ns = 0;
-  for (i = 0; i < THREAD_NUM; i++)
+  for (i = 0; i < thread_num; i++)
     {
       total_ns += param[i].delta;
     }
 
-  printf("%s: Test Results:\n", test_type);
-  printf("%s: Final counter: %" PRIu32 "\n", test_type, pub.counter);
-  assert(pub.counter == THREAD_NUM * LOOP_TIMES);
-  printf("%s: Average time per thread: %" PRIu64 " ns\n"
-        , test_type, total_ns / THREAD_NUM);
-  printf("%s: Total execution time: %" PRIu64 " ns\n \n"
-        , test_type, calc_diff(&stime, &etime));
+  printf("%s: Test Results:\n", lock_type);
+  printf("%s: Final counter: %" PRIu32 "\n", lock_type, pub.counter);
+  assert(pub.counter == thread_num * LOOP_TIMES);
+  printf("%s: Average throughput : %" PRIu64 " op/s\n", lock_type,
+         (uint64_t)NSEC_PER_SEC * LOOP_TIMES * thread_num / total_ns);
+  printf("%s: Total execution time: %" PRIu64 " ns\n \n",
+         lock_type, calc_diff(&stime, &etime));
 }
 
 /****************************************************************************
@@ -197,12 +232,34 @@ static inline void run_test_thread(
  * Name: spinlock_test
  ****************************************************************************/
 
+static void spinlock_test_thread_num(unsigned thread_num)
+{
+  aligned_data(64) union
+    {
+      spinlock_t  spinlock;
+      rspinlock_t rspinlock;
+      seqcount_t  seqcount;
+    } lock;
+
+  printf("Start Lock test:\n");
+  printf("Thread num: %u, Loop times: %d\n\n", thread_num, LOOP_TIMES);
+
+  spin_lock_init(&lock.spinlock);
+  run_test_thread(&lock, spinlock_t_test_thread, thread_num, "spinlock");
+
+  rspin_lock_init(&lock.rspinlock);
+  run_test_thread(&lock, rspinlock_t_test_thread, thread_num, "rspinlock");
+
+  seqlock_init(&lock.seqcount);
+  run_test_thread(&lock, seqcount_t_test_thread, thread_num, "seqcount");
+}
+
 void spinlock_test(void)
 {
-  printf("Start Spin lock test:\n");
-  printf("Thread num: %d, Loop times: %d\n\n", THREAD_NUM, LOOP_TIMES);
+  unsigned tnr;
 
-  run_test_thread(SPINLOCK, lock_test_thread);
-
-  run_test_thread(RSPINLOCK, rlock_test_thread);
+  for (tnr = 1; tnr < MAX_THREAD_NUM; tnr++)
+    {
+      spinlock_test_thread_num(tnr);
+    }
 }

From 06d07b15228b9af04e23137ecd337604293f73d6 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 30 Dec 2025 10:07:46 +0800
Subject: [PATCH 210/568] testing/ostest: Fix Coverity for spinlock test.

This commit fixed coverity for spinlock test.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/spinlock.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/testing/ostest/spinlock.c b/testing/ostest/spinlock.c
index 0e38ec03b..1ebe290f1 100644
--- a/testing/ostest/spinlock.c
+++ b/testing/ostest/spinlock.c
@@ -215,13 +215,20 @@ void run_test_thread(void *lock, FAR void *(*thread_func)(FAR void *arg),
       total_ns += param[i].delta;
     }
 
-  printf("%s: Test Results:\n", lock_type);
-  printf("%s: Final counter: %" PRIu32 "\n", lock_type, pub.counter);
-  assert(pub.counter == thread_num * LOOP_TIMES);
-  printf("%s: Average throughput : %" PRIu64 " op/s\n", lock_type,
-         (uint64_t)NSEC_PER_SEC * LOOP_TIMES * thread_num / total_ns);
-  printf("%s: Total execution time: %" PRIu64 " ns\n \n",
-         lock_type, calc_diff(&stime, &etime));
+  if (total_ns != 0)
+    {
+      printf("%s: Test Results:\n", lock_type);
+      printf("%s: Final counter: %" PRIu32 "\n", lock_type, pub.counter);
+      assert(pub.counter == thread_num * LOOP_TIMES);
+      printf("%s: Average throughput : %" PRIu64 " op/s\n", lock_type,
+            (uint64_t)NSEC_PER_SEC * LOOP_TIMES * thread_num / total_ns);
+      printf("%s: Total execution time: %" PRIu64 " ns\n \n",
+            lock_type, calc_diff(&stime, &etime));
+    }
+  else
+    {
+      printf("spinlock_test: ERROR: total_ns is 0\n");
+    }
 }
 
 /****************************************************************************
@@ -258,7 +265,7 @@ void spinlock_test(void)
 {
   unsigned tnr;
 
-  for (tnr = 1; tnr < MAX_THREAD_NUM; tnr++)
+  for (tnr = 1; tnr <= MAX_THREAD_NUM; tnr++)
     {
       spinlock_test_thread_num(tnr);
     }

From 71561d29795901da23ccf34ca4c1ff7db3a851c3 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Tue, 27 Jan 2026 17:49:19 +0800
Subject: [PATCH 211/568] testing/ostest: run spinlock_test only in flat mode.

Since the kernel spinlocks can only work in flat mode, this commit
allowed spinlock_test only in flat mode.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/CMakeLists.txt | 4 ++--
 testing/ostest/Makefile       | 4 ++--
 testing/ostest/ostest_main.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 35b0c5596..a8a2ca921 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -22,7 +22,7 @@
 
 if(CONFIG_TESTING_OSTEST)
 
-  set(SRCS getopt.c libc_memmem.c restart.c sighelper.c spinlock.c)
+  set(SRCS getopt.c libc_memmem.c restart.c sighelper.c)
 
   if(CONFIG_ENABLE_ALL_SIGNALS)
     list(APPEND SRCS sighand.c signest.c)
@@ -162,7 +162,7 @@ if(CONFIG_TESTING_OSTEST)
   endif()
 
   if(CONFIG_BUILD_FLAT)
-    list(APPEND SRCS wdog.c)
+    list(APPEND SRCS wdog.c spinlock.c)
   endif()
 
   set(OSTEST_SRCS ostest_main.c ${SRCS})
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index b8be63a62..817fcdb51 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -31,7 +31,7 @@ MODULE = $(CONFIG_TESTING_OSTEST)
 
 # NuttX OS Test
 
-CSRCS  = getopt.c libc_memmem.c restart.c sighelper.c spinlock.c
+CSRCS  = getopt.c libc_memmem.c restart.c sighelper.c
 
 ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
 CSRCS += sighand.c signest.c
@@ -167,7 +167,7 @@ endif
 endif
 
 ifeq ($(CONFIG_BUILD_FLAT),y)
-CSRCS += wdog.c
+CSRCS += wdog.c spinlock.c
 endif
 
 include $(APPDIR)/Application.mk
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 58ccc87fb..8247b4788 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -547,11 +547,11 @@ static int user_main(int argc, char *argv[])
 #endif
 #endif
 
+#ifdef CONFIG_BUILD_FLAT
       printf("\nuser_main: spinlock test\n");
       spinlock_test();
       check_test_memory_usage();
 
-#ifdef CONFIG_BUILD_FLAT
       printf("\nuser_main: wdog test\n");
       wdog_test();
       check_test_memory_usage();

From ebe2dd57ddef45ac7c3d2db037fa4e5a5d5f26cd Mon Sep 17 00:00:00 2001
From: wangchengdong <wangchengdong@lixiang.com>
Date: Tue, 27 Jan 2026 11:21:06 +0800
Subject: [PATCH 212/568] ostest/hrtimer: sync hrtimer ostest with latest
 hritmer update

  sync hrtimer ostest with latest hritmer update

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
---
 testing/ostest/hrtimer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index d503f878f..48ed46b99 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -223,7 +223,7 @@ static void * hrtimer_test_thread(void *arg)
       /* Cancel timer */
 
       ret = hrtimer_cancel(&timer);
-      HRTIMER_TEST(ret, OK);
+      HRTIMER_TEST(ret >= 0, true);
 
       /* Start timer with fixed period */
 
@@ -241,7 +241,7 @@ static void * hrtimer_test_thread(void *arg)
   /* Cancel the timer synchronously */
 
   ret = hrtimer_cancel_sync(&timer);
-  HRTIMER_TEST(ret, OK);
+  HRTIMER_TEST(ret >= 0, true);
 
   return NULL;
 }

From 4ac37327348c9fa6808a25ff379d28367a9bf98e Mon Sep 17 00:00:00 2001
From: guohao15 <guohao15@xiaomi.com>
Date: Wed, 16 Apr 2025 20:48:45 +0800
Subject: [PATCH 213/568] testing/fdcheck: fix fd close in other thread

Fix file descriptor leak issue where fd was stored in test_state for deferred close, but could fail when CONFIG_FDCHECK is enabled because fd cannot be closed in a different thread.

Signed-off-by: guohao15 <guohao15@xiaomi.com>
---
 testing/testsuites/kernel/fs/cases/fs_creat_test.c   |  3 ++-
 testing/testsuites/kernel/fs/cases/fs_dup2_test.c    |  8 +++-----
 testing/testsuites/kernel/fs/cases/fs_eventfd_test.c |  4 +---
 testing/testsuites/kernel/fs/cases/fs_fcntl_test.c   | 12 +++++-------
 testing/testsuites/kernel/fs/cases/fs_fstat_test.c   |  7 ++-----
 testing/testsuites/kernel/fs/cases/fs_fstatfs_test.c |  2 +-
 testing/testsuites/kernel/fs/cases/fs_fsync_test.c   |  8 +++-----
 testing/testsuites/kernel/fs/cases/fs_open_test.c    |  7 ++-----
 testing/testsuites/kernel/fs/cases/fs_pread_test.c   |  3 ++-
 testing/testsuites/kernel/fs/cases/fs_pwrite_test.c  |  3 ++-
 testing/testsuites/kernel/fs/cases/fs_read_test.c    |  8 ++------
 .../testsuites/kernel/fs/cases/fs_readlink_test.c    |  6 +-----
 testing/testsuites/kernel/fs/cases/fs_stat_test.c    |  4 ----
 testing/testsuites/kernel/fs/cases/fs_write_test.c   |  6 ++----
 14 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/testing/testsuites/kernel/fs/cases/fs_creat_test.c b/testing/testsuites/kernel/fs/cases/fs_creat_test.c
index 3d7d88330..19ff97fed 100644
--- a/testing/testsuites/kernel/fs/cases/fs_creat_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_creat_test.c
@@ -73,10 +73,11 @@ void test_nuttx_fs_creat01(FAR void **state)
 
   fd = creat(test_state->filename, 0700);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* do write */
 
   ret = write(fd, buf, sizeof(buf));
   assert_int_in_range(ret, 1, 20);
+
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_dup2_test.c b/testing/testsuites/kernel/fs/cases/fs_dup2_test.c
index 7ec1ece97..f7fb236a1 100644
--- a/testing/testsuites/kernel/fs/cases/fs_dup2_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_dup2_test.c
@@ -60,21 +60,16 @@ void test_nuttx_fs_dup201(FAR void **state)
   };
 
   off_t currpos;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
   int fd1 = open(TESTFILE, O_RDWR | O_CREAT, 0777);
   assert_true(fd1 > 0);
-  test_state->fd1 = fd1;
 
   /* open file */
 
   int fd2 = open(TESTFILE, O_RDWR | O_CREAT, 0777);
   assert_true(fd2 > 0);
-  test_state->fd2 = fd2;
 
   /* do dup2 */
 
@@ -114,4 +109,7 @@ void test_nuttx_fs_dup201(FAR void **state)
 
   ret = strncmp(buf, "hello world!", 12);
   assert_int_equal(ret, 0);
+
+  close(fd1);
+  close(fd2);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c b/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
index 1a70776af..9930e776d 100644
--- a/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
@@ -75,12 +75,9 @@ void test_nuttx_fs_eventfd(FAR void **state)
   int eventfd01_ret;
   int eventfd01_efd;
   pthread_t eventfd01_tid;
-  struct fs_testsuites_state_s *test_state;
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   eventfd01_efd = eventfd(0, 0);
   assert_int_not_equal(eventfd01_efd, -1);
-  test_state->fd1 = eventfd01_efd;
   assert_true(pthread_create(&eventfd01_tid, NULL, threadfunc,
                              &eventfd01_efd) >= 0);
 
@@ -94,5 +91,6 @@ void test_nuttx_fs_eventfd(FAR void **state)
     }
 
   sleep(2);
+  close(eventfd01_efd);
 #endif
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_fcntl_test.c b/testing/testsuites/kernel/fs/cases/fs_fcntl_test.c
index 1c163690c..55c1b4208 100644
--- a/testing/testsuites/kernel/fs/cases/fs_fcntl_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_fcntl_test.c
@@ -62,13 +62,11 @@ void test_nuttx_fs_fcntl01(FAR void **state)
 
   oldfd = open(TEST_FILE_1, O_CREAT | O_RDWR, 0700);
   assert_true(oldfd > 0);
-  test_state->fd1 = oldfd;
 
   /* do fcntl */
 
   newfd = fcntl(oldfd, F_DUPFD, 0);
   assert_true(newfd > 0);
-  test_state->fd2 = newfd;
 
   /* malloc memory */
 
@@ -84,6 +82,9 @@ void test_nuttx_fs_fcntl01(FAR void **state)
 
   ret = write(newfd, buf, BUFSIZ);
   assert_int_in_range(ret, 1, BUFSIZ);
+
+  close(oldfd);
+  close(newfd);
 }
 
 /****************************************************************************
@@ -105,9 +106,6 @@ void test_nuttx_fs_fcntl02(FAR void **state)
   int fd;
   int ret;
   int v;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
@@ -118,7 +116,6 @@ void test_nuttx_fs_fcntl02(FAR void **state)
 
   v = fcntl(fd, F_GETFD);
   assert_int_in_range(v, 0, 255);
-  test_state->fd1 = fd;
 
   v |= FD_CLOEXEC;
 
@@ -126,9 +123,10 @@ void test_nuttx_fs_fcntl02(FAR void **state)
 
   ret = fcntl(fd, F_SETFD, v);
   assert_int_in_range(ret, 0, 255);
-  test_state->fd2 = ret;
   ret = (v == fcntl(fd, F_GETFD) ? 1 : 0);
   assert_int_equal(ret, 1);
+
+  close(fd);
 }
 
 /****************************************************************************
diff --git a/testing/testsuites/kernel/fs/cases/fs_fstat_test.c b/testing/testsuites/kernel/fs/cases/fs_fstat_test.c
index 315c3e991..7850b883c 100644
--- a/testing/testsuites/kernel/fs/cases/fs_fstat_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_fstat_test.c
@@ -67,7 +67,6 @@ void test_nuttx_fs_fstat01(FAR void **state)
 
   fd = open(TEST_FILE_1, O_RDWR | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* malloc memory */
 
@@ -98,6 +97,8 @@ void test_nuttx_fs_fstat01(FAR void **state)
 
   ret = (file_s.st_size == BUF_SIZE) ? 1 : 0;
   assert_int_equal(ret, 1);
+
+  close(fd);
 }
 
 /****************************************************************************
@@ -113,15 +114,11 @@ void test_nuttx_fs_fstat02(FAR void **state)
   int fd;
   int ret;
   struct stat file_s;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
   fd = open(TEST_FILE_2, O_RDWR | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* get the file size before write */
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_fstatfs_test.c b/testing/testsuites/kernel/fs/cases/fs_fstatfs_test.c
index 0f804a6f8..240e74d90 100644
--- a/testing/testsuites/kernel/fs/cases/fs_fstatfs_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_fstatfs_test.c
@@ -102,10 +102,10 @@ void test_nuttx_fs_fstatfs01(FAR void **state)
 
   fd = open(TEST_FILE, O_RDWR | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* call fstatfs() */
 
   ret = fstatfs(fd, &statfsbuf);
   assert_int_equal(ret, 0);
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_fsync_test.c b/testing/testsuites/kernel/fs/cases/fs_fsync_test.c
index f69c50a87..c0a03b82f 100644
--- a/testing/testsuites/kernel/fs/cases/fs_fsync_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_fsync_test.c
@@ -64,15 +64,11 @@ void test_nuttx_fs_fsync01(FAR void **state)
   int fd;
   int rval;
   int ret;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
   fd = open(TESTFILE, O_RDWR | O_CREAT, 0700);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   for (int i = 0; i < 20; i++)
     {
@@ -86,6 +82,8 @@ void test_nuttx_fs_fsync01(FAR void **state)
       ret = fsync(fd);
       assert_int_equal(ret, 0);
     }
+
+  close(fd);
 }
 
 /****************************************************************************
@@ -118,7 +116,6 @@ void test_nuttx_fs_fsync02(FAR void **state)
 
   fd = open(TESTFILE, O_CREAT | O_RDWR, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* call fstatfs() */
 
@@ -165,4 +162,5 @@ void test_nuttx_fs_fsync02(FAR void **state)
 
   ret = fstatfs(fd, &statfsbuf);
   assert_int_equal(ret, 0);
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_open_test.c b/testing/testsuites/kernel/fs/cases/fs_open_test.c
index f671438af..38b30d336 100644
--- a/testing/testsuites/kernel/fs/cases/fs_open_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_open_test.c
@@ -62,10 +62,6 @@ void test_nuttx_fs_open01(FAR void **state)
     0
   };
 
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
-
   /* open file */
 
   fd = open(TESTFILE, O_WRONLY | O_CREAT, 0700);
@@ -81,12 +77,13 @@ void test_nuttx_fs_open01(FAR void **state)
 
   fd = open(TESTFILE, O_RDONLY);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* do read */
 
   ret = read(fd, buffer, sizeof(buffer));
   assert_true(ret > 0);
+
+  close(fd);
 }
 
 /****************************************************************************
diff --git a/testing/testsuites/kernel/fs/cases/fs_pread_test.c b/testing/testsuites/kernel/fs/cases/fs_pread_test.c
index 1095a4827..166c98e29 100644
--- a/testing/testsuites/kernel/fs/cases/fs_pread_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_pread_test.c
@@ -69,7 +69,6 @@ void test_nuttx_fs_pread01(FAR void **state)
 
   fd = open(TEST_FILE, O_RDWR | O_CREAT, 0777);
   assert_int_not_equal(fd, -1);
-  test_state->fd1 = fd;
 
   /* do write */
 
@@ -98,4 +97,6 @@ void test_nuttx_fs_pread01(FAR void **state)
 
   pread(fd, buf, 3, 1);
   assert_int_equal(strncmp(buf, "BCD", 3), 0);
+
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c b/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c
index b44e87b09..ec8ca4c66 100644
--- a/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c
@@ -64,7 +64,6 @@ void test_nuttx_fs_pwrite01(FAR void **state)
 
   fd = open(TEST_FILE, O_RDWR | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   /* malloc memory */
 
@@ -108,4 +107,6 @@ void test_nuttx_fs_pwrite01(FAR void **state)
   /* check buf */
 
   assert_true(strncmp(buf, "CBAA", BUF_SIZE) == 0);
+
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_read_test.c b/testing/testsuites/kernel/fs/cases/fs_read_test.c
index d9659cf86..c20309fbe 100644
--- a/testing/testsuites/kernel/fs/cases/fs_read_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_read_test.c
@@ -58,21 +58,17 @@ void test_nuttx_fs_read01(FAR void **state)
   int size;
   char s[] = "Test!";
   char buffer[80];
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   fd = open(TESTFILE, O_WRONLY | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   size = write(fd, s, sizeof(s));
   assert_int_equal(size, sizeof(s));
-
   close(fd);
+
   fd = open(TESTFILE, O_RDONLY, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
   size = read(fd, buffer, sizeof(buffer));
   assert_int_equal(size, sizeof(s));
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_readlink_test.c b/testing/testsuites/kernel/fs/cases/fs_readlink_test.c
index c6318e439..32da71ed5 100644
--- a/testing/testsuites/kernel/fs/cases/fs_readlink_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_readlink_test.c
@@ -70,15 +70,10 @@ void test_nuttx_fs_readlink01(FAR void **state)
     0
   };
 
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
-
   /* creat file */
 
   fd = creat(TEST_FILE, 0700);
   assert_true(fd > 0);
-  test_state->fd1 = fd;
 
   getcwd(path, sizeof(path));
   strcat(path, "/");
@@ -97,4 +92,5 @@ void test_nuttx_fs_readlink01(FAR void **state)
   /* delete test file */
 
   assert_int_equal(unlink("/file_link"), 0);
+  close(fd);
 }
diff --git a/testing/testsuites/kernel/fs/cases/fs_stat_test.c b/testing/testsuites/kernel/fs/cases/fs_stat_test.c
index 2afb114e0..58fd9ef90 100644
--- a/testing/testsuites/kernel/fs/cases/fs_stat_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_stat_test.c
@@ -91,9 +91,6 @@ void test_nuttx_fs_stat01(FAR void **state)
   time_t t_1;
   time_t t_2;
   time_t t_diff;
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* set memory */
 
@@ -103,7 +100,6 @@ void test_nuttx_fs_stat01(FAR void **state)
 
   fd = open(TEST_FILE, O_RDWR | O_CREAT, 0777);
   assert_true(fd > 0);
-  test_state->fd1 = 0;
 
   /* do write */
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_write_test.c b/testing/testsuites/kernel/fs/cases/fs_write_test.c
index 5318acbe2..cfac9d6a1 100644
--- a/testing/testsuites/kernel/fs/cases/fs_write_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_write_test.c
@@ -57,15 +57,11 @@ void test_nuttx_fs_write01(FAR void **state)
   int out;
   int rval;
   char buffer[1024];
-  struct fs_testsuites_state_s *test_state;
-
-  test_state = (struct fs_testsuites_state_s *)*state;
 
   /* open file */
 
   out = open(TESTFILE, O_WRONLY | O_CREAT, 0700);
   assert_true(out > 0);
-  test_state->fd1 = out;
 
   /* set memory */
 
@@ -75,6 +71,8 @@ void test_nuttx_fs_write01(FAR void **state)
 
   rval = write(out, buffer, MAXLEN);
   assert_int_in_range(rval, 1, MAXLEN);
+
+  close(out);
 }
 
 /****************************************************************************

From 050fb406c28b4a9cd0451fa5e74dac3165743fa8 Mon Sep 17 00:00:00 2001
From: ligd <liguiding1@xiaomi.com>
Date: Mon, 4 Aug 2025 17:32:35 +0800
Subject: [PATCH 214/568] testing/eventfd_test: avoid the orphan Thread

Replace sleep() with pthread_join() to properly wait for the child thread to finish, avoiding orphan threads.
Change sleep(1) to usleep(1000) to reduce test time while maintaining synchronization.
Fix loop iteration count mismatch between reader thread (6 iterations) and writer (5 iterations).

Signed-off-by: ligd <liguiding1@xiaomi.com>
---
 testing/testsuites/kernel/fs/cases/fs_eventfd_test.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c b/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
index 9930e776d..42f8fe425 100644
--- a/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
@@ -51,10 +51,10 @@ __attribute__((unused)) static void *threadfunc(void *args)
   eventfd_t eventfd01_buffer;
   int fd = *(int *)args;
 
-  for (int i = 1; i < 6; i++)
+  for (int i = 0; i < 5; i++)
     {
       read(fd, &eventfd01_buffer, sizeof(eventfd_t));
-      sleep(1);
+      usleep(1000);
     }
 
   return 0;
@@ -81,16 +81,17 @@ void test_nuttx_fs_eventfd(FAR void **state)
   assert_true(pthread_create(&eventfd01_tid, NULL, threadfunc,
                              &eventfd01_efd) >= 0);
 
-  for (int i = 1; i < 5; i++)
+  for (int i = 0; i < 5; i++)
     {
       eventfd01_ret =
           write(eventfd01_efd, &eventfd01_buf, sizeof(eventfd_t));
       assert_int_equal(eventfd01_ret, sizeof(eventfd_t));
       eventfd01_buf++;
-      sleep(1);
+      usleep(1000);
     }
 
-  sleep(2);
+  pthread_join(eventfd01_tid, NULL);
   close(eventfd01_efd);
+
 #endif
 }

From f2ba4883fa2b5af83fbb9c13244de69fff9f5334 Mon Sep 17 00:00:00 2001
From: wangxingxing <wangxingxing@xiaomi.com>
Date: Mon, 17 Nov 2025 16:29:42 +0800
Subject: [PATCH 215/568] testing/fs:remove the usleep of evend_fd read to
 solve the questiong of sem wait

Remove unnecessary usleep(1000) in the read thread of eventfd test.
The eventfd read operation will block and wait for data naturally via semaphore, no additional delay is needed.

Signed-off-by: wangxingxing <wangxingxing@xiaomi.com>
---
 testing/testsuites/kernel/fs/cases/fs_eventfd_test.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c b/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
index 42f8fe425..5cc2177b0 100644
--- a/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_eventfd_test.c
@@ -54,7 +54,6 @@ __attribute__((unused)) static void *threadfunc(void *args)
   for (int i = 0; i < 5; i++)
     {
       read(fd, &eventfd01_buffer, sizeof(eventfd_t));
-      usleep(1000);
     }
 
   return 0;

From 42e3566147fd40f735569000eea68bc0c74d800c Mon Sep 17 00:00:00 2001
From: wangxingxing <wangxingxing@xiaomi.com>
Date: Thu, 7 Aug 2025 20:48:22 +0800
Subject: [PATCH 216/568] testing/fs:reduce the test time of fs test

Reduce TEST_NUM from 1000 to 100 in fs_opendir_test.c
Reduce loop count from 100 to 30 in fs_stream_test.c

Signed-off-by: wangxingxing <wangxingxing@xiaomi.com>
---
 testing/testsuites/kernel/fs/cases/fs_opendir_test.c | 2 +-
 testing/testsuites/kernel/fs/cases/fs_stream_test.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/testsuites/kernel/fs/cases/fs_opendir_test.c b/testing/testsuites/kernel/fs/cases/fs_opendir_test.c
index a92a779d6..ec42bb777 100644
--- a/testing/testsuites/kernel/fs/cases/fs_opendir_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_opendir_test.c
@@ -85,7 +85,7 @@ void test_nuttx_fs_opendir01(FAR void **state)
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define TEST_NUM 1000
+#define TEST_NUM 100
 
 /****************************************************************************
  * Public Functions
diff --git a/testing/testsuites/kernel/fs/cases/fs_stream_test.c b/testing/testsuites/kernel/fs/cases/fs_stream_test.c
index dfc83ea93..c4f44e590 100644
--- a/testing/testsuites/kernel/fs/cases/fs_stream_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_stream_test.c
@@ -119,7 +119,7 @@ void test_nuttx_fs_stream02(FAR void **state)
   char *junk = "abcdefghijklmnopqrstuvwxyz";
   long pos;
   int lc;
-  for (lc = 0; lc < 100; lc++)
+  for (lc = 0; lc < 30; lc++)
     {
       if ((stream = fopen(TESTFILENAME, "a+")) == NULL)
         {

From b80d67c6281356efde5bd72d2d1466d8bd1593fb Mon Sep 17 00:00:00 2001
From: liqinhui <liqinhui@xiaomi.com>
Date: Fri, 6 Jun 2025 10:07:25 +0800
Subject: [PATCH 217/568] netutils/netinit: Support the NETINIT_MACADDR

Support getting MAC address from boardctl(BOARDIOC_MACADDR) via NETINIT_MACADDR.

Signed-off-by: liqinhui <liqinhui@xiaomi.com>
---
 include/netutils/netinit.h |  4 ----
 netutils/netinit/Kconfig   |  7 +++++++
 netutils/netinit/netinit.c | 13 +++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/include/netutils/netinit.h b/include/netutils/netinit.h
index 3c3c85d50..320fa1498 100644
--- a/include/netutils/netinit.h
+++ b/include/netutils/netinit.h
@@ -57,10 +57,6 @@
 #  define CONFIG_NETINIT_DNSIPADDR CONFIG_NETINIT_DRIPADDR
 #endif
 
-#ifndef CONFIG_NETINIT_MACADDR
-#  define CONFIG_NETINIT_MACADDR   0x00e0deadbeef
-#endif
-
 #if !defined(CONFIG_NETINIT_THREAD) || !defined(CONFIG_ARCH_PHY_INTERRUPT) || \
     !defined(CONFIG_NETDEV_PHY_IOCTL) || !defined(CONFIG_NET_UDP)
 #  undef CONFIG_NETINIT_MONITOR
diff --git a/netutils/netinit/Kconfig b/netutils/netinit/Kconfig
index 2031c7bae..8d91b0b50 100644
--- a/netutils/netinit/Kconfig
+++ b/netutils/netinit/Kconfig
@@ -488,6 +488,13 @@ config NETINIT_SWMAC
 		With this choice, you can assign a fixed MAC address determined by
 		a NuttX configuration option.
 
+config NETINIT_MACADDR
+	bool "Device MAC address"
+	depends on BOARDCTL_MACADDR
+	---help---
+		With this choice, you can assign a fixed MAC address in the file
+		device.info (DEVICE_INFO_PATH) defined by user.
+
 endchoice # MAC address selection
 
 config NETINIT_MACADDR_1
diff --git a/netutils/netinit/netinit.c b/netutils/netinit/netinit.c
index 4433eb4a5..c0a459725 100644
--- a/netutils/netinit/netinit.c
+++ b/netutils/netinit/netinit.c
@@ -286,7 +286,9 @@ static const uint16_t g_ipv6_netmask[8] =
     defined(HAVE_MAC)
 static void netinit_set_macaddr(void)
 {
-#if defined(CONFIG_NETINIT_UIDMAC)
+#if defined(CONFIG_NETINIT_MACADDR)
+  struct boardioc_macaddr_s req;
+#elif defined(CONFIG_NETINIT_UIDMAC)
   uint8_t uid[CONFIG_BOARDCTL_UNIQUEID_SIZE];
 #elif defined(CONFIG_NET_ETHERNET)
   uint8_t mac[IFHWADDRLEN];
@@ -296,7 +298,14 @@ static void netinit_set_macaddr(void)
 
   /* Many embedded network interfaces must have a software assigned MAC */
 
-#if defined(CONFIG_NETINIT_UIDMAC)
+#if defined(CONFIG_NETINIT_MACADDR)
+  strlcpy(req.ifname, NET_DEVNAME, IFNAMSIZ);
+  if (boardctl(BOARDIOC_MACADDR, (uintptr_t)&req) == 0)
+    {
+      netlib_setmacaddr(NET_DEVNAME, req.macaddr);
+    }
+
+#elif defined(CONFIG_NETINIT_UIDMAC)
   boardctl(BOARDIOC_UNIQUEID, (uintptr_t)&uid);
   uid[0] = (uid[0] & 0b11110000) | 2; /* Locally Administered MAC */
   netlib_setmacaddr(NET_DEVNAME, uid);

From 367e9dca017ef790f2620c394e5d6f15a8d2f2fd Mon Sep 17 00:00:00 2001
From: makejian <makejian@xiaomi.com>
Date: Thu, 6 Mar 2025 22:19:29 +0800
Subject: [PATCH 218/568] testing: move nist-sts into drivers/rng directory

Move NIST Statistical Test Suite (nist-sts) testing module from testing/drivers/
into testing/drivers/rng/ directory to better organize RNG (random number generator)
related tests that utilize /dev/random device.

Changes:
- Create testing/drivers/rng/ directory structure
- Move nist-sts from testing/drivers/ to testing/drivers/rng/nist-sts
- Update build configuration file paths:
  - CMakeLists.txt
  - Makefile
  - Make.defs
- Maintain all test patches and Kconfig settings

Signed-off-by: makejian <makejian@xiaomi.com>
---
 testing/{ => drivers/rng}/nist-sts/.gitignore                | 0
 .../0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch | 0
 ...ix-bug-that-crash-in-running-a-single-test-after-ru.patch | 0
 testing/{ => drivers/rng}/nist-sts/CMakeLists.txt            | 5 +++--
 testing/{ => drivers/rng}/nist-sts/Kconfig                   | 0
 testing/{ => drivers/rng}/nist-sts/Make.defs                 | 4 ++--
 testing/{ => drivers/rng}/nist-sts/Makefile                  | 2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename testing/{ => drivers/rng}/nist-sts/.gitignore (100%)
 rename testing/{ => drivers/rng}/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch (100%)
 rename testing/{ => drivers/rng}/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch (100%)
 rename testing/{ => drivers/rng}/nist-sts/CMakeLists.txt (94%)
 rename testing/{ => drivers/rng}/nist-sts/Kconfig (100%)
 rename testing/{ => drivers/rng}/nist-sts/Make.defs (90%)
 rename testing/{ => drivers/rng}/nist-sts/Makefile (98%)

diff --git a/testing/nist-sts/.gitignore b/testing/drivers/rng/nist-sts/.gitignore
similarity index 100%
rename from testing/nist-sts/.gitignore
rename to testing/drivers/rng/nist-sts/.gitignore
diff --git a/testing/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch b/testing/drivers/rng/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
similarity index 100%
rename from testing/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
rename to testing/drivers/rng/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
diff --git a/testing/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch b/testing/drivers/rng/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch
similarity index 100%
rename from testing/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch
rename to testing/drivers/rng/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch
diff --git a/testing/nist-sts/CMakeLists.txt b/testing/drivers/rng/nist-sts/CMakeLists.txt
similarity index 94%
rename from testing/nist-sts/CMakeLists.txt
rename to testing/drivers/rng/nist-sts/CMakeLists.txt
index e61b2b191..7b2a9da79 100644
--- a/testing/nist-sts/CMakeLists.txt
+++ b/testing/drivers/rng/nist-sts/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/nist-sts/CMakeLists.txt
+# apps/testing/drivers/rng/nist-sts/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -32,7 +32,8 @@ if(CONFIG_TESTING_NIST_STS)
     FetchContent_Declare(
       nist-sts_fetch
       URL ${CONFIG_NIST_URL} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/nist-sts
-          BINARY_DIR ${CMAKE_BINARY_DIR}/apps/testing/nist-sts/nist-sts
+          BINARY_DIR
+          ${CMAKE_BINARY_DIR}/apps/testing/drivers/rng/nist-sts/nist-sts
       PATCH_COMMAND
         patch -p0 -d ${CMAKE_CURRENT_LIST_DIR}/nist-sts <
         ${CMAKE_CURRENT_LIST_DIR}/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch
diff --git a/testing/nist-sts/Kconfig b/testing/drivers/rng/nist-sts/Kconfig
similarity index 100%
rename from testing/nist-sts/Kconfig
rename to testing/drivers/rng/nist-sts/Kconfig
diff --git a/testing/nist-sts/Make.defs b/testing/drivers/rng/nist-sts/Make.defs
similarity index 90%
rename from testing/nist-sts/Make.defs
rename to testing/drivers/rng/nist-sts/Make.defs
index 3bb4a2e35..8bd85ad87 100644
--- a/testing/nist-sts/Make.defs
+++ b/testing/drivers/rng/nist-sts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/nist-sts/Make.defs
+# apps/testing/drivers/rng/nist-sts/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_NIST_STS),)
-CONFIGURED_APPS += $(APPDIR)/testing/nist-sts
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/rng/nist-sts
 endif
diff --git a/testing/nist-sts/Makefile b/testing/drivers/rng/nist-sts/Makefile
similarity index 98%
rename from testing/nist-sts/Makefile
rename to testing/drivers/rng/nist-sts/Makefile
index 4240db968..b7da67825 100644
--- a/testing/nist-sts/Makefile
+++ b/testing/drivers/rng/nist-sts/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/nist-sts/Makefile
+# apps/testing/drivers/rng/nist-sts/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

From 8804f086b3186d40c4708ba0ef9cff801a0fb9ac Mon Sep 17 00:00:00 2001
From: anjiahao <anjiahao@xiaomi.com>
Date: Mon, 10 Feb 2025 12:14:07 +0800
Subject: [PATCH 219/568] ymodem:sbrb.py send command need flush and reset
 input buffer

These changes fix reliability issues when initiating ymodem transfers
over serial connections.

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
---
 system/ymodem/sbrb.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/ymodem/sbrb.py b/system/ymodem/sbrb.py
index 0b9767384..a5c90930f 100755
--- a/system/ymodem/sbrb.py
+++ b/system/ymodem/sbrb.py
@@ -822,7 +822,9 @@ if __name__ == "__main__":
                 recvfile += i + " "
 
             fd_serial.write(("sb %s\r\n" % (recvfile)).encode())
-            tmp = fd_serial.read(len(("sb %s\r\n" % (recvfile)).encode()))
+            fd_serial.flush()
+            tmp = fd_serial.read(len(("sb %s\r\n" % (recvfile)).encode()) - 1)
+            fd_serial.reset_input_buffer()
         else:
             if args.sendto:
                 cmd = ("rb -f %s\r\n" % (args.sendto[0])).encode()
@@ -830,6 +832,7 @@ if __name__ == "__main__":
                 cmd = ("rb\r\n").encode()
 
             fd_serial.write(cmd)
+            fd_serial.flush()
             fd_serial.read(len(cmd))
 
             fd_serial.reset_input_buffer()

From 2908f101549565c881b5ae422d66de7f1da3bbce Mon Sep 17 00:00:00 2001
From: wangxingxing <wangxingxing@xiaomi.com>
Date: Mon, 14 Apr 2025 17:42:59 +0800
Subject: [PATCH 220/568] apps/system/ymodem: Optimized ymodem for burn during
 bootloader

If device automatically enters the ymodem rb mode when it starts up,
the PC tool does not need to send rb command anymore. Here, when a
specified number of consecutive 'C' are received, the subsequent
ymodem protocol content will continue.

Signed-off-by: wangxingxing <wangxingxing@xiaomi.com>
---
 system/ymodem/sbrb.py | 104 +++++++++++++++++++++++++++++++++---------
 1 file changed, 82 insertions(+), 22 deletions(-)

diff --git a/system/ymodem/sbrb.py b/system/ymodem/sbrb.py
index a5c90930f..8d93f1901 100755
--- a/system/ymodem/sbrb.py
+++ b/system/ymodem/sbrb.py
@@ -25,6 +25,7 @@ import io
 import os
 import sys
 import termios
+import time
 
 import serial
 
@@ -92,25 +93,31 @@ def ymodem_stdprogress(data):
 
 
 def ymodem_ser_read(size):
-    global fd_serial
-
     data = fd_serial.read(size)
     return data
 
 
 def ymodem_ser_write(data):
-    global fd_serial
     fd_serial.write(data)
     fd_serial.flush()
 
 
 def ymodem_ser_clear():
-    global fd_serial
-
     fd_serial.reset_input_buffer()
     fd_serial.reset_output_buffer()
 
 
+def ymodem_ser_recv_repeat_c(num, timeout):
+    except_data = b"C" * num
+    start_time = time.time()
+
+    while time.time() - start_time < timeout:
+        read_data = ymodem_ser_read(num)
+        if read_data == except_data:
+            return 0
+    return -1
+
+
 def calc_crc16(data, crc=0):
     crctable = [
         0x0000,
@@ -385,7 +392,7 @@ class ymodem:
         write=ymodem_stdwrite,
         progress=ymodem_stdprogress,
         clear=ymodem_stdclear,
-        timeout=100,
+        timeout=10,
         maxretry=RETRIESMAX,
         debug="",
         customsize=0,
@@ -452,15 +459,30 @@ class ymodem:
         return PACKET_SIZE
 
     def recv_cmd(self, cmd):
-        chunk = self.read(1)
-        if chunk == NAK:
-            return -EAGAIN
-        if chunk != cmd:
-            self.debug("should be " + binascii.hexlify(cmd).decode("utf-8"))
-            self.debug("but receive " + binascii.hexlify(chunk).decode("utf-8") + "\n")
-            return -EINVAL
-
-        return 0
+        start_time = time.time()
+        unexpected_buffer = b""
+        while time.time() - start_time < self.timeout:
+            chunk = self.read(1)
+            if chunk == cmd:
+                if unexpected_buffer:
+                    # try to decode to UTF-8
+                    decoded = unexpected_buffer.decode("utf-8", errors="replace")
+                    self.progress(f"Ignored unexpected text: {decoded}\n")
+                return 0
+            elif chunk == NAK:
+                if unexpected_buffer:
+                    decoded = unexpected_buffer.decode("utf-8", errors="replace")
+                    self.progress(f"Ignored unexpected text: {decoded}\n")
+                print("EAGAIN!!!")
+                return -EAGAIN
+            elif chunk == b"":
+                continue
+            else:
+                unexpected_buffer += chunk
+        if unexpected_buffer:
+            decoded = unexpected_buffer.decode("utf-8", errors="replace")
+            self.progress(f"Ignored unexpected text: {decoded}\n")
+        return -EINVAL
 
     def send_handshake(self):
         self.write(CRC)
@@ -686,7 +708,7 @@ class ymodem:
                     return -1
 
                 self.progress("recv ret %d\n" % ret)
-                self.debug("recv frist packet\n")
+                self.debug("recv first packet\n")
                 self.retries += 1
                 continue
 
@@ -807,6 +829,29 @@ if __name__ == "__main__":
         help="This opthin set max retry for transmission",
     )
 
+    parser.add_argument(
+        "-c",
+        "--countofc",
+        type=int,
+        default=0,
+        help="""
+            When this value is greater than 0, it means that the rb command is not sent to
+            device, but to receive a specified number of consecutive 'C'.
+            If do not receive continuous 'C', time out and exit.
+            """,
+    )
+
+    parser.add_argument(
+        "-w",
+        "--waitctimeout",
+        type=int,
+        default=30,
+        help="""
+            When the -c parameter is valid, this arg will determine whether it has timed out
+            while waiting for consecutive Cs. The unit is second.
+            """,
+    )
+
     parser.add_argument(
         "--debug", help="This opthin is save debug log on host", default=""
     )
@@ -821,19 +866,34 @@ if __name__ == "__main__":
             for i in args.recvfrom:
                 recvfile += i + " "
 
+            if args.kblocksize:
+                recvfile += "-k %d " % (args.kblocksize)
+
             fd_serial.write(("sb %s\r\n" % (recvfile)).encode())
             fd_serial.flush()
             tmp = fd_serial.read(len(("sb %s\r\n" % (recvfile)).encode()) - 1)
             fd_serial.reset_input_buffer()
         else:
-            if args.sendto:
-                cmd = ("rb -f %s\r\n" % (args.sendto[0])).encode()
+            if args.countofc:
+                ret = ymodem_ser_recv_repeat_c(args.countofc, args.waitctimeout)
+                if ret < 0:
+                    print("read C timeout")
+                    fd_serial.close()
+                    sys.exit(1)
             else:
-                cmd = ("rb\r\n").encode()
+                if args.sendto:
+                    cmd = ("rb -f %s" % args.sendto[0]).encode()
+                else:
+                    cmd = "rb".encode()
 
-            fd_serial.write(cmd)
-            fd_serial.flush()
-            fd_serial.read(len(cmd))
+                if args.kblocksize:
+                    cmd += (" -k %d" % args.kblocksize).encode()
+
+                cmd += b"\r\n"
+
+                fd_serial.write(cmd)
+                fd_serial.flush()
+                fd_serial.read(len(cmd))
 
             fd_serial.reset_input_buffer()
         sbrb = ymodem(

From 102c0788341f1c73d298a3acab9a81dc03a63b22 Mon Sep 17 00:00:00 2001
From: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
Date: Wed, 4 Jun 2025 14:53:31 +0800
Subject: [PATCH 221/568] mtd/nvs: modify config name to MTD_CONFIG_NVS part1

Because the MTD_CONFIG configuration item in
drivers/mtd/Kconfig has changed

Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
---
 system/cfgdata/Kconfig           | 2 +-
 testing/fs/mtd_config_fs/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/cfgdata/Kconfig b/system/cfgdata/Kconfig
index 23eb9ebce..64f51d40e 100644
--- a/system/cfgdata/Kconfig
+++ b/system/cfgdata/Kconfig
@@ -6,7 +6,7 @@
 config SYSTEM_CFGDATA
 	tristate "Cfgdata Command"
 	default n
-	depends on MTD_CONFIG
+	depends on !MTD_CONFIG_NONE
 	---help---
 		Enable support for the CFGDATA tool.
 
diff --git a/testing/fs/mtd_config_fs/Kconfig b/testing/fs/mtd_config_fs/Kconfig
index 02f8b752a..d2c9c2e8c 100644
--- a/testing/fs/mtd_config_fs/Kconfig
+++ b/testing/fs/mtd_config_fs/Kconfig
@@ -6,7 +6,7 @@
 config TESTING_MTD_CONFIG_FAIL_SAFE
 	tristate "MTD Config fail-safe storage test"
 	default n
-	depends on MTD_CONFIG_FAIL_SAFE
+	depends on MTD_CONFIG_NVS
 	select MTD_CONFIG_NAMED
 	---help---
 		Enable the fail-safe storage test

From d9d434d97eded8b303d20d48d46adf7b22205e3f Mon Sep 17 00:00:00 2001
From: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
Date: Tue, 3 Jun 2025 17:33:16 +0800
Subject: [PATCH 222/568] mtdconfig: lomtdconfig device change to depends on
 !MTD_CONFIG_NONE

Because  MTD_CONFIG configuration item in drivers/mtd/Kconfig
has changed.

Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
---
 nshlib/nsh_command.c | 2 +-
 nshlib/nsh_fscmds.c  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index cace8eeac..ec3f8a385 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -322,7 +322,7 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #ifndef CONFIG_DISABLE_MOUNTPOINT
 #  if defined(CONFIG_MTD_LOOP) && !defined(CONFIG_NSH_DISABLE_LOMTD)
-#    ifdef CONFIG_MTD_CONFIG
+#    ifndef CONFIG_MTD_CONFIG_NONE
   CMD_MAP("lomtd",    cmd_lomtd,    3, 10,
     "[-d <dev-path>] | [[-o <offset>] [-e <erase-size>] "
     "[-b <sect-size>] [-c <configdata>] <dev-path> <file-path>]]"),
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 447d45e72..13f26f694 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -1308,7 +1308,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   int sectsize = -1;
   off_t offset = 0;
   bool badarg = false;
-#  ifdef CONFIG_MTD_CONFIG
+#  ifndef CONFIG_MTD_CONFIG_NONE
   int configdata = 0;
 #  endif
   int ret = ERROR;
@@ -1324,7 +1324,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
    * NOTE that the -o and -r options are accepted with the -d option, but
    * will be ignored.
    */
-#  ifdef CONFIG_MTD_CONFIG
+#  ifndef CONFIG_MTD_CONFIG_NONE
   while ((option = getopt(argc, argv, "d:o:e:b:c:")) != ERROR)
 #  else
   while ((option = getopt(argc, argv, "d:o:e:b:")) != ERROR)
@@ -1349,7 +1349,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
           sectsize = atoi(optarg);
           break;
 
-#  ifdef CONFIG_MTD_CONFIG
+#  ifndef CONFIG_MTD_CONFIG_NONE
         case 'c':
           configdata = atoi(optarg);
           break;
@@ -1435,7 +1435,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
       setup.sectsize   = sectsize;   /* The sector size to use with the block device */
       setup.erasesize  = erasesize;  /* The sector size to use with the block device */
       setup.offset     = offset;     /* An offset that may be applied to the device */
-#  ifdef CONFIG_MTD_CONFIG
+#  ifndef CONFIG_MTD_CONFIG_NONE
       setup.configdata = configdata; /* Is a loop mtdconfig device */
 #  endif
 

From eda1309745e4d3b7ee7bec107ebc93e52225b2eb Mon Sep 17 00:00:00 2001
From: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
Date: Wed, 28 Jan 2026 15:56:30 +0800
Subject: [PATCH 223/568] mtdconfig: modify config names for mtdconfig
 testcases 2

change nvs module testcase name TESTING_MTD_CONFIG_FAIL_SAFE
to TESTING_MTD_CONFIG_NVS and modify the configuration names
related to mtdconfig testing.

Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
---
 testing/fs/mtd_config_fs/CMakeLists.txt       | 10 +--
 testing/fs/mtd_config_fs/Kconfig              | 20 +++---
 testing/fs/mtd_config_fs/Make.defs            |  2 +-
 testing/fs/mtd_config_fs/Makefile             |  8 +--
 .../mtd_config_fs/mtd_config_fs_test_main.c   | 66 +++++++++----------
 5 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/testing/fs/mtd_config_fs/CMakeLists.txt b/testing/fs/mtd_config_fs/CMakeLists.txt
index 70201dca9..32651349b 100644
--- a/testing/fs/mtd_config_fs/CMakeLists.txt
+++ b/testing/fs/mtd_config_fs/CMakeLists.txt
@@ -20,16 +20,16 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE)
+if(CONFIG_TESTING_MTD_CONFIG_NVS)
   nuttx_add_application(
     NAME
-    ${CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_PROGNAME}
+    ${CONFIG_TESTING_MTD_CONFIG_PROGNAME}
     PRIORITY
-    ${CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_PRIORITY}
+    ${CONFIG_TESTING_MTD_CONFIG_PRIORITY}
     STACKSIZE
-    ${CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_STACKSIZE}
+    ${CONFIG_TESTING_MTD_CONFIG_STACKSIZE}
     MODULE
-    ${CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE}
+    ${CONFIG_TESTING_MTD_CONFIG_NVS}
     SRCS
     mtd_config_fs_test_main.c)
 endif()
diff --git a/testing/fs/mtd_config_fs/Kconfig b/testing/fs/mtd_config_fs/Kconfig
index d2c9c2e8c..0ca8d6d47 100644
--- a/testing/fs/mtd_config_fs/Kconfig
+++ b/testing/fs/mtd_config_fs/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTING_MTD_CONFIG_FAIL_SAFE
+config TESTING_MTD_CONFIG_NVS
 	tristate "MTD Config fail-safe storage test"
 	default n
 	depends on MTD_CONFIG_NVS
@@ -11,40 +11,40 @@ config TESTING_MTD_CONFIG_FAIL_SAFE
 	---help---
 		Enable the fail-safe storage test
 
-if TESTING_MTD_CONFIG_FAIL_SAFE
+if TESTING_MTD_CONFIG_NVS
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_PROGNAME
+config TESTING_MTD_CONFIG_PROGNAME
 	string "Program name"
 	default "mtdconfig_fs_test"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME
+config TESTING_MTD_CONFIG_MOUNTPT_NAME
 	string "MTD driver mount pt"
 	default "/dev/mtdnvs_flash"
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_MAXNAME
+config TESTING_MTD_CONFIG_MOUNTPT_MAXNAME
 	int "MTD driver mount pt path len"
 	default 64
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+config TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
 	int "MTD flash section size"
 	default 4096
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_COUNT
+config TESTING_MTD_CONFIG_FLASH_SECTION_COUNT
 	int "MTD flash section count"
 	default 3
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_PRIORITY
+config TESTING_MTD_CONFIG_PRIORITY
 	int "MTD nvs test task priority"
 	default 100
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_STACKSIZE
+config TESTING_MTD_CONFIG_STACKSIZE
 	int "MTD nvs test stack size"
 	default 4096
 
-config TESTING_MTD_CONFIG_FAIL_SAFE_VERBOSE
+config TESTING_MTD_CONFIG_VERBOSE
 	bool "Verbose output"
 	default n
 
diff --git a/testing/fs/mtd_config_fs/Make.defs b/testing/fs/mtd_config_fs/Make.defs
index 0c8bde14c..72fbf13e5 100644
--- a/testing/fs/mtd_config_fs/Make.defs
+++ b/testing/fs/mtd_config_fs/Make.defs
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE),)
+ifneq ($(CONFIG_TESTING_MTD_CONFIG_NVS),)
 CONFIGURED_APPS += $(APPDIR)/testing/fs/mtd_config_fs
 endif
diff --git a/testing/fs/mtd_config_fs/Makefile b/testing/fs/mtd_config_fs/Makefile
index c3ad88386..359b210e6 100644
--- a/testing/fs/mtd_config_fs/Makefile
+++ b/testing/fs/mtd_config_fs/Makefile
@@ -24,10 +24,10 @@ include $(APPDIR)/Make.defs
 
 # MTD nvs test application info
 
-PROGNAME = $(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_PROGNAME)
-PRIORITY = $(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_STACKSIZE)
-MODULE = $(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE)
+PROGNAME = $(CONFIG_TESTING_MTD_CONFIG_PROGNAME)
+PRIORITY = $(CONFIG_TESTING_MTD_CONFIG_PRIORITY)
+STACKSIZE = $(CONFIG_TESTING_MTD_CONFIG_STACKSIZE)
+MODULE = $(CONFIG_TESTING_MTD_CONFIG_NVS)
 
 # MTD nvs test
 
diff --git a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index 16ed4cb7e..c85df92aa 100644
--- a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
@@ -81,7 +81,7 @@ begin_packed_struct struct nvs_ate
 
 struct mtdnvs_ctx_s
 {
-  char mountdir[CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_MAXNAME];
+  char mountdir[CONFIG_TESTING_MTD_CONFIG_MOUNTPT_MAXNAME];
   struct mallinfo mmbefore;
   struct mallinfo mmprevious;
   struct mallinfo mmafter;
@@ -351,7 +351,7 @@ static void show_useage(void)
   printf("Usage : mtdconfig_fs_test [OPTION [ARG]] ...\n");
   printf("-h    show this help statement\n");
   printf("-m    mount point to be tested e.g. [%s]\n",
-          CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME);
+          CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME);
 }
 
 /****************************************************************************
@@ -402,12 +402,12 @@ static int setup(struct mtdnvs_ctx_s *ctx)
   int ret;
   FAR struct inode *sys_node;
 
-  ret = find_mtddriver(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME,
+  ret = find_mtddriver(CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME,
     &sys_node);
   if (ret < 0)
     {
       printf("ERROR: open %s failed: %d\n",
-        CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, ret);
+        CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME, ret);
       return -errno;
     }
 
@@ -608,7 +608,7 @@ static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
 
   printf("%s: test begin\n", __func__);
 
-  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, O_RDWR);
+  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME, O_RDWR);
   if (mtd_fd < 0)
     {
       printf("%s:mtdnvs_register failed, ret=%d\n", __func__, mtd_fd);
@@ -662,7 +662,7 @@ static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
   /* set unused flash to 0xff */
 
   for (i = 2 * (strlen(TEST_KEY1) + strlen(TEST_DATA1) + 2) + padding_size;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 4 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -699,7 +699,7 @@ static void test_nvs_corrupt_expire(struct mtdnvs_ctx_s *ctx)
   /* write close ate, mark section 0 as closed */
 
   ret = write_close_ate(mtd_fd, ctx,
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+    CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
     - 4 * ate_size);
   if (ret < 0)
     {
@@ -798,7 +798,7 @@ static void test_nvs_corrupted_write(struct mtdnvs_ctx_s *ctx)
 
   printf("%s: test begin\n", __func__);
 
-  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, O_RDWR);
+  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME, O_RDWR);
   if (mtd_fd < 0)
     {
       printf("%s:mtdnvs_register failed, ret=%d\n", __func__, mtd_fd);
@@ -854,7 +854,7 @@ static void test_nvs_corrupted_write(struct mtdnvs_ctx_s *ctx)
   /* set unused flash to 0xff */
 
   for (i = 2 * (sizeof(key1) + sizeof(wr_buf_1)) + padding_size;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 3 * nvs_ate_size(ctx); i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -966,7 +966,7 @@ static void test_nvs_gc(struct mtdnvs_ctx_s *ctx)
 
   size_t kv_size = nvs_align_up(ctx, 44 + 4) + ate_size;
   size_t block_max_write_size =
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE - ate_size;
+    CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE - ate_size;
   uint16_t block_max_write_nums = block_max_write_size / kv_size;
 
   const uint16_t max_writes = block_max_write_nums + 1;
@@ -1235,9 +1235,9 @@ static void test_nvs_gc_3sectors(struct mtdnvs_ctx_s *ctx)
 
   size_t kv_size = nvs_align_up(ctx, 44 + 4) + ate_size;
   uint16_t max_id =
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / kv_size;
+    CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE / kv_size;
   const uint16_t max_writes =
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE * 2 / kv_size + 1;
+    CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE * 2 / kv_size + 1;
   const uint16_t max_writes_2 = max_writes + max_id;
   const uint16_t max_writes_3 = max_writes_2 + max_id;
   const uint16_t max_writes_4 = max_writes_3 + max_id;
@@ -1435,7 +1435,7 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
 
   printf("%s: test begin\n", __func__);
 
-  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, O_RDWR);
+  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME, O_RDWR);
   if (mtd_fd < 0)
     {
       printf("%s:mtdnvs_register failed, ret=%d\n", __func__, mtd_fd);
@@ -1446,7 +1446,7 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
 
   for (loop_section = 0;
     loop_section <
-      CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_COUNT - 1;
+      CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_COUNT - 1;
     loop_section++)
     {
       /* write valid data */
@@ -1474,7 +1474,7 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
       /* set unused flash to 0xff */
 
       for (i = 2 * (sizeof(key1) + sizeof(wr_buf));
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 4 * ate_size; i++)
         {
           ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -1490,7 +1490,7 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
       ret = write_ate(mtd_fd, ctx, key1, sizeof(wr_buf),
         sizeof(wr_buf) + sizeof(key1),
         (loop_section ==
-        CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_COUNT - 2)
+        CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_COUNT - 2)
         ? false : true);
       if (ret < 0)
         {
@@ -1512,14 +1512,14 @@ static void test_nvs_corrupted_sector_close(struct mtdnvs_ctx_s *ctx)
         }
 
       if (loop_section ==
-        CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_COUNT - 2)
+        CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_COUNT - 2)
         {
           ret  = write_corrupted_close_ate(mtd_fd, ctx);
         }
       else
         {
           ret = write_close_ate(mtd_fd, ctx,
-            CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+            CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
             - 4 * ate_size);
         }
 
@@ -1787,7 +1787,7 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   printf("%s: test begin\n", __func__);
 
-  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, O_RDWR);
+  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME, O_RDWR);
   if (mtd_fd < 0)
     {
       printf("%s:mtdnvs_register failed, ret=%d\n", __func__, mtd_fd);
@@ -1813,7 +1813,7 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
   /* set unused flash to 0xff */
 
   for (i = strlen(TEST_KEY1) + strlen(TEST_DATA1) + 2;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 6 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -1834,9 +1834,9 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   /* set unused flash to 0xff */
 
-  for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+  for (i = CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 5 * ate_size;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 2 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -1865,8 +1865,8 @@ static void test_nvs_gc_corrupt_close_ate(struct mtdnvs_ctx_s *ctx)
 
   /* set unused flash to 0xff in section 1 */
 
-  for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+  for (i = CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE;
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -1964,7 +1964,7 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   printf("%s: test begin\n", __func__);
 
-  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME, O_RDWR);
+  mtd_fd = open(CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME, O_RDWR);
   if (mtd_fd < 0)
     {
       printf("%s:mtdnvs_register failed, ret=%d\n", __func__, mtd_fd);
@@ -1974,7 +1974,7 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
   /* set unused flash to 0xff */
 
   for (i = 0 ;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2; i++)
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE / 2; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
       if (ret != sizeof(erase_value))
@@ -1992,9 +1992,9 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
       goto test_fail;
     }
 
-  for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2
+  for (i = CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE / 2
         + ate_size;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - 2 * ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -2016,7 +2016,7 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
   /* write close ate, mark section 0 as closed */
 
   ret = write_close_ate(mtd_fd, ctx,
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2);
+    CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE / 2);
   if (ret < 0)
     {
       printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
@@ -2025,8 +2025,8 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
 
   /* set unused flash to 0xff in section 1 */
 
-  for (i = CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE;
-        i < CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE
+  for (i = CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE;
+        i < CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE
         - ate_size; i++)
     {
       ret = write(mtd_fd, &erase_value, sizeof(erase_value));
@@ -2040,7 +2040,7 @@ static void test_nvs_gc_corrupt_ate(struct mtdnvs_ctx_s *ctx)
   /* write close ate, mark section 1 as closed */
 
   ret = write_close_ate(mtd_fd, ctx,
-    CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_FLASH_SECTION_SIZE / 2);
+    CONFIG_TESTING_MTD_CONFIG_FLASH_SECTION_SIZE / 2);
   if (ret < 0)
     {
       printf("%s:write gc_done ate failed, ret=%d\n", __func__, ret);
@@ -2582,7 +2582,7 @@ int main(int argc, FAR char *argv[])
 
   memset(ctx, 0, sizeof(struct mtdnvs_ctx_s));
 
-  strlcpy(ctx->mountdir, CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE_MOUNTPT_NAME,
+  strlcpy(ctx->mountdir, CONFIG_TESTING_MTD_CONFIG_MOUNTPT_NAME,
     sizeof(ctx->mountdir));
 
   /* Opt Parse */

From b2d4ad67b1f789f80c8ce1903d1b75c7d535b38c Mon Sep 17 00:00:00 2001
From: hujun5 <hujun5@xiaomi.com>
Date: Sun, 1 Feb 2026 15:16:37 +0800
Subject: [PATCH 224/568] testing/ostest: Add performance event time counter
 test

Integrate up_perf_gettime() test into ostest suite with comprehensive
test coverage including monotonicity verification, interval statistics,
and frequency validation. The test verifies performance event counter
functionality across 5 independent test cases with proper error handling.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
---
 testing/ostest/CMakeLists.txt |   4 +
 testing/ostest/Makefile       |   4 +
 testing/ostest/ostest.h       |   6 +
 testing/ostest/ostest_main.c  |   8 ++
 testing/ostest/perf_gettime.c | 231 ++++++++++++++++++++++++++++++++++
 5 files changed, 253 insertions(+)
 create mode 100644 testing/ostest/perf_gettime.c

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index a8a2ca921..6096c7ce6 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -161,6 +161,10 @@ if(CONFIG_TESTING_OSTEST)
     list(APPEND SRCS hrtimer.c)
   endif()
 
+  if(CONFIG_ARCH_HAVE_PERF_EVENTS)
+    list(APPEND SRCS perf_gettime.c)
+  endif()
+
   if(CONFIG_BUILD_FLAT)
     list(APPEND SRCS wdog.c spinlock.c)
   endif()
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 817fcdb51..1f6a28b2f 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -166,6 +166,10 @@ CSRCS += hrtimer.c
 endif
 endif
 
+ifeq ($(CONFIG_ARCH_HAVE_PERF_EVENTS),y)
+CSRCS += perf_gettime.c
+endif
+
 ifeq ($(CONFIG_BUILD_FLAT),y)
 CSRCS += wdog.c spinlock.c
 endif
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index 1a396ba28..f4f09ca8b 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -290,6 +290,12 @@ void smp_call_test(void);
 
 void spinlock_test(void);
 
+/* perf_gettime.c ***********************************************************/
+
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
+void perf_gettime_test(void);
+#endif
+
 /* APIs exported (conditionally) by the OS specifically for testing of
  * priority inheritance
  */
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 8247b4788..c711a8db6 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -635,6 +635,14 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
+#if defined(CONFIG_ARCH_PERF_EVENTS) && !defined(CONFIG_ARCH_PERF_EVENTS_USER_ACCESS)
+      /* Verify performance event time counter */
+
+      printf("\nuser_main: performance event time counter test\n");
+      perf_gettime_test();
+      check_test_memory_usage();
+#endif
+
 #if defined(CONFIG_HRTIMER) && defined(CONFIG_BUILD_FLAT)
       /* Verify hrtimer */
 
diff --git a/testing/ostest/perf_gettime.c b/testing/ostest/perf_gettime.c
new file mode 100644
index 000000000..35fcaabff
--- /dev/null
+++ b/testing/ostest/perf_gettime.c
@@ -0,0 +1,231 @@
+/****************************************************************************
+ * apps/testing/ostest/perf_gettime.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sys/types.h>
+
+#include "ostest.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Performance event test parameters */
+
+#define PERF_ITERATIONS     10
+#define SLEEP_INTERVAL_USEC 100000  /* 100ms */
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_PERF_EVENTS
+static clock_t g_prev_time = 0;
+static clock_t g_min_interval = ULONG_MAX;
+static clock_t g_max_interval = 0;
+static unsigned long g_total_interval = 0;
+static int g_iteration_count = 0;
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: perf_gettime_test
+ *
+ * Description:
+ *   Test performance event time counter: perf_gettime()
+ *
+ *   This test verifies:
+ *   1. perf_gettime() returns non-zero values
+ *   2. Time values are monotonically increasing
+ *   3. Multiple calls return consistent intervals
+ *   4. Performance counter frequency is reasonable
+ *
+ ****************************************************************************/
+
+void perf_gettime_test(void)
+{
+#ifdef CONFIG_ARCH_PERF_EVENTS
+  int i;
+  clock_t curr_time;
+  clock_t time_interval;
+  unsigned long perf_freq;
+
+  printf("\nperf_gettime_test: Starting performance event test\n");
+
+  /* Test 1: Get initial time value */
+
+  printf("\nTest 1: Getting initial performance time value\n");
+  g_prev_time = perf_gettime();
+  printf("perf_gettime_test: Initial time = %lu\n",
+          (unsigned long)g_prev_time);
+
+  /* We expect the counter to not be zero (unless just initialized) */
+
+  if (g_prev_time == 0)
+    {
+      printf("perf_gettime_test: WARNING - Initial time is zero\n");
+    }
+
+  /* Test 2: Verify monotonically increasing time */
+
+  printf("\nTest 2: Verify monotonically increasing time values\n");
+  g_total_interval = 0;
+  g_min_interval = ULONG_MAX;
+  g_max_interval = 0;
+  g_iteration_count = 0;
+
+  for (i = 0; i < PERF_ITERATIONS; i++)
+    {
+      /* Sleep for a short interval */
+
+      usleep(SLEEP_INTERVAL_USEC);
+
+      /* Get new time value */
+
+      curr_time = perf_gettime();
+      time_interval = curr_time - g_prev_time;
+
+      printf("perf_gettime_test [%d]: current=%lu, interval=%lu\n",
+             i, (unsigned long)curr_time, (unsigned long)time_interval);
+
+      /* Verify time is monotonically increasing */
+
+      if (curr_time <= g_prev_time)
+        {
+          printf("perf_gettime_test: ERROR - Time not monotonically "
+                 "increasing at iteration %d\n", i);
+          printf("  Previous time: %lu, Current time: %lu\n",
+                 (unsigned long)g_prev_time, (unsigned long)curr_time);
+          ASSERT(false);
+        }
+
+      /* Track intervals */
+
+      if (time_interval < g_min_interval)
+        {
+          g_min_interval = time_interval;
+        }
+
+      if (time_interval > g_max_interval)
+        {
+          g_max_interval = time_interval;
+        }
+
+      g_total_interval += time_interval;
+      g_iteration_count++;
+
+      g_prev_time = curr_time;
+    }
+
+  /* Test 3: Analyze time intervals */
+
+  printf("\nTest 3: Analyzing time intervals\n");
+
+  if (g_iteration_count > 0)
+    {
+      unsigned long avg_interval = g_total_interval / g_iteration_count;
+
+      printf("perf_gettime_test: Interval statistics:\n");
+      printf("  Minimum interval: %lu\n", (unsigned long)g_min_interval);
+      printf("  Maximum interval: %lu\n", (unsigned long)g_max_interval);
+      printf("  Average interval: %lu\n", avg_interval);
+      printf("  Total iterations: %d\n", g_iteration_count);
+
+      /* Verify that intervals are within reasonable bounds */
+
+      if (g_max_interval == 0 || g_min_interval == ULONG_MAX)
+        {
+          printf("perf_gettime_test: WARNING - \
+                  No time intervals recorded\n");
+        }
+      else
+        {
+          printf("perf_gettime_test: Time intervals look reasonable\n");
+        }
+    }
+
+  /* Test 4: Test perf_getfreq() if available */
+
+  printf("\nTest 4: Getting performance counter frequency\n");
+
+  perf_freq = perf_getfreq();
+  printf("perf_gettime_test: Performance frequency = %lu Hz\n", perf_freq);
+
+  if (perf_freq == ULONG_MAX || perf_freq == 0)
+    {
+      printf("perf_gettime_test: WARNING - Performance frequency is " \
+             "invalid or uninitialized\n");
+    }
+  else
+    {
+      printf("perf_gettime_test: Performance frequency is valid\n");
+    }
+
+  /* Test 5: Multiple rapid calls */
+
+  printf("\nTest 5: Testing multiple rapid calls\n");
+
+  curr_time = perf_gettime();
+  printf("perf_gettime_test: Rapid call 1: %lu\n", (unsigned long)curr_time);
+
+  /* Make several rapid calls */
+
+  for (i = 0; i < 5; i++)
+    {
+      clock_t t = perf_gettime();
+      printf("perf_gettime_test: Rapid call %d: %lu\n", i + 2,
+              (unsigned long)t);
+
+      /* Verify either monotonic increase or same value (on fast systems) */
+
+      if (t < curr_time)
+        {
+          printf("perf_gettime_test: ERROR - Time went backwards!\n");
+          ASSERT(false);
+        }
+
+      curr_time = t;
+    }
+
+  printf("\nperf_gettime_test: All performance event tests PASSED\n");
+
+#else /* CONFIG_ARCH_PERF_EVENTS */
+
+  printf("\nperf_gettime_test: Skipping test - "
+         "CONFIG_ARCH_PERF_EVENTS not enabled\n");
+
+#endif /* CONFIG_ARCH_PERF_EVENTS */
+}

From eb9b9a2d608c160bb25f67bce5eca499210b0bb5 Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Thu, 8 May 2025 22:10:40 +0800
Subject: [PATCH 225/568] netutils/rexecd: fix rpname mismatch with rexec when
 using AF_RPMSG

When using AF_RPMSG (-r option), rexecd was setting the rp_name
to the raw port number, while rexec was using htons(port). This
caused a mismatch where rexec couldn't connect to rexecd.

This commit fixes the issue by applying htons() to REXECD_PORT
when setting rp_name in the AF_RPMSG case, making it consistent
with the rexec client implementation.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 netutils/rexecd/rexecd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netutils/rexecd/rexecd.c b/netutils/rexecd/rexecd.c
index 2e462083c..6c238d586 100644
--- a/netutils/rexecd/rexecd.c
+++ b/netutils/rexecd/rexecd.c
@@ -223,7 +223,7 @@ int main(int argc, FAR char **argv)
       case AF_RPMSG:
         ((FAR struct sockaddr_rpmsg *)&addr)->rp_family = AF_RPMSG;
         snprintf(((FAR struct sockaddr_rpmsg *)&addr)->rp_name,
-                 RPMSG_SOCKET_NAME_SIZE, "%d", REXECD_PORT);
+                 RPMSG_SOCKET_NAME_SIZE, "%d", htons(REXECD_PORT));
         ret = sizeof(struct sockaddr_rpmsg);
     }
 

From f9dc9bc21e6a2b3c83826bc5efae78903f31455f Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Mon, 25 Nov 2024 10:44:11 +0800
Subject: [PATCH 226/568] testing: Fix cmocka_syscall_test crash when
 CONFIG_FDCHECK enable

Fix cmocka_syscall_test crash when CONFIG_FDCHECK is enabled.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 testing/testsuites/kernel/syscall/cases/connect_test.c | 6 ++++--
 testing/testsuites/kernel/syscall/cases/dup_test.c     | 2 +-
 testing/testsuites/kernel/syscall/cases/listen_test.c  | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/testing/testsuites/kernel/syscall/cases/connect_test.c b/testing/testsuites/kernel/syscall/cases/connect_test.c
index 530e9c8fd..8c808e1a4 100644
--- a/testing/testsuites/kernel/syscall/cases/connect_test.c
+++ b/testing/testsuites/kernel/syscall/cases/connect_test.c
@@ -77,11 +77,13 @@ __attribute__((unused)) static struct test_case_t
 
 tdat[] =
     {
+    #ifndef CONFIG_FDCHECK
         {
           PF_INET, SOCK_STREAM, 0, (struct sockaddr *)&sin1,
         sizeof(struct sockaddr_in), -1, EBADF, setup0, cleanup0,
         "bad file descriptor"
         },
+    #endif
     #ifndef UCLINUX
 
         /* Skip since uClinux does not implement memory protection */
@@ -97,12 +99,12 @@ tdat[] =
           PF_INET, SOCK_STREAM, 0, (struct sockaddr *)&sin1, 3, -1, EINVAL,
         setup1, cleanup1, "invalid salen"
         },
-
+    #ifndef CONFIG_FDCHECK
         {
           0, 0, 0, (struct sockaddr *)&sin1, sizeof(sin1), -1, ENOTSOCK,
         setup0, cleanup0, "invalid socket"
         },
-
+    #endif
         {
           PF_INET, SOCK_STREAM, 0, (struct sockaddr *)&sin1,
           sizeof(sin1), -1, EISCONN, setup2, cleanup1,
diff --git a/testing/testsuites/kernel/syscall/cases/dup_test.c b/testing/testsuites/kernel/syscall/cases/dup_test.c
index 0d31adae1..4794866be 100644
--- a/testing/testsuites/kernel/syscall/cases/dup_test.c
+++ b/testing/testsuites/kernel/syscall/cases/dup_test.c
@@ -78,7 +78,7 @@ void test_nuttx_syscall_dup01(FAR void **state)
 
 void test_nuttx_syscall_dup02(FAR void **state)
 {
-#ifndef CONFIG_FDSAN
+#if !defined(CONFIG_FDSAN) && !defined(CONFIG_FDCHECK)
   int fds[] =
   {
     -1, 1500
diff --git a/testing/testsuites/kernel/syscall/cases/listen_test.c b/testing/testsuites/kernel/syscall/cases/listen_test.c
index 7dc4ba266..de016b009 100644
--- a/testing/testsuites/kernel/syscall/cases/listen_test.c
+++ b/testing/testsuites/kernel/syscall/cases/listen_test.c
@@ -68,10 +68,12 @@ void test_nuttx_syscall_listen01(FAR void **state)
 
   tdat[] =
     {
+    #ifndef CONFIG_FDCHECK
         {
           0, 0, 0, 0, -1, EBADF, "setup0", "cleanup0",
         "bad file descriptor"
         },
+    #endif
 
         {
           0, 0, 0, 0, -1, ENOTSOCK, "setup0", "cleanup0", "not a socket"

From bb9229de06e33baa6b24821aa15bebd51b272b6d Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Wed, 19 Mar 2025 21:38:01 +0800
Subject: [PATCH 227/568] testing/drivers: set default vendor dalay to 1 for
 rtc cases run correctly

Set default VENDOR_DELAY to 1 for reliable test execution

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 testing/drivers/drivertest/drivertest_rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/drivers/drivertest/drivertest_rtc.c b/testing/drivers/drivertest/drivertest_rtc.c
index e25e93c55..62e4fd0a2 100644
--- a/testing/drivers/drivertest/drivertest_rtc.c
+++ b/testing/drivers/drivertest/drivertest_rtc.c
@@ -54,7 +54,7 @@
 #define DEFAULT_TIME_OUT      5
 #define SLEEPSECONDS          10
 #define RTC_SIGNO             13
-#define VENDOR_DELAY          0
+#define VENDOR_DELAY          1
 
 #define OPTARG_TO_VALUE(value, type, base)                            \
   do                                                                  \

From d48b45000d1d083082f7a1650f351573c36a87d0 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Mon, 23 Dec 2024 13:42:20 +0800
Subject: [PATCH 228/568] netlib_xarp: remove redundant cast

removes redundant type casts in ARP-related network library functions.
The casts from req.arp_dev (already a char array) to (FAR char *)
are unnecessary and can be safely removed.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 netutils/netlib/netlib_delarp.c | 3 +--
 netutils/netlib/netlib_getarp.c | 3 +--
 netutils/netlib/netlib_setarp.c | 3 +--
 nshlib/nsh_netcmds.c            | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/netutils/netlib/netlib_delarp.c b/netutils/netlib/netlib_delarp.c
index 7a263211c..ac8fc1ad6 100644
--- a/netutils/netlib/netlib_delarp.c
+++ b/netutils/netlib/netlib_delarp.c
@@ -76,8 +76,7 @@ int netlib_del_arpmapping(FAR const struct sockaddr_in *inaddr,
           memset(&req.arp_ha, 0, sizeof(struct sockaddr_in));
           if (ifname != NULL)
             {
-               strlcpy((FAR char *)&req.arp_dev, ifname,
-                       sizeof(req.arp_dev));
+               strlcpy(req.arp_dev, ifname, sizeof(req.arp_dev));
             }
           else
             {
diff --git a/netutils/netlib/netlib_getarp.c b/netutils/netlib/netlib_getarp.c
index d023bce30..b98d99f9b 100644
--- a/netutils/netlib/netlib_getarp.c
+++ b/netutils/netlib/netlib_getarp.c
@@ -77,8 +77,7 @@ int netlib_get_arpmapping(FAR const struct sockaddr_in *inaddr,
           memcpy(&req.arp_pa, inaddr, sizeof(struct sockaddr_in));
           if (ifname != NULL)
             {
-               strlcpy((FAR char *)&req.arp_dev, ifname,
-                       sizeof(req.arp_dev));
+               strlcpy(req.arp_dev, ifname, sizeof(req.arp_dev));
             }
           else
             {
diff --git a/netutils/netlib/netlib_setarp.c b/netutils/netlib/netlib_setarp.c
index 1c2261d4c..a62ac9a9e 100644
--- a/netutils/netlib/netlib_setarp.c
+++ b/netutils/netlib/netlib_setarp.c
@@ -81,8 +81,7 @@ int netlib_set_arpmapping(FAR const struct sockaddr_in *inaddr,
           req.arp_flags = ATF_PERM;
           if (ifname != NULL)
             {
-               strlcpy((FAR char *)&req.arp_dev, ifname,
-                       sizeof(req.arp_dev));
+               strlcpy(req.arp_dev, ifname, sizeof(req.arp_dev));
             }
           else
             {
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 6010e1084..8cd0d6cc3 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -1310,7 +1310,7 @@ int cmd_arp(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
           FAR uint8_t *ptr;
 
           if (ifname != NULL &&
-              strcmp(ifname, (FAR char *)arptab[i].arp_dev) != 0)
+              strcmp(ifname, arptab[i].arp_dev) != 0)
             {
               continue;
             }

From 7289c27a8509c4943ee359644067b9e9326e93eb Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Thu, 5 Feb 2026 15:15:25 -0500
Subject: [PATCH 229/568] testing/{ostest,sched/smp}: Remove BOARD_LOOPSPERMSEC
 references

In an effort to avoid unexpected behaviour from users not calibrating
BOARD_LOOPSPERMSEC, a compilation error occurs when it is undefined. On
some systems, this is allowed (those that use timer implementations
instead of busy-looping for delays). In these cases, we should busy-loop
using the clock time instead of relying on a possibly
undefined/uncalibrated macro.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 testing/ostest/sporadic.c    | 14 ++++++++++----
 testing/ostest/sporadic2.c   | 16 +++++++++++-----
 testing/sched/smp/smp_main.c | 15 +++++++++++----
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/testing/ostest/sporadic.c b/testing/ostest/sporadic.c
index 5e6986ba7..98a8d755f 100644
--- a/testing/ostest/sporadic.c
+++ b/testing/ostest/sporadic.c
@@ -65,13 +65,19 @@ static time_t g_start_time;
 
 static void my_mdelay(unsigned int milliseconds)
 {
-  volatile unsigned int i;
-  volatile unsigned int j;
+  struct timespec start;
+  struct timespec cur;
+  struct timespec diff;
 
-  for (i = 0; i < milliseconds; i++)
+  clock_gettime(CLOCK_MONOTONIC, &start);
+
+  for (; ; )
     {
-      for (j = 0; j < CONFIG_BOARD_LOOPSPERMSEC; j++)
+      clock_gettime(CLOCK_MONOTONIC, &cur);
+      clock_timespec_subtract(&cur, &start, &diff);
+      if (diff.tv_sec * 1000 + diff.tv_nsec / 1000000 > milliseconds)
         {
+          break;
         }
     }
 }
diff --git a/testing/ostest/sporadic2.c b/testing/ostest/sporadic2.c
index acc7f34e1..494dc8b29 100644
--- a/testing/ostest/sporadic2.c
+++ b/testing/ostest/sporadic2.c
@@ -80,13 +80,19 @@ static int32_t g_ms_cnt2[2] =
 
 static void my_mdelay(unsigned int milliseconds)
 {
-  volatile unsigned int i;
-  volatile unsigned int j;
+  struct timespec start;
+  struct timespec cur;
+  struct timespec diff;
 
-  for (i = 0; i < milliseconds; i++)
+  clock_gettime(CLOCK_MONOTONIC, &start);
+
+  for (; ; )
     {
-      for (j = 0; j < CONFIG_BOARD_LOOPSPERMSEC; j++)
+      clock_gettime(CLOCK_MONOTONIC, &cur);
+      clock_timespec_subtract(&cur, &start, &diff);
+      if (diff.tv_sec * 1000 + diff.tv_nsec / 1000000 > milliseconds)
         {
+          break;
         }
     }
 }
@@ -172,7 +178,7 @@ static void sporadic_test_case(int32_t budget_1_ns, int32_t budget_2_ns)
 
   sem_init(&g_sporadic_sem, 0, 0);
 
-  /* initilize global worker-thread millisecons-counters */
+  /* Initialize global worker-thread milliseconds-counters */
 
   g_ms_cnt1[PRIO_HI_NDX] = 0;
   g_ms_cnt1[PRIO_LO_NDX] = 0;
diff --git a/testing/sched/smp/smp_main.c b/testing/sched/smp/smp_main.c
index 8c3b94e7e..98f1894db 100644
--- a/testing/sched/smp/smp_main.c
+++ b/testing/sched/smp/smp_main.c
@@ -27,6 +27,7 @@
 #include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <string.h>
@@ -87,13 +88,19 @@ static void show_cpu_conditional(FAR const char *caller, int threadno)
 
 static void hog_milliseconds(unsigned int milliseconds)
 {
-  volatile unsigned int i;
-  volatile unsigned int j;
+  struct timespec start;
+  struct timespec cur;
+  struct timespec diff;
 
-  for (i = 0; i < milliseconds; i++)
+  clock_gettime(CLOCK_MONOTONIC, &start);
+
+  for (; ; )
     {
-      for (j = 0; j < CONFIG_BOARD_LOOPSPERMSEC; j++)
+      clock_gettime(CLOCK_MONOTONIC, &cur);
+      clock_timespec_subtract(&cur, &start, &diff);
+      if (diff.tv_sec * 1000 + diff.tv_nsec / 1000000 > milliseconds)
         {
+          break;
         }
     }
 }

From 1ab486d1d040dfa8243dff9368c1f0b6bf73cc5f Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 12 Feb 2026 17:30:41 +0530
Subject: [PATCH 230/568] netutils/cjson: update download URL for cJSON tarball
 to include refs/tags

Modified the CMakeLists.txt and Makefile to ensure the correct format for downloading the cJSON tarball from GitHub by including 'refs/tags/' in the URL. This change addresses issues with fetching the correct version of the library.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 netutils/cjson/CMakeLists.txt | 3 ++-
 netutils/cjson/Makefile       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/netutils/cjson/CMakeLists.txt b/netutils/cjson/CMakeLists.txt
index 83a6475cd..b497e4a01 100644
--- a/netutils/cjson/CMakeLists.txt
+++ b/netutils/cjson/CMakeLists.txt
@@ -30,12 +30,13 @@ if(CONFIG_NETUTILS_CJSON)
     set(CONFIG_NETUTILS_CJSON_VERSION "1.7.10")
   endif()
 
+  # GitHub requires refs/tags/ in the archive URL for tag downloads
   if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/cJSON)
     FetchContent_Declare(
       cJSON
       DOWNLOAD_NAME "v${CONFIG_NETUTILS_CJSON_VERSION}.tar.gz"
       DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
-      URL "${CONFIG_NETUTILS_CJSON_URL}/v${CONFIG_NETUTILS_CJSON_VERSION}.tar.gz"
+      URL "${CONFIG_NETUTILS_CJSON_URL}/refs/tags/v${CONFIG_NETUTILS_CJSON_VERSION}.tar.gz"
           SOURCE_DIR
           ${CMAKE_CURRENT_LIST_DIR}/cJSON
           BINARY_DIR
diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile
index d8993373d..683bdb3da 100644
--- a/netutils/cjson/Makefile
+++ b/netutils/cjson/Makefile
@@ -49,10 +49,12 @@ CSRCS = $(CJSON_SRCDIR)$(DELIM)cJSON.c
 CSRCS += $(CJSON_SRCDIR)$(DELIM)cJSON_Utils.c
 
 # Download and unpack tarball if no git repo found
+# GitHub requires refs/tags/ in the archive URL for tag downloads (see
+# https://docs.github.com/en/repositories/working-with-files/using-files/downloading-source-code-archives)
 ifeq ($(wildcard $(CJSON_UNPACKNAME)/.git),)
 $(CJSON_TARBALL):
 	@echo "Downloading: $(CJSON_TARBALL)"
-	$(Q) curl -O -L $(CONFIG_NETUTILS_CJSON_URL)/$(CJSON_TARBALL)
+	$(Q) curl -O -L $(CONFIG_NETUTILS_CJSON_URL)/refs/tags/$(CJSON_TARBALL)
 
 $(CJSON_UNPACKNAME): $(CJSON_TARBALL)
 	@echo "Unpacking: $(CJSON_TARBALL) -> $(CJSON_UNPACKNAME)"

From 76e02c0dd6cf2fa2b536f25c6136c4f277cd3ca5 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 12 Feb 2026 17:54:54 +0530
Subject: [PATCH 231/568] netutils/cjson: update cJSON download URL format

Modified CMakeLists.txt, Kconfig, and Makefile to change the cJSON download URL to include 'refs/tags/' for proper version fetching. This ensures compatibility with GitHub's archive download requirements.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 netutils/cjson/CMakeLists.txt | 6 +++---
 netutils/cjson/Kconfig        | 2 +-
 netutils/cjson/Makefile       | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/netutils/cjson/CMakeLists.txt b/netutils/cjson/CMakeLists.txt
index b497e4a01..729dbc619 100644
--- a/netutils/cjson/CMakeLists.txt
+++ b/netutils/cjson/CMakeLists.txt
@@ -23,20 +23,20 @@
 if(CONFIG_NETUTILS_CJSON)
 
   if(NOT CONFIG_NETUTILS_CJSON_URL)
-    set(CONFIG_NETUTILS_CJSON_URL "https://github.com/DaveGamble/cJSON/archive")
+    set(CONFIG_NETUTILS_CJSON_URL
+        "https://github.com/DaveGamble/cJSON/archive/refs/tags")
   endif()
 
   if(NOT CONFIG_NETUTILS_CJSON_VERSION)
     set(CONFIG_NETUTILS_CJSON_VERSION "1.7.10")
   endif()
 
-  # GitHub requires refs/tags/ in the archive URL for tag downloads
   if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/cJSON)
     FetchContent_Declare(
       cJSON
       DOWNLOAD_NAME "v${CONFIG_NETUTILS_CJSON_VERSION}.tar.gz"
       DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
-      URL "${CONFIG_NETUTILS_CJSON_URL}/refs/tags/v${CONFIG_NETUTILS_CJSON_VERSION}.tar.gz"
+      URL "${CONFIG_NETUTILS_CJSON_URL}/v${CONFIG_NETUTILS_CJSON_VERSION}.tar.gz"
           SOURCE_DIR
           ${CMAKE_CURRENT_LIST_DIR}/cJSON
           BINARY_DIR
diff --git a/netutils/cjson/Kconfig b/netutils/cjson/Kconfig
index 4a360de6a..05773f157 100644
--- a/netutils/cjson/Kconfig
+++ b/netutils/cjson/Kconfig
@@ -14,7 +14,7 @@ if NETUTILS_CJSON
 
 config NETUTILS_CJSON_URL
 	string "URL where cJSON library can be downloaded"
-	default "https://github.com/DaveGamble/cJSON/archive"
+	default "https://github.com/DaveGamble/cJSON/archive/refs/tags"
 
 config NETUTILS_CJSON_VERSION
 	string "Version number"
diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile
index 683bdb3da..050e5cf86 100644
--- a/netutils/cjson/Makefile
+++ b/netutils/cjson/Makefile
@@ -28,7 +28,7 @@ include $(APPDIR)/Make.defs
 
 WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
-CONFIG_NETUTILS_CJSON_URL ?= "https://github.com/DaveGamble/cJSON/archive"
+CONFIG_NETUTILS_CJSON_URL ?= "https://github.com/DaveGamble/cJSON/archive/refs/tags"
 CONFIG_NETUTILS_CJSON_VERSION ?= "1.7.10"
 CJSON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_NETUTILS_CJSON_VERSION)))
 
@@ -49,12 +49,10 @@ CSRCS = $(CJSON_SRCDIR)$(DELIM)cJSON.c
 CSRCS += $(CJSON_SRCDIR)$(DELIM)cJSON_Utils.c
 
 # Download and unpack tarball if no git repo found
-# GitHub requires refs/tags/ in the archive URL for tag downloads (see
-# https://docs.github.com/en/repositories/working-with-files/using-files/downloading-source-code-archives)
 ifeq ($(wildcard $(CJSON_UNPACKNAME)/.git),)
 $(CJSON_TARBALL):
 	@echo "Downloading: $(CJSON_TARBALL)"
-	$(Q) curl -O -L $(CONFIG_NETUTILS_CJSON_URL)/refs/tags/$(CJSON_TARBALL)
+	$(Q) curl -O -L $(CONFIG_NETUTILS_CJSON_URL)/$(CJSON_TARBALL)
 
 $(CJSON_UNPACKNAME): $(CJSON_TARBALL)
 	@echo "Unpacking: $(CJSON_TARBALL) -> $(CJSON_UNPACKNAME)"

From be2cdfa5972b04e0d9584fed317ecc46a07ba4aa Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 15 Feb 2026 16:23:26 -0500
Subject: [PATCH 232/568] !interpreters/bas: Align naming of configuration
 options

Aligns `CONFIG_INTERPRETER_*` options to `CONFIG_INTERPRETERS_*` options
to be consistent with other interpreters.

BREAKING CHANGE: All configurations using `CONFIG_INTERPRETER_BAS_*`
options will no longer compile due to missing symbol errors. The fix is
very quick: any configurations using this options should add a trailing
S following INTERPRETER in the affected Kconfig variables. I believe
`./tools/refresh.sh` should also be capable of doing this automatically.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 interpreters/bas/CMakeLists.txt |  6 +++---
 interpreters/bas/Kconfig        | 14 +++++++-------
 interpreters/bas/Makefile       |  6 +++---
 interpreters/bas/bas.c          |  4 ++--
 interpreters/bas/bas_fs.c       | 16 ++++++++--------
 interpreters/bas/bas_main.c     |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/interpreters/bas/CMakeLists.txt b/interpreters/bas/CMakeLists.txt
index 86219418a..527353d7c 100644
--- a/interpreters/bas/CMakeLists.txt
+++ b/interpreters/bas/CMakeLists.txt
@@ -27,9 +27,9 @@ if(CONFIG_INTERPRETERS_BAS)
     SRCS
     bas_main.c
     STACKSIZE
-    ${CONFIG_INTERPRETER_BAS_STACKSIZE}
+    ${CONFIG_INTERPRETERS_BAS_STACKSIZE}
     PRIORITY
-    ${CONFIG_INTERPRETER_BAS_PRIORITY})
+    ${CONFIG_INTERPRETERS_BAS_PRIORITY})
 
   set(CSRCS
       bas_str.c
@@ -42,7 +42,7 @@ if(CONFIG_INTERPRETERS_BAS)
       bas_global.c
       bas_program.c)
 
-  if(CONFIG_INTERPRETER_BAS_VT100)
+  if(CONFIG_INTERPRETERS_BAS_VT100)
     list(APPEND CSRCS bas_vt100.c)
   endif()
 
diff --git a/interpreters/bas/Kconfig b/interpreters/bas/Kconfig
index db84d3d07..39b502902 100644
--- a/interpreters/bas/Kconfig
+++ b/interpreters/bas/Kconfig
@@ -33,37 +33,37 @@ config INTERPRETERS_BAS
 
 if INTERPRETERS_BAS
 
-config INTERPRETER_BAS_VERSION
+config INTERPRETERS_BAS_VERSION
 	string "Version number"
 	default "2.4"
 
-config INTERPRETER_BAS_PRIORITY
+config INTERPRETERS_BAS_PRIORITY
 	int "Basic interpreter priority"
 	default 100
 	---help---
 		Task priority of the Basic interpreter main task
 
-config INTERPRETER_BAS_STACKSIZE
+config INTERPRETERS_BAS_STACKSIZE
 	int "Basic interpreter stack size"
 	default 4096
 	---help---
 		Size of the stack allocated for the Basic interpreter main task
 
-config INTERPRETER_BAS_VT100
+config INTERPRETERS_BAS_VT100
 	bool "VT100 terminal support"
 	default y
 
-config INTERPRETER_BAS_USE_LR0
+config INTERPRETERS_BAS_USE_LR0
 	bool "LR0 parser"
 	default n
 	---help---
 		Select if you want LR0 parser.
 
-config INTERPRETER_BAS_USE_SELECT
+config INTERPRETERS_BAS_USE_SELECT
 	bool "Use select()"
 	default n
 
-config INTERPRETER_BAS_HAVE_FTRUNCATE
+config INTERPRETERS_BAS_HAVE_FTRUNCATE
 	bool
 	default n
 	---help---
diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile
index 332cb17df..532c74043 100644
--- a/interpreters/bas/Makefile
+++ b/interpreters/bas/Makefile
@@ -27,7 +27,7 @@ include $(APPDIR)/Make.defs
 CSRCS  = bas.c bas_auto.c bas_fs.c bas_global.c bas_program.c
 CSRCS += bas_str.c bas_token.c bas_value.c bas_var.c
 
-ifeq ($(CONFIG_INTERPRETER_BAS_VT100),y)
+ifeq ($(CONFIG_INTERPRETERS_BAS_VT100),y)
 CSRCS += bas_vt100.c
 endif
 
@@ -36,8 +36,8 @@ MAINSRC = bas_main.c
 # BAS built-in application info
 
 PROGNAME  = bas
-PRIORITY  = $(CONFIG_INTERPRETER_BAS_PRIORITY)
-STACKSIZE = $(CONFIG_INTERPRETER_BAS_STACKSIZE)
+PRIORITY  = $(CONFIG_INTERPRETERS_BAS_PRIORITY)
+STACKSIZE = $(CONFIG_INTERPRETERS_BAS_STACKSIZE)
 MODULE    = $(CONFIG_INTERPRETERS_BAS)
 
 include $(APPDIR)/Application.mk
diff --git a/interpreters/bas/bas.c b/interpreters/bas/bas.c
index 3ccaea3b9..18b08876f 100644
--- a/interpreters/bas/bas.c
+++ b/interpreters/bas/bas.c
@@ -614,7 +614,7 @@ static struct Value *func(struct Value *value)
   return value;
 }
 
-#ifdef CONFIG_INTERPRETER_BAS_USE_LR0
+#ifdef CONFIG_INTERPRETERS_BAS_USE_LR0
 
 /* Grammar with LR(0) sets */
 
@@ -2368,7 +2368,7 @@ void bas_interpreter(void)
 {
   if (FS_istty(STDCHANNEL))
     {
-      FS_putChars(STDCHANNEL, "bas " CONFIG_INTERPRETER_BAS_VERSION "\n");
+      FS_putChars(STDCHANNEL, "bas " CONFIG_INTERPRETERS_BAS_VERSION "\n");
       FS_putChars(STDCHANNEL, "Copyright 1999-2014 Michael Haardt.\n");
       FS_putChars(STDCHANNEL,
                   "This is free software with ABSOLUTELY NO WARRANTY.\n");
diff --git a/interpreters/bas/bas_fs.c b/interpreters/bas/bas_fs.c
index 199f41bb9..ad708a912 100644
--- a/interpreters/bas/bas_fs.c
+++ b/interpreters/bas/bas_fs.c
@@ -270,7 +270,7 @@ static int edit(int chn, int nl)
         {
           if (f->inCapacity)
             {
-#ifdef CONFIG_INTERPRETER_BAS_VT100
+#ifdef CONFIG_INTERPRETERS_BAS_VT100
               /* Could use vt100_clrtoeol */
 #endif
               /* Is the previous char in buffer 2 char escape sequence? */
@@ -319,7 +319,7 @@ static int edit(int chn, int nl)
 
 static int cls(int chn)
 {
-#ifdef CONFIG_INTERPRETER_BAS_VT100
+#ifdef CONFIG_INTERPRETERS_BAS_VT100
   vt100_clrscreen(chn);
   vt100_cursorhome(chn);
   return 0;
@@ -331,7 +331,7 @@ static int cls(int chn)
 
 static int locate(int chn, int line, int column)
 {
-#ifdef CONFIG_INTERPRETER_BAS_VT100
+#ifdef CONFIG_INTERPRETERS_BAS_VT100
   vt100_setcursor(chn, line, column);
   return 0;
 #else
@@ -342,7 +342,7 @@ static int locate(int chn, int line, int column)
 
 static int colour(int chn, int foreground, int background)
 {
-#ifdef CONFIG_INTERPRETER_BAS_VT100
+#ifdef CONFIG_INTERPRETERS_BAS_VT100
   if (foreground >= 0)
     {
       vt100_foreground_color(chn, foreground);
@@ -362,7 +362,7 @@ static int colour(int chn, int foreground, int background)
 
 static int resetcolour(int chn)
 {
-#ifdef CONFIG_INTERPRETER_BAS_VT100
+#ifdef CONFIG_INTERPRETERS_BAS_VT100
   vt100_foreground_color(chn, VT100_DEFAULT);
   vt100_background_color(chn, VT100_DEFAULT);
 #endif
@@ -837,7 +837,7 @@ int FS_lock(int chn, off_t offset, off_t length, int mode, int w)
 
 int FS_truncate(int chn)
 {
-#ifdef CONFIG_INTERPRETER_BAS_HAVE_FTRUNCATE
+#ifdef CONFIG_INTERPRETERS_BAS_HAVE_FTRUNCATE
   int fd;
   off_t o;
 
@@ -1411,7 +1411,7 @@ int FS_inkeyChar(int dev, int ms)
   struct FileStream *f;
   char c;
   ssize_t len;
-#ifdef CONFIG_INTERPRETER_BAS_USE_SELECT
+#ifdef CONFIG_INTERPRETERS_BAS_USE_SELECT
   fd_set just_infd;
   struct timeval timeout;
 #endif
@@ -1427,7 +1427,7 @@ int FS_inkeyChar(int dev, int ms)
       return f->inBuf[f->inSize++];
     }
 
-#ifdef CONFIG_INTERPRETER_BAS_USE_SELECT
+#ifdef CONFIG_INTERPRETERS_BAS_USE_SELECT
   FD_ZERO(&just_infd);
   FD_SET(f->infd, &just_infd);
   timeout.tv_sec = ms / 1000;
diff --git a/interpreters/bas/bas_main.c b/interpreters/bas/bas_main.c
index 4bb2d0f12..833721dab 100644
--- a/interpreters/bas/bas_main.c
+++ b/interpreters/bas/bas_main.c
@@ -84,7 +84,7 @@ int main(int argc, FAR char *argv[])
           break;
 
         case 'V':
-          printf("bas %s\n", CONFIG_INTERPRETER_BAS_VERSION);
+          printf("bas %s\n", CONFIG_INTERPRETERS_BAS_VERSION);
           exit(0);
           break;
 

From 468ded86bb02e054c0d730bd02314a11bc95da47 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 15 Feb 2026 16:24:23 -0500
Subject: [PATCH 233/568] !interpreters/lua: Align naming of configuration
 options

Aligns `CONFIG_INTERPRETER_*` options to `CONFIG_INTERPRETERS_*` options
to be consistent with other interpreters.

BREAKING CHANGE: All configurations using `CONFIG_INTERPRETER_LUA_*`
options will no longer compile due to missing symbol errors. The fix is
very quick: any configurations using this options should add a trailing
S following INTERPRETER in the affected Kconfig variables. I believe
`./tools/refresh.sh` should also be capable of doing this automatically.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 interpreters/lua/CMakeLists.txt | 20 ++++++++++----------
 interpreters/lua/Kconfig        | 18 +++++++++---------
 interpreters/lua/Makefile       | 20 ++++++++++----------
 interpreters/lua/nuttx_linit.c  |  2 +-
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/interpreters/lua/CMakeLists.txt b/interpreters/lua/CMakeLists.txt
index 8083a605d..863c63514 100644
--- a/interpreters/lua/CMakeLists.txt
+++ b/interpreters/lua/CMakeLists.txt
@@ -32,7 +32,7 @@ if(CONFIG_INTERPRETERS_LUA)
     set(LUA_URL https://github.com/lua/lua/archive/refs/tags/)
     FetchContent_Declare(
       lua_fetch
-      URL ${LUA_URL}/v${CONFIG_INTERPRETER_LUA_VERSION}.tar.gz SOURCE_DIR
+      URL ${LUA_URL}/v${CONFIG_INTERPRETERS_LUA_VERSION}.tar.gz SOURCE_DIR
           ${CMAKE_CURRENT_LIST_DIR}/lua BINARY_DIR
           ${CMAKE_BINARY_DIR}/apps/interpreters/lua/lua
       DOWNLOAD_NO_PROGRESS true
@@ -49,17 +49,17 @@ if(CONFIG_INTERPRETERS_LUA)
   # Flags
   # ############################################################################
 
-  set(CFLAGS -DLUA_MAXINPUT=${CONFIG_INTERPRETER_LUA_IOBUFSIZE}
+  set(CFLAGS -DLUA_MAXINPUT=${CONFIG_INTERPRETERS_LUA_IOBUFSIZE}
              -DLUA_PROGNAME=\"lua\")
-  if(CONFIG_INTERPRETER_LUA_32BITS)
+  if(CONFIG_INTERPRETERS_LUA_32BITS)
     list(APPEND CFLAGS -DLUA_32BITS)
   endif()
-  if(NOT "${CONFIG_INTERPRETER_LUA_PATH}" STREQUAL "")
-    list(APPEND CFLAGS -DLUA_PATH_DEFAULT=\"${CONFIG_INTERPRETER_LUA_PATH}\")
+  if(NOT "${CONFIG_INTERPRETERS_LUA_PATH}" STREQUAL "")
+    list(APPEND CFLAGS -DLUA_PATH_DEFAULT=\"${CONFIG_INTERPRETERS_LUA_PATH}\")
   endif()
 
-  if(NOT "${CONFIG_INTERPRETER_LUA_CPATH}" STREQUAL "")
-    list(APPEND CFLAGS -DLUA_CPATH_DEFAULT=\"${CONFIG_INTERPRETER_LUA_CPATH}\")
+  if(NOT "${CONFIG_INTERPRETERS_LUA_CPATH}" STREQUAL "")
+    list(APPEND CFLAGS -DLUA_CPATH_DEFAULT=\"${CONFIG_INTERPRETERS_LUA_CPATH}\")
   endif()
 
   if(CONFIG_SYSTEM_READLINE)
@@ -96,7 +96,7 @@ if(CONFIG_INTERPRETERS_LUA)
     ${CORELIBS_SRCS})
   list(APPEND CSRCS nuttx_linit.c)
 
-  if(CONFIG_INTERPRETER_LUA_CORELIBS)
+  if(CONFIG_INTERPRETERS_LUA_CORELIBS)
     list(APPEND CSRCS ${CORELIBS_SRCS})
 
     set(LUA_LIB_H_PATH ${LUA_DIR}/lualib.h)
@@ -135,9 +135,9 @@ if(CONFIG_INTERPRETERS_LUA)
     NAME
     lua
     STACKSIZE
-    ${CONFIG_INTERPRETER_LUA_STACKSIZE}
+    ${CONFIG_INTERPRETERS_LUA_STACKSIZE}
     PRIORITY
-    ${CONFIG_INTERPRETER_LUA_PRIORITY}
+    ${CONFIG_INTERPRETERS_LUA_PRIORITY}
     SRCS
     ${LUA_DIR}/lua.c
     ${CSRCS}
diff --git a/interpreters/lua/Kconfig b/interpreters/lua/Kconfig
index 8afeb0549..418cf8472 100644
--- a/interpreters/lua/Kconfig
+++ b/interpreters/lua/Kconfig
@@ -10,55 +10,55 @@ menuconfig INTERPRETERS_LUA
 	select LIBC_LOCALE
 	---help---
 		Embed Lua language interpreter.
-		Select the Lua version with the INTERPRETER_LUA_VERSION config.
+		Select the Lua version with the INTERPRETERS_LUA_VERSION config.
 		A math library is required. Use the LIBM config or a toolchain library.
 		It's suggested to enable the SYSTEM_READLINE and LIBC_FLOATINGPOINT configs.
 
 if INTERPRETERS_LUA
 
-config INTERPRETER_LUA_VERSION
+config INTERPRETERS_LUA_VERSION
 	string "Lua interpreter version"
 	default "5.4.0"
 	---help---
 		Lua release version to fetch and build.
 		Versions 5.2.0 and up are supported.
 
-config INTERPRETER_LUA_CORELIBS
+config INTERPRETERS_LUA_CORELIBS
 	bool "Load core Lua modules"
 	default y
 	select SYSTEM_SYSTEM
 	---help---
 		Load core Lua modules like "os", "string", and "table".
 
-config INTERPRETER_LUA_PATH
+config INTERPRETERS_LUA_PATH
 	string "Lua modules search path"
 	---help---
 		Override default package.path search path for Lua modules.
 
-config INTERPRETER_LUA_CPATH
+config INTERPRETERS_LUA_CPATH
 	string "Lua C modules search path"
 	---help---
 		Override default package.cpath search path for C modules.
 
-config INTERPRETER_LUA_32BIT
+config INTERPRETERS_LUA_32BIT
 	bool "Use 32-bit integers and floats"
 	default y
 	---help---
 		"Use int and float instead of long and double for Lua numbers."
 
-config INTERPRETER_LUA_PRIORITY
+config INTERPRETERS_LUA_PRIORITY
 	int "Lua interpreter priority"
 	default 100
 	---help---
 		Task priority of the Lua interpreter main task.
 
-config INTERPRETER_LUA_STACKSIZE
+config INTERPRETERS_LUA_STACKSIZE
 	int "Lua interpreter stack size"
 	default 32768
 	---help---
 		Size of the stack allocated for the Lua interpreter main task.
 
-config INTERPRETER_LUA_IOBUFSIZE
+config INTERPRETERS_LUA_IOBUFSIZE
 	int "I/O buffer size"
 	default 1024
 	---help---
diff --git a/interpreters/lua/Makefile b/interpreters/lua/Makefile
index 86e446667..40daf76ed 100644
--- a/interpreters/lua/Makefile
+++ b/interpreters/lua/Makefile
@@ -25,13 +25,13 @@ include $(APPDIR)/Make.defs
 # Lua built-in application info
 
 PROGNAME  = lua
-PRIORITY  = $(CONFIG_INTERPRETER_LUA_PRIORITY)
-STACKSIZE = $(CONFIG_INTERPRETER_LUA_STACKSIZE)
+PRIORITY  = $(CONFIG_INTERPRETERS_LUA_PRIORITY)
+STACKSIZE = $(CONFIG_INTERPRETERS_LUA_STACKSIZE)
 MODULE    = $(CONFIG_INTERPRETERS_LUA)
 
 # Lua library
 
-LUA_VERSION  = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_LUA_VERSION)))
+LUA_VERSION  = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_LUA_VERSION)))
 LUA_TARBALL  = v$(LUA_VERSION).tar.gz
 LUA_UNPACK   = lua
 LUA_URL_BASE = https://github.com/lua/lua/archive/refs/tags/
@@ -44,19 +44,19 @@ EXCLUDE_SRCS  = $(MAINSRC) $(CORELIBS_SRCS) $(LUA_SRC)$(DELIM)onelua.c $(LUA_SRC
 CSRCS         = $(filter-out $(EXCLUDE_SRCS),$(wildcard $(LUA_SRC)$(DELIM)*.c))
 CSRCS        += nuttx_linit.c
 
-CFLAGS += -DLUA_MAXINPUT=$(CONFIG_INTERPRETER_LUA_IOBUFSIZE)
+CFLAGS += -DLUA_MAXINPUT=$(CONFIG_INTERPRETERS_LUA_IOBUFSIZE)
 CFLAGS += -DLUA_PROGNAME=\"$(PROGNAME)\"
 
-ifeq ($(CONFIG_INTERPRETER_LUA_32BITS),y)
+ifeq ($(CONFIG_INTERPRETERS_LUA_32BITS),y)
 CFLAGS += -DLUA_32BITS
 endif
 
-ifneq ($(CONFIG_INTERPRETER_LUA_PATH),"")
-CFLAGS += -DLUA_PATH_DEFAULT=\"$(CONFIG_INTERPRETER_LUA_PATH)\"
+ifneq ($(CONFIG_INTERPRETERS_LUA_PATH),"")
+CFLAGS += -DLUA_PATH_DEFAULT=\"$(CONFIG_INTERPRETERS_LUA_PATH)\"
 endif
 
-ifneq ($(CONFIG_INTERPRETER_LUA_CPATH),"")
-CFLAGS += -DLUA_CPATH_DEFAULT=\"$(CONFIG_INTERPRETER_LUA_CPATH)\"
+ifneq ($(CONFIG_INTERPRETERS_LUA_CPATH),"")
+CFLAGS += -DLUA_CPATH_DEFAULT=\"$(CONFIG_INTERPRETERS_LUA_CPATH)\"
 endif
 
 ifeq ($(CONFIG_SYSTEM_READLINE),y)
@@ -83,7 +83,7 @@ endif
 
 # Register core modules
 
-ifeq ($(CONFIG_INTERPRETER_LUA_CORELIBS),y)
+ifeq ($(CONFIG_INTERPRETERS_LUA_CORELIBS),y)
 CSRCS += $(CORELIBS_SRCS)
 
 register::
diff --git a/interpreters/lua/nuttx_linit.c b/interpreters/lua/nuttx_linit.c
index 3e47a9c99..904eb9f81 100644
--- a/interpreters/lua/nuttx_linit.c
+++ b/interpreters/lua/nuttx_linit.c
@@ -48,7 +48,7 @@
 
 static const luaL_Reg g_loadedlibs[] =
 {
-#ifdef CONFIG_INTERPRETER_LUA_CORELIBS
+#ifdef CONFIG_INTERPRETERS_LUA_CORELIBS
   {LUA_GNAME, luaopen_base},
 #endif
 #include "luamod_list.h"

From a604c46b00b9f379c7d2b7c968297b3d76adc03f Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 15 Feb 2026 16:24:44 -0500
Subject: [PATCH 234/568] !interpreters/minibasic: Align naming of
 configuration options

Aligns `CONFIG_INTERPRETER_*` options to `CONFIG_INTERPRETERS_*` options
to be consistent with other interpreters.

BREAKING CHANGE: All configurations using `CONFIG_INTERPRETER_MINIBASIC_*`
options will no longer compile due to missing symbol errors. The fix is
very quick: any configurations using this options should add a trailing
S following INTERPRETER in the affected Kconfig variables. I believe
`./tools/refresh.sh` should also be capable of doing this automatically.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 interpreters/minibasic/CMakeLists.txt | 4 ++--
 interpreters/minibasic/Kconfig        | 8 ++++----
 interpreters/minibasic/Makefile       | 4 ++--
 interpreters/minibasic/basic.c        | 6 +++---
 interpreters/minibasic/script.c       | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interpreters/minibasic/CMakeLists.txt b/interpreters/minibasic/CMakeLists.txt
index 7c1e1401d..c13cef5b1 100644
--- a/interpreters/minibasic/CMakeLists.txt
+++ b/interpreters/minibasic/CMakeLists.txt
@@ -28,7 +28,7 @@ if(CONFIG_INTERPRETERS_MINIBASIC)
     script.c
     basic.c
     STACKSIZE
-    ${CONFIG_INTERPRETER_MINIBASIC_STACKSIZE}
+    ${CONFIG_INTERPRETERS_MINIBASIC_STACKSIZE}
     PRIORITY
-    ${CONFIG_INTERPRETER_MINIBASIC_PRIORITY})
+    ${CONFIG_INTERPRETERS_MINIBASIC_PRIORITY})
 endif()
diff --git a/interpreters/minibasic/Kconfig b/interpreters/minibasic/Kconfig
index bab275fc0..0d54790b5 100644
--- a/interpreters/minibasic/Kconfig
+++ b/interpreters/minibasic/Kconfig
@@ -33,25 +33,25 @@ config INTERPRETERS_MINIBASIC
 
 if INTERPRETERS_MINIBASIC
 
-config INTERPRETER_MINIBASIC_PRIORITY
+config INTERPRETERS_MINIBASIC_PRIORITY
 	int "Basic interpreter priority"
 	default 100
 	---help---
 		Task priority of the Basic interpreter main task
 
-config INTERPRETER_MINIBASIC_STACKSIZE
+config INTERPRETERS_MINIBASIC_STACKSIZE
 	int "Basic interpreter stack size"
 	default 4096
 	---help---
 		Size of the stack allocated for the Basic interpreter main task
 
-config INTERPRETER_MINIBASIC_IOBUFSIZE
+config INTERPRETERS_MINIBASIC_IOBUFSIZE
 	int "I/O buffer size"
 	default 1024
 	---help---
 		Size of the statically allocated I/O buffer.
 
-config INTERPRETER_MINIBASIC_TESTSCRIPT
+config INTERPRETERS_MINIBASIC_TESTSCRIPT
 	bool "Test script"
 	default n
 	---help---
diff --git a/interpreters/minibasic/Makefile b/interpreters/minibasic/Makefile
index 40f597750..61a439873 100644
--- a/interpreters/minibasic/Makefile
+++ b/interpreters/minibasic/Makefile
@@ -31,8 +31,8 @@ MAINSRC = script.c
 # Mini Basic built-in application info
 
 PROGNAME  = basic
-PRIORITY  = $(CONFIG_INTERPRETER_MINIBASIC_PRIORITY)
-STACKSIZE = $(CONFIG_INTERPRETER_MINIBASIC_STACKSIZE)
+PRIORITY  = $(CONFIG_INTERPRETERS_MINIBASIC_PRIORITY)
+STACKSIZE = $(CONFIG_INTERPRETERS_MINIBASIC_STACKSIZE)
 MODULE    = $(CONFIG_INTERPRETERS_MINIBASIC)
 
 include $(APPDIR)/Application.mk
diff --git a/interpreters/minibasic/basic.c b/interpreters/minibasic/basic.c
index 791463a30..054ff11f7 100644
--- a/interpreters/minibasic/basic.c
+++ b/interpreters/minibasic/basic.c
@@ -48,11 +48,11 @@
 
 /* Configuration */
 
-#ifndef CONFIG_INTERPRETER_MINIBASIC_IOBUFSIZE
-#  define CONFIG_INTERPRETER_MINIBASIC_IOBUFSIZE 1024
+#ifndef CONFIG_INTERPRETERS_MINIBASIC_IOBUFSIZE
+#  define CONFIG_INTERPRETERS_MINIBASIC_IOBUFSIZE 1024
 #endif
 
-#define IOBUFSIZE CONFIG_INTERPRETER_MINIBASIC_IOBUFSIZE
+#define IOBUFSIZE CONFIG_INTERPRETERS_MINIBASIC_IOBUFSIZE
 
 /* Tokens defined */
 
diff --git a/interpreters/minibasic/script.c b/interpreters/minibasic/script.c
index af3b668f9..c4070889b 100644
--- a/interpreters/minibasic/script.c
+++ b/interpreters/minibasic/script.c
@@ -45,7 +45,7 @@
  * Private Data
  ****************************************************************************/
 
-#ifdef CONFIG_INTERPRETER_MINIBASIC_TESTSCRIPT
+#ifdef CONFIG_INTERPRETERS_MINIBASIC_TESTSCRIPT
 /* Here is a simple script to play with */
 
 static FAR char *script =
@@ -147,7 +147,7 @@ int main(int argc, FAR char *argv[])
 
   if (argc == 1)
     {
-#ifdef CONFIG_INTERPRETER_MINIBASIC_TESTSCRIPT
+#ifdef CONFIG_INTERPRETERS_MINIBASIC_TESTSCRIPT
       basic(script, stdin, stdout, stderr);
 #else
       fprintf(stderr, "ERROR: Missing argument.\n");

From 3ce356378daead4a405d04b4efeb10c99a2d2786 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 15 Feb 2026 16:25:09 -0500
Subject: [PATCH 235/568] !interpreters/python: Align naming of configuration
 options

Aligns `CONFIG_INTERPRETER_*` options to `CONFIG_INTERPRETERS_*` options
to be consistent with other interpreters.

BREAKING CHANGE: All configurations using `CONFIG_INTERPRETER_PYTHON_*`
options will no longer compile due to missing symbol errors. The fix is
very quick: any configurations using this options should add a trailing
S following INTERPRETER in the affected Kconfig variables. I believe
`./tools/refresh.sh` should also be capable of doing this automatically.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 interpreters/python/Kconfig   | 12 ++++++------
 interpreters/python/Make.defs |  4 ++--
 interpreters/python/Makefile  | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interpreters/python/Kconfig b/interpreters/python/Kconfig
index 947a71e6d..dfc3f5ee8 100644
--- a/interpreters/python/Kconfig
+++ b/interpreters/python/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config INTERPRETER_CPYTHON
+config INTERPRETERS_CPYTHON
 	tristate "CPython"
 	depends on LIB_ZLIB
 	depends on EXPERIMENTAL
@@ -13,25 +13,25 @@ config INTERPRETER_CPYTHON
 		interpreter to NuttX. Initially, it is tweaked to work with the
 		RISC-V QEMU virtual board (`rv-virt`).
 
-if INTERPRETER_CPYTHON
+if INTERPRETERS_CPYTHON
 
-config INTERPRETER_CPYTHON_VERSION
+config INTERPRETERS_CPYTHON_VERSION
 	string "Python Version"
 	default "3.13.0"
 
-config INTERPRETER_CPYTHON_STACKSIZE
+config INTERPRETERS_CPYTHON_STACKSIZE
 	int "CPython stack size"
 	default 307200
 	---help---
 		This is the stack size allocated when the CPython task runs.
 
-config INTERPRETER_CPYTHON_PRIORITY
+config INTERPRETERS_CPYTHON_PRIORITY
 	int "CPython task priority"
 	default 100
 	---help---
 		This is the priority of the CPython task.
 
-config INTERPRETER_CPYTHON_PROGNAME
+config INTERPRETERS_CPYTHON_PROGNAME
 	string "CPython name"
 	default "python"
 	---help---
diff --git a/interpreters/python/Make.defs b/interpreters/python/Make.defs
index 39472e7a1..c02973e5a 100644
--- a/interpreters/python/Make.defs
+++ b/interpreters/python/Make.defs
@@ -20,9 +20,9 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_INTERPRETER_CPYTHON),)
+ifneq ($(CONFIG_INTERPRETERS_CPYTHON),)
 
-CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_CPYTHON_VERSION)))
+CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_CPYTHON_VERSION)))
 CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
 
 EXTRA_LIBPATHS += -L$(APPDIR)/interpreters/python/install/target
diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index bf20c9ae4..954f07b30 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -23,7 +23,7 @@
 include $(APPDIR)/Make.defs
 
 CPYTHON_URL ?= "https://github.com/python/cpython/archive"
-CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETER_CPYTHON_VERSION)))
+CPYTHON_VERSION = $(patsubst "%",%,$(strip $(CONFIG_INTERPRETERS_CPYTHON_VERSION)))
 CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
 CPYTHON_ZIP = v$(CPYTHON_VERSION).zip
 
@@ -171,11 +171,11 @@ $(TARGETLIBPYTHON): $(TARGETBUILD)/Makefile
 	$(Q) ( cp $(TARGETBUILD)/libpython$(CPYTHON_VERSION_MINOR).a $(TARGETLIBPYTHON) )
 	$(Q) $(UNPACK) $(TARGETMODULESPACK) -d $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)
 
-MODULE    = $(CONFIG_INTERPRETER_CPYTHON)
+MODULE    = $(CONFIG_INTERPRETERS_CPYTHON)
 
-PROGNAME  += $(CONFIG_INTERPRETER_CPYTHON_PROGNAME)
-PRIORITY  += $(CONFIG_INTERPRETER_CPYTHON_PRIORITY)
-STACKSIZE += $(CONFIG_INTERPRETER_CPYTHON_STACKSIZE)
+PROGNAME  += $(CONFIG_INTERPRETERS_CPYTHON_PROGNAME)
+PRIORITY  += $(CONFIG_INTERPRETERS_CPYTHON_PRIORITY)
+STACKSIZE += $(CONFIG_INTERPRETERS_CPYTHON_STACKSIZE)
 
 MAINSRC += python_wrapper.c
 

From 448b0bd0a6847e8e0976b86462e4a79029a90799 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 15 Feb 2026 16:50:09 -0500
Subject: [PATCH 236/568] interpreters: Fix spelling errors

Fix some spelling errors for CI.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 interpreters/bas/bas_main.c     | 2 +-
 interpreters/minibasic/basic.c  | 6 +++---
 interpreters/minibasic/script.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interpreters/bas/bas_main.c b/interpreters/bas/bas_main.c
index 833721dab..c6c9a70ec 100644
--- a/interpreters/bas/bas_main.c
+++ b/interpreters/bas/bas_main.c
@@ -129,7 +129,7 @@ int main(int argc, FAR char *argv[])
       fputs(_("-u  Output all tokens in uppercase\n"),
             stdout);
       fputs(_("-h  Display this help and exit\n"), stdout);
-      fputs(_("-V  Ooutput version information and exit\n"),
+      fputs(_("-V  Output version information and exit\n"),
             stdout);
       exit(0);
     }
diff --git a/interpreters/minibasic/basic.c b/interpreters/minibasic/basic.c
index 054ff11f7..2547f963e 100644
--- a/interpreters/minibasic/basic.c
+++ b/interpreters/minibasic/basic.c
@@ -22,7 +22,7 @@
 
 /****************************************************************************
  *
- * This file was taken from Mini Basic, versino 1.0 developed by Malcolm
+ * This file was taken from Mini Basic, version 1.0 developed by Malcolm
  * McLean, Leeds University.  Mini Basic version 1.0 was released the
  * Creative Commons Attribution license which, from my reading, appears to
  * be compatible with the NuttX license:
@@ -990,7 +990,7 @@ static int doif(void)
  * Name: dogoto
  *
  * Description:
- *   The GOTO satement
+ *   The GOTO statement
  *   Returns new line number
  *
  ****************************************************************************/
@@ -3804,7 +3804,7 @@ static int isstring(int tokenid)
  * Description:
  *   Get a numerical value from the parse string
  *   Params: str - the string to search
- *           len - return pinter for no chars read
+ *           len - return pointer for no chars read
  *   Returns: the value of the string.
  *
  ****************************************************************************/
diff --git a/interpreters/minibasic/script.c b/interpreters/minibasic/script.c
index c4070889b..3e0212464 100644
--- a/interpreters/minibasic/script.c
+++ b/interpreters/minibasic/script.c
@@ -22,7 +22,7 @@
 
 /****************************************************************************
  *
- * This file was taken from Mini Basic, versino 1.0 developed by Malcolm
+ * This file was taken from Mini Basic, version 1.0 developed by Malcolm
  * McLean, Leeds University.  Mini Basic version 1.0 was released the
  * Creative Commons Attribution license which, from my reading, appears to
  * be compatible with the NuttX BSD-style license:

From fe546acfc7c50bb2af89d8fc1c032952d3ab7616 Mon Sep 17 00:00:00 2001
From: Lup Yuen Lee <luppy@appkaki.com>
Date: Mon, 23 Feb 2026 14:10:37 +0800
Subject: [PATCH 237/568] github/workflow: Sync the new PR Labeling Workflow
 from NuttX Repo to NuttX Apps

This PR replicates the new PR Labeling Workflow from NuttX Repo to NuttX Apps Repo. For Future Syncing:
- Copy from NuttX Repo to NuttX Apps: `.github/workflows/labeler.yml` and `.github/workflows/pr_labeler.yml`
- Edit `.github/workflows/labeler.yml` and change `repository: apache/nuttx` to `repository: apache/nuttx-apps`
- Don't overwrite `.github/labeler.yml` by NuttX Repo

The new workflow reimplements PR Labeling with two triggers: pull_request and workflow_run. We no longer need pull_request_target, which is an unsafe trigger and may introduce security vulnerabilities.

The New PR Labeler is explained here:
- https://lupyuen.org/articles/prtarget
- https://github.com/apache/nuttx/issues/18359

Modified Files:

`.github/workflows/labeler.yml`: Changed the (read-write) pull_request_target trigger to (read-only) pull_request trigger. Compute the Size Label (e.g. Size: XS) and Arch Labels (e.g. Area: Examples). Save the PR Labels into a PR Artifact.

`.github/labeler.yml`: Added comment to clarify that NuttX PR Labeler only supports a subset of the `actions/labeler` syntax: `changed-files` and `any-glob-to-any-file`. Note: Don't overwrite this file by NuttX Repo.

New Files:

`.github/workflows/pr_labeler.yml`: Contains the workflow_run trigger, which is executed upon completion of the pull_request trigger. Download the PR Labels from the PR Artifact. Write the PR Labels into the PR.

Signed-off-by: Lup Yuen Lee <luppy@appkaki.com>
---
 .github/labeler.yml              |   3 +
 .github/workflows/labeler.yml    | 143 +++++++++++++++++++++++++++----
 .github/workflows/pr_labeler.yml |  90 +++++++++++++++++++
 3 files changed, 217 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/pr_labeler.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 88336e8ae..278cc551a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -17,6 +17,9 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+# Note: NuttX PR Labeler only supports a subset of the
+# `actions/labeler` syntax: `changed-files` and
+# `any-glob-to-any-file`. See .github/workflows/labeler.yml
 
 # add arch labels
 
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 1c38d38da..bf1c459ec 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -12,34 +12,139 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# This workflow will fetch the updated PR filenames, compute the Size Label
+# and Arch Labels, then save the PR Labels into a PR Artifact. The
+# PR Labels will be written to the PR inside the "workflow_run" trigger
+# (pr_labeler.yml), because this "pull_request" trigger has read-only
+# permission. Don't use "pull_request_target", it's unsafe.
+# See https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=321719166#GitHubActionsSecurity-Buildstriggeredwithpull_request_target
 name: "Pull Request Labeler"
 on:
-  - pull_request_target
+  - pull_request
 
 jobs:
   labeler:
     permissions:
       contents: read
-      pull-requests: write
-      issues: write
+      pull-requests: read
+      issues: read
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Assign labels based on paths
-        uses: actions/labeler@main
+      # Checkout one file from our trusted source: .github/labeler.yml
+      # Never checkout and execute any untrusted code from the PR.
+      - name: Checkout labeler config
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          sync-labels: true
+          repository: apache/nuttx-apps
+          ref: master
+          path: labeler
+          fetch-depth: 1
+          persist-credentials: false
+          sparse-checkout: .github/labeler.yml
+          sparse-checkout-cone-mode: false
 
-      - name: Assign labels based on the PR's size
-        uses: codelytv/pr-size-labeler@v1.10.3
+      # Fetch the updated PR filenames. Compute the Size Label and Arch Labels.
+      - name: Compute PR labels
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ignore_file_deletions: true
-          xs_label: 'Size: XS'
-          s_label: 'Size: S'
-          m_label: 'Size: M'
-          l_label: 'Size: L'
-          xl_label: 'Size: XL'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const pull_number = context.issue.number;
+
+            // Fetch the array of updated PR filenames:
+            // { status: 'added',    filename: 'arch/arm/test.txt',              additions: 3, deletions: 0,    changes: 3 }
+            // { status: 'removed',  filename: 'Documentation/legacy_README.md', additions: 0, deletions: 2531, changes: 2531 }
+            // { status: 'modified', filename: 'Documentation/security.rst',     additions: 1, deletions: 0,    changes: 1 }
+            const listFilesOptions = github.rest.pulls.listFiles
+              .endpoint.merge({ owner, repo, pull_number });
+            const listFilesResponse = await github.paginate(listFilesOptions);
+
+            // Sum up the number of lines changed
+            const sizeFiles = listFilesResponse
+              .filter(f => (f.status != 'removed'));  // Ignore deleted files
+            var linesChanged = 0;
+            for (const file of sizeFiles) {
+              linesChanged += file.changes;
+            }
+            console.log({ linesChanged });
+
+            // Compute the Size Label
+            const sizeLabel =
+              (linesChanged   <=   10) ? 'Size: XS'
+              : (linesChanged <=  100) ? 'Size: S'
+              : (linesChanged <=  500) ? 'Size: M'
+              : (linesChanged <= 1000) ? 'Size: L'
+              : 'Size: XL';
+            var prLabels = [ sizeLabel ];
+
+            // Parse the Arch Label Patterns in .github/labeler.yml. Condense into:
+            // "Arch: arm":
+            // - any-glob-to-any-file: 'arch/arm/**'
+            // - any-glob-to-any-file: ...
+            const fs = require('fs');
+            const config = fs.readFileSync('labeler/.github/labeler.yml', 'utf8')
+              .split('\n')             // Split by newline
+              .map(s => s.trim())      // Remove leading and trailing spaces
+              .filter(s => (s != ''))  // Remove empty lines
+              .filter(s => !s.startsWith('#'))                  // Remove comments
+              .filter(s => !s.startsWith('- changed-files:'));  // Remove "changed-files"
+
+            // Convert the Arch Label Patterns from config to archLabels.
+            // archLabels will contain the mappings for Arch Label and Filename Pattern:
+            // { label: "Arch: arm",   pattern: "arch/arm/.*"   },
+            // { label: "Arch: arm64", pattern: "arch/arm64/.*" }, ...
+            var archLabels = [];
+            var label = "";
+            for (const c of config) {
+              // Get the Arch Label
+              if (c.startsWith('"')) {    // "Arch: arm":
+                label = c.split('"')[1];  // Arch: arm
+
+              } else if (c.startsWith('- any-glob-to-any-file:')) {  // - any-glob-to-any-file: 'arch/arm/**'
+                // Convert the Glob Pattern to Regex Pattern
+                const pattern = c.split("'")[1]      // arch/arm/**
+                  .split('.').join('\\.')            // .  becomes \.
+                  .split('*').join('[^/]*')          // *  becomes [^/]*
+                  .split('[^/]*[^/]*').join('.*');   // ** becomes .*
+                archLabels.push({
+                  label,                        // Arch: arm
+                  pattern: '^' + pattern + '$'  // Match the Line Start and Line End
+                });
+
+              } else {
+                // We don't support all rules of `actions/labeler`
+                throw new Error('.github/labeler.yml should contain only changed-files and any-glob-to-any-file, not: ' + c);
+              }
+            }
+
+            // Search the filenames for matching Arch Labels
+            for (const archLabel of archLabels) {
+              if (prLabels.includes(archLabel.label)) {
+                break;
+              }
+              for (const file of listFilesResponse) {
+                const re = new RegExp(archLabel.pattern);
+                const match = re.test(file.filename);
+                if (match && !prLabels.includes(archLabel.label)) {
+                  prLabels.push(archLabel.label);
+                  break;
+                }
+              }
+            }
+            console.log({ prLabels });
+
+            // Save the PR Number and PR Labels into a PR Artifact
+            // e.g. 'Size: XS\nArch: avr\n'
+            const dir = 'pr';
+            fs.mkdirSync(dir);
+            fs.writeFileSync(dir + '/pr-id.txt', pull_number + '\n');
+            fs.writeFileSync(dir + '/pr-labels.txt', prLabels.join('\n') + '\n');
+
+      # Upload the PR Artifact as pr.zip
+      - name: Upload PR artifact
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f  # v6.0.0
+        with:
+          name: pr
+          path: pr/
diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml
new file mode 100644
index 000000000..f8af53e05
--- /dev/null
+++ b/.github/workflows/pr_labeler.yml
@@ -0,0 +1,90 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This workflow will fetch the PR Labels from the PR Artifact, and write
+# the PR Labels into the PR. The workflow is called after the
+# "pull_request" trigger (labeler.yml). This "workflow_run" trigger uses a
+# GitHub Token with Write Permission, so we must never run any untrusted
+# code from the PR, and we must always extract and use the PR Artifact
+# safely. See https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=321719166#GitHubActionsSecurity-Buildstriggeredwithworkflow_run
+name: "Set Pull Request Labels"
+on:
+  workflow_run:
+    workflows: ["Pull Request Labeler"]
+    types:
+      - completed
+
+jobs:
+  pr_labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      # Download the PR Artifact, containing PR Number and PR Labels
+      - name: Download PR artifact
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
+        with:
+          script: |
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }},
+            });
+            const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr"
+            })[0];
+            const download = await github.rest.actions.downloadArtifact({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              artifact_id: matchArtifact.id,
+              archive_format: 'zip',
+            });
+            const fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
+
+      # Unzip the PR Artifact
+      - name: Unzip PR artifact
+        run: unzip pr.zip
+
+      # Write the PR Labels into the PR
+      - name: Write PR labels
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const fs = require('fs');
+
+            // Read the PR Number and PR Labels from the PR Artifact
+            // e.g. 'Size: XS\nArch: avr\n'
+            const issue_number = Number(fs.readFileSync('pr-id.txt'));
+            const labels = fs.readFileSync('pr-labels.txt', 'utf8')
+              .split('\n')              // Split by newline
+              .filter(s => (s != ''));  // Remove empty lines
+            console.log({ issue_number, labels });
+
+            // Write the PR Labels into the PR
+            // e.g. [ 'Size: XS', 'Arch: avr' ]
+            await github.rest.issues.setLabels({
+              owner,
+              repo,
+              issue_number,
+              labels
+            });

From 0b084ded88b397e13f39c18dae97784af189833f Mon Sep 17 00:00:00 2001
From: Eren Terzioglu <eren.terzioglu@espressif.com>
Date: Fri, 20 Feb 2026 17:22:59 +0100
Subject: [PATCH 238/568] testing/crypto: Add options to disable hash tests

Add options to disable individual hash tests for devices not supported each hash

Signed-off-by: Eren Terzioglu <eren.terzioglu@espressif.com>
---
 testing/drivers/crypto/Kconfig | 16 +++++++
 testing/drivers/crypto/hash.c  | 77 ++++++++++++++++++++++++++++++++--
 2 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/testing/drivers/crypto/Kconfig b/testing/drivers/crypto/Kconfig
index 8eca7f728..40983778a 100644
--- a/testing/drivers/crypto/Kconfig
+++ b/testing/drivers/crypto/Kconfig
@@ -36,6 +36,22 @@ config TESTING_CRYPTO_HASH_HUGE_BLOCK
 	bool "hash huge block crypto test"
 	default y
 
+config TESTING_CRYPTO_HASH_DISABLE_MD5
+	bool "disable md5 tests"
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_SHA1
+	bool "disable sha1 tests"
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_SHA256
+	bool "disable sha256 tests"
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_SHA512
+	bool "disable sha512 tests"
+	default n
+
 endif
 
 config TESTING_CRYPTO_CRC32
diff --git a/testing/drivers/crypto/hash.c b/testing/drivers/crypto/hash.c
index a4688124e..b0be9306c 100644
--- a/testing/drivers/crypto/hash.c
+++ b/testing/drivers/crypto/hash.c
@@ -29,9 +29,16 @@
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <crypto/cryptodev.h>
-#include <crypto/md5.h>
-#include <crypto/sha1.h>
-#include <crypto/sha2.h>
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
+#  include <crypto/md5.h>
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
+#  include <crypto/sha1.h>
+#endif
+#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256) || \
+    !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512)
+#  include <crypto/sha2.h>
+#endif
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
 #  define HASH_HUGE_BLOCK_SIZE (600 * 1024) /* 600k */
@@ -53,6 +60,7 @@ typedef struct tb
 }
 tb;
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
 tb md5_testcase[] =
 {
     {
@@ -85,7 +93,10 @@ tb md5_testcase[] =
       80,
     }
 };
+#endif
 
+#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1) || \
+    !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256)
 tb sha_testcase[] =
 {
     {
@@ -101,7 +112,9 @@ tb sha_testcase[] =
       1000,
     }
 };
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
 tb sha512_testcase[] =
 {
     {
@@ -118,7 +131,9 @@ tb sha512_testcase[] =
       1000,
     }
 };
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
 /* RFC 1321 test vectors */
 
 static const unsigned char md5_result[7][16] =
@@ -138,7 +153,9 @@ static const unsigned char md5_result[7][16] =
   { 0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55,
     0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a }
 };
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
 /* FIPS-180-1 test vectors */
 
 static const unsigned char sha1_result[3][20] =
@@ -150,7 +167,9 @@ static const unsigned char sha1_result[3][20] =
   { 0x34, 0xaa, 0x97, 0x3c, 0xd4, 0xc4, 0xda, 0xa4, 0xf6, 0x1e,
     0xeb, 0x2b, 0xdb, 0xad, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6f }
 };
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
 /* FIPS-180-2 test vectors */
 
 static const unsigned char sha256_result[3][32] =
@@ -168,7 +187,9 @@ static const unsigned char sha256_result[3][32] =
     0xf1, 0x80, 0x9a, 0x48, 0xa4, 0x97, 0x20, 0x0e,
     0x04, 0x6d, 0x39, 0xcc, 0xc7, 0x11, 0x2c, 0xd0 }
 };
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
 /* FIPS-180-2 test vectors */
 
 static const unsigned char sha512_result[3][64] =
@@ -198,20 +219,26 @@ static const unsigned char sha512_result[3][64] =
     0xeb, 0x00, 0x9c, 0x5c, 0x2c, 0x49, 0xaa, 0x2e,
     0x4e, 0xad, 0xb2, 0x17, 0xad, 0x8c, 0xc0, 0x9b }
 };
+#endif
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
 static const unsigned char md5_huge_block_result[16] =
 {
   0xef, 0x6d, 0xcc, 0xc8, 0xe1, 0xcc, 0x7f, 0x08,
   0xc2, 0x71, 0xd4, 0xc4, 0xe0, 0x13, 0xa3, 0x9b
 };
+#  endif
 
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
 static const unsigned char sha1_huge_block_result[20] =
 {
   0xf2, 0x35, 0x65, 0x81, 0x79, 0x4d, 0xac, 0x20, 0x79, 0x7b,
   0xff, 0x38, 0xee, 0x2b, 0xdc, 0x44, 0x24, 0xd3, 0xf0, 0x4a
 };
+#  endif
 
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
 static const unsigned char sha256_huge_block_result[32] =
 {
   0x79, 0xb1, 0xf2, 0x65, 0x7e, 0x33, 0x25, 0xff,
@@ -219,7 +246,9 @@ static const unsigned char sha256_huge_block_result[32] =
   0x0d, 0xd5, 0xa1, 0x45, 0xb5, 0x30, 0xe0, 0x91,
   0x54, 0x01, 0x40, 0x0c, 0xff, 0x35, 0x1d, 0xd3
 };
+#  endif
 
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
 static const unsigned char sha512_huge_block_result[64] =
 {
   0xa4, 0x3a, 0x66, 0xe8, 0xf7, 0x59, 0x95, 0x6d,
@@ -231,6 +260,7 @@ static const unsigned char sha512_huge_block_result[64] =
   0xce, 0x3a, 0xcf, 0xb6, 0x9c, 0x8b, 0x6e, 0x07,
   0x13, 0xca, 0xe1, 0x94, 0x3c, 0x41, 0x50, 0xcc
 };
+#  endif
 #endif
 
 static void syshash_free(FAR crypto_context *ctx)
@@ -381,25 +411,42 @@ static int testing_hash_huge_block(crypto_context *ctx, int op,
 
 int main(void)
 {
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   crypto_context md5_ctx;
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   crypto_context sha1_ctx;
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   crypto_context sha2_256_ctx;
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   crypto_context sha2_512_ctx;
+#endif
   unsigned char output[64];
   unsigned char buf[1024];
   int ret = 0;
   int i;
   int j;
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   ret += syshash_init(&md5_ctx);
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   ret += syshash_init(&sha1_ctx);
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   ret += syshash_init(&sha2_256_ctx);
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   ret += syshash_init(&sha2_512_ctx);
+#endif
   if (ret != 0)
     {
       printf("syshash init failed\n");
     }
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   for (i = 0; i < nitems(md5_testcase); i++)
     {
       ret = syshash_start(&md5_ctx, CRYPTO_MD5);
@@ -435,7 +482,9 @@ int main(void)
           printf("hash md5 success\n");
         }
     }
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   for (i = 0; i < nitems(sha_testcase); i++)
     {
       ret = syshash_start(&sha1_ctx, CRYPTO_SHA1);
@@ -490,7 +539,9 @@ int main(void)
           printf("hash sha1 success\n");
         }
     }
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   for (i = 0; i < nitems(sha_testcase); i++)
     {
       ret = syshash_start(&sha2_256_ctx, CRYPTO_SHA2_256);
@@ -543,7 +594,9 @@ int main(void)
           printf("hash sha256 success\n");
         }
     }
+#endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   for (i = 0; i < nitems(sha512_testcase); i++)
     {
       ret = syshash_start(&sha2_512_ctx, CRYPTO_SHA2_512);
@@ -598,6 +651,7 @@ int main(void)
           printf("hash sha512 success\n");
         }
     }
+#endif
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
   unsigned char *huge_block;
@@ -609,6 +663,7 @@ int main(void)
     }
 
   memset(huge_block, 'a', HASH_HUGE_BLOCK_SIZE);
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   ret = testing_hash_huge_block(&md5_ctx, CRYPTO_MD5,
                                 huge_block, HASH_HUGE_BLOCK_SIZE,
                                 md5_huge_block_result,
@@ -622,6 +677,9 @@ int main(void)
       printf("md5 huge block test success\n");
     }
 
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   ret = testing_hash_huge_block(&sha1_ctx, CRYPTO_SHA1,
                                 huge_block, HASH_HUGE_BLOCK_SIZE,
                                 sha1_huge_block_result,
@@ -635,6 +693,8 @@ int main(void)
       printf("sha1 huge block test success\n");
     }
 
+#endif
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   ret = testing_hash_huge_block(&sha2_256_ctx, CRYPTO_SHA2_256,
                                 huge_block, HASH_HUGE_BLOCK_SIZE,
                                 sha256_huge_block_result,
@@ -647,7 +707,9 @@ int main(void)
     {
       printf("sha256 huge block test success\n");
     }
+#endif
 
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   ret = testing_hash_huge_block(&sha2_512_ctx, CRYPTO_SHA2_512,
                                 huge_block, HASH_HUGE_BLOCK_SIZE,
                                 sha512_huge_block_result,
@@ -660,14 +722,23 @@ int main(void)
     {
       printf("sha512 huge block test success\n");
     }
+#  endif
 
   free(huge_block);
 #endif
 
 err:
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   syshash_free(&md5_ctx);
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   syshash_free(&sha1_ctx);
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   syshash_free(&sha2_256_ctx);
+#endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   syshash_free(&sha2_512_ctx);
+#endif
   return 0;
 }

From e0d118e3491ac294e8e936f17d701d6abd95bf0f Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 24 Feb 2026 14:54:05 -0500
Subject: [PATCH 239/568] examples/powerled: Fix board initialization
 compilation

When NSH_ARCHINIT is not enabled, initialization is to be performed by
boardctl(BOARDIOC_INIT). However, the boardctl header is not included so
this causes compilation to fail. This commit corrects that issue.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 examples/powerled/powerled_main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c
index c0b3cd29d..4478d2ee7 100644
--- a/examples/powerled/powerled_main.c
+++ b/examples/powerled/powerled_main.c
@@ -38,6 +38,10 @@
 #include <debug.h>
 #include <sys/ioctl.h>
 
+#ifndef CONFIG_NSH_ARCHINIT
+#include <sys/boardctl.h>
+#endif
+
 #include <nuttx/fs/fs.h>
 
 #include <nuttx/power/powerled.h>

From da105afee2186f6b971df38802823ab6748e8621 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 29 Jan 2026 15:48:01 +0800
Subject: [PATCH 240/568] ostest/hrtimer: Add missing assert.h

This commit added missing assert.h.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 48ed46b99..4cd9eb157 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 #include <nuttx/hrtimer.h>
 
+#include <assert.h>
 #include <stdio.h>
 #include <sched.h>
 #include <unistd.h>

From 05e8b0ae609a1e37881c5f607f729611250e52cf Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 29 Jan 2026 15:51:19 +0800
Subject: [PATCH 241/568] ostest/hrtimer: Remove HRTIMER_TEST to simplify the
 code.

This commit removed HRTIMER_TEST to simplify the code.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 4cd9eb157..5b2961179 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -59,20 +59,6 @@
 
 #define HRTIMER_TEST_MARGIN    (NSEC_PER_MSEC)
 
-/* Simple assertion macro for HRTimer test cases */
-#define HRTIMER_TEST(expr, value)                                   \
-  do                                                                \
-    {                                                               \
-      ret = (expr);                                                 \
-      if (ret != (value))                                           \
-        {                                                           \
-          printf("ERROR: HRTimer test failed, line=%d ret=%d\n",   \
-                 __LINE__, ret);                                    \
-          ASSERT(false);                                            \
-        }                                                           \
-    }                                                               \
-  while (0)
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -167,8 +153,8 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 
       diff = (uint32_t)(now - test->previous);
 
-      HRTIMER_TEST(NSEC_PER_50MS < diff + HRTIMER_TEST_MARGIN, true);
-      HRTIMER_TEST(NSEC_PER_50MS > diff - HRTIMER_TEST_MARGIN, true);
+      ASSERT(NSEC_PER_50MS < diff + HRTIMER_TEST_MARGIN);
+      ASSERT(NSEC_PER_50MS > diff - HRTIMER_TEST_MARGIN);
     }
 
   test->previous = now;
@@ -224,25 +210,24 @@ static void * hrtimer_test_thread(void *arg)
       /* Cancel timer */
 
       ret = hrtimer_cancel(&timer);
-      HRTIMER_TEST(ret >= 0, true);
+      ASSERT(ret == OK);
 
       /* Start timer with fixed period */
 
       ret = hrtimer_start(&timer, hrtimer_test_callback,
                           10 * NSEC_PER_USEC, HRTIMER_MODE_REL);
-      HRTIMER_TEST(ret, OK);
+      ASSERT(ret == OK);
 
       /* Start timer with random delay */
 
       ret = hrtimer_start(&timer, hrtimer_test_callback,
                           delay, HRTIMER_MODE_REL);
-      HRTIMER_TEST(ret, OK);
+      ASSERT(ret == OK);
     }
 
   /* Cancel the timer synchronously */
 
-  ret = hrtimer_cancel_sync(&timer);
-  HRTIMER_TEST(ret >= 0, true);
+  ASSERT(hrtimer_cancel_sync(&timer) == OK);
 
   return NULL;
 }
@@ -293,7 +278,8 @@ void hrtimer_test(void)
                       hrtimer_test.period,
                       HRTIMER_MODE_REL);
 
-  HRTIMER_TEST(ret, OK);
+  ASSERT(ret == OK);
+
 
   /* Wait until the test completes */
 
@@ -309,8 +295,8 @@ void hrtimer_test(void)
 
   for (thread_id = 0; thread_id < HRTIMER_TEST_THREAD_NR; thread_id++)
     {
-      HRTIMER_TEST(pthread_create(&pthreads[thread_id], &attr,
-                                  hrtimer_test_thread, NULL), 0);
+      ASSERT(pthread_create(&pthreads[thread_id], &attr,
+                            hrtimer_test_thread, NULL) == 0);
     }
 
   /* Wait for all threads to complete */
@@ -320,5 +306,5 @@ void hrtimer_test(void)
       pthread_join(pthreads[thread_id], NULL);
     }
 
-  HRTIMER_TEST(pthread_attr_destroy(&attr), 0);
+  ASSERT(pthread_attr_destroy(&attr) == 0);
 }

From 9b84a0ab02fe5b3cdab7a1949958de40a9c73993 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 29 Jan 2026 16:02:10 +0800
Subject: [PATCH 242/568] sched/hrtimer: Simplify the hrtimer test.

This commit simplified the hrtimer test.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 94 +++++++++++++---------------------------
 1 file changed, 29 insertions(+), 65 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 5b2961179..585c6f30a 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -65,43 +65,18 @@
 
 /* Structure for HRTimer test tracking */
 
-struct hrtimer_test_s
+typedef struct hrtimer_test_s
 {
-  hrtimer_t timer;    /* HRTimer instance */
-  uint64_t  previous; /* Previous timestamp in nanoseconds */
-  uint32_t  count;    /* Number of timer expirations */
-  uint32_t  period;   /* Expected period between expirations */
-  bool      active;   /* True while the test is still running */
-};
+  struct hrtimer_s  timer;     /* HRTimer instance */
+  volatile uint64_t timestamp; /* Previous timestamp in nanoseconds */
+  volatile uint64_t count;     /* Number of timer expirations */
+  uint64_t          period;    /* Expected period between expirations */
+} hrtimer_test_t;
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: hrtimer_test_init
- *
- * Description:
- *   Initialize a hrtimer_test_s structure for a new test.
- *
- * Input Parameters:
- *   hrtimer_test - Pointer to the test structure to initialize
- *   period       - Expected timer period in nanoseconds
- *
- * Returned Value:
- *   None
- *
- ****************************************************************************/
-
-static void hrtimer_test_init(FAR struct hrtimer_test_s *hrtimer_test,
-                              uint32_t period)
-{
-  hrtimer_test->previous = 0;
-  hrtimer_test->count = 0;
-  hrtimer_test->active = true;
-  hrtimer_test->period = period;
-}
-
 /****************************************************************************
  * Name: test_hrtimer_callback
  *
@@ -129,8 +104,6 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
   uint64_t now;
   int ret;
 
-  UNUSED(expired);
-
   FAR struct hrtimer_test_s *test =
     (FAR struct hrtimer_test_s *)hrtimer;
 
@@ -151,13 +124,13 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
        * 500ms with nsec resolution
        */
 
-      diff = (uint32_t)(now - test->previous);
+      diff = (uint32_t)(now - expired);
 
       ASSERT(NSEC_PER_50MS < diff + HRTIMER_TEST_MARGIN);
       ASSERT(NSEC_PER_50MS > diff - HRTIMER_TEST_MARGIN);
     }
 
-  test->previous = now;
+  test->timestamp = now;
 
   /* Stop the test after PERIOD_TEST_COUNT expirations */
 
@@ -196,11 +169,28 @@ hrtimer_test_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 
 static void * hrtimer_test_thread(void *arg)
 {
-  hrtimer_t timer;
-  int ret;
-  int i = 0;
+  hrtimer_test_t test;
+  int             ret;
+  uint64_t      stamp;
+  int               i = 0;
+  hrtimer_t    *timer = &test.timer;
 
-  hrtimer_init(&timer);
+  /* Initialize the high-resolution timer */
+
+  hrtimer_init(timer);
+
+  /* Start the timer with 500ms relative timeout */
+
+  stamp = test.timestamp;
+  ASSERT(hrtimer_start(timer, test_hrtimer_callback,
+                       NSEC_PER_50MS, HRTIMER_MODE_REL) == OK);
+
+  /* Wait until the test completes */
+
+  while (test.timestamp != stamp)
+    {
+      usleep(USEC_PER_MSEC);
+    }
 
   while (i < THREAD_LOOP_COUNT)
     {
@@ -260,34 +250,8 @@ void hrtimer_test(void)
   unsigned int thread_id;
   pthread_attr_t attr;
   pthread_t pthreads[HRTIMER_TEST_THREAD_NR];
-  struct hrtimer_test_s hrtimer_test;
   int ret;
 
-  /* Initialize test structure */
-
-  hrtimer_test_init(&hrtimer_test, NSEC_PER_50MS);
-
-  /* Initialize the high-resolution timer */
-
-  hrtimer_init(&hrtimer_test.timer);
-
-  /* Start the timer with 500ms relative timeout */
-
-  ret = hrtimer_start(&hrtimer_test.timer,
-                      test_hrtimer_callback,
-                      hrtimer_test.period,
-                      HRTIMER_MODE_REL);
-
-  ASSERT(ret == OK);
-
-
-  /* Wait until the test completes */
-
-  while (hrtimer_test.active)
-    {
-      usleep(USEC_PER_MSEC);
-    }
-
   pthread_attr_init(&attr);
 
   sparam.sched_priority = PTHREAD_DEFAULT_PRIORITY;

From e69f9e902b354a94a37672296af41bcb4a0e5ef4 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 29 Jan 2026 16:08:24 +0800
Subject: [PATCH 243/568] sched/hrtimer: Fix test in QEMU.

This commit fixed the hrtimer test.
In a QEMU environment, the hrtimer latency can be arbitrary because vCPUs can be preempted. We can not assert the latency. we can only issue alerts for excessively high latency.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 585c6f30a..d82cf171a 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -100,9 +100,9 @@ static uint64_t
 test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 {
   struct timespec ts;
-  uint32_t diff;
+  int64_t  diff;
   uint64_t now;
-  int ret;
+  int      ret;
 
   FAR struct hrtimer_test_s *test =
     (FAR struct hrtimer_test_s *)hrtimer;
@@ -116,18 +116,20 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
   clock_systime_timespec(&ts);
   now = clock_time2nsec(&ts);
 
-  /* Skip comparison for first two invocations */
+  /* Verify the timer interval is exactly
+   * 500ms with nsec resolution
+   */
 
-  if (test->count > 2)
+  diff = now - expired;
+
+  /* Ensure the time diff is valid. */
+
+  ASSERT(diff >= 0);
+
+  if (diff > HRTIMER_TEST_MARGIN)
     {
-      /* Verify the timer interval is exactly
-       * 500ms with nsec resolution
-       */
-
-      diff = (uint32_t)(now - expired);
-
-      ASSERT(NSEC_PER_50MS < diff + HRTIMER_TEST_MARGIN);
-      ASSERT(NSEC_PER_50MS > diff - HRTIMER_TEST_MARGIN);
+      printf("hrtimer_test: warning diff=%" PRIu64 " > %" PRIu64 "\n",
+             diff, HRTIMER_TEST_MARGIN);
     }
 
   test->timestamp = now;

From 1c0281be1520ff33e90264866798964914f0f35f Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 29 Jan 2026 16:13:52 +0800
Subject: [PATCH 244/568] sched/hrtimer: relocate the hrtimer test to simplify.

This commit relocated the hrtimer test to simplify the code.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/CMakeLists.txt |  7 +++----
 testing/ostest/Makefile       | 10 ++++------
 testing/ostest/ostest.h       | 10 ++++++----
 testing/ostest/ostest_main.c  | 16 ++++++++--------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 6096c7ce6..fba7f4c47 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -157,16 +157,15 @@ if(CONFIG_TESTING_OSTEST)
     list(APPEND SRCS nxevent.c)
   endif()
 
-  if(CONFIG_HRTIMER AND CONFIG_BUILD_FLAT)
-    list(APPEND SRCS hrtimer.c)
-  endif()
-
   if(CONFIG_ARCH_HAVE_PERF_EVENTS)
     list(APPEND SRCS perf_gettime.c)
   endif()
 
   if(CONFIG_BUILD_FLAT)
     list(APPEND SRCS wdog.c spinlock.c)
+    if(CONFIG_HRTIMER)
+      list(APPEND SRCS hrtimer.c)
+    endif()
   endif()
 
   set(OSTEST_SRCS ostest_main.c ${SRCS})
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 1f6a28b2f..6fc3a7b76 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -160,18 +160,16 @@ CSRCS += nxevent.c
 endif
 endif
 
-ifeq ($(CONFIG_HRTIMER),y)
-ifeq ($(CONFIG_BUILD_FLAT),y)
-CSRCS += hrtimer.c
-endif
-endif
-
 ifeq ($(CONFIG_ARCH_HAVE_PERF_EVENTS),y)
 CSRCS += perf_gettime.c
 endif
 
 ifeq ($(CONFIG_BUILD_FLAT),y)
 CSRCS += wdog.c spinlock.c
+
+ifeq ($(CONFIG_HRTIMER),y)
+CSRCS += hrtimer.c
+endif
 endif
 
 include $(APPDIR)/Application.mk
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index f4f09ca8b..0fb2b8d31 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -215,6 +215,12 @@ void suspend_test(void);
 
 void wdog_test(void);
 
+/* hrtimer.c ****************************************************************/
+
+#ifdef CONFIG_HRTIMER
+void hrtimer_test(void);
+#endif
+
 /* posixtimers.c ************************************************************/
 
 void timer_test(void);
@@ -314,8 +320,4 @@ int sem_nfreeholders(void);
 void nxevent_test(void);
 #endif
 
-#if defined(CONFIG_HRTIMER) && defined(CONFIG_BUILD_FLAT)
-void hrtimer_test(void);
-#endif
-
 #endif /* __APPS_TESTING_OSTEST_OSTEST_H */
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index c711a8db6..89022b4bc 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -555,6 +555,14 @@ static int user_main(int argc, char *argv[])
       printf("\nuser_main: wdog test\n");
       wdog_test();
       check_test_memory_usage();
+
+      /* Verify hrtimer */
+
+#  ifdef CONFIG_HRTIMER
+      printf("\nuser_main: hrtimer test\n");
+      hrtimer_test();
+      check_test_memory_usage();
+#  endif
 #endif
 
 #if !defined(CONFIG_DISABLE_POSIX_TIMERS) && \
@@ -643,14 +651,6 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
-#if defined(CONFIG_HRTIMER) && defined(CONFIG_BUILD_FLAT)
-      /* Verify hrtimer */
-
-      printf("\nuser_main: hrtimer test\n");
-      hrtimer_test();
-      check_test_memory_usage();
-#endif
-
       /* Compare memory usage at time ostest_main started until
        * user_main exits.  These should not be identical, but should
        * be similar enough that we can detect any serious OS memory

From 0bbf5dc0924fe3c602d85a9cccfe3268b1578ffe Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Thu, 29 Jan 2026 16:18:14 +0800
Subject: [PATCH 245/568] sched/hrtimer: Improve code readability

This commit improved the code readability.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 45 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index d82cf171a..eedd53b86 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -41,23 +41,22 @@
 
 /* Timer constants */
 
-#define NSEC_PER_50MS            (50 * NSEC_PER_MSEC)
-#define PERIOD_TEST_COUNT        15
-#define THREAD_LOOP_COUNT        50
-#define HRTIMER_TEST_THREAD_NR   (CONFIG_SMP_NCPUS * 5)
+#define HRTIMER_PERIOD_TEST_NR 15
+#define HRTIMER_THREAD_LOOP_NR 50
+#define HRTIMER_TEST_THREAD_NR (CONFIG_SMP_NCPUS * 5)
 
-/* Set a 1ms margin to allow hrtimertest to pass in QEMU.
+/* Set a 1ms latency to allow hrtimertest to pass in QEMU.
  *
  * QEMU is a virtual platform, and its timer resolution and scheduling
  * latency may be less precise than on real hardware. Using a larger
- * margin ensures that tests do not fail due to timing inaccuracies.
+ * latency ensures that tests do not fail due to timing inaccuracies.
  *
  * On real hardware (verified on the a2g-tc397-5v-tft board), this
- * margin can be reduced to less than 5 ns because timers are precise
+ * latency can be reduced to less than 5 ns because timers are precise
  * and deterministic.
  */
 
-#define HRTIMER_TEST_MARGIN    (NSEC_PER_MSEC)
+#define HRTIMER_TEST_TOLERENT_LATENCY (NSEC_PER_MSEC)
 
 /****************************************************************************
  * Private Types
@@ -126,17 +125,17 @@ test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 
   ASSERT(diff >= 0);
 
-  if (diff > HRTIMER_TEST_MARGIN)
+  if (diff > HRTIMER_TEST_TOLERENT_LATENCY)
     {
       printf("hrtimer_test: warning diff=%" PRIu64 " > %" PRIu64 "\n",
-             diff, HRTIMER_TEST_MARGIN);
+             diff, HRTIMER_TEST_TOLERENT_LATENCY);
     }
 
   test->timestamp = now;
 
-  /* Stop the test after PERIOD_TEST_COUNT expirations */
+  /* Stop the test after HRTIMER_PERIOD_TEST_NR expirations */
 
-  if (test->count < PERIOD_TEST_COUNT)
+  if (test->count < HRTIMER_PERIOD_TEST_NR)
     {
       return test->period;
     }
@@ -174,7 +173,7 @@ static void * hrtimer_test_thread(void *arg)
   hrtimer_test_t test;
   int             ret;
   uint64_t      stamp;
-  int               i = 0;
+  int        loop_cnt = 0;
   hrtimer_t    *timer = &test.timer;
 
   /* Initialize the high-resolution timer */
@@ -185,7 +184,7 @@ static void * hrtimer_test_thread(void *arg)
 
   stamp = test.timestamp;
   ASSERT(hrtimer_start(timer, test_hrtimer_callback,
-                       NSEC_PER_50MS, HRTIMER_MODE_REL) == OK);
+                       50 * NSEC_PER_MSEC, HRTIMER_MODE_REL) == OK);
 
   /* Wait until the test completes */
 
@@ -194,9 +193,8 @@ static void * hrtimer_test_thread(void *arg)
       usleep(USEC_PER_MSEC);
     }
 
-  while (i < THREAD_LOOP_COUNT)
+  while (loop_cnt++ < HRTIMER_THREAD_LOOP_NR)
     {
-      i++;
       uint64_t delay = rand() % NSEC_PER_MSEC;
 
       /* Cancel timer */
@@ -249,15 +247,16 @@ static void * hrtimer_test_thread(void *arg)
 void hrtimer_test(void)
 {
   struct sched_param sparam;
-  unsigned int thread_id;
-  pthread_attr_t attr;
-  pthread_t pthreads[HRTIMER_TEST_THREAD_NR];
-  int ret;
+  unsigned int    thread_id;
+  pthread_attr_t       attr;
+  pthread_t        pthreads[HRTIMER_TEST_THREAD_NR];
 
-  pthread_attr_init(&attr);
+  printf("hrtimer_test start...\n");
+
+  ASSERT(pthread_attr_init(&attr) == 0);
 
   sparam.sched_priority = PTHREAD_DEFAULT_PRIORITY;
-  pthread_attr_setschedparam(&attr, &sparam);
+  ASSERT(pthread_attr_setschedparam(&attr, &sparam) == 0);
 
   for (thread_id = 0; thread_id < HRTIMER_TEST_THREAD_NR; thread_id++)
     {
@@ -273,4 +272,6 @@ void hrtimer_test(void)
     }
 
   ASSERT(pthread_attr_destroy(&attr) == 0);
+
+  printf("hrtimer_test end...\n");
 }

From d33830e83fe99fc56e5a53642196a1d9e45ef702 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Mon, 2 Feb 2026 16:17:22 +0800
Subject: [PATCH 246/568] ostest/hrtimer: Increase the tolerent latency.

For QEMU, virtual CPUs can be preempted by any high priority thread in
test environments. This can cause the timer to be triggered later than
expected. This commit increased the tolerant latency to avoid the test
failures.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index eedd53b86..3cf847eb3 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -45,18 +45,22 @@
 #define HRTIMER_THREAD_LOOP_NR 50
 #define HRTIMER_TEST_THREAD_NR (CONFIG_SMP_NCPUS * 5)
 
-/* Set a 1ms latency to allow hrtimertest to pass in QEMU.
+/* Set the tolerent latency to 10ms to allow hrtimer_test to pass
+ * in QEMU.
  *
- * QEMU is a virtual platform, and its timer resolution and scheduling
- * latency may be less precise than on real hardware. Using a larger
- * latency ensures that tests do not fail due to timing inaccuracies.
+ * QEMU is a virtual platform, vCPUs can be preempted by any
+ * high priority thread. This can cause the timer to be triggered
+ * later than expected. This is especially true on QEMU because it
+ * has a lot of overhead. The timer resolution is also less precise
+ * than on real hardware. Using a larger latency ensures that tests
+ * do not fail due to timing inaccuracies.
  *
  * On real hardware (verified on the a2g-tc397-5v-tft board), this
  * latency can be reduced to less than 5 ns because timers are precise
  * and deterministic.
  */
 
-#define HRTIMER_TEST_TOLERENT_LATENCY (NSEC_PER_MSEC)
+#define HRTIMER_TEST_TOLERENT_LATENCY (10 * NSEC_PER_MSEC)
 
 /****************************************************************************
  * Private Types

From 256d6685d57788ec47cf34957124d87f229e2571 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Wed, 25 Feb 2026 09:48:19 +0800
Subject: [PATCH 247/568] sched/hrtimer: Refactor the hrtimer_test.

This commit refactored the hrtimer_test and provided significantly
improved test-cases for both SMP and non-SMP.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 572 +++++++++++++++++++++++++++++++--------
 1 file changed, 466 insertions(+), 106 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 3cf847eb3..63040697c 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -41,9 +41,9 @@
 
 /* Timer constants */
 
-#define HRTIMER_PERIOD_TEST_NR 15
-#define HRTIMER_THREAD_LOOP_NR 50
-#define HRTIMER_TEST_THREAD_NR (CONFIG_SMP_NCPUS * 5)
+#define HRTIMER_TEST_RAND_ITER (1024 * 2)
+#define HRTIMER_TEST_CSECTION  1024
+#define HRTIMER_TEST_THREAD_NR (CONFIG_SMP_NCPUS * 8)
 
 /* Set the tolerent latency to 10ms to allow hrtimer_test to pass
  * in QEMU.
@@ -62,6 +62,8 @@
 
 #define HRTIMER_TEST_TOLERENT_LATENCY (10 * NSEC_PER_MSEC)
 
+#define hrtimer_test_ndelay(delay_ns) usleep(delay_ns / 1000 + 1)
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -71,99 +73,458 @@
 typedef struct hrtimer_test_s
 {
   struct hrtimer_s  timer;     /* HRTimer instance */
+  spinlock_t        lock;      /* Spinlock */
   volatile uint64_t timestamp; /* Previous timestamp in nanoseconds */
   volatile uint64_t count;     /* Number of timer expirations */
   uint64_t          period;    /* Expected period between expirations */
+  volatile uint8_t  state;     /* Test state */
 } hrtimer_test_t;
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: test_hrtimer_callback
- *
- * Description:
- *   HRTimer callback function for test.
- *
- *   - Verifies the timer interval is exactly 500ms (nanosecond precision)
- *   - Stops the test after 15 expirations
- *   - Re-arms the timer in absolute mode
- *
- * Input Parameters:
- *   hrtimer - Pointer to the expired HRTimer instance
- *   expired - The expired value of hrtimer
- *
- * Returned Value:
- *   Timer period in nanoseconds (NSEC_PER_50MS)
- *
- ****************************************************************************/
-
-static uint64_t
-test_hrtimer_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
+static uint64_t hrtimer_test_callback_oneshot(FAR const hrtimer_t *timer,
+                                              uint64_t expired_ns)
 {
-  struct timespec ts;
-  int64_t  diff;
-  uint64_t now;
-  int      ret;
+  FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
 
-  FAR struct hrtimer_test_s *test =
-    (FAR struct hrtimer_test_s *)hrtimer;
+  /* Save the timestamp when the callback was triggered */
 
-  /* Increment expiration count */
+  param->timestamp = clock_systime_nsec();
 
-  test->count++;
+  /* Increment the callback count */
 
-  /* Get current system time */
+  param->count++;
 
-  clock_systime_timespec(&ts);
-  now = clock_time2nsec(&ts);
+  return 0;
+}
 
-  /* Verify the timer interval is exactly
-   * 500ms with nsec resolution
-   */
+static void hrtimer_test_checkdelay(uint64_t timestamp, uint64_t expected)
+{
+  int64_t diff = timestamp - expected;
 
-  diff = now - expired;
-
-  /* Ensure the time diff is valid. */
+  /* Ensure the hrtimer trigger time is not earlier than expected. */
 
   ASSERT(diff >= 0);
 
+  /* If the timer latency exceeds the tolerance, print a warning. */
+
   if (diff > HRTIMER_TEST_TOLERENT_LATENCY)
     {
-      printf("hrtimer_test: warning diff=%" PRIu64 " > %" PRIu64 "\n",
-             diff, HRTIMER_TEST_TOLERENT_LATENCY);
-    }
-
-  test->timestamp = now;
-
-  /* Stop the test after HRTIMER_PERIOD_TEST_NR expirations */
-
-  if (test->count < HRTIMER_PERIOD_TEST_NR)
-    {
-      return test->period;
-    }
-  else
-    {
-      test->active = false;
-      return 0;
+      printf("hrtimer_test: [WARNING] hrtimer latency %" PRId64
+             " is too late!!! (> %u)\n", diff,
+             (unsigned)HRTIMER_TEST_TOLERENT_LATENCY);
     }
 }
 
-/****************************************************************************
- * Name: hrtimer_test_callback
- *
- * Description:
- *   Simple HRTimer callback for threaded tests.
- *
- ****************************************************************************/
-
-static uint64_t
-hrtimer_test_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
+static void hrtimer_test_oneshot(FAR hrtimer_test_t *param, uint64_t delay)
 {
+  uint64_t       count;
+  uint64_t       now;
+  FAR hrtimer_t *timer = &param->timer;
+
+  printf("hrtimer_test_oneshot %" PRIu64 " ns\n", delay);
+
+  /* Save the current callback count. */
+
+  count = param->count;
+
+  /* Save the current system time. */
+
+  now = clock_systime_nsec();
+
+  ASSERT(hrtimer_start(timer, hrtimer_test_callback_oneshot,
+                       delay + now, HRTIMER_MODE_ABS) == OK);
+
+  /* Wait until the callback is triggered exactly once. */
+
+  while (count + 1 != param->count)
+    {
+      hrtimer_test_ndelay(delay);
+    }
+
+  /* Check if the delay is within the acceptable tolerance. */
+
+  hrtimer_test_checkdelay(param->timestamp, now + delay);
+
+  /* Cancel the timer. */
+
+  hrtimer_cancel_sync(timer);
+}
+
+static void hrtimer_test_maximum(FAR hrtimer_test_t *param)
+{
+  uint64_t       count;
+  uint64_t       rest;
+  FAR hrtimer_t *timer = &param->timer;
+
+  count = param->count;
+
+  /* Start the hrtimer with maximum */
+
+  ASSERT(hrtimer_start(timer, hrtimer_test_callback_oneshot, UINT64_MAX,
+                       HRTIMER_MODE_REL) == OK);
+
+  /* Sleep for at least 1s */
+
+  hrtimer_test_ndelay(USEC_PER_SEC / 100);
+
+  /* Ensure hrtimer is not alarmed */
+
+  ASSERT(count == param->count);
+
+  rest = hrtimer_gettime(timer);
+
+  ASSERT(rest < UINT64_MAX);
+
+  ASSERT(hrtimer_cancel_sync(timer) == OK);
+
+  printf("hrtimer_start with maximum delay, rest %" PRIu64 "\n", rest);
+}
+
+static void hrtimer_test_rand(FAR hrtimer_test_t *param, uint64_t rand_ns)
+{
+  uint64_t       count;
+  uint64_t       now;
+  unsigned int   idx;
+  uint64_t       delay;
+  irqstate_t     flags;
+  FAR hrtimer_t *timer = &param->timer;
+
+  printf("hrtimer_test_rand %" PRIu64 " ns\n", rand_ns);
+
+  /* Perform multiple iterations with random delays. */
+
+  for (idx = 0; idx < HRTIMER_TEST_RAND_ITER; idx++)
+    {
+      /* Generate a random delay within the specified range. */
+
+      delay = rand() % rand_ns;
+
+      ASSERT(timer->func == NULL);
+
+      /* Enter critical section if the callback count is odd. */
+
+      count = param->count;
+
+      if (count % 2u)
+        {
+          flags = up_irq_save();
+        }
+
+      now = clock_systime_nsec();
+      ASSERT(hrtimer_start(timer, hrtimer_test_callback_oneshot,
+                           delay, HRTIMER_MODE_REL) == 0);
+      if (count % 2u)
+        {
+          up_irq_restore(flags);
+        }
+
+      /* Decide to wait for the callback or cancel the hrtimer. */
+
+      if (delay % 2u)
+        {
+          /* Wait for the callback. */
+
+          while (count + 1u != param->count)
+            {
+              hrtimer_test_ndelay(delay);
+            }
+
+          /* Check the delay if the callback count is odd. */
+
+          if (count % 2u)
+            {
+              hrtimer_test_checkdelay(param->timestamp, now + delay);
+            }
+        }
+
+      hrtimer_cancel_sync(timer);
+      ASSERT(timer->func == NULL);
+    }
+
+  hrtimer_cancel_sync(timer);
+}
+
+static uint64_t hrtimer_test_cancel_callback(FAR const hrtimer_t *timer,
+                                             uint64_t expired_ns)
+{
+  FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
+  FAR spinlock_t      *lock = &param->lock;
+  uint64_t            delay = 0;
+  irqstate_t          flags = spin_lock_irqsave(lock);
+
+  /* Random sleep */
+
+  delay = expired_ns % param->period;
+
+  /* Check if the version is same. */
+
+  if (expired_ns == timer->expired)
+    {
+      param->timestamp = clock_systime_nsec();
+
+      /* Increment the callback count */
+
+      param->count++;
+    }
+
+  spin_unlock_irqrestore(lock, flags);
+
+  up_ndelay(delay);
+
   return 0;
 }
 
+static void hrtimer_test_rand_cancel(FAR hrtimer_test_t *param,
+                                     uint64_t rand_ns)
+{
+  uint64_t       now;
+  unsigned int   idx;
+  uint64_t     count;
+  uint64_t     delay;
+  irqstate_t   flags;
+  spinlock_t   *lock = &param->lock;
+
+  printf("hrtimer_test_rand cancel %" PRIu64 " ns\n", rand_ns);
+
+  param->period = rand_ns;
+
+  /* Perform multiple iterations with random delays. */
+
+  for (idx = 0; idx < HRTIMER_TEST_RAND_ITER; idx++)
+    {
+      /* Generate a random delay within the specified range. */
+
+      delay = rand() % rand_ns;
+
+      flags = spin_lock_irqsave(lock);
+
+      now   = clock_systime_nsec();
+      count = param->count;
+      ASSERT(hrtimer_start(&param->timer, hrtimer_test_cancel_callback,
+                           delay, HRTIMER_MODE_REL) == 0);
+
+      spin_unlock_irqrestore(lock, flags);
+
+      /* Decide to wait for the callback or cancel the hrtimer. */
+
+      if (delay % 2u)
+        {
+          /* Wait for the callback finished. */
+
+          while (param->count != count + 1u)
+            {
+              hrtimer_test_ndelay(delay);
+            }
+
+          hrtimer_test_checkdelay(param->timestamp, now + delay);
+        }
+
+      hrtimer_cancel(&param->timer);
+    }
+
+  hrtimer_cancel_sync(&param->timer);
+}
+
+static uint64_t hrtimer_test_callback_period(FAR const hrtimer_t *timer,
+                                             uint64_t expired_ns)
+{
+  FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
+  uint64_t         interval = param->period;
+
+  param->count++;
+  param->timestamp = clock_systime_nsec();
+
+  return interval;
+}
+
+static void hrtimer_test_period(FAR hrtimer_test_t *param,
+                                uint64_t delay_ns,
+                                unsigned int iters)
+{
+  uint64_t   timestamp;
+  uint64_t       count = param->count;
+  FAR hrtimer_t *timer = &param->timer;
+
+  printf("hrtimer_test_period %" PRIu64 " ns\n", delay_ns);
+
+  param->period = delay_ns;
+  ASSERT(param->period > 0);
+
+  timestamp = clock_systime_nsec();
+
+  ASSERT(hrtimer_start(timer, hrtimer_test_callback_period,
+                       delay_ns, HRTIMER_MODE_REL) == OK);
+
+  hrtimer_test_ndelay(iters * delay_ns);
+
+  hrtimer_cancel_sync(timer);
+  ASSERT(timer->func == NULL);
+
+  printf("periodical hrtimer triggered %" PRIu64 " times, "
+         "elapsed nsec %" PRIu64 "\n", param->count - count,
+         param->timestamp - timestamp);
+
+  if (param->count - count < iters)
+    {
+      printf("hrtimer_test: [WARNING] periodical hrtimer"
+             "triggered times < %u\n", iters);
+    }
+}
+
+#ifdef CONFIG_SMP
+static uint64_t hrtimer_test_callback_crita(FAR const hrtimer_t *timer,
+                                            uint64_t expired_ns)
+{
+  FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
+
+  /* change status */
+
+  if (param->state == 0)
+    {
+      param->state = 1;
+      param->count++;
+    }
+
+  /* check whether parameter be changed by another critical section */
+
+  ASSERT(param->state == 1);
+  param->state = 0;
+
+  return 0;
+}
+
+static uint64_t hrtimer_test_callback_critb(FAR const hrtimer_t *timer,
+                                            uint64_t expired_ns)
+{
+  FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
+
+  /* change status */
+
+  if (param->state == 1)
+    {
+      param->state = 0;
+      param->count++;
+    }
+
+  /* check whether parameter be changed by another critical section */
+
+  ASSERT(param->state == 0);
+  param->state = 1;
+
+  return 0;
+}
+
+static uint64_t hrtimer_test_callback_critdelay(FAR const hrtimer_t *timer,
+                                                uint64_t expired_ns)
+{
+  FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
+  FAR spinlock_t *lock      = &param->lock;
+  irqstate_t flags;
+
+  flags = spin_lock_irqsave(lock);
+  param->count++;
+  spin_unlock_irqrestore(lock, flags);
+
+  up_ndelay(100 * NSEC_PER_USEC);
+
+  return 300 * NSEC_PER_USEC;
+}
+
+static void hrtimer_test_cancel_sync(FAR hrtimer_test_t *param)
+{
+  unsigned int idx = 0;
+
+  ASSERT(!param->timer.func);
+
+  param->count = 0;
+
+  /* This test is to validate if the hrtimer can ensure the
+   * callback function be finished after the hrtimer_cancel_sync
+   * is called.
+   */
+
+  for (idx = 0; idx < HRTIMER_TEST_CSECTION; )
+    {
+      param->state = 0;
+      hrtimer_start(&param->timer, hrtimer_test_callback_crita,
+                    0, HRTIMER_MODE_REL);
+
+      hrtimer_cancel_sync(&param->timer);
+      param->state = 1;
+      hrtimer_start(&param->timer, hrtimer_test_callback_critb,
+                    0, HRTIMER_MODE_REL);
+
+      if (++idx % (HRTIMER_TEST_CSECTION / 4) == 0)
+        {
+          printf("hrtimer_test_cancel_sync passed %d times.\n", idx);
+        }
+
+      hrtimer_cancel_sync(&param->timer);
+    }
+}
+
+static void hrtimer_test_cancel_periodic(FAR hrtimer_test_t *param)
+{
+  uint64_t       count;
+  unsigned int     idx = 0;
+  FAR spinlock_t *lock = &param->lock;
+
+  ASSERT(!param->timer.func);
+
+  param->count = 0;
+
+  /* This test to check if the hrtimer can ensure the perodical callback
+   * can not restart the timer again after the hrtimer_cancel_sync is
+   * called.
+   */
+
+  for (idx = 0; idx < HRTIMER_TEST_CSECTION; idx++)
+    {
+      irqstate_t flags = spin_lock_irqsave(lock);
+
+      hrtimer_start(&param->timer, hrtimer_test_callback_critdelay,
+                    0, HRTIMER_MODE_REL);
+
+      spin_unlock_irqrestore(lock, flags);
+
+      up_ndelay(10000);
+
+      flags = spin_lock_irqsave(lock);
+
+      hrtimer_start(&param->timer, hrtimer_test_callback_critdelay,
+                    0, HRTIMER_MODE_REL);
+
+      spin_unlock_irqrestore(lock, flags);
+
+      hrtimer_cancel(&param->timer);
+
+      up_ndelay(10000);
+
+      /* The hrtimer should not be restarted again after the cancellation. */
+
+      ASSERT(!param->timer.func);
+
+      hrtimer_cancel_sync(&param->timer);
+      count = param->count;
+
+      hrtimer_test_ndelay(10000);
+
+      ASSERT(count == param->count);
+
+      if (++idx % (HRTIMER_TEST_CSECTION / 4) == 0)
+        {
+          printf("hrtimer_test_cancel_periodic passed %d times. count %"
+                 PRIu64 "\n", idx, param->count);
+        }
+    }
+
+  hrtimer_cancel_sync(&param->timer);
+}
+#endif
+
 /****************************************************************************
  * Name: hrtimer_test_thread
  *
@@ -174,56 +535,55 @@ hrtimer_test_callback(FAR const hrtimer_t *hrtimer, uint64_t expired)
 
 static void * hrtimer_test_thread(void *arg)
 {
-  hrtimer_test_t test;
-  int             ret;
-  uint64_t      stamp;
-  int        loop_cnt = 0;
-  hrtimer_t    *timer = &test.timer;
-
-  /* Initialize the high-resolution timer */
-
-  hrtimer_init(timer);
-
-  /* Start the timer with 500ms relative timeout */
-
-  stamp = test.timestamp;
-  ASSERT(hrtimer_start(timer, test_hrtimer_callback,
-                       50 * NSEC_PER_MSEC, HRTIMER_MODE_REL) == OK);
-
-  /* Wait until the test completes */
-
-  while (test.timestamp != stamp)
+  hrtimer_test_t param =
     {
-      usleep(USEC_PER_MSEC);
-    }
+      0
+    };
 
-  while (loop_cnt++ < HRTIMER_THREAD_LOOP_NR)
-    {
-      uint64_t delay = rand() % NSEC_PER_MSEC;
+  hrtimer_init(&param.timer);
 
-      /* Cancel timer */
+  /* Delay = 0 */
 
-      ret = hrtimer_cancel(&timer);
-      ASSERT(ret == OK);
+  hrtimer_test_oneshot(&param, 0u);
 
-      /* Start timer with fixed period */
+  /* 0 < Delay < 10000 */
 
-      ret = hrtimer_start(&timer, hrtimer_test_callback,
-                          10 * NSEC_PER_USEC, HRTIMER_MODE_REL);
-      ASSERT(ret == OK);
+  hrtimer_test_oneshot(&param, 1u);
+  hrtimer_test_oneshot(&param, 10u);
+  hrtimer_test_oneshot(&param, 100u);
+  hrtimer_test_oneshot(&param, 1000u);
+  hrtimer_test_oneshot(&param, 10000u);
 
-      /* Start timer with random delay */
+  /* 10000 < Delay < 10000000 */
 
-      ret = hrtimer_start(&timer, hrtimer_test_callback,
-                          delay, HRTIMER_MODE_REL);
-      ASSERT(ret == OK);
-    }
+  hrtimer_test_oneshot(&param, 100000u);
+  hrtimer_test_oneshot(&param, 1000000u);
+  hrtimer_test_oneshot(&param, 10000000u);
 
-  /* Cancel the timer synchronously */
+#ifdef CONFIG_SMP
+  /* Test hrtimer_cancel_sync */
 
-  ASSERT(hrtimer_cancel_sync(&timer) == OK);
+  hrtimer_test_cancel_sync(&param);
 
-  return NULL;
+  /* Test hrtimer_cancel */
+
+  hrtimer_test_cancel_periodic(&param);
+#endif
+
+  /* Maximum hrtimer delay test. */
+
+  hrtimer_test_maximum(&param);
+
+  /* Period hrtimer delay 100000ns */
+
+  hrtimer_test_period(&param, 1000000u, 128u);
+
+  /* Random delay 12345ns and 67890ns */
+
+  hrtimer_test_rand(&param, 12345u);
+  hrtimer_test_rand_cancel(&param, 67890u);
+
+  return 0;
 }
 
 /****************************************************************************

From e4b84b29d47b98a666df524d6f2d38904c972de5 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Wed, 25 Feb 2026 10:01:21 +0800
Subject: [PATCH 248/568] ostest/hrtimer: Update the comments.

This commit updated the comments.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 testing/ostest/hrtimer.c | 388 ++++++++++++++++++++++++++++++++-------
 1 file changed, 322 insertions(+), 66 deletions(-)

diff --git a/testing/ostest/hrtimer.c b/testing/ostest/hrtimer.c
index 63040697c..3220ef2db 100644
--- a/testing/ostest/hrtimer.c
+++ b/testing/ostest/hrtimer.c
@@ -39,14 +39,13 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Timer constants */
+/* HRTimer test constants */
 
-#define HRTIMER_TEST_RAND_ITER (1024 * 2)
-#define HRTIMER_TEST_CSECTION  1024
-#define HRTIMER_TEST_THREAD_NR (CONFIG_SMP_NCPUS * 8)
+#define HRTIMER_TEST_RAND_ITER (1024 * 2)             /* Random delay iterations */
+#define HRTIMER_TEST_CSECTION  1024                   /* Critical section iterations */
+#define HRTIMER_TEST_THREAD_NR (CONFIG_SMP_NCPUS * 8) /* Test threads */
 
-/* Set the tolerent latency to 10ms to allow hrtimer_test to pass
- * in QEMU.
+/* Tolerable latency for timer expiration
  *
  * QEMU is a virtual platform, vCPUs can be preempted by any
  * high priority thread. This can cause the timer to be triggered
@@ -62,7 +61,9 @@
 
 #define HRTIMER_TEST_TOLERENT_LATENCY (10 * NSEC_PER_MSEC)
 
-#define hrtimer_test_ndelay(delay_ns) usleep(delay_ns / 1000 + 1)
+/* Helper macro for nanosecond delay */
+
+#define hrtimer_test_ndelay(delay_ns) usleep((delay_ns) / 1000 + 1)
 
 /****************************************************************************
  * Private Types
@@ -73,23 +74,40 @@
 typedef struct hrtimer_test_s
 {
   struct hrtimer_s  timer;     /* HRTimer instance */
-  spinlock_t        lock;      /* Spinlock */
+  spinlock_t        lock;      /* Spinlock for thread-safe operations */
   volatile uint64_t timestamp; /* Previous timestamp in nanoseconds */
   volatile uint64_t count;     /* Number of timer expirations */
   uint64_t          period;    /* Expected period between expirations */
-  volatile uint8_t  state;     /* Test state */
+  volatile uint8_t  state;     /* Test state (used for synchronization tests) */
 } hrtimer_test_t;
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: hrtimer_test_callback_oneshot
+ *
+ * Description:
+ *   One-shot timer callback function. This callback is invoked when a
+ *   one-shot HRTimer expires. It records the exact timestamp and increments
+ *   the expiration counter.
+ *
+ * Input Parameters:
+ *   timer      - Pointer to the HRTimer instance
+ *   expired_ns - Time when the timer expired (unused)
+ *
+ * Returned Value:
+ *   0 (oneshot hrtimer)
+ *
+ ****************************************************************************/
+
 static uint64_t hrtimer_test_callback_oneshot(FAR const hrtimer_t *timer,
                                               uint64_t expired_ns)
 {
   FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
 
-  /* Save the timestamp when the callback was triggered */
+  /* Record the exact timestamp when the callback was triggered */
 
   param->timestamp = clock_systime_nsec();
 
@@ -100,6 +118,24 @@ static uint64_t hrtimer_test_callback_oneshot(FAR const hrtimer_t *timer,
   return 0;
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_checkdelay
+ *
+ * Description:
+ *   Check timer delay against tolerance threshold. This function verifies
+ *   that the actual timer expiration time is within the acceptable
+ *   tolerance.
+ *   It warns if the delay exceeds the threshold.
+ *
+ * Input Parameters:
+ *   timestamp - Actual expiration timestamp (nanoseconds)
+ *   expected  - Expected expiration timestamp (nanoseconds)
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_checkdelay(uint64_t timestamp, uint64_t expected)
 {
   int64_t diff = timestamp - expected;
@@ -113,76 +149,131 @@ static void hrtimer_test_checkdelay(uint64_t timestamp, uint64_t expected)
   if (diff > HRTIMER_TEST_TOLERENT_LATENCY)
     {
       printf("hrtimer_test: [WARNING] hrtimer latency %" PRId64
-             " is too late!!! (> %u)\n", diff,
+             " ns is too late (> %u ns)\n", diff,
              (unsigned)HRTIMER_TEST_TOLERENT_LATENCY);
     }
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_oneshot
+ *
+ * Description:
+ *   Test one-shot HRTimer functionality. This function tests a one-shot
+ *   HRTimer by starting it with a specified delay and verifying that it
+ *   expires at the expected time.
+ *
+ * Input Parameters:
+ *   param - Test context structure containing timer and state information
+ *   delay - Delay in nanoseconds for the one-shot timer
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_oneshot(FAR hrtimer_test_t *param, uint64_t delay)
 {
   uint64_t       count;
   uint64_t       now;
   FAR hrtimer_t *timer = &param->timer;
 
-  printf("hrtimer_test_oneshot %" PRIu64 " ns\n", delay);
+  printf("hrtimer_test_oneshot: delay = %" PRIu64 " ns\n", delay);
 
-  /* Save the current callback count. */
+  /* Save the current callback count and system time */
 
   count = param->count;
-
-  /* Save the current system time. */
-
   now = clock_systime_nsec();
 
+  /* Start the one-shot timer */
+
   ASSERT(hrtimer_start(timer, hrtimer_test_callback_oneshot,
                        delay + now, HRTIMER_MODE_ABS) == OK);
 
-  /* Wait until the callback is triggered exactly once. */
+  /* Wait until the callback is triggered exactly once */
 
   while (count + 1 != param->count)
     {
       hrtimer_test_ndelay(delay);
     }
 
-  /* Check if the delay is within the acceptable tolerance. */
+  /* Verify the delay is within acceptable tolerance */
 
   hrtimer_test_checkdelay(param->timestamp, now + delay);
 
-  /* Cancel the timer. */
+  /* Cancel the timer to clean up */
 
   hrtimer_cancel_sync(timer);
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_maximum
+ *
+ * Description:
+ *   Test HRTimer with maximum delay value. This function tests the behavior
+ *   of HRTimer when started with the maximum possible delay (UINT64_MAX
+ *   nanoseconds). The timer should not expire within a reasonable test
+ *   period.
+ *
+ * Input Parameters:
+ *   param - Test context structure containing timer and state information
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_maximum(FAR hrtimer_test_t *param)
 {
   uint64_t       count;
   uint64_t       rest;
   FAR hrtimer_t *timer = &param->timer;
 
+  printf("hrtimer_test_maximum: testing with UINT64_MAX delay\n");
+
   count = param->count;
 
-  /* Start the hrtimer with maximum */
+  /* Start the hrtimer with maximum delay */
 
   ASSERT(hrtimer_start(timer, hrtimer_test_callback_oneshot, UINT64_MAX,
                        HRTIMER_MODE_REL) == OK);
 
-  /* Sleep for at least 1s */
+  /* Sleep for at least 100ms to verify timer doesn't expire */
 
   hrtimer_test_ndelay(USEC_PER_SEC / 100);
 
-  /* Ensure hrtimer is not alarmed */
+  /* Ensure hrtimer has not expired (count should remain unchanged) */
 
   ASSERT(count == param->count);
 
+  /* Get the remaining time until expiration */
+
   rest = hrtimer_gettime(timer);
 
+  /* Verify the remaining time is still large (less than UINT64_MAX) */
+
   ASSERT(rest < UINT64_MAX);
 
+  /* Cancel the timer */
+
   ASSERT(hrtimer_cancel_sync(timer) == OK);
 
-  printf("hrtimer_start with maximum delay, rest %" PRIu64 "\n", rest);
+  printf("hrtimer_test_maximum: remaining time = %" PRIu64 " ns\n", rest);
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_rand
+ *
+ * Description:
+ *   Test HRTimer with random delays. This function tests HRTimer behavior
+ *   with random delay values within a specified range. It performs multiple
+ *   iterations, testing both timer expiration and cancellation scenarios.
+ *
+ * Input Parameters:
+ *   param   - Test context structure containing timer and state information
+ *   rand_ns - Maximum random delay value in nanoseconds
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_rand(FAR hrtimer_test_t *param, uint64_t rand_ns)
 {
   uint64_t       count;
@@ -192,19 +283,19 @@ static void hrtimer_test_rand(FAR hrtimer_test_t *param, uint64_t rand_ns)
   irqstate_t     flags;
   FAR hrtimer_t *timer = &param->timer;
 
-  printf("hrtimer_test_rand %" PRIu64 " ns\n", rand_ns);
+  printf("hrtimer_test_rand: max delay = %" PRIu64 " ns\n", rand_ns);
 
-  /* Perform multiple iterations with random delays. */
+  /* Perform multiple iterations with random delays */
 
   for (idx = 0; idx < HRTIMER_TEST_RAND_ITER; idx++)
     {
-      /* Generate a random delay within the specified range. */
+      /* Generate a random delay within the specified range */
 
       delay = rand() % rand_ns;
 
       ASSERT(timer->func == NULL);
 
-      /* Enter critical section if the callback count is odd. */
+      /* Enter critical section if the callback count is odd */
 
       count = param->count;
 
@@ -221,18 +312,18 @@ static void hrtimer_test_rand(FAR hrtimer_test_t *param, uint64_t rand_ns)
           up_irq_restore(flags);
         }
 
-      /* Decide to wait for the callback or cancel the hrtimer. */
+      /* Decide to wait for the callback or cancel the hrtimer */
 
       if (delay % 2u)
         {
-          /* Wait for the callback. */
+          /* Wait for the callback */
 
           while (count + 1u != param->count)
             {
               hrtimer_test_ndelay(delay);
             }
 
-          /* Check the delay if the callback count is odd. */
+          /* Check the delay if the callback count is odd */
 
           if (count % 2u)
             {
@@ -247,6 +338,23 @@ static void hrtimer_test_rand(FAR hrtimer_test_t *param, uint64_t rand_ns)
   hrtimer_cancel_sync(timer);
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_cancel_callback
+ *
+ * Description:
+ *   Callback function for cancel test. This callback is used in the cancel
+ *   test to simulate a long-running callback that can be interrupted by
+ *   timer cancellation.
+ *
+ * Input Parameters:
+ *   timer      - Pointer to the HRTimer instance
+ *   expired_ns - Time when the timer expired
+ *
+ * Returned Value:
+ *   0 (oneshot hrtimer)
+ *
+ ****************************************************************************/
+
 static uint64_t hrtimer_test_cancel_callback(FAR const hrtimer_t *timer,
                                              uint64_t expired_ns)
 {
@@ -255,11 +363,11 @@ static uint64_t hrtimer_test_cancel_callback(FAR const hrtimer_t *timer,
   uint64_t            delay = 0;
   irqstate_t          flags = spin_lock_irqsave(lock);
 
-  /* Random sleep */
+  /* Calculate random sleep delay based on period */
 
   delay = expired_ns % param->period;
 
-  /* Check if the version is same. */
+  /* Check if the expiration time matches (prevents duplicate processing) */
 
   if (expired_ns == timer->expired)
     {
@@ -272,11 +380,28 @@ static uint64_t hrtimer_test_cancel_callback(FAR const hrtimer_t *timer,
 
   spin_unlock_irqrestore(lock, flags);
 
+  /* Simulate work with random delay */
+
   up_ndelay(delay);
 
   return 0;
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_rand_cancel
+ *
+ * Description:
+ *   Test HRTimer cancellation with random delays. This function tests
+ *   HRTimer cancellation behavior with random delay values. It verifies
+ *   that timers can be properly cancelled and that callbacks behave
+ *   correctly when cancellation occurs.
+ *
+ * Input Parameters:
+ *   param   - Test context structure containing timer and state information
+ *   rand_ns - Maximum random delay value in nanoseconds
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_rand_cancel(FAR hrtimer_test_t *param,
                                      uint64_t rand_ns)
 {
@@ -287,15 +412,15 @@ static void hrtimer_test_rand_cancel(FAR hrtimer_test_t *param,
   irqstate_t   flags;
   spinlock_t   *lock = &param->lock;
 
-  printf("hrtimer_test_rand cancel %" PRIu64 " ns\n", rand_ns);
+  printf("hrtimer_test_rand_cancel: max delay = %" PRIu64 " ns\n", rand_ns);
 
   param->period = rand_ns;
 
-  /* Perform multiple iterations with random delays. */
+  /* Perform multiple iterations with random delays */
 
   for (idx = 0; idx < HRTIMER_TEST_RAND_ITER; idx++)
     {
-      /* Generate a random delay within the specified range. */
+      /* Generate a random delay within the specified range */
 
       delay = rand() % rand_ns;
 
@@ -308,11 +433,11 @@ static void hrtimer_test_rand_cancel(FAR hrtimer_test_t *param,
 
       spin_unlock_irqrestore(lock, flags);
 
-      /* Decide to wait for the callback or cancel the hrtimer. */
+      /* Decide to wait for the callback or cancel the hrtimer */
 
       if (delay % 2u)
         {
-          /* Wait for the callback finished. */
+          /* Wait for the callback to finish */
 
           while (param->count != count + 1u)
             {
@@ -328,6 +453,23 @@ static void hrtimer_test_rand_cancel(FAR hrtimer_test_t *param,
   hrtimer_cancel_sync(&param->timer);
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_callback_period
+ *
+ * Description:
+ *   Periodic timer callback function. This callback is invoked when a
+ *   periodic HRTimer expires. It records the timestamp, increments the
+ *   count, and returns the interval for the next expiration.
+ *
+ * Input Parameters:
+ *   timer      - Pointer to the HRTimer instance
+ *   expired_ns - Time when the timer expired (unused)
+ *
+ * Returned Value:
+ *   The interval in nanoseconds for the next expiration
+ *
+ ****************************************************************************/
+
 static uint64_t hrtimer_test_callback_period(FAR const hrtimer_t *timer,
                                              uint64_t expired_ns)
 {
@@ -340,6 +482,24 @@ static uint64_t hrtimer_test_callback_period(FAR const hrtimer_t *timer,
   return interval;
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_period
+ *
+ * Description:
+ *   Test periodic HRTimer functionality. This function tests a periodic
+ *   HRTimer by starting it with a specified interval and verifying that
+ *   it triggers multiple times as expected.
+ *
+ * Input Parameters:
+ *   param    - Test context structure containing timer and state information
+ *   delay_ns - Period interval in nanoseconds
+ *   iters    - Expected number of timer expirations
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_period(FAR hrtimer_test_t *param,
                                 uint64_t delay_ns,
                                 unsigned int iters)
@@ -348,7 +508,8 @@ static void hrtimer_test_period(FAR hrtimer_test_t *param,
   uint64_t       count = param->count;
   FAR hrtimer_t *timer = &param->timer;
 
-  printf("hrtimer_test_period %" PRIu64 " ns\n", delay_ns);
+  printf("hrtimer_test_period: period = %" PRIu64 " ns, iters = %u\n",
+         delay_ns, iters);
 
   param->period = delay_ns;
   ASSERT(param->period > 0);
@@ -358,29 +519,52 @@ static void hrtimer_test_period(FAR hrtimer_test_t *param,
   ASSERT(hrtimer_start(timer, hrtimer_test_callback_period,
                        delay_ns, HRTIMER_MODE_REL) == OK);
 
+  /* Wait for expected number of periods */
+
   hrtimer_test_ndelay(iters * delay_ns);
 
   hrtimer_cancel_sync(timer);
   ASSERT(timer->func == NULL);
 
-  printf("periodical hrtimer triggered %" PRIu64 " times, "
+  /* Report results */
+
+  printf("hrtimer_test_period: triggered %" PRIu64 " times, "
          "elapsed nsec %" PRIu64 "\n", param->count - count,
          param->timestamp - timestamp);
 
+  /* Warn if fewer expirations than expected */
+
   if (param->count - count < iters)
     {
-      printf("hrtimer_test: [WARNING] periodical hrtimer"
+      printf("hrtimer_test_period: [WARNING] periodical hrtimer "
              "triggered times < %u\n", iters);
     }
 }
 
 #ifdef CONFIG_SMP
+/****************************************************************************
+ * Name: hrtimer_test_callback_crita
+ *
+ * Description:
+ *   Critical section test callback A. This callback is used to test
+ *   critical section protection in SMP systems. It verifies that timer
+ *   callbacks can safely access shared state.
+ *
+ * Input Parameters:
+ *   timer      - Pointer to the HRTimer instance
+ *   expired_ns - Time when the timer expired (unused)
+ *
+ * Returned Value:
+ *   0 (oneshot hrtimer)
+ *
+ ****************************************************************************/
+
 static uint64_t hrtimer_test_callback_crita(FAR const hrtimer_t *timer,
                                             uint64_t expired_ns)
 {
   FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
 
-  /* change status */
+  /* Change status if in initial state */
 
   if (param->state == 0)
     {
@@ -388,7 +572,7 @@ static uint64_t hrtimer_test_callback_crita(FAR const hrtimer_t *timer,
       param->count++;
     }
 
-  /* check whether parameter be changed by another critical section */
+  /* Verify state wasn't changed by another critical section */
 
   ASSERT(param->state == 1);
   param->state = 0;
@@ -396,12 +580,29 @@ static uint64_t hrtimer_test_callback_crita(FAR const hrtimer_t *timer,
   return 0;
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_callback_critb
+ *
+ * Description:
+ *   Critical section test callback B. This callback is used to test
+ *   critical section protection in SMP systems. It verifies that timer
+ *   callbacks can safely access shared state.
+ *
+ * Input Parameters:
+ *   timer      - Pointer to the HRTimer instance
+ *   expired_ns - Time when the timer expired (unused)
+ *
+ * Returned Value:
+ *   0 (oneshot hrtimer)
+ *
+ ****************************************************************************/
+
 static uint64_t hrtimer_test_callback_critb(FAR const hrtimer_t *timer,
                                             uint64_t expired_ns)
 {
   FAR hrtimer_test_t *param = (FAR hrtimer_test_t *)timer;
 
-  /* change status */
+  /* Change status if in expected state */
 
   if (param->state == 1)
     {
@@ -409,7 +610,7 @@ static uint64_t hrtimer_test_callback_critb(FAR const hrtimer_t *timer,
       param->count++;
     }
 
-  /* check whether parameter be changed by another critical section */
+  /* Verify state wasn't changed by another critical section */
 
   ASSERT(param->state == 0);
   param->state = 1;
@@ -417,6 +618,23 @@ static uint64_t hrtimer_test_callback_critb(FAR const hrtimer_t *timer,
   return 0;
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_callback_critdelay
+ *
+ * Description:
+ *   Critical section delay test callback. This callback simulates a
+ *   long-running timer callback with spinlock protection. It's used to
+ *   test timer cancellation behavior with in-progress callbacks.
+ *
+ * Input Parameters:
+ *   timer      - Pointer to the HRTimer instance
+ *   expired_ns - Time when the timer expired (unused)
+ *
+ * Returned Value:
+ *   300 microseconds (reschedules timer for periodic behavior)
+ *
+ ****************************************************************************/
+
 static uint64_t hrtimer_test_callback_critdelay(FAR const hrtimer_t *timer,
                                                 uint64_t expired_ns)
 {
@@ -424,15 +642,35 @@ static uint64_t hrtimer_test_callback_critdelay(FAR const hrtimer_t *timer,
   FAR spinlock_t *lock      = &param->lock;
   irqstate_t flags;
 
+  /* Protect count increment with spinlock */
+
   flags = spin_lock_irqsave(lock);
   param->count++;
   spin_unlock_irqrestore(lock, flags);
 
+  /* Simulate work with 100 microsecond delay */
+
   up_ndelay(100 * NSEC_PER_USEC);
 
+  /* Return reschedule interval for periodic behavior */
+
   return 300 * NSEC_PER_USEC;
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_cancel_sync
+ *
+ * Description:
+ *   Test HRTimer cancel synchronization. This function tests that
+ *   hrtimer_cancel_sync properly waits for callback completion before
+ *   returning. It verifies that timer callbacks complete execution even
+ *   when cancellation is requested.
+ *
+ * Input Parameters:
+ *   param - Test context structure containing timer and state information
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_cancel_sync(FAR hrtimer_test_t *param)
 {
   unsigned int idx = 0;
@@ -441,11 +679,6 @@ static void hrtimer_test_cancel_sync(FAR hrtimer_test_t *param)
 
   param->count = 0;
 
-  /* This test is to validate if the hrtimer can ensure the
-   * callback function be finished after the hrtimer_cancel_sync
-   * is called.
-   */
-
   for (idx = 0; idx < HRTIMER_TEST_CSECTION; )
     {
       param->state = 0;
@@ -459,13 +692,27 @@ static void hrtimer_test_cancel_sync(FAR hrtimer_test_t *param)
 
       if (++idx % (HRTIMER_TEST_CSECTION / 4) == 0)
         {
-          printf("hrtimer_test_cancel_sync passed %d times.\n", idx);
+          printf("hrtimer_test_cancel_sync: passed %u times\n", idx);
         }
 
       hrtimer_cancel_sync(&param->timer);
     }
 }
 
+/****************************************************************************
+ * Name: hrtimer_test_cancel_periodic
+ *
+ * Description:
+ *   Test periodic HRTimer cancellation. This function tests that periodic
+ *   timers can be properly cancelled and that they don't restart after
+ *   cancellation. It verifies that timer cancellation is effective and
+ *   persistent.
+ *
+ * Input Parameters:
+ *   param - Test context structure containing timer and state information
+ *
+ ****************************************************************************/
+
 static void hrtimer_test_cancel_periodic(FAR hrtimer_test_t *param)
 {
   uint64_t       count;
@@ -476,11 +723,6 @@ static void hrtimer_test_cancel_periodic(FAR hrtimer_test_t *param)
 
   param->count = 0;
 
-  /* This test to check if the hrtimer can ensure the perodical callback
-   * can not restart the timer again after the hrtimer_cancel_sync is
-   * called.
-   */
-
   for (idx = 0; idx < HRTIMER_TEST_CSECTION; idx++)
     {
       irqstate_t flags = spin_lock_irqsave(lock);
@@ -503,7 +745,7 @@ static void hrtimer_test_cancel_periodic(FAR hrtimer_test_t *param)
 
       up_ndelay(10000);
 
-      /* The hrtimer should not be restarted again after the cancellation. */
+      /* The hrtimer should not restart after cancellation */
 
       ASSERT(!param->timer.func);
 
@@ -516,7 +758,7 @@ static void hrtimer_test_cancel_periodic(FAR hrtimer_test_t *param)
 
       if (++idx % (HRTIMER_TEST_CSECTION / 4) == 0)
         {
-          printf("hrtimer_test_cancel_periodic passed %d times. count %"
+          printf("hrtimer_test_cancel_periodic: passed %u times, count = %"
                  PRIu64 "\n", idx, param->count);
         }
     }
@@ -529,11 +771,20 @@ static void hrtimer_test_cancel_periodic(FAR hrtimer_test_t *param)
  * Name: hrtimer_test_thread
  *
  * Description:
- *   Thread function to repeatedly test HRTimer start/cancel behavior.
+ *   HRTimer test thread function. This function runs a comprehensive test
+ *   suite for HRTimer functionality. It tests various scenarios including
+ *   one-shot timers, periodic timers, random delays, maximum delays, and
+ *   cancellation behavior.
+ *
+ * Input Parameters:
+ *   arg - Thread argument (unused)
+ *
+ * Returned Value:
+ *   NULL.
  *
  ****************************************************************************/
 
-static void * hrtimer_test_thread(void *arg)
+static void *hrtimer_test_thread(void *arg)
 {
   hrtimer_test_t param =
     {
@@ -542,6 +793,8 @@ static void * hrtimer_test_thread(void *arg)
 
   hrtimer_init(&param.timer);
 
+  /* Test one-shot timers with various delays */
+
   /* Delay = 0 */
 
   hrtimer_test_oneshot(&param, 0u);
@@ -561,24 +814,21 @@ static void * hrtimer_test_thread(void *arg)
   hrtimer_test_oneshot(&param, 10000000u);
 
 #ifdef CONFIG_SMP
-  /* Test hrtimer_cancel_sync */
+  /* Test SMP-specific cancellation behavior */
 
   hrtimer_test_cancel_sync(&param);
-
-  /* Test hrtimer_cancel */
-
   hrtimer_test_cancel_periodic(&param);
 #endif
 
-  /* Maximum hrtimer delay test. */
+  /* Test maximum delay handling */
 
   hrtimer_test_maximum(&param);
 
-  /* Period hrtimer delay 100000ns */
+  /* Test periodic timer with 1ms period */
 
   hrtimer_test_period(&param, 1000000u, 128u);
 
-  /* Random delay 12345ns and 67890ns */
+  /* Test random delay and cancel scenarios */
 
   hrtimer_test_rand(&param, 12345u);
   hrtimer_test_rand_cancel(&param, 67890u);
@@ -617,11 +867,15 @@ void hrtimer_test(void)
 
   printf("hrtimer_test start...\n");
 
+  /* Initialize thread attributes */
+
   ASSERT(pthread_attr_init(&attr) == 0);
 
   sparam.sched_priority = PTHREAD_DEFAULT_PRIORITY;
   ASSERT(pthread_attr_setschedparam(&attr, &sparam) == 0);
 
+  /* Create multiple test threads */
+
   for (thread_id = 0; thread_id < HRTIMER_TEST_THREAD_NR; thread_id++)
     {
       ASSERT(pthread_create(&pthreads[thread_id], &attr,
@@ -635,6 +889,8 @@ void hrtimer_test(void)
       pthread_join(pthreads[thread_id], NULL);
     }
 
+  /* Clean up thread attributes */
+
   ASSERT(pthread_attr_destroy(&attr) == 0);
 
   printf("hrtimer_test end...\n");

From c46ed184edceea1a2d4c63ed428aeeefb066b9c4 Mon Sep 17 00:00:00 2001
From: Mihai Pacuraru <mpacuraru@protonmail.com>
Date: Sat, 28 Feb 2026 11:43:31 +0200
Subject: [PATCH 249/568] examples/mqttc: Fix QOS arguments parsing
 (char->long).

Modify the switch cases in parsearg function for QOS levels definition.
The comparison was made between a long value and a char.

Signed-off-by: Mihai Pacuraru <mpacuraru@protonmail.com>
---
 examples/mqttc/mqttc_pub.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/mqttc/mqttc_pub.c b/examples/mqttc/mqttc_pub.c
index 6948afb42..9beae6885 100644
--- a/examples/mqttc/mqttc_pub.c
+++ b/examples/mqttc/mqttc_pub.c
@@ -192,13 +192,13 @@ static void parsearg(int argc, FAR char *argv[],
           case 'q':
             switch (strtol(optarg, NULL, 10))
               {
-                case '0':
+                case 0L:
                   cfg->qos = MQTT_PUBLISH_QOS_0;
                   break;
-                case '1':
+                case 1L:
                   cfg->qos = MQTT_PUBLISH_QOS_1;
                   break;
-                case '2':
+                case 2L:
                   cfg->qos = MQTT_PUBLISH_QOS_2;
                   break;
                 }

From 7d13ee204b6fb8545d5eac3b5a1eae9cde3ba14d Mon Sep 17 00:00:00 2001
From: Mihai Pacuraru <mpacuraru@protonmail.com>
Date: Sun, 1 Mar 2026 22:50:09 +0200
Subject: [PATCH 250/568] examples/mqttc: Fix mqtt_init() failed message typo
 (ERRPR -> ERROR).

Modify the message logged when mqtt_init() failed to execute properly.

Signed-off-by: Mihai Pacuraru <mpacuraru@protonmail.com>
---
 examples/mqttc/mqttc_pub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mqttc/mqttc_pub.c b/examples/mqttc/mqttc_pub.c
index 9beae6885..306df6dcc 100644
--- a/examples/mqttc/mqttc_pub.c
+++ b/examples/mqttc/mqttc_pub.c
@@ -528,7 +528,7 @@ int main(int argc, FAR char *argv[])
                       NULL);
   if (mqtterr != MQTT_OK)
     {
-      printf("ERRPR! mqtt_init() failed.\n");
+      printf("ERROR! mqtt_init() failed.\n");
       goto err_with_conn;
     }
 

From af7222ec9f6206ec46bedea254cd7d78bad924c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 23:47:16 +0000
Subject: [PATCH 251/568] build(deps): bump actions/upload-artifact from 6.0.0
 to 7.0.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml   | 12 ++++++------
 .github/workflows/labeler.yml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 907497cba..7cdb24fa2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
         run: tar zcf sources.tar.gz sources
 
       - name: Archive Source Bundle
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: source-bundle
           path: sources.tar.gz
@@ -222,7 +222,7 @@ jobs:
         if: always()
         run: df -h
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.0
         if: ${{ always() }}
         with:
           name: linux-${{matrix.boards}}-builds
@@ -267,7 +267,7 @@ jobs:
             cd sources/nuttx
             ./tools/ci/cibuild-oot.sh
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.0
         if: ${{ always() }}
         with:
           name: oot-build-artifacts
@@ -328,7 +328,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.0
         with:
           name: macos-${{matrix.boards}}-builds
           path: buildartifacts/
@@ -411,7 +411,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -g -i -A -C -N -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.0
         with:
           name: msys2-${{matrix.boards}}-builds
           path: buildartifacts/
@@ -463,7 +463,7 @@ jobs:
           cd sources\nuttx\tools\ci
           .\cibuild.ps1 -n -i -A -C -N testlist\windows.dat
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.0
         with:
           name: msvc-builds
           path: ./sources/buildartifacts/
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index bf1c459ec..cd98874b8 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -144,7 +144,7 @@ jobs:
 
       # Upload the PR Artifact as pr.zip
       - name: Upload PR artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f  # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f  # v7.0.0
         with:
           name: pr
           path: pr/

From 45d4c7098bb3a7a6d9b5642efc47df5998c048d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 23:47:08 +0000
Subject: [PATCH 252/568] build(deps): bump actions/download-artifact from 7 to
 8

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7cdb24fa2..835754444 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -154,7 +154,7 @@ jobs:
         run: df -h
 
       - name: Download Source Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: source-bundle
           path: .
@@ -237,7 +237,7 @@ jobs:
       DOCKER_BUILDKIT: 1
     steps:
       - name: Download Source Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: source-bundle
           path: .
@@ -296,7 +296,7 @@ jobs:
         boards: ${{ fromJSON(needs.macOS-Arch.outputs.selected_builds) }}
     steps:
       - name: Download Source Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: source-bundle
           path: .
@@ -391,7 +391,7 @@ jobs:
       - run: git config --global core.autocrlf false
 
       - name: Download Source Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: source-bundle
           path: .
@@ -445,7 +445,7 @@ jobs:
       - run: git config --global core.autocrlf false
 
       - name: Download Source Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: source-bundle
           path: .

From 2964c8cc3dfde40f74e2824b2cf86aaa88dcda7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2026 22:50:02 +0000
Subject: [PATCH 253/568] build(deps): bump docker/login-action from 3 to 4

Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 835754444..cc12b797d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -163,7 +163,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -246,7 +246,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 8579459bb0bf4fa28c044b7b7de71a7a09029b4d Mon Sep 17 00:00:00 2001
From: Neil Berkman <neil@xuku.com>
Date: Sun, 8 Mar 2026 17:22:48 -0700
Subject: [PATCH 254/568] boot/nxboot: fix Clang warnings for format and
 va_start

Use PRIdOFF instead of %ld for off_t arguments in flash.c syslog
calls, fixing -Wformat errors when off_t is not long.

Change nxboot_progress parameter from enum progress_type_e to int
to avoid undefined behavior from va_start on a parameter that
undergoes default argument promotion (-Wvarargs).

Signed-off-by: Neil Berkman <neil@xuku.com>
---
 boot/nxboot/include/nxboot.h |  2 +-
 boot/nxboot/loader/flash.c   | 13 ++++++++-----
 boot/nxboot/nxboot_main.c    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/boot/nxboot/include/nxboot.h b/boot/nxboot/include/nxboot.h
index 6821cc703..3d92e9753 100644
--- a/boot/nxboot/include/nxboot.h
+++ b/boot/nxboot/include/nxboot.h
@@ -169,7 +169,7 @@ enum progress_msg_e
  ****************************************************************************/
 
 #ifdef CONFIG_NXBOOT_PROGRESS
-void nxboot_progress(enum progress_type_e type, ...);
+void nxboot_progress(int type, ...);
 #else
 #define nxboot_progress(type, ...) do {} while (0)
 #endif
diff --git a/boot/nxboot/loader/flash.c b/boot/nxboot/loader/flash.c
index 9142b25d9..f1a359573 100644
--- a/boot/nxboot/loader/flash.c
+++ b/boot/nxboot/loader/flash.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <string.h>
 #include <stddef.h>
 #include <fcntl.h>
@@ -137,14 +138,15 @@ int flash_partition_write(int fd, const void *buf, size_t count, off_t off)
   pos = lseek(fd, off, SEEK_SET);
   if (pos != off)
     {
-      syslog(LOG_ERR, "Could not seek to %ld: %s\n", off, strerror(errno));
+      syslog(LOG_ERR, "Could not seek to %" PRIdOFF ": %s\n",
+              off, strerror(errno));
       return ERROR;
     }
 
   nbytes = write(fd, buf, count);
   if (nbytes != count)
     {
-      syslog(LOG_ERR, "Write to offset %ld failed %s\n",
+      syslog(LOG_ERR, "Write to offset %" PRIdOFF " failed %s\n",
               off, strerror(errno));
       return ERROR;
     }
@@ -195,15 +197,16 @@ int flash_partition_read(int fd, void *buf, size_t count, off_t off)
   pos = lseek(fd, off, SEEK_SET);
   if (pos != off)
     {
-      syslog(LOG_ERR, "Could not seek to %ld: %s\n", off, strerror(errno));
+      syslog(LOG_ERR, "Could not seek to %" PRIdOFF ": %s\n",
+              off, strerror(errno));
       return ERROR;
     }
 
   nbytes = read(fd, buf, count);
   if (nbytes != count)
     {
-      syslog(LOG_ERR, "Read from offset %ld failed %s\n", off,
-                      strerror(errno));
+      syslog(LOG_ERR, "Read from offset %" PRIdOFF " failed %s\n",
+              off, strerror(errno));
       return ERROR;
     }
 
diff --git a/boot/nxboot/nxboot_main.c b/boot/nxboot/nxboot_main.c
index ddc2f2284..976b03b4c 100644
--- a/boot/nxboot/nxboot_main.c
+++ b/boot/nxboot/nxboot_main.c
@@ -124,7 +124,7 @@ static const char *progress_msgs[] =
  ****************************************************************************/
 
 #ifdef CONFIG_NXBOOT_PROGRESS
-void nxboot_progress(enum progress_type_e type, ...)
+void nxboot_progress(int type, ...)
 {
 #ifdef CONFIG_NXBOOT_PRINTF_PROGRESS
   va_list arg;

From b5d151f73ffe0897011b299772705653827650ff Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Tue, 10 Mar 2026 09:45:33 +0800
Subject: [PATCH 255/568] cmake/tools: Fix panic_immediate_abort deprecation in
 Rust build

Replace deprecated -Zbuild-std-features=panic_immediate_abort with
-Cpanic=immediate-abort compiler flag via RUSTFLAGS.

The panic_immediate_abort feature has been stabilized as a real panic
strategy in recent Rust nightly versions. The old method of enabling
it via -Zbuild-std-features is no longer supported and triggers a
compile error in core/src/panicking.rs.

Changes:
* cmake/nuttx_add_rust.cmake: Use RUSTFLAGS with -Cpanic=immediate-abort
* tools/Rust.mk: Use RUSTFLAGS with -Cpanic=immediate-abort

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 cmake/nuttx_add_rust.cmake | 10 +++++-----
 tools/Rust.mk              |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index 97ecdcec7..d50482ef7 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -128,10 +128,10 @@ function(nuttx_add_rust)
   # Determine build profile based on CONFIG_DEBUG_FULLOPT
   if(CONFIG_DEBUG_FULLOPT)
     set(RUST_PROFILE "release")
-    set(RUST_DEBUG_FLAGS "-Zbuild-std-features=panic_immediate_abort")
+    set(RUST_PANIC_FLAGS "-Zunstable-options -Cpanic=immediate-abort")
   else()
     set(RUST_PROFILE "debug")
-    set(RUST_DEBUG_FLAGS "")
+    set(RUST_PANIC_FLAGS "")
   endif()
 
   # Get the Rust target triple
@@ -152,9 +152,9 @@ function(nuttx_add_rust)
     COMMAND
       ${CMAKE_COMMAND} -E env
       NUTTX_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/include:${CMAKE_BINARY_DIR}/include:${CMAKE_BINARY_DIR}/include/arch
-      cargo build --${RUST_PROFILE} -Zbuild-std=std,panic_abort
-      ${RUST_DEBUG_FLAGS} --manifest-path ${CRATE_PATH}/Cargo.toml --target
-      ${RUST_TARGET} --target-dir ${RUST_BUILD_DIR}
+      RUSTFLAGS=${RUST_PANIC_FLAGS} cargo build --${RUST_PROFILE}
+      -Zbuild-std=std,panic_abort --manifest-path ${CRATE_PATH}/Cargo.toml
+      --target ${RUST_TARGET} --target-dir ${RUST_BUILD_DIR}
     COMMENT "Building Rust crate ${CRATE_NAME}"
     VERBATIM)
 
diff --git a/tools/Rust.mk b/tools/Rust.mk
index 9a77ae57b..ad2fb3a82 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -90,8 +90,8 @@ endef
 ifeq ($(CONFIG_DEBUG_FULLOPT),y)
 define RUST_CARGO_BUILD
 	NUTTX_INCLUDE_DIR=$(TOPDIR)/include:$(TOPDIR)/include/arch \
+    RUSTFLAGS="-Zunstable-options -Cpanic=immediate-abort" \
     cargo build --release -Zbuild-std=std,panic_abort \
-    -Zbuild-std-features=panic_immediate_abort \
 		--manifest-path $(2)/$(1)/Cargo.toml \
 		--target $(call RUST_TARGET_TRIPLE)
 endef

From 68f9e5424b45096361d2bc45e31fe7f278a4dd12 Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Tue, 10 Mar 2026 10:18:37 +0800
Subject: [PATCH 256/568] codespell: Add ARCHTYPE to ignore list

ARCHTYPE is a valid abbreviation for 'architecture type' used
consistently across the codebase. This matches the nuttx repo's
.codespellrc configuration.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 .codespellrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codespellrc b/.codespellrc
index ac22a4c37..c2a1ecdfc 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -10,4 +10,4 @@ skip =
   LICENSE,
 
 # Ignore words list (FTP protocol commands and technical terms)
-ignore-words-list = ALLO
+ignore-words-list = ALLO, ARCHTYPE

From f90e1e184ff5eefe147f1386cf172058b50ff98a Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Fri, 13 Mar 2026 14:29:19 +0800
Subject: [PATCH 257/568] tools/build: Make Rust target triples for x86 use
 JSON files

X86 support for Rust needs more test and verification, and not
upstreamed to Rust side yet.

It's better to use custom target triples for x86 by json files for now,
and it can be upstreamed to Rust side if stable enough.

Changed the Rust target triples in the CMake configuration to reference JSON files for x86_64 and i486 architectures. This improves the build process by providing more detailed target specifications.
* Added JSON files for i486 and x86_64 targets
* Updated CMake functions to use the new target triples
* Enhanced build directory structure for Rust crates

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 cmake/nuttx_add_rust.cmake      | 18 +++++++++++------
 tools/Rust.mk                   |  8 +++++---
 tools/i486-unknown-nuttx.json   | 33 ++++++++++++++++++++++++++++++
 tools/x86_64-unknown-nuttx.json | 36 +++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 tools/i486-unknown-nuttx.json
 create mode 100644 tools/x86_64-unknown-nuttx.json

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index d50482ef7..0d1f09839 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -48,9 +48,9 @@ include(nuttx_parse_function_args)
 
 function(nuttx_rust_target_triple ARCHTYPE ABITYPE CPUTYPE OUTPUT)
   if(ARCHTYPE STREQUAL "x86_64")
-    set(TARGET_TRIPLE "x86_64-unknown-nuttx")
+    set(TARGET_TRIPLE "${APPDIR}/tools/x86_64-unknown-nuttx.json")
   elseif(ARCHTYPE STREQUAL "x86")
-    set(TARGET_TRIPLE "i686-unknown-nuttx")
+    set(TARGET_TRIPLE "${APPDIR}/tools/i486-unknown-nuttx.json")
   elseif(ARCHTYPE MATCHES "thumb")
     if(ARCHTYPE MATCHES "thumbv8m")
       # Extract just the base architecture type (thumbv8m.main or thumbv8m.base)
@@ -138,10 +138,16 @@ function(nuttx_add_rust)
   nuttx_rust_target_triple(${LLVM_ARCHTYPE} ${LLVM_ABITYPE} ${LLVM_CPUTYPE}
                            RUST_TARGET)
 
-  # Set up build directory in current binary dir
-  set(RUST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CRATE_NAME})
-  set(RUST_LIB_PATH
-      ${RUST_BUILD_DIR}/${RUST_TARGET}/${RUST_PROFILE}/lib${CRATE_NAME}.a)
+  # Get binary directory path using target triple base name if it's a JSON file
+  if(RUST_TARGET MATCHES ".json$")
+    get_filename_component(TARGET_BASE ${RUST_TARGET} NAME_WE)
+  else()
+    set(TARGET_BASE ${RUST_TARGET})
+  endif()
+
+  set(RUST_BUILD_DIR
+      ${CMAKE_CURRENT_BINARY_DIR}/${CRATE_NAME}/target/${TARGET_BASE})
+  set(RUST_LIB_PATH ${RUST_BUILD_DIR}/${RUST_PROFILE}/lib${CRATE_NAME}.a)
 
   # Create build directory
   file(MAKE_DIRECTORY ${RUST_BUILD_DIR})
diff --git a/tools/Rust.mk b/tools/Rust.mk
index ad2fb3a82..8e037aef6 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -47,10 +47,10 @@
 define RUST_TARGET_TRIPLE
 $(or \
   $(and $(filter x86_64,$(LLVM_ARCHTYPE)), \
-    x86_64-unknown-nuttx \
+    $(APPDIR)/tools/x86_64-unknown-nuttx.json \
   ), \
   $(and $(filter x86,$(LLVM_ARCHTYPE)), \
-    i686-unknown-nuttx \
+    $(APPDIR)/tools/i486-unknown-nuttx.json \
   ), \
   $(and $(filter thumb%,$(LLVM_ARCHTYPE)), \
     $(if $(filter thumbv8m%,$(LLVM_ARCHTYPE)), \
@@ -132,5 +132,7 @@ endef
 #   Path to the Rust binary (e.g. path/to/project/target/riscv32imac-unknown-nuttx-elf/release/libhello.a)
 
 define RUST_GET_BINDIR
-$(2)/$(1)/target/$(strip $(call RUST_TARGET_TRIPLE))/$(if $(CONFIG_DEBUG_FULLOPT),release,debug)/lib$(1).a
+$(2)/$(1)/target/$(strip $(if $(findstring .json,$(call RUST_TARGET_TRIPLE)), \
+	$(basename $(notdir $(call RUST_TARGET_TRIPLE))), \
+	$(call RUST_TARGET_TRIPLE)))/$(if $(CONFIG_DEBUG_FULLOPT),release,debug)/lib$(1).a
 endef
diff --git a/tools/i486-unknown-nuttx.json b/tools/i486-unknown-nuttx.json
new file mode 100644
index 000000000..8d52aa161
--- /dev/null
+++ b/tools/i486-unknown-nuttx.json
@@ -0,0 +1,33 @@
+{
+  "arch": "x86",
+  "cpu": "i486",
+  "crt-objects-fallback": "false",
+  "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
+  "features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float",
+  "default-dwarf-version": 2,
+  "dynamic-linking": true,
+  "has-rpath": true,
+  "has-thread-local": true,
+  "linker-flavor": "gnu-lld",
+  "llvm-target": "i486-unknown-nuttx",
+  "max-atomic-width": 64,
+  "metadata": {
+    "description": "32-bit x86, resricted to i486",
+    "host_tools": false,
+    "std": true,
+    "tier": 3
+  },
+  "no-default-libraries": true,
+  "os": "nuttx",
+  "position-independent-executables": false,
+  "relro-level": "full",
+  "rustc-abi": "x86-softfloat",
+  "stack-probes": {
+    "kind": "inline"
+  },
+  "target-family": [
+    "unix"
+  ],
+  "target-mcount": "__mcount",
+  "target-pointer-width": "32"
+}
diff --git a/tools/x86_64-unknown-nuttx.json b/tools/x86_64-unknown-nuttx.json
new file mode 100644
index 000000000..4a5b84901
--- /dev/null
+++ b/tools/x86_64-unknown-nuttx.json
@@ -0,0 +1,36 @@
+{
+  "arch": "x86_64",
+  "cpu": "x86-64",
+  "crt-objects-fallback": "false",
+  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
+  "disable-redzone": true,
+  "features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float",
+  "linker": "rust-lld",
+  "linker-flavor": "gnu-lld",
+  "llvm-target": "x86_64-unknown-nuttx",
+  "max-atomic-width": 64,
+  "metadata": {
+    "description": "x86_64 target for NuttX RTOS with softfloat",
+    "host_tools": false,
+    "std": true,
+    "tier": 3
+  },
+  "panic-strategy": "abort",
+  "plt-by-default": false,
+  "position-independent-executables": true,
+  "relro-level": "full",
+  "rustc-abi": "x86-softfloat",
+  "stack-probes": {
+    "kind": "inline"
+  },
+  "static-position-independent-executables": true,
+  "supported-sanitizers": [
+    "kcfi",
+    "kernel-address"
+  ],
+  "os": "nuttx",
+  "target-family": [
+    "unix"
+  ],
+  "target-pointer-width": "64"
+}
\ No newline at end of file

From ea22a66dcf22baff5013d7c5073d59b33499b809 Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Fri, 13 Mar 2026 14:29:37 +0800
Subject: [PATCH 258/568] tools: Fix target-pointer-width type in x86 target
 configs

Remove quotes around target-pointer-width values in i486 and x86_64
target configuration files to change from string to numeric type.
This change is required due to recent rustc JSON format modifications
that expect numeric values instead of strings for target-pointer-width.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 tools/i486-unknown-nuttx.json   | 2 +-
 tools/x86_64-unknown-nuttx.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/i486-unknown-nuttx.json b/tools/i486-unknown-nuttx.json
index 8d52aa161..93cd43418 100644
--- a/tools/i486-unknown-nuttx.json
+++ b/tools/i486-unknown-nuttx.json
@@ -29,5 +29,5 @@
     "unix"
   ],
   "target-mcount": "__mcount",
-  "target-pointer-width": "32"
+  "target-pointer-width": 32
 }
diff --git a/tools/x86_64-unknown-nuttx.json b/tools/x86_64-unknown-nuttx.json
index 4a5b84901..d12fecb8a 100644
--- a/tools/x86_64-unknown-nuttx.json
+++ b/tools/x86_64-unknown-nuttx.json
@@ -32,5 +32,5 @@
   "target-family": [
     "unix"
   ],
-  "target-pointer-width": "64"
+  "target-pointer-width": 64
 }
\ No newline at end of file

From 3a156581ca4de611c221f97815e10c842f993913 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Wed, 11 Mar 2026 16:07:39 -0300
Subject: [PATCH 259/568] examples/rmtchar: fix source file ordering for
 RMTCHAR

rmtchar_main.c is coming after rmtchar_common.c, which causes an
undefined reference error. This change fixes the problem.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 examples/rmtchar/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/rmtchar/CMakeLists.txt b/examples/rmtchar/CMakeLists.txt
index 0d03174f5..a01ebe080 100644
--- a/examples/rmtchar/CMakeLists.txt
+++ b/examples/rmtchar/CMakeLists.txt
@@ -29,8 +29,8 @@ if(CONFIG_EXAMPLES_RMTCHAR)
     MODULE
     ${CONFIG_EXAMPLES_RMTCHAR}
     SRCS
-    rmtchar_common.c
     rmtchar_main.c)
+  target_sources(apps PRIVATE rmtchar_common.c)
   if(CONFIG_EXAMPLES_RMTCHAR_TX)
     target_sources(apps PRIVATE rmtchar_transmitter.c)
   endif()

From 10056077f4f0c6f7d7f4e8638eac810073dfaea8 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Mon, 16 Mar 2026 20:18:18 +0800
Subject: [PATCH 260/568] examples/camera: fix build error and still capture
 logic

Add missing #include <sys/boardctl.h> in camera_bkgd.c to fix
implicit declaration of boardctl() and undeclared BOARDIOC_NX_START.

Also fix capture_num check in camera_main.c to only apply still
capture size enumeration when capture_type is STILL_CAPTURE.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 examples/camera/camera_bkgd.c | 1 +
 examples/camera/camera_main.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/camera/camera_bkgd.c b/examples/camera/camera_bkgd.c
index c53b11ab8..4703b1ea5 100644
--- a/examples/camera/camera_bkgd.c
+++ b/examples/camera/camera_bkgd.c
@@ -33,6 +33,7 @@
 #include <semaphore.h>
 #include <errno.h>
 #include <debug.h>
+#include <sys/boardctl.h>
 
 #include <arch/board/board.h>
 #include <nuttx/nx/nx.h>
diff --git a/examples/camera/camera_main.c b/examples/camera/camera_main.c
index 43f1fff9d..32ad1a460 100644
--- a/examples/camera/camera_main.c
+++ b/examples/camera/camera_main.c
@@ -537,7 +537,7 @@ int main(int argc, FAR char *argv[])
    * And all allocated memorys are VIDIOC_QBUFed.
    */
 
-  if (capture_num != 0)
+  if (capture_num != 0 && capture_type == V4L2_BUF_TYPE_STILL_CAPTURE)
     {
       /* Determine image size from connected image sensor name,
        * because video driver does not support VIDIOC_ENUM_FRAMESIZES

From 8cd9e9acc23d35a8bcc5f38e7f49cbb05951675e Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Mon, 16 Mar 2026 20:31:54 +0800
Subject: [PATCH 261/568] examples/camera: fix spelling errors

Fix typos found by codespell:
- camera_bkgd.c: defaul -> default
- camera_main.c: memorys -> memories (2 occurrences)
- camera_main.c: freame -> frame
- camera_main.c: valiable -> variable

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 examples/camera/camera_bkgd.c | 2 +-
 examples/camera/camera_main.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/camera/camera_bkgd.c b/examples/camera/camera_bkgd.c
index 4703b1ea5..aa1464471 100644
--- a/examples/camera/camera_bkgd.c
+++ b/examples/camera/camera_bkgd.c
@@ -249,7 +249,7 @@ int nximage_initialize(void)
     }
 
   /* Start a separate thread to listen for server events.
-   * For simplicity, use defaul thread attribute.
+   * For simplicity, use default thread attribute.
    */
 
   ret = pthread_create(&thread, NULL, nximage_listener, NULL);
diff --git a/examples/camera/camera_main.c b/examples/camera/camera_main.c
index 32ad1a460..a342008b5 100644
--- a/examples/camera/camera_main.c
+++ b/examples/camera/camera_main.c
@@ -534,7 +534,7 @@ int main(int argc, FAR char *argv[])
    * Set FULLHD size in ISX012 case, QUADVGA size in ISX019 case or other
    * image sensors,
    * Number of frame buffers is defined as STILL_BUFNUM(1).
-   * And all allocated memorys are VIDIOC_QBUFed.
+   * And all allocated memories are VIDIOC_QBUFed.
    */
 
   if (capture_num != 0 && capture_type == V4L2_BUF_TYPE_STILL_CAPTURE)
@@ -580,9 +580,9 @@ int main(int argc, FAR char *argv[])
    * order from the captured frame buffer and a new camera image is
    * recaptured.
    *
-   * Allocate freame buffers for QVGA RGB565 size (320x240x2=150KB).
+   * Allocate frame buffers for QVGA RGB565 size (320x240x2=150KB).
    * Number of frame buffers is defined as VIDEO_BUFNUM(3).
-   * And all allocated memorys are VIDIOC_QBUFed.
+   * And all allocated memories are VIDIOC_QBUFed.
    */
 
   ret = camera_prepare(v_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE,
@@ -603,7 +603,7 @@ int main(int argc, FAR char *argv[])
    *
    * APP_STATE_UNDER_CAPTURE:
    *    This state will start taking picture and store the image into files.
-   *    Number of taking pictures is set capture_num valiable.
+   *    Number of taking pictures is set capture_num variable.
    *    It can be changed by command line argument.
    *    After finishing taking pictures, the state will be changed to
    *    APP_STATE_AFTER_CAPTURE.

From 4decc1699a18cc81f4b72837626fa32a1059b9fd Mon Sep 17 00:00:00 2001
From: Neil Berkman <neil@xuku.com>
Date: Tue, 17 Mar 2026 15:39:02 -0700
Subject: [PATCH 262/568] boot/nxboot: add flush barriers and CRC-validate
 primary before boot

Two hardening fixes for nxboot power-loss resilience:

1. Add flash_partition_flush() calls between critical partition
   operations in perform_update(). Without explicit flush barriers,
   writes may remain buffered in RAM (e.g. via FTL rwbuffer) when
   nxboot proceeds to the next phase. A power loss between phases
   can leave the recovery image uncommitted while the staging
   partition has already been consumed.

   Flush points added:
   - After copy_partition(primary, recovery) completes
   - After copy_partition(update, primary) completes, before
     erasing the staging first sector

2. Replace validate_image_header() with validate_image() in the
   final primary validation path of nxboot_perform_update(). The
   header-only check validates magic and platform identifier but
   does not CRC-check the image body. After an interrupted update,
   a corrupt primary with an intact header would pass this check
   and be booted, resulting in a persistent boot failure.

Signed-off-by: Neil Berkman <neil@xuku.com>
---
 boot/nxboot/loader/boot.c  |  6 ++++--
 boot/nxboot/loader/flash.c | 20 ++++++++++++++++++++
 boot/nxboot/loader/flash.h | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/boot/nxboot/loader/boot.c b/boot/nxboot/loader/boot.c
index 6de9659ac..8bcd24cef 100644
--- a/boot/nxboot/loader/boot.c
+++ b/boot/nxboot/loader/boot.c
@@ -417,6 +417,7 @@ static int perform_update(struct nxboot_state *state, bool check_only)
           syslog(LOG_INFO, "Creating recovery image.\n");
           nxboot_progress(nxboot_progress_start, recovery_create);
           copy_partition(primary, recovery, state, false);
+          flash_partition_flush(recovery);
           nxboot_progress(nxboot_progress_end);
           nxboot_progress(nxboot_progress_start, validate_recovery);
           successful = validate_image(recovery);
@@ -444,6 +445,8 @@ static int perform_update(struct nxboot_state *state, bool check_only)
           nxboot_progress(nxboot_progress_start, update_from_update);
           if (copy_partition(update, primary, state, true) >= 0)
             {
+              flash_partition_flush(primary);
+
               /* Erase the first sector of update partition. This marks the
                * partition as updated so we don't end up in an update loop.
                * The sector is written back again during the image
@@ -919,8 +922,7 @@ int nxboot_perform_update(bool check_only)
       return ERROR;
     }
 
-  get_image_header(primary, &header);
-  if (!validate_image_header(&header))
+  if (!validate_image(primary))
     {
       ret = ERROR;
     }
diff --git a/boot/nxboot/loader/flash.c b/boot/nxboot/loader/flash.c
index f1a359573..ab6a24320 100644
--- a/boot/nxboot/loader/flash.c
+++ b/boot/nxboot/loader/flash.c
@@ -76,6 +76,26 @@ int flash_partition_open(const char *path)
   return fd;
 }
 
+/****************************************************************************
+ * Name: flash_partition_flush
+ *
+ * Description:
+ *   Flushes any buffered writes to the underlying storage. This ensures
+ *   data is physically committed to flash before the caller proceeds.
+ *
+ * Input parameters:
+ *   fd: Valid file descriptor.
+ *
+ * Returned Value:
+ *   0 on success, -1 on failure.
+ *
+ ****************************************************************************/
+
+int flash_partition_flush(int fd)
+{
+  return fsync(fd);
+}
+
 /****************************************************************************
  * Name: flash_partition_close
  *
diff --git a/boot/nxboot/loader/flash.h b/boot/nxboot/loader/flash.h
index ef1dee09d..69906490d 100644
--- a/boot/nxboot/loader/flash.h
+++ b/boot/nxboot/loader/flash.h
@@ -79,6 +79,22 @@ int flash_partition_open(const char *path);
 
 int flash_partition_close(int fd);
 
+/****************************************************************************
+ * Name: flash_partition_flush
+ *
+ * Description:
+ *   Flushes any buffered writes to the underlying storage.
+ *
+ * Input parameters:
+ *   fd: Valid file descriptor.
+ *
+ * Returned Value:
+ *   0 on success, -1 on failure.
+ *
+ ****************************************************************************/
+
+int flash_partition_flush(int fd);
+
 /****************************************************************************
  * Name: flash_partition_write
  *

From 83af0a011e17066c36223467614853f4647dc03d Mon Sep 17 00:00:00 2001
From: Neil Berkman <neil@xuku.com>
Date: Wed, 18 Mar 2026 00:33:41 -0700
Subject: [PATCH 263/568] boot/nxboot: update stale comment to reflect CRC
 validation

The comment previously stated CRC was not calculated before
boot. This is no longer accurate after adding full image CRC
validation in validate_image().

Signed-off-by: Neil Berkman <neil@xuku.com>
---
 boot/nxboot/loader/boot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot/nxboot/loader/boot.c b/boot/nxboot/loader/boot.c
index 8bcd24cef..703148754 100644
--- a/boot/nxboot/loader/boot.c
+++ b/boot/nxboot/loader/boot.c
@@ -911,9 +911,9 @@ int nxboot_perform_update(bool check_only)
         }
     }
 
-  /* Check whether there is a valid image in the primary slot. This just
-   * checks whether the header is valid, but does not calculate the CRC
-   * of the image as this would prolong the boot process.
+  /* Check whether there is a valid image in the primary slot. Validates
+   * both the header and the full image CRC to ensure integrity before
+   * booting.
    */
 
   primary = flash_partition_open(CONFIG_NXBOOT_PRIMARY_SLOT_PATH);

From cb880b72578c9501710dacf74f2683ea8cfd8a51 Mon Sep 17 00:00:00 2001
From: Neil Berkman <neil@xuku.com>
Date: Wed, 18 Mar 2026 00:42:13 -0700
Subject: [PATCH 264/568] boot/nxboot: remove unused header variable

The header variable in nxboot_perform_update() is no longer
used after validate_image() was changed to take only the fd.

Signed-off-by: Neil Berkman <neil@xuku.com>
---
 boot/nxboot/loader/boot.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boot/nxboot/loader/boot.c b/boot/nxboot/loader/boot.c
index 703148754..c4f936d23 100644
--- a/boot/nxboot/loader/boot.c
+++ b/boot/nxboot/loader/boot.c
@@ -887,7 +887,6 @@ int nxboot_perform_update(bool check_only)
   int ret;
   int primary;
   struct nxboot_state state;
-  struct nxboot_img_header header;
 
   ret = nxboot_get_state(&state);
   if (ret < 0)

From 193fadfaa88bcdafccbef87e6b120404aa9c9f54 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 13 Mar 2026 11:49:18 +0100
Subject: [PATCH 265/568] logging/nxscope: add UDP transfer interface

add UDP transfer interface for nxscope

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 include/logging/nxscope/nxscope_intf.h |  25 +++
 logging/nxscope/CMakeLists.txt         |   4 +
 logging/nxscope/Kconfig                |   6 +
 logging/nxscope/Makefile               |   4 +
 logging/nxscope/nxscope_iudp.c         | 271 +++++++++++++++++++++++++
 5 files changed, 310 insertions(+)
 create mode 100644 logging/nxscope/nxscope_iudp.c

diff --git a/include/logging/nxscope/nxscope_intf.h b/include/logging/nxscope/nxscope_intf.h
index b422e0d77..937619f3a 100644
--- a/include/logging/nxscope/nxscope_intf.h
+++ b/include/logging/nxscope/nxscope_intf.h
@@ -99,6 +99,16 @@ struct nxscope_ser_cfg_s
 };
 #endif
 
+#ifdef CONFIG_LOGGING_NXSCOPE_INTF_UDP
+/* Nxscope UDP interface configuration */
+
+struct nxscope_udp_cfg_s
+{
+  uint16_t  port;               /* Local UDP port */
+  bool      nonblock;           /* Nonblocking operation */
+};
+#endif
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -133,6 +143,21 @@ int nxscope_ser_init(FAR struct nxscope_intf_s *intf,
 void nxscope_ser_deinit(FAR struct nxscope_intf_s *intf);
 #endif
 
+#ifdef CONFIG_LOGGING_NXSCOPE_INTF_UDP
+/****************************************************************************
+ * Name: nxscope_udp_init
+ ****************************************************************************/
+
+int nxscope_udp_init(FAR struct nxscope_intf_s *intf,
+                     FAR struct nxscope_udp_cfg_s *cfg);
+
+/****************************************************************************
+ * Name: nxscope_udp_deinit
+ ****************************************************************************/
+
+void nxscope_udp_deinit(FAR struct nxscope_intf_s *intf);
+#endif
+
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/logging/nxscope/CMakeLists.txt b/logging/nxscope/CMakeLists.txt
index 378ebefd5..98594accd 100644
--- a/logging/nxscope/CMakeLists.txt
+++ b/logging/nxscope/CMakeLists.txt
@@ -27,6 +27,10 @@ if(CONFIG_LOGGING_NXSCOPE)
     list(APPEND CSRCS nxscope_iser.c)
   endif()
 
+  if(CONFIG_LOGGING_NXSCOPE_INTF_UDP)
+    list(APPEND CSRCS nxscope_iudp.c)
+  endif()
+
   if(CONFIG_LOGGING_NXSCOPE_INTF_DUMMY)
     list(APPEND CSRCS nxscope_idummy.c)
   endif()
diff --git a/logging/nxscope/Kconfig b/logging/nxscope/Kconfig
index 3649b25e9..bb187ea43 100644
--- a/logging/nxscope/Kconfig
+++ b/logging/nxscope/Kconfig
@@ -15,6 +15,12 @@ config LOGGING_NXSCOPE_INTF_SERIAL
 	---help---
 		For details, see logging/nxscope/nxscope_iserial.c
 
+config LOGGING_NXSCOPE_INTF_UDP
+	bool "NxScope UDP interface support"
+	default n
+	---help---
+		For details, see logging/nxscope/nxscope_iudp.c
+
 config LOGGING_NXSCOPE_INTF_DUMMY
 	bool "NxScope dummy interface support"
 	default n
diff --git a/logging/nxscope/Makefile b/logging/nxscope/Makefile
index 3e45148fc..c8fc05489 100644
--- a/logging/nxscope/Makefile
+++ b/logging/nxscope/Makefile
@@ -34,6 +34,10 @@ ifeq ($(CONFIG_LOGGING_NXSCOPE_INTF_DUMMY),y)
 CSRCS += nxscope_idummy.c
 endif
 
+ifeq ($(CONFIG_LOGGING_NXSCOPE_INTF_UDP),y)
+CSRCS += nxscope_iudp.c
+endif
+
 ifeq ($(CONFIG_LOGGING_NXSCOPE_PROTO_SER),y)
 CSRCS += nxscope_pser.c
 endif
diff --git a/logging/nxscope/nxscope_iudp.c b/logging/nxscope/nxscope_iudp.c
new file mode 100644
index 000000000..07aae7711
--- /dev/null
+++ b/logging/nxscope/nxscope_iudp.c
@@ -0,0 +1,271 @@
+/****************************************************************************
+ * apps/logging/nxscope/nxscope_iudp.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <debug.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include <logging/nxscope/nxscope.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct nxscope_intf_udp_s
+{
+  FAR struct nxscope_udp_cfg_s *cfg;
+  int                           fd;
+  bool                          peer_valid;
+  struct sockaddr_in            peer;
+};
+
+/****************************************************************************
+ * Private Function Protototypes
+ ****************************************************************************/
+
+static int nxscope_udp_send(FAR struct nxscope_intf_s *intf,
+                            FAR uint8_t *buff, int len);
+static int nxscope_udp_recv(FAR struct nxscope_intf_s *intf,
+                            FAR uint8_t *buff, int len);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct nxscope_intf_ops_s g_nxscope_udp_ops =
+{
+  nxscope_udp_send,
+  nxscope_udp_recv
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxscope_udp_send
+ ****************************************************************************/
+
+static int nxscope_udp_send(FAR struct nxscope_intf_s *intf,
+                            FAR uint8_t *buff, int len)
+{
+  FAR struct nxscope_intf_udp_s *priv = NULL;
+
+  DEBUGASSERT(intf);
+  DEBUGASSERT(intf->priv);
+
+  /* Get priv data */
+
+  priv = (FAR struct nxscope_intf_udp_s *)intf->priv;
+
+  if (!priv->peer_valid)
+    {
+      return -ENOTCONN;
+    }
+
+  return sendto(priv->fd, buff, len, 0,
+                (FAR const struct sockaddr *)&priv->peer,
+                sizeof(priv->peer));
+}
+
+/****************************************************************************
+ * Name: nxscope_udp_recv
+ ****************************************************************************/
+
+static int nxscope_udp_recv(FAR struct nxscope_intf_s *intf,
+                            FAR uint8_t *buff, int len)
+{
+  FAR struct nxscope_intf_udp_s *priv = NULL;
+  struct sockaddr_in             from;
+  socklen_t                      fromlen;
+  int                            ret = OK;
+
+  DEBUGASSERT(intf);
+  DEBUGASSERT(intf->priv);
+
+  /* Get priv data */
+
+  priv = (FAR struct nxscope_intf_udp_s *)intf->priv;
+
+  fromlen = sizeof(from);
+  ret     = recvfrom(priv->fd, buff, len, 0, (FAR struct sockaddr *)&from,
+                     &fromlen);
+
+  if (ret < 0)
+    {
+      if (priv->cfg->nonblock && (errno == EAGAIN || errno == EWOULDBLOCK))
+        {
+          ret = 0;
+        }
+
+      return ret;
+    }
+
+  priv->peer       = from;
+  priv->peer_valid = true;
+
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxscope_udp_init
+ ****************************************************************************/
+
+int nxscope_udp_init(FAR struct nxscope_intf_s *intf,
+                     FAR struct nxscope_udp_cfg_s *cfg)
+{
+  FAR struct nxscope_intf_udp_s *priv = NULL;
+  struct sockaddr_in             addr;
+  int                            ret   = OK;
+  int                            flags = 0;
+
+  DEBUGASSERT(intf);
+  DEBUGASSERT(cfg);
+
+  /* Allocate priv data */
+
+  intf->priv = zalloc(sizeof(struct nxscope_intf_udp_s));
+  if (intf->priv == NULL)
+    {
+      _err("ERROR: intf->priv alloc failed %d\n", errno);
+      ret = -errno;
+      goto errout;
+    }
+
+  /* Get priv data */
+
+  priv = (FAR struct nxscope_intf_udp_s *)intf->priv;
+  priv->fd = -1;
+
+  /* Connect configuration */
+
+  priv->cfg = (FAR struct nxscope_udp_cfg_s *)cfg;
+
+  /* Connect ops */
+
+  intf->ops = &g_nxscope_udp_ops;
+
+  /* Open UDP socket */
+
+  priv->fd = socket(AF_INET, SOCK_DGRAM, 0);
+  if (priv->fd < 0)
+    {
+      _err("ERROR: failed to create UDP socket %d\n", errno);
+      ret = -errno;
+      goto errout;
+    }
+
+  /* Configure non-blocking if enabled */
+
+  if (priv->cfg->nonblock)
+    {
+      flags = fcntl(priv->fd, F_GETFL, 0);
+      if (flags < 0)
+        {
+          _err("ERROR: failed to get socket flags %d\n", errno);
+          ret = -errno;
+          goto errout;
+        }
+
+      ret = fcntl(priv->fd, F_SETFL, flags | O_NONBLOCK);
+      if (ret < 0)
+        {
+          _err("ERROR: failed to set O_NONBLOCK %d\n", errno);
+          ret = -errno;
+          goto errout;
+        }
+    }
+
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family      = AF_INET;
+  addr.sin_addr.s_addr = INADDR_ANY;
+  addr.sin_port        = htons(priv->cfg->port);
+
+  ret = bind(priv->fd, (FAR struct sockaddr *)&addr, sizeof(addr));
+  if (ret < 0)
+    {
+      _err("ERROR: failed to bind UDP port %u errno=%d\n",
+           priv->cfg->port,
+           errno);
+      ret = -errno;
+      goto errout;
+    }
+
+  /* Initialized */
+
+  intf->initialized = true;
+  return OK;
+
+errout:
+  if (priv != NULL && priv->fd >= 0)
+    {
+      close(priv->fd);
+      priv->fd = -1;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: nxscope_udp_deinit
+ ****************************************************************************/
+
+void nxscope_udp_deinit(FAR struct nxscope_intf_s *intf)
+{
+  FAR struct nxscope_intf_udp_s *priv = NULL;
+
+  DEBUGASSERT(intf);
+
+  /* Get priv data */
+
+  priv = (FAR struct nxscope_intf_udp_s *)intf->priv;
+
+  if (priv != NULL && priv->fd != -1)
+    {
+      close(priv->fd);
+    }
+
+  if (priv != NULL)
+    {
+      free(priv);
+    }
+
+  /* Reset structure */
+
+  memset(intf, 0, sizeof(struct nxscope_intf_s));
+}

From 7884410be2d18957d7ee951f42cfd8d62d79d44d Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 16 Mar 2026 13:56:01 +0100
Subject: [PATCH 266/568] examples/nxscope: add UDP interface

add UDP interface for examples/nxscope

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/nxscope/Kconfig        |  9 +++++++++
 examples/nxscope/nxscope_main.c | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/examples/nxscope/Kconfig b/examples/nxscope/Kconfig
index b29f97f26..49d36f270 100644
--- a/examples/nxscope/Kconfig
+++ b/examples/nxscope/Kconfig
@@ -43,6 +43,15 @@ config EXAMPLES_NXSCOPE_CDCACM
 
 endif # LOGGING_NXSCOPE_INTF_SERIAL
 
+if LOGGING_NXSCOPE_INTF_UDP
+
+config EXAMPLES_NXSCOPE_UDP_PORT
+	int "nxscope UDP local port"
+	default 50000
+	range 1 65535
+
+endif # LOGGING_NXSCOPE_INTF_UDP
+
 config EXAMPLES_NXSCOPE_FORCE_ENABLE
 	bool "nxscope force enable"
 	default n
diff --git a/examples/nxscope/nxscope_main.c b/examples/nxscope/nxscope_main.c
index b2311a74a..5d5102e99 100644
--- a/examples/nxscope/nxscope_main.c
+++ b/examples/nxscope/nxscope_main.c
@@ -431,6 +431,9 @@ int main(int argc, FAR char *argv[])
 #ifdef CONFIG_LOGGING_NXSCOPE_INTF_SERIAL
   struct nxscope_ser_cfg_s    nxs_ser_cfg;
 #endif
+#ifdef CONFIG_LOGGING_NXSCOPE_INTF_UDP
+  struct nxscope_udp_cfg_s    nxs_udp_cfg;
+#endif
 #ifdef CONFIG_LOGGING_NXSCOPE_INTF_DUMMY
   struct nxscope_dummy_cfg_s  nxs_dummy_cfg;
 #endif
@@ -484,6 +487,22 @@ int main(int argc, FAR char *argv[])
     }
 #endif
 
+#ifdef CONFIG_LOGGING_NXSCOPE_INTF_UDP
+  /* Configuration */
+
+  nxs_udp_cfg.port     = CONFIG_EXAMPLES_NXSCOPE_UDP_PORT;
+  nxs_udp_cfg.nonblock = true;
+
+  /* Initialize UDP interface */
+
+  ret = nxscope_udp_init(&intf, &nxs_udp_cfg);
+  if (ret < 0)
+    {
+      printf("ERROR: nxscope_udp_init failed %d\n", ret);
+      goto errout_nointf;
+    }
+#endif
+
 #ifdef CONFIG_LOGGING_NXSCOPE_INTF_DUMMY
   /* Configuration */
 
@@ -733,6 +752,9 @@ errout_nonxscope:
 #if defined(CONFIG_LOGGING_NXSCOPE_INTF_SERIAL)
   nxscope_ser_deinit(&intf);
 #endif
+#if defined(CONFIG_LOGGING_NXSCOPE_INTF_UDP)
+  nxscope_udp_deinit(&intf);
+#endif
 #if defined(CONFIG_LOGGING_NXSCOPE_INTF_DUMMY)
   nxscope_dummy_deinit(&intf);
 #endif

From 5fe08779897d1a566d7b555ea85131c2608a868f Mon Sep 17 00:00:00 2001
From: Lup Yuen Lee <luppy@appkaki.com>
Date: Sun, 22 Mar 2026 08:02:39 +0800
Subject: [PATCH 267/568] CI: Revert GitHub Actions for Docker

All CI Builds have been failing since 18 hours ago:
- https://github.com/apache/nuttx/pull/18571#issuecomment-4104792750
- https://github.com/apache/nuttx/actions/runs/23389990049

> _The action docker/login-action@v4 is not allowed in apache/nuttx because all actions must be from a repository owned by your enterprise, created by GitHub, or match one of the patterns: 1Password/load-secrets-action@13f58eec611f8e5db52ec16247f58c508398f3e6, 1Password/load-secrets-action@8d0d610af187e78a2772c2d18d627f4c52d3fbfb, 1Password/load-secrets-action@dafbe7cb03502b260e2b2893c753c352eee545bf, AdoptOpenJDK/install-jdk@*, BobAnkh/auto-generate-changelog@*, DavidAnson/markdownlint-cli2-action@07035fd053f7be764496c0f8d8f9f41f98305101, DavidAnson/markdownlint-cli2-action@30a0e04f1870d58f8d717450cc6134995f993c63, EnricoMi/publish-unit-test-result-action@*, JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23, JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f, Jimver/cuda-toolkit@6008063726ffe3309d1b22e413d9e88fed91a2f2, Jimver/cuda-toolkit@b6fc3a9f3f15256d9d94ffe1254f9c5a2565cde6, JustinBeckwith/linkinator-action@af984b9f30f63e796..._

That's because ASF Infrastructure Team has mandated that we use the Hash Versions of GitHub Actions for Docker, stated below:
- https://github.com/apache/infrastructure-actions/blob/main/actions.yml
- Which generates: https://github.com/apache/infrastructure-actions/blob/main/approved_patterns.yml
- Due to: https://github.com/apache/infrastructure-actions/pull/547

```yaml
docker/build-push-action:
  10e90e3645eae34f1e60eeb005ba3a3d33f178e8:
    tag: v6.19.2
docker/login-action:
  c94ce9fb468520275223c153574b00df6fe4bcc9:
    tag: v3.7.0
docker/metadata-action:
  c299e40c65443455700f0fdfc63efafe5b349051:
    tag: v5.10.0
docker/setup-buildx-action:
  8d2750c68a42422c14e847fe6c8ac0403b4cbd6f:
    tag: v3.12.0
```

This PR reverts our GitHub Actions for Docker to the hash versions stated above.

Signed-off-by: Lup Yuen Lee <luppy@appkaki.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc12b797d..6c4a7367e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -163,7 +163,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@v4
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9  # v3.7.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -246,7 +246,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@v4
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9  # v3.7.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From b986eef7a71b0932ee23349afaf63e7b7d0758bc Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 22 Mar 2026 10:59:13 +0100
Subject: [PATCH 268/568] system/sensorscope: fix compilation

fix compilation error:

sensorscope_main.c:314:3: error: implicit declaration of function 'list_initialize'; did you mean 'fs_initialize'? [-Wimplicit-function-declaration]

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 system/sensorscope/sensorscope_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/sensorscope/sensorscope_main.c b/system/sensorscope/sensorscope_main.c
index 2248afaec..2c8f2ecbe 100644
--- a/system/sensorscope/sensorscope_main.c
+++ b/system/sensorscope/sensorscope_main.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/list.h>
 #include <sys/boardctl.h>
 #include <sys/param.h>
 
@@ -58,7 +59,7 @@ struct nxsensor_info_s
   FAR const char *name;
   size_t          data_size;    /* Sensor read data size */
   size_t          data_offset;  /* Read data offset (no timestamp) */
-  size_t          dim;          /* Data vector dimenstion */
+  size_t          dim;          /* Data vector dimension */
   int             dtype;        /* Data vector type */
 };
 
@@ -313,7 +314,7 @@ static int nxscope_channels(FAR struct nxscope_thr_env_s *envp)
 
   list_initialize(&envp->objlist);
 
-  /* Open sensors direcotry */
+  /* Open sensors directory */
 
   dir = opendir(SENSOR_PATH);
   if (!dir)

From 460281a90f8356dc5d25d9fee110550c59a7c2ff Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Fri, 20 Mar 2026 13:53:36 +0800
Subject: [PATCH 269/568] system/fastboot: fix socket() parameter order for TCP
 transport

SOCK_CLOEXEC and SOCK_NONBLOCK were incorrectly passed as the
third argument (protocol) instead of being OR'd into the second
argument (type). This caused socket() to fail with EPROTONOSUPPORT
(errno 93) on NuttX.

Move SOCK_CLOEXEC | SOCK_NONBLOCK to the type parameter and set
protocol to 0.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/fastboot/fastboot.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/fastboot/fastboot.c b/system/fastboot/fastboot.c
index 4ba39b5d3..d443bb9c8 100644
--- a/system/fastboot/fastboot.c
+++ b/system/fastboot/fastboot.c
@@ -1295,8 +1295,9 @@ static int fastboot_tcp_initialize(FAR struct fastboot_ctx_s *ctx)
   netinit_bringup();
 #endif
 
-  ctx->tran_fd[0] = socket(AF_INET, SOCK_STREAM,
-                           SOCK_CLOEXEC | SOCK_NONBLOCK);
+  ctx->tran_fd[0] = socket(AF_INET,
+                           SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
+                           0);
   if (ctx->tran_fd[0] < 0)
     {
       fb_err("create socket failed %d", errno);

From 509b8074620e47aa08d87a7ad13ce34a73c1984d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 22:22:50 +0000
Subject: [PATCH 270/568] build(deps): bump docker/login-action from 3.7.0 to
 4.0.0

Bumps [docker/login-action](https://github.com/docker/login-action) from 3.7.0 to 4.0.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/c94ce9fb468520275223c153574b00df6fe4bcc9...b45d80f862d83dbcd57f89517bcf500b2ab88fb2)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c4a7367e..95ba5d943 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -163,7 +163,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9  # v3.7.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2  # v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -246,7 +246,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9  # v3.7.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2  # v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 6a1b2c69035ee1ad54b366586d34f64ebb406f22 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Wed, 18 Mar 2026 11:15:45 +0800
Subject: [PATCH 271/568] system/nxrecorder: Fix null pointer dereference in
 argument parsing

When a command has no arguments (e.g., 'q', 'quit', 'stop'), the strtok_r()
function returns NULL for the arg parameter. The argument trimming loop was
dereferencing this NULL pointer without checking, causing undefined behavior
and system hang on ESP32-S3.

This commit adds a null check before dereferencing the arg pointer in the
leading space trimming loop.

Tested on ESP32-S3 (lckfb-szpi-esp32s3) - quit command now works correctly.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxrecorder/nxrecorder_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/nxrecorder/nxrecorder_main.c b/system/nxrecorder/nxrecorder_main.c
index 8ba3ad4b4..a8a4c63d6 100644
--- a/system/nxrecorder/nxrecorder_main.c
+++ b/system/nxrecorder/nxrecorder_main.c
@@ -588,7 +588,7 @@ int main(int argc, FAR char *argv[])
 
               /* Remove leading spaces from arg */
 
-              while (*arg == ' ')
+              while (arg && *arg == ' ')
                 {
                   arg++;
                 }

From f3a7282230bdd1c3f09148d6bc5cc1acd9fd3e4a Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Tue, 24 Mar 2026 14:57:03 -0300
Subject: [PATCH 272/568] netutils/cjson: fix apps path in CMake

Fix mismatch on apps directory naming when it is cloned under 'nuttx-apps' instead of 'apps'.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 netutils/cjson/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/netutils/cjson/CMakeLists.txt b/netutils/cjson/CMakeLists.txt
index 729dbc619..315326793 100644
--- a/netutils/cjson/CMakeLists.txt
+++ b/netutils/cjson/CMakeLists.txt
@@ -40,7 +40,7 @@ if(CONFIG_NETUTILS_CJSON)
           SOURCE_DIR
           ${CMAKE_CURRENT_LIST_DIR}/cJSON
           BINARY_DIR
-          ${CMAKE_BINARY_DIR}/apps/netutils/cjson/cJSON
+          ${NUTTX_APPS_BINDIR}/netutils/cjson/cJSON
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 30)
 
@@ -51,13 +51,13 @@ if(CONFIG_NETUTILS_CJSON)
     endif()
   endif()
 
-  if(NOT EXISTS ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON.h
-     OR NOT EXISTS ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON_Utils.h)
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/apps/include/netutils)
+  if(NOT EXISTS ${NUTTX_APPS_BINDIR}/include/netutils/cJSON.h
+     OR NOT EXISTS ${NUTTX_APPS_BINDIR}/include/netutils/cJSON_Utils.h)
+    file(MAKE_DIRECTORY ${NUTTX_APPS_BINDIR}/include/netutils)
     file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/cJSON/cJSON.h
-         ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON.h SYMBOLIC)
+         ${NUTTX_APPS_BINDIR}/include/netutils/cJSON.h SYMBOLIC)
     file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/cJSON/cJSON_Utils.h
-         ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON_Utils.h SYMBOLIC)
+         ${NUTTX_APPS_BINDIR}/include/netutils/cJSON_Utils.h SYMBOLIC)
   endif()
 
   target_sources(apps PRIVATE cJSON/cJSON.c cJSON/cJSON_Utils.c)

From e564816e1d931edb2cd01d7202511ec0a8fbd068 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 27 Mar 2026 10:41:40 +0100
Subject: [PATCH 273/568] .github: install NTFC from PIP

install NTFC package from PIP

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 .github/workflows/build.yml | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95ba5d943..34cc01a43 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -175,42 +175,26 @@ jobs:
       - name: Export NuttX Repo SHA
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
 
-      - name: Install NTFC
-        uses: ./sources/nuttx/.github/actions/ci-container
-        env:
-          BLOBDIR: /tools/blobs
-        with:
-          run: |
-            # install python venv
-            apt-get update
-            apt-get install -y python3 python3-dev python3-venv
-
-            # get NTFC sources
-            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-ntfc
-            cd /github/workspace/nuttx-ntfc
-
-            # install NTFC with venv
-            python3 -m venv /github/workspace/nuttx-ntfc/venv
-            source /github/workspace/nuttx-ntfc/venv/bin/activate
-            pip3 install .
-            deactivate
-
-            # get NTFC test cases
-            cd external
-            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
-
       - name: Run builds
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
           BLOBDIR: /tools/blobs
         with:
           run: |
+            pip install ntfc==0.0.1
+            mkdir /github/workspace/nuttx-ntfc
+            mkdir /github/workspace/nuttx-ntfc/external
+            cd /github/workspace/nuttx-ntfc
+            # get NTFC test cases
+            cd external
+            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
+
             echo "::add-matcher::sources/nuttx/.github/gcc.json"
             export ARTIFACTDIR=`pwd`/buildartifacts
             export NTFCDIR=/github/workspace/nuttx-ntfc
             git config --global --add safe.directory /github/workspace/sources/nuttx
             git config --global --add safe.directory /github/workspace/sources/apps
-            cd sources/nuttx/tools/ci
+            cd /github/workspace/sources/nuttx/tools/ci
             if [ "X${{matrix.boards}}" = "Xcodechecker" ]; then
                 ./cibuild.sh -c -A -N -R --codechecker testlist/${{matrix.boards}}.dat
             else

From cd2b0c0e877f718dca44ca7cc13586b655409fb8 Mon Sep 17 00:00:00 2001
From: Vlad Pruteanu <pruteanuvlad1611@yahoo.com>
Date: Thu, 26 Mar 2026 00:12:49 +0200
Subject: [PATCH 274/568] testing/crypto: Add pbkdf2 test app

This adds support for testing PBKDF2 implementation. Test
vectors for SHA1 are taken from RFC6070. SHA256 vectors
were extrapolated using an online PBKDF2 generator which
was checked against RFC6070.

Signed-off-by: Vlad Pruteanu <pruteanuvlad1611@yahoo.com>
---
 testing/drivers/crypto/CMakeLists.txt |  14 ++
 testing/drivers/crypto/Kconfig        |   4 +
 testing/drivers/crypto/Makefile       |   5 +
 testing/drivers/crypto/pbkdf2.c       | 278 ++++++++++++++++++++++++++
 4 files changed, 301 insertions(+)
 create mode 100644 testing/drivers/crypto/pbkdf2.c

diff --git a/testing/drivers/crypto/CMakeLists.txt b/testing/drivers/crypto/CMakeLists.txt
index 3918043a1..6e7fb369f 100644
--- a/testing/drivers/crypto/CMakeLists.txt
+++ b/testing/drivers/crypto/CMakeLists.txt
@@ -175,4 +175,18 @@ if(CONFIG_TESTING_CRYPTO)
       rsa.c)
   endif()
 
+  if(CONFIG_TESTING_CRYPTO_PBKDF2)
+    nuttx_add_application(
+      NAME
+      pbkdf2
+      PRIORITY
+      ${CONFIG_TESTING_CRYPTO_PRIORITY}
+      STACKSIZE
+      ${CONFIG_TESTING_CRYPTO_STACKSIZE}
+      MODULE
+      ${CONFIG_TESTING_CRYPTO}
+      SRCS
+      pbkdf2.c)
+  endif()
+
 endif()
diff --git a/testing/drivers/crypto/Kconfig b/testing/drivers/crypto/Kconfig
index 40983778a..18a4f3521 100644
--- a/testing/drivers/crypto/Kconfig
+++ b/testing/drivers/crypto/Kconfig
@@ -74,6 +74,10 @@ config TESTING_CRYPTO_RSA
 	bool "rsa crypto test"
 	default n
 
+config TESTING_CRYPTO_PBKDF2
+	bool "pbkdf2 crypto test"
+	default n
+
 config TESTING_CRYPTO_PRIORITY
 	int "crypto test task priority"
 	default 100
diff --git a/testing/drivers/crypto/Makefile b/testing/drivers/crypto/Makefile
index 64c6dfac7..82aeebef0 100644
--- a/testing/drivers/crypto/Makefile
+++ b/testing/drivers/crypto/Makefile
@@ -78,6 +78,11 @@ PROGNAME += rsa
 MAINSRC +=  rsa.c
 endif
 
+ifeq ($(CONFIG_TESTING_CRYPTO_PBKDF2),y)
+PROGNAME += pbkdf2
+MAINSRC +=  pbkdf2.c
+endif
+
 PRIORITY = $(CONFIG_TESTING_CRYPTO_PRIORITY)
 STACKSIZE = $(CONFIG_TESTING_CRYPTO_STACKSIZE)
 MODULE = $(CONFIG_TESTING_CRYPTO)
diff --git a/testing/drivers/crypto/pbkdf2.c b/testing/drivers/crypto/pbkdf2.c
new file mode 100644
index 000000000..10e7174ef
--- /dev/null
+++ b/testing/drivers/crypto/pbkdf2.c
@@ -0,0 +1,278 @@
+/****************************************************************************
+ * apps/testing/drivers/crypto/pbkdf2.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <err.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <crypto/cryptodev.h>
+
+struct tb
+{
+  FAR char *key;
+  int keylen;
+  FAR char *data;
+  int datalen;
+  int iterations;
+  int dklen;
+}
+pbkdf2_testcases[] =
+{
+    {
+      "password",
+      8,
+      "salt",
+      4,
+      1,
+      20,
+    },
+    {
+      "password",
+      8,
+      "salt",
+      4,
+      2,
+      20,
+    },
+    {
+      "password",
+      8,
+      "salt",
+      4,
+      4096,
+      20,
+    },
+    {
+      "password",
+      8,
+      "salt",
+      4,
+      16777216,
+      20,
+    },
+    {
+      "passwordPASSWORDpassword",
+      24,
+      "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+      36,
+      4096,
+      25,
+    },
+    {
+      "pass\0word",
+      9,
+      "sa\0lt",
+      5,
+      4096,
+      16,
+    },
+};
+
+FAR char *pbkdf2_sha1_result[] =
+{
+  "\x0c\x60\xc8\x0f\x96\x1f\x0e\x71\xf3\xa9\xb5\x24\xaf\x60\x12\x06"
+  "\x2f\xe0\x37\xa6",
+  "\xea\x6c\x01\x4d\xc7\x2d\x6f\x8c\xcd\x1e\xd9\x2a\xce\x1d\x41\xf0"
+  "\xd8\xde\x89\x57",
+  "\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26\xf7\x21\xd0"
+  "\x65\xa4\x29\xc1",
+  "\xee\xfe\x3d\x61\xcd\x4d\xa4\xe4\xe9\x94\x5b\x3d\x6b\xa2\x15\x8c"
+  "\x26\x34\xe9\x84",
+  "\x3d\x2e\xec\x4f\xe4\x1c\x84\x9b\x80\xc8\xd8\x36\x62\xc0\xe4\x4a"
+  "\x8b\x29\x1a\x96\x4c\xf2\xf0\x70\x38",
+  "\x56\xfa\x6a\xa7\x55\x48\x09\x9d\xcc\x37\xd7\xf0\x34\x25\xe0\xc3",
+};
+
+FAR char *pbkdf2_sha256_result[] =
+{
+  "\x12\x0f\xb6\xcf\xfc\xf8\xb3\x2c\x43\xe7\x22\x52\x56\xc4\xf8\x37"
+  "\xa8\x65\x48\xc9",
+  "\xae\x4d\x0c\x95\xaf\x6b\x46\xd3\x2d\x0a\xdf\xf9\x28\xf0\x6d\xd0"
+  "\x2a\x30\x3f\x8e",
+  "\xc5\xe4\x78\xd5\x92\x88\xc8\x41\xaa\x53\x0d\xb6\x84\x5c\x4c\x8d"
+  "\x96\x28\x93\xa0",
+  "\xcf\x81\xc6\x6f\xe8\xcf\xc0\x4d\x1f\x31\xec\xb6\x5d\xab\x40\x89"
+  "\xf7\xf1\x79\xe8",
+  "\x34\x8c\x89\xdb\xcb\xd3\x2b\x2f\x32\xd8\x14\xb8\x11\x6e\x84\xcf"
+  "\x2b\x17\x34\x7e\xbc\x18\x00\x18\x1c",
+  "\x89\xb6\x9d\x05\x16\xf8\x29\x89\x3c\x69\x62\x26\x65\x0a\x86\x87",
+};
+
+int syspbkdf2(int mac, FAR const char *key, size_t keylen,
+            FAR const char *s, size_t len, int iterations,
+            size_t dklen, FAR char *out)
+{
+  struct session_op session;
+  struct crypt_op cryp;
+  int cryptodev_fd = -1;
+  int fd = -1;
+
+  if ((fd = open("/dev/crypto", O_RDWR, 0)) < 0)
+    {
+      warn("/dev/crypto");
+      goto err;
+    }
+
+  if (ioctl(fd, CRIOGET, &cryptodev_fd) == -1)
+    {
+      warn("CRIOGET");
+      goto err;
+    }
+
+  memset(&session, 0, sizeof(session));
+  session.cipher = 0;
+  session.mac = mac;
+  session.mackey = (caddr_t)key;
+  session.mackeylen = keylen;
+  if (ioctl(cryptodev_fd, CIOCGSESSION, &session) == -1)
+    {
+      warn("CIOCGSESSION");
+      goto err;
+    }
+  memset(&cryp, 0, sizeof(cryp));
+  cryp.ses = session.ses;
+  cryp.flags = 0;
+  cryp.src = (caddr_t)s;
+  cryp.len = len;
+  cryp.dst = 0;
+  cryp.mac = (caddr_t) out;
+  cryp.iv = 0;
+  cryp.iterations = iterations;
+  cryp.olen = dklen;
+
+  if (ioctl(cryptodev_fd, CIOCCRYPT, &cryp) == -1)
+    {
+      warn("CIOCCRYPT");
+      goto err;
+    }
+
+  close(cryptodev_fd);
+  close(fd);
+
+  return 0;
+err:
+  if (cryptodev_fd != -1)
+    {
+      close(cryptodev_fd);
+    }
+
+  if (fd != -1)
+    {
+      close(fd);
+    }
+
+  return 1;
+}
+
+static int match(unsigned char *a, unsigned char *b, size_t len)
+{
+  int i;
+
+  if (memcmp(a, b, len) == 0)
+    return (0);
+
+  warnx("pbkdf2 mismatch\n");
+
+  for (i = 0; i < len; i++)
+    {
+      printf("%02x", a[i]);
+    }
+
+  printf("\n");
+  for (i = 0; i < len; i++)
+    {
+      printf("%02x", b[i]);
+    }
+
+  printf("\n");
+
+  return (1);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(void)
+{
+  char output[40];
+  int ret = 0;
+  for (int i = 0; i < 6; i++)
+    {
+      ret = syspbkdf2(CRYPTO_PBKDF2_HMAC_SHA1, pbkdf2_testcases[i].key,
+                      pbkdf2_testcases[i].keylen,
+                      pbkdf2_testcases[i].data,
+                      pbkdf2_testcases[i].datalen,
+                      pbkdf2_testcases[i].iterations,
+                      pbkdf2_testcases[i].dklen, output);
+      if (ret)
+        {
+          printf("PBKDF2 SHA1 failed\n");
+        }
+
+      ret += match((unsigned char *)pbkdf2_sha1_result[i],
+                   (unsigned char *)output,
+                   pbkdf2_testcases[i].dklen);
+      if (ret)
+        {
+          printf("match PBKDF2 SHA1 failed\n");
+        }
+      else
+        {
+          printf("hmac PBKDF2 SHA1 success\n");
+        }
+    }
+
+  for (int i = 0; i < 6; i++)
+    {
+      ret = syspbkdf2(CRYPTO_PBKDF2_HMAC_SHA256, pbkdf2_testcases[i].key,
+                      pbkdf2_testcases[i].keylen,
+                      pbkdf2_testcases[i].data,
+                      pbkdf2_testcases[i].datalen,
+                      pbkdf2_testcases[i].iterations,
+                      pbkdf2_testcases[i].dklen, output);
+      if (ret)
+        {
+          printf("PBKDF2 SHA256 failed\n");
+        }
+
+      ret += match((unsigned char *)pbkdf2_sha256_result[i],
+                   (unsigned char *)output,
+                   pbkdf2_testcases[i].dklen);
+      if (ret)
+        {
+          printf("match PBKDF2 SHA256 failed\n");
+        }
+      else
+        {
+          printf("hmac PBKDF2 SHA256 success\n");
+        }
+    }
+
+  return 0;
+}

From dc4ecc973e41435d7f253ef0ff5f14ffe45b1d2f Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Fri, 27 Mar 2026 13:45:32 -0300
Subject: [PATCH 275/568] ci: split xtensa jobs into three separate jobs
 (instead of two)

This is necessary because new defconfig were recently added to
Xtensa-based Espressif SoCs and the build job may exceed 2 hours.
In order to avoid increasing job timeout, a specific job for each
supported SoC (ESP32, ESP32-S2 and ESP32-S3) was created instead.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 .github/workflows/arch.yml  | 2 +-
 .github/workflows/build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 278d5f666..02e39ab2b 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -230,7 +230,7 @@ jobs:
                 skip_build=1
               fi
   
-            # For "Arch / Board: xtensa": Build xtensa-01, xtensa-02
+            # For "Arch / Board: xtensa": Build xtensa-01, xtensa-02, xtensa-03
             elif [[ "$arch_contains_xtensa" == "1" || "$board_contains_xtensa" == "1" ]]; then
               if [[ "$board" != *"xtensa-"* ]]; then
                 skip_build=1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34cc01a43..fc106e7d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,7 +121,7 @@ jobs:
         [
           "arm-01", "risc-v-01", "sim-01", "xtensa-01", "arm64-01", "x86_64-01", "other",
           "arm-02", "risc-v-02", "sim-02", "xtensa-02",
-          "arm-03", "risc-v-03", "sim-03",
+          "arm-03", "risc-v-03", "sim-03", "xtensa-03",
           "arm-04", "risc-v-04",
           "arm-05", "risc-v-05",
           "arm-06", "risc-v-06",

From 073df9d1dec8d569e971e39c9dc71504f40836ea Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Mon, 16 Mar 2026 18:22:43 +0800
Subject: [PATCH 276/568] examples/uvc_cam: add UVC camera streaming app

Usage: uvc_cam [nframes] [video_dev] [uvc_dev]

V4L2 capture -> write UVC gadget device.
Uses boardctl to initialize/deinitialize UVC gadget.
Queries sensor pixel format, resolution and frame rate via V4L2.
Uses poll() to wait for USB host streaming state.
Supports optional device path arguments (default /dev/video0, /dev/uvc0).
Supports configurable frame count (0=infinite).

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 examples/uvc_cam/CMakeLists.txt |  35 +++
 examples/uvc_cam/Kconfig        |  32 +++
 examples/uvc_cam/Make.defs      |  25 ++
 examples/uvc_cam/Makefile       |  34 +++
 examples/uvc_cam/uvc_cam_main.c | 482 ++++++++++++++++++++++++++++++++
 5 files changed, 608 insertions(+)
 create mode 100644 examples/uvc_cam/CMakeLists.txt
 create mode 100644 examples/uvc_cam/Kconfig
 create mode 100644 examples/uvc_cam/Make.defs
 create mode 100644 examples/uvc_cam/Makefile
 create mode 100644 examples/uvc_cam/uvc_cam_main.c

diff --git a/examples/uvc_cam/CMakeLists.txt b/examples/uvc_cam/CMakeLists.txt
new file mode 100644
index 000000000..952fd3e4b
--- /dev/null
+++ b/examples/uvc_cam/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/examples/uvc_cam/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_UVC_CAM)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_UVC_CAM_PROGNAME}
+    PRIORITY
+    ${CONFIG_EXAMPLES_UVC_CAM_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_UVC_CAM_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_UVC_CAM}
+    SRCS
+    uvc_cam_main.c)
+endif()
diff --git a/examples/uvc_cam/Kconfig b/examples/uvc_cam/Kconfig
new file mode 100644
index 000000000..83e6ca52d
--- /dev/null
+++ b/examples/uvc_cam/Kconfig
@@ -0,0 +1,32 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_UVC_CAM
+	tristate "UVC Camera streaming example"
+	default n
+	depends on USBUVC && VIDEO
+	---help---
+		Captures frames from V4L2 camera and streams to USB host
+		via UVC gadget driver (/dev/uvc0).
+
+if EXAMPLES_UVC_CAM
+
+config EXAMPLES_UVC_CAM_PROGNAME
+	string "Program name"
+	default "uvc_cam"
+
+config EXAMPLES_UVC_CAM_PRIORITY
+	int "Task priority"
+	default 100
+
+config EXAMPLES_UVC_CAM_STACKSIZE
+	int "Stack size"
+	default 4096
+
+config EXAMPLES_UVC_CAM_NFRAMES
+	int "Number of frames (0=infinite)"
+	default 0
+
+endif
diff --git a/examples/uvc_cam/Make.defs b/examples/uvc_cam/Make.defs
new file mode 100644
index 000000000..8a5c46a47
--- /dev/null
+++ b/examples/uvc_cam/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/uvc_cam/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_UVC_CAM),)
+CONFIGURED_APPS += $(APPDIR)/examples/uvc_cam
+endif
diff --git a/examples/uvc_cam/Makefile b/examples/uvc_cam/Makefile
new file mode 100644
index 000000000..409bc2494
--- /dev/null
+++ b/examples/uvc_cam/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/examples/uvc_cam/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# UVC Camera streaming application
+
+PROGNAME  = $(CONFIG_EXAMPLES_UVC_CAM_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_UVC_CAM_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_UVC_CAM_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_UVC_CAM)
+
+MAINSRC = uvc_cam_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/uvc_cam/uvc_cam_main.c b/examples/uvc_cam/uvc_cam_main.c
new file mode 100644
index 000000000..a47d97e84
--- /dev/null
+++ b/examples/uvc_cam/uvc_cam_main.c
@@ -0,0 +1,482 @@
+/****************************************************************************
+ * apps/examples/uvc_cam/uvc_cam_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * USB Video Class camera streaming application.
+ * Captures frames from V4L2 camera and streams to /dev/uvc0.
+ *
+ * Queries the sensor's native pixel format, resolution and frame rate
+ * via V4L2, then streams frames to the UVC gadget.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <unistd.h>
+#include <sys/boardctl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include <nuttx/video/video.h>
+#include <nuttx/video/v4l2_cap.h>
+#include <nuttx/usb/uvc.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define UVC_DEV_DEFAULT  "/dev/uvc0"
+#define VIDEO_DEV_DEFAULT "/dev/video0"
+
+#ifndef CONFIG_EXAMPLES_UVC_CAM_NFRAMES
+#  define CONFIG_EXAMPLES_UVC_CAM_NFRAMES 0  /* 0 = infinite */
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: pixfmt_to_bpp
+ *
+ * Description:
+ *   Return bytes-per-pixel for common V4L2 pixel formats.
+ *
+ ****************************************************************************/
+
+static int pixfmt_to_bpp(uint32_t pixfmt)
+{
+  switch (pixfmt)
+    {
+      case V4L2_PIX_FMT_YUYV:
+      case V4L2_PIX_FMT_RGB565:
+        return 2;
+      case V4L2_PIX_FMT_RGB24:
+        return 3;
+      default:
+        return 0;
+    }
+}
+
+/****************************************************************************
+ * Name: camera_init
+ *
+ * Description:
+ *   Open and configure the V4L2 camera device.
+ *   Queries the sensor's native pixel format, resolution and frame rate
+ *   and returns them via output parameters.
+ *
+ ****************************************************************************/
+
+static int camera_init(int fd, FAR uint32_t *pixfmt, FAR uint16_t *width,
+                       FAR uint16_t *height, FAR uint16_t *fps)
+{
+  struct v4l2_fmtdesc fmtdesc;
+  struct v4l2_frmivalenum frmival;
+  struct v4l2_frmsizeenum frmsize;
+  struct v4l2_format fmt;
+  struct v4l2_requestbuffers req;
+  int ret;
+
+  /* Query native pixel format from sensor */
+
+  memset(&fmtdesc, 0, sizeof(fmtdesc));
+  fmtdesc.index = 0;
+  fmtdesc.type  = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+  ret = ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc);
+  if (ret < 0)
+    {
+      printf("VIDIOC_ENUM_FMT failed: %d\n", errno);
+      return -errno;
+    }
+
+  printf("Sensor format: %.4s\n", (FAR const char *)&fmtdesc.pixelformat);
+
+  /* Query native resolution from sensor */
+
+  memset(&frmsize, 0, sizeof(frmsize));
+  frmsize.index        = 0;
+  frmsize.buf_type     = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  frmsize.pixel_format = fmtdesc.pixelformat;
+
+  ret = ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frmsize);
+  if (ret < 0)
+    {
+      printf("VIDIOC_ENUM_FRAMESIZES failed: %d\n", errno);
+      return -errno;
+    }
+
+  printf("Sensor native: %dx%d\n",
+         frmsize.discrete.width, frmsize.discrete.height);
+
+  /* Set format — capture at native resolution */
+
+  memset(&fmt, 0, sizeof(fmt));
+  fmt.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  fmt.fmt.pix.width       = frmsize.discrete.width;
+  fmt.fmt.pix.height      = frmsize.discrete.height;
+  fmt.fmt.pix.field       = V4L2_FIELD_ANY;
+  fmt.fmt.pix.pixelformat = fmtdesc.pixelformat;
+
+  ret = ioctl(fd, VIDIOC_S_FMT, &fmt);
+  if (ret < 0)
+    {
+      printf("VIDIOC_S_FMT failed: %d\n", errno);
+      return -errno;
+    }
+
+  /* Request buffers — match camcap: USERPTR + FIFO */
+
+  memset(&req, 0, sizeof(req));
+  req.count  = 1;
+  req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  req.memory = V4L2_MEMORY_USERPTR;
+  req.mode   = V4L2_BUF_MODE_FIFO;
+
+  ret = ioctl(fd, VIDIOC_REQBUFS, &req);
+  if (ret < 0)
+    {
+      printf("VIDIOC_REQBUFS failed: %d\n", errno);
+      return -errno;
+    }
+
+  /* NOTE: Do NOT call VIDIOC_STREAMON here.
+   * With USERPTR + FIFO mode, STREAMON would start DMA capture
+   * immediately using the container's uninitialized userptr (0),
+   * causing DMA to write 153KB of video data to address 0 and
+   * corrupt memory.  STREAMON must be called AFTER the first QBUF
+   * so that userptr points to a valid buffer.
+   */
+
+  /* Query frame interval from sensor */
+
+  memset(&frmival, 0, sizeof(frmival));
+  frmival.index        = 0;
+  frmival.buf_type     = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  frmival.pixel_format = fmtdesc.pixelformat;
+  frmival.width        = frmsize.discrete.width;
+  frmival.height       = frmsize.discrete.height;
+
+  ret = ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival);
+  if (ret < 0)
+    {
+      printf("VIDIOC_ENUM_FRAMEINTERVALS failed: %d\n", errno);
+      return -errno;
+    }
+
+  *pixfmt = fmtdesc.pixelformat;
+  *width  = frmsize.discrete.width;
+  *height = frmsize.discrete.height;
+  *fps    = frmival.discrete.numerator > 0
+          ? frmival.discrete.denominator / frmival.discrete.numerator
+          : 0;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: camera_capture_frame
+ *
+ * Description:
+ *   Capture one frame from V4L2 into the provided buffer.
+ *
+ ****************************************************************************/
+
+static int camera_capture_frame(int camfd, FAR uint8_t *buf, size_t buflen,
+                                bool do_streamon)
+{
+  struct v4l2_buffer vbuf;
+  int ret;
+
+  memset(&vbuf, 0, sizeof(vbuf));
+  vbuf.type      = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  vbuf.memory    = V4L2_MEMORY_USERPTR;
+  vbuf.index     = 0;
+  vbuf.m.userptr = (uintptr_t)buf;
+  vbuf.length    = buflen;
+
+  ret = ioctl(camfd, VIDIOC_QBUF, &vbuf);
+  if (ret < 0)
+    {
+      printf("VIDIOC_QBUF failed: %d\n", errno);
+      return -errno;
+    }
+
+  /* Start streaming after the first QBUF so DMA has a valid buffer */
+
+  if (do_streamon)
+    {
+      enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      ret = ioctl(camfd, VIDIOC_STREAMON, &type);
+      if (ret < 0)
+        {
+          printf("VIDIOC_STREAMON failed: %d\n", errno);
+          return -errno;
+        }
+    }
+
+  ret = ioctl(camfd, VIDIOC_DQBUF, &vbuf);
+  if (ret < 0)
+    {
+      printf("VIDIOC_DQBUF failed: %d\n", errno);
+      return -errno;
+    }
+
+  return vbuf.bytesused > 0 ? (int)vbuf.bytesused : (int)buflen;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct boardioc_usbdev_ctrl_s ctrl;
+  struct uvc_params_s uvc_params;
+  FAR void *uvc_handle = NULL;
+  FAR const char *video_dev = VIDEO_DEV_DEFAULT;
+  FAR const char *uvc_dev = UVC_DEV_DEFAULT;
+  FAR uint8_t *framebuf;
+  ssize_t written;
+  enum v4l2_buf_type cap_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  uint32_t pixfmt = 0;
+  uint16_t width = 0;
+  uint16_t height = 0;
+  uint16_t fps = 0;
+  uint32_t frame_size;
+  int bpp;
+  int camfd;
+  int uvcfd;
+  int nframes;
+  int count = 0;
+  int ret;
+
+  nframes = CONFIG_EXAMPLES_UVC_CAM_NFRAMES;
+  if (argc > 1)
+    {
+      nframes = atoi(argv[1]);
+    }
+
+  if (argc > 2)
+    {
+      video_dev = argv[2];
+    }
+
+  if (argc > 3)
+    {
+      uvc_dev = argv[3];
+    }
+
+  /* Create capture device */
+
+  ret = capture_initialize(video_dev);
+  if (ret < 0 && ret != -EEXIST)
+    {
+      printf("Failed to initialize capture: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  /* Open camera and query resolution */
+
+  camfd = open(video_dev, O_RDWR);
+  if (camfd < 0)
+    {
+      printf("Failed to open %s: %d\n", video_dev, errno);
+      return EXIT_FAILURE;
+    }
+
+  ret = camera_init(camfd, &pixfmt, &width, &height, &fps);
+  if (ret < 0)
+    {
+      printf("Camera init failed: %d\n", ret);
+      close(camfd);
+      return EXIT_FAILURE;
+    }
+
+  bpp = pixfmt_to_bpp(pixfmt);
+  if (bpp == 0)
+    {
+      printf("Unsupported pixel format: 0x%08lx\n",
+             (unsigned long)pixfmt);
+      close(camfd);
+      return EXIT_FAILURE;
+    }
+
+  frame_size = (uint32_t)width * height * bpp;
+  printf("UVC Camera: %dx%d %.4s @%dfps, frames=%d (0=infinite)\n",
+         width, height, (FAR const char *)&pixfmt, fps, nframes);
+
+  /* Allocate frame buffer — 32-byte aligned for DMA (same as camcap) */
+
+  framebuf = memalign(32, frame_size);
+  if (!framebuf)
+    {
+      printf("Failed to allocate frame buffer (%lu bytes)\n",
+             (unsigned long)frame_size);
+      close(camfd);
+      return EXIT_FAILURE;
+    }
+
+  /* Initialize and connect UVC gadget via boardctl.
+   * Pass video params queried from camera so USB descriptors
+   * match the actual sensor resolution.
+   */
+
+  uvc_params.width  = width;
+  uvc_params.height = height;
+  uvc_params.fps    = fps;
+
+  uvc_handle = (FAR void *)&uvc_params;
+#ifdef CONFIG_USBUVC_COMPOSITE
+  ctrl.usbdev   = BOARDIOC_USBDEV_COMPOSITE;
+#else
+  ctrl.usbdev   = BOARDIOC_USBDEV_UVC;
+#endif
+  ctrl.action   = BOARDIOC_USBDEV_CONNECT;
+  ctrl.instance = 0;
+  ctrl.config   = 0;
+  ctrl.handle   = &uvc_handle;
+
+  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
+
+  if (ret < 0)
+    {
+      printf("Failed to initialize UVC device: %d\n", ret);
+      close(camfd);
+      free(framebuf);
+      return EXIT_FAILURE;
+    }
+
+  /* Open UVC device */
+
+  uvcfd = open(uvc_dev, O_WRONLY);
+  if (uvcfd < 0)
+    {
+      printf("Failed to open %s: %d\n", uvc_dev, errno);
+      ctrl.action = BOARDIOC_USBDEV_DISCONNECT;
+      boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
+      close(camfd);
+      free(framebuf);
+      return EXIT_FAILURE;
+    }
+
+  /* Wait for USB host to enumerate and start streaming */
+
+  struct pollfd pfd;
+  pfd.fd     = uvcfd;
+  pfd.events = POLLOUT;
+
+  printf("Waiting for USB host to connect...\n");
+  while (poll(&pfd, 1, 500) <= 0 || !(pfd.revents & POLLOUT))
+    {
+    }
+
+  printf("Streaming started...\n");
+
+  /* Main capture-stream loop */
+
+  while (nframes == 0 || count < nframes)
+    {
+      ret = camera_capture_frame(camfd, framebuf, frame_size,
+                                 count == 0);
+      if (ret < 0)
+        {
+          printf("Capture failed: %d\n", ret);
+          break;
+        }
+
+      /* Write frame to UVC directly from framebuf.
+       * DMA won't touch framebuf until next QBUF.
+       */
+
+      written = 0;
+      while (written < (ssize_t)frame_size)
+        {
+          ret = write(uvcfd, framebuf + written,
+                      frame_size - written);
+          if (ret < 0)
+            {
+              if (errno == EAGAIN)
+                {
+                  /* Host stopped streaming - wait for reconnect.
+                   *
+                   * NOTE: The printf inside the loop is required
+                   * on boards where the USB-UART bridge (CH341)
+                   * and the ESP32-S3 OTG share an on-board USB
+                   * hub (e.g. lckfb-szpi).  Continuous UART TX
+                   * keeps the hub active and prevents the host
+                   * from power-cycling the hub port, which would
+                   * cause a full board POWERON reset.
+                   */
+
+                  printf("Host disconnected, waiting...\n");
+                  pfd.revents = 0;
+                  while (poll(&pfd, 1, 500) <= 0
+                         || !(pfd.revents & POLLOUT))
+                    {
+                      printf(".\n");
+                    }
+
+                  printf("Streaming restarted.\n");
+                  written = 0;
+                  break;
+                }
+
+              printf("UVC write failed: %d\n", errno);
+              goto out;
+            }
+
+          written += ret;
+        }
+
+      count++;
+      if ((count % 10) == 0)
+        {
+          printf("Streamed %d frames\n", count);
+        }
+    }
+
+  printf("Done. Streamed %d frames total.\n", count);
+
+out:
+  ioctl(camfd, VIDIOC_STREAMOFF, &cap_type);
+
+  close(uvcfd);
+  close(camfd);
+
+  /* Disconnect UVC gadget */
+
+  ctrl.action = BOARDIOC_USBDEV_DISCONNECT;
+  boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
+
+  free(framebuf);
+  return EXIT_SUCCESS;
+}

From b8718d8c5264ff0d4bcca033b93d9b1a9d0b1af6 Mon Sep 17 00:00:00 2001
From: simbit18 <simbit18@gmail.com>
Date: Wed, 1 Apr 2026 17:26:30 +0200
Subject: [PATCH 277/568] build.yml: Fix No files were found with the provided
 path

Fix

Warning: No files were found with the provided path: buildartifacts/.

Signed-off-by: simbit18 <simbit18@gmail.com>
---
 .github/workflows/build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fc106e7d6..f4f33fda9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -181,6 +181,8 @@ jobs:
           BLOBDIR: /tools/blobs
         with:
           run: |
+            export ARTIFACTDIR=`pwd`/buildartifacts
+
             pip install ntfc==0.0.1
             mkdir /github/workspace/nuttx-ntfc
             mkdir /github/workspace/nuttx-ntfc/external
@@ -188,10 +190,9 @@ jobs:
             # get NTFC test cases
             cd external
             git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
+            export NTFCDIR=/github/workspace/nuttx-ntfc
 
             echo "::add-matcher::sources/nuttx/.github/gcc.json"
-            export ARTIFACTDIR=`pwd`/buildartifacts
-            export NTFCDIR=/github/workspace/nuttx-ntfc
             git config --global --add safe.directory /github/workspace/sources/nuttx
             git config --global --add safe.directory /github/workspace/sources/apps
             cd /github/workspace/sources/nuttx/tools/ci

From 5c867b21e600d430c8c3336efa2ae2456d5357b9 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 16 Mar 2026 12:39:41 +0100
Subject: [PATCH 278/568] examples/nxscope: control stream interval from CLI

add the ability to control the stream interval from the CLI
which is useful for performance testing

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/nxscope/nxscope_main.c | 105 +++++++++++++++++++++++++++++---
 1 file changed, 97 insertions(+), 8 deletions(-)

diff --git a/examples/nxscope/nxscope_main.c b/examples/nxscope/nxscope_main.c
index 5d5102e99..afad9052b 100644
--- a/examples/nxscope/nxscope_main.c
+++ b/examples/nxscope/nxscope_main.c
@@ -29,15 +29,17 @@
 #include <sys/boardctl.h>
 
 #include <assert.h>
+#include <errno.h>
+#include <getopt.h>
 #include <pthread.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <math.h>
 
 #ifdef CONFIG_EXAMPLES_NXSCOPE_TIMER
 #  include <sys/ioctl.h>
 #  include <fcntl.h>
-#  include <stdlib.h>
 #  include <signal.h>
 #  include <nuttx/timers/timer.h>
 #endif
@@ -52,7 +54,8 @@
 #  error "math library must be selected for this example"
 #endif
 
-#define SIN_DT (0.01f)
+#define SIN_DT              (0.01f)
+#define STREAM_THREAD_USLEP 100
 
 /****************************************************************************
  * Private Types
@@ -61,6 +64,7 @@
 struct nxscope_thr_env_s
 {
   FAR struct nxscope_s *nxs;
+  int interval;
 };
 
 /****************************************************************************
@@ -93,12 +97,76 @@ static int nxscope_cb_start(FAR void *priv, bool start)
   return OK;
 }
 
+/****************************************************************************
+ * Name: nxscope_show_usage
+ ****************************************************************************/
+
+static void nxscope_show_usage(FAR const char *progname)
+{
+  printf("Usage: %s [-i <stream_interval_us>]\n", progname);
+  printf("          [-m <main_interval_us>]\n");
+}
+
+/****************************************************************************
+ * Name: nxscope_parse_args
+ ****************************************************************************/
+
+static int nxscope_parse_args(int argc, FAR char *argv[],
+                              FAR int *stream_interval,
+                              FAR int *main_interval)
+{
+  unsigned long value = 0;
+  int opt             = 0;
+
+  DEBUGASSERT(argv);
+  DEBUGASSERT(stream_interval);
+  DEBUGASSERT(main_interval);
+
+  while ((opt = getopt(argc, argv, "i:m:")) != -1)
+    {
+      switch (opt)
+        {
+          case 'i':
+            {
+              value = strtoul(optarg, NULL, 10);
+              if (value == 0)
+                {
+                  printf("ERROR: invalid interval: %s\n", optarg);
+                  return -EINVAL;
+                }
+
+              *stream_interval = (int)value;
+              break;
+            }
+
+          case 'm':
+            {
+              value = strtoul(optarg, NULL, 10);
+              if (value == 0)
+                {
+                  printf("ERROR: invalid interval: %s\n", optarg);
+                  return -EINVAL;
+                }
+
+              *main_interval = (int)value;
+              break;
+            }
+
+          default:
+            printf("ERROR: unsupported argument\n");
+            return -EINVAL;
+        }
+    }
+
+  return OK;
+}
+
 #ifdef CONFIG_EXAMPLES_NXSCOPE_TIMER
 /****************************************************************************
  * Name: nxscope_timer_init
  ****************************************************************************/
 
-static int nxscope_timer_init(void)
+static int nxscope_timer_init(int interval_us)
 {
   int                   fd = 0;
   int                   ret = 0;
@@ -116,8 +184,7 @@ static int nxscope_timer_init(void)
 
   /* Set the timer interval */
 
-  ret = ioctl(fd, TCIOC_SETTIMEOUT,
-              CONFIG_EXAMPLES_NXSCOPE_TIMER_INTERVAL);
+  ret = ioctl(fd, TCIOC_SETTIMEOUT, interval_us);
   if (ret < 0)
     {
       printf("ERROR: Failed to set the timer interval: %d\n", errno);
@@ -197,7 +264,7 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
 #ifdef CONFIG_EXAMPLES_NXSCOPE_TIMER
   /* Initialize timer for periodic signal. */
 
-  ret = nxscope_timer_init();
+  ret = nxscope_timer_init(envp->interval);
   if (ret < 0)
     {
       printf("ERROR: nxscope_timer_init() failed: %d\n", errno);
@@ -307,7 +374,7 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
           goto errout;
         }
 #else
-      usleep(100);
+      usleep(envp->interval);
 #endif
     }
 
@@ -421,6 +488,7 @@ int main(int argc, FAR char *argv[])
 {
   struct nxscope_s            nxs;
   int                         ret = OK;
+  int                         interval;
   pthread_t                   thread;
   struct nxscope_thr_env_s    env;
   struct nxscope_cfg_s        nxs_cfg;
@@ -438,6 +506,27 @@ int main(int argc, FAR char *argv[])
   struct nxscope_dummy_cfg_s  nxs_dummy_cfg;
 #endif
 
+  /* Default settings */
+
+  interval     = CONFIG_EXAMPLES_NXSCOPE_MAIN_INTERVAL;
+#ifdef CONFIG_EXAMPLES_NXSCOPE_TIMER
+  env.interval = CONFIG_EXAMPLES_NXSCOPE_TIMER_INTERVAL;
+#else
+  env.interval = STREAM_THREAD_USLEP;
+#endif
+
+  /* Parse args */
+
+  ret = nxscope_parse_args(argc, argv, &env.interval, &interval);
+  if (ret < 0)
+    {
+      nxscope_show_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  printf("stream interval = %d\n", env.interval);
+  printf("main interval = %d\n", interval);
+
 #ifndef CONFIG_NSH_ARCHINIT
   /* Perform architecture-specific initialization (if configured) */
 
@@ -736,7 +825,7 @@ int main(int argc, FAR char *argv[])
           printf("ERROR: nxscope_recv failed %d\n", ret);
         }
 
-      usleep(CONFIG_EXAMPLES_NXSCOPE_MAIN_INTERVAL);
+      usleep(interval);
     }
 
 errout:

From 231ac397a7fd01cdd2bac13b4ff9c57c7253c36e Mon Sep 17 00:00:00 2001
From: Shunchao Hu <ankohuu@gmail.com>
Date: Thu, 2 Apr 2026 15:27:57 +0800
Subject: [PATCH 279/568] canutils/lely-canopen: avoid patch reapply on
 repeated builds.

The patch step currently uses a phony target, so it is executed
again when the build is repeated in the same source tree. In that
case `patch -N` detects previously applied patches and returns 1,
which make treats as a failure.

Replace the phony patch target with a stamped `.patched` file so
the patch step is not re-run unnecessarily.

Fixes #3188

Signed-off-by: Shunchao Hu <ankohuu@gmail.com>
---
 canutils/lely-canopen/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/canutils/lely-canopen/Makefile b/canutils/lely-canopen/Makefile
index ca124b833..2304c1580 100644
--- a/canutils/lely-canopen/Makefile
+++ b/canutils/lely-canopen/Makefile
@@ -179,7 +179,7 @@ $(LELYCANOPEN_SRCNAME): $(LELYCANOPEN_TARBALL)
 	@echo "Unpacking: $(LELYCANOPEN_TARBALL) -> $(LELYCANOPEN_UNPACKNAME)"
 	$(Q) $(UNPACK) $(LELYCANOPEN_TARBALL)
 
-patch_src: $(LELYCANOPEN_SRCNAME)
+$(LELYCANOPEN_SRCNAME)/.patched : $(LELYCANOPEN_SRCNAME)
 	# Get the name of the directory created by the tar command
 	$(eval LELYCANOPEN_UNPACKNAME := $(shell ls -d lely-core-master*))
 	$(Q) mv $(LELYCANOPEN_UNPACKNAME) $(LELYCANOPEN_SRCNAME)
@@ -188,9 +188,10 @@ patch_src: $(LELYCANOPEN_SRCNAME)
 	$(Q) cat 0003-src-co-nmt.c-fix-compilation.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
 	$(Q) cat 0004-tools-coctl.c-add-missing-mutex-init.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
 	$(Q) cat 0005-add-NuttX-support.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
+	$(Q) touch $@
 	$(Q) echo "Patching $(LELYCANOPEN_SRCNAME)"
 
-context:: patch_src
+context:: $(LELYCANOPEN_SRCNAME)/.patched
 else
 context:: $(LELYCANOPEN_SRCNAME)
 endif

From 9db3e26c85484344f34bd3163136ad7136fe7d7d Mon Sep 17 00:00:00 2001
From: Lup Yuen Lee <luppy@appkaki.com>
Date: Wed, 8 Apr 2026 11:45:33 +0800
Subject: [PATCH 280/568] graphics/libyuv: Download libyuv from NuttX Mirror
 Repo

NuttX Build Target `sim:nxcamera` failed to build because chromium.googlesource.com is blocking our download of libyuv library: https://github.com/apache/nuttx/actions/runs/24106742084/job/70356374433#step:10:603

```
Configuration/Tool: sim/nxcamera
Building NuttX...
curl -L https://chromium.googlesource.com/libyuv/libyuv/+archive/refs/heads/stable.tar.gz -o libyuv.tar.gz
gzip: stdin: not in gzip format
```

This PR updates the libyuv Makefile to download libyuv from the NuttX Mirror Repo instead: https://github.com/NuttX/nuttx/releases/tag/libyuv

Signed-off-by: Lup Yuen Lee <luppy@appkaki.com>
---
 graphics/libyuv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/libyuv/Makefile b/graphics/libyuv/Makefile
index d15033fd1..e4421ee1d 100644
--- a/graphics/libyuv/Makefile
+++ b/graphics/libyuv/Makefile
@@ -29,7 +29,7 @@ CXXFLAGS += -Wno-shadow -Wno-undef
 CXXSRCS = $(wildcard $(SRCDIR)/source/*.cc)
 
 libyuv.tar.gz:
-	$(Q) curl -L https://chromium.googlesource.com/libyuv/libyuv/+archive/refs/heads/$(CONFIG_LIBYUV_BRANCH).tar.gz -o libyuv.tar.gz
+	$(Q) curl -L https://github.com/NuttX/nuttx/releases/download/libyuv/libyuv-refs_heads_$(CONFIG_LIBYUV_BRANCH).tar.gz -o libyuv.tar.gz
 	$(Q) mkdir -p $(SRCDIR)
 	$(Q) tar zxf libyuv.tar.gz --directory $(SRCDIR)
 ifeq ($(CONFIG_LIBYUV_BRANCH),"stable")

From a6286ee0ea746a135fd769bdd94d3e35dcbf7d04 Mon Sep 17 00:00:00 2001
From: liuhongchao <liuhongchao@xiaomi.com>
Date: Fri, 28 Mar 2025 14:59:52 +0800
Subject: [PATCH 281/568] graphics/input: Add getevent input event monitor
 tool.

Add getevent utility for monitoring input events including
mouse clicks/movement, multi-touch coordinates/pressure,
and keyboard key presses. Supports automatic device detection
in /dev and command-line device path specification with
non-blocking I/O.

Signed-off-by: liuhongchao <liuhongchao@xiaomi.com>
---
 graphics/input/CMakeLists.txt      |  14 +
 graphics/input/Kconfig             |  36 ++
 graphics/input/Make.defs           |   2 +-
 graphics/input/Makefile            |  12 +
 graphics/input/getevent/getevent.c | 562 +++++++++++++++++++++++++++++
 5 files changed, 625 insertions(+), 1 deletion(-)
 create mode 100644 graphics/input/getevent/getevent.c

diff --git a/graphics/input/CMakeLists.txt b/graphics/input/CMakeLists.txt
index 2ec8eb86f..8213d364a 100644
--- a/graphics/input/CMakeLists.txt
+++ b/graphics/input/CMakeLists.txt
@@ -62,3 +62,17 @@ if(CONFIG_GRAPHICS_INPUT_TOOL)
     SRCS
     generator/input.c)
 endif()
+
+if(CONFIG_GRAPHICS_INPUT_GETEVENT)
+  nuttx_add_application(
+    MODULE
+    ${CONFIG_GRAPHICS_INPUT_GETEVENT}
+    NAME
+    getevent
+    STACKSIZE
+    ${CONFIG_GRAPHICS_INPUT_GETEVENT_STACKSIZE}
+    PRIORITY
+    ${CONFIG_GRAPHICS_INPUT_GETEVENT_PRIORITY}
+    SRCS
+    getevent/getevent.c)
+endif()
diff --git a/graphics/input/Kconfig b/graphics/input/Kconfig
index 08430e8d8..7cda0c370 100644
--- a/graphics/input/Kconfig
+++ b/graphics/input/Kconfig
@@ -59,3 +59,39 @@ config GRAPHICS_INPUT_TOOL_PRIORITY
 		The priority of the input task.
 
 endif # GRAPHICS_INPUT_TOOL
+
+menuconfig GRAPHICS_INPUT_GETEVENT
+	tristate "Enable getevent tool"
+	default n
+	---help---
+		The getevent is a command-line input event monitor. It
+		captures and displays real-time events from mouse,
+		touchscreen, and keyboard devices via the input subsystem.
+
+		Use getevent to debug and verify input drivers, inspect
+		raw event data during device bring-up, or diagnose
+		input issues on a running system. It supports automatic
+		device detection in /dev as well as manual device path
+		specification.
+
+if GRAPHICS_INPUT_GETEVENT
+
+config GRAPHICS_INPUT_GETEVENT_STACKSIZE
+	int "getevent stack size"
+	default DEFAULT_TASK_STACKSIZE
+	---help---
+		The size of stack allocated for the getevent task.
+
+config GRAPHICS_INPUT_GETEVENT_PRIORITY
+	int "getevent priority"
+	default 100
+	---help---
+		The priority of the getevent task.
+
+config GRAPHICS_INPUT_GETEVENT_DETAIL_INFO
+	bool "getevent detail info"
+	default n
+	---help---
+		Enable detailed information in getevent output.
+
+endif # GRAPHICS_INPUT_GETEVENT
diff --git a/graphics/input/Make.defs b/graphics/input/Make.defs
index 8bf4cb9c1..5931c7950 100644
--- a/graphics/input/Make.defs
+++ b/graphics/input/Make.defs
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_GRAPHICS_INPUT_GENERATOR),)
+ifneq ($(CONFIG_GRAPHICS_INPUT_GENERATOR)$(CONFIG_GRAPHICS_INPUT_GETEVENT),)
 CONFIGURED_APPS += $(APPDIR)/graphics/input
 endif
diff --git a/graphics/input/Makefile b/graphics/input/Makefile
index b88166a09..e0a974b51 100644
--- a/graphics/input/Makefile
+++ b/graphics/input/Makefile
@@ -50,4 +50,16 @@ MODULE    += $(CONFIG_GRAPHICS_INPUT_TOOL)
 MAINSRC   += generator/input.c
 endif
 
+# getevent tool
+
+ifneq ($(CONFIG_GRAPHICS_INPUT_GETEVENT),)
+PROGNAME  += getevent
+PRIORITY  += $(CONFIG_GRAPHICS_INPUT_GETEVENT_PRIORITY)
+STACKSIZE += $(CONFIG_GRAPHICS_INPUT_GETEVENT_STACKSIZE)
+MODULE    += $(CONFIG_GRAPHICS_INPUT_GETEVENT)
+
+MAINSRC   += getevent/getevent.c
+CFLAGS    += -Wno-discarded-qualifiers
+endif
+
 include $(APPDIR)/Application.mk
diff --git a/graphics/input/getevent/getevent.c b/graphics/input/getevent/getevent.c
new file mode 100644
index 000000000..c70f90d47
--- /dev/null
+++ b/graphics/input/getevent/getevent.c
@@ -0,0 +1,562 @@
+/****************************************************************************
+ * apps/graphics/input/getevent/getevent.c
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <dirent.h>
+
+#include <nuttx/input/keyboard.h>
+#include <nuttx/input/mouse.h>
+#include <nuttx/input/touchscreen.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define GETEVENT_INFO(format, ...) \
+  printf("[getevent]: " format, ##__VA_ARGS__)
+
+#define GETEVENT_ERR(format, ...) \
+  fprintf(stderr, "[getevent]: " format, ##__VA_ARGS__)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct input_device_s;
+
+typedef CODE int  (*input_init_cb)(FAR struct input_device_s *);
+typedef CODE void (*input_read_cb)(FAR struct input_device_s *);
+
+struct touch_priv_s
+{
+  uint8_t maxpoint;
+  struct touch_sample_s sample[];
+};
+
+struct input_device_s
+{
+  int fd;
+  input_init_cb init_cb;
+  input_read_cb read_cb;
+  FAR void *priv;
+  FAR struct input_device_s *next;
+  char path[];
+};
+
+struct input_devices_ctx_s
+{
+  FAR struct input_device_s *head;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: open_device
+ ****************************************************************************/
+
+static int open_device(FAR struct input_device_s *dev)
+{
+  GETEVENT_INFO("opening %s\n", dev->path);
+  dev->fd = open(dev->path, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
+
+  if (dev->fd < 0)
+    {
+      GETEVENT_ERR("open %s failed, errno: %d\n", dev->path, errno);
+      return -errno;
+    }
+
+  if (dev->init_cb)
+    {
+      return dev->init_cb(dev);
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: touch_init
+ ****************************************************************************/
+
+static int touch_init(FAR struct input_device_s *dev)
+{
+  FAR struct touch_priv_s *priv;
+  uint8_t maxpoint;
+  int ret;
+
+  ret = ioctl(dev->fd, TSIOC_GETMAXPOINTS, &maxpoint);
+  if (ret < 0)
+    {
+      GETEVENT_ERR("ioctl GETMAXPOINTS failed: %d, "
+                   "errno: %d\n", ret, errno);
+      return -errno;
+    }
+
+  priv = calloc(1, sizeof(struct touch_priv_s) +
+                SIZEOF_TOUCH_SAMPLE_S(maxpoint));
+  if (!priv)
+    {
+      GETEVENT_ERR("Memory allocation failed for touch_priv_s\n");
+      return -ENOMEM;
+    }
+
+  priv->maxpoint = maxpoint;
+  dev->priv = priv;
+  GETEVENT_INFO("ioctl TSIOC_GETMAXPOINTS: %d\n", maxpoint);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: read_mouse_event
+ ****************************************************************************/
+
+static void read_mouse_event(FAR struct input_device_s *dev)
+{
+  struct mouse_report_s sample;
+  ssize_t nbytes;
+
+  /* Read one sample */
+
+  nbytes = read(dev->fd, &sample, sizeof(struct mouse_report_s));
+
+  /* Print the sample data on successful return */
+
+  if (nbytes == sizeof(struct mouse_report_s))
+    {
+      GETEVENT_INFO("mouse event: %s\n", dev->path);
+      GETEVENT_INFO("   buttons : %02" PRIx8 "\n", sample.buttons);
+      GETEVENT_INFO("         x : %d\n", sample.x);
+      GETEVENT_INFO("         y : %d\n", sample.y);
+#ifdef CONFIG_INPUT_MOUSE_WHEEL
+      GETEVENT_INFO("     wheel : %d\n", sample.wheel);
+#endif
+    }
+}
+
+/****************************************************************************
+ * Name: read_touch_event
+ ****************************************************************************/
+
+static void read_touch_event(FAR struct input_device_s *dev)
+{
+  FAR struct touch_priv_s *priv = (FAR struct touch_priv_s *)dev->priv;
+  ssize_t nbytes;
+  size_t i;
+
+  /* Read one sample */
+
+  nbytes = read(dev->fd, priv->sample,
+                SIZEOF_TOUCH_SAMPLE_S(priv->maxpoint));
+
+  /* Print the sample data on successful return */
+
+  if (nbytes == SIZEOF_TOUCH_SAMPLE_S(priv->maxpoint))
+    {
+      GETEVENT_INFO("touch event: %s\n", dev->path);
+      GETEVENT_INFO("   npoints : %" PRId32 "\n", priv->sample->npoints);
+      for (i = 0; i < priv->maxpoint; i++)
+        {
+          if (priv->sample->point[i].flags == 0)
+            {
+              break;
+            }
+
+          GETEVENT_INFO("Point      : %d\n", priv->sample->point[i].id);
+          GETEVENT_INFO("     flags : %02x\n", priv->sample->point[i].flags);
+          GETEVENT_INFO("         x : %d\n", priv->sample->point[i].x);
+          GETEVENT_INFO("         y : %d\n", priv->sample->point[i].y);
+#ifdef CONFIG_GRAPHICS_INPUT_GETEVENT_DETAIL_INFO
+          GETEVENT_INFO("         h : %d\n", priv->sample->point[i].h);
+          GETEVENT_INFO("         w : %d\n", priv->sample->point[i].w);
+          GETEVENT_INFO("  pressure : %d\n",
+                        priv->sample->point[i].pressure);
+#endif
+          GETEVENT_INFO(" timestamp : %" PRIu64"\n",
+                        priv->sample->point[i].timestamp);
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: read_keyboard_event
+ ****************************************************************************/
+
+static void read_keyboard_event(FAR struct input_device_s *dev)
+{
+  struct keyboard_event_s sample;
+  ssize_t nbytes;
+
+  /* Read one sample */
+
+  nbytes = read(dev->fd, &sample, sizeof(struct keyboard_event_s));
+
+  /* Print the sample data on successful return */
+
+  if (nbytes == sizeof(struct keyboard_event_s))
+    {
+      GETEVENT_INFO("keyboard event: %s\n", dev->path);
+      GETEVENT_INFO("         type : %" PRIu32 "\n", sample.type);
+      GETEVENT_INFO("         code : %" PRIu32 "\n", sample.code);
+    }
+}
+
+/****************************************************************************
+ * Name: cleanup_input_devices
+ ****************************************************************************/
+
+static void cleanup_input_devices(FAR struct input_devices_ctx_s *ctx)
+{
+  FAR struct input_device_s *dev = ctx->head;
+  FAR struct input_device_s *next;
+
+  while (dev)
+    {
+      next = dev->next;
+      if (dev->fd >= 0)
+        {
+          close(dev->fd);
+        }
+
+      free(dev->priv);
+      free(dev);
+      dev = next;
+    }
+
+  ctx->head = NULL;
+}
+
+/****************************************************************************
+ * Name: signal_handler
+ ****************************************************************************/
+
+static void
+signal_handler(int signum, FAR siginfo_t *info, FAR void *context)
+{
+  FAR volatile sig_atomic_t *running = info->si_user;
+  *running = 0;
+}
+
+/****************************************************************************
+ * Name: run_event_loop
+ ****************************************************************************/
+
+static void run_event_loop(FAR struct input_devices_ctx_s *ctx)
+{
+  FAR struct input_device_s *dev;
+  FAR struct pollfd *fds = NULL;
+  volatile sig_atomic_t running = 1;
+  struct sigaction sa;
+  int fd_count = 0;
+  int timeout = 500;
+  int i = 0;
+  int ret;
+
+  sa.sa_flags = SA_SIGINFO;
+  sa.sa_sigaction = signal_handler;
+  sigemptyset(&sa.sa_mask);
+  sa.sa_user = (FAR void *)&running;
+  sigaction(SIGINT, &sa, NULL);
+
+  for (dev = ctx->head; dev; dev = dev->next)
+    {
+      if (dev->fd >= 0)
+        {
+          fd_count++;
+        }
+    }
+
+  fds = calloc(fd_count, sizeof(struct pollfd));
+
+  if (!fds)
+    {
+      GETEVENT_ERR("Memory allocation failed for fds\n");
+      return;
+    }
+
+  for (dev = ctx->head; dev; dev = dev->next)
+    {
+      if (dev->fd >= 0)
+        {
+          fds[i].fd = dev->fd;
+          fds[i].events = POLLIN;
+          fds[i].revents = 0;
+          i++;
+        }
+    }
+
+  while (running)
+    {
+      ret = poll(fds, fd_count, timeout);
+      if (ret < 0 && errno != EINTR)
+        {
+          GETEVENT_ERR("poll error: %d\n", errno);
+          break;
+        }
+
+      for (i = 0; i < fd_count; i++)
+        {
+          if (!(fds[i].revents & POLLIN))
+            {
+              continue;
+            }
+
+          for (dev = ctx->head; dev; dev = dev->next)
+            {
+              if (dev->fd == fds[i].fd)
+                {
+                  dev->read_cb(dev);
+                  break;
+                }
+            }
+        }
+    }
+
+  free(fds);
+}
+
+/****************************************************************************
+ * Name: show_usage
+ ****************************************************************************/
+
+static void show_usage(void)
+{
+  printf("Usage: getevent [OPTIONS]\n");
+  printf("Options:\n");
+  printf(" -h                Show this help message\n");
+  printf(" -m /dev/mouse    -- mouse device path\n");
+  printf(" -t /dev/input    -- touch device path\n");
+  printf(" -k /dev/keyboard -- keyboard device path\n");
+  printf("No options: Auto detect devices in /dev\n");
+}
+
+/****************************************************************************
+ * Name: alloc_input_device
+ ****************************************************************************/
+
+static FAR struct input_device_s *
+alloc_input_device(FAR struct input_devices_ctx_s *ctx,
+                   FAR const char *path)
+{
+  FAR struct input_device_s *dev;
+  FAR struct input_device_s *cur;
+  size_t path_len = strlen(path) + 1;
+
+  dev = calloc(1, sizeof(struct input_device_s) + path_len);
+  if (!dev)
+    {
+      GETEVENT_ERR("Memory allocation failed for device\n");
+      return NULL;
+    }
+
+  memcpy(dev->path, path, path_len);
+
+  if (!ctx->head)
+    {
+      ctx->head = dev;
+    }
+  else
+    {
+      cur = ctx->head;
+      while (cur->next)
+        {
+          cur = cur->next;
+        }
+
+      cur->next = dev;
+    }
+
+  return dev;
+}
+
+/****************************************************************************
+ * Name: add_input_device
+ ****************************************************************************/
+
+static int add_input_device(FAR struct input_devices_ctx_s *ctx,
+                            input_init_cb init_cb,
+                            input_read_cb read_cb,
+                            FAR const char *path)
+{
+  FAR struct input_device_s *dev = alloc_input_device(ctx, path);
+
+  if (!dev)
+    {
+      return -ENOMEM;
+    }
+
+  dev->fd = -1;
+  dev->init_cb = init_cb;
+  dev->read_cb = read_cb;
+
+  return open_device(dev);
+}
+
+/****************************************************************************
+ * Name: detect_devices
+ ****************************************************************************/
+
+static int detect_devices(FAR struct input_devices_ctx_s *ctx)
+{
+  FAR struct dirent *entry;
+  char path[PATH_MAX];
+  FAR DIR *dir;
+  int ret = 0;
+
+  dir = opendir("/dev");
+  if (!dir)
+    {
+      GETEVENT_ERR("Failed to open /dev directory, errno: %d\n", errno);
+      return -errno;
+    }
+
+  while ((entry = readdir(dir)))
+    {
+      if (entry->d_type == DT_CHR)
+        {
+          if (snprintf(path, sizeof(path), "/dev/%s", entry->d_name) < 0)
+            {
+              GETEVENT_ERR("Memory allocation failed for path\n");
+              continue;
+            }
+
+          if (strncmp(entry->d_name, "mouse", 5) == 0)
+            {
+              ret = add_input_device(ctx, NULL, read_mouse_event, path);
+            }
+          else if (strncmp(entry->d_name, "input", 5) == 0)
+            {
+              ret = add_input_device(ctx, touch_init, read_touch_event,
+                                     path);
+            }
+          else if (strncmp(entry->d_name, "kbd", 3) == 0)
+            {
+              ret = add_input_device(ctx, NULL, read_keyboard_event, path);
+            }
+
+          if (ret < 0)
+            {
+              break;
+            }
+        }
+    }
+
+  closedir(dir);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: parse_commandline
+ ****************************************************************************/
+
+static int parse_commandline(FAR struct input_devices_ctx_s *ctx,
+                             int argc, FAR char **argv)
+{
+  int ret = -EINVAL;
+  int ch;
+
+  if (argc == 1)
+    {
+      return detect_devices(ctx);
+    }
+
+  while ((ch = getopt(argc, argv, "hn:m:t:k:")) != -1)
+    {
+      switch (ch)
+        {
+        case 'm':
+          ret = add_input_device(ctx, NULL, read_mouse_event, optarg);
+          break;
+        case 't':
+          ret = add_input_device(ctx, touch_init, read_touch_event, optarg);
+          break;
+        case 'k':
+          ret = add_input_device(ctx, NULL, read_keyboard_event, optarg);
+          break;
+        case '?':
+        case 'h':
+        default:
+          show_usage();
+          break;
+        }
+
+      if (ret < 0)
+        {
+          break;
+        }
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct input_devices_ctx_s ctx;
+  int ret;
+
+  memset(&ctx, 0, sizeof(ctx));
+
+  /* Parse the command line arguments */
+
+  ret = parse_commandline(&ctx, argc, argv);
+  if (ret < 0)
+    {
+      goto cleanup;
+    }
+
+  /* Start event loop for input processing */
+
+  run_event_loop(&ctx);
+
+  /* Clean up resources */
+
+cleanup:
+  cleanup_input_devices(&ctx);
+
+  GETEVENT_INFO("Terminating!\n");
+
+  return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}

From 52b36deb13a30c8cbeb4be9b82d030b9bc87bf9a Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 2 Apr 2026 10:51:02 +0800
Subject: [PATCH 282/568] examples/camera: use MMAP with USERPTR fallback and
 fix NX stride

Use MMAP buffer allocation by default so the driver can manage
DMA-capable memory with proper alignment and cache attributes.
Fall back to USERPTR if the driver does not support MMAP.

Also fix NX framebuffer stride calculation to use the actual
display width instead of hardcoded values.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 examples/camera/camera_bkgd.c |  15 +++--
 examples/camera/camera_main.c | 114 ++++++++++++++++++++++++----------
 2 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/examples/camera/camera_bkgd.c b/examples/camera/camera_bkgd.c
index aa1464471..e53010dad 100644
--- a/examples/camera/camera_bkgd.c
+++ b/examples/camera/camera_bkgd.c
@@ -307,21 +307,28 @@ void nximage_draw(FAR void *image, int w, int h)
   FAR struct nxgl_rect_s dest;
   FAR const void *src[CONFIG_NX_NPLANES];
   int ret;
+  int dest_w;
+  int dest_h;
 
   origin.x = 0;
   origin.y = 0;
 
-  /* Set up the destination to whole LCD screen */
+  /* Clip destination to the smaller of image size and screen size */
+
+  dest_w = w < g_nximage.xres ? w : g_nximage.xres;
+  dest_h = h < g_nximage.yres ? h : g_nximage.yres;
 
   dest.pt1.x = 0;
   dest.pt1.y = 0;
-  dest.pt2.x = g_nximage.xres - 1;
-  dest.pt2.y = g_nximage.yres - 1;
+  dest.pt2.x = dest_w - 1;
+  dest.pt2.y = dest_h - 1;
 
   src[0] = image;
 
+  /* stride must match the source image width, not the screen width */
+
   ret = nx_bitmap(g_nximage.hbkgd, &dest, src, &origin,
-                  g_nximage.xres * sizeof(nxgl_mxpixel_t));
+                  w * sizeof(nxgl_mxpixel_t));
   if (ret < 0)
     {
       printf("nximage_image: nx_bitmap failed: %d\n", errno);
diff --git a/examples/camera/camera_main.c b/examples/camera/camera_main.c
index a342008b5..10bcda47e 100644
--- a/examples/camera/camera_main.c
+++ b/examples/camera/camera_main.c
@@ -84,13 +84,14 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
                           uint32_t buf_mode, uint32_t pixformat,
                           uint16_t hsize, uint16_t vsize,
                           FAR struct v_buffer **vbuf,
-                          uint8_t buffernum, int buffersize);
+                          uint8_t buffernum, int buffersize,
+                          FAR uint32_t *memory);
 static void free_buffer(FAR struct v_buffer *buffers, uint8_t bufnum);
 static int parse_arguments(int argc, FAR char *argv[],
                            FAR int *capture_num,
                            FAR enum v4l2_buf_type *type);
 static int get_camimage(int fd, FAR struct v4l2_buffer *v4l2_buf,
-                        enum v4l2_buf_type buf_type);
+                        enum v4l2_buf_type buf_type, uint32_t memory);
 static int release_camimage(int fd, FAR struct v4l2_buffer *v4l2_buf);
 static int start_stillcapture(int v_fd, enum v4l2_buf_type capture_type);
 static int stop_stillcapture(int v_fd, enum v4l2_buf_type capture_type);
@@ -119,7 +120,8 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
                           uint32_t buf_mode, uint32_t pixformat,
                           uint16_t hsize, uint16_t vsize,
                           FAR struct v_buffer **vbuf,
-                          uint8_t buffernum, int buffersize)
+                          uint8_t buffernum, int buffersize,
+                          FAR uint32_t *memory)
 {
   int ret;
   int cnt;
@@ -153,21 +155,30 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
       return ret;
     }
 
-  /* VIDIOC_REQBUFS initiate user pointer I/O */
+  /* VIDIOC_REQBUFS: try MMAP first (driver-managed DMA buffers).
+   * Fall back to USERPTR if the driver does not support MMAP.
+   */
 
   req.type   = type;
-  req.memory = V4L2_MEMORY_USERPTR;
+  req.memory = V4L2_MEMORY_MMAP;
   req.count  = buffernum;
   req.mode   = buf_mode;
 
   ret = ioctl(fd, VIDIOC_REQBUFS, (uintptr_t)&req);
   if (ret < 0)
     {
-      printf("Failed to VIDIOC_REQBUFS: errno = %d\n", errno);
-      return ret;
+      req.memory = V4L2_MEMORY_USERPTR;
+      ret = ioctl(fd, VIDIOC_REQBUFS, (uintptr_t)&req);
+      if (ret < 0)
+        {
+          printf("Failed to VIDIOC_REQBUFS: errno = %d\n", errno);
+          return ret;
+        }
     }
 
-  /* Prepare video memory to store images */
+  *memory = req.memory;
+
+  /* Prepare v_buffer array to track buffer metadata */
 
   *vbuf = malloc(sizeof(v_buffer_t) * buffernum);
   if (!(*vbuf))
@@ -178,29 +189,54 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
 
   for (cnt = 0; cnt < buffernum; cnt++)
     {
-      (*vbuf)[cnt].length = buffersize;
-
-      /* Note:
-       * VIDIOC_QBUF set buffer pointer.
-       * Buffer pointer must be 32bytes aligned.
-       */
-
-      (*vbuf)[cnt].start = memalign(32, buffersize);
-      if (!(*vbuf)[cnt].start)
+      if (req.memory == V4L2_MEMORY_MMAP)
         {
-          printf("Out of memory for image buffer of %d/%d\n",
-                 cnt, buffernum);
+          /* VIDIOC_QUERYBUF: get driver-allocated buffer metadata */
 
-          /* Release allocated memory. */
+          memset(&buf, 0, sizeof(v4l2_buffer_t));
+          buf.type   = type;
+          buf.memory = V4L2_MEMORY_MMAP;
+          buf.index  = cnt;
 
-          while (cnt--)
+          ret = ioctl(fd, VIDIOC_QUERYBUF, (uintptr_t)&buf);
+          if (ret < 0)
             {
-              free((*vbuf)[cnt].start);
+              printf("Failed to VIDIOC_QUERYBUF %d: errno = %d\n",
+                     cnt, errno);
+              free(*vbuf);
+              *vbuf = NULL;
+              return ret;
             }
 
-          free(*vbuf);
-          *vbuf = NULL;
-          return ERROR;
+          (*vbuf)[cnt].start  = NULL;
+          (*vbuf)[cnt].length = buf.length;
+        }
+      else
+        {
+          (*vbuf)[cnt].length = buffersize;
+
+          /* Note:
+           * VIDIOC_QBUF set buffer pointer.
+           * Buffer pointer must be 32bytes aligned.
+           */
+
+          (*vbuf)[cnt].start = memalign(32, buffersize);
+          if (!(*vbuf)[cnt].start)
+            {
+              printf("Out of memory for image buffer of %d/%d\n",
+                     cnt, buffernum);
+
+              /* Release allocated memory. */
+
+              while (cnt--)
+                {
+                  free((*vbuf)[cnt].start);
+                }
+
+              free(*vbuf);
+              *vbuf = NULL;
+              return ERROR;
+            }
         }
     }
 
@@ -210,11 +246,15 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
     {
       memset(&buf, 0, sizeof(v4l2_buffer_t));
       buf.type = type;
-      buf.memory = V4L2_MEMORY_USERPTR;
+      buf.memory = req.memory;
       buf.index = cnt;
-      buf.m.userptr = (uintptr_t)(*vbuf)[cnt].start;
       buf.length = (*vbuf)[cnt].length;
 
+      if (req.memory == V4L2_MEMORY_USERPTR)
+        {
+          buf.m.userptr = (uintptr_t)(*vbuf)[cnt].start;
+        }
+
       ret = ioctl(fd, VIDIOC_QBUF, (uintptr_t)&buf);
       if (ret)
         {
@@ -336,7 +376,7 @@ static int parse_arguments(int argc, FAR char *argv[],
  ****************************************************************************/
 
 static int get_camimage(int fd, FAR struct v4l2_buffer *v4l2_buf,
-                        enum v4l2_buf_type buf_type)
+                        enum v4l2_buf_type buf_type, uint32_t memory)
 {
   int ret;
 
@@ -344,7 +384,7 @@ static int get_camimage(int fd, FAR struct v4l2_buffer *v4l2_buf,
 
   memset(v4l2_buf, 0, sizeof(v4l2_buffer_t));
   v4l2_buf->type = buf_type;
-  v4l2_buf->memory = V4L2_MEMORY_USERPTR;
+  v4l2_buf->memory = memory;
 
   ret = ioctl(fd, VIDIOC_DQBUF, (uintptr_t)v4l2_buf);
   if (ret)
@@ -476,6 +516,8 @@ int main(int argc, FAR char *argv[])
 
   FAR struct v_buffer *buffers_video = NULL;
   FAR struct v_buffer *buffers_still = NULL;
+  uint32_t video_memory = V4L2_MEMORY_USERPTR;
+  uint32_t still_memory = V4L2_MEMORY_USERPTR;
 
   /* =====  Parse and Check arguments  ===== */
 
@@ -564,7 +606,8 @@ int main(int argc, FAR char *argv[])
       ret = camera_prepare(v_fd, V4L2_BUF_TYPE_STILL_CAPTURE,
                            V4L2_BUF_MODE_FIFO, V4L2_PIX_FMT_JPEG,
                            w, h,
-                           &buffers_still, STILL_BUFNUM, IMAGE_JPG_SIZE);
+                           &buffers_still, STILL_BUFNUM, IMAGE_JPG_SIZE,
+                           &still_memory);
       if (ret != OK)
         {
           goto exit_this_app;
@@ -588,7 +631,8 @@ int main(int argc, FAR char *argv[])
   ret = camera_prepare(v_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE,
                        V4L2_BUF_MODE_RING, V4L2_PIX_FMT_RGB565,
                        VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA,
-                       &buffers_video, VIDEO_BUFNUM, IMAGE_RGB_SIZE);
+                       &buffers_video, VIDEO_BUFNUM, IMAGE_RGB_SIZE,
+                       &video_memory);
   if (ret != OK)
     {
       goto exit_this_app;
@@ -659,7 +703,8 @@ int main(int argc, FAR char *argv[])
 
           case APP_STATE_BEFORE_CAPTURE:
           case APP_STATE_AFTER_CAPTURE:
-            ret = get_camimage(v_fd, &v4l2_buf, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+            ret = get_camimage(v_fd, &v4l2_buf,
+                              V4L2_BUF_TYPE_VIDEO_CAPTURE, video_memory);
             if (ret != OK)
               {
                 goto exit_this_app;
@@ -712,7 +757,10 @@ int main(int argc, FAR char *argv[])
 
             while (capture_num)
               {
-                ret = get_camimage(v_fd, &v4l2_buf, capture_type);
+                ret = get_camimage(v_fd, &v4l2_buf, capture_type,
+                                   capture_type ==
+                                   V4L2_BUF_TYPE_STILL_CAPTURE ?
+                                   still_memory : video_memory);
                 if (ret != OK)
                   {
                     goto exit_this_app;

From 21dd3082c1f2756ffd51b9fdf82e821a4991e483 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Fri, 3 Apr 2026 14:44:42 +0800
Subject: [PATCH 283/568] examples/camera: handle RGB565X (BE) format from
 8-bit DVP camera
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some image sensors on 8-bit DVP buses (e.g. GC0308) produce RGB565X
(big-endian) pixel data — the high byte is clocked out first and
stored first in PSRAM by the ESP32-S3 CAM controller.

The V4L2 framework does not negotiate formats automatically, so try
RGB565 first and fall back to RGB565X if S_FMT fails.

When the sensor reports RGB565X:
 - Invalidate D-Cache after DQBUF so the CPU reads fresh DMA data
 - Byte-swap each pixel in place from BE to LE RGB565 for display

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 examples/camera/camera_main.c | 51 +++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/examples/camera/camera_main.c b/examples/camera/camera_main.c
index 10bcda47e..f725460ca 100644
--- a/examples/camera/camera_main.c
+++ b/examples/camera/camera_main.c
@@ -38,6 +38,7 @@
 
 #include <nuttx/video/video.h>
 #include <nuttx/video/v4l2_cap.h>
+#include <nuttx/cache.h>
 
 #include "camera_fileutil.h"
 #include "camera_bkgd.h"
@@ -85,7 +86,8 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
                           uint16_t hsize, uint16_t vsize,
                           FAR struct v_buffer **vbuf,
                           uint8_t buffernum, int buffersize,
-                          FAR uint32_t *memory);
+                          FAR uint32_t *memory,
+                          FAR uint32_t *actual_fmt);
 static void free_buffer(FAR struct v_buffer *buffers, uint8_t bufnum);
 static int parse_arguments(int argc, FAR char *argv[],
                            FAR int *capture_num,
@@ -121,7 +123,8 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
                           uint16_t hsize, uint16_t vsize,
                           FAR struct v_buffer **vbuf,
                           uint8_t buffernum, int buffersize,
-                          FAR uint32_t *memory)
+                          FAR uint32_t *memory,
+                          FAR uint32_t *actual_fmt)
 {
   int ret;
   int cnt;
@@ -149,12 +152,27 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
   fmt.fmt.pix.pixelformat = pixformat;
 
   ret = ioctl(fd, VIDIOC_S_FMT, (uintptr_t)&fmt);
+  if (ret < 0 && pixformat == V4L2_PIX_FMT_RGB565)
+    {
+      /* Some sensors on 8-bit DVP output big-endian RGB565 (RGB565X).
+       * Retry with RGB565X if RGB565 is not supported.
+       */
+
+      fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB565X;
+      ret = ioctl(fd, VIDIOC_S_FMT, (uintptr_t)&fmt);
+    }
+
   if (ret < 0)
     {
       printf("Failed to VIDIOC_S_FMT: errno = %d\n", errno);
       return ret;
     }
 
+  if (actual_fmt)
+    {
+      *actual_fmt = fmt.fmt.pix.pixelformat;
+    }
+
   /* VIDIOC_REQBUFS: try MMAP first (driver-managed DMA buffers).
    * Fall back to USERPTR if the driver does not support MMAP.
    */
@@ -518,6 +536,7 @@ int main(int argc, FAR char *argv[])
   FAR struct v_buffer *buffers_still = NULL;
   uint32_t video_memory = V4L2_MEMORY_USERPTR;
   uint32_t still_memory = V4L2_MEMORY_USERPTR;
+  uint32_t video_pixfmt = V4L2_PIX_FMT_RGB565;
 
   /* =====  Parse and Check arguments  ===== */
 
@@ -607,7 +626,7 @@ int main(int argc, FAR char *argv[])
                            V4L2_BUF_MODE_FIFO, V4L2_PIX_FMT_JPEG,
                            w, h,
                            &buffers_still, STILL_BUFNUM, IMAGE_JPG_SIZE,
-                           &still_memory);
+                           &still_memory, NULL);
       if (ret != OK)
         {
           goto exit_this_app;
@@ -632,7 +651,7 @@ int main(int argc, FAR char *argv[])
                        V4L2_BUF_MODE_RING, V4L2_PIX_FMT_RGB565,
                        VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA,
                        &buffers_video, VIDEO_BUFNUM, IMAGE_RGB_SIZE,
-                       &video_memory);
+                       &video_memory, &video_pixfmt);
   if (ret != OK)
     {
       goto exit_this_app;
@@ -704,13 +723,35 @@ int main(int argc, FAR char *argv[])
           case APP_STATE_BEFORE_CAPTURE:
           case APP_STATE_AFTER_CAPTURE:
             ret = get_camimage(v_fd, &v4l2_buf,
-                              V4L2_BUF_TYPE_VIDEO_CAPTURE, video_memory);
+                               V4L2_BUF_TYPE_VIDEO_CAPTURE, video_memory);
             if (ret != OK)
               {
                 goto exit_this_app;
               }
 
 #ifdef CONFIG_EXAMPLES_CAMERA_OUTPUT_LCD
+            /* If the sensor outputs RGB565X (big-endian), invalidate
+             * D-Cache so we read fresh DMA data from PSRAM, then
+             * byte-swap in place for display and swap back before
+             * returning the buffer to the driver.
+             */
+
+            if (video_pixfmt == V4L2_PIX_FMT_RGB565X)
+              {
+                FAR uint16_t *p = (FAR uint16_t *)v4l2_buf.m.userptr;
+                uint32_t npixels = v4l2_buf.bytesused / 2;
+                uint32_t i;
+
+                up_invalidate_dcache((uintptr_t)p,
+                                     (uintptr_t)p + v4l2_buf.bytesused);
+
+                for (i = 0; i < npixels; i++)
+                  {
+                    uint16_t v = p[i];
+                    p[i] = (v >> 8) | (v << 8);
+                  }
+              }
+
             nximage_draw((FAR void *)v4l2_buf.m.userptr,
                          VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA);
 #endif

From f95b53d15b1c15c9b313750499b0b38d647dce4f Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Tue, 7 Apr 2026 11:22:32 +0800
Subject: [PATCH 284/568] examples/camera: add -m option for horizontal mirror
 preview

Add -m command line option to enable horizontal mirror on the
camera sensor via VIDIOC_S_CTRL + V4L2_CID_HFLIP.  This uses
the sensor hardware mirror (e.g. GC0308 register 0x14 bit[0])
with zero CPU overhead.

Also refactor parse_arguments to use a loop-based parser so
options can appear in any order.

Usage: camera 0 -m    (mirror preview)
       camera -jpg -m (mirror still capture)

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 examples/camera/camera_main.c | 75 ++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/examples/camera/camera_main.c b/examples/camera/camera_main.c
index f725460ca..c2c83e762 100644
--- a/examples/camera/camera_main.c
+++ b/examples/camera/camera_main.c
@@ -91,7 +91,8 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
 static void free_buffer(FAR struct v_buffer *buffers, uint8_t bufnum);
 static int parse_arguments(int argc, FAR char *argv[],
                            FAR int *capture_num,
-                           FAR enum v4l2_buf_type *type);
+                           FAR enum v4l2_buf_type *type,
+                           FAR bool *mirror);
 static int get_camimage(int fd, FAR struct v4l2_buffer *v4l2_buf,
                         enum v4l2_buf_type buf_type, uint32_t memory);
 static int release_camimage(int fd, FAR struct v4l2_buffer *v4l2_buf);
@@ -330,58 +331,36 @@ static void free_buffer(FAR struct v_buffer *buffers, uint8_t bufnum)
 
 static int parse_arguments(int argc, FAR char *argv[],
                            FAR int *capture_num,
-                           FAR enum v4l2_buf_type *type)
+                           FAR enum v4l2_buf_type *type,
+                           FAR bool *mirror)
 {
-  if (argc == 1)
+  int i;
+
+  *capture_num = DEFAULT_CAPTURE_NUM;
+  *type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  *mirror = false;
+
+  for (i = 1; i < argc; i++)
     {
-      *capture_num = DEFAULT_CAPTURE_NUM;
-      *type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    }
-  else if (argc == 2)
-    {
-      if (strncmp(argv[1], "-jpg", 5) == 0)
+      if (strncmp(argv[i], "-jpg", 5) == 0)
         {
-          *capture_num = DEFAULT_CAPTURE_NUM;
           *type = V4L2_BUF_TYPE_STILL_CAPTURE;
         }
+      else if (strncmp(argv[i], "-m", 3) == 0)
+        {
+          *mirror = true;
+        }
       else
         {
-          *capture_num = atoi(argv[1]);
+          *capture_num = atoi(argv[i]);
           if (*capture_num < 0 || *capture_num > MAX_CAPTURE_NUM)
             {
               printf("Invalid capture num(%d). must be >=0 and <=%d\n",
                     *capture_num, MAX_CAPTURE_NUM);
               return ERROR;
             }
-
-          *type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         }
     }
-  else if (argc == 3)
-    {
-      if (strncmp(argv[1], "-jpg", 5) == 0)
-        {
-          *capture_num = atoi(argv[2]);
-          if (*capture_num < 0 || *capture_num > MAX_CAPTURE_NUM)
-            {
-              printf("Invalid capture num(%d). must be >=0 and <=%d\n",
-                    *capture_num, MAX_CAPTURE_NUM);
-              return ERROR;
-            }
-
-          *type = V4L2_BUF_TYPE_STILL_CAPTURE;
-        }
-      else
-        {
-          printf("Invalid argument 1 : %s\n", argv[1]);
-          return ERROR;
-        }
-    }
-  else
-    {
-      printf("Too many arguments\n");
-      return ERROR;
-    }
 
   return OK;
 }
@@ -537,13 +516,14 @@ int main(int argc, FAR char *argv[])
   uint32_t video_memory = V4L2_MEMORY_USERPTR;
   uint32_t still_memory = V4L2_MEMORY_USERPTR;
   uint32_t video_pixfmt = V4L2_PIX_FMT_RGB565;
+  bool mirror = false;
 
   /* =====  Parse and Check arguments  ===== */
 
-  ret = parse_arguments(argc, argv, &capture_num, &capture_type);
+  ret = parse_arguments(argc, argv, &capture_num, &capture_type, &mirror);
   if (ret != OK)
     {
-      printf("usage: %s ([-jpg]) ([capture num])\n", argv[0]);
+      printf("usage: %s [-jpg] [-m] [capture num]\n", argv[0]);
       return ERROR;
     }
 
@@ -583,6 +563,21 @@ int main(int argc, FAR char *argv[])
       goto exit_without_cleaning_buffer;
     }
 
+  /* Set horizontal mirror if requested */
+
+  if (mirror)
+    {
+      struct v4l2_control ctrl;
+
+      ctrl.id    = V4L2_CID_HFLIP;
+      ctrl.value = 1;
+      ret = ioctl(v_fd, VIDIOC_S_CTRL, (uintptr_t)&ctrl);
+      if (ret < 0)
+        {
+          printf("WARNING: VIDIOC_S_CTRL HFLIP failed: %d\n", errno);
+        }
+    }
+
   /* Prepare for STILL_CAPTURE stream.
    *
    * The video buffer mode is V4L2_BUF_MODE_FIFO mode.

From bfbeafabbfd6d4638f5892544ab51a55baf5a999 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Tue, 31 Mar 2026 21:16:00 -0300
Subject: [PATCH 285/568] netutils/mqttc: fix patch and add mbedtls dependency

Add mbedtls dependecy and fix patch path.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 netutils/mqttc/CMakeLists.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/netutils/mqttc/CMakeLists.txt b/netutils/mqttc/CMakeLists.txt
index ae03435be..420c987b1 100644
--- a/netutils/mqttc/CMakeLists.txt
+++ b/netutils/mqttc/CMakeLists.txt
@@ -33,7 +33,7 @@ if(CONFIG_NETUTILS_MQTTC)
     FetchContent_Declare(
       mqttc_fetch
       URL ${MQTTC_URL}/${CONFIG_NETUTILS_MQTTC_VERSION}.tar.gz SOURCE_DIR
-          ${MQTTC_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}/apps/netutils/mqttc/MQTT-C
+          ${MQTTC_DIR} BINARY_DIR ${NUTTX_APPS_BINDIR}/netutils/mqttc/MQTT-C
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 30)
 
@@ -44,9 +44,8 @@ if(CONFIG_NETUTILS_MQTTC)
     endif()
 
     execute_process(
-      COMMAND
-        sh -c
-        "cat 0001_add_connection_status.patch | patch -s -N -d $(MQTTC_DIR) -p1"
+      COMMAND patch -s -N -d ${MQTTC_DIR} -p1 -i
+              ${CMAKE_CURRENT_LIST_DIR}/0001_add_connection_status.patch
       WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
   endif()
 
@@ -65,6 +64,10 @@ if(CONFIG_NETUTILS_MQTTC)
   target_sources(mqttc PRIVATE ${CSRCS})
   target_compile_options(mqttc PRIVATE ${CFLAGS})
 
+  if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS AND CONFIG_CRYPTO_MBEDTLS)
+    nuttx_add_dependencies(TARGET mqttc DEPENDS mbedtls)
+  endif()
+
   if(CONFIG_NETUTILS_MQTTC_EXAMPLE)
     if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS)
       nuttx_add_application(
@@ -79,7 +82,8 @@ if(CONFIG_NETUTILS_MQTTC)
         COMPILE_FLAGS
         ${CFLAGS}
         DEPENDS
-        mqttc)
+        mqttc
+        mbedtls)
     else()
       set(MQTT_PUB_CFLAGS
           ${CFLAGS}

From 3591378113d72806e8ca4cb523f8b9bc2d95bdaa Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Tue, 31 Mar 2026 21:16:47 -0300
Subject: [PATCH 286/568] crypto/mbedtls: expose include paths as public

Expose include paths as public when using CMake.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 crypto/mbedtls/CMakeLists.txt | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/crypto/mbedtls/CMakeLists.txt b/crypto/mbedtls/CMakeLists.txt
index 9a80ffab9..478a257bd 100644
--- a/crypto/mbedtls/CMakeLists.txt
+++ b/crypto/mbedtls/CMakeLists.txt
@@ -129,18 +129,16 @@ if(CONFIG_CRYPTO_MBEDTLS)
   # Library Configuration
   # ############################################################################
 
-  set_property(
-    TARGET nuttx
-    APPEND
-    PROPERTY NUTTX_INCLUDE_DIRECTORIES ${INCDIR})
-  set_property(
-    TARGET nuttx
-    APPEND
-    PROPERTY NUTTX_CXX_INCLUDE_DIRECTORIES ${INCDIR})
-
   nuttx_add_library(mbedtls STATIC)
   target_sources(mbedtls PRIVATE ${CSRCS})
-  target_include_directories(mbedtls PRIVATE ${INCDIR})
+  target_include_directories(mbedtls PUBLIC ${INCDIR})
+  nuttx_export_header(TARGET mbedtls INCLUDE_DIRECTORIES ${MBEDTLS_DIR}/include)
+  # Overlay mbedtls_config.h cannot be in the same nuttx_export_header() as
+  # ${MBEDTLS_DIR}/include (duplicate path). Alt headers need no export; INCDIR
+  # supplies them for this library only.
+  nuttx_create_symlink(
+    ${CMAKE_CURRENT_LIST_DIR}/include/mbedtls/mbedtls_config.h
+    ${NUTTX_APPS_BINDIR}/include/mbedtls/mbedtls/mbedtls_config.h)
   target_compile_definitions(mbedtls PRIVATE unix)
 
   if(CONFIG_ARCH_SIM)

From 9d849adfabac2a33ef1ee73ecfdc3648eb5f7454 Mon Sep 17 00:00:00 2001
From: Piyush Patle <piyushpatle228@gmail.com>
Date: Wed, 1 Apr 2026 16:29:59 +0530
Subject: [PATCH 287/568] include/debug.h: Use <nuttx/debug.h> in apps

Replace app-side includes of <debug.h> with <nuttx/debug.h> to use the
header from the NuttX tree explicitly after the header move.

Signed-off-by: Piyush Patle <piyushpatle228@gmail.com>
---
 builtin/exec_builtin.c                             |  2 +-
 canutils/canlib/canlib_getbaud.c                   |  2 +-
 canutils/canlib/canlib_getloopback.c               |  2 +-
 canutils/canlib/canlib_getsilent.c                 |  2 +-
 canutils/canlib/canlib_setbaud.c                   |  2 +-
 canutils/canlib/canlib_setloopback.c               |  2 +-
 canutils/canlib/canlib_setsilent.c                 |  2 +-
 examples/adc/adc_main.c                            |  4 ++--
 examples/ajoystick/ajoy_main.c                     |  2 +-
 examples/battery/batt_main.c                       |  4 ++--
 examples/bridge/bridge_main.c                      |  2 +-
 examples/camera/camera_bkgd.c                      |  2 +-
 examples/can/can_main.c                            |  2 +-
 examples/capture/cap_main.c                        |  2 +-
 examples/chat/chat_main.c                          |  2 +-
 examples/configdata/configdata_main.c              |  4 ++--
 examples/cordic/cordic_main.c                      |  2 +-
 examples/discover/discover_main.c                  |  2 +-
 examples/djoystick/djoy_main.c                     |  2 +-
 examples/elf/main/elf_main.c                       |  2 +-
 examples/etl/etl_main.cxx                          |  2 +-
 examples/fbcon/fbcon_main.c                        |  5 ++---
 examples/flowc/flowc.h                             |  2 +-
 examples/ft80x/ft80x.h                             |  2 +-
 examples/ftpd/ftpd_main.c                          |  2 +-
 examples/hall/hall_main.c                          |  2 +-
 examples/helloxx/helloxx_main.cxx                  |  2 +-
 examples/hts221_reader/hts221_reader_main.c        |  2 +-
 examples/i2schar/i2schar_main.c                    |  2 +-
 examples/i2schar/i2schar_receiver.c                |  2 +-
 examples/i2schar/i2schar_transmitter.c             |  2 +-
 examples/igmp/igmp.c                               |  2 +-
 examples/igmp/igmp.h                               |  2 +-
 examples/ipcfg/ipcfg_main.c                        |  2 +-
 examples/keyboard/kbd_main.c                       |  2 +-
 examples/lis3dsh_reader/lis3dsh_reader_main.c      |  2 +-
 examples/lsm303_reader/lsm303_reader_main.c        |  2 +-
 examples/lsm6dsl_reader/lsm6dsl_reader_main.c      |  2 +-
 examples/lvglterm/lvglterm.c                       |  2 +-
 examples/mld/mld.h                                 |  2 +-
 examples/mld/mld_main.c                            |  2 +-
 examples/module/chardev/chardev.c                  |  2 +-
 examples/module/main/module_main.c                 |  2 +-
 examples/mtdpart/mtdpart_main.c                    |  2 +-
 examples/mtdrwb/mtdrwb_main.c                      |  2 +-
 examples/netloop/lo_listener.c                     |  2 +-
 examples/netloop/lo_main.c                         |  2 +-
 examples/nettest/nettest.h                         |  2 +-
 examples/nettest/nettest_netinit.c                 |  2 +-
 examples/nettest/nettest_target1.c                 |  2 +-
 examples/nng_test/pubsub.c                         |  2 +-
 examples/nrf24l01_btle/nrf24l01_btle.c             |  2 +-
 examples/nrf24l01_btle/nrf24l01_btle.h             |  2 +-
 examples/nrf24l01_term/nrf24l01_term.c             |  2 +-
 examples/nunchuck/nunchuck_main.c                  |  2 +-
 examples/nx/nx_events.c                            |  2 +-
 examples/nx/nx_kbdin.c                             |  2 +-
 examples/nx/nx_main.c                              |  2 +-
 examples/nxdemo/nxdemo_bkgd.c                      |  2 +-
 examples/nxdemo/nxdemo_main.c                      |  2 +-
 examples/nxflat/nxflat_main.c                      |  2 +-
 examples/nxhello/nxhello_bkgd.c                    |  2 +-
 examples/nxhello/nxhello_main.c                    |  2 +-
 examples/nximage/nximage_bkgd.c                    |  2 +-
 examples/nximage/nximage_main.c                    |  2 +-
 examples/nxlines/nxlines_bkgd.c                    |  2 +-
 examples/nxlines/nxlines_main.c                    |  2 +-
 examples/nxterm/nxterm_main.c                      |  2 +-
 examples/nxterm/nxterm_toolbar.c                   |  2 +-
 examples/nxterm/nxterm_wndo.c                      |  2 +-
 examples/nxtext/nxtext_bkgd.c                      |  2 +-
 examples/nxtext/nxtext_main.c                      |  2 +-
 examples/nxtext/nxtext_popup.c                     |  2 +-
 examples/nxtext/nxtext_putc.c                      |  4 ++--
 examples/pf_ieee802154/pfieee802154.h              |  2 +-
 examples/poll/net_listener.c                       |  2 +-
 examples/poll/net_reader.c                         |  2 +-
 examples/poll/poll_listener.c                      |  2 +-
 examples/poll/poll_main.c                          |  2 +-
 examples/poll/select_listener.c                    |  2 +-
 examples/posix_spawn/spawn_main.c                  |  2 +-
 examples/powerled/powerled_main.c                  |  2 +-
 examples/powermonitor/powermonitor_main.c          |  2 +-
 examples/pwfb/pwfb_events.c                        |  2 +-
 examples/pwfb/pwfb_main.c                          |  2 +-
 examples/pwlines/pwlines_events.c                  |  2 +-
 examples/pwlines/pwlines_main.c                    |  2 +-
 examples/pwlines/pwlines_update.c                  |  2 +-
 examples/pwm/pwm_main.c                            |  4 ++--
 examples/qencoder/qe_main.c                        |  4 ++--
 examples/random/random_main.c                      |  2 +-
 examples/relays/relays_main.c                      |  2 +-
 examples/rmtchar/rmtchar_common.c                  |  2 +-
 examples/rmtchar/rmtchar_main.c                    |  4 ++--
 examples/rmtchar/rmtchar_receiver.c                |  2 +-
 examples/rmtchar/rmtchar_transmitter.c             |  2 +-
 examples/smps/smps_main.c                          |  2 +-
 examples/sotest/main/sotest_main.c                 |  2 +-
 examples/sx127x_demo/sx127x_demo.c                 |  2 +-
 examples/tcpblaster/tcpblaster.h                   |  2 +-
 examples/tcpblaster/tcpblaster_netinit.c           |  2 +-
 examples/tcpblaster/tcpblaster_target1.c           |  2 +-
 examples/tcpecho/tcpecho_main.c                    |  2 +-
 examples/thttpd/thttpd_main.c                      |  2 +-
 examples/touchscreen/tc_main.c                     |  2 +-
 examples/udp/udp.h                                 |  2 +-
 examples/udp/udp_netinit.c                         |  2 +-
 examples/udpblaster/udpblaster_target.c            |  2 +-
 examples/usbserial/usbserial_main.c                |  2 +-
 examples/usrsocktest/usrsocktest_daemon.c          |  2 +-
 examples/usrsocktest/usrsocktest_main.c            |  2 +-
 examples/watchdog/watchdog_main.c                  |  2 +-
 examples/watcher/wdt.c                             |  2 +-
 examples/webserver/webserver_main.c                |  2 +-
 examples/wgetjson/wgetjson_main.c                  |  2 +-
 examples/ws2812/ws2812_main.c                      |  4 ++--
 examples/ws2812esp32rmt/ws2812esp32rmt_main.c      |  2 +-
 examples/xmlrpc/xmlrpc_main.c                      |  2 +-
 examples/zerocross/zerocross_main.c                |  2 +-
 fsutils/flash_eraseall/flash_eraseall.c            |  2 +-
 fsutils/flashtool/flashtool_main.c                 |  2 +-
 fsutils/inifile/inifile.c                          |  2 +-
 fsutils/ipcfg/ipcfg.c                              |  2 +-
 fsutils/ipcfg/ipcfg_binary.c                       | 12 ++++++------
 fsutils/ipcfg/ipcfg_text.c                         | 14 +++++++-------
 fsutils/mkfatfs/configfat.c                        |  2 +-
 fsutils/mkfatfs/mkfatfs.c                          |  2 +-
 fsutils/mkfatfs/writefat.c                         |  6 +++---
 fsutils/mkgpt/mkgpt.c                              |  2 +-
 graphics/ft80x/ft80x.h                             |  2 +-
 graphics/input/generator/input_gen_ctx.c           |  2 +-
 graphics/input/generator/input_gen_dev.c           |  2 +-
 graphics/input/generator/input_gen_event.c         |  2 +-
 .../nxwidgets/UnitTests/CButton/cbutton_main.cxx   |  2 +-
 .../nxwidgets/UnitTests/CButton/cbuttontest.cxx    |  2 +-
 .../nxwidgets/UnitTests/CButton/cbuttontest.hxx    |  2 +-
 .../UnitTests/CButtonArray/cbuttonarray_main.cxx   |  2 +-
 .../UnitTests/CButtonArray/cbuttonarraytest.cxx    |  2 +-
 .../UnitTests/CButtonArray/cbuttonarraytest.hxx    |  2 +-
 .../UnitTests/CCheckBox/ccheckbox_main.cxx         |  2 +-
 .../UnitTests/CCheckBox/ccheckboxtest.cxx          |  2 +-
 .../UnitTests/CCheckBox/ccheckboxtest.hxx          |  2 +-
 .../UnitTests/CGlyphButton/cglyphbutton_main.cxx   |  2 +-
 .../UnitTests/CGlyphButton/cglyphbuttontest.cxx    |  2 +-
 .../UnitTests/CGlyphButton/cglyphbuttontest.hxx    |  2 +-
 .../cglyphsliderhorizontal_main.cxx                |  2 +-
 .../cglyphsliderhorizontaltest.cxx                 |  2 +-
 .../cglyphsliderhorizontaltest.hxx                 |  2 +-
 .../nxwidgets/UnitTests/CImage/cimage_main.cxx     |  2 +-
 graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx |  2 +-
 graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx |  2 +-
 .../nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx   |  2 +-
 .../nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx    |  2 +-
 .../nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx    |  2 +-
 .../nxwidgets/UnitTests/CLabel/clabel_main.cxx     |  2 +-
 graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx |  2 +-
 graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx |  2 +-
 .../UnitTests/CLatchButton/clatchbutton_main.cxx   |  2 +-
 .../UnitTests/CLatchButton/clatchbuttontest.cxx    |  2 +-
 .../UnitTests/CLatchButton/clatchbuttontest.hxx    |  2 +-
 .../CLatchButtonArray/clatchbuttonarray_main.cxx   |  2 +-
 .../CLatchButtonArray/clatchbuttonarraytest.cxx    |  2 +-
 .../CLatchButtonArray/clatchbuttonarraytest.hxx    |  2 +-
 .../nxwidgets/UnitTests/CListBox/clistbox_main.cxx |  2 +-
 .../nxwidgets/UnitTests/CListBox/clistboxtest.cxx  |  2 +-
 .../nxwidgets/UnitTests/CListBox/clistboxtest.hxx  |  2 +-
 .../UnitTests/CProgressBar/cprogressbar_main.cxx   |  2 +-
 .../UnitTests/CProgressBar/cprogressbartest.cxx    |  2 +-
 .../UnitTests/CProgressBar/cprogressbartest.hxx    |  2 +-
 .../UnitTests/CRadioButton/cradiobutton_main.cxx   |  2 +-
 .../UnitTests/CRadioButton/cradiobuttontest.cxx    |  2 +-
 .../UnitTests/CRadioButton/cradiobuttontest.hxx    |  2 +-
 .../cscrollbarhorizontal_main.cxx                  |  2 +-
 .../cscrollbarhorizontaltest.cxx                   |  2 +-
 .../cscrollbarhorizontaltest.hxx                   |  2 +-
 .../CScrollbarVertical/cscrollbarvertical_main.cxx |  2 +-
 .../CScrollbarVertical/cscrollbarverticaltest.cxx  |  2 +-
 .../CScrollbarVertical/cscrollbarverticaltest.hxx  |  2 +-
 .../CSliderHorizonal/csliderhorizontal_main.cxx    |  2 +-
 .../CSliderHorizonal/csliderhorizontaltest.cxx     |  2 +-
 .../CSliderHorizonal/csliderhorizontaltest.hxx     |  2 +-
 .../CSliderVertical/cslidervertical_main.cxx       |  2 +-
 .../CSliderVertical/csliderverticaltest.cxx        |  2 +-
 .../CSliderVertical/csliderverticaltest.hxx        |  2 +-
 .../nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx |  2 +-
 .../nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx  |  2 +-
 .../nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx  |  2 +-
 graphics/nxwidgets/src/ccallback.cxx               |  4 ++--
 graphics/nxwidgets/src/cgraphicsport.cxx           |  2 +-
 graphics/nxwidgets/src/cimage.cxx                  |  2 +-
 graphics/nxwidgets/src/clabelgrid.cxx              |  2 +-
 graphics/nxwidgets/src/cnumericedit.cxx            |  2 +-
 graphics/nxwidgets/src/cnxserver.cxx               |  2 +-
 graphics/nxwidgets/src/cnxtimer.cxx                |  2 +-
 graphics/nxwidgets/src/cscaledbitmap.cxx           |  4 ++--
 graphics/nxwidgets/src/cscrollingpanel.cxx         |  2 +-
 graphics/nxwidgets/src/cwidgetcontrol.cxx          |  2 +-
 graphics/nxwidgets/src/singletons.cxx              |  2 +-
 graphics/nxwm/src/ccalibration.cxx                 |  2 +-
 graphics/nxwm/src/chexcalculator.cxx               |  2 +-
 graphics/nxwm/src/ckeyboard.cxx                    |  4 ++--
 graphics/nxwm/src/cmediaplayer.cxx                 |  2 +-
 graphics/nxwm/src/cnxterm.cxx                      |  2 +-
 graphics/nxwm/src/ctaskbar.cxx                     |  4 ++--
 graphics/nxwm/src/ctouchscreen.cxx                 |  6 +++---
 graphics/nxwm/src/cwindowmessenger.cxx             |  2 +-
 graphics/slcd/cslcd.cxx                            |  2 +-
 graphics/tiff/tiff_addstrip.c                      |  2 +-
 graphics/tiff/tiff_finalize.c                      |  2 +-
 graphics/tiff/tiff_initialize.c                    | 10 +++++-----
 graphics/tiff/tiff_utils.c                         |  4 ++--
 graphics/twm4nx/apps/ccalibration.cxx              |  2 +-
 graphics/twm4nx/apps/cclock.cxx                    |  2 +-
 graphics/twm4nx/apps/cnxterm.cxx                   |  2 +-
 graphics/twm4nx/src/cmainmenu.cxx                  |  2 +-
 include/graphics/nxwidgets/cscaledbitmap.hxx       |  2 +-
 include/graphics/nxwm/cstartwindow.hxx             |  2 +-
 include/graphics/twm4nx/apps/calib_config.hxx      |  2 +-
 include/graphics/twm4nx/apps/clock_config.hxx      |  2 +-
 include/graphics/twm4nx/apps/nxterm_config.hxx     |  2 +-
 include/graphics/twm4nx/ciconwidget.hxx            |  2 +-
 include/graphics/twm4nx/twm4nx_config.hxx          |  2 +-
 include/netutils/cmux.h                            |  2 +-
 industry/foc/fixed16/foc_cordic.c                  |  2 +-
 industry/foc/float/foc_cordic.c                    |  2 +-
 interpreters/python/python_wrapper.c               |  2 +-
 logging/nxscope/nxscope.c                          |  4 ++--
 logging/nxscope/nxscope_chan.c                     |  2 +-
 logging/nxscope/nxscope_idummy.c                   |  2 +-
 logging/nxscope/nxscope_internals.c                |  2 +-
 logging/nxscope/nxscope_iser.c                     |  2 +-
 logging/nxscope/nxscope_iudp.c                     |  2 +-
 logging/nxscope/nxscope_pser.c                     |  4 ++--
 lte/alt1250/alt1250_dbg.h                          |  2 +-
 lte/lapi/src/lapi_dbg.h                            |  2 +-
 netutils/chat/chat.c                               |  2 +-
 netutils/cmux/cmux.h                               |  2 +-
 netutils/dhcp6c/dhcp6c.c                           |  2 +-
 netutils/dhcpc/dhcpc.c                             |  2 +-
 netutils/dhcpd/dhcpd.c                             |  2 +-
 netutils/discover/discover.c                       |  2 +-
 netutils/esp8266/esp8266.c                         |  2 +-
 netutils/ftpc/ftpc_chmod.c                         |  2 +-
 netutils/ftpc/ftpc_cmd.c                           |  2 +-
 netutils/ftpc/ftpc_connect.c                       |  2 +-
 netutils/ftpc/ftpc_getfile.c                       |  2 +-
 netutils/ftpc/ftpc_getreply.c                      |  2 +-
 netutils/ftpc/ftpc_idle.c                          |  2 +-
 netutils/ftpc/ftpc_listdir.c                       |  2 +-
 netutils/ftpc/ftpc_login.c                         |  2 +-
 netutils/ftpc/ftpc_putfile.c                       |  2 +-
 netutils/ftpc/ftpc_rpwd.c                          |  2 +-
 netutils/ftpc/ftpc_socket.c                        |  2 +-
 netutils/ftpc/ftpc_transfer.c                      |  2 +-
 netutils/ftpd/ftpd.c                               |  2 +-
 netutils/libcurl4nx/curl4nx_easy_cleanup.c         |  2 +-
 netutils/libcurl4nx/curl4nx_easy_duphandle.c       |  2 +-
 netutils/libcurl4nx/curl4nx_easy_escape.c          |  2 +-
 netutils/libcurl4nx/curl4nx_easy_getinfo.c         |  2 +-
 netutils/libcurl4nx/curl4nx_easy_init.c            |  2 +-
 netutils/libcurl4nx/curl4nx_easy_perform.c         |  2 +-
 netutils/libcurl4nx/curl4nx_easy_reset.c           |  2 +-
 netutils/libcurl4nx/curl4nx_easy_setopt.c          |  2 +-
 netutils/libcurl4nx/curl4nx_easy_unescape.c        |  2 +-
 netutils/mdns/mdnsd.c                              |  2 +-
 netutils/netinit/netinit.c                         |  2 +-
 netutils/netlib/netlib_checkhttpconnectivity.c     |  2 +-
 netutils/netlib/netlib_checkifconflict.c           |  2 +-
 netutils/netlib/netlib_checkifconnectivity.c       |  2 +-
 netutils/netlib/netlib_checkipconnectivity.c       |  2 +-
 netutils/netlib/netlib_getifstatistics.c           |  2 +-
 netutils/netlib/netlib_ipmsfilter.c                |  2 +-
 netutils/netlib/netlib_listenon.c                  |  2 +-
 netutils/netlib/netlib_nodeaddrconv.c              |  2 +-
 netutils/netlib/netlib_obtainipv4addr.c            |  2 +-
 netutils/netlib/netlib_obtainipv6addr.c            |  2 +-
 netutils/netlib/netlib_server.c                    |  2 +-
 netutils/ntpclient/ntpclient.c                     |  2 +-
 netutils/pppd/ppp.h                                |  2 +-
 netutils/pppd/pppd.c                               |  2 +-
 netutils/ptpd/ptpd.c                               |  2 +-
 netutils/telnetd/telnetd_daemon.c                  |  2 +-
 netutils/tftpc/tftpc_get.c                         |  2 +-
 netutils/tftpc/tftpc_packets.c                     |  2 +-
 netutils/tftpc/tftpc_put.c                         |  2 +-
 netutils/thttpd/fdwatch.c                          |  2 +-
 netutils/thttpd/libhttpd.c                         |  2 +-
 netutils/thttpd/tdate_parse.c                      |  2 +-
 netutils/thttpd/thttpd.c                           |  2 +-
 netutils/thttpd/thttpd_alloc.c                     |  2 +-
 netutils/thttpd/thttpd_cgi.c                       |  4 ++--
 netutils/thttpd/timers.c                           |  2 +-
 netutils/webclient/webclient.c                     |  4 ++--
 netutils/webserver/httpd.c                         |  2 +-
 netutils/webserver/httpd_dirlist.c                 |  2 +-
 netutils/webserver/httpd_mmap.c                    |  2 +-
 netutils/webserver/httpd_sendfile.c                |  2 +-
 nshlib/nsh_altconsole.c                            |  2 +-
 nshlib/nsh_codeccmd.c                              |  2 +-
 nshlib/nsh_console.c                               |  2 +-
 nshlib/nsh_fscmds.c                                |  2 +-
 nshlib/nsh_mntcmds.c                               |  2 +-
 nshlib/nsh_netcmds.c                               |  2 +-
 nshlib/nsh_parse.c                                 |  2 +-
 nshlib/nsh_telnetd.c                               |  2 +-
 nshlib/nsh_usbconsole.c                            |  2 +-
 nshlib/nsh_usbtrace.c                              |  2 +-
 platform/mikroe-stm32f4/mikroe_configdata.c        |  4 ++--
 system/cdcacm/sercon_main.c                        |  2 +-
 system/cdcacm/serdis_main.c                        |  2 +-
 system/cle/cle.c                                   |  2 +-
 system/composite/composite_main.c                  |  2 +-
 system/cu/cu_main.c                                |  2 +-
 system/dd/dd_main.c                                |  2 +-
 system/dhcp6c/renew6_main.c                        |  2 +-
 system/i2c/i2c_main.c                              |  4 ++--
 system/nxcamera/nxcamera.c                         |  2 +-
 system/nxlooper/nxlooper.c                         |  2 +-
 system/nxplayer/nxplayer.c                         |  2 +-
 system/nxplayer/nxplayer_common.c                  |  2 +-
 system/nxrecorder/nxrecorder.c                     |  2 +-
 system/nxrecorder/nxrecorder_common.c              |  2 +-
 system/popen/popen.c                               |  2 +-
 system/readline/readline_common.c                  |  2 +-
 system/spi/spi_main.c                              |  2 +-
 system/system/system.c                             |  2 +-
 system/tee/tee.c                                   |  2 +-
 system/termcurses/tcurses_vt100.c                  |  2 +-
 system/termcurses/termcurses.c                     |  2 +-
 system/ubloxmodem/ubloxmodem_main.c                |  2 +-
 system/usbmsc/usbmsc_main.c                        |  2 +-
 system/vi/vi.c                                     |  2 +-
 system/zmodem/zm.h                                 |  6 +++---
 testing/drivers/drivertest/drivertest_audio.c      |  2 +-
 .../drivers/drivertest/drivertest_framebuffer.c    |  2 +-
 testing/drivers/drivertest/drivertest_lcd.c        |  2 +-
 testing/drivers/drivertest/drivertest_pwm.c        |  4 ++--
 testing/drivers/drivertest/drivertest_watchdog.c   |  2 +-
 testing/drivers/nand_sim/nand_sim_main.c           |  6 +++---
 testing/fs/epoll/epoll.c                           | 10 +++++-----
 testing/fs/mtd_config_fs/mtd_config_fs_test_main.c |  2 +-
 testing/fs/nxffs/nxffs_main.c                      |  4 ++--
 testing/fs/smart/smart_main.c                      |  4 ++--
 testing/libc/arch_libc/arch_libc_test_main.c       |  2 +-
 testing/libc/scanftest/scanftest_main.c            |  2 +-
 testing/mm/memstress/memorystress_main.c           |  2 +-
 testing/ostest/signest.c                           |  4 ++--
 wireless/bluetooth/nimble/include/logcfg/logcfg.h  |  2 +-
 wireless/gs2200m/gs2200m_main.c                    |  2 +-
 wireless/ieee802154/i8shark/i8shark_main.c         |  2 +-
 wireless/wapi/src/driver_wext.c                    |  2 +-
 wireless/wapi/src/util.h                           |  2 +-
 352 files changed, 403 insertions(+), 404 deletions(-)

diff --git a/builtin/exec_builtin.c b/builtin/exec_builtin.c
index 325d594cf..b87133243 100644
--- a/builtin/exec_builtin.c
+++ b/builtin/exec_builtin.c
@@ -29,7 +29,7 @@
 #include <spawn.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "builtin/builtin.h"
 
diff --git a/canutils/canlib/canlib_getbaud.c b/canutils/canlib/canlib_getbaud.c
index af123edea..61ebb4de9 100644
--- a/canutils/canlib/canlib_getbaud.c
+++ b/canutils/canlib/canlib_getbaud.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_getloopback.c b/canutils/canlib/canlib_getloopback.c
index 443161e96..b931301d5 100644
--- a/canutils/canlib/canlib_getloopback.c
+++ b/canutils/canlib/canlib_getloopback.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_getsilent.c b/canutils/canlib/canlib_getsilent.c
index 868072eb1..18e2b0637 100644
--- a/canutils/canlib/canlib_getsilent.c
+++ b/canutils/canlib/canlib_getsilent.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_setbaud.c b/canutils/canlib/canlib_setbaud.c
index b3ee68f26..f8bbb23ff 100644
--- a/canutils/canlib/canlib_setbaud.c
+++ b/canutils/canlib/canlib_setbaud.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_setloopback.c b/canutils/canlib/canlib_setloopback.c
index 7e78b1a34..18164210c 100644
--- a/canutils/canlib/canlib_setloopback.c
+++ b/canutils/canlib/canlib_setloopback.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_setsilent.c b/canutils/canlib/canlib_setsilent.c
index 0900f9261..bf8ef1722 100644
--- a/canutils/canlib/canlib_setsilent.c
+++ b/canutils/canlib/canlib_setsilent.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>
diff --git a/examples/adc/adc_main.c b/examples/adc/adc_main.c
index 68f4f1955..e5678e123 100644
--- a/examples/adc/adc_main.c
+++ b/examples/adc/adc_main.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/analog/adc.h>
 #include <nuttx/analog/ioctl.h>
@@ -95,7 +95,7 @@ static void adc_help(FAR struct adc_state_s *adc)
   printf("Usage: adc [OPTIONS]\n");
   printf("\nArguments are \"sticky\".  "
          "For example, once the ADC device is\n");
-  printf("specified, that device will be re-used until it is changed.\n");
+  printf("specified, that device will be reused until it is changed.\n");
   printf("\n\"sticky\" OPTIONS include:\n");
   printf("  [-p devpath] selects the ADC device.  "
          "Default: %s Current: %s\n",
diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c
index 178608b2f..8a58b66a9 100644
--- a/examples/ajoystick/ajoy_main.c
+++ b/examples/ajoystick/ajoy_main.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/input/ajoystick.h>
diff --git a/examples/battery/batt_main.c b/examples/battery/batt_main.c
index d88a2885f..384d78147 100644
--- a/examples/battery/batt_main.c
+++ b/examples/battery/batt_main.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/power/battery_ioctl.h>
 #include <nuttx/power/battery_charger.h>
@@ -117,7 +117,7 @@ void health_report(int health)
 
       case BATTERY_HEALTH_GOOD:
         {
-          printf("Battery is in good condiction!\n");
+          printf("Battery is in good condition!\n");
         }
         break;
 
diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c
index 8d2165514..183ccedbe 100644
--- a/examples/bridge/bridge_main.c
+++ b/examples/bridge/bridge_main.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <sched.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <net/if.h>
diff --git a/examples/camera/camera_bkgd.c b/examples/camera/camera_bkgd.c
index e53010dad..a0c0bd2fa 100644
--- a/examples/camera/camera_bkgd.c
+++ b/examples/camera/camera_bkgd.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/boardctl.h>
 
 #include <arch/board/board.h>
diff --git a/examples/can/can_main.c b/examples/can/can_main.c
index b62f565fe..422458a33 100644
--- a/examples/can/can_main.c
+++ b/examples/can/can_main.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/can/can.h>
 
diff --git a/examples/capture/cap_main.c b/examples/capture/cap_main.c
index 2ba238a60..1c44e0383 100644
--- a/examples/capture/cap_main.c
+++ b/examples/capture/cap_main.c
@@ -37,7 +37,7 @@
 #include <limits.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/timers/capture.h>
 
diff --git a/examples/chat/chat_main.c b/examples/chat/chat_main.c
index caf6cca28..291e88824 100644
--- a/examples/chat/chat_main.c
+++ b/examples/chat/chat_main.c
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c
index 236d8e267..3218569f6 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -35,7 +35,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/crc32.h>
 #include <nuttx/mtd/mtd.h>
@@ -450,7 +450,7 @@ static int configdata_verifyconfig(void)
                 {
                   g_nverified++;
 #if CONFIG_EXAMPLES_CONFIGDATA_VERBOSE != 0
-                  printf("  Verifed entry %04X, %d\n",
+                  printf("  Verified entry %04X, %d\n",
                          entry->id, entry->instance);
 #endif
                 }
diff --git a/examples/cordic/cordic_main.c b/examples/cordic/cordic_main.c
index 204a755ac..3d4aede0c 100644
--- a/examples/cordic/cordic_main.c
+++ b/examples/cordic/cordic_main.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <math.h>
 #include <fixedmath.h>
 
diff --git a/examples/discover/discover_main.c b/examples/discover/discover_main.c
index cd14720ed..9f5941587 100644
--- a/examples/discover/discover_main.c
+++ b/examples/discover/discover_main.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c
index 110de4531..b3d1134c9 100644
--- a/examples/djoystick/djoy_main.c
+++ b/examples/djoystick/djoy_main.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/input/djoystick.h>
diff --git a/examples/elf/main/elf_main.c b/examples/elf/main/elf_main.c
index 7a52b5f6e..000339e00 100644
--- a/examples/elf/main/elf_main.c
+++ b/examples/elf/main/elf_main.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <pthread.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/symtab.h>
diff --git a/examples/etl/etl_main.cxx b/examples/etl/etl_main.cxx
index efb4aa835..f8628cdfc 100644
--- a/examples/etl/etl_main.cxx
+++ b/examples/etl/etl_main.cxx
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <cstdio>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <etl/vector.h>
 #include <etl/numeric.h>
diff --git a/examples/fbcon/fbcon_main.c b/examples/fbcon/fbcon_main.c
index 2aa95e0c5..da0833800 100644
--- a/examples/fbcon/fbcon_main.c
+++ b/examples/fbcon/fbcon_main.c
@@ -42,7 +42,7 @@
 #include <nuttx/video/fb.h>
 #include <ctype.h>
 #include <spawn.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <poll.h>
 #include <nuttx/ascii.h>
 #include <nuttx/lib/builtin.h>
@@ -1913,7 +1913,7 @@ static void fbcon_write(FAR struct fbcon_state_s *st,
 
       do
         {
-          /* Is the character part of a VT100 escape sequnce? */
+          /* Is the character part of a VT100 escape sequence? */
 
           state = fbcon_vt100(st, ch);
           switch (state)
@@ -2652,4 +2652,3 @@ errout:
   fprintf(stderr, "FBCON exiting with error %d\n", exitcode);
   return exitcode;
 }
-
diff --git a/examples/flowc/flowc.h b/examples/flowc/flowc.h
index c96fe76af..12caefa93 100644
--- a/examples/flowc/flowc.h
+++ b/examples/flowc/flowc.h
@@ -29,7 +29,7 @@
 
 #ifdef EXAMPLES_FLOWC_HOST
 #else
-#  include <debug.h>
+#  include <nuttx/debug.h>
 #endif
 
 /****************************************************************************
diff --git a/examples/ft80x/ft80x.h b/examples/ft80x/ft80x.h
index 0349f6eb4..70492f24e 100644
--- a/examples/ft80x/ft80x.h
+++ b/examples/ft80x/ft80x.h
@@ -31,7 +31,7 @@
 #include <nuttx/compiler.h>
 
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_EXAMPLES_FT80X
 
diff --git a/examples/ftpd/ftpd_main.c b/examples/ftpd/ftpd_main.c
index 5c7888b24..e2673572a 100644
--- a/examples/ftpd/ftpd_main.c
+++ b/examples/ftpd/ftpd_main.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/examples/hall/hall_main.c b/examples/hall/hall_main.c
index ed3c3b570..e0fdc2e78 100644
--- a/examples/hall/hall_main.c
+++ b/examples/hall/hall_main.c
@@ -37,7 +37,7 @@
 #include <limits.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/sensors/hall3ph.h>
 
diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx
index c3425ff6b..8df920916 100644
--- a/examples/helloxx/helloxx_main.cxx
+++ b/examples/helloxx/helloxx_main.cxx
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <cstdio>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 //***************************************************************************
 // Definitions
diff --git a/examples/hts221_reader/hts221_reader_main.c b/examples/hts221_reader/hts221_reader_main.c
index ac00ede5e..5c1c39664 100644
--- a/examples/hts221_reader/hts221_reader_main.c
+++ b/examples/hts221_reader/hts221_reader_main.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/sensors/hts221.h>
 
diff --git a/examples/i2schar/i2schar_main.c b/examples/i2schar/i2schar_main.c
index dec7b70c1..176def927 100644
--- a/examples/i2schar/i2schar_main.c
+++ b/examples/i2schar/i2schar_main.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <nuttx/audio/audio.h>
diff --git a/examples/i2schar/i2schar_receiver.c b/examples/i2schar/i2schar_receiver.c
index fdcc0c8ba..e088bee9f 100644
--- a/examples/i2schar/i2schar_receiver.c
+++ b/examples/i2schar/i2schar_receiver.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 #include <string.h>
 
diff --git a/examples/i2schar/i2schar_transmitter.c b/examples/i2schar/i2schar_transmitter.c
index df1560ac6..14e4ec347 100644
--- a/examples/i2schar/i2schar_transmitter.c
+++ b/examples/i2schar/i2schar_transmitter.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 
diff --git a/examples/igmp/igmp.c b/examples/igmp/igmp.c
index da904fa34..7da32c680 100644
--- a/examples/igmp/igmp.c
+++ b/examples/igmp/igmp.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <net/if.h>
diff --git a/examples/igmp/igmp.h b/examples/igmp/igmp.h
index 11ffb57f9..3cf99b1b0 100644
--- a/examples/igmp/igmp.h
+++ b/examples/igmp/igmp.h
@@ -27,7 +27,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/examples/ipcfg/ipcfg_main.c b/examples/ipcfg/ipcfg_main.c
index f64a73ea8..51c411081 100644
--- a/examples/ipcfg/ipcfg_main.c
+++ b/examples/ipcfg/ipcfg_main.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <arpa/inet.h>
diff --git a/examples/keyboard/kbd_main.c b/examples/keyboard/kbd_main.c
index ff832c862..d793e6344 100644
--- a/examples/keyboard/kbd_main.c
+++ b/examples/keyboard/kbd_main.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/input/keyboard.h>
 
diff --git a/examples/lis3dsh_reader/lis3dsh_reader_main.c b/examples/lis3dsh_reader/lis3dsh_reader_main.c
index dad00b312..98194ea66 100644
--- a/examples/lis3dsh_reader/lis3dsh_reader_main.c
+++ b/examples/lis3dsh_reader/lis3dsh_reader_main.c
@@ -47,7 +47,7 @@
 #include <fcntl.h>
 #include <sched.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/examples/lsm303_reader/lsm303_reader_main.c b/examples/lsm303_reader/lsm303_reader_main.c
index b48e81a2d..51611720d 100644
--- a/examples/lsm303_reader/lsm303_reader_main.c
+++ b/examples/lsm303_reader/lsm303_reader_main.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/sensors/lsm303agr.h>
 
diff --git a/examples/lsm6dsl_reader/lsm6dsl_reader_main.c b/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
index c3ec68ff7..6f7cf0355 100644
--- a/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
+++ b/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/sensors/lsm6dsl.h>
 
diff --git a/examples/lvglterm/lvglterm.c b/examples/lvglterm/lvglterm.c
index 90269daa8..71c5e650e 100644
--- a/examples/lvglterm/lvglterm.c
+++ b/examples/lvglterm/lvglterm.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <poll.h>
 #include <spawn.h>
 #include <lvgl/lvgl.h>
diff --git a/examples/mld/mld.h b/examples/mld/mld.h
index 69d8f13a4..936a37062 100644
--- a/examples/mld/mld.h
+++ b/examples/mld/mld.h
@@ -27,7 +27,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/examples/mld/mld_main.c b/examples/mld/mld_main.c
index 363a7e41d..594115a22 100644
--- a/examples/mld/mld_main.c
+++ b/examples/mld/mld_main.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <net/if.h>
diff --git a/examples/module/chardev/chardev.c b/examples/module/chardev/chardev.c
index f0faa3bfb..b2fd7b61d 100644
--- a/examples/module/chardev/chardev.c
+++ b/examples/module/chardev/chardev.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <errno.h>
 #include <syslog.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/module.h>
 #include <nuttx/lib/elf.h>
diff --git a/examples/module/main/module_main.c b/examples/module/main/module_main.c
index 37da14fee..9eb9b205e 100644
--- a/examples/module/main/module_main.c
+++ b/examples/module/main/module_main.c
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 #include <syslog.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/module.h>
 #include <nuttx/symtab.h>
diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c
index 35ba65ce7..428eddc57 100644
--- a/examples/mtdpart/mtdpart_main.c
+++ b/examples/mtdpart/mtdpart_main.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/drivers/drivers.h>
diff --git a/examples/mtdrwb/mtdrwb_main.c b/examples/mtdrwb/mtdrwb_main.c
index 1ebbe44f5..93b9d3290 100644
--- a/examples/mtdrwb/mtdrwb_main.c
+++ b/examples/mtdrwb/mtdrwb_main.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/drivers/drivers.h>
diff --git a/examples/netloop/lo_listener.c b/examples/netloop/lo_listener.c
index 8b51027bb..20f72ad9c 100644
--- a/examples/netloop/lo_listener.c
+++ b/examples/netloop/lo_listener.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <net/if.h>
 #include <arpa/inet.h>
diff --git a/examples/netloop/lo_main.c b/examples/netloop/lo_main.c
index cfdfab429..513278b08 100644
--- a/examples/netloop/lo_main.c
+++ b/examples/netloop/lo_main.c
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/examples/nettest/nettest.h b/examples/nettest/nettest.h
index e4ff7f3cc..fd314befb 100644
--- a/examples/nettest/nettest.h
+++ b/examples/nettest/nettest.h
@@ -31,7 +31,7 @@
 
 #ifdef NETTEST_HOST
 #else
-#  include <debug.h>
+#  include <nuttx/debug.h>
 #endif
 
 /****************************************************************************
diff --git a/examples/nettest/nettest_netinit.c b/examples/nettest/nettest_netinit.c
index 5c29ca411..e2e786164 100644
--- a/examples/nettest/nettest_netinit.c
+++ b/examples/nettest/nettest_netinit.c
@@ -28,7 +28,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/examples/nettest/nettest_target1.c b/examples/nettest/nettest_target1.c
index 3875be272..47db8916b 100644
--- a/examples/nettest/nettest_target1.c
+++ b/examples/nettest/nettest_target1.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sched.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "nettest.h"
 
diff --git a/examples/nng_test/pubsub.c b/examples/nng_test/pubsub.c
index 4f285906e..78e427eb2 100644
--- a/examples/nng_test/pubsub.c
+++ b/examples/nng_test/pubsub.c
@@ -32,7 +32,7 @@
 #include <pthread.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nng/nng.h>
 #include <nng/protocol/pubsub0/pub.h>
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.c b/examples/nrf24l01_btle/nrf24l01_btle.c
index ee373798f..6e1490f45 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.c
+++ b/examples/nrf24l01_btle/nrf24l01_btle.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/signal.h>
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.h b/examples/nrf24l01_btle/nrf24l01_btle.h
index 73d166356..9394ee568 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.h
+++ b/examples/nrf24l01_btle/nrf24l01_btle.h
@@ -31,7 +31,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c
index b8af3dca0..c120cafc1 100644
--- a/examples/nrf24l01_term/nrf24l01_term.c
+++ b/examples/nrf24l01_term/nrf24l01_term.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <poll.h>
 #include <fcntl.h>
 
diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c
index fa72e1ce6..63200288c 100644
--- a/examples/nunchuck/nunchuck_main.c
+++ b/examples/nunchuck/nunchuck_main.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/input/nunchuck.h>
diff --git a/examples/nx/nx_events.c b/examples/nx/nx_events.c
index 360856584..4e5616641 100644
--- a/examples/nx/nx_events.c
+++ b/examples/nx/nx_events.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/examples/nx/nx_kbdin.c b/examples/nx/nx_kbdin.c
index 856323a24..cdab7fe20 100644
--- a/examples/nx/nx_kbdin.c
+++ b/examples/nx/nx_kbdin.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c
index a7b9134c0..942d59870 100644
--- a/examples/nx/nx_main.c
+++ b/examples/nx/nx_main.c
@@ -38,7 +38,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/nxdemo/nxdemo_bkgd.c b/examples/nxdemo/nxdemo_bkgd.c
index fd03f08c0..ecd82b238 100644
--- a/examples/nxdemo/nxdemo_bkgd.c
+++ b/examples/nxdemo/nxdemo_bkgd.c
@@ -34,7 +34,7 @@
 #include <semaphore.h>
 #include <sys/param.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/examples/nxdemo/nxdemo_main.c b/examples/nxdemo/nxdemo_main.c
index ca5d5b878..e6875b9cd 100644
--- a/examples/nxdemo/nxdemo_main.c
+++ b/examples/nxdemo/nxdemo_main.c
@@ -38,7 +38,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c
index 0c8425e2e..c7ea6cf19 100644
--- a/examples/nxflat/nxflat_main.c
+++ b/examples/nxflat/nxflat_main.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <pthread.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/symtab.h>
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index ee73f2614..323b4870d 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxglib.h>
diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c
index 13e2b8a62..8165d9abe 100644
--- a/examples/nxhello/nxhello_main.c
+++ b/examples/nxhello/nxhello_main.c
@@ -38,7 +38,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index 36ac04eda..8a86f0498 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxglib.h>
diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c
index 4598ae4f6..fd2beac0b 100644
--- a/examples/nximage/nximage_main.c
+++ b/examples/nximage/nximage_main.c
@@ -38,7 +38,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/nxlines/nxlines_bkgd.c b/examples/nxlines/nxlines_bkgd.c
index 22b068c64..f3e3940fd 100644
--- a/examples/nxlines/nxlines_bkgd.c
+++ b/examples/nxlines/nxlines_bkgd.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fixedmath.h>
 #include <inttypes.h>
 
diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c
index 7b3d4ba0d..85b75177e 100644
--- a/examples/nxlines/nxlines_main.c
+++ b/examples/nxlines/nxlines_main.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <sched.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/nxterm/nxterm_main.c b/examples/nxterm/nxterm_main.c
index c1a912a08..6fbf0be6d 100644
--- a/examples/nxterm/nxterm_main.c
+++ b/examples/nxterm/nxterm_main.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
diff --git a/examples/nxterm/nxterm_toolbar.c b/examples/nxterm/nxterm_toolbar.c
index 24bcee463..0fa7c0802 100644
--- a/examples/nxterm/nxterm_toolbar.c
+++ b/examples/nxterm/nxterm_toolbar.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/examples/nxterm/nxterm_wndo.c b/examples/nxterm/nxterm_wndo.c
index 2bba6016a..c326e0449 100644
--- a/examples/nxterm/nxterm_wndo.c
+++ b/examples/nxterm/nxterm_wndo.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxglib.h>
diff --git a/examples/nxtext/nxtext_bkgd.c b/examples/nxtext/nxtext_bkgd.c
index 1e0d4a18d..8eb55ba09 100644
--- a/examples/nxtext/nxtext_bkgd.c
+++ b/examples/nxtext/nxtext_bkgd.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c
index 1ad8bb9b3..d3d02956f 100644
--- a/examples/nxtext/nxtext_main.c
+++ b/examples/nxtext/nxtext_main.c
@@ -38,7 +38,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/nxtext/nxtext_popup.c b/examples/nxtext/nxtext_popup.c
index 4ca10e1b7..19dbd3cc5 100644
--- a/examples/nxtext/nxtext_popup.c
+++ b/examples/nxtext/nxtext_popup.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index 47fdd9ba5..384ae22bb 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
@@ -365,7 +365,7 @@ nxtext_getglyph(NXHANDLE hfont, FAR struct nxtext_state_s *st, uint8_t ch)
  *
  * Description:
  *   This is part of the nxtext_putc logic.  It creates and positions a
- *   the character and renders (or re-uses) a glyph for font.
+ *   the character and renders (or reuses) a glyph for font.
  *
  ****************************************************************************/
 
diff --git a/examples/pf_ieee802154/pfieee802154.h b/examples/pf_ieee802154/pfieee802154.h
index ee7a88b5c..adf9e3bd6 100644
--- a/examples/pf_ieee802154/pfieee802154.h
+++ b/examples/pf_ieee802154/pfieee802154.h
@@ -27,7 +27,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <netpacket/ieee802154.h>
 
 /****************************************************************************
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index 9db855477..e20306d6c 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <net/if.h>
 #include <arpa/inet.h>
diff --git a/examples/poll/net_reader.c b/examples/poll/net_reader.c
index 5e22822e3..288179763 100644
--- a/examples/poll/net_reader.c
+++ b/examples/poll/net_reader.c
@@ -39,7 +39,7 @@
 #include <pthread.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <net/if.h>
 #include <arpa/inet.h>
diff --git a/examples/poll/poll_listener.c b/examples/poll/poll_listener.c
index 5864c4222..ce912357d 100644
--- a/examples/poll/poll_listener.c
+++ b/examples/poll/poll_listener.c
@@ -36,7 +36,7 @@
 #include <poll.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 
diff --git a/examples/poll/poll_main.c b/examples/poll/poll_main.c
index 817916839..5dfb2d938 100644
--- a/examples/poll/poll_main.c
+++ b/examples/poll/poll_main.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "poll_internal.h"
 
diff --git a/examples/poll/select_listener.c b/examples/poll/select_listener.c
index 69cfe92d6..e99eda06d 100644
--- a/examples/poll/select_listener.c
+++ b/examples/poll/select_listener.c
@@ -37,7 +37,7 @@
 #include <pthread.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "poll_internal.h"
 
diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c
index 100030b6c..34428d472 100644
--- a/examples/posix_spawn/spawn_main.c
+++ b/examples/posix_spawn/spawn_main.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <spawn.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/drivers/ramdisk.h>
diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c
index 4478d2ee7..b949aadfa 100644
--- a/examples/powerled/powerled_main.c
+++ b/examples/powerled/powerled_main.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/ioctl.h>
 
 #ifndef CONFIG_NSH_ARCHINIT
diff --git a/examples/powermonitor/powermonitor_main.c b/examples/powermonitor/powermonitor_main.c
index 3a335dd66..0e13e3b4b 100644
--- a/examples/powermonitor/powermonitor_main.c
+++ b/examples/powermonitor/powermonitor_main.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdio.h>
 #include <fixedmath.h>
 #include <sys/types.h>
diff --git a/examples/pwfb/pwfb_events.c b/examples/pwfb/pwfb_events.c
index 142985ab7..bec7a845a 100644
--- a/examples/pwfb/pwfb_events.c
+++ b/examples/pwfb/pwfb_events.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c
index 6a7bfc438..3b5993372 100644
--- a/examples/pwfb/pwfb_main.c
+++ b/examples/pwfb/pwfb_main.c
@@ -39,7 +39,7 @@
 #include <pthread.h>
 #include <fixedmath.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/pwlines/pwlines_events.c b/examples/pwlines/pwlines_events.c
index 73a2b80a6..3dcd0504c 100644
--- a/examples/pwlines/pwlines_events.c
+++ b/examples/pwlines/pwlines_events.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/examples/pwlines/pwlines_main.c b/examples/pwlines/pwlines_main.c
index dc776d744..8d448cc11 100644
--- a/examples/pwlines/pwlines_main.c
+++ b/examples/pwlines/pwlines_main.c
@@ -39,7 +39,7 @@
 #include <pthread.h>
 #include <fixedmath.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/examples/pwlines/pwlines_update.c b/examples/pwlines/pwlines_update.c
index 2dbe4e39e..37d41456e 100644
--- a/examples/pwlines/pwlines_update.c
+++ b/examples/pwlines/pwlines_update.c
@@ -33,7 +33,7 @@
 #include <inttypes.h>
 #include <unistd.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fixedmath.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/examples/pwm/pwm_main.c b/examples/pwm/pwm_main.c
index 7a1a83c16..683587f08 100644
--- a/examples/pwm/pwm_main.c
+++ b/examples/pwm/pwm_main.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <string.h>
 #include <inttypes.h>
 
@@ -199,7 +199,7 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
   printf("Usage: pwm [OPTIONS]\n");
   printf("\nArguments are \"sticky\".  "
          "For example, once the PWM frequency is\n");
-  printf("specified, that frequency will be re-used until it is changed.\n");
+  printf("specified, that frequency will be reused until it is changed.\n");
   printf("\n\"sticky\" OPTIONS include:\n");
   printf("  [-p devpath] selects the PWM device.  "
          "Default: %s Current: %s\n",
diff --git a/examples/qencoder/qe_main.c b/examples/qencoder/qe_main.c
index 2614fe7fb..504db260d 100644
--- a/examples/qencoder/qe_main.c
+++ b/examples/qencoder/qe_main.c
@@ -37,7 +37,7 @@
 #include <limits.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/sensors/qencoder.h>
 
@@ -317,7 +317,7 @@ int main(int argc, FAR char *argv[])
               goto errout_with_dev;
             }
 
-          /* GETINDEX succesful */
+          /* GETINDEX successful */
 
           else
             {
diff --git a/examples/random/random_main.c b/examples/random/random_main.c
index 2b1be2827..3a35b4e89 100644
--- a/examples/random/random_main.c
+++ b/examples/random/random_main.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 /****************************************************************************
diff --git a/examples/relays/relays_main.c b/examples/relays/relays_main.c
index f5ab6fb7b..83e108419 100644
--- a/examples/relays/relays_main.c
+++ b/examples/relays/relays_main.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_ARCH_RELAYS
 
diff --git a/examples/rmtchar/rmtchar_common.c b/examples/rmtchar/rmtchar_common.c
index 663f0abd5..098e5363a 100644
--- a/examples/rmtchar/rmtchar_common.c
+++ b/examples/rmtchar/rmtchar_common.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include "rmtchar.h"
diff --git a/examples/rmtchar/rmtchar_main.c b/examples/rmtchar/rmtchar_main.c
index dcf2c54f2..63a8ced85 100644
--- a/examples/rmtchar/rmtchar_main.c
+++ b/examples/rmtchar/rmtchar_main.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "rmtchar.h"
 
@@ -112,7 +112,7 @@ static void rmtchar_help(FAR struct rmtchar_state_s *rmtchar)
   printf("Usage: rmtchar [OPTIONS]\n");
   printf("\nArguments are \"sticky\".\n");
   printf("For example, once the RMT character device is\n");
-  printf("specified, that device will be re-used until it is changed.\n");
+  printf("specified, that device will be reused until it is changed.\n");
   printf("\n\"sticky\" OPTIONS include:\n");
   printf("  [-i items] selects the number of words (items) to be transmitted"
          " or received by the RMT character device. "
diff --git a/examples/rmtchar/rmtchar_receiver.c b/examples/rmtchar/rmtchar_receiver.c
index b6d94800e..2e1b20e36 100644
--- a/examples/rmtchar/rmtchar_receiver.c
+++ b/examples/rmtchar/rmtchar_receiver.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include "rmtchar.h"
diff --git a/examples/rmtchar/rmtchar_transmitter.c b/examples/rmtchar/rmtchar_transmitter.c
index 8c0528e2a..75fc0103b 100644
--- a/examples/rmtchar/rmtchar_transmitter.c
+++ b/examples/rmtchar/rmtchar_transmitter.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/audio/audio.h>
diff --git a/examples/smps/smps_main.c b/examples/smps/smps_main.c
index ba6a7b079..852696855 100644
--- a/examples/smps/smps_main.c
+++ b/examples/smps/smps_main.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/ioctl.h>
 #include <sys/boardctl.h>
 
diff --git a/examples/sotest/main/sotest_main.c b/examples/sotest/main/sotest_main.c
index 98b11730c..0d399568f 100644
--- a/examples/sotest/main/sotest_main.c
+++ b/examples/sotest/main/sotest_main.c
@@ -37,7 +37,7 @@
 #include <syslog.h>
 #include <dlfcn.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/symtab.h>
diff --git a/examples/sx127x_demo/sx127x_demo.c b/examples/sx127x_demo/sx127x_demo.c
index 05175a6ed..a93fe74fe 100644
--- a/examples/sx127x_demo/sx127x_demo.c
+++ b/examples/sx127x_demo/sx127x_demo.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <poll.h>
 #include <fcntl.h>
 
diff --git a/examples/tcpblaster/tcpblaster.h b/examples/tcpblaster/tcpblaster.h
index 9fc7c4dcc..5d645f4ab 100644
--- a/examples/tcpblaster/tcpblaster.h
+++ b/examples/tcpblaster/tcpblaster.h
@@ -31,7 +31,7 @@
 
 #ifdef TCPBLASTER_HOST
 #else
-#  include <debug.h>
+#  include <nuttx/debug.h>
 #endif
 
 /****************************************************************************
diff --git a/examples/tcpblaster/tcpblaster_netinit.c b/examples/tcpblaster/tcpblaster_netinit.c
index 6007674f4..f9719d295 100644
--- a/examples/tcpblaster/tcpblaster_netinit.c
+++ b/examples/tcpblaster/tcpblaster_netinit.c
@@ -28,7 +28,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/examples/tcpblaster/tcpblaster_target1.c b/examples/tcpblaster/tcpblaster_target1.c
index f46fd0da8..827fe3a7d 100644
--- a/examples/tcpblaster/tcpblaster_target1.c
+++ b/examples/tcpblaster/tcpblaster_target1.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sched.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "tcpblaster.h"
 
diff --git a/examples/tcpecho/tcpecho_main.c b/examples/tcpecho/tcpecho_main.c
index 96aba8096..2de49f6af 100644
--- a/examples/tcpecho/tcpecho_main.c
+++ b/examples/tcpecho/tcpecho_main.c
@@ -28,7 +28,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <poll.h>
 #include <stdint.h>
diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c
index 291e7552c..5ee01b455 100644
--- a/examples/thttpd/thttpd_main.c
+++ b/examples/thttpd/thttpd_main.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <net/if.h>
 #include <arpa/inet.h>
diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c
index 129de8d27..b2f40a8f7 100644
--- a/examples/touchscreen/tc_main.c
+++ b/examples/touchscreen/tc_main.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE
 #  include <nuttx/input/mouse.h>
diff --git a/examples/udp/udp.h b/examples/udp/udp.h
index 415317f50..2f15d8ea3 100644
--- a/examples/udp/udp.h
+++ b/examples/udp/udp.h
@@ -29,7 +29,7 @@
 
 #ifdef EXAMPLES_UDP_HOST
 #else
-#  include <debug.h>
+#  include <nuttx/debug.h>
 #endif
 
 #include <arpa/inet.h>
diff --git a/examples/udp/udp_netinit.c b/examples/udp/udp_netinit.c
index 3cd2625b7..d5851b22a 100644
--- a/examples/udp/udp_netinit.c
+++ b/examples/udp/udp_netinit.c
@@ -28,7 +28,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/examples/udpblaster/udpblaster_target.c b/examples/udpblaster/udpblaster_target.c
index 0df0072d4..be5908fbd 100644
--- a/examples/udpblaster/udpblaster_target.c
+++ b/examples/udpblaster/udpblaster_target.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <poll.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <net/if.h>
diff --git a/examples/usbserial/usbserial_main.c b/examples/usbserial/usbserial_main.c
index 66e4790b9..e1eec27c8 100644
--- a/examples/usbserial/usbserial_main.c
+++ b/examples/usbserial/usbserial_main.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
diff --git a/examples/usrsocktest/usrsocktest_daemon.c b/examples/usrsocktest/usrsocktest_daemon.c
index 3d84d8396..efa543591 100644
--- a/examples/usrsocktest/usrsocktest_daemon.c
+++ b/examples/usrsocktest/usrsocktest_daemon.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c
index d09036c38..c6109423e 100644
--- a/examples/usrsocktest/usrsocktest_main.c
+++ b/examples/usrsocktest/usrsocktest_main.c
@@ -32,7 +32,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c
index 06a36c75d..4e22001a1 100644
--- a/examples/watchdog/watchdog_main.c
+++ b/examples/watchdog/watchdog_main.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/examples/watcher/wdt.c b/examples/watcher/wdt.c
index ccfbeaa98..667240dee 100644
--- a/examples/watcher/wdt.c
+++ b/examples/watcher/wdt.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
diff --git a/examples/webserver/webserver_main.c b/examples/webserver/webserver_main.c
index 7a16c8c45..8309f59c8 100644
--- a/examples/webserver/webserver_main.c
+++ b/examples/webserver/webserver_main.c
@@ -51,7 +51,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/examples/wgetjson/wgetjson_main.c b/examples/wgetjson/wgetjson_main.c
index 860a0fb5b..083d68e93 100644
--- a/examples/wgetjson/wgetjson_main.c
+++ b/examples/wgetjson/wgetjson_main.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/netlib.h"
 #include "netutils/webclient.h"
diff --git a/examples/ws2812/ws2812_main.c b/examples/ws2812/ws2812_main.c
index 438e68f11..ebb16b575 100644
--- a/examples/ws2812/ws2812_main.c
+++ b/examples/ws2812/ws2812_main.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -77,7 +77,7 @@ static void help(FAR struct neo_config_s *conf)
 
   printf("\nArguments are \"sticky\".  "
          "For example, once the device path is\n");
-  printf("specified, that path will be re-used until it is changed.\n");
+  printf("specified, that path will be reused until it is changed.\n");
 
   printf("  [-p path] selects the ws2812 device.  "
          "Default: %s Current: %s\n",
diff --git a/examples/ws2812esp32rmt/ws2812esp32rmt_main.c b/examples/ws2812esp32rmt/ws2812esp32rmt_main.c
index 3f451436e..7eb8dd6fe 100644
--- a/examples/ws2812esp32rmt/ws2812esp32rmt_main.c
+++ b/examples/ws2812esp32rmt/ws2812esp32rmt_main.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c
index feeb0bf4e..0d90626e5 100644
--- a/examples/xmlrpc/xmlrpc_main.c
+++ b/examples/xmlrpc/xmlrpc_main.c
@@ -52,7 +52,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c
index d2f49fa5b..2b6da5b62 100644
--- a/examples/zerocross/zerocross_main.c
+++ b/examples/zerocross/zerocross_main.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/sensors/zerocross.h>
diff --git a/fsutils/flash_eraseall/flash_eraseall.c b/fsutils/flash_eraseall/flash_eraseall.c
index 2dde3a1ee..f7462c152 100644
--- a/fsutils/flash_eraseall/flash_eraseall.c
+++ b/fsutils/flash_eraseall/flash_eraseall.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/mtd/mtd.h>
 #include "fsutils/flash_eraseall.h"
diff --git a/fsutils/flashtool/flashtool_main.c b/fsutils/flashtool/flashtool_main.c
index 8e4f288f3..b1f7f29a4 100644
--- a/fsutils/flashtool/flashtool_main.c
+++ b/fsutils/flashtool/flashtool_main.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <ctype.h>
 
diff --git a/fsutils/inifile/inifile.c b/fsutils/inifile/inifile.c
index 16c9da6af..8bb52326b 100644
--- a/fsutils/inifile/inifile.c
+++ b/fsutils/inifile/inifile.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "fsutils/inifile.h"
 
diff --git a/fsutils/ipcfg/ipcfg.c b/fsutils/ipcfg/ipcfg.c
index c1d4f9f9d..9f6deab5b 100644
--- a/fsutils/ipcfg/ipcfg.c
+++ b/fsutils/ipcfg/ipcfg.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "fsutils/ipcfg.h"
 #include "ipcfg.h"
diff --git a/fsutils/ipcfg/ipcfg_binary.c b/fsutils/ipcfg/ipcfg_binary.c
index 0247a4e88..c12a7ada4 100644
--- a/fsutils/ipcfg/ipcfg_binary.c
+++ b/fsutils/ipcfg/ipcfg_binary.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "fsutils/ipcfg.h"
 #include "ipcfg.h"
@@ -154,7 +154,7 @@ static int ipcfg_read_binary(int fd, FAR void *buffer, size_t nbytes)
  * Input Parameters:
  *   fd     - File descriptor of the open file to write to
  *   buffer - Location to write to
- *   nbytes - Number of bytes to wrtie
+ *   nbytes - Number of bytes to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -265,7 +265,7 @@ static int ipcfg_find_binary(int fd, sa_family_t af)
  *
  * Input Parameters:
  *   path    - The full path to the IP configuration file
- *   ipv4cfg - Location to read IPv4 configration to
+ *   ipv4cfg - Location to read IPv4 configuration to
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -316,7 +316,7 @@ errout_with_fd:
  *
  * Input Parameters:
  *   path    - The full path to the IP configuration file
- *   ipv6cfg - Location to read IPv6 configration to
+ *   ipv6cfg - Location to read IPv6 configuration to
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -367,7 +367,7 @@ errout_with_fd:
  *
  * Input Parameters:
  *   path    - The full path to the IP configuration file
- *   ipv4cfg - The IPv4 configration to write
+ *   ipv4cfg - The IPv4 configuration to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -474,7 +474,7 @@ errout_with_fd:
  *
  * Input Parameters:
  *   path    - The full path to the IP configuration file
- *   ipv6cfg - The IPv6 configration to write
+ *   ipv6cfg - The IPv6 configuration to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
diff --git a/fsutils/ipcfg/ipcfg_text.c b/fsutils/ipcfg/ipcfg_text.c
index 738bde088..f0e64f8e8 100644
--- a/fsutils/ipcfg/ipcfg_text.c
+++ b/fsutils/ipcfg/ipcfg_text.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 
@@ -238,7 +238,7 @@ static int ipcfg_put_ipv6addr(FAR FILE *stream, FAR const char *variable,
  *
  * Input Parameters:
  *   stream  - Stream of the open file to write to
- *   ipv4cfg - The IPv4 configration to write
+ *   ipv4cfg - The IPv4 configuration to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -278,7 +278,7 @@ static int ipcfg_write_ipv4(FAR FILE *stream,
  *
  * Input Parameters:
  *   stream  - Stream of the open file to write to
- *   ipv6cfg - The IPv6 configration to write
+ *   ipv6cfg - The IPv6 configuration to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -322,7 +322,7 @@ static int ipcfg_write_ipv6(FAR FILE *stream,
  * Input Parameters:
  *   path    - The full path to the IP configuration file
  *   netdev  - Network device name string
- *   ipv4cfg - Location to read IPv4 configration to
+ *   ipv4cfg - Location to read IPv4 configuration to
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -473,7 +473,7 @@ int ipcfg_read_text_ipv4(FAR const char *path, FAR const char *netdev,
  * Input Parameters:
  *   path    - The full path to the IP configuration file
  *   netdev  - Network device name string
- *   ipv6cfg - Location to read IPv6 configration to
+ *   ipv6cfg - Location to read IPv6 configuration to
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -639,7 +639,7 @@ int ipcfg_read_text_ipv6(FAR const char *path, FAR const char *netdev,
  * Input Parameters:
  *   path    - The full path to the IP configuration file
  *   netdev  - Network device name string
- *   ipv4cfg - The IPv4 configration to write
+ *   ipv4cfg - The IPv4 configuration to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
@@ -726,7 +726,7 @@ int ipcfg_write_text_ipv4(FAR const char *path, FAR const char *netdev,
  * Input Parameters:
  *   path    - The full path to the IP configuration file
  *   netdev  - Network device name string
- *   ipv6cfg - The IPv6 configration to write
+ *   ipv6cfg - The IPv6 configuration to write
  *
  * Returned Value:
  *   Zero is returned on success; a negated errno value is returned on any
diff --git a/fsutils/mkfatfs/configfat.c b/fsutils/mkfatfs/configfat.c
index cb6d41da4..a3550cf7a 100644
--- a/fsutils/mkfatfs/configfat.c
+++ b/fsutils/mkfatfs/configfat.c
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include "fsutils/mkfatfs.h"
diff --git a/fsutils/mkfatfs/mkfatfs.c b/fsutils/mkfatfs/mkfatfs.c
index 2bf7e56b8..8b2227e02 100644
--- a/fsutils/mkfatfs/mkfatfs.c
+++ b/fsutils/mkfatfs/mkfatfs.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <unistd.h>
 
diff --git a/fsutils/mkfatfs/writefat.c b/fsutils/mkfatfs/writefat.c
index d88e0bbb7..01837d05c 100644
--- a/fsutils/mkfatfs/writefat.c
+++ b/fsutils/mkfatfs/writefat.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/fs/fat.h>
@@ -206,7 +206,7 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt,
 
       /* The following fields are only valid for FAT12/16 */
 
-      /*  1@36: Drive number for MSDOS bootstrap -- left zero */
+      /*  1@36: Drive number for MS-DOS bootstrap -- left zero */
 
       /*  1@37: Reserved (zero) */
 
@@ -268,7 +268,7 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt,
 
       /* 12@52: Reserved (zero) */
 
-      /*  1@64: Drive number for MSDOS bootstrap -- left zero */
+      /*  1@64: Drive number for MS-DOS bootstrap -- left zero */
 
       /*  1@65: Reserved (zero) */
 
diff --git a/fsutils/mkgpt/mkgpt.c b/fsutils/mkgpt/mkgpt.c
index e7621fab0..994902067 100644
--- a/fsutils/mkgpt/mkgpt.c
+++ b/fsutils/mkgpt/mkgpt.c
@@ -32,7 +32,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/graphics/ft80x/ft80x.h b/graphics/ft80x/ft80x.h
index 6462f1ce1..64254691c 100644
--- a/graphics/ft80x/ft80x.h
+++ b/graphics/ft80x/ft80x.h
@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_GRAPHICS_FT80X
 
diff --git a/graphics/input/generator/input_gen_ctx.c b/graphics/input/generator/input_gen_ctx.c
index 6449979fd..ea415e020 100644
--- a/graphics/input/generator/input_gen_ctx.c
+++ b/graphics/input/generator/input_gen_ctx.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <strings.h>
diff --git a/graphics/input/generator/input_gen_dev.c b/graphics/input/generator/input_gen_dev.c
index 117946d9c..9c921107c 100644
--- a/graphics/input/generator/input_gen_dev.c
+++ b/graphics/input/generator/input_gen_dev.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
diff --git a/graphics/input/generator/input_gen_event.c b/graphics/input/generator/input_gen_event.c
index 64637bb85..51219d51b 100644
--- a/graphics/input/generator/input_gen_event.c
+++ b/graphics/input/generator/input_gen_event.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdint.h>
 #include <unistd.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
index 472348ba5..663048593 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
index 773f0435e..c7628b41a 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
index 8b1749d88..608e77929 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
index 8af3de7d1..51a09a16c 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
@@ -31,7 +31,7 @@
 #include <cstdlib>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
index a19c6f880..e84caf02f 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
index a13783bd5..0d69a2838 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
index 8719611ba..087e31499 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
index 1ff5a0a53..8f8398324 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
index 1bd72dba5..205884f47 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
index ec673c5f2..01081b38e 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
index f46468626..acee748fa 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
index d7593734f..89884872f 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/param.h>
 
 #include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
index e40c78be7..59546fa73 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
index 2809bfb26..a9e38f00a 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
index c3fd43ecc..0d563eecb 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
index 3423d6e74..339627a74 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
index 2472f19f2..9eedd8aa4 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
index 34568a5f4..99970b6f1 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
index bfd5dfd2c..9e9d4b269 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
@@ -31,7 +31,7 @@
 #include <cstdlib>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
index 64cf7c366..a51555e44 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
index f566d8bcd..783fb0b52 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
index bed815541..c822abf1a 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
index 1851674ad..1b439125f 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
index 57ccc1f0d..317a08bec 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
index ca0310ae2..0663f74c3 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
index 58fe9b6a1..a8dbe2603 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
index 71946d325..641ccb9ec 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
index fd6dcbeb0..a1e713660 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
@@ -31,7 +31,7 @@
 #include <cstdlib>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
index 3da02db99..146f9172a 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
index 212d512a7..9ebfed210 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
index 45864f1e5..c9bb459ed 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
index 7bd3836de..b81fff628 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
index 452240dc9..7171c26cd 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
index d5c5d4b9f..3df02715f 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
index 11ad6bb07..537774ea8 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
index dd8dcf103..657da3d8e 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
index fd0c13b40..b093382a1 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
index 683dc02dc..5d0be7bb5 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
index fc8d7ee29..8a5c1f0df 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index 51ea0e6e2..2429a75d1 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
index e59f0fe3b..21501c125 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
index c8b31b392..b53d318d5 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
index 04664b08b..9497febe5 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
index bbf21f2c2..8770f5df4 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
index 159fb3bf2..fc062fed2 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
index 9b8f21b54..6c122a20b 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
index 8a9e19496..5dd3880f7 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
index 538af2daf..9f9297399 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
index 40872745c..2d109b35a 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
index efad3275e..aa2241764 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
index 7bad5e81d..0bac9b3d6 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
index 92de3dd85..ef9a5e362 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
index 4d0fad790..d34d937b9 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
@@ -30,7 +30,7 @@
 #include <cstdio>
 #include <cerrno>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
index 427824422..21e994d74 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
@@ -32,7 +32,7 @@
 #include <nuttx/init.h>
 #include <cstdio>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/nxwidgets/src/ccallback.cxx b/graphics/nxwidgets/src/ccallback.cxx
index 510f55161..f07deaf93 100644
--- a/graphics/nxwidgets/src/ccallback.cxx
+++ b/graphics/nxwidgets/src/ccallback.cxx
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <cassert>
 #include <cerrno>
@@ -308,7 +308,7 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
  *   NXEVENT_SYCNCHED - Synchronization handshake
  *
  *     This completes the handshake started by nx_synch().  nx_synch()
- *     sends a syncrhonization messages to the NX server which responds
+ *     sends a synchronization message to the NX server which responds
  *     with this event.  The sleeping client is awakened and continues
  *     graphics processing, completing the handshake.
  *
diff --git a/graphics/nxwidgets/src/cgraphicsport.cxx b/graphics/nxwidgets/src/cgraphicsport.cxx
index 2e299162d..ffe56033e 100644
--- a/graphics/nxwidgets/src/cgraphicsport.cxx
+++ b/graphics/nxwidgets/src/cgraphicsport.cxx
@@ -64,7 +64,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nxglib.h>
 #include <nuttx/video/rgbcolors.h>
diff --git a/graphics/nxwidgets/src/cimage.cxx b/graphics/nxwidgets/src/cimage.cxx
index a500c3b4e..337b7fea4 100644
--- a/graphics/nxwidgets/src/cimage.cxx
+++ b/graphics/nxwidgets/src/cimage.cxx
@@ -62,7 +62,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nxglib.h>
 
diff --git a/graphics/nxwidgets/src/clabelgrid.cxx b/graphics/nxwidgets/src/clabelgrid.cxx
index 6302f4c6a..175535bba 100644
--- a/graphics/nxwidgets/src/clabelgrid.cxx
+++ b/graphics/nxwidgets/src/clabelgrid.cxx
@@ -59,7 +59,7 @@
  ****************************************************************************/
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/clabelgrid.hxx"
 #include "graphics/nxwidgets/clabel.hxx"
diff --git a/graphics/nxwidgets/src/cnumericedit.cxx b/graphics/nxwidgets/src/cnumericedit.cxx
index 770f727c7..22556c7d8 100644
--- a/graphics/nxwidgets/src/cnumericedit.cxx
+++ b/graphics/nxwidgets/src/cnumericedit.cxx
@@ -66,7 +66,7 @@
 #include <limits.h>
 
 #include <nuttx/nx/nxglib.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/cnumericedit.hxx"
 #include "graphics/nxwidgets/cbutton.hxx"
diff --git a/graphics/nxwidgets/src/cnxserver.cxx b/graphics/nxwidgets/src/cnxserver.cxx
index 67ad93332..60f841833 100644
--- a/graphics/nxwidgets/src/cnxserver.cxx
+++ b/graphics/nxwidgets/src/cnxserver.cxx
@@ -37,7 +37,7 @@
 #include <cerrno>
 #include <sched.h>
 #include <pthread.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/board.h>
 
diff --git a/graphics/nxwidgets/src/cnxtimer.cxx b/graphics/nxwidgets/src/cnxtimer.cxx
index 81ba0da64..dd6be5101 100644
--- a/graphics/nxwidgets/src/cnxtimer.cxx
+++ b/graphics/nxwidgets/src/cnxtimer.cxx
@@ -64,7 +64,7 @@
 #include <stdbool.h>
 #include <cstring>
 #include <ctime>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/clock.h>
diff --git a/graphics/nxwidgets/src/cscaledbitmap.cxx b/graphics/nxwidgets/src/cscaledbitmap.cxx
index ec46ca5c4..65f1a372f 100644
--- a/graphics/nxwidgets/src/cscaledbitmap.cxx
+++ b/graphics/nxwidgets/src/cscaledbitmap.cxx
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <cstring>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nxglib.h>
 
@@ -64,7 +64,7 @@ CScaledBitmap::CScaledBitmap(IBitmap *bitmap, struct nxgl_size_s &newSize)
   m_xScale = itob16((uint32_t)m_bitmap->getWidth()) / newSize.w;
 
   // Similarly, yScale will be used to convert a request Y position to a Y
-  // positionin the contained bitmap:
+  // position in the contained bitmap:
   //
   // yImage = yRequested * oldHeight / newHeight
   //        = yRequested * yScale
diff --git a/graphics/nxwidgets/src/cscrollingpanel.cxx b/graphics/nxwidgets/src/cscrollingpanel.cxx
index d369d42fc..80f51c87c 100644
--- a/graphics/nxwidgets/src/cscrollingpanel.cxx
+++ b/graphics/nxwidgets/src/cscrollingpanel.cxx
@@ -62,7 +62,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/cwidgetcontrol.hxx"
 #include "graphics/nxwidgets/cscrollingpanel.hxx"
diff --git a/graphics/nxwidgets/src/cwidgetcontrol.cxx b/graphics/nxwidgets/src/cwidgetcontrol.cxx
index 921b05412..3107d7729 100644
--- a/graphics/nxwidgets/src/cwidgetcontrol.cxx
+++ b/graphics/nxwidgets/src/cwidgetcontrol.cxx
@@ -31,7 +31,7 @@
 #include <cstring>
 #include <cerrno>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sched.h>
 
 #include "graphics/nxwidgets/nxconfig.hxx"
diff --git a/graphics/nxwidgets/src/singletons.cxx b/graphics/nxwidgets/src/singletons.cxx
index e6c4da73e..a6e44797c 100644
--- a/graphics/nxwidgets/src/singletons.cxx
+++ b/graphics/nxwidgets/src/singletons.cxx
@@ -64,7 +64,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sched.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/nxconfig.hxx"
 #include "graphics/nxwidgets/cnxserver.hxx"
diff --git a/graphics/nxwm/src/ccalibration.cxx b/graphics/nxwm/src/ccalibration.cxx
index 21adb2183..262a9d567 100644
--- a/graphics/nxwm/src/ccalibration.cxx
+++ b/graphics/nxwm/src/ccalibration.cxx
@@ -30,7 +30,7 @@
 #include <sched.h>
 #include <limits.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
diff --git a/graphics/nxwm/src/chexcalculator.cxx b/graphics/nxwm/src/chexcalculator.cxx
index e5ab0d9e8..f2cf62018 100644
--- a/graphics/nxwm/src/chexcalculator.cxx
+++ b/graphics/nxwm/src/chexcalculator.cxx
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <cstdio>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/cwidgetcontrol.hxx"
 
diff --git a/graphics/nxwm/src/ckeyboard.cxx b/graphics/nxwm/src/ckeyboard.cxx
index 20dcc44cc..7afb0b0ae 100644
--- a/graphics/nxwm/src/ckeyboard.cxx
+++ b/graphics/nxwm/src/ckeyboard.cxx
@@ -32,7 +32,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include "graphics/nxwm/nxwmconfig.hxx"
@@ -188,7 +188,7 @@ int CKeyboard::open(void)
 
               if (errcode == ENOENT || errcode == ENODEV)
                 {
-                  // REVIST: Can we inject a constant string here to let the
+                  // REVISIT: Can we inject a constant string here to let the
                   // user know that we are waiting for a USB keyboard to be
                   // connected?
 
diff --git a/graphics/nxwm/src/cmediaplayer.cxx b/graphics/nxwm/src/cmediaplayer.cxx
index bcfb95718..8561eb469 100644
--- a/graphics/nxwm/src/cmediaplayer.cxx
+++ b/graphics/nxwm/src/cmediaplayer.cxx
@@ -33,7 +33,7 @@
 #include <cerrno>
 #include <strings.h>
 #include <dirent.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "system/nxplayer.h"
 #include <nuttx/audio/audio.h>
diff --git a/graphics/nxwm/src/cnxterm.cxx b/graphics/nxwm/src/cnxterm.cxx
index 0c4d20455..40bc5997b 100644
--- a/graphics/nxwm/src/cnxterm.cxx
+++ b/graphics/nxwm/src/cnxterm.cxx
@@ -35,7 +35,7 @@
 #include <semaphore.h>
 #include <sched.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include "nshlib/nshlib.h"
diff --git a/graphics/nxwm/src/ctaskbar.cxx b/graphics/nxwm/src/ctaskbar.cxx
index d66d36850..7160b93d9 100644
--- a/graphics/nxwm/src/ctaskbar.cxx
+++ b/graphics/nxwm/src/ctaskbar.cxx
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nxglib.h>
 
@@ -617,7 +617,7 @@ bool CTaskbar::maximizeApplication(IApplication *app)
 
 /**
  * Minimize an application by moving its window to the bottom of the and
- * redrawing the next visible appliation.
+ * redrawing the next visible application.
  *
  * @param app.  The new application to add to the task bar
  * @return true on success
diff --git a/graphics/nxwm/src/ctouchscreen.cxx b/graphics/nxwm/src/ctouchscreen.cxx
index bbebc0f7a..b7807c710 100644
--- a/graphics/nxwm/src/ctouchscreen.cxx
+++ b/graphics/nxwm/src/ctouchscreen.cxx
@@ -34,7 +34,7 @@
 #include <sched.h>
 #include <pthread.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/nx/nxglib.h>
@@ -181,7 +181,7 @@ void CTouchscreen::setCalibrationData(const struct SCalibrationData &caldata)
   m_calibData = caldata;
 
   // Note that we have calibration data.  Data will now be scaled and forwarded
-  // to NX (unless we are still in cpature mode)
+  // to NX (unless we are still in capture mode)
 
    m_calibrated = true;
 
@@ -205,7 +205,7 @@ bool CTouchscreen::waitRawTouchData(struct touch_sample_s *touch)
 {
   _info("Capturing touch input\n");
 
-  // Setup to cpature raw data into the user provided buffer
+  // Setup to capture raw data into the user provided buffer
 
   sched_lock();
   m_touch   = touch;
diff --git a/graphics/nxwm/src/cwindowmessenger.cxx b/graphics/nxwm/src/cwindowmessenger.cxx
index 8761e4799..92a2ba91a 100644
--- a/graphics/nxwm/src/cwindowmessenger.cxx
+++ b/graphics/nxwm/src/cwindowmessenger.cxx
@@ -28,7 +28,7 @@
 
 #include <cerrno>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 
 #include "graphics/nxwm/nxwmconfig.hxx"
diff --git a/graphics/slcd/cslcd.cxx b/graphics/slcd/cslcd.cxx
index 8f7320e1e..f732b8e42 100644
--- a/graphics/slcd/cslcd.cxx
+++ b/graphics/slcd/cslcd.cxx
@@ -25,7 +25,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nx.h>
 
diff --git a/graphics/tiff/tiff_addstrip.c b/graphics/tiff/tiff_addstrip.c
index ff4a9d598..5db952088 100644
--- a/graphics/tiff/tiff_addstrip.c
+++ b/graphics/tiff/tiff_addstrip.c
@@ -28,7 +28,7 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/tiff.h"
 
diff --git a/graphics/tiff/tiff_finalize.c b/graphics/tiff/tiff_finalize.c
index 2ad01a06e..da49343c9 100644
--- a/graphics/tiff/tiff_finalize.c
+++ b/graphics/tiff/tiff_finalize.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/tiff.h"
 
diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c
index b6de8408d..263f650cf 100644
--- a/graphics/tiff/tiff_initialize.c
+++ b/graphics/tiff/tiff_initialize.c
@@ -32,7 +32,7 @@
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/tiff.h"
 
@@ -68,7 +68,7 @@
  *          172    XResolution                 Hard-coded to 300/1
  *          180    YResolution                 Hard-coded to 300/1
  *          188    "NuttX"                     Length = 6 (including NUL terminator)
- *          194    "YYYY:MM:DD HH:MM:SS"       Length = 20 (ncluding NUL terminator)
+ *          194    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL terminator)
  *          214    [2 bytes padding]
  *          216    StripByteCounts             Beginning of strip byte counts
  *          xxx    StripOffsets                Beginning of strip offsets
@@ -121,7 +121,7 @@
  *          184    XResolution                 Hard-coded to 300/1
  *          192    YResolution                 Hard-coded to 300/1
  *          200    "NuttX"                     Length = 6 (including NUL terminator)
- *          206    "YYYY:MM:DD HH:MM:SS"       Length = 20 (ncluding NUL terminator)
+ *          206    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL terminator)
  *          226    [2 bytes padding]
  *          228    StripByteCounts             Beginning of strip byte counts
  *          xxx    StripOffsets                Beginning of strip offsets
@@ -170,7 +170,7 @@
  *          212    BitsPerSample               8, 8, 8
  *          218    [2 bytes padding]
  *          220    "NuttX"                     Length = 6 (including NUL terminator)
- *          226    "YYYY:MM:DD HH:MM:SS"       Length = 20 (ncluding NUL terminator)
+ *          226    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL terminator)
  *          246    [2 bytes padding]
  *          248    StripByteCounts             Beginning of strip byte counts
  *          xxx    StripOffsets                Beginning of strip offsets
@@ -410,7 +410,7 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
 
   gmtime_r((FAR const time_t*)&ts.tv_sec, &tm);
 
-  /* Comvert the current time in the TIFF format */
+  /* Convert the current time to TIFF format */
 
   strftime(timbuf, buflen, TIFF_DATETIME_FORMAT, &tm);
   return OK;
diff --git a/graphics/tiff/tiff_utils.c b/graphics/tiff/tiff_utils.c
index c16f7b3e3..17e72689b 100644
--- a/graphics/tiff/tiff_utils.c
+++ b/graphics/tiff/tiff_utils.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/tiff.h"
 
@@ -335,7 +335,7 @@ int tiff_putstring(int fd, FAR const char *string, int len)
  * Name: tiff_wordalign
  *
  * Description:
- *  Pad a file with zeros as necessary to achieve word alignament.
+ *  Pad a file with zeros as necessary to achieve word alignment.
  *
  * Input Parameters:
  *   fd - File descriptor to be used.
diff --git a/graphics/twm4nx/apps/ccalibration.cxx b/graphics/twm4nx/apps/ccalibration.cxx
index 7eab8067a..40317cdb6 100644
--- a/graphics/twm4nx/apps/ccalibration.cxx
+++ b/graphics/twm4nx/apps/ccalibration.cxx
@@ -32,7 +32,7 @@
 
 #include <limits.h>
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sched.h>
 #include <unistd.h>
 
diff --git a/graphics/twm4nx/apps/cclock.cxx b/graphics/twm4nx/apps/cclock.cxx
index 55c6c3e34..e9d3b55bd 100644
--- a/graphics/twm4nx/apps/cclock.cxx
+++ b/graphics/twm4nx/apps/cclock.cxx
@@ -31,7 +31,7 @@
 #include <cassert>
 
 #include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sched.h>
 #include <unistd.h>
 
diff --git a/graphics/twm4nx/apps/cnxterm.cxx b/graphics/twm4nx/apps/cnxterm.cxx
index 1918775a8..a36edc4db 100644
--- a/graphics/twm4nx/apps/cnxterm.cxx
+++ b/graphics/twm4nx/apps/cnxterm.cxx
@@ -34,7 +34,7 @@
 #include <sys/boardctl.h>
 #include <semaphore.h>
 #include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include "nshlib/nshlib.h"
diff --git a/graphics/twm4nx/src/cmainmenu.cxx b/graphics/twm4nx/src/cmainmenu.cxx
index 2c2034f3b..e2b9c1992 100644
--- a/graphics/twm4nx/src/cmainmenu.cxx
+++ b/graphics/twm4nx/src/cmainmenu.cxx
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <graphics/nxwidgets/cnxstring.hxx>
 
diff --git a/include/graphics/nxwidgets/cscaledbitmap.hxx b/include/graphics/nxwidgets/cscaledbitmap.hxx
index b2cc5f577..f175dd6ee 100644
--- a/include/graphics/nxwidgets/cscaledbitmap.hxx
+++ b/include/graphics/nxwidgets/cscaledbitmap.hxx
@@ -32,7 +32,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/video/rgbcolors.h>
 #include <nuttx/nx/nxglib.h>
diff --git a/include/graphics/nxwm/cstartwindow.hxx b/include/graphics/nxwm/cstartwindow.hxx
index fb4fb2acb..2c1d0178a 100644
--- a/include/graphics/nxwm/cstartwindow.hxx
+++ b/include/graphics/nxwm/cstartwindow.hxx
@@ -29,7 +29,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/tnxarray.hxx"
 
diff --git a/include/graphics/twm4nx/apps/calib_config.hxx b/include/graphics/twm4nx/apps/calib_config.hxx
index 85abc746a..ffcdfc6a7 100644
--- a/include/graphics/twm4nx/apps/calib_config.hxx
+++ b/include/graphics/twm4nx/apps/calib_config.hxx
@@ -28,7 +28,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxwidgets/nxconfig.hxx"
 #include "graphics/twm4nx/twm4nx_config.hxx"
diff --git a/include/graphics/twm4nx/apps/clock_config.hxx b/include/graphics/twm4nx/apps/clock_config.hxx
index b6c059060..2e2db213c 100644
--- a/include/graphics/twm4nx/apps/clock_config.hxx
+++ b/include/graphics/twm4nx/apps/clock_config.hxx
@@ -28,7 +28,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxglyphs.hxx"
 #include "graphics/nxwidgets/crlepalettebitmap.hxx"
diff --git a/include/graphics/twm4nx/apps/nxterm_config.hxx b/include/graphics/twm4nx/apps/nxterm_config.hxx
index e90be9b90..2d0661e9e 100644
--- a/include/graphics/twm4nx/apps/nxterm_config.hxx
+++ b/include/graphics/twm4nx/apps/nxterm_config.hxx
@@ -28,7 +28,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxglyphs.hxx"
 #include "graphics/nxwidgets/crlepalettebitmap.hxx"
diff --git a/include/graphics/twm4nx/ciconwidget.hxx b/include/graphics/twm4nx/ciconwidget.hxx
index e96b69ca8..e9152fc19 100644
--- a/include/graphics/twm4nx/ciconwidget.hxx
+++ b/include/graphics/twm4nx/ciconwidget.hxx
@@ -32,7 +32,7 @@
 #include <cstdint>
 #include <cstdbool>
 #include <mqueue.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/nx/nxglib.h>
 #include <nuttx/nx/nx.h>
diff --git a/include/graphics/twm4nx/twm4nx_config.hxx b/include/graphics/twm4nx/twm4nx_config.hxx
index 679cc887e..60b34d09d 100644
--- a/include/graphics/twm4nx/twm4nx_config.hxx
+++ b/include/graphics/twm4nx/twm4nx_config.hxx
@@ -28,7 +28,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "graphics/nxglyphs.hxx"
 #include "graphics/nxwidgets/nxconfig.hxx"
diff --git a/include/netutils/cmux.h b/include/netutils/cmux.h
index 42f0d5ca0..8bbf2e1f0 100644
--- a/include/netutils/cmux.h
+++ b/include/netutils/cmux.h
@@ -29,7 +29,7 @@
 
 #include <sys/time.h>
 #include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 /****************************************************************************
diff --git a/industry/foc/fixed16/foc_cordic.c b/industry/foc/fixed16/foc_cordic.c
index fdd4cc059..22af88a46 100644
--- a/industry/foc/fixed16/foc_cordic.c
+++ b/industry/foc/fixed16/foc_cordic.c
@@ -30,7 +30,7 @@
 
 #include <assert.h>
 #include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/math/cordic.h>
diff --git a/industry/foc/float/foc_cordic.c b/industry/foc/float/foc_cordic.c
index f53c05674..d4fe510ff 100644
--- a/industry/foc/float/foc_cordic.c
+++ b/industry/foc/float/foc_cordic.c
@@ -30,7 +30,7 @@
 
 #include <assert.h>
 #include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/math/cordic.h>
diff --git a/interpreters/python/python_wrapper.c b/interpreters/python/python_wrapper.c
index 1eb1d3cc3..6617bae98 100644
--- a/interpreters/python/python_wrapper.c
+++ b/interpreters/python/python_wrapper.c
@@ -41,7 +41,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/drivers/ramdisk.h>
 
diff --git a/logging/nxscope/nxscope.c b/logging/nxscope/nxscope.c
index f919bf62c..094395dd8 100644
--- a/logging/nxscope/nxscope.c
+++ b/logging/nxscope/nxscope.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
@@ -150,7 +150,7 @@ static int nxscope_chinfo_send(FAR struct nxscope_s *s, uint8_t ch)
   namelen = strnlen(s->chinfo[ch].name, CHAN_NAMELEN_MAX);
   memcpy(&data[tmp], s->chinfo[ch].name, namelen);
 
-  /* Treminate name wit a null-character */
+  /* Terminate name with a null character */
 
   txlen = tmp  + namelen + 1;
   data[txlen - 1] = '\0';
diff --git a/logging/nxscope/nxscope_chan.c b/logging/nxscope/nxscope_chan.c
index 10c30ad25..a68451f47 100644
--- a/logging/nxscope/nxscope_chan.c
+++ b/logging/nxscope/nxscope_chan.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <endian.h>
 #include <errno.h>
 #include <string.h>
diff --git a/logging/nxscope/nxscope_idummy.c b/logging/nxscope/nxscope_idummy.c
index 8615748af..f139ce4dd 100644
--- a/logging/nxscope/nxscope_idummy.c
+++ b/logging/nxscope/nxscope_idummy.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/logging/nxscope/nxscope_internals.c b/logging/nxscope/nxscope_internals.c
index 43ffdd610..b001b4187 100644
--- a/logging/nxscope/nxscope_internals.c
+++ b/logging/nxscope/nxscope_internals.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/logging/nxscope/nxscope_iser.c b/logging/nxscope/nxscope_iser.c
index b1722042b..492617723 100644
--- a/logging/nxscope/nxscope_iser.c
+++ b/logging/nxscope/nxscope_iser.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/logging/nxscope/nxscope_iudp.c b/logging/nxscope/nxscope_iudp.c
index 07aae7711..5a5e1eed0 100644
--- a/logging/nxscope/nxscope_iudp.c
+++ b/logging/nxscope/nxscope_iudp.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
diff --git a/logging/nxscope/nxscope_pser.c b/logging/nxscope/nxscope_pser.c
index 2d0917d51..2f8d5ad41 100644
--- a/logging/nxscope/nxscope_pser.c
+++ b/logging/nxscope/nxscope_pser.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <endian.h>
 #include <errno.h>
 #include <string.h>
@@ -274,7 +274,7 @@ int nxscope_proto_ser_init(FAR struct nxscope_proto_s *proto, FAR void *cfg)
 {
   DEBUGASSERT(proto);
 
-  /* cfg argument not used, but keept here for compatibility with
+  /* cfg argument not used, but kept here for compatibility with
    * future protocol implementations.
    */
 
diff --git a/lte/alt1250/alt1250_dbg.h b/lte/alt1250/alt1250_dbg.h
index 82b9bb27a..0034bea82 100644
--- a/lte/alt1250/alt1250_dbg.h
+++ b/lte/alt1250/alt1250_dbg.h
@@ -29,7 +29,7 @@
 
 #include <nuttx/config.h>
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/lte/lapi/src/lapi_dbg.h b/lte/lapi/src/lapi_dbg.h
index 403847653..ebe02523a 100644
--- a/lte/lapi/src/lapi_dbg.h
+++ b/lte/lapi/src/lapi_dbg.h
@@ -27,7 +27,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/netutils/chat/chat.c b/netutils/chat/chat.c
index 3849631df..c1af84ae8 100644
--- a/netutils/chat/chat.c
+++ b/netutils/chat/chat.c
@@ -45,7 +45,7 @@
 #include <sys/stat.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <poll.h>
 #include <stdio.h>
diff --git a/netutils/cmux/cmux.h b/netutils/cmux/cmux.h
index 470aacfa4..7758f83b5 100644
--- a/netutils/cmux/cmux.h
+++ b/netutils/cmux/cmux.h
@@ -29,7 +29,7 @@
 
 #include <sys/time.h>
 #include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #define CMUX_BIT0 (0)
diff --git a/netutils/dhcp6c/dhcp6c.c b/netutils/dhcp6c/dhcp6c.c
index 5418c0a98..3989bee0c 100644
--- a/netutils/dhcp6c/dhcp6c.c
+++ b/netutils/dhcp6c/dhcp6c.c
@@ -36,7 +36,7 @@
 #include <resolv.h>
 #include <string.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index 003d7d8cb..e899b6930 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <pthread.h>
 
 #include <arpa/inet.h>
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index a382709a2..a166e9123 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -40,7 +40,7 @@
 #  define OK    (0)
 #else
 #  include <nuttx/config.h>          /* NuttX configuration */
-#  include <debug.h>                 /* For nerr, info */
+#  include <nuttx/debug.h>                 /* For nerr, info */
 #  include <nuttx/compiler.h>        /* For CONFIG_CPP_HAVE_WARNING */
 #  include "netutils/dhcpd.h"        /* Advertised DHCPD APIs */
 #endif
diff --git a/netutils/discover/discover.c b/netutils/discover/discover.c
index 6bb3f675b..ba11fbe87 100644
--- a/netutils/discover/discover.c
+++ b/netutils/discover/discover.c
@@ -24,7 +24,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <sched.h>
 #include <stdint.h>
diff --git a/netutils/esp8266/esp8266.c b/netutils/esp8266/esp8266.c
index 51de514b7..051dd15fc 100644
--- a/netutils/esp8266/esp8266.c
+++ b/netutils/esp8266/esp8266.c
@@ -39,7 +39,7 @@
 #include <termios.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <netdb.h>
diff --git a/netutils/ftpc/ftpc_chmod.c b/netutils/ftpc/ftpc_chmod.c
index 5710b7c8b..d9b490b0a 100644
--- a/netutils/ftpc/ftpc_chmod.c
+++ b/netutils/ftpc/ftpc_chmod.c
@@ -26,7 +26,7 @@
 
 #include "ftpc_config.h"
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_cmd.c b/netutils/ftpc/ftpc_cmd.c
index b6b7556b5..1e3ff9ea8 100644
--- a/netutils/ftpc/ftpc_cmd.c
+++ b/netutils/ftpc/ftpc_cmd.c
@@ -30,7 +30,7 @@
 #include <strings.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "ftpc_internal.h"
 
diff --git a/netutils/ftpc/ftpc_connect.c b/netutils/ftpc/ftpc_connect.c
index 8624f4905..61defa614 100644
--- a/netutils/ftpc/ftpc_connect.c
+++ b/netutils/ftpc/ftpc_connect.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 
diff --git a/netutils/ftpc/ftpc_getfile.c b/netutils/ftpc/ftpc_getfile.c
index 83524df4e..3ca989a80 100644
--- a/netutils/ftpc/ftpc_getfile.c
+++ b/netutils/ftpc/ftpc_getfile.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include "netutils/ftpc.h"
diff --git a/netutils/ftpc/ftpc_getreply.c b/netutils/ftpc/ftpc_getreply.c
index d5a3d0983..e63e0ed2b 100644
--- a/netutils/ftpc/ftpc_getreply.c
+++ b/netutils/ftpc/ftpc_getreply.c
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "ftpc_internal.h"
 
diff --git a/netutils/ftpc/ftpc_idle.c b/netutils/ftpc/ftpc_idle.c
index 42e2fdbef..dd5ab5c23 100644
--- a/netutils/ftpc/ftpc_idle.c
+++ b/netutils/ftpc/ftpc_idle.c
@@ -26,7 +26,7 @@
 
 #include "ftpc_config.h"
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_listdir.c b/netutils/ftpc/ftpc_listdir.c
index 92461f6e3..02947ad5c 100644
--- a/netutils/ftpc/ftpc_listdir.c
+++ b/netutils/ftpc/ftpc_listdir.c
@@ -33,7 +33,7 @@
 #include <libgen.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/ftpc.h"
 
diff --git a/netutils/ftpc/ftpc_login.c b/netutils/ftpc/ftpc_login.c
index 9e99c0dc5..4ee477e00 100644
--- a/netutils/ftpc/ftpc_login.c
+++ b/netutils/ftpc/ftpc_login.c
@@ -28,7 +28,7 @@
 
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/ftpc.h"
 
diff --git a/netutils/ftpc/ftpc_putfile.c b/netutils/ftpc/ftpc_putfile.c
index 9ac75cc0e..a0ea6bc3e 100644
--- a/netutils/ftpc/ftpc_putfile.c
+++ b/netutils/ftpc/ftpc_putfile.c
@@ -35,7 +35,7 @@
 #include <libgen.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/ftpc.h"
 
diff --git a/netutils/ftpc/ftpc_rpwd.c b/netutils/ftpc/ftpc_rpwd.c
index 8ff608d9b..c2673b20e 100644
--- a/netutils/ftpc/ftpc_rpwd.c
+++ b/netutils/ftpc/ftpc_rpwd.c
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/ftpc.h"
 
diff --git a/netutils/ftpc/ftpc_socket.c b/netutils/ftpc/ftpc_socket.c
index db9b4ccd0..4a769a3d3 100644
--- a/netutils/ftpc/ftpc_socket.c
+++ b/netutils/ftpc/ftpc_socket.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_transfer.c b/netutils/ftpc/ftpc_transfer.c
index 7d294d52d..b6ef5a65c 100644
--- a/netutils/ftpc/ftpc_transfer.c
+++ b/netutils/ftpc/ftpc_transfer.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <arpa/inet.h>
 
 #include "netutils/ftpc.h"
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 73b8fc9b9..a6ed75324 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -58,7 +58,7 @@
 #include <libgen.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 
diff --git a/netutils/libcurl4nx/curl4nx_easy_cleanup.c b/netutils/libcurl4nx/curl4nx_easy_cleanup.c
index 1c3000671..0533693e8 100644
--- a/netutils/libcurl4nx/curl4nx_easy_cleanup.c
+++ b/netutils/libcurl4nx/curl4nx_easy_cleanup.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_duphandle.c b/netutils/libcurl4nx/curl4nx_easy_duphandle.c
index 4de16e0af..9bf44580c 100644
--- a/netutils/libcurl4nx/curl4nx_easy_duphandle.c
+++ b/netutils/libcurl4nx/curl4nx_easy_duphandle.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_escape.c b/netutils/libcurl4nx/curl4nx_easy_escape.c
index ff76d6d8c..8c5919b72 100644
--- a/netutils/libcurl4nx/curl4nx_easy_escape.c
+++ b/netutils/libcurl4nx/curl4nx_easy_escape.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_getinfo.c b/netutils/libcurl4nx/curl4nx_easy_getinfo.c
index ed8e90a9d..ff64739ad 100644
--- a/netutils/libcurl4nx/curl4nx_easy_getinfo.c
+++ b/netutils/libcurl4nx/curl4nx_easy_getinfo.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_init.c b/netutils/libcurl4nx/curl4nx_easy_init.c
index 1817bf734..661cfde76 100644
--- a/netutils/libcurl4nx/curl4nx_easy_init.c
+++ b/netutils/libcurl4nx/curl4nx_easy_init.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_perform.c b/netutils/libcurl4nx/curl4nx_easy_perform.c
index 466b3efe7..529aaa22d 100644
--- a/netutils/libcurl4nx/curl4nx_easy_perform.c
+++ b/netutils/libcurl4nx/curl4nx_easy_perform.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_reset.c b/netutils/libcurl4nx/curl4nx_easy_reset.c
index 7ece89011..9ee355a2f 100644
--- a/netutils/libcurl4nx/curl4nx_easy_reset.c
+++ b/netutils/libcurl4nx/curl4nx_easy_reset.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_setopt.c b/netutils/libcurl4nx/curl4nx_easy_setopt.c
index 03f8ff5d1..378862b9e 100644
--- a/netutils/libcurl4nx/curl4nx_easy_setopt.c
+++ b/netutils/libcurl4nx/curl4nx_easy_setopt.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_unescape.c b/netutils/libcurl4nx/curl4nx_easy_unescape.c
index 23f169afe..7e3955497 100644
--- a/netutils/libcurl4nx/curl4nx_easy_unescape.c
+++ b/netutils/libcurl4nx/curl4nx_easy_unescape.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/netutils/mdns/mdnsd.c b/netutils/mdns/mdnsd.c
index 1f648950b..d060a8849 100644
--- a/netutils/mdns/mdnsd.c
+++ b/netutils/mdns/mdnsd.c
@@ -32,7 +32,7 @@
 #include <syslog.h>
 #include <limits.h>
 #include <semaphore.h>
-#include <debug.h>                 /* For nerr, info */
+#include <nuttx/debug.h>                 /* For nerr, info */
 
 #include "netutils/netlib.h"
 #include "netutils/mdnsd.h"
diff --git a/netutils/netinit/netinit.c b/netutils/netinit/netinit.c
index c0a459725..24feea642 100644
--- a/netutils/netinit/netinit.c
+++ b/netutils/netinit/netinit.c
@@ -36,7 +36,7 @@
 #endif
 
 #include <arpa/inet.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <pthread.h>
diff --git a/netutils/netlib/netlib_checkhttpconnectivity.c b/netutils/netlib/netlib_checkhttpconnectivity.c
index 4b0df89c2..a4ed482e5 100644
--- a/netutils/netlib/netlib_checkhttpconnectivity.c
+++ b/netutils/netlib/netlib_checkhttpconnectivity.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_LIBC_NETDB
 #  include <netdb.h>
diff --git a/netutils/netlib/netlib_checkifconflict.c b/netutils/netlib/netlib_checkifconflict.c
index 5aebddd8e..c8c8fc2c1 100644
--- a/netutils/netlib/netlib_checkifconflict.c
+++ b/netutils/netlib/netlib_checkifconflict.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/netlib.h"
 
diff --git a/netutils/netlib/netlib_checkifconnectivity.c b/netutils/netlib/netlib_checkifconnectivity.c
index c08995366..bfc06001a 100644
--- a/netutils/netlib/netlib_checkifconnectivity.c
+++ b/netutils/netlib/netlib_checkifconnectivity.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <nuttx/net/ip.h>
diff --git a/netutils/netlib/netlib_checkipconnectivity.c b/netutils/netlib/netlib_checkipconnectivity.c
index 44a5c636a..04b3c3c0b 100644
--- a/netutils/netlib/netlib_checkipconnectivity.c
+++ b/netutils/netlib/netlib_checkipconnectivity.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <nuttx/net/ip.h>
diff --git a/netutils/netlib/netlib_getifstatistics.c b/netutils/netlib/netlib_getifstatistics.c
index b838d556d..e6c52abba 100644
--- a/netutils/netlib/netlib_getifstatistics.c
+++ b/netutils/netlib/netlib_getifstatistics.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/types.h>
 
diff --git a/netutils/netlib/netlib_ipmsfilter.c b/netutils/netlib/netlib_ipmsfilter.c
index d7f9b0ff1..9fa2f23aa 100644
--- a/netutils/netlib/netlib_ipmsfilter.c
+++ b/netutils/netlib/netlib_ipmsfilter.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <netinet/in.h>
 #include <sys/sockio.h>
diff --git a/netutils/netlib/netlib_listenon.c b/netutils/netlib/netlib_listenon.c
index 608937ff7..a80cd8158 100644
--- a/netutils/netlib/netlib_listenon.c
+++ b/netutils/netlib/netlib_listenon.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/netutils/netlib/netlib_nodeaddrconv.c b/netutils/netlib/netlib_nodeaddrconv.c
index 67c6ee2f7..1df293788 100644
--- a/netutils/netlib/netlib_nodeaddrconv.c
+++ b/netutils/netlib/netlib_nodeaddrconv.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "nuttx/wireless/pktradio.h"
 #include "netutils/netlib.h"
diff --git a/netutils/netlib/netlib_obtainipv4addr.c b/netutils/netlib/netlib_obtainipv4addr.c
index 5390466fe..cab55b74c 100644
--- a/netutils/netlib/netlib_obtainipv4addr.c
+++ b/netutils/netlib/netlib_obtainipv4addr.c
@@ -24,7 +24,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sys/types.h>
 
 #include "netutils/dhcpc.h"
diff --git a/netutils/netlib/netlib_obtainipv6addr.c b/netutils/netlib/netlib_obtainipv6addr.c
index f55667705..c1a74b8ce 100644
--- a/netutils/netlib/netlib_obtainipv6addr.c
+++ b/netutils/netlib/netlib_obtainipv6addr.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <netinet/in.h>
 #include <net/if.h>
diff --git a/netutils/netlib/netlib_server.c b/netutils/netlib/netlib_server.c
index 98ff5e907..9436481bc 100644
--- a/netutils/netlib/netlib_server.c
+++ b/netutils/netlib/netlib_server.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <netinet/in.h>
 
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index 22c448fdd..ce7d2f0d9 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -40,7 +40,7 @@
 #include <sched.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <netinet/in.h>
diff --git a/netutils/pppd/ppp.h b/netutils/pppd/ppp.h
index f436a1206..519b7f168 100644
--- a/netutils/pppd/ppp.h
+++ b/netutils/pppd/ppp.h
@@ -51,7 +51,7 @@
 
 #include "netutils/chat.h"
 
-#include "debug.h"
+#include <nuttx/debug.h>
 #include "ppp_conf.h"
 #include "ahdlc.h"
 #include "lcp.h"
diff --git a/netutils/pppd/pppd.c b/netutils/pppd/pppd.c
index 73efa27c9..849e3e874 100644
--- a/netutils/pppd/pppd.c
+++ b/netutils/pppd/pppd.c
@@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <netinet/in.h>
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index f85619093..74b43084d 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -40,7 +40,7 @@
 #include <sched.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c
index 989de34f9..c1512113c 100644
--- a/netutils/telnetd/telnetd_daemon.c
+++ b/netutils/telnetd/telnetd_daemon.c
@@ -35,7 +35,7 @@
 #include <sched.h>
 #include <spawn.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/net/telnet.h>
 
diff --git a/netutils/tftpc/tftpc_get.c b/netutils/tftpc/tftpc_get.c
index 36227e29a..84be9b223 100644
--- a/netutils/tftpc/tftpc_get.c
+++ b/netutils/tftpc/tftpc_get.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 
diff --git a/netutils/tftpc/tftpc_packets.c b/netutils/tftpc/tftpc_packets.c
index 05d56083c..9f6af0c65 100644
--- a/netutils/tftpc/tftpc_packets.c
+++ b/netutils/tftpc/tftpc_packets.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/netutils/tftpc/tftpc_put.c b/netutils/tftpc/tftpc_put.c
index 3f3a9c849..456100bdb 100644
--- a/netutils/tftpc/tftpc_put.c
+++ b/netutils/tftpc/tftpc_put.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/net/netconfig.h>
 #include "netutils/tftp.h"
diff --git a/netutils/thttpd/fdwatch.c b/netutils/thttpd/fdwatch.c
index 105fea30f..dcbd782e5 100644
--- a/netutils/thttpd/fdwatch.c
+++ b/netutils/thttpd/fdwatch.c
@@ -39,7 +39,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/param.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <poll.h>
 
 #include "config.h"
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 2d6a558e6..19acb562c 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -58,7 +58,7 @@
 #include <signal.h>
 #include <sched.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fnmatch.h>
 
 #include "netutils/thttpd.h"
diff --git a/netutils/thttpd/tdate_parse.c b/netutils/thttpd/tdate_parse.c
index 113059223..2b49d3995 100644
--- a/netutils/thttpd/tdate_parse.c
+++ b/netutils/thttpd/tdate_parse.c
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "tdate_parse.h"
 
diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c
index 22338665b..f7de45177 100644
--- a/netutils/thttpd/thttpd.c
+++ b/netutils/thttpd/thttpd.c
@@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 
diff --git a/netutils/thttpd/thttpd_alloc.c b/netutils/thttpd/thttpd_alloc.c
index 7999f7823..6deade0be 100644
--- a/netutils/thttpd/thttpd_alloc.c
+++ b/netutils/thttpd/thttpd_alloc.c
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <malloc.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include "config.h"
diff --git a/netutils/thttpd/thttpd_cgi.c b/netutils/thttpd/thttpd_cgi.c
index 5c8914560..a0cacf03e 100644
--- a/netutils/thttpd/thttpd_cgi.c
+++ b/netutils/thttpd/thttpd_cgi.c
@@ -52,7 +52,7 @@
 #include <libgen.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/binfmt/binfmt.h>
 #include "netutils/thttpd.h"
@@ -766,7 +766,7 @@ static int cgi_child(int argc, char **argv)
   /* Close all file descriptors EXCEPT for stdin, stdout, stderr and
    * hc->conn_fd.  We'll keep stderr open for error reporting; stdin and
    * stdout will be closed later by dup2().  Keeping stdin and stdout open
-   * now prevents re-use of fd=0 and 1 by pipe().
+   * now prevents reuse of fd=0 and 1 by pipe().
    */
 
   ninfo("Closing descriptors\n");
diff --git a/netutils/thttpd/timers.c b/netutils/thttpd/timers.c
index a3bd89831..d2026bd1b 100644
--- a/netutils/thttpd/timers.c
+++ b/netutils/thttpd/timers.c
@@ -39,7 +39,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "thttpd_alloc.h"
 #include "timers.h"
diff --git a/netutils/webclient/webclient.c b/netutils/webclient/webclient.c
index 8784b68b5..61f56cb4f 100644
--- a/netutils/webclient/webclient.c
+++ b/netutils/webclient/webclient.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <assert.h>
 #include <fcntl.h>
@@ -857,7 +857,7 @@ static inline int wget_parsechunkheader(struct webclient_context *ctx,
               if (semicolon != NULL)
                 {
                   found_extension = true;
-                  ninfo("Ignoring extentions in chunk header\n");
+                  ninfo("Ignoring extensions in chunk header\n");
                   *semicolon = 0;
                 }
             }
diff --git a/netutils/webserver/httpd.c b/netutils/webserver/httpd.c
index 23f69a949..1cc8d58fc 100644
--- a/netutils/webserver/httpd.c
+++ b/netutils/webserver/httpd.c
@@ -52,7 +52,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifndef CONFIG_NETUTILS_HTTPD_SINGLECONNECT
 #  include <pthread.h>
diff --git a/netutils/webserver/httpd_dirlist.c b/netutils/webserver/httpd_dirlist.c
index bac1b2d77..6dda65286 100644
--- a/netutils/webserver/httpd_dirlist.c
+++ b/netutils/webserver/httpd_dirlist.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <string.h>
 #include <dirent.h>
 #include <stdlib.h>
diff --git a/netutils/webserver/httpd_mmap.c b/netutils/webserver/httpd_mmap.c
index a4f47427d..b17ad54c4 100644
--- a/netutils/webserver/httpd_mmap.c
+++ b/netutils/webserver/httpd_mmap.c
@@ -35,7 +35,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/httpd.h"
 
diff --git a/netutils/webserver/httpd_sendfile.c b/netutils/webserver/httpd_sendfile.c
index 7ff8a5ccd..3a8286fe9 100644
--- a/netutils/webserver/httpd_sendfile.c
+++ b/netutils/webserver/httpd_sendfile.c
@@ -35,7 +35,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "netutils/httpd.h"
 
diff --git a/nshlib/nsh_altconsole.c b/nshlib/nsh_altconsole.c
index 7423fedf7..bb9fc30f2 100644
--- a/nshlib/nsh_altconsole.c
+++ b/nshlib/nsh_altconsole.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <string.h>
 
 #include "nsh.h"
diff --git a/nshlib/nsh_codeccmd.c b/nshlib/nsh_codeccmd.c
index 91b3953ff..0d677669f 100644
--- a/nshlib/nsh_codeccmd.c
+++ b/nshlib/nsh_codeccmd.c
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <libgen.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #if defined(CONFIG_NSH_DISABLE_URLENCODE) && defined(CONFIG_NSH_DISABLE_URLDECODE)
 #  undef CONFIG_CODECS_URLCODE
diff --git a/nshlib/nsh_console.c b/nshlib/nsh_console.c
index cb95e0342..ebcbe6fb2 100644
--- a/nshlib/nsh_console.c
+++ b/nshlib/nsh_console.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "nsh.h"
 #include "nsh_console.h"
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 13f26f694..a88c1a20d 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -43,7 +43,7 @@
 #include <limits.h>
 #include <libgen.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "nsh.h"
 
diff --git a/nshlib/nsh_mntcmds.c b/nshlib/nsh_mntcmds.c
index f4a2e903b..a58d6ef9c 100644
--- a/nshlib/nsh_mntcmds.c
+++ b/nshlib/nsh_mntcmds.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <netdb.h>
 
 #include <netinet/in.h>
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 8cd0d6cc3..3171bdfbb 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -45,7 +45,7 @@
 #include <libgen.h>      /* Needed for basename */
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <getopt.h>
 
 #if defined(CONFIG_LIBC_NETDB) && !defined(CONFIG_NSH_DISABLE_NSLOOKUP)
diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
index 9a67cc845..61ed7de55 100644
--- a/nshlib/nsh_parse.c
+++ b/nshlib/nsh_parse.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <sched.h>
 #include <unistd.h>
 
diff --git a/nshlib/nsh_telnetd.c b/nshlib/nsh_telnetd.c
index 62f87e479..83fc36ca6 100644
--- a/nshlib/nsh_telnetd.c
+++ b/nshlib/nsh_telnetd.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <sys/socket.h>
 
diff --git a/nshlib/nsh_usbconsole.c b/nshlib/nsh_usbconsole.c
index cc7f97005..74f8a4795 100644
--- a/nshlib/nsh_usbconsole.c
+++ b/nshlib/nsh_usbconsole.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #ifdef CONFIG_CDCACM
 #  include <nuttx/usb/cdcacm.h>
diff --git a/nshlib/nsh_usbtrace.c b/nshlib/nsh_usbtrace.c
index df05d45a3..f57a81ac6 100644
--- a/nshlib/nsh_usbtrace.c
+++ b/nshlib/nsh_usbtrace.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <stdarg.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/usb/usbdev_trace.h>
 
diff --git a/platform/mikroe-stm32f4/mikroe_configdata.c b/platform/mikroe-stm32f4/mikroe_configdata.c
index b6d9bb6fc..d65e695c7 100644
--- a/platform/mikroe-stm32f4/mikroe_configdata.c
+++ b/platform/mikroe-stm32f4/mikroe_configdata.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 
@@ -233,7 +233,7 @@ int platform_getconfig(enum config_data_e id, int instance,
       case CONFIGDATA_TSCALIBRATION:
 
 #ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_FS
-        /* Load config data fram a file on the filesystem.  Try to open
+        /* Load config data from a file on the filesystem.  Try to open
          * the file.
          */
 
diff --git a/system/cdcacm/sercon_main.c b/system/cdcacm/sercon_main.c
index 9b8ab41d8..c03ce2d18 100644
--- a/system/cdcacm/sercon_main.c
+++ b/system/cdcacm/sercon_main.c
@@ -30,7 +30,7 @@
 #include <sys/boardctl.h>
 
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/cdcacm.h>
diff --git a/system/cdcacm/serdis_main.c b/system/cdcacm/serdis_main.c
index 834ae186b..56e5fbfe0 100644
--- a/system/cdcacm/serdis_main.c
+++ b/system/cdcacm/serdis_main.c
@@ -30,7 +30,7 @@
 #include <sys/boardctl.h>
 
 #include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/cdcacm.h>
diff --git a/system/cle/cle.c b/system/cle/cle.c
index 21b442806..bfa01c11f 100644
--- a/system/cle/cle.c
+++ b/system/cle/cle.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <syslog.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <termios.h>
 
 #include <nuttx/ascii.h>
diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c
index 9dc4399e8..f6dc54bff 100644
--- a/system/composite/composite_main.c
+++ b/system/composite/composite_main.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/composite.h>
diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index fa5b31900..f0767ddc3 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -52,7 +52,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <signal.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <semaphore.h>
diff --git a/system/dd/dd_main.c b/system/dd/dd_main.c
index 9be5de7ac..a240ae3fe 100644
--- a/system/dd/dd_main.c
+++ b/system/dd/dd_main.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 
 #ifdef __NuttX__
-#include <debug.h>
+#include <nuttx/debug.h>
 #endif
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/system/dhcp6c/renew6_main.c b/system/dhcp6c/renew6_main.c
index d0f44382b..7149af1f2 100644
--- a/system/dhcp6c/renew6_main.c
+++ b/system/dhcp6c/renew6_main.c
@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/system/i2c/i2c_main.c b/system/i2c/i2c_main.c
index 7abe9bdd1..80e7974d2 100644
--- a/system/i2c/i2c_main.c
+++ b/system/i2c/i2c_main.c
@@ -35,7 +35,7 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "i2ctool.h"
 
@@ -165,7 +165,7 @@ static int i2ccmd_help(FAR struct i2ctool_s *i2ctool, int argc,
                  "o Arguments are \"sticky\". For example, once "
                  "the I2C address is\n");
   i2ctool_printf(i2ctool,
-                 "  specified, that address will be re-used until "
+                 "  specified, that address will be reused until "
                  "it is changed.\n");
   i2ctool_printf(i2ctool, "\nWARNING:\n");
   i2ctool_printf(i2ctool,
diff --git a/system/nxcamera/nxcamera.c b/system/nxcamera/nxcamera.c
index d2070e966..d698b9e20 100644
--- a/system/nxcamera/nxcamera.c
+++ b/system/nxcamera/nxcamera.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/system/nxlooper/nxlooper.c b/system/nxlooper/nxlooper.c
index 3d8404520..6c142ee26 100644
--- a/system/nxlooper/nxlooper.c
+++ b/system/nxlooper/nxlooper.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 0de66f68a..173ad622f 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/system/nxplayer/nxplayer_common.c b/system/nxplayer/nxplayer_common.c
index 94b794c2c..c33c38690 100644
--- a/system/nxplayer/nxplayer_common.c
+++ b/system/nxplayer/nxplayer_common.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index 6a75f6a57..2f6d01d22 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/system/nxrecorder/nxrecorder_common.c b/system/nxrecorder/nxrecorder_common.c
index d063f140c..c78a360ca 100644
--- a/system/nxrecorder/nxrecorder_common.c
+++ b/system/nxrecorder/nxrecorder_common.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/system/popen/popen.c b/system/popen/popen.c
index d9286c959..b52fbaafe 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -35,7 +35,7 @@
 #include <sched.h>
 #include <spawn.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index 273821357..0fd3b9396 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -31,7 +31,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/ascii.h>
 #include <nuttx/vt100.h>
diff --git a/system/spi/spi_main.c b/system/spi/spi_main.c
index 140826e43..8950a48b8 100644
--- a/system/spi/spi_main.c
+++ b/system/spi/spi_main.c
@@ -35,7 +35,7 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "spitool.h"
 
diff --git a/system/system/system.c b/system/system/system.c
index 3fd9850d7..46db1719b 100644
--- a/system/system/system.c
+++ b/system/system/system.c
@@ -31,7 +31,7 @@
 #include <sched.h>
 #include <spawn.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <execinfo.h>
 #include <syslog.h>
diff --git a/system/tee/tee.c b/system/tee/tee.c
index cb934c7a9..844c94c11 100644
--- a/system/tee/tee.c
+++ b/system/tee/tee.c
@@ -50,7 +50,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/system/termcurses/tcurses_vt100.c b/system/termcurses/tcurses_vt100.c
index 84c369cce..ac4685a4e 100644
--- a/system/termcurses/tcurses_vt100.c
+++ b/system/termcurses/tcurses_vt100.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
diff --git a/system/termcurses/termcurses.c b/system/termcurses/termcurses.c
index 4d042b6eb..6e3273c31 100644
--- a/system/termcurses/termcurses.c
+++ b/system/termcurses/termcurses.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "tcurses_priv.h"
 
diff --git a/system/ubloxmodem/ubloxmodem_main.c b/system/ubloxmodem/ubloxmodem_main.c
index 0a54b9240..3f7baa601 100644
--- a/system/ubloxmodem/ubloxmodem_main.c
+++ b/system/ubloxmodem/ubloxmodem_main.c
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 #include <sys/param.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c
index 6b08e4da0..3cddcc230 100644
--- a/system/usbmsc/usbmsc_main.c
+++ b/system/usbmsc/usbmsc_main.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <malloc.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbmsc.h>
diff --git a/system/vi/vi.c b/system/vi/vi.c
index d2c894cf3..e94bc4361 100644
--- a/system/vi/vi.c
+++ b/system/vi/vi.c
@@ -39,7 +39,7 @@
 #include <ctype.h>
 #include <syslog.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <system/termcurses.h>
 #include <graphics/curses.h>
diff --git a/system/zmodem/zm.h b/system/zmodem/zm.h
index a7971c00e..8593e1ff7 100644
--- a/system/zmodem/zm.h
+++ b/system/zmodem/zm.h
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 
 #include <stdint.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <syslog.h>
 
 #include <nuttx/compiler.h>
@@ -206,7 +206,7 @@
 #define ZM_XFRDONE    1              /* Success - Transfer complete */
 
 /* The actual packet buffer size includes 5 bytes to hold the transfer type
- * and the maxmimum size 4-byte CRC.
+ * and the maximum size 4-byte CRC.
  */
 
 #define ZM_PKTBUFSIZE (CONFIG_SYSTEM_ZMODEM_PKTBUFSIZE + 5)
@@ -332,7 +332,7 @@ struct zm_state_s
   uint16_t flags;            /* See ZM_FLAG_* definitions */
   uint16_t nerrors;          /* Number of data errors */
   timer_t  timer;            /* Watchdog timer */
-  int      remfd;            /* The R/W file descritor used for communication with remote */
+  int      remfd;            /* The R/W file descriptor used for communication with remote */
 
   /* Buffers.
    *
diff --git a/testing/drivers/drivertest/drivertest_audio.c b/testing/drivers/drivertest/drivertest_audio.c
index a467f6f26..de12da3d1 100644
--- a/testing/drivers/drivertest/drivertest_audio.c
+++ b/testing/drivers/drivertest/drivertest_audio.c
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <mqueue.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/audio/audio.h>
diff --git a/testing/drivers/drivertest/drivertest_framebuffer.c b/testing/drivers/drivertest/drivertest_framebuffer.c
index ac8f6f266..cf57d3f8a 100644
--- a/testing/drivers/drivertest/drivertest_framebuffer.c
+++ b/testing/drivers/drivertest/drivertest_framebuffer.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <string.h>
 #include <inttypes.h>
 #include <poll.h>
diff --git a/testing/drivers/drivertest/drivertest_lcd.c b/testing/drivers/drivertest/drivertest_lcd.c
index 647d8cbe2..405b129f0 100644
--- a/testing/drivers/drivertest/drivertest_lcd.c
+++ b/testing/drivers/drivertest/drivertest_lcd.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <string.h>
 #include <inttypes.h>
 
diff --git a/testing/drivers/drivertest/drivertest_pwm.c b/testing/drivers/drivertest/drivertest_pwm.c
index a587fead1..3dd3bae64 100644
--- a/testing/drivers/drivertest/drivertest_pwm.c
+++ b/testing/drivers/drivertest/drivertest_pwm.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <string.h>
 #include <inttypes.h>
 
@@ -107,7 +107,7 @@ static void pwm_help(FAR const char *progname,
          progname);
   printf("\nArguments are \"sticky\".  "
          "For example, once the PWM frequency is\n");
-  printf("specified, that frequency will be re-used until it is changed.\n");
+  printf("specified, that frequency will be reused until it is changed.\n");
   printf("\n\"sticky\" OPTIONS include:\n");
   printf("  [-p devpath] selects the PWM device.  "
          "Default: %s Current: %s\n", PWM_DEFAULT_DEVPATH,
diff --git a/testing/drivers/drivertest/drivertest_watchdog.c b/testing/drivers/drivertest/drivertest_watchdog.c
index 1021e8e10..72f5abe0e 100644
--- a/testing/drivers/drivertest/drivertest_watchdog.c
+++ b/testing/drivers/drivertest/drivertest_watchdog.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/testing/drivers/nand_sim/nand_sim_main.c b/testing/drivers/nand_sim/nand_sim_main.c
index 9e91227a4..70ea24227 100644
--- a/testing/drivers/nand_sim/nand_sim_main.c
+++ b/testing/drivers/nand_sim/nand_sim_main.c
@@ -24,7 +24,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdio.h>
 
 #include <nuttx/drivers/drivers.h>
@@ -72,7 +72,7 @@ FAR struct nand_raw_s   *g_nand_mtd_raw;
  * Name: wrapper_init
  *
  * Description:
- *   Initializes the wrapper by allocating memory and assiging the methods.
+ *   Initializes the wrapper by allocating memory and assigning the methods.
  *
  * Returned Value:
  *   0: Successful
@@ -114,7 +114,7 @@ int wrapper_init(void)
  * Name: terminate
  *
  * Description:
- *   Handles the SIGTERM signal by exitting gracefully.
+ *   Handles the SIGTERM signal by exiting gracefully.
  *
  ****************************************************************************/
 
diff --git a/testing/fs/epoll/epoll.c b/testing/fs/epoll/epoll.c
index cd1d6cc0f..8422c5fe7 100644
--- a/testing/fs/epoll/epoll.c
+++ b/testing/fs/epoll/epoll.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
@@ -193,7 +193,7 @@ static void epoll01(FAR void **state)
   ret = timerfd_stop(args->fd[0]);
   assert_true(ret == 0);
 
-  /* 3rd wait should directly return 0, timer has stoped */
+  /* 3rd wait should directly return 0, timer has stopped */
 
   ret = epoll_wait(args->efd, &evs, 1, 0);
   TIME_ASSERT_RANGE(get_elapse(args->start), 1000);
@@ -274,7 +274,7 @@ static void epoll02(FAR void **state)
   struct epoll_event evs[2];
   int ret;
 
-  /* 1st wait, shoud return after 1000ms */
+  /* 1st wait, should return after 1000ms */
 
   ret = epoll_wait(args->efd, evs, 2, 1100);
   TIME_ASSERT_RANGE(get_elapse(args->start), 1000);
@@ -406,7 +406,7 @@ static void epoll03(FAR void **state)
 
   /* 1st wait should timeout, because server accept will trigger
    * EPOLLOUT event, but we do not set EPOLLOUT in ev.events.
-   * Even the server has writen the data, but to check the EPOLLIN event,
+   * Even the server has written the data, but to check the EPOLLIN event,
    * client need call epoll_wait again, because local socket internal state
    * changed, we need setup it again to get the EPOLLIN event.
    */
@@ -416,7 +416,7 @@ static void epoll03(FAR void **state)
   TIME_ASSERT_RANGE(get_elapse(args->start), 1000);
   assert_true(ret == 0);
 
-  /* 2nd wait shoud return immediately, because server has send
+  /* 2nd wait should return immediately, because server has sent
    * data to client.
    */
 
diff --git a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index c85df92aa..7b8390150 100644
--- a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <errno.h>
 #include <nuttx/crc8.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <assert.h>
 
 /****************************************************************************
diff --git a/testing/fs/nxffs/nxffs_main.c b/testing/fs/nxffs/nxffs_main.c
index 25c15513a..3305aa684 100644
--- a/testing/fs/nxffs/nxffs_main.c
+++ b/testing/fs/nxffs/nxffs_main.c
@@ -37,7 +37,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/crc32.h>
 #include <nuttx/mtd/mtd.h>
@@ -598,7 +598,7 @@ static int nxffs_verifyfs(void)
               else
                 {
 #if CONFIG_TESTING_NXFFS_VERBOSE != 0
-                  printf("  Verifed file %s\n", file->name);
+                  printf("  Verified file %s\n", file->name);
 #endif
                 }
             }
diff --git a/testing/fs/smart/smart_main.c b/testing/fs/smart/smart_main.c
index 671f5b5cb..9c8717a9d 100644
--- a/testing/fs/smart/smart_main.c
+++ b/testing/fs/smart/smart_main.c
@@ -37,7 +37,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/crc32.h>
 #include <nuttx/mtd/mtd.h>
@@ -611,7 +611,7 @@ static int smart_verifyfs(void)
               else
                 {
 #if CONFIG_TESTING_SMART_VERBOSE != 0
-                  printf("  Verifed file %s\n", file->name);
+                  printf("  Verified file %s\n", file->name);
 #endif
                 }
             }
diff --git a/testing/libc/arch_libc/arch_libc_test_main.c b/testing/libc/arch_libc/arch_libc_test_main.c
index 1e1a06b19..b69c1dfc4 100644
--- a/testing/libc/arch_libc/arch_libc_test_main.c
+++ b/testing/libc/arch_libc/arch_libc_test_main.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <assert.h>
 
 /****************************************************************************
diff --git a/testing/libc/scanftest/scanftest_main.c b/testing/libc/scanftest/scanftest_main.c
index 6334c3074..0b1e614ae 100644
--- a/testing/libc/scanftest/scanftest_main.c
+++ b/testing/libc/scanftest/scanftest_main.c
@@ -75,7 +75,7 @@
 #include <limits.h>
 #include <libgen.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/testing/mm/memstress/memorystress_main.c b/testing/mm/memstress/memorystress_main.c
index eca7b7735..f3952e08d 100644
--- a/testing/mm/memstress/memorystress_main.c
+++ b/testing/mm/memstress/memorystress_main.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 #include <stdlib.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <pthread.h>
diff --git a/testing/ostest/signest.c b/testing/ostest/signest.c
index 5e8e65961..d79b40119 100644
--- a/testing/ostest/signest.c
+++ b/testing/ostest/signest.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "ostest.h"
 
@@ -532,7 +532,7 @@ errout_with_waiter:
   total_handled = g_odd_handled + g_even_handled;
   total_nested  = g_odd_nested + g_even_nested;
 
-  printf("signest_test: With intefering thread\n");
+  printf("signest_test: With interfering thread\n");
   printf("  Total signalled %-3d  Odd=%-3d Even=%-3d\n",
          total_signals, odd_signals, even_signals);
   printf("  Total handled   %-3d  Odd=%-3d Even=%-3d\n",
diff --git a/wireless/bluetooth/nimble/include/logcfg/logcfg.h b/wireless/bluetooth/nimble/include/logcfg/logcfg.h
index 419c1373d..de738d51f 100644
--- a/wireless/bluetooth/nimble/include/logcfg/logcfg.h
+++ b/wireless/bluetooth/nimble/include/logcfg/logcfg.h
@@ -27,7 +27,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
index f58cf882c..39749761c 100644
--- a/wireless/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
diff --git a/wireless/ieee802154/i8shark/i8shark_main.c b/wireless/ieee802154/i8shark/i8shark_main.c
index 8d7af6f7f..c213045dc 100644
--- a/wireless/ieee802154/i8shark/i8shark_main.c
+++ b/wireless/ieee802154/i8shark/i8shark_main.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/wireless/wapi/src/driver_wext.c b/wireless/wapi/src/driver_wext.c
index 23b158328..f7dc2906e 100644
--- a/wireless/wapi/src/driver_wext.c
+++ b/wireless/wapi/src/driver_wext.c
@@ -59,7 +59,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "wireless/wapi.h"
 
diff --git a/wireless/wapi/src/util.h b/wireless/wapi/src/util.h
index 4639d3159..a2a0e2e78 100644
--- a/wireless/wapi/src/util.h
+++ b/wireless/wapi/src/util.h
@@ -39,7 +39,7 @@
  ****************************************************************************/
 
 #include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 /****************************************************************************

From 96a003072d596d2e1b81ff3fd944692877e5bae3 Mon Sep 17 00:00:00 2001
From: Piyush Patle <piyushpatle228@gmail.com>
Date: Sat, 11 Apr 2026 03:50:44 +0530
Subject: [PATCH 288/568] include/debug.h: fix checkpatch fallout in touched
 apps files

Clean up style issues in the files touched by the <nuttx/debug.h> include
migration so the full apps-side PR passes checkpatch.

Signed-off-by: Piyush Patle <piyushpatle228@gmail.com>
---
 examples/nx/nx_events.c                 |  54 ++++---
 examples/nx/nx_kbdin.c                  |  83 ++++++-----
 examples/nx/nx_main.c                   | 158 +++++++++++++--------
 examples/nxhello/nxhello_bkgd.c         |  72 +++++-----
 examples/nxhello/nxhello_main.c         |  75 +++++-----
 examples/nximage/nximage_bkgd.c         |  61 ++++----
 examples/nximage/nximage_main.c         |  79 ++++++-----
 examples/nxlines/nxlines_main.c         |  78 +++++-----
 examples/nxterm/nxterm_toolbar.c        |   9 +-
 examples/nxterm/nxterm_wndo.c           |  16 ++-
 examples/nxtext/nxtext_bkgd.c           |  33 +++--
 examples/nxtext/nxtext_main.c           |  86 ++++++-----
 examples/nxtext/nxtext_putc.c           |  86 +++++------
 examples/pwfb/pwfb_main.c               |  59 ++++----
 examples/pwlines/pwlines_main.c         |  65 +++++----
 examples/qencoder/qe_main.c             |  19 ++-
 fsutils/flash_eraseall/flash_eraseall.c |   5 +-
 graphics/tiff/tiff_addstrip.c           |  25 +++-
 graphics/tiff/tiff_initialize.c         | 180 +++++++++++++++++-------
 graphics/tiff/tiff_utils.c              |  37 +++--
 system/nxcamera/nxcamera.c              | 120 ++++++++--------
 21 files changed, 820 insertions(+), 580 deletions(-)

diff --git a/examples/nx/nx_events.c b/examples/nx/nx_events.c
index 4e5616641..065c4e3cf 100644
--- a/examples/nx/nx_events.c
+++ b/examples/nx/nx_events.c
@@ -52,25 +52,30 @@
 
 static void nxeg_redraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                         bool morem, FAR void *arg);
-static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxeg_position(NXEGWINDOW hwnd,
+                          FAR const struct nxgl_size_s *size,
                           FAR const struct nxgl_point_s *pos,
                           FAR const struct nxgl_rect_s *bounds,
                           FAR void *arg);
 #ifdef CONFIG_NX_XYINPUT
-static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
+static void nxeg_mousein(NXEGWINDOW hwnd,
+                         FAR const struct nxgl_point_s *pos,
                          uint8_t buttons, FAR void *arg);
 #endif
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static void nxeg_tbredraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+static void nxeg_tbredraw(NXEGWINDOW hwnd,
+                          FAR const struct nxgl_rect_s *rect,
                           bool morem, FAR void *arg);
-static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxeg_tbposition(NXEGWINDOW hwnd,
+                            FAR const struct nxgl_size_s *size,
                             FAR const struct nxgl_point_s *pos,
                             FAR const struct nxgl_rect_s *bounds,
                             FAR void *arg);
 #ifdef CONFIG_NX_XYINPUT
-static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
-                            uint8_t buttons, FAR void *arg);
+static void nxeg_tbmousein(NXEGWINDOW hwnd,
+                           FAR const struct nxgl_point_s *pos,
+                           uint8_t buttons, FAR void *arg);
 #endif
 #endif
 
@@ -137,6 +142,7 @@ static inline void nxeg_fillwindow(NXEGWINDOW hwnd,
       printf("nxeg_fillwindow: nxtk_fillwindow failed: %d\n", errno);
     }
 #endif
+
 #ifdef CONFIG_NX_KBD
   nxeg_filltext(hwnd, rect, st);
 #endif
@@ -148,8 +154,8 @@ static inline void nxeg_fillwindow(NXEGWINDOW hwnd,
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
 static inline void nxeg_filltoolbar(NXTKWINDOW htb,
-                                   FAR const struct nxgl_rect_s *rect,
-                                   nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+                                    FAR const struct nxgl_rect_s *rect,
+                                    nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
 {
   int ret;
 
@@ -181,7 +187,8 @@ static void nxeg_redraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
  * Name: nxeg_position
  ****************************************************************************/
 
-static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxeg_position(NXEGWINDOW hwnd,
+                          FAR const struct nxgl_size_s *size,
                           FAR const struct nxgl_point_s *pos,
                           FAR const struct nxgl_rect_s *bounds,
                           FAR void *arg)
@@ -190,7 +197,8 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
   /* Report the position */
 
-  printf("nxeg_position%d: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  printf("nxeg_position%d: hwnd=%p size=(%d,%d) pos=(%d,%d) "
+         "bounds={(%d,%d),(%d,%d)}\n",
          st->wnum, hwnd, size->w, size->h, pos->x, pos->y,
          bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -198,7 +206,9 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
   if (!b_haveresolution)
     {
-      /* Save the window limits (these should be the same for all places and all windows */
+      /* Save the window limits (these should be the same for all places
+       * and all windows.
+       */
 
       g_xres = bounds->pt2.x;
       g_yres = bounds->pt2.y;
@@ -228,7 +238,8 @@ static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
  ****************************************************************************/
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static void nxeg_tbredraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+static void nxeg_tbredraw(NXEGWINDOW hwnd,
+                          FAR const struct nxgl_rect_s *rect,
                           bool more, FAR void *arg)
 {
   FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
@@ -245,16 +256,18 @@ static void nxeg_tbredraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
  ****************************************************************************/
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
-                           FAR const struct nxgl_point_s *pos,
-                           FAR const struct nxgl_rect_s *bounds,
-                           FAR void *arg)
+static void nxeg_tbposition(NXEGWINDOW hwnd,
+                            FAR const struct nxgl_size_s *size,
+                            FAR const struct nxgl_point_s *pos,
+                            FAR const struct nxgl_rect_s *bounds,
+                            FAR void *arg)
 {
   FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
 
   /* Report the position */
 
-  printf("nxeg_ptbosition%d: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  printf("nxeg_ptbosition%d: hwnd=%p size=(%d,%d) pos=(%d,%d) "
+         "bounds={(%d,%d),(%d,%d)}\n",
          st->wnum, hwnd, size->w, size->h, pos->x, pos->y,
          bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 }
@@ -266,8 +279,9 @@ static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
 #ifdef CONFIG_NX_XYINPUT
-static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
-                          uint8_t buttons, FAR void *arg)
+static void nxeg_tbmousein(NXEGWINDOW hwnd,
+                           FAR const struct nxgl_point_s *pos,
+                           uint8_t buttons, FAR void *arg)
 {
   FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
 
@@ -291,7 +305,7 @@ FAR void *nx_listenerthread(FAR void *arg)
 
   /* Process events forever */
 
-  for (;;)
+  for (; ; )
     {
       /* Handle the next event.  If we were configured blocking, then
        * we will stay right here until the next event is received.  Since
diff --git a/examples/nx/nx_kbdin.c b/examples/nx/nx_kbdin.c
index cdab7fe20..51f0e7efd 100644
--- a/examples/nx/nx_kbdin.c
+++ b/examples/nx/nx_kbdin.c
@@ -109,7 +109,8 @@ static void nxeg_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
       if (!nxgl_nullrect(&intersection))
         {
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-          ret = nxtk_bitmapwindow((NXTKWINDOW)hwnd, &intersection, (FAR const void **)&src,
+          ret = nxtk_bitmapwindow((NXTKWINDOW)hwnd, &intersection,
+                                  (FAR const void **)&src,
                                   &bm->bounds.pt1,
                                   (unsigned int)bm->glyph->stride);
           if (ret < 0)
@@ -165,7 +166,7 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
       /* Allocate memory to hold the glyph with its offsets */
 
       glyph->stride = (glyph->width * CONFIG_EXAMPLES_NX_BPP + 7) / 8;
-      bmsize        =  glyph->stride * glyph->height;
+      bmsize        = glyph->stride * glyph->height;
       glyph->bitmap = (FAR uint8_t *)malloc(bmsize);
 
       if (glyph->bitmap)
@@ -178,13 +179,13 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
           /* Pack 1-bit pixels into a 2-bits */
 
           pixel &= 0x01;
-          pixel  = (pixel) << 1 |pixel;
+          pixel  = (pixel) << 1 | pixel;
 #  endif
 #  if CONFIG_EXAMPLES_NX_BPP < 4
           /* Pack 2-bit pixels into a nibble */
 
           pixel &= 0x03;
-          pixel  = (pixel) << 2 |pixel;
+          pixel  = (pixel) << 2 | pixel;
 #  endif
 
           /* Pack 4-bit nibbles into a byte */
@@ -222,7 +223,7 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
 
           /* Then render the glyph into the allocated memory */
 
-          ret = RENDERER((FAR nxgl_mxpixel_t*)glyph->bitmap,
+          ret = RENDERER((FAR nxgl_mxpixel_t *)glyph->bitmap,
                           glyph->height, glyph->width, glyph->stride,
                           bm, CONFIG_EXAMPLES_NX_FONTCOLOR);
           if (ret < 0)
@@ -236,9 +237,9 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
             }
           else
             {
-               /* Make it permanent */
+              /* Make it permanent */
 
-               st->nglyphs++;
+              st->nglyphs++;
             }
         }
     }
@@ -269,6 +270,7 @@ nxeg_addspace(FAR struct nxeg_state_s *st, uint8_t ch)
 
       st->nglyphs++;
     }
+
   return glyph;
 }
 
@@ -283,13 +285,14 @@ nxeg_findglyph(FAR struct nxeg_state_s *st, uint8_t ch)
 
   /* First, try to find the glyph in the cache of pre-rendered glyphs */
 
-   for (i = 0; i < st->nglyphs; i++)
+  for (i = 0; i < st->nglyphs; i++)
     {
       if (st->glyph[i].code == ch)
         {
           return &st->glyph[i];
         }
     }
+
   return NULL;
 }
 
@@ -313,21 +316,22 @@ nxeg_getglyph(FAR struct nxeg_state_s *st, uint8_t ch)
       bm = nxf_getbitmap(g_fonthandle, ch);
       if (!bm)
         {
-          /* No, there is no glyph for this code.  Use space */
+          /* No, there is no glyph for this code.  Use space. */
 
           glyph = nxeg_findglyph(st, ' ');
           if (!glyph)
             {
-              /* There isn't fake glyph for ' ' yet... create one */
+              /* There isn't a fake glyph for ' ' yet... create one */
 
               glyph = nxeg_addspace(st, ' ');
             }
         }
       else
         {
-          glyph =  nxeg_renderglyph(st, bm, ch);
+          glyph = nxeg_renderglyph(st, bm, ch);
         }
     }
+
   return glyph;
 }
 
@@ -346,41 +350,42 @@ nxeg_addchar(FAR struct nxeg_state_s *st, uint8_t ch)
 
   if (st->nchars < NXTK_MAXKBDCHARS)
     {
-       /* Yes, setup the bitmap */
+      /* Yes, setup the bitmap */
 
-       bm = &st->bm[st->nchars];
+      bm = &st->bm[st->nchars];
 
-       /* Find the matching glyph */
+      /* Find the matching glyph */
 
-       bm->glyph = nxeg_getglyph(st, ch);
-       if (!bm->glyph)
-         {
-           return NULL;
-         }
+      bm->glyph = nxeg_getglyph(st, ch);
+      if (!bm->glyph)
+        {
+          return NULL;
+        }
 
-       /* Set up the bounds for the bitmap */
+      /* Set up the bounds for the bitmap */
 
-       if (st->nchars <= 0)
-         {
-            /* The first character is one space from the left */
+      if (st->nchars <= 0)
+        {
+          /* The first character is one space from the left */
 
-            leftx  = st->spwidth;
-         }
-       else
-         {
-            /* Otherwise, it is to the left of the preceding char */
+          leftx  = st->spwidth;
+        }
+      else
+        {
+          /* Otherwise, it is to the left of the preceding char */
 
-            bmleft = &st->bm[st->nchars-1];
-            leftx  = bmleft->bounds.pt2.x + 1;
-         }
+          bmleft = &st->bm[st->nchars - 1];
+          leftx  = bmleft->bounds.pt2.x + 1;
+        }
 
-       bm->bounds.pt1.x = leftx;
-       bm->bounds.pt1.y = 2;
-       bm->bounds.pt2.x = leftx + bm->glyph->width - 1;
-       bm->bounds.pt2.y = 2 + bm->glyph->height - 1;
+      bm->bounds.pt1.x = leftx;
+      bm->bounds.pt1.y = 2;
+      bm->bounds.pt2.x = leftx + bm->glyph->width - 1;
+      bm->bounds.pt2.y = 2 + bm->glyph->height - 1;
 
-       st->nchars++;
+      st->nchars++;
     }
+
   return bm;
 }
 
@@ -424,10 +429,12 @@ void nxeg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
  ****************************************************************************/
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, FAR void *arg)
+void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
+                  FAR void *arg)
 {
   FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
-  printf("nxeg_tbkbdin: ERROR -- toolbar should not received keyboard input\n");
+  printf("nxeg_tbkbdin: ERROR -- toolbar should not received keyboard "
+         "input\n");
   printf("nxeg_tbkbdin%d: hwnd=%p nch=%d\n", st->wnum, hwnd, nch);
 }
 #endif
diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c
index 942d59870..9bdeded9c 100644
--- a/examples/nx/nx_main.c
+++ b/examples/nx/nx_main.c
@@ -54,6 +54,7 @@
  ****************************************************************************/
 
 /* Configuration ************************************************************/
+
 /* If not specified, assume that the hardware supports one video plane */
 
 #ifndef CONFIG_EXAMPLES_NX_VPLANE
@@ -98,7 +99,10 @@ nxgl_coord_t g_yres;
 
 bool b_haveresolution = false;
 bool g_connected = false;
-sem_t g_semevent = {0};
+sem_t g_semevent =
+{
+  0
+};
 
 /* Colors used to fill window 1 & 2 */
 
@@ -181,14 +185,16 @@ static void nxeg_freestate(FAR struct nxeg_state_s *st)
     {
       for (i = 0; i < st->nglyphs; i++)
         {
-           if (st->glyph[i].bitmap)
-              {
-                free(st->glyph[i].bitmap);
-              }
-           st->glyph[i].bitmap = NULL;
+          if (st->glyph[i].bitmap)
+            {
+              free(st->glyph[i].bitmap);
+            }
+
+          st->glyph[i].bitmap = NULL;
         }
+
       st->nchars = 0;
-     }
+    }
 #endif
 }
 #endif
@@ -199,7 +205,7 @@ static void nxeg_freestate(FAR struct nxeg_state_s *st)
 
 #ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
 static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
-                                       FAR struct nxeg_state_s *state)
+                                         FAR struct nxeg_state_s *state)
 {
   NXEGWINDOW hwnd;
 
@@ -209,8 +215,10 @@ static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
       printf("nxeg_openwindow: nx_openwindow failed: %d\n", errno);
       g_exitcode = NXEXIT_NXOPENWINDOW;
     }
+
   return hwnd;
 }
+
 #else
 static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
                                          FAR struct nxeg_state_s *state)
@@ -223,8 +231,10 @@ static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
       printf("nxeg_openwindow: nxtk_openwindow failed: %d\n", errno);
       g_exitcode = NXEXIT_NXOPENWINDOW;
     }
+
   return hwnd;
 }
+
 #endif
 
 /****************************************************************************
@@ -232,7 +242,8 @@ static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
  ****************************************************************************/
 
 #ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *state)
+static inline int nxeg_closewindow(NXEGWINDOW hwnd,
+                                   FAR struct nxeg_state_s *state)
 {
   int ret = nx_closewindow(hwnd);
   if (ret < 0)
@@ -240,10 +251,13 @@ static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *sta
       printf("nxeg_closewindow: nx_closewindow failed: %d\n", errno);
       g_exitcode = NXEXIT_NXCLOSEWINDOW;
     }
+
   return ret;
 }
+
 #else
-static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *state)
+static inline int nxeg_closewindow(NXEGWINDOW hwnd,
+                                   FAR struct nxeg_state_s *state)
 {
   int ret = nxtk_closewindow(hwnd);
   if (ret < 0)
@@ -251,9 +265,11 @@ static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *sta
       printf("nxeg_closewindow: nxtk_closewindow failed: %d\n", errno);
       g_exitcode = NXEXIT_NXCLOSEWINDOW;
     }
+
   nxeg_freestate(state);
   return ret;
 }
+
 #endif
 
 /****************************************************************************
@@ -261,7 +277,8 @@ static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *sta
  ****************************************************************************/
 
 #ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
+static inline int nxeg_setsize(NXEGWINDOW hwnd,
+                               FAR struct nxgl_size_s *size)
 {
   int ret = nx_setsize(hwnd, size);
   if (ret < 0)
@@ -269,10 +286,13 @@ static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
       printf("nxeg_setsize: nx_setsize failed: %d\n", errno);
       g_exitcode = NXEXIT_NXSETSIZE;
     }
+
   return ret;
 }
+
 #else
-static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
+static inline int nxeg_setsize(NXEGWINDOW hwnd,
+                               FAR struct nxgl_size_s *size)
 {
   int ret = nxtk_setsize(hwnd, size);
   if (ret < 0)
@@ -280,8 +300,10 @@ static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
       printf("nxeg_setsize: nxtk_setsize failed: %d\n", errno);
       g_exitcode = NXEXIT_NXSETSIZE;
     }
+
   return ret;
 }
+
 #endif
 
 /****************************************************************************
@@ -289,7 +311,8 @@ static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
  ****************************************************************************/
 
 #ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos)
+static inline int nxeg_setposition(NXEGWINDOW hwnd,
+                                   FAR struct nxgl_point_s *pos)
 {
   int ret = nx_setposition(hwnd, pos);
   if (ret < 0)
@@ -297,10 +320,13 @@ static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos
       printf("nxeg_setposition: nx_setposition failed: %d\n", errno);
       g_exitcode = NXEXIT_NXSETPOSITION;
     }
+
   return ret;
 }
+
 #else
-static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos)
+static inline int nxeg_setposition(NXEGWINDOW hwnd,
+                                   FAR struct nxgl_point_s *pos)
 {
   int ret = nxtk_setposition(hwnd, pos);
   if (ret < 0)
@@ -308,8 +334,10 @@ static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos
       printf("nxeg_setposition: nxtk_setposition failed: %d\n", errno);
       g_exitcode = NXEXIT_NXSETPOSITION;
     }
+
   return ret;
 }
+
 #endif
 
 /****************************************************************************
@@ -328,8 +356,10 @@ static inline int nxeq_opentoolbar(NXEGWINDOW hwnd, nxgl_coord_t height,
       printf("nxeq_opentoolbar: nxtk_opentoolbar failed: %d\n", errno);
       g_exitcode = NXEXIT_NXOPENTOOLBAR;
     }
+
   return ret;
 }
+
 #endif
 
 /****************************************************************************
@@ -345,8 +375,10 @@ static inline int nxeg_lower(NXEGWINDOW hwnd)
       printf("nxeg_lower: nx_lower failed: %d\n", errno);
       g_exitcode = NXEXIT_NXLOWER;
     }
+
   return ret;
 }
+
 #else
 static inline int nxeg_lower(NXEGWINDOW hwnd)
 {
@@ -356,8 +388,10 @@ static inline int nxeg_lower(NXEGWINDOW hwnd)
       printf("nxeg_lower: nxtk_lower failed: %d\n", errno);
       g_exitcode = NXEXIT_NXLOWER;
     }
+
   return ret;
 }
+
 #endif
 
 /****************************************************************************
@@ -373,8 +407,10 @@ static inline int nxeg_raise(NXEGWINDOW hwnd)
       printf("nxeg_raise: nx_raise failed: %d\n", errno);
       g_exitcode = NXEXIT_NXRAISE;
     }
+
   return ret;
 }
+
 #else
 static inline int nxeg_raise(NXEGWINDOW hwnd)
 {
@@ -384,8 +420,10 @@ static inline int nxeg_raise(NXEGWINDOW hwnd)
       printf("nxeg_raise: nxtk_raise failed: %d\n", errno);
       g_exitcode = NXEXIT_NXRAISE;
     }
+
   return ret;
 }
+
 #endif
 
 /****************************************************************************
@@ -416,7 +454,7 @@ static int nxeg_initialize(void)
   ret = sched_setparam(0, &param);
   if (ret < 0)
     {
-      printf("nxeg_initialize: sched_setparam failed: %d\n" , ret);
+      printf("nxeg_initialize: sched_setparam failed: %d\n", ret);
       g_exitcode = NXEXIT_SCHEDSETPARAM;
       return ERROR;
     }
@@ -426,7 +464,8 @@ static int nxeg_initialize(void)
   ret = boardctl(BOARDIOC_NX_START, 0);
   if (ret < 0)
     {
-      printf("nxeg_initialize: Failed to start the NX server: %d\n", errno);
+      printf("nxeg_initialize: Failed to start the NX server: %d\n",
+             errno);
       g_exitcode = NXEXIT_TASKCREATE;
       return ERROR;
     }
@@ -436,54 +475,54 @@ static int nxeg_initialize(void)
   g_hnx = nx_connect();
   if (g_hnx)
     {
-       pthread_attr_t attr;
+      pthread_attr_t attr;
 
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, g_hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, g_hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
-           nx_disconnect(g_hnx);
-           g_exitcode = NXEXIT_FBINITIALIZE;
-           return ERROR;
-         }
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+          nx_disconnect(g_hnx);
+          g_exitcode = NXEXIT_FBINITIALIZE;
+          return ERROR;
+        }
 #endif
 
-       /* Start a separate thread to listen for server events.  This is probably
-        * the least efficient way to do this, but it makes this example flow more
-        * smoothly.
-        */
+      /* Start a separate thread to listen for server events.  This is
+       * probably the least efficient way to do this, but it makes this
+       * example flow more smoothly.
+       */
 
-       pthread_attr_init(&attr);
-       param.sched_priority = CONFIG_EXAMPLES_NX_LISTENERPRIO;
-       pthread_attr_setschedparam(&attr, &param);
-       pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NX_STACKSIZE);
+      pthread_attr_init(&attr);
+      param.sched_priority = CONFIG_EXAMPLES_NX_LISTENERPRIO;
+      pthread_attr_setschedparam(&attr, &param);
+      pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NX_STACKSIZE);
 
-       ret = pthread_create(&thread, &attr, nx_listenerthread, NULL);
-       if (ret != 0)
-         {
-            printf("nxeg_initialize: pthread_create failed: %d\n", ret);
-            g_exitcode = NXEXIT_PTHREADCREATE;
-            return ERROR;
-         }
+      ret = pthread_create(&thread, &attr, nx_listenerthread, NULL);
+      if (ret != 0)
+        {
+          printf("nxeg_initialize: pthread_create failed: %d\n", ret);
+          g_exitcode = NXEXIT_PTHREADCREATE;
+          return ERROR;
+        }
 
-       /* Don't return until we are connected to the server */
+      /* Don't return until we are connected to the server */
 
-       while (!g_connected)
-         {
-           /* Wait for the listener thread to wake us up when we really
-            * are connected.
-            */
+      while (!g_connected)
+        {
+          /* Wait for the listener thread to wake us up when we really
+           * are connected.
+           */
 
-           sem_wait(&g_semevent);
-         }
+          sem_wait(&g_semevent);
+        }
     }
   else
     {
@@ -562,6 +601,7 @@ int main(int argc, FAR char *argv[])
     {
       sem_wait(&g_semevent);
     }
+
   printf("nx_main: Screen resolution (%d,%d)\n", g_xres, g_yres);
 
   /* Set the size of the window 1 */
@@ -576,9 +616,8 @@ int main(int argc, FAR char *argv[])
       goto errout_with_hwnd1;
     }
 
-  /* Sleep a bit -- both so that we can see the result of the above operations
-   * but also, in the multi-user case, so that the server can get a chance to
-   * actually do them!
+  /* Sleep a bit.  This lets us see the result of the above operations and,
+   * in the multi-user case, gives the server a chance to actually do them.
    */
 
   printf("nx_main: Sleeping\n\n");
@@ -605,7 +644,8 @@ int main(int argc, FAR char *argv[])
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
   printf("nx_main: Add toolbar to window #1\n");
-  ret = nxeq_opentoolbar(hwnd1, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[0]);
+  ret = nxeq_opentoolbar(hwnd1, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT,
+                         &g_tbcb, &g_wstate[0]);
   if (ret < 0)
     {
       goto errout_with_hwnd1;
@@ -633,7 +673,7 @@ int main(int argc, FAR char *argv[])
   printf("nx_main: Sleeping\n\n");
   sleep(1);
 
-  /* Set the size of the window 2 == size of window 1*/
+  /* Set the size of window 2 equal to the size of window 1 */
 
   printf("nx_main: Set hwnd2 size to (%d,%d)\n", size.w, size.h);
   ret = nxeg_setsize(hwnd2, &size);
@@ -666,7 +706,8 @@ int main(int argc, FAR char *argv[])
 
 #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
   printf("nx_main: Add toolbar to window #2\n");
-  ret = nxeq_opentoolbar(hwnd2, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[1]);
+  ret = nxeq_opentoolbar(hwnd2, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT,
+                         &g_tbcb, &g_wstate[1]);
   if (ret < 0)
     {
       goto errout_with_hwnd2;
@@ -770,6 +811,7 @@ errout_with_hwnd1:
   nxeg_closewindow(hwnd1, &g_wstate[0]);
 
 errout_with_nx:
+
   /* Disconnect from the server */
 
   printf("nx_main: Disconnect from the server\n");
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index 323b4870d..5e0a5b80e 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -76,19 +76,21 @@
  ****************************************************************************/
 
 static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
-                        bool morem, FAR void *arg);
-static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
-                          FAR const struct nxgl_point_s *pos,
-                          FAR const struct nxgl_rect_s *bounds,
-                          FAR void *arg);
+                           bool morem, FAR void *arg);
+static void nxhello_position(NXWINDOW hwnd,
+                             FAR const struct nxgl_size_s *size,
+                             FAR const struct nxgl_point_s *pos,
+                             FAR const struct nxgl_rect_s *bounds,
+                             FAR void *arg);
 #ifdef CONFIG_NX_XYINPUT
-static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
-                         uint8_t buttons, FAR void *arg);
+static void nxhello_mousein(NXWINDOW hwnd,
+                            FAR const struct nxgl_point_s *pos,
+                            uint8_t buttons, FAR void *arg);
 #endif
 
 #ifdef CONFIG_NX_KBD
-static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
-                       FAR void *arg);
+static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch,
+                          FAR const uint8_t *ch, FAR void *arg);
 #endif
 
 /****************************************************************************
@@ -125,7 +127,7 @@ const struct nx_callback_s g_nxhellocb =
  ****************************************************************************/
 
 static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
-                        bool more, FAR void *arg)
+                           bool more, FAR void *arg)
 {
   ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
@@ -136,10 +138,11 @@ static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
  * Name: nxhello_position
  ****************************************************************************/
 
-static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
-                          FAR const struct nxgl_point_s *pos,
-                          FAR const struct nxgl_rect_s *bounds,
-                          FAR void *arg)
+static void nxhello_position(NXWINDOW hwnd,
+                             FAR const struct nxgl_size_s *size,
+                             FAR const struct nxgl_point_s *pos,
+                             FAR const struct nxgl_rect_s *bounds,
+                             FAR void *arg)
 {
   /* Report the position */
 
@@ -171,8 +174,9 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
  ****************************************************************************/
 
 #ifdef CONFIG_NX_XYINPUT
-static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
-                         uint8_t buttons, FAR void *arg)
+static void nxhello_mousein(NXWINDOW hwnd,
+                            FAR const struct nxgl_point_s *pos,
+                            uint8_t buttons, FAR void *arg)
 {
   printf("nxhello_mousein: hwnd=%p pos=(%d,%d) button=%02x\n",
          hwnd,  pos->x, pos->y, buttons);
@@ -184,16 +188,16 @@ static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
  ****************************************************************************/
 
 #ifdef CONFIG_NX_KBD
-static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
-                       FAR void *arg)
+static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch,
+                          FAR const uint8_t *ch, FAR void *arg)
 {
   ginfo("hwnd=%p nch=%d\n", hwnd, nch);
 
-   /* In this example, there is no keyboard so a keyboard event is not
-    * expected.
-    */
+  /* In this example, there is no keyboard so a keyboard event is not
+   * expected.
+   */
 
-   printf("nxhello_kbdin: Unexpected keyboard callback\n");
+  printf("nxhello_kbdin: Unexpected keyboard callback\n");
 }
 #endif
 
@@ -212,7 +216,7 @@ static void nxhello_center(FAR struct nxgl_point_s *pos,
    * hello world message.
    */
 
-  for (ptr = (uint8_t*)g_hello, width = 0; *ptr; ptr++)
+  for (ptr = (uint8_t *)g_hello, width = 0; *ptr; ptr++)
     {
       /* Get the font bitmap for this character */
 
@@ -225,7 +229,7 @@ static void nxhello_center(FAR struct nxgl_point_s *pos,
         }
       else
         {
-           /* Use the width of a space */
+          /* Use the width of a space */
 
           width += fontset->spwidth;
         }
@@ -266,7 +270,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height,
   /* Pack 1-bit pixels into a 2-bits */
 
   pixel &= 0x01;
-  pixel  = (pixel) << 1 |pixel;
+  pixel  = (pixel) << 1 | pixel;
 
 #  endif
 #  if CONFIG_EXAMPLES_NXHELLO_BPP < 4
@@ -274,7 +278,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height,
   /* Pack 2-bit pixels into a nibble */
 
   pixel &= 0x03;
-  pixel  = (pixel) << 2 |pixel;
+  pixel  = (pixel) << 2 | pixel;
 
 #  endif
 
@@ -348,10 +352,10 @@ void nxhello_hello(NXWINDOW hwnd)
 
   mxstride  = (fontset->mxwidth * CONFIG_EXAMPLES_NXHELLO_BPP + 7) >> 3;
   glyphsize = (unsigned int)fontset->mxheight * mxstride;
-  glyph     = (FAR uint8_t*)malloc(glyphsize);
+  glyph     = (FAR uint8_t *)malloc(glyphsize);
 
-  /* NOTE: no check for failure to allocate the memory.  In a real application
-   * you would need to handle that event.
+  /* NOTE: no check for failure to allocate the memory.  In a real
+   * application you would need to handle that event.
    */
 
   /* Get a position so the "Hello, World!" string will be centered on the
@@ -389,7 +393,7 @@ void nxhello_hello(NXWINDOW hwnd)
 #if CONFIG_NX_NPLANES > 1
 # warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
 #endif
-          RENDERER((FAR nxgl_mxpixel_t*)glyph, fheight, fwidth,
+          RENDERER((FAR nxgl_mxpixel_t *)glyph, fheight, fwidth,
                    fstride, fbm, CONFIG_EXAMPLES_NXHELLO_FONTCOLOR);
 
           /* Describe the destination of the font with a rectangle */
@@ -411,15 +415,15 @@ void nxhello_hello(NXWINDOW hwnd)
               printf("nxhello_write: nx_bitmapwindow failed: %d\n", errno);
             }
 
-           /* Skip to the right the width of the font */
+          /* Skip to the right the width of the font */
 
           pos.x += fwidth;
         }
       else
         {
-           /* No bitmap (probably because the font is a space).  Skip to the
-            * right the width of a space.
-            */
+          /* No bitmap (probably because the font is a space).  Skip to the
+           * right the width of a space.
+           */
 
           pos.x += fontset->spwidth;
         }
diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c
index 8165d9abe..d524f6f2c 100644
--- a/examples/nxhello/nxhello_main.c
+++ b/examples/nxhello/nxhello_main.c
@@ -95,7 +95,8 @@ static inline int nxhello_initialize(void)
   ret = boardctl(BOARDIOC_NX_START, 0);
   if (ret < 0)
     {
-      printf("nxhello_initialize: Failed to start the NX server: %d\n", errno);
+      printf("nxhello_initialize: Failed to start the NX server: %d\n",
+             errno);
       return ERROR;
     }
 
@@ -104,52 +105,53 @@ static inline int nxhello_initialize(void)
   g_nxhello.hnx = nx_connect();
   if (g_nxhello.hnx)
     {
-       pthread_attr_t attr;
+      pthread_attr_t attr;
 
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, g_nxhello.hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, g_nxhello.hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
-           nx_disconnect(g_nxhello.hnx);
-           return ERROR;
-         }
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+          nx_disconnect(g_nxhello.hnx);
+          return ERROR;
+        }
 #endif
 
-       /* Start a separate thread to listen for server events.  This is probably
-        * the least efficient way to do this, but it makes this example flow more
-        * smoothly.
-        */
+      /* Start a separate thread to listen for server events.  This is
+       * probably the least efficient way to do this, but it makes this
+       * example flow more smoothly.
+       */
 
-       pthread_attr_init(&attr);
-       param.sched_priority = CONFIG_EXAMPLES_NXHELLO_LISTENERPRIO;
-       pthread_attr_setschedparam(&attr, &param);
-       pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE);
+      pthread_attr_init(&attr);
+      param.sched_priority = CONFIG_EXAMPLES_NXHELLO_LISTENERPRIO;
+      pthread_attr_setschedparam(&attr, &param);
+      pthread_attr_setstacksize(&attr,
+                                CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE);
 
-       ret = pthread_create(&thread, &attr, nxhello_listener, NULL);
-       if (ret != 0)
-         {
-            printf("nxhello_initialize: pthread_create failed: %d\n", ret);
-            return ERROR;
-         }
+      ret = pthread_create(&thread, &attr, nxhello_listener, NULL);
+      if (ret != 0)
+        {
+          printf("nxhello_initialize: pthread_create failed: %d\n", ret);
+          return ERROR;
+        }
 
-       /* Don't return until we are connected to the server */
+      /* Don't return until we are connected to the server */
 
-       while (!g_nxhello.connected)
-         {
-           /* Wait for the listener thread to wake us up when we really
-            * are connected.
-            */
+      while (!g_nxhello.connected)
+        {
+          /* Wait for the listener thread to wake us up when we really
+           * are connected.
+           */
 
-           sem_wait(&g_nxhello.eventsem);
-         }
+          sem_wait(&g_nxhello.eventsem);
+        }
     }
   else
     {
@@ -225,7 +227,8 @@ int main(int argc, FAR char *argv[])
       sem_wait(&g_nxhello.eventsem);
     }
 
-  printf("nxhello_main: Screen resolution (%d,%d)\n", g_nxhello.xres, g_nxhello.yres);
+  printf("nxhello_main: Screen resolution (%d,%d)\n",
+         g_nxhello.xres, g_nxhello.yres);
 
   /* Now, say hello and exit, sleeping a little before each. */
 
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index 8a86f0498..8e3a2f651 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -109,19 +109,21 @@ struct nximage_run_s
  ****************************************************************************/
 
 static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
-                        bool more, FAR void *arg);
-static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
-                          FAR const struct nxgl_point_s *pos,
-                          FAR const struct nxgl_rect_s *bounds,
-                          FAR void *arg);
+                           bool more, FAR void *arg);
+static void nximage_position(NXWINDOW hwnd,
+                             FAR const struct nxgl_size_s *size,
+                             FAR const struct nxgl_point_s *pos,
+                             FAR const struct nxgl_rect_s *bounds,
+                             FAR void *arg);
 #ifdef CONFIG_NX_XYINPUT
-static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
-                         uint8_t buttons, FAR void *arg);
+static void nximage_mousein(NXWINDOW hwnd,
+                            FAR const struct nxgl_point_s *pos,
+                            uint8_t buttons, FAR void *arg);
 #endif
 
 #ifdef CONFIG_NX_KBD
-static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
-                       FAR void *arg);
+static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch,
+                          FAR const uint8_t *ch, FAR void *arg);
 #endif
 
 /****************************************************************************
@@ -164,7 +166,7 @@ const struct nx_callback_s g_nximagecb =
  ****************************************************************************/
 
 static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
-                        bool more, FAR void *arg)
+                           bool more, FAR void *arg)
 {
   ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
@@ -179,10 +181,11 @@ static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
  *
  ****************************************************************************/
 
-static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
-                          FAR const struct nxgl_point_s *pos,
-                          FAR const struct nxgl_rect_s *bounds,
-                          FAR void *arg)
+static void nximage_position(NXWINDOW hwnd,
+                             FAR const struct nxgl_size_s *size,
+                             FAR const struct nxgl_point_s *pos,
+                             FAR const struct nxgl_rect_s *bounds,
+                             FAR void *arg)
 {
   /* Report the position */
 
@@ -218,8 +221,9 @@ static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
  ****************************************************************************/
 
 #ifdef CONFIG_NX_XYINPUT
-static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
-                         uint8_t buttons, FAR void *arg)
+static void nximage_mousein(NXWINDOW hwnd,
+                            FAR const struct nxgl_point_s *pos,
+                            uint8_t buttons, FAR void *arg)
 {
   printf("nximage_mousein: hwnd=%p pos=(%d,%d) button=%02x\n",
          hwnd,  pos->x, pos->y, buttons);
@@ -235,16 +239,16 @@ static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
  ****************************************************************************/
 
 #ifdef CONFIG_NX_KBD
-static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
-                       FAR void *arg)
+static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch,
+                          FAR const uint8_t *ch, FAR void *arg)
 {
   ginfo("hwnd=%p nch=%d\n", hwnd, nch);
 
-   /* In this example, there is no keyboard so a keyboard event is not
-    * expected.
-    */
+  /* In this example, there is no keyboard so a keyboard event is not
+   * expected.
+   */
 
-   printf("nximage_kbdin: Unexpected keyboard callback\n");
+  printf("nximage_kbdin: Unexpected keyboard callback\n");
 }
 #endif
 
@@ -288,9 +292,9 @@ void nximage_image(NXWINDOW hwnd)
     {
       /* Read input row(s) */
 
-     nximage_blitrow(g_runs[0].run, &state);
+      nximage_blitrow(g_runs[0].run, &state);
 #if NINPUT_ROWS > 1
-     nximage_blitrow(g_runs[1].run, &state);
+      nximage_blitrow(g_runs[1].run, &state);
 #endif
 
       /* Output rows before averaging */
@@ -306,7 +310,8 @@ void nximage_image(NXWINDOW hwnd)
 #if CONFIG_NX_NPLANES > 1
 # warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
 #endif
-      ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, SCALED_WIDTH*sizeof(nxgl_mxpixel_t));
+      ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos,
+                      SCALED_WIDTH * sizeof(nxgl_mxpixel_t));
       if (ret < 0)
         {
           printf("nximage_image: nx_bitmapwindow failed: %d\n", errno);
@@ -348,7 +353,8 @@ void nximage_image(NXWINDOW hwnd)
 #if CONFIG_NX_NPLANES > 1
 # warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
 #endif
-      ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, SCALED_WIDTH*sizeof(nxgl_mxpixel_t));
+      ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos,
+                      SCALED_WIDTH * sizeof(nxgl_mxpixel_t));
       if (ret < 0)
         {
           printf("nximage_image: nx_bitmapwindow failed: %d\n", errno);
@@ -369,7 +375,8 @@ void nximage_image(NXWINDOW hwnd)
 #if CONFIG_NX_NPLANES > 1
 # warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
 #endif
-      ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, SCALED_WIDTH*sizeof(nxgl_mxpixel_t));
+      ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos,
+                      SCALED_WIDTH * sizeof(nxgl_mxpixel_t));
       if (ret < 0)
         {
           printf("nximage_image: nx_bitmapwindow failed: %d\n", errno);
diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c
index fd2beac0b..4d9648f0f 100644
--- a/examples/nximage/nximage_main.c
+++ b/examples/nximage/nximage_main.c
@@ -90,7 +90,7 @@ static inline int nximage_initialize(void)
   ret = sched_setparam(0, &param);
   if (ret < 0)
     {
-      printf("nximage_initialize: sched_setparam failed: %d\n" , ret);
+      printf("nximage_initialize: sched_setparam failed: %d\n", ret);
       return ERROR;
     }
 
@@ -99,7 +99,8 @@ static inline int nximage_initialize(void)
   ret = boardctl(BOARDIOC_NX_START, 0);
   if (ret < 0)
     {
-      printf("nximage_initialize: Failed to start the NX server: %d\n", errno);
+      printf("nximage_initialize: Failed to start the NX server: %d\n",
+             errno);
       return ERROR;
     }
 
@@ -108,52 +109,53 @@ static inline int nximage_initialize(void)
   g_nximage.hnx = nx_connect();
   if (g_nximage.hnx)
     {
-       pthread_attr_t attr;
+      pthread_attr_t attr;
 
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, g_nximage.hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, g_nximage.hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
-           nx_disconnect(g_nximage.hnx);
-           return ERROR;
-         }
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+          nx_disconnect(g_nximage.hnx);
+          return ERROR;
+        }
 #endif
 
-       /* Start a separate thread to listen for server events.  This is probably
-        * the least efficient way to do this, but it makes this example flow more
-        * smoothly.
-        */
+      /* Start a separate thread to listen for server events.  This is
+       * probably the least efficient way to do this, but it makes this
+       * example flow more smoothly.
+       */
 
-       pthread_attr_init(&attr);
-       param.sched_priority = CONFIG_EXAMPLES_NXIMAGE_LISTENERPRIO;
-       pthread_attr_setschedparam(&attr, &param);
-       pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NXIMAGE_LISTENER_STACKSIZE);
+      pthread_attr_init(&attr);
+      param.sched_priority = CONFIG_EXAMPLES_NXIMAGE_LISTENERPRIO;
+      pthread_attr_setschedparam(&attr, &param);
+      pthread_attr_setstacksize(&attr,
+                                CONFIG_EXAMPLES_NXIMAGE_LISTENER_STACKSIZE);
 
-       ret = pthread_create(&thread, &attr, nximage_listener, NULL);
-       if (ret != 0)
-         {
-            printf("nximage_initialize: pthread_create failed: %d\n", ret);
-            return ERROR;
-         }
+      ret = pthread_create(&thread, &attr, nximage_listener, NULL);
+      if (ret != 0)
+        {
+          printf("nximage_initialize: pthread_create failed: %d\n", ret);
+          return ERROR;
+        }
 
-       /* Don't return until we are connected to the server */
+      /* Don't return until we are connected to the server */
 
-       while (!g_nximage.connected)
-         {
-           /* Wait for the listener thread to wake us up when we really
-            * are connected.
-            */
+      while (!g_nximage.connected)
+        {
+          /* Wait for the listener thread to wake us up when we really
+           * are connected.
+           */
 
-           sem_wait(&g_nximage.eventsem);
-         }
+          sem_wait(&g_nximage.eventsem);
+        }
     }
   else
     {
@@ -194,7 +196,7 @@ int main(int argc, FAR char *argv[])
 
   /* Set the background to the configured background color */
 
-  color =  nximage_bgcolor();
+  color = nximage_bgcolor();
   printf("nximage_main: Set background color=%u\n", color);
 
   ret = nx_setbgcolor(g_nximage.hnx, &color);
@@ -222,7 +224,8 @@ int main(int argc, FAR char *argv[])
       sem_wait(&g_nximage.eventsem);
     }
 
-  printf("nximage_main: Screen resolution (%d,%d)\n", g_nximage.xres, g_nximage.yres);
+  printf("nximage_main: Screen resolution (%d,%d)\n",
+         g_nximage.xres, g_nximage.yres);
 
   /* Now, put up the NuttX logo and wait a bit so that it visible. */
 
diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c
index 85b75177e..f13294fd0 100644
--- a/examples/nxlines/nxlines_main.c
+++ b/examples/nxlines/nxlines_main.c
@@ -51,6 +51,7 @@
  ****************************************************************************/
 
 /* Configuration ************************************************************/
+
 /* If not specified, assume that the hardware supports one video plane */
 
 #ifndef CONFIG_EXAMPLES_NXLINES_VPLANE
@@ -111,7 +112,7 @@ static inline int nxlines_initialize(void)
   ret = sched_setparam(0, &param);
   if (ret < 0)
     {
-      printf("nxlines_initialize: sched_setparam failed: %d\n" , ret);
+      printf("nxlines_initialize: sched_setparam failed: %d\n", ret);
       return ERROR;
     }
 
@@ -120,7 +121,8 @@ static inline int nxlines_initialize(void)
   ret = boardctl(BOARDIOC_NX_START, 0);
   if (ret < 0)
     {
-      printf("nxlines_initialize: Failed to start the NX server: %d\n", errno);
+      printf("nxlines_initialize: Failed to start the NX server: %d\n",
+             errno);
       return ERROR;
     }
 
@@ -129,52 +131,53 @@ static inline int nxlines_initialize(void)
   g_nxlines.hnx = nx_connect();
   if (g_nxlines.hnx)
     {
-       pthread_attr_t attr;
+      pthread_attr_t attr;
 
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, g_nxlines.hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, g_nxlines.hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
-           nx_disconnect(g_nxlines.hnx);
-           return ERROR;
-         }
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+          nx_disconnect(g_nxlines.hnx);
+          return ERROR;
+        }
 #endif
 
-       /* Start a separate thread to listen for server events.  This is probably
-        * the least efficient way to do this, but it makes this example flow more
-        * smoothly.
-        */
+      /* Start a separate thread to listen for server events.  This is
+       * probably the least efficient way to do this, but it makes this
+       * example flow more smoothly.
+       */
 
-       pthread_attr_init(&attr);
-       param.sched_priority = CONFIG_EXAMPLES_NXLINES_LISTENERPRIO;
-       pthread_attr_setschedparam(&attr, &param);
-       pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NXLINES_LISTENER_STACKSIZE);
+      pthread_attr_init(&attr);
+      param.sched_priority = CONFIG_EXAMPLES_NXLINES_LISTENERPRIO;
+      pthread_attr_setschedparam(&attr, &param);
+      pthread_attr_setstacksize(&attr,
+                                CONFIG_EXAMPLES_NXLINES_LISTENER_STACKSIZE);
 
-       ret = pthread_create(&thread, &attr, nxlines_listener, NULL);
-       if (ret != 0)
-         {
-            printf("nxlines_initialize: pthread_create failed: %d\n", ret);
-            return ERROR;
-         }
+      ret = pthread_create(&thread, &attr, nxlines_listener, NULL);
+      if (ret != 0)
+        {
+          printf("nxlines_initialize: pthread_create failed: %d\n", ret);
+          return ERROR;
+        }
 
-       /* Don't return until we are connected to the server */
+      /* Don't return until we are connected to the server */
 
-       while (!g_nxlines.connected)
-         {
-           /* Wait for the listener thread to wake us up when we really
-            * are connected.
-            */
+      while (!g_nxlines.connected)
+        {
+          /* Wait for the listener thread to wake us up when we really
+           * are connected.
+           */
 
-           sem_wait(&g_nxlines.eventsem);
-         }
+          sem_wait(&g_nxlines.eventsem);
+        }
     }
   else
     {
@@ -240,7 +243,8 @@ int main(int argc, FAR char *argv[])
       sem_wait(&g_nxlines.eventsem);
     }
 
-  printf("nxlines_main: Screen resolution (%d,%d)\n", g_nxlines.xres, g_nxlines.yres);
+  printf("nxlines_main: Screen resolution (%d,%d)\n",
+         g_nxlines.xres, g_nxlines.yres);
 
   /* Now, say perform the lines (these test does not return so the remaining
    * logic is cosmetic).
diff --git a/examples/nxterm/nxterm_toolbar.c b/examples/nxterm/nxterm_toolbar.c
index 0fa7c0802..327a54057 100644
--- a/examples/nxterm/nxterm_toolbar.c
+++ b/examples/nxterm/nxterm_toolbar.c
@@ -54,12 +54,14 @@
 
 static void nxtool_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                           bool morem, FAR void *arg);
-static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxtool_position(NXWINDOW hwnd,
+                            FAR const struct nxgl_size_s *size,
                             FAR const struct nxgl_point_s *pos,
                             FAR const struct nxgl_rect_s *bounds,
                             FAR void *arg);
 #ifdef CONFIG_NX_XYINPUT
-static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
+static void nxtool_mousein(NXWINDOW hwnd,
+                           FAR const struct nxgl_point_s *pos,
                            uint8_t buttons, FAR void *arg);
 #endif
 
@@ -121,7 +123,8 @@ static void nxtool_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
  * Name: nxtool_position
  ****************************************************************************/
 
-static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxtool_position(NXWINDOW hwnd,
+                            FAR const struct nxgl_size_s *size,
                             FAR const struct nxgl_point_s *pos,
                             FAR const struct nxgl_rect_s *bounds,
                             FAR void *arg)
diff --git a/examples/nxterm/nxterm_wndo.c b/examples/nxterm/nxterm_wndo.c
index c326e0449..ca88204ae 100644
--- a/examples/nxterm/nxterm_wndo.c
+++ b/examples/nxterm/nxterm_wndo.c
@@ -49,12 +49,14 @@
 
 static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                           bool morem, FAR void *arg);
-static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxwndo_position(NXWINDOW hwnd,
+                            FAR const struct nxgl_size_s *size,
                             FAR const struct nxgl_point_s *pos,
                             FAR const struct nxgl_rect_s *bounds,
                             FAR void *arg);
 #ifdef CONFIG_NX_XYINPUT
-static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
+static void nxwndo_mousein(NXWINDOW hwnd,
+                           FAR const struct nxgl_point_s *pos,
                            uint8_t buttons, FAR void *arg);
 #endif
 
@@ -119,7 +121,9 @@ static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
     }
   else
     {
-      /* If the driver has not been opened, then just redraw the window color */
+      /* If the driver has not been opened, then just redraw the window
+       * color.
+       */
 
       wcolor[0] = CONFIG_EXAMPLES_NXTERM_WCOLOR;
       nxtk_fillwindow(hwnd, rect, wcolor);
@@ -130,7 +134,8 @@ static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
  * Name: nxwndo_position
  ****************************************************************************/
 
-static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxwndo_position(NXWINDOW hwnd,
+                            FAR const struct nxgl_size_s *size,
                             FAR const struct nxgl_point_s *pos,
                             FAR const struct nxgl_rect_s *bounds,
                             FAR void *arg)
@@ -163,7 +168,8 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
       g_nxterm_vars.haveres = true;
       sem_post(&g_nxterm_vars.eventsem);
-      ginfo("Have xres=%d yres=%d\n", g_nxterm_vars.xres, g_nxterm_vars.yres);
+      ginfo("Have xres=%d yres=%d\n",
+            g_nxterm_vars.xres, g_nxterm_vars.yres);
     }
 }
 
diff --git a/examples/nxtext/nxtext_bkgd.c b/examples/nxtext/nxtext_bkgd.c
index 8eb55ba09..b0957bb7a 100644
--- a/examples/nxtext/nxtext_bkgd.c
+++ b/examples/nxtext/nxtext_bkgd.c
@@ -107,7 +107,8 @@ NXHANDLE g_bgwnd;
  * Name: nxbg_redrawrect
  ****************************************************************************/
 
-static void nxbg_redrawrect(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect)
+static void nxbg_redrawrect(NXWINDOW hwnd,
+                            FAR const struct nxgl_rect_s *rect)
 {
   int ret;
   int i;
@@ -172,7 +173,9 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
       st->wsize.w = size->w;
       st->wsize.h = size->h;
 
-      /* Save the window limits (these should be the same for all places and all windows */
+      /* Save the window limits (these should be the same for all places
+       * and all windows.
+       */
 
       g_xres = bounds->pt2.x + 1;
       g_yres = bounds->pt2.y + 1;
@@ -219,7 +222,8 @@ static void nxbg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
  *   only.
  ****************************************************************************/
 
-static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
+static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom,
+                                    int lineheight)
 {
   FAR struct nxtext_bitmap_s *bm;
   struct nxgl_rect_s rect;
@@ -227,10 +231,10 @@ static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
   int ret;
   int i;
 
-  /* Move each row, one at a time.  They could all be moved at once (by calling
-   * nxbg_redrawrect), but the since the region is cleared, then re-written, the
-   * effect would not be good.  Below the region is also cleared and re-written,
-   * however, in much smaller chunks.
+  /* Move each row, one at a time.  They could all be moved at once (by
+   * calling nxbg_redrawrect), but since the region is cleared, then
+   * rewritten, the effect would not be good.  Below the region is also
+   * cleared and rewritten, however, in much smaller chunks.
    */
 
   rect.pt1.x = 0;
@@ -256,7 +260,8 @@ static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
       for (i = 0; i < g_bgstate.nchars; i++)
         {
           bm = &g_bgstate.bm[i];
-          if (bm->pos.y <= rect.pt2.y && bm->pos.y + g_bgstate.fheight >= rect.pt1.y)
+          if (bm->pos.y <= rect.pt2.y &&
+              bm->pos.y + g_bgstate.fheight >= rect.pt1.y)
             {
               nxtext_fillchar(hwnd, &rect, &g_bgstate, g_bghfont, bm);
             }
@@ -266,7 +271,7 @@ static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
   /* Finally, clear the bottom part of the display */
 
   rect.pt1.y = bottom;
-  rect.pt2.y = g_bgstate.wsize.h- 1;
+  rect.pt2.y = g_bgstate.wsize.h - 1;
 
   ret = nx_fill(hwnd, &rect, g_bgstate.wcolor);
   if (ret < 0)
@@ -296,13 +301,15 @@ static inline void nxbg_scroll(NXWINDOW hwnd, int lineheight)
         {
           /* Yes... Delete the character by moving all of the data */
 
-          for (j = i; j < g_bgstate.nchars-1; j++)
+          for (j = i; j < g_bgstate.nchars - 1; j++)
             {
-              memcpy(&g_bgstate.bm[j], &g_bgstate.bm[j+1], sizeof(struct nxtext_bitmap_s));
+              memcpy(&g_bgstate.bm[j], &g_bgstate.bm[j + 1],
+                     sizeof(struct nxtext_bitmap_s));
             }
 
-          /* Decrement the number of cached characters ('i' is not incremented
-           * in this case because it already points to the next character)
+          /* Decrement the number of cached characters.  'i' is not
+           * incremented in this case because it already points to the next
+           * character.
            */
 
           g_bgstate.nchars--;
diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c
index d3d02956f..c749cd53a 100644
--- a/examples/nxtext/nxtext_main.c
+++ b/examples/nxtext/nxtext_main.c
@@ -60,6 +60,7 @@
  ****************************************************************************/
 
 /* Configuration ************************************************************/
+
 /* If not specified, assume that the hardware supports one video plane */
 
 #ifndef CONFIG_EXAMPLES_NXTEXT_VPLANE
@@ -138,7 +139,10 @@ nxgl_coord_t g_yres;
 
 bool b_haveresolution = false;
 bool g_connected = false;
-sem_t g_semevent = {0};
+sem_t g_semevent =
+{
+  0
+};
 
 int g_exitcode = NXEXIT_SUCCESS;
 
@@ -162,7 +166,7 @@ static int nxtext_initialize(void)
   ret = sched_setparam(0, &param);
   if (ret < 0)
     {
-      printf("nxtext_initialize: sched_setparam failed: %d\n" , ret);
+      printf("nxtext_initialize: sched_setparam failed: %d\n", ret);
       g_exitcode = NXEXIT_SCHEDSETPARAM;
       return ERROR;
     }
@@ -173,7 +177,8 @@ static int nxtext_initialize(void)
   ret = boardctl(BOARDIOC_NX_START, 0);
   if (ret < 0)
     {
-      printf("nxtext_initialize: Failed to start the NX server: %d\n", errno);
+      printf("nxtext_initialize: Failed to start the NX server: %d\n",
+             errno);
       g_exitcode = NXEXIT_SERVERSTART;
       return ERROR;
     }
@@ -188,24 +193,24 @@ static int nxtext_initialize(void)
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, g_hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, g_hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
-           nx_disconnect(g_hnx);
-           g_exitcode = NXEXIT_FBINITIALIZE;
-           return ERROR;
-         }
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+          nx_disconnect(g_hnx);
+          g_exitcode = NXEXIT_FBINITIALIZE;
+          return ERROR;
+        }
 #endif
 
-      /* Start a separate thread to listen for server events.  This is probably
-       * the least efficient way to do this, but it makes this example flow more
-       * smoothly.
+      /* Start a separate thread to listen for server events.  This is
+       * probably the least efficient way to do this, but it makes this
+       * example flow more smoothly.
        */
 
       pthread_attr_init(&attr);
@@ -216,10 +221,10 @@ static int nxtext_initialize(void)
       ret = pthread_create(&thread, &attr, nxtext_listener, NULL);
       if (ret != 0)
         {
-           printf("nxtext_initialize: pthread_create failed: %d\n", ret);
+          printf("nxtext_initialize: pthread_create failed: %d\n", ret);
 
-           g_exitcode = NXEXIT_PTHREADCREATE;
-           return ERROR;
+          g_exitcode = NXEXIT_PTHREADCREATE;
+          return ERROR;
         }
 
       /* Don't return until we are connected to the server */
@@ -277,7 +282,8 @@ int main(int argc, FAR char *argv[])
   g_bghfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXTEXT_BGFONTID);
   if (!g_bghfont)
     {
-      printf("nxtext_main: Failed to get background font handle: %d\n", errno);
+      printf("nxtext_main: Failed to get background font handle: %d\n",
+             errno);
       g_exitcode = NXEXIT_FONTOPEN;
       goto errout;
     }
@@ -285,14 +291,16 @@ int main(int argc, FAR char *argv[])
   g_puhfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXTEXT_PUFONTID);
   if (!g_puhfont)
     {
-      printf("nxtext_main: Failed to get pop-up font handle: %d\n", errno);
+      printf("nxtext_main: Failed to get pop-up font handle: %d\n",
+             errno);
       g_exitcode = NXEXIT_FONTOPEN;
       goto errout;
     }
 
   /* Set the background to the configured background color */
 
-  printf("nxtext_main: Set background color=%d\n", CONFIG_EXAMPLES_NXTEXT_BGCOLOR);
+  printf("nxtext_main: Set background color=%d\n",
+         CONFIG_EXAMPLES_NXTEXT_BGCOLOR);
   color = CONFIG_EXAMPLES_NXTEXT_BGCOLOR;
   ret = nx_setbgcolor(g_hnx, &color);
   if (ret < 0)
@@ -328,7 +336,7 @@ int main(int argc, FAR char *argv[])
 
   popcnt = 0;
   bkgndx = 0;
-  for (;;)
+  for (; ; )
     {
       /* Sleep for one second */
 
@@ -346,15 +354,18 @@ int main(int argc, FAR char *argv[])
           hwnd = nxpu_open();
 
 #ifdef CONFIG_NX_KBD
-          /* Give keyboard input to the top window (which should be the pop-up) */
+          /* Give keyboard input to the top window (which should be the
+           * pop-up).
+           */
 
           printf("nxtext_main: Send keyboard input: %s\n", g_pumsg);
-          ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_pumsg), g_pumsg);
+          ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_pumsg),
+                         g_pumsg);
           if (ret < 0)
-           {
-             printf("nxtext_main: nx_kbdin failed: %d\n", errno);
-             goto errout_with_hwnd;
-           }
+            {
+              printf("nxtext_main: nx_kbdin failed: %d\n", errno);
+              goto errout_with_hwnd;
+            }
 #endif
         }
       else if (popcnt == 5)
@@ -367,11 +378,12 @@ int main(int argc, FAR char *argv[])
         }
 
       /* Give another line of text to the background window.  Force this
-       * text to go the background by calling the background window interfaces
-       * directly.
+       * text to the background by calling the background window
+       * interfaces directly.
        */
 
-      nxbg_write(g_bgwnd, (FAR const uint8_t *)g_bgmsg[bkgndx], strlen(g_bgmsg[bkgndx]));
+      nxbg_write(g_bgwnd, (FAR const uint8_t *)g_bgmsg[bkgndx],
+                 strlen(g_bgmsg[bkgndx]));
       if (++bkgndx >= BGMSG_LINES)
         {
           bkgndx = 0;
@@ -386,13 +398,15 @@ errout_with_hwnd:
   if (popcnt >= 3)
     {
       printf("nxtext_main: Close pop-up\n");
-     nxpu_close(hwnd);
+      nxpu_close(hwnd);
     }
 
-//errout_with_bkgd:
+  /* errout_with_bkgd: */
+
   nx_releasebkgd(g_bgwnd);
 
 errout_with_nx:
+
   /* Disconnect from the server */
 
   printf("nxtext_main: Disconnect from the server\n");
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index 384ae22bb..325132caf 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -95,6 +95,7 @@ static void nxtext_freeglyph(FAR struct nxtext_glyph_s *glyph)
     {
       free(glyph->bitmap);
     }
+
   memset(glyph, 0, sizeof(struct nxtext_glyph_s));
 }
 
@@ -111,11 +112,11 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
   int i;
 
   /* Search through the glyph cache looking for an unused glyph.  Also, keep
-   * track of the least used glyph as well.  We need that if we have to replace
-   * a glyph in the cache.
+   * track of the least used glyph as well.  We need that if we have to
+   * replace a glyph in the cache.
    */
 
-   for (i = 0; i < st->maxglyphs; i++)
+  for (i = 0; i < st->maxglyphs; i++)
     {
       /* Is this glyph in use? */
 
@@ -149,9 +150,9 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
 
   if (luusecnt > 1)
     {
-       uint8_t decr = luusecnt - 1;
+      uint8_t decr = luusecnt - 1;
 
-       for (i = 0; i < st->maxglyphs; i++)
+      for (i = 0; i < st->maxglyphs; i++)
         {
           /* Is this glyph in use? */
 
@@ -180,7 +181,7 @@ nxtext_findglyph(FAR struct nxtext_state_s *st, uint8_t ch)
 
   /* First, try to find the glyph in the cache of pre-rendered glyphs */
 
-   for (i = 0; i < st->maxglyphs; i++)
+  for (i = 0; i < st->maxglyphs; i++)
     {
       FAR struct nxtext_glyph_s *glyph = &st->glyph[i];
       if (glyph->usecnt > 0 && glyph->code == ch)
@@ -189,7 +190,7 @@ nxtext_findglyph(FAR struct nxtext_state_s *st, uint8_t ch)
 
           if (glyph->usecnt < MAX_USECNT)
             {
-               glyph->usecnt++;
+              glyph->usecnt++;
             }
 
           /* And return the glyph that we found */
@@ -197,6 +198,7 @@ nxtext_findglyph(FAR struct nxtext_state_s *st, uint8_t ch)
           return glyph;
         }
     }
+
   return NULL;
 }
 
@@ -248,13 +250,13 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
       /* Pack 1-bit pixels into a 2-bits */
 
       pixel &= 0x01;
-      pixel  = (pixel) << 1 |pixel;
+      pixel  = (pixel) << 1 | pixel;
 #  endif
 #  if CONFIG_EXAMPLES_NXTEXT_BPP < 4
       /* Pack 2-bit pixels into a nibble */
 
       pixel &= 0x03;
-      pixel  = (pixel) << 2 |pixel;
+      pixel  = (pixel) << 2 | pixel;
 #  endif
 
       /* Pack 4-bit nibbles into a byte */
@@ -292,7 +294,7 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
 
       /* Then render the glyph into the allocated memory */
 
-      ret = RENDERER((FAR nxgl_mxpixel_t*)glyph->bitmap,
+      ret = RENDERER((FAR nxgl_mxpixel_t *)glyph->bitmap,
                       glyph->height, glyph->width, glyph->stride,
                       fbm, st->fcolor[0]);
       if (ret < 0)
@@ -312,7 +314,8 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
  * Name: nxtext_fontsize
  ****************************************************************************/
 
-static int nxtext_fontsize(NXHANDLE hfont, uint8_t ch, FAR struct nxgl_size_s *size)
+static int nxtext_fontsize(NXHANDLE hfont, uint8_t ch,
+                           FAR struct nxgl_size_s *size)
 {
   FAR const struct nx_fontbitmap_s *fbm;
 
@@ -379,37 +382,39 @@ nxtext_addchar(NXHANDLE hfont, FAR struct nxtext_state_s *st, uint8_t ch)
 
   if (st->nchars < st->maxchars)
     {
-       /* Yes, setup the bitmap information */
+      /* Yes, setup the bitmap information */
 
-       bm        = &st->bm[st->nchars];
-       bm->code  = ch;
-       bm->flags = 0;
-       bm->pos.x = st->fpos.x;
-       bm->pos.y = st->fpos.y;
+      bm        = &st->bm[st->nchars];
+      bm->code  = ch;
+      bm->flags = 0;
+      bm->pos.x = st->fpos.x;
+      bm->pos.y = st->fpos.y;
 
-       /* Find (or create) the matching glyph */
+      /* Find (or create) the matching glyph */
 
-       glyph = nxtext_getglyph(hfont, st, ch);
-       if (!glyph)
-         {
-            /* No, there is no font for this code.  Just mark this as a space. */
+      glyph = nxtext_getglyph(hfont, st, ch);
+      if (!glyph)
+        {
+          /* No, there is no font for this code.  Just mark this as a
+           * space.
+           */
 
-            bm->flags |= BMFLAGS_NOGLYPH;
+          bm->flags |= BMFLAGS_NOGLYPH;
 
-            /* Set up the next character position */
+          /* Set up the next character position */
 
-            st->fpos.x += st->spwidth;
-         }
-       else
-         {
-            /* Set up the next character position */
+          st->fpos.x += st->spwidth;
+        }
+      else
+        {
+          /* Set up the next character position */
 
-            st->fpos.x += glyph->width;
-         }
+          st->fpos.x += glyph->width;
+        }
 
-       /* Success.. increment nchars to retain this character */
+      /* Success.. increment nchars to retain this character */
 
-       st->nchars++;
+      st->nchars++;
     }
 
   return bm;
@@ -465,7 +470,8 @@ void nxtext_newline(FAR struct nxtext_state_s *st)
  *
  ****************************************************************************/
 
-void nxtext_putc(NXWINDOW hwnd, FAR struct nxtext_state_s *st, NXHANDLE hfont, uint8_t ch)
+void nxtext_putc(NXWINDOW hwnd, FAR struct nxtext_state_s *st,
+                 NXHANDLE hfont, uint8_t ch)
 {
   FAR const struct nxtext_bitmap_s *bm;
 
@@ -562,13 +568,13 @@ void nxtext_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 
       /* Find (or create) the glyph that goes with this font */
 
-       glyph = nxtext_getglyph(hfont, st, bm->code);
-       if (!glyph)
-         {
-           /* Shouldn't happen */
+      glyph = nxtext_getglyph(hfont, st, bm->code);
+      if (!glyph)
+        {
+          /* Shouldn't happen */
 
-           return;
-         }
+          return;
+        }
 
       /* Blit the font bitmap into the window */
 
diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c
index 3b5993372..cd98a48e2 100644
--- a/examples/pwfb/pwfb_main.c
+++ b/examples/pwfb/pwfb_main.c
@@ -57,6 +57,8 @@
 
 #include "pwfb_internal.h"
 
+#define ARROW1_CURSOR_IMAGE g_arrow1##Cursor
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -115,22 +117,22 @@ static bool pwfb_server_initialize(FAR struct pwfb_state_s *st)
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, st->hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, st->hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("pwfb_server_initialize: ERROR: "
-                  "boardctl(BOARDIOC_VNC_START) failed: %d\n",
-                  ret);
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("pwfb_server_initialize: ERROR: "
+                 "boardctl(BOARDIOC_VNC_START) failed: %d\n",
+                 ret);
 
-           nx_disconnect(st->hnx);
-           g_exitcode = NXEXIT_FBINITIALIZE;
-           return ERROR;
-         }
+          nx_disconnect(st->hnx);
+          g_exitcode = NXEXIT_FBINITIALIZE;
+          return ERROR;
+        }
 #endif
     }
   else
@@ -168,10 +170,10 @@ static bool pwfb_listener_initialize(FAR struct pwfb_state_s *st)
   ret = pthread_create(&thread, &attr, pwfb_listener, st);
   if (ret != 0)
     {
-       printf("pwfb_listener_initialize: ERROR: "
-              "pthread_create failed: %d\n",
-              ret);
-       return false;
+      printf("pwfb_listener_initialize: ERROR: "
+             "pthread_create failed: %d\n",
+             ret);
+      return false;
     }
 
   /* Don't return until we are connected to the server */
@@ -340,8 +342,8 @@ static bool pwfb_putc(FAR struct pwfb_state_s *st,
   /* Render the glyph into the window */
 
   src = glyph->bitmap;
-  ret =  nxtk_bitmapwindow(wndo->hwnd, &bounds, &src,
-                           fpos, (unsigned int)glyph->stride);
+  ret = nxtk_bitmapwindow(wndo->hwnd, &bounds, &src,
+                          fpos, (unsigned int)glyph->stride);
   if (ret < 0)
     {
       printf("pwfb_putc: ERROR: "
@@ -510,8 +512,8 @@ static bool pwfb_configure_cursor(FAR struct pwfb_state_s *st,
   st->cursor.state     = PFWB_CURSOR_MOVING;
   st->cursor.countdown = CURSOR_MOVING_DELAY;
   st->cursor.blinktime = 0;
-  st->cursor.xmax      = itob16(st->xres - g_arrow1Cursor.size.w - 1);
-  st->cursor.ymax      = itob16(st->yres - g_arrow1Cursor.size.h - 1);
+  st->cursor.xmax      = itob16(st->xres - ARROW1_CURSOR_IMAGE.size.w - 1);
+  st->cursor.ymax      = itob16(st->yres - ARROW1_CURSOR_IMAGE.size.h - 1);
   st->cursor.xpos      = itob16(pos->x);
   st->cursor.ypos      = itob16(pos->y);
   st->cursor.deltax    = dtob16(deltax);
@@ -519,7 +521,7 @@ static bool pwfb_configure_cursor(FAR struct pwfb_state_s *st,
 
   /* Set the cursor image */
 
-  ret = nxcursor_setimage(st->hnx, &g_arrow1Cursor);
+  ret = nxcursor_setimage(st->hnx, &ARROW1_CURSOR_IMAGE);
   if (ret < 0)
     {
       printf("pwfb_configure_cursor: ERROR: "
@@ -651,7 +653,8 @@ int main(int argc, FAR char *argv[])
   pos.x  = wstate.xres / 8;
   pos.y  = wstate.yres / 8;
 
-  if (!pwfb_configure_window(&wstate, 0, &size, &pos, g_wndomsg1, 4.200, 4.285))
+  if (!pwfb_configure_window(&wstate, 0, &size, &pos, g_wndomsg1,
+                             4.200, 4.285))
     {
       printf("pwfb_main: ERROR: "
              "pwfb_configure_window failed for window 1\n");
@@ -681,7 +684,8 @@ int main(int argc, FAR char *argv[])
   pos.x  = wstate.xres / 4;
   pos.y  = wstate.yres / 4;
 
-  if (!pwfb_configure_window(&wstate, 1, &size, &pos, g_wndomsg2, -3.317, 5.0))
+  if (!pwfb_configure_window(&wstate, 1, &size, &pos, g_wndomsg2,
+                             -3.317, 5.0))
     {
       printf("pwfb_main: ERROR: "
              "pwfb_configure_window failed for window 2\n");
@@ -711,7 +715,8 @@ int main(int argc, FAR char *argv[])
   pos.x = (3 * wstate.xres) / 8;
   pos.y = (3 * wstate.yres) / 8;
 
-  if (!pwfb_configure_window(&wstate, 2, &size, &pos, g_wndomsg3, 4.600, -3.852))
+  if (!pwfb_configure_window(&wstate, 2, &size, &pos, g_wndomsg3,
+                             4.600, -3.852))
     {
       printf("pwfb_main: ERROR: "
              "pwfb_configure_window failed for window 2\n");
@@ -797,6 +802,7 @@ errout_with_hwnd1:
 #endif
 
 errout_with_fontcache:
+
   /* Release the font cache */
 
   nxf_cache_disconnect(wstate.wndo[0].fcache);
@@ -804,6 +810,7 @@ errout_with_fontcache:
   nxf_cache_disconnect(wstate.wndo[2].fcache);
 
 errout_with_nx:
+
   /* Disconnect from the server */
 
   printf("pwfb_main: Disconnect from the server\n");
diff --git a/examples/pwlines/pwlines_main.c b/examples/pwlines/pwlines_main.c
index 8d448cc11..53a2b3a53 100644
--- a/examples/pwlines/pwlines_main.c
+++ b/examples/pwlines/pwlines_main.c
@@ -94,21 +94,21 @@ static bool pwlines_server_initialize(FAR struct pwlines_state_s *st)
 #ifdef CONFIG_VNCSERVER
       /* Setup the VNC server to support keyboard/mouse inputs */
 
-       struct boardioc_vncstart_s vnc =
-       {
-         0, st->hnx
-       };
+      struct boardioc_vncstart_s vnc =
+      {
+        0, st->hnx
+      };
 
-       ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
-       if (ret < 0)
-         {
-           printf("pwlines_server_initialize: ERROR: "
-                  "boardctl(BOARDIOC_VNC_START) failed: %d\n",
-                  ret);
+      ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+      if (ret < 0)
+        {
+          printf("pwlines_server_initialize: ERROR: "
+                 "boardctl(BOARDIOC_VNC_START) failed: %d\n",
+                 ret);
 
-           nx_disconnect(st->hnx);
-           return false;
-         }
+          nx_disconnect(st->hnx);
+          return false;
+        }
 #endif
     }
   else
@@ -141,15 +141,16 @@ static bool pwlines_listener_initialize(FAR struct pwlines_state_s *st)
   pthread_attr_init(&attr);
   param.sched_priority = CONFIG_EXAMPLES_PWLINES_LISTENER_PRIO;
   pthread_attr_setschedparam(&attr, &param);
-  pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_PWLINES_LISTENER_STACKSIZE);
+  pthread_attr_setstacksize(&attr,
+                            CONFIG_EXAMPLES_PWLINES_LISTENER_STACKSIZE);
 
   ret = pthread_create(&thread, &attr, pwlines_listener, st);
   if (ret != 0)
     {
-       printf("pwlines_listener_initialize: ERROR: "
-              "pthread_create failed: %d\n",
-              ret);
-       return false;
+      printf("pwlines_listener_initialize: ERROR: "
+             "pthread_create failed: %d\n",
+             ret);
+      return false;
     }
 
   /* Don't return until we are connected to the server */
@@ -193,7 +194,8 @@ static bool pwlines_state_initialize(FAR struct pwlines_state_s *st)
  * Name: pwlines_configure_window
  ****************************************************************************/
 
-static bool pwlines_configure_window(FAR struct pwlines_state_s *st, int wndx,
+static bool pwlines_configure_window(FAR struct pwlines_state_s *st,
+                                     int wndx,
                                      FAR struct nxgl_size_s *size,
                                      FAR struct nxgl_point_s *pos,
                                      double deltax, double deltay)
@@ -353,8 +355,9 @@ int main(int argc, FAR char *argv[])
 
   printf("pwlines_main: Open window 1\n");
 
-  wstate.wndo[0].hwnd = nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
-                                        &g_pwlines_wncb, (FAR void *)&wstate);
+  wstate.wndo[0].hwnd =
+    nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
+                    &g_pwlines_wncb, (FAR void *)&wstate);
   if (wstate.wndo[0].hwnd == NULL)
     {
       printf("pwlines_main: ERROR: "
@@ -386,7 +389,8 @@ int main(int argc, FAR char *argv[])
   pos.x  = wstate.xres / 8;
   pos.y  = wstate.yres / 8;
 
-  if (!pwlines_configure_window(&wstate, 0, &size, &pos, 4.200, 4.285))
+  if (!pwlines_configure_window(&wstate, 0, &size, &pos,
+                                4.200, 4.285))
     {
       printf("pwlines_main: ERROR: "
              "pwlines_configure_window failed for window 1\n");
@@ -397,8 +401,9 @@ int main(int argc, FAR char *argv[])
 
   printf("pwlines_main: Open window 2\n");
 
-  wstate.wndo[1].hwnd = nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
-                                        &g_pwlines_wncb, (FAR void *)&wstate);
+  wstate.wndo[1].hwnd =
+    nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
+                    &g_pwlines_wncb, (FAR void *)&wstate);
   if (wstate.wndo[1].hwnd == NULL)
     {
       printf("pwlines_main: ERROR: "
@@ -414,7 +419,8 @@ int main(int argc, FAR char *argv[])
   pos.x  = wstate.xres / 4;
   pos.y  = wstate.yres / 4;
 
-  if (!pwlines_configure_window(&wstate, 1, &size, &pos, -3.317, 5.0))
+  if (!pwlines_configure_window(&wstate, 1, &size, &pos,
+                                -3.317, 5.0))
     {
       printf("pwlines_main: ERROR: "
              "pwlines_configure_window failed for window 2\n");
@@ -425,8 +431,9 @@ int main(int argc, FAR char *argv[])
 
   printf("pwlines_main: Open window 3\n");
 
-  wstate.wndo[2].hwnd = nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
-                                        &g_pwlines_wncb, (FAR void *)&wstate);
+  wstate.wndo[2].hwnd =
+    nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
+                    &g_pwlines_wncb, (FAR void *)&wstate);
   if (wstate.wndo[2].hwnd == NULL)
     {
       printf("pwlines_main: ERROR: "
@@ -442,7 +449,8 @@ int main(int argc, FAR char *argv[])
   pos.x = (3 * wstate.xres) / 8;
   pos.y = (3 * wstate.yres) / 8;
 
-  if (!pwlines_configure_window(&wstate, 2, &size, &pos, 4.600, -3.852))
+  if (!pwlines_configure_window(&wstate, 2, &size, &pos,
+                                4.600, -3.852))
     {
       printf("pwlines_main: ERROR: "
              "pwlines_configure_window failed for window 2\n");
@@ -512,6 +520,7 @@ errout_with_hwnd1:
     }
 
 errout_with_nx:
+
   /* Disconnect from the server */
 
   printf("pwlines_main: Disconnect from the server\n");
diff --git a/examples/qencoder/qe_main.c b/examples/qencoder/qe_main.c
index 504db260d..23e529802 100644
--- a/examples/qencoder/qe_main.c
+++ b/examples/qencoder/qe_main.c
@@ -307,11 +307,14 @@ int main(int argc, FAR char *argv[])
 
       if (g_qeexample.use_qeindex)
         {
-          ret = ioctl(fd, QEIOC_GETINDEX, (unsigned long)((uintptr_t)&index));
+          ret = ioctl(fd, QEIOC_GETINDEX,
+                      (unsigned long)((uintptr_t)&index));
           if (ret < 0)
             {
-              printf("qe_main: ioctl(QEIOC_GETINDEX) failed: %d\n", errno);
-              printf("Your MCU probably does not support this ioctl call.\n");
+              printf("qe_main: ioctl(QEIOC_GETINDEX) failed: %d\n",
+                     errno);
+              printf("Your MCU probably does not support this ioctl "
+                     "call.\n");
               printf("Consider using this example without the -i option.\n");
               exitval = EXIT_FAILURE;
               goto errout_with_dev;
@@ -321,13 +324,17 @@ int main(int argc, FAR char *argv[])
 
           else
             {
-              printf("qe_main: %3d. pos: %" PRIi32 ", last index: %" PRIi32 ", hit indexes: %" \
-                     PRIi16 "\n", nloops + 1, index.qenc_pos, index.indx_pos, index.indx_cnt);
+              printf("qe_main: %3d. pos: %" PRIi32 ", "
+                     "last index: %" PRIi32 ", "
+                     "hit indexes: %" PRIi16 "\n",
+                     nloops + 1, index.qenc_pos, index.indx_pos,
+                     index.indx_cnt);
             }
         }
       else
         {
-          ret = ioctl(fd, QEIOC_POSITION, (unsigned long)((uintptr_t)&position));
+          ret = ioctl(fd, QEIOC_POSITION,
+                      (unsigned long)((uintptr_t)&position));
           if (ret < 0)
             {
               printf("qe_main: ioctl(QEIOC_POSITION) failed: %d\n", errno);
diff --git a/fsutils/flash_eraseall/flash_eraseall.c b/fsutils/flash_eraseall/flash_eraseall.c
index f7462c152..fda7b7e04 100644
--- a/fsutils/flash_eraseall/flash_eraseall.c
+++ b/fsutils/flash_eraseall/flash_eraseall.c
@@ -71,13 +71,14 @@ int flash_eraseall(FAR const char *driver)
       if (ret < 0)
         {
           errcode = errno;
-          ferr("ERROR: MTD ioctl(%04x) failed: %d\n", MTDIOC_BULKERASE, errcode);
+          ferr("ERROR: MTD ioctl(%04x) failed: %d\n",
+               MTDIOC_BULKERASE, errcode);
           ret = -errcode;
         }
 
       /* Close the block driver */
 
-     close(fd);
+      close(fd);
     }
 
   return ret;
diff --git a/graphics/tiff/tiff_addstrip.c b/graphics/tiff/tiff_addstrip.c
index 5db952088..965152eac 100644
--- a/graphics/tiff/tiff_addstrip.c
+++ b/graphics/tiff/tiff_addstrip.c
@@ -65,13 +65,15 @@
  *   tiff_initialize().
  *
  * Input Parameters:
- *   info    - A pointer to the caller allocated parameter passing/TIFF state instance.
+ *   info    - A pointer to the caller allocated parameter passing/TIFF
+ *             state instance.
  *   buffer  - A buffer containing a single row of data.
  *
  * Returned Value:
  *   Zero (OK) on success.  A negated errno value on failure.
  *
  ****************************************************************************/
+
 int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
 {
 #ifdef CONFIG_DEBUG_GRAPHICS
@@ -100,9 +102,9 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
       /* Convert RGB565 to RGB888 */
 
       rgb565  = *src++;
-      *dest++ = (rgb565 >> (11-3)) & 0xf8; /* Move bits 11-15 to 3-7 */
-      *dest++ = (rgb565 >> ( 5-2)) & 0xfc; /* Move bits  5-10 to 2-7 */
-      *dest++ = (rgb565 << (   3)) & 0xf8; /* Move bits  0- 4 to 3-7 */
+      *dest++ = (rgb565 >> (11 - 3)) & 0xf8; /* Move bits 11-15 to 3-7 */
+      *dest++ = (rgb565 >> (5 - 2)) & 0xfc;  /* Move bits  5-10 to 2-7 */
+      *dest++ = (rgb565 << 3) & 0xf8;        /* Move bits  0- 4 to 3-7 */
 
       /* Update the byte count */
 
@@ -113,7 +115,7 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
 
       /* Flush the conversion buffer to tmpfile2 when it becomes full */
 
-      if (nbytes > (info->iosize-3))
+      if (nbytes > (info->iosize - 3))
         {
           ret = tiff_write(info->tmp2fd, info->iobuffer, nbytes);
           if (ret < 0)
@@ -134,6 +136,7 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
 #ifdef CONFIG_DEBUG_GRAPHICS
   DEBUGASSERT(ntotal == info->bps);
 #endif
+
   return ret;
 }
 
@@ -150,7 +153,8 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
  *   tiff_initialize().
  *
  * Input Parameters:
- *   info    - A pointer to the caller allocated parameter passing/TIFF state instance.
+ *   info    - A pointer to the caller allocated parameter passing/TIFF
+ *             state instance.
  *   buffer  - A buffer containing a single row of data.
  *
  * Returned Value:
@@ -172,7 +176,9 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
       ret = tiff_convstrip(info, strip);
     }
 
-  /* For other formats, it is a simple write using the number of bytes per strip */
+  /* For other formats, it is a simple write using the number of bytes per
+   * strip.
+   */
 
   else
     {
@@ -191,6 +197,7 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
     {
       goto errout;
     }
+
   info->outsize += 4;
 
   ret = tiff_putint32(info->tmp1fd, info->tmp2size);
@@ -198,6 +205,7 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
     {
       goto errout;
     }
+
   info->tmp1size += 4;
 
   /* Increment the size of tmp2file. */
@@ -212,14 +220,17 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
       ret = (int)newsize;
       goto errout;
     }
+
   info->tmp2size = (size_t)newsize;
 
   /* Increment the number of strips in the TIFF file */
 
   info->nstrips++;
+
   return OK;
 
 errout:
+
   tiff_abort(info);
   return ret;
 }
diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c
index 263f650cf..2c4f5921a 100644
--- a/graphics/tiff/tiff_initialize.c
+++ b/graphics/tiff/tiff_initialize.c
@@ -41,6 +41,7 @@
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
+
 /* Bi-level Images
  *
  *          Offset Description                 Contents/Notes
@@ -50,13 +51,18 @@
  *            8    [2 bytes padding]
  * IFD:      10    Number of Directory Entries 13
  *           12    NewSubfileType
- *           24    ImageWidth                  Number of columns is a user parameter
- *           36    ImageLength                 Number of rows is a user parameter
- *           48    Compression                 Hard-coded no compression (for now)
+ *           24    ImageWidth                  Number of columns is a user
+ *                                             parameter
+ *           36    ImageLength                 Number of rows is a user
+ *                                             parameter
+ *           48    Compression                 Hard-coded no compression
+ *                                             (for now)
  *           60    PhotometricInterpretation   Value is a user parameter
- *           72    StripOffsets                Offset and count determined as strips added
+ *           72    StripOffsets                Offset and count determined
+ *                                             as strips added
  *           84    RowsPerStrip                Value is a user parameter
- *           96    StripByteCounts             Offset and count determined as strips added
+ *           96    StripByteCounts             Offset and count determined
+ *                                             as strips added
  *          108    XResolution                 Value is a user parameter
  *          120    YResolution                 Value is a user parameter
  *          132    Resolution Unit             Hard-coded to "inches"
@@ -67,8 +73,10 @@
  * Values:
  *          172    XResolution                 Hard-coded to 300/1
  *          180    YResolution                 Hard-coded to 300/1
- *          188    "NuttX"                     Length = 6 (including NUL terminator)
- *          194    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL terminator)
+ *          188    "NuttX"                     Length = 6 (including NUL
+ *                                             terminator)
+ *          194    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL
+ *                                             terminator)
  *          214    [2 bytes padding]
  *          216    StripByteCounts             Beginning of strip byte counts
  *          xxx    StripOffsets                Beginning of strip offsets
@@ -76,7 +84,7 @@
  *          xxx    Data for strips             Beginning of strip data
  */
 
-#define TIFF_IFD_OFFSET           (SIZEOF_TIFF_HEADER+2)
+#define TIFF_IFD_OFFSET           (SIZEOF_TIFF_HEADER + 2)
 
 #define TIFF_BILEV_NIFDENTRIES    13
 #define TIFF_BILEV_STRIPIFDOFFS   72
@@ -102,14 +110,19 @@
  *            8    [2 bytes padding]
  * IFD:      10    Number of Directory Entries 14
  *           12    NewSubfileType
- *           24    ImageWidth                  Number of columns is a user parameter
- *           36    ImageLength                 Number of rows is a user parameter
+ *           24    ImageWidth                  Number of columns is a user
+ *                                             parameter
+ *           36    ImageLength                 Number of rows is a user
+ *                                             parameter
  *           48    BitsPerSample
- *           60    Compression                 Hard-coded no compression (for now)
+ *           60    Compression                 Hard-coded no compression
+ *                                             (for now)
  *           72    PhotometricInterpretation   Value is a user parameter
- *           84    StripOffsets                Offset and count determined as strips added
+ *           84    StripOffsets                Offset and count determined
+ *                                             as strips added
  *           96    RowsPerStrip                Value is a user parameter
- *          108    StripByteCounts             Offset and count determined as strips added
+ *          108    StripByteCounts             Offset and count determined
+ *                                             as strips added
  *          120    XResolution                 Value is a user parameter
  *          132    YResolution                 Value is a user parameter
  *          144    Resolution Unit             Hard-coded to "inches"
@@ -120,8 +133,10 @@
  * Values:
  *          184    XResolution                 Hard-coded to 300/1
  *          192    YResolution                 Hard-coded to 300/1
- *          200    "NuttX"                     Length = 6 (including NUL terminator)
- *          206    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL terminator)
+ *          200    "NuttX"                     Length = 6 (including NUL
+ *                                             terminator)
+ *          206    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL
+ *                                             terminator)
  *          226    [2 bytes padding]
  *          228    StripByteCounts             Beginning of strip byte counts
  *          xxx    StripOffsets                Beginning of strip offsets
@@ -148,15 +163,20 @@
  *            8    [2 bytes padding]
  * IFD:      10    Number of Directory Entries 15
  *           12    NewSubfileType
- *           24    ImageWidth                  Number of columns is a user parameter
- *           36    ImageLength                 Number of rows is a user parameter
+ *           24    ImageWidth                  Number of columns is a user
+ *                                             parameter
+ *           36    ImageLength                 Number of rows is a user
+ *                                             parameter
  *           48    BitsPerSample               8, 8, 8
- *           60    Compression                 Hard-coded no compression (for now)
+ *           60    Compression                 Hard-coded no compression
+ *                                             (for now)
  *           72    PhotometricInterpretation   Value is a user parameter
- *           84    StripOffsets                Offset and count determined as strips added
+ *           84    StripOffsets                Offset and count determined
+ *                                             as strips added
  *           96    SamplesPerPixel             Hard-coded to 3
  *          108    RowsPerStrip                Value is a user parameter
- *          120    StripByteCounts             Offset and count determined as strips added
+ *          120    StripByteCounts             Offset and count determined
+ *                                             as strips added
  *          132    XResolution                 Value is a user parameter
  *          144    YResolution                 Value is a user parameter
  *          156    Resolution Unit              Hard-coded to "inches"
@@ -169,8 +189,10 @@
  *          204    YResolution                 Hard-coded to 300/1
  *          212    BitsPerSample               8, 8, 8
  *          218    [2 bytes padding]
- *          220    "NuttX"                     Length = 6 (including NUL terminator)
- *          226    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL terminator)
+ *          220    "NuttX"                     Length = 6 (including NUL
+ *                                             terminator)
+ *          226    "YYYY:MM:DD HH:MM:SS"       Length = 20 (including NUL
+ *                                             terminator)
  *          246    [2 bytes padding]
  *          248    StripByteCounts             Beginning of strip byte counts
  *          xxx    StripOffsets                Beginning of strip offsets
@@ -189,8 +211,12 @@
 #define TIFF_RGB_DATEOFFSET     226
 #define TIFF_RGB_STRIPBCOFFSET  248
 
-/* Debug *******************************************************************/
-/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG_FEATURES and
+/****************************************************************************
+ * Debug
+ ****************************************************************************/
+
+/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG_FEATURES
+ * and
  * CONFIG_DEBUG_GRAPHICS) in order to verify the pre-determined TIFF file
  * offsets.
  */
@@ -200,11 +226,11 @@
 #endif
 
 #ifdef CONFIG_DEBUG_TIFFOFFSETS
-#  define tiff_offset(o,l)      (o) += (l)
-#  define tiff_checkoffs(o,x)   DEBUGASSERT((o) == (x))
+#  define tiff_offset(o, l)      (o) += (l)
+#  define tiff_checkoffs(o, x)   DEBUGASSERT((o) == (x))
 #else
-#  define tiff_offset(o,l)
-#  define tiff_checkoffs(o,x)
+#  define tiff_offset(o, l)
+#  define tiff_checkoffs(o, x)
 #endif
 
 /****************************************************************************
@@ -408,7 +434,7 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
 
   /* Break the current time up into the format needed by strftime */
 
-  gmtime_r((FAR const time_t*)&ts.tv_sec, &tm);
+  gmtime_r((FAR const time_t *)&ts.tv_sec, &tm);
 
   /* Convert the current time to TIFF format */
 
@@ -427,7 +453,8 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
  *   Setup to create a new TIFF file.
  *
  * Input Parameters:
- *   info - A pointer to the caller allocated parameter passing/TIFF state instance.
+ *   info - A pointer to the caller allocated parameter passing/TIFF state
+ *          instance.
  *
  * Returned Value:
  *   Zero (OK) on success.  A negated errno value on failure.
@@ -447,7 +474,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
 
   /* Open all output files */
 
-  info->outfd = open(info->outfile, O_RDWR|O_CREAT|O_TRUNC, 0666);
+  info->outfd = open(info->outfile, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (info->outfd < 0)
     {
       gerr("ERROR: Failed to open %s for reading/writing: %d\n",
@@ -455,7 +482,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
       goto errout;
     }
 
-  info->tmp1fd = open(info->tmpfile1, O_RDWR|O_CREAT|O_TRUNC, 0666);
+  info->tmp1fd = open(info->tmpfile1, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (info->tmp1fd < 0)
     {
       gerr("ERROR: Failed to open %s for reading/writing: %d\n",
@@ -463,7 +490,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
       goto errout;
     }
 
-  info->tmp2fd = open(info->tmpfile2, O_RDWR|O_CREAT|O_TRUNC, 0666);
+  info->tmp2fd = open(info->tmpfile2, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (info->tmp2fd < 0)
     {
       gerr("ERROR: Failed to open %s for reading/writing: %d\n",
@@ -505,7 +532,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
       case FB_FMT_RGB24:                            /* BPP=24 R=8, G=8, B=8 */
         info->filefmt  = &g_rgbinfo;                /* RGB file image file info */
         info->imgflags = IMGFLAGS_FMT_RGB24;        /* Bit encoded image characteristics */
-        info->bps      = 3 *info->pps;              /* Bytes per strip */
+        info->bps      = 3 * info->pps;             /* Bytes per strip */
         break;
 
       default:
@@ -526,6 +553,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, TIFF_IFD_OFFSET);
 
   /* Write the Number of directory entries
@@ -538,6 +566,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, 2);
 
   /* Write the NewSubfileType IFD entry
@@ -545,11 +574,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * All formats: Offset 12 NewSubfileType
    */
 
-  ret = tiff_putifdentry16(info, IFD_TAG_NEWSUBFILETYPE, IFD_FIELD_LONG, 1, 0);
+  ret = tiff_putifdentry16(info, IFD_TAG_NEWSUBFILETYPE,
+                           IFD_FIELD_LONG, 1, 0);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write ImageWidth and ImageLength
@@ -558,17 +589,20 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    *                     36 ImageLength Number of rows is a user parameter
    */
 
-  ret = tiff_putifdentry16(info, IFD_TAG_IMAGEWIDTH, IFD_FIELD_SHORT, 1, info->imgwidth);
+  ret = tiff_putifdentry16(info, IFD_TAG_IMAGEWIDTH,
+                           IFD_FIELD_SHORT, 1, info->imgwidth);
   if (ret == OK)
     {
-      ret= tiff_putifdentry16(info, IFD_TAG_IMAGELENGTH, IFD_FIELD_SHORT, 1, info->imgheight);
+      ret = tiff_putifdentry16(info, IFD_TAG_IMAGELENGTH,
+                               IFD_FIELD_SHORT, 1, info->imgheight);
     }
 
   if (ret < 0)
     {
       goto errout;
     }
-  tiff_offset(offset, 2*SIZEOF_IFD_ENTRY);
+
+  tiff_offset(offset, 2 * SIZEOF_IFD_ENTRY);
 
   /* Write BitsPerSample
    *
@@ -589,20 +623,24 @@ int tiff_initialize(FAR struct tiff_info_s *info)
           val16 = 4;
         }
 
-      ret = tiff_putifdentry16(info, IFD_TAG_BITSPERSAMPLE, IFD_FIELD_SHORT, 1, val16);
+      ret = tiff_putifdentry16(info, IFD_TAG_BITSPERSAMPLE,
+                               IFD_FIELD_SHORT, 1, val16);
       if (ret < 0)
         {
           goto errout;
         }
+
       tiff_offset(offset, SIZEOF_IFD_ENTRY);
     }
   else if (IMGFLAGS_ISRGB(info->imgflags))
     {
-      ret = tiff_putifdentry(info, IFD_TAG_BITSPERSAMPLE, IFD_FIELD_SHORT, 3, TIFF_RGB_BPSOFFSET);
+      ret = tiff_putifdentry(info, IFD_TAG_BITSPERSAMPLE,
+                             IFD_FIELD_SHORT, 3, TIFF_RGB_BPSOFFSET);
       if (ret < 0)
         {
           goto errout;
         }
+
       tiff_offset(offset, SIZEOF_IFD_ENTRY);
     }
 
@@ -613,11 +651,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * RGB:             Offset 60 "  " "   " "" "          " " " " "
    */
 
-  ret = tiff_putifdentry16(info, IFD_TAG_COMPRESSION, IFD_FIELD_SHORT, 1, TAG_COMP_NONE);
+  ret = tiff_putifdentry16(info, IFD_TAG_COMPRESSION,
+                           IFD_FIELD_SHORT, 1, TAG_COMP_NONE);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write PhotometricInterpretation:
@@ -641,6 +681,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write StripOffsets:
@@ -656,6 +697,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write SamplesPerPixel
@@ -667,11 +709,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
 
   if (IMGFLAGS_ISRGB(info->imgflags))
     {
-      ret = tiff_putifdentry16(info, IFD_TAG_SAMPLESPERPIXEL, IFD_FIELD_SHORT, 1, 3);
+      ret = tiff_putifdentry16(info, IFD_TAG_SAMPLESPERPIXEL,
+                               IFD_FIELD_SHORT, 1, 3);
       if (ret < 0)
         {
           goto errout;
         }
+
       tiff_offset(offset, SIZEOF_IFD_ENTRY);
     }
 
@@ -682,26 +726,33 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * RGB:             Offset 108 Value is a user parameter
    */
 
-  ret = tiff_putifdentry16(info, IFD_TAG_ROWSPERSTRIP, IFD_FIELD_SHORT, 1, info->rps);
+  ret = tiff_putifdentry16(info, IFD_TAG_ROWSPERSTRIP,
+                           IFD_FIELD_SHORT, 1, info->rps);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write StripByteCounts:
    *
-   * Bi-level Images: Offset  96 Count determined as strips added, Value offset = 216
-   * Greyscale:       Offset 108 Count determined as strips added, Value offset = 228
-   * RGB:             Offset 120 Count determined as strips added, Value offset = 248
+ * Bi-level Images: Offset  96 Count determined as strips added, Value
+ *                  offset = 216
+ * Greyscale:       Offset 108 Count determined as strips added, Value
+ *                  offset = 228
+ * RGB:             Offset 120 Count determined as strips added, Value
+ *                  offset = 248
    */
 
   tiff_checkoffs(offset, info->filefmt->sbcifdoffset);
-  ret = tiff_putifdentry(info, IFD_TAG_STRIPCOUNTS, IFD_FIELD_LONG, 0, info->filefmt->sbcoffset);
+  ret = tiff_putifdentry(info, IFD_TAG_STRIPCOUNTS,
+                         IFD_FIELD_LONG, 0, info->filefmt->sbcoffset);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write XResolution and YResolution:
@@ -711,17 +762,22 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * RGB:             Offset 132 and 144, Values are a user parameters
    */
 
-  ret = tiff_putifdentry(info, IFD_TAG_XRESOLUTION, IFD_FIELD_RATIONAL, 1, info->filefmt->xresoffset);
+  ret = tiff_putifdentry(info, IFD_TAG_XRESOLUTION,
+                         IFD_FIELD_RATIONAL, 1,
+                         info->filefmt->xresoffset);
   if (ret == OK)
     {
-      ret = tiff_putifdentry(info, IFD_TAG_YRESOLUTION, IFD_FIELD_RATIONAL, 1, info->filefmt->yresoffset);
+      ret = tiff_putifdentry(info, IFD_TAG_YRESOLUTION,
+                             IFD_FIELD_RATIONAL, 1,
+                             info->filefmt->yresoffset);
     }
 
   if (ret < 0)
     {
       goto errout;
     }
-  tiff_offset(offset, 2*SIZEOF_IFD_ENTRY);
+
+  tiff_offset(offset, 2 * SIZEOF_IFD_ENTRY);
 
   /* Write ResolutionUnit:
    *
@@ -730,11 +786,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * RGB:             Offset 156, Hard-coded to "inches"
    */
 
-  ret = tiff_putifdentry16(info, IFD_TAG_RESUNIT, IFD_FIELD_SHORT, 1, TAG_RESUNIT_INCH);
+  ret = tiff_putifdentry16(info, IFD_TAG_RESUNIT,
+                           IFD_FIELD_SHORT, 1, TAG_RESUNIT_INCH);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write Software:
@@ -744,11 +802,14 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * RGB:             Offset 168 Count, Hard-coded "NuttX"
    */
 
-  ret = tiff_putifdentry(info, IFD_TAG_SOFTWARE, IFD_FIELD_ASCII, TIFF_SOFTWARE_STRLEN, info->filefmt->swoffset);
+  ret = tiff_putifdentry(info, IFD_TAG_SOFTWARE,
+                         IFD_FIELD_ASCII, TIFF_SOFTWARE_STRLEN,
+                         info->filefmt->swoffset);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write DateTime:
@@ -758,11 +819,14 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    * RGB:             Offset 180 Count, Format "YYYY:MM:DD HH:MM:SS"
    */
 
-  ret = tiff_putifdentry(info, IFD_TAG_DATETIME, IFD_FIELD_ASCII, TIFF_DATETIME_STRLEN, info->filefmt->dateoffset);
+  ret = tiff_putifdentry(info, IFD_TAG_DATETIME,
+                         IFD_FIELD_ASCII, TIFF_DATETIME_STRLEN,
+                         info->filefmt->dateoffset);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, SIZEOF_IFD_ENTRY);
 
   /* Write Next IFD Offset and 2 bytes of padding:
@@ -780,6 +844,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, 4);
 
   /* Now we begin the value section of the file */
@@ -807,6 +872,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, 8);
 
   tiff_checkoffs(offset, info->filefmt->yresoffset);
@@ -820,6 +886,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, 8);
 
   /* Write RGB BitsPerSample Data:
@@ -837,6 +904,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
       tiff_putint16(info->outfd, 8);
       tiff_putint16(info->outfd, 8);
       tiff_putint16(info->outfd, 0);
+
       tiff_offset(offset, 8);
     }
 
@@ -849,11 +917,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
    */
 
   tiff_checkoffs(offset, info->filefmt->swoffset);
-  ret = tiff_putstring(info->outfd, TIFF_SOFTWARE_STRING, TIFF_SOFTWARE_STRLEN);
+  ret = tiff_putstring(info->outfd, TIFF_SOFTWARE_STRING,
+                       TIFF_SOFTWARE_STRLEN);
   if (ret < 0)
     {
       goto errout;
     }
+
   tiff_offset(offset, TIFF_SOFTWARE_STRLEN);
 
   /* Write the DateTime string:
@@ -876,6 +946,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, TIFF_DATETIME_STRLEN);
 
   /* Add two bytes of padding */
@@ -885,6 +956,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
     {
       goto errout;
     }
+
   tiff_offset(offset, 2);
 
   /* And that should do it! */
diff --git a/graphics/tiff/tiff_utils.c b/graphics/tiff/tiff_utils.c
index 17e72689b..12aa4bb8e 100644
--- a/graphics/tiff/tiff_utils.c
+++ b/graphics/tiff/tiff_utils.c
@@ -93,10 +93,10 @@ void tiff_put32(FAR uint8_t *dest, uint32_t value)
 {
 #ifdef CONFIG_ENDIAN_BIG
   tiff_put16(dest,   (uint16_t)(value >> 16));
-  tiff_put16(dest+2, (uint16_t)(value & 0xffff));
+  tiff_put16(dest + 2, (uint16_t)(value & 0xffff));
 #else
   tiff_put16(dest,   (uint16_t)(value & 0xffff));
-  tiff_put16(dest+2, (uint16_t)(value >> 16));
+  tiff_put16(dest + 2, (uint16_t)(value >> 16));
 #endif
 }
 
@@ -112,11 +112,10 @@ uint16_t tiff_get16(FAR uint8_t *src)
 uint32_t tiff_get32(FAR uint8_t *src)
 {
 #ifdef CONFIG_ENDIAN_BIG
-  return (uint32_t)tiff_get16(src) << 16 | (uint32_t)tiff_get16(src+2);
+  return (uint32_t)tiff_get16(src) << 16 | (uint32_t)tiff_get16(src + 2);
 #else
-  return (uint32_t)tiff_get16(src+2) << 16 | (uint32_t)tiff_get16(src);
+  return (uint32_t)tiff_get16(src + 2) << 16 | (uint32_t)tiff_get16(src);
 #endif
-
 }
 
 /****************************************************************************
@@ -153,7 +152,7 @@ ssize_t tiff_read(int fd, FAR void *buffer, size_t count)
        * (ntotal).
        */
 
-      nbytes = read(fd, buffer, count-ntotal);
+      nbytes = read(fd, buffer, count - ntotal);
 
       /* Check for an error */
 
@@ -166,22 +165,26 @@ ssize_t tiff_read(int fd, FAR void *buffer, size_t count)
           errval = errno;
           if (errval != EINTR)
             {
-              /* Other errors are bad news and we will break out with an error */
+              /* Other errors are bad news and we will break out with an
+               * error.
+               */
 
               return -errval;
             }
         }
 
-      /* Zero is a special case and means that the end of file was encountered. */
+      /* Zero is a special case and means that the end of file was
+       * encountered.
+       */
 
       else if (nbytes == 0)
         {
           break;
         }
 
-      /* What if read returns some number of bytes other than the requested number?
-       * This probably means that the end-of-file will be encountered the next time
-       * that we call read().
+      /* What if read returns some number of bytes other than the requested
+       * number?  This probably means that the end-of-file will be
+       * encountered the next time that we call read().
        */
 
       else
@@ -236,13 +239,17 @@ int tiff_write(int fd, FAR const void *buffer, size_t count)
           errval = errno;
           if (errval != EINTR)
             {
-              /* Other errors are bad news and we will break out with an error */
+              /* Other errors are bad news and we will break out with an
+               * error.
+               */
 
               return -errval;
             }
         }
 
-      /* What if write returns some number of bytes other than the requested number? */
+      /* What if write returns some number of bytes other than the requested
+       * number?
+       */
 
       else
         {
@@ -326,7 +333,7 @@ int tiff_putstring(int fd, FAR const char *string, int len)
 #ifdef CONFIG_DEBUG_GRAPHICS
   int actual = strlen(string);
 
-  DEBUGASSERT(len = actual+1);
+  DEBUGASSERT(len == actual + 1);
 #endif
   return tiff_write(fd, string, len);
 }
@@ -362,7 +369,9 @@ ssize_t tiff_wordalign(int fd, size_t size)
         {
           return (ssize_t)ret;
         }
+
       size += nbytes;
     }
+
   return size;
 }
diff --git a/system/nxcamera/nxcamera.c b/system/nxcamera/nxcamera.c
index d698b9e20..b8f5d41aa 100644
--- a/system/nxcamera/nxcamera.c
+++ b/system/nxcamera/nxcamera.c
@@ -52,6 +52,10 @@
 
 #ifdef CONFIG_LIBYUV
 #  include <libyuv.h>
+
+#  define CONVERT_TO_ARGB    ConvertToARGB
+#  define CONVERT_FROM_I420  ConvertFromI420
+#  define CONVERT_TO_I420    ConvertToI420
 #endif
 
 /****************************************************************************
@@ -91,38 +95,38 @@ static int show_image(FAR struct nxcamera_s *pcam, FAR v4l2_buffer_t *buf)
 #ifdef CONFIG_LIBYUV
   if (pcam->display_vinfo.fmt == FB_FMT_RGB32)
     {
-      return ConvertToARGB(pcam->bufs[buf->index],
-                           pcam->buf_sizes[buf->index],
-                           pcam->display_pinfo.fbmem,
-                           pcam->display_pinfo.stride,
-                           0,
-                           0,
-                           pcam->fmt.fmt.pix.width,
-                           pcam->fmt.fmt.pix.height,
-                           pcam->fmt.fmt.pix.width,
-                           pcam->fmt.fmt.pix.height,
-                           0,
-                           pcam->fmt.fmt.pix.pixelformat);
+      return CONVERT_TO_ARGB(pcam->bufs[buf->index],
+                             pcam->buf_sizes[buf->index],
+                             pcam->display_pinfo.fbmem,
+                             pcam->display_pinfo.stride,
+                             0,
+                             0,
+                             pcam->fmt.fmt.pix.width,
+                             pcam->fmt.fmt.pix.height,
+                             pcam->fmt.fmt.pix.width,
+                             pcam->fmt.fmt.pix.height,
+                             0,
+                             pcam->fmt.fmt.pix.pixelformat);
     }
   else if (pcam->display_vinfo.fmt == FB_FMT_RGB16_565)
     {
       if (pcam->fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_YUV420)
         {
-          return ConvertFromI420(pcam->bufs[buf->index],
-                                 pcam->fmt.fmt.pix.width,
-                                 &pcam->bufs[buf->index][
-                                            pcam->fmt.fmt.pix.width *
-                                            pcam->fmt.fmt.pix.height],
-                                 pcam->fmt.fmt.pix.width / 2,
-                                 &pcam->bufs[buf->index][
-                                      pcam->fmt.fmt.pix.width *
-                                      pcam->fmt.fmt.pix.height * 5 / 4],
-                                 pcam->fmt.fmt.pix.width / 2,
-                                 pcam->display_pinfo.fbmem,
-                                 pcam->display_pinfo.stride,
-                                 pcam->fmt.fmt.pix.width,
-                                 pcam->fmt.fmt.pix.height,
-                                 V4L2_PIX_FMT_RGB565);
+          return CONVERT_FROM_I420(pcam->bufs[buf->index],
+                                   pcam->fmt.fmt.pix.width,
+                                   &pcam->bufs[buf->index][
+                                              pcam->fmt.fmt.pix.width *
+                                              pcam->fmt.fmt.pix.height],
+                                   pcam->fmt.fmt.pix.width / 2,
+                                   &pcam->bufs[buf->index][
+                                        pcam->fmt.fmt.pix.width *
+                                        pcam->fmt.fmt.pix.height * 5 / 4],
+                                   pcam->fmt.fmt.pix.width / 2,
+                                   pcam->display_pinfo.fbmem,
+                                   pcam->display_pinfo.stride,
+                                   pcam->fmt.fmt.pix.width,
+                                   pcam->fmt.fmt.pix.height,
+                                   V4L2_PIX_FMT_RGB565);
         }
       else
         {
@@ -134,42 +138,42 @@ static int show_image(FAR struct nxcamera_s *pcam, FAR v4l2_buffer_t *buf)
               return -ENOMEM;
             }
 
-          ret = ConvertToI420(pcam->bufs[buf->index],
-                              pcam->buf_sizes[buf->index],
-                              dst,
-                              pcam->fmt.fmt.pix.width,
-                              &dst[pcam->fmt.fmt.pix.width *
-                                        pcam->fmt.fmt.pix.height],
-                              pcam->fmt.fmt.pix.width / 2,
-                              &dst[pcam->fmt.fmt.pix.width *
-                                        pcam->fmt.fmt.pix.height * 5 / 4],
-                              pcam->fmt.fmt.pix.width / 2,
-                              0,
-                              0,
-                              pcam->fmt.fmt.pix.width,
-                              pcam->fmt.fmt.pix.height,
-                              pcam->fmt.fmt.pix.width,
-                              pcam->fmt.fmt.pix.height,
-                              0,
-                              pcam->fmt.fmt.pix.pixelformat);
+          ret = CONVERT_TO_I420(pcam->bufs[buf->index],
+                                pcam->buf_sizes[buf->index],
+                                dst,
+                                pcam->fmt.fmt.pix.width,
+                                &dst[pcam->fmt.fmt.pix.width *
+                                          pcam->fmt.fmt.pix.height],
+                                pcam->fmt.fmt.pix.width / 2,
+                                &dst[pcam->fmt.fmt.pix.width *
+                                          pcam->fmt.fmt.pix.height * 5 / 4],
+                                pcam->fmt.fmt.pix.width / 2,
+                                0,
+                                0,
+                                pcam->fmt.fmt.pix.width,
+                                pcam->fmt.fmt.pix.height,
+                                pcam->fmt.fmt.pix.width,
+                                pcam->fmt.fmt.pix.height,
+                                0,
+                                pcam->fmt.fmt.pix.pixelformat);
           if (ret < 0)
             {
               goto err;
             }
 
-          ret = ConvertFromI420(dst,
-                                pcam->fmt.fmt.pix.width,
-                                &dst[pcam->fmt.fmt.pix.width *
-                                            pcam->fmt.fmt.pix.height],
-                                pcam->fmt.fmt.pix.width / 2,
-                                &dst[pcam->fmt.fmt.pix.width *
-                                     pcam->fmt.fmt.pix.height * 5 / 4],
-                                pcam->fmt.fmt.pix.width / 2,
-                                pcam->display_pinfo.fbmem,
-                                pcam->display_pinfo.stride,
-                                pcam->fmt.fmt.pix.width,
-                                pcam->fmt.fmt.pix.height,
-                                V4L2_PIX_FMT_RGB565);
+          ret = CONVERT_FROM_I420(dst,
+                                  pcam->fmt.fmt.pix.width,
+                                  &dst[pcam->fmt.fmt.pix.width *
+                                              pcam->fmt.fmt.pix.height],
+                                  pcam->fmt.fmt.pix.width / 2,
+                                  &dst[pcam->fmt.fmt.pix.width *
+                                       pcam->fmt.fmt.pix.height * 5 / 4],
+                                  pcam->fmt.fmt.pix.width / 2,
+                                  pcam->display_pinfo.fbmem,
+                                  pcam->display_pinfo.stride,
+                                  pcam->fmt.fmt.pix.width,
+                                  pcam->fmt.fmt.pix.height,
+                                  V4L2_PIX_FMT_RGB565);
           if (ret < 0)
             {
               goto err;

From 7dc8cec1ac0f151e13ce37e57256bff377de9cb7 Mon Sep 17 00:00:00 2001
From: Michal Lenc <michallenc@seznam.cz>
Date: Sun, 12 Apr 2026 14:33:32 +0200
Subject: [PATCH 289/568] examples/hello_nim/Kconfig: name consistent with
 other Hello World apps

Use "Hello, language" scheme to keep the naming consistency with other
Hello World applications for different languages.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
---
 examples/hello_nim/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/hello_nim/Kconfig b/examples/hello_nim/Kconfig
index a34c8fcdb..e955ef88f 100644
--- a/examples/hello_nim/Kconfig
+++ b/examples/hello_nim/Kconfig
@@ -4,10 +4,10 @@
 #
 
 config EXAMPLES_HELLO_NIM
-	tristate "\"Hello, World!\" example (Nim)"
+	tristate "\"Hello, Nim!\" example"
 	default n
 	---help---
-		Enable the \"Hello, World!\" example
+		Enable the \"Hello, Nim!\" example in Nim language
 
 if EXAMPLES_HELLO_NIM
 

From a6c11a1db70472eb74e723f0041012759971a8ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 22:47:22 +0000
Subject: [PATCH 290/568] build(deps): bump actions/github-script from 8.0.0 to
 9.0.0

Bumps [actions/github-script](https://github.com/actions/github-script) from 8.0.0 to 9.0.0.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v8...v9)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/issue_labeler.yml | 2 +-
 .github/workflows/labeler.yml       | 2 +-
 .github/workflows/pr_labeler.yml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/issue_labeler.yml b/.github/workflows/issue_labeler.yml
index 2363ece67..2965bf5a6 100644
--- a/.github/workflows/issue_labeler.yml
+++ b/.github/workflows/issue_labeler.yml
@@ -23,7 +23,7 @@ jobs:
       issues: write
     steps:
       - name: Add labels issues automatically based on their body.
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9.0.0
         with:
           script: |
             const body = context.payload.issue.body;
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index cd98874b8..cafc52676 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -45,7 +45,7 @@ jobs:
 
       # Fetch the updated PR filenames. Compute the Size Label and Arch Labels.
       - name: Compute PR labels
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3  # v9.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml
index f8af53e05..26ed16441 100644
--- a/.github/workflows/pr_labeler.yml
+++ b/.github/workflows/pr_labeler.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
       # Download the PR Artifact, containing PR Number and PR Labels
       - name: Download PR artifact
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3  # v9.0.0
         with:
           script: |
             const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -64,7 +64,7 @@ jobs:
 
       # Write the PR Labels into the PR
       - name: Write PR labels
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3  # v9.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

From f22a8d0d4fd44c351b04ade9a7a7f1b14304f028 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 22:47:19 +0000
Subject: [PATCH 291/568] build(deps): bump actions/upload-artifact from 7.0.0
 to 7.0.1

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v7...v7.0.1)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml   | 12 ++++++------
 .github/workflows/labeler.yml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4f33fda9..740d6f81d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
         run: tar zcf sources.tar.gz sources
 
       - name: Archive Source Bundle
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: source-bundle
           path: sources.tar.gz
@@ -207,7 +207,7 @@ jobs:
         if: always()
         run: df -h
 
-      - uses: actions/upload-artifact@v7.0.0
+      - uses: actions/upload-artifact@v7.0.1
         if: ${{ always() }}
         with:
           name: linux-${{matrix.boards}}-builds
@@ -252,7 +252,7 @@ jobs:
             cd sources/nuttx
             ./tools/ci/cibuild-oot.sh
 
-      - uses: actions/upload-artifact@v7.0.0
+      - uses: actions/upload-artifact@v7.0.1
         if: ${{ always() }}
         with:
           name: oot-build-artifacts
@@ -313,7 +313,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v7.0.0
+      - uses: actions/upload-artifact@v7.0.1
         with:
           name: macos-${{matrix.boards}}-builds
           path: buildartifacts/
@@ -396,7 +396,7 @@ jobs:
           cd sources/nuttx/tools/ci
           ./cibuild.sh -g -i -A -C -N -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v7.0.0
+      - uses: actions/upload-artifact@v7.0.1
         with:
           name: msys2-${{matrix.boards}}-builds
           path: buildartifacts/
@@ -448,7 +448,7 @@ jobs:
           cd sources\nuttx\tools\ci
           .\cibuild.ps1 -n -i -A -C -N testlist\windows.dat
 
-      - uses: actions/upload-artifact@v7.0.0
+      - uses: actions/upload-artifact@v7.0.1
         with:
           name: msvc-builds
           path: ./sources/buildartifacts/
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index cafc52676..224911be2 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -144,7 +144,7 @@ jobs:
 
       # Upload the PR Artifact as pr.zip
       - name: Upload PR artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f  # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         with:
           name: pr
           path: pr/

From 722f3193ceb43b11fe7f2d2172402867c48b4f3e Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 13 Apr 2026 12:07:12 +0200
Subject: [PATCH 292/568] modbus: move freemodbus to a separate directory

move freemodbus to modbus/freemodbus so it is possible to add other
modbus implementations

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 modbus/.gitignore                             |   1 +
 modbus/CMakeLists.txt                         |  80 +-------------
 modbus/Make.defs                              |   4 +-
 modbus/Makefile                               |  24 +----
 modbus/freemodbus/CMakeLists.txt              | 101 ++++++++++++++++++
 modbus/{ => freemodbus}/Kconfig               |   0
 modbus/freemodbus/Make.defs                   |  25 +++++
 modbus/freemodbus/Makefile                    |  45 ++++++++
 modbus/{ => freemodbus}/ascii/Make.defs       |   4 +-
 modbus/{ => freemodbus}/ascii/mbascii.c       |   0
 modbus/{ => freemodbus}/ascii/mbascii.h       |   0
 modbus/{ => freemodbus}/functions/Make.defs   |   4 +-
 .../{ => freemodbus}/functions/mbfunccoils.c  |   0
 .../functions/mbfunccoils_m.c                 |   0
 .../{ => freemodbus}/functions/mbfuncdiag.c   |   0
 .../{ => freemodbus}/functions/mbfuncdisc.c   |   0
 .../{ => freemodbus}/functions/mbfuncdisc_m.c |   0
 .../functions/mbfuncholding.c                 |   0
 .../functions/mbfuncholding_m.c               |   0
 .../{ => freemodbus}/functions/mbfuncinput.c  |   0
 .../functions/mbfuncinput_m.c                 |   0
 .../{ => freemodbus}/functions/mbfuncother.c  |   0
 modbus/{ => freemodbus}/functions/mbutils.c   |   0
 modbus/{ => freemodbus}/mb.c                  |   0
 modbus/{ => freemodbus}/mb_m.c                |   0
 modbus/{ => freemodbus}/nuttx/Make.defs       |   4 +-
 modbus/{ => freemodbus}/nuttx/port.h          |   0
 modbus/{ => freemodbus}/nuttx/portevent.c     |   0
 modbus/{ => freemodbus}/nuttx/portevent_m.c   |   0
 modbus/{ => freemodbus}/nuttx/portother.c     |   0
 modbus/{ => freemodbus}/nuttx/portother_m.c   |   0
 modbus/{ => freemodbus}/nuttx/portserial.c    |   0
 modbus/{ => freemodbus}/nuttx/portserial_m.c  |   0
 modbus/{ => freemodbus}/nuttx/porttimer.c     |   0
 modbus/{ => freemodbus}/nuttx/porttimer_m.c   |   0
 modbus/{ => freemodbus}/rtu/Make.defs         |   4 +-
 modbus/{ => freemodbus}/rtu/mbcrc.c           |   0
 modbus/{ => freemodbus}/rtu/mbcrc.h           |   0
 modbus/{ => freemodbus}/rtu/mbrtu.c           |   0
 modbus/{ => freemodbus}/rtu/mbrtu.h           |   0
 modbus/{ => freemodbus}/rtu/mbrtu_m.c         |   0
 modbus/{ => freemodbus}/rtu/mbrtu_m.h         |   0
 modbus/{ => freemodbus}/tcp/Make.defs         |   4 +-
 modbus/{ => freemodbus}/tcp/mbtcp.c           |   0
 modbus/{ => freemodbus}/tcp/mbtcp.h           |   0
 45 files changed, 187 insertions(+), 113 deletions(-)
 create mode 100644 modbus/.gitignore
 create mode 100644 modbus/freemodbus/CMakeLists.txt
 rename modbus/{ => freemodbus}/Kconfig (100%)
 create mode 100644 modbus/freemodbus/Make.defs
 create mode 100644 modbus/freemodbus/Makefile
 rename modbus/{ => freemodbus}/ascii/Make.defs (91%)
 rename modbus/{ => freemodbus}/ascii/mbascii.c (100%)
 rename modbus/{ => freemodbus}/ascii/mbascii.h (100%)
 rename modbus/{ => freemodbus}/functions/Make.defs (92%)
 rename modbus/{ => freemodbus}/functions/mbfunccoils.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfunccoils_m.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncdiag.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncdisc.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncdisc_m.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncholding.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncholding_m.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncinput.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncinput_m.c (100%)
 rename modbus/{ => freemodbus}/functions/mbfuncother.c (100%)
 rename modbus/{ => freemodbus}/functions/mbutils.c (100%)
 rename modbus/{ => freemodbus}/mb.c (100%)
 rename modbus/{ => freemodbus}/mb_m.c (100%)
 rename modbus/{ => freemodbus}/nuttx/Make.defs (92%)
 rename modbus/{ => freemodbus}/nuttx/port.h (100%)
 rename modbus/{ => freemodbus}/nuttx/portevent.c (100%)
 rename modbus/{ => freemodbus}/nuttx/portevent_m.c (100%)
 rename modbus/{ => freemodbus}/nuttx/portother.c (100%)
 rename modbus/{ => freemodbus}/nuttx/portother_m.c (100%)
 rename modbus/{ => freemodbus}/nuttx/portserial.c (100%)
 rename modbus/{ => freemodbus}/nuttx/portserial_m.c (100%)
 rename modbus/{ => freemodbus}/nuttx/porttimer.c (100%)
 rename modbus/{ => freemodbus}/nuttx/porttimer_m.c (100%)
 rename modbus/{ => freemodbus}/rtu/Make.defs (93%)
 rename modbus/{ => freemodbus}/rtu/mbcrc.c (100%)
 rename modbus/{ => freemodbus}/rtu/mbcrc.h (100%)
 rename modbus/{ => freemodbus}/rtu/mbrtu.c (100%)
 rename modbus/{ => freemodbus}/rtu/mbrtu.h (100%)
 rename modbus/{ => freemodbus}/rtu/mbrtu_m.c (100%)
 rename modbus/{ => freemodbus}/rtu/mbrtu_m.h (100%)
 rename modbus/{ => freemodbus}/tcp/Make.defs (91%)
 rename modbus/{ => freemodbus}/tcp/mbtcp.c (100%)
 rename modbus/{ => freemodbus}/tcp/mbtcp.h (100%)

diff --git a/modbus/.gitignore b/modbus/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/modbus/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/modbus/CMakeLists.txt b/modbus/CMakeLists.txt
index edba762df..781050084 100644
--- a/modbus/CMakeLists.txt
+++ b/modbus/CMakeLists.txt
@@ -20,82 +20,6 @@
 #
 # ##############################################################################
 
-if(CONFIG_MODBUS)
+nuttx_add_subdirectory()
 
-  set(CSRCS)
-
-  if(CONFIG_MODBUS_SLAVE)
-    list(APPEND CSRCS mb.c)
-  endif()
-
-  if(CONFIG_MB_RTU_MASTER)
-    list(APPEND CSRCS mb_m.c)
-  endif()
-
-  # ascii/Make.defs
-
-  if(CONFIG_MB_ASCII_ENABLED)
-    list(APPEND CSRCS ascii/mbascii.c)
-  endif()
-
-  # functions/Make.defs
-
-  list(
-    APPEND
-    CSRCS
-    functions/mbfunccoils.c
-    functions/mbfuncdiag.c
-    functions/mbfuncdisc.c
-    functions/mbfuncholding.c
-    functions/mbfuncinput.c
-    functions/mbfuncother.c
-    functions/mbutils.c)
-
-  if(CONFIG_MB_ASCII_MASTER)
-    list(APPEND CSRCS functions/mbfunccoils_m.c functions/mbfuncdisc_m.c
-         functions/mbfuncholding_m.c functions/mbfuncinput_m.c)
-  elseif(CONFIG_MB_RTU_MASTER)
-    list(APPEND CSRCS functions/mbfunccoils_m.c functions/mbfuncdisc_m.c
-         functions/mbfuncholding_m.c functions/mbfuncinput_m.c)
-  endif()
-
-  # nuttx/Make.defs
-
-  list(APPEND CSRCS nuttx/portother.c)
-
-  if(CONFIG_MODBUS_SLAVE)
-    list(APPEND CSRCS nuttx/portevent.c nuttx/portserial.c nuttx/porttimer.c)
-  endif()
-
-  if(CONFIG_MB_RTU_MASTER)
-    list(APPEND CSRCS nuttx/portother_m.c nuttx/portserial_m.c
-         nuttx/porttimer_m.c nuttx/portevent_m.c)
-  endif()
-
-  # rtu/Make.defs
-
-  if(CONFIG_MB_RTU_ENABLED OR CONFIG_MB_RTU_MASTER)
-    list(APPEND CSRCS rtu/mbcrc.c)
-    if(CONFIG_MB_RTU_ENABLED)
-      list(APPEND CSRCS rtu/mbrtu.c)
-    endif()
-
-    if(CONFIG_MB_RTU_MASTER)
-      list(APPEND CSRCS rtu/mbrtu_m.c)
-    endif()
-  endif()
-
-  # tcp/Make.defs
-
-  if(CONFIG_MB_TCP_ENABLED)
-    list(APPEND CSRCS tcp/mbtcp.c)
-  endif()
-
-  # include private headers
-
-  target_include_directories(apps PRIVATE nuttx)
-  target_include_directories(apps PRIVATE rtu)
-
-  target_sources(apps PRIVATE ${CSRCS})
-
-endif()
+nuttx_generate_kconfig(MENUDESC "Modbus")
diff --git a/modbus/Make.defs b/modbus/Make.defs
index 10fd914c3..03e07693a 100644
--- a/modbus/Make.defs
+++ b/modbus/Make.defs
@@ -20,6 +20,4 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_MODBUS),)
-CONFIGURED_APPS += $(APPDIR)/modbus
-endif
+include $(wildcard $(APPDIR)/modbus/*/Make.defs)
diff --git a/modbus/Makefile b/modbus/Makefile
index ce7eac1d5..5858b4b4a 100644
--- a/modbus/Makefile
+++ b/modbus/Makefile
@@ -20,26 +20,6 @@
 #
 ############################################################################
 
-include $(APPDIR)/Make.defs
+MENUDESC = "Modbus"
 
-# FreeModBus Library
-
-ifeq ($(CONFIG_MODBUS),y)
-
-  ifeq ($(CONFIG_MODBUS_SLAVE),y)
-    CSRCS += mb.c
-  endif
-
-  ifeq ($(CONFIG_MB_RTU_MASTER),y)
-    CSRCS += mb_m.c
-  endif
-
-  include ascii/Make.defs
-  include functions/Make.defs
-  include nuttx/Make.defs
-  include rtu/Make.defs
-  include tcp/Make.defs
-
-endif
-
-include $(APPDIR)/Application.mk
+include $(APPDIR)/Directory.mk
diff --git a/modbus/freemodbus/CMakeLists.txt b/modbus/freemodbus/CMakeLists.txt
new file mode 100644
index 000000000..a9980f597
--- /dev/null
+++ b/modbus/freemodbus/CMakeLists.txt
@@ -0,0 +1,101 @@
+# ##############################################################################
+# apps/modbus/freemodbus/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_MODBUS)
+
+  set(CSRCS)
+
+  if(CONFIG_MODBUS_SLAVE)
+    list(APPEND CSRCS mb.c)
+  endif()
+
+  if(CONFIG_MB_RTU_MASTER)
+    list(APPEND CSRCS mb_m.c)
+  endif()
+
+  # ascii/Make.defs
+
+  if(CONFIG_MB_ASCII_ENABLED)
+    list(APPEND CSRCS ascii/mbascii.c)
+  endif()
+
+  # functions/Make.defs
+
+  list(
+    APPEND
+    CSRCS
+    functions/mbfunccoils.c
+    functions/mbfuncdiag.c
+    functions/mbfuncdisc.c
+    functions/mbfuncholding.c
+    functions/mbfuncinput.c
+    functions/mbfuncother.c
+    functions/mbutils.c)
+
+  if(CONFIG_MB_ASCII_MASTER)
+    list(APPEND CSRCS functions/mbfunccoils_m.c functions/mbfuncdisc_m.c
+         functions/mbfuncholding_m.c functions/mbfuncinput_m.c)
+  elseif(CONFIG_MB_RTU_MASTER)
+    list(APPEND CSRCS functions/mbfunccoils_m.c functions/mbfuncdisc_m.c
+         functions/mbfuncholding_m.c functions/mbfuncinput_m.c)
+  endif()
+
+  # nuttx/Make.defs
+
+  list(APPEND CSRCS nuttx/portother.c)
+
+  if(CONFIG_MODBUS_SLAVE)
+    list(APPEND CSRCS nuttx/portevent.c nuttx/portserial.c nuttx/porttimer.c)
+  endif()
+
+  if(CONFIG_MB_RTU_MASTER)
+    list(APPEND CSRCS nuttx/portother_m.c nuttx/portserial_m.c
+         nuttx/porttimer_m.c nuttx/portevent_m.c)
+  endif()
+
+  # rtu/Make.defs
+
+  if(CONFIG_MB_RTU_ENABLED OR CONFIG_MB_RTU_MASTER)
+    list(APPEND CSRCS rtu/mbcrc.c)
+    if(CONFIG_MB_RTU_ENABLED)
+      list(APPEND CSRCS rtu/mbrtu.c)
+    endif()
+
+    if(CONFIG_MB_RTU_MASTER)
+      list(APPEND CSRCS rtu/mbrtu_m.c)
+    endif()
+  endif()
+
+  # tcp/Make.defs
+
+  if(CONFIG_MB_TCP_ENABLED)
+    list(APPEND CSRCS tcp/mbtcp.c)
+  endif()
+
+  # include private headers
+
+  target_include_directories(apps PRIVATE nuttx)
+  target_include_directories(apps PRIVATE rtu)
+
+  target_sources(apps PRIVATE ${CSRCS})
+
+endif()
diff --git a/modbus/Kconfig b/modbus/freemodbus/Kconfig
similarity index 100%
rename from modbus/Kconfig
rename to modbus/freemodbus/Kconfig
diff --git a/modbus/freemodbus/Make.defs b/modbus/freemodbus/Make.defs
new file mode 100644
index 000000000..6eac9db77
--- /dev/null
+++ b/modbus/freemodbus/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/modbus/freemodbus/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_MODBUS),)
+CONFIGURED_APPS += $(APPDIR)/modbus/freemodbus
+endif
diff --git a/modbus/freemodbus/Makefile b/modbus/freemodbus/Makefile
new file mode 100644
index 000000000..6d45f7650
--- /dev/null
+++ b/modbus/freemodbus/Makefile
@@ -0,0 +1,45 @@
+############################################################################
+# apps/modbus/freemodbus/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# FreeModBus Library
+
+ifeq ($(CONFIG_MODBUS),y)
+
+  ifeq ($(CONFIG_MODBUS_SLAVE),y)
+    CSRCS += mb.c
+  endif
+
+  ifeq ($(CONFIG_MB_RTU_MASTER),y)
+    CSRCS += mb_m.c
+  endif
+
+  include ascii/Make.defs
+  include functions/Make.defs
+  include nuttx/Make.defs
+  include rtu/Make.defs
+  include tcp/Make.defs
+
+endif
+
+include $(APPDIR)/Application.mk
diff --git a/modbus/ascii/Make.defs b/modbus/freemodbus/ascii/Make.defs
similarity index 91%
rename from modbus/ascii/Make.defs
rename to modbus/freemodbus/ascii/Make.defs
index 972cd903f..2f2745828 100644
--- a/modbus/ascii/Make.defs
+++ b/modbus/freemodbus/ascii/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/ascii/Make.defs
+# apps/modbus/freemodbus/ascii/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -26,6 +26,6 @@ CSRCS += mbascii.c
 
 DEPPATH += --dep-path ascii
 VPATH += :ascii
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/ascii
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/ascii
 
 endif
diff --git a/modbus/ascii/mbascii.c b/modbus/freemodbus/ascii/mbascii.c
similarity index 100%
rename from modbus/ascii/mbascii.c
rename to modbus/freemodbus/ascii/mbascii.c
diff --git a/modbus/ascii/mbascii.h b/modbus/freemodbus/ascii/mbascii.h
similarity index 100%
rename from modbus/ascii/mbascii.h
rename to modbus/freemodbus/ascii/mbascii.h
diff --git a/modbus/functions/Make.defs b/modbus/freemodbus/functions/Make.defs
similarity index 92%
rename from modbus/functions/Make.defs
rename to modbus/freemodbus/functions/Make.defs
index a4e6ea90c..c59393a2a 100644
--- a/modbus/functions/Make.defs
+++ b/modbus/freemodbus/functions/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/functions/Make.defs
+# apps/modbus/freemodbus/functions/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -33,4 +33,4 @@ endif
 
 DEPPATH += --dep-path functions
 VPATH += :functions
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/functions
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/functions
diff --git a/modbus/functions/mbfunccoils.c b/modbus/freemodbus/functions/mbfunccoils.c
similarity index 100%
rename from modbus/functions/mbfunccoils.c
rename to modbus/freemodbus/functions/mbfunccoils.c
diff --git a/modbus/functions/mbfunccoils_m.c b/modbus/freemodbus/functions/mbfunccoils_m.c
similarity index 100%
rename from modbus/functions/mbfunccoils_m.c
rename to modbus/freemodbus/functions/mbfunccoils_m.c
diff --git a/modbus/functions/mbfuncdiag.c b/modbus/freemodbus/functions/mbfuncdiag.c
similarity index 100%
rename from modbus/functions/mbfuncdiag.c
rename to modbus/freemodbus/functions/mbfuncdiag.c
diff --git a/modbus/functions/mbfuncdisc.c b/modbus/freemodbus/functions/mbfuncdisc.c
similarity index 100%
rename from modbus/functions/mbfuncdisc.c
rename to modbus/freemodbus/functions/mbfuncdisc.c
diff --git a/modbus/functions/mbfuncdisc_m.c b/modbus/freemodbus/functions/mbfuncdisc_m.c
similarity index 100%
rename from modbus/functions/mbfuncdisc_m.c
rename to modbus/freemodbus/functions/mbfuncdisc_m.c
diff --git a/modbus/functions/mbfuncholding.c b/modbus/freemodbus/functions/mbfuncholding.c
similarity index 100%
rename from modbus/functions/mbfuncholding.c
rename to modbus/freemodbus/functions/mbfuncholding.c
diff --git a/modbus/functions/mbfuncholding_m.c b/modbus/freemodbus/functions/mbfuncholding_m.c
similarity index 100%
rename from modbus/functions/mbfuncholding_m.c
rename to modbus/freemodbus/functions/mbfuncholding_m.c
diff --git a/modbus/functions/mbfuncinput.c b/modbus/freemodbus/functions/mbfuncinput.c
similarity index 100%
rename from modbus/functions/mbfuncinput.c
rename to modbus/freemodbus/functions/mbfuncinput.c
diff --git a/modbus/functions/mbfuncinput_m.c b/modbus/freemodbus/functions/mbfuncinput_m.c
similarity index 100%
rename from modbus/functions/mbfuncinput_m.c
rename to modbus/freemodbus/functions/mbfuncinput_m.c
diff --git a/modbus/functions/mbfuncother.c b/modbus/freemodbus/functions/mbfuncother.c
similarity index 100%
rename from modbus/functions/mbfuncother.c
rename to modbus/freemodbus/functions/mbfuncother.c
diff --git a/modbus/functions/mbutils.c b/modbus/freemodbus/functions/mbutils.c
similarity index 100%
rename from modbus/functions/mbutils.c
rename to modbus/freemodbus/functions/mbutils.c
diff --git a/modbus/mb.c b/modbus/freemodbus/mb.c
similarity index 100%
rename from modbus/mb.c
rename to modbus/freemodbus/mb.c
diff --git a/modbus/mb_m.c b/modbus/freemodbus/mb_m.c
similarity index 100%
rename from modbus/mb_m.c
rename to modbus/freemodbus/mb_m.c
diff --git a/modbus/nuttx/Make.defs b/modbus/freemodbus/nuttx/Make.defs
similarity index 92%
rename from modbus/nuttx/Make.defs
rename to modbus/freemodbus/nuttx/Make.defs
index 7960ecee4..723284cc4 100644
--- a/modbus/nuttx/Make.defs
+++ b/modbus/freemodbus/nuttx/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/nuttx/Make.defs
+# apps/modbus/freemodbus/nuttx/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -32,4 +32,4 @@ endif
 
 DEPPATH += --dep-path nuttx
 VPATH += :nuttx
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/nuttx
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/nuttx
diff --git a/modbus/nuttx/port.h b/modbus/freemodbus/nuttx/port.h
similarity index 100%
rename from modbus/nuttx/port.h
rename to modbus/freemodbus/nuttx/port.h
diff --git a/modbus/nuttx/portevent.c b/modbus/freemodbus/nuttx/portevent.c
similarity index 100%
rename from modbus/nuttx/portevent.c
rename to modbus/freemodbus/nuttx/portevent.c
diff --git a/modbus/nuttx/portevent_m.c b/modbus/freemodbus/nuttx/portevent_m.c
similarity index 100%
rename from modbus/nuttx/portevent_m.c
rename to modbus/freemodbus/nuttx/portevent_m.c
diff --git a/modbus/nuttx/portother.c b/modbus/freemodbus/nuttx/portother.c
similarity index 100%
rename from modbus/nuttx/portother.c
rename to modbus/freemodbus/nuttx/portother.c
diff --git a/modbus/nuttx/portother_m.c b/modbus/freemodbus/nuttx/portother_m.c
similarity index 100%
rename from modbus/nuttx/portother_m.c
rename to modbus/freemodbus/nuttx/portother_m.c
diff --git a/modbus/nuttx/portserial.c b/modbus/freemodbus/nuttx/portserial.c
similarity index 100%
rename from modbus/nuttx/portserial.c
rename to modbus/freemodbus/nuttx/portserial.c
diff --git a/modbus/nuttx/portserial_m.c b/modbus/freemodbus/nuttx/portserial_m.c
similarity index 100%
rename from modbus/nuttx/portserial_m.c
rename to modbus/freemodbus/nuttx/portserial_m.c
diff --git a/modbus/nuttx/porttimer.c b/modbus/freemodbus/nuttx/porttimer.c
similarity index 100%
rename from modbus/nuttx/porttimer.c
rename to modbus/freemodbus/nuttx/porttimer.c
diff --git a/modbus/nuttx/porttimer_m.c b/modbus/freemodbus/nuttx/porttimer_m.c
similarity index 100%
rename from modbus/nuttx/porttimer_m.c
rename to modbus/freemodbus/nuttx/porttimer_m.c
diff --git a/modbus/rtu/Make.defs b/modbus/freemodbus/rtu/Make.defs
similarity index 93%
rename from modbus/rtu/Make.defs
rename to modbus/freemodbus/rtu/Make.defs
index ac4ab7e2a..43576f993 100644
--- a/modbus/rtu/Make.defs
+++ b/modbus/freemodbus/rtu/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/rtu/Make.defs
+# apps/modbus/freemodbus/rtu/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -40,6 +40,6 @@ endif
 
 DEPPATH += --dep-path rtu
 VPATH += :rtu
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/rtu
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/rtu
 
 endif
diff --git a/modbus/rtu/mbcrc.c b/modbus/freemodbus/rtu/mbcrc.c
similarity index 100%
rename from modbus/rtu/mbcrc.c
rename to modbus/freemodbus/rtu/mbcrc.c
diff --git a/modbus/rtu/mbcrc.h b/modbus/freemodbus/rtu/mbcrc.h
similarity index 100%
rename from modbus/rtu/mbcrc.h
rename to modbus/freemodbus/rtu/mbcrc.h
diff --git a/modbus/rtu/mbrtu.c b/modbus/freemodbus/rtu/mbrtu.c
similarity index 100%
rename from modbus/rtu/mbrtu.c
rename to modbus/freemodbus/rtu/mbrtu.c
diff --git a/modbus/rtu/mbrtu.h b/modbus/freemodbus/rtu/mbrtu.h
similarity index 100%
rename from modbus/rtu/mbrtu.h
rename to modbus/freemodbus/rtu/mbrtu.h
diff --git a/modbus/rtu/mbrtu_m.c b/modbus/freemodbus/rtu/mbrtu_m.c
similarity index 100%
rename from modbus/rtu/mbrtu_m.c
rename to modbus/freemodbus/rtu/mbrtu_m.c
diff --git a/modbus/rtu/mbrtu_m.h b/modbus/freemodbus/rtu/mbrtu_m.h
similarity index 100%
rename from modbus/rtu/mbrtu_m.h
rename to modbus/freemodbus/rtu/mbrtu_m.h
diff --git a/modbus/tcp/Make.defs b/modbus/freemodbus/tcp/Make.defs
similarity index 91%
rename from modbus/tcp/Make.defs
rename to modbus/freemodbus/tcp/Make.defs
index dfd220f41..b9f82c6de 100644
--- a/modbus/tcp/Make.defs
+++ b/modbus/freemodbus/tcp/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/tcp/Make.defs
+# apps/modbus/freemodbus/tcp/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -26,6 +26,6 @@ CSRCS += mbtcp.c
 
 DEPPATH += --dep-path tcp
 VPATH += :tcp
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/tcp
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/tcp
 
 endif
diff --git a/modbus/tcp/mbtcp.c b/modbus/freemodbus/tcp/mbtcp.c
similarity index 100%
rename from modbus/tcp/mbtcp.c
rename to modbus/freemodbus/tcp/mbtcp.c
diff --git a/modbus/tcp/mbtcp.h b/modbus/freemodbus/tcp/mbtcp.h
similarity index 100%
rename from modbus/tcp/mbtcp.h
rename to modbus/freemodbus/tcp/mbtcp.h

From 8e9f5a8d3aa318fb9b3fb67db3577fac7cf84116 Mon Sep 17 00:00:00 2001
From: Michal Lenc <michallenc@seznam.cz>
Date: Fri, 17 Apr 2026 11:57:40 +0200
Subject: [PATCH 293/568] nshlib/nsh_timcmds.c: fix incorrect time set during
 summer time

Value zero in tm_isdst means daylight saving time (or summer
time) is not in effect. This is obviously not true for half of the year
in most timezones and keeping it at zero leads to incorrect time
being set. This commit sets tm_isdst to -1, which means the information
is not available and it should be handled according to timezone rules.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
---
 nshlib/nsh_timcmds.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nshlib/nsh_timcmds.c b/nshlib/nsh_timcmds.c
index a0952acc1..de5dd8adf 100644
--- a/nshlib/nsh_timcmds.c
+++ b/nshlib/nsh_timcmds.c
@@ -265,6 +265,10 @@ static inline int date_settime(FAR struct nsh_vtbl_s *vtbl,
 
   tm.tm_year = (int)result - 1900;
 
+  /* Information about daylight saving not available -> let TZ handle it */
+
+  tm.tm_isdst = -1;
+
   /* Convert this to the right form, then set the timer */
 
   ts.tv_sec  = utc ? timegm(&tm): mktime(&tm);

From 2ee08209a099718be0cfbbc9846c91fee9a4e7e8 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 15 Apr 2026 09:44:45 -0300
Subject: [PATCH 294/568] apps/modbus: Move modbus to inside industry/

Modbus is a protocol mostly used on industries and since it is a
protocol it is not a category to be at root of apps/

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 {modbus => industry/modbus}/.gitignore             |  0
 {modbus => industry/modbus}/CMakeLists.txt         |  2 +-
 {modbus => industry/modbus}/Make.defs              |  2 +-
 {modbus => industry/modbus}/Makefile               |  2 +-
 .../modbus}/freemodbus/CMakeLists.txt              |  8 ++++----
 {modbus => industry/modbus}/freemodbus/Kconfig     | 14 +++++++-------
 {modbus => industry/modbus}/freemodbus/Make.defs   |  6 +++---
 {modbus => industry/modbus}/freemodbus/Makefile    |  6 +++---
 .../modbus}/freemodbus/ascii/Make.defs             |  4 ++--
 .../modbus}/freemodbus/ascii/mbascii.c             |  2 +-
 .../modbus}/freemodbus/ascii/mbascii.h             |  2 +-
 .../modbus}/freemodbus/functions/Make.defs         |  4 ++--
 .../modbus}/freemodbus/functions/mbfunccoils.c     |  0
 .../modbus}/freemodbus/functions/mbfunccoils_m.c   |  2 +-
 .../modbus}/freemodbus/functions/mbfuncdiag.c      |  2 +-
 .../modbus}/freemodbus/functions/mbfuncdisc.c      |  0
 .../modbus}/freemodbus/functions/mbfuncdisc_m.c    |  2 +-
 .../modbus}/freemodbus/functions/mbfuncholding.c   |  0
 .../modbus}/freemodbus/functions/mbfuncholding_m.c |  2 +-
 .../modbus}/freemodbus/functions/mbfuncinput.c     |  0
 .../modbus}/freemodbus/functions/mbfuncinput_m.c   |  2 +-
 .../modbus}/freemodbus/functions/mbfuncother.c     |  0
 .../modbus}/freemodbus/functions/mbutils.c         |  0
 {modbus => industry/modbus}/freemodbus/mb.c        |  2 +-
 {modbus => industry/modbus}/freemodbus/mb_m.c      |  0
 .../modbus}/freemodbus/nuttx/Make.defs             |  6 +++---
 .../modbus}/freemodbus/nuttx/port.h                | 10 +++++-----
 .../modbus}/freemodbus/nuttx/portevent.c           |  2 +-
 .../modbus}/freemodbus/nuttx/portevent_m.c         |  2 +-
 .../modbus}/freemodbus/nuttx/portother.c           |  4 ++--
 .../modbus}/freemodbus/nuttx/portother_m.c         |  2 +-
 .../modbus}/freemodbus/nuttx/portserial.c          |  2 +-
 .../modbus}/freemodbus/nuttx/portserial_m.c        |  2 +-
 .../modbus}/freemodbus/nuttx/porttimer.c           |  2 +-
 .../modbus}/freemodbus/nuttx/porttimer_m.c         |  2 +-
 .../modbus}/freemodbus/rtu/Make.defs               |  4 ++--
 {modbus => industry/modbus}/freemodbus/rtu/mbcrc.c |  2 +-
 {modbus => industry/modbus}/freemodbus/rtu/mbcrc.h |  0
 {modbus => industry/modbus}/freemodbus/rtu/mbrtu.c |  2 +-
 {modbus => industry/modbus}/freemodbus/rtu/mbrtu.h |  2 +-
 .../modbus}/freemodbus/rtu/mbrtu_m.c               |  2 +-
 .../modbus}/freemodbus/rtu/mbrtu_m.h               |  2 +-
 .../modbus}/freemodbus/tcp/Make.defs               |  4 ++--
 {modbus => industry/modbus}/freemodbus/tcp/mbtcp.c |  2 +-
 {modbus => industry/modbus}/freemodbus/tcp/mbtcp.h |  2 +-
 45 files changed, 60 insertions(+), 60 deletions(-)
 rename {modbus => industry/modbus}/.gitignore (100%)
 rename {modbus => industry/modbus}/CMakeLists.txt (96%)
 rename {modbus => industry/modbus}/Make.defs (96%)
 rename {modbus => industry/modbus}/Makefile (96%)
 rename {modbus => industry/modbus}/freemodbus/CMakeLists.txt (94%)
 rename {modbus => industry/modbus}/freemodbus/Kconfig (97%)
 rename {modbus => industry/modbus}/freemodbus/Make.defs (87%)
 rename {modbus => industry/modbus}/freemodbus/Makefile (91%)
 rename {modbus => industry/modbus}/freemodbus/ascii/Make.defs (90%)
 rename {modbus => industry/modbus}/freemodbus/ascii/mbascii.c (99%)
 rename {modbus => industry/modbus}/freemodbus/ascii/mbascii.h (98%)
 rename {modbus => industry/modbus}/freemodbus/functions/Make.defs (91%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfunccoils.c (100%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfunccoils_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncdiag.c (97%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncdisc.c (100%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncdisc_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncholding.c (100%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncholding_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncinput.c (100%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncinput_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbfuncother.c (100%)
 rename {modbus => industry/modbus}/freemodbus/functions/mbutils.c (100%)
 rename {modbus => industry/modbus}/freemodbus/mb.c (99%)
 rename {modbus => industry/modbus}/freemodbus/mb_m.c (100%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/Make.defs (88%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/port.h (94%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/portevent.c (98%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/portevent_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/portother.c (97%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/portother_m.c (98%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/portserial.c (99%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/portserial_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/porttimer.c (98%)
 rename {modbus => industry/modbus}/freemodbus/nuttx/porttimer_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/rtu/Make.defs (91%)
 rename {modbus => industry/modbus}/freemodbus/rtu/mbcrc.c (99%)
 rename {modbus => industry/modbus}/freemodbus/rtu/mbcrc.h (100%)
 rename {modbus => industry/modbus}/freemodbus/rtu/mbrtu.c (99%)
 rename {modbus => industry/modbus}/freemodbus/rtu/mbrtu.h (98%)
 rename {modbus => industry/modbus}/freemodbus/rtu/mbrtu_m.c (99%)
 rename {modbus => industry/modbus}/freemodbus/rtu/mbrtu_m.h (98%)
 rename {modbus => industry/modbus}/freemodbus/tcp/Make.defs (90%)
 rename {modbus => industry/modbus}/freemodbus/tcp/mbtcp.c (99%)
 rename {modbus => industry/modbus}/freemodbus/tcp/mbtcp.h (98%)

diff --git a/modbus/.gitignore b/industry/modbus/.gitignore
similarity index 100%
rename from modbus/.gitignore
rename to industry/modbus/.gitignore
diff --git a/modbus/CMakeLists.txt b/industry/modbus/CMakeLists.txt
similarity index 96%
rename from modbus/CMakeLists.txt
rename to industry/modbus/CMakeLists.txt
index 781050084..89038a9a7 100644
--- a/modbus/CMakeLists.txt
+++ b/industry/modbus/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/modbus/CMakeLists.txt
+# apps/industry/modbus/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/modbus/Make.defs b/industry/modbus/Make.defs
similarity index 96%
rename from modbus/Make.defs
rename to industry/modbus/Make.defs
index 03e07693a..fde0dd716 100644
--- a/modbus/Make.defs
+++ b/industry/modbus/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/Make.defs
+# apps/industry/modbus/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/modbus/Makefile b/industry/modbus/Makefile
similarity index 96%
rename from modbus/Makefile
rename to industry/modbus/Makefile
index 5858b4b4a..320c97faf 100644
--- a/modbus/Makefile
+++ b/industry/modbus/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/Makefile
+# apps/industry/modbus/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/modbus/freemodbus/CMakeLists.txt b/industry/modbus/freemodbus/CMakeLists.txt
similarity index 94%
rename from modbus/freemodbus/CMakeLists.txt
rename to industry/modbus/freemodbus/CMakeLists.txt
index a9980f597..d49e6c069 100644
--- a/modbus/freemodbus/CMakeLists.txt
+++ b/industry/modbus/freemodbus/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/modbus/freemodbus/CMakeLists.txt
+# apps/industry/modbus/freemodbus/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,11 +20,11 @@
 #
 # ##############################################################################
 
-if(CONFIG_MODBUS)
+if(CONFIG_INDUSTRY_MODBUS)
 
   set(CSRCS)
 
-  if(CONFIG_MODBUS_SLAVE)
+  if(CONFIG_INDUSTRY_MODBUS_SLAVE)
     list(APPEND CSRCS mb.c)
   endif()
 
@@ -63,7 +63,7 @@ if(CONFIG_MODBUS)
 
   list(APPEND CSRCS nuttx/portother.c)
 
-  if(CONFIG_MODBUS_SLAVE)
+  if(CONFIG_INDUSTRY_MODBUS_SLAVE)
     list(APPEND CSRCS nuttx/portevent.c nuttx/portserial.c nuttx/porttimer.c)
   endif()
 
diff --git a/modbus/freemodbus/Kconfig b/industry/modbus/freemodbus/Kconfig
similarity index 97%
rename from modbus/freemodbus/Kconfig
rename to industry/modbus/freemodbus/Kconfig
index d891d181c..dd46bbe3c 100644
--- a/modbus/freemodbus/Kconfig
+++ b/industry/modbus/freemodbus/Kconfig
@@ -4,11 +4,11 @@
 #
 
 menu "FreeModBus"
-config MODBUS
+config INDUSTRY_MODBUS
 	bool "Modbus support using FreeModbus"
 	default n
 
-if MODBUS
+if INDUSTRY_MODBUS
 
 config MB_FUNC_HANDLERS_MAX
 	int "Maximum number of Modbus functions"
@@ -20,11 +20,11 @@ config MB_FUNC_HANDLERS_MAX
 		the sum of all enabled functions in this file and custom function
 		handlers. If set to small adding more functions will fail.
 
-config MODBUS_SLAVE
+config INDUSTRY_MODBUS_SLAVE
 	bool "Modbus slave support via FreeModBus"
 	default n
 
-if MODBUS_SLAVE
+if INDUSTRY_MODBUS_SLAVE
 config MB_ASCII_ENABLED
 	bool "Modbus ASCII support"
 	default y
@@ -144,9 +144,9 @@ config MB_FUNC_READWRITE_HOLDING_ENABLED
 	---help---
 		If the Read/Write Multiple Registers function should be enabled.
 
-endif # MODBUS_SLAVE
+endif # INDUSTRY_MODBUS_SLAVE
 
-config MODBUS_MASTER
+config INDUSTRY_MODBUS_MASTER
 	bool "Modbus Master support via FreeModBus"
 	default n
 
@@ -252,7 +252,7 @@ config MB_MASTER_FUNC_READWRITE_HOLDING_ENABLED
 endif # MB_ASCII_MASTER || MB_RTU_MASTER
 endif # MODBUS
 
-config MODBUS_DISABLE_LOG
+config INDUSTRY_MODBUS_DISABLE_LOG
 	bool "Disable logging for FreeModBus"
 	default !FILE_STREAM
 	---help---
diff --git a/modbus/freemodbus/Make.defs b/industry/modbus/freemodbus/Make.defs
similarity index 87%
rename from modbus/freemodbus/Make.defs
rename to industry/modbus/freemodbus/Make.defs
index 6eac9db77..7d867a0aa 100644
--- a/modbus/freemodbus/Make.defs
+++ b/industry/modbus/freemodbus/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/Make.defs
+# apps/industry/modbus/freemodbus/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_MODBUS),)
-CONFIGURED_APPS += $(APPDIR)/modbus/freemodbus
+ifneq ($(CONFIG_INDUSTRY_MODBUS),)
+CONFIGURED_APPS += $(APPDIR)/industry/modbus/freemodbus
 endif
diff --git a/modbus/freemodbus/Makefile b/industry/modbus/freemodbus/Makefile
similarity index 91%
rename from modbus/freemodbus/Makefile
rename to industry/modbus/freemodbus/Makefile
index 6d45f7650..dddb6559a 100644
--- a/modbus/freemodbus/Makefile
+++ b/industry/modbus/freemodbus/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/Makefile
+# apps/industry/modbus/freemodbus/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -24,9 +24,9 @@ include $(APPDIR)/Make.defs
 
 # FreeModBus Library
 
-ifeq ($(CONFIG_MODBUS),y)
+ifeq ($(CONFIG_INDUSTRY_MODBUS),y)
 
-  ifeq ($(CONFIG_MODBUS_SLAVE),y)
+  ifeq ($(CONFIG_INDUSTRY_MODBUS_SLAVE),y)
     CSRCS += mb.c
   endif
 
diff --git a/modbus/freemodbus/ascii/Make.defs b/industry/modbus/freemodbus/ascii/Make.defs
similarity index 90%
rename from modbus/freemodbus/ascii/Make.defs
rename to industry/modbus/freemodbus/ascii/Make.defs
index 2f2745828..c2fcf2218 100644
--- a/modbus/freemodbus/ascii/Make.defs
+++ b/industry/modbus/freemodbus/ascii/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/ascii/Make.defs
+# apps/industry/modbus/freemodbus/ascii/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -26,6 +26,6 @@ CSRCS += mbascii.c
 
 DEPPATH += --dep-path ascii
 VPATH += :ascii
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/ascii
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/ascii
 
 endif
diff --git a/modbus/freemodbus/ascii/mbascii.c b/industry/modbus/freemodbus/ascii/mbascii.c
similarity index 99%
rename from modbus/freemodbus/ascii/mbascii.c
rename to industry/modbus/freemodbus/ascii/mbascii.c
index 3540628ad..d64505125 100644
--- a/modbus/freemodbus/ascii/mbascii.c
+++ b/industry/modbus/freemodbus/ascii/mbascii.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/ascii/mbascii.c
+ * apps/industry/modbus/ascii/mbascii.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/ascii/mbascii.h b/industry/modbus/freemodbus/ascii/mbascii.h
similarity index 98%
rename from modbus/freemodbus/ascii/mbascii.h
rename to industry/modbus/freemodbus/ascii/mbascii.h
index 355484103..5351de010 100644
--- a/modbus/freemodbus/ascii/mbascii.h
+++ b/industry/modbus/freemodbus/ascii/mbascii.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/ascii/mbascii.h
+ * apps/industry/modbus/ascii/mbascii.h
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/functions/Make.defs b/industry/modbus/freemodbus/functions/Make.defs
similarity index 91%
rename from modbus/freemodbus/functions/Make.defs
rename to industry/modbus/freemodbus/functions/Make.defs
index c59393a2a..7c53d5bfc 100644
--- a/modbus/freemodbus/functions/Make.defs
+++ b/industry/modbus/freemodbus/functions/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/functions/Make.defs
+# apps/industry/modbus/freemodbus/functions/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -33,4 +33,4 @@ endif
 
 DEPPATH += --dep-path functions
 VPATH += :functions
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/functions
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/functions
diff --git a/modbus/freemodbus/functions/mbfunccoils.c b/industry/modbus/freemodbus/functions/mbfunccoils.c
similarity index 100%
rename from modbus/freemodbus/functions/mbfunccoils.c
rename to industry/modbus/freemodbus/functions/mbfunccoils.c
diff --git a/modbus/freemodbus/functions/mbfunccoils_m.c b/industry/modbus/freemodbus/functions/mbfunccoils_m.c
similarity index 99%
rename from modbus/freemodbus/functions/mbfunccoils_m.c
rename to industry/modbus/freemodbus/functions/mbfunccoils_m.c
index c258d757d..ca59e4caf 100644
--- a/modbus/freemodbus/functions/mbfunccoils_m.c
+++ b/industry/modbus/freemodbus/functions/mbfunccoils_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/functions/mbfunccoils_m.c
+ * apps/industry/modbus/functions/mbfunccoils_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2013 Armink <armink.ztl@gmail.com>
diff --git a/modbus/freemodbus/functions/mbfuncdiag.c b/industry/modbus/freemodbus/functions/mbfuncdiag.c
similarity index 97%
rename from modbus/freemodbus/functions/mbfuncdiag.c
rename to industry/modbus/freemodbus/functions/mbfuncdiag.c
index b34581e6e..c9add6fd4 100644
--- a/modbus/freemodbus/functions/mbfuncdiag.c
+++ b/industry/modbus/freemodbus/functions/mbfuncdiag.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/functions/mbfuncdiag.c
+ * apps/industry/modbus/functions/mbfuncdiag.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/functions/mbfuncdisc.c b/industry/modbus/freemodbus/functions/mbfuncdisc.c
similarity index 100%
rename from modbus/freemodbus/functions/mbfuncdisc.c
rename to industry/modbus/freemodbus/functions/mbfuncdisc.c
diff --git a/modbus/freemodbus/functions/mbfuncdisc_m.c b/industry/modbus/freemodbus/functions/mbfuncdisc_m.c
similarity index 99%
rename from modbus/freemodbus/functions/mbfuncdisc_m.c
rename to industry/modbus/freemodbus/functions/mbfuncdisc_m.c
index 29386996d..770ab899d 100644
--- a/modbus/freemodbus/functions/mbfuncdisc_m.c
+++ b/industry/modbus/freemodbus/functions/mbfuncdisc_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/functions/mbfuncdisc_m.c
+ * apps/industry/modbus/functions/mbfuncdisc_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2013 Armink <armink.ztl@gmail.com>
diff --git a/modbus/freemodbus/functions/mbfuncholding.c b/industry/modbus/freemodbus/functions/mbfuncholding.c
similarity index 100%
rename from modbus/freemodbus/functions/mbfuncholding.c
rename to industry/modbus/freemodbus/functions/mbfuncholding.c
diff --git a/modbus/freemodbus/functions/mbfuncholding_m.c b/industry/modbus/freemodbus/functions/mbfuncholding_m.c
similarity index 99%
rename from modbus/freemodbus/functions/mbfuncholding_m.c
rename to industry/modbus/freemodbus/functions/mbfuncholding_m.c
index b017be715..59be35b26 100644
--- a/modbus/freemodbus/functions/mbfuncholding_m.c
+++ b/industry/modbus/freemodbus/functions/mbfuncholding_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/functions/mbfuncholding_m.c
+ * apps/industry/modbus/functions/mbfuncholding_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2013 Armink <armink.ztl@gmail.com>
diff --git a/modbus/freemodbus/functions/mbfuncinput.c b/industry/modbus/freemodbus/functions/mbfuncinput.c
similarity index 100%
rename from modbus/freemodbus/functions/mbfuncinput.c
rename to industry/modbus/freemodbus/functions/mbfuncinput.c
diff --git a/modbus/freemodbus/functions/mbfuncinput_m.c b/industry/modbus/freemodbus/functions/mbfuncinput_m.c
similarity index 99%
rename from modbus/freemodbus/functions/mbfuncinput_m.c
rename to industry/modbus/freemodbus/functions/mbfuncinput_m.c
index 4ca7e8113..2d4799037 100644
--- a/modbus/freemodbus/functions/mbfuncinput_m.c
+++ b/industry/modbus/freemodbus/functions/mbfuncinput_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/functions/mbfuncinput_m.c
+ * apps/industry/modbus/functions/mbfuncinput_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2013 Armink <armink.ztl@gmail.com>
diff --git a/modbus/freemodbus/functions/mbfuncother.c b/industry/modbus/freemodbus/functions/mbfuncother.c
similarity index 100%
rename from modbus/freemodbus/functions/mbfuncother.c
rename to industry/modbus/freemodbus/functions/mbfuncother.c
diff --git a/modbus/freemodbus/functions/mbutils.c b/industry/modbus/freemodbus/functions/mbutils.c
similarity index 100%
rename from modbus/freemodbus/functions/mbutils.c
rename to industry/modbus/freemodbus/functions/mbutils.c
diff --git a/modbus/freemodbus/mb.c b/industry/modbus/freemodbus/mb.c
similarity index 99%
rename from modbus/freemodbus/mb.c
rename to industry/modbus/freemodbus/mb.c
index 16f5567d8..3d4b9bf5a 100644
--- a/modbus/freemodbus/mb.c
+++ b/industry/modbus/freemodbus/mb.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/mb.c
+ * apps/industry/modbus/mb.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/mb_m.c b/industry/modbus/freemodbus/mb_m.c
similarity index 100%
rename from modbus/freemodbus/mb_m.c
rename to industry/modbus/freemodbus/mb_m.c
diff --git a/modbus/freemodbus/nuttx/Make.defs b/industry/modbus/freemodbus/nuttx/Make.defs
similarity index 88%
rename from modbus/freemodbus/nuttx/Make.defs
rename to industry/modbus/freemodbus/nuttx/Make.defs
index 723284cc4..1c3413ce3 100644
--- a/modbus/freemodbus/nuttx/Make.defs
+++ b/industry/modbus/freemodbus/nuttx/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/nuttx/Make.defs
+# apps/industry/modbus/freemodbus/nuttx/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -22,7 +22,7 @@
 
 CSRCS += portother.c
 
-ifeq ($(CONFIG_MODBUS_SLAVE),y)
+ifeq ($(CONFIG_INDUSTRY_MODBUS_SLAVE),y)
 CSRCS += portevent.c portserial.c porttimer.c
 endif
 
@@ -32,4 +32,4 @@ endif
 
 DEPPATH += --dep-path nuttx
 VPATH += :nuttx
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/nuttx
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/nuttx
diff --git a/modbus/freemodbus/nuttx/port.h b/industry/modbus/freemodbus/nuttx/port.h
similarity index 94%
rename from modbus/freemodbus/nuttx/port.h
rename to industry/modbus/freemodbus/nuttx/port.h
index c79dcdd98..149cefad2 100644
--- a/modbus/freemodbus/nuttx/port.h
+++ b/industry/modbus/freemodbus/nuttx/port.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/port.h
+ * apps/industry/modbus/nuttx/port.h
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
@@ -28,8 +28,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_MODBUS_NUTTX_PORT_H
-#define __APPS_MODBUS_NUTTX_PORT_H
+#ifndef __APPS_INDUSTRY_MODBUS_NUTTX_PORT_H
+#define __APPS_INDUSTRY_MODBUS_NUTTX_PORT_H
 
 /****************************************************************************
  * Included Files
@@ -79,7 +79,7 @@ typedef enum
 
 void vMBPortEnterCritical(void);
 void vMBPortExitCritical(void);
-#ifndef CONFIG_MODBUS_DISABLE_LOG
+#ifndef CONFIG_INDUSTRY_MODBUS_DISABLE_LOG
 void vMBPortLog(eMBPortLogLevel eLevel, const char *szModule,
                 const char *szFmt, ...) printf_like(3, 4);
 #else
@@ -103,4 +103,4 @@ bool xMBPortSerialSetTimeout(uint32_t dwTimeoutMs);
 }
 #endif
 
-#endif /* __APPS_MODBUS_NUTTX_PORT_H */
+#endif /* __APPS_INDUSTRY_MODBUS_NUTTX_PORT_H */
diff --git a/modbus/freemodbus/nuttx/portevent.c b/industry/modbus/freemodbus/nuttx/portevent.c
similarity index 98%
rename from modbus/freemodbus/nuttx/portevent.c
rename to industry/modbus/freemodbus/nuttx/portevent.c
index bce6e9c54..d9d31072d 100644
--- a/modbus/freemodbus/nuttx/portevent.c
+++ b/industry/modbus/freemodbus/nuttx/portevent.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/portevent.c
+ * apps/industry/modbus/nuttx/portevent.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/nuttx/portevent_m.c b/industry/modbus/freemodbus/nuttx/portevent_m.c
similarity index 99%
rename from modbus/freemodbus/nuttx/portevent_m.c
rename to industry/modbus/freemodbus/nuttx/portevent_m.c
index fb40f4dee..90d0c0e6e 100644
--- a/modbus/freemodbus/nuttx/portevent_m.c
+++ b/industry/modbus/freemodbus/nuttx/portevent_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/portevent_m.c
+ * apps/industry/modbus/nuttx/portevent_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/nuttx/portother.c b/industry/modbus/freemodbus/nuttx/portother.c
similarity index 97%
rename from modbus/freemodbus/nuttx/portother.c
rename to industry/modbus/freemodbus/nuttx/portother.c
index 3de2a38b5..b6c4731d9 100644
--- a/modbus/freemodbus/nuttx/portother.c
+++ b/industry/modbus/freemodbus/nuttx/portother.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/portother.c
+ * apps/industry/modbus/nuttx/portother.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
@@ -73,7 +73,7 @@ void vMBPortLogFile(FILE * fNewLogFile)
   fLogFile = fNewLogFile;
 }
 
-#ifndef CONFIG_MODBUS_DISABLE_LOG
+#ifndef CONFIG_INDUSTRY_MODBUS_DISABLE_LOG
 void vMBPortLog(eMBPortLogLevel eLevel, const char * szModule,
                 const char * szFmt, ...)
 {
diff --git a/modbus/freemodbus/nuttx/portother_m.c b/industry/modbus/freemodbus/nuttx/portother_m.c
similarity index 98%
rename from modbus/freemodbus/nuttx/portother_m.c
rename to industry/modbus/freemodbus/nuttx/portother_m.c
index 1d703c192..9ee337f2a 100644
--- a/modbus/freemodbus/nuttx/portother_m.c
+++ b/industry/modbus/freemodbus/nuttx/portother_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/portother_m.c
+ * apps/industry/modbus/nuttx/portother_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/nuttx/portserial.c b/industry/modbus/freemodbus/nuttx/portserial.c
similarity index 99%
rename from modbus/freemodbus/nuttx/portserial.c
rename to industry/modbus/freemodbus/nuttx/portserial.c
index 35155a732..4cb502aa5 100644
--- a/modbus/freemodbus/nuttx/portserial.c
+++ b/industry/modbus/freemodbus/nuttx/portserial.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/portserial.c
+ * apps/industry/modbus/nuttx/portserial.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/nuttx/portserial_m.c b/industry/modbus/freemodbus/nuttx/portserial_m.c
similarity index 99%
rename from modbus/freemodbus/nuttx/portserial_m.c
rename to industry/modbus/freemodbus/nuttx/portserial_m.c
index 98c11eb28..d7fc25526 100644
--- a/modbus/freemodbus/nuttx/portserial_m.c
+++ b/industry/modbus/freemodbus/nuttx/portserial_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/portserial_m.c
+ * apps/industry/modbus/nuttx/portserial_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/nuttx/porttimer.c b/industry/modbus/freemodbus/nuttx/porttimer.c
similarity index 98%
rename from modbus/freemodbus/nuttx/porttimer.c
rename to industry/modbus/freemodbus/nuttx/porttimer.c
index 1685df6ee..d09561f4b 100644
--- a/modbus/freemodbus/nuttx/porttimer.c
+++ b/industry/modbus/freemodbus/nuttx/porttimer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/porttimer.c
+ * apps/industry/modbus/nuttx/porttimer.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/nuttx/porttimer_m.c b/industry/modbus/freemodbus/nuttx/porttimer_m.c
similarity index 99%
rename from modbus/freemodbus/nuttx/porttimer_m.c
rename to industry/modbus/freemodbus/nuttx/porttimer_m.c
index 1e878aa00..8d9f3f3af 100644
--- a/modbus/freemodbus/nuttx/porttimer_m.c
+++ b/industry/modbus/freemodbus/nuttx/porttimer_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/nuttx/porttimer_m.c
+ * apps/industry/modbus/nuttx/porttimer_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/rtu/Make.defs b/industry/modbus/freemodbus/rtu/Make.defs
similarity index 91%
rename from modbus/freemodbus/rtu/Make.defs
rename to industry/modbus/freemodbus/rtu/Make.defs
index 43576f993..46656017d 100644
--- a/modbus/freemodbus/rtu/Make.defs
+++ b/industry/modbus/freemodbus/rtu/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/rtu/Make.defs
+# apps/industry/modbus/freemodbus/rtu/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -40,6 +40,6 @@ endif
 
 DEPPATH += --dep-path rtu
 VPATH += :rtu
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/rtu
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/rtu
 
 endif
diff --git a/modbus/freemodbus/rtu/mbcrc.c b/industry/modbus/freemodbus/rtu/mbcrc.c
similarity index 99%
rename from modbus/freemodbus/rtu/mbcrc.c
rename to industry/modbus/freemodbus/rtu/mbcrc.c
index dcaddec71..df16f13e0 100644
--- a/modbus/freemodbus/rtu/mbcrc.c
+++ b/industry/modbus/freemodbus/rtu/mbcrc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/rtu/mbcrc.c
+ * apps/industry/modbus/rtu/mbcrc.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/rtu/mbcrc.h b/industry/modbus/freemodbus/rtu/mbcrc.h
similarity index 100%
rename from modbus/freemodbus/rtu/mbcrc.h
rename to industry/modbus/freemodbus/rtu/mbcrc.h
diff --git a/modbus/freemodbus/rtu/mbrtu.c b/industry/modbus/freemodbus/rtu/mbrtu.c
similarity index 99%
rename from modbus/freemodbus/rtu/mbrtu.c
rename to industry/modbus/freemodbus/rtu/mbrtu.c
index 0f8262d4f..ead36d164 100644
--- a/modbus/freemodbus/rtu/mbrtu.c
+++ b/industry/modbus/freemodbus/rtu/mbrtu.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/rtu/mbrtu.c
+ * apps/industry/modbus/rtu/mbrtu.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/rtu/mbrtu.h b/industry/modbus/freemodbus/rtu/mbrtu.h
similarity index 98%
rename from modbus/freemodbus/rtu/mbrtu.h
rename to industry/modbus/freemodbus/rtu/mbrtu.h
index 418311bff..ff31a1844 100644
--- a/modbus/freemodbus/rtu/mbrtu.h
+++ b/industry/modbus/freemodbus/rtu/mbrtu.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/rtu/mbrtu.h
+ * apps/industry/modbus/rtu/mbrtu.h
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/rtu/mbrtu_m.c b/industry/modbus/freemodbus/rtu/mbrtu_m.c
similarity index 99%
rename from modbus/freemodbus/rtu/mbrtu_m.c
rename to industry/modbus/freemodbus/rtu/mbrtu_m.c
index ed8e62488..4a67a0508 100644
--- a/modbus/freemodbus/rtu/mbrtu_m.c
+++ b/industry/modbus/freemodbus/rtu/mbrtu_m.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/rtu/mbrtu_m.c
+ * apps/industry/modbus/rtu/mbrtu_m.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2013 China Beijing Armink <armink.ztl@gmail.com>
diff --git a/modbus/freemodbus/rtu/mbrtu_m.h b/industry/modbus/freemodbus/rtu/mbrtu_m.h
similarity index 98%
rename from modbus/freemodbus/rtu/mbrtu_m.h
rename to industry/modbus/freemodbus/rtu/mbrtu_m.h
index 5fb2eee43..b59652b59 100644
--- a/modbus/freemodbus/rtu/mbrtu_m.h
+++ b/industry/modbus/freemodbus/rtu/mbrtu_m.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/rtu/mbrtu_m.h
+ * apps/industry/modbus/rtu/mbrtu_m.h
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2013 China Beijing Armink <armink.ztl@gmail.com>
diff --git a/modbus/freemodbus/tcp/Make.defs b/industry/modbus/freemodbus/tcp/Make.defs
similarity index 90%
rename from modbus/freemodbus/tcp/Make.defs
rename to industry/modbus/freemodbus/tcp/Make.defs
index b9f82c6de..281a9a5be 100644
--- a/modbus/freemodbus/tcp/Make.defs
+++ b/industry/modbus/freemodbus/tcp/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/modbus/freemodbus/tcp/Make.defs
+# apps/industry/modbus/freemodbus/tcp/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -26,6 +26,6 @@ CSRCS += mbtcp.c
 
 DEPPATH += --dep-path tcp
 VPATH += :tcp
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/modbus/freemodbus/tcp
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/industry/modbus/freemodbus/tcp
 
 endif
diff --git a/modbus/freemodbus/tcp/mbtcp.c b/industry/modbus/freemodbus/tcp/mbtcp.c
similarity index 99%
rename from modbus/freemodbus/tcp/mbtcp.c
rename to industry/modbus/freemodbus/tcp/mbtcp.c
index ca9c41c43..6957effb9 100644
--- a/modbus/freemodbus/tcp/mbtcp.c
+++ b/industry/modbus/freemodbus/tcp/mbtcp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/tcp/mbtcp.c
+ * apps/industry/modbus/tcp/mbtcp.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>
diff --git a/modbus/freemodbus/tcp/mbtcp.h b/industry/modbus/freemodbus/tcp/mbtcp.h
similarity index 98%
rename from modbus/freemodbus/tcp/mbtcp.h
rename to industry/modbus/freemodbus/tcp/mbtcp.h
index 39fa9c8ce..26e380cb9 100644
--- a/modbus/freemodbus/tcp/mbtcp.h
+++ b/industry/modbus/freemodbus/tcp/mbtcp.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/modbus/tcp/mbtcp.h
+ * apps/industry/modbus/tcp/mbtcp.h
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>

From 2016c0b6ae2d2ce590bb4d55895a0c2917f466b2 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 15 Apr 2026 09:44:45 -0300
Subject: [PATCH 295/568] apps/modbus: Move modbus to inside industry/

Modbus is a protocol mostly used on industries and since it is a
protocol it is not a category to be at root of apps/

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 CMakeLists.txt                             | 1 -
 industry/modbus/Make.defs                  | 2 +-
 industry/modbus/freemodbus/Kconfig         | 8 ++++----
 industry/modbus/freemodbus/ascii/mbascii.c | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84844e700..3ebffdd94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ add_subdirectory(logging)
 add_subdirectory(lte)
 add_subdirectory(math)
 add_subdirectory(mlearning)
-add_subdirectory(modbus)
 add_subdirectory(netutils)
 add_subdirectory(nshlib)
 add_subdirectory(platform)
diff --git a/industry/modbus/Make.defs b/industry/modbus/Make.defs
index fde0dd716..b358e9be4 100644
--- a/industry/modbus/Make.defs
+++ b/industry/modbus/Make.defs
@@ -20,4 +20,4 @@
 #
 ############################################################################
 
-include $(wildcard $(APPDIR)/modbus/*/Make.defs)
+include $(wildcard $(APPDIR)/industry/modbus/*/Make.defs)
diff --git a/industry/modbus/freemodbus/Kconfig b/industry/modbus/freemodbus/Kconfig
index dd46bbe3c..7c9e834f3 100644
--- a/industry/modbus/freemodbus/Kconfig
+++ b/industry/modbus/freemodbus/Kconfig
@@ -153,17 +153,17 @@ config INDUSTRY_MODBUS_MASTER
 config MB_ASCII_MASTER
 	bool "Modbus ASCII master"
 	default n
-	depends on MODBUS_MASTER
+	depends on INDUSTRY_MODBUS_MASTER
 
 config MB_RTU_MASTER
 	bool "Modbus RTU master"
 	default n
-	depends on MODBUS_MASTER
+	depends on INDUSTRY_MODBUS_MASTER
 
 config MB_PORT_HAS_CLOSE
 	bool "Platform close callbacks"
 	default n
-	depends on MODBUS_MASTER
+	depends on INDUSTRY_MODBUS_MASTER
 	---help---
 		A port which wants to get an callback must select
 		CONFIG_MB_HAS_CLOSE and provide vMBMasterPortClose() as
@@ -250,7 +250,7 @@ config MB_MASTER_FUNC_READWRITE_HOLDING_ENABLED
 		If the Read/Write Multiple Registers function should be enabled.
 
 endif # MB_ASCII_MASTER || MB_RTU_MASTER
-endif # MODBUS
+endif # INDUSTRY_MODBUS
 
 config INDUSTRY_MODBUS_DISABLE_LOG
 	bool "Disable logging for FreeModBus"
diff --git a/industry/modbus/freemodbus/ascii/mbascii.c b/industry/modbus/freemodbus/ascii/mbascii.c
index d64505125..1ba55f99c 100644
--- a/industry/modbus/freemodbus/ascii/mbascii.c
+++ b/industry/modbus/freemodbus/ascii/mbascii.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/industry/modbus/ascii/mbascii.c
+ * apps/industry/modbus/freemodbus/ascii/mbascii.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>

From 773f69d5d95d0390d60447a29c2c1b82931932a3 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 13 Apr 2026 14:37:52 +0200
Subject: [PATCH 296/568] modbus: add nxmodbus

NxModbus is a lightweight Modbus protocol stack implementation for NuttX RTOS.

This commit adds:
- nxmodbus stack
- nxmbserver - Modbus Server (Slave) example
- nxmbclient - Modbus Client (Master) tool

Supported Modbus transports:
- ASCII
- RTU over serial port
- TCP
- RAW (ADU) for custom transport implementations

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/nxmbserver/CMakeLists.txt            |  35 +
 examples/nxmbserver/Kconfig                   |  33 +
 examples/nxmbserver/Make.defs                 |  25 +
 examples/nxmbserver/Makefile                  |  32 +
 examples/nxmbserver/nxmbserver_main.c         | 543 ++++++++++++
 include/nxmodbus/nxmb_client.h                | 261 ++++++
 include/nxmodbus/nxmb_raw.h                   | 108 +++
 include/nxmodbus/nxmodbus.h                   | 378 +++++++++
 industry/nxmodbus/CMakeLists.txt              |  68 ++
 industry/nxmodbus/Kconfig                     | 245 ++++++
 industry/nxmodbus/Make.defs                   |  25 +
 industry/nxmodbus/Makefile                    |  76 ++
 industry/nxmodbus/core/nxmb_client.c          | 739 ++++++++++++++++
 industry/nxmodbus/core/nxmb_context.c         | 392 +++++++++
 industry/nxmodbus/core/nxmb_func.c            | 354 ++++++++
 industry/nxmodbus/core/nxmb_func_coils.c      | 259 ++++++
 industry/nxmodbus/core/nxmb_func_diag.c       |  83 ++
 industry/nxmodbus/core/nxmb_func_discrete.c   | 110 +++
 industry/nxmodbus/core/nxmb_func_holding.c    | 331 ++++++++
 industry/nxmodbus/core/nxmb_func_input.c      | 115 +++
 industry/nxmodbus/core/nxmb_func_other.c      |  99 +++
 industry/nxmodbus/core/nxmb_server.c          | 121 +++
 industry/nxmodbus/core/nxmb_utils.c           | 127 +++
 industry/nxmodbus/nxmb_internal.h             | 379 +++++++++
 industry/nxmodbus/transport/nxmb_ascii.c      | 550 ++++++++++++
 industry/nxmodbus/transport/nxmb_crc.c        | 108 +++
 industry/nxmodbus/transport/nxmb_lrc.c        |  70 ++
 industry/nxmodbus/transport/nxmb_raw.c        | 303 +++++++
 industry/nxmodbus/transport/nxmb_serial.c     | 423 ++++++++++
 .../nxmodbus/transport/nxmb_serial_common.c   | 138 +++
 industry/nxmodbus/transport/nxmb_tcp.c        | 684 +++++++++++++++
 system/nxmbclient/CMakeLists.txt              |  35 +
 system/nxmbclient/Kconfig                     |  32 +
 system/nxmbclient/Make.defs                   |  25 +
 system/nxmbclient/Makefile                    |  32 +
 system/nxmbclient/nxmbclient_main.c           | 799 ++++++++++++++++++
 36 files changed, 8137 insertions(+)
 create mode 100644 examples/nxmbserver/CMakeLists.txt
 create mode 100644 examples/nxmbserver/Kconfig
 create mode 100644 examples/nxmbserver/Make.defs
 create mode 100644 examples/nxmbserver/Makefile
 create mode 100644 examples/nxmbserver/nxmbserver_main.c
 create mode 100644 include/nxmodbus/nxmb_client.h
 create mode 100644 include/nxmodbus/nxmb_raw.h
 create mode 100644 include/nxmodbus/nxmodbus.h
 create mode 100644 industry/nxmodbus/CMakeLists.txt
 create mode 100644 industry/nxmodbus/Kconfig
 create mode 100644 industry/nxmodbus/Make.defs
 create mode 100644 industry/nxmodbus/Makefile
 create mode 100644 industry/nxmodbus/core/nxmb_client.c
 create mode 100644 industry/nxmodbus/core/nxmb_context.c
 create mode 100644 industry/nxmodbus/core/nxmb_func.c
 create mode 100644 industry/nxmodbus/core/nxmb_func_coils.c
 create mode 100644 industry/nxmodbus/core/nxmb_func_diag.c
 create mode 100644 industry/nxmodbus/core/nxmb_func_discrete.c
 create mode 100644 industry/nxmodbus/core/nxmb_func_holding.c
 create mode 100644 industry/nxmodbus/core/nxmb_func_input.c
 create mode 100644 industry/nxmodbus/core/nxmb_func_other.c
 create mode 100644 industry/nxmodbus/core/nxmb_server.c
 create mode 100644 industry/nxmodbus/core/nxmb_utils.c
 create mode 100644 industry/nxmodbus/nxmb_internal.h
 create mode 100644 industry/nxmodbus/transport/nxmb_ascii.c
 create mode 100644 industry/nxmodbus/transport/nxmb_crc.c
 create mode 100644 industry/nxmodbus/transport/nxmb_lrc.c
 create mode 100644 industry/nxmodbus/transport/nxmb_raw.c
 create mode 100644 industry/nxmodbus/transport/nxmb_serial.c
 create mode 100644 industry/nxmodbus/transport/nxmb_serial_common.c
 create mode 100644 industry/nxmodbus/transport/nxmb_tcp.c
 create mode 100644 system/nxmbclient/CMakeLists.txt
 create mode 100644 system/nxmbclient/Kconfig
 create mode 100644 system/nxmbclient/Make.defs
 create mode 100644 system/nxmbclient/Makefile
 create mode 100644 system/nxmbclient/nxmbclient_main.c

diff --git a/examples/nxmbserver/CMakeLists.txt b/examples/nxmbserver/CMakeLists.txt
new file mode 100644
index 000000000..d6880be38
--- /dev/null
+++ b/examples/nxmbserver/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/examples/nxmbserver/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_NXMBSERVER)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_NXMBSERVER_PROGNAME}
+    PRIORITY
+    ${CONFIG_EXAMPLES_NXMBSERVER_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_NXMBSERVER_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_NXMBSERVER}
+    SRCS
+    nxmbserver_main.c)
+endif()
diff --git a/examples/nxmbserver/Kconfig b/examples/nxmbserver/Kconfig
new file mode 100644
index 000000000..428f49c5e
--- /dev/null
+++ b/examples/nxmbserver/Kconfig
@@ -0,0 +1,33 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_NXMBSERVER
+	tristate "NxModbus Server Example"
+	default n
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable the NxModbus server example. This example demonstrates
+		how to create a Modbus server (slave) that responds to client
+		requests. Supports RTU, ASCII, and TCP transports with simulated
+		register data.
+
+if EXAMPLES_NXMBSERVER
+
+config EXAMPLES_NXMBSERVER_PROGNAME
+	string "Program name"
+	default "nxmbserver"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config EXAMPLES_NXMBSERVER_PRIORITY
+	int "NxModbus server task priority"
+	default 100
+
+config EXAMPLES_NXMBSERVER_STACKSIZE
+	int "NxModbus server stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif # EXAMPLES_NXMBSERVER
diff --git a/examples/nxmbserver/Make.defs b/examples/nxmbserver/Make.defs
new file mode 100644
index 000000000..57fd777e7
--- /dev/null
+++ b/examples/nxmbserver/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/nxmbserver/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_NXMBSERVER),)
+CONFIGURED_APPS += $(APPDIR)/examples/nxmbserver
+endif
diff --git a/examples/nxmbserver/Makefile b/examples/nxmbserver/Makefile
new file mode 100644
index 000000000..d3699d90b
--- /dev/null
+++ b/examples/nxmbserver/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/examples/nxmbserver/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+MAINSRC = nxmbserver_main.c
+
+PROGNAME  = $(CONFIG_EXAMPLES_NXMBSERVER_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_NXMBSERVER_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_NXMBSERVER_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_NXMBSERVER)
+
+include $(APPDIR)/Application.mk
diff --git a/examples/nxmbserver/nxmbserver_main.c b/examples/nxmbserver/nxmbserver_main.c
new file mode 100644
index 000000000..8e8572dda
--- /dev/null
+++ b/examples/nxmbserver/nxmbserver_main.c
@@ -0,0 +1,543 @@
+/****************************************************************************
+ * apps/examples/nxmbserver/nxmbserver_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEFAULT_UNIT_ID  1
+#define DEFAULT_TCP_PORT 502
+#define DEFAULT_BAUDRATE 19200
+
+#define NUM_COILS        100
+#define NUM_DISCRETE     100
+#define NUM_INPUT_REGS   100
+#define NUM_HOLDING_REGS 100
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Modbus type supported by example */
+
+enum transport_type_e
+{
+  TRANSPORT_RTU = 0,
+  TRANSPORT_ASCII,
+  TRANSPORT_TCP
+};
+
+/* Modbus registers */
+
+struct server_data_s
+{
+  uint8_t  coils[NUM_COILS / 8 + 1];
+  uint8_t  discrete[NUM_DISCRETE / 8 + 1];
+  uint16_t input_regs[NUM_INPUT_REGS];
+  uint16_t holding_regs[NUM_HOLDING_REGS];
+};
+
+/* Modbus server configuration */
+
+struct server_config_s
+{
+  enum transport_type_e  transport;
+  enum nxmb_parity_e     parity;
+  FAR const char        *device;
+  FAR const char        *bindaddr;
+  uint32_t               baudrate;
+  uint16_t               port;
+  uint8_t                unit_id;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct server_data_s g_data;
+static volatile bool        g_running = true;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: signal_handler
+ ****************************************************************************/
+
+static void signal_handler(int signo)
+{
+  g_running = false;
+}
+
+/****************************************************************************
+ * Name: show_usage
+ ****************************************************************************/
+
+static void show_usage(FAR const char *progname)
+{
+  printf("Usage: %s [OPTIONS]\n\n", progname);
+  printf("Transport Options:\n");
+  printf("  -t TYPE     Transport type: rtu, ascii, tcp (required)\n");
+  printf("  -d DEVICE   Serial device path (for RTU/ASCII)\n");
+  printf("  -b BAUD     Baud rate (default: %u)\n", DEFAULT_BAUDRATE);
+  printf("  -p PARITY   Parity: none, even, odd (default: even)\n");
+  printf("  -a ADDR     Bind address (for TCP, default: 0.0.0.0)\n");
+  printf("  -P PORT     TCP port (default: %u)\n", DEFAULT_TCP_PORT);
+  printf("\nModbus Options:\n");
+  printf("  -u UNIT     Unit ID (default: %u)\n", DEFAULT_UNIT_ID);
+  printf("\nExample:\n");
+  printf("  %s -t rtu -d /dev/ttyS1 -b 19200\n", progname);
+  printf("  %s -t tcp -P 502\n", progname);
+}
+
+/****************************************************************************
+ * Name: parse_parity
+ ****************************************************************************/
+
+static int parse_parity(FAR const char *str, FAR enum nxmb_parity_e *parity)
+{
+  if (strcmp(str, "none") == 0)
+    {
+      *parity = NXMB_PAR_NONE;
+    }
+  else if (strcmp(str, "even") == 0)
+    {
+      *parity = NXMB_PAR_EVEN;
+    }
+  else if (strcmp(str, "odd") == 0)
+    {
+      *parity = NXMB_PAR_ODD;
+    }
+  else
+    {
+      return -EINVAL;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: parse_transport
+ ****************************************************************************/
+
+static int parse_transport(FAR const char *str,
+                           FAR enum transport_type_e *transport)
+{
+  if (strcmp(str, "rtu") == 0)
+    {
+      *transport = TRANSPORT_RTU;
+    }
+  else if (strcmp(str, "ascii") == 0)
+    {
+      *transport = TRANSPORT_ASCII;
+    }
+  else if (strcmp(str, "tcp") == 0)
+    {
+      *transport = TRANSPORT_TCP;
+    }
+  else
+    {
+      return -EINVAL;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: coils_callback
+ ****************************************************************************/
+
+static int coils_callback(FAR uint8_t *buf, uint16_t addr, uint16_t count,
+                          enum nxmb_regmode_e mode, FAR void *priv)
+{
+  uint16_t byte_idx;
+  uint16_t bit_idx;
+  uint16_t i;
+
+  if (addr + count > NUM_COILS)
+    {
+      return -ENOENT;
+    }
+
+  if (mode == NXMB_REG_READ)
+    {
+      for (i = 0; i < count; i++)
+        {
+          byte_idx = (addr + i) / 8;
+          bit_idx  = (addr + i) % 8;
+
+          if (g_data.coils[byte_idx] & (1 << bit_idx))
+            {
+              buf[i / 8] |= (1 << (i % 8));
+            }
+          else
+            {
+              buf[i / 8] &= ~(1 << (i % 8));
+            }
+        }
+    }
+  else
+    {
+      for (i = 0; i < count; i++)
+        {
+          byte_idx = (addr + i) / 8;
+          bit_idx  = (addr + i) % 8;
+
+          if (buf[i / 8] & (1 << (i % 8)))
+            {
+              g_data.coils[byte_idx] |= (1 << bit_idx);
+            }
+          else
+            {
+              g_data.coils[byte_idx] &= ~(1 << bit_idx);
+            }
+        }
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: discrete_callback
+ ****************************************************************************/
+
+static int discrete_callback(FAR uint8_t *buf, uint16_t addr,
+                             uint16_t count, FAR void *priv)
+{
+  uint16_t byte_idx;
+  uint16_t bit_idx;
+  uint16_t i;
+
+  if (addr + count > NUM_DISCRETE)
+    {
+      return -ENOENT;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      byte_idx = (addr + i) / 8;
+      bit_idx  = (addr + i) % 8;
+
+      if (g_data.discrete[byte_idx] & (1 << bit_idx))
+        {
+          buf[i / 8] |= (1 << (i % 8));
+        }
+      else
+        {
+          buf[i / 8] &= ~(1 << (i % 8));
+        }
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: input_callback
+ ****************************************************************************/
+
+static int input_callback(FAR uint8_t *buf, uint16_t addr, uint16_t count,
+                          FAR void *priv)
+{
+  uint16_t i;
+
+  if (addr + count > NUM_INPUT_REGS)
+    {
+      return -ENOENT;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      buf[i * 2]     = (uint8_t)(g_data.input_regs[addr + i] >> 8);
+      buf[i * 2 + 1] = (uint8_t)(g_data.input_regs[addr + i] & 0xff);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: holding_callback
+ ****************************************************************************/
+
+static int holding_callback(FAR uint8_t *buf, uint16_t addr, uint16_t count,
+                            enum nxmb_regmode_e mode, FAR void *priv)
+{
+  uint16_t i;
+
+  if (addr + count > NUM_HOLDING_REGS)
+    {
+      return -ENOENT;
+    }
+
+  if (mode == NXMB_REG_READ)
+    {
+      for (i = 0; i < count; i++)
+        {
+          buf[i * 2]     = (uint8_t)(g_data.holding_regs[addr + i] >> 8);
+          buf[i * 2 + 1] = (uint8_t)(g_data.holding_regs[addr + i] & 0xff);
+        }
+    }
+  else
+    {
+      for (i = 0; i < count; i++)
+        {
+          g_data.holding_regs[addr + i] =
+            (uint16_t)(buf[i * 2] << 8) | (uint16_t)buf[i * 2 + 1];
+        }
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: init_data
+ ****************************************************************************/
+
+static void init_data(void)
+{
+  uint16_t i;
+
+  memset(&g_data, 0, sizeof(g_data));
+
+  for (i = 0; i < NUM_INPUT_REGS; i++)
+    {
+      g_data.input_regs[i] = i * 10;
+    }
+
+  for (i = 0; i < NUM_HOLDING_REGS; i++)
+    {
+      g_data.holding_regs[i] = i * 100;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmbserver_main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct server_config_s  config;
+  struct nxmb_config_s    mb_config;
+  struct nxmb_callbacks_s callbacks;
+  nxmb_handle_t           handle;
+  bool                    transport_set = false;
+  int                     option;
+  int                     ret;
+
+  /* Default config */
+
+  memset(&config, 0, sizeof(config));
+  config.baudrate = DEFAULT_BAUDRATE;
+  config.parity   = NXMB_PAR_EVEN;
+  config.port     = DEFAULT_TCP_PORT;
+  config.unit_id  = DEFAULT_UNIT_ID;
+
+  /* Handle CLI */
+
+  while ((option = getopt(argc, argv, "t:d:b:p:a:P:u:h")) != -1)
+    {
+      switch (option)
+        {
+          case 't':
+            if (parse_transport(optarg, &config.transport) < 0)
+              {
+                fprintf(stderr, "Error: invalid transport '%s'\n", optarg);
+                return EXIT_FAILURE;
+              }
+
+            transport_set = true;
+            break;
+
+          case 'd':
+            config.device = optarg;
+            break;
+
+          case 'b':
+            config.baudrate = (uint32_t)strtoul(optarg, NULL, 0);
+            break;
+
+          case 'p':
+            if (parse_parity(optarg, &config.parity) < 0)
+              {
+                fprintf(stderr, "Error: invalid parity '%s'\n", optarg);
+                return EXIT_FAILURE;
+              }
+
+            break;
+
+          case 'a':
+            config.bindaddr = optarg;
+            break;
+
+          case 'P':
+            config.port = (uint16_t)strtoul(optarg, NULL, 0);
+            break;
+
+          case 'u':
+            config.unit_id = (uint8_t)strtoul(optarg, NULL, 0);
+            break;
+
+          case 'h':
+          default:
+            show_usage(argv[0]);
+            return (option == 'h') ? EXIT_SUCCESS : EXIT_FAILURE;
+        }
+    }
+
+  /* Validate input */
+
+  if (!transport_set)
+    {
+      fprintf(stderr, "Error: transport type (-t) is required\n\n");
+      show_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  if ((config.transport == TRANSPORT_RTU ||
+       config.transport == TRANSPORT_ASCII) &&
+      config.device == NULL)
+    {
+      fprintf(stderr, "Error: device path (-d) required for RTU/ASCII\n");
+      return EXIT_FAILURE;
+    }
+
+  /* Connect signals */
+
+  signal(SIGINT, signal_handler);
+  signal(SIGTERM, signal_handler);
+
+  /* Init modbus data */
+
+  init_data();
+
+  /* Init modbus stack */
+
+  memset(&callbacks, 0, sizeof(callbacks));
+  callbacks.coil_cb     = coils_callback;
+  callbacks.discrete_cb = discrete_callback;
+  callbacks.input_cb    = input_callback;
+  callbacks.holding_cb  = holding_callback;
+
+  memset(&mb_config, 0, sizeof(mb_config));
+  mb_config.unit_id   = config.unit_id;
+  mb_config.is_client = false;
+
+  switch (config.transport)
+    {
+      case TRANSPORT_RTU:
+        mb_config.mode                      = NXMB_MODE_RTU;
+        mb_config.transport.serial.devpath  = config.device;
+        mb_config.transport.serial.baudrate = config.baudrate;
+        mb_config.transport.serial.parity   = config.parity;
+        printf("Starting Modbus RTU server on %s (baud=%" PRId32
+               ", unit=%u)\n", config.device, config.baudrate,
+               config.unit_id);
+        break;
+
+      case TRANSPORT_ASCII:
+        mb_config.mode                      = NXMB_MODE_ASCII;
+        mb_config.transport.serial.devpath  = config.device;
+        mb_config.transport.serial.baudrate = config.baudrate;
+        mb_config.transport.serial.parity   = config.parity;
+        printf("Starting Modbus ASCII server on %s (baud=%" PRId32
+               ", unit=%u)\n", config.device, config.baudrate,
+               config.unit_id);
+        break;
+
+      case TRANSPORT_TCP:
+        mb_config.mode                   = NXMB_MODE_TCP;
+        mb_config.transport.tcp.port     = config.port;
+        mb_config.transport.tcp.bindaddr = config.bindaddr;
+        printf("Starting Modbus TCP server on port %u (unit=%u)\n",
+               config.port, config.unit_id);
+        break;
+    }
+
+  ret = nxmb_create(&handle, &mb_config);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: failed to create Modbus context: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = nxmb_set_callbacks(handle, &callbacks);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: failed to set callbacks: %d\n", ret);
+      nxmb_destroy(handle);
+      return EXIT_FAILURE;
+    }
+
+  ret = nxmb_enable(handle);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: failed to enable context: %d\n", ret);
+      nxmb_destroy(handle);
+      return EXIT_FAILURE;
+    }
+
+  printf("Server running. Press Ctrl+C to stop.\n");
+  printf("Register map:\n");
+  printf("  Coils:          1-%d (read/write)\n", NUM_COILS);
+  printf("  Discrete:       1-%d (read-only)\n", NUM_DISCRETE);
+  printf("  Input regs:     1-%d (read-only, value=addr*10)\n",
+         NUM_INPUT_REGS);
+  printf("  Holding regs:   1-%d (read/write, initial=addr*100)\n",
+         NUM_HOLDING_REGS);
+
+  /* Poll loop */
+
+  while (g_running)
+    {
+      ret = nxmb_poll(handle);
+      if (ret < 0 && ret != -EAGAIN)
+        {
+          fprintf(stderr, "Error: poll failed: %d\n", ret);
+          break;
+        }
+    }
+
+  printf("\nShutting down...\n");
+  nxmb_disable(handle);
+  nxmb_destroy(handle);
+
+  return EXIT_SUCCESS;
+}
diff --git a/include/nxmodbus/nxmb_client.h b/include/nxmodbus/nxmb_client.h
new file mode 100644
index 000000000..49c10e542
--- /dev/null
+++ b/include/nxmodbus/nxmb_client.h
@@ -0,0 +1,261 @@
+/****************************************************************************
+ * apps/include/nxmodbus/nxmb_client.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INCLUDE_NXMODBUS_NXMB_CLIENT_H
+#define __APPS_INCLUDE_NXMODBUS_NXMB_CLIENT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/compiler.h>
+#include <nuttx/config.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Name: nxmb_read_coils
+ *
+ * Description:
+ *   Read coil values from a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The first coil address to read.
+ *   count - The number of coils to read.
+ *   buf   - The destination buffer for the returned coil values.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_read_coils(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                    uint16_t count, FAR uint8_t *buf);
+
+/****************************************************************************
+ * Name: nxmb_read_discrete
+ *
+ * Description:
+ *   Read discrete input values from a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The first discrete input address to read.
+ *   count - The number of discrete inputs to read.
+ *   buf   - The destination buffer for the returned values.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_read_discrete(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                       uint16_t count, FAR uint8_t *buf);
+
+/****************************************************************************
+ * Name: nxmb_read_input
+ *
+ * Description:
+ *   Read input registers from a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The first input register address to read.
+ *   count - The number of registers to read.
+ *   buf   - The destination buffer for the returned register values.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_read_input(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                    uint16_t count, FAR uint16_t *buf);
+
+/****************************************************************************
+ * Name: nxmb_read_holding
+ *
+ * Description:
+ *   Read holding registers from a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The first holding register address to read.
+ *   count - The number of registers to read.
+ *   buf   - The destination buffer for the returned register values.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_read_holding(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                      uint16_t count, FAR uint16_t *buf);
+
+/****************************************************************************
+ * Name: nxmb_write_coil
+ *
+ * Description:
+ *   Write a single coil on a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The coil address to update.
+ *   value - The coil state to write.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_write_coil(nxmb_handle_t h, uint8_t uid, uint16_t addr, bool value);
+
+/****************************************************************************
+ * Name: nxmb_write_holding
+ *
+ * Description:
+ *   Write a single holding register on a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The holding register address to update.
+ *   value - The register value to write.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_write_holding(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                       uint16_t value);
+
+/****************************************************************************
+ * Name: nxmb_write_coils
+ *
+ * Description:
+ *   Write multiple coils on a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The first coil address to update.
+ *   count - The number of coils to write.
+ *   buf   - The source buffer containing coil values.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_write_coils(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                     uint16_t count, FAR const uint8_t *buf);
+
+/****************************************************************************
+ * Name: nxmb_write_holdings
+ *
+ * Description:
+ *   Write multiple holding registers on a remote unit.
+ *
+ * Input Parameters:
+ *   h     - The NxModbus client instance.
+ *   uid   - The remote unit identifier.
+ *   addr  - The first holding register address to update.
+ *   count - The number of registers to write.
+ *   buf   - The source buffer containing register values.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_write_holdings(nxmb_handle_t h, uint8_t uid, uint16_t addr,
+                        uint16_t count, FAR const uint16_t *buf);
+
+/****************************************************************************
+ * Name: nxmb_readwrite_holdings
+ *
+ * Description:
+ *   Perform a combined read/write of holding registers on a remote unit
+ *   using FC23 (0x17). The write is performed before the read on the
+ *   server side.
+ *
+ * Input Parameters:
+ *   h        - The NxModbus client instance.
+ *   uid      - The remote unit identifier.
+ *   rd_addr  - The first holding register address to read.
+ *   rd_count - The number of registers to read (1-125).
+ *   rd_buf   - The destination buffer for the returned register values.
+ *   wr_addr  - The first holding register address to write.
+ *   wr_count - The number of registers to write (1-121).
+ *   wr_buf   - The source buffer containing register values to write.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_readwrite_holdings(nxmb_handle_t h, uint8_t uid, uint16_t rd_addr,
+                            uint16_t rd_count, FAR uint16_t *rd_buf,
+                            uint16_t wr_addr, uint16_t wr_count,
+                            FAR const uint16_t *wr_buf);
+
+/****************************************************************************
+ * Name: nxmb_set_timeout
+ *
+ * Description:
+ *   Set the client-side response timeout.
+ *
+ * Input Parameters:
+ *   h          - The NxModbus client instance.
+ *   timeout_ms - The timeout in milliseconds.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_set_timeout(nxmb_handle_t h, uint32_t timeout_ms);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_INCLUDE_NXMODBUS_NXMB_CLIENT_H */
diff --git a/include/nxmodbus/nxmb_raw.h b/include/nxmodbus/nxmb_raw.h
new file mode 100644
index 000000000..e01f42598
--- /dev/null
+++ b/include/nxmodbus/nxmb_raw.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+ * apps/include/nxmodbus/nxmb_raw.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INCLUDE_NXMODBUS_NXMB_RAW_H
+#define __APPS_INCLUDE_NXMODBUS_NXMB_RAW_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/compiler.h>
+#include <nuttx/config.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_RAW_HDR_SIZE 8
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Name: nxmb_raw_submit_rx
+ *
+ * Description:
+ *   Submit a received raw ADU into the NxModbus protocol core.
+ *
+ * Input Parameters:
+ *   h   - The NxModbus instance receiving the frame.
+ *   adu - The received raw ADU container.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_raw_submit_rx(nxmb_handle_t h, FAR const struct nxmb_adu_s *adu);
+
+/****************************************************************************
+ * Name: nxmb_raw_put_header
+ *
+ * Description:
+ *   Serialize the 8-byte MBAP+FC header for an ADU.
+ *
+ * Input Parameters:
+ *   adu - The ADU providing the header fields.
+ *   hdr - The destination buffer for the serialized header.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+void nxmb_raw_put_header(FAR const struct nxmb_adu_s *adu, FAR uint8_t *hdr);
+
+/****************************************************************************
+ * Name: nxmb_raw_get_header
+ *
+ * Description:
+ *   Parse the 8-byte MBAP+FC header into an ADU structure.
+ *
+ * Input Parameters:
+ *   adu - The destination ADU structure.
+ *   hdr - The source buffer containing the serialized header.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+void nxmb_raw_get_header(FAR struct nxmb_adu_s *adu, FAR const uint8_t *hdr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_INCLUDE_NXMODBUS_NXMB_RAW_H */
diff --git a/include/nxmodbus/nxmodbus.h b/include/nxmodbus/nxmodbus.h
new file mode 100644
index 000000000..f5307989b
--- /dev/null
+++ b/include/nxmodbus/nxmodbus.h
@@ -0,0 +1,378 @@
+/****************************************************************************
+ * apps/include/nxmodbus/nxmodbus.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INCLUDE_NXMODBUS_NXMODBUS_H
+#define __APPS_INCLUDE_NXMODBUS_NXMODBUS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/compiler.h>
+#include <nuttx/config.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_TCP_PORT_DEFAULT 502
+
+/* Maximum number of PDU data bytes (everything after the FC byte).
+ * Configured via Kconfig (CONFIG_NXMODBUS_ADU_DATA_MAX).
+ */
+
+#define NXMB_ADU_DATA_MAX CONFIG_NXMODBUS_ADU_DATA_MAX
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Opaque handle to an NxModbus instance. */
+
+typedef FAR struct nxmb_context_s *nxmb_handle_t;
+
+/* Custom frame handler */
+
+typedef CODE int (*nxmb_custom_fc_handler_t)(nxmb_handle_t ctx);
+
+/* Modbus Application Data Unit container.
+ *
+ * Single canonical ADU representation shared by the protocol core and all
+ * transports. Transports parse incoming wire frames into this struct and
+ * serialize this struct back out on transmit.
+ *
+ *   trans_id, proto_id, length - MBAP header fields (TCP-only).
+ *   unit_id                    - Modbus address byte.
+ *   fc                         - Modbus function code byte.
+ *   data[]                     - PDU payload after the function code.
+ *   crc                        - RTU/ASCII checksum (serial-only).
+ *
+ * The MBAP `length` field counts the bytes following it: unit_id + fc +
+ * data_count. Transports that don't carry MBAP still populate this field
+ * with the same value so that consumers can derive data_count uniformly:
+ *     data_count = adu.length - 2
+ */
+
+struct nxmb_adu_s
+{
+  uint16_t trans_id;
+  uint16_t proto_id;
+  uint16_t length;
+  uint8_t  unit_id;
+  uint8_t  fc;
+  uint8_t  data[NXMB_ADU_DATA_MAX];
+  uint16_t crc;
+};
+
+/* Callback used by raw ADU mode to emit a fully-formed frame. */
+
+typedef int (*nxmb_raw_tx_cb_t)(FAR const struct nxmb_adu_s *adu,
+                                FAR void *user_data);
+
+/* Supported transport modes. */
+
+enum nxmb_mode_e
+{
+  NXMB_MODE_INVAL = 0,
+  NXMB_MODE_RTU,                /* Modbus RTU */
+  NXMB_MODE_ASCII,              /* Modbus ASCII */
+  NXMB_MODE_TCP,                /* Modbus TCP */
+  NXMB_MODE_RAW                 /* Custom ADU transport */
+};
+
+/* Serial parity configuration. */
+
+enum nxmb_parity_e
+{
+  NXMB_PAR_NONE = 0,
+  NXMB_PAR_EVEN,
+  NXMB_PAR_ODD
+};
+
+/* Register access direction passed to callbacks. */
+
+enum nxmb_regmode_e
+{
+  NXMB_REG_READ = 0,
+  NXMB_REG_WRITE
+};
+
+/* Standard Modbus exception codes. */
+
+enum nxmb_exception_e
+{
+  NXMB_EX_NONE                 = 0x00,
+  NXMB_EX_ILLEGAL_FUNCTION     = 0x01,
+  NXMB_EX_ILLEGAL_DATA_ADDRESS = 0x02,
+  NXMB_EX_ILLEGAL_DATA_VALUE   = 0x03,
+  NXMB_EX_DEVICE_FAILURE       = 0x04,
+  NXMB_EX_ACKNOWLEDGE          = 0x05,
+  NXMB_EX_DEVICE_BUSY          = 0x06,
+  NXMB_EX_MEMORY_PARITY_ERROR  = 0x08,
+  NXMB_EX_GATEWAY_PATH_FAILED  = 0x0a,
+  NXMB_EX_GATEWAY_TGT_FAILED   = 0x0b
+};
+
+/* Serial transport configuration. */
+
+struct nxmb_serial_config_s
+{
+  FAR const char     *devpath;
+  enum nxmb_parity_e  parity;
+  uint32_t            baudrate;
+};
+
+/* TCP transport configuration.
+ *
+ * For slave mode, bindaddr selects the local address and port selects the
+ * listening port. For client mode, host selects the remote endpoint and
+ * port selects the remote port.
+ */
+
+struct nxmb_tcp_config_s
+{
+  FAR const char *host;
+  FAR const char *bindaddr;
+  uint16_t        port;
+};
+
+/* Raw ADU transport configuration. */
+
+struct nxmb_raw_config_s
+{
+  FAR void         *user_data;
+  nxmb_raw_tx_cb_t  tx_cb;
+};
+
+union nxmb_transport_config_u
+{
+  struct nxmb_serial_config_s serial;
+  struct nxmb_tcp_config_s    tcp;
+  struct nxmb_raw_config_s    raw;
+};
+
+/* Generic NxModbus instance configuration. */
+
+struct nxmb_config_s
+{
+  union nxmb_transport_config_u transport;
+  enum nxmb_mode_e              mode;
+  uint8_t                       unit_id;
+  bool                          is_client;
+};
+
+/* Application callback table for Modbus data model access.
+ *
+ * The protocol stack passes buffers covering a contiguous address range and
+ * the application fills or consumes them depending on the register mode.
+ */
+
+struct nxmb_callbacks_s
+{
+  CODE int (*coil_cb)(FAR uint8_t *buf, uint16_t addr, uint16_t ncoils,
+                      enum nxmb_regmode_e mode, FAR void *priv);
+  CODE int (*discrete_cb)(FAR uint8_t *buf, uint16_t addr,
+                          uint16_t ndiscrete, FAR void *priv);
+  CODE int (*input_cb)(FAR uint8_t *buf, uint16_t addr, uint16_t nregs,
+                       FAR void *priv);
+  CODE int (*holding_cb)(FAR uint8_t *buf, uint16_t addr, uint16_t nregs,
+                         enum nxmb_regmode_e mode, FAR void *priv);
+  FAR void *priv;
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Name: nxmb_create
+ *
+ * Description:
+ *   Create and initialize an NxModbus instance. This function allocates one
+ *   entry from the static NxModbus instance pool and initializes it for the
+ *   selected transport mode.
+ *
+ * Input Parameters:
+ *   handle - A location to receive the opaque NxModbus handle.
+ *   config - The transport and role configuration for the new instance.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_create(FAR nxmb_handle_t *handle,
+                FAR const struct nxmb_config_s *config);
+
+/****************************************************************************
+ * Name: nxmb_destroy
+ *
+ * Description:
+ *   Destroy a previously created NxModbus instance. This function releases
+ *   a handle previously obtained from nxmb_create().
+ *
+ * Input Parameters:
+ *   handle - The NxModbus instance to destroy.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_destroy(nxmb_handle_t handle);
+
+/****************************************************************************
+ * Name: nxmb_set_callbacks
+ *
+ * Description:
+ *   Register the application callback table for an instance. The registered
+ *   callback table defines how the application exposes coils, discrete
+ *   inputs, input registers, and holding registers to the protocol stack.
+ *
+ * Input Parameters:
+ *   handle - The NxModbus instance to update.
+ *   cbs    - The callback table to associate with the instance.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_set_callbacks(nxmb_handle_t handle,
+                       FAR const struct nxmb_callbacks_s *cbs);
+
+/****************************************************************************
+ * Name: nxmb_enable
+ *
+ * Description:
+ *   Enable the configured transport and protocol handling. This function
+ *   prepares the configured transport backend so the instance can start
+ *   sending or receiving Modbus ADUs.
+ *
+ * Input Parameters:
+ *   handle - The NxModbus instance to enable.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_enable(nxmb_handle_t handle);
+
+/****************************************************************************
+ * Name: nxmb_disable
+ *
+ * Description:
+ *   Disable an active NxModbus instance. This function stops frame
+ *   processing and releases any transport state held by an enabled instance.
+ *
+ * Input Parameters:
+ *   handle - The NxModbus instance to disable.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_disable(nxmb_handle_t handle);
+
+/****************************************************************************
+ * Name: nxmb_poll
+ *
+ * Description:
+ *   Execute one server-side polling iteration. This function performs a
+ *   single poll of the transport backend and processes one server-side
+ *   Modbus transaction when data is available.
+ *
+ * Input Parameters:
+ *   handle - The NxModbus instance to poll.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_poll(nxmb_handle_t handle);
+
+/****************************************************************************
+ * Name: nxmb_set_server_id
+ *
+ * Description:
+ *   Configure the data returned by FC17 (Report Server ID). The response
+ *   contains the server ID byte, a run indicator, and optional additional
+ *   data supplied by the application.
+ *
+ * Input Parameters:
+ *   handle     - The NxModbus instance to update.
+ *   id         - The server ID byte.
+ *   is_running - True if the device is in a running state.
+ *   additional - Optional additional data bytes (may be NULL).
+ *   addlen     - Length of additional data.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_set_server_id(nxmb_handle_t handle, uint8_t id, bool is_running,
+                       FAR const uint8_t *additional, uint16_t addlen);
+
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+/****************************************************************************
+ * Name: nxmb_register_custom_fc
+ *
+ * Description:
+ *   Register a custom Modbus function code handler for an instance.
+ *   Custom handlers are checked after standard handlers, so standard
+ *   function codes cannot be overridden.
+ *
+ * Input Parameters:
+ *   h       - The NxModbus instance handle.
+ *   fc      - The custom function code to register.
+ *   handler - The handler function. Receives the instance handle and
+ *             operates on ctx->adu in place: the request fields
+ *             (adu.fc, adu.data[], adu.length) are overwritten with the
+ *             response. Returns zero on success or a negated errno value
+ *             on failure.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int nxmb_register_custom_fc(nxmb_handle_t h, uint8_t fc,
+                            nxmb_custom_fc_handler_t handler);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_INCLUDE_NXMODBUS_NXMODBUS_H */
diff --git a/industry/nxmodbus/CMakeLists.txt b/industry/nxmodbus/CMakeLists.txt
new file mode 100644
index 000000000..35be513e4
--- /dev/null
+++ b/industry/nxmodbus/CMakeLists.txt
@@ -0,0 +1,68 @@
+# ##############################################################################
+# apps/industry/nxmodbus/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_INDUSTRY_NXMODBUS)
+
+  set(CSRCS)
+
+  # Core sources
+  list(APPEND CSRCS core/nxmb_context.c core/nxmb_utils.c)
+
+  if(CONFIG_NXMODBUS_SERVER)
+    list(APPEND CSRCS core/nxmb_server.c)
+    list(APPEND CSRCS core/nxmb_func.c)
+    list(APPEND CSRCS core/nxmb_func_coils.c core/nxmb_func_discrete.c)
+    list(APPEND CSRCS core/nxmb_func_holding.c core/nxmb_func_input.c)
+    list(APPEND CSRCS core/nxmb_func_diag.c core/nxmb_func_other.c)
+  endif()
+
+  if(CONFIG_NXMODBUS_CLIENT)
+    list(APPEND CSRCS core/nxmb_client.c)
+  endif()
+
+  # Transport layer sources
+  if(CONFIG_NXMODBUS_RTU OR CONFIG_NXMODBUS_ASCII)
+    list(APPEND CSRCS transport/nxmb_serial_common.c)
+  endif()
+
+  if(CONFIG_NXMODBUS_RTU)
+    list(APPEND CSRCS transport/nxmb_crc.c transport/nxmb_serial.c)
+  endif()
+
+  if(CONFIG_NXMODBUS_ASCII)
+    list(APPEND CSRCS transport/nxmb_lrc.c transport/nxmb_ascii.c)
+  endif()
+
+  if(CONFIG_NXMODBUS_RAW_ADU)
+    list(APPEND CSRCS transport/nxmb_raw.c)
+  endif()
+
+  if(CONFIG_NXMODBUS_TCP)
+    list(APPEND CSRCS transport/nxmb_tcp.c)
+  endif()
+
+  if(CSRCS)
+    target_include_directories(apps PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+    target_sources(apps PRIVATE ${CSRCS})
+  endif()
+
+endif()
diff --git a/industry/nxmodbus/Kconfig b/industry/nxmodbus/Kconfig
new file mode 100644
index 000000000..31f555fe7
--- /dev/null
+++ b/industry/nxmodbus/Kconfig
@@ -0,0 +1,245 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+menuconfig INDUSTRY_NXMODBUS
+	bool "NxModbus - New Modbus Stack"
+	default n
+	---help---
+		NxModbus is a modern Modbus stack for NuttX with multi-instance
+		support, per-instance register callbacks, and pluggable transport
+		backends (RTU, ASCII, TCP, Raw ADU).
+
+		This implementation follows NuttX coding standards and is
+		designed for upstream contribution to nuttx-apps.
+
+if INDUSTRY_NXMODBUS
+
+config NXMODBUS_SERVER
+	bool "Server (slave) support"
+	default y
+	---help---
+		Enable Modbus server (slave) support. The server processes
+		incoming Modbus requests and calls registered register
+		callbacks.
+
+config NXMODBUS_CLIENT
+	bool "Client (master) support"
+	default n
+	---help---
+		Enable Modbus client (master) support. The client sends
+		Modbus requests to a server and receives responses.
+
+config NXMODBUS_RTU
+	bool "Modbus RTU mode"
+	default y
+	---help---
+		Enable Modbus RTU (Remote Terminal Unit) serial transmission
+		mode. Uses binary encoding with CRC16 error checking.
+
+config NXMODBUS_ASCII
+	bool "Modbus ASCII mode"
+	default n
+	---help---
+		Enable Modbus ASCII serial transmission mode. Uses
+		hex-encoded text with LRC error checking. Slower but
+		more human-readable than RTU.
+
+config NXMODBUS_TCP
+	bool "Modbus TCP mode"
+	default n
+	depends on NET_TCP
+	---help---
+		Enable Modbus TCP support. Modbus frames are encapsulated
+		in TCP/IP using the MBAP header format. Requires network
+		stack with TCP support.
+
+config NXMODBUS_RAW_ADU
+	bool "Raw ADU transport support"
+	default n
+	---help---
+		Enable raw ADU (Application Data Unit) transport mode.
+		The application provides callbacks for transmitting and
+		receiving raw Modbus frames. This enables custom transports
+		such as TLS, CAN, BLE, or MQTT.
+
+config NXMODBUS_MAX_INSTANCES
+	int "Maximum number of NxModbus instances"
+	default 1
+	range 1 16
+	---help---
+		Maximum number of simultaneous NxModbus instances. Each
+		instance can use a different transport (RTU, TCP, etc.)
+		and configuration. Instances are allocated from a static
+		pool at compile time.
+
+config NXMODBUS_ADU_DATA_MAX
+	int "ADU data buffer size in bytes"
+	default 252
+	range 4 252
+	---help---
+		Size of the data[] payload in struct nxmb_adu_s, in bytes.
+		This is the PDU body after the function code. The Modbus
+		specification allows up to 252 data bytes (1 fc + 252 data =
+		253-byte PDU max). Reduce this value to save RAM on
+		resource-constrained systems.
+
+config NXMODBUS_REP_SERVER_ID_BUF
+	int "Report Server ID buffer size"
+	default 32
+	range 4 253
+	---help---
+		Size of the buffer used by FC17 (Report Server ID).
+		This buffer holds the server ID byte, run indicator, and
+		optional additional data configured via nxmb_set_server_id().
+
+config NXMODBUS_ASCII_TIMEOUT_SEC
+	int "ASCII character timeout (seconds)"
+	default 1
+	range 1 60
+	depends on NXMODBUS_ASCII
+	---help---
+		Character timeout for Modbus ASCII mode in seconds. If no
+		character is received within this period, the current frame
+		is discarded. Default is 1 second per the Modbus specification.
+
+config NXMODBUS_CLIENT_TIMEOUT_MS
+	int "Client default response timeout (ms)"
+	default 1000
+	range 100 60000
+	depends on NXMODBUS_CLIENT
+	---help---
+		Default response timeout for client (master) mode in
+		milliseconds. If no response is received from the server
+		within this period, the request fails with ETIMEDOUT.
+		Can be overridden at runtime via nxmb_set_timeout().
+
+config NXMODBUS_TCP_MAX_CLIENTS
+	int "Maximum simultaneous TCP client connections"
+	default 1
+	range 1 8
+	depends on NXMODBUS_TCP
+	---help---
+		Maximum number of simultaneous TCP client connections
+		accepted by a Modbus TCP server instance. Each connection
+		uses one file descriptor. Set to 1 for minimal resource
+		usage.
+
+config NXMODBUS_TCP_TIMEOUT_SEC
+	int "TCP idle connection timeout (seconds)"
+	default 60
+	range 1 3600
+	depends on NXMODBUS_TCP
+	---help---
+		Idle timeout for TCP connections in seconds. If no data is
+		received on a client connection within this period, the
+		connection is closed. Set to a higher value for slow networks.
+
+config NXMODBUS_RTU_IDLE_TIMEOUT_MS
+	int "RTU inter-frame idle timeout (ms)"
+	default 50
+	range 1 1000
+	depends on NXMODBUS_RTU
+	---help---
+		Fallback idle timeout in milliseconds used by the RTU
+		transport when waiting for a new frame via select(). This
+		is the maximum time to block waiting for data when no
+		frame is in progress. The T3.5 character timing is still
+		used for frame delimiting within an active reception.
+
+menu "Function Code Selection"
+
+config NXMODBUS_FUNC_READ_COILS
+	bool "FC01 Read Coils"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC01 Read Coils function code handler.
+
+config NXMODBUS_FUNC_READ_DISCRETE
+	bool "FC02 Read Discrete Inputs"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC02 Read Discrete Inputs function code handler.
+
+config NXMODBUS_FUNC_READ_HOLDING
+	bool "FC03 Read Holding Registers"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC03 Read Holding Registers function code handler.
+
+config NXMODBUS_FUNC_READ_INPUT
+	bool "FC04 Read Input Registers"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC04 Read Input Registers function code handler.
+
+config NXMODBUS_FUNC_WRITE_COIL
+	bool "FC05 Write Single Coil"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC05 Write Single Coil function code handler.
+
+config NXMODBUS_FUNC_WRITE_HOLDING
+	bool "FC06 Write Single Holding Register"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC06 Write Single Holding Register function
+		code handler.
+
+config NXMODBUS_FUNC_DIAGNOSTICS
+	bool "FC08 Diagnostics"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC08 Diagnostics function code handler.
+		Only sub-function 0x0000 (Return Query Data) is supported.
+
+config NXMODBUS_FUNC_WRITE_COILS
+	bool "FC15 Write Multiple Coils"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC15 Write Multiple Coils function code handler.
+
+config NXMODBUS_FUNC_WRITE_HOLDINGS
+	bool "FC16 Write Multiple Holding Registers"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC16 Write Multiple Holding Registers function
+		code handler.
+
+config NXMODBUS_FUNC_REPORT_SERVER_ID
+	bool "FC17 Report Server ID"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC17 Report Server ID function code handler.
+
+config NXMODBUS_FUNC_READWRITE_HOLDINGS
+	bool "FC23 Read/Write Multiple Holding Registers"
+	default y
+	depends on NXMODBUS_SERVER
+	---help---
+		Enable FC23 Read/Write Multiple Holding Registers
+		function code handler.
+
+endmenu # Function Code Selection
+
+config NXMODBUS_CUSTOM_FC
+	bool "Custom function code extension support"
+	default y
+	depends on NXMODBUS
+	---help---
+		Enable support for registering custom Modbus function
+		code handlers. Applications can extend the Modbus
+		function code set via nxmb_register_custom_fc().
+
+endif # INDUSTRY_NXMODBUS
diff --git a/industry/nxmodbus/Make.defs b/industry/nxmodbus/Make.defs
new file mode 100644
index 000000000..539b48d64
--- /dev/null
+++ b/industry/nxmodbus/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/modbus/nxmodbus/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_INDUSTRY_NXMODBUS),)
+CONFIGURED_APPS += $(APPDIR)/industry/nxmodbus
+endif
diff --git a/industry/nxmodbus/Makefile b/industry/nxmodbus/Makefile
new file mode 100644
index 000000000..64caacdba
--- /dev/null
+++ b/industry/nxmodbus/Makefile
@@ -0,0 +1,76 @@
+############################################################################
+# apps/industry/nxmodbus/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# NxModbus Library
+
+ifeq ($(CONFIG_INDUSTRY_NXMODBUS),y)
+
+# Core sources
+CSRCS := core/nxmb_context.c
+CSRCS += core/nxmb_utils.c
+
+ifeq ($(CONFIG_NXMODBUS_SERVER),y)
+CSRCS += core/nxmb_server.c
+CSRCS += core/nxmb_func.c
+CSRCS += core/nxmb_func_coils.c
+CSRCS += core/nxmb_func_discrete.c
+CSRCS += core/nxmb_func_holding.c
+CSRCS += core/nxmb_func_input.c
+CSRCS += core/nxmb_func_diag.c
+CSRCS += core/nxmb_func_other.c
+endif
+
+ifeq ($(CONFIG_NXMODBUS_CLIENT),y)
+CSRCS += core/nxmb_client.c
+endif
+
+# Transport layer sources
+ifneq (,$(filter y,$(CONFIG_NXMODBUS_RTU) $(CONFIG_NXMODBUS_ASCII)))
+CSRCS += transport/nxmb_serial_common.c
+endif
+
+ifeq ($(CONFIG_NXMODBUS_RTU),y)
+CSRCS += transport/nxmb_crc.c
+CSRCS += transport/nxmb_serial.c
+endif
+
+ifeq ($(CONFIG_NXMODBUS_ASCII),y)
+CSRCS += transport/nxmb_lrc.c
+CSRCS += transport/nxmb_ascii.c
+endif
+
+ifeq ($(CONFIG_NXMODBUS_RAW_ADU),y)
+CSRCS += transport/nxmb_raw.c
+endif
+
+ifeq ($(CONFIG_NXMODBUS_TCP),y)
+CSRCS += transport/nxmb_tcp.c
+endif
+
+# Include private headers
+CFLAGS += ${INCDIR_PREFIX}$(CURDIR)
+
+endif
+
+include $(APPDIR)/Application.mk
diff --git a/industry/nxmodbus/core/nxmb_client.c b/industry/nxmodbus/core/nxmb_client.c
new file mode 100644
index 000000000..24b264f92
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_client.c
@@ -0,0 +1,739 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_client.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <nxmodbus/nxmb_client.h>
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct nxmb_client_state_s
+{
+  uint32_t timeout_ms;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int nxmb_client_tx_wait_rx(nxmb_handle_t ctx,
+                                  uint8_t expected_uid, uint8_t expected_fc);
+static int nxmb_client_validate_response(nxmb_handle_t ctx,
+                                         uint8_t expected_uid,
+                                         uint8_t expected_fc);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_exception_to_errno
+ ****************************************************************************/
+
+static int nxmb_exception_to_errno(uint8_t exception)
+{
+  switch (exception)
+    {
+      case NXMB_EX_ILLEGAL_FUNCTION:
+        return -ENXIO;
+
+      case NXMB_EX_ILLEGAL_DATA_ADDRESS:
+        return -EFAULT;
+
+      case NXMB_EX_ILLEGAL_DATA_VALUE:
+        return -EINVAL;
+
+      case NXMB_EX_DEVICE_FAILURE:
+        return -EIO;
+
+      case NXMB_EX_ACKNOWLEDGE:
+        return -EBUSY;
+
+      case NXMB_EX_DEVICE_BUSY:
+        return -EBUSY;
+
+      default:
+        return -EPROTO;
+    }
+}
+
+/****************************************************************************
+ * Name: nxmb_client_validate_response
+ ****************************************************************************/
+
+static int nxmb_client_validate_response(nxmb_handle_t ctx,
+                                         uint8_t expected_uid,
+                                         uint8_t expected_fc)
+{
+  uint8_t rx_uid;
+  uint8_t rx_fc;
+
+  if (ctx->adu.length < 2)
+    {
+      return -EPROTO;
+    }
+
+  rx_uid = ctx->adu.unit_id;
+  rx_fc  = ctx->adu.fc;
+
+  if (rx_uid != expected_uid)
+    {
+      return -EPROTO;
+    }
+
+  if (rx_fc == (expected_fc | 0x80))
+    {
+      if (ctx->adu.length < 3)
+        {
+          return -EPROTO;
+        }
+
+      return nxmb_exception_to_errno(ctx->adu.data[0]);
+    }
+
+  if (rx_fc != expected_fc)
+    {
+      return -EPROTO;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_client_tx_wait_rx
+ ****************************************************************************/
+
+static int nxmb_client_tx_wait_rx(nxmb_handle_t ctx, uint8_t expected_uid,
+                                  uint8_t expected_fc)
+{
+  FAR struct nxmb_client_state_s *state;
+  uint64_t                        deadline;
+  int                             ret;
+
+  if (ctx == NULL || ctx->client_state == NULL)
+    {
+      return -EINVAL;
+    }
+
+  state = (FAR struct nxmb_client_state_s *)ctx->client_state;
+
+  ret = ctx->transport_ops->send(ctx);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  /* Broadcast frames do not receive a response */
+
+  if (expected_uid == NXMB_ADDRESS_BROADCAST)
+    {
+      return OK;
+    }
+
+  deadline = nxmb_util_clock_ms() + state->timeout_ms;
+
+  for (; ; )
+    {
+      if (nxmb_util_clock_ms() >= deadline)
+        {
+          return -ETIMEDOUT;
+        }
+
+      ret = ctx->transport_ops->receive(ctx);
+      if (ret > 0)
+        {
+          return nxmb_client_validate_response(ctx, expected_uid,
+                                               expected_fc);
+        }
+      else if (ret < 0 && ret != -EAGAIN)
+        {
+          return ret;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: nxmb_client_read_bits
+ *
+ * Description:
+ *   Common helper for FC01 (Read Coils) and FC02 (Read Discrete Inputs).
+ *
+ ****************************************************************************/
+
+static int nxmb_client_read_bits(nxmb_handle_t ctx, uint8_t uid, uint8_t fc,
+                                 uint16_t addr, uint16_t count,
+                                 FAR uint8_t *buf)
+{
+  uint16_t nbytes;
+  int      ret;
+
+  nbytes = (count + 7) / 8;
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = fc;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], count);
+  ctx->adu.length = 6;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, fc);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (ctx->adu.length < (3 + nbytes) || ctx->adu.data[0] != nbytes)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  memcpy(buf, &ctx->adu.data[1], nbytes);
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_client_read_regs
+ *
+ * Description:
+ *   Common helper for FC03 (Read Holding) and FC04 (Read Input) registers.
+ *
+ ****************************************************************************/
+
+static int nxmb_client_read_regs(nxmb_handle_t ctx, uint8_t uid, uint8_t fc,
+                                 uint16_t addr, uint16_t count,
+                                 FAR uint16_t *buf)
+{
+  uint16_t nbytes;
+  int      ret;
+  int      i;
+
+  nbytes = count * 2;
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = fc;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], count);
+  ctx->adu.length = 6;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, fc);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (ctx->adu.length < (3 + nbytes) || ctx->adu.data[0] != nbytes)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      buf[i] = nxmb_util_get_u16_be(&ctx->adu.data[1 + i * 2]);
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_read_coils
+ ****************************************************************************/
+
+int nxmb_read_coils(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                    uint16_t count, FAR uint8_t *buf)
+{
+  DEBUGASSERT(ctx && buf);
+
+  if (uid == NXMB_ADDRESS_BROADCAST || count == 0 || count > 2000)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  return nxmb_client_read_bits(ctx, uid, NXMB_FC_READ_COILS, addr,
+                               count, buf);
+}
+
+/****************************************************************************
+ * Name: nxmb_read_discrete
+ ****************************************************************************/
+
+int nxmb_read_discrete(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                       uint16_t count, FAR uint8_t *buf)
+{
+  DEBUGASSERT(ctx && buf);
+
+  if (uid == NXMB_ADDRESS_BROADCAST || count == 0 || count > 2000)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  return nxmb_client_read_bits(ctx, uid, NXMB_FC_READ_DISCRETE, addr,
+                               count, buf);
+}
+
+/****************************************************************************
+ * Name: nxmb_read_input
+ ****************************************************************************/
+
+int nxmb_read_input(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                    uint16_t count, FAR uint16_t *buf)
+{
+  DEBUGASSERT(ctx && buf);
+
+  if (uid == NXMB_ADDRESS_BROADCAST || count == 0 || count > 125)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  return nxmb_client_read_regs(ctx, uid, NXMB_FC_READ_INPUT, addr,
+                               count, buf);
+}
+
+/****************************************************************************
+ * Name: nxmb_read_holding
+ ****************************************************************************/
+
+int nxmb_read_holding(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                      uint16_t count, FAR uint16_t *buf)
+{
+  DEBUGASSERT(ctx && buf);
+
+  if (uid == NXMB_ADDRESS_BROADCAST || count == 0 || count > 125)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  return nxmb_client_read_regs(ctx, uid, NXMB_FC_READ_HOLDING, addr,
+                               count, buf);
+}
+
+/****************************************************************************
+ * Name: nxmb_write_coil
+ ****************************************************************************/
+
+int nxmb_write_coil(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                    bool value)
+{
+  uint16_t coil_value;
+  int      ret;
+
+  DEBUGASSERT(ctx);
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  coil_value = value ? 0xff00 : 0x0000;
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = NXMB_FC_WRITE_COIL;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], coil_value);
+  ctx->adu.length = 6;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, NXMB_FC_WRITE_COIL);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (uid != NXMB_ADDRESS_BROADCAST && ctx->adu.length < 6)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_write_holding
+ ****************************************************************************/
+
+int nxmb_write_holding(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                       uint16_t value)
+{
+  int ret;
+
+  DEBUGASSERT(ctx);
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = NXMB_FC_WRITE_HOLDING;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], value);
+  ctx->adu.length = 6;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, NXMB_FC_WRITE_HOLDING);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (uid != NXMB_ADDRESS_BROADCAST && ctx->adu.length < 6)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_write_coils
+ ****************************************************************************/
+
+int nxmb_write_coils(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                     uint16_t count, FAR const uint8_t *buf)
+{
+  uint16_t nbytes;
+  int      ret;
+
+  DEBUGASSERT(ctx && buf);
+
+  if (count == 0 || count > 1968)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  nbytes = (count + 7) / 8;
+
+  /* Request layout in adu.data[]: addr(2) + count(2) + bcnt(1) + nbytes */
+
+  if (5 + nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return -EMSGSIZE;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = NXMB_FC_WRITE_COILS;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], count);
+  ctx->adu.data[4] = nbytes;
+  memcpy(&ctx->adu.data[5], buf, nbytes);
+  ctx->adu.length = 7 + nbytes;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, NXMB_FC_WRITE_COILS);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (uid != NXMB_ADDRESS_BROADCAST && ctx->adu.length < 6)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_write_holdings
+ ****************************************************************************/
+
+int nxmb_write_holdings(nxmb_handle_t ctx, uint8_t uid, uint16_t addr,
+                        uint16_t count, FAR const uint16_t *buf)
+{
+  uint16_t nbytes;
+  int      ret;
+  int      i;
+
+  DEBUGASSERT(ctx && buf);
+
+  if (count == 0 || count > 123)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  nbytes = count * 2;
+
+  /* Request layout in adu.data[]: addr(2) + count(2) + bcnt(1) + nbytes */
+
+  if (5 + nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return -EMSGSIZE;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = NXMB_FC_WRITE_HOLDINGS;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], count);
+  ctx->adu.data[4] = nbytes;
+
+  for (i = 0; i < count; i++)
+    {
+      nxmb_util_put_u16_be(&ctx->adu.data[5 + i * 2], buf[i]);
+    }
+
+  ctx->adu.length = 7 + nbytes;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, NXMB_FC_WRITE_HOLDINGS);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (uid != NXMB_ADDRESS_BROADCAST && ctx->adu.length < 6)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_readwrite_holdings
+ ****************************************************************************/
+
+int nxmb_readwrite_holdings(nxmb_handle_t ctx, uint8_t uid, uint16_t rd_addr,
+                            uint16_t rd_count, FAR uint16_t *rd_buf,
+                            uint16_t wr_addr, uint16_t wr_count,
+                            FAR const uint16_t *wr_buf)
+{
+  uint16_t rd_nbytes;
+  uint16_t wr_nbytes;
+  int      ret;
+  int      i;
+
+  DEBUGASSERT(ctx && rd_buf && wr_buf);
+
+  if (uid == NXMB_ADDRESS_BROADCAST || rd_count == 0 || rd_count > 125 ||
+      wr_count == 0 || wr_count > 121)
+    {
+      return -EINVAL;
+    }
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  rd_nbytes = rd_count * 2;
+  wr_nbytes = wr_count * 2;
+
+  /* Request layout: rd_addr(2) + rd_qty(2) + wr_addr(2) + wr_qty(2) +
+   * wr_bcnt(1) + wr_nbytes
+   */
+
+  if (9 + wr_nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return -EMSGSIZE;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->adu.unit_id = uid;
+  ctx->adu.fc = NXMB_FC_READWRITE_HOLDINGS;
+  nxmb_util_put_u16_be(&ctx->adu.data[0], rd_addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[2], rd_count);
+  nxmb_util_put_u16_be(&ctx->adu.data[4], wr_addr);
+  nxmb_util_put_u16_be(&ctx->adu.data[6], wr_count);
+  ctx->adu.data[8] = (uint8_t)wr_nbytes;
+
+  for (i = 0; i < wr_count; i++)
+    {
+      nxmb_util_put_u16_be(&ctx->adu.data[9 + i * 2], wr_buf[i]);
+    }
+
+  ctx->adu.length = 11 + wr_nbytes;
+
+  ret = nxmb_client_tx_wait_rx(ctx, uid, NXMB_FC_READWRITE_HOLDINGS);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (ctx->adu.length < (3 + rd_nbytes))
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  if (ctx->adu.data[0] != rd_nbytes)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EPROTO;
+    }
+
+  for (i = 0; i < rd_count; i++)
+    {
+      rd_buf[i] = nxmb_util_get_u16_be(&ctx->adu.data[1 + i * 2]);
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_set_timeout
+ ****************************************************************************/
+
+int nxmb_set_timeout(nxmb_handle_t ctx, uint32_t timeout_ms)
+{
+  FAR struct nxmb_client_state_s *state;
+
+  DEBUGASSERT(ctx && ctx->client_state);
+
+  if (!ctx->is_client)
+    {
+      return -ENOTSUP;
+    }
+
+  state = (FAR struct nxmb_client_state_s *)ctx->client_state;
+
+  pthread_mutex_lock(&ctx->lock);
+  state->timeout_ms = timeout_ms;
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_client_init
+ ****************************************************************************/
+
+int nxmb_client_init(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_client_state_s *state;
+
+  DEBUGASSERT(ctx && ctx->is_client);
+
+  state = calloc(1, sizeof(struct nxmb_client_state_s));
+  if (state == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  state->timeout_ms = CONFIG_NXMODBUS_CLIENT_TIMEOUT_MS;
+
+  ctx->client_state = state;
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_client_deinit
+ ****************************************************************************/
+
+int nxmb_client_deinit(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_client_state_s *state;
+
+  DEBUGASSERT(ctx && ctx->client_state);
+
+  state = (FAR struct nxmb_client_state_s *)ctx->client_state;
+
+  free(state);
+
+  ctx->client_state = NULL;
+
+  return OK;
+}
diff --git a/industry/nxmodbus/core/nxmb_context.c b/industry/nxmodbus/core/nxmb_context.c
new file mode 100644
index 000000000..e6a76c581
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_context.c
@@ -0,0 +1,392 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_context.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+#include <nuttx/debug.h>
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct nxmb_context_s g_nxmb_pool[CONFIG_NXMODBUS_MAX_INSTANCES];
+static pthread_mutex_t       g_pool_lock = PTHREAD_MUTEX_INITIALIZER;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_create
+ *
+ * Description:
+ *   Create a new NxModbus instance.
+ *
+ * Input Parameters:
+ *   handle - Pointer to receive the instance handle
+ *   config - Instance configuration
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_create(FAR nxmb_handle_t *handle,
+                FAR const struct nxmb_config_s *config)
+{
+  nxmb_handle_t ctx = NULL;
+  int           ret = -ENOMEM;
+  int           i;
+
+  DEBUGASSERT(handle && config);
+
+#ifndef CONFIG_NXMODBUS_CLIENT
+  if (config->is_client)
+    {
+      /* Master not supported */
+
+      return -EINVAL;
+    }
+#endif
+
+  pthread_mutex_lock(&g_pool_lock);
+
+  for (i = 0; i < CONFIG_NXMODBUS_MAX_INSTANCES; i++)
+    {
+      if (g_nxmb_pool[i].mode == NXMB_MODE_INVAL)
+        {
+          ctx = &g_nxmb_pool[i];
+          break;
+        }
+    }
+
+  if (ctx != NULL)
+    {
+      memset(ctx, 0, sizeof(struct nxmb_context_s));
+
+      ret = pthread_mutex_init(&ctx->lock, NULL);
+      if (ret == 0)
+        {
+          ctx->mode      = config->mode;
+          ctx->unit_id   = config->unit_id;
+          ctx->is_client = config->is_client;
+
+          switch (config->mode)
+            {
+#ifdef CONFIG_NXMODBUS_RTU
+              case NXMB_MODE_RTU:
+                ctx->transport_cfg.serial = config->transport.serial;
+                ctx->transport_ops        = &g_nxmb_serial_ops;
+                break;
+#endif
+
+#ifdef CONFIG_NXMODBUS_ASCII
+              case NXMB_MODE_ASCII:
+                ctx->transport_cfg.serial = config->transport.serial;
+                ctx->transport_ops        = &g_nxmb_ascii_ops;
+                break;
+#endif
+
+#ifdef CONFIG_NXMODBUS_TCP
+              case NXMB_MODE_TCP:
+                ctx->transport_cfg.tcp = config->transport.tcp;
+                ctx->transport_ops     = &g_nxmb_tcp_ops;
+                break;
+#endif
+
+#ifdef CONFIG_NXMODBUS_RAW_ADU
+              case NXMB_MODE_RAW:
+                ctx->transport_cfg.raw = config->transport.raw;
+                ctx->transport_ops     = &g_nxmb_raw_ops;
+                break;
+#endif
+
+              default:
+                pthread_mutex_destroy(&ctx->lock);
+                memset(ctx, 0, sizeof(struct nxmb_context_s));
+                ret = -EINVAL;
+                goto out;
+            }
+
+          *handle = ctx;
+          ret     = 0;
+        }
+      else
+        {
+          memset(ctx, 0, sizeof(struct nxmb_context_s));
+          ret = -ret;
+        }
+    }
+
+out:
+  pthread_mutex_unlock(&g_pool_lock);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: nxmb_destroy
+ *
+ * Description:
+ *   Destroy an NxModbus instance.
+ *
+ * Input Parameters:
+ *   handle - Instance handle
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_destroy(nxmb_handle_t ctx)
+{
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+  FAR struct nxmb_custom_fc_s *entry;
+  FAR struct nxmb_custom_fc_s *next;
+#endif
+
+  DEBUGASSERT(ctx);
+
+  pthread_mutex_lock(&g_pool_lock);
+  pthread_mutex_lock(&ctx->lock);
+
+  if (ctx->enabled)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      pthread_mutex_unlock(&g_pool_lock);
+      return -EBUSY;
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+  pthread_mutex_destroy(&ctx->lock);
+
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+  entry = ctx->custom_fc_list;
+  while (entry != NULL)
+    {
+      next = entry->next;
+      free(entry);
+      entry = next;
+    }
+#endif
+
+  memset(ctx, 0, sizeof(struct nxmb_context_s));
+  pthread_mutex_unlock(&g_pool_lock);
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_set_callbacks
+ *
+ * Description:
+ *   Set application callbacks for register access.
+ *
+ * Input Parameters:
+ *   handle    - Instance handle
+ *   callbacks - Pointer to callback structure
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_set_callbacks(nxmb_handle_t ctx,
+                       FAR const struct nxmb_callbacks_s *callbacks)
+{
+  DEBUGASSERT(ctx);
+
+  pthread_mutex_lock(&ctx->lock);
+  ctx->callbacks = callbacks;
+  pthread_mutex_unlock(&ctx->lock);
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_enable
+ *
+ * Description:
+ *   Enable an NxModbus instance and initialize transport.
+ *
+ * Input Parameters:
+ *   handle - Instance handle
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_enable(nxmb_handle_t ctx)
+{
+  int ret;
+
+  DEBUGASSERT(ctx && ctx->transport_ops && ctx->transport_ops->init);
+
+  pthread_mutex_lock(&ctx->lock);
+
+  if (ctx->enabled)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EBUSY;
+    }
+
+#ifdef CONFIG_NXMODBUS_CLIENT
+  if (ctx->is_client)
+    {
+      ret = nxmb_client_init(ctx);
+      if (ret < 0)
+        {
+          pthread_mutex_unlock(&ctx->lock);
+          return ret;
+        }
+    }
+#endif
+
+  /* Initialize transport */
+
+  ret = ctx->transport_ops->init(ctx);
+  if (ret < 0)
+    {
+#ifdef CONFIG_NXMODBUS_CLIENT
+      if (ctx->is_client)
+        {
+          nxmb_client_deinit(ctx);
+        }
+#endif
+
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  ctx->enabled = true;
+  pthread_mutex_unlock(&ctx->lock);
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_set_server_id
+ *
+ * Description:
+ *   Configure the data returned by FC17 (Report Server ID).
+ *
+ * Input Parameters:
+ *   handle     - Instance handle
+ *   id         - Server ID byte
+ *   is_running - True if device is running
+ *   additional - Optional additional data (may be NULL)
+ *   addlen     - Length of additional data
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_set_server_id(nxmb_handle_t ctx, uint8_t id, bool is_running,
+                       FAR const uint8_t *additional, uint16_t addlen)
+{
+  DEBUGASSERT(ctx);
+
+  /* The first two bytes are server ID and run indicator.
+   * The rest is optional additional data.
+   */
+
+  if (addlen + 2 > CONFIG_NXMODBUS_REP_SERVER_ID_BUF)
+    {
+      return -ENOMEM;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+
+  ctx->server_id_len = 0;
+  ctx->server_id_buf[ctx->server_id_len++] = id;
+  ctx->server_id_buf[ctx->server_id_len++] =
+    (uint8_t)(is_running ? 0xff : 0x00);
+
+  if (addlen > 0 && additional != NULL)
+    {
+      memcpy(&ctx->server_id_buf[ctx->server_id_len], additional,
+             (size_t)addlen);
+      ctx->server_id_len += addlen;
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_disable
+ *
+ * Description:
+ *   Disable an NxModbus instance and deinitialize transport.
+ *
+ * Input Parameters:
+ *   handle - Instance handle
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_disable(nxmb_handle_t ctx)
+{
+  DEBUGASSERT(ctx && ctx->transport_ops && ctx->transport_ops->deinit);
+
+  pthread_mutex_lock(&ctx->lock);
+
+  if (!ctx->enabled)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return 0;
+    }
+
+  ctx->transport_ops->deinit(ctx);
+
+#ifdef CONFIG_NXMODBUS_CLIENT
+  if (ctx->is_client)
+    {
+      nxmb_client_deinit(ctx);
+    }
+#endif
+
+  ctx->enabled = false;
+  pthread_mutex_unlock(&ctx->lock);
+
+  return 0;
+}
diff --git a/industry/nxmodbus/core/nxmb_func.c b/industry/nxmodbus/core/nxmb_func.c
new file mode 100644
index 000000000..13b595b4f
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func.c
@@ -0,0 +1,354 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_EXCEPTION_FLAG 0x80
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Function code handler signature */
+
+typedef enum nxmb_exception_e (*nxmb_fc_handler_t)(nxmb_handle_t ctx);
+
+/* Dispatch table entry */
+
+struct nxmb_fc_entry_s
+{
+  uint8_t           fc;
+  nxmb_fc_handler_t handler;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Standard function code dispatch table */
+
+static const struct nxmb_fc_entry_s g_nxmb_fc_table[] =
+{
+#ifdef CONFIG_NXMODBUS_FUNC_READ_COILS
+  { NXMB_FC_READ_COILS, nxmb_fc01_read_coils },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_READ_DISCRETE
+  { NXMB_FC_READ_DISCRETE, nxmb_fc02_read_discrete },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_READ_HOLDING
+  { NXMB_FC_READ_HOLDING, nxmb_fc03_read_holding },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_READ_INPUT
+  { NXMB_FC_READ_INPUT, nxmb_fc04_read_input },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_WRITE_COIL
+  { NXMB_FC_WRITE_COIL, nxmb_fc05_write_coil },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_WRITE_HOLDING
+  { NXMB_FC_WRITE_HOLDING, nxmb_fc06_write_holding },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_DIAGNOSTICS
+  { NXMB_FC_DIAGNOSTICS, nxmb_fc08_diagnostics },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_WRITE_COILS
+  { NXMB_FC_WRITE_COILS, nxmb_fc15_write_coils },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_WRITE_HOLDINGS
+  { NXMB_FC_WRITE_HOLDINGS, nxmb_fc16_write_holdings },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_REPORT_SERVER_ID
+  { NXMB_FC_REPORT_SERVER_ID, nxmb_fc17_report_server_id },
+#endif
+#ifdef CONFIG_NXMODBUS_FUNC_READWRITE_HOLDINGS
+  { NXMB_FC_READWRITE_HOLDINGS, nxmb_fc23_readwrite_holding }
+#endif
+};
+
+#define NXMB_FC_TABLE_SIZE                                                     \
+  (sizeof(g_nxmb_fc_table) / sizeof(g_nxmb_fc_table[0]))
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_build_exception
+ *
+ * Description:
+ *   Build a Modbus exception response in ctx->adu in place.
+ *
+ * Input Parameters:
+ *   ctx       - Instance context
+ *   fc        - Function code
+ *   exception - NxModbus exception code
+ *
+ ****************************************************************************/
+
+static void nxmb_build_exception(nxmb_handle_t ctx, uint8_t fc,
+                                 enum nxmb_exception_e exception)
+{
+  ctx->adu.fc      = fc | NXMB_EXCEPTION_FLAG;
+  ctx->adu.data[0] = (uint8_t)exception;
+
+  /* unit_id + fc + 1 exception byte */
+
+  ctx->adu.length  = 3;
+}
+
+/****************************************************************************
+ * Name: nxmb_lookup_standard_fc
+ *
+ * Description:
+ *   Look up a standard function code handler in the dispatch table.
+ *
+ * Input Parameters:
+ *   fc - Function code to look up
+ *
+ * Returned Value:
+ *   Handler function pointer, or NULL if not found
+ *
+ ****************************************************************************/
+
+static nxmb_fc_handler_t nxmb_lookup_standard_fc(uint8_t fc)
+{
+  int i;
+
+  for (i = 0; i < NXMB_FC_TABLE_SIZE; i++)
+    {
+      if (g_nxmb_fc_table[i].fc == fc)
+        {
+          return g_nxmb_fc_table[i].handler;
+        }
+    }
+
+  return NULL;
+}
+
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+
+/****************************************************************************
+ * Name: nxmb_lookup_custom_fc
+ *
+ * Description:
+ *   Look up a custom function code handler in the instance list.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *   fc  - Function code to look up
+ *
+ * Returned Value:
+ *   Handler function pointer, or NULL if not found
+ *
+ ****************************************************************************/
+
+static nxmb_custom_fc_handler_t nxmb_lookup_custom_fc(
+  nxmb_handle_t ctx, uint8_t fc)
+{
+  FAR struct nxmb_custom_fc_s *entry;
+
+  for (entry = ctx->custom_fc_list; entry != NULL; entry = entry->next)
+    {
+      if (entry->fc == fc)
+        {
+          return entry->handler;
+        }
+    }
+
+  return NULL;
+}
+
+#endif /* CONFIG_NXMODBUS_CUSTOM_FC */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_dispatch_function
+ *
+ * Description:
+ *   Dispatch a Modbus function code to the appropriate handler. Operates in
+ *   place on ctx->adu. Checks standard handlers first, then custom handlers
+ *   if enabled. Builds an exception response if no handler is found or the
+ *   handler fails.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_dispatch_function(nxmb_handle_t ctx)
+{
+  nxmb_fc_handler_t        handler;
+  enum nxmb_exception_e    exception;
+  uint8_t                  fc;
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+  nxmb_custom_fc_handler_t custom_handler;
+  int                      ret;
+#endif
+
+  DEBUGASSERT(ctx);
+
+  if (ctx->adu.length < 2)
+    {
+      return -EINVAL;
+    }
+
+  fc = ctx->adu.fc;
+
+  /* Look up standard handler first */
+
+  handler = nxmb_lookup_standard_fc(fc);
+
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+
+  /* If not found, check custom handlers */
+
+  if (handler == NULL)
+    {
+      custom_handler = nxmb_lookup_custom_fc(ctx, fc);
+      if (custom_handler != NULL)
+        {
+          ret = custom_handler(ctx);
+          if (ret < 0)
+            {
+              nxmb_build_exception(ctx, fc, NXMB_EX_DEVICE_FAILURE);
+            }
+
+          return 0;
+        }
+    }
+#endif
+
+  /* If no handler found, return illegal function exception */
+
+  if (handler == NULL)
+    {
+      nxmb_build_exception(ctx, fc, NXMB_EX_ILLEGAL_FUNCTION);
+      return 0;
+    }
+
+  /* Call the handler */
+
+  exception = handler(ctx);
+
+  /* If handler returned exception, build exception response */
+
+  if (exception != NXMB_EX_NONE)
+    {
+      nxmb_build_exception(ctx, fc, exception);
+    }
+
+  return 0;
+}
+
+#ifdef CONFIG_NXMODBUS_CUSTOM_FC
+/****************************************************************************
+ * Name: nxmb_register_custom_fc
+ *
+ * Description:
+ *   Register a custom Modbus function code handler for an instance.
+ *
+ *   Custom handlers are checked after standard handlers, so standard
+ *   function codes (FC01-FC16) cannot be overridden.
+ *
+ * Input Parameters:
+ *   h       - The NxModbus instance handle
+ *   fc      - The custom function code to register
+ *   handler - The handler function
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_register_custom_fc(nxmb_handle_t ctx, uint8_t fc,
+                            nxmb_custom_fc_handler_t handler)
+{
+  FAR struct nxmb_custom_fc_s *entry;
+  FAR struct nxmb_custom_fc_s *new_entry;
+
+  DEBUGASSERT(ctx && handler);
+
+  /* Check if FC is already a standard handler */
+
+  if (nxmb_lookup_standard_fc(fc) != NULL)
+    {
+      return -EEXIST;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+
+  /* Check if FC is already registered as custom */
+
+  for (entry = ctx->custom_fc_list; entry != NULL; entry = entry->next)
+    {
+      if (entry->fc == fc)
+        {
+          pthread_mutex_unlock(&ctx->lock);
+          return -EEXIST;
+        }
+    }
+
+  /* Allocate new entry */
+
+  new_entry = malloc(sizeof(struct nxmb_custom_fc_s));
+  if (new_entry == NULL)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -ENOMEM;
+    }
+
+  /* Initialize and prepend to list */
+
+  new_entry->fc       = fc;
+  new_entry->handler  = handler;
+  new_entry->next     = ctx->custom_fc_list;
+  ctx->custom_fc_list = new_entry;
+
+  pthread_mutex_unlock(&ctx->lock);
+  return 0;
+}
+
+#endif /* CONFIG_NXMODBUS_CUSTOM_FC */
diff --git a/industry/nxmodbus/core/nxmb_func_coils.c b/industry/nxmodbus/core/nxmb_func_coils.c
new file mode 100644
index 000000000..3235fcc9e
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func_coils.c
@@ -0,0 +1,259 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func_coils.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Offsets are in adu.data[]; lengths refer to data only. */
+
+/* FC01 Read Coils */
+
+#define NXMB_FC01_ADDR_OFF      0
+#define NXMB_FC01_QTY_OFF       2
+#define NXMB_FC01_REQ_DATA_LEN  4
+
+/* FC05 Write Single Coil */
+
+#define NXMB_FC05_ADDR_OFF      0
+#define NXMB_FC05_VALUE_OFF     2
+#define NXMB_FC05_REQ_DATA_LEN  4
+
+/* FC15 Write Multiple Coils */
+
+#define NXMB_FC15_ADDR_OFF      0
+#define NXMB_FC15_QTY_OFF       2
+#define NXMB_FC15_BCNT_OFF      4
+#define NXMB_FC15_DATA_OFF      5
+#define NXMB_FC15_RESP_DATA_LEN 4
+
+/* Maximum coil quantity per Modbus specification.
+ * FC01/FC02 read max is 2000 (0x07D0).
+ * FC15 write max is 1968 (0x07B0).
+ */
+
+#define NXMB_COIL_READ_QTY_MAX  2000
+#define NXMB_COIL_WRITE_QTY_MAX 1968
+
+/* Coil ON/OFF wire values for FC05 */
+
+#define NXMB_COIL_ON            0xff00
+#define NXMB_COIL_OFF           0x0000
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_fc01_read_coils
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc01_read_coils(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t qty;
+  uint8_t  nbytes;
+  int      ret;
+
+  if (data_len != NXMB_FC01_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->coil_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC01_ADDR_OFF]);
+  qty  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC01_QTY_OFF]);
+
+  if (qty < 1 || qty > NXMB_COIL_READ_QTY_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)addr + qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  nbytes = (uint8_t)((qty + 7) / 8);
+
+  /* Response is byte_count + coil data */
+
+  if (1 + nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Build response: byte_count + coil data */
+
+  ctx->adu.fc      = NXMB_FC_READ_COILS;
+  ctx->adu.data[0] = nbytes;
+
+  /* Zero data area so unused trailing bits are clear */
+
+  memset(&ctx->adu.data[1], 0, nbytes);
+
+  ret = ctx->callbacks->coil_cb(&ctx->adu.data[1], addr, qty, NXMB_REG_READ,
+                                ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  ctx->adu.length = (uint16_t)(2 + 1 + nbytes);
+  return NXMB_EX_NONE;
+}
+
+/****************************************************************************
+ * Name: nxmb_fc05_write_coil
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc05_write_coil(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t value;
+  uint8_t  coil_buf[2];
+  int      ret;
+
+  if (data_len != NXMB_FC05_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->coil_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC05_ADDR_OFF]);
+  value = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC05_VALUE_OFF]);
+
+  if (addr == 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  if (value != NXMB_COIL_ON && value != NXMB_COIL_OFF)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Convert wire value to single-bit buffer for callback */
+
+  coil_buf[0] = (value == NXMB_COIL_ON) ? 1 : 0;
+  coil_buf[1] = 0;
+
+  ret = ctx->callbacks->coil_cb(coil_buf, addr, 1, NXMB_REG_WRITE,
+                                ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  /* Response echoes the request — adu.length is already correct */
+
+  return NXMB_EX_NONE;
+}
+
+/****************************************************************************
+ * Name: nxmb_fc15_write_coils
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc15_write_coils(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t qty;
+  uint8_t  byte_count;
+  uint8_t  byte_count_exp;
+  int      ret;
+
+  if (data_len < NXMB_FC15_DATA_OFF)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->coil_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr       = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC15_ADDR_OFF]);
+  qty        = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC15_QTY_OFF]);
+  byte_count = ctx->adu.data[NXMB_FC15_BCNT_OFF];
+
+  if (qty < 1 || qty > NXMB_COIL_WRITE_QTY_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)addr + qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  byte_count_exp = (uint8_t)((qty + 7) / 8);
+
+  if (byte_count != byte_count_exp)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Verify total data length matches header + payload */
+
+  if (data_len != (uint16_t)(NXMB_FC15_DATA_OFF + byte_count))
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  ret = ctx->callbacks->coil_cb(&ctx->adu.data[NXMB_FC15_DATA_OFF], addr,
+                                qty, NXMB_REG_WRITE, ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  /* Response: addr(2) + qty(2) — already in data[0..3] from request */
+
+  ctx->adu.length = (uint16_t)(2 + NXMB_FC15_RESP_DATA_LEN);
+  return NXMB_EX_NONE;
+}
diff --git a/industry/nxmodbus/core/nxmb_func_diag.c b/industry/nxmodbus/core/nxmb_func_diag.c
new file mode 100644
index 000000000..8575c610d
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func_diag.c
@@ -0,0 +1,83 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func_diag.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_DIAG_SUBFUNC_OFF       0
+#define NXMB_DIAG_DATA_OFF          2
+#define NXMB_DIAG_REQ_MIN_DATA_LEN  4
+
+/* Sub-function codes */
+
+#define NXMB_DIAG_RETURN_QUERY      0x0000
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_fc08_diagnostics
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc08_diagnostics(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t subfunc;
+
+  if (data_len < NXMB_DIAG_REQ_MIN_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  subfunc = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_DIAG_SUBFUNC_OFF]);
+
+  switch (subfunc)
+    {
+      case NXMB_DIAG_RETURN_QUERY:
+        {
+          /* Response echoes the request — adu is already correct */
+
+          return NXMB_EX_NONE;
+        }
+
+      default:
+        {
+          return NXMB_EX_ILLEGAL_FUNCTION;
+        }
+    }
+}
diff --git a/industry/nxmodbus/core/nxmb_func_discrete.c b/industry/nxmodbus/core/nxmb_func_discrete.c
new file mode 100644
index 000000000..b30a0a720
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func_discrete.c
@@ -0,0 +1,110 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func_discrete.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_FC02_ADDR_OFF     0
+#define NXMB_FC02_QTY_OFF      2
+#define NXMB_FC02_REQ_DATA_LEN 4
+
+#define NXMB_DISCRETE_QTY_MAX  2000
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_fc02_read_discrete
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc02_read_discrete(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t qty;
+  uint8_t  nbytes;
+  int      ret;
+
+  if (data_len != NXMB_FC02_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->discrete_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC02_ADDR_OFF]);
+  qty  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC02_QTY_OFF]);
+
+  if (qty < 1 || qty > NXMB_DISCRETE_QTY_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)addr + qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  nbytes = (uint8_t)((qty + 7) / 8);
+
+  /* Response is byte_count + discrete data */
+
+  if (1 + nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  ctx->adu.fc      = NXMB_FC_READ_DISCRETE;
+  ctx->adu.data[0] = nbytes;
+
+  memset(&ctx->adu.data[1], 0, nbytes);
+
+  ret = ctx->callbacks->discrete_cb(&ctx->adu.data[1], addr, qty,
+                                    ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  ctx->adu.length = (uint16_t)(2 + 1 + nbytes);
+  return NXMB_EX_NONE;
+}
diff --git a/industry/nxmodbus/core/nxmb_func_holding.c b/industry/nxmodbus/core/nxmb_func_holding.c
new file mode 100644
index 000000000..a4fe74cc5
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func_holding.c
@@ -0,0 +1,331 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func_holding.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* PDU data offsets are relative to ctx->adu.data[] (after unit_id + fc).
+ * Lengths refer to the data payload only — adu.length = 2 + data_len.
+ */
+
+/* FC03 Read Holding Registers */
+
+#define NXMB_FC03_ADDR_OFF            0
+#define NXMB_FC03_QTY_OFF             2
+#define NXMB_FC03_REQ_DATA_LEN        4
+
+/* FC06 Write Single Holding Register */
+
+#define NXMB_FC06_ADDR_OFF            0
+#define NXMB_FC06_VALUE_OFF           2
+#define NXMB_FC06_REQ_DATA_LEN        4
+
+/* FC16 Write Multiple Holding Registers */
+
+#define NXMB_FC16_ADDR_OFF            0
+#define NXMB_FC16_QTY_OFF             2
+#define NXMB_FC16_BCNT_OFF            4
+#define NXMB_FC16_DATA_OFF            5
+#define NXMB_FC16_RESP_DATA_LEN       4
+
+/* FC23 Read/Write Multiple Holding Registers */
+
+#define NXMB_FC23_RD_ADDR_OFF         0
+#define NXMB_FC23_RD_QTY_OFF          2
+#define NXMB_FC23_WR_ADDR_OFF         4
+#define NXMB_FC23_WR_QTY_OFF          6
+#define NXMB_FC23_WR_BCNT_OFF         8
+#define NXMB_FC23_WR_DATA_OFF         9
+#define NXMB_FC23_REQ_MIN_DATA_LEN    9
+
+/* Quantity limits per Modbus Application Protocol Specification */
+
+#define NXMB_REG_READ_QTY_MAX         125 /* 0x007D */
+#define NXMB_REG_WRITE_MUL_QTY_MAX    123 /* 0x007B */
+#define NXMB_REG_READWRITE_RD_QTY_MAX 125 /* 0x007D */
+#define NXMB_REG_READWRITE_WR_QTY_MAX 121 /* 0x0079 */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_fc03_read_holding
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc03_read_holding(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t qty;
+  uint8_t  nbytes;
+  int      ret;
+
+  if (data_len != NXMB_FC03_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->holding_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC03_ADDR_OFF]);
+  qty  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC03_QTY_OFF]);
+
+  if (qty < 1 || qty > NXMB_REG_READ_QTY_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)addr + qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  nbytes = (uint8_t)(qty * 2);
+
+  /* Response is byte_count + register data */
+
+  if (1 + nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Build response: byte_count + register data (big-endian) */
+
+  ctx->adu.fc      = NXMB_FC_READ_HOLDING;
+  ctx->adu.data[0] = nbytes;
+
+  ret = ctx->callbacks->holding_cb(&ctx->adu.data[1], addr, qty,
+                                   NXMB_REG_READ, ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  ctx->adu.length = (uint16_t)(2 + 1 + nbytes);
+  return NXMB_EX_NONE;
+}
+
+/****************************************************************************
+ * Name: nxmb_fc06_write_holding
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc06_write_holding(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  int      ret;
+
+  if (data_len != NXMB_FC06_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->holding_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC06_ADDR_OFF]);
+
+  if (addr == 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  ret = ctx->callbacks->holding_cb(&ctx->adu.data[NXMB_FC06_VALUE_OFF], addr,
+                                   1, NXMB_REG_WRITE, ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  /* Response echoes the request — adu.length is already correct */
+
+  return NXMB_EX_NONE;
+}
+
+/****************************************************************************
+ * Name: nxmb_fc16_write_holdings
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc16_write_holdings(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t qty;
+  uint8_t  byte_count;
+  int      ret;
+
+  if (data_len < NXMB_FC16_DATA_OFF)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->holding_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr       = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC16_ADDR_OFF]);
+  qty        = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC16_QTY_OFF]);
+  byte_count = ctx->adu.data[NXMB_FC16_BCNT_OFF];
+
+  if (qty < 1 || qty > NXMB_REG_WRITE_MUL_QTY_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)addr + qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  if (byte_count != (uint8_t)(qty * 2))
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Verify total data length matches header + payload */
+
+  if (data_len != (uint16_t)(NXMB_FC16_DATA_OFF + byte_count))
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  ret = ctx->callbacks->holding_cb(&ctx->adu.data[NXMB_FC16_DATA_OFF], addr,
+                                   qty, NXMB_REG_WRITE,
+                                   ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  /* Response: addr(2) + qty(2) — already in data[0..3] from request */
+
+  ctx->adu.length = (uint16_t)(2 + NXMB_FC16_RESP_DATA_LEN);
+  return NXMB_EX_NONE;
+}
+
+/****************************************************************************
+ * Name: nxmb_fc23_readwrite_holding
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc23_readwrite_holding(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t rd_addr;
+  uint16_t rd_qty;
+  uint16_t wr_addr;
+  uint16_t wr_qty;
+  uint8_t  wr_bcnt;
+  uint16_t rd_bcnt;
+  int      ret;
+
+  if (data_len < NXMB_FC23_REQ_MIN_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->holding_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  rd_addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC23_RD_ADDR_OFF]);
+  rd_qty  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC23_RD_QTY_OFF]);
+  wr_addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC23_WR_ADDR_OFF]);
+  wr_qty  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC23_WR_QTY_OFF]);
+  wr_bcnt = ctx->adu.data[NXMB_FC23_WR_BCNT_OFF];
+
+  if (rd_qty < 1 || rd_qty > NXMB_REG_READWRITE_RD_QTY_MAX || wr_qty < 1 ||
+      wr_qty > NXMB_REG_READWRITE_WR_QTY_MAX || wr_bcnt != (wr_qty * 2))
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)rd_addr + rd_qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  if ((uint32_t)wr_addr + wr_qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  /* Verify total request data length matches header + write payload */
+
+  if (data_len != (uint16_t)(NXMB_FC23_WR_DATA_OFF + wr_bcnt))
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Response is byte_count + read register data — must fit in adu.data[] */
+
+  if (1 + rd_qty * 2 > NXMB_ADU_DATA_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  ret = ctx->callbacks->holding_cb(&ctx->adu.data[NXMB_FC23_WR_DATA_OFF],
+                                   wr_addr, wr_qty, NXMB_REG_WRITE,
+                                   ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  /* Build response: byte_count + read register data, overwriting request */
+
+  ctx->adu.fc      = NXMB_FC_READWRITE_HOLDINGS;
+  rd_bcnt          = rd_qty * 2;
+  ctx->adu.data[0] = (uint8_t)rd_bcnt;
+
+  ret = ctx->callbacks->holding_cb(&ctx->adu.data[1], rd_addr, rd_qty,
+                                   NXMB_REG_READ, ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  ctx->adu.length = (uint16_t)(2 + 1 + rd_bcnt);
+  return NXMB_EX_NONE;
+}
diff --git a/industry/nxmodbus/core/nxmb_func_input.c b/industry/nxmodbus/core/nxmb_func_input.c
new file mode 100644
index 000000000..151d2510b
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func_input.c
@@ -0,0 +1,115 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func_input.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* FC04 Read Input Registers — offsets in adu.data[], lengths are data
+ * only
+ */
+
+#define NXMB_FC04_ADDR_OFF     0
+#define NXMB_FC04_QTY_OFF      2
+#define NXMB_FC04_REQ_DATA_LEN 4
+
+/* Maximum register quantity per Modbus specification */
+
+#define NXMB_REG_READ_QTY_MAX  125 /* 0x007D */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_fc04_read_input
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc04_read_input(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+  uint16_t addr;
+  uint16_t qty;
+  uint8_t  nbytes;
+  int      ret;
+
+  if (data_len != NXMB_FC04_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if (ctx->callbacks == NULL || ctx->callbacks->input_cb == NULL)
+    {
+      return NXMB_EX_ILLEGAL_FUNCTION;
+    }
+
+  addr = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC04_ADDR_OFF]);
+  qty  = nxmb_util_get_u16_be(&ctx->adu.data[NXMB_FC04_QTY_OFF]);
+
+  if (qty < 1 || qty > NXMB_REG_READ_QTY_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  if ((uint32_t)addr + qty > 0xffffu)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  nbytes = (uint8_t)(qty * 2);
+
+  /* Response is byte_count + register data */
+
+  if (1 + nbytes > NXMB_ADU_DATA_MAX)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* Build response: byte_count + register data (big-endian) */
+
+  ctx->adu.fc      = NXMB_FC_READ_INPUT;
+  ctx->adu.data[0] = nbytes;
+
+  ret = ctx->callbacks->input_cb(&ctx->adu.data[1], addr, qty,
+                                 ctx->callbacks->priv);
+  if (ret != 0)
+    {
+      return nxmb_cb_ret_to_exception(ret);
+    }
+
+  ctx->adu.length = (uint16_t)(2 + 1 + nbytes);
+  return NXMB_EX_NONE;
+}
diff --git a/industry/nxmodbus/core/nxmb_func_other.c b/industry/nxmodbus/core/nxmb_func_other.c
new file mode 100644
index 000000000..5827026df
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_func_other.c
@@ -0,0 +1,99 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_func_other.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_REPORT_ID_REQ_DATA_LEN 0
+
+/* Run indicator status */
+
+#define NXMB_RUN_STATUS_ON          0xff
+#define NXMB_RUN_STATUS_OFF         0x00
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_fc17_report_server_id
+ *
+ * Description:
+ *   Handle FC17 (0x11) Report Server ID request. Returns the configured
+ *   unit ID and a run indicator byte (0xFF = ON).
+ *
+ ****************************************************************************/
+
+enum nxmb_exception_e nxmb_fc17_report_server_id(nxmb_handle_t ctx)
+{
+  uint16_t data_len = ctx->adu.length - 2;
+
+  if (data_len != NXMB_REPORT_ID_REQ_DATA_LEN)
+    {
+      return NXMB_EX_ILLEGAL_DATA_VALUE;
+    }
+
+  /* If the application configured server ID data via nxmb_set_server_id(),
+   * use that; otherwise fall back to unit_id + run status ON.
+   */
+
+  ctx->adu.fc = NXMB_FC_REPORT_SERVER_ID;
+
+  if (ctx->server_id_len > 0)
+    {
+      /* Response is byte_count + server_id_buf */
+
+      if (1 + ctx->server_id_len > NXMB_ADU_DATA_MAX)
+        {
+          return NXMB_EX_DEVICE_FAILURE;
+        }
+
+      ctx->adu.data[0] = (uint8_t)ctx->server_id_len;
+      memcpy(&ctx->adu.data[1], ctx->server_id_buf, ctx->server_id_len);
+      ctx->adu.length = (uint16_t)(2 + 1 + ctx->server_id_len);
+    }
+  else
+    {
+      ctx->adu.data[0] = 2;                  /* byte count */
+      ctx->adu.data[1] = ctx->unit_id;       /* server ID */
+      ctx->adu.data[2] = NXMB_RUN_STATUS_ON; /* run indicator */
+      ctx->adu.length  = (uint16_t)(2 + 3);
+    }
+
+  return NXMB_EX_NONE;
+}
diff --git a/industry/nxmodbus/core/nxmb_server.c b/industry/nxmodbus/core/nxmb_server.c
new file mode 100644
index 000000000..4168b53f2
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_server.c
@@ -0,0 +1,121 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_server.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_FUNC_ERROR 0x80
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_poll
+ *
+ * Description:
+ *   Poll for Modbus events and process received frames.
+ *
+ * Input Parameters:
+ *   handle - Instance handle
+ *
+ * Returned Value:
+ *   0 on success, negative errno on failure
+ *
+ ****************************************************************************/
+
+int nxmb_poll(nxmb_handle_t ctx)
+{
+  uint8_t rcv_address;
+  int     ret;
+
+  DEBUGASSERT(ctx && ctx->transport_ops && ctx->transport_ops->receive);
+
+  pthread_mutex_lock(&ctx->lock);
+
+  if (!ctx->enabled)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return -EAGAIN;
+    }
+
+  ret = ctx->transport_ops->receive(ctx);
+  if (ret < 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return ret;
+    }
+
+  if (ret == 0 || ctx->adu.length == 0)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return 0;
+    }
+
+  rcv_address = ctx->adu.unit_id;
+
+  if (rcv_address != NXMB_ADDRESS_BROADCAST && rcv_address != ctx->unit_id)
+    {
+      pthread_mutex_unlock(&ctx->lock);
+      return 0;
+    }
+
+  /* Dispatch to function code handler. Handlers mutate ctx->adu in place,
+   * turning the request into the response.
+   */
+
+  ret = nxmb_dispatch_function(ctx);
+
+  if (rcv_address != NXMB_ADDRESS_BROADCAST)
+    {
+      if (ctx->transport_ops->send != NULL)
+        {
+          ret = ctx->transport_ops->send(ctx);
+          if (ret < 0)
+            {
+              pthread_mutex_unlock(&ctx->lock);
+              return ret;
+            }
+        }
+    }
+
+  pthread_mutex_unlock(&ctx->lock);
+  return 0;
+}
diff --git a/industry/nxmodbus/core/nxmb_utils.c b/industry/nxmodbus/core/nxmb_utils.c
new file mode 100644
index 000000000..016d370c5
--- /dev/null
+++ b/industry/nxmodbus/core/nxmb_utils.c
@@ -0,0 +1,127 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/core/nxmb_utils.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_util_set_bits
+ *
+ * Description:
+ *   Set bits in a byte buffer.
+ *
+ * Input Parameters:
+ *   buf        - Byte buffer
+ *   bit_offset - Bit offset from start of buffer
+ *   nbits      - Number of bits to set (max 8)
+ *   value      - Value to set
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+void nxmb_util_set_bits(FAR uint8_t *buf, uint16_t bit_offset, uint8_t nbits,
+                        uint8_t value)
+{
+  uint16_t word_buf;
+  uint16_t mask;
+  uint16_t byte_offset;
+  uint16_t pre_bits;
+  uint16_t val = value;
+
+  byte_offset = bit_offset / 8;
+  pre_bits    = bit_offset - (byte_offset * 8);
+
+  val <<= pre_bits;
+  mask = (uint16_t)((1 << nbits) - 1);
+  mask <<= pre_bits;
+
+  word_buf = buf[byte_offset];
+  if (pre_bits + nbits > 8)
+    {
+      word_buf |= buf[byte_offset + 1] << 8;
+    }
+
+  word_buf = (word_buf & (~mask)) | val;
+
+  buf[byte_offset] = (uint8_t)(word_buf & 0xff);
+  if (pre_bits + nbits > 8)
+    {
+      buf[byte_offset + 1] = (uint8_t)(word_buf >> 8);
+    }
+}
+
+/****************************************************************************
+ * Name: nxmb_util_get_bits
+ *
+ * Description:
+ *   Get bits from a byte buffer.
+ *
+ * Input Parameters:
+ *   buf        - Byte buffer
+ *   bit_offset - Bit offset from start of buffer
+ *   nbits      - Number of bits to get (max 8)
+ *
+ * Returned Value:
+ *   Bit value
+ *
+ ****************************************************************************/
+
+uint8_t nxmb_util_get_bits(FAR const uint8_t *buf, uint16_t bit_offset,
+                           uint8_t nbits)
+{
+  uint16_t word_buf;
+  uint16_t mask;
+  uint16_t byte_offset;
+  uint16_t pre_bits;
+
+  byte_offset = bit_offset / 8;
+  pre_bits    = bit_offset - (byte_offset * 8);
+
+  mask = (uint16_t)((1 << nbits) - 1);
+
+  word_buf = buf[byte_offset];
+  if (pre_bits + nbits > 8)
+    {
+      word_buf |= buf[byte_offset + 1] << 8;
+    }
+
+  word_buf >>= pre_bits;
+  word_buf &= mask;
+
+  return (uint8_t)word_buf;
+}
+
diff --git a/industry/nxmodbus/nxmb_internal.h b/industry/nxmodbus/nxmb_internal.h
new file mode 100644
index 000000000..0ec3db5c9
--- /dev/null
+++ b/industry/nxmodbus/nxmb_internal.h
@@ -0,0 +1,379 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/nxmb_internal.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INDUSTRY_NXMODBUS_NXMB_INTERNAL_H
+#define __APPS_INDUSTRY_NXMODBUS_NXMB_INTERNAL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/compiler.h>
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <time.h>
+
+#include <nxmodbus/nxmodbus.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Pre-processor Definitions */
+
+#define NXMB_ADDRESS_BROADCAST 0
+
+/* Modbus function codes */
+
+#define NXMB_FC_READ_COILS         0x01
+#define NXMB_FC_READ_DISCRETE      0x02
+#define NXMB_FC_READ_HOLDING       0x03
+#define NXMB_FC_READ_INPUT         0x04
+#define NXMB_FC_WRITE_COIL         0x05
+#define NXMB_FC_WRITE_HOLDING      0x06
+#define NXMB_FC_DIAGNOSTICS        0x08
+#define NXMB_FC_WRITE_COILS        0x0f
+#define NXMB_FC_WRITE_HOLDINGS     0x10
+#define NXMB_FC_REPORT_SERVER_ID   0x11
+#define NXMB_FC_READWRITE_HOLDINGS 0x17
+
+/* Transport operations interface.
+ *
+ * receive() must not block indefinitely. Implementations should use an
+ * internal timeout (e.g. select()) and return 0 or -EAGAIN when no
+ * complete frame is available yet. The client polling loop relies on
+ * this to enforce its own response timeout.
+ */
+
+struct nxmb_transport_ops_s
+{
+  CODE int (*init)(nxmb_handle_t ctx);
+  CODE int (*deinit)(nxmb_handle_t ctx);
+  CODE int (*send)(nxmb_handle_t ctx);
+  CODE int (*receive)(nxmb_handle_t ctx);
+};
+
+/* Custom function code handler */
+
+struct nxmb_custom_fc_s
+{
+  FAR struct nxmb_custom_fc_s *next;
+  nxmb_custom_fc_handler_t     handler;
+  uint8_t                      fc;
+};
+
+/* NxModbus instance context */
+
+struct nxmb_context_s
+{
+  FAR const struct nxmb_callbacks_s     *callbacks;
+  FAR const struct nxmb_transport_ops_s *transport_ops;
+  enum nxmb_mode_e                       mode;
+  pthread_mutex_t                        lock;
+  uint8_t                                unit_id;
+  bool                                   is_client;
+  bool                                   enabled;
+
+  /* Transport configuration */
+
+  union nxmb_transport_config_u transport_cfg;
+
+  /* Single ADU container reused for both RX and TX. Modbus is half-duplex,
+   * so request and response never coexist: handlers mutate the request
+   * in place to form the response.
+   */
+
+  struct nxmb_adu_s adu;
+
+  /* Report Server ID (FC17) data */
+
+  uint8_t  server_id_buf[CONFIG_NXMODBUS_REP_SERVER_ID_BUF];
+  uint16_t server_id_len;
+
+  /* Custom handlers */
+
+  FAR struct nxmb_custom_fc_s *custom_fc_list;
+  FAR void                    *transport_state;
+  FAR void                    *client_state;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef CONFIG_NXMODBUS_RTU
+extern const struct nxmb_transport_ops_s g_nxmb_serial_ops;
+#endif
+
+#ifdef CONFIG_NXMODBUS_ASCII
+extern const struct nxmb_transport_ops_s g_nxmb_ascii_ops;
+#endif
+
+#ifdef CONFIG_NXMODBUS_RAW_ADU
+extern const struct nxmb_transport_ops_s g_nxmb_raw_ops;
+#endif
+
+#ifdef CONFIG_NXMODBUS_TCP
+extern const struct nxmb_transport_ops_s g_nxmb_tcp_ops;
+#endif
+
+/****************************************************************************
+ * Inline Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_cb_ret_to_exception
+ *
+ * Description:
+ *   Map a callback return value to a Modbus exception code.
+ *
+ *   -ENOENT  -> address not supported by the application
+ *   anything else -> generic device failure
+ *
+ ****************************************************************************/
+
+static inline enum nxmb_exception_e nxmb_cb_ret_to_exception(int ret)
+{
+  if (ret == -ENOENT)
+    {
+      return NXMB_EX_ILLEGAL_DATA_ADDRESS;
+    }
+
+  return NXMB_EX_DEVICE_FAILURE;
+}
+
+/****************************************************************************
+ * Name: nxmb_util_get_u16_be
+ *
+ * Description:
+ *   Extract a big-endian 16-bit value from a buffer.
+ *
+ ****************************************************************************/
+
+static inline uint16_t nxmb_util_get_u16_be(FAR const uint8_t *buf)
+{
+  return (uint16_t)((buf[0] << 8) | buf[1]);
+}
+
+/****************************************************************************
+ * Name: nxmb_util_put_u16_be
+ *
+ * Description:
+ *   Store a 16-bit value as big-endian in a buffer.
+ *
+ ****************************************************************************/
+
+static inline void nxmb_util_put_u16_be(FAR uint8_t *buf, uint16_t value)
+{
+  buf[0] = (uint8_t)(value >> 8);
+  buf[1] = (uint8_t)(value & 0xff);
+}
+
+/****************************************************************************
+ * Name: nxmb_util_clock_ms
+ *
+ * Description:
+ *   Return the current monotonic clock value in milliseconds.
+ *
+ ****************************************************************************/
+
+static inline uint64_t nxmb_util_clock_ms(void)
+{
+  struct timespec ts;
+
+  clock_gettime(CLOCK_MONOTONIC, &ts);
+  return (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+}
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef CONFIG_SERIAL_TERMIOS
+/****************************************************************************
+ * Name: nxmb_serial_configure
+ *
+ * Description:
+ *   Configure serial port with termios settings for Modbus communication.
+ *   Shared by RTU and ASCII transports.
+ *
+ * Input Parameters:
+ *   fd       - File descriptor
+ *   baudrate - Baud rate
+ *   parity   - Parity setting
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_serial_configure(int fd, uint32_t baudrate,
+                          enum nxmb_parity_e parity);
+#endif
+
+/****************************************************************************
+ *  Name: nxmb_util_set_bits
+ *
+ *  Description:
+ *    Set up to 8 bits in a byte buffer at the given bit offset.
+ *
+ *  Input Parameters:
+ *    buf        - Byte buffer
+ *    bit_offset - Bit offset from start of buffer
+ *    nbits      - Number of bits to set (max 8)
+ *    value      - Bit values to write
+ *
+ ****************************************************************************/
+
+void nxmb_util_set_bits(FAR uint8_t *buf, uint16_t bit_offset, uint8_t nbits,
+                        uint8_t value);
+
+/****************************************************************************
+ * Name: nxmb_util_get_bits
+ *
+ * Description:
+ *   Extract up to 8 bits from a byte buffer at the given bit offset.
+ *
+ * Input Parameters:
+ *   buf        - Byte buffer
+ *   bit_offset - Bit offset from start of buffer
+ *   nbits      - Number of bits to extract (max 8)
+ *
+ * Returned Value:
+ *   Extracted bit values
+ *
+ ****************************************************************************/
+
+uint8_t nxmb_util_get_bits(FAR const uint8_t *buf, uint16_t bit_offset,
+                           uint8_t nbits);
+
+#ifdef CONFIG_NXMODBUS_RTU
+/****************************************************************************
+ * Name: nxmb_crc16
+ *
+ * Description:
+ *   Calculate Modbus RTU CRC16 checksum.
+ *
+ * Input Parameters:
+ *   buf - Pointer to data buffer
+ *   len - Length of data in bytes
+ *
+ * Returned Value:
+ *   CRC16 value
+ *
+ ****************************************************************************/
+
+uint16_t nxmb_crc16(FAR const uint8_t *buf, uint16_t len);
+#endif
+
+#ifdef CONFIG_NXMODBUS_ASCII
+/****************************************************************************
+ * Name: nxmb_lrc
+ *
+ * Description:
+ *   Calculate Modbus ASCII LRC checksum.
+ *
+ * Input Parameters:
+ *   buf - Pointer to data buffer
+ *   len - Length of data in bytes
+ *
+ * Returned Value:
+ *   LRC value (8-bit)
+ *
+ ****************************************************************************/
+
+uint8_t nxmb_lrc(FAR const uint8_t *buf, uint16_t len);
+#endif
+
+#ifdef CONFIG_NXMODBUS_CLIENT
+/****************************************************************************
+ * Name: nxmb_client_init
+ *
+ * Description:
+ *   Initialize client state for master mode.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_client_init(nxmb_handle_t ctx);
+
+/****************************************************************************
+ * Name: nxmb_client_deinit
+ *
+ * Description:
+ *   Deinitialize client state.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_client_deinit(nxmb_handle_t ctx);
+#endif
+
+/****************************************************************************
+ * Name: nxmb_dispatch_function
+ *
+ * Description:
+ *   Dispatch a Modbus function code to the appropriate handler. Operates
+ *   in place on ctx->adu.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_dispatch_function(nxmb_handle_t ctx);
+
+/* Function-code handlers operate on ctx->adu in place: they read the
+ * request from adu.fc/adu.data[]/adu.length and overwrite those fields
+ * with the response.
+ */
+
+enum nxmb_exception_e nxmb_fc01_read_coils(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc02_read_discrete(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc05_write_coil(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc15_write_coils(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc03_read_holding(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc04_read_input(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc06_write_holding(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc16_write_holdings(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc23_readwrite_holding(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc08_diagnostics(nxmb_handle_t ctx);
+enum nxmb_exception_e nxmb_fc17_report_server_id(nxmb_handle_t ctx);
+
+#endif /* __APPS_INDUSTRY_NXMODBUS_NXMB_INTERNAL_H */
diff --git a/industry/nxmodbus/transport/nxmb_ascii.c b/industry/nxmodbus/transport/nxmb_ascii.c
new file mode 100644
index 000000000..668a89821
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_ascii.c
@@ -0,0 +1,550 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_ascii.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/select.h>
+#include <unistd.h>
+#ifdef CONFIG_SERIAL_TERMIOS
+#  include <termios.h>
+#endif
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_ASCII_START_CHAR ':'
+#define NXMB_ASCII_CR         '\r'
+#define NXMB_ASCII_LF         '\n'
+
+/* Serialized binary frame: unit_id(1) + fc(1) + data + LRC(1) */
+
+#define NXMB_ASCII_BIN_MAX    (NXMB_ADU_DATA_MAX + 3)
+
+/* Hex-encoded ASCII frame: ':' + 2*bin + CR + LF */
+
+#define NXMB_ASCII_BUFLEN     (NXMB_ASCII_BIN_MAX * 2 + 4)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct nxmb_ascii_state_s
+{
+  int            fd;
+  uint8_t        rx_buf[NXMB_ASCII_BUFLEN];
+  uint16_t       rx_pos;
+  bool           in_frame;
+#ifdef CONFIG_SERIAL_TERMIOS
+  struct termios old_tio;
+#endif
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int nxmb_ascii_char_to_hex(char c);
+static char nxmb_ascii_hex_to_char(uint8_t nibble);
+static uint16_t nxmb_ascii_encode(FAR const uint8_t *bin, uint16_t bin_len,
+                                    FAR char *ascii);
+static int nxmb_ascii_decode(FAR const char *ascii, uint16_t ascii_len,
+                             FAR uint8_t *bin);
+static int nxmb_ascii_init(nxmb_handle_t ctx);
+static int nxmb_ascii_deinit(nxmb_handle_t ctx);
+static int nxmb_ascii_send(nxmb_handle_t ctx);
+static int nxmb_ascii_receive(nxmb_handle_t ctx);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct nxmb_transport_ops_s g_nxmb_ascii_ops =
+{
+  .init    = nxmb_ascii_init,
+  .deinit  = nxmb_ascii_deinit,
+  .send    = nxmb_ascii_send,
+  .receive = nxmb_ascii_receive
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_ascii_char_to_hex
+ *
+ * Description:
+ *   Convert ASCII hex character to binary nibble.
+ *
+ * Input Parameters:
+ *   c - ASCII hex character
+ *
+ * Returned Value:
+ *   Binary value 0-15, or -1 on error
+ *
+ ****************************************************************************/
+
+static int nxmb_ascii_char_to_hex(char c)
+{
+  if (c >= '0' && c <= '9')
+    {
+      return c - '0';
+    }
+  else if (c >= 'A' && c <= 'F')
+    {
+      return c - 'A' + 10;
+    }
+  else if (c >= 'a' && c <= 'f')
+    {
+      return c - 'a' + 10;
+    }
+
+  return -1;
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_hex_to_char
+ *
+ * Description:
+ *   Convert binary nibble to ASCII hex character.
+ *
+ * Input Parameters:
+ *   nibble - Binary value 0-15
+ *
+ * Returned Value:
+ *   ASCII hex character
+ *
+ ****************************************************************************/
+
+static char nxmb_ascii_hex_to_char(uint8_t nibble)
+{
+  if (nibble < 10)
+    {
+      return '0' + nibble;
+    }
+  else
+    {
+      return 'A' + (nibble - 10);
+    }
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_encode
+ *
+ * Description:
+ *   Encode binary data to ASCII hex string.
+ *
+ * Input Parameters:
+ *   bin     - Binary data
+ *   bin_len - Binary data length
+ *   ascii   - Output ASCII buffer
+ *
+ * Returned Value:
+ *   ASCII string length
+ *
+ ****************************************************************************/
+
+static uint16_t nxmb_ascii_encode(FAR const uint8_t *bin, uint16_t bin_len,
+                                  FAR char *ascii)
+{
+  uint16_t pos = 0;
+  uint16_t i;
+
+  for (i = 0; i < bin_len; i++)
+    {
+      ascii[pos++] = nxmb_ascii_hex_to_char(bin[i] >> 4);
+      ascii[pos++] = nxmb_ascii_hex_to_char(bin[i] & 0x0f);
+    }
+
+  return pos;
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_decode
+ *
+ * Description:
+ *   Decode ASCII hex string to binary data.
+ *
+ * Input Parameters:
+ *   ascii     - ASCII hex string
+ *   ascii_len - ASCII string length (must be even)
+ *   bin       - Output binary buffer
+ *
+ * Returned Value:
+ *   Binary data length, or negative errno on error
+ *
+ ****************************************************************************/
+
+static int nxmb_ascii_decode(FAR const char *ascii, uint16_t ascii_len,
+                             FAR uint8_t *bin)
+{
+  uint16_t i;
+  int      high;
+  int      low;
+
+  if (ascii_len % 2 != 0)
+    {
+      return -EINVAL;
+    }
+
+  for (i = 0; i < ascii_len; i += 2)
+    {
+      high = nxmb_ascii_char_to_hex(ascii[i]);
+      low  = nxmb_ascii_char_to_hex(ascii[i + 1]);
+
+      if (high < 0 || low < 0)
+        {
+          return -EINVAL;
+        }
+
+      bin[i / 2] = (high << 4) | low;
+    }
+
+  return ascii_len / 2;
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_init
+ *
+ * Description:
+ *   Initialize serial ASCII transport.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_ascii_init(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_ascii_state_s         *state;
+  FAR const struct nxmb_serial_config_s *cfg;
+  int                                    ret;
+
+  DEBUGASSERT(ctx);
+
+  cfg = &ctx->transport_cfg.serial;
+
+  if (cfg->devpath == NULL)
+    {
+      return -EINVAL;
+    }
+
+  state = calloc(1, sizeof(struct nxmb_ascii_state_s));
+  if (state == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  state->fd = open(cfg->devpath, O_RDWR | O_NOCTTY);
+  if (state->fd < 0)
+    {
+      ret = -errno;
+      free(state);
+      return ret;
+    }
+
+#ifdef CONFIG_SERIAL_TERMIOS
+  if (tcgetattr(state->fd, &state->old_tio) < 0)
+    {
+      ret = -errno;
+      close(state->fd);
+      free(state);
+      return ret;
+    }
+
+  ret = nxmb_serial_configure(state->fd, cfg->baudrate, cfg->parity);
+  if (ret < 0)
+    {
+      close(state->fd);
+      free(state);
+      return ret;
+    }
+#endif
+
+  state->rx_pos   = 0;
+  state->in_frame = false;
+
+  ctx->transport_state = state;
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_deinit
+ *
+ * Description:
+ *   Deinitialize serial ASCII transport.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_ascii_deinit(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_ascii_state_s *state;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+#ifdef CONFIG_SERIAL_TERMIOS
+  tcsetattr(state->fd, TCSANOW, &state->old_tio);
+#endif
+  close(state->fd);
+  free(state);
+
+  ctx->transport_state = NULL;
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_send
+ *
+ * Description:
+ *   Send ASCII frame over serial port.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_ascii_send(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_ascii_state_s *state;
+  uint8_t                        bin[NXMB_ASCII_BIN_MAX];
+  char                           tx_buf[NXMB_ASCII_BUFLEN];
+  uint16_t                       data_len;
+  uint16_t                       pos = 0;
+  uint8_t                        lrc;
+  ssize_t                        written;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  if (ctx->adu.length < 2)
+    {
+      return -EINVAL;
+    }
+
+  data_len = ctx->adu.length - 2;
+
+  /* Linearize the ADU into the wire byte order: unit_id, fc, data... */
+
+  bin[0] = ctx->adu.unit_id;
+  bin[1] = ctx->adu.fc;
+  memcpy(&bin[2], ctx->adu.data, data_len);
+
+  lrc          = nxmb_lrc(bin, ctx->adu.length);
+  ctx->adu.crc = lrc;
+
+  tx_buf[pos++] = NXMB_ASCII_START_CHAR;
+  pos += nxmb_ascii_encode(bin, ctx->adu.length, &tx_buf[pos]);
+  tx_buf[pos++] = nxmb_ascii_hex_to_char(lrc >> 4);
+  tx_buf[pos++] = nxmb_ascii_hex_to_char(lrc & 0x0f);
+  tx_buf[pos++] = NXMB_ASCII_CR;
+  tx_buf[pos++] = NXMB_ASCII_LF;
+
+  written = write(state->fd, tx_buf, pos);
+
+  if (written < 0)
+    {
+      return -errno;
+    }
+
+  if (written != pos)
+    {
+      return -EIO;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_ascii_receive
+ *
+ * Description:
+ *   Receive ASCII frame from serial port.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_ascii_receive(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_ascii_state_s *state;
+  uint8_t                        bin[NXMB_ASCII_BIN_MAX];
+  struct timeval                 timeout;
+  fd_set                         readfds;
+  ssize_t                        nread;
+  uint8_t                        c;
+  uint8_t                        lrc_calc;
+  uint8_t                        lrc_recv;
+  int                            ret;
+  int                            bin_len;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  FD_ZERO(&readfds);
+  FD_SET(state->fd, &readfds);
+
+  timeout.tv_sec  = CONFIG_NXMODBUS_ASCII_TIMEOUT_SEC;
+  timeout.tv_usec = 0;
+
+  ret = select(state->fd + 1, &readfds, NULL, NULL, &timeout);
+
+  if (ret < 0)
+    {
+      return -errno;
+    }
+
+  if (ret == 0)
+    {
+      return 0;
+    }
+
+  if (!FD_ISSET(state->fd, &readfds))
+    {
+      return 0;
+    }
+
+  nread = read(state->fd, &c, 1);
+  if (nread < 0)
+    {
+      return -errno;
+    }
+
+  if (nread == 0)
+    {
+      return 0;
+    }
+
+  if (c == NXMB_ASCII_START_CHAR)
+    {
+      state->rx_pos   = 0;
+      state->in_frame = true;
+      return 0;
+    }
+
+  if (!state->in_frame)
+    {
+      return 0;
+    }
+
+  if (c == NXMB_ASCII_LF)
+    {
+      state->in_frame = false;
+
+      /* Minimum valid frame: addr(2) + func(2) + lrc(2) + CR = 7 chars.
+       * Maximum valid frame: NXMB_ASCII_BIN_MAX hex pairs + CR. Reject
+       * anything larger so the decoded length fits bin[].
+       */
+
+      if (state->rx_pos < 7 ||
+          state->rx_pos > NXMB_ASCII_BIN_MAX * 2 + 1 ||
+          state->rx_buf[state->rx_pos - 1] != NXMB_ASCII_CR)
+        {
+          state->rx_pos = 0;
+          return 0;
+        }
+
+      /* Decode all hex chars (exclude CR) into a temp binary buffer.
+       * Layout: unit_id + fc + data... + LRC.
+       */
+
+      bin_len = nxmb_ascii_decode((FAR const char *)state->rx_buf,
+                                  state->rx_pos - 1, bin);
+
+      if (bin_len < 3)
+        {
+          state->rx_pos = 0;
+          return 0;
+        }
+
+      lrc_calc = nxmb_lrc(bin, bin_len - 1);
+      lrc_recv = bin[bin_len - 1];
+
+      if (lrc_calc != lrc_recv)
+        {
+          state->rx_pos = 0;
+          return 0;
+        }
+
+      /* Unpack into ctx->adu. Length excludes LRC. */
+
+      ctx->adu.unit_id = bin[0];
+      ctx->adu.fc      = bin[1];
+      memcpy(ctx->adu.data, &bin[2], (bin_len - 3));
+      ctx->adu.crc     = lrc_recv;
+      ctx->adu.length  = (bin_len - 1);
+
+      state->rx_pos = 0;
+
+      return 1;
+    }
+
+  if (state->rx_pos < sizeof(state->rx_buf))
+    {
+      state->rx_buf[state->rx_pos++] = c;
+    }
+  else
+    {
+      state->in_frame = false;
+      state->rx_pos   = 0;
+    }
+
+  return 0;
+}
diff --git a/industry/nxmodbus/transport/nxmb_crc.c b/industry/nxmodbus/transport/nxmb_crc.c
new file mode 100644
index 000000000..abfffffb4
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_crc.c
@@ -0,0 +1,108 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_crc.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const uint16_t g_crc16_table[256] =
+{
+  0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241, 0xc601,
+  0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440, 0xcc01, 0x0cc0,
+  0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40, 0x0a00, 0xcac1, 0xcb81,
+  0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841, 0xd801, 0x18c0, 0x1980, 0xd941,
+  0x1b00, 0xdbc1, 0xda81, 0x1a40, 0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01,
+  0x1dc0, 0x1c80, 0xdc41, 0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0,
+  0x1680, 0xd641, 0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081,
+  0x1040, 0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,
+  0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441, 0x3c00,
+  0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41, 0xfa01, 0x3ac0,
+  0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840, 0x2800, 0xe8c1, 0xe981,
+  0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41, 0xee01, 0x2ec0, 0x2f80, 0xef41,
+  0x2d00, 0xedc1, 0xec81, 0x2c40, 0xe401, 0x24c0, 0x2580, 0xe541, 0x2700,
+  0xe7c1, 0xe681, 0x2640, 0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0,
+  0x2080, 0xe041, 0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281,
+  0x6240, 0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,
+  0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41, 0xaa01,
+  0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840, 0x7800, 0xb8c1,
+  0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41, 0xbe01, 0x7ec0, 0x7f80,
+  0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40, 0xb401, 0x74c0, 0x7580, 0xb541,
+  0x7700, 0xb7c1, 0xb681, 0x7640, 0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101,
+  0x71c0, 0x7080, 0xb041, 0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0,
+  0x5280, 0x9241, 0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481,
+  0x5440, 0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,
+  0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841, 0x8801,
+  0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40, 0x4e00, 0x8ec1,
+  0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41, 0x4400, 0x84c1, 0x8581,
+  0x4540, 0x8701, 0x47c0, 0x4680, 0x8641, 0x8201, 0x42c0, 0x4380, 0x8341,
+  0x4100, 0x81c1, 0x8081, 0x4040
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_crc16
+ *
+ * Description:
+ *   Calculate Modbus RTU CRC16 checksum.
+ *
+ * Input Parameters:
+ *   buf - Pointer to data buffer
+ *   len - Length of data in bytes
+ *
+ * Returned Value:
+ *   CRC16 value
+ *
+ ****************************************************************************/
+
+uint16_t nxmb_crc16(FAR const uint8_t *buf, uint16_t len)
+{
+  uint16_t crc = 0xffff;
+  uint8_t  index;
+
+  if (buf == NULL || len == 0)
+    {
+      return crc;
+    }
+
+  while (len--)
+    {
+      index = (crc ^ *buf++);
+      crc   = (crc >> 8) ^ g_crc16_table[index];
+    }
+
+  return crc;
+}
diff --git a/industry/nxmodbus/transport/nxmb_lrc.c b/industry/nxmodbus/transport/nxmb_lrc.c
new file mode 100644
index 000000000..7768c9cb5
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_lrc.c
@@ -0,0 +1,70 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_lrc.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_lrc
+ *
+ * Description:
+ *   Calculate Modbus ASCII LRC checksum.
+ *
+ * Input Parameters:
+ *   buf - Pointer to data buffer
+ *   len - Length of data in bytes
+ *
+ * Returned Value:
+ *   LRC value (8-bit)
+ *
+ ****************************************************************************/
+
+uint8_t nxmb_lrc(FAR const uint8_t *buf, uint16_t len)
+{
+  uint8_t  lrc = 0;
+  uint16_t i;
+
+  if (buf == NULL || len == 0)
+    {
+      return lrc;
+    }
+
+  for (i = 0; i < len; i++)
+    {
+      lrc += buf[i];
+    }
+
+  return (uint8_t)(-((int8_t)lrc));
+}
diff --git a/industry/nxmodbus/transport/nxmb_raw.c b/industry/nxmodbus/transport/nxmb_raw.c
new file mode 100644
index 000000000..8352581fe
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_raw.c
@@ -0,0 +1,303 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_raw.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <nxmodbus/nxmb_raw.h>
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MBAP_PROTO_ID 0x0000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Raw ADU transport state */
+
+struct nxmb_raw_state_s
+{
+  FAR void         *user_data;
+  nxmb_raw_tx_cb_t  tx_callback;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int nxmb_raw_init(nxmb_handle_t ctx);
+static int nxmb_raw_deinit(nxmb_handle_t ctx);
+static int nxmb_raw_send(nxmb_handle_t ctx);
+static int nxmb_raw_receive(nxmb_handle_t ctx);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct nxmb_transport_ops_s g_nxmb_raw_ops =
+{
+  .init    = nxmb_raw_init,
+  .deinit  = nxmb_raw_deinit,
+  .send    = nxmb_raw_send,
+  .receive = nxmb_raw_receive,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_raw_init
+ *
+ * Description:
+ *   Initialize raw ADU transport.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_raw_init(nxmb_handle_t ctx)
+{
+  FAR const struct nxmb_raw_config_s *cfg;
+  FAR struct nxmb_raw_state_s        *state;
+
+  DEBUGASSERT(ctx);
+
+  cfg = &ctx->transport_cfg.raw;
+
+  if (cfg->tx_cb == NULL)
+    {
+      return -EINVAL;
+    }
+
+  state = malloc(sizeof(struct nxmb_raw_state_s));
+  if (state == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  state->tx_callback = cfg->tx_cb;
+  state->user_data   = cfg->user_data;
+
+  ctx->transport_state = state;
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_raw_deinit
+ *
+ * Description:
+ *   Deinitialize raw ADU transport.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_raw_deinit(nxmb_handle_t ctx)
+{
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  free(ctx->transport_state);
+  ctx->transport_state = NULL;
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_raw_send
+ *
+ * Description:
+ *   Send raw ADU via user callback.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_raw_send(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_raw_state_s *state;
+  int                          ret;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  if (state->tx_callback == NULL)
+    {
+      return -EINVAL;
+    }
+
+  ctx->adu.proto_id = MBAP_PROTO_ID;
+
+  ret = state->tx_callback(&ctx->adu, state->user_data);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_raw_receive
+ *
+ * Description:
+ *   Receive raw ADU (not used in raw mode, frames are submitted via
+ *   nxmb_raw_submit_rx).
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   -ENOTSUP (raw mode uses submit pattern, not polling)
+ *
+ ****************************************************************************/
+
+static int nxmb_raw_receive(nxmb_handle_t ctx)
+{
+  return -ENOTSUP;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_raw_submit_rx
+ *
+ * Description:
+ *   Submit a received raw ADU into the NxModbus protocol core.
+ *
+ * Input Parameters:
+ *   h   - The NxModbus instance receiving the frame
+ *   adu - The received raw ADU container
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_raw_submit_rx(nxmb_handle_t ctx, FAR const struct nxmb_adu_s *adu)
+{
+  DEBUGASSERT(ctx && adu);
+
+  if (adu->proto_id != MBAP_PROTO_ID)
+    {
+      return -EPROTO;
+    }
+
+  if (adu->length < 2)
+    {
+      return -EINVAL;
+    }
+
+  if ((adu->length - 2) > NXMB_ADU_DATA_MAX)
+    {
+      return -EMSGSIZE;
+    }
+
+  pthread_mutex_lock(&ctx->lock);
+  ctx->adu = *adu;
+  pthread_mutex_unlock(&ctx->lock);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_raw_put_header
+ *
+ * Description:
+ *   Serialize the 8-byte MBAP+FC header for an ADU.
+ *
+ * Input Parameters:
+ *   adu - The ADU providing the header fields
+ *   hdr - The destination buffer for the serialized header
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+void nxmb_raw_put_header(FAR const struct nxmb_adu_s *adu, FAR uint8_t *hdr)
+{
+  DEBUGASSERT(adu && hdr);
+
+  nxmb_util_put_u16_be(&hdr[0], adu->trans_id);
+  nxmb_util_put_u16_be(&hdr[2], adu->proto_id);
+  nxmb_util_put_u16_be(&hdr[4], adu->length);
+  hdr[6] = adu->unit_id;
+  hdr[7] = adu->fc;
+}
+
+/****************************************************************************
+ * Name: nxmb_raw_get_header
+ *
+ * Description:
+ *   Parse the 8-byte MBAP+FC header into an ADU structure.
+ *
+ * Input Parameters:
+ *   adu - The destination ADU structure
+ *   hdr - The source buffer containing the serialized header
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+void nxmb_raw_get_header(FAR struct nxmb_adu_s *adu, FAR const uint8_t *hdr)
+{
+  DEBUGASSERT(adu && hdr);
+
+  adu->trans_id = nxmb_util_get_u16_be(&hdr[0]);
+  adu->proto_id = nxmb_util_get_u16_be(&hdr[2]);
+  adu->length   = nxmb_util_get_u16_be(&hdr[4]);
+  adu->unit_id  = hdr[6];
+  adu->fc       = hdr[7];
+}
diff --git a/industry/nxmodbus/transport/nxmb_serial.c b/industry/nxmodbus/transport/nxmb_serial.c
new file mode 100644
index 000000000..679e0d597
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_serial.c
@@ -0,0 +1,423 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_serial.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/select.h>
+#include <unistd.h>
+
+#ifdef CONFIG_SERIAL_TERMIOS
+#  include <termios.h>
+#endif
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NXMB_RTU_MIN_FRAME_SIZE 5
+
+/* Wire frame: unit_id + fc + data + 2 CRC bytes */
+
+#define NXMB_RTU_FRAME_MAX      (NXMB_ADU_DATA_MAX + 4)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct nxmb_serial_state_s
+{
+  int            fd;
+  uint32_t       t35_usec;
+  bool           rx_frame_now;
+  uint16_t       rx_pos;
+  uint8_t        rx_buf[NXMB_RTU_FRAME_MAX];
+#ifdef CONFIG_SERIAL_TERMIOS
+  struct termios old_tio;
+#endif
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static uint32_t nxmb_serial_calculate_t35(uint32_t baudrate);
+static int nxmb_serial_init(nxmb_handle_t ctx);
+static int nxmb_serial_deinit(nxmb_handle_t ctx);
+static int nxmb_serial_send(nxmb_handle_t ctx);
+static int nxmb_serial_receive(nxmb_handle_t ctx);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct nxmb_transport_ops_s g_nxmb_serial_ops =
+{
+  .init    = nxmb_serial_init,
+  .deinit  = nxmb_serial_deinit,
+  .send    = nxmb_serial_send,
+  .receive = nxmb_serial_receive
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_serial_calculate_t35
+ *
+ * Description:
+ *   Calculate T3.5 character timeout in microseconds based on baud rate.
+ *
+ * Input Parameters:
+ *   baudrate - Serial baud rate
+ *
+ * Returned Value:
+ *   T3.5 timeout in microseconds
+ *
+ ****************************************************************************/
+
+static uint32_t nxmb_serial_calculate_t35(uint32_t baudrate)
+{
+  if (baudrate <= 19200)
+    {
+      /* T3.5 = 3.5 * 11 bits/char * 1e6 us/s / baudrate
+       * = 38500000 / baudrate (in microseconds).
+       * Use integer arithmetic to avoid floating-point, which may
+       * require FPU context save/restore on embedded targets.
+       */
+
+      return 38500000u / baudrate;
+    }
+  else
+    {
+      /* Per Modbus spec, fixed 1750 us for baud rates above 19200 */
+
+      return 1750;
+    }
+}
+
+/****************************************************************************
+ * Name: nxmb_serial_init
+ *
+ * Description:
+ *   Initialize serial RTU transport.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_serial_init(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_serial_state_s        *state;
+  FAR const struct nxmb_serial_config_s *cfg;
+  int                                    ret;
+
+  DEBUGASSERT(ctx);
+
+  cfg = &ctx->transport_cfg.serial;
+
+  if (cfg->devpath == NULL)
+    {
+      return -EINVAL;
+    }
+
+  state = calloc(1, sizeof(struct nxmb_serial_state_s));
+  if (state == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  state->fd = open(cfg->devpath, O_RDWR | O_NOCTTY);
+  if (state->fd < 0)
+    {
+      ret = -errno;
+      free(state);
+      return ret;
+    }
+
+#ifdef CONFIG_SERIAL_TERMIOS
+  if (tcgetattr(state->fd, &state->old_tio) < 0)
+    {
+      ret = -errno;
+      close(state->fd);
+      free(state);
+      return ret;
+    }
+
+  ret = nxmb_serial_configure(state->fd, cfg->baudrate, cfg->parity);
+
+  if (ret < 0)
+    {
+      close(state->fd);
+      free(state);
+      return ret;
+    }
+
+  tcflush(state->fd, TCIOFLUSH);
+#endif
+
+  state->t35_usec     = nxmb_serial_calculate_t35(cfg->baudrate);
+  state->rx_frame_now = false;
+
+  ctx->transport_state = state;
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_serial_deinit
+ *
+ * Description:
+ *   Deinitialize serial RTU transport.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_serial_deinit(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_serial_state_s *state;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+#ifdef CONFIG_SERIAL_TERMIOS
+  tcsetattr(state->fd, TCSANOW, &state->old_tio);
+#endif
+  close(state->fd);
+  free(state);
+
+  ctx->transport_state = NULL;
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_serial_send
+ *
+ * Description:
+ *   Send RTU frame over serial port.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_serial_send(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_serial_state_s *state;
+  uint8_t                         frame[NXMB_RTU_FRAME_MAX];
+  uint16_t                        data_len;
+  uint16_t                        total;
+  uint16_t                        crc;
+  ssize_t                         written;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  if (ctx->adu.length < 2)
+    {
+      return -EINVAL;
+    }
+
+  data_len = ctx->adu.length - 2;
+
+  /* Linearize the ADU and append CRC: unit_id, fc, data..., crc_lo, crc_hi */
+
+  frame[0] = ctx->adu.unit_id;
+  frame[1] = ctx->adu.fc;
+  memcpy(&frame[2], ctx->adu.data, data_len);
+
+  crc = nxmb_crc16(frame, ctx->adu.length);
+
+  frame[ctx->adu.length]     = (crc & 0xff);
+  frame[ctx->adu.length + 1] = (crc >> 8);
+
+  ctx->adu.crc = crc;
+
+  total   = ctx->adu.length + 2;
+  written = write(state->fd, frame, total);
+
+  if (written < 0)
+    {
+      return -errno;
+    }
+
+  if (written != total)
+    {
+      return -EIO;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: nxmb_serial_receive
+ *
+ * Description:
+ *   Receive RTU frame from serial port with dynamic timeout.
+ *
+ * Input Parameters:
+ *   ctx - Instance context
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static int nxmb_serial_receive(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_serial_state_s *state;
+  struct timeval                  timeout;
+  fd_set                          readfds;
+  ssize_t                         nread;
+  uint16_t                        crc_calc;
+  uint16_t                        crc_recv;
+  uint16_t                        data_len;
+  int                             ret;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  FD_ZERO(&readfds);
+  FD_SET(state->fd, &readfds);
+
+  if (state->rx_frame_now)
+    {
+      timeout.tv_sec  = 0;
+      timeout.tv_usec = state->t35_usec;
+    }
+  else
+    {
+      timeout.tv_sec  = 0;
+      timeout.tv_usec = CONFIG_NXMODBUS_RTU_IDLE_TIMEOUT_MS * 1000;
+    }
+
+  ret = select(state->fd + 1, &readfds, NULL, NULL, &timeout);
+
+  if (ret < 0)
+    {
+      return -errno;
+    }
+
+  if (ret == 0)
+    {
+      if (state->rx_frame_now)
+        {
+          state->rx_frame_now = false;
+
+          if (state->rx_pos < NXMB_RTU_MIN_FRAME_SIZE)
+            {
+              state->rx_pos = 0;
+              return 0;
+            }
+
+          crc_calc = nxmb_crc16(state->rx_buf, state->rx_pos - 2);
+          crc_recv = state->rx_buf[state->rx_pos - 2] |
+                     (state->rx_buf[state->rx_pos - 1] << 8);
+
+          if (crc_calc != crc_recv)
+            {
+              state->rx_pos = 0;
+              return 0;
+            }
+
+          /* Unpack frame into ctx->adu (excluding the trailing CRC). */
+
+          data_len         = (state->rx_pos - 4);
+          ctx->adu.unit_id = state->rx_buf[0];
+          ctx->adu.fc      = state->rx_buf[1];
+          memcpy(ctx->adu.data, &state->rx_buf[2], data_len);
+          ctx->adu.crc     = crc_recv;
+          ctx->adu.length  = (state->rx_pos - 2);
+
+          state->rx_pos = 0;
+          return 1;
+        }
+
+      return 0;
+    }
+
+  if (!FD_ISSET(state->fd, &readfds))
+    {
+      return 0;
+    }
+
+  if (!state->rx_frame_now)
+    {
+      state->rx_pos       = 0;
+      state->rx_frame_now = true;
+    }
+
+  nread = read(state->fd,
+               &state->rx_buf[state->rx_pos],
+               sizeof(state->rx_buf) - state->rx_pos);
+  if (nread < 0)
+    {
+      return -errno;
+    }
+
+  if (nread == 0)
+    {
+      return 0;
+    }
+
+  state->rx_pos += nread;
+
+  if (state->rx_pos >= sizeof(state->rx_buf))
+    {
+      state->rx_pos       = 0;
+      state->rx_frame_now = false;
+      return 0;
+    }
+
+  return 0;
+}
diff --git a/industry/nxmodbus/transport/nxmb_serial_common.c b/industry/nxmodbus/transport/nxmb_serial_common.c
new file mode 100644
index 000000000..72b2d1a87
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_serial_common.c
@@ -0,0 +1,138 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_serial_common.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/compiler.h>
+
+#include <errno.h>
+#include <stdint.h>
+
+#ifdef CONFIG_SERIAL_TERMIOS
+#  include <termios.h>
+#endif
+
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_SERIAL_TERMIOS
+
+/****************************************************************************
+ * Name: nxmb_serial_configure
+ *
+ * Description:
+ *   Configure serial port with termios settings for Modbus communication.
+ *
+ * Input Parameters:
+ *   fd       - File descriptor
+ *   baudrate - Baud rate
+ *   parity   - Parity setting
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+int nxmb_serial_configure(int fd, uint32_t baudrate,
+                          enum nxmb_parity_e parity)
+{
+  struct termios tio;
+  speed_t        speed;
+
+  if (tcgetattr(fd, &tio) < 0)
+    {
+      return -errno;
+    }
+
+  switch (baudrate)
+    {
+      case 9600:
+        speed = B9600;
+        break;
+      case 19200:
+        speed = B19200;
+        break;
+      case 38400:
+        speed = B38400;
+        break;
+      case 57600:
+        speed = B57600;
+        break;
+      case 115200:
+        speed = B115200;
+        break;
+      default:
+        return -EINVAL;
+    }
+
+  cfsetispeed(&tio, speed);
+  cfsetospeed(&tio, speed);
+
+  tio.c_cflag &= ~(CSIZE | PARENB | PARODD | CSTOPB);
+  tio.c_cflag |= CS8 | CLOCAL | CREAD;
+
+  switch (parity)
+    {
+      case NXMB_PAR_NONE:
+
+        /* Modbus spec: no parity requires 2 stop bits so the
+         * character frame remains 11 bits.
+         */
+
+        tio.c_cflag |= CSTOPB;
+        break;
+      case NXMB_PAR_EVEN:
+        tio.c_cflag |= PARENB;
+        break;
+      case NXMB_PAR_ODD:
+        tio.c_cflag |= PARENB | PARODD;
+        break;
+      default:
+        return -EINVAL;
+    }
+
+  tio.c_iflag &=
+    ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+  tio.c_oflag &= ~OPOST;
+  tio.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+
+  tio.c_cc[VMIN]  = 0;
+  tio.c_cc[VTIME] = 0;
+
+  if (tcsetattr(fd, TCSANOW, &tio) < 0)
+    {
+      return -errno;
+    }
+
+  return 0;
+}
+
+#endif /* CONFIG_SERIAL_TERMIOS */
diff --git a/industry/nxmodbus/transport/nxmb_tcp.c b/industry/nxmodbus/transport/nxmb_tcp.c
new file mode 100644
index 000000000..f4b2dc940
--- /dev/null
+++ b/industry/nxmodbus/transport/nxmb_tcp.c
@@ -0,0 +1,684 @@
+/****************************************************************************
+ * apps/industry/nxmodbus/transport/nxmb_tcp.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+#include <nxmodbus/nxmb_raw.h>
+#include <nxmodbus/nxmodbus.h>
+
+#include "nxmb_internal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MBAP_HEADER_SIZE 7
+#define MBAP_FC_SIZE     8
+#define NXMB_TCP_RECV_MS 1000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct nxmb_tcp_client_s
+{
+  int      fd;
+  uint16_t trans_id;
+  time_t   last_activity;
+};
+
+struct nxmb_tcp_state_s
+{
+  struct nxmb_tcp_client_s clients[CONFIG_NXMODBUS_TCP_MAX_CLIENTS];
+  int                      listen_fd;
+  int                      active_idx;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int nxmb_tcp_init(nxmb_handle_t ctx);
+static int nxmb_tcp_deinit(nxmb_handle_t ctx);
+static int nxmb_tcp_send(nxmb_handle_t ctx);
+static int nxmb_tcp_receive(nxmb_handle_t ctx);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct nxmb_transport_ops_s g_nxmb_tcp_ops =
+{
+  .init    = nxmb_tcp_init,
+  .deinit  = nxmb_tcp_deinit,
+  .send    = nxmb_tcp_send,
+  .receive = nxmb_tcp_receive,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmb_tcp_put_header
+ ****************************************************************************/
+
+static void nxmb_tcp_put_header(FAR const struct nxmb_adu_s *adu,
+                                FAR uint8_t *hdr)
+{
+  nxmb_util_put_u16_be(&hdr[0], adu->trans_id);
+  nxmb_util_put_u16_be(&hdr[2], adu->proto_id);
+  nxmb_util_put_u16_be(&hdr[4], adu->length);
+  hdr[6] = adu->unit_id;
+  hdr[7] = adu->fc;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_get_header
+ ****************************************************************************/
+
+static void nxmb_tcp_get_header(FAR struct nxmb_adu_s *adu,
+                                FAR const uint8_t *hdr)
+{
+  adu->trans_id = nxmb_util_get_u16_be(&hdr[0]);
+  adu->proto_id = nxmb_util_get_u16_be(&hdr[2]);
+  adu->length   = nxmb_util_get_u16_be(&hdr[4]);
+  adu->unit_id  = hdr[6];
+  adu->fc       = hdr[7];
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_create_server
+ ****************************************************************************/
+
+static int nxmb_tcp_create_server(FAR const struct nxmb_tcp_config_s *cfg)
+{
+  struct sockaddr_in addr;
+  int                listen_fd;
+  int                ret;
+#ifdef CONFIG_NET_SOCKOPTS
+  int                opt = 1;
+#endif
+
+  listen_fd = socket(AF_INET, SOCK_STREAM, 0);
+  if (listen_fd < 0)
+    {
+      return -errno;
+    }
+
+#ifdef CONFIG_NET_SOCKOPTS
+  setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
+#endif
+
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port   = htons(cfg->port);
+
+  if (cfg->bindaddr != NULL)
+    {
+      ret = inet_pton(AF_INET, cfg->bindaddr, &addr.sin_addr);
+      if (ret != 1)
+        {
+          close(listen_fd);
+          return -EINVAL;
+        }
+    }
+  else
+    {
+      addr.sin_addr.s_addr = htonl(INADDR_ANY);
+    }
+
+  ret = bind(listen_fd, (FAR struct sockaddr *)&addr, sizeof(addr));
+  if (ret < 0)
+    {
+      close(listen_fd);
+      return -errno;
+    }
+
+  ret = listen(listen_fd, CONFIG_NXMODBUS_TCP_MAX_CLIENTS);
+  if (ret < 0)
+    {
+      close(listen_fd);
+      return -errno;
+    }
+
+  return listen_fd;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_connect_client
+ ****************************************************************************/
+
+static int nxmb_tcp_connect_client(FAR const struct nxmb_tcp_config_s *cfg)
+{
+  struct sockaddr_in addr;
+  int                client_fd;
+  int                ret;
+
+  if (cfg->host == NULL)
+    {
+      return -EINVAL;
+    }
+
+  client_fd = socket(AF_INET, SOCK_STREAM, 0);
+  if (client_fd < 0)
+    {
+      return -errno;
+    }
+
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port   = htons(cfg->port);
+
+  ret = inet_pton(AF_INET, cfg->host, &addr.sin_addr);
+  if (ret != 1)
+    {
+      close(client_fd);
+      return -EINVAL;
+    }
+
+  ret = connect(client_fd, (FAR struct sockaddr *)&addr, sizeof(addr));
+  if (ret < 0)
+    {
+      close(client_fd);
+      return -errno;
+    }
+
+  return client_fd;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_recv_full
+ ****************************************************************************/
+
+static int nxmb_tcp_recv_full(int fd, FAR uint8_t *buf, size_t len,
+                              int timeout_ms)
+{
+  struct timeval tv;
+  fd_set         readfds;
+  size_t         received;
+  int            ret;
+
+  received = 0;
+
+  while (received < len)
+    {
+      FD_ZERO(&readfds);
+      FD_SET(fd, &readfds);
+
+      tv.tv_sec  = timeout_ms / 1000;
+      tv.tv_usec = (timeout_ms % 1000) * 1000;
+
+      ret = select(fd + 1, &readfds, NULL, NULL, &tv);
+      if (ret < 0)
+        {
+          return -errno;
+        }
+      else if (ret == 0)
+        {
+          return -ETIMEDOUT;
+        }
+
+      ret = recv(fd, &buf[received], len - received, 0);
+      if (ret < 0)
+        {
+          if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+            {
+              continue;
+            }
+
+          return -errno;
+        }
+      else if (ret == 0)
+        {
+          return -ECONNRESET;
+        }
+
+      received += ret;
+    }
+
+  return received;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_init
+ ****************************************************************************/
+
+static int nxmb_tcp_init(nxmb_handle_t ctx)
+{
+  FAR const struct nxmb_tcp_config_s *cfg;
+  FAR struct nxmb_tcp_state_s        *state;
+  int                                 fd;
+  int                                 i;
+
+  DEBUGASSERT(ctx);
+
+  cfg = &ctx->transport_cfg.tcp;
+
+  state = calloc(1, sizeof(struct nxmb_tcp_state_s));
+  if (state == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  state->listen_fd  = -1;
+  state->active_idx = -1;
+
+  for (i = 0; i < CONFIG_NXMODBUS_TCP_MAX_CLIENTS; i++)
+    {
+      state->clients[i].fd = -1;
+    }
+
+  if (ctx->is_client)
+    {
+      fd = nxmb_tcp_connect_client(cfg);
+      if (fd < 0)
+        {
+          free(state);
+          return fd;
+        }
+
+      state->clients[0].fd            = fd;
+      state->clients[0].last_activity = time(NULL);
+    }
+  else
+    {
+      fd = nxmb_tcp_create_server(cfg);
+      if (fd < 0)
+        {
+          free(state);
+          return fd;
+        }
+
+      state->listen_fd = fd;
+    }
+
+  ctx->transport_state = state;
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_deinit
+ ****************************************************************************/
+
+static int nxmb_tcp_deinit(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_tcp_state_s *state;
+  int                          i;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  for (i = 0; i < CONFIG_NXMODBUS_TCP_MAX_CLIENTS; i++)
+    {
+      if (state->clients[i].fd >= 0)
+        {
+          close(state->clients[i].fd);
+        }
+    }
+
+  if (state->listen_fd >= 0)
+    {
+      close(state->listen_fd);
+    }
+
+  free(state);
+  ctx->transport_state = NULL;
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_send
+ ****************************************************************************/
+
+static int nxmb_tcp_send(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_tcp_state_s  *state;
+  FAR struct nxmb_tcp_client_s *client;
+  uint8_t                       header[MBAP_FC_SIZE];
+  struct iovec                  iov[2];
+  uint16_t                      data_len;
+  uint16_t                      total;
+  ssize_t                       sent;
+  int                           fd;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+
+  /* For server mode, respond to the client that sent the request.
+   * For client mode, use the single connection (index 0).
+   */
+
+  if (ctx->is_client)
+    {
+      client = &state->clients[0];
+    }
+  else
+    {
+      if (state->active_idx < 0)
+        {
+          return -ENOTCONN;
+        }
+
+      client = &state->clients[state->active_idx];
+    }
+
+  fd = client->fd;
+  if (fd < 0)
+    {
+      return -ENOTCONN;
+    }
+
+  if (ctx->adu.length < 2)
+    {
+      return -EINVAL;
+    }
+
+  /* Populate the MBAP fields before serializing the header */
+
+  ctx->adu.trans_id = client->trans_id;
+  ctx->adu.proto_id = 0x0000;
+
+  data_len = ctx->adu.length - 2;
+
+  /* Emit MBAP header + PDU data via writev() to avoid a stack-side
+   * copy. The kernel gathers both iovecs into a single TCP segment.
+   */
+
+  nxmb_tcp_put_header(&ctx->adu, header);
+
+  iov[0].iov_base = header;
+  iov[0].iov_len  = MBAP_FC_SIZE;
+  iov[1].iov_base = ctx->adu.data;
+  iov[1].iov_len  = data_len;
+
+  total = MBAP_FC_SIZE + data_len;
+  sent  = writev(fd, iov, (data_len > 0) ? 2 : 1);
+  if (sent != total)
+    {
+      return (sent < 0) ? -errno : -EIO;
+    }
+
+  client->last_activity = time(NULL);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_evict_idle
+ *
+ * Description:
+ *   Close idle client connections that exceed the configured timeout.
+ *
+ ****************************************************************************/
+
+static void nxmb_tcp_evict_idle(FAR struct nxmb_tcp_state_s *state,
+                                time_t now)
+{
+  int i;
+
+  for (i = 0; i < CONFIG_NXMODBUS_TCP_MAX_CLIENTS; i++)
+    {
+      if (state->clients[i].fd >= 0 &&
+          (now - state->clients[i].last_activity) >
+          CONFIG_NXMODBUS_TCP_TIMEOUT_SEC)
+        {
+          close(state->clients[i].fd);
+          state->clients[i].fd = -1;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_accept_new
+ *
+ * Description:
+ *   Accept a pending connection into the first free client slot.
+ *
+ ****************************************************************************/
+
+static void nxmb_tcp_accept_new(FAR struct nxmb_tcp_state_s *state)
+{
+  int fd;
+  int i;
+
+  fd = accept(state->listen_fd, NULL, NULL);
+  if (fd < 0)
+    {
+      return;
+    }
+
+  for (i = 0; i < CONFIG_NXMODBUS_TCP_MAX_CLIENTS; i++)
+    {
+      if (state->clients[i].fd < 0)
+        {
+          state->clients[i].fd            = fd;
+          state->clients[i].last_activity = time(NULL);
+          return;
+        }
+    }
+
+  /* No free slot -- reject the connection */
+
+  close(fd);
+}
+
+/****************************************************************************
+ * Name: nxmb_tcp_read_frame
+ *
+ * Description:
+ *   Read a complete Modbus TCP frame from a client connection.
+ *   On error (except timeout), the connection is closed.
+ *
+ ****************************************************************************/
+
+static int nxmb_tcp_read_frame(nxmb_handle_t ctx,
+                               FAR struct nxmb_tcp_client_s *client)
+{
+  uint8_t  header[MBAP_FC_SIZE];
+  uint16_t data_len;
+  int      ret;
+
+  ret = nxmb_tcp_recv_full(client->fd, header, MBAP_FC_SIZE,
+                           NXMB_TCP_RECV_MS);
+  if (ret < 0)
+    {
+      if (ret == -ETIMEDOUT || ret == -EAGAIN)
+        {
+          return -EAGAIN;
+        }
+
+      close(client->fd);
+      client->fd = -1;
+      return ret;
+    }
+
+  nxmb_tcp_get_header(&ctx->adu, header);
+
+  if (ctx->adu.proto_id != 0x0000)
+    {
+      close(client->fd);
+      client->fd = -1;
+      return -EPROTO;
+    }
+
+  if (ctx->adu.length < 2)
+    {
+      close(client->fd);
+      client->fd = -1;
+      return -EINVAL;
+    }
+
+  data_len = ctx->adu.length - 2;
+
+  if (data_len > NXMB_ADU_DATA_MAX)
+    {
+      close(client->fd);
+      client->fd = -1;
+      return -EMSGSIZE;
+    }
+
+  if (data_len > 0)
+    {
+      ret = nxmb_tcp_recv_full(client->fd, ctx->adu.data, data_len,
+                               NXMB_TCP_RECV_MS);
+      if (ret < 0)
+        {
+          close(client->fd);
+          client->fd = -1;
+          return ret;
+        }
+    }
+
+  client->trans_id      = ctx->adu.trans_id;
+  client->last_activity = time(NULL);
+
+  return ctx->adu.length;
+}
+
+static int nxmb_tcp_receive(nxmb_handle_t ctx)
+{
+  FAR struct nxmb_tcp_state_s *state;
+  struct timeval               tv;
+  fd_set                       readfds;
+  time_t                       now;
+  int                          maxfd;
+  int                          ret;
+  int                          i;
+
+  DEBUGASSERT(ctx && ctx->transport_state);
+
+  state = ctx->transport_state;
+  state->active_idx = -1;
+
+  /* Client mode: single connection, read directly */
+
+  if (ctx->is_client)
+    {
+      if (state->clients[0].fd < 0)
+        {
+          return -ENOTCONN;
+        }
+
+      state->active_idx = 0;
+      return nxmb_tcp_read_frame(ctx, &state->clients[0]);
+    }
+
+  /* Server mode: multiplex listen socket + all client connections */
+
+  now = time(NULL);
+  nxmb_tcp_evict_idle(state, now);
+
+  FD_ZERO(&readfds);
+  maxfd = -1;
+
+  if (state->listen_fd >= 0)
+    {
+      FD_SET(state->listen_fd, &readfds);
+      maxfd = state->listen_fd;
+    }
+
+  for (i = 0; i < CONFIG_NXMODBUS_TCP_MAX_CLIENTS; i++)
+    {
+      if (state->clients[i].fd >= 0)
+        {
+          FD_SET(state->clients[i].fd, &readfds);
+          if (state->clients[i].fd > maxfd)
+            {
+              maxfd = state->clients[i].fd;
+            }
+        }
+    }
+
+  if (maxfd < 0)
+    {
+      return -EAGAIN;
+    }
+
+  tv.tv_sec  = 0;
+  tv.tv_usec = 50000;
+
+  ret = select(maxfd + 1, &readfds, NULL, NULL, &tv);
+  if (ret < 0)
+    {
+      return -errno;
+    }
+
+  if (ret == 0)
+    {
+      return -EAGAIN;
+    }
+
+  /* Accept new connections if listen socket is ready */
+
+  if (state->listen_fd >= 0 && FD_ISSET(state->listen_fd, &readfds))
+    {
+      nxmb_tcp_accept_new(state);
+    }
+
+  /* Check each client for incoming data (first ready wins).
+   * In server mode, a per-client read failure (disconnect, protocol
+   * error, etc.) must not be fatal - nxmb_tcp_read_frame has already
+   * closed the offending fd, and the listen socket remains open for new
+   * connections. Translate any such error to -EAGAIN so the caller
+   * keeps polling.
+   */
+
+  for (i = 0; i < CONFIG_NXMODBUS_TCP_MAX_CLIENTS; i++)
+    {
+      if (state->clients[i].fd >= 0 &&
+          FD_ISSET(state->clients[i].fd, &readfds))
+        {
+          state->active_idx = i;
+          ret = nxmb_tcp_read_frame(ctx, &state->clients[i]);
+          if (ret < 0 && ret != -EAGAIN)
+            {
+              state->active_idx = -1;
+              return -EAGAIN;
+            }
+
+          return ret;
+        }
+    }
+
+  return -EAGAIN;
+}
diff --git a/system/nxmbclient/CMakeLists.txt b/system/nxmbclient/CMakeLists.txt
new file mode 100644
index 000000000..fa463ae85
--- /dev/null
+++ b/system/nxmbclient/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/system/nxmbclient/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_NXMBCLIENT)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_NXMBCLIENT_PROGNAME}
+    PRIORITY
+    ${CONFIG_NXMBCLIENT_PRIORITY}
+    STACKSIZE
+    ${CONFIG_NXMBCLIENT_STACKSIZE}
+    MODULE
+    ${CONFIG_SYSTEM_NXMBCLIENT}
+    SRCS
+    nxmbclient_main.c)
+endif()
diff --git a/system/nxmbclient/Kconfig b/system/nxmbclient/Kconfig
new file mode 100644
index 000000000..8768d601c
--- /dev/null
+++ b/system/nxmbclient/Kconfig
@@ -0,0 +1,32 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_NXMBCLIENT
+	tristate "NxModbus Client Tool"
+	default n
+	depends on NXMODBUS_CLIENT
+	---help---
+		Enable the NxModbus client command-line tool. This utility allows
+		you to perform Modbus client operations from the command line,
+		supporting RTU, ASCII, and TCP transports.
+
+if SYSTEM_NXMBCLIENT
+
+config NXMBCLIENT_PROGNAME
+	string "Program name"
+	default "nxmbclient"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config NXMBCLIENT_PRIORITY
+	int "NxModbus client task priority"
+	default 100
+
+config NXMBCLIENT_STACKSIZE
+	int "NxModbus client stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif # SYSTEM_NXMBCLIENT
diff --git a/system/nxmbclient/Make.defs b/system/nxmbclient/Make.defs
new file mode 100644
index 000000000..e171ba4d4
--- /dev/null
+++ b/system/nxmbclient/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/nxmbclient/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_NXMBCLIENT),)
+CONFIGURED_APPS += $(APPDIR)/system/nxmbclient
+endif
diff --git a/system/nxmbclient/Makefile b/system/nxmbclient/Makefile
new file mode 100644
index 000000000..f4e1a7cc0
--- /dev/null
+++ b/system/nxmbclient/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/system/nxmbclient/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+MAINSRC = nxmbclient_main.c
+
+PROGNAME  = $(CONFIG_NXMBCLIENT_PROGNAME)
+PRIORITY  = $(CONFIG_NXMBCLIENT_PRIORITY)
+STACKSIZE = $(CONFIG_NXMBCLIENT_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_NXMBCLIENT)
+
+include $(APPDIR)/Application.mk
diff --git a/system/nxmbclient/nxmbclient_main.c b/system/nxmbclient/nxmbclient_main.c
new file mode 100644
index 000000000..eb550d07c
--- /dev/null
+++ b/system/nxmbclient/nxmbclient_main.c
@@ -0,0 +1,799 @@
+/****************************************************************************
+ * apps/system/nxmbclient/nxmbclient_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nxmodbus/nxmb_client.h>
+#include <nxmodbus/nxmodbus.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DEFAULT_TIMEOUT_MS 1000
+#define DEFAULT_UNIT_ID    1
+#define DEFAULT_TCP_PORT   502
+#define DEFAULT_BAUDRATE   115200
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Modbus client type */
+
+enum transport_type_e
+{
+  TRANSPORT_RTU = 0,
+  TRANSPORT_ASCII,
+  TRANSPORT_TCP
+};
+
+/* Modbus client configuration */
+
+struct nxmbclient_config_s
+{
+  enum transport_type_e  transport;
+  enum nxmb_parity_e     parity;
+  FAR const char        *device;
+  FAR const char        *host;
+  uint32_t               baudrate;
+  uint16_t               port;
+  uint8_t                unit_id;
+  uint32_t               timeout_ms;
+  uint32_t               poll_ms;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static volatile bool g_running = true;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: signal_handler
+ ****************************************************************************/
+
+static void signal_handler(int signo)
+{
+  g_running = false;
+}
+
+/****************************************************************************
+ * Name: show_usage
+ ****************************************************************************/
+
+static void show_usage(FAR const char *progname)
+{
+  printf("Usage: %s [OPTIONS] COMMAND [ARGS...]\n\n", progname);
+  printf("Transport Options:\n");
+  printf("  -t TYPE     Transport type: rtu, ascii, tcp (required)\n");
+  printf("  -d DEVICE   Serial device path (for RTU/ASCII)\n");
+  printf("  -b BAUD     Baud rate (default: %u)\n", DEFAULT_BAUDRATE);
+  printf("  -p PARITY   Parity: none, even, odd (default: none)\n");
+  printf("  -h HOST     TCP host address (for TCP)\n");
+  printf("  -P PORT     TCP port (default: %u)\n", DEFAULT_TCP_PORT);
+  printf("\nModbus Options:\n");
+  printf("  -u UNIT     Unit ID (default: %u)\n", DEFAULT_UNIT_ID);
+  printf("  -T TIMEOUT  Timeout in ms (default: %u)\n", DEFAULT_TIMEOUT_MS);
+  printf("  --poll MS   Polling interval in ms (0 = one-shot)\n");
+  printf("\nCommands:\n");
+  printf("  read-coils ADDR COUNT\n");
+  printf("  read-discrete ADDR COUNT\n");
+  printf("  read-input ADDR COUNT\n");
+  printf("  read-holding ADDR COUNT\n");
+  printf("  write-coil ADDR VALUE\n");
+  printf("  write-holding ADDR VALUE\n");
+  printf("  write-coils ADDR VALUE...\n");
+  printf("  write-holdings ADDR VALUE...\n");
+}
+
+/****************************************************************************
+ * Name: parse_parity
+ ****************************************************************************/
+
+static int parse_parity(FAR const char *str, FAR enum nxmb_parity_e *parity)
+{
+  if (strcmp(str, "none") == 0)
+    {
+      *parity = NXMB_PAR_NONE;
+    }
+  else if (strcmp(str, "even") == 0)
+    {
+      *parity = NXMB_PAR_EVEN;
+    }
+  else if (strcmp(str, "odd") == 0)
+    {
+      *parity = NXMB_PAR_ODD;
+    }
+  else
+    {
+      return -EINVAL;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: parse_transport
+ ****************************************************************************/
+
+static int parse_transport(FAR const char *str,
+                           FAR enum transport_type_e *transport)
+{
+  if (strcmp(str, "rtu") == 0)
+    {
+      *transport = TRANSPORT_RTU;
+    }
+  else if (strcmp(str, "ascii") == 0)
+    {
+      *transport = TRANSPORT_ASCII;
+    }
+  else if (strcmp(str, "tcp") == 0)
+    {
+      *transport = TRANSPORT_TCP;
+    }
+  else
+    {
+      return -EINVAL;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_read_coils
+ ****************************************************************************/
+
+static int cmd_read_coils(nxmb_handle_t handle, uint8_t unit_id,
+                          int argc, FAR char **argv)
+{
+  FAR uint8_t *values;
+  uint16_t     addr;
+  uint16_t     count;
+  uint16_t     nbytes;
+  int          ret;
+  int          i;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: read-coils requires ADDR COUNT\n");
+      return -EINVAL;
+    }
+
+  addr   = (uint16_t)strtoul(argv[0], NULL, 0);
+  count  = (uint16_t)strtoul(argv[1], NULL, 0);
+  nbytes = (count + 7) / 8;
+
+  values = malloc(nbytes);
+  if (values == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  memset(values, 0, nbytes);
+
+  ret = nxmb_read_coils(handle, unit_id, addr, count, values);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: read-coils failed: %d\n", ret);
+      free(values);
+      return ret;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      printf("%u\t%u\n", addr + i,
+             (values[i / 8] >> (i % 8)) & 1);
+    }
+
+  free(values);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_read_discrete
+ ****************************************************************************/
+
+static int cmd_read_discrete(nxmb_handle_t handle, uint8_t unit_id,
+                             int argc, FAR char **argv)
+{
+  FAR uint8_t *values;
+  uint16_t     addr;
+  uint16_t     count;
+  uint16_t     nbytes;
+  int          ret;
+  int          i;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: read-discrete requires ADDR COUNT\n");
+      return -EINVAL;
+    }
+
+  addr   = (uint16_t)strtoul(argv[0], NULL, 0);
+  count  = (uint16_t)strtoul(argv[1], NULL, 0);
+  nbytes = (count + 7) / 8;
+
+  values = malloc(nbytes);
+  if (values == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  memset(values, 0, nbytes);
+
+  ret = nxmb_read_discrete(handle, unit_id, addr, count, values);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: read-discrete failed: %d\n", ret);
+      free(values);
+      return ret;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      printf("%u\t%u\n", addr + i,
+             (values[i / 8] >> (i % 8)) & 1);
+    }
+
+  free(values);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_read_input
+ ****************************************************************************/
+
+static int cmd_read_input(nxmb_handle_t handle, uint8_t unit_id,
+                          int argc, FAR char **argv)
+{
+  FAR uint16_t *values;
+  uint16_t      addr;
+  uint16_t      count;
+  int           ret;
+  int           i;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: read-input requires ADDR COUNT\n");
+      return -EINVAL;
+    }
+
+  addr  = (uint16_t)strtoul(argv[0], NULL, 0);
+  count = (uint16_t)strtoul(argv[1], NULL, 0);
+
+  values = malloc(count * sizeof(uint16_t));
+  if (values == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  ret = nxmb_read_input(handle, unit_id, addr, count, values);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: read-input failed: %d\n", ret);
+      free(values);
+      return ret;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      printf("%u\t%u\n", addr + i, values[i]);
+    }
+
+  free(values);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_read_holding
+ ****************************************************************************/
+
+static int cmd_read_holding(nxmb_handle_t handle, uint8_t unit_id,
+                            int argc, FAR char **argv)
+{
+  FAR uint16_t *values;
+  uint16_t      addr;
+  uint16_t      count;
+  int           ret;
+  int           i;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: read-holding requires ADDR COUNT\n");
+      return -EINVAL;
+    }
+
+  addr  = (uint16_t)strtoul(argv[0], NULL, 0);
+  count = (uint16_t)strtoul(argv[1], NULL, 0);
+
+  values = malloc(count * sizeof(uint16_t));
+  if (values == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  ret = nxmb_read_holding(handle, unit_id, addr, count, values);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: read-holding failed: %d\n", ret);
+      free(values);
+      return ret;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      printf("%u\t%u\n", addr + i, values[i]);
+    }
+
+  free(values);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_write_coil
+ ****************************************************************************/
+
+static int cmd_write_coil(nxmb_handle_t handle, uint8_t unit_id,
+                          int argc, FAR char **argv)
+{
+  uint16_t addr;
+  uint8_t  value;
+  int      ret;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: write-coil requires ADDR VALUE\n");
+      return -EINVAL;
+    }
+
+  addr  = (uint16_t)strtoul(argv[0], NULL, 0);
+  value = (uint8_t)strtoul(argv[1], NULL, 0);
+
+  ret = nxmb_write_coil(handle, unit_id, addr, value);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: write-coil failed: %d\n", ret);
+      return ret;
+    }
+
+  printf("OK\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_write_holding
+ ****************************************************************************/
+
+static int cmd_write_holding(nxmb_handle_t handle, uint8_t unit_id,
+                             int argc, FAR char **argv)
+{
+  uint16_t addr;
+  uint16_t value;
+  int      ret;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: write-holding requires ADDR VALUE\n");
+      return -EINVAL;
+    }
+
+  addr  = (uint16_t)strtoul(argv[0], NULL, 0);
+  value = (uint16_t)strtoul(argv[1], NULL, 0);
+
+  ret = nxmb_write_holding(handle, unit_id, addr, value);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: write-holding failed: %d\n", ret);
+      return ret;
+    }
+
+  printf("OK\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_write_coils
+ ****************************************************************************/
+
+static int cmd_write_coils(nxmb_handle_t handle, uint8_t unit_id,
+                           int argc, FAR char **argv)
+{
+  FAR uint8_t *values;
+  uint16_t addr;
+  uint16_t count;
+  int ret;
+  int i;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: write-coils requires ADDR VALUE...\n");
+      return -EINVAL;
+    }
+
+  addr  = (uint16_t)strtoul(argv[0], NULL, 0);
+  count = argc - 1;
+
+  values = malloc(count);
+  if (values == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      values[i] = (uint8_t)strtoul(argv[i + 1], NULL, 0);
+    }
+
+  ret = nxmb_write_coils(handle, unit_id, addr, count, values);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: write-coils failed: %d\n", ret);
+      free(values);
+      return ret;
+    }
+
+  free(values);
+  printf("OK\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: cmd_write_holdings
+ ****************************************************************************/
+
+static int cmd_write_holdings(nxmb_handle_t handle, uint8_t unit_id,
+                              int argc, FAR char **argv)
+{
+  FAR uint16_t *values;
+  uint16_t      addr;
+  uint16_t      count;
+  int           ret;
+  int           i;
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "Error: write-holdings requires ADDR VALUE...\n");
+      return -EINVAL;
+    }
+
+  addr  = (uint16_t)strtoul(argv[0], NULL, 0);
+  count = argc - 1;
+
+  values = malloc(count * sizeof(uint16_t));
+  if (values == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      values[i] = (uint16_t)strtoul(argv[i + 1], NULL, 0);
+    }
+
+  ret = nxmb_write_holdings(handle, unit_id, addr, count, values);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: write-holdings failed: %d\n", ret);
+      free(values);
+      return ret;
+    }
+
+  free(values);
+  printf("OK\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: execute_command
+ ****************************************************************************/
+
+static int execute_command(nxmb_handle_t handle,
+                           uint8_t unit_id,
+                           FAR const char *cmd,
+                           int argc,
+                           FAR char **argv)
+{
+  if (strcmp(cmd, "read-coils") == 0)
+    {
+      return cmd_read_coils(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "read-discrete") == 0)
+    {
+      return cmd_read_discrete(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "read-input") == 0)
+    {
+      return cmd_read_input(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "read-holding") == 0)
+    {
+      return cmd_read_holding(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "write-coil") == 0)
+    {
+      return cmd_write_coil(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "write-holding") == 0)
+    {
+      return cmd_write_holding(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "write-coils") == 0)
+    {
+      return cmd_write_coils(handle, unit_id, argc, argv);
+    }
+  else if (strcmp(cmd, "write-holdings") == 0)
+    {
+      return cmd_write_holdings(handle, unit_id, argc, argv);
+    }
+  else
+    {
+      fprintf(stderr, "Error: unknown command '%s'\n", cmd);
+      return -EINVAL;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxmbclient_main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct nxmbclient_config_s   config;
+  struct nxmb_config_s         mb_config;
+  nxmb_handle_t                handle = NULL;
+  struct sigaction             sa;
+  FAR const char              *cmd;
+  int                          option;
+  int                          ret;
+  int                          cmd_argc;
+  FAR char                   **cmd_argv;
+
+  /* Initialize config with defaults */
+
+  memset(&config, 0, sizeof(config));
+  config.baudrate   = DEFAULT_BAUDRATE;
+  config.parity     = NXMB_PAR_NONE;
+  config.port       = DEFAULT_TCP_PORT;
+  config.unit_id    = DEFAULT_UNIT_ID;
+  config.timeout_ms = DEFAULT_TIMEOUT_MS;
+  config.poll_ms    = 0;
+
+  /* Parse options */
+
+  while ((option = getopt(argc, argv, "t:d:b:p:h:P:u:T:-:")) != -1)
+    {
+      switch (option)
+        {
+          case 't':
+            if (parse_transport(optarg, &config.transport) < 0)
+              {
+                fprintf(stderr, "Error: invalid transport '%s'\n", optarg);
+                return EXIT_FAILURE;
+              }
+            break;
+
+          case 'd':
+            config.device = optarg;
+            break;
+
+          case 'b':
+            config.baudrate = strtoul(optarg, NULL, 0);
+            break;
+
+          case 'p':
+            if (parse_parity(optarg, &config.parity) < 0)
+              {
+                fprintf(stderr, "Error: invalid parity '%s'\n", optarg);
+                return EXIT_FAILURE;
+              }
+            break;
+
+          case 'h':
+            config.host = optarg;
+            break;
+
+          case 'P':
+            config.port = (uint16_t)strtoul(optarg, NULL, 0);
+            break;
+
+          case 'u':
+            config.unit_id = (uint8_t)strtoul(optarg, NULL, 0);
+            break;
+
+          case 'T':
+            config.timeout_ms = strtoul(optarg, NULL, 0);
+            break;
+
+          case '-':
+            if (strcmp(optarg, "poll") == 0)
+              {
+                if (optind < argc)
+                  {
+                    config.poll_ms = strtoul(argv[optind++], NULL, 0);
+                  }
+                else
+                  {
+                    fprintf(stderr, "Error: --poll requires argument\n");
+                    return EXIT_FAILURE;
+                  }
+              }
+            else
+              {
+                fprintf(stderr, "Error: unknown option --%s\n", optarg);
+                return EXIT_FAILURE;
+              }
+            break;
+
+          default:
+            show_usage(argv[0]);
+            return EXIT_FAILURE;
+        }
+    }
+
+  /* Check for command */
+
+  if (optind >= argc)
+    {
+      fprintf(stderr, "Error: no command specified\n");
+      show_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  cmd       = argv[optind];
+  cmd_argc  = argc - optind - 1;
+  cmd_argv  = &argv[optind + 1];
+
+  /* Validate transport-specific options */
+
+  if (config.transport == TRANSPORT_RTU ||
+      config.transport == TRANSPORT_ASCII)
+    {
+      if (config.device == NULL)
+        {
+          fprintf(stderr, "Error: -d DEVICE required for RTU/ASCII\n");
+          return EXIT_FAILURE;
+        }
+    }
+  else if (config.transport == TRANSPORT_TCP)
+    {
+      if (config.host == NULL)
+        {
+          fprintf(stderr, "Error: -h HOST required for TCP\n");
+          return EXIT_FAILURE;
+        }
+    }
+
+  /* Setup signal handler for clean shutdown */
+
+  memset(&sa, 0, sizeof(sa));
+  sa.sa_handler = signal_handler;
+  sigaction(SIGINT, &sa, NULL);
+  sigaction(SIGTERM, &sa, NULL);
+
+  /* Create Modbus context */
+
+  memset(&mb_config, 0, sizeof(mb_config));
+  mb_config.unit_id   = config.unit_id;
+  mb_config.is_client = true;
+
+  if (config.transport == TRANSPORT_RTU)
+    {
+      mb_config.mode                      = NXMB_MODE_RTU;
+      mb_config.transport.serial.devpath  = config.device;
+      mb_config.transport.serial.baudrate = config.baudrate;
+      mb_config.transport.serial.parity   = config.parity;
+    }
+  else if (config.transport == TRANSPORT_ASCII)
+    {
+      mb_config.mode                      = NXMB_MODE_ASCII;
+      mb_config.transport.serial.devpath  = config.device;
+      mb_config.transport.serial.baudrate = config.baudrate;
+      mb_config.transport.serial.parity   = config.parity;
+    }
+  else if (config.transport == TRANSPORT_TCP)
+    {
+      mb_config.mode               = NXMB_MODE_TCP;
+      mb_config.transport.tcp.host = config.host;
+      mb_config.transport.tcp.port = config.port;
+    }
+
+  ret = nxmb_create(&handle, &mb_config);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: failed to create Modbus context: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  /* Enable context */
+
+  ret = nxmb_enable(handle);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: failed to enable context: %d\n", ret);
+      nxmb_destroy(handle);
+      return EXIT_FAILURE;
+    }
+
+  /* Set timeout */
+
+  ret = nxmb_set_timeout(handle, config.timeout_ms);
+  if (ret < 0)
+    {
+      fprintf(stderr, "Error: failed to set timeout: %d\n", ret);
+      nxmb_disable(handle);
+      nxmb_destroy(handle);
+      return EXIT_FAILURE;
+    }
+
+  /* Execute command (with optional polling) */
+
+  if (config.poll_ms > 0)
+    {
+      /* Polling mode */
+
+      while (g_running)
+        {
+          ret = execute_command(handle, config.unit_id, cmd, cmd_argc,
+                               cmd_argv);
+          if (ret < 0)
+            {
+              break;
+            }
+
+          usleep(config.poll_ms * 1000);
+        }
+    }
+  else
+    {
+      /* One-shot mode */
+
+      ret = execute_command(handle, config.unit_id, cmd, cmd_argc,
+                             cmd_argv);
+    }
+
+  /* Cleanup */
+
+  nxmb_disable(handle);
+  nxmb_destroy(handle);
+
+  return (ret < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
+}

From 180607372a12b26d1c312c7ef2f3774f235e3695 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 24 Apr 2026 09:19:23 +0200
Subject: [PATCH 297/568] .github/build.yml: improve ntfc installation

increase retries and timeout for pip install and try again in case of failure

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 .github/workflows/build.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 740d6f81d..a8aba0de8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -183,7 +183,15 @@ jobs:
           run: |
             export ARTIFACTDIR=`pwd`/buildartifacts
 
-            pip install ntfc==0.0.1
+            for i in 1 2 3; do
+              python -m pip install \
+                --default-timeout=100 \
+                --retries 10 \
+                ntfc==0.0.1 && break
+              echo "Retry $i failed..."
+              sleep 5
+            done
+
             mkdir /github/workspace/nuttx-ntfc
             mkdir /github/workspace/nuttx-ntfc/external
             cd /github/workspace/nuttx-ntfc

From eccfba4776808ad1a705d9da25793bdd8d227afe Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 24 Apr 2026 09:30:59 +0200
Subject: [PATCH 298/568] .github: use ntfc test cases from Apache repo

use ntfc test cases from Apache repo

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8aba0de8..05735c18d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -197,7 +197,8 @@ jobs:
             cd /github/workspace/nuttx-ntfc
             # get NTFC test cases
             cd external
-            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
+            git clone -b release-0.0.1 https://github.com/apache/nuttx-ntfc-testing
+            mv nuttx-ntfc-testing nuttx-testing
             export NTFCDIR=/github/workspace/nuttx-ntfc
 
             echo "::add-matcher::sources/nuttx/.github/gcc.json"

From 901278a4bab1ef503de1569096ff01f95b25c3d3 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Mon, 20 Apr 2026 17:04:51 -0300
Subject: [PATCH 299/568] examples: Remove deprecated `rmtchar` example
 application

The upper-half RMT driver is no longer available on NuttX. Instead,
Espressif's RMT peripheral was bound directly to the lirc driver.
For testing purposes, use the `irtest` application. NuttX OS PR
https://github.com/apache/nuttx/pull/18654 removed the upper-half
driver interface used by this application, so removing it does not
break any existing feature on NuttX.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 examples/rmtchar/CMakeLists.txt        |  40 ---
 examples/rmtchar/Kconfig               |  68 -----
 examples/rmtchar/Make.defs             |  25 --
 examples/rmtchar/Makefile              |  43 ---
 examples/rmtchar/rmtchar.h             | 129 ---------
 examples/rmtchar/rmtchar_common.c      |  93 -------
 examples/rmtchar/rmtchar_main.c        | 362 -------------------------
 examples/rmtchar/rmtchar_receiver.c    | 140 ----------
 examples/rmtchar/rmtchar_transmitter.c | 158 -----------
 9 files changed, 1058 deletions(-)
 delete mode 100644 examples/rmtchar/CMakeLists.txt
 delete mode 100644 examples/rmtchar/Kconfig
 delete mode 100644 examples/rmtchar/Make.defs
 delete mode 100644 examples/rmtchar/Makefile
 delete mode 100644 examples/rmtchar/rmtchar.h
 delete mode 100644 examples/rmtchar/rmtchar_common.c
 delete mode 100644 examples/rmtchar/rmtchar_main.c
 delete mode 100644 examples/rmtchar/rmtchar_receiver.c
 delete mode 100644 examples/rmtchar/rmtchar_transmitter.c

diff --git a/examples/rmtchar/CMakeLists.txt b/examples/rmtchar/CMakeLists.txt
deleted file mode 100644
index a01ebe080..000000000
--- a/examples/rmtchar/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# ##############################################################################
-# apps/examples/rmtchar/CMakeLists.txt
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  The ASF licenses this
-# file to you under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License.  You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations under
-# the License.
-#
-# ##############################################################################
-
-if(CONFIG_EXAMPLES_RMTCHAR)
-  nuttx_add_application(
-    NAME
-    rmtchar
-    STACKSIZE
-    ${CONFIG_DEFAULT_TASK_STACKSIZE}
-    MODULE
-    ${CONFIG_EXAMPLES_RMTCHAR}
-    SRCS
-    rmtchar_main.c)
-  target_sources(apps PRIVATE rmtchar_common.c)
-  if(CONFIG_EXAMPLES_RMTCHAR_TX)
-    target_sources(apps PRIVATE rmtchar_transmitter.c)
-  endif()
-  if(CONFIG_EXAMPLES_RMTCHAR_RX)
-    target_sources(apps PRIVATE rmtchar_receiver.c)
-  endif()
-endif()
diff --git a/examples/rmtchar/Kconfig b/examples/rmtchar/Kconfig
deleted file mode 100644
index e88da638a..000000000
--- a/examples/rmtchar/Kconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-config EXAMPLES_RMTCHAR
-	tristate "RMT character driver test"
-	default n
-	depends on RMT
-	---help---
-		Enable the RMT character driver test
-
-if EXAMPLES_RMTCHAR
-
-config EXAMPLES_RMTCHAR_TX
-	bool "Use RMT transmitter"
-	default n
-	---help---
-		This should be set if the RMT device supports a transmitter.
-
-if EXAMPLES_RMTCHAR_TX
-
-config EXAMPLES_RMTCHAR_TX_DEVPATH
-	string "RMT transmitter character device path"
-	default "/dev/rmt0"
-	---help---
-		The default path to the RMT transmitter character device.
-		Default: /dev/rmt0
-
-config EXAMPLES_RMTCHAR_TXSTACKSIZE
-	int "Transmitter thread stack size"
-	default DEFAULT_TASK_STACKSIZE
-	---help---
-		This is the stack size to use when starting the transmitter thread.
-
-endif # EXAMPLES_RMTCHAR_TX
-
-config EXAMPLES_RMTCHAR_RX
-	bool "Use RMT receiver"
-	default n
-	---help---
-		This should be set if the RMT device supports a receiver.
-
-if EXAMPLES_RMTCHAR_RX
-
-config EXAMPLES_RMTCHAR_RX_DEVPATH
-	string "RMT receiver character device path"
-	default "/dev/rmt1"
-	---help---
-		The default path to the RMT receiver character device.
-		Default: /dev/rmt1
-
-config EXAMPLES_RMTCHAR_RXSTACKSIZE
-	int "Receiver thread stack size"
-	default DEFAULT_TASK_STACKSIZE
-	---help---
-		This is the stack size to use when starting the receiver thread.
-
-endif # EXAMPLES_RMTCHAR_RX
-
-config EXAMPLES_RMTCHAR_ITEMS
-	int "Number of words to transmit or receive"
-	default 64
-	---help---
-		This is the total amount of words to be transmitted or
-		received by the RMT RX device.
-
-endif
diff --git a/examples/rmtchar/Make.defs b/examples/rmtchar/Make.defs
deleted file mode 100644
index 0b14b2487..000000000
--- a/examples/rmtchar/Make.defs
+++ /dev/null
@@ -1,25 +0,0 @@
-############################################################################
-# apps/examples/rmtchar/Make.defs
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-ifneq ($(CONFIG_EXAMPLES_RMTCHAR),)
-CONFIGURED_APPS += $(APPDIR)/examples/rmtchar
-endif
diff --git a/examples/rmtchar/Makefile b/examples/rmtchar/Makefile
deleted file mode 100644
index 2c6d454dd..000000000
--- a/examples/rmtchar/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-############################################################################
-# apps/examples/rmtchar/Makefile
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(APPDIR)/Make.defs
-
-# rmt character driver test
-
-ifeq ($(CONFIG_EXAMPLES_RMTCHAR_TX),y)
-CSRCS += rmtchar_transmitter.c
-endif
-ifeq ($(CONFIG_EXAMPLES_RMTCHAR_RX),y)
-CSRCS += rmtchar_receiver.c
-endif
-CSRCS += rmtchar_common.c
-MAINSRC = rmtchar_main.c
-
-# Touchscreen built-in application info
-
-PROGNAME = rmtchar
-PRIORITY = SCHED_PRIORITY_DEFAULT
-STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
-MODULE = $(CONFIG_EXAMPLES_RMTCHAR)
-
-include $(APPDIR)/Application.mk
diff --git a/examples/rmtchar/rmtchar.h b/examples/rmtchar/rmtchar.h
deleted file mode 100644
index 832b80a4c..000000000
--- a/examples/rmtchar/rmtchar.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
- * apps/examples/rmtchar/rmtchar.h
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __APPS_EXAMPLES_RMTCHAR_RMTCHAR_H
-#define __APPS_EXAMPLES_RMTCHAR_RMTCHAR_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <pthread.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration */
-
-#ifndef CONFIG_EXAMPLES_RMTCHAR_TX_DEVPATH
-#  define CONFIG_EXAMPLES_RMTCHAR_TX_DEVPATH "/dev/rmt0"
-#endif
-
-#ifndef CONFIG_EXAMPLES_RMTCHAR_RX_DEVPATH
-#  define CONFIG_EXAMPLES_RMTCHAR_RX_DEVPATH "/dev/rmt1"
-#endif
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-struct rmtchar_state_s
-{
-  bool initialized;
-  int rmtchar_items;
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-  FAR char *txdevpath;
-#endif
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-  FAR char *rxdevpath;
-#endif
-};
-
-struct rmt_item32_s
-{
-  union
-    {
-      struct
-        {
-          uint32_t duration0 : 15; /* Duration of level0 */
-          uint32_t level0 : 1;     /* Level of the first part */
-          uint32_t duration1 : 15; /* Duration of level1 */
-          uint32_t level1 : 1;     /* Level of the second part */
-        };
-      uint32_t val; /* Equivalent unsigned value for the RMT item */
-    };
-};
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: rmtchar_transmitter()
- *
- * Description:
- *   This is the entry point for the transmitter thread.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-pthread_addr_t rmtchar_transmitter(pthread_addr_t arg);
-#endif
-
-/****************************************************************************
- * Name: rmtchar_receiver()
- *
- * Description:
- *   This is the entry point for the receiver thread.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-pthread_addr_t rmtchar_receiver(pthread_addr_t arg);
-#endif
-
-/****************************************************************************
- * Name: print_items
- *
- * Description:
- *   This function prints the level and duration of RMT items stored in a
- *   buffer. It iterates over the buffer, printing the level and duration of
- *   each item in a formatted manner.
- *
- * Input Parameters:
- *   buf  - Pointer to the buffer containing the RMT items.
- *   len  - The number of RMT items in the buffer.
- *
- * Returned Value:
- *   None.
- *
- ****************************************************************************/
-
-void print_items(struct rmt_item32_s *buf, int len);
-
-#endif /* __APPS_EXAMPLES_RMTCHAR_RMTCHAR_H */
diff --git a/examples/rmtchar/rmtchar_common.c b/examples/rmtchar/rmtchar_common.c
deleted file mode 100644
index 098e5363a..000000000
--- a/examples/rmtchar/rmtchar_common.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
- * apps/examples/rmtchar/rmtchar_common.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <errno.h>
-#include <nuttx/debug.h>
-#include <unistd.h>
-
-#include "rmtchar.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: print_items
- *
- * Description:
- *   This function prints the level and duration of RMT items stored in a
- *   buffer. It iterates over the buffer, printing the level and duration of
- *   each item in a formatted manner.
- *
- * Input Parameters:
- *   buf  - Pointer to the buffer containing the RMT items.
- *   len  - The number of RMT items in the buffer.
- *
- * Returned Value:
- *   None.
- *
- ****************************************************************************/
-
-void print_items(struct rmt_item32_s *buf, int len)
-{
-  int i;
-
-  for (i = 0; i < len; i++, buf++)
-    {
-      printf("\t[%d]:\tL %d\tD %d\t", i, buf->level0, buf->duration0);
-      printf("L %d\t D %d\n", buf->level1, buf->duration1);
-    }
-}
diff --git a/examples/rmtchar/rmtchar_main.c b/examples/rmtchar/rmtchar_main.c
deleted file mode 100644
index 63a8ced85..000000000
--- a/examples/rmtchar/rmtchar_main.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/****************************************************************************
- * apps/examples/rmtchar/rmtchar_main.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <errno.h>
-#include <nuttx/debug.h>
-
-#include "rmtchar.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#if !defined(CONFIG_EXAMPLES_RMTCHAR_RX) && \
-    !defined(CONFIG_EXAMPLES_RMTCHAR_TX)
-#  error "At least one of CONFIG_EXAMPLES_RMTCHAR_RX or \
-          CONFIG_EXAMPLES_RMTCHAR_TX must be defined"
-#endif
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static struct rmtchar_state_s g_rmtchar;
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: rmtchar_devpath
- ****************************************************************************/
-
-static void rmtchar_devpath(FAR struct rmtchar_state_s *rmtchar,
-                            FAR const char *devpath,
-                            bool is_tx)
-{
-  /* Get rid of any old device path */
-
-  if (is_tx)
-    {
-      if (rmtchar->txdevpath)
-        {
-          free(rmtchar->txdevpath);
-        }
-
-      /* Then set-up the new device path by copying the string */
-
-      rmtchar->txdevpath = strdup(devpath);
-    }
-  else
-    {
-      if (rmtchar->rxdevpath)
-        {
-          free(rmtchar->rxdevpath);
-        }
-
-      /* Then set-up the new device path by copying the string */
-
-      rmtchar->rxdevpath = strdup(devpath);
-    }
-}
-
-/****************************************************************************
- * Name: rmtchar_help
- ****************************************************************************/
-
-static void rmtchar_help(FAR struct rmtchar_state_s *rmtchar)
-{
-  printf("Usage: rmtchar [OPTIONS]\n");
-  printf("\nArguments are \"sticky\".\n");
-  printf("For example, once the RMT character device is\n");
-  printf("specified, that device will be reused until it is changed.\n");
-  printf("\n\"sticky\" OPTIONS include:\n");
-  printf("  [-i items] selects the number of words (items) to be transmitted"
-         " or received by the RMT character device. "
-         "Default: %d Current: %d\n",
-         CONFIG_EXAMPLES_RMTCHAR_ITEMS,
-         rmtchar->rmtchar_items ? rmtchar->rmtchar_items :
-         CONFIG_EXAMPLES_RMTCHAR_ITEMS);
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-  printf("  [-t devpath] selects the RMT transmitter character device path. "
-         "Default: %s Current: %s\n",
-         CONFIG_EXAMPLES_RMTCHAR_TX_DEVPATH,
-         rmtchar->txdevpath ? rmtchar->txdevpath : "NONE");
-#endif
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-  printf("  [-r devpath] selects the RMT receiver character device path. "
-         "Default: %s Current: %s\n",
-         CONFIG_EXAMPLES_RMTCHAR_RX_DEVPATH,
-         rmtchar->rxdevpath ? rmtchar->rxdevpath : "NONE");
-#endif
-  printf("  [-h] shows this message and exits\n");
-}
-
-/****************************************************************************
- * Name: arg_string
- ****************************************************************************/
-
-static int arg_string(FAR char **arg, FAR char **value)
-{
-  FAR char *ptr = *arg;
-
-  if (ptr[2] == '\0')
-    {
-      *value = arg[1];
-      return 2;
-    }
-  else
-    {
-      *value = &ptr[2];
-      return 1;
-    }
-}
-
-/****************************************************************************
- * Name: arg_decimal
- ****************************************************************************/
-
-static int arg_decimal(FAR char **arg, FAR int *value)
-{
-  FAR char *string;
-  int ret;
-
-  ret = arg_string(arg, &string);
-  *value = strtol(string, NULL, 10);
-  return ret;
-}
-
-/****************************************************************************
- * Name: parse_args
- ****************************************************************************/
-
-static void parse_args(FAR struct rmtchar_state_s *rmtchar,
-                       int argc,
-                       FAR char **argv)
-{
-  FAR char *ptr;
-  FAR char *str;
-  int value;
-  int index;
-  int nargs;
-
-  for (index = 1; index < argc; )
-    {
-      ptr = argv[index];
-      if (ptr[0] != '-')
-        {
-          printf("Invalid options format: %s\n", ptr);
-          exit(0);
-        }
-
-      switch (ptr[1])
-        {
-          case 'i':
-            nargs = arg_decimal(&argv[index], &value);
-            if (value < 0)
-              {
-                printf("Count must be non-negative: %d\n", value);
-                exit(1);
-              }
-
-            rmtchar->rmtchar_items = value;
-            index += nargs;
-            break;
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-          case 't':
-            nargs = arg_string(&argv[index], &str);
-            rmtchar_devpath(rmtchar, str, true);
-            index += nargs;
-            break;
-#endif
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-          case 'r':
-            nargs = arg_string(&argv[index], &str);
-            rmtchar_devpath(rmtchar, str, false);
-            index += nargs;
-            break;
-#endif
-          case 'h':
-            rmtchar_help(rmtchar);
-            exit(0);
-
-          default:
-            printf("Unsupported option: %s\n", ptr);
-            rmtchar_help(rmtchar);
-            exit(1);
-        }
-    }
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: rmtchar_main
- ****************************************************************************/
-
-int main(int argc, FAR char *argv[])
-{
-  pthread_attr_t attr;
-  pthread_addr_t result;
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-  pthread_t transmitter;
-#endif
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-  pthread_t receiver;
-#endif
-#if defined(CONFIG_EXAMPLES_RMTCHAR_RX) && defined(CONFIG_EXAMPLES_RMTCHAR_TX)
-  struct sched_param param;
-#endif
-  int ret;
-
-  UNUSED(ret);
-
-  /* Check if we have initialized */
-
-  if (!g_rmtchar.initialized)
-    {
-      /* Set the default values */
-
-      g_rmtchar.rmtchar_items = CONFIG_EXAMPLES_RMTCHAR_ITEMS;
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-      rmtchar_devpath(&g_rmtchar, CONFIG_EXAMPLES_RMTCHAR_TX_DEVPATH, true);
-#endif
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-      rmtchar_devpath(&g_rmtchar, CONFIG_EXAMPLES_RMTCHAR_RX_DEVPATH, false);
-#endif
-
-      g_rmtchar.initialized = true;
-    }
-
-  /* Parse the command line */
-
-  parse_args(&g_rmtchar, argc, argv);
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-  /* Start the receiver thread */
-
-  printf("rmtchar_main: Start receiver thread\n");
-  pthread_attr_init(&attr);
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-  /* Bump the receiver priority from the default so that it will be above
-   * the priority of transmitter.  This is important if a loopback test is
-   * being performed.
-   */
-
-  pthread_attr_getschedparam(&attr, &param);
-  param.sched_priority++;
-  pthread_attr_setschedparam(&attr, &param);
-#endif
-
-  /* Set the receiver stack size */
-
-  pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_RMTCHAR_RXSTACKSIZE);
-
-  /* Start the receiver */
-
-  ret = pthread_create(&receiver, &attr, rmtchar_receiver, &g_rmtchar);
-  if (ret != OK)
-    {
-      printf("rmtchar_main: ERROR: failed to Start receiver thread: %d\n",
-             ret);
-      return EXIT_FAILURE;
-    }
-
-  pthread_setname_np(receiver, "receiver");
-#endif
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-  /* Start the transmitter thread */
-
-  printf("rmtchar_main: Start transmitter thread\n");
-  pthread_attr_init(&attr);
-
-  /* Set the transmitter stack size */
-
-  pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_RMTCHAR_TXSTACKSIZE);
-
-  /* Start the transmitter */
-
-  ret = pthread_create(&transmitter, &attr, rmtchar_transmitter, &g_rmtchar);
-  if (ret != OK)
-    {
-      printf("rmtchar_main: ERROR: failed to Start transmitter thread: %d\n",
-             ret);
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-      printf("rmtchar_main: Waiting for the receiver thread\n");
-      pthread_join(receiver, &result);
-#endif
-      return EXIT_FAILURE;
-    }
-
-  pthread_setname_np(transmitter, "transmitter");
-#endif
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-  printf("rmtchar_main: Waiting for the transmitter thread\n");
-  ret = pthread_join(transmitter, &result);
-  if (ret != OK)
-    {
-      printf("rmtchar_main: ERROR: pthread_join failed: %d\n", ret);
-    }
-#endif
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-  printf("rmtchar_main: Waiting for the receiver thread\n");
-  ret = pthread_join(receiver, &result);
-  if (ret != OK)
-    {
-      printf("rmtchar_main: ERROR: pthread_join failed: %d\n", ret);
-    }
-#endif
-
-  return EXIT_SUCCESS;
-}
diff --git a/examples/rmtchar/rmtchar_receiver.c b/examples/rmtchar/rmtchar_receiver.c
deleted file mode 100644
index 2e1b20e36..000000000
--- a/examples/rmtchar/rmtchar_receiver.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
- * apps/examples/rmtchar/rmtchar_receiver.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <errno.h>
-#include <nuttx/debug.h>
-#include <unistd.h>
-
-#include "rmtchar.h"
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_RX
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: rmtchar_receiver()
- *
- * Description:
- *   This is the entry point for the receiver thread.
- *
- ****************************************************************************/
-
-pthread_addr_t rmtchar_receiver(pthread_addr_t arg)
-{
-  FAR struct rmtchar_state_s *rmtchar = (FAR struct rmtchar_state_s *)arg;
-  struct rmt_item32_s buf[rmtchar->rmtchar_items];
-  int nread;
-  int fd;
-
-  /* Open the RMT character device */
-
-  fd = open(rmtchar->rxdevpath, O_RDONLY);
-  if (fd < 0)
-    {
-      int errcode = errno;
-      printf("rmtchar_receiver: ERROR: failed to open %s: %d\n",
-              rmtchar->rxdevpath, errcode);
-      pthread_exit(NULL);
-    }
-
-  /* Flush any output before reading */
-
-  fflush(stdout);
-
-  /* Read the buffer to the RMT character driver */
-
-  nread = read(fd, (char *)buf, rmtchar->rmtchar_items *
-               sizeof(struct rmt_item32_s));
-  if (nread < 0)
-    {
-      int errcode = errno;
-      if (errcode != EINTR)
-        {
-          printf("rmtchar_receiver: ERROR: read failed: %d\n",
-                  errcode);
-          close(fd);
-          pthread_exit(NULL);
-        }
-    }
-  else
-    {
-      if (nread != (rmtchar->rmtchar_items * sizeof(struct rmt_item32_s)))
-        {
-          printf("rmtchar_receiver: ERROR: partial read: %d\n",
-                  nread);
-          printf("rmtchar_receiver: Received buffer:\n");
-          print_items(buf, nread / sizeof(struct rmt_item32_s));
-          close(fd);
-          pthread_exit(NULL);
-        }
-      else
-        {
-          printf("rmtchar_receiver: Received buffer:\n");
-          print_items(buf, nread / sizeof(struct rmt_item32_s));
-        }
-    }
-
-  /* Make sure that the transmitter thread has a chance to run */
-
-  pthread_yield();
-
-  close(fd);
-  return NULL;
-}
-
-#endif /* CONFIG_EXAMPLES_RMTCHAR_RX */
diff --git a/examples/rmtchar/rmtchar_transmitter.c b/examples/rmtchar/rmtchar_transmitter.c
deleted file mode 100644
index 75fc0103b..000000000
--- a/examples/rmtchar/rmtchar_transmitter.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
- * apps/examples/rmtchar/rmtchar_transmitter.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <errno.h>
-#include <nuttx/debug.h>
-#include <unistd.h>
-
-#include <nuttx/audio/audio.h>
-
-#include "rmtchar.h"
-
-#ifdef CONFIG_EXAMPLES_RMTCHAR_TX
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: rmtchar_transmitter()
- *
- * Description:
- *   This is the entry point for the transmitter thread.
- *
- ****************************************************************************/
-
-pthread_addr_t rmtchar_transmitter(pthread_addr_t arg)
-{
-  FAR struct rmtchar_state_s *rmtchar = (FAR struct rmtchar_state_s *)arg;
-  struct rmt_item32_s buf[rmtchar->rmtchar_items];
-  int duration = 1000;
-  int nwritten;
-  int fd;
-  int i;
-
-  /* Open the RMT character device */
-
-  fd = open(rmtchar->txdevpath, O_WRONLY);
-  if (fd < 0)
-    {
-      int errcode = errno;
-      printf("rmtchar_transmitter: ERROR: failed to open %s: %d\n",
-              rmtchar->txdevpath, errcode);
-      pthread_exit(NULL);
-    }
-
-  /* Fill the transmitter buffer with known items */
-
-  for (i = 0; i < rmtchar->rmtchar_items; i++)
-    {
-      buf[i].level0 = 1;
-      buf[i].duration0 = duration;
-      buf[i].level1 = 0;
-      buf[i].duration1 = duration;
-
-      duration += 10;
-    }
-
-  /* Flush any output before writing */
-
-  fflush(stdout);
-
-  /* Print the buffer to be sent */
-
-  print_items(buf, rmtchar->rmtchar_items);
-
-  /* Then send the buffer */
-
-  /* Write the buffer to the RMT character driver */
-
-  nwritten = write(fd, (char *)buf, rmtchar->rmtchar_items *
-                   sizeof(struct rmt_item32_s));
-  if (nwritten < 0)
-    {
-      int errcode = errno;
-      if (errcode != EINTR)
-        {
-          printf("rmtchar_transmitter: ERROR: write failed: %d\n",
-                  errcode);
-          close(fd);
-          pthread_exit(NULL);
-        }
-    }
-  else if (nwritten != (rmtchar->rmtchar_items *
-                        sizeof(struct rmt_item32_s)))
-    {
-      printf("rmtchar_transmitter: ERROR: partial write: %d\n",
-              nwritten);
-      close(fd);
-      pthread_exit(NULL);
-    }
-  else
-    {
-      printf("rmtchar_transmitter: Send buffer with %d bytes\n",
-             rmtchar->rmtchar_items * sizeof(struct rmt_item32_s));
-    }
-
-  /* Make sure that the receiver thread has a chance to run */
-
-  pthread_yield();
-
-  close(fd);
-  return NULL;
-}
-
-#endif /* CONFIG_EXAMPLES_RMTCHAR_TX */

From 6cb1a04fe7e53a25893d5c0aa2155e214daf230a Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Mon, 20 Apr 2026 17:15:00 -0300
Subject: [PATCH 300/568] system/irtest: Fix issues regarding portability and
 buffer size

This commit fixes issues regarding portability by using variables
with fixed width (and their format macro constants).

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 system/irtest/Kconfig |  2 +-
 system/irtest/cmd.cxx | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/system/irtest/Kconfig b/system/irtest/Kconfig
index 34743bb87..e77bea6aa 100644
--- a/system/irtest/Kconfig
+++ b/system/irtest/Kconfig
@@ -32,7 +32,7 @@ config SYSTEM_IRTEST_MAX_NIRDEV
 	default 2
 
 config SYSTEM_IRTEST_MAX_SIRDATA
-	int "The Maximum size of sending data in unsigned int"
+	int "The Maximum size of sending data in nwords (4 bytes)"
 	default 64
 
 endif
diff --git a/system/irtest/cmd.cxx b/system/irtest/cmd.cxx
index d61527df7..8dde00437 100644
--- a/system/irtest/cmd.cxx
+++ b/system/irtest/cmd.cxx
@@ -226,7 +226,8 @@ CMD1(close_device, size_t, index)
 
 CMD1(write_data, size_t, index)
 {
-  unsigned int data[CONFIG_SYSTEM_IRTEST_MAX_SIRDATA];
+  uint32_t data[CONFIG_SYSTEM_IRTEST_MAX_SIRDATA];
+  uint32_t tmp;
 
   if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
@@ -236,7 +237,7 @@ CMD1(write_data, size_t, index)
   int size = 0;
   for (; size < CONFIG_SYSTEM_IRTEST_MAX_SIRDATA; size++)
     {
-      unsigned int tmp = get_next_arg < unsigned int > ();
+      tmp = get_next_arg < uint32_t > ();
       if (tmp == 0)
         {
           break;
@@ -250,14 +251,14 @@ CMD1(write_data, size_t, index)
   if (size % 2 == 0)
     {
       int result = write(g_irdevs[index], data,
-                         sizeof(unsigned int) * (size - 1));
+                         sizeof(uint32_t) * (size - 1));
       usleep(data[size - 1]);
       return result;
     }
   else
     {
       return write(g_irdevs[index], data,
-                   sizeof(unsigned int) * size);
+                   sizeof(uint32_t) * size);
     }
 }
 
@@ -268,20 +269,20 @@ CMD2(read_data, size_t, index, size_t, size)
       return ERROR;
     }
 
-  unsigned int data[size];
+  uint32_t data[size];
   int result = read(g_irdevs[index], data, sizeof(data));
   if (result > 0)
     {
-      result /= sizeof(unsigned int);
+      result /= sizeof(uint32_t);
       for (int i = 0; i < result; i++)
         {
           if (i + 1 == result)
             {
-              printf("%d\n", data[i]);
+              printf("%" PRIu32 "\n", data[i]);
             }
           else
             {
-              printf("%d, ", data[i]);
+              printf("%" PRIu32 ", ", data[i]);
             }
         }
     }

From 9b6b7607f20d2ce119d14ee56da084e1ff582ac7 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Mon, 20 Apr 2026 17:26:17 -0300
Subject: [PATCH 301/568] system/irtest: Avoids silently truncating long
 write_data commands

Long write_data commands can be truncated without any check due to
the maximum size of CONFIG_SYSTEM_IRTEST_MAX_SIRDATA. This commit
adds a check to avoid a silent fail.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 system/irtest/cmd.cxx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/system/irtest/cmd.cxx b/system/irtest/cmd.cxx
index 8dde00437..c8673c9b1 100644
--- a/system/irtest/cmd.cxx
+++ b/system/irtest/cmd.cxx
@@ -31,6 +31,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <unistd.h>
 
 #include "enum.hpp"
@@ -246,6 +247,17 @@ CMD1(write_data, size_t, index)
       data[size] = tmp;
     }
 
+  /* Avoid silently truncating long write_data commands. */
+
+  if (size == CONFIG_SYSTEM_IRTEST_MAX_SIRDATA)
+    {
+      tmp = get_next_arg < uint32_t > ();
+      if (tmp != 0)
+        {
+          return -E2BIG;
+        }
+    }
+
   /* lirc require the odd length */
 
   if (size % 2 == 0)

From 6379e531de0d73549a5242de1cc6c9ee7839db9b Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Mon, 20 Apr 2026 17:22:26 -0300
Subject: [PATCH 302/568] system/irtest: Set `irtest` command line size to
 CONFIG_LINE_MAX

Let `irtest` command line size be equal to CONFIG_LINE_MAX so that
bigger (or smaller) commands can be set.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 system/irtest/main.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/irtest/main.cxx b/system/irtest/main.cxx
index d8534aae6..a50976666 100644
--- a/system/irtest/main.cxx
+++ b/system/irtest/main.cxx
@@ -24,11 +24,17 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
+
 #include <stdio.h>
 
 #include "system/readline.h"
 #include "cmd.hpp"
 
+#ifndef CONFIG_LINE_MAX
+#  define CONFIG_LINE_MAX 512
+#endif
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -48,7 +54,7 @@ extern "C"
 {
 int main(int argc, char *argv[])
 {
-  char cmdline[512];
+  char cmdline[CONFIG_LINE_MAX];
 
   init_device();
 

From 62f3d37041f3a72dc71cec50187c656d89fed4e5 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 23 Apr 2026 23:16:47 +0800
Subject: [PATCH 303/568] examples/vncviewer: add VNC viewer for LCD display

Add a minimal VNC viewer application that connects to a VNC server
and renders the remote desktop on a local LCD.

Features:
- RFB 3.8 protocol with VNC Authentication (DES, pure software)
- Raw encoding with pixel format auto-detected from LCD driver
- Row-by-row rendering via LCDDEVIO_PUTAREA (minimal RAM usage)
- LCD resolution and format queried at runtime via LCDDEVIO_GETVIDEOINFO
- Auto-reconnect on connection loss with 2-second retry

Usage:
  vncviewer <host> [port]
  vncviewer -p <password> <host> [port]
  vncviewer -p <password> -d <lcd_devno> <host> [port]

Assisted-by: GitHubCopilot:claude-4.6-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/vncviewer/CMakeLists.txt   |   35 +
 system/vncviewer/Kconfig          |   32 +
 system/vncviewer/Make.defs        |   25 +
 system/vncviewer/Makefile         |   37 +
 system/vncviewer/lcd_render.c     |  177 +++++
 system/vncviewer/lcd_render.h     |  106 +++
 system/vncviewer/rfb_protocol.c   | 1051 +++++++++++++++++++++++++++++
 system/vncviewer/rfb_protocol.h   |  220 ++++++
 system/vncviewer/vncviewer_main.c |  306 +++++++++
 9 files changed, 1989 insertions(+)
 create mode 100644 system/vncviewer/CMakeLists.txt
 create mode 100644 system/vncviewer/Kconfig
 create mode 100644 system/vncviewer/Make.defs
 create mode 100644 system/vncviewer/Makefile
 create mode 100644 system/vncviewer/lcd_render.c
 create mode 100644 system/vncviewer/lcd_render.h
 create mode 100644 system/vncviewer/rfb_protocol.c
 create mode 100644 system/vncviewer/rfb_protocol.h
 create mode 100644 system/vncviewer/vncviewer_main.c

diff --git a/system/vncviewer/CMakeLists.txt b/system/vncviewer/CMakeLists.txt
new file mode 100644
index 000000000..06fc69463
--- /dev/null
+++ b/system/vncviewer/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/system/vncviewer/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_VNCVIEWER)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_SYSTEM_VNCVIEWER_PROGNAME}
+    SRCS
+    vncviewer_main.c
+    rfb_protocol.c
+    lcd_render.c
+    STACKSIZE
+    ${CONFIG_SYSTEM_VNCVIEWER_STACKSIZE}
+    PRIORITY
+    ${CONFIG_SYSTEM_VNCVIEWER_PRIORITY})
+endif()
diff --git a/system/vncviewer/Kconfig b/system/vncviewer/Kconfig
new file mode 100644
index 000000000..49af6c94a
--- /dev/null
+++ b/system/vncviewer/Kconfig
@@ -0,0 +1,32 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_VNCVIEWER
+	tristate "VNC Viewer"
+	default n
+	depends on NET_TCP && LCD
+	---help---
+		Enable the VNC Viewer example application.
+		Connects to a VNC server and displays the remote
+		framebuffer on a local LCD.
+
+if SYSTEM_VNCVIEWER
+
+config SYSTEM_VNCVIEWER_PROGNAME
+	string "Program name"
+	default "vncviewer"
+	---help---
+		This is the name of the program that will be used when the
+		NSH ELF program is installed.
+
+config SYSTEM_VNCVIEWER_PRIORITY
+	int "VNC Viewer task priority"
+	default 100
+
+config SYSTEM_VNCVIEWER_STACKSIZE
+	int "VNC Viewer stack size"
+	default 4096
+
+endif
diff --git a/system/vncviewer/Make.defs b/system/vncviewer/Make.defs
new file mode 100644
index 000000000..eca552f64
--- /dev/null
+++ b/system/vncviewer/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/vncviewer/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_VNCVIEWER),)
+CONFIGURED_APPS += $(APPDIR)/system/vncviewer
+endif
diff --git a/system/vncviewer/Makefile b/system/vncviewer/Makefile
new file mode 100644
index 000000000..90fa66590
--- /dev/null
+++ b/system/vncviewer/Makefile
@@ -0,0 +1,37 @@
+############################################################################
+# apps/system/vncviewer/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# VNC Viewer built-in application info
+
+PROGNAME = $(CONFIG_SYSTEM_VNCVIEWER_PROGNAME)
+PRIORITY = $(CONFIG_SYSTEM_VNCVIEWER_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_VNCVIEWER_STACKSIZE)
+MODULE = $(CONFIG_SYSTEM_VNCVIEWER)
+
+# VNC Viewer sources
+
+MAINSRC = vncviewer_main.c
+CSRCS   = rfb_protocol.c lcd_render.c
+
+include $(APPDIR)/Application.mk
diff --git a/system/vncviewer/lcd_render.c b/system/vncviewer/lcd_render.c
new file mode 100644
index 000000000..9e940474e
--- /dev/null
+++ b/system/vncviewer/lcd_render.c
@@ -0,0 +1,177 @@
+/****************************************************************************
+ * apps/system/vncviewer/lcd_render.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <nuttx/video/fb.h>
+#include <nuttx/lcd/lcd_dev.h>
+
+#include "lcd_render.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lcd_init
+ ****************************************************************************/
+
+int lcd_init(struct lcd_ctx_s *ctx, int devno)
+{
+  char devpath[16];
+  int ret;
+
+  snprintf(devpath, sizeof(devpath), "/dev/lcd%d", devno);
+
+  ctx->fd = open(devpath, O_RDWR);
+  if (ctx->fd < 0)
+    {
+      printf("vncviewer: failed to open %s: %d\n", devpath, errno);
+      return -errno;
+    }
+
+  /* Query LCD resolution */
+
+  struct fb_videoinfo_s vinfo;
+  ret = ioctl(ctx->fd, LCDDEVIO_GETVIDEOINFO,
+             (unsigned long)(uintptr_t)&vinfo);
+  if (ret < 0)
+    {
+      printf("vncviewer: GETVIDEOINFO failed: %d\n", errno);
+      close(ctx->fd);
+      ctx->fd = -1;
+      return -errno;
+    }
+  else
+    {
+      ctx->xres = vinfo.xres;
+      ctx->yres = vinfo.yres;
+      ctx->fmt  = vinfo.fmt;
+    }
+
+  printf("vncviewer: LCD %s opened (%ux%u)\n",
+         devpath, ctx->xres, ctx->yres);
+
+  /* Set power on */
+
+  ret = ioctl(ctx->fd, LCDDEVIO_SETPOWER, 1);
+  if (ret < 0)
+    {
+      printf("vncviewer: WARNING: SETPOWER failed: %d\n", errno);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: lcd_put_row
+ ****************************************************************************/
+
+int lcd_put_row(struct lcd_ctx_s *ctx, uint16_t x, uint16_t y,
+                uint16_t w, const uint16_t *pixels)
+{
+  struct lcddev_area_s area;
+  int ret;
+
+  /* Clip to LCD bounds */
+
+  if (x >= ctx->xres || y >= ctx->yres)
+    {
+      return OK;
+    }
+
+  if (x + w > ctx->xres)
+    {
+      w = ctx->xres - x;
+    }
+
+  area.row_start = y;
+  area.row_end   = y;
+  area.col_start = x;
+  area.col_end   = x + w - 1;
+  area.data      = (uint8_t *)pixels;
+
+  ret = ioctl(ctx->fd, LCDDEVIO_PUTAREA, (unsigned long)(uintptr_t)&area);
+  if (ret < 0)
+    {
+      return -errno;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: lcd_fill
+ ****************************************************************************/
+
+int lcd_fill(struct lcd_ctx_s *ctx, uint16_t color)
+{
+  uint16_t y;
+  uint16_t i;
+  uint16_t w = ctx->xres;
+  FAR uint16_t *rowbuf;
+
+  rowbuf = (FAR uint16_t *)malloc(w * sizeof(uint16_t));
+  if (rowbuf == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  for (i = 0; i < w; i++)
+    {
+      rowbuf[i] = color;
+    }
+
+  for (y = 0; y < ctx->yres; y++)
+    {
+      lcd_put_row(ctx, 0, y, w, rowbuf);
+    }
+
+  free(rowbuf);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: lcd_uninit
+ ****************************************************************************/
+
+void lcd_uninit(struct lcd_ctx_s *ctx)
+{
+  if (ctx->fd >= 0)
+    {
+      close(ctx->fd);
+      ctx->fd = -1;
+    }
+}
diff --git a/system/vncviewer/lcd_render.h b/system/vncviewer/lcd_render.h
new file mode 100644
index 000000000..5940b8f87
--- /dev/null
+++ b/system/vncviewer/lcd_render.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+ * apps/system/vncviewer/lcd_render.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_VNCVIEWER_LCD_RENDER_H
+#define __APPS_SYSTEM_VNCVIEWER_LCD_RENDER_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdint.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct lcd_ctx_s
+{
+  int fd;           /* File descriptor for /dev/lcdN */
+  uint16_t xres;    /* LCD horizontal resolution */
+  uint16_t yres;    /* LCD vertical resolution */
+  uint8_t fmt;      /* Pixel format (FB_FMT_*) */
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lcd_init
+ *
+ * Description:
+ *   Open and initialize the LCD device.
+ *
+ * Input Parameters:
+ *   ctx   - LCD context to initialize
+ *   devno - LCD device number (0 for /dev/lcd0)
+ *
+ * Returned Value:
+ *   OK on success, negative errno on failure.
+ *
+ ****************************************************************************/
+
+int lcd_init(struct lcd_ctx_s *ctx, int devno);
+
+/****************************************************************************
+ * Name: lcd_put_row
+ *
+ * Description:
+ *   Write a single row of pixels to the LCD.
+ *
+ * Input Parameters:
+ *   ctx    - LCD context
+ *   x      - Starting X coordinate
+ *   y      - Y coordinate (row)
+ *   w      - Width in pixels
+ *   pixels - Pixel data matching LCD native format
+ *
+ * Returned Value:
+ *   OK on success, negative errno on failure.
+ *
+ ****************************************************************************/
+
+int lcd_put_row(struct lcd_ctx_s *ctx, uint16_t x, uint16_t y,
+                uint16_t w, const uint16_t *pixels);
+
+/****************************************************************************
+ * Name: lcd_fill
+ *
+ * Description:
+ *   Fill the entire LCD with a solid color.
+ *
+ ****************************************************************************/
+
+int lcd_fill(struct lcd_ctx_s *ctx, uint16_t color);
+
+/****************************************************************************
+ * Name: lcd_uninit
+ *
+ * Description:
+ *   Close the LCD device.
+ *
+ ****************************************************************************/
+
+void lcd_uninit(struct lcd_ctx_s *ctx);
+
+#endif /* __APPS_SYSTEM_VNCVIEWER_LCD_RENDER_H */
diff --git a/system/vncviewer/rfb_protocol.c b/system/vncviewer/rfb_protocol.c
new file mode 100644
index 000000000..ef324af83
--- /dev/null
+++ b/system/vncviewer/rfb_protocol.c
@@ -0,0 +1,1051 @@
+/****************************************************************************
+ * apps/system/vncviewer/rfb_protocol.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include "rfb_protocol.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data - DES tables for VNC authentication
+ ****************************************************************************/
+
+/* Initial permutation */
+
+static const uint8_t g_ip[64] =
+{
+  58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12,  4,
+  62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16,  8,
+  57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11,  3,
+  61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15,  7
+};
+
+/* Final permutation (IP inverse) */
+
+static const uint8_t g_fp[64] =
+{
+  40,  8, 48, 16, 56, 24, 64, 32, 39,  7, 47, 15, 55, 23, 63, 31,
+  38,  6, 46, 14, 54, 22, 62, 30, 37,  5, 45, 13, 53, 21, 61, 29,
+  36,  4, 44, 12, 52, 20, 60, 28, 35,  3, 43, 11, 51, 19, 59, 27,
+  34,  2, 42, 10, 50, 18, 58, 26, 33,  1, 41,  9, 49, 17, 57, 25
+};
+
+/* Expansion permutation */
+
+static const uint8_t g_expand[48] =
+{
+  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
+  8,   9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
+  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
+  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
+};
+
+/* Permuted choice 1 */
+
+static const uint8_t g_pc1[56] =
+{
+  57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
+  10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
+  63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
+  14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
+};
+
+/* Permuted choice 2 */
+
+static const uint8_t g_pc2[48] =
+{
+  14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
+  23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
+  41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
+  44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
+};
+
+/* P-box permutation */
+
+static const uint8_t g_pbox[32] =
+{
+  16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,
+  5,  18, 31, 10,  2,  8, 24, 14, 32, 27,  3,  9,
+  19, 13, 30,  6, 22, 11,  4, 25
+};
+
+/* S-boxes */
+
+static const uint8_t g_sbox[8][64] =
+{
+  {
+    14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+     0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+     4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+    15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13
+  },
+  {
+    15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+     3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+     0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+    13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9
+  },
+  {
+    10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+    13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+    13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+     1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12
+  },
+  {
+     7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+    13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+    10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+     3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14
+  },
+  {
+     2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+    14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+     4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+    11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3
+  },
+  {
+    12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+    10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+     9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+     4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13
+  },
+  {
+     4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+    13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+     1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+     6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12
+  },
+  {
+    13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+     1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+     7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
+     2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
+  }
+};
+
+/* Key schedule left shifts */
+
+static const uint8_t g_shifts[] =
+{
+  1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: des_getbit / des_setbit
+ *
+ * Description:
+ *   Get/set a single bit in a byte array (1-indexed, MSB first).
+ *
+ ****************************************************************************/
+
+static int des_getbit(const uint8_t *data, int bitnum)
+{
+  return (data[(bitnum - 1) / 8] >> (7 - ((bitnum - 1) % 8))) & 1;
+}
+
+static void des_setbit(uint8_t *data, int bitnum, int val)
+{
+  int byte_idx = (bitnum - 1) / 8;
+  int bit_idx  = 7 - ((bitnum - 1) % 8);
+
+  if (val)
+    {
+      data[byte_idx] |= (uint8_t)(1 << bit_idx);
+    }
+  else
+    {
+      data[byte_idx] &= (uint8_t)~(1 << bit_idx);
+    }
+}
+
+/****************************************************************************
+ * Name: des_permute
+ *
+ * Description:
+ *   Apply a permutation table to a bit array.
+ *
+ ****************************************************************************/
+
+static void des_permute(const uint8_t *in, uint8_t *out,
+                        const uint8_t *table, int n)
+{
+  int i;
+
+  memset(out, 0, (n + 7) / 8);
+  for (i = 0; i < n; i++)
+    {
+      des_setbit(out, i + 1, des_getbit(in, table[i]));
+    }
+}
+
+/****************************************************************************
+ * Name: des_encrypt_block
+ *
+ * Description:
+ *   DES ECB encrypt a single 8-byte block in place.
+ *   Straightforward implementation using standard tables.
+ *
+ ****************************************************************************/
+
+static void des_encrypt_block(uint8_t *block, const uint8_t *key)
+{
+  uint8_t state[8];
+  uint8_t cd[7];
+  uint8_t l[4];
+  uint8_t r[4];
+  uint8_t er[6];
+  uint8_t subkey[6];
+  uint8_t sout[4];
+  uint8_t f[4];
+  uint8_t newl[4];
+  uint8_t combined[8];
+  uint8_t result[8];
+  uint32_t c;
+  uint32_t d;
+  int round;
+  int i;
+  int s;
+
+  /* Initial permutation */
+
+  des_permute(block, state, g_ip, 64);
+  memcpy(l, state, 4);
+  memcpy(r, state + 4, 4);
+
+  /* Key schedule: apply PC1 to key */
+
+  des_permute(key, cd, g_pc1, 56);
+
+  /* Extract C (bits 1-28) and D (bits 29-56) as 28-bit values */
+
+  for (round = 0; round < 16; round++)
+    {
+      int shift = g_shifts[round];
+
+      c = ((uint32_t)cd[0] << 20) | ((uint32_t)cd[1] << 12) |
+          ((uint32_t)cd[2] << 4)  | ((uint32_t)cd[3] >> 4);
+      d = (((uint32_t)cd[3] & 0x0f) << 24) | ((uint32_t)cd[4] << 16) |
+          ((uint32_t)cd[5] << 8)  | (uint32_t)cd[6];
+
+      /* Left rotate C and D by shift positions */
+
+      c = ((c << shift) | (c >> (28 - shift))) & 0x0fffffff;
+      d = ((d << shift) | (d >> (28 - shift))) & 0x0fffffff;
+
+      /* Pack back into cd[] */
+
+      cd[0] = (uint8_t)(c >> 20);
+      cd[1] = (uint8_t)(c >> 12);
+      cd[2] = (uint8_t)(c >> 4);
+      cd[3] = (uint8_t)((c << 4) | (d >> 24));
+      cd[4] = (uint8_t)(d >> 16);
+      cd[5] = (uint8_t)(d >> 8);
+      cd[6] = (uint8_t)d;
+
+      /* Apply PC2 to get 48-bit subkey */
+
+      des_permute(cd, subkey, g_pc2, 48);
+
+      /* Expand R from 32 to 48 bits */
+
+      des_permute(r, er, g_expand, 48);
+
+      /* XOR with subkey */
+
+      for (i = 0; i < 6; i++)
+        {
+          er[i] ^= subkey[i];
+        }
+
+      /* S-box substitution: 48 bits -> 32 bits */
+
+      memset(sout, 0, 4);
+      for (s = 0; s < 8; s++)
+        {
+          int off = s * 6;
+          int b0  = des_getbit(er, off + 1);
+          int b1  = des_getbit(er, off + 2);
+          int b2  = des_getbit(er, off + 3);
+          int b3  = des_getbit(er, off + 4);
+          int b4  = des_getbit(er, off + 5);
+          int b5  = des_getbit(er, off + 6);
+          int row = (b0 << 1) | b5;
+          int col = (b1 << 3) | (b2 << 2) | (b3 << 1) | b4;
+          int val = g_sbox[s][row * 16 + col];
+
+          sout[s / 2] |= (uint8_t)(val << (((s & 1) == 0) ? 4 : 0));
+        }
+
+      /* P-box permutation */
+
+      des_permute(sout, f, g_pbox, 32);
+
+      /* newR = L XOR f(R, K); L = old R */
+
+      for (i = 0; i < 4; i++)
+        {
+          newl[i] = l[i] ^ f[i];
+        }
+
+      memcpy(l, r, 4);
+      memcpy(r, newl, 4);
+    }
+
+  /* Final: combine R16 | L16 (note the swap) and apply FP */
+
+  memcpy(combined, r, 4);
+  memcpy(combined + 4, l, 4);
+  des_permute(combined, result, g_fp, 64);
+  memcpy(block, result, 8);
+}
+
+/****************************************************************************
+ * Name: vnc_encrypt_challenge
+ *
+ * Description:
+ *   Encrypt 16-byte VNC challenge using password as DES key.
+ *   VNC reverses bits in each byte of the password.
+ *
+ ****************************************************************************/
+
+static void vnc_encrypt_challenge(uint8_t *challenge,
+                                  const char *password)
+{
+  uint8_t key[8];
+  int i;
+
+  memset(key, 0, 8);
+  for (i = 0; i < 8 && password[i] != '\0'; i++)
+    {
+      uint8_t c = (uint8_t)password[i];
+
+      /* Reverse bits in byte (VNC quirk) */
+
+      key[i] = (uint8_t)(((c & 0x01) << 7) | ((c & 0x02) << 5) |
+                          ((c & 0x04) << 3) | ((c & 0x08) << 1) |
+                          ((c & 0x10) >> 1) | ((c & 0x20) >> 3) |
+                          ((c & 0x40) >> 5) | ((c & 0x80) >> 7));
+    }
+
+  /* Encrypt two 8-byte blocks */
+
+  des_encrypt_block(challenge, key);
+  des_encrypt_block(challenge + 8, key);
+}
+
+/****************************************************************************
+ * Name: rfb_recv_exact
+ *
+ * Description:
+ *   Receive exactly 'len' bytes from socket.
+ *
+ ****************************************************************************/
+
+static int rfb_recv_exact(int sockfd, void *buf, size_t len)
+{
+  uint8_t *p = (uint8_t *)buf;
+  ssize_t n;
+
+  while (len > 0)
+    {
+      n = recv(sockfd, p, len, 0);
+      if (n <= 0)
+        {
+          if (n == 0)
+            {
+              return -ECONNRESET;
+            }
+
+          if (errno == EINTR)
+            {
+              continue;
+            }
+
+          return -errno;
+        }
+
+      p   += n;
+      len -= n;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: rfb_send_exact
+ *
+ * Description:
+ *   Send exactly 'len' bytes to socket.
+ *
+ ****************************************************************************/
+
+static int rfb_send_exact(int sockfd, const void *buf, size_t len)
+{
+  const uint8_t *p = (const uint8_t *)buf;
+  ssize_t n;
+
+  while (len > 0)
+    {
+      n = send(sockfd, p, len, 0);
+      if (n <= 0)
+        {
+          if (errno == EINTR)
+            {
+              continue;
+            }
+
+          return -errno;
+        }
+
+      p   += n;
+      len -= n;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: rfb_negotiate_version
+ *
+ * Description:
+ *   Exchange RFB protocol version strings.
+ *
+ ****************************************************************************/
+
+static int rfb_negotiate_version(int sockfd)
+{
+  char buf[RFB_VERSION_LEN + 1];
+  int ret;
+
+  /* Receive server version */
+
+  ret = rfb_recv_exact(sockfd, buf, RFB_VERSION_LEN);
+  if (ret < 0)
+    {
+      printf("vncviewer: failed to receive server version\n");
+      return ret;
+    }
+
+  buf[RFB_VERSION_LEN] = '\0';
+  printf("vncviewer: server version: %s", buf);
+
+  /* Send our version (3.8) */
+
+  ret = rfb_send_exact(sockfd, RFB_VERSION_STRING, RFB_VERSION_LEN);
+  if (ret < 0)
+    {
+      printf("vncviewer: failed to send client version\n");
+      return ret;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: rfb_negotiate_security
+ *
+ * Description:
+ *   Negotiate security type. Supports None and VNC Authentication.
+ *
+ ****************************************************************************/
+
+static int rfb_negotiate_security(int sockfd, const char *password)
+{
+  uint8_t num_types;
+  uint8_t types[16];
+  uint8_t chosen;
+  uint32_t result;
+  int ret;
+  int i;
+
+  /* Receive number of security types */
+
+  ret = rfb_recv_exact(sockfd, &num_types, 1);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if (num_types == 0)
+    {
+      /* Connection failed - read reason string */
+
+      uint32_t reason_len;
+      rfb_recv_exact(sockfd, &reason_len, 4);
+      reason_len = ntohl(reason_len);
+      printf("vncviewer: connection refused by server\n");
+      return -ECONNREFUSED;
+    }
+
+  /* Receive security type list */
+
+  ret = rfb_recv_exact(sockfd, types, num_types);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  /* Choose security type: prefer None, fallback to VNC Auth */
+
+  chosen = RFB_SEC_INVALID;
+  for (i = 0; i < num_types; i++)
+    {
+      if (types[i] == RFB_SEC_NONE)
+        {
+          chosen = RFB_SEC_NONE;
+          break;
+        }
+
+      if (types[i] == RFB_SEC_VNC_AUTH)
+        {
+          chosen = RFB_SEC_VNC_AUTH;
+        }
+    }
+
+  if (chosen == RFB_SEC_INVALID)
+    {
+      printf("vncviewer: no supported security type\n");
+      return -ENOTSUP;
+    }
+
+  /* Send chosen type */
+
+  ret = rfb_send_exact(sockfd, &chosen, 1);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  printf("vncviewer: security type: %s\n",
+         chosen == RFB_SEC_NONE ? "None" : "VNC Auth");
+
+  if (chosen == RFB_SEC_VNC_AUTH)
+    {
+      /* VNC Authentication: receive 16-byte challenge */
+
+      uint8_t challenge[16];
+
+      ret = rfb_recv_exact(sockfd, challenge, 16);
+      if (ret < 0)
+        {
+          return ret;
+        }
+
+      /* Encrypt challenge with password using DES */
+
+      if (password == NULL || password[0] == '\0')
+        {
+          printf("vncviewer: WARNING: VNC Auth required but no password\n");
+        }
+      else
+        {
+          vnc_encrypt_challenge(challenge, password);
+        }
+
+      ret = rfb_send_exact(sockfd, challenge, 16);
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
+
+  /* Receive SecurityResult (for both None and VNC Auth in RFB 3.8) */
+
+  ret = rfb_recv_exact(sockfd, &result, 4);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  result = ntohl(result);
+  if (result != 0)
+    {
+      printf("vncviewer: authentication failed (result=%u)\n",
+             (unsigned)result);
+      return -EACCES;
+    }
+
+  printf("vncviewer: authentication OK\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: rfb_client_init
+ *
+ * Description:
+ *   Send ClientInit and receive ServerInit.
+ *
+ ****************************************************************************/
+
+static int rfb_client_init(int sockfd, struct rfb_conn_s *conn)
+{
+  uint8_t shared = 1;  /* shared session */
+  uint8_t buf[24];
+  uint32_t name_len;
+  int ret;
+
+  /* Send ClientInit */
+
+  ret = rfb_send_exact(sockfd, &shared, 1);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  /* Receive ServerInit: 2+2+16+4 = 24 bytes header + name */
+
+  ret = rfb_recv_exact(sockfd, buf, 24);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  conn->fb_width  = ntohs(*(uint16_t *)&buf[0]);
+  conn->fb_height = ntohs(*(uint16_t *)&buf[2]);
+
+  /* bytes 4..19 = server pixel format (we'll override it) */
+
+  name_len = ntohl(*(uint32_t *)&buf[20]);
+  if (name_len > sizeof(conn->name) - 1)
+    {
+      name_len = sizeof(conn->name) - 1;
+    }
+
+  if (name_len > 0)
+    {
+      ret = rfb_recv_exact(sockfd, conn->name, name_len);
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
+
+  conn->name[name_len] = '\0';
+
+  printf("vncviewer: server desktop: \"%s\" %ux%u\n",
+         conn->name, conn->fb_width, conn->fb_height);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: rfb_connect
+ ****************************************************************************/
+
+int rfb_connect(const char *host, uint16_t port)
+{
+  struct sockaddr_in addr;
+  int sockfd;
+  int ret;
+
+  sockfd = socket(AF_INET, SOCK_STREAM, 0);
+  if (sockfd < 0)
+    {
+      printf("vncviewer: socket() failed: %d\n", errno);
+      return -errno;
+    }
+
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family      = AF_INET;
+  addr.sin_port        = htons(port);
+
+  ret = inet_pton(AF_INET, host, &addr.sin_addr);
+  if (ret <= 0)
+    {
+      printf("vncviewer: invalid address: %s\n", host);
+      close(sockfd);
+      return -EINVAL;
+    }
+
+  printf("vncviewer: connecting to %s:%u...\n", host, port);
+
+  ret = connect(sockfd, (struct sockaddr *)&addr, sizeof(addr));
+  if (ret < 0)
+    {
+      printf("vncviewer: connect() failed: %d\n", errno);
+      close(sockfd);
+      return -errno;
+    }
+
+  printf("vncviewer: connected\n");
+  return sockfd;
+}
+
+/****************************************************************************
+ * Name: rfb_handshake
+ ****************************************************************************/
+
+int rfb_handshake(struct rfb_conn_s *conn, const char *password)
+{
+  int ret;
+
+  ret = rfb_negotiate_version(conn->sockfd);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = rfb_negotiate_security(conn->sockfd, password);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = rfb_client_init(conn->sockfd, conn);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: rfb_set_pixel_format
+ ****************************************************************************/
+
+int rfb_set_pixel_format(struct rfb_conn_s *conn, uint8_t fmt)
+{
+  uint8_t msg[20];
+  uint8_t bits;
+  uint8_t depth;
+  uint16_t rmax;
+  uint16_t gmax;
+  uint16_t bmax;
+  uint8_t rshift;
+  uint8_t gshift;
+  uint8_t bshift;
+
+  switch (fmt)
+    {
+      case 11: /* FB_FMT_RGB16_565 */
+        bits   = 16; depth  = 16;
+        rmax   = 31; gmax   = 63; bmax   = 31;
+        rshift = 11; gshift = 5;  bshift = 0;
+        conn->bpp = 2;
+        break;
+
+      case 10: /* FB_FMT_RGB16_555 */
+        bits   = 16; depth  = 15;
+        rmax   = 31; gmax   = 31; bmax   = 31;
+        rshift = 10; gshift = 5;  bshift = 0;
+        conn->bpp = 2;
+        break;
+
+      case 12: /* FB_FMT_RGB24 */
+        bits   = 32; depth  = 24;
+        rmax   = 255; gmax  = 255; bmax  = 255;
+        rshift = 16; gshift = 8;  bshift = 0;
+        conn->bpp = 4;
+        break;
+
+      case 13: /* FB_FMT_RGB32 */
+        bits   = 32; depth  = 24;
+        rmax   = 255; gmax  = 255; bmax  = 255;
+        rshift = 16; gshift = 8;  bshift = 0;
+        conn->bpp = 4;
+        break;
+
+      default:
+        printf("vncviewer: unsupported LCD format %d\n", fmt);
+        return -ENOTSUP;
+    }
+
+  memset(msg, 0, sizeof(msg));
+
+  /* Message type + 3 bytes padding */
+
+  msg[0] = RFB_SET_PIXEL_FORMAT;
+
+  /* Pixel format at offset 4 */
+
+  msg[4]  = bits;          /* bits-per-pixel */
+  msg[5]  = depth;         /* depth */
+  msg[6]  = 0;             /* big-endian = false */
+  msg[7]  = 1;             /* true-color = true */
+
+  msg[8]  = (rmax >> 8) & 0xff;
+  msg[9]  = rmax & 0xff;
+  msg[10] = (gmax >> 8) & 0xff;
+  msg[11] = gmax & 0xff;
+  msg[12] = (bmax >> 8) & 0xff;
+  msg[13] = bmax & 0xff;
+
+  msg[14] = rshift;
+  msg[15] = gshift;
+  msg[16] = bshift;
+
+  return rfb_send_exact(conn->sockfd, msg, sizeof(msg));
+}
+
+/****************************************************************************
+ * Name: rfb_set_encodings
+ ****************************************************************************/
+
+int rfb_set_encodings(struct rfb_conn_s *conn)
+{
+  uint8_t msg[8];
+
+  msg[0] = RFB_SET_ENCODINGS;
+  msg[1] = 0;  /* padding */
+
+  /* number-of-encodings = 1 */
+
+  msg[2] = 0;
+  msg[3] = 1;
+
+  /* encoding: Raw = 0 */
+
+  msg[4] = 0;
+  msg[5] = 0;
+  msg[6] = 0;
+  msg[7] = 0;
+
+  return rfb_send_exact(conn->sockfd, msg, sizeof(msg));
+}
+
+/****************************************************************************
+ * Name: rfb_request_update
+ ****************************************************************************/
+
+int rfb_request_update(struct rfb_conn_s *conn, bool incremental,
+                       uint16_t x, uint16_t y, uint16_t w, uint16_t h)
+{
+  uint8_t msg[10];
+
+  msg[0] = RFB_FB_UPDATE_REQUEST;
+  msg[1] = incremental ? 1 : 0;
+  *(uint16_t *)&msg[2] = htons(x);
+  *(uint16_t *)&msg[4] = htons(y);
+  *(uint16_t *)&msg[6] = htons(w);
+  *(uint16_t *)&msg[8] = htons(h);
+
+  return rfb_send_exact(conn->sockfd, msg, sizeof(msg));
+}
+
+/****************************************************************************
+ * Name: rfb_recv_update
+ ****************************************************************************/
+
+int rfb_recv_update(struct rfb_conn_s *conn, rfb_rect_cb_t rect_cb,
+                    void *arg)
+{
+  uint8_t msg_type;
+  int ret;
+
+  /* Read message type */
+
+  ret = rfb_recv_exact(conn->sockfd, &msg_type, 1);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  switch (msg_type)
+    {
+      case RFB_FB_UPDATE:
+        {
+          uint8_t hdr[3];
+          uint16_t num_rects;
+          uint16_t i;
+
+          /* Read padding(1) + number-of-rectangles(2) */
+
+          ret = rfb_recv_exact(conn->sockfd, hdr, 3);
+          if (ret < 0)
+            {
+              return ret;
+            }
+
+          num_rects = ntohs(*(uint16_t *)&hdr[1]);
+
+          for (i = 0; i < num_rects; i++)
+            {
+              struct rfb_rect_hdr_s rect;
+              uint8_t rect_buf[12];
+              uint32_t row_bytes;
+              uint32_t row;
+
+              /* Read rectangle header: x(2)+y(2)+w(2)+h(2)+encoding(4) */
+
+              ret = rfb_recv_exact(conn->sockfd, rect_buf, 12);
+              if (ret < 0)
+                {
+                  return ret;
+                }
+
+              rect.x        = ntohs(*(uint16_t *)&rect_buf[0]);
+              rect.y        = ntohs(*(uint16_t *)&rect_buf[2]);
+              rect.w        = ntohs(*(uint16_t *)&rect_buf[4]);
+              rect.h        = ntohs(*(uint16_t *)&rect_buf[6]);
+              rect.encoding = (int32_t)ntohl(*(uint32_t *)&rect_buf[8]);
+
+              if (rect.encoding != RFB_ENCODING_RAW)
+                {
+                  printf("vncviewer: unsupported encoding %d\n",
+                         (int)rect.encoding);
+                  return -ENOTSUP;
+                }
+
+              /* Read pixel data row by row to limit memory usage */
+
+              row_bytes = rect.w * conn->bpp;
+
+              FAR uint8_t *rowbuf = malloc(row_bytes);
+              if (rowbuf == NULL)
+                {
+                  return -ENOMEM;
+                }
+
+              for (row = 0; row < rect.h; row++)
+                {
+                  struct rfb_rect_hdr_s row_rect;
+
+                  ret = rfb_recv_exact(conn->sockfd, rowbuf, row_bytes);
+                  if (ret < 0)
+                    {
+                      free(rowbuf);
+                      return ret;
+                    }
+
+                  /* Callback with single-row rectangle */
+
+                  row_rect.x = rect.x;
+                  row_rect.y = rect.y + row;
+                  row_rect.w = rect.w;
+                  row_rect.h = 1;
+                  row_rect.encoding = RFB_ENCODING_RAW;
+
+                  if (rect_cb)
+                    {
+                      rect_cb(&row_rect, rowbuf, arg);
+                    }
+                }
+
+              free(rowbuf);
+            }
+        }
+        break;
+
+      case RFB_SET_COLORMAP:
+        {
+          /* Skip: padding(1) + first-color(2) + num-colors(2) */
+
+          uint8_t cm_hdr[5];
+          uint16_t num_colors;
+
+          ret = rfb_recv_exact(conn->sockfd, cm_hdr, 5);
+          if (ret < 0)
+            {
+              return ret;
+            }
+
+          num_colors = ntohs(*(uint16_t *)&cm_hdr[3]);
+
+          /* Skip color entries: num_colors * 6 bytes (R+G+B each 2B) */
+
+          uint32_t skip = num_colors * 6;
+          uint8_t tmp[256];
+
+          while (skip > 0)
+            {
+              uint32_t chunk = skip > sizeof(tmp) ? sizeof(tmp) : skip;
+              ret = rfb_recv_exact(conn->sockfd, tmp, chunk);
+              if (ret < 0)
+                {
+                  return ret;
+                }
+
+              skip -= chunk;
+            }
+        }
+        break;
+
+      case RFB_BELL:
+
+        /* No payload */
+
+        break;
+
+      case RFB_SERVER_CUT_TEXT:
+        {
+          uint8_t ct_hdr[7];
+          uint32_t text_len;
+
+          ret = rfb_recv_exact(conn->sockfd, ct_hdr, 7);
+          if (ret < 0)
+            {
+              return ret;
+            }
+
+          text_len = ntohl(*(uint32_t *)&ct_hdr[3]);
+
+          /* Skip text content */
+
+          uint8_t tmp[256];
+
+          while (text_len > 0)
+            {
+              uint32_t chunk = text_len > sizeof(tmp)
+                               ? sizeof(tmp) : text_len;
+              ret = rfb_recv_exact(conn->sockfd, tmp, chunk);
+              if (ret < 0)
+                {
+                  return ret;
+                }
+
+              text_len -= chunk;
+            }
+        }
+        break;
+
+      default:
+        printf("vncviewer: unknown message type %u\n", msg_type);
+        return -EPROTO;
+    }
+
+  return OK;
+}
diff --git a/system/vncviewer/rfb_protocol.h b/system/vncviewer/rfb_protocol.h
new file mode 100644
index 000000000..b5b4c1e78
--- /dev/null
+++ b/system/vncviewer/rfb_protocol.h
@@ -0,0 +1,220 @@
+/****************************************************************************
+ * apps/system/vncviewer/rfb_protocol.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_VNCVIEWER_RFB_PROTOCOL_H
+#define __APPS_SYSTEM_VNCVIEWER_RFB_PROTOCOL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* RFB Protocol Version */
+
+#define RFB_VERSION_STRING      "RFB 003.008\n"
+#define RFB_VERSION_LEN         12
+
+/* Security Types */
+
+#define RFB_SEC_INVALID         0
+#define RFB_SEC_NONE            1
+#define RFB_SEC_VNC_AUTH        2
+
+/* Client-to-Server Message Types */
+
+#define RFB_SET_PIXEL_FORMAT    0
+#define RFB_SET_ENCODINGS       2
+#define RFB_FB_UPDATE_REQUEST   3
+#define RFB_KEY_EVENT           4
+#define RFB_POINTER_EVENT       5
+#define RFB_CLIENT_CUT_TEXT     6
+
+/* Server-to-Client Message Types */
+
+#define RFB_FB_UPDATE           0
+#define RFB_SET_COLORMAP        1
+#define RFB_BELL                2
+#define RFB_SERVER_CUT_TEXT     3
+
+/* Encoding Types */
+
+#define RFB_ENCODING_RAW        0
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Pixel format (negotiated with server based on LCD) */
+
+struct rfb_pixel_format_s
+{
+  uint8_t  bits_per_pixel;    /* 16 */
+  uint8_t  depth;             /* 16 */
+  uint8_t  big_endian;        /* 0 = little-endian */
+  uint8_t  true_color;        /* 1 */
+  uint16_t red_max;           /* 31 (5 bits) */
+  uint16_t green_max;         /* 63 (6 bits) */
+  uint16_t blue_max;          /* 31 (5 bits) */
+  uint8_t  red_shift;         /* 11 */
+  uint8_t  green_shift;       /* 5 */
+  uint8_t  blue_shift;        /* 0 */
+  uint8_t  padding[3];
+};
+
+/* Server init message (parsed) */
+
+struct rfb_server_init_s
+{
+  uint16_t fb_width;
+  uint16_t fb_height;
+  struct rfb_pixel_format_s pixel_format;
+  char     name[256];
+};
+
+/* Framebuffer update rectangle header */
+
+struct rfb_rect_hdr_s
+{
+  uint16_t x;
+  uint16_t y;
+  uint16_t w;
+  uint16_t h;
+  int32_t  encoding;
+};
+
+/* RFB connection context */
+
+struct rfb_conn_s
+{
+  int      sockfd;
+  uint16_t fb_width;
+  uint16_t fb_height;
+  uint16_t view_width;
+  uint16_t view_height;
+  uint8_t  bpp;             /* Bytes per pixel */
+  char     name[256];
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: rfb_connect
+ *
+ * Description:
+ *   Establish TCP connection to VNC server.
+ *
+ * Input Parameters:
+ *   host - Server IP address string
+ *   port - Server port number
+ *
+ * Returned Value:
+ *   Socket fd on success, negative errno on failure.
+ *
+ ****************************************************************************/
+
+int rfb_connect(const char *host, uint16_t port);
+
+/****************************************************************************
+ * Name: rfb_handshake
+ *
+ * Description:
+ *   Perform RFB protocol handshake: version, security, init.
+ *
+ * Input Parameters:
+ *   conn     - RFB connection context (sockfd must be set)
+ *   password - VNC password (NULL or empty for no auth)
+ *
+ * Returned Value:
+ *   OK on success, negative errno on failure.
+ *
+ ****************************************************************************/
+
+int rfb_handshake(struct rfb_conn_s *conn, const char *password);
+
+/****************************************************************************
+ * Name: rfb_set_pixel_format
+ *
+ * Description:
+ *   Send SetPixelFormat message based on LCD pixel format.
+ *
+ ****************************************************************************/
+
+int rfb_set_pixel_format(struct rfb_conn_s *conn, uint8_t fmt);
+
+/****************************************************************************
+ * Name: rfb_set_encodings
+ *
+ * Description:
+ *   Send SetEncodings message (Raw only).
+ *
+ ****************************************************************************/
+
+int rfb_set_encodings(struct rfb_conn_s *conn);
+
+/****************************************************************************
+ * Name: rfb_request_update
+ *
+ * Description:
+ *   Send FramebufferUpdateRequest.
+ *
+ * Input Parameters:
+ *   conn        - RFB connection
+ *   incremental - true for incremental update
+ *   x, y, w, h  - Region to request
+ *
+ ****************************************************************************/
+
+int rfb_request_update(struct rfb_conn_s *conn, bool incremental,
+                       uint16_t x, uint16_t y, uint16_t w, uint16_t h);
+
+/****************************************************************************
+ * Name: rfb_recv_update
+ *
+ * Description:
+ *   Receive and process one server message. For FramebufferUpdate,
+ *   calls the provided callback for each rectangle.
+ *
+ * Input Parameters:
+ *   conn - RFB connection
+ *   rect_cb - Callback for each received rectangle
+ *   arg     - User argument passed to callback
+ *
+ * Returned Value:
+ *   OK on success, negative errno on failure.
+ *
+ ****************************************************************************/
+
+typedef void (*rfb_rect_cb_t)(const struct rfb_rect_hdr_s *rect,
+                              const uint8_t *pixels, void *arg);
+
+int rfb_recv_update(struct rfb_conn_s *conn, rfb_rect_cb_t rect_cb,
+                    void *arg);
+
+#endif /* __APPS_SYSTEM_VNCVIEWER_RFB_PROTOCOL_H */
diff --git a/system/vncviewer/vncviewer_main.c b/system/vncviewer/vncviewer_main.c
new file mode 100644
index 000000000..654740ccb
--- /dev/null
+++ b/system/vncviewer/vncviewer_main.c
@@ -0,0 +1,306 @@
+/****************************************************************************
+ * apps/system/vncviewer/vncviewer_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/socket.h>
+
+#include <nuttx/video/fb.h>
+
+#include "rfb_protocol.h"
+#include "lcd_render.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define VNCVIEWER_DEFAULT_PORT  5900
+#define VNCVIEWER_DEFAULT_LCD   0
+
+#define COLOR_BLACK             0x0000
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct lcd_ctx_s g_lcd;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: rect_callback
+ *
+ * Description:
+ *   Called for each row of pixel data received from VNC server.
+ *   Writes directly to LCD, clipping to screen bounds.
+ *
+ ****************************************************************************/
+
+static void rect_callback(const struct rfb_rect_hdr_s *rect,
+                          const uint8_t *pixels, void *arg)
+{
+  /* rect->h is always 1 (row-by-row from rfb_recv_update) */
+
+  if (rect->y < g_lcd.yres && rect->x < g_lcd.xres)
+    {
+      uint16_t w = rect->w;
+
+      if (rect->x + w > g_lcd.xres)
+        {
+          w = g_lcd.xres - rect->x;
+        }
+
+      lcd_put_row(&g_lcd, rect->x, rect->y, w, (const uint16_t *)pixels);
+    }
+}
+
+/****************************************************************************
+ * Name: show_usage
+ ****************************************************************************/
+
+static void show_usage(const char *progname)
+{
+  printf("Usage: %s [options] <host> [port]\n", progname);
+  printf("Options:\n");
+  printf("  -p <password>  VNC password\n");
+  printf("  -d <devno>     LCD device number (default: %d)\n",
+         VNCVIEWER_DEFAULT_LCD);
+  printf("  -h             Show this help\n");
+  printf("Default port: %d\n", VNCVIEWER_DEFAULT_PORT);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: vncviewer_main
+ *
+ * Description:
+ *   VNC Viewer entry point. Connects to a VNC server and displays
+ *   the remote framebuffer on the local LCD.
+ *
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  const char *host = NULL;
+  const char *password = "";
+  uint16_t port = VNCVIEWER_DEFAULT_PORT;
+  int lcd_devno = VNCVIEWER_DEFAULT_LCD;
+  struct rfb_conn_s conn;
+  int opt;
+  int ret;
+
+  /* Parse command line arguments */
+
+  while ((opt = getopt(argc, argv, "p:d:h")) != -1)
+    {
+      switch (opt)
+        {
+          case 'p':
+            password = optarg;
+            break;
+
+          case 'd':
+            lcd_devno = atoi(optarg);
+            break;
+
+          case 'h':
+            show_usage(argv[0]);
+            return EXIT_SUCCESS;
+
+          default:
+            show_usage(argv[0]);
+            return EXIT_FAILURE;
+        }
+    }
+
+  if (optind < argc)
+    {
+      host = argv[optind++];
+    }
+
+  if (optind < argc)
+    {
+      port = atoi(argv[optind]);
+    }
+
+  if (host == NULL)
+    {
+      printf("vncviewer: host is required\n");
+      show_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  /* Initialize LCD */
+
+  printf("vncviewer: initializing LCD...\n");
+
+  ret = lcd_init(&g_lcd, lcd_devno);
+  if (ret < 0)
+    {
+      printf("vncviewer: LCD init failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  /* Fill screen black */
+
+  lcd_fill(&g_lcd, COLOR_BLACK);
+
+  /* Connect to VNC server */
+
+  memset(&conn, 0, sizeof(conn));
+
+  /* Connection loop with retry */
+
+  for (; ; )
+    {
+      int rcvbuf;
+
+      conn.sockfd = rfb_connect(host, port);
+      if (conn.sockfd < 0)
+        {
+          printf("vncviewer: connection failed: %d, retrying...\n",
+                 conn.sockfd);
+          sleep(2);
+          continue;
+        }
+
+      /* Increase TCP receive buffer to handle bursts */
+
+      rcvbuf = 32768;
+      setsockopt(conn.sockfd, SOL_SOCKET, SO_RCVBUF,
+                 &rcvbuf, sizeof(rcvbuf));
+
+      /* RFB handshake */
+
+      ret = rfb_handshake(&conn, password);
+      if (ret < 0)
+        {
+          printf("vncviewer: handshake failed: %d, retrying...\n", ret);
+          close(conn.sockfd);
+          sleep(2);
+          continue;
+        }
+
+      /* Configure pixel format based on LCD */
+
+      ret = rfb_set_pixel_format(&conn, g_lcd.fmt);
+      if (ret < 0)
+        {
+          printf("vncviewer: set pixel format failed: %d, retrying...\n",
+                 ret);
+          close(conn.sockfd);
+          sleep(2);
+          continue;
+        }
+
+      /* Set encodings: Raw only */
+
+      ret = rfb_set_encodings(&conn);
+      if (ret < 0)
+        {
+          printf("vncviewer: set encodings failed: %d, retrying...\n", ret);
+          close(conn.sockfd);
+          sleep(2);
+          continue;
+        }
+
+      /* Determine view size: min of server desktop and LCD */
+
+      conn.view_width  = conn.fb_width < g_lcd.xres
+                         ? conn.fb_width : g_lcd.xres;
+      conn.view_height = conn.fb_height < g_lcd.yres
+                         ? conn.fb_height : g_lcd.yres;
+
+      printf("vncviewer: view area: %ux%u (server: %ux%u, lcd: %ux%u)\n",
+             conn.view_width, conn.view_height,
+             conn.fb_width, conn.fb_height,
+             g_lcd.xres, g_lcd.yres);
+
+      /* Request initial full framebuffer update */
+
+      ret = rfb_request_update(&conn, false,
+                               0, 0, conn.view_width, conn.view_height);
+      if (ret < 0)
+        {
+          printf("vncviewer: initial update request failed: %d, "
+                 "retrying...\n", ret);
+          close(conn.sockfd);
+          sleep(2);
+          continue;
+        }
+
+      /* Main loop: receive updates and render to LCD */
+
+      printf("vncviewer: entering main loop\n");
+
+      while (true)
+        {
+          /* Receive and process server message */
+
+          ret = rfb_recv_update(&conn, rect_callback, NULL);
+          if (ret < 0)
+            {
+              printf("vncviewer: recv error: %d\n", ret);
+              break;
+            }
+
+          /* Request next incremental update */
+
+          ret = rfb_request_update(&conn, true,
+                                   0, 0,
+                                   conn.view_width, conn.view_height);
+          if (ret < 0)
+            {
+              printf("vncviewer: update request failed: %d\n", ret);
+              break;
+            }
+        }
+
+      /* Connection lost - retry */
+
+      printf("vncviewer: reconnecting in 2 seconds...\n");
+      close(conn.sockfd);
+      sleep(2);
+    }
+
+  /* Cleanup */
+
+  printf("vncviewer: disconnecting\n");
+  close(conn.sockfd);
+  lcd_uninit(&g_lcd);
+
+  return EXIT_SUCCESS;
+}

From 4b705721cae4d029b93ac9cd5df42fa81940b535 Mon Sep 17 00:00:00 2001
From: shichunma <masc2008@gmail.com>
Date: Sat, 11 Apr 2026 18:26:39 +0800
Subject: [PATCH 304/568] netutils/dhcpc: parse DHCP NTP server option

Request DHCP option 42 and store the returned IPv4 NTP server
addresses in struct dhcpc_state for later consumers.

Signed-off-by: Jerry Ma <masc2008@gmail.com>
---
 include/netutils/dhcpc.h |  6 +++++
 netutils/dhcpc/dhcpc.c   | 52 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/include/netutils/dhcpc.h b/include/netutils/dhcpc.h
index 0cf16907b..b17d6f368 100644
--- a/include/netutils/dhcpc.h
+++ b/include/netutils/dhcpc.h
@@ -55,6 +55,10 @@
 #  define CONFIG_NETDB_DNSSERVER_NAMESERVERS 1
 #endif
 
+#if !defined(CONFIG_NETUTILS_DHCPC_NTP_SERVERS)
+#  define CONFIG_NETUTILS_DHCPC_NTP_SERVERS 1
+#endif
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -66,6 +70,8 @@ struct dhcpc_state
   struct in_addr netmask;
   struct in_addr dnsaddr[CONFIG_NETDB_DNSSERVER_NAMESERVERS];
   uint8_t        num_dnsaddr;     /* Number of DNS addresses received */
+  struct in_addr ntpaddr[CONFIG_NETUTILS_DHCPC_NTP_SERVERS];
+  uint8_t        num_ntpaddr;     /* Number of NTP addresses received */
   struct in_addr default_router;
   uint32_t       lease_time;      /* Lease expires in this number of seconds */
   uint32_t       renewal_time;    /* Seconds to transition to RENEW state(T1) */
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index e899b6930..a449c96ca 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -91,6 +91,7 @@
 #define DHCP_OPTION_ROUTER      3
 #define DHCP_OPTION_DNS_SERVER  6
 #define DHCP_OPTION_HOST_NAME   12
+#define DHCP_OPTION_NTP_SERVER  42
 #define DHCP_OPTION_REQ_IPADDR  50
 #define DHCP_OPTION_LEASE_TIME  51
 #define DHCP_OPTION_MSG_TYPE    53
@@ -210,10 +211,11 @@ static FAR uint8_t *dhcpc_addclientid(FAR uint8_t *clientid,
 static FAR uint8_t *dhcpc_addreqoptions(FAR uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_REQ_LIST;
-  *optptr++ = 3;
+  *optptr++ = 4;
   *optptr++ = DHCP_OPTION_SUBNET_MASK;
   *optptr++ = DHCP_OPTION_ROUTER;
   *optptr++ = DHCP_OPTION_DNS_SERVER;
+  *optptr++ = DHCP_OPTION_NTP_SERVER;
   return optptr;
 }
 
@@ -411,6 +413,39 @@ static uint8_t dhcpc_parseoptions(FAR struct dhcpc_state *presult,
               }
             break;
 
+          case DHCP_OPTION_NTP_SERVER:
+
+            /* Get the NTP server addresses in network order.
+             * DHCP option 42 can contain multiple IPv4 addresses,
+             * each 4 bytes long.
+             */
+
+            if (optptr + 2 <= end)
+              {
+                uint8_t optlen = *(optptr + 1);
+                uint8_t num_ntp = optlen / 4;
+                uint8_t i;
+
+                if (num_ntp > CONFIG_NETUTILS_DHCPC_NTP_SERVERS)
+                  {
+                    num_ntp = CONFIG_NETUTILS_DHCPC_NTP_SERVERS;
+                  }
+
+                presult->num_ntpaddr = 0;
+                for (i = 0; i < num_ntp && (optptr + 2 + i * 4 + 4) <= end;
+                     i++)
+                  {
+                    memcpy(&presult->ntpaddr[i].s_addr, optptr + 2 + i * 4,
+                           4);
+                    presult->num_ntpaddr++;
+                  }
+              }
+            else
+              {
+                nerr("Packet too short (NTP address missing)\n");
+              }
+            break;
+
           case DHCP_OPTION_MSG_TYPE:
 
             /* Get message type */
@@ -999,6 +1034,21 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult)
         }
     }
 
+  /* Print all NTP servers received */
+
+  if (presult->num_ntpaddr > 0)
+    {
+      uint8_t i;
+      for (i = 0; i < presult->num_ntpaddr; i++)
+        {
+          ninfo("Got NTP server %d: %u.%u.%u.%u\n", i,
+                ip4_addr1(presult->ntpaddr[i].s_addr),
+                ip4_addr2(presult->ntpaddr[i].s_addr),
+                ip4_addr3(presult->ntpaddr[i].s_addr),
+                ip4_addr4(presult->ntpaddr[i].s_addr));
+        }
+    }
+
   ninfo("Got default router %u.%u.%u.%u\n",
         ip4_addr1(presult->default_router.s_addr),
         ip4_addr2(presult->default_router.s_addr),

From c82957109fc14fe552c8f32a8f93bc7330c41cd3 Mon Sep 17 00:00:00 2001
From: shichunma <masc2008@gmail.com>
Date: Sat, 11 Apr 2026 18:41:05 +0800
Subject: [PATCH 305/568] netutils: prefer DHCP-provided NTP servers for ntpc

Use the DHCP-learned NTP server list as the default ntpc server source when DHCP option 42 is available.

Fall back to CONFIG_NETUTILS_NTPCLIENT_SERVER only when DHCP does not provide any NTP servers, and restart ntpc when the DHCP-provided server list changes.

Signed-off-by: Jerry Ma <masc2008@gmail.com>
---
 include/netutils/netlib.h               |  43 ++++
 netutils/netlib/CMakeLists.txt          |   1 +
 netutils/netlib/Makefile                |   1 +
 netutils/netlib/netlib_dhcp_ntp.c       | 182 ++++++++++++++++
 netutils/netlib/netlib_obtainipv4addr.c |  78 +++++++
 netutils/ntpclient/ntpclient.c          | 263 +++++++++++++++++++++---
 6 files changed, 535 insertions(+), 33 deletions(-)
 create mode 100644 netutils/netlib/netlib_dhcp_ntp.c

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index 2b3146e91..eb3933fe9 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -203,6 +203,11 @@ struct url_s
 };
 #endif
 
+#ifdef CONFIG_NETUTILS_DHCPC
+typedef CODE void (*netlib_dhcp_ntp_callback_t)
+  (FAR const char *ntp_server_list, FAR void *arg);
+#endif
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -247,6 +252,44 @@ ssize_t netlib_get_devices(FAR struct netlib_device_s *devlist,
 bool netlib_ipv4addrconv(FAR const char *addrstr, FAR uint8_t *addr);
 bool netlib_ethaddrconv(FAR const char *hwstr, FAR uint8_t *hw);
 
+#ifdef CONFIG_NETUTILS_DHCPC
+/****************************************************************************
+ * Name: netlib_set_ntp_servers_from_dhcp
+ *
+ * Description:
+ *   Update the currently active DHCP option 42 NTP server list. The list
+ *   contains semicolon-separated hostnames or addresses. Passing NULL or
+ *   an empty string clears the DHCP-provided list.
+ *
+ ****************************************************************************/
+
+int netlib_set_ntp_servers_from_dhcp(FAR const char *ntp_server_list);
+
+/****************************************************************************
+ * Name: netlib_register_dhcp_ntp_callback
+ *
+ * Description:
+ *   Register a callback to receive DHCP option 42 NTP server list updates.
+ *   The current list, if any, is replayed immediately after registration.
+ *   Only one callback may be registered at a time.
+ *
+ ****************************************************************************/
+
+int netlib_register_dhcp_ntp_callback(netlib_dhcp_ntp_callback_t callback,
+                                      FAR void *arg);
+
+/****************************************************************************
+ * Name: netlib_unregister_dhcp_ntp_callback
+ *
+ * Description:
+ *   Unregister a previously registered DHCP option 42 NTP update callback.
+ *
+ ****************************************************************************/
+
+int netlib_unregister_dhcp_ntp_callback(netlib_dhcp_ntp_callback_t callback,
+                                        FAR void *arg);
+#endif
+
 #ifdef CONFIG_NET_ETHERNET
 /* Get and set IP/MAC addresses (Ethernet L2 only) */
 
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 49e8aa81e..2f0f11e0f 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -57,6 +57,7 @@ if(CONFIG_NETUTILS_NETLIB)
     endif()
     if(CONFIG_NETUTILS_DHCPC)
       list(APPEND SRCS netlib_obtainipv4addr.c)
+      list(APPEND SRCS netlib_dhcp_ntp.c)
     endif()
   endif()
 
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 4bfc8d9d4..7bba856b7 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -57,6 +57,7 @@ CSRCS += netlib_iptables.c
 endif
 ifeq ($(CONFIG_NETUTILS_DHCPC),y)
 CSRCS += netlib_obtainipv4addr.c
+CSRCS += netlib_dhcp_ntp.c
 endif
 endif
 
diff --git a/netutils/netlib/netlib_dhcp_ntp.c b/netutils/netlib/netlib_dhcp_ntp.c
new file mode 100644
index 000000000..b1d608db0
--- /dev/null
+++ b/netutils/netlib/netlib_dhcp_ntp.c
@@ -0,0 +1,182 @@
+/****************************************************************************
+ * apps/netutils/netlib/netlib_dhcp_ntp.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#ifdef CONFIG_NETUTILS_DHCPC
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "netutils/netlib.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static pthread_mutex_t g_dhcp_ntp_lock = PTHREAD_MUTEX_INITIALIZER;
+static FAR char *g_dhcp_ntp_servers;
+static netlib_dhcp_ntp_callback_t g_dhcp_ntp_callback;
+static FAR void *g_dhcp_ntp_callback_arg;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static FAR char *netlib_dhcp_ntp_dup(FAR const char *ntp_server_list)
+{
+  if (ntp_server_list == NULL || ntp_server_list[0] == '\0')
+    {
+      return NULL;
+    }
+
+  return strdup(ntp_server_list);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int netlib_set_ntp_servers_from_dhcp(FAR const char *ntp_server_list)
+{
+  FAR char *new_servers;
+  FAR char *notify_servers = NULL;
+  FAR char *old_servers;
+  netlib_dhcp_ntp_callback_t callback;
+  FAR void *arg;
+  int ret = OK;
+
+  new_servers = netlib_dhcp_ntp_dup(ntp_server_list);
+  if (ntp_server_list != NULL && ntp_server_list[0] != '\0' &&
+      new_servers == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  pthread_mutex_lock(&g_dhcp_ntp_lock);
+
+  if ((g_dhcp_ntp_servers == NULL && new_servers == NULL) ||
+      (g_dhcp_ntp_servers != NULL && new_servers != NULL &&
+       strcmp(g_dhcp_ntp_servers, new_servers) == 0))
+    {
+      pthread_mutex_unlock(&g_dhcp_ntp_lock);
+      free(new_servers);
+      return OK;
+    }
+
+  callback = g_dhcp_ntp_callback;
+  arg = g_dhcp_ntp_callback_arg;
+
+  if (callback != NULL && new_servers != NULL)
+    {
+      notify_servers = strdup(new_servers);
+      if (notify_servers == NULL)
+        {
+          ret = -ENOMEM;
+          goto errout_with_lock;
+        }
+    }
+
+  old_servers = g_dhcp_ntp_servers;
+  g_dhcp_ntp_servers = new_servers;
+  pthread_mutex_unlock(&g_dhcp_ntp_lock);
+
+  free(old_servers);
+
+  if (callback != NULL)
+    {
+      callback(notify_servers, arg);
+    }
+
+  free(notify_servers);
+  return OK;
+
+errout_with_lock:
+  pthread_mutex_unlock(&g_dhcp_ntp_lock);
+  free(new_servers);
+  return ret;
+}
+
+int netlib_register_dhcp_ntp_callback(netlib_dhcp_ntp_callback_t callback,
+                                      FAR void *arg)
+{
+  FAR char *notify_servers = NULL;
+
+  if (callback == NULL)
+    {
+      return -EINVAL;
+    }
+
+  pthread_mutex_lock(&g_dhcp_ntp_lock);
+
+  if (g_dhcp_ntp_callback != NULL &&
+      (g_dhcp_ntp_callback != callback || g_dhcp_ntp_callback_arg != arg))
+    {
+      pthread_mutex_unlock(&g_dhcp_ntp_lock);
+      return -EBUSY;
+    }
+
+  if (g_dhcp_ntp_servers != NULL)
+    {
+      notify_servers = strdup(g_dhcp_ntp_servers);
+      if (notify_servers == NULL)
+        {
+          pthread_mutex_unlock(&g_dhcp_ntp_lock);
+          return -ENOMEM;
+        }
+    }
+
+  g_dhcp_ntp_callback = callback;
+  g_dhcp_ntp_callback_arg = arg;
+
+  pthread_mutex_unlock(&g_dhcp_ntp_lock);
+
+  callback(notify_servers, arg);
+  free(notify_servers);
+  return OK;
+}
+
+int netlib_unregister_dhcp_ntp_callback(netlib_dhcp_ntp_callback_t callback,
+                                        FAR void *arg)
+{
+  int ret = -ENOENT;
+
+  pthread_mutex_lock(&g_dhcp_ntp_lock);
+
+  if (g_dhcp_ntp_callback == callback && g_dhcp_ntp_callback_arg == arg)
+    {
+      g_dhcp_ntp_callback = NULL;
+      g_dhcp_ntp_callback_arg = NULL;
+      ret = OK;
+    }
+
+  pthread_mutex_unlock(&g_dhcp_ntp_lock);
+  return ret;
+}
+
+#endif /* CONFIG_NETUTILS_DHCPC */
diff --git a/netutils/netlib/netlib_obtainipv4addr.c b/netutils/netlib/netlib_obtainipv4addr.c
index cab55b74c..df07fef59 100644
--- a/netutils/netlib/netlib_obtainipv4addr.c
+++ b/netutils/netlib/netlib_obtainipv4addr.c
@@ -25,6 +25,10 @@
  ****************************************************************************/
 
 #include <nuttx/debug.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 
 #include "netutils/dhcpc.h"
@@ -105,6 +109,68 @@ static int dhcp_setup_result(FAR const char *ifname,
   return OK;
 }
 
+#ifdef CONFIG_NETUTILS_NTPCLIENT
+static int dhcp_set_ntp_servers(FAR const struct dhcpc_state *ds)
+{
+  char ntp_server_list[CONFIG_NETUTILS_DHCPC_NTP_SERVERS *
+                       (INET_ADDRSTRLEN + 1)];
+  size_t offset = 0;
+  uint8_t i;
+
+  /* Clear the DHCP-provided NTP server list,
+   * consider case: that device has joined another dhcp domain,
+   * it need refresh related settings.
+   */
+
+  if (ds->num_ntpaddr == 0)
+    {
+      return netlib_set_ntp_servers_from_dhcp(NULL);
+    }
+
+  ntp_server_list[0] = '\0';
+
+  for (i = 0; i < ds->num_ntpaddr; i++)
+    {
+      char addrbuf[INET_ADDRSTRLEN];
+      int ret;
+
+      /* Skip empty entries */
+
+      if (ds->ntpaddr[i].s_addr == 0)
+        {
+          continue;
+        }
+
+      if (inet_ntop(AF_INET, &ds->ntpaddr[i], addrbuf, sizeof(addrbuf)) ==
+          NULL)
+        {
+          return -EINVAL;
+        }
+
+      /* Append the server to the list */
+
+      ret = snprintf(ntp_server_list + offset,
+                     sizeof(ntp_server_list) - offset,
+                     "%s%s", offset == 0 ? "" : ";", addrbuf);
+      if (ret < 0 || (size_t)ret >= sizeof(ntp_server_list) - offset)
+        {
+          return -E2BIG;
+        }
+
+      offset += (size_t)ret;
+    }
+
+  /* Clear the list if all entries were empty */
+
+  if (offset == 0)
+    {
+      return netlib_set_ntp_servers_from_dhcp(NULL);
+    }
+
+  return netlib_set_ntp_servers_from_dhcp(ntp_server_list);
+}
+#endif
+
 /****************************************************************************
  * Name: dhcp_obtain_statefuladdr
  *
@@ -156,6 +222,18 @@ static int dhcp_obtain_statefuladdr(FAR const char *ifname)
   if (ret == OK)
     {
       ret = dhcp_setup_result(ifname, &ds);
+#ifdef CONFIG_NETUTILS_NTPCLIENT
+      if (ret == OK)
+        {
+          ret = dhcp_set_ntp_servers(&ds);
+          if (ret < 0)
+            {
+              nwarn("WARNING: failed to update DHCP NTP server list: %d\n",
+                    ret);
+              ret = OK;
+            }
+        }
+#endif
     }
   else
     {
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index ce7d2f0d9..ec002a7f1 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -126,6 +126,14 @@ enum ntpc_daemon_e
   NTP_STOPPED
 };
 
+enum ntpc_server_source_e
+{
+  NTP_SERVER_SOURCE_NONE = 0,
+  NTP_SERVER_SOURCE_CONFIG,
+  NTP_SERVER_SOURCE_DHCP,
+  NTP_SERVER_SOURCE_EXPLICIT
+};
+
 /* This type describes the state of the NTP client daemon.  Only one
  * instance of the NTP daemon is permitted in this implementation.
  */
@@ -133,11 +141,17 @@ enum ntpc_daemon_e
 struct ntpc_daemon_s
 {
   uint8_t state;       /* See enum ntpc_daemon_e */
+  uint8_t source;      /* See enum ntpc_server_source_e */
+  bool dhcp_registered;
   sem_t lock;          /* Used to protect the whole structure */
   sem_t sync;          /* Used to synchronize start and stop events */
   pid_t pid;           /* Task ID of the NTP daemon */
   sq_queue_t kod_list; /* KoD excluded server addresses */
   int family;          /* Allowed address family */
+
+  /* DHCP-provided server list */
+
+  FAR char *dhcp_servers;
 };
 
 union ntp_addr_u
@@ -194,11 +208,14 @@ struct ntp_kod_exclude_s
 static struct ntpc_daemon_s g_ntpc_daemon =
 {
   NTP_NOT_RUNNING,
+  NTP_SERVER_SOURCE_NONE,
+  false,
   SEM_INITIALIZER(1),
   SEM_INITIALIZER(0),
   -1,
   { NULL, NULL },
   AF_UNSPEC,         /* Default is both IPv4 and IPv6 */
+  NULL,
 };
 
 static struct ntp_sample_s g_last_samples
@@ -209,6 +226,115 @@ unsigned int g_last_nsamples = 0;
  * Private Functions
  ****************************************************************************/
 
+static int ntpc_daemon(int argc, FAR char **argv);
+static int ntpc_set_servers_from_dhcp(FAR const char *ntp_server_list);
+
+static FAR char *ntpc_dup_server_list(FAR const char *ntp_server_list)
+{
+  if (ntp_server_list == NULL || ntp_server_list[0] == '\0')
+    {
+      return NULL;
+    }
+
+  return strdup(ntp_server_list);
+}
+
+static FAR const char *ntpc_select_server_list(FAR uint8_t *source)
+{
+  if (g_ntpc_daemon.dhcp_servers != NULL &&
+      g_ntpc_daemon.dhcp_servers[0] != '\0')
+    {
+      *source = NTP_SERVER_SOURCE_DHCP;
+      return g_ntpc_daemon.dhcp_servers;
+    }
+
+  if (CONFIG_NETUTILS_NTPCLIENT_SERVER[0] != '\0')
+    {
+      *source = NTP_SERVER_SOURCE_CONFIG;
+      return CONFIG_NETUTILS_NTPCLIENT_SERVER;
+    }
+
+  *source = NTP_SERVER_SOURCE_NONE;
+  return NULL;
+}
+
+#ifdef CONFIG_NETUTILS_DHCPC
+static void ntpc_dhcp_notify(FAR const char *ntp_server_list, FAR void *arg)
+{
+  int ret;
+
+  UNUSED(arg);
+
+  ret = ntpc_set_servers_from_dhcp(ntp_server_list);
+  if (ret < 0)
+    {
+      nwarn("WARNING: failed to update DHCP NTP server list: %d\n", ret);
+    }
+}
+
+static int ntpc_register_dhcp(void)
+{
+  int ret;
+
+  sem_wait(&g_ntpc_daemon.lock);
+  if (g_ntpc_daemon.dhcp_registered)
+    {
+      sem_post(&g_ntpc_daemon.lock);
+      return OK;
+    }
+
+  g_ntpc_daemon.dhcp_registered = true;
+  sem_post(&g_ntpc_daemon.lock);
+
+  ret = netlib_register_dhcp_ntp_callback(ntpc_dhcp_notify, NULL);
+  if (ret < 0)
+    {
+      sem_wait(&g_ntpc_daemon.lock);
+      g_ntpc_daemon.dhcp_registered = false;
+      sem_post(&g_ntpc_daemon.lock);
+      return ret;
+    }
+
+  return OK;
+}
+#endif
+
+static int ntpc_start_selected(FAR const char *ntp_server_list,
+                               uint8_t source)
+{
+  FAR char *task_argv[] =
+    {
+      (FAR char *)ntp_server_list,
+      NULL
+    };
+
+  g_ntpc_daemon.state = NTP_STARTED;
+  g_ntpc_daemon.source = source;
+  g_ntpc_daemon.pid =
+    task_create("NTP daemon", CONFIG_NETUTILS_NTPCLIENT_SERVERPRIO,
+                CONFIG_NETUTILS_NTPCLIENT_STACKSIZE, ntpc_daemon,
+                task_argv);
+
+  if (g_ntpc_daemon.pid < 0)
+    {
+      int errval = errno;
+      DEBUGASSERT(errval > 0);
+
+      g_ntpc_daemon.state = NTP_STOPPED;
+      g_ntpc_daemon.source = NTP_SERVER_SOURCE_NONE;
+      nerr("ERROR: Failed to start the NTP daemon: %d\n", errval);
+      return -errval;
+    }
+
+  do
+    {
+      sem_wait(&g_ntpc_daemon.sync);
+    }
+  while (g_ntpc_daemon.state == NTP_STARTED);
+
+  return g_ntpc_daemon.pid;
+}
+
 /****************************************************************************
  * Name: sample_cmp
  ****************************************************************************/
@@ -1490,11 +1616,12 @@ void ntpc_dualstack_family(int family)
 
 int ntpc_start_with_list(FAR const char *ntp_server_list)
 {
-  FAR char *task_argv[] =
+  int ret;
+
+  if (ntp_server_list == NULL || ntp_server_list[0] == '\0')
     {
-      (FAR char *)ntp_server_list,
-      NULL
-    };
+      return -EINVAL;
+    }
 
   /* Is the NTP in a non-running state? */
 
@@ -1502,34 +1629,10 @@ int ntpc_start_with_list(FAR const char *ntp_server_list)
   if (g_ntpc_daemon.state == NTP_NOT_RUNNING ||
       g_ntpc_daemon.state == NTP_STOPPED)
     {
-      /* Start the NTP daemon */
-
-      g_ntpc_daemon.state = NTP_STARTED;
-      g_ntpc_daemon.pid =
-        task_create("NTP daemon", CONFIG_NETUTILS_NTPCLIENT_SERVERPRIO,
-                    CONFIG_NETUTILS_NTPCLIENT_STACKSIZE, ntpc_daemon,
-                    task_argv);
-
-      /* Handle failures to start the NTP daemon */
-
-      if (g_ntpc_daemon.pid < 0)
-        {
-          int errval = errno;
-          DEBUGASSERT(errval > 0);
-
-          g_ntpc_daemon.state = NTP_STOPPED;
-          nerr("ERROR: Failed to start the NTP daemon: %d\n", errval);
-          sem_post(&g_ntpc_daemon.lock);
-          return -errval;
-        }
-
-      /* Wait for any daemon state change */
-
-      do
-        {
-          sem_wait(&g_ntpc_daemon.sync);
-        }
-      while (g_ntpc_daemon.state == NTP_STARTED);
+      ret = ntpc_start_selected(ntp_server_list,
+                                NTP_SERVER_SOURCE_EXPLICIT);
+      sem_post(&g_ntpc_daemon.lock);
+      return ret;
     }
 
   sem_post(&g_ntpc_daemon.lock);
@@ -1550,7 +1653,101 @@ int ntpc_start_with_list(FAR const char *ntp_server_list)
 
 int ntpc_start(void)
 {
-  return ntpc_start_with_list(CONFIG_NETUTILS_NTPCLIENT_SERVER);
+  FAR const char *ntp_server_list;
+  uint8_t source;
+  int ret;
+
+#ifdef CONFIG_NETUTILS_DHCPC
+  ret = ntpc_register_dhcp();
+  if (ret < 0)
+    {
+      return ret;
+    }
+#endif
+
+  sem_wait(&g_ntpc_daemon.lock);
+  if (g_ntpc_daemon.state != NTP_NOT_RUNNING &&
+      g_ntpc_daemon.state != NTP_STOPPED)
+    {
+      ret = g_ntpc_daemon.pid;
+      sem_post(&g_ntpc_daemon.lock);
+      return ret;
+    }
+
+  ntp_server_list = ntpc_select_server_list(&source);
+  if (ntp_server_list == NULL)
+    {
+      g_ntpc_daemon.source = NTP_SERVER_SOURCE_NONE;
+      sem_post(&g_ntpc_daemon.lock);
+      return -ENOENT;
+    }
+
+  ret = ntpc_start_selected(ntp_server_list, source);
+  sem_post(&g_ntpc_daemon.lock);
+  return ret;
+}
+
+static int ntpc_set_servers_from_dhcp(FAR const char *ntp_server_list)
+{
+  FAR char *new_servers;
+  FAR char *old_servers;
+  bool start = false;
+  bool restart = false;
+  int ret = OK;
+
+  new_servers = ntpc_dup_server_list(ntp_server_list);
+  if (ntp_server_list != NULL && ntp_server_list[0] != '\0' &&
+      new_servers == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  sem_wait(&g_ntpc_daemon.lock);
+
+  if ((g_ntpc_daemon.dhcp_servers == NULL && new_servers == NULL) ||
+      (g_ntpc_daemon.dhcp_servers != NULL && new_servers != NULL &&
+       strcmp(g_ntpc_daemon.dhcp_servers, new_servers) == 0))
+    {
+      sem_post(&g_ntpc_daemon.lock);
+      free(new_servers);
+      return OK;
+    }
+
+  old_servers = g_ntpc_daemon.dhcp_servers;
+  g_ntpc_daemon.dhcp_servers = new_servers;
+
+  if ((g_ntpc_daemon.source == NTP_SERVER_SOURCE_DHCP ||
+       g_ntpc_daemon.source == NTP_SERVER_SOURCE_CONFIG) &&
+      (g_ntpc_daemon.state == NTP_STARTED ||
+       g_ntpc_daemon.state == NTP_RUNNING))
+    {
+      restart = true;
+    }
+  else if (g_ntpc_daemon.source == NTP_SERVER_SOURCE_NONE &&
+           new_servers != NULL &&
+           (g_ntpc_daemon.state == NTP_NOT_RUNNING ||
+            g_ntpc_daemon.state == NTP_STOPPED))
+    {
+      start = true;
+    }
+
+  sem_post(&g_ntpc_daemon.lock);
+  free(old_servers);
+
+  if (restart)
+    {
+      ret = ntpc_stop();
+      if (ret >= 0 && new_servers != NULL)
+        {
+          ret = ntpc_start();
+        }
+    }
+  else if (start)
+    {
+      ret = ntpc_start();
+    }
+
+  return ret;
 }
 
 /****************************************************************************

From 0105a9b23879666fc323e36d4896c3333679bba3 Mon Sep 17 00:00:00 2001
From: shichunma <masc2008@gmail.com>
Date: Mon, 27 Apr 2026 21:40:58 +0800
Subject: [PATCH 306/568] netutils/ntpclient: guard DHCP-only helpers

fix a warning that static function defined by not used

Signed-off-by: Jerry Ma <masc2008@gmail.com>
---
 netutils/ntpclient/ntpclient.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index ec002a7f1..304c02a3c 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -227,6 +227,7 @@ unsigned int g_last_nsamples = 0;
  ****************************************************************************/
 
 static int ntpc_daemon(int argc, FAR char **argv);
+#ifdef CONFIG_NETUTILS_DHCPC
 static int ntpc_set_servers_from_dhcp(FAR const char *ntp_server_list);
 
 static FAR char *ntpc_dup_server_list(FAR const char *ntp_server_list)
@@ -238,6 +239,7 @@ static FAR char *ntpc_dup_server_list(FAR const char *ntp_server_list)
 
   return strdup(ntp_server_list);
 }
+#endif
 
 static FAR const char *ntpc_select_server_list(FAR uint8_t *source)
 {
@@ -1687,6 +1689,7 @@ int ntpc_start(void)
   return ret;
 }
 
+#ifdef CONFIG_NETUTILS_DHCPC
 static int ntpc_set_servers_from_dhcp(FAR const char *ntp_server_list)
 {
   FAR char *new_servers;
@@ -1749,6 +1752,7 @@ static int ntpc_set_servers_from_dhcp(FAR const char *ntp_server_list)
 
   return ret;
 }
+#endif
 
 /****************************************************************************
  * Name: ntpc_stop

From ded0a17514954cf8230b2e0a0f1fce63a5c69080 Mon Sep 17 00:00:00 2001
From: Serg Podtynnyi <serg@podtynnyi.com>
Date: Wed, 22 Apr 2026 22:13:59 +0700
Subject: [PATCH 307/568] graphics/lvgl: bump version to 9.2.2

Update lvlg version to 9.2.2, includes fix for nuttx lcd release
Get version from config in Makefile
Get version from config in cmake file

Signed-off-by: Serg Podtynnyi <serg@podtynnyi.com>
---
 graphics/lvgl/CMakeLists.txt | 15 ++++++++++++---
 graphics/lvgl/Kconfig        |  4 ++--
 graphics/lvgl/Makefile       |  7 +++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/graphics/lvgl/CMakeLists.txt b/graphics/lvgl/CMakeLists.txt
index 352b5da59..ba5af28e2 100644
--- a/graphics/lvgl/CMakeLists.txt
+++ b/graphics/lvgl/CMakeLists.txt
@@ -27,12 +27,21 @@ if(CONFIG_GRAPHICS_LVGL)
   # ############################################################################
   set(LVGL_DIR ${CMAKE_CURRENT_LIST_DIR}/lvgl)
 
+  set(LVGL_VERSION
+      "${CONFIG_LVGL_VERSION_MAJOR}.${CONFIG_LVGL_VERSION_MINOR}.${CONFIG_LVGL_VERSION_PATCH}"
+  )
+
   if(NOT EXISTS ${LVGL_DIR})
+    set(LVGL_URL
+        "https://github.com/lvgl/lvgl/archive/refs/tags/v${LVGL_VERSION}.zip")
     FetchContent_Declare(
       lvgl_fetch
-      DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
-      URL "https://github.com/lvgl/lvgl/archive/refs/tags/v9.2.1.zip" SOURCE_DIR
-          ${CMAKE_CURRENT_LIST_DIR}/lvgl BINARY_DIR
+      URL ${LVGL_URL}
+          DOWNLOAD_DIR
+          ${CMAKE_CURRENT_LIST_DIR}
+          SOURCE_DIR
+          ${CMAKE_CURRENT_LIST_DIR}/lvgl
+          BINARY_DIR
           ${CMAKE_BINARY_DIR}/apps/graphics/lvgl/lvgl
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 120)
diff --git a/graphics/lvgl/Kconfig b/graphics/lvgl/Kconfig
index 4daf467f3..2d9ad2f8e 100644
--- a/graphics/lvgl/Kconfig
+++ b/graphics/lvgl/Kconfig
@@ -11,7 +11,7 @@ menuconfig GRAPHICS_LVGL
 
 if GRAPHICS_LVGL
 
-# Kconfig file for LVGL v9.2.1
+# Kconfig file for LVGL v9.2.2
 
 menu "LVGL configuration"
 
@@ -1495,7 +1495,7 @@ menu "LVGL configuration"
 			default 2 # LVGL_VERSION_MINOR
 		config LVGL_VERSION_PATCH
 			int
-			default 1 # LVGL_VERSION_PATCH
+			default 2 # LVGL_VERSION_PATCH
 	endmenu
 
 	menu "Devices"
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index a81fac1eb..ce9ad6b7f 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -58,8 +58,11 @@ WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
 CONFIG_GRAPH_LVGL_URL ?= "https://github.com/lvgl/lvgl/archive/refs/tags"
 
-LVGL_VERSION = 9.2.1
-LVGL_TARBALL = v$(LVGL_VERSION).zip
+_MAJ         := $(CONFIG_LVGL_VERSION_MAJOR)
+_MIN         := $(CONFIG_LVGL_VERSION_MINOR)
+_PAT         := $(CONFIG_LVGL_VERSION_PATCH)
+LVGL_VERSION := $(_MAJ).$(_MIN).$(_PAT)
+LVGL_TARBALL := v$(LVGL_VERSION).zip
 
 LVGL_UNPACKNAME = lvgl
 UNPACK ?= unzip -o $(if $(V),,-q)

From a9881037ea8f37c99cad6c31eb3ba8af2ebc3cec Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Tue, 27 Aug 2024 17:53:44 +0200
Subject: [PATCH 308/568] nimble: remove -Wno-pointer-to-int-cast from CFLAGS

it's not needed and cause warnings for C++ builds:

cc1plus: warning: command-line option '-Wno-pointer-to-int-cast' is valid for C/ObjC but not for C++
Signed-off-by: raiden00pl <raiden00@railab.me>
---
 wireless/bluetooth/nimble/CMakeLists.txt  | 5 +++--
 wireless/bluetooth/nimble/Makefile.nimble | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wireless/bluetooth/nimble/CMakeLists.txt b/wireless/bluetooth/nimble/CMakeLists.txt
index 1abf4a576..f6fda14ec 100644
--- a/wireless/bluetooth/nimble/CMakeLists.txt
+++ b/wireless/bluetooth/nimble/CMakeLists.txt
@@ -193,7 +193,8 @@ if(CONFIG_NIMBLE)
 
   target_include_directories(nimble PUBLIC include ${INCLUDES})
 
-  target_compile_options(nimble PUBLIC -Wno-pointer-to-int-cast -Wno-undef
-                                       -Wno-format -Wno-unused-but-set-variable)
+  target_compile_options(nimble PUBLIC -Wno-undef -Wno-format
+                                       -Wno-unused-but-set-variable)
+
   target_sources(nimble PRIVATE ${SRCS})
 endif()
diff --git a/wireless/bluetooth/nimble/Makefile.nimble b/wireless/bluetooth/nimble/Makefile.nimble
index 8a4281dfa..0b86a8263 100644
--- a/wireless/bluetooth/nimble/Makefile.nimble
+++ b/wireless/bluetooth/nimble/Makefile.nimble
@@ -64,7 +64,7 @@ CXXFLAGS += $(addprefix ${INCDIR_PREFIX}, $(NIMBLE_ALL_INC))
 
 # NimBLE assumes this flag since it expects undefined macros to be zero value
 
-CFLAGS += -Wno-pointer-to-int-cast -Wno-undef
+CFLAGS += -Wno-undef
 
 # disable printf format checks
 

From 5b0cae9ab0e8669ad2f6020e1ecb0e855b44c466 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Mon, 16 Feb 2026 13:41:27 -0500
Subject: [PATCH 309/568] !apps: Simplify NuttX initialization

BREAKING: In an effort to simplify board initialization logic for NuttX,
NSH will no longer support architecture initialization. This will happen
during boot via the BOARD_LATE_INITIALIZE option. The boardctl command
BOARDIOC_INIT is also no longer available from user-space.

Quick fix:
Any application relying on BOARDIOC_INIT should now enable
BOARD_LATE_INITIALIZE to have initialization performed by the kernel in
advance of the application running. If control over initialization is
still necessary, BOARDIOC_FINALINIT should be implemented and used.
Boards relying on NSH for initialization should also enable
BOARD_LATE_INITIALIZE instead.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 boot/miniboot/miniboot_main.c                 |  6 +----
 boot/nxboot/nxboot_main.c                     |  6 -----
 examples/foc/foc_main.c                       | 10 ++------
 examples/lvgldemo/lvgldemo.c                  | 24 -------------------
 examples/lvglterm/lvglterm.c                  | 23 ------------------
 examples/nimble/nimble_main.c                 |  6 -----
 examples/nimble_blecent/nimble_blecent_main.c |  8 +------
 examples/nimble_bleprph/nimble_bleprph_main.c |  8 +------
 examples/nxscope/nxscope_main.c               |  8 +------
 examples/powerled/powerled_main.c             |  6 -----
 examples/smps/smps_main.c                     |  6 -----
 graphics/nxwm/src/nxwm_main.cxx               | 10 --------
 graphics/twm4nx/Kconfig                       | 11 ---------
 graphics/twm4nx/src/twm4nx_main.cxx           | 17 -------------
 nshlib/Kconfig                                | 12 +---------
 nshlib/nsh.h                                  |  7 ------
 nshlib/nsh_init.c                             | 12 ----------
 system/adb/Kconfig                            |  9 +------
 system/adb/adb_main.c                         |  7 +-----
 system/adcscope/adcscope_main.c               |  8 +------
 system/ofloader/ofloader.c                    | 10 ++------
 system/sensorscope/sensorscope_main.c         |  8 +------
 22 files changed, 13 insertions(+), 209 deletions(-)

diff --git a/boot/miniboot/miniboot_main.c b/boot/miniboot/miniboot_main.c
index 63f47465c..ce490c45b 100644
--- a/boot/miniboot/miniboot_main.c
+++ b/boot/miniboot/miniboot_main.c
@@ -39,7 +39,7 @@
  * Name: miniboot_main
  *
  * Description:
- *   Minimal bootlaoder entry point.
+ *   Minimal bootloader entry point.
  *
  ****************************************************************************/
 
@@ -49,10 +49,6 @@ int main(int argc, FAR char *argv[])
 
   syslog(LOG_INFO, "*** miniboot ***\n");
 
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
 #ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
diff --git a/boot/nxboot/nxboot_main.c b/boot/nxboot/nxboot_main.c
index 976b03b4c..0682b92c7 100644
--- a/boot/nxboot/nxboot_main.c
+++ b/boot/nxboot/nxboot_main.c
@@ -264,16 +264,10 @@ int main(int argc, FAR char *argv[])
   FAR struct boardioc_reset_cause_s cause;
 #endif
 
-#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
 #ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#endif
 #endif
 
   syslog(LOG_INFO, "*** nxboot ***\n");
diff --git a/examples/foc/foc_main.c b/examples/foc/foc_main.c
index 4b280e848..2f1b6b0c4 100644
--- a/examples/foc/foc_main.c
+++ b/examples/foc/foc_main.c
@@ -142,7 +142,7 @@ struct args_s g_args =
   }
 };
 
-/* Start allowed at defaule */
+/* Start allowed at default */
 
 static bool            g_start_allowed      = true;
 static pthread_mutex_t g_start_allowed_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -294,16 +294,10 @@ int main(int argc, char *argv[])
       goto errout_no_nxscope;
     }
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
-#  ifdef CONFIG_BOARDCTL_FINALINIT
+#ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#  endif
 #endif
 
   PRINTF("\nStart foc_main application!\n\n");
diff --git a/examples/lvgldemo/lvgldemo.c b/examples/lvgldemo/lvgldemo.c
index 55d6620ed..b6ab1e5ab 100644
--- a/examples/lvgldemo/lvgldemo.c
+++ b/examples/lvgldemo/lvgldemo.c
@@ -38,23 +38,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Should we perform board-specific driver initialization? There are two
- * ways that board initialization can occur:  1) automatically via
- * board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE
- * or 2).
- * via a call to boardctl() if the interface is enabled
- * (CONFIG_BOARDCTL=y).
- * If this task is running as an NSH built-in application, then that
- * initialization has probably already been performed otherwise we do it
- * here.
- */
-
-#undef NEED_BOARDINIT
-
-#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
-#  define NEED_BOARDINIT 1
-#endif
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -122,13 +105,6 @@ int main(int argc, FAR char *argv[])
       return -1;
     }
 
-#ifdef NEED_BOARDINIT
-  /* Perform board-specific driver initialization */
-
-  boardctl(BOARDIOC_INIT, 0);
-
-#endif
-
   lv_init();
 
   lv_nuttx_dsc_init(&info);
diff --git a/examples/lvglterm/lvglterm.c b/examples/lvglterm/lvglterm.c
index 71c5e650e..f1ef2259f 100644
--- a/examples/lvglterm/lvglterm.c
+++ b/examples/lvglterm/lvglterm.c
@@ -63,23 +63,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Should we perform board-specific driver initialization?  There are two
- * ways that board initialization can occur:  1) automatically via
- * board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE
- * or 2).
- * via a call to boardctl() if the interface is enabled
- * (CONFIG_BOARDCTL=y).
- * If this task is running as an NSH built-in application, then that
- * initialization has probably already been performed otherwise we do it
- * here.
- */
-
-#undef NEED_BOARDINIT
-
-#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
-#  define NEED_BOARDINIT 1
-#endif
-
 /* How often to poll for output from NSH Shell (milliseconds) */
 
 #define TIMER_PERIOD_MS 100
@@ -550,16 +533,10 @@ int main(int argc, FAR char *argv[])
   uv_loop_t ui_loop;
 #endif
 
-#ifdef NEED_BOARDINIT
-  /* Perform board-specific driver initialization */
-
-  boardctl(BOARDIOC_INIT, 0);
-
 #ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#endif
 #endif
 
   /* LVGL initialization */
diff --git a/examples/nimble/nimble_main.c b/examples/nimble/nimble_main.c
index ba46199f7..68eb2f051 100644
--- a/examples/nimble/nimble_main.c
+++ b/examples/nimble/nimble_main.c
@@ -255,12 +255,6 @@ int main(int argc, FAR char *argv[])
       ble_hci_sock_set_device(atoi(argv[1]));
     }
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization */
-
-  boardctl(BOARDIOC_INIT, 0);
-#endif
-
 #ifndef CONFIG_NSH_NETINIT
   /* Bring up the network */
 
diff --git a/examples/nimble_blecent/nimble_blecent_main.c b/examples/nimble_blecent/nimble_blecent_main.c
index a20dd282d..5af9d2b03 100644
--- a/examples/nimble_blecent/nimble_blecent_main.c
+++ b/examples/nimble_blecent/nimble_blecent_main.c
@@ -412,7 +412,7 @@ static int blecent_gap_event(FAR struct ble_gap_event *event, FAR void *arg)
             return 0;
           }
 
-        /* An advertisment report was received during GAP discovery. */
+        /* An advertisement report was received during GAP discovery. */
 
         print_adv_fields(&fields);
 
@@ -632,12 +632,6 @@ int main(int argc, FAR char **argv)
       ble_hci_sock_set_device(atoi(argv[1]));
     }
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization */
-
-  boardctl(BOARDIOC_INIT, 0);
-#endif
-
 #ifndef CONFIG_NSH_NETINIT
   /* Bring up the network */
 
diff --git a/examples/nimble_bleprph/nimble_bleprph_main.c b/examples/nimble_bleprph/nimble_bleprph_main.c
index 9dea4d226..9c41f72b2 100644
--- a/examples/nimble_bleprph/nimble_bleprph_main.c
+++ b/examples/nimble_bleprph/nimble_bleprph_main.c
@@ -140,7 +140,7 @@ static void bleprph_advertise(void)
     BLE_HS_ADV_F_BREDR_UNSUP;
 
   /* Indicate that the TX power level field should be included; have the
-   * stack fill this value automatically.  This is done by assiging the
+   * stack fill this value automatically. This is done by assigning the
    * special value BLE_HS_ADV_TX_PWR_LVL_AUTO.
    */
 
@@ -372,12 +372,6 @@ int main(int argc, FAR char *argv[])
       ble_hci_sock_set_device(atoi(argv[1]));
     }
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization */
-
-  boardctl(BOARDIOC_INIT, 0);
-#endif
-
 #ifndef CONFIG_NSH_NETINIT
   /* Bring up the network */
 
diff --git a/examples/nxscope/nxscope_main.c b/examples/nxscope/nxscope_main.c
index afad9052b..1f4c9fff4 100644
--- a/examples/nxscope/nxscope_main.c
+++ b/examples/nxscope/nxscope_main.c
@@ -527,16 +527,10 @@ int main(int argc, FAR char *argv[])
   printf("stream interval = %d\n", env.interval);
   printf("main interval = %d\n", interval);
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
-#  ifdef CONFIG_BOARDCTL_FINALINIT
+#ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#  endif
 #endif
 
 #ifdef CONFIG_EXAMPLES_NXSCOPE_CDCACM
diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c
index b949aadfa..6743b5e23 100644
--- a/examples/powerled/powerled_main.c
+++ b/examples/powerled/powerled_main.c
@@ -439,16 +439,10 @@ int main(int argc, char *argv[])
       goto errout;
     }
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
 #ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#endif
 #endif
 
   /* Set LED current limit */
diff --git a/examples/smps/smps_main.c b/examples/smps/smps_main.c
index 852696855..b9ddbd827 100644
--- a/examples/smps/smps_main.c
+++ b/examples/smps/smps_main.c
@@ -476,16 +476,10 @@ int main(int argc, char *argv[])
       goto errout;
     }
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
 #ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#endif
 #endif
 
   /* Set SMPS mode */
diff --git a/graphics/nxwm/src/nxwm_main.cxx b/graphics/nxwm/src/nxwm_main.cxx
index 98feabbf6..6b6a3ca1d 100644
--- a/graphics/nxwm/src/nxwm_main.cxx
+++ b/graphics/nxwm/src/nxwm_main.cxx
@@ -485,16 +485,6 @@ static bool createMediaPlayer(void)
 
 int main(int argc, char *argv[])
 {
-#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_BOARD_LATE_INITIALIZE)
-  // Should we perform board-specific initialization?  There are two ways
-  // that board initialization can occur:  1) automatically via
-  // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or
-  // 2) here via a call to boardctl() if the interface is enabled
-  // (CONFIG_BOARDCTL=y).
-
-  boardctl(BOARDIOC_INIT, 0);
-#endif
-
 #ifdef CONFIG_NXWM_NXTERM
   // Initialize the NSH library
 
diff --git a/graphics/twm4nx/Kconfig b/graphics/twm4nx/Kconfig
index 3f9600f68..3b114df88 100644
--- a/graphics/twm4nx/Kconfig
+++ b/graphics/twm4nx/Kconfig
@@ -42,17 +42,6 @@ config TWM4NX_REVMINOR
 	string "Twm4Nx minor version number"
 	default "0"
 
-config TWM4NX_ARCHINIT
-	bool "Have architecture-specific initialization"
-	default n
-	select BOARDCTL
-	depends on !NSH_ARCHINIT
-	---help---
-		Set if your board provides architecture specific initialization
-		via the board-interface function boardctl().  The boardctl()
-		function will be called early in Twm4Nx initialization to allow
-		board logic to do such things as configure MMC/SD slots.
-
 config TWM4NX_NETINIT
 	bool "Network initialization"
 	default y
diff --git a/graphics/twm4nx/src/twm4nx_main.cxx b/graphics/twm4nx/src/twm4nx_main.cxx
index 30185ad07..3cfb3a6b5 100644
--- a/graphics/twm4nx/src/twm4nx_main.cxx
+++ b/graphics/twm4nx/src/twm4nx_main.cxx
@@ -98,23 +98,6 @@ int main(int argc, FAR char *argv[])
 
   int ret;
 
-#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_BOARDCTL) && \
-   !defined(CONFIG_BOARD_LATE_INITIALIZE)
-  // Should we perform board-specific initialization?  There are two ways
-  // that board initialization can occur:  1) automatically via
-  // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or
-  // 2) here via a call to boardctl() if the interface is enabled
-  // (CONFIG_BOARDCTL=y).  board_early_initialize() is also possibility,
-  // although less likely.
-
-  ret = boardctl(BOARDIOC_INIT, 0);
-  if (ret < 0)
-    {
-      twmerr("ERROR: boardctl(BOARDIOC_INIT) failed: %d\n", errno);
-      return EXIT_FAILURE;
-    }
-#endif
-
 #ifdef CONFIG_TWM4NX_NETINIT
   /* Bring up the network */
 
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index b9a510383..1fc34cb21 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -9,7 +9,7 @@ config NSH_LIBRARY
 	bool "NSH Library"
 	default n
 	select NETUTILS_NETLIB if NET
-	select BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT) || NSH_ARCHINIT
+	select BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT)
 	select BOARDCTL_MKRD if !NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT
 	---help---
 		Build the NSH support library.  This is used, for example, by
@@ -1116,16 +1116,6 @@ config NSH_USBDEV_TRACEINTERRUPTS
 endif # NSH_USBDEV_TRACE
 endmenu # USB Device Trace Support
 
-config NSH_ARCHINIT
-	bool "Have architecture-specific initialization"
-	default n
-	select BOARDCTL
-	---help---
-		Set if your board provides architecture specific initialization
-		via the board-interface function boardctl().  The boardctl()
-		function will be called early in NSH initialization to allow
-		board logic to do such things as configure MMC/SD slots.
-
 menu "Networking Configuration"
 	depends on NET
 
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 8ea334d07..2fb3cf867 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -807,13 +807,6 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl);
  * available:
  */
 
-/* Architecture-specific initialization depends on boardctl(BOARDIOC_INIT) */
-
-#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BOARDCTL)
-#  warning CONFIG_NSH_ARCHINIT is set, but CONFIG_BOARDCTL is not
-#  undef CONFIG_NSH_ARCHINIT
-#endif
-
 /* The mkrd command depends on boardctl(BOARDIOC_MKRD) */
 
 #if !defined(CONFIG_BOARDCTL) || !defined(CONFIG_BOARDCTL_MKRD)
diff --git a/nshlib/nsh_init.c b/nshlib/nsh_init.c
index 4846ff15b..aea095e34 100644
--- a/nshlib/nsh_init.c
+++ b/nshlib/nsh_init.c
@@ -143,12 +143,6 @@ void nsh_initialize(void)
   boardctl(BOARDIOC_APP_SYMTAB, (uintptr_t)&symdesc);
 #endif
 
-#ifdef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-#endif
-
 #if defined(CONFIG_ETC_ROMFS) && !defined(CONFIG_NSH_DISABLESCRIPT)
   pstate = nsh_newconsole(false);
 
@@ -163,12 +157,6 @@ void nsh_initialize(void)
   netinit_bringup();
 #endif
 
-#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
-  /* Perform architecture-specific final-initialization (if configured) */
-
-  boardctl(BOARDIOC_FINALINIT, 0);
-#endif
-
 #if defined(CONFIG_ETC_ROMFS) && !defined(CONFIG_NSH_DISABLESCRIPT)
   /* Execute the start-up script */
 
diff --git a/system/adb/Kconfig b/system/adb/Kconfig
index 05296cca7..a97ac5a9f 100644
--- a/system/adb/Kconfig
+++ b/system/adb/Kconfig
@@ -200,19 +200,12 @@ config ADBD_SOCKET_SERVICE
 	---help---
 		Enable "adb forward|reverse" feature.
 
-config ADBD_BOARD_INIT
-	bool "Board initialization"
-	depends on BOARDCTL
-	default n
-	---help---
-		Setup board before running adb daemon.
-
 config ADBD_USB_BOARDCTL
 	bool "USB Board Control"
 	depends on BOARDCTL
 	depends on ADBD_USB_SERVER
 	select BOARDCTL_USBDEVCTRL
-	default ADBD_BOARD_INIT
+	default y
 	---help---
 		Connect usbdev before running adb daemon.
 
diff --git a/system/adb/adb_main.c b/system/adb/adb_main.c
index 3895001d5..8703337c6 100644
--- a/system/adb/adb_main.c
+++ b/system/adb/adb_main.c
@@ -32,8 +32,7 @@
 #include <syslog.h>
 #include <nuttx/streams.h>
 
-#if defined(CONFIG_ADBD_BOARD_INIT) || defined (CONFIG_BOARDCTL_RESET) || \
-    defined(CONFIG_ADBD_USB_BOARDCTL)
+#if defined (CONFIG_BOARDCTL_RESET) || defined(CONFIG_ADBD_USB_BOARDCTL)
 #  include <sys/boardctl.h>
 #endif
 
@@ -120,10 +119,6 @@ int main(int argc, FAR char **argv)
   int ret;
 #endif
 
-#ifdef CONFIG_ADBD_BOARD_INIT
-  boardctl(BOARDIOC_INIT, 0);
-#endif /* CONFIG_ADBD_BOARD_INIT */
-
 #ifdef CONFIG_ADBD_USB_BOARDCTL
 
   /* Setup USBADB device */
diff --git a/system/adcscope/adcscope_main.c b/system/adcscope/adcscope_main.c
index 3413c6b52..991a756ca 100644
--- a/system/adcscope/adcscope_main.c
+++ b/system/adcscope/adcscope_main.c
@@ -382,16 +382,10 @@ int main(int argc, FAR char *argv[])
   pthread_t                 thread;
   int                       ret;
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
-#  ifdef CONFIG_BOARDCTL_FINALINIT
+#ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#  endif
 #endif
 
 #ifdef CONFIG_SYSTEM_ADCSCOPE_CDCACM
diff --git a/system/ofloader/ofloader.c b/system/ofloader/ofloader.c
index 8200262fe..6648a66b0 100644
--- a/system/ofloader/ofloader.c
+++ b/system/ofloader/ofloader.c
@@ -35,7 +35,7 @@
 #include "ofloader.h"
 
 /****************************************************************************
- * Private Typess
+ * Private Types
  ****************************************************************************/
 
 struct devinfo_s
@@ -320,16 +320,10 @@ int main(int argc, FAR char *argv[])
   size_t i;
   mqd_t mq;
 
-#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
-#  ifdef CONFIG_BOARDCTL_FINALINIT
+#ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#  endif
 #endif
 
   memset(&mqattr, 0, sizeof(struct mq_attr));
diff --git a/system/sensorscope/sensorscope_main.c b/system/sensorscope/sensorscope_main.c
index 2c8f2ecbe..1bb5e044d 100644
--- a/system/sensorscope/sensorscope_main.c
+++ b/system/sensorscope/sensorscope_main.c
@@ -412,16 +412,10 @@ int main(int argc, FAR char *argv[])
   pthread_t                   thread;
   int                         ret;
 
-#ifndef CONFIG_NSH_ARCHINIT
-  /* Perform architecture-specific initialization (if configured) */
-
-  boardctl(BOARDIOC_INIT, 0);
-
-#  ifdef CONFIG_BOARDCTL_FINALINIT
+#ifdef CONFIG_BOARDCTL_FINALINIT
   /* Perform architecture-specific final-initialization (if configured) */
 
   boardctl(BOARDIOC_FINALINIT, 0);
-#  endif
 #endif
 
 #ifdef CONFIG_SYSTEM_SENSORSCOPE_CDCACM

From dca76ccb7853f2e96aa4add40dbe924209d2259c Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Thu, 19 Feb 2026 00:07:07 -0500
Subject: [PATCH 310/568] codespell: Ignore lines without typos

Ignore some new lines with incorrect spelling error detection.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 .codespell-ignore-lines | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.codespell-ignore-lines b/.codespell-ignore-lines
index 4b6f55c66..45628423d 100644
--- a/.codespell-ignore-lines
+++ b/.codespell-ignore-lines
@@ -1,6 +1,8 @@
       mynewt-nimble/nimble/host/services/ans/src/ble_svc_ans.c
       mynewt-nimble/nimble/host/services/ans/include
+#include "services/ans/ble_svc_ans.h"
 #include "crypto/controlse/ccertificate.hxx"
+ * notifications for the ANS Unread Alert Status characteristic
               object = new Controlse::CCertificate(
           Controlse::CCertificate cert(se, settings->key_id);
       auto certificate = Controlse::CCertificate(

From b3cf222836bea1a97fc2c5d49596850459c99b9d Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 29 Mar 2026 17:46:22 +0200
Subject: [PATCH 311/568] system/sensorscope: support for fixe16 data

system/sensorscope: support for fixe16 data

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 system/sensorscope/sensorscope_main.c | 57 ++++++++++++++++++---------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/system/sensorscope/sensorscope_main.c b/system/sensorscope/sensorscope_main.c
index 1bb5e044d..9430ab08c 100644
--- a/system/sensorscope/sensorscope_main.c
+++ b/system/sensorscope/sensorscope_main.c
@@ -50,6 +50,12 @@
 #define SENSOR_PATH_MAX    62
 #define SENSOR_CHNAME_MAX  16
 
+#ifdef CONFIG_SENSORS_USE_B16
+#  define NXSCOPE_DATA_TYPE NXSCOPE_TYPE_B16
+#else
+#  define NXSCOPE_DATA_TYPE NXSCOPE_TYPE_FLOAT
+#endif
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -98,24 +104,41 @@ struct nxscope_thr_env_s
 
 struct nxsensor_info_s g_nxsensor[] =
 {
-  {"accel", sizeof(struct sensor_accel), 0, 3, NXSCOPE_TYPE_FLOAT},
-  {"mag", sizeof(struct sensor_mag), 0, 3, NXSCOPE_TYPE_FLOAT},
-  {"gyro", sizeof(struct sensor_gyro), 0, 3, NXSCOPE_TYPE_FLOAT},
-  {"light", sizeof(struct sensor_light), 0, 2, NXSCOPE_TYPE_FLOAT},
-  {"baro", sizeof(struct sensor_baro), 0, 2, NXSCOPE_TYPE_FLOAT},
-  {"prox", sizeof(struct sensor_prox), 0, 1, NXSCOPE_TYPE_FLOAT},
-  {"humi", sizeof(struct sensor_humi), 0, 1, NXSCOPE_TYPE_FLOAT},
-  {"temp", sizeof(struct sensor_temp), 0, 1, NXSCOPE_TYPE_FLOAT},
-  {"rgb", sizeof(struct sensor_rgb), 0, 3, NXSCOPE_TYPE_FLOAT},
+  {"accel", sizeof(struct sensor_accel), 0, 3, NXSCOPE_DATA_TYPE},
+  {"mag", sizeof(struct sensor_mag), 0, 3, NXSCOPE_DATA_TYPE},
+  {"gyro", sizeof(struct sensor_gyro), 0, 3, NXSCOPE_DATA_TYPE},
+  {"light", sizeof(struct sensor_light), 0, 2, NXSCOPE_DATA_TYPE},
+  {"baro", sizeof(struct sensor_baro), 0, 2, NXSCOPE_DATA_TYPE},
+  {"prox", sizeof(struct sensor_prox), 0, 1, NXSCOPE_DATA_TYPE},
+  {"humi", sizeof(struct sensor_humi), 0, 1, NXSCOPE_DATA_TYPE},
+  {"temp", sizeof(struct sensor_temp), 0, 1, NXSCOPE_DATA_TYPE},
+  {"rgb", sizeof(struct sensor_rgb), 0, 3, NXSCOPE_DATA_TYPE},
   {"hall", sizeof(struct sensor_hall), 0, 1, NXSCOPE_TYPE_INT32},
-  {"ir", sizeof(struct sensor_ir), 0, 1, NXSCOPE_TYPE_FLOAT},
-  {"gas", sizeof(struct sensor_gas), 0, 1, NXSCOPE_TYPE_FLOAT},
+  {"ir", sizeof(struct sensor_ir), 0, 1, NXSCOPE_DATA_TYPE},
+  {"gas", sizeof(struct sensor_gas), 0, 1, NXSCOPE_DATA_TYPE},
 };
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: nxscope_samples_put
+ ****************************************************************************/
+
+static void nxscope_samples_put(FAR struct nxscope_thr_env_s *envp,
+                                FAR struct listen_object_s *tmp,
+                                size_t offset)
+{
+#ifdef CONFIG_SENSORS_USE_B16
+  FAR b16_t *data = (b16_t *)&tmp->data[offset];
+  nxscope_put_vb16(&envp->nxs, tmp->chanid, data, tmp->info->dim);
+#else
+  FAR float *data = (float *)&tmp->data[offset];
+  nxscope_put_vfloat(&envp->nxs, tmp->chanid, data, tmp->info->dim);
+#endif
+}
+
 /****************************************************************************
  * Name: nxscope_samples_thr
  ****************************************************************************/
@@ -124,9 +147,7 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
 {
   FAR struct nxscope_thr_env_s *envp   = arg;
   FAR struct listen_object_s   *tmp;
-  FAR float                    *data;
   int                           ret;
-  size_t                        offset;
 
   DEBUGASSERT(envp);
 
@@ -147,11 +168,9 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
             {
               /* Get vector from a given offset */
 
-              offset = tmp->info->data_offset + sizeof(uint64_t);
-              data = (float *)&tmp->data[offset];
-
-              nxscope_put_vfloat(&envp->nxs, tmp->chanid, data,
-                                 tmp->info->dim);
+              nxscope_samples_put(envp, tmp,
+                                  tmp->info->data_offset +
+                                  sizeof(uint64_t));
             }
         }
 
@@ -363,7 +382,7 @@ static int nxscope_channels(FAR struct nxscope_thr_env_s *envp)
 
               /* Register nxscope channel */
 
-              u.s.dtype = NXSCOPE_TYPE_FLOAT;
+              u.s.dtype = NXSCOPE_DATA_TYPE;
               u.s._res  = 0;
               u.s.cri   = 0;
 

From 783957da07a39f0de7d6337b853d3516483a60da Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 29 Mar 2026 17:48:36 +0200
Subject: [PATCH 312/568] system/uorb: DEBUG_UORB depends on float data

DEBUG_UORB depends on float data, FIXED16 not supported

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 system/uorb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/uorb/Kconfig b/system/uorb/Kconfig
index 4e8103d2e..674317a38 100644
--- a/system/uorb/Kconfig
+++ b/system/uorb/Kconfig
@@ -46,7 +46,7 @@ endif # UORB_TESTS
 config DEBUG_UORB
 	bool "uorb debug output"
 	select LIBC_PRINT_EXTENSION
-	depends on LIBC_FLOATINGPOINT
+	depends on LIBC_FLOATINGPOINT && SENSORS_USE_FLOAT
 	default n
 
 if DEBUG_UORB

From 3adb14f12d66b833d21a18c4f94a260c96d28a5d Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 3 May 2026 16:25:03 +0800
Subject: [PATCH 313/568] !compiler: drop CONFIG_HAVE_LONG_LONG and require
 long long support

The matching nuttx commit removes CONFIG_HAVE_LONG_LONG; clean up the
remaining users in nuttx-apps so that "long long" is always assumed:

  - examples/noteprintf, examples/nxscope:
        unconditionally exercise the %lld / long long branch.
  - fsutils/mkfatfs/configfat.c:
        drop the 32-bit fall-back paths in mkfatfs_nfatsect12/16/32;
        always use uint64_t for the FAT-size arithmetic.
  - logging/nxscope/nxscope_chan.c:
        drop the CONFIG_HAVE_LONG_LONG guard around the 64-bit
        sample helpers.
  - netutils/ftpd, netutils/ntpclient:
        always emit the 64-bit format strings.
  - testing/fs/fstest/fstest_main.c:
        drop the parallel 32-bit verification path; keep only the
        64-bit (long long) random pattern generator.
  - system/zmodem/host/nuttx/compiler.h:
        remove the host-side CONFIG_HAVE_LONG_LONG stub macro.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 examples/noteprintf/noteprintf_main.c |  4 ---
 examples/nxscope/nxscope_main.c       |  4 ---
 fsutils/mkfatfs/configfat.c           | 40 ++++-----------------------
 logging/nxscope/nxscope_chan.c        |  2 --
 netutils/ftpd/ftpd.c                  |  4 ---
 netutils/ntpclient/ntpclient.c        |  4 ---
 system/zmodem/host/nuttx/compiler.h   |  4 ---
 testing/fs/fstest/fstest_main.c       | 34 ++---------------------
 8 files changed, 8 insertions(+), 88 deletions(-)

diff --git a/examples/noteprintf/noteprintf_main.c b/examples/noteprintf/noteprintf_main.c
index dbc81ee8f..2717d7a1b 100644
--- a/examples/noteprintf/noteprintf_main.c
+++ b/examples/noteprintf/noteprintf_main.c
@@ -53,9 +53,7 @@ int main(int argc, FAR char *argv[])
   short s        = 2;
   int i          = 3;
   long l         = 4;
-#ifdef CONFIG_HAVE_LONG_LONG
   long long ll   = 5;
-#endif
   intmax_t im    = 6;
   size_t sz      = 7;
   ptrdiff_t ptr  = 8;
@@ -78,9 +76,7 @@ int main(int argc, FAR char *argv[])
       sched_note_printf(NOTE_TAG_ALWAYS, "%hd", s);
       sched_note_printf(NOTE_TAG_ALWAYS, "%d", i);
       sched_note_printf(NOTE_TAG_ALWAYS, "%ld", l);
-#ifdef CONFIG_HAVE_LONG_LONG
       sched_note_printf(NOTE_TAG_ALWAYS, "%lld", ll);
-#endif
       sched_note_printf(NOTE_TAG_ALWAYS, "%jd", im);
       sched_note_printf(NOTE_TAG_ALWAYS, "%zd", sz);
       sched_note_printf(NOTE_TAG_ALWAYS, "%td", ptr);
diff --git a/examples/nxscope/nxscope_main.c b/examples/nxscope/nxscope_main.c
index 1f4c9fff4..ba0a3c226 100644
--- a/examples/nxscope/nxscope_main.c
+++ b/examples/nxscope/nxscope_main.c
@@ -341,7 +341,6 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
 
       nxscope_put_b16(envp->nxs, 13, ftob16(-1.0f));
 
-#ifdef CONFIG_HAVE_LONG_LONG
       /* Channel 14 */
 
       nxscope_put_ub32(envp->nxs, 14, dtob32(1.0));
@@ -349,7 +348,6 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
       /* Channel 15 */
 
       nxscope_put_b32(envp->nxs, 15, dtob32(-1.0));
-#endif
 
       /* Channel 16 */
 
@@ -705,7 +703,6 @@ int main(int argc, FAR char *argv[])
   u.s.cri   = 0;
   nxscope_chan_init(&nxs, 13, "chan13", u.u8, 1, 0);
 
-#ifdef CONFIG_HAVE_LONG_LONG
   u.s.dtype = NXSCOPE_TYPE_UB32;
   u.s._res  = 0;
   u.s.cri   = 0;
@@ -715,7 +712,6 @@ int main(int argc, FAR char *argv[])
   u.s._res  = 0;
   u.s.cri   = 0;
   nxscope_chan_init(&nxs, 15, "chan15", u.u8, 1, 0);
-#endif
 
   /* Vector data channel */
 
diff --git a/fsutils/mkfatfs/configfat.c b/fsutils/mkfatfs/configfat.c
index a3550cf7a..20f54d5af 100644
--- a/fsutils/mkfatfs/configfat.c
+++ b/fsutils/mkfatfs/configfat.c
@@ -121,13 +121,8 @@ static inline uint32_t
 mkfatfs_nfatsect12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
                    uint32_t navailsects)
 {
-#ifdef CONFIG_HAVE_LONG_LONG
   uint64_t denom;
   uint64_t number;
-#else
-  uint32_t denom;
-  uint32_t number;
-#endif
 
   /* For FAT12, the cluster number is held in a 12-bit number or 1.5 bytes
    * per cluster reference.  So each FAT sector will hold sectorsize/1.5
@@ -156,25 +151,12 @@ mkfatfs_nfatsect12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
    *   navailsects > 0x55555555 - 2 * clustersize
    */
 
-#ifndef CONFIG_HAVE_LONG_LONG
-  if (navailsects <= (0x55555555 - (1 << (fmt->ff_clustshift + 1))))
-    {
-#endif
-
-      denom = (fmt->ff_nfats << 1) + fmt->ff_nfats
-            + (var->fv_sectorsize << (fmt->ff_clustshift + 1));
-      number = (navailsects << 1) + navailsects
-            + (1 << (fmt->ff_clustshift + 2))
-            + (1 << (fmt->ff_clustshift + 1));
-      return (uint32_t)((number + denom - 1) / denom);
-
-#ifndef CONFIG_HAVE_LONG_LONG
-    }
-  else
-    {
-      return 0;
-    }
-#endif
+  denom = (fmt->ff_nfats << 1) + fmt->ff_nfats
+        + (var->fv_sectorsize << (fmt->ff_clustshift + 1));
+  number = (navailsects << 1) + navailsects
+        + (1 << (fmt->ff_clustshift + 2))
+        + (1 << (fmt->ff_clustshift + 1));
+  return (uint32_t)((number + denom - 1) / denom);
 }
 
 /****************************************************************************
@@ -201,13 +183,8 @@ static inline uint32_t
 mkfatfs_nfatsect16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
                    uint32_t navailsects)
 {
-#ifdef CONFIG_HAVE_LONG_LONG
   uint64_t denom;
   uint64_t number;
-#else
-  uint32_t denom;
-  uint32_t number;
-#endif
 
   /* For FAT16, the cluster number is held in a 16-bit number or 2 bytes per
    * cluster reference.  So each FAT sector will hold sectorsize/2 cluster
@@ -270,13 +247,8 @@ static inline uint32_t
 mkfatfs_nfatsect32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
                    uint32_t navailsects)
 {
-#ifdef CONFIG_HAVE_LONG_LONG
   uint64_t denom;
   uint64_t number;
-#else
-  uint32_t denom;
-  uint32_t number;
-#endif
 
   /* For FAT32, the cluster number is held in a 32-bit number or 4 bytes per
    * cluster reference.  So each FAT sector will hold sectorsize/4 cluster
diff --git a/logging/nxscope/nxscope_chan.c b/logging/nxscope/nxscope_chan.c
index a68451f47..5fb9e9b92 100644
--- a/logging/nxscope/nxscope_chan.c
+++ b/logging/nxscope/nxscope_chan.c
@@ -332,7 +332,6 @@ static int nxscope_put_vector(FAR uint8_t *buff, uint8_t type, FAR void *val,
           break;
         }
 
-#ifdef CONFIG_HAVE_LONG_LONG
       case NXSCOPE_TYPE_UINT64:
       case NXSCOPE_TYPE_INT64:
       case NXSCOPE_TYPE_DOUBLE:
@@ -358,7 +357,6 @@ static int nxscope_put_vector(FAR uint8_t *buff, uint8_t type, FAR void *val,
 
           break;
         }
-#endif
 
       case NXSCOPE_TYPE_CHAR:
         {
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index a6ed75324..fa5eb9284 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -3735,11 +3735,7 @@ static int ftpd_command_appe(FAR struct ftpd_session_s *session)
 
 static int ftpd_command_rest(FAR struct ftpd_session_s *session)
 {
-#ifdef CONFIG_HAVE_LONG_LONG
   session->restartpos = (off_t)atoll(session->param);
-#else
-  session->restartpos = (off_t)atoi(session->param);
-#endif
   session->flags |= FTPD_SESSIONFLAG_RESTARTPOS;
 
   return ftpd_response(session->cmd.sd, session->txtimeout,
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index 304c02a3c..3d2b50e02 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -63,10 +63,6 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_HAVE_LONG_LONG
-#  error "64-bit integer support required for NTP client"
-#endif
-
 #if defined(CONFIG_LIBC_NETDB) && !defined(CONFIG_NETUTILS_NTPCLIENT_SERVER)
 #  error "CONFIG_NETUTILS_NTPCLIENT_SERVER must be provided"
 #endif
diff --git a/system/zmodem/host/nuttx/compiler.h b/system/zmodem/host/nuttx/compiler.h
index d2a4ff0f9..5376baee0 100644
--- a/system/zmodem/host/nuttx/compiler.h
+++ b/system/zmodem/host/nuttx/compiler.h
@@ -219,7 +219,6 @@
 
 /* GCC supports both types double and long long */
 
-#  define CONFIG_HAVE_LONG_LONG 1
 #  define CONFIG_HAVE_FLOAT 1
 #  define CONFIG_HAVE_DOUBLE 1
 #  define CONFIG_HAVE_LONG_DOUBLE 1
@@ -323,7 +322,6 @@
 
 /* SDCC does not support type long long or type double */
 
-# undef  CONFIG_HAVE_LONG_LONG
 #  define CONFIG_HAVE_FLOAT 1
 # undef  CONFIG_HAVE_DOUBLE
 # undef  CONFIG_HAVE_LONG_DOUBLE
@@ -431,7 +429,6 @@
  * and simply do not support long long or double.
  */
 
-# undef  CONFIG_HAVE_LONG_LONG
 #  define CONFIG_HAVE_FLOAT 1
 # undef  CONFIG_HAVE_DOUBLE
 # undef  CONFIG_HAVE_LONG_DOUBLE
@@ -507,7 +504,6 @@
 # undef  CONFIG_SMALL_MEMORY
 # undef  CONFIG_LONG_IS_NOT_INT
 # undef  CONFIG_PTR_IS_NOT_INT
-# undef  CONFIG_HAVE_LONG_LONG
 #  define CONFIG_HAVE_FLOAT 1
 # undef  CONFIG_HAVE_DOUBLE
 # undef  CONFIG_HAVE_LONG_DOUBLE
diff --git a/testing/fs/fstest/fstest_main.c b/testing/fs/fstest/fstest_main.c
index 68ea1f719..a0d8f8978 100644
--- a/testing/fs/fstest/fstest_main.c
+++ b/testing/fs/fstest/fstest_main.c
@@ -218,7 +218,7 @@ static inline void fstest_randname(FAR struct fstest_ctx_s *ctx,
 
   dirlen   = strlen(ctx->mountdir);
 
-  /* Force the max filename lengh and also the min name len = 4 */
+  /* Force the max filename length and also the min name len = 4 */
 
   maxname  = CONFIG_TESTING_FSTEST_MAXNAME - dirlen - 3;
   namelen  = (rand() % maxname) + 4;
@@ -668,7 +668,6 @@ static inline int fstest_rdfile(FAR struct fstest_ctx_s *ctx,
  * Name: fstest_filesize
  ****************************************************************************/
 
-#ifdef CONFIG_HAVE_LONG_LONG
 static unsigned long long fstest_filesize(FAR struct fstest_ctx_s *ctx)
 {
   unsigned long long bytes_used;
@@ -688,27 +687,6 @@ static unsigned long long fstest_filesize(FAR struct fstest_ctx_s *ctx)
 
   return bytes_used;
 }
-#else
-static unsigned long fstest_filesize(FAR struct fstest_ctx_s *ctx)
-{
-  unsigned long bytes_used;
-  FAR struct fstest_filedesc_s *file;
-  int i;
-
-  bytes_used = 0;
-
-  for (i = 0; i < ctx->max_open; i++)
-    {
-      file = &ctx->files[i];
-      if (file->name != NULL && !file->deleted)
-        {
-          bytes_used += file->len;
-        }
-    }
-
-  return bytes_used;
-}
-#endif
 
 /****************************************************************************
  * Name: fstest_verifyfs
@@ -983,7 +961,7 @@ int main(int argc, FAR char *argv[])
   ctx = malloc(sizeof(struct fstest_ctx_s));
   if (ctx == NULL)
     {
-      printf("malloc ctx feild,exit!\n");
+      printf("malloc ctx field,exit!\n");
       exit(1);
     }
 
@@ -1081,11 +1059,7 @@ int main(int argc, FAR char *argv[])
       /* Directory listing */
 
       fstest_directory(ctx);
-#ifdef CONFIG_HAVE_LONG_LONG
       printf("Total file size: %llu\n", fstest_filesize(ctx));
-#else
-      printf("Total file size: %lu\n", fstest_filesize(ctx));
-#endif
 
       /* Verify all files written to FLASH */
 
@@ -1131,11 +1105,7 @@ int main(int argc, FAR char *argv[])
       /* Directory listing */
 
       fstest_directory(ctx);
-#ifdef CONFIG_HAVE_LONG_LONG
       printf("Total file size: %llu\n", fstest_filesize(ctx));
-#else
-      printf("Total file size: %lu\n", fstest_filesize(ctx));
-#endif
 
       /* Verify all files written to FLASH */
 

From ed746548ca857ad149433a90e7eb8ec44ad84522 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 3 May 2026 20:52:13 +0800
Subject: [PATCH 314/568] !testing/libc/scanftest: drop CONFIG_LIBC_LONG_LONG
 from help text

CONFIG_LIBC_LONG_LONG has been removed; long long support is now
unconditional.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 testing/libc/scanftest/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testing/libc/scanftest/Kconfig b/testing/libc/scanftest/Kconfig
index 33426dc97..92cc1c81b 100644
--- a/testing/libc/scanftest/Kconfig
+++ b/testing/libc/scanftest/Kconfig
@@ -11,8 +11,7 @@ config TESTING_SCANFTEST
 		Enable sscanf() test
 
 		For all tests to be successful, you need to enable
-		CONFIG_LIBC_FLOATINGPOINT, CONFIG_LIBC_LONG_LONG and
-		CONFIG_LIBC_SCANSET in addition.
+		CONFIG_LIBC_FLOATINGPOINT and CONFIG_LIBC_SCANSET in addition.
 
 if TESTING_SCANFTEST
 

From 72837c8d2698fcb6a9750ad8aa8103831fc2273b Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 3 May 2026 15:54:26 +0800
Subject: [PATCH 315/568] !apps: drop CONFIG_SYSTEM_TIME64 conditionals

NuttX always uses a 64-bit system clock now (time_t/clock_t are
always 64-bit). Remove the obsolete CONFIG_SYSTEM_TIME64 #ifdef
branches and Kconfig dependency.

  - examples/dronecan: drop SYSTEM_TIME64 dependency
  - examples/netlink_route: always use PRIx64
  - netutils/netinit: always use the 1-hour LONG_TIME_SEC
  - netutils/ptpd: always pack the 48-bit seconds field and apply
    the 64-bit overflow guard in timespec_delta_ns()
  - testing/ostest/semtimed: always validate tv_sec >= 0

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 examples/dronecan/Kconfig                   | 2 +-
 examples/netlink_route/netlink_route_main.c | 4 ----
 netutils/netinit/netinit.c                  | 6 +-----
 netutils/ptpd/ptpd.c                        | 7 -------
 testing/ostest/semtimed.c                   | 4 ----
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/examples/dronecan/Kconfig b/examples/dronecan/Kconfig
index f005a37f2..4ad761eb1 100644
--- a/examples/dronecan/Kconfig
+++ b/examples/dronecan/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_DRONECAN
 	tristate "DroneCAN example"
 	default n
-	depends on CANUTILS_LIBDRONECAN && SYSTEM_TIME64
+	depends on CANUTILS_LIBDRONECAN
 	---help---
 		Enable the LIBDRONECAN example
 
diff --git a/examples/netlink_route/netlink_route_main.c b/examples/netlink_route/netlink_route_main.c
index c69f4dd12..896a9796e 100644
--- a/examples/netlink_route/netlink_route_main.c
+++ b/examples/netlink_route/netlink_route_main.c
@@ -168,11 +168,7 @@ static void dump_neighbor(void)
           printf("  ");
         }
 
-#ifdef CONFIG_SYSTEM_TIME64
       printf("Time 0x%" PRIx64 "\n", nb->ne_time);
-#else
-      printf("Time 0x%" PRIx32 "\n", nb->ne_time);
-#endif
     }
 
   free(nbtab);
diff --git a/netutils/netinit/netinit.c b/netutils/netinit/netinit.c
index 24feea642..6120f4a67 100644
--- a/netutils/netinit/netinit.c
+++ b/netutils/netinit/netinit.c
@@ -204,11 +204,7 @@
  * signal indicating a change in network status.
  */
 
-#ifdef CONFIG_SYSTEM_TIME64
-#  define LONG_TIME_SEC    (60*60)   /* One hour in seconds */
-#else
-#  define LONG_TIME_SEC    (5*60)    /* Five minutes in seconds */
-#endif
+#define LONG_TIME_SEC      (60*60)   /* One hour in seconds */
 
 #define SHORT_TIME_SEC     (2)       /* 2 seconds */
 
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 74b43084d..430693cc9 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -184,13 +184,8 @@ static void timespec_to_ptp_format(FAR const struct timespec *ts,
    * both fields big-endian.
    */
 
-#ifdef CONFIG_SYSTEM_TIME64
   timestamp[0] = (uint8_t)(ts->tv_sec >> 40);
   timestamp[1] = (uint8_t)(ts->tv_sec >> 32);
-#else
-  timestamp[0] = 0;
-  timestamp[1] = 0;
-#endif
   timestamp[2] = (uint8_t)(ts->tv_sec >> 24);
   timestamp[3] = (uint8_t)(ts->tv_sec >> 16);
   timestamp[4] = (uint8_t)(ts->tv_sec >>  8);
@@ -320,7 +315,6 @@ static int64_t timespec_delta_ns(FAR const struct timespec *ts1,
 
   delta_s = ts1->tv_sec - ts2->tv_sec;
 
-#ifdef CONFIG_SYSTEM_TIME64
   /* Conversion to nanoseconds could overflow if the system time is 64-bit */
 
   if (delta_s >= INT64_MAX / NSEC_PER_SEC)
@@ -331,7 +325,6 @@ static int64_t timespec_delta_ns(FAR const struct timespec *ts1,
     {
       return INT64_MIN;
     }
-#endif
 
   return delta_s * NSEC_PER_SEC + (ts1->tv_nsec - ts2->tv_nsec);
 }
diff --git a/testing/ostest/semtimed.c b/testing/ostest/semtimed.c
index ce3f163c1..2b8fc6648 100644
--- a/testing/ostest/semtimed.c
+++ b/testing/ostest/semtimed.c
@@ -79,11 +79,7 @@ static void ostest_gettime(struct timespec *tp)
       printf("ostest_gettime: ERROR: clock_gettime failed\n");
       ASSERT(false);
     }
-#ifdef CONFIG_SYSTEM_TIME64
   else if (tp->tv_sec < 0 || tp->tv_nsec < 0 ||
-#else
-  else if (tp->tv_nsec < 0 ||
-#endif
            tp->tv_nsec >= 1000 * 1000 * 1000)
     {
       printf("ostest_gettime: ERROR: clock_gettime returned bogus time\n");

From a6477ec8dc38f92e16c2b6632cdcf3320259042f Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 3 May 2026 17:17:05 +0800
Subject: [PATCH 316/568] !apps: replace sclock_t with clock_t and drop
 redundant time_t/off_t casts

Align with the upstream nuttx change that drops the sclock_t alias now
that clock_t is itself a signed 64-bit type (int64_t).  Beyond the pure
sclock_t -> clock_t rename, this commit also removes the
now-unnecessary (time_t)-1 / (time_t)0 / (off_t)-1 casts that were
papering over the previously-unsigned time_t.

Files touched:

  - examples/alarm/alarm_main.c:        sclock_t -> clock_t
  - netutils/dhcpd/dhcpd.c:             sclock_t -> clock_t
  - netutils/ftpd/ftpd.c:               sclock_t -> clock_t
  - netutils/thttpd/libhttpd.c,
    netutils/thttpd/tdate_parse.c:      drop (time_t)-1 / (time_t)0 /
                                        (off_t)-1 sentinel casts
  - system/resmonitor/filldisk.c,
    system/zmodem/zm_receive.c:         sclock_t -> clock_t
  - testing/ostest/wdog.c:              sclock_t -> clock_t (the bulk
                                        of the rename, 30 sites)
  - testing/testsuites/kernel/syscall/cases/{clock_nanosleep_test,
    fsync_test,time_test}.c:            drop (time_t)-1 casts in the
                                        new signed-time_t world

No behavioural change.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 examples/alarm/alarm_main.c                   |  2 +-
 netutils/dhcpd/dhcpd.c                        |  2 +-
 netutils/ftpd/ftpd.c                          |  4 +--
 netutils/thttpd/libhttpd.c                    | 16 +++++-----
 netutils/thttpd/tdate_parse.c                 |  2 +-
 system/resmonitor/filldisk.c                  |  2 +-
 system/zmodem/zm_receive.c                    |  2 +-
 testing/ostest/wdog.c                         | 30 +++++++++----------
 .../syscall/cases/clock_nanosleep_test.c      |  2 +-
 .../kernel/syscall/cases/fsync_test.c         |  2 +-
 .../kernel/syscall/cases/time_test.c          |  2 +-
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/examples/alarm/alarm_main.c b/examples/alarm/alarm_main.c
index d4ab70a80..4b5296f73 100644
--- a/examples/alarm/alarm_main.c
+++ b/examples/alarm/alarm_main.c
@@ -393,7 +393,7 @@ int main(int argc, FAR char *argv[])
 
       setrel.id      = alarmid;
       setrel.pid     = g_alarm_daemon_pid;
-      setrel.reltime = (time_t)seconds;
+      setrel.reltime = seconds;
 
       setrel.event.sigev_notify = SIGEV_SIGNAL;
       setrel.event.sigev_signo  = CONFIG_EXAMPLES_ALARM_SIGNO;
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index a166e9123..5d909a2e6 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -661,7 +661,7 @@ static inline bool dhcpd_parseoptions(void)
             if (optlen >= 6 && optlen < remaining)
               {
                 memcpy(&tmp, &ptr[DHCPD_OPTION_DATA], 4);
-                g_state.ds_optleasetime = (time_t)ntohl(tmp);
+                g_state.ds_optleasetime = ntohl(tmp);
               }
             break;
 
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index fa5eb9284..ded7484d7 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -2305,11 +2305,11 @@ static int ftpd_listbuffer(FAR struct ftpd_session_s *session,
 
       /* time */
 
-      memcpy(&tm, localtime((FAR const time_t *)&st->st_mtime), sizeof(tm));
+      memcpy(&tm, localtime(&st->st_mtime), sizeof(tm));
       offset += snprintf(&buffer[offset], buflen - offset, " %s %2u",
                          g_monthtab[tm.tm_mon], tm.tm_mday);
       now = time(0);
-      if ((now - st->st_mtime) > (time_t)(60 * 60 * 24 * 180))
+      if (now - st->st_mtime > 60 * 60 * 24 * 180)
         {
           offset += snprintf(&buffer[offset], buflen - offset, " %5u",
                              tm.tm_year + 1900);
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 19acb562c..1a7d46c13 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -327,7 +327,7 @@ static void send_mime(httpd_conn *hc, int status, const char *title,
           (hc->range_end >= hc->range_start) &&
           ((hc->range_end != length - 1) ||
            (hc->range_start != 0)) &&
-          (hc->range_if == (time_t) - 1 || hc->range_if == hc->sb.st_mtime))
+          (hc->range_if == -1 || hc->range_if == hc->sb.st_mtime))
         {
           partial_content = 1;
           status = 206;
@@ -340,7 +340,7 @@ static void send_mime(httpd_conn *hc, int status, const char *title,
         }
 
       gettimeofday(&now, NULL);
-      if (mod == (time_t)0)
+      if (mod == 0)
         {
           mod = now.tv_sec;
         }
@@ -510,7 +510,7 @@ static int send_err_file(httpd_conn *hc, int status, char *title,
     }
 
   send_mime(hc, status, title, "", extraheads, "text/html; charset=%s",
-            (off_t)-1, (time_t)0);
+            -1, 0);
   for (; ; )
     {
       nread = fread(buf, 1, sizeof(buf) - 1, fp);
@@ -2421,8 +2421,8 @@ int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc)
   hc->altdir[0]         = '\0';
 #endif
   hc->buflen = 0;
-  hc->if_modified_since = (time_t) - 1;
-  hc->range_if          = (time_t)-1;
+  hc->if_modified_since = -1;
+  hc->range_if          = -1;
   hc->contentlength     = -1;
   hc->type = "";
 #ifdef CONFIG_THTTPD_VHOST
@@ -2926,7 +2926,7 @@ int httpd_parse_request(httpd_conn *hc)
             {
               cp = &buf[18];
               hc->if_modified_since = tdate_parse(cp);
-              if (hc->if_modified_since == (time_t) - 1)
+              if (hc->if_modified_since == -1)
                 {
                   nerr("ERROR: unparsable time: %s\n", cp);
                 }
@@ -2973,7 +2973,7 @@ int httpd_parse_request(httpd_conn *hc)
             {
               cp = &buf[9];
               hc->range_if = tdate_parse(cp);
-              if (hc->range_if == (time_t) - 1)
+              if (hc->range_if == -1)
                 {
                   nerr("ERROR: unparsable time: %s\n", cp);
                 }
@@ -3521,7 +3521,7 @@ int httpd_start_request(httpd_conn *hc, struct timeval *nowp)
       send_mime(hc, 200, ok200title, hc->encodings, "", hc->type,
                 hc->sb.st_size, hc->sb.st_mtime);
     }
-  else if (hc->if_modified_since != (time_t) - 1 &&
+  else if (hc->if_modified_since != -1 &&
            hc->if_modified_since >= hc->sb.st_mtime)
     {
       send_mime(hc, 304, err304title, hc->encodings, "",
diff --git a/netutils/thttpd/tdate_parse.c b/netutils/thttpd/tdate_parse.c
index 2b49d3995..82b55846a 100644
--- a/netutils/thttpd/tdate_parse.c
+++ b/netutils/thttpd/tdate_parse.c
@@ -348,7 +348,7 @@ time_t tdate_parse(char *str)
 #endif /* Day of week not yet supported by NuttX */
   else
     {
-      return (time_t) - 1;
+      return -1;
     }
 
   if (tm.tm_year > 1900)
diff --git a/system/resmonitor/filldisk.c b/system/resmonitor/filldisk.c
index de550b47e..6670048b0 100644
--- a/system/resmonitor/filldisk.c
+++ b/system/resmonitor/filldisk.c
@@ -304,7 +304,7 @@ int main(int argc, FAR char *argv[])
             mode   = 1;
             break;
           case 'i':
-            interval = (time_t)bytes(optarg);
+            interval = bytes(optarg);
             break;
           case 'b':
             bufsize = bytes(optarg);
diff --git a/system/zmodem/zm_receive.c b/system/zmodem/zm_receive.c
index 6818a1fab..19fe6ef18 100644
--- a/system/zmodem/zm_receive.c
+++ b/system/zmodem/zm_receive.c
@@ -675,7 +675,7 @@ static int zmr_filename(FAR struct zm_state_s *pzm)
 
   pzmr->filesize  = (off_t)filesize;
 #ifdef CONFIG_SYSTEM_ZMODEM_TIMESTAMPS
-  pzmr->timestamp = (time_t)timestamp;
+  pzmr->timestamp = timestamp;
 #endif
 
   /* Check if we need to send the CRC */
diff --git a/testing/ostest/wdog.c b/testing/ostest/wdog.c
index e64f1246f..69e4b1386 100644
--- a/testing/ostest/wdog.c
+++ b/testing/ostest/wdog.c
@@ -56,7 +56,7 @@
 typedef struct wdtest_param_s
 {
   FAR struct wdog_s *wdog;
-  sclock_t           interval;
+  clock_t            interval;
   uint64_t           callback_cnt;
   clock_t            triggered_tick;
 } wdtest_param_t;
@@ -79,7 +79,7 @@ static void wdtest_callback(wdparm_t param)
   wdtest_param->callback_cnt   += 1;
 }
 
-static void wdtest_checkdelay(sclock_t diff, sclock_t delay_tick)
+static void wdtest_checkdelay(clock_t diff, clock_t delay_tick)
 {
   /* Ensure the watchdog trigger time is not earlier than expected. */
 
@@ -97,13 +97,13 @@ static void wdtest_checkdelay(sclock_t diff, sclock_t delay_tick)
 }
 
 static void wdtest_once(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
-                        sclock_t delay_ns)
+                        clock_t delay_ns)
 {
   uint64_t   cnt;
-  sclock_t   diff;
+  clock_t    diff;
   clock_t    wdset_tick;
   irqstate_t flags;
-  sclock_t   delay_tick = (sclock_t)NSEC2TICK((clock_t)delay_ns);
+  clock_t    delay_tick = NSEC2TICK(delay_ns);
 
   wdtest_printf("wdtest_once %lld ns\n", (long long)delay_ns);
 
@@ -133,20 +133,20 @@ static void wdtest_once(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
 
   /* Check if the delay is within the acceptable tolerance. */
 
-  diff = (sclock_t)(param->triggered_tick - wdset_tick);
+  diff = param->triggered_tick - wdset_tick;
 
   wdtest_checkdelay(diff, delay_tick);
 }
 
 static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
-                        sclock_t rand_ns)
+                        clock_t rand_ns)
 {
   uint64_t   cnt;
   int        idx;
-  sclock_t   delay_ns;
+  clock_t    delay_ns;
   clock_t    wdset_tick;
-  sclock_t   delay_tick;
-  sclock_t   diff;
+  clock_t    delay_tick;
+  clock_t    diff;
   irqstate_t flags = 0;
 
   /* Perform multiple iterations with random delays. */
@@ -190,7 +190,7 @@ static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
 
           if (cnt % 2)
             {
-              diff = (sclock_t)(param->triggered_tick - wdset_tick);
+              diff = param->triggered_tick - wdset_tick;
               wdtest_checkdelay(diff, delay_tick);
             }
         }
@@ -204,7 +204,7 @@ static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
 static void wdtest_callback_recursive(wdparm_t param)
 {
   FAR wdtest_param_t *wdtest_param = (FAR wdtest_param_t *)param;
-  sclock_t            interval     = wdtest_param->interval;
+  clock_t             interval     = wdtest_param->interval;
 
   wdtest_param->callback_cnt   += 1;
   wdtest_param->triggered_tick  = clock_systime_ticks();
@@ -215,7 +215,7 @@ static void wdtest_callback_recursive(wdparm_t param)
 
 static void wdtest_recursive(FAR struct wdog_s *wdog,
                              FAR wdtest_param_t *param,
-                             sclock_t delay_ns,
+                             clock_t delay_ns,
                              unsigned int times)
 {
   uint64_t cnt;
@@ -227,7 +227,7 @@ static void wdtest_recursive(FAR struct wdog_s *wdog,
   cnt = param->callback_cnt;
 
   param->wdog = wdog;
-  param->interval = (sclock_t)NSEC2TICK((clock_t)delay_ns);
+  param->interval = NSEC2TICK(delay_ns);
 
   wdtest_assert(param->interval >= 0);
 
@@ -253,7 +253,7 @@ static void wdtest_recursive(FAR struct wdog_s *wdog,
 static void wdog_test_run(FAR wdtest_param_t *param)
 {
   uint64_t             cnt;
-  sclock_t             rest;
+  clock_t              rest;
   clock_t              delay;
   struct wdog_s        test_wdog =
   {
diff --git a/testing/testsuites/kernel/syscall/cases/clock_nanosleep_test.c b/testing/testsuites/kernel/syscall/cases/clock_nanosleep_test.c
index 6ae37f7da..dacb6076b 100644
--- a/testing/testsuites/kernel/syscall/cases/clock_nanosleep_test.c
+++ b/testing/testsuites/kernel/syscall/cases/clock_nanosleep_test.c
@@ -55,7 +55,7 @@ void test_nuttx_syscall_clocknanosleep01(FAR void **state)
   ret = clock_nanosleep(type, 0, &t, NULL);
   assert_int_equal(ret, 0);
   end_time = clock();
-  assert_int_equal((time_t)(end_time - start_time) / CLOCKS_PER_SEC,
+  assert_int_equal((end_time - start_time) / CLOCKS_PER_SEC,
                    t.tv_sec);
 }
 
diff --git a/testing/testsuites/kernel/syscall/cases/fsync_test.c b/testing/testsuites/kernel/syscall/cases/fsync_test.c
index e2834f861..d84f17937 100644
--- a/testing/testsuites/kernel/syscall/cases/fsync_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fsync_test.c
@@ -238,7 +238,7 @@ void test_nuttx_syscall_fsync03(FAR void **state)
   ret = fsync(fd);
 
   time_end = time(0);
-  assert_true(time_end != (time_t)-1);
+  assert_true(time_end != -1);
   assert_int_not_equal(ret, -1);
   assert_int_equal(ret, 0);
   assert_false(time_end < time_start);
diff --git a/testing/testsuites/kernel/syscall/cases/time_test.c b/testing/testsuites/kernel/syscall/cases/time_test.c
index a5aea7653..1d9b35119 100644
--- a/testing/testsuites/kernel/syscall/cases/time_test.c
+++ b/testing/testsuites/kernel/syscall/cases/time_test.c
@@ -57,7 +57,7 @@ void test_nuttx_syscall_time01(FAR void **state)
 
       /* check return code */
 
-      assert_int_not_equal(ret, (time_t)-1);
+      assert_int_not_equal(ret, -1);
     }
 }
 

From 275a083464fd08209fd54e7372954977dfd45fbd Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Tue, 12 May 2026 09:22:51 +0200
Subject: [PATCH 317/568] ci: retry git clone for nuttx-ntfc-testing

github infra is not stable so even "git clone" from github repos can fail with error: 500.
With this commit we try to clone repo few more times.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 .github/workflows/build.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 05735c18d..4fe967a7e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -197,7 +197,18 @@ jobs:
             cd /github/workspace/nuttx-ntfc
             # get NTFC test cases
             cd external
-            git clone -b release-0.0.1 https://github.com/apache/nuttx-ntfc-testing
+            for i in 1 2 3 4 5; do
+              git clone -b release-0.0.1 https://github.com/apache/nuttx-ntfc-testing && break
+              if [ "$i" -eq 5 ]; then
+                echo "Failed to clone nuttx-ntfc-testing after $i attempts"
+                exit 1
+              fi
+
+              delay=$((i * 10))
+              echo "Clone attempt $i failed; retrying in ${delay}s..."
+              rm -rf nuttx-ntfc-testing
+              sleep "$delay"
+            done
             mv nuttx-ntfc-testing nuttx-testing
             export NTFCDIR=/github/workspace/nuttx-ntfc
 

From 97485342aa2e983ab566c0731caea59c4dc0df04 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Thu, 23 Apr 2026 21:59:12 +0800
Subject: [PATCH 318/568] netlib_ipv6route.c: fix the issue of parsing IPv6
 routing entries

Update the column ruler and field labels in route_ipv6_entry comment
to match the actual output: lowercase to uppercase, remove colons.
Consistent with Nuttx definition

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 netutils/netlib/netlib_ipv6route.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/netutils/netlib/netlib_ipv6route.c b/netutils/netlib/netlib_ipv6route.c
index a0e10fa7c..14bcc2e9f 100644
--- a/netutils/netlib/netlib_ipv6route.c
+++ b/netutils/netlib/netlib_ipv6route.c
@@ -49,14 +49,14 @@
 
 /* The form of the entry from the routing table file:
  *
- *            11111111112222222222333333333344444444445555
- *   12345678901234567890123456789012345678901234567890123
- *   nnnn. target:  xxxx:xxxx:xxxx:xxxxxxxx:xxxx:xxxx:xxxx
- *         netmask: xxxx:xxxx:xxxx:xxxxxxxx:xxxx:xxxx:xxxx
- *         router:  xxxx:xxxx:xxxx:xxxxxxxx:xxxx:xxxx:xxxx
+ *            1111111111222222222233333333334444444444555
+ *   1234567890123456789012345678901234567890123456789012
+ *   nnnn. TARGET  xxxx:xxxx:xxxx:xxxxxxxx:xxxx:xxxx:xxxx
+ *         NETMASK xxxx:xxxx:xxxx:xxxxxxxx:xxxx:xxxx:xxxx
+ *         ROUTER  xxxx:xxxx:xxxx:xxxxxxxx:xxxx:xxxx:xxxx
  */
 
-#define ADDR_OFFSET  15
+#define ADDR_OFFSET  14
 
 /****************************************************************************
  * Private Functions

From 5d15d9741814dd198fa9902bdcb18f5f2b8fb839 Mon Sep 17 00:00:00 2001
From: zhanghongyu <zhanghongyu@xiaomi.com>
Date: Thu, 23 Apr 2026 11:50:53 +0800
Subject: [PATCH 319/568] netlib: replace DNS ping with gateway ping for
 connectivity check

Refactor netlib_check_ipconnectivity() to use gateway/router ping instead
of DNS server ping for network connectivity checks. Add IPv6 support.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
---
 include/netutils/netlib.h                    |  41 ++-
 netutils/netlib/CMakeLists.txt               |   4 +-
 netutils/netlib/Makefile                     |   4 +-
 netutils/netlib/netlib_checkifconnectivity.c |   7 +-
 netutils/netlib/netlib_checkipconnectivity.c | 345 +++++++++++++++++--
 5 files changed, 365 insertions(+), 36 deletions(-)

diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h
index eb3933fe9..d76c93e96 100644
--- a/include/netutils/netlib.h
+++ b/include/netutils/netlib.h
@@ -561,12 +561,49 @@ int netlib_getifstatistics(FAR const char *ifname,
 int netlib_check_ifconflict(FAR const char *ifname);
 #endif
 
-#ifdef CONFIG_NETUTILS_PING
+/****************************************************************************
+ * Name: netlib_check_ipconnectivity
+ *
+ * Description:
+ *   Check network connectivity by pinging a remote IP address.
+ *   If ip is NULL, ping the gateway of each network interface,
+ *   and optionally the routers from the routing table. If ping
+ *   is disabled, just check the status of the IP network card.
+ *
+ * Parameters:
+ *   ip       The ipv4 address to check, or NULL to ping gateways
+ *   timeout  The max timeout of each ping
+ *   retry    The retry times of ping
+ *
+ * Return:
+ *   nums of remote reply of ping; a negative or ZERO on failure
+ *
+ ****************************************************************************/
+
 int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry);
+
+#ifdef CONFIG_NETUTILS_PING
+
+/****************************************************************************
+ * Name: netlib_check_ifconnectivity
+ *
+ * Description:
+ *   Check network connectivity by pinging the default gateway
+ *   of the specified network interface.
+ *
+ * Parameters:
+ *   ifname   The name of the interface to use
+ *   timeout  The timeout of ping
+ *   retry    The retry times of ping
+ *
+ * Return:
+ *   nums of gateway reply of ping; a negative on failure.
+ *
+ ****************************************************************************/
+
 int netlib_check_ifconnectivity(FAR const char *ifname,
                                 int timeout, int retry);
 #else
-#define netlib_check_ipconnectivity(i, t, r) 1
 #define netlib_check_ifconnectivity(i, t, r) 1
 #endif
 
diff --git a/netutils/netlib/CMakeLists.txt b/netutils/netlib/CMakeLists.txt
index 2f0f11e0f..0a6735121 100644
--- a/netutils/netlib/CMakeLists.txt
+++ b/netutils/netlib/CMakeLists.txt
@@ -158,8 +158,10 @@ if(CONFIG_NETUTILS_NETLIB)
     list(APPEND SRCS netlib_getiobinfo.c)
   endif()
 
+  list(APPEND SRCS netlib_checkipconnectivity.c)
+
   if(CONFIG_NETUTILS_PING)
-    list(APPEND SRCS netlib_checkipconnectivity.c netlib_checkifconnectivity.c)
+    list(APPEND SRCS netlib_checkifconnectivity.c)
   endif()
 
   list(APPEND SRCS netlib_checkhttpconnectivity.c)
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 7bba856b7..5867d9190 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -157,8 +157,10 @@ ifeq ($(CONFIG_MM_IOB),y)
 CSRCS += netlib_getiobinfo.c
 endif
 
+CSRCS += netlib_checkipconnectivity.c
+
 ifeq ($(CONFIG_NETUTILS_PING),y)
-CSRCS += netlib_checkipconnectivity.c netlib_checkifconnectivity.c
+CSRCS += netlib_checkifconnectivity.c
 endif
 
 CSRCS += netlib_checkhttpconnectivity.c
diff --git a/netutils/netlib/netlib_checkifconnectivity.c b/netutils/netlib/netlib_checkifconnectivity.c
index bfc06001a..d0bc8c3e3 100644
--- a/netutils/netlib/netlib_checkifconnectivity.c
+++ b/netutils/netlib/netlib_checkifconnectivity.c
@@ -48,7 +48,8 @@
  * Name: netlib_check_ifconnectivity
  *
  * Description:
- *   Check network interface connectivity by pinging the gateway
+ *   Check network connectivity by pinging the default gateway
+ *   of the specified network interface.
  *
  * Parameters:
  *   ifname   The name of the interface to use
@@ -56,7 +57,7 @@
  *   retry    The retry times of ping
  *
  * Return:
- *   nums of gateway reply of ping; a nagtive on failure.
+ *   nums of gateway reply of ping; a negative on failure.
  *
  ****************************************************************************/
 
@@ -86,4 +87,4 @@ int netlib_check_ifconnectivity(FAR const char *ifname,
   return netlib_check_ipconnectivity(destip, timeout, retry);
 }
 
-#endif /* CONFIG_NETUTILS_PING */
\ No newline at end of file
+#endif /* CONFIG_NETUTILS_PING */
diff --git a/netutils/netlib/netlib_checkipconnectivity.c b/netutils/netlib/netlib_checkipconnectivity.c
index 04b3c3c0b..ce1a334b8 100644
--- a/netutils/netlib/netlib_checkipconnectivity.c
+++ b/netutils/netlib/netlib_checkipconnectivity.c
@@ -32,20 +32,22 @@
 #include <string.h>
 #include <errno.h>
 #include <nuttx/debug.h>
+#include <ifaddrs.h>
 
 #include <arpa/inet.h>
 #include <nuttx/net/ip.h>
 
-#include "netutils/icmp_ping.h"
 #include "netutils/netlib.h"
-
-#ifdef CONFIG_NETUTILS_PING
+#include "netutils/icmp_ping.h"
+#include "netutils/icmpv6_ping.h"
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
-#define PING_IPADDR_DATALEN  80
+#define PING_IPADDR_DATALEN  56
+
+#ifdef CONFIG_NETUTILS_PING
 
 /****************************************************************************
  * Private Functions
@@ -72,6 +74,243 @@ static void ping_ipaddr_callback(FAR const struct ping_result_s *result)
     }
 }
 
+#endif /* CONFIG_NETUTILS_PING */
+
+#ifdef CONFIG_NETUTILS_PING6
+
+/****************************************************************************
+ * Name: ping6_ipaddr_callback
+ *
+ * Description:
+ *   ping6 ipaddr callback
+ *
+ * Parameters:
+ *   result  The result of ping6
+ *
+ ****************************************************************************/
+
+static void ping6_ipaddr_callback(FAR const struct ping6_result_s *result)
+{
+  FAR int *count = result->info->priv;
+
+  if (result->code == ICMPv6_I_FINISH)
+    {
+      *count = result->nreplies;
+    }
+}
+
+#endif /* CONFIG_NETUTILS_PING6 */
+
+/****************************************************************************
+ * Name: ping_gateway
+ *
+ * Description:
+ *   Ping the default gateway of each network interface (IPv4 and IPv6).
+ *
+ * Parameters:
+ *   info   Pointer to the IPv4 ping info structure
+ *   info6  Pointer to the IPv6 ping info structure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NETDEV_IFINDEX
+static void ping_gateway(FAR struct ping_info_s *info,
+                         FAR struct ping6_info_s *info6)
+{
+  FAR int *replies = info->priv;
+  FAR struct ifaddrs *ifap;
+  FAR struct ifaddrs *ifa;
+
+  if (getifaddrs(&ifap) < 0)
+    {
+      return;
+    }
+
+  for (ifa = ifap; ifa != NULL && *replies == 0; ifa = ifa->ifa_next)
+    {
+      if (ifa->ifa_addr == NULL)
+        {
+          continue;
+        }
+
+      /* Skip interfaces that are not up and running */
+
+      if ((ifa->ifa_flags & (IFF_UP | IFF_RUNNING)) !=
+          (IFF_UP | IFF_RUNNING) || (ifa->ifa_flags & IFF_LOOPBACK) != 0)
+        {
+          continue;
+        }
+
+      if (ifa->ifa_addr->sa_family == AF_INET)
+        {
+          FAR struct sockaddr_in *sin;
+          char destip[INET_ADDRSTRLEN];
+
+          /* Skip interfaces with INADDR_ANY address and loopback flag */
+
+          sin = (FAR struct sockaddr_in *)ifa->ifa_addr;
+          if (sin->sin_addr.s_addr == INADDR_ANY)
+            {
+              continue;
+            }
+
+          /* No ARP means point-to-point or tunnel, treat as reachable */
+
+          if ((ifa->ifa_flags & IFF_NOARP) != 0)
+            {
+              (*replies)++;
+              break;
+            }
+
+          sin = (FAR struct sockaddr_in *)ifa->ifa_dstaddr;
+          if (sin == NULL ||
+              sin->sin_family != AF_INET ||
+              sin->sin_addr.s_addr == INADDR_ANY)
+            {
+              continue;
+            }
+
+          inet_ntop(AF_INET, &sin->sin_addr, destip, sizeof(destip));
+          ninfo("ping gateway %s on %s\n", destip, ifa->ifa_name);
+          info->hostname = destip;
+#ifdef CONFIG_NETUTILS_PING
+          icmp_ping(info);
+#else
+          (*replies)++;
+#endif
+        }
+      else if (ifa->ifa_addr->sa_family == AF_INET6)
+        {
+          FAR struct sockaddr_in6 *sin6;
+          char destip[INET6_ADDRSTRLEN];
+
+          /* Skip interfaces with unspecified address and loopback flag */
+
+          sin6 = (FAR struct sockaddr_in6 *)ifa->ifa_addr;
+          if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
+            {
+              continue;
+            }
+
+          /* No ARP means point-to-point or tunnel, treat as reachable */
+
+          if ((ifa->ifa_flags & IFF_NOARP) != 0)
+            {
+              (*replies)++;
+              break;
+            }
+
+          sin6 = (FAR struct sockaddr_in6 *)ifa->ifa_dstaddr;
+          if (sin6 == NULL ||
+              sin6->sin6_family != AF_INET6 ||
+              IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
+            {
+              continue;
+            }
+
+          inet_ntop(AF_INET6, &sin6->sin6_addr, destip, sizeof(destip));
+          ninfo("ping6 gateway %s on %s\n", destip, ifa->ifa_name);
+          info6->hostname = destip;
+#ifdef CONFIG_NETUTILS_PING6
+          icmp6_ping(info6);
+#else
+          (*replies)++;
+#endif
+        }
+    }
+
+  freeifaddrs(ifap);
+}
+#endif /* CONFIG_NETDEV_IFINDEX */
+
+/****************************************************************************
+ * Name: ping_route
+ *
+ * Description:
+ *   Ping the router addresses from the IPv4 routing table.
+ *
+ * Parameters:
+ *   info  Pointer to the ping info structure
+ *
+ ****************************************************************************/
+
+#if defined(HAVE_ROUTE_PROCFS) && defined(CONFIG_NETUTILS_PING)
+static void ping_route(FAR struct ping_info_s *info)
+{
+  FAR int *replies = info->priv;
+  FAR FILE *stream;
+  struct netlib_ipv4_route_s route;
+
+  stream = netlib_open_ipv4route();
+  if (stream == NULL)
+    {
+      return;
+    }
+
+  while (*replies == 0 && netlib_read_ipv4route(stream, &route) > 0)
+    {
+      char destip[INET_ADDRSTRLEN];
+
+      if (route.router == INADDR_ANY)
+        {
+          continue;
+        }
+
+      inet_ntop(AF_INET, &route.router, destip, sizeof(destip));
+      ninfo("ping route gateway %s\n", destip);
+      info->hostname = destip;
+      icmp_ping(info);
+    }
+
+  netlib_close_ipv4route(stream);
+}
+#endif /* HAVE_ROUTE_PROCFS && CONFIG_NETUTILS_PING */
+
+/****************************************************************************
+ * Name: ping6_route
+ *
+ * Description:
+ *   Ping the router addresses from the IPv6 routing table.
+ *
+ * Parameters:
+ *   info6  Pointer to the ping6 info structure
+ *
+ ****************************************************************************/
+
+#if defined(HAVE_ROUTE_PROCFS) && defined(CONFIG_NETUTILS_PING6)
+static void ping6_route(FAR struct ping6_info_s *info6)
+{
+  FAR int *replies = info6->priv;
+  FAR FILE *stream;
+  struct netlib_ipv6_route_s route;
+
+  stream = netlib_open_ipv6route();
+  if (stream == NULL)
+    {
+      return;
+    }
+
+  while (*replies == 0 && netlib_read_ipv6route(stream, &route) > 0)
+    {
+      char destip[INET6_ADDRSTRLEN];
+      struct in6_addr router;
+
+      memcpy(&router, route.router, sizeof(router));
+      if (IN6_IS_ADDR_UNSPECIFIED(&router))
+        {
+          continue;
+        }
+
+      inet_ntop(AF_INET6, &router, destip, sizeof(destip));
+      ninfo("ping6 route gateway %s\n", destip);
+      info6->hostname = destip;
+      icmp6_ping(info6);
+    }
+
+  netlib_close_ipv6route(stream);
+}
+#endif /* HAVE_ROUTE_PROCFS && CONFIG_NETUTILS_PING6 */
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -80,59 +319,107 @@ static void ping_ipaddr_callback(FAR const struct ping_result_s *result)
  * Name: netlib_check_ipconnectivity
  *
  * Description:
- *   Get the network dns status
+ *   Check network connectivity by pinging a remote IP address.
+ *   If ip is NULL, ping the gateway of each network interface,
+ *   and optionally the routers from the routing table. If ping
+ *   is disabled, just check the status of the IP network card.
  *
  * Parameters:
- *   ip       The ipv4 address to check
+ *   ip       The ipv4 address to check, or NULL to ping gateways
  *   timeout  The max timeout of each ping
  *   retry    The retry times of ping
  *
  * Return:
- *   nums of remote reply of ping; a nagtive on failure
+ *   nums of remote reply of ping; a negative or ZERO on failure
  *
  ****************************************************************************/
 
 int netlib_check_ipconnectivity(FAR const char *ip, int timeout, int retry)
 {
   int replies = 0;
-#ifdef CONFIG_NETDB_DNSSERVER_IPv4ADDR
-  char ip_str[INET_ADDRSTRLEN];
-  struct in_addr addr;
-#endif
+#if defined(CONFIG_NETDEV_IFINDEX) || defined(CONFIG_NETUTILS_PING)
   struct ping_info_s info;
+#endif
+#if defined(CONFIG_NETDEV_IFINDEX) || defined(CONFIG_NETUTILS_PING6)
+  struct ping6_info_s info6;
+#endif
 
+#ifdef CONFIG_NETUTILS_PING
   info.count    = retry;
   info.datalen  = PING_IPADDR_DATALEN;
   info.delay    = 0;
   info.timeout  = timeout;
   info.callback = ping_ipaddr_callback;
-  info.priv     = &replies;
-#ifdef CONFIG_NET_BINDTODEVICE
+  info.hostname = ip;
+#  ifdef CONFIG_NET_BINDTODEVICE
   info.devname  = NULL;
+#  endif
+#endif
+#if defined(CONFIG_NETDEV_IFINDEX) || defined(CONFIG_NETUTILS_PING)
+  info.priv     = &replies;
 #endif
 
-  /* if ip is NULL we use default DNS server */
+#ifdef CONFIG_NETUTILS_PING6
+  info6.count    = retry;
+  info6.datalen  = PING_IPADDR_DATALEN;
+  info6.delay    = 0;
+  info6.timeout  = timeout;
+  info6.hostname = ip;
+  info6.callback = ping6_ipaddr_callback;
+#  ifdef CONFIG_NET_BINDTODEVICE
+  info6.devname  = NULL;
+#  endif
+#endif
+#if defined(CONFIG_NETDEV_IFINDEX) || defined(CONFIG_NETUTILS_PING6)
+  info6.priv     = &replies;
+#endif
 
-  if (ip == NULL)
+  if (ip != NULL)
     {
-#ifdef CONFIG_NETDB_DNSSERVER_IPv4ADDR
-      addr.s_addr = HTONL(CONFIG_NETDB_DNSSERVER_IPv4ADDR);
-      inet_ntop(AF_INET, &addr, ip_str, INET_ADDRSTRLEN);
-      info.hostname = ip_str;
+      struct in6_addr addr6;
+
+      ninfo("ping ipaddr test %s\n", ip);
+      if (inet_pton(AF_INET6, ip, &addr6) == 1)
+        {
+#ifdef CONFIG_NETUTILS_PING6
+          icmp6_ping(&info6);
+          return replies;
 #else
-      nerr("ERROR: IP is NULL and no DNS server configured\n");
-      return -EINVAL;
+          /* Fallback to network card status check */
 #endif
-    }
-  else
-    {
-      info.hostname = ip;
+        }
+      else
+        {
+#ifdef CONFIG_NETUTILS_PING
+          icmp_ping(&info);
+          return replies;
+#else
+          /* Fallback to network card status check */
+#endif
+        }
     }
 
-  ninfo("ping ipaddr test %s \n", info.hostname);
-  icmp_ping(&info);
+#ifdef CONFIG_NETDEV_IFINDEX
+  ping_gateway(&info, &info6);
+#endif
+
+#if defined(HAVE_ROUTE_PROCFS) && defined(CONFIG_NETUTILS_PING)
+  if (replies == 0)
+    {
+      ping_route(&info);
+    }
+#endif
+
+#if defined(HAVE_ROUTE_PROCFS) && defined(CONFIG_NETUTILS_PING6)
+  if (replies == 0)
+    {
+      ping6_route(&info6);
+    }
+#endif
+
+#if !defined(CONFIG_NETDEV_IFINDEX) && !defined(HAVE_ROUTE_PROCFS)
+  replies = 1;
+#endif
 
   return replies;
 }
-
-#endif /* CONFIG_NETUTILS_PING */
\ No newline at end of file

From 21b28a4126ac1268c9f4d4f41b60247837e1158f Mon Sep 17 00:00:00 2001
From: xiaoxiang781216 <xiaoxiang781216@gmail.com>
Date: Wed, 13 May 2026 18:36:26 +0800
Subject: [PATCH 320/568] testing/ltp: silence -Wshift-count-overflow on
 -Werror builds

The LTP open_posix_testsuite header timespec.h has, since 2019:

  #define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1)

When time_t is 64 bits (the default after sched/remove-system-time64),
the shift reaches the sign bit of the underlying type and toolchains
emit -Wshift-count-overflow, which the LTP build promotes to a hard
error via -Werror.  This breaks rv-virt/citest and rv-virt/citest64
on CI.

The diagnostic is benign here (TIME_T_MAX itself is correct) and the
defect is in upstream LTP, so disable the warning alongside the other
'should be removed in the future' relaxations until upstream is fixed.

Signed-off-by: xiaoxiang781216 <xiaoxiang781216@gmail.com>
---
 testing/ltp/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/ltp/Makefile b/testing/ltp/Makefile
index c6f712614..39a7d931b 100644
--- a/testing/ltp/Makefile
+++ b/testing/ltp/Makefile
@@ -238,6 +238,7 @@ CFLAGS += -Wno-int-conversion -Wno-shadow
 
 # Should be removed if possible in the future
 CFLAGS += -Wno-incompatible-pointer-types -Wno-overflow -Wno-int-to-pointer-cast
+CFLAGS += -Wno-shift-count-overflow
 
 # Specific compilation errors ignored in MacOS platform
 ifneq ($(CONFIG_HOST_MACOS),)

From c10ce6aa4f2578f3fee49f3731eb53b446d02a27 Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Wed, 13 May 2026 14:08:11 +0900
Subject: [PATCH 321/568] apps/cmake: Make hello_rust_cargo buildable with
 cmake

* Resolve APPDIR.
* Remove "debug" from RUST_PROFILE_FLAG.
* Add JSON specification compatibility flag.
* Correct the directory structure for RUST_LIB_PATH.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 cmake/nuttx_add_rust.cmake | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index 0d1f09839..3a26bfd16 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -47,6 +47,8 @@ include(nuttx_parse_function_args)
 # ~~~
 
 function(nuttx_rust_target_triple ARCHTYPE ABITYPE CPUTYPE OUTPUT)
+  get_filename_component(APPDIR "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/.."
+                         ABSOLUTE)
   if(ARCHTYPE STREQUAL "x86_64")
     set(TARGET_TRIPLE "${APPDIR}/tools/x86_64-unknown-nuttx.json")
   elseif(ARCHTYPE STREQUAL "x86")
@@ -127,9 +129,11 @@ function(nuttx_add_rust)
 
   # Determine build profile based on CONFIG_DEBUG_FULLOPT
   if(CONFIG_DEBUG_FULLOPT)
+    set(RUST_PROFILE_FLAG "--release")
     set(RUST_PROFILE "release")
     set(RUST_PANIC_FLAGS "-Zunstable-options -Cpanic=immediate-abort")
   else()
+    set(RUST_PROFILE_FLAG "")
     set(RUST_PROFILE "debug")
     set(RUST_PANIC_FLAGS "")
   endif()
@@ -145,9 +149,9 @@ function(nuttx_add_rust)
     set(TARGET_BASE ${RUST_TARGET})
   endif()
 
-  set(RUST_BUILD_DIR
-      ${CMAKE_CURRENT_BINARY_DIR}/${CRATE_NAME}/target/${TARGET_BASE})
-  set(RUST_LIB_PATH ${RUST_BUILD_DIR}/${RUST_PROFILE}/lib${CRATE_NAME}.a)
+  set(RUST_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CRATE_NAME}/target)
+  set(RUST_LIB_PATH
+      ${RUST_BUILD_DIR}/${TARGET_BASE}/${RUST_PROFILE}/lib${CRATE_NAME}.a)
 
   # Create build directory
   file(MAKE_DIRECTORY ${RUST_BUILD_DIR})
@@ -158,9 +162,10 @@ function(nuttx_add_rust)
     COMMAND
       ${CMAKE_COMMAND} -E env
       NUTTX_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/include:${CMAKE_BINARY_DIR}/include:${CMAKE_BINARY_DIR}/include/arch
-      RUSTFLAGS=${RUST_PANIC_FLAGS} cargo build --${RUST_PROFILE}
-      -Zbuild-std=std,panic_abort --manifest-path ${CRATE_PATH}/Cargo.toml
-      --target ${RUST_TARGET} --target-dir ${RUST_BUILD_DIR}
+      RUSTFLAGS=${RUST_PANIC_FLAGS} cargo build ${RUST_PROFILE_FLAG}
+      -Zbuild-std=std,panic_abort -Zjson-target-spec --manifest-path
+      ${CRATE_PATH}/Cargo.toml --target ${RUST_TARGET} --target-dir
+      ${RUST_BUILD_DIR}
     COMMENT "Building Rust crate ${CRATE_NAME}"
     VERBATIM)
 

From bb7c83b01cf7c48d8f4850b9074e3478e62ca08e Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Sat, 16 May 2026 14:55:38 +0900
Subject: [PATCH 322/568] apps:cmake: Add APPLE to a build target for sim's
 configuration using CMake.

* Add Rust target conversion support for `aarch64` on acOS/Linux (and Linux `arm`).
* When a Rust target is unsupported and results in an empty configuration, trigger a CMake `FATAL_ERROR`.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 cmake/nuttx_add_rust.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index 3a26bfd16..55fce1a8e 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -35,6 +35,7 @@ include(nuttx_parse_function_args)
 #   - riscv64: riscv64imac/imafdc-unknown-nuttx-elf
 #   - x86: i686-unknown-nuttx
 #   - x86_64: x86_64-unknown-nuttx
+#   - aarch64: aarch64-apple-darwin
 #
 # Inputs:
 #   ARCHTYPE - Architecture type (e.g. thumbv7m, riscv32)
@@ -53,6 +54,10 @@ function(nuttx_rust_target_triple ARCHTYPE ABITYPE CPUTYPE OUTPUT)
     set(TARGET_TRIPLE "${APPDIR}/tools/x86_64-unknown-nuttx.json")
   elseif(ARCHTYPE STREQUAL "x86")
     set(TARGET_TRIPLE "${APPDIR}/tools/i486-unknown-nuttx.json")
+  elseif(ARCHTYPE STREQUAL "aarch64")
+    if(APPLE)
+      set(TARGET_TRIPLE "aarch64-apple-darwin")
+    endif()
   elseif(ARCHTYPE MATCHES "thumb")
     if(ARCHTYPE MATCHES "thumbv8m")
       # Extract just the base architecture type (thumbv8m.main or thumbv8m.base)
@@ -92,6 +97,13 @@ function(nuttx_rust_target_triple ARCHTYPE ABITYPE CPUTYPE OUTPUT)
       set(TARGET_TRIPLE "riscv64imac-unknown-nuttx-elf")
     endif()
   endif()
+
+  if(NOT TARGET_TRIPLE)
+    message(
+      FATAL_ERROR
+        "Unsupported Rust target: LLVM_ARCHTYPE=${ARCHTYPE}, LLVM_ABITYPE=${ABITYPE}, LLVM_CPUTYPE=${CPUTYPE}"
+    )
+  endif()
   set(${OUTPUT}
       ${TARGET_TRIPLE}
       PARENT_SCOPE)

From 86fb38fbe42899dd9ccca99a03f9dfcbca36269f Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sun, 17 May 2026 15:16:15 -0400
Subject: [PATCH 323/568] boot/mcuboot: Update commit version

This updates the version of mcuboot used by NuttX now that BOARDIOC_INIT
is removed.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 boot/mcuboot/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/mcuboot/Kconfig b/boot/mcuboot/Kconfig
index 271c986e7..656861d73 100644
--- a/boot/mcuboot/Kconfig
+++ b/boot/mcuboot/Kconfig
@@ -22,7 +22,7 @@ config MCUBOOT_REPOSITORY
 
 config MCUBOOT_VERSION
 	string "MCUboot version"
-	default "457be0cf3fb03e9e09938728dece8f03309db973"
+	default "e36d3c8d6ca5e0ed1f510f2a7d110f405a7c396b"
 	---help---
 		Defines MCUboot version to be downloaded. Either release tag
 		or commit hash should be specified. Using newer MCUboot version

From 8bd66150344846b3d28112690ac9d381e6327406 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 11 May 2026 11:15:18 +0200
Subject: [PATCH 324/568] examples/pwm: remove references to
 CONFIG_PWM_MULTICHAN

remove references to CONFIG_PWM_MULTICHAN

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/pwm/Kconfig    |  18 +----
 examples/pwm/pwm.h      |  10 ++-
 examples/pwm/pwm_main.c | 151 +++++++++++++++-------------------------
 3 files changed, 63 insertions(+), 116 deletions(-)

diff --git a/examples/pwm/Kconfig b/examples/pwm/Kconfig
index 9378003f2..b6e0a3d82 100644
--- a/examples/pwm/Kconfig
+++ b/examples/pwm/Kconfig
@@ -29,10 +29,7 @@ config EXAMPLES_PWM_DURATION
 	default 5
 	---help---
 		The default PWM pulse train duration in seconds.  Used only if the current
-		pulse count is zero (pulse count is only supported if PWM_PULSECOUNT
-		is not defined).  Default: 5 seconds
-
-if PWM_MULTICHAN
+		pulse count is zero.  Default: 5 seconds
 
 config EXAMPLES_PWM_DUTYPCT1
 	int "First PWM duty percentage"
@@ -138,17 +135,6 @@ config EXAMPLES_PWM_CHANNEL6
 
 endif
 
-endif
-
-if !PWM_MULTICHAN
-
-config EXAMPLES_PWM_DUTYPCT
-	int "Default PWM duty percentage"
-	default 50
-	range 1 99
-	---help---
-		The default PWM duty as a percentage.  Default: 50%
-
 config EXAMPLES_PWM_PULSECOUNT
 	int "Default pulse count"
 	default 0
@@ -159,5 +145,3 @@ config EXAMPLES_PWM_PULSECOUNT
 		the count).
 
 endif
-
-endif
diff --git a/examples/pwm/pwm.h b/examples/pwm/pwm.h
index e0447b9b3..d5c15aed9 100644
--- a/examples/pwm/pwm.h
+++ b/examples/pwm/pwm.h
@@ -40,8 +40,10 @@
  *   Default: /dev/pwm0
  * CONFIG_EXAMPLES_PWM_FREQUENCY - The initial PWM frequency.
  *   Default: 100 Hz
- * CONFIG_EXAMPLES_PWM_DUTYPCT - The initial PWM duty as a percentage.
- *   Default: 50%
+ * CONFIG_EXAMPLES_PWM_DUTYPCTn - The initial PWM duty as a percentage for
+ *   channel n.  Default: 50%
+ * CONFIG_EXAMPLES_PWM_CHANNELn - The PWM channel number for channel n.
+ *   Default: n
  * CONFIG_EXAMPLES_PWM_DURATION - The initial PWM pulse train duration
  *   in seconds. Used only if the current pulse count is zero
  *   (pulse count is only supported if CONFIG_PWM_PULSECOUNT is defined).
@@ -63,10 +65,6 @@
 #  define CONFIG_EXAMPLES_PWM_FREQUENCY 100
 #endif
 
-#ifndef CONFIG_EXAMPLES_PWM_DUTYPCT
-#  define CONFIG_EXAMPLES_PWM_DUTYPCT 50
-#endif
-
 #ifndef CONFIG_EXAMPLES_PWM_DURATION
 #  define CONFIG_EXAMPLES_PWM_DURATION 5
 #endif
diff --git a/examples/pwm/pwm_main.c b/examples/pwm/pwm_main.c
index 683587f08..085a36b9e 100644
--- a/examples/pwm/pwm_main.c
+++ b/examples/pwm/pwm_main.c
@@ -48,46 +48,44 @@
 
 /* Configuration ************************************************************/
 
-#ifdef CONFIG_PWM_MULTICHAN
-#  if CONFIG_PWM_NCHANNELS > 1
-#    if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL2
-#      error "Channel numbers must be unique"
-#    endif
+#if CONFIG_PWM_NCHANNELS > 1
+#  if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL2
+#    error "Channel numbers must be unique"
 #  endif
-#  if CONFIG_PWM_NCHANNELS > 2
-#    if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL3 || \
+#endif
+#if CONFIG_PWM_NCHANNELS > 2
+#  if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL3 || \
         CONFIG_EXAMPLES_PWM_CHANNEL2 == CONFIG_EXAMPLES_PWM_CHANNEL3
-#      error "Channel numbers must be unique"
-#    endif
+#    error "Channel numbers must be unique"
 #  endif
-#  if CONFIG_PWM_NCHANNELS > 3
-#    if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL4 || \
+#endif
+#if CONFIG_PWM_NCHANNELS > 3
+#  if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL4 || \
         CONFIG_EXAMPLES_PWM_CHANNEL2 == CONFIG_EXAMPLES_PWM_CHANNEL4 || \
         CONFIG_EXAMPLES_PWM_CHANNEL3 == CONFIG_EXAMPLES_PWM_CHANNEL4
-#      error "Channel numbers must be unique"
-#    endif
+#    error "Channel numbers must be unique"
 #  endif
-#  if CONFIG_PWM_NCHANNELS > 4
-#    if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
+#endif
+#if CONFIG_PWM_NCHANNELS > 4
+#  if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
         CONFIG_EXAMPLES_PWM_CHANNEL2 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
         CONFIG_EXAMPLES_PWM_CHANNEL3 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
         CONFIG_EXAMPLES_PWM_CHANNEL4 == CONFIG_EXAMPLES_PWM_CHANNEL5
-#      error "Channel numbers must be unique"
-#    endif
+#    error "Channel numbers must be unique"
 #  endif
-#  if CONFIG_PWM_NCHANNELS > 5
-#    if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
+#endif
+#if CONFIG_PWM_NCHANNELS > 5
+#  if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
         CONFIG_EXAMPLES_PWM_CHANNEL2 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
         CONFIG_EXAMPLES_PWM_CHANNEL3 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
         CONFIG_EXAMPLES_PWM_CHANNEL4 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
         CONFIG_EXAMPLES_PWM_CHANNEL5 == CONFIG_EXAMPLES_PWM_CHANNEL6
-#      error "Channel numbers must be unique"
-#    endif
-#  endif
-#  if CONFIG_PWM_NCHANNELS > 6
-#    error "Too many PWM channels"
+#    error "Channel numbers must be unique"
 #  endif
 #endif
+#if CONFIG_PWM_NCHANNELS > 6
+#  error "Too many PWM channels"
+#endif
 
 /****************************************************************************
  * Private Types
@@ -97,12 +95,8 @@ struct pwm_state_s
 {
   bool      initialized;
   FAR char *devpath;
-#ifdef CONFIG_PWM_MULTICHAN
-  uint8_t   channels[CONFIG_PWM_NCHANNELS];
+  int8_t    channels[CONFIG_PWM_NCHANNELS];
   uint8_t   duties[CONFIG_PWM_NCHANNELS];
-#else
-  uint8_t   duty;
-#endif
   uint32_t  freq;
 #ifdef CONFIG_PWM_PULSECOUNT
   uint32_t  count;
@@ -152,49 +146,47 @@ static void pwm_devpath(FAR struct pwm_state_s *pwm, FAR const char *devpath)
 
 static void pwm_help(FAR struct pwm_state_s *pwm)
 {
-#ifdef CONFIG_PWM_MULTICHAN
-  uint8_t channels[CONFIG_PWM_NCHANNELS] =
-  {
-    CONFIG_EXAMPLES_PWM_CHANNEL1,
+  int8_t channels[CONFIG_PWM_NCHANNELS] =
+    {
+      CONFIG_EXAMPLES_PWM_CHANNEL1,
 #if CONFIG_PWM_NCHANNELS > 1
-    CONFIG_EXAMPLES_PWM_CHANNEL2,
+      CONFIG_EXAMPLES_PWM_CHANNEL2,
 #endif
 #if CONFIG_PWM_NCHANNELS > 2
-    CONFIG_EXAMPLES_PWM_CHANNEL3,
+      CONFIG_EXAMPLES_PWM_CHANNEL3,
 #endif
 #if CONFIG_PWM_NCHANNELS > 3
-    CONFIG_EXAMPLES_PWM_CHANNEL4,
+      CONFIG_EXAMPLES_PWM_CHANNEL4,
 #endif
 #if CONFIG_PWM_NCHANNELS > 4
-    CONFIG_EXAMPLES_PWM_CHANNEL5,
+      CONFIG_EXAMPLES_PWM_CHANNEL5,
 #endif
 #if CONFIG_PWM_NCHANNELS > 5
-    CONFIG_EXAMPLES_PWM_CHANNEL6,
+      CONFIG_EXAMPLES_PWM_CHANNEL6,
 #endif
-  };
+    };
 
   uint8_t duties[CONFIG_PWM_NCHANNELS] =
-  {
-    CONFIG_EXAMPLES_PWM_DUTYPCT1,
+    {
+      CONFIG_EXAMPLES_PWM_DUTYPCT1,
 #if CONFIG_PWM_NCHANNELS > 1
-    CONFIG_EXAMPLES_PWM_DUTYPCT2,
+      CONFIG_EXAMPLES_PWM_DUTYPCT2,
 #endif
 #if CONFIG_PWM_NCHANNELS > 2
-    CONFIG_EXAMPLES_PWM_DUTYPCT3,
+      CONFIG_EXAMPLES_PWM_DUTYPCT3,
 #endif
 #if CONFIG_PWM_NCHANNELS > 3
-    CONFIG_EXAMPLES_PWM_DUTYPCT4,
+      CONFIG_EXAMPLES_PWM_DUTYPCT4,
 #endif
 #if CONFIG_PWM_NCHANNELS > 4
-    CONFIG_EXAMPLES_PWM_DUTYPCT5,
+      CONFIG_EXAMPLES_PWM_DUTYPCT5,
 #endif
 #if CONFIG_PWM_NCHANNELS > 5
-    CONFIG_EXAMPLES_PWM_DUTYPCT6,
+      CONFIG_EXAMPLES_PWM_DUTYPCT6,
 #endif
-  };
+    };
 
   int i;
-#endif
 
   printf("Usage: pwm [OPTIONS]\n");
   printf("\nArguments are \"sticky\".  "
@@ -207,7 +199,6 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
   printf("  [-f frequency] selects the pulse frequency.  "
          "Default: %d Hz Current: %" PRIu32 " Hz\n",
          CONFIG_EXAMPLES_PWM_FREQUENCY, pwm->freq);
-#ifdef CONFIG_PWM_MULTICHAN
   printf("  [[-c channel1] [[-c channel2] ...]] "
          "selects the channel number for each channel.  ");
   printf("Default:");
@@ -239,11 +230,6 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
     }
 
   printf("\n");
-#else
-  printf("  [-d duty] selects the pulse duty as a percentage.  "
-         "Default: %d %% Current: %d %%\n",
-         CONFIG_EXAMPLES_PWM_DUTYPCT, pwm->duty);
-#endif
 #ifdef CONFIG_PWM_PULSECOUNT
   printf("  [-n count] selects the pulse count.  "
          "Default: %d Current: %" PRIx32 "\n",
@@ -301,10 +287,10 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc,
   long value;
   int index;
   int nargs;
-#ifdef CONFIG_PWM_MULTICHAN
+#if CONFIG_PWM_NCHANNELS > 1
   int nchannels = 0;
-  int nduties   = 0;
 #endif
+  int nduties   = 0;
 
   for (index = 1; index < argc; )
     {
@@ -329,7 +315,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc,
             index += nargs;
             break;
 
-#ifdef CONFIG_PWM_MULTICHAN
+#if CONFIG_PWM_NCHANNELS > 1
           case 'c':
             nargs = arg_decimal(&argv[index], &value);
             if (value < -1 || value > CONFIG_PWM_NCHANNELS)
@@ -361,7 +347,6 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc,
                 exit(1);
               }
 
-#ifdef CONFIG_PWM_MULTICHAN
             if (nduties < CONFIG_PWM_NCHANNELS)
               {
                 nduties++;
@@ -373,9 +358,6 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc,
               }
 
             pwm->duties[nduties - 1] = (uint8_t)value;
-#else
-            pwm->duty = (uint8_t)value;
-#endif
             index += nargs;
             break;
 
@@ -436,16 +418,13 @@ int main(int argc, FAR char *argv[])
   struct pwm_info_s info;
   int fd;
   int ret;
-#ifdef CONFIG_PWM_MULTICHAN
   int i;
   int j;
-#endif
 
   /* Initialize the state data */
 
   if (!g_pwmstate.initialized)
     {
-#ifdef CONFIG_PWM_MULTICHAN
       g_pwmstate.channels[0] = CONFIG_EXAMPLES_PWM_CHANNEL1;
       g_pwmstate.duties[0]   = CONFIG_EXAMPLES_PWM_DUTYPCT1;
 #if CONFIG_PWM_NCHANNELS > 1
@@ -467,9 +446,6 @@ int main(int argc, FAR char *argv[])
 #if CONFIG_PWM_NCHANNELS > 5
       g_pwmstate.channels[5] = CONFIG_EXAMPLES_PWM_CHANNEL6;
       g_pwmstate.duties[5]   = CONFIG_EXAMPLES_PWM_DUTYPCT6;
-#endif
-#else
-      g_pwmstate.duty        = CONFIG_EXAMPLES_PWM_DUTYPCT;
 #endif
       g_pwmstate.freq        = CONFIG_EXAMPLES_PWM_FREQUENCY;
       g_pwmstate.duration    = CONFIG_EXAMPLES_PWM_DURATION;
@@ -483,19 +459,23 @@ int main(int argc, FAR char *argv[])
 
   parse_args(&g_pwmstate, argc, argv);
 
-#ifdef CONFIG_PWM_MULTICHAN
-  for (i = 0; i < CONFIG_PWM_MULTICHAN; i++)
+  for (i = 0; i < CONFIG_PWM_NCHANNELS; i++)
     {
-      for (j = i + 1; j < CONFIG_PWM_MULTICHAN; j++)
+      if (g_pwmstate.channels[i] < 1)
         {
-          if (g_pwmstate.channels[j] == g_pwmstate.channels[i])
+          continue;
+        }
+
+      for (j = i + 1; j < CONFIG_PWM_NCHANNELS; j++)
+        {
+          if (g_pwmstate.channels[j] > 0 &&
+              g_pwmstate.channels[j] == g_pwmstate.channels[i])
             {
               printf("pwm_main: channel numbers must be unique\n");
               goto errout;
             }
         }
     }
-#endif
 
   /* Has a device been assigned? */
 
@@ -517,8 +497,8 @@ int main(int argc, FAR char *argv[])
 
   /* Configure the characteristics of the pulse train */
 
+  memset(&info, 0, sizeof(info));
   info.frequency = g_pwmstate.freq;
-#ifdef CONFIG_PWM_MULTICHAN
   printf("pwm_main: starting output with frequency: %" PRIu32,
          info.frequency);
 
@@ -531,26 +511,11 @@ int main(int argc, FAR char *argv[])
         info.channels[i].channel, info.channels[i].duty);
     }
 
-  printf("\n");
-
-#else
-  info.duty = g_pwmstate.duty ? \
-    b16divi(uitoub16(g_pwmstate.duty) - 1, 100) : 0;
-#  ifdef CONFIG_PWM_PULSECOUNT
-  info.count = g_pwmstate.count;
-
-  printf("pwm_main: starting output "
-         "with frequency: %" PRIu32 " duty: %08" PRIx32
-         " count: %" PRIx32 "\n",
-         info.frequency, (uint32_t)info.duty, info.count);
-
-#  else
-  printf("pwm_main: starting output "
-         "with frequency: %" PRIu32 " duty: %08" PRIx32 "\n",
-         info.frequency, (uint32_t)info.duty);
-
-#  endif
+#ifdef CONFIG_PWM_PULSECOUNT
+  info.channels[0].count = g_pwmstate.count;
+  printf(" count: %" PRIx32, info.channels[0].count);
 #endif
+  printf("\n");
 
   ret = ioctl(fd, PWMIOC_SETCHARACTERISTICS,
               (unsigned long)((uintptr_t)&info));
@@ -577,7 +542,7 @@ int main(int argc, FAR char *argv[])
    */
 
 #ifdef CONFIG_PWM_PULSECOUNT
-  if (info.count == 0)
+  if (info.channels[0].count == 0)
 #endif
     {
       /* Wait for the specified duration */

From 2fce07fe1ccc295ffeec3d63dee2de8dcc9d4b89 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 11 May 2026 11:15:41 +0200
Subject: [PATCH 325/568] testing/drivertest_pwm: remove references to
 CONFIG_PWM_MULTICHAN

remove references to CONFIG_PWM_MULTICHAN

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 testing/drivers/drivertest/drivertest_pwm.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/testing/drivers/drivertest/drivertest_pwm.c b/testing/drivers/drivertest/drivertest_pwm.c
index 3dd3bae64..7b08f9a24 100644
--- a/testing/drivers/drivertest/drivertest_pwm.c
+++ b/testing/drivers/drivertest/drivertest_pwm.c
@@ -164,11 +164,11 @@ static void parse_commandline(FAR struct pwm_state_s *pwm_state, int argc,
             OPTARG_TO_VALUE(converted, uint32_t, 10);
             if (converted < 0)
               {
-                printf("Count must be non-negative: %ld\n", converted);
+                printf("Count must be non-negative: %d\n", converted);
                 pwm_help(argv[0], pwm_state, EXIT_FAILURE);
               }
 
-            pwm_state->count = (uint32_t)value;
+            pwm_state->count = (uint32_t)converted;
             break;
 #endif
           case 'f':
@@ -223,9 +223,7 @@ static void drivertest_pwm(FAR void **state)
 {
   int fd;
   int ret;
-#ifdef CONFIG_PWM_MULTICHAN
   int i;
-#endif
   struct pwm_info_s info;
   FAR struct pwm_state_s *pwm_state;
   pwm_state = (FAR struct pwm_state_s *)*state;
@@ -241,18 +239,14 @@ static void drivertest_pwm(FAR void **state)
 
   info.frequency = pwm_state->freq;
 
-#ifdef CONFIG_PWM_MULTICHAN
   for (i = 0; i < CONFIG_PWM_NCHANNELS; i++)
     {
       info.channels[i].channel = i + 1;
       info.channels[i].duty = b16divi(uitoub16(pwm_state->duty), 100);
     }
-#else
-  info.duty = b16divi(uitoub16(pwm_state->duty), 100);
-#endif
 
 #ifdef CONFIG_PWM_PULSECOUNT
-  info.count = pwm_state.count;
+  info.channels[0].count = pwm_state->count;
 #endif
 
   ret = ioctl(fd, PWMIOC_SETCHARACTERISTICS,
@@ -271,7 +265,7 @@ static void drivertest_pwm(FAR void **state)
    */
 
 #ifdef CONFIG_PWM_PULSECOUNT
-  if (info.count == 0)
+  if (info.channels[0].count == 0)
 #endif
     {
       /* Wait for the specified duration */

From 8ba84edb0ac6772ac67e4c78d14044435dd90d75 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Fri, 8 May 2026 13:54:17 -0300
Subject: [PATCH 326/568] interpreters/python: Enable using `pip` to install
 Python packages

This commit enables using `pip` as a pre-compiled (pyc) built-in
distributed along with cpython.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 interpreters/python/Kconfig                   |  17 +++
 interpreters/python/Make.defs                 |   2 +
 interpreters/python/Makefile                  |  38 ++++-
 interpreters/python/Setup.local.in            |  10 --
 interpreters/python/config.site.in            |  11 +-
 ...015-keep-ensurepip-in-stdlib-archive.patch |  25 ++++
 ...offset-check-when-time-t-is-unsigned.patch |  21 +++
 ...ep-pydecimal-and-trim-tooling-extras.patch |  35 +++++
 ...0018-ignore-chmod-on-nuttx-like-wasi.patch |  25 ++++
 interpreters/python/python_wrapper.c          |   2 +
 interpreters/python/repack_wheel_add_pyc.py   | 139 ++++++++++++++++++
 11 files changed, 313 insertions(+), 12 deletions(-)
 create mode 100644 interpreters/python/patch/0015-keep-ensurepip-in-stdlib-archive.patch
 create mode 100644 interpreters/python/patch/0016-fix-timezone-offset-check-when-time-t-is-unsigned.patch
 create mode 100644 interpreters/python/patch/0017-stdlib-zip-keep-pydecimal-and-trim-tooling-extras.patch
 create mode 100644 interpreters/python/patch/0018-ignore-chmod-on-nuttx-like-wasi.patch
 create mode 100644 interpreters/python/repack_wheel_add_pyc.py

diff --git a/interpreters/python/Kconfig b/interpreters/python/Kconfig
index dfc3f5ee8..dfc5fd4cc 100644
--- a/interpreters/python/Kconfig
+++ b/interpreters/python/Kconfig
@@ -37,4 +37,21 @@ config INTERPRETERS_CPYTHON_PROGNAME
 	---help---
 		This is the name of the program that will be used from the nsh.
 
+config INTERPRETERS_CPYTHON_ENABLE_PIP
+	bool "Enable bundled pip"
+	default n
+	---help---
+		Enable bundling pip into the CPython module image. When enabled, the
+		build downloads the pip wheel and pre-installs it through a
+		site-packages .pth entry that points to ensurepip's bundled wheel.
+		Disable this to skip pip wheel download/integration entirely.
+
+
+config INTERPRETERS_CPYTHON_PYTHONPATH
+	string "CPython Python path"
+	default "/tmp"
+	---help---
+		This is the Python default search path for modules files. This is
+		required to be a writable path.
+
 endif
diff --git a/interpreters/python/Make.defs b/interpreters/python/Make.defs
index c02973e5a..dceeb5267 100644
--- a/interpreters/python/Make.defs
+++ b/interpreters/python/Make.defs
@@ -27,6 +27,8 @@ CPYTHON_VERSION_MINOR=$(basename $(CPYTHON_VERSION))
 
 EXTRA_LIBPATHS += -L$(APPDIR)/interpreters/python/install/target
 EXTRA_LIBS += -lpython$(CPYTHON_VERSION_MINOR)
+EXTRA_LIBS += $(APPDIR)/interpreters/python/build/target/Modules/_hacl/libHacl_Hash_SHA2.a
+EXTRA_LIBS += $(APPDIR)/interpreters/python/build/target/Modules/expat/libexpat.a
 
 CONFIGURED_APPS += $(APPDIR)/interpreters/python
 endif
diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index 954f07b30..a339bbe02 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -84,6 +84,10 @@ $(CPYTHON_UNPACKNAME): $(CPYTHON_ZIP)
 	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0012-hack-place-_PyRuntime-structure-into-PSRAM-bss-regio.patch
 	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0013-transform-functions-used-by-NuttX-to-lowercase.patch
 	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0014-insert-prefix-to-list_length-to-avoid-symbol-collisi.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0015-keep-ensurepip-in-stdlib-archive.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0016-fix-timezone-offset-check-when-time-t-is-unsigned.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0017-stdlib-zip-keep-pydecimal-and-trim-tooling-extras.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0018-ignore-chmod-on-nuttx-like-wasi.patch
 
 $(HOSTPYTHON):
 	mkdir -p $(HOSTBUILD)
@@ -92,6 +96,7 @@ $(HOSTPYTHON):
 			cd $(HOSTBUILD) && $(CPYTHON_PATH)/configure \
 			 --with-pydebug \
 			 --prefix=$(HOSTINSTALL) \
+			 --disable-test-modules \
 		 )
 	$(MAKE) -C $(HOSTBUILD) install
 
@@ -152,7 +157,7 @@ $(TARGETBUILD)/Makefile: $(HOSTPYTHON) $(CONFIG_SITE) $(SETUP_LOCAL)
 			AR="$(AR)" \
 			ARFLAGS=" " \
 			MACHDEP="$(MACHDEP)" \
-			OPT="-g -O0 -Wall" \
+			OPT="-O3" \
 			CONFIG_SITE="$(CONFIG_SITE)" \
 			$(CPYTHON_PATH)/configure \
 			 --prefix=${TARGETINSTALL} \
@@ -163,13 +168,44 @@ $(TARGETBUILD)/Makefile: $(HOSTPYTHON) $(CONFIG_SITE) $(SETUP_LOCAL)
 			 --without-mimalloc \
 			 --without-pymalloc \
 			 --disable-test-modules \
+			 --with-ensurepip=no \
 		)
+	$(Q) sed -i 's/^#define HAVE_LIBB2 1/\/* #undef HAVE_LIBB2 *\//' $(TARGETBUILD)/pyconfig.h
+	$(Q) sed -i 's/-lb2//g' $(TARGETBUILD)/Makefile
 
 $(TARGETLIBPYTHON): $(TARGETBUILD)/Makefile
+ifeq ($(CONFIG_INTERPRETERS_CPYTHON_ENABLE_PIP),y)
+	$(Q) mkdir -p $(CPYTHON_PATH)/Lib/ensurepip/_bundled
+	$(Q) ( \
+		PIP_WHEEL_VERSION=$$($(HOSTPYTHON) -c "import ensurepip; print(ensurepip._PIP_VERSION)"); \
+		PIP_WHEEL=$(CPYTHON_PATH)/Lib/ensurepip/_bundled/pip-$${PIP_WHEEL_VERSION}-py3-none-any.whl; \
+		if [ ! -f "$${PIP_WHEEL}" ]; then \
+			echo "Fetching pip wheel $${PIP_WHEEL_VERSION} for ensurepip bundle"; \
+			$(HOSTPYTHON) -m pip download --only-binary=:all: --no-deps --dest $(CPYTHON_PATH)/Lib/ensurepip/_bundled pip==$${PIP_WHEEL_VERSION}; \
+		fi; \
+		echo "Pre-compiling pip wheel with build Python (must match embedded CPython version)"; \
+		$(HOSTPYTHON) $(CURDIR)/repack_wheel_add_pyc.py "$${PIP_WHEEL}"; \
+	)
+endif
 	$(MAKE) -C $(TARGETBUILD) regen-frozen
 	$(MAKE) -C $(TARGETBUILD) libpython$(CPYTHON_VERSION_MINOR).a wasm_stdlib
 	$(Q) ( cp $(TARGETBUILD)/libpython$(CPYTHON_VERSION_MINOR).a $(TARGETLIBPYTHON) )
 	$(Q) $(UNPACK) $(TARGETMODULESPACK) -d $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)
+ifeq ($(CONFIG_INTERPRETERS_CPYTHON_ENABLE_PIP),y)
+	$(Q) mkdir -p $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)/site-packages
+	$(Q) ( \
+		set -e; \
+		BUNDLED_DIR=$(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)/ensurepip/_bundled; \
+		SITE_PACKAGES=$(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)/site-packages; \
+		: > "$${SITE_PACKAGES}/bundled_wheels.pth"; \
+		for wheel in $${BUNDLED_DIR}/*.whl; do \
+			[ -f "$${wheel}" ] || continue; \
+			whl_name=$$(basename "$${wheel}"); \
+			echo "Pre-installing wheel via zipimport into target sys.path: $${whl_name}"; \
+			echo "../ensurepip/_bundled/$${whl_name}" >> "$${SITE_PACKAGES}/bundled_wheels.pth"; \
+		done; \
+	)
+endif
 
 MODULE    = $(CONFIG_INTERPRETERS_CPYTHON)
 
diff --git a/interpreters/python/Setup.local.in b/interpreters/python/Setup.local.in
index 5ff7cd3fa..0bd116574 100644
--- a/interpreters/python/Setup.local.in
+++ b/interpreters/python/Setup.local.in
@@ -4,7 +4,6 @@
 
 *disabled*
 _asyncio
-_blake2
 _bz2
 _codecs_cn
 _codecs_hk
@@ -15,19 +14,12 @@ _codecs_tw
 _ctypes
 _decimal
 _elementtree
-_hashlib
 _heapq
 _interpchannels
 _interpqueues
 _lsprof
 _lzma
-_md5
 _multibytecodec
-_sha1
-_sha2
-_sha2
-_sha3
-_sha3
 _sqlite3
 _ssl
 _statistics
@@ -41,9 +33,7 @@ _testlimitedcapi
 _uuid
 _xxtestfuzz
 _zoneinfo
-mmap
 pwd
-pyexpat
 readline
 resource
 xxsubtype
diff --git a/interpreters/python/config.site.in b/interpreters/python/config.site.in
index eb37e5a88..52c04725a 100644
--- a/interpreters/python/config.site.in
+++ b/interpreters/python/config.site.in
@@ -21,4 +21,13 @@ export ac_cv_func_pipe="yes"
 export ac_cv_enable_strict_prototypes_warning="no"
 export ac_cv_func_getnameinfo="yes"
 export ac_cv_func_poll="yes"
-export ac_cv_func_gethostname="yes"
\ No newline at end of file
+export ac_cv_func_gethostname="yes"
+export ac_cv_func_lstat="yes"
+export ac_cv_func_readlink="yes"
+export ac_cv_func_realpath="yes"
+export ac_cv_func_getpid="yes"
+export ac_cv_func_utime="yes"
+export ac_cv_func_utimes="yes"
+export ac_cv_func_getuid="yes"
+export ac_cv_func_sysconf="yes"
+export ac_cv_func_umask="yes"
diff --git a/interpreters/python/patch/0015-keep-ensurepip-in-stdlib-archive.patch b/interpreters/python/patch/0015-keep-ensurepip-in-stdlib-archive.patch
new file mode 100644
index 000000000..a74e892ef
--- /dev/null
+++ b/interpreters/python/patch/0015-keep-ensurepip-in-stdlib-archive.patch
@@ -0,0 +1,25 @@
+--- a/Tools/wasm/wasm_assets.py
++++ b/Tools/wasm/wasm_assets.py
+@@ -40,7 +40,6 @@ OMIT_FILES = (
+     # regression tests
+     "test/",
+     # package management
+-    "ensurepip/",
+     "venv/",
+     # other platforms
+     "_aix_support.py",
+@@ -148,6 +147,13 @@ def create_stdlib_zip(
+             if entry.name.endswith(".py") or entry.is_dir():
+                 # writepy() writes .pyc files (bytecode).
+                 pzf.writepy(entry, filterfunc=filterfunc)
++
++        # Preserve ensurepip wheel payloads so `python -m ensurepip` can
++        # bootstrap pip on targets that consume this stdlib zip archive.
++        bundled_wheels = args.srcdir_lib / "ensurepip" / "_bundled"
++        if bundled_wheels.is_dir():
++            for wheel in sorted(bundled_wheels.glob("*.whl")):
++                pzf.write(wheel, arcname=f"ensurepip/_bundled/{wheel.name}")
+ 
+ 
+ def detect_extension_modules(args: argparse.Namespace) -> Dict[str, bool]:
+
diff --git a/interpreters/python/patch/0016-fix-timezone-offset-check-when-time-t-is-unsigned.patch b/interpreters/python/patch/0016-fix-timezone-offset-check-when-time-t-is-unsigned.patch
new file mode 100644
index 000000000..81924297b
--- /dev/null
+++ b/interpreters/python/patch/0016-fix-timezone-offset-check-when-time-t-is-unsigned.patch
@@ -0,0 +1,21 @@
+--- a/Modules/timemodule.c
++++ b/Modules/timemodule.c
+@@ -1800,15 +1800,15 @@ static int
+     static const time_t YEAR = (365 * 24 + 6) * 3600;
+     time_t t;
+     struct tm p;
+-    time_t janzone_t, julyzone_t;
++    long long janzone_t, julyzone_t;
+     char janname[10], julyname[10];
+     t = (time((time_t *)0) / YEAR) * YEAR;
+     _PyTime_localtime(t, &p);
+     get_zone(janname, 9, &p);
+-    janzone_t = -get_gmtoff(t, &p);
++    janzone_t = -(long long)get_gmtoff(t, &p);
+     janname[9] = '\0';
+     t += YEAR/2;
+     _PyTime_localtime(t, &p);
+     get_zone(julyname, 9, &p);
+-    julyzone_t = -get_gmtoff(t, &p);
++    julyzone_t = -(long long)get_gmtoff(t, &p);
+     julyname[9] = '\0';
diff --git a/interpreters/python/patch/0017-stdlib-zip-keep-pydecimal-and-trim-tooling-extras.patch b/interpreters/python/patch/0017-stdlib-zip-keep-pydecimal-and-trim-tooling-extras.patch
new file mode 100644
index 000000000..333bb983a
--- /dev/null
+++ b/interpreters/python/patch/0017-stdlib-zip-keep-pydecimal-and-trim-tooling-extras.patch
@@ -0,0 +1,35 @@
+--- a/Tools/wasm/wasm_assets.py
++++ b/Tools/wasm/wasm_assets.py
+@@ -47,13 +47,20 @@
+     # webbrowser
+     "antigravity.py",
+     "webbrowser.py",
+-    # Pure Python implementations of C extensions
+-    "_pydecimal.py",
++    # Pure Python implementations of C extensions.
++    # NOTE: keep "_pydecimal.py" so decimal.py can fall back to it when the
++    # _decimal C extension is not built (NuttX targets do not link libmpdec).
+     "_pyio.py",
+     # concurrent threading
+     "concurrent/futures/thread.py",
+     # Misc unused or large files
+     "pydoc_data/",
++    # Tooling/REPL extras not needed on a constrained embedded target.
++    "unittest/",
++    "_pyrepl/",
++    "idlelib/",
++    "turtledemo/",
++    "wsgiref/",
+ )
+ 
+ # Synchronous network I/O and protocols are not supported; for example,
+@@ -80,7 +87,8 @@
+     "_asyncio": ["asyncio/"],
+     "_curses": ["curses/"],
+     "_ctypes": ["ctypes/"],
+-    "_decimal": ["decimal.py"],
++    # decimal.py is intentionally NOT omitted here: it ships a pure-Python
++    # fallback (_pydecimal) used when the _decimal C ext is unavailable.
+     "_dbm": ["dbm/ndbm.py"],
+     "_gdbm": ["dbm/gnu.py"],
+     "_json": ["json/"],
diff --git a/interpreters/python/patch/0018-ignore-chmod-on-nuttx-like-wasi.patch b/interpreters/python/patch/0018-ignore-chmod-on-nuttx-like-wasi.patch
new file mode 100644
index 000000000..4e2afb410
--- /dev/null
+++ b/interpreters/python/patch/0018-ignore-chmod-on-nuttx-like-wasi.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tiago Medicci <tiago.medicci@espressif.com>
+Date: Thu, 7 May 2026 14:00:00 -0300
+Subject: [PATCH] posixmodule: ignore chmod on NuttX like WASI
+
+NuttX's tmpfs does not implement chstat, so chmod fails with ENOSYS.
+Apply the same workaround already used for WASI: silently succeed
+when HAVE_CHMOD is not defined.
+
+---
+ Modules/posixmodule.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -3608,8 +3608,8 @@
+ #ifdef HAVE_CHMOD
+         result = chmod(path->narrow, mode);
+-#elif defined(__wasi__)
+-        // WASI SDK 15.0 does not support chmod.
++#elif defined(__wasi__) || defined(__NuttX__)
++        // WASI SDK 15.0 and NuttX do not fully support chmod.
+         // Ignore missing syscall for now.
+         result = 0;
+ #else
diff --git a/interpreters/python/python_wrapper.c b/interpreters/python/python_wrapper.c
index 6617bae98..be7454514 100644
--- a/interpreters/python/python_wrapper.c
+++ b/interpreters/python/python_wrapper.c
@@ -198,5 +198,7 @@ int main(int argc, FAR char *argv[])
 
   setenv("PYTHON_BASIC_REPL", "1", 1);
 
+  setenv("PYTHONPATH", CONFIG_INTERPRETERS_CPYTHON_PYTHONPATH, 1);
+
   return py_bytesmain(argc, argv);
 }
diff --git a/interpreters/python/repack_wheel_add_pyc.py b/interpreters/python/repack_wheel_add_pyc.py
new file mode 100644
index 000000000..fc2d913f7
--- /dev/null
+++ b/interpreters/python/repack_wheel_add_pyc.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: Apache-2.0
+#
+# Repack a wheel in-place: compile pip/*.py to legacy sibling *.pyc (compileall
+# -b: required for zipimport, which does not read PEP 3147 __pycache__/ names),
+# remove the .py sources, and rewrite *.dist-info/RECORD.
+
+from __future__ import annotations
+
+import argparse
+import base64
+import hashlib
+import shutil
+import subprocess
+import sys
+import tempfile
+import zipfile
+from pathlib import Path
+
+
+def wheel_record_hash(data: bytes) -> str:
+    digest = hashlib.sha256(data).digest()
+    return base64.urlsafe_b64encode(digest).decode("ascii").rstrip("=")
+
+
+def wheel_has_pip_py_sources(zf: zipfile.ZipFile) -> bool:
+    return any(n.startswith("pip/") and n.endswith(".py") for n in zf.namelist())
+
+
+def wheel_has_legacy_pip_bytecode(zf: zipfile.ZipFile) -> bool:
+    return "pip/__init__.pyc" in zf.namelist()
+
+
+def strip_pip_py_sources(pip_dir: Path) -> int:
+    """Remove pip/**/*.py after sibling legacy *.pyc exists (compileall -b output)."""
+    removed = 0
+    for path in sorted(pip_dir.rglob("*.py")):
+        if not path.is_file():
+            continue
+        pyc = path.with_suffix(".pyc")
+        if not pyc.is_file():
+            rel = path.relative_to(pip_dir)
+            raise SystemExit(
+                f"missing legacy .pyc for pip/{rel.as_posix()}, refusing to delete source"
+            )
+        path.unlink()
+        removed += 1
+    return removed
+
+
+def rebuild_record(root: Path) -> None:
+    dist_infos = sorted(root.glob("*.dist-info"))
+    if len(dist_infos) != 1:
+        raise SystemExit(
+            f"expected one *.dist-info, got {[p.name for p in dist_infos]}"
+        )
+    di = dist_infos[0]
+    record_path = di / "RECORD"
+    record_rel = f"{di.name}/RECORD"
+    lines: list[str] = []
+    for path in sorted(root.rglob("*")):
+        if not path.is_file():
+            continue
+        rel = path.relative_to(root).as_posix()
+        if rel == record_rel:
+            continue
+        body = path.read_bytes()
+        lines.append(f"{rel},sha256={wheel_record_hash(body)},{len(body)}")
+    lines.append(f"{record_rel},,")
+    record_path.write_text("\n".join(lines) + "\n", encoding="utf-8")
+
+
+def repack(whl_path: Path, *, force: bool) -> None:
+    whl_path = whl_path.resolve()
+    if not whl_path.is_file():
+        raise SystemExit(f"missing wheel: {whl_path}")
+
+    with zipfile.ZipFile(whl_path) as zf:
+        has_py = wheel_has_pip_py_sources(zf)
+        if not has_py:
+            if not wheel_has_legacy_pip_bytecode(zf):
+                raise SystemExit(
+                    "repack_wheel_add_pyc: wheel has no pip/*.py and no pip/__init__.pyc "
+                    "(corrupt or old tool output). Delete the bundled pip-*.whl and rebuild."
+                )
+            if not force:
+                print(
+                    f"repack_wheel_add_pyc: skip (pip already bytecode-only): {whl_path.name}"
+                )
+                return
+
+    tmpdir = tempfile.mkdtemp(prefix="pip-whl-pyc-")
+    try:
+        root = Path(tmpdir)
+        with zipfile.ZipFile(whl_path) as zf:
+            zf.extractall(root)
+
+        pip_dir = root / "pip"
+        if not pip_dir.is_dir():
+            raise SystemExit("wheel has no pip/ top-level package")
+
+        subprocess.run(
+            [sys.executable, "-m", "compileall", "-q", "-f", "-b", str(pip_dir)],
+            cwd=str(root),
+            check=True,
+        )
+        n_py = strip_pip_py_sources(pip_dir)
+        rebuild_record(root)
+
+        out_path = whl_path.with_suffix(whl_path.suffix + ".tmp")
+        with zipfile.ZipFile(out_path, "w", compression=zipfile.ZIP_DEFLATED) as out:
+            for path in sorted(root.rglob("*")):
+                if path.is_file():
+                    arcname = path.relative_to(root).as_posix()
+                    out.write(path, arcname)
+
+        out_path.replace(whl_path)
+        print(
+            f"repack_wheel_add_pyc: bytecode-only pip ({n_py} .py removed) -> {whl_path.name}"
+        )
+    finally:
+        shutil.rmtree(tmpdir, ignore_errors=True)
+
+
+def main() -> None:
+    ap = argparse.ArgumentParser(description=__doc__)
+    ap.add_argument("wheel", type=Path, help="path to .whl (updated in place)")
+    ap.add_argument(
+        "-f",
+        "--force",
+        action="store_true",
+        help="repack even if pip is already .pyc-only",
+    )
+    args = ap.parse_args()
+    repack(args.wheel, force=args.force)
+
+
+if __name__ == "__main__":
+    main()

From f0f7c5ada9f4c92c73acab75c4ef21a38722d689 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Mon, 18 May 2026 12:30:05 +0200
Subject: [PATCH 327/568] wakaama: add support for TLV

add support for LWM2M TLV

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 netutils/wakaama/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/netutils/wakaama/CMakeLists.txt b/netutils/wakaama/CMakeLists.txt
index df3c32c2c..6e5e4f094 100644
--- a/netutils/wakaama/CMakeLists.txt
+++ b/netutils/wakaama/CMakeLists.txt
@@ -78,6 +78,10 @@ if(CONFIG_NETUTILS_WAKAAMA)
     list(APPEND WAKAAMA_DEFINITIONS LWM2M_SUPPORT_SENML_JSON)
   endif()
 
+  if(CONFIG_WAKAAMA_TLV)
+    list(APPEND WAKAAMA_DEFINITIONS LWM2M_SUPPORT_TLV)
+  endif()
+
   list(APPEND WAKAAMA_DEFINITIONS
        LWM2M_COAP_DEFAULT_BLOCK_SIZE=${CONFIG_WAKAAMA_COAP_DEFAULT_BLOCK_SIZE})
 

From ecfc1b5b61ad505aeb0f75a399ed2738d200c459 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Wed, 13 May 2026 21:40:51 +0000
Subject: [PATCH 328/568] nshlib: add chmod and chown builtins

Add minimal chmod/chown support to NSH using the
existing libc/VFS syscall interfaces.

Supported forms:

  - chmod <octal-mode> <path>
  - chown <uid>[:gid] <path>

The chown implementation supports the numeric
ownership forms already handled by the underlying
NuttX chown() implementation, including unchanged
uid/gid semantics via omitted fields.

Only numeric permission modes and numeric uid/gid
forms are supported in this initial implementation.

This adds interactive filesystem permission and
ownership management support to NSH and aligns the
shell more closely with standard POSIX environments.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 nshlib/Kconfig       |  10 ++++
 nshlib/nsh.h         |   6 +++
 nshlib/nsh_command.c |   8 +++
 nshlib/nsh_fscmds.c  | 123 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 147 insertions(+)

diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 1fc34cb21..2d1570b87 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -341,6 +341,16 @@ config NSH_DISABLE_CD
 	bool "Disable cd"
 	default DEFAULT_SMALL
 
+config NSH_DISABLE_CHMOD
+	bool "Disable chmod"
+	default DEFAULT_SMALL
+	depends on FS_PERMISSION
+
+config NSH_DISABLE_CHOWN
+	bool "Disable chown"
+	default DEFAULT_SMALL
+	depends on FS_PERMISSION
+
 config NSH_DISABLE_CP
 	bool "Disable cp"
 	default DEFAULT_SMALL
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 2fb3cf867..7abb7c38f 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -963,6 +963,12 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #ifndef CONFIG_NSH_DISABLE_CAT
   int cmd_cat(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
+#if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHMOD)
+  int cmd_chmod(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#endif
+#if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHOWN)
+  int cmd_chown(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#endif
 #ifndef CONFIG_NSH_DISABLE_CP
   int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index ec3f8a385..23534fbe5 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -168,6 +168,14 @@ static const struct cmdmap_s g_cmdmap[] =
   CMD_MAP("cd",       cmd_cd,       1, 2, "[<dir-path>|-|~|..]"),
 #endif
 
+#if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHMOD)
+  CMD_MAP("chmod",    cmd_chmod,    3, 3, "<octal-mode> <path>"),
+#endif
+
+#if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHOWN)
+  CMD_MAP("chown",    cmd_chown,    3, 3, "[<uid>][:<gid>] <path>"),
+#endif
+
 #ifndef CONFIG_NSH_DISABLE_CP
   CMD_MAP("cp",       cmd_cp,       3, 4, "[-r] <source-path> <dest-path>"),
 #endif
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index a88c1a20d..13daa8258 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -843,6 +843,129 @@ int cmd_cat(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 }
 #endif
 
+/****************************************************************************
+ * Name: cmd_chmod
+ *
+ * Description:
+ *   chmod <octal-mode> <path>
+ *
+ *   Only numeric (octal) modes are supported.
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHMOD)
+int cmd_chmod(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  FAR char *fullpath;
+  FAR char *endptr;
+  long      mode;
+  int       ret = ERROR;
+
+  UNUSED(argc);
+
+  mode = strtol(argv[1], &endptr, 8);
+  if (endptr == argv[1] || *endptr != '\0' || mode < 0 || mode > 0777)
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+      return ERROR;
+    }
+
+  fullpath = nsh_getfullpath(vtbl, argv[2]);
+  if (fullpath != NULL)
+    {
+      ret = chmod(fullpath, (mode_t)mode);
+      if (ret < 0)
+        {
+          nsh_error(vtbl, g_fmtcmdfailed, argv[0], "chmod", NSH_ERRNO);
+        }
+
+      nsh_freefullpath(fullpath);
+    }
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_chown
+ *
+ * Description:
+ *   chown <uid>[:<gid>] <path>
+ *   chown [<uid>]:<gid> <path>
+ *
+ *   Only numeric uid/gid forms are supported.  Empty uid or gid fields
+ *   leave that side unchanged.
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHOWN)
+int cmd_chown(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  FAR const char *spec = argv[1];
+  FAR char       *endptr;
+  FAR char       *fullpath;
+  long            value;
+  uid_t           uid = (uid_t)-1;
+  gid_t           gid = (gid_t)-1;
+  int             ret = ERROR;
+
+  UNUSED(argc);
+
+  value = strtol(spec, &endptr, 10);
+  if (endptr != spec)
+    {
+      if (value < 0)
+        {
+          nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+          return ERROR;
+        }
+
+      uid = (uid_t)value;
+    }
+
+  if (*endptr == ':')
+    {
+      FAR const char *gidstr = endptr + 1;
+      if (*gidstr != '\0')
+        {
+          value = strtol(gidstr, &endptr, 10);
+          if (*endptr != '\0' || value < 0)
+            {
+              nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+              return ERROR;
+            }
+
+          gid = (gid_t)value;
+        }
+    }
+  else if (*endptr != '\0')
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+      return ERROR;
+    }
+
+  if (uid == (uid_t)-1 && gid == (gid_t)-1)
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+      return ERROR;
+    }
+
+  fullpath = nsh_getfullpath(vtbl, argv[2]);
+  if (fullpath != NULL)
+    {
+      ret = lchown(fullpath, uid, gid);
+      if (ret < 0)
+        {
+          nsh_error(vtbl, g_fmtcmdfailed, argv[0], "chown", NSH_ERRNO);
+        }
+
+      nsh_freefullpath(fullpath);
+    }
+
+  return ret;
+}
+#endif
+
 /****************************************************************************
  * Name: cmd_dmesg
  ****************************************************************************/

From e536adaabc92f77ad652a4b1f45986d7ebceb75c Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Sun, 17 May 2026 14:07:13 +0900
Subject: [PATCH 329/568] apps/cmake: Add DEPENDS for Rust-related files.

* Add `DEPENDS` to ensure staticlib rebuilds when Rust-related files change.
* Uses `GLOB_RECURSE` to search for Rust-related files.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 cmake/nuttx_add_rust.cmake | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index 55fce1a8e..c8546f0fa 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -168,6 +168,18 @@ function(nuttx_add_rust)
   # Create build directory
   file(MAKE_DIRECTORY ${RUST_BUILD_DIR})
 
+  # Collect Rust source files and manifests as dependencies so that changes in
+  # the crate trigger a rebuild via CMake/Ninja.
+  file(
+    GLOB_RECURSE
+    RUST_CRATE_SOURCES
+    CONFIGURE_DEPENDS
+    "${CRATE_PATH}/Cargo.toml"
+    "${CRATE_PATH}/Cargo.lock"
+    "${CRATE_PATH}/build.rs"
+    "${CRATE_PATH}/src/*.rs"
+    "${CRATE_PATH}/src/**/*.rs")
+
   # Add a custom command to build the Rust crate
   add_custom_command(
     OUTPUT ${RUST_LIB_PATH}
@@ -178,6 +190,7 @@ function(nuttx_add_rust)
       -Zbuild-std=std,panic_abort -Zjson-target-spec --manifest-path
       ${CRATE_PATH}/Cargo.toml --target ${RUST_TARGET} --target-dir
       ${RUST_BUILD_DIR}
+    DEPENDS ${RUST_CRATE_SOURCES}
     COMMENT "Building Rust crate ${CRATE_NAME}"
     VERBATIM)
 

From 02153debae607b6b7b2b1f093ba7db7d6e3b06e9 Mon Sep 17 00:00:00 2001
From: Shunchao Hu <ankohuu@gmail.com>
Date: Sun, 12 Apr 2026 09:54:32 +0800
Subject: [PATCH 330/568] system/ping: Fallback to ping6 for gethost error
 handling.

When ping only receives an IPv6 DNS response, the current command
reports "ping_gethostip" and exits even though ping6 can still
handle the target.

Keep the existing ping and ping6 netutils interfaces unchanged and
add a one-way fallback in the ping command. If IPv4 name resolution
fails, ping will spawn ping6 with the same arguments and let ping6
report the final result.

Signed-off-by: Shunchao Hu <ankohuu@gmail.com>
---
 system/ping/ping.c | 64 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/system/ping/ping.c b/system/ping/ping.c
index f294983a1..4588393ab 100644
--- a/system/ping/ping.c
+++ b/system/ping/ping.c
@@ -35,6 +35,15 @@
 #include <limits.h>
 #include <fixedmath.h>
 
+#if defined(CONFIG_SYSTEM_PING6) && defined(CONFIG_LIBC_EXECFUNCS)
+#define PING_ENABLE_PING6_FALLBACK
+#endif
+
+#ifdef PING_ENABLE_PING6_FALLBACK
+#include <spawn.h>
+#include <sys/wait.h>
+#endif
+
 #include <nuttx/net/ip.h>
 
 #include "netutils/icmp_ping.h"
@@ -121,8 +130,10 @@ static void ping_result(FAR const struct ping_result_s *result)
   switch (result->code)
     {
       case ICMP_E_HOSTIP:
+#ifndef PING_ENABLE_PING6_FALLBACK
         fprintf(stderr, "ERROR: ping_gethostip(%s) failed\n",
                 result->info->hostname);
+#endif
         break;
 
       case ICMP_E_MEMORY:
@@ -279,6 +290,49 @@ static void ping_result(FAR const struct ping_result_s *result)
     }
 }
 
+#ifdef PING_ENABLE_PING6_FALLBACK
+/****************************************************************************
+ * Name: ping6_fallback
+ ****************************************************************************/
+
+static int ping6_fallback(int argc, FAR char *argv[])
+{
+  pid_t pid;
+  int ret;
+  int status;
+
+  if (argc <= 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  argv[0] = CONFIG_SYSTEM_PING6_PROGNAME;
+
+  ret = posix_spawnp(&pid, CONFIG_SYSTEM_PING6_PROGNAME, NULL, NULL,
+                     argv, NULL);
+  if (ret != 0)
+    {
+      fprintf(stderr, "ERROR: posix_spawnp(%s) failed: %d\n",
+              CONFIG_SYSTEM_PING6_PROGNAME, ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = waitpid(pid, &status, 0);
+  if (ret < 0)
+    {
+      fprintf(stderr, "ERROR: waitpid() failed: %d\n", errno);
+      return EXIT_FAILURE;
+    }
+
+  if (WIFEXITED(status))
+    {
+      return WEXITSTATUS(status);
+    }
+
+  return EXIT_FAILURE;
+}
+#endif
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -403,7 +457,15 @@ int main(int argc, FAR char *argv[])
 
   info.hostname = argv[optind];
   icmp_ping(&info);
-  return priv.code < 0 ? EXIT_FAILURE: EXIT_SUCCESS;
+
+#ifdef PING_ENABLE_PING6_FALLBACK
+  if (priv.code == ICMP_E_HOSTIP)
+    {
+      return ping6_fallback(argc, argv);
+    }
+#endif
+
+  return priv.code < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
 errout_with_usage:
   optind = 0;

From 173e19cde118546c5d3180e1a4b5c3c53a765142 Mon Sep 17 00:00:00 2001
From: Eren Terzioglu <eren.terzioglu@espressif.com>
Date: Wed, 29 Apr 2026 10:27:12 +0200
Subject: [PATCH 331/568] apps/examples: Add path option to SPI Slave test

Add path option to spislv_test example

Signed-off-by: Eren Terzioglu <eren.terzioglu@espressif.com>
---
 examples/spislv_test/Kconfig       |  6 +++
 examples/spislv_test/spislv_test.c | 84 ++++++++++++++++++------------
 2 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/examples/spislv_test/Kconfig b/examples/spislv_test/Kconfig
index ab273e0aa..54dd827c5 100644
--- a/examples/spislv_test/Kconfig
+++ b/examples/spislv_test/Kconfig
@@ -12,6 +12,12 @@ config EXAMPLES_SPISLV
 
 if EXAMPLES_SPISLV
 
+config EXAMPLES_SPISLV_DEFAULT_PATH
+	string "Default SPI Slave device path"
+	default "/dev/spislv0"
+	---help---
+		Default path for SPI Slave device
+
 config EXAMPLES_SPISLV_PROGNAME
 	string "Program name"
 	default "spislv"
diff --git a/examples/spislv_test/spislv_test.c b/examples/spislv_test/spislv_test.c
index 2ad13c236..dcde9fe3a 100644
--- a/examples/spislv_test/spislv_test.c
+++ b/examples/spislv_test/spislv_test.c
@@ -40,7 +40,7 @@
 /* Define buffer sizes */
 #define RX_BUFFER_SIZE 64
 #define TX_BUFFER_SIZE 64
-#define SOURCE_FILE "dev/spislv2" /* SPI device path */
+#define DEFAULT_SPI_PATH CONFIG_EXAMPLES_SPISLV_DEFAULT_PATH
 
 /* Enumeration for operation modes */
 
@@ -61,6 +61,7 @@ typedef struct
   operation_mode_t mode;
   int num_bytes;            /* Applicable for write mode */
   int timeout_seconds;      /* Applicable for all modes */
+  const char *spi_path;     /* SPI slave device path */
   unsigned char tx_buffer[TX_BUFFER_SIZE];
 } program_config_t;
 
@@ -68,6 +69,33 @@ typedef struct
  * Private Functions
  ****************************************************************************/
 
+static void print_usage(const char *progname)
+{
+  fprintf(stderr, "Usage:\n");
+  fprintf(stderr, "  %s -x <num_bytes> [-p <path>] [-t <sec>] <hex_bytes>\n",
+          progname);
+  fprintf(stderr, "  %s -l [-p <path>] [-t <sec>]\n", progname);
+  fprintf(stderr, "  %s -e [-p <path>] [-t <sec>]\n", progname);
+  fprintf(stderr, "\n");
+  fprintf(stderr, "Options:\n");
+  fprintf(stderr, "  -p  SPI slave device path  [default: %s]\n",
+          DEFAULT_SPI_PATH);
+  fprintf(stderr,
+          "  -t  Timeout in seconds  [default: 10]\n");
+  fprintf(stderr,
+          "  -x  Number of bytes to queue <hex_bytes>\n");
+  fprintf(stderr,
+          "  -l  Only listen for data from the master\n");
+  fprintf(stderr,
+          "  -e  Echo received data back to the master\n");
+  fprintf(stderr, "\n");
+  fprintf(stderr, "Examples:\n");
+  fprintf(stderr, "  %s -x 2 abba\n", progname);
+  fprintf(stderr, "  %s -l -t 5\n", progname);
+  fprintf(stderr, "  %s -e -t 10\n", progname);
+  fprintf(stderr, "  %s -p /dev/spislv2 -l\n", progname);
+}
+
 /**
  * @brief Converts a single hexadecimal character to its byte value.
  *
@@ -148,13 +176,25 @@ static int parse_arguments(int argc, char *argv[],
   config->mode           = MODE_INVALID;
   config->num_bytes      = 0;
   config->timeout_seconds = 10; /* Default timeout */
+  config->spi_path       = DEFAULT_SPI_PATH;
 
   /* Parse command-line options */
 
-  while ((opt = getopt(argc, argv, "x:t:le")) != -1)
+  while ((opt = getopt(argc, argv, "p:x:t:le")) != -1)
     {
       switch (opt)
         {
+          case 'p':
+            if (optarg[0] == '\0')
+              {
+                fprintf(stderr,
+                        "Error: SPI device path (-p) must not be empty.\n");
+                return -1;
+              }
+
+            config->spi_path = optarg;
+            break;
+
           case 'x':
             if (config->mode != MODE_INVALID)
               {
@@ -208,18 +248,7 @@ static int parse_arguments(int argc, char *argv[],
             break;
 
           default:
-            fprintf(stderr, "Usage:\n");
-            fprintf(stderr,
-        "  %s -x <num_bytes> [-t <timeout_seconds>] <hex_bytes>\n",
-                    argv[0]);
-            fprintf(stderr,
-                    "  %s -l [-t <timeout_seconds>]\n", argv[0]);
-            fprintf(stderr,
-                    "  %s -e [-t <timeout_seconds>]\n", argv[0]);
-            printf("Examples:\n");
-            printf("  spislv -x 2 abba\n");
-            printf("  spislv -l -t 5\n");
-            printf("  spislv -e -t 10\n\n");
+            print_usage(argv[0]);
             return -1;
         }
     }
@@ -232,9 +261,7 @@ static int parse_arguments(int argc, char *argv[],
         {
           fprintf(stderr,
                   "Error: Missing hexadecimal bytes to send.\n");
-          fprintf(stderr,
-        "Usage: %s -x <num_bytes> [-t <timeout_seconds>] <hex_bytes>\n",
-                  argv[0]);
+          print_usage(argv[0]);
           return -1;
         }
 
@@ -265,18 +292,7 @@ static int parse_arguments(int argc, char *argv[],
   else if (config->mode == MODE_INVALID)
     {
       fprintf(stderr, "Error: No operation mode specified.\n");
-      fprintf(stderr, "Usage:\n");
-      fprintf(stderr,
-        "  %s -x <num_bytes> [-t <timeout_seconds>] <hex_bytes>\n",
-              argv[0]);
-      fprintf(stderr,
-              "  %s -l [-t <timeout_seconds>]\n", argv[0]);
-      fprintf(stderr,
-              "  %s -e [-t <timeout_seconds>]\n", argv[0]);
-      printf("Examples:\n");
-      printf("  spislv -x 2 abba\n");
-      printf("  spislv -l -t 5\n");
-      printf("  spislv -e -t 10\n");
+      print_usage(argv[0]);
       return -1;
     }
 
@@ -320,7 +336,7 @@ static int write_mode(program_config_t *config, int fd)
   if (bytes_written < 0)
     {
       fprintf(stderr, "Error: Failed to write to %s: %s\n",
-              SOURCE_FILE, strerror(errno));
+              config->spi_path, strerror(errno));
       return -1;
     }
 
@@ -426,7 +442,7 @@ static int read_with_timeout(program_config_t *config, int fd)
           if (bytes_read < 0)
             {
               fprintf(stderr, "Error: Failed to read from %s: %s\n",
-                      SOURCE_FILE, strerror(errno));
+                      config->spi_path, strerror(errno));
               return -1;
             }
 
@@ -453,7 +469,7 @@ static int read_with_timeout(program_config_t *config, int fd)
                     {
                       fprintf(stderr,
                               "Error: Failed to write to %s: %s\n",
-                              SOURCE_FILE, strerror(errno));
+                              config->spi_path, strerror(errno));
                       return -1;
                     }
                   else if (bytes_written != bytes_read)
@@ -503,11 +519,11 @@ int main(int argc, char *argv[])
       return -1;
     }
 
-  fd = open(SOURCE_FILE, O_RDWR);
+  fd = open(config.spi_path, O_RDWR);
   if (fd < 0)
     {
       fprintf(stderr, "Error: Failed to open %s: %s\n",
-              SOURCE_FILE, strerror(errno));
+              config.spi_path, strerror(errno));
       return -1;
     }
 

From 43bc7e99d6453cdd0e925ae5128574012f5198e0 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Wed, 20 May 2026 13:22:49 +0200
Subject: [PATCH 332/568] system/nxdiag: add CMake support for NXDiag tool

Supports building NXDiag with CMake.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 system/nxdiag/CMakeLists.txt | 102 +++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 system/nxdiag/CMakeLists.txt

diff --git a/system/nxdiag/CMakeLists.txt b/system/nxdiag/CMakeLists.txt
new file mode 100644
index 000000000..ec0cd116c
--- /dev/null
+++ b/system/nxdiag/CMakeLists.txt
@@ -0,0 +1,102 @@
+# ##############################################################################
+# apps/system/nxdiag/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_NXDIAG)
+
+  find_program(PYTHON3 python3)
+  if(NOT PYTHON3)
+    message(FATAL_ERROR "python3 not found in PATH (required for nxdiag)")
+  endif()
+
+  set(NXDIAG_TOOLSDIR ${NUTTX_DIR}/tools)
+  set(NXDIAG_SYSINFO ${CMAKE_CURRENT_SOURCE_DIR}/sysinfo.h)
+
+  # Build host_info_dump.py argument list
+
+  set(NXDIAG_FLAGS ${NUTTX_DIR})
+
+  if(CONFIG_SYSTEM_NXDIAG_CONF)
+    list(APPEND NXDIAG_FLAGS --config)
+  endif()
+
+  if(CONFIG_SYSTEM_NXDIAG_COMP_FLAGS)
+    list(APPEND NXDIAG_FLAGS --flags "${CMAKE_C_FLAGS}" "${CMAKE_CXX_FLAGS}"
+         "${CMAKE_EXE_LINKER_FLAGS}")
+  endif()
+
+  if(CONFIG_SYSTEM_NXDIAG_HOST_PACKAGES)
+    list(APPEND NXDIAG_FLAGS --packages)
+  endif()
+
+  if(CONFIG_SYSTEM_NXDIAG_HOST_MODULES)
+    list(APPEND NXDIAG_FLAGS --modules)
+  endif()
+
+  if(CONFIG_SYSTEM_NXDIAG_HOST_PATH)
+    list(APPEND NXDIAG_FLAGS --path)
+  endif()
+
+  if(CONFIG_SYSTEM_NXDIAG_VERBOSE)
+    list(APPEND NXDIAG_FLAGS --verbose)
+  endif()
+
+  set(NXDIAG_PY_FLAGS "")
+
+  # Vendor-specific checks
+
+  if(CONFIG_SYSTEM_NXDIAG_ESPRESSIF)
+    list(APPEND NXDIAG_FLAGS --target_info)
+    list(APPEND NXDIAG_PY_FLAGS -B)
+  endif()
+
+  # Generate sysinfo.h
+
+  add_custom_command(
+    OUTPUT ${NXDIAG_SYSINFO}
+    COMMAND ${PYTHON3} ${NXDIAG_PY_FLAGS} ${NXDIAG_TOOLSDIR}/host_info_dump.py
+            ${NXDIAG_FLAGS} -b ${CMAKE_BINARY_DIR} > ${NXDIAG_SYSINFO}
+    DEPENDS ${NXDIAG_TOOLSDIR}/host_info_dump.py
+    COMMENT "Generating nxdiag sysinfo.h"
+    VERBATIM)
+
+  add_custom_target(nxdiag_sysinfo_gen DEPENDS ${NXDIAG_SYSINFO})
+
+  nuttx_add_application(
+    NAME
+    nxdiag
+    SRCS
+    nxdiag.c
+    PRIORITY
+    ${CONFIG_SYSTEM_NXDIAG_PRIORITY}
+    STACKSIZE
+    ${CONFIG_SYSTEM_NXDIAG_STACKSIZE}
+    INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS
+    nxdiag_sysinfo_gen)
+
+  set_property(
+    DIRECTORY ${CMAKE_SOURCE_DIR}
+    APPEND
+    PROPERTY ADDITIONAL_CLEAN_FILES ${NXDIAG_SYSINFO})
+
+endif()

From bda34481067a3d27508cd0edcd837e931d97bb3e Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 21 May 2026 10:40:34 +0530
Subject: [PATCH 333/568] apps/system/microros: Create empty library skeleton.

Add Make.defs with copyright header for the micro-ROS library
build system. This establishes the directory structure for Phase 2,
with actual build logic to follow in subsequent steps.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/Make.defs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 system/microros/Make.defs

diff --git a/system/microros/Make.defs b/system/microros/Make.defs
new file mode 100644
index 000000000..5ec456770
--- /dev/null
+++ b/system/microros/Make.defs
@@ -0,0 +1,21 @@
+############################################################################
+# apps/system/microros/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################

From 2a3a41d53af6cefcd357954839c110703347e214 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 21 May 2026 10:40:38 +0530
Subject: [PATCH 334/568] apps/system/microros: Add Kconfig with configuration
 options.

Add Kconfig file defining CONFIG_SYSTEM_MICROROS and related options:
- MICROROS_DISTRO: ROS 2 distribution selection (default jazzy)
- MICROROS_TRANSPORT_UDP/SERIAL: Transport method selection
- MICROROS_AGENT_IP/PORT: UDP agent address configuration
- MICROROS_SERIAL_DEVICE/BAUD: Serial transport configuration
- Resource limits: MAX_NODES, MAX_PUBLISHERS, MAX_SUBSCRIPTIONS,
  MAX_SERVICES, MAX_CLIENTS

Allows menuconfig integration for micro-ROS library configuration.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/Kconfig | 102 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 system/microros/Kconfig

diff --git a/system/microros/Kconfig b/system/microros/Kconfig
new file mode 100644
index 000000000..d1d7d562a
--- /dev/null
+++ b/system/microros/Kconfig
@@ -0,0 +1,102 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+menuconfig SYSTEM_MICROROS
+	bool "micro-ROS Integration"
+	default n
+	depends on NET_UDP || SERIAL_TERMIOS
+	---help---
+		Enable micro-ROS integration for NuttX RTOS. Provides a ROS 2
+		client library for embedded and real-time systems.
+
+if SYSTEM_MICROROS
+
+config MICROROS_DISTRO
+	string "ROS 2 Distribution"
+	default "jazzy"
+	---help---
+		Specifies the ROS 2 distribution branch (e.g., humble, jazzy, kilted).
+		This determines which versions of micro-ROS packages are fetched.
+
+choice
+	prompt "Transport Method"
+	default MICROROS_TRANSPORT_UDP
+
+config MICROROS_TRANSPORT_UDP
+	bool "UDP Transport"
+	---help---
+		Use UDP socket for communication with micro-ROS agent.
+
+config MICROROS_TRANSPORT_SERIAL
+	bool "Serial Transport"
+	depends on SERIAL_TERMIOS
+	---help---
+		Use serial (UART/USB-CDC) for communication with micro-ROS agent.
+
+endchoice
+
+if MICROROS_TRANSPORT_UDP
+
+config MICROROS_AGENT_IP
+	string "Agent IP Address"
+	default "10.42.0.214"
+	---help---
+		IP address of the micro-ROS agent.
+
+config MICROROS_AGENT_PORT
+	int "Agent Port"
+	default 8888
+	---help---
+		UDP port of the micro-ROS agent.
+
+endif
+
+if MICROROS_TRANSPORT_SERIAL
+
+config MICROROS_SERIAL_DEVICE
+	string "Serial Device Path"
+	default "/dev/ttyS0"
+	---help---
+		Serial device to use for transport (e.g., /dev/ttyS0, /dev/ttyACM0).
+
+config MICROROS_SERIAL_BAUD
+	int "Serial Baud Rate"
+	default 115200
+	---help---
+		Baud rate for serial communication.
+
+endif
+
+config MICROROS_MAX_NODES
+	int "Maximum Nodes"
+	default 1
+	---help---
+		Maximum number of ROS nodes that can be created.
+
+config MICROROS_MAX_PUBLISHERS
+	int "Maximum Publishers"
+	default 5
+	---help---
+		Maximum number of publishers per node.
+
+config MICROROS_MAX_SUBSCRIPTIONS
+	int "Maximum Subscriptions"
+	default 5
+	---help---
+		Maximum number of subscriptions per node.
+
+config MICROROS_MAX_SERVICES
+	int "Maximum Services"
+	default 1
+	---help---
+		Maximum number of services per node.
+
+config MICROROS_MAX_CLIENTS
+	int "Maximum Clients"
+	default 1
+	---help---
+		Maximum number of service clients per node.
+
+endif

From 0be492889355a88c8885588ec71aabc8e06cc668 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 21 May 2026 10:40:41 +0530
Subject: [PATCH 335/568] apps/system/microros: Add Makefile skeleton.

Add Makefile with standard NuttX build system integration. Follows
the MENUDESC + Directory.mk pattern used throughout nuttx-apps.
Enables the system/microros module to be built as part of the apps
directory build process.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/Makefile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 system/microros/Makefile

diff --git a/system/microros/Makefile b/system/microros/Makefile
new file mode 100644
index 000000000..b907087ee
--- /dev/null
+++ b/system/microros/Makefile
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/microros/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+MENUDESC = "micro-ROS Library"
+
+include $(APPDIR)/Directory.mk

From faf07ed3b07ed2e10e2aae8d93f1bfddfec37c6f Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 21 May 2026 10:40:44 +0530
Subject: [PATCH 336/568] apps/system/microros: Add .gitignore for library
 build artifacts.

Ignore build outputs and generated files:
- Directories: micro_ros_src/, micro_ros_dev/, build/, install/
- Build outputs: libmicroros.a, toolchain.cmake, colcon.meta
- Archives: *.tar.gz

Prevents build artifacts and downloaded sources from being committed.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/.gitignore | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 system/microros/.gitignore

diff --git a/system/microros/.gitignore b/system/microros/.gitignore
new file mode 100644
index 000000000..878b0e80a
--- /dev/null
+++ b/system/microros/.gitignore
@@ -0,0 +1,13 @@
+# Build artifacts
+/build/
+/install/
+/micro_ros_dev/
+/micro_ros_src/
+
+# Generated files
+/libmicroros.a
+/toolchain.cmake
+/colcon.meta
+
+# Archives
+*.tar.gz

From e9d1141f7c12220a8577feccbd22ba6e78ec70f8 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Thu, 21 May 2026 10:43:35 +0530
Subject: [PATCH 337/568] apps/system/microros: Add CMakeLists.txt for CMake
 support.

Add CMakeLists.txt file for CMake build system integration.
Enables the micro-ROS library module to be built using NuttX CMake
build system alongside traditional Make-based builds.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/CMakeLists.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 system/microros/CMakeLists.txt

diff --git a/system/microros/CMakeLists.txt b/system/microros/CMakeLists.txt
new file mode 100644
index 000000000..9edae8cef
--- /dev/null
+++ b/system/microros/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ##############################################################################
+# apps/system/microros/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_MICROROS)
+  nuttx_add_library(microros)
+endif()

From f9f59bd0f86a97f873496736e942f594b0c546c1 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Mon, 11 May 2026 17:51:35 +0800
Subject: [PATCH 338/568] !apps: drop redundant casts on tv_sec/tv_nsec and fix
 printf formats

Now that time_t is unconditionally 64-bit (signed int64_t) and the
struct timespec fields tv_sec / tv_nsec are wide enough on their own,
the explicit (uint64_t)/(int64_t)/(int) casts that used to guard the
multiplications and subtractions in *_us / *_ms / *_ns helpers are no
longer needed.  Drop them to keep the timekeeping math readable.

In the same spirit, this commit also normalises the printf-style format
specifiers and casts used to print tv_sec / tv_nsec / tv_usec values.
The prior code was a mix of "%d"/"%u"/"%ld"/"%lu"/"%lld" with matching
(int)/(unsigned long)/(long long) casts; some formats truncated time_t
on 32-bit hosts, others mismatched signedness or width.  Replace all
such cases with the portable POSIX-recommended forms:

  - tv_sec  (time_t,       signed, impl-defined width) -> %jd  + (intmax_t)
  - tv_nsec (long,         signed)                     -> %ld  (no cast)
  - tv_usec (suseconds_t / long)                       -> %ld  (no cast)

Also drop two stale `(FAR const time_t *)&ts.tv_sec` casts that are
unnecessary now that ts.tv_sec is plain time_t.

Arithmetic-cleanup files (existing scope):

  - benchmarks/cyclictest/cyclictest.c:        timediff_us()
  - benchmarks/sd_bench/sd_bench_main.c:       get_time_delta_us()
  - examples/oneshot/oneshot_main.c:           maxus computation
  - examples/watchdog/watchdog_main.c:         current_time_ms (x2)
  - industry/nxmodbus/nxmb_internal.h:         nxmb_util_clock_ms()
  - netutils/ntpclient/ntpclient.c:            timespec2ntp()
  - netutils/ptpd/ptpd.c:                      ptp_adjtime()
  - system/dd/dd_main.c:                       elapsed accounting
  - testing/drivers/drivertest/drivertest_posix_timer.c:
                                               get_timestamp()
  - testing/drivers/sd_stress/sd_stress_main.c:get_time_delta()
  - testing/sched/getprime/getprime_main.c:    elapsed accounting
  - testing/sched/pthread_mutex_perf/pthread_mutex_perf.c:
                                               timespec_avg()

Printf-format-fix files (new in this revision):

  - examples/adjtime/adjtime_main.c
  - examples/charger/charger_main.c
  - examples/netpkt/netpkt_ethercat.c
  - fsutils/mkfatfs/mkfatfs.c
  - graphics/tiff/tiff_initialize.c
  - netutils/ptpd/ptpd.c
  - nshlib/nsh_timcmds.c
  - system/coredump/coredump.c
  - system/ptpd/ptpd_main.c
  - testing/drivers/drivertest/drivertest_oneshot.c
  - testing/mm/kasantest/kasantest.c
  - testing/ostest/semtimed.c
  - testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
  - testing/sched/timerjitter/timerjitter.c
  - testing/testsuites/kernel/time/cases/clock_test_clock01.c
  - testing/testsuites/kernel/time/cases/clock_test_smoke.c

No behavioural change.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 benchmarks/cyclictest/cyclictest.c            |  8 ++---
 benchmarks/sd_bench/sd_bench_main.c           |  4 +--
 examples/adjtime/adjtime_main.c               |  9 +++---
 examples/charger/charger_main.c               |  4 +--
 examples/netpkt/netpkt_ethercat.c             |  7 +++--
 examples/oneshot/oneshot_main.c               |  4 +--
 examples/watchdog/watchdog_main.c             |  6 ++--
 fsutils/mkfatfs/mkfatfs.c                     |  2 +-
 graphics/nxwm/src/chexcalculator.cxx          |  6 ++--
 graphics/tiff/tiff_initialize.c               |  2 +-
 industry/nxmodbus/nxmb_internal.h             |  2 +-
 .../usock_handlers/alt1250_ioctl_lwm2m.c      |  2 +-
 netutils/ntpclient/ntpclient.c                | 20 ++++++------
 netutils/ptpd/ptpd.c                          | 20 ++++++------
 nshlib/nsh_timcmds.c                          | 13 ++++----
 system/coredump/coredump.c                    |  4 +--
 system/dd/dd_main.c                           |  4 +--
 system/ptpd/ptpd_main.c                       | 31 ++++++++++---------
 system/resmonitor/filldisk.c                  | 20 ++++++------
 .../drivers/drivertest/drivertest_oneshot.c   |  2 +-
 .../drivertest/drivertest_posix_timer.c       |  2 +-
 testing/drivers/sd_stress/sd_stress_main.c    |  6 ++--
 testing/mm/kasantest/kasantest.c              |  6 ++--
 testing/ostest/semtimed.c                     | 17 +++++-----
 testing/sched/getprime/getprime_main.c        |  4 +--
 .../pthread_mutex_perf/pthread_mutex_perf.c   | 17 +++++-----
 testing/sched/timerjitter/timerjitter.c       |  5 +--
 .../kernel/syscall/cases/pread_test.c         |  8 ++---
 .../kernel/syscall/cases/truncate_test.c      |  4 +--
 .../kernel/syscall/cases/write_test.c         |  8 ++---
 .../kernel/time/cases/clock_test_clock01.c    | 12 +++----
 .../kernel/time/cases/clock_test_smoke.c      | 24 +++++++-------
 32 files changed, 144 insertions(+), 139 deletions(-)

diff --git a/benchmarks/cyclictest/cyclictest.c b/benchmarks/cyclictest/cyclictest.c
index 1727c54f1..fb9382dd5 100644
--- a/benchmarks/cyclictest/cyclictest.c
+++ b/benchmarks/cyclictest/cyclictest.c
@@ -443,8 +443,8 @@ static inline void tsnorm(struct timespec *ts)
 static inline int64_t timediff_us(struct timespec t1, struct timespec t2)
 {
   int64_t ret;
-  ret = 1000000 * (int64_t) ((int) t1.tv_sec - (int) t2.tv_sec);
-  ret += (int64_t) ((int) t1.tv_nsec - (int) t2.tv_nsec) / 1000;
+  ret = 1000000 * (t1.tv_sec - t2.tv_sec);
+  ret += (t1.tv_nsec - t2.tv_nsec) / 1000;
   return ret;
 }
 
@@ -458,11 +458,11 @@ static inline int64_t timediff_us_timer(struct timer_status_s after,
   t2 = after.timeleft;
   if (t2 < t1)
     {
-      ret = (int64_t) (t1 - t2);
+      ret = t1 - t2;
     }
   else
     {
-      ret = (int64_t) (after.timeout - (t2 - t1));
+      ret = after.timeout - (t2 - t1);
     }
 
   return ret;
diff --git a/benchmarks/sd_bench/sd_bench_main.c b/benchmarks/sd_bench/sd_bench_main.c
index 8a48a9128..44d30fa63 100644
--- a/benchmarks/sd_bench/sd_bench_main.c
+++ b/benchmarks/sd_bench/sd_bench_main.c
@@ -130,8 +130,8 @@ static uint64_t get_time_delta_us(const struct timespec *start,
                                   const struct timespec *end)
 {
   uint64_t elapsed;
-  elapsed = (((uint64_t)end->tv_sec * NSEC_PER_SEC) + end->tv_nsec);
-  elapsed -= (((uint64_t)start->tv_sec * NSEC_PER_SEC) + start->tv_nsec);
+  elapsed = (end->tv_sec * NSEC_PER_SEC) + end->tv_nsec;
+  elapsed -= (start->tv_sec * NSEC_PER_SEC) + start->tv_nsec;
   return elapsed / 1000.;
 }
 
diff --git a/examples/adjtime/adjtime_main.c b/examples/adjtime/adjtime_main.c
index 17eda10f5..fefe80567 100644
--- a/examples/adjtime/adjtime_main.c
+++ b/examples/adjtime/adjtime_main.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <sys/time.h>
 
@@ -149,8 +150,8 @@ int main(int argc, FAR char *argv[])
 
   parse_args(&delta, argc, argv);
 
-  printf("Delta time is %ld seconds and %ld micro seconds.\n",
-         (long)delta.tv_sec, delta.tv_usec);
+  printf("Delta time is %jd seconds and %ld micro seconds.\n",
+         (intmax_t)delta.tv_sec, delta.tv_usec);
 
   /* Call adjtime function. */
 
@@ -161,8 +162,8 @@ int main(int argc, FAR char *argv[])
     }
   else
     {
-      printf("Returned olddelta is %ld seconds and %ld micro seconds.\n",
-             (long)olddelta.tv_sec, olddelta.tv_usec);
+      printf("Returned olddelta is %jd seconds and %ld micro seconds.\n",
+             (intmax_t)olddelta.tv_sec, olddelta.tv_usec);
     }
 
   return ret;
diff --git a/examples/charger/charger_main.c b/examples/charger/charger_main.c
index baac2f27e..2184ea9d5 100644
--- a/examples/charger/charger_main.c
+++ b/examples/charger/charger_main.c
@@ -231,8 +231,8 @@ int main(int argc, FAR char *argv[])
     }
 
   gettimeofday(&tv, NULL);
-  printf("%ju.%06ld: %d mV, %d mA\n",
-         (uintmax_t)tv.tv_sec, tv.tv_usec, voltage, current);
+  printf("%jd.%06ld: %d mV, %d mA\n",
+         (intmax_t)tv.tv_sec, tv.tv_usec, voltage, current);
 
   close(fd);
 
diff --git a/examples/netpkt/netpkt_ethercat.c b/examples/netpkt/netpkt_ethercat.c
index 6ed6ae8d9..ea24791a7 100644
--- a/examples/netpkt/netpkt_ethercat.c
+++ b/examples/netpkt/netpkt_ethercat.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <time.h>
 
@@ -118,9 +119,9 @@ int main(int argc, FAR const char *argv[])
 
       len = recvfrom(sockfd, recvbuff, 100, 0, NULL, NULL);
       clock_gettime(CLOCK_REALTIME, &recv_time);
-      printf("Data recv: %d bytes, spent time %ld ns\n", len,
-              (recv_time.tv_sec - send_time.tv_sec) * NSEC_PER_SEC +
-              recv_time.tv_nsec - send_time.tv_nsec);
+      printf("Data recv: %d bytes, spent time %jd ns\n", len,
+             (intmax_t)(recv_time.tv_sec - send_time.tv_sec) *
+             NSEC_PER_SEC + recv_time.tv_nsec - send_time.tv_nsec);
       usleep(1000);
     }
 
diff --git a/examples/oneshot/oneshot_main.c b/examples/oneshot/oneshot_main.c
index 50760e360..00fac3f2d 100644
--- a/examples/oneshot/oneshot_main.c
+++ b/examples/oneshot/oneshot_main.c
@@ -167,8 +167,8 @@ int main(int argc, FAR char *argv[])
       return EXIT_FAILURE;
     }
 
-  maxus = (uint64_t)ts.tv_sec * USEC_PER_SEC +
-          (uint64_t)ts.tv_nsec / NSEC_PER_USEC;
+  maxus = ts.tv_sec * USEC_PER_SEC +
+          ts.tv_nsec / NSEC_PER_USEC;
 
   printf("Maximum delay is %" PRIu64 "\n", maxus);
 
diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c
index 4e22001a1..1167f3116 100644
--- a/examples/watchdog/watchdog_main.c
+++ b/examples/watchdog/watchdog_main.c
@@ -308,8 +308,7 @@ int main(int argc, FAR char *argv[])
       /* Get current time to calculate the elapsed time */
 
       clock_gettime(CLOCK_REALTIME, &tnow);
-      current_time_ms = (uint64_t)((tnow.tv_sec * 1000)
-                                    + (tnow.tv_nsec / 1000000));
+      current_time_ms = (tnow.tv_sec * 1000) + (tnow.tv_nsec / 1000000);
     }
 
   /* Then stop pinging */
@@ -345,8 +344,7 @@ int main(int argc, FAR char *argv[])
       /* Get current time to calculate the elapsed time */
 
       clock_gettime(CLOCK_REALTIME, &tnow);
-      current_time_ms = (uint64_t)((tnow.tv_sec * 1000)
-                                    + (tnow.tv_nsec / 1000000));
+      current_time_ms = (tnow.tv_sec * 1000) + (tnow.tv_nsec / 1000000);
     }
 
   /* We should not get here */
diff --git a/fsutils/mkfatfs/mkfatfs.c b/fsutils/mkfatfs/mkfatfs.c
index 8b2227e02..629d6bb76 100644
--- a/fsutils/mkfatfs/mkfatfs.c
+++ b/fsutils/mkfatfs/mkfatfs.c
@@ -92,7 +92,7 @@ static uint32_t fat_systime2fattime(void)
     {
       /* Break done the seconds in date and time units */
 
-      if (gmtime_r((FAR const time_t *)&ts.tv_sec, &tm) != NULL)
+      if (gmtime_r(&ts.tv_sec, &tm) != NULL)
         {
           /* FAT can only represent dates since 1980.  struct tm can
            * represent dates since 1900.
diff --git a/graphics/nxwm/src/chexcalculator.cxx b/graphics/nxwm/src/chexcalculator.cxx
index f2cf62018..3ba68eac3 100644
--- a/graphics/nxwm/src/chexcalculator.cxx
+++ b/graphics/nxwm/src/chexcalculator.cxx
@@ -734,7 +734,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
 
               if (m_result)
                 {
-                  m_accum = (uint64_t)g_keyDesc[index].value;
+                  m_accum = g_keyDesc[index].value;
                 }
 
               // Otherwise, add the new value to the accumulator.  The way
@@ -743,12 +743,12 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
               else if (m_hexMode)
                 {
                   m_accum <<= 4;
-                  m_accum |= (uint64_t)g_keyDesc[index].value;
+                  m_accum |= g_keyDesc[index].value;
                 }
               else
                 {
                   m_accum *= 10;
-                  m_accum += (uint64_t)g_keyDesc[index].value;
+                  m_accum += g_keyDesc[index].value;
                 }
               updateText();
             }
diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c
index 2c4f5921a..5ce27cac4 100644
--- a/graphics/tiff/tiff_initialize.c
+++ b/graphics/tiff/tiff_initialize.c
@@ -434,7 +434,7 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
 
   /* Break the current time up into the format needed by strftime */
 
-  gmtime_r((FAR const time_t *)&ts.tv_sec, &tm);
+  gmtime_r(&ts.tv_sec, &tm);
 
   /* Convert the current time to TIFF format */
 
diff --git a/industry/nxmodbus/nxmb_internal.h b/industry/nxmodbus/nxmb_internal.h
index 0ec3db5c9..6e781bd04 100644
--- a/industry/nxmodbus/nxmb_internal.h
+++ b/industry/nxmodbus/nxmb_internal.h
@@ -205,7 +205,7 @@ static inline uint64_t nxmb_util_clock_ms(void)
   struct timespec ts;
 
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  return (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+  return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
 }
 
 /****************************************************************************
diff --git a/lte/alt1250/usock_handlers/alt1250_ioctl_lwm2m.c b/lte/alt1250/usock_handlers/alt1250_ioctl_lwm2m.c
index e68704a87..3e76e43bd 100644
--- a/lte/alt1250/usock_handlers/alt1250_ioctl_lwm2m.c
+++ b/lte/alt1250/usock_handlers/alt1250_ioctl_lwm2m.c
@@ -610,7 +610,7 @@ static int perform_m2m_applysetting(FAR struct alt1250_s *dev,
     }
 
   *usock_result = OK;
-  dev->lwm2m_apply_xid = (int64_t)xid;
+  dev->lwm2m_apply_xid = xid;
 
   MODEM_STATE_INTENTRST(dev);
   altdevice_reset(dev->altfd);
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index 3d2b50e02..5a48b0586 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -567,7 +567,7 @@ static int32_t ntp_nsecpart(int64_t time)
 {
   /* Get fraction part converted to nanoseconds. */
 
-  return (((int64_t)((uint64_t)time << 32) >> 32) * NSEC_PER_SEC) >> 32;
+  return (((time << 32) >> 32) * NSEC_PER_SEC) >> 32;
 }
 
 /****************************************************************************
@@ -589,7 +589,7 @@ static uint64_t timespec2ntp(FAR const struct timespec *ts)
 
   /* Set seconds part. */
 
-  ntp_time += (uint64_t)(ts->tv_sec) << 32;
+  ntp_time += ts->tv_sec << 32;
 
   return ntp_time;
 }
@@ -647,8 +647,8 @@ static void ntpc_calculate_offset(FAR int64_t *offset, FAR int64_t *delay,
    *      http://nicolas.aimon.fr/2014/12/05/timesync/
    */
 
-  *offset = (int64_t)((remote_recvtime / 2 - local_xmittime / 2) +
-                     (remote_xmittime / 2 - local_recvtime / 2));
+  *offset = (remote_recvtime / 2 - local_xmittime / 2) +
+            (remote_xmittime / 2 - local_recvtime / 2);
 
   /* Calculate roundtrip delay. */
 
@@ -707,13 +707,13 @@ static void ntpc_settime(int64_t offset, FAR struct timespec *start_realtime,
 
   diffms_real = curr_realtime.tv_sec - start_realtime->tv_sec;
   diffms_real *= 1000;
-  diffms_real += (int64_t)(curr_realtime.tv_nsec -
-                           start_realtime->tv_nsec) / (1000 * 1000);
+  diffms_real += (curr_realtime.tv_nsec -
+                  start_realtime->tv_nsec) / (1000 * 1000);
 
   diffms_mono = curr_monotonic.tv_sec - start_monotonic->tv_sec;
   diffms_mono *= 1000;
-  diffms_mono += (int64_t)(curr_monotonic.tv_nsec -
-                           start_monotonic->tv_nsec) / (1000 * 1000);
+  diffms_mono += (curr_monotonic.tv_nsec -
+                  start_monotonic->tv_nsec) / (1000 * 1000);
 
   /* Detect if real-time has been altered by other task. */
 
@@ -1489,14 +1489,14 @@ static int ntpc_daemon(int argc, FAR char **argv)
 
               if (offset1 > 0 && offset2 > 0)
                 {
-                  offset = ((uint64_t)offset1 + (uint64_t)offset2) / 2;
+                  offset = (offset1 + offset2) / 2;
                 }
               else if (offset1 < 0 && offset2 < 0)
                 {
                   offset1 = -offset1;
                   offset2 = -offset2;
 
-                  offset = ((uint64_t)offset1 + (uint64_t)offset2) / 2;
+                  offset = (offset1 + offset2) / 2;
 
                   offset = -offset;
                 }
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index 430693cc9..49c608210 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -425,7 +425,7 @@ static int ptp_adjtime(FAR struct ptp_state_s *state, int64_t delta_ns,
       struct timeval delta;
 
       delta.tv_sec = delta_ns / NSEC_PER_SEC;
-      delta_ns -= (int64_t)delta.tv_sec * NSEC_PER_SEC;
+      delta_ns -= delta.tv_sec * NSEC_PER_SEC;
       delta.tv_usec = delta_ns / NSEC_PER_USEC;
       return adjtime(&delta, NULL);
     }
@@ -1030,11 +1030,11 @@ static int ptp_update_local_clock(FAR struct ptp_state_s *state,
   const int64_t adj_limit_ns = CONFIG_NETUTILS_PTPD_SETTIME_THRESHOLD_MS
                                * (int64_t)NSEC_PER_MSEC;
 
-  ptpinfo("Local time: %lld.%09ld, remote time %lld.%09ld\n",
-          (long long)local_timestamp->tv_sec,
-          (long)local_timestamp->tv_nsec,
-          (long long)remote_timestamp->tv_sec,
-          (long)remote_timestamp->tv_nsec);
+  ptpinfo("Local time: %jd.%09ld, remote time %jd.%09ld\n",
+          (intmax_t)local_timestamp->tv_sec,
+          local_timestamp->tv_nsec,
+          (intmax_t)remote_timestamp->tv_sec,
+          remote_timestamp->tv_nsec);
 
   delta_ns = timespec_delta_ns(remote_timestamp, local_timestamp);
   delta_ns += state->path_delay_ns;
@@ -1062,8 +1062,8 @@ static int ptp_update_local_clock(FAR struct ptp_state_s *state,
 
       if (ret == OK)
         {
-          ptpinfo("Jumped to timestamp %lld.%09ld s\n",
-                  (long long)new_time.tv_sec, (long)new_time.tv_nsec);
+          ptpinfo("Jumped to timestamp %jd.%09ld s\n",
+                  (intmax_t)new_time.tv_sec, new_time.tv_nsec);
         }
       else
         {
@@ -1241,7 +1241,7 @@ static void ptp_add_correction_time(FAR const uint8_t *correction,
                            | (((uint64_t)correction[4]) <<  8)
                            | (((uint64_t)correction[5]) <<  0);
 
-  ptpinfo("correction before: %lld.%09ld\n", (long long)ts->tv_sec,
+  ptpinfo("correction before: %jd.%09ld\n", (intmax_t)ts->tv_sec,
           ts->tv_nsec);
 
   ts->tv_sec  += correction_time / NSEC_PER_SEC;
@@ -1252,7 +1252,7 @@ static void ptp_add_correction_time(FAR const uint8_t *correction,
       ts->tv_sec  += 1;
     }
 
-  ptpinfo("correction after: %lld.%09ld\n", (long long)ts->tv_sec,
+  ptpinfo("correction after: %jd.%09ld\n", (intmax_t)ts->tv_sec,
           ts->tv_nsec);
 }
 
diff --git a/nshlib/nsh_timcmds.c b/nshlib/nsh_timcmds.c
index de5dd8adf..9a812d461 100644
--- a/nshlib/nsh_timcmds.c
+++ b/nshlib/nsh_timcmds.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -120,7 +121,7 @@ static inline int date_showtime(FAR struct nsh_vtbl_s *vtbl,
 
   if (utc)
     {
-      if (gmtime_r((FAR const time_t *)&ts.tv_sec, &tm) == NULL)
+      if (gmtime_r(&ts.tv_sec, &tm) == NULL)
         {
           nsh_error(vtbl, g_fmtcmdfailed, name, "gmtime_r", NSH_ERRNO);
           return ERROR;
@@ -128,7 +129,7 @@ static inline int date_showtime(FAR struct nsh_vtbl_s *vtbl,
     }
   else
     {
-      if (localtime_r((FAR const time_t *)&ts.tv_sec, &tm) == NULL)
+      if (localtime_r(&ts.tv_sec, &tm) == NULL)
         {
           nsh_error(vtbl, g_fmtcmdfailed, name, "localtime_r", NSH_ERRNO);
           return ERROR;
@@ -354,8 +355,8 @@ int cmd_time(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
             }
 
           diff.tv_nsec = end.tv_nsec - start.tv_nsec;
-          nsh_output(vtbl, "\n%lu.%04lu sec\n", (unsigned long)diff.tv_sec,
-                     (unsigned long)diff.tv_nsec / 100000);
+          nsh_output(vtbl, "\n%jd.%04ld sec\n", (intmax_t)diff.tv_sec,
+                     diff.tv_nsec / 100000);
         }
     }
 
@@ -489,7 +490,7 @@ int cmd_timedatectl(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
           return ERROR;
         }
 
-      if (localtime_r((FAR const time_t *)&ts.tv_sec, &tm) == NULL)
+      if (localtime_r(&ts.tv_sec, &tm) == NULL)
         {
           nsh_error(vtbl, g_fmtcmdfailed, argv[0], "localtime_r", NSH_ERRNO);
           return ERROR;
@@ -508,7 +509,7 @@ int cmd_timedatectl(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
                  tm.tm_gmtoff);
       nsh_output(vtbl, "    Local time: %s %s\n", timbuf, tm.tm_zone);
 
-      if (gmtime_r((FAR const time_t *)&ts.tv_sec, &tm) == NULL)
+      if (gmtime_r(&ts.tv_sec, &tm) == NULL)
         {
           nsh_error(vtbl, g_fmtcmdfailed, argv[0], "gmtime_r", NSH_ERRNO);
           return ERROR;
diff --git a/system/coredump/coredump.c b/system/coredump/coredump.c
index 6a742f479..2787ee3d0 100644
--- a/system/coredump/coredump.c
+++ b/system/coredump/coredump.c
@@ -264,9 +264,9 @@ static void coredump_restore(FAR char *savepath, size_t maxfile)
   /* 'date -d @$(printf "%d" 0x6720C67E)' restore utc to date */
 
   ret = snprintf(dumppath, sizeof(dumppath),
-                 "%s/%.16s-%llx"COREDUMP_FILE_SUFFIX,
+                 "%s/%.16s-%jx"COREDUMP_FILE_SUFFIX,
                  savepath, info.name.version,
-                 (unsigned long long)info.time.tv_sec);
+                 (intmax_t)info.time.tv_sec);
 
   while (ret--)
     {
diff --git a/system/dd/dd_main.c b/system/dd/dd_main.c
index a240ae3fe..17138371b 100644
--- a/system/dd/dd_main.c
+++ b/system/dd/dd_main.c
@@ -508,8 +508,8 @@ int main(int argc, FAR char **argv)
 #ifdef CONFIG_SYSTEM_DD_STATS
   clock_gettime(CLOCK_MONOTONIC, &ts1);
 
-  elapsed  = (((uint64_t)ts1.tv_sec * NSEC_PER_SEC) + ts1.tv_nsec);
-  elapsed -= (((uint64_t)ts0.tv_sec * NSEC_PER_SEC) + ts0.tv_nsec);
+  elapsed  = (ts1.tv_sec * NSEC_PER_SEC) + ts1.tv_nsec;
+  elapsed -= (ts0.tv_sec * NSEC_PER_SEC) + ts0.tv_nsec;
   elapsed /= NSEC_PER_USEC; /* usec */
 
   fprintf(stderr, "%" PRIu64 " bytes (%" PRIu32 " blocks) copied, %u usec, ",
diff --git a/system/ptpd/ptpd_main.c b/system/ptpd/ptpd_main.c
index 4a87ce472..6b1720689 100644
--- a/system/ptpd/ptpd_main.c
+++ b/system/ptpd/ptpd_main.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/socket.h>
@@ -97,7 +98,7 @@ static int do_ptpd_status(int pid)
   gmtime_r(&status.last_clock_update.tv_sec, &time_tm);
   strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S", &time_tm);
   printf("- last_clock_update: %s.%09ld\n",
-    buf, (long)status.last_clock_update.tv_nsec);
+    buf, status.last_clock_update.tv_nsec);
 
   printf("- last_delta_ns: %lld\n", (long long)status.last_delta_ns);
   printf("- last_adjtime_ns: %lld\n", (long long)status.last_adjtime_ns);
@@ -106,20 +107,20 @@ static int do_ptpd_status(int pid)
 
   clock_gettime(CLOCK_MONOTONIC, &time_now);
 
-  printf("- last_received_multicast: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_received_multicast.tv_sec));
-  printf("- last_received_announce: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_received_announce.tv_sec));
-  printf("- last_received_sync: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_received_sync.tv_sec));
-  printf("- last_transmitted_sync: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_transmitted_sync.tv_sec));
-  printf("- last_transmitted_announce: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_transmitted_announce.tv_sec));
-  printf("- last_transmitted_delayresp: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_transmitted_delayresp.tv_sec));
-  printf("- last_transmitted_delayreq: %d s ago\n",
-    (int)(time_now.tv_sec - status.last_transmitted_delayreq.tv_sec));
+  printf("- last_received_multicast: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_received_multicast.tv_sec));
+  printf("- last_received_announce: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_received_announce.tv_sec));
+  printf("- last_received_sync: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_received_sync.tv_sec));
+  printf("- last_transmitted_sync: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_transmitted_sync.tv_sec));
+  printf("- last_transmitted_announce: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_transmitted_announce.tv_sec));
+  printf("- last_transmitted_delayresp: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_transmitted_delayresp.tv_sec));
+  printf("- last_transmitted_delayreq: %jd s ago\n",
+    (intmax_t)(time_now.tv_sec - status.last_transmitted_delayreq.tv_sec));
 
   return EXIT_SUCCESS;
 }
diff --git a/system/resmonitor/filldisk.c b/system/resmonitor/filldisk.c
index 6670048b0..35f1289da 100644
--- a/system/resmonitor/filldisk.c
+++ b/system/resmonitor/filldisk.c
@@ -234,20 +234,20 @@ static void print_disk_info(struct statfs *diskinfo)
 {
   syslog(LOG_INFO, "\tfs block size : %zu\n", diskinfo->f_bsize);
   syslog(LOG_INFO,
-         "\tfs block nums : %" PRIu64 "\n",
-         (uint64_t)diskinfo->f_blocks);
+         "\tfs block nums : %ju\n",
+         (uintmax_t)diskinfo->f_blocks);
   syslog(LOG_INFO,
-         "\tfs free blocks : %" PRIu64 "\n",
-         (uint64_t)diskinfo->f_bfree);
+         "\tfs free blocks : %ju\n",
+         (uintmax_t)diskinfo->f_bfree);
   syslog(LOG_INFO,
-         "\tfs free blocks available : %" PRIu64 "\n",
-         (uint64_t)diskinfo->f_bavail);
+         "\tfs free blocks available : %ju\n",
+         (uintmax_t)diskinfo->f_bavail);
   syslog(LOG_INFO,
-         "\tfs total file nodes : %" PRIu64 "\n",
-         (uint64_t)diskinfo->f_files);
+         "\tfs total file nodes : %ju\n",
+         (uintmax_t)diskinfo->f_files);
   syslog(LOG_INFO,
-         "\tfs free file nodes : %" PRIu64 "\n",
-         (uint64_t)diskinfo->f_ffree);
+         "\tfs free file nodes : %ju\n",
+         (uintmax_t)diskinfo->f_ffree);
 }
 
 int main(int argc, FAR char *argv[])
diff --git a/testing/drivers/drivertest/drivertest_oneshot.c b/testing/drivers/drivertest/drivertest_oneshot.c
index a8b18cc6d..2538112b5 100644
--- a/testing/drivers/drivertest/drivertest_oneshot.c
+++ b/testing/drivers/drivertest/drivertest_oneshot.c
@@ -167,7 +167,7 @@ static void drivertest_oneshot(FAR void **state)
   ret = ioctl(fd, OSIOC_MAXDELAY, &ts);
   assert_return_code(ret, OK);
 
-  syslog(LOG_DEBUG, "maxdelay sec:%lld\n", (long long)ts.tv_sec);
+  syslog(LOG_DEBUG, "maxdelay sec:%jd\n", (intmax_t)ts.tv_sec);
   syslog(LOG_DEBUG, "maxdelay nsec:%ld\n", ts.tv_nsec);
 
   for (i = 0; i < ONESHOT_DEFAULT_NSAMPLES; i++)
diff --git a/testing/drivers/drivertest/drivertest_posix_timer.c b/testing/drivers/drivertest/drivertest_posix_timer.c
index 65b95ee24..727eeb7ec 100644
--- a/testing/drivers/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -146,7 +146,7 @@ static uint64_t get_timestamp(void)
   struct timespec ts;
   uint64_t ms;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  ms = (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+  ms = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
   return ms;
 }
 
diff --git a/testing/drivers/sd_stress/sd_stress_main.c b/testing/drivers/sd_stress/sd_stress_main.c
index afcf528a0..da6e4f5c7 100644
--- a/testing/drivers/sd_stress/sd_stress_main.c
+++ b/testing/drivers/sd_stress/sd_stress_main.c
@@ -134,7 +134,7 @@ static bool create_files(const char *dir, const char *name,
 
   if (!read_bytes)
     {
-      printf("malloc failed for read bytes bufffer\n");
+      printf("malloc failed for read bytes buffer\n");
       return false;
     }
 
@@ -282,8 +282,8 @@ static uint64_t get_time_delta(const struct timespec *start,
                                const struct timespec *end)
 {
   uint64_t elapsed;
-  elapsed = (((uint64_t)end->tv_sec * NSEC_PER_SEC) + end->tv_nsec);
-  elapsed -= (((uint64_t)start->tv_sec * NSEC_PER_SEC) + start->tv_nsec);
+  elapsed = (end->tv_sec * NSEC_PER_SEC) + end->tv_nsec;
+  elapsed -= (start->tv_sec * NSEC_PER_SEC) + start->tv_nsec;
   return elapsed / 1000;
 }
 
diff --git a/testing/mm/kasantest/kasantest.c b/testing/mm/kasantest/kasantest.c
index 72f1353a1..bf8317b54 100644
--- a/testing/mm/kasantest/kasantest.c
+++ b/testing/mm/kasantest/kasantest.c
@@ -666,9 +666,9 @@ static int run_testcase(int argc, FAR char *argv[])
   clock_gettime(CLOCK_MONOTONIC, &end);
 
   timespec_sub(&result, &end, &start);
-  printf("%s spending %ld.%lds\n", run->testcase->name,
-                                   result.tv_sec,
-                                   result.tv_nsec);
+  printf("%s spending %jd.%09lds\n", run->testcase->name,
+                                     (intmax_t)result.tv_sec,
+                                     result.tv_nsec);
 
   return ret;
 }
diff --git a/testing/ostest/semtimed.c b/testing/ostest/semtimed.c
index 2b8fc6648..231da93c3 100644
--- a/testing/ostest/semtimed.c
+++ b/testing/ostest/semtimed.c
@@ -29,6 +29,7 @@
 #include <pthread.h>
 #include <sched.h>
 #include <semaphore.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
@@ -150,10 +151,10 @@ void semtimed_test(void)
         }
     }
 
-  printf("BEFORE: (%lu sec, %lu nsec)\n",
-          (unsigned long)before.tv_sec, (unsigned long)before.tv_nsec);
-  printf("AFTER:  (%lu sec, %lu nsec)\n",
-          (unsigned long)after.tv_sec, (unsigned long)after.tv_nsec);
+  printf("BEFORE: (%jd sec, %ld nsec)\n",
+          (intmax_t)before.tv_sec, before.tv_nsec);
+  printf("AFTER:  (%jd sec, %ld nsec)\n",
+          (intmax_t)after.tv_sec, after.tv_nsec);
 
   /* Now make sure that the time wait returns successfully if the semaphore
    * is posted
@@ -246,10 +247,10 @@ void semtimed_test(void)
       printf("semtimed_test: PASS: sem_timedwait succeeded\n");
     }
 
-  printf("BEFORE: (%lu sec, %lu nsec)\n",
-          (unsigned long)before.tv_sec, (unsigned long)before.tv_nsec);
-  printf("AFTER:  (%lu sec, %lu nsec)\n",
-          (unsigned long)after.tv_sec, (unsigned long)after.tv_nsec);
+  printf("BEFORE: (%jd sec, %ld nsec)\n",
+          (intmax_t)before.tv_sec, before.tv_nsec);
+  printf("AFTER:  (%jd sec, %ld nsec)\n",
+          (intmax_t)after.tv_sec, after.tv_nsec);
 
   /* Clean up detritus left by the pthread */
 
diff --git a/testing/sched/getprime/getprime_main.c b/testing/sched/getprime/getprime_main.c
index bee2509be..2670963a2 100644
--- a/testing/sched/getprime/getprime_main.c
+++ b/testing/sched/getprime/getprime_main.c
@@ -217,8 +217,8 @@ int main(int argc, FAR char *argv[])
   get_prime_in_parallel(n);
   clock_gettime(CLOCK_REALTIME, &ts1);
 
-  elapsed  = (((uint64_t)ts1.tv_sec * NSEC_PER_SEC) + ts1.tv_nsec);
-  elapsed -= (((uint64_t)ts0.tv_sec * NSEC_PER_SEC) + ts0.tv_nsec);
+  elapsed  = (ts1.tv_sec * NSEC_PER_SEC) + ts1.tv_nsec;
+  elapsed -= (ts0.tv_sec * NSEC_PER_SEC) + ts0.tv_nsec;
   elapsed /= NSEC_PER_MSEC; /* msec */
 
   printf("%s took %" PRIu64 " msec\n", argv[0], elapsed);
diff --git a/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c b/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
index f958f0fcb..12128e394 100644
--- a/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
+++ b/testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <pthread.h>
 
@@ -63,7 +64,7 @@ static void timespec_add(struct timespec *total, const struct timespec *diff)
 static void timespec_avg(const struct timespec *total, int count,
                          struct timespec *avg)
 {
-  uint64_t total_ns = (uint64_t)total->tv_sec * 1000000000 + total->tv_nsec;
+  uint64_t total_ns = total->tv_sec * 1000000000 + total->tv_nsec;
   uint64_t avg_ns = total_ns / count;
 
   avg->tv_sec = avg_ns / 1000000000;
@@ -129,17 +130,17 @@ int main(int argc, char *argv[])
 
       timespec_avg(&total, j, &avg);
 
-      printf("%d: diff = %lu.%09lu s | avg = %lu.%09lu s\n", j,
-             (unsigned long)diff.tv_sec, (unsigned long)diff.tv_nsec,
-             (unsigned long)avg.tv_sec, (unsigned long)avg.tv_nsec);
+      printf("%d: diff = %jd.%09ld s | avg = %jd.%09ld s\n", j,
+             (intmax_t)diff.tv_sec, diff.tv_nsec,
+             (intmax_t)avg.tv_sec, avg.tv_nsec);
     }
 
   printf("\n===== result =====\n");
   printf("count: %d\n", loop_count);
-  printf("total: %lu.%09lu s\n", (unsigned long)total.tv_sec,
-         (unsigned long)total.tv_nsec);
-  printf("avg: %lu.%09lu s\n", (unsigned long)avg.tv_sec,
-         (unsigned long)avg.tv_nsec);
+  printf("total: %jd.%09ld s\n", (intmax_t)total.tv_sec,
+         total.tv_nsec);
+  printf("avg: %jd.%09ld s\n", (intmax_t)avg.tv_sec,
+         avg.tv_nsec);
 
   return 0;
 }
diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index 01eed10d5..6811a3f19 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -213,8 +214,8 @@ static FAR void *timerjitter(FAR void *arg)
       diff = calc_diff(&now, &next);
       if (param->print)
         {
-          printf("diff %"PRId64", now %"PRId64".%09lu\n", diff, now.tv_sec,
-                  now.tv_nsec);
+          printf("diff %"PRId64", now %jd.%09ld\n", diff,
+                  (intmax_t)now.tv_sec, now.tv_nsec);
         }
 
       if (diff > param->max)
diff --git a/testing/testsuites/kernel/syscall/cases/pread_test.c b/testing/testsuites/kernel/syscall/cases/pread_test.c
index 8877e5b99..ed1eb419e 100644
--- a/testing/testsuites/kernel/syscall/cases/pread_test.c
+++ b/testing/testsuites/kernel/syscall/cases/pread_test.c
@@ -224,8 +224,8 @@ void pread01_l_seek(int fdesc, off_t offset, int whence, off_t checkoff)
   if ((offloc = lseek(fdesc, offset, whence)) != checkoff)
     {
       syslog(LOG_WARNING,
-             "return = %" PRId64 " , expected %" PRId64 "\n",
-             (int64_t)offloc, (int64_t)checkoff);
+             "return = %jd, expected %jd\n",
+             (intmax_t)offloc, (intmax_t)checkoff);
       syslog(LOG_ERR, "lseek() on %s failed\n", pread01_filename);
     }
 }
@@ -234,7 +234,7 @@ void pread01_l_seek(int fdesc, off_t offset, int whence, off_t checkoff)
  * Name: pread01_compare_bufers
  ****************************************************************************/
 
-/* compare_bufers() - Compare the contents of read buffer aganist the
+/* compare_bufers() - Compare the contents of read buffer against the
  *                    write buffer contents.
  *
  *  The contents of the index of each buffer should be as follows:
@@ -259,7 +259,7 @@ int pread01_compare_bufers(void)
         }
     }
 
-  /* If no erros, Test successful */
+  /* If no errors, Test successful */
 
   if (!err_flg)
     {
diff --git a/testing/testsuites/kernel/syscall/cases/truncate_test.c b/testing/testsuites/kernel/syscall/cases/truncate_test.c
index 3162bcfd0..48a141ba5 100644
--- a/testing/testsuites/kernel/syscall/cases/truncate_test.c
+++ b/testing/testsuites/kernel/syscall/cases/truncate_test.c
@@ -140,8 +140,8 @@ void test_nuttx_syscall_truncate01(FAR void **state)
             {
               syslog(LOG_ERR,
                      "FAIL, %s: Incorrect file "
-                     "size %" PRId64 " , Expected %d\n",
-                     truncate01_fileneme, (int64_t)file_length,
+                     "size %jd, Expected %d\n",
+                     truncate01_fileneme, (intmax_t)file_length,
                      TRUNC_LEN);
               fail_msg("test fail !");
             }
diff --git a/testing/testsuites/kernel/syscall/cases/write_test.c b/testing/testsuites/kernel/syscall/cases/write_test.c
index 8b274f66c..c994c9e91 100644
--- a/testing/testsuites/kernel/syscall/cases/write_test.c
+++ b/testing/testsuites/kernel/syscall/cases/write_test.c
@@ -79,8 +79,8 @@ void test_nuttx_syscall_write01(FAR void **state)
         {
           badcount++;
           syslog(LOG_INFO,
-                 "INFO, write() returned %" PRId64 ", expected %d\n",
-                 (int64_t)ret, i);
+                 "INFO, write() returned %zd, expected %d\n",
+                 ret, i);
         }
     }
 
@@ -160,8 +160,8 @@ void test_nuttx_syscall_write03(FAR void **state)
         {
           badcount++;
           syslog(LOG_INFO,
-                 "INFO, write() returned %" PRId64 ", expected %d\n",
-                 (int64_t)ret, i);
+                 "INFO, write() returned %zd, expected %d\n",
+                 ret, i);
         }
     }
 
diff --git a/testing/testsuites/kernel/time/cases/clock_test_clock01.c b/testing/testsuites/kernel/time/cases/clock_test_clock01.c
index 6443495e2..7d79dd8c7 100644
--- a/testing/testsuites/kernel/time/cases/clock_test_clock01.c
+++ b/testing/testsuites/kernel/time/cases/clock_test_clock01.c
@@ -61,8 +61,8 @@ void test_nuttx_clock_test_clock01(FAR void **state)
   /* get current real time */
 
   ret = clock_gettime(clk, &oldtp);
-  syslog(LOG_INFO, "The current real time: sec is %lld, nsec is %ld\n",
-         (long long)oldtp.tv_sec, oldtp.tv_nsec);
+  syslog(LOG_INFO, "The current real time: sec is %jd, nsec is %ld\n",
+         (intmax_t)oldtp.tv_sec, oldtp.tv_nsec);
   assert_int_equal(ret, 0);
 
   syslog(LOG_INFO, "sleep 2 seconds\n");
@@ -76,8 +76,8 @@ void test_nuttx_clock_test_clock01(FAR void **state)
   /* set real time */
 
   ret = clock_settime(clk, &tp);
-  syslog(LOG_INFO, "Setting time: sec is %lld, nsec is %ld\n",
-         (long long)tp.tv_sec, tp.tv_nsec);
+  syslog(LOG_INFO, "Setting time: sec is %jd, nsec is %ld\n",
+         (intmax_t)tp.tv_sec, tp.tv_nsec);
   assert_int_equal(ret, 0);
 
   syslog(LOG_INFO, "get real time clock again\n");
@@ -86,9 +86,9 @@ void test_nuttx_clock_test_clock01(FAR void **state)
 
   ret = clock_gettime(clk, &tp);
   syslog(LOG_INFO,
-         "Obtaining the current time after setting: sec = %lld, nsec = "
+         "Obtaining the current time after setting: sec = %jd, nsec = "
          "%ld\n",
-         (long long)tp.tv_sec, tp.tv_nsec);
+         (intmax_t)tp.tv_sec, tp.tv_nsec);
   passflag = (tp.tv_sec >= 2 + oldtp.tv_sec) &&
              (tp.tv_sec <=
               2 + oldtp.tv_sec + 1); /* 2, use for testing clock setting */
diff --git a/testing/testsuites/kernel/time/cases/clock_test_smoke.c b/testing/testsuites/kernel/time/cases/clock_test_smoke.c
index 3b8948958..035b6ad41 100644
--- a/testing/testsuites/kernel/time/cases/clock_test_smoke.c
+++ b/testing/testsuites/kernel/time/cases/clock_test_smoke.c
@@ -52,7 +52,7 @@ void test_nuttx_clock_test_smoke01(FAR void **state)
     0, 0
   };
 
-  struct timespec setts =
+  struct timespec tp =
   {
     0, 0
   };
@@ -79,30 +79,30 @@ void test_nuttx_clock_test_smoke01(FAR void **state)
 
   ret = clock_gettime(clk, &oldtp);
   syslog(LOG_INFO,
-         "the clock current time: %lld second, %ld nanosecond\n",
-         (long long)oldtp.tv_sec, oldtp.tv_nsec);
+         "the clock current time: %jd second, %ld nanosecond\n",
+         (intmax_t)oldtp.tv_sec, oldtp.tv_nsec);
   assert_int_equal(ret, 0);
 
   /* set clock realtime */
 
-  setts.tv_sec = oldtp.tv_sec + 1;
-  setts.tv_nsec = oldtp.tv_nsec;
+  tp.tv_sec = oldtp.tv_sec + 1;
+  tp.tv_nsec = oldtp.tv_nsec;
   syslog(LOG_INFO,
-         "the clock setting time: %lld second, %ld nanosecond\n",
-         (long long)setts.tv_sec, setts.tv_nsec);
-  ret = clock_settime(CLOCK_REALTIME, &setts);
+         "the clock setting time: %jd second, %ld nanosecond\n",
+         (intmax_t)tp.tv_sec, tp.tv_nsec);
+  ret = clock_settime(CLOCK_REALTIME, &tp);
   assert_int_equal(ret, 0);
 
   ret = clock_gettime(clk, &ts);
   syslog(LOG_INFO,
-         "obtaining the current time after setting: %lld second, %ld "
+         "obtaining the current time after setting: %jd second, %ld "
          "nanosecond\n",
-         (long long)ts.tv_sec, ts.tv_nsec);
+         (intmax_t)ts.tv_sec, ts.tv_nsec);
 
   passflag =
-      (ts.tv_sec >= setts.tv_sec) &&
+      (ts.tv_sec >= tp.tv_sec) &&
       (ts.tv_sec <=
-       setts.tv_sec + 1); /* 1, means obtaining time's errno is 1 second. */
+       tp.tv_sec + 1); /* 1, means obtaining time's errno is 1 second. */
   assert_int_equal(ret, 0);
   assert_int_equal(passflag, 1);
 }

From 5c703f5603f3cea92c82a46c650435f430b03e33 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Tue, 19 May 2026 17:43:05 +0800
Subject: [PATCH 339/568] nshlib/testing: Fix open() arguments.

Pass explicit open flags for the NSH script redirect file so the mode argument is used as file creation permissions.

Add the missing mode argument to AIO ostest open() calls that create the test file.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 nshlib/nsh_script.c  |  3 ++-
 testing/ostest/aio.c | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nshlib/nsh_script.c b/nshlib/nsh_script.c
index 21bef19e4..d1f1d369e 100644
--- a/nshlib/nsh_script.c
+++ b/nshlib/nsh_script.c
@@ -61,7 +61,8 @@ static int nsh_script_redirect(FAR struct nsh_vtbl_s *vtbl,
 
   if (CONFIG_NSH_SCRIPT_REDIRECT_PATH[0])
     {
-      fd = open(CONFIG_NSH_SCRIPT_REDIRECT_PATH, 0666);
+      fd = open(CONFIG_NSH_SCRIPT_REDIRECT_PATH,
+                O_WRONLY | O_CREAT | O_TRUNC, 0666);
       if (fd > 0)
         {
           nsh_redirect(vtbl, 0, fd, fd, save);
diff --git a/testing/ostest/aio.c b/testing/ostest/aio.c
index 8a6fe9637..e69d3a5e7 100644
--- a/testing/ostest/aio.c
+++ b/testing/ostest/aio.c
@@ -299,7 +299,7 @@ void aio_test(void)
   /* Case 1: Poll for transfer complete */
 
   printf("AIO test case 1: Poll for transfer complete\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",
@@ -336,7 +336,7 @@ void aio_test(void)
   usleep(500 * 1000);
 
   printf("AIO test case 2: Use LIO_WAIT for transfer complete\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",
@@ -374,7 +374,7 @@ void aio_test(void)
   usleep(500 * 1000);
 
   printf("AIO test case 3: Use aio_suspend for transfer complete\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",
@@ -442,7 +442,7 @@ void aio_test(void)
   usleep(500 * 1000);
 
   printf("AIO test case 4: Use individual signals for transfer complete\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",
@@ -506,7 +506,7 @@ void aio_test(void)
 
   printf("AIO test case 5:"
          " Use list complete signal for transfer complete\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",
@@ -569,7 +569,7 @@ void aio_test(void)
   usleep(500 * 1000);
 
   printf("AIO test case 6: Cancel I/O by AIO control block\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",
@@ -616,7 +616,7 @@ void aio_test(void)
   usleep(500 * 1000);
 
   printf("AIO test case 7:Cancel I/O by file descriptor\n");
-  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC);
+  g_fildes = open(AIO_FILEPATH, O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (g_fildes < 0)
     {
       printf("aio_test: ERROR: Failed to open %s: %d\n",

From b4f1e2949462a6e3c8ba7233e48649757906a2aa Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Tue, 19 May 2026 17:56:09 +0800
Subject: [PATCH 340/568] apps: Fix additional open() arguments.

Add missing mode arguments to direct open() calls that use O_CREAT.

Also open the lp503x device with explicit read-only flags instead of O_CREAT, matching the device-node usage.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 benchmarks/sd_bench/sd_bench_main.c                   | 2 +-
 examples/lp503x/lp503x_main.c                         | 2 +-
 examples/settings/settings_main.c                     | 4 ++--
 system/nxcamera/nxcamera.c                            | 2 +-
 testing/drivers/drivertest/drivertest_audio.c         | 3 ++-
 testing/drivers/sd_stress/sd_stress_main.c            | 2 +-
 testing/fs/smart_test/smart_test.c                    | 2 +-
 testing/testsuites/kernel/fs/cases/fs_poll_test.c     | 4 ++--
 testing/testsuites/kernel/syscall/cases/fcntl_test.c  | 2 +-
 testing/testsuites/kernel/syscall/cases/lseek_test.c  | 2 +-
 testing/testsuites/kernel/syscall/cases/rmdir_test.c  | 2 +-
 testing/testsuites/kernel/syscall/cases/unlink_test.c | 2 +-
 12 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/benchmarks/sd_bench/sd_bench_main.c b/benchmarks/sd_bench/sd_bench_main.c
index 44d30fa63..9822ac748 100644
--- a/benchmarks/sd_bench/sd_bench_main.c
+++ b/benchmarks/sd_bench/sd_bench_main.c
@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
 
   cfg.run_duration *= 1000;
   bench_fd = open(BENCHMARK_FILE,
-                  O_CREAT | (verify ? O_RDWR : O_WRONLY) | O_TRUNC);
+                  O_CREAT | (verify ? O_RDWR : O_WRONLY) | O_TRUNC, 0666);
 
   if (bench_fd < 0)
     {
diff --git a/examples/lp503x/lp503x_main.c b/examples/lp503x/lp503x_main.c
index 5a43da39c..0eba5c1b3 100644
--- a/examples/lp503x/lp503x_main.c
+++ b/examples/lp503x/lp503x_main.c
@@ -632,7 +632,7 @@ int main(int argc, FAR char *argv[])
   int len;
   int x;
 
-  fd = open(CONFIG_EXAMPLES_LP503X_DEVPATH, O_CREAT);
+  fd = open(CONFIG_EXAMPLES_LP503X_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
       fprintf(stderr, "ERROR: Failed to open %s: %d\n",
diff --git a/examples/settings/settings_main.c b/examples/settings/settings_main.c
index b284a4843..3f718aa7c 100644
--- a/examples/settings/settings_main.c
+++ b/examples/settings/settings_main.c
@@ -115,7 +115,7 @@ int settings_main(int argc, FAR char *argv[])
   if (ret == -ENOENT)
     {
       printf("No existing binary storage file found. Creating it.\n");
-      fd = open(bin_path, O_CREAT);
+      fd = open(bin_path, O_CREAT, 0666);
       if (fd < 0)
         {
           printf("Failed to create settings file\n");
@@ -138,7 +138,7 @@ int settings_main(int argc, FAR char *argv[])
   if (ret == -ENOENT)
     {
       printf("No existing text storage file found. Creating it.\n");
-      fd = open(text_path, O_CREAT);
+      fd = open(text_path, O_CREAT, 0666);
       if (fd < 0)
         {
           printf("Failed to create settings file\n");
diff --git a/system/nxcamera/nxcamera.c b/system/nxcamera/nxcamera.c
index b8f5d41aa..331ff6214 100644
--- a/system/nxcamera/nxcamera.c
+++ b/system/nxcamera/nxcamera.c
@@ -575,7 +575,7 @@ int nxcamera_setfile(FAR struct nxcamera_s *pcam, FAR const char *pfile,
 
   /* Try to open the file */
 
-  temp_fd = open(pfile, O_CREAT | O_RDWR);
+  temp_fd = open(pfile, O_CREAT | O_RDWR, 0666);
   if (temp_fd == -1)
     {
       /* Error opening the file */
diff --git a/testing/drivers/drivertest/drivertest_audio.c b/testing/drivers/drivertest/drivertest_audio.c
index de12da3d1..0232d32b7 100644
--- a/testing/drivers/drivertest/drivertest_audio.c
+++ b/testing/drivers/drivertest/drivertest_audio.c
@@ -382,7 +382,8 @@ static int audio_test_prepare(FAR struct audio_state_s *state,
     }
   else
     {
-      state->out_fd = open(state->outfile, O_WRONLY | O_CREAT | O_TRUNC);
+      state->out_fd = open(state->outfile,
+                           O_WRONLY | O_CREAT | O_TRUNC, 0666);
     }
 
   if (state->out_fd == -1)
diff --git a/testing/drivers/sd_stress/sd_stress_main.c b/testing/drivers/sd_stress/sd_stress_main.c
index da6e4f5c7..39c3e563e 100644
--- a/testing/drivers/sd_stress/sd_stress_main.c
+++ b/testing/drivers/sd_stress/sd_stress_main.c
@@ -160,7 +160,7 @@ static bool create_files(const char *dir, const char *name,
           bytes[j] = (bytes[j] + i) & 0xff;
         }
 
-      int fd = open(path, O_CREAT | O_RDWR);
+      int fd = open(path, O_CREAT | O_RDWR, 0666);
 
       if (fd < 0)
         {
diff --git a/testing/fs/smart_test/smart_test.c b/testing/fs/smart_test/smart_test.c
index 13bd393c8..f439cdfda 100644
--- a/testing/fs/smart_test/smart_test.c
+++ b/testing/fs/smart_test/smart_test.c
@@ -393,7 +393,7 @@ static int smart_circular_log_test(char *filename)
 
   /* Open the circular log file */
 
-  fd = open(filename, O_RDWR | O_CREAT);
+  fd = open(filename, O_RDWR | O_CREAT, 0666);
   if (fd == -1)
     {
       printf("Unable to create file %s\n", filename);
diff --git a/testing/testsuites/kernel/fs/cases/fs_poll_test.c b/testing/testsuites/kernel/fs/cases/fs_poll_test.c
index e51ae9ee9..fcbcaf246 100644
--- a/testing/testsuites/kernel/fs/cases/fs_poll_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_poll_test.c
@@ -59,13 +59,13 @@ void test_nuttx_fs_poll01(FAR void **state)
   int poll01_ret;
   struct pollfd poll01_fds[5];
 
-  poll01_fd1 = open(I_FILE1, O_RDONLY | O_CREAT);
+  poll01_fd1 = open(I_FILE1, O_RDONLY | O_CREAT, 0666);
   assert_true(poll01_fd1 >= 0);
 
   poll01_fds[0].fd = poll01_fd1;
   poll01_fds[0].events = POLLOUT;
 
-  poll01_fd2 = open(I_FILE2, O_RDWR | O_CREAT);
+  poll01_fd2 = open(I_FILE2, O_RDWR | O_CREAT, 0666);
   assert_true(poll01_fd2 >= 0);
 
   poll01_fds[1].fd = poll01_fd2;
diff --git a/testing/testsuites/kernel/syscall/cases/fcntl_test.c b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
index 0897f65b4..2dfdcc370 100644
--- a/testing/testsuites/kernel/syscall/cases/fcntl_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
@@ -306,7 +306,7 @@ void test_nuttx_syscall_fcntl06(FAR void **state)
 
   sprintf(fname, "fcntl06_%d", gettid());
 
-  fd = open(fname, O_RDWR | O_CREAT);
+  fd = open(fname, O_RDWR | O_CREAT, 0700);
   assert_true(fd > 0);
 
   for (lc = 0; lc < 10; lc++)
diff --git a/testing/testsuites/kernel/syscall/cases/lseek_test.c b/testing/testsuites/kernel/syscall/cases/lseek_test.c
index cef521915..619f61a72 100644
--- a/testing/testsuites/kernel/syscall/cases/lseek_test.c
+++ b/testing/testsuites/kernel/syscall/cases/lseek_test.c
@@ -91,7 +91,7 @@ void test_nuttx_syscall_lseek01(FAR void **state)
 
   snprintf(filename, sizeof(filename), "%s_file", __func__);
 
-  fd = open(filename, O_RDWR | O_CREAT);
+  fd = open(filename, O_RDWR | O_CREAT, 0644);
 
   if (fd > 0)
     {
diff --git a/testing/testsuites/kernel/syscall/cases/rmdir_test.c b/testing/testsuites/kernel/syscall/cases/rmdir_test.c
index 8068a2253..20c74a9c6 100644
--- a/testing/testsuites/kernel/syscall/cases/rmdir_test.c
+++ b/testing/testsuites/kernel/syscall/cases/rmdir_test.c
@@ -103,7 +103,7 @@ void test_nuttx_syscall_rmdir02(FAR void **state)
   assert_int_equal(ret, 0);
   ret = mkdir("Rmdir02_testdir/test1", (S_IRWXU | S_IRWXG | S_IRWXO));
   assert_int_equal(ret, 0);
-  fd = open("Rmdir02_testfile2", O_CREAT | O_RDWR);
+  fd = open("Rmdir02_testfile2", O_CREAT | O_RDWR, 0700);
 
   if (fd > 0)
     close(fd);
diff --git a/testing/testsuites/kernel/syscall/cases/unlink_test.c b/testing/testsuites/kernel/syscall/cases/unlink_test.c
index f3a7e1697..e5b771786 100644
--- a/testing/testsuites/kernel/syscall/cases/unlink_test.c
+++ b/testing/testsuites/kernel/syscall/cases/unlink_test.c
@@ -55,7 +55,7 @@ void test_nuttx_syscall_unlink01(FAR void **state)
 
   sprintf(fname, "%s_file", __func__);
 
-  fd = open(fname, O_RDWR | O_CREAT);
+  fd = open(fname, O_RDWR | O_CREAT, 0700);
   if (fd > 0)
     {
       close(fd);

From fcd10aa7259e5e80eb9aed98477e407d827cceb4 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 20 May 2026 09:46:12 +0800
Subject: [PATCH 341/568] examples/lp503x: Open device write-only.

Open the LP503X device with O_WRONLY because the driver registers the device node with write-only permissions and the example controls it through ioctl().

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 examples/lp503x/lp503x_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/lp503x/lp503x_main.c b/examples/lp503x/lp503x_main.c
index 0eba5c1b3..9cc99d3b7 100644
--- a/examples/lp503x/lp503x_main.c
+++ b/examples/lp503x/lp503x_main.c
@@ -632,7 +632,7 @@ int main(int argc, FAR char *argv[])
   int len;
   int x;
 
-  fd = open(CONFIG_EXAMPLES_LP503X_DEVPATH, O_RDONLY);
+  fd = open(CONFIG_EXAMPLES_LP503X_DEVPATH, O_WRONLY);
   if (fd < 0)
     {
       fprintf(stderr, "ERROR: Failed to open %s: %d\n",

From 5355adb9cf789340b89b948b6a35b6aafb4c5a47 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 20 May 2026 21:36:08 +0800
Subject: [PATCH 342/568] apps: Fix codespell warnings.

Fix the reported typo warnings and ignore the V4L2 parm field name in apps codespell configuration, matching the main NuttX repository.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 .codespellrc                                         |  2 +-
 system/nxcamera/nxcamera.c                           | 12 ++++++------
 testing/testsuites/kernel/syscall/cases/fcntl_test.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.codespellrc b/.codespellrc
index c2a1ecdfc..8bcdf2bc7 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -10,4 +10,4 @@ skip =
   LICENSE,
 
 # Ignore words list (FTP protocol commands and technical terms)
-ignore-words-list = ALLO, ARCHTYPE
+ignore-words-list = ALLO, ARCHTYPE, parm
diff --git a/system/nxcamera/nxcamera.c b/system/nxcamera/nxcamera.c
index 331ff6214..0f74b418a 100644
--- a/system/nxcamera/nxcamera.c
+++ b/system/nxcamera/nxcamera.c
@@ -676,7 +676,7 @@ int nxcamera_stream(FAR struct nxcamera_s *pcam,
   int                        i;
   struct v4l2_buffer         buf;
   struct v4l2_requestbuffers req;
-  struct v4l2_streamparm     parm;
+  struct v4l2_streamparm     param;
 
   DEBUGASSERT(pcam != NULL);
 
@@ -720,11 +720,11 @@ int nxcamera_stream(FAR struct nxcamera_s *pcam,
       return ret;
     }
 
-  memset(&parm, 0, sizeof(parm));
-  parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-  parm.parm.capture.timeperframe.denominator = framerate;
-  parm.parm.capture.timeperframe.numerator = 1;
-  ret = ioctl(pcam->capture_fd, VIDIOC_S_PARM, (uintptr_t)&parm);
+  memset(&param, 0, sizeof(param));
+  param.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  param.parm.capture.timeperframe.denominator = framerate;
+  param.parm.capture.timeperframe.numerator = 1;
+  ret = ioctl(pcam->capture_fd, VIDIOC_S_PARM, (uintptr_t)&param);
   if (ret < 0)
     {
       ret = -errno;
diff --git a/testing/testsuites/kernel/syscall/cases/fcntl_test.c b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
index 2dfdcc370..2737621ce 100644
--- a/testing/testsuites/kernel/syscall/cases/fcntl_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
@@ -113,7 +113,7 @@ void test_nuttx_syscall_fcntl01(FAR void **state)
   flags = fcntl(fd[2], F_GETFL, 0);
   assert_false((flags & (O_NDELAY | O_APPEND | O_WRONLY)) == 0);
 
-  /* Check that flags are not cummulative */
+  /* Check that flags are not cumulative */
 
   assert_false(fcntl(fd[2], F_SETFL, 0) == -1);
 

From 2ad3e4e17be61f6f98acfc6bba2c19fe3f753f11 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Wed, 20 May 2026 09:25:25 +0200
Subject: [PATCH 343/568] examples/pwm: remove refenrences to PULSECOUNT

Remove refenrences to PULSECOUNT from PWM example.
Pulse count driver will be handled by separate application.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/pwm/Kconfig    | 12 +-------
 examples/pwm/pwm.h      | 10 +------
 examples/pwm/pwm_main.c | 64 ++++++++---------------------------------
 3 files changed, 14 insertions(+), 72 deletions(-)

diff --git a/examples/pwm/Kconfig b/examples/pwm/Kconfig
index b6e0a3d82..facd1b6dd 100644
--- a/examples/pwm/Kconfig
+++ b/examples/pwm/Kconfig
@@ -28,8 +28,7 @@ config EXAMPLES_PWM_DURATION
 	int "Default PWM duration"
 	default 5
 	---help---
-		The default PWM pulse train duration in seconds.  Used only if the current
-		pulse count is zero.  Default: 5 seconds
+		The default PWM pulse train duration in seconds.  Default: 5 seconds
 
 config EXAMPLES_PWM_DUTYPCT1
 	int "First PWM duty percentage"
@@ -135,13 +134,4 @@ config EXAMPLES_PWM_CHANNEL6
 
 endif
 
-config EXAMPLES_PWM_PULSECOUNT
-	int "Default pulse count"
-	default 0
-	depends on PWM_PULSECOUNT
-	---help---
-		The initial PWM pulse count.  This option is only available if
-		PWM_PULSECOUNT is defined.  Default: 0 (i.e., use the duration, not
-		the count).
-
 endif
diff --git a/examples/pwm/pwm.h b/examples/pwm/pwm.h
index d5c15aed9..389241626 100644
--- a/examples/pwm/pwm.h
+++ b/examples/pwm/pwm.h
@@ -45,12 +45,8 @@
  * CONFIG_EXAMPLES_PWM_CHANNELn - The PWM channel number for channel n.
  *   Default: n
  * CONFIG_EXAMPLES_PWM_DURATION - The initial PWM pulse train duration
- *   in seconds. Used only if the current pulse count is zero
- *   (pulse count is only supported if CONFIG_PWM_PULSECOUNT is defined).
+ *   in seconds.
  *   Default: 5 seconds
- * CONFIG_EXAMPLES_PWM_PULSECOUNT - The initial PWM pulse count.
- *   This option is only available if CONFIG_PWM_PULSECOUNT is defined.
- *   Default: 0 (i.e., use the duration, not the count).
  */
 
 #ifndef CONFIG_PWM
@@ -69,10 +65,6 @@
 #  define CONFIG_EXAMPLES_PWM_DURATION 5
 #endif
 
-#ifndef CONFIG_EXAMPLES_PWM_PULSECOUNT
-#  define CONFIG_EXAMPLES_PWM_PULSECOUNT 0
-#endif
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/examples/pwm/pwm_main.c b/examples/pwm/pwm_main.c
index 085a36b9e..e373a5bb0 100644
--- a/examples/pwm/pwm_main.c
+++ b/examples/pwm/pwm_main.c
@@ -98,9 +98,6 @@ struct pwm_state_s
   int8_t    channels[CONFIG_PWM_NCHANNELS];
   uint8_t   duties[CONFIG_PWM_NCHANNELS];
   uint32_t  freq;
-#ifdef CONFIG_PWM_PULSECOUNT
-  uint32_t  count;
-#endif
   int       duration;
 };
 
@@ -230,11 +227,6 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
     }
 
   printf("\n");
-#ifdef CONFIG_PWM_PULSECOUNT
-  printf("  [-n count] selects the pulse count.  "
-         "Default: %d Current: %" PRIx32 "\n",
-         CONFIG_EXAMPLES_PWM_PULSECOUNT, pwm->count);
-#endif
   printf("  [-t duration] is the duration of the pulse train in seconds.  "
          "Default: %d Current: %d\n",
          CONFIG_EXAMPLES_PWM_DURATION, pwm->duration);
@@ -361,20 +353,6 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc,
             index += nargs;
             break;
 
-#ifdef CONFIG_PWM_PULSECOUNT
-          case 'n':
-            nargs = arg_decimal(&argv[index], &value);
-            if (value < 0)
-              {
-                printf("Count must be non-negative: %ld\n", value);
-                exit(1);
-              }
-
-            pwm->count = (uint32_t)value;
-            index += nargs;
-            break;
-#endif
-
           case 'p':
             nargs = arg_string(&argv[index], &str);
             pwm_devpath(pwm, str);
@@ -449,9 +427,6 @@ int main(int argc, FAR char *argv[])
 #endif
       g_pwmstate.freq        = CONFIG_EXAMPLES_PWM_FREQUENCY;
       g_pwmstate.duration    = CONFIG_EXAMPLES_PWM_DURATION;
-#ifdef CONFIG_PWM_PULSECOUNT
-      g_pwmstate.count       = CONFIG_EXAMPLES_PWM_PULSECOUNT;
-#endif
       g_pwmstate.initialized = true;
     }
 
@@ -511,10 +486,6 @@ int main(int argc, FAR char *argv[])
         info.channels[i].channel, info.channels[i].duty);
     }
 
-#ifdef CONFIG_PWM_PULSECOUNT
-  info.channels[0].count = g_pwmstate.count;
-  printf(" count: %" PRIx32, info.channels[0].count);
-#endif
   printf("\n");
 
   ret = ioctl(fd, PWMIOC_SETCHARACTERISTICS,
@@ -526,9 +497,7 @@ int main(int argc, FAR char *argv[])
       goto errout_with_dev;
     }
 
-  /* Then start the pulse train.  Since the driver was opened in blocking
-   * mode, this call will block if the count value is greater than zero.
-   */
+  /* Then start the pulse train. */
 
   ret = ioctl(fd, PWMIOC_START, 0);
   if (ret < 0)
@@ -537,28 +506,19 @@ int main(int argc, FAR char *argv[])
       goto errout_with_dev;
     }
 
-  /* It a non-zero count was not specified, then wait for the selected
-   * duration, then stop the PWM output.
-   */
+  /* Wait for the specified duration, then stop the PWM output. */
 
-#ifdef CONFIG_PWM_PULSECOUNT
-  if (info.channels[0].count == 0)
-#endif
+  sleep(g_pwmstate.duration);
+
+  /* Then stop the pulse train */
+
+  printf("pwm_main: stopping output\n");
+
+  ret = ioctl(fd, PWMIOC_STOP, 0);
+  if (ret < 0)
     {
-      /* Wait for the specified duration */
-
-      sleep(g_pwmstate.duration);
-
-      /* Then stop the pulse train */
-
-      printf("pwm_main: stopping output\n");
-
-      ret = ioctl(fd, PWMIOC_STOP, 0);
-      if (ret < 0)
-        {
-          printf("pwm_main: ioctl(PWMIOC_STOP) failed: %d\n", errno);
-          goto errout_with_dev;
-        }
+      printf("pwm_main: ioctl(PWMIOC_STOP) failed: %d\n", errno);
+      goto errout_with_dev;
     }
 
   close(fd);

From 5cce60aa9afe7631a86aa2cbe61492bbf27b172a Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Wed, 20 May 2026 09:26:55 +0200
Subject: [PATCH 344/568] examples: add pulse count example

add pulse count driver example. Previously it was mixed with PWM example.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/pulsecount/CMakeLists.txt    |  33 ++++
 examples/pulsecount/Kconfig           |  42 +++++
 examples/pulsecount/Make.defs         |  25 +++
 examples/pulsecount/Makefile          |  32 ++++
 examples/pulsecount/pulsecount_main.c | 247 ++++++++++++++++++++++++++
 5 files changed, 379 insertions(+)
 create mode 100644 examples/pulsecount/CMakeLists.txt
 create mode 100644 examples/pulsecount/Kconfig
 create mode 100644 examples/pulsecount/Make.defs
 create mode 100644 examples/pulsecount/Makefile
 create mode 100644 examples/pulsecount/pulsecount_main.c

diff --git a/examples/pulsecount/CMakeLists.txt b/examples/pulsecount/CMakeLists.txt
new file mode 100644
index 000000000..356b1b982
--- /dev/null
+++ b/examples/pulsecount/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/examples/pulsecount/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_PULSECOUNT)
+  nuttx_add_application(
+    NAME
+    pulsecount
+    STACKSIZE
+    ${CONFIG_DEFAULT_TASK_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_PULSECOUNT}
+    SRCS
+    pulsecount_main.c)
+endif()
diff --git a/examples/pulsecount/Kconfig b/examples/pulsecount/Kconfig
new file mode 100644
index 000000000..4f4526868
--- /dev/null
+++ b/examples/pulsecount/Kconfig
@@ -0,0 +1,42 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_PULSECOUNT
+	tristate "pulsecount example"
+	default n
+	depends on PULSECOUNT
+	---help---
+		Enable the finite pulsecount example
+
+if EXAMPLES_PULSECOUNT
+
+config EXAMPLES_PULSECOUNT_DEVPATH
+	string "pulsecount device path"
+	default "/dev/pulsecount0"
+	---help---
+		The path to the pulsecount device.  Default: /dev/pulsecount0
+
+config EXAMPLES_PULSECOUNT_HIGH_NS
+	int "Default pulsecount high time"
+	default 5000000
+	---help---
+		The default pulsecount high time in nanoseconds.
+		Default: 5000000 ns
+
+config EXAMPLES_PULSECOUNT_LOW_NS
+	int "Default pulsecount low time"
+	default 5000000
+	---help---
+		The default pulsecount low time in nanoseconds.
+		Default: 5000000 ns
+
+config EXAMPLES_PULSECOUNT_COUNT
+	int "Default pulsecount count"
+	default 100
+	range 1 2147483647
+	---help---
+		The default number of pulses to generate.
+
+endif
diff --git a/examples/pulsecount/Make.defs b/examples/pulsecount/Make.defs
new file mode 100644
index 000000000..db46b5478
--- /dev/null
+++ b/examples/pulsecount/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/pulsecount/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_PULSECOUNT),)
+CONFIGURED_APPS += $(APPDIR)/examples/pulsecount
+endif
diff --git a/examples/pulsecount/Makefile b/examples/pulsecount/Makefile
new file mode 100644
index 000000000..b03e07503
--- /dev/null
+++ b/examples/pulsecount/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/examples/pulsecount/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+MAINSRC = pulsecount_main.c
+
+PROGNAME = pulsecount
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE = $(CONFIG_EXAMPLES_PULSECOUNT)
+
+include $(APPDIR)/Application.mk
diff --git a/examples/pulsecount/pulsecount_main.c b/examples/pulsecount/pulsecount_main.c
new file mode 100644
index 000000000..82678be08
--- /dev/null
+++ b/examples/pulsecount/pulsecount_main.c
@@ -0,0 +1,247 @@
+/****************************************************************************
+ * apps/examples/pulsecount/pulsecount_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/ioctl.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nuttx/timers/pulsecount.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct pulsecount_state_s
+{
+  FAR char *devpath;
+  uint32_t high_ns;
+  uint32_t low_ns;
+  uint32_t count;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void pulsecount_devpath(FAR struct pulsecount_state_s *state,
+                               FAR const char *devpath)
+{
+  if (state->devpath != NULL)
+    {
+      free(state->devpath);
+    }
+
+  state->devpath = strdup(devpath);
+}
+
+static int arg_string(FAR char **arg, FAR char **value)
+{
+  FAR char *ptr = *arg;
+
+  if (ptr[2] == '\0')
+    {
+      *value = arg[1];
+      return 2;
+    }
+
+  *value = &ptr[2];
+  return 1;
+}
+
+static int arg_decimal(FAR char **arg, FAR long *value)
+{
+  FAR char *string;
+  int ret;
+
+  ret = arg_string(arg, &string);
+  *value = strtol(string, NULL, 10);
+  return ret;
+}
+
+static void pulsecount_help(FAR struct pulsecount_state_s *state)
+{
+  printf("Usage: pulsecount [OPTIONS]\n");
+  printf("  [-p devpath] Default: %s Current: %s\n",
+         CONFIG_EXAMPLES_PULSECOUNT_DEVPATH,
+         state->devpath != NULL ? state->devpath : "NONE");
+  printf("  [-H high-ns] Default: %d ns Current: %" PRIu32 " ns\n",
+         CONFIG_EXAMPLES_PULSECOUNT_HIGH_NS, state->high_ns);
+  printf("  [-L low-ns] Default: %d ns Current: %" PRIu32 " ns\n",
+         CONFIG_EXAMPLES_PULSECOUNT_LOW_NS, state->low_ns);
+  printf("  [-n count] Default: %d Current: %" PRIu32 "\n",
+         CONFIG_EXAMPLES_PULSECOUNT_COUNT, state->count);
+  printf("  [-h] shows this message and exits\n");
+}
+
+static void parse_args(FAR struct pulsecount_state_s *state, int argc,
+                       FAR char **argv)
+{
+  FAR char *str;
+  long value;
+  int index;
+  int nargs;
+
+  for (index = 1; index < argc; )
+    {
+      if (argv[index][0] != '-')
+        {
+          printf("Invalid options format: %s\n", argv[index]);
+          exit(1);
+        }
+
+      switch (argv[index][1])
+        {
+          case 'p':
+            nargs = arg_string(&argv[index], &str);
+            pulsecount_devpath(state, str);
+            index += nargs;
+            break;
+
+          case 'H':
+            nargs = arg_decimal(&argv[index], &value);
+            if (value < 1)
+              {
+                printf("High time out of range: %ld\n", value);
+                exit(1);
+              }
+
+            state->high_ns = (uint32_t)value;
+            index += nargs;
+            break;
+
+          case 'L':
+            nargs = arg_decimal(&argv[index], &value);
+            if (value < 1)
+              {
+                printf("Low time out of range: %ld\n", value);
+                exit(1);
+              }
+
+            state->low_ns = (uint32_t)value;
+            index += nargs;
+            break;
+
+          case 'n':
+            nargs = arg_decimal(&argv[index], &value);
+            if (value < 1)
+              {
+                printf("Count out of range: %ld\n", value);
+                exit(1);
+              }
+
+            state->count = (uint32_t)value;
+            index += nargs;
+            break;
+
+          case 'h':
+            pulsecount_help(state);
+            exit(0);
+
+          default:
+            printf("Unsupported option: %s\n", argv[index]);
+            pulsecount_help(state);
+            exit(1);
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct pulsecount_state_s state;
+  struct pulsecount_info_s info;
+  int fd;
+  int ret;
+
+  /* Defaults */
+
+  memset(&state, 0, sizeof(state));
+  state.high_ns = CONFIG_EXAMPLES_PULSECOUNT_HIGH_NS;
+  state.low_ns = CONFIG_EXAMPLES_PULSECOUNT_LOW_NS;
+  state.count = CONFIG_EXAMPLES_PULSECOUNT_COUNT;
+
+  /* Parse args */
+
+  parse_args(&state, argc, argv);
+
+  if (state.devpath == NULL)
+    {
+      pulsecount_devpath(&state, CONFIG_EXAMPLES_PULSECOUNT_DEVPATH);
+    }
+
+  fd = open(state.devpath, O_RDONLY);
+  if (fd < 0)
+    {
+      printf("pulsecount: open %s failed: %d\n", state.devpath, errno);
+      goto errout;
+    }
+
+  memset(&info, 0, sizeof(info));
+  info.high_ns = state.high_ns;
+  info.low_ns = state.low_ns;
+  info.count = state.count;
+
+  printf("pulsecount: high: %" PRIu32 " ns low: %" PRIu32
+         " ns count: %" PRIu32 "\n",
+         info.high_ns, info.low_ns, info.count);
+
+  ret = ioctl(fd, PULSECOUNTIOC_SETCHARACTERISTICS,
+              (unsigned long)((uintptr_t)&info));
+  if (ret < 0)
+    {
+      printf("pulsecount: ioctl(PULSECOUNTIOC_SETCHARACTERISTICS) "
+             "failed: %d\n", errno);
+      goto errout_with_dev;
+    }
+
+  ret = ioctl(fd, PULSECOUNTIOC_START, 0);
+  if (ret < 0)
+    {
+      printf("pulsecount: ioctl(PULSECOUNTIOC_START) failed: %d\n", errno);
+      goto errout_with_dev;
+    }
+
+  close(fd);
+  fflush(stdout);
+  return OK;
+
+errout_with_dev:
+  close(fd);
+errout:
+  fflush(stdout);
+  return ERROR;
+}

From c9c5c75d08828aca7fb695a2a0a65a57063641f1 Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Fri, 22 May 2026 09:04:14 +0900
Subject: [PATCH 345/568] examples/rust: Fix hello_rust_cargo CMake settings

Use the hello_rust_cargo-specific Kconfig symbols for the built-in
application stack size and priority.

Previously, CMake referenced the generic hello example symbols, so the
configured hello_rust_cargo stack size could be ignored.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 examples/rust/hello/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/rust/hello/CMakeLists.txt b/examples/rust/hello/CMakeLists.txt
index c0daea419..2a83be84e 100644
--- a/examples/rust/hello/CMakeLists.txt
+++ b/examples/rust/hello/CMakeLists.txt
@@ -25,7 +25,7 @@ if(CONFIG_EXAMPLES_HELLO_RUST_CARGO)
 
   nuttx_add_application(
     NAME ${CONFIG_EXAMPLES_HELLO_RUST_CARGO_PROGNAME} STACKSIZE
-    ${CONFIG_EXAMPLES_HELLO_STACKSIZE} PRIORITY
-    ${CONFIG_EXAMPLES_HELLO_PRIORITY})
+    ${CONFIG_EXAMPLES_HELLO_RUST_CARGO_STACKSIZE} PRIORITY
+    ${CONFIG_EXAMPLES_HELLO_RUST_CARGO_PRIORITY})
 
 endif() # CONFIG_EXAMPLES_HELLO_RUST_CARGO

From 965cddfa365f261c3c8ace3dbe35a0a1cca70c4e Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Thu, 21 May 2026 14:29:22 +0200
Subject: [PATCH 346/568] system/libffi: Add libffi package integration

Add Kconfig, build rules, and ignore entries required to build and
package libffi as a standalone system component.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 system/libffi/.gitignore |   4 ++
 system/libffi/Kconfig    |  24 +++++++
 system/libffi/Make.defs  |  28 ++++++++
 system/libffi/Makefile   | 135 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 191 insertions(+)
 create mode 100644 system/libffi/.gitignore
 create mode 100644 system/libffi/Kconfig
 create mode 100644 system/libffi/Make.defs
 create mode 100644 system/libffi/Makefile

diff --git a/system/libffi/.gitignore b/system/libffi/.gitignore
new file mode 100644
index 000000000..26d13e2cd
--- /dev/null
+++ b/system/libffi/.gitignore
@@ -0,0 +1,4 @@
+/*.zip
+/build/
+/install/
+/libffi/
diff --git a/system/libffi/Kconfig b/system/libffi/Kconfig
new file mode 100644
index 000000000..0b11516ef
--- /dev/null
+++ b/system/libffi/Kconfig
@@ -0,0 +1,24 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config LIB_LIBFFI
+	bool "libffi"
+	default n
+	---help---
+		Enable the libffi Foreign Function Interface library. libffi
+		provides a portable way to call C functions with arguments
+		determined at runtime. It is required by CPython's _ctypes module.
+
+if LIB_LIBFFI
+
+config LIB_LIBFFI_VERSION
+	string "libffi commit hash"
+	default "9760868682cc9a33008761f158d86481d56738aa"
+	---help---
+		Git commit hash of the libffi repository to download and build.
+		The source is fetched from https://github.com/libffi/libffi at
+		the specified commit.
+
+endif # LIB_LIBFFI
diff --git a/system/libffi/Make.defs b/system/libffi/Make.defs
new file mode 100644
index 000000000..5949ff04f
--- /dev/null
+++ b/system/libffi/Make.defs
@@ -0,0 +1,28 @@
+############################################################################
+# apps/system/libffi/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_LIB_LIBFFI),)
+CONFIGURED_APPS += $(APPDIR)/system/libffi
+
+EXTRA_LIBPATHS += -L$(APPDIR)/system/libffi/install/lib
+EXTRA_LIBS += -lffi
+endif
diff --git a/system/libffi/Makefile b/system/libffi/Makefile
new file mode 100644
index 000000000..c2b4810ed
--- /dev/null
+++ b/system/libffi/Makefile
@@ -0,0 +1,135 @@
+############################################################################
+# apps/system/libffi/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+LIBFFI_URL        = https://github.com/libffi/libffi/archive
+LIBFFI_COMMIT     = $(patsubst "%",%,$(strip $(CONFIG_LIB_LIBFFI_VERSION)))
+LIBFFI_ZIP        = libffi-$(LIBFFI_COMMIT).zip
+LIBFFI_SRC        = libffi
+LIBFFI_BUILDDIR   = $(CURDIR)/build
+LIBFFI_INSTALLDIR = $(CURDIR)/install
+APPS_INCDIR       = $(APPDIR)$(DELIM)include
+
+UNPACK ?= unzip -q -o
+
+# ---------------------------------------------------------------------------
+# Derive the autotools --host triplet from the NuttX configuration.
+#
+# libffi's configure.host matches on patterns such as:
+#   riscv*-*-*   arm*-*-*   aarch64*-*-*   xtensa*-*-*
+#   mips*-*-*    i?86-*-*   x86_64-*-*
+#
+# We map CONFIG_ARCH (and, for RISC-V, the word-size selectors) to the
+# CPU part that libffi expects, then append "-nuttx-elf" as vendor-os.
+# ---------------------------------------------------------------------------
+
+ifeq ($(CONFIG_ARCH),risc-v)
+  ifeq ($(CONFIG_ARCH_RV64),y)
+    LIBFFI_CPU = riscv64
+  else
+    LIBFFI_CPU = riscv32
+  endif
+else ifeq ($(CONFIG_ARCH),arm64)
+  LIBFFI_CPU = aarch64
+else ifeq ($(CONFIG_ARCH),arm)
+  LIBFFI_CPU = arm
+else ifeq ($(CONFIG_ARCH),xtensa)
+  LIBFFI_CPU = xtensa
+else ifeq ($(CONFIG_ARCH),mips)
+  LIBFFI_CPU = mips
+else ifeq ($(CONFIG_ARCH),x86_64)
+  LIBFFI_CPU = x86_64
+else ifeq ($(CONFIG_ARCH),x86)
+  LIBFFI_CPU = i686
+else
+  LIBFFI_CPU = $(subst -,,$(CONFIG_ARCH))
+endif
+
+LIBFFI_HOST = $(LIBFFI_CPU)-nuttx-elf
+
+# ---------------------------------------------------------------------------
+# CFLAGS for the libffi build itself.
+#
+# We start from the NuttX-provided CFLAGS (which already carry -march,
+# -mabi, -isystem paths, -D__NuttX__, etc.) and add a few flags that the
+# library needs.  We deliberately strip -nostdlib because autoconf link
+# checks need the default startfiles/libs to succeed.
+# ---------------------------------------------------------------------------
+
+LIBFFI_CFLAGS = $(filter-out -nostdlib -Werror -Werror=% -Wno-cpp,$(CFLAGS))
+LIBFFI_CFLAGS += -ffunction-sections -fdata-sections -O2
+
+# ---------------------------------------------------------------------------
+# Download, autoreconf, configure, build, install
+# ---------------------------------------------------------------------------
+
+ifeq ($(wildcard $(LIBFFI_SRC)/.git),)
+
+$(LIBFFI_ZIP):
+	@echo "Downloading: $(LIBFFI_URL)/$(LIBFFI_COMMIT).zip"
+	$(Q) curl -L $(LIBFFI_URL)/$(LIBFFI_COMMIT).zip -o $(LIBFFI_ZIP)
+
+$(LIBFFI_SRC): $(LIBFFI_ZIP)
+	@echo "Unpacking: $(LIBFFI_ZIP) -> $(LIBFFI_SRC)"
+	$(Q) $(UNPACK) $(LIBFFI_ZIP)
+	$(Q) mv libffi-$(LIBFFI_COMMIT) $(LIBFFI_SRC)
+
+endif
+
+$(LIBFFI_SRC)/configure: $(LIBFFI_SRC)
+	@echo "Generating libffi configure script (autoreconf)"
+	$(Q) (cd $(LIBFFI_SRC) && autoreconf -v -i)
+
+$(LIBFFI_INSTALLDIR)/lib/libffi.a: $(LIBFFI_SRC)/configure
+	$(Q) mkdir -p $(LIBFFI_BUILDDIR)
+	$(Q) ( \
+		cd $(LIBFFI_BUILDDIR) && \
+		$(CURDIR)/$(LIBFFI_SRC)/configure \
+		  --host=$(LIBFFI_HOST) \
+		  --prefix=$(LIBFFI_INSTALLDIR) \
+		  --disable-shared \
+		  --enable-static \
+		  --disable-docs \
+		  --disable-exec-static-tramp \
+		  --disable-multi-os-directory \
+		  CC="$(CC)" \
+		  CFLAGS="$(LIBFFI_CFLAGS)" \
+		  AR="$(CROSSDEV)ar" \
+		  RANLIB="$(CROSSDEV)ranlib" \
+	)
+	$(MAKE) -C $(LIBFFI_BUILDDIR) -j$(shell nproc)
+	$(MAKE) -C $(LIBFFI_BUILDDIR) install
+
+context:: $(LIBFFI_INSTALLDIR)/lib/libffi.a
+	$(Q) mkdir -p $(APPS_INCDIR)
+	$(Q) cp $(LIBFFI_INSTALLDIR)/include/*.h $(APPS_INCDIR)
+
+distclean::
+	$(call DELDIR, $(LIBFFI_BUILDDIR))
+	$(call DELDIR, $(LIBFFI_INSTALLDIR))
+	$(call DELDIR, $(LIBFFI_SRC))
+	$(call DELFILE, $(LIBFFI_ZIP))
+	$(call DELFILE, $(APPS_INCDIR)/ffi.h)
+	$(call DELFILE, $(APPS_INCDIR)/ffitarget.h)
+
+include $(APPDIR)/Application.mk

From 58b780c280f3bab89d947be17c5c398e6556711a Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Thu, 21 May 2026 14:29:12 +0200
Subject: [PATCH 347/568] interpreters/python: Add ctypes prototype patches for
 NuttX

Integrate NuttX-specific ctypes and posixmodule updates.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 interpreters/python/Kconfig                     |  1 +
 interpreters/python/Makefile                    |  6 ++++++
 interpreters/python/Setup.local.in              |  1 -
 interpreters/python/config.site.in              |  4 ++++
 ...no-set_errno-to-avoid-nuttx-macro-coll.patch | 17 +++++++++++++++++
 .../0020-ctypes-skip-pythonapi-on-nuttx.patch   | 11 +++++++++++
 ...sixmodule-ignore-utime-enosys-on-nuttx.patch | 16 ++++++++++++++++
 7 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 interpreters/python/patch/0019-undef-get_errno-set_errno-to-avoid-nuttx-macro-coll.patch
 create mode 100644 interpreters/python/patch/0020-ctypes-skip-pythonapi-on-nuttx.patch
 create mode 100644 interpreters/python/patch/0021-posixmodule-ignore-utime-enosys-on-nuttx.patch

diff --git a/interpreters/python/Kconfig b/interpreters/python/Kconfig
index dfc5fd4cc..a0582835f 100644
--- a/interpreters/python/Kconfig
+++ b/interpreters/python/Kconfig
@@ -6,6 +6,7 @@
 config INTERPRETERS_CPYTHON
 	tristate "CPython"
 	depends on LIB_ZLIB
+	depends on !LIBC_DLFCN || LIB_LIBFFI
 	depends on EXPERIMENTAL
 	default n
 	---help---
diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index a339bbe02..1b1392cac 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -88,6 +88,9 @@ $(CPYTHON_UNPACKNAME): $(CPYTHON_ZIP)
 	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0016-fix-timezone-offset-check-when-time-t-is-unsigned.patch
 	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0017-stdlib-zip-keep-pydecimal-and-trim-tooling-extras.patch
 	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0018-ignore-chmod-on-nuttx-like-wasi.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0019-undef-get_errno-set_errno-to-avoid-nuttx-macro-coll.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0020-ctypes-skip-pythonapi-on-nuttx.patch
+	$(Q) patch -p1 -d $(CPYTHON_UNPACKNAME) < patch$(DELIM)0021-posixmodule-ignore-utime-enosys-on-nuttx.patch
 
 $(HOSTPYTHON):
 	mkdir -p $(HOSTBUILD)
@@ -128,6 +131,9 @@ $(SETUP_LOCAL):
 ifneq ($(CONFIG_ARCH_HAVE_FORK),y)
 	@echo "_posixsubprocess" >> $@
 endif
+ifneq ($(CONFIG_LIBC_DLFCN),y)
+	@echo "_ctypes" >> $@
+endif
 
 # For the Python's `configure` script, please consider the following
 # when building for NuttX:
diff --git a/interpreters/python/Setup.local.in b/interpreters/python/Setup.local.in
index 0bd116574..d8c27292b 100644
--- a/interpreters/python/Setup.local.in
+++ b/interpreters/python/Setup.local.in
@@ -11,7 +11,6 @@ _codecs_iso2022
 _codecs_jp
 _codecs_kr
 _codecs_tw
-_ctypes
 _decimal
 _elementtree
 _heapq
diff --git a/interpreters/python/config.site.in b/interpreters/python/config.site.in
index 52c04725a..d19337ea6 100644
--- a/interpreters/python/config.site.in
+++ b/interpreters/python/config.site.in
@@ -31,3 +31,7 @@ export ac_cv_func_utimes="yes"
 export ac_cv_func_getuid="yes"
 export ac_cv_func_sysconf="yes"
 export ac_cv_func_umask="yes"
+export ac_cv_func_ffi_prep_cif_var="yes"
+export ac_cv_func_ffi_prep_closure_loc="yes"
+export ac_cv_func_ffi_closure_alloc="yes"
+export ac_cv_func_utimes="no"
diff --git a/interpreters/python/patch/0019-undef-get_errno-set_errno-to-avoid-nuttx-macro-coll.patch b/interpreters/python/patch/0019-undef-get_errno-set_errno-to-avoid-nuttx-macro-coll.patch
new file mode 100644
index 000000000..905827466
--- /dev/null
+++ b/interpreters/python/patch/0019-undef-get_errno-set_errno-to-avoid-nuttx-macro-coll.patch
@@ -0,0 +1,17 @@
+--- a/Modules/_ctypes/callproc.c
++++ b/Modules/_ctypes/callproc.c
+@@ -91,6 +91,14 @@
+ #include <alloca.h>
+ #endif
+ 
++/* NuttX errno.h defines get_errno() and set_errno(e) as macros.
++   Undef them so that CPython's static functions of the same name
++   in this file compile without conflict. */
++#ifdef __NuttX__
++#undef get_errno
++#undef set_errno
++#endif
++
+ #ifdef _Py_MEMORY_SANITIZER
+ #include <sanitizer/msan_interface.h>
+ #endif
diff --git a/interpreters/python/patch/0020-ctypes-skip-pythonapi-on-nuttx.patch b/interpreters/python/patch/0020-ctypes-skip-pythonapi-on-nuttx.patch
new file mode 100644
index 000000000..99ca460d9
--- /dev/null
+++ b/interpreters/python/patch/0020-ctypes-skip-pythonapi-on-nuttx.patch
@@ -0,0 +1,11 @@
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -481,6 +481,8 @@
+     pythonapi = PyDLL("libpython%d.%d.so" % _sys.version_info[:2])
+ elif _sys.platform == "cygwin":
+     pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2])
++elif _sys.platform == "nuttx":
++    pythonapi = None
+ else:
+     pythonapi = PyDLL(None)
+ 
diff --git a/interpreters/python/patch/0021-posixmodule-ignore-utime-enosys-on-nuttx.patch b/interpreters/python/patch/0021-posixmodule-ignore-utime-enosys-on-nuttx.patch
new file mode 100644
index 000000000..664d0f174
--- /dev/null
+++ b/interpreters/python/patch/0021-posixmodule-ignore-utime-enosys-on-nuttx.patch
@@ -0,0 +1,16 @@
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -6666,6 +6666,13 @@
+     }
+ #endif
+ 
++#if defined(__NuttX__)
++    if (result == -1 && errno == ENOSYS) {
++        /* SmartFS and other NuttX fs do not implement chstat. */
++        Py_RETURN_NONE;
++    }
++#endif
++
+     if (result < 0) {
+         path_error(path);
+         return NULL;

From c44f9a0556aef8cc7d9e50c5e4a86a41b26e143f Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Sat, 23 May 2026 10:23:47 +0800
Subject: [PATCH 348/568] apps: Fix unchecked strdup()/asprintf() as requested
 in #1727

Add missing failure handling for direct strdup() and asprintf() calls where the allocated result is consumed locally before any NULL/error check.

This keeps the scope to the functions named in #1727 and avoids changing pass-through return sites where callers already receive NULL on allocation failure.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 .codespell-ignore-lines            |  2 ++
 examples/mount/mount_main.c        |  7 +++++
 examples/romfs/romfs_main.c        |  6 +++++
 netutils/chat/chat.c               | 42 +++++++++++++++++-------------
 netutils/ftpc/ftpc_connect.c       |  5 ++++
 netutils/ftpc/ftpc_listdir.c       | 12 +++++++++
 netutils/ftpc/ftpc_login.c         |  4 +++
 netutils/ftpd/ftpd.c               | 33 +++++++++++++++++++++++
 netutils/webserver/httpd_dirlist.c |  6 ++++-
 nshlib/nsh_envcmds.c               | 22 ++++++++++++++++
 nshlib/nsh_netcmds.c               |  6 +++++
 system/telnet/telnet_chatd.c       |  9 ++++++-
 12 files changed, 134 insertions(+), 20 deletions(-)

diff --git a/.codespell-ignore-lines b/.codespell-ignore-lines
index 45628423d..b001b6343 100644
--- a/.codespell-ignore-lines
+++ b/.codespell-ignore-lines
@@ -6,3 +6,5 @@
               object = new Controlse::CCertificate(
           Controlse::CCertificate cert(se, settings->key_id);
       auto certificate = Controlse::CCertificate(
+ *  |---------- [-rw-r--r--        15]  afile.txt
+  g_afile.name                 = "afile.txt";
diff --git a/examples/mount/mount_main.c b/examples/mount/mount_main.c
index c2b4e45b4..e42f0d88b 100644
--- a/examples/mount/mount_main.c
+++ b/examples/mount/mount_main.c
@@ -217,6 +217,13 @@ static void show_directories(const char *path, int indent)
           snprintf(g_namebuffer, sizeof(g_namebuffer),
                    "%s/%s", path, direntry->d_name);
           subdir = strdup(g_namebuffer);
+          if (subdir == NULL)
+            {
+              printf("show_directories: ERROR out of memory\n");
+              g_nerrors++;
+              continue;
+            }
+
           show_directories(subdir, indent + 1);
           free(subdir);
         }
diff --git a/examples/romfs/romfs_main.c b/examples/romfs/romfs_main.c
index fa957bbd7..7a7395503 100644
--- a/examples/romfs/romfs_main.c
+++ b/examples/romfs/romfs_main.c
@@ -394,6 +394,12 @@ static void readdirectories(const char *path, struct node_s *entry)
       snprintf(g_scratchbuffer, sizeof(g_scratchbuffer),
                "%s/%s", path, direntry->d_name);
       fullpath = strdup(g_scratchbuffer);
+      if (fullpath == NULL)
+        {
+          printf("  ERROR: Out of memory\n");
+          g_nerrors++;
+          continue;
+        }
 
       if (DIRENT_ISDIRECTORY(direntry->d_type))
         {
diff --git a/netutils/chat/chat.c b/netutils/chat/chat.c
index c1af84ae8..94f79c500 100644
--- a/netutils/chat/chat.c
+++ b/netutils/chat/chat.c
@@ -108,6 +108,8 @@ static int chat_tokenise(FAR struct chat *priv,
 
   int tok_on_delimiter(void)
   {
+    FAR struct chat_token *newtok;
+
     if (!tok_pos && !quoted && !no_termin)
       {
           /* a) the first character in the script is a delimiter or
@@ -122,9 +124,29 @@ static int chat_tokenise(FAR struct chat *priv,
     /* Terminate the temporary */
 
     tok_str[tok_pos] = '\0';
+    newtok = malloc(sizeof(struct chat_token));
+    if (newtok == NULL)
+      {
+        /* out of memory */
+
+        return -ENOMEM;
+      }
+
+    /* Copy the temporary */
+
+    newtok->string = strdup(tok_str);
+    if (newtok->string == NULL)
+      {
+        free(newtok);
+        return -ENOMEM;
+      }
+
+    newtok->no_termin = no_termin;
+    newtok->next = NULL;
+
     if (tok)
       {
-        tok->next = malloc(sizeof(struct chat_token));
+        tok->next = newtok;
 
         /* The terminated token becomes previous */
 
@@ -134,26 +156,10 @@ static int chat_tokenise(FAR struct chat *priv,
       {
         /* There was no previous token */
 
-        *first_tok = malloc(sizeof(struct chat_token));
+        *first_tok = newtok;
         tok = *first_tok;
       }
 
-    if (!tok)
-      {
-        /* out of memory */
-
-        return -ENOMEM;
-      }
-
-    /* Copy the temporary */
-
-    tok->string = strdup(tok_str);
-    tok->no_termin = no_termin;
-
-    /* Initialize the next token */
-
-    tok->next = NULL;
-
     /* Reset the buffer position */
 
     tok_pos = 0;
diff --git a/netutils/ftpc/ftpc_connect.c b/netutils/ftpc/ftpc_connect.c
index 61defa614..f28c40b61 100644
--- a/netutils/ftpc/ftpc_connect.c
+++ b/netutils/ftpc/ftpc_connect.c
@@ -108,6 +108,11 @@ SESSION ftpc_connect(FAR union ftpc_sockaddr_u *server)
    */
 
   session->homeldir = strdup(ftpc_lpwd());
+  if (session->homeldir == NULL)
+    {
+      nerr("ERROR: Failed to allocate local home directory\n");
+      goto errout_with_alloc;
+    }
 
   /* And (Re-)connect to the server */
 
diff --git a/netutils/ftpc/ftpc_listdir.c b/netutils/ftpc/ftpc_listdir.c
index 02947ad5c..01ef7dd3a 100644
--- a/netutils/ftpc/ftpc_listdir.c
+++ b/netutils/ftpc/ftpc_listdir.c
@@ -257,6 +257,7 @@ FAR struct ftpc_dirlist_s *ftpc_listdir(SESSION handle,
   FAR char *tmpfname;
   bool iscurrdir;
   unsigned int nnames;
+  unsigned int i;
   int allocsize;
   int ret;
 
@@ -365,6 +366,17 @@ FAR struct ftpc_dirlist_s *ftpc_listdir(SESSION handle,
 
       ftpc_nlstparse(filestream, ftpc_addname, dirlist);
       DEBUGASSERT(nnames == dirlist->nnames);
+
+      for (i = 0; i < dirlist->nnames; i++)
+        {
+          if (dirlist->name[i] == NULL)
+            {
+              nerr("ERROR: Failed to allocate directory name\n");
+              ftpc_dirfree(dirlist);
+              dirlist = NULL;
+              break;
+            }
+        }
     }
 
 errout:
diff --git a/netutils/ftpc/ftpc_login.c b/netutils/ftpc/ftpc_login.c
index 4ee477e00..80a97044a 100644
--- a/netutils/ftpc/ftpc_login.c
+++ b/netutils/ftpc/ftpc_login.c
@@ -172,6 +172,10 @@ int ftpc_relogin(FAR struct ftpc_session_s *session)
   if (session->homerdir != NULL)
     {
       session->currdir = strdup(session->homerdir);
+      if (session->currdir == NULL)
+        {
+          return -ENOMEM;
+        }
     }
 
   /* If the user has requested a special start up directory, then change to
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index ded7484d7..c62d9ca73 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -627,6 +627,11 @@ static bool ftpd_account_login(FAR struct ftpd_session_s *session,
       if (account->home != NULL)
         {
           home = strdup(account->home);
+          if (home == NULL)
+            {
+              ftpd_account_free(account);
+              return false;
+            }
         }
 
       flags = account->flags;
@@ -645,6 +650,11 @@ static bool ftpd_account_login(FAR struct ftpd_session_s *session,
         {
           home = strdup(home);
         }
+
+      if (home == NULL)
+        {
+          return false;
+        }
     }
 
   if ((flags & FTPD_ACCOUNTFLAG_ADMIN) != 0)
@@ -652,6 +662,12 @@ static bool ftpd_account_login(FAR struct ftpd_session_s *session,
       /* admin user */
 
       session->home = strdup("/");
+      if (session->home == NULL)
+        {
+          free(home);
+          return false;
+        }
+
       session->work = home;
     }
   else
@@ -660,6 +676,12 @@ static bool ftpd_account_login(FAR struct ftpd_session_s *session,
 
       session->home = home;
       session->work = strdup("/");
+      if (session->work == NULL)
+        {
+          free(home);
+          session->home = NULL;
+          return false;
+        }
     }
 
   return true;
@@ -2517,6 +2539,17 @@ static int ftpd_command_user(FAR struct ftpd_session_s *session)
       session->loggedin = false;
       session->home     = strdup(home == NULL ? "/" : home);
       session->work     = strdup("/");
+      if (session->home == NULL || session->work == NULL)
+        {
+          free(session->home);
+          free(session->work);
+          session->home = NULL;
+          session->work = NULL;
+
+          return ftpd_response(session->cmd.sd, session->txtimeout,
+                               g_respfmt1, 451, ' ',
+                               "Memory exhausted !");
+        }
 
       return ftpd_response(session->cmd.sd, session->txtimeout,
                            g_respfmt1, 230, ' ', "Login successful.");
diff --git a/netutils/webserver/httpd_dirlist.c b/netutils/webserver/httpd_dirlist.c
index 6dda65286..b77d68e4e 100644
--- a/netutils/webserver/httpd_dirlist.c
+++ b/netutils/webserver/httpd_dirlist.c
@@ -196,7 +196,11 @@ ssize_t httpd_dirlist(int outfd, FAR struct httpd_fs_file *file)
         }
 
       ret = asprintf(&path, "%s/%s", file->path, dent->d_name);
-      ASSERT(ret > 0 && path);
+      if (ret < 0 || path == NULL)
+        {
+          nerr("ERROR: asprintf failed\n");
+          break;
+        }
 
       /* call stat() to obtain modified time and size */
 
diff --git a/nshlib/nsh_envcmds.c b/nshlib/nsh_envcmds.c
index d2378bb38..442d6b2ba 100644
--- a/nshlib/nsh_envcmds.c
+++ b/nshlib/nsh_envcmds.c
@@ -257,17 +257,38 @@ int cmd_cd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   else if (strcmp(path, "-") == 0)
     {
       alloc = strdup(nsh_getwd(g_oldpwd));
+      if (alloc == NULL)
+        {
+          nsh_error(vtbl, g_fmtcmdoutofmemory, argv[0]);
+          ret = ERROR;
+          goto errout;
+        }
+
       path  = alloc;
     }
 #endif
   else if (strcmp(path, "..") == 0)
     {
       alloc = strdup(nsh_getcwd(vtbl));
+      if (alloc == NULL)
+        {
+          nsh_error(vtbl, g_fmtcmdoutofmemory, argv[0]);
+          ret = ERROR;
+          goto errout;
+        }
+
       path  = dirname(alloc);
     }
   else
     {
       fullpath = nsh_getfullpath(vtbl, path);
+      if (fullpath == NULL)
+        {
+          nsh_error(vtbl, g_fmtcmdoutofmemory, argv[0]);
+          ret = ERROR;
+          goto errout;
+        }
+
       path     = fullpath;
     }
 
@@ -288,6 +309,7 @@ int cmd_cd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 
   /* Free any memory that was allocated */
 
+errout:
   if (alloc)
     {
       free(alloc);
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 3171bdfbb..8e25c69a2 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -1555,6 +1555,12 @@ int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   if (localfile == NULL)
     {
       allocfile = strdup(url);
+      if (allocfile == NULL)
+        {
+          fmt = g_fmtcmdoutofmemory;
+          goto errout;
+        }
+
       localfile = basename(allocfile);
     }
 
diff --git a/system/telnet/telnet_chatd.c b/system/telnet/telnet_chatd.c
index 5ab503092..582bda725 100644
--- a/system/telnet/telnet_chatd.c
+++ b/system/telnet/telnet_chatd.c
@@ -40,7 +40,7 @@
 /* Leveraged from libtelnet, https://github.com/seanmiddleditch/libtelnet.
  * Modified and re-released under the BSD license.
  *
- * The original authors of libtelnet are listed below.  Per their licesne,
+ * The original authors of libtelnet are listed below.  Per their license,
  * "The author or authors of this code dedicate any and all copyright
  * interest in this code to the public domain. We make this dedication for
  * the benefit of the public at large and to the detriment of our heirs and
@@ -52,6 +52,7 @@
  *   (Also listed in the AUTHORS file are Jack Kelly <endgame.dos@gmail.com>
  *   and Katherine Flavel <kate@elide.org>)
  */
+
 /****************************************************************************
  * Included Files
  ****************************************************************************/
@@ -254,6 +255,12 @@ static void _online(const char *line, int overflow, void *ud)
       /* Keep name */
 
       user->name = strdup(line);
+      if (user->name == NULL)
+        {
+          telnet_printf(user->telnet, "Out of memory.\nEnter name: ");
+          return;
+        }
+
       telnet_printf(user->telnet, "Welcome, %s!\n", line);
       return;
     }

From 85680134366118955daa7c00fffada10c9ef3208 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Sat, 23 May 2026 10:24:19 +0800
Subject: [PATCH 349/568] netutils/thttpd: Apply the same check to related
 allocation sites

Extend the allocation-failure check to httpd_strdup(), the thttpd-local wrapper that has the same failure contract as strdup().

This is logically separable from the direct strdup()/asprintf() fixes: it prevents using hs->hostname before checking whether the wrapped string allocation succeeded, and releases the partially allocated server state on failure.

The scope intentionally does not extend to malloc(), calloc(), or other raw allocators because #1727 specifically calls out strdup()/asprintf(), and covering all allocation APIs would make this PR much broader.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 netutils/thttpd/libhttpd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 1a7d46c13..8be1c6ec9 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -2163,14 +2163,15 @@ FAR httpd_server *httpd_initialize(FAR httpd_sockaddr *sa)
 #else
   hs->hostname = httpd_strdup(httpd_ntoa(sa));
 #endif
-  ninfo("hostname: %s\n", hs->hostname);
-
   if (!hs->hostname)
     {
       nerr("ERROR: out of memory copying hostname\n");
+      free_httpd_server(hs);
       return NULL;
     }
 
+  ninfo("hostname: %s\n", hs->hostname);
+
   hs->cgi_count = 0;
 
   /* Initialize listen sockets */

From 2d6cd7421554a8c040f33b8bc421167f58f055fb Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Sun, 24 May 2026 10:30:11 +0800
Subject: [PATCH 350/568] testing/sd_stress: Handle stale temporary directories

Fix #3205 by removing stale sdstress work directories left by previous interrupted or failed runs before starting a new test.

The cleanup only removes entries matching the generated tmpNNN file pattern. If the directory contains any unexpected entry, the test fails instead of deleting user data.

Also make create_dir() and remove_dir() use their path argument instead of the fixed temporary directory names.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 testing/drivers/sd_stress/sd_stress_main.c | 100 ++++++++++++++++++++-
 1 file changed, 98 insertions(+), 2 deletions(-)

diff --git a/testing/drivers/sd_stress/sd_stress_main.c b/testing/drivers/sd_stress/sd_stress_main.c
index 39c3e563e..882bec362 100644
--- a/testing/drivers/sd_stress/sd_stress_main.c
+++ b/testing/drivers/sd_stress/sd_stress_main.c
@@ -47,12 +47,14 @@
  * Included Files
  ****************************************************************************/
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -94,7 +96,7 @@ static void usage(void)
 
 static bool create_dir(const char *path)
 {
-  int ret = mkdir(TEMPDIR, S_IRWXU | S_IRWXG | S_IRWXO);
+  int ret = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO);
 
   if (ret < 0)
     {
@@ -108,7 +110,7 @@ static bool create_dir(const char *path)
 
 static bool remove_dir(const char *path)
 {
-  int ret = rmdir(TEMPDIR2);
+  int ret = rmdir(path);
 
   if (ret < 0)
     {
@@ -120,6 +122,94 @@ static bool remove_dir(const char *path)
   return true;
 }
 
+static bool is_temp_file(const char *name, const char *prefix)
+{
+  size_t prefix_len = strlen(prefix);
+  int i;
+
+  if (strncmp(name, prefix, prefix_len) != 0)
+    {
+      return false;
+    }
+
+  for (i = 0; i < 3; i++)
+    {
+      char ch = name[prefix_len + i];
+
+      if (ch < '0' || ch > '9')
+        {
+          return false;
+        }
+    }
+
+  return name[prefix_len + i] == '\0';
+}
+
+static bool cleanup_dir(const char *path, const char *name)
+{
+  FAR DIR *dir;
+  FAR struct dirent *entry;
+  char filepath[MAX_PATH_LEN];
+  int ret;
+
+  dir = opendir(path);
+  if (dir == NULL)
+    {
+      if (errno == ENOENT)
+        {
+          return true;
+        }
+
+      printf("opendir %s failed, errno: %d -> %s\n",
+             path, errno, strerror(errno));
+      return false;
+    }
+
+  while ((entry = readdir(dir)) != NULL)
+    {
+      if (strcmp(entry->d_name, ".") == 0 ||
+          strcmp(entry->d_name, "..") == 0)
+        {
+          continue;
+        }
+
+      if (!is_temp_file(entry->d_name, name))
+        {
+          printf("%s contains unexpected entry %s\n", path, entry->d_name);
+          closedir(dir);
+          return false;
+        }
+
+      ret = snprintf(filepath, sizeof(filepath), "%s/%s",
+                     path, entry->d_name);
+      if (ret < 0 || (size_t)ret >= sizeof(filepath))
+        {
+          printf("path name too long\n");
+          closedir(dir);
+          return false;
+        }
+
+      ret = unlink(filepath);
+      if (ret < 0)
+        {
+          printf("unlink %s failed, ret: %d, errno %d -> %s\n",
+                 filepath, ret, errno, strerror(errno));
+          closedir(dir);
+          return false;
+        }
+    }
+
+  ret = closedir(dir);
+  if (ret < 0)
+    {
+      printf("closedir %s failed, ret: %d, errno %d -> %s\n",
+             path, ret, errno, strerror(errno));
+      return false;
+    }
+
+  return remove_dir(path);
+}
+
 static bool create_files(const char *dir, const char *name,
                          size_t num_files, char *bytes, size_t num_bytes)
 {
@@ -372,6 +462,12 @@ int main(int argc, char *argv[])
 
   total_time = 0;
 
+  if (!cleanup_dir(TEMPDIR, TEMPFILE) || !cleanup_dir(TEMPDIR2, TEMPFILE))
+    {
+      free(bytes);
+      return -1;
+    }
+
   for (size_t i = 0; i < num_runs; ++i)
     {
       start = get_abs_time();

From f8a48fa5f35f5d6aaceb66859dac578d6fdaff13 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Sun, 24 May 2026 10:30:56 +0800
Subject: [PATCH 351/568] testing/sd_stress: Harden file creation cleanup

Close the temporary file descriptor when create_files() fails after open(), and release the read buffer before returning from the path-length failure branch.

This is logically separable from the #3205 stale-directory fix: it does not change how existing /sd/stress is handled, but keeps the same failure paths from leaking resources while the stress test exits after an error.

The scope intentionally stays within sd_stress failure cleanup and does not touch SD/MMC transfer behavior or other testing drivers.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 testing/drivers/sd_stress/sd_stress_main.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/testing/drivers/sd_stress/sd_stress_main.c b/testing/drivers/sd_stress/sd_stress_main.c
index 882bec362..dffdd16c5 100644
--- a/testing/drivers/sd_stress/sd_stress_main.c
+++ b/testing/drivers/sd_stress/sd_stress_main.c
@@ -233,6 +233,7 @@ static bool create_files(const char *dir, const char *name,
   if (path_len + 5 >= MAX_PATH_LEN)
     {
       printf("path name too long\n");
+      free(read_bytes);
       return false;
     }
 
@@ -267,7 +268,7 @@ static bool create_files(const char *dir, const char *name,
           printf("write %s failed, ret: %d, errno %d -> %s\n",
                  path, ret, errno, strerror(errno));
           passed = false;
-          break;
+          goto close_file;
         }
 
       ret = lseek(fd, 0, SEEK_SET);
@@ -277,7 +278,7 @@ static bool create_files(const char *dir, const char *name,
           printf("lseek %s failed, ret: %d, errno %d -> %s\n",
                  path, ret, errno, strerror(errno));
           passed = false;
-          break;
+          goto close_file;
         }
 
       ret = read(fd, read_bytes, num_bytes);
@@ -287,16 +288,17 @@ static bool create_files(const char *dir, const char *name,
           printf("read %s failed, ret: %d, errno %d -> %s\n",
                  path, ret, errno, strerror(errno));
           passed = false;
-          break;
+          goto close_file;
         }
 
       if (memcmp(read_bytes, bytes, num_bytes) != 0)
         {
           printf("read and write buffers are not the same\n");
           passed = false;
-          break;
+          goto close_file;
         }
 
+close_file:
       ret = close(fd);
 
       if (ret < 0)
@@ -306,6 +308,11 @@ static bool create_files(const char *dir, const char *name,
           passed = false;
           break;
         }
+
+      if (!passed)
+        {
+          break;
+        }
     }
 
   free(read_bytes);

From 2d949fa7c57b1a836f1217d8093787a63c9c04a1 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Mon, 25 May 2026 10:46:59 +0800
Subject: [PATCH 352/568] system/settings: Avoid recursive save locking

Fix #3105 by making the immediate save path write pending settings while the caller still owns g_settings.mtx instead of calling the timer callback, which locks the same mutex again.

The cached-save timer callback still takes the mutex before using the same locked helper, so asynchronous saves keep their existing synchronization while non-cached saves no longer depend on a recursive mutex.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 system/settings/settings.c | 70 ++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/system/settings/settings.c b/system/settings/settings.c
index 105c093dd..c478e96f8 100644
--- a/system/settings/settings.c
+++ b/system/settings/settings.c
@@ -82,7 +82,10 @@ static int      set_ip(FAR setting_t *setting, FAR struct in_addr *ip);
 static int      load(void);
 static void     save(void);
 static void     signotify(void);
+static void     dump_cache_locked(FAR bool *wrpend);
+#ifdef CONFIG_SYSTEM_SETTINGS_CACHED_SAVES
 static void     dump_cache(union sigval ptr);
+#endif
 
 /****************************************************************************
  * Private Data
@@ -623,12 +626,7 @@ static void save(void)
 #ifdef CONFIG_SYSTEM_SETTINGS_CACHED_SAVES
   timer_settime(g_settings.timerid, 0, &g_settings.trigger, NULL);
 #else
-  union sigval value =
-  {
-    .sival_ptr = &g_settings.wrpend,
-  };
-
-  dump_cache(value);
+  dump_cache_locked(&g_settings.wrpend);
 #endif
 }
 
@@ -661,6 +659,38 @@ static void signotify(void)
     }
 }
 
+/****************************************************************************
+ * Name: dump_cache_locked
+ *
+ * Description:
+ *    Writes out the cached data to the appropriate storage.  The caller
+ *    must hold g_settings.mtx.
+ *
+ * Input Parameters:
+ *    wrpend           - pending write flag to clear after dumping
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static void dump_cache_locked(FAR bool *wrpend)
+{
+  int i;
+
+  for (i = 0; i < CONFIG_SYSTEM_SETTINGS_MAX_STORAGES; i++)
+    {
+      if ((g_settings.store[i].file[0] != '\0') &&
+           g_settings.store[i].save_fn)
+        {
+          (void)g_settings.store[i].save_fn(g_settings.store[i].file);
+        }
+    }
+
+  *wrpend = false;
+}
+
+#ifdef CONFIG_SYSTEM_SETTINGS_CACHED_SAVES
 /****************************************************************************
  * Name: dump_cache
  *
@@ -677,36 +707,16 @@ static void signotify(void)
 
 static void dump_cache(union sigval ptr)
 {
-  int ret = OK;
-  FAR bool *wrpend = (bool *)ptr.sival_ptr;
-
-  int i;
+  FAR bool *wrpend = (FAR bool *)ptr.sival_ptr;
+  int ret;
 
   ret = pthread_mutex_lock(&g_settings.mtx);
   assert(ret >= 0);
 
-  for (i = 0; i < CONFIG_SYSTEM_SETTINGS_MAX_STORAGES; i++)
-    {
-      if ((g_settings.store[i].file[0] != '\0') &&
-           g_settings.store[i].save_fn)
-        {
-          ret = g_settings.store[i].save_fn(g_settings.store[i].file);
-#if 0
-          if (ret < 0)
-            {
-              /* What to do? We can't return anything from a void function.
-               *
-               * MIGHT BE A FUTURE REVISIT NEEDED
-               */
-            }
-#endif
-        }
-    }
-
-  *wrpend = false;
-
+  dump_cache_locked(wrpend);
   pthread_mutex_unlock(&g_settings.mtx);
 }
+#endif
 
 /****************************************************************************
  * Name: sanity_check

From 0dd221cc763a6b41198868f245593126741d6ba5 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Mon, 25 May 2026 10:47:43 +0800
Subject: [PATCH 353/568] system/settings: Drop unused recursive mutex type

The settings save path no longer re-enters g_settings.mtx, so the mutex does not need to be initialized as PTHREAD_MUTEX_RECURSIVE.

This keeps the #3105 fix independent of CONFIG_PTHREAD_MUTEX_TYPES and destroys the temporary mutex attribute object after initialization.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 system/settings/settings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/settings/settings.c b/system/settings/settings.c
index c478e96f8..1625c3f5a 100644
--- a/system/settings/settings.c
+++ b/system/settings/settings.c
@@ -772,9 +772,9 @@ void settings_init(void)
   pthread_mutexattr_t attr;
 
   pthread_mutexattr_init(&attr);
-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
   pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
   pthread_mutex_init(&g_settings.mtx, &attr);
+  pthread_mutexattr_destroy(&attr);
 
   memset(map, 0, sizeof(map));
   memset(g_settings.store, 0, sizeof(g_settings.store));

From 0f8f9125f08bbe68bfcedd21e7c1b88a88037b09 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 05:00:00 +0000
Subject: [PATCH 354/568] apps/system/microros: add micro_ros_lib directory
 skeleton.

Add micro_ros_lib/ subdirectory with a .keep sentinel so the directory
is tracked by git before any generated build artifacts appear.  All
colcon/fetch outputs land here and are gitignored by the parent .gitignore.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/micro_ros_lib/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 system/microros/micro_ros_lib/.keep

diff --git a/system/microros/micro_ros_lib/.keep b/system/microros/micro_ros_lib/.keep
new file mode 100644
index 000000000..e69de29bb

From 98d3a0bcb051e04c22f880fe5292ec7e89dbf991 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 05:43:58 +0000
Subject: [PATCH 355/568] apps/system/microros: add colcon.meta.in
 resource-limit template.

Add a colcon.meta.in template that is substituted at build time with
Kconfig values.  Key settings:
  - Custom transport only (UCLIENT_PROFILE_CUSTOM_TRANSPORT=ON,
    UCLIENT_PROFILE_STREAM_FRAMING=ON) -- actual UDP/serial callbacks
    are wired in Phase 4.
  - RCL_MICROROS=ON (Jazzy/Kilted renamed flag replacing the old
    RCL_COMMAND_LINE_ENABLED/RCL_LOGGING_ENABLED pair).
  - RCUTILS_NO_FILESYSTEM=OFF -- NuttX provides POSIX filesystem.
  - Resource limits use @MAX_NODES@/@MAX_PUBLISHERS@ etc. placeholders
    substituted from CONFIG_MICROROS_MAX_* Kconfig values.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/micro_ros_lib/colcon.meta.in | 52 ++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 system/microros/micro_ros_lib/colcon.meta.in

diff --git a/system/microros/micro_ros_lib/colcon.meta.in b/system/microros/micro_ros_lib/colcon.meta.in
new file mode 100644
index 000000000..00468545b
--- /dev/null
+++ b/system/microros/micro_ros_lib/colcon.meta.in
@@ -0,0 +1,52 @@
+{
+  "names": {
+    "microxrcedds_client": {
+      "cmake-args": [
+        "-DUCLIENT_PIC=OFF",
+        "-DUCLIENT_PROFILE_DISCOVERY=OFF",
+        "-DUCLIENT_PROFILE_UDP=OFF",
+        "-DUCLIENT_PROFILE_TCP=OFF",
+        "-DUCLIENT_PROFILE_SERIAL=OFF",
+        "-DUCLIENT_PROFILE_CUSTOM_TRANSPORT=ON",
+        "-DUCLIENT_PROFILE_STREAM_FRAMING=ON",
+        "-DUCLIENT_EXTERNAL_SERIAL=ON"
+      ]
+    },
+    "rmw_microxrcedds": {
+      "cmake-args": [
+        "-DRMW_UXRCE_TRANSPORT=custom",
+        "-DRMW_UXRCE_MAX_NODES=@MAX_NODES@",
+        "-DRMW_UXRCE_MAX_PUBLISHERS=@MAX_PUBLISHERS@",
+        "-DRMW_UXRCE_MAX_SUBSCRIPTIONS=@MAX_SUBSCRIPTIONS@",
+        "-DRMW_UXRCE_MAX_SERVICES=@MAX_SERVICES@",
+        "-DRMW_UXRCE_MAX_CLIENTS=@MAX_CLIENTS@",
+        "-DRMW_UXRCE_MAX_HISTORY=4"
+      ]
+    },
+    "rcl": {
+      "cmake-args": [
+        "-DRCL_MICROROS=ON"
+      ]
+    },
+    "rcutils": {
+      "cmake-args": [
+        "-DRCUTILS_NO_FILESYSTEM=OFF",
+        "-DRCUTILS_NO_THREAD_SUPPORT=ON",
+        "-DRCUTILS_NO_64_ATOMIC=ON",
+        "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON",
+        "-DENABLE_TESTING=OFF"
+      ]
+    },
+    "rosidl_typesupport": {
+      "cmake-args": [
+        "-DROSIDL_TYPESUPPORT_SINGLE_TYPESUPPORT=ON"
+      ]
+    },
+    "tracetools": {
+      "cmake-args": [
+        "-DTRACETOOLS_DISABLED=ON",
+        "-DTRACETOOLS_STATUS_CHECKING_TOOL=OFF"
+      ]
+    }
+  }
+}

From e764594d2607b0a4cb680935240ea1655a8db889 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 06:23:38 +0000
Subject: [PATCH 356/568] apps/system/microros: add CMake cross-compile
 toolchain template.

Add toolchain.cmake.in and include_override/assert.h for the colcon
cross-build.  Key differences from the old robertobucher port:
  - Drop -DCLOCK_MONOTONIC=0: NuttX defines CLOCK_MONOTONIC=1 and
    the override broke nanosleep() on newer kernels.
  - CMAKE_SYSTEM_PROCESSOR is a placeholder substituted per-arch.
  - include_override/assert.h works around the rosidl NDEBUG issue
    (https://github.com/ros2/rosidl/pull/739).

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 .../micro_ros_lib/include_override/assert.h   | 41 +++++++++++++++++++
 .../microros/micro_ros_lib/toolchain.cmake.in | 29 +++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 system/microros/micro_ros_lib/include_override/assert.h
 create mode 100644 system/microros/micro_ros_lib/toolchain.cmake.in

diff --git a/system/microros/micro_ros_lib/include_override/assert.h b/system/microros/micro_ros_lib/include_override/assert.h
new file mode 100644
index 000000000..1874aa304
--- /dev/null
+++ b/system/microros/micro_ros_lib/include_override/assert.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * apps/system/microros/micro_ros_lib/include_override/assert.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __MICROROS_INCLUDE_OVERRIDE_ASSERT_H
+#define __MICROROS_INCLUDE_OVERRIDE_ASSERT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Pull the system assert.h, then redefine assert to a no-op when NDEBUG is
+ * set.  Avoids an assert redefinition conflict in rosidl typesupport.
+ */
+
+#include_next <assert.h>
+
+#ifdef NDEBUG
+#  undef assert
+#  define assert(x) ((void)(0))
+#endif
+
+#endif /* __MICROROS_INCLUDE_OVERRIDE_ASSERT_H */
diff --git a/system/microros/micro_ros_lib/toolchain.cmake.in b/system/microros/micro_ros_lib/toolchain.cmake.in
new file mode 100644
index 000000000..dbdc290e2
--- /dev/null
+++ b/system/microros/micro_ros_lib/toolchain.cmake.in
@@ -0,0 +1,29 @@
+include(CMakeForceCompiler)
+
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR @CMAKE_SYSTEM_PROCESSOR@)
+set(CMAKE_CROSSCOMPILING 1)
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(PLATFORM_NAME "nuttx")
+
+set(CMAKE_C_COMPILER @CMAKE_C_COMPILER@)
+set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
+
+set(CMAKE_C_FLAGS_INIT "-std=c11 @ARCH_C_FLAGS@ -D'__attribute__(x)='" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_INIT "-std=c++14 @ARCH_CPP_FLAGS@ -fno-rtti -D'__attribute__(x)='" CACHE STRING "" FORCE)
+
+set(NUTTX_TOPDIR @NUTTX_TOPDIR@)
+set(NUTTX_APPDIR @NUTTX_APPDIR@)
+set(INCLUDE_OVR_DIR @INCLUDE_OVR_DIR@)
+
+include_directories(SYSTEM
+	${NUTTX_TOPDIR}/include
+	${NUTTX_TOPDIR}/include/cxx
+	${NUTTX_APPDIR}/include
+)
+
+include_directories(AFTER SYSTEM
+	${INCLUDE_OVR_DIR}/include_override
+)
+
+set(__BIG_ENDIAN__ 0)

From b1a4d3fcd5f35a4b82aaadb9158356b2313433d3 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 07:04:05 +0000
Subject: [PATCH 357/568] apps/system/microros: add libmicroros.a colcon build
 pipeline.

Replace the Directory.mk stub with a full Application.mk-based Makefile
that builds libmicroros.a from upstream micro-ROS sources via colcon.
Build pipeline (six steps, each a Make target):

  1. micro_ros_dev/install  -- clone + build ament/colcon host tools
  2. micro_ros_src/src      -- git clone all Jazzy micro-ROS packages
                               with --depth 1; apply DIR-typedef guard
                               patch; mark unused packages COLCON_IGNORE
  3. toolchain.cmake        -- sed-substitute CC/CXX/CFLAGS into template
  4. colcon.meta            -- sed-substitute Kconfig resource limits
  5. micro_ros_src/install  -- colcon cross-build (merge-install,
                               packages-ignore-regex=.*_cpp)
  6. libmicroros.a          -- ar-merge all install/lib/*.a into one
                               archive; copy include/ tree

clean:: removes generated files; distclean:: removes all fetched dirs.
Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/Makefile | 223 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 222 insertions(+), 1 deletion(-)

diff --git a/system/microros/Makefile b/system/microros/Makefile
index b907087ee..6d34e3cc3 100644
--- a/system/microros/Makefile
+++ b/system/microros/Makefile
@@ -20,6 +20,227 @@
 #
 ############################################################################
 
+include $(APPDIR)/Make.defs
+
+MICROROS_DIR     := $(APPDIR)/system/microros
+MICROROS_LIB_DIR := $(MICROROS_DIR)/micro_ros_lib
+MICROROS_DISTRO  := $(patsubst "%",%,$(CONFIG_MICROROS_DISTRO))
+MICROROS_AR      := $(CROSSDEV)ar
+
+MAX_NODES   := $(CONFIG_MICROROS_MAX_NODES)
+MAX_PUB     := $(CONFIG_MICROROS_MAX_PUBLISHERS)
+MAX_SUB     := $(CONFIG_MICROROS_MAX_SUBSCRIPTIONS)
+MAX_SVC     := $(CONFIG_MICROROS_MAX_SERVICES)
+MAX_CLIENTS := $(CONFIG_MICROROS_MAX_CLIENTS)
+
+# Escape for sed: forward slashes and strip quotes
+ESCAPED_CC     := $(subst /,\/,$(CC))
+ESCAPED_CXX    := $(subst /,\/,$(CXX))
+ESCAPED_TOPDIR := $(subst /,\/,$(TOPDIR))
+ESCAPED_APPDIR := $(subst /,\/,$(APPDIR))
+ESCAPED_LIBDIR := $(subst /,\/,$(MICROROS_LIB_DIR))
+ESCAPED_CFLAGS   := $(subst /,\/,$(subst ",,$(CFLAGS)))
+ESCAPED_CXXFLAGS := $(subst /,\/,$(subst ",,$(CXXFLAGS)))
+
 MENUDESC = "micro-ROS Library"
 
-include $(APPDIR)/Directory.mk
+# Architecture for CMake toolchain
+ifeq ($(CONFIG_ARCH_ARM),y)
+MICROROS_ARCH := arm
+else ifeq ($(CONFIG_ARCH_ARM64),y)
+MICROROS_ARCH := arm64
+else ifeq ($(CONFIG_ARCH_RISCV),y)
+MICROROS_ARCH := riscv
+else ifeq ($(CONFIG_ARCH_XTENSA),y)
+MICROROS_ARCH := xtensa
+else
+MICROROS_ARCH := generic
+endif
+
+# Wire libmicroros.a into the build when the context target fires
+context:: $(MICROROS_DIR)/libmicroros.a
+
+# ---------------------------------------------------------------------------
+# Step 1 – Build the ament/colcon dev tools (host-side)
+# ---------------------------------------------------------------------------
+
+$(MICROROS_LIB_DIR)/micro_ros_dev/install:
+	rm -rf $(MICROROS_LIB_DIR)/micro_ros_dev
+	mkdir -p $(MICROROS_LIB_DIR)/micro_ros_dev/src
+	cd $(MICROROS_LIB_DIR)/micro_ros_dev && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ament/ament_cmake src/ament_cmake && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ament/ament_lint src/ament_lint && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ament/ament_package src/ament_package && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ament/googletest src/googletest && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ament/ament_index src/ament_index && \
+	  touch src/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE 2>/dev/null || true && \
+	  touch src/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE 2>/dev/null || true && \
+	  colcon build --cmake-args -DBUILD_TESTING=OFF
+
+# ---------------------------------------------------------------------------
+# Step 2 – Clone all micro-ROS source packages
+# ---------------------------------------------------------------------------
+
+$(MICROROS_LIB_DIR)/micro_ros_src/src: $(MICROROS_LIB_DIR)/micro_ros_dev/install
+	rm -rf $(MICROROS_LIB_DIR)/micro_ros_src
+	mkdir -p $(MICROROS_LIB_DIR)/micro_ros_src/src
+	cd $(MICROROS_LIB_DIR)/micro_ros_src && \
+	  git clone -b ros2 --depth 1 \
+	    https://github.com/eProsima/micro-CDR src/micro-CDR && \
+	  git clone -b ros2 --depth 1 \
+	    https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/rmw-microxrcedds src/rmw_microxrcedds && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/rcl src/rcl && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rclc src/rclc && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/rcutils src/rcutils && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rosidl src/rosidl && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rosidl_defaults src/rosidl_defaults && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rosidl_core src/rosidl_core && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rmw src/rmw && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rmw_implementation src/rmw_implementation && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rcl_interfaces src/rcl_interfaces && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/common_interfaces src/common_interfaces && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/rcl_logging src/rcl_logging && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/test_interface_files src/test_interface_files && \
+	  git clone -b $(MICROROS_DISTRO) --depth 1 \
+	    https://github.com/ros2/ros2_tracing src/ros2_tracing && \
+	  touch src/ros2_tracing/test_tracetools/COLCON_IGNORE && \
+	  touch src/ros2_tracing/lttngpy/COLCON_IGNORE && \
+	  touch src/rmw/rmw_security_common/COLCON_IGNORE && \
+	  touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE && \
+	  touch src/rclc/rclc_examples/COLCON_IGNORE && \
+	  touch src/rcl/rcl_yaml_param_parser/COLCON_IGNORE && \
+	  touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE && \
+	  touch src/rcl_interfaces/test_msgs/COLCON_IGNORE && \
+	  touch src/common_interfaces/actionlib_msgs/COLCON_IGNORE && \
+	  touch src/common_interfaces/std_srvs/COLCON_IGNORE && \
+	  patch -p1 --forward --ignore-whitespace \
+	    -d src < $(MICROROS_LIB_DIR)/patches/0001-dir-typedef-nuttx-guard.patch || true && \
+	  patch -p1 --forward --ignore-whitespace \
+	    -d src < $(MICROROS_LIB_DIR)/patches/0002-rcutils-process-nuttx-compat.patch || true && \
+	  patch -p1 --forward --ignore-whitespace \
+	    -d src < $(MICROROS_LIB_DIR)/patches/0003-rcutils-strcasecmp-include-strings-h.patch || true
+
+# ---------------------------------------------------------------------------
+# Step 3 – Generate toolchain.cmake from template
+# ---------------------------------------------------------------------------
+
+$(MICROROS_LIB_DIR)/toolchain.cmake: $(MICROROS_LIB_DIR)/toolchain.cmake.in
+	sed \
+	  -e 's/@CMAKE_C_COMPILER@/$(ESCAPED_CC)/g' \
+	  -e 's/@CMAKE_CXX_COMPILER@/$(ESCAPED_CXX)/g' \
+	  -e 's/@ARCH_C_FLAGS@/$(ESCAPED_CFLAGS)/g' \
+	  -e 's/@ARCH_CPP_FLAGS@/$(ESCAPED_CXXFLAGS)/g' \
+	  -e 's/@NUTTX_TOPDIR@/$(ESCAPED_TOPDIR)/g' \
+	  -e 's/@NUTTX_APPDIR@/$(ESCAPED_APPDIR)/g' \
+	  -e 's/@INCLUDE_OVR_DIR@/$(ESCAPED_LIBDIR)/g' \
+	  -e 's/@CMAKE_SYSTEM_PROCESSOR@/$(MICROROS_ARCH)/g' \
+	  $< > $@
+
+# ---------------------------------------------------------------------------
+# Step 4 – Generate colcon.meta from template
+# ---------------------------------------------------------------------------
+
+$(MICROROS_LIB_DIR)/colcon.meta: $(MICROROS_LIB_DIR)/colcon.meta.in
+	sed \
+	  -e 's/@MAX_NODES@/$(MAX_NODES)/g' \
+	  -e 's/@MAX_PUBLISHERS@/$(MAX_PUB)/g' \
+	  -e 's/@MAX_SUBSCRIPTIONS@/$(MAX_SUB)/g' \
+	  -e 's/@MAX_SERVICES@/$(MAX_SVC)/g' \
+	  -e 's/@MAX_CLIENTS@/$(MAX_CLIENTS)/g' \
+	  $< > $@
+
+# ---------------------------------------------------------------------------
+# Step 5 – Cross-build micro-ROS packages with colcon
+# ---------------------------------------------------------------------------
+
+$(MICROROS_LIB_DIR)/micro_ros_src/install: \
+    $(MICROROS_LIB_DIR)/toolchain.cmake \
+    $(MICROROS_LIB_DIR)/colcon.meta \
+    $(MICROROS_LIB_DIR)/micro_ros_src/src
+	cd $(MICROROS_LIB_DIR)/micro_ros_src && \
+	  unset AMENT_PREFIX_PATH && \
+	  . ../micro_ros_dev/install/local_setup.sh && \
+	  colcon build \
+	    --merge-install \
+	    "--packages-ignore-regex=(.*_cpp$$|.*_py$$|test_rmw_implementation|rclc_examples)" \
+	    --metas $(MICROROS_LIB_DIR)/colcon.meta \
+	    --cmake-args \
+	      --no-warn-unused-cli \
+	      -DCMAKE_POSITION_INDEPENDENT_CODE=OFF \
+	      -DTHIRDPARTY=ON \
+	      -DBUILD_SHARED_LIBS=OFF \
+	      -DBUILD_TESTING=OFF \
+	      -DCMAKE_BUILD_TYPE=Release \
+	      "-DCMAKE_TOOLCHAIN_FILE=$(MICROROS_LIB_DIR)/toolchain.cmake" \
+	      -DCMAKE_VERBOSE_MAKEFILE=OFF
+
+# ---------------------------------------------------------------------------
+# Step 6 – Merge all .a files into a single libmicroros.a
+# ---------------------------------------------------------------------------
+
+$(MICROROS_DIR)/libmicroros.a: $(MICROROS_LIB_DIR)/micro_ros_src/install
+	mkdir -p $(MICROROS_LIB_DIR)/libmicroros_obj
+	cd $(MICROROS_LIB_DIR)/libmicroros_obj && \
+	  for file in $$(find $(MICROROS_LIB_DIR)/micro_ros_src/install/lib/ -name '*.a'); do \
+	    folder=$$(basename $$file .a); \
+	    mkdir -p $$folder && cd $$folder; \
+	    $(MICROROS_AR) x $$file; \
+	    for f in *; do \
+	      [ -f "$$f" ] && mv "$$f" "../$${folder}-$${f}" 2>/dev/null || true; \
+	    done; \
+	    cd ..; \
+	    rm -rf $$folder; \
+	  done && \
+	  $(MICROROS_AR) rc libmicroros.a $$(find . -maxdepth 1 -type f ! -name 'libmicroros.a') && \
+	  cp libmicroros.a $(MICROROS_DIR)/
+	cd $(MICROROS_LIB_DIR) && rm -rf libmicroros_obj
+	cp -R $(MICROROS_LIB_DIR)/micro_ros_src/install/include $(MICROROS_DIR)/include
+
+# ---------------------------------------------------------------------------
+# Cleanup targets
+# ---------------------------------------------------------------------------
+
+clean::
+	$(call DELFILE,$(MICROROS_DIR)/libmicroros.a)
+	$(call DELDIR,$(MICROROS_DIR)/include)
+	$(call DELFILE,$(MICROROS_LIB_DIR)/toolchain.cmake)
+	$(call DELFILE,$(MICROROS_LIB_DIR)/colcon.meta)
+
+distclean:: clean
+	$(call DELDIR,$(MICROROS_LIB_DIR)/micro_ros_src)
+	$(call DELDIR,$(MICROROS_LIB_DIR)/micro_ros_dev)
+
+include $(APPDIR)/Application.mk

From cb316ec1659542e6ae8024cfe1d3aed76bb224c6 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 07:44:01 +0000
Subject: [PATCH 358/568] apps/system/microros: wire libmicroros.a into LDLIBS
 and CFLAGS.

When CONFIG_SYSTEM_MICROROS=y, add the prebuilt libmicroros.a to LDLIBS
and the colcon-installed include/ tree to CFLAGS/CXXFLAGS so that any
application in nuttx-apps can include micro-ROS headers and link against
the library without extra flags.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/Make.defs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/microros/Make.defs b/system/microros/Make.defs
index 5ec456770..ae95e997d 100644
--- a/system/microros/Make.defs
+++ b/system/microros/Make.defs
@@ -19,3 +19,12 @@
 # under the License.
 #
 ############################################################################
+
+ifneq ($(CONFIG_SYSTEM_MICROROS),)
+CONFIGURED_APPS += $(APPDIR)/system/microros
+
+CFLAGS   += ${INCDIR_PREFIX}$(APPDIR)/system/microros/include
+CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/microros/include
+
+LDLIBS   += $(APPDIR)/system/microros/libmicroros.a
+endif

From 7dbebe1673afc25228c3da82be9cfb7e3d10c5ec Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 08:29:50 +0000
Subject: [PATCH 359/568] apps/system/microros: add DIR-typedef NuttX guard
 patch.

NuttX defines DIR as a struct type in dirent.h.  The rcutils filesystem
source has a bare typedef int DIR that triggers a redefinition error when
NuttX system headers are on the include path.  Guard it with #ifndef DIR
so the typedef is skipped when the type is already defined.

Applied automatically during the micro_ros_src/src fetch step with
  patch -p1 --forward --ignore-whitespace ... || true
so the build is idempotent if the upstream ever merges a fix.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 .../0001-dir-typedef-nuttx-guard.patch        | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 system/microros/patches/0001-dir-typedef-nuttx-guard.patch

diff --git a/system/microros/patches/0001-dir-typedef-nuttx-guard.patch b/system/microros/patches/0001-dir-typedef-nuttx-guard.patch
new file mode 100644
index 000000000..75e4f91d9
--- /dev/null
+++ b/system/microros/patches/0001-dir-typedef-nuttx-guard.patch
@@ -0,0 +1,31 @@
+From: micro-ROS NuttX Port <noreply@nuttx.apache.org>
+Subject: [PATCH] rcutils: guard bare DIR typedef to avoid conflict with NuttX dirent.h
+
+NuttX defines DIR as a struct type in dirent.h.  The bare
+  typedef int DIR;
+in rcutils/src/filesystem.c causes a redefinition error when the
+NuttX system headers are on the include path.  Guard it so it is
+only emitted when DIR has not already been defined.
+
+--- a/rcutils/src/filesystem.c
++++ b/rcutils/src/filesystem.c
+@@ -1,6 +1,8 @@
+ // Copyright 2017 Open Source Robotics Foundation, Inc.
+ //
+ // Licensed under the Apache License, Version 2.0 (the "License");
+ // you may not use this file except in compliance with the License.
+ // You may obtain a copy of the License at
+ //
+ //     http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing, software
+ // distributed under the License is distributed on an "AS IS" BASIS,
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+
+ #if !defined _WIN32 && !defined __QNXTO__
++#ifndef DIR
+ typedef int DIR;
++#endif
+ #endif

From 9a0c249c79dd81551aa2d71bba846e82f9c48876 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 09:10:51 +0000
Subject: [PATCH 360/568] apps/system/microros: add CMake ExternalProject build
 support.

Mirror the Makefile build pipeline into CMakeLists.txt using
ExternalProject_Add so that CMake-based NuttX builds (cmake --build)
can also produce libmicroros.a.  The external project delegates to the
existing Makefile targets, then exposes the result via an IMPORTED
STATIC library target with correct INTERFACE_INCLUDE_DIRECTORIES.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/CMakeLists.txt | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/system/microros/CMakeLists.txt b/system/microros/CMakeLists.txt
index 9edae8cef..44cd0d25b 100644
--- a/system/microros/CMakeLists.txt
+++ b/system/microros/CMakeLists.txt
@@ -21,5 +21,27 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_MICROROS)
-  nuttx_add_library(microros)
+  set(MICROROS_DIR ${CMAKE_CURRENT_LIST_DIR})
+  set(MICROROS_LIB_DIR ${MICROROS_DIR}/micro_ros_lib)
+  set(MICROROS_DISTRO ${CONFIG_MICROROS_DISTRO})
+
+  include(ExternalProject)
+
+  ExternalProject_Add(
+    microros_build
+    SOURCE_DIR ${MICROROS_LIB_DIR}
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND
+      ${CMAKE_COMMAND} -E env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+      AR=${CMAKE_AR} CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} make -C
+      ${MICROROS_DIR} libmicroros.a
+    INSTALL_COMMAND ""
+    BUILD_IN_SOURCE TRUE
+    BUILD_BYPRODUCTS ${MICROROS_DIR}/libmicroros.a)
+
+  nuttx_add_library(microros STATIC IMPORTED GLOBAL)
+  set_target_properties(
+    microros PROPERTIES IMPORTED_LOCATION ${MICROROS_DIR}/libmicroros.a
+                        INTERFACE_INCLUDE_DIRECTORIES ${MICROROS_DIR}/include)
+  add_dependencies(microros microros_build)
 endif()

From 55a7d4d2df0b95cda489afa3ad5c48d0ca3d4e5d Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 09:52:17 +0000
Subject: [PATCH 361/568] apps/system/microros: define __NuttX__ in
 cross-compile toolchain flags.

Add -D__NuttX__ to CMAKE_C_FLAGS_INIT and CMAKE_CXX_FLAGS_INIT in
toolchain.cmake.in so that all cross-compiled micro-ROS packages see the
NuttX target macro.  Without this, rcutils/src/process.c follows the
__linux__ branch and references program_invocation_name, a glibc-only
extension absent from the NuttX C library.

Pair with 0002-rcutils-process-nuttx-compat.patch which additionally
guards the linux branch with !defined(__NuttX__), ensuring the embedded
fallback path is taken on NuttX even if the host compiler defines any
linux-flavoured macros.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 .../microros/micro_ros_lib/toolchain.cmake.in |  4 ++--
 .../0002-rcutils-process-nuttx-compat.patch   | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 system/microros/patches/0002-rcutils-process-nuttx-compat.patch

diff --git a/system/microros/micro_ros_lib/toolchain.cmake.in b/system/microros/micro_ros_lib/toolchain.cmake.in
index dbdc290e2..8d3aabe3c 100644
--- a/system/microros/micro_ros_lib/toolchain.cmake.in
+++ b/system/microros/micro_ros_lib/toolchain.cmake.in
@@ -9,8 +9,8 @@ set(PLATFORM_NAME "nuttx")
 set(CMAKE_C_COMPILER @CMAKE_C_COMPILER@)
 set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
 
-set(CMAKE_C_FLAGS_INIT "-std=c11 @ARCH_C_FLAGS@ -D'__attribute__(x)='" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS_INIT "-std=c++14 @ARCH_CPP_FLAGS@ -fno-rtti -D'__attribute__(x)='" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_INIT "-std=c11 @ARCH_C_FLAGS@ -D__NuttX__ -D'__attribute__(x)='" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_INIT "-std=c++14 @ARCH_CPP_FLAGS@ -fno-rtti -D__NuttX__ -D'__attribute__(x)='" CACHE STRING "" FORCE)
 
 set(NUTTX_TOPDIR @NUTTX_TOPDIR@)
 set(NUTTX_APPDIR @NUTTX_APPDIR@)
diff --git a/system/microros/patches/0002-rcutils-process-nuttx-compat.patch b/system/microros/patches/0002-rcutils-process-nuttx-compat.patch
new file mode 100644
index 000000000..ca8b6c56a
--- /dev/null
+++ b/system/microros/patches/0002-rcutils-process-nuttx-compat.patch
@@ -0,0 +1,20 @@
+From: micro-ROS NuttX Port <noreply@nuttx.apache.org>
+Subject: [PATCH] rcutils: skip program_invocation_name on NuttX
+
+When cross-compiling for NuttX on a Linux host the compiler still
+defines __linux__, causing rcutils_get_executable_name() to reference
+program_invocation_name which is a glibc extension absent from the
+NuttX C library.  Guard the Linux branch with !defined(__NuttX__) so
+the "embedded OS" fallback (empty string) is taken instead.
+
+--- a/rcutils/src/process.c
++++ b/rcutils/src/process.c
+@@ -61,7 +61,7 @@ int rcutils_get_pid()
+ #if defined __APPLE__ || defined __FreeBSD__ || (defined __ANDROID__ && __ANDROID_API__ >= 21)
+   const char * appname = getprogname();
+ #elif defined __GNUC__ && !defined(__QNXNTO__) && !defined(__OHOS__)
+-  #if defined __linux__ || defined __linux || defined __gnu_linux__ || defined linux
++  #if (defined __linux__ || defined __linux || defined __gnu_linux__ || defined linux) && !defined(__NuttX__)
+     const char * appname = program_invocation_name;
+   #else
+     // Some embedded OS compile with __GNUC__ but are not quite conformant with GNU-specific extensions.

From 939ed0ca2a7b593949973be5d09aefea1b659418 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sat, 23 May 2026 15:40:17 +0000
Subject: [PATCH 362/568] apps/system/microros: add rcutils strcasecmp
 strings.h include patch.

POSIX specifies strcasecmp/strncasecmp in <strings.h>, not <string.h>.
On NuttX (and other strict POSIX environments) rcutils/src/strcasecmp.c
only includes <string.h>, causing an implicit-declaration error for
strcasecmp when cross-compiling.

Patch 0003 adds #include <strings.h> guarded by !_WIN32, matching the
existing Windows/POSIX split in the file.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 ...rcutils-strcasecmp-include-strings-h.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 system/microros/patches/0003-rcutils-strcasecmp-include-strings-h.patch

diff --git a/system/microros/patches/0003-rcutils-strcasecmp-include-strings-h.patch b/system/microros/patches/0003-rcutils-strcasecmp-include-strings-h.patch
new file mode 100644
index 000000000..7392f2828
--- /dev/null
+++ b/system/microros/patches/0003-rcutils-strcasecmp-include-strings-h.patch
@@ -0,0 +1,19 @@
+From: micro-ROS NuttX Port <noreply@nuttx.apache.org>
+Subject: [PATCH] rcutils: include <strings.h> for strcasecmp on NuttX
+
+POSIX specifies strcasecmp/strncasecmp in <strings.h>, not <string.h>.
+NuttX follows the standard strictly so omitting this header causes an
+"implicit declaration" error.  Guard the include with __NuttX__ so it
+only applies where needed and does not affect Linux or other platforms
+that already expose strcasecmp through <string.h>.
+
+--- a/rcutils/src/strcasecmp.c
++++ b/rcutils/src/strcasecmp.c
+@@ -17,6 +17,9 @@ extern "C"
+ #include <errno.h>
+ #include <string.h>
++#ifdef __NuttX__
++#include <strings.h>
++#endif
+
+ #include "rcutils/strcasecmp.h"

From 84022eaa8130fcc1cb09a01caaa4299bf5ee57c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 May 2026 03:48:08 +0000
Subject: [PATCH 363/568] build(deps): bump docker/login-action from 4.0.0 to
 4.2.0

Bumps [docker/login-action](https://github.com/docker/login-action) from 4.0.0 to 4.2.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/b45d80f862d83dbcd57f89517bcf500b2ab88fb2...650006c6eb7dba73a995cc03b0b2d7f5ca915bee)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fe967a7e..c159fe7ff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -163,7 +163,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2  # v4.0.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee  # v4.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -251,7 +251,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2  # v4.0.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee  # v4.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From d0fa5af39b8eaab9067db0dec45fbbf6f996e120 Mon Sep 17 00:00:00 2001
From: Jiri Vlasak <jvlasak@elektroline.cz>
Date: Mon, 11 May 2026 09:09:12 +0200
Subject: [PATCH 364/568] audioutils: Add RTTTL parsing library

Add a simple library for parsing Ring Tone Text Transfer Language
(RTTTL).

Signed-off-by: Jiri Vlasak <jvlasak@elektroline.cz>
---
 audioutils/rtttl-c/.gitignore |  1 +
 audioutils/rtttl-c/Kconfig    | 21 +++++++++++++++
 audioutils/rtttl-c/Make.defs  | 25 ++++++++++++++++++
 audioutils/rtttl-c/Makefile   | 50 +++++++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 audioutils/rtttl-c/.gitignore
 create mode 100644 audioutils/rtttl-c/Kconfig
 create mode 100644 audioutils/rtttl-c/Make.defs
 create mode 100644 audioutils/rtttl-c/Makefile

diff --git a/audioutils/rtttl-c/.gitignore b/audioutils/rtttl-c/.gitignore
new file mode 100644
index 000000000..554f93513
--- /dev/null
+++ b/audioutils/rtttl-c/.gitignore
@@ -0,0 +1 @@
+/rtttl-c
diff --git a/audioutils/rtttl-c/Kconfig b/audioutils/rtttl-c/Kconfig
new file mode 100644
index 000000000..8ea3355d5
--- /dev/null
+++ b/audioutils/rtttl-c/Kconfig
@@ -0,0 +1,21 @@
+config AUDIOUTILS_RTTTL_C
+	bool "RTTTL parsing library"
+	default n
+	---help---
+		Simple library for parsing Ring Tone Text Transfer Language (RTTTL)
+
+		Define how to make a sound:
+
+			void
+			play_tone(struct rtttl_tone tone)
+			{
+				/* TODO: Make a sound with
+				 * 	tone.frequency_100hz
+				 *	tone.period_us
+				 *	tone.duration_us
+				 */
+			}
+
+		and then play RTTTL string:
+
+			rtttl_play("...", play_tone);
diff --git a/audioutils/rtttl-c/Make.defs b/audioutils/rtttl-c/Make.defs
new file mode 100644
index 000000000..fa9aa98f8
--- /dev/null
+++ b/audioutils/rtttl-c/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/audioutils/rtttl-c/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_AUDIOUTILS_RTTTL_C),)
+CONFIGURED_APPS += $(APPDIR)/audioutils/rtttl-c
+endif
diff --git a/audioutils/rtttl-c/Makefile b/audioutils/rtttl-c/Makefile
new file mode 100644
index 000000000..aa290169d
--- /dev/null
+++ b/audioutils/rtttl-c/Makefile
@@ -0,0 +1,50 @@
+############################################################################
+# apps/audioutils/rtttl-c/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+CSRCS = $(RTTTL_C_DIR)/rtttl.c
+
+RTTTL_C_DIR = rtttl-c
+RTTTL_C_VERSION = v0.1.0
+RTTTL_C_RTTTL_H_SHA256 = 6331174ae34a419ad427d9755f8ba9d3b6a92c09ecc4f36bbe07ec5e4d0cc007
+RTTTL_C_RTTTL_C_SHA256 = f0db64ef0b68136bac24616a3d62508bcc54ccdd68265d6447d99b264653b7b9
+
+$(RTTTL_C_DIR):
+	$(Q) echo "Cloning rtttl-c repo..."
+	$(Q) git clone --depth=1 --branch=$(RTTTL_C_VERSION) https://git.sr.ht/~qeef/rtttl-c
+	$(Q) touch $(RTTTL_C_DIR)
+	$(Q) echo "Checking rtttl-c hashes..."
+	$(Q) $(APPDIR)/tools/check-hash.sh sha256 $(RTTTL_C_RTTTL_H_SHA256) $@/rtttl.h
+	$(Q) $(APPDIR)/tools/check-hash.sh sha256 $(RTTTL_C_RTTTL_C_SHA256) $@/rtttl.c
+
+create_includes: $(RTTTL_C_DIR)/rtttl.h
+	$(Q) cp $< $(APPDIR)/include/audioutils
+
+context:: $(RTTTL_C_DIR)
+	$(Q) $(MAKE) create_includes
+
+distclean::
+	$(call DELFILE, $(APPDIR)/include/audioutils/rtttl.h)
+	$(call DELDIR, rtttl-c)
+
+include $(APPDIR)/Application.mk

From 72bedd5c5df72f85daa65f4ddeac54efcf84c080 Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Tue, 26 May 2026 10:06:13 +0900
Subject: [PATCH 365/568] apps/tools: Make hello_rust_cargo buildable with make

* Add JSON specification compatibility flag.
* Add Rust target conversion support for `aarch64` on macOS.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 tools/Rust.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/Rust.mk b/tools/Rust.mk
index 8e037aef6..3a5f72806 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -52,6 +52,9 @@ $(or \
   $(and $(filter x86,$(LLVM_ARCHTYPE)), \
     $(APPDIR)/tools/i486-unknown-nuttx.json \
   ), \
+  $(and $(filter aarch64,$(LLVM_ARCHTYPE)), \
+    $(if $(filter y,$(CONFIG_HOST_MACOS)),aarch64-apple-darwin) \
+  ), \
   $(and $(filter thumb%,$(LLVM_ARCHTYPE)), \
     $(if $(filter thumbv8m%,$(LLVM_ARCHTYPE)), \
       $(if $(filter cortex-m23,$(LLVM_CPUTYPE)),thumbv8m.base,thumbv8m.main)-nuttx-$(LLVM_ABITYPE), \
@@ -91,7 +94,7 @@ ifeq ($(CONFIG_DEBUG_FULLOPT),y)
 define RUST_CARGO_BUILD
 	NUTTX_INCLUDE_DIR=$(TOPDIR)/include:$(TOPDIR)/include/arch \
     RUSTFLAGS="-Zunstable-options -Cpanic=immediate-abort" \
-    cargo build --release -Zbuild-std=std,panic_abort \
+    cargo build --release -Zbuild-std=std,panic_abort -Zjson-target-spec \
 		--manifest-path $(2)/$(1)/Cargo.toml \
 		--target $(call RUST_TARGET_TRIPLE)
 endef
@@ -99,7 +102,7 @@ else
 define RUST_CARGO_BUILD
 	@echo "Building Rust code with cargo..."
 	NUTTX_INCLUDE_DIR=$(TOPDIR)/include:$(TOPDIR)/include/arch \
-    cargo build -Zbuild-std=std,panic_abort \
+    cargo build -Zbuild-std=std,panic_abort -Zjson-target-spec \
 		--manifest-path $(2)/$(1)/Cargo.toml \
 		--target $(call RUST_TARGET_TRIPLE)
 endef

From ed063a0981f97949c1294745eb5602bfa8170d36 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Tue, 19 May 2026 16:42:47 +0800
Subject: [PATCH 366/568] nshlib: fix infinite loop on broken stdout in
 nsh_catfile

When stdout is broken (e.g. PTY master closed), nsh_catfile could spin
forever: write() fails, error logging generates syslog output to
/dev/log, next read() picks it up, write() fails again, ad infinitum.

Two fixes:
- nsh_console: drop the _err() in nsh_consolewrite entirely.  The risk
  is errno-agnostic (EPIPE / EIO / ENOSPC / ...): any failure logged
  here can be re-injected by the syslog backend when OUTFD is bound to
  /dev/log.  Callers already see the failure via the negative return
  value and errno, so on-failure logging at this layer is redundant.
- nsh_fsutils: jump straight from the inner write-failure path to a
  single errout: cleanup label instead of using a two-level break +
  flag check, so a failed write cannot fall through to another read().

Assisted-by: GitHubCopilot:claude-4.7-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 nshlib/nsh_console.c | 21 +++++++++++----------
 nshlib/nsh_fsutils.c |  9 ++++++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/nshlib/nsh_console.c b/nshlib/nsh_console.c
index ebcbe6fb2..0e4284222 100644
--- a/nshlib/nsh_console.c
+++ b/nshlib/nsh_console.c
@@ -131,18 +131,19 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl,
                                 FAR const void *buffer, size_t nbytes)
 {
   FAR struct console_stdio_s *pstate = (FAR struct console_stdio_s *)vtbl;
-  ssize_t ret;
 
-  /* Write the data to the output stream */
+  /* Write the data to the output stream.
+   *
+   * Errors are reported to the caller via the negative return value and
+   * errno; do NOT _err() here.  OUTFD may itself be wired to the syslog
+   * backend (e.g. nsh_catfile dumping /dev/log on dmesg), in which case
+   * logging on write failure would produce new bytes, get picked up by
+   * the next read(), and lock the shell into an infinite loop at the
+   * highest priority — independent of which errno (EPIPE/EIO/ENOSPC/...)
+   * the underlying device returns.
+   */
 
-  ret = write(OUTFD(pstate), buffer, nbytes);
-  if (ret < 0)
-    {
-      _err("ERROR: [%d] Failed to send buffer: %d\n",
-          OUTFD(pstate), errno);
-    }
-
-  return ret;
+  return write(OUTFD(pstate), buffer, nbytes);
 }
 
 /****************************************************************************
diff --git a/nshlib/nsh_fsutils.c b/nshlib/nsh_fsutils.c
index 878c1d18e..7044d8d54 100644
--- a/nshlib/nsh_fsutils.c
+++ b/nshlib/nsh_fsutils.c
@@ -228,8 +228,14 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
                                  NSH_ERRNO_OF(errcode));
                     }
 
+                  /* Jump straight to cleanup.  On a broken stdout (e.g.
+                   * closed PTY master) we must not keep reading: the
+                   * outer loop would otherwise drain /dev/log forever
+                   * when cat is dumping it on dmesg.
+                   */
+
                   ret = ERROR;
-                  break;
+                  goto errout;
                 }
               else
                 {
@@ -255,6 +261,7 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
 
   /* Close the input file and return the result */
 
+errout:
   close(fd);
   free(buffer);
   return ret;

From 492a86691d5b25a2de8510c15db8eaf73fe550f2 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 14 Aug 2025 21:45:53 +0800
Subject: [PATCH 367/568] system/nxinit: Add NuttX Init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This component (abbreviated as "NxInit") is specifically developed
for NuttX and intended for system initialization. While we have
adopted the Android Init Language among various syntax options,
this is a brand-new implementation—it is not a port or variant of
Android Init.

Refer to the implementation of Android Init Language, consists of five broad
classes of statements: Actions, Commands, Services, Options, and Imports.

Actions support two types of triggers: event and action. Action triggers also
support runtime triggering. Services support lifecycle management, including
automatic restart (at specified intervals), and starting/stopping
individually or by class. Import supports files or directories, and we may
add a static method in the future. The following are some differences:
  1. The Android Init Language treats lines starting with `#` as comments,
     while we use a preprocessor to handle comments.
  2. For action commands, we can omit "exec" and directly execute
     built-in apps or nsh builtins.
  3. Regarding the property service, users can either adapt it by self or
     directly use the preset NVS-based properties.
  4. Only part of standard action commands and service options are
     implemented currlently.

To enable system/nxinit:
  ```diff
  -CONFIG_INIT_ENTRYPOINT="nsh_main"
  +CONFIG_INIT_ENTRYPOINT="init_main"
  +CONFIG_SYSTEM_NXINIT=y
  ```

For format and additional details, refer to:
  https://android.googlesource.com/platform/system/core/+/
  master/init/README.md

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/CMakeLists.txt |  39 +++
 system/nxinit/Kconfig        | 118 +++++++
 system/nxinit/Make.defs      |  25 ++
 system/nxinit/Makefile       |  39 +++
 system/nxinit/action.c       | 320 ++++++++++++++++++
 system/nxinit/action.h       |  85 +++++
 system/nxinit/builtin.c      | 184 +++++++++++
 system/nxinit/builtin.h      |  38 +++
 system/nxinit/import.c       |  60 ++++
 system/nxinit/import.h       |  38 +++
 system/nxinit/init.c         | 252 ++++++++++++++
 system/nxinit/init.h         |  91 +++++
 system/nxinit/parser.c       | 288 ++++++++++++++++
 system/nxinit/parser.h       |  60 ++++
 system/nxinit/service.c      | 622 +++++++++++++++++++++++++++++++++++
 system/nxinit/service.h      | 138 ++++++++
 16 files changed, 2397 insertions(+)
 create mode 100644 system/nxinit/CMakeLists.txt
 create mode 100644 system/nxinit/Kconfig
 create mode 100644 system/nxinit/Make.defs
 create mode 100644 system/nxinit/Makefile
 create mode 100644 system/nxinit/action.c
 create mode 100644 system/nxinit/action.h
 create mode 100644 system/nxinit/builtin.c
 create mode 100644 system/nxinit/builtin.h
 create mode 100644 system/nxinit/import.c
 create mode 100644 system/nxinit/import.h
 create mode 100644 system/nxinit/init.c
 create mode 100644 system/nxinit/init.h
 create mode 100644 system/nxinit/parser.c
 create mode 100644 system/nxinit/parser.h
 create mode 100644 system/nxinit/service.c
 create mode 100644 system/nxinit/service.h

diff --git a/system/nxinit/CMakeLists.txt b/system/nxinit/CMakeLists.txt
new file mode 100644
index 000000000..5aef892e9
--- /dev/null
+++ b/system/nxinit/CMakeLists.txt
@@ -0,0 +1,39 @@
+# ##############################################################################
+# apps/system/nxinit/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_NXINIT)
+
+  set(CSRCS init.c action.c builtin.c import.c parser.c service.c)
+
+  nuttx_add_application(
+    MODULE
+    ${CONFIG_SYSTEM_NXINIT}
+    NAME
+    ${CONFIG_SYSTEM_NXINIT_PROGNAME}
+    STACKSIZE
+    ${CONFIG_SYSTEM_NXINIT_STACKSIZE}
+    PRIORITY
+    ${CONFIG_SYSTEM_NXINIT_PRIORITY}
+    SRCS
+    ${CSRCS})
+
+endif()
diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
new file mode 100644
index 000000000..8b1bb6b22
--- /dev/null
+++ b/system/nxinit/Kconfig
@@ -0,0 +1,118 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_NXINIT
+	tristate "NuttX Init"
+	default n
+	depends on LIBC_EXECFUNCS
+	depends on SCHED_CHILD_STATUS
+	---help---
+		Enable NxInit(NuttX Init) component for system initialization.
+		The script of NxInit(init.rc) is compatible with the Android Init Language syntax.
+
+if SYSTEM_NXINIT
+
+#
+# Basic
+#
+
+config SYSTEM_NXINIT_PRIORITY
+	int "Thread priority"
+	default 100
+
+config SYSTEM_NXINIT_STACKSIZE
+	int "Stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+config SYSTEM_NXINIT_PROGNAME
+	string "Program name"
+	default "init"
+
+#
+# RC
+#
+
+config SYSTEM_NXINIT_RC_LINE_MAX
+	int "Max line length of RC file"
+	default 128
+	---help---
+		Maximum line length of RC file.
+		More details: https://android.googlesource.com/platform/system/core/+/master/init/README.md
+
+#
+# Action
+#
+
+config SYSTEM_NXINIT_ACTION_CMD_ARGS_MAX
+	int "Max number of command arguments"
+	default 8
+	---help---
+		Maximum number of command arguments.
+		Form:
+		```
+		on <trigger>
+		   <command>
+		   <command>
+		   <command>
+		   ...
+		```
+
+config SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX
+	int "Max number of action manager events"
+	default 32
+	---help---
+		Maximum number of action manager events.
+		```
+		struct action_manager_s
+		{
+		  ...
+		  FAR char *events[CONFIG_SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX];
+		  ...
+		};
+		```
+
+#
+# Service
+#
+
+config SYSTEM_NXINIT_SERVICE_ARGS_MAX
+	int "Max number of service arguments"
+	default 8
+	range 3 64
+	---help---
+		Maximum number of service arguments,
+		including "name", "pathname" and key word "service"(at least 3). Form:
+		```
+		service <name> <pathname> [ <argument> ]*
+		   <option>
+		   <option>
+		   ...
+		```
+
+config SYSTEM_NXINIT_SERVICE_RESTART_PERIOD
+	int "Service restart period in ms"
+	default 5000
+
+#
+# Log level
+#
+
+config SYSTEM_NXINIT_ERR
+	bool "Enable error log"
+	default !DEFAULT_SMALL
+
+config SYSTEM_NXINIT_WARN
+	bool "Enable warning log"
+	depends on SYSTEM_NXINIT_ERR
+
+config SYSTEM_NXINIT_INFO
+	bool "Enable info log"
+	depends on SYSTEM_NXINIT_WARN
+
+config SYSTEM_NXINIT_DEBUG
+	bool "Enable debug log"
+	depends on SYSTEM_NXINIT_INFO
+
+endif
diff --git a/system/nxinit/Make.defs b/system/nxinit/Make.defs
new file mode 100644
index 000000000..6efb435bc
--- /dev/null
+++ b/system/nxinit/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/nxinit/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_NXINIT),)
+CONFIGURED_APPS += $(APPDIR)/system/nxinit
+endif
diff --git a/system/nxinit/Makefile b/system/nxinit/Makefile
new file mode 100644
index 000000000..e1f6ae894
--- /dev/null
+++ b/system/nxinit/Makefile
@@ -0,0 +1,39 @@
+############################################################################
+# apps/system/nxinit/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# NuttX Init
+
+MAINSRC = init.c
+CSRCS += builtin.c
+CSRCS += parser.c
+CSRCS += action.c
+CSRCS += service.c
+CSRCS += import.c
+
+PROGNAME = $(CONFIG_SYSTEM_NXINIT_PROGNAME)
+PRIORITY = $(CONFIG_SYSTEM_NXINIT_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_NXINIT_STACKSIZE)
+MODULE = $(CONFIG_SYSTEM_NXINIT)
+
+include $(APPDIR)/Application.mk
diff --git a/system/nxinit/action.c b/system/nxinit/action.c
new file mode 100644
index 000000000..5a1140e10
--- /dev/null
+++ b/system/nxinit/action.c
@@ -0,0 +1,320 @@
+/****************************************************************************
+ * apps/system/nxinit/action.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <unistd.h>
+
+#include "action.h"
+#include "builtin.h"
+#include "init.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Maximum number of parameters for the action trigger.
+ * Format: `on <trigger>`
+ */
+
+#define ACTION_ARGUMENTS_MAX 2
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+static void init_dump_action(FAR struct action_s *action);
+#else
+#  define init_dump_action(a)
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+static void init_dump_action(FAR struct action_s *action)
+{
+  FAR struct action_cmd_s *cmd;
+
+  init_debug("Action %p", action);
+  init_debug("  event trigger: '%s'", action->event ? action->event : "");
+  list_for_every_entry(&action->cmds, cmd, struct action_cmd_s, node)
+    {
+      init_dump_args(cmd->argc, cmd->argv);
+    }
+}
+#endif
+
+static void add_ready(FAR struct action_manager_s *am,
+                      FAR struct action_s *a)
+{
+  FAR struct action_s *ready;
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+  FAR struct action_cmd_s *cmd;
+
+  list_for_every_entry(&a->cmds, cmd, struct action_cmd_s, node)
+    {
+      init_debug("Add ready %p %s", cmd, cmd->argv[0]);
+    }
+#endif
+
+  list_for_every_entry(&am->ready_actions, ready, struct action_s,
+                       ready_node)
+    {
+      if (ready == a)
+        {
+          init_debug("Action %p(%s) already on the queue", a,
+                     a->event ? a->event : "");
+          init_dump_action(a);
+          return;
+        }
+    }
+
+  list_add_tail(&am->ready_actions, &a->ready_node);
+}
+
+static void update_ready(FAR struct action_manager_s *am)
+{
+  size_t i;
+
+  /* Actions with event trigger */
+
+  for (i = 0; i < nitems(am->events); i++)
+    {
+      if (!am->events[i])
+        {
+          continue;
+        }
+
+      am->current = list_prepare_entry(am->current, &am->actions,
+                                       struct action_s, node);
+      list_for_every_entry_continue(am->current, &am->actions,
+                                    struct action_s, node)
+        {
+          if (am->current->event && !strcmp(am->current->event,
+                                            am->events[i]))
+            {
+              add_ready(am, am->current);
+              return;
+            }
+        }
+
+      init_debug("Remove event [%zu] '%s'", i, am->events[i]);
+      am->current = NULL;
+      free(am->events[i]);
+      am->events[i] = NULL;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int init_action_add_event(FAR struct action_manager_s *am,
+                          FAR const char *event)
+{
+  int ret = -ENOBUFS;
+  size_t i;
+
+  for (i = 0; i < nitems(am->events); i++)
+    {
+      if (am->events[i])
+        {
+          continue;
+        }
+
+      am->events[i] = strdup(event);
+      if (am->events[i])
+        {
+          init_debug("Add event [%zu] '%s'", i, am->events[i]);
+          return 0;
+        }
+
+      ret = -errno;
+      break;
+    }
+
+  init_warn("Drop event '%s' %d", event, ret);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: init_action_run_command
+ *
+ * Description:
+ *   Execute the ready commands in the action.
+ *
+ * Input Parameters:
+ *   am - Instance of Action Manager
+ *
+ * Returned Value:
+ *   The expected next call interval (in milliseconds), where INT_MAX
+ *   indicates blocking.
+ ****************************************************************************/
+
+int init_action_run_command(FAR struct action_manager_s *am)
+{
+  FAR struct action_s *ready;
+  int ret;
+
+  if (am->pid_running != -1)
+    {
+      init_debug("Waiting '%s' pid %d", am->running->argv[0],
+                 am->pid_running);
+      return INT_MAX;
+    }
+
+  update_ready(am);
+  if (list_is_empty(&am->ready_actions))
+    {
+      return INT_MAX;
+    }
+
+  ready = list_peek_head_type(&am->ready_actions, struct action_s,
+                              ready_node);
+
+  if (!am->running)
+    {
+      am->running = list_peek_head_type(&ready->cmds,
+                                        struct action_cmd_s, node);
+    }
+
+  ret = init_builtin_run(am, am->running->argc, am->running->argv);
+  if (ret > 0)
+    {
+      am->pid_running = ret;
+    }
+  else
+    {
+      init_action_reap_command(am);
+    }
+
+  return 0;
+}
+
+void init_action_reap_command(FAR struct action_manager_s *am)
+{
+  FAR struct action_s *ready = list_peek_head_type(&am->ready_actions,
+                                                   struct action_s,
+                                                   ready_node);
+
+  am->pid_running = -1;
+  if (list_is_tail(&ready->cmds, &am->running->node))
+    {
+      am->running = NULL;
+      list_delete(&ready->ready_node);
+    }
+  else
+    {
+      am->running = list_next_entry(am->running, struct action_cmd_s, node);
+    }
+}
+
+int init_action_parse(FAR const struct parser_s *parser,
+                      bool create, FAR char *buf)
+{
+  FAR struct action_manager_s *am = parser->priv;
+  FAR char *argv[ACTION_ARGUMENTS_MAX];
+  FAR struct action_cmd_s *cmd;
+  FAR struct action_s *a;
+  int ret;
+
+  if (create)
+    {
+      ret = init_parse_arguments(buf, false, nitems(argv), argv);
+      if (ret < 2)
+        {
+          init_err("Invalid argument: %s", buf);
+          return -EINVAL;
+        }
+
+      a = calloc(1, sizeof(*a));
+      if (a == NULL)
+        {
+          init_err("Alloc action");
+          return -errno;
+        }
+
+      list_initialize(&a->cmds);
+
+      a->event = strdup(argv[--ret]);
+      if (a->event == NULL)
+        {
+          init_err("Event trigger");
+          free(a);
+          return -errno;
+        }
+
+      list_add_tail(&am->actions, &a->node);
+      init_debug("Add action %p(%s) to manager %p", a, argv[1], am);
+    }
+  else
+    {
+      cmd = calloc(1, sizeof(*cmd));
+      if (cmd == NULL)
+        {
+          init_err("Alloc action command");
+          return -errno;
+        }
+
+      cmd->argc = init_parse_arguments(buf, true, nitems(cmd->argv) - 1,
+                                       cmd->argv);
+      if (cmd->argc < 1)
+        {
+          free(cmd);
+          init_err("Invalid command argument");
+          return -EINVAL;
+        }
+
+      a = list_last_entry(&am->actions, struct action_s, node);
+      list_add_tail(&a->cmds, &cmd->node);
+      init_debug("Add command %p(%s) to action %p", cmd, cmd->argv[0], a);
+      init_dump_args(cmd->argc, cmd->argv);
+    }
+
+  return 0;
+}
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+void init_dump_actions(FAR struct list_node *head)
+{
+  FAR struct action_s *action;
+
+  init_debug("== Dump Actions ==");
+  list_for_every_entry(head, action, struct action_s, node)
+    {
+      init_dump_action(action);
+    }
+}
+#endif
diff --git a/system/nxinit/action.h b/system/nxinit/action.h
new file mode 100644
index 000000000..3f1cd287a
--- /dev/null
+++ b/system/nxinit/action.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+ * apps/system/nxinit/action.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXINIT_ACTION_H
+#define __APPS_SYSTEM_NXINIT_ACTION_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/list.h>
+
+#include "parser.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct action_cmd_s
+{
+  struct list_node node;          /* Command list node */
+  int argc;
+  FAR char *argv[CONFIG_SYSTEM_NXINIT_ACTION_CMD_ARGS_MAX];
+};
+
+struct action_s
+{
+  struct list_node node;          /* Action list node */
+  struct list_node ready_node;    /* Ready list node */
+
+  /* Event trigger */
+
+  FAR const char *event;
+
+  struct list_node cmds;          /* Command header, struct action_cmd_s */
+};
+
+struct action_manager_s
+{
+  struct list_node actions;       /* Action header, struct action_s */
+  struct list_node ready_actions; /* Ready header, struct action_s */
+
+  FAR char *events[CONFIG_SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX];
+  FAR struct action_s *current;
+
+  FAR struct action_cmd_s *running;
+  int pid_running;
+  FAR struct service_manager_s *sm;
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int  init_action_add_event(FAR struct action_manager_s *am,
+                           FAR const char *name);
+int  init_action_run_command(FAR struct action_manager_s *am);
+void init_action_reap_command(FAR struct action_manager_s *am);
+int  init_action_parse(FAR const struct parser_s *parser,
+                       bool create, FAR char *buf);
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+void init_dump_actions(FAR struct list_node *head);
+#else
+#  define init_dump_actions(h)
+#endif
+#endif /* __APPS_SYSTEM_NXINIT_ACTION_H */
diff --git a/system/nxinit/builtin.c b/system/nxinit/builtin.c
new file mode 100644
index 000000000..34a514bf3
--- /dev/null
+++ b/system/nxinit/builtin.c
@@ -0,0 +1,184 @@
+/****************************************************************************
+ * apps/system/nxinit/builtin.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <string.h>
+#include <spawn.h>
+#include <sys/param.h>
+
+#include "builtin.h"
+#include "init.h"
+#include "service.h"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct cmd_map_s
+{
+  FAR const char *cmd;
+  uint8_t minargs;
+  uint8_t maxargs;
+  CODE int (*func)(FAR struct action_manager_s *, int, FAR char **);
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int cmd_trigger(FAR struct action_manager_s *am,
+                       int argc, FAR char **argv);
+static int cmd_start(FAR struct action_manager_s *am,
+                     int argc, FAR char **argv);
+static int cmd_stop(FAR struct action_manager_s *am,
+                    int argc, FAR char **argv);
+static int cmd_exec(FAR struct action_manager_s *am,
+                    int argc, FAR char **argv);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct cmd_map_s g_builtin[] =
+{
+  {"exec", 3, 99, cmd_exec},
+  {"start", 2, 2, cmd_start},
+  {"stop", 2, 2, cmd_stop},
+  {"trigger", 2, 2, cmd_trigger},
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int cmd_start(FAR struct action_manager_s *am,
+                     int argc, FAR char **argv)
+{
+  FAR struct service_s *service;
+
+  service = init_service_find_by_name(am->sm, argv[1]);
+  if (service == NULL)
+    {
+      init_err("No such service '%s'", argv[1]);
+      return -EINVAL;
+    }
+
+  return init_service_start(service);
+}
+
+static int cmd_stop(FAR struct action_manager_s *am,
+                    int argc, FAR char **argv)
+{
+  FAR struct service_s *service;
+
+  service = init_service_find_by_name(am->sm, argv[1]);
+  if (service == NULL)
+    {
+      init_err("No such service '%s'", argv[1]);
+      return -EINVAL;
+    }
+
+  return init_service_stop(service);
+}
+
+static int cmd_trigger(FAR struct action_manager_s *am,
+                       int argc, FAR char **argv)
+{
+  return init_action_add_event(am, argv[1]);
+}
+
+static int cmd_exec(FAR struct action_manager_s *am,
+                    int argc, FAR char **argv)
+{
+  int i;
+
+  for (i = 0; i < argc; i++)
+    {
+      if (!strcmp(argv[i], "--"))
+        {
+          i++;
+          return init_builtin_run(am, argc - i, &argv[i]);
+        }
+    }
+
+  return -EINVAL;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: init_builtin_run
+ *
+ * Description:
+ *   Execute the builtin command of NxInit, builtin App, or NSH builtin.
+ *
+ * Input Parameters:
+ *   am   - Instance of Action Manager.
+ *   argc - Argument count.
+ *   argv - A pointer to an array of string arguments. The end of the array
+ *          is indicated with a NULL entry.
+ *
+ * Returned Value:
+ *   Returns 0 (for NxInit builtin) or a PID (for builtin App or NSH builtin)
+ *   on success; Returns the negative value of errno on failure.
+ ****************************************************************************/
+
+int init_builtin_run(FAR struct action_manager_s *am,
+                     int argc, FAR char **argv)
+{
+  pid_t pid;
+  size_t i;
+  int ret;
+
+  for (i = 0; i < nitems(g_builtin); i++)
+    {
+      if (!strcmp(g_builtin[i].cmd, argv[0]))
+        {
+          if (argc < g_builtin[i].minargs || argc > g_builtin[i].maxargs)
+            {
+              init_err("Executing command '%s': invalid argument", argv[0]);
+              init_dump_args(argc, argv);
+              return -EINVAL;
+            }
+
+          init_info("Executing command '%s'", argv[0]);
+          return g_builtin[i].func(am, argc, argv);
+        }
+    }
+
+  ret = posix_spawnp(&pid, argv[0], NULL, NULL, argv, NULL);
+  if (ret != 0)
+    {
+      init_err("Executing command '%s': %d", argv[0], ret);
+      init_dump_args(argc, argv);
+      return -ret;
+    }
+
+  init_debug("Executed command '%s' pid %d", argv[0], pid);
+  return pid;
+}
diff --git a/system/nxinit/builtin.h b/system/nxinit/builtin.h
new file mode 100644
index 000000000..94cfef763
--- /dev/null
+++ b/system/nxinit/builtin.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+ * apps/system/nxinit/builtin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXINIT_BUILTIN_H
+#define __APPS_SYSTEM_NXINIT_BUILTIN_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "action.h"
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int init_builtin_run(FAR struct action_manager_s *am,
+                     int argc, FAR char **argv);
+#endif
diff --git a/system/nxinit/import.c b/system/nxinit/import.c
new file mode 100644
index 000000000..ca389d396
--- /dev/null
+++ b/system/nxinit/import.c
@@ -0,0 +1,60 @@
+/****************************************************************************
+ * apps/system/nxinit/import.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <sys/param.h>
+
+#include "import.h"
+#include "init.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int init_import_parse(FAR const struct parser_s *parser,
+                      bool create, FAR char *buf)
+{
+  FAR char *argv[2];
+  int ret;
+
+  if (create)
+    {
+      init_parse_arguments(buf, false, nitems(argv), argv);
+      ret = init_parse_config_file(parser, argv[1]);
+      if (ret < 0)
+        {
+          init_err("Import %s", argv[1]);
+          return ret;
+        }
+    }
+  else
+    {
+      init_err("Parse import");
+      return -EINVAL;
+    }
+
+  return 0;
+}
diff --git a/system/nxinit/import.h b/system/nxinit/import.h
new file mode 100644
index 000000000..05c1d6bdc
--- /dev/null
+++ b/system/nxinit/import.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+ * apps/system/nxinit/import.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXINIT_IMPORT_H
+#define __APPS_SYSTEM_NXINIT_IMPORT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "parser.h"
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int init_import_parse(FAR const struct parser_s *parser,
+                      bool create, FAR char *buf);
+#endif /* __APPS_SYSTEM_NXINIT_IMPORT_H */
diff --git a/system/nxinit/init.c b/system/nxinit/init.c
new file mode 100644
index 000000000..1f5396265
--- /dev/null
+++ b/system/nxinit/init.c
@@ -0,0 +1,252 @@
+/****************************************************************************
+ * apps/system/nxinit/init.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <poll.h>
+#include <sys/param.h>
+#include <sys/boardctl.h>
+#include <sys/wait.h>
+
+#include <netutils/netinit.h>
+
+#include "action.h"
+#include "builtin.h"
+#include "init.h"
+#include "import.h"
+#include "service.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MS2TIMESPEC(ts, ms) \
+          ((ms) == INT_MAX ? NULL \
+                           : ((ts)->tv_sec = (ms) / 1000, \
+                              (ts)->tv_nsec = ((ms) % 1000) * 1000000, (ts)))
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct init_event_s
+{
+  FAR struct pollfd *pfd;
+  FAR void *priv;
+  FAR struct service_manager_s *sm;
+  FAR struct action_manager_s *am;
+  CODE int  (*init)   (FAR struct init_event_s *);
+  CODE void (*handle) (FAR struct init_event_s *);
+  CODE void (*deinit) (FAR struct init_event_s *);
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void reap_process(FAR struct service_manager_s *sm,
+                         FAR struct action_manager_s *am)
+{
+  FAR const char *name = "unknown";
+  FAR const char *status;
+  FAR struct service_s *service;
+  int wstatus;
+  int pid;
+
+  for (; ; )
+    {
+      pid = waitpid(-1,
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+                    &wstatus,
+#else
+                    NULL,
+#endif
+                    WNOHANG);
+      if (pid <= 0)
+        {
+          break;
+        }
+      else if (WIFEXITED(wstatus))
+        {
+          status = "status";
+          wstatus = WEXITSTATUS(wstatus);
+        }
+      else if (WIFSIGNALED(wtatus))
+        {
+          status = "signal";
+          wstatus = WTERMSIG(wstatus);
+        }
+      else
+        {
+          continue;
+        }
+
+      service = init_service_find_by_pid(sm, pid);
+      if (service != NULL)
+        {
+          name = service->argv[1];
+          init_service_reap(service);
+        }
+      else if (pid == am->pid_running)
+        {
+          name = am->running->argv[0];
+          init_action_reap_command(am);
+        }
+
+      init_log(service ? LOG_WARNING : LOG_DEBUG,
+               "%s '%s' pid %d exited %s %d",
+               service ? "Service" : "Command", name, pid, status, wstatus);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct service_manager_s sm =
+    {
+      .services = LIST_INITIAL_VALUE(sm.services),
+    };
+
+  struct action_manager_s am =
+    {
+      .actions = LIST_INITIAL_VALUE(am.actions),
+      .ready_actions = LIST_INITIAL_VALUE(am.ready_actions),
+      .events = { 0 },
+      .current = NULL,
+      .running = NULL,
+      .pid_running = -1,
+      .sm = &sm,
+    };
+
+  const struct parser_s parser[] =
+    {
+      {"import", init_import_parse, NULL, NULL},
+      {"on", init_action_parse, NULL, &am},
+      {"service", init_service_parse, init_service_check, &sm},
+      {NULL},
+    };
+
+  struct init_event_s ev[] =
+    {
+    };
+
+  struct pollfd pfds[nitems(ev)];
+  size_t i;
+  int r;
+
+#ifdef CONFIG_USBDEV_TRACE
+  usbtrace_enable(TRACE_BITSET);
+#endif
+
+  for (i = 0; i < nitems(ev); i++)
+    {
+      ev[i].sm = &sm;
+      ev[i].am = &am;
+      ev[i].pfd = &pfds[i];
+      r = ev[i].init(&ev[i]);
+      if (r < 0)
+        {
+          init_err("Init event %zu", i);
+          goto out;
+        }
+    }
+
+  r = init_parse_config_file(parser, "/etc/init.d/init.rc");
+  if (r < 0)
+    {
+      goto out;
+    }
+
+  init_dump_actions(&am.actions);
+  init_dump_services(&sm.services);
+
+  init_action_add_event(&am, "boot");
+
+  boardctl(BOARDIOC_INIT, 0);
+  init_action_add_event(&am, "init");
+
+#ifdef CONFIG_NETUTILS_NETINIT
+  netinit_bringup();
+  init_action_add_event(&am, "netinit");
+#endif
+
+#ifdef CONFIG_BOARDCTL_FINALINIT
+  boardctl(BOARDIOC_FINALINIT, 0);
+  init_action_add_event(&am, "finalinit");
+#endif
+
+  for (; ; )
+    {
+      int t1 = init_service_refresh(&sm);
+      int t2 = init_action_run_command(&am);
+      struct timespec timeout;
+      int t = MIN(t1, t2);
+
+      if (t1 < 0)
+        {
+          r = t1;
+          break;
+        }
+
+      if (t2 < 0)
+        {
+          r = t2;
+          break;
+        }
+
+      r = ppoll(pfds, nitems(pfds), MS2TIMESPEC(&timeout, t), NULL);
+      if (r < 0 && errno != EINTR)
+        {
+          init_err("Wait event");
+          break;
+        }
+
+      for (i = 0; i < nitems(ev); i++)
+        {
+          if (ev[i].pfd->revents & ev[i].pfd->events)
+            {
+              ev[i].handle(&ev[i]);
+            }
+        }
+
+      reap_process(&sm, &am);
+    }
+
+out:
+  while (i--)
+    {
+      if (ev[i].deinit)
+        {
+          ev[i].deinit(&ev[i]);
+        }
+    }
+
+  return r;
+}
diff --git a/system/nxinit/init.h b/system/nxinit/init.h
new file mode 100644
index 000000000..355357a7f
--- /dev/null
+++ b/system/nxinit/init.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+ * apps/system/nxinit/init.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXINIT_INIT_H
+#define __APPS_SYSTEM_NXINIT_INIT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <syslog.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+#define init_debug(...) syslog(LOG_DEBUG, ##__VA_ARGS__)
+#define init_dump_args(argc, argv) \
+          { \
+            int _i; \
+            for (_i = 0; _i < (argc); _i++) \
+              { \
+                init_debug("  argv[%d] '%s'", _i, (argv)[_i]); \
+              } \
+          }
+#else
+#define init_debug(...)
+#define init_dump_args(...)
+#endif
+
+#ifdef CONFIG_SYSTEM_NXINIT_INFO
+#define init_info(...) syslog(LOG_INFO, ##__VA_ARGS__)
+#else
+#define init_info(...)
+#endif
+
+#ifdef CONFIG_SYSTEM_NXINIT_WARN
+#define init_warn(...) syslog(LOG_WARNING, ##__VA_ARGS__)
+#else
+#define init_warn(...)
+#endif
+
+#ifdef CONFIG_SYSTEM_NXINIT_ERR
+#define init_err(f, ...) syslog(LOG_ERR, "Error " f, ##__VA_ARGS__)
+#else
+#define init_err(...)
+#endif
+
+#define init_log(p, ...) \
+        do \
+          { \
+            if ((p) <= LOG_ERR) \
+              { \
+                init_err(__VA_ARGS__); \
+              } \
+            else if ((p) <= LOG_WARNING) \
+              { \
+                init_warn(__VA_ARGS__); \
+              } \
+            else if ((p) <= LOG_INFO) \
+              { \
+                init_info(__VA_ARGS__); \
+              } \
+            else \
+              { \
+                init_debug(__VA_ARGS__); \
+              } \
+          } \
+        while (0)
+
+#endif /* __APPS_SYSTEM_NXINIT_INIT_H */
diff --git a/system/nxinit/parser.c b/system/nxinit/parser.c
new file mode 100644
index 000000000..3ffe4a5a6
--- /dev/null
+++ b/system/nxinit/parser.c
@@ -0,0 +1,288 @@
+/****************************************************************************
+ * apps/system/nxinit/parser.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "init.h"
+#include "parser.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int init_parse_arguments(FAR char *buf, bool dup, int argc, FAR char **argv)
+{
+  bool quote = false;
+  bool new = true;
+  int i = 0;
+
+  while (*buf != '\0')
+    {
+      while (isblank(*buf))
+        {
+          if (!quote)
+            {
+              *buf = '\0';
+              new = true;
+            }
+
+          buf++;
+        }
+
+      if (*buf == '-' && *(buf + 1) == '-')
+        {
+          argv[i++] = buf;
+          if (i >= argc || *(buf += 2) == '\0')
+            {
+              break;
+            }
+
+          while (isblank(*buf))
+            {
+              *buf++ = '\0';
+            }
+
+          argv[i++] = buf;
+          break;
+        }
+
+      if (*buf == '\"')
+        {
+          *buf = '\0';
+          if (quote)
+            {
+              quote = false;
+            }
+          else
+            {
+              quote = true;
+              new = true;
+              buf++;
+            }
+        }
+
+      if (new)
+        {
+          argv[i++] = buf;
+          if (i >= argc)
+            {
+              break;
+            }
+
+          new = false;
+        }
+
+      buf++;
+    }
+
+  if (dup && i > 0)
+    {
+      argc = i;
+      for (i = 0; i < argc; i++)
+        {
+          argv[i] = strdup(argv[i]);
+          if (!argv[i])
+            {
+              while (i-- > 0)
+                {
+                  free(argv[i]);
+                }
+
+              return -errno;
+            }
+        }
+    }
+
+  return i;
+}
+
+int init_parse_config_file(FAR const struct parser_s *parser,
+                           FAR const char *file)
+{
+  char buf[CONFIG_SYSTEM_NXINIT_RC_LINE_MAX];
+  FAR const struct parser_s *cur = NULL;
+  bool create = false;
+  FAR char *nl;
+  size_t n = 0;
+  int ret = 0;
+  int fd;
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+  int line = 0;
+#endif
+
+  init_debug("Parsing %s", file);
+
+  fd = open(file, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      init_err("Opening %s %d", file, errno);
+      return -errno;
+    }
+
+  for (; ; )
+    {
+      ssize_t r = read(fd, &buf[n], sizeof(buf) - n);
+      if (r < 0)
+        {
+          if (errno == EINTR)
+            {
+              continue;
+            }
+
+          ret = -errno;
+          goto out;
+        }
+      else if (r == 0)
+        {
+          if (n == 0)
+            {
+              break;
+            }
+
+          buf[n++] = '\n';
+        }
+
+      n += r;
+      while ((nl = memchr(buf, '\n', n)))
+        {
+          *(nl++) = '\0';
+          n -= nl - buf;
+          init_debug("Line %3d: '%s'", ++line, buf);
+
+          for (ret = 0; parser[ret].key; ret++)
+            {
+              if (!strncmp(parser[ret].key, buf, strlen(parser[ret].key)))
+                {
+                  create = true;
+                  cur = &parser[ret];
+                  init_debug("New section (%s)", parser[ret].key);
+                  break;
+                }
+            }
+
+          if (cur == NULL)
+            {
+              ret = -EINVAL;
+              goto out;
+            }
+
+          ret = cur->parse(cur, create, buf);
+          create = false;
+          if (ret < 0)
+            {
+              goto out;
+            }
+
+          memmove(buf, nl, n);
+        }
+
+      if (n == sizeof(buf))
+        {
+          ret = -E2BIG;
+          goto out;
+        }
+    }
+
+  for (n = 0; parser[n].key; n++)
+    {
+      if (parser[n].check)
+        {
+          ret = parser[n].check(&parser[n]);
+          if (ret < 0)
+            {
+              break;
+            }
+        }
+    }
+
+out:
+  close(fd);
+  if (ret < 0)
+    {
+      init_err("Parse %s %d", file, ret);
+    }
+
+  return ret;
+}
+
+int init_parse_configs(FAR const struct parser_s *parser,
+                       FAR const char *path)
+{
+  FAR struct dirent *entry;
+  char file[PATH_MAX];
+  struct stat sb;
+  FAR DIR *dir;
+  int ret = 0;
+  size_t i;
+
+  if (stat(path, &sb) < 0)
+    {
+      init_err("Stat %s", path);
+      return -errno;
+    }
+
+  if (S_ISDIR(sb.st_mode))
+    {
+      dir = opendir(path);
+      if (dir == NULL)
+        {
+          init_err("Opening directory %s", path);
+          return -errno;
+        }
+
+      while ((entry = readdir(dir)) != NULL)
+        {
+          if (DIRENT_ISFILE(entry->d_type))
+            {
+              i = strlen(entry->d_name);
+              if (i >= 3 && !strcmp(entry->d_name + i - 3, ".rc"))
+                {
+                  snprintf(file, sizeof(file), "%s/%s", path, entry->d_name);
+                  ret = init_parse_config_file(parser, file);
+                  if (ret < 0)
+                    {
+                      break;
+                    }
+                }
+            }
+        }
+
+      closedir(dir);
+    }
+  else if (S_ISREG(sb.st_mode))
+    {
+      ret = init_parse_config_file(parser, path);
+    }
+
+  return ret;
+}
diff --git a/system/nxinit/parser.h b/system/nxinit/parser.h
new file mode 100644
index 000000000..37ab10b3f
--- /dev/null
+++ b/system/nxinit/parser.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+ * apps/system/nxinit/parser.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXINIT_PARSER_H
+#define __APPS_SYSTEM_NXINIT_PARSER_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdbool.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct parser_s
+{
+  FAR const char *key;
+
+  CODE int (*parse)(FAR const struct parser_s *, bool, FAR char *);
+  CODE int (*check)(FAR const struct parser_s *);
+
+  /* Type
+   *  a. struct action_manager_s
+   *  b. struct service_manager_s
+   */
+
+  FAR void *priv;
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int init_parse_arguments(FAR char *buf, bool dup, int argc, FAR char **argv);
+int init_parse_configs(FAR const struct parser_s *parser,
+                       FAR const char *path);
+int init_parse_config_file(FAR const struct parser_s *parser,
+                           FAR const char *file);
+#endif
diff --git a/system/nxinit/service.c b/system/nxinit/service.c
new file mode 100644
index 000000000..f45d893ba
--- /dev/null
+++ b/system/nxinit/service.c
@@ -0,0 +1,622 @@
+/****************************************************************************
+ * apps/system/nxinit/service.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/clock.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+#include <signal.h>
+#include <spawn.h>
+#include <sys/param.h>
+
+#include "init.h"
+#include "parser.h"
+#include "service.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SYSTEM_NXINIT_SERVICE_GENTLE_KILL_TIMEOUT 200
+#define TIMESPEC2MS(t) (((t).tv_sec * 1000) + (t).tv_nsec / 1000000)
+
+#define check_flags(s, f) ((s)->flags & (f))
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+#  define dump_flags(fmt, flags) \
+          do \
+            { \
+              size_t _i; \
+              for (_i = 0; _i < nitems(g_flag_str); _i++) \
+                { \
+                  if (g_flag_str[_i].flag & (flags)) \
+                    { \
+                      init_debug(fmt, g_flag_str[_i].str); \
+                    } \
+                } \
+            } \
+          while(0)
+#else
+#  define dump_flags(...)
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct cmd_map_s
+{
+  FAR const char *cmd;
+  uint8_t minargs;
+  uint8_t maxargs;
+  int (*func)(FAR struct service_manager_s *, int, FAR char **);
+};
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+struct flag_str_s
+{
+  uint32_t flag;
+  FAR const char *str;
+};
+#endif
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int option_class(FAR struct service_manager_s *sm,
+                        int argc, FAR char **argv);
+static int option_gentle_kill(FAR struct service_manager_s *sm,
+                              int argc, FAR char **argv);
+static int option_restart_period(FAR struct service_manager_s *sm,
+                                 int argc, FAR char **argv);
+static int option_override(FAR struct service_manager_s *sm,
+                           int argc, FAR char **argv);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct cmd_map_s g_option[] =
+{
+  {"class", 2, 99, option_class},
+  {"gentle_kill", 1, 1, option_gentle_kill},
+  {"restart_period", 2, 2, option_restart_period},
+  {"override", 1, 1, option_override},
+};
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+static const struct flag_str_s g_flag_str[] =
+{
+  {SVC_DISABLED, "disabled"},
+  {SVC_ONESHOT, "oneshot"},
+  {SVC_RUNNING, "running"},
+  {SVC_RESTARTING, "restarting"},
+  {SVC_GENTLE_KILL, "gentle_kill"},
+  {SVC_REMOVE, "remove"},
+  {SVC_SIGKILL, "sigkill"},
+  {SVC_OVERRIDE, "override"},
+};
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void add_flags(FAR struct service_s *service, uint32_t flags)
+{
+  init_debug("Service '%s' flag 0x%" PRIx32 " add 0x%" PRIx32 "",
+             service->argv[1], service->flags, flags);
+  dump_flags("  +flag '%s'", flags);
+
+  service->flags |= flags;
+}
+
+static void remove_flags(FAR struct service_s *service, uint32_t flags)
+{
+  init_debug("Service '%s' flag 0x%" PRIx32 " add 0x%" PRIx32 "",
+             service->argv[1], service->flags, flags);
+  dump_flags("  -flag '%s'", flags);
+
+  service->flags &= ~flags;
+}
+
+static int kill_service(FAR struct service_s *service, int signo)
+{
+  int ret;
+
+  ret = kill(service->pid, signo);
+  if (ret < 0)
+    {
+      ret = -errno;
+      if (ret == -ESRCH)
+        {
+          init_service_reap(service);
+        }
+    }
+
+  init_log(ret < 0 ? LOG_ERR : LOG_WARNING,
+           "sent signal %d to service '%s' pid %d %d",
+           signo, service->argv[1], service->pid, ret);
+
+  return ret;
+}
+
+static void remove_service(FAR struct service_s *service)
+{
+  FAR struct service_class_s *class;
+  FAR struct service_class_s *tmp;
+  int i;
+
+  init_warn("Removing service '%s' ...", service->argv[1]);
+  list_for_every_entry_safe(&service->classes, class, tmp,
+                            struct service_class_s, node)
+    {
+      list_delete(&class->node);
+      free(class);
+    }
+
+  for (i = 0; i < service->argc; i++)
+    {
+      free(service->argv[i]);
+    }
+
+  list_delete(&service->node);
+  free(service);
+}
+
+static int option_class(FAR struct service_manager_s *sm,
+                        int argc, FAR char **argv)
+{
+  FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
+                                            node);
+  size_t len = strlen(argv[1]) + 1;
+  FAR struct service_class_s *c;
+
+  list_for_every_entry(&s->classes, c, struct service_class_s, node)
+    {
+      if (!strcmp(c->name, argv[1]))
+        {
+          return 0;
+        }
+    }
+
+  c = malloc(sizeof(*c) + len);
+  if (c == NULL)
+    {
+      init_err("Alloc class");
+      return -errno;
+    }
+
+  memcpy(c->name, argv[1], len);
+  list_add_tail(&s->classes, &c->node);
+  return 0;
+}
+
+static int option_gentle_kill(FAR struct service_manager_s *sm,
+                              int argc, FAR char **argv)
+{
+  FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
+                                            node);
+
+  add_flags(s, SVC_GENTLE_KILL);
+  return 0;
+}
+
+static int option_restart_period(FAR struct service_manager_s *sm,
+                                 int argc, FAR char **argv)
+{
+  FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
+                                            node);
+
+  s->restart_period = atoi(argv[1]);
+  return 0;
+}
+
+static int option_override(FAR struct service_manager_s *sm,
+                           int argc, FAR char **argv)
+{
+  FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
+                                            node);
+
+  add_flags(s, SVC_OVERRIDE);
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: init_service_refresh
+ *
+ * Description:
+ *   Check if any services need to be restarted, force terminate(SIGKILL), or
+ *   deleted.
+ *
+ * Input Parameters:
+ *   sm - Instance of Service Manager
+ *
+ * Returned Value:
+ *   The expected time interval until the next call is returned, INT_MAX for
+ *   block indefinitely;
+ ****************************************************************************/
+
+int init_service_refresh(FAR struct service_manager_s *sm)
+{
+  FAR struct service_s *service;
+  FAR struct service_s *tmp;
+  struct timespec diff;
+  struct timespec cur;
+  int min = INT_MAX;
+  int ms;
+
+  clock_gettime(CLOCK_MONOTONIC, &cur);
+  list_for_every_entry_safe(&sm->services, service, tmp, struct service_s,
+                            node)
+    {
+      if (check_flags(service, SVC_RESTARTING))
+        {
+          clock_timespec_subtract(&cur, &service->time_started, &diff);
+          ms = TIMESPEC2MS(diff);
+          if (ms >= service->restart_period)
+            {
+              init_service_start(service);
+              continue;
+            }
+
+          min = MIN(min, service->restart_period - ms);
+        }
+      else if (check_flags(service, SVC_RUNNING) &&
+               check_flags(service, SVC_GENTLE_KILL) &&
+               check_flags(service, SVC_DISABLED))
+        {
+          if (check_flags(service, SVC_SIGKILL))
+            {
+              continue;
+            }
+
+          clock_timespec_subtract(&cur, &service->time_kill, &diff);
+          ms = TIMESPEC2MS(diff);
+          if (ms >= SYSTEM_NXINIT_SERVICE_GENTLE_KILL_TIMEOUT)
+            {
+              init_warn("Service '%s' pid %d timeout for gentle kill",
+                        service->argv[1], service->pid);
+              kill_service(service, SIGKILL);
+              add_flags(service, SVC_SIGKILL);
+              continue;
+            }
+
+          min = MIN(min, SYSTEM_NXINIT_SERVICE_GENTLE_KILL_TIMEOUT - ms);
+        }
+      else if (check_flags(service, SVC_REMOVE) &&
+               check_flags(service, SVC_DISABLED) &&
+               !check_flags(service, SVC_RUNNING))
+        {
+          remove_service(service);
+        }
+    }
+
+  return min;
+}
+
+FAR struct service_s *
+init_service_find_by_name(FAR struct service_manager_s *sm,
+                          FAR const char *name)
+{
+  FAR struct service_s *service;
+
+  list_for_every_entry(&sm->services, service, struct service_s, node)
+    {
+      if (!strcmp(name, service->argv[1]))
+        {
+          return service;
+        }
+    }
+
+  return NULL;
+}
+
+FAR struct service_s *
+init_service_find_by_pid(FAR struct service_manager_s *sm, const int pid)
+{
+  FAR struct service_s *service;
+
+  list_for_every_entry(&sm->services, service, struct service_s, node)
+    {
+      if (pid == service->pid)
+        {
+          return service;
+        }
+    }
+
+  return NULL;
+}
+
+void init_service_reap(FAR struct service_s *service)
+{
+  remove_flags(service, SVC_RUNNING);
+  if (!check_flags(service, SVC_DISABLED))
+    {
+      add_flags(service, SVC_RESTARTING);
+    }
+}
+
+int init_service_start(FAR struct service_s *service)
+{
+  int ret;
+  int pid;
+
+  init_debug("Starting service '%s' ...", service->argv[1]);
+
+  if (check_flags(service, SVC_RUNNING))
+    {
+      init_info("Service '%s' already started pid %d", service->argv[1],
+                service->pid);
+      return service->pid;
+    }
+
+  ret = posix_spawnp(&pid, service->argv[2], NULL, NULL, &service->argv[2],
+                     environ);
+  if (ret != 0)
+    {
+      init_err("Starting service '%s': %d", service->argv[1], ret);
+      return -ret;
+    }
+
+  service->pid = pid;
+  clock_gettime(CLOCK_MONOTONIC, &service->time_started);
+  add_flags(service, SVC_RUNNING);
+  remove_flags(service, SVC_RESTARTING);
+  remove_flags(service, SVC_DISABLED);
+  init_info("Started service '%s' pid %d", service->argv[1], service->pid);
+
+  return 0;
+}
+
+int init_service_stop(FAR struct service_s *service)
+{
+  init_info("Stopping service '%s' ...", service->argv[1]);
+
+  if (check_flags(service, SVC_RUNNING | SVC_RESTARTING))
+    {
+      if (check_flags(service, SVC_DISABLED))
+        {
+          init_warn("Service '%s' is exiting", service->argv[1]);
+          return -EINPROGRESS;
+        }
+    }
+  else
+    {
+      init_warn("Service '%s' is not running", service->argv[1]);
+      return -ESRCH;
+    }
+
+  add_flags(service, SVC_DISABLED);
+  if (check_flags(service, SVC_RESTARTING))
+    {
+      remove_flags(service, SVC_RESTARTING);
+    }
+
+  if (check_flags(service, SVC_GENTLE_KILL))
+    {
+      init_debug("Gentle kill");
+      remove_flags(service, SVC_SIGKILL);
+      kill_service(service, SIGTERM);
+      clock_gettime(CLOCK_MONOTONIC, &service->time_kill);
+      return 0;
+    }
+
+  return kill_service(service, SIGKILL);
+}
+
+int init_service_start_by_class(FAR struct service_manager_s *sm,
+                                FAR const char *name)
+{
+  FAR struct service_class_s *class;
+  FAR struct service_s *service;
+  int ret;
+
+  list_for_every_entry(&sm->services, service, struct service_s, node)
+    {
+      list_for_every_entry(&service->classes, class, struct service_class_s,
+                           node)
+        {
+          if (!strcmp(name, class->name))
+            {
+              ret = init_service_start(service);
+              if (ret < 0)
+                {
+                  return ret;
+                }
+
+              break;
+            }
+        }
+    }
+
+  return 0;
+}
+
+int init_service_stop_by_class(FAR struct service_manager_s *sm,
+                               FAR const char *name)
+{
+  FAR struct service_class_s *class;
+  FAR struct service_s *service;
+  int ret;
+
+  list_for_every_entry(&sm->services, service, struct service_s, node)
+    {
+      list_for_every_entry(&service->classes, class, struct service_class_s,
+                           node)
+        {
+          if (!strcmp(name, class->name))
+            {
+              ret = init_service_stop(service);
+              if (ret < 0)
+                {
+                  return ret;
+                }
+
+              break;
+            }
+        }
+    }
+
+  return 0;
+}
+
+int init_service_parse(FAR const struct parser_s *parser,
+                       bool create, FAR char *buf)
+{
+  FAR char *argv[CONFIG_SYSTEM_NXINIT_SERVICE_ARGS_MAX];
+  FAR struct service_manager_s *sm = parser->priv;
+  FAR struct service_s *s;
+  int argc;
+  size_t i;
+
+  if (create)
+    {
+      s = calloc(1, sizeof(*s));
+      if (s == NULL)
+        {
+          init_err("Alloc service");
+          return -errno;
+        }
+
+      s->argc = init_parse_arguments(buf, true, nitems(s->argv), s->argv);
+      if (s->argc < 3)
+        {
+          init_err("Get arguments %d", s->argc);
+          free(s);
+          return -EINVAL;
+        }
+
+      s->restart_period = CONFIG_SYSTEM_NXINIT_SERVICE_RESTART_PERIOD;
+      list_initialize(&s->classes);
+      list_add_tail(&sm->services, &s->node);
+    }
+  else
+    {
+      argc = init_parse_arguments(buf, false, nitems(argv), argv);
+      for (i = 0; i < nitems(g_option); i++)
+        {
+          if (!strcmp(g_option[i].cmd, argv[0]))
+            {
+              init_info("Apply option[%zu] %p for %s", i, g_option[i].func,
+                        argv[0]);
+              if (argc < g_option[i].minargs || argc > g_option[i].maxargs)
+                {
+                  break;
+                }
+
+              init_dump_args(argc, argv);
+              return g_option[i].func(sm, argc, argv);
+            }
+        }
+
+      init_err("'%s': unknown option / invalid argument", argv[0]);
+      return -EINVAL;
+    }
+
+  return 0;
+}
+
+int init_service_check(FAR const struct parser_s *parser)
+{
+  FAR struct service_manager_s *sm = parser->priv;
+  FAR struct service_s *tmp;
+  FAR struct service_s *s;
+
+  list_for_every_entry(&sm->services, s, struct service_s, node)
+    {
+      tmp = list_next_entry(s, struct service_s, node);
+      list_for_every_entry_from(&sm->services, tmp, struct service_s, node)
+        {
+          if (!strcmp(s->argv[1], tmp->argv[1]))
+            {
+              if (!check_flags(tmp, SVC_OVERRIDE))
+                {
+                  init_err("Redefined service '%s'", tmp->argv[1]);
+                  init_dump_service(s);
+                  init_dump_service(tmp);
+                  return -EEXIST;
+                }
+
+              init_info("Remove duplicate definition of service '%s'",
+                        tmp->argv[1]);
+              add_flags(s, SVC_DISABLED | SVC_REMOVE);
+            }
+        }
+    }
+
+  return 0;
+}
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+void init_dump_service(FAR struct service_s *s)
+{
+  FAR struct service_class_s *c;
+  int i;
+
+  init_debug("Service %p name '%s' path '%s'", s, s->argv[1], s->argv[2]);
+
+  init_debug("  pid: %d", s->pid);
+  init_debug("  arguments:");
+  for (i = 0; s->argv[i] && i < nitems(s->argv); i++)
+    {
+      init_debug("      [%d] '%s'", i, s->argv[i]);
+    }
+
+  init_debug("  classes:");
+  list_for_every_entry(&s->classes, c, struct service_class_s, node)
+    {
+      init_debug("    '%s'", c->name);
+    }
+
+  init_debug("  restart_period: %d", s->restart_period);
+
+  if (s->flags)
+    {
+      init_debug("  flags:");
+      dump_flags("    '%s'", s->flags);
+    }
+}
+
+void init_dump_services(FAR struct list_node *head)
+{
+  FAR struct service_s *service;
+
+  init_debug("== Dump Services ==");
+  list_for_every_entry(head, service, struct service_s, node)
+    {
+      init_dump_service(service);
+    }
+}
+#endif
diff --git a/system/nxinit/service.h b/system/nxinit/service.h
new file mode 100644
index 000000000..303a44584
--- /dev/null
+++ b/system/nxinit/service.h
@@ -0,0 +1,138 @@
+/****************************************************************************
+ * apps/system/nxinit/service.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXINIT_SERVICE_H
+#define __APPS_SYSTEM_NXINIT_SERVICE_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/list.h>
+
+#include <stdint.h>
+#include <sys/types.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Ref to Android Init
+ * URL: https://android.googlesource.com/platform/system/core/+/
+ *      android16-release/init/service.h#42
+ */
+#define SVC_DISABLED    (1 << 0)  /* do not autostart with class */
+#define SVC_ONESHOT     (1 << 1)  /* do not restart on exit */
+#define SVC_RUNNING     (1 << 2)  /* currently active */
+#define SVC_RESTARTING  (1 << 3)  /* waiting to restart */
+
+/* This service should be stopped with SIGTERM instead of SIGKILL.
+ * Will still be SIGKILLed after timeout period of 200 ms.
+ */
+
+#define SVC_GENTLE_KILL (1 << 13)
+
+/* Flags below are new added.
+ */
+
+/* Override the previous definition for a service with the same name */
+
+#define SVC_OVERRIDE    (1 << 29)
+
+/* Already sent SIGKILL, and should not send again. */
+
+#define SVC_SIGKILL     (1 << 30)
+
+/* Should be removed immediately after stopped */
+
+#define SVC_REMOVE      (1 << 31)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct service_class_s
+{
+  struct list_node node;     /* Service class list node */
+  FAR char name[0];
+};
+
+struct service_s
+{
+  struct list_node node;     /* Service list node */
+  struct list_node classes;  /* Class header, struct service_class_s */
+
+  uint32_t flags;
+
+  /* The explanation of the `argv` parameter.
+   *
+   * | Index   |   Value     |      Details      |
+   * |---------|-------------|-------------------|
+   * | argv[0] | "service"   | Statement keyword |
+   * | argv[1] | name        | Service name      |
+   * | argv[2] | argv[0]     | Service pathname  |
+   * | argv[n] | argv[n - 2] | Service arguments |
+   */
+
+  FAR char *argv[CONFIG_SYSTEM_NXINIT_SERVICE_ARGS_MAX];
+  int argc;
+
+  struct timespec time_started;
+  struct timespec time_kill;
+  int restart_period;
+  pid_t pid;
+};
+
+struct service_manager_s
+{
+  struct list_node services; /* Service header, struct service_s */
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int  init_service_refresh(FAR struct service_manager_s *sm);
+void init_service_reap(FAR struct service_s *service);
+int  init_service_start(FAR struct service_s *service);
+int  init_service_stop(FAR struct service_s *service);
+int  init_service_start_by_class(FAR struct service_manager_s *sm,
+                                 FAR const char *name);
+int  init_service_stop_by_class(FAR struct service_manager_s *sm,
+                                FAR const char *name);
+FAR struct service_s *
+init_service_find_by_name(FAR struct service_manager_s *sm,
+                          FAR const char *name);
+FAR struct service_s *
+init_service_find_by_pid(FAR struct service_manager_s *sm, const int pid);
+int init_service_parse(FAR const struct parser_s *parser,
+                       bool create, FAR char *buf);
+int init_service_check(FAR const struct parser_s *parser);
+
+#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
+void init_dump_service(FAR struct service_s *s);
+void init_dump_services(FAR struct list_node *head);
+#else
+#  define init_dump_service(s)
+#  define init_dump_services(h)
+#endif
+#endif /* __APPS_SYSTEM_NXINIT_SERVICE_H */

From 8594627d8a235bec89ca967b0c5a75a1e3b1776e Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Sat, 16 Aug 2025 20:48:51 +0800
Subject: [PATCH 368/568] system/nxinit: Add class start/stop for service

Usage:
  class_start <classname>
  class_stop <classname>

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/builtin.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/system/nxinit/builtin.c b/system/nxinit/builtin.c
index 34a514bf3..032b3269f 100644
--- a/system/nxinit/builtin.c
+++ b/system/nxinit/builtin.c
@@ -57,6 +57,10 @@ static int cmd_stop(FAR struct action_manager_s *am,
                     int argc, FAR char **argv);
 static int cmd_exec(FAR struct action_manager_s *am,
                     int argc, FAR char **argv);
+static int cmd_class_start(FAR struct action_manager_s *am,
+                           int argc, FAR char **argv);
+static int cmd_class_stop(FAR struct action_manager_s *am,
+                          int argc, FAR char **argv);
 
 /****************************************************************************
  * Private Data
@@ -64,6 +68,8 @@ static int cmd_exec(FAR struct action_manager_s *am,
 
 static const struct cmd_map_s g_builtin[] =
 {
+  {"class_start", 2, 2, cmd_class_start},
+  {"class_stop", 2, 2, cmd_class_stop},
   {"exec", 3, 99, cmd_exec},
   {"start", 2, 2, cmd_start},
   {"stop", 2, 2, cmd_stop},
@@ -74,6 +80,18 @@ static const struct cmd_map_s g_builtin[] =
  * Private Functions
  ****************************************************************************/
 
+static int cmd_class_start(FAR struct action_manager_s *am,
+                           int argc, FAR char **argv)
+{
+  return init_service_start_by_class(am->sm, argv[1]);
+}
+
+static int cmd_class_stop(FAR struct action_manager_s *am,
+                          int argc, FAR char **argv)
+{
+  return init_service_stop_by_class(am->sm, argv[1]);
+}
+
 static int cmd_start(FAR struct action_manager_s *am,
                      int argc, FAR char **argv)
 {

From 7c02e7f5556559bf001ec6ab5e492488af5bb427 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Sat, 30 Aug 2025 20:23:05 +0800
Subject: [PATCH 369/568] system/nxinit: Add NSH builtin support for action

Enable CONFIG_SYSTEM_SYSTEM to support nsh builtins, which depends on nsh.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/builtin.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/system/nxinit/builtin.c b/system/nxinit/builtin.c
index 032b3269f..a64a46425 100644
--- a/system/nxinit/builtin.c
+++ b/system/nxinit/builtin.c
@@ -25,9 +25,11 @@
  ****************************************************************************/
 
 #include <errno.h>
+#include <stdlib.h>
 #include <string.h>
 #include <spawn.h>
 #include <sys/param.h>
+#include <sys/wait.h>
 
 #include "builtin.h"
 #include "init.h"
@@ -192,6 +194,27 @@ int init_builtin_run(FAR struct action_manager_s *am,
   ret = posix_spawnp(&pid, argv[0], NULL, NULL, argv, NULL);
   if (ret != 0)
     {
+#ifdef CONFIG_SYSTEM_SYSTEM
+      char cmd[CONFIG_SYSTEM_NXINIT_RC_LINE_MAX];
+
+      for (i = 0, cmd[i] = '\0'; i < argc; i++)
+        {
+          strlcat(cmd, argv[i], sizeof(cmd));
+          if (i < argc - 1)
+            {
+              strcat(cmd, " ");
+            }
+        }
+
+      init_debug("Executing nsh command '%s'", cmd);
+      ret = system(cmd);
+      if (WIFEXITED(ret))
+        {
+          init_debug("NSH command '%s' exited %d", cmd, WEXITSTATUS(ret));
+          return -WEXITSTATUS(ret);
+        }
+#endif
+
       init_err("Executing command '%s': %d", argv[0], ret);
       init_dump_args(argc, argv);
       return -ret;

From 4281a1096f728daaa166004a29b8125792eb7930 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Wed, 27 Aug 2025 23:54:36 +0800
Subject: [PATCH 370/568] system/nxinit: Warning for long commands

If the command of an action takes too long (greater than
CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW milliseconds, 50 ms by default),
a warning log will be output for analysis and debugging.

For example:

  a. sleep 1
       [    0.340000] [ 3] [ 0] init_main: executing NSH command 'sleep 1'
       [    1.360000] [ 3] [ 0] init_main: NSH command 'sleep 1' exited 0
     > [    1.360000] [ 3] [ 0] init_main: command 'sleep' took 1020 ms

  b. hello (add sleep(1) to examples/hello)

       [    1.390000] [ 3] [ 0] init_main: executed command 'hello' pid 14
       [    1.390000] [ 3] [ 0] init_main: waiting 'hello' pid 14
       Hello, World!!
     > [    2.400000] [ 3] [ 0] init_main: command 'hello' pid 14 took 1010 ms
       [    2.400000] [ 3] [ 0] init_main: command 'hello' pid 14 exited status 0

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/Kconfig   |  7 +++++++
 system/nxinit/action.c  | 26 ++++++++++++++++++++++++++
 system/nxinit/action.h  |  4 ++++
 system/nxinit/init.h    |  2 ++
 system/nxinit/service.c |  1 -
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
index 8b1bb6b22..b5e82ec2d 100644
--- a/system/nxinit/Kconfig
+++ b/system/nxinit/Kconfig
@@ -59,6 +59,13 @@ config SYSTEM_NXINIT_ACTION_CMD_ARGS_MAX
 		   ...
 		```
 
+config SYSTEM_NXINIT_ACTION_WARN_SLOW
+	int "Warn if command takes too long"
+	default 50
+	depends on SYSTEM_NXINIT_WARN
+	---help---
+		Warning if command took more than `SYSTEM_NXINIT_ACTION_WARN_SLOW` ms.
+
 config SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX
 	int "Max number of action manager events"
 	default 32
diff --git a/system/nxinit/action.c b/system/nxinit/action.c
index 5a1140e10..81716e571 100644
--- a/system/nxinit/action.c
+++ b/system/nxinit/action.c
@@ -210,6 +210,10 @@ int init_action_run_command(FAR struct action_manager_s *am)
                                         struct action_cmd_s, node);
     }
 
+#if defined(CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW) && \
+    CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW > 0
+  clock_gettime(CLOCK_MONOTONIC, &am->time_run);
+#endif
   ret = init_builtin_run(am, am->running->argc, am->running->argv);
   if (ret > 0)
     {
@@ -229,6 +233,28 @@ void init_action_reap_command(FAR struct action_manager_s *am)
                                                    struct action_s,
                                                    ready_node);
 
+#if defined(CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW) && \
+    CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW > 0
+  struct timespec time;
+  int ms;
+
+  clock_gettime(CLOCK_MONOTONIC, &time);
+  clock_timespec_subtract(&time, &am->time_run, &time);
+  ms = TIMESPEC2MS(time);
+  if (ms > CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW)
+    {
+      if (am->pid_running <= 0)
+        {
+          init_warn("Command '%s' took %d ms", am->running->argv[0], ms);
+        }
+      else
+        {
+          init_warn("Command '%s' pid %d took %d ms", am->running->argv[0],
+                    am->pid_running, ms);
+        }
+    }
+#endif
+
   am->pid_running = -1;
   if (list_is_tail(&ready->cmds, &am->running->node))
     {
diff --git a/system/nxinit/action.h b/system/nxinit/action.h
index 3f1cd287a..672621d13 100644
--- a/system/nxinit/action.h
+++ b/system/nxinit/action.h
@@ -64,6 +64,10 @@ struct action_manager_s
 
   FAR struct action_cmd_s *running;
   int pid_running;
+#if defined(CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW) && \
+    CONFIG_SYSTEM_NXINIT_ACTION_WARN_SLOW > 0
+  struct timespec time_run;
+#endif
   FAR struct service_manager_s *sm;
 };
 
diff --git a/system/nxinit/init.h b/system/nxinit/init.h
index 355357a7f..3e81aceb0 100644
--- a/system/nxinit/init.h
+++ b/system/nxinit/init.h
@@ -33,6 +33,8 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+#define TIMESPEC2MS(t) (((t).tv_sec * 1000) + (t).tv_nsec / 1000000)
+
 #ifdef CONFIG_SYSTEM_NXINIT_DEBUG
 #define init_debug(...) syslog(LOG_DEBUG, ##__VA_ARGS__)
 #define init_dump_args(argc, argv) \
diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index f45d893ba..6916dd419 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -44,7 +44,6 @@
  ****************************************************************************/
 
 #define SYSTEM_NXINIT_SERVICE_GENTLE_KILL_TIMEOUT 200
-#define TIMESPEC2MS(t) (((t).tv_sec * 1000) + (t).tv_nsec / 1000000)
 
 #define check_flags(s, f) ((s)->flags & (f))
 

From 8049d91a951ca2a09be7222c4a5f78b19aab0531 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Fri, 10 Oct 2025 22:38:15 +0800
Subject: [PATCH 371/568] system/nxinit: Add oneshot support for service

Add support for the oneshot option to the service.

Test
  - RC
      service telnet telnetd
          class test
    >     oneshot
          restart_period 3000
  - Runtime
      [    0.150000] [ 3] [ 0] init_main: == Dump Services ==
      ...
      [    0.160000] [ 3] [ 0] init_main: Service 0x40486aa8 name 'telnet' path 'telnetd'
      [    0.160000] [ 3] [ 0] init_main:   pid: 0
      [    0.160000] [ 3] [ 0] init_main:   arguments:
      [    0.160000] [ 3] [ 0] init_main:       [0] 'service'
      [    0.160000] [ 3] [ 0] init_main:       [1] 'telnet'
      [    0.160000] [ 3] [ 0] init_main:       [2] 'telnetd'
      [    0.160000] [ 3] [ 0] init_main:   classes:
      [    0.160000] [ 3] [ 0] init_main:     'test'
      [    0.170000] [ 3] [ 0] init_main:   restart_period: 3000
      [    0.170000] [ 3] [ 0] init_main:   reboot_on_failure: -1
      [    0.170000] [ 3] [ 0] init_main:   flags:
    > [    0.170000] [ 3] [ 0] init_main:     'oneshot'
      ...
      [    0.370000] [ 3] [ 0] init_main: starting service 'telnet' ...
      [    0.380000] [ 3] [ 0] init_main: service 'telnet' flag 0x2 add 0x4
      [    0.380000] [ 3] [ 0] init_main:   +flag 'running'
      [    0.380000] [ 3] [ 0] init_main: service 'telnet' flag 0x6 add 0x8
      [    0.380000] [ 3] [ 0] init_main:   -flag 'restarting'
      [    0.380000] [ 3] [ 0] init_main: service 'telnet' flag 0x6 add 0x1
      [    0.380000] [ 3] [ 0] init_main:   -flag 'disabled'
      [    0.380000] [ 3] [ 0] init_main: started service 'telnet' pid 9
      ...
      nsh> kill -9 9
      nsh> [    7.350000] [ 3] [ 0] init_main: service 'telnet' flag 0x6 add 0x4
      [    7.350000] [ 3] [ 0] init_main:   -flag 'running'
      [    7.350000] [ 3] [ 0] init_main: service 'telnet' flag 0x2 add 0x80000001
      [    7.350000] [ 3] [ 0] init_main:   +flag 'disabled'
      [    7.350000] [ 3] [ 0] init_main:   +flag 'remove'
      [    7.350000] [ 3] [ 0] init_main: service 'telnet' pid 9 exited status 1
    > [    7.360000] [ 3] [ 0] init_main: removing service 'telnet' ...

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/service.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 6916dd419..8f456c920 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -97,6 +97,8 @@ static int option_restart_period(FAR struct service_manager_s *sm,
                                  int argc, FAR char **argv);
 static int option_override(FAR struct service_manager_s *sm,
                            int argc, FAR char **argv);
+static int option_oneshot(FAR struct service_manager_s *sm,
+                          int argc, FAR char **argv);
 
 /****************************************************************************
  * Private Data
@@ -108,6 +110,7 @@ static const struct cmd_map_s g_option[] =
   {"gentle_kill", 1, 1, option_gentle_kill},
   {"restart_period", 2, 2, option_restart_period},
   {"override", 1, 1, option_override},
+  {"oneshot", 1, 1, option_oneshot},
 };
 
 #ifdef CONFIG_SYSTEM_NXINIT_DEBUG
@@ -248,6 +251,16 @@ static int option_override(FAR struct service_manager_s *sm,
   return 0;
 }
 
+static int option_oneshot(FAR struct service_manager_s *sm,
+                          int argc, FAR char **argv)
+{
+  FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
+                                            node);
+
+  add_flags(s, SVC_ONESHOT);
+  return 0;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -361,6 +374,11 @@ init_service_find_by_pid(FAR struct service_manager_s *sm, const int pid)
 void init_service_reap(FAR struct service_s *service)
 {
   remove_flags(service, SVC_RUNNING);
+  if (check_flags(service, SVC_ONESHOT))
+    {
+      add_flags(service, SVC_DISABLED | SVC_REMOVE);
+    }
+
   if (!check_flags(service, SVC_DISABLED))
     {
       add_flags(service, SVC_RESTARTING);

From 84f798d434d8c9c7da541837d3686dc71cbc7b02 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Sat, 11 Oct 2025 21:10:28 +0800
Subject: [PATCH 372/568] system/nxinit: Add exec_start support for action

Format: exec_start <service>

Start the specified service and pause the processing of any additional
initialization commands until the service completes its execution. This
command operates similarly to the `exec` command; the key difference is
that it utilizes an existing service definition rather than requiring
the `exec` argument vector.

This feature is particularly intended for use with the `reboot_on_failure`
built-in command to perform all types of essential checks during system boot.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/builtin.c | 16 ++++++++++++++--
 system/nxinit/init.c    | 11 ++++++-----
 system/nxinit/service.c |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/system/nxinit/builtin.c b/system/nxinit/builtin.c
index a64a46425..d300457f7 100644
--- a/system/nxinit/builtin.c
+++ b/system/nxinit/builtin.c
@@ -53,6 +53,8 @@ struct cmd_map_s
 
 static int cmd_trigger(FAR struct action_manager_s *am,
                        int argc, FAR char **argv);
+static int cmd_exec_start(FAR struct action_manager_s *am,
+                          int argc, FAR char **argv);
 static int cmd_start(FAR struct action_manager_s *am,
                      int argc, FAR char **argv);
 static int cmd_stop(FAR struct action_manager_s *am,
@@ -73,6 +75,7 @@ static const struct cmd_map_s g_builtin[] =
   {"class_start", 2, 2, cmd_class_start},
   {"class_stop", 2, 2, cmd_class_stop},
   {"exec", 3, 99, cmd_exec},
+  {"exec_start", 2, 2, cmd_exec_start},
   {"start", 2, 2, cmd_start},
   {"stop", 2, 2, cmd_stop},
   {"trigger", 2, 2, cmd_trigger},
@@ -94,8 +97,8 @@ static int cmd_class_stop(FAR struct action_manager_s *am,
   return init_service_stop_by_class(am->sm, argv[1]);
 }
 
-static int cmd_start(FAR struct action_manager_s *am,
-                     int argc, FAR char **argv)
+static int cmd_exec_start(FAR struct action_manager_s *am,
+                          int argc, FAR char **argv)
 {
   FAR struct service_s *service;
 
@@ -109,6 +112,15 @@ static int cmd_start(FAR struct action_manager_s *am,
   return init_service_start(service);
 }
 
+static int cmd_start(FAR struct action_manager_s *am,
+                     int argc, FAR char **argv)
+{
+  int ret;
+
+  ret = cmd_exec_start(am, argc, argv);
+  return ret < 0 ? ret : 0;
+}
+
 static int cmd_stop(FAR struct action_manager_s *am,
                     int argc, FAR char **argv)
 {
diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index 1f5396265..52b71728f 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -105,17 +105,18 @@ static void reap_process(FAR struct service_manager_s *sm,
           continue;
         }
 
+      if (pid == am->pid_running)
+        {
+          name = am->running->argv[0];
+          init_action_reap_command(am);
+        }
+
       service = init_service_find_by_pid(sm, pid);
       if (service != NULL)
         {
           name = service->argv[1];
           init_service_reap(service);
         }
-      else if (pid == am->pid_running)
-        {
-          name = am->running->argv[0];
-          init_action_reap_command(am);
-        }
 
       init_log(service ? LOG_WARNING : LOG_DEBUG,
                "%s '%s' pid %d exited %s %d",
diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 8f456c920..49f4d4c49 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -414,7 +414,7 @@ int init_service_start(FAR struct service_s *service)
   remove_flags(service, SVC_DISABLED);
   init_info("Started service '%s' pid %d", service->argv[1], service->pid);
 
-  return 0;
+  return service->pid;
 }
 
 int init_service_stop(FAR struct service_s *service)

From 84e87a5158134b867480a9ac01070e6917ff5311 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Fri, 10 Oct 2025 21:48:38 +0800
Subject: [PATCH 373/568] system/nxinit: Add reboot_on_failure for service

Add support for the reboot_on_failure option to the service.

When the execution of a command within a certain action fails (returning
a non-zero status code), NxInit will continue to execute subsequent commands or
actions and will not proactively terminate the startup process. To implement
the functionality of "terminating the startup process after a command
execution fails", there are two methods:
a. Execute conditional statements (if/then/else/fi) via exec command,
   but this depends on sh:
   ```
   on init
       exec -- set +e; \
               mount -t fatfs /dev/data /data ; \
               if [ $? -ne 0 ] ; \
               then \
                 echo "failed" ; \
                 reboot ; \
               else \
                 echo "succeed" ; \
               fi;
   ```
b. Via service's oneshot + reboot_on_failure:
   /* Although the example uses sh, it does not depend on it and can be
    * replaced with any other Builtin Apps.
    */
   ```
   on init
       exec_start mkdir_tmp
       ls /tmp

   service mkdir_tmp sh -c "mkdir /tmp"
       reboot_on_failure 0
       oneshot
   ```

Test
  - RC
      service console sh
          class core
          override
    >     reboot_on_failure 0
          restart_period 10000
  - Runtime
      [    0.150000] [ 3] [ 0] init_main: == Dump Services ==
      ...
      [    0.170000] [ 3] [ 0] init_main: Service 0x40486ea0 name 'console' path 'sh'
      [    0.170000] [ 3] [ 0] init_main:   pid: 0
      [    0.170000] [ 3] [ 0] init_main:   arguments:
      [    0.170000] [ 3] [ 0] init_main:       [0] 'service'
      [    0.170000] [ 3] [ 0] init_main:       [1] 'console'
      [    0.170000] [ 3] [ 0] init_main:       [2] 'sh'
      [    0.170000] [ 3] [ 0] init_main:   classes:
      [    0.170000] [ 3] [ 0] init_main:     'core'
      [    0.170000] [ 3] [ 0] init_main:   restart_period: 10000
    > [    0.170000] [ 3] [ 0] init_main:   reboot_on_failure: 0
      [    0.170000] [ 3] [ 0] init_main:   flags:
      [    0.170000] [ 3] [ 0] init_main:     'override'
      ...
      [    0.380000] [ 3] [ 0] init_main: started service 'console' pid 4
      ...
      nsh> kill -9 4
      [    8.060000] [ 3] [ 0] init_main: service 'console' flag 0x20000004 add 0x4
      [    8.060000] [ 3] [ 0] init_main:   -flag 'running'
      [    8.060000] [ 3] [ 0] init_main: service 'console' flag 0x20000000 add 0x8
      [    8.060000] [ 3] [ 0] init_main:   +flag 'restarting'
    > [    8.060000] [ 3] [ 0] init_main: Error reboot on failure of service 'console' reason 0

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/init.c    |  9 ++++----
 system/nxinit/service.c | 47 +++++++++++++++++++++++++++++++++++++++--
 system/nxinit/service.h |  8 ++++++-
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index 52b71728f..a1482f693 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -75,6 +75,7 @@ static void reap_process(FAR struct service_manager_s *sm,
   FAR const char *status;
   FAR struct service_s *service;
   int wstatus;
+  int ret;
   int pid;
 
   for (; ; )
@@ -93,12 +94,12 @@ static void reap_process(FAR struct service_manager_s *sm,
       else if (WIFEXITED(wstatus))
         {
           status = "status";
-          wstatus = WEXITSTATUS(wstatus);
+          ret = WEXITSTATUS(wstatus);
         }
       else if (WIFSIGNALED(wtatus))
         {
           status = "signal";
-          wstatus = WTERMSIG(wstatus);
+          ret = WTERMSIG(wstatus);
         }
       else
         {
@@ -115,12 +116,12 @@ static void reap_process(FAR struct service_manager_s *sm,
       if (service != NULL)
         {
           name = service->argv[1];
-          init_service_reap(service);
+          init_service_reap(service, ret);
         }
 
       init_log(service ? LOG_WARNING : LOG_DEBUG,
                "%s '%s' pid %d exited %s %d",
-               service ? "Service" : "Command", name, pid, status, wstatus);
+               service ? "Service" : "Command", name, pid, status, ret);
     }
 }
 
diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 49f4d4c49..0d39bb614 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/clock.h>
+#include <sys/boardctl.h>
 
 #include <assert.h>
 #include <errno.h>
@@ -99,6 +100,10 @@ static int option_override(FAR struct service_manager_s *sm,
                            int argc, FAR char **argv);
 static int option_oneshot(FAR struct service_manager_s *sm,
                           int argc, FAR char **argv);
+#ifdef CONFIG_BOARDCTL_RESET
+static int option_reboot_on_failure(FAR struct service_manager_s *sm,
+                                    int argc, FAR char **argv);
+#endif
 
 /****************************************************************************
  * Private Data
@@ -111,6 +116,9 @@ static const struct cmd_map_s g_option[] =
   {"restart_period", 2, 2, option_restart_period},
   {"override", 1, 1, option_override},
   {"oneshot", 1, 1, option_oneshot},
+#ifdef CONFIG_BOARDCTL_RESET
+  {"reboot_on_failure", 2, 2, option_reboot_on_failure},
+#endif
 };
 
 #ifdef CONFIG_SYSTEM_NXINIT_DEBUG
@@ -159,7 +167,7 @@ static int kill_service(FAR struct service_s *service, int signo)
       ret = -errno;
       if (ret == -ESRCH)
         {
-          init_service_reap(service);
+          init_service_reap(service, 0);
         }
     }
 
@@ -261,6 +269,17 @@ static int option_oneshot(FAR struct service_manager_s *sm,
   return 0;
 }
 
+#ifdef CONFIG_BOARDCTL_RESET
+static int option_reboot_on_failure(FAR struct service_manager_s *sm,
+                                    int argc, FAR char **argv)
+{
+  FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
+                                            node);
+  s->reset_reason = atoi(argv[1]);
+  return 0;
+}
+#endif
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -371,8 +390,25 @@ init_service_find_by_pid(FAR struct service_manager_s *sm, const int pid)
   return NULL;
 }
 
-void init_service_reap(FAR struct service_s *service)
+void init_service_reap(FAR struct service_s *service, int status)
 {
+#ifdef CONFIG_BOARDCTL_RESET
+  int ret;
+
+  if (status && service->reset_reason >= 0)
+    {
+      init_err("Reboot on failure of service '%s' reason %d",
+               service->argv[1], service->reset_reason);
+      ret = boardctl(BOARDIOC_RESET, service->reset_reason);
+      if (ret < 0)
+        {
+          init_err("Reset failed %d", errno);
+        }
+    }
+#else
+  UNUSED(status);
+#endif
+
   remove_flags(service, SVC_RUNNING);
   if (check_flags(service, SVC_ONESHOT))
     {
@@ -404,6 +440,7 @@ int init_service_start(FAR struct service_s *service)
   if (ret != 0)
     {
       init_err("Starting service '%s': %d", service->argv[1], ret);
+      init_service_reap(service, ret);
       return -ret;
     }
 
@@ -536,6 +573,9 @@ int init_service_parse(FAR const struct parser_s *parser,
         }
 
       s->restart_period = CONFIG_SYSTEM_NXINIT_SERVICE_RESTART_PERIOD;
+#ifdef CONFIG_BOARDCTL_RESET
+      s->reset_reason = -1;
+#endif
       list_initialize(&s->classes);
       list_add_tail(&sm->services, &s->node);
     }
@@ -618,6 +658,9 @@ void init_dump_service(FAR struct service_s *s)
     }
 
   init_debug("  restart_period: %d", s->restart_period);
+#ifdef CONFIG_BOARDCTL_RESET
+  init_debug("  reboot_on_failure: %d", s->reset_reason);
+#endif
 
   if (s->flags)
     {
diff --git a/system/nxinit/service.h b/system/nxinit/service.h
index 303a44584..d76406e56 100644
--- a/system/nxinit/service.h
+++ b/system/nxinit/service.h
@@ -100,6 +100,12 @@ struct service_s
   struct timespec time_kill;
   int restart_period;
   pid_t pid;
+
+  /* The "target" of service option "reboot_on_failure" */
+
+#ifdef CONFIG_BOARDCTL_RESET
+  int reset_reason;
+#endif
 };
 
 struct service_manager_s
@@ -112,7 +118,7 @@ struct service_manager_s
  ****************************************************************************/
 
 int  init_service_refresh(FAR struct service_manager_s *sm);
-void init_service_reap(FAR struct service_s *service);
+void init_service_reap(FAR struct service_s *service, int status);
 int  init_service_start(FAR struct service_s *service);
 int  init_service_stop(FAR struct service_s *service);
 int  init_service_start_by_class(FAR struct service_manager_s *sm,

From 610de9816dd7663074177a9e21c7a193c5d5f348 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 09:17:54 -0300
Subject: [PATCH 374/568] system/nxinit: Add comments to the Kconfig

This comments to be visible to the users

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/Kconfig | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
index b5e82ec2d..b701124a3 100644
--- a/system/nxinit/Kconfig
+++ b/system/nxinit/Kconfig
@@ -14,9 +14,7 @@ config SYSTEM_NXINIT
 
 if SYSTEM_NXINIT
 
-#
-# Basic
-#
+comment "NXInit Basic"
 
 config SYSTEM_NXINIT_PRIORITY
 	int "Thread priority"
@@ -30,9 +28,7 @@ config SYSTEM_NXINIT_PROGNAME
 	string "Program name"
 	default "init"
 
-#
-# RC
-#
+comment "NXInit Run Control(RC)"
 
 config SYSTEM_NXINIT_RC_LINE_MAX
 	int "Max line length of RC file"
@@ -41,9 +37,7 @@ config SYSTEM_NXINIT_RC_LINE_MAX
 		Maximum line length of RC file.
 		More details: https://android.googlesource.com/platform/system/core/+/master/init/README.md
 
-#
-# Action
-#
+comment "NXInit Action"
 
 config SYSTEM_NXINIT_ACTION_CMD_ARGS_MAX
 	int "Max number of command arguments"
@@ -60,7 +54,7 @@ config SYSTEM_NXINIT_ACTION_CMD_ARGS_MAX
 		```
 
 config SYSTEM_NXINIT_ACTION_WARN_SLOW
-	int "Warn if command takes too long"
+	int "Slow command warning timeout"
 	default 50
 	depends on SYSTEM_NXINIT_WARN
 	---help---
@@ -80,9 +74,7 @@ config SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX
 		};
 		```
 
-#
-# Service
-#
+comment "NXInit Service"
 
 config SYSTEM_NXINIT_SERVICE_ARGS_MAX
 	int "Max number of service arguments"
@@ -102,9 +94,7 @@ config SYSTEM_NXINIT_SERVICE_RESTART_PERIOD
 	int "Service restart period in ms"
 	default 5000
 
-#
-# Log level
-#
+comment "NXInit Log level"
 
 config SYSTEM_NXINIT_ERR
 	bool "Enable error log"

From 7af8ed81fd7482ffcc47223e8c4c12836e9adc48 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 09:26:30 -0300
Subject: [PATCH 375/568] system/nxinit: Fix name[0] issue

This an issue where a variable was declared as name[0]

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/service.c | 1 +
 system/nxinit/service.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 0d39bb614..3f7578fea 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -224,6 +224,7 @@ static int option_class(FAR struct service_manager_s *sm,
       return -errno;
     }
 
+  len = (len >= MAX_NXINIT_SERVICE_NAME) ? MAX_NXINIT_SERVICE_NAME : len;
   memcpy(c->name, argv[1], len);
   list_add_tail(&s->classes, &c->node);
   return 0;
diff --git a/system/nxinit/service.h b/system/nxinit/service.h
index d76406e56..babf6edd2 100644
--- a/system/nxinit/service.h
+++ b/system/nxinit/service.h
@@ -66,6 +66,8 @@
 
 #define SVC_REMOVE      (1 << 31)
 
+#define MAX_NXINIT_SERVICE_NAME 32
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -73,7 +75,7 @@
 struct service_class_s
 {
   struct list_node node;     /* Service class list node */
-  FAR char name[0];
+  FAR char name[MAX_NXINIT_SERVICE_NAME];
 };
 
 struct service_s

From cdb89a54f63344401f1a2d306b06806f3d153e22 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 09:32:32 -0300
Subject: [PATCH 376/568] system/nxinit: Let use a define to define the class
 max cmds

Avoid fixing the max 99 class cmds directly in the code.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/service.c | 2 +-
 system/nxinit/service.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 3f7578fea..847b1a31d 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -111,7 +111,7 @@ static int option_reboot_on_failure(FAR struct service_manager_s *sm,
 
 static const struct cmd_map_s g_option[] =
 {
-  {"class", 2, 99, option_class},
+  {"class", 2, NXINIT_ACTION_CMD_ARGS_MAX, option_class},
   {"gentle_kill", 1, 1, option_gentle_kill},
   {"restart_period", 2, 2, option_restart_period},
   {"override", 1, 1, option_override},
diff --git a/system/nxinit/service.h b/system/nxinit/service.h
index babf6edd2..645200648 100644
--- a/system/nxinit/service.h
+++ b/system/nxinit/service.h
@@ -66,7 +66,9 @@
 
 #define SVC_REMOVE      (1 << 31)
 
-#define MAX_NXINIT_SERVICE_NAME 32
+#define NXINIT_SERVICE_NAME_MAX    32
+
+#define NXINIT_ACTION_CMD_ARGS_MAX 99
 
 /****************************************************************************
  * Public Types
@@ -75,7 +77,7 @@
 struct service_class_s
 {
   struct list_node node;     /* Service class list node */
-  FAR char name[MAX_NXINIT_SERVICE_NAME];
+  FAR char name[NXINIT_SERVICE_NAME_MAX];
 };
 
 struct service_s

From 820eb64f1abd998aedd118f6f30b591b4fa75bf6 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 09:37:57 -0300
Subject: [PATCH 377/568] system/nxinit: Change LOG_DEBUG to LOG_USER

Make it clear it is a userspace log.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/init.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/nxinit/init.h b/system/nxinit/init.h
index 3e81aceb0..16daa2306 100644
--- a/system/nxinit/init.h
+++ b/system/nxinit/init.h
@@ -36,7 +36,7 @@
 #define TIMESPEC2MS(t) (((t).tv_sec * 1000) + (t).tv_nsec / 1000000)
 
 #ifdef CONFIG_SYSTEM_NXINIT_DEBUG
-#define init_debug(...) syslog(LOG_DEBUG, ##__VA_ARGS__)
+#define init_debug(...) syslog(LOG_USER, ##__VA_ARGS__)
 #define init_dump_args(argc, argv) \
           { \
             int _i; \

From d8ead1a0f3d81cfb253b6fa774c8ad0a7e394253 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 09:42:14 -0300
Subject: [PATCH 378/568] system/nxinit: Remove deprecated BOARDIOC_INIT ioctl

Since boardctl(BOARDIOC_INIT, 0) was removed from all boards, it is
not right to use it here.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/init.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index a1482f693..e7824a419 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -191,7 +191,6 @@ int main(int argc, FAR char *argv[])
 
   init_action_add_event(&am, "boot");
 
-  boardctl(BOARDIOC_INIT, 0);
   init_action_add_event(&am, "init");
 
 #ifdef CONFIG_NETUTILS_NETINIT

From 5341a2fc9207963f488d292d8f07383dd015f8c8 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 10:32:54 -0300
Subject: [PATCH 379/568] system/nxinit: Add final event

Add the final event option to the Kconfig

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/Kconfig | 7 +++++++
 system/nxinit/init.c  | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
index b701124a3..382984371 100644
--- a/system/nxinit/Kconfig
+++ b/system/nxinit/Kconfig
@@ -73,6 +73,13 @@ config SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX
 		  ...
 		};
 		```
+config SYSTEM_NXINIT_FINALINIT
+	bool "Enable NXInit final event"
+	default n
+	--help--
+		Enable support to run the "final" event. Currently only "boot",
+		and "init" event are enabled by default, where "netinit" and
+		"final" are optional.
 
 comment "NXInit Service"
 
diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index e7824a419..8a88c63d9 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -198,8 +198,7 @@ int main(int argc, FAR char *argv[])
   init_action_add_event(&am, "netinit");
 #endif
 
-#ifdef CONFIG_BOARDCTL_FINALINIT
-  boardctl(BOARDIOC_FINALINIT, 0);
+#ifdef CONFIG_SYSTEM_NXINIT_FINALINIT
   init_action_add_event(&am, "finalinit");
 #endif
 

From c28e61fd3941cdf9e9b8bcb34c68b53891ad55fb Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Wed, 27 May 2026 10:51:34 -0300
Subject: [PATCH 380/568] system/nxinit: Change NXInit to EXPERIMENTAL

Since NXInit still under development, it is better to change it to
EXPERIMENTAL.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/nxinit/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
index 382984371..58d3c406e 100644
--- a/system/nxinit/Kconfig
+++ b/system/nxinit/Kconfig
@@ -6,6 +6,7 @@
 config SYSTEM_NXINIT
 	tristate "NuttX Init"
 	default n
+	depends on EXPERIMENTAL
 	depends on LIBC_EXECFUNCS
 	depends on SCHED_CHILD_STATUS
 	---help---

From 241096a87b27c26f0ac593669dcad757c238924f Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Wed, 27 May 2026 19:42:10 -0400
Subject: [PATCH 381/568] apps/nxinit: Fix Kconfig typo

Fix typo in help string.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 system/nxinit/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
index 58d3c406e..fc2670312 100644
--- a/system/nxinit/Kconfig
+++ b/system/nxinit/Kconfig
@@ -77,7 +77,7 @@ config SYSTEM_NXINIT_ACTION_MANAGER_EVENT_MAX
 config SYSTEM_NXINIT_FINALINIT
 	bool "Enable NXInit final event"
 	default n
-	--help--
+	---help---
 		Enable support to run the "final" event. Currently only "boot",
 		and "init" event are enabled by default, where "netinit" and
 		"final" are optional.

From 6d8708184ee9926d6e3ff58987c8ad4aaf7130cf Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Wed, 27 May 2026 19:52:02 -0400
Subject: [PATCH 382/568] apps/nxinit: Fix service length error

Would not compile due to typo in macro describing service name length.

Change ensures that:
* We do not malloc an extra `len` bytes since this is already allocated
  as part of the struct
* The name string always has a null terminating byte

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>

FIx
---
 system/nxinit/service.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 847b1a31d..7f582e6e4 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -206,9 +206,12 @@ static int option_class(FAR struct service_manager_s *sm,
 {
   FAR struct service_s *s = list_last_entry(&sm->services, struct service_s,
                                             node);
-  size_t len = strlen(argv[1]) + 1;
+  size_t len;
   FAR struct service_class_s *c;
 
+  len = strlen(argv[1]) + 1;
+  len = (len >= NXINIT_SERVICE_NAME_MAX) ? NXINIT_SERVICE_NAME_MAX : len;
+
   list_for_every_entry(&s->classes, c, struct service_class_s, node)
     {
       if (!strcmp(c->name, argv[1]))
@@ -217,15 +220,15 @@ static int option_class(FAR struct service_manager_s *sm,
         }
     }
 
-  c = malloc(sizeof(*c) + len);
+  c = malloc(sizeof(*c));
   if (c == NULL)
     {
       init_err("Alloc class");
       return -errno;
     }
 
-  len = (len >= MAX_NXINIT_SERVICE_NAME) ? MAX_NXINIT_SERVICE_NAME : len;
   memcpy(c->name, argv[1], len);
+  c->name[len] = '\0'; /* Always ensure null termination */
   list_add_tail(&s->classes, &c->node);
   return 0;
 }

From 2b5899c7d4b277c1977e6e14d8c0ef8a9921782e Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Wed, 27 May 2026 19:32:57 -0400
Subject: [PATCH 383/568] apps/nxinit: Make init.rc file path configurable

The init.rc file path is now configurable to allow users to choose where
to put the startup script. This is useful for devices that mount
external media to a special directory like `/sd`.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 system/nxinit/Kconfig | 6 ++++++
 system/nxinit/init.c  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/Kconfig b/system/nxinit/Kconfig
index fc2670312..e159e90b7 100644
--- a/system/nxinit/Kconfig
+++ b/system/nxinit/Kconfig
@@ -31,6 +31,12 @@ config SYSTEM_NXINIT_PROGNAME
 
 comment "NXInit Run Control(RC)"
 
+config SYSTEM_NXINIT_RC_FILE_PATH
+	string "Path to RC file"
+	default "/etc/init.d/init.rc"
+	---help---
+		Path to the init.rc file to use for NXInit's boot logic.
+
 config SYSTEM_NXINIT_RC_LINE_MAX
 	int "Max line length of RC file"
 	default 128
diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index 8a88c63d9..d501abcad 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -180,7 +180,7 @@ int main(int argc, FAR char *argv[])
         }
     }
 
-  r = init_parse_config_file(parser, "/etc/init.d/init.rc");
+  r = init_parse_config_file(parser, CONFIG_SYSTEM_NXINIT_RC_FILE_PATH);
   if (r < 0)
     {
       goto out;

From 418cf21224309faa838c77abd87285c977caf20a Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Wed, 27 May 2026 19:56:44 -0400
Subject: [PATCH 384/568] apps/nxinit: Fix uninitialized variable

Without debug enabled, the code would not compile due to checking
`WIFEXITED(wstatus)` when `wstatus` was uninitialized.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 system/nxinit/init.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index d501abcad..1a542f796 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -80,13 +80,7 @@ static void reap_process(FAR struct service_manager_s *sm,
 
   for (; ; )
     {
-      pid = waitpid(-1,
-#ifdef CONFIG_SYSTEM_NXINIT_DEBUG
-                    &wstatus,
-#else
-                    NULL,
-#endif
-                    WNOHANG);
+      pid = waitpid(-1, &wstatus, WNOHANG);
       if (pid <= 0)
         {
           break;

From b5b54e7663c5672cc62be2d60d73432584314d36 Mon Sep 17 00:00:00 2001
From: hanzj <hanzjian@zepp.com>
Date: Thu, 28 May 2026 09:31:46 +0800
Subject: [PATCH 385/568] interpreters/quickjs,testing/nettest: fix typos in
 Kconfig and source.

Fix spelling errors in QuickJS Kconfig and nettest source:
* "distable" -> "disable" in INTERPRETERS_QUICKJS_NONE description
* "destory" -> "destroy" in INTERPRETERS_QUICKJS_EXT_HOOK option
  and help text (2 occurrences)
* "err_destory" -> "err_destroy" label in nettest_tcpserver.c
  (3 occurrences: 2 goto targets and 1 label definition)

These are cosmetic fixes with no functional change.

Signed-off-by: hanzj <hanzjian@zepp.com>
---
 interpreters/quickjs/Kconfig              | 6 +++---
 testing/nettest/utils/nettest_tcpserver.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/interpreters/quickjs/Kconfig b/interpreters/quickjs/Kconfig
index cc10f7799..43a31c055 100644
--- a/interpreters/quickjs/Kconfig
+++ b/interpreters/quickjs/Kconfig
@@ -14,7 +14,7 @@ choice
 	default INTERPRETERS_QUICKJS_NONE
 
 config INTERPRETERS_QUICKJS_NONE
-	bool "distable quickjs interpreter"
+	bool "Disable quickjs interpreter"
 
 config INTERPRETERS_QUICKJS_MINI
 	bool "Minimal quickjs interpreter"
@@ -40,11 +40,11 @@ config INTERPRETERS_QUICKJS_STACKSIZE
 	default 8192
 
 config INTERPRETERS_QUICKJS_EXT_HOOK
-	bool "External init/destory hook"
+	bool "External init/destroy hook"
 	default n
 	depends on INTERPRETERS_QUICKJS_MINI
 	---help---
 		Since minimal interpreter only support 'console.log',
-		you can export custom module by implement init/destory hook.
+		you can export custom module by implement init/destroy hook.
 
 endif # INTERPRETERS_QUICKJS
diff --git a/testing/nettest/utils/nettest_tcpserver.c b/testing/nettest/utils/nettest_tcpserver.c
index c31acf8b4..a11f41d92 100644
--- a/testing/nettest/utils/nettest_tcpserver.c
+++ b/testing/nettest/utils/nettest_tcpserver.c
@@ -409,13 +409,13 @@ int nettest_destroy_tcp_lo_server(pthread_t server_tid)
       ret = connect(sockfd, (FAR struct sockaddr *)&myaddr, addrlen);
       if (ret < 0)
         {
-          goto err_destory;
+          goto err_destroy;
         }
 
       ret = send(sockfd, EXIT_MSG, strlen(EXIT_MSG), 0);
       if (ret < 0)
         {
-          goto err_destory;
+          goto err_destroy;
         }
 
       pthread_join(server_tid, NULL);
@@ -424,7 +424,7 @@ int nettest_destroy_tcp_lo_server(pthread_t server_tid)
 
   return 0;
 
-err_destory:
+err_destroy:
   close(sockfd);
   return -errno;
 }

From a74b2fc61b87cce26cfc8867032122a6d3ac6520 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 27 May 2026 17:17:04 +0800
Subject: [PATCH 386/568] system/settings: Bound public string handling

Use strnlen() for public key, value, and storage path length checks so user-provided settings strings are validated against the configured maximum sizes before they are scanned.

Use bounded key comparisons and strlcpy() for fixed-size settings fields. This addresses part of #3109 without changing the settings API or storage formats.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 system/settings/settings.c | 47 +++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/system/settings/settings.c b/system/settings/settings.c
index 1625c3f5a..3949a384f 100644
--- a/system/settings/settings.c
+++ b/system/settings/settings.c
@@ -152,6 +152,13 @@ static int get_setting(FAR char *key, FAR setting_t **setting)
 
   assert(*setting == NULL);
 
+  if (strnlen(key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE) >=
+      CONFIG_SYSTEM_SETTINGS_KEY_SIZE)
+    {
+      ret = -EINVAL;
+      goto exit;
+    }
+
   for (i = 0; i < CONFIG_SYSTEM_SETTINGS_MAP_SIZE; i++)
     {
       if (map[i].type == SETTING_EMPTY)
@@ -160,7 +167,7 @@ static int get_setting(FAR char *key, FAR setting_t **setting)
           goto exit;
         }
 
-      if (strcmp(map[i].key, key) == 0)
+      if (strncmp(map[i].key, key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE) == 0)
         {
           *setting = &map[i];
           goto exit;
@@ -201,16 +208,16 @@ static size_t get_string(FAR setting_t *setting, FAR char *buffer,
   if (setting->type == SETTING_STRING)
     {
       FAR const char *s = setting->val.s;
-      size_t len = strlen(s);
+      size_t len = strnlen(s, CONFIG_SYSTEM_SETTINGS_VALUE_SIZE);
 
+      assert(len < CONFIG_SYSTEM_SETTINGS_VALUE_SIZE);
       assert(len < size);
-      if (len >= size)
+      if (len >= CONFIG_SYSTEM_SETTINGS_VALUE_SIZE || len >= size)
         {
           return 0;
         }
 
-      strncpy(buffer, s, size);
-      buffer[size - 1] = '\0';
+      strlcpy(buffer, s, size);
 
       return len;
     }
@@ -221,7 +228,7 @@ static size_t get_string(FAR setting_t *setting, FAR char *buffer,
       inet_ntop(AF_INET, &setting->val.ip, buffer, size);
       buffer[size - 1] = '\0';
 
-      return strlen(buffer);
+      return strnlen(buffer, size);
     }
 
   return 0;
@@ -244,6 +251,8 @@ static size_t get_string(FAR setting_t *setting, FAR char *buffer,
 
 static int set_string(FAR setting_t *setting, FAR char *str)
 {
+  size_t len;
+
   assert(setting);
 
   if ((setting->type != SETTING_STRING) &&
@@ -252,19 +261,19 @@ static int set_string(FAR setting_t *setting, FAR char *str)
       return -EACCES;
     }
 
-  if (strlen(str) >= CONFIG_SYSTEM_SETTINGS_VALUE_SIZE)
+  len = strnlen(str, CONFIG_SYSTEM_SETTINGS_VALUE_SIZE);
+  if (len >= CONFIG_SYSTEM_SETTINGS_VALUE_SIZE)
     {
       return -EINVAL;
     }
 
-  if (strlen(str) && (sanity_check(str) < 0))
+  if (len > 0 && (sanity_check(str) < 0))
     {
       return -EINVAL;
     }
 
   setting->type = SETTING_STRING;
-  strncpy(setting->val.s, str, CONFIG_SYSTEM_SETTINGS_VALUE_SIZE);
-  setting->val.s[CONFIG_SYSTEM_SETTINGS_VALUE_SIZE - 1] = '\0';
+  strlcpy(setting->val.s, str, CONFIG_SYSTEM_SETTINGS_VALUE_SIZE);
 
   return OK;
 }
@@ -825,6 +834,7 @@ int settings_setstorage(FAR char *file, enum storage_type_e type)
   int ret = OK;
   int idx = 0;
   uint32_t h;
+  size_t filelen;
 
   assert(g_settings.initialized);
 
@@ -847,16 +857,16 @@ int settings_setstorage(FAR char *file, enum storage_type_e type)
       goto errout;
     }
 
-  assert(strlen(file) < CONFIG_SYSTEM_SETTINGS_MAX_FILENAME);
-  if (strlen(file) >= CONFIG_SYSTEM_SETTINGS_MAX_FILENAME)
+  filelen = strnlen(file, CONFIG_SYSTEM_SETTINGS_MAX_FILENAME);
+  assert(filelen < CONFIG_SYSTEM_SETTINGS_MAX_FILENAME);
+  if (filelen >= CONFIG_SYSTEM_SETTINGS_MAX_FILENAME)
     {
       ret = -EINVAL;
       goto errout;
     }
 
   storage = &g_settings.store[idx];
-  strncpy(storage->file, file, sizeof(storage->file));
-  storage->file[sizeof(storage->file) - 1] = '\0';
+  strlcpy(storage->file, file, sizeof(storage->file));
 
   switch (type)
   {
@@ -1114,6 +1124,7 @@ int settings_create(FAR char *key, enum settings_type_e type, ...)
 {
   int ret = OK;
   FAR setting_t *setting = NULL;
+  size_t keylen;
   int j;
 
   assert(g_settings.initialized);
@@ -1123,7 +1134,8 @@ int settings_create(FAR char *key, enum settings_type_e type, ...)
       return -EINVAL;
     }
 
-  if (strlen(key) == 0 || strlen(key) >= CONFIG_SYSTEM_SETTINGS_KEY_SIZE)
+  keylen = strnlen(key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
+  if (keylen == 0 || keylen >= CONFIG_SYSTEM_SETTINGS_KEY_SIZE)
     {
       return -EINVAL;
     }
@@ -1141,7 +1153,7 @@ int settings_create(FAR char *key, enum settings_type_e type, ...)
 
   for (j = 0; j < CONFIG_SYSTEM_SETTINGS_MAP_SIZE; j++)
     {
-      if (strcmp(key, map[j].key) == 0)
+      if (strncmp(key, map[j].key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE) == 0)
         {
           setting = &map[j];
 
@@ -1153,8 +1165,7 @@ int settings_create(FAR char *key, enum settings_type_e type, ...)
       if (map[j].type == SETTING_EMPTY)
         {
           setting = &map[j];
-          strncpy(setting->key, key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
-          setting->key[CONFIG_SYSTEM_SETTINGS_KEY_SIZE - 1] = '\0';
+          strlcpy(setting->key, key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
 
           /* This setting is empty/unused - we can use it */
 

From c0fc20820288c541935fd02a2d9c1ce4d940ba4f Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 27 May 2026 17:18:35 +0800
Subject: [PATCH 387/568] system/settings: Bound storage string handling

Use configured key, value, and filename limits while loading and saving settings storage data.

The text backend now builds backup filenames with a sized buffer and bounded formatting, and both text and binary loading reject keys or string values that are not terminated within their configured field sizes. This completes #3109 without changing the storage formats.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 system/settings/storage_bin.c  | 16 ++++++++++++-
 system/settings/storage_text.c | 44 +++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/system/settings/storage_bin.c b/system/settings/storage_bin.c
index dff17f6fa..b2b37443e 100644
--- a/system/settings/storage_bin.c
+++ b/system/settings/storage_bin.c
@@ -96,12 +96,19 @@ extern setting_t map[CONFIG_SYSTEM_SETTINGS_MAP_SIZE];
 FAR setting_t *getsetting(FAR char *key)
 {
   int i;
+  size_t keylen;
+
+  keylen = strnlen(key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
+  if (keylen >= CONFIG_SYSTEM_SETTINGS_KEY_SIZE)
+    {
+      return NULL;
+    }
 
   for (i = 0; i < CONFIG_SYSTEM_SETTINGS_MAP_SIZE; i++)
     {
       FAR setting_t *setting = &map[i];
 
-      if (strcmp(key, setting->key) == 0)
+      if (strncmp(key, setting->key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE) == 0)
         {
           return setting;
         }
@@ -190,6 +197,13 @@ int load_bin(FAR char *file)
           continue;
         }
 
+      if (setting.type == SETTING_STRING &&
+          strnlen(setting.val.s, CONFIG_SYSTEM_SETTINGS_VALUE_SIZE) >=
+          CONFIG_SYSTEM_SETTINGS_VALUE_SIZE)
+        {
+          continue;
+        }
+
       memcpy(slot, &setting, sizeof(setting_t));
     }
 
diff --git a/system/settings/storage_text.c b/system/settings/storage_text.c
index de48a60a2..dcf0b0fac 100644
--- a/system/settings/storage_text.c
+++ b/system/settings/storage_text.c
@@ -97,9 +97,11 @@ extern setting_t map[CONFIG_SYSTEM_SETTINGS_MAP_SIZE];
 FAR setting_t *getsetting(char *key)
 {
   int i;
+  size_t keylen;
   FAR setting_t *setting;
 
-  if (strlen(key) >= CONFIG_SYSTEM_SETTINGS_KEY_SIZE)
+  keylen = strnlen(key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
+  if (keylen >= CONFIG_SYSTEM_SETTINGS_KEY_SIZE)
     {
       return NULL;
     }
@@ -108,15 +110,14 @@ FAR setting_t *getsetting(char *key)
     {
       setting = &map[i];
 
-      if (strcmp(key, setting->key) == 0)
+      if (strncmp(key, setting->key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE) == 0)
         {
           return setting;
         }
 
       if (setting->type == SETTING_EMPTY)
         {
-          strncpy(setting->key, key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
-          setting->key[CONFIG_SYSTEM_SETTINGS_KEY_SIZE - 1] = '\0';
+          strlcpy(setting->key, key, CONFIG_SYSTEM_SETTINGS_KEY_SIZE);
           return setting;
         }
     }
@@ -152,21 +153,27 @@ int load_text(FAR char *file)
   FAR char      *backup_file;
   FAR char      *buffer;
   FAR setting_t *setting;
+  size_t        filelen;
 
   /* Check that the file exists */
 
+  filelen = strnlen(file, CONFIG_SYSTEM_SETTINGS_MAX_FILENAME);
+  if (filelen >= CONFIG_SYSTEM_SETTINGS_MAX_FILENAME)
+    {
+      return -EINVAL;
+    }
+
   if (access(file, F_OK) != 0)
     {
       /* If not, try the backup file */
 
-      backup_file = malloc(strlen(file) + 2);
+      backup_file = malloc(filelen + 2);
       if (backup_file == NULL)
         {
           return -ENODEV;
         }
 
-      strcpy(backup_file, file);
-      strcat(backup_file, "~");
+      snprintf(backup_file, filelen + 2, "%s~", file);
 
       if (access(backup_file, F_OK) == 0)
         {
@@ -196,10 +203,12 @@ int load_text(FAR char *file)
   while (fgets(buffer, BUFFER_SIZE, f))
     {
       int  i;
+      size_t linelen;
 
       /* Remove any line terminators */
 
-      for (i = ((int)strlen(buffer) - 1); i > 0; i--)
+      linelen = strnlen(buffer, BUFFER_SIZE);
+      for (i = ((int)linelen - 1); i > 0; i--)
         {
           if (buffer[i] == ';' || buffer[i] == '\n' || buffer[i] == '\r')
             {
@@ -260,15 +269,15 @@ int load_text(FAR char *file)
             {
               /* It's a string */
 
-              if (strlen(val) >= CONFIG_SYSTEM_SETTINGS_VALUE_SIZE)
+              if (strnlen(val, CONFIG_SYSTEM_SETTINGS_VALUE_SIZE) >=
+                  CONFIG_SYSTEM_SETTINGS_VALUE_SIZE)
                 {
                   continue;
                 }
 
               setting->type = SETTING_STRING;
-              strncpy(setting->val.s, val,
+              strlcpy(setting->val.s, val,
                       CONFIG_SYSTEM_SETTINGS_VALUE_SIZE);
-              setting->val.s[CONFIG_SYSTEM_SETTINGS_VALUE_SIZE - 1] = '\0';
             }
         }
       else
@@ -343,17 +352,24 @@ abort:
 int save_text(FAR char *file)
 {
   int      ret = OK;
-  FAR char *backup_file = malloc(strlen(file) + 2);
+  FAR char *backup_file;
   FAR FILE *f;
+  size_t   filelen;
   int      i;
 
+  filelen = strnlen(file, CONFIG_SYSTEM_SETTINGS_MAX_FILENAME);
+  if (filelen >= CONFIG_SYSTEM_SETTINGS_MAX_FILENAME)
+    {
+      return -EINVAL;
+    }
+
+  backup_file = malloc(filelen + 2);
   if (backup_file == NULL)
     {
       return -ENODEV;
     }
 
-  strcpy(backup_file, file);
-  strcat(backup_file, "~");
+  snprintf(backup_file, filelen + 2, "%s~", file);
 
   f = fopen(backup_file, "w");
   if (f == NULL)

From 07647d3fd45a9d21b5baa69df1a5880dec8eacde Mon Sep 17 00:00:00 2001
From: hanzj <hanzjian@zepp.com>
Date: Thu, 28 May 2026 21:18:44 +0800
Subject: [PATCH 388/568] system/lzf: Fix missing space in Kconfig help text.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix a missing space in the Kconfig help text for SYSTEM_LZF:
'Enable theLZF' → 'Enable the LZF'.

Signed-off-by: Zepp-Hanzj <Zepp-Hanzj@users.noreply.github.com>
Signed-off-by: hanzj <hanzjian@zepp.com>
---
 system/lzf/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/lzf/Kconfig b/system/lzf/Kconfig
index dad84b9a2..897945169 100644
--- a/system/lzf/Kconfig
+++ b/system/lzf/Kconfig
@@ -8,7 +8,7 @@ config SYSTEM_LZF
 	default n
 	depends on LIBC_LZF
 	---help---
-		Enable theLZF compression tool
+		Enable the LZF compression tool
 
 if SYSTEM_LZF
 

From fa46bdf9e868e9c6eb12930e9646b999571c18bb Mon Sep 17 00:00:00 2001
From: Peter Barada <peter.barada@gmail.com>
Date: Sat, 30 May 2026 18:05:31 -0400
Subject: [PATCH 389/568] testing/drivers/crypto: Add SH224 hash test

Add SHA224 hash test using results generated from sha224sum.

Modify "huge block" testing since allocating 600KB to hash all
at once fails on most microcontrollers.  Instead allocate a
smaller block and pass into syshash_update() enough times to
hash 600KB of data.

Signed-off-by: Peter Barada <peter.barada@gmail.com>
---
 testing/drivers/crypto/Kconfig |   4 +
 testing/drivers/crypto/hash.c  | 200 +++++++++++++++++++++++++++++----
 2 files changed, 185 insertions(+), 19 deletions(-)

diff --git a/testing/drivers/crypto/Kconfig b/testing/drivers/crypto/Kconfig
index 18a4f3521..83d10889b 100644
--- a/testing/drivers/crypto/Kconfig
+++ b/testing/drivers/crypto/Kconfig
@@ -44,6 +44,10 @@ config TESTING_CRYPTO_HASH_DISABLE_SHA1
 	bool "disable sha1 tests"
 	default n
 
+config TESTING_CRYPTO_HASH_DISABLE_SHA224
+	bool "disable sha224 tests"
+	default n
+
 config TESTING_CRYPTO_HASH_DISABLE_SHA256
 	bool "disable sha256 tests"
 	default n
diff --git a/testing/drivers/crypto/hash.c b/testing/drivers/crypto/hash.c
index b0be9306c..acbbce0fd 100644
--- a/testing/drivers/crypto/hash.c
+++ b/testing/drivers/crypto/hash.c
@@ -35,13 +35,14 @@
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
 #  include <crypto/sha1.h>
 #endif
-#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256) || \
+#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224) || \
+    !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256) ||   \
     !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512)
 #  include <crypto/sha2.h>
 #endif
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
-#  define HASH_HUGE_BLOCK_SIZE (600 * 1024) /* 600k */
+#  define HASH_HUGE_BLOCK_SIZE (600 * 1024) /* size hash was done over */
 #endif
 
 typedef struct crypto_context
@@ -95,8 +96,9 @@ tb md5_testcase[] =
 };
 #endif
 
-#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1) || \
-    !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256)
+#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1)    \
+  || !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224) \
+  || !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256)
 tb sha_testcase[] =
 {
     {
@@ -169,6 +171,26 @@ static const unsigned char sha1_result[3][20] =
 };
 #endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+/* Calculated using sha224sum */
+
+static const unsigned char sha224_result[3][28] =
+{
+  { 0x23, 0x09, 0x7d, 0x22, 0x34, 0x05, 0xd8, 0x22,
+    0x86, 0x42, 0xa4, 0x77, 0xbd, 0xa2, 0x55, 0xb3,
+    0x2a, 0xad, 0xbc, 0xe4, 0xbd, 0xa0, 0xb3, 0xf7,
+    0xe3, 0x6c, 0x9d, 0xa7 },
+  { 0x75, 0x38, 0x8b, 0x16, 0x51, 0x27, 0x76, 0xcc,
+    0x5d, 0xba, 0x5d, 0xa1, 0xfd, 0x89, 0x01, 0x50,
+    0xb0, 0xc6, 0x45, 0x5c, 0xb4, 0xf5, 0x8b, 0x19,
+    0x52, 0x52, 0x25, 0x25 },
+  { 0x20, 0x79, 0x46, 0x55, 0x98, 0x0c, 0x91, 0xd8,
+    0xbb, 0xb4, 0xc1, 0xea, 0x97, 0x61, 0x8a, 0x4b,
+    0xf0, 0x3f, 0x42, 0x58, 0x19, 0x48, 0xb2, 0xee,
+    0x4e, 0xe7, 0xad, 0x67 }
+};
+#endif
+
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
 /* FIPS-180-2 test vectors */
 
@@ -238,6 +260,16 @@ static const unsigned char sha1_huge_block_result[20] =
 };
 #  endif
 
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
+static const unsigned char sha224_huge_block_result[28] =
+{
+  0xff, 0x42, 0x9e, 0x92, 0x94, 0xce, 0x0a, 0x31,
+  0xd2, 0x80, 0xc6, 0xad, 0x27, 0x3f, 0x8f, 0xd5,
+  0xa9, 0x8a, 0xe7, 0x6b, 0xd1, 0xd4, 0x67, 0xc7,
+  0xc1, 0x91, 0xc4, 0x78
+};
+#  endif
+
 #  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
 static const unsigned char sha256_huge_block_result[32] =
 {
@@ -377,11 +409,13 @@ static int match(const unsigned char *a, const unsigned char *b, size_t len)
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
 static int testing_hash_huge_block(crypto_context *ctx, int op,
-                    FAR const unsigned char *block, size_t len,
+                    FAR const unsigned char *block, size_t block_size,
                     FAR const unsigned char *result, size_t reslen)
 {
-  int ret = 0;
   unsigned char output[64];
+  size_t offset;
+  size_t buf_size;
+  int ret = 0;
 
   ret = syshash_start(ctx, op);
   if (ret != 0)
@@ -389,11 +423,28 @@ static int testing_hash_huge_block(crypto_context *ctx, int op,
       return ret;
     }
 
-  ret = syshash_update(ctx, (char *)block, len);
-  if (ret != 0)
+  /* Huge block tests results were calculated over
+   * HASH_HUGE_BLOCK_SIZE bytes containing all 'a's.
+   * If buffer block size isn't that size, repeatedly
+   * pass buffer into syshash_update() to hash total of
+   * HASH_HUGE_BLOCK_SIZE bytes of data.
+   */
+
+  offset = 0;
+  while (offset < HASH_HUGE_BLOCK_SIZE)
+  {
+    buf_size = HASH_HUGE_BLOCK_SIZE - offset;
+    if (buf_size > block_size)
+    {
+      buf_size = block_size;
+    }
+    ret = syshash_update(ctx, (char *)block, buf_size);
+    if (ret != 0)
     {
       return ret;
     }
+    offset += block_size;
+  }
 
   ret = syshash_finish(ctx, output);
   if (ret != 0)
@@ -403,6 +454,19 @@ static int testing_hash_huge_block(crypto_context *ctx, int op,
 
   return match(result, output, reslen);
 }
+
+static void report_huge_block_success(const char *hash_type,
+             uint32_t block_size, uint32_t total_bytes)
+{
+  int npasses;
+
+  npasses = (total_bytes + (block_size - 1))
+    / block_size;
+
+  printf("%s huge block test success(%u passes over"
+         " %" PRIu32 " bytes to hash %" PRIu32 " bytes)\n",
+         hash_type, npasses, block_size, total_bytes);
+}
 #endif
 
 /****************************************************************************
@@ -417,6 +481,9 @@ int main(void)
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   crypto_context sha1_ctx;
 #endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+  crypto_context sha2_224_ctx;
+#endif
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   crypto_context sha2_256_ctx;
 #endif
@@ -435,6 +502,9 @@ int main(void)
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   ret += syshash_init(&sha1_ctx);
 #endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+  ret += syshash_init(&sha2_224_ctx);
+#endif
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   ret += syshash_init(&sha2_256_ctx);
 #endif
@@ -541,6 +611,61 @@ int main(void)
     }
 #endif
 
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+  for (i = 0; i < nitems(sha_testcase); i++)
+    {
+      ret = syshash_start(&sha2_224_ctx, CRYPTO_SHA2_224);
+      if (ret != 0)
+        {
+          printf("sha224 start failed\n");
+          goto err;
+        }
+
+      if (i == 2)
+        {
+          memset(buf, 'a', sha_testcase[i].datalen);
+          for (j = 0; j < 1000; j++)
+            {
+              ret = syshash_update(&sha2_224_ctx, (char *)buf,
+                                   sha_testcase[i].datalen);
+              if (ret)
+                {
+                  break;
+                }
+            }
+        }
+      else
+        {
+          ret = syshash_update(&sha2_224_ctx, sha_testcase[i].data,
+                               sha_testcase[i].datalen);
+        }
+
+      if (ret)
+        {
+          printf("sha224 update failed\n");
+          goto err;
+        }
+
+      ret = syshash_finish(&sha2_224_ctx, output);
+      if (ret)
+        {
+          printf("sha224 finish failed\n");
+        }
+
+      ret = match((unsigned char *)sha224_result[i],
+                  (unsigned char *)output,
+                  SHA224_DIGEST_LENGTH);
+      if (ret)
+        {
+          printf("match sha224 failed\n");
+        }
+      else
+        {
+          printf("hash sha224 success\n");
+        }
+    }
+#endif
+
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   for (i = 0; i < nitems(sha_testcase); i++)
     {
@@ -655,17 +780,28 @@ int main(void)
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
   unsigned char *huge_block;
-  huge_block = (unsigned char *)malloc(HASH_HUGE_BLOCK_SIZE);
+  uint32_t huge_block_size = HASH_HUGE_BLOCK_SIZE;
+  /* Loop trying to allocate a huge block, cutting requested
+   * size in half until success.
+   */
+
+  do
+    {
+      huge_block = (unsigned char *)malloc(huge_block_size);
+      huge_block_size /= 2;
+    }
+  while (!huge_block && (huge_block_size > 1));
+
   if (huge_block == NULL)
     {
       printf("huge block test no memory\n");
       goto err;
     }
 
-  memset(huge_block, 'a', HASH_HUGE_BLOCK_SIZE);
+  memset(huge_block, 'a', huge_block_size);
 #  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   ret = testing_hash_huge_block(&md5_ctx, CRYPTO_MD5,
-                                huge_block, HASH_HUGE_BLOCK_SIZE,
+                                huge_block, huge_block_size,
                                 md5_huge_block_result,
                                 MD5_DIGEST_LENGTH);
   if (ret != 0)
@@ -674,14 +810,15 @@ int main(void)
     }
   else
     {
-      printf("md5 huge block test success\n");
+      report_huge_block_success("md5", huge_block_size,
+                                HASH_HUGE_BLOCK_SIZE);
     }
 
 #  endif
 
 #  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   ret = testing_hash_huge_block(&sha1_ctx, CRYPTO_SHA1,
-                                huge_block, HASH_HUGE_BLOCK_SIZE,
+                                huge_block, huge_block_size,
                                 sha1_huge_block_result,
                                 SHA1_DIGEST_LENGTH);
   if (ret != 0)
@@ -690,13 +827,32 @@ int main(void)
     }
   else
     {
-      printf("sha1 huge block test success\n");
+      report_huge_block_success("sha1", huge_block_size,
+                                HASH_HUGE_BLOCK_SIZE);
     }
 
 #endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+  ret = testing_hash_huge_block(&sha2_224_ctx, CRYPTO_SHA2_224,
+                                huge_block, huge_block_size,
+                                sha224_huge_block_result,
+                                SHA224_DIGEST_LENGTH);
+  if (ret != 0)
+    {
+      printf("sha224 huge block test failed\n");
+    }
+  else
+    {
+      report_huge_block_success("sha224", huge_block_size,
+                                HASH_HUGE_BLOCK_SIZE);
+    }
+
+#  endif
+
 #  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   ret = testing_hash_huge_block(&sha2_256_ctx, CRYPTO_SHA2_256,
-                                huge_block, HASH_HUGE_BLOCK_SIZE,
+                                huge_block, huge_block_size,
                                 sha256_huge_block_result,
                                 SHA256_DIGEST_LENGTH);
   if (ret != 0)
@@ -705,13 +861,15 @@ int main(void)
     }
   else
     {
-      printf("sha256 huge block test success\n");
+      report_huge_block_success("sha256", huge_block_size,
+                                HASH_HUGE_BLOCK_SIZE);
     }
-#endif
+
+#  endif
 
 #  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   ret = testing_hash_huge_block(&sha2_512_ctx, CRYPTO_SHA2_512,
-                                huge_block, HASH_HUGE_BLOCK_SIZE,
+                                huge_block, huge_block_size,
                                 sha512_huge_block_result,
                                 SHA512_DIGEST_LENGTH);
   if (ret != 0)
@@ -720,7 +878,8 @@ int main(void)
     }
   else
     {
-      printf("sha512 huge block test success\n");
+      report_huge_block_success("sha512", huge_block_size,
+                                HASH_HUGE_BLOCK_SIZE);
     }
 #  endif
 
@@ -734,6 +893,9 @@ err:
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
   syshash_free(&sha1_ctx);
 #endif
+#ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+  syshash_free(&sha2_224_ctx);
+#endif
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
   syshash_free(&sha2_256_ctx);
 #endif

From 3d6ea0ccece3a1ccd917940b16bb1ff6a5ae3f5e Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sun, 31 May 2026 10:11:06 +0530
Subject: [PATCH 390/568] system/microros: Fix toolchain attribute strip
 breaking libc inlines.

micro_ros_lib/toolchain.cmake.in initialised C and CXX flags with
-D'__attribute__(x)=' to silence GCC attributes the upstream ament
build is not aware of. The strip also removed __gnu_inline__ and
__always_inline__ from NuttX's libc string.h inlines, so each
micro-ROS translation unit emitted external definitions of strcmp,
strcpy, strlen and friends. Sim final link then failed with ~50
multiple-definition errors.

Drop the define from both flag init lines so the attributes survive
and the inlines collapse as intended.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/micro_ros_lib/toolchain.cmake.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/microros/micro_ros_lib/toolchain.cmake.in b/system/microros/micro_ros_lib/toolchain.cmake.in
index 8d3aabe3c..ebfa15eea 100644
--- a/system/microros/micro_ros_lib/toolchain.cmake.in
+++ b/system/microros/micro_ros_lib/toolchain.cmake.in
@@ -9,8 +9,8 @@ set(PLATFORM_NAME "nuttx")
 set(CMAKE_C_COMPILER @CMAKE_C_COMPILER@)
 set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
 
-set(CMAKE_C_FLAGS_INIT "-std=c11 @ARCH_C_FLAGS@ -D__NuttX__ -D'__attribute__(x)='" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS_INIT "-std=c++14 @ARCH_CPP_FLAGS@ -fno-rtti -D__NuttX__ -D'__attribute__(x)='" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_INIT "-std=c11 @ARCH_C_FLAGS@ -D__NuttX__" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_INIT "-std=c++14 @ARCH_CPP_FLAGS@ -fno-rtti -D__NuttX__" CACHE STRING "" FORCE)
 
 set(NUTTX_TOPDIR @NUTTX_TOPDIR@)
 set(NUTTX_APPDIR @NUTTX_APPDIR@)

From 0a0118b93c8f324b1716a9401b6c66a9876adc60 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sun, 31 May 2026 10:11:14 +0530
Subject: [PATCH 391/568] system/microros: Wire libmicroros include layout and
 sim final link.

libmicroros is installed by colcon under include/<pkg>/<pkg>/file.h
for ament-packaged headers (e.g. rcl, rmw, rosidl) and the flat
include/<pkg>/file.h for a few others (e.g. rclc). A single
-I include/ therefore resolves <rclc/rclc.h> but not <rcl/rcl.h>.

Enumerate every immediate subdirectory of include/ in addition to
include/ itself so both layouts resolve.

Switch the library hand-off from LDLIBS to EXTRA_LIBS. The sim
target's final link pulls EXTRA_LIBS, not LDLIBS, so the previous
form left rcl/rclc/rcutils symbols unresolved.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 system/microros/Make.defs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/microros/Make.defs b/system/microros/Make.defs
index ae95e997d..beb8a0c3d 100644
--- a/system/microros/Make.defs
+++ b/system/microros/Make.defs
@@ -23,8 +23,10 @@
 ifneq ($(CONFIG_SYSTEM_MICROROS),)
 CONFIGURED_APPS += $(APPDIR)/system/microros
 
-CFLAGS   += ${INCDIR_PREFIX}$(APPDIR)/system/microros/include
-CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/microros/include
+MICROROS_INC_DIRS := $(APPDIR)/system/microros/include \
+                     $(wildcard $(APPDIR)/system/microros/include/*)
+CFLAGS   += $(foreach d,$(MICROROS_INC_DIRS),${INCDIR_PREFIX}$(d))
+CXXFLAGS += $(foreach d,$(MICROROS_INC_DIRS),${INCDIR_PREFIX}$(d))
 
-LDLIBS   += $(APPDIR)/system/microros/libmicroros.a
+EXTRA_LIBS += $(APPDIR)/system/microros/libmicroros.a
 endif

From 5e91459b1a16f0ab4dd14fc66ee4c35ec3b9af12 Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sun, 31 May 2026 10:11:25 +0530
Subject: [PATCH 392/568] system/microros: Add UDP and serial custom transport
 backends.

Micro XRCE-DDS expects the application to supply open/close/write/read
callbacks for the wire transport. Add a single dispatcher that
registers the selected backend via rmw_uros_set_custom_transport(),
plus two backends:

transport/microros_transport_udp.c
  BSD-socket UDP backend. Opens an AF_INET/SOCK_DGRAM socket,
  resolves CONFIG_MICROROS_AGENT_IP/PORT, connect()s it, and uses
  send/recv. The socket fd is stashed in uxrCustomTransport->args
  so no module-level state is needed.

transport/microros_transport_serial.c
  termios serial backend. Opens CONFIG_MICROROS_SERIAL_DEVICE with
  O_RDWR|O_NOCTTY|O_CLOEXEC, switches to raw 8N1 at
  CONFIG_MICROROS_SERIAL_BAUD, and uses poll/read/write. Fd is
  again stashed in uxrCustomTransport->args.

Both backends are mutually exclusive at compile time via Kconfig;
the dispatcher selects which set of callbacks to register. Wired
into both the legacy Make build (CSRCS in system/microros/Makefile)
and the CMake build (separate microros_transport static library
with the transport directory only exposed to its INTERFACE).

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 include/system/microros_transport.h           |  50 ++++
 system/microros/CMakeLists.txt                |  20 ++
 system/microros/Makefile                      |  14 +-
 .../microros/transport/microros_transport.c   |  62 +++++
 .../microros/transport/microros_transport.h   |  67 ++++++
 .../transport/microros_transport_serial.c     | 216 ++++++++++++++++++
 .../transport/microros_transport_udp.c        | 162 +++++++++++++
 7 files changed, 590 insertions(+), 1 deletion(-)
 create mode 100644 include/system/microros_transport.h
 create mode 100644 system/microros/transport/microros_transport.c
 create mode 100644 system/microros/transport/microros_transport.h
 create mode 100644 system/microros/transport/microros_transport_serial.c
 create mode 100644 system/microros/transport/microros_transport_udp.c

diff --git a/include/system/microros_transport.h b/include/system/microros_transport.h
new file mode 100644
index 000000000..fc89bde3c
--- /dev/null
+++ b/include/system/microros_transport.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+ * apps/include/system/microros_transport.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INCLUDE_SYSTEM_MICROROS_TRANSPORT_H
+#define __APPS_INCLUDE_SYSTEM_MICROROS_TRANSPORT_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* microros_transport_init
+ *
+ * Register the NuttX-native transport (UDP or Serial, selected by Kconfig)
+ * with the rmw_microxrcedds layer.  Must be called once before
+ * rclc_support_init().
+ *
+ * Returns 0 on success, negated errno on failure.
+ */
+
+int microros_transport_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_INCLUDE_SYSTEM_MICROROS_TRANSPORT_H */
diff --git a/system/microros/CMakeLists.txt b/system/microros/CMakeLists.txt
index 44cd0d25b..1c3d89576 100644
--- a/system/microros/CMakeLists.txt
+++ b/system/microros/CMakeLists.txt
@@ -44,4 +44,24 @@ if(CONFIG_SYSTEM_MICROROS)
     microros PROPERTIES IMPORTED_LOCATION ${MICROROS_DIR}/libmicroros.a
                         INTERFACE_INCLUDE_DIRECTORIES ${MICROROS_DIR}/include)
   add_dependencies(microros microros_build)
+
+  # Transport glue compiled into the apps tree
+  set(MICROROS_TRANSPORT_SRCS ${MICROROS_DIR}/transport/microros_transport.c)
+
+  if(CONFIG_MICROROS_TRANSPORT_UDP)
+    list(APPEND MICROROS_TRANSPORT_SRCS
+         ${MICROROS_DIR}/transport/microros_transport_udp.c)
+  endif()
+
+  if(CONFIG_MICROROS_TRANSPORT_SERIAL)
+    list(APPEND MICROROS_TRANSPORT_SRCS
+         ${MICROROS_DIR}/transport/microros_transport_serial.c)
+  endif()
+
+  nuttx_add_library(microros_transport STATIC)
+  target_sources(microros_transport PRIVATE ${MICROROS_TRANSPORT_SRCS})
+  target_include_directories(microros_transport
+                             PRIVATE ${MICROROS_DIR}/transport)
+  target_include_directories(microros_transport PUBLIC ${MICROROS_DIR}/include)
+  add_dependencies(microros_transport microros_build)
 endif()
diff --git a/system/microros/Makefile b/system/microros/Makefile
index 6d34e3cc3..18067408f 100644
--- a/system/microros/Makefile
+++ b/system/microros/Makefile
@@ -25,7 +25,7 @@ include $(APPDIR)/Make.defs
 MICROROS_DIR     := $(APPDIR)/system/microros
 MICROROS_LIB_DIR := $(MICROROS_DIR)/micro_ros_lib
 MICROROS_DISTRO  := $(patsubst "%",%,$(CONFIG_MICROROS_DISTRO))
-MICROROS_AR      := $(CROSSDEV)ar
+MICROROS_AR      := $(firstword $(AR))
 
 MAX_NODES   := $(CONFIG_MICROROS_MAX_NODES)
 MAX_PUB     := $(CONFIG_MICROROS_MAX_PUBLISHERS)
@@ -44,6 +44,18 @@ ESCAPED_CXXFLAGS := $(subst /,\/,$(subst ",,$(CXXFLAGS)))
 
 MENUDESC = "micro-ROS Library"
 
+# Transport sources compiled into the user-side app library
+
+CSRCS += transport/microros_transport.c
+
+ifeq ($(CONFIG_MICROROS_TRANSPORT_UDP),y)
+CSRCS += transport/microros_transport_udp.c
+endif
+
+ifeq ($(CONFIG_MICROROS_TRANSPORT_SERIAL),y)
+CSRCS += transport/microros_transport_serial.c
+endif
+
 # Architecture for CMake toolchain
 ifeq ($(CONFIG_ARCH_ARM),y)
 MICROROS_ARCH := arm
diff --git a/system/microros/transport/microros_transport.c b/system/microros/transport/microros_transport.c
new file mode 100644
index 000000000..e9fdc44fa
--- /dev/null
+++ b/system/microros/transport/microros_transport.c
@@ -0,0 +1,62 @@
+/****************************************************************************
+ * apps/system/microros/transport/microros_transport.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+
+#include <rmw_microros/rmw_microros.h>
+
+#include <system/microros_transport.h>
+
+#include "microros_transport.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int microros_transport_init(void)
+{
+#if defined(CONFIG_MICROROS_TRANSPORT_UDP)
+  rmw_uros_set_custom_transport(false,
+                                NULL,
+                                microros_udp_open,
+                                microros_udp_close,
+                                microros_udp_write,
+                                microros_udp_read);
+  return 0;
+#elif defined(CONFIG_MICROROS_TRANSPORT_SERIAL)
+  rmw_uros_set_custom_transport(true,
+                                NULL,
+                                microros_serial_open,
+                                microros_serial_close,
+                                microros_serial_write,
+                                microros_serial_read);
+  return 0;
+#else
+  return -ENOSYS;
+#endif
+}
diff --git a/system/microros/transport/microros_transport.h b/system/microros/transport/microros_transport.h
new file mode 100644
index 000000000..4483b8ffc
--- /dev/null
+++ b/system/microros/transport/microros_transport.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+ * apps/system/microros/transport/microros_transport.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_MICROROS_TRANSPORT_MICROROS_TRANSPORT_H
+#define __APPS_SYSTEM_MICROROS_TRANSPORT_MICROROS_TRANSPORT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <uxr/client/profile/transport/custom/custom_transport.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Backend callbacks.  Exposed for testing only. */
+
+bool   microros_udp_open(struct uxrCustomTransport *transport);
+bool   microros_udp_close(struct uxrCustomTransport *transport);
+size_t microros_udp_write(struct uxrCustomTransport *transport,
+                          const uint8_t *buf, size_t len, uint8_t *err);
+size_t microros_udp_read(struct uxrCustomTransport *transport,
+                         uint8_t *buf, size_t len,
+                         int timeout_ms, uint8_t *err);
+
+bool   microros_serial_open(struct uxrCustomTransport *transport);
+bool   microros_serial_close(struct uxrCustomTransport *transport);
+size_t microros_serial_write(struct uxrCustomTransport *transport,
+                             const uint8_t *buf, size_t len, uint8_t *err);
+size_t microros_serial_read(struct uxrCustomTransport *transport,
+                            uint8_t *buf, size_t len,
+                            int timeout_ms, uint8_t *err);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_SYSTEM_MICROROS_TRANSPORT_MICROROS_TRANSPORT_H */
diff --git a/system/microros/transport/microros_transport_serial.c b/system/microros/transport/microros_transport_serial.c
new file mode 100644
index 000000000..6a9c7badc
--- /dev/null
+++ b/system/microros/transport/microros_transport_serial.c
@@ -0,0 +1,216 @@
+/****************************************************************************
+ * apps/system/microros/transport/microros_transport_serial.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <fcntl.h>
+#include <poll.h>
+#include <stdint.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include "microros_transport.h"
+
+/****************************************************************************
+ * Private Helpers
+ ****************************************************************************/
+
+static inline int serial_fd(struct uxrCustomTransport *transport)
+{
+  return (int)(intptr_t)transport->args - 1;
+}
+
+static inline void serial_set_fd(struct uxrCustomTransport *transport,
+                                 int fd)
+{
+  transport->args = (void *)(intptr_t)(fd + 1);
+}
+
+static int set_baud(struct termios *tio, int baud)
+{
+  speed_t s;
+
+  switch (baud)
+    {
+      case 9600:
+        s = B9600;
+        break;
+
+      case 19200:
+        s = B19200;
+        break;
+
+      case 38400:
+        s = B38400;
+        break;
+
+      case 57600:
+        s = B57600;
+        break;
+
+      case 115200:
+        s = B115200;
+        break;
+
+      case 230400:
+        s = B230400;
+        break;
+
+      case 460800:
+        s = B460800;
+        break;
+
+      case 921600:
+        s = B921600;
+        break;
+
+      default:
+        return -1;
+    }
+
+  cfsetispeed(tio, s);
+  cfsetospeed(tio, s);
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+bool microros_serial_open(struct uxrCustomTransport *transport)
+{
+  struct termios tio;
+  int fd;
+
+  fd = open(CONFIG_MICROROS_SERIAL_DEVICE, O_RDWR | O_NOCTTY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return false;
+    }
+
+  if (tcgetattr(fd, &tio) < 0)
+    {
+      close(fd);
+      return false;
+    }
+
+  cfmakeraw(&tio);
+  tio.c_cflag |= (CLOCAL | CREAD);
+  tio.c_cflag &= ~CRTSCTS;
+  tio.c_cc[VMIN]  = 0;
+  tio.c_cc[VTIME] = 0;
+
+  if (set_baud(&tio, CONFIG_MICROROS_SERIAL_BAUD) < 0)
+    {
+      close(fd);
+      return false;
+    }
+
+  if (tcsetattr(fd, TCSANOW, &tio) < 0)
+    {
+      close(fd);
+      return false;
+    }
+
+  tcflush(fd, TCIOFLUSH);
+  serial_set_fd(transport, fd);
+  return true;
+}
+
+bool microros_serial_close(struct uxrCustomTransport *transport)
+{
+  int fd = serial_fd(transport);
+
+  if (fd >= 0)
+    {
+      close(fd);
+      serial_set_fd(transport, -1);
+    }
+
+  return true;
+}
+
+size_t microros_serial_write(struct uxrCustomTransport *transport,
+                             const uint8_t *buf, size_t len, uint8_t *err)
+{
+  int fd = serial_fd(transport);
+  ssize_t n;
+
+  if (fd < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  n = write(fd, buf, len);
+  if (n < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  return n;
+}
+
+size_t microros_serial_read(struct uxrCustomTransport *transport,
+                            uint8_t *buf, size_t len,
+                            int timeout_ms, uint8_t *err)
+{
+  int fd = serial_fd(transport);
+  struct pollfd pfd;
+  ssize_t n;
+  int r;
+
+  if (fd < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  pfd.fd     = fd;
+  pfd.events = POLLIN;
+
+  r = poll(&pfd, 1, timeout_ms);
+  if (r < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  if (r == 0)
+    {
+      return 0;
+    }
+
+  n = read(fd, buf, len);
+  if (n < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  return n;
+}
diff --git a/system/microros/transport/microros_transport_udp.c b/system/microros/transport/microros_transport_udp.c
new file mode 100644
index 000000000..6b048a480
--- /dev/null
+++ b/system/microros/transport/microros_transport_udp.c
@@ -0,0 +1,162 @@
+/****************************************************************************
+ * apps/system/microros/transport/microros_transport_udp.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <poll.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "microros_transport.h"
+
+/****************************************************************************
+ * Private Helpers
+ ****************************************************************************/
+
+static inline int udp_fd(struct uxrCustomTransport *transport)
+{
+  return (int)(intptr_t)transport->args - 1;
+}
+
+static inline void udp_set_fd(struct uxrCustomTransport *transport, int fd)
+{
+  transport->args = (void *)(intptr_t)(fd + 1);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+bool microros_udp_open(struct uxrCustomTransport *transport)
+{
+  struct sockaddr_in addr;
+  int fd;
+
+  fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+  if (fd < 0)
+    {
+      return false;
+    }
+
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port   = htons(CONFIG_MICROROS_AGENT_PORT);
+
+  if (inet_pton(AF_INET, CONFIG_MICROROS_AGENT_IP, &addr.sin_addr) != 1)
+    {
+      close(fd);
+      return false;
+    }
+
+  if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
+    {
+      close(fd);
+      return false;
+    }
+
+  udp_set_fd(transport, fd);
+  return true;
+}
+
+bool microros_udp_close(struct uxrCustomTransport *transport)
+{
+  int fd = udp_fd(transport);
+
+  if (fd >= 0)
+    {
+      close(fd);
+      udp_set_fd(transport, -1);
+    }
+
+  return true;
+}
+
+size_t microros_udp_write(struct uxrCustomTransport *transport,
+                          const uint8_t *buf, size_t len, uint8_t *err)
+{
+  int fd = udp_fd(transport);
+  ssize_t n;
+
+  if (fd < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  n = send(fd, buf, len, 0);
+  if (n < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  return n;
+}
+
+size_t microros_udp_read(struct uxrCustomTransport *transport,
+                         uint8_t *buf, size_t len,
+                         int timeout_ms, uint8_t *err)
+{
+  int fd = udp_fd(transport);
+  struct pollfd pfd;
+  ssize_t n;
+  int r;
+
+  if (fd < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  pfd.fd     = fd;
+  pfd.events = POLLIN;
+
+  r = poll(&pfd, 1, timeout_ms);
+  if (r < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  if (r == 0)
+    {
+      return 0;
+    }
+
+  n = recv(fd, buf, len, 0);
+  if (n < 0)
+    {
+      *err = 1;
+      return 0;
+    }
+
+  return n;
+}

From 1081225509857d4e265b28b242d59d314399380e Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Sun, 31 May 2026 10:11:34 +0530
Subject: [PATCH 393/568] examples/microros_pub: Add minimal Int32 publisher
 example.

End-to-end exercise of the micro-ROS stack on NuttX: calls
microros_transport_init() to register the configured backend,
brings up rclc_support / node / publisher, publishes 30
std_msgs/Int32 messages on /nuttx_pub at 1 Hz, then tears the
stack down cleanly.

The example's Make.defs adds $(APPDIR)/system/microros/transport
to its own CFLAGS rather than the system/microros Make.defs, so
the transport-glue header path is not pushed into the global
search path for unrelated apps.

Serves as the smoke test for the transport layer and as a template
for downstream publisher apps.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 examples/microros_pub/CMakeLists.txt      |  35 +++++++
 examples/microros_pub/Kconfig             |  30 ++++++
 examples/microros_pub/Make.defs           |  25 +++++
 examples/microros_pub/Makefile            |  32 +++++++
 examples/microros_pub/microros_pub_main.c | 109 ++++++++++++++++++++++
 5 files changed, 231 insertions(+)
 create mode 100644 examples/microros_pub/CMakeLists.txt
 create mode 100644 examples/microros_pub/Kconfig
 create mode 100644 examples/microros_pub/Make.defs
 create mode 100644 examples/microros_pub/Makefile
 create mode 100644 examples/microros_pub/microros_pub_main.c

diff --git a/examples/microros_pub/CMakeLists.txt b/examples/microros_pub/CMakeLists.txt
new file mode 100644
index 000000000..8bf83218e
--- /dev/null
+++ b/examples/microros_pub/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/examples/microros_pub/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_MICROROS_PUB)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_MICROROS_PUB_PROGNAME}
+    SRCS
+    microros_pub_main.c
+    STACKSIZE
+    ${CONFIG_EXAMPLES_MICROROS_PUB_STACKSIZE}
+    PRIORITY
+    ${CONFIG_EXAMPLES_MICROROS_PUB_PRIORITY}
+    DEPENDS
+    microros_transport)
+endif()
diff --git a/examples/microros_pub/Kconfig b/examples/microros_pub/Kconfig
new file mode 100644
index 000000000..a1d75478d
--- /dev/null
+++ b/examples/microros_pub/Kconfig
@@ -0,0 +1,30 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_MICROROS_PUB
+	tristate "micro-ROS int32 publisher example"
+	default n
+	depends on SYSTEM_MICROROS
+	---help---
+		Minimal micro-ROS publisher that creates a node and publishes
+		an std_msgs/Int32 every second on the topic /nuttx_pub.  Used
+		to validate the NuttX-native transport layer end-to-end with
+		a micro-ROS agent.
+
+if EXAMPLES_MICROROS_PUB
+
+config EXAMPLES_MICROROS_PUB_PROGNAME
+	string "Program name"
+	default "microros_pub"
+
+config EXAMPLES_MICROROS_PUB_PRIORITY
+	int "micro-ROS pub task priority"
+	default 100
+
+config EXAMPLES_MICROROS_PUB_STACKSIZE
+	int "micro-ROS pub stack size"
+	default 8192
+
+endif
diff --git a/examples/microros_pub/Make.defs b/examples/microros_pub/Make.defs
new file mode 100644
index 000000000..16128b96e
--- /dev/null
+++ b/examples/microros_pub/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/microros_pub/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_MICROROS_PUB),)
+CONFIGURED_APPS += $(APPDIR)/examples/microros_pub
+endif
diff --git a/examples/microros_pub/Makefile b/examples/microros_pub/Makefile
new file mode 100644
index 000000000..1377e68b5
--- /dev/null
+++ b/examples/microros_pub/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/examples/microros_pub/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_EXAMPLES_MICROROS_PUB_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_MICROROS_PUB_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_MICROROS_PUB_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_MICROROS_PUB)
+
+MAINSRC = microros_pub_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/microros_pub/microros_pub_main.c b/examples/microros_pub/microros_pub_main.c
new file mode 100644
index 000000000..d9211c36b
--- /dev/null
+++ b/examples/microros_pub/microros_pub_main.c
@@ -0,0 +1,109 @@
+/****************************************************************************
+ * apps/examples/microros_pub/microros_pub_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <rcl/rcl.h>
+#include <rcl/error_handling.h>
+#include <rclc/rclc.h>
+#include <rclc/executor.h>
+#include <std_msgs/msg/int32.h>
+
+#include <system/microros_transport.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  rcl_publisher_t       publisher;
+  std_msgs__msg__Int32  msg;
+  rcl_allocator_t       allocator;
+  rclc_support_t        support;
+  rcl_node_t            node;
+  int                   i;
+
+  printf("microros_pub: starting\n");
+
+  if (microros_transport_init() != 0)
+    {
+      printf("microros_pub: transport init failed\n");
+      return 1;
+    }
+
+  allocator = rcl_get_default_allocator();
+
+  if (rclc_support_init(&support, 0, NULL, &allocator) != RCL_RET_OK)
+    {
+      printf("microros_pub: rclc_support_init failed\n");
+      return 1;
+    }
+
+  if (rclc_node_init_default(&node, "nuttx_node", "", &support)
+      != RCL_RET_OK)
+    {
+      printf("microros_pub: node init failed\n");
+      return 1;
+    }
+
+  if (rclc_publisher_init_default(
+        &publisher,
+        &node,
+        ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, Int32),
+        "nuttx_pub") != RCL_RET_OK)
+    {
+      printf("microros_pub: publisher init failed\n");
+      return 1;
+    }
+
+  msg.data = 0;
+
+  for (i = 0; i < 30; i++)
+    {
+      if (rcl_publish(&publisher, &msg, NULL) == RCL_RET_OK)
+        {
+          printf("microros_pub: sent %d\n", (int)msg.data);
+        }
+      else
+        {
+          printf("microros_pub: publish failed\n");
+        }
+
+      msg.data++;
+      sleep(1);
+    }
+
+  rcl_publisher_fini(&publisher, &node);
+  rcl_node_fini(&node);
+  rclc_support_fini(&support);
+
+  printf("microros_pub: done\n");
+  return 0;
+}

From 9796690b7b056fb0b3bc341e94681ff67dbce5f0 Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Thu, 28 May 2026 12:24:24 +0900
Subject: [PATCH 394/568] apps/cmake: Fix aarch64 NuttX Rust target specs

Add aarch64 Rust target specs for NuttX, including a Mach-O variant
for macOS sim builds. Use the NuttX custom targets instead of
aarch64-apple-darwin so Rust std is built with target_os=nuttx while
still producing link-compatible objects for sim.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 cmake/nuttx_add_rust.cmake      | 17 +++++++++-------
 tools/Rust.mk                   | 11 +++++++---
 tools/i486-unknown-nuttx.json   | 33 ------------------------------
 tools/x86_64-unknown-nuttx.json | 36 ---------------------------------
 4 files changed, 18 insertions(+), 79 deletions(-)
 delete mode 100644 tools/i486-unknown-nuttx.json
 delete mode 100644 tools/x86_64-unknown-nuttx.json

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index c8546f0fa..8978c84f3 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -35,7 +35,8 @@ include(nuttx_parse_function_args)
 #   - riscv64: riscv64imac/imafdc-unknown-nuttx-elf
 #   - x86: i686-unknown-nuttx
 #   - x86_64: x86_64-unknown-nuttx
-#   - aarch64: aarch64-apple-darwin
+#   - aarch64: aarch64-unknown-nuttx-macho for sim on macOS,
+#              aarch64-unknown-nuttx otherwise
 #
 # Inputs:
 #   ARCHTYPE - Architecture type (e.g. thumbv7m, riscv32)
@@ -48,15 +49,17 @@ include(nuttx_parse_function_args)
 # ~~~
 
 function(nuttx_rust_target_triple ARCHTYPE ABITYPE CPUTYPE OUTPUT)
-  get_filename_component(APPDIR "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/.."
-                         ABSOLUTE)
   if(ARCHTYPE STREQUAL "x86_64")
-    set(TARGET_TRIPLE "${APPDIR}/tools/x86_64-unknown-nuttx.json")
+    set(TARGET_TRIPLE "${PROJECT_SOURCE_DIR}/tools/x86_64-unknown-nuttx.json")
   elseif(ARCHTYPE STREQUAL "x86")
-    set(TARGET_TRIPLE "${APPDIR}/tools/i486-unknown-nuttx.json")
+    set(TARGET_TRIPLE "${PROJECT_SOURCE_DIR}/tools/i486-unknown-nuttx.json")
   elseif(ARCHTYPE STREQUAL "aarch64")
-    if(APPLE)
-      set(TARGET_TRIPLE "aarch64-apple-darwin")
+    if(CONFIG_ARCH_SIM AND CONFIG_HOST_MACOS)
+      set(TARGET_TRIPLE
+          "${PROJECT_SOURCE_DIR}/tools/aarch64-unknown-nuttx-macho.json")
+    else()
+      set(TARGET_TRIPLE
+          "${PROJECT_SOURCE_DIR}/tools/aarch64-unknown-nuttx.json")
     endif()
   elseif(ARCHTYPE MATCHES "thumb")
     if(ARCHTYPE MATCHES "thumbv8m")
diff --git a/tools/Rust.mk b/tools/Rust.mk
index 3a5f72806..90f3615a2 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -37,6 +37,8 @@
 #   - thumbv8m.base: thumbv8m.base-nuttx-eabi, thumbv8m.base-nuttx-eabihf
 #   - riscv32: riscv32imc/imac/imafc-unknown-nuttx-elf
 #   - riscv64: riscv64imac/imafdc-unknown-nuttx-elf
+#   - aarch64: aarch64-unknown-nuttx-macho for sim on macOS,
+#              aarch64-unknown-nuttx otherwise
 #
 # Usage:   $(call RUST_TARGET_TRIPLE)
 #
@@ -47,13 +49,16 @@
 define RUST_TARGET_TRIPLE
 $(or \
   $(and $(filter x86_64,$(LLVM_ARCHTYPE)), \
-    $(APPDIR)/tools/x86_64-unknown-nuttx.json \
+    $(TOPDIR)/tools/x86_64-unknown-nuttx.json \
   ), \
   $(and $(filter x86,$(LLVM_ARCHTYPE)), \
-    $(APPDIR)/tools/i486-unknown-nuttx.json \
+    $(TOPDIR)/tools/i486-unknown-nuttx.json \
   ), \
   $(and $(filter aarch64,$(LLVM_ARCHTYPE)), \
-    $(if $(filter y,$(CONFIG_HOST_MACOS)),aarch64-apple-darwin) \
+    $(if $(and $(filter sim,$(CONFIG_ARCH)),$(filter y,$(CONFIG_HOST_MACOS))), \
+      $(TOPDIR)/tools/aarch64-unknown-nuttx-macho.json, \
+      $(TOPDIR)/tools/aarch64-unknown-nuttx.json \
+    ) \
   ), \
   $(and $(filter thumb%,$(LLVM_ARCHTYPE)), \
     $(if $(filter thumbv8m%,$(LLVM_ARCHTYPE)), \
diff --git a/tools/i486-unknown-nuttx.json b/tools/i486-unknown-nuttx.json
deleted file mode 100644
index 93cd43418..000000000
--- a/tools/i486-unknown-nuttx.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "arch": "x86",
-  "cpu": "i486",
-  "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
-  "features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float",
-  "default-dwarf-version": 2,
-  "dynamic-linking": true,
-  "has-rpath": true,
-  "has-thread-local": true,
-  "linker-flavor": "gnu-lld",
-  "llvm-target": "i486-unknown-nuttx",
-  "max-atomic-width": 64,
-  "metadata": {
-    "description": "32-bit x86, resricted to i486",
-    "host_tools": false,
-    "std": true,
-    "tier": 3
-  },
-  "no-default-libraries": true,
-  "os": "nuttx",
-  "position-independent-executables": false,
-  "relro-level": "full",
-  "rustc-abi": "x86-softfloat",
-  "stack-probes": {
-    "kind": "inline"
-  },
-  "target-family": [
-    "unix"
-  ],
-  "target-mcount": "__mcount",
-  "target-pointer-width": 32
-}
diff --git a/tools/x86_64-unknown-nuttx.json b/tools/x86_64-unknown-nuttx.json
deleted file mode 100644
index d12fecb8a..000000000
--- a/tools/x86_64-unknown-nuttx.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "arch": "x86_64",
-  "cpu": "x86-64",
-  "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
-  "disable-redzone": true,
-  "features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float",
-  "linker": "rust-lld",
-  "linker-flavor": "gnu-lld",
-  "llvm-target": "x86_64-unknown-nuttx",
-  "max-atomic-width": 64,
-  "metadata": {
-    "description": "x86_64 target for NuttX RTOS with softfloat",
-    "host_tools": false,
-    "std": true,
-    "tier": 3
-  },
-  "panic-strategy": "abort",
-  "plt-by-default": false,
-  "position-independent-executables": true,
-  "relro-level": "full",
-  "rustc-abi": "x86-softfloat",
-  "stack-probes": {
-    "kind": "inline"
-  },
-  "static-position-independent-executables": true,
-  "supported-sanitizers": [
-    "kcfi",
-    "kernel-address"
-  ],
-  "os": "nuttx",
-  "target-family": [
-    "unix"
-  ],
-  "target-pointer-width": 64
-}
\ No newline at end of file

From 3a255d5463b2611ef4aeeb67175f3e078ef273d9 Mon Sep 17 00:00:00 2001
From: Eren Terzioglu <eren.terzioglu@espressif.com>
Date: Tue, 2 Jun 2026 12:49:32 +0200
Subject: [PATCH 395/568] testing/drivers/crypto: Fix typo on hash test

Fix typo issue on hash test

Signed-off-by: Eren Terzioglu <eren.terzioglu@espressif.com>
---
 testing/drivers/crypto/hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/drivers/crypto/hash.c b/testing/drivers/crypto/hash.c
index acbbce0fd..1638bed70 100644
--- a/testing/drivers/crypto/hash.c
+++ b/testing/drivers/crypto/hash.c
@@ -260,7 +260,7 @@ static const unsigned char sha1_huge_block_result[20] =
 };
 #  endif
 
-#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
 static const unsigned char sha224_huge_block_result[28] =
 {
   0xff, 0x42, 0x9e, 0x92, 0x94, 0xce, 0x0a, 0x31,

From 0d35e2e0bb7fb4504f864cf445b7c0ae262795b1 Mon Sep 17 00:00:00 2001
From: cuiziwei <cuiziwei@xiaomi.com>
Date: Tue, 28 Apr 2026 17:00:56 +0800
Subject: [PATCH 396/568] system/popen: add dpopen/dpclose fd-based interface

Add dpopen()/dpclose() as the descriptor-based counterpart of
popen()/pclose(), analogous to how dprintf() relates to fprintf().
dpopen() returns a raw file descriptor instead of a FILE stream,
avoiding the stdio.h dependency for callers that only need an fd.

Refactor popen() as a thin wrapper: dpopen() + fdopen() + FILE
container.  All pipe creation and process spawning logic now lives
in dpopen.c.

Also remove the hard dependency on NSH_LIBRARY from SYSTEM_POPEN.
When NSH is available, commands are executed through sh -c with full
shell syntax support.  When NSH is not available, commands are split
by whitespace and executed directly via posix_spawnp().

Add CONFIG_SYSTEM_POPEN_MAXARGUMENTS (default 7) to control the
argv array size for the no-shell path.

Signed-off-by: cuiziwei <cuiziwei@xiaomi.com>
---
 system/popen/CMakeLists.txt |   2 +-
 system/popen/Kconfig        |  19 ++-
 system/popen/Makefile       |   4 +-
 system/popen/dpopen.c       | 321 ++++++++++++++++++++++++++++++++++++
 system/popen/popen.c        | 310 ++++++----------------------------
 5 files changed, 385 insertions(+), 271 deletions(-)
 create mode 100644 system/popen/dpopen.c

diff --git a/system/popen/CMakeLists.txt b/system/popen/CMakeLists.txt
index 78add77e6..353205d24 100644
--- a/system/popen/CMakeLists.txt
+++ b/system/popen/CMakeLists.txt
@@ -21,5 +21,5 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_POPEN)
-  target_sources(apps PRIVATE popen.c)
+  target_sources(apps PRIVATE dpopen.c popen.c)
 endif()
diff --git a/system/popen/Kconfig b/system/popen/Kconfig
index 94041b0e0..606efa032 100644
--- a/system/popen/Kconfig
+++ b/system/popen/Kconfig
@@ -4,14 +4,25 @@
 #
 
 config SYSTEM_POPEN
-	bool "popen()/pclose() Functions"
+	bool "popen()/pclose()/dpopen()/dpclose() Functions"
 	default n
 	select SCHED_WAITPID
 	depends on NSH_LIBRARY && PIPES
 	---help---
-		Enable support for the popen() and pclose() interfaces.
-		This will support execution of NSH commands from C code with
-		pipe communications with the shell.
+		Enable support for the popen(), pclose(), dpopen(), and
+		dpclose() interfaces.
+
+		dpopen()/dpclose() are the descriptor-based counterparts
+		of popen()/pclose(), analogous to how dprintf() relates
+		to fprintf().  They return a raw file descriptor instead
+		of a FILE stream, avoiding the stdio.h dependency.
+
+		popen()/pclose() are thin wrappers around dpopen()/dpclose()
+		that additionally wrap the fd in a FILE stream.
+
+		Commands are executed through the NSH shell (sh -c command),
+		supporting full shell syntax including pipes, redirects,
+		and globbing.
 
 if SYSTEM_POPEN
 
diff --git a/system/popen/Makefile b/system/popen/Makefile
index fbd958274..7e8887de6 100644
--- a/system/popen/Makefile
+++ b/system/popen/Makefile
@@ -22,8 +22,8 @@
 
 include $(APPDIR)/Make.defs
 
-# popen()/pclose functions
+# dpopen()/dpclose() core and popen()/pclose() FILE wrappers
 
-CSRCS = popen.c
+CSRCS = dpopen.c popen.c
 
 include $(APPDIR)/Application.mk
diff --git a/system/popen/dpopen.c b/system/popen/dpopen.c
new file mode 100644
index 000000000..dd8bc9b7d
--- /dev/null
+++ b/system/popen/dpopen.c
@@ -0,0 +1,321 @@
+/****************************************************************************
+ * apps/system/popen/dpopen.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <sched.h>
+#include <spawn.h>
+#include <debug.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#if defined(CONFIG_NET_LOCAL) && defined(CONFIG_NET_LOCAL_STREAM)
+#  include <sys/socket.h>
+#endif
+
+#include "nshlib/nshlib.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: dpopen
+ *
+ * Description:
+ *   Execute a command and return a raw file descriptor connected to the
+ *   child process via a pipe, along with the child PID.
+ *
+ *   This is the descriptor-based counterpart of popen(), analogous to how
+ *   dprintf() relates to fprintf().  It avoids the FILE stream layer,
+ *   making it suitable for callers that only need a raw fd and want to
+ *   avoid the stdio.h dependency.
+ *
+ *   When NSH is available, commands are executed through the shell
+ *   (sh -c command), supporting full shell syntax.
+ *
+ * Input Parameters:
+ *   command - The command string to execute
+ *   oflag   - O_RDONLY to read child stdout, O_WRONLY to write child stdin,
+ *             O_RDWR for bidirectional socket mode
+ *   pid     - Location to return the child process ID
+ *
+ * Returned Value:
+ *   A valid file descriptor on success, or -1 on failure with errno set.
+ *
+ ****************************************************************************/
+
+int dpopen(FAR const char *command, int oflag, FAR pid_t *pid)
+{
+  struct sched_param param;
+  posix_spawnattr_t attr;
+  posix_spawn_file_actions_t file_actions;
+  FAR char *argv[4];
+  int fd[2];
+  int childfd;
+  int parentfd;
+  int errcode;
+
+  if (command == NULL || pid == NULL)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* Create a pipe or socketpair.  fd[0] refers to the read end of the
+   * pipe; fd[1] refers to the write end of the pipe.
+   */
+
+  if ((oflag & O_RDWR) == O_RDWR)
+    {
+#if defined(CONFIG_NET_LOCAL) && defined(CONFIG_NET_LOCAL_STREAM)
+      /* Create a socketpair for bidirectional communication */
+
+      if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, fd) < 0)
+        {
+          return -1;
+        }
+
+      childfd  = fd[0];
+      parentfd = fd[1];
+#else
+      errno = ENOTSUP;
+      return -1;
+#endif
+    }
+  else if (pipe2(fd, O_CLOEXEC) < 0)
+    {
+      return -1;
+    }
+  else if ((oflag & O_ACCMODE) == O_RDONLY)
+    {
+      /* Pipe is the output from the child */
+
+      childfd  = fd[1];  /* Child writes to pipe */
+      parentfd = fd[0];  /* Parent reads from pipe */
+    }
+  else if ((oflag & O_ACCMODE) == O_WRONLY)
+    {
+      /* Pipe is the input to the child */
+
+      childfd  = fd[0];  /* Child reads from pipe */
+      parentfd = fd[1];  /* Parent writes to pipe */
+    }
+  else
+    {
+      errcode = EINVAL;
+      goto errout_with_pipe;
+    }
+
+  /* Initialize attributes for task_spawn() (or posix_spawn()). */
+
+  errcode = posix_spawnattr_init(&attr);
+  if (errcode != 0)
+    {
+      goto errout_with_pipe;
+    }
+
+  errcode = posix_spawn_file_actions_init(&file_actions);
+  if (errcode != 0)
+    {
+      goto errout_with_attr;
+    }
+
+  /* Set the correct stack size and priority */
+
+  param.sched_priority = CONFIG_SYSTEM_POPEN_PRIORITY;
+  errcode = posix_spawnattr_setschedparam(&attr, &param);
+  if (errcode != 0)
+    {
+      goto errout_with_actions;
+    }
+
+#ifndef CONFIG_SYSTEM_POPEN_SHPATH
+  errcode = posix_spawnattr_setstacksize(&attr,
+                                         CONFIG_SYSTEM_POPEN_STACKSIZE);
+  if (errcode != 0)
+    {
+      goto errout_with_actions;
+    }
+#endif
+
+  /* If robin robin scheduling is enabled, then set the scheduling policy
+   * of the new task to SCHED_RR before it has a chance to run.
+   */
+
+#if CONFIG_RR_INTERVAL > 0
+  errcode = posix_spawnattr_setschedpolicy(&attr, SCHED_RR);
+  if (errcode != 0)
+    {
+      goto errout_with_actions;
+    }
+
+  errcode = posix_spawnattr_setflags(&attr,
+                                     POSIX_SPAWN_SETSCHEDPARAM |
+                                     POSIX_SPAWN_SETSCHEDULER);
+  if (errcode != 0)
+    {
+      goto errout_with_actions;
+    }
+
+#else
+  errcode = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDPARAM);
+  if (errcode != 0)
+    {
+      goto errout_with_actions;
+    }
+
+#endif
+
+  /* Redirect child's stdin or stdout to the pipe */
+
+  if ((oflag & O_RDWR) == O_RDWR)
+    {
+      errcode = posix_spawn_file_actions_adddup2(&file_actions, childfd,
+                                                 STDIN_FILENO);
+      if (errcode != 0)
+        {
+          goto errout_with_actions;
+        }
+
+      errcode = posix_spawn_file_actions_adddup2(&file_actions, childfd,
+                                                 STDOUT_FILENO);
+      if (errcode != 0)
+        {
+          goto errout_with_actions;
+        }
+    }
+  else
+    {
+      errcode = posix_spawn_file_actions_adddup2(&file_actions, childfd,
+                   (oflag & O_ACCMODE) == O_RDONLY ?
+                   STDOUT_FILENO : STDIN_FILENO);
+      if (errcode != 0)
+        {
+          goto errout_with_actions;
+        }
+    }
+
+  /* Call task_spawn() (or posix_spawn), re-directing stdin or stdout
+   * appropriately.
+   */
+
+  argv[1] = "-c";
+  argv[2] = (FAR char *)command;
+  argv[3] = NULL;
+
+#ifdef CONFIG_SYSTEM_POPEN_SHPATH
+  argv[0] = CONFIG_SYSTEM_POPEN_SHPATH;
+  errcode = posix_spawn(pid, argv[0], &file_actions,
+                        &attr, argv, NULL);
+#else
+  *pid = task_spawn("dpopen", nsh_system, &file_actions,
+                    &attr, argv + 1, NULL);
+  if (*pid < 0)
+    {
+      errcode = -*pid;
+    }
+#endif
+
+  if (errcode != 0)
+    {
+      serr("ERROR: dpopen spawn failed: %d\n", errcode);
+      goto errout_with_pipe;
+    }
+
+  /* Free attributes and file actions */
+
+  posix_spawn_file_actions_destroy(&file_actions);
+  posix_spawnattr_destroy(&attr);
+
+  /* Close the child's end in the parent */
+
+  if (!(oflag & O_CLOEXEC))
+    {
+      ioctl(parentfd, FIONCLEX, 0);
+    }
+
+  close(childfd);
+
+  return parentfd;
+
+errout_with_actions:
+  posix_spawn_file_actions_destroy(&file_actions);
+
+errout_with_attr:
+  posix_spawnattr_destroy(&attr);
+
+errout_with_pipe:
+  close(fd[0]);
+  close(fd[1]);
+  errno = errcode;
+  return -1;
+}
+
+/****************************************************************************
+ * Name: dpclose
+ *
+ * Description:
+ *   Close a file descriptor opened by dpopen() and wait for the child
+ *   process to terminate.
+ *
+ *   This is the descriptor-based counterpart of pclose().
+ *
+ * Input Parameters:
+ *   fd  - The file descriptor returned by dpopen()
+ *   pid - The child process ID returned by dpopen()
+ *
+ * Returned Value:
+ *   The child termination status on success, or -1 on failure with
+ *   errno set.
+ *
+ ****************************************************************************/
+
+int dpclose(int fd, pid_t pid)
+{
+#ifdef CONFIG_SCHED_WAITPID
+  int status;
+  int ret;
+#endif
+
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+#ifdef CONFIG_SCHED_WAITPID
+  ret = waitpid(pid, &status, 0);
+  if (ret < 0)
+    {
+      return ERROR;
+    }
+
+  return status;
+#else
+  return 0;
+#endif
+}
diff --git a/system/popen/popen.c b/system/popen/popen.c
index b52fbaafe..4f46e6cd2 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -26,21 +26,13 @@
 
 #include <nuttx/config.h>
 
-#include <sys/wait.h>
-#include <sys/ioctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sched.h>
-#include <spawn.h>
-#include <assert.h>
-#include <nuttx/debug.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#include "nshlib/nshlib.h"
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -69,17 +61,9 @@ struct popen_file_s
  *   executed command, and will return a pointer to a stream that can be
  *   used to either read from or write to the pipe.
  *
- *   The environment of the executed command will be as if a child process
- *   were created within the popen() call using the fork() function, and the
- *   child invoked the sh utility using the call:
- *
- *     execl(shell path, "sh", "-c", command, NULL);
- *
- *   where shell path is an unspecified pathname for the sh utility.
- *
- *   The popen() function will ensure that any streams from previous popen()
- *   calls that remain open in the parent process are closed in the new child
- *   process.
+ *   This is a thin wrapper around dpopen() that wraps the returned file
+ *   descriptor in a FILE stream, analogous to how fprintf() relates to
+ *   dprintf().
  *
  *   The mode argument to popen() is a string that specifies I/O mode:
  *
@@ -95,18 +79,12 @@ struct popen_file_s
  *       the stream pointer returned by popen(), will be the writable end of
  *       the pipe.
  *
- *   If mode is any other value, the result is undefined.
- *
- *   After popen(), both the parent and the child process will be capable of
- *   executing independently before either terminates.
- *
- *   Pipe streams are byte-oriented.
- *
  * Input Parameters:
- *   command
+ *   command - The command string to execute
+ *   mode    - "r" or "w"
  *
  * Returned Value:
- *   A non-NULLFILE stream connected to the shell instance is returned on
+ *   A non-NULL FILE stream connected to the child process is returned on
  *   success.  NULL is returned on any failure with the errno variable set
  *   appropriately.
  *
@@ -115,244 +93,67 @@ struct popen_file_s
 FILE *popen(FAR const char *command, FAR const char *mode)
 {
   FAR struct popen_file_s *container;
-  struct sched_param param;
-  posix_spawnattr_t attr;
-  posix_spawn_file_actions_t file_actions;
-  FAR char *argv[4];
-  int fd[2];
-  int oldfd[2];
-  int newfd[2];
-  int retfd;
-  int errcode;
-  int result = 0;
-  bool rw = false;
+  int oflag;
+  int fd;
 
   /* Allocate a container for returned FILE stream */
 
   container = (FAR struct popen_file_s *)malloc(sizeof(struct popen_file_s));
   if (container == NULL)
     {
-      errcode = ENOMEM;
-      goto errout;
+      errno = ENOMEM;
+      return NULL;
     }
 
-  oldfd[1] = 0;
-  newfd[1] = 0;
+  /* Map mode string to open flags */
 
-  /* Create a pipe.  fd[0] refers to the read end of the pipe; fd[1] refers
-   * to the write end of the pipe.
-   * Is the pipe the input to the shell?  Or the output?
-   */
-
-  if (strcmp(mode, "r") == 0 &&
-      (result = pipe2(fd, O_CLOEXEC)) >= 0)
+  if (strstr(mode, "r+") || strstr(mode, "w+"))
     {
-      /* Pipe is the output from the shell */
-
-      oldfd[0] = 1;     /* Replace stdout with the write side of the pipe */
-      newfd[0] = fd[1];
-      retfd    = fd[0]; /* Use read side of the pipe to create the return stream */
+      oflag = O_RDWR;
     }
-  else if (strcmp(mode, "w") == 0 &&
-           (result = pipe2(fd, O_CLOEXEC)) >= 0)
+  else if (strstr(mode, "r"))
     {
-      /* Pipe is the input to the shell */
-
-      oldfd[0] = 0;     /* Replace stdin with the read side of the pipe */
-      newfd[0] = fd[0];
-      retfd    = fd[1]; /* Use write side of the pipe to create the return stream */
+      oflag = O_RDONLY;
     }
-
-  /* Create a socketpair. Using fd[0] as the input and output to the shell */
-
-#if defined(CONFIG_NET_LOCAL) && defined(CONFIG_NET_LOCAL_STREAM)
-  else if ((strcmp(mode, "r+") == 0 || strcmp(mode, "w+") == 0) &&
-           (result = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC,
-                                0, fd)) >= 0)
+  else if (strstr(mode, "w"))
     {
-      /* Socketpair is the input/output to the shell */
-
-      rw = true;
-      oldfd[0] = 0;     /* Replace stdin with the one side of a socket pair */
-      newfd[0] = fd[0];
-      oldfd[1] = 1;     /* Replace stdout with the one side of a socket pair */
-      newfd[1] = fd[0];
-      retfd    = fd[1]; /* Use other side of the socket pair to create the return stream */
-    }
-#endif
-  else if (result < 0)
-    {
-      errcode = errno;
-      goto errout_with_container;
+      oflag = O_WRONLY;
     }
   else
     {
-      errcode = EINVAL;
-      goto errout_with_pipe;
+      free(container);
+      errno = EINVAL;
+      return NULL;
     }
 
-  /* Create the FILE stream return reference */
+  if (strchr(mode, 'e') != NULL)
+    {
+      oflag |= O_CLOEXEC;
+    }
 
-  container->original = fdopen(retfd, mode);
+  /* Use dpopen() to do the real work */
+
+  fd = dpopen(command, oflag, &container->shell);
+  if (fd < 0)
+    {
+      free(container);
+      return NULL;
+    }
+
+  /* Wrap the raw fd in a FILE stream */
+
+  container->original = fdopen(fd, mode);
   if (container->original == NULL)
     {
-      errcode = errno;
-      goto errout_with_pipe;
+      int errcode = errno;
+      dpclose(fd, container->shell);
+      free(container);
+      errno = errcode;
+      return NULL;
     }
 
-  /* Initialize attributes for task_spawn() (or posix_spawn()). */
-
-  errcode = posix_spawnattr_init(&attr);
-  if (errcode != 0)
-    {
-      goto errout_with_stream;
-    }
-
-  errcode = posix_spawn_file_actions_init(&file_actions);
-  if (errcode != 0)
-    {
-      goto errout_with_attrs;
-    }
-
-  /* Set the correct stack size and priority */
-
-  param.sched_priority = CONFIG_SYSTEM_POPEN_PRIORITY;
-  errcode = posix_spawnattr_setschedparam(&attr, &param);
-  if (errcode != 0)
-    {
-      goto errout_with_actions;
-    }
-
-#ifndef CONFIG_SYSTEM_POPEN_SHPATH
-  errcode = posix_spawnattr_setstacksize(&attr,
-                                         CONFIG_SYSTEM_POPEN_STACKSIZE);
-  if (errcode != 0)
-    {
-      goto errout_with_actions;
-    }
-#endif
-
-  /* If robin robin scheduling is enabled, then set the scheduling policy
-   * of the new task to SCHED_RR before it has a chance to run.
-   */
-
-#if CONFIG_RR_INTERVAL > 0
-  errcode = posix_spawnattr_setschedpolicy(&attr, SCHED_RR);
-  if (errcode != 0)
-    {
-      goto errout_with_actions;
-    }
-
-  errcode = posix_spawnattr_setflags(&attr,
-                                     POSIX_SPAWN_SETSCHEDPARAM |
-                                     POSIX_SPAWN_SETSCHEDULER);
-  if (errcode != 0)
-    {
-      goto errout_with_actions;
-    }
-
-#else
-  errcode = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDPARAM);
-  if (errcode != 0)
-    {
-      goto errout_with_actions;
-    }
-
-#endif
-
-  /* Redirect input or output as determined by the mode parameter */
-
-  errcode = posix_spawn_file_actions_adddup2(&file_actions,
-                                             newfd[0], oldfd[0]);
-  if (errcode != 0)
-    {
-      goto errout_with_actions;
-    }
-
-  if (rw)
-    {
-      errcode = posix_spawn_file_actions_adddup2(&file_actions,
-                                                 newfd[1], oldfd[1]);
-      if (errcode != 0)
-        {
-          goto errout_with_actions;
-        }
-    }
-
-  /* Call task_spawn() (or posix_spawn), re-directing stdin or stdout
-   * appropriately.
-   */
-
-  argv[1] = "-c";
-  argv[2] = (FAR char *)command;
-  argv[3] = NULL;
-
-#ifdef CONFIG_SYSTEM_POPEN_SHPATH
-  argv[0] = CONFIG_SYSTEM_POPEN_SHPATH;
-  errcode = posix_spawn(&container->shell, argv[0], &file_actions,
-                        &attr, argv, NULL);
-#else
-  container->shell = task_spawn("popen", nsh_system, &file_actions,
-                                &attr, argv + 1, NULL);
-  if (container->shell < 0)
-    {
-      errcode = -container->shell;
-    }
-#endif
-
-  if (errcode != 0)
-    {
-      serr("ERROR: Spawn failed: %d\n", errcode);
-      goto errout_with_actions;
-    }
-
-  /* We can close the 'newfd' now.  It is no longer useful on this side of
-   * the interface.
-   */
-
-  close(newfd[0]);
-
-  if (rw && newfd[0] != newfd[1])
-    {
-      close(newfd[1]);
-    }
-
-  /* Free attributes and file actions.  Ignoring return values in the case
-   * of an error.
-   */
-
-  posix_spawn_file_actions_destroy(&file_actions);
-  posix_spawnattr_destroy(&attr);
-
-  if (strchr(mode, 'e') == NULL)
-    {
-      ioctl(retfd, FIOCLEX, 0);
-    }
-
-  /* Finale and return input input/output stream */
-
   memcpy(&container->copy, container->original, sizeof(FILE));
   return &container->copy;
-
-errout_with_actions:
-  posix_spawn_file_actions_destroy(&file_actions);
-
-errout_with_attrs:
-  posix_spawnattr_destroy(&attr);
-
-errout_with_stream:
-  fclose(container->original);
-
-errout_with_pipe:
-  close(fd[0]);
-  close(fd[1]);
-
-errout_with_container:
-  free(container);
-
-errout:
-  errno = errcode;
-  return NULL;
 }
 
 /****************************************************************************
@@ -388,12 +189,12 @@ errout:
  *   If the argument stream to pclose() is not a pointer to a stream created
  *   by popen(), the result of pclose() is undefined.
  *
- * Description:
+ * Input Parameters:
  *   stream - The stream reference returned by a previous call to popen()
  *
  * Returned Value:
- *   Zero (OK) is returned on success; otherwise -1 (ERROR) is returned and
- *   the errno variable is set appropriately.
+ *   The child termination status on success, or -1 (ERROR) on failure
+ *   with errno set.
  *
  ****************************************************************************/
 
@@ -402,12 +203,7 @@ int pclose(FILE *stream)
   FAR struct popen_file_s *container = (FAR struct popen_file_s *)stream;
   FILE *original;
   pid_t shell;
-#ifdef CONFIG_SCHED_WAITPID
-  int status;
-  int result;
-#endif
 
-  DEBUGASSERT(container != NULL && container->original != NULL);
   original = container->original;
 
   /* Set the state of the original file descriptor to the state of the
@@ -417,7 +213,7 @@ int pclose(FILE *stream)
   memcpy(original, &container->copy, sizeof(FILE));
 
   /* Then close the original and free the container (saving the PID of the
-   * shell process)
+   * shell process).  Pass -1 to dpclose since fclose already closed the fd.
    */
 
   fclose(original);
@@ -425,19 +221,5 @@ int pclose(FILE *stream)
   shell = container->shell;
   free(container);
 
-#ifdef CONFIG_SCHED_WAITPID
-  /* Wait for the shell to exit, retrieving the return value if available. */
-
-  result = waitpid(shell, &status, 0);
-  if (result < 0)
-    {
-      /* The errno has already been set */
-
-      return ERROR;
-    }
-
-  return status;
-#else
-  return OK;
-#endif
+  return dpclose(-1, shell);
 }

From 740fda96302cc6f379907ce03f62d6754c657a1c Mon Sep 17 00:00:00 2001
From: cuiziwei <cuiziwei@xiaomi.com>
Date: Tue, 28 Apr 2026 17:32:22 +0800
Subject: [PATCH 397/568] system/popen: support no-shell mode via posix_spawnp

When NSH_LIBRARY is not available, dpopen()/popen() can still execute
commands by splitting the command string by whitespace and calling
posix_spawnp() directly.  Shell syntax (pipes, redirects, globbing)
is not supported in this mode.

Add CONFIG_SYSTEM_POPEN_MAXARGUMENTS (default 7) to control the
argv array size for the no-shell path.

Remove the hard dependency on NSH_LIBRARY from SYSTEM_POPEN so the
feature can be used in minimal configurations without a shell.

Signed-off-by: cuiziwei <cuiziwei@xiaomi.com>
---
 system/popen/Kconfig  | 27 ++++++++++++++++----
 system/popen/dpopen.c | 59 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/system/popen/Kconfig b/system/popen/Kconfig
index 606efa032..6256af7c4 100644
--- a/system/popen/Kconfig
+++ b/system/popen/Kconfig
@@ -7,7 +7,7 @@ config SYSTEM_POPEN
 	bool "popen()/pclose()/dpopen()/dpclose() Functions"
 	default n
 	select SCHED_WAITPID
-	depends on NSH_LIBRARY && PIPES
+	depends on PIPES
 	---help---
 		Enable support for the popen(), pclose(), dpopen(), and
 		dpclose() interfaces.
@@ -20,16 +20,20 @@ config SYSTEM_POPEN
 		popen()/pclose() are thin wrappers around dpopen()/dpclose()
 		that additionally wrap the fd in a FILE stream.
 
-		Commands are executed through the NSH shell (sh -c command),
-		supporting full shell syntax including pipes, redirects,
-		and globbing.
+		When NSH is available (NSH_LIBRARY), commands are executed
+		through the shell (sh -c command), supporting full shell
+		syntax including pipes, redirects, and globbing.
+
+		When NSH is not available, commands are executed directly
+		via posix_spawnp(). The command string must be a simple
+		"program arg1 arg2" form without shell syntax.
 
 if SYSTEM_POPEN
 
 config SYSTEM_POPEN_SHPATH
 	string "Path to shell command"
 	default "/bin/sh"
-	depends on SYSTEM_NSH=m || BUILD_KERNEL
+	depends on (SYSTEM_NSH=m || BUILD_KERNEL) && NSH_LIBRARY
 	---help---
 		This is the full path to the program in a mounted file system that
 		implements the system() command.  That is, a program that starts the
@@ -53,4 +57,17 @@ config SYSTEM_POPEN_PRIORITY
 	---help---
 		The priority of the shell.
 
+config SYSTEM_POPEN_MAXARGUMENTS
+	int "Maximum number of command arguments (no-shell mode)"
+	default 7
+	depends on !NSH_LIBRARY
+	---help---
+		When NSH is not available, dpopen()/popen() splits the command
+		string by whitespace into an argv array.  This sets the maximum
+		number of arguments (excluding the program name and the
+		terminating NULL).
+
+		This is analogous to CONFIG_NSH_MAXARGUMENTS but applies
+		only to the no-shell path.
+
 endif
diff --git a/system/popen/dpopen.c b/system/popen/dpopen.c
index dd8bc9b7d..785fcc202 100644
--- a/system/popen/dpopen.c
+++ b/system/popen/dpopen.c
@@ -27,6 +27,7 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <string.h>
 #include <sched.h>
 #include <spawn.h>
 #include <debug.h>
@@ -37,7 +38,17 @@
 #  include <sys/socket.h>
 #endif
 
-#include "nshlib/nshlib.h"
+#ifdef CONFIG_NSH_LIBRARY
+#  include "nshlib/nshlib.h"
+#endif
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_LIBRARY
+#  define DPOPEN_MAX_ARGV (CONFIG_SYSTEM_POPEN_MAXARGUMENTS + 1)
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -58,6 +69,10 @@
  *   When NSH is available, commands are executed through the shell
  *   (sh -c command), supporting full shell syntax.
  *
+ *   When NSH is not available, the command is split by whitespace and
+ *   executed directly via posix_spawnp().  Shell syntax (pipes, redirects,
+ *   globbing) is not supported in this mode.
+ *
  * Input Parameters:
  *   command - The command string to execute
  *   oflag   - O_RDONLY to read child stdout, O_WRONLY to write child stdin,
@@ -74,7 +89,14 @@ int dpopen(FAR const char *command, int oflag, FAR pid_t *pid)
   struct sched_param param;
   posix_spawnattr_t attr;
   posix_spawn_file_actions_t file_actions;
+#ifdef CONFIG_NSH_LIBRARY
   FAR char *argv[4];
+#else
+  char cmdbuf[PATH_MAX];
+  FAR char *argv[DPOPEN_MAX_ARGV];
+  FAR char *saveptr;
+  int argc = 0;
+#endif
   int fd[2];
   int childfd;
   int parentfd;
@@ -224,21 +246,52 @@ int dpopen(FAR const char *command, int oflag, FAR pid_t *pid)
    * appropriately.
    */
 
+#ifdef CONFIG_NSH_LIBRARY
+  /* Shell mode: execute command through sh -c */
+
   argv[1] = "-c";
   argv[2] = (FAR char *)command;
   argv[3] = NULL;
 
-#ifdef CONFIG_SYSTEM_POPEN_SHPATH
+#  ifdef CONFIG_SYSTEM_POPEN_SHPATH
   argv[0] = CONFIG_SYSTEM_POPEN_SHPATH;
   errcode = posix_spawn(pid, argv[0], &file_actions,
                         &attr, argv, NULL);
-#else
+#  else
   *pid = task_spawn("dpopen", nsh_system, &file_actions,
                     &attr, argv + 1, NULL);
   if (*pid < 0)
     {
       errcode = -*pid;
     }
+#  endif
+#else
+  /* No-shell mode: split command and execute directly via posix_spawnp.
+   * The command must be in "program arg1 arg2" form -- no shell syntax.
+   */
+
+  if (strlcpy(cmdbuf, command, sizeof(cmdbuf)) >= sizeof(cmdbuf))
+    {
+      errcode = ENAMETOOLONG;
+      goto errout_with_actions;
+    }
+
+  do
+    {
+      argv[argc] = strtok_r(argc ? NULL : cmdbuf, " \t", &saveptr);
+    }
+  while (argv[argc] != NULL && ++argc < DPOPEN_MAX_ARGV - 1);
+
+  argv[argc] = NULL;
+
+  if (argc == 0)
+    {
+      errcode = EINVAL;
+      goto errout_with_actions;
+    }
+
+  errcode = posix_spawnp(pid, argv[0], &file_actions,
+                         &attr, argv, NULL);
 #endif
 
   if (errcode != 0)

From 97802bd9e0ae57ec18a74e777a58f2eb143c4aa7 Mon Sep 17 00:00:00 2001
From: cuiziwei <cuiziwei@xiaomi.com>
Date: Tue, 28 Apr 2026 17:29:12 +0800
Subject: [PATCH 398/568] testing/libc/popen: add popen/dpopen test for shell
 and no-shell modes

Add tests for popen()/pclose() and dpopen()/dpclose() that work in
both shell (NSH) and no-shell (direct posix_spawnp) modes.  The test
binary doubles as its own target via the --echo sub-command.

Tests:
 1-4: popen  - basic read, multi-arg, pclose, invalid mode
 5-7: dpopen - basic read, multi-arg, dpclose

Signed-off-by: cuiziwei <cuiziwei@xiaomi.com>
---
 testing/libc/popen/CMakeLists.txt |  33 ++++
 testing/libc/popen/Kconfig        |  16 ++
 testing/libc/popen/Make.defs      |  25 +++
 testing/libc/popen/Makefile       |  32 ++++
 testing/libc/popen/popen_test.c   | 250 ++++++++++++++++++++++++++++++
 5 files changed, 356 insertions(+)
 create mode 100644 testing/libc/popen/CMakeLists.txt
 create mode 100644 testing/libc/popen/Kconfig
 create mode 100644 testing/libc/popen/Make.defs
 create mode 100644 testing/libc/popen/Makefile
 create mode 100644 testing/libc/popen/popen_test.c

diff --git a/testing/libc/popen/CMakeLists.txt b/testing/libc/popen/CMakeLists.txt
new file mode 100644
index 000000000..867a56891
--- /dev/null
+++ b/testing/libc/popen/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/testing/libc/popen/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_POPEN)
+  nuttx_add_application(
+    NAME
+    popen_test
+    STACKSIZE
+    ${CONFIG_DEFAULT_TASK_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_POPEN}
+    SRCS
+    popen_test.c)
+endif()
diff --git a/testing/libc/popen/Kconfig b/testing/libc/popen/Kconfig
new file mode 100644
index 000000000..73d4beb36
--- /dev/null
+++ b/testing/libc/popen/Kconfig
@@ -0,0 +1,16 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_POPEN
+	tristate "popen()/dpopen() test"
+	default n
+	depends on SYSTEM_POPEN
+	---help---
+		Test popen()/pclose() and dpopen()/dpclose() in both shell
+		and no-shell modes. The test binary doubles as its own
+		popen/dpopen target via --echo.
+
+if TESTING_POPEN
+endif
diff --git a/testing/libc/popen/Make.defs b/testing/libc/popen/Make.defs
new file mode 100644
index 000000000..eac91c500
--- /dev/null
+++ b/testing/libc/popen/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/libc/popen/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_POPEN),)
+CONFIGURED_APPS += $(APPDIR)/testing/libc/popen
+endif
diff --git a/testing/libc/popen/Makefile b/testing/libc/popen/Makefile
new file mode 100644
index 000000000..1ef31c7ab
--- /dev/null
+++ b/testing/libc/popen/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/testing/libc/popen/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME = popen_test
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE = $(CONFIG_TESTING_POPEN)
+
+MAINSRC = popen_test.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/libc/popen/popen_test.c b/testing/libc/popen/popen_test.c
new file mode 100644
index 000000000..bbe3a7e59
--- /dev/null
+++ b/testing/libc/popen/popen_test.c
@@ -0,0 +1,250 @@
+/****************************************************************************
+ * apps/testing/libc/popen/popen_test.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int test_popen_read(void)
+{
+  FILE *fp;
+  char buf[256];
+  int found = 0;
+
+  printf("[TEST 1] popen read...\n");
+  fp = popen("popen_test --echo hello_popen", "r");
+  if (fp == NULL)
+    {
+      printf("[FAIL] popen returned NULL\n");
+      return 1;
+    }
+
+  while (fgets(buf, sizeof(buf), fp) != NULL)
+    {
+      printf("  > %s", buf);
+      if (strstr(buf, "hello_popen"))
+        {
+          found = 1;
+        }
+    }
+
+  pclose(fp);
+  printf("%s\n", found ? "[PASS]" : "[FAIL] missing output");
+  return !found;
+}
+
+static int test_popen_multiarg(void)
+{
+  FILE *fp;
+  char buf[256];
+  int found = 0;
+
+  printf("[TEST 2] popen multi-arg...\n");
+  fp = popen("popen_test --echo aaa bbb ccc", "r");
+  if (fp == NULL)
+    {
+      printf("[FAIL] popen returned NULL\n");
+      return 1;
+    }
+
+  while (fgets(buf, sizeof(buf), fp) != NULL)
+    {
+      printf("  > %s", buf);
+      if (strstr(buf, "aaa bbb ccc"))
+        {
+          found = 1;
+        }
+    }
+
+  pclose(fp);
+  printf("%s\n", found ? "[PASS]" : "[FAIL] wrong output");
+  return !found;
+}
+
+static int test_pclose_complete(void)
+{
+  FILE *fp;
+  char buf[256];
+
+  printf("[TEST 3] pclose completes...\n");
+  fp = popen("popen_test --echo ok", "r");
+  if (fp == NULL)
+    {
+      printf("[FAIL] popen returned NULL\n");
+      return 1;
+    }
+
+  while (fgets(buf, sizeof(buf), fp) != NULL);
+  pclose(fp);
+  printf("[PASS]\n");
+  return 0;
+}
+
+static int test_popen_invalid_mode(void)
+{
+  FILE *fp;
+
+  printf("[TEST 4] popen invalid mode...\n");
+  fp = popen("popen_test", "x");
+  if (fp == NULL)
+    {
+      printf("[PASS]\n");
+      return 0;
+    }
+
+  pclose(fp);
+  printf("[FAIL] should return NULL\n");
+  return 1;
+}
+
+static int test_dpopen_read(void)
+{
+  char buf[256];
+  ssize_t n;
+  pid_t pid;
+  int found = 0;
+  int fd;
+
+  printf("[TEST 5] dpopen read...\n");
+  fd = dpopen("popen_test --echo hello_dpopen", O_RDONLY, &pid);
+  if (fd < 0)
+    {
+      printf("[FAIL] dpopen returned %d\n", fd);
+      return 1;
+    }
+
+  while ((n = read(fd, buf, sizeof(buf) - 1)) > 0)
+    {
+      buf[n] = '\0';
+      printf("  > %s", buf);
+      if (strstr(buf, "hello_dpopen"))
+        {
+          found = 1;
+        }
+    }
+
+  dpclose(fd, pid);
+  printf("%s\n", found ? "[PASS]" : "[FAIL] missing output");
+  return !found;
+}
+
+static int test_dpopen_multiarg(void)
+{
+  char buf[256];
+  ssize_t n;
+  pid_t pid;
+  int found = 0;
+  int fd;
+
+  printf("[TEST 6] dpopen multi-arg...\n");
+  fd = dpopen("popen_test --echo xxx yyy zzz", O_RDONLY, &pid);
+  if (fd < 0)
+    {
+      printf("[FAIL] dpopen returned %d\n", fd);
+      return 1;
+    }
+
+  while ((n = read(fd, buf, sizeof(buf) - 1)) > 0)
+    {
+      buf[n] = '\0';
+      printf("  > %s", buf);
+      if (strstr(buf, "xxx yyy zzz"))
+        {
+          found = 1;
+        }
+    }
+
+  dpclose(fd, pid);
+  printf("%s\n", found ? "[PASS]" : "[FAIL] wrong output");
+  return !found;
+}
+
+static int test_dpclose_complete(void)
+{
+  char buf[256];
+  pid_t pid;
+  int fd;
+
+  printf("[TEST 7] dpclose completes...\n");
+  fd = dpopen("popen_test --echo ok", O_RDONLY, &pid);
+  if (fd < 0)
+    {
+      printf("[FAIL] dpopen returned %d\n", fd);
+      return 1;
+    }
+
+  while (read(fd, buf, sizeof(buf)) > 0);
+  dpclose(fd, pid);
+  printf("[PASS]\n");
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  int fail = 0;
+
+  /* Sub-command: echo args back, used as popen/dpopen target */
+
+  if (argc > 1 && strcmp(argv[1], "--echo") == 0)
+    {
+      int i;
+      for (i = 2; i < argc; i++)
+        {
+          printf("%s%s", i > 2 ? " " : "", argv[i]);
+        }
+
+      printf("\n");
+      return 0;
+    }
+
+  printf("=== popen/dpopen test ===\n\n");
+
+  /* popen tests */
+
+  fail += test_popen_read();
+  fail += test_popen_multiarg();
+  fail += test_pclose_complete();
+  fail += test_popen_invalid_mode();
+
+  /* dpopen tests */
+
+  fail += test_dpopen_read();
+  fail += test_dpopen_multiarg();
+  fail += test_dpclose_complete();
+
+  printf("\n=== Results: %d failed ===\n", fail);
+  return fail;
+}

From c106a02b586253e2bdcf3e64ccad4b4cc8b6527b Mon Sep 17 00:00:00 2001
From: Arjav Patel <arjav1528@gmail.com>
Date: Mon, 1 Jun 2026 23:11:04 +0530
Subject: [PATCH 399/568] examples/microros_sub: Add minimal Int32 subscriber
 example.

Mirror of microros_pub for the receive direction.  Creates a node,
subscribes to /nuttx_sub with std_msgs/Int32, drives an rclc_executor
spin loop, and prints each received value.  Exercises the new
rclc_executor + subscription callback path on top of the
microros_transport library shipped in apps/system/microros.

Validates the NuttX-native transport in the agent->client direction
end-to-end against a micro-ROS agent + ros2 topic pub on the host.

Signed-off-by: Arjav Patel <arjav1528@gmail.com>
---
 examples/microros_sub/CMakeLists.txt      |  35 ++++++
 examples/microros_sub/Kconfig             |  31 +++++
 examples/microros_sub/Make.defs           |  25 +++++
 examples/microros_sub/Makefile            |  32 ++++++
 examples/microros_sub/microros_sub_main.c | 131 ++++++++++++++++++++++
 5 files changed, 254 insertions(+)
 create mode 100644 examples/microros_sub/CMakeLists.txt
 create mode 100644 examples/microros_sub/Kconfig
 create mode 100644 examples/microros_sub/Make.defs
 create mode 100644 examples/microros_sub/Makefile
 create mode 100644 examples/microros_sub/microros_sub_main.c

diff --git a/examples/microros_sub/CMakeLists.txt b/examples/microros_sub/CMakeLists.txt
new file mode 100644
index 000000000..1c094949a
--- /dev/null
+++ b/examples/microros_sub/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/examples/microros_sub/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_MICROROS_SUB)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_MICROROS_SUB_PROGNAME}
+    SRCS
+    microros_sub_main.c
+    STACKSIZE
+    ${CONFIG_EXAMPLES_MICROROS_SUB_STACKSIZE}
+    PRIORITY
+    ${CONFIG_EXAMPLES_MICROROS_SUB_PRIORITY}
+    DEPENDS
+    microros_transport)
+endif()
diff --git a/examples/microros_sub/Kconfig b/examples/microros_sub/Kconfig
new file mode 100644
index 000000000..3bbbf5efb
--- /dev/null
+++ b/examples/microros_sub/Kconfig
@@ -0,0 +1,31 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_MICROROS_SUB
+	tristate "micro-ROS int32 subscriber example"
+	default n
+	depends on SYSTEM_MICROROS
+	---help---
+		Minimal micro-ROS subscriber that creates a node, subscribes to
+		the topic /nuttx_sub with std_msgs/Int32, and prints each
+		received value.  Drives an rclc_executor spin loop and is used
+		together with microros_pub (or any external publisher) to
+		validate the NuttX-native transport in the receive direction.
+
+if EXAMPLES_MICROROS_SUB
+
+config EXAMPLES_MICROROS_SUB_PROGNAME
+	string "Program name"
+	default "microros_sub"
+
+config EXAMPLES_MICROROS_SUB_PRIORITY
+	int "micro-ROS sub task priority"
+	default 100
+
+config EXAMPLES_MICROROS_SUB_STACKSIZE
+	int "micro-ROS sub stack size"
+	default 8192
+
+endif
diff --git a/examples/microros_sub/Make.defs b/examples/microros_sub/Make.defs
new file mode 100644
index 000000000..e9fe5aa1d
--- /dev/null
+++ b/examples/microros_sub/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/microros_sub/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_MICROROS_SUB),)
+CONFIGURED_APPS += $(APPDIR)/examples/microros_sub
+endif
diff --git a/examples/microros_sub/Makefile b/examples/microros_sub/Makefile
new file mode 100644
index 000000000..a1144a70c
--- /dev/null
+++ b/examples/microros_sub/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/examples/microros_sub/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_EXAMPLES_MICROROS_SUB_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_MICROROS_SUB_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_MICROROS_SUB_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_MICROROS_SUB)
+
+MAINSRC = microros_sub_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/microros_sub/microros_sub_main.c b/examples/microros_sub/microros_sub_main.c
new file mode 100644
index 000000000..1e1a6c550
--- /dev/null
+++ b/examples/microros_sub/microros_sub_main.c
@@ -0,0 +1,131 @@
+/****************************************************************************
+ * apps/examples/microros_sub/microros_sub_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <rcl/rcl.h>
+#include <rcl/error_handling.h>
+#include <rclc/rclc.h>
+#include <rclc/executor.h>
+#include <std_msgs/msg/int32.h>
+
+#include <system/microros_transport.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static std_msgs__msg__Int32 g_rx_msg;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void sub_callback(const void *msgin)
+{
+  const std_msgs__msg__Int32 *msg = (const std_msgs__msg__Int32 *)msgin;
+
+  printf("microros_sub: got %d\n", (int)msg->data);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  rcl_subscription_t   subscriber;
+  rcl_allocator_t      allocator;
+  rclc_support_t       support;
+  rcl_node_t           node;
+  rclc_executor_t      executor;
+
+  printf("microros_sub: starting\n");
+
+  if (microros_transport_init() != 0)
+    {
+      printf("microros_sub: transport init failed\n");
+      return 1;
+    }
+
+  allocator = rcl_get_default_allocator();
+
+  if (rclc_support_init(&support, 0, NULL, &allocator) != RCL_RET_OK)
+    {
+      printf("microros_sub: rclc_support_init failed\n");
+      return 1;
+    }
+
+  if (rclc_node_init_default(&node, "nuttx_sub_node", "", &support)
+      != RCL_RET_OK)
+    {
+      printf("microros_sub: node init failed\n");
+      return 1;
+    }
+
+  if (rclc_subscription_init_default(
+        &subscriber,
+        &node,
+        ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, Int32),
+        "nuttx_sub") != RCL_RET_OK)
+    {
+      printf("microros_sub: subscription init failed\n");
+      return 1;
+    }
+
+  executor = rclc_executor_get_zero_initialized_executor();
+  if (rclc_executor_init(&executor, &support.context, 1, &allocator)
+      != RCL_RET_OK)
+    {
+      printf("microros_sub: executor init failed\n");
+      return 1;
+    }
+
+  if (rclc_executor_add_subscription(&executor,
+                                     &subscriber,
+                                     &g_rx_msg,
+                                     &sub_callback,
+                                     ON_NEW_DATA) != RCL_RET_OK)
+    {
+      printf("microros_sub: add_subscription failed\n");
+      return 1;
+    }
+
+  printf("microros_sub: spinning on /nuttx_sub\n");
+
+  rclc_executor_spin(&executor);
+
+  rclc_executor_fini(&executor);
+  rcl_subscription_fini(&subscriber, &node);
+  rcl_node_fini(&node);
+  rclc_support_fini(&support);
+
+  printf("microros_sub: done\n");
+  return 0;
+}

From 840c2f30db650d23a53f75c46a49b74d06f699f2 Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Sat, 30 May 2026 02:03:08 +0900
Subject: [PATCH 400/568] apps/rust: Add dependencies for Rust cargo in make
 builds

Add a Rust make helper that collects crate input files, and use it for
the Rust hello and slint examples.

This makes the generated Rust static libraries depend on the crate
sources, manifests, build scripts. Hook the libraries into both context
and all, so re-running make after editing Rust inputs rebuilds the crate.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 examples/rust/hello/Makefile |  9 ++++++++-
 examples/rust/slint/Makefile |  9 ++++++++-
 tools/Rust.mk                | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/examples/rust/hello/Makefile b/examples/rust/hello/Makefile
index 2c638eb3c..c5af98671 100644
--- a/examples/rust/hello/Makefile
+++ b/examples/rust/hello/Makefile
@@ -27,9 +27,16 @@ PRIORITY  = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_STACKSIZE)
 MODULE    = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO)
 
-context::
+RUST_LIB  := $(call RUST_GET_BINDIR,hello,$(APPDIR)/examples/rust)
+RUST_SRCS := $(call RUST_CARGO_SRCS,hello,$(APPDIR)/examples/rust)
+
+$(RUST_LIB): $(RUST_SRCS)
 	$(call RUST_CARGO_BUILD,hello,$(APPDIR)/examples/rust)
 
+context:: $(RUST_LIB)
+
+all:: $(RUST_LIB)
+
 clean::
 	$(call RUST_CARGO_CLEAN,hello,$(APPDIR)/examples/rust)
 
diff --git a/examples/rust/slint/Makefile b/examples/rust/slint/Makefile
index 34b444e9d..747f8960b 100644
--- a/examples/rust/slint/Makefile
+++ b/examples/rust/slint/Makefile
@@ -25,9 +25,16 @@ PRIORITY  = $(CONFIG_EXAMPLES_RUST_SLINT_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_RUST_SLINT_STACKSIZE)
 MODULE    = $(CONFIG_EXAMPLES_RUST_SLINT)
 
-context::
+RUST_LIB  := $(call RUST_GET_BINDIR,slint,$(APPDIR)/examples/rust)
+RUST_SRCS := $(call RUST_CARGO_SRCS,slint,$(APPDIR)/examples/rust)
+
+$(RUST_LIB): $(RUST_SRCS)
 	$(call RUST_CARGO_BUILD,slint,$(APPDIR)/examples/rust)
 
+context:: $(RUST_LIB)
+
+all:: $(RUST_LIB)
+
 clean::
 	$(call RUST_CARGO_CLEAN,slint,$(APPDIR)/examples/rust)
 
diff --git a/tools/Rust.mk b/tools/Rust.mk
index 90f3615a2..80abe2970 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -144,3 +144,18 @@ $(2)/$(1)/target/$(strip $(if $(findstring .json,$(call RUST_TARGET_TRIPLE)), \
 	$(basename $(notdir $(call RUST_TARGET_TRIPLE))), \
 	$(call RUST_TARGET_TRIPLE)))/$(if $(CONFIG_DEBUG_FULLOPT),release,debug)/lib$(1).a
 endef
+
+# Collect crate input files for a crate
+#
+# Usage:   $(call RUST_CARGO_SRCS,cratename,prefix)
+#
+# Inputs:
+#   cratename - Name of the Rust crate (e.g. hello)
+#   prefix    - Path prefix to the crate (e.g. path/to/project)
+#
+# Output:
+#   List of crate input files (excluding the cargo target directory)
+
+define RUST_CARGO_SRCS
+$(shell find $(2)/$(1) -type f -not -path '$(2)/$(1)/target/*' 2>/dev/null)
+endef

From e86c0b997d3ea4bd6bc339d3f556d1f15e9cbaa0 Mon Sep 17 00:00:00 2001
From: hanzj <hanzhijian@zepp.com>
Date: Thu, 4 Jun 2026 14:18:10 +0800
Subject: [PATCH 401/568] system/nxinit: skip empty lines in init.rc parser

Empty lines in init.rc caused parsing to fail with -EINVAL because init_parse_arguments() returns 0 for empty strings, triggering the 'argc < 1' error path in init_action_parse() and accessing uninitialized argv[0] in init_service_parse().

Fix by skipping empty lines and lines containing only whitespace before attempting to match section keywords or calling parser callbacks.

Fixes apache/nuttx-apps#3513

Signed-off-by: hanzj <hanzhijian@zepp.com>
---
 system/nxinit/parser.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/nxinit/parser.c b/system/nxinit/parser.c
index 3ffe4a5a6..0c91703f8 100644
--- a/system/nxinit/parser.c
+++ b/system/nxinit/parser.c
@@ -179,6 +179,16 @@ int init_parse_config_file(FAR const struct parser_s *parser,
           n -= nl - buf;
           init_debug("Line %3d: '%s'", ++line, buf);
 
+          /* Skip empty lines and lines containing only whitespace */
+
+          for (ret = 0; buf[ret] && isblank(buf[ret]); ret++);
+
+          if (buf[ret] == '\0')
+            {
+              memmove(buf, nl, n);
+              continue;
+            }
+
           for (ret = 0; parser[ret].key; ret++)
             {
               if (!strncmp(parser[ret].key, buf, strlen(parser[ret].key)))

From df01c3cbfc0adc42296583b01f58a180f50bddc2 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 16 Oct 2025 16:58:21 +0800
Subject: [PATCH 402/568] system/nxinit: Handle trailing file '\0'

When ETC_ROMFS is disabled to reduce the bin size, we can provide the init.rc
file via a pseudo-file in the boards/vendor directory. For example:
  - CONFIG_ETC_ROMFS=n
  - CONFIG_PSEUDOFS_FILE=y
  - CONFIG_DISABLE_PSEUDOFS_OPERATIONS=n
  ```C
  FAR const char *init_rc =
    "on init\n"
    "    start console\n";
    "service console sh\n"
    "    restart_period 100\n";

  int fd = open("/etc/init.d/init.rc", O_WRONLY | O_CREAT);
  /* ... */
  ssize_t n = write(fd, init_rc, strlen(init_rc) + 1);
  /* ... */
  close(fd);
  ```

The last character '\0' in the file content will be treated as a new line,
and the number of parsed parameters will be zero (abnormal, there should be
at least one keyword).

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/parser.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/nxinit/parser.c b/system/nxinit/parser.c
index 0c91703f8..11c90c00d 100644
--- a/system/nxinit/parser.c
+++ b/system/nxinit/parser.c
@@ -178,6 +178,10 @@ int init_parse_config_file(FAR const struct parser_s *parser,
           *(nl++) = '\0';
           n -= nl - buf;
           init_debug("Line %3d: '%s'", ++line, buf);
+          if (*buf == '\0')
+            {
+              continue;
+            }
 
           /* Skip empty lines and lines containing only whitespace */
 

From 3d26835e0cdb1845203d404be6cdfbd3f100ce77 Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Tue, 18 Nov 2025 22:50:15 +0800
Subject: [PATCH 403/568] system/nxinit: fix compilation errors in action.c

action.c uses clock_gettime(CLOCK_MONOTONIC, ...) but did not
pull in <nuttx/clock.h> directly, which fails to build on
configurations where the header is not transitively included.

Add the missing #include.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 system/nxinit/action.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/nxinit/action.c b/system/nxinit/action.c
index 81716e571..b677e6760 100644
--- a/system/nxinit/action.c
+++ b/system/nxinit/action.c
@@ -33,6 +33,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <unistd.h>
+#include <nuttx/clock.h>
 
 #include "action.h"
 #include "builtin.h"

From 62b74502fe28bb493c7cee7f0576aa18c6ebeeda Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Tue, 18 Nov 2025 23:02:58 +0800
Subject: [PATCH 404/568] system/nxinit: fix uninitialized 'wstatus' warning

reap_process() referenced an undeclared identifier 'wtatus' on
the WIFSIGNALED branch (typo of 'wstatus'). Some toolchains then
flagged a -Wmaybe-uninitialized on the surrounding wstatus use.

Correct the typo so WIFSIGNALED/WTERMSIG operate on the actual
wstatus value returned by waitpid().

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 system/nxinit/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index 1a542f796..978b8a63b 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -90,7 +90,7 @@ static void reap_process(FAR struct service_manager_s *sm,
           status = "status";
           ret = WEXITSTATUS(wstatus);
         }
-      else if (WIFSIGNALED(wtatus))
+      else if (WIFSIGNALED(wstatus))
         {
           status = "signal";
           ret = WTERMSIG(wstatus);

From b0fdffb7f675cfb3bcd8ebc396cd16b4f36b96bd Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 4 Dec 2025 12:30:59 +0800
Subject: [PATCH 405/568] system/nxinit: Fix timespec incomplete error in
 action.h

 /.../apps/system/nxinit/action.h:72:19: error: field 'time_run' has incomplete type
    72 |   struct timespec time_run;
       |                   ^~~~~~~~

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/action.c | 1 -
 system/nxinit/action.h | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/action.c b/system/nxinit/action.c
index b677e6760..0975682b7 100644
--- a/system/nxinit/action.c
+++ b/system/nxinit/action.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <unistd.h>
diff --git a/system/nxinit/action.h b/system/nxinit/action.h
index 672621d13..908b907b4 100644
--- a/system/nxinit/action.h
+++ b/system/nxinit/action.h
@@ -29,6 +29,8 @@
 
 #include <nuttx/list.h>
 
+#include <time.h>
+
 #include "parser.h"
 
 /****************************************************************************

From 78bf19c83c30730ae2331911a5a57f760734ee10 Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Thu, 4 Dec 2025 18:07:15 +0800
Subject: [PATCH 406/568] system/nxinit: prevent parser from reading past
 string boundry

Any string ending with whitespace passed to init_parse_arguments()
could cause the parser to advance past the string boundary and read
unintended memory content.
 - " echo "A" \0& echo "B" should be parsed
   as a command with two argvs instand of five.
 - "command arg  " may lead to uncertain results.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 system/nxinit/parser.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/parser.c b/system/nxinit/parser.c
index 11c90c00d..f88b74e69 100644
--- a/system/nxinit/parser.c
+++ b/system/nxinit/parser.c
@@ -46,7 +46,7 @@ int init_parse_arguments(FAR char *buf, bool dup, int argc, FAR char **argv)
   bool new = true;
   int i = 0;
 
-  while (*buf != '\0')
+  for (; ; )
     {
       while (isblank(*buf))
         {
@@ -91,6 +91,11 @@ int init_parse_arguments(FAR char *buf, bool dup, int argc, FAR char **argv)
             }
         }
 
+      if (*buf == '\0')
+        {
+          break;
+        }
+
       if (new)
         {
           argv[i++] = buf;

From 84d6b1276fa7ebe8ba66646690a173f13bc28e42 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Fri, 19 Dec 2025 21:54:19 +0800
Subject: [PATCH 407/568] system/nxinit: Avoid SIGCHLD race with ppoll()

Pending all signals(SIGCHLD) when ppoll() is not invoked to
avoid race conditions.

Case reproduction

  Set examples/hello as a service that exits immediately after startup.

  ```init.rc
  on boot
     start hello

  service hello hello
     restart_period 0
  ```

  Log - without this patch:

    # Service hello only restarts about 100 times, ppoll is not woken up
    # after the hello process with PID 119 exits.

    [    4.391274] [ 2] [ 0] init_main: service 'hello' pid 118 exited status 0
    [    4.401423] [ 2] [ 0] init_main: started service 'hello' pid 119

  Log - with this patch:

    # ppoll() can still be woken up normally after tens of thousands of
    # restarts of service hello in stress test.

    [  268.447747] [ 2] [ 0] init_main: service 'hello' pid 34503 exited status 0

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/init.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index 978b8a63b..cc1f18132 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -154,9 +154,19 @@ int main(int argc, FAR char *argv[])
     };
 
   struct pollfd pfds[nitems(ev)];
+  sigset_t mask;
   size_t i;
   int r;
 
+  sigfillset(&mask);
+  r = sigprocmask(SIG_BLOCK, &mask, NULL);
+  sigemptyset(&mask);
+  if (r < 0)
+    {
+      init_err("sigprocmask failed %d", errno);
+      return r;
+    }
+
 #ifdef CONFIG_USBDEV_TRACE
   usbtrace_enable(TRACE_BITSET);
 #endif
@@ -215,7 +225,7 @@ int main(int argc, FAR char *argv[])
           break;
         }
 
-      r = ppoll(pfds, nitems(pfds), MS2TIMESPEC(&timeout, t), NULL);
+      r = ppoll(pfds, nitems(pfds), MS2TIMESPEC(&timeout, t), &mask);
       if (r < 0 && errno != EINTR)
         {
           init_err("Wait event");

From 63c691eae2531e18fc2ae816c5fe3f4d3122a172 Mon Sep 17 00:00:00 2001
From: v-maomingju <v-maomingju@xiaomi.com>
Date: Mon, 22 Dec 2025 22:30:53 +0800
Subject: [PATCH 408/568] system/nxinit: fix unused variable warning

fix the unused variable warnings for name and status in init.c.

Signed-off-by: v-maomingju <v-maomingju@xiaomi.com>
---
 system/nxinit/init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/nxinit/init.c b/system/nxinit/init.c
index cc1f18132..6c7291e5e 100644
--- a/system/nxinit/init.c
+++ b/system/nxinit/init.c
@@ -78,6 +78,11 @@ static void reap_process(FAR struct service_manager_s *sm,
   int ret;
   int pid;
 
+  /* prevent unused warning */
+
+  UNUSED(name);
+  UNUSED(status);
+
   for (; ; )
     {
       pid = waitpid(-1, &wstatus, WNOHANG);

From b73a5acf92e6c840f2fb769db9b45785653ba525 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Fri, 26 Dec 2025 11:58:03 +0800
Subject: [PATCH 409/568] system/nxinit: Fix missing check for import argument

Add missing return value check for init_parse_arguments function.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/import.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/nxinit/import.c b/system/nxinit/import.c
index ca389d396..2b656c059 100644
--- a/system/nxinit/import.c
+++ b/system/nxinit/import.c
@@ -42,7 +42,13 @@ int init_import_parse(FAR const struct parser_s *parser,
 
   if (create)
     {
-      init_parse_arguments(buf, false, nitems(argv), argv);
+      ret = init_parse_arguments(buf, false, nitems(argv), argv);
+      if (ret < 2)
+        {
+          init_err("parse import: %s", buf);
+          return -EINVAL;
+        }
+
       ret = init_parse_config_file(parser, argv[1]);
       if (ret < 0)
         {

From d79d8107b3e08494e73f87df6ec6163fd6a9b5a2 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 25 Dec 2025 15:22:48 +0800
Subject: [PATCH 410/568] system/nxinit: Fix signal mask inheritance

The init process has blocked all signals, spawned services would
inherit that mask. This could cause services to miss important
signals like SIGTERM during graceful shutdown.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 system/nxinit/builtin.c | 84 +++++++++++++++++++++++++++++------------
 system/nxinit/service.c | 29 +++++++++++++-
 2 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/system/nxinit/builtin.c b/system/nxinit/builtin.c
index d300457f7..ba7a41bcf 100644
--- a/system/nxinit/builtin.c
+++ b/system/nxinit/builtin.c
@@ -183,6 +183,10 @@ static int cmd_exec(FAR struct action_manager_s *am,
 int init_builtin_run(FAR struct action_manager_s *am,
                      int argc, FAR char **argv)
 {
+  char cmd[CONFIG_SYSTEM_NXINIT_RC_LINE_MAX];
+  posix_spawnattr_t attr;
+  FAR char *args[4];
+  sigset_t mask;
   pid_t pid;
   size_t i;
   int ret;
@@ -203,35 +207,65 @@ int init_builtin_run(FAR struct action_manager_s *am,
         }
     }
 
-  ret = posix_spawnp(&pid, argv[0], NULL, NULL, argv, NULL);
+  ret = posix_spawnattr_init(&attr);
   if (ret != 0)
     {
-#ifdef CONFIG_SYSTEM_SYSTEM
-      char cmd[CONFIG_SYSTEM_NXINIT_RC_LINE_MAX];
-
-      for (i = 0, cmd[i] = '\0'; i < argc; i++)
-        {
-          strlcat(cmd, argv[i], sizeof(cmd));
-          if (i < argc - 1)
-            {
-              strcat(cmd, " ");
-            }
-        }
-
-      init_debug("Executing nsh command '%s'", cmd);
-      ret = system(cmd);
-      if (WIFEXITED(ret))
-        {
-          init_debug("NSH command '%s' exited %d", cmd, WEXITSTATUS(ret));
-          return -WEXITSTATUS(ret);
-        }
-#endif
-
-      init_err("Executing command '%s': %d", argv[0], ret);
-      init_dump_args(argc, argv);
+      init_err("posix_spawnattr_init %d", ret);
       return -ret;
     }
 
-  init_debug("Executed command '%s' pid %d", argv[0], pid);
+  ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSIGMASK);
+  if (ret != 0)
+    {
+      init_err("posix_spawnattr_setflags %d", ret);
+      posix_spawnattr_destroy(&attr);
+      return -ret;
+    }
+
+  sigemptyset(&mask);
+  ret = posix_spawnattr_setsigmask(&attr, &mask);
+  if (ret != 0)
+    {
+      init_err("posix_spawnattr_setsigmask %d", ret);
+      posix_spawnattr_destroy(&attr);
+      return -ret;
+    }
+
+  for (i = 0, cmd[i] = '\0'; i < argc; i++)
+    {
+      strlcat(cmd, argv[i], sizeof(cmd));
+      if (i < argc - 1)
+        {
+          strcat(cmd, " ");
+        }
+    }
+
+  for (; ; )
+    {
+      ret = posix_spawnp(&pid, argv[0], NULL, &attr, argv, NULL);
+      if (ret == 0)
+        {
+          init_debug("executed command '%s' pid %d", cmd, pid);
+          break;
+        }
+
+      if (!strcmp("sh", argv[0]))
+        {
+          init_err("executing command '%s': %d", cmd, ret);
+          init_dump_args(argc, argv);
+          pid = -ret;
+          break;
+        }
+
+      init_debug("command '%s': %d", argv[0], ret);
+      args[0] = "sh";
+      args[1] = "-c";
+      args[2] = cmd;
+      args[3] = NULL;
+      argc = nitems(args) - 1;
+      argv = args;
+    }
+
+  posix_spawnattr_destroy(&attr);
   return pid;
 }
diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 7f582e6e4..7e840e7e7 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -427,6 +427,8 @@ void init_service_reap(FAR struct service_s *service, int status)
 
 int init_service_start(FAR struct service_s *service)
 {
+  posix_spawnattr_t attr;
+  sigset_t mask;
   int ret;
   int pid;
 
@@ -439,8 +441,33 @@ int init_service_start(FAR struct service_s *service)
       return service->pid;
     }
 
-  ret = posix_spawnp(&pid, service->argv[2], NULL, NULL, &service->argv[2],
+  ret = posix_spawnattr_init(&attr);
+  if (ret != 0)
+    {
+      init_err("posix_spawnattr_init %d", ret);
+      return -ret;
+    }
+
+  ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSIGMASK);
+  if (ret != 0)
+    {
+      init_err("posix_spawnattr_setflags %d", ret);
+      posix_spawnattr_destroy(&attr);
+      return -ret;
+    }
+
+  sigemptyset(&mask);
+  ret = posix_spawnattr_setsigmask(&attr, &mask);
+  if (ret != 0)
+    {
+      init_err("posix_spawnattr_setsigmask %d", ret);
+      posix_spawnattr_destroy(&attr);
+      return -ret;
+    }
+
+  ret = posix_spawnp(&pid, service->argv[2], NULL, &attr, &service->argv[2],
                      environ);
+  posix_spawnattr_destroy(&attr);
   if (ret != 0)
     {
       init_err("Starting service '%s': %d", service->argv[1], ret);

From 1d7d4fe67efa14af3c1aa53fdb8ab3fdd983b778 Mon Sep 17 00:00:00 2001
From: fangpeina <fangpeina@xiaomi.com>
Date: Wed, 28 Jan 2026 19:48:25 +0800
Subject: [PATCH 411/568] system/nxinit: fix init parser to handle multiple
 quoted arguments

Fix argument parsing in init_parse_arguments() to properly handle
multiple quoted arguments like 'echo "arg1" "arg2"' by skipping
quote characters after processing them.

Signed-off-by: fangpeina <fangpeina@xiaomi.com>
---
 system/nxinit/parser.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/nxinit/parser.c b/system/nxinit/parser.c
index f88b74e69..56e15935c 100644
--- a/system/nxinit/parser.c
+++ b/system/nxinit/parser.c
@@ -82,6 +82,7 @@ int init_parse_arguments(FAR char *buf, bool dup, int argc, FAR char **argv)
           if (quote)
             {
               quote = false;
+              buf++;
             }
           else
             {

From 075863181194ffd05b6121ff7c1b3e790f75b9f6 Mon Sep 17 00:00:00 2001
From: simbit18 <simbit18@gmail.com>
Date: Fri, 5 Jun 2026 19:55:46 +0200
Subject: [PATCH 412/568] workflows/build.yml: Fix Skipping sim\windows in the
 MSVC job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix

====================================================================================
Cmake in present: sim\windows
Configuration/Tool: sim\windows
2026-06-05 16:01:37
------------------------------------------------------------------------------------
  Cleaning...
  Skipping: sim\windows
------------------------------------------------------------------------------------
End: 2026-06-05 16:01:37
====================================================================================

The "windows-latest" and “windows-2025” labels in GitHub Actions will be migrated to use Visual Studio 2026 by default. Customers needing Visual Studio 2022 must migrate to the windows-2022 image.

https://github.com/actions/runner-images/issues/14017

Signed-off-by: simbit18 <simbit18@gmail.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c159fe7ff..5c137c5be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -435,7 +435,7 @@ jobs:
   msvc:
     needs: msvc-Arch
     if: ${{ needs.msvc-Arch.outputs.skip_all_builds != '1' }}
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v6
       # Set up Python environment and install kconfiglib

From 80907e514c414d4fd8d91d079d87df5bffb8f4fe Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Fri, 5 Jun 2026 11:55:15 +0200
Subject: [PATCH 413/568] lte: make lte_initialize() build without the ALT1250
 daemon

Guard the daemon path (and is_daemon_running()) with CONFIG_MODEM_ALT1250 and
return OK from lte_initialize() when it is not set, so lapi builds and works
for kernel-resident LTE modems.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 lte/lapi/src/lapi_power.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lte/lapi/src/lapi_power.c b/lte/lapi/src/lapi_power.c
index 31ae86df0..8f5ea6c14 100644
--- a/lte/lapi/src/lapi_power.c
+++ b/lte/lapi/src/lapi_power.c
@@ -102,6 +102,7 @@ static inline void lapi_unlock(FAR sem_t *lock)
  * Name: is_daemon_running
  ****************************************************************************/
 
+#ifdef CONFIG_MODEM_ALT1250
 static bool is_daemon_running(void)
 {
   int sock;
@@ -127,6 +128,7 @@ static bool is_daemon_running(void)
 
   return is_run;
 }
+#endif /* CONFIG_MODEM_ALT1250 */
 
 /****************************************************************************
  * Public Functions
@@ -140,6 +142,15 @@ int lte_initialize(void)
 {
   int ret = 0;
 
+#ifndef CONFIG_MODEM_ALT1250
+  /* The modem backend can be kernel-resident (e.g. a built-in modem
+   * served by kernel side usrsock handler, such as the nRF91). LTE
+   * commands reach the modem directly via the SIOCLTECMD socket ioctl.
+   */
+
+  UNUSED(ret);
+  return OK;
+#else
   lapi_lock(&g_lock);
 
   if (!is_daemon_running())
@@ -178,6 +189,7 @@ int lte_initialize(void)
   lapi_unlock(&g_lock);
 
   return ret;
+#endif
 }
 
 /****************************************************************************

From 8b4d20e41189d7a66677ae057cee6dfdc9850905 Mon Sep 17 00:00:00 2001
From: hanzj <hanzhijian@zepp.com>
Date: Fri, 5 Jun 2026 19:41:14 +0800
Subject: [PATCH 414/568] system/uorb: fix listener_top not showing topic data

listener_update() only prints topic data when delta_generation is
non-zero (i.e., new data arrived since last check). In listener_top,
the first call adds objects to the list, and subsequent calls only
print if new data was published between iterations. This results in
listener_top -T showing only the header with no topic rows.

Fix by always printing the current topic state in listener_update,
setting frequency to 0 when no new data arrives. This ensures
listener_top displays all topics every iteration.

Fixes apache/nuttx-apps#3202

Signed-off-by: hanzj <hanzhijian@zepp.com>
---
 system/uorb/listener.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index 4a60b5185..e228f7daa 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -330,24 +330,25 @@ static int listener_update(FAR struct listen_list_s *objlist,
 
       delta_time       = now_time - old->timestamp;
       delta_generation = state.generation - old->generation;
+
+      unsigned long frequency = 0;
       if (delta_generation && delta_time)
         {
-          unsigned long frequency;
-
           frequency = (state.max_frequency ? state.max_frequency : 1000000)
                       * delta_generation / delta_time;
-          uorbinfo_raw("\033[K" "%-*s %2u %4" PRIu32 " %4lu "
-                       "%2" PRIu32 " %4u",
-                       ORB_MAX_PRINT_NAME,
-                       object->meta->o_name,
-                       object->instance,
-                       state.nsubscribers,
-                       frequency,
-                       state.queue_size,
-                       object->meta->o_size);
-          old->generation = state.generation;
-          old->timestamp  = now_time;
         }
+
+      uorbinfo_raw("\033[K" "%-*s %2u %4" PRIu32 " %4lu "
+                   "%2" PRIu32 " %4u",
+                   ORB_MAX_PRINT_NAME,
+                   object->meta->o_name,
+                   object->instance,
+                   state.nsubscribers,
+                   frequency,
+                   state.queue_size,
+                   object->meta->o_size);
+      old->generation = state.generation;
+      old->timestamp  = now_time;
     }
   else
     {

From 33d96e92e5bef22196e6fc98bc41763480044656 Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Mon, 1 Jun 2026 15:30:14 +0900
Subject: [PATCH 415/568] apps/tools: Enable Rust sim builds on Intel Macs

Select the Mach-O Rust target (x86_64-unknown-nuttx-macho.json) when
building Rust apps for the simulator on x86_64 macOS.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 cmake/nuttx_add_rust.cmake | 10 ++++++++--
 tools/Rust.mk              | 10 +++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index 8978c84f3..54b17255b 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -34,7 +34,8 @@ include(nuttx_parse_function_args)
 #   - riscv32: riscv32imc/imac/imafc-unknown-nuttx-elf
 #   - riscv64: riscv64imac/imafdc-unknown-nuttx-elf
 #   - x86: i686-unknown-nuttx
-#   - x86_64: x86_64-unknown-nuttx
+#   - x86_64: x86_64-unknown-nuttx-macho for sim on macOS,
+#              x86_64-unknown-nuttx otherwise
 #   - aarch64: aarch64-unknown-nuttx-macho for sim on macOS,
 #              aarch64-unknown-nuttx otherwise
 #
@@ -50,7 +51,12 @@ include(nuttx_parse_function_args)
 
 function(nuttx_rust_target_triple ARCHTYPE ABITYPE CPUTYPE OUTPUT)
   if(ARCHTYPE STREQUAL "x86_64")
-    set(TARGET_TRIPLE "${PROJECT_SOURCE_DIR}/tools/x86_64-unknown-nuttx.json")
+    if(CONFIG_ARCH_SIM AND CONFIG_HOST_MACOS)
+      set(TARGET_TRIPLE
+          "${PROJECT_SOURCE_DIR}/tools/x86_64-unknown-nuttx-macho.json")
+    else()
+      set(TARGET_TRIPLE "${PROJECT_SOURCE_DIR}/tools/x86_64-unknown-nuttx.json")
+    endif()
   elseif(ARCHTYPE STREQUAL "x86")
     set(TARGET_TRIPLE "${PROJECT_SOURCE_DIR}/tools/i486-unknown-nuttx.json")
   elseif(ARCHTYPE STREQUAL "aarch64")
diff --git a/tools/Rust.mk b/tools/Rust.mk
index 80abe2970..06b65f7c5 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -27,7 +27,8 @@
 #
 # Supported architectures and their target triples:
 #   - x86: i686-unknown-nuttx
-#   - x86_64: x86_64-unknown-nuttx
+#   - x86_64: x86_64-unknown-nuttx-macho for sim on macOS,
+#              x86_64-unknown-nuttx otherwise
 #   - armv7a: armv7a-nuttx-eabi, armv7a-nuttx-eabihf
 #   - thumbv6m: thumbv6m-nuttx-eabi
 #   - thumbv7a: thumbv7a-nuttx-eabi, thumbv7a-nuttx-eabihf
@@ -49,13 +50,16 @@
 define RUST_TARGET_TRIPLE
 $(or \
   $(and $(filter x86_64,$(LLVM_ARCHTYPE)), \
-    $(TOPDIR)/tools/x86_64-unknown-nuttx.json \
+    $(if $(and $(filter y,$(CONFIG_ARCH_SIM)),$(filter y,$(CONFIG_HOST_MACOS))), \
+      $(TOPDIR)/tools/x86_64-unknown-nuttx-macho.json, \
+      $(TOPDIR)/tools/x86_64-unknown-nuttx.json \
+    ) \
   ), \
   $(and $(filter x86,$(LLVM_ARCHTYPE)), \
     $(TOPDIR)/tools/i486-unknown-nuttx.json \
   ), \
   $(and $(filter aarch64,$(LLVM_ARCHTYPE)), \
-    $(if $(and $(filter sim,$(CONFIG_ARCH)),$(filter y,$(CONFIG_HOST_MACOS))), \
+    $(if $(and $(filter y,$(CONFIG_ARCH_SIM)),$(filter y,$(CONFIG_HOST_MACOS))), \
       $(TOPDIR)/tools/aarch64-unknown-nuttx-macho.json, \
       $(TOPDIR)/tools/aarch64-unknown-nuttx.json \
     ) \

From 8b43c71595aa6fdf311910260dde8645ec743dd5 Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Sun, 7 Jun 2026 22:14:21 -0300
Subject: [PATCH 416/568] examples/rng90: add RNG90 example

Add a new RNG90 example application that opens the RNG90 character device, reads random bytes, and prints them in hexadecimal format.

The example supports optional command-line arguments for device path and byte count and integrates with Kconfig, Make, and CMake build flows.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 examples/rng90/CMakeLists.txt |  35 ++++++++
 examples/rng90/Kconfig        |  37 ++++++++
 examples/rng90/Make.defs      |  25 ++++++
 examples/rng90/Makefile       |  36 ++++++++
 examples/rng90/rng90_main.c   | 162 ++++++++++++++++++++++++++++++++++
 5 files changed, 295 insertions(+)
 create mode 100644 examples/rng90/CMakeLists.txt
 create mode 100644 examples/rng90/Kconfig
 create mode 100644 examples/rng90/Make.defs
 create mode 100644 examples/rng90/Makefile
 create mode 100644 examples/rng90/rng90_main.c

diff --git a/examples/rng90/CMakeLists.txt b/examples/rng90/CMakeLists.txt
new file mode 100644
index 000000000..65cda8f30
--- /dev/null
+++ b/examples/rng90/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/examples/rng90/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_RNG90)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_RNG90_PROGNAME}
+    PRIORITY
+    ${CONFIG_EXAMPLES_RNG90_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_RNG90_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_RNG90}
+    SRCS
+    rng90_main.c)
+endif()
diff --git a/examples/rng90/Kconfig b/examples/rng90/Kconfig
new file mode 100644
index 000000000..86f1c0660
--- /dev/null
+++ b/examples/rng90/Kconfig
@@ -0,0 +1,37 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_RNG90
+	tristate "Microchip RNG90 TRNG example"
+	default n
+	depends on DEV_RNG90
+	---help---
+		Enable the RNG90 example.  It opens the RNG90 character device,
+		runs the built-in self-test and reads random bytes from it.
+
+if EXAMPLES_RNG90
+
+config EXAMPLES_RNG90_PROGNAME
+	string "Program name"
+	default "rng90"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config EXAMPLES_RNG90_DEVPATH
+	string "RNG90 device path"
+	default "/dev/rng0"
+	---help---
+		The default path of the RNG90 character device.
+
+config EXAMPLES_RNG90_PRIORITY
+	int "RNG90 task priority"
+	default 100
+
+config EXAMPLES_RNG90_STACKSIZE
+	int "RNG90 stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/examples/rng90/Make.defs b/examples/rng90/Make.defs
new file mode 100644
index 000000000..b2b20b4ba
--- /dev/null
+++ b/examples/rng90/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/rng90/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_RNG90),)
+CONFIGURED_APPS += $(APPDIR)/examples/rng90
+endif
diff --git a/examples/rng90/Makefile b/examples/rng90/Makefile
new file mode 100644
index 000000000..6905cb569
--- /dev/null
+++ b/examples/rng90/Makefile
@@ -0,0 +1,36 @@
+############################################################################
+# apps/examples/rng90/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Microchip RNG90 TRNG example built-in application info
+
+PROGNAME = $(CONFIG_EXAMPLES_RNG90_PROGNAME)
+PRIORITY = $(CONFIG_EXAMPLES_RNG90_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_RNG90_STACKSIZE)
+MODULE = $(CONFIG_EXAMPLES_RNG90)
+
+# Microchip RNG90 TRNG example
+
+MAINSRC = rng90_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/rng90/rng90_main.c b/examples/rng90/rng90_main.c
new file mode 100644
index 000000000..3ef3ec899
--- /dev/null
+++ b/examples/rng90/rng90_main.c
@@ -0,0 +1,162 @@
+/****************************************************************************
+ * apps/examples/rng90/rng90_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <nuttx/crypto/rng90.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_EXAMPLES_RNG90_DEVPATH
+#  define CONFIG_EXAMPLES_RNG90_DEVPATH "/dev/rng0"
+#endif
+
+#define RNG90_MAX_BYTES 32
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: print_hex
+ *
+ * Description:
+ *   Dump a buffer as a hex string, 16 bytes per line.
+ *
+ ****************************************************************************/
+
+static void print_hex(FAR const uint8_t *buf, size_t len)
+{
+  size_t i;
+
+  for (i = 0; i < len; i++)
+    {
+      printf("%02x", buf[i]);
+      if ((i & 0x0f) == 0x0f)
+        {
+          printf("\n");
+        }
+      else
+        {
+          printf(" ");
+        }
+    }
+
+  if ((len & 0x0f) != 0)
+    {
+      printf("\n");
+    }
+}
+
+/****************************************************************************
+ * Name: usage
+ ****************************************************************************/
+
+static void usage(FAR const char *progname)
+{
+  printf("Usage: %s [<devpath>] [<count>]\n", progname);
+  printf("  <devpath>  RNG90 device (default %s)\n",
+         CONFIG_EXAMPLES_RNG90_DEVPATH);
+  printf("  <count>    number of random bytes to read, 1..%d (default %d)\n",
+         RNG90_MAX_BYTES, RNG90_MAX_BYTES);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * rng90_main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR const char *devpath = CONFIG_EXAMPLES_RNG90_DEVPATH;
+  int count = RNG90_MAX_BYTES;
+  uint8_t buf[RNG90_MAX_BYTES];
+  int fd;
+  int ret;
+
+  /* Parse the optional command line arguments */
+
+  if (argc > 1)
+    {
+      if (argv[1][0] == '-')
+        {
+          usage(argv[0]);
+          return EXIT_FAILURE;
+        }
+
+      devpath = argv[1];
+    }
+
+  if (argc > 2)
+    {
+      count = atoi(argv[2]);
+      if (count < 1 || count > RNG90_MAX_BYTES)
+        {
+          printf("Invalid count %d, clamping to %d\n", count,
+                 RNG90_MAX_BYTES);
+          count = RNG90_MAX_BYTES;
+        }
+    }
+
+  /* Opening the device wakes the RNG90 up; closing puts it to sleep. */
+
+  fd = open(devpath, O_RDONLY);
+  if (fd < 0)
+    {
+      printf("ERROR: Failed to open %s: %d\n", devpath, errno);
+      return EXIT_FAILURE;
+    }
+
+  printf("RNG90 example: device %s\n", devpath);
+
+  /* Read random bytes from the device */
+
+  ret = read(fd, buf, (size_t)count);
+  if (ret < 0)
+    {
+      printf("ERROR: read failed: %d\n", errno);
+      close(fd);
+      return EXIT_FAILURE;
+    }
+
+  printf("Read %d random byte(s):\n", ret);
+  print_hex(buf, (size_t)ret);
+
+  close(fd);
+  return EXIT_SUCCESS;
+}

From 03171162f1f5d3444557863a268930dba49dac9a Mon Sep 17 00:00:00 2001
From: hanzhijian <hanzhijian@zepp.com>
Date: Fri, 5 Jun 2026 23:56:48 +0800
Subject: [PATCH 417/568] system/uorb: introduce CONFIG_UORB_FORMAT for format
 string control

Introduce a new CONFIG_UORB_FORMAT Kconfig option to control whether
uORB format strings are compiled in. UORB_LISTENER, UORB_GENERATOR,
and DEBUG_UORB all select UORB_FORMAT automatically, so format strings
are included when any of these features are enabled.

This replaces the previous approach of guarding format strings with
CONFIG_DEBUG_UORB, which prevented uorb_listener from displaying
sensor data when debug output was disabled.

Signed-off-by: hanzhijian <hanzhijian@zepp.com>
---
 system/uorb/Kconfig               |  7 +++++++
 system/uorb/listener.c            | 10 +++++-----
 system/uorb/sensor/accel.c        |  2 +-
 system/uorb/sensor/angle.c        |  2 +-
 system/uorb/sensor/baro.c         |  2 +-
 system/uorb/sensor/cap.c          |  2 +-
 system/uorb/sensor/co2.c          |  2 +-
 system/uorb/sensor/dust.c         |  2 +-
 system/uorb/sensor/ecg.c          |  2 +-
 system/uorb/sensor/eng.c          |  2 +-
 system/uorb/sensor/force.c        |  2 +-
 system/uorb/sensor/gas.c          |  2 +-
 system/uorb/sensor/gesture.c      |  2 +-
 system/uorb/sensor/gnss.c         |  2 +-
 system/uorb/sensor/gyro.c         |  2 +-
 system/uorb/sensor/hall.c         |  2 +-
 system/uorb/sensor/hbeat.c        |  2 +-
 system/uorb/sensor/hcho.c         |  2 +-
 system/uorb/sensor/hrate.c        |  2 +-
 system/uorb/sensor/humi.c         |  2 +-
 system/uorb/sensor/impd.c         |  2 +-
 system/uorb/sensor/ir.c           |  2 +-
 system/uorb/sensor/light.c        |  2 +-
 system/uorb/sensor/mag.c          |  2 +-
 system/uorb/sensor/motion.c       |  2 +-
 system/uorb/sensor/noise.c        |  2 +-
 system/uorb/sensor/ots.c          |  2 +-
 system/uorb/sensor/ph.c           |  2 +-
 system/uorb/sensor/pm10.c         |  2 +-
 system/uorb/sensor/pm1p0.c        |  2 +-
 system/uorb/sensor/pm25.c         |  2 +-
 system/uorb/sensor/pose_6dof.c    |  2 +-
 system/uorb/sensor/ppgd.c         |  2 +-
 system/uorb/sensor/ppgq.c         |  2 +-
 system/uorb/sensor/prox.c         |  2 +-
 system/uorb/sensor/rgb.c          |  2 +-
 system/uorb/sensor/rotation.c     |  2 +-
 system/uorb/sensor/step_counter.c |  2 +-
 system/uorb/sensor/temp.c         |  2 +-
 system/uorb/sensor/tvoc.c         |  2 +-
 system/uorb/sensor/uv.c           |  2 +-
 system/uorb/test/utility.c        |  2 +-
 system/uorb/uORB/uORB.c           |  2 +-
 system/uorb/uORB/uORB.h           |  8 ++++----
 44 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/system/uorb/Kconfig b/system/uorb/Kconfig
index 674317a38..71f06e504 100644
--- a/system/uorb/Kconfig
+++ b/system/uorb/Kconfig
@@ -18,12 +18,18 @@ config UORB_STACKSIZE
 	int "stack size"
 	default DEFAULT_TASK_STACKSIZE
 
+config UORB_FORMAT
+	bool
+	default n
+
 config UORB_LISTENER
 	bool "uorb listener"
+	select UORB_FORMAT
 	default n
 
 config UORB_GENERATOR
 	bool "uorb generator"
+	select UORB_FORMAT
 	default n
 
 config UORB_TESTS
@@ -46,6 +52,7 @@ endif # UORB_TESTS
 config DEBUG_UORB
 	bool "uorb debug output"
 	select LIBC_PRINT_EXTENSION
+	select UORB_FORMAT
 	depends on LIBC_FLOATINGPOINT && SENSORS_USE_FLOAT
 	default n
 
diff --git a/system/uorb/listener.c b/system/uorb/listener.c
index e228f7daa..2fd1e532d 100644
--- a/system/uorb/listener.c
+++ b/system/uorb/listener.c
@@ -49,7 +49,7 @@
 #define ORB_TOP_WAIT_TIME  1000
 #define ORB_DATA_DIR       "/data/uorb/"
 
-#if defined(CONFIG_DEBUG_UORB) && !defined(CONFIG_LIBC_FLOATINGPOINT)
+#if defined(CONFIG_UORB_FORMAT) && !defined(CONFIG_LIBC_FLOATINGPOINT)
 #error "Enable CONFIG_LIBC_FLOATINGPOINT, required to see debug output"
 #endif
 
@@ -552,7 +552,7 @@ static int listener_print(FAR const struct orb_metadata *meta, int fd)
   int ret;
 
   ret = orb_copy(meta, fd, buffer);
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
   if (ret == OK && meta->o_format != NULL)
     {
       orb_info(meta->o_format, meta->o_name, buffer);
@@ -775,7 +775,7 @@ static int listener_record(FAR const struct orb_metadata *meta, int fd,
   int ret;
 
   ret = orb_copy(meta, fd, buffer);
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
   if (ret == OK && meta->o_format != NULL)
     {
       ret = orb_fprintf(file, meta->o_format, buffer);
@@ -877,7 +877,7 @@ static void listener_monitor(FAR struct listen_list_s *objlist,
           tmp->file = fopen(path, "w");
           if (tmp->file != NULL)
             {
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
               fprintf(tmp->file, "%s,%d,%d,%s\n", tmp->object.meta->o_format,
                       tmp->object.meta->o_size, tmp->object.instance,
                       tmp->object.meta->o_name);
@@ -1130,7 +1130,7 @@ int main(int argc, FAR char *argv[])
             }
           break;
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
         case 's':
           record = true;
           break;
diff --git a/system/uorb/sensor/accel.c b/system/uorb/sensor/accel.c
index f2c67a34d..b71839bbb 100644
--- a/system/uorb/sensor/accel.c
+++ b/system/uorb/sensor/accel.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_accel_format[] =
   "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,temperature:%hf";
 
diff --git a/system/uorb/sensor/angle.c b/system/uorb/sensor/angle.c
index e80404142..9f6e4d562 100644
--- a/system/uorb/sensor/angle.c
+++ b/system/uorb/sensor/angle.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_angle_format[] = "timestamp:%" PRIu64 ",angle:%hf";
 #endif
 
diff --git a/system/uorb/sensor/baro.c b/system/uorb/sensor/baro.c
index d56cc9b87..0f86d1cb2 100644
--- a/system/uorb/sensor/baro.c
+++ b/system/uorb/sensor/baro.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_baro_format[] =
   "timestamp:%" PRIu64 ",pressure:%hf,temperature:%hf";
 #endif
diff --git a/system/uorb/sensor/cap.c b/system/uorb/sensor/cap.c
index b0e662160..d95d94910 100644
--- a/system/uorb/sensor/cap.c
+++ b/system/uorb/sensor/cap.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_cap_format[] =
   "timestamp:%" PRIu64 ",status:%" PRIu32 ",rawdata0:%" PRIu32 ","
   "rawdata1:%" PRIu32 ",rawdata2:%" PRIu32 ",rawdata3:%" PRIu32 "";
diff --git a/system/uorb/sensor/co2.c b/system/uorb/sensor/co2.c
index 50a5bf931..214155a4f 100644
--- a/system/uorb/sensor/co2.c
+++ b/system/uorb/sensor/co2.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_co2_format[] = "timestamp:%" PRIu64 ",co2:%hf";
 #endif
 
diff --git a/system/uorb/sensor/dust.c b/system/uorb/sensor/dust.c
index 7e5097eb6..de6e1a1af 100644
--- a/system/uorb/sensor/dust.c
+++ b/system/uorb/sensor/dust.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_dust_format[] = "timestamp:%" PRIu64 ",dust:%hf";
 #endif
 
diff --git a/system/uorb/sensor/ecg.c b/system/uorb/sensor/ecg.c
index 7fbc4b6ca..f2d1e192e 100644
--- a/system/uorb/sensor/ecg.c
+++ b/system/uorb/sensor/ecg.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_ecg_format[] =
   "timestamp:%" PRIu64 ",ecg:%hf,status:%" PRIx32 "";
 #endif
diff --git a/system/uorb/sensor/eng.c b/system/uorb/sensor/eng.c
index afc712aec..403bd1c47 100644
--- a/system/uorb/sensor/eng.c
+++ b/system/uorb/sensor/eng.c
@@ -28,7 +28,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_eng_format[] =
   "timestamp:%" PRIu64 ",eng0:%hf,eng1:%hf,eng2:%hf,eng3:%hf,"
   "status:0x%" PRIx32 "";
diff --git a/system/uorb/sensor/force.c b/system/uorb/sensor/force.c
index ed03c4801..caf8b93e4 100644
--- a/system/uorb/sensor/force.c
+++ b/system/uorb/sensor/force.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_force_format[] =
   "timestamp:%" PRIu64 ",force:%hf,event:%" PRIi32 "";
 #endif
diff --git a/system/uorb/sensor/gas.c b/system/uorb/sensor/gas.c
index 24e10076d..9b43fa578 100644
--- a/system/uorb/sensor/gas.c
+++ b/system/uorb/sensor/gas.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_gas_format[] =
   "timestamp:%" PRIu64 ",gas_resistance:%hf";
 #endif
diff --git a/system/uorb/sensor/gesture.c b/system/uorb/sensor/gesture.c
index 0848b6fbb..8a282d554 100644
--- a/system/uorb/sensor/gesture.c
+++ b/system/uorb/sensor/gesture.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_gesture_format[] =
   "timestamp:%" PRIu64 ",event:%" PRIu32 "";
 #endif
diff --git a/system/uorb/sensor/gnss.c b/system/uorb/sensor/gnss.c
index 18720cfb6..1289c590b 100644
--- a/system/uorb/sensor/gnss.c
+++ b/system/uorb/sensor/gnss.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 #define UORB_DEBUG_FORMAT_SENSOR_GNSS     \
   "timestamp:%" PRIu64                    \
   ",time_utc:%" PRIu64                    \
diff --git a/system/uorb/sensor/gyro.c b/system/uorb/sensor/gyro.c
index d1988f56d..ba45d4d71 100644
--- a/system/uorb/sensor/gyro.c
+++ b/system/uorb/sensor/gyro.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_gyro_format[] =
   "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,temperature:%hf";
 #endif
diff --git a/system/uorb/sensor/hall.c b/system/uorb/sensor/hall.c
index ab58b712b..fca57c072 100644
--- a/system/uorb/sensor/hall.c
+++ b/system/uorb/sensor/hall.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_hall_format[] =
   "timestamp:%" PRIu64 ",hall:%" PRIi32 "";
 #endif
diff --git a/system/uorb/sensor/hbeat.c b/system/uorb/sensor/hbeat.c
index 77e3abb27..cc3136e7c 100644
--- a/system/uorb/sensor/hbeat.c
+++ b/system/uorb/sensor/hbeat.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_hbeat_format[] =
   "timestamp:%" PRIu64 ",heart beat:%hf";
 #endif
diff --git a/system/uorb/sensor/hcho.c b/system/uorb/sensor/hcho.c
index 64db42f7f..1d58b8e54 100644
--- a/system/uorb/sensor/hcho.c
+++ b/system/uorb/sensor/hcho.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_hcho_format[] = "timestamp:%" PRIu64 ",hcho:%hf";
 #endif
 
diff --git a/system/uorb/sensor/hrate.c b/system/uorb/sensor/hrate.c
index 8616d88e1..9056a80ee 100644
--- a/system/uorb/sensor/hrate.c
+++ b/system/uorb/sensor/hrate.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_hrate_format[] = "timestamp:%" PRIu64 ",bpm:%hf";
 #endif
 
diff --git a/system/uorb/sensor/humi.c b/system/uorb/sensor/humi.c
index 951114413..25bc62977 100644
--- a/system/uorb/sensor/humi.c
+++ b/system/uorb/sensor/humi.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_humi_format[] = "timestamp:%" PRIu64 ",humi:%hf";
 #endif
 
diff --git a/system/uorb/sensor/impd.c b/system/uorb/sensor/impd.c
index b398694ae..d30747cbf 100644
--- a/system/uorb/sensor/impd.c
+++ b/system/uorb/sensor/impd.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_impd_format[] =
   "timestamp:%" PRIu64 ",real:%hf,imaginary:%hf";
 #endif
diff --git a/system/uorb/sensor/ir.c b/system/uorb/sensor/ir.c
index a06f624c4..ae7a9516f 100644
--- a/system/uorb/sensor/ir.c
+++ b/system/uorb/sensor/ir.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_ir_format[] = "timestamp:%" PRIu64 ",ir:%hf";
 #endif
 
diff --git a/system/uorb/sensor/light.c b/system/uorb/sensor/light.c
index 58b031a30..e98ad7e9a 100644
--- a/system/uorb/sensor/light.c
+++ b/system/uorb/sensor/light.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_light_format[] =
   "timestamp:%" PRIu64 ",light:%hf,ir:%hf";
 #endif
diff --git a/system/uorb/sensor/mag.c b/system/uorb/sensor/mag.c
index 97077975b..aa16dd08d 100644
--- a/system/uorb/sensor/mag.c
+++ b/system/uorb/sensor/mag.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_mag_format[] =
   "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,temperature:%hf,"
   "status:%" PRId32 "";
diff --git a/system/uorb/sensor/motion.c b/system/uorb/sensor/motion.c
index 773e39edd..1d4b18649 100644
--- a/system/uorb/sensor/motion.c
+++ b/system/uorb/sensor/motion.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_event_format[] =
   "timestamp:%" PRIu64 ",event:%" PRIu32 "";
 #endif
diff --git a/system/uorb/sensor/noise.c b/system/uorb/sensor/noise.c
index bcb1fa25c..92ba9a892 100644
--- a/system/uorb/sensor/noise.c
+++ b/system/uorb/sensor/noise.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_noise_format[] =
   "timestamp:%" PRIu64 ",noise:%hf";
 #endif
diff --git a/system/uorb/sensor/ots.c b/system/uorb/sensor/ots.c
index b808a23cf..e2b48e8af 100644
--- a/system/uorb/sensor/ots.c
+++ b/system/uorb/sensor/ots.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_ots_format[] =
   "timestamp:%" PRIu64 ",x:%" PRIi32 ",y:%" PRIi32 "";
 #endif
diff --git a/system/uorb/sensor/ph.c b/system/uorb/sensor/ph.c
index c85042091..af830a491 100644
--- a/system/uorb/sensor/ph.c
+++ b/system/uorb/sensor/ph.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_ph_format[] = "timestamp:%" PRIu64 ",ph:%hf";
 #endif
 
diff --git a/system/uorb/sensor/pm10.c b/system/uorb/sensor/pm10.c
index b7feb5290..9dec9b082 100644
--- a/system/uorb/sensor/pm10.c
+++ b/system/uorb/sensor/pm10.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_pm10_format[] = "timestamp:%" PRIu64 ",pm10:%hf";
 #endif
 
diff --git a/system/uorb/sensor/pm1p0.c b/system/uorb/sensor/pm1p0.c
index ad8476e40..ff4011a4a 100644
--- a/system/uorb/sensor/pm1p0.c
+++ b/system/uorb/sensor/pm1p0.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_pm1p0_format[] = "timestamp:%" PRIu64 ",pm1p0:%hf";
 #endif
 
diff --git a/system/uorb/sensor/pm25.c b/system/uorb/sensor/pm25.c
index 3e4890369..96fce3f6f 100644
--- a/system/uorb/sensor/pm25.c
+++ b/system/uorb/sensor/pm25.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_pm25_format[] = "timestamp:%" PRIu64 ",pm25:%hf";
 #endif
 
diff --git a/system/uorb/sensor/pose_6dof.c b/system/uorb/sensor/pose_6dof.c
index 9eb4395d3..e9b24a582 100644
--- a/system/uorb/sensor/pose_6dof.c
+++ b/system/uorb/sensor/pose_6dof.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_pose_6dof_format[] =
   "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,w:%hf,tx:%hf,ty:%hf,tz:%hf,"
   "dx:%hf,dy:%hf,dz:%hf,dw:%hf,dtx:%hf,dty:%hf,dtz:%hf,number:%" PRIu64 "";
diff --git a/system/uorb/sensor/ppgd.c b/system/uorb/sensor/ppgd.c
index c547f0d4e..550d30bf3 100644
--- a/system/uorb/sensor/ppgd.c
+++ b/system/uorb/sensor/ppgd.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_ppgd_format[] =
   "timestamp:%" PRIu64 ",ppg0:%" PRIu32 ",ppg1:%" PRIu32 ","
   "current:%" PRIu32 ",gain0:%hu,gain1:%hu";
diff --git a/system/uorb/sensor/ppgq.c b/system/uorb/sensor/ppgq.c
index 13bcf1761..4b9f9fcc5 100644
--- a/system/uorb/sensor/ppgq.c
+++ b/system/uorb/sensor/ppgq.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_ppgq_format[] =
   "timestamp:%" PRIu64 ",ppg0:%" PRIu32 ",ppg1:%" PRIu32 ",ppg2:%" PRIu32 ","
   "ppg3:%" PRIu32 ",current:%" PRIu32 ",gain0:%hu,gain1:%hu,gain2:%hu,"
diff --git a/system/uorb/sensor/prox.c b/system/uorb/sensor/prox.c
index ebe906268..7cdf6568c 100644
--- a/system/uorb/sensor/prox.c
+++ b/system/uorb/sensor/prox.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_prox_format[] =
   "timestamp:%" PRIu64 ",proximity:%hf";
 #endif
diff --git a/system/uorb/sensor/rgb.c b/system/uorb/sensor/rgb.c
index 658bfe4bd..098dc0bc7 100644
--- a/system/uorb/sensor/rgb.c
+++ b/system/uorb/sensor/rgb.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_rgb_format[] =
   "timestamp:%" PRIu64 ",r:%hf,g:%hf,b:%hf";
 #endif
diff --git a/system/uorb/sensor/rotation.c b/system/uorb/sensor/rotation.c
index 03b9a4abb..ac3ae79cb 100644
--- a/system/uorb/sensor/rotation.c
+++ b/system/uorb/sensor/rotation.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_rotation_format[] =
   "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf";
 static const char sensor_orientation_format[] =
diff --git a/system/uorb/sensor/step_counter.c b/system/uorb/sensor/step_counter.c
index 706b4f6a6..2576c946b 100644
--- a/system/uorb/sensor/step_counter.c
+++ b/system/uorb/sensor/step_counter.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_step_counter_format[] =
   "timestamp:%" PRIu64 ",event:%" PRIu32 ",cadence:%" PRIu32 "";
 #endif
diff --git a/system/uorb/sensor/temp.c b/system/uorb/sensor/temp.c
index 8c8153e83..63545b312 100644
--- a/system/uorb/sensor/temp.c
+++ b/system/uorb/sensor/temp.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_temp_format[] =
   "timestamp:%" PRIu64 ",temperature:%hf";
 #endif
diff --git a/system/uorb/sensor/tvoc.c b/system/uorb/sensor/tvoc.c
index 8fa7a1629..c772e1200 100644
--- a/system/uorb/sensor/tvoc.c
+++ b/system/uorb/sensor/tvoc.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_tvoc_format[] = "timestamp:%" PRIu64 ",tvoc:%hf";
 #endif
 
diff --git a/system/uorb/sensor/uv.c b/system/uorb/sensor/uv.c
index 748eafea3..aa57dd60f 100644
--- a/system/uorb/sensor/uv.c
+++ b/system/uorb/sensor/uv.c
@@ -30,7 +30,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char sensor_uv_format[] = "timestamp:%" PRIu64 ",uvi:%hf";
 #endif
 
diff --git a/system/uorb/test/utility.c b/system/uorb/test/utility.c
index 6e36edf2f..3f90c6c7b 100644
--- a/system/uorb/test/utility.c
+++ b/system/uorb/test/utility.c
@@ -33,7 +33,7 @@
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 static const char orb_test_format[] =
   "timestamp:%" PRIu64 ",val:%" PRId32 "";
 #endif
diff --git a/system/uorb/uORB/uORB.c b/system/uorb/uORB/uORB.c
index 6fcc060c2..77589cbe3 100644
--- a/system/uorb/uORB/uORB.c
+++ b/system/uorb/uORB/uORB.c
@@ -372,7 +372,7 @@ int orb_group_count(FAR const struct orb_metadata *meta)
   return instance;
 }
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 int orb_sscanf(FAR const char *buf, FAR const char *format, FAR void *data)
 {
   struct lib_meminstream_s meminstream;
diff --git a/system/uorb/uORB/uORB.h b/system/uorb/uORB/uORB.h
index e30c52fdd..0df42707a 100644
--- a/system/uorb/uORB/uORB.h
+++ b/system/uorb/uORB/uORB.h
@@ -57,7 +57,7 @@ struct orb_metadata
 {
   FAR const char   *o_name;     /* Unique object name */
   uint16_t          o_size;     /* Object size */
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
   FAR const char   *o_format;   /* Format string used for structure input and
                                  * output.
                                  */
@@ -165,7 +165,7 @@ struct orb_loop_s
 #  define uorbinfo             uorbnone
 #endif
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 #  define uorbdebug(fmt, ...)  syslog(LOG_INFO, fmt "\n", ##__VA_ARGS__)
 #else
 #  define uorbdebug            uorbnone
@@ -207,7 +207,7 @@ struct orb_loop_s
  * struct  The structure the topic provides.
  * cb      The function pointer of output topic message.
  */
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 #define ORB_DEFINE(name, structure, format) \
   const struct orb_metadata g_orb_##name = \
   { \
@@ -898,7 +898,7 @@ int orb_group_count(FAR const struct orb_metadata *meta);
 
 FAR const struct orb_metadata *orb_get_meta(FAR const char *name);
 
-#ifdef CONFIG_DEBUG_UORB
+#ifdef CONFIG_UORB_FORMAT
 /****************************************************************************
  * Name: orb_scanf
  *

From fa2dd70386be572446d2dad5bd8ed8b56431429d Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 3 Jun 2026 09:54:17 +0800
Subject: [PATCH 418/568] system/popen: Avoid copying FILE

Use fopencookie() to attach the popen fd and shell pid to the returned FILE stream instead of copying FILE into the popen container.

Keep the upstream dpopen()/dpclose() implementation as the process and descriptor backend, and make pclose() close the cookie-backed stream directly.

Fixes #2937.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 system/popen/popen.c | 104 +++++++++++++++++++++++++++++--------------
 1 file changed, 70 insertions(+), 34 deletions(-)

diff --git a/system/popen/popen.c b/system/popen/popen.c
index 4f46e6cd2..f4fdfab94 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -37,17 +37,65 @@
  * Private Types
  ****************************************************************************/
 
-/* struct popen_file_s is a cast compatible version of FILE that contains
- * the additional PID of the shell processes needed by pclose().
- */
-
 struct popen_file_s
 {
-  FILE copy;
-  FILE *original;
+  int fd;
   pid_t shell;
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: popen_file_read
+ ****************************************************************************/
+
+static ssize_t popen_file_read(FAR void *cookie, FAR char *buf,
+                               size_t size)
+{
+  FAR struct popen_file_s *filep = (FAR struct popen_file_s *)cookie;
+
+  return read(filep->fd, buf, size);
+}
+
+/****************************************************************************
+ * Name: popen_file_write
+ ****************************************************************************/
+
+static ssize_t popen_file_write(FAR void *cookie, FAR const char *buf,
+                                size_t size)
+{
+  FAR struct popen_file_s *filep = (FAR struct popen_file_s *)cookie;
+
+  return write(filep->fd, buf, size);
+}
+
+/****************************************************************************
+ * Name: popen_file_seek
+ ****************************************************************************/
+
+static off_t popen_file_seek(FAR void *cookie, FAR off_t *offset,
+                             int whence)
+{
+  set_errno(ESPIPE);
+  return ERROR;
+}
+
+/****************************************************************************
+ * Name: popen_file_close
+ ****************************************************************************/
+
+static int popen_file_close(FAR void *cookie)
+{
+  FAR struct popen_file_s *filep = (FAR struct popen_file_s *)cookie;
+  int ret;
+
+  ret = dpclose(filep->fd, filep->shell);
+  free(filep);
+  return ret < 0 ? ERROR : OK;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -93,6 +141,15 @@ struct popen_file_s
 FILE *popen(FAR const char *command, FAR const char *mode)
 {
   FAR struct popen_file_s *container;
+  FAR FILE *stream;
+  cookie_io_functions_t popen_io =
+    {
+      .read  = popen_file_read,
+      .write = popen_file_write,
+      .seek  = popen_file_seek,
+      .close = popen_file_close
+    };
+
   int oflag;
   int fd;
 
@@ -142,8 +199,9 @@ FILE *popen(FAR const char *command, FAR const char *mode)
 
   /* Wrap the raw fd in a FILE stream */
 
-  container->original = fdopen(fd, mode);
-  if (container->original == NULL)
+  container->fd = fd;
+  stream = fopencookie(container, mode, popen_io);
+  if (stream == NULL)
     {
       int errcode = errno;
       dpclose(fd, container->shell);
@@ -152,8 +210,7 @@ FILE *popen(FAR const char *command, FAR const char *mode)
       return NULL;
     }
 
-  memcpy(&container->copy, container->original, sizeof(FILE));
-  return &container->copy;
+  return stream;
 }
 
 /****************************************************************************
@@ -193,33 +250,12 @@ FILE *popen(FAR const char *command, FAR const char *mode)
  *   stream - The stream reference returned by a previous call to popen()
  *
  * Returned Value:
- *   The child termination status on success, or -1 (ERROR) on failure
- *   with errno set.
+ *   Zero (OK) is returned on success; otherwise -1 (ERROR) is returned and
+ *   errno is set appropriately.
  *
  ****************************************************************************/
 
 int pclose(FILE *stream)
 {
-  FAR struct popen_file_s *container = (FAR struct popen_file_s *)stream;
-  FILE *original;
-  pid_t shell;
-
-  original = container->original;
-
-  /* Set the state of the original file descriptor to the state of the
-   * working copy
-   */
-
-  memcpy(original, &container->copy, sizeof(FILE));
-
-  /* Then close the original and free the container (saving the PID of the
-   * shell process).  Pass -1 to dpclose since fclose already closed the fd.
-   */
-
-  fclose(original);
-
-  shell = container->shell;
-  free(container);
-
-  return dpclose(-1, shell);
+  return fclose(stream);
 }

From 499352fb0c2de46113001ab8abd1194531969c30 Mon Sep 17 00:00:00 2001
From: Peter Barada <peter.barada@gmail.com>
Date: Tue, 2 Jun 2026 19:42:55 -0400
Subject: [PATCH 419/568] testing/drivers/hash: Add unaligned buffer size test

Add hash testing of unaligned buffer sizes via multiple call to
ioctl(CIOCCRYPT) in a single session with buffer sizes incrementally
increasing from zero size to 255 (with monotoncially increasing
byte value data) to force all sizes to be handled by cryptodev
implementations.

Signed-off-by: Peter Barada <peter.barada@gmail.com>
---
 testing/drivers/crypto/Kconfig |  29 +++++
 testing/drivers/crypto/hash.c  | 207 ++++++++++++++++++++++++++++++++-
 2 files changed, 230 insertions(+), 6 deletions(-)

diff --git a/testing/drivers/crypto/Kconfig b/testing/drivers/crypto/Kconfig
index 83d10889b..4ceea2738 100644
--- a/testing/drivers/crypto/Kconfig
+++ b/testing/drivers/crypto/Kconfig
@@ -36,6 +36,10 @@ config TESTING_CRYPTO_HASH_HUGE_BLOCK
 	bool "hash huge block crypto test"
 	default y
 
+config TESTING_CRYPTO_HASH_UNALIGNED_BUFFER_SIZE
+	bool "hash unaligned buffer size test"
+	default y
+
 config TESTING_CRYPTO_HASH_DISABLE_MD5
 	bool "disable md5 tests"
 	default n
@@ -56,6 +60,31 @@ config TESTING_CRYPTO_HASH_DISABLE_SHA512
 	bool "disable sha512 tests"
 	default n
 
+config TESTING_CRYPTO_HASH_DISABLE_UNALIGNED_MD5
+	bool "disable unaligned md5 tests"
+        depends on !TESTING_CRYPTO_HASH_DISABLE_MD5
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_UNALIGNED_SHA1
+	bool "disable unaligned sha1 tests"
+        depends on !TESTING_CRYPTO_HASH_DISABLE_SHA1
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_UNALIGNED_SHA224
+	bool "disable unaligned sha224 tests"
+        depends on !TESTING_CRYPTO_HASH_DISABLE_SHA224
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_UNALIGNED_SHA256
+	bool "disable unaligned sha256 tests"
+        depends on !TESTING_CRYPTO_HASH_DISABLE_SHA256
+	default n
+
+config TESTING_CRYPTO_HASH_DISABLE_UNALIGNED_SHA512
+	bool "disable unaligned sha512 tests"
+        depends on !TESTING_CRYPTO_HASH_DISABLE_SHA512
+	default n
+
 endif
 
 config TESTING_CRYPTO_CRC32
diff --git a/testing/drivers/crypto/hash.c b/testing/drivers/crypto/hash.c
index 1638bed70..afa7e94fe 100644
--- a/testing/drivers/crypto/hash.c
+++ b/testing/drivers/crypto/hash.c
@@ -295,6 +295,69 @@ static const unsigned char sha512_huge_block_result[64] =
 #  endif
 #endif
 
+#ifdef CONFIG_TESTING_CRYPTO_HASH_UNALIGNED_BUFFER_SIZE
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
+static const unsigned char md5_unaligned_block_result[16] =
+{
+  /* md5sum of 32640 monotonically increasing bytes from 0x00 */
+
+  0x18, 0x8a, 0x1f, 0x86, 0x80, 0x37, 0x39, 0x2a,
+  0x36, 0xf7, 0x25, 0xb1, 0x98, 0x5b, 0xda, 0xcc
+};
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
+static const unsigned char sha1_unaligned_block_result[20] =
+{
+  /* sha1sum 32640 monotonically increasing bytes from 0x00 */
+
+  0x5b, 0xec, 0x9f, 0x44, 0xe4, 0x21, 0xe4, 0xf2,
+  0x41, 0x86, 0xd0, 0x89, 0x45, 0xf1, 0xa8, 0x11,
+  0x1d, 0xaa, 0x93, 0x51,
+};
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+static const unsigned char sha224_unaligned_block_result[28] =
+{
+  /* sha224sum of 32640 monotonically increasing bytes from 0x00 */
+
+  0x90, 0xad, 0x7d, 0x0e, 0x75, 0x60, 0xec, 0xcd,
+  0xcc, 0x90, 0x02, 0xfb, 0x74, 0xa3, 0xfb, 0x54,
+  0xbf, 0xcc, 0xca, 0x48, 0x23, 0x1c, 0x9f, 0xcc,
+  0x25, 0x29, 0xff, 0xd6
+};
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
+static const unsigned char sha256_unaligned_block_result[32] =
+{
+  /* sha256sum of 32640 monotonically increasing bytes from 0x00 */
+
+  0x6b, 0x5e, 0x17, 0xc4, 0x05, 0x5d, 0xac, 0xdf,
+  0xc2, 0xff, 0x9e, 0x54, 0xdc, 0x21, 0xee, 0x75,
+  0x16, 0x97, 0xb2, 0x78, 0xc7, 0xdd, 0x64, 0x26,
+  0x70, 0xf6, 0xa2, 0xf2, 0xcb, 0x3b, 0x8e, 0x12
+};
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
+static const unsigned char sha512_unaligned_block_result[64] =
+{
+  /* sha512sum of 32640 monotonically increasing bytes from 0x00 */
+
+  0xfb, 0x03, 0xde, 0x53, 0x92, 0xc6, 0xc5, 0x17,
+  0x09, 0x10, 0x6c, 0x12, 0x9c, 0xc4, 0x6e, 0x79,
+  0x37, 0xdd, 0x53, 0x4e, 0x49, 0xa1, 0x8e, 0x27,
+  0x6d, 0xfd, 0xfb, 0x9c, 0xfa, 0xf7, 0xf4, 0x22,
+  0x98, 0xfe, 0xd5, 0x9e, 0x5c, 0x89, 0x4e, 0xf9,
+  0x1a, 0xf7, 0x40, 0x04, 0x0a, 0x49, 0x9e, 0x2a,
+  0x4e, 0x4d, 0xe6, 0xac, 0x1a, 0xa4, 0x5b, 0xb9,
+  0x15, 0x10, 0x0d, 0x37, 0x40, 0x8e, 0x8c, 0x29
+};
+#  endif
+#endif
+
 static void syshash_free(FAR crypto_context *ctx)
 {
   if (ctx->crypto_fd != 0)
@@ -382,7 +445,7 @@ static int syshash_finish(FAR crypto_context *ctx, FAR unsigned char *out)
 
 static int match(const unsigned char *a, const unsigned char *b, size_t len)
 {
-  int i;
+  unsigned int i;
 
   if (memcmp(a, b, len) == 0)
     {
@@ -469,6 +532,69 @@ static void report_huge_block_success(const char *hash_type,
 }
 #endif
 
+#ifdef CONFIG_TESTING_CRYPTO_HASH_UNALIGNED_BUFFER_SIZE
+/* Test unaligned buffer sizes.
+ * Starting with hashing a zero-length buffer, increase buffer
+ * size by one byte and hash increasingly larger buffers until
+ * size reaches 255 bytes (for a total of 32640 bytes).
+ * At same time buffer data starts from 0x00 and monotonically
+ * increases (across buffer boundaries) so that the hash is
+ * performed over 32640 monotonically increasing bytes
+ * starting with 0x00.
+ */
+
+static int testing_hash_unaligned_buffer_size(const char *test,
+                    crypto_context *ctx, int op,
+                    FAR const unsigned char *result, size_t reslen)
+{
+  unsigned char block[256];
+  unsigned char output[64];
+  unsigned char byte = 0;
+  unsigned int block_size;
+  unsigned int idx;
+  int ret;
+
+  ret = syshash_start(ctx, op);
+  if (ret != 0)
+  {
+    return ret;
+  }
+
+  for (block_size = 0; block_size < 256 ; ++block_size)
+  {
+    for (idx = 0; idx < block_size; ++idx)
+    {
+      block[idx] = byte++;
+    }
+
+    ret = syshash_update(ctx, (char *)block, block_size);
+    if (ret < 0)
+      {
+        return ret;
+      }
+  }
+
+  ret = syshash_finish(ctx, output);
+  if (ret != 0)
+    {
+      return ret;
+    }
+
+  ret = match(result, output, reslen);
+  if (ret)
+  {
+    printf("%s unaligned buffer size match failed\n", test);
+  }
+  else
+  {
+    printf("%s unaligned buffer size match success\n", test);
+  }
+
+  return ret;
+}
+
+#endif
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -489,12 +615,21 @@ int main(void)
 #endif
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
   crypto_context sha2_512_ctx;
+#endif
+#ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
+  unsigned char *huge_block = NULL;
+  uint32_t huge_block_size = HASH_HUGE_BLOCK_SIZE;
 #endif
   unsigned char output[64];
-  unsigned char buf[1024];
   int ret = 0;
-  int i;
+  unsigned int i;
+#if !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1) \
+  || !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224) \
+  || !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256) \
+  || !defined(CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512)
+  unsigned char buf[1024];
   int j;
+#endif
 
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   ret += syshash_init(&md5_ctx);
@@ -779,8 +914,6 @@ int main(void)
 #endif
 
 #ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
-  unsigned char *huge_block;
-  uint32_t huge_block_size = HASH_HUGE_BLOCK_SIZE;
   /* Loop trying to allocate a huge block, cutting requested
    * size in half until success.
    */
@@ -807,6 +940,7 @@ int main(void)
   if (ret != 0)
     {
       printf("md5 huge block test failed\n");
+      goto err;
     }
   else
     {
@@ -824,6 +958,7 @@ int main(void)
   if (ret != 0)
     {
       printf("sha1 huge block test failed\n");
+      goto err;
     }
   else
     {
@@ -841,6 +976,7 @@ int main(void)
   if (ret != 0)
     {
       printf("sha224 huge block test failed\n");
+      goto err;
     }
   else
     {
@@ -858,6 +994,7 @@ int main(void)
   if (ret != 0)
     {
       printf("sha256 huge block test failed\n");
+      goto err;
     }
   else
     {
@@ -875,6 +1012,7 @@ int main(void)
   if (ret != 0)
     {
       printf("sha512 huge block test failed\n");
+      goto err;
     }
   else
     {
@@ -883,10 +1021,67 @@ int main(void)
     }
 #  endif
 
-  free(huge_block);
+#endif
+
+#ifdef CONFIG_TESTING_CRYPTO_HASH_UNALIGNED_BUFFER_SIZE
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
+  ret = testing_hash_unaligned_buffer_size("md5", &md5_ctx, CRYPTO_MD5,
+                                           md5_unaligned_block_result,
+                                           MD5_DIGEST_LENGTH);
+  if (ret < 0)
+    {
+      goto err;
+    }
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA1
+  ret = testing_hash_unaligned_buffer_size("sha1", &sha1_ctx, CRYPTO_SHA1,
+                                           sha1_unaligned_block_result,
+                                           SHA1_DIGEST_LENGTH);
+  if (ret < 0)
+    {
+      goto err;
+    }
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA224
+  ret = testing_hash_unaligned_buffer_size("sha244", &sha2_224_ctx,
+                                           CRYPTO_SHA2_224,
+                                           sha224_unaligned_block_result,
+                                           SHA224_DIGEST_LENGTH);
+  if (ret < 0)
+    {
+      goto err;
+    }
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA256
+  ret = testing_hash_unaligned_buffer_size("sha256", &sha2_256_ctx,
+                                           CRYPTO_SHA2_256,
+                                           sha256_unaligned_block_result,
+                                           SHA256_DIGEST_LENGTH);
+  if (ret < 0)
+    {
+      goto err;
+    }
+#  endif
+
+#  ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_SHA512
+  ret = testing_hash_unaligned_buffer_size("sha512", &sha2_512_ctx,
+                                           CRYPTO_SHA2_512,
+                                           sha512_unaligned_block_result,
+                                           SHA512_DIGEST_LENGTH);
+  if (ret < 0)
+    {
+      goto err;
+    }
+#  endif
 #endif
 
 err:
+#ifdef CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK
+  free(huge_block);
+#endif
 #ifndef CONFIG_TESTING_CRYPTO_HASH_DISABLE_MD5
   syshash_free(&md5_ctx);
 #endif

From 397047fa373b1ef971bc66d628bbdc00616307b4 Mon Sep 17 00:00:00 2001
From: Lars Kruse <devel@sumpfralle.de>
Date: Tue, 9 Jun 2026 22:14:40 +0200
Subject: [PATCH 420/568] benchmarks/mtd: use uniform output style for numbers

One of the four values emitted by this interactive tools uses the
hexadecimal presentation. The other values are decimal numbers.
Now the confusion is avoided: all numbers use the decimal
representation.

In addition the suffix "size" is added to the "Erase block" label
in order to clarify its meaning.

Signed-off-by: Lars Kruse <devel@sumpfralle.de>
---
 benchmarks/mtd/mtd.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/benchmarks/mtd/mtd.c b/benchmarks/mtd/mtd.c
index 475fd1c66..b9d3d8a98 100644
--- a/benchmarks/mtd/mtd.c
+++ b/benchmarks/mtd/mtd.c
@@ -102,10 +102,10 @@ int main(int argc, FAR char *argv[])
   /* Report the device structure */
 
   printf("FLASH device parameters:\n");
-  printf("   Sector size:  %10d\n", info.sectorsize);
-  printf("   Sector count: %10d\n", info.numsectors);
-  printf("   Erase block:  %10" PRIx32 "\n", geo.erasesize);
-  printf("   Total size:   %10d\n", info.sectorsize * info.numsectors);
+  printf("   Sector size:      %10d\n", info.sectorsize);
+  printf("   Sector count:     %10d\n", info.numsectors);
+  printf("   Erase block size: %10" PRIu32 "\n", geo.erasesize);
+  printf("   Total size:       %10d\n", info.sectorsize * info.numsectors);
 
   if (info.sectorsize != geo.erasesize)
     {
@@ -124,7 +124,7 @@ int main(int argc, FAR char *argv[])
       goto errout_with_driver;
     }
 
-  /* Fill the buffer with known data and print it in hex format */
+  /* Fill the buffer with known data */
 
   for (int i = 0; i < info.sectorsize; i++)
     {

From e18a206082344d2ccd1a3003012cce9d4e38d5dc Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Thu, 11 Jun 2026 08:15:53 -0300
Subject: [PATCH 421/568] interpreters/python: update repack_wheel script

Updates the repack_wheel_add_pyc.py script to support other packages,
not only pip.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 interpreters/python/repack_wheel_add_pyc.py | 65 ++++++++++++---------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/interpreters/python/repack_wheel_add_pyc.py b/interpreters/python/repack_wheel_add_pyc.py
index fc2d913f7..ba27f7d07 100644
--- a/interpreters/python/repack_wheel_add_pyc.py
+++ b/interpreters/python/repack_wheel_add_pyc.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: Apache-2.0
 #
-# Repack a wheel in-place: compile pip/*.py to legacy sibling *.pyc (compileall
-# -b: required for zipimport, which does not read PEP 3147 __pycache__/ names),
-# remove the .py sources, and rewrite *.dist-info/RECORD.
+# Repack a wheel in-place: compile package/*.py to legacy sibling *.pyc
+# (compileall -b: required for zipimport, which does not read PEP 3147
+# __pycache__/ names), remove the .py sources, and rewrite *.dist-info/RECORD.
 
 from __future__ import annotations
 
@@ -23,25 +23,27 @@ def wheel_record_hash(data: bytes) -> str:
     return base64.urlsafe_b64encode(digest).decode("ascii").rstrip("=")
 
 
-def wheel_has_pip_py_sources(zf: zipfile.ZipFile) -> bool:
-    return any(n.startswith("pip/") and n.endswith(".py") for n in zf.namelist())
+def wheel_has_py_sources(zf: zipfile.ZipFile, package: str) -> bool:
+    prefix = f"{package}/"
+    return any(n.startswith(prefix) and n.endswith(".py") for n in zf.namelist())
 
 
-def wheel_has_legacy_pip_bytecode(zf: zipfile.ZipFile) -> bool:
-    return "pip/__init__.pyc" in zf.namelist()
+def wheel_has_legacy_bytecode(zf: zipfile.ZipFile, package: str) -> bool:
+    return f"{package}/__init__.pyc" in zf.namelist()
 
 
-def strip_pip_py_sources(pip_dir: Path) -> int:
-    """Remove pip/**/*.py after sibling legacy *.pyc exists (compileall -b output)."""
+def strip_py_sources(pkg_dir: Path, package: str) -> int:
+    """Remove package/**/*.py after sibling legacy *.pyc exists (compileall -b output)."""
     removed = 0
-    for path in sorted(pip_dir.rglob("*.py")):
+    for path in sorted(pkg_dir.rglob("*.py")):
         if not path.is_file():
             continue
         pyc = path.with_suffix(".pyc")
         if not pyc.is_file():
-            rel = path.relative_to(pip_dir)
+            rel = path.relative_to(pkg_dir)
             raise SystemExit(
-                f"missing legacy .pyc for pip/{rel.as_posix()}, refusing to delete source"
+                f"missing legacy .pyc for {package}/{rel.as_posix()}, "
+                "refusing to delete source"
             )
         path.unlink()
         removed += 1
@@ -70,41 +72,43 @@ def rebuild_record(root: Path) -> None:
     record_path.write_text("\n".join(lines) + "\n", encoding="utf-8")
 
 
-def repack(whl_path: Path, *, force: bool) -> None:
+def repack(whl_path: Path, *, package: str, force: bool) -> None:
     whl_path = whl_path.resolve()
     if not whl_path.is_file():
         raise SystemExit(f"missing wheel: {whl_path}")
 
     with zipfile.ZipFile(whl_path) as zf:
-        has_py = wheel_has_pip_py_sources(zf)
+        has_py = wheel_has_py_sources(zf, package)
         if not has_py:
-            if not wheel_has_legacy_pip_bytecode(zf):
+            if not wheel_has_legacy_bytecode(zf, package):
                 raise SystemExit(
-                    "repack_wheel_add_pyc: wheel has no pip/*.py and no pip/__init__.pyc "
-                    "(corrupt or old tool output). Delete the bundled pip-*.whl and rebuild."
+                    f"repack_wheel_add_pyc: wheel has no {package}/*.py and no "
+                    f"{package}/__init__.pyc (corrupt or old tool output). "
+                    f"Delete the bundled wheel and rebuild."
                 )
             if not force:
                 print(
-                    f"repack_wheel_add_pyc: skip (pip already bytecode-only): {whl_path.name}"
+                    f"repack_wheel_add_pyc: skip ({package} already bytecode-only): "
+                    f"{whl_path.name}"
                 )
                 return
 
-    tmpdir = tempfile.mkdtemp(prefix="pip-whl-pyc-")
+    tmpdir = tempfile.mkdtemp(prefix=f"{package}-whl-pyc-")
     try:
         root = Path(tmpdir)
         with zipfile.ZipFile(whl_path) as zf:
             zf.extractall(root)
 
-        pip_dir = root / "pip"
-        if not pip_dir.is_dir():
-            raise SystemExit("wheel has no pip/ top-level package")
+        pkg_dir = root / package
+        if not pkg_dir.is_dir():
+            raise SystemExit(f"wheel has no {package}/ top-level package")
 
         subprocess.run(
-            [sys.executable, "-m", "compileall", "-q", "-f", "-b", str(pip_dir)],
+            [sys.executable, "-m", "compileall", "-q", "-f", "-b", str(pkg_dir)],
             cwd=str(root),
             check=True,
         )
-        n_py = strip_pip_py_sources(pip_dir)
+        n_py = strip_py_sources(pkg_dir, package)
         rebuild_record(root)
 
         out_path = whl_path.with_suffix(whl_path.suffix + ".tmp")
@@ -116,7 +120,8 @@ def repack(whl_path: Path, *, force: bool) -> None:
 
         out_path.replace(whl_path)
         print(
-            f"repack_wheel_add_pyc: bytecode-only pip ({n_py} .py removed) -> {whl_path.name}"
+            f"repack_wheel_add_pyc: bytecode-only {package} ({n_py} .py removed) -> "
+            f"{whl_path.name}"
         )
     finally:
         shutil.rmtree(tmpdir, ignore_errors=True)
@@ -125,14 +130,20 @@ def repack(whl_path: Path, *, force: bool) -> None:
 def main() -> None:
     ap = argparse.ArgumentParser(description=__doc__)
     ap.add_argument("wheel", type=Path, help="path to .whl (updated in place)")
+    ap.add_argument(
+        "-p",
+        "--package",
+        default="pip",
+        help="top-level package directory inside the wheel (default: pip)",
+    )
     ap.add_argument(
         "-f",
         "--force",
         action="store_true",
-        help="repack even if pip is already .pyc-only",
+        help="repack even if the package is already .pyc-only",
     )
     args = ap.parse_args()
-    repack(args.wheel, force=args.force)
+    repack(args.wheel, package=args.package, force=args.force)
 
 
 if __name__ == "__main__":

From c00dc4052548606190bc9a10a4889c65f6ab1695 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Thu, 11 Jun 2026 08:16:59 -0300
Subject: [PATCH 422/568] interpreters/python: support nuttx-periphery package

Adds support for installing nuttx-periphery Python package by default
on Python support. This package provides API for accessing Nuttx
character drivers.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 interpreters/python/Kconfig  |  7 +++++++
 interpreters/python/Makefile | 30 +++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/interpreters/python/Kconfig b/interpreters/python/Kconfig
index a0582835f..752bb08b5 100644
--- a/interpreters/python/Kconfig
+++ b/interpreters/python/Kconfig
@@ -47,6 +47,13 @@ config INTERPRETERS_CPYTHON_ENABLE_PIP
 		site-packages .pth entry that points to ensurepip's bundled wheel.
 		Disable this to skip pip wheel download/integration entirely.
 
+config INTERPRETERS_CPYTHON_INSTALL_NUTTX_PACKAGE
+	bool "Install NuttX Python package"
+	default y
+	---help---
+		Installs the nuttx-periphery Python package into the CPython module image.
+		This allows importing the nuttx-periphery package into the CPython interpreter,
+		which provides a Python interface to the NuttX's peripheral drivers.
 
 config INTERPRETERS_CPYTHON_PYTHONPATH
 	string "CPython Python path"
diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index 1b1392cac..36aaed3ab 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -179,25 +179,45 @@ $(TARGETBUILD)/Makefile: $(HOSTPYTHON) $(CONFIG_SITE) $(SETUP_LOCAL)
 	$(Q) sed -i 's/^#define HAVE_LIBB2 1/\/* #undef HAVE_LIBB2 *\//' $(TARGETBUILD)/pyconfig.h
 	$(Q) sed -i 's/-lb2//g' $(TARGETBUILD)/Makefile
 
+BUNDLED_WHEELS_DIR = $(CPYTHON_PATH)/Lib/ensurepip/_bundled
+# PyPI downloads use the host system pip, not $(HOSTPYTHON)'s ensurepip bundle:
+# pip 24.x vendors urllib3 that breaks on Python 3.13 (zlib.Decompress.unused_data).
+HOSTPIP = python3 -m pip
+
 $(TARGETLIBPYTHON): $(TARGETBUILD)/Makefile
+ifneq ($(or $(filter y,$(CONFIG_INTERPRETERS_CPYTHON_ENABLE_PIP)),$(filter y,$(CONFIG_INTERPRETERS_CPYTHON_INSTALL_NUTTX_PACKAGE))),)
+	$(Q) mkdir -p $(BUNDLED_WHEELS_DIR)
+endif
 ifeq ($(CONFIG_INTERPRETERS_CPYTHON_ENABLE_PIP),y)
-	$(Q) mkdir -p $(CPYTHON_PATH)/Lib/ensurepip/_bundled
 	$(Q) ( \
 		PIP_WHEEL_VERSION=$$($(HOSTPYTHON) -c "import ensurepip; print(ensurepip._PIP_VERSION)"); \
-		PIP_WHEEL=$(CPYTHON_PATH)/Lib/ensurepip/_bundled/pip-$${PIP_WHEEL_VERSION}-py3-none-any.whl; \
+		PIP_WHEEL=$(BUNDLED_WHEELS_DIR)/pip-$${PIP_WHEEL_VERSION}-py3-none-any.whl; \
 		if [ ! -f "$${PIP_WHEEL}" ]; then \
 			echo "Fetching pip wheel $${PIP_WHEEL_VERSION} for ensurepip bundle"; \
-			$(HOSTPYTHON) -m pip download --only-binary=:all: --no-deps --dest $(CPYTHON_PATH)/Lib/ensurepip/_bundled pip==$${PIP_WHEEL_VERSION}; \
+			$(HOSTPIP) download --only-binary=:all: --no-deps --dest $(BUNDLED_WHEELS_DIR) pip==$${PIP_WHEEL_VERSION}; \
 		fi; \
 		echo "Pre-compiling pip wheel with build Python (must match embedded CPython version)"; \
-		$(HOSTPYTHON) $(CURDIR)/repack_wheel_add_pyc.py "$${PIP_WHEEL}"; \
+		$(HOSTPYTHON) $(CURDIR)/repack_wheel_add_pyc.py --package pip "$${PIP_WHEEL}"; \
+	)
+endif
+ifeq ($(CONFIG_INTERPRETERS_CPYTHON_INSTALL_NUTTX_PACKAGE),y)
+	$(Q) ( \
+		set -e; \
+		NUTTX_WHEEL=$$(ls $(BUNDLED_WHEELS_DIR)/nuttx_periphery-*-py3-none-any.whl 2>/dev/null | head -1 || true); \
+		if [ -z "$${NUTTX_WHEEL}" ]; then \
+			echo "Fetching latest nuttx-periphery wheel for ensurepip bundle"; \
+			$(HOSTPIP) download --only-binary=:all: --no-deps --dest $(BUNDLED_WHEELS_DIR) nuttx-periphery; \
+			NUTTX_WHEEL=$$(ls $(BUNDLED_WHEELS_DIR)/nuttx_periphery-*-py3-none-any.whl); \
+		fi; \
+		echo "Pre-compiling nuttx-periphery wheel with build Python (must match embedded CPython version)"; \
+		$(HOSTPYTHON) $(CURDIR)/repack_wheel_add_pyc.py --package nuttx_periphery "$${NUTTX_WHEEL}"; \
 	)
 endif
 	$(MAKE) -C $(TARGETBUILD) regen-frozen
 	$(MAKE) -C $(TARGETBUILD) libpython$(CPYTHON_VERSION_MINOR).a wasm_stdlib
 	$(Q) ( cp $(TARGETBUILD)/libpython$(CPYTHON_VERSION_MINOR).a $(TARGETLIBPYTHON) )
 	$(Q) $(UNPACK) $(TARGETMODULESPACK) -d $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)
-ifeq ($(CONFIG_INTERPRETERS_CPYTHON_ENABLE_PIP),y)
+ifneq ($(or $(filter y,$(CONFIG_INTERPRETERS_CPYTHON_ENABLE_PIP)),$(filter y,$(CONFIG_INTERPRETERS_CPYTHON_INSTALL_NUTTX_PACKAGE))),)
 	$(Q) mkdir -p $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)/site-packages
 	$(Q) ( \
 		set -e; \

From afc652243efd77f6050ef1c8c3a0c1a2755f4195 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:56:07 +0800
Subject: [PATCH 423/568] examples/thttpd: use procfs for tasks CGI

The tasks CGI used nxsched_foreach() to walk scheduler internals and read
fields directly from struct tcb_s. That exposes an application example to
non-standard OS internals.

Read task information from /proc/<pid>/status instead, matching the public
procfs interface used by other task listing tools.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 examples/thttpd/content/tasks/tasks.c | 288 ++++++++++++++++++++------
 1 file changed, 225 insertions(+), 63 deletions(-)

diff --git a/examples/thttpd/content/tasks/tasks.c b/examples/thttpd/content/tasks/tasks.c
index da7347678..089a751b6 100644
--- a/examples/thttpd/content/tasks/tasks.c
+++ b/examples/thttpd/content/tasks/tasks.c
@@ -26,48 +26,36 @@
 
 #include <nuttx/config.h>
 
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <sched.h>
-
-#include <nuttx/sched.h>
 
 /****************************************************************************
- * Private Data
+ * Pre-processor Definitions
  ****************************************************************************/
 
-static const char *g_statenames[] =
-{
-  "INVALID ",
-  "PENDING ",
-  "READY   ",
-  "RUNNING ",
-  "INACTIVE",
-  "WAITSEM ",
-#ifndef CONFIG_DISABLE_MQUEUE
-  "WAITSIG ",
+#ifndef THTTPD_PROCFS_MOUNTPOINT
+#  define THTTPD_PROCFS_MOUNTPOINT "/proc"
 #endif
-#ifndef CONFIG_DISABLE_MQUEUE
-  "MQNEMPTY",
-  "MQNFULL "
-#endif
-};
 
-static const char *g_ttypenames[4] =
-{
-  "TASK   ",
-  "PTHREAD",
-  "KTHREAD",
-  "--?--  "
-};
+#define THTTPD_STATUS_SIZE 512
 
-static FAR const char *g_policynames[4] =
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct thttpd_task_status_s
 {
-  "FIFO",
-  "RR  ",
-  "SPOR",
-  "OTHR"
+  FAR const char *name;
+  FAR const char *type;
+  FAR const char *state;
+  FAR const char *priority;
+  FAR const char *policy;
 };
 
 /****************************************************************************
@@ -78,38 +66,210 @@ static FAR const char *g_policynames[4] =
  * Private Functions
  ****************************************************************************/
 
-/* NOTEs:
- *
- * 1. One limitation in the use of NXFLAT is that functions that are
- *    referenced as a pointer-to-a-function must have global scope.
- *    Otherwise ARM GCC will generate some bad logic.
- * 2. In general, when called back, there is no guarantee to that PIC
- *    registers will be valid and, unless you take special precautions, it
- *    could be dangerous to reference global variables in the callback
- *    function.
- */
+/****************************************************************************
+ * Name: tasks_trim_value
+ ****************************************************************************/
 
-void show_task(FAR struct tcb_s *tcb, FAR void *arg)
+static FAR char *tasks_trim_value(FAR char *line)
 {
-  FAR const char *policy;
+  FAR char *end;
 
-  /* Show task/thread status */
+  while (isblank((unsigned char)*line) && *line != '\0')
+    {
+      line++;
+    }
 
-  policy = g_policynames[(tcb->flags & TCB_FLAG_POLICY_MASK) >>
-                         TCB_FLAG_POLICY_SHIFT];
-#if CONFIG_TASK_NAME_SIZE > 0
-  printf("%5d %3d %4s %7s %8s %s\n",
-#else
-  printf("%5d %3d %4s %7s %8s\n",
-#endif
-         tcb->pid, tcb->sched_priority, policy,
-         g_ttypenames[(tcb->flags & TCB_FLAG_TTYPE_MASK) >>
-                      TCB_FLAG_TTYPE_SHIFT],
-         g_statenames[tcb->task_state]
-#if CONFIG_TASK_NAME_SIZE > 0
-         , tcb->name
-#endif
-         );
+  end = line + strlen(line);
+  while (end > line &&
+         (*(end - 1) == '\n' || *(end - 1) == '\r' ||
+          isblank((unsigned char)*(end - 1))))
+    {
+      end--;
+    }
+
+  *end = '\0';
+  return line;
+}
+
+/****************************************************************************
+ * Name: tasks_is_pid_dir
+ ****************************************************************************/
+
+static bool tasks_is_pid_dir(FAR const struct dirent *entryp)
+{
+  FAR const char *name = entryp->d_name;
+
+  if (!DIRENT_ISDIRECTORY(entryp->d_type) || *name == '\0')
+    {
+      return false;
+    }
+
+  for (; *name != '\0'; name++)
+    {
+      if (!isdigit((unsigned char)*name))
+        {
+          return false;
+        }
+    }
+
+  return true;
+}
+
+/****************************************************************************
+ * Name: tasks_parse_status_line
+ ****************************************************************************/
+
+static void tasks_parse_status_line(FAR char *line,
+                                    FAR struct thttpd_task_status_s *status)
+{
+  if (strncmp(line, "Name:", 5) == 0)
+    {
+      status->name = tasks_trim_value(&line[5]);
+    }
+  else if (strncmp(line, "Type:", 5) == 0)
+    {
+      status->type = tasks_trim_value(&line[5]);
+    }
+  else if (strncmp(line, "State:", 6) == 0)
+    {
+      status->state = tasks_trim_value(&line[6]);
+    }
+  else if (strncmp(line, "Priority:", 9) == 0)
+    {
+      status->priority = tasks_trim_value(&line[9]);
+    }
+  else if (strncmp(line, "Scheduler:", 10) == 0)
+    {
+      status->policy = tasks_trim_value(&line[10]);
+    }
+}
+
+/****************************************************************************
+ * Name: tasks_parse_status
+ ****************************************************************************/
+
+static void tasks_parse_status(FAR char *buffer,
+                               FAR struct thttpd_task_status_s *status)
+{
+  FAR char *line = buffer;
+
+  while (line != NULL && *line != '\0')
+    {
+      FAR char *next = strchr(line, '\n');
+      if (next != NULL)
+        {
+          *next++ = '\0';
+        }
+
+      tasks_parse_status_line(line, status);
+      line = next;
+    }
+}
+
+/****************************************************************************
+ * Name: tasks_read_status
+ ****************************************************************************/
+
+static int tasks_read_status(FAR const char *pid, FAR char *buffer,
+                             size_t buflen,
+                             FAR struct thttpd_task_status_s *status)
+{
+  char filepath[sizeof(THTTPD_PROCFS_MOUNTPOINT) + NAME_MAX +
+                sizeof("/status") + 1];
+  ssize_t nread;
+  size_t total = 0;
+  int ret;
+  int fd;
+
+  ret = snprintf(filepath, sizeof(filepath), "%s/%s/status",
+                 THTTPD_PROCFS_MOUNTPOINT, pid);
+  if (ret < 0 || ret >= sizeof(filepath))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  fd = open(filepath, O_RDONLY);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  while (total < buflen - 1)
+    {
+      nread = read(fd, &buffer[total], buflen - 1 - total);
+      if (nread < 0)
+        {
+          ret = -errno;
+          close(fd);
+          return ret;
+        }
+      else if (nread == 0)
+        {
+          break;
+        }
+
+      total += nread;
+    }
+
+  close(fd);
+  buffer[total] = '\0';
+  tasks_parse_status(buffer, status);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: show_task
+ ****************************************************************************/
+
+static void show_task(FAR const char *pid,
+                      FAR const struct thttpd_task_status_s *status)
+{
+  printf("%5s %-12s %-14s %-7s %-18s %s\n",
+         pid, status->priority, status->policy, status->type,
+         status->state, status->name);
+}
+
+/****************************************************************************
+ * Name: show_tasks
+ ****************************************************************************/
+
+static int show_tasks(void)
+{
+  FAR struct dirent *entryp;
+  DIR *dirp;
+
+  dirp = opendir(THTTPD_PROCFS_MOUNTPOINT);
+  if (dirp == NULL)
+    {
+      printf("Unable to open %s (is procfs mounted?): %d\n",
+             THTTPD_PROCFS_MOUNTPOINT, errno);
+      return -errno;
+    }
+
+  while ((entryp = readdir(dirp)) != NULL)
+    {
+      char buffer[THTTPD_STATUS_SIZE];
+      struct thttpd_task_status_s status =
+      {
+        "", "", "", "", ""
+      };
+
+      if (!tasks_is_pid_dir(entryp))
+        {
+          continue;
+        }
+
+      if (tasks_read_status(entryp->d_name, buffer, sizeof(buffer),
+                            &status) < 0)
+        {
+          continue;
+        }
+
+      show_task(entryp->d_name, &status);
+    }
+
+  closedir(dirp);
+  return OK;
 }
 
 /****************************************************************************
@@ -139,10 +299,12 @@ int main(int argc, char *argv[])
     "<br>\r\n"
     "</div>\r\n"
     "<div class=\"contentblock\">\r\n"
-    "<pre>\r\n"
-    "PID   PRI SCHD TYPE   NP STATE    NAME\r\n");
+    "<pre>\r\n");
 
-  nxsched_foreach(show_task, NULL);
+  printf("%5s %-12s %-14s %-7s %-18s %s\n",
+         "PID", "PRI", "SCHEDULER", "TYPE", "STATE", "NAME");
+
+  show_tasks();
 
   puts(
     "</pre>\r\n"

From 47409451576f46c9ad4cc378df27172750af5070 Mon Sep 17 00:00:00 2001
From: Jukka Laitinen <jukka.laitinen@tii.ae>
Date: Fri, 12 Jun 2026 08:21:58 +0300
Subject: [PATCH 424/568] ostest: Make POSIX timers test work with
 CONFIG_ENABLE_PARTIAL_SIGNALS

POSIX timers test doesn't really need signal actions, so we can change it
to synchronously wait for the signal in sigwaitinfo, instead of registering
a signal handler.

Also exclude the test from compilation with CONFIG_DISABLE_ALL_SIGNALS;
the test does require at least partial signal support.

Signed-off-by: Jukka Laitinen <jukka.laitinen@tii.ae>
---
 testing/ostest/CMakeLists.txt |   4 +-
 testing/ostest/Makefile       |   2 +
 testing/ostest/ostest_main.c  |  16 ++---
 testing/ostest/posixtimer.c   | 110 +++++++---------------------------
 4 files changed, 36 insertions(+), 96 deletions(-)

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index fba7f4c47..893465362 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -133,7 +133,9 @@ if(CONFIG_TESTING_OSTEST)
   endif() # CONFIG_DISABLE_MQUEUE
 
   if(NOT CONFIG_DISABLE_POSIX_TIMERS)
-    list(APPEND SRCS posixtimer.c)
+    if(NOT CONFIG_DISABLE_ALL_SIGNALS)
+      list(APPEND SRCS posixtimer.c)
+    endif()
     if(CONFIG_SIG_EVTHREAD)
       list(APPEND SRCS sigev_thread.c)
     endif()
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 6fc3a7b76..3c28199c3 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -134,7 +134,9 @@ endif # CONFIG_DISABLE_PTHREAD
 endif # CONFIG_DISABLE_MQUEUE
 
 ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y)
+ifneq ($(CONFIG_DISABLE_ALL_SIGNALS),y)
 CSRCS += posixtimer.c
+endif
 ifeq ($(CONFIG_SIG_EVTHREAD),y)
 CSRCS += sigev_thread.c
 endif
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 89022b4bc..edbf6485d 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -525,6 +525,14 @@ static int user_main(int argc, char *argv[])
       suspend_test();
       check_test_memory_usage();
 #endif
+
+#ifndef CONFIG_DISABLE_POSIX_TIMERS
+      /* Verify POSIX timers (SIGEV_SIGNAL delivered via sigwaitinfo()) */
+
+      printf("\nuser_main: POSIX timer test\n");
+      timer_test();
+      check_test_memory_usage();
+#endif
 #endif /* !CONFIG_DISABLE_ALL_SIGNALS */
 
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
@@ -537,14 +545,6 @@ static int user_main(int argc, char *argv[])
       printf("\nuser_main: nested signal handler test\n");
       signest_test();
       check_test_memory_usage();
-
-#ifndef CONFIG_DISABLE_POSIX_TIMERS
-      /* Verify posix timers (with SIGEV_SIGNAL) */
-
-      printf("\nuser_main: POSIX timer test\n");
-      timer_test();
-      check_test_memory_usage();
-#endif
 #endif
 
 #ifdef CONFIG_BUILD_FLAT
diff --git a/testing/ostest/posixtimer.c b/testing/ostest/posixtimer.c
index ea47261b2..995e0f057 100644
--- a/testing/ostest/posixtimer.c
+++ b/testing/ostest/posixtimer.c
@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <sched.h>
-#include <semaphore.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -47,23 +46,14 @@
  * Private Data
  ****************************************************************************/
 
-static sem_t sem;
 static int g_nsigreceived = 0;
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
-static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
+static void timer_expiration(int signo, FAR const siginfo_t *info)
 {
-  sigset_t oldset;
-  sigset_t allsigs;
-  int status;
-
-  printf("timer_expiration: Received signal %d\n" , signo);
-
-  g_nsigreceived++;
-
   /* Check signo */
 
   if (signo != MY_TIMER_SIGNAL)
@@ -104,28 +94,8 @@ static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
       ASSERT(false);
     }
 
-  /* Check ucontext_t */
-
-  printf("timer_expiration: ucontext=%p\n" , ucontext);
-
-  /* Check sigprocmask */
-
-  sigfillset(&allsigs);
-  status = sigprocmask(SIG_SETMASK, NULL, &oldset);
-  if (status != OK)
-    {
-      printf("timer_expiration: ERROR sigprocmask failed, status=%d\n",
-              status);
-      ASSERT(false);
-    }
-
-  if (!sigset_isequal(&oldset, &allsigs))
-    {
-      printf("timer_expiration: ERROR sigprocmask=" SIGSET_FMT
-             " expected=" SIGSET_FMT "\n",
-             SIGSET_ELEM(&oldset), SIGSET_ELEM(&allsigs));
-      ASSERT(false);
-    }
+  g_nsigreceived++;
+  printf("timer_expiration: g_nsigreceived=%d\n", g_nsigreceived);
 }
 
 /****************************************************************************
@@ -135,24 +105,23 @@ static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
 void timer_test(void)
 {
   sigset_t           set;
-  struct sigaction   act;
-  struct sigaction   oact;
+  siginfo_t          info;
   struct sigevent    notify;
   struct itimerspec  timer;
   timer_t            timerid;
   int                status;
   int                i;
 
-  printf("timer_test: Initializing semaphore to 0\n");
-  sem_init(&sem, 0, 0);
-
-  /* Start waiter thread  */
-
-  printf("timer_test: Unmasking signal %d\n" , MY_TIMER_SIGNAL);
+  /* Block the timer signal so that it stays pending until we explicitly
+   * wait for it via sigwaitinfo().
+   */
 
   sigemptyset(&set);
   sigaddset(&set, MY_TIMER_SIGNAL);
-  status = sigprocmask(SIG_UNBLOCK, &set, NULL);
+
+  printf("timer_test: Masking signal %d\n", MY_TIMER_SIGNAL);
+
+  status = sigprocmask(SIG_BLOCK, &set, NULL);
   if (status != OK)
     {
       printf("timer_test: ERROR sigprocmask failed, status=%d\n",
@@ -160,26 +129,6 @@ void timer_test(void)
       ASSERT(false);
     }
 
-  printf("timer_test: Registering signal handler\n");
-  act.sa_sigaction = timer_expiration;
-  act.sa_flags  = SA_SIGINFO;
-
-  sigfillset(&act.sa_mask);
-  sigdelset(&act.sa_mask, MY_TIMER_SIGNAL);
-
-  status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
-  if (status != OK)
-    {
-      printf("timer_test: ERROR sigaction failed, status=%d\n" , status);
-      ASSERT(false);
-    }
-
-#ifndef SDCC
-  printf("timer_test: oact.sigaction=%p oact.sa_flags=%x "
-         "oact.sa_mask=" SIGSET_FMT "\n",
-         oact.sa_sigaction, oact.sa_flags, SIGSET_ELEM(&oact.sa_mask));
-#endif
-
   /* Create the POSIX timer */
 
   printf("timer_test: Creating timer\n");
@@ -217,53 +166,40 @@ void timer_test(void)
       goto errorout;
     }
 
-  /* Take the semaphore */
+  /* Synchronously wait for the timer signal via sigwaitinfo(). */
 
   for (i = 0; i < 5; i++)
     {
-      printf("timer_test: Waiting on semaphore\n");
+      printf("timer_test: Waiting on sigwaitinfo\n");
       FFLUSH();
-      status = sem_wait(&sem);
-      if (status != 0)
+      status = sigwaitinfo(&set, &info);
+      if (status < 0)
         {
-          int error = errno;
-          if (error == EINTR)
-            {
-              printf("timer_test: sem_wait() successfully interrupted "
-                     "by signal\n");
-            }
-          else
-            {
-              printf("timer_test: ERROR sem_wait failed, errno=%d\n", error);
-              ASSERT(false);
-            }
+          printf("timer_test: ERROR sigwaitinfo failed, errno=%d\n", errno);
+          ASSERT(false);
         }
       else
         {
-          printf("timer_test: ERROR awakened with no error!\n");
-          ASSERT(false);
+          printf("timer_test: sigwaitinfo() returned signo=%d\n", status);
+          timer_expiration(status, &info);
         }
-
-      printf("timer_test: g_nsigreceived=%d\n", g_nsigreceived);
     }
 
 errorout:
-  sem_destroy(&sem);
 
-  /* Then delete the timer */
+  /* Delete the timer */
 
   printf("timer_test: Deleting timer\n");
   status = timer_delete(timerid);
   if (status != OK)
     {
-      printf("timer_test: ERROR timer_create failed, errno=%d\n", errno);
+      printf("timer_test: ERROR timer_delete failed, errno=%d\n", errno);
       ASSERT(false);
     }
 
-  /* Detach the signal handler */
+  /* Restore the signal mask */
 
-  act.sa_handler = SIG_DFL;
-  status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
+  sigprocmask(SIG_UNBLOCK, &set, NULL);
 
   printf("timer_test: done\n");
   FFLUSH();

From c51180d780bc86c6a69263abf2c408093cb077fa Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Thu, 11 Jun 2026 09:34:54 -0300
Subject: [PATCH 425/568] examples/mdnsd: Create an event-based starter for
 mDNS daemon

Start the mDNS daemon based on the event of getting a new IP
address for any of the system's network interfaces. This allows
DHCP client to trigger the mDNS daemon after getting a new IP
address, for instance.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 examples/mdnsd/Makefile      |   4 +-
 examples/mdnsd/mdnsd_event.c | 244 +++++++++++++++++++++++++++++++++++
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 examples/mdnsd/mdnsd_event.c

diff --git a/examples/mdnsd/Makefile b/examples/mdnsd/Makefile
index 316e6d817..5dc84bd13 100644
--- a/examples/mdnsd/Makefile
+++ b/examples/mdnsd/Makefile
@@ -26,11 +26,11 @@ include $(APPDIR)/Make.defs
 
 CSRCS = mdnsd_daemon.c
 
-MAINSRC = mdnsd_start.c mdnsd_stop.c
+MAINSRC = mdnsd_start.c mdnsd_stop.c mdnsd_event.c
 
 # MDNSD built-in application info
 
-PROGNAME = mdnsd_start mdnsd_stop
+PROGNAME = mdnsd_start mdnsd_stop mdnsd_event
 PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_MDNSD)
diff --git a/examples/mdnsd/mdnsd_event.c b/examples/mdnsd/mdnsd_event.c
new file mode 100644
index 000000000..432042372
--- /dev/null
+++ b/examples/mdnsd/mdnsd_event.c
@@ -0,0 +1,244 @@
+/****************************************************************************
+ * apps/examples/mdnsd/mdnsd_event.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netpacket/if_addr.h>
+#include <netpacket/netlink.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include "netutils/mdnsd.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MDNSD_EVENT_BUFSIZE   512
+#define MDNSD_EVENT_SETTLE_MS 500
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mdnsd_event_has_ipv4addr
+ *
+ * Description:
+ *   Check whether any network interface already has a non-zero IPv4
+ *   address.  Uses SIOCGIFCONF to enumerate interfaces.
+ *
+ * Returned Value:
+ *   true if at least one interface has a non-zero IPv4 address,
+ *   false otherwise.
+ *
+ ****************************************************************************/
+
+static bool mdnsd_event_has_ipv4addr(void)
+{
+  struct ifconf ifc;
+  char buf[sizeof(struct ifreq) * 4];
+  int sd;
+  int i;
+
+  sd = socket(AF_INET, SOCK_DGRAM, 0);
+  if (sd < 0)
+    {
+      return false;
+    }
+
+  ifc.ifc_len = sizeof(buf);
+  ifc.ifc_buf = buf;
+  if (ioctl(sd, SIOCGIFCONF, &ifc) < 0)
+    {
+      close(sd);
+      return false;
+    }
+
+  close(sd);
+
+  for (i = 0; i < ifc.ifc_len; i += sizeof(struct ifreq))
+    {
+      FAR struct ifreq *ifr = (FAR struct ifreq *)&buf[i];
+      FAR struct sockaddr_in *sin;
+
+      if (ifr->ifr_addr.sa_family != AF_INET)
+        {
+          continue;
+        }
+
+      sin = (FAR struct sockaddr_in *)&ifr->ifr_addr;
+      if (sin->sin_addr.s_addr != INADDR_ANY &&
+          sin->sin_addr.s_addr != htonl(INADDR_LOOPBACK))
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
+/****************************************************************************
+ * Name: mdnsd_event_is_newaddr
+ *
+ * Description:
+ *   Checks whether the given Netlink message header represents a new
+ *   IPv4 or IPv6 address event (RTM_NEWADDR).
+ *
+ * Input Parameters:
+ *   hdr - Pointer to the Netlink message header to inspect.
+ *
+ * Returned Value:
+ *   true if the message is a new IPv4 or IPv6 address notification,
+ *   false otherwise.
+ *
+ ****************************************************************************/
+
+static bool mdnsd_event_is_newaddr(FAR struct nlmsghdr *hdr)
+{
+  FAR struct ifaddrmsg *addr;
+
+  if (hdr->nlmsg_type != RTM_NEWADDR)
+    {
+      return false;
+    }
+
+  if (hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifaddrmsg)))
+    {
+      return false;
+    }
+
+  addr = (FAR struct ifaddrmsg *)NLMSG_DATA(hdr);
+  return addr->ifa_family == AF_INET || addr->ifa_family == AF_INET6;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ *
+ * Description:
+ *   Entry point for the mdnsd_event application.  Listens for Netlink
+ *   address events and starts the mDNS daemon when an IP address is
+ *   assigned to a network interface.
+ *
+ * Input Parameters:
+ *   argc - Number of command-line arguments.
+ *   argv - Array of command-line argument strings.
+ *
+ * Returned Value:
+ *   EXIT_SUCCESS on success, EXIT_FAILURE on error.
+ *
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+#ifdef CONFIG_NETLINK_ROUTE
+  struct sockaddr_nl addr;
+  uint8_t buffer[MDNSD_EVENT_BUFSIZE];
+  int sd;
+  int ret;
+
+  /* If an interface already has an IP (DHCP finished before we started),
+   * skip the netlink wait and start mDNS right away.
+   */
+
+  if (mdnsd_event_has_ipv4addr())
+    {
+      printf("mdnsd_event: address already set, starting mDNS\n");
+      usleep(MDNSD_EVENT_SETTLE_MS * 1000);
+      ret = mdnsd_start(CONFIG_EXAMPLES_MDNS_SERVICE,
+                         CONFIG_EXAMPLES_MDNS_SERVICE_PORT);
+      return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+    }
+
+  sd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+  if (sd < 0)
+    {
+      fprintf(stderr, "mdnsd_event: socket failed: %d\n", errno);
+      return EXIT_FAILURE;
+    }
+
+  memset(&addr, 0, sizeof(addr));
+  addr.nl_family = AF_NETLINK;
+  addr.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR;
+
+  ret = bind(sd, (FAR struct sockaddr *)&addr, sizeof(addr));
+  if (ret < 0)
+    {
+      fprintf(stderr, "mdnsd_event: bind failed: %d\n", errno);
+      close(sd);
+      return EXIT_FAILURE;
+    }
+
+  printf("mdnsd_event: waiting for network address event\n");
+
+  for (; ; )
+    {
+      FAR struct nlmsghdr *hdr;
+      ssize_t nread;
+      int remaining;
+
+      nread = recv(sd, buffer, sizeof(buffer), 0);
+      if (nread < 0)
+        {
+          fprintf(stderr, "mdnsd_event: recv failed: %d\n", errno);
+          close(sd);
+          return EXIT_FAILURE;
+        }
+
+      remaining = nread;
+      for (hdr = (FAR struct nlmsghdr *)buffer;
+           NLMSG_OK(hdr, remaining);
+           hdr = NLMSG_NEXT(hdr, remaining))
+        {
+          if (mdnsd_event_is_newaddr(hdr))
+            {
+              printf("mdnsd_event: address set, starting mDNS\n");
+              usleep(MDNSD_EVENT_SETTLE_MS * 1000);
+              ret = mdnsd_start(CONFIG_EXAMPLES_MDNS_SERVICE,
+                                CONFIG_EXAMPLES_MDNS_SERVICE_PORT);
+              close(sd);
+              return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+            }
+        }
+    }
+#else
+  fprintf(stderr, "mdnsd_event: CONFIG_NETLINK_ROUTE is required\n");
+  return EXIT_FAILURE;
+#endif
+}

From d106011a7fbef520bde8a81d5f40ee515e564cc9 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Fri, 12 Jun 2026 10:46:56 -0300
Subject: [PATCH 426/568] netutils/libwebsockets: Remove hard dependency on
 mbedTLS

libwebsockets can be built without TLS support. To allow this, it
was necessary to create a specific Kconfig option that enables TLS
support if OPENSSL_MBEDTLS_WRAPPER is enabled. Otherwise, TLS is
not supported (but libwebsockets can still be used with plain ws://
connections).

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 netutils/libwebsockets/CMakeLists.txt | 21 ++++++++++++++-------
 netutils/libwebsockets/Kconfig        | 11 ++++++++++-
 netutils/libwebsockets/Make.defs      |  6 ++++--
 netutils/libwebsockets/Makefile       |  4 +++-
 netutils/libwebsockets/lws_config.h   |  8 +++++---
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/netutils/libwebsockets/CMakeLists.txt b/netutils/libwebsockets/CMakeLists.txt
index 7977f9311..717788f13 100644
--- a/netutils/libwebsockets/CMakeLists.txt
+++ b/netutils/libwebsockets/CMakeLists.txt
@@ -21,7 +21,7 @@
 if(CONFIG_NETUTILS_LIBWEBSOCKETS)
 
   # ############################################################################
-  # Config and Fetch MbedTLS lib
+  # Config and Fetch libwebsockets
   # ############################################################################
 
   set(LIBWEBSOCKETS_DIR ${CMAKE_CURRENT_LIST_DIR}/libwebsockets)
@@ -66,7 +66,7 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
       -Wno-shadow)
 
   set(INCDIR
-      .
+      ${CMAKE_CURRENT_LIST_DIR}
       ${LIBWEBSOCKETS_DIR}/lib/core
       ${LIBWEBSOCKETS_DIR}/lib/plat/unix
       ${LIBWEBSOCKETS_DIR}/lib/event-libs
@@ -78,9 +78,7 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
       ${LIBWEBSOCKETS_DIR}/lib/roles/h1
       ${LIBWEBSOCKETS_DIR}/lib/roles/h2
       ${LIBWEBSOCKETS_DIR}/lib/roles/ws
-      ${LIBWEBSOCKETS_DIR}/lib/tls
-      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include
-      ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include/internal)
+      ${LIBWEBSOCKETS_DIR}/lib/tls)
 
   set(CSRCS
       ${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-caps.c
@@ -146,7 +144,14 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
       ${LIBWEBSOCKETS_DIR}/lib/roles/raw-skt/ops-raw-skt.c
       ${LIBWEBSOCKETS_DIR}/lib/roles/raw-file/ops-raw-file.c
       ${LIBWEBSOCKETS_DIR}/lib/roles/http/client/client-http.c
-      ${LIBWEBSOCKETS_DIR}/lib/event-libs/poll/poll.c
+      ${LIBWEBSOCKETS_DIR}/lib/event-libs/poll/poll.c)
+
+  if(CONFIG_NETUTILS_LIBWEBSOCKETS_TLS)
+    list(APPEND INCDIR ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include
+         ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include/internal)
+    list(
+      APPEND
+      CSRCS
       ${LIBWEBSOCKETS_DIR}/lib/tls/tls.c
       ${LIBWEBSOCKETS_DIR}/lib/tls/tls-network.c
       ${LIBWEBSOCKETS_DIR}/lib/tls/tls-sessions.c
@@ -157,6 +162,7 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
       ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-ssl.c
       ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-session.c
       ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/mbedtls-client.c)
+  endif()
 
   if(CONFIG_NETUTILS_MQTTC)
     list(APPEND INCDIR ${LIBWEBSOCKETS_DIR}/lib/roles/mqtt)
@@ -178,7 +184,8 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
   set_property(
     TARGET nuttx
     APPEND
-    PROPERTY NUTTX_INCLUDE_DIRECTORIES ${LIBWEBSOCKETS_DIR}/include)
+    PROPERTY NUTTX_INCLUDE_DIRECTORIES ${LIBWEBSOCKETS_DIR}/include
+             ${CMAKE_CURRENT_LIST_DIR})
 
   nuttx_add_library(libwebsockets STATIC)
   target_sources(libwebsockets PRIVATE ${CSRCS})
diff --git a/netutils/libwebsockets/Kconfig b/netutils/libwebsockets/Kconfig
index 07686db68..0e127e286 100644
--- a/netutils/libwebsockets/Kconfig
+++ b/netutils/libwebsockets/Kconfig
@@ -6,7 +6,7 @@
 config NETUTILS_LIBWEBSOCKETS
 	bool "libwebsockets library (current version)"
 	default n
-	depends on NET && OPENSSL_MBEDTLS_WRAPPER
+	depends on NET
 	---help---
 		Enables the libwebsockets library.
 
@@ -16,4 +16,13 @@ config NETUTILS_LIBWEBSOCKETS_VERSION
 	string "Version number"
 	default "4.3.1"
 
+config NETUTILS_LIBWEBSOCKETS_TLS
+	bool "Enable TLS support"
+	default y
+	depends on OPENSSL_MBEDTLS_WRAPPER
+	---help---
+		Enable TLS in libwebsockets via the OpenSSL-mbedTLS
+		wrapper. Requires CONFIG_OPENSSL_MBEDTLS_WRAPPER.
+		When disabled, only plain ws:// connections are supported.
+
 endif
diff --git a/netutils/libwebsockets/Make.defs b/netutils/libwebsockets/Make.defs
index 13fe3849c..58ebdbb3e 100644
--- a/netutils/libwebsockets/Make.defs
+++ b/netutils/libwebsockets/Make.defs
@@ -25,7 +25,9 @@ CONFIGURED_APPS += $(APPDIR)/netutils/libwebsockets
 
 # Allows `<libwebsockets/<>.h>` import.
 
-CFLAGS +=  ${INCDIR_PREFIX}$(APPDIR)/netutils/libwebsockets/libwebsockets/include
-CXXFLAGS +=  ${INCDIR_PREFIX}$(APPDIR)/netutils/libwebsockets/libwebsockets/include
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/libwebsockets
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/libwebsockets/libwebsockets/include
+CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/libwebsockets
+CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/netutils/libwebsockets/libwebsockets/include
 
 endif
diff --git a/netutils/libwebsockets/Makefile b/netutils/libwebsockets/Makefile
index ad8c0c5e6..2dbe64479 100644
--- a/netutils/libwebsockets/Makefile
+++ b/netutils/libwebsockets/Makefile
@@ -118,6 +118,7 @@ CSRCS += \
 	$(LIBWEBSOCKETS_UNPACK)/lib/roles/http/client/client-http.c \
 	$(LIBWEBSOCKETS_UNPACK)/lib/event-libs/poll/poll.c
 
+ifneq ($(CONFIG_NETUTILS_LIBWEBSOCKETS_TLS),)
 CSRCS += \
 	$(LIBWEBSOCKETS_UNPACK)/lib/tls/tls.c \
 	$(LIBWEBSOCKETS_UNPACK)/lib/tls/tls-network.c \
@@ -128,7 +129,8 @@ CSRCS += \
 	$(LIBWEBSOCKETS_UNPACK)/lib/tls/mbedtls/mbedtls-x509.c \
 	$(LIBWEBSOCKETS_UNPACK)/lib/tls/mbedtls/mbedtls-ssl.c \
 	$(LIBWEBSOCKETS_UNPACK)/lib/tls/mbedtls/mbedtls-session.c \
-	$(LIBWEBSOCKETS_UNPACK)/lib/tls/mbedtls/mbedtls-client.c \
+	$(LIBWEBSOCKETS_UNPACK)/lib/tls/mbedtls/mbedtls-client.c
+endif
 
 ifneq ($(CONFIG_NETUTILS_MQTTC),)
 	CFLAGS += -I$(LIBWEBSOCKETS_UNPACK)/lib/roles/mqtt
diff --git a/netutils/libwebsockets/lws_config.h b/netutils/libwebsockets/lws_config.h
index 3fe970b47..6a4bcb79b 100644
--- a/netutils/libwebsockets/lws_config.h
+++ b/netutils/libwebsockets/lws_config.h
@@ -106,7 +106,7 @@
 #define LWS_HAVE_MALLOC_H
 /* #define LWS_HAVE_MALLOC_TRIM */
 #define LWS_HAVE_MALLOC_USABLE_SIZE
-#ifdef CONFIG_CRYPTO_MBEDTLS
+#ifdef CONFIG_NETUTILS_LIBWEBSOCKETS_TLS
 #define LWS_HAVE_mbedtls_md_setup
 #define LWS_HAVE_mbedtls_net_init
 #define LWS_HAVE_mbedtls_rsa_complete
@@ -187,8 +187,10 @@
 
 /* #undef LWS_NO_CLIENT */
 #define LWS_NO_DAEMONIZE
+#ifdef CONFIG_NETUTILS_LIBWEBSOCKETS_TLS
 #define LWS_OPENSSL_CLIENT_CERTS "/etc/ssl/certs"
 #define LWS_OPENSSL_SUPPORT
+#endif
 /* #undef LWS_PLAT_OPTEE */
 #define LWS_PLAT_UNIX
 /* #undef LWS_PLAT_FREERTOS */
@@ -281,7 +283,7 @@
 /* #undef LWS_WITH_SDEVENT */
 #define LWS_WITH_LWSAC
 #define LWS_LOGS_TIMESTAMP
-#ifdef CONFIG_CRYPTO_MBEDTLS
+#ifdef CONFIG_NETUTILS_LIBWEBSOCKETS_TLS
 #define LWS_WITH_MBEDTLS
 #endif
 /* #undef LWS_WITH_MINIZ */
@@ -355,7 +357,7 @@
 /* #undef LWS_WITH_SYS_NTPCLIENT */
 #define LWS_WITH_SYS_STATE
 /* #undef LWS_WITH_THREADPOOL */
-#ifdef CONFIG_CRYPTO_MBEDTLS
+#ifdef CONFIG_NETUTILS_LIBWEBSOCKETS_TLS
 #define LWS_WITH_TLS
 /* #undef LWS_WITH_TLS_JIT_TRUST */
 #define LWS_WITH_TLS_SESSIONS

From 4263e27d92ac27b59dc8a92afcd8b68bbcd7e4f3 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Fri, 12 Jun 2026 10:50:38 -0300
Subject: [PATCH 427/568] netutils/libwebsockets: Enable libwebsockets server

This commit enables building libwebsockets server based on a new
Kconfig entry.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 netutils/libwebsockets/CMakeLists.txt | 10 +++++++++-
 netutils/libwebsockets/Kconfig        |  7 +++++++
 netutils/libwebsockets/Makefile       | 12 +++++++++++-
 netutils/libwebsockets/lws_config.h   |  4 +++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/netutils/libwebsockets/CMakeLists.txt b/netutils/libwebsockets/CMakeLists.txt
index 717788f13..ed3f58674 100644
--- a/netutils/libwebsockets/CMakeLists.txt
+++ b/netutils/libwebsockets/CMakeLists.txt
@@ -63,7 +63,8 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
       -DLWS_LIBRARY_VERSION_PATCH=${VERSION_PATCH}
       -DLWS_LIBRARY_VERSION_PATCH_ELABORATED=${VERSION_PATCH}-unknown
       -DLWS_LIBRARY_VERSION="${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}-unknown"
-      -Wno-shadow)
+      -Wno-shadow
+      -Wno-format)
 
   set(INCDIR
       ${CMAKE_CURRENT_LIST_DIR}
@@ -146,6 +147,13 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
       ${LIBWEBSOCKETS_DIR}/lib/roles/http/client/client-http.c
       ${LIBWEBSOCKETS_DIR}/lib/event-libs/poll/poll.c)
 
+  if(CONFIG_NETUTILS_LIBWEBSOCKETS_SERVER)
+    list(APPEND INCDIR ${LIBWEBSOCKETS_DIR}/lib/roles/http/server)
+    list(APPEND CSRCS ${LIBWEBSOCKETS_DIR}/lib/roles/ws/server-ws.c
+         ${LIBWEBSOCKETS_DIR}/lib/roles/http/server/server.c
+         ${LIBWEBSOCKETS_DIR}/lib/roles/listen/ops-listen.c)
+  endif()
+
   if(CONFIG_NETUTILS_LIBWEBSOCKETS_TLS)
     list(APPEND INCDIR ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include
          ${LIBWEBSOCKETS_DIR}/lib/tls/mbedtls/wrapper/include/internal)
diff --git a/netutils/libwebsockets/Kconfig b/netutils/libwebsockets/Kconfig
index 0e127e286..36c904906 100644
--- a/netutils/libwebsockets/Kconfig
+++ b/netutils/libwebsockets/Kconfig
@@ -16,6 +16,13 @@ config NETUTILS_LIBWEBSOCKETS_VERSION
 	string "Version number"
 	default "4.3.1"
 
+config NETUTILS_LIBWEBSOCKETS_SERVER
+	bool "Enable server support"
+	default n
+	---help---
+		Enable WebSocket/HTTP server support in libwebsockets.
+		When disabled, only client-side code is built.
+
 config NETUTILS_LIBWEBSOCKETS_TLS
 	bool "Enable TLS support"
 	default y
diff --git a/netutils/libwebsockets/Makefile b/netutils/libwebsockets/Makefile
index 2dbe64479..ff28433ce 100644
--- a/netutils/libwebsockets/Makefile
+++ b/netutils/libwebsockets/Makefile
@@ -35,7 +35,8 @@ CFLAGS += \
 	-DLWS_LIBRARY_VERSION_MINOR=$(call word-dot,$(LIBWEBSOCKETS_VERSION),2) \
 	-DLWS_LIBRARY_VERSION_PATCH=$(call word-dot,$(LIBWEBSOCKETS_VERSION),3) \
 	-DLWS_LIBRARY_VERSION_PATCH_ELABORATED=$(call word-dot,$(LIBWEBSOCKETS_VERSION),3)-unknown \
-	-DLWS_LIBRARY_VERSION=\"$(LIBWEBSOCKETS_VERSION)-unknown\"
+	-DLWS_LIBRARY_VERSION=\"$(LIBWEBSOCKETS_VERSION)-unknown\" \
+	-Wno-shadow -Wno-format
 
 CFLAGS += \
 	-I. \
@@ -118,6 +119,15 @@ CSRCS += \
 	$(LIBWEBSOCKETS_UNPACK)/lib/roles/http/client/client-http.c \
 	$(LIBWEBSOCKETS_UNPACK)/lib/event-libs/poll/poll.c
 
+ifneq ($(CONFIG_NETUTILS_LIBWEBSOCKETS_SERVER),)
+CSRCS += \
+	$(LIBWEBSOCKETS_UNPACK)/lib/roles/ws/server-ws.c \
+	$(LIBWEBSOCKETS_UNPACK)/lib/roles/http/server/server.c \
+	$(LIBWEBSOCKETS_UNPACK)/lib/roles/listen/ops-listen.c
+
+CFLAGS += -I$(LIBWEBSOCKETS_UNPACK)/lib/roles/http/server
+endif
+
 ifneq ($(CONFIG_NETUTILS_LIBWEBSOCKETS_TLS),)
 CSRCS += \
 	$(LIBWEBSOCKETS_UNPACK)/lib/tls/tls.c \
diff --git a/netutils/libwebsockets/lws_config.h b/netutils/libwebsockets/lws_config.h
index 6a4bcb79b..02fb9ef2c 100644
--- a/netutils/libwebsockets/lws_config.h
+++ b/netutils/libwebsockets/lws_config.h
@@ -294,7 +294,9 @@
 #define LWS_WITH_CACHE_NSCOOKIEJAR
 #define LWS_WITH_CLIENT
 #define LWS_WITHOUT_EXTENSIONS
-/* #undef LWS_WITH_SERVER */
+#ifdef CONFIG_NETUTILS_LIBWEBSOCKETS_SERVER
+#define LWS_WITH_SERVER
+#endif
 
 /* #undef LWS_WITH_SPAWN */
 

From d6cf3015d8203ac8f0717382768ee5dec43407ac Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Fri, 12 Jun 2026 17:17:15 -0300
Subject: [PATCH 428/568] netutils/libwebsockets: Fix error regarding building
 with CMake

Prior to this change, if an empty folder existed instead of the
actual libwebsockets source, the build would fail. This commit
checks for an actual file instead, avoid such kind of errors.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 netutils/libwebsockets/CMakeLists.txt | 34 ++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/netutils/libwebsockets/CMakeLists.txt b/netutils/libwebsockets/CMakeLists.txt
index ed3f58674..8f308e292 100644
--- a/netutils/libwebsockets/CMakeLists.txt
+++ b/netutils/libwebsockets/CMakeLists.txt
@@ -26,12 +26,19 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
 
   set(LIBWEBSOCKETS_DIR ${CMAKE_CURRENT_LIST_DIR}/libwebsockets)
 
-  if(NOT EXISTS ${LIBWEBSOCKETS_DIR})
+  # Match Makefile: strip kconfig quotes; default when olddefconfig has not run
+  set(LWS_VERSION ${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION})
+  string(REGEX REPLACE "^\"(.*)\"$" "\\1" LWS_VERSION "${LWS_VERSION}")
+  if(NOT LWS_VERSION)
+    set(LWS_VERSION "4.3.1")
+  endif()
+
+  if(NOT EXISTS "${LIBWEBSOCKETS_DIR}/lib/plat/unix/unix-caps.c")
     set(LIBWEBSOCKETS_URL "https://github.com/warmcat/libwebsockets/archive")
     FetchContent_Declare(
       libwebsockets_fetch
-      URL ${LIBWEBSOCKETS_URL}/v${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}.zip
-          SOURCE_DIR ${LIBWEBSOCKETS_DIR} BINARY_DIR
+      URL ${LIBWEBSOCKETS_URL}/v${LWS_VERSION}.zip SOURCE_DIR
+          ${LIBWEBSOCKETS_DIR} BINARY_DIR
           ${CMAKE_BINARY_DIR}/apps/netutils/libwebsockets/libwebsockets
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 30)
@@ -52,17 +59,26 @@ if(CONFIG_NETUTILS_LIBWEBSOCKETS)
   # Flags
   # ############################################################################
 
-  string(REGEX MATCHALL "[0-9]" versions
-               "${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}")
-  list(GET versions 0 VERSION_MAJOR)
-  list(GET versions 1 VERSION_MINOR)
-  list(GET versions 2 VERSION_PATCH)
+  string(REPLACE "." ";" LWS_VERSION_PARTS "${LWS_VERSION}")
+  list(GET LWS_VERSION_PARTS 0 VERSION_MAJOR)
+  list(LENGTH LWS_VERSION_PARTS LWS_VERSION_PARTS_LEN)
+  if(LWS_VERSION_PARTS_LEN GREATER 1)
+    list(GET LWS_VERSION_PARTS 1 VERSION_MINOR)
+  else()
+    set(VERSION_MINOR 0)
+  endif()
+  if(LWS_VERSION_PARTS_LEN GREATER 2)
+    list(GET LWS_VERSION_PARTS 2 VERSION_PATCH)
+  else()
+    set(VERSION_PATCH 0)
+  endif()
+
   set(FLAGS
       -DLWS_LIBRARY_VERSION_MAJOR=${VERSION_MAJOR}
       -DLWS_LIBRARY_VERSION_MINOR=${VERSION_MINOR}
       -DLWS_LIBRARY_VERSION_PATCH=${VERSION_PATCH}
       -DLWS_LIBRARY_VERSION_PATCH_ELABORATED=${VERSION_PATCH}-unknown
-      -DLWS_LIBRARY_VERSION="${CONFIG_NETUTILS_LIBWEBSOCKETS_VERSION}-unknown"
+      -DLWS_LIBRARY_VERSION="${LWS_VERSION}-unknown"
       -Wno-shadow
       -Wno-format)
 

From ec764fbbab6afd61e05d2171c0d258853f324194 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Fri, 12 Jun 2026 16:15:38 -0300
Subject: [PATCH 429/568] examples/lws_echo: Add a simple websocket server
 example

This commit adds a simple websocket server example that echoes data
back to the client using libwebsockets.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 examples/lws_echo/CMakeLists.txt  |  37 ++++++
 examples/lws_echo/Kconfig         |  31 +++++
 examples/lws_echo/Make.defs       |  25 ++++
 examples/lws_echo/Makefile        |  32 +++++
 examples/lws_echo/lws_echo_main.c | 203 ++++++++++++++++++++++++++++++
 5 files changed, 328 insertions(+)
 create mode 100644 examples/lws_echo/CMakeLists.txt
 create mode 100644 examples/lws_echo/Kconfig
 create mode 100644 examples/lws_echo/Make.defs
 create mode 100644 examples/lws_echo/Makefile
 create mode 100644 examples/lws_echo/lws_echo_main.c

diff --git a/examples/lws_echo/CMakeLists.txt b/examples/lws_echo/CMakeLists.txt
new file mode 100644
index 000000000..d959489f6
--- /dev/null
+++ b/examples/lws_echo/CMakeLists.txt
@@ -0,0 +1,37 @@
+# ##############################################################################
+# apps/examples/lws_echo/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_LWS_ECHO)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_LWS_ECHO_PROGNAME}
+    PRIORITY
+    ${CONFIG_EXAMPLES_LWS_ECHO_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_LWS_ECHO_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_LWS_ECHO}
+    DEPENDS
+    libwebsockets
+    SRCS
+    lws_echo_main.c)
+endif()
diff --git a/examples/lws_echo/Kconfig b/examples/lws_echo/Kconfig
new file mode 100644
index 000000000..b58daa24e
--- /dev/null
+++ b/examples/lws_echo/Kconfig
@@ -0,0 +1,31 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_LWS_ECHO
+	tristate "libwebsockets WebSocket echo server"
+	default n
+	depends on NETUTILS_LIBWEBSOCKETS && NETUTILS_LIBWEBSOCKETS_SERVER
+	---help---
+		Simple WebSocket echo server using libwebsockets without TLS.
+
+if EXAMPLES_LWS_ECHO
+
+config EXAMPLES_LWS_ECHO_PROGNAME
+	string "Program name"
+	default "lws_echo"
+
+config EXAMPLES_LWS_ECHO_PRIORITY
+	int "Task priority"
+	default 100
+
+config EXAMPLES_LWS_ECHO_STACKSIZE
+	int "Stack size"
+	default 16384
+
+config EXAMPLES_LWS_ECHO_PORT
+	int "WebSocket server TCP port"
+	default 9000
+
+endif
diff --git a/examples/lws_echo/Make.defs b/examples/lws_echo/Make.defs
new file mode 100644
index 000000000..b0a46ccd5
--- /dev/null
+++ b/examples/lws_echo/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/lws_echo/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_LWS_ECHO),)
+CONFIGURED_APPS += $(APPDIR)/examples/lws_echo
+endif
diff --git a/examples/lws_echo/Makefile b/examples/lws_echo/Makefile
new file mode 100644
index 000000000..48da93216
--- /dev/null
+++ b/examples/lws_echo/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/examples/lws_echo/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_EXAMPLES_LWS_ECHO_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_LWS_ECHO_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_LWS_ECHO_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_LWS_ECHO)
+
+MAINSRC = lws_echo_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/lws_echo/lws_echo_main.c b/examples/lws_echo/lws_echo_main.c
new file mode 100644
index 000000000..48bf644f0
--- /dev/null
+++ b/examples/lws_echo/lws_echo_main.c
@@ -0,0 +1,203 @@
+/****************************************************************************
+ * apps/examples/lws_echo/lws_echo_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <libwebsockets.h>
+#include <stdio.h>
+#include <string.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_EXAMPLES_LWS_ECHO_PORT
+#  define CONFIG_EXAMPLES_LWS_ECHO_PORT 9000
+#endif
+
+#define LWS_ECHO_IOBUF_SIZE 256
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct lws_echo_session_s
+{
+  unsigned char buf[LWS_PRE + LWS_ECHO_IOBUF_SIZE];
+  size_t len;
+  int pending;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int callback_echo(struct lws *wsi,
+                         enum lws_callback_reasons reason,
+                         void *user, void *in, size_t len);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct lws_protocols g_protocols[] =
+{
+  {
+    "echo-protocol",
+    callback_echo,
+    sizeof(struct lws_echo_session_s),
+    LWS_ECHO_IOBUF_SIZE,
+    0, NULL, 0
+  },
+  LWS_PROTOCOL_LIST_TERM
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: callback_echo
+ *
+ * Description:
+ *   libwebsockets protocol callback for the echo server.
+ *
+ * Input Parameters:
+ *   wsi    - Websocket instance.
+ *   reason - Callback reason.
+ *   user   - Per-session data.
+ *   in     - Received data.
+ *   len    - Length of received data.
+ *
+ * Returned Value:
+ *   Zero on success; non-zero on failure.
+ *
+ ****************************************************************************/
+
+static int callback_echo(struct lws *wsi,
+                         enum lws_callback_reasons reason,
+                         void *user, void *in, size_t len)
+{
+  struct lws_echo_session_s *pss = (struct lws_echo_session_s *)user;
+
+  switch (reason)
+    {
+    case LWS_CALLBACK_ESTABLISHED:
+      printf("lws_echo: client connected\n");
+      pss->pending = 0;
+      break;
+
+    case LWS_CALLBACK_RECEIVE:
+      if (len > sizeof(pss->buf) - LWS_PRE)
+        {
+          len = sizeof(pss->buf) - LWS_PRE;
+        }
+
+      memcpy(&pss->buf[LWS_PRE], in, len);
+      pss->len = len;
+      pss->pending = 1;
+      lws_callback_on_writable(wsi);
+      break;
+
+    case LWS_CALLBACK_SERVER_WRITEABLE:
+      if (!pss->pending)
+        {
+          break;
+        }
+
+      lws_write(wsi, &pss->buf[LWS_PRE], pss->len, LWS_WRITE_TEXT);
+      pss->pending = 0;
+      break;
+
+    case LWS_CALLBACK_CLOSED:
+      printf("lws_echo: client disconnected\n");
+      break;
+
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ *
+ * Description:
+ *   Start a libwebsockets WebSocket echo server.
+ *
+ * Input Parameters:
+ *   Standard argc and argv.
+ *
+ * Returned Value:
+ *   Zero on success; non-zero on failure.
+ *
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct lws_context_creation_info info;
+  struct lws_context *context;
+  int n;
+
+  lws_set_log_level(LLL_USER | LLL_ERR | LLL_WARN | LLL_NOTICE, NULL);
+
+  printf("lws_echo: starting WebSocket echo server on port %d\n",
+         CONFIG_EXAMPLES_LWS_ECHO_PORT);
+  printf("lws_echo: connect with ws://<device-ip>:%d "
+         "(subprotocol echo-protocol)\n",
+         CONFIG_EXAMPLES_LWS_ECHO_PORT);
+
+  memset(&info, 0, sizeof(info));
+  info.port = CONFIG_EXAMPLES_LWS_ECHO_PORT;
+  info.protocols = g_protocols;
+  info.vhost_name = "localhost";
+  info.options = 0;
+
+  context = lws_create_context(&info);
+  if (context == NULL)
+    {
+      printf("lws_echo: ERROR creating context\n");
+      return 1;
+    }
+
+  printf("lws_echo: server running\n");
+
+  n = 0;
+  while (n >= 0)
+    {
+      n = lws_service(context, 100);
+    }
+
+  lws_context_destroy(context);
+  printf("lws_echo: server stopped\n");
+
+  return 0;
+}

From b523f0e51342689b8f3db785c074c47f6c6ee9ff Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Thu, 11 Jun 2026 09:32:38 -0300
Subject: [PATCH 430/568] interpreters/python: Optmize Python for size

This aims to reduce Python's library size.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 interpreters/python/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index 36aaed3ab..bda257932 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -163,7 +163,7 @@ $(TARGETBUILD)/Makefile: $(HOSTPYTHON) $(CONFIG_SITE) $(SETUP_LOCAL)
 			AR="$(AR)" \
 			ARFLAGS=" " \
 			MACHDEP="$(MACHDEP)" \
-			OPT="-O3" \
+			OPT="-Os" \
 			CONFIG_SITE="$(CONFIG_SITE)" \
 			$(CPYTHON_PATH)/configure \
 			 --prefix=${TARGETINSTALL} \

From 1e19ceb3470057813c46bdf7c6a1c70ad434d8a1 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Wed, 10 Jun 2026 08:49:35 -0300
Subject: [PATCH 431/568] examples/webpanel: Add a web panel application to
 configure NuttX

Initial development of the NuttX's Web Panel application. This is
a self-hosted web page application that enables retrieving system
info, provides a simple NSH terminal and enables uploading files.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 .codespellrc                               |   3 +-
 examples/webpanel/.gitignore               |   2 +
 examples/webpanel/CMakeLists.txt           |  25 +
 examples/webpanel/Kconfig                  | 109 ++++
 examples/webpanel/Make.defs                |  25 +
 examples/webpanel/Makefile                 |  94 +++
 examples/webpanel/cgi_files.c              | 314 ++++++++++
 examples/webpanel/cgi_renew.c              |  72 +++
 examples/webpanel/cgi_sysinfo.c            | 414 +++++++++++++
 examples/webpanel/cgi_upload.c             | 637 +++++++++++++++++++++
 examples/webpanel/content/www/index.html   | 454 +++++++++++++++
 examples/webpanel/content/www/xterm.css    | 218 +++++++
 examples/webpanel/content/www/xterm.min.js |   8 +
 examples/webpanel/webpanel_main.c          | 207 +++++++
 examples/webpanel/ws_terminal.c            | 350 +++++++++++
 examples/webpanel/ws_terminal.h            |  63 ++
 16 files changed, 2994 insertions(+), 1 deletion(-)
 create mode 100644 examples/webpanel/.gitignore
 create mode 100644 examples/webpanel/CMakeLists.txt
 create mode 100644 examples/webpanel/Kconfig
 create mode 100644 examples/webpanel/Make.defs
 create mode 100644 examples/webpanel/Makefile
 create mode 100644 examples/webpanel/cgi_files.c
 create mode 100644 examples/webpanel/cgi_renew.c
 create mode 100644 examples/webpanel/cgi_sysinfo.c
 create mode 100644 examples/webpanel/cgi_upload.c
 create mode 100644 examples/webpanel/content/www/index.html
 create mode 100644 examples/webpanel/content/www/xterm.css
 create mode 100644 examples/webpanel/content/www/xterm.min.js
 create mode 100644 examples/webpanel/webpanel_main.c
 create mode 100644 examples/webpanel/ws_terminal.c
 create mode 100644 examples/webpanel/ws_terminal.h

diff --git a/.codespellrc b/.codespellrc
index 8bcdf2bc7..651916c6a 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -8,6 +8,7 @@ exclude-file = .codespell-ignore-lines
 # Ignore complete files (e.g. legal text or other immutable material).
 skip =
   LICENSE,
+  examples/webpanel/content/www/xterm.min.js,
 
 # Ignore words list (FTP protocol commands and technical terms)
-ignore-words-list = ALLO, ARCHTYPE, parm
+ignore-words-list = ALLO, ARCHTYPE, parm, shiftIn
diff --git a/examples/webpanel/.gitignore b/examples/webpanel/.gitignore
new file mode 100644
index 000000000..583a0928d
--- /dev/null
+++ b/examples/webpanel/.gitignore
@@ -0,0 +1,2 @@
+# ROMFS build artifacts (generated by Makefile)
+/content
diff --git a/examples/webpanel/CMakeLists.txt b/examples/webpanel/CMakeLists.txt
new file mode 100644
index 000000000..ed47cabbd
--- /dev/null
+++ b/examples/webpanel/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ##############################################################################
+# apps/examples/webpanel/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_WEBPANEL)
+  nuttx_add_application(NAME ${CONFIG_EXAMPLES_WEBPANEL_PROGNAME})
+endif()
diff --git a/examples/webpanel/Kconfig b/examples/webpanel/Kconfig
new file mode 100644
index 000000000..b1392c725
--- /dev/null
+++ b/examples/webpanel/Kconfig
@@ -0,0 +1,109 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_WEBPANEL
+	tristate "Web Panel for device management"
+	default n
+	depends on NET_TCP
+	depends on NETUTILS_THTTPD
+	depends on NETUTILS_LIBWEBSOCKETS
+	depends on NETUTILS_LIBWEBSOCKETS_SERVER
+	depends on FS_BINFS
+	depends on FS_UNIONFS
+	depends on PSEUDOTERM
+	depends on PSEUDOTERM_SUSV1
+	---help---
+		Enable the Web Panel application, a Tasmota-inspired web
+		interface for NuttX devices. Provides a landing page served
+		via THTTPD from ROMFS, CGI handlers for system info, file
+		management, and a WebSocket-based NSH terminal (powered
+		by libwebsockets).
+
+if EXAMPLES_WEBPANEL
+
+config EXAMPLES_WEBPANEL_PROGNAME
+	string "Program name"
+	default "webpanel"
+
+config EXAMPLES_WEBPANEL_PRIORITY
+	int "Web Panel task priority"
+	default 100
+
+config EXAMPLES_WEBPANEL_STACKSIZE
+	int "Web Panel stack size"
+	default 4096
+
+config EXAMPLES_WEBPANEL_NETIF
+	string "Network interface name"
+	default "eth0"
+	---help---
+		Name of the network interface used by the web panel for
+		system info queries and DHCP renew (e.g. eth0, wlan0).
+
+config EXAMPLES_WEBPANEL_CGI_SYSINFO_PROGNAME
+	string "CGI sysinfo program name"
+	default "sysinfo"
+
+config EXAMPLES_WEBPANEL_CGI_SYSINFO_PRIORITY
+	int "CGI sysinfo task priority"
+	default 100
+
+config EXAMPLES_WEBPANEL_CGI_SYSINFO_STACKSIZE
+	int "CGI sysinfo stack size"
+	default 4096
+
+config EXAMPLES_WEBPANEL_CGI_FILES_PROGNAME
+	string "CGI files program name"
+	default "files"
+
+config EXAMPLES_WEBPANEL_CGI_FILES_PRIORITY
+	int "CGI files task priority"
+	default 100
+
+config EXAMPLES_WEBPANEL_CGI_FILES_STACKSIZE
+	int "CGI files stack size"
+	default 4096
+
+config EXAMPLES_WEBPANEL_CGI_UPLOAD_PROGNAME
+	string "CGI upload program name"
+	default "upload"
+
+config EXAMPLES_WEBPANEL_CGI_UPLOAD_PRIORITY
+	int "CGI upload task priority"
+	default 100
+
+config EXAMPLES_WEBPANEL_CGI_UPLOAD_STACKSIZE
+	int "CGI upload stack size"
+	default 8192
+
+config EXAMPLES_WEBPANEL_CGI_RENEW_PROGNAME
+	string "CGI DHCP renew program name"
+	default "dhcprenew"
+
+config EXAMPLES_WEBPANEL_CGI_RENEW_PRIORITY
+	int "CGI DHCP renew task priority"
+	default 100
+
+config EXAMPLES_WEBPANEL_CGI_RENEW_STACKSIZE
+	int "CGI DHCP renew stack size"
+	default 4096
+
+config EXAMPLES_WEBPANEL_WS_PORT
+	int "WebSocket terminal TCP port"
+	default 8080
+
+config EXAMPLES_WEBPANEL_WS_PRIORITY
+	int "WebSocket server task priority"
+	default 100
+
+config EXAMPLES_WEBPANEL_WS_STACKSIZE
+	int "WebSocket daemon stack size"
+	default 8192
+
+config EXAMPLES_WEBPANEL_WS_NSH_STACKSIZE
+	int "WebSocket NSH session stack size"
+	default 4096
+
+endif
diff --git a/examples/webpanel/Make.defs b/examples/webpanel/Make.defs
new file mode 100644
index 000000000..bf880eb82
--- /dev/null
+++ b/examples/webpanel/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/webpanel/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_WEBPANEL),)
+CONFIGURED_APPS += $(APPDIR)/examples/webpanel
+endif
diff --git a/examples/webpanel/Makefile b/examples/webpanel/Makefile
new file mode 100644
index 000000000..12d6be8e6
--- /dev/null
+++ b/examples/webpanel/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/examples/webpanel/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Web Panel application + CGI handlers
+# NuttX multi-program build: space-separated lists, matched by position.
+
+CSRCS   = romfs.c ws_terminal.c
+MAINSRC = webpanel_main.c cgi_sysinfo.c cgi_files.c cgi_upload.c cgi_renew.c
+
+PROGNAME  = $(CONFIG_EXAMPLES_WEBPANEL_PROGNAME) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_SYSINFO_PROGNAME) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_FILES_PROGNAME) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_UPLOAD_PROGNAME) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_RENEW_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_WEBPANEL_PRIORITY) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_SYSINFO_PRIORITY) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_FILES_PRIORITY) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_UPLOAD_PRIORITY) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_RENEW_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_WEBPANEL_STACKSIZE) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_SYSINFO_STACKSIZE) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_FILES_STACKSIZE) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_UPLOAD_STACKSIZE) \
+            $(CONFIG_EXAMPLES_WEBPANEL_CGI_RENEW_STACKSIZE)
+
+LWS_DIR = $(APPDIR)/netutils/libwebsockets
+CFLAGS += -I$(LWS_DIR) \
+          -I$(LWS_DIR)/libwebsockets/include
+
+MODULE    = $(CONFIG_EXAMPLES_WEBPANEL)
+
+VPATH   += content
+DEPPATH += --dep-path content
+
+# ROMFS image generation
+# Static web content goes directly into the ROMFS root (no www/ subdir)
+
+WEBPANEL_DIR  = $(APPDIR)/examples/webpanel
+CONTENT_DIR   = $(WEBPANEL_DIR)/content
+ROMFS_DIR     = $(CONTENT_DIR)/romfs
+ROMFS_IMG     = $(CONTENT_DIR)/romfs.img
+ROMFS_SRC     = $(CONTENT_DIR)/romfs.c
+
+WWW_FILES = $(wildcard $(CONTENT_DIR)/www/*)
+
+$(CONTENT_DIR)/.romfs_stamp: $(WWW_FILES)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) cp -a $(CONTENT_DIR)/www/* $(ROMFS_DIR)/
+	$(Q) touch $@
+
+$(ROMFS_IMG): $(CONTENT_DIR)/.romfs_stamp
+	$(Q) genromfs -f $@ -d $(ROMFS_DIR) -V "WebPanelROMFS"
+
+$(ROMFS_SRC): $(ROMFS_IMG)
+	$(Q) (cd $(CONTENT_DIR) && \
+	      echo "#include <nuttx/compiler.h>" >$@ && \
+	      xxd -i romfs.img | \
+	      sed -e "s/romfs_img/webpanel_romfs_img/g" | \
+	      sed -e "s/^unsigned char/const unsigned char aligned_data(4)/g" >>$@)
+
+content/romfs.c: $(ROMFS_SRC)
+
+context::
+
+clean::
+	$(call DELFILE, $(ROMFS_SRC))
+	$(call DELFILE, $(ROMFS_IMG))
+	$(call DELFILE, $(CONTENT_DIR)/.romfs_stamp)
+	$(Q) rm -rf $(ROMFS_DIR)
+
+distclean:: clean
+
+include $(APPDIR)/Application.mk
diff --git a/examples/webpanel/cgi_files.c b/examples/webpanel/cgi_files.c
new file mode 100644
index 000000000..fdc67b868
--- /dev/null
+++ b/examples/webpanel/cgi_files.c
@@ -0,0 +1,314 @@
+/****************************************************************************
+ * apps/examples/webpanel/cgi_files.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define FILES_DIR "/mnt"
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void url_decode(char *dst, const char *src, size_t dstsize);
+static const char *get_query_param(const char *qs, const char *key,
+                                   char *val, size_t vallen);
+static void handle_list(void);
+static void handle_delete(const char *name);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: url_decode
+ *
+ * Description:
+ *   Decode a URL-encoded string into a destination buffer.
+ *
+ * Input Parameters:
+ *   dst     - Destination buffer.
+ *   src     - Source URL-encoded string.
+ *   dstsize - Size of destination buffer.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void url_decode(char *dst, const char *src, size_t dstsize)
+{
+  size_t i = 0;
+
+  while (*src && i < dstsize - 1)
+    {
+      if (*src == '%' && src[1] && src[2])
+        {
+          char hex[3];
+
+          hex[0] = src[1];
+          hex[1] = src[2];
+          hex[2] = '\0';
+          dst[i++] = (char)strtol(hex, NULL, 16);
+          src += 3;
+        }
+      else if (*src == '+')
+        {
+          dst[i++] = ' ';
+          src++;
+        }
+      else
+        {
+          dst[i++] = *src++;
+        }
+    }
+
+  dst[i] = '\0';
+}
+
+/****************************************************************************
+ * Name: get_query_param
+ *
+ * Description:
+ *   Find and decode a key=value parameter from the QUERY_STRING.
+ *
+ * Input Parameters:
+ *   qs     - Query string.
+ *   key    - Parameter name to search for.
+ *   val    - Output buffer for decoded value.
+ *   vallen - Size of output buffer.
+ *
+ * Returned Value:
+ *   Pointer to val on success; NULL if not found or invalid input.
+ *
+ ****************************************************************************/
+
+static const char *get_query_param(const char *qs, const char *key,
+                                   char *val, size_t vallen)
+{
+  const char *p;
+  size_t klen;
+
+  if (qs == NULL || key == NULL)
+    {
+      return NULL;
+    }
+
+  klen = strlen(key);
+  p = qs;
+
+  while (*p)
+    {
+      if (strncmp(p, key, klen) == 0 && p[klen] == '=')
+        {
+          const char *start = p + klen + 1;
+          const char *end = strchr(start, '&');
+          size_t len;
+
+          if (end == NULL)
+            {
+              end = start + strlen(start);
+            }
+
+          len = end - start;
+          if (len >= vallen)
+            {
+              len = vallen - 1;
+            }
+
+          url_decode(val, start, len + 1);
+          return val;
+        }
+
+      p = strchr(p, '&');
+      if (p == NULL)
+        {
+          break;
+        }
+
+      p++;
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: handle_list
+ *
+ * Description:
+ *   Emit a JSON response listing files in FILES_DIR.
+ *
+ * Input Parameters:
+ *   None.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void handle_list(void)
+{
+  DIR *dir;
+  struct dirent *ent;
+  struct stat st;
+  char path[128];
+  int first = 1;
+
+  puts("Content-type: application/json\r\n"
+       "\r\n");
+
+  printf("{\"files\":[");
+
+  dir = opendir(FILES_DIR);
+  if (dir != NULL)
+    {
+      while ((ent = readdir(dir)) != NULL)
+        {
+          if (ent->d_name[0] == '.')
+            {
+              continue;
+            }
+
+          snprintf(path, sizeof(path), "%s/%s", FILES_DIR, ent->d_name);
+
+          if (!first)
+            {
+              printf(",");
+            }
+
+          first = 0;
+
+          if (stat(path, &st) == 0)
+            {
+              printf("{\"name\":\"%s\",\"size\":%ld}",
+                     ent->d_name, (long)st.st_size);
+            }
+          else
+            {
+              printf("{\"name\":\"%s\",\"size\":0}", ent->d_name);
+            }
+        }
+
+      closedir(dir);
+    }
+
+  printf("]}\n");
+}
+
+/****************************************************************************
+ * Name: handle_delete
+ *
+ * Description:
+ *   Delete the requested file from FILES_DIR and emit a JSON response.
+ *
+ * Input Parameters:
+ *   name - File name to delete.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void handle_delete(const char *name)
+{
+  char path[128];
+
+  if (name == NULL || name[0] == '\0' || strchr(name, '/') != NULL)
+    {
+      puts("Content-type: application/json\r\n"
+           "Status: 400\r\n"
+           "\r\n");
+      printf("{\"error\":\"Invalid filename\"}\n");
+      return;
+    }
+
+  snprintf(path, sizeof(path), "%s/%s", FILES_DIR, name);
+
+  if (unlink(path) == 0)
+    {
+      puts("Content-type: application/json\r\n"
+           "\r\n");
+      printf("{\"ok\":true}\n");
+    }
+  else
+    {
+      puts("Content-type: application/json\r\n"
+           "Status: 404\r\n"
+           "\r\n");
+      printf("{\"error\":\"File not found\"}\n");
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: files_main
+ *
+ * Description:
+ *   Entry point for file list/delete CGI handling.
+ *
+ * Input Parameters:
+ *   argc - Number of arguments.
+ *   argv - Argument vector.
+ *
+ * Returned Value:
+ *   Zero (OK).
+ *
+ ****************************************************************************/
+
+int files_main(int argc, FAR char *argv[])
+{
+  const char *qs;
+  char action[16];
+  char name[64];
+
+  qs = getenv("QUERY_STRING");
+
+  if (qs != NULL && get_query_param(qs, "action", action, sizeof(action)))
+    {
+      if (strcmp(action, "delete") == 0)
+        {
+          get_query_param(qs, "name", name, sizeof(name));
+          handle_delete(name);
+          return 0;
+        }
+    }
+
+  handle_list();
+  return 0;
+}
diff --git a/examples/webpanel/cgi_renew.c b/examples/webpanel/cgi_renew.c
new file mode 100644
index 000000000..098995094
--- /dev/null
+++ b/examples/webpanel/cgi_renew.c
@@ -0,0 +1,72 @@
+/****************************************************************************
+ * apps/examples/webpanel/cgi_renew.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+
+#include "netutils/netlib.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: dhcprenew_main
+ *
+ * Description:
+ *   CGI entry point that renews the IPv4 address on the configured
+ *   interface and returns the result as JSON.
+ *
+ * Input Parameters:
+ *   argc - Number of arguments.
+ *   argv - Argument vector.
+ *
+ * Returned Value:
+ *   Zero on success; one on failure.
+ *
+ ****************************************************************************/
+
+int dhcprenew_main(int argc, FAR char *argv[])
+{
+  int ret;
+
+  ret = netlib_obtain_ipv4addr(CONFIG_EXAMPLES_WEBPANEL_NETIF);
+
+  puts("Content-type: application/json\r\n"
+       "\r\n");
+
+  if (ret >= 0)
+    {
+      puts("{\"status\":\"ok\"}\n");
+    }
+  else
+    {
+      printf("{\"status\":\"error\",\"code\":%d}\n", ret);
+    }
+
+  return ret < 0 ? 1 : 0;
+}
diff --git a/examples/webpanel/cgi_sysinfo.c b/examples/webpanel/cgi_sysinfo.c
new file mode 100644
index 000000000..619eb4cf1
--- /dev/null
+++ b/examples/webpanel/cgi_sysinfo.c
@@ -0,0 +1,414 @@
+/****************************************************************************
+ * apps/examples/webpanel/cgi_sysinfo.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <time.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/utsname.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void get_version(char *ver, size_t vlen,
+                        char *build, size_t blen,
+                        char *board, size_t boardlen);
+static void get_arch(char *arch, size_t archlen);
+static unsigned long get_uptime(char *buf, size_t len);
+static void get_net_info(char *ip, size_t iplen,
+                         char *mask, size_t masklen,
+                         char *gw, size_t gwlen,
+                         char *mac, size_t maclen);
+static int count_files(const char *path);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: get_version
+ *
+ * Description:
+ *   Read version, build hash, and board information from /proc/version.
+ *
+ * Input Parameters:
+ *   ver      - Output buffer for version string.
+ *   vlen     - Size of ver buffer.
+ *   build    - Output buffer for build/hash string.
+ *   blen     - Size of build buffer.
+ *   board    - Output buffer for board string.
+ *   boardlen - Size of board buffer.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void get_version(char *ver, size_t vlen,
+                        char *build, size_t blen,
+                        char *board, size_t boardlen)
+{
+  FILE *fp;
+  char line[256];
+  char *p;
+  char *sp;
+  char *last;
+  char *tok;
+  size_t n;
+
+  strncpy(ver,   "unknown", vlen);
+  strncpy(build, "unknown", blen);
+  strncpy(board, "unknown", boardlen);
+
+  fp = fopen("/proc/version", "r");
+  if (fp == NULL)
+    {
+      return;
+    }
+
+  if (fgets(line, sizeof(line), fp) != NULL)
+    {
+      /* Format: "NuttX version X.Y.Z HASH DATE TIME BOARD:CONFIG" */
+
+      p = strstr(line, "version ");
+      if (p != NULL)
+        {
+          p += 8;
+
+          /* version token */
+
+          sp = strchr(p, ' ');
+          if (sp != NULL)
+            {
+              n = sp - p;
+              if (n >= vlen)
+                {
+                  n = vlen - 1;
+                }
+
+              memcpy(ver, p, n);
+              ver[n] = '\0';
+
+              /* build (git hash) token */
+
+              p = sp + 1;
+              sp = strchr(p, ' ');
+              if (sp != NULL)
+                {
+                  n = sp - p;
+                  if (n >= blen)
+                    {
+                      n = blen - 1;
+                    }
+
+                  memcpy(build, p, n);
+                  build[n] = '\0';
+                }
+            }
+        }
+
+      /* Board name is the last whitespace-separated token; trim :config */
+
+      last = NULL;
+      tok  = strtok(line, " \t\r\n");
+      while (tok != NULL)
+        {
+          last = tok;
+          tok  = strtok(NULL, " \t\r\n");
+        }
+
+      if (last != NULL)
+        {
+          char *colon = strchr(last, ':');
+          if (colon != NULL)
+            {
+              *colon = '\0';
+            }
+
+          strncpy(board, last, boardlen - 1);
+          board[boardlen - 1] = '\0';
+        }
+    }
+
+  fclose(fp);
+}
+
+/****************************************************************************
+ * Name: get_arch
+ *
+ * Description:
+ *   Query architecture information via uname().
+ *
+ * Input Parameters:
+ *   arch    - Output buffer for architecture string.
+ *   archlen - Size of arch buffer.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void get_arch(char *arch, size_t archlen)
+{
+  struct utsname uts;
+
+  strncpy(arch, "unknown", archlen);
+
+  if (uname(&uts) == 0)
+    {
+      strncpy(arch, uts.machine, archlen - 1);
+      arch[archlen - 1] = '\0';
+    }
+}
+
+/****************************************************************************
+ * Name: get_uptime
+ *
+ * Description:
+ *   Read system uptime based on CLOCK_MONOTONIC and format it.
+ *
+ * Input Parameters:
+ *   buf - Output buffer for formatted uptime.
+ *   len - Size of buf.
+ *
+ * Returned Value:
+ *   Uptime in seconds; zero on error.
+ *
+ ****************************************************************************/
+
+static unsigned long get_uptime(char *buf, size_t len)
+{
+  struct timespec ts;
+
+  if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
+    {
+      unsigned long secs = ts.tv_sec;
+      unsigned int days = secs / 86400;
+      unsigned int hrs  = (secs % 86400) / 3600;
+      unsigned int mins = (secs % 3600) / 60;
+      unsigned int s    = secs % 60;
+
+      if (days > 0)
+        {
+          snprintf(buf, len, "%ud %02u:%02u:%02u", days, hrs, mins, s);
+        }
+      else
+        {
+          snprintf(buf, len, "%02u:%02u:%02u", hrs, mins, s);
+        }
+
+      return secs;
+    }
+
+  snprintf(buf, len, "unknown");
+  return 0;
+}
+
+/****************************************************************************
+ * Name: get_net_info
+ *
+ * Description:
+ *   Query IP, netmask, gateway, and MAC for the configured interface.
+ *
+ * Input Parameters:
+ *   ip      - Output buffer for IPv4 address.
+ *   iplen   - Size of ip buffer.
+ *   mask    - Output buffer for netmask.
+ *   masklen - Size of mask buffer.
+ *   gw      - Output buffer for gateway.
+ *   gwlen   - Size of gw buffer.
+ *   mac     - Output buffer for MAC address.
+ *   maclen  - Size of mac buffer.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void get_net_info(char *ip, size_t iplen,
+                         char *mask, size_t masklen,
+                         char *gw, size_t gwlen,
+                         char *mac, size_t maclen)
+{
+  int sockfd;
+  struct ifreq ifr;
+
+  strncpy(ip, "N/A", iplen);
+  strncpy(mask, "N/A", masklen);
+  strncpy(gw, "N/A", gwlen);
+  strncpy(mac, "N/A", maclen);
+
+  sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+  if (sockfd < 0)
+    {
+      return;
+    }
+
+  memset(&ifr, 0, sizeof(ifr));
+  strncpy(ifr.ifr_name, CONFIG_EXAMPLES_WEBPANEL_NETIF, IFNAMSIZ);
+
+  if (ioctl(sockfd, SIOCGIFADDR, &ifr) == 0)
+    {
+      struct sockaddr_in *sa = (struct sockaddr_in *)&ifr.ifr_addr;
+      inet_ntop(AF_INET, &sa->sin_addr, ip, iplen);
+    }
+
+  if (ioctl(sockfd, SIOCGIFNETMASK, &ifr) == 0)
+    {
+      struct sockaddr_in *sa = (struct sockaddr_in *)&ifr.ifr_netmask;
+      inet_ntop(AF_INET, &sa->sin_addr, mask, masklen);
+    }
+
+  if (ioctl(sockfd, SIOCGIFDSTADDR, &ifr) == 0)
+    {
+      struct sockaddr_in *sa = (struct sockaddr_in *)&ifr.ifr_dstaddr;
+      inet_ntop(AF_INET, &sa->sin_addr, gw, gwlen);
+    }
+
+  if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) == 0)
+    {
+      unsigned char *hw = (unsigned char *)ifr.ifr_hwaddr.sa_data;
+      snprintf(mac, maclen, "%02x:%02x:%02x:%02x:%02x:%02x",
+               hw[0], hw[1], hw[2], hw[3], hw[4], hw[5]);
+    }
+
+  close(sockfd);
+}
+
+/****************************************************************************
+ * Name: count_files
+ *
+ * Description:
+ *   Count visible files in a directory.
+ *
+ * Input Parameters:
+ *   path - Directory path.
+ *
+ * Returned Value:
+ *   Number of visible entries.
+ *
+ ****************************************************************************/
+
+static int count_files(const char *path)
+{
+  DIR *dir;
+  struct dirent *ent;
+  int count = 0;
+
+  dir = opendir(path);
+  if (dir == NULL)
+    {
+      return 0;
+    }
+
+  while ((ent = readdir(dir)) != NULL)
+    {
+      if (ent->d_name[0] != '.')
+        {
+          count++;
+        }
+    }
+
+  closedir(dir);
+  return count;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: sysinfo_main
+ *
+ * Description:
+ *   CGI entry point that returns board and runtime information as JSON.
+ *
+ * Input Parameters:
+ *   argc - Number of arguments.
+ *   argv - Argument vector.
+ *
+ * Returned Value:
+ *   Zero (OK).
+ *
+ ****************************************************************************/
+
+int sysinfo_main(int argc, FAR char *argv[])
+{
+  char version[16];
+  char build[16];
+  char board[64];
+  char arch[32];
+  char uptime[32];
+  char ip[16];
+  char mask[16];
+  char gw[16];
+  char mac[24];
+  unsigned long uptime_sec;
+  int nfiles;
+
+  get_version(version, sizeof(version), build, sizeof(build),
+              board, sizeof(board));
+  get_arch(arch, sizeof(arch));
+  uptime_sec = get_uptime(uptime, sizeof(uptime));
+  get_net_info(ip, sizeof(ip), mask, sizeof(mask),
+               gw, sizeof(gw), mac, sizeof(mac));
+  nfiles = count_files("/mnt");
+
+  puts("Content-type: application/json\r\n"
+       "\r\n");
+
+  printf("{"
+         "\"chip\":\"" CONFIG_ARCH_CHIP "\","
+         "\"board\":\"%s\","
+         "\"os\":\"NuttX\","
+         "\"version\":\"%s\","
+         "\"build\":\"%s\","
+         "\"arch\":\"%s\","
+         "\"ifname\":\"" CONFIG_EXAMPLES_WEBPANEL_NETIF "\","
+         "\"ip\":\"%s\","
+         "\"mask\":\"%s\","
+         "\"gw\":\"%s\","
+         "\"mac\":\"%s\","
+         "\"uptime\":\"%s\","
+         "\"uptime_sec\":%lu,"
+         "\"files\":%d"
+         "}\n",
+         board, version, build, arch,
+         ip, mask, gw, mac,
+         uptime, uptime_sec, nfiles);
+
+  return 0;
+}
diff --git a/examples/webpanel/cgi_upload.c b/examples/webpanel/cgi_upload.c
new file mode 100644
index 000000000..4dfd137ad
--- /dev/null
+++ b/examples/webpanel/cgi_upload.c
@@ -0,0 +1,637 @@
+/****************************************************************************
+ * apps/examples/webpanel/cgi_upload.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define UPLOAD_DIR   "/mnt"
+#define BUF_SIZE     512
+#define MAX_FILENAME 64
+#define MAX_BOUNDARY 80
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void cgi_error(int status, const char *msg);
+static void cgi_ok(const char *filename);
+static int extract_boundary(const char *content_type, char *boundary,
+                            size_t blen);
+static int extract_filename(const char *line, char *name, size_t nlen);
+static size_t read_stdin(char *buf, size_t n);
+static char *memmem_local(const char *haystack, size_t hlen,
+                          const char *needle, size_t nlen);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: cgi_error
+ *
+ * Description:
+ *   Emit a JSON error response with HTTP status.
+ *
+ * Input Parameters:
+ *   status - HTTP status code.
+ *   msg    - Error message string.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void cgi_error(int status, const char *msg)
+{
+  printf("Content-type: application/json\r\n"
+         "Status: %d\r\n"
+         "\r\n"
+         "{\"error\":\"%s\"}\n", status, msg);
+}
+
+/****************************************************************************
+ * Name: cgi_ok
+ *
+ * Description:
+ *   Emit a JSON success response.
+ *
+ * Input Parameters:
+ *   filename - Uploaded file name.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void cgi_ok(const char *filename)
+{
+  printf("Content-type: application/json\r\n"
+         "\r\n"
+         "{\"ok\":true,\"name\":\"%s\"}\n", filename);
+}
+
+/****************************************************************************
+ * Name: extract_boundary
+ *
+ * Description:
+ *   Extract multipart boundary from CONTENT_TYPE.
+ *
+ * Input Parameters:
+ *   content_type - CONTENT_TYPE value.
+ *   boundary     - Output buffer for boundary token.
+ *   blen         - Size of boundary buffer.
+ *
+ * Returned Value:
+ *   Zero on success; negated value on failure.
+ *
+ ****************************************************************************/
+
+static int extract_boundary(const char *content_type, char *boundary,
+                            size_t blen)
+{
+  const char *p;
+  char *q;
+  size_t len;
+
+  p = strstr(content_type, "boundary=");
+  if (p == NULL)
+    {
+      return -1;
+    }
+
+  p += 9;
+
+  /* Skip optional quotes */
+
+  if (*p == '"')
+    {
+      p++;
+    }
+
+  strncpy(boundary, p, blen - 1);
+  boundary[blen - 1] = '\0';
+
+  /* Remove trailing quote if present */
+
+  q = strchr(boundary, '"');
+  if (q != NULL)
+    {
+      *q = '\0';
+    }
+
+  /* Remove trailing whitespace/CR/LF */
+
+  len = strlen(boundary);
+  while (len > 0 &&
+         (boundary[len - 1] == '\r' || boundary[len - 1] == '\n' ||
+          boundary[len - 1] == ' '))
+    {
+      boundary[--len] = '\0';
+    }
+
+  return len > 0 ? 0 : -1;
+}
+
+/****************************************************************************
+ * Name: extract_filename
+ *
+ * Description:
+ *   Extract a safe filename from a Content-Disposition header line.
+ *
+ * Input Parameters:
+ *   line - Header line.
+ *   name - Output buffer for filename.
+ *   nlen - Size of name buffer.
+ *
+ * Returned Value:
+ *   Zero on success; negated value on failure.
+ *
+ ****************************************************************************/
+
+static int extract_filename(const char *line, char *name, size_t nlen)
+{
+  const char *p;
+  const char *end;
+  size_t len;
+
+  p = strstr(line, "filename=\"");
+  if (p == NULL)
+    {
+      return -1;
+    }
+
+  p += 10;
+  end = strchr(p, '"');
+  if (end == NULL)
+    {
+      return -1;
+    }
+
+  len = end - p;
+  if (len == 0 || len >= nlen)
+    {
+      return -1;
+    }
+
+  /* Reject path separators in filename */
+
+  if (memchr(p, '/', len) != NULL || memchr(p, '\\', len) != NULL)
+    {
+      return -1;
+    }
+
+  memcpy(name, p, len);
+  name[len] = '\0';
+  return 0;
+}
+
+/****************************************************************************
+ * Name: read_stdin
+ *
+ * Description:
+ *   Read exactly n bytes from standard input unless EOF/error occurs.
+ *
+ * Input Parameters:
+ *   buf - Destination buffer.
+ *   n   - Requested number of bytes.
+ *
+ * Returned Value:
+ *   Number of bytes actually read.
+ *
+ ****************************************************************************/
+
+static size_t read_stdin(char *buf, size_t n)
+{
+  size_t total = 0;
+  while (total < n)
+    {
+      ssize_t r = read(STDIN_FILENO, buf + total, n - total);
+      if (r <= 0)
+        {
+          break;
+        }
+
+      total += r;
+    }
+
+  return total;
+}
+
+/****************************************************************************
+ * Name: memmem_local
+ *
+ * Description:
+ *   Find a byte sequence inside a bounded memory region.
+ *
+ * Input Parameters:
+ *   haystack - Input buffer.
+ *   hlen     - Size of haystack.
+ *   needle   - Pattern to search.
+ *   nlen     - Size of needle.
+ *
+ * Returned Value:
+ *   Pointer to first match; NULL if not found.
+ *
+ ****************************************************************************/
+
+static char *memmem_local(const char *haystack, size_t hlen,
+                          const char *needle, size_t nlen)
+{
+  const char *p;
+  if (nlen == 0)
+    {
+      return (char *)haystack;
+    }
+
+  if (hlen < nlen)
+    {
+      return NULL;
+    }
+
+  p = haystack;
+  while (p <= haystack + hlen - nlen)
+    {
+      if (memcmp(p, needle, nlen) == 0)
+        {
+          return (char *)p;
+        }
+
+      p++;
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: upload_main
+ *
+ * Description:
+ *   CGI entry point for multipart file upload.
+ *
+ * Input Parameters:
+ *   argc - Number of arguments.
+ *   argv - Argument vector.
+ *
+ * Returned Value:
+ *   Zero (OK).
+ *
+ ****************************************************************************/
+
+int upload_main(int argc, FAR char *argv[])
+{
+  const char *content_type;
+  const char *content_length_str;
+  char boundary_raw[MAX_BOUNDARY];
+  char boundary[MAX_BOUNDARY + 4];
+  size_t boundary_len;
+  char filename[MAX_FILENAME];
+  char filepath[MAX_FILENAME + 8];
+  char buf[BUF_SIZE];
+  size_t content_length;
+  size_t total_read;
+  int fd = -1;
+  int state;
+  char linebuf[256];
+  size_t linepos;
+  int headers_done;
+
+  content_type = getenv("CONTENT_TYPE");
+  content_length_str = getenv("CONTENT_LENGTH");
+
+  if (content_type == NULL || content_length_str == NULL)
+    {
+      cgi_error(400, "Missing Content-Type or Content-Length");
+      return 0;
+    }
+
+  content_length = strtoul(content_length_str, NULL, 10);
+  if (content_length == 0 || content_length > 1024 * 1024)
+    {
+      cgi_error(400, "Invalid content length (max 1MB)");
+      return 0;
+    }
+
+  if (extract_boundary(content_type, boundary_raw, sizeof(boundary_raw)) < 0)
+    {
+      cgi_error(400, "No boundary in Content-Type");
+      return 0;
+    }
+
+  /* Multipart boundaries in the body are prefixed with "--" */
+
+  snprintf(boundary, sizeof(boundary), "--%s", boundary_raw);
+  boundary_len = strlen(boundary);
+
+  /* State machine for multipart parsing:
+   * 0 = looking for first boundary
+   * 1 = reading headers after boundary
+   * 2 = reading file data
+   * 3 = done
+   */
+
+  state = 0;
+  total_read = 0;
+  filename[0] = '\0';
+  linepos = 0;
+  headers_done = 0;
+
+  /* Read the entire POST body in chunks and process inline.
+   * We accumulate a line buffer for header parsing, and stream
+   * file data directly to disk.
+   */
+
+  while (total_read < content_length && state != 3)
+    {
+      size_t toread = content_length - total_read;
+      size_t nread;
+
+      if (toread > sizeof(buf))
+        {
+          toread = sizeof(buf);
+        }
+
+      nread = read_stdin(buf, toread);
+      if (nread == 0)
+        {
+          break;
+        }
+
+      total_read += nread;
+
+      size_t i = 0;
+      while (i < nread && state != 3)
+        {
+          switch (state)
+            {
+              case 0:
+
+                /* Accumulate until we find the first boundary line */
+
+                while (i < nread)
+                  {
+                    if (buf[i] == '\n')
+                      {
+                        linebuf[linepos] = '\0';
+
+                        /* Strip trailing \r */
+
+                        if (linepos > 0 && linebuf[linepos - 1] == '\r')
+                          {
+                            linebuf[--linepos] = '\0';
+                          }
+
+                        if (strncmp(linebuf, boundary, boundary_len) == 0)
+                          {
+                            state = 1;
+                            headers_done = 0;
+                            linepos = 0;
+                            i++;
+                            break;
+                          }
+
+                        linepos = 0;
+                        i++;
+                      }
+                    else
+                      {
+                        if (linepos < sizeof(linebuf) - 1)
+                          {
+                            linebuf[linepos++] = buf[i];
+                          }
+
+                        i++;
+                      }
+                  }
+
+                break;
+
+              case 1:
+                /* Parse headers after boundary, looking for
+                 * Content-Disposition with filename.
+                 * Headers end with an empty line.
+                 */
+
+                while (i < nread && !headers_done)
+                  {
+                    if (buf[i] == '\n')
+                      {
+                        linebuf[linepos] = '\0';
+
+                        if (linepos > 0 && linebuf[linepos - 1] == '\r')
+                          {
+                            linebuf[--linepos] = '\0';
+                          }
+
+                        if (linepos == 0)
+                          {
+                            /* Empty line = end of headers */
+
+                            headers_done = 1;
+
+                            if (filename[0] == '\0')
+                              {
+                                cgi_error(400, "No filename in upload");
+                                if (fd >= 0)
+                                  {
+                                    close(fd);
+                                  }
+
+                                return 0;
+                              }
+
+                            snprintf(filepath, sizeof(filepath), "%s/%s",
+                                     UPLOAD_DIR, filename);
+
+                            fd = open(filepath,
+                                      O_WRONLY | O_CREAT | O_TRUNC,
+                                      0666);
+                            if (fd < 0)
+                              {
+                                cgi_error(500, "Cannot create file");
+                                return 0;
+                              }
+
+                            state = 2;
+                            i++;
+                            break;
+                          }
+
+                        if (strstr(linebuf, "Content-Disposition") != NULL)
+                          {
+                            extract_filename(linebuf, filename,
+                                             sizeof(filename));
+                          }
+
+                        linepos = 0;
+                        i++;
+                      }
+                    else
+                      {
+                        if (linepos < sizeof(linebuf) - 1)
+                          {
+                            linebuf[linepos++] = buf[i];
+                          }
+
+                        i++;
+                      }
+                  }
+
+                break;
+
+              case 2:
+              {
+                /* Write file data. We need to detect the closing boundary
+                 * which appears as "\r\n--BOUNDARY" in the stream.
+                   * Buffer the last boundary_len+4 bytes to check for the
+                   * boundary.
+                 */
+
+                size_t remaining = nread - i;
+                char *bnd;
+
+                bnd = memmem_local(buf + i, remaining,
+                                   boundary, boundary_len);
+                if (bnd != NULL)
+                  {
+                    /* Found boundary. Write everything before it,
+                     * minus the preceding \r\n.
+                     */
+
+                    size_t datalen = bnd - (buf + i);
+                    if (datalen >= 2)
+                      {
+                        datalen -= 2;
+                      }
+
+                    if (datalen > 0)
+                      {
+                        write(fd, buf + i, datalen);
+                      }
+
+                    close(fd);
+                    fd = -1;
+                    state = 3;
+                    break;
+                  }
+                else
+                  {
+                    /* No boundary in this chunk. Write data but hold back
+                     * enough bytes to avoid splitting a boundary across
+                     * chunks.
+                     */
+
+                    size_t safe;
+
+                    if (remaining > boundary_len + 4)
+                      {
+                        safe = remaining - boundary_len - 4;
+                      }
+                    else
+                      {
+                        safe = 0;
+                      }
+
+                    if (safe > 0)
+                      {
+                        write(fd, buf + i, safe);
+                        i += safe;
+                      }
+                    else
+                      {
+                        /* Not enough data to be safe. This means we're near
+                         * the end of a chunk and need more data. Just write
+                         * what we have and hope the boundary comes in the
+                         * next read. For simplicity, write it all - worst
+                         * case we include a few extra bytes at end of file
+                         * which will be fixed when the boundary is found.
+                         */
+
+                        write(fd, buf + i, remaining);
+                        i = nread;
+                      }
+                  }
+
+                break;
+              }
+            }
+        }
+    }
+
+  /* Drain any remaining data from stdin */
+
+  while (total_read < content_length)
+    {
+      size_t toread = content_length - total_read;
+      size_t nread;
+
+      if (toread > sizeof(buf))
+        {
+          toread = sizeof(buf);
+        }
+
+      nread = read_stdin(buf, toread);
+      if (nread == 0)
+        {
+          break;
+        }
+
+      total_read += nread;
+    }
+
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  if (state == 3 && filename[0] != '\0')
+    {
+      cgi_ok(filename);
+    }
+  else if (filename[0] != '\0')
+    {
+      cgi_ok(filename);
+    }
+  else
+    {
+      cgi_error(400, "Upload incomplete or no file received");
+    }
+
+  return 0;
+}
diff --git a/examples/webpanel/content/www/index.html b/examples/webpanel/content/www/index.html
new file mode 100644
index 000000000..7d4928e31
--- /dev/null
+++ b/examples/webpanel/content/www/index.html
@@ -0,0 +1,454 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<title>NuttX Web Panel</title>
+<link rel="stylesheet" href="/xterm.css">
+<style>
+*{box-sizing:border-box;margin:0;padding:0}
+body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;
+  background:#1a1a2e;color:#e0e0e0;min-height:100vh}
+a{color:#5dade2;text-decoration:none}
+a:hover{text-decoration:underline}
+
+.hdr{background:#16213e;padding:12px 20px;border-bottom:2px solid #0f3460;
+  display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap}
+.hdr h1{font-size:18px;color:#e94560;display:flex;align-items:center;gap:8px}
+.hdr .chip{font-size:11px;background:#0f3460;color:#7ec8e3;padding:2px 8px;
+  border-radius:10px}
+.hdr .uptime{font-size:11px;color:#8899aa}
+
+nav{background:#0f1b33;display:flex;gap:0;overflow-x:auto}
+nav a{padding:10px 18px;font-size:13px;color:#8899aa;border-bottom:2px solid transparent;
+  white-space:nowrap;transition:all .2s}
+nav a:hover,nav a.act{color:#e94560;border-bottom-color:#e94560;text-decoration:none;
+  background:rgba(233,69,96,.06)}
+
+.page{display:none;padding:16px 20px;max-width:1200px;margin:0 auto}
+.page.vis{display:block}
+
+.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:14px}
+.card{background:#16213e;border:1px solid #0f3460;border-radius:8px;padding:16px;
+  transition:border-color .2s}
+.card:hover{border-color:#e94560}
+.card h3{font-size:14px;color:#e94560;margin-bottom:10px;display:flex;
+  align-items:center;gap:6px}
+.card .ico{font-size:18px}
+.row{display:flex;justify-content:space-between;padding:4px 0;font-size:12px;
+  border-bottom:1px solid rgba(255,255,255,.04)}
+.row .lbl{color:#8899aa}
+.row .val{color:#c0d0e0;font-family:monospace}
+
+.badge{display:inline-block;padding:1px 7px;border-radius:8px;font-size:10px;
+  font-weight:600}
+.badge-ok{background:#1e4d2b;color:#4ade80}
+.badge-warn{background:#4d3e1e;color:#fbbf24}
+
+.term-wrap{background:#0d1117;border:1px solid #0f3460;border-radius:8px;
+  padding:8px;height:360px;overflow:hidden;position:relative}
+.term-placeholder{display:flex;align-items:center;justify-content:center;
+  height:100%;color:#556;font-size:13px;flex-direction:column;gap:8px}
+
+.fm-toolbar{display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap;align-items:center}
+.fm-path{background:#0d1117;border:1px solid #0f3460;border-radius:4px;padding:6px 10px;
+  color:#c0d0e0;font-family:monospace;font-size:12px;flex:1;min-width:120px}
+.btn{background:#e94560;color:#fff;border:none;padding:7px 16px;border-radius:4px;
+  cursor:pointer;font-size:12px;font-weight:600;transition:background .2s}
+.btn:hover{background:#c73852}
+.btn-sec{background:#0f3460;color:#7ec8e3}
+.btn-sec:hover{background:#1a4a80}
+
+.fm-list{background:#0d1117;border:1px solid #0f3460;border-radius:8px;overflow:hidden}
+.fm-item{display:flex;align-items:center;padding:8px 12px;font-size:12px;
+  border-bottom:1px solid rgba(255,255,255,.04);gap:10px}
+.fm-item:hover{background:rgba(233,69,96,.04)}
+.fm-item .name{flex:1;font-family:monospace;color:#c0d0e0}
+.fm-item .sz{color:#667;min-width:60px;text-align:right}
+.fm-item .acts{display:flex;gap:6px}
+.fm-item .acts button{background:none;border:1px solid #0f3460;color:#8899aa;
+  padding:2px 8px;border-radius:3px;cursor:pointer;font-size:11px}
+.fm-item .acts button:hover{border-color:#e94560;color:#e94560}
+.fm-empty{padding:24px;text-align:center;color:#556;font-size:13px}
+
+.upload-zone{border:2px dashed #0f3460;border-radius:8px;padding:24px;text-align:center;
+  color:#556;font-size:13px;cursor:pointer;transition:border-color .2s;margin-top:12px}
+.upload-zone:hover,.upload-zone.drag{border-color:#e94560;color:#8899aa}
+.upload-zone input{display:none}
+
+.net-if{margin-bottom:12px}
+.net-if h4{font-size:12px;color:#7ec8e3;margin-bottom:6px}
+
+.toast{position:fixed;bottom:20px;right:20px;background:#16213e;border:1px solid #0f3460;
+  border-radius:8px;padding:10px 16px;font-size:12px;color:#c0d0e0;
+  transform:translateY(80px);opacity:0;transition:all .3s;z-index:999}
+.toast.show{transform:translateY(0);opacity:1}
+.toast.err{border-color:#e94560}
+</style>
+</head>
+<body>
+
+<div class="hdr">
+  <h1>NuttX Web Panel <span class="chip" id="chip">--</span></h1>
+  <span class="uptime" id="uptime">Uptime: --</span>
+</div>
+
+<nav id="nav">
+  <a href="#home" class="act" data-p="home">Home</a>
+  <a href="#terminal" data-p="terminal">Terminal</a>
+  <a href="#files" data-p="files">Files</a>
+  <a href="#network" data-p="network">Network</a>
+</nav>
+
+<!-- HOME -->
+<div class="page vis" id="p-home">
+  <div class="grid">
+    <div class="card">
+      <h3><span class="ico">&#9881;</span> System</h3>
+      <div class="row"><span class="lbl">Board</span><span class="val" id="si-board">--</span></div>
+      <div class="row"><span class="lbl">OS</span><span class="val" id="si-os">NuttX</span></div>
+      <div class="row"><span class="lbl">Version</span><span class="val" id="si-ver">--</span></div>
+      <div class="row"><span class="lbl">Build</span><span class="val" id="si-build">--</span></div>
+      <div class="row"><span class="lbl">Arch</span><span class="val" id="si-arch">--</span></div>
+    </div>
+    <div class="card">
+      <h3><span class="ico">&#128268;</span> Network</h3>
+      <div class="row"><span class="lbl">Interface</span><span class="val" id="si-ifname">--</span></div>
+      <div class="row"><span class="lbl">IP</span><span class="val" id="si-ip">--</span></div>
+      <div class="row"><span class="lbl">Mask</span><span class="val" id="si-mask">--</span></div>
+      <div class="row"><span class="lbl">Gateway</span><span class="val" id="si-gw">--</span></div>
+      <div class="row"><span class="lbl">MAC</span><span class="val" id="si-mac">--</span></div>
+    </div>
+    <div class="card">
+      <h3><span class="ico">&#128190;</span> Storage</h3>
+      <div class="row"><span class="lbl">SmartFS</span><span class="val">/mnt</span></div>
+      <div class="row"><span class="lbl">Web Root</span><span class="val">/data/www (ROMFS)</span></div>
+      <div class="row"><span class="lbl">Files</span><span class="val" id="si-files">--</span></div>
+    </div>
+    <div class="card">
+      <h3><span class="ico">&#9889;</span> Quick Actions</h3>
+      <div style="display:flex;flex-direction:column;gap:8px;margin-top:4px">
+        <button class="btn" onclick="showPage('terminal')">Open Terminal</button>
+        <button class="btn btn-sec" onclick="showPage('files')">Manage Files</button>
+        <button class="btn btn-sec" onclick="fetchSysInfo()">Refresh Info</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- TERMINAL -->
+<div class="page" id="p-terminal">
+  <div class="card" style="padding:12px">
+    <h3><span class="ico">&#9000;</span> NSH Terminal</h3>
+    <div class="fm-toolbar" style="margin-bottom:8px">
+      <button class="btn btn-sec" id="term-connect" onclick="connectTerminal()">Connect</button>
+      <button class="btn btn-sec" id="term-disc" onclick="disconnectTerminal()" style="display:none">Disconnect</button>
+      <span id="term-status" style="font-size:11px;color:#8899aa;margin-left:8px">Disconnected</span>
+    </div>
+    <div class="term-wrap" id="term-container"></div>
+  </div>
+</div>
+
+<!-- FILES -->
+<div class="page" id="p-files">
+  <div class="card" style="padding:12px">
+    <h3><span class="ico">&#128193;</span> File Manager &mdash; /mnt</h3>
+    <div class="fm-toolbar">
+      <span class="fm-path">/mnt</span>
+      <button class="btn btn-sec" onclick="fetchFiles()">Refresh</button>
+    </div>
+    <div class="fm-list" id="fm-list">
+      <div class="fm-empty">Loading file list&hellip;</div>
+    </div>
+    <div class="upload-zone" id="upload-zone" onclick="document.getElementById('file-in').click()">
+      <input type="file" id="file-in" onchange="uploadFile(this.files[0])">
+      Drop file here or click to upload to /mnt
+    </div>
+  </div>
+</div>
+
+<!-- NETWORK -->
+<div class="page" id="p-network">
+  <div class="grid">
+    <div class="card">
+      <h3><span class="ico">&#128268;</span> <span id="net-ifname">--</span></h3>
+      <div class="net-if">
+        <div class="row"><span class="lbl">Status</span><span class="val"><span class="badge badge-ok">RUNNING</span></span></div>
+        <div class="row"><span class="lbl">IP Address</span><span class="val" id="net-ip">--</span></div>
+        <div class="row"><span class="lbl">Netmask</span><span class="val" id="net-mask">--</span></div>
+        <div class="row"><span class="lbl">Gateway</span><span class="val" id="net-gw">--</span></div>
+        <div class="row"><span class="lbl">MAC</span><span class="val" id="net-mac">--</span></div>
+        <div class="row"><span class="lbl">MTU</span><span class="val" id="net-mtu">1500</span></div>
+      </div>
+    </div>
+    <div class="card">
+      <h3><span class="ico">&#128220;</span> DHCP</h3>
+      <div class="row"><span class="lbl">Mode</span><span class="val">Client (auto)</span></div>
+      <div class="row"><span class="lbl">Last Renew</span><span class="val" id="net-lease">--</span></div>
+      <div style="margin-top:10px;display:flex;align-items:center;gap:10px">
+        <button class="btn btn-sec" id="renew-btn" onclick="renewDhcp()">Renew Lease</button>
+        <span id="renew-status" style="font-size:11px;color:#8899aa"></span>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="toast" id="toast"></div>
+
+<script src="/xterm.min.js"></script>
+<script>
+var term=null, termWs=null, termReady=false, termQueue=[], termDataSub=null;
+var uptimeSec=0, uptimeRef=0;
+function $(id){return document.getElementById(id)}
+function showPage(p){
+  document.querySelectorAll('.page').forEach(function(e){e.classList.remove('vis')});
+  document.querySelectorAll('nav a').forEach(function(e){e.classList.remove('act')});
+  $('p-'+p).classList.add('vis');
+  document.querySelector('nav a[data-p="'+p+'"]').classList.add('act');
+  if(p==='terminal')initTerminal();
+}
+document.querySelectorAll('nav a').forEach(function(a){
+  a.addEventListener('click',function(e){
+    e.preventDefault();showPage(this.dataset.p);
+  });
+});
+
+function toast(msg,err){
+  var t=$('toast');t.textContent=msg;
+  t.className='toast'+(err?' err':'')+' show';
+  setTimeout(function(){t.classList.remove('show')},3000);
+}
+
+function fmtUptime(s){
+  var d=Math.floor(s/86400);
+  var h=Math.floor((s%86400)/3600);
+  var m=Math.floor((s%3600)/60);
+  var sec=s%60;
+  var hh=('0'+h).slice(-2),mm=('0'+m).slice(-2),ss=('0'+sec).slice(-2);
+  return d>0?(d+'d '+hh+':'+mm+':'+ss):(hh+':'+mm+':'+ss);
+}
+
+setInterval(function(){
+  if(!uptimeRef)return;
+  var s=uptimeSec+Math.floor((Date.now()-uptimeRef)/1000);
+  $('uptime').textContent='Uptime: '+fmtUptime(s);
+},1000);
+
+function fetchSysInfo(){
+  var x=new XMLHttpRequest();
+  x.open('GET','/cgi-bin/sysinfo');
+  x.onload=function(){
+    if(x.status===200){
+      try{
+        var d=JSON.parse(x.responseText);
+        if(d.version)$('si-ver').textContent=d.version;
+        if(d.build)$('si-build').textContent=d.build;
+        if(d.chip)$('chip').textContent=d.chip;
+        if(d.board)$('si-board').textContent=d.board;
+        if(d.ifname){
+          $('si-ifname').textContent=d.ifname;
+          $('net-ifname').textContent=d.ifname;
+        }
+        if(d.arch)$('si-arch').textContent=d.arch;
+        if(d.ip){$('si-ip').textContent=d.ip;$('net-ip').textContent=d.ip;}
+        if(d.mask){$('si-mask').textContent=d.mask;$('net-mask').textContent=d.mask;}
+        if(d.gw){$('si-gw').textContent=d.gw;$('net-gw').textContent=d.gw;}
+        if(d.mac){$('si-mac').textContent=d.mac;$('net-mac').textContent=d.mac;}
+        if(d.uptime_sec!==undefined){
+          uptimeSec=d.uptime_sec;
+          uptimeRef=Date.now();
+          $('uptime').textContent='Uptime: '+fmtUptime(d.uptime_sec);
+        } else if(d.uptime){
+          $('uptime').textContent='Uptime: '+d.uptime;
+        }
+        if(d.files!==undefined)$('si-files').textContent=d.files;
+        toast('System info updated');
+      }catch(e){toast('Parse error','err');}
+    }
+  };
+  x.onerror=function(){};
+  x.send();
+}
+
+function fetchFiles(){
+  var x=new XMLHttpRequest();
+  x.open('GET','/cgi-bin/files');
+  x.onload=function(){
+    if(x.status===200){
+      try{
+        var d=JSON.parse(x.responseText);
+        renderFiles(d.files||[]);
+      }catch(e){renderFiles([]);}
+    }
+  };
+  x.onerror=function(){
+    $('fm-list').innerHTML='<div class="fm-empty">Could not load files (CGI not ready)</div>';
+  };
+  x.send();
+}
+
+function renderFiles(files){
+  var el=$('fm-list');
+  if(!files.length){el.innerHTML='<div class="fm-empty">No files in /mnt</div>';return;}
+  var h='';
+  for(var i=0;i<files.length;i++){
+    var f=files[i];
+    h+='<div class="fm-item">'
+      +'<span class="name">'+esc(f.name)+'</span>'
+      +'<span class="sz">'+(f.size||'--')+'</span>'
+      +'<span class="acts">';
+    if(f.name.match(/\.py$/i))
+      h+='<button onclick="runScript(\''+esc(f.name)+'\')">Run</button>';
+    h+='<button onclick="deleteFile(\''+esc(f.name)+'\')">Del</button>'
+      +'</span></div>';
+  }
+  el.innerHTML=h;
+}
+
+function esc(s){return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/"/g,'&quot;');}
+
+function uploadFile(file){
+  if(!file)return;
+  toast('Uploading '+file.name+'...');
+  var form=new FormData();
+  form.append('file',file);
+  var x=new XMLHttpRequest();
+  x.open('POST','/cgi-bin/upload');
+  x.onload=function(){
+    if(x.status===200){toast('Uploaded '+file.name);fetchFiles();}
+    else toast('Upload failed: '+x.status,true);
+  };
+  x.onerror=function(){toast('Upload failed (CGI not ready)',true);};
+  x.send(form);
+}
+
+function deleteFile(name){
+  if(!confirm('Delete '+name+'?'))return;
+  var x=new XMLHttpRequest();
+  x.open('POST','/cgi-bin/files?action=delete&name='+encodeURIComponent(name));
+  x.onload=function(){
+    if(x.status===200){toast('Deleted '+name);fetchFiles();}
+    else toast('Delete failed',true);
+  };
+  x.send();
+}
+
+function initTerminal(){
+  if(term)return;
+  term=new Terminal({cursorBlink:true,fontSize:13,theme:{background:'#0d1117',foreground:'#c0d0e0'}});
+  term.open($('term-container'));
+  term.writeln('NuttX Web Terminal - click Connect to start NSH session');
+  termDataSub=term.onData(function(data){
+    if(termWs&&termWs.readyState===WebSocket.OPEN)termWs.send(data);
+    else termQueue.push(data);
+  });
+}
+
+function setTermStatus(s,ok){
+  $('term-status').textContent=s;
+  $('term-status').style.color=ok?'#4ade80':'#8899aa';
+}
+
+function connectTerminal(){
+  initTerminal();
+  if(termWs&&termWs.readyState===WebSocket.OPEN)return;
+  var host=window.location.hostname||'127.0.0.1';
+  var url='ws://'+host+':8080';
+  setTermStatus('Connecting...',false);
+  termWs=new WebSocket(url);
+  termWs.onopen=function(){
+    termReady=true;
+    setTermStatus('Connected',true);
+    $('term-connect').style.display='none';
+    $('term-disc').style.display='';
+    while(termQueue.length)termWs.send(termQueue.shift());
+  };
+  termWs.onmessage=function(ev){term.write(ev.data);};
+  termWs.onclose=function(){
+    termReady=false;
+    setTermStatus('Disconnected',false);
+    $('term-connect').style.display='';
+    $('term-disc').style.display='none';
+    termWs=null;
+  };
+  termWs.onerror=function(){
+    toast('WebSocket connection failed',true);
+    setTermStatus('Error',false);
+  };
+}
+
+function disconnectTerminal(){
+  if(termWs)termWs.close();
+}
+
+function sendTerminalCmd(cmd){
+  showPage('terminal');
+  if(!term)initTerminal();
+  if(!termWs||termWs.readyState!==WebSocket.OPEN){
+    connectTerminal();
+    setTimeout(function(){sendTerminalCmd(cmd);},800);
+    return;
+  }
+  termWs.send(cmd);
+}
+
+function runScript(name){
+  var cmd='python /mnt/'+name;
+  sendTerminalCmd(cmd+'\r');
+  toast('Running: '+cmd);
+}
+
+function renewDhcp(){
+  var btn=$('renew-btn'), st=$('renew-status');
+  btn.disabled=true;
+  st.textContent='Renewing...';
+  st.style.color='#fbbf24';
+  var x=new XMLHttpRequest();
+  x.open('GET','/cgi-bin/dhcprenew');
+  x.timeout=30000;
+  x.onload=function(){
+    btn.disabled=false;
+    try{
+      var d=JSON.parse(x.responseText);
+      if(d.status==='ok'){
+        var now=new Date();
+        var ts=('0'+now.getHours()).slice(-2)+':'+('0'+now.getMinutes()).slice(-2)+':'+('0'+now.getSeconds()).slice(-2);
+        $('net-lease').textContent='Renewed at '+ts;
+        st.textContent='OK';
+        st.style.color='#4ade80';
+        toast('DHCP lease renewed');
+        setTimeout(fetchSysInfo,1000);
+      } else {
+        st.textContent='Failed (code '+d.code+')';
+        st.style.color='#e94560';
+        toast('DHCP renew failed',true);
+      }
+    }catch(e){
+      st.textContent='Error';
+      st.style.color='#e94560';
+      toast('DHCP renew error',true);
+    }
+    setTimeout(function(){st.textContent='';},5000);
+  };
+  x.onerror=x.ontimeout=function(){
+    btn.disabled=false;
+    st.textContent='Timeout';
+    st.style.color='#e94560';
+    toast('DHCP renew timed out',true);
+  };
+  x.send();
+}
+
+var uz=$('upload-zone');
+uz.addEventListener('dragover',function(e){e.preventDefault();uz.classList.add('drag');});
+uz.addEventListener('dragleave',function(){uz.classList.remove('drag');});
+uz.addEventListener('drop',function(e){
+  e.preventDefault();uz.classList.remove('drag');
+  if(e.dataTransfer.files.length)uploadFile(e.dataTransfer.files[0]);
+});
+
+fetchSysInfo();
+fetchFiles();
+</script>
+</body>
+</html>
diff --git a/examples/webpanel/content/www/xterm.css b/examples/webpanel/content/www/xterm.css
new file mode 100644
index 000000000..e97b64390
--- /dev/null
+++ b/examples/webpanel/content/www/xterm.css
@@ -0,0 +1,218 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * 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.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/**
+ *  Default styles for xterm.js
+ */
+
+.xterm {
+    cursor: text;
+    position: relative;
+    user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+}
+
+.xterm.focus,
+.xterm:focus {
+    outline: none;
+}
+
+.xterm .xterm-helpers {
+    position: absolute;
+    top: 0;
+    /**
+     * The z-index of the helpers must be higher than the canvases in order for
+     * IMEs to appear on top.
+     */
+    z-index: 5;
+}
+
+.xterm .xterm-helper-textarea {
+    padding: 0;
+    border: 0;
+    margin: 0;
+    /* Move textarea out of the screen to the far left, so that the cursor is not visible */
+    position: absolute;
+    opacity: 0;
+    left: -9999em;
+    top: 0;
+    width: 0;
+    height: 0;
+    z-index: -5;
+    /** Prevent wrapping so the IME appears against the textarea at the correct position */
+    white-space: nowrap;
+    overflow: hidden;
+    resize: none;
+}
+
+.xterm .composition-view {
+    /* TODO: Composition position got messed up somewhere */
+    background: #000;
+    color: #FFF;
+    display: none;
+    position: absolute;
+    white-space: nowrap;
+    z-index: 1;
+}
+
+.xterm .composition-view.active {
+    display: block;
+}
+
+.xterm .xterm-viewport {
+    /* On OS X this is required in order for the scroll bar to appear fully opaque */
+    background-color: #000;
+    overflow-y: scroll;
+    cursor: default;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.xterm .xterm-screen {
+    position: relative;
+}
+
+.xterm .xterm-screen canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.xterm .xterm-scroll-area {
+    visibility: hidden;
+}
+
+.xterm-char-measure-element {
+    display: inline-block;
+    visibility: hidden;
+    position: absolute;
+    top: 0;
+    left: -9999em;
+    line-height: normal;
+}
+
+.xterm.enable-mouse-events {
+    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
+    cursor: default;
+}
+
+.xterm.xterm-cursor-pointer,
+.xterm .xterm-cursor-pointer {
+    cursor: pointer;
+}
+
+.xterm.column-select.focus {
+    /* Column selection mode */
+    cursor: crosshair;
+}
+
+.xterm .xterm-accessibility:not(.debug),
+.xterm .xterm-message {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 10;
+    color: transparent;
+    pointer-events: none;
+}
+
+.xterm .xterm-accessibility-tree:not(.debug) *::selection {
+  color: transparent;
+}
+
+.xterm .xterm-accessibility-tree {
+  user-select: text;
+  white-space: pre;
+}
+
+.xterm .live-region {
+    position: absolute;
+    left: -9999px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
+
+.xterm-dim {
+    /* Dim should not apply to background, so the opacity of the foreground color is applied
+     * explicitly in the generated class and reset to 1 here */
+    opacity: 1 !important;
+}
+
+.xterm-underline-1 { text-decoration: underline; }
+.xterm-underline-2 { text-decoration: double underline; }
+.xterm-underline-3 { text-decoration: wavy underline; }
+.xterm-underline-4 { text-decoration: dotted underline; }
+.xterm-underline-5 { text-decoration: dashed underline; }
+
+.xterm-overline {
+    text-decoration: overline;
+}
+
+.xterm-overline.xterm-underline-1 { text-decoration: overline underline; }
+.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; }
+.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; }
+.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; }
+.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; }
+
+.xterm-strikethrough {
+    text-decoration: line-through;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration {
+	z-index: 6;
+	position: absolute;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {
+	z-index: 7;
+}
+
+.xterm-decoration-overview-ruler {
+    z-index: 8;
+    position: absolute;
+    top: 0;
+    right: 0;
+    pointer-events: none;
+}
+
+.xterm-decoration-top {
+    z-index: 2;
+    position: relative;
+}
diff --git a/examples/webpanel/content/www/xterm.min.js b/examples/webpanel/content/www/xterm.min.js
new file mode 100644
index 000000000..0a51bfb69
--- /dev/null
+++ b/examples/webpanel/content/www/xterm.min.js
@@ -0,0 +1,8 @@
+/**
+ * Skipped minification because the original files appears to be already minified.
+ * Original file: /npm/@xterm/xterm@5.5.0/lib/xterm.js
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var i=t();for(var s in i)("object"==typeof exports?exports:e)[s]=i[s]}}(globalThis,(()=>(()=>{"use strict";var e={4567:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.AccessibilityManager=void 0;const n=i(9042),o=i(9924),a=i(844),h=i(4725),c=i(2585),l=i(3656);let d=t.AccessibilityManager=class extends a.Disposable{constructor(e,t,i,s){super(),this._terminal=e,this._coreBrowserService=i,this._renderService=s,this._rowColumns=new WeakMap,this._liveRegionLineCount=0,this._charsToConsume=[],this._charsToAnnounce="",this._accessibilityContainer=this._coreBrowserService.mainDocument.createElement("div"),this._accessibilityContainer.classList.add("xterm-accessibility"),this._rowContainer=this._coreBrowserService.mainDocument.createElement("div"),this._rowContainer.setAttribute("role","list"),this._rowContainer.classList.add("xterm-accessibility-tree"),this._rowElements=[];for(let e=0;e<this._terminal.rows;e++)this._rowElements[e]=this._createAccessibilityTreeNode(),this._rowContainer.appendChild(this._rowElements[e]);if(this._topBoundaryFocusListener=e=>this._handleBoundaryFocus(e,0),this._bottomBoundaryFocusListener=e=>this._handleBoundaryFocus(e,1),this._rowElements[0].addEventListener("focus",this._topBoundaryFocusListener),this._rowElements[this._rowElements.length-1].addEventListener("focus",this._bottomBoundaryFocusListener),this._refreshRowsDimensions(),this._accessibilityContainer.appendChild(this._rowContainer),this._liveRegion=this._coreBrowserService.mainDocument.createElement("div"),this._liveRegion.classList.add("live-region"),this._liveRegion.setAttribute("aria-live","assertive"),this._accessibilityContainer.appendChild(this._liveRegion),this._liveRegionDebouncer=this.register(new o.TimeBasedDebouncer(this._renderRows.bind(this))),!this._terminal.element)throw new Error("Cannot enable accessibility before Terminal.open");this._terminal.element.insertAdjacentElement("afterbegin",this._accessibilityContainer),this.register(this._terminal.onResize((e=>this._handleResize(e.rows)))),this.register(this._terminal.onRender((e=>this._refreshRows(e.start,e.end)))),this.register(this._terminal.onScroll((()=>this._refreshRows()))),this.register(this._terminal.onA11yChar((e=>this._handleChar(e)))),this.register(this._terminal.onLineFeed((()=>this._handleChar("\n")))),this.register(this._terminal.onA11yTab((e=>this._handleTab(e)))),this.register(this._terminal.onKey((e=>this._handleKey(e.key)))),this.register(this._terminal.onBlur((()=>this._clearLiveRegion()))),this.register(this._renderService.onDimensionsChange((()=>this._refreshRowsDimensions()))),this.register((0,l.addDisposableDomListener)(document,"selectionchange",(()=>this._handleSelectionChange()))),this.register(this._coreBrowserService.onDprChange((()=>this._refreshRowsDimensions()))),this._refreshRows(),this.register((0,a.toDisposable)((()=>{this._accessibilityContainer.remove(),this._rowElements.length=0})))}_handleTab(e){for(let t=0;t<e;t++)this._handleChar(" ")}_handleChar(e){this._liveRegionLineCount<21&&(this._charsToConsume.length>0?this._charsToConsume.shift()!==e&&(this._charsToAnnounce+=e):this._charsToAnnounce+=e,"\n"===e&&(this._liveRegionLineCount++,21===this._liveRegionLineCount&&(this._liveRegion.textContent+=n.tooMuchOutput)))}_clearLiveRegion(){this._liveRegion.textContent="",this._liveRegionLineCount=0}_handleKey(e){this._clearLiveRegion(),/\p{Control}/u.test(e)||this._charsToConsume.push(e)}_refreshRows(e,t){this._liveRegionDebouncer.refresh(e,t,this._terminal.rows)}_renderRows(e,t){const i=this._terminal.buffer,s=i.lines.length.toString();for(let r=e;r<=t;r++){const e=i.lines.get(i.ydisp+r),t=[],n=e?.translateToString(!0,void 0,void 0,t)||"",o=(i.ydisp+r+1).toString(),a=this._rowElements[r];a&&(0===n.length?(a.innerText=" ",this._rowColumns.set(a,[0,1])):(a.textContent=n,this._rowColumns.set(a,t)),a.setAttribute("aria-posinset",o),a.setAttribute("aria-setsize",s))}this._announceCharacters()}_announceCharacters(){0!==this._charsToAnnounce.length&&(this._liveRegion.textContent+=this._charsToAnnounce,this._charsToAnnounce="")}_handleBoundaryFocus(e,t){const i=e.target,s=this._rowElements[0===t?1:this._rowElements.length-2];if(i.getAttribute("aria-posinset")===(0===t?"1":`${this._terminal.buffer.lines.length}`))return;if(e.relatedTarget!==s)return;let r,n;if(0===t?(r=i,n=this._rowElements.pop(),this._rowContainer.removeChild(n)):(r=this._rowElements.shift(),n=i,this._rowContainer.removeChild(r)),r.removeEventListener("focus",this._topBoundaryFocusListener),n.removeEventListener("focus",this._bottomBoundaryFocusListener),0===t){const e=this._createAccessibilityTreeNode();this._rowElements.unshift(e),this._rowContainer.insertAdjacentElement("afterbegin",e)}else{const e=this._createAccessibilityTreeNode();this._rowElements.push(e),this._rowContainer.appendChild(e)}this._rowElements[0].addEventListener("focus",this._topBoundaryFocusListener),this._rowElements[this._rowElements.length-1].addEventListener("focus",this._bottomBoundaryFocusListener),this._terminal.scrollLines(0===t?-1:1),this._rowElements[0===t?1:this._rowElements.length-2].focus(),e.preventDefault(),e.stopImmediatePropagation()}_handleSelectionChange(){if(0===this._rowElements.length)return;const e=document.getSelection();if(!e)return;if(e.isCollapsed)return void(this._rowContainer.contains(e.anchorNode)&&this._terminal.clearSelection());if(!e.anchorNode||!e.focusNode)return void console.error("anchorNode and/or focusNode are null");let t={node:e.anchorNode,offset:e.anchorOffset},i={node:e.focusNode,offset:e.focusOffset};if((t.node.compareDocumentPosition(i.node)&Node.DOCUMENT_POSITION_PRECEDING||t.node===i.node&&t.offset>i.offset)&&([t,i]=[i,t]),t.node.compareDocumentPosition(this._rowElements[0])&(Node.DOCUMENT_POSITION_CONTAINED_BY|Node.DOCUMENT_POSITION_FOLLOWING)&&(t={node:this._rowElements[0].childNodes[0],offset:0}),!this._rowContainer.contains(t.node))return;const s=this._rowElements.slice(-1)[0];if(i.node.compareDocumentPosition(s)&(Node.DOCUMENT_POSITION_CONTAINED_BY|Node.DOCUMENT_POSITION_PRECEDING)&&(i={node:s,offset:s.textContent?.length??0}),!this._rowContainer.contains(i.node))return;const r=({node:e,offset:t})=>{const i=e instanceof Text?e.parentNode:e;let s=parseInt(i?.getAttribute("aria-posinset"),10)-1;if(isNaN(s))return console.warn("row is invalid. Race condition?"),null;const r=this._rowColumns.get(i);if(!r)return console.warn("columns is null. Race condition?"),null;let n=t<r.length?r[t]:r.slice(-1)[0]+1;return n>=this._terminal.cols&&(++s,n=0),{row:s,column:n}},n=r(t),o=r(i);if(n&&o){if(n.row>o.row||n.row===o.row&&n.column>=o.column)throw new Error("invalid range");this._terminal.select(n.column,n.row,(o.row-n.row)*this._terminal.cols-n.column+o.column)}}_handleResize(e){this._rowElements[this._rowElements.length-1].removeEventListener("focus",this._bottomBoundaryFocusListener);for(let e=this._rowContainer.children.length;e<this._terminal.rows;e++)this._rowElements[e]=this._createAccessibilityTreeNode(),this._rowContainer.appendChild(this._rowElements[e]);for(;this._rowElements.length>e;)this._rowContainer.removeChild(this._rowElements.pop());this._rowElements[this._rowElements.length-1].addEventListener("focus",this._bottomBoundaryFocusListener),this._refreshRowsDimensions()}_createAccessibilityTreeNode(){const e=this._coreBrowserService.mainDocument.createElement("div");return e.setAttribute("role","listitem"),e.tabIndex=-1,this._refreshRowDimensions(e),e}_refreshRowsDimensions(){if(this._renderService.dimensions.css.cell.height){this._accessibilityContainer.style.width=`${this._renderService.dimensions.css.canvas.width}px`,this._rowElements.length!==this._terminal.rows&&this._handleResize(this._terminal.rows);for(let e=0;e<this._terminal.rows;e++)this._refreshRowDimensions(this._rowElements[e])}}_refreshRowDimensions(e){e.style.height=`${this._renderService.dimensions.css.cell.height}px`}};t.AccessibilityManager=d=s([r(1,c.IInstantiationService),r(2,h.ICoreBrowserService),r(3,h.IRenderService)],d)},3614:(e,t)=>{function i(e){return e.replace(/\r?\n/g,"\r")}function s(e,t){return t?"[200~"+e+"[201~":e}function r(e,t,r,n){e=s(e=i(e),r.decPrivateModes.bracketedPasteMode&&!0!==n.rawOptions.ignoreBracketedPasteMode),r.triggerDataEvent(e,!0),t.value=""}function n(e,t,i){const s=i.getBoundingClientRect(),r=e.clientX-s.left-10,n=e.clientY-s.top-10;t.style.width="20px",t.style.height="20px",t.style.left=`${r}px`,t.style.top=`${n}px`,t.style.zIndex="1000",t.focus()}Object.defineProperty(t,"__esModule",{value:!0}),t.rightClickHandler=t.moveTextAreaUnderMouseCursor=t.paste=t.handlePasteEvent=t.copyHandler=t.bracketTextForPaste=t.prepareTextForTerminal=void 0,t.prepareTextForTerminal=i,t.bracketTextForPaste=s,t.copyHandler=function(e,t){e.clipboardData&&e.clipboardData.setData("text/plain",t.selectionText),e.preventDefault()},t.handlePasteEvent=function(e,t,i,s){e.stopPropagation(),e.clipboardData&&r(e.clipboardData.getData("text/plain"),t,i,s)},t.paste=r,t.moveTextAreaUnderMouseCursor=n,t.rightClickHandler=function(e,t,i,s,r){n(e,t,i),r&&s.rightClickSelect(e),t.value=s.selectionText,t.select()}},7239:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.ColorContrastCache=void 0;const s=i(1505);t.ColorContrastCache=class{constructor(){this._color=new s.TwoKeyMap,this._css=new s.TwoKeyMap}setCss(e,t,i){this._css.set(e,t,i)}getCss(e,t){return this._css.get(e,t)}setColor(e,t,i){this._color.set(e,t,i)}getColor(e,t){return this._color.get(e,t)}clear(){this._color.clear(),this._css.clear()}}},3656:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.addDisposableDomListener=void 0,t.addDisposableDomListener=function(e,t,i,s){e.addEventListener(t,i,s);let r=!1;return{dispose:()=>{r||(r=!0,e.removeEventListener(t,i,s))}}}},3551:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.Linkifier=void 0;const n=i(3656),o=i(8460),a=i(844),h=i(2585),c=i(4725);let l=t.Linkifier=class extends a.Disposable{get currentLink(){return this._currentLink}constructor(e,t,i,s,r){super(),this._element=e,this._mouseService=t,this._renderService=i,this._bufferService=s,this._linkProviderService=r,this._linkCacheDisposables=[],this._isMouseOut=!0,this._wasResized=!1,this._activeLine=-1,this._onShowLinkUnderline=this.register(new o.EventEmitter),this.onShowLinkUnderline=this._onShowLinkUnderline.event,this._onHideLinkUnderline=this.register(new o.EventEmitter),this.onHideLinkUnderline=this._onHideLinkUnderline.event,this.register((0,a.getDisposeArrayDisposable)(this._linkCacheDisposables)),this.register((0,a.toDisposable)((()=>{this._lastMouseEvent=void 0,this._activeProviderReplies?.clear()}))),this.register(this._bufferService.onResize((()=>{this._clearCurrentLink(),this._wasResized=!0}))),this.register((0,n.addDisposableDomListener)(this._element,"mouseleave",(()=>{this._isMouseOut=!0,this._clearCurrentLink()}))),this.register((0,n.addDisposableDomListener)(this._element,"mousemove",this._handleMouseMove.bind(this))),this.register((0,n.addDisposableDomListener)(this._element,"mousedown",this._handleMouseDown.bind(this))),this.register((0,n.addDisposableDomListener)(this._element,"mouseup",this._handleMouseUp.bind(this)))}_handleMouseMove(e){this._lastMouseEvent=e;const t=this._positionFromMouseEvent(e,this._element,this._mouseService);if(!t)return;this._isMouseOut=!1;const i=e.composedPath();for(let e=0;e<i.length;e++){const t=i[e];if(t.classList.contains("xterm"))break;if(t.classList.contains("xterm-hover"))return}this._lastBufferCell&&t.x===this._lastBufferCell.x&&t.y===this._lastBufferCell.y||(this._handleHover(t),this._lastBufferCell=t)}_handleHover(e){if(this._activeLine!==e.y||this._wasResized)return this._clearCurrentLink(),this._askForLink(e,!1),void(this._wasResized=!1);this._currentLink&&this._linkAtPosition(this._currentLink.link,e)||(this._clearCurrentLink(),this._askForLink(e,!0))}_askForLink(e,t){this._activeProviderReplies&&t||(this._activeProviderReplies?.forEach((e=>{e?.forEach((e=>{e.link.dispose&&e.link.dispose()}))})),this._activeProviderReplies=new Map,this._activeLine=e.y);let i=!1;for(const[s,r]of this._linkProviderService.linkProviders.entries())if(t){const t=this._activeProviderReplies?.get(s);t&&(i=this._checkLinkProviderResult(s,e,i))}else r.provideLinks(e.y,(t=>{if(this._isMouseOut)return;const r=t?.map((e=>({link:e})));this._activeProviderReplies?.set(s,r),i=this._checkLinkProviderResult(s,e,i),this._activeProviderReplies?.size===this._linkProviderService.linkProviders.length&&this._removeIntersectingLinks(e.y,this._activeProviderReplies)}))}_removeIntersectingLinks(e,t){const i=new Set;for(let s=0;s<t.size;s++){const r=t.get(s);if(r)for(let t=0;t<r.length;t++){const s=r[t],n=s.link.range.start.y<e?0:s.link.range.start.x,o=s.link.range.end.y>e?this._bufferService.cols:s.link.range.end.x;for(let e=n;e<=o;e++){if(i.has(e)){r.splice(t--,1);break}i.add(e)}}}}_checkLinkProviderResult(e,t,i){if(!this._activeProviderReplies)return i;const s=this._activeProviderReplies.get(e);let r=!1;for(let t=0;t<e;t++)this._activeProviderReplies.has(t)&&!this._activeProviderReplies.get(t)||(r=!0);if(!r&&s){const e=s.find((e=>this._linkAtPosition(e.link,t)));e&&(i=!0,this._handleNewLink(e))}if(this._activeProviderReplies.size===this._linkProviderService.linkProviders.length&&!i)for(let e=0;e<this._activeProviderReplies.size;e++){const s=this._activeProviderReplies.get(e)?.find((e=>this._linkAtPosition(e.link,t)));if(s){i=!0,this._handleNewLink(s);break}}return i}_handleMouseDown(){this._mouseDownLink=this._currentLink}_handleMouseUp(e){if(!this._currentLink)return;const t=this._positionFromMouseEvent(e,this._element,this._mouseService);t&&this._mouseDownLink===this._currentLink&&this._linkAtPosition(this._currentLink.link,t)&&this._currentLink.link.activate(e,this._currentLink.link.text)}_clearCurrentLink(e,t){this._currentLink&&this._lastMouseEvent&&(!e||!t||this._currentLink.link.range.start.y>=e&&this._currentLink.link.range.end.y<=t)&&(this._linkLeave(this._element,this._currentLink.link,this._lastMouseEvent),this._currentLink=void 0,(0,a.disposeArray)(this._linkCacheDisposables))}_handleNewLink(e){if(!this._lastMouseEvent)return;const t=this._positionFromMouseEvent(this._lastMouseEvent,this._element,this._mouseService);t&&this._linkAtPosition(e.link,t)&&(this._currentLink=e,this._currentLink.state={decorations:{underline:void 0===e.link.decorations||e.link.decorations.underline,pointerCursor:void 0===e.link.decorations||e.link.decorations.pointerCursor},isHovered:!0},this._linkHover(this._element,e.link,this._lastMouseEvent),e.link.decorations={},Object.defineProperties(e.link.decorations,{pointerCursor:{get:()=>this._currentLink?.state?.decorations.pointerCursor,set:e=>{this._currentLink?.state&&this._currentLink.state.decorations.pointerCursor!==e&&(this._currentLink.state.decorations.pointerCursor=e,this._currentLink.state.isHovered&&this._element.classList.toggle("xterm-cursor-pointer",e))}},underline:{get:()=>this._currentLink?.state?.decorations.underline,set:t=>{this._currentLink?.state&&this._currentLink?.state?.decorations.underline!==t&&(this._currentLink.state.decorations.underline=t,this._currentLink.state.isHovered&&this._fireUnderlineEvent(e.link,t))}}}),this._linkCacheDisposables.push(this._renderService.onRenderedViewportChange((e=>{if(!this._currentLink)return;const t=0===e.start?0:e.start+1+this._bufferService.buffer.ydisp,i=this._bufferService.buffer.ydisp+1+e.end;if(this._currentLink.link.range.start.y>=t&&this._currentLink.link.range.end.y<=i&&(this._clearCurrentLink(t,i),this._lastMouseEvent)){const e=this._positionFromMouseEvent(this._lastMouseEvent,this._element,this._mouseService);e&&this._askForLink(e,!1)}}))))}_linkHover(e,t,i){this._currentLink?.state&&(this._currentLink.state.isHovered=!0,this._currentLink.state.decorations.underline&&this._fireUnderlineEvent(t,!0),this._currentLink.state.decorations.pointerCursor&&e.classList.add("xterm-cursor-pointer")),t.hover&&t.hover(i,t.text)}_fireUnderlineEvent(e,t){const i=e.range,s=this._bufferService.buffer.ydisp,r=this._createLinkUnderlineEvent(i.start.x-1,i.start.y-s-1,i.end.x,i.end.y-s-1,void 0);(t?this._onShowLinkUnderline:this._onHideLinkUnderline).fire(r)}_linkLeave(e,t,i){this._currentLink?.state&&(this._currentLink.state.isHovered=!1,this._currentLink.state.decorations.underline&&this._fireUnderlineEvent(t,!1),this._currentLink.state.decorations.pointerCursor&&e.classList.remove("xterm-cursor-pointer")),t.leave&&t.leave(i,t.text)}_linkAtPosition(e,t){const i=e.range.start.y*this._bufferService.cols+e.range.start.x,s=e.range.end.y*this._bufferService.cols+e.range.end.x,r=t.y*this._bufferService.cols+t.x;return i<=r&&r<=s}_positionFromMouseEvent(e,t,i){const s=i.getCoords(e,t,this._bufferService.cols,this._bufferService.rows);if(s)return{x:s[0],y:s[1]+this._bufferService.buffer.ydisp}}_createLinkUnderlineEvent(e,t,i,s,r){return{x1:e,y1:t,x2:i,y2:s,cols:this._bufferService.cols,fg:r}}};t.Linkifier=l=s([r(1,c.IMouseService),r(2,c.IRenderService),r(3,h.IBufferService),r(4,c.ILinkProviderService)],l)},9042:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.tooMuchOutput=t.promptLabel=void 0,t.promptLabel="Terminal input",t.tooMuchOutput="Too much output to announce, navigate to rows manually to read"},3730:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.OscLinkProvider=void 0;const n=i(511),o=i(2585);let a=t.OscLinkProvider=class{constructor(e,t,i){this._bufferService=e,this._optionsService=t,this._oscLinkService=i}provideLinks(e,t){const i=this._bufferService.buffer.lines.get(e-1);if(!i)return void t(void 0);const s=[],r=this._optionsService.rawOptions.linkHandler,o=new n.CellData,a=i.getTrimmedLength();let c=-1,l=-1,d=!1;for(let t=0;t<a;t++)if(-1!==l||i.hasContent(t)){if(i.loadCell(t,o),o.hasExtendedAttrs()&&o.extended.urlId){if(-1===l){l=t,c=o.extended.urlId;continue}d=o.extended.urlId!==c}else-1!==l&&(d=!0);if(d||-1!==l&&t===a-1){const i=this._oscLinkService.getLinkData(c)?.uri;if(i){const n={start:{x:l+1,y:e},end:{x:t+(d||t!==a-1?0:1),y:e}};let o=!1;if(!r?.allowNonHttpProtocols)try{const e=new URL(i);["http:","https:"].includes(e.protocol)||(o=!0)}catch(e){o=!0}o||s.push({text:i,range:n,activate:(e,t)=>r?r.activate(e,t,n):h(0,t),hover:(e,t)=>r?.hover?.(e,t,n),leave:(e,t)=>r?.leave?.(e,t,n)})}d=!1,o.hasExtendedAttrs()&&o.extended.urlId?(l=t,c=o.extended.urlId):(l=-1,c=-1)}}t(s)}};function h(e,t){if(confirm(`Do you want to navigate to ${t}?\n\nWARNING: This link could potentially be dangerous`)){const e=window.open();if(e){try{e.opener=null}catch{}e.location.href=t}else console.warn("Opening link blocked as opener could not be cleared")}}t.OscLinkProvider=a=s([r(0,o.IBufferService),r(1,o.IOptionsService),r(2,o.IOscLinkService)],a)},6193:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.RenderDebouncer=void 0,t.RenderDebouncer=class{constructor(e,t){this._renderCallback=e,this._coreBrowserService=t,this._refreshCallbacks=[]}dispose(){this._animationFrame&&(this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame),this._animationFrame=void 0)}addRefreshCallback(e){return this._refreshCallbacks.push(e),this._animationFrame||(this._animationFrame=this._coreBrowserService.window.requestAnimationFrame((()=>this._innerRefresh()))),this._animationFrame}refresh(e,t,i){this._rowCount=i,e=void 0!==e?e:0,t=void 0!==t?t:this._rowCount-1,this._rowStart=void 0!==this._rowStart?Math.min(this._rowStart,e):e,this._rowEnd=void 0!==this._rowEnd?Math.max(this._rowEnd,t):t,this._animationFrame||(this._animationFrame=this._coreBrowserService.window.requestAnimationFrame((()=>this._innerRefresh())))}_innerRefresh(){if(this._animationFrame=void 0,void 0===this._rowStart||void 0===this._rowEnd||void 0===this._rowCount)return void this._runRefreshCallbacks();const e=Math.max(this._rowStart,0),t=Math.min(this._rowEnd,this._rowCount-1);this._rowStart=void 0,this._rowEnd=void 0,this._renderCallback(e,t),this._runRefreshCallbacks()}_runRefreshCallbacks(){for(const e of this._refreshCallbacks)e(0);this._refreshCallbacks=[]}}},3236:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.Terminal=void 0;const s=i(3614),r=i(3656),n=i(3551),o=i(9042),a=i(3730),h=i(1680),c=i(3107),l=i(5744),d=i(2950),_=i(1296),u=i(428),f=i(4269),v=i(5114),p=i(8934),g=i(3230),m=i(9312),S=i(4725),C=i(6731),b=i(8055),w=i(8969),y=i(8460),E=i(844),k=i(6114),L=i(8437),D=i(2584),R=i(7399),x=i(5941),A=i(9074),B=i(2585),T=i(5435),M=i(4567),O=i(779);class P extends w.CoreTerminal{get onFocus(){return this._onFocus.event}get onBlur(){return this._onBlur.event}get onA11yChar(){return this._onA11yCharEmitter.event}get onA11yTab(){return this._onA11yTabEmitter.event}get onWillOpen(){return this._onWillOpen.event}constructor(e={}){super(e),this.browser=k,this._keyDownHandled=!1,this._keyDownSeen=!1,this._keyPressHandled=!1,this._unprocessedDeadKey=!1,this._accessibilityManager=this.register(new E.MutableDisposable),this._onCursorMove=this.register(new y.EventEmitter),this.onCursorMove=this._onCursorMove.event,this._onKey=this.register(new y.EventEmitter),this.onKey=this._onKey.event,this._onRender=this.register(new y.EventEmitter),this.onRender=this._onRender.event,this._onSelectionChange=this.register(new y.EventEmitter),this.onSelectionChange=this._onSelectionChange.event,this._onTitleChange=this.register(new y.EventEmitter),this.onTitleChange=this._onTitleChange.event,this._onBell=this.register(new y.EventEmitter),this.onBell=this._onBell.event,this._onFocus=this.register(new y.EventEmitter),this._onBlur=this.register(new y.EventEmitter),this._onA11yCharEmitter=this.register(new y.EventEmitter),this._onA11yTabEmitter=this.register(new y.EventEmitter),this._onWillOpen=this.register(new y.EventEmitter),this._setup(),this._decorationService=this._instantiationService.createInstance(A.DecorationService),this._instantiationService.setService(B.IDecorationService,this._decorationService),this._linkProviderService=this._instantiationService.createInstance(O.LinkProviderService),this._instantiationService.setService(S.ILinkProviderService,this._linkProviderService),this._linkProviderService.registerLinkProvider(this._instantiationService.createInstance(a.OscLinkProvider)),this.register(this._inputHandler.onRequestBell((()=>this._onBell.fire()))),this.register(this._inputHandler.onRequestRefreshRows(((e,t)=>this.refresh(e,t)))),this.register(this._inputHandler.onRequestSendFocus((()=>this._reportFocus()))),this.register(this._inputHandler.onRequestReset((()=>this.reset()))),this.register(this._inputHandler.onRequestWindowsOptionsReport((e=>this._reportWindowsOptions(e)))),this.register(this._inputHandler.onColor((e=>this._handleColorEvent(e)))),this.register((0,y.forwardEvent)(this._inputHandler.onCursorMove,this._onCursorMove)),this.register((0,y.forwardEvent)(this._inputHandler.onTitleChange,this._onTitleChange)),this.register((0,y.forwardEvent)(this._inputHandler.onA11yChar,this._onA11yCharEmitter)),this.register((0,y.forwardEvent)(this._inputHandler.onA11yTab,this._onA11yTabEmitter)),this.register(this._bufferService.onResize((e=>this._afterResize(e.cols,e.rows)))),this.register((0,E.toDisposable)((()=>{this._customKeyEventHandler=void 0,this.element?.parentNode?.removeChild(this.element)})))}_handleColorEvent(e){if(this._themeService)for(const t of e){let e,i="";switch(t.index){case 256:e="foreground",i="10";break;case 257:e="background",i="11";break;case 258:e="cursor",i="12";break;default:e="ansi",i="4;"+t.index}switch(t.type){case 0:const s=b.color.toColorRGB("ansi"===e?this._themeService.colors.ansi[t.index]:this._themeService.colors[e]);this.coreService.triggerDataEvent(`${D.C0.ESC}]${i};${(0,x.toRgbString)(s)}${D.C1_ESCAPED.ST}`);break;case 1:if("ansi"===e)this._themeService.modifyColors((e=>e.ansi[t.index]=b.channels.toColor(...t.color)));else{const i=e;this._themeService.modifyColors((e=>e[i]=b.channels.toColor(...t.color)))}break;case 2:this._themeService.restoreColor(t.index)}}}_setup(){super._setup(),this._customKeyEventHandler=void 0}get buffer(){return this.buffers.active}focus(){this.textarea&&this.textarea.focus({preventScroll:!0})}_handleScreenReaderModeOptionChange(e){e?!this._accessibilityManager.value&&this._renderService&&(this._accessibilityManager.value=this._instantiationService.createInstance(M.AccessibilityManager,this)):this._accessibilityManager.clear()}_handleTextAreaFocus(e){this.coreService.decPrivateModes.sendFocus&&this.coreService.triggerDataEvent(D.C0.ESC+"[I"),this.element.classList.add("focus"),this._showCursor(),this._onFocus.fire()}blur(){return this.textarea?.blur()}_handleTextAreaBlur(){this.textarea.value="",this.refresh(this.buffer.y,this.buffer.y),this.coreService.decPrivateModes.sendFocus&&this.coreService.triggerDataEvent(D.C0.ESC+"[O"),this.element.classList.remove("focus"),this._onBlur.fire()}_syncTextArea(){if(!this.textarea||!this.buffer.isCursorInViewport||this._compositionHelper.isComposing||!this._renderService)return;const e=this.buffer.ybase+this.buffer.y,t=this.buffer.lines.get(e);if(!t)return;const i=Math.min(this.buffer.x,this.cols-1),s=this._renderService.dimensions.css.cell.height,r=t.getWidth(i),n=this._renderService.dimensions.css.cell.width*r,o=this.buffer.y*this._renderService.dimensions.css.cell.height,a=i*this._renderService.dimensions.css.cell.width;this.textarea.style.left=a+"px",this.textarea.style.top=o+"px",this.textarea.style.width=n+"px",this.textarea.style.height=s+"px",this.textarea.style.lineHeight=s+"px",this.textarea.style.zIndex="-5"}_initGlobal(){this._bindKeys(),this.register((0,r.addDisposableDomListener)(this.element,"copy",(e=>{this.hasSelection()&&(0,s.copyHandler)(e,this._selectionService)})));const e=e=>(0,s.handlePasteEvent)(e,this.textarea,this.coreService,this.optionsService);this.register((0,r.addDisposableDomListener)(this.textarea,"paste",e)),this.register((0,r.addDisposableDomListener)(this.element,"paste",e)),k.isFirefox?this.register((0,r.addDisposableDomListener)(this.element,"mousedown",(e=>{2===e.button&&(0,s.rightClickHandler)(e,this.textarea,this.screenElement,this._selectionService,this.options.rightClickSelectsWord)}))):this.register((0,r.addDisposableDomListener)(this.element,"contextmenu",(e=>{(0,s.rightClickHandler)(e,this.textarea,this.screenElement,this._selectionService,this.options.rightClickSelectsWord)}))),k.isLinux&&this.register((0,r.addDisposableDomListener)(this.element,"auxclick",(e=>{1===e.button&&(0,s.moveTextAreaUnderMouseCursor)(e,this.textarea,this.screenElement)})))}_bindKeys(){this.register((0,r.addDisposableDomListener)(this.textarea,"keyup",(e=>this._keyUp(e)),!0)),this.register((0,r.addDisposableDomListener)(this.textarea,"keydown",(e=>this._keyDown(e)),!0)),this.register((0,r.addDisposableDomListener)(this.textarea,"keypress",(e=>this._keyPress(e)),!0)),this.register((0,r.addDisposableDomListener)(this.textarea,"compositionstart",(()=>this._compositionHelper.compositionstart()))),this.register((0,r.addDisposableDomListener)(this.textarea,"compositionupdate",(e=>this._compositionHelper.compositionupdate(e)))),this.register((0,r.addDisposableDomListener)(this.textarea,"compositionend",(()=>this._compositionHelper.compositionend()))),this.register((0,r.addDisposableDomListener)(this.textarea,"input",(e=>this._inputEvent(e)),!0)),this.register(this.onRender((()=>this._compositionHelper.updateCompositionElements())))}open(e){if(!e)throw new Error("Terminal requires a parent element.");if(e.isConnected||this._logService.debug("Terminal.open was called on an element that was not attached to the DOM"),this.element?.ownerDocument.defaultView&&this._coreBrowserService)return void(this.element.ownerDocument.defaultView!==this._coreBrowserService.window&&(this._coreBrowserService.window=this.element.ownerDocument.defaultView));this._document=e.ownerDocument,this.options.documentOverride&&this.options.documentOverride instanceof Document&&(this._document=this.optionsService.rawOptions.documentOverride),this.element=this._document.createElement("div"),this.element.dir="ltr",this.element.classList.add("terminal"),this.element.classList.add("xterm"),e.appendChild(this.element);const t=this._document.createDocumentFragment();this._viewportElement=this._document.createElement("div"),this._viewportElement.classList.add("xterm-viewport"),t.appendChild(this._viewportElement),this._viewportScrollArea=this._document.createElement("div"),this._viewportScrollArea.classList.add("xterm-scroll-area"),this._viewportElement.appendChild(this._viewportScrollArea),this.screenElement=this._document.createElement("div"),this.screenElement.classList.add("xterm-screen"),this.register((0,r.addDisposableDomListener)(this.screenElement,"mousemove",(e=>this.updateCursorStyle(e)))),this._helperContainer=this._document.createElement("div"),this._helperContainer.classList.add("xterm-helpers"),this.screenElement.appendChild(this._helperContainer),t.appendChild(this.screenElement),this.textarea=this._document.createElement("textarea"),this.textarea.classList.add("xterm-helper-textarea"),this.textarea.setAttribute("aria-label",o.promptLabel),k.isChromeOS||this.textarea.setAttribute("aria-multiline","false"),this.textarea.setAttribute("autocorrect","off"),this.textarea.setAttribute("autocapitalize","off"),this.textarea.setAttribute("spellcheck","false"),this.textarea.tabIndex=0,this._coreBrowserService=this.register(this._instantiationService.createInstance(v.CoreBrowserService,this.textarea,e.ownerDocument.defaultView??window,this._document??"undefined"!=typeof window?window.document:null)),this._instantiationService.setService(S.ICoreBrowserService,this._coreBrowserService),this.register((0,r.addDisposableDomListener)(this.textarea,"focus",(e=>this._handleTextAreaFocus(e)))),this.register((0,r.addDisposableDomListener)(this.textarea,"blur",(()=>this._handleTextAreaBlur()))),this._helperContainer.appendChild(this.textarea),this._charSizeService=this._instantiationService.createInstance(u.CharSizeService,this._document,this._helperContainer),this._instantiationService.setService(S.ICharSizeService,this._charSizeService),this._themeService=this._instantiationService.createInstance(C.ThemeService),this._instantiationService.setService(S.IThemeService,this._themeService),this._characterJoinerService=this._instantiationService.createInstance(f.CharacterJoinerService),this._instantiationService.setService(S.ICharacterJoinerService,this._characterJoinerService),this._renderService=this.register(this._instantiationService.createInstance(g.RenderService,this.rows,this.screenElement)),this._instantiationService.setService(S.IRenderService,this._renderService),this.register(this._renderService.onRenderedViewportChange((e=>this._onRender.fire(e)))),this.onResize((e=>this._renderService.resize(e.cols,e.rows))),this._compositionView=this._document.createElement("div"),this._compositionView.classList.add("composition-view"),this._compositionHelper=this._instantiationService.createInstance(d.CompositionHelper,this.textarea,this._compositionView),this._helperContainer.appendChild(this._compositionView),this._mouseService=this._instantiationService.createInstance(p.MouseService),this._instantiationService.setService(S.IMouseService,this._mouseService),this.linkifier=this.register(this._instantiationService.createInstance(n.Linkifier,this.screenElement)),this.element.appendChild(t);try{this._onWillOpen.fire(this.element)}catch{}this._renderService.hasRenderer()||this._renderService.setRenderer(this._createRenderer()),this.viewport=this._instantiationService.createInstance(h.Viewport,this._viewportElement,this._viewportScrollArea),this.viewport.onRequestScrollLines((e=>this.scrollLines(e.amount,e.suppressScrollEvent,1))),this.register(this._inputHandler.onRequestSyncScrollBar((()=>this.viewport.syncScrollArea()))),this.register(this.viewport),this.register(this.onCursorMove((()=>{this._renderService.handleCursorMove(),this._syncTextArea()}))),this.register(this.onResize((()=>this._renderService.handleResize(this.cols,this.rows)))),this.register(this.onBlur((()=>this._renderService.handleBlur()))),this.register(this.onFocus((()=>this._renderService.handleFocus()))),this.register(this._renderService.onDimensionsChange((()=>this.viewport.syncScrollArea()))),this._selectionService=this.register(this._instantiationService.createInstance(m.SelectionService,this.element,this.screenElement,this.linkifier)),this._instantiationService.setService(S.ISelectionService,this._selectionService),this.register(this._selectionService.onRequestScrollLines((e=>this.scrollLines(e.amount,e.suppressScrollEvent)))),this.register(this._selectionService.onSelectionChange((()=>this._onSelectionChange.fire()))),this.register(this._selectionService.onRequestRedraw((e=>this._renderService.handleSelectionChanged(e.start,e.end,e.columnSelectMode)))),this.register(this._selectionService.onLinuxMouseSelection((e=>{this.textarea.value=e,this.textarea.focus(),this.textarea.select()}))),this.register(this._onScroll.event((e=>{this.viewport.syncScrollArea(),this._selectionService.refresh()}))),this.register((0,r.addDisposableDomListener)(this._viewportElement,"scroll",(()=>this._selectionService.refresh()))),this.register(this._instantiationService.createInstance(c.BufferDecorationRenderer,this.screenElement)),this.register((0,r.addDisposableDomListener)(this.element,"mousedown",(e=>this._selectionService.handleMouseDown(e)))),this.coreMouseService.areMouseEventsActive?(this._selectionService.disable(),this.element.classList.add("enable-mouse-events")):this._selectionService.enable(),this.options.screenReaderMode&&(this._accessibilityManager.value=this._instantiationService.createInstance(M.AccessibilityManager,this)),this.register(this.optionsService.onSpecificOptionChange("screenReaderMode",(e=>this._handleScreenReaderModeOptionChange(e)))),this.options.overviewRulerWidth&&(this._overviewRulerRenderer=this.register(this._instantiationService.createInstance(l.OverviewRulerRenderer,this._viewportElement,this.screenElement))),this.optionsService.onSpecificOptionChange("overviewRulerWidth",(e=>{!this._overviewRulerRenderer&&e&&this._viewportElement&&this.screenElement&&(this._overviewRulerRenderer=this.register(this._instantiationService.createInstance(l.OverviewRulerRenderer,this._viewportElement,this.screenElement)))})),this._charSizeService.measure(),this.refresh(0,this.rows-1),this._initGlobal(),this.bindMouse()}_createRenderer(){return this._instantiationService.createInstance(_.DomRenderer,this,this._document,this.element,this.screenElement,this._viewportElement,this._helperContainer,this.linkifier)}bindMouse(){const e=this,t=this.element;function i(t){const i=e._mouseService.getMouseReportCoords(t,e.screenElement);if(!i)return!1;let s,r;switch(t.overrideType||t.type){case"mousemove":r=32,void 0===t.buttons?(s=3,void 0!==t.button&&(s=t.button<3?t.button:3)):s=1&t.buttons?0:4&t.buttons?1:2&t.buttons?2:3;break;case"mouseup":r=0,s=t.button<3?t.button:3;break;case"mousedown":r=1,s=t.button<3?t.button:3;break;case"wheel":if(e._customWheelEventHandler&&!1===e._customWheelEventHandler(t))return!1;if(0===e.viewport.getLinesScrolled(t))return!1;r=t.deltaY<0?0:1,s=4;break;default:return!1}return!(void 0===r||void 0===s||s>4)&&e.coreMouseService.triggerMouseEvent({col:i.col,row:i.row,x:i.x,y:i.y,button:s,action:r,ctrl:t.ctrlKey,alt:t.altKey,shift:t.shiftKey})}const s={mouseup:null,wheel:null,mousedrag:null,mousemove:null},n={mouseup:e=>(i(e),e.buttons||(this._document.removeEventListener("mouseup",s.mouseup),s.mousedrag&&this._document.removeEventListener("mousemove",s.mousedrag)),this.cancel(e)),wheel:e=>(i(e),this.cancel(e,!0)),mousedrag:e=>{e.buttons&&i(e)},mousemove:e=>{e.buttons||i(e)}};this.register(this.coreMouseService.onProtocolChange((e=>{e?("debug"===this.optionsService.rawOptions.logLevel&&this._logService.debug("Binding to mouse events:",this.coreMouseService.explainEvents(e)),this.element.classList.add("enable-mouse-events"),this._selectionService.disable()):(this._logService.debug("Unbinding from mouse events."),this.element.classList.remove("enable-mouse-events"),this._selectionService.enable()),8&e?s.mousemove||(t.addEventListener("mousemove",n.mousemove),s.mousemove=n.mousemove):(t.removeEventListener("mousemove",s.mousemove),s.mousemove=null),16&e?s.wheel||(t.addEventListener("wheel",n.wheel,{passive:!1}),s.wheel=n.wheel):(t.removeEventListener("wheel",s.wheel),s.wheel=null),2&e?s.mouseup||(s.mouseup=n.mouseup):(this._document.removeEventListener("mouseup",s.mouseup),s.mouseup=null),4&e?s.mousedrag||(s.mousedrag=n.mousedrag):(this._document.removeEventListener("mousemove",s.mousedrag),s.mousedrag=null)}))),this.coreMouseService.activeProtocol=this.coreMouseService.activeProtocol,this.register((0,r.addDisposableDomListener)(t,"mousedown",(e=>{if(e.preventDefault(),this.focus(),this.coreMouseService.areMouseEventsActive&&!this._selectionService.shouldForceSelection(e))return i(e),s.mouseup&&this._document.addEventListener("mouseup",s.mouseup),s.mousedrag&&this._document.addEventListener("mousemove",s.mousedrag),this.cancel(e)}))),this.register((0,r.addDisposableDomListener)(t,"wheel",(e=>{if(!s.wheel){if(this._customWheelEventHandler&&!1===this._customWheelEventHandler(e))return!1;if(!this.buffer.hasScrollback){const t=this.viewport.getLinesScrolled(e);if(0===t)return;const i=D.C0.ESC+(this.coreService.decPrivateModes.applicationCursorKeys?"O":"[")+(e.deltaY<0?"A":"B");let s="";for(let e=0;e<Math.abs(t);e++)s+=i;return this.coreService.triggerDataEvent(s,!0),this.cancel(e,!0)}return this.viewport.handleWheel(e)?this.cancel(e):void 0}}),{passive:!1})),this.register((0,r.addDisposableDomListener)(t,"touchstart",(e=>{if(!this.coreMouseService.areMouseEventsActive)return this.viewport.handleTouchStart(e),this.cancel(e)}),{passive:!0})),this.register((0,r.addDisposableDomListener)(t,"touchmove",(e=>{if(!this.coreMouseService.areMouseEventsActive)return this.viewport.handleTouchMove(e)?void 0:this.cancel(e)}),{passive:!1}))}refresh(e,t){this._renderService?.refreshRows(e,t)}updateCursorStyle(e){this._selectionService?.shouldColumnSelect(e)?this.element.classList.add("column-select"):this.element.classList.remove("column-select")}_showCursor(){this.coreService.isCursorInitialized||(this.coreService.isCursorInitialized=!0,this.refresh(this.buffer.y,this.buffer.y))}scrollLines(e,t,i=0){1===i?(super.scrollLines(e,t,i),this.refresh(0,this.rows-1)):this.viewport?.scrollLines(e)}paste(e){(0,s.paste)(e,this.textarea,this.coreService,this.optionsService)}attachCustomKeyEventHandler(e){this._customKeyEventHandler=e}attachCustomWheelEventHandler(e){this._customWheelEventHandler=e}registerLinkProvider(e){return this._linkProviderService.registerLinkProvider(e)}registerCharacterJoiner(e){if(!this._characterJoinerService)throw new Error("Terminal must be opened first");const t=this._characterJoinerService.register(e);return this.refresh(0,this.rows-1),t}deregisterCharacterJoiner(e){if(!this._characterJoinerService)throw new Error("Terminal must be opened first");this._characterJoinerService.deregister(e)&&this.refresh(0,this.rows-1)}get markers(){return this.buffer.markers}registerMarker(e){return this.buffer.addMarker(this.buffer.ybase+this.buffer.y+e)}registerDecoration(e){return this._decorationService.registerDecoration(e)}hasSelection(){return!!this._selectionService&&this._selectionService.hasSelection}select(e,t,i){this._selectionService.setSelection(e,t,i)}getSelection(){return this._selectionService?this._selectionService.selectionText:""}getSelectionPosition(){if(this._selectionService&&this._selectionService.hasSelection)return{start:{x:this._selectionService.selectionStart[0],y:this._selectionService.selectionStart[1]},end:{x:this._selectionService.selectionEnd[0],y:this._selectionService.selectionEnd[1]}}}clearSelection(){this._selectionService?.clearSelection()}selectAll(){this._selectionService?.selectAll()}selectLines(e,t){this._selectionService?.selectLines(e,t)}_keyDown(e){if(this._keyDownHandled=!1,this._keyDownSeen=!0,this._customKeyEventHandler&&!1===this._customKeyEventHandler(e))return!1;const t=this.browser.isMac&&this.options.macOptionIsMeta&&e.altKey;if(!t&&!this._compositionHelper.keydown(e))return this.options.scrollOnUserInput&&this.buffer.ybase!==this.buffer.ydisp&&this.scrollToBottom(),!1;t||"Dead"!==e.key&&"AltGraph"!==e.key||(this._unprocessedDeadKey=!0);const i=(0,R.evaluateKeyboardEvent)(e,this.coreService.decPrivateModes.applicationCursorKeys,this.browser.isMac,this.options.macOptionIsMeta);if(this.updateCursorStyle(e),3===i.type||2===i.type){const t=this.rows-1;return this.scrollLines(2===i.type?-t:t),this.cancel(e,!0)}return 1===i.type&&this.selectAll(),!!this._isThirdLevelShift(this.browser,e)||(i.cancel&&this.cancel(e,!0),!i.key||!!(e.key&&!e.ctrlKey&&!e.altKey&&!e.metaKey&&1===e.key.length&&e.key.charCodeAt(0)>=65&&e.key.charCodeAt(0)<=90)||(this._unprocessedDeadKey?(this._unprocessedDeadKey=!1,!0):(i.key!==D.C0.ETX&&i.key!==D.C0.CR||(this.textarea.value=""),this._onKey.fire({key:i.key,domEvent:e}),this._showCursor(),this.coreService.triggerDataEvent(i.key,!0),!this.optionsService.rawOptions.screenReaderMode||e.altKey||e.ctrlKey?this.cancel(e,!0):void(this._keyDownHandled=!0))))}_isThirdLevelShift(e,t){const i=e.isMac&&!this.options.macOptionIsMeta&&t.altKey&&!t.ctrlKey&&!t.metaKey||e.isWindows&&t.altKey&&t.ctrlKey&&!t.metaKey||e.isWindows&&t.getModifierState("AltGraph");return"keypress"===t.type?i:i&&(!t.keyCode||t.keyCode>47)}_keyUp(e){this._keyDownSeen=!1,this._customKeyEventHandler&&!1===this._customKeyEventHandler(e)||(function(e){return 16===e.keyCode||17===e.keyCode||18===e.keyCode}(e)||this.focus(),this.updateCursorStyle(e),this._keyPressHandled=!1)}_keyPress(e){let t;if(this._keyPressHandled=!1,this._keyDownHandled)return!1;if(this._customKeyEventHandler&&!1===this._customKeyEventHandler(e))return!1;if(this.cancel(e),e.charCode)t=e.charCode;else if(null===e.which||void 0===e.which)t=e.keyCode;else{if(0===e.which||0===e.charCode)return!1;t=e.which}return!(!t||(e.altKey||e.ctrlKey||e.metaKey)&&!this._isThirdLevelShift(this.browser,e)||(t=String.fromCharCode(t),this._onKey.fire({key:t,domEvent:e}),this._showCursor(),this.coreService.triggerDataEvent(t,!0),this._keyPressHandled=!0,this._unprocessedDeadKey=!1,0))}_inputEvent(e){if(e.data&&"insertText"===e.inputType&&(!e.composed||!this._keyDownSeen)&&!this.optionsService.rawOptions.screenReaderMode){if(this._keyPressHandled)return!1;this._unprocessedDeadKey=!1;const t=e.data;return this.coreService.triggerDataEvent(t,!0),this.cancel(e),!0}return!1}resize(e,t){e!==this.cols||t!==this.rows?super.resize(e,t):this._charSizeService&&!this._charSizeService.hasValidSize&&this._charSizeService.measure()}_afterResize(e,t){this._charSizeService?.measure(),this.viewport?.syncScrollArea(!0)}clear(){if(0!==this.buffer.ybase||0!==this.buffer.y){this.buffer.clearAllMarkers(),this.buffer.lines.set(0,this.buffer.lines.get(this.buffer.ybase+this.buffer.y)),this.buffer.lines.length=1,this.buffer.ydisp=0,this.buffer.ybase=0,this.buffer.y=0;for(let e=1;e<this.rows;e++)this.buffer.lines.push(this.buffer.getBlankLine(L.DEFAULT_ATTR_DATA));this._onScroll.fire({position:this.buffer.ydisp,source:0}),this.viewport?.reset(),this.refresh(0,this.rows-1)}}reset(){this.options.rows=this.rows,this.options.cols=this.cols;const e=this._customKeyEventHandler;this._setup(),super.reset(),this._selectionService?.reset(),this._decorationService.reset(),this.viewport?.reset(),this._customKeyEventHandler=e,this.refresh(0,this.rows-1)}clearTextureAtlas(){this._renderService?.clearTextureAtlas()}_reportFocus(){this.element?.classList.contains("focus")?this.coreService.triggerDataEvent(D.C0.ESC+"[I"):this.coreService.triggerDataEvent(D.C0.ESC+"[O")}_reportWindowsOptions(e){if(this._renderService)switch(e){case T.WindowsOptionsReportType.GET_WIN_SIZE_PIXELS:const e=this._renderService.dimensions.css.canvas.width.toFixed(0),t=this._renderService.dimensions.css.canvas.height.toFixed(0);this.coreService.triggerDataEvent(`${D.C0.ESC}[4;${t};${e}t`);break;case T.WindowsOptionsReportType.GET_CELL_SIZE_PIXELS:const i=this._renderService.dimensions.css.cell.width.toFixed(0),s=this._renderService.dimensions.css.cell.height.toFixed(0);this.coreService.triggerDataEvent(`${D.C0.ESC}[6;${s};${i}t`)}}cancel(e,t){if(this.options.cancelEvents||t)return e.preventDefault(),e.stopPropagation(),!1}}t.Terminal=P},9924:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.TimeBasedDebouncer=void 0,t.TimeBasedDebouncer=class{constructor(e,t=1e3){this._renderCallback=e,this._debounceThresholdMS=t,this._lastRefreshMs=0,this._additionalRefreshRequested=!1}dispose(){this._refreshTimeoutID&&clearTimeout(this._refreshTimeoutID)}refresh(e,t,i){this._rowCount=i,e=void 0!==e?e:0,t=void 0!==t?t:this._rowCount-1,this._rowStart=void 0!==this._rowStart?Math.min(this._rowStart,e):e,this._rowEnd=void 0!==this._rowEnd?Math.max(this._rowEnd,t):t;const s=Date.now();if(s-this._lastRefreshMs>=this._debounceThresholdMS)this._lastRefreshMs=s,this._innerRefresh();else if(!this._additionalRefreshRequested){const e=s-this._lastRefreshMs,t=this._debounceThresholdMS-e;this._additionalRefreshRequested=!0,this._refreshTimeoutID=window.setTimeout((()=>{this._lastRefreshMs=Date.now(),this._innerRefresh(),this._additionalRefreshRequested=!1,this._refreshTimeoutID=void 0}),t)}}_innerRefresh(){if(void 0===this._rowStart||void 0===this._rowEnd||void 0===this._rowCount)return;const e=Math.max(this._rowStart,0),t=Math.min(this._rowEnd,this._rowCount-1);this._rowStart=void 0,this._rowEnd=void 0,this._renderCallback(e,t)}}},1680:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.Viewport=void 0;const n=i(3656),o=i(4725),a=i(8460),h=i(844),c=i(2585);let l=t.Viewport=class extends h.Disposable{constructor(e,t,i,s,r,o,h,c){super(),this._viewportElement=e,this._scrollArea=t,this._bufferService=i,this._optionsService=s,this._charSizeService=r,this._renderService=o,this._coreBrowserService=h,this.scrollBarWidth=0,this._currentRowHeight=0,this._currentDeviceCellHeight=0,this._lastRecordedBufferLength=0,this._lastRecordedViewportHeight=0,this._lastRecordedBufferHeight=0,this._lastTouchY=0,this._lastScrollTop=0,this._wheelPartialScroll=0,this._refreshAnimationFrame=null,this._ignoreNextScrollEvent=!1,this._smoothScrollState={startTime:0,origin:-1,target:-1},this._onRequestScrollLines=this.register(new a.EventEmitter),this.onRequestScrollLines=this._onRequestScrollLines.event,this.scrollBarWidth=this._viewportElement.offsetWidth-this._scrollArea.offsetWidth||15,this.register((0,n.addDisposableDomListener)(this._viewportElement,"scroll",this._handleScroll.bind(this))),this._activeBuffer=this._bufferService.buffer,this.register(this._bufferService.buffers.onBufferActivate((e=>this._activeBuffer=e.activeBuffer))),this._renderDimensions=this._renderService.dimensions,this.register(this._renderService.onDimensionsChange((e=>this._renderDimensions=e))),this._handleThemeChange(c.colors),this.register(c.onChangeColors((e=>this._handleThemeChange(e)))),this.register(this._optionsService.onSpecificOptionChange("scrollback",(()=>this.syncScrollArea()))),setTimeout((()=>this.syncScrollArea()))}_handleThemeChange(e){this._viewportElement.style.backgroundColor=e.background.css}reset(){this._currentRowHeight=0,this._currentDeviceCellHeight=0,this._lastRecordedBufferLength=0,this._lastRecordedViewportHeight=0,this._lastRecordedBufferHeight=0,this._lastTouchY=0,this._lastScrollTop=0,this._coreBrowserService.window.requestAnimationFrame((()=>this.syncScrollArea()))}_refresh(e){if(e)return this._innerRefresh(),void(null!==this._refreshAnimationFrame&&this._coreBrowserService.window.cancelAnimationFrame(this._refreshAnimationFrame));null===this._refreshAnimationFrame&&(this._refreshAnimationFrame=this._coreBrowserService.window.requestAnimationFrame((()=>this._innerRefresh())))}_innerRefresh(){if(this._charSizeService.height>0){this._currentRowHeight=this._renderDimensions.device.cell.height/this._coreBrowserService.dpr,this._currentDeviceCellHeight=this._renderDimensions.device.cell.height,this._lastRecordedViewportHeight=this._viewportElement.offsetHeight;const e=Math.round(this._currentRowHeight*this._lastRecordedBufferLength)+(this._lastRecordedViewportHeight-this._renderDimensions.css.canvas.height);this._lastRecordedBufferHeight!==e&&(this._lastRecordedBufferHeight=e,this._scrollArea.style.height=this._lastRecordedBufferHeight+"px")}const e=this._bufferService.buffer.ydisp*this._currentRowHeight;this._viewportElement.scrollTop!==e&&(this._ignoreNextScrollEvent=!0,this._viewportElement.scrollTop=e),this._refreshAnimationFrame=null}syncScrollArea(e=!1){if(this._lastRecordedBufferLength!==this._bufferService.buffer.lines.length)return this._lastRecordedBufferLength=this._bufferService.buffer.lines.length,void this._refresh(e);this._lastRecordedViewportHeight===this._renderService.dimensions.css.canvas.height&&this._lastScrollTop===this._activeBuffer.ydisp*this._currentRowHeight&&this._renderDimensions.device.cell.height===this._currentDeviceCellHeight||this._refresh(e)}_handleScroll(e){if(this._lastScrollTop=this._viewportElement.scrollTop,!this._viewportElement.offsetParent)return;if(this._ignoreNextScrollEvent)return this._ignoreNextScrollEvent=!1,void this._onRequestScrollLines.fire({amount:0,suppressScrollEvent:!0});const t=Math.round(this._lastScrollTop/this._currentRowHeight)-this._bufferService.buffer.ydisp;this._onRequestScrollLines.fire({amount:t,suppressScrollEvent:!0})}_smoothScroll(){if(this._isDisposed||-1===this._smoothScrollState.origin||-1===this._smoothScrollState.target)return;const e=this._smoothScrollPercent();this._viewportElement.scrollTop=this._smoothScrollState.origin+Math.round(e*(this._smoothScrollState.target-this._smoothScrollState.origin)),e<1?this._coreBrowserService.window.requestAnimationFrame((()=>this._smoothScroll())):this._clearSmoothScrollState()}_smoothScrollPercent(){return this._optionsService.rawOptions.smoothScrollDuration&&this._smoothScrollState.startTime?Math.max(Math.min((Date.now()-this._smoothScrollState.startTime)/this._optionsService.rawOptions.smoothScrollDuration,1),0):1}_clearSmoothScrollState(){this._smoothScrollState.startTime=0,this._smoothScrollState.origin=-1,this._smoothScrollState.target=-1}_bubbleScroll(e,t){const i=this._viewportElement.scrollTop+this._lastRecordedViewportHeight;return!(t<0&&0!==this._viewportElement.scrollTop||t>0&&i<this._lastRecordedBufferHeight)||(e.cancelable&&e.preventDefault(),!1)}handleWheel(e){const t=this._getPixelsScrolled(e);return 0!==t&&(this._optionsService.rawOptions.smoothScrollDuration?(this._smoothScrollState.startTime=Date.now(),this._smoothScrollPercent()<1?(this._smoothScrollState.origin=this._viewportElement.scrollTop,-1===this._smoothScrollState.target?this._smoothScrollState.target=this._viewportElement.scrollTop+t:this._smoothScrollState.target+=t,this._smoothScrollState.target=Math.max(Math.min(this._smoothScrollState.target,this._viewportElement.scrollHeight),0),this._smoothScroll()):this._clearSmoothScrollState()):this._viewportElement.scrollTop+=t,this._bubbleScroll(e,t))}scrollLines(e){if(0!==e)if(this._optionsService.rawOptions.smoothScrollDuration){const t=e*this._currentRowHeight;this._smoothScrollState.startTime=Date.now(),this._smoothScrollPercent()<1?(this._smoothScrollState.origin=this._viewportElement.scrollTop,this._smoothScrollState.target=this._smoothScrollState.origin+t,this._smoothScrollState.target=Math.max(Math.min(this._smoothScrollState.target,this._viewportElement.scrollHeight),0),this._smoothScroll()):this._clearSmoothScrollState()}else this._onRequestScrollLines.fire({amount:e,suppressScrollEvent:!1})}_getPixelsScrolled(e){if(0===e.deltaY||e.shiftKey)return 0;let t=this._applyScrollModifier(e.deltaY,e);return e.deltaMode===WheelEvent.DOM_DELTA_LINE?t*=this._currentRowHeight:e.deltaMode===WheelEvent.DOM_DELTA_PAGE&&(t*=this._currentRowHeight*this._bufferService.rows),t}getBufferElements(e,t){let i,s="";const r=[],n=t??this._bufferService.buffer.lines.length,o=this._bufferService.buffer.lines;for(let t=e;t<n;t++){const e=o.get(t);if(!e)continue;const n=o.get(t+1)?.isWrapped;if(s+=e.translateToString(!n),!n||t===o.length-1){const e=document.createElement("div");e.textContent=s,r.push(e),s.length>0&&(i=e),s=""}}return{bufferElements:r,cursorElement:i}}getLinesScrolled(e){if(0===e.deltaY||e.shiftKey)return 0;let t=this._applyScrollModifier(e.deltaY,e);return e.deltaMode===WheelEvent.DOM_DELTA_PIXEL?(t/=this._currentRowHeight+0,this._wheelPartialScroll+=t,t=Math.floor(Math.abs(this._wheelPartialScroll))*(this._wheelPartialScroll>0?1:-1),this._wheelPartialScroll%=1):e.deltaMode===WheelEvent.DOM_DELTA_PAGE&&(t*=this._bufferService.rows),t}_applyScrollModifier(e,t){const i=this._optionsService.rawOptions.fastScrollModifier;return"alt"===i&&t.altKey||"ctrl"===i&&t.ctrlKey||"shift"===i&&t.shiftKey?e*this._optionsService.rawOptions.fastScrollSensitivity*this._optionsService.rawOptions.scrollSensitivity:e*this._optionsService.rawOptions.scrollSensitivity}handleTouchStart(e){this._lastTouchY=e.touches[0].pageY}handleTouchMove(e){const t=this._lastTouchY-e.touches[0].pageY;return this._lastTouchY=e.touches[0].pageY,0!==t&&(this._viewportElement.scrollTop+=t,this._bubbleScroll(e,t))}};t.Viewport=l=s([r(2,c.IBufferService),r(3,c.IOptionsService),r(4,o.ICharSizeService),r(5,o.IRenderService),r(6,o.ICoreBrowserService),r(7,o.IThemeService)],l)},3107:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.BufferDecorationRenderer=void 0;const n=i(4725),o=i(844),a=i(2585);let h=t.BufferDecorationRenderer=class extends o.Disposable{constructor(e,t,i,s,r){super(),this._screenElement=e,this._bufferService=t,this._coreBrowserService=i,this._decorationService=s,this._renderService=r,this._decorationElements=new Map,this._altBufferIsActive=!1,this._dimensionsChanged=!1,this._container=document.createElement("div"),this._container.classList.add("xterm-decoration-container"),this._screenElement.appendChild(this._container),this.register(this._renderService.onRenderedViewportChange((()=>this._doRefreshDecorations()))),this.register(this._renderService.onDimensionsChange((()=>{this._dimensionsChanged=!0,this._queueRefresh()}))),this.register(this._coreBrowserService.onDprChange((()=>this._queueRefresh()))),this.register(this._bufferService.buffers.onBufferActivate((()=>{this._altBufferIsActive=this._bufferService.buffer===this._bufferService.buffers.alt}))),this.register(this._decorationService.onDecorationRegistered((()=>this._queueRefresh()))),this.register(this._decorationService.onDecorationRemoved((e=>this._removeDecoration(e)))),this.register((0,o.toDisposable)((()=>{this._container.remove(),this._decorationElements.clear()})))}_queueRefresh(){void 0===this._animationFrame&&(this._animationFrame=this._renderService.addRefreshCallback((()=>{this._doRefreshDecorations(),this._animationFrame=void 0})))}_doRefreshDecorations(){for(const e of this._decorationService.decorations)this._renderDecoration(e);this._dimensionsChanged=!1}_renderDecoration(e){this._refreshStyle(e),this._dimensionsChanged&&this._refreshXPosition(e)}_createElement(e){const t=this._coreBrowserService.mainDocument.createElement("div");t.classList.add("xterm-decoration"),t.classList.toggle("xterm-decoration-top-layer","top"===e?.options?.layer),t.style.width=`${Math.round((e.options.width||1)*this._renderService.dimensions.css.cell.width)}px`,t.style.height=(e.options.height||1)*this._renderService.dimensions.css.cell.height+"px",t.style.top=(e.marker.line-this._bufferService.buffers.active.ydisp)*this._renderService.dimensions.css.cell.height+"px",t.style.lineHeight=`${this._renderService.dimensions.css.cell.height}px`;const i=e.options.x??0;return i&&i>this._bufferService.cols&&(t.style.display="none"),this._refreshXPosition(e,t),t}_refreshStyle(e){const t=e.marker.line-this._bufferService.buffers.active.ydisp;if(t<0||t>=this._bufferService.rows)e.element&&(e.element.style.display="none",e.onRenderEmitter.fire(e.element));else{let i=this._decorationElements.get(e);i||(i=this._createElement(e),e.element=i,this._decorationElements.set(e,i),this._container.appendChild(i),e.onDispose((()=>{this._decorationElements.delete(e),i.remove()}))),i.style.top=t*this._renderService.dimensions.css.cell.height+"px",i.style.display=this._altBufferIsActive?"none":"block",e.onRenderEmitter.fire(i)}}_refreshXPosition(e,t=e.element){if(!t)return;const i=e.options.x??0;"right"===(e.options.anchor||"left")?t.style.right=i?i*this._renderService.dimensions.css.cell.width+"px":"":t.style.left=i?i*this._renderService.dimensions.css.cell.width+"px":""}_removeDecoration(e){this._decorationElements.get(e)?.remove(),this._decorationElements.delete(e),e.dispose()}};t.BufferDecorationRenderer=h=s([r(1,a.IBufferService),r(2,n.ICoreBrowserService),r(3,a.IDecorationService),r(4,n.IRenderService)],h)},5871:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.ColorZoneStore=void 0,t.ColorZoneStore=class{constructor(){this._zones=[],this._zonePool=[],this._zonePoolIndex=0,this._linePadding={full:0,left:0,center:0,right:0}}get zones(){return this._zonePool.length=Math.min(this._zonePool.length,this._zones.length),this._zones}clear(){this._zones.length=0,this._zonePoolIndex=0}addDecoration(e){if(e.options.overviewRulerOptions){for(const t of this._zones)if(t.color===e.options.overviewRulerOptions.color&&t.position===e.options.overviewRulerOptions.position){if(this._lineIntersectsZone(t,e.marker.line))return;if(this._lineAdjacentToZone(t,e.marker.line,e.options.overviewRulerOptions.position))return void this._addLineToZone(t,e.marker.line)}if(this._zonePoolIndex<this._zonePool.length)return this._zonePool[this._zonePoolIndex].color=e.options.overviewRulerOptions.color,this._zonePool[this._zonePoolIndex].position=e.options.overviewRulerOptions.position,this._zonePool[this._zonePoolIndex].startBufferLine=e.marker.line,this._zonePool[this._zonePoolIndex].endBufferLine=e.marker.line,void this._zones.push(this._zonePool[this._zonePoolIndex++]);this._zones.push({color:e.options.overviewRulerOptions.color,position:e.options.overviewRulerOptions.position,startBufferLine:e.marker.line,endBufferLine:e.marker.line}),this._zonePool.push(this._zones[this._zones.length-1]),this._zonePoolIndex++}}setPadding(e){this._linePadding=e}_lineIntersectsZone(e,t){return t>=e.startBufferLine&&t<=e.endBufferLine}_lineAdjacentToZone(e,t,i){return t>=e.startBufferLine-this._linePadding[i||"full"]&&t<=e.endBufferLine+this._linePadding[i||"full"]}_addLineToZone(e,t){e.startBufferLine=Math.min(e.startBufferLine,t),e.endBufferLine=Math.max(e.endBufferLine,t)}}},5744:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.OverviewRulerRenderer=void 0;const n=i(5871),o=i(4725),a=i(844),h=i(2585),c={full:0,left:0,center:0,right:0},l={full:0,left:0,center:0,right:0},d={full:0,left:0,center:0,right:0};let _=t.OverviewRulerRenderer=class extends a.Disposable{get _width(){return this._optionsService.options.overviewRulerWidth||0}constructor(e,t,i,s,r,o,h){super(),this._viewportElement=e,this._screenElement=t,this._bufferService=i,this._decorationService=s,this._renderService=r,this._optionsService=o,this._coreBrowserService=h,this._colorZoneStore=new n.ColorZoneStore,this._shouldUpdateDimensions=!0,this._shouldUpdateAnchor=!0,this._lastKnownBufferLength=0,this._canvas=this._coreBrowserService.mainDocument.createElement("canvas"),this._canvas.classList.add("xterm-decoration-overview-ruler"),this._refreshCanvasDimensions(),this._viewportElement.parentElement?.insertBefore(this._canvas,this._viewportElement);const c=this._canvas.getContext("2d");if(!c)throw new Error("Ctx cannot be null");this._ctx=c,this._registerDecorationListeners(),this._registerBufferChangeListeners(),this._registerDimensionChangeListeners(),this.register((0,a.toDisposable)((()=>{this._canvas?.remove()})))}_registerDecorationListeners(){this.register(this._decorationService.onDecorationRegistered((()=>this._queueRefresh(void 0,!0)))),this.register(this._decorationService.onDecorationRemoved((()=>this._queueRefresh(void 0,!0))))}_registerBufferChangeListeners(){this.register(this._renderService.onRenderedViewportChange((()=>this._queueRefresh()))),this.register(this._bufferService.buffers.onBufferActivate((()=>{this._canvas.style.display=this._bufferService.buffer===this._bufferService.buffers.alt?"none":"block"}))),this.register(this._bufferService.onScroll((()=>{this._lastKnownBufferLength!==this._bufferService.buffers.normal.lines.length&&(this._refreshDrawHeightConstants(),this._refreshColorZonePadding())})))}_registerDimensionChangeListeners(){this.register(this._renderService.onRender((()=>{this._containerHeight&&this._containerHeight===this._screenElement.clientHeight||(this._queueRefresh(!0),this._containerHeight=this._screenElement.clientHeight)}))),this.register(this._optionsService.onSpecificOptionChange("overviewRulerWidth",(()=>this._queueRefresh(!0)))),this.register(this._coreBrowserService.onDprChange((()=>this._queueRefresh(!0)))),this._queueRefresh(!0)}_refreshDrawConstants(){const e=Math.floor(this._canvas.width/3),t=Math.ceil(this._canvas.width/3);l.full=this._canvas.width,l.left=e,l.center=t,l.right=e,this._refreshDrawHeightConstants(),d.full=0,d.left=0,d.center=l.left,d.right=l.left+l.center}_refreshDrawHeightConstants(){c.full=Math.round(2*this._coreBrowserService.dpr);const e=this._canvas.height/this._bufferService.buffer.lines.length,t=Math.round(Math.max(Math.min(e,12),6)*this._coreBrowserService.dpr);c.left=t,c.center=t,c.right=t}_refreshColorZonePadding(){this._colorZoneStore.setPadding({full:Math.floor(this._bufferService.buffers.active.lines.length/(this._canvas.height-1)*c.full),left:Math.floor(this._bufferService.buffers.active.lines.length/(this._canvas.height-1)*c.left),center:Math.floor(this._bufferService.buffers.active.lines.length/(this._canvas.height-1)*c.center),right:Math.floor(this._bufferService.buffers.active.lines.length/(this._canvas.height-1)*c.right)}),this._lastKnownBufferLength=this._bufferService.buffers.normal.lines.length}_refreshCanvasDimensions(){this._canvas.style.width=`${this._width}px`,this._canvas.width=Math.round(this._width*this._coreBrowserService.dpr),this._canvas.style.height=`${this._screenElement.clientHeight}px`,this._canvas.height=Math.round(this._screenElement.clientHeight*this._coreBrowserService.dpr),this._refreshDrawConstants(),this._refreshColorZonePadding()}_refreshDecorations(){this._shouldUpdateDimensions&&this._refreshCanvasDimensions(),this._ctx.clearRect(0,0,this._canvas.width,this._canvas.height),this._colorZoneStore.clear();for(const e of this._decorationService.decorations)this._colorZoneStore.addDecoration(e);this._ctx.lineWidth=1;const e=this._colorZoneStore.zones;for(const t of e)"full"!==t.position&&this._renderColorZone(t);for(const t of e)"full"===t.position&&this._renderColorZone(t);this._shouldUpdateDimensions=!1,this._shouldUpdateAnchor=!1}_renderColorZone(e){this._ctx.fillStyle=e.color,this._ctx.fillRect(d[e.position||"full"],Math.round((this._canvas.height-1)*(e.startBufferLine/this._bufferService.buffers.active.lines.length)-c[e.position||"full"]/2),l[e.position||"full"],Math.round((this._canvas.height-1)*((e.endBufferLine-e.startBufferLine)/this._bufferService.buffers.active.lines.length)+c[e.position||"full"]))}_queueRefresh(e,t){this._shouldUpdateDimensions=e||this._shouldUpdateDimensions,this._shouldUpdateAnchor=t||this._shouldUpdateAnchor,void 0===this._animationFrame&&(this._animationFrame=this._coreBrowserService.window.requestAnimationFrame((()=>{this._refreshDecorations(),this._animationFrame=void 0})))}};t.OverviewRulerRenderer=_=s([r(2,h.IBufferService),r(3,h.IDecorationService),r(4,o.IRenderService),r(5,h.IOptionsService),r(6,o.ICoreBrowserService)],_)},2950:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.CompositionHelper=void 0;const n=i(4725),o=i(2585),a=i(2584);let h=t.CompositionHelper=class{get isComposing(){return this._isComposing}constructor(e,t,i,s,r,n){this._textarea=e,this._compositionView=t,this._bufferService=i,this._optionsService=s,this._coreService=r,this._renderService=n,this._isComposing=!1,this._isSendingComposition=!1,this._compositionPosition={start:0,end:0},this._dataAlreadySent=""}compositionstart(){this._isComposing=!0,this._compositionPosition.start=this._textarea.value.length,this._compositionView.textContent="",this._dataAlreadySent="",this._compositionView.classList.add("active")}compositionupdate(e){this._compositionView.textContent=e.data,this.updateCompositionElements(),setTimeout((()=>{this._compositionPosition.end=this._textarea.value.length}),0)}compositionend(){this._finalizeComposition(!0)}keydown(e){if(this._isComposing||this._isSendingComposition){if(229===e.keyCode)return!1;if(16===e.keyCode||17===e.keyCode||18===e.keyCode)return!1;this._finalizeComposition(!1)}return 229!==e.keyCode||(this._handleAnyTextareaChanges(),!1)}_finalizeComposition(e){if(this._compositionView.classList.remove("active"),this._isComposing=!1,e){const e={start:this._compositionPosition.start,end:this._compositionPosition.end};this._isSendingComposition=!0,setTimeout((()=>{if(this._isSendingComposition){let t;this._isSendingComposition=!1,e.start+=this._dataAlreadySent.length,t=this._isComposing?this._textarea.value.substring(e.start,e.end):this._textarea.value.substring(e.start),t.length>0&&this._coreService.triggerDataEvent(t,!0)}}),0)}else{this._isSendingComposition=!1;const e=this._textarea.value.substring(this._compositionPosition.start,this._compositionPosition.end);this._coreService.triggerDataEvent(e,!0)}}_handleAnyTextareaChanges(){const e=this._textarea.value;setTimeout((()=>{if(!this._isComposing){const t=this._textarea.value,i=t.replace(e,"");this._dataAlreadySent=i,t.length>e.length?this._coreService.triggerDataEvent(i,!0):t.length<e.length?this._coreService.triggerDataEvent(`${a.C0.DEL}`,!0):t.length===e.length&&t!==e&&this._coreService.triggerDataEvent(t,!0)}}),0)}updateCompositionElements(e){if(this._isComposing){if(this._bufferService.buffer.isCursorInViewport){const e=Math.min(this._bufferService.buffer.x,this._bufferService.cols-1),t=this._renderService.dimensions.css.cell.height,i=this._bufferService.buffer.y*this._renderService.dimensions.css.cell.height,s=e*this._renderService.dimensions.css.cell.width;this._compositionView.style.left=s+"px",this._compositionView.style.top=i+"px",this._compositionView.style.height=t+"px",this._compositionView.style.lineHeight=t+"px",this._compositionView.style.fontFamily=this._optionsService.rawOptions.fontFamily,this._compositionView.style.fontSize=this._optionsService.rawOptions.fontSize+"px";const r=this._compositionView.getBoundingClientRect();this._textarea.style.left=s+"px",this._textarea.style.top=i+"px",this._textarea.style.width=Math.max(r.width,1)+"px",this._textarea.style.height=Math.max(r.height,1)+"px",this._textarea.style.lineHeight=r.height+"px"}e||setTimeout((()=>this.updateCompositionElements(!0)),0)}}};t.CompositionHelper=h=s([r(2,o.IBufferService),r(3,o.IOptionsService),r(4,o.ICoreService),r(5,n.IRenderService)],h)},9806:(e,t)=>{function i(e,t,i){const s=i.getBoundingClientRect(),r=e.getComputedStyle(i),n=parseInt(r.getPropertyValue("padding-left")),o=parseInt(r.getPropertyValue("padding-top"));return[t.clientX-s.left-n,t.clientY-s.top-o]}Object.defineProperty(t,"__esModule",{value:!0}),t.getCoords=t.getCoordsRelativeToElement=void 0,t.getCoordsRelativeToElement=i,t.getCoords=function(e,t,s,r,n,o,a,h,c){if(!o)return;const l=i(e,t,s);return l?(l[0]=Math.ceil((l[0]+(c?a/2:0))/a),l[1]=Math.ceil(l[1]/h),l[0]=Math.min(Math.max(l[0],1),r+(c?1:0)),l[1]=Math.min(Math.max(l[1],1),n),l):void 0}},9504:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.moveToCellSequence=void 0;const s=i(2584);function r(e,t,i,s){const r=e-n(e,i),a=t-n(t,i),l=Math.abs(r-a)-function(e,t,i){let s=0;const r=e-n(e,i),a=t-n(t,i);for(let n=0;n<Math.abs(r-a);n++){const a="A"===o(e,t)?-1:1,h=i.buffer.lines.get(r+a*n);h?.isWrapped&&s++}return s}(e,t,i);return c(l,h(o(e,t),s))}function n(e,t){let i=0,s=t.buffer.lines.get(e),r=s?.isWrapped;for(;r&&e>=0&&e<t.rows;)i++,s=t.buffer.lines.get(--e),r=s?.isWrapped;return i}function o(e,t){return e>t?"A":"B"}function a(e,t,i,s,r,n){let o=e,a=t,h="";for(;o!==i||a!==s;)o+=r?1:-1,r&&o>n.cols-1?(h+=n.buffer.translateBufferLineToString(a,!1,e,o),o=0,e=0,a++):!r&&o<0&&(h+=n.buffer.translateBufferLineToString(a,!1,0,e+1),o=n.cols-1,e=o,a--);return h+n.buffer.translateBufferLineToString(a,!1,e,o)}function h(e,t){const i=t?"O":"[";return s.C0.ESC+i+e}function c(e,t){e=Math.floor(e);let i="";for(let s=0;s<e;s++)i+=t;return i}t.moveToCellSequence=function(e,t,i,s){const o=i.buffer.x,l=i.buffer.y;if(!i.buffer.hasScrollback)return function(e,t,i,s,o,l){return 0===r(t,s,o,l).length?"":c(a(e,t,e,t-n(t,o),!1,o).length,h("D",l))}(o,l,0,t,i,s)+r(l,t,i,s)+function(e,t,i,s,o,l){let d;d=r(t,s,o,l).length>0?s-n(s,o):t;const _=s,u=function(e,t,i,s,o,a){let h;return h=r(i,s,o,a).length>0?s-n(s,o):t,e<i&&h<=s||e>=i&&h<s?"C":"D"}(e,t,i,s,o,l);return c(a(e,d,i,_,"C"===u,o).length,h(u,l))}(o,l,e,t,i,s);let d;if(l===t)return d=o>e?"D":"C",c(Math.abs(o-e),h(d,s));d=l>t?"D":"C";const _=Math.abs(l-t);return c(function(e,t){return t.cols-e}(l>t?e:o,i)+(_-1)*i.cols+1+((l>t?o:e)-1),h(d,s))}},1296:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.DomRenderer=void 0;const n=i(3787),o=i(2550),a=i(2223),h=i(6171),c=i(6052),l=i(4725),d=i(8055),_=i(8460),u=i(844),f=i(2585),v="xterm-dom-renderer-owner-",p="xterm-rows",g="xterm-fg-",m="xterm-bg-",S="xterm-focus",C="xterm-selection";let b=1,w=t.DomRenderer=class extends u.Disposable{constructor(e,t,i,s,r,a,l,d,f,g,m,S,w){super(),this._terminal=e,this._document=t,this._element=i,this._screenElement=s,this._viewportElement=r,this._helperContainer=a,this._linkifier2=l,this._charSizeService=f,this._optionsService=g,this._bufferService=m,this._coreBrowserService=S,this._themeService=w,this._terminalClass=b++,this._rowElements=[],this._selectionRenderModel=(0,c.createSelectionRenderModel)(),this.onRequestRedraw=this.register(new _.EventEmitter).event,this._rowContainer=this._document.createElement("div"),this._rowContainer.classList.add(p),this._rowContainer.style.lineHeight="normal",this._rowContainer.setAttribute("aria-hidden","true"),this._refreshRowElements(this._bufferService.cols,this._bufferService.rows),this._selectionContainer=this._document.createElement("div"),this._selectionContainer.classList.add(C),this._selectionContainer.setAttribute("aria-hidden","true"),this.dimensions=(0,h.createRenderDimensions)(),this._updateDimensions(),this.register(this._optionsService.onOptionChange((()=>this._handleOptionsChanged()))),this.register(this._themeService.onChangeColors((e=>this._injectCss(e)))),this._injectCss(this._themeService.colors),this._rowFactory=d.createInstance(n.DomRendererRowFactory,document),this._element.classList.add(v+this._terminalClass),this._screenElement.appendChild(this._rowContainer),this._screenElement.appendChild(this._selectionContainer),this.register(this._linkifier2.onShowLinkUnderline((e=>this._handleLinkHover(e)))),this.register(this._linkifier2.onHideLinkUnderline((e=>this._handleLinkLeave(e)))),this.register((0,u.toDisposable)((()=>{this._element.classList.remove(v+this._terminalClass),this._rowContainer.remove(),this._selectionContainer.remove(),this._widthCache.dispose(),this._themeStyleElement.remove(),this._dimensionsStyleElement.remove()}))),this._widthCache=new o.WidthCache(this._document,this._helperContainer),this._widthCache.setFont(this._optionsService.rawOptions.fontFamily,this._optionsService.rawOptions.fontSize,this._optionsService.rawOptions.fontWeight,this._optionsService.rawOptions.fontWeightBold),this._setDefaultSpacing()}_updateDimensions(){const e=this._coreBrowserService.dpr;this.dimensions.device.char.width=this._charSizeService.width*e,this.dimensions.device.char.height=Math.ceil(this._charSizeService.height*e),this.dimensions.device.cell.width=this.dimensions.device.char.width+Math.round(this._optionsService.rawOptions.letterSpacing),this.dimensions.device.cell.height=Math.floor(this.dimensions.device.char.height*this._optionsService.rawOptions.lineHeight),this.dimensions.device.char.left=0,this.dimensions.device.char.top=0,this.dimensions.device.canvas.width=this.dimensions.device.cell.width*this._bufferService.cols,this.dimensions.device.canvas.height=this.dimensions.device.cell.height*this._bufferService.rows,this.dimensions.css.canvas.width=Math.round(this.dimensions.device.canvas.width/e),this.dimensions.css.canvas.height=Math.round(this.dimensions.device.canvas.height/e),this.dimensions.css.cell.width=this.dimensions.css.canvas.width/this._bufferService.cols,this.dimensions.css.cell.height=this.dimensions.css.canvas.height/this._bufferService.rows;for(const e of this._rowElements)e.style.width=`${this.dimensions.css.canvas.width}px`,e.style.height=`${this.dimensions.css.cell.height}px`,e.style.lineHeight=`${this.dimensions.css.cell.height}px`,e.style.overflow="hidden";this._dimensionsStyleElement||(this._dimensionsStyleElement=this._document.createElement("style"),this._screenElement.appendChild(this._dimensionsStyleElement));const t=`${this._terminalSelector} .${p} span { display: inline-block; height: 100%; vertical-align: top;}`;this._dimensionsStyleElement.textContent=t,this._selectionContainer.style.height=this._viewportElement.style.height,this._screenElement.style.width=`${this.dimensions.css.canvas.width}px`,this._screenElement.style.height=`${this.dimensions.css.canvas.height}px`}_injectCss(e){this._themeStyleElement||(this._themeStyleElement=this._document.createElement("style"),this._screenElement.appendChild(this._themeStyleElement));let t=`${this._terminalSelector} .${p} { color: ${e.foreground.css}; font-family: ${this._optionsService.rawOptions.fontFamily}; font-size: ${this._optionsService.rawOptions.fontSize}px; font-kerning: none; white-space: pre}`;t+=`${this._terminalSelector} .${p} .xterm-dim { color: ${d.color.multiplyOpacity(e.foreground,.5).css};}`,t+=`${this._terminalSelector} span:not(.xterm-bold) { font-weight: ${this._optionsService.rawOptions.fontWeight};}${this._terminalSelector} span.xterm-bold { font-weight: ${this._optionsService.rawOptions.fontWeightBold};}${this._terminalSelector} span.xterm-italic { font-style: italic;}`;const i=`blink_underline_${this._terminalClass}`,s=`blink_bar_${this._terminalClass}`,r=`blink_block_${this._terminalClass}`;t+=`@keyframes ${i} { 50% {  border-bottom-style: hidden; }}`,t+=`@keyframes ${s} { 50% {  box-shadow: none; }}`,t+=`@keyframes ${r} { 0% {  background-color: ${e.cursor.css};  color: ${e.cursorAccent.css}; } 50% {  background-color: inherit;  color: ${e.cursor.css}; }}`,t+=`${this._terminalSelector} .${p}.${S} .xterm-cursor.xterm-cursor-blink.xterm-cursor-underline { animation: ${i} 1s step-end infinite;}${this._terminalSelector} .${p}.${S} .xterm-cursor.xterm-cursor-blink.xterm-cursor-bar { animation: ${s} 1s step-end infinite;}${this._terminalSelector} .${p}.${S} .xterm-cursor.xterm-cursor-blink.xterm-cursor-block { animation: ${r} 1s step-end infinite;}${this._terminalSelector} .${p} .xterm-cursor.xterm-cursor-block { background-color: ${e.cursor.css}; color: ${e.cursorAccent.css};}${this._terminalSelector} .${p} .xterm-cursor.xterm-cursor-block:not(.xterm-cursor-blink) { background-color: ${e.cursor.css} !important; color: ${e.cursorAccent.css} !important;}${this._terminalSelector} .${p} .xterm-cursor.xterm-cursor-outline { outline: 1px solid ${e.cursor.css}; outline-offset: -1px;}${this._terminalSelector} .${p} .xterm-cursor.xterm-cursor-bar { box-shadow: ${this._optionsService.rawOptions.cursorWidth}px 0 0 ${e.cursor.css} inset;}${this._terminalSelector} .${p} .xterm-cursor.xterm-cursor-underline { border-bottom: 1px ${e.cursor.css}; border-bottom-style: solid; height: calc(100% - 1px);}`,t+=`${this._terminalSelector} .${C} { position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;}${this._terminalSelector}.focus .${C} div { position: absolute; background-color: ${e.selectionBackgroundOpaque.css};}${this._terminalSelector} .${C} div { position: absolute; background-color: ${e.selectionInactiveBackgroundOpaque.css};}`;for(const[i,s]of e.ansi.entries())t+=`${this._terminalSelector} .${g}${i} { color: ${s.css}; }${this._terminalSelector} .${g}${i}.xterm-dim { color: ${d.color.multiplyOpacity(s,.5).css}; }${this._terminalSelector} .${m}${i} { background-color: ${s.css}; }`;t+=`${this._terminalSelector} .${g}${a.INVERTED_DEFAULT_COLOR} { color: ${d.color.opaque(e.background).css}; }${this._terminalSelector} .${g}${a.INVERTED_DEFAULT_COLOR}.xterm-dim { color: ${d.color.multiplyOpacity(d.color.opaque(e.background),.5).css}; }${this._terminalSelector} .${m}${a.INVERTED_DEFAULT_COLOR} { background-color: ${e.foreground.css}; }`,this._themeStyleElement.textContent=t}_setDefaultSpacing(){const e=this.dimensions.css.cell.width-this._widthCache.get("W",!1,!1);this._rowContainer.style.letterSpacing=`${e}px`,this._rowFactory.defaultSpacing=e}handleDevicePixelRatioChange(){this._updateDimensions(),this._widthCache.clear(),this._setDefaultSpacing()}_refreshRowElements(e,t){for(let e=this._rowElements.length;e<=t;e++){const e=this._document.createElement("div");this._rowContainer.appendChild(e),this._rowElements.push(e)}for(;this._rowElements.length>t;)this._rowContainer.removeChild(this._rowElements.pop())}handleResize(e,t){this._refreshRowElements(e,t),this._updateDimensions(),this.handleSelectionChanged(this._selectionRenderModel.selectionStart,this._selectionRenderModel.selectionEnd,this._selectionRenderModel.columnSelectMode)}handleCharSizeChanged(){this._updateDimensions(),this._widthCache.clear(),this._setDefaultSpacing()}handleBlur(){this._rowContainer.classList.remove(S),this.renderRows(0,this._bufferService.rows-1)}handleFocus(){this._rowContainer.classList.add(S),this.renderRows(this._bufferService.buffer.y,this._bufferService.buffer.y)}handleSelectionChanged(e,t,i){if(this._selectionContainer.replaceChildren(),this._rowFactory.handleSelectionChanged(e,t,i),this.renderRows(0,this._bufferService.rows-1),!e||!t)return;this._selectionRenderModel.update(this._terminal,e,t,i);const s=this._selectionRenderModel.viewportStartRow,r=this._selectionRenderModel.viewportEndRow,n=this._selectionRenderModel.viewportCappedStartRow,o=this._selectionRenderModel.viewportCappedEndRow;if(n>=this._bufferService.rows||o<0)return;const a=this._document.createDocumentFragment();if(i){const i=e[0]>t[0];a.appendChild(this._createSelectionElement(n,i?t[0]:e[0],i?e[0]:t[0],o-n+1))}else{const i=s===n?e[0]:0,h=n===r?t[0]:this._bufferService.cols;a.appendChild(this._createSelectionElement(n,i,h));const c=o-n-1;if(a.appendChild(this._createSelectionElement(n+1,0,this._bufferService.cols,c)),n!==o){const e=r===o?t[0]:this._bufferService.cols;a.appendChild(this._createSelectionElement(o,0,e))}}this._selectionContainer.appendChild(a)}_createSelectionElement(e,t,i,s=1){const r=this._document.createElement("div"),n=t*this.dimensions.css.cell.width;let o=this.dimensions.css.cell.width*(i-t);return n+o>this.dimensions.css.canvas.width&&(o=this.dimensions.css.canvas.width-n),r.style.height=s*this.dimensions.css.cell.height+"px",r.style.top=e*this.dimensions.css.cell.height+"px",r.style.left=`${n}px`,r.style.width=`${o}px`,r}handleCursorMove(){}_handleOptionsChanged(){this._updateDimensions(),this._injectCss(this._themeService.colors),this._widthCache.setFont(this._optionsService.rawOptions.fontFamily,this._optionsService.rawOptions.fontSize,this._optionsService.rawOptions.fontWeight,this._optionsService.rawOptions.fontWeightBold),this._setDefaultSpacing()}clear(){for(const e of this._rowElements)e.replaceChildren()}renderRows(e,t){const i=this._bufferService.buffer,s=i.ybase+i.y,r=Math.min(i.x,this._bufferService.cols-1),n=this._optionsService.rawOptions.cursorBlink,o=this._optionsService.rawOptions.cursorStyle,a=this._optionsService.rawOptions.cursorInactiveStyle;for(let h=e;h<=t;h++){const e=h+i.ydisp,t=this._rowElements[h],c=i.lines.get(e);if(!t||!c)break;t.replaceChildren(...this._rowFactory.createRow(c,e,e===s,o,a,r,n,this.dimensions.css.cell.width,this._widthCache,-1,-1))}}get _terminalSelector(){return`.${v}${this._terminalClass}`}_handleLinkHover(e){this._setCellUnderline(e.x1,e.x2,e.y1,e.y2,e.cols,!0)}_handleLinkLeave(e){this._setCellUnderline(e.x1,e.x2,e.y1,e.y2,e.cols,!1)}_setCellUnderline(e,t,i,s,r,n){i<0&&(e=0),s<0&&(t=0);const o=this._bufferService.rows-1;i=Math.max(Math.min(i,o),0),s=Math.max(Math.min(s,o),0),r=Math.min(r,this._bufferService.cols);const a=this._bufferService.buffer,h=a.ybase+a.y,c=Math.min(a.x,r-1),l=this._optionsService.rawOptions.cursorBlink,d=this._optionsService.rawOptions.cursorStyle,_=this._optionsService.rawOptions.cursorInactiveStyle;for(let o=i;o<=s;++o){const u=o+a.ydisp,f=this._rowElements[o],v=a.lines.get(u);if(!f||!v)break;f.replaceChildren(...this._rowFactory.createRow(v,u,u===h,d,_,c,l,this.dimensions.css.cell.width,this._widthCache,n?o===i?e:0:-1,n?(o===s?t:r)-1:-1))}}};t.DomRenderer=w=s([r(7,f.IInstantiationService),r(8,l.ICharSizeService),r(9,f.IOptionsService),r(10,f.IBufferService),r(11,l.ICoreBrowserService),r(12,l.IThemeService)],w)},3787:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.DomRendererRowFactory=void 0;const n=i(2223),o=i(643),a=i(511),h=i(2585),c=i(8055),l=i(4725),d=i(4269),_=i(6171),u=i(3734);let f=t.DomRendererRowFactory=class{constructor(e,t,i,s,r,n,o){this._document=e,this._characterJoinerService=t,this._optionsService=i,this._coreBrowserService=s,this._coreService=r,this._decorationService=n,this._themeService=o,this._workCell=new a.CellData,this._columnSelectMode=!1,this.defaultSpacing=0}handleSelectionChanged(e,t,i){this._selectionStart=e,this._selectionEnd=t,this._columnSelectMode=i}createRow(e,t,i,s,r,a,h,l,_,f,p){const g=[],m=this._characterJoinerService.getJoinedCharacters(t),S=this._themeService.colors;let C,b=e.getNoBgTrimmedLength();i&&b<a+1&&(b=a+1);let w=0,y="",E=0,k=0,L=0,D=!1,R=0,x=!1,A=0;const B=[],T=-1!==f&&-1!==p;for(let M=0;M<b;M++){e.loadCell(M,this._workCell);let b=this._workCell.getWidth();if(0===b)continue;let O=!1,P=M,I=this._workCell;if(m.length>0&&M===m[0][0]){O=!0;const t=m.shift();I=new d.JoinedCellData(this._workCell,e.translateToString(!0,t[0],t[1]),t[1]-t[0]),P=t[1]-1,b=I.getWidth()}const H=this._isCellInSelection(M,t),F=i&&M===a,W=T&&M>=f&&M<=p;let U=!1;this._decorationService.forEachDecorationAtCell(M,t,void 0,(e=>{U=!0}));let N=I.getChars()||o.WHITESPACE_CELL_CHAR;if(" "===N&&(I.isUnderline()||I.isOverline())&&(N=" "),A=b*l-_.get(N,I.isBold(),I.isItalic()),C){if(w&&(H&&x||!H&&!x&&I.bg===E)&&(H&&x&&S.selectionForeground||I.fg===k)&&I.extended.ext===L&&W===D&&A===R&&!F&&!O&&!U){I.isInvisible()?y+=o.WHITESPACE_CELL_CHAR:y+=N,w++;continue}w&&(C.textContent=y),C=this._document.createElement("span"),w=0,y=""}else C=this._document.createElement("span");if(E=I.bg,k=I.fg,L=I.extended.ext,D=W,R=A,x=H,O&&a>=M&&a<=P&&(a=M),!this._coreService.isCursorHidden&&F&&this._coreService.isCursorInitialized)if(B.push("xterm-cursor"),this._coreBrowserService.isFocused)h&&B.push("xterm-cursor-blink"),B.push("bar"===s?"xterm-cursor-bar":"underline"===s?"xterm-cursor-underline":"xterm-cursor-block");else if(r)switch(r){case"outline":B.push("xterm-cursor-outline");break;case"block":B.push("xterm-cursor-block");break;case"bar":B.push("xterm-cursor-bar");break;case"underline":B.push("xterm-cursor-underline")}if(I.isBold()&&B.push("xterm-bold"),I.isItalic()&&B.push("xterm-italic"),I.isDim()&&B.push("xterm-dim"),y=I.isInvisible()?o.WHITESPACE_CELL_CHAR:I.getChars()||o.WHITESPACE_CELL_CHAR,I.isUnderline()&&(B.push(`xterm-underline-${I.extended.underlineStyle}`)," "===y&&(y=" "),!I.isUnderlineColorDefault()))if(I.isUnderlineColorRGB())C.style.textDecorationColor=`rgb(${u.AttributeData.toColorRGB(I.getUnderlineColor()).join(",")})`;else{let e=I.getUnderlineColor();this._optionsService.rawOptions.drawBoldTextInBrightColors&&I.isBold()&&e<8&&(e+=8),C.style.textDecorationColor=S.ansi[e].css}I.isOverline()&&(B.push("xterm-overline")," "===y&&(y=" ")),I.isStrikethrough()&&B.push("xterm-strikethrough"),W&&(C.style.textDecoration="underline");let $=I.getFgColor(),j=I.getFgColorMode(),z=I.getBgColor(),K=I.getBgColorMode();const q=!!I.isInverse();if(q){const e=$;$=z,z=e;const t=j;j=K,K=t}let V,G,X,J=!1;switch(this._decorationService.forEachDecorationAtCell(M,t,void 0,(e=>{"top"!==e.options.layer&&J||(e.backgroundColorRGB&&(K=50331648,z=e.backgroundColorRGB.rgba>>8&16777215,V=e.backgroundColorRGB),e.foregroundColorRGB&&(j=50331648,$=e.foregroundColorRGB.rgba>>8&16777215,G=e.foregroundColorRGB),J="top"===e.options.layer)})),!J&&H&&(V=this._coreBrowserService.isFocused?S.selectionBackgroundOpaque:S.selectionInactiveBackgroundOpaque,z=V.rgba>>8&16777215,K=50331648,J=!0,S.selectionForeground&&(j=50331648,$=S.selectionForeground.rgba>>8&16777215,G=S.selectionForeground)),J&&B.push("xterm-decoration-top"),K){case 16777216:case 33554432:X=S.ansi[z],B.push(`xterm-bg-${z}`);break;case 50331648:X=c.channels.toColor(z>>16,z>>8&255,255&z),this._addStyle(C,`background-color:#${v((z>>>0).toString(16),"0",6)}`);break;default:q?(X=S.foreground,B.push(`xterm-bg-${n.INVERTED_DEFAULT_COLOR}`)):X=S.background}switch(V||I.isDim()&&(V=c.color.multiplyOpacity(X,.5)),j){case 16777216:case 33554432:I.isBold()&&$<8&&this._optionsService.rawOptions.drawBoldTextInBrightColors&&($+=8),this._applyMinimumContrast(C,X,S.ansi[$],I,V,void 0)||B.push(`xterm-fg-${$}`);break;case 50331648:const e=c.channels.toColor($>>16&255,$>>8&255,255&$);this._applyMinimumContrast(C,X,e,I,V,G)||this._addStyle(C,`color:#${v($.toString(16),"0",6)}`);break;default:this._applyMinimumContrast(C,X,S.foreground,I,V,G)||q&&B.push(`xterm-fg-${n.INVERTED_DEFAULT_COLOR}`)}B.length&&(C.className=B.join(" "),B.length=0),F||O||U?C.textContent=y:w++,A!==this.defaultSpacing&&(C.style.letterSpacing=`${A}px`),g.push(C),M=P}return C&&w&&(C.textContent=y),g}_applyMinimumContrast(e,t,i,s,r,n){if(1===this._optionsService.rawOptions.minimumContrastRatio||(0,_.treatGlyphAsBackgroundColor)(s.getCode()))return!1;const o=this._getContrastCache(s);let a;if(r||n||(a=o.getColor(t.rgba,i.rgba)),void 0===a){const e=this._optionsService.rawOptions.minimumContrastRatio/(s.isDim()?2:1);a=c.color.ensureContrastRatio(r||t,n||i,e),o.setColor((r||t).rgba,(n||i).rgba,a??null)}return!!a&&(this._addStyle(e,`color:${a.css}`),!0)}_getContrastCache(e){return e.isDim()?this._themeService.colors.halfContrastCache:this._themeService.colors.contrastCache}_addStyle(e,t){e.setAttribute("style",`${e.getAttribute("style")||""}${t};`)}_isCellInSelection(e,t){const i=this._selectionStart,s=this._selectionEnd;return!(!i||!s)&&(this._columnSelectMode?i[0]<=s[0]?e>=i[0]&&t>=i[1]&&e<s[0]&&t<=s[1]:e<i[0]&&t>=i[1]&&e>=s[0]&&t<=s[1]:t>i[1]&&t<s[1]||i[1]===s[1]&&t===i[1]&&e>=i[0]&&e<s[0]||i[1]<s[1]&&t===s[1]&&e<s[0]||i[1]<s[1]&&t===i[1]&&e>=i[0])}};function v(e,t,i){for(;e.length<i;)e=t+e;return e}t.DomRendererRowFactory=f=s([r(1,l.ICharacterJoinerService),r(2,h.IOptionsService),r(3,l.ICoreBrowserService),r(4,h.ICoreService),r(5,h.IDecorationService),r(6,l.IThemeService)],f)},2550:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.WidthCache=void 0,t.WidthCache=class{constructor(e,t){this._flat=new Float32Array(256),this._font="",this._fontSize=0,this._weight="normal",this._weightBold="bold",this._measureElements=[],this._container=e.createElement("div"),this._container.classList.add("xterm-width-cache-measure-container"),this._container.setAttribute("aria-hidden","true"),this._container.style.whiteSpace="pre",this._container.style.fontKerning="none";const i=e.createElement("span");i.classList.add("xterm-char-measure-element");const s=e.createElement("span");s.classList.add("xterm-char-measure-element"),s.style.fontWeight="bold";const r=e.createElement("span");r.classList.add("xterm-char-measure-element"),r.style.fontStyle="italic";const n=e.createElement("span");n.classList.add("xterm-char-measure-element"),n.style.fontWeight="bold",n.style.fontStyle="italic",this._measureElements=[i,s,r,n],this._container.appendChild(i),this._container.appendChild(s),this._container.appendChild(r),this._container.appendChild(n),t.appendChild(this._container),this.clear()}dispose(){this._container.remove(),this._measureElements.length=0,this._holey=void 0}clear(){this._flat.fill(-9999),this._holey=new Map}setFont(e,t,i,s){e===this._font&&t===this._fontSize&&i===this._weight&&s===this._weightBold||(this._font=e,this._fontSize=t,this._weight=i,this._weightBold=s,this._container.style.fontFamily=this._font,this._container.style.fontSize=`${this._fontSize}px`,this._measureElements[0].style.fontWeight=`${i}`,this._measureElements[1].style.fontWeight=`${s}`,this._measureElements[2].style.fontWeight=`${i}`,this._measureElements[3].style.fontWeight=`${s}`,this.clear())}get(e,t,i){let s=0;if(!t&&!i&&1===e.length&&(s=e.charCodeAt(0))<256){if(-9999!==this._flat[s])return this._flat[s];const t=this._measure(e,0);return t>0&&(this._flat[s]=t),t}let r=e;t&&(r+="B"),i&&(r+="I");let n=this._holey.get(r);if(void 0===n){let s=0;t&&(s|=1),i&&(s|=2),n=this._measure(e,s),n>0&&this._holey.set(r,n)}return n}_measure(e,t){const i=this._measureElements[t];return i.textContent=e.repeat(32),i.offsetWidth/32}}},2223:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.TEXT_BASELINE=t.DIM_OPACITY=t.INVERTED_DEFAULT_COLOR=void 0;const s=i(6114);t.INVERTED_DEFAULT_COLOR=257,t.DIM_OPACITY=.5,t.TEXT_BASELINE=s.isFirefox||s.isLegacyEdge?"bottom":"ideographic"},6171:(e,t)=>{function i(e){return 57508<=e&&e<=57558}function s(e){return e>=128512&&e<=128591||e>=127744&&e<=128511||e>=128640&&e<=128767||e>=9728&&e<=9983||e>=9984&&e<=10175||e>=65024&&e<=65039||e>=129280&&e<=129535||e>=127462&&e<=127487}Object.defineProperty(t,"__esModule",{value:!0}),t.computeNextVariantOffset=t.createRenderDimensions=t.treatGlyphAsBackgroundColor=t.allowRescaling=t.isEmoji=t.isRestrictedPowerlineGlyph=t.isPowerlineGlyph=t.throwIfFalsy=void 0,t.throwIfFalsy=function(e){if(!e)throw new Error("value must not be falsy");return e},t.isPowerlineGlyph=i,t.isRestrictedPowerlineGlyph=function(e){return 57520<=e&&e<=57527},t.isEmoji=s,t.allowRescaling=function(e,t,r,n){return 1===t&&r>Math.ceil(1.5*n)&&void 0!==e&&e>255&&!s(e)&&!i(e)&&!function(e){return 57344<=e&&e<=63743}(e)},t.treatGlyphAsBackgroundColor=function(e){return i(e)||function(e){return 9472<=e&&e<=9631}(e)},t.createRenderDimensions=function(){return{css:{canvas:{width:0,height:0},cell:{width:0,height:0}},device:{canvas:{width:0,height:0},cell:{width:0,height:0},char:{width:0,height:0,left:0,top:0}}}},t.computeNextVariantOffset=function(e,t,i=0){return(e-(2*Math.round(t)-i))%(2*Math.round(t))}},6052:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.createSelectionRenderModel=void 0;class i{constructor(){this.clear()}clear(){this.hasSelection=!1,this.columnSelectMode=!1,this.viewportStartRow=0,this.viewportEndRow=0,this.viewportCappedStartRow=0,this.viewportCappedEndRow=0,this.startCol=0,this.endCol=0,this.selectionStart=void 0,this.selectionEnd=void 0}update(e,t,i,s=!1){if(this.selectionStart=t,this.selectionEnd=i,!t||!i||t[0]===i[0]&&t[1]===i[1])return void this.clear();const r=e.buffers.active.ydisp,n=t[1]-r,o=i[1]-r,a=Math.max(n,0),h=Math.min(o,e.rows-1);a>=e.rows||h<0?this.clear():(this.hasSelection=!0,this.columnSelectMode=s,this.viewportStartRow=n,this.viewportEndRow=o,this.viewportCappedStartRow=a,this.viewportCappedEndRow=h,this.startCol=t[0],this.endCol=i[0])}isCellSelected(e,t,i){return!!this.hasSelection&&(i-=e.buffer.active.viewportY,this.columnSelectMode?this.startCol<=this.endCol?t>=this.startCol&&i>=this.viewportCappedStartRow&&t<this.endCol&&i<=this.viewportCappedEndRow:t<this.startCol&&i>=this.viewportCappedStartRow&&t>=this.endCol&&i<=this.viewportCappedEndRow:i>this.viewportStartRow&&i<this.viewportEndRow||this.viewportStartRow===this.viewportEndRow&&i===this.viewportStartRow&&t>=this.startCol&&t<this.endCol||this.viewportStartRow<this.viewportEndRow&&i===this.viewportEndRow&&t<this.endCol||this.viewportStartRow<this.viewportEndRow&&i===this.viewportStartRow&&t>=this.startCol)}}t.createSelectionRenderModel=function(){return new i}},456:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.SelectionModel=void 0,t.SelectionModel=class{constructor(e){this._bufferService=e,this.isSelectAllActive=!1,this.selectionStartLength=0}clearSelection(){this.selectionStart=void 0,this.selectionEnd=void 0,this.isSelectAllActive=!1,this.selectionStartLength=0}get finalSelectionStart(){return this.isSelectAllActive?[0,0]:this.selectionEnd&&this.selectionStart&&this.areSelectionValuesReversed()?this.selectionEnd:this.selectionStart}get finalSelectionEnd(){if(this.isSelectAllActive)return[this._bufferService.cols,this._bufferService.buffer.ybase+this._bufferService.rows-1];if(this.selectionStart){if(!this.selectionEnd||this.areSelectionValuesReversed()){const e=this.selectionStart[0]+this.selectionStartLength;return e>this._bufferService.cols?e%this._bufferService.cols==0?[this._bufferService.cols,this.selectionStart[1]+Math.floor(e/this._bufferService.cols)-1]:[e%this._bufferService.cols,this.selectionStart[1]+Math.floor(e/this._bufferService.cols)]:[e,this.selectionStart[1]]}if(this.selectionStartLength&&this.selectionEnd[1]===this.selectionStart[1]){const e=this.selectionStart[0]+this.selectionStartLength;return e>this._bufferService.cols?[e%this._bufferService.cols,this.selectionStart[1]+Math.floor(e/this._bufferService.cols)]:[Math.max(e,this.selectionEnd[0]),this.selectionEnd[1]]}return this.selectionEnd}}areSelectionValuesReversed(){const e=this.selectionStart,t=this.selectionEnd;return!(!e||!t)&&(e[1]>t[1]||e[1]===t[1]&&e[0]>t[0])}handleTrim(e){return this.selectionStart&&(this.selectionStart[1]-=e),this.selectionEnd&&(this.selectionEnd[1]-=e),this.selectionEnd&&this.selectionEnd[1]<0?(this.clearSelection(),!0):(this.selectionStart&&this.selectionStart[1]<0&&(this.selectionStart[1]=0),!1)}}},428:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.CharSizeService=void 0;const n=i(2585),o=i(8460),a=i(844);let h=t.CharSizeService=class extends a.Disposable{get hasValidSize(){return this.width>0&&this.height>0}constructor(e,t,i){super(),this._optionsService=i,this.width=0,this.height=0,this._onCharSizeChange=this.register(new o.EventEmitter),this.onCharSizeChange=this._onCharSizeChange.event;try{this._measureStrategy=this.register(new d(this._optionsService))}catch{this._measureStrategy=this.register(new l(e,t,this._optionsService))}this.register(this._optionsService.onMultipleOptionChange(["fontFamily","fontSize"],(()=>this.measure())))}measure(){const e=this._measureStrategy.measure();e.width===this.width&&e.height===this.height||(this.width=e.width,this.height=e.height,this._onCharSizeChange.fire())}};t.CharSizeService=h=s([r(2,n.IOptionsService)],h);class c extends a.Disposable{constructor(){super(...arguments),this._result={width:0,height:0}}_validateAndSet(e,t){void 0!==e&&e>0&&void 0!==t&&t>0&&(this._result.width=e,this._result.height=t)}}class l extends c{constructor(e,t,i){super(),this._document=e,this._parentElement=t,this._optionsService=i,this._measureElement=this._document.createElement("span"),this._measureElement.classList.add("xterm-char-measure-element"),this._measureElement.textContent="W".repeat(32),this._measureElement.setAttribute("aria-hidden","true"),this._measureElement.style.whiteSpace="pre",this._measureElement.style.fontKerning="none",this._parentElement.appendChild(this._measureElement)}measure(){return this._measureElement.style.fontFamily=this._optionsService.rawOptions.fontFamily,this._measureElement.style.fontSize=`${this._optionsService.rawOptions.fontSize}px`,this._validateAndSet(Number(this._measureElement.offsetWidth)/32,Number(this._measureElement.offsetHeight)),this._result}}class d extends c{constructor(e){super(),this._optionsService=e,this._canvas=new OffscreenCanvas(100,100),this._ctx=this._canvas.getContext("2d");const t=this._ctx.measureText("W");if(!("width"in t&&"fontBoundingBoxAscent"in t&&"fontBoundingBoxDescent"in t))throw new Error("Required font metrics not supported")}measure(){this._ctx.font=`${this._optionsService.rawOptions.fontSize}px ${this._optionsService.rawOptions.fontFamily}`;const e=this._ctx.measureText("W");return this._validateAndSet(e.width,e.fontBoundingBoxAscent+e.fontBoundingBoxDescent),this._result}}},4269:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.CharacterJoinerService=t.JoinedCellData=void 0;const n=i(3734),o=i(643),a=i(511),h=i(2585);class c extends n.AttributeData{constructor(e,t,i){super(),this.content=0,this.combinedData="",this.fg=e.fg,this.bg=e.bg,this.combinedData=t,this._width=i}isCombined(){return 2097152}getWidth(){return this._width}getChars(){return this.combinedData}getCode(){return 2097151}setFromCharData(e){throw new Error("not implemented")}getAsCharData(){return[this.fg,this.getChars(),this.getWidth(),this.getCode()]}}t.JoinedCellData=c;let l=t.CharacterJoinerService=class e{constructor(e){this._bufferService=e,this._characterJoiners=[],this._nextCharacterJoinerId=0,this._workCell=new a.CellData}register(e){const t={id:this._nextCharacterJoinerId++,handler:e};return this._characterJoiners.push(t),t.id}deregister(e){for(let t=0;t<this._characterJoiners.length;t++)if(this._characterJoiners[t].id===e)return this._characterJoiners.splice(t,1),!0;return!1}getJoinedCharacters(e){if(0===this._characterJoiners.length)return[];const t=this._bufferService.buffer.lines.get(e);if(!t||0===t.length)return[];const i=[],s=t.translateToString(!0);let r=0,n=0,a=0,h=t.getFg(0),c=t.getBg(0);for(let e=0;e<t.getTrimmedLength();e++)if(t.loadCell(e,this._workCell),0!==this._workCell.getWidth()){if(this._workCell.fg!==h||this._workCell.bg!==c){if(e-r>1){const e=this._getJoinedRanges(s,a,n,t,r);for(let t=0;t<e.length;t++)i.push(e[t])}r=e,a=n,h=this._workCell.fg,c=this._workCell.bg}n+=this._workCell.getChars().length||o.WHITESPACE_CELL_CHAR.length}if(this._bufferService.cols-r>1){const e=this._getJoinedRanges(s,a,n,t,r);for(let t=0;t<e.length;t++)i.push(e[t])}return i}_getJoinedRanges(t,i,s,r,n){const o=t.substring(i,s);let a=[];try{a=this._characterJoiners[0].handler(o)}catch(e){console.error(e)}for(let t=1;t<this._characterJoiners.length;t++)try{const i=this._characterJoiners[t].handler(o);for(let t=0;t<i.length;t++)e._mergeRanges(a,i[t])}catch(e){console.error(e)}return this._stringRangesToCellRanges(a,r,n),a}_stringRangesToCellRanges(e,t,i){let s=0,r=!1,n=0,a=e[s];if(a){for(let h=i;h<this._bufferService.cols;h++){const i=t.getWidth(h),c=t.getString(h).length||o.WHITESPACE_CELL_CHAR.length;if(0!==i){if(!r&&a[0]<=n&&(a[0]=h,r=!0),a[1]<=n){if(a[1]=h,a=e[++s],!a)break;a[0]<=n?(a[0]=h,r=!0):r=!1}n+=c}}a&&(a[1]=this._bufferService.cols)}}static _mergeRanges(e,t){let i=!1;for(let s=0;s<e.length;s++){const r=e[s];if(i){if(t[1]<=r[0])return e[s-1][1]=t[1],e;if(t[1]<=r[1])return e[s-1][1]=Math.max(t[1],r[1]),e.splice(s,1),e;e.splice(s,1),s--}else{if(t[1]<=r[0])return e.splice(s,0,t),e;if(t[1]<=r[1])return r[0]=Math.min(t[0],r[0]),e;t[0]<r[1]&&(r[0]=Math.min(t[0],r[0]),i=!0)}}return i?e[e.length-1][1]=t[1]:e.push(t),e}};t.CharacterJoinerService=l=s([r(0,h.IBufferService)],l)},5114:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.CoreBrowserService=void 0;const s=i(844),r=i(8460),n=i(3656);class o extends s.Disposable{constructor(e,t,i){super(),this._textarea=e,this._window=t,this.mainDocument=i,this._isFocused=!1,this._cachedIsFocused=void 0,this._screenDprMonitor=new a(this._window),this._onDprChange=this.register(new r.EventEmitter),this.onDprChange=this._onDprChange.event,this._onWindowChange=this.register(new r.EventEmitter),this.onWindowChange=this._onWindowChange.event,this.register(this.onWindowChange((e=>this._screenDprMonitor.setWindow(e)))),this.register((0,r.forwardEvent)(this._screenDprMonitor.onDprChange,this._onDprChange)),this._textarea.addEventListener("focus",(()=>this._isFocused=!0)),this._textarea.addEventListener("blur",(()=>this._isFocused=!1))}get window(){return this._window}set window(e){this._window!==e&&(this._window=e,this._onWindowChange.fire(this._window))}get dpr(){return this.window.devicePixelRatio}get isFocused(){return void 0===this._cachedIsFocused&&(this._cachedIsFocused=this._isFocused&&this._textarea.ownerDocument.hasFocus(),queueMicrotask((()=>this._cachedIsFocused=void 0))),this._cachedIsFocused}}t.CoreBrowserService=o;class a extends s.Disposable{constructor(e){super(),this._parentWindow=e,this._windowResizeListener=this.register(new s.MutableDisposable),this._onDprChange=this.register(new r.EventEmitter),this.onDprChange=this._onDprChange.event,this._outerListener=()=>this._setDprAndFireIfDiffers(),this._currentDevicePixelRatio=this._parentWindow.devicePixelRatio,this._updateDpr(),this._setWindowResizeListener(),this.register((0,s.toDisposable)((()=>this.clearListener())))}setWindow(e){this._parentWindow=e,this._setWindowResizeListener(),this._setDprAndFireIfDiffers()}_setWindowResizeListener(){this._windowResizeListener.value=(0,n.addDisposableDomListener)(this._parentWindow,"resize",(()=>this._setDprAndFireIfDiffers()))}_setDprAndFireIfDiffers(){this._parentWindow.devicePixelRatio!==this._currentDevicePixelRatio&&this._onDprChange.fire(this._parentWindow.devicePixelRatio),this._updateDpr()}_updateDpr(){this._outerListener&&(this._resolutionMediaMatchList?.removeListener(this._outerListener),this._currentDevicePixelRatio=this._parentWindow.devicePixelRatio,this._resolutionMediaMatchList=this._parentWindow.matchMedia(`screen and (resolution: ${this._parentWindow.devicePixelRatio}dppx)`),this._resolutionMediaMatchList.addListener(this._outerListener))}clearListener(){this._resolutionMediaMatchList&&this._outerListener&&(this._resolutionMediaMatchList.removeListener(this._outerListener),this._resolutionMediaMatchList=void 0,this._outerListener=void 0)}}},779:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.LinkProviderService=void 0;const s=i(844);class r extends s.Disposable{constructor(){super(),this.linkProviders=[],this.register((0,s.toDisposable)((()=>this.linkProviders.length=0)))}registerLinkProvider(e){return this.linkProviders.push(e),{dispose:()=>{const t=this.linkProviders.indexOf(e);-1!==t&&this.linkProviders.splice(t,1)}}}}t.LinkProviderService=r},8934:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.MouseService=void 0;const n=i(4725),o=i(9806);let a=t.MouseService=class{constructor(e,t){this._renderService=e,this._charSizeService=t}getCoords(e,t,i,s,r){return(0,o.getCoords)(window,e,t,i,s,this._charSizeService.hasValidSize,this._renderService.dimensions.css.cell.width,this._renderService.dimensions.css.cell.height,r)}getMouseReportCoords(e,t){const i=(0,o.getCoordsRelativeToElement)(window,e,t);if(this._charSizeService.hasValidSize)return i[0]=Math.min(Math.max(i[0],0),this._renderService.dimensions.css.canvas.width-1),i[1]=Math.min(Math.max(i[1],0),this._renderService.dimensions.css.canvas.height-1),{col:Math.floor(i[0]/this._renderService.dimensions.css.cell.width),row:Math.floor(i[1]/this._renderService.dimensions.css.cell.height),x:Math.floor(i[0]),y:Math.floor(i[1])}}};t.MouseService=a=s([r(0,n.IRenderService),r(1,n.ICharSizeService)],a)},3230:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.RenderService=void 0;const n=i(6193),o=i(4725),a=i(8460),h=i(844),c=i(7226),l=i(2585);let d=t.RenderService=class extends h.Disposable{get dimensions(){return this._renderer.value.dimensions}constructor(e,t,i,s,r,o,l,d){super(),this._rowCount=e,this._charSizeService=s,this._renderer=this.register(new h.MutableDisposable),this._pausedResizeTask=new c.DebouncedIdleTask,this._observerDisposable=this.register(new h.MutableDisposable),this._isPaused=!1,this._needsFullRefresh=!1,this._isNextRenderRedrawOnly=!0,this._needsSelectionRefresh=!1,this._canvasWidth=0,this._canvasHeight=0,this._selectionState={start:void 0,end:void 0,columnSelectMode:!1},this._onDimensionsChange=this.register(new a.EventEmitter),this.onDimensionsChange=this._onDimensionsChange.event,this._onRenderedViewportChange=this.register(new a.EventEmitter),this.onRenderedViewportChange=this._onRenderedViewportChange.event,this._onRender=this.register(new a.EventEmitter),this.onRender=this._onRender.event,this._onRefreshRequest=this.register(new a.EventEmitter),this.onRefreshRequest=this._onRefreshRequest.event,this._renderDebouncer=new n.RenderDebouncer(((e,t)=>this._renderRows(e,t)),l),this.register(this._renderDebouncer),this.register(l.onDprChange((()=>this.handleDevicePixelRatioChange()))),this.register(o.onResize((()=>this._fullRefresh()))),this.register(o.buffers.onBufferActivate((()=>this._renderer.value?.clear()))),this.register(i.onOptionChange((()=>this._handleOptionsChanged()))),this.register(this._charSizeService.onCharSizeChange((()=>this.handleCharSizeChanged()))),this.register(r.onDecorationRegistered((()=>this._fullRefresh()))),this.register(r.onDecorationRemoved((()=>this._fullRefresh()))),this.register(i.onMultipleOptionChange(["customGlyphs","drawBoldTextInBrightColors","letterSpacing","lineHeight","fontFamily","fontSize","fontWeight","fontWeightBold","minimumContrastRatio","rescaleOverlappingGlyphs"],(()=>{this.clear(),this.handleResize(o.cols,o.rows),this._fullRefresh()}))),this.register(i.onMultipleOptionChange(["cursorBlink","cursorStyle"],(()=>this.refreshRows(o.buffer.y,o.buffer.y,!0)))),this.register(d.onChangeColors((()=>this._fullRefresh()))),this._registerIntersectionObserver(l.window,t),this.register(l.onWindowChange((e=>this._registerIntersectionObserver(e,t))))}_registerIntersectionObserver(e,t){if("IntersectionObserver"in e){const i=new e.IntersectionObserver((e=>this._handleIntersectionChange(e[e.length-1])),{threshold:0});i.observe(t),this._observerDisposable.value=(0,h.toDisposable)((()=>i.disconnect()))}}_handleIntersectionChange(e){this._isPaused=void 0===e.isIntersecting?0===e.intersectionRatio:!e.isIntersecting,this._isPaused||this._charSizeService.hasValidSize||this._charSizeService.measure(),!this._isPaused&&this._needsFullRefresh&&(this._pausedResizeTask.flush(),this.refreshRows(0,this._rowCount-1),this._needsFullRefresh=!1)}refreshRows(e,t,i=!1){this._isPaused?this._needsFullRefresh=!0:(i||(this._isNextRenderRedrawOnly=!1),this._renderDebouncer.refresh(e,t,this._rowCount))}_renderRows(e,t){this._renderer.value&&(e=Math.min(e,this._rowCount-1),t=Math.min(t,this._rowCount-1),this._renderer.value.renderRows(e,t),this._needsSelectionRefresh&&(this._renderer.value.handleSelectionChanged(this._selectionState.start,this._selectionState.end,this._selectionState.columnSelectMode),this._needsSelectionRefresh=!1),this._isNextRenderRedrawOnly||this._onRenderedViewportChange.fire({start:e,end:t}),this._onRender.fire({start:e,end:t}),this._isNextRenderRedrawOnly=!0)}resize(e,t){this._rowCount=t,this._fireOnCanvasResize()}_handleOptionsChanged(){this._renderer.value&&(this.refreshRows(0,this._rowCount-1),this._fireOnCanvasResize())}_fireOnCanvasResize(){this._renderer.value&&(this._renderer.value.dimensions.css.canvas.width===this._canvasWidth&&this._renderer.value.dimensions.css.canvas.height===this._canvasHeight||this._onDimensionsChange.fire(this._renderer.value.dimensions))}hasRenderer(){return!!this._renderer.value}setRenderer(e){this._renderer.value=e,this._renderer.value&&(this._renderer.value.onRequestRedraw((e=>this.refreshRows(e.start,e.end,!0))),this._needsSelectionRefresh=!0,this._fullRefresh())}addRefreshCallback(e){return this._renderDebouncer.addRefreshCallback(e)}_fullRefresh(){this._isPaused?this._needsFullRefresh=!0:this.refreshRows(0,this._rowCount-1)}clearTextureAtlas(){this._renderer.value&&(this._renderer.value.clearTextureAtlas?.(),this._fullRefresh())}handleDevicePixelRatioChange(){this._charSizeService.measure(),this._renderer.value&&(this._renderer.value.handleDevicePixelRatioChange(),this.refreshRows(0,this._rowCount-1))}handleResize(e,t){this._renderer.value&&(this._isPaused?this._pausedResizeTask.set((()=>this._renderer.value?.handleResize(e,t))):this._renderer.value.handleResize(e,t),this._fullRefresh())}handleCharSizeChanged(){this._renderer.value?.handleCharSizeChanged()}handleBlur(){this._renderer.value?.handleBlur()}handleFocus(){this._renderer.value?.handleFocus()}handleSelectionChanged(e,t,i){this._selectionState.start=e,this._selectionState.end=t,this._selectionState.columnSelectMode=i,this._renderer.value?.handleSelectionChanged(e,t,i)}handleCursorMove(){this._renderer.value?.handleCursorMove()}clear(){this._renderer.value?.clear()}};t.RenderService=d=s([r(2,l.IOptionsService),r(3,o.ICharSizeService),r(4,l.IDecorationService),r(5,l.IBufferService),r(6,o.ICoreBrowserService),r(7,o.IThemeService)],d)},9312:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.SelectionService=void 0;const n=i(9806),o=i(9504),a=i(456),h=i(4725),c=i(8460),l=i(844),d=i(6114),_=i(4841),u=i(511),f=i(2585),v=String.fromCharCode(160),p=new RegExp(v,"g");let g=t.SelectionService=class extends l.Disposable{constructor(e,t,i,s,r,n,o,h,d){super(),this._element=e,this._screenElement=t,this._linkifier=i,this._bufferService=s,this._coreService=r,this._mouseService=n,this._optionsService=o,this._renderService=h,this._coreBrowserService=d,this._dragScrollAmount=0,this._enabled=!0,this._workCell=new u.CellData,this._mouseDownTimeStamp=0,this._oldHasSelection=!1,this._oldSelectionStart=void 0,this._oldSelectionEnd=void 0,this._onLinuxMouseSelection=this.register(new c.EventEmitter),this.onLinuxMouseSelection=this._onLinuxMouseSelection.event,this._onRedrawRequest=this.register(new c.EventEmitter),this.onRequestRedraw=this._onRedrawRequest.event,this._onSelectionChange=this.register(new c.EventEmitter),this.onSelectionChange=this._onSelectionChange.event,this._onRequestScrollLines=this.register(new c.EventEmitter),this.onRequestScrollLines=this._onRequestScrollLines.event,this._mouseMoveListener=e=>this._handleMouseMove(e),this._mouseUpListener=e=>this._handleMouseUp(e),this._coreService.onUserInput((()=>{this.hasSelection&&this.clearSelection()})),this._trimListener=this._bufferService.buffer.lines.onTrim((e=>this._handleTrim(e))),this.register(this._bufferService.buffers.onBufferActivate((e=>this._handleBufferActivate(e)))),this.enable(),this._model=new a.SelectionModel(this._bufferService),this._activeSelectionMode=0,this.register((0,l.toDisposable)((()=>{this._removeMouseDownListeners()})))}reset(){this.clearSelection()}disable(){this.clearSelection(),this._enabled=!1}enable(){this._enabled=!0}get selectionStart(){return this._model.finalSelectionStart}get selectionEnd(){return this._model.finalSelectionEnd}get hasSelection(){const e=this._model.finalSelectionStart,t=this._model.finalSelectionEnd;return!(!e||!t||e[0]===t[0]&&e[1]===t[1])}get selectionText(){const e=this._model.finalSelectionStart,t=this._model.finalSelectionEnd;if(!e||!t)return"";const i=this._bufferService.buffer,s=[];if(3===this._activeSelectionMode){if(e[0]===t[0])return"";const r=e[0]<t[0]?e[0]:t[0],n=e[0]<t[0]?t[0]:e[0];for(let o=e[1];o<=t[1];o++){const e=i.translateBufferLineToString(o,!0,r,n);s.push(e)}}else{const r=e[1]===t[1]?t[0]:void 0;s.push(i.translateBufferLineToString(e[1],!0,e[0],r));for(let r=e[1]+1;r<=t[1]-1;r++){const e=i.lines.get(r),t=i.translateBufferLineToString(r,!0);e?.isWrapped?s[s.length-1]+=t:s.push(t)}if(e[1]!==t[1]){const e=i.lines.get(t[1]),r=i.translateBufferLineToString(t[1],!0,0,t[0]);e&&e.isWrapped?s[s.length-1]+=r:s.push(r)}}return s.map((e=>e.replace(p," "))).join(d.isWindows?"\r\n":"\n")}clearSelection(){this._model.clearSelection(),this._removeMouseDownListeners(),this.refresh(),this._onSelectionChange.fire()}refresh(e){this._refreshAnimationFrame||(this._refreshAnimationFrame=this._coreBrowserService.window.requestAnimationFrame((()=>this._refresh()))),d.isLinux&&e&&this.selectionText.length&&this._onLinuxMouseSelection.fire(this.selectionText)}_refresh(){this._refreshAnimationFrame=void 0,this._onRedrawRequest.fire({start:this._model.finalSelectionStart,end:this._model.finalSelectionEnd,columnSelectMode:3===this._activeSelectionMode})}_isClickInSelection(e){const t=this._getMouseBufferCoords(e),i=this._model.finalSelectionStart,s=this._model.finalSelectionEnd;return!!(i&&s&&t)&&this._areCoordsInSelection(t,i,s)}isCellInSelection(e,t){const i=this._model.finalSelectionStart,s=this._model.finalSelectionEnd;return!(!i||!s)&&this._areCoordsInSelection([e,t],i,s)}_areCoordsInSelection(e,t,i){return e[1]>t[1]&&e[1]<i[1]||t[1]===i[1]&&e[1]===t[1]&&e[0]>=t[0]&&e[0]<i[0]||t[1]<i[1]&&e[1]===i[1]&&e[0]<i[0]||t[1]<i[1]&&e[1]===t[1]&&e[0]>=t[0]}_selectWordAtCursor(e,t){const i=this._linkifier.currentLink?.link?.range;if(i)return this._model.selectionStart=[i.start.x-1,i.start.y-1],this._model.selectionStartLength=(0,_.getRangeLength)(i,this._bufferService.cols),this._model.selectionEnd=void 0,!0;const s=this._getMouseBufferCoords(e);return!!s&&(this._selectWordAt(s,t),this._model.selectionEnd=void 0,!0)}selectAll(){this._model.isSelectAllActive=!0,this.refresh(),this._onSelectionChange.fire()}selectLines(e,t){this._model.clearSelection(),e=Math.max(e,0),t=Math.min(t,this._bufferService.buffer.lines.length-1),this._model.selectionStart=[0,e],this._model.selectionEnd=[this._bufferService.cols,t],this.refresh(),this._onSelectionChange.fire()}_handleTrim(e){this._model.handleTrim(e)&&this.refresh()}_getMouseBufferCoords(e){const t=this._mouseService.getCoords(e,this._screenElement,this._bufferService.cols,this._bufferService.rows,!0);if(t)return t[0]--,t[1]--,t[1]+=this._bufferService.buffer.ydisp,t}_getMouseEventScrollAmount(e){let t=(0,n.getCoordsRelativeToElement)(this._coreBrowserService.window,e,this._screenElement)[1];const i=this._renderService.dimensions.css.canvas.height;return t>=0&&t<=i?0:(t>i&&(t-=i),t=Math.min(Math.max(t,-50),50),t/=50,t/Math.abs(t)+Math.round(14*t))}shouldForceSelection(e){return d.isMac?e.altKey&&this._optionsService.rawOptions.macOptionClickForcesSelection:e.shiftKey}handleMouseDown(e){if(this._mouseDownTimeStamp=e.timeStamp,(2!==e.button||!this.hasSelection)&&0===e.button){if(!this._enabled){if(!this.shouldForceSelection(e))return;e.stopPropagation()}e.preventDefault(),this._dragScrollAmount=0,this._enabled&&e.shiftKey?this._handleIncrementalClick(e):1===e.detail?this._handleSingleClick(e):2===e.detail?this._handleDoubleClick(e):3===e.detail&&this._handleTripleClick(e),this._addMouseDownListeners(),this.refresh(!0)}}_addMouseDownListeners(){this._screenElement.ownerDocument&&(this._screenElement.ownerDocument.addEventListener("mousemove",this._mouseMoveListener),this._screenElement.ownerDocument.addEventListener("mouseup",this._mouseUpListener)),this._dragScrollIntervalTimer=this._coreBrowserService.window.setInterval((()=>this._dragScroll()),50)}_removeMouseDownListeners(){this._screenElement.ownerDocument&&(this._screenElement.ownerDocument.removeEventListener("mousemove",this._mouseMoveListener),this._screenElement.ownerDocument.removeEventListener("mouseup",this._mouseUpListener)),this._coreBrowserService.window.clearInterval(this._dragScrollIntervalTimer),this._dragScrollIntervalTimer=void 0}_handleIncrementalClick(e){this._model.selectionStart&&(this._model.selectionEnd=this._getMouseBufferCoords(e))}_handleSingleClick(e){if(this._model.selectionStartLength=0,this._model.isSelectAllActive=!1,this._activeSelectionMode=this.shouldColumnSelect(e)?3:0,this._model.selectionStart=this._getMouseBufferCoords(e),!this._model.selectionStart)return;this._model.selectionEnd=void 0;const t=this._bufferService.buffer.lines.get(this._model.selectionStart[1]);t&&t.length!==this._model.selectionStart[0]&&0===t.hasWidth(this._model.selectionStart[0])&&this._model.selectionStart[0]++}_handleDoubleClick(e){this._selectWordAtCursor(e,!0)&&(this._activeSelectionMode=1)}_handleTripleClick(e){const t=this._getMouseBufferCoords(e);t&&(this._activeSelectionMode=2,this._selectLineAt(t[1]))}shouldColumnSelect(e){return e.altKey&&!(d.isMac&&this._optionsService.rawOptions.macOptionClickForcesSelection)}_handleMouseMove(e){if(e.stopImmediatePropagation(),!this._model.selectionStart)return;const t=this._model.selectionEnd?[this._model.selectionEnd[0],this._model.selectionEnd[1]]:null;if(this._model.selectionEnd=this._getMouseBufferCoords(e),!this._model.selectionEnd)return void this.refresh(!0);2===this._activeSelectionMode?this._model.selectionEnd[1]<this._model.selectionStart[1]?this._model.selectionEnd[0]=0:this._model.selectionEnd[0]=this._bufferService.cols:1===this._activeSelectionMode&&this._selectToWordAt(this._model.selectionEnd),this._dragScrollAmount=this._getMouseEventScrollAmount(e),3!==this._activeSelectionMode&&(this._dragScrollAmount>0?this._model.selectionEnd[0]=this._bufferService.cols:this._dragScrollAmount<0&&(this._model.selectionEnd[0]=0));const i=this._bufferService.buffer;if(this._model.selectionEnd[1]<i.lines.length){const e=i.lines.get(this._model.selectionEnd[1]);e&&0===e.hasWidth(this._model.selectionEnd[0])&&this._model.selectionEnd[0]<this._bufferService.cols&&this._model.selectionEnd[0]++}t&&t[0]===this._model.selectionEnd[0]&&t[1]===this._model.selectionEnd[1]||this.refresh(!0)}_dragScroll(){if(this._model.selectionEnd&&this._model.selectionStart&&this._dragScrollAmount){this._onRequestScrollLines.fire({amount:this._dragScrollAmount,suppressScrollEvent:!1});const e=this._bufferService.buffer;this._dragScrollAmount>0?(3!==this._activeSelectionMode&&(this._model.selectionEnd[0]=this._bufferService.cols),this._model.selectionEnd[1]=Math.min(e.ydisp+this._bufferService.rows,e.lines.length-1)):(3!==this._activeSelectionMode&&(this._model.selectionEnd[0]=0),this._model.selectionEnd[1]=e.ydisp),this.refresh()}}_handleMouseUp(e){const t=e.timeStamp-this._mouseDownTimeStamp;if(this._removeMouseDownListeners(),this.selectionText.length<=1&&t<500&&e.altKey&&this._optionsService.rawOptions.altClickMovesCursor){if(this._bufferService.buffer.ybase===this._bufferService.buffer.ydisp){const t=this._mouseService.getCoords(e,this._element,this._bufferService.cols,this._bufferService.rows,!1);if(t&&void 0!==t[0]&&void 0!==t[1]){const e=(0,o.moveToCellSequence)(t[0]-1,t[1]-1,this._bufferService,this._coreService.decPrivateModes.applicationCursorKeys);this._coreService.triggerDataEvent(e,!0)}}}else this._fireEventIfSelectionChanged()}_fireEventIfSelectionChanged(){const e=this._model.finalSelectionStart,t=this._model.finalSelectionEnd,i=!(!e||!t||e[0]===t[0]&&e[1]===t[1]);i?e&&t&&(this._oldSelectionStart&&this._oldSelectionEnd&&e[0]===this._oldSelectionStart[0]&&e[1]===this._oldSelectionStart[1]&&t[0]===this._oldSelectionEnd[0]&&t[1]===this._oldSelectionEnd[1]||this._fireOnSelectionChange(e,t,i)):this._oldHasSelection&&this._fireOnSelectionChange(e,t,i)}_fireOnSelectionChange(e,t,i){this._oldSelectionStart=e,this._oldSelectionEnd=t,this._oldHasSelection=i,this._onSelectionChange.fire()}_handleBufferActivate(e){this.clearSelection(),this._trimListener.dispose(),this._trimListener=e.activeBuffer.lines.onTrim((e=>this._handleTrim(e)))}_convertViewportColToCharacterIndex(e,t){let i=t;for(let s=0;t>=s;s++){const r=e.loadCell(s,this._workCell).getChars().length;0===this._workCell.getWidth()?i--:r>1&&t!==s&&(i+=r-1)}return i}setSelection(e,t,i){this._model.clearSelection(),this._removeMouseDownListeners(),this._model.selectionStart=[e,t],this._model.selectionStartLength=i,this.refresh(),this._fireEventIfSelectionChanged()}rightClickSelect(e){this._isClickInSelection(e)||(this._selectWordAtCursor(e,!1)&&this.refresh(!0),this._fireEventIfSelectionChanged())}_getWordAt(e,t,i=!0,s=!0){if(e[0]>=this._bufferService.cols)return;const r=this._bufferService.buffer,n=r.lines.get(e[1]);if(!n)return;const o=r.translateBufferLineToString(e[1],!1);let a=this._convertViewportColToCharacterIndex(n,e[0]),h=a;const c=e[0]-a;let l=0,d=0,_=0,u=0;if(" "===o.charAt(a)){for(;a>0&&" "===o.charAt(a-1);)a--;for(;h<o.length&&" "===o.charAt(h+1);)h++}else{let t=e[0],i=e[0];0===n.getWidth(t)&&(l++,t--),2===n.getWidth(i)&&(d++,i++);const s=n.getString(i).length;for(s>1&&(u+=s-1,h+=s-1);t>0&&a>0&&!this._isCharWordSeparator(n.loadCell(t-1,this._workCell));){n.loadCell(t-1,this._workCell);const e=this._workCell.getChars().length;0===this._workCell.getWidth()?(l++,t--):e>1&&(_+=e-1,a-=e-1),a--,t--}for(;i<n.length&&h+1<o.length&&!this._isCharWordSeparator(n.loadCell(i+1,this._workCell));){n.loadCell(i+1,this._workCell);const e=this._workCell.getChars().length;2===this._workCell.getWidth()?(d++,i++):e>1&&(u+=e-1,h+=e-1),h++,i++}}h++;let f=a+c-l+_,v=Math.min(this._bufferService.cols,h-a+l+d-_-u);if(t||""!==o.slice(a,h).trim()){if(i&&0===f&&32!==n.getCodePoint(0)){const t=r.lines.get(e[1]-1);if(t&&n.isWrapped&&32!==t.getCodePoint(this._bufferService.cols-1)){const t=this._getWordAt([this._bufferService.cols-1,e[1]-1],!1,!0,!1);if(t){const e=this._bufferService.cols-t.start;f-=e,v+=e}}}if(s&&f+v===this._bufferService.cols&&32!==n.getCodePoint(this._bufferService.cols-1)){const t=r.lines.get(e[1]+1);if(t?.isWrapped&&32!==t.getCodePoint(0)){const t=this._getWordAt([0,e[1]+1],!1,!1,!0);t&&(v+=t.length)}}return{start:f,length:v}}}_selectWordAt(e,t){const i=this._getWordAt(e,t);if(i){for(;i.start<0;)i.start+=this._bufferService.cols,e[1]--;this._model.selectionStart=[i.start,e[1]],this._model.selectionStartLength=i.length}}_selectToWordAt(e){const t=this._getWordAt(e,!0);if(t){let i=e[1];for(;t.start<0;)t.start+=this._bufferService.cols,i--;if(!this._model.areSelectionValuesReversed())for(;t.start+t.length>this._bufferService.cols;)t.length-=this._bufferService.cols,i++;this._model.selectionEnd=[this._model.areSelectionValuesReversed()?t.start:t.start+t.length,i]}}_isCharWordSeparator(e){return 0!==e.getWidth()&&this._optionsService.rawOptions.wordSeparator.indexOf(e.getChars())>=0}_selectLineAt(e){const t=this._bufferService.buffer.getWrappedRangeForLine(e),i={start:{x:0,y:t.first},end:{x:this._bufferService.cols-1,y:t.last}};this._model.selectionStart=[0,t.first],this._model.selectionEnd=void 0,this._model.selectionStartLength=(0,_.getRangeLength)(i,this._bufferService.cols)}};t.SelectionService=g=s([r(3,f.IBufferService),r(4,f.ICoreService),r(5,h.IMouseService),r(6,f.IOptionsService),r(7,h.IRenderService),r(8,h.ICoreBrowserService)],g)},4725:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.ILinkProviderService=t.IThemeService=t.ICharacterJoinerService=t.ISelectionService=t.IRenderService=t.IMouseService=t.ICoreBrowserService=t.ICharSizeService=void 0;const s=i(8343);t.ICharSizeService=(0,s.createDecorator)("CharSizeService"),t.ICoreBrowserService=(0,s.createDecorator)("CoreBrowserService"),t.IMouseService=(0,s.createDecorator)("MouseService"),t.IRenderService=(0,s.createDecorator)("RenderService"),t.ISelectionService=(0,s.createDecorator)("SelectionService"),t.ICharacterJoinerService=(0,s.createDecorator)("CharacterJoinerService"),t.IThemeService=(0,s.createDecorator)("ThemeService"),t.ILinkProviderService=(0,s.createDecorator)("LinkProviderService")},6731:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.ThemeService=t.DEFAULT_ANSI_COLORS=void 0;const n=i(7239),o=i(8055),a=i(8460),h=i(844),c=i(2585),l=o.css.toColor("#ffffff"),d=o.css.toColor("#000000"),_=o.css.toColor("#ffffff"),u=o.css.toColor("#000000"),f={css:"rgba(255, 255, 255, 0.3)",rgba:4294967117};t.DEFAULT_ANSI_COLORS=Object.freeze((()=>{const e=[o.css.toColor("#2e3436"),o.css.toColor("#cc0000"),o.css.toColor("#4e9a06"),o.css.toColor("#c4a000"),o.css.toColor("#3465a4"),o.css.toColor("#75507b"),o.css.toColor("#06989a"),o.css.toColor("#d3d7cf"),o.css.toColor("#555753"),o.css.toColor("#ef2929"),o.css.toColor("#8ae234"),o.css.toColor("#fce94f"),o.css.toColor("#729fcf"),o.css.toColor("#ad7fa8"),o.css.toColor("#34e2e2"),o.css.toColor("#eeeeec")],t=[0,95,135,175,215,255];for(let i=0;i<216;i++){const s=t[i/36%6|0],r=t[i/6%6|0],n=t[i%6];e.push({css:o.channels.toCss(s,r,n),rgba:o.channels.toRgba(s,r,n)})}for(let t=0;t<24;t++){const i=8+10*t;e.push({css:o.channels.toCss(i,i,i),rgba:o.channels.toRgba(i,i,i)})}return e})());let v=t.ThemeService=class extends h.Disposable{get colors(){return this._colors}constructor(e){super(),this._optionsService=e,this._contrastCache=new n.ColorContrastCache,this._halfContrastCache=new n.ColorContrastCache,this._onChangeColors=this.register(new a.EventEmitter),this.onChangeColors=this._onChangeColors.event,this._colors={foreground:l,background:d,cursor:_,cursorAccent:u,selectionForeground:void 0,selectionBackgroundTransparent:f,selectionBackgroundOpaque:o.color.blend(d,f),selectionInactiveBackgroundTransparent:f,selectionInactiveBackgroundOpaque:o.color.blend(d,f),ansi:t.DEFAULT_ANSI_COLORS.slice(),contrastCache:this._contrastCache,halfContrastCache:this._halfContrastCache},this._updateRestoreColors(),this._setTheme(this._optionsService.rawOptions.theme),this.register(this._optionsService.onSpecificOptionChange("minimumContrastRatio",(()=>this._contrastCache.clear()))),this.register(this._optionsService.onSpecificOptionChange("theme",(()=>this._setTheme(this._optionsService.rawOptions.theme))))}_setTheme(e={}){const i=this._colors;if(i.foreground=p(e.foreground,l),i.background=p(e.background,d),i.cursor=p(e.cursor,_),i.cursorAccent=p(e.cursorAccent,u),i.selectionBackgroundTransparent=p(e.selectionBackground,f),i.selectionBackgroundOpaque=o.color.blend(i.background,i.selectionBackgroundTransparent),i.selectionInactiveBackgroundTransparent=p(e.selectionInactiveBackground,i.selectionBackgroundTransparent),i.selectionInactiveBackgroundOpaque=o.color.blend(i.background,i.selectionInactiveBackgroundTransparent),i.selectionForeground=e.selectionForeground?p(e.selectionForeground,o.NULL_COLOR):void 0,i.selectionForeground===o.NULL_COLOR&&(i.selectionForeground=void 0),o.color.isOpaque(i.selectionBackgroundTransparent)){const e=.3;i.selectionBackgroundTransparent=o.color.opacity(i.selectionBackgroundTransparent,e)}if(o.color.isOpaque(i.selectionInactiveBackgroundTransparent)){const e=.3;i.selectionInactiveBackgroundTransparent=o.color.opacity(i.selectionInactiveBackgroundTransparent,e)}if(i.ansi=t.DEFAULT_ANSI_COLORS.slice(),i.ansi[0]=p(e.black,t.DEFAULT_ANSI_COLORS[0]),i.ansi[1]=p(e.red,t.DEFAULT_ANSI_COLORS[1]),i.ansi[2]=p(e.green,t.DEFAULT_ANSI_COLORS[2]),i.ansi[3]=p(e.yellow,t.DEFAULT_ANSI_COLORS[3]),i.ansi[4]=p(e.blue,t.DEFAULT_ANSI_COLORS[4]),i.ansi[5]=p(e.magenta,t.DEFAULT_ANSI_COLORS[5]),i.ansi[6]=p(e.cyan,t.DEFAULT_ANSI_COLORS[6]),i.ansi[7]=p(e.white,t.DEFAULT_ANSI_COLORS[7]),i.ansi[8]=p(e.brightBlack,t.DEFAULT_ANSI_COLORS[8]),i.ansi[9]=p(e.brightRed,t.DEFAULT_ANSI_COLORS[9]),i.ansi[10]=p(e.brightGreen,t.DEFAULT_ANSI_COLORS[10]),i.ansi[11]=p(e.brightYellow,t.DEFAULT_ANSI_COLORS[11]),i.ansi[12]=p(e.brightBlue,t.DEFAULT_ANSI_COLORS[12]),i.ansi[13]=p(e.brightMagenta,t.DEFAULT_ANSI_COLORS[13]),i.ansi[14]=p(e.brightCyan,t.DEFAULT_ANSI_COLORS[14]),i.ansi[15]=p(e.brightWhite,t.DEFAULT_ANSI_COLORS[15]),e.extendedAnsi){const s=Math.min(i.ansi.length-16,e.extendedAnsi.length);for(let r=0;r<s;r++)i.ansi[r+16]=p(e.extendedAnsi[r],t.DEFAULT_ANSI_COLORS[r+16])}this._contrastCache.clear(),this._halfContrastCache.clear(),this._updateRestoreColors(),this._onChangeColors.fire(this.colors)}restoreColor(e){this._restoreColor(e),this._onChangeColors.fire(this.colors)}_restoreColor(e){if(void 0!==e)switch(e){case 256:this._colors.foreground=this._restoreColors.foreground;break;case 257:this._colors.background=this._restoreColors.background;break;case 258:this._colors.cursor=this._restoreColors.cursor;break;default:this._colors.ansi[e]=this._restoreColors.ansi[e]}else for(let e=0;e<this._restoreColors.ansi.length;++e)this._colors.ansi[e]=this._restoreColors.ansi[e]}modifyColors(e){e(this._colors),this._onChangeColors.fire(this.colors)}_updateRestoreColors(){this._restoreColors={foreground:this._colors.foreground,background:this._colors.background,cursor:this._colors.cursor,ansi:this._colors.ansi.slice()}}};function p(e,t){if(void 0!==e)try{return o.css.toColor(e)}catch{}return t}t.ThemeService=v=s([r(0,c.IOptionsService)],v)},6349:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.CircularList=void 0;const s=i(8460),r=i(844);class n extends r.Disposable{constructor(e){super(),this._maxLength=e,this.onDeleteEmitter=this.register(new s.EventEmitter),this.onDelete=this.onDeleteEmitter.event,this.onInsertEmitter=this.register(new s.EventEmitter),this.onInsert=this.onInsertEmitter.event,this.onTrimEmitter=this.register(new s.EventEmitter),this.onTrim=this.onTrimEmitter.event,this._array=new Array(this._maxLength),this._startIndex=0,this._length=0}get maxLength(){return this._maxLength}set maxLength(e){if(this._maxLength===e)return;const t=new Array(e);for(let i=0;i<Math.min(e,this.length);i++)t[i]=this._array[this._getCyclicIndex(i)];this._array=t,this._maxLength=e,this._startIndex=0}get length(){return this._length}set length(e){if(e>this._length)for(let t=this._length;t<e;t++)this._array[t]=void 0;this._length=e}get(e){return this._array[this._getCyclicIndex(e)]}set(e,t){this._array[this._getCyclicIndex(e)]=t}push(e){this._array[this._getCyclicIndex(this._length)]=e,this._length===this._maxLength?(this._startIndex=++this._startIndex%this._maxLength,this.onTrimEmitter.fire(1)):this._length++}recycle(){if(this._length!==this._maxLength)throw new Error("Can only recycle when the buffer is full");return this._startIndex=++this._startIndex%this._maxLength,this.onTrimEmitter.fire(1),this._array[this._getCyclicIndex(this._length-1)]}get isFull(){return this._length===this._maxLength}pop(){return this._array[this._getCyclicIndex(this._length---1)]}splice(e,t,...i){if(t){for(let i=e;i<this._length-t;i++)this._array[this._getCyclicIndex(i)]=this._array[this._getCyclicIndex(i+t)];this._length-=t,this.onDeleteEmitter.fire({index:e,amount:t})}for(let t=this._length-1;t>=e;t--)this._array[this._getCyclicIndex(t+i.length)]=this._array[this._getCyclicIndex(t)];for(let t=0;t<i.length;t++)this._array[this._getCyclicIndex(e+t)]=i[t];if(i.length&&this.onInsertEmitter.fire({index:e,amount:i.length}),this._length+i.length>this._maxLength){const e=this._length+i.length-this._maxLength;this._startIndex+=e,this._length=this._maxLength,this.onTrimEmitter.fire(e)}else this._length+=i.length}trimStart(e){e>this._length&&(e=this._length),this._startIndex+=e,this._length-=e,this.onTrimEmitter.fire(e)}shiftElements(e,t,i){if(!(t<=0)){if(e<0||e>=this._length)throw new Error("start argument out of range");if(e+i<0)throw new Error("Cannot shift elements in list beyond index 0");if(i>0){for(let s=t-1;s>=0;s--)this.set(e+s+i,this.get(e+s));const s=e+t+i-this._length;if(s>0)for(this._length+=s;this._length>this._maxLength;)this._length--,this._startIndex++,this.onTrimEmitter.fire(1)}else for(let s=0;s<t;s++)this.set(e+s+i,this.get(e+s))}}_getCyclicIndex(e){return(this._startIndex+e)%this._maxLength}}t.CircularList=n},1439:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.clone=void 0,t.clone=function e(t,i=5){if("object"!=typeof t)return t;const s=Array.isArray(t)?[]:{};for(const r in t)s[r]=i<=1?t[r]:t[r]&&e(t[r],i-1);return s}},8055:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.contrastRatio=t.toPaddedHex=t.rgba=t.rgb=t.css=t.color=t.channels=t.NULL_COLOR=void 0;let i=0,s=0,r=0,n=0;var o,a,h,c,l;function d(e){const t=e.toString(16);return t.length<2?"0"+t:t}function _(e,t){return e<t?(t+.05)/(e+.05):(e+.05)/(t+.05)}t.NULL_COLOR={css:"#00000000",rgba:0},function(e){e.toCss=function(e,t,i,s){return void 0!==s?`#${d(e)}${d(t)}${d(i)}${d(s)}`:`#${d(e)}${d(t)}${d(i)}`},e.toRgba=function(e,t,i,s=255){return(e<<24|t<<16|i<<8|s)>>>0},e.toColor=function(t,i,s,r){return{css:e.toCss(t,i,s,r),rgba:e.toRgba(t,i,s,r)}}}(o||(t.channels=o={})),function(e){function t(e,t){return n=Math.round(255*t),[i,s,r]=l.toChannels(e.rgba),{css:o.toCss(i,s,r,n),rgba:o.toRgba(i,s,r,n)}}e.blend=function(e,t){if(n=(255&t.rgba)/255,1===n)return{css:t.css,rgba:t.rgba};const a=t.rgba>>24&255,h=t.rgba>>16&255,c=t.rgba>>8&255,l=e.rgba>>24&255,d=e.rgba>>16&255,_=e.rgba>>8&255;return i=l+Math.round((a-l)*n),s=d+Math.round((h-d)*n),r=_+Math.round((c-_)*n),{css:o.toCss(i,s,r),rgba:o.toRgba(i,s,r)}},e.isOpaque=function(e){return 255==(255&e.rgba)},e.ensureContrastRatio=function(e,t,i){const s=l.ensureContrastRatio(e.rgba,t.rgba,i);if(s)return o.toColor(s>>24&255,s>>16&255,s>>8&255)},e.opaque=function(e){const t=(255|e.rgba)>>>0;return[i,s,r]=l.toChannels(t),{css:o.toCss(i,s,r),rgba:t}},e.opacity=t,e.multiplyOpacity=function(e,i){return n=255&e.rgba,t(e,n*i/255)},e.toColorRGB=function(e){return[e.rgba>>24&255,e.rgba>>16&255,e.rgba>>8&255]}}(a||(t.color=a={})),function(e){let t,a;try{const e=document.createElement("canvas");e.width=1,e.height=1;const i=e.getContext("2d",{willReadFrequently:!0});i&&(t=i,t.globalCompositeOperation="copy",a=t.createLinearGradient(0,0,1,1))}catch{}e.toColor=function(e){if(e.match(/#[\da-f]{3,8}/i))switch(e.length){case 4:return i=parseInt(e.slice(1,2).repeat(2),16),s=parseInt(e.slice(2,3).repeat(2),16),r=parseInt(e.slice(3,4).repeat(2),16),o.toColor(i,s,r);case 5:return i=parseInt(e.slice(1,2).repeat(2),16),s=parseInt(e.slice(2,3).repeat(2),16),r=parseInt(e.slice(3,4).repeat(2),16),n=parseInt(e.slice(4,5).repeat(2),16),o.toColor(i,s,r,n);case 7:return{css:e,rgba:(parseInt(e.slice(1),16)<<8|255)>>>0};case 9:return{css:e,rgba:parseInt(e.slice(1),16)>>>0}}const h=e.match(/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(,\s*(0|1|\d?\.(\d+))\s*)?\)/);if(h)return i=parseInt(h[1]),s=parseInt(h[2]),r=parseInt(h[3]),n=Math.round(255*(void 0===h[5]?1:parseFloat(h[5]))),o.toColor(i,s,r,n);if(!t||!a)throw new Error("css.toColor: Unsupported css format");if(t.fillStyle=a,t.fillStyle=e,"string"!=typeof t.fillStyle)throw new Error("css.toColor: Unsupported css format");if(t.fillRect(0,0,1,1),[i,s,r,n]=t.getImageData(0,0,1,1).data,255!==n)throw new Error("css.toColor: Unsupported css format");return{rgba:o.toRgba(i,s,r,n),css:e}}}(h||(t.css=h={})),function(e){function t(e,t,i){const s=e/255,r=t/255,n=i/255;return.2126*(s<=.03928?s/12.92:Math.pow((s+.055)/1.055,2.4))+.7152*(r<=.03928?r/12.92:Math.pow((r+.055)/1.055,2.4))+.0722*(n<=.03928?n/12.92:Math.pow((n+.055)/1.055,2.4))}e.relativeLuminance=function(e){return t(e>>16&255,e>>8&255,255&e)},e.relativeLuminance2=t}(c||(t.rgb=c={})),function(e){function t(e,t,i){const s=e>>24&255,r=e>>16&255,n=e>>8&255;let o=t>>24&255,a=t>>16&255,h=t>>8&255,l=_(c.relativeLuminance2(o,a,h),c.relativeLuminance2(s,r,n));for(;l<i&&(o>0||a>0||h>0);)o-=Math.max(0,Math.ceil(.1*o)),a-=Math.max(0,Math.ceil(.1*a)),h-=Math.max(0,Math.ceil(.1*h)),l=_(c.relativeLuminance2(o,a,h),c.relativeLuminance2(s,r,n));return(o<<24|a<<16|h<<8|255)>>>0}function a(e,t,i){const s=e>>24&255,r=e>>16&255,n=e>>8&255;let o=t>>24&255,a=t>>16&255,h=t>>8&255,l=_(c.relativeLuminance2(o,a,h),c.relativeLuminance2(s,r,n));for(;l<i&&(o<255||a<255||h<255);)o=Math.min(255,o+Math.ceil(.1*(255-o))),a=Math.min(255,a+Math.ceil(.1*(255-a))),h=Math.min(255,h+Math.ceil(.1*(255-h))),l=_(c.relativeLuminance2(o,a,h),c.relativeLuminance2(s,r,n));return(o<<24|a<<16|h<<8|255)>>>0}e.blend=function(e,t){if(n=(255&t)/255,1===n)return t;const a=t>>24&255,h=t>>16&255,c=t>>8&255,l=e>>24&255,d=e>>16&255,_=e>>8&255;return i=l+Math.round((a-l)*n),s=d+Math.round((h-d)*n),r=_+Math.round((c-_)*n),o.toRgba(i,s,r)},e.ensureContrastRatio=function(e,i,s){const r=c.relativeLuminance(e>>8),n=c.relativeLuminance(i>>8);if(_(r,n)<s){if(n<r){const n=t(e,i,s),o=_(r,c.relativeLuminance(n>>8));if(o<s){const t=a(e,i,s);return o>_(r,c.relativeLuminance(t>>8))?n:t}return n}const o=a(e,i,s),h=_(r,c.relativeLuminance(o>>8));if(h<s){const n=t(e,i,s);return h>_(r,c.relativeLuminance(n>>8))?o:n}return o}},e.reduceLuminance=t,e.increaseLuminance=a,e.toChannels=function(e){return[e>>24&255,e>>16&255,e>>8&255,255&e]}}(l||(t.rgba=l={})),t.toPaddedHex=d,t.contrastRatio=_},8969:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.CoreTerminal=void 0;const s=i(844),r=i(2585),n=i(4348),o=i(7866),a=i(744),h=i(7302),c=i(6975),l=i(8460),d=i(1753),_=i(1480),u=i(7994),f=i(9282),v=i(5435),p=i(5981),g=i(2660);let m=!1;class S extends s.Disposable{get onScroll(){return this._onScrollApi||(this._onScrollApi=this.register(new l.EventEmitter),this._onScroll.event((e=>{this._onScrollApi?.fire(e.position)}))),this._onScrollApi.event}get cols(){return this._bufferService.cols}get rows(){return this._bufferService.rows}get buffers(){return this._bufferService.buffers}get options(){return this.optionsService.options}set options(e){for(const t in e)this.optionsService.options[t]=e[t]}constructor(e){super(),this._windowsWrappingHeuristics=this.register(new s.MutableDisposable),this._onBinary=this.register(new l.EventEmitter),this.onBinary=this._onBinary.event,this._onData=this.register(new l.EventEmitter),this.onData=this._onData.event,this._onLineFeed=this.register(new l.EventEmitter),this.onLineFeed=this._onLineFeed.event,this._onResize=this.register(new l.EventEmitter),this.onResize=this._onResize.event,this._onWriteParsed=this.register(new l.EventEmitter),this.onWriteParsed=this._onWriteParsed.event,this._onScroll=this.register(new l.EventEmitter),this._instantiationService=new n.InstantiationService,this.optionsService=this.register(new h.OptionsService(e)),this._instantiationService.setService(r.IOptionsService,this.optionsService),this._bufferService=this.register(this._instantiationService.createInstance(a.BufferService)),this._instantiationService.setService(r.IBufferService,this._bufferService),this._logService=this.register(this._instantiationService.createInstance(o.LogService)),this._instantiationService.setService(r.ILogService,this._logService),this.coreService=this.register(this._instantiationService.createInstance(c.CoreService)),this._instantiationService.setService(r.ICoreService,this.coreService),this.coreMouseService=this.register(this._instantiationService.createInstance(d.CoreMouseService)),this._instantiationService.setService(r.ICoreMouseService,this.coreMouseService),this.unicodeService=this.register(this._instantiationService.createInstance(_.UnicodeService)),this._instantiationService.setService(r.IUnicodeService,this.unicodeService),this._charsetService=this._instantiationService.createInstance(u.CharsetService),this._instantiationService.setService(r.ICharsetService,this._charsetService),this._oscLinkService=this._instantiationService.createInstance(g.OscLinkService),this._instantiationService.setService(r.IOscLinkService,this._oscLinkService),this._inputHandler=this.register(new v.InputHandler(this._bufferService,this._charsetService,this.coreService,this._logService,this.optionsService,this._oscLinkService,this.coreMouseService,this.unicodeService)),this.register((0,l.forwardEvent)(this._inputHandler.onLineFeed,this._onLineFeed)),this.register(this._inputHandler),this.register((0,l.forwardEvent)(this._bufferService.onResize,this._onResize)),this.register((0,l.forwardEvent)(this.coreService.onData,this._onData)),this.register((0,l.forwardEvent)(this.coreService.onBinary,this._onBinary)),this.register(this.coreService.onRequestScrollToBottom((()=>this.scrollToBottom()))),this.register(this.coreService.onUserInput((()=>this._writeBuffer.handleUserInput()))),this.register(this.optionsService.onMultipleOptionChange(["windowsMode","windowsPty"],(()=>this._handleWindowsPtyOptionChange()))),this.register(this._bufferService.onScroll((e=>{this._onScroll.fire({position:this._bufferService.buffer.ydisp,source:0}),this._inputHandler.markRangeDirty(this._bufferService.buffer.scrollTop,this._bufferService.buffer.scrollBottom)}))),this.register(this._inputHandler.onScroll((e=>{this._onScroll.fire({position:this._bufferService.buffer.ydisp,source:0}),this._inputHandler.markRangeDirty(this._bufferService.buffer.scrollTop,this._bufferService.buffer.scrollBottom)}))),this._writeBuffer=this.register(new p.WriteBuffer(((e,t)=>this._inputHandler.parse(e,t)))),this.register((0,l.forwardEvent)(this._writeBuffer.onWriteParsed,this._onWriteParsed))}write(e,t){this._writeBuffer.write(e,t)}writeSync(e,t){this._logService.logLevel<=r.LogLevelEnum.WARN&&!m&&(this._logService.warn("writeSync is unreliable and will be removed soon."),m=!0),this._writeBuffer.writeSync(e,t)}input(e,t=!0){this.coreService.triggerDataEvent(e,t)}resize(e,t){isNaN(e)||isNaN(t)||(e=Math.max(e,a.MINIMUM_COLS),t=Math.max(t,a.MINIMUM_ROWS),this._bufferService.resize(e,t))}scroll(e,t=!1){this._bufferService.scroll(e,t)}scrollLines(e,t,i){this._bufferService.scrollLines(e,t,i)}scrollPages(e){this.scrollLines(e*(this.rows-1))}scrollToTop(){this.scrollLines(-this._bufferService.buffer.ydisp)}scrollToBottom(){this.scrollLines(this._bufferService.buffer.ybase-this._bufferService.buffer.ydisp)}scrollToLine(e){const t=e-this._bufferService.buffer.ydisp;0!==t&&this.scrollLines(t)}registerEscHandler(e,t){return this._inputHandler.registerEscHandler(e,t)}registerDcsHandler(e,t){return this._inputHandler.registerDcsHandler(e,t)}registerCsiHandler(e,t){return this._inputHandler.registerCsiHandler(e,t)}registerOscHandler(e,t){return this._inputHandler.registerOscHandler(e,t)}_setup(){this._handleWindowsPtyOptionChange()}reset(){this._inputHandler.reset(),this._bufferService.reset(),this._charsetService.reset(),this.coreService.reset(),this.coreMouseService.reset()}_handleWindowsPtyOptionChange(){let e=!1;const t=this.optionsService.rawOptions.windowsPty;t&&void 0!==t.buildNumber&&void 0!==t.buildNumber?e=!!("conpty"===t.backend&&t.buildNumber<21376):this.optionsService.rawOptions.windowsMode&&(e=!0),e?this._enableWindowsWrappingHeuristics():this._windowsWrappingHeuristics.clear()}_enableWindowsWrappingHeuristics(){if(!this._windowsWrappingHeuristics.value){const e=[];e.push(this.onLineFeed(f.updateWindowsModeWrappedState.bind(null,this._bufferService))),e.push(this.registerCsiHandler({final:"H"},(()=>((0,f.updateWindowsModeWrappedState)(this._bufferService),!1)))),this._windowsWrappingHeuristics.value=(0,s.toDisposable)((()=>{for(const t of e)t.dispose()}))}}}t.CoreTerminal=S},8460:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.runAndSubscribe=t.forwardEvent=t.EventEmitter=void 0,t.EventEmitter=class{constructor(){this._listeners=[],this._disposed=!1}get event(){return this._event||(this._event=e=>(this._listeners.push(e),{dispose:()=>{if(!this._disposed)for(let t=0;t<this._listeners.length;t++)if(this._listeners[t]===e)return void this._listeners.splice(t,1)}})),this._event}fire(e,t){const i=[];for(let e=0;e<this._listeners.length;e++)i.push(this._listeners[e]);for(let s=0;s<i.length;s++)i[s].call(void 0,e,t)}dispose(){this.clearListeners(),this._disposed=!0}clearListeners(){this._listeners&&(this._listeners.length=0)}},t.forwardEvent=function(e,t){return e((e=>t.fire(e)))},t.runAndSubscribe=function(e,t){return t(void 0),e((e=>t(e)))}},5435:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.InputHandler=t.WindowsOptionsReportType=void 0;const n=i(2584),o=i(7116),a=i(2015),h=i(844),c=i(482),l=i(8437),d=i(8460),_=i(643),u=i(511),f=i(3734),v=i(2585),p=i(1480),g=i(6242),m=i(6351),S=i(5941),C={"(":0,")":1,"*":2,"+":3,"-":1,".":2},b=131072;function w(e,t){if(e>24)return t.setWinLines||!1;switch(e){case 1:return!!t.restoreWin;case 2:return!!t.minimizeWin;case 3:return!!t.setWinPosition;case 4:return!!t.setWinSizePixels;case 5:return!!t.raiseWin;case 6:return!!t.lowerWin;case 7:return!!t.refreshWin;case 8:return!!t.setWinSizeChars;case 9:return!!t.maximizeWin;case 10:return!!t.fullscreenWin;case 11:return!!t.getWinState;case 13:return!!t.getWinPosition;case 14:return!!t.getWinSizePixels;case 15:return!!t.getScreenSizePixels;case 16:return!!t.getCellSizePixels;case 18:return!!t.getWinSizeChars;case 19:return!!t.getScreenSizeChars;case 20:return!!t.getIconTitle;case 21:return!!t.getWinTitle;case 22:return!!t.pushTitle;case 23:return!!t.popTitle;case 24:return!!t.setWinLines}return!1}var y;!function(e){e[e.GET_WIN_SIZE_PIXELS=0]="GET_WIN_SIZE_PIXELS",e[e.GET_CELL_SIZE_PIXELS=1]="GET_CELL_SIZE_PIXELS"}(y||(t.WindowsOptionsReportType=y={}));let E=0;class k extends h.Disposable{getAttrData(){return this._curAttrData}constructor(e,t,i,s,r,h,_,f,v=new a.EscapeSequenceParser){super(),this._bufferService=e,this._charsetService=t,this._coreService=i,this._logService=s,this._optionsService=r,this._oscLinkService=h,this._coreMouseService=_,this._unicodeService=f,this._parser=v,this._parseBuffer=new Uint32Array(4096),this._stringDecoder=new c.StringToUtf32,this._utf8Decoder=new c.Utf8ToUtf32,this._workCell=new u.CellData,this._windowTitle="",this._iconName="",this._windowTitleStack=[],this._iconNameStack=[],this._curAttrData=l.DEFAULT_ATTR_DATA.clone(),this._eraseAttrDataInternal=l.DEFAULT_ATTR_DATA.clone(),this._onRequestBell=this.register(new d.EventEmitter),this.onRequestBell=this._onRequestBell.event,this._onRequestRefreshRows=this.register(new d.EventEmitter),this.onRequestRefreshRows=this._onRequestRefreshRows.event,this._onRequestReset=this.register(new d.EventEmitter),this.onRequestReset=this._onRequestReset.event,this._onRequestSendFocus=this.register(new d.EventEmitter),this.onRequestSendFocus=this._onRequestSendFocus.event,this._onRequestSyncScrollBar=this.register(new d.EventEmitter),this.onRequestSyncScrollBar=this._onRequestSyncScrollBar.event,this._onRequestWindowsOptionsReport=this.register(new d.EventEmitter),this.onRequestWindowsOptionsReport=this._onRequestWindowsOptionsReport.event,this._onA11yChar=this.register(new d.EventEmitter),this.onA11yChar=this._onA11yChar.event,this._onA11yTab=this.register(new d.EventEmitter),this.onA11yTab=this._onA11yTab.event,this._onCursorMove=this.register(new d.EventEmitter),this.onCursorMove=this._onCursorMove.event,this._onLineFeed=this.register(new d.EventEmitter),this.onLineFeed=this._onLineFeed.event,this._onScroll=this.register(new d.EventEmitter),this.onScroll=this._onScroll.event,this._onTitleChange=this.register(new d.EventEmitter),this.onTitleChange=this._onTitleChange.event,this._onColor=this.register(new d.EventEmitter),this.onColor=this._onColor.event,this._parseStack={paused:!1,cursorStartX:0,cursorStartY:0,decodedLength:0,position:0},this._specialColors=[256,257,258],this.register(this._parser),this._dirtyRowTracker=new L(this._bufferService),this._activeBuffer=this._bufferService.buffer,this.register(this._bufferService.buffers.onBufferActivate((e=>this._activeBuffer=e.activeBuffer))),this._parser.setCsiHandlerFallback(((e,t)=>{this._logService.debug("Unknown CSI code: ",{identifier:this._parser.identToString(e),params:t.toArray()})})),this._parser.setEscHandlerFallback((e=>{this._logService.debug("Unknown ESC code: ",{identifier:this._parser.identToString(e)})})),this._parser.setExecuteHandlerFallback((e=>{this._logService.debug("Unknown EXECUTE code: ",{code:e})})),this._parser.setOscHandlerFallback(((e,t,i)=>{this._logService.debug("Unknown OSC code: ",{identifier:e,action:t,data:i})})),this._parser.setDcsHandlerFallback(((e,t,i)=>{"HOOK"===t&&(i=i.toArray()),this._logService.debug("Unknown DCS code: ",{identifier:this._parser.identToString(e),action:t,payload:i})})),this._parser.setPrintHandler(((e,t,i)=>this.print(e,t,i))),this._parser.registerCsiHandler({final:"@"},(e=>this.insertChars(e))),this._parser.registerCsiHandler({intermediates:" ",final:"@"},(e=>this.scrollLeft(e))),this._parser.registerCsiHandler({final:"A"},(e=>this.cursorUp(e))),this._parser.registerCsiHandler({intermediates:" ",final:"A"},(e=>this.scrollRight(e))),this._parser.registerCsiHandler({final:"B"},(e=>this.cursorDown(e))),this._parser.registerCsiHandler({final:"C"},(e=>this.cursorForward(e))),this._parser.registerCsiHandler({final:"D"},(e=>this.cursorBackward(e))),this._parser.registerCsiHandler({final:"E"},(e=>this.cursorNextLine(e))),this._parser.registerCsiHandler({final:"F"},(e=>this.cursorPrecedingLine(e))),this._parser.registerCsiHandler({final:"G"},(e=>this.cursorCharAbsolute(e))),this._parser.registerCsiHandler({final:"H"},(e=>this.cursorPosition(e))),this._parser.registerCsiHandler({final:"I"},(e=>this.cursorForwardTab(e))),this._parser.registerCsiHandler({final:"J"},(e=>this.eraseInDisplay(e,!1))),this._parser.registerCsiHandler({prefix:"?",final:"J"},(e=>this.eraseInDisplay(e,!0))),this._parser.registerCsiHandler({final:"K"},(e=>this.eraseInLine(e,!1))),this._parser.registerCsiHandler({prefix:"?",final:"K"},(e=>this.eraseInLine(e,!0))),this._parser.registerCsiHandler({final:"L"},(e=>this.insertLines(e))),this._parser.registerCsiHandler({final:"M"},(e=>this.deleteLines(e))),this._parser.registerCsiHandler({final:"P"},(e=>this.deleteChars(e))),this._parser.registerCsiHandler({final:"S"},(e=>this.scrollUp(e))),this._parser.registerCsiHandler({final:"T"},(e=>this.scrollDown(e))),this._parser.registerCsiHandler({final:"X"},(e=>this.eraseChars(e))),this._parser.registerCsiHandler({final:"Z"},(e=>this.cursorBackwardTab(e))),this._parser.registerCsiHandler({final:"`"},(e=>this.charPosAbsolute(e))),this._parser.registerCsiHandler({final:"a"},(e=>this.hPositionRelative(e))),this._parser.registerCsiHandler({final:"b"},(e=>this.repeatPrecedingCharacter(e))),this._parser.registerCsiHandler({final:"c"},(e=>this.sendDeviceAttributesPrimary(e))),this._parser.registerCsiHandler({prefix:">",final:"c"},(e=>this.sendDeviceAttributesSecondary(e))),this._parser.registerCsiHandler({final:"d"},(e=>this.linePosAbsolute(e))),this._parser.registerCsiHandler({final:"e"},(e=>this.vPositionRelative(e))),this._parser.registerCsiHandler({final:"f"},(e=>this.hVPosition(e))),this._parser.registerCsiHandler({final:"g"},(e=>this.tabClear(e))),this._parser.registerCsiHandler({final:"h"},(e=>this.setMode(e))),this._parser.registerCsiHandler({prefix:"?",final:"h"},(e=>this.setModePrivate(e))),this._parser.registerCsiHandler({final:"l"},(e=>this.resetMode(e))),this._parser.registerCsiHandler({prefix:"?",final:"l"},(e=>this.resetModePrivate(e))),this._parser.registerCsiHandler({final:"m"},(e=>this.charAttributes(e))),this._parser.registerCsiHandler({final:"n"},(e=>this.deviceStatus(e))),this._parser.registerCsiHandler({prefix:"?",final:"n"},(e=>this.deviceStatusPrivate(e))),this._parser.registerCsiHandler({intermediates:"!",final:"p"},(e=>this.softReset(e))),this._parser.registerCsiHandler({intermediates:" ",final:"q"},(e=>this.setCursorStyle(e))),this._parser.registerCsiHandler({final:"r"},(e=>this.setScrollRegion(e))),this._parser.registerCsiHandler({final:"s"},(e=>this.saveCursor(e))),this._parser.registerCsiHandler({final:"t"},(e=>this.windowOptions(e))),this._parser.registerCsiHandler({final:"u"},(e=>this.restoreCursor(e))),this._parser.registerCsiHandler({intermediates:"'",final:"}"},(e=>this.insertColumns(e))),this._parser.registerCsiHandler({intermediates:"'",final:"~"},(e=>this.deleteColumns(e))),this._parser.registerCsiHandler({intermediates:'"',final:"q"},(e=>this.selectProtected(e))),this._parser.registerCsiHandler({intermediates:"$",final:"p"},(e=>this.requestMode(e,!0))),this._parser.registerCsiHandler({prefix:"?",intermediates:"$",final:"p"},(e=>this.requestMode(e,!1))),this._parser.setExecuteHandler(n.C0.BEL,(()=>this.bell())),this._parser.setExecuteHandler(n.C0.LF,(()=>this.lineFeed())),this._parser.setExecuteHandler(n.C0.VT,(()=>this.lineFeed())),this._parser.setExecuteHandler(n.C0.FF,(()=>this.lineFeed())),this._parser.setExecuteHandler(n.C0.CR,(()=>this.carriageReturn())),this._parser.setExecuteHandler(n.C0.BS,(()=>this.backspace())),this._parser.setExecuteHandler(n.C0.HT,(()=>this.tab())),this._parser.setExecuteHandler(n.C0.SO,(()=>this.shiftOut())),this._parser.setExecuteHandler(n.C0.SI,(()=>this.shiftIn())),this._parser.setExecuteHandler(n.C1.IND,(()=>this.index())),this._parser.setExecuteHandler(n.C1.NEL,(()=>this.nextLine())),this._parser.setExecuteHandler(n.C1.HTS,(()=>this.tabSet())),this._parser.registerOscHandler(0,new g.OscHandler((e=>(this.setTitle(e),this.setIconName(e),!0)))),this._parser.registerOscHandler(1,new g.OscHandler((e=>this.setIconName(e)))),this._parser.registerOscHandler(2,new g.OscHandler((e=>this.setTitle(e)))),this._parser.registerOscHandler(4,new g.OscHandler((e=>this.setOrReportIndexedColor(e)))),this._parser.registerOscHandler(8,new g.OscHandler((e=>this.setHyperlink(e)))),this._parser.registerOscHandler(10,new g.OscHandler((e=>this.setOrReportFgColor(e)))),this._parser.registerOscHandler(11,new g.OscHandler((e=>this.setOrReportBgColor(e)))),this._parser.registerOscHandler(12,new g.OscHandler((e=>this.setOrReportCursorColor(e)))),this._parser.registerOscHandler(104,new g.OscHandler((e=>this.restoreIndexedColor(e)))),this._parser.registerOscHandler(110,new g.OscHandler((e=>this.restoreFgColor(e)))),this._parser.registerOscHandler(111,new g.OscHandler((e=>this.restoreBgColor(e)))),this._parser.registerOscHandler(112,new g.OscHandler((e=>this.restoreCursorColor(e)))),this._parser.registerEscHandler({final:"7"},(()=>this.saveCursor())),this._parser.registerEscHandler({final:"8"},(()=>this.restoreCursor())),this._parser.registerEscHandler({final:"D"},(()=>this.index())),this._parser.registerEscHandler({final:"E"},(()=>this.nextLine())),this._parser.registerEscHandler({final:"H"},(()=>this.tabSet())),this._parser.registerEscHandler({final:"M"},(()=>this.reverseIndex())),this._parser.registerEscHandler({final:"="},(()=>this.keypadApplicationMode())),this._parser.registerEscHandler({final:">"},(()=>this.keypadNumericMode())),this._parser.registerEscHandler({final:"c"},(()=>this.fullReset())),this._parser.registerEscHandler({final:"n"},(()=>this.setgLevel(2))),this._parser.registerEscHandler({final:"o"},(()=>this.setgLevel(3))),this._parser.registerEscHandler({final:"|"},(()=>this.setgLevel(3))),this._parser.registerEscHandler({final:"}"},(()=>this.setgLevel(2))),this._parser.registerEscHandler({final:"~"},(()=>this.setgLevel(1))),this._parser.registerEscHandler({intermediates:"%",final:"@"},(()=>this.selectDefaultCharset())),this._parser.registerEscHandler({intermediates:"%",final:"G"},(()=>this.selectDefaultCharset()));for(const e in o.CHARSETS)this._parser.registerEscHandler({intermediates:"(",final:e},(()=>this.selectCharset("("+e))),this._parser.registerEscHandler({intermediates:")",final:e},(()=>this.selectCharset(")"+e))),this._parser.registerEscHandler({intermediates:"*",final:e},(()=>this.selectCharset("*"+e))),this._parser.registerEscHandler({intermediates:"+",final:e},(()=>this.selectCharset("+"+e))),this._parser.registerEscHandler({intermediates:"-",final:e},(()=>this.selectCharset("-"+e))),this._parser.registerEscHandler({intermediates:".",final:e},(()=>this.selectCharset("."+e))),this._parser.registerEscHandler({intermediates:"/",final:e},(()=>this.selectCharset("/"+e)));this._parser.registerEscHandler({intermediates:"#",final:"8"},(()=>this.screenAlignmentPattern())),this._parser.setErrorHandler((e=>(this._logService.error("Parsing error: ",e),e))),this._parser.registerDcsHandler({intermediates:"$",final:"q"},new m.DcsHandler(((e,t)=>this.requestStatusString(e,t))))}_preserveStack(e,t,i,s){this._parseStack.paused=!0,this._parseStack.cursorStartX=e,this._parseStack.cursorStartY=t,this._parseStack.decodedLength=i,this._parseStack.position=s}_logSlowResolvingAsync(e){this._logService.logLevel<=v.LogLevelEnum.WARN&&Promise.race([e,new Promise(((e,t)=>setTimeout((()=>t("#SLOW_TIMEOUT")),5e3)))]).catch((e=>{if("#SLOW_TIMEOUT"!==e)throw e;console.warn("async parser handler taking longer than 5000 ms")}))}_getCurrentLinkId(){return this._curAttrData.extended.urlId}parse(e,t){let i,s=this._activeBuffer.x,r=this._activeBuffer.y,n=0;const o=this._parseStack.paused;if(o){if(i=this._parser.parse(this._parseBuffer,this._parseStack.decodedLength,t))return this._logSlowResolvingAsync(i),i;s=this._parseStack.cursorStartX,r=this._parseStack.cursorStartY,this._parseStack.paused=!1,e.length>b&&(n=this._parseStack.position+b)}if(this._logService.logLevel<=v.LogLevelEnum.DEBUG&&this._logService.debug("parsing data"+("string"==typeof e?` "${e}"`:` "${Array.prototype.map.call(e,(e=>String.fromCharCode(e))).join("")}"`),"string"==typeof e?e.split("").map((e=>e.charCodeAt(0))):e),this._parseBuffer.length<e.length&&this._parseBuffer.length<b&&(this._parseBuffer=new Uint32Array(Math.min(e.length,b))),o||this._dirtyRowTracker.clearRange(),e.length>b)for(let t=n;t<e.length;t+=b){const n=t+b<e.length?t+b:e.length,o="string"==typeof e?this._stringDecoder.decode(e.substring(t,n),this._parseBuffer):this._utf8Decoder.decode(e.subarray(t,n),this._parseBuffer);if(i=this._parser.parse(this._parseBuffer,o))return this._preserveStack(s,r,o,t),this._logSlowResolvingAsync(i),i}else if(!o){const t="string"==typeof e?this._stringDecoder.decode(e,this._parseBuffer):this._utf8Decoder.decode(e,this._parseBuffer);if(i=this._parser.parse(this._parseBuffer,t))return this._preserveStack(s,r,t,0),this._logSlowResolvingAsync(i),i}this._activeBuffer.x===s&&this._activeBuffer.y===r||this._onCursorMove.fire();const a=this._dirtyRowTracker.end+(this._bufferService.buffer.ybase-this._bufferService.buffer.ydisp),h=this._dirtyRowTracker.start+(this._bufferService.buffer.ybase-this._bufferService.buffer.ydisp);h<this._bufferService.rows&&this._onRequestRefreshRows.fire(Math.min(h,this._bufferService.rows-1),Math.min(a,this._bufferService.rows-1))}print(e,t,i){let s,r;const n=this._charsetService.charset,o=this._optionsService.rawOptions.screenReaderMode,a=this._bufferService.cols,h=this._coreService.decPrivateModes.wraparound,d=this._coreService.modes.insertMode,u=this._curAttrData;let f=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y);this._dirtyRowTracker.markDirty(this._activeBuffer.y),this._activeBuffer.x&&i-t>0&&2===f.getWidth(this._activeBuffer.x-1)&&f.setCellFromCodepoint(this._activeBuffer.x-1,0,1,u);let v=this._parser.precedingJoinState;for(let g=t;g<i;++g){if(s=e[g],s<127&&n){const e=n[String.fromCharCode(s)];e&&(s=e.charCodeAt(0))}const t=this._unicodeService.charProperties(s,v);r=p.UnicodeService.extractWidth(t);const i=p.UnicodeService.extractShouldJoin(t),m=i?p.UnicodeService.extractWidth(v):0;if(v=t,o&&this._onA11yChar.fire((0,c.stringFromCodePoint)(s)),this._getCurrentLinkId()&&this._oscLinkService.addLineToLink(this._getCurrentLinkId(),this._activeBuffer.ybase+this._activeBuffer.y),this._activeBuffer.x+r-m>a)if(h){const e=f;let t=this._activeBuffer.x-m;for(this._activeBuffer.x=m,this._activeBuffer.y++,this._activeBuffer.y===this._activeBuffer.scrollBottom+1?(this._activeBuffer.y--,this._bufferService.scroll(this._eraseAttrData(),!0)):(this._activeBuffer.y>=this._bufferService.rows&&(this._activeBuffer.y=this._bufferService.rows-1),this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y).isWrapped=!0),f=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y),m>0&&f instanceof l.BufferLine&&f.copyCellsFrom(e,t,0,m,!1);t<a;)e.setCellFromCodepoint(t++,0,1,u)}else if(this._activeBuffer.x=a-1,2===r)continue;if(i&&this._activeBuffer.x){const e=f.getWidth(this._activeBuffer.x-1)?1:2;f.addCodepointToCell(this._activeBuffer.x-e,s,r);for(let e=r-m;--e>=0;)f.setCellFromCodepoint(this._activeBuffer.x++,0,0,u)}else if(d&&(f.insertCells(this._activeBuffer.x,r-m,this._activeBuffer.getNullCell(u)),2===f.getWidth(a-1)&&f.setCellFromCodepoint(a-1,_.NULL_CELL_CODE,_.NULL_CELL_WIDTH,u)),f.setCellFromCodepoint(this._activeBuffer.x++,s,r,u),r>0)for(;--r;)f.setCellFromCodepoint(this._activeBuffer.x++,0,0,u)}this._parser.precedingJoinState=v,this._activeBuffer.x<a&&i-t>0&&0===f.getWidth(this._activeBuffer.x)&&!f.hasContent(this._activeBuffer.x)&&f.setCellFromCodepoint(this._activeBuffer.x,0,1,u),this._dirtyRowTracker.markDirty(this._activeBuffer.y)}registerCsiHandler(e,t){return"t"!==e.final||e.prefix||e.intermediates?this._parser.registerCsiHandler(e,t):this._parser.registerCsiHandler(e,(e=>!w(e.params[0],this._optionsService.rawOptions.windowOptions)||t(e)))}registerDcsHandler(e,t){return this._parser.registerDcsHandler(e,new m.DcsHandler(t))}registerEscHandler(e,t){return this._parser.registerEscHandler(e,t)}registerOscHandler(e,t){return this._parser.registerOscHandler(e,new g.OscHandler(t))}bell(){return this._onRequestBell.fire(),!0}lineFeed(){return this._dirtyRowTracker.markDirty(this._activeBuffer.y),this._optionsService.rawOptions.convertEol&&(this._activeBuffer.x=0),this._activeBuffer.y++,this._activeBuffer.y===this._activeBuffer.scrollBottom+1?(this._activeBuffer.y--,this._bufferService.scroll(this._eraseAttrData())):this._activeBuffer.y>=this._bufferService.rows?this._activeBuffer.y=this._bufferService.rows-1:this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y).isWrapped=!1,this._activeBuffer.x>=this._bufferService.cols&&this._activeBuffer.x--,this._dirtyRowTracker.markDirty(this._activeBuffer.y),this._onLineFeed.fire(),!0}carriageReturn(){return this._activeBuffer.x=0,!0}backspace(){if(!this._coreService.decPrivateModes.reverseWraparound)return this._restrictCursor(),this._activeBuffer.x>0&&this._activeBuffer.x--,!0;if(this._restrictCursor(this._bufferService.cols),this._activeBuffer.x>0)this._activeBuffer.x--;else if(0===this._activeBuffer.x&&this._activeBuffer.y>this._activeBuffer.scrollTop&&this._activeBuffer.y<=this._activeBuffer.scrollBottom&&this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y)?.isWrapped){this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y).isWrapped=!1,this._activeBuffer.y--,this._activeBuffer.x=this._bufferService.cols-1;const e=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y);e.hasWidth(this._activeBuffer.x)&&!e.hasContent(this._activeBuffer.x)&&this._activeBuffer.x--}return this._restrictCursor(),!0}tab(){if(this._activeBuffer.x>=this._bufferService.cols)return!0;const e=this._activeBuffer.x;return this._activeBuffer.x=this._activeBuffer.nextStop(),this._optionsService.rawOptions.screenReaderMode&&this._onA11yTab.fire(this._activeBuffer.x-e),!0}shiftOut(){return this._charsetService.setgLevel(1),!0}shiftIn(){return this._charsetService.setgLevel(0),!0}_restrictCursor(e=this._bufferService.cols-1){this._activeBuffer.x=Math.min(e,Math.max(0,this._activeBuffer.x)),this._activeBuffer.y=this._coreService.decPrivateModes.origin?Math.min(this._activeBuffer.scrollBottom,Math.max(this._activeBuffer.scrollTop,this._activeBuffer.y)):Math.min(this._bufferService.rows-1,Math.max(0,this._activeBuffer.y)),this._dirtyRowTracker.markDirty(this._activeBuffer.y)}_setCursor(e,t){this._dirtyRowTracker.markDirty(this._activeBuffer.y),this._coreService.decPrivateModes.origin?(this._activeBuffer.x=e,this._activeBuffer.y=this._activeBuffer.scrollTop+t):(this._activeBuffer.x=e,this._activeBuffer.y=t),this._restrictCursor(),this._dirtyRowTracker.markDirty(this._activeBuffer.y)}_moveCursor(e,t){this._restrictCursor(),this._setCursor(this._activeBuffer.x+e,this._activeBuffer.y+t)}cursorUp(e){const t=this._activeBuffer.y-this._activeBuffer.scrollTop;return t>=0?this._moveCursor(0,-Math.min(t,e.params[0]||1)):this._moveCursor(0,-(e.params[0]||1)),!0}cursorDown(e){const t=this._activeBuffer.scrollBottom-this._activeBuffer.y;return t>=0?this._moveCursor(0,Math.min(t,e.params[0]||1)):this._moveCursor(0,e.params[0]||1),!0}cursorForward(e){return this._moveCursor(e.params[0]||1,0),!0}cursorBackward(e){return this._moveCursor(-(e.params[0]||1),0),!0}cursorNextLine(e){return this.cursorDown(e),this._activeBuffer.x=0,!0}cursorPrecedingLine(e){return this.cursorUp(e),this._activeBuffer.x=0,!0}cursorCharAbsolute(e){return this._setCursor((e.params[0]||1)-1,this._activeBuffer.y),!0}cursorPosition(e){return this._setCursor(e.length>=2?(e.params[1]||1)-1:0,(e.params[0]||1)-1),!0}charPosAbsolute(e){return this._setCursor((e.params[0]||1)-1,this._activeBuffer.y),!0}hPositionRelative(e){return this._moveCursor(e.params[0]||1,0),!0}linePosAbsolute(e){return this._setCursor(this._activeBuffer.x,(e.params[0]||1)-1),!0}vPositionRelative(e){return this._moveCursor(0,e.params[0]||1),!0}hVPosition(e){return this.cursorPosition(e),!0}tabClear(e){const t=e.params[0];return 0===t?delete this._activeBuffer.tabs[this._activeBuffer.x]:3===t&&(this._activeBuffer.tabs={}),!0}cursorForwardTab(e){if(this._activeBuffer.x>=this._bufferService.cols)return!0;let t=e.params[0]||1;for(;t--;)this._activeBuffer.x=this._activeBuffer.nextStop();return!0}cursorBackwardTab(e){if(this._activeBuffer.x>=this._bufferService.cols)return!0;let t=e.params[0]||1;for(;t--;)this._activeBuffer.x=this._activeBuffer.prevStop();return!0}selectProtected(e){const t=e.params[0];return 1===t&&(this._curAttrData.bg|=536870912),2!==t&&0!==t||(this._curAttrData.bg&=-536870913),!0}_eraseInBufferLine(e,t,i,s=!1,r=!1){const n=this._activeBuffer.lines.get(this._activeBuffer.ybase+e);n.replaceCells(t,i,this._activeBuffer.getNullCell(this._eraseAttrData()),r),s&&(n.isWrapped=!1)}_resetBufferLine(e,t=!1){const i=this._activeBuffer.lines.get(this._activeBuffer.ybase+e);i&&(i.fill(this._activeBuffer.getNullCell(this._eraseAttrData()),t),this._bufferService.buffer.clearMarkers(this._activeBuffer.ybase+e),i.isWrapped=!1)}eraseInDisplay(e,t=!1){let i;switch(this._restrictCursor(this._bufferService.cols),e.params[0]){case 0:for(i=this._activeBuffer.y,this._dirtyRowTracker.markDirty(i),this._eraseInBufferLine(i++,this._activeBuffer.x,this._bufferService.cols,0===this._activeBuffer.x,t);i<this._bufferService.rows;i++)this._resetBufferLine(i,t);this._dirtyRowTracker.markDirty(i);break;case 1:for(i=this._activeBuffer.y,this._dirtyRowTracker.markDirty(i),this._eraseInBufferLine(i,0,this._activeBuffer.x+1,!0,t),this._activeBuffer.x+1>=this._bufferService.cols&&(this._activeBuffer.lines.get(i+1).isWrapped=!1);i--;)this._resetBufferLine(i,t);this._dirtyRowTracker.markDirty(0);break;case 2:for(i=this._bufferService.rows,this._dirtyRowTracker.markDirty(i-1);i--;)this._resetBufferLine(i,t);this._dirtyRowTracker.markDirty(0);break;case 3:const e=this._activeBuffer.lines.length-this._bufferService.rows;e>0&&(this._activeBuffer.lines.trimStart(e),this._activeBuffer.ybase=Math.max(this._activeBuffer.ybase-e,0),this._activeBuffer.ydisp=Math.max(this._activeBuffer.ydisp-e,0),this._onScroll.fire(0))}return!0}eraseInLine(e,t=!1){switch(this._restrictCursor(this._bufferService.cols),e.params[0]){case 0:this._eraseInBufferLine(this._activeBuffer.y,this._activeBuffer.x,this._bufferService.cols,0===this._activeBuffer.x,t);break;case 1:this._eraseInBufferLine(this._activeBuffer.y,0,this._activeBuffer.x+1,!1,t);break;case 2:this._eraseInBufferLine(this._activeBuffer.y,0,this._bufferService.cols,!0,t)}return this._dirtyRowTracker.markDirty(this._activeBuffer.y),!0}insertLines(e){this._restrictCursor();let t=e.params[0]||1;if(this._activeBuffer.y>this._activeBuffer.scrollBottom||this._activeBuffer.y<this._activeBuffer.scrollTop)return!0;const i=this._activeBuffer.ybase+this._activeBuffer.y,s=this._bufferService.rows-1-this._activeBuffer.scrollBottom,r=this._bufferService.rows-1+this._activeBuffer.ybase-s+1;for(;t--;)this._activeBuffer.lines.splice(r-1,1),this._activeBuffer.lines.splice(i,0,this._activeBuffer.getBlankLine(this._eraseAttrData()));return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.y,this._activeBuffer.scrollBottom),this._activeBuffer.x=0,!0}deleteLines(e){this._restrictCursor();let t=e.params[0]||1;if(this._activeBuffer.y>this._activeBuffer.scrollBottom||this._activeBuffer.y<this._activeBuffer.scrollTop)return!0;const i=this._activeBuffer.ybase+this._activeBuffer.y;let s;for(s=this._bufferService.rows-1-this._activeBuffer.scrollBottom,s=this._bufferService.rows-1+this._activeBuffer.ybase-s;t--;)this._activeBuffer.lines.splice(i,1),this._activeBuffer.lines.splice(s,0,this._activeBuffer.getBlankLine(this._eraseAttrData()));return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.y,this._activeBuffer.scrollBottom),this._activeBuffer.x=0,!0}insertChars(e){this._restrictCursor();const t=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y);return t&&(t.insertCells(this._activeBuffer.x,e.params[0]||1,this._activeBuffer.getNullCell(this._eraseAttrData())),this._dirtyRowTracker.markDirty(this._activeBuffer.y)),!0}deleteChars(e){this._restrictCursor();const t=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y);return t&&(t.deleteCells(this._activeBuffer.x,e.params[0]||1,this._activeBuffer.getNullCell(this._eraseAttrData())),this._dirtyRowTracker.markDirty(this._activeBuffer.y)),!0}scrollUp(e){let t=e.params[0]||1;for(;t--;)this._activeBuffer.lines.splice(this._activeBuffer.ybase+this._activeBuffer.scrollTop,1),this._activeBuffer.lines.splice(this._activeBuffer.ybase+this._activeBuffer.scrollBottom,0,this._activeBuffer.getBlankLine(this._eraseAttrData()));return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom),!0}scrollDown(e){let t=e.params[0]||1;for(;t--;)this._activeBuffer.lines.splice(this._activeBuffer.ybase+this._activeBuffer.scrollBottom,1),this._activeBuffer.lines.splice(this._activeBuffer.ybase+this._activeBuffer.scrollTop,0,this._activeBuffer.getBlankLine(l.DEFAULT_ATTR_DATA));return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom),!0}scrollLeft(e){if(this._activeBuffer.y>this._activeBuffer.scrollBottom||this._activeBuffer.y<this._activeBuffer.scrollTop)return!0;const t=e.params[0]||1;for(let e=this._activeBuffer.scrollTop;e<=this._activeBuffer.scrollBottom;++e){const i=this._activeBuffer.lines.get(this._activeBuffer.ybase+e);i.deleteCells(0,t,this._activeBuffer.getNullCell(this._eraseAttrData())),i.isWrapped=!1}return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom),!0}scrollRight(e){if(this._activeBuffer.y>this._activeBuffer.scrollBottom||this._activeBuffer.y<this._activeBuffer.scrollTop)return!0;const t=e.params[0]||1;for(let e=this._activeBuffer.scrollTop;e<=this._activeBuffer.scrollBottom;++e){const i=this._activeBuffer.lines.get(this._activeBuffer.ybase+e);i.insertCells(0,t,this._activeBuffer.getNullCell(this._eraseAttrData())),i.isWrapped=!1}return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom),!0}insertColumns(e){if(this._activeBuffer.y>this._activeBuffer.scrollBottom||this._activeBuffer.y<this._activeBuffer.scrollTop)return!0;const t=e.params[0]||1;for(let e=this._activeBuffer.scrollTop;e<=this._activeBuffer.scrollBottom;++e){const i=this._activeBuffer.lines.get(this._activeBuffer.ybase+e);i.insertCells(this._activeBuffer.x,t,this._activeBuffer.getNullCell(this._eraseAttrData())),i.isWrapped=!1}return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom),!0}deleteColumns(e){if(this._activeBuffer.y>this._activeBuffer.scrollBottom||this._activeBuffer.y<this._activeBuffer.scrollTop)return!0;const t=e.params[0]||1;for(let e=this._activeBuffer.scrollTop;e<=this._activeBuffer.scrollBottom;++e){const i=this._activeBuffer.lines.get(this._activeBuffer.ybase+e);i.deleteCells(this._activeBuffer.x,t,this._activeBuffer.getNullCell(this._eraseAttrData())),i.isWrapped=!1}return this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom),!0}eraseChars(e){this._restrictCursor();const t=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y);return t&&(t.replaceCells(this._activeBuffer.x,this._activeBuffer.x+(e.params[0]||1),this._activeBuffer.getNullCell(this._eraseAttrData())),this._dirtyRowTracker.markDirty(this._activeBuffer.y)),!0}repeatPrecedingCharacter(e){const t=this._parser.precedingJoinState;if(!t)return!0;const i=e.params[0]||1,s=p.UnicodeService.extractWidth(t),r=this._activeBuffer.x-s,n=this._activeBuffer.lines.get(this._activeBuffer.ybase+this._activeBuffer.y).getString(r),o=new Uint32Array(n.length*i);let a=0;for(let e=0;e<n.length;){const t=n.codePointAt(e)||0;o[a++]=t,e+=t>65535?2:1}let h=a;for(let e=1;e<i;++e)o.copyWithin(h,0,a),h+=a;return this.print(o,0,h),!0}sendDeviceAttributesPrimary(e){return e.params[0]>0||(this._is("xterm")||this._is("rxvt-unicode")||this._is("screen")?this._coreService.triggerDataEvent(n.C0.ESC+"[?1;2c"):this._is("linux")&&this._coreService.triggerDataEvent(n.C0.ESC+"[?6c")),!0}sendDeviceAttributesSecondary(e){return e.params[0]>0||(this._is("xterm")?this._coreService.triggerDataEvent(n.C0.ESC+"[>0;276;0c"):this._is("rxvt-unicode")?this._coreService.triggerDataEvent(n.C0.ESC+"[>85;95;0c"):this._is("linux")?this._coreService.triggerDataEvent(e.params[0]+"c"):this._is("screen")&&this._coreService.triggerDataEvent(n.C0.ESC+"[>83;40003;0c")),!0}_is(e){return 0===(this._optionsService.rawOptions.termName+"").indexOf(e)}setMode(e){for(let t=0;t<e.length;t++)switch(e.params[t]){case 4:this._coreService.modes.insertMode=!0;break;case 20:this._optionsService.options.convertEol=!0}return!0}setModePrivate(e){for(let t=0;t<e.length;t++)switch(e.params[t]){case 1:this._coreService.decPrivateModes.applicationCursorKeys=!0;break;case 2:this._charsetService.setgCharset(0,o.DEFAULT_CHARSET),this._charsetService.setgCharset(1,o.DEFAULT_CHARSET),this._charsetService.setgCharset(2,o.DEFAULT_CHARSET),this._charsetService.setgCharset(3,o.DEFAULT_CHARSET);break;case 3:this._optionsService.rawOptions.windowOptions.setWinLines&&(this._bufferService.resize(132,this._bufferService.rows),this._onRequestReset.fire());break;case 6:this._coreService.decPrivateModes.origin=!0,this._setCursor(0,0);break;case 7:this._coreService.decPrivateModes.wraparound=!0;break;case 12:this._optionsService.options.cursorBlink=!0;break;case 45:this._coreService.decPrivateModes.reverseWraparound=!0;break;case 66:this._logService.debug("Serial port requested application keypad."),this._coreService.decPrivateModes.applicationKeypad=!0,this._onRequestSyncScrollBar.fire();break;case 9:this._coreMouseService.activeProtocol="X10";break;case 1e3:this._coreMouseService.activeProtocol="VT200";break;case 1002:this._coreMouseService.activeProtocol="DRAG";break;case 1003:this._coreMouseService.activeProtocol="ANY";break;case 1004:this._coreService.decPrivateModes.sendFocus=!0,this._onRequestSendFocus.fire();break;case 1005:this._logService.debug("DECSET 1005 not supported (see #2507)");break;case 1006:this._coreMouseService.activeEncoding="SGR";break;case 1015:this._logService.debug("DECSET 1015 not supported (see #2507)");break;case 1016:this._coreMouseService.activeEncoding="SGR_PIXELS";break;case 25:this._coreService.isCursorHidden=!1;break;case 1048:this.saveCursor();break;case 1049:this.saveCursor();case 47:case 1047:this._bufferService.buffers.activateAltBuffer(this._eraseAttrData()),this._coreService.isCursorInitialized=!0,this._onRequestRefreshRows.fire(0,this._bufferService.rows-1),this._onRequestSyncScrollBar.fire();break;case 2004:this._coreService.decPrivateModes.bracketedPasteMode=!0}return!0}resetMode(e){for(let t=0;t<e.length;t++)switch(e.params[t]){case 4:this._coreService.modes.insertMode=!1;break;case 20:this._optionsService.options.convertEol=!1}return!0}resetModePrivate(e){for(let t=0;t<e.length;t++)switch(e.params[t]){case 1:this._coreService.decPrivateModes.applicationCursorKeys=!1;break;case 3:this._optionsService.rawOptions.windowOptions.setWinLines&&(this._bufferService.resize(80,this._bufferService.rows),this._onRequestReset.fire());break;case 6:this._coreService.decPrivateModes.origin=!1,this._setCursor(0,0);break;case 7:this._coreService.decPrivateModes.wraparound=!1;break;case 12:this._optionsService.options.cursorBlink=!1;break;case 45:this._coreService.decPrivateModes.reverseWraparound=!1;break;case 66:this._logService.debug("Switching back to normal keypad."),this._coreService.decPrivateModes.applicationKeypad=!1,this._onRequestSyncScrollBar.fire();break;case 9:case 1e3:case 1002:case 1003:this._coreMouseService.activeProtocol="NONE";break;case 1004:this._coreService.decPrivateModes.sendFocus=!1;break;case 1005:this._logService.debug("DECRST 1005 not supported (see #2507)");break;case 1006:case 1016:this._coreMouseService.activeEncoding="DEFAULT";break;case 1015:this._logService.debug("DECRST 1015 not supported (see #2507)");break;case 25:this._coreService.isCursorHidden=!0;break;case 1048:this.restoreCursor();break;case 1049:case 47:case 1047:this._bufferService.buffers.activateNormalBuffer(),1049===e.params[t]&&this.restoreCursor(),this._coreService.isCursorInitialized=!0,this._onRequestRefreshRows.fire(0,this._bufferService.rows-1),this._onRequestSyncScrollBar.fire();break;case 2004:this._coreService.decPrivateModes.bracketedPasteMode=!1}return!0}requestMode(e,t){const i=this._coreService.decPrivateModes,{activeProtocol:s,activeEncoding:r}=this._coreMouseService,o=this._coreService,{buffers:a,cols:h}=this._bufferService,{active:c,alt:l}=a,d=this._optionsService.rawOptions,_=e=>e?1:2,u=e.params[0];return f=u,v=t?2===u?4:4===u?_(o.modes.insertMode):12===u?3:20===u?_(d.convertEol):0:1===u?_(i.applicationCursorKeys):3===u?d.windowOptions.setWinLines?80===h?2:132===h?1:0:0:6===u?_(i.origin):7===u?_(i.wraparound):8===u?3:9===u?_("X10"===s):12===u?_(d.cursorBlink):25===u?_(!o.isCursorHidden):45===u?_(i.reverseWraparound):66===u?_(i.applicationKeypad):67===u?4:1e3===u?_("VT200"===s):1002===u?_("DRAG"===s):1003===u?_("ANY"===s):1004===u?_(i.sendFocus):1005===u?4:1006===u?_("SGR"===r):1015===u?4:1016===u?_("SGR_PIXELS"===r):1048===u?1:47===u||1047===u||1049===u?_(c===l):2004===u?_(i.bracketedPasteMode):0,o.triggerDataEvent(`${n.C0.ESC}[${t?"":"?"}${f};${v}$y`),!0;var f,v}_updateAttrColor(e,t,i,s,r){return 2===t?(e|=50331648,e&=-16777216,e|=f.AttributeData.fromColorRGB([i,s,r])):5===t&&(e&=-50331904,e|=33554432|255&i),e}_extractColor(e,t,i){const s=[0,0,-1,0,0,0];let r=0,n=0;do{if(s[n+r]=e.params[t+n],e.hasSubParams(t+n)){const i=e.getSubParams(t+n);let o=0;do{5===s[1]&&(r=1),s[n+o+1+r]=i[o]}while(++o<i.length&&o+n+1+r<s.length);break}if(5===s[1]&&n+r>=2||2===s[1]&&n+r>=5)break;s[1]&&(r=1)}while(++n+t<e.length&&n+r<s.length);for(let e=2;e<s.length;++e)-1===s[e]&&(s[e]=0);switch(s[0]){case 38:i.fg=this._updateAttrColor(i.fg,s[1],s[3],s[4],s[5]);break;case 48:i.bg=this._updateAttrColor(i.bg,s[1],s[3],s[4],s[5]);break;case 58:i.extended=i.extended.clone(),i.extended.underlineColor=this._updateAttrColor(i.extended.underlineColor,s[1],s[3],s[4],s[5])}return n}_processUnderline(e,t){t.extended=t.extended.clone(),(!~e||e>5)&&(e=1),t.extended.underlineStyle=e,t.fg|=268435456,0===e&&(t.fg&=-268435457),t.updateExtended()}_processSGR0(e){e.fg=l.DEFAULT_ATTR_DATA.fg,e.bg=l.DEFAULT_ATTR_DATA.bg,e.extended=e.extended.clone(),e.extended.underlineStyle=0,e.extended.underlineColor&=-67108864,e.updateExtended()}charAttributes(e){if(1===e.length&&0===e.params[0])return this._processSGR0(this._curAttrData),!0;const t=e.length;let i;const s=this._curAttrData;for(let r=0;r<t;r++)i=e.params[r],i>=30&&i<=37?(s.fg&=-50331904,s.fg|=16777216|i-30):i>=40&&i<=47?(s.bg&=-50331904,s.bg|=16777216|i-40):i>=90&&i<=97?(s.fg&=-50331904,s.fg|=16777224|i-90):i>=100&&i<=107?(s.bg&=-50331904,s.bg|=16777224|i-100):0===i?this._processSGR0(s):1===i?s.fg|=134217728:3===i?s.bg|=67108864:4===i?(s.fg|=268435456,this._processUnderline(e.hasSubParams(r)?e.getSubParams(r)[0]:1,s)):5===i?s.fg|=536870912:7===i?s.fg|=67108864:8===i?s.fg|=1073741824:9===i?s.fg|=2147483648:2===i?s.bg|=134217728:21===i?this._processUnderline(2,s):22===i?(s.fg&=-134217729,s.bg&=-134217729):23===i?s.bg&=-67108865:24===i?(s.fg&=-268435457,this._processUnderline(0,s)):25===i?s.fg&=-536870913:27===i?s.fg&=-67108865:28===i?s.fg&=-1073741825:29===i?s.fg&=2147483647:39===i?(s.fg&=-67108864,s.fg|=16777215&l.DEFAULT_ATTR_DATA.fg):49===i?(s.bg&=-67108864,s.bg|=16777215&l.DEFAULT_ATTR_DATA.bg):38===i||48===i||58===i?r+=this._extractColor(e,r,s):53===i?s.bg|=1073741824:55===i?s.bg&=-1073741825:59===i?(s.extended=s.extended.clone(),s.extended.underlineColor=-1,s.updateExtended()):100===i?(s.fg&=-67108864,s.fg|=16777215&l.DEFAULT_ATTR_DATA.fg,s.bg&=-67108864,s.bg|=16777215&l.DEFAULT_ATTR_DATA.bg):this._logService.debug("Unknown SGR attribute: %d.",i);return!0}deviceStatus(e){switch(e.params[0]){case 5:this._coreService.triggerDataEvent(`${n.C0.ESC}[0n`);break;case 6:const e=this._activeBuffer.y+1,t=this._activeBuffer.x+1;this._coreService.triggerDataEvent(`${n.C0.ESC}[${e};${t}R`)}return!0}deviceStatusPrivate(e){if(6===e.params[0]){const e=this._activeBuffer.y+1,t=this._activeBuffer.x+1;this._coreService.triggerDataEvent(`${n.C0.ESC}[?${e};${t}R`)}return!0}softReset(e){return this._coreService.isCursorHidden=!1,this._onRequestSyncScrollBar.fire(),this._activeBuffer.scrollTop=0,this._activeBuffer.scrollBottom=this._bufferService.rows-1,this._curAttrData=l.DEFAULT_ATTR_DATA.clone(),this._coreService.reset(),this._charsetService.reset(),this._activeBuffer.savedX=0,this._activeBuffer.savedY=this._activeBuffer.ybase,this._activeBuffer.savedCurAttrData.fg=this._curAttrData.fg,this._activeBuffer.savedCurAttrData.bg=this._curAttrData.bg,this._activeBuffer.savedCharset=this._charsetService.charset,this._coreService.decPrivateModes.origin=!1,!0}setCursorStyle(e){const t=e.params[0]||1;switch(t){case 1:case 2:this._optionsService.options.cursorStyle="block";break;case 3:case 4:this._optionsService.options.cursorStyle="underline";break;case 5:case 6:this._optionsService.options.cursorStyle="bar"}const i=t%2==1;return this._optionsService.options.cursorBlink=i,!0}setScrollRegion(e){const t=e.params[0]||1;let i;return(e.length<2||(i=e.params[1])>this._bufferService.rows||0===i)&&(i=this._bufferService.rows),i>t&&(this._activeBuffer.scrollTop=t-1,this._activeBuffer.scrollBottom=i-1,this._setCursor(0,0)),!0}windowOptions(e){if(!w(e.params[0],this._optionsService.rawOptions.windowOptions))return!0;const t=e.length>1?e.params[1]:0;switch(e.params[0]){case 14:2!==t&&this._onRequestWindowsOptionsReport.fire(y.GET_WIN_SIZE_PIXELS);break;case 16:this._onRequestWindowsOptionsReport.fire(y.GET_CELL_SIZE_PIXELS);break;case 18:this._bufferService&&this._coreService.triggerDataEvent(`${n.C0.ESC}[8;${this._bufferService.rows};${this._bufferService.cols}t`);break;case 22:0!==t&&2!==t||(this._windowTitleStack.push(this._windowTitle),this._windowTitleStack.length>10&&this._windowTitleStack.shift()),0!==t&&1!==t||(this._iconNameStack.push(this._iconName),this._iconNameStack.length>10&&this._iconNameStack.shift());break;case 23:0!==t&&2!==t||this._windowTitleStack.length&&this.setTitle(this._windowTitleStack.pop()),0!==t&&1!==t||this._iconNameStack.length&&this.setIconName(this._iconNameStack.pop())}return!0}saveCursor(e){return this._activeBuffer.savedX=this._activeBuffer.x,this._activeBuffer.savedY=this._activeBuffer.ybase+this._activeBuffer.y,this._activeBuffer.savedCurAttrData.fg=this._curAttrData.fg,this._activeBuffer.savedCurAttrData.bg=this._curAttrData.bg,this._activeBuffer.savedCharset=this._charsetService.charset,!0}restoreCursor(e){return this._activeBuffer.x=this._activeBuffer.savedX||0,this._activeBuffer.y=Math.max(this._activeBuffer.savedY-this._activeBuffer.ybase,0),this._curAttrData.fg=this._activeBuffer.savedCurAttrData.fg,this._curAttrData.bg=this._activeBuffer.savedCurAttrData.bg,this._charsetService.charset=this._savedCharset,this._activeBuffer.savedCharset&&(this._charsetService.charset=this._activeBuffer.savedCharset),this._restrictCursor(),!0}setTitle(e){return this._windowTitle=e,this._onTitleChange.fire(e),!0}setIconName(e){return this._iconName=e,!0}setOrReportIndexedColor(e){const t=[],i=e.split(";");for(;i.length>1;){const e=i.shift(),s=i.shift();if(/^\d+$/.exec(e)){const i=parseInt(e);if(D(i))if("?"===s)t.push({type:0,index:i});else{const e=(0,S.parseColor)(s);e&&t.push({type:1,index:i,color:e})}}}return t.length&&this._onColor.fire(t),!0}setHyperlink(e){const t=e.split(";");return!(t.length<2)&&(t[1]?this._createHyperlink(t[0],t[1]):!t[0]&&this._finishHyperlink())}_createHyperlink(e,t){this._getCurrentLinkId()&&this._finishHyperlink();const i=e.split(":");let s;const r=i.findIndex((e=>e.startsWith("id=")));return-1!==r&&(s=i[r].slice(3)||void 0),this._curAttrData.extended=this._curAttrData.extended.clone(),this._curAttrData.extended.urlId=this._oscLinkService.registerLink({id:s,uri:t}),this._curAttrData.updateExtended(),!0}_finishHyperlink(){return this._curAttrData.extended=this._curAttrData.extended.clone(),this._curAttrData.extended.urlId=0,this._curAttrData.updateExtended(),!0}_setOrReportSpecialColor(e,t){const i=e.split(";");for(let e=0;e<i.length&&!(t>=this._specialColors.length);++e,++t)if("?"===i[e])this._onColor.fire([{type:0,index:this._specialColors[t]}]);else{const s=(0,S.parseColor)(i[e]);s&&this._onColor.fire([{type:1,index:this._specialColors[t],color:s}])}return!0}setOrReportFgColor(e){return this._setOrReportSpecialColor(e,0)}setOrReportBgColor(e){return this._setOrReportSpecialColor(e,1)}setOrReportCursorColor(e){return this._setOrReportSpecialColor(e,2)}restoreIndexedColor(e){if(!e)return this._onColor.fire([{type:2}]),!0;const t=[],i=e.split(";");for(let e=0;e<i.length;++e)if(/^\d+$/.exec(i[e])){const s=parseInt(i[e]);D(s)&&t.push({type:2,index:s})}return t.length&&this._onColor.fire(t),!0}restoreFgColor(e){return this._onColor.fire([{type:2,index:256}]),!0}restoreBgColor(e){return this._onColor.fire([{type:2,index:257}]),!0}restoreCursorColor(e){return this._onColor.fire([{type:2,index:258}]),!0}nextLine(){return this._activeBuffer.x=0,this.index(),!0}keypadApplicationMode(){return this._logService.debug("Serial port requested application keypad."),this._coreService.decPrivateModes.applicationKeypad=!0,this._onRequestSyncScrollBar.fire(),!0}keypadNumericMode(){return this._logService.debug("Switching back to normal keypad."),this._coreService.decPrivateModes.applicationKeypad=!1,this._onRequestSyncScrollBar.fire(),!0}selectDefaultCharset(){return this._charsetService.setgLevel(0),this._charsetService.setgCharset(0,o.DEFAULT_CHARSET),!0}selectCharset(e){return 2!==e.length?(this.selectDefaultCharset(),!0):("/"===e[0]||this._charsetService.setgCharset(C[e[0]],o.CHARSETS[e[1]]||o.DEFAULT_CHARSET),!0)}index(){return this._restrictCursor(),this._activeBuffer.y++,this._activeBuffer.y===this._activeBuffer.scrollBottom+1?(this._activeBuffer.y--,this._bufferService.scroll(this._eraseAttrData())):this._activeBuffer.y>=this._bufferService.rows&&(this._activeBuffer.y=this._bufferService.rows-1),this._restrictCursor(),!0}tabSet(){return this._activeBuffer.tabs[this._activeBuffer.x]=!0,!0}reverseIndex(){if(this._restrictCursor(),this._activeBuffer.y===this._activeBuffer.scrollTop){const e=this._activeBuffer.scrollBottom-this._activeBuffer.scrollTop;this._activeBuffer.lines.shiftElements(this._activeBuffer.ybase+this._activeBuffer.y,e,1),this._activeBuffer.lines.set(this._activeBuffer.ybase+this._activeBuffer.y,this._activeBuffer.getBlankLine(this._eraseAttrData())),this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop,this._activeBuffer.scrollBottom)}else this._activeBuffer.y--,this._restrictCursor();return!0}fullReset(){return this._parser.reset(),this._onRequestReset.fire(),!0}reset(){this._curAttrData=l.DEFAULT_ATTR_DATA.clone(),this._eraseAttrDataInternal=l.DEFAULT_ATTR_DATA.clone()}_eraseAttrData(){return this._eraseAttrDataInternal.bg&=-67108864,this._eraseAttrDataInternal.bg|=67108863&this._curAttrData.bg,this._eraseAttrDataInternal}setgLevel(e){return this._charsetService.setgLevel(e),!0}screenAlignmentPattern(){const e=new u.CellData;e.content=1<<22|"E".charCodeAt(0),e.fg=this._curAttrData.fg,e.bg=this._curAttrData.bg,this._setCursor(0,0);for(let t=0;t<this._bufferService.rows;++t){const i=this._activeBuffer.ybase+this._activeBuffer.y+t,s=this._activeBuffer.lines.get(i);s&&(s.fill(e),s.isWrapped=!1)}return this._dirtyRowTracker.markAllDirty(),this._setCursor(0,0),!0}requestStatusString(e,t){const i=this._bufferService.buffer,s=this._optionsService.rawOptions;return(e=>(this._coreService.triggerDataEvent(`${n.C0.ESC}${e}${n.C0.ESC}\\`),!0))('"q'===e?`P1$r${this._curAttrData.isProtected()?1:0}"q`:'"p'===e?'P1$r61;1"p':"r"===e?`P1$r${i.scrollTop+1};${i.scrollBottom+1}r`:"m"===e?"P1$r0m":" q"===e?`P1$r${{block:2,underline:4,bar:6}[s.cursorStyle]-(s.cursorBlink?1:0)} q`:"P0$r")}markRangeDirty(e,t){this._dirtyRowTracker.markRangeDirty(e,t)}}t.InputHandler=k;let L=class{constructor(e){this._bufferService=e,this.clearRange()}clearRange(){this.start=this._bufferService.buffer.y,this.end=this._bufferService.buffer.y}markDirty(e){e<this.start?this.start=e:e>this.end&&(this.end=e)}markRangeDirty(e,t){e>t&&(E=e,e=t,t=E),e<this.start&&(this.start=e),t>this.end&&(this.end=t)}markAllDirty(){this.markRangeDirty(0,this._bufferService.rows-1)}};function D(e){return 0<=e&&e<256}L=s([r(0,v.IBufferService)],L)},844:(e,t)=>{function i(e){for(const t of e)t.dispose();e.length=0}Object.defineProperty(t,"__esModule",{value:!0}),t.getDisposeArrayDisposable=t.disposeArray=t.toDisposable=t.MutableDisposable=t.Disposable=void 0,t.Disposable=class{constructor(){this._disposables=[],this._isDisposed=!1}dispose(){this._isDisposed=!0;for(const e of this._disposables)e.dispose();this._disposables.length=0}register(e){return this._disposables.push(e),e}unregister(e){const t=this._disposables.indexOf(e);-1!==t&&this._disposables.splice(t,1)}},t.MutableDisposable=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}},t.toDisposable=function(e){return{dispose:e}},t.disposeArray=i,t.getDisposeArrayDisposable=function(e){return{dispose:()=>i(e)}}},1505:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.FourKeyMap=t.TwoKeyMap=void 0;class i{constructor(){this._data={}}set(e,t,i){this._data[e]||(this._data[e]={}),this._data[e][t]=i}get(e,t){return this._data[e]?this._data[e][t]:void 0}clear(){this._data={}}}t.TwoKeyMap=i,t.FourKeyMap=class{constructor(){this._data=new i}set(e,t,s,r,n){this._data.get(e,t)||this._data.set(e,t,new i),this._data.get(e,t).set(s,r,n)}get(e,t,i,s){return this._data.get(e,t)?.get(i,s)}clear(){this._data.clear()}}},6114:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.isChromeOS=t.isLinux=t.isWindows=t.isIphone=t.isIpad=t.isMac=t.getSafariVersion=t.isSafari=t.isLegacyEdge=t.isFirefox=t.isNode=void 0,t.isNode="undefined"!=typeof process&&"title"in process;const i=t.isNode?"node":navigator.userAgent,s=t.isNode?"node":navigator.platform;t.isFirefox=i.includes("Firefox"),t.isLegacyEdge=i.includes("Edge"),t.isSafari=/^((?!chrome|android).)*safari/i.test(i),t.getSafariVersion=function(){if(!t.isSafari)return 0;const e=i.match(/Version\/(\d+)/);return null===e||e.length<2?0:parseInt(e[1])},t.isMac=["Macintosh","MacIntel","MacPPC","Mac68K"].includes(s),t.isIpad="iPad"===s,t.isIphone="iPhone"===s,t.isWindows=["Windows","Win16","Win32","WinCE"].includes(s),t.isLinux=s.indexOf("Linux")>=0,t.isChromeOS=/\bCrOS\b/.test(i)},6106:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.SortedList=void 0;let i=0;t.SortedList=class{constructor(e){this._getKey=e,this._array=[]}clear(){this._array.length=0}insert(e){0!==this._array.length?(i=this._search(this._getKey(e)),this._array.splice(i,0,e)):this._array.push(e)}delete(e){if(0===this._array.length)return!1;const t=this._getKey(e);if(void 0===t)return!1;if(i=this._search(t),-1===i)return!1;if(this._getKey(this._array[i])!==t)return!1;do{if(this._array[i]===e)return this._array.splice(i,1),!0}while(++i<this._array.length&&this._getKey(this._array[i])===t);return!1}*getKeyIterator(e){if(0!==this._array.length&&(i=this._search(e),!(i<0||i>=this._array.length)&&this._getKey(this._array[i])===e))do{yield this._array[i]}while(++i<this._array.length&&this._getKey(this._array[i])===e)}forEachByKey(e,t){if(0!==this._array.length&&(i=this._search(e),!(i<0||i>=this._array.length)&&this._getKey(this._array[i])===e))do{t(this._array[i])}while(++i<this._array.length&&this._getKey(this._array[i])===e)}values(){return[...this._array].values()}_search(e){let t=0,i=this._array.length-1;for(;i>=t;){let s=t+i>>1;const r=this._getKey(this._array[s]);if(r>e)i=s-1;else{if(!(r<e)){for(;s>0&&this._getKey(this._array[s-1])===e;)s--;return s}t=s+1}}return t}}},7226:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.DebouncedIdleTask=t.IdleTaskQueue=t.PriorityTaskQueue=void 0;const s=i(6114);class r{constructor(){this._tasks=[],this._i=0}enqueue(e){this._tasks.push(e),this._start()}flush(){for(;this._i<this._tasks.length;)this._tasks[this._i]()||this._i++;this.clear()}clear(){this._idleCallback&&(this._cancelCallback(this._idleCallback),this._idleCallback=void 0),this._i=0,this._tasks.length=0}_start(){this._idleCallback||(this._idleCallback=this._requestCallback(this._process.bind(this)))}_process(e){this._idleCallback=void 0;let t=0,i=0,s=e.timeRemaining(),r=0;for(;this._i<this._tasks.length;){if(t=Date.now(),this._tasks[this._i]()||this._i++,t=Math.max(1,Date.now()-t),i=Math.max(t,i),r=e.timeRemaining(),1.5*i>r)return s-t<-20&&console.warn(`task queue exceeded allotted deadline by ${Math.abs(Math.round(s-t))}ms`),void this._start();s=r}this.clear()}}class n extends r{_requestCallback(e){return setTimeout((()=>e(this._createDeadline(16))))}_cancelCallback(e){clearTimeout(e)}_createDeadline(e){const t=Date.now()+e;return{timeRemaining:()=>Math.max(0,t-Date.now())}}}t.PriorityTaskQueue=n,t.IdleTaskQueue=!s.isNode&&"requestIdleCallback"in window?class extends r{_requestCallback(e){return requestIdleCallback(e)}_cancelCallback(e){cancelIdleCallback(e)}}:n,t.DebouncedIdleTask=class{constructor(){this._queue=new t.IdleTaskQueue}set(e){this._queue.clear(),this._queue.enqueue(e)}flush(){this._queue.flush()}}},9282:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.updateWindowsModeWrappedState=void 0;const s=i(643);t.updateWindowsModeWrappedState=function(e){const t=e.buffer.lines.get(e.buffer.ybase+e.buffer.y-1),i=t?.get(e.cols-1),r=e.buffer.lines.get(e.buffer.ybase+e.buffer.y);r&&i&&(r.isWrapped=i[s.CHAR_DATA_CODE_INDEX]!==s.NULL_CELL_CODE&&i[s.CHAR_DATA_CODE_INDEX]!==s.WHITESPACE_CELL_CODE)}},3734:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.ExtendedAttrs=t.AttributeData=void 0;class i{constructor(){this.fg=0,this.bg=0,this.extended=new s}static toColorRGB(e){return[e>>>16&255,e>>>8&255,255&e]}static fromColorRGB(e){return(255&e[0])<<16|(255&e[1])<<8|255&e[2]}clone(){const e=new i;return e.fg=this.fg,e.bg=this.bg,e.extended=this.extended.clone(),e}isInverse(){return 67108864&this.fg}isBold(){return 134217728&this.fg}isUnderline(){return this.hasExtendedAttrs()&&0!==this.extended.underlineStyle?1:268435456&this.fg}isBlink(){return 536870912&this.fg}isInvisible(){return 1073741824&this.fg}isItalic(){return 67108864&this.bg}isDim(){return 134217728&this.bg}isStrikethrough(){return 2147483648&this.fg}isProtected(){return 536870912&this.bg}isOverline(){return 1073741824&this.bg}getFgColorMode(){return 50331648&this.fg}getBgColorMode(){return 50331648&this.bg}isFgRGB(){return 50331648==(50331648&this.fg)}isBgRGB(){return 50331648==(50331648&this.bg)}isFgPalette(){return 16777216==(50331648&this.fg)||33554432==(50331648&this.fg)}isBgPalette(){return 16777216==(50331648&this.bg)||33554432==(50331648&this.bg)}isFgDefault(){return 0==(50331648&this.fg)}isBgDefault(){return 0==(50331648&this.bg)}isAttributeDefault(){return 0===this.fg&&0===this.bg}getFgColor(){switch(50331648&this.fg){case 16777216:case 33554432:return 255&this.fg;case 50331648:return 16777215&this.fg;default:return-1}}getBgColor(){switch(50331648&this.bg){case 16777216:case 33554432:return 255&this.bg;case 50331648:return 16777215&this.bg;default:return-1}}hasExtendedAttrs(){return 268435456&this.bg}updateExtended(){this.extended.isEmpty()?this.bg&=-268435457:this.bg|=268435456}getUnderlineColor(){if(268435456&this.bg&&~this.extended.underlineColor)switch(50331648&this.extended.underlineColor){case 16777216:case 33554432:return 255&this.extended.underlineColor;case 50331648:return 16777215&this.extended.underlineColor;default:return this.getFgColor()}return this.getFgColor()}getUnderlineColorMode(){return 268435456&this.bg&&~this.extended.underlineColor?50331648&this.extended.underlineColor:this.getFgColorMode()}isUnderlineColorRGB(){return 268435456&this.bg&&~this.extended.underlineColor?50331648==(50331648&this.extended.underlineColor):this.isFgRGB()}isUnderlineColorPalette(){return 268435456&this.bg&&~this.extended.underlineColor?16777216==(50331648&this.extended.underlineColor)||33554432==(50331648&this.extended.underlineColor):this.isFgPalette()}isUnderlineColorDefault(){return 268435456&this.bg&&~this.extended.underlineColor?0==(50331648&this.extended.underlineColor):this.isFgDefault()}getUnderlineStyle(){return 268435456&this.fg?268435456&this.bg?this.extended.underlineStyle:1:0}getUnderlineVariantOffset(){return this.extended.underlineVariantOffset}}t.AttributeData=i;class s{get ext(){return this._urlId?-469762049&this._ext|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(469762048&this._ext)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return 67108863&this._ext}set underlineColor(e){this._ext&=-67108864,this._ext|=67108863&e}get urlId(){return this._urlId}set urlId(e){this._urlId=e}get underlineVariantOffset(){const e=(3758096384&this._ext)>>29;return e<0?4294967288^e:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}constructor(e=0,t=0){this._ext=0,this._urlId=0,this._ext=e,this._urlId=t}clone(){return new s(this._ext,this._urlId)}isEmpty(){return 0===this.underlineStyle&&0===this._urlId}}t.ExtendedAttrs=s},9092:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.Buffer=t.MAX_BUFFER_SIZE=void 0;const s=i(6349),r=i(7226),n=i(3734),o=i(8437),a=i(4634),h=i(511),c=i(643),l=i(4863),d=i(7116);t.MAX_BUFFER_SIZE=4294967295,t.Buffer=class{constructor(e,t,i){this._hasScrollback=e,this._optionsService=t,this._bufferService=i,this.ydisp=0,this.ybase=0,this.y=0,this.x=0,this.tabs={},this.savedY=0,this.savedX=0,this.savedCurAttrData=o.DEFAULT_ATTR_DATA.clone(),this.savedCharset=d.DEFAULT_CHARSET,this.markers=[],this._nullCell=h.CellData.fromCharData([0,c.NULL_CELL_CHAR,c.NULL_CELL_WIDTH,c.NULL_CELL_CODE]),this._whitespaceCell=h.CellData.fromCharData([0,c.WHITESPACE_CELL_CHAR,c.WHITESPACE_CELL_WIDTH,c.WHITESPACE_CELL_CODE]),this._isClearing=!1,this._memoryCleanupQueue=new r.IdleTaskQueue,this._memoryCleanupPosition=0,this._cols=this._bufferService.cols,this._rows=this._bufferService.rows,this.lines=new s.CircularList(this._getCorrectBufferLength(this._rows)),this.scrollTop=0,this.scrollBottom=this._rows-1,this.setupTabStops()}getNullCell(e){return e?(this._nullCell.fg=e.fg,this._nullCell.bg=e.bg,this._nullCell.extended=e.extended):(this._nullCell.fg=0,this._nullCell.bg=0,this._nullCell.extended=new n.ExtendedAttrs),this._nullCell}getWhitespaceCell(e){return e?(this._whitespaceCell.fg=e.fg,this._whitespaceCell.bg=e.bg,this._whitespaceCell.extended=e.extended):(this._whitespaceCell.fg=0,this._whitespaceCell.bg=0,this._whitespaceCell.extended=new n.ExtendedAttrs),this._whitespaceCell}getBlankLine(e,t){return new o.BufferLine(this._bufferService.cols,this.getNullCell(e),t)}get hasScrollback(){return this._hasScrollback&&this.lines.maxLength>this._rows}get isCursorInViewport(){const e=this.ybase+this.y-this.ydisp;return e>=0&&e<this._rows}_getCorrectBufferLength(e){if(!this._hasScrollback)return e;const i=e+this._optionsService.rawOptions.scrollback;return i>t.MAX_BUFFER_SIZE?t.MAX_BUFFER_SIZE:i}fillViewportRows(e){if(0===this.lines.length){void 0===e&&(e=o.DEFAULT_ATTR_DATA);let t=this._rows;for(;t--;)this.lines.push(this.getBlankLine(e))}}clear(){this.ydisp=0,this.ybase=0,this.y=0,this.x=0,this.lines=new s.CircularList(this._getCorrectBufferLength(this._rows)),this.scrollTop=0,this.scrollBottom=this._rows-1,this.setupTabStops()}resize(e,t){const i=this.getNullCell(o.DEFAULT_ATTR_DATA);let s=0;const r=this._getCorrectBufferLength(t);if(r>this.lines.maxLength&&(this.lines.maxLength=r),this.lines.length>0){if(this._cols<e)for(let t=0;t<this.lines.length;t++)s+=+this.lines.get(t).resize(e,i);let n=0;if(this._rows<t)for(let s=this._rows;s<t;s++)this.lines.length<t+this.ybase&&(this._optionsService.rawOptions.windowsMode||void 0!==this._optionsService.rawOptions.windowsPty.backend||void 0!==this._optionsService.rawOptions.windowsPty.buildNumber?this.lines.push(new o.BufferLine(e,i)):this.ybase>0&&this.lines.length<=this.ybase+this.y+n+1?(this.ybase--,n++,this.ydisp>0&&this.ydisp--):this.lines.push(new o.BufferLine(e,i)));else for(let e=this._rows;e>t;e--)this.lines.length>t+this.ybase&&(this.lines.length>this.ybase+this.y+1?this.lines.pop():(this.ybase++,this.ydisp++));if(r<this.lines.maxLength){const e=this.lines.length-r;e>0&&(this.lines.trimStart(e),this.ybase=Math.max(this.ybase-e,0),this.ydisp=Math.max(this.ydisp-e,0),this.savedY=Math.max(this.savedY-e,0)),this.lines.maxLength=r}this.x=Math.min(this.x,e-1),this.y=Math.min(this.y,t-1),n&&(this.y+=n),this.savedX=Math.min(this.savedX,e-1),this.scrollTop=0}if(this.scrollBottom=t-1,this._isReflowEnabled&&(this._reflow(e,t),this._cols>e))for(let t=0;t<this.lines.length;t++)s+=+this.lines.get(t).resize(e,i);this._cols=e,this._rows=t,this._memoryCleanupQueue.clear(),s>.1*this.lines.length&&(this._memoryCleanupPosition=0,this._memoryCleanupQueue.enqueue((()=>this._batchedMemoryCleanup())))}_batchedMemoryCleanup(){let e=!0;this._memoryCleanupPosition>=this.lines.length&&(this._memoryCleanupPosition=0,e=!1);let t=0;for(;this._memoryCleanupPosition<this.lines.length;)if(t+=this.lines.get(this._memoryCleanupPosition++).cleanupMemory(),t>100)return!0;return e}get _isReflowEnabled(){const e=this._optionsService.rawOptions.windowsPty;return e&&e.buildNumber?this._hasScrollback&&"conpty"===e.backend&&e.buildNumber>=21376:this._hasScrollback&&!this._optionsService.rawOptions.windowsMode}_reflow(e,t){this._cols!==e&&(e>this._cols?this._reflowLarger(e,t):this._reflowSmaller(e,t))}_reflowLarger(e,t){const i=(0,a.reflowLargerGetLinesToRemove)(this.lines,this._cols,e,this.ybase+this.y,this.getNullCell(o.DEFAULT_ATTR_DATA));if(i.length>0){const s=(0,a.reflowLargerCreateNewLayout)(this.lines,i);(0,a.reflowLargerApplyNewLayout)(this.lines,s.layout),this._reflowLargerAdjustViewport(e,t,s.countRemoved)}}_reflowLargerAdjustViewport(e,t,i){const s=this.getNullCell(o.DEFAULT_ATTR_DATA);let r=i;for(;r-- >0;)0===this.ybase?(this.y>0&&this.y--,this.lines.length<t&&this.lines.push(new o.BufferLine(e,s))):(this.ydisp===this.ybase&&this.ydisp--,this.ybase--);this.savedY=Math.max(this.savedY-i,0)}_reflowSmaller(e,t){const i=this.getNullCell(o.DEFAULT_ATTR_DATA),s=[];let r=0;for(let n=this.lines.length-1;n>=0;n--){let h=this.lines.get(n);if(!h||!h.isWrapped&&h.getTrimmedLength()<=e)continue;const c=[h];for(;h.isWrapped&&n>0;)h=this.lines.get(--n),c.unshift(h);const l=this.ybase+this.y;if(l>=n&&l<n+c.length)continue;const d=c[c.length-1].getTrimmedLength(),_=(0,a.reflowSmallerGetNewLineLengths)(c,this._cols,e),u=_.length-c.length;let f;f=0===this.ybase&&this.y!==this.lines.length-1?Math.max(0,this.y-this.lines.maxLength+u):Math.max(0,this.lines.length-this.lines.maxLength+u);const v=[];for(let e=0;e<u;e++){const e=this.getBlankLine(o.DEFAULT_ATTR_DATA,!0);v.push(e)}v.length>0&&(s.push({start:n+c.length+r,newLines:v}),r+=v.length),c.push(...v);let p=_.length-1,g=_[p];0===g&&(p--,g=_[p]);let m=c.length-u-1,S=d;for(;m>=0;){const e=Math.min(S,g);if(void 0===c[p])break;if(c[p].copyCellsFrom(c[m],S-e,g-e,e,!0),g-=e,0===g&&(p--,g=_[p]),S-=e,0===S){m--;const e=Math.max(m,0);S=(0,a.getWrappedLineTrimmedLength)(c,e,this._cols)}}for(let t=0;t<c.length;t++)_[t]<e&&c[t].setCell(_[t],i);let C=u-f;for(;C-- >0;)0===this.ybase?this.y<t-1?(this.y++,this.lines.pop()):(this.ybase++,this.ydisp++):this.ybase<Math.min(this.lines.maxLength,this.lines.length+r)-t&&(this.ybase===this.ydisp&&this.ydisp++,this.ybase++);this.savedY=Math.min(this.savedY+u,this.ybase+t-1)}if(s.length>0){const e=[],t=[];for(let e=0;e<this.lines.length;e++)t.push(this.lines.get(e));const i=this.lines.length;let n=i-1,o=0,a=s[o];this.lines.length=Math.min(this.lines.maxLength,this.lines.length+r);let h=0;for(let c=Math.min(this.lines.maxLength-1,i+r-1);c>=0;c--)if(a&&a.start>n+h){for(let e=a.newLines.length-1;e>=0;e--)this.lines.set(c--,a.newLines[e]);c++,e.push({index:n+1,amount:a.newLines.length}),h+=a.newLines.length,a=s[++o]}else this.lines.set(c,t[n--]);let c=0;for(let t=e.length-1;t>=0;t--)e[t].index+=c,this.lines.onInsertEmitter.fire(e[t]),c+=e[t].amount;const l=Math.max(0,i+r-this.lines.maxLength);l>0&&this.lines.onTrimEmitter.fire(l)}}translateBufferLineToString(e,t,i=0,s){const r=this.lines.get(e);return r?r.translateToString(t,i,s):""}getWrappedRangeForLine(e){let t=e,i=e;for(;t>0&&this.lines.get(t).isWrapped;)t--;for(;i+1<this.lines.length&&this.lines.get(i+1).isWrapped;)i++;return{first:t,last:i}}setupTabStops(e){for(null!=e?this.tabs[e]||(e=this.prevStop(e)):(this.tabs={},e=0);e<this._cols;e+=this._optionsService.rawOptions.tabStopWidth)this.tabs[e]=!0}prevStop(e){for(null==e&&(e=this.x);!this.tabs[--e]&&e>0;);return e>=this._cols?this._cols-1:e<0?0:e}nextStop(e){for(null==e&&(e=this.x);!this.tabs[++e]&&e<this._cols;);return e>=this._cols?this._cols-1:e<0?0:e}clearMarkers(e){this._isClearing=!0;for(let t=0;t<this.markers.length;t++)this.markers[t].line===e&&(this.markers[t].dispose(),this.markers.splice(t--,1));this._isClearing=!1}clearAllMarkers(){this._isClearing=!0;for(let e=0;e<this.markers.length;e++)this.markers[e].dispose(),this.markers.splice(e--,1);this._isClearing=!1}addMarker(e){const t=new l.Marker(e);return this.markers.push(t),t.register(this.lines.onTrim((e=>{t.line-=e,t.line<0&&t.dispose()}))),t.register(this.lines.onInsert((e=>{t.line>=e.index&&(t.line+=e.amount)}))),t.register(this.lines.onDelete((e=>{t.line>=e.index&&t.line<e.index+e.amount&&t.dispose(),t.line>e.index&&(t.line-=e.amount)}))),t.register(t.onDispose((()=>this._removeMarker(t)))),t}_removeMarker(e){this._isClearing||this.markers.splice(this.markers.indexOf(e),1)}}},8437:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.BufferLine=t.DEFAULT_ATTR_DATA=void 0;const s=i(3734),r=i(511),n=i(643),o=i(482);t.DEFAULT_ATTR_DATA=Object.freeze(new s.AttributeData);let a=0;class h{constructor(e,t,i=!1){this.isWrapped=i,this._combined={},this._extendedAttrs={},this._data=new Uint32Array(3*e);const s=t||r.CellData.fromCharData([0,n.NULL_CELL_CHAR,n.NULL_CELL_WIDTH,n.NULL_CELL_CODE]);for(let t=0;t<e;++t)this.setCell(t,s);this.length=e}get(e){const t=this._data[3*e+0],i=2097151&t;return[this._data[3*e+1],2097152&t?this._combined[e]:i?(0,o.stringFromCodePoint)(i):"",t>>22,2097152&t?this._combined[e].charCodeAt(this._combined[e].length-1):i]}set(e,t){this._data[3*e+1]=t[n.CHAR_DATA_ATTR_INDEX],t[n.CHAR_DATA_CHAR_INDEX].length>1?(this._combined[e]=t[1],this._data[3*e+0]=2097152|e|t[n.CHAR_DATA_WIDTH_INDEX]<<22):this._data[3*e+0]=t[n.CHAR_DATA_CHAR_INDEX].charCodeAt(0)|t[n.CHAR_DATA_WIDTH_INDEX]<<22}getWidth(e){return this._data[3*e+0]>>22}hasWidth(e){return 12582912&this._data[3*e+0]}getFg(e){return this._data[3*e+1]}getBg(e){return this._data[3*e+2]}hasContent(e){return 4194303&this._data[3*e+0]}getCodePoint(e){const t=this._data[3*e+0];return 2097152&t?this._combined[e].charCodeAt(this._combined[e].length-1):2097151&t}isCombined(e){return 2097152&this._data[3*e+0]}getString(e){const t=this._data[3*e+0];return 2097152&t?this._combined[e]:2097151&t?(0,o.stringFromCodePoint)(2097151&t):""}isProtected(e){return 536870912&this._data[3*e+2]}loadCell(e,t){return a=3*e,t.content=this._data[a+0],t.fg=this._data[a+1],t.bg=this._data[a+2],2097152&t.content&&(t.combinedData=this._combined[e]),268435456&t.bg&&(t.extended=this._extendedAttrs[e]),t}setCell(e,t){2097152&t.content&&(this._combined[e]=t.combinedData),268435456&t.bg&&(this._extendedAttrs[e]=t.extended),this._data[3*e+0]=t.content,this._data[3*e+1]=t.fg,this._data[3*e+2]=t.bg}setCellFromCodepoint(e,t,i,s){268435456&s.bg&&(this._extendedAttrs[e]=s.extended),this._data[3*e+0]=t|i<<22,this._data[3*e+1]=s.fg,this._data[3*e+2]=s.bg}addCodepointToCell(e,t,i){let s=this._data[3*e+0];2097152&s?this._combined[e]+=(0,o.stringFromCodePoint)(t):2097151&s?(this._combined[e]=(0,o.stringFromCodePoint)(2097151&s)+(0,o.stringFromCodePoint)(t),s&=-2097152,s|=2097152):s=t|1<<22,i&&(s&=-12582913,s|=i<<22),this._data[3*e+0]=s}insertCells(e,t,i){if((e%=this.length)&&2===this.getWidth(e-1)&&this.setCellFromCodepoint(e-1,0,1,i),t<this.length-e){const s=new r.CellData;for(let i=this.length-e-t-1;i>=0;--i)this.setCell(e+t+i,this.loadCell(e+i,s));for(let s=0;s<t;++s)this.setCell(e+s,i)}else for(let t=e;t<this.length;++t)this.setCell(t,i);2===this.getWidth(this.length-1)&&this.setCellFromCodepoint(this.length-1,0,1,i)}deleteCells(e,t,i){if(e%=this.length,t<this.length-e){const s=new r.CellData;for(let i=0;i<this.length-e-t;++i)this.setCell(e+i,this.loadCell(e+t+i,s));for(let e=this.length-t;e<this.length;++e)this.setCell(e,i)}else for(let t=e;t<this.length;++t)this.setCell(t,i);e&&2===this.getWidth(e-1)&&this.setCellFromCodepoint(e-1,0,1,i),0!==this.getWidth(e)||this.hasContent(e)||this.setCellFromCodepoint(e,0,1,i)}replaceCells(e,t,i,s=!1){if(s)for(e&&2===this.getWidth(e-1)&&!this.isProtected(e-1)&&this.setCellFromCodepoint(e-1,0,1,i),t<this.length&&2===this.getWidth(t-1)&&!this.isProtected(t)&&this.setCellFromCodepoint(t,0,1,i);e<t&&e<this.length;)this.isProtected(e)||this.setCell(e,i),e++;else for(e&&2===this.getWidth(e-1)&&this.setCellFromCodepoint(e-1,0,1,i),t<this.length&&2===this.getWidth(t-1)&&this.setCellFromCodepoint(t,0,1,i);e<t&&e<this.length;)this.setCell(e++,i)}resize(e,t){if(e===this.length)return 4*this._data.length*2<this._data.buffer.byteLength;const i=3*e;if(e>this.length){if(this._data.buffer.byteLength>=4*i)this._data=new Uint32Array(this._data.buffer,0,i);else{const e=new Uint32Array(i);e.set(this._data),this._data=e}for(let i=this.length;i<e;++i)this.setCell(i,t)}else{this._data=this._data.subarray(0,i);const t=Object.keys(this._combined);for(let i=0;i<t.length;i++){const s=parseInt(t[i],10);s>=e&&delete this._combined[s]}const s=Object.keys(this._extendedAttrs);for(let t=0;t<s.length;t++){const i=parseInt(s[t],10);i>=e&&delete this._extendedAttrs[i]}}return this.length=e,4*i*2<this._data.buffer.byteLength}cleanupMemory(){if(4*this._data.length*2<this._data.buffer.byteLength){const e=new Uint32Array(this._data.length);return e.set(this._data),this._data=e,1}return 0}fill(e,t=!1){if(t)for(let t=0;t<this.length;++t)this.isProtected(t)||this.setCell(t,e);else{this._combined={},this._extendedAttrs={};for(let t=0;t<this.length;++t)this.setCell(t,e)}}copyFrom(e){this.length!==e.length?this._data=new Uint32Array(e._data):this._data.set(e._data),this.length=e.length,this._combined={};for(const t in e._combined)this._combined[t]=e._combined[t];this._extendedAttrs={};for(const t in e._extendedAttrs)this._extendedAttrs[t]=e._extendedAttrs[t];this.isWrapped=e.isWrapped}clone(){const e=new h(0);e._data=new Uint32Array(this._data),e.length=this.length;for(const t in this._combined)e._combined[t]=this._combined[t];for(const t in this._extendedAttrs)e._extendedAttrs[t]=this._extendedAttrs[t];return e.isWrapped=this.isWrapped,e}getTrimmedLength(){for(let e=this.length-1;e>=0;--e)if(4194303&this._data[3*e+0])return e+(this._data[3*e+0]>>22);return 0}getNoBgTrimmedLength(){for(let e=this.length-1;e>=0;--e)if(4194303&this._data[3*e+0]||50331648&this._data[3*e+2])return e+(this._data[3*e+0]>>22);return 0}copyCellsFrom(e,t,i,s,r){const n=e._data;if(r)for(let r=s-1;r>=0;r--){for(let e=0;e<3;e++)this._data[3*(i+r)+e]=n[3*(t+r)+e];268435456&n[3*(t+r)+2]&&(this._extendedAttrs[i+r]=e._extendedAttrs[t+r])}else for(let r=0;r<s;r++){for(let e=0;e<3;e++)this._data[3*(i+r)+e]=n[3*(t+r)+e];268435456&n[3*(t+r)+2]&&(this._extendedAttrs[i+r]=e._extendedAttrs[t+r])}const o=Object.keys(e._combined);for(let s=0;s<o.length;s++){const r=parseInt(o[s],10);r>=t&&(this._combined[r-t+i]=e._combined[r])}}translateToString(e,t,i,s){t=t??0,i=i??this.length,e&&(i=Math.min(i,this.getTrimmedLength())),s&&(s.length=0);let r="";for(;t<i;){const e=this._data[3*t+0],i=2097151&e,a=2097152&e?this._combined[t]:i?(0,o.stringFromCodePoint)(i):n.WHITESPACE_CELL_CHAR;if(r+=a,s)for(let e=0;e<a.length;++e)s.push(t);t+=e>>22||1}return s&&s.push(t),r}}t.BufferLine=h},4841:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.getRangeLength=void 0,t.getRangeLength=function(e,t){if(e.start.y>e.end.y)throw new Error(`Buffer range end (${e.end.x}, ${e.end.y}) cannot be before start (${e.start.x}, ${e.start.y})`);return t*(e.end.y-e.start.y)+(e.end.x-e.start.x+1)}},4634:(e,t)=>{function i(e,t,i){if(t===e.length-1)return e[t].getTrimmedLength();const s=!e[t].hasContent(i-1)&&1===e[t].getWidth(i-1),r=2===e[t+1].getWidth(0);return s&&r?i-1:i}Object.defineProperty(t,"__esModule",{value:!0}),t.getWrappedLineTrimmedLength=t.reflowSmallerGetNewLineLengths=t.reflowLargerApplyNewLayout=t.reflowLargerCreateNewLayout=t.reflowLargerGetLinesToRemove=void 0,t.reflowLargerGetLinesToRemove=function(e,t,s,r,n){const o=[];for(let a=0;a<e.length-1;a++){let h=a,c=e.get(++h);if(!c.isWrapped)continue;const l=[e.get(a)];for(;h<e.length&&c.isWrapped;)l.push(c),c=e.get(++h);if(r>=a&&r<h){a+=l.length-1;continue}let d=0,_=i(l,d,t),u=1,f=0;for(;u<l.length;){const e=i(l,u,t),r=e-f,o=s-_,a=Math.min(r,o);l[d].copyCellsFrom(l[u],f,_,a,!1),_+=a,_===s&&(d++,_=0),f+=a,f===e&&(u++,f=0),0===_&&0!==d&&2===l[d-1].getWidth(s-1)&&(l[d].copyCellsFrom(l[d-1],s-1,_++,1,!1),l[d-1].setCell(s-1,n))}l[d].replaceCells(_,s,n);let v=0;for(let e=l.length-1;e>0&&(e>d||0===l[e].getTrimmedLength());e--)v++;v>0&&(o.push(a+l.length-v),o.push(v)),a+=l.length-1}return o},t.reflowLargerCreateNewLayout=function(e,t){const i=[];let s=0,r=t[s],n=0;for(let o=0;o<e.length;o++)if(r===o){const i=t[++s];e.onDeleteEmitter.fire({index:o-n,amount:i}),o+=i-1,n+=i,r=t[++s]}else i.push(o);return{layout:i,countRemoved:n}},t.reflowLargerApplyNewLayout=function(e,t){const i=[];for(let s=0;s<t.length;s++)i.push(e.get(t[s]));for(let t=0;t<i.length;t++)e.set(t,i[t]);e.length=t.length},t.reflowSmallerGetNewLineLengths=function(e,t,s){const r=[],n=e.map(((s,r)=>i(e,r,t))).reduce(((e,t)=>e+t));let o=0,a=0,h=0;for(;h<n;){if(n-h<s){r.push(n-h);break}o+=s;const c=i(e,a,t);o>c&&(o-=c,a++);const l=2===e[a].getWidth(o-1);l&&o--;const d=l?s-1:s;r.push(d),h+=d}return r},t.getWrappedLineTrimmedLength=i},5295:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.BufferSet=void 0;const s=i(8460),r=i(844),n=i(9092);class o extends r.Disposable{constructor(e,t){super(),this._optionsService=e,this._bufferService=t,this._onBufferActivate=this.register(new s.EventEmitter),this.onBufferActivate=this._onBufferActivate.event,this.reset(),this.register(this._optionsService.onSpecificOptionChange("scrollback",(()=>this.resize(this._bufferService.cols,this._bufferService.rows)))),this.register(this._optionsService.onSpecificOptionChange("tabStopWidth",(()=>this.setupTabStops())))}reset(){this._normal=new n.Buffer(!0,this._optionsService,this._bufferService),this._normal.fillViewportRows(),this._alt=new n.Buffer(!1,this._optionsService,this._bufferService),this._activeBuffer=this._normal,this._onBufferActivate.fire({activeBuffer:this._normal,inactiveBuffer:this._alt}),this.setupTabStops()}get alt(){return this._alt}get active(){return this._activeBuffer}get normal(){return this._normal}activateNormalBuffer(){this._activeBuffer!==this._normal&&(this._normal.x=this._alt.x,this._normal.y=this._alt.y,this._alt.clearAllMarkers(),this._alt.clear(),this._activeBuffer=this._normal,this._onBufferActivate.fire({activeBuffer:this._normal,inactiveBuffer:this._alt}))}activateAltBuffer(e){this._activeBuffer!==this._alt&&(this._alt.fillViewportRows(e),this._alt.x=this._normal.x,this._alt.y=this._normal.y,this._activeBuffer=this._alt,this._onBufferActivate.fire({activeBuffer:this._alt,inactiveBuffer:this._normal}))}resize(e,t){this._normal.resize(e,t),this._alt.resize(e,t),this.setupTabStops(e)}setupTabStops(e){this._normal.setupTabStops(e),this._alt.setupTabStops(e)}}t.BufferSet=o},511:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.CellData=void 0;const s=i(482),r=i(643),n=i(3734);class o extends n.AttributeData{constructor(){super(...arguments),this.content=0,this.fg=0,this.bg=0,this.extended=new n.ExtendedAttrs,this.combinedData=""}static fromCharData(e){const t=new o;return t.setFromCharData(e),t}isCombined(){return 2097152&this.content}getWidth(){return this.content>>22}getChars(){return 2097152&this.content?this.combinedData:2097151&this.content?(0,s.stringFromCodePoint)(2097151&this.content):""}getCode(){return this.isCombined()?this.combinedData.charCodeAt(this.combinedData.length-1):2097151&this.content}setFromCharData(e){this.fg=e[r.CHAR_DATA_ATTR_INDEX],this.bg=0;let t=!1;if(e[r.CHAR_DATA_CHAR_INDEX].length>2)t=!0;else if(2===e[r.CHAR_DATA_CHAR_INDEX].length){const i=e[r.CHAR_DATA_CHAR_INDEX].charCodeAt(0);if(55296<=i&&i<=56319){const s=e[r.CHAR_DATA_CHAR_INDEX].charCodeAt(1);56320<=s&&s<=57343?this.content=1024*(i-55296)+s-56320+65536|e[r.CHAR_DATA_WIDTH_INDEX]<<22:t=!0}else t=!0}else this.content=e[r.CHAR_DATA_CHAR_INDEX].charCodeAt(0)|e[r.CHAR_DATA_WIDTH_INDEX]<<22;t&&(this.combinedData=e[r.CHAR_DATA_CHAR_INDEX],this.content=2097152|e[r.CHAR_DATA_WIDTH_INDEX]<<22)}getAsCharData(){return[this.fg,this.getChars(),this.getWidth(),this.getCode()]}}t.CellData=o},643:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.WHITESPACE_CELL_CODE=t.WHITESPACE_CELL_WIDTH=t.WHITESPACE_CELL_CHAR=t.NULL_CELL_CODE=t.NULL_CELL_WIDTH=t.NULL_CELL_CHAR=t.CHAR_DATA_CODE_INDEX=t.CHAR_DATA_WIDTH_INDEX=t.CHAR_DATA_CHAR_INDEX=t.CHAR_DATA_ATTR_INDEX=t.DEFAULT_EXT=t.DEFAULT_ATTR=t.DEFAULT_COLOR=void 0,t.DEFAULT_COLOR=0,t.DEFAULT_ATTR=256|t.DEFAULT_COLOR<<9,t.DEFAULT_EXT=0,t.CHAR_DATA_ATTR_INDEX=0,t.CHAR_DATA_CHAR_INDEX=1,t.CHAR_DATA_WIDTH_INDEX=2,t.CHAR_DATA_CODE_INDEX=3,t.NULL_CELL_CHAR="",t.NULL_CELL_WIDTH=1,t.NULL_CELL_CODE=0,t.WHITESPACE_CELL_CHAR=" ",t.WHITESPACE_CELL_WIDTH=1,t.WHITESPACE_CELL_CODE=32},4863:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.Marker=void 0;const s=i(8460),r=i(844);class n{get id(){return this._id}constructor(e){this.line=e,this.isDisposed=!1,this._disposables=[],this._id=n._nextId++,this._onDispose=this.register(new s.EventEmitter),this.onDispose=this._onDispose.event}dispose(){this.isDisposed||(this.isDisposed=!0,this.line=-1,this._onDispose.fire(),(0,r.disposeArray)(this._disposables),this._disposables.length=0)}register(e){return this._disposables.push(e),e}}t.Marker=n,n._nextId=1},7116:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.DEFAULT_CHARSET=t.CHARSETS=void 0,t.CHARSETS={},t.DEFAULT_CHARSET=t.CHARSETS.B,t.CHARSETS[0]={"`":"◆",a:"▒",b:"␉",c:"␌",d:"␍",e:"␊",f:"°",g:"±",h:"␤",i:"␋",j:"┘",k:"┐",l:"┌",m:"└",n:"┼",o:"⎺",p:"⎻",q:"─",r:"⎼",s:"⎽",t:"├",u:"┤",v:"┴",w:"┬",x:"│",y:"≤",z:"≥","{":"π","|":"≠","}":"£","~":"·"},t.CHARSETS.A={"#":"£"},t.CHARSETS.B=void 0,t.CHARSETS[4]={"#":"£","@":"¾","[":"ij","\\":"½","]":"|","{":"¨","|":"f","}":"¼","~":"´"},t.CHARSETS.C=t.CHARSETS[5]={"[":"Ä","\\":"Ö","]":"Å","^":"Ü","`":"é","{":"ä","|":"ö","}":"å","~":"ü"},t.CHARSETS.R={"#":"£","@":"à","[":"°","\\":"ç","]":"§","{":"é","|":"ù","}":"è","~":"¨"},t.CHARSETS.Q={"@":"à","[":"â","\\":"ç","]":"ê","^":"î","`":"ô","{":"é","|":"ù","}":"è","~":"û"},t.CHARSETS.K={"@":"§","[":"Ä","\\":"Ö","]":"Ü","{":"ä","|":"ö","}":"ü","~":"ß"},t.CHARSETS.Y={"#":"£","@":"§","[":"°","\\":"ç","]":"é","`":"ù","{":"à","|":"ò","}":"è","~":"ì"},t.CHARSETS.E=t.CHARSETS[6]={"@":"Ä","[":"Æ","\\":"Ø","]":"Å","^":"Ü","`":"ä","{":"æ","|":"ø","}":"å","~":"ü"},t.CHARSETS.Z={"#":"£","@":"§","[":"¡","\\":"Ñ","]":"¿","{":"°","|":"ñ","}":"ç"},t.CHARSETS.H=t.CHARSETS[7]={"@":"É","[":"Ä","\\":"Ö","]":"Å","^":"Ü","`":"é","{":"ä","|":"ö","}":"å","~":"ü"},t.CHARSETS["="]={"#":"ù","@":"à","[":"é","\\":"ç","]":"ê","^":"î",_:"è","`":"ô","{":"ä","|":"ö","}":"ü","~":"û"}},2584:(e,t)=>{var i,s,r;Object.defineProperty(t,"__esModule",{value:!0}),t.C1_ESCAPED=t.C1=t.C0=void 0,function(e){e.NUL="\0",e.SOH="
",e.STX="",e.ETX="",e.EOT="",e.ENQ="",e.ACK="",e.BEL="",e.BS="\b",e.HT="\t",e.LF="\n",e.VT="\v",e.FF="\f",e.CR="\r",e.SO="",e.SI="",e.DLE="",e.DC1="",e.DC2="",e.DC3="",e.DC4="",e.NAK="",e.SYN="",e.ETB="",e.CAN="",e.EM="",e.SUB="",e.ESC="",e.FS="",e.GS="",e.RS="",e.US="",e.SP=" ",e.DEL=""}(i||(t.C0=i={})),function(e){e.PAD="€",e.HOP="",e.BPH="‚",e.NBH="ƒ",e.IND="„",e.NEL="…",e.SSA="†",e.ESA="‡",e.HTS="ˆ",e.HTJ="‰",e.VTS="Š",e.PLD="‹",e.PLU="Œ",e.RI="",e.SS2="Ž",e.SS3="",e.DCS="",e.PU1="‘",e.PU2="’",e.STS="“",e.CCH="”",e.MW="•",e.SPA="–",e.EPA="—",e.SOS="˜",e.SGCI="™",e.SCI="š",e.CSI="›",e.ST="œ",e.OSC="",e.PM="ž",e.APC="Ÿ"}(s||(t.C1=s={})),function(e){e.ST=`${i.ESC}\\`}(r||(t.C1_ESCAPED=r={}))},7399:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.evaluateKeyboardEvent=void 0;const s=i(2584),r={48:["0",")"],49:["1","!"],50:["2","@"],51:["3","#"],52:["4","$"],53:["5","%"],54:["6","^"],55:["7","&"],56:["8","*"],57:["9","("],186:[";",":"],187:["=","+"],188:[",","<"],189:["-","_"],190:[".",">"],191:["/","?"],192:["`","~"],219:["[","{"],220:["\\","|"],221:["]","}"],222:["'",'"']};t.evaluateKeyboardEvent=function(e,t,i,n){const o={type:0,cancel:!1,key:void 0},a=(e.shiftKey?1:0)|(e.altKey?2:0)|(e.ctrlKey?4:0)|(e.metaKey?8:0);switch(e.keyCode){case 0:"UIKeyInputUpArrow"===e.key?o.key=t?s.C0.ESC+"OA":s.C0.ESC+"[A":"UIKeyInputLeftArrow"===e.key?o.key=t?s.C0.ESC+"OD":s.C0.ESC+"[D":"UIKeyInputRightArrow"===e.key?o.key=t?s.C0.ESC+"OC":s.C0.ESC+"[C":"UIKeyInputDownArrow"===e.key&&(o.key=t?s.C0.ESC+"OB":s.C0.ESC+"[B");break;case 8:o.key=e.ctrlKey?"\b":s.C0.DEL,e.altKey&&(o.key=s.C0.ESC+o.key);break;case 9:if(e.shiftKey){o.key=s.C0.ESC+"[Z";break}o.key=s.C0.HT,o.cancel=!0;break;case 13:o.key=e.altKey?s.C0.ESC+s.C0.CR:s.C0.CR,o.cancel=!0;break;case 27:o.key=s.C0.ESC,e.altKey&&(o.key=s.C0.ESC+s.C0.ESC),o.cancel=!0;break;case 37:if(e.metaKey)break;a?(o.key=s.C0.ESC+"[1;"+(a+1)+"D",o.key===s.C0.ESC+"[1;3D"&&(o.key=s.C0.ESC+(i?"b":"[1;5D"))):o.key=t?s.C0.ESC+"OD":s.C0.ESC+"[D";break;case 39:if(e.metaKey)break;a?(o.key=s.C0.ESC+"[1;"+(a+1)+"C",o.key===s.C0.ESC+"[1;3C"&&(o.key=s.C0.ESC+(i?"f":"[1;5C"))):o.key=t?s.C0.ESC+"OC":s.C0.ESC+"[C";break;case 38:if(e.metaKey)break;a?(o.key=s.C0.ESC+"[1;"+(a+1)+"A",i||o.key!==s.C0.ESC+"[1;3A"||(o.key=s.C0.ESC+"[1;5A")):o.key=t?s.C0.ESC+"OA":s.C0.ESC+"[A";break;case 40:if(e.metaKey)break;a?(o.key=s.C0.ESC+"[1;"+(a+1)+"B",i||o.key!==s.C0.ESC+"[1;3B"||(o.key=s.C0.ESC+"[1;5B")):o.key=t?s.C0.ESC+"OB":s.C0.ESC+"[B";break;case 45:e.shiftKey||e.ctrlKey||(o.key=s.C0.ESC+"[2~");break;case 46:o.key=a?s.C0.ESC+"[3;"+(a+1)+"~":s.C0.ESC+"[3~";break;case 36:o.key=a?s.C0.ESC+"[1;"+(a+1)+"H":t?s.C0.ESC+"OH":s.C0.ESC+"[H";break;case 35:o.key=a?s.C0.ESC+"[1;"+(a+1)+"F":t?s.C0.ESC+"OF":s.C0.ESC+"[F";break;case 33:e.shiftKey?o.type=2:e.ctrlKey?o.key=s.C0.ESC+"[5;"+(a+1)+"~":o.key=s.C0.ESC+"[5~";break;case 34:e.shiftKey?o.type=3:e.ctrlKey?o.key=s.C0.ESC+"[6;"+(a+1)+"~":o.key=s.C0.ESC+"[6~";break;case 112:o.key=a?s.C0.ESC+"[1;"+(a+1)+"P":s.C0.ESC+"OP";break;case 113:o.key=a?s.C0.ESC+"[1;"+(a+1)+"Q":s.C0.ESC+"OQ";break;case 114:o.key=a?s.C0.ESC+"[1;"+(a+1)+"R":s.C0.ESC+"OR";break;case 115:o.key=a?s.C0.ESC+"[1;"+(a+1)+"S":s.C0.ESC+"OS";break;case 116:o.key=a?s.C0.ESC+"[15;"+(a+1)+"~":s.C0.ESC+"[15~";break;case 117:o.key=a?s.C0.ESC+"[17;"+(a+1)+"~":s.C0.ESC+"[17~";break;case 118:o.key=a?s.C0.ESC+"[18;"+(a+1)+"~":s.C0.ESC+"[18~";break;case 119:o.key=a?s.C0.ESC+"[19;"+(a+1)+"~":s.C0.ESC+"[19~";break;case 120:o.key=a?s.C0.ESC+"[20;"+(a+1)+"~":s.C0.ESC+"[20~";break;case 121:o.key=a?s.C0.ESC+"[21;"+(a+1)+"~":s.C0.ESC+"[21~";break;case 122:o.key=a?s.C0.ESC+"[23;"+(a+1)+"~":s.C0.ESC+"[23~";break;case 123:o.key=a?s.C0.ESC+"[24;"+(a+1)+"~":s.C0.ESC+"[24~";break;default:if(!e.ctrlKey||e.shiftKey||e.altKey||e.metaKey)if(i&&!n||!e.altKey||e.metaKey)!i||e.altKey||e.ctrlKey||e.shiftKey||!e.metaKey?e.key&&!e.ctrlKey&&!e.altKey&&!e.metaKey&&e.keyCode>=48&&1===e.key.length?o.key=e.key:e.key&&e.ctrlKey&&("_"===e.key&&(o.key=s.C0.US),"@"===e.key&&(o.key=s.C0.NUL)):65===e.keyCode&&(o.type=1);else{const t=r[e.keyCode],i=t?.[e.shiftKey?1:0];if(i)o.key=s.C0.ESC+i;else if(e.keyCode>=65&&e.keyCode<=90){const t=e.ctrlKey?e.keyCode-64:e.keyCode+32;let i=String.fromCharCode(t);e.shiftKey&&(i=i.toUpperCase()),o.key=s.C0.ESC+i}else if(32===e.keyCode)o.key=s.C0.ESC+(e.ctrlKey?s.C0.NUL:" ");else if("Dead"===e.key&&e.code.startsWith("Key")){let t=e.code.slice(3,4);e.shiftKey||(t=t.toLowerCase()),o.key=s.C0.ESC+t,o.cancel=!0}}else e.keyCode>=65&&e.keyCode<=90?o.key=String.fromCharCode(e.keyCode-64):32===e.keyCode?o.key=s.C0.NUL:e.keyCode>=51&&e.keyCode<=55?o.key=String.fromCharCode(e.keyCode-51+27):56===e.keyCode?o.key=s.C0.DEL:219===e.keyCode?o.key=s.C0.ESC:220===e.keyCode?o.key=s.C0.FS:221===e.keyCode&&(o.key=s.C0.GS)}return o}},482:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.Utf8ToUtf32=t.StringToUtf32=t.utf32ToString=t.stringFromCodePoint=void 0,t.stringFromCodePoint=function(e){return e>65535?(e-=65536,String.fromCharCode(55296+(e>>10))+String.fromCharCode(e%1024+56320)):String.fromCharCode(e)},t.utf32ToString=function(e,t=0,i=e.length){let s="";for(let r=t;r<i;++r){let t=e[r];t>65535?(t-=65536,s+=String.fromCharCode(55296+(t>>10))+String.fromCharCode(t%1024+56320)):s+=String.fromCharCode(t)}return s},t.StringToUtf32=class{constructor(){this._interim=0}clear(){this._interim=0}decode(e,t){const i=e.length;if(!i)return 0;let s=0,r=0;if(this._interim){const i=e.charCodeAt(r++);56320<=i&&i<=57343?t[s++]=1024*(this._interim-55296)+i-56320+65536:(t[s++]=this._interim,t[s++]=i),this._interim=0}for(let n=r;n<i;++n){const r=e.charCodeAt(n);if(55296<=r&&r<=56319){if(++n>=i)return this._interim=r,s;const o=e.charCodeAt(n);56320<=o&&o<=57343?t[s++]=1024*(r-55296)+o-56320+65536:(t[s++]=r,t[s++]=o)}else 65279!==r&&(t[s++]=r)}return s}},t.Utf8ToUtf32=class{constructor(){this.interim=new Uint8Array(3)}clear(){this.interim.fill(0)}decode(e,t){const i=e.length;if(!i)return 0;let s,r,n,o,a=0,h=0,c=0;if(this.interim[0]){let s=!1,r=this.interim[0];r&=192==(224&r)?31:224==(240&r)?15:7;let n,o=0;for(;(n=63&this.interim[++o])&&o<4;)r<<=6,r|=n;const h=192==(224&this.interim[0])?2:224==(240&this.interim[0])?3:4,l=h-o;for(;c<l;){if(c>=i)return 0;if(n=e[c++],128!=(192&n)){c--,s=!0;break}this.interim[o++]=n,r<<=6,r|=63&n}s||(2===h?r<128?c--:t[a++]=r:3===h?r<2048||r>=55296&&r<=57343||65279===r||(t[a++]=r):r<65536||r>1114111||(t[a++]=r)),this.interim.fill(0)}const l=i-4;let d=c;for(;d<i;){for(;!(!(d<l)||128&(s=e[d])||128&(r=e[d+1])||128&(n=e[d+2])||128&(o=e[d+3]));)t[a++]=s,t[a++]=r,t[a++]=n,t[a++]=o,d+=4;if(s=e[d++],s<128)t[a++]=s;else if(192==(224&s)){if(d>=i)return this.interim[0]=s,a;if(r=e[d++],128!=(192&r)){d--;continue}if(h=(31&s)<<6|63&r,h<128){d--;continue}t[a++]=h}else if(224==(240&s)){if(d>=i)return this.interim[0]=s,a;if(r=e[d++],128!=(192&r)){d--;continue}if(d>=i)return this.interim[0]=s,this.interim[1]=r,a;if(n=e[d++],128!=(192&n)){d--;continue}if(h=(15&s)<<12|(63&r)<<6|63&n,h<2048||h>=55296&&h<=57343||65279===h)continue;t[a++]=h}else if(240==(248&s)){if(d>=i)return this.interim[0]=s,a;if(r=e[d++],128!=(192&r)){d--;continue}if(d>=i)return this.interim[0]=s,this.interim[1]=r,a;if(n=e[d++],128!=(192&n)){d--;continue}if(d>=i)return this.interim[0]=s,this.interim[1]=r,this.interim[2]=n,a;if(o=e[d++],128!=(192&o)){d--;continue}if(h=(7&s)<<18|(63&r)<<12|(63&n)<<6|63&o,h<65536||h>1114111)continue;t[a++]=h}}return a}}},225:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.UnicodeV6=void 0;const s=i(1480),r=[[768,879],[1155,1158],[1160,1161],[1425,1469],[1471,1471],[1473,1474],[1476,1477],[1479,1479],[1536,1539],[1552,1557],[1611,1630],[1648,1648],[1750,1764],[1767,1768],[1770,1773],[1807,1807],[1809,1809],[1840,1866],[1958,1968],[2027,2035],[2305,2306],[2364,2364],[2369,2376],[2381,2381],[2385,2388],[2402,2403],[2433,2433],[2492,2492],[2497,2500],[2509,2509],[2530,2531],[2561,2562],[2620,2620],[2625,2626],[2631,2632],[2635,2637],[2672,2673],[2689,2690],[2748,2748],[2753,2757],[2759,2760],[2765,2765],[2786,2787],[2817,2817],[2876,2876],[2879,2879],[2881,2883],[2893,2893],[2902,2902],[2946,2946],[3008,3008],[3021,3021],[3134,3136],[3142,3144],[3146,3149],[3157,3158],[3260,3260],[3263,3263],[3270,3270],[3276,3277],[3298,3299],[3393,3395],[3405,3405],[3530,3530],[3538,3540],[3542,3542],[3633,3633],[3636,3642],[3655,3662],[3761,3761],[3764,3769],[3771,3772],[3784,3789],[3864,3865],[3893,3893],[3895,3895],[3897,3897],[3953,3966],[3968,3972],[3974,3975],[3984,3991],[3993,4028],[4038,4038],[4141,4144],[4146,4146],[4150,4151],[4153,4153],[4184,4185],[4448,4607],[4959,4959],[5906,5908],[5938,5940],[5970,5971],[6002,6003],[6068,6069],[6071,6077],[6086,6086],[6089,6099],[6109,6109],[6155,6157],[6313,6313],[6432,6434],[6439,6440],[6450,6450],[6457,6459],[6679,6680],[6912,6915],[6964,6964],[6966,6970],[6972,6972],[6978,6978],[7019,7027],[7616,7626],[7678,7679],[8203,8207],[8234,8238],[8288,8291],[8298,8303],[8400,8431],[12330,12335],[12441,12442],[43014,43014],[43019,43019],[43045,43046],[64286,64286],[65024,65039],[65056,65059],[65279,65279],[65529,65531]],n=[[68097,68099],[68101,68102],[68108,68111],[68152,68154],[68159,68159],[119143,119145],[119155,119170],[119173,119179],[119210,119213],[119362,119364],[917505,917505],[917536,917631],[917760,917999]];let o;t.UnicodeV6=class{constructor(){if(this.version="6",!o){o=new Uint8Array(65536),o.fill(1),o[0]=0,o.fill(0,1,32),o.fill(0,127,160),o.fill(2,4352,4448),o[9001]=2,o[9002]=2,o.fill(2,11904,42192),o[12351]=1,o.fill(2,44032,55204),o.fill(2,63744,64256),o.fill(2,65040,65050),o.fill(2,65072,65136),o.fill(2,65280,65377),o.fill(2,65504,65511);for(let e=0;e<r.length;++e)o.fill(0,r[e][0],r[e][1]+1)}}wcwidth(e){return e<32?0:e<127?1:e<65536?o[e]:function(e,t){let i,s=0,r=t.length-1;if(e<t[0][0]||e>t[r][1])return!1;for(;r>=s;)if(i=s+r>>1,e>t[i][1])s=i+1;else{if(!(e<t[i][0]))return!0;r=i-1}return!1}(e,n)?0:e>=131072&&e<=196605||e>=196608&&e<=262141?2:1}charProperties(e,t){let i=this.wcwidth(e),r=0===i&&0!==t;if(r){const e=s.UnicodeService.extractWidth(t);0===e?r=!1:e>i&&(i=e)}return s.UnicodeService.createPropertyValue(0,i,r)}}},5981:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.WriteBuffer=void 0;const s=i(8460),r=i(844);class n extends r.Disposable{constructor(e){super(),this._action=e,this._writeBuffer=[],this._callbacks=[],this._pendingData=0,this._bufferOffset=0,this._isSyncWriting=!1,this._syncCalls=0,this._didUserInput=!1,this._onWriteParsed=this.register(new s.EventEmitter),this.onWriteParsed=this._onWriteParsed.event}handleUserInput(){this._didUserInput=!0}writeSync(e,t){if(void 0!==t&&this._syncCalls>t)return void(this._syncCalls=0);if(this._pendingData+=e.length,this._writeBuffer.push(e),this._callbacks.push(void 0),this._syncCalls++,this._isSyncWriting)return;let i;for(this._isSyncWriting=!0;i=this._writeBuffer.shift();){this._action(i);const e=this._callbacks.shift();e&&e()}this._pendingData=0,this._bufferOffset=2147483647,this._isSyncWriting=!1,this._syncCalls=0}write(e,t){if(this._pendingData>5e7)throw new Error("write data discarded, use flow control to avoid losing data");if(!this._writeBuffer.length){if(this._bufferOffset=0,this._didUserInput)return this._didUserInput=!1,this._pendingData+=e.length,this._writeBuffer.push(e),this._callbacks.push(t),void this._innerWrite();setTimeout((()=>this._innerWrite()))}this._pendingData+=e.length,this._writeBuffer.push(e),this._callbacks.push(t)}_innerWrite(e=0,t=!0){const i=e||Date.now();for(;this._writeBuffer.length>this._bufferOffset;){const e=this._writeBuffer[this._bufferOffset],s=this._action(e,t);if(s){const e=e=>Date.now()-i>=12?setTimeout((()=>this._innerWrite(0,e))):this._innerWrite(i,e);return void s.catch((e=>(queueMicrotask((()=>{throw e})),Promise.resolve(!1)))).then(e)}const r=this._callbacks[this._bufferOffset];if(r&&r(),this._bufferOffset++,this._pendingData-=e.length,Date.now()-i>=12)break}this._writeBuffer.length>this._bufferOffset?(this._bufferOffset>50&&(this._writeBuffer=this._writeBuffer.slice(this._bufferOffset),this._callbacks=this._callbacks.slice(this._bufferOffset),this._bufferOffset=0),setTimeout((()=>this._innerWrite()))):(this._writeBuffer.length=0,this._callbacks.length=0,this._pendingData=0,this._bufferOffset=0),this._onWriteParsed.fire()}}t.WriteBuffer=n},5941:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.toRgbString=t.parseColor=void 0;const i=/^([\da-f])\/([\da-f])\/([\da-f])$|^([\da-f]{2})\/([\da-f]{2})\/([\da-f]{2})$|^([\da-f]{3})\/([\da-f]{3})\/([\da-f]{3})$|^([\da-f]{4})\/([\da-f]{4})\/([\da-f]{4})$/,s=/^[\da-f]+$/;function r(e,t){const i=e.toString(16),s=i.length<2?"0"+i:i;switch(t){case 4:return i[0];case 8:return s;case 12:return(s+s).slice(0,3);default:return s+s}}t.parseColor=function(e){if(!e)return;let t=e.toLowerCase();if(0===t.indexOf("rgb:")){t=t.slice(4);const e=i.exec(t);if(e){const t=e[1]?15:e[4]?255:e[7]?4095:65535;return[Math.round(parseInt(e[1]||e[4]||e[7]||e[10],16)/t*255),Math.round(parseInt(e[2]||e[5]||e[8]||e[11],16)/t*255),Math.round(parseInt(e[3]||e[6]||e[9]||e[12],16)/t*255)]}}else if(0===t.indexOf("#")&&(t=t.slice(1),s.exec(t)&&[3,6,9,12].includes(t.length))){const e=t.length/3,i=[0,0,0];for(let s=0;s<3;++s){const r=parseInt(t.slice(e*s,e*s+e),16);i[s]=1===e?r<<4:2===e?r:3===e?r>>4:r>>8}return i}},t.toRgbString=function(e,t=16){const[i,s,n]=e;return`rgb:${r(i,t)}/${r(s,t)}/${r(n,t)}`}},5770:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.PAYLOAD_LIMIT=void 0,t.PAYLOAD_LIMIT=1e7},6351:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.DcsHandler=t.DcsParser=void 0;const s=i(482),r=i(8742),n=i(5770),o=[];t.DcsParser=class{constructor(){this._handlers=Object.create(null),this._active=o,this._ident=0,this._handlerFb=()=>{},this._stack={paused:!1,loopPosition:0,fallThrough:!1}}dispose(){this._handlers=Object.create(null),this._handlerFb=()=>{},this._active=o}registerHandler(e,t){void 0===this._handlers[e]&&(this._handlers[e]=[]);const i=this._handlers[e];return i.push(t),{dispose:()=>{const e=i.indexOf(t);-1!==e&&i.splice(e,1)}}}clearHandler(e){this._handlers[e]&&delete this._handlers[e]}setHandlerFallback(e){this._handlerFb=e}reset(){if(this._active.length)for(let e=this._stack.paused?this._stack.loopPosition-1:this._active.length-1;e>=0;--e)this._active[e].unhook(!1);this._stack.paused=!1,this._active=o,this._ident=0}hook(e,t){if(this.reset(),this._ident=e,this._active=this._handlers[e]||o,this._active.length)for(let e=this._active.length-1;e>=0;e--)this._active[e].hook(t);else this._handlerFb(this._ident,"HOOK",t)}put(e,t,i){if(this._active.length)for(let s=this._active.length-1;s>=0;s--)this._active[s].put(e,t,i);else this._handlerFb(this._ident,"PUT",(0,s.utf32ToString)(e,t,i))}unhook(e,t=!0){if(this._active.length){let i=!1,s=this._active.length-1,r=!1;if(this._stack.paused&&(s=this._stack.loopPosition-1,i=t,r=this._stack.fallThrough,this._stack.paused=!1),!r&&!1===i){for(;s>=0&&(i=this._active[s].unhook(e),!0!==i);s--)if(i instanceof Promise)return this._stack.paused=!0,this._stack.loopPosition=s,this._stack.fallThrough=!1,i;s--}for(;s>=0;s--)if(i=this._active[s].unhook(!1),i instanceof Promise)return this._stack.paused=!0,this._stack.loopPosition=s,this._stack.fallThrough=!0,i}else this._handlerFb(this._ident,"UNHOOK",e);this._active=o,this._ident=0}};const a=new r.Params;a.addParam(0),t.DcsHandler=class{constructor(e){this._handler=e,this._data="",this._params=a,this._hitLimit=!1}hook(e){this._params=e.length>1||e.params[0]?e.clone():a,this._data="",this._hitLimit=!1}put(e,t,i){this._hitLimit||(this._data+=(0,s.utf32ToString)(e,t,i),this._data.length>n.PAYLOAD_LIMIT&&(this._data="",this._hitLimit=!0))}unhook(e){let t=!1;if(this._hitLimit)t=!1;else if(e&&(t=this._handler(this._data,this._params),t instanceof Promise))return t.then((e=>(this._params=a,this._data="",this._hitLimit=!1,e)));return this._params=a,this._data="",this._hitLimit=!1,t}}},2015:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.EscapeSequenceParser=t.VT500_TRANSITION_TABLE=t.TransitionTable=void 0;const s=i(844),r=i(8742),n=i(6242),o=i(6351);class a{constructor(e){this.table=new Uint8Array(e)}setDefault(e,t){this.table.fill(e<<4|t)}add(e,t,i,s){this.table[t<<8|e]=i<<4|s}addMany(e,t,i,s){for(let r=0;r<e.length;r++)this.table[t<<8|e[r]]=i<<4|s}}t.TransitionTable=a;const h=160;t.VT500_TRANSITION_TABLE=function(){const e=new a(4095),t=Array.apply(null,Array(256)).map(((e,t)=>t)),i=(e,i)=>t.slice(e,i),s=i(32,127),r=i(0,24);r.push(25),r.push.apply(r,i(28,32));const n=i(0,14);let o;for(o in e.setDefault(1,0),e.addMany(s,0,2,0),n)e.addMany([24,26,153,154],o,3,0),e.addMany(i(128,144),o,3,0),e.addMany(i(144,152),o,3,0),e.add(156,o,0,0),e.add(27,o,11,1),e.add(157,o,4,8),e.addMany([152,158,159],o,0,7),e.add(155,o,11,3),e.add(144,o,11,9);return e.addMany(r,0,3,0),e.addMany(r,1,3,1),e.add(127,1,0,1),e.addMany(r,8,0,8),e.addMany(r,3,3,3),e.add(127,3,0,3),e.addMany(r,4,3,4),e.add(127,4,0,4),e.addMany(r,6,3,6),e.addMany(r,5,3,5),e.add(127,5,0,5),e.addMany(r,2,3,2),e.add(127,2,0,2),e.add(93,1,4,8),e.addMany(s,8,5,8),e.add(127,8,5,8),e.addMany([156,27,24,26,7],8,6,0),e.addMany(i(28,32),8,0,8),e.addMany([88,94,95],1,0,7),e.addMany(s,7,0,7),e.addMany(r,7,0,7),e.add(156,7,0,0),e.add(127,7,0,7),e.add(91,1,11,3),e.addMany(i(64,127),3,7,0),e.addMany(i(48,60),3,8,4),e.addMany([60,61,62,63],3,9,4),e.addMany(i(48,60),4,8,4),e.addMany(i(64,127),4,7,0),e.addMany([60,61,62,63],4,0,6),e.addMany(i(32,64),6,0,6),e.add(127,6,0,6),e.addMany(i(64,127),6,0,0),e.addMany(i(32,48),3,9,5),e.addMany(i(32,48),5,9,5),e.addMany(i(48,64),5,0,6),e.addMany(i(64,127),5,7,0),e.addMany(i(32,48),4,9,5),e.addMany(i(32,48),1,9,2),e.addMany(i(32,48),2,9,2),e.addMany(i(48,127),2,10,0),e.addMany(i(48,80),1,10,0),e.addMany(i(81,88),1,10,0),e.addMany([89,90,92],1,10,0),e.addMany(i(96,127),1,10,0),e.add(80,1,11,9),e.addMany(r,9,0,9),e.add(127,9,0,9),e.addMany(i(28,32),9,0,9),e.addMany(i(32,48),9,9,12),e.addMany(i(48,60),9,8,10),e.addMany([60,61,62,63],9,9,10),e.addMany(r,11,0,11),e.addMany(i(32,128),11,0,11),e.addMany(i(28,32),11,0,11),e.addMany(r,10,0,10),e.add(127,10,0,10),e.addMany(i(28,32),10,0,10),e.addMany(i(48,60),10,8,10),e.addMany([60,61,62,63],10,0,11),e.addMany(i(32,48),10,9,12),e.addMany(r,12,0,12),e.add(127,12,0,12),e.addMany(i(28,32),12,0,12),e.addMany(i(32,48),12,9,12),e.addMany(i(48,64),12,0,11),e.addMany(i(64,127),12,12,13),e.addMany(i(64,127),10,12,13),e.addMany(i(64,127),9,12,13),e.addMany(r,13,13,13),e.addMany(s,13,13,13),e.add(127,13,0,13),e.addMany([27,156,24,26],13,14,0),e.add(h,0,2,0),e.add(h,8,5,8),e.add(h,6,0,6),e.add(h,11,0,11),e.add(h,13,13,13),e}();class c extends s.Disposable{constructor(e=t.VT500_TRANSITION_TABLE){super(),this._transitions=e,this._parseStack={state:0,handlers:[],handlerPos:0,transition:0,chunkPos:0},this.initialState=0,this.currentState=this.initialState,this._params=new r.Params,this._params.addParam(0),this._collect=0,this.precedingJoinState=0,this._printHandlerFb=(e,t,i)=>{},this._executeHandlerFb=e=>{},this._csiHandlerFb=(e,t)=>{},this._escHandlerFb=e=>{},this._errorHandlerFb=e=>e,this._printHandler=this._printHandlerFb,this._executeHandlers=Object.create(null),this._csiHandlers=Object.create(null),this._escHandlers=Object.create(null),this.register((0,s.toDisposable)((()=>{this._csiHandlers=Object.create(null),this._executeHandlers=Object.create(null),this._escHandlers=Object.create(null)}))),this._oscParser=this.register(new n.OscParser),this._dcsParser=this.register(new o.DcsParser),this._errorHandler=this._errorHandlerFb,this.registerEscHandler({final:"\\"},(()=>!0))}_identifier(e,t=[64,126]){let i=0;if(e.prefix){if(e.prefix.length>1)throw new Error("only one byte as prefix supported");if(i=e.prefix.charCodeAt(0),i&&60>i||i>63)throw new Error("prefix must be in range 0x3c .. 0x3f")}if(e.intermediates){if(e.intermediates.length>2)throw new Error("only two bytes as intermediates are supported");for(let t=0;t<e.intermediates.length;++t){const s=e.intermediates.charCodeAt(t);if(32>s||s>47)throw new Error("intermediate must be in range 0x20 .. 0x2f");i<<=8,i|=s}}if(1!==e.final.length)throw new Error("final must be a single byte");const s=e.final.charCodeAt(0);if(t[0]>s||s>t[1])throw new Error(`final must be in range ${t[0]} .. ${t[1]}`);return i<<=8,i|=s,i}identToString(e){const t=[];for(;e;)t.push(String.fromCharCode(255&e)),e>>=8;return t.reverse().join("")}setPrintHandler(e){this._printHandler=e}clearPrintHandler(){this._printHandler=this._printHandlerFb}registerEscHandler(e,t){const i=this._identifier(e,[48,126]);void 0===this._escHandlers[i]&&(this._escHandlers[i]=[]);const s=this._escHandlers[i];return s.push(t),{dispose:()=>{const e=s.indexOf(t);-1!==e&&s.splice(e,1)}}}clearEscHandler(e){this._escHandlers[this._identifier(e,[48,126])]&&delete this._escHandlers[this._identifier(e,[48,126])]}setEscHandlerFallback(e){this._escHandlerFb=e}setExecuteHandler(e,t){this._executeHandlers[e.charCodeAt(0)]=t}clearExecuteHandler(e){this._executeHandlers[e.charCodeAt(0)]&&delete this._executeHandlers[e.charCodeAt(0)]}setExecuteHandlerFallback(e){this._executeHandlerFb=e}registerCsiHandler(e,t){const i=this._identifier(e);void 0===this._csiHandlers[i]&&(this._csiHandlers[i]=[]);const s=this._csiHandlers[i];return s.push(t),{dispose:()=>{const e=s.indexOf(t);-1!==e&&s.splice(e,1)}}}clearCsiHandler(e){this._csiHandlers[this._identifier(e)]&&delete this._csiHandlers[this._identifier(e)]}setCsiHandlerFallback(e){this._csiHandlerFb=e}registerDcsHandler(e,t){return this._dcsParser.registerHandler(this._identifier(e),t)}clearDcsHandler(e){this._dcsParser.clearHandler(this._identifier(e))}setDcsHandlerFallback(e){this._dcsParser.setHandlerFallback(e)}registerOscHandler(e,t){return this._oscParser.registerHandler(e,t)}clearOscHandler(e){this._oscParser.clearHandler(e)}setOscHandlerFallback(e){this._oscParser.setHandlerFallback(e)}setErrorHandler(e){this._errorHandler=e}clearErrorHandler(){this._errorHandler=this._errorHandlerFb}reset(){this.currentState=this.initialState,this._oscParser.reset(),this._dcsParser.reset(),this._params.reset(),this._params.addParam(0),this._collect=0,this.precedingJoinState=0,0!==this._parseStack.state&&(this._parseStack.state=2,this._parseStack.handlers=[])}_preserveStack(e,t,i,s,r){this._parseStack.state=e,this._parseStack.handlers=t,this._parseStack.handlerPos=i,this._parseStack.transition=s,this._parseStack.chunkPos=r}parse(e,t,i){let s,r=0,n=0,o=0;if(this._parseStack.state)if(2===this._parseStack.state)this._parseStack.state=0,o=this._parseStack.chunkPos+1;else{if(void 0===i||1===this._parseStack.state)throw this._parseStack.state=1,new Error("improper continuation due to previous async handler, giving up parsing");const t=this._parseStack.handlers;let n=this._parseStack.handlerPos-1;switch(this._parseStack.state){case 3:if(!1===i&&n>-1)for(;n>=0&&(s=t[n](this._params),!0!==s);n--)if(s instanceof Promise)return this._parseStack.handlerPos=n,s;this._parseStack.handlers=[];break;case 4:if(!1===i&&n>-1)for(;n>=0&&(s=t[n](),!0!==s);n--)if(s instanceof Promise)return this._parseStack.handlerPos=n,s;this._parseStack.handlers=[];break;case 6:if(r=e[this._parseStack.chunkPos],s=this._dcsParser.unhook(24!==r&&26!==r,i),s)return s;27===r&&(this._parseStack.transition|=1),this._params.reset(),this._params.addParam(0),this._collect=0;break;case 5:if(r=e[this._parseStack.chunkPos],s=this._oscParser.end(24!==r&&26!==r,i),s)return s;27===r&&(this._parseStack.transition|=1),this._params.reset(),this._params.addParam(0),this._collect=0}this._parseStack.state=0,o=this._parseStack.chunkPos+1,this.precedingJoinState=0,this.currentState=15&this._parseStack.transition}for(let i=o;i<t;++i){switch(r=e[i],n=this._transitions.table[this.currentState<<8|(r<160?r:h)],n>>4){case 2:for(let s=i+1;;++s){if(s>=t||(r=e[s])<32||r>126&&r<h){this._printHandler(e,i,s),i=s-1;break}if(++s>=t||(r=e[s])<32||r>126&&r<h){this._printHandler(e,i,s),i=s-1;break}if(++s>=t||(r=e[s])<32||r>126&&r<h){this._printHandler(e,i,s),i=s-1;break}if(++s>=t||(r=e[s])<32||r>126&&r<h){this._printHandler(e,i,s),i=s-1;break}}break;case 3:this._executeHandlers[r]?this._executeHandlers[r]():this._executeHandlerFb(r),this.precedingJoinState=0;break;case 0:break;case 1:if(this._errorHandler({position:i,code:r,currentState:this.currentState,collect:this._collect,params:this._params,abort:!1}).abort)return;break;case 7:const o=this._csiHandlers[this._collect<<8|r];let a=o?o.length-1:-1;for(;a>=0&&(s=o[a](this._params),!0!==s);a--)if(s instanceof Promise)return this._preserveStack(3,o,a,n,i),s;a<0&&this._csiHandlerFb(this._collect<<8|r,this._params),this.precedingJoinState=0;break;case 8:do{switch(r){case 59:this._params.addParam(0);break;case 58:this._params.addSubParam(-1);break;default:this._params.addDigit(r-48)}}while(++i<t&&(r=e[i])>47&&r<60);i--;break;case 9:this._collect<<=8,this._collect|=r;break;case 10:const c=this._escHandlers[this._collect<<8|r];let l=c?c.length-1:-1;for(;l>=0&&(s=c[l](),!0!==s);l--)if(s instanceof Promise)return this._preserveStack(4,c,l,n,i),s;l<0&&this._escHandlerFb(this._collect<<8|r),this.precedingJoinState=0;break;case 11:this._params.reset(),this._params.addParam(0),this._collect=0;break;case 12:this._dcsParser.hook(this._collect<<8|r,this._params);break;case 13:for(let s=i+1;;++s)if(s>=t||24===(r=e[s])||26===r||27===r||r>127&&r<h){this._dcsParser.put(e,i,s),i=s-1;break}break;case 14:if(s=this._dcsParser.unhook(24!==r&&26!==r),s)return this._preserveStack(6,[],0,n,i),s;27===r&&(n|=1),this._params.reset(),this._params.addParam(0),this._collect=0,this.precedingJoinState=0;break;case 4:this._oscParser.start();break;case 5:for(let s=i+1;;s++)if(s>=t||(r=e[s])<32||r>127&&r<h){this._oscParser.put(e,i,s),i=s-1;break}break;case 6:if(s=this._oscParser.end(24!==r&&26!==r),s)return this._preserveStack(5,[],0,n,i),s;27===r&&(n|=1),this._params.reset(),this._params.addParam(0),this._collect=0,this.precedingJoinState=0}this.currentState=15&n}}}t.EscapeSequenceParser=c},6242:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.OscHandler=t.OscParser=void 0;const s=i(5770),r=i(482),n=[];t.OscParser=class{constructor(){this._state=0,this._active=n,this._id=-1,this._handlers=Object.create(null),this._handlerFb=()=>{},this._stack={paused:!1,loopPosition:0,fallThrough:!1}}registerHandler(e,t){void 0===this._handlers[e]&&(this._handlers[e]=[]);const i=this._handlers[e];return i.push(t),{dispose:()=>{const e=i.indexOf(t);-1!==e&&i.splice(e,1)}}}clearHandler(e){this._handlers[e]&&delete this._handlers[e]}setHandlerFallback(e){this._handlerFb=e}dispose(){this._handlers=Object.create(null),this._handlerFb=()=>{},this._active=n}reset(){if(2===this._state)for(let e=this._stack.paused?this._stack.loopPosition-1:this._active.length-1;e>=0;--e)this._active[e].end(!1);this._stack.paused=!1,this._active=n,this._id=-1,this._state=0}_start(){if(this._active=this._handlers[this._id]||n,this._active.length)for(let e=this._active.length-1;e>=0;e--)this._active[e].start();else this._handlerFb(this._id,"START")}_put(e,t,i){if(this._active.length)for(let s=this._active.length-1;s>=0;s--)this._active[s].put(e,t,i);else this._handlerFb(this._id,"PUT",(0,r.utf32ToString)(e,t,i))}start(){this.reset(),this._state=1}put(e,t,i){if(3!==this._state){if(1===this._state)for(;t<i;){const i=e[t++];if(59===i){this._state=2,this._start();break}if(i<48||57<i)return void(this._state=3);-1===this._id&&(this._id=0),this._id=10*this._id+i-48}2===this._state&&i-t>0&&this._put(e,t,i)}}end(e,t=!0){if(0!==this._state){if(3!==this._state)if(1===this._state&&this._start(),this._active.length){let i=!1,s=this._active.length-1,r=!1;if(this._stack.paused&&(s=this._stack.loopPosition-1,i=t,r=this._stack.fallThrough,this._stack.paused=!1),!r&&!1===i){for(;s>=0&&(i=this._active[s].end(e),!0!==i);s--)if(i instanceof Promise)return this._stack.paused=!0,this._stack.loopPosition=s,this._stack.fallThrough=!1,i;s--}for(;s>=0;s--)if(i=this._active[s].end(!1),i instanceof Promise)return this._stack.paused=!0,this._stack.loopPosition=s,this._stack.fallThrough=!0,i}else this._handlerFb(this._id,"END",e);this._active=n,this._id=-1,this._state=0}}},t.OscHandler=class{constructor(e){this._handler=e,this._data="",this._hitLimit=!1}start(){this._data="",this._hitLimit=!1}put(e,t,i){this._hitLimit||(this._data+=(0,r.utf32ToString)(e,t,i),this._data.length>s.PAYLOAD_LIMIT&&(this._data="",this._hitLimit=!0))}end(e){let t=!1;if(this._hitLimit)t=!1;else if(e&&(t=this._handler(this._data),t instanceof Promise))return t.then((e=>(this._data="",this._hitLimit=!1,e)));return this._data="",this._hitLimit=!1,t}}},8742:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.Params=void 0;const i=2147483647;class s{static fromArray(e){const t=new s;if(!e.length)return t;for(let i=Array.isArray(e[0])?1:0;i<e.length;++i){const s=e[i];if(Array.isArray(s))for(let e=0;e<s.length;++e)t.addSubParam(s[e]);else t.addParam(s)}return t}constructor(e=32,t=32){if(this.maxLength=e,this.maxSubParamsLength=t,t>256)throw new Error("maxSubParamsLength must not be greater than 256");this.params=new Int32Array(e),this.length=0,this._subParams=new Int32Array(t),this._subParamsLength=0,this._subParamsIdx=new Uint16Array(e),this._rejectDigits=!1,this._rejectSubDigits=!1,this._digitIsSub=!1}clone(){const e=new s(this.maxLength,this.maxSubParamsLength);return e.params.set(this.params),e.length=this.length,e._subParams.set(this._subParams),e._subParamsLength=this._subParamsLength,e._subParamsIdx.set(this._subParamsIdx),e._rejectDigits=this._rejectDigits,e._rejectSubDigits=this._rejectSubDigits,e._digitIsSub=this._digitIsSub,e}toArray(){const e=[];for(let t=0;t<this.length;++t){e.push(this.params[t]);const i=this._subParamsIdx[t]>>8,s=255&this._subParamsIdx[t];s-i>0&&e.push(Array.prototype.slice.call(this._subParams,i,s))}return e}reset(){this.length=0,this._subParamsLength=0,this._rejectDigits=!1,this._rejectSubDigits=!1,this._digitIsSub=!1}addParam(e){if(this._digitIsSub=!1,this.length>=this.maxLength)this._rejectDigits=!0;else{if(e<-1)throw new Error("values lesser than -1 are not allowed");this._subParamsIdx[this.length]=this._subParamsLength<<8|this._subParamsLength,this.params[this.length++]=e>i?i:e}}addSubParam(e){if(this._digitIsSub=!0,this.length)if(this._rejectDigits||this._subParamsLength>=this.maxSubParamsLength)this._rejectSubDigits=!0;else{if(e<-1)throw new Error("values lesser than -1 are not allowed");this._subParams[this._subParamsLength++]=e>i?i:e,this._subParamsIdx[this.length-1]++}}hasSubParams(e){return(255&this._subParamsIdx[e])-(this._subParamsIdx[e]>>8)>0}getSubParams(e){const t=this._subParamsIdx[e]>>8,i=255&this._subParamsIdx[e];return i-t>0?this._subParams.subarray(t,i):null}getSubParamsAll(){const e={};for(let t=0;t<this.length;++t){const i=this._subParamsIdx[t]>>8,s=255&this._subParamsIdx[t];s-i>0&&(e[t]=this._subParams.slice(i,s))}return e}addDigit(e){let t;if(this._rejectDigits||!(t=this._digitIsSub?this._subParamsLength:this.length)||this._digitIsSub&&this._rejectSubDigits)return;const s=this._digitIsSub?this._subParams:this.params,r=s[t-1];s[t-1]=~r?Math.min(10*r+e,i):e}}t.Params=s},5741:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.AddonManager=void 0,t.AddonManager=class{constructor(){this._addons=[]}dispose(){for(let e=this._addons.length-1;e>=0;e--)this._addons[e].instance.dispose()}loadAddon(e,t){const i={instance:t,dispose:t.dispose,isDisposed:!1};this._addons.push(i),t.dispose=()=>this._wrappedAddonDispose(i),t.activate(e)}_wrappedAddonDispose(e){if(e.isDisposed)return;let t=-1;for(let i=0;i<this._addons.length;i++)if(this._addons[i]===e){t=i;break}if(-1===t)throw new Error("Could not dispose an addon that has not been loaded");e.isDisposed=!0,e.dispose.apply(e.instance),this._addons.splice(t,1)}}},8771:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.BufferApiView=void 0;const s=i(3785),r=i(511);t.BufferApiView=class{constructor(e,t){this._buffer=e,this.type=t}init(e){return this._buffer=e,this}get cursorY(){return this._buffer.y}get cursorX(){return this._buffer.x}get viewportY(){return this._buffer.ydisp}get baseY(){return this._buffer.ybase}get length(){return this._buffer.lines.length}getLine(e){const t=this._buffer.lines.get(e);if(t)return new s.BufferLineApiView(t)}getNullCell(){return new r.CellData}}},3785:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.BufferLineApiView=void 0;const s=i(511);t.BufferLineApiView=class{constructor(e){this._line=e}get isWrapped(){return this._line.isWrapped}get length(){return this._line.length}getCell(e,t){if(!(e<0||e>=this._line.length))return t?(this._line.loadCell(e,t),t):this._line.loadCell(e,new s.CellData)}translateToString(e,t,i){return this._line.translateToString(e,t,i)}}},8285:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.BufferNamespaceApi=void 0;const s=i(8771),r=i(8460),n=i(844);class o extends n.Disposable{constructor(e){super(),this._core=e,this._onBufferChange=this.register(new r.EventEmitter),this.onBufferChange=this._onBufferChange.event,this._normal=new s.BufferApiView(this._core.buffers.normal,"normal"),this._alternate=new s.BufferApiView(this._core.buffers.alt,"alternate"),this._core.buffers.onBufferActivate((()=>this._onBufferChange.fire(this.active)))}get active(){if(this._core.buffers.active===this._core.buffers.normal)return this.normal;if(this._core.buffers.active===this._core.buffers.alt)return this.alternate;throw new Error("Active buffer is neither normal nor alternate")}get normal(){return this._normal.init(this._core.buffers.normal)}get alternate(){return this._alternate.init(this._core.buffers.alt)}}t.BufferNamespaceApi=o},7975:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.ParserApi=void 0,t.ParserApi=class{constructor(e){this._core=e}registerCsiHandler(e,t){return this._core.registerCsiHandler(e,(e=>t(e.toArray())))}addCsiHandler(e,t){return this.registerCsiHandler(e,t)}registerDcsHandler(e,t){return this._core.registerDcsHandler(e,((e,i)=>t(e,i.toArray())))}addDcsHandler(e,t){return this.registerDcsHandler(e,t)}registerEscHandler(e,t){return this._core.registerEscHandler(e,t)}addEscHandler(e,t){return this.registerEscHandler(e,t)}registerOscHandler(e,t){return this._core.registerOscHandler(e,t)}addOscHandler(e,t){return this.registerOscHandler(e,t)}}},7090:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.UnicodeApi=void 0,t.UnicodeApi=class{constructor(e){this._core=e}register(e){this._core.unicodeService.register(e)}get versions(){return this._core.unicodeService.versions}get activeVersion(){return this._core.unicodeService.activeVersion}set activeVersion(e){this._core.unicodeService.activeVersion=e}}},744:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.BufferService=t.MINIMUM_ROWS=t.MINIMUM_COLS=void 0;const n=i(8460),o=i(844),a=i(5295),h=i(2585);t.MINIMUM_COLS=2,t.MINIMUM_ROWS=1;let c=t.BufferService=class extends o.Disposable{get buffer(){return this.buffers.active}constructor(e){super(),this.isUserScrolling=!1,this._onResize=this.register(new n.EventEmitter),this.onResize=this._onResize.event,this._onScroll=this.register(new n.EventEmitter),this.onScroll=this._onScroll.event,this.cols=Math.max(e.rawOptions.cols||0,t.MINIMUM_COLS),this.rows=Math.max(e.rawOptions.rows||0,t.MINIMUM_ROWS),this.buffers=this.register(new a.BufferSet(e,this))}resize(e,t){this.cols=e,this.rows=t,this.buffers.resize(e,t),this._onResize.fire({cols:e,rows:t})}reset(){this.buffers.reset(),this.isUserScrolling=!1}scroll(e,t=!1){const i=this.buffer;let s;s=this._cachedBlankLine,s&&s.length===this.cols&&s.getFg(0)===e.fg&&s.getBg(0)===e.bg||(s=i.getBlankLine(e,t),this._cachedBlankLine=s),s.isWrapped=t;const r=i.ybase+i.scrollTop,n=i.ybase+i.scrollBottom;if(0===i.scrollTop){const e=i.lines.isFull;n===i.lines.length-1?e?i.lines.recycle().copyFrom(s):i.lines.push(s.clone()):i.lines.splice(n+1,0,s.clone()),e?this.isUserScrolling&&(i.ydisp=Math.max(i.ydisp-1,0)):(i.ybase++,this.isUserScrolling||i.ydisp++)}else{const e=n-r+1;i.lines.shiftElements(r+1,e-1,-1),i.lines.set(n,s.clone())}this.isUserScrolling||(i.ydisp=i.ybase),this._onScroll.fire(i.ydisp)}scrollLines(e,t,i){const s=this.buffer;if(e<0){if(0===s.ydisp)return;this.isUserScrolling=!0}else e+s.ydisp>=s.ybase&&(this.isUserScrolling=!1);const r=s.ydisp;s.ydisp=Math.max(Math.min(s.ydisp+e,s.ybase),0),r!==s.ydisp&&(t||this._onScroll.fire(s.ydisp))}};t.BufferService=c=s([r(0,h.IOptionsService)],c)},7994:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.CharsetService=void 0,t.CharsetService=class{constructor(){this.glevel=0,this._charsets=[]}reset(){this.charset=void 0,this._charsets=[],this.glevel=0}setgLevel(e){this.glevel=e,this.charset=this._charsets[e]}setgCharset(e,t){this._charsets[e]=t,this.glevel===e&&(this.charset=t)}}},1753:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.CoreMouseService=void 0;const n=i(2585),o=i(8460),a=i(844),h={NONE:{events:0,restrict:()=>!1},X10:{events:1,restrict:e=>4!==e.button&&1===e.action&&(e.ctrl=!1,e.alt=!1,e.shift=!1,!0)},VT200:{events:19,restrict:e=>32!==e.action},DRAG:{events:23,restrict:e=>32!==e.action||3!==e.button},ANY:{events:31,restrict:e=>!0}};function c(e,t){let i=(e.ctrl?16:0)|(e.shift?4:0)|(e.alt?8:0);return 4===e.button?(i|=64,i|=e.action):(i|=3&e.button,4&e.button&&(i|=64),8&e.button&&(i|=128),32===e.action?i|=32:0!==e.action||t||(i|=3)),i}const l=String.fromCharCode,d={DEFAULT:e=>{const t=[c(e,!1)+32,e.col+32,e.row+32];return t[0]>255||t[1]>255||t[2]>255?"":`${l(t[0])}${l(t[1])}${l(t[2])}`},SGR:e=>{const t=0===e.action&&4!==e.button?"m":"M";return`[<${c(e,!0)};${e.col};${e.row}${t}`},SGR_PIXELS:e=>{const t=0===e.action&&4!==e.button?"m":"M";return`[<${c(e,!0)};${e.x};${e.y}${t}`}};let _=t.CoreMouseService=class extends a.Disposable{constructor(e,t){super(),this._bufferService=e,this._coreService=t,this._protocols={},this._encodings={},this._activeProtocol="",this._activeEncoding="",this._lastEvent=null,this._onProtocolChange=this.register(new o.EventEmitter),this.onProtocolChange=this._onProtocolChange.event;for(const e of Object.keys(h))this.addProtocol(e,h[e]);for(const e of Object.keys(d))this.addEncoding(e,d[e]);this.reset()}addProtocol(e,t){this._protocols[e]=t}addEncoding(e,t){this._encodings[e]=t}get activeProtocol(){return this._activeProtocol}get areMouseEventsActive(){return 0!==this._protocols[this._activeProtocol].events}set activeProtocol(e){if(!this._protocols[e])throw new Error(`unknown protocol "${e}"`);this._activeProtocol=e,this._onProtocolChange.fire(this._protocols[e].events)}get activeEncoding(){return this._activeEncoding}set activeEncoding(e){if(!this._encodings[e])throw new Error(`unknown encoding "${e}"`);this._activeEncoding=e}reset(){this.activeProtocol="NONE",this.activeEncoding="DEFAULT",this._lastEvent=null}triggerMouseEvent(e){if(e.col<0||e.col>=this._bufferService.cols||e.row<0||e.row>=this._bufferService.rows)return!1;if(4===e.button&&32===e.action)return!1;if(3===e.button&&32!==e.action)return!1;if(4!==e.button&&(2===e.action||3===e.action))return!1;if(e.col++,e.row++,32===e.action&&this._lastEvent&&this._equalEvents(this._lastEvent,e,"SGR_PIXELS"===this._activeEncoding))return!1;if(!this._protocols[this._activeProtocol].restrict(e))return!1;const t=this._encodings[this._activeEncoding](e);return t&&("DEFAULT"===this._activeEncoding?this._coreService.triggerBinaryEvent(t):this._coreService.triggerDataEvent(t,!0)),this._lastEvent=e,!0}explainEvents(e){return{down:!!(1&e),up:!!(2&e),drag:!!(4&e),move:!!(8&e),wheel:!!(16&e)}}_equalEvents(e,t,i){if(i){if(e.x!==t.x)return!1;if(e.y!==t.y)return!1}else{if(e.col!==t.col)return!1;if(e.row!==t.row)return!1}return e.button===t.button&&e.action===t.action&&e.ctrl===t.ctrl&&e.alt===t.alt&&e.shift===t.shift}};t.CoreMouseService=_=s([r(0,n.IBufferService),r(1,n.ICoreService)],_)},6975:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.CoreService=void 0;const n=i(1439),o=i(8460),a=i(844),h=i(2585),c=Object.freeze({insertMode:!1}),l=Object.freeze({applicationCursorKeys:!1,applicationKeypad:!1,bracketedPasteMode:!1,origin:!1,reverseWraparound:!1,sendFocus:!1,wraparound:!0});let d=t.CoreService=class extends a.Disposable{constructor(e,t,i){super(),this._bufferService=e,this._logService=t,this._optionsService=i,this.isCursorInitialized=!1,this.isCursorHidden=!1,this._onData=this.register(new o.EventEmitter),this.onData=this._onData.event,this._onUserInput=this.register(new o.EventEmitter),this.onUserInput=this._onUserInput.event,this._onBinary=this.register(new o.EventEmitter),this.onBinary=this._onBinary.event,this._onRequestScrollToBottom=this.register(new o.EventEmitter),this.onRequestScrollToBottom=this._onRequestScrollToBottom.event,this.modes=(0,n.clone)(c),this.decPrivateModes=(0,n.clone)(l)}reset(){this.modes=(0,n.clone)(c),this.decPrivateModes=(0,n.clone)(l)}triggerDataEvent(e,t=!1){if(this._optionsService.rawOptions.disableStdin)return;const i=this._bufferService.buffer;t&&this._optionsService.rawOptions.scrollOnUserInput&&i.ybase!==i.ydisp&&this._onRequestScrollToBottom.fire(),t&&this._onUserInput.fire(),this._logService.debug(`sending data "${e}"`,(()=>e.split("").map((e=>e.charCodeAt(0))))),this._onData.fire(e)}triggerBinaryEvent(e){this._optionsService.rawOptions.disableStdin||(this._logService.debug(`sending binary "${e}"`,(()=>e.split("").map((e=>e.charCodeAt(0))))),this._onBinary.fire(e))}};t.CoreService=d=s([r(0,h.IBufferService),r(1,h.ILogService),r(2,h.IOptionsService)],d)},9074:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.DecorationService=void 0;const s=i(8055),r=i(8460),n=i(844),o=i(6106);let a=0,h=0;class c extends n.Disposable{get decorations(){return this._decorations.values()}constructor(){super(),this._decorations=new o.SortedList((e=>e?.marker.line)),this._onDecorationRegistered=this.register(new r.EventEmitter),this.onDecorationRegistered=this._onDecorationRegistered.event,this._onDecorationRemoved=this.register(new r.EventEmitter),this.onDecorationRemoved=this._onDecorationRemoved.event,this.register((0,n.toDisposable)((()=>this.reset())))}registerDecoration(e){if(e.marker.isDisposed)return;const t=new l(e);if(t){const e=t.marker.onDispose((()=>t.dispose()));t.onDispose((()=>{t&&(this._decorations.delete(t)&&this._onDecorationRemoved.fire(t),e.dispose())})),this._decorations.insert(t),this._onDecorationRegistered.fire(t)}return t}reset(){for(const e of this._decorations.values())e.dispose();this._decorations.clear()}*getDecorationsAtCell(e,t,i){let s=0,r=0;for(const n of this._decorations.getKeyIterator(t))s=n.options.x??0,r=s+(n.options.width??1),e>=s&&e<r&&(!i||(n.options.layer??"bottom")===i)&&(yield n)}forEachDecorationAtCell(e,t,i,s){this._decorations.forEachByKey(t,(t=>{a=t.options.x??0,h=a+(t.options.width??1),e>=a&&e<h&&(!i||(t.options.layer??"bottom")===i)&&s(t)}))}}t.DecorationService=c;class l extends n.Disposable{get isDisposed(){return this._isDisposed}get backgroundColorRGB(){return null===this._cachedBg&&(this.options.backgroundColor?this._cachedBg=s.css.toColor(this.options.backgroundColor):this._cachedBg=void 0),this._cachedBg}get foregroundColorRGB(){return null===this._cachedFg&&(this.options.foregroundColor?this._cachedFg=s.css.toColor(this.options.foregroundColor):this._cachedFg=void 0),this._cachedFg}constructor(e){super(),this.options=e,this.onRenderEmitter=this.register(new r.EventEmitter),this.onRender=this.onRenderEmitter.event,this._onDispose=this.register(new r.EventEmitter),this.onDispose=this._onDispose.event,this._cachedBg=null,this._cachedFg=null,this.marker=e.marker,this.options.overviewRulerOptions&&!this.options.overviewRulerOptions.position&&(this.options.overviewRulerOptions.position="full")}dispose(){this._onDispose.fire(),super.dispose()}}},4348:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.InstantiationService=t.ServiceCollection=void 0;const s=i(2585),r=i(8343);class n{constructor(...e){this._entries=new Map;for(const[t,i]of e)this.set(t,i)}set(e,t){const i=this._entries.get(e);return this._entries.set(e,t),i}forEach(e){for(const[t,i]of this._entries.entries())e(t,i)}has(e){return this._entries.has(e)}get(e){return this._entries.get(e)}}t.ServiceCollection=n,t.InstantiationService=class{constructor(){this._services=new n,this._services.set(s.IInstantiationService,this)}setService(e,t){this._services.set(e,t)}getService(e){return this._services.get(e)}createInstance(e,...t){const i=(0,r.getServiceDependencies)(e).sort(((e,t)=>e.index-t.index)),s=[];for(const t of i){const i=this._services.get(t.id);if(!i)throw new Error(`[createInstance] ${e.name} depends on UNKNOWN service ${t.id}.`);s.push(i)}const n=i.length>0?i[0].index:t.length;if(t.length!==n)throw new Error(`[createInstance] First service dependency of ${e.name} at position ${n+1} conflicts with ${t.length} static arguments`);return new e(...[...t,...s])}}},7866:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.traceCall=t.setTraceLogger=t.LogService=void 0;const n=i(844),o=i(2585),a={trace:o.LogLevelEnum.TRACE,debug:o.LogLevelEnum.DEBUG,info:o.LogLevelEnum.INFO,warn:o.LogLevelEnum.WARN,error:o.LogLevelEnum.ERROR,off:o.LogLevelEnum.OFF};let h,c=t.LogService=class extends n.Disposable{get logLevel(){return this._logLevel}constructor(e){super(),this._optionsService=e,this._logLevel=o.LogLevelEnum.OFF,this._updateLogLevel(),this.register(this._optionsService.onSpecificOptionChange("logLevel",(()=>this._updateLogLevel()))),h=this}_updateLogLevel(){this._logLevel=a[this._optionsService.rawOptions.logLevel]}_evalLazyOptionalParams(e){for(let t=0;t<e.length;t++)"function"==typeof e[t]&&(e[t]=e[t]())}_log(e,t,i){this._evalLazyOptionalParams(i),e.call(console,(this._optionsService.options.logger?"":"xterm.js: ")+t,...i)}trace(e,...t){this._logLevel<=o.LogLevelEnum.TRACE&&this._log(this._optionsService.options.logger?.trace.bind(this._optionsService.options.logger)??console.log,e,t)}debug(e,...t){this._logLevel<=o.LogLevelEnum.DEBUG&&this._log(this._optionsService.options.logger?.debug.bind(this._optionsService.options.logger)??console.log,e,t)}info(e,...t){this._logLevel<=o.LogLevelEnum.INFO&&this._log(this._optionsService.options.logger?.info.bind(this._optionsService.options.logger)??console.info,e,t)}warn(e,...t){this._logLevel<=o.LogLevelEnum.WARN&&this._log(this._optionsService.options.logger?.warn.bind(this._optionsService.options.logger)??console.warn,e,t)}error(e,...t){this._logLevel<=o.LogLevelEnum.ERROR&&this._log(this._optionsService.options.logger?.error.bind(this._optionsService.options.logger)??console.error,e,t)}};t.LogService=c=s([r(0,o.IOptionsService)],c),t.setTraceLogger=function(e){h=e},t.traceCall=function(e,t,i){if("function"!=typeof i.value)throw new Error("not supported");const s=i.value;i.value=function(...e){if(h.logLevel!==o.LogLevelEnum.TRACE)return s.apply(this,e);h.trace(`GlyphRenderer#${s.name}(${e.map((e=>JSON.stringify(e))).join(", ")})`);const t=s.apply(this,e);return h.trace(`GlyphRenderer#${s.name} return`,t),t}}},7302:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.OptionsService=t.DEFAULT_OPTIONS=void 0;const s=i(8460),r=i(844),n=i(6114);t.DEFAULT_OPTIONS={cols:80,rows:24,cursorBlink:!1,cursorStyle:"block",cursorWidth:1,cursorInactiveStyle:"outline",customGlyphs:!0,drawBoldTextInBrightColors:!0,documentOverride:null,fastScrollModifier:"alt",fastScrollSensitivity:5,fontFamily:"courier-new, courier, monospace",fontSize:15,fontWeight:"normal",fontWeightBold:"bold",ignoreBracketedPasteMode:!1,lineHeight:1,letterSpacing:0,linkHandler:null,logLevel:"info",logger:null,scrollback:1e3,scrollOnUserInput:!0,scrollSensitivity:1,screenReaderMode:!1,smoothScrollDuration:0,macOptionIsMeta:!1,macOptionClickForcesSelection:!1,minimumContrastRatio:1,disableStdin:!1,allowProposedApi:!1,allowTransparency:!1,tabStopWidth:8,theme:{},rescaleOverlappingGlyphs:!1,rightClickSelectsWord:n.isMac,windowOptions:{},windowsMode:!1,windowsPty:{},wordSeparator:" ()[]{}',\"`",altClickMovesCursor:!0,convertEol:!1,termName:"xterm",cancelEvents:!1,overviewRulerWidth:0};const o=["normal","bold","100","200","300","400","500","600","700","800","900"];class a extends r.Disposable{constructor(e){super(),this._onOptionChange=this.register(new s.EventEmitter),this.onOptionChange=this._onOptionChange.event;const i={...t.DEFAULT_OPTIONS};for(const t in e)if(t in i)try{const s=e[t];i[t]=this._sanitizeAndValidateOption(t,s)}catch(e){console.error(e)}this.rawOptions=i,this.options={...i},this._setupOptions(),this.register((0,r.toDisposable)((()=>{this.rawOptions.linkHandler=null,this.rawOptions.documentOverride=null})))}onSpecificOptionChange(e,t){return this.onOptionChange((i=>{i===e&&t(this.rawOptions[e])}))}onMultipleOptionChange(e,t){return this.onOptionChange((i=>{-1!==e.indexOf(i)&&t()}))}_setupOptions(){const e=e=>{if(!(e in t.DEFAULT_OPTIONS))throw new Error(`No option with key "${e}"`);return this.rawOptions[e]},i=(e,i)=>{if(!(e in t.DEFAULT_OPTIONS))throw new Error(`No option with key "${e}"`);i=this._sanitizeAndValidateOption(e,i),this.rawOptions[e]!==i&&(this.rawOptions[e]=i,this._onOptionChange.fire(e))};for(const t in this.rawOptions){const s={get:e.bind(this,t),set:i.bind(this,t)};Object.defineProperty(this.options,t,s)}}_sanitizeAndValidateOption(e,i){switch(e){case"cursorStyle":if(i||(i=t.DEFAULT_OPTIONS[e]),!function(e){return"block"===e||"underline"===e||"bar"===e}(i))throw new Error(`"${i}" is not a valid value for ${e}`);break;case"wordSeparator":i||(i=t.DEFAULT_OPTIONS[e]);break;case"fontWeight":case"fontWeightBold":if("number"==typeof i&&1<=i&&i<=1e3)break;i=o.includes(i)?i:t.DEFAULT_OPTIONS[e];break;case"cursorWidth":i=Math.floor(i);case"lineHeight":case"tabStopWidth":if(i<1)throw new Error(`${e} cannot be less than 1, value: ${i}`);break;case"minimumContrastRatio":i=Math.max(1,Math.min(21,Math.round(10*i)/10));break;case"scrollback":if((i=Math.min(i,4294967295))<0)throw new Error(`${e} cannot be less than 0, value: ${i}`);break;case"fastScrollSensitivity":case"scrollSensitivity":if(i<=0)throw new Error(`${e} cannot be less than or equal to 0, value: ${i}`);break;case"rows":case"cols":if(!i&&0!==i)throw new Error(`${e} must be numeric, value: ${i}`);break;case"windowsPty":i=i??{}}return i}}t.OptionsService=a},2660:function(e,t,i){var s=this&&this.__decorate||function(e,t,i,s){var r,n=arguments.length,o=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,i,s);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(n<3?r(o):n>3?r(t,i,o):r(t,i))||o);return n>3&&o&&Object.defineProperty(t,i,o),o},r=this&&this.__param||function(e,t){return function(i,s){t(i,s,e)}};Object.defineProperty(t,"__esModule",{value:!0}),t.OscLinkService=void 0;const n=i(2585);let o=t.OscLinkService=class{constructor(e){this._bufferService=e,this._nextId=1,this._entriesWithId=new Map,this._dataByLinkId=new Map}registerLink(e){const t=this._bufferService.buffer;if(void 0===e.id){const i=t.addMarker(t.ybase+t.y),s={data:e,id:this._nextId++,lines:[i]};return i.onDispose((()=>this._removeMarkerFromLink(s,i))),this._dataByLinkId.set(s.id,s),s.id}const i=e,s=this._getEntryIdKey(i),r=this._entriesWithId.get(s);if(r)return this.addLineToLink(r.id,t.ybase+t.y),r.id;const n=t.addMarker(t.ybase+t.y),o={id:this._nextId++,key:this._getEntryIdKey(i),data:i,lines:[n]};return n.onDispose((()=>this._removeMarkerFromLink(o,n))),this._entriesWithId.set(o.key,o),this._dataByLinkId.set(o.id,o),o.id}addLineToLink(e,t){const i=this._dataByLinkId.get(e);if(i&&i.lines.every((e=>e.line!==t))){const e=this._bufferService.buffer.addMarker(t);i.lines.push(e),e.onDispose((()=>this._removeMarkerFromLink(i,e)))}}getLinkData(e){return this._dataByLinkId.get(e)?.data}_getEntryIdKey(e){return`${e.id};;${e.uri}`}_removeMarkerFromLink(e,t){const i=e.lines.indexOf(t);-1!==i&&(e.lines.splice(i,1),0===e.lines.length&&(void 0!==e.data.id&&this._entriesWithId.delete(e.key),this._dataByLinkId.delete(e.id)))}};t.OscLinkService=o=s([r(0,n.IBufferService)],o)},8343:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.createDecorator=t.getServiceDependencies=t.serviceRegistry=void 0;const i="di$target",s="di$dependencies";t.serviceRegistry=new Map,t.getServiceDependencies=function(e){return e[s]||[]},t.createDecorator=function(e){if(t.serviceRegistry.has(e))return t.serviceRegistry.get(e);const r=function(e,t,n){if(3!==arguments.length)throw new Error("@IServiceName-decorator can only be used to decorate a parameter");!function(e,t,r){t[i]===t?t[s].push({id:e,index:r}):(t[s]=[{id:e,index:r}],t[i]=t)}(r,e,n)};return r.toString=()=>e,t.serviceRegistry.set(e,r),r}},2585:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.IDecorationService=t.IUnicodeService=t.IOscLinkService=t.IOptionsService=t.ILogService=t.LogLevelEnum=t.IInstantiationService=t.ICharsetService=t.ICoreService=t.ICoreMouseService=t.IBufferService=void 0;const s=i(8343);var r;t.IBufferService=(0,s.createDecorator)("BufferService"),t.ICoreMouseService=(0,s.createDecorator)("CoreMouseService"),t.ICoreService=(0,s.createDecorator)("CoreService"),t.ICharsetService=(0,s.createDecorator)("CharsetService"),t.IInstantiationService=(0,s.createDecorator)("InstantiationService"),function(e){e[e.TRACE=0]="TRACE",e[e.DEBUG=1]="DEBUG",e[e.INFO=2]="INFO",e[e.WARN=3]="WARN",e[e.ERROR=4]="ERROR",e[e.OFF=5]="OFF"}(r||(t.LogLevelEnum=r={})),t.ILogService=(0,s.createDecorator)("LogService"),t.IOptionsService=(0,s.createDecorator)("OptionsService"),t.IOscLinkService=(0,s.createDecorator)("OscLinkService"),t.IUnicodeService=(0,s.createDecorator)("UnicodeService"),t.IDecorationService=(0,s.createDecorator)("DecorationService")},1480:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.UnicodeService=void 0;const s=i(8460),r=i(225);class n{static extractShouldJoin(e){return 0!=(1&e)}static extractWidth(e){return e>>1&3}static extractCharKind(e){return e>>3}static createPropertyValue(e,t,i=!1){return(16777215&e)<<3|(3&t)<<1|(i?1:0)}constructor(){this._providers=Object.create(null),this._active="",this._onChange=new s.EventEmitter,this.onChange=this._onChange.event;const e=new r.UnicodeV6;this.register(e),this._active=e.version,this._activeProvider=e}dispose(){this._onChange.dispose()}get versions(){return Object.keys(this._providers)}get activeVersion(){return this._active}set activeVersion(e){if(!this._providers[e])throw new Error(`unknown Unicode version "${e}"`);this._active=e,this._activeProvider=this._providers[e],this._onChange.fire(e)}register(e){this._providers[e.version]=e}wcwidth(e){return this._activeProvider.wcwidth(e)}getStringCellWidth(e){let t=0,i=0;const s=e.length;for(let r=0;r<s;++r){let o=e.charCodeAt(r);if(55296<=o&&o<=56319){if(++r>=s)return t+this.wcwidth(o);const i=e.charCodeAt(r);56320<=i&&i<=57343?o=1024*(o-55296)+i-56320+65536:t+=this.wcwidth(i)}const a=this.charProperties(o,i);let h=n.extractWidth(a);n.extractShouldJoin(a)&&(h-=n.extractWidth(i)),t+=h,i=a}return t}charProperties(e,t){return this._activeProvider.charProperties(e,t)}}t.UnicodeService=n}},t={};function i(s){var r=t[s];if(void 0!==r)return r.exports;var n=t[s]={exports:{}};return e[s].call(n.exports,n,n.exports,i),n.exports}var s={};return(()=>{var e=s;Object.defineProperty(e,"__esModule",{value:!0}),e.Terminal=void 0;const t=i(9042),r=i(3236),n=i(844),o=i(5741),a=i(8285),h=i(7975),c=i(7090),l=["cols","rows"];class d extends n.Disposable{constructor(e){super(),this._core=this.register(new r.Terminal(e)),this._addonManager=this.register(new o.AddonManager),this._publicOptions={...this._core.options};const t=e=>this._core.options[e],i=(e,t)=>{this._checkReadonlyOptions(e),this._core.options[e]=t};for(const e in this._core.options){const s={get:t.bind(this,e),set:i.bind(this,e)};Object.defineProperty(this._publicOptions,e,s)}}_checkReadonlyOptions(e){if(l.includes(e))throw new Error(`Option "${e}" can only be set in the constructor`)}_checkProposedApi(){if(!this._core.optionsService.rawOptions.allowProposedApi)throw new Error("You must set the allowProposedApi option to true to use proposed API")}get onBell(){return this._core.onBell}get onBinary(){return this._core.onBinary}get onCursorMove(){return this._core.onCursorMove}get onData(){return this._core.onData}get onKey(){return this._core.onKey}get onLineFeed(){return this._core.onLineFeed}get onRender(){return this._core.onRender}get onResize(){return this._core.onResize}get onScroll(){return this._core.onScroll}get onSelectionChange(){return this._core.onSelectionChange}get onTitleChange(){return this._core.onTitleChange}get onWriteParsed(){return this._core.onWriteParsed}get element(){return this._core.element}get parser(){return this._parser||(this._parser=new h.ParserApi(this._core)),this._parser}get unicode(){return this._checkProposedApi(),new c.UnicodeApi(this._core)}get textarea(){return this._core.textarea}get rows(){return this._core.rows}get cols(){return this._core.cols}get buffer(){return this._buffer||(this._buffer=this.register(new a.BufferNamespaceApi(this._core))),this._buffer}get markers(){return this._checkProposedApi(),this._core.markers}get modes(){const e=this._core.coreService.decPrivateModes;let t="none";switch(this._core.coreMouseService.activeProtocol){case"X10":t="x10";break;case"VT200":t="vt200";break;case"DRAG":t="drag";break;case"ANY":t="any"}return{applicationCursorKeysMode:e.applicationCursorKeys,applicationKeypadMode:e.applicationKeypad,bracketedPasteMode:e.bracketedPasteMode,insertMode:this._core.coreService.modes.insertMode,mouseTrackingMode:t,originMode:e.origin,reverseWraparoundMode:e.reverseWraparound,sendFocusMode:e.sendFocus,wraparoundMode:e.wraparound}}get options(){return this._publicOptions}set options(e){for(const t in e)this._publicOptions[t]=e[t]}blur(){this._core.blur()}focus(){this._core.focus()}input(e,t=!0){this._core.input(e,t)}resize(e,t){this._verifyIntegers(e,t),this._core.resize(e,t)}open(e){this._core.open(e)}attachCustomKeyEventHandler(e){this._core.attachCustomKeyEventHandler(e)}attachCustomWheelEventHandler(e){this._core.attachCustomWheelEventHandler(e)}registerLinkProvider(e){return this._core.registerLinkProvider(e)}registerCharacterJoiner(e){return this._checkProposedApi(),this._core.registerCharacterJoiner(e)}deregisterCharacterJoiner(e){this._checkProposedApi(),this._core.deregisterCharacterJoiner(e)}registerMarker(e=0){return this._verifyIntegers(e),this._core.registerMarker(e)}registerDecoration(e){return this._checkProposedApi(),this._verifyPositiveIntegers(e.x??0,e.width??0,e.height??0),this._core.registerDecoration(e)}hasSelection(){return this._core.hasSelection()}select(e,t,i){this._verifyIntegers(e,t,i),this._core.select(e,t,i)}getSelection(){return this._core.getSelection()}getSelectionPosition(){return this._core.getSelectionPosition()}clearSelection(){this._core.clearSelection()}selectAll(){this._core.selectAll()}selectLines(e,t){this._verifyIntegers(e,t),this._core.selectLines(e,t)}dispose(){super.dispose()}scrollLines(e){this._verifyIntegers(e),this._core.scrollLines(e)}scrollPages(e){this._verifyIntegers(e),this._core.scrollPages(e)}scrollToTop(){this._core.scrollToTop()}scrollToBottom(){this._core.scrollToBottom()}scrollToLine(e){this._verifyIntegers(e),this._core.scrollToLine(e)}clear(){this._core.clear()}write(e,t){this._core.write(e,t)}writeln(e,t){this._core.write(e),this._core.write("\r\n",t)}paste(e){this._core.paste(e)}refresh(e,t){this._verifyIntegers(e,t),this._core.refresh(e,t)}reset(){this._core.reset()}clearTextureAtlas(){this._core.clearTextureAtlas()}loadAddon(e){this._addonManager.loadAddon(this,e)}static get strings(){return t}_verifyIntegers(...e){for(const t of e)if(t===1/0||isNaN(t)||t%1!=0)throw new Error("This API only accepts integers")}_verifyPositiveIntegers(...e){for(const t of e)if(t&&(t===1/0||isNaN(t)||t%1!=0||t<0))throw new Error("This API only accepts positive integers")}}e.Terminal=d})(),s})()));
+//# sourceMappingURL=xterm.js.map
\ No newline at end of file
diff --git a/examples/webpanel/webpanel_main.c b/examples/webpanel/webpanel_main.c
new file mode 100644
index 000000000..7831808f3
--- /dev/null
+++ b/examples/webpanel/webpanel_main.c
@@ -0,0 +1,207 @@
+/****************************************************************************
+ * apps/examples/webpanel/webpanel_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/mount.h>
+#include <sys/boardctl.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <nuttx/drivers/ramdisk.h>
+
+#include "netutils/thttpd.h"
+#include "fsutils/mksmartfs.h"
+#include "ws_terminal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SECTORSIZE   64
+#define NSECTORS(b)  (((b) + SECTORSIZE - 1) / SECTORSIZE)
+#define WEBPANEL_RAMDISK_MINOR 2
+#define ROMFSDEV     "/dev/ram2"
+
+#define ROMFS_MOUNTPT  "/data/tmp_romfs"
+#define BINFS_MOUNTPT  "/data/tmp_binfs"
+#define BINFS_PREFIX   "cgi-bin"
+#define UNIONFS_MOUNTPT CONFIG_THTTPD_PATH
+
+#define SMARTFS_DEV    "/dev/smart0"
+#define SMARTFS_MNT    "/mnt"
+
+/****************************************************************************
+ * External References
+ ****************************************************************************/
+
+extern const unsigned char webpanel_romfs_img[];
+extern const unsigned int  webpanel_romfs_img_len;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ *
+ * Description:
+ *   Initialize WebPanel filesystem mounts, start the websocket daemon,
+ *   then launch the THTTPD server.
+ *
+ * Input Parameters:
+ *   argc - Number of arguments.
+ *   argv - Argument vector.
+ *
+ * Returned Value:
+ *   EXIT_SUCCESS on success; EXIT_FAILURE on setup error.
+ *
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct boardioc_romdisk_s desc;
+  char *thttpd_argv = "thttpd";
+  struct statfs check_fs;
+  struct statfs sfs;
+  int ret;
+
+  /* Prevent duplicate startup (e.g. rcS runs again in child NSH) */
+
+  if (statfs(UNIONFS_MOUNTPT, &check_fs) == 0)
+    {
+      return 0;
+    }
+
+  /* Register the ROMFS image as a ramdisk */
+
+  printf("WebPanel: Registering ROMFS ramdisk\n");
+
+  desc.minor    = WEBPANEL_RAMDISK_MINOR;
+  desc.nsectors = NSECTORS(webpanel_romfs_img_len);
+  desc.sectsize = SECTORSIZE;
+  desc.image    = (FAR uint8_t *)webpanel_romfs_img;
+
+  ret = boardctl(BOARDIOC_ROMDISK, (uintptr_t)&desc);
+  if (ret < 0 && errno != EEXIST)
+    {
+      printf("WebPanel: ERROR romdisk_register failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  /* Create mount point directories */
+
+  mkdir("/data", 0777);
+  mkdir(ROMFS_MOUNTPT, 0777);
+  mkdir(BINFS_MOUNTPT, 0777);
+
+  /* Mount ROMFS at temp location */
+
+  printf("WebPanel: Mounting ROMFS at %s\n", ROMFS_MOUNTPT);
+
+  ret = mount(ROMFSDEV, ROMFS_MOUNTPT, "romfs", MS_RDONLY, NULL);
+  if (ret < 0 && errno != EBUSY)
+    {
+      printf("WebPanel: ERROR mount ROMFS failed: %d\n", errno);
+      return EXIT_FAILURE;
+    }
+
+  /* Mount BINFS at temp location (exposes built-in apps as CGI) */
+
+  printf("WebPanel: Mounting BINFS at %s\n", BINFS_MOUNTPT);
+
+  ret = mount(NULL, BINFS_MOUNTPT, "binfs", MS_RDONLY, NULL);
+  if (ret < 0 && errno != EBUSY)
+    {
+      printf("WebPanel: ERROR mount BINFS failed: %d\n", errno);
+      return EXIT_FAILURE;
+    }
+
+  /* Create UNIONFS: ROMFS content + BINFS under cgi-bin/ prefix */
+
+  printf("WebPanel: Creating UNIONFS at %s\n", UNIONFS_MOUNTPT);
+
+  ret = mount(NULL, UNIONFS_MOUNTPT, "unionfs", 0,
+              "fspath1=" ROMFS_MOUNTPT ",prefix1="
+              ",fspath2=" BINFS_MOUNTPT ",prefix2=" BINFS_PREFIX);
+  if (ret < 0 && errno != EBUSY)
+    {
+      printf("WebPanel: ERROR mount UNIONFS failed: %d\n", errno);
+      return EXIT_FAILURE;
+    }
+
+  /* Ensure SmartFS is formatted and mounted at /mnt for user files */
+
+  if (statfs(SMARTFS_MNT, &sfs) != 0)
+    {
+      printf("WebPanel: SmartFS not mounted, formatting %s\n",
+             SMARTFS_DEV);
+      ret = mksmartfs(SMARTFS_DEV, 0);
+      if (ret < 0)
+        {
+          printf("WebPanel: WARNING mksmartfs failed: %d\n", errno);
+        }
+      else
+        {
+          mkdir(SMARTFS_MNT, 0777);
+          ret = mount(SMARTFS_DEV, SMARTFS_MNT, "smartfs", 0, NULL);
+          if (ret < 0)
+            {
+              printf("WebPanel: WARNING mount SmartFS failed: %d\n",
+                     errno);
+            }
+          else
+            {
+              printf("WebPanel: SmartFS mounted at %s\n", SMARTFS_MNT);
+            }
+        }
+    }
+  else
+    {
+      printf("WebPanel: SmartFS already mounted at %s\n", SMARTFS_MNT);
+    }
+
+  /* Start WebSocket terminal server */
+
+  ret = ws_terminal_start();
+  if (ret < 0)
+    {
+      printf("WebPanel: WARNING WebSocket server failed to start\n");
+    }
+
+  /* Start THTTPD */
+
+  printf("WebPanel: Starting THTTPD (serving from %s)\n", UNIONFS_MOUNTPT);
+  fflush(stdout);
+
+  thttpd_main(1, &thttpd_argv);
+
+  printf("WebPanel: THTTPD terminated\n");
+  return 0;
+}
diff --git a/examples/webpanel/ws_terminal.c b/examples/webpanel/ws_terminal.c
new file mode 100644
index 000000000..7db8d7392
--- /dev/null
+++ b/examples/webpanel/ws_terminal.c
@@ -0,0 +1,350 @@
+/****************************************************************************
+ * apps/examples/webpanel/ws_terminal.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sched.h>
+#include <spawn.h>
+
+#include <libwebsockets.h>
+
+#include "ws_terminal.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_EXAMPLES_WEBPANEL_WS_PORT
+#  define CONFIG_EXAMPLES_WEBPANEL_WS_PORT 8080
+#endif
+
+#ifndef CONFIG_EXAMPLES_WEBPANEL_WS_PRIORITY
+#  define CONFIG_EXAMPLES_WEBPANEL_WS_PRIORITY 100
+#endif
+
+#ifndef CONFIG_EXAMPLES_WEBPANEL_WS_STACKSIZE
+#  define CONFIG_EXAMPLES_WEBPANEL_WS_STACKSIZE 8192
+#endif
+
+#ifndef CONFIG_EXAMPLES_WEBPANEL_WS_NSH_STACKSIZE
+#  define CONFIG_EXAMPLES_WEBPANEL_WS_NSH_STACKSIZE 4096
+#endif
+
+#define WS_IOBUF_SIZE  512
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct ws_session
+{
+  int masterfd;
+  pid_t nshpid;
+  unsigned char txbuf[LWS_PRE + WS_IOBUF_SIZE];
+  size_t txlen;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int ws_spawn_nsh(int masterfd, pid_t *pid);
+static int ws_callback(struct lws *wsi,
+                       enum lws_callback_reasons reason,
+                       void *user, void *in, size_t len);
+static int ws_daemon(int argc, FAR char *argv[]);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct lws_protocols g_protocols[] =
+{
+  {
+    "",
+    ws_callback,
+    sizeof(struct ws_session),
+    WS_IOBUF_SIZE,
+    0, NULL, 0
+  },
+  LWS_PROTOCOL_LIST_TERM
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ws_spawn_nsh
+ *
+ * Description:
+ *   Spawn an NSH instance attached to a PTY slave.
+ *
+ * Input Parameters:
+ *   masterfd - PTY master descriptor.
+ *   pid      - Location to receive spawned task PID.
+ *
+ * Returned Value:
+ *   Zero on success; negated errno on failure.
+ *
+ ****************************************************************************/
+
+static int ws_spawn_nsh(int masterfd, pid_t *pid)
+{
+  char slavepath[32];
+  FAR char *nshargv[] =
+  {
+    "nsh", NULL
+  };
+
+  posix_spawn_file_actions_t actions;
+  posix_spawnattr_t attr;
+  struct sched_param param;
+  int ret;
+
+  ret = grantpt(masterfd);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = unlockpt(masterfd);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = ptsname_r(masterfd, slavepath, sizeof(slavepath));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  posix_spawn_file_actions_init(&actions);
+  posix_spawn_file_actions_addopen(&actions, 0, slavepath,
+                                   O_RDWR, 0);
+  posix_spawn_file_actions_adddup2(&actions, 0, 1);
+  posix_spawn_file_actions_adddup2(&actions, 0, 2);
+
+  posix_spawnattr_init(&attr);
+  param.sched_priority = CONFIG_EXAMPLES_WEBPANEL_WS_PRIORITY;
+  posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDPARAM);
+  posix_spawnattr_setschedparam(&attr, &param);
+  posix_spawnattr_setstacksize(&attr,
+                               CONFIG_EXAMPLES_WEBPANEL_WS_NSH_STACKSIZE);
+
+  ret = posix_spawn(pid, "nsh", &actions, &attr, nshargv, NULL);
+
+  posix_spawn_file_actions_destroy(&actions);
+  posix_spawnattr_destroy(&attr);
+
+  return ret == 0 ? 0 : -ret;
+}
+
+/****************************************************************************
+ * Name: ws_callback
+ *
+ * Description:
+ *   libwebsockets protocol callback for the NSH terminal relay.
+ *
+ ****************************************************************************/
+
+static int ws_callback(struct lws *wsi,
+                       enum lws_callback_reasons reason,
+                       void *user, void *in, size_t len)
+{
+  struct ws_session *sess = (struct ws_session *)user;
+  ssize_t n;
+
+  switch (reason)
+    {
+    case LWS_CALLBACK_ESTABLISHED:
+      sess->masterfd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
+      if (sess->masterfd < 0)
+        {
+          printf("ws_terminal: failed to open PTY\n");
+          return -1;
+        }
+
+      sess->nshpid = -1;
+      if (ws_spawn_nsh(sess->masterfd, &sess->nshpid) < 0)
+        {
+          printf("ws_terminal: failed to spawn NSH\n");
+          close(sess->masterfd);
+          sess->masterfd = -1;
+          return -1;
+        }
+
+      /* Make PTY master non-blocking for polling */
+
+      fcntl(sess->masterfd, F_SETFL,
+            fcntl(sess->masterfd, F_GETFL) | O_NONBLOCK);
+
+      sess->txlen = 0;
+      printf("ws_terminal: client connected\n");
+
+      lws_set_timer_usecs(wsi, 50 * LWS_USEC_PER_SEC / 1000);
+      break;
+
+    case LWS_CALLBACK_RECEIVE:
+      if (sess->masterfd >= 0 && len > 0)
+        {
+          write(sess->masterfd, in, len);
+        }
+
+      break;
+
+    case LWS_CALLBACK_SERVER_WRITEABLE:
+      if (sess->masterfd < 0)
+        {
+          break;
+        }
+
+      n = read(sess->masterfd,
+               &sess->txbuf[LWS_PRE],
+               WS_IOBUF_SIZE);
+      if (n > 0)
+        {
+          lws_write(wsi, &sess->txbuf[LWS_PRE], n, LWS_WRITE_TEXT);
+          lws_set_timer_usecs(wsi, 10 * LWS_USEC_PER_SEC / 1000);
+        }
+      else
+        {
+          lws_set_timer_usecs(wsi, 50 * LWS_USEC_PER_SEC / 1000);
+        }
+
+      break;
+
+    case LWS_CALLBACK_TIMER:
+      lws_callback_on_writable(wsi);
+      break;
+
+    case LWS_CALLBACK_CLOSED:
+      printf("ws_terminal: client disconnected\n");
+      if (sess->nshpid > 0)
+        {
+          task_delete(sess->nshpid);
+          sess->nshpid = -1;
+        }
+
+      if (sess->masterfd >= 0)
+        {
+          close(sess->masterfd);
+          sess->masterfd = -1;
+        }
+
+      break;
+
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: ws_daemon
+ *
+ * Description:
+ *   WebSocket terminal daemon using libwebsockets.
+ *
+ ****************************************************************************/
+
+static int ws_daemon(int argc, FAR char *argv[])
+{
+  struct lws_context_creation_info info;
+  struct lws_context *context;
+  int n;
+
+  lws_set_log_level(LLL_ERR | LLL_WARN, NULL);
+
+  memset(&info, 0, sizeof(info));
+  info.port = CONFIG_EXAMPLES_WEBPANEL_WS_PORT;
+  info.protocols = g_protocols;
+  info.vhost_name = "localhost";
+  info.options = 0;
+
+  context = lws_create_context(&info);
+  if (context == NULL)
+    {
+      printf("ws_terminal: ERROR creating lws context\n");
+      return EXIT_FAILURE;
+    }
+
+  printf("WebPanel: WebSocket terminal listening on port %d\n",
+         CONFIG_EXAMPLES_WEBPANEL_WS_PORT);
+
+  n = 0;
+  while (n >= 0)
+    {
+      n = lws_service(context, 100);
+    }
+
+  lws_context_destroy(context);
+  return EXIT_FAILURE;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ws_terminal_start
+ *
+ * Description:
+ *   Start the websocket terminal daemon task.
+ *
+ * Input Parameters:
+ *   None.
+ *
+ * Returned Value:
+ *   Task PID on success; negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int ws_terminal_start(void)
+{
+  int pid;
+
+  pid = task_create("ws_daemon",
+                    CONFIG_EXAMPLES_WEBPANEL_WS_PRIORITY,
+                    CONFIG_EXAMPLES_WEBPANEL_WS_STACKSIZE,
+                    ws_daemon, NULL);
+  if (pid < 0)
+    {
+      printf("WebPanel: ERROR failed to start WebSocket server: %d\n",
+             errno);
+      return -errno;
+    }
+
+  return pid;
+}
diff --git a/examples/webpanel/ws_terminal.h b/examples/webpanel/ws_terminal.h
new file mode 100644
index 000000000..91cc637d9
--- /dev/null
+++ b/examples/webpanel/ws_terminal.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+ * apps/examples/webpanel/ws_terminal.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_WEBPANEL_WS_TERMINAL_H
+#define __APPS_EXAMPLES_WEBPANEL_WS_TERMINAL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ws_terminal_start
+ *
+ * Description:
+ *   Start the websocket terminal daemon task.
+ *
+ * Input Parameters:
+ *   None.
+ *
+ * Returned Value:
+ *   Task PID on success; negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int ws_terminal_start(void);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_EXAMPLES_WEBPANEL_WS_TERMINAL_H */

From ee4727fdbacd0d847f3c197fcf7ed06f14328289 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Thu, 18 Jun 2026 08:00:29 +0000
Subject: [PATCH 432/568] testing/ostest: Add multi-user permission regression
 tests

Add CONFIG_TESTING_OSTEST_MULTIUSER tests for seteuid, file permissions,
and pseudoFS/tmpfs permission enforcement.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 testing/ostest/CMakeLists.txt |   8 +-
 testing/ostest/Kconfig        |  10 +
 testing/ostest/Makefile       |   6 +-
 testing/ostest/multiuser.c    | 688 ++++++++++++++++++++++++++++++++++
 testing/ostest/ostest.h       |   6 +
 testing/ostest/ostest_main.c  |  29 +-
 6 files changed, 734 insertions(+), 13 deletions(-)
 create mode 100644 testing/ostest/multiuser.c

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 893465362..74103db41 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -60,6 +60,10 @@ if(CONFIG_TESTING_OSTEST)
     list(APPEND SRCS aio.c)
   endif()
 
+  if(CONFIG_TESTING_OSTEST_MULTIUSER)
+    list(APPEND SRCS multiuser.c)
+  endif()
+
   if(CONFIG_SCHED_WAITPID)
     list(APPEND SRCS waitpid.c)
   endif()
@@ -133,9 +137,7 @@ if(CONFIG_TESTING_OSTEST)
   endif() # CONFIG_DISABLE_MQUEUE
 
   if(NOT CONFIG_DISABLE_POSIX_TIMERS)
-    if(NOT CONFIG_DISABLE_ALL_SIGNALS)
-      list(APPEND SRCS posixtimer.c)
-    endif()
+    list(APPEND SRCS posixtimer.c)
     if(CONFIG_SIG_EVTHREAD)
       list(APPEND SRCS sigev_thread.c)
     endif()
diff --git a/testing/ostest/Kconfig b/testing/ostest/Kconfig
index 100afb73e..aabffab40 100644
--- a/testing/ostest/Kconfig
+++ b/testing/ostest/Kconfig
@@ -120,6 +120,16 @@ config TESTING_OSTEST_SPINLOCK_THREADS
 	default 2
 	range 1 32
 
+config TESTING_OSTEST_MULTIUSER
+	bool "Multi-user identity and permission tests"
+	default n
+	depends on SCHED_USER_IDENTITY
+	---help---
+		Enable regression tests for UID/GID identity switching and file
+		permission enforcement.  Individual sub-tests run only when the
+		corresponding kernel options are enabled (for example pseudoFS
+		permission checks require FS_PERMISSION and PSEUDOFS_FILE).
+
 config TEST_LOOP_SCALE
 	int "Loop scale of spinlock test (N x 10,000)"
 	default 100
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 3c28199c3..f443ecb0b 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -75,6 +75,10 @@ ifeq ($(CONFIG_TESTING_OSTEST_AIO),y)
 CSRCS += aio.c
 endif
 
+ifeq ($(CONFIG_TESTING_OSTEST_MULTIUSER),y)
+CSRCS += multiuser.c
+endif
+
 ifeq ($(CONFIG_SCHED_WAITPID),y)
 CSRCS += waitpid.c
 endif
@@ -134,9 +138,7 @@ endif # CONFIG_DISABLE_PTHREAD
 endif # CONFIG_DISABLE_MQUEUE
 
 ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y)
-ifneq ($(CONFIG_DISABLE_ALL_SIGNALS),y)
 CSRCS += posixtimer.c
-endif
 ifeq ($(CONFIG_SIG_EVTHREAD),y)
 CSRCS += sigev_thread.c
 endif
diff --git a/testing/ostest/multiuser.c b/testing/ostest/multiuser.c
new file mode 100644
index 000000000..eb2c45f98
--- /dev/null
+++ b/testing/ostest/multiuser.c
@@ -0,0 +1,688 @@
+/****************************************************************************
+ * apps/testing/ostest/multiuser.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdarg.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "ostest.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MU_UID1   1000
+#define MU_GID1   1000
+#define MU_UID2   2000
+#define MU_GID2   2000
+#define MU_GID3   3000
+
+#define MU_PSEUDO_PERM   "/ostest_mu_perm"
+#define MU_PSEUDO_SECRET "/ostest_mu_secret"
+#define MU_PSEUDO_USER   "/ostest_mu_user"
+
+#ifndef CONFIG_LIBC_TMPDIR
+#  define CONFIG_LIBC_TMPDIR "/tmp"
+#endif
+
+#define MU_TMPFS_SECRET CONFIG_LIBC_TMPDIR "/ostest_mu_secret"
+
+#define MU_CHILD_PRIORITY 100
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct mu_ctx_s
+{
+  int failures;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void mu_fail(FAR struct mu_ctx_s *ctx, FAR const char *fmt, ...)
+{
+  va_list ap;
+
+  ctx->failures++;
+  printf("  FAIL: ");
+  va_start(ap, fmt);
+  vfprintf(stdout, fmt, ap);
+  va_end(ap);
+  printf("\n");
+}
+
+static void mu_pass(FAR const char *fmt, ...)
+{
+  va_list ap;
+
+  printf("  PASS: ");
+  va_start(ap, fmt);
+  vfprintf(stdout, fmt, ap);
+  va_end(ap);
+  printf("\n");
+}
+
+static void mu_check_eq(FAR struct mu_ctx_s *ctx, FAR const char *label,
+                        long got, long want)
+{
+  if (got == want)
+    {
+      mu_pass("%s == %ld", label, want);
+    }
+  else
+    {
+      mu_fail(ctx, "%s: expected %ld, got %ld", label, want, got);
+    }
+}
+
+static int mu_restore_root(FAR struct mu_ctx_s *ctx)
+{
+  if (seteuid(0) != 0)
+    {
+      mu_fail(ctx, "seteuid(0) restore errno=%d", errno);
+      return -1;
+    }
+
+  if (setegid(0) != 0)
+    {
+      mu_fail(ctx, "setegid(0) restore errno=%d", errno);
+      return -1;
+    }
+
+  if (geteuid() != 0 || getegid() != 0)
+    {
+      mu_fail(ctx, "restore root effective credentials failed "
+              "(euid=%d egid=%d)", geteuid(), getegid());
+      return -1;
+    }
+
+  return 0;
+}
+
+static int mu_set_effective(FAR struct mu_ctx_s *ctx, uid_t uid, gid_t gid)
+{
+  /* NuttX grants arbitrary seteuid/setegid only while the effective ID
+   * is 0.  With real UID 0 (flat NSH), restore effective root before
+   * switching user, matching nsh_switch_credentials().
+   */
+
+  if (getuid() == 0 && (geteuid() != 0 || getegid() != 0))
+    {
+      if (seteuid(0) != 0)
+        {
+          mu_fail(ctx, "seteuid(0) before switch errno=%d", errno);
+          return -1;
+        }
+
+      if (setegid(0) != 0)
+        {
+          mu_fail(ctx, "setegid(0) before switch errno=%d", errno);
+          return -1;
+        }
+    }
+
+  if (seteuid(uid) != 0)
+    {
+      mu_fail(ctx, "seteuid(%u) errno=%d", (unsigned int)uid, errno);
+      return -1;
+    }
+
+  if (setegid(gid) != 0)
+    {
+      mu_fail(ctx, "setegid(%u) errno=%d", (unsigned int)gid, errno);
+      return -1;
+    }
+
+  if (geteuid() != (int)uid || getegid() != (int)gid)
+    {
+      mu_fail(ctx, "effective credential switch failed "
+              "(have euid=%d egid=%d)", geteuid(), getegid());
+      return -1;
+    }
+
+  return 0;
+}
+
+static int mu_expect_ok(FAR struct mu_ctx_s *ctx, FAR const char *op,
+                        int ret)
+{
+  if (ret == 0)
+    {
+      mu_pass("%s", op);
+      return 0;
+    }
+
+  mu_fail(ctx, "%s (ret=%d errno=%d)", op, ret, errno);
+  return -1;
+}
+
+static int mu_expect_denied(FAR struct mu_ctx_s *ctx, FAR const char *op,
+                            int ret)
+{
+  int err = errno;
+
+  if (ret != 0 && (err == EPERM || err == EACCES))
+    {
+      mu_pass("%s denied errno=%d", op, err);
+      return 0;
+    }
+
+  if (ret == 0)
+    {
+      mu_fail(ctx, "%s succeeded (expected EPERM/EACCES, euid=%d)",
+              op, geteuid());
+    }
+  else
+    {
+      mu_fail(ctx, "%s (ret=%d errno=%d, expected EPERM/EACCES)",
+              op, ret, err);
+    }
+
+  return -1;
+}
+
+static int mu_verify_owner(FAR struct mu_ctx_s *ctx, FAR const char *path,
+                           uid_t uid, gid_t gid)
+{
+  struct stat st;
+
+  if (stat(path, &st) != 0)
+    {
+      mu_fail(ctx, "stat(%s) errno=%d", path, errno);
+      return -1;
+    }
+
+  if (st.st_uid != uid || st.st_gid != gid)
+    {
+      mu_fail(ctx, "%s owner expected %u:%u got %u:%u",
+              path, (unsigned int)uid, (unsigned int)gid,
+              (unsigned int)st.st_uid, (unsigned int)st.st_gid);
+      return -1;
+    }
+
+  mu_pass("%s owner %u:%u", path, (unsigned int)uid, (unsigned int)gid);
+  return 0;
+}
+
+#if defined(CONFIG_SCHED_USER_IDENTITY)
+
+static int multiuser_effective_test(FAR struct mu_ctx_s *ctx)
+{
+  int ret;
+
+  printf("multiuser: effective UID/GID switching\n");
+
+  mu_check_eq(ctx, "initial uid", getuid(), 0);
+  mu_check_eq(ctx, "initial euid", geteuid(), 0);
+  mu_check_eq(ctx, "initial gid", getgid(), 0);
+  mu_check_eq(ctx, "initial egid", getegid(), 0);
+
+  ret = seteuid(MU_UID1);
+  if (mu_expect_ok(ctx, "root seteuid(1000)", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  mu_check_eq(ctx, "euid after seteuid(1000)", geteuid(), MU_UID1);
+
+  ret = seteuid(0);
+  if (mu_expect_ok(ctx, "root seteuid(0) restore", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  mu_check_eq(ctx, "euid restored to 0", geteuid(), 0);
+
+  ret = setegid(MU_GID2);
+  if (mu_expect_ok(ctx, "root setegid(2000)", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  mu_check_eq(ctx, "egid after setegid(2000)", getegid(), MU_GID2);
+
+  ret = setegid(0);
+  if (mu_expect_ok(ctx, "root setegid(0) restore", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  mu_check_eq(ctx, "egid restored to 0", getegid(), 0);
+
+  return ctx->failures;
+}
+
+#if defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_BUILD_KERNEL)
+
+static int multiuser_suid_child(int argc, FAR char *argv[])
+{
+  struct mu_ctx_s ctx =
+  {
+    0
+  };
+
+  int ret;
+
+  (void)argc;
+  (void)argv;
+
+  printf("multiuser_suid_child: saved set-UID/GID semantics\n");
+
+  ret = setuid(MU_UID1);
+  if (mu_expect_ok(&ctx, "setuid(1000) as root", ret) != 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  mu_check_eq(&ctx, "uid after setuid(1000)", getuid(), MU_UID1);
+  mu_check_eq(&ctx, "euid after setuid(1000)", geteuid(), MU_UID1);
+
+  ret = seteuid(0);
+  mu_expect_denied(&ctx, "non-root seteuid(0)", ret);
+  mu_check_eq(&ctx, "euid unchanged after denied seteuid(0)", geteuid(),
+              MU_UID1);
+
+  ret = seteuid(MU_UID1);
+  mu_expect_ok(&ctx, "non-root seteuid(1000)", ret);
+
+  ret = setegid(MU_GID2);
+  mu_expect_ok(&ctx, "root-group setegid(2000)", ret);
+  mu_check_eq(&ctx, "egid after setegid(2000)", getegid(), MU_GID2);
+
+  ret = setegid(0);
+  mu_expect_ok(&ctx, "root-group setegid(0) restore", ret);
+
+  ret = setgid(MU_GID3);
+  mu_expect_ok(&ctx, "setgid(3000)", ret);
+  mu_check_eq(&ctx, "gid after setgid(3000)", getgid(), MU_GID3);
+  mu_check_eq(&ctx, "egid after setgid(3000)", getegid(), MU_GID3);
+
+  ret = setegid(0);
+  mu_expect_denied(&ctx, "non-root setegid(0)", ret);
+  mu_check_eq(&ctx, "egid unchanged after denied setegid(0)", getegid(),
+              MU_GID3);
+
+  printf("multiuser_suid_child: %d failure(s)\n", ctx.failures);
+  return ctx.failures == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static int multiuser_suid_test(FAR struct mu_ctx_s *ctx)
+{
+  pid_t pid;
+  int status;
+
+  printf("multiuser: saved set-UID/GID semantics (child task)\n");
+
+  pid = task_create("mu_suid", MU_CHILD_PRIORITY, STACKSIZE,
+                    multiuser_suid_child, NULL);
+  if (pid < 0)
+    {
+      mu_fail(ctx, "task_create(mu_suid) failed");
+      return ctx->failures;
+    }
+
+  if (waitpid(pid, &status, 0) != pid)
+    {
+      mu_fail(ctx, "waitpid(mu_suid) failed errno=%d", errno);
+      return ctx->failures;
+    }
+
+  if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
+    {
+      mu_fail(ctx, "mu_suid child exited with status=%d", status);
+    }
+  else
+    {
+      mu_pass("mu_suid child completed successfully");
+    }
+
+  mu_check_eq(ctx, "parent euid after child", geteuid(), 0);
+  mu_check_eq(ctx, "parent egid after child", getegid(), 0);
+
+  return ctx->failures;
+}
+
+#endif /* CONFIG_SCHED_WAITPID && !CONFIG_BUILD_KERNEL */
+
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_PSEUDOFS_ATTRIBUTES) && \
+    defined(CONFIG_PSEUDOFS_FILE)
+
+static int multiuser_open_secret(FAR struct mu_ctx_s *ctx,
+                                 FAR const char *path, int expect_ok)
+{
+  int fd;
+
+  fd = open(path, O_RDONLY);
+  if (expect_ok)
+    {
+      if (fd < 0)
+        {
+          mu_fail(ctx, "open(%s) errno=%d (expected success)", path, errno);
+          return -1;
+        }
+
+      close(fd);
+      mu_pass("open(%s) allowed", path);
+      return 0;
+    }
+
+  if (fd >= 0)
+    {
+      close(fd);
+      mu_fail(ctx, "open(%s) succeeded (expected EACCES, euid=%d)",
+              path, geteuid());
+      return -1;
+    }
+
+  if (errno != EACCES)
+    {
+      mu_fail(ctx, "open(%s) errno=%d (expected EACCES)", path, errno);
+      return -1;
+    }
+
+  mu_pass("open(%s) denied with EACCES", path);
+  return 0;
+}
+
+static int multiuser_pseudofs_test(FAR struct mu_ctx_s *ctx)
+{
+  int fd;
+  int ret;
+
+  printf("multiuser: pseudoFS chmod/chown/open permissions\n");
+
+  unlink(MU_PSEUDO_PERM);
+  unlink(MU_PSEUDO_SECRET);
+  unlink(MU_PSEUDO_USER);
+
+  fd = open(MU_PSEUDO_PERM, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "create %s errno=%d", MU_PSEUDO_PERM, errno);
+      goto out;
+    }
+
+  close(fd);
+  mu_verify_owner(ctx, MU_PSEUDO_PERM, 0, 0);
+
+  ret = chmod(MU_PSEUDO_PERM, 0600);
+  mu_expect_ok(ctx, "root chmod(0600)", ret);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  ret = chmod(MU_PSEUDO_PERM, 0777);
+  mu_expect_denied(ctx, "non-owner chmod(0777)", ret);
+
+  ret = chown(MU_PSEUDO_PERM, 0, 0);
+  mu_expect_denied(ctx, "non-root chown(0,0)", ret);
+
+  if (mu_restore_root(ctx) != 0)
+    {
+      goto out;
+    }
+
+  ret = chown(MU_PSEUDO_PERM, MU_UID1, MU_GID1);
+  mu_expect_ok(ctx, "root chown to 1000:1000", ret);
+  mu_verify_owner(ctx, MU_PSEUDO_PERM, MU_UID1, MU_GID1);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  ret = chmod(MU_PSEUDO_PERM, 0777);
+  mu_expect_ok(ctx, "owner chmod(0777)", ret);
+
+  if (mu_restore_root(ctx) != 0)
+    {
+      goto out;
+    }
+
+  fd = open(MU_PSEUDO_SECRET, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "create %s errno=%d", MU_PSEUDO_SECRET, errno);
+      goto out;
+    }
+
+  close(fd);
+  mu_verify_owner(ctx, MU_PSEUDO_SECRET, 0, 0);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  multiuser_open_secret(ctx, MU_PSEUDO_SECRET, 0);
+
+  if (mu_restore_root(ctx) != 0)
+    {
+      goto out;
+    }
+
+  multiuser_open_secret(ctx, MU_PSEUDO_SECRET, 1);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  fd = open(MU_PSEUDO_USER, O_CREAT | O_WRONLY, 0644);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "create %s as euid=%d errno=%d",
+              MU_PSEUDO_USER, geteuid(), errno);
+      goto out;
+    }
+
+  close(fd);
+  mu_verify_owner(ctx, MU_PSEUDO_USER, MU_UID1, MU_GID1);
+
+  if (mu_set_effective(ctx, MU_UID2, MU_GID2) != 0)
+    {
+      goto out;
+    }
+
+  multiuser_open_secret(ctx, MU_PSEUDO_USER, 1);
+
+out:
+  mu_restore_root(ctx);
+  unlink(MU_PSEUDO_PERM);
+  unlink(MU_PSEUDO_SECRET);
+  unlink(MU_PSEUDO_USER);
+
+  return ctx->failures;
+}
+
+#endif /* FS_PERMISSION && PSEUDOFS_ATTRIBUTES && PSEUDOFS_FILE */
+
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_FS_TMPFS)
+
+static int multiuser_tmpfs_test(FAR struct mu_ctx_s *ctx)
+{
+  int fd;
+
+  printf("multiuser: tmpfs open permission enforcement\n");
+
+  unlink(MU_TMPFS_SECRET);
+
+  fd = open(MU_TMPFS_SECRET, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "create %s errno=%d", MU_TMPFS_SECRET, errno);
+      goto out;
+    }
+
+  close(fd);
+  mu_verify_owner(ctx, MU_TMPFS_SECRET, 0, 0);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  multiuser_open_secret(ctx, MU_TMPFS_SECRET, 0);
+
+  if (mu_restore_root(ctx) != 0)
+    {
+      goto out;
+    }
+
+  multiuser_open_secret(ctx, MU_TMPFS_SECRET, 1);
+
+out:
+  mu_restore_root(ctx);
+  unlink(MU_TMPFS_SECRET);
+
+  return ctx->failures;
+}
+
+#endif /* CONFIG_FS_PERMISSION && CONFIG_FS_TMPFS */
+
+#if defined(CONFIG_LIBC_PASSWD_FILE)
+
+static int multiuser_passwd_test(FAR struct mu_ctx_s *ctx)
+{
+  FAR struct passwd *pwd;
+
+  printf("multiuser: passwd lookup after credential drop\n");
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      return ctx->failures;
+    }
+
+  pwd = getpwnam("root");
+  if (pwd == NULL)
+    {
+      mu_fail(ctx, "getpwnam(root) failed errno=%d after seteuid(%d)",
+              errno, MU_UID1);
+    }
+  else
+    {
+      mu_pass("getpwnam(root) uid=%u", (unsigned int)pwd->pw_uid);
+    }
+
+  pwd = getpwnam("testuser");
+  if (pwd == NULL)
+    {
+      mu_fail(ctx, "getpwnam(testuser) failed errno=%d", errno);
+    }
+  else if (pwd->pw_uid != MU_UID1)
+    {
+      mu_fail(ctx, "getpwnam(testuser) uid=%u (expected %u)",
+              (unsigned int)pwd->pw_uid, (unsigned int)MU_UID1);
+    }
+  else
+    {
+      mu_pass("getpwnam(testuser) uid=%u", (unsigned int)pwd->pw_uid);
+    }
+
+  mu_restore_root(ctx);
+  return ctx->failures;
+}
+
+#endif /* CONFIG_LIBC_PASSWD_FILE */
+
+#endif /* CONFIG_SCHED_USER_IDENTITY */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int multiuser_test(void)
+{
+  struct mu_ctx_s ctx =
+  {
+    0
+  };
+
+#if defined(CONFIG_SCHED_USER_IDENTITY)
+
+  printf("multiuser_test: start\n");
+
+  multiuser_effective_test(&ctx);
+
+#if defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_BUILD_KERNEL)
+  multiuser_suid_test(&ctx);
+#else
+  printf("multiuser: skipping saved set-UID/GID child test "
+         "(need CONFIG_SCHED_WAITPID)\n");
+#endif
+
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_PSEUDOFS_ATTRIBUTES) && \
+    defined(CONFIG_PSEUDOFS_FILE)
+  multiuser_pseudofs_test(&ctx);
+#else
+  printf("multiuser: skipping pseudoFS permission tests "
+         "(need FS_PERMISSION, PSEUDOFS_ATTRIBUTES, PSEUDOFS_FILE)\n");
+#endif
+
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_FS_TMPFS)
+  multiuser_tmpfs_test(&ctx);
+#else
+  printf("multiuser: skipping tmpfs permission tests "
+         "(need FS_PERMISSION and FS_TMPFS)\n");
+#endif
+
+#if defined(CONFIG_LIBC_PASSWD_FILE)
+  multiuser_passwd_test(&ctx);
+#else
+  printf("multiuser: skipping passwd lookup test "
+         "(need LIBC_PASSWD_FILE)\n");
+#endif
+
+  mu_restore_root(&ctx);
+
+  printf("multiuser_test: %d failure(s)\n", ctx.failures);
+
+#else
+
+  printf("multiuser_test: CONFIG_SCHED_USER_IDENTITY disabled\n");
+
+#endif
+
+  return ctx.failures;
+}
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index 0fb2b8d31..5e01626c0 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -109,6 +109,12 @@ int setvbuf_test(void);
 int dev_null_test(void);
 #endif
 
+/* multiuser.c **************************************************************/
+
+#if defined(CONFIG_TESTING_OSTEST_MULTIUSER) && defined(CONFIG_SCHED_USER_IDENTITY)
+int multiuser_test(void);
+#endif
+
 /* fpu.c ********************************************************************/
 
 void fpu_test(void);
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index edbf6485d..92224701f 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -381,6 +381,19 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
+#if defined(CONFIG_TESTING_OSTEST_MULTIUSER) && defined(CONFIG_SCHED_USER_IDENTITY)
+      /* Multi-user identity and file permission regression tests */
+
+      printf("\nuser_main: multi-user test\n");
+      if (multiuser_test() != 0)
+        {
+          printf("user_main: ERROR multi-user test failed\n");
+          ASSERT(false);
+        }
+
+      check_test_memory_usage();
+#endif
+
 #if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_BUILD_FLAT) && \
     defined(CONFIG_SCHED_WORKQUEUE)
       /* Check work queues */
@@ -525,14 +538,6 @@ static int user_main(int argc, char *argv[])
       suspend_test();
       check_test_memory_usage();
 #endif
-
-#ifndef CONFIG_DISABLE_POSIX_TIMERS
-      /* Verify POSIX timers (SIGEV_SIGNAL delivered via sigwaitinfo()) */
-
-      printf("\nuser_main: POSIX timer test\n");
-      timer_test();
-      check_test_memory_usage();
-#endif
 #endif /* !CONFIG_DISABLE_ALL_SIGNALS */
 
 #ifdef CONFIG_ENABLE_ALL_SIGNALS
@@ -545,6 +550,14 @@ static int user_main(int argc, char *argv[])
       printf("\nuser_main: nested signal handler test\n");
       signest_test();
       check_test_memory_usage();
+
+#ifndef CONFIG_DISABLE_POSIX_TIMERS
+      /* Verify posix timers (with SIGEV_SIGNAL) */
+
+      printf("\nuser_main: POSIX timer test\n");
+      timer_test();
+      check_test_memory_usage();
+#endif
 #endif
 
 #ifdef CONFIG_BUILD_FLAT

From d1202bd501acb9a2a88093baaccbfcc4e70fa3df Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Mon, 15 Jun 2026 17:28:54 +0900
Subject: [PATCH 433/568] examples/rust: Avoid the infinite loop on sim for
 hello_rust_cargo

On the sim target (Windows/macOS/Linux), hello_rust_cargo_main() ended
with an infinite `loop {}` that never returned control to NSH, so the
example could not exit and the shell prompt hung.

Introduce a Cargo `sim` feature that is enabled only when CONFIG_ARCH_SIM
is set, and use it to compile out the trailing infinite loop and return 0
instead. Other embedded targets keep the original looping behavior.

Signed-off-by: Shoji Tokunaga <toku@mac.com>
---
 cmake/nuttx_add_rust.cmake         | 10 +++++++++-
 examples/rust/hello/CMakeLists.txt |  7 ++++++-
 examples/rust/hello/Cargo.toml     |  3 +++
 examples/rust/hello/Makefile       |  6 +++++-
 examples/rust/hello/src/lib.rs     |  7 ++++++-
 tools/Rust.mk                      |  9 ++++++---
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake
index 54b17255b..cfc527b9b 100644
--- a/cmake/nuttx_add_rust.cmake
+++ b/cmake/nuttx_add_rust.cmake
@@ -130,6 +130,8 @@ endfunction()
 #    hello
 #    CRATE_PATH
 #    ${CMAKE_CURRENT_SOURCE_DIR}/hello
+#    FEATURES
+#    sim
 #  )
 # ~~~
 
@@ -142,6 +144,8 @@ function(nuttx_add_rust)
     ONE_VALUE
     CRATE_NAME
     CRATE_PATH
+    MULTI_VALUE
+    FEATURES
     REQUIRED
     CRATE_NAME
     CRATE_PATH
@@ -159,6 +163,10 @@ function(nuttx_add_rust)
     set(RUST_PANIC_FLAGS "")
   endif()
 
+  foreach(feature ${FEATURES})
+    list(APPEND RUST_FEATURE_FLAGS --features ${feature})
+  endforeach()
+
   # Get the Rust target triple
   nuttx_rust_target_triple(${LLVM_ARCHTYPE} ${LLVM_ABITYPE} ${LLVM_CPUTYPE}
                            RUST_TARGET)
@@ -198,7 +206,7 @@ function(nuttx_add_rust)
       RUSTFLAGS=${RUST_PANIC_FLAGS} cargo build ${RUST_PROFILE_FLAG}
       -Zbuild-std=std,panic_abort -Zjson-target-spec --manifest-path
       ${CRATE_PATH}/Cargo.toml --target ${RUST_TARGET} --target-dir
-      ${RUST_BUILD_DIR}
+      ${RUST_BUILD_DIR} ${RUST_FEATURE_FLAGS}
     DEPENDS ${RUST_CRATE_SOURCES}
     COMMENT "Building Rust crate ${CRATE_NAME}"
     VERBATIM)
diff --git a/examples/rust/hello/CMakeLists.txt b/examples/rust/hello/CMakeLists.txt
index 2a83be84e..b84e0234a 100644
--- a/examples/rust/hello/CMakeLists.txt
+++ b/examples/rust/hello/CMakeLists.txt
@@ -21,7 +21,12 @@
 if(CONFIG_EXAMPLES_HELLO_RUST_CARGO)
 
   # Build the Rust crate using nuttx_add_rust
-  nuttx_add_rust(CRATE_NAME hello CRATE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+  if(CONFIG_ARCH_SIM)
+    nuttx_add_rust(CRATE_NAME hello CRATE_PATH ${CMAKE_CURRENT_SOURCE_DIR}
+                   FEATURES sim)
+  else()
+    nuttx_add_rust(CRATE_NAME hello CRATE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
 
   nuttx_add_application(
     NAME ${CONFIG_EXAMPLES_HELLO_RUST_CARGO_PROGNAME} STACKSIZE
diff --git a/examples/rust/hello/Cargo.toml b/examples/rust/hello/Cargo.toml
index 0741516b9..d58728934 100644
--- a/examples/rust/hello/Cargo.toml
+++ b/examples/rust/hello/Cargo.toml
@@ -6,6 +6,9 @@ edition = "2021"
 [lib]
 crate-type = ["staticlib"]
 
+[features]
+sim = []
+
 [profile.dev]
 panic = "abort"
 
diff --git a/examples/rust/hello/Makefile b/examples/rust/hello/Makefile
index c5af98671..0e1b534c4 100644
--- a/examples/rust/hello/Makefile
+++ b/examples/rust/hello/Makefile
@@ -30,8 +30,12 @@ MODULE    = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO)
 RUST_LIB  := $(call RUST_GET_BINDIR,hello,$(APPDIR)/examples/rust)
 RUST_SRCS := $(call RUST_CARGO_SRCS,hello,$(APPDIR)/examples/rust)
 
+ifeq ($(CONFIG_ARCH_SIM),y)
+HELLO_RUST_FEATURES := sim
+endif
+
 $(RUST_LIB): $(RUST_SRCS)
-	$(call RUST_CARGO_BUILD,hello,$(APPDIR)/examples/rust)
+	$(call RUST_CARGO_BUILD,hello,$(APPDIR)/examples/rust,$(HELLO_RUST_FEATURES))
 
 context:: $(RUST_LIB)
 
diff --git a/examples/rust/hello/src/lib.rs b/examples/rust/hello/src/lib.rs
index f50cf5bc5..dbe71ca0e 100644
--- a/examples/rust/hello/src/lib.rs
+++ b/examples/rust/hello/src/lib.rs
@@ -1,6 +1,7 @@
 extern crate serde;
 extern crate serde_json;
 
+use core::ffi::{c_char, c_int};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
@@ -11,7 +12,7 @@ struct Person {
 
 // Function hello_rust_cargo without manglng
 #[no_mangle]
-pub extern "C" fn hello_rust_cargo_main() {
+pub extern "C" fn hello_rust_cargo_main(_argc: c_int, _argv: *mut *mut c_char) -> c_int {
     // Print hello world to stdout
 
     let john = Person {
@@ -50,7 +51,11 @@ pub extern "C" fn hello_rust_cargo_main() {
             println!("Hello world from tokio!");
         });
 
+    #[cfg(not(feature = "sim"))]
     loop {
         // Do nothing
     }
+
+    #[cfg(feature = "sim")]
+    0
 }
diff --git a/tools/Rust.mk b/tools/Rust.mk
index 06b65f7c5..722c62380 100644
--- a/tools/Rust.mk
+++ b/tools/Rust.mk
@@ -90,11 +90,12 @@ endef
 
 # Build Rust project using cargo
 #
-# Usage:   $(call RUST_CARGO_BUILD,cratename,prefix)
+# Usage:   $(call RUST_CARGO_BUILD,cratename,prefix[,features])
 #
 # Inputs:
 #   cratename - Name of the Rust crate (e.g. hello)
 #   prefix    - Path prefix to the crate (e.g. path/to/project)
+#   features  - Optional Cargo features to enable
 #
 # Output:
 #   None, builds the Rust project
@@ -105,7 +106,8 @@ define RUST_CARGO_BUILD
     RUSTFLAGS="-Zunstable-options -Cpanic=immediate-abort" \
     cargo build --release -Zbuild-std=std,panic_abort -Zjson-target-spec \
 		--manifest-path $(2)/$(1)/Cargo.toml \
-		--target $(call RUST_TARGET_TRIPLE)
+		--target $(call RUST_TARGET_TRIPLE) \
+		$(if $(strip $(3)),--features $(3),)
 endef
 else
 define RUST_CARGO_BUILD
@@ -113,7 +115,8 @@ define RUST_CARGO_BUILD
 	NUTTX_INCLUDE_DIR=$(TOPDIR)/include:$(TOPDIR)/include/arch \
     cargo build -Zbuild-std=std,panic_abort -Zjson-target-spec \
 		--manifest-path $(2)/$(1)/Cargo.toml \
-		--target $(call RUST_TARGET_TRIPLE)
+		--target $(call RUST_TARGET_TRIPLE) \
+		$(if $(strip $(3)),--features $(3),)
 endef
 endif
 

From 8d6c49536569b517a97bf3104edb83636e2b910e Mon Sep 17 00:00:00 2001
From: Shoji Tokunaga <toku@mac.com>
Date: Thu, 18 Jun 2026 23:53:58 +0900
Subject: [PATCH 434/568] examples/rust: Show command arguments in
 hello_rust_cargo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Print each argument passed from nsh with its index, and report when
the example is running on the simulator target. This makes the Rust
example demonstrate both C argv handling and target-specific output.

Signed-off-by: Shoji Tokunaga <toku@mac.​com>
---
 examples/rust/hello/src/lib.rs | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/examples/rust/hello/src/lib.rs b/examples/rust/hello/src/lib.rs
index dbe71ca0e..e9b0e0ade 100644
--- a/examples/rust/hello/src/lib.rs
+++ b/examples/rust/hello/src/lib.rs
@@ -1,7 +1,7 @@
 extern crate serde;
 extern crate serde_json;
 
-use core::ffi::{c_char, c_int};
+use core::ffi::{c_char, c_int, CStr};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
@@ -10,10 +10,29 @@ struct Person {
     age: u8,
 }
 
-// Function hello_rust_cargo without manglng
+fn print_args(argc: c_int, argv: *mut *mut c_char) {
+    if argv.is_null() {
+        return;
+    }
+
+    for i in 1..argc {
+        let arg = unsafe { *argv.add(i as usize) };
+        if arg.is_null() {
+            continue;
+        }
+
+        let arg = unsafe { CStr::from_ptr(arg) }.to_string_lossy();
+        println!("{}: {}", i, arg);
+    }
+}
+
+// Function hello_rust_cargo without mangling
 #[no_mangle]
-pub extern "C" fn hello_rust_cargo_main(_argc: c_int, _argv: *mut *mut c_char) -> c_int {
-    // Print hello world to stdout
+pub extern "C" fn hello_rust_cargo_main(argc: c_int, argv: *mut *mut c_char) -> c_int {
+    print_args(argc, argv);
+
+    #[cfg(feature = "sim")]
+    println!("On simulator");
 
     let john = Person {
         name: "John".to_string(),
@@ -50,12 +69,5 @@ pub extern "C" fn hello_rust_cargo_main(_argc: c_int, _argv: *mut *mut c_char) -
         .block_on(async {
             println!("Hello world from tokio!");
         });
-
-    #[cfg(not(feature = "sim"))]
-    loop {
-        // Do nothing
-    }
-
-    #[cfg(feature = "sim")]
     0
 }

From 1a6d06c3be6b9875904863661b3859d18ed44940 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Mon, 15 Jun 2026 21:32:36 +0800
Subject: [PATCH 435/568] examples/gps: show units in output

The GPS example prints parsed measurements without explicit units. The RMC
floating-point speed path also used minmea_tocoord(), even though speed is
not a coordinate.

Add units to the output labels, print speed with minmea_tofloat(), and print
GGA altitude as a scaled value with the sentence-provided unit.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 examples/gps/gps_main.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/gps/gps_main.c b/examples/gps/gps_main.c
index 72673944d..4434a97ed 100644
--- a/examples/gps/gps_main.c
+++ b/examples/gps/gps_main.c
@@ -99,21 +99,21 @@ int main(int argc, FAR char *argv[])
 
               if (minmea_parse_rmc(&frame, line))
                 {
-                  printf("Fixed-point Latitude...........: %" PRIdLEAST32
-                         "\n",
+                  printf("Fixed-point Latitude (NMEA * 1000)..: %"
+                         PRIdLEAST32 "\n",
                          minmea_rescale(&frame.latitude, 1000));
-                  printf("Fixed-point Longitude..........: %" PRIdLEAST32
-                         "\n",
+                  printf("Fixed-point Longitude (NMEA * 1000).: %"
+                         PRIdLEAST32 "\n",
                          minmea_rescale(&frame.longitude, 1000));
-                  printf("Fixed-point Speed..............: %" PRIdLEAST32
-                         "\n",
+                  printf("Fixed-point Speed (knots * 1000)....: %"
+                         PRIdLEAST32 "\n",
                          minmea_rescale(&frame.speed, 1000));
-                  printf("Floating point degree latitude.: %2.6f\n",
+                  printf("Floating point Latitude (degrees)...: %2.6f\n",
                          minmea_tocoord(&frame.latitude));
-                  printf("Floating point degree longitude: %2.6f\n",
+                  printf("Floating point Longitude (degrees)..: %2.6f\n",
                          minmea_tocoord(&frame.longitude));
-                  printf("Floating point speed...........: %2.6f\n",
-                         minmea_tocoord(&frame.speed));
+                  printf("Floating point Speed (knots)........: %2.6f\n",
+                         minmea_tofloat(&frame.speed));
                 }
               else
                 {
@@ -130,9 +130,9 @@ int main(int argc, FAR char *argv[])
                 {
                   printf("Fix quality....................: %d\n",
                          frame.fix_quality);
-                  printf("Altitude.......................: %" PRIdLEAST32
-                         "\n",
-                         frame.altitude.value);
+                  printf("Altitude (%c)...................: %2.6f\n",
+                         frame.altitude_units ? frame.altitude_units : '?',
+                         minmea_tofloat(&frame.altitude));
                   printf("Tracked satellites.............: %d\n",
                          frame.satellites_tracked);
                 }

From 477d04b975a91c27cde6eafc2bda8276508a3794 Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 17 Jun 2026 16:54:40 +0800
Subject: [PATCH 436/568] examples/gps: print units after measurements

Move GPS example units after the printed values to match the requested output style.

Wrap long printf format strings for checkpatch.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 examples/gps/gps_main.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/examples/gps/gps_main.c b/examples/gps/gps_main.c
index 4434a97ed..68f6da66e 100644
--- a/examples/gps/gps_main.c
+++ b/examples/gps/gps_main.c
@@ -99,20 +99,23 @@ int main(int argc, FAR char *argv[])
 
               if (minmea_parse_rmc(&frame, line))
                 {
-                  printf("Fixed-point Latitude (NMEA * 1000)..: %"
-                         PRIdLEAST32 "\n",
+                  printf("Fixed-point Latitude................: %"
+                         PRIdLEAST32 " (NMEA * 1000)\n",
                          minmea_rescale(&frame.latitude, 1000));
-                  printf("Fixed-point Longitude (NMEA * 1000).: %"
-                         PRIdLEAST32 "\n",
+                  printf("Fixed-point Longitude...............: %"
+                         PRIdLEAST32 " (NMEA * 1000)\n",
                          minmea_rescale(&frame.longitude, 1000));
-                  printf("Fixed-point Speed (knots * 1000)....: %"
-                         PRIdLEAST32 "\n",
+                  printf("Fixed-point Speed...................: %"
+                         PRIdLEAST32 " (knots * 1000)\n",
                          minmea_rescale(&frame.speed, 1000));
-                  printf("Floating point Latitude (degrees)...: %2.6f\n",
+                  printf("Floating point Latitude.............: %2.6f "
+                         "degrees\n",
                          minmea_tocoord(&frame.latitude));
-                  printf("Floating point Longitude (degrees)..: %2.6f\n",
+                  printf("Floating point Longitude............: %2.6f "
+                         "degrees\n",
                          minmea_tocoord(&frame.longitude));
-                  printf("Floating point Speed (knots)........: %2.6f\n",
+                  printf("Floating point Speed................: %2.6f "
+                         "knots\n",
                          minmea_tofloat(&frame.speed));
                 }
               else
@@ -130,9 +133,9 @@ int main(int argc, FAR char *argv[])
                 {
                   printf("Fix quality....................: %d\n",
                          frame.fix_quality);
-                  printf("Altitude (%c)...................: %2.6f\n",
-                         frame.altitude_units ? frame.altitude_units : '?',
-                         minmea_tofloat(&frame.altitude));
+                  printf("Altitude.......................: %2.6f %c\n",
+                         minmea_tofloat(&frame.altitude),
+                         frame.altitude_units ? frame.altitude_units : '?');
                   printf("Tracked satellites.............: %d\n",
                          frame.satellites_tracked);
                 }

From 65854ea80563b91e11e9763ec2fa826b5a32657e Mon Sep 17 00:00:00 2001
From: aviralgarg05 <gargaviral99@gmail.com>
Date: Mon, 18 May 2026 15:56:33 +0530
Subject: [PATCH 437/568] system/nxpkg: add local package lifecycle helper

Add the initial nxpkg command, metadata and store handling, the local install/list path, and the repository export helper.

Keep the current flow scoped to local artifacts and target-qualified repository entries so it remains usable as an incremental MVP while follow-up features land separately.

Signed-off-by: aviralgarg05 <gargaviral99@gmail.com>
---
 system/nxpkg/CMakeLists.txt |  43 ++
 system/nxpkg/Kconfig        |  32 ++
 system/nxpkg/Make.defs      |  25 ++
 system/nxpkg/Makefile       |  34 ++
 system/nxpkg/pkg.h          | 187 +++++++++
 system/nxpkg/pkg_compat.c   |  64 +++
 system/nxpkg/pkg_hash.c     |  98 +++++
 system/nxpkg/pkg_install.c  | 501 +++++++++++++++++++++++
 system/nxpkg/pkg_log.c      |  65 +++
 system/nxpkg/pkg_main.c     | 106 +++++
 system/nxpkg/pkg_manifest.c | 155 ++++++++
 system/nxpkg/pkg_metadata.c | 770 ++++++++++++++++++++++++++++++++++++
 system/nxpkg/pkg_store.c    | 501 +++++++++++++++++++++++
 system/nxpkg/pkg_txn.c      | 110 ++++++
 tools/export_pkg_repo.py    | 229 +++++++++++
 15 files changed, 2920 insertions(+)
 create mode 100644 system/nxpkg/CMakeLists.txt
 create mode 100644 system/nxpkg/Kconfig
 create mode 100644 system/nxpkg/Make.defs
 create mode 100644 system/nxpkg/Makefile
 create mode 100644 system/nxpkg/pkg.h
 create mode 100644 system/nxpkg/pkg_compat.c
 create mode 100644 system/nxpkg/pkg_hash.c
 create mode 100644 system/nxpkg/pkg_install.c
 create mode 100644 system/nxpkg/pkg_log.c
 create mode 100644 system/nxpkg/pkg_main.c
 create mode 100644 system/nxpkg/pkg_manifest.c
 create mode 100644 system/nxpkg/pkg_metadata.c
 create mode 100644 system/nxpkg/pkg_store.c
 create mode 100644 system/nxpkg/pkg_txn.c
 create mode 100644 tools/export_pkg_repo.py

diff --git a/system/nxpkg/CMakeLists.txt b/system/nxpkg/CMakeLists.txt
new file mode 100644
index 000000000..8ac3e3585
--- /dev/null
+++ b/system/nxpkg/CMakeLists.txt
@@ -0,0 +1,43 @@
+# ##############################################################################
+# apps/system/nxpkg/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_NXPKG)
+  nuttx_add_application(
+    MODULE
+    ${CONFIG_SYSTEM_NXPKG}
+    NAME
+    ${CONFIG_SYSTEM_NXPKG_PROGNAME}
+    STACKSIZE
+    ${CONFIG_SYSTEM_NXPKG_STACKSIZE}
+    PRIORITY
+    ${CONFIG_SYSTEM_NXPKG_PRIORITY}
+    SRCS
+    pkg_main.c
+    pkg_compat.c
+    pkg_hash.c
+    pkg_install.c
+    pkg_log.c
+    pkg_manifest.c
+    pkg_metadata.c
+    pkg_store.c
+    pkg_txn.c)
+endif()
diff --git a/system/nxpkg/Kconfig b/system/nxpkg/Kconfig
new file mode 100644
index 000000000..afc7fa326
--- /dev/null
+++ b/system/nxpkg/Kconfig
@@ -0,0 +1,32 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_NXPKG
+	bool "'nxpkg' lifecycle helper"
+	default n
+	select CRYPTO
+	select NETUTILS_CJSON
+	---help---
+		Enable the thin package lifecycle helper proposed for the
+		Dynamic ELF distribution work.
+
+if SYSTEM_NXPKG
+
+config SYSTEM_NXPKG_PROGNAME
+	string "Program name"
+	default "nxpkg"
+	---help---
+		This is the name of the program that will be used when the
+		nxpkg tool is installed.
+
+config SYSTEM_NXPKG_PRIORITY
+	int "'nxpkg' task priority"
+	default 100
+
+config SYSTEM_NXPKG_STACKSIZE
+	int "'nxpkg' stack size"
+	default 16384
+
+endif
diff --git a/system/nxpkg/Make.defs b/system/nxpkg/Make.defs
new file mode 100644
index 000000000..bdb799080
--- /dev/null
+++ b/system/nxpkg/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/nxpkg/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_NXPKG),)
+CONFIGURED_APPS += $(APPDIR)/system/nxpkg
+endif
diff --git a/system/nxpkg/Makefile b/system/nxpkg/Makefile
new file mode 100644
index 000000000..757f9fc89
--- /dev/null
+++ b/system/nxpkg/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/system/nxpkg/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_SYSTEM_NXPKG_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_NXPKG_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_NXPKG_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_NXPKG)
+
+CSRCS = pkg_compat.c pkg_hash.c pkg_install.c pkg_log.c pkg_manifest.c
+CSRCS += pkg_metadata.c pkg_store.c pkg_txn.c
+MAINSRC = pkg_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/system/nxpkg/pkg.h b/system/nxpkg/pkg.h
new file mode 100644
index 000000000..39a4bf0c2
--- /dev/null
+++ b/system/nxpkg/pkg.h
@@ -0,0 +1,187 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_SYSTEM_NXPKG_PKG_H
+#define __APPS_SYSTEM_NXPKG_PKG_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <limits.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define PKG_REPO_DIR          "/etc/nxpkg"
+#define PKG_REPO_INDEX        "/etc/nxpkg/index.json"
+#define PKG_REPO_INSTALLED    "/var/lib/nxpkg/installed.json"
+#define PKG_STORE_DIR         "/var/lib/nxpkg/pkgs"
+#define PKG_TMP_DIR           "/var/cache/nxpkg"
+#define PKG_TMP_PKG_DIR       "/var/cache/nxpkg/pkg"
+
+#define PKG_NAME_MAX          63
+#define PKG_VERSION_MAX       31
+#define PKG_ARCH_MAX          31
+#define PKG_COMPAT_MAX        63
+#define PKG_HASH_HEX_LEN      64
+#define PKG_INDEX_MAX         32
+#define PKG_INSTALLED_MAX     16
+#define PKG_INSTALLED_VERSIONS_MAX 8
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+enum pkg_payload_type_e
+{
+  PKG_PAYLOAD_ELF = 0,
+  PKG_PAYLOAD_SHARED_LIB
+};
+
+enum pkg_txn_state_e
+{
+  PKG_TXN_IDLE = 0,
+  PKG_TXN_FETCHING,
+  PKG_TXN_VERIFIED,
+  PKG_TXN_STAGED,
+  PKG_TXN_COMPAT_OK,
+  PKG_TXN_ACTIVATED,
+  PKG_TXN_CLEANUP,
+  PKG_TXN_FAILED,
+  PKG_TXN_RESTORE
+};
+
+struct pkg_manifest_s
+{
+  char name[PKG_NAME_MAX + 1];
+  char version[PKG_VERSION_MAX + 1];
+  char arch[PKG_ARCH_MAX + 1];
+  char compat[PKG_COMPAT_MAX + 1];
+  char artifact[PATH_MAX];
+  char sha256[PKG_HASH_HEX_LEN + 1];
+  enum pkg_payload_type_e type;
+};
+
+struct pkg_index_s
+{
+  struct pkg_manifest_s manifests[PKG_INDEX_MAX];
+  size_t count;
+};
+
+struct pkg_installed_entry_s
+{
+  char name[PKG_NAME_MAX + 1];
+  char current[PKG_VERSION_MAX + 1];
+  char previous[PKG_VERSION_MAX + 1];
+  char arch[PKG_ARCH_MAX + 1];
+  char compat[PKG_COMPAT_MAX + 1];
+  char versions[PKG_INSTALLED_VERSIONS_MAX][PKG_VERSION_MAX + 1];
+  enum pkg_payload_type_e type;
+  size_t version_count;
+};
+
+struct pkg_installed_db_s
+{
+  struct pkg_installed_entry_s entries[PKG_INSTALLED_MAX];
+  size_t count;
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+const char *pkg_manifest_type_str(enum pkg_payload_type_e type);
+int pkg_manifest_validate(FAR const struct pkg_manifest_s *manifest);
+int pkg_manifest_parse_type(FAR const char *value,
+                            FAR enum pkg_payload_type_e *type);
+
+int pkg_store_prepare_layout(void);
+int pkg_store_ensure_package_root(FAR const char *name);
+int pkg_store_ensure_version_dir(FAR const char *name,
+                                 FAR const char *version);
+int pkg_store_format_index_path(FAR char *buffer, size_t size);
+int pkg_store_format_installed_path(FAR char *buffer, size_t size);
+int pkg_store_format_package_root(FAR char *buffer, size_t size,
+                                  FAR const char *name);
+int pkg_store_format_version_path(FAR char *buffer, size_t size,
+                                  FAR const char *name,
+                                  FAR const char *version);
+int pkg_store_format_current_path(FAR char *buffer, size_t size,
+                                  FAR const char *name);
+int pkg_store_format_previous_path(FAR char *buffer, size_t size,
+                                   FAR const char *name);
+int pkg_store_format_txn_path(FAR char *buffer, size_t size,
+                              FAR const char *name);
+int pkg_store_format_lock_path(FAR char *buffer, size_t size,
+                               FAR const char *name);
+int pkg_store_format_download_path(FAR char *buffer, size_t size,
+                                   FAR const char *name,
+                                   FAR const char *version);
+int pkg_store_format_payload_path(FAR char *buffer, size_t size,
+                                  FAR const char *name,
+                                  FAR const char *version,
+                                  FAR const char *artifact);
+int pkg_store_format_manifest_path(FAR char *buffer, size_t size,
+                                   FAR const char *name,
+                                   FAR const char *version);
+int pkg_store_read_text(FAR const char *path, FAR char **buffer);
+int pkg_store_write_text_atomic(FAR const char *path, FAR const char *text);
+int pkg_store_copy_file(FAR const char *src, FAR const char *dest);
+int pkg_store_remove_file(FAR const char *path);
+
+const char *pkg_runtime_arch(void);
+const char *pkg_runtime_compat(void);
+int pkg_compat_check(FAR const struct pkg_manifest_s *manifest);
+
+int pkg_hash_file_sha256(FAR const char *path,
+                         FAR char digest[PKG_HASH_HEX_LEN + 1]);
+
+int pkg_metadata_load_index(FAR struct pkg_index_s *index);
+FAR const struct pkg_manifest_s *
+pkg_metadata_find_latest(FAR const struct pkg_index_s *index,
+                         FAR const char *name);
+int pkg_metadata_load_installed(FAR struct pkg_installed_db_s *db);
+int pkg_metadata_save_installed(FAR const struct pkg_installed_db_s *db);
+FAR struct pkg_installed_entry_s *
+pkg_metadata_find_installed(FAR struct pkg_installed_db_s *db,
+                            FAR const char *name);
+int pkg_metadata_write_manifest(FAR const char *path,
+                                FAR const struct pkg_manifest_s *manifest);
+int pkg_metadata_print_installed(FAR FILE *stream,
+                                 FAR const struct pkg_installed_db_s *db);
+
+const char *pkg_txn_state_str(enum pkg_txn_state_e state);
+int pkg_txn_write_state(FAR const char *name, enum pkg_txn_state_e state);
+int pkg_txn_clear_state(FAR const char *name);
+
+int pkg_install(FAR const char *name);
+int pkg_list(FAR FILE *stream);
+
+void pkg_error(FAR const char *fmt, ...);
+void pkg_info(FAR const char *fmt, ...);
+
+#endif /* __APPS_SYSTEM_NXPKG_PKG_H */
diff --git a/system/nxpkg/pkg_compat.c b/system/nxpkg/pkg_compat.c
new file mode 100644
index 000000000..301fb07aa
--- /dev/null
+++ b/system/nxpkg/pkg_compat.c
@@ -0,0 +1,64 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_compat.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <string.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+const char *pkg_runtime_arch(void)
+{
+  return CONFIG_ARCH;
+}
+
+const char *pkg_runtime_compat(void)
+{
+  return CONFIG_ARCH_BOARD;
+}
+
+int pkg_compat_check(FAR const struct pkg_manifest_s *manifest)
+{
+  if (manifest == NULL)
+    {
+      return -EINVAL;
+    }
+
+  if (strcmp(manifest->arch, pkg_runtime_arch()) != 0)
+    {
+      return -ENOEXEC;
+    }
+
+  if (strcmp(manifest->compat, pkg_runtime_compat()) != 0)
+    {
+      return -EXDEV;
+    }
+
+  return 0;
+}
diff --git a/system/nxpkg/pkg_hash.c b/system/nxpkg/pkg_hash.c
new file mode 100644
index 000000000..8ea1889f5
--- /dev/null
+++ b/system/nxpkg/pkg_hash.c
@@ -0,0 +1,98 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_hash.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <crypto/sha2.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void pkg_hex_encode(FAR const uint8_t *input, size_t length,
+                           FAR char *output)
+{
+  static const char g_hex[] = "0123456789abcdef";
+  size_t i;
+
+  for (i = 0; i < length; i++)
+    {
+      output[i * 2] = g_hex[input[i] >> 4];
+      output[i * 2 + 1] = g_hex[input[i] & 0x0f];
+    }
+
+  output[length * 2] = '\0';
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int pkg_hash_file_sha256(FAR const char *path,
+                         FAR char digest[PKG_HASH_HEX_LEN + 1])
+{
+  SHA2_CTX ctx;
+  FAR FILE *stream;
+  uint8_t raw[SHA256_DIGEST_LENGTH];
+  uint8_t buffer[512];
+  size_t nread;
+
+  stream = fopen(path, "rb");
+  if (stream == NULL)
+    {
+      return -errno;
+    }
+
+  sha256init(&ctx);
+
+  for (; ; )
+    {
+      nread = fread(buffer, 1, sizeof(buffer), stream);
+      if (nread > 0)
+        {
+          sha256update(&ctx, buffer, nread);
+        }
+
+      if (nread < sizeof(buffer))
+        {
+          if (ferror(stream))
+            {
+              fclose(stream);
+              return -EIO;
+            }
+
+          break;
+        }
+    }
+
+  fclose(stream);
+  sha256final(raw, &ctx);
+  pkg_hex_encode(raw, sizeof(raw), digest);
+  return 0;
+}
diff --git a/system/nxpkg/pkg_install.c b/system/nxpkg/pkg_install.c
new file mode 100644
index 000000000..c40982001
--- /dev/null
+++ b/system/nxpkg/pkg_install.c
@@ -0,0 +1,501 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_install.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <strings.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int pkg_install_resolve_artifact(FAR char *buffer, size_t size,
+                                        FAR const struct pkg_manifest_s
+                                          *manifest)
+{
+  int ret;
+
+  if (manifest->artifact[0] == '/')
+    {
+      ret = snprintf(buffer, size, "%s", manifest->artifact);
+      if (ret < 0)
+        {
+          return ret;
+        }
+
+      return (size_t)ret >= size ? -ENAMETOOLONG : 0;
+    }
+
+  ret = snprintf(buffer, size, "%s/%s", PKG_REPO_DIR, manifest->artifact);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return (size_t)ret >= size ? -ENAMETOOLONG : 0;
+}
+
+static int pkg_install_acquire_lock(FAR const char *name, FAR char *path,
+                                    size_t size)
+{
+  int fd;
+  int ret;
+
+  ret = pkg_store_ensure_package_root(name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_format_lock_path(path, size, name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  fd = open(path, O_WRONLY | O_CREAT | O_EXCL, 0644);
+  if (fd < 0)
+    {
+      return errno == EEXIST ? -EBUSY : -errno;
+    }
+
+  close(fd);
+  return 0;
+}
+
+static bool pkg_install_has_version(
+              FAR const struct pkg_installed_entry_s *entry,
+              FAR const char *version)
+{
+  size_t i;
+
+  for (i = 0; i < entry->version_count; i++)
+    {
+      if (strcmp(entry->versions[i], version) == 0)
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
+static int pkg_install_add_version(FAR struct pkg_installed_entry_s *entry,
+                                   FAR const char *version)
+{
+  int ret;
+
+  if (pkg_install_has_version(entry, version))
+    {
+      return 0;
+    }
+
+  if (entry->version_count >= PKG_INSTALLED_VERSIONS_MAX)
+    {
+      return -E2BIG;
+    }
+
+  ret = snprintf(entry->versions[entry->version_count],
+                 sizeof(entry->versions[entry->version_count]),
+                 "%s", version);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= sizeof(entry->versions[entry->version_count]))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  entry->version_count++;
+  return 0;
+}
+
+static int pkg_install_update_installed(FAR struct pkg_installed_db_s *db,
+                                        FAR const struct pkg_manifest_s
+                                          *manifest)
+{
+  FAR struct pkg_installed_entry_s *entry;
+  int ret;
+
+  entry = pkg_metadata_find_installed(db, manifest->name);
+  if (entry == NULL)
+    {
+      if (db->count >= PKG_INSTALLED_MAX)
+        {
+          return -E2BIG;
+        }
+
+      entry = &db->entries[db->count++];
+      memset(entry, 0, sizeof(*entry));
+      ret = snprintf(entry->name, sizeof(entry->name), "%s", manifest->name);
+      if (ret < 0 || (size_t)ret >= sizeof(entry->name))
+        {
+          return -ENAMETOOLONG;
+        }
+    }
+
+  if (entry->current[0] != '\0' &&
+      strcmp(entry->current, manifest->version) != 0)
+    {
+      ret = snprintf(entry->previous, sizeof(entry->previous), "%s",
+                     entry->current);
+      if (ret < 0 || (size_t)ret >= sizeof(entry->previous))
+        {
+          return -ENAMETOOLONG;
+        }
+    }
+
+  ret = snprintf(entry->current, sizeof(entry->current), "%s",
+                 manifest->version);
+  if (ret < 0 || (size_t)ret >= sizeof(entry->current))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  ret = snprintf(entry->arch, sizeof(entry->arch), "%s", manifest->arch);
+  if (ret < 0 || (size_t)ret >= sizeof(entry->arch))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  ret = snprintf(entry->compat, sizeof(entry->compat), "%s",
+                 manifest->compat);
+  if (ret < 0 || (size_t)ret >= sizeof(entry->compat))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  entry->type = manifest->type;
+  return pkg_install_add_version(entry, manifest->version);
+}
+
+static int pkg_install_write_pointers(
+              FAR const struct pkg_installed_db_s *db,
+              FAR const struct pkg_manifest_s *manifest)
+{
+  FAR struct pkg_installed_entry_s *entry;
+  char current[PATH_MAX];
+  char previous[PATH_MAX];
+  int ret;
+
+  entry = pkg_metadata_find_installed((FAR struct pkg_installed_db_s *)db,
+                                      manifest->name);
+  if (entry == NULL)
+    {
+      return -ENOENT;
+    }
+
+  ret = pkg_store_format_current_path(current, sizeof(current),
+                                      manifest->name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_format_previous_path(previous, sizeof(previous),
+                                       manifest->name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_write_text_atomic(current, entry->current);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return pkg_store_write_text_atomic(previous, entry->previous);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int pkg_install(FAR const char *name)
+{
+  FAR struct pkg_index_s *index;
+  FAR struct pkg_installed_db_s *installed;
+  FAR const struct pkg_manifest_s *manifest;
+  char source[PATH_MAX];
+  char tmp[PATH_MAX] = "";
+  char payload[PATH_MAX];
+  char manifest_path[PATH_MAX];
+  char lock[PATH_MAX] = "";
+  char digest[PKG_HASH_HEX_LEN + 1];
+  int ret;
+
+  index = malloc(sizeof(*index));
+  installed = malloc(sizeof(*installed));
+  if (index == NULL || installed == NULL)
+    {
+      free(index);
+      free(installed);
+      pkg_error("unable to allocate package metadata buffers");
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_store_prepare_layout();
+  if (ret < 0)
+    {
+      free(index);
+      free(installed);
+      pkg_error("unable to prepare package layout: %d", ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_metadata_load_index(index);
+  if (ret < 0)
+    {
+      free(index);
+      free(installed);
+      pkg_error("unable to load local index metadata: %d", ret);
+      return EXIT_FAILURE;
+    }
+
+  manifest = pkg_metadata_find_latest(index, name);
+  if (manifest == NULL)
+    {
+      free(index);
+      free(installed);
+      pkg_error("package '%s' not found in local index", name);
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_install_resolve_artifact(source, sizeof(source), manifest);
+  if (ret < 0)
+    {
+      pkg_error("artifact path for '%s' is too long", name);
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_install_acquire_lock(name, lock, sizeof(lock));
+  if (ret < 0)
+    {
+      pkg_error("unable to acquire package lock for '%s': %d", name, ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_txn_write_state(name, PKG_TXN_FETCHING);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_store_format_download_path(tmp, sizeof(tmp), manifest->name,
+                                       manifest->version);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_store_copy_file(source, tmp);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_hash_file_sha256(tmp, digest);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  if (strcasecmp(digest, manifest->sha256) != 0)
+    {
+      ret = -EILSEQ;
+      goto errout;
+    }
+
+  ret = pkg_txn_write_state(name, PKG_TXN_VERIFIED);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_store_ensure_version_dir(manifest->name, manifest->version);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_store_format_payload_path(payload, sizeof(payload),
+                                      manifest->name, manifest->version,
+                                      manifest->artifact);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_store_copy_file(tmp, payload);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_store_format_manifest_path(manifest_path, sizeof(manifest_path),
+                                       manifest->name, manifest->version);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_metadata_write_manifest(manifest_path, manifest);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_txn_write_state(name, PKG_TXN_STAGED);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_compat_check(manifest);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_txn_write_state(name, PKG_TXN_COMPAT_OK);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_metadata_load_installed(installed);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_install_update_installed(installed, manifest);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_install_write_pointers(installed, manifest);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_metadata_save_installed(installed);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  ret = pkg_txn_write_state(name, PKG_TXN_ACTIVATED);
+  if (ret < 0)
+    {
+      goto errout;
+    }
+
+  pkg_txn_write_state(name, PKG_TXN_CLEANUP);
+  if (tmp[0] != '\0')
+    {
+      pkg_store_remove_file(tmp);
+    }
+
+  pkg_txn_clear_state(name);
+  if (lock[0] != '\0')
+    {
+      pkg_store_remove_file(lock);
+    }
+
+  pkg_info("installed %s version %s", manifest->name, manifest->version);
+  free(index);
+  free(installed);
+  return EXIT_SUCCESS;
+
+errout:
+  pkg_txn_write_state(name, PKG_TXN_FAILED);
+  if (tmp[0] != '\0')
+    {
+      pkg_store_remove_file(tmp);
+    }
+
+  pkg_txn_clear_state(name);
+  if (lock[0] != '\0')
+    {
+      pkg_store_remove_file(lock);
+    }
+
+  free(index);
+  free(installed);
+  pkg_error("install failed for '%s': %d", name, ret);
+  return EXIT_FAILURE;
+}
+
+int pkg_list(FAR FILE *stream)
+{
+  FAR struct pkg_installed_db_s *db;
+  int ret;
+
+  db = malloc(sizeof(*db));
+  if (db == NULL)
+    {
+      pkg_error("unable to allocate installed metadata buffer");
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_store_prepare_layout();
+  if (ret < 0)
+    {
+      free(db);
+      pkg_error("unable to prepare package layout: %d", ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_metadata_load_installed(db);
+  if (ret < 0)
+    {
+      free(db);
+      pkg_error("unable to load installed metadata: %d", ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = pkg_metadata_print_installed(stream, db);
+  if (ret < 0)
+    {
+      free(db);
+      pkg_error("unable to print installed metadata: %d", ret);
+      return EXIT_FAILURE;
+    }
+
+  free(db);
+  return EXIT_SUCCESS;
+}
diff --git a/system/nxpkg/pkg_log.c b/system/nxpkg/pkg_log.c
new file mode 100644
index 000000000..bed06b13f
--- /dev/null
+++ b/system/nxpkg/pkg_log.c
@@ -0,0 +1,65 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_log.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void pkg_vlog(FAR FILE *stream, FAR const char *level,
+                     FAR const char *fmt, va_list ap)
+{
+  fprintf(stream, "nxpkg: %s: ", level);
+  vfprintf(stream, fmt, ap);
+  fputc('\n', stream);
+  fflush(stream);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void pkg_error(FAR const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+  pkg_vlog(stderr, "error", fmt, ap);
+  va_end(ap);
+}
+
+void pkg_info(FAR const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+  pkg_vlog(stdout, "info", fmt, ap);
+  va_end(ap);
+}
diff --git a/system/nxpkg/pkg_main.c b/system/nxpkg/pkg_main.c
new file mode 100644
index 000000000..c049592c5
--- /dev/null
+++ b/system/nxpkg/pkg_main.c
@@ -0,0 +1,106 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR const char *cmd;
+
+  if (argc < 2)
+    {
+      fprintf(stderr,
+              "Usage: %s <install|update|list|rollback|help> [args]\n",
+              argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  cmd = argv[1];
+
+  if (strcmp(cmd, "help") == 0 || strcmp(cmd, "--help") == 0 ||
+      strcmp(cmd, "-h") == 0)
+    {
+      fprintf(stdout,
+              "Usage: %s <install|update|list|rollback|help> [args]\n",
+              argv[0]);
+      return EXIT_SUCCESS;
+    }
+
+  if (strcmp(cmd, "install") == 0)
+    {
+      if (argc != 3)
+        {
+          pkg_error("install expects exactly one package name");
+          fprintf(stderr,
+                  "Usage: %s <install|update|list|rollback|help> [args]\n",
+                  argv[0]);
+          return EXIT_FAILURE;
+        }
+
+      return pkg_install(argv[2]);
+    }
+
+  if (strcmp(cmd, "update") == 0)
+    {
+      pkg_error("'update' is not implemented yet in the current unit");
+      return EXIT_FAILURE;
+    }
+
+  if (strcmp(cmd, "list") == 0)
+    {
+      if (argc != 2)
+        {
+          pkg_error("list does not take additional arguments");
+          fprintf(stderr,
+                  "Usage: %s <install|update|list|rollback|help> [args]\n",
+                  argv[0]);
+          return EXIT_FAILURE;
+        }
+
+      return pkg_list(stdout);
+    }
+
+  if (strcmp(cmd, "rollback") == 0)
+    {
+      pkg_error("'rollback' is not implemented yet in the current unit");
+      return EXIT_FAILURE;
+    }
+
+  fprintf(stderr, "ERROR: Unknown subcommand '%s'\n", cmd);
+  fprintf(stderr,
+          "Usage: %s <install|update|list|rollback|help> [args]\n",
+          argv[0]);
+  return EXIT_FAILURE;
+}
diff --git a/system/nxpkg/pkg_manifest.c b/system/nxpkg/pkg_manifest.c
new file mode 100644
index 000000000..3e7b56a26
--- /dev/null
+++ b/system/nxpkg/pkg_manifest.c
@@ -0,0 +1,155 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_manifest.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool pkg_has_nonspace(FAR const char *value)
+{
+  while (*value != '\0')
+    {
+      if (!isspace((unsigned char)*value))
+        {
+          return true;
+        }
+
+      value++;
+    }
+
+  return false;
+}
+
+static int pkg_validate_required(FAR const char *value)
+{
+  if (value == NULL || value[0] == '\0' || !pkg_has_nonspace(value))
+    {
+      return -EINVAL;
+    }
+
+  return 0;
+}
+
+static bool pkg_validate_hex(FAR const char *value)
+{
+  while (*value != '\0')
+    {
+      if (!isxdigit((unsigned char)*value))
+        {
+          return false;
+        }
+
+      value++;
+    }
+
+  return true;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+const char *pkg_manifest_type_str(enum pkg_payload_type_e type)
+{
+  switch (type)
+    {
+      case PKG_PAYLOAD_ELF:
+        return "elf";
+
+      case PKG_PAYLOAD_SHARED_LIB:
+        return "shared-lib";
+
+      default:
+        return "unknown";
+    }
+}
+
+int pkg_manifest_validate(FAR const struct pkg_manifest_s *manifest)
+{
+  if (manifest == NULL)
+    {
+      return -EINVAL;
+    }
+
+  if (pkg_validate_required(manifest->name) < 0 ||
+      pkg_validate_required(manifest->version) < 0 ||
+      pkg_validate_required(manifest->arch) < 0 ||
+      pkg_validate_required(manifest->compat) < 0 ||
+      pkg_validate_required(manifest->artifact) < 0 ||
+      pkg_validate_required(manifest->sha256) < 0)
+    {
+      return -EINVAL;
+    }
+
+  if (strlen(manifest->sha256) != PKG_HASH_HEX_LEN)
+    {
+      return -EINVAL;
+    }
+
+  if (!pkg_validate_hex(manifest->sha256))
+    {
+      return -EINVAL;
+    }
+
+  if (manifest->type != PKG_PAYLOAD_ELF &&
+      manifest->type != PKG_PAYLOAD_SHARED_LIB)
+    {
+      return -EINVAL;
+    }
+
+  return 0;
+}
+
+int pkg_manifest_parse_type(FAR const char *value,
+                            FAR enum pkg_payload_type_e *type)
+{
+  if (value == NULL || type == NULL)
+    {
+      return -EINVAL;
+    }
+
+  if (strcmp(value, "elf") == 0)
+    {
+      *type = PKG_PAYLOAD_ELF;
+      return 0;
+    }
+
+  if (strcmp(value, "shared-lib") == 0 ||
+      strcmp(value, "shared_lib") == 0 ||
+      strcmp(value, "shared") == 0)
+    {
+      *type = PKG_PAYLOAD_SHARED_LIB;
+      return 0;
+    }
+
+  return -EINVAL;
+}
diff --git a/system/nxpkg/pkg_metadata.c b/system/nxpkg/pkg_metadata.c
new file mode 100644
index 000000000..aadb4692e
--- /dev/null
+++ b/system/nxpkg/pkg_metadata.c
@@ -0,0 +1,770 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_metadata.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "netutils/cJSON.h"
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int pkg_copy_string(FAR char *dest, size_t size, FAR const char *src)
+{
+  int ret;
+
+  ret = snprintf(dest, size, "%s", src);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= size)
+    {
+      return -ENAMETOOLONG;
+    }
+
+  return 0;
+}
+
+static bool pkg_string_equal(FAR const char *lhs, size_t lhs_size,
+                             FAR const char *rhs, size_t rhs_size)
+{
+  size_t lhs_len;
+  size_t rhs_len;
+
+  lhs_len = strnlen(lhs, lhs_size);
+  rhs_len = strnlen(rhs, rhs_size);
+
+  if (lhs_len >= lhs_size || rhs_len >= rhs_size)
+    {
+      return false;
+    }
+
+  return lhs_len == rhs_len && strncmp(lhs, rhs, lhs_len) == 0;
+}
+
+static int pkg_string_cmp(FAR const char *lhs, size_t lhs_size,
+                          FAR const char *rhs, size_t rhs_size)
+{
+  size_t lhs_len;
+  size_t rhs_len;
+  size_t cmp_len;
+
+  lhs_len = strnlen(lhs, lhs_size);
+  rhs_len = strnlen(rhs, rhs_size);
+  cmp_len = lhs_len > rhs_len ? lhs_len : rhs_len;
+
+  if (lhs_len >= lhs_size || rhs_len >= rhs_size)
+    {
+      return strncmp(lhs, rhs, cmp_len);
+    }
+
+  return strncmp(lhs, rhs, cmp_len + 1);
+}
+
+static FAR cJSON *pkg_metadata_packages_array(FAR cJSON *root)
+{
+  if (cJSON_IsArray(root))
+    {
+      return root;
+    }
+
+  return cJSON_GetObjectItemCaseSensitive(root, "packages");
+}
+
+static int pkg_metadata_parse_manifest(FAR cJSON *item,
+                                       FAR struct pkg_manifest_s *manifest)
+{
+  FAR cJSON *field;
+  FAR const char *value;
+  int ret;
+
+  memset(manifest, 0, sizeof(*manifest));
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "name");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL ||
+      (ret = pkg_copy_string(manifest->name, sizeof(manifest->name),
+                             value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "version");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL || (ret = pkg_copy_string(manifest->version,
+                                              sizeof(manifest->version),
+                                              value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "arch");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL ||
+      (ret = pkg_copy_string(manifest->arch, sizeof(manifest->arch),
+                             value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "compat");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL || (ret = pkg_copy_string(manifest->compat,
+                                              sizeof(manifest->compat),
+                                              value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "artifact");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL || (ret = pkg_copy_string(manifest->artifact,
+                                              sizeof(manifest->artifact),
+                                              value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "sha256");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL ||
+      (ret = pkg_copy_string(manifest->sha256, sizeof(manifest->sha256),
+                             value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "type");
+  value = cJSON_GetStringValue(field);
+  if (pkg_manifest_parse_type(value, &manifest->type) < 0)
+    {
+      return -EINVAL;
+    }
+
+  return pkg_manifest_validate(manifest);
+}
+
+static int pkg_metadata_parse_versions(FAR cJSON *versions,
+                                       FAR struct pkg_installed_entry_s
+                                         *entry)
+{
+  FAR cJSON *item;
+  size_t count = 0;
+
+  if (!cJSON_IsArray(versions))
+    {
+      return -EINVAL;
+    }
+
+  cJSON_ArrayForEach(item, versions)
+    {
+      FAR const char *value;
+      int ret;
+
+      if (count >= PKG_INSTALLED_VERSIONS_MAX)
+        {
+          return -E2BIG;
+        }
+
+      value = cJSON_GetStringValue(item);
+      if (value == NULL)
+        {
+          return -EINVAL;
+        }
+
+      ret = pkg_copy_string(entry->versions[count],
+                            sizeof(entry->versions[count]), value);
+      if (ret < 0)
+        {
+          return ret;
+        }
+
+      count++;
+    }
+
+  entry->version_count = count;
+  return 0;
+}
+
+static int pkg_metadata_parse_installed_entry(
+              FAR cJSON *item,
+              FAR struct pkg_installed_entry_s *entry)
+{
+  FAR cJSON *field;
+  FAR const char *value;
+  int ret;
+
+  memset(entry, 0, sizeof(*entry));
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "name");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL ||
+      (ret = pkg_copy_string(entry->name, sizeof(entry->name), value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "current");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL || (ret = pkg_copy_string(entry->current,
+                                              sizeof(entry->current),
+                                              value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "previous");
+  value = cJSON_GetStringValue(field);
+  if (value != NULL)
+    {
+      ret = pkg_copy_string(entry->previous, sizeof(entry->previous),
+                            value);
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "arch");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL ||
+      (ret = pkg_copy_string(entry->arch, sizeof(entry->arch), value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "compat");
+  value = cJSON_GetStringValue(field);
+  if (value == NULL ||
+      (ret = pkg_copy_string(entry->compat, sizeof(entry->compat),
+                             value)) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "type");
+  value = cJSON_GetStringValue(field);
+  if (pkg_manifest_parse_type(value, &entry->type) < 0)
+    {
+      return -EINVAL;
+    }
+
+  field = cJSON_GetObjectItemCaseSensitive(item, "versions");
+  ret = pkg_metadata_parse_versions(field, entry);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return 0;
+}
+
+static int pkg_metadata_version_token_cmp(FAR const char *lhs,
+                                          FAR const char *rhs)
+{
+  long leftnum;
+  long rightnum;
+  FAR char *leftend;
+  FAR char *rightend;
+
+  leftnum = strtol(lhs, &leftend, 10);
+  rightnum = strtol(rhs, &rightend, 10);
+
+  if (leftend != lhs && rightend != rhs)
+    {
+      if (leftnum < rightnum)
+        {
+          return -1;
+        }
+
+      if (leftnum > rightnum)
+        {
+          return 1;
+        }
+    }
+  else
+    {
+      int ret;
+
+      ret = pkg_string_cmp(lhs, PKG_VERSION_MAX + 1,
+                           rhs, PKG_VERSION_MAX + 1);
+      if (ret < 0)
+        {
+          return -1;
+        }
+
+      if (ret > 0)
+        {
+          return 1;
+        }
+    }
+
+  return 0;
+}
+
+static int pkg_metadata_version_cmp(FAR const char *lhs, FAR const char *rhs)
+{
+  while (*lhs != '\0' || *rhs != '\0')
+    {
+      char leftbuf[16];
+      char rightbuf[16];
+      size_t leftlen = 0;
+      size_t rightlen = 0;
+      int ret;
+
+      while (lhs[leftlen] != '\0' && lhs[leftlen] != '.')
+        {
+          if (leftlen + 1 >= sizeof(leftbuf))
+            {
+              return pkg_string_cmp(lhs, PKG_VERSION_MAX + 1,
+                                    rhs, PKG_VERSION_MAX + 1);
+            }
+
+          leftbuf[leftlen] = lhs[leftlen];
+          leftlen++;
+        }
+
+      while (rhs[rightlen] != '\0' && rhs[rightlen] != '.')
+        {
+          if (rightlen + 1 >= sizeof(rightbuf))
+            {
+              return pkg_string_cmp(lhs, PKG_VERSION_MAX + 1,
+                                    rhs, PKG_VERSION_MAX + 1);
+            }
+
+          rightbuf[rightlen] = rhs[rightlen];
+          rightlen++;
+        }
+
+      leftbuf[leftlen] = '\0';
+      rightbuf[rightlen] = '\0';
+
+      ret = pkg_metadata_version_token_cmp(leftbuf, rightbuf);
+      if (ret != 0)
+        {
+          return ret;
+        }
+
+      lhs += leftlen;
+      rhs += rightlen;
+
+      if (*lhs == '.')
+        {
+          lhs++;
+        }
+
+      if (*rhs == '.')
+        {
+          rhs++;
+        }
+    }
+
+  return 0;
+}
+
+static FAR cJSON *pkg_metadata_manifest_to_json(
+                     FAR const struct pkg_manifest_s *manifest)
+{
+  FAR cJSON *root;
+
+  root = cJSON_CreateObject();
+  if (root == NULL)
+    {
+      return NULL;
+    }
+
+  cJSON_AddStringToObject(root, "name", manifest->name);
+  cJSON_AddStringToObject(root, "version", manifest->version);
+  cJSON_AddStringToObject(root, "arch", manifest->arch);
+  cJSON_AddStringToObject(root, "compat", manifest->compat);
+  cJSON_AddStringToObject(root, "artifact", manifest->artifact);
+  cJSON_AddStringToObject(root, "sha256", manifest->sha256);
+  cJSON_AddStringToObject(root, "type",
+                          pkg_manifest_type_str(manifest->type));
+  return root;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int pkg_metadata_load_index(FAR struct pkg_index_s *index)
+{
+  FAR cJSON *root;
+  FAR cJSON *packages;
+  FAR cJSON *item;
+  FAR char *text;
+  char path[PATH_MAX];
+  size_t count = 0;
+  size_t textlen;
+  int ret;
+
+  if (index == NULL)
+    {
+      return -EINVAL;
+    }
+
+  memset(index, 0, sizeof(*index));
+
+  ret = pkg_store_format_index_path(path, sizeof(path));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  pkg_info("loading index from %s", path);
+
+  ret = pkg_store_read_text(path, &text);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  textlen = strlen(text);
+  pkg_info("index read complete (%zu bytes)", textlen);
+
+  root = cJSON_Parse(text);
+  pkg_info("cJSON_Parse returned %s", root != NULL ? "success" : "failure");
+  free(text);
+  if (root == NULL)
+    {
+      return -EINVAL;
+    }
+
+  packages = pkg_metadata_packages_array(root);
+  if (!cJSON_IsArray(packages))
+    {
+      cJSON_Delete(root);
+      return -EINVAL;
+    }
+
+  cJSON_ArrayForEach(item, packages)
+    {
+      if (count >= PKG_INDEX_MAX)
+        {
+          cJSON_Delete(root);
+          return -E2BIG;
+        }
+
+      ret = pkg_metadata_parse_manifest(item, &index->manifests[count]);
+      if (ret < 0)
+        {
+          cJSON_Delete(root);
+          return ret;
+        }
+
+      pkg_info("parsed manifest %s %s",
+               index->manifests[count].name,
+               index->manifests[count].version);
+      count++;
+    }
+
+  index->count = count;
+  cJSON_Delete(root);
+  return 0;
+}
+
+FAR const struct pkg_manifest_s *
+pkg_metadata_find_latest(FAR const struct pkg_index_s *index,
+                         FAR const char *name)
+{
+  FAR const struct pkg_manifest_s *best = NULL;
+  FAR const char *arch;
+  FAR const char *compat;
+  size_t i;
+
+  if (index == NULL || name == NULL)
+    {
+      return NULL;
+    }
+
+  arch = pkg_runtime_arch();
+  compat = pkg_runtime_compat();
+
+  for (i = 0; i < index->count; i++)
+    {
+      FAR const struct pkg_manifest_s *candidate = &index->manifests[i];
+
+      if (!pkg_string_equal(candidate->name, sizeof(candidate->name),
+                            name, PKG_NAME_MAX + 1))
+        {
+          continue;
+        }
+
+      if (!pkg_string_equal(candidate->arch, sizeof(candidate->arch),
+                            arch, PKG_ARCH_MAX + 1) ||
+          !pkg_string_equal(candidate->compat, sizeof(candidate->compat),
+                            compat, PKG_COMPAT_MAX + 1))
+        {
+          continue;
+        }
+
+      if (best == NULL ||
+          pkg_metadata_version_cmp(candidate->version, best->version) > 0)
+        {
+          best = candidate;
+        }
+    }
+
+  return best;
+}
+
+int pkg_metadata_load_installed(FAR struct pkg_installed_db_s *db)
+{
+  FAR cJSON *root;
+  FAR cJSON *packages;
+  FAR cJSON *item;
+  FAR char *text;
+  char path[PATH_MAX];
+  size_t count = 0;
+  int ret;
+
+  if (db == NULL)
+    {
+      return -EINVAL;
+    }
+
+  memset(db, 0, sizeof(*db));
+
+  ret = pkg_store_format_installed_path(path, sizeof(path));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_read_text(path, &text);
+  if (ret == -ENOENT)
+    {
+      return 0;
+    }
+
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  root = cJSON_Parse(text);
+  free(text);
+  if (root == NULL)
+    {
+      return -EINVAL;
+    }
+
+  packages = pkg_metadata_packages_array(root);
+  if (!cJSON_IsArray(packages))
+    {
+      cJSON_Delete(root);
+      return -EINVAL;
+    }
+
+  cJSON_ArrayForEach(item, packages)
+    {
+      if (count >= PKG_INSTALLED_MAX)
+        {
+          cJSON_Delete(root);
+          return -E2BIG;
+        }
+
+      ret = pkg_metadata_parse_installed_entry(item, &db->entries[count]);
+      if (ret < 0)
+        {
+          cJSON_Delete(root);
+          return ret;
+        }
+
+      count++;
+    }
+
+  db->count = count;
+  cJSON_Delete(root);
+  return 0;
+}
+
+int pkg_metadata_save_installed(FAR const struct pkg_installed_db_s *db)
+{
+  FAR cJSON *root;
+  FAR cJSON *packages;
+  FAR char *text;
+  char path[PATH_MAX];
+  size_t i;
+  int ret;
+
+  if (db == NULL)
+    {
+      return -EINVAL;
+    }
+
+  root = cJSON_CreateObject();
+  if (root == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  packages = cJSON_AddArrayToObject(root, "packages");
+  if (packages == NULL)
+    {
+      cJSON_Delete(root);
+      return -ENOMEM;
+    }
+
+  for (i = 0; i < db->count; i++)
+    {
+      FAR const struct pkg_installed_entry_s *entry = &db->entries[i];
+      FAR cJSON *item = cJSON_CreateObject();
+      FAR cJSON *versions = cJSON_AddArrayToObject(item, "versions");
+      size_t j;
+
+      if (item == NULL || versions == NULL)
+        {
+          cJSON_Delete(root);
+          return -ENOMEM;
+        }
+
+      cJSON_AddStringToObject(item, "name", entry->name);
+      cJSON_AddStringToObject(item, "current", entry->current);
+      cJSON_AddStringToObject(item, "previous", entry->previous);
+      cJSON_AddStringToObject(item, "arch", entry->arch);
+      cJSON_AddStringToObject(item, "compat", entry->compat);
+      cJSON_AddStringToObject(item, "type",
+                              pkg_manifest_type_str(entry->type));
+
+      for (j = 0; j < entry->version_count; j++)
+        {
+          cJSON_AddItemToArray(versions,
+                               cJSON_CreateString(entry->versions[j]));
+        }
+
+      cJSON_AddItemToArray(packages, item);
+    }
+
+  text = cJSON_PrintUnformatted(root);
+  cJSON_Delete(root);
+  if (text == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  ret = pkg_store_format_installed_path(path, sizeof(path));
+  if (ret < 0)
+    {
+      cJSON_free(text);
+      return ret;
+    }
+
+  ret = pkg_store_write_text_atomic(path, text);
+  cJSON_free(text);
+  return ret;
+}
+
+FAR struct pkg_installed_entry_s *
+pkg_metadata_find_installed(FAR struct pkg_installed_db_s *db,
+                            FAR const char *name)
+{
+  size_t i;
+
+  if (db == NULL || name == NULL)
+    {
+      return NULL;
+    }
+
+  for (i = 0; i < db->count; i++)
+    {
+      if (pkg_string_equal(db->entries[i].name, sizeof(db->entries[i].name),
+                           name, PKG_NAME_MAX + 1))
+        {
+          return &db->entries[i];
+        }
+    }
+
+  return NULL;
+}
+
+int pkg_metadata_write_manifest(FAR const char *path,
+                                FAR const struct pkg_manifest_s *manifest)
+{
+  FAR cJSON *root;
+  FAR char *text;
+  int ret;
+
+  root = pkg_metadata_manifest_to_json(manifest);
+  if (root == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  text = cJSON_PrintUnformatted(root);
+  cJSON_Delete(root);
+  if (text == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  ret = pkg_store_write_text_atomic(path, text);
+  cJSON_free(text);
+  return ret;
+}
+
+int pkg_metadata_print_installed(FAR FILE *stream,
+                                 FAR const struct pkg_installed_db_s *db)
+{
+  size_t i;
+
+  if (stream == NULL || db == NULL)
+    {
+      return -EINVAL;
+    }
+
+  for (i = 0; i < db->count; i++)
+    {
+      FAR const struct pkg_installed_entry_s *entry = &db->entries[i];
+      size_t j;
+
+      fprintf(
+          stream,
+          "%s current=%s previous=%s type=%s arch=%s compat=%s versions=",
+          entry->name,
+          entry->current[0] != '\0' ? entry->current : "-",
+          entry->previous[0] != '\0' ? entry->previous : "-",
+          pkg_manifest_type_str(entry->type),
+          entry->arch,
+          entry->compat);
+
+      for (j = 0; j < entry->version_count; j++)
+        {
+          fprintf(stream, "%s%s", j == 0 ? "" : ",", entry->versions[j]);
+        }
+
+      fputc('\n', stream);
+    }
+
+  return 0;
+}
diff --git a/system/nxpkg/pkg_store.c b/system/nxpkg/pkg_store.c
new file mode 100644
index 000000000..0b23b054c
--- /dev/null
+++ b/system/nxpkg/pkg_store.c
@@ -0,0 +1,501 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_store.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int pkg_store_format(FAR char *buffer, size_t size,
+                            FAR const char *fmt,
+                            FAR const char *name,
+                            FAR const char *version)
+{
+  int ret;
+
+  ret = snprintf(buffer, size, fmt, name, version);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= size)
+    {
+      return -ENAMETOOLONG;
+    }
+
+  return 0;
+}
+
+static int pkg_store_mkdir(FAR const char *path)
+{
+  struct stat st;
+  int ret;
+
+  ret = stat(path, &st);
+  if (ret == 0)
+    {
+      if (!S_ISDIR(st.st_mode))
+        {
+          return -ENOTDIR;
+        }
+
+      return 0;
+    }
+
+  if (errno != ENOENT)
+    {
+      return -errno;
+    }
+
+  ret = mkdir(path, 0755);
+  if (ret < 0 && errno != EEXIST)
+    {
+      return -errno;
+    }
+
+  return 0;
+}
+
+static int pkg_store_mkdirs(FAR const char *path)
+{
+  char buffer[PATH_MAX];
+  FAR char *cursor;
+  int ret;
+
+  ret = snprintf(buffer, sizeof(buffer), "%s", path);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= sizeof(buffer))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  for (cursor = buffer + 1; *cursor != '\0'; cursor++)
+    {
+      if (*cursor != '/')
+        {
+          continue;
+        }
+
+      *cursor = '\0';
+      ret = pkg_store_mkdir(buffer);
+      *cursor = '/';
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
+
+  return pkg_store_mkdir(buffer);
+}
+
+static int pkg_store_write_all(int fd, FAR const char *buffer, size_t length)
+{
+  size_t offset = 0;
+
+  while (offset < length)
+    {
+      ssize_t ret;
+
+      ret = write(fd, buffer + offset, length - offset);
+      if (ret < 0)
+        {
+          if (errno == EINTR)
+            {
+              continue;
+            }
+
+          return -errno;
+        }
+
+      offset += (size_t)ret;
+    }
+
+  return 0;
+}
+
+static FAR const char *pkg_store_basename(FAR const char *path)
+{
+  FAR const char *leaf;
+
+  leaf = strrchr(path, '/');
+  return leaf != NULL ? leaf + 1 : path;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int pkg_store_prepare_layout(void)
+{
+  int ret;
+
+  ret = pkg_store_mkdirs(PKG_REPO_DIR);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_mkdirs(PKG_STORE_DIR);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_mkdirs(PKG_TMP_DIR);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return pkg_store_mkdirs(PKG_TMP_PKG_DIR);
+}
+
+int pkg_store_ensure_package_root(FAR const char *name)
+{
+  char path[PATH_MAX];
+  int ret;
+
+  ret = pkg_store_format_package_root(path, sizeof(path), name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return pkg_store_mkdirs(path);
+}
+
+int pkg_store_ensure_version_dir(FAR const char *name,
+                                 FAR const char *version)
+{
+  char path[PATH_MAX];
+  int ret;
+
+  ret = pkg_store_ensure_package_root(name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = pkg_store_format_version_path(path, sizeof(path), name, version);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return pkg_store_mkdirs(path);
+}
+
+int pkg_store_format_index_path(FAR char *buffer, size_t size)
+{
+  return pkg_store_format(buffer, size, "%s", PKG_REPO_INDEX, "");
+}
+
+int pkg_store_format_installed_path(FAR char *buffer, size_t size)
+{
+  return pkg_store_format(buffer, size, "%s", PKG_REPO_INSTALLED, "");
+}
+
+int pkg_store_format_package_root(FAR char *buffer, size_t size,
+                                  FAR const char *name)
+{
+  return pkg_store_format(buffer, size, PKG_STORE_DIR "/%s", name, "");
+}
+
+int pkg_store_format_version_path(FAR char *buffer, size_t size,
+                                  FAR const char *name,
+                                  FAR const char *version)
+{
+  return pkg_store_format(buffer, size,
+                          PKG_STORE_DIR "/%s/%s",
+                          name, version);
+}
+
+int pkg_store_format_current_path(FAR char *buffer, size_t size,
+                                  FAR const char *name)
+{
+  return pkg_store_format(buffer, size,
+                          PKG_STORE_DIR "/%s/current",
+                          name, "");
+}
+
+int pkg_store_format_previous_path(FAR char *buffer, size_t size,
+                                   FAR const char *name)
+{
+  return pkg_store_format(buffer, size, PKG_STORE_DIR "/%s/previous", name,
+                          "");
+}
+
+int pkg_store_format_txn_path(FAR char *buffer, size_t size,
+                              FAR const char *name)
+{
+  return pkg_store_format(buffer, size, PKG_STORE_DIR "/%s/.txn", name, "");
+}
+
+int pkg_store_format_lock_path(FAR char *buffer, size_t size,
+                               FAR const char *name)
+{
+  return pkg_store_format(buffer, size, PKG_STORE_DIR "/%s/.lock", name, "");
+}
+
+int pkg_store_format_download_path(FAR char *buffer, size_t size,
+                                   FAR const char *name,
+                                   FAR const char *version)
+{
+  return pkg_store_format(buffer, size, PKG_TMP_PKG_DIR "/%s-%s.npkg", name,
+                          version);
+}
+
+int pkg_store_format_payload_path(FAR char *buffer, size_t size,
+                                  FAR const char *name,
+                                  FAR const char *version,
+                                  FAR const char *artifact)
+{
+  FAR const char *leaf;
+  int ret;
+
+  leaf = pkg_store_basename(artifact);
+  ret = snprintf(buffer, size, PKG_STORE_DIR "/%s/%s/%s",
+                 name, version, leaf);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= size)
+    {
+      return -ENAMETOOLONG;
+    }
+
+  return 0;
+}
+
+int pkg_store_format_manifest_path(FAR char *buffer, size_t size,
+                                   FAR const char *name,
+                                   FAR const char *version)
+{
+  return pkg_store_format(buffer, size, PKG_STORE_DIR "/%s/%s/manifest.json",
+                          name, version);
+}
+
+int pkg_store_read_text(FAR const char *path, FAR char **buffer)
+{
+  FAR FILE *stream;
+  FAR char *data;
+  long length;
+  size_t nread;
+
+  if (buffer == NULL)
+    {
+      return -EINVAL;
+    }
+
+  *buffer = NULL;
+
+  stream = fopen(path, "rb");
+  if (stream == NULL)
+    {
+      return errno == ENOENT ? -ENOENT : -errno;
+    }
+
+  if (fseek(stream, 0, SEEK_END) < 0)
+    {
+      fclose(stream);
+      return -errno;
+    }
+
+  length = ftell(stream);
+  if (length < 0)
+    {
+      fclose(stream);
+      return -errno;
+    }
+
+  if (fseek(stream, 0, SEEK_SET) < 0)
+    {
+      fclose(stream);
+      return -errno;
+    }
+
+  data = malloc((size_t)length + 1);
+  if (data == NULL)
+    {
+      fclose(stream);
+      return -ENOMEM;
+    }
+
+  nread = fread(data, 1, (size_t)length, stream);
+  if (nread != (size_t)length)
+    {
+      int err = ferror(stream);
+
+      fclose(stream);
+      free(data);
+      return err ? -EIO : -EINVAL;
+    }
+
+  fclose(stream);
+
+  data[length] = '\0';
+  *buffer = data;
+  return 0;
+}
+
+int pkg_store_write_text_atomic(FAR const char *path, FAR const char *text)
+{
+  char tmp[PATH_MAX];
+  int fd;
+  int ret;
+
+  ret = snprintf(tmp, sizeof(tmp), "%s.tmp", path);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= sizeof(tmp))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = pkg_store_write_all(fd, text, strlen(text));
+  if (ret < 0)
+    {
+      close(fd);
+      unlink(tmp);
+      return ret;
+    }
+
+  if (close(fd) < 0)
+    {
+      unlink(tmp);
+      return -errno;
+    }
+
+  if (rename(tmp, path) < 0)
+    {
+      unlink(tmp);
+      return -errno;
+    }
+
+  return 0;
+}
+
+int pkg_store_copy_file(FAR const char *src, FAR const char *dest)
+{
+  int infd;
+  int outfd;
+  int ret;
+  char buffer[512];
+
+  infd = open(src, O_RDONLY);
+  if (infd < 0)
+    {
+      return -errno;
+    }
+
+  outfd = open(dest, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+  if (outfd < 0)
+    {
+      ret = -errno;
+      close(infd);
+      return ret;
+    }
+
+  for (; ; )
+    {
+      ssize_t nread;
+
+      nread = read(infd, buffer, sizeof(buffer));
+      if (nread < 0)
+        {
+          if (errno == EINTR)
+            {
+              continue;
+            }
+
+          ret = -errno;
+          goto errout;
+        }
+
+      if (nread == 0)
+        {
+          break;
+        }
+
+      ret = pkg_store_write_all(outfd, buffer, (size_t)nread);
+      if (ret < 0)
+        {
+          goto errout;
+        }
+    }
+
+  close(infd);
+
+  if (close(outfd) < 0)
+    {
+      unlink(dest);
+      return -errno;
+    }
+
+  return 0;
+
+errout:
+  close(infd);
+  close(outfd);
+  unlink(dest);
+  return ret;
+}
+
+int pkg_store_remove_file(FAR const char *path)
+{
+  if (unlink(path) < 0)
+    {
+      return errno == ENOENT ? 0 : -errno;
+    }
+
+  return 0;
+}
diff --git a/system/nxpkg/pkg_txn.c b/system/nxpkg/pkg_txn.c
new file mode 100644
index 000000000..e20a8700f
--- /dev/null
+++ b/system/nxpkg/pkg_txn.c
@@ -0,0 +1,110 @@
+/****************************************************************************
+ * apps/system/nxpkg/pkg_txn.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "pkg.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+const char *pkg_txn_state_str(enum pkg_txn_state_e state)
+{
+  switch (state)
+    {
+      case PKG_TXN_IDLE:
+        return "IDLE";
+
+      case PKG_TXN_FETCHING:
+        return "FETCHING";
+
+      case PKG_TXN_VERIFIED:
+        return "VERIFIED";
+
+      case PKG_TXN_STAGED:
+        return "STAGED";
+
+      case PKG_TXN_COMPAT_OK:
+        return "COMPAT_OK";
+
+      case PKG_TXN_ACTIVATED:
+        return "ACTIVATED";
+
+      case PKG_TXN_CLEANUP:
+        return "CLEANUP";
+
+      case PKG_TXN_FAILED:
+        return "FAILED";
+
+      case PKG_TXN_RESTORE:
+        return "RESTORE";
+
+      default:
+        return "UNKNOWN";
+    }
+}
+
+int pkg_txn_write_state(FAR const char *name, enum pkg_txn_state_e state)
+{
+  char path[PATH_MAX];
+  char text[32];
+  int ret;
+
+  ret = pkg_store_format_txn_path(path, sizeof(path), name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = snprintf(text, sizeof(text), "%s\n", pkg_txn_state_str(state));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  if ((size_t)ret >= sizeof(text))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  return pkg_store_write_text_atomic(path, text);
+}
+
+int pkg_txn_clear_state(FAR const char *name)
+{
+  char path[PATH_MAX];
+  int ret;
+
+  ret = pkg_store_format_txn_path(path, sizeof(path), name);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  return pkg_store_remove_file(path);
+}
diff --git a/tools/export_pkg_repo.py b/tools/export_pkg_repo.py
new file mode 100644
index 000000000..36d611434
--- /dev/null
+++ b/tools/export_pkg_repo.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""Export built binaries into a package repository layout.
+
+The script copies built application or library artifacts into a
+server-friendly repository directory, computes SHA-256 digests, and emits an
+`index.json` compatible with the current `nxpkg` metadata parser.
+
+The repository can then be served by FTP, HTTP, or any static file transport.
+"""
+
+from __future__ import annotations
+
+import argparse
+import hashlib
+import json
+import shutil
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Dict, List
+
+VALID_TYPES = {"elf", "shared-lib"}
+PACKAGE_SPEC_HELP = (
+    "package must look like " "<name>:<version>:<elf|shared-lib>:<source>"
+)
+
+
+@dataclass
+class PackageSpec:
+    name: str
+    version: str
+    payload_type: str
+    source: Path
+
+
+def sha256_file(path: Path) -> str:
+    digest = hashlib.sha256()
+    with path.open("rb") as infile:
+        while True:
+            chunk = infile.read(65536)
+            if not chunk:
+                break
+
+            digest.update(chunk)
+
+    return digest.hexdigest()
+
+
+def parse_package_spec(value: str) -> PackageSpec:
+    parts = value.split(":", 3)
+    if len(parts) != 4:
+        raise argparse.ArgumentTypeError(PACKAGE_SPEC_HELP)
+
+    name, version, payload_type, source = parts
+    if payload_type not in VALID_TYPES:
+        raise argparse.ArgumentTypeError(
+            f"unsupported package type '{payload_type}', expected one of "
+            f"{', '.join(sorted(VALID_TYPES))}"
+        )
+
+    source_path = Path(source).expanduser().resolve()
+    if not source_path.is_file():
+        msg = f"source does not exist: {source_path}"
+        raise argparse.ArgumentTypeError(msg)
+
+    return PackageSpec(
+        name=name,
+        version=version,
+        payload_type=payload_type,
+        source=source_path,
+    )
+
+
+def artifact_relpath(arch: str, chip: str, compat: str,
+                     spec: PackageSpec) -> Path:  # fmt: skip
+    filename = spec.source.name
+    path = Path("artifacts") / arch / chip / compat
+    path = path / spec.name / spec.version / filename
+    return path
+
+
+def package_identity(package: Dict[str, str]) -> tuple:
+    return (
+        package["name"],
+        package["version"],
+        package["arch"],
+        package["compat"],
+        package["type"],
+    )
+
+
+def load_existing_packages(repo_dir: Path) -> List[dict]:
+    index_path = repo_dir / "index.json"
+
+    if not index_path.exists():
+        return []
+
+    root = json.loads(index_path.read_text(encoding="utf-8"))
+    if isinstance(root, list):
+        packages = root
+    else:
+        packages = root.get("packages")
+
+    if not isinstance(packages, list):
+        raise ValueError(f"invalid repository index format in {index_path}")
+
+    for item in packages:
+        if not isinstance(item, dict):
+            raise ValueError(f"invalid repository index entry in {index_path}")
+
+    return packages
+
+
+def emit_index(repo_dir: Path, packages: List[dict]) -> None:
+    index_path = repo_dir / "index.json"
+    payload = {"packages": packages}
+    index_path.write_text(
+        json.dumps(payload, indent=2, sort_keys=False) + "\n",
+        encoding="utf-8",
+    )
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "repo_dir",
+        type=Path,
+        help="Destination repository directory",
+    )
+    parser.add_argument(
+        "--arch",
+        required=True,
+        help="Target architecture string, for example xtensa",
+    )
+    parser.add_argument(
+        "--chip",
+        required=True,
+        help="Target chip/family string, for example esp32s3",
+    )
+    parser.add_argument(
+        "--compat",
+        required=True,
+        help="Target board/runtime identity, for example esp32s3-xiao",
+    )
+    parser.add_argument(
+        "--artifact-prefix",
+        default="",
+        help="Optional prefix prepended to artifact paths in index.json",
+    )
+    parser.add_argument(
+        "--package",
+        action="append",
+        required=True,
+        type=parse_package_spec,
+        help=PACKAGE_SPEC_HELP,
+    )
+    args = parser.parse_args()
+
+    repo_dir = args.repo_dir.expanduser().resolve()
+    repo_dir.mkdir(parents=True, exist_ok=True)
+
+    packages = load_existing_packages(repo_dir)
+    packages_by_id = {}
+    for package in packages:
+        packages_by_id[package_identity(package)] = package
+    prefix = args.artifact_prefix.rstrip("/")
+
+    for spec in args.package:
+        relpath = artifact_relpath(args.arch, args.chip, args.compat, spec)
+        destination = repo_dir / relpath
+        destination.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(spec.source, destination)
+
+        artifact = relpath.as_posix()
+        if prefix:
+            artifact = f"{prefix}/{artifact}"
+
+        package = {
+            "name": spec.name,
+            "version": spec.version,
+            "arch": args.arch,
+            "compat": args.compat,
+            "artifact": artifact,
+            "sha256": sha256_file(destination),
+            "type": spec.payload_type,
+        }
+        packages_by_id[package_identity(package)] = package
+
+    packages = sorted(
+        packages_by_id.values(),
+        key=lambda item: (
+            item["name"],
+            item["version"],
+            item["arch"],
+            item["compat"],
+            item["type"],
+        ),
+    )
+    emit_index(repo_dir, packages)
+
+    print(f"exported {len(packages)} package(s) to {repo_dir}")
+    for package in packages:
+        print(
+            f"- {package['name']} {package['version']} "
+            f"[{package['type']}] -> {package['artifact']}"
+        )
+
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

From 75ee4d90907d905676ebd52366f2ab04cdfacebe Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Thu, 18 Jun 2026 07:08:09 +0000
Subject: [PATCH 438/568] nshlib: Add su, id, and whoami identity commands

Add NSH commands for switching effective credentials and inspecting
session identity. Update login and prompt to reflect effective user.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 nshlib/CMakeLists.txt    |   4 +
 nshlib/Kconfig           |  46 ++++
 nshlib/Makefile          |   4 +
 nshlib/nsh.h             |  13 ++
 nshlib/nsh_command.c     |  12 ++
 nshlib/nsh_fscmds.c      |  48 ++++-
 nshlib/nsh_identity.c    | 453 +++++++++++++++++++++++++++++++++++++++
 nshlib/nsh_login.c       |  11 +
 nshlib/nsh_parse.c       |   1 +
 nshlib/nsh_prompt.c      |  24 +++
 nshlib/nsh_telnetlogin.c |  11 +
 11 files changed, 625 insertions(+), 2 deletions(-)
 create mode 100644 nshlib/nsh_identity.c

diff --git a/nshlib/CMakeLists.txt b/nshlib/CMakeLists.txt
index 86b1b06ae..8adab3168 100644
--- a/nshlib/CMakeLists.txt
+++ b/nshlib/CMakeLists.txt
@@ -42,6 +42,10 @@ if(CONFIG_NSH_LIBRARY)
     nsh_syscmds.c
     nsh_dbgcmds.c)
 
+  if(CONFIG_SCHED_USER_IDENTITY)
+    list(APPEND CSRCS nsh_identity.c)
+  endif()
+
   list(APPEND CSRCS nsh_session.c)
 
   if(CONFIG_NSH_CONSOLE_LOGIN)
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 2d1570b87..80476e7f5 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -69,6 +69,24 @@ config NSH_PROMPT_STRING
 		Provide the shell prompt string with size limit NSH_PROMPT_MAX.
 		default is "nsh> ".
 
+config NSH_PROMPT_STRING_ROOT
+	string "Prompt string for effective root (euid=0)"
+	default ""
+	depends on SCHED_USER_IDENTITY
+	---help---
+		If non-empty, NSH uses this prompt when the effective UID is zero.
+		If empty, the prompt from NSH_PROMPT_STRING (or ENV/HOSTNAME) is used.
+		Set explicitly for multi-user shells (for example, "nsh# ").
+
+config NSH_PROMPT_STRING_USER
+	string "Prompt string for non-root effective UID"
+	default ""
+	depends on SCHED_USER_IDENTITY
+	---help---
+		If non-empty, NSH uses this prompt when the effective UID is non-zero.
+		If empty, the prompt from NSH_PROMPT_STRING (or ENV/HOSTNAME) is used.
+		Set explicitly for multi-user shells (for example, "nsh$ ").
+
 config NSH_PROMPT_MAX
 	int "Maximum Size of Prompt String"
 	default NAME_MAX
@@ -351,6 +369,21 @@ config NSH_DISABLE_CHOWN
 	default DEFAULT_SMALL
 	depends on FS_PERMISSION
 
+config NSH_DISABLE_SU
+	bool "Disable su"
+	default DEFAULT_SMALL
+	depends on SCHED_USER_IDENTITY
+
+config NSH_DISABLE_ID
+	bool "Disable id"
+	default DEFAULT_SMALL
+	depends on SCHED_USER_IDENTITY
+
+config NSH_DISABLE_WHOAMI
+	bool "Disable whoami"
+	default DEFAULT_SMALL
+	depends on SCHED_USER_IDENTITY
+
 config NSH_DISABLE_CP
 	bool "Disable cp"
 	default DEFAULT_SMALL
@@ -1259,6 +1292,19 @@ config NSH_LOGIN_FAILCOUNT
 	---help---
 		Number of login retry attempts.
 
+config NSH_LOGIN_SETUID
+	bool "Set user identity after successful login"
+	default y
+	depends on SCHED_USER_IDENTITY
+	---help---
+		After a successful NSH login, look up the authenticated user name
+		in the passwd database and call setuid()/setgid() so that the shell
+		session runs with that user's credentials.
+
+		When CONFIG_LIBC_PASSWD_FILE is enabled, any user listed in the
+		passwd file may be selected.  Otherwise only the built-in "root"
+		account is supported.
+
 config NSH_PLATFORM_CHALLENGE
 	bool "Platform challenge"
 	default n
diff --git a/nshlib/Makefile b/nshlib/Makefile
index 26dbbd0de..d15ca4aa3 100644
--- a/nshlib/Makefile
+++ b/nshlib/Makefile
@@ -28,6 +28,10 @@ CSRCS  = nsh_init.c nsh_parse.c nsh_console.c nsh_script.c nsh_system.c
 CSRCS += nsh_command.c nsh_fscmds.c nsh_proccmds.c nsh_mmcmds.c
 CSRCS += nsh_timcmds.c nsh_envcmds.c nsh_syscmds.c nsh_dbgcmds.c nsh_prompt.c
 
+ifeq ($(CONFIG_SCHED_USER_IDENTITY),y)
+CSRCS += nsh_identity.c
+endif
+
 CSRCS += nsh_session.c
 ifeq ($(CONFIG_NSH_CONSOLE_LOGIN),y)
 CSRCS += nsh_login.c
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 7abb7c38f..f20fcf773 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -750,6 +750,7 @@ extern const char g_userprompt[];
 extern const char g_passwordprompt[];
 extern const char g_loginsuccess[];
 extern const char g_badcredentials[];
+extern const char g_badidentity[];
 extern const char g_loginfailure[];
 #endif
 extern const char g_fmtsyntax[];
@@ -969,6 +970,18 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #if defined(CONFIG_FS_PERMISSION) && !defined(CONFIG_NSH_DISABLE_CHOWN)
   int cmd_chown(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
+#ifdef CONFIG_SCHED_USER_IDENTITY
+  int nsh_setuser_identity(FAR const char *username);
+#  ifndef CONFIG_NSH_DISABLE_SU
+  int cmd_su(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#  endif
+#  ifndef CONFIG_NSH_DISABLE_ID
+  int cmd_id(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#  endif
+#  ifndef CONFIG_NSH_DISABLE_WHOAMI
+  int cmd_whoami(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#  endif
+#endif
 #ifndef CONFIG_NSH_DISABLE_CP
   int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 23534fbe5..a50e223c9 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -256,6 +256,10 @@ static const struct cmdmap_s g_cmdmap[] =
   CMD_MAP("free",     cmd_free,     1, 1, NULL),
 #endif
 
+#if defined(CONFIG_SCHED_USER_IDENTITY) && !defined(CONFIG_NSH_DISABLE_ID)
+  CMD_MAP("id",       cmd_id,       1, 1, NULL),
+#endif
+
 #ifdef CONFIG_DEBUG_MM
 #  ifndef CONFIG_NSH_DISABLE_MEMDUMP
   CMD_MAP("memdump",  cmd_memdump,
@@ -571,6 +575,10 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 #endif /* CONFIG_NSH_DISABLE_SET */
 
+#if defined(CONFIG_SCHED_USER_IDENTITY) && !defined(CONFIG_NSH_DISABLE_SU)
+  CMD_MAP("su",       cmd_su,       1, 2, "[<username>]"),
+#endif
+
 #ifndef CONFIG_NSH_DISABLE_SHUTDOWN
 #if defined(CONFIG_BOARDCTL_POWEROFF) && defined(CONFIG_BOARDCTL_RESET)
   CMD_MAP("shutdown", cmd_shutdown, 1, 2, "[--reboot]"),
@@ -635,6 +643,10 @@ static const struct cmdmap_s g_cmdmap[] =
 #  endif
 #endif
 
+#if defined(CONFIG_SCHED_USER_IDENTITY) && !defined(CONFIG_NSH_DISABLE_WHOAMI)
+  CMD_MAP("whoami",   cmd_whoami,   1, 1, NULL),
+#endif
+
 #ifndef CONFIG_NSH_DISABLE_UNAME
 #  ifdef CONFIG_NET
   CMD_MAP("uname",    cmd_uname,    1, 7, "[-a | -imnoprsv]"),
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 13daa8258..797048f6c 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -45,6 +45,13 @@
 #include <errno.h>
 #include <nuttx/debug.h>
 
+#ifdef CONFIG_LIBC_PASSWD_FILE
+#  include <pwd.h>
+#endif
+#ifdef CONFIG_LIBC_GROUP_FILE
+#  include <grp.h>
+#endif
+
 #include "nsh.h"
 
 #if !defined(CONFIG_DISABLE_MOUNTPOINT)
@@ -340,6 +347,44 @@ static inline int ls_specialdir(FAR const char *dir)
 
   return (strcmp(dir, ".")  == 0 || strcmp(dir, "..") == 0);
 }
+
+#ifdef CONFIG_SCHED_USER_IDENTITY
+/****************************************************************************
+ * Name: nsh_ls_printowner
+ ****************************************************************************/
+
+static void nsh_ls_printowner(FAR struct nsh_vtbl_s *vtbl, uid_t uid,
+                              gid_t gid)
+{
+#ifdef CONFIG_LIBC_PASSWD_FILE
+  FAR struct passwd *pwd;
+
+  pwd = getpwuid(uid);
+  if (pwd != NULL && pwd->pw_name != NULL)
+    {
+      nsh_output(vtbl, "%8s", pwd->pw_name);
+    }
+  else
+#endif
+    {
+      nsh_output(vtbl, "%8d", (int)uid);
+    }
+
+#ifdef CONFIG_LIBC_GROUP_FILE
+  FAR struct group *grp;
+
+  grp = getgrgid(gid);
+  if (grp != NULL && grp->gr_name != NULL)
+    {
+      nsh_output(vtbl, "%8s", grp->gr_name);
+    }
+  else
+#endif
+    {
+      nsh_output(vtbl, "%8d", (int)gid);
+    }
+}
+#endif /* CONFIG_SCHED_USER_IDENTITY */
 #endif
 
 /****************************************************************************
@@ -511,8 +556,7 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
 #ifdef CONFIG_SCHED_USER_IDENTITY
       if ((lsflags & LSFLAGS_UID_GID) != 0)
         {
-          nsh_output(vtbl, "%8d", buf.st_uid);
-          nsh_output(vtbl, "%8d", buf.st_gid);
+          nsh_ls_printowner(vtbl, buf.st_uid, buf.st_gid);
         }
 #endif
 
diff --git a/nshlib/nsh_identity.c b/nshlib/nsh_identity.c
new file mode 100644
index 000000000..e69fd92e2
--- /dev/null
+++ b/nshlib/nsh_identity.c
@@ -0,0 +1,453 @@
+/****************************************************************************
+ * apps/nshlib/nsh_identity.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <termios.h>
+
+#ifdef CONFIG_NSH_CLE
+#  include "system/cle.h"
+#else
+#  include "system/readline.h"
+#endif
+
+#ifdef CONFIG_NSH_LOGIN_PASSWD
+#  include "fsutils/passwd.h"
+#endif
+
+#include "nshlib/nshlib.h"
+#include "nsh.h"
+#include "nsh_console.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nsh_is_privileged
+ *
+ * Description:
+ *   Return true if the caller has root privileges (effective UID or GID is
+ *   zero).  NuttX does not support supplementary groups; membership in the
+ *   root group is indicated by a primary GID of zero.
+ *
+ ****************************************************************************/
+
+static bool nsh_is_privileged(void)
+{
+  return geteuid() == 0 || getegid() == 0;
+}
+
+#ifdef CONFIG_LIBC_PASSWD_FILE
+
+/****************************************************************************
+ * Name: nsh_lookup_user
+ *
+ * Description:
+ *   Look up a passwd entry by name using re-entrant libc helpers.
+ *
+ ****************************************************************************/
+
+static int nsh_lookup_user(FAR const char *username, uid_t *uid, gid_t *gid)
+{
+  struct passwd pwd;
+  struct passwd *result;
+  char buf[CONFIG_LIBC_PASSWD_LINESIZE];
+  int ret;
+
+  ret = getpwnam_r(username, &pwd, buf, sizeof(buf), &result);
+  if (ret != 0)
+    {
+      return -ret;
+    }
+
+  if (result == NULL)
+    {
+      return -ENOENT;
+    }
+
+  *uid = result->pw_uid;
+  *gid = result->pw_gid;
+  return OK;
+}
+#endif /* CONFIG_LIBC_PASSWD_FILE */
+
+#ifdef CONFIG_NSH_LOGIN
+
+/****************************************************************************
+ * Name: nsh_read_password
+ ****************************************************************************/
+
+static int nsh_read_password(FAR struct nsh_vtbl_s *vtbl,
+                             FAR char *password, size_t buflen)
+{
+  FAR struct console_stdio_s *pstate = (FAR struct console_stdio_s *)vtbl;
+  struct termios cfg;
+  int ret;
+
+  write(OUTFD(pstate), g_passwordprompt, strlen(g_passwordprompt));
+
+  if (isatty(INFD(pstate)))
+    {
+      if (tcgetattr(INFD(pstate), &cfg) == 0)
+        {
+          cfg.c_lflag &= ~ECHO;
+          tcsetattr(INFD(pstate), TCSANOW, &cfg);
+        }
+    }
+
+  password[0] = '\0';
+  pstate->cn_line[0] = '\0';
+
+#ifdef CONFIG_NSH_CLE
+  ret = cle_fd(pstate->cn_line, "", LINE_MAX,
+               INFD(pstate), OUTFD(pstate));
+#else
+  ret = readline_fd(pstate->cn_line, LINE_MAX, INFD(pstate), -1);
+#endif
+
+  if (isatty(INFD(pstate)))
+    {
+      if (tcgetattr(INFD(pstate), &cfg) == 0)
+        {
+          cfg.c_lflag |= ECHO;
+          tcsetattr(INFD(pstate), TCSANOW, &cfg);
+        }
+    }
+
+  if (ret > 0)
+    {
+      strlcpy(password, pstate->cn_line, buflen);
+      write(OUTFD(pstate), "\n", 1);
+      return OK;
+    }
+
+  return ERROR;
+}
+
+/****************************************************************************
+ * Name: nsh_verify_credentials
+ ****************************************************************************/
+
+static bool nsh_verify_credentials(FAR const char *username,
+                                   FAR const char *password)
+{
+#ifdef CONFIG_NSH_LOGIN_PASSWD
+  return PASSWORD_VERIFY_MATCH(passwd_verify(username, password));
+#elif defined(CONFIG_NSH_LOGIN_PLATFORM)
+  return PASSWORD_VERIFY_MATCH(platform_user_verify(username, password));
+#elif defined(CONFIG_NSH_LOGIN_FIXED)
+  return strcmp(password, CONFIG_NSH_LOGIN_PASSWORD) == 0 &&
+         strcmp(username, CONFIG_NSH_LOGIN_USERNAME) == 0;
+#else
+  UNUSED(username);
+  UNUSED(password);
+  return false;
+#endif
+}
+#endif /* CONFIG_NSH_LOGIN */
+
+/****************************************************************************
+ * Name: nsh_switch_credentials
+ *
+ * Description:
+ *   Switch the session to the given UID/GID.  NSH starts with real UID/GID
+ *   zero; file permission checks use the effective identity.  When the real
+ *   UID is still zero, only the effective UID/GID are changed so that a
+ *   later 'su' can regain root via seteuid(0) after password verification.
+ *
+ ****************************************************************************/
+
+static int nsh_switch_credentials(uid_t uid, gid_t gid)
+{
+  if (getuid() == 0)
+    {
+      if (geteuid() != 0 || getegid() != 0)
+        {
+          if (seteuid(0) != 0 || setegid(0) != 0)
+            {
+              return -errno;
+            }
+        }
+
+      if (seteuid(uid) != 0 || setegid(gid) != 0)
+        {
+          return -errno;
+        }
+
+      return OK;
+    }
+
+  if (setuid(uid) != 0 || setgid(gid) != 0)
+    {
+      return -errno;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nsh_setuser_identity
+ *
+ * Description:
+ *   Look up 'username' in the passwd database and set the calling task's
+ *   session identity.  When NSH still has real UID zero, only the effective
+ *   UID/GID are updated so that 'su' can switch users later.
+ *
+ * Input Parameters:
+ *   username - Login name to assume
+ *
+ * Returned Value:
+ *   OK on success; negated errno on failure.
+ *
+ ****************************************************************************/
+
+int nsh_setuser_identity(FAR const char *username)
+{
+#ifdef CONFIG_LIBC_PASSWD_FILE
+  FAR struct passwd *pwd;
+  uid_t uid;
+  gid_t gid;
+
+  /* getpwnam() uses libc static storage; NSH is single-threaded here. */
+
+  pwd = getpwnam(username);
+  if (pwd == NULL)
+    {
+      return -ENOENT;
+    }
+
+  uid = pwd->pw_uid;
+  gid = pwd->pw_gid;
+#else
+  uid_t uid;
+  gid_t gid;
+
+  if (strcmp(username, "root") != 0)
+    {
+      return -ENOENT;
+    }
+
+  uid = 0;
+  gid = 0;
+#endif
+
+  return nsh_switch_credentials(uid, gid);
+}
+
+/****************************************************************************
+ * Name: cmd_su
+ *
+ * Description:
+ *   su [username]
+ *
+ *   Switch the NSH session to the credentials of 'username'.  Callers with
+ *   root privileges (effective UID or GID zero) may switch to any user
+ *   without a password.  Other users may switch to their own identity
+ *   without a password, or to another user after entering that user's
+ *   password.
+ *
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_SU
+int cmd_su(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  char username_buf[48];
+  FAR const char *username;
+  uid_t target_uid;
+  gid_t target_gid;
+  int ret;
+  bool need_password = false;
+
+  if (argc > 2)
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+      return ERROR;
+    }
+
+  if (argc == 1)
+    {
+      username = "root";
+    }
+  else
+    {
+      /* argv[1] points into cn_line; copy it before readline reuses that
+       * buffer for the password prompt.
+       */
+
+      strlcpy(username_buf, argv[1], sizeof(username_buf));
+      username = username_buf;
+    }
+
+#ifdef CONFIG_LIBC_PASSWD_FILE
+  ret = nsh_lookup_user(username, &target_uid, &target_gid);
+  if (ret == -ENOENT)
+    {
+      nsh_error(vtbl, "su: Unknown user '%s'\n", username);
+      return ERROR;
+    }
+  else if (ret < 0)
+    {
+      nsh_error(vtbl, "su: Permission denied\n");
+      return ERROR;
+    }
+#else
+  if (strcmp(username, "root") != 0)
+    {
+      nsh_error(vtbl, "su: Unknown user '%s'\n", username);
+      return ERROR;
+    }
+
+  target_uid = 0;
+  target_gid = 0;
+#endif
+
+  if (!nsh_is_privileged())
+    {
+#ifdef CONFIG_LIBC_PASSWD_FILE
+      if (target_uid != geteuid())
+        {
+          need_password = true;
+        }
+#else
+      need_password = true;
+#endif
+    }
+
+#ifdef CONFIG_NSH_LOGIN
+  if (need_password)
+    {
+      char password[LINE_MAX];
+
+      ret = nsh_read_password(vtbl, password, sizeof(password));
+      if (ret < 0)
+        {
+          return ERROR;
+        }
+
+      if (!nsh_verify_credentials(username, password))
+        {
+          nsh_error(vtbl, "su: Authentication failure\n");
+          return ERROR;
+        }
+    }
+#else
+  if (need_password)
+    {
+      nsh_error(vtbl, "su: Permission denied\n");
+      return ERROR;
+    }
+#endif
+
+  ret = nsh_switch_credentials(target_uid, target_gid);
+  if (ret < 0)
+    {
+      nsh_error(vtbl, "su: Permission denied\n");
+      return ERROR;
+    }
+
+  nsh_update_prompt();
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_id
+ *
+ * Description:
+ *   Print real and effective UID/GID for the current session.
+ *
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_ID
+int cmd_id(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  if (argc != 1)
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+      return ERROR;
+    }
+
+  nsh_output(vtbl, "uid=%d euid=%d gid=%d egid=%d\n",
+             getuid(), geteuid(), getgid(), getegid());
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_whoami
+ *
+ * Description:
+ *   Print the user name for the effective UID.
+ *
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_WHOAMI
+int cmd_whoami(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  uid_t euid;
+
+  if (argc != 1)
+    {
+      nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+      return ERROR;
+    }
+
+  euid = geteuid();
+
+#ifdef CONFIG_LIBC_PASSWD_FILE
+  FAR struct passwd *pwd;
+
+  pwd = getpwuid(euid);
+  if (pwd != NULL && pwd->pw_name != NULL)
+    {
+      nsh_output(vtbl, "%s\n", pwd->pw_name);
+      return OK;
+    }
+#endif
+
+  if (euid == 0)
+    {
+      nsh_output(vtbl, "root\n");
+    }
+  else
+    {
+      nsh_output(vtbl, "%d\n", (int)euid);
+    }
+
+  return OK;
+}
+#endif
diff --git a/nshlib/nsh_login.c b/nshlib/nsh_login.c
index cde17f55c..6630a1689 100644
--- a/nshlib/nsh_login.c
+++ b/nshlib/nsh_login.c
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <termios.h>
+#include <errno.h>
 
 #include "fsutils/passwd.h"
 #ifdef CONFIG_NSH_CLE
@@ -250,6 +251,16 @@ int nsh_login(FAR struct console_stdio_s *pstate)
 #endif
             {
               write(OUTFD(pstate), g_loginsuccess, strlen(g_loginsuccess));
+
+#if defined(CONFIG_NSH_LOGIN_SETUID) && defined(CONFIG_SCHED_USER_IDENTITY)
+              if (nsh_setuser_identity(username) < 0)
+                {
+                  write(OUTFD(pstate), g_badidentity, strlen(g_badidentity));
+                  return -1;
+                }
+
+              nsh_update_prompt();
+#endif
               return OK;
             }
           else
diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
index 61ed7de55..9de45b887 100644
--- a/nshlib/nsh_parse.c
+++ b/nshlib/nsh_parse.c
@@ -316,6 +316,7 @@ const char g_userprompt[]        = "login: ";
 const char g_passwordprompt[]    = "password: ";
 const char g_loginsuccess[]      = "\nUser Logged-in!\n";
 const char g_badcredentials[]    = "\nInvalid username or password\n";
+const char g_badidentity[]       = "\nUnknown user identity\n";
 const char g_loginfailure[]      = "Login failed!\n";
 #endif
 
diff --git a/nshlib/nsh_prompt.c b/nshlib/nsh_prompt.c
index 4dfe24c3c..04f110a83 100644
--- a/nshlib/nsh_prompt.c
+++ b/nshlib/nsh_prompt.c
@@ -30,6 +30,10 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#ifdef CONFIG_SCHED_USER_IDENTITY
+#  include <unistd.h>
+#endif
+
 #include "nsh.h"
 
 /****************************************************************************
@@ -59,6 +63,10 @@ static char g_nshprompt[CONFIG_NSH_PROMPT_MAX] = CONFIG_NSH_PROMPT_STRING;
  *   - non-empty NSH_PROMPT_STRING
  *   - non-empty HOSTNAME and suffix
  *
+ *   When SCHED_USER_IDENTITY is enabled and NSH_PROMPT_STRING_ROOT or
+ *   NSH_PROMPT_STRING_USER are non-empty, the prompt for the current
+ *   effective UID replaces the value from the sources above.
+ *
  * Note that suffix has higher priority when used to help clearly separate
  * prompts from command line inputs.
  *
@@ -90,6 +98,22 @@ void nsh_update_prompt(void)
       gethostname(g_nshprompt, NSH_PROMPT_SIZE);
       strcat(g_nshprompt, CONFIG_NSH_PROMPT_SUFFIX);
     }
+
+#ifdef CONFIG_SCHED_USER_IDENTITY
+  if (geteuid() == 0)
+    {
+      if (CONFIG_NSH_PROMPT_STRING_ROOT[0] != '\0')
+        {
+          strlcpy(g_nshprompt, CONFIG_NSH_PROMPT_STRING_ROOT,
+                  CONFIG_NSH_PROMPT_MAX);
+        }
+    }
+  else if (CONFIG_NSH_PROMPT_STRING_USER[0] != '\0')
+    {
+      strlcpy(g_nshprompt, CONFIG_NSH_PROMPT_STRING_USER,
+              CONFIG_NSH_PROMPT_MAX);
+    }
+#endif
 }
 
 /****************************************************************************
diff --git a/nshlib/nsh_telnetlogin.c b/nshlib/nsh_telnetlogin.c
index 417ffda68..c796b2a36 100644
--- a/nshlib/nsh_telnetlogin.c
+++ b/nshlib/nsh_telnetlogin.c
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <termios.h>
+#include <errno.h>
 
 #include "fsutils/passwd.h"
 
@@ -255,6 +256,16 @@ int nsh_telnetlogin(FAR struct console_stdio_s *pstate)
 #endif
             {
               write(OUTFD(pstate), g_loginsuccess, strlen(g_loginsuccess));
+
+#if defined(CONFIG_NSH_LOGIN_SETUID) && defined(CONFIG_SCHED_USER_IDENTITY)
+              if (nsh_setuser_identity(username) < 0)
+                {
+                  write(OUTFD(pstate), g_badidentity, strlen(g_badidentity));
+                  return -1;
+                }
+
+              nsh_update_prompt();
+#endif
               return OK;
             }
           else

From 326b68aa3682a1f4efbf286086e610ffd96fbd9d Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 21 Jun 2026 01:08:24 +0800
Subject: [PATCH 439/568] examples/userfs: use designated initializers for
 struct dirent

The g_rootdir[] table initialized each entry's struct dirent member
positionally as { DTYPE_FILE, "FileN" }, which assumes d_type is the
first field.  This breaks when struct dirent gains the POSIX d_ino field
as its first member (see apache/nuttx: "fs/dirent: add d_ino member to
struct dirent"): the file-name string would be assigned to d_type,
producing -Wint-conversion warnings and an "initializer element is not
computable at load time" error.

Use designated initializers (.d_type / .d_name) so the table is robust
against the field order of struct dirent.

Also fix a 'Initiallly' typo in a nearby comment flagged by codespell.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 examples/userfs/userfs_main.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/examples/userfs/userfs_main.c b/examples/userfs/userfs_main.c
index a2cf97ea5..0a6b89cee 100644
--- a/examples/userfs/userfs_main.c
+++ b/examples/userfs/userfs_main.c
@@ -142,19 +142,28 @@ static char g_file3_data[UFSTEST_FILE3_MXSIZE] = "This is file 3";
 static struct ufstest_file_s g_rootdir[UFSTEST_NFILES] =
 {
     {
-      { DTYPE_FILE, "File1" },
+      {
+        .d_type = DTYPE_FILE,
+        .d_name = "File1"
+      },
       UFSTEST_INIT_FILE1_SIZE,
       UFSTEST_FILE1_MXSIZE,
       g_file1_data
     },
     {
-      { DTYPE_FILE, "File2" },
+      {
+        .d_type = DTYPE_FILE,
+        .d_name = "File2"
+      },
       UFSTEST_INIT_FILE2_SIZE,
       UFSTEST_FILE2_MXSIZE,
       g_file2_data
     },
     {
-      { DTYPE_FILE, "File3" },
+      {
+        .d_type = DTYPE_FILE,
+        .d_name = "File3"
+      },
       UFSTEST_INIT_FILE3_SIZE,
       UFSTEST_FILE3_MXSIZE,
       g_file3_data
@@ -247,7 +256,7 @@ static int ufstest_open(FAR void *volinfo, FAR const char *relpath,
 
       opriv->file = file;
 
-      /* Initiallly, there is one reference count on the open data.  This may
+      /* Initially, there is one reference count on the open data.  This may
        * be incremented in the event that the file is dup'ed.
        */
 

From d9874394dd34b7f6ca4bd95371bec25657b9ee17 Mon Sep 17 00:00:00 2001
From: Andrew Au <cshung@gmail.com>
Date: Sun, 21 Jun 2026 17:26:28 +0000
Subject: [PATCH 440/568] testing/sig_sp_test: add test for SP context restore
 on signal return

Add a test that verifies modifying SP (REG_R13) in the saved register
context is honored on signal return. The test pushes values onto the
stack, triggers SIGALRM, and in the handler advances SP to skip a
value, then verifies the correct value is popped after signal return.

This exercises the SP relocation fix in arm_sigdeliver.c for ARMv7-M
and ARMv8-M architectures.

Signed-off-by: Andrew Au <cshung@gmail.com>
---
 testing/sig_sp_test/CMakeLists.txt     |  20 +++
 testing/sig_sp_test/Kconfig            |  31 ++++
 testing/sig_sp_test/Make.defs          |  10 ++
 testing/sig_sp_test/Makefile           |  17 ++
 testing/sig_sp_test/sig_sp_test_main.c | 210 +++++++++++++++++++++++++
 5 files changed, 288 insertions(+)
 create mode 100644 testing/sig_sp_test/CMakeLists.txt
 create mode 100644 testing/sig_sp_test/Kconfig
 create mode 100644 testing/sig_sp_test/Make.defs
 create mode 100644 testing/sig_sp_test/Makefile
 create mode 100644 testing/sig_sp_test/sig_sp_test_main.c

diff --git a/testing/sig_sp_test/CMakeLists.txt b/testing/sig_sp_test/CMakeLists.txt
new file mode 100644
index 000000000..ed82f11be
--- /dev/null
+++ b/testing/sig_sp_test/CMakeLists.txt
@@ -0,0 +1,20 @@
+# ##############################################################################
+# apps/testing/sig_sp_test/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_SIG_SP_TEST)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_TESTING_SIG_SP_TEST_PROGNAME}
+    PRIORITY
+    ${CONFIG_TESTING_SIG_SP_TEST_PRIORITY}
+    STACKSIZE
+    ${CONFIG_TESTING_SIG_SP_TEST_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_SIG_SP_TEST}
+    SRCS
+    sig_sp_test_main.c)
+endif()
diff --git a/testing/sig_sp_test/Kconfig b/testing/sig_sp_test/Kconfig
new file mode 100644
index 000000000..1c32a53f2
--- /dev/null
+++ b/testing/sig_sp_test/Kconfig
@@ -0,0 +1,31 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_SIG_SP_TEST
+	tristate "Signal SP restore test"
+	default n
+	depends on BUILD_FLAT && ARCH_ARM
+	---help---
+		Test that modifying SP (REG_R13) in saved register context
+		during a signal handler is honored on exception return.
+
+		This verifies the SP context relocation in arm_sigdeliver.
+		Only available for flat builds on ARM.
+
+if TESTING_SIG_SP_TEST
+
+config TESTING_SIG_SP_TEST_PROGNAME
+	string "Program name"
+	default "sig_sp_test"
+
+config TESTING_SIG_SP_TEST_PRIORITY
+	int "Task priority"
+	default 100
+
+config TESTING_SIG_SP_TEST_STACKSIZE
+	int "Stack size"
+	default 4096
+
+endif
diff --git a/testing/sig_sp_test/Make.defs b/testing/sig_sp_test/Make.defs
new file mode 100644
index 000000000..57974a46c
--- /dev/null
+++ b/testing/sig_sp_test/Make.defs
@@ -0,0 +1,10 @@
+############################################################################
+# apps/testing/sig_sp_test/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_SIG_SP_TEST),)
+CONFIGURED_APPS += $(APPDIR)/testing/sig_sp_test
+endif
diff --git a/testing/sig_sp_test/Makefile b/testing/sig_sp_test/Makefile
new file mode 100644
index 000000000..af73ec99e
--- /dev/null
+++ b/testing/sig_sp_test/Makefile
@@ -0,0 +1,17 @@
+############################################################################
+# apps/testing/sig_sp_test/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_TESTING_SIG_SP_TEST_PROGNAME)
+PRIORITY  = $(CONFIG_TESTING_SIG_SP_TEST_PRIORITY)
+STACKSIZE = $(CONFIG_TESTING_SIG_SP_TEST_STACKSIZE)
+MODULE    = $(CONFIG_TESTING_SIG_SP_TEST)
+
+MAINSRC = sig_sp_test_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/sig_sp_test/sig_sp_test_main.c b/testing/sig_sp_test/sig_sp_test_main.c
new file mode 100644
index 000000000..e6df0a3bd
--- /dev/null
+++ b/testing/sig_sp_test/sig_sp_test_main.c
@@ -0,0 +1,210 @@
+/****************************************************************************
+ * apps/testing/sig_sp_test/sig_sp_test_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Test: Verify that modifying SP (REG_R13) in the saved register context
+ * is honored on context restore (exception return path).
+ *
+ * Scenario (simulates runtime unwinding past a trampoline):
+ *   1. Push values 1 and 2 onto the stack (simulating a trampoline push)
+ *   2. Busy-wait for a timer signal (SIGALRM)
+ *   3. In the handler, "emulate a pop" by advancing SP by 4
+ *      (simulating a runtime deciding the top frame was a stub)
+ *   4. Redirect PC to resume_after_signal
+ *   5. After signal return, pop a value — it should be 1
+ *
+ * This exercises:
+ *   - The SP relocation fix in arm_exception.S
+ *   - The backward sliding copy (new SP > old SP, stack shrinks)
+ *   - A realistic use case: unwinding past a trampoline frame
+ *
+ * Requirements:
+ *   - Flat build only (accesses nxsched_self() for saved_regs)
+ *   - ARM architecture (uses ARMv7-M register layout)
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <nuttx/arch.h>
+#include <nuttx/sched.h>
+#include <arch/irq.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static volatile int g_result = -1;
+static volatile int g_ready = 0;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: verify_result
+ *
+ * Description:
+ *   Called with the popped value in r0. Verifies it equals 1.
+ ****************************************************************************/
+
+void __attribute__((noinline, used)) verify_result(uint32_t value)
+{
+  printf("sig_sp_test: popped value = %lu (expected 1)\n",
+         (unsigned long)value);
+
+  if (value == 1)
+    {
+      printf("sig_sp_test: PASS\n");
+      g_result = 0;
+    }
+  else
+    {
+      printf("sig_sp_test: FAIL - expected 1, got %lu\n",
+             (unsigned long)value);
+      g_result = 1;
+    }
+
+  exit(g_result);
+}
+
+/****************************************************************************
+ * Name: resume_after_signal
+ *
+ * Description:
+ *   We land here after the signal handler adjusts SP and PC.
+ *   Stack now has [SP] = 1 (the '2' was skipped by SP += 4).
+ *   Pop one value and verify it equals 1.
+ ****************************************************************************/
+
+static void __attribute__((naked, used)) resume_after_signal(void)
+{
+  __asm__ __volatile__(
+    "pop  {r0}\n\t"
+    "b    verify_result\n\t"
+  );
+}
+
+/****************************************************************************
+ * Name: sigalrm_handler
+ *
+ * Description:
+ *   Called from the timer interrupt path (async signal delivery).
+ *   Accesses saved_regs via nxsched_self() to modify the context
+ *   that will be restored after signal return.
+ ****************************************************************************/
+
+static void sigalrm_handler(int signo, siginfo_t *info, void *ucontext)
+{
+  struct tcb_s *rtcb = nxsched_self();
+  uint32_t *regs;
+
+  (void)signo;
+  (void)info;
+  (void)ucontext;
+
+  regs = rtcb->xcp.saved_regs;
+  if (regs == NULL)
+    {
+      printf("sig_sp_test: ERROR - saved_regs is NULL\n");
+      exit(2);
+    }
+
+  printf("sig_sp_test: handler - PC=0x%08lx SP=0x%08lx\n",
+         (unsigned long)regs[REG_R15],
+         (unsigned long)regs[REG_R13]);
+
+  /* Only act when the main code is ready (in the asm loop) */
+
+  if (!g_ready)
+    {
+      alarm(1);
+      return;
+    }
+
+  /* Emulate a pop: advance SP by 4 (skip top-of-stack value '2') */
+
+  regs[REG_R13] += 4;
+
+  /* Redirect execution to resume_after_signal */
+
+  regs[REG_R15] = ((uint32_t)(uintptr_t)resume_after_signal) & ~1u;
+  regs[REG_XPSR] |= (1 << 24);
+
+  printf("sig_sp_test: handler - new SP=0x%08lx PC=0x%08lx\n",
+         (unsigned long)regs[REG_R13],
+         (unsigned long)regs[REG_R15]);
+}
+
+/****************************************************************************
+ * Name: wait_with_values_on_stack
+ *
+ * Description:
+ *   Push 1 and 2 on the stack, set g_ready, then loop forever.
+ *   The alarm handler will redirect us out of the loop.
+ *   Stack after pushes: [SP] = 2, [SP+4] = 1
+ ****************************************************************************/
+
+static void __attribute__((naked, used)) wait_with_values_on_stack(void)
+{
+  __asm__ __volatile__(
+    "mov  r0, #1\n\t"
+    "push {r0}\n\t"
+    "mov  r0, #2\n\t"
+    "push {r0}\n\t"
+    "ldr  r0, =g_ready\n\t"
+    "mov  r1, #1\n\t"
+    "str  r1, [r0]\n\t"
+    "1: nop\n\t"
+    "b    1b\n\t"
+  );
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * sig_sp_test_main
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  struct sigaction sa;
+
+  (void)argc;
+  (void)argv;
+
+  printf("sig_sp_test: Signal SP restore test\n");
+  printf("sig_sp_test: push 1, push 2, alarm, handler SP+=4, pop => 1\n");
+
+  memset(&sa, 0, sizeof(sa));
+  sa.sa_sigaction = sigalrm_handler;
+  sa.sa_flags = SA_SIGINFO;
+  sigemptyset(&sa.sa_mask);
+
+  if (sigaction(SIGALRM, &sa, NULL) < 0)
+    {
+      printf("sig_sp_test: ERROR sigaction failed\n");
+      return 1;
+    }
+
+  alarm(1);
+  wait_with_values_on_stack();
+
+  /* Should never reach here */
+
+  printf("sig_sp_test: ERROR - returned from wait\n");
+  return 1;
+}

From da143595e1ce2ea209e1b3d4491db6627be016ad Mon Sep 17 00:00:00 2001
From: aviralgarg05 <gargaviral99@gmail.com>
Date: Wed, 3 Jun 2026 19:21:14 +0530
Subject: [PATCH 441/568] apps: add missing module metadata for executable
 tools

Add the missing module metadata for the executable ELF helpers used by the package fixture flow so the generated artifacts describe their target and type consistently.

Also fix the existing embedlog spelling issue that is picked up by the current apps check, keeping this branch clean under CI.

Signed-off-by: aviralgarg05 <gargaviral99@gmail.com>
---
 crypto/libtomcrypt/Makefile |  3 +++
 crypto/tinycrypt/Makefile   |  3 ++-
 database/sqlite/Makefile    |  2 +-
 logging/embedlog/Kconfig    |  4 ++--
 logging/embedlog/Makefile   |  3 ++-
 math/libtommath/Makefile    |  4 ++++
 system/fdt/Kconfig          |  8 ++++----
 system/fdt/Makefile         | 12 ++++++++----
 system/libuv/Kconfig        |  4 ++--
 system/libuv/Makefile       |  4 +++-
 videoutils/x264/Makefile    |  3 +--
 11 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/crypto/libtomcrypt/Makefile b/crypto/libtomcrypt/Makefile
index 68219a8cf..b4fe79fd6 100644
--- a/crypto/libtomcrypt/Makefile
+++ b/crypto/libtomcrypt/Makefile
@@ -451,6 +451,7 @@ ifneq ($(CONFIG_LIBTOMCRYPT_DEMOS),)
 ifneq ($(CONFIG_LIBTOMCRYPT_LTCRYPT),)
 MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/demos/ltcrypt.c
 
+MODULE += $(CONFIG_LIBTOMCRYPT_LTCRYPT)
 PROGNAME += $(CONFIG_LIBTOMCRYPT_LTCRYPT_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMCRYPT_LTCRYPT_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMCRYPT_LTCRYPT_STACKSIZE)
@@ -459,6 +460,7 @@ endif
 ifneq ($(CONFIG_LIBTOMCRYPT_HASHSUM),)
 MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/demos/hashsum.c
 
+MODULE += $(CONFIG_LIBTOMCRYPT_HASHSUM)
 PROGNAME += $(CONFIG_LIBTOMCRYPT_HASHSUM_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMCRYPT_HASHSUM_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMCRYPT_HASHSUM_STACKSIZE)
@@ -478,6 +480,7 @@ NEWSRC := $(wildcard libtomcrypt/tests/*.c)
 CSRCS += $(filter-out $(LIBTOMCRYPT_UNPACKNAME)/tests/test.c, $(NEWSRC))
 MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/tests/test.c
 
+MODULE += $(CONFIG_LIBTOMCRYPT_TEST)
 PROGNAME += $(CONFIG_LIBTOMCRYPT_TEST_PROGNAME)
 PRIORITY  += $(CONFIG_LIBTOMCRYPT_TEST_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMCRYPT_TEST_STACKSIZE)
diff --git a/crypto/tinycrypt/Makefile b/crypto/tinycrypt/Makefile
index 70cee2435..d5c2c0e9f 100644
--- a/crypto/tinycrypt/Makefile
+++ b/crypto/tinycrypt/Makefile
@@ -104,10 +104,11 @@ ifeq ($(CONFIG_TINYCRYPT_CTR_PRNG),y)
 	CSRCS += tinycrypt/lib/source/ctr_prng.c
 endif
 
-ifeq ($(CONFIG_TINYCRYPT_TEST),y)
+ifneq ($(CONFIG_TINYCRYPT_TEST),)
 	CFLAGS    += ${INCDIR_PREFIX}$(APPDIR)/crypto/tinycrypt/tinycrypt/tests/include
 	CFLAGS    += -DENABLE_TESTS
 	CSRCS     += tinycrypt/tests/test_ecc_utils.c
+	MODULE    += $(CONFIG_TINYCRYPT_TEST)
 	PRIORITY   = $(CONFIG_TINYCRYPT_TEST_PRIORITY)
 	STACKSIZE  = $(CONFIG_TINYCRYPT_TEST_STACKSIZE)
 
diff --git a/database/sqlite/Makefile b/database/sqlite/Makefile
index cc1e6b460..3a109672f 100644
--- a/database/sqlite/Makefile
+++ b/database/sqlite/Makefile
@@ -36,6 +36,7 @@ ifneq ($(CONFIG_UTILS_SQLITE),)
 PROGNAME  = sqlite3
 PRIORITY  = 100
 STACKSIZE = ${CONFIG_UTILS_SQLITE_STACKSIZE}
+MODULE = $(CONFIG_UTILS_SQLITE)
 MAINSRC = ${BUILDDIR}/shell.c
 endif
 
@@ -67,4 +68,3 @@ ifeq ($(wildcard sqlite/.git),)
 endif
 
 include $(APPDIR)/Application.mk
-
diff --git a/logging/embedlog/Kconfig b/logging/embedlog/Kconfig
index c6cad947c..ce5dd19d3 100644
--- a/logging/embedlog/Kconfig
+++ b/logging/embedlog/Kconfig
@@ -189,7 +189,7 @@ config EMBEDLOG_LOG_MAX
 	int "Max length of log message"
 	default 128
 	---help---
-		Maximum length of single log message. This defines length of finall
+		Maximum length of single log message. This defines length of final
 		message, so message "foo() returned %s" may consume for example
 		200 bytes since '%s' may be a long string. Metadata like timestamp
 		or file info uses this space too. Output log will be truncated if
@@ -205,7 +205,7 @@ config EMBEDLOG_MEM_LINE_SIZE
 		for more information about this.
 
 config EMBEDLOG_DEMO_PROGRAMS
-	bool "Compile demo programs"
+	tristate "Compile demo programs"
 	default n
 	---help---
 		Compile demo programs that visualise how embedlog works. Also good
diff --git a/logging/embedlog/Makefile b/logging/embedlog/Makefile
index ef7b306f7..45d499bc0 100644
--- a/logging/embedlog/Makefile
+++ b/logging/embedlog/Makefile
@@ -168,10 +168,11 @@ CFLAGS += -DENABLE_OUT_NET=0
 # nuttx does not implement clock() function
 CFLAGS += -DENABLE_CLOCK=0
 
-ifeq ($(CONFIG_EMBEDLOG_DEMO_PROGRAMS),y)
+ifneq ($(CONFIG_EMBEDLOG_DEMO_PROGRAMS),)
 	# build demo programs as library instead of standalone programs
 	CFLAGS += -DEMBEDLOG_DEMO_LIBRARY
 
+	MODULE     = $(CONFIG_EMBEDLOG_DEMO_PROGRAMS)
 	PROGNAME   = el_demo_print_memory
 	PRIORITY   = $(CONFIG_EMBEDLOG_DEMO_PROGRAMS_PRIORITY)
 	STACKSIZE  = $(CONFIG_EMBEDLOG_DEMO_PROGRAMS_STACKSIZE)
diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile
index 91b47d463..0d9fe26e4 100644
--- a/math/libtommath/Makefile
+++ b/math/libtommath/Makefile
@@ -65,6 +65,7 @@ DEPPATH += --dep-path $(LIBTOMMATH_UNPACKNAME)/demo
 ifneq ($(CONFIG_LIBTOMMATH_TEST),)
 MAINSRC += test.c
 
+MODULE += $(CONFIG_LIBTOMMATH_TEST)
 PROGNAME += $(CONFIG_LIBTOMMATH_TEST_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMMATH_TEST_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMMATH_TEST_STACKSIZE)
@@ -73,6 +74,7 @@ endif
 ifneq ($(CONFIG_LIBTOMMATH_MTEST_OPPONENT),)
 MAINSRC += mtest_opponent.c
 
+MODULE += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT)
 PROGNAME += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT_STACKSIZE)
@@ -81,6 +83,7 @@ endif
 ifneq ($(CONFIG_LIBTOMMATH_TIMING),)
 MAINSRC += timing.c
 
+MODULE += $(CONFIG_LIBTOMMATH_TIMING)
 PROGNAME += $(CONFIG_LIBTOMMATH_TIMING_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMMATH_TIMING_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMMATH_TIMING_STACKSIZE)
@@ -91,6 +94,7 @@ MAINSRC += mtest.c
 VPATH += $(LIBTOMMATH_UNPACKNAME)/mtest
 DEPPATH += --dep-path $(LIBTOMMATH_UNPACKNAME)/mtest
 
+MODULE += $(CONFIG_LIBTOMMATH_MTEST)
 PROGNAME += $(CONFIG_LIBTOMMATH_MTEST_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMMATH_MTEST_PRIORITY)
 STACKSIZE += $(CONFIG_LIBTOMMATH_MTEST_STACKSIZE)
diff --git a/system/fdt/Kconfig b/system/fdt/Kconfig
index 0d3af5e54..1d9c7f235 100644
--- a/system/fdt/Kconfig
+++ b/system/fdt/Kconfig
@@ -12,7 +12,7 @@ config SYSTEM_FDT
 if LIBC_FDT
 
 config SYSTEM_FDTDUMP
-	bool "system fdtdump command"
+	tristate "system fdtdump command"
 	default n
 	select SYSTEM_FDT
 	---help---
@@ -35,7 +35,7 @@ config SYSTEM_FDTDUMP_PRIORITY
 endif # SYSTEM_FDTDUMP
 
 config SYSTEM_FDTGET
-	bool "system fdtget command"
+	tristate "system fdtget command"
 	default n
 	select SYSTEM_FDT
 	---help---
@@ -58,7 +58,7 @@ config SYSTEM_FDTGET_PRIORITY
 endif # SYSTEM_FDTGET
 
 config SYSTEM_FDTPUT
-	bool "system fdtput command"
+	tristate "system fdtput command"
 	default n
 	select SYSTEM_FDT
 	---help---
@@ -81,7 +81,7 @@ config SYSTEM_FDTPUT_PRIORITY
 endif # SYSTEM_FDTPUT
 
 config SYSTEM_FDTOVERLAY
-	bool "system fdtoverlay command"
+	tristate "system fdtoverlay command"
 	default n
 	select SYSTEM_FDT
 	---help---
diff --git a/system/fdt/Makefile b/system/fdt/Makefile
index 58329c89a..6b4284697 100644
--- a/system/fdt/Makefile
+++ b/system/fdt/Makefile
@@ -26,29 +26,33 @@ include $(APPDIR)/Make.defs
 
 CSRCS = util.c
 
-ifeq ($(CONFIG_SYSTEM_FDTDUMP),y)
+ifneq ($(CONFIG_SYSTEM_FDTDUMP),)
   MAINSRC += fdtdump.c
+  MODULE += $(CONFIG_SYSTEM_FDTDUMP)
   PROGNAME += fdtdump
   STACKSIZE += $(CONFIG_SYSTEM_FDTDUMP_STACKSIZE)
   PRIORITY += $(CONFIG_SYSTEM_FDTDUMP_PRIORITY)
 endif
 
-ifeq ($(CONFIG_SYSTEM_FDTGET),y)
+ifneq ($(CONFIG_SYSTEM_FDTGET),)
   MAINSRC += fdtget.c
+  MODULE += $(CONFIG_SYSTEM_FDTGET)
   PROGNAME += fdtget
   STACKSIZE += $(CONFIG_SYSTEM_FDTGET_STACKSIZE)
   PRIORITY += $(CONFIG_SYSTEM_FDTGET_PRIORITY)
 endif
 
-ifeq ($(CONFIG_SYSTEM_FDTPUT),y)
+ifneq ($(CONFIG_SYSTEM_FDTPUT),)
   MAINSRC += fdtput.c
+  MODULE += $(CONFIG_SYSTEM_FDTPUT)
   PROGNAME += fdtput
   STACKSIZE += $(CONFIG_SYSTEM_FDTPUT_STACKSIZE)
   PRIORITY += $(CONFIG_SYSTEM_FDTPUT_PRIORITY)
 endif
 
-ifeq ($(CONFIG_SYSTEM_FDTOVERLAY),y)
+ifneq ($(CONFIG_SYSTEM_FDTOVERLAY),)
   MAINSRC += fdtoverlay.c
+  MODULE += $(CONFIG_SYSTEM_FDTOVERLAY)
   PROGNAME += fdtoverlay
   STACKSIZE += $(CONFIG_SYSTEM_FDTOVERLAY_STACKSIZE)
   PRIORITY += $(CONFIG_SYSTEM_FDTOVERLAY_PRIORITY)
diff --git a/system/libuv/Kconfig b/system/libuv/Kconfig
index 6b2caf7ef..b969cda90 100644
--- a/system/libuv/Kconfig
+++ b/system/libuv/Kconfig
@@ -62,10 +62,10 @@ config LIBUV_UTILS_NONE
 	bool "none"
 
 config LIBUV_UTILS_TEST
-	bool "uv_run_tests"
+	tristate "uv_run_tests"
 
 config LIBUV_UTILS_BENCHMARK
-	bool "uv_run_benchmarks"
+	tristate "uv_run_benchmarks"
 
 endchoice
 
diff --git a/system/libuv/Makefile b/system/libuv/Makefile
index b8d4e0d8b..dec76cc1a 100644
--- a/system/libuv/Makefile
+++ b/system/libuv/Makefile
@@ -129,13 +129,14 @@ ifneq ($(CONFIG_NET_UDP),)
 CSRCS += udp.c
 endif
 
-ifeq ($(findstring y,$(CONFIG_LIBUV_UTILS_TEST)$(CONFIG_LIBUV_UTILS_BENCHMARK)), y)
+ifneq ($(CONFIG_LIBUV_UTILS_TEST)$(CONFIG_LIBUV_UTILS_BENCHMARK),)
 PRIORITY  = $(CONFIG_LIBUV_UTILS_PRIORITY)
 STACKSIZE = $(CONFIG_LIBUV_UTILS_STACKSIZE)
 endif
 
 ifneq ($(CONFIG_LIBUV_UTILS_TEST),)
 
+MODULE = $(CONFIG_LIBUV_UTILS_TEST)
 PROGNAME = uv_run_tests
 MAINSRC  = run-tests.c
 
@@ -148,6 +149,7 @@ endif
 
 ifneq ($(CONFIG_LIBUV_UTILS_BENCHMARK),)
 
+MODULE = $(CONFIG_LIBUV_UTILS_BENCHMARK)
 PROGNAME = uv_run_benchmarks
 MAINSRC  = run-benchmarks.c
 
diff --git a/videoutils/x264/Makefile b/videoutils/x264/Makefile
index 8faf0771a..b8f05ead4 100644
--- a/videoutils/x264/Makefile
+++ b/videoutils/x264/Makefile
@@ -239,7 +239,7 @@ $(OBJASM_G): $(PREFIX)%.$(ASMEXT)$(NASUFFIX)$(OBJEXT): %.$(ASMEXT)
 	$(Q) $(AS) $(ASFLAGS) $< -o $@
 
 ifneq ($(CONFIG_UTILS_X264),)
-  MODULE    += CONFIG_UTILS_X264
+  MODULE    += $(CONFIG_UTILS_X264)
   PROGNAME  += x264
   PRIORITY  += $(CONFIG_UTILS_X264_PRIORITY)
   STACKSIZE += $(CONFIG_UTILS_X264_STACKSIZE)
@@ -282,4 +282,3 @@ distclean::
 endif
 
 include $(APPDIR)/Application.mk
-

From 085ca0606ef2a45e6d776845c36698201fe2ea0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2026 22:22:34 +0000
Subject: [PATCH 442/568] build(deps): bump actions/checkout from 6 to 7

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml   | 8 ++++----
 .github/workflows/check.yml   | 4 ++--
 .github/workflows/labeler.yml | 2 +-
 .github/workflows/lint.yml    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c137c5be..22106e8bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,7 @@ jobs:
           echo "apps_ref=$APPS_REF" >> $GITHUB_OUTPUT
 
       - name: Checkout nuttx repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: apache/nuttx
           ref: ${{ steps.gittargets.outputs.os_ref }}
@@ -95,7 +95,7 @@ jobs:
         run: git -C sources/nuttx fetch --tags
 
       - name: Checkout apps repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: apache/nuttx-apps
           ref: ${{ steps.gittargets.outputs.apps_ref }}
@@ -363,7 +363,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MSYS
@@ -437,7 +437,7 @@ jobs:
     if: ${{ needs.msvc-Arch.outputs.skip_all_builds != '1' }}
     runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       # Set up Python environment and install kconfiglib
       - name: Set up Python and install kconfiglib
         uses: actions/setup-python@v6
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 67b8d17ec..a183d0c12 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -28,14 +28,14 @@ jobs:
 
     steps:
       - name: Checkout nuttx repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: apache/nuttx
           path: nuttx
           fetch-depth: 0
 
       - name: Checkout apps repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: apache/nuttx-apps
           path: apps
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 224911be2..4c6bb3ef7 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -33,7 +33,7 @@ jobs:
       # Checkout one file from our trusted source: .github/labeler.yml
       # Never checkout and execute any untrusted code from the PR.
       - name: Checkout labeler config
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
         with:
           repository: apache/nuttx-apps
           ref: master
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index fbebfdc0a..9a82b0362 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - run: mkdir super-linter.report

From cea2f89f7428c4a8b45dd31e18baf7605c29cbcc Mon Sep 17 00:00:00 2001
From: Nightt <87569709+nightt5879@users.noreply.github.com>
Date: Wed, 24 Jun 2026 11:52:41 +0800
Subject: [PATCH 443/568] industry/scpi: add unit parser config options

Expose scpi-parser unit support through explicit Kconfig options instead of raw CFLAGS.

Map each option to the corresponding upstream USE_UNITS_* compile-time define, preserving the existing default unit set while allowing users to enable groups such as USE_UNITS_TIME.

Signed-off-by: Nightt <87569709+nightt5879@users.noreply.github.com>
---
 industry/scpi/Kconfig  | 65 +++++++++++++++++++++++++++++++++++++++++-
 industry/scpi/Makefile | 18 ++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/industry/scpi/Kconfig b/industry/scpi/Kconfig
index d8911ecc7..6797051e6 100644
--- a/industry/scpi/Kconfig
+++ b/industry/scpi/Kconfig
@@ -7,10 +7,71 @@ config SCPI_PARSER
 	tristate "SCPI instrument side parser"
 	default n
 
+if SCPI_PARSER
+
+menu "SCPI parser unit support"
+
+config SCPI_PARSER_UNITS_IMPERIAL
+	bool "Imperial units"
+	default n
+
+config SCPI_PARSER_UNITS_ANGLE
+	bool "Angle units"
+	default n
+
+config SCPI_PARSER_UNITS_PARTICLES
+	bool "Particle units"
+	default n
+
+config SCPI_PARSER_UNITS_DISTANCE
+	bool "Distance units"
+	default n
+
+config SCPI_PARSER_UNITS_MAGNETIC
+	bool "Magnetic units"
+	default n
+
+config SCPI_PARSER_UNITS_LIGHT
+	bool "Light units"
+	default n
+
+config SCPI_PARSER_UNITS_ENERGY_FORCE_MASS
+	bool "Energy, force, and mass units"
+	default n
+
+config SCPI_PARSER_UNITS_TIME
+	bool "Time units"
+	default n
+
+config SCPI_PARSER_UNITS_TEMPERATURE
+	bool "Temperature units"
+	default n
+
+config SCPI_PARSER_UNITS_RATIO
+	bool "Ratio units"
+	default n
+
+config SCPI_PARSER_UNITS_POWER
+	bool "Power units"
+	default y
+
+config SCPI_PARSER_UNITS_FREQUENCY
+	bool "Frequency units"
+	default y
+
+config SCPI_PARSER_UNITS_ELECTRIC
+	bool "Electric units"
+	default y
+
+config SCPI_PARSER_UNITS_ELECTRIC_CHARGE_CONDUCTANCE
+	bool "Electric charge and conductance units"
+	default n
+
+endmenu
+
 config SCPI_PARSER_DEMO
 	bool "Enable the SCPI parser library demo"
 	default n
-	depends on SCPI_PARSER
 
 if SCPI_PARSER_DEMO
 
@@ -23,3 +84,5 @@ config SCPI_PARSER_DEMO_STACKSIZE
 	default DEFAULT_TASK_STACKSIZE
 
 endif
+
+endif
diff --git a/industry/scpi/Makefile b/industry/scpi/Makefile
index c86267297..515011129 100644
--- a/industry/scpi/Makefile
+++ b/industry/scpi/Makefile
@@ -39,6 +39,24 @@ CFLAGS += -DHAVE_SNPRINTF
 CFLAGS += -DHAVE_STRNDUP
 CFLAGS += -DHAVE_STRNCASECMP
 
+SCPI_UNIT = $(if $(filter y,$(CONFIG_SCPI_PARSER_UNITS_$(1))),1,0)
+SCPI_UECC = $(call SCPI_UNIT,ELECTRIC_CHARGE_CONDUCTANCE)
+
+CFLAGS += -DUSE_UNITS_IMPERIAL=$(call SCPI_UNIT,IMPERIAL)
+CFLAGS += -DUSE_UNITS_ANGLE=$(call SCPI_UNIT,ANGLE)
+CFLAGS += -DUSE_UNITS_PARTICLES=$(call SCPI_UNIT,PARTICLES)
+CFLAGS += -DUSE_UNITS_DISTANCE=$(call SCPI_UNIT,DISTANCE)
+CFLAGS += -DUSE_UNITS_MAGNETIC=$(call SCPI_UNIT,MAGNETIC)
+CFLAGS += -DUSE_UNITS_LIGHT=$(call SCPI_UNIT,LIGHT)
+CFLAGS += -DUSE_UNITS_ENERGY_FORCE_MASS=$(call SCPI_UNIT,ENERGY_FORCE_MASS)
+CFLAGS += -DUSE_UNITS_TIME=$(call SCPI_UNIT,TIME)
+CFLAGS += -DUSE_UNITS_TEMPERATURE=$(call SCPI_UNIT,TEMPERATURE)
+CFLAGS += -DUSE_UNITS_RATIO=$(call SCPI_UNIT,RATIO)
+CFLAGS += -DUSE_UNITS_POWER=$(call SCPI_UNIT,POWER)
+CFLAGS += -DUSE_UNITS_FREQUENCY=$(call SCPI_UNIT,FREQUENCY)
+CFLAGS += -DUSE_UNITS_ELECTRIC=$(call SCPI_UNIT,ELECTRIC)
+CFLAGS += -DUSE_UNITS_ELECTRIC_CHARGE_CONDUCTANCE=$(SCPI_UECC)
+
 ifneq ($(CONFIG_SCPI_PARSER_DEMO),)
 MAINSRC = $(SCPI_UNPACK)/examples/test-interactive/main.c
 CSRCS += scpi-def.c

From e44c4f370f67728e3c276c7f681eeb11120195c0 Mon Sep 17 00:00:00 2001
From: Michal Lenc <michallenc@seznam.cz>
Date: Sun, 8 Feb 2026 15:49:23 +0100
Subject: [PATCH 444/568] testing/libc: add stdbit test

Adds the testing application used for CI stdc*_ functions tests.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
---
 testing/libc/stdbit/CMakeLists.txt |   33 +
 testing/libc/stdbit/Kconfig        |   13 +
 testing/libc/stdbit/Make.defs      |   25 +
 testing/libc/stdbit/Makefile       |   34 +
 testing/libc/stdbit/stdbit.c       | 1398 ++++++++++++++++++++++++++++
 5 files changed, 1503 insertions(+)
 create mode 100644 testing/libc/stdbit/CMakeLists.txt
 create mode 100644 testing/libc/stdbit/Kconfig
 create mode 100644 testing/libc/stdbit/Make.defs
 create mode 100644 testing/libc/stdbit/Makefile
 create mode 100644 testing/libc/stdbit/stdbit.c

diff --git a/testing/libc/stdbit/CMakeLists.txt b/testing/libc/stdbit/CMakeLists.txt
new file mode 100644
index 000000000..56004a164
--- /dev/null
+++ b/testing/libc/stdbit/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/testing/libc/stdbit/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_STDBIT_TEST)
+  nuttx_add_application(
+    NAME
+    stdbit_test
+    STACKSIZE
+    4096
+    MODULE
+    ${CONFIG_TESTING_STDBIT_TEST}
+    SRCS
+    stdbit.c)
+endif()
diff --git a/testing/libc/stdbit/Kconfig b/testing/libc/stdbit/Kconfig
new file mode 100644
index 000000000..e43204c2c
--- /dev/null
+++ b/testing/libc/stdbit/Kconfig
@@ -0,0 +1,13 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_STDBIT_TEST
+	tristate "stdbit test tool"
+	default n
+	---help---
+		Performs a basic operations with stdbit call.
+
+if TESTING_STDBIT_TEST
+endif
diff --git a/testing/libc/stdbit/Make.defs b/testing/libc/stdbit/Make.defs
new file mode 100644
index 000000000..c4610f12d
--- /dev/null
+++ b/testing/libc/stdbit/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/libc/stdbit/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_STDBIT_TEST),)
+CONFIGURED_APPS += $(APPDIR)/testing/libc/stdbit
+endif
diff --git a/testing/libc/stdbit/Makefile b/testing/libc/stdbit/Makefile
new file mode 100644
index 000000000..6de6d6b40
--- /dev/null
+++ b/testing/libc/stdbit/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/testing/libc/stdbit/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# stdbit.h test tool
+
+PROGNAME = stdbit_test
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = 4096
+MODULE = $(CONFIG_TESTING_STDBIT_TEST)
+
+MAINSRC = stdbit.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/libc/stdbit/stdbit.c b/testing/libc/stdbit/stdbit.c
new file mode 100644
index 000000000..9a5d485b5
--- /dev/null
+++ b/testing/libc/stdbit/stdbit.c
@@ -0,0 +1,1398 @@
+/****************************************************************************
+ * apps/testing/libc/stdbit/stdbit.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdbit.h>
+#include <limits.h>
+#include <sys/param.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CHAR_SIZ (8)
+#define NBITS(x) (sizeof(x) * CHAR_SIZ)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct test_entry_s
+{
+  const char name[NAME_MAX];
+  CODE int (*entry)(void);
+};
+
+/****************************************************************************
+ * Private Functions Prototypes
+ ****************************************************************************/
+
+static int leading_zeros(void);
+static int leading_ones(void);
+static int trailing_zeros(void);
+static int trailing_ones(void);
+static int first_leading_zero(void);
+static int first_leading_one(void);
+static int first_trailing_zero(void);
+static int first_trailing_one(void);
+static int count_zeros(void);
+static int count_ones(void);
+static int has_single_bit(void);
+static int bit_width(void);
+static int bit_floor(void);
+static int bit_ceil(void);
+
+/****************************************************************************
+ * Private data
+ ****************************************************************************/
+
+static const struct test_entry_s g_entry_list[] =
+{
+  {"leading_zeros", leading_zeros},
+  {"leading_ones", leading_ones},
+  {"trailing_zeros", trailing_zeros},
+  {"trailing_ones", trailing_ones},
+  {"first_leading_zero", first_leading_zero},
+  {"first_leading_one", first_leading_one},
+  {"first_trailing_zero", first_trailing_zero},
+  {"first_trailing_one", first_trailing_one},
+  {"count_zeros", count_zeros},
+  {"count_ones", count_ones},
+  {"has_single_bit", has_single_bit},
+  {"bit_width", bit_width},
+  {"bit_floor", bit_floor},
+  {"bit_ceil", bit_ceil},
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: leading_zeros
+ ****************************************************************************/
+
+static int leading_zeros(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = (1 << (nbits - 1));
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_zeros_uc(uc);
+      ret2 = stdc_leading_zeros(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc = uc >> 1;
+    }
+
+  nbits = NBITS(us);
+  us = (1 << (nbits - 1));
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_zeros_us(us);
+      ret2 = stdc_leading_zeros(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us = us >> 1;
+    }
+
+  nbits = NBITS(ui);
+  ui = (1U << (nbits - 1));
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_zeros_ui(ui);
+      ret2 = stdc_leading_zeros(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui = ui >> 1;
+    }
+
+  nbits = NBITS(ul);
+  ul = (1UL << (nbits - 1));
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_zeros_ul(ul);
+      ret2 = stdc_leading_zeros(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul = ul >> 1;
+    }
+
+  nbits = NBITS(ull);
+  ull = (1ULL << (nbits - 1));
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_zeros_ul(ull);
+      ret2 = stdc_leading_zeros(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull = ull >> 1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: leading_ones
+ ****************************************************************************/
+
+static int leading_ones(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_ones_uc(uc);
+      ret2 = stdc_leading_ones(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc |= (1 << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_ones_us(us);
+      ret2 = stdc_leading_ones(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us |= (1 << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_ones_ui(ui);
+      ret2 = stdc_leading_ones(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui |= (1U << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_ones_ul(ul);
+      ret2 = stdc_leading_ones(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul |= (1UL << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_leading_ones_ul(ull);
+      ret2 = stdc_leading_ones(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull |= (1ULL << (nbits - (i + 1)));
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: trailing_zeros
+ ****************************************************************************/
+
+static int trailing_zeros(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 1;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_zeros_uc(uc);
+      ret2 = stdc_trailing_zeros(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc = uc << 1;
+    }
+
+  nbits = NBITS(us);
+  us = 1;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_zeros_us(us);
+      ret2 = stdc_trailing_zeros(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us = us << 1;
+    }
+
+  nbits = NBITS(ui);
+  ui = 1;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_zeros_ui(ui);
+      ret2 = stdc_trailing_zeros(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui = ui << 1;
+    }
+
+  nbits = NBITS(ul);
+  ul = 1;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_zeros_ul(ul);
+      ret2 = stdc_trailing_zeros(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul = ul << 1;
+    }
+
+  nbits = NBITS(ull);
+  ull = 1;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_zeros_ul(ull);
+      ret2 = stdc_trailing_zeros(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull = ull << 1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: traling_ones
+ ****************************************************************************/
+
+static int trailing_ones(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_ones_uc(uc);
+      ret2 = stdc_trailing_ones(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc |= (1 << i);
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_ones_us(us);
+      ret2 = stdc_trailing_ones(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us |= (1 << i);
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_ones_ui(ui);
+      ret2 = stdc_trailing_ones(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui |= (1U << i);
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_ones_ul(ul);
+      ret2 = stdc_trailing_ones(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul |= (1UL << i);
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_trailing_ones_ul(ull);
+      ret2 = stdc_trailing_ones(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull |= (1ULL << i);
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: first_leading_zero
+ ****************************************************************************/
+
+static int first_leading_zero(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 1; i <= nbits + 1; i++)
+    {
+      ret = stdc_first_leading_zero_uc(uc);
+      ret2 = stdc_first_leading_zero(uc);
+      if (ret != (i % (nbits + 1)) || ret2 != (i % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      uc |= (1 << (nbits - i));
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 1; i <= nbits + 1; i++)
+    {
+      ret = stdc_first_leading_zero_us(us);
+      ret2 = stdc_first_leading_zero(us);
+      if (ret != (i % (nbits + 1)) || ret2 != (i % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      us |= (1 << (nbits - i));
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 1; i <= nbits + 1; i++)
+    {
+      ret = stdc_first_leading_zero_ui(ui);
+      ret2 = stdc_first_leading_zero(ui);
+      if (ret != (i % (nbits + 1)) || ret2 != (i % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ui |= (1U << (nbits - i));
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 1; i <= (nbits + 1); i++)
+    {
+      ret = stdc_first_leading_zero_ul(ul);
+      ret2 = stdc_first_leading_zero(ul);
+      if (ret != (i % (nbits + 1)) || ret2 != (i % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ul |= (1UL << (nbits - i));
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 1; i <= nbits + 1; i++)
+    {
+      ret = stdc_first_leading_zero_ul(ull);
+      ret2 = stdc_first_leading_zero(ull);
+      if (ret != (i % (nbits + 1)) || ret2 != (i % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ull |= (1ULL << (nbits - i));
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: first_leading_zero
+ ****************************************************************************/
+
+static int first_leading_one(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = UCHAR_MAX;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_leading_one_uc(uc);
+      ret2 = stdc_first_leading_one(uc);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      uc &= ~(1 << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(us);
+  us = USHRT_MAX;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_leading_one_us(us);
+      ret2 = stdc_first_leading_one(us);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      us &= ~(1 << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(ui);
+  ui = UINT_MAX;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_leading_one_ui(ui);
+      ret2 = stdc_first_leading_one(ui);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ui &= ~(1U << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(ul);
+  ul = ULONG_MAX;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_leading_one_ul(ul);
+      ret2 = stdc_first_leading_one(ul);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ul &= ~(1UL << (nbits - (i + 1)));
+    }
+
+  nbits = NBITS(ull);
+  ull = ULLONG_MAX;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_leading_one_ull(ull);
+      ret2 = stdc_first_leading_one(ull);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ull &= ~(1ULL << (nbits - (i + 1)));
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: first_trailing_zero
+ ****************************************************************************/
+
+static int first_trailing_zero(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_zero_uc(uc);
+      ret2 = stdc_first_trailing_zero(uc);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      uc |= (1 << i);
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_zero_us(us);
+      ret2 = stdc_first_trailing_zero(us);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      us |= (1 << i);
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_zero_ui(ui);
+      ret2 = stdc_first_trailing_zero(ui);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ui |= (1U << i);
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_zero_ul(ul);
+      ret2 = stdc_first_trailing_zero(ul);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ul |= (1UL << i);
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_zero_ull(ull);
+      ret2 = stdc_first_trailing_zero(ull);
+      if (ret != ((i + 1) % (nbits + 1)) || ret2 != ((i + 1) % (nbits + 1)))
+        {
+          return -1;
+        }
+
+      ull |= (1ULL << i);
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: first_trailing_one
+ ****************************************************************************/
+
+static int first_trailing_one(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_one_uc(uc);
+      ret2 = stdc_first_trailing_one(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc = (1 << i);
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_one_us(us);
+      ret2 = stdc_first_trailing_one(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us = (1 << i);
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_one_ui(ui);
+      ret2 = stdc_first_trailing_one(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui = (1U << i);
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_one_ul(ul);
+      ret2 = stdc_first_trailing_one(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul = (1UL << i);
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_first_trailing_one_ull(ull);
+      ret2 = stdc_first_trailing_one(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull = (1ULL << i);
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: count_zeros
+ ****************************************************************************/
+
+static int count_zeros(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = nbits; i >= 0; i--)
+    {
+      ret = stdc_count_zeros_uc(uc);
+      ret2 = stdc_count_zeros(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc |= (1 << (i - 1));
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = nbits; i >= 0; i--)
+    {
+      ret = stdc_count_zeros_us(us);
+      ret2 = stdc_count_zeros(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us |= (1 << (i - 1));
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = nbits; i >= 0; i--)
+    {
+      ret = stdc_count_zeros_ui(ui);
+      ret2 = stdc_count_zeros(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui |= (1U << (i - 1));
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = nbits; i >= 0; i--)
+    {
+      ret = stdc_count_zeros_ul(ul);
+      ret2 = stdc_count_zeros(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul |= (1UL << (i - 1));
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = nbits; i >= 0; i--)
+    {
+      ret = stdc_count_zeros_ull(ull);
+      ret2 = stdc_count_zeros(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull |= (1ULL << (i - 1));
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: count_ones
+ ****************************************************************************/
+
+static int count_ones(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_count_ones_uc(uc);
+      ret2 = stdc_count_ones(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc |= (1 << i);
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_count_ones_us(us);
+      ret2 = stdc_count_ones(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us |= (1 << i);
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_count_ones_ui(ui);
+      ret2 = stdc_count_ones(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui |= (1U << i);
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_count_ones_ul(ul);
+      ret2 = stdc_count_ones(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul |= (1UL << i);
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_count_ones_ull(ull);
+      ret2 = stdc_count_ones(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull |= (1ULL << i);
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: has_single_bit
+ ****************************************************************************/
+
+static int has_single_bit(void)
+{
+  int i;
+  int nbits;
+  bool ret;
+  bool ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = (1 << (nbits - 1));
+  for (i = 0; i < nbits; i++)
+    {
+      ret = stdc_has_single_bit_uc(uc);
+      ret2 = stdc_has_single_bit(uc);
+      if (!ret || !ret2)
+        {
+          return -1;
+        }
+
+      uc = uc >> 1;
+    }
+
+  nbits = NBITS(us);
+  us = (1 << (nbits - 1));
+  for (i = 0; i < nbits; i++)
+    {
+      ret = stdc_has_single_bit_us(us);
+      ret2 = stdc_has_single_bit(us);
+      if (!ret || !ret2)
+        {
+          return -1;
+        }
+
+      us = us >> 1;
+    }
+
+  nbits = NBITS(ui);
+  ui = (1U << (nbits - 1));
+  for (i = 0; i < nbits; i++)
+    {
+      ret = stdc_has_single_bit_ui(ui);
+      ret2 = stdc_has_single_bit(ui);
+      if (!ret || !ret2)
+        {
+          return -1;
+        }
+
+      ui = ui >> 1;
+    }
+
+  nbits = NBITS(ul);
+  ul = (1UL << (nbits - 1));
+  for (i = 0; i < nbits; i++)
+    {
+      ret = stdc_has_single_bit_ul(ul);
+      ret2 = stdc_has_single_bit(ul);
+      if (!ret || !ret2)
+        {
+          return -1;
+        }
+
+      ul = ul >> 1;
+    }
+
+  nbits = NBITS(ull);
+  ull = (1ULL << (nbits - 1));
+  for (i = 0; i < nbits; i++)
+    {
+      ret = stdc_has_single_bit_ull(ull);
+      ret2 = stdc_has_single_bit(ull);
+      if (!ret || !ret2)
+        {
+          return -1;
+        }
+
+      ull = ull >> 1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: bit_width
+ ****************************************************************************/
+
+static int bit_width(void)
+{
+  int i;
+  int nbits;
+  int ret;
+  int ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  nbits = NBITS(uc);
+  uc = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_bit_width_uc(uc);
+      ret2 = stdc_bit_width(uc);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      uc = 1 << i;
+    }
+
+  nbits = NBITS(us);
+  us = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_bit_width_us(us);
+      ret2 = stdc_bit_width(us);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      us = 1 << i;
+    }
+
+  nbits = NBITS(ui);
+  ui = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_bit_width_ui(ui);
+      ret2 = stdc_bit_width(ui);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ui = 1U << i;
+    }
+
+  nbits = NBITS(ul);
+  ul = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_bit_width_ul(ul);
+      ret2 = stdc_bit_width(ul);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ul = 1UL << i;
+    }
+
+  nbits = NBITS(ull);
+  ull = 0;
+  for (i = 0; i <= nbits; i++)
+    {
+      ret = stdc_bit_width_ull(ull);
+      ret2 = stdc_bit_width(ull);
+      if (ret != i || ret2 != i)
+        {
+          return -1;
+        }
+
+      ull = 1ULL << i;
+    }
+
+  return 0;
+}
+
+static int bit_floor(void)
+{
+  int nbits;
+  unsigned long long ret;
+  unsigned long long ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  uc = 5;
+  ret = stdc_bit_floor_uc(uc);
+  ret2 = stdc_bit_floor(uc);
+  if (ret != 4 || ret2 != 4)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(uc);
+  uc = (1 << (nbits - 1)) + 1;
+  ret = stdc_bit_floor_uc(uc);
+  ret2 = stdc_bit_floor(uc);
+  if (ret != uc - 1 || ret2 != uc - 1)
+    {
+      return -1;
+    }
+
+  us = 5;
+  ret = stdc_bit_floor_us(us);
+  ret2 = stdc_bit_floor(us);
+  if (ret != 4 || ret2 != 4)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(us);
+  us = (1 << (nbits - 1)) + 1;
+  ret = stdc_bit_floor_us(us);
+  ret2 = stdc_bit_floor(us);
+  if (ret != us - 1 || ret2 != us - 1)
+    {
+      return -1;
+    }
+
+  ui = 5;
+  ret = stdc_bit_floor_ui(ui);
+  ret2 = stdc_bit_floor(ui);
+  if (ret != 4 || ret2 != 4)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(uc);
+  ui = (1U << (nbits - 1)) + 1;
+  ret = stdc_bit_floor_ui(ui);
+  ret2 = stdc_bit_floor(ui);
+  if (ret != ui - 1 || ret2 != ui - 1)
+    {
+      return -1;
+    }
+
+  ul = 5;
+  ret = stdc_bit_floor_ul(ul);
+  ret2 = stdc_bit_floor(ul);
+  if (ret != 4 || ret2 != 4)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(ul);
+  ul = (1UL << (nbits - 1)) + 1;
+  ret = stdc_bit_floor_ul(ul);
+  ret2 = stdc_bit_floor(ul);
+  if (ret != ul - 1 || ret2 != ul - 1)
+    {
+      return -1;
+    }
+
+  ull = 5;
+  ret = stdc_bit_floor_ull(ull);
+  ret2 = stdc_bit_floor(ull);
+  if (ret != 4 || ret2 != 4)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(ull);
+  ull = (1ULL << (nbits - 1)) + 1;
+  ret = stdc_bit_floor_ull(ull);
+  ret2 = stdc_bit_floor(ull);
+  if (ret != ull - 1 || ret2 != ull - 1)
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+static int bit_ceil(void)
+{
+  int nbits;
+  unsigned long long ret;
+  unsigned long long ret2;
+  unsigned char uc;
+  unsigned short us;
+  unsigned int ui;
+  unsigned long int ul;
+  unsigned long long int ull;
+
+  uc = 5;
+  ret = stdc_bit_ceil_uc(uc);
+  ret2 = stdc_bit_ceil(uc);
+  if (ret != 8 || ret2 != 8)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(uc);
+  uc = (1 << (nbits - 1)) - 1;
+  ret = stdc_bit_ceil_uc(uc);
+  ret2 = stdc_bit_ceil(uc);
+  if (ret != uc + 1 || ret2 != uc + 1)
+    {
+      return -1;
+    }
+
+  us = 5;
+  ret = stdc_bit_ceil_us(us);
+  ret2 = stdc_bit_ceil(us);
+  if (ret != 8 || ret2 != 8)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(us);
+  us = (1 << (nbits - 1)) - 1;
+  ret = stdc_bit_ceil_us(us);
+  ret2 = stdc_bit_ceil(us);
+  if (ret != us + 1 || ret2 != us + 1)
+    {
+      return -1;
+    }
+
+  ui = 5;
+  ret = stdc_bit_ceil_ui(ui);
+  ret2 = stdc_bit_ceil(ui);
+  if (ret != 8 || ret2 != 8)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(uc);
+  ui = (1U << (nbits - 1)) - 1;
+  ret = stdc_bit_ceil_ui(ui);
+  ret2 = stdc_bit_ceil(ui);
+  if (ret != ui + 1 || ret2 != ui + 1)
+    {
+      return -1;
+    }
+
+  ul = 5;
+  ret = stdc_bit_ceil_ul(ul);
+  ret2 = stdc_bit_ceil(ul);
+  if (ret != 8 || ret2 != 8)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(ul);
+  ul = (1UL << (nbits - 1)) - 1;
+  ret = stdc_bit_ceil_ul(ul);
+  ret2 = stdc_bit_ceil(ul);
+  if (ret != ul + 1 || ret2 != ul + 1)
+    {
+      return -1;
+    }
+
+  ull = 5;
+  ret = stdc_bit_ceil_ull(ull);
+  ret2 = stdc_bit_ceil(ull);
+  if (ret != 8 || ret2 != 8)
+    {
+      return -1;
+    }
+
+  nbits = NBITS(ull);
+  ull = (1ULL << (nbits - 1)) - 1;
+  ret = stdc_bit_ceil_ull(ull);
+  ret2 = stdc_bit_ceil(ull);
+  if (ret != ull + 1 || ret2 != ull + 1)
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  const FAR struct test_entry_s *item = NULL;
+  int i;
+  int ret;
+  int tests_ok;
+  int tests_err;
+
+  tests_ok = tests_err = 0;
+
+  for (i = 0; i < sizeof(g_entry_list) / sizeof(g_entry_list[0]); i++)
+    {
+      item = &g_entry_list[i];
+      ret = item->entry();
+      if (ret < 0)
+        {
+          tests_err++;
+          printf("stdbit_tests: %s test failed.\n", item->name);
+        }
+      else
+        {
+          tests_ok++;
+        }
+    }
+
+  /* Run tests. They should return 0 on success, -1 otherwise. */
+
+  printf("stdbit tests: SUCCESSFUL: %d; FAILED: %d\n", tests_ok,
+          tests_err);
+
+  return 0;
+}

From fee2ddbf540ddd3639a30a2ed488b34fa10bf862 Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Tue, 23 Jun 2026 19:40:49 -0300
Subject: [PATCH 445/568] netutils/dropbear: add Dropbear SSH server port for
 NuttX

Integrated SSH daemon authenticating against FSUTILS_PASSWD, with an
ECDSA P-256 host key and an NSH session over a PTY per connection. Built
from the upstream Dropbear tarball (pinned commit) and patched for
NuttX, using Dropbear's bundled libtomcrypt for all crypto. setsid()
(apache/nuttx#19184) and link() now come from NuttX, not local stubs.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 fsutils/passwd/passwd_append.c                |   2 +-
 netutils/dropbear/.gitignore                  |   6 +
 netutils/dropbear/CMakeLists.txt              | 185 +++++
 netutils/dropbear/Kconfig                     | 120 ++++
 netutils/dropbear/Make.defs                   |  25 +
 netutils/dropbear/Makefile                    | 157 +++++
 netutils/dropbear/dropbear_main.c             | 329 +++++++++
 netutils/dropbear/dropbear_nshsession.c       | 633 ++++++++++++++++++
 .../0001-guard-platform-declarations.patch    |  26 +
 .../patch/0002-use-nuttx-passwd-auth.patch    |  87 +++
 ...loptions-to-override-tracking-malloc.patch |  24 +
 .../patch/0004-use-nuttx-unused-macro.patch   | 202 ++++++
 netutils/dropbear/port/config.h               |  20 +
 netutils/dropbear/port/dropbear_utils.c       | 149 +++++
 netutils/dropbear/port/dropbear_utils.h       |  31 +
 netutils/dropbear/port/localoptions.h         |  81 +++
 netutils/dropbear/port/nuttx_auth.c           | 109 +++
 netutils/dropbear/port/nuttx_config.h         | 142 ++++
 nshlib/CMakeLists.txt                         |   4 +
 nshlib/Kconfig                                |  22 +
 nshlib/Makefile                               |   4 +
 nshlib/nsh.h                                  |   4 +
 nshlib/nsh_dropbear.c                         |  76 +++
 nshlib/nsh_init.c                             |  12 +
 24 files changed, 2449 insertions(+), 1 deletion(-)
 create mode 100644 netutils/dropbear/.gitignore
 create mode 100644 netutils/dropbear/CMakeLists.txt
 create mode 100644 netutils/dropbear/Kconfig
 create mode 100644 netutils/dropbear/Make.defs
 create mode 100644 netutils/dropbear/Makefile
 create mode 100644 netutils/dropbear/dropbear_main.c
 create mode 100644 netutils/dropbear/dropbear_nshsession.c
 create mode 100644 netutils/dropbear/patch/0001-guard-platform-declarations.patch
 create mode 100644 netutils/dropbear/patch/0002-use-nuttx-passwd-auth.patch
 create mode 100644 netutils/dropbear/patch/0003-allow-localoptions-to-override-tracking-malloc.patch
 create mode 100644 netutils/dropbear/patch/0004-use-nuttx-unused-macro.patch
 create mode 100644 netutils/dropbear/port/config.h
 create mode 100644 netutils/dropbear/port/dropbear_utils.c
 create mode 100644 netutils/dropbear/port/dropbear_utils.h
 create mode 100644 netutils/dropbear/port/localoptions.h
 create mode 100644 netutils/dropbear/port/nuttx_auth.c
 create mode 100644 netutils/dropbear/port/nuttx_config.h
 create mode 100644 nshlib/nsh_dropbear.c

diff --git a/fsutils/passwd/passwd_append.c b/fsutils/passwd/passwd_append.c
index be77c9aed..125a4cfe6 100644
--- a/fsutils/passwd/passwd_append.c
+++ b/fsutils/passwd/passwd_append.c
@@ -69,7 +69,7 @@ int passwd_append(FAR const char *username, FAR const char *password)
     {
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
-      return errcode;
+      return -errcode;
     }
 
   /* The format of the password file is:
diff --git a/netutils/dropbear/.gitignore b/netutils/dropbear/.gitignore
new file mode 100644
index 000000000..1dc4834a1
--- /dev/null
+++ b/netutils/dropbear/.gitignore
@@ -0,0 +1,6 @@
+/dropbear
+/*.zip
+*.o
+.built
+.depend
+Make.dep
diff --git a/netutils/dropbear/CMakeLists.txt b/netutils/dropbear/CMakeLists.txt
new file mode 100644
index 000000000..c3187a32d
--- /dev/null
+++ b/netutils/dropbear/CMakeLists.txt
@@ -0,0 +1,185 @@
+# ##############################################################################
+# apps/netutils/dropbear/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_NETUTILS_DROPBEAR)
+
+  set(DROPBEAR_COMMIT "${CONFIG_NETUTILS_DROPBEAR_COMMIT}")
+  string(REPLACE "\"" "" DROPBEAR_COMMIT "${DROPBEAR_COMMIT}")
+
+  set(DROPBEAR_ZIP "${DROPBEAR_COMMIT}.zip")
+  set(DROPBEAR_URL "https://github.com/mkj/dropbear/archive")
+  set(DROPBEAR_UNPACKNAME "dropbear")
+
+  if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}")
+    if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_ZIP}")
+      message(STATUS "Downloading Dropbear: ${DROPBEAR_URL}/${DROPBEAR_ZIP}")
+      file(DOWNLOAD "${DROPBEAR_URL}/${DROPBEAR_ZIP}"
+           "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_ZIP}")
+    endif()
+    message(STATUS "Unpacking Dropbear: ${DROPBEAR_ZIP}")
+    execute_process(
+      COMMAND unzip -q -o "${DROPBEAR_ZIP}"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      RESULT_VARIABLE result)
+    if(result EQUAL 0)
+      file(RENAME "${CMAKE_CURRENT_SOURCE_DIR}/dropbear-${DROPBEAR_COMMIT}"
+           "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}")
+      execute_process(
+        COMMAND
+          patch -s -N -l -p1 -d "${DROPBEAR_UNPACKNAME}" -i
+          "${CMAKE_CURRENT_SOURCE_DIR}/patch/0001-guard-platform-declarations.patch"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+      execute_process(
+        COMMAND
+          patch -s -N -l -p1 -d "${DROPBEAR_UNPACKNAME}" -i
+          "${CMAKE_CURRENT_SOURCE_DIR}/patch/0002-use-nuttx-passwd-auth.patch"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+      execute_process(
+        COMMAND
+          patch -s -N -l -p1 -d "${DROPBEAR_UNPACKNAME}" -i
+          "${CMAKE_CURRENT_SOURCE_DIR}/patch/0003-allow-localoptions-to-override-tracking-malloc.patch"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+      execute_process(
+        COMMAND
+          patch -s -N -l -p1 -d "${DROPBEAR_UNPACKNAME}" -i
+          "${CMAKE_CURRENT_SOURCE_DIR}/patch/0004-use-nuttx-unused-macro.patch"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+      message(STATUS "Generating default_options_guard.h")
+      execute_process(
+        COMMAND
+          sh
+          "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}/src/ifndef_wrapper.sh"
+        INPUT_FILE
+          "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}/src/default_options.h"
+        OUTPUT_FILE
+          "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}/src/default_options_guard.h"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+    endif()
+  endif()
+
+  set(PROGNAME "${CONFIG_NETUTILS_DROPBEAR_PROGNAME}")
+  string(REPLACE "\"" "" PROGNAME "${PROGNAME}")
+
+  set(DROPBEAR_SRCS
+      dropbear_nshsession.c
+      port/nuttx_auth.c
+      port/dropbear_utils.c
+      dropbear/src/dbutil.c
+      dropbear/src/buffer.c
+      dropbear/src/dbhelpers.c
+      dropbear/src/bignum.c
+      dropbear/src/signkey.c
+      dropbear/src/dbrandom.c
+      dropbear/src/queue.c
+      dropbear/src/atomicio.c
+      dropbear/src/compat.c
+      dropbear/src/fake-rfc2553.c
+      dropbear/src/curve25519.c
+      dropbear/src/chachapoly.c
+      dropbear/src/ltc_prng.c
+      dropbear/src/ecc.c
+      dropbear/src/ecdsa.c
+      dropbear/src/crypto_desc.c
+      dropbear/src/dbmalloc.c
+      dropbear/src/gensignkey.c
+      dropbear/src/common-session.c
+      dropbear/src/packet.c
+      dropbear/src/common-algo.c
+      dropbear/src/common-kex.c
+      dropbear/src/common-channel.c
+      dropbear/src/common-chansession.c
+      dropbear/src/termcodes.c
+      dropbear/src/tcp-accept.c
+      dropbear/src/listener.c
+      dropbear/src/process-packet.c
+      dropbear/src/common-runopts.c
+      dropbear/src/circbuffer.c
+      dropbear/src/list.c
+      dropbear/src/netio.c
+      dropbear/src/gcm.c
+      dropbear/src/kex-x25519.c
+      dropbear/src/svr-kex.c
+      dropbear/src/svr-auth.c
+      dropbear/src/svr-authpasswd.c
+      dropbear/src/svr-session.c
+      dropbear/src/svr-service.c
+      dropbear/src/svr-runopts.c
+      dropbear/src/svr-tcpfwd.c
+      dropbear/src/svr-forward.c
+      dropbear/src/svr-streamfwd.c
+      dropbear/src/svr-authpam.c)
+
+  file(GLOB LIBTOMMATH_SRCS CONFIGURE_DEPENDS
+       "${CMAKE_CURRENT_SOURCE_DIR}/dropbear/libtommath/*.c")
+  list(APPEND DROPBEAR_SRCS ${LIBTOMMATH_SRCS})
+
+  file(GLOB_RECURSE LIBTOMCRYPT_SRCS CONFIGURE_DEPENDS
+       "${CMAKE_CURRENT_SOURCE_DIR}/dropbear/libtomcrypt/src/*.c")
+  list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/prngs/sober128tab\\.c$")
+  list(APPEND DROPBEAR_SRCS ${LIBTOMCRYPT_SRCS})
+
+  nuttx_add_application(
+    NAME
+    ${PROGNAME}
+    SRCS
+    ${DROPBEAR_SRCS}
+    dropbear_main.c
+    STACKSIZE
+    ${CONFIG_NETUTILS_DROPBEAR_STACKSIZE}
+    PRIORITY
+    ${CONFIG_NETUTILS_DROPBEAR_PRIORITY}
+    DEPENDS
+    ${DROPBEAR_UNPACKNAME})
+
+  target_include_directories(
+    ${PROGNAME}
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+            ${CMAKE_CURRENT_SOURCE_DIR}/port
+            ${CMAKE_CURRENT_SOURCE_DIR}/dropbear
+            ${CMAKE_CURRENT_SOURCE_DIR}/dropbear/src
+            ${CMAKE_CURRENT_SOURCE_DIR}/dropbear/libtomcrypt/src/headers
+            ${CMAKE_CURRENT_SOURCE_DIR}/dropbear/libtommath
+            ${CMAKE_CURRENT_SOURCE_DIR}/../../nshlib)
+
+  if(CONFIG_NETUTILS_DROPBEAR_COMPRESSION)
+    target_include_directories(
+      ${PROGNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../system/zlib/zlib)
+  endif()
+
+  target_compile_definitions(
+    ${PROGNAME} PRIVATE LOCALOPTIONS_H_EXISTS=1 DROPBEAR_NUTTX=1
+                        DROPBEAR_NUTTX_PASSWD=1)
+
+  set_source_files_properties(
+    dropbear_nshsession.c
+    PROPERTIES COMPILE_DEFINITIONS
+               "Channel=dropbear_channel;ChanType=dropbear_chantype")
+
+  # LTC_SOURCE must be set only for libtomcrypt sources.
+  set_source_files_properties(${LIBTOMCRYPT_SRCS} PROPERTIES COMPILE_DEFINITIONS
+                                                             LTC_SOURCE=1)
+
+  target_compile_options(${PROGNAME} PRIVATE -Wno-pointer-sign -Wno-format)
+
+  target_sources(apps PRIVATE ${DROPBEAR_SRCS})
+
+endif()
diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
new file mode 100644
index 000000000..507c85068
--- /dev/null
+++ b/netutils/dropbear/Kconfig
@@ -0,0 +1,120 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+menuconfig NETUTILS_DROPBEAR
+	tristate "Dropbear SSH server"
+	default n
+	depends on NET && NET_TCP
+	depends on !DISABLE_PSEUDOFS_OPERATIONS
+	depends on !DISABLE_PTHREAD
+	depends on SCHED_WAITPID
+	depends on NSH_LIBRARY
+	depends on FSUTILS_PASSWD
+	depends on PSEUDOTERM
+	depends on SERIAL
+	depends on ARCH_HAVE_RNG
+	depends on DEV_RANDOM
+	depends on DEV_URANDOM
+	depends on LIBC_NETDB
+	depends on LIBC_GAISTRERROR
+	select CRYPTO
+	select CRYPTO_RANDOM_POOL
+	---help---
+		Enable a minimal Dropbear SSH server port for NuttX.  This initial
+		port is based on the ESP-IDF MCU test port and provides a single
+		foreground SSH server process with SSH sessions backed by NSH.
+
+if NETUTILS_DROPBEAR
+
+config NETUTILS_DROPBEAR_STACKSIZE
+	int "Dropbear main stack size"
+	default 65536
+	---help---
+		Stack size for the Dropbear server built-in.
+		This is architecture-specific, so adjust it according to your setup.
+
+config NETUTILS_DROPBEAR_PRIORITY
+	int "Dropbear main priority"
+	default 100
+
+config NETUTILS_DROPBEAR_SHELL_PRIORITY
+	int "Dropbear NSH session priority"
+	default 100
+
+config NETUTILS_DROPBEAR_PROGNAME
+	string "Dropbear program name"
+	default "dropbear"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config NETUTILS_DROPBEAR_LISTEN_RETRIES
+	int "Dropbear listen retries"
+	default 0
+	---help---
+		Number of times to retry listen setup when no listen socket could
+		be opened.  Zero means to retry forever.
+
+config NETUTILS_DROPBEAR_LISTEN_RETRY_MAX
+	int "Dropbear maximum listen retry interval"
+	default 120
+	range 1 3600
+	---help---
+		Maximum number of seconds to wait between listen setup retries.
+		The retry delay starts at one second and doubles until it reaches
+		this value.
+
+config NETUTILS_DROPBEAR_SHELL_STACKSIZE
+	int "Dropbear NSH session task stack size"
+	default 8192
+
+config NETUTILS_DROPBEAR_PORT
+	int "Dropbear listen port"
+	default 2222
+
+config NETUTILS_DROPBEAR_HOSTKEY_PATH
+	string "Dropbear ECDSA P-256 host key path"
+	default "/etc/dropbear/dropbear_ecdsa_host_key"
+	---help---
+		Path to the persistent ECDSA P-256 host key used by the Dropbear
+		server.  The file is stored in Dropbear's native host key format.
+
+config NETUTILS_DROPBEAR_GENERATE_HOSTKEY
+	bool "Generate host key if missing"
+	default y
+	---help---
+		Pass -R so Dropbear generates an ECDSA P-256 host key on demand and
+		persists it at NETUTILS_DROPBEAR_HOSTKEY_PATH when it does not exist.
+		Product builds can disable this and provision the host key
+		externally (loaded with -r).
+
+config NETUTILS_DROPBEAR_COMPRESSION
+	bool "Enable SSH compression (zlib)"
+	default n
+	depends on LIB_ZLIB
+	---help---
+		Enable zlib compression for SSH sessions.  Requires the zlib
+		library (LIB_ZLIB).  When disabled, Dropbear is built with
+		DISABLE_ZLIB and negotiates no compression.
+
+		WARNING: each session allocates a zlib deflate state of about
+		256 KiB (DROPBEAR_ZLIB_WINDOW_BITS=15, DROPBEAR_ZLIB_MEM_LEVEL=8),
+		and the state is allocated even for the delayed zlib@openssh.com
+		method, right after key exchange.
+
+config NETUTILS_DROPBEAR_SYSLOG
+	bool "Log via syslog"
+	default n
+	---help---
+		Route Dropbear log messages through syslog().  When disabled,
+		Dropbear is built with DISABLE_SYSLOG.
+
+config NETUTILS_DROPBEAR_COMMIT
+	string "Dropbear upstream commit"
+	default "54ef47adf8c99b422be6a8f694f2866e62f88b9e"
+	---help---
+		Upstream Dropbear (mkj/dropbear) commit to download and build.
+
+endif
diff --git a/netutils/dropbear/Make.defs b/netutils/dropbear/Make.defs
new file mode 100644
index 000000000..9fcb635f7
--- /dev/null
+++ b/netutils/dropbear/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/netutils/dropbear/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_NETUTILS_DROPBEAR),)
+CONFIGURED_APPS += $(APPDIR)/netutils/dropbear
+endif
diff --git a/netutils/dropbear/Makefile b/netutils/dropbear/Makefile
new file mode 100644
index 000000000..039b0d0b3
--- /dev/null
+++ b/netutils/dropbear/Makefile
@@ -0,0 +1,157 @@
+############################################################################
+# apps/netutils/dropbear/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+ifneq ($(CONFIG_NETUTILS_DROPBEAR),)
+
+DROPBEAR_COMMIT = $(patsubst "%",%,$(strip $(CONFIG_NETUTILS_DROPBEAR_COMMIT)))
+DROPBEAR_ZIP = $(DROPBEAR_COMMIT).zip
+DROPBEAR_UNPACKNAME = dropbear
+DROPBEAR_URL = https://github.com/mkj/dropbear/archive
+UNPACK ?= unzip -q -o
+ifeq ($(CONFIG_HOST_MACOS),y)
+PATCH ?= gpatch
+else
+PATCH ?= patch
+endif
+
+MODULE = $(CONFIG_NETUTILS_DROPBEAR)
+PROGNAME = $(CONFIG_NETUTILS_DROPBEAR_PROGNAME)
+PRIORITY = $(CONFIG_NETUTILS_DROPBEAR_PRIORITY)
+STACKSIZE = $(CONFIG_NETUTILS_DROPBEAR_STACKSIZE)
+
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear"
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)port"
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)dropbear"
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)dropbear$(DELIM)src"
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)dropbear$(DELIM)libtomcrypt$(DELIM)src$(DELIM)headers"
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)dropbear$(DELIM)libtommath"
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)nshlib"
+
+ifneq ($(CONFIG_NETUTILS_DROPBEAR_COMPRESSION),)
+CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)system$(DELIM)zlib$(DELIM)zlib"
+endif
+
+CFLAGS += ${DEFINE_PREFIX}LOCALOPTIONS_H_EXISTS=1
+CFLAGS += ${DEFINE_PREFIX}DROPBEAR_NUTTX=1
+CFLAGS += ${DEFINE_PREFIX}DROPBEAR_NUTTX_PASSWD=1
+CFLAGS += -Wno-pointer-sign -Wno-format
+
+dropbear_nshsession.c_CFLAGS += ${DEFINE_PREFIX}Channel=dropbear_channel
+dropbear_nshsession.c_CFLAGS += ${DEFINE_PREFIX}ChanType=dropbear_chantype
+
+CSRCS = dropbear_nshsession.c
+CSRCS += port/nuttx_auth.c
+CSRCS += port/dropbear_utils.c
+
+CSRCS += \
+	dropbear/src/dbutil.c \
+	dropbear/src/buffer.c \
+	dropbear/src/dbhelpers.c \
+	dropbear/src/bignum.c \
+	dropbear/src/signkey.c \
+	dropbear/src/dbrandom.c \
+	dropbear/src/queue.c \
+	dropbear/src/atomicio.c \
+	dropbear/src/compat.c \
+	dropbear/src/fake-rfc2553.c \
+	dropbear/src/curve25519.c \
+	dropbear/src/chachapoly.c \
+	dropbear/src/ltc_prng.c \
+	dropbear/src/ecc.c \
+	dropbear/src/ecdsa.c \
+	dropbear/src/crypto_desc.c \
+	dropbear/src/dbmalloc.c \
+	dropbear/src/gensignkey.c \
+	dropbear/src/common-session.c \
+	dropbear/src/packet.c \
+	dropbear/src/common-algo.c \
+	dropbear/src/common-kex.c \
+	dropbear/src/common-channel.c \
+	dropbear/src/common-chansession.c \
+	dropbear/src/termcodes.c \
+	dropbear/src/tcp-accept.c \
+	dropbear/src/listener.c \
+	dropbear/src/process-packet.c \
+	dropbear/src/common-runopts.c \
+	dropbear/src/circbuffer.c \
+	dropbear/src/list.c \
+	dropbear/src/netio.c \
+	dropbear/src/gcm.c \
+	dropbear/src/kex-x25519.c \
+	dropbear/src/svr-kex.c \
+	dropbear/src/svr-auth.c \
+	dropbear/src/svr-authpasswd.c \
+	dropbear/src/svr-session.c \
+	dropbear/src/svr-service.c \
+	dropbear/src/svr-runopts.c \
+	dropbear/src/svr-tcpfwd.c \
+	dropbear/src/svr-forward.c \
+	dropbear/src/svr-streamfwd.c \
+	dropbear/src/svr-authpam.c
+
+TOMMATH_SRCS = $(shell if [ -d "$(DROPBEAR_UNPACKNAME)/libtommath" ]; then find "$(DROPBEAR_UNPACKNAME)/libtommath" -name "*.c"; fi)
+TOMCRYPT_SRCS = $(shell if [ -d "$(DROPBEAR_UNPACKNAME)/libtomcrypt/src" ]; then find "$(DROPBEAR_UNPACKNAME)/libtomcrypt/src" -name "*.c" ! -name "sober128tab.c"; fi)
+
+CSRCS += $(TOMMATH_SRCS)
+CSRCS += $(TOMCRYPT_SRCS)
+
+# Match the ESP-IDF port behavior: LTC_SOURCE is only for libtomcrypt sources.
+$(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}LTC_SOURCE=1))
+
+MAINSRC = dropbear_main.c
+
+$(DROPBEAR_ZIP):
+	@echo "Downloading: $(DROPBEAR_ZIP)"
+	$(Q) curl -L -o $(DROPBEAR_ZIP) $(DROPBEAR_URL)/$(DROPBEAR_ZIP)
+
+$(DROPBEAR_UNPACKNAME): $(DROPBEAR_ZIP)
+	@echo "Unpacking: $(DROPBEAR_ZIP) -> $(DROPBEAR_UNPACKNAME)"
+	$(Q) $(UNPACK) $(DROPBEAR_ZIP)
+	$(Q) rm -rf $(DROPBEAR_UNPACKNAME)
+	$(Q) mv dropbear-$(DROPBEAR_COMMIT) $(DROPBEAR_UNPACKNAME)
+	@echo "Patching $(DROPBEAR_UNPACKNAME)"
+	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0001-guard-platform-declarations.patch; true
+	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0002-use-nuttx-passwd-auth.patch; true
+	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0003-allow-localoptions-to-override-tracking-malloc.patch; true
+	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0004-use-nuttx-unused-macro.patch; true
+	@echo "Generating default_options_guard.h"
+	$(Q) sh $(DROPBEAR_UNPACKNAME)$(DELIM)src$(DELIM)ifndef_wrapper.sh \
+		< $(DROPBEAR_UNPACKNAME)$(DELIM)src$(DELIM)default_options.h \
+		> $(DROPBEAR_UNPACKNAME)$(DELIM)src$(DELIM)default_options_guard.h
+	$(Q) touch $(DROPBEAR_UNPACKNAME)
+
+ifeq ($(wildcard $(DROPBEAR_UNPACKNAME)/.git),)
+context:: $(DROPBEAR_UNPACKNAME)
+
+clean::
+	$(call DELFILE, port$(DELIM)*.o)
+
+distclean::
+	$(call DELDIR, $(DROPBEAR_UNPACKNAME))
+	$(call DELFILE, $(DROPBEAR_ZIP))
+endif
+
+endif
+
+include $(APPDIR)/Application.mk
diff --git a/netutils/dropbear/dropbear_main.c b/netutils/dropbear/dropbear_main.c
new file mode 100644
index 000000000..798ba2b55
--- /dev/null
+++ b/netutils/dropbear/dropbear_main.c
@@ -0,0 +1,329 @@
+/****************************************************************************
+ * apps/netutils/dropbear/dropbear_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/socket.h>
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "includes.h"
+#include "algo.h"
+#include "crypto_desc.h"
+#define dropbear_main dropbear_multi_entry
+#include "dbutil.h"
+#undef dropbear_main
+#include "dbrandom.h"
+#include "netio.h"
+#include "runopts.h"
+#include "session.h"
+#include "signkey.h"
+#include "gensignkey.h"
+#include "ssh.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DROPBEAR_PORT_STRING_HELPER(n) #n
+#define DROPBEAR_PORT_STRING(n) DROPBEAR_PORT_STRING_HELPER(n)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef void (*dropbear_exit_handler_t)(int exitcode, FAR const char *format,
+                                        va_list param) ATTRIB_NORETURN;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static jmp_buf g_session_exit_jmp;
+static int g_session_exitcode;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void dropbear_session_exit(int exitcode, FAR const char *format,
+                                  va_list param) noreturn_function;
+static void dropbear_session_exit(int exitcode, FAR const char *format,
+                                  va_list param)
+{
+  char exitmsg[150];
+  char fullmsg[300];
+  char fromaddr[60];
+  int signal_pipe[2];
+
+  vsnprintf(exitmsg, sizeof(exitmsg), format, param);
+
+  fromaddr[0] = '\0';
+
+  if (svr_ses.addrstring != NULL)
+    {
+      snprintf(fromaddr, sizeof(fromaddr), " from <%s>", svr_ses.addrstring);
+    }
+
+  if (!ses.init_done)
+    {
+      snprintf(fullmsg, sizeof(fullmsg), "Early exit%s: %s", fromaddr,
+               exitmsg);
+    }
+  else if (ses.authstate.authdone)
+    {
+      snprintf(fullmsg, sizeof(fullmsg), "Exit (%s)%s: %s",
+               ses.authstate.pw_name, fromaddr, exitmsg);
+    }
+  else if (ses.authstate.pw_name != NULL)
+    {
+      snprintf(fullmsg, sizeof(fullmsg),
+               "Exit before auth%s: (user '%s', %u fails): %s",
+               fromaddr, ses.authstate.pw_name, ses.authstate.failcount,
+               exitmsg);
+    }
+  else
+    {
+      snprintf(fullmsg, sizeof(fullmsg), "Exit before auth%s: %s", fromaddr,
+               exitmsg);
+    }
+
+  dropbear_log(LOG_INFO, "%s", fullmsg);
+
+  signal_pipe[0] = ses.signal_pipe[0];
+  signal_pipe[1] = ses.signal_pipe[1];
+  session_cleanup();
+
+  if (signal_pipe[0] > STDERR_FILENO)
+    {
+      m_close(signal_pipe[0]);
+    }
+
+  if (signal_pipe[1] > STDERR_FILENO && signal_pipe[1] != signal_pipe[0])
+    {
+      m_close(signal_pipe[1]);
+    }
+
+  memset(&ses, 0, sizeof(ses));
+  memset(&svr_ses, 0, sizeof(svr_ses));
+
+  g_session_exitcode = exitcode;
+  longjmp(g_session_exit_jmp, 1);
+
+  while (1)
+    {
+    }
+}
+
+static void dropbear_setup(FAR const char *port)
+{
+  /* Load the host key with -r so it lives in the persistent (epoch 0)
+   * allocation rather than being created lazily inside a per-session malloc
+   * epoch (-R), which would free it when the first session ends and leave a
+   * dangling svr_opts.hostkey for the next connection.
+   */
+
+  FAR char *argv[] =
+  {
+    "dropbear",
+    "-F",
+    "-p",
+    (FAR char *)port,
+    "-r",
+    CONFIG_NETUTILS_DROPBEAR_HOSTKEY_PATH,
+    NULL
+  };
+
+  _dropbear_exit = svr_dropbear_exit;
+  _dropbear_log = svr_dropbear_log;
+
+  disallow_core();
+  svr_getopts(6, argv);
+  seedrandom();
+  crypto_init();
+
+#ifdef CONFIG_NETUTILS_DROPBEAR_GENERATE_HOSTKEY
+  /* Generate the ECDSA host key now if it is missing.  signkey_generate()
+   * with skip_exist=1 silently succeeds when the file already exists.
+   */
+
+  if (signkey_generate(DROPBEAR_SIGNKEY_ECDSA_NISTP256, 0,
+                       CONFIG_NETUTILS_DROPBEAR_HOSTKEY_PATH, 1)
+      == DROPBEAR_FAILURE)
+    {
+      dropbear_exit("failed to generate host key");
+    }
+#endif
+
+  load_all_hostkeys();
+
+  if (dropbear_auth_initialize() < 0)
+    {
+      dropbear_exit("failed to initialize password auth");
+    }
+}
+
+static void dropbear_run_session(int childsock)
+{
+  dropbear_exit_handler_t saved_exit;
+
+  saved_exit = _dropbear_exit;
+  _dropbear_exit = dropbear_session_exit;
+
+  m_malloc_set_epoch(1);
+
+  if (setjmp(g_session_exit_jmp) == 0)
+    {
+      svr_session(childsock, -1);
+    }
+
+  m_malloc_free_epoch(1, 1);
+  m_malloc_set_epoch(0);
+
+  _dropbear_exit = saved_exit;
+
+  if (g_session_exitcode != EXIT_SUCCESS)
+    {
+      dropbear_log(LOG_WARNING, "session exited with status %d",
+                   g_session_exitcode);
+    }
+}
+
+static size_t dropbear_listen_sockets(FAR int *socks, size_t sockcount,
+                                      FAR int *maxfd)
+{
+  FAR char *errstring = NULL;
+  size_t sockpos = 0;
+  unsigned int i;
+
+  for (i = 0; i < svr_opts.portcount; i++)
+    {
+      int nsock;
+      unsigned int n;
+
+      nsock = dropbear_listen(svr_opts.addresses[i], svr_opts.ports[i],
+                              &socks[sockpos], sockcount - sockpos,
+                              &errstring, maxfd, svr_opts.interface);
+
+      if (nsock < 0)
+        {
+          dropbear_log(LOG_WARNING, "failed listening on '%s': %s",
+                       svr_opts.ports[i],
+                       errstring != NULL ? errstring : "unknown error");
+          m_free(errstring);
+          errstring = NULL;
+          continue;
+        }
+
+      for (n = 0; n < (unsigned int)nsock; n++)
+        {
+          set_sock_priority(socks[sockpos + n], DROPBEAR_PRIO_LOWDELAY);
+        }
+
+      sockpos += (size_t)nsock;
+    }
+
+  return sockpos;
+}
+
+static size_t dropbear_wait_listen_sockets(FAR int *socks, size_t sockcount,
+                                           FAR int *maxfd)
+{
+  int retries = 0;
+  int retry_delay = 1;
+
+  while (1)
+    {
+      size_t count;
+
+      *maxfd = -1;
+      count = dropbear_listen_sockets(socks, sockcount, maxfd);
+
+      if (count > 0)
+        {
+          return count;
+        }
+
+#if CONFIG_NETUTILS_DROPBEAR_LISTEN_RETRIES > 0
+      if (retries++ >= CONFIG_NETUTILS_DROPBEAR_LISTEN_RETRIES)
+        {
+          dropbear_exit("no listening ports available");
+        }
+#else
+      retries++;
+#endif
+
+      dropbear_log(LOG_WARNING, "Retry %d in %d seconds...", retries,
+                   retry_delay);
+      sleep(retry_delay);
+
+      retry_delay *= 2;
+
+      if (retry_delay > CONFIG_NETUTILS_DROPBEAR_LISTEN_RETRY_MAX)
+        {
+          retry_delay = CONFIG_NETUTILS_DROPBEAR_LISTEN_RETRY_MAX;
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR const char *port = DROPBEAR_PORT_STRING(CONFIG_NETUTILS_DROPBEAR_PORT);
+  int listensocks[MAX_LISTEN_ADDR];
+  int maxfd = -1;
+
+  if (argc > 1)
+    {
+      port = argv[1];
+    }
+
+  dropbear_setup(port);
+
+  dropbear_wait_listen_sockets(listensocks, MAX_LISTEN_ADDR, &maxfd);
+
+  printf("dropbear: listening on port %s\n", port);
+
+  while (1)
+    {
+      struct sockaddr_storage remoteaddr;
+      socklen_t remoteaddrlen = sizeof(remoteaddr);
+      FAR char *remote_host = NULL;
+      FAR char *remote_port = NULL;
+      int childsock;
+
+      childsock = accept(listensocks[0], (FAR struct sockaddr *)&remoteaddr,
+                         &remoteaddrlen);
+
+      if (childsock < 0)
+        {
+          continue;
+        }
+
+      getaddrstring(&remoteaddr, &remote_host, &remote_port, 0);
+      dropbear_log(LOG_INFO, "connection from %s:%s",
+                   remote_host != NULL ? remote_host : "?",
+                   remote_port != NULL ? remote_port : "?");
+      m_free(remote_host);
+      m_free(remote_port);
+
+      seedrandom();
+      dropbear_run_session(childsock);
+      close(childsock);
+    }
+
+  return EXIT_SUCCESS;
+}
diff --git a/netutils/dropbear/dropbear_nshsession.c b/netutils/dropbear/dropbear_nshsession.c
new file mode 100644
index 000000000..3b2e6cdbd
--- /dev/null
+++ b/netutils/dropbear/dropbear_nshsession.c
@@ -0,0 +1,633 @@
+/****************************************************************************
+ * apps/netutils/dropbear/dropbear_nshsession.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "includes.h"
+#include "channel.h"
+#include "chansession.h"
+#include "dbutil.h"
+#include "session.h"
+
+#include "nsh.h"
+#include "nsh_console.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <pty.h>
+#include <pthread.h>
+#include <sched.h>
+#include <signal.h>
+#include <spawn.h>
+#include <stdbool.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/wait.h>
+#include <termios.h>
+#include <unistd.h>
+
+struct dropbear_nshsession_s
+{
+  int pty_readfd;
+  int pty_writefd;
+  pid_t nsh_pid;
+  volatile bool done;
+  pthread_t waiter;
+  bool waiter_started;
+  bool have_winsize;
+  struct winsize win;
+};
+
+struct dropbear_signal_name_s
+{
+  FAR const char *name;
+  int signo;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct dropbear_signal_name_s g_dropbear_signals[] =
+{
+  { "ABRT", SIGABRT },
+  { "ALRM", SIGALRM },
+  { "FPE",  SIGFPE },
+  { "HUP",  SIGHUP },
+  { "ILL",  SIGILL },
+  { "INT",  SIGINT },
+  { "KILL", SIGKILL },
+  { "PIPE", SIGPIPE },
+  { "QUIT", SIGQUIT },
+  { "SEGV", SIGSEGV },
+  { "TERM", SIGTERM },
+  { "USR1", SIGUSR1 },
+  { "USR2", SIGUSR2 },
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int dropbear_nsh_main(int argc, FAR char *argv[])
+{
+  FAR struct console_stdio_s *pstate;
+  FAR char *nsh_argv[] =
+  {
+    "nsh",
+    NULL
+  };
+
+  int ret;
+
+  (void)argc;
+  (void)argv;
+
+  pstate = nsh_newconsole(true);
+  if (pstate == NULL)
+    {
+      dropbear_log(LOG_WARNING, "failed to create NSH console");
+      return -ENOMEM;
+    }
+
+  ret = nsh_session(pstate, NSH_LOGIN_NONE, 1, nsh_argv);
+  dropbear_log(LOG_INFO, "NSH session exited: %d", ret);
+
+  nsh_exit(&pstate->cn_vtbl, ret);
+  return ret;
+}
+
+static FAR void *dropbear_nsh_waiter(FAR void *arg)
+{
+  FAR struct dropbear_nshsession_s *sess = arg;
+  unsigned char ch = 0;
+  int status;
+  int ret;
+
+  ret = waitpid(sess->nsh_pid, &status, 0);
+  if (ret < 0)
+    {
+      dropbear_log(LOG_WARNING, "NSH session wait failed: %s",
+                   strerror(errno));
+    }
+
+  sess->nsh_pid = -1;
+  sess->done = true;
+
+  /* Match Dropbear's SIGCHLD wakeup path.  The session loop checks channel
+   * close conditions when this pipe becomes readable.
+   */
+
+  if (ses.signal_pipe[1] >= 0)
+    {
+      write(ses.signal_pipe[1], &ch, sizeof(ch));
+    }
+
+  return NULL;
+}
+
+static int dropbear_newchansess(FAR struct dropbear_channel *channel)
+{
+  FAR struct dropbear_nshsession_s *sess;
+
+  sess = m_malloc(sizeof(*sess));
+  memset(sess, 0, sizeof(*sess));
+  sess->pty_readfd = -1;
+  sess->pty_writefd = -1;
+  sess->nsh_pid = -1;
+
+  channel->typedata = sess;
+  channel->prio = DROPBEAR_PRIO_LOWDELAY;
+  return 0;
+}
+
+static int dropbear_sesscheckclose(FAR struct dropbear_channel *channel)
+{
+  FAR struct dropbear_nshsession_s *sess = channel->typedata;
+
+  return sess != NULL && sess->done;
+}
+
+static int dropbear_setup_spawn_attrs(FAR posix_spawnattr_t *attr,
+                                      FAR const char **errmsg)
+{
+  struct sched_param param;
+  int rc;
+
+  param.sched_priority = CONFIG_NETUTILS_DROPBEAR_SHELL_PRIORITY;
+  *errmsg = "spawn priority setup";
+  rc = posix_spawnattr_setschedparam(attr, &param);
+  if (rc != 0)
+    {
+      return rc;
+    }
+
+  *errmsg = "spawn stack setup";
+  rc = posix_spawnattr_setstacksize(
+         attr, CONFIG_NETUTILS_DROPBEAR_SHELL_STACKSIZE);
+  if (rc != 0)
+    {
+      return rc;
+    }
+
+  *errmsg = "spawn flags setup";
+  return posix_spawnattr_setflags(attr, POSIX_SPAWN_SETSCHEDPARAM);
+}
+
+static int
+dropbear_setup_spawn_stdio(FAR posix_spawn_file_actions_t *actions,
+                           int slavefd)
+{
+  static const int stdio_fds[] =
+  {
+    STDIN_FILENO,
+    STDOUT_FILENO,
+    STDERR_FILENO
+  };
+
+  int i;
+  int rc;
+
+  for (i = 0; i < nitems(stdio_fds); i++)
+    {
+      rc = posix_spawn_file_actions_adddup2(actions, slavefd, stdio_fds[i]);
+      if (rc != 0)
+        {
+          return rc;
+        }
+    }
+
+  return 0;
+}
+
+static int
+dropbear_setup_spawn_close(FAR posix_spawn_file_actions_t *actions,
+                           int fd)
+{
+  if (fd <= STDERR_FILENO)
+    {
+      return 0;
+    }
+
+  return posix_spawn_file_actions_addclose(actions, fd);
+}
+
+static int dropbear_start_nsh(FAR struct dropbear_channel *channel,
+                              FAR struct dropbear_nshsession_s *sess)
+{
+  posix_spawn_file_actions_t actions;
+  posix_spawnattr_t attr;
+  FAR const char *errmsg;
+  FAR char * const argv[] =
+  {
+    "nsh",
+    NULL
+  };
+
+  int masterfd;
+  int slavefd;
+  int writefd;
+  int rc;
+
+  if (sess->nsh_pid >= 0)
+    {
+      dropbear_log(LOG_WARNING, "NSH session already running");
+      return DROPBEAR_FAILURE;
+    }
+
+  rc = openpty(&masterfd, &slavefd, NULL, NULL,
+               sess->have_winsize ? &sess->win : NULL);
+  if (rc < 0)
+    {
+      dropbear_log(LOG_WARNING, "openpty failed: %s", strerror(errno));
+      return DROPBEAR_FAILURE;
+    }
+
+  writefd = dup(masterfd);
+  if (writefd < 0)
+    {
+      dropbear_log(LOG_WARNING, "pty dup failed: %s", strerror(errno));
+      close(masterfd);
+      close(slavefd);
+      return DROPBEAR_FAILURE;
+    }
+
+  rc = posix_spawn_file_actions_init(&actions);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn actions init failed: %s",
+                   strerror(rc));
+      close(masterfd);
+      close(writefd);
+      close(slavefd);
+      return DROPBEAR_FAILURE;
+    }
+
+  rc = posix_spawnattr_init(&attr);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn attr init failed: %s", strerror(rc));
+      goto err_with_actions;
+    }
+
+  rc = dropbear_setup_spawn_attrs(&attr, &errmsg);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "%s failed: %s", errmsg, strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_stdio(&actions, slavefd);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stdio setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, masterfd);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn master close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, writefd);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn write close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, slavefd);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn slave close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  sess->nsh_pid = task_spawn("dropbear nsh", dropbear_nsh_main, &actions,
+                             &attr, argv, NULL);
+  if (sess->nsh_pid < 0)
+    {
+      dropbear_log(LOG_WARNING, "failed to create NSH task: %s",
+                   strerror(-sess->nsh_pid));
+      goto err_with_attr;
+    }
+
+  close(slavefd);
+  slavefd = -1;
+
+  rc = pthread_create(&sess->waiter, NULL, dropbear_nsh_waiter, sess);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "failed to create NSH waiter: %s",
+                   strerror(rc));
+      close(masterfd);
+      close(writefd);
+      masterfd = -1;
+      writefd = -1;
+      kill(sess->nsh_pid, SIGTERM);
+      waitpid(sess->nsh_pid, NULL, 0);
+      sess->nsh_pid = -1;
+      goto err_with_attr;
+    }
+
+  sess->waiter_started = true;
+  sess->pty_readfd = masterfd;
+  sess->pty_writefd = writefd;
+
+  channel->readfd = masterfd;
+  channel->writefd = writefd;
+  channel->bidir_fd = 0;
+
+  setnonblocking(channel->readfd);
+  setnonblocking(channel->writefd);
+  ses.maxfd = MAX(ses.maxfd, channel->readfd);
+  ses.maxfd = MAX(ses.maxfd, channel->writefd);
+
+  posix_spawnattr_destroy(&attr);
+  posix_spawn_file_actions_destroy(&actions);
+
+  dropbear_log(LOG_INFO, "NSH PTY session started");
+  return DROPBEAR_SUCCESS;
+
+err_with_attr:
+  posix_spawnattr_destroy(&attr);
+
+err_with_actions:
+  posix_spawn_file_actions_destroy(&actions);
+
+  if (masterfd >= 0)
+    {
+      close(masterfd);
+    }
+
+  if (writefd >= 0)
+    {
+      close(writefd);
+    }
+
+  if (slavefd >= 0)
+    {
+      close(slavefd);
+    }
+
+  sess->nsh_pid = -1;
+  return DROPBEAR_FAILURE;
+}
+
+static void dropbear_parse_winsize(FAR struct dropbear_nshsession_s *sess)
+{
+  unsigned int cols = buf_getint(ses.payload);
+  unsigned int rows = buf_getint(ses.payload);
+  unsigned int width = buf_getint(ses.payload);
+  unsigned int height = buf_getint(ses.payload);
+
+  sess->win.ws_col = cols;
+  sess->win.ws_row = rows;
+  sess->win.ws_xpixel = width;
+  sess->win.ws_ypixel = height;
+  sess->have_winsize = true;
+
+  if (sess->pty_readfd >= 0)
+    {
+      ioctl(sess->pty_readfd, TIOCSWINSZ, (unsigned long)&sess->win);
+    }
+}
+
+static int dropbear_handle_pty_req(FAR struct dropbear_nshsession_s *sess)
+{
+  unsigned int len;
+  FAR char *term;
+  FAR char *modes;
+
+  term = buf_getstring(ses.payload, &len);
+  dropbear_parse_winsize(sess);
+  modes = buf_getstring(ses.payload, &len);
+
+  m_free(term);
+  m_free(modes);
+  return DROPBEAR_SUCCESS;
+}
+
+static int dropbear_signal_from_name(FAR const char *name)
+{
+  int i;
+
+  for (i = 0; i < nitems(g_dropbear_signals); i++)
+    {
+      if (strcmp(name, g_dropbear_signals[i].name) == 0)
+        {
+          return g_dropbear_signals[i].signo;
+        }
+    }
+
+  return -EINVAL;
+}
+
+static int dropbear_write_terminal_signal(
+                            FAR struct dropbear_nshsession_s *sess,
+                            int signo)
+{
+#ifdef CONFIG_TTY_SIGINT
+  unsigned char ch;
+  ssize_t nwritten;
+
+  if (signo == SIGINT && sess->pty_writefd >= 0)
+    {
+      ch = CONFIG_TTY_SIGINT_CHAR;
+      nwritten = write(sess->pty_writefd, &ch, sizeof(ch));
+      if (nwritten == sizeof(ch))
+        {
+          return DROPBEAR_SUCCESS;
+        }
+
+      dropbear_log(LOG_WARNING, "SSH terminal INT failed: %s",
+                   strerror(errno));
+      return DROPBEAR_FAILURE;
+    }
+#endif
+
+  return DROPBEAR_FAILURE;
+}
+
+static int dropbear_handle_signal(FAR struct dropbear_nshsession_s *sess)
+{
+  unsigned int len;
+  FAR char *name;
+  int signo;
+  int ret;
+
+  name = buf_getstring(ses.payload, &len);
+  signo = dropbear_signal_from_name(name);
+  if (signo < 0)
+    {
+      dropbear_log(LOG_WARNING, "unsupported SSH signal '%s'", name);
+      m_free(name);
+      return DROPBEAR_FAILURE;
+    }
+
+  ret = dropbear_write_terminal_signal(sess, signo);
+  if (ret == DROPBEAR_SUCCESS)
+    {
+      dropbear_log(LOG_INFO, "SSH signal '%s' sent to PTY", name);
+      m_free(name);
+      return DROPBEAR_SUCCESS;
+    }
+
+  if (sess->nsh_pid <= 0)
+    {
+      dropbear_log(LOG_WARNING, "SSH signal '%s' has no NSH session", name);
+      m_free(name);
+      return DROPBEAR_FAILURE;
+    }
+
+  ret = kill(sess->nsh_pid, signo);
+  if (ret < 0)
+    {
+      dropbear_log(LOG_WARNING, "SSH signal '%s' failed: %s",
+                   name, strerror(errno));
+      m_free(name);
+      return DROPBEAR_FAILURE;
+    }
+
+  dropbear_log(LOG_INFO, "SSH signal '%s' sent to NSH session", name);
+  m_free(name);
+  return DROPBEAR_SUCCESS;
+}
+
+static void dropbear_chansessionrequest(FAR struct dropbear_channel *channel)
+{
+  unsigned int typelen;
+  FAR char *type = buf_getstring(ses.payload, &typelen);
+  unsigned char wantreply = buf_getbool(ses.payload);
+  FAR struct dropbear_nshsession_s *sess = channel->typedata;
+  int ret = DROPBEAR_FAILURE;
+
+  TRACE(("dropbear_chansessionrequest: type='%s'", type))
+
+  if (strcmp(type, "pty-req") == 0)
+    {
+      ret = dropbear_handle_pty_req(sess);
+    }
+  else if (strcmp(type, "shell") == 0)
+    {
+      ret = dropbear_start_nsh(channel, sess);
+    }
+  else if (strcmp(type, "exec") == 0)
+    {
+      dropbear_log(LOG_WARNING, "SSH exec requests are not supported");
+    }
+  else if (strcmp(type, "window-change") == 0)
+    {
+      dropbear_parse_winsize(sess);
+      ret = DROPBEAR_SUCCESS;
+    }
+  else if (strcmp(type, "signal") == 0)
+    {
+      ret = dropbear_handle_signal(sess);
+    }
+  else if (strcmp(type, "break") == 0)
+    {
+      ret = DROPBEAR_SUCCESS;
+    }
+  else
+    {
+      TRACE(("dropbear_chansessionrequest: unhandled type '%s'", type))
+    }
+
+  if (wantreply)
+    {
+      if (ret == DROPBEAR_SUCCESS)
+        {
+          send_msg_channel_success(channel);
+        }
+      else
+        {
+          send_msg_channel_failure(channel);
+        }
+    }
+
+  m_free(type);
+}
+
+static void
+dropbear_closechansess(FAR const struct dropbear_channel *channel)
+{
+  FAR struct dropbear_nshsession_s *sess = channel->typedata;
+
+  if (sess != NULL)
+    {
+      sess->done = true;
+    }
+}
+
+static void
+dropbear_cleanupchansess(FAR const struct dropbear_channel *channel)
+{
+  FAR struct dropbear_nshsession_s *sess = channel->typedata;
+
+  if (sess == NULL)
+    {
+      return;
+    }
+
+  sess->done = true;
+
+  if (sess->nsh_pid > 0)
+    {
+      kill(sess->nsh_pid, SIGTERM);
+    }
+
+  if (sess->waiter_started)
+    {
+      pthread_join(sess->waiter, NULL);
+      sess->waiter_started = false;
+    }
+
+  m_free(sess);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Chansession lifecycle hooks invoked from svr-session.c.  Upstream
+ * svr-chansession.c uses these to set up and reap the global childpids[] /
+ * SIGCHLD machinery; the NSH bridge tracks each session's child through its
+ * own waiter thread (dropbear_nsh_waiter), so both are no-ops here.
+ */
+
+void svr_chansessinitialise(void)
+{
+}
+
+void svr_chansess_checksignal(void)
+{
+}
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct dropbear_chantype svrchansess =
+{
+  "session",
+  dropbear_newchansess,
+  dropbear_sesscheckclose,
+  dropbear_chansessionrequest,
+  dropbear_closechansess,
+  dropbear_cleanupchansess,
+};
diff --git a/netutils/dropbear/patch/0001-guard-platform-declarations.patch b/netutils/dropbear/patch/0001-guard-platform-declarations.patch
new file mode 100644
index 000000000..7eb1dfcd2
--- /dev/null
+++ b/netutils/dropbear/patch/0001-guard-platform-declarations.patch
@@ -0,0 +1,26 @@
+--- a/src/dbutil.c
++++ b/src/dbutil.c
+@@ -66,6 +66,10 @@
+ #include "session.h"
+ #include "atomicio.h"
+
++#ifdef DROPBEAR_NUTTX
++int execv(const char *path, char * const argv[]);
++#endif
++
+ #define MAX_FMT 100
+
+ static void generic_dropbear_exit(int exitcode, const char* format,
+--- a/src/signkey.h
++++ b/src/signkey.h
+@@ -150,9 +150,9 @@
+ void buf_put_sign(buffer* buf, sign_key *key, enum signature_type sigtype, const buffer *data_buf);
+ #if DROPBEAR_SIGNKEY_VERIFY
+ int buf_verify(buffer * buf, sign_key *key, enum signature_type expect_sigtype, const buffer *data_buf);
+ int sk_buf_verify(buffer * buf, sign_key *key, enum signature_type expect_sigtype, const buffer *data_buf, char* app, unsigned int applen);
+-char * sign_key_fingerprint(const unsigned char* keyblob, unsigned int keybloblen);
+ #endif
++char * sign_key_fingerprint(const unsigned char* keyblob, unsigned int keybloblen);
+ int cmp_base64_key(const unsigned char* keyblob, unsigned int keybloblen,
+ 					const unsigned char* algoname, unsigned int algolen,
+ 					const buffer * line, char ** fingerprint);
diff --git a/netutils/dropbear/patch/0002-use-nuttx-passwd-auth.patch b/netutils/dropbear/patch/0002-use-nuttx-passwd-auth.patch
new file mode 100644
index 000000000..5e71d73da
--- /dev/null
+++ b/netutils/dropbear/patch/0002-use-nuttx-passwd-auth.patch
@@ -0,0 +1,87 @@
+--- a/src/svr-authpasswd.c
++++ b/src/svr-authpasswd.c
+@@ -33,6 +33,77 @@
+ 
+ #if DROPBEAR_SVR_PASSWORD_AUTH
+ 
++#if DROPBEAR_NUTTX_PASSWD
++
++/* Process a password auth request, sending success or failure messages as
++ * appropriate */
++void svr_auth_password(int valid_user) {
++
++	char * password = NULL;
++	unsigned int passwordlen;
++	unsigned int changepw;
++	int auth_ok = 0;
++
++	/* check if client wants to change password */
++	changepw = buf_getbool(ses.payload);
++	if (changepw) {
++		/* not implemented by this server */
++		send_msg_userauth_failure(0, 1);
++		return;
++	}
++
++	password = buf_getstring(ses.payload, &passwordlen);
++	if (valid_user && passwordlen <= DROPBEAR_MAX_PASSWORD_LEN &&
++			strlen(password) == passwordlen) {
++		auth_ok = dropbear_verify_password(ses.authstate.pw_name, password);
++	}
++	m_burn(password, passwordlen);
++	m_free(password);
++
++	/* After we have got the payload contents we can exit if the username
++	is invalid. Invalid users have already been logged. */
++	if (!valid_user) {
++		send_msg_userauth_failure(0, 1);
++		return;
++	}
++
++	if (passwordlen > DROPBEAR_MAX_PASSWORD_LEN) {
++		dropbear_log(LOG_WARNING,
++				"Too-long password attempt for '%s' from %s",
++				ses.authstate.pw_name,
++				svr_ses.addrstring);
++		send_msg_userauth_failure(0, 1);
++		return;
++	}
++
++	if (auth_ok == DROPBEAR_SUCCESS) {
++		if (svr_opts.multiauthmethod && (ses.authstate.authtypes & ~AUTH_TYPE_PASSWORD)) {
++			/* successful password authentication, but extra auth required */
++			dropbear_log(LOG_NOTICE,
++					"Password auth succeeded for '%s' from %s, extra auth required",
++					ses.authstate.pw_name,
++					svr_ses.addrstring);
++			ses.authstate.authtypes &= ~AUTH_TYPE_PASSWORD; /* password auth ok, delete the method flag */
++			send_msg_userauth_failure(1, 0);  /* Send partial success */
++		} else {
++			/* successful authentication */
++			dropbear_log(LOG_NOTICE,
++					"Password auth succeeded for '%s' from %s",
++					ses.authstate.pw_name,
++					svr_ses.addrstring);
++			send_msg_userauth_success();
++		}
++	} else {
++		dropbear_log(LOG_WARNING,
++				"Bad password attempt for '%s' from %s",
++				ses.authstate.pw_name,
++				svr_ses.addrstring);
++		send_msg_userauth_failure(0, 1);
++	}
++}
++
++#else
++
+ /* not constant time when strings are differing lengths. 
+  string content isn't leaked, and crypt hashes are predictable length. */
+ static int constant_time_strcmp(const char* a, const char* b) {
+@@ -131,4 +202,6 @@
+ 	}
+ }
+ 
++#endif /* DROPBEAR_NUTTX_PASSWD */
++
+ #endif
diff --git a/netutils/dropbear/patch/0003-allow-localoptions-to-override-tracking-malloc.patch b/netutils/dropbear/patch/0003-allow-localoptions-to-override-tracking-malloc.patch
new file mode 100644
index 000000000..b1dc3e52c
--- /dev/null
+++ b/netutils/dropbear/patch/0003-allow-localoptions-to-override-tracking-malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/sysoptions.h
++++ b/src/sysoptions.h
+@@ -183,7 +183,9 @@ defined(__has_feature)
+ #define LTC_ECC521
+ #endif
+
+-#define DROPBEAR_LTC_PRNG (DROPBEAR_ECC)
++#ifndef DROPBEAR_LTC_PRNG
++#define DROPBEAR_LTC_PRNG (DROPBEAR_ECC)
++#endif
+
+ /* RSA can be vulnerable to timing attacks which use the time required for
+  * signing to guess the private key. Blinding avoids this attack, though makes
+@@ -436,7 +438,9 @@ defined(__has_feature)
+ #define DROPBEAR_CLIENT_TCP_FAST_OPEN 0
+ #endif
+
+-#define DROPBEAR_TRACKING_MALLOC (DROPBEAR_FUZZ)
++#ifndef DROPBEAR_TRACKING_MALLOC
++#define DROPBEAR_TRACKING_MALLOC (DROPBEAR_FUZZ)
++#endif
+
+ /* Used to work around Memory Sanitizer false positives */
+ #if defined(__has_feature)
diff --git a/netutils/dropbear/patch/0004-use-nuttx-unused-macro.patch b/netutils/dropbear/patch/0004-use-nuttx-unused-macro.patch
new file mode 100644
index 000000000..2ea588057
--- /dev/null
+++ b/netutils/dropbear/patch/0004-use-nuttx-unused-macro.patch
@@ -0,0 +1,202 @@
+--- a/src/compat.c
++++ b/src/compat.c
+@@ -89,6 +89,6 @@
+ #ifndef HAVE_GETUSERSHELL
+ static char **curshell, **shells, *strings;
+-static char **initshells();
++static char **initshells(void);
+ #endif
+
+ #ifndef HAVE_STRLCPY
+@@ -234,7 +234,7 @@
+ 	curshell = initshells();
+ }
+
+-static char **initshells() {
++static char **initshells(void) {
+ 	static const char *okshells[] = { COMPAT_USER_SHELLS, NULL };
+ 	register char **sp, *cp;
+ 	register FILE *fp;
+--- a/src/common-algo.c
++++ b/src/common-algo.c
+@@ -39,16 +39,25 @@
+ /* This file (algo.c) organises the ciphers which can be used, and is used to
+  * decide which ciphers/hashes/compression/signing to use during key exchange*/
+
+-static int void_cipher(const unsigned char* in, unsigned char* out,
+-		unsigned long len, void* UNUSED(cipher_state)) {
++static int void_cipher(const unsigned char* in, unsigned char* out,
++		unsigned long len, void* cipher_state) {
++	UNUSED(cipher_state);
++
+ 	if (in != out) {
+ 		memmove(out, in, len);
+ 	}
+ 	return CRYPT_OK;
+ }
+
+-static int void_start(int UNUSED(cipher), const unsigned char* UNUSED(IV),
+-			const unsigned char* UNUSED(key),
+-			int UNUSED(keylen), int UNUSED(num_rounds), void* UNUSED(cipher_state)) {
++static int void_start(int cipher, const unsigned char* IV,
++			const unsigned char* key,
++			int keylen, int num_rounds, void* cipher_state) {
++	UNUSED(cipher);
++	UNUSED(IV);
++	UNUSED(key);
++	UNUSED(keylen);
++	UNUSED(num_rounds);
++	UNUSED(cipher_state);
++
+ 	return CRYPT_OK;
+ }
+
+--- a/src/common-channel.c
++++ b/src/common-channel.c
+@@ -410,7 +410,9 @@
+
+ #ifndef HAVE_WRITEV
+ static int writechannel_fallback(struct Channel* channel, int fd, circbuffer *cbuf,
+-	const unsigned char *UNUSED(moredata), unsigned int *morelen) {
++	const unsigned char *moredata, unsigned int *morelen) {
++	UNUSED(moredata);
++
+
+ 	unsigned char *circ_p1, *circ_p2;
+ 	unsigned int circ_len1, circ_len2;
+--- a/src/dbutil.c
++++ b/src/dbutil.c
+@@ -138,7 +138,9 @@
+ }
+
+-static void generic_dropbear_log(int UNUSED(priority), const char* format,
++static void generic_dropbear_log(int priority, const char* format,
+ 		va_list param) {
++	UNUSED(priority);
++
+
+ 	char printbuf[1024];
+
+--- a/src/netio.c
++++ b/src/netio.c
+@@ -47,7 +47,10 @@
+ 	}
+ }
+
+-static void cancel_callback(int result, int sock, void* UNUSED(data), const char* UNUSED(errstring)) {
++static void cancel_callback(int result, int sock, void* data, const char* errstring) {
++	UNUSED(data);
++	UNUSED(errstring);
++
+ 	if (result == DROPBEAR_SUCCESS)
+ 	{
+ 		m_close(sock);
+--- a/src/ltc_prng.c
++++ b/src/ltc_prng.c
+@@ -32,8 +32,10 @@
+   @param prng     [out] The PRNG state to initialize
+   @return CRYPT_OK if successful
+ */  
+-int dropbear_prng_start(prng_state* UNUSED(prng))
++int dropbear_prng_start(prng_state* prng)
+ {
++   UNUSED(prng);
++
+    return CRYPT_OK;  
+ }
+ 
+@@ -44,8 +46,12 @@
+   @param prng     PRNG state to update
+   @return CRYPT_OK if successful
+ */  
+-int dropbear_prng_add_entropy(const unsigned char* UNUSED(in), unsigned long UNUSED(inlen), prng_state* UNUSED(prng))
++int dropbear_prng_add_entropy(const unsigned char* in, unsigned long inlen, prng_state* prng)
+ {
++   UNUSED(in);
++   UNUSED(inlen);
++   UNUSED(prng);
++
+    return CRYPT_OK;
+ }
+ 
+@@ -54,8 +60,10 @@
+   @param prng   The PRNG to make active
+   @return CRYPT_OK if successful
+ */  
+-int dropbear_prng_ready(prng_state* UNUSED(prng))
++int dropbear_prng_ready(prng_state* prng)
+ {
++   UNUSED(prng);
++
+    return CRYPT_OK;
+ }
+ 
+@@ -66,8 +74,10 @@
+   @param prng     The active PRNG to read from
+   @return Number of octets read
+ */  
+-unsigned long dropbear_prng_read(unsigned char* out, unsigned long outlen, prng_state* UNUSED(prng))
++unsigned long dropbear_prng_read(unsigned char* out, unsigned long outlen, prng_state* prng)
+ {
++   UNUSED(prng);
++
+    LTC_ARGCHK(out != NULL);
+    genrandom(out, outlen);
+    return outlen;
+@@ -78,8 +88,10 @@
+   @param prng   The PRNG to terminate
+   @return CRYPT_OK if successful
+ */  
+-int dropbear_prng_done(prng_state* UNUSED(prng))
++int dropbear_prng_done(prng_state* prng)
+ {
++   UNUSED(prng);
++
+    return CRYPT_OK;
+ }
+ 
+@@ -90,8 +102,11 @@
+   @param prng      The PRNG to export
+   @return CRYPT_OK if successful
+ */  
+-int dropbear_prng_export(unsigned char* UNUSED(out), unsigned long* outlen, prng_state* UNUSED(prng))
++int dropbear_prng_export(unsigned char* out, unsigned long* outlen, prng_state* prng)
+ {
++   UNUSED(out);
++   UNUSED(prng);
++
+    LTC_ARGCHK(outlen != NULL);
+ 
+    *outlen = 0;
+@@ -105,8 +120,12 @@
+   @param prng     The PRNG to import
+   @return CRYPT_OK if successful
+ */  
+-int dropbear_prng_import(const unsigned char* UNUSED(in), unsigned long UNUSED(inlen), prng_state* UNUSED(prng))
++int dropbear_prng_import(const unsigned char* in, unsigned long inlen, prng_state* prng)
+ {
++   UNUSED(in);
++   UNUSED(inlen);
++   UNUSED(prng);
++
+    return CRYPT_OK;
+ }
+ 
+--- a/src/chachapoly.c
++++ b/src/chachapoly.c
+@@ -43,9 +43,13 @@
+ const struct dropbear_cipher dropbear_chachapoly =
+ 	{&dummy, CHACHA20_KEY_LEN*2, CHACHA20_BLOCKSIZE};
+ 
+-static int dropbear_chachapoly_start(int UNUSED(cipher), const unsigned char* UNUSED(IV),
++static int dropbear_chachapoly_start(int cipher, const unsigned char* IV,
+ 			const unsigned char *key, int keylen,
+-			int UNUSED(num_rounds), dropbear_chachapoly_state *state) {
++			int num_rounds, dropbear_chachapoly_state *state) {
++	UNUSED(cipher);
++	UNUSED(IV);
++	UNUSED(num_rounds);
++
+ 	int err;
+ 
+ 	TRACE2(("enter dropbear_chachapoly_start"))
diff --git a/netutils/dropbear/port/config.h b/netutils/dropbear/port/config.h
new file mode 100644
index 000000000..0f5355fd7
--- /dev/null
+++ b/netutils/dropbear/port/config.h
@@ -0,0 +1,20 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/config.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+#ifndef __APPS_NETUTILS_DROPBEAR_PORT_CONFIG_H
+#define __APPS_NETUTILS_DROPBEAR_PORT_CONFIG_H
+
+/* Dropbear looks for a file named config.h. Keep this wrapper name stable;
+ * NuttX-specific autoconf replacements live in nuttx_config.h.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "nuttx_config.h"
+
+#endif /* __APPS_NETUTILS_DROPBEAR_PORT_CONFIG_H */
diff --git a/netutils/dropbear/port/dropbear_utils.c b/netutils/dropbear/port/dropbear_utils.c
new file mode 100644
index 000000000..73619cbe7
--- /dev/null
+++ b/netutils/dropbear/port/dropbear_utils.c
@@ -0,0 +1,149 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/dropbear_utils.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "dropbear_utils.h"
+
+#include <sys/stat.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int dropbear_hex_value(char ch)
+{
+  if (ch >= '0' && ch <= '9')
+    {
+      return ch - '0';
+    }
+
+  if (ch >= 'a' && ch <= 'f')
+    {
+      return ch - 'a' + 10;
+    }
+
+  if (ch >= 'A' && ch <= 'F')
+    {
+      return ch - 'A' + 10;
+    }
+
+  return -1;
+}
+
+static int dropbear_try_mkdir(FAR const char *path)
+{
+  if (mkdir(path, 0700) < 0 && errno != EEXIST)
+    {
+      return -errno;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void dropbear_hex_encode(FAR char *dst, FAR const uint8_t *src,
+                         size_t srclen)
+{
+  static const char hex[] = "0123456789abcdef";
+  size_t i;
+
+  for (i = 0; i < srclen; i++)
+    {
+      dst[i * 2] = hex[src[i] >> 4];
+      dst[i * 2 + 1] = hex[src[i] & 0x0f];
+    }
+
+  dst[srclen * 2] = '\0';
+}
+
+int dropbear_hex_decode(FAR const char *src, size_t srclen,
+                        FAR uint8_t *dst, size_t dstlen)
+{
+  size_t i;
+
+  if (srclen != dstlen * 2)
+    {
+      return -EINVAL;
+    }
+
+  for (i = 0; i < dstlen; i++)
+    {
+      int hi = dropbear_hex_value(src[i * 2]);
+      int lo = dropbear_hex_value(src[i * 2 + 1]);
+
+      if (hi < 0 || lo < 0)
+        {
+          return -EINVAL;
+        }
+
+      dst[i] = (uint8_t)((hi << 4) | lo);
+    }
+
+  return OK;
+}
+
+int dropbear_try_prepare_parent(FAR const char *path)
+{
+  char dir[PATH_MAX];
+  struct stat st;
+  FAR char *slash;
+  FAR char *p;
+  int ret;
+
+  if (strlcpy(dir, path, sizeof(dir)) >= sizeof(dir))
+    {
+      return -ENAMETOOLONG;
+    }
+
+  slash = strrchr(dir, '/');
+  if (slash == NULL || slash == dir)
+    {
+      return OK;
+    }
+
+  *slash = '\0';
+  if (stat(dir, &st) == 0)
+    {
+      return OK;
+    }
+
+  for (p = dir + 1; *p != '\0'; p++)
+    {
+      if (*p == '/')
+        {
+          *p = '\0';
+          ret = dropbear_try_mkdir(dir);
+          if (ret < 0)
+            {
+              return ret;
+            }
+
+          *p = '/';
+        }
+    }
+
+  return dropbear_try_mkdir(dir);
+}
+
+#ifndef CONFIG_SCHED_USER_IDENTITY
+int dropbear_getgroups(int size, gid_t list[])
+{
+  (void)size;
+  (void)list;
+  set_errno(ENOSYS);
+  return ERROR;
+}
+#endif
diff --git a/netutils/dropbear/port/dropbear_utils.h b/netutils/dropbear/port/dropbear_utils.h
new file mode 100644
index 000000000..3e7d2722e
--- /dev/null
+++ b/netutils/dropbear/port/dropbear_utils.h
@@ -0,0 +1,31 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/dropbear_utils.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+#ifndef __APPS_NETUTILS_DROPBEAR_PORT_DROPBEAR_UTILS_H
+#define __APPS_NETUTILS_DROPBEAR_PORT_DROPBEAR_UTILS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "config.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void dropbear_hex_encode(FAR char *dst, FAR const uint8_t *src,
+                         size_t srclen);
+
+int dropbear_hex_decode(FAR const char *src, size_t srclen,
+                        FAR uint8_t *dst, size_t dstlen);
+
+int dropbear_try_prepare_parent(FAR const char *path);
+
+#endif /* __APPS_NETUTILS_DROPBEAR_PORT_DROPBEAR_UTILS_H */
diff --git a/netutils/dropbear/port/localoptions.h b/netutils/dropbear/port/localoptions.h
new file mode 100644
index 000000000..28ac5a3b5
--- /dev/null
+++ b/netutils/dropbear/port/localoptions.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/localoptions.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+#ifndef __APPS_NETUTILS_DROPBEAR_PORT_LOCALOPTIONS_H
+#define __APPS_NETUTILS_DROPBEAR_PORT_LOCALOPTIONS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DROPBEAR_TRACKING_MALLOC 1
+
+/* Persist the native Dropbear ECDSA host key at the configured path. */
+
+#define ECDSA_PRIV_FILENAME CONFIG_NETUTILS_DROPBEAR_HOSTKEY_PATH
+
+#define DROPBEAR_SVR_DROP_PRIVS 0
+
+#ifdef CONFIG_SCHED_USER_IDENTITY
+#  define DROPBEAR_SVR_MULTIUSER 1
+#else
+#  define DROPBEAR_SVR_MULTIUSER 0
+#endif
+
+#define DROPBEAR_SVR_PASSWORD_AUTH 1
+#define DROPBEAR_SVR_PUBKEY_AUTH 0
+#define DROPBEAR_SVR_PUBKEY_OPTIONS 0
+
+#define DROPBEAR_REEXEC 0
+#define DROPBEAR_SMALL_CODE 1
+#define DROPBEAR_USER_ALGO_LIST 0
+
+#define DROPBEAR_X11FWD 0
+#define DROPBEAR_SVR_AGENTFWD 0
+#define DROPBEAR_SVR_LOCALTCPFWD 0
+#define DROPBEAR_SVR_REMOTETCPFWD 0
+#define DROPBEAR_SVR_LOCALSTREAMFWD 0
+#define DROPBEAR_SVR_REMOTESTREAMFWD 0
+
+#define DROPBEAR_DSS 0
+#define DROPBEAR_RSA 0
+#define DROPBEAR_ECDSA 1
+#define DROPBEAR_ED25519 0
+#define DROPBEAR_SK_KEYS 0
+#define DROPBEAR_ECC_256 1
+#define DROPBEAR_ECC_384 0
+#define DROPBEAR_ECC_521 0
+
+#define DROPBEAR_AES128 1
+#define DROPBEAR_AES256 0
+#define DROPBEAR_CHACHA20POLY1305 1
+#define DROPBEAR_ENABLE_CBC_MODE 0
+#define DROPBEAR_ENABLE_GCM_MODE 0
+
+#define DROPBEAR_SHA1_HMAC 0
+#define DROPBEAR_SHA2_256_HMAC 1
+#define DROPBEAR_SHA2_512_HMAC 0
+#define DROPBEAR_SHA1_96_HMAC 0
+
+#define DROPBEAR_CURVE25519 1
+#define DROPBEAR_DH_GROUP14_SHA1 0
+#define DROPBEAR_DH_GROUP14_SHA256 0
+#define DROPBEAR_DH_GROUP16 0
+#define DROPBEAR_DH_GROUP1 0
+#define DROPBEAR_ECDH 0
+#define DROPBEAR_SNTRUP761 0
+#define DROPBEAR_MLKEM768 0
+
+#define DROPBEAR_DEFAULT_CLI_AUTHKEY "/etc/dropbear/authorized_keys"
+#define DROPBEAR_SFTPSERVER 0
+
+#endif /* __APPS_NETUTILS_DROPBEAR_PORT_LOCALOPTIONS_H */
diff --git a/netutils/dropbear/port/nuttx_auth.c b/netutils/dropbear/port/nuttx_auth.c
new file mode 100644
index 000000000..83becdcae
--- /dev/null
+++ b/netutils/dropbear/port/nuttx_auth.c
@@ -0,0 +1,109 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/nuttx_auth.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "fsutils/passwd.h"
+
+#include "dbutil.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct passwd g_dropbear_pw;
+static char g_dropbear_name[64];
+static char g_dropbear_dir[] = "/";
+static char g_dropbear_shell[] = "/bin/sh";
+static char g_dropbear_password_marker[] = "x";
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static FAR struct passwd *dropbear_fill_pw(FAR const char *name, uid_t uid)
+{
+  memset(&g_dropbear_pw, 0, sizeof(g_dropbear_pw));
+
+  snprintf(g_dropbear_name, sizeof(g_dropbear_name), "%s", name);
+
+  g_dropbear_pw.pw_uid = uid;
+  g_dropbear_pw.pw_gid = 0;
+  g_dropbear_pw.pw_name = g_dropbear_name;
+  g_dropbear_pw.pw_passwd = g_dropbear_password_marker;
+  g_dropbear_pw.pw_gecos = g_dropbear_name;
+  g_dropbear_pw.pw_dir = g_dropbear_dir;
+  g_dropbear_pw.pw_shell = g_dropbear_shell;
+
+  return &g_dropbear_pw;
+}
+
+FAR struct passwd *dropbear_getpwuid(uid_t uid)
+{
+  return dropbear_fill_pw("root", uid);
+}
+
+FAR struct passwd *dropbear_getpwnam(FAR const char *name)
+{
+  if (name == NULL || name[0] == '\0')
+    {
+      return NULL;
+    }
+
+  return dropbear_fill_pw(name, 0);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+uid_t dropbear_getuid(void)
+{
+  return 0;
+}
+
+uid_t dropbear_geteuid(void)
+{
+  return 0;
+}
+
+int dropbear_auth_initialize(void)
+{
+  dropbear_log(LOG_INFO, "using NuttX passwd auth at %s",
+               CONFIG_FSUTILS_PASSWD_PATH);
+  return OK;
+}
+
+int dropbear_verify_password(FAR const char *username,
+                             FAR const char *password)
+{
+  int ret;
+
+  ret = passwd_verify(username, password);
+  if (PASSWORD_VERIFY_MATCH(ret))
+    {
+      return DROPBEAR_SUCCESS;
+    }
+
+  if (PASSWORD_VERIFY_ERROR(ret) && ret != -ENOENT)
+    {
+      dropbear_log(LOG_WARNING, "passwd_verify failed for '%s': %d",
+                   username, ret);
+    }
+
+  return DROPBEAR_FAILURE;
+}
diff --git a/netutils/dropbear/port/nuttx_config.h b/netutils/dropbear/port/nuttx_config.h
new file mode 100644
index 000000000..d91709d1e
--- /dev/null
+++ b/netutils/dropbear/port/nuttx_config.h
@@ -0,0 +1,142 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/nuttx_config.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ****************************************************************************/
+
+#ifndef __APPS_NETUTILS_DROPBEAR_PORT_NUTTX_CONFIG_H
+#define __APPS_NETUTILS_DROPBEAR_PORT_NUTTX_CONFIG_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <errno.h>
+#include <grp.h>
+#include <pwd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DROPBEAR_SERVER 1
+#define BUNDLED_LIBTOM 1
+#define DISABLE_LASTLOG 1
+#define DISABLE_PAM 1
+#define DISABLE_PUTUTLINE 1
+#define DISABLE_PUTUTXLINE 1
+#define DISABLE_UTMP 1
+#define DISABLE_UTMPX 1
+#define DISABLE_WTMP 1
+#define DISABLE_WTMPX 1
+
+#ifndef CONFIG_NETUTILS_DROPBEAR_SYSLOG
+#  define DISABLE_SYSLOG 1
+#endif
+
+#ifndef CONFIG_NETUTILS_DROPBEAR_COMPRESSION
+#  define DISABLE_ZLIB 1
+#endif
+
+#define DROPBEAR_FUZZ 0
+#define DROPBEAR_PLUGIN 0
+
+#define HAVE_BASENAME 1
+#define HAVE_CLOCK_GETTIME 1
+#define HAVE_CONST_GAI_STRERROR_PROTO 1
+#define HAVE_CRYPT 1
+#define HAVE_DECL_HTOLE64 1
+#define HAVE_ENDIAN_H 1
+#define HAVE_EXPLICIT_BZERO 1
+#define HAVE_FREEADDRINFO 1
+#define HAVE_GAI_STRERROR 1
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETNAMEINFO 1
+#define HAVE_GETRANDOM 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_LIBGEN_H 1
+#define HAVE_NETDB_H 1
+#define HAVE_NETINET_IN_H 1
+#define HAVE_NETINET_TCP_H 1
+#define HAVE_PATHS_H 1
+#define HAVE_PUTENV 1
+#define HAVE_STATIC_ASSERT 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRLCAT 1
+#define HAVE_STRLCPY 1
+#define HAVE_STRUCT_ADDRINFO 1
+#define HAVE_STRUCT_IN6_ADDR 1
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+#define HAVE_SYS_RANDOM_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_SOCKET_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_UIO_H 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_UINT16_T 1
+#define HAVE_UINT32_T 1
+#define HAVE_UINT8_T 1
+#define HAVE_U_INT16_T 1
+#define HAVE_U_INT32_T 1
+#define HAVE_U_INT8_T 1
+#define HAVE_UNDERSCORE_STATIC_ASSERT 1
+#define HAVE_UNISTD_H 1
+/* NuttX exposes writev(), but keep this port on Dropbear's simpler write()
+ * path until the SSH-to-NSH channel bridge is validated with vectored
+ * writes.
+ */
+
+#undef HAVE_WRITEV
+#define STDC_HEADERS 1
+
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME ""
+#define PACKAGE_STRING ""
+#define PACKAGE_TARNAME ""
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION ""
+
+#define SELECT_TYPE_ARG1 int
+#define SELECT_TYPE_ARG234 (fd_set *)
+#define SELECT_TYPE_ARG5 (struct timeval *)
+
+#ifndef PF_UNIX
+#  define PF_UNIX AF_UNIX
+#endif
+
+#ifndef GRND_NONBLOCK
+#  define GRND_NONBLOCK O_NONBLOCK
+#endif
+
+#define IPPORT_RESERVED 1024
+
+#define getuid dropbear_getuid
+#define geteuid dropbear_geteuid
+#define getpwuid dropbear_getpwuid
+#define getpwnam dropbear_getpwnam
+uid_t getuid(void);
+uid_t geteuid(void);
+struct passwd *getpwuid(uid_t uid);
+struct passwd *getpwnam(const char *name);
+int dropbear_auth_initialize(void);
+int dropbear_verify_password(const char *username, const char *password);
+
+#ifndef CONFIG_SCHED_USER_IDENTITY
+/* NuttX has no supplementary-group support, so getgroups() does not exist. */
+
+int dropbear_getgroups(int size, gid_t list[]);
+
+#  define getgroups dropbear_getgroups
+#endif
+
+#endif /* __APPS_NETUTILS_DROPBEAR_PORT_NUTTX_CONFIG_H */
diff --git a/nshlib/CMakeLists.txt b/nshlib/CMakeLists.txt
index 8adab3168..866f8bb6c 100644
--- a/nshlib/CMakeLists.txt
+++ b/nshlib/CMakeLists.txt
@@ -101,6 +101,10 @@ if(CONFIG_NSH_LIBRARY)
     endif()
   endif()
 
+  if(CONFIG_NSH_DROPBEAR)
+    list(APPEND CSRCS nsh_dropbear.c)
+  endif()
+
   if(NOT CONFIG_NSH_DISABLESCRIPT)
     list(APPEND CSRCS nsh_test.c)
   endif()
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 80476e7f5..01103ee29 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -1201,6 +1201,28 @@ config NSH_DISABLE_TELNETSTART
 
 endmenu # Telnet Configuration
 
+menu "Dropbear Configuration"
+
+config NSH_DROPBEAR
+	bool "Start Dropbear SSH server"
+	default n
+	depends on NETUTILS_DROPBEAR
+	depends on NSH_BUILTIN_APPS
+	depends on !NSH_DISABLEBG
+	select NSH_LOGIN
+	---help---
+		If NSH_DROPBEAR is set to 'y', then NSH starts the Dropbear SSH
+		server automatically.
+
+config NSH_DISABLE_DROPBEARSTART
+	bool "Disable to start Dropbear"
+	default n
+	depends on NSH_DROPBEAR
+	---help---
+		Determines if NSH starts Dropbear automatically.
+
+endmenu # Dropbear Configuration
+
 config NSH_LOGIN
 	bool
 	default n
diff --git a/nshlib/Makefile b/nshlib/Makefile
index d15ca4aa3..4aba9e3a8 100644
--- a/nshlib/Makefile
+++ b/nshlib/Makefile
@@ -86,6 +86,10 @@ CSRCS += nsh_telnetlogin.c
 endif
 endif
 
+ifeq ($(CONFIG_NSH_DROPBEAR),y)
+CSRCS += nsh_dropbear.c
+endif
+
 ifneq ($(CONFIG_NSH_DISABLESCRIPT),y)
 CSRCS += nsh_test.c
 endif
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index f20fcf773..872c1e4af 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -844,6 +844,10 @@ int nsh_login(FAR struct console_stdio_s *pstate);
 int nsh_telnetlogin(FAR struct console_stdio_s *pstate);
 #endif
 
+#if defined(CONFIG_NSH_DROPBEAR) && !defined(CONFIG_NSH_DISABLE_DROPBEARSTART)
+int nsh_dropbearstart(void);
+#endif
+
 /* Application interface */
 
 int nsh_command(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char *argv[]);
diff --git a/nshlib/nsh_dropbear.c b/nshlib/nsh_dropbear.c
new file mode 100644
index 000000000..9e7753f11
--- /dev/null
+++ b/nshlib/nsh_dropbear.c
@@ -0,0 +1,76 @@
+/****************************************************************************
+ * apps/nshlib/nsh_dropbear.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <assert.h>
+#include <debug.h>
+
+#include "nsh.h"
+#include "nsh_console.h"
+
+#ifdef CONFIG_NSH_DROPBEAR
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nsh_dropbearstart
+ *
+ * Description:
+ *   nsh_dropbearstart() starts the Dropbear SSH server.  This function
+ *   returns immediately after the daemon has been started.
+ *
+ * Returned Values:
+ *   Zero is returned if Dropbear was started.  A negated errno value will be
+ *   returned on failure.
+ *
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_DROPBEARSTART
+int nsh_dropbearstart(void)
+{
+  FAR struct console_stdio_s *pstate = nsh_newconsole(false);
+  char cmdline[] = CONFIG_NETUTILS_DROPBEAR_PROGNAME " &";
+  int ret;
+
+  DEBUGASSERT(pstate != NULL);
+
+  ninfo("Starting the Dropbear SSH server\n");
+
+  ret = nsh_parse(&pstate->cn_vtbl, cmdline);
+  if (ret < 0)
+    {
+      nerr("ERROR: Failed to start Dropbear: %d\n", ret);
+    }
+
+  nsh_release(&pstate->cn_vtbl);
+  return ret;
+}
+#endif
+
+#endif /* CONFIG_NSH_DROPBEAR */
diff --git a/nshlib/nsh_init.c b/nshlib/nsh_init.c
index aea095e34..49c1488e6 100644
--- a/nshlib/nsh_init.c
+++ b/nshlib/nsh_init.c
@@ -175,4 +175,16 @@ void nsh_initialize(void)
 
   nsh_telnetstart(AF_UNSPEC);
 #endif
+
+#if defined(CONFIG_NSH_DROPBEAR) && \
+    !defined(CONFIG_NSH_DISABLE_DROPBEARSTART) && \
+    !defined(CONFIG_NETINIT_NETLOCAL)
+  /* If Dropbear is selected as an SSH front-end, then start the daemon
+   * UNLESS network initialization is deferred via CONFIG_NETINIT_NETLOCAL.
+   * In that case, Dropbear must be started manually with the dropbear
+   * command after the network has been initialized.
+   */
+
+  nsh_dropbearstart();
+#endif
 }

From ae718ba47fd396d649939c1f54f09b92e096a594 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Fri, 26 Jun 2026 12:41:02 -0300
Subject: [PATCH 446/568] nsh/echo: Fix echo previous behavior, single write
 with '\n'

This commit fixes the previous behavior where an echo with a
single string and its default new line is send as single write().

This issue came from:  https://github.com/apache/nuttx-apps/pull/1559

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 nshlib/nsh_envcmds.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nshlib/nsh_envcmds.c b/nshlib/nsh_envcmds.c
index 442d6b2ba..52be0e96c 100644
--- a/nshlib/nsh_envcmds.c
+++ b/nshlib/nsh_envcmds.c
@@ -390,19 +390,18 @@ do_echo:
           str_escape(argv[0]);
         }
 
-      nsh_output(vtbl, "%s", argv[0]);
+      if (argc > 1)
+        {
+          nsh_output(vtbl, "%s ", argv[0]);
+        }
+      else
+        {
+          nsh_output(vtbl, newline ? "%s\n" : "%s", argv[0]);
+          break;
+        }
 
       --argc;
       ++argv;
-      if (argc > 0)
-        {
-          nsh_output(vtbl, " ");
-        }
-    }
-
-  if (newline)
-    {
-      nsh_output(vtbl, "\n");
     }
 
   return OK;

From d29ae9bda6597eef9be5e10ade25cc5888fa96a8 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 25 Jun 2026 16:00:10 +0800
Subject: [PATCH 447/568] netutils/rexec: initialize ret to avoid
 maybe-uninitialized

When the relay loop exits early without entering any branch, ret would be
returned uninitialized, tripping -Werror=maybe-uninitialized. Initialize
it to 0.

Assisted-by: GitHubCopilot:claude-4.8-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 netutils/rexec/rexec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netutils/rexec/rexec.c b/netutils/rexec/rexec.c
index 01c8000bf..519790c4a 100644
--- a/netutils/rexec/rexec.c
+++ b/netutils/rexec/rexec.c
@@ -87,7 +87,7 @@ static int do_rexec(FAR struct rexec_arg_s *arg)
   char buffer[REXEC_BUFSIZE];
   struct pollfd fds[2];
   int sock;
-  int ret;
+  int ret = 0;
 
   sock = rexec_af(&arg->host, htons(arg->port), arg->user,
                   arg->password, arg->command,

From 253f1d40c3a98956f066450c07b263bfe681e14a Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 25 Jun 2026 16:00:10 +0800
Subject: [PATCH 448/568] netutils/rexecd: use dpopen() instead of popen() to
 get raw fd

popen() now returns a fopencookie-backed FILE* whose fileno() yields the
cookie pointer rather than a real descriptor, so poll() silently ignores
the negative fd and the relay loop blocks forever waiting for command
completion. See https://github.com/apache/nuttx-apps/pull/3511

Use dpopen()/dpclose() to obtain the raw bidirectional socket descriptor
directly, restoring the EOF/POLLHUP command-completion signal.

Assisted-by: GitHubCopilot:claude-4.8-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 netutils/rexecd/rexecd.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/netutils/rexecd/rexecd.c b/netutils/rexecd/rexecd.c
index 6c238d586..13864a841 100644
--- a/netutils/rexecd/rexecd.c
+++ b/netutils/rexecd/rexecd.c
@@ -25,9 +25,11 @@
  ****************************************************************************/
 
 #include <errno.h>
+#include <fcntl.h>
 #include <netdb.h>
 #include <pthread.h>
 #include <netpacket/rpmsg.h>
+#include <sys/socket.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -84,7 +86,7 @@ static FAR void *doit(pthread_addr_t pvarg)
 {
   char buf[REXECD_BUFSIZE];
   struct pollfd fds[2];
-  FAR FILE *fp;
+  pid_t pid;
   int sock = (long)pvarg;
   int ret;
 
@@ -97,18 +99,18 @@ static FAR void *doit(pthread_addr_t pvarg)
   /* we need to read command */
 
   getstr(sock, buf);
-  fp = popen(buf, "r+");
-  if (!fp)
-    {
-      goto errout;
-    }
 
   memset(fds, 0, sizeof(fds));
-  fds[0].fd = fileno(fp);
   fds[0].events = POLLIN;
   fds[1].fd = sock;
   fds[1].events = POLLIN;
 
+  fds[0].fd = dpopen(buf, O_RDWR, &pid);
+  if (fds[0].fd < 0)
+    {
+      goto errout;
+    }
+
   while (1)
     {
       ret = poll(fds, 2, -1);
@@ -119,7 +121,7 @@ static FAR void *doit(pthread_addr_t pvarg)
 
       if (fds[0].revents & POLLIN)
         {
-          ret = read(fileno(fp), buf, REXECD_BUFSIZE);
+          ret = read(fds[0].fd, buf, REXECD_BUFSIZE);
           if (ret <= 0)
             {
               break;
@@ -140,7 +142,7 @@ static FAR void *doit(pthread_addr_t pvarg)
               break;
             }
 
-          ret = write(fileno(fp), buf, ret);
+          ret = write(fds[0].fd, buf, ret);
           if (ret < 0)
             {
               break;
@@ -154,7 +156,7 @@ static FAR void *doit(pthread_addr_t pvarg)
         }
     }
 
-  pclose(fp);
+  dpclose(fds[0].fd, pid);
 errout:
   close(sock);
   return NULL;

From a2b1cc16da61b0cee2af547026632ca0f47d324d Mon Sep 17 00:00:00 2001
From: Frederick Blais <fred_blais5@hotmail.com>
Date: Fri, 26 Jun 2026 09:12:29 -0400
Subject: [PATCH 449/568] interpreters/berry: Add Berry scripting language

Add an optional Berry interpreter under apps/interpreters.

Fetch the pinned upstream source and apply the NuttX default-port patch.

Generate Berry constant objects and build the NSH command through Kconfig.

Make and CMake build paths are included for normal app integration.

Signed-off-by: Frederick Blais <fred_blais5@hotmail.com>
---
 ...001-Fix-Berry-default-port-for-NuttX.patch |  27 ++++
 interpreters/berry/CMakeLists.txt             | 148 ++++++++++++++++++
 interpreters/berry/Kconfig                    |  43 +++++
 interpreters/berry/Make.defs                  |  25 +++
 interpreters/berry/Makefile                   |  97 ++++++++++++
 interpreters/berry/include/berry_conf.h       |  86 ++++++++++
 6 files changed, 426 insertions(+)
 create mode 100644 interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch
 create mode 100644 interpreters/berry/CMakeLists.txt
 create mode 100644 interpreters/berry/Kconfig
 create mode 100644 interpreters/berry/Make.defs
 create mode 100644 interpreters/berry/Makefile
 create mode 100644 interpreters/berry/include/berry_conf.h

diff --git a/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch b/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch
new file mode 100644
index 000000000..39fc4972e
--- /dev/null
+++ b/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch
@@ -0,0 +1,27 @@
+diff --git a/default/berry.c b/default/berry.c
+index d6ea5d1..bb95fc7 100644
+--- a/default/berry.c
++++ b/default/berry.c
+@@ -22 +22,3 @@
+-#if defined(__linux)
++#if defined(__NuttX__)
++    #define OS_NAME   "NuttX"
++#elif defined(__linux)
+@@ -103 +105 @@
+-    const char *optarg;
++    const char *optvalue;
+@@ -148 +150 @@
+-                opt->optarg = argv[opt->idx++]; /* save the argument */
++                opt->optvalue = argv[opt->idx++]; /* save the argument */
+@@ -151 +153 @@
+-            opt->optarg = NULL;
++            opt->optvalue = NULL;
+@@ -272 +274 @@
+-            opt->modulepath = opt->optarg;
++            opt->modulepath = opt->optvalue;
+@@ -277 +279 @@
+-            opt->src = opt->optarg;
++            opt->src = opt->optvalue;
+@@ -281 +283 @@
+-            opt->dst = opt->optarg;
++            opt->dst = opt->optvalue;
diff --git a/interpreters/berry/CMakeLists.txt b/interpreters/berry/CMakeLists.txt
new file mode 100644
index 000000000..42a37554b
--- /dev/null
+++ b/interpreters/berry/CMakeLists.txt
@@ -0,0 +1,148 @@
+# ##############################################################################
+# apps/interpreters/berry/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_INTERPRETERS_BERRY)
+  set(BERRY_COMMIT_ID 4db341475df9e9ad18e6741ef978b4c467690e09)
+  set(BERRY_DIR ${CMAKE_CURRENT_LIST_DIR}/berry)
+
+  if(NOT EXISTS ${BERRY_DIR})
+    set(BERRY_URL_BASE https://github.com/berry-lang/berry/archive/)
+
+    FetchContent_Declare(
+      berry_fetch
+      URL ${BERRY_URL_BASE}/${BERRY_COMMIT_ID}.zip SOURCE_DIR
+          ${CMAKE_CURRENT_LIST_DIR}/berry BINARY_DIR
+          ${CMAKE_BINARY_DIR}/apps/interpreters/berry/berry
+      PATCH_COMMAND
+        patch -l -p1 -d ${CMAKE_CURRENT_LIST_DIR}/berry -i
+        ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-Berry-default-port-for-NuttX.patch
+      DOWNLOAD_NO_PROGRESS true
+      TIMEOUT 30)
+
+    FetchContent_GetProperties(berry_fetch)
+
+    if(NOT berry_fetch_POPULATED)
+      FetchContent_Populate(berry_fetch)
+    endif()
+  endif()
+
+  find_package(
+    Python3
+    COMPONENTS Interpreter
+    REQUIRED)
+
+  set(BERRY_CONFIG_DIR ${CMAKE_CURRENT_LIST_DIR}/include)
+  set(BERRY_CONFIG ${BERRY_CONFIG_DIR}/berry_conf.h)
+  set(BERRY_GENERATE ${BERRY_DIR}/generate)
+  set(BERRY_GEN_STAMP ${BERRY_GENERATE}/.generated)
+  set(BERRY_FLAGS -Wno-unused-but-set-variable)
+  set(BERRY_INCDIR ${BERRY_CONFIG_DIR} ${BERRY_DIR}/src ${BERRY_DIR}/default)
+
+  set(BERRY_CSRCS
+      ${BERRY_DIR}/src/be_api.c
+      ${BERRY_DIR}/src/be_baselib.c
+      ${BERRY_DIR}/src/be_bytecode.c
+      ${BERRY_DIR}/src/be_byteslib.c
+      ${BERRY_DIR}/src/be_class.c
+      ${BERRY_DIR}/src/be_code.c
+      ${BERRY_DIR}/src/be_debug.c
+      ${BERRY_DIR}/src/be_debuglib.c
+      ${BERRY_DIR}/src/be_exec.c
+      ${BERRY_DIR}/src/be_filelib.c
+      ${BERRY_DIR}/src/be_func.c
+      ${BERRY_DIR}/src/be_gc.c
+      ${BERRY_DIR}/src/be_gclib.c
+      ${BERRY_DIR}/src/be_globallib.c
+      ${BERRY_DIR}/src/be_introspectlib.c
+      ${BERRY_DIR}/src/be_jsonlib.c
+      ${BERRY_DIR}/src/be_lexer.c
+      ${BERRY_DIR}/src/be_libs.c
+      ${BERRY_DIR}/src/be_list.c
+      ${BERRY_DIR}/src/be_listlib.c
+      ${BERRY_DIR}/src/be_map.c
+      ${BERRY_DIR}/src/be_maplib.c
+      ${BERRY_DIR}/src/be_mathlib.c
+      ${BERRY_DIR}/src/be_mem.c
+      ${BERRY_DIR}/src/be_module.c
+      ${BERRY_DIR}/src/be_object.c
+      ${BERRY_DIR}/src/be_oslib.c
+      ${BERRY_DIR}/src/be_parser.c
+      ${BERRY_DIR}/src/be_rangelib.c
+      ${BERRY_DIR}/src/be_repl.c
+      ${BERRY_DIR}/src/be_solidifylib.c
+      ${BERRY_DIR}/src/be_strictlib.c
+      ${BERRY_DIR}/src/be_string.c
+      ${BERRY_DIR}/src/be_strlib.c
+      ${BERRY_DIR}/src/be_syslib.c
+      ${BERRY_DIR}/src/be_timelib.c
+      ${BERRY_DIR}/src/be_undefinedlib.c
+      ${BERRY_DIR}/src/be_var.c
+      ${BERRY_DIR}/src/be_vector.c
+      ${BERRY_DIR}/src/be_vm.c
+      ${BERRY_DIR}/default/be_modtab.c
+      ${BERRY_DIR}/default/be_port.c)
+
+  add_custom_command(
+    OUTPUT ${BERRY_GEN_STAMP}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${BERRY_GENERATE}
+    COMMAND
+      ${Python3_EXECUTABLE} ${BERRY_DIR}/tools/coc/coc -o ${BERRY_GENERATE}
+      ${BERRY_DIR}/src ${BERRY_DIR}/default -c ${BERRY_CONFIG}
+    COMMAND ${CMAKE_COMMAND} -E touch ${BERRY_GEN_STAMP}
+    DEPENDS ${BERRY_CSRCS} ${BERRY_CONFIG}
+    WORKING_DIRECTORY ${BERRY_DIR}
+    COMMENT "Generating Berry constant objects")
+
+  add_custom_target(berry_coc DEPENDS ${BERRY_GEN_STAMP})
+
+  nuttx_add_library(libberry)
+  target_sources(libberry PRIVATE ${BERRY_CSRCS})
+  target_include_directories(libberry PRIVATE ${BERRY_INCDIR})
+  target_compile_options(libberry PRIVATE ${BERRY_FLAGS})
+  add_dependencies(libberry berry_coc)
+  nuttx_export_header(TARGET libberry INCLUDE_DIRECTORIES ${BERRY_DIR}/src)
+
+  set_property(
+    TARGET nuttx
+    APPEND
+    PROPERTY NUTTX_INCLUDE_DIRECTORIES ${BERRY_DIR}/src)
+
+  nuttx_add_application(
+    MODULE
+    ${CONFIG_INTERPRETERS_BERRY}
+    NAME
+    ${CONFIG_INTERPRETERS_BERRY_PROGNAME}
+    STACKSIZE
+    ${CONFIG_INTERPRETERS_BERRY_STACKSIZE}
+    PRIORITY
+    ${CONFIG_INTERPRETERS_BERRY_PRIORITY}
+    SRCS
+    ${BERRY_DIR}/default/berry.c
+    INCLUDE_DIRECTORIES
+    ${BERRY_INCDIR}
+    COMPILE_FLAGS
+    ${BERRY_FLAGS}
+    DEPENDS
+    libberry
+    berry_coc)
+
+endif()
diff --git a/interpreters/berry/Kconfig b/interpreters/berry/Kconfig
new file mode 100644
index 000000000..805c61866
--- /dev/null
+++ b/interpreters/berry/Kconfig
@@ -0,0 +1,43 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config INTERPRETERS_BERRY
+	tristate "Berry scripting language"
+	default n
+	depends on ARCH_SETJMP_H
+	depends on LIBC_FLOATINGPOINT
+	depends on SYSTEM_SYSTEM
+	---help---
+		Enable the Berry embedded scripting language as an NSH built-in
+		command.  Berry provides a small ANSI C99 compiler, register-based
+		virtual machine, garbage collector, file I/O, bytecode loading and
+		saving, and built-in modules.
+
+		The default NuttX configuration keeps Berry shared-library loading
+		disabled so boards do not need CONFIG_LIBC_DLFCN.  The math module
+		is enabled, so select a NuttX math library or provide one from the
+		toolchain.
+
+if INTERPRETERS_BERRY
+
+config INTERPRETERS_BERRY_PROGNAME
+	string "Berry program name"
+	default "berry"
+	---help---
+		The command name used to start the Berry interpreter.
+
+config INTERPRETERS_BERRY_PRIORITY
+	int "Berry interpreter priority"
+	default 100
+	---help---
+		Task priority of the Berry interpreter main task.
+
+config INTERPRETERS_BERRY_STACKSIZE
+	int "Berry interpreter stack size"
+	default 12288
+	---help---
+		Size of the stack allocated for the Berry interpreter main task.
+
+endif # INTERPRETERS_BERRY
diff --git a/interpreters/berry/Make.defs b/interpreters/berry/Make.defs
new file mode 100644
index 000000000..48a5e64ef
--- /dev/null
+++ b/interpreters/berry/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/interpreters/berry/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_INTERPRETERS_BERRY),)
+CONFIGURED_APPS += $(APPDIR)/interpreters/berry
+endif
diff --git a/interpreters/berry/Makefile b/interpreters/berry/Makefile
new file mode 100644
index 000000000..6fd563162
--- /dev/null
+++ b/interpreters/berry/Makefile
@@ -0,0 +1,97 @@
+############################################################################
+# apps/interpreters/berry/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+BERRY_COMMIT_ID  = 4db341475df9e9ad18e6741ef978b4c467690e09
+BERRY_UNPACK     = berry
+BERRY_ARCHIVE    = berry-$(BERRY_COMMIT_ID).zip
+BERRY_URL_BASE   = https://github.com/berry-lang/berry/archive/
+BERRY_URL        = $(BERRY_URL_BASE)/$(BERRY_COMMIT_ID).zip
+BERRY_CONFIG     = include$(DELIM)berry_conf.h
+BERRY_COC        = $(BERRY_UNPACK)$(DELIM)tools$(DELIM)coc$(DELIM)coc
+BERRY_GENERATE   = $(BERRY_UNPACK)$(DELIM)generate
+BERRY_GEN_STAMP  = $(BERRY_GENERATE)$(DELIM).generated
+
+BERRY_SRCS = be_api.c be_baselib.c be_bytecode.c be_byteslib.c
+BERRY_SRCS += be_class.c be_code.c be_debug.c be_debuglib.c be_exec.c
+BERRY_SRCS += be_filelib.c be_func.c be_gc.c be_gclib.c be_globallib.c
+BERRY_SRCS += be_introspectlib.c be_jsonlib.c be_lexer.c be_libs.c
+BERRY_SRCS += be_list.c be_listlib.c be_map.c be_maplib.c be_mathlib.c
+BERRY_SRCS += be_mem.c be_module.c be_object.c be_oslib.c be_parser.c
+BERRY_SRCS += be_rangelib.c be_repl.c be_solidifylib.c be_strictlib.c
+BERRY_SRCS += be_string.c be_strlib.c be_syslib.c be_timelib.c
+BERRY_SRCS += be_undefinedlib.c be_var.c be_vector.c be_vm.c
+
+CSRCS = $(BERRY_SRCS)
+CSRCS += be_modtab.c be_port.c
+
+MAINSRC = berry.c
+
+VPATH += $(BERRY_UNPACK)$(DELIM)src
+VPATH += $(BERRY_UNPACK)$(DELIM)default
+DEPPATH += --dep-path $(BERRY_UNPACK)$(DELIM)src
+DEPPATH += --dep-path $(BERRY_UNPACK)$(DELIM)default
+
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)interpreters$(DELIM)berry$(DELIM)include
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)interpreters$(DELIM)berry$(DELIM)$(BERRY_UNPACK)$(DELIM)src
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)interpreters$(DELIM)berry$(DELIM)$(BERRY_UNPACK)$(DELIM)default
+CFLAGS += -Wno-unused-but-set-variable
+
+PROGNAME  = $(CONFIG_INTERPRETERS_BERRY_PROGNAME)
+PRIORITY  = $(CONFIG_INTERPRETERS_BERRY_PRIORITY)
+STACKSIZE = $(CONFIG_INTERPRETERS_BERRY_STACKSIZE)
+MODULE    = $(CONFIG_INTERPRETERS_BERRY)
+
+$(BERRY_ARCHIVE):
+	$(Q) echo "Downloading $(BERRY_ARCHIVE)"
+	$(Q) curl -L $(BERRY_URL) -o $(BERRY_ARCHIVE)
+
+$(BERRY_UNPACK): $(BERRY_ARCHIVE)
+	$(Q) echo "Unpacking $(BERRY_ARCHIVE) to $(BERRY_UNPACK)"
+	$(Q) unzip -q -o $(BERRY_ARCHIVE)
+	$(call DELDIR, $(BERRY_UNPACK))
+	$(Q) mv berry-$(BERRY_COMMIT_ID) $(BERRY_UNPACK)
+	$(Q) patch -l -d $(BERRY_UNPACK) -p1 < 0001-Fix-Berry-default-port-for-NuttX.patch
+
+$(BERRY_GEN_STAMP): $(BERRY_UNPACK) $(BERRY_CONFIG)
+	$(Q) echo "Generating Berry constant objects"
+	$(Q) mkdir -p $(BERRY_GENERATE)
+	$(Q) python3 $(BERRY_COC) -o $(BERRY_GENERATE) \
+		$(BERRY_UNPACK)$(DELIM)src \
+		$(BERRY_UNPACK)$(DELIM)default \
+		-c $(BERRY_CONFIG)
+	$(Q) touch $(BERRY_GEN_STAMP)
+
+ifeq ($(wildcard $(BERRY_UNPACK)/.git),)
+context:: $(BERRY_GEN_STAMP)
+endif
+
+depend:: $(BERRY_GEN_STAMP)
+
+distclean::
+ifeq ($(wildcard $(BERRY_UNPACK)/.git),)
+	$(call DELDIR, $(BERRY_UNPACK))
+	$(call DELFILE, $(BERRY_ARCHIVE))
+endif
+
+include $(APPDIR)/Application.mk
diff --git a/interpreters/berry/include/berry_conf.h b/interpreters/berry/include/berry_conf.h
new file mode 100644
index 000000000..633d9cdc9
--- /dev/null
+++ b/interpreters/berry/include/berry_conf.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+ * apps/interpreters/berry/include/berry_conf.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INTERPRETERS_BERRY_INCLUDE_BERRY_CONF_H
+#define __APPS_INTERPRETERS_BERRY_INCLUDE_BERRY_CONF_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <assert.h>
+#include <stdlib.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define BE_DEBUG                        0
+#define BE_INTGER_TYPE                  2
+#define BE_USE_SINGLE_FLOAT             0
+#define BE_BYTES_MAX_SIZE               (32 * 1024)
+#define BE_USE_PRECOMPILED_OBJECT       1
+#define BE_DEBUG_SOURCE_FILE            1
+#define BE_DEBUG_RUNTIME_INFO           1
+#define BE_DEBUG_VAR_INFO               1
+#define BE_USE_PERF_COUNTERS            1
+#define BE_VM_OBSERVABILITY_SAMPLING    20
+#define BE_STACK_TOTAL_MAX              20000
+#define BE_STACK_FREE_MIN               10
+#define BE_STACK_START                  50
+#define BE_CONST_SEARCH_SIZE            50
+#define BE_USE_STR_HASH_CACHE           0
+#define BE_USE_FILE_SYSTEM              1
+#define BE_USE_SCRIPT_COMPILER          1
+#define BE_USE_BYTECODE_SAVER           1
+#define BE_USE_BYTECODE_LOADER          1
+#define BE_USE_SHARED_LIB               0
+#define BE_USE_OVERLOAD_HASH            1
+#define BE_USE_DEBUG_HOOK               0
+#define BE_USE_DEBUG_GC                 0
+#define BE_USE_DEBUG_STACK              0
+#define BE_USE_MEM_ALIGNED              0
+
+#define BE_USE_STRING_MODULE            1
+#define BE_USE_JSON_MODULE              1
+#define BE_USE_MATH_MODULE              1
+#define BE_USE_TIME_MODULE              1
+#define BE_USE_OS_MODULE                1
+#define BE_USE_GLOBAL_MODULE            1
+#define BE_USE_SYS_MODULE               1
+#define BE_USE_DEBUG_MODULE             1
+#define BE_USE_GC_MODULE                1
+#define BE_USE_SOLIDIFY_MODULE          1
+#define BE_USE_INTROSPECT_MODULE        1
+#define BE_USE_STRICT_MODULE            1
+
+#define BE_EXPLICIT_ABORT               abort
+#define BE_EXPLICIT_EXIT                exit
+#define BE_EXPLICIT_MALLOC              malloc
+#define BE_EXPLICIT_FREE                free
+#define BE_EXPLICIT_REALLOC             realloc
+
+#define be_assert(expr)                 assert(expr)
+
+#endif /* __APPS_INTERPRETERS_BERRY_INCLUDE_BERRY_CONF_H */

From 4c560ef0a202aa00657e67f4572aee0ed071bd0f Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Thu, 25 Jun 2026 03:23:52 +0800
Subject: [PATCH 450/568] apps: Replace O_RDOK with O_RDONLY after alias
 removal

The O_RDOK/O_WROK aliases have been removed from fcntl.h.  Replace
all remaining O_RDOK usage with O_RDONLY in the apps repository.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 examples/configdata/configdata_main.c       | 2 +-
 nshlib/nsh_script.c                         | 2 +-
 platform/mikroe-stm32f4/mikroe_configdata.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c
index 3218569f6..007a9d162 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -664,7 +664,7 @@ int main(int argc, FAR char *argv[])
 
   /* Open the /dev/config device */
 
-  g_fd = open("/dev/config", O_RDOK);
+  g_fd = open("/dev/config", O_RDONLY);
   if (g_fd == -1)
     {
       printf("ERROR: Failed to open /dev/config %d\n", -errno);
diff --git a/nshlib/nsh_script.c b/nshlib/nsh_script.c
index d1f1d369e..20114efc0 100644
--- a/nshlib/nsh_script.c
+++ b/nshlib/nsh_script.c
@@ -121,7 +121,7 @@ int nsh_script(FAR struct nsh_vtbl_s *vtbl, FAR const FAR char *cmd,
 
       /* Open the file containing the script */
 
-      vtbl->np.np_fd = open(fullpath, O_RDOK | O_CLOEXEC);
+      vtbl->np.np_fd = open(fullpath, O_RDONLY | O_CLOEXEC);
       if (vtbl->np.np_fd < 0)
         {
           if (log)
diff --git a/platform/mikroe-stm32f4/mikroe_configdata.c b/platform/mikroe-stm32f4/mikroe_configdata.c
index d65e695c7..ab786c625 100644
--- a/platform/mikroe-stm32f4/mikroe_configdata.c
+++ b/platform/mikroe-stm32f4/mikroe_configdata.c
@@ -86,7 +86,7 @@ int platform_setconfig(enum config_data_e id, int instance,
 
   /* Try to open the /dev/config device file */
 
-  if ((fd = open("/dev/config", O_RDOK)) == -1)
+  if ((fd = open("/dev/config", O_RDONLY)) == -1)
     {
       /* Error opening the config device */
 
@@ -209,7 +209,7 @@ int platform_getconfig(enum config_data_e id, int instance,
 
   /* Try to open the /dev/config device file */
 
-  if ((fd = open("/dev/config", O_RDOK)) == -1)
+  if ((fd = open("/dev/config", O_RDONLY)) == -1)
     {
       /* Error opening the config device */
 

From d172f81eccd24475850e66204cb60af2164dc04d Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Mon, 29 Jun 2026 09:53:20 +0800
Subject: [PATCH 451/568]  apps: Replace O_RDOK with O_RDONLY after alias
 removal

The O_RDOK/O_WROK aliases have been removed from fcntl.h.  Replace
all remaining O_RDOK usage with O_RDONLY in the apps repository.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 examples/userfs/userfs_main.c | 2 +-
 system/usbmsc/usbmsc_main.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/userfs/userfs_main.c b/examples/userfs/userfs_main.c
index 0a6b89cee..d1d64fa80 100644
--- a/examples/userfs/userfs_main.c
+++ b/examples/userfs/userfs_main.c
@@ -245,7 +245,7 @@ static int ufstest_open(FAR void *volinfo, FAR const char *relpath,
           file->inuse = 0;
         }
 
-      if ((oflags & (O_WROK | O_APPEND)) == (O_WROK | O_APPEND))
+      if ((oflags & (O_WRONLY | O_APPEND)) == (O_WRONLY | O_APPEND))
         {
           opriv->pos = file->inuse;
         }
diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c
index 3cddcc230..e625e003b 100644
--- a/system/usbmsc/usbmsc_main.c
+++ b/system/usbmsc/usbmsc_main.c
@@ -581,7 +581,7 @@ int main(int argc, FAR char *argv[])
              num_luns, luns[num_luns].path);
 
       ret = usbmsc_bindlun(handle, luns[num_luns].path, 0, 0, 0,
-                           luns[num_luns].flags & O_WROK ? false : true);
+                           luns[num_luns].flags & O_WRONLY ? false : true);
       if (ret < 0)
         {
           printf("mcsonn_main: usbmsc_bindlun failed for LUN %d using %s: "

From 535ecd864043574f427a365e2e66552c94a70ae0 Mon Sep 17 00:00:00 2001
From: Michal Lenc <michallenc@seznam.cz>
Date: Mon, 29 Jun 2026 08:31:36 +0200
Subject: [PATCH 452/568] testing/libc/fopencookie/fopencookie.c: fix
 spellcheck

succesfull => successful

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
---
 testing/libc/fopencookie/fopencookie.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/libc/fopencookie/fopencookie.c b/testing/libc/fopencookie/fopencookie.c
index 46ce595fd..380c29803 100644
--- a/testing/libc/fopencookie/fopencookie.c
+++ b/testing/libc/fopencookie/fopencookie.c
@@ -171,7 +171,7 @@ static int fopencookie_write_test(FILE *stream)
     }
 
   printf("fopencookie_write_test: written buffer: %.*s\n", n, correctbuf);
-  printf("fopencookie_write_test: succesfull\n");
+  printf("fopencookie_write_test: successful\n");
   return 0;
 }
 
@@ -202,7 +202,7 @@ static int fopencookie_read_test(FILE *stream)
     }
 
   printf("fopencookie_read_test: read buffer: %.*s\n", n, correctbuf);
-  printf("fopencookie_read_test: succesfull\n");
+  printf("fopencookie_read_test: successful\n");
   return 0;
 }
 
@@ -240,7 +240,7 @@ static int fopencookie_seek_test(FILE *stream)
       printf("fopencookie_seek_test: pos %d, char %c\n", i, buf[i]);
     }
 
-  printf("fopencookie_seek_test: succesfull\n");
+  printf("fopencookie_seek_test: successful\n");
 
   fseek(stream, 0, SEEK_SET);
   return 0;
@@ -301,7 +301,7 @@ int main(int argc, FAR char *argv[])
       goto fopencookie_ret;
     }
 
-  printf("fopencokie tests were succesfull.\n");
+  printf("fopencokie tests were successful.\n");
 
 fopencookie_ret:
   fclose(stream);

From c503843e38322eb381d4cff86d667fae001c62ef Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Thu, 25 Jun 2026 20:08:53 +0800
Subject: [PATCH 453/568] netutils/rexecd: add -t option to serve connections
 without a thread

By default rexecd spawns a detached worker thread per accepted connection
to allow concurrent sessions. Add a "-t" runtime option to instead handle
each connection inline in the main task, avoiding the per-connection
worker stack (CONFIG_NETUTILS_REXECD_STACKSIZE) allocation from the heap.
This matters on low-memory targets with limited free heap.

With "-t", connections are served strictly one at a time: a long-running
or interactive command blocks the accept loop until it finishes. Without
it, the existing thread-per-connection behaviour is unchanged.

Assisted-by: GitHubCopilot:claude-4.8-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 netutils/rexecd/rexecd.c | 63 +++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/netutils/rexecd/rexecd.c b/netutils/rexecd/rexecd.c
index 13864a841..2ae489b6d 100644
--- a/netutils/rexecd/rexecd.c
+++ b/netutils/rexecd/rexecd.c
@@ -30,6 +30,7 @@
 #include <pthread.h>
 #include <netpacket/rpmsg.h>
 #include <sys/socket.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -164,11 +165,13 @@ errout:
 
 static void usage(FAR const char *progname)
 {
-  fprintf(stderr, "Usage: %s [-4|-6|-r]\n", progname);
+  fprintf(stderr, "Usage: %s [-4|-6|-r] [-t]\n", progname);
   fprintf(stderr, "Remote Execution Daemon:\n"
                   " -4, Specify address family to AF_INET(default)\n"
                   " -6, Specify address family to AF_INET6\n"
-                  " -r, Specify address family to AF_RPMSG\n");
+                  " -r, Specify address family to AF_RPMSG\n"
+                  " -t, Serve each connection inline without spawning a"
+                  " per-connection thread (saves heap, no concurrency)\n");
   exit(EXIT_FAILURE);
 }
 
@@ -177,6 +180,7 @@ int main(int argc, FAR char **argv)
   struct sockaddr_storage addr;
   pthread_attr_t attr;
   pthread_t tid;
+  bool threadless = false;
   int family;
   int option;
   int serv;
@@ -184,7 +188,7 @@ int main(int argc, FAR char **argv)
   int ret;
 
   family = AF_INET;
-  while ((option = getopt(argc, argv, "46r")) != ERROR)
+  while ((option = getopt(argc, argv, "46rt")) != ERROR)
     {
       switch (option)
         {
@@ -197,6 +201,9 @@ int main(int argc, FAR char **argv)
           case 'r':
             family = AF_RPMSG;
             break;
+          case 't':
+            threadless = true;
+            break;
           default:
             usage(argv[0]);
         }
@@ -241,22 +248,26 @@ int main(int argc, FAR char **argv)
       goto err_out;
     }
 
-  ret = pthread_attr_init(&attr);
-  if (ret != 0)
+  if (!threadless)
     {
-      goto err_out;
-    }
+      ret = pthread_attr_init(&attr);
+      if (ret != 0)
+        {
+          goto err_out;
+        }
 
-  ret = pthread_attr_setstacksize(&attr, CONFIG_NETUTILS_REXECD_STACKSIZE);
-  if (ret != 0)
-    {
-      goto attr_out;
-    }
+      ret = pthread_attr_setstacksize(&attr,
+                                      CONFIG_NETUTILS_REXECD_STACKSIZE);
+      if (ret != 0)
+        {
+          goto attr_out;
+        }
 
-  ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-  if (ret != 0)
-    {
-      goto attr_out;
+      ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+      if (ret != 0)
+        {
+          goto attr_out;
+        }
     }
 
   while (1)
@@ -275,15 +286,27 @@ int main(int argc, FAR char **argv)
             }
         }
 
-      ret = pthread_create(&tid, &attr, doit, (pthread_addr_t)sock);
-      if (ret < 0)
+      if (threadless)
         {
-          close(sock);
+          doit((pthread_addr_t)(long)sock);
+        }
+      else
+        {
+          ret = pthread_create(&tid, &attr, doit,
+                               (pthread_addr_t)(long)sock);
+          if (ret < 0)
+            {
+              close(sock);
+            }
         }
     }
 
 attr_out:
-  pthread_attr_destroy(&attr);
+  if (!threadless)
+    {
+      pthread_attr_destroy(&attr);
+    }
+
 err_out:
   syslog(LOG_ERR, "rexecd failed ret:%d errno:%d\n", ret, errno);
   close(serv);

From f57aa7b4cf29520c988652f95bface00721e18e9 Mon Sep 17 00:00:00 2001
From: hanzhijian <hanzhijian@zepp.com>
Date: Mon, 29 Jun 2026 19:21:51 +0800
Subject: [PATCH 454/568] nshlib/nsh_fscmds: Display modification time in ls -l
 output

Fixes #17063

Add modification time display to ls -l long format output.
The timestamp is shown as 'YYYY-MM-DD HH:MM' between the permission
string and the file size, following the ISO long-iso format.

Files with st_mtime == 0 (e.g., procfs, tmpfs pseudo-entries) skip
the timestamp display to avoid showing a meaningless epoch time.

Signed-off-by: hanzhijian <hanzhijian@zepp.com>
---
 nshlib/nsh_fscmds.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 797048f6c..952556ce1 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -37,6 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <time.h>
 #include <string.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -599,6 +600,19 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
               nsh_output(vtbl, "%12" PRIdOFF, buf.st_size);
             }
         }
+
+      /* Display modification time in long format */
+
+      if ((lsflags & LSFLAGS_LONG) != 0 && buf.st_mtime != 0)
+        {
+          struct tm tm;
+          char timebuf[20];
+          time_t mtime = (time_t)buf.st_mtime;
+
+          gmtime_r(&mtime, &tm);
+          strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M", &tm);
+          nsh_output(vtbl, " %s", timebuf);
+        }
     }
 
   /* Then provide the filename that is common to normal and verbose output */

From 9b51035300f15afde063c0cc5413d8ce2b728bf0 Mon Sep 17 00:00:00 2001
From: hanzhijian <hanzhijian@zepp.com>
Date: Tue, 30 Jun 2026 16:17:50 +0800
Subject: [PATCH 455/568] nshlib/nsh_fscmds: Fix potential NULL pointer
 dereferences

Fix two potential NULL pointer dereferences in nsh_fscmds.c:

1. fdinfo_callback: asprintf() failure left filepath potentially
   NULL, which was then passed to nsh_catfile(). Add early return
   on asprintf failure.

2. cmd_cat: malloc(BUFSIZ) for stdin reading was used without
   checking the return value. Add NULL check with -ENOMEM return.

Also fix a typo in error message: 'nsh_catfaile' -> 'nsh_catfile'.

Signed-off-by: hanzhijian <hanzhijian@zepp.com>
---
 nshlib/nsh_fscmds.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 952556ce1..a3423494c 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -753,13 +753,14 @@ static int fdinfo_callback(FAR struct nsh_vtbl_s *vtbl,
   if (ret < 0)
     {
       nsh_error(vtbl, g_fmtcmdfailed, "fdinfo", "asprintf", NSH_ERRNO);
+      return ret;
     }
 
   nsh_output(vtbl, "\npid:%s", entryp->d_name);
   ret = nsh_catfile(vtbl, "fdinfo", filepath);
   if (ret < 0)
     {
-      nsh_error(vtbl, g_fmtcmdfailed, "fdinfo", "nsh_catfaile", NSH_ERRNO);
+      nsh_error(vtbl, g_fmtcmdfailed, "fdinfo", "nsh_catfile", NSH_ERRNO);
     }
 
   free(filepath);
@@ -871,6 +872,10 @@ int cmd_cat(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   if (argc == 1)
     {
       char *buf = malloc(BUFSIZ);
+      if (buf == NULL)
+        {
+          return -ENOMEM;
+        }
 
       /* Dump from input */
 

From fc25af7cd7595242d55d07583be723695ba4b945 Mon Sep 17 00:00:00 2001
From: Frederick Blais <fred_blais5@hotmail.com>
Date: Sun, 28 Jun 2026 12:10:25 -0400
Subject: [PATCH 456/568] interpreters/berry: Patch CRLF upstream source
 directly

Berry's downloaded default/berry.c uses CRLF line endings, while the local NuttX patch was LF. Fresh Linux and CMake builds failed when patch saw the line-ending mismatch.

Regenerate the local Berry patch against the pinned upstream CRLF source and apply it directly in both Make and CMake fetch paths. This keeps the integration working until the Berry-side change is merged upstream and the pinned commit can be updated.

Signed-off-by: Frederick Blais <fred_blais5@hotmail.com>
---
 interpreters/berry/.gitattributes             |  1 +
 ...001-Fix-Berry-default-port-for-NuttX.patch | 78 +++++++++++++------
 2 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 interpreters/berry/.gitattributes

diff --git a/interpreters/berry/.gitattributes b/interpreters/berry/.gitattributes
new file mode 100644
index 000000000..0a83e0afa
--- /dev/null
+++ b/interpreters/berry/.gitattributes
@@ -0,0 +1 @@
+0001-Fix-Berry-default-port-for-NuttX.patch whitespace=cr-at-eol,-blank-at-eol
diff --git a/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch b/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch
index 39fc4972e..5e720d07d 100644
--- a/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch
+++ b/interpreters/berry/0001-Fix-Berry-default-port-for-NuttX.patch
@@ -1,27 +1,57 @@
 diff --git a/default/berry.c b/default/berry.c
-index d6ea5d1..bb95fc7 100644
+index 203773f..0df2a99 100644
 --- a/default/berry.c
 +++ b/default/berry.c
-@@ -22 +22,3 @@
--#if defined(__linux)
-+#if defined(__NuttX__)
-+    #define OS_NAME   "NuttX"
-+#elif defined(__linux)
-@@ -103 +105 @@
--    const char *optarg;
-+    const char *optvalue;
-@@ -148 +150 @@
--                opt->optarg = argv[opt->idx++]; /* save the argument */
-+                opt->optvalue = argv[opt->idx++]; /* save the argument */
-@@ -151 +153 @@
--            opt->optarg = NULL;
-+            opt->optvalue = NULL;
-@@ -272 +274 @@
--            opt->modulepath = opt->optarg;
-+            opt->modulepath = opt->optvalue;
-@@ -277 +279 @@
--            opt->src = opt->optarg;
-+            opt->src = opt->optvalue;
-@@ -281 +283 @@
--            opt->dst = opt->optarg;
-+            opt->dst = opt->optvalue;
+@@ -19,7 +19,9 @@
+ #endif
+ 
+ /* detect operating system name */
+-#if defined(__linux)
++#if defined(__NuttX__)
++    #define OS_NAME   "NuttX"
++#elif defined(__linux)
+     #define OS_NAME   "Linux"
+ #elif defined(__unix)
+     #define OS_NAME   "Unix"
+@@ -98,7 +100,7 @@
+ struct arg_opts {
+     int idx;
+     const char *pattern;
+-    const char *optarg;
++    const char *optvalue;
+     const char *errarg;
+     const char *src;
+     const char *dst;
+@@ -143,10 +145,10 @@ static int arg_getopt(struct arg_opts *opt, int argc, char *argv[])
+             /* the '?' indicates an optional argument after the option */
+             if (++opt->idx < argc && res != NULL
+                 && res[1] == '?' && *argv[opt->idx] != '-') {
+-                opt->optarg = argv[opt->idx++]; /* save the argument */
++                opt->optvalue = argv[opt->idx++]; /* save the argument */
+                 return *res;
+             }
+-            opt->optarg = NULL;
++            opt->optvalue = NULL;
+             opt->errarg = arg;
+             return res != NULL ? *res : '?';
+         }
+@@ -267,16 +269,16 @@ static int parse_arg(struct arg_opts *opt, int argc, char *argv[])
+         case 's': args |= arg_s; break;
+         case 'm':
+             args |= arg_m;
+-            opt->modulepath = opt->optarg;
++            opt->modulepath = opt->optvalue;
+             break;
+         case '?': return args | arg_err;
+         case 'c':
+             args |= arg_c;
+-            opt->src = opt->optarg;
++            opt->src = opt->optvalue;
+             break;
+         case 'o':
+             args |= arg_o;
+-            opt->dst = opt->optarg;
++            opt->dst = opt->optvalue;
+             break;
+         default:
+             break;

From 5ead824fff5acf8ab57891b3b7c1054842514a4a Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 28 Jun 2026 02:21:28 +0800
Subject: [PATCH 457/568] apps: Fix O_ACCMODE bitmask checks after Linux flag
 alignment

After aligning NuttX open() flag constants with Linux (O_RDONLY=0,
O_WRONLY=1, O_RDWR=2), code that used '(flags & O_RDONLY)' or
'(flags & O_WRONLY)' as a bitmask check is broken because O_RDONLY
is now 0.  Fix by using '(flags & O_ACCMODE)' comparisons instead.

  - usrsocktest: replace 'flags & O_RDWR' with 'flags & O_ACCMODE'
    in fcntl F_GETFL assertions
  - dd: verify mode used '(oflags & O_RDONLY)' to detect verify;
    replace with '(oflags & O_ACCMODE) == O_RDWR'
  - dpopen: replace '(oflag & O_RDWR) == O_RDWR' with
    '(oflag & O_ACCMODE) == O_RDWR'
  - usbmsc: replace 'flags & O_WRONLY' with
    '(flags & O_ACCMODE) == O_RDONLY'
  - fcntl_test: replace '(flags & O_WRONLY) == 0' with
    '(flags & O_ACCMODE) == O_RDONLY'

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 .../usrsocktest/usrsocktest_noblock_connect.c | 44 +++++++++----------
 .../usrsocktest/usrsocktest_noblock_recv.c    |  8 ++--
 .../usrsocktest/usrsocktest_noblock_send.c    |  8 ++--
 examples/usrsocktest/usrsocktest_poll.c       | 12 ++---
 .../usrsocktest_remote_disconnect.c           | 12 ++---
 system/dd/dd_main.c                           |  7 +--
 system/popen/dpopen.c                         |  4 +-
 system/usbmsc/usbmsc_main.c                   |  2 +-
 .../kernel/syscall/cases/fcntl_test.c         | 11 ++---
 9 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/examples/usrsocktest/usrsocktest_noblock_connect.c b/examples/usrsocktest/usrsocktest_noblock_connect.c
index bc7264bfe..32906e2a2 100644
--- a/examples/usrsocktest/usrsocktest_noblock_connect.c
+++ b/examples/usrsocktest/usrsocktest_noblock_connect.c
@@ -120,13 +120,13 @@ TEST(no_block_connect, instant_connect)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Do connect, should succeed instantly. */
@@ -188,13 +188,13 @@ TEST(no_block_connect, delayed_connect)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
@@ -290,13 +290,13 @@ TEST(no_block_connect, close_not_connected)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
@@ -363,13 +363,13 @@ TEST(no_block_connect, early_drop)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
@@ -443,24 +443,24 @@ TEST(no_block_connect, multiple)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   flags = fcntl(sd2, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd2, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd2, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempts, daemon delays actual connection until
@@ -552,24 +552,24 @@ TEST(no_block_connect, multiple)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   flags = fcntl(sd2, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd2, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd2, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempts, daemon delays actual connection until
@@ -637,24 +637,24 @@ TEST(no_block_connect, multiple)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   flags = fcntl(sd2, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd2, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd2, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
@@ -758,13 +758,13 @@ TEST(no_block_connect, basic_daemon_dup2)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
diff --git a/examples/usrsocktest/usrsocktest_noblock_recv.c b/examples/usrsocktest/usrsocktest_noblock_recv.c
index 146471d6f..ffacefde3 100644
--- a/examples/usrsocktest/usrsocktest_noblock_recv.c
+++ b/examples/usrsocktest/usrsocktest_noblock_recv.c
@@ -114,13 +114,13 @@ static void receive(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Do connect, should succeed instantly. */
@@ -310,13 +310,13 @@ static void delayed_connect(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
diff --git a/examples/usrsocktest/usrsocktest_noblock_send.c b/examples/usrsocktest/usrsocktest_noblock_send.c
index 7b039f3ae..8526c29b2 100644
--- a/examples/usrsocktest/usrsocktest_noblock_send.c
+++ b/examples/usrsocktest/usrsocktest_noblock_send.c
@@ -110,13 +110,13 @@ static void _send(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Do connect, should succeed instantly. */
@@ -231,13 +231,13 @@ static void connect_send(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Launch connect attempt, daemon delays actual connection until
diff --git a/examples/usrsocktest/usrsocktest_poll.c b/examples/usrsocktest/usrsocktest_poll.c
index 8ab7f6ce0..66cda8aa6 100644
--- a/examples/usrsocktest/usrsocktest_poll.c
+++ b/examples/usrsocktest/usrsocktest_poll.c
@@ -115,13 +115,13 @@ static void connectreceive(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* poll for input (instant timeout). */
@@ -321,13 +321,13 @@ static void connectsend(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* poll for input (instant timeout). */
@@ -454,13 +454,13 @@ static void daemonabort(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* poll for input (instant timeout). */
diff --git a/examples/usrsocktest/usrsocktest_remote_disconnect.c b/examples/usrsocktest/usrsocktest_remote_disconnect.c
index 79ccbfefb..a49acc03f 100644
--- a/examples/usrsocktest/usrsocktest_remote_disconnect.c
+++ b/examples/usrsocktest/usrsocktest_remote_disconnect.c
@@ -151,13 +151,13 @@ static void unreachable(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Try connect, connection in progress. */
@@ -670,13 +670,13 @@ static void remote_disconnect_poll(struct usrsocktest_daemon_conf_s *dconf)
 
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
   ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
   TEST_ASSERT_EQUAL(0, ret);
   flags = fcntl(sd, F_GETFL, 0);
   TEST_ASSERT_TRUE(flags >= 0);
-  TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+  TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
   TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
   /* Poll for input (instant timeout). */
@@ -797,13 +797,13 @@ static void remote_disconnect_poll2(struct usrsocktest_daemon_conf_s *dconf)
 
       flags = fcntl(sd, F_GETFL, 0);
       TEST_ASSERT_TRUE(flags >= 0);
-      TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+      TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
       TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
       ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
       TEST_ASSERT_EQUAL(0, ret);
       flags = fcntl(sd, F_GETFL, 0);
       TEST_ASSERT_TRUE(flags >= 0);
-      TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+      TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
       TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
 
       /* Poll for input (instant timeout). */
diff --git a/system/dd/dd_main.c b/system/dd/dd_main.c
index 17138371b..be9aba342 100644
--- a/system/dd/dd_main.c
+++ b/system/dd/dd_main.c
@@ -356,7 +356,7 @@ int main(int argc, FAR char **argv)
         }
       else if (strncmp(argv[i], "verify", 6) == 0)
         {
-          dd.oflags |= O_RDONLY;
+          dd.oflags = (dd.oflags & ~O_ACCMODE) | O_RDWR;
         }
       else if (strncmp(argv[i], "conv=", 5) == 0)
         {
@@ -409,7 +409,8 @@ int main(int argc, FAR char **argv)
 
   /* If verify enabled, infile and outfile are mandatory */
 
-  if ((dd.oflags & O_RDONLY) && (infile == NULL || outfile == NULL))
+  if ((dd.oflags & O_ACCMODE) == O_RDWR &&
+      (infile == NULL || outfile == NULL))
     {
       fprintf(stderr, "%s: invalid parameters: %s\n", g_dd,
           strerror(EINVAL));
@@ -519,7 +520,7 @@ int main(int argc, FAR char **argv)
          / ((double)elapsed / USEC_PER_SEC)));
 #endif
 
-  if (ret == 0 && (dd.oflags & O_RDONLY) != 0)
+  if (ret == 0 && (dd.oflags & O_ACCMODE) == O_RDWR)
     {
       ret = dd_verify(&dd);
     }
diff --git a/system/popen/dpopen.c b/system/popen/dpopen.c
index 785fcc202..8e57371b7 100644
--- a/system/popen/dpopen.c
+++ b/system/popen/dpopen.c
@@ -112,7 +112,7 @@ int dpopen(FAR const char *command, int oflag, FAR pid_t *pid)
    * pipe; fd[1] refers to the write end of the pipe.
    */
 
-  if ((oflag & O_RDWR) == O_RDWR)
+  if ((oflag & O_ACCMODE) == O_RDWR)
     {
 #if defined(CONFIG_NET_LOCAL) && defined(CONFIG_NET_LOCAL_STREAM)
       /* Create a socketpair for bidirectional communication */
@@ -215,7 +215,7 @@ int dpopen(FAR const char *command, int oflag, FAR pid_t *pid)
 
   /* Redirect child's stdin or stdout to the pipe */
 
-  if ((oflag & O_RDWR) == O_RDWR)
+  if ((oflag & O_ACCMODE) == O_RDWR)
     {
       errcode = posix_spawn_file_actions_adddup2(&file_actions, childfd,
                                                  STDIN_FILENO);
diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c
index e625e003b..97f2ca495 100644
--- a/system/usbmsc/usbmsc_main.c
+++ b/system/usbmsc/usbmsc_main.c
@@ -581,7 +581,7 @@ int main(int argc, FAR char *argv[])
              num_luns, luns[num_luns].path);
 
       ret = usbmsc_bindlun(handle, luns[num_luns].path, 0, 0, 0,
-                           luns[num_luns].flags & O_WRONLY ? false : true);
+                           (luns[num_luns].flags & O_ACCMODE) == O_RDONLY);
       if (ret < 0)
         {
           printf("mcsonn_main: usbmsc_bindlun failed for LUN %d using %s: "
diff --git a/testing/testsuites/kernel/syscall/cases/fcntl_test.c b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
index 2737621ce..d86e612d7 100644
--- a/testing/testsuites/kernel/syscall/cases/fcntl_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
@@ -90,35 +90,36 @@ void test_nuttx_syscall_fcntl01(FAR void **state)
   /* //block1: */
 
   flags = fcntl(fd[2], F_GETFL, 0);
-  assert_false((flags & O_WRONLY) == 0);
+  assert_false((flags & O_ACCMODE) == O_RDONLY);
 
   /* Check setting of no_delay flag */
 
   assert_false(fcntl(fd[2], F_SETFL, O_NDELAY) == -1);
 
   flags = fcntl(fd[2], F_GETFL, 0);
-  assert_false((flags & (O_NDELAY | O_WRONLY)) == 0);
+  assert_false((flags & O_NDELAY) == 0 && (flags & O_ACCMODE) == O_RDONLY);
 
   /* Check of setting append flag */
 
   assert_false(fcntl(fd[2], F_SETFL, O_APPEND) == -1);
 
   flags = fcntl(fd[2], F_GETFL, 0);
-  assert_false((flags & (O_APPEND | O_WRONLY)) == 0);
+  assert_false((flags & O_APPEND) == 0 && (flags & O_ACCMODE) == O_RDONLY);
 
   /* Check setting flags together */
 
   assert_false(fcntl(fd[2], F_SETFL, O_NDELAY | O_APPEND) < 0);
 
   flags = fcntl(fd[2], F_GETFL, 0);
-  assert_false((flags & (O_NDELAY | O_APPEND | O_WRONLY)) == 0);
+  assert_false((flags & (O_NDELAY | O_APPEND)) == 0 &&
+               (flags & O_ACCMODE) == O_RDONLY);
 
   /* Check that flags are not cumulative */
 
   assert_false(fcntl(fd[2], F_SETFL, 0) == -1);
 
   flags = fcntl(fd[2], F_GETFL, 0);
-  assert_false((flags & O_WRONLY) == 0);
+  assert_false((flags & O_ACCMODE) == O_RDONLY);
   assert_false((flags = fcntl(fd[2], F_GETFD, 0)) < 0);
   assert_false(flags != 0);
   assert_false((flags = fcntl(fd[2], F_SETFD, 1)) == -1);

From 53ca441b32652d342b906058d24bf82bd2e45b76 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 30 Jun 2026 10:22:59 -0400
Subject: [PATCH 458/568] apps/games/NXDoom: Original Chocolate DOOM source

This commit adds the original Chocolate DOOM source which forms a basis
for the NuttX port of DOOM.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/.devcontainer/.gitignore         |     4 +
 games/NXDoom/.devcontainer/Dockerfile         |    39 +
 games/NXDoom/.devcontainer/devcontainer.json  |    45 +
 .../NXDoom/.devcontainer/initialize-linux.sh  |     9 +
 games/NXDoom/.github/CONTRIBUTING.md          |   101 +
 games/NXDoom/.github/ISSUE_TEMPLATE.md        |    28 +
 games/NXDoom/.github/workflows/cpp-linter.yml |    54 +
 games/NXDoom/.github/workflows/cppcheck.yml   |    23 +
 games/NXDoom/.github/workflows/main.yml       |   152 +
 games/NXDoom/.gitignore                       |    67 +
 games/NXDoom/.gitmodules                      |     3 +
 games/NXDoom/.lvimrc                          |    32 +
 games/NXDoom/.travis.sh                       |    19 +
 games/NXDoom/AUTHORS                          |     7 +
 games/NXDoom/CMakeLists.txt                   |   105 +
 games/NXDoom/CODE_OF_CONDUCT.md               |    74 +
 games/NXDoom/COPYING.md                       |   361 +
 games/NXDoom/ChangeLog                        |     5 +
 games/NXDoom/HACKING.md                       |   256 +
 games/NXDoom/Makefile.am                      |    62 +
 games/NXDoom/NEWS.md                          |  1492 ++
 games/NXDoom/NOT-BUGS.md                      |   149 +
 games/NXDoom/PHILOSOPHY.md                    |   214 +
 games/NXDoom/README.Music.md                  |   173 +
 games/NXDoom/README.Strife.md                 |   124 +
 games/NXDoom/README.md                        |   102 +
 games/NXDoom/RELEASE_NOTES.md                 |    35 +
 games/NXDoom/TODO.md                          |    36 +
 games/NXDoom/autogen.sh                       |     4 +
 games/NXDoom/check-extern.sh                  |     6 +
 games/NXDoom/cmake/FindFluidSynth.cmake       |   106 +
 games/NXDoom/cmake/FindSDL2.cmake             |   114 +
 games/NXDoom/cmake/FindSDL2_mixer.cmake       |    88 +
 games/NXDoom/cmake/FindSDL2_net.cmake         |    88 +
 games/NXDoom/cmake/FindSampleRate.cmake       |    67 +
 games/NXDoom/cmake/Findm.cmake                |    36 +
 games/NXDoom/cmake/config.h.cin               |    12 +
 games/NXDoom/configure.ac                     |   335 +
 games/NXDoom/data/.gitignore                  |     7 +
 games/NXDoom/data/Makefile.am                 |    39 +
 games/NXDoom/data/README                      |    16 +
 games/NXDoom/data/convert-icon                |    72 +
 games/NXDoom/data/doom.ico                    |   Bin 0 -> 43344 bytes
 games/NXDoom/data/doom.png                    |   Bin 0 -> 4551 bytes
 games/NXDoom/data/heretic.ico                 |   Bin 0 -> 44563 bytes
 games/NXDoom/data/heretic.png                 |   Bin 0 -> 5090 bytes
 games/NXDoom/data/hexen.ico                   |   Bin 0 -> 44747 bytes
 games/NXDoom/data/hexen.png                   |   Bin 0 -> 5033 bytes
 games/NXDoom/data/setup.ico                   |   Bin 0 -> 45885 bytes
 games/NXDoom/data/setup.png                   |   Bin 0 -> 5654 bytes
 games/NXDoom/data/strife.ico                  |   Bin 0 -> 44131 bytes
 games/NXDoom/data/strife.png                  |   Bin 0 -> 4966 bytes
 games/NXDoom/data/wadfile.png                 |   Bin 0 -> 8681 bytes
 games/NXDoom/man/.gitignore                   |    16 +
 games/NXDoom/man/CMDLINE.template             |     8 +
 games/NXDoom/man/CMDLINE.template.md          |     8 +
 games/NXDoom/man/INSTALL.template             |   316 +
 games/NXDoom/man/Makefile.am                  |   226 +
 games/NXDoom/man/bash-completion/.gitignore   |     5 +
 games/NXDoom/man/bash-completion/Makefile.am  |    52 +
 .../man/bash-completion/doom.template.in      |    51 +
 .../man/bash-completion/heretic.template.in   |    48 +
 .../man/bash-completion/hexen.template.in     |    45 +
 .../man/bash-completion/strife.template.in    |    48 +
 games/NXDoom/man/default.cfg.template         |    50 +
 games/NXDoom/man/docgen                       |   624 +
 games/NXDoom/man/doom.template                |    45 +
 games/NXDoom/man/environ.man                  |    34 +
 games/NXDoom/man/extra.cfg.template           |    28 +
 games/NXDoom/man/heretic.template             |    47 +
 games/NXDoom/man/hexen.template               |    47 +
 games/NXDoom/man/iwad_paths.man               |    73 +
 games/NXDoom/man/server.template              |    55 +
 games/NXDoom/man/setup.template               |    46 +
 games/NXDoom/man/simplecpp                    |   228 +
 games/NXDoom/man/strife.template              |    91 +
 games/NXDoom/man/wikipages                    |     7 +
 games/NXDoom/opl/.gitignore                   |     7 +
 games/NXDoom/opl/CMakeLists.txt               |    28 +
 games/NXDoom/opl/Makefile.am                  |    21 +
 games/NXDoom/opl/examples/.gitignore          |     7 +
 games/NXDoom/opl/examples/Makefile.am         |     8 +
 games/NXDoom/opl/examples/droplay.c           |   210 +
 games/NXDoom/opl/ioperm_sys.c                 |   355 +
 games/NXDoom/opl/ioperm_sys.h                 |    28 +
 games/NXDoom/opl/opl.c                        |   530 +
 games/NXDoom/opl/opl.h                        |   153 +
 games/NXDoom/opl/opl3.c                       |  1377 ++
 games/NXDoom/opl/opl3.h                       |   150 +
 games/NXDoom/opl/opl_internal.h               |    71 +
 games/NXDoom/opl/opl_linux.c                  |   103 +
 games/NXDoom/opl/opl_obsd.c                   |   118 +
 games/NXDoom/opl/opl_queue.c                  |   285 +
 games/NXDoom/opl/opl_queue.h                  |    39 +
 games/NXDoom/opl/opl_sdl.c                    |   521 +
 games/NXDoom/opl/opl_timer.c                  |   250 +
 games/NXDoom/opl/opl_timer.h                  |    33 +
 games/NXDoom/opl/opl_win32.c                  |   192 +
 games/NXDoom/pcsound/.gitignore               |     8 +
 games/NXDoom/pcsound/CMakeLists.txt           |    24 +
 games/NXDoom/pcsound/Makefile.am              |    15 +
 games/NXDoom/pcsound/pcsound.c                |   119 +
 games/NXDoom/pcsound/pcsound.h                |    38 +
 games/NXDoom/pcsound/pcsound_bsd.c            |   321 +
 games/NXDoom/pcsound/pcsound_internal.h       |    62 +
 games/NXDoom/pcsound/pcsound_linux.c          |   171 +
 games/NXDoom/pcsound/pcsound_sdl.c            |   254 +
 games/NXDoom/pcsound/pcsound_win32.c          |   106 +
 games/NXDoom/pkg/.gitignore                   |     3 +
 games/NXDoom/pkg/Makefile.am                  |    25 +
 games/NXDoom/pkg/config.make.in               |    30 +
 games/NXDoom/pkg/osx/.gitignore               |    10 +
 games/NXDoom/pkg/osx/AppController.h          |    45 +
 games/NXDoom/pkg/osx/AppController.m          |   146 +
 games/NXDoom/pkg/osx/Execute.h                |    24 +
 games/NXDoom/pkg/osx/Execute.m                |   226 +
 games/NXDoom/pkg/osx/GNUmakefile              |   132 +
 games/NXDoom/pkg/osx/IWADController.h         |    57 +
 games/NXDoom/pkg/osx/IWADController.m         |   482 +
 games/NXDoom/pkg/osx/Info.plist.in            |   104 +
 games/NXDoom/pkg/osx/LauncherManager.h        |    51 +
 games/NXDoom/pkg/osx/LauncherManager.m        |   410 +
 games/NXDoom/pkg/osx/PkgInfo                  |     1 +
 games/NXDoom/pkg/osx/Resources/app.png        |   Bin 0 -> 4597 bytes
 .../osx/Resources/launcher.nib/designable.nib |   607 +
 .../Resources/launcher.nib/keyedobjects.nib   |   Bin 0 -> 31078 bytes
 games/NXDoom/pkg/osx/cp-with-libs             |   107 +
 games/NXDoom/pkg/osx/disk/background.png      |   Bin 0 -> 227363 bytes
 games/NXDoom/pkg/osx/disk/dir.DS_Store        |   Bin 0 -> 28196 bytes
 games/NXDoom/pkg/osx/dmgfix                   |    67 +
 games/NXDoom/pkg/osx/main.m                   |    24 +
 games/NXDoom/pkg/style.html                   |    48 +
 games/NXDoom/pkg/win32/.gitignore             |     2 +
 games/NXDoom/pkg/win32/GNUmakefile            |    65 +
 games/NXDoom/pkg/win32/README                 |     2 +
 games/NXDoom/pkg/win32/cp-with-libs           |   200 +
 games/NXDoom/rpm.spec.in                      |   121 +
 games/NXDoom/src/.gitignore                   |    22 +
 games/NXDoom/src/CMakeLists.txt               |   287 +
 games/NXDoom/src/Doom.desktop.in              |     8 +
 games/NXDoom/src/Doom.metainfo.xml.in         |    74 +
 games/NXDoom/src/Doom_Screensaver.desktop.in  |    10 +
 games/NXDoom/src/Heretic.desktop.in           |     8 +
 games/NXDoom/src/Heretic.metainfo.xml.in      |    47 +
 games/NXDoom/src/Hexen.desktop.in             |     8 +
 games/NXDoom/src/Hexen.metainfo.xml.in        |    47 +
 games/NXDoom/src/Makefile.am                  |   299 +
 games/NXDoom/src/Strife.desktop.in            |     8 +
 games/NXDoom/src/Strife.metainfo.xml.in       |    48 +
 games/NXDoom/src/aes_prng.c                   |   956 ++
 games/NXDoom/src/aes_prng.h                   |    32 +
 games/NXDoom/src/d_dedicated.c                |    47 +
 games/NXDoom/src/d_event.c                    |    63 +
 games/NXDoom/src/d_event.h                    |   147 +
 games/NXDoom/src/d_iwad.c                     |  1047 ++
 games/NXDoom/src/d_iwad.h                     |    53 +
 games/NXDoom/src/d_loop.c                     |   881 +
 games/NXDoom/src/d_loop.h                     |    96 +
 games/NXDoom/src/d_mode.c                     |   233 +
 games/NXDoom/src/d_mode.h                     |   112 +
 games/NXDoom/src/d_ticcmd.h                   |    56 +
 games/NXDoom/src/deh_defs.h                   |    85 +
 games/NXDoom/src/deh_io.c                     |   357 +
 games/NXDoom/src/deh_io.h                     |    33 +
 games/NXDoom/src/deh_main.c                   |   519 +
 games/NXDoom/src/deh_main.h                   |    48 +
 games/NXDoom/src/deh_mapping.c                |   200 +
 games/NXDoom/src/deh_mapping.h                |    93 +
 games/NXDoom/src/deh_str.c                    |   433 +
 games/NXDoom/src/deh_str.h                    |    45 +
 games/NXDoom/src/deh_text.c                   |   113 +
 games/NXDoom/src/doom-res.rc.in               |    30 +
 games/NXDoom/src/doom/.gitignore              |     5 +
 games/NXDoom/src/doom/CMakeLists.txt          |    91 +
 games/NXDoom/src/doom/Makefile.am             |    83 +
 games/NXDoom/src/doom/am_map.c                |  1374 ++
 games/NXDoom/src/doom/am_map.h                |    49 +
 games/NXDoom/src/doom/d_englsh.h              |   693 +
 games/NXDoom/src/doom/d_items.c               |   128 +
 games/NXDoom/src/doom/d_items.h               |    41 +
 games/NXDoom/src/doom/d_main.c                |  2002 +++
 games/NXDoom/src/doom/d_main.h                |    53 +
 games/NXDoom/src/doom/d_net.c                 |   287 +
 games/NXDoom/src/doom/d_player.h              |   209 +
 games/NXDoom/src/doom/d_textur.h              |    43 +
 games/NXDoom/src/doom/d_think.h               |    68 +
 games/NXDoom/src/doom/deh_ammo.c              |   103 +
 games/NXDoom/src/doom/deh_bexstr.c            |   376 +
 games/NXDoom/src/doom/deh_cheat.c             |   146 +
 games/NXDoom/src/doom/deh_doom.c              |    48 +
 games/NXDoom/src/doom/deh_frame.c             |   161 +
 games/NXDoom/src/doom/deh_misc.c              |   228 +
 games/NXDoom/src/doom/deh_misc.h              |    79 +
 games/NXDoom/src/doom/deh_ptr.c               |   142 +
 games/NXDoom/src/doom/deh_sound.c             |   102 +
 games/NXDoom/src/doom/deh_thing.c             |   131 +
 games/NXDoom/src/doom/deh_weapon.c            |   101 +
 games/NXDoom/src/doom/doom_icon.c             |  2736 ++++
 games/NXDoom/src/doom/doomdata.h              |   213 +
 games/NXDoom/src/doom/doomdef.c               |    28 +
 games/NXDoom/src/doom/doomdef.h               |   168 +
 games/NXDoom/src/doom/doomstat.c              |    35 +
 games/NXDoom/src/doom/doomstat.h              |   277 +
 games/NXDoom/src/doom/dstrings.c              |    73 +
 games/NXDoom/src/doom/dstrings.h              |    41 +
 games/NXDoom/src/doom/f_finale.c              |   718 +
 games/NXDoom/src/doom/f_finale.h              |    45 +
 games/NXDoom/src/doom/f_wipe.c                |   294 +
 games/NXDoom/src/doom/f_wipe.h                |    63 +
 games/NXDoom/src/doom/g_game.c                |  2408 +++
 games/NXDoom/src/doom/g_game.h                |    88 +
 games/NXDoom/src/doom/hu_lib.c                |   347 +
 games/NXDoom/src/doom/hu_lib.h                |   182 +
 games/NXDoom/src/doom/hu_stuff.c              |   707 +
 games/NXDoom/src/doom/hu_stuff.h              |    68 +
 games/NXDoom/src/doom/info.c                  |  4662 ++++++
 games/NXDoom/src/doom/info.h                  |  1331 ++
 games/NXDoom/src/doom/m_menu.c                |  2128 +++
 games/NXDoom/src/doom/m_menu.h                |    62 +
 games/NXDoom/src/doom/m_random.c              |    72 +
 games/NXDoom/src/doom/m_random.h              |    40 +
 games/NXDoom/src/doom/p_ceilng.c              |   324 +
 games/NXDoom/src/doom/p_doors.c               |   779 +
 games/NXDoom/src/doom/p_enemy.c               |  2024 +++
 games/NXDoom/src/doom/p_floor.c               |   561 +
 games/NXDoom/src/doom/p_inter.c               |   931 ++
 games/NXDoom/src/doom/p_inter.h               |    30 +
 games/NXDoom/src/doom/p_lights.c              |   350 +
 games/NXDoom/src/doom/p_local.h               |   305 +
 games/NXDoom/src/doom/p_map.c                 |  1445 ++
 games/NXDoom/src/doom/p_maputl.c              |  1002 ++
 games/NXDoom/src/doom/p_mobj.c                |  1072 ++
 games/NXDoom/src/doom/p_mobj.h                |   284 +
 games/NXDoom/src/doom/p_plats.c               |   304 +
 games/NXDoom/src/doom/p_pspr.c                |   887 +
 games/NXDoom/src/doom/p_pspr.h                |    75 +
 games/NXDoom/src/doom/p_saveg.c               |  1888 +++
 games/NXDoom/src/doom/p_saveg.h               |    65 +
 games/NXDoom/src/doom/p_setup.c               |   833 +
 games/NXDoom/src/doom/p_setup.h               |    39 +
 games/NXDoom/src/doom/p_sight.c               |   394 +
 games/NXDoom/src/doom/p_spec.c                |  1519 ++
 games/NXDoom/src/doom/p_spec.h                |   637 +
 games/NXDoom/src/doom/p_switch.c              |   641 +
 games/NXDoom/src/doom/p_telept.c              |   132 +
 games/NXDoom/src/doom/p_tick.c                |   153 +
 games/NXDoom/src/doom/p_tick.h                |    33 +
 games/NXDoom/src/doom/p_user.c                |   379 +
 games/NXDoom/src/doom/r_bsp.c                 |   583 +
 games/NXDoom/src/doom/r_bsp.h                 |    61 +
 games/NXDoom/src/doom/r_data.c                |   904 +
 games/NXDoom/src/doom/r_data.h                |    55 +
 games/NXDoom/src/doom/r_defs.h                |   448 +
 games/NXDoom/src/doom/r_draw.c                |   959 ++
 games/NXDoom/src/doom/r_draw.h                |   104 +
 games/NXDoom/src/doom/r_local.h               |    45 +
 games/NXDoom/src/doom/r_main.c                |   890 +
 games/NXDoom/src/doom/r_main.h                |   165 +
 games/NXDoom/src/doom/r_plane.c               |   449 +
 games/NXDoom/src/doom/r_plane.h               |    76 +
 games/NXDoom/src/doom/r_segs.c                |   743 +
 games/NXDoom/src/doom/r_segs.h                |    34 +
 games/NXDoom/src/doom/r_sky.c                 |    52 +
 games/NXDoom/src/doom/r_sky.h                 |    37 +
 games/NXDoom/src/doom/r_state.h               |   127 +
 games/NXDoom/src/doom/r_things.c              |   982 ++
 games/NXDoom/src/doom/r_things.h              |    65 +
 games/NXDoom/src/doom/s_sound.c               |   724 +
 games/NXDoom/src/doom/s_sound.h               |    89 +
 games/NXDoom/src/doom/sounds.c                |   229 +
 games/NXDoom/src/doom/sounds.h                |   227 +
 games/NXDoom/src/doom/st_lib.c                |   283 +
 games/NXDoom/src/doom/st_lib.h                |   209 +
 games/NXDoom/src/doom/st_stuff.c              |  1367 ++
 games/NXDoom/src/doom/st_stuff.h              |    69 +
 games/NXDoom/src/doom/statdump.c              |   357 +
 games/NXDoom/src/doom/statdump.h              |    23 +
 games/NXDoom/src/doom/wi_stuff.c              |  1833 +++
 games/NXDoom/src/doom/wi_stuff.h              |    48 +
 games/NXDoom/src/doomkeys.h                   |   156 +
 games/NXDoom/src/doomtype.h                   |   145 +
 games/NXDoom/src/gusconf.c                    |   301 +
 games/NXDoom/src/gusconf.h                    |    29 +
 games/NXDoom/src/heretic-res.rc.in            |    30 +
 games/NXDoom/src/heretic/.gitignore           |     6 +
 games/NXDoom/src/heretic/CMakeLists.txt       |    77 +
 games/NXDoom/src/heretic/Makefile.am          |    72 +
 games/NXDoom/src/heretic/am_data.h            |   103 +
 games/NXDoom/src/heretic/am_map.c             |  1535 ++
 games/NXDoom/src/heretic/am_map.h             |   124 +
 games/NXDoom/src/heretic/ct_chat.c            |   477 +
 games/NXDoom/src/heretic/ct_chat.h            |    38 +
 games/NXDoom/src/heretic/d_main.c             |  1171 ++
 games/NXDoom/src/heretic/d_net.c              |   218 +
 games/NXDoom/src/heretic/deh_ammo.c           |   113 +
 games/NXDoom/src/heretic/deh_frame.c          |   335 +
 games/NXDoom/src/heretic/deh_htext.c          |   845 +
 games/NXDoom/src/heretic/deh_htic.c           |   182 +
 games/NXDoom/src/heretic/deh_htic.h           |    56 +
 games/NXDoom/src/heretic/deh_sound.c          |   108 +
 games/NXDoom/src/heretic/deh_thing.c          |   144 +
 games/NXDoom/src/heretic/deh_weapon.c         |   122 +
 games/NXDoom/src/heretic/doomdata.h           |   192 +
 games/NXDoom/src/heretic/doomdef.h            |   858 +
 games/NXDoom/src/heretic/dstrings.h           |   244 +
 games/NXDoom/src/heretic/f_finale.c           |   436 +
 games/NXDoom/src/heretic/g_game.c             |  2284 +++
 games/NXDoom/src/heretic/heretic_icon.c       |  2736 ++++
 games/NXDoom/src/heretic/in_lude.c            |  1075 ++
 games/NXDoom/src/heretic/info.c               |  5600 +++++++
 games/NXDoom/src/heretic/info.h               |  1584 ++
 games/NXDoom/src/heretic/m_random.c           |    76 +
 games/NXDoom/src/heretic/m_random.h           |    37 +
 games/NXDoom/src/heretic/mn_menu.c            |  1824 +++
 games/NXDoom/src/heretic/p_action.h           |   151 +
 games/NXDoom/src/heretic/p_ceilng.c           |   256 +
 games/NXDoom/src/heretic/p_doors.c            |   380 +
 games/NXDoom/src/heretic/p_enemy.c            |  2711 +++
 games/NXDoom/src/heretic/p_floor.c            |   461 +
 games/NXDoom/src/heretic/p_inter.c            |  1488 ++
 games/NXDoom/src/heretic/p_lights.c           |   280 +
 games/NXDoom/src/heretic/p_local.h            |   292 +
 games/NXDoom/src/heretic/p_map.c              |  1696 ++
 games/NXDoom/src/heretic/p_maputl.c           |   779 +
 games/NXDoom/src/heretic/p_mobj.c             |  1626 ++
 games/NXDoom/src/heretic/p_plats.c            |   259 +
 games/NXDoom/src/heretic/p_pspr.c             |  1907 +++
 games/NXDoom/src/heretic/p_saveg.c            |  1925 +++
 games/NXDoom/src/heretic/p_setup.c            |   709 +
 games/NXDoom/src/heretic/p_sight.c            |   355 +
 games/NXDoom/src/heretic/p_spec.c             |  1306 ++
 games/NXDoom/src/heretic/p_spec.h             |   390 +
 games/NXDoom/src/heretic/p_switch.c           |   409 +
 games/NXDoom/src/heretic/p_telept.c           |   164 +
 games/NXDoom/src/heretic/p_tick.c             |   167 +
 games/NXDoom/src/heretic/p_user.c             |  1017 ++
 games/NXDoom/src/heretic/r_bsp.c              |   489 +
 games/NXDoom/src/heretic/r_data.c             |   732 +
 games/NXDoom/src/heretic/r_draw.c             |   490 +
 games/NXDoom/src/heretic/r_local.h            |   487 +
 games/NXDoom/src/heretic/r_main.c             |   818 +
 games/NXDoom/src/heretic/r_plane.c            |   511 +
 games/NXDoom/src/heretic/r_segs.c             |   661 +
 games/NXDoom/src/heretic/r_things.c           |  1017 ++
 games/NXDoom/src/heretic/s_sound.c            |   607 +
 games/NXDoom/src/heretic/s_sound.h            |    40 +
 games/NXDoom/src/heretic/sb_bar.c             |  1283 ++
 games/NXDoom/src/heretic/sounds.c             |   249 +
 games/NXDoom/src/heretic/sounds.h             |   291 +
 games/NXDoom/src/hexen-res.rc.in              |    30 +
 games/NXDoom/src/hexen/.gitignore             |     5 +
 games/NXDoom/src/hexen/CMakeLists.txt         |    78 +
 games/NXDoom/src/hexen/Makefile.am            |    71 +
 games/NXDoom/src/hexen/a_action.c             |  1341 ++
 games/NXDoom/src/hexen/am_data.h              |   109 +
 games/NXDoom/src/hexen/am_map.c               |  1544 ++
 games/NXDoom/src/hexen/am_map.h               |   128 +
 games/NXDoom/src/hexen/ct_chat.c              |   497 +
 games/NXDoom/src/hexen/ct_chat.h              |    38 +
 games/NXDoom/src/hexen/d_net.c                |   283 +
 games/NXDoom/src/hexen/f_finale.c             |   387 +
 games/NXDoom/src/hexen/g_game.c               |  2347 +++
 games/NXDoom/src/hexen/h2_main.c              |  1227 ++
 games/NXDoom/src/hexen/h2def.h                |  1121 ++
 games/NXDoom/src/hexen/hexen_icon.c           |  2736 ++++
 games/NXDoom/src/hexen/in_lude.c              |   607 +
 games/NXDoom/src/hexen/info.c                 | 13654 ++++++++++++++++
 games/NXDoom/src/hexen/info.h                 |  3626 ++++
 games/NXDoom/src/hexen/m_random.c             |    80 +
 games/NXDoom/src/hexen/m_random.h             |    37 +
 games/NXDoom/src/hexen/mn_menu.c              |  1952 +++
 games/NXDoom/src/hexen/p_acs.c                |  1996 +++
 games/NXDoom/src/hexen/p_action.h             |   240 +
 games/NXDoom/src/hexen/p_anim.c               |   477 +
 games/NXDoom/src/hexen/p_ceilng.c             |   303 +
 games/NXDoom/src/hexen/p_doors.c              |   319 +
 games/NXDoom/src/hexen/p_enemy.c              |  5428 ++++++
 games/NXDoom/src/hexen/p_floor.c              |   946 ++
 games/NXDoom/src/hexen/p_inter.c              |  2231 +++
 games/NXDoom/src/hexen/p_lights.c             |   369 +
 games/NXDoom/src/hexen/p_local.h              |   429 +
 games/NXDoom/src/hexen/p_map.c                |  2338 +++
 games/NXDoom/src/hexen/p_maputl.c             |  1072 ++
 games/NXDoom/src/hexen/p_mobj.c               |  2469 +++
 games/NXDoom/src/hexen/p_plats.c              |   277 +
 games/NXDoom/src/hexen/p_pspr.c               |  2476 +++
 games/NXDoom/src/hexen/p_setup.c              |  1273 ++
 games/NXDoom/src/hexen/p_sight.c              |   398 +
 games/NXDoom/src/hexen/p_spec.c               |  1202 ++
 games/NXDoom/src/hexen/p_spec.h               |   586 +
 games/NXDoom/src/hexen/p_switch.c             |   172 +
 games/NXDoom/src/hexen/p_telept.c             |   190 +
 games/NXDoom/src/hexen/p_things.c             |   537 +
 games/NXDoom/src/hexen/p_tick.c               |   151 +
 games/NXDoom/src/hexen/p_user.c               |  1643 ++
 games/NXDoom/src/hexen/po_man.c               |  1505 ++
 games/NXDoom/src/hexen/r_bsp.c                |   508 +
 games/NXDoom/src/hexen/r_data.c               |   689 +
 games/NXDoom/src/hexen/r_draw.c               |   558 +
 games/NXDoom/src/hexen/r_local.h              |   554 +
 games/NXDoom/src/hexen/r_main.c               |   830 +
 games/NXDoom/src/hexen/r_plane.c              |   579 +
 games/NXDoom/src/hexen/r_segs.c               |   654 +
 games/NXDoom/src/hexen/r_things.c             |  1044 ++
 games/NXDoom/src/hexen/s_sound.c              |  1014 ++
 games/NXDoom/src/hexen/s_sound.h              |    94 +
 games/NXDoom/src/hexen/sb_bar.c               |  2000 +++
 games/NXDoom/src/hexen/sc_man.c               |   465 +
 games/NXDoom/src/hexen/sn_sonix.c             |   535 +
 games/NXDoom/src/hexen/sounds.c               |   313 +
 games/NXDoom/src/hexen/sounds.h               |   321 +
 games/NXDoom/src/hexen/st_start.c             |   310 +
 games/NXDoom/src/hexen/st_start.h             |    41 +
 games/NXDoom/src/hexen/sv_save.c              |  3508 ++++
 games/NXDoom/src/hexen/textdefs.h             |   172 +
 games/NXDoom/src/hexen/xddefs.h               |   189 +
 games/NXDoom/src/i_cdmus.c                    |    79 +
 games/NXDoom/src/i_cdmus.h                    |    41 +
 games/NXDoom/src/i_endoom.c                   |    79 +
 games/NXDoom/src/i_endoom.h                   |    29 +
 games/NXDoom/src/i_flmusic.c                  |   332 +
 games/NXDoom/src/i_glob.c                     |   373 +
 games/NXDoom/src/i_glob.h                     |    44 +
 games/NXDoom/src/i_input.c                    |   473 +
 games/NXDoom/src/i_input.h                    |    49 +
 games/NXDoom/src/i_joystick.c                 |   826 +
 games/NXDoom/src/i_joystick.h                 |   115 +
 games/NXDoom/src/i_main.c                     |    79 +
 games/NXDoom/src/i_musicpack.c                |  1496 ++
 games/NXDoom/src/i_oplmusic.c                 |  1898 +++
 games/NXDoom/src/i_pcsound.c                  |   338 +
 games/NXDoom/src/i_sdlmusic.c                 |   473 +
 games/NXDoom/src/i_sdlsound.c                 |  1146 ++
 games/NXDoom/src/i_sound.c                    |   540 +
 games/NXDoom/src/i_sound.h                    |   300 +
 games/NXDoom/src/i_swap.h                     |    43 +
 games/NXDoom/src/i_system.c                   |   470 +
 games/NXDoom/src/i_system.h                   |    86 +
 games/NXDoom/src/i_timer.c                    |    82 +
 games/NXDoom/src/i_timer.h                    |    42 +
 games/NXDoom/src/i_video.c                    |  1537 ++
 games/NXDoom/src/i_video.h                    |   110 +
 games/NXDoom/src/i_videohr.c                  |   257 +
 games/NXDoom/src/i_videohr.h                  |    35 +
 games/NXDoom/src/i_winmusic.c                 |  1920 +++
 games/NXDoom/src/m_argv.c                     |   556 +
 games/NXDoom/src/m_argv.h                     |    53 +
 games/NXDoom/src/m_bbox.c                     |    54 +
 games/NXDoom/src/m_bbox.h                     |    47 +
 games/NXDoom/src/m_cheat.c                    |    89 +
 games/NXDoom/src/m_cheat.h                    |    62 +
 games/NXDoom/src/m_config.c                   |  2811 ++++
 games/NXDoom/src/m_config.h                   |    43 +
 games/NXDoom/src/m_controls.c                 |   457 +
 games/NXDoom/src/m_controls.h                 |   194 +
 games/NXDoom/src/m_fixed.c                    |    62 +
 games/NXDoom/src/m_fixed.h                    |    39 +
 games/NXDoom/src/m_misc.c                     |   965 ++
 games/NXDoom/src/m_misc.h                     |   107 +
 games/NXDoom/src/manifest.xml                 |    12 +
 games/NXDoom/src/memio.c                      |   197 +
 games/NXDoom/src/memio.h                      |    38 +
 games/NXDoom/src/midifallback.c               |   370 +
 games/NXDoom/src/midifallback.h               |    47 +
 games/NXDoom/src/midifile.c                   |   838 +
 games/NXDoom/src/midifile.h                   |   232 +
 games/NXDoom/src/mus2mid.c                    |   736 +
 games/NXDoom/src/mus2mid.h                    |    29 +
 games/NXDoom/src/net_client.c                 |  1229 ++
 games/NXDoom/src/net_client.h                 |    53 +
 games/NXDoom/src/net_common.c                 |   527 +
 games/NXDoom/src/net_common.h                 |   106 +
 games/NXDoom/src/net_dedicated.c              |    80 +
 games/NXDoom/src/net_dedicated.h              |    25 +
 games/NXDoom/src/net_defs.h                   |   276 +
 games/NXDoom/src/net_gui.c                    |   434 +
 games/NXDoom/src/net_gui.h                    |    29 +
 games/NXDoom/src/net_io.c                     |   147 +
 games/NXDoom/src/net_io.h                     |    61 +
 games/NXDoom/src/net_loop.c                   |   231 +
 games/NXDoom/src/net_loop.h                   |    27 +
 games/NXDoom/src/net_packet.c                 |   328 +
 games/NXDoom/src/net_packet.h                 |    45 +
 games/NXDoom/src/net_petname.c                |   118 +
 games/NXDoom/src/net_petname.h                |    18 +
 games/NXDoom/src/net_query.c                  |  1006 ++
 games/NXDoom/src/net_query.h                  |    45 +
 games/NXDoom/src/net_sdl.c                    |   441 +
 games/NXDoom/src/net_sdl.h                    |    26 +
 games/NXDoom/src/net_server.c                 |  2097 +++
 games/NXDoom/src/net_server.h                 |    42 +
 games/NXDoom/src/net_structrw.c               |   676 +
 games/NXDoom/src/net_structrw.h               |    55 +
 games/NXDoom/src/p_rejectpad.c                |    81 +
 games/NXDoom/src/p_rejectpad.h                |    28 +
 games/NXDoom/src/setup-res.rc.in              |    28 +
 games/NXDoom/src/setup/.gitignore             |     7 +
 games/NXDoom/src/setup/CMakeLists.txt         |    32 +
 games/NXDoom/src/setup/Makefile.am            |    42 +
 games/NXDoom/src/setup/Setup.desktop.in       |     8 +
 games/NXDoom/src/setup/compatibility.c        |    51 +
 games/NXDoom/src/setup/compatibility.h        |    24 +
 games/NXDoom/src/setup/display.c              |   289 +
 games/NXDoom/src/setup/display.h              |    26 +
 games/NXDoom/src/setup/execute.c              |   429 +
 games/NXDoom/src/setup/execute.h              |    40 +
 games/NXDoom/src/setup/joystick.c             |  1365 ++
 games/NXDoom/src/setup/joystick.h             |    32 +
 games/NXDoom/src/setup/keyboard.c             |   448 +
 games/NXDoom/src/setup/keyboard.h             |    23 +
 games/NXDoom/src/setup/mainmenu.c             |   346 +
 games/NXDoom/src/setup/mode.c                 |   384 +
 games/NXDoom/src/setup/mode.h                 |    31 +
 games/NXDoom/src/setup/mouse.c                |   176 +
 games/NXDoom/src/setup/mouse.h                |    23 +
 games/NXDoom/src/setup/multiplayer.c          |  1191 ++
 games/NXDoom/src/setup/multiplayer.h          |    29 +
 games/NXDoom/src/setup/setup-manifest.xml.in  |    48 +
 games/NXDoom/src/setup/setup_icon.c           |  2736 ++++
 games/NXDoom/src/setup/sound.c                |   410 +
 games/NXDoom/src/setup/sound.h                |    24 +
 games/NXDoom/src/setup/txt_joyaxis.c          |   654 +
 games/NXDoom/src/setup/txt_joyaxis.h          |    90 +
 games/NXDoom/src/setup/txt_joybinput.c        |   780 +
 games/NXDoom/src/setup/txt_joybinput.h        |    40 +
 games/NXDoom/src/setup/txt_keyinput.c         |   185 +
 games/NXDoom/src/setup/txt_keyinput.h         |    38 +
 games/NXDoom/src/setup/txt_mouseinput.c       |   184 +
 games/NXDoom/src/setup/txt_mouseinput.h       |    38 +
 games/NXDoom/src/sha1.c                       |   321 +
 games/NXDoom/src/sha1.h                       |    40 +
 games/NXDoom/src/strife-res.rc.in             |    30 +
 games/NXDoom/src/strife/.gitignore            |     5 +
 games/NXDoom/src/strife/CMakeLists.txt        |    92 +
 games/NXDoom/src/strife/Makefile.am           |    85 +
 games/NXDoom/src/strife/am_map.c              |  1415 ++
 games/NXDoom/src/strife/am_map.h              |    49 +
 games/NXDoom/src/strife/d_englsh.h            |   593 +
 games/NXDoom/src/strife/d_items.c             |   159 +
 games/NXDoom/src/strife/d_items.h             |    42 +
 games/NXDoom/src/strife/d_main.c              |  2191 +++
 games/NXDoom/src/strife/d_main.h              |    64 +
 games/NXDoom/src/strife/d_net.c               |   290 +
 games/NXDoom/src/strife/d_player.h            |   249 +
 games/NXDoom/src/strife/d_textur.h            |    43 +
 games/NXDoom/src/strife/d_think.h             |    68 +
 games/NXDoom/src/strife/deh_ammo.c            |   103 +
 games/NXDoom/src/strife/deh_cheat.c           |   148 +
 games/NXDoom/src/strife/deh_frame.c           |   159 +
 games/NXDoom/src/strife/deh_misc.c            |   228 +
 games/NXDoom/src/strife/deh_misc.h            |    79 +
 games/NXDoom/src/strife/deh_ptr.c             |   142 +
 games/NXDoom/src/strife/deh_sound.c           |   102 +
 games/NXDoom/src/strife/deh_strife.c          |    47 +
 games/NXDoom/src/strife/deh_thing.c           |   132 +
 games/NXDoom/src/strife/deh_weapon.c          |   102 +
 games/NXDoom/src/strife/doomdata.h            |   225 +
 games/NXDoom/src/strife/doomdef.c             |    28 +
 games/NXDoom/src/strife/doomdef.h             |   291 +
 games/NXDoom/src/strife/doomstat.c            |    35 +
 games/NXDoom/src/strife/doomstat.h            |   281 +
 games/NXDoom/src/strife/dstrings.c            |    73 +
 games/NXDoom/src/strife/dstrings.h            |    41 +
 games/NXDoom/src/strife/f_finale.c            |  1047 ++
 games/NXDoom/src/strife/f_finale.h            |    48 +
 games/NXDoom/src/strife/f_wipe.c              |   292 +
 games/NXDoom/src/strife/f_wipe.h              |    63 +
 games/NXDoom/src/strife/g_game.c              |  2534 +++
 games/NXDoom/src/strife/g_game.h              |    89 +
 games/NXDoom/src/strife/hu_lib.c              |   474 +
 games/NXDoom/src/strife/hu_lib.h              |   185 +
 games/NXDoom/src/strife/hu_stuff.c            |   687 +
 games/NXDoom/src/strife/hu_stuff.h            |    75 +
 games/NXDoom/src/strife/info.c                | 11041 +++++++++++++
 games/NXDoom/src/strife/info.h                |  2219 +++
 games/NXDoom/src/strife/m_menu.c              |  2466 +++
 games/NXDoom/src/strife/m_menu.h              |   104 +
 games/NXDoom/src/strife/m_random.c            |    80 +
 games/NXDoom/src/strife/m_random.h            |    39 +
 games/NXDoom/src/strife/m_saves.c             |   482 +
 games/NXDoom/src/strife/m_saves.h             |    55 +
 games/NXDoom/src/strife/p_ceilng.c            |   343 +
 games/NXDoom/src/strife/p_dialog.c            |  1413 ++
 games/NXDoom/src/strife/p_dialog.h            |   102 +
 games/NXDoom/src/strife/p_doors.c             |  1370 ++
 games/NXDoom/src/strife/p_enemy.c             |  3388 ++++
 games/NXDoom/src/strife/p_floor.c             |   597 +
 games/NXDoom/src/strife/p_inter.c             |  1411 ++
 games/NXDoom/src/strife/p_inter.h             |    32 +
 games/NXDoom/src/strife/p_lights.c            |   372 +
 games/NXDoom/src/strife/p_local.h             |   311 +
 games/NXDoom/src/strife/p_map.c               |  1643 ++
 games/NXDoom/src/strife/p_maputl.c            |  1056 ++
 games/NXDoom/src/strife/p_mobj.c              |  1360 ++
 games/NXDoom/src/strife/p_mobj.h              |   330 +
 games/NXDoom/src/strife/p_plats.c             |   358 +
 games/NXDoom/src/strife/p_pspr.c              |  1003 ++
 games/NXDoom/src/strife/p_pspr.h              |    86 +
 games/NXDoom/src/strife/p_saveg.c             |  2208 +++
 games/NXDoom/src/strife/p_saveg.h             |    62 +
 games/NXDoom/src/strife/p_setup.c             |   808 +
 games/NXDoom/src/strife/p_setup.h             |    37 +
 games/NXDoom/src/strife/p_sight.c             |   360 +
 games/NXDoom/src/strife/p_spec.c              |  1984 +++
 games/NXDoom/src/strife/p_spec.h              |   678 +
 games/NXDoom/src/strife/p_switch.c            |  1078 ++
 games/NXDoom/src/strife/p_telept.c            |   151 +
 games/NXDoom/src/strife/p_tick.c              |   160 +
 games/NXDoom/src/strife/p_tick.h              |    33 +
 games/NXDoom/src/strife/p_user.c              |   920 ++
 games/NXDoom/src/strife/r_bsp.c               |   583 +
 games/NXDoom/src/strife/r_bsp.h               |    61 +
 games/NXDoom/src/strife/r_data.c              |  1010 ++
 games/NXDoom/src/strife/r_data.h              |    56 +
 games/NXDoom/src/strife/r_defs.h              |   448 +
 games/NXDoom/src/strife/r_draw.c              |   968 ++
 games/NXDoom/src/strife/r_draw.h              |   111 +
 games/NXDoom/src/strife/r_local.h             |    45 +
 games/NXDoom/src/strife/r_main.c              |   944 ++
 games/NXDoom/src/strife/r_main.h              |   164 +
 games/NXDoom/src/strife/r_plane.c             |   447 +
 games/NXDoom/src/strife/r_plane.h             |    76 +
 games/NXDoom/src/strife/r_segs.c              |   754 +
 games/NXDoom/src/strife/r_segs.h              |    34 +
 games/NXDoom/src/strife/r_sky.c               |    54 +
 games/NXDoom/src/strife/r_sky.h               |    37 +
 games/NXDoom/src/strife/r_state.h             |   127 +
 games/NXDoom/src/strife/r_things.c            |  1067 ++
 games/NXDoom/src/strife/r_things.h            |    66 +
 games/NXDoom/src/strife/s_sound.c             |   825 +
 games/NXDoom/src/strife/s_sound.h             |    95 +
 games/NXDoom/src/strife/sounds.c              |   227 +
 games/NXDoom/src/strife/sounds.h              |   222 +
 games/NXDoom/src/strife/st_lib.c              |   326 +
 games/NXDoom/src/strife/st_lib.h              |   221 +
 games/NXDoom/src/strife/st_stuff.c            |  1605 ++
 games/NXDoom/src/strife/st_stuff.h            |    80 +
 games/NXDoom/src/strife/strife_icon.c         |  2736 ++++
 games/NXDoom/src/strife/wi_stuff.c            |  1836 +++
 games/NXDoom/src/strife/wi_stuff.h            |    51 +
 games/NXDoom/src/tables.c                     |  2227 +++
 games/NXDoom/src/tables.h                     |    96 +
 games/NXDoom/src/v_diskicon.c                 |   160 +
 games/NXDoom/src/v_diskicon.h                 |    32 +
 games/NXDoom/src/v_patch.h                    |    50 +
 games/NXDoom/src/v_video.c                    |  1023 ++
 games/NXDoom/src/v_video.h                    |   108 +
 games/NXDoom/src/w_checksum.c                 |    88 +
 games/NXDoom/src/w_checksum.h                 |    27 +
 games/NXDoom/src/w_file.c                     |    84 +
 games/NXDoom/src/w_file.h                     |    86 +
 games/NXDoom/src/w_file_posix.c               |   176 +
 games/NXDoom/src/w_file_stdc.c                |    96 +
 games/NXDoom/src/w_file_win32.c               |   204 +
 games/NXDoom/src/w_main.c                     |   268 +
 games/NXDoom/src/w_main.h                     |    30 +
 games/NXDoom/src/w_merge.c                    |   722 +
 games/NXDoom/src/w_merge.h                    |    44 +
 games/NXDoom/src/w_wad.c                      |   629 +
 games/NXDoom/src/w_wad.h                      |    78 +
 games/NXDoom/src/z_native.c                   |   506 +
 games/NXDoom/src/z_zone.c                     |   552 +
 games/NXDoom/src/z_zone.h                     |    73 +
 games/NXDoom/textscreen/.gitignore            |     6 +
 games/NXDoom/textscreen/CMakeLists.txt        |    33 +
 games/NXDoom/textscreen/Doxyfile              |  2451 +++
 games/NXDoom/textscreen/Makefile.am           |    41 +
 games/NXDoom/textscreen/examples/.gitignore   |     8 +
 games/NXDoom/textscreen/examples/Makefile.am  |    11 +
 games/NXDoom/textscreen/examples/calculator.c |   180 +
 games/NXDoom/textscreen/examples/guitest.c    |   308 +
 games/NXDoom/textscreen/fonts/Makefile.am     |    18 +
 games/NXDoom/textscreen/fonts/README          |    38 +
 games/NXDoom/textscreen/fonts/codepage.h      |   113 +
 games/NXDoom/textscreen/fonts/convert-font    |   104 +
 games/NXDoom/textscreen/fonts/large.h         |  2060 +++
 games/NXDoom/textscreen/fonts/large.png       |   Bin 0 -> 7837 bytes
 games/NXDoom/textscreen/fonts/normal.h        |   524 +
 games/NXDoom/textscreen/fonts/normal.png      |   Bin 0 -> 3783 bytes
 games/NXDoom/textscreen/fonts/small.h         |   140 +
 games/NXDoom/textscreen/fonts/small.png       |   Bin 0 -> 1750 bytes
 games/NXDoom/textscreen/textscreen.h          |    48 +
 games/NXDoom/textscreen/txt_button.c          |   127 +
 games/NXDoom/textscreen/txt_button.h          |    74 +
 games/NXDoom/textscreen/txt_checkbox.c        |   142 +
 games/NXDoom/textscreen/txt_checkbox.h        |    76 +
 games/NXDoom/textscreen/txt_conditional.c     |   168 +
 games/NXDoom/textscreen/txt_conditional.h     |    63 +
 games/NXDoom/textscreen/txt_desktop.c         |   386 +
 games/NXDoom/textscreen/txt_desktop.h         |   108 +
 games/NXDoom/textscreen/txt_dropdown.c        |   305 +
 games/NXDoom/textscreen/txt_dropdown.h        |    69 +
 games/NXDoom/textscreen/txt_fileselect.c      |   836 +
 games/NXDoom/textscreen/txt_fileselect.h      |    79 +
 games/NXDoom/textscreen/txt_gui.c             |   480 +
 games/NXDoom/textscreen/txt_gui.h             |    40 +
 games/NXDoom/textscreen/txt_inputbox.c        |   347 +
 games/NXDoom/textscreen/txt_inputbox.h        |    76 +
 games/NXDoom/textscreen/txt_io.c              |   176 +
 games/NXDoom/textscreen/txt_io.h              |    41 +
 games/NXDoom/textscreen/txt_label.c           |   200 +
 games/NXDoom/textscreen/txt_label.h           |    83 +
 games/NXDoom/textscreen/txt_main.h            |   203 +
 games/NXDoom/textscreen/txt_radiobutton.c     |   143 +
 games/NXDoom/textscreen/txt_radiobutton.h     |    79 +
 games/NXDoom/textscreen/txt_scrollpane.c      |   586 +
 games/NXDoom/textscreen/txt_scrollpane.h      |    59 +
 games/NXDoom/textscreen/txt_sdl.c             |   990 ++
 games/NXDoom/textscreen/txt_sdl.h             |    45 +
 games/NXDoom/textscreen/txt_separator.c       |   114 +
 games/NXDoom/textscreen/txt_separator.h       |    65 +
 games/NXDoom/textscreen/txt_spinctrl.c        |   426 +
 games/NXDoom/textscreen/txt_spinctrl.h        |    78 +
 games/NXDoom/textscreen/txt_strut.c           |    72 +
 games/NXDoom/textscreen/txt_strut.h           |    54 +
 games/NXDoom/textscreen/txt_table.c           |  1244 ++
 games/NXDoom/textscreen/txt_table.h           |   245 +
 games/NXDoom/textscreen/txt_utf8.c            |   154 +
 games/NXDoom/textscreen/txt_utf8.h            |    26 +
 games/NXDoom/textscreen/txt_widget.c          |   326 +
 games/NXDoom/textscreen/txt_widget.h          |   179 +
 games/NXDoom/textscreen/txt_window.c          |   596 +
 games/NXDoom/textscreen/txt_window.h          |   221 +
 games/NXDoom/textscreen/txt_window_action.c   |   169 +
 games/NXDoom/textscreen/txt_window_action.h   |    89 +
 games/NXDoom/vcpkg.json                       |    10 +
 games/NXDoom/win32/win_opendir.c              |   360 +
 games/NXDoom/win32/win_opendir.h              |   110 +
 728 files changed, 332623 insertions(+)
 create mode 100644 games/NXDoom/.devcontainer/.gitignore
 create mode 100644 games/NXDoom/.devcontainer/Dockerfile
 create mode 100644 games/NXDoom/.devcontainer/devcontainer.json
 create mode 100755 games/NXDoom/.devcontainer/initialize-linux.sh
 create mode 100644 games/NXDoom/.github/CONTRIBUTING.md
 create mode 100644 games/NXDoom/.github/ISSUE_TEMPLATE.md
 create mode 100644 games/NXDoom/.github/workflows/cpp-linter.yml
 create mode 100644 games/NXDoom/.github/workflows/cppcheck.yml
 create mode 100644 games/NXDoom/.github/workflows/main.yml
 create mode 100644 games/NXDoom/.gitignore
 create mode 100644 games/NXDoom/.gitmodules
 create mode 100644 games/NXDoom/.lvimrc
 create mode 100755 games/NXDoom/.travis.sh
 create mode 100644 games/NXDoom/AUTHORS
 create mode 100644 games/NXDoom/CMakeLists.txt
 create mode 100644 games/NXDoom/CODE_OF_CONDUCT.md
 create mode 100644 games/NXDoom/COPYING.md
 create mode 100644 games/NXDoom/ChangeLog
 create mode 100644 games/NXDoom/HACKING.md
 create mode 100644 games/NXDoom/Makefile.am
 create mode 100644 games/NXDoom/NEWS.md
 create mode 100644 games/NXDoom/NOT-BUGS.md
 create mode 100644 games/NXDoom/PHILOSOPHY.md
 create mode 100644 games/NXDoom/README.Music.md
 create mode 100644 games/NXDoom/README.Strife.md
 create mode 100644 games/NXDoom/README.md
 create mode 100644 games/NXDoom/RELEASE_NOTES.md
 create mode 100644 games/NXDoom/TODO.md
 create mode 100755 games/NXDoom/autogen.sh
 create mode 100755 games/NXDoom/check-extern.sh
 create mode 100644 games/NXDoom/cmake/FindFluidSynth.cmake
 create mode 100644 games/NXDoom/cmake/FindSDL2.cmake
 create mode 100644 games/NXDoom/cmake/FindSDL2_mixer.cmake
 create mode 100644 games/NXDoom/cmake/FindSDL2_net.cmake
 create mode 100644 games/NXDoom/cmake/FindSampleRate.cmake
 create mode 100644 games/NXDoom/cmake/Findm.cmake
 create mode 100644 games/NXDoom/cmake/config.h.cin
 create mode 100644 games/NXDoom/configure.ac
 create mode 100644 games/NXDoom/data/.gitignore
 create mode 100644 games/NXDoom/data/Makefile.am
 create mode 100644 games/NXDoom/data/README
 create mode 100755 games/NXDoom/data/convert-icon
 create mode 100644 games/NXDoom/data/doom.ico
 create mode 100644 games/NXDoom/data/doom.png
 create mode 100644 games/NXDoom/data/heretic.ico
 create mode 100644 games/NXDoom/data/heretic.png
 create mode 100644 games/NXDoom/data/hexen.ico
 create mode 100644 games/NXDoom/data/hexen.png
 create mode 100644 games/NXDoom/data/setup.ico
 create mode 100644 games/NXDoom/data/setup.png
 create mode 100644 games/NXDoom/data/strife.ico
 create mode 100644 games/NXDoom/data/strife.png
 create mode 100644 games/NXDoom/data/wadfile.png
 create mode 100644 games/NXDoom/man/.gitignore
 create mode 100644 games/NXDoom/man/CMDLINE.template
 create mode 100644 games/NXDoom/man/CMDLINE.template.md
 create mode 100644 games/NXDoom/man/INSTALL.template
 create mode 100644 games/NXDoom/man/Makefile.am
 create mode 100644 games/NXDoom/man/bash-completion/.gitignore
 create mode 100644 games/NXDoom/man/bash-completion/Makefile.am
 create mode 100644 games/NXDoom/man/bash-completion/doom.template.in
 create mode 100644 games/NXDoom/man/bash-completion/heretic.template.in
 create mode 100644 games/NXDoom/man/bash-completion/hexen.template.in
 create mode 100644 games/NXDoom/man/bash-completion/strife.template.in
 create mode 100644 games/NXDoom/man/default.cfg.template
 create mode 100755 games/NXDoom/man/docgen
 create mode 100644 games/NXDoom/man/doom.template
 create mode 100644 games/NXDoom/man/environ.man
 create mode 100644 games/NXDoom/man/extra.cfg.template
 create mode 100644 games/NXDoom/man/heretic.template
 create mode 100644 games/NXDoom/man/hexen.template
 create mode 100644 games/NXDoom/man/iwad_paths.man
 create mode 100644 games/NXDoom/man/server.template
 create mode 100644 games/NXDoom/man/setup.template
 create mode 100755 games/NXDoom/man/simplecpp
 create mode 100644 games/NXDoom/man/strife.template
 create mode 100644 games/NXDoom/man/wikipages
 create mode 100644 games/NXDoom/opl/.gitignore
 create mode 100644 games/NXDoom/opl/CMakeLists.txt
 create mode 100644 games/NXDoom/opl/Makefile.am
 create mode 100644 games/NXDoom/opl/examples/.gitignore
 create mode 100644 games/NXDoom/opl/examples/Makefile.am
 create mode 100644 games/NXDoom/opl/examples/droplay.c
 create mode 100644 games/NXDoom/opl/ioperm_sys.c
 create mode 100644 games/NXDoom/opl/ioperm_sys.h
 create mode 100644 games/NXDoom/opl/opl.c
 create mode 100644 games/NXDoom/opl/opl.h
 create mode 100644 games/NXDoom/opl/opl3.c
 create mode 100644 games/NXDoom/opl/opl3.h
 create mode 100644 games/NXDoom/opl/opl_internal.h
 create mode 100644 games/NXDoom/opl/opl_linux.c
 create mode 100644 games/NXDoom/opl/opl_obsd.c
 create mode 100644 games/NXDoom/opl/opl_queue.c
 create mode 100644 games/NXDoom/opl/opl_queue.h
 create mode 100644 games/NXDoom/opl/opl_sdl.c
 create mode 100644 games/NXDoom/opl/opl_timer.c
 create mode 100644 games/NXDoom/opl/opl_timer.h
 create mode 100644 games/NXDoom/opl/opl_win32.c
 create mode 100644 games/NXDoom/pcsound/.gitignore
 create mode 100644 games/NXDoom/pcsound/CMakeLists.txt
 create mode 100644 games/NXDoom/pcsound/Makefile.am
 create mode 100644 games/NXDoom/pcsound/pcsound.c
 create mode 100644 games/NXDoom/pcsound/pcsound.h
 create mode 100644 games/NXDoom/pcsound/pcsound_bsd.c
 create mode 100644 games/NXDoom/pcsound/pcsound_internal.h
 create mode 100644 games/NXDoom/pcsound/pcsound_linux.c
 create mode 100644 games/NXDoom/pcsound/pcsound_sdl.c
 create mode 100644 games/NXDoom/pcsound/pcsound_win32.c
 create mode 100644 games/NXDoom/pkg/.gitignore
 create mode 100644 games/NXDoom/pkg/Makefile.am
 create mode 100644 games/NXDoom/pkg/config.make.in
 create mode 100644 games/NXDoom/pkg/osx/.gitignore
 create mode 100644 games/NXDoom/pkg/osx/AppController.h
 create mode 100644 games/NXDoom/pkg/osx/AppController.m
 create mode 100644 games/NXDoom/pkg/osx/Execute.h
 create mode 100644 games/NXDoom/pkg/osx/Execute.m
 create mode 100644 games/NXDoom/pkg/osx/GNUmakefile
 create mode 100644 games/NXDoom/pkg/osx/IWADController.h
 create mode 100644 games/NXDoom/pkg/osx/IWADController.m
 create mode 100644 games/NXDoom/pkg/osx/Info.plist.in
 create mode 100644 games/NXDoom/pkg/osx/LauncherManager.h
 create mode 100644 games/NXDoom/pkg/osx/LauncherManager.m
 create mode 100644 games/NXDoom/pkg/osx/PkgInfo
 create mode 100644 games/NXDoom/pkg/osx/Resources/app.png
 create mode 100644 games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib
 create mode 100644 games/NXDoom/pkg/osx/Resources/launcher.nib/keyedobjects.nib
 create mode 100755 games/NXDoom/pkg/osx/cp-with-libs
 create mode 100644 games/NXDoom/pkg/osx/disk/background.png
 create mode 100644 games/NXDoom/pkg/osx/disk/dir.DS_Store
 create mode 100755 games/NXDoom/pkg/osx/dmgfix
 create mode 100644 games/NXDoom/pkg/osx/main.m
 create mode 100644 games/NXDoom/pkg/style.html
 create mode 100644 games/NXDoom/pkg/win32/.gitignore
 create mode 100644 games/NXDoom/pkg/win32/GNUmakefile
 create mode 100644 games/NXDoom/pkg/win32/README
 create mode 100755 games/NXDoom/pkg/win32/cp-with-libs
 create mode 100644 games/NXDoom/rpm.spec.in
 create mode 100644 games/NXDoom/src/.gitignore
 create mode 100644 games/NXDoom/src/CMakeLists.txt
 create mode 100644 games/NXDoom/src/Doom.desktop.in
 create mode 100644 games/NXDoom/src/Doom.metainfo.xml.in
 create mode 100644 games/NXDoom/src/Doom_Screensaver.desktop.in
 create mode 100644 games/NXDoom/src/Heretic.desktop.in
 create mode 100644 games/NXDoom/src/Heretic.metainfo.xml.in
 create mode 100644 games/NXDoom/src/Hexen.desktop.in
 create mode 100644 games/NXDoom/src/Hexen.metainfo.xml.in
 create mode 100644 games/NXDoom/src/Makefile.am
 create mode 100644 games/NXDoom/src/Strife.desktop.in
 create mode 100644 games/NXDoom/src/Strife.metainfo.xml.in
 create mode 100644 games/NXDoom/src/aes_prng.c
 create mode 100644 games/NXDoom/src/aes_prng.h
 create mode 100644 games/NXDoom/src/d_dedicated.c
 create mode 100644 games/NXDoom/src/d_event.c
 create mode 100644 games/NXDoom/src/d_event.h
 create mode 100644 games/NXDoom/src/d_iwad.c
 create mode 100644 games/NXDoom/src/d_iwad.h
 create mode 100644 games/NXDoom/src/d_loop.c
 create mode 100644 games/NXDoom/src/d_loop.h
 create mode 100644 games/NXDoom/src/d_mode.c
 create mode 100644 games/NXDoom/src/d_mode.h
 create mode 100644 games/NXDoom/src/d_ticcmd.h
 create mode 100644 games/NXDoom/src/deh_defs.h
 create mode 100644 games/NXDoom/src/deh_io.c
 create mode 100644 games/NXDoom/src/deh_io.h
 create mode 100644 games/NXDoom/src/deh_main.c
 create mode 100644 games/NXDoom/src/deh_main.h
 create mode 100644 games/NXDoom/src/deh_mapping.c
 create mode 100644 games/NXDoom/src/deh_mapping.h
 create mode 100644 games/NXDoom/src/deh_str.c
 create mode 100644 games/NXDoom/src/deh_str.h
 create mode 100644 games/NXDoom/src/deh_text.c
 create mode 100644 games/NXDoom/src/doom-res.rc.in
 create mode 100644 games/NXDoom/src/doom/.gitignore
 create mode 100644 games/NXDoom/src/doom/CMakeLists.txt
 create mode 100644 games/NXDoom/src/doom/Makefile.am
 create mode 100644 games/NXDoom/src/doom/am_map.c
 create mode 100644 games/NXDoom/src/doom/am_map.h
 create mode 100644 games/NXDoom/src/doom/d_englsh.h
 create mode 100644 games/NXDoom/src/doom/d_items.c
 create mode 100644 games/NXDoom/src/doom/d_items.h
 create mode 100644 games/NXDoom/src/doom/d_main.c
 create mode 100644 games/NXDoom/src/doom/d_main.h
 create mode 100644 games/NXDoom/src/doom/d_net.c
 create mode 100644 games/NXDoom/src/doom/d_player.h
 create mode 100644 games/NXDoom/src/doom/d_textur.h
 create mode 100644 games/NXDoom/src/doom/d_think.h
 create mode 100644 games/NXDoom/src/doom/deh_ammo.c
 create mode 100644 games/NXDoom/src/doom/deh_bexstr.c
 create mode 100644 games/NXDoom/src/doom/deh_cheat.c
 create mode 100644 games/NXDoom/src/doom/deh_doom.c
 create mode 100644 games/NXDoom/src/doom/deh_frame.c
 create mode 100644 games/NXDoom/src/doom/deh_misc.c
 create mode 100644 games/NXDoom/src/doom/deh_misc.h
 create mode 100644 games/NXDoom/src/doom/deh_ptr.c
 create mode 100644 games/NXDoom/src/doom/deh_sound.c
 create mode 100644 games/NXDoom/src/doom/deh_thing.c
 create mode 100644 games/NXDoom/src/doom/deh_weapon.c
 create mode 100644 games/NXDoom/src/doom/doom_icon.c
 create mode 100644 games/NXDoom/src/doom/doomdata.h
 create mode 100644 games/NXDoom/src/doom/doomdef.c
 create mode 100644 games/NXDoom/src/doom/doomdef.h
 create mode 100644 games/NXDoom/src/doom/doomstat.c
 create mode 100644 games/NXDoom/src/doom/doomstat.h
 create mode 100644 games/NXDoom/src/doom/dstrings.c
 create mode 100644 games/NXDoom/src/doom/dstrings.h
 create mode 100644 games/NXDoom/src/doom/f_finale.c
 create mode 100644 games/NXDoom/src/doom/f_finale.h
 create mode 100644 games/NXDoom/src/doom/f_wipe.c
 create mode 100644 games/NXDoom/src/doom/f_wipe.h
 create mode 100644 games/NXDoom/src/doom/g_game.c
 create mode 100644 games/NXDoom/src/doom/g_game.h
 create mode 100644 games/NXDoom/src/doom/hu_lib.c
 create mode 100644 games/NXDoom/src/doom/hu_lib.h
 create mode 100644 games/NXDoom/src/doom/hu_stuff.c
 create mode 100644 games/NXDoom/src/doom/hu_stuff.h
 create mode 100644 games/NXDoom/src/doom/info.c
 create mode 100644 games/NXDoom/src/doom/info.h
 create mode 100644 games/NXDoom/src/doom/m_menu.c
 create mode 100644 games/NXDoom/src/doom/m_menu.h
 create mode 100644 games/NXDoom/src/doom/m_random.c
 create mode 100644 games/NXDoom/src/doom/m_random.h
 create mode 100644 games/NXDoom/src/doom/p_ceilng.c
 create mode 100644 games/NXDoom/src/doom/p_doors.c
 create mode 100644 games/NXDoom/src/doom/p_enemy.c
 create mode 100644 games/NXDoom/src/doom/p_floor.c
 create mode 100644 games/NXDoom/src/doom/p_inter.c
 create mode 100644 games/NXDoom/src/doom/p_inter.h
 create mode 100644 games/NXDoom/src/doom/p_lights.c
 create mode 100644 games/NXDoom/src/doom/p_local.h
 create mode 100644 games/NXDoom/src/doom/p_map.c
 create mode 100644 games/NXDoom/src/doom/p_maputl.c
 create mode 100644 games/NXDoom/src/doom/p_mobj.c
 create mode 100644 games/NXDoom/src/doom/p_mobj.h
 create mode 100644 games/NXDoom/src/doom/p_plats.c
 create mode 100644 games/NXDoom/src/doom/p_pspr.c
 create mode 100644 games/NXDoom/src/doom/p_pspr.h
 create mode 100644 games/NXDoom/src/doom/p_saveg.c
 create mode 100644 games/NXDoom/src/doom/p_saveg.h
 create mode 100644 games/NXDoom/src/doom/p_setup.c
 create mode 100644 games/NXDoom/src/doom/p_setup.h
 create mode 100644 games/NXDoom/src/doom/p_sight.c
 create mode 100644 games/NXDoom/src/doom/p_spec.c
 create mode 100644 games/NXDoom/src/doom/p_spec.h
 create mode 100644 games/NXDoom/src/doom/p_switch.c
 create mode 100644 games/NXDoom/src/doom/p_telept.c
 create mode 100644 games/NXDoom/src/doom/p_tick.c
 create mode 100644 games/NXDoom/src/doom/p_tick.h
 create mode 100644 games/NXDoom/src/doom/p_user.c
 create mode 100644 games/NXDoom/src/doom/r_bsp.c
 create mode 100644 games/NXDoom/src/doom/r_bsp.h
 create mode 100644 games/NXDoom/src/doom/r_data.c
 create mode 100644 games/NXDoom/src/doom/r_data.h
 create mode 100644 games/NXDoom/src/doom/r_defs.h
 create mode 100644 games/NXDoom/src/doom/r_draw.c
 create mode 100644 games/NXDoom/src/doom/r_draw.h
 create mode 100644 games/NXDoom/src/doom/r_local.h
 create mode 100644 games/NXDoom/src/doom/r_main.c
 create mode 100644 games/NXDoom/src/doom/r_main.h
 create mode 100644 games/NXDoom/src/doom/r_plane.c
 create mode 100644 games/NXDoom/src/doom/r_plane.h
 create mode 100644 games/NXDoom/src/doom/r_segs.c
 create mode 100644 games/NXDoom/src/doom/r_segs.h
 create mode 100644 games/NXDoom/src/doom/r_sky.c
 create mode 100644 games/NXDoom/src/doom/r_sky.h
 create mode 100644 games/NXDoom/src/doom/r_state.h
 create mode 100644 games/NXDoom/src/doom/r_things.c
 create mode 100644 games/NXDoom/src/doom/r_things.h
 create mode 100644 games/NXDoom/src/doom/s_sound.c
 create mode 100644 games/NXDoom/src/doom/s_sound.h
 create mode 100644 games/NXDoom/src/doom/sounds.c
 create mode 100644 games/NXDoom/src/doom/sounds.h
 create mode 100644 games/NXDoom/src/doom/st_lib.c
 create mode 100644 games/NXDoom/src/doom/st_lib.h
 create mode 100644 games/NXDoom/src/doom/st_stuff.c
 create mode 100644 games/NXDoom/src/doom/st_stuff.h
 create mode 100644 games/NXDoom/src/doom/statdump.c
 create mode 100644 games/NXDoom/src/doom/statdump.h
 create mode 100644 games/NXDoom/src/doom/wi_stuff.c
 create mode 100644 games/NXDoom/src/doom/wi_stuff.h
 create mode 100644 games/NXDoom/src/doomkeys.h
 create mode 100644 games/NXDoom/src/doomtype.h
 create mode 100644 games/NXDoom/src/gusconf.c
 create mode 100644 games/NXDoom/src/gusconf.h
 create mode 100644 games/NXDoom/src/heretic-res.rc.in
 create mode 100644 games/NXDoom/src/heretic/.gitignore
 create mode 100644 games/NXDoom/src/heretic/CMakeLists.txt
 create mode 100644 games/NXDoom/src/heretic/Makefile.am
 create mode 100644 games/NXDoom/src/heretic/am_data.h
 create mode 100644 games/NXDoom/src/heretic/am_map.c
 create mode 100644 games/NXDoom/src/heretic/am_map.h
 create mode 100644 games/NXDoom/src/heretic/ct_chat.c
 create mode 100644 games/NXDoom/src/heretic/ct_chat.h
 create mode 100644 games/NXDoom/src/heretic/d_main.c
 create mode 100644 games/NXDoom/src/heretic/d_net.c
 create mode 100644 games/NXDoom/src/heretic/deh_ammo.c
 create mode 100644 games/NXDoom/src/heretic/deh_frame.c
 create mode 100644 games/NXDoom/src/heretic/deh_htext.c
 create mode 100644 games/NXDoom/src/heretic/deh_htic.c
 create mode 100644 games/NXDoom/src/heretic/deh_htic.h
 create mode 100644 games/NXDoom/src/heretic/deh_sound.c
 create mode 100644 games/NXDoom/src/heretic/deh_thing.c
 create mode 100644 games/NXDoom/src/heretic/deh_weapon.c
 create mode 100644 games/NXDoom/src/heretic/doomdata.h
 create mode 100644 games/NXDoom/src/heretic/doomdef.h
 create mode 100644 games/NXDoom/src/heretic/dstrings.h
 create mode 100644 games/NXDoom/src/heretic/f_finale.c
 create mode 100644 games/NXDoom/src/heretic/g_game.c
 create mode 100644 games/NXDoom/src/heretic/heretic_icon.c
 create mode 100644 games/NXDoom/src/heretic/in_lude.c
 create mode 100644 games/NXDoom/src/heretic/info.c
 create mode 100644 games/NXDoom/src/heretic/info.h
 create mode 100644 games/NXDoom/src/heretic/m_random.c
 create mode 100644 games/NXDoom/src/heretic/m_random.h
 create mode 100644 games/NXDoom/src/heretic/mn_menu.c
 create mode 100644 games/NXDoom/src/heretic/p_action.h
 create mode 100644 games/NXDoom/src/heretic/p_ceilng.c
 create mode 100644 games/NXDoom/src/heretic/p_doors.c
 create mode 100644 games/NXDoom/src/heretic/p_enemy.c
 create mode 100644 games/NXDoom/src/heretic/p_floor.c
 create mode 100644 games/NXDoom/src/heretic/p_inter.c
 create mode 100644 games/NXDoom/src/heretic/p_lights.c
 create mode 100644 games/NXDoom/src/heretic/p_local.h
 create mode 100644 games/NXDoom/src/heretic/p_map.c
 create mode 100644 games/NXDoom/src/heretic/p_maputl.c
 create mode 100644 games/NXDoom/src/heretic/p_mobj.c
 create mode 100644 games/NXDoom/src/heretic/p_plats.c
 create mode 100644 games/NXDoom/src/heretic/p_pspr.c
 create mode 100644 games/NXDoom/src/heretic/p_saveg.c
 create mode 100644 games/NXDoom/src/heretic/p_setup.c
 create mode 100644 games/NXDoom/src/heretic/p_sight.c
 create mode 100644 games/NXDoom/src/heretic/p_spec.c
 create mode 100644 games/NXDoom/src/heretic/p_spec.h
 create mode 100644 games/NXDoom/src/heretic/p_switch.c
 create mode 100644 games/NXDoom/src/heretic/p_telept.c
 create mode 100644 games/NXDoom/src/heretic/p_tick.c
 create mode 100644 games/NXDoom/src/heretic/p_user.c
 create mode 100644 games/NXDoom/src/heretic/r_bsp.c
 create mode 100644 games/NXDoom/src/heretic/r_data.c
 create mode 100644 games/NXDoom/src/heretic/r_draw.c
 create mode 100644 games/NXDoom/src/heretic/r_local.h
 create mode 100644 games/NXDoom/src/heretic/r_main.c
 create mode 100644 games/NXDoom/src/heretic/r_plane.c
 create mode 100644 games/NXDoom/src/heretic/r_segs.c
 create mode 100644 games/NXDoom/src/heretic/r_things.c
 create mode 100644 games/NXDoom/src/heretic/s_sound.c
 create mode 100644 games/NXDoom/src/heretic/s_sound.h
 create mode 100644 games/NXDoom/src/heretic/sb_bar.c
 create mode 100644 games/NXDoom/src/heretic/sounds.c
 create mode 100644 games/NXDoom/src/heretic/sounds.h
 create mode 100644 games/NXDoom/src/hexen-res.rc.in
 create mode 100644 games/NXDoom/src/hexen/.gitignore
 create mode 100644 games/NXDoom/src/hexen/CMakeLists.txt
 create mode 100644 games/NXDoom/src/hexen/Makefile.am
 create mode 100644 games/NXDoom/src/hexen/a_action.c
 create mode 100644 games/NXDoom/src/hexen/am_data.h
 create mode 100644 games/NXDoom/src/hexen/am_map.c
 create mode 100644 games/NXDoom/src/hexen/am_map.h
 create mode 100644 games/NXDoom/src/hexen/ct_chat.c
 create mode 100644 games/NXDoom/src/hexen/ct_chat.h
 create mode 100644 games/NXDoom/src/hexen/d_net.c
 create mode 100644 games/NXDoom/src/hexen/f_finale.c
 create mode 100644 games/NXDoom/src/hexen/g_game.c
 create mode 100644 games/NXDoom/src/hexen/h2_main.c
 create mode 100644 games/NXDoom/src/hexen/h2def.h
 create mode 100644 games/NXDoom/src/hexen/hexen_icon.c
 create mode 100644 games/NXDoom/src/hexen/in_lude.c
 create mode 100644 games/NXDoom/src/hexen/info.c
 create mode 100644 games/NXDoom/src/hexen/info.h
 create mode 100644 games/NXDoom/src/hexen/m_random.c
 create mode 100644 games/NXDoom/src/hexen/m_random.h
 create mode 100644 games/NXDoom/src/hexen/mn_menu.c
 create mode 100644 games/NXDoom/src/hexen/p_acs.c
 create mode 100644 games/NXDoom/src/hexen/p_action.h
 create mode 100644 games/NXDoom/src/hexen/p_anim.c
 create mode 100644 games/NXDoom/src/hexen/p_ceilng.c
 create mode 100644 games/NXDoom/src/hexen/p_doors.c
 create mode 100644 games/NXDoom/src/hexen/p_enemy.c
 create mode 100644 games/NXDoom/src/hexen/p_floor.c
 create mode 100644 games/NXDoom/src/hexen/p_inter.c
 create mode 100644 games/NXDoom/src/hexen/p_lights.c
 create mode 100644 games/NXDoom/src/hexen/p_local.h
 create mode 100644 games/NXDoom/src/hexen/p_map.c
 create mode 100644 games/NXDoom/src/hexen/p_maputl.c
 create mode 100644 games/NXDoom/src/hexen/p_mobj.c
 create mode 100644 games/NXDoom/src/hexen/p_plats.c
 create mode 100644 games/NXDoom/src/hexen/p_pspr.c
 create mode 100644 games/NXDoom/src/hexen/p_setup.c
 create mode 100644 games/NXDoom/src/hexen/p_sight.c
 create mode 100644 games/NXDoom/src/hexen/p_spec.c
 create mode 100644 games/NXDoom/src/hexen/p_spec.h
 create mode 100644 games/NXDoom/src/hexen/p_switch.c
 create mode 100644 games/NXDoom/src/hexen/p_telept.c
 create mode 100644 games/NXDoom/src/hexen/p_things.c
 create mode 100644 games/NXDoom/src/hexen/p_tick.c
 create mode 100644 games/NXDoom/src/hexen/p_user.c
 create mode 100644 games/NXDoom/src/hexen/po_man.c
 create mode 100644 games/NXDoom/src/hexen/r_bsp.c
 create mode 100644 games/NXDoom/src/hexen/r_data.c
 create mode 100644 games/NXDoom/src/hexen/r_draw.c
 create mode 100644 games/NXDoom/src/hexen/r_local.h
 create mode 100644 games/NXDoom/src/hexen/r_main.c
 create mode 100644 games/NXDoom/src/hexen/r_plane.c
 create mode 100644 games/NXDoom/src/hexen/r_segs.c
 create mode 100644 games/NXDoom/src/hexen/r_things.c
 create mode 100644 games/NXDoom/src/hexen/s_sound.c
 create mode 100644 games/NXDoom/src/hexen/s_sound.h
 create mode 100644 games/NXDoom/src/hexen/sb_bar.c
 create mode 100644 games/NXDoom/src/hexen/sc_man.c
 create mode 100644 games/NXDoom/src/hexen/sn_sonix.c
 create mode 100644 games/NXDoom/src/hexen/sounds.c
 create mode 100644 games/NXDoom/src/hexen/sounds.h
 create mode 100644 games/NXDoom/src/hexen/st_start.c
 create mode 100644 games/NXDoom/src/hexen/st_start.h
 create mode 100644 games/NXDoom/src/hexen/sv_save.c
 create mode 100644 games/NXDoom/src/hexen/textdefs.h
 create mode 100644 games/NXDoom/src/hexen/xddefs.h
 create mode 100644 games/NXDoom/src/i_cdmus.c
 create mode 100644 games/NXDoom/src/i_cdmus.h
 create mode 100644 games/NXDoom/src/i_endoom.c
 create mode 100644 games/NXDoom/src/i_endoom.h
 create mode 100644 games/NXDoom/src/i_flmusic.c
 create mode 100644 games/NXDoom/src/i_glob.c
 create mode 100644 games/NXDoom/src/i_glob.h
 create mode 100644 games/NXDoom/src/i_input.c
 create mode 100644 games/NXDoom/src/i_input.h
 create mode 100644 games/NXDoom/src/i_joystick.c
 create mode 100644 games/NXDoom/src/i_joystick.h
 create mode 100644 games/NXDoom/src/i_main.c
 create mode 100644 games/NXDoom/src/i_musicpack.c
 create mode 100644 games/NXDoom/src/i_oplmusic.c
 create mode 100644 games/NXDoom/src/i_pcsound.c
 create mode 100644 games/NXDoom/src/i_sdlmusic.c
 create mode 100644 games/NXDoom/src/i_sdlsound.c
 create mode 100644 games/NXDoom/src/i_sound.c
 create mode 100644 games/NXDoom/src/i_sound.h
 create mode 100644 games/NXDoom/src/i_swap.h
 create mode 100644 games/NXDoom/src/i_system.c
 create mode 100644 games/NXDoom/src/i_system.h
 create mode 100644 games/NXDoom/src/i_timer.c
 create mode 100644 games/NXDoom/src/i_timer.h
 create mode 100644 games/NXDoom/src/i_video.c
 create mode 100644 games/NXDoom/src/i_video.h
 create mode 100644 games/NXDoom/src/i_videohr.c
 create mode 100644 games/NXDoom/src/i_videohr.h
 create mode 100644 games/NXDoom/src/i_winmusic.c
 create mode 100644 games/NXDoom/src/m_argv.c
 create mode 100644 games/NXDoom/src/m_argv.h
 create mode 100644 games/NXDoom/src/m_bbox.c
 create mode 100644 games/NXDoom/src/m_bbox.h
 create mode 100644 games/NXDoom/src/m_cheat.c
 create mode 100644 games/NXDoom/src/m_cheat.h
 create mode 100644 games/NXDoom/src/m_config.c
 create mode 100644 games/NXDoom/src/m_config.h
 create mode 100644 games/NXDoom/src/m_controls.c
 create mode 100644 games/NXDoom/src/m_controls.h
 create mode 100644 games/NXDoom/src/m_fixed.c
 create mode 100644 games/NXDoom/src/m_fixed.h
 create mode 100644 games/NXDoom/src/m_misc.c
 create mode 100644 games/NXDoom/src/m_misc.h
 create mode 100644 games/NXDoom/src/manifest.xml
 create mode 100644 games/NXDoom/src/memio.c
 create mode 100644 games/NXDoom/src/memio.h
 create mode 100644 games/NXDoom/src/midifallback.c
 create mode 100644 games/NXDoom/src/midifallback.h
 create mode 100644 games/NXDoom/src/midifile.c
 create mode 100644 games/NXDoom/src/midifile.h
 create mode 100644 games/NXDoom/src/mus2mid.c
 create mode 100644 games/NXDoom/src/mus2mid.h
 create mode 100644 games/NXDoom/src/net_client.c
 create mode 100644 games/NXDoom/src/net_client.h
 create mode 100644 games/NXDoom/src/net_common.c
 create mode 100644 games/NXDoom/src/net_common.h
 create mode 100644 games/NXDoom/src/net_dedicated.c
 create mode 100644 games/NXDoom/src/net_dedicated.h
 create mode 100644 games/NXDoom/src/net_defs.h
 create mode 100644 games/NXDoom/src/net_gui.c
 create mode 100644 games/NXDoom/src/net_gui.h
 create mode 100644 games/NXDoom/src/net_io.c
 create mode 100644 games/NXDoom/src/net_io.h
 create mode 100644 games/NXDoom/src/net_loop.c
 create mode 100644 games/NXDoom/src/net_loop.h
 create mode 100644 games/NXDoom/src/net_packet.c
 create mode 100644 games/NXDoom/src/net_packet.h
 create mode 100644 games/NXDoom/src/net_petname.c
 create mode 100644 games/NXDoom/src/net_petname.h
 create mode 100644 games/NXDoom/src/net_query.c
 create mode 100644 games/NXDoom/src/net_query.h
 create mode 100644 games/NXDoom/src/net_sdl.c
 create mode 100644 games/NXDoom/src/net_sdl.h
 create mode 100644 games/NXDoom/src/net_server.c
 create mode 100644 games/NXDoom/src/net_server.h
 create mode 100644 games/NXDoom/src/net_structrw.c
 create mode 100644 games/NXDoom/src/net_structrw.h
 create mode 100644 games/NXDoom/src/p_rejectpad.c
 create mode 100644 games/NXDoom/src/p_rejectpad.h
 create mode 100644 games/NXDoom/src/setup-res.rc.in
 create mode 100644 games/NXDoom/src/setup/.gitignore
 create mode 100644 games/NXDoom/src/setup/CMakeLists.txt
 create mode 100644 games/NXDoom/src/setup/Makefile.am
 create mode 100644 games/NXDoom/src/setup/Setup.desktop.in
 create mode 100644 games/NXDoom/src/setup/compatibility.c
 create mode 100644 games/NXDoom/src/setup/compatibility.h
 create mode 100644 games/NXDoom/src/setup/display.c
 create mode 100644 games/NXDoom/src/setup/display.h
 create mode 100644 games/NXDoom/src/setup/execute.c
 create mode 100644 games/NXDoom/src/setup/execute.h
 create mode 100644 games/NXDoom/src/setup/joystick.c
 create mode 100644 games/NXDoom/src/setup/joystick.h
 create mode 100644 games/NXDoom/src/setup/keyboard.c
 create mode 100644 games/NXDoom/src/setup/keyboard.h
 create mode 100644 games/NXDoom/src/setup/mainmenu.c
 create mode 100644 games/NXDoom/src/setup/mode.c
 create mode 100644 games/NXDoom/src/setup/mode.h
 create mode 100644 games/NXDoom/src/setup/mouse.c
 create mode 100644 games/NXDoom/src/setup/mouse.h
 create mode 100644 games/NXDoom/src/setup/multiplayer.c
 create mode 100644 games/NXDoom/src/setup/multiplayer.h
 create mode 100644 games/NXDoom/src/setup/setup-manifest.xml.in
 create mode 100644 games/NXDoom/src/setup/setup_icon.c
 create mode 100644 games/NXDoom/src/setup/sound.c
 create mode 100644 games/NXDoom/src/setup/sound.h
 create mode 100644 games/NXDoom/src/setup/txt_joyaxis.c
 create mode 100644 games/NXDoom/src/setup/txt_joyaxis.h
 create mode 100644 games/NXDoom/src/setup/txt_joybinput.c
 create mode 100644 games/NXDoom/src/setup/txt_joybinput.h
 create mode 100644 games/NXDoom/src/setup/txt_keyinput.c
 create mode 100644 games/NXDoom/src/setup/txt_keyinput.h
 create mode 100644 games/NXDoom/src/setup/txt_mouseinput.c
 create mode 100644 games/NXDoom/src/setup/txt_mouseinput.h
 create mode 100644 games/NXDoom/src/sha1.c
 create mode 100644 games/NXDoom/src/sha1.h
 create mode 100644 games/NXDoom/src/strife-res.rc.in
 create mode 100644 games/NXDoom/src/strife/.gitignore
 create mode 100644 games/NXDoom/src/strife/CMakeLists.txt
 create mode 100644 games/NXDoom/src/strife/Makefile.am
 create mode 100644 games/NXDoom/src/strife/am_map.c
 create mode 100644 games/NXDoom/src/strife/am_map.h
 create mode 100644 games/NXDoom/src/strife/d_englsh.h
 create mode 100644 games/NXDoom/src/strife/d_items.c
 create mode 100644 games/NXDoom/src/strife/d_items.h
 create mode 100644 games/NXDoom/src/strife/d_main.c
 create mode 100644 games/NXDoom/src/strife/d_main.h
 create mode 100644 games/NXDoom/src/strife/d_net.c
 create mode 100644 games/NXDoom/src/strife/d_player.h
 create mode 100644 games/NXDoom/src/strife/d_textur.h
 create mode 100644 games/NXDoom/src/strife/d_think.h
 create mode 100644 games/NXDoom/src/strife/deh_ammo.c
 create mode 100644 games/NXDoom/src/strife/deh_cheat.c
 create mode 100644 games/NXDoom/src/strife/deh_frame.c
 create mode 100644 games/NXDoom/src/strife/deh_misc.c
 create mode 100644 games/NXDoom/src/strife/deh_misc.h
 create mode 100644 games/NXDoom/src/strife/deh_ptr.c
 create mode 100644 games/NXDoom/src/strife/deh_sound.c
 create mode 100644 games/NXDoom/src/strife/deh_strife.c
 create mode 100644 games/NXDoom/src/strife/deh_thing.c
 create mode 100644 games/NXDoom/src/strife/deh_weapon.c
 create mode 100644 games/NXDoom/src/strife/doomdata.h
 create mode 100644 games/NXDoom/src/strife/doomdef.c
 create mode 100644 games/NXDoom/src/strife/doomdef.h
 create mode 100644 games/NXDoom/src/strife/doomstat.c
 create mode 100644 games/NXDoom/src/strife/doomstat.h
 create mode 100644 games/NXDoom/src/strife/dstrings.c
 create mode 100644 games/NXDoom/src/strife/dstrings.h
 create mode 100644 games/NXDoom/src/strife/f_finale.c
 create mode 100644 games/NXDoom/src/strife/f_finale.h
 create mode 100644 games/NXDoom/src/strife/f_wipe.c
 create mode 100644 games/NXDoom/src/strife/f_wipe.h
 create mode 100644 games/NXDoom/src/strife/g_game.c
 create mode 100644 games/NXDoom/src/strife/g_game.h
 create mode 100644 games/NXDoom/src/strife/hu_lib.c
 create mode 100644 games/NXDoom/src/strife/hu_lib.h
 create mode 100644 games/NXDoom/src/strife/hu_stuff.c
 create mode 100644 games/NXDoom/src/strife/hu_stuff.h
 create mode 100644 games/NXDoom/src/strife/info.c
 create mode 100644 games/NXDoom/src/strife/info.h
 create mode 100644 games/NXDoom/src/strife/m_menu.c
 create mode 100644 games/NXDoom/src/strife/m_menu.h
 create mode 100644 games/NXDoom/src/strife/m_random.c
 create mode 100644 games/NXDoom/src/strife/m_random.h
 create mode 100644 games/NXDoom/src/strife/m_saves.c
 create mode 100644 games/NXDoom/src/strife/m_saves.h
 create mode 100644 games/NXDoom/src/strife/p_ceilng.c
 create mode 100644 games/NXDoom/src/strife/p_dialog.c
 create mode 100644 games/NXDoom/src/strife/p_dialog.h
 create mode 100644 games/NXDoom/src/strife/p_doors.c
 create mode 100644 games/NXDoom/src/strife/p_enemy.c
 create mode 100644 games/NXDoom/src/strife/p_floor.c
 create mode 100644 games/NXDoom/src/strife/p_inter.c
 create mode 100644 games/NXDoom/src/strife/p_inter.h
 create mode 100644 games/NXDoom/src/strife/p_lights.c
 create mode 100644 games/NXDoom/src/strife/p_local.h
 create mode 100644 games/NXDoom/src/strife/p_map.c
 create mode 100644 games/NXDoom/src/strife/p_maputl.c
 create mode 100644 games/NXDoom/src/strife/p_mobj.c
 create mode 100644 games/NXDoom/src/strife/p_mobj.h
 create mode 100644 games/NXDoom/src/strife/p_plats.c
 create mode 100644 games/NXDoom/src/strife/p_pspr.c
 create mode 100644 games/NXDoom/src/strife/p_pspr.h
 create mode 100644 games/NXDoom/src/strife/p_saveg.c
 create mode 100644 games/NXDoom/src/strife/p_saveg.h
 create mode 100644 games/NXDoom/src/strife/p_setup.c
 create mode 100644 games/NXDoom/src/strife/p_setup.h
 create mode 100644 games/NXDoom/src/strife/p_sight.c
 create mode 100644 games/NXDoom/src/strife/p_spec.c
 create mode 100644 games/NXDoom/src/strife/p_spec.h
 create mode 100644 games/NXDoom/src/strife/p_switch.c
 create mode 100644 games/NXDoom/src/strife/p_telept.c
 create mode 100644 games/NXDoom/src/strife/p_tick.c
 create mode 100644 games/NXDoom/src/strife/p_tick.h
 create mode 100644 games/NXDoom/src/strife/p_user.c
 create mode 100644 games/NXDoom/src/strife/r_bsp.c
 create mode 100644 games/NXDoom/src/strife/r_bsp.h
 create mode 100644 games/NXDoom/src/strife/r_data.c
 create mode 100644 games/NXDoom/src/strife/r_data.h
 create mode 100644 games/NXDoom/src/strife/r_defs.h
 create mode 100644 games/NXDoom/src/strife/r_draw.c
 create mode 100644 games/NXDoom/src/strife/r_draw.h
 create mode 100644 games/NXDoom/src/strife/r_local.h
 create mode 100644 games/NXDoom/src/strife/r_main.c
 create mode 100644 games/NXDoom/src/strife/r_main.h
 create mode 100644 games/NXDoom/src/strife/r_plane.c
 create mode 100644 games/NXDoom/src/strife/r_plane.h
 create mode 100644 games/NXDoom/src/strife/r_segs.c
 create mode 100644 games/NXDoom/src/strife/r_segs.h
 create mode 100644 games/NXDoom/src/strife/r_sky.c
 create mode 100644 games/NXDoom/src/strife/r_sky.h
 create mode 100644 games/NXDoom/src/strife/r_state.h
 create mode 100644 games/NXDoom/src/strife/r_things.c
 create mode 100644 games/NXDoom/src/strife/r_things.h
 create mode 100644 games/NXDoom/src/strife/s_sound.c
 create mode 100644 games/NXDoom/src/strife/s_sound.h
 create mode 100644 games/NXDoom/src/strife/sounds.c
 create mode 100644 games/NXDoom/src/strife/sounds.h
 create mode 100644 games/NXDoom/src/strife/st_lib.c
 create mode 100644 games/NXDoom/src/strife/st_lib.h
 create mode 100644 games/NXDoom/src/strife/st_stuff.c
 create mode 100644 games/NXDoom/src/strife/st_stuff.h
 create mode 100644 games/NXDoom/src/strife/strife_icon.c
 create mode 100644 games/NXDoom/src/strife/wi_stuff.c
 create mode 100644 games/NXDoom/src/strife/wi_stuff.h
 create mode 100644 games/NXDoom/src/tables.c
 create mode 100644 games/NXDoom/src/tables.h
 create mode 100644 games/NXDoom/src/v_diskicon.c
 create mode 100644 games/NXDoom/src/v_diskicon.h
 create mode 100644 games/NXDoom/src/v_patch.h
 create mode 100644 games/NXDoom/src/v_video.c
 create mode 100644 games/NXDoom/src/v_video.h
 create mode 100644 games/NXDoom/src/w_checksum.c
 create mode 100644 games/NXDoom/src/w_checksum.h
 create mode 100644 games/NXDoom/src/w_file.c
 create mode 100644 games/NXDoom/src/w_file.h
 create mode 100644 games/NXDoom/src/w_file_posix.c
 create mode 100644 games/NXDoom/src/w_file_stdc.c
 create mode 100644 games/NXDoom/src/w_file_win32.c
 create mode 100644 games/NXDoom/src/w_main.c
 create mode 100644 games/NXDoom/src/w_main.h
 create mode 100644 games/NXDoom/src/w_merge.c
 create mode 100644 games/NXDoom/src/w_merge.h
 create mode 100644 games/NXDoom/src/w_wad.c
 create mode 100644 games/NXDoom/src/w_wad.h
 create mode 100644 games/NXDoom/src/z_native.c
 create mode 100644 games/NXDoom/src/z_zone.c
 create mode 100644 games/NXDoom/src/z_zone.h
 create mode 100644 games/NXDoom/textscreen/.gitignore
 create mode 100644 games/NXDoom/textscreen/CMakeLists.txt
 create mode 100644 games/NXDoom/textscreen/Doxyfile
 create mode 100644 games/NXDoom/textscreen/Makefile.am
 create mode 100644 games/NXDoom/textscreen/examples/.gitignore
 create mode 100644 games/NXDoom/textscreen/examples/Makefile.am
 create mode 100644 games/NXDoom/textscreen/examples/calculator.c
 create mode 100644 games/NXDoom/textscreen/examples/guitest.c
 create mode 100644 games/NXDoom/textscreen/fonts/Makefile.am
 create mode 100644 games/NXDoom/textscreen/fonts/README
 create mode 100644 games/NXDoom/textscreen/fonts/codepage.h
 create mode 100755 games/NXDoom/textscreen/fonts/convert-font
 create mode 100644 games/NXDoom/textscreen/fonts/large.h
 create mode 100644 games/NXDoom/textscreen/fonts/large.png
 create mode 100644 games/NXDoom/textscreen/fonts/normal.h
 create mode 100644 games/NXDoom/textscreen/fonts/normal.png
 create mode 100644 games/NXDoom/textscreen/fonts/small.h
 create mode 100644 games/NXDoom/textscreen/fonts/small.png
 create mode 100644 games/NXDoom/textscreen/textscreen.h
 create mode 100644 games/NXDoom/textscreen/txt_button.c
 create mode 100644 games/NXDoom/textscreen/txt_button.h
 create mode 100644 games/NXDoom/textscreen/txt_checkbox.c
 create mode 100644 games/NXDoom/textscreen/txt_checkbox.h
 create mode 100644 games/NXDoom/textscreen/txt_conditional.c
 create mode 100644 games/NXDoom/textscreen/txt_conditional.h
 create mode 100644 games/NXDoom/textscreen/txt_desktop.c
 create mode 100644 games/NXDoom/textscreen/txt_desktop.h
 create mode 100644 games/NXDoom/textscreen/txt_dropdown.c
 create mode 100644 games/NXDoom/textscreen/txt_dropdown.h
 create mode 100644 games/NXDoom/textscreen/txt_fileselect.c
 create mode 100644 games/NXDoom/textscreen/txt_fileselect.h
 create mode 100644 games/NXDoom/textscreen/txt_gui.c
 create mode 100644 games/NXDoom/textscreen/txt_gui.h
 create mode 100644 games/NXDoom/textscreen/txt_inputbox.c
 create mode 100644 games/NXDoom/textscreen/txt_inputbox.h
 create mode 100644 games/NXDoom/textscreen/txt_io.c
 create mode 100644 games/NXDoom/textscreen/txt_io.h
 create mode 100644 games/NXDoom/textscreen/txt_label.c
 create mode 100644 games/NXDoom/textscreen/txt_label.h
 create mode 100644 games/NXDoom/textscreen/txt_main.h
 create mode 100644 games/NXDoom/textscreen/txt_radiobutton.c
 create mode 100644 games/NXDoom/textscreen/txt_radiobutton.h
 create mode 100644 games/NXDoom/textscreen/txt_scrollpane.c
 create mode 100644 games/NXDoom/textscreen/txt_scrollpane.h
 create mode 100644 games/NXDoom/textscreen/txt_sdl.c
 create mode 100644 games/NXDoom/textscreen/txt_sdl.h
 create mode 100644 games/NXDoom/textscreen/txt_separator.c
 create mode 100644 games/NXDoom/textscreen/txt_separator.h
 create mode 100644 games/NXDoom/textscreen/txt_spinctrl.c
 create mode 100644 games/NXDoom/textscreen/txt_spinctrl.h
 create mode 100644 games/NXDoom/textscreen/txt_strut.c
 create mode 100644 games/NXDoom/textscreen/txt_strut.h
 create mode 100644 games/NXDoom/textscreen/txt_table.c
 create mode 100644 games/NXDoom/textscreen/txt_table.h
 create mode 100644 games/NXDoom/textscreen/txt_utf8.c
 create mode 100644 games/NXDoom/textscreen/txt_utf8.h
 create mode 100644 games/NXDoom/textscreen/txt_widget.c
 create mode 100644 games/NXDoom/textscreen/txt_widget.h
 create mode 100644 games/NXDoom/textscreen/txt_window.c
 create mode 100644 games/NXDoom/textscreen/txt_window.h
 create mode 100644 games/NXDoom/textscreen/txt_window_action.c
 create mode 100644 games/NXDoom/textscreen/txt_window_action.h
 create mode 100644 games/NXDoom/vcpkg.json
 create mode 100644 games/NXDoom/win32/win_opendir.c
 create mode 100644 games/NXDoom/win32/win_opendir.h

diff --git a/games/NXDoom/.devcontainer/.gitignore b/games/NXDoom/.devcontainer/.gitignore
new file mode 100644
index 000000000..70fdefc76
--- /dev/null
+++ b/games/NXDoom/.devcontainer/.gitignore
@@ -0,0 +1,4 @@
+*.xauth
+wads/
+prefs/
+share/
\ No newline at end of file
diff --git a/games/NXDoom/.devcontainer/Dockerfile b/games/NXDoom/.devcontainer/Dockerfile
new file mode 100644
index 000000000..589a6cede
--- /dev/null
+++ b/games/NXDoom/.devcontainer/Dockerfile
@@ -0,0 +1,39 @@
+FROM ubuntu
+
+######### Apt dependencies
+
+ARG system_apt_dependencies="build-essential gdb automake autoconf libtool git pkg-config python3 python3-pip sudo"
+ARG choco_apt_dependencies="gcc make libsdl2-dev libsdl2-net-dev libsdl2-mixer-dev"
+ARG choco_apt_dependencies_optional="libflac-dev libfluidsynth-dev libpng-dev libsamplerate-dev libvorbis-dev"
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq $system_apt_dependencies $choco_apt_dependencies $choco_apt_dependencies_optional
+
+########## Install Pillow (PIL) via pip, not apt
+
+ARG choco_pip_dependencies="pillow"
+RUN pip install $choco_pip_dependencies
+
+########## Container user setup
+
+ARG USERNAME=chocodev
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
+
+# Add sudo support
+RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+
+# Add the user to the audio group, to have ALSA sound access
+# TODO: pulseaudio, so this isn't necessary?
+RUN addgroup $USERNAME audio
+
+# Use bash, not sh. Yuck.
+RUN chsh $USERNAME -s /bin/bash
+
+USER $USERNAME
+
+# Make sure we actually own our own local share stuff
+RUN mkdir -p /home/$USERNAME/.local/share && \
+    chown -R $USERNAME:$USERNAME /home/$USERNAME/.local
diff --git a/games/NXDoom/.devcontainer/devcontainer.json b/games/NXDoom/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..cca038698
--- /dev/null
+++ b/games/NXDoom/.devcontainer/devcontainer.json
@@ -0,0 +1,45 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/docker-existing-dockerfile
+{
+	"name": "Doom Dev Container",
+	"context": "..",
+	"dockerFile": "./Dockerfile",
+	
+	"extensions": [
+		"yzhang.markdown-all-in-one",
+		"bierner.markdown-preview-github-styles",
+		"dotjoshjohnson.xml",
+
+		"eamodio.gitlens",
+		"npxms.hide-gitignored",  // Note: need to run its command manually
+
+		// Build tooling
+		"ms-vscode.cpptools",
+		"cschlosser.doxdocgen",
+		"austin.code-gnu-global",
+		"jeff-hykin.better-cpp-syntax", // Note: runs locally
+		"ms-vscode.cpptools-themes", // Note: runs locally
+	],
+
+	// Required to not bleed "root" permission files into the host volume
+	"containerUser": "chocodev",
+
+	// VSCode on Linux specific, for creating X11 and sound forwarding
+	// Comment out manually if working on non-Linux
+	"initializeCommand": "${localWorkspaceFolder}/.devcontainer/initialize-linux.sh",
+	"mounts": [
+		"source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind",
+		"source=${localWorkspaceFolder}/.devcontainer/prefs,target=/home/chocodev/.local/share/chocolate-doom,type=bind",
+	],
+	"containerEnv": {
+		"DISPLAY": "${localEnv:DISPLAY}",
+		"XAUTHORITY": "${containerWorkspaceFolder}/.devcontainer/share/devcontainer.xauth",
+	},
+	"runArgs": [
+		// "--gpus", "all",  // Uncomment for GPU support
+		"--device", "/dev/snd",  
+		// TODO: pulseaudio? https://github.com/mviereck/x11docker/wiki/Container-sound:-ALSA-or-Pulseaudio
+	]
+
+	// TODO: X11/sound forwarding configs for MacOS (XQuartz) and Windows (Xming)
+}
diff --git a/games/NXDoom/.devcontainer/initialize-linux.sh b/games/NXDoom/.devcontainer/initialize-linux.sh
new file mode 100755
index 000000000..7a4275d36
--- /dev/null
+++ b/games/NXDoom/.devcontainer/initialize-linux.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+HERE=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+
+### Create the xauth file allowing the container to interact with a forwarded X11
+XAUTH="$HERE/share/devcontainer.xauth";
+touch "$XAUTH"
+xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
+
+### TODO: pulseaudio pasthrough
\ No newline at end of file
diff --git a/games/NXDoom/.github/CONTRIBUTING.md b/games/NXDoom/.github/CONTRIBUTING.md
new file mode 100644
index 000000000..ad3a1c110
--- /dev/null
+++ b/games/NXDoom/.github/CONTRIBUTING.md
@@ -0,0 +1,101 @@
+Thanks for contributing to Chocolate Doom! Whatever your contribution,
+whether it's code or just a bug report, it's greatly appreciated.
+
+The project is governed by the
+[Contributor Covenant](http://contributor-covenant.org/version/1/4/)
+version 1.4. By contributing to the project you agree to abide by its
+terms. To report violations, please send an email to fraggle@gmail.com.
+
+### Reporting bugs
+
+Before reporting a bug, it's worth checking if this really is a bug.
+Chocolate Doom's mission is to reproduce the Vanilla (DOS) versions of
+the Doom engine games, bugs and all. Check out the
+[NOT-BUGS](../NOT-BUGS.md) file for a list of common issues which aren't
+really bugs at all. You might also try searching [the GitHub issues
+list](https://github.com/chocolate-doom/chocolate-doom/issues) to see
+if your bug has already been reported.
+
+If you're confident that you've found a real bug (or even if you're
+not sure!) please go ahead and [file an issue on
+GitHub](https://github.com/chocolate-doom/chocolate-doom/issues/new).
+You'll need a GitHub account, but it's pretty easy to sign up.
+
+Please try to give as much information as possible:
+
+* What version of Chocolate Doom are you using? Check the title bar of
+  the window for the version number.
+
+* Chocolate Doom runs on many different operating systems (not just
+  Windows!). Please say which operating system and what version of it
+  you're using.
+
+* Please say which game you're playing (Doom 1, Doom 2, Heretic,
+  Hexen, Strife, etc.) and if you're using any fan-made WADs or mods,
+  please say which mods (and where they can be downloaded!). It helps
+  to give the full command line you're using to start the game.
+
+* Please mention if you have any special configuration you think may be
+  relevant, too.
+
+### Feature requests
+
+Chocolate Doom is always open to new feature requests; however, please
+be aware that the project is designed around a deliberately limited
+[philosophy](../PHILOSOPHY.md), and many features common in other source
+ports will not be accepted. Here are a few common requests which are
+often rejected:
+
+* "High resolution" rendering (greater than 320x200 display).
+
+* An option to disable Vanilla limits, such as the visplane rendering
+  limit.
+
+* Ability to play "No Rest For The Living", the expansion pack which
+  comes with the XBLA / BFG Edition of Doom.
+
+If you're not sure whether your feature is in line with the project
+philosophy, don't worry - just ask anyway!
+To make a feature request, [file an issue on
+GitHub](https://github.com/chocolate-doom/chocolate-doom/issues/new).
+
+### Bug fixes / code submission
+
+Thank you for contributing code to Chocolate Doom! Please check the
+following guidelines before opening a pull request:
+
+* All code must be licensed under [the GNU General Public License,
+  version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).
+  Please don't reuse code that isn't GPL, or that is GPLv3 licensed.
+  Be aware that by submitting your code to the project, you're agreeing
+  to license it under the GPL.
+
+* Please follow the coding style guidelines described in the
+  [HACKING](../HACKING.md) file.
+
+* Please don't make unnecessary changes which just change formatting
+  without any actual change to program logic. While being consistent
+  is nice, such changes destroy the ability to use the `git blame`
+  command to see when code was last changed.
+
+* The guidelines given above in the "feature requests" section also
+  apply here. New features which aren't in line with the project
+  philosophy are likely to be rejected. If you're not sure, open a
+  feature request first and ask before you start implementing your
+  feature.
+
+* Follow the guidelines for [how to write a Git commit
+  message](http://chris.beams.io/posts/git-commit/). In short: the
+  first line should be a short summary; keep to an 80 column limit;
+  use the imperative mood ("fix bug X", rather than "fixed bug X" or
+  "fixing bug X"). If your change fixes a particular subsystem,
+  prefix the summary with that subsystem: eg. "doom: Fix bug X" or
+  "textscreen: Change size of X".
+
+* If you're making a change related to a bug, reference the GitHub
+  issue number in the commit message, eg. "This is a partial fix
+  for #646". This will link your commit into the issue comments. If
+  your change is a fix for the bug, put the word "fixes" before the
+  issue number to automatically close the issue once your change
+  is merged.
+
diff --git a/games/NXDoom/.github/ISSUE_TEMPLATE.md b/games/NXDoom/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..101a5b337
--- /dev/null
+++ b/games/NXDoom/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+<!--
+  Thank you for reporting a bug in Chocolate Doom. Please complete
+  the following template so that we can better diagnose the source
+  of your problem.
+
+  To save yourself some time, you may want to check the FAQ and the
+  NOT-BUGS list for solutions to some common problems:
+
+     https://www.chocolate-doom.org/wiki/index.php/FAQ
+     https://www.chocolate-doom.org/not-bugs
+-->
+
+### Background
+
+Version of Chocolate Doom:
+
+Operating System and version:
+
+Game: (Doom/Heretic/Hexen/Strife/other)
+
+Any loaded WADs and mods (please include full command line):
+
+### Bug description
+
+Observed behavior:
+
+Expected behavior:
+
diff --git a/games/NXDoom/.github/workflows/cpp-linter.yml b/games/NXDoom/.github/workflows/cpp-linter.yml
new file mode 100644
index 000000000..931e0421a
--- /dev/null
+++ b/games/NXDoom/.github/workflows/cpp-linter.yml
@@ -0,0 +1,54 @@
+# Workflow syntax:
+# https://help.github.com/en/articles/workflow-syntax-for-github-actions
+name: cpp-linter
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  push:
+    branches:
+      - master
+
+jobs:
+  cpp-linter:
+    strategy:
+      matrix:
+        compiler: [clang]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install libfluidsynth-dev libpng-dev libsamplerate0-dev libsdl2-dev libsdl2-mixer-dev libsdl2-net-dev ninja-build
+      - name: Run cmake to generate compilation database
+        run: cmake -S . -B . -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+      - uses: cpp-linter/cpp-linter-action@v2
+        id: linter
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          style: file
+          lines-changed-only: true
+          version: 16
+          tidy-checks: >-
+            boost-*
+            ,bugprone-*
+            ,performance-*
+            ,readability-*
+            ,portability-*
+            ,modernize-*
+            ,clang-analyzer-*
+            ,cppcoreguidelines-*
+            ,-cppcoreguidelines-avoid-magic-numbers
+            ,-cppcoreguidelines-init-variables
+            ,-readability-identifier-length
+            ,-readability-isolate-declaration
+            ,-readability-magic-numbers
+
+      - name: Fail fast?!
+        if: steps.linter.outputs.checks-failed > 0
+        run: |
+          echo "Some files failed the linting checks! Fail fast disabled until false positive issue is fixed"
+
+      - name: Check no extern used in .c files
+        run: |
+          ./check-extern.sh
diff --git a/games/NXDoom/.github/workflows/cppcheck.yml b/games/NXDoom/.github/workflows/cppcheck.yml
new file mode 100644
index 000000000..213afba01
--- /dev/null
+++ b/games/NXDoom/.github/workflows/cppcheck.yml
@@ -0,0 +1,23 @@
+name: cppcheck
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  push:
+    branches:
+      - master
+
+jobs:
+  cppcheck:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install cppcheck
+
+      - uses: actions/checkout@v6
+
+      - name: Run cppcheck
+        env:
+          ANALYZE: true
+        run: $GITHUB_WORKSPACE/.travis.sh
diff --git a/games/NXDoom/.github/workflows/main.yml b/games/NXDoom/.github/workflows/main.yml
new file mode 100644
index 000000000..b9a1a51c5
--- /dev/null
+++ b/games/NXDoom/.github/workflows/main.yml
@@ -0,0 +1,152 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches:
+      - "master"
+    tags:
+      - "*"
+    paths-ignore:
+      - "**.md"
+  pull_request:
+    branches:
+      - "master"
+    paths-ignore:
+      - "**.md"
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+    defaults:
+      run:
+        shell: ${{ matrix.config.shell }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: Linux GCC
+            os: ubuntu-latest
+            compiler: gcc
+            shell: bash
+
+          - name: macOS Clang
+            os: macos-latest
+            compiler: clang
+            shell: bash
+
+          - name: macOS x86 Clang
+            os: macos-15-intel
+            compiler: clang
+            shell: bash
+
+          - name: MSYS2 UCRT64
+            os: windows-latest
+            compiler: gcc
+            shell: 'msys2 {0}'
+            msystem: ucrt64
+            msys-env: mingw-w64-ucrt-x86_64
+            artifacts: true
+            pkg-path: pkg/win32/*.zip
+            pkg-dir: pkg/win32
+
+    steps:
+      - name: Install pandoc
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: choco install pandoc
+
+      - name: Install dependencies (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install \
+            libsdl2-dev \
+            libsdl2-mixer-dev \
+            libsdl2-net-dev \
+            libpng-dev \
+            libsamplerate0-dev \
+            libfluidsynth-dev
+
+      - name: Install dependencies (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install \
+            automake \
+            sdl2 \
+            sdl2_mixer \
+            sdl2_net \
+            libpng \
+            libsamplerate \
+            fluid-synth
+
+      - name: Install dependencies (MSYS2)
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.config.msystem }}
+          update: true
+          path-type: inherit
+          install: >-
+            autotools
+            zip
+            ${{ matrix.config.msys-env }}-python-pip
+            ${{ matrix.config.msys-env }}-gcc
+            ${{ matrix.config.msys-env }}-SDL2
+            ${{ matrix.config.msys-env }}-SDL2_mixer
+            ${{ matrix.config.msys-env }}-SDL2_net
+            ${{ matrix.config.msys-env }}-libpng
+            ${{ matrix.config.msys-env }}-libsamplerate
+            ${{ matrix.config.msys-env }}-fluidsynth
+
+      - uses: actions/checkout@v6
+        with:
+          submodules: true
+
+      - name: Configure
+        env:
+          CC: ${{ matrix.config.compiler }}
+        run: |
+          ./autogen.sh
+
+      - name: Build
+        run: make -j4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Test
+        run: |
+          pip install pyyaml
+          PREFIX=`sed -n '/PROGRAM_PREFIX/p' ${PWD}/config.h | cut -d '"' -f 2`
+          make -j4 -C quickcheck check SOURCE_PORT=$PWD/src/${PREFIX}doom
+
+      - name: Package
+        if: ${{ matrix.config.artifacts }}
+        run: |
+          cd ${{ matrix.config.pkg-dir }}
+          make
+
+      - name: Upload artifacts
+        if: ${{ matrix.config.artifacts }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.config.name }}
+          path: ${{ matrix.config.pkg-path }}
+
+      - name: Extract Package String
+        if: ${{ contains(github.ref, 'tags') }}
+        run: |
+          PACKAGE_STRING=`sed -n '/PACKAGE_STRING/p' ${PWD}/config.h | cut -d '"' -f 2`
+          echo "PACKAGE_STRING=${PACKAGE_STRING}" >> $GITHUB_ENV
+
+      - name: Release
+        if: ${{ contains(github.ref, 'tags') && matrix.config.artifacts }}
+        uses: ncipollo/release-action@v1
+        with:
+          name: ${{ env.PACKAGE_STRING }}
+          bodyFile: RELEASE_NOTES.md
+          allowUpdates: true
+          artifacts: ${{ matrix.config.pkg-path }}
diff --git a/games/NXDoom/.gitignore b/games/NXDoom/.gitignore
new file mode 100644
index 000000000..c41a75396
--- /dev/null
+++ b/games/NXDoom/.gitignore
@@ -0,0 +1,67 @@
+CMDLINE
+INSTALL
+Makefile
+Makefile.in
+TAGS
+aclocal.m4
+autom4te.cache
+autotools
+bin
+config.h
+config.hin
+config.log
+config.status
+configure
+lib
+obj
+rpm.spec
+stamp-h
+stamp-h.in
+stamp-h1
+tags
+\#*\#
+DOOM*.png
+HTIC*.png
+HEXEN*.png
+STRIFE*.png
+DOOM*.pcx
+HTIC*.pcx
+HEXEN*.pcx
+STRIFE*.pcx
+
+# CMake-specific ignores
+/.vs
+/build*
+/CMakeSettings.json
+/out
+
+# These are the default patterns globally ignored by Subversion:
+*.o
+*.lo
+*.la
+*.al
+.libs
+*.so
+*.so.[0-9]*
+*.a
+*.pyc
+*.pyo
+*.rej
+*~
+.#*
+.*.swp
+.DS_store
+
+# Ignore GNU Global tags and html files
+GPATH
+GRTAGS
+GTAGS
+/HTML/
+
+# VSCode settings
+
+/.vscode/
+
+# clangd settings
+/.cache/clangd
+compile_commands.json
diff --git a/games/NXDoom/.gitmodules b/games/NXDoom/.gitmodules
new file mode 100644
index 000000000..7a381cfd4
--- /dev/null
+++ b/games/NXDoom/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "quickcheck"]
+	path = quickcheck
+	url = https://github.com/chocolate-doom/quickcheck.git
diff --git a/games/NXDoom/.lvimrc b/games/NXDoom/.lvimrc
new file mode 100644
index 000000000..63e461335
--- /dev/null
+++ b/games/NXDoom/.lvimrc
@@ -0,0 +1,32 @@
+" Local vimrc configuration file.  Install the localvimrc.vim vim script.
+set expandtab
+set tabstop=8
+set softtabstop=4
+set shiftwidth=4
+
+" Add all tag files to tags path.
+
+let topdir = findfile("configure.ac", ".;")
+let topdir = substitute(topdir, "configure.ac", "", "")
+
+" Check tags file in current dir:
+set tags+=tags
+
+" Add tag files in parent directories:
+let tagfiles = findfile("tags", ".;", -1)
+
+" Add tag files for libraries:
+call add(tagfiles, topdir . "opl/tags")
+call add(tagfiles, topdir . "pcsound/tags")
+call add(tagfiles, topdir . "textscreen/tags")
+
+for tagfile in tagfiles
+    " Don't go beyond the project top level when adding parent dirs:
+    if stridx(tagfile, topdir) >= 0
+        exec "set tags+=" . tagfile
+    endif
+endfor
+
+unlet topdir
+unlet tagfiles
+
diff --git a/games/NXDoom/.travis.sh b/games/NXDoom/.travis.sh
new file mode 100755
index 000000000..683d9bea6
--- /dev/null
+++ b/games/NXDoom/.travis.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+if [ "$ANALYZE" = "true" ] ; then
+	# -D__GNUC__ is required for cppcheck to know about noreturn functions
+	cppcheck --error-exitcode=1 -j2 -UTESTING -D__GNUC__ -Iopl -Isrc -Isrc/setup opl pcsound src textscreen 2> stderr.txt
+	RET=$?
+	if [ -s stderr.txt ]
+	then
+		cat stderr.txt
+	fi
+	exit $RET
+else
+	set -e
+	./autogen.sh --enable-werror
+	make -j4
+	make install DESTDIR=/tmp/whatever
+	make dist
+	PREFIX=`sed -n '/PROGRAM_PREFIX/p' ${PWD}/config.h | cut -d '"' -f 2`
+	make -j4 -C quickcheck check SOURCE_PORT=$PWD/src/${PREFIX}doom
+fi
diff --git a/games/NXDoom/AUTHORS b/games/NXDoom/AUTHORS
new file mode 100644
index 000000000..6324caae4
--- /dev/null
+++ b/games/NXDoom/AUTHORS
@@ -0,0 +1,7 @@
+Simon Howard <fraggle@gmail.com>
+James Haley <haleyjd@hotmail.com>
+Samuel Villarreal <svkaiser@gmail.com>
+Fabian Greffrath <fabian@greffrath.com>
+Jonathan Dowland <jon@dow.land>
+Alexey Khokholov <alexeytf2@gmail.com>
+Turo Lamminen <turol@iki.fi>
diff --git a/games/NXDoom/CMakeLists.txt b/games/NXDoom/CMakeLists.txt
new file mode 100644
index 000000000..da58daca2
--- /dev/null
+++ b/games/NXDoom/CMakeLists.txt
@@ -0,0 +1,105 @@
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+cmake_minimum_required(VERSION 3.7.2)
+project("Chocolate Doom" VERSION 3.1.1 LANGUAGES C)
+
+set(CMAKE_C_STANDARD 99)
+
+# Autotools variables
+set(top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+set(top_builddir ${CMAKE_CURRENT_BINARY_DIR})
+
+# AC_INIT variables
+set(PACKAGE_NAME "${PROJECT_NAME}")
+set(PACKAGE_TARNAME "chocolate-doom")
+set(PACKAGE_VERSION "${PROJECT_VERSION}")
+set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+set(PACKAGE_BUGREPORT "chocolate-doom-dev-list@chocolate-doom.org")
+
+string(REGEX REPLACE " Doom$" "" PACKAGE_SHORTNAME "${PACKAGE_NAME}")
+set(PACKAGE_COPYRIGHT "Copyright (C) 1993-2025")
+set(PACKAGE_LICENSE "GNU General Public License, version 2")
+
+# Any settings that should apply to all targets in this directory and all
+# subdirectories should go here.  Use judiciously.
+if(MSVC)
+    add_definitions("/D_CRT_SECURE_NO_WARNINGS" "/D_CRT_SECURE_NO_DEPRECATE"
+                    "/D_CRT_NONSTDC_NO_DEPRECATE")
+else()
+    add_compile_options("-Wall" "-Wdeclaration-after-statement"
+                        "-Wredundant-decls")
+endif()
+
+option(CMAKE_FIND_PACKAGE_PREFER_CONFIG
+       "Lookup package config files before using find modules" On)
+
+option(ENABLE_SDL2_NET "Enable SDL2_net" On)
+option(ENABLE_SDL2_MIXER "Enable SDL2_mixer" On)
+
+if (NOT DEFINED EMSCRIPTEN)
+    find_package(SDL2 2.0.14)
+endif()
+if(ENABLE_SDL2_MIXER)
+    if (NOT DEFINED EMSCRIPTEN)
+        find_package(SDL2_mixer 2.0.2)
+    endif()
+else()
+    add_compile_definitions(DISABLE_SDL2MIXER=1)
+endif()
+
+if(ENABLE_SDL2_NET)
+    if (NOT DEFINED EMSCRIPTEN)
+        find_package(SDL2_net 2.0.0)
+    endif()
+else()
+    add_compile_definitions(DISABLE_SDL2NET=1)
+endif()
+
+
+# Check for libsamplerate.
+find_package(SampleRate)
+if(SampleRate_FOUND)
+    set(HAVE_LIBSAMPLERATE TRUE)
+endif()
+
+# Check for libpng.
+find_package(PNG)
+if(PNG_FOUND)
+    set(HAVE_LIBPNG TRUE)
+endif()
+
+# Check for FluidSynth.
+find_package(FluidSynth 2.2.0)
+if(FluidSynth_FOUND AND ENABLE_SDL2_MIXER)
+    set(HAVE_FLUIDSYNTH TRUE)
+endif()
+
+find_package(m)
+
+include(CheckSymbolExists)
+include(CheckIncludeFile)
+check_symbol_exists(strcasecmp "strings.h" HAVE_DECL_STRCASECMP)
+check_symbol_exists(strncasecmp "strings.h" HAVE_DECL_STRNCASECMP)
+check_include_file("dirent.h" HAVE_DIRENT_H)
+
+string(CONCAT WINDOWS_RC_VERSION "${PROJECT_VERSION_MAJOR}, "
+    "${PROJECT_VERSION_MINOR}, ${PROJECT_VERSION_PATCH}, 0")
+
+# Without a hyphen. This is used for the bash-completion scripts.
+string(TOLOWER "${PACKAGE_SHORTNAME}" PROGRAM_SPREFIX)
+
+# With a hyphen, used almost everywhere else.
+set(PROGRAM_PREFIX "${PROGRAM_SPREFIX}-")
+
+configure_file(cmake/config.h.cin config.h)
+
+configure_file(src/doom-res.rc.in src/doom-res.rc)
+configure_file(src/heretic-res.rc.in src/heretic-res.rc)
+configure_file(src/hexen-res.rc.in src/hexen-res.rc)
+configure_file(src/setup-res.rc.in src/setup-res.rc)
+configure_file(src/setup/setup-manifest.xml.in src/setup/setup-manifest.xml)
+configure_file(src/strife-res.rc.in src/strife-res.rc)
+
+foreach(SUBDIR textscreen opl pcsound src)
+    add_subdirectory("${SUBDIR}")
+endforeach()
diff --git a/games/NXDoom/CODE_OF_CONDUCT.md b/games/NXDoom/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..895dcfd49
--- /dev/null
+++ b/games/NXDoom/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at fraggle@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/games/NXDoom/COPYING.md b/games/NXDoom/COPYING.md
new file mode 100644
index 000000000..28fbecabf
--- /dev/null
+++ b/games/NXDoom/COPYING.md
@@ -0,0 +1,361 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+    Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser 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.
+
+### 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 an idea of what it does.
+    Copyright (C) yyyy  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General Public
+License](https://www.gnu.org/licenses/lgpl.html) instead of this
+License.
diff --git a/games/NXDoom/ChangeLog b/games/NXDoom/ChangeLog
new file mode 100644
index 000000000..59a73a4b6
--- /dev/null
+++ b/games/NXDoom/ChangeLog
@@ -0,0 +1,5 @@
+Chocolate Doom's version history is stored in Git. For a full
+change log, clone the repository on Github:
+
+    https://github.com/chocolate-doom/chocolate-doom
+
diff --git a/games/NXDoom/HACKING.md b/games/NXDoom/HACKING.md
new file mode 100644
index 000000000..792136e82
--- /dev/null
+++ b/games/NXDoom/HACKING.md
@@ -0,0 +1,256 @@
+# Coding style guidelines
+
+The coding style guidelines for Chocolate Doom are designed to keep the
+style of the original source code.  This maintains consistency throughout
+the program, and does not require the original code to be changed. Some
+of these guidelines are stricter than what was done in the original
+source; follow these when writing new code only: there is no need to
+change existing code to fit them.
+
+You should set tabs to *display* as eight spaces, not four.  However,
+*indentation* should be four spaces.  If possible, do not use tab
+characters at all.  There is a utility called “expand” which will remove
+tab characters.  For the reasoning behind this, see:
+http://www.jwz.org/doc/tabs-vs-spaces.html
+
+Please write code to an 80 column limit so that it fits within a standard
+80 column terminal. Do not leave trailing whitespace at the end of lines.
+
+Functions should be named like this: `AB_FunctionName`.  The `AB` prefix
+denotes the subsystem (`AM_` for automap, `G_` for game, etc).  If a
+function is static, you can omit the prefix and just name it like
+`FunctionName`.  Functions and global variables should always be made
+static if possible.
+
+Put `_t` on the end of types created with typedef.  Type names like this
+should be all lowercase and have the subsystem name at the start. An
+example of this is `txt_window_t`.  When creating structures, always
+typedef them.
+
+Do not use Hungarian notation.
+
+Do not use the goto statement.
+
+Use C++-style comments, ie. `//` comments, not `/* ... */` comments.
+I don’t care that this isn’t standard ANSI C.
+
+Variables should be named like this: `my_variable_name`, not like this:
+`MyVariableName`.  In pointer variable declarations, place the `*` next
+to the variable name, not the type.
+
+When casting variables from one type to another, put a space after the
+last closing brace.
+
+When using an if, do, while, or for statement, always use the { } braces
+even when they are not necessary.  For example, do this:
+
+```c
+if (condition)
+{
+    body;
+}
+```
+
+Not this:
+
+```c
+if (condition)   // NO
+    body;
+```
+
+Write code like this:
+
+```c
+typedef struct
+{
+    int member1;
+    char *member2;
+} my_structure_t;
+
+void FunctionName(int argument, int arg2, int arg3, int arg4, int arg5,
+                  int arg6, int arg7)
+{
+    int assign_var;
+
+    assign_var = arg2 + arg3 * arg4 * (arg5 + arg6);
+
+    if (foo && !bar || baz && qux || !(foo && bar && baz))
+    {
+        body;
+    }
+    else if (xyz + 4 < abc * 4 + 3)
+    {
+        body;
+    }
+    else
+    {
+        body;
+    }
+
+    if (very_long_condition_like_this_one_that_forces_a_line_break
+     && other_condition)
+    {
+        body;
+    }
+
+    switch (argument)
+    {
+        case FIRST:
+            code;
+            break;
+
+        case SECOND:
+            code;
+            break;
+
+        default:
+            break;
+    }
+
+    for (a = 0; a < 10; ++a)
+    {
+        FunctionCall(arg1, arg2, arg3, arg4,
+                     arg_split_onto_second_line);
+    }
+
+    while (a < 10)
+    {
+        loop_body;
+    }
+
+    do
+    {
+
+    } while (condition);
+}
+```
+
+## Editor-specific default settings
+
+If you use vim, you can put this into your `.vimrc` (or install the
+`localvimrc` script):
+
+```
+set expandtab
+set tabstop=8
+set softtabstop=4
+set shiftwidth=4
+```
+
+Or, if you use Emacs, put this in your `.emacs`:
+
+```lisp
+(add-hook 'c-mode-hook (lambda ()
+  (when (and buffer-file-name
+             (string-match "chocolate-doom" buffer-file-name))
+    (c-set-style "bsd")
+    (setq indent-tabs-mode nil)
+    (setq tab-width 8)
+    (setq c-basic-offset 4))))
+```
+
+## Security
+
+The C standard library has a number of unsafe functions that should be
+avoided when writing code for Chocolate Doom. These are:
+
+Unsafe function   |   Safer alternative
+------------------|------------------------
+`gets()`          |  `fgets(.., stdin)`
+`sprintf`         |  `M_snprintf()`
+`snprintf`        |  `M_snprintf()`
+`vsprintf`        |  `M_vsnprintf()`
+`vsnprintf`       |  `M_vsnprintf()`
+`strcpy()`        |  `M_StringCopy()`
+`strncpy()`       |  `M_StringCopy()`
+`strcat()`        |  `M_StringConcat()`
+`strncat()`       |  `M_StringConcat()`
+`strdup()`        |  `M_StringDuplicate()`
+`realloc()`       |  `I_Realloc()`
+
+Lots of the code includes calls to DEH_String() to simulate string
+replacement by the Dehacked tool. Be careful when using Dehacked
+replacements of printf format strings. For example, do not do this:
+
+```c
+printf(DEH_String("foo %s"), s);
+sprintf(mybuf, DEH_String("bar %s"), t);
+```
+
+Instead do this:
+
+```c
+DEH_printf("foo %s", s);
+DEH_snprintf(mybuf, sizeof(mybuf), "bar %s", t);
+```
+
+This does the format string replacement safely in a way that checks
+the arguments securely.
+
+## Portability
+
+Chocolate Doom is designed to be cross-platform and work on different
+Operating Systems and processors.  Bear this in mind when writing code.
+
+Do not use the `long` type (its size differs across platforms; use
+`int` or `int64_t` depending on which you want).
+
+Use Doom’s byte data type for byte data. `int` is assumed to be a
+32-bit integer, and `short` is a 16-bit integer. You can also use the
+ISO C99 data types: `intN_t` and `uintN_t` where N is 8, 16, 32, 64.
+
+Be careful with platform dependencies: do not use Windows API
+functions, for example.  Use SDL where possible.
+
+Preprocessor `#defines` are set that can be used to identify the OS
+if necessary: `_WIN32` for Windows and `__MACOSX__` for Mac OS X. Others
+are set through SDL.  Try to avoid this if possible.
+
+Be careful of endianness!  Doom has `SHORT()` and `LONG()` macros that
+do endianness conversion.  Never assume that integer types have a
+particular byte ordering.  Similarly, never assume that fields
+inside a structure are aligned in a particular way.  This is most
+relevant when reading or writing data to a file or a network pipe.
+
+For signed integers, you shouldn’t assume that `(i >> n)` is the same as
+`(i / (1 << n))`.  However, most processors handle bitshifts of signed
+integers properly, so it’s not a huge problem.
+
+Due to Microsoft implementation of the Unicode support in C standard
+library you should use these wrappers to support non-latin paths and
+filenames on Windows.
+
+C library function |   Wrapper
+-------------------|-------------------
+`fopen()`          |  `M_fopen()`
+`remove()`         |  `M_remove()`
+`rename()`         |  `M_rename()`
+`stat()`           |  `M_stat()`
+`mkdir()`          |  `M_MakeDirectory()`
+`getenv()`         |  `M_getenv()`
+
+## GNU GPL and licensing
+
+All code submitted to the project must be licensed under the GNU GPLv2 or a
+compatible license.  If you use code that you haven’t 100% written
+yourself, say so. Add a copyright header to the start of every file.  Use
+this template:
+
+```
+//
+// Copyright(C) YEAR Author's name
+//
+// 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.
+//
+//
+// *File description goes here*
+//
+```
diff --git a/games/NXDoom/Makefile.am b/games/NXDoom/Makefile.am
new file mode 100644
index 000000000..4cad870c5
--- /dev/null
+++ b/games/NXDoom/Makefile.am
@@ -0,0 +1,62 @@
+AUX_DIST_GEN =                          \
+        $(ac_aux_dir)/install-sh        \
+        $(ac_aux_dir)/missing
+
+CMAKE_FILES=                                   \
+        CMakeLists.txt                         \
+        cmake/FindSDL2.cmake                   \
+        cmake/FindSDL2_mixer.cmake             \
+        cmake/FindSDL2_net.cmake               \
+        cmake/FindFluidSynth.cmake             \
+        cmake/Findm.cmake                      \
+        cmake/FindSampleRate.cmake             \
+        cmake/config.h.cin
+
+DOC_FILES=                              \
+        COPYING.md                      \
+        README.md                       \
+        README.Music.md                 \
+        NEWS.md                         \
+        PHILOSOPHY.md                   \
+        ChangeLog
+
+EXTRA_DIST=                             \
+        $(AUX_DIST_GEN)                 \
+        $(CMAKE_FILES)                  \
+        $(DOC_FILES)                    \
+        NOT-BUGS.md                     \
+        README.Strife.md                \
+        .lvimrc                         \
+        HACKING.md                      \
+        TODO.md                         \
+        rpm.spec                        \
+        win32/win_opendir.c             \
+        win32/win_opendir.h
+
+doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
+doomdocs_DATA = $(DOC_FILES) NOT-BUGS.md
+
+hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
+hereticdocs_DATA = $(DOC_FILES)
+
+hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
+hexendocs_DATA = $(DOC_FILES)
+
+strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
+strifedocs_DATA = $(DOC_FILES) README.Strife.md
+
+MAINTAINERCLEANFILES =  $(AUX_DIST_GEN)
+
+SUBDIRS=textscreen opl pcsound data src man
+
+DIST_SUBDIRS=pkg $(SUBDIRS)
+
+if HAVE_DOC
+
+INSTALL : man/INSTALL.template man/simplecpp
+	$(srcdir)/man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
+            -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
+	                < $(srcdir)/man/INSTALL.template > $@
+
+endif
diff --git a/games/NXDoom/NEWS.md b/games/NXDoom/NEWS.md
new file mode 100644
index 000000000..9fa55a749
--- /dev/null
+++ b/games/NXDoom/NEWS.md
@@ -0,0 +1,1492 @@
+## 3.1.1 (2025-08-14)
+
+### General
+  * Fix compilation on GCC 15 (thanks Fabian).
+  * Hide public IP addresses for privacy.
+  * Use native OpenGL texture format for better performance (thanks Fabian).
+  * Improved directory handling on Windows (thank Roman Fomin):
+      * Fixes problems with postfix "." for non-relative paths.
+      * Support for long NTFS paths (up to 32768 characters).
+  * Fixed metainfo files for latest AppStream spec compliance (thanks Fabian).
+  * Add option to enable or disable smooth pixel scaling (thanks StevenSYS).
+  * Allow spaces in GUS patch folder path (thanks Michael Day).
+  * Add support for non-US backslash key (thanks Michael Day).
+  * Never let SDL Mixer use native midi on Windows (thanks Michael Day).
+  * Use $TMPDIR to find tempdir on Unix (thanks Mr. Myth).
+  * Improve man page formatting (thanks g-branden-robinson).
+
+### Build systems
+  * Can now be built with Emscripten (thanks James Baicoianu).
+  * Misc. improvements (thanks suve, Emmanuel Ferdman, Gabriele Simoni, et al.)
+
+### Setup
+  * Use correct EGA palette colors (thanks Henrique Jorge).
+
+### Doom
+  * Initial support for Doom version 1.5 (thanks Michael Francis).
+
+### Heretic
+  * Fix crash after loading too many saved games (thanks Noseey).
+
+### Hexen
+  * Fix crash with Heresiarch fireballs if player has never touched a wall (thank Noseey).
+
+### Strife
+  * Initialize floor->type and floor->crush fields in EV_BuildStairs() (thanks Fabian).
+
+## 3.1.0 (2024-08-01)
+
+### General
+  * Drag and drop loading of WAD, Dehacked and demo files is now supported on
+    Windows - simply drag the files onto chocolate-doom.exe (thanks Fabian).
+  * WAD file autoloading was added - WAD and DEH files can be copied into
+    an autoload folder to be automatically included on every game start.
+  * Music pack configuration has been significantly simplified. By simply
+    copying .flac/.ogg music files into a folder they will be automatically
+    detected by filename and used.
+  * Music packs can now be used with OPL as a fallback, and music pack
+    config files can have any name ending in '.cfg'.
+  * MP3 music packs are now supported.
+  * Network synchronization now uses a PID controller by default, which
+    makes games more smooth and more stable, especially for Internet play.
+  * UDP hole punching is now used to make servers behind NAT gateways
+    automatically accessible to the Internet.
+  * OPL emulation now uses Nuked OPL3 v1.8 (thanks nukeykt)
+  * Allow simultaneous PC speaker emulation and OPL emulation
+    (thanks Michael Day).
+  * The setup tool now uses "Romero Blue" as a background (see the wiki:
+    <https://doomwiki.org/wiki/Romero_Blue> for more info).
+  * The 0 and 5 keys on the number pad can now be bound independently
+    of any other keyboard key (thanks BlooD2ool).
+  * With aspect ratio correction disabled, the game can scale to any
+    arbitrary size and remove all black borders in full screen mode.
+    (thanks chungy)
+  * The executable's location is now checked when looking for IWADs.
+  * The IWAD files installed by Steam-on-Linux are now detected (thanks
+    chungy).
+  * It's now possible to use `-response` to load response files.
+  * Default savegame name now includes the WAD filename (thanks Fabian).
+  * Mouse movement is no longer read when the game window is inactive
+    (thanks Julia Nechaevskaya).
+  * Chocolate Doom now by default generates a "pet name" for the user
+    to respect privacy (thanks Jon!)
+  * The Freedoom single-player IWAD files are now officially supported,
+    since recent versions changed all levels to be vanilla compatible.
+  * Add native support for the FluidSynth midi synthesizer.
+  * Add a fsynth_gain config key to fine tune the FluidSynth output level
+    (thanks Fabian).
+  * Redesign of native MIDI support in Windows (thanks ceski and Roman Fomin):
+    - Emulates DMX MPU-401 feature set by default, change with
+      `winmm_complevel`.
+    - MIDI device reset between songs using "GM System On", change with
+      `winmm_reset_type`.
+    - Configurable delay after reset for legacy MIDI hardware (e.g. Roland
+      SC-55), change with `winmm_reset_delay`.
+  * Add improved gamepad support via the SDL\_GameController interface. This
+    includes support for analog triggers, modern dual-stick default bindings
+    (based on Unity Doom), descriptive button names for common controller types
+    and configurable dead zones for stick axes. (Michael Day).
+  * All games now have shiny new icons!
+  * The -display parameter was added to specify the display number on which to show the screen (thanks Robin Emeršič).
+
+### Build systems
+  * SDL2_mixer and SDL2_net can now be optionally disabled to increase
+    portability to systems that might not support audio or networking
+    (thanks turol).
+  * Travis CI was replaced with GitHub Actions (thanks Michael Francis).
+  * mingw CI was added for automatic Windows-building (thanks turol).
+  * A cpp-linter CI was added to improve the quality and formatting of code
+    (thanks turol).
+  * The `--disable-zpool` autoconf argument for disabling memory pooling was
+    added to make debugging easier (thanks turol).
+  * Python 2 has been deprecated and Python 3 is now used exclusively
+  (thanks Fabian).
+
+### Refactorings
+  * CMake project files have been added, replacing the Microsoft Visual
+    Studio and Code::Blocks files. CMake maintains support for multiple
+    IDEs and versions thereof, and reduces developer overhead when updating
+    Chocolate Doom (huge thanks to AlexMax for this work).
+  * Source code has been retrofitted to fix many compiler warnings and
+    add const annotations to many variables (thanks turol).
+  * Several functions have been hardened against incomplete reads and
+    error conditions, and made safer (thanks turol).
+  * Man page generation has been reworked to use autoconf macro
+    substitution, making it eaiser for downstream forks to change the
+    project name (thanks Jon).
+  * We now print a meaningful error message when a savegame cannot be
+    loaded (thanks Zodomaniac, chungy).
+  * There's now a log file feature for the network code to aid in tracking
+    down multiplayer bugs.
+  * AppData files were updated to the AppStream standard (thanks Mike).
+  * Many abuses of the extern keyword have been cleaned up to prevent
+    undefined behavior (thanks turol).
+  * Install of bash completion scripts was fixed (thanks Mike Swanson).
+
+### Bug fixes
+  * Fixed an exception thrown by the Windows kernel when debugging with
+    GDB (thanks AXDOOMER).
+  * Loop metadata now works properly with music packs on Windows.
+  * Mouse movement is ignored when the game window isn't active (thanks
+    Julia Nechaevskaya).
+  * A bug was fixed where music would not play after pausing on an
+    intermission screen (thanks Julia Nechaevskaya).
+  * Timeouts when connecting to a network server were fixed (thanks
+    @bradc6).
+  * A long-standing bug where some visplane overflows caused crashes was
+    fixed (thanks Michael Francis).
+  * A multiplayer deadlock bug where clients would stop sending tics after
+    missing tics from the server was fixed. There are both client- and
+    server- side fixes to fix the problem when playing with older versions
+    (thanks MadDog and Mortrixs for help tracking this down).
+  * The macOS launcher now quits automatically when all windows are closed.
+  * The mouse speed calibration thermometer was fixed.
+  * Some improvements have been made to PC speaker emulation to better match
+    Vanilla (thanks NY00123).
+  * Filenames and paths with non-latin characters now work on Windows
+    (thanks Roman Fomin).
+  * Properly handle orphan carriage returns when parsing deh files
+    (thanks Michael Day).
+
+### Doom
+  * Doom 1.2 demo support was added (thanks James Canete!)
+  * Map33 intermission screen and map33-map35 automap names are
+    emulated (thanks CapnClever).
+  * We now exit gracefully when player starts are missing (thanks Michael
+    Francis).
+  * We now exit gracefully on levels with a boss brain and no boss spitter
+    things (thanks Jason Benaim).
+  * It's now possible to play multiplayer with gameversion=1.2.
+  * When the game hits the limit for the number of wall scrollers, a count
+    of the number of scrollers is now displayed (thanks Jon).
+  * Sector special 17 (random light flicker) is now accurately emulated to
+    only appear in gameversion > 1.2 (thanks tpoppins).
+  * Fixed mouse events causing unwanted key presses (thanks Michael Day).
+  * French Doom II files doom2f.wad and french.deh are now automatically
+    detected (thanks Acts19quiz).
+  * Mouse buttons are now bindable to run (thanks Archenoth).
+  * The "Sky never changes in Doom II" bug is now accurately emulated
+    (thanks Michael Francis).
+  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
+  * Fix possible undefined behavior and accurately emulate vanilla when -skill
+    parameter is given a negative value (thanks Henrique Jorge).
+
+### Heretic
+  * P\_FindNextHighestFloor was changed to match vanilla behavior (thanks
+    AXDOOMER).
+  * WAD hash table is now generated for speed (thanks Michael Francis).
+  * HHE level name replacements now apply on the intermission screen
+    (thanks ETTiNGRiNDER).
+  * Mouse buttons are now bindable to scroll through inventory and
+    "use artifact" (thanks Michael Day).
+  * Mouse buttons are now bindable to run (thanks Archenoth).
+  * Multiplayer demo playback was fixed (thanks Ryan Krafnick).
+  * The GOG.com release is now detected (thanks Mike Swanson).
+  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
+  * Fix NULL backsector crash (thanks kitchen-ace and Julia Nechaevskaya).
+
+### Hexen
+  * ACS code has been hardened against potential security vulnerabilities.
+  * WAD hash table is now generated for speed (thanks AXDOOMER).
+  * Mouse buttons are now bindable to scroll through inventory and
+    "use artifact" (thanks Michael Day).
+  * Mouse buttons are now bindable to run (thanks Archenoth).
+  * Multiplayer demo playback was fixed (thanks Ryan Krafnick).
+  * The GOG.com release is now detected (thanks Mike Swanson).
+  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
+  * Fixed demo desyncs in P_LookForPlayers (thanks Michael Day)
+  * Add support for two different v1.1 variants through -gameversion
+    argument (thank NY00123).
+
+### Strife
+  * Sehacked replacements of the "empty slot" string now work.
+  * VOICES.WAD is now found in a case-insensitive way (thanks Michael Francis).
+  * PC speaker sound effects are now supported (thanks ceski).
+  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
+  * Fixed demo desyncs in P_LookForPlayers (thanks Michael Day)
+  * Fix possible undefined behavior and accurately emulate vanilla when -skill
+    parameter is given a negative value (thanks Henrique Jorge).
+
+## 3.0.1 (2020-06-24)
+
+This is a point release that includes two security fixes related to Chocolate
+Doom server logic.
+
+Thanks to Michał Dardas from LogicalTrust for discovering the vulnerability.
+
+### Bug fixes
+  * ([CVE-2020-14983](https://nvd.nist.gov/vuln/detail/CVE-2020-14983)) Fixed a vulnerability where
+    an unchecked `num_players` field in the server logic could allow a malicious attacker to trigger
+    arbitrary code execution against Chocolate Doom servers.
+  * Fixed an issue where a client could crash if the server sent an invalid `ticdup` setting.
+
+## 3.0.0 (2017-12-30)
+
+  Chocolate Doom 3.0 is a new major revision. The main change is that
+  the codebase has been ported to SDL 2.0. This brings a number of
+  benefits, although there have also been some other minor changes (all
+  listed below).
+
+  Huge thanks go to the entire Chocolate Doom team for working on the
+  port to SDL2, and to all the testers who have found and reported bugs
+  during its development.
+
+### General
+  * All screen scaling is now performed in hardware, meaning that the
+    game can run in arbitrary window sizes in high quality. It can also
+    scale to very large resolutions sizes without using large amounts of
+    CPU or suffering degraded performance (thanks Fabian).
+  * It is now possible to switch between windowed and full screen modes
+    while the game is running by pressing alt + enter (thanks Jon)
+  * Windows binaries now ship with several previously-optional DLLs.
+    This means it is now possible to take PNG screenshots and to use
+    digital music packs (FLAC/Ogg Vorbis formats).
+  * The game now remembers your preferred monitor and will start on the
+    same monitor you were using the last time you played. Windows appear
+    centered on the screen.
+  * The OS X launcher was tweaked somewhat, and now uses proper path
+    controls for choosing files. FreeDM was added as an IWAD.
+  * Configuration files on Mac OS X and Unix are now stored in locations
+    compliant with the XDG standard (thanks chungy):
+    - On Unix: `~/.local/share/chocolate-doom/`
+    - On OS X: `~/Library/Application Support/chocolate-doom/`
+  * Icons when the game is running are now a higher resolution.
+  * Keyboard input is improved and uses the new SDL input API; on
+    systems with on-screen keyboards, this should activate the on-screen
+    keyboard when it is appropriate.
+  * Menu navigation with the joystick is now much more practical, and
+    it’s possible to bind a joystick axis to look up/down in games which
+    support it (thanks Jon, Wintermute0110).
+  * Several command line options were removed that were judged to be
+    useless: `-grabmouse`, `-novert` and `-nonovert`. The mouse grabbing
+    and novert settings can still be configured in the setup tool.
+  * There is no longer any option in the setup tool to specify a screen
+    resolution, since in full screen mode the game just runs at the
+    desktop resolution without changing screen modes. If necessary, the
+    config file options `fullscreen_width` and `fullscreen_height` can
+    be used to explicitly set a screen resolution.
+  * There is no longer a soft dependency on Zenity on Unix systems; the
+    SDL API is now used to display error dialogs.
+  * Joysticks are identified more precisely using GUID now.
+  * A new parameter, `-savedir` allows users to specify a directory from
+    which to load and save games. (thanks CapnClever)
+  * The midiproc code from Eternity Engine has been imported, improving
+    native MIDI playback on Windows and fixing a long-standing bug with
+    music volume adjustment (thanks AlexMax, Quasar).
+  * VGA “porch” emulation was added (thanks Jon).
+  * The codebase now compiles with OpenWatcom (thanks Stephen Finniss).
+
+### Doom
+  * The GOG install of Doom 3: BFG Edition is now detected (thanks chungy)
+  * A `-shorttics` command line parameter was added that simulates
+    recording a vanilla demo without actually recording a demo.
+
+### Hexen
+  * The CD audio option for music playback has been removed; the CD
+    playback API has been removed from SDL 2.0. However, it is possible
+    to use digital music packs as an alternative.
+
+### Strife
+  * `voices.wad` is now correctly loaded before PWADs (thanks
+    @Catoptromancy)
+
+### libtextscreen
+  * On OS X on machines with retina displays, text screens are rendered
+    using a high detail font.
+  * File selector widgets now look more visually distinctive.
+  * There is now a convenience widget for conditionally hiding widgets.
+  * Font handling was restructured to be based around PNG format fonts
+    which are converted during the build and can be more easily edited.
+  * Handling of code pages was cleaned up, so it is easier to change the
+    code to work with a different code page now.
+  * Lots of the UI code was changed to use UTF-8 strings.
+  * File extensions when using the Zenity file selector are now case
+    insensitive (thanks Jon).
+
+## 2.3.0 (2016-12-29)
+
+### General
+  * Bash completion scripts are included (thanks Fabian)
+  * The OS X launcher now supports the .lmp file format (thanks Jon)
+  * Pitch-shifting from early versions of Doom, Heretic, and Hexen.
+    is now supported (thanks Jon)
+  * Aspect ratio-corrected 1600×1200 PNGs are now written (thanks Jon)
+  * OPL emulation is more accurate (thanks Nuke.YKT)
+  * DMX bugs with GUS cards are now better emulated (thanks Nuke.YKT)
+  * The disk activity floppy disk icon is now shown (thanks Fabian, Jon)
+  * Checksum calculations are fixed on big endian systems, allowing
+    multiplayer games to be played in mixed little/big-endian
+    environments (thanks GhostlyDeath, njankowski)
+  * The NES30, SNES30, and SFC30 gamepads are detected and configured
+    automatically by the Setup tool. The automap can also be configured
+    to a joystick button (thanks Jon)
+  * The vanilla limit of 4046 lumps per WAD is now enforced (thanks
+    Jon, Quasar, Edward-san)
+  * Solidsegs overflow is emulated like in vanilla (thanks Quasar)
+  * Multiple capitalizations are now tried when searching for WAD files,
+    for convenience when running on case sensitive filesystems (thanks
+    Fabian).
+  * A new command line argument, `-strictdemos`, was added, to allow
+    more careful control over demo format extensions. Such extensions
+    are now forbidden in WAD files and warning messages are shown.
+
+### Build systems
+  * There is better compatibility with BSD Make (thanks R.Rebello)
+  * `./configure --with-PACKAGE` checks were repaired to behave
+    logically, rather than disabling the feature (thanks R.Rebello)
+  * Games are now installed to ${bindir} by default, eg.
+    /usr/local/bin, rather than /usr/local/games (thanks chungy)
+  * Visual Studio 2015 is now supported (thanks Azarien)
+  * SDL headers and libraries can now exist in the Microsoft Visual
+    Studio project directory (thanks Quasar)
+  * CodeBlocks projects were repaired by removing non-existent files
+    from the project files (thanks krystalgamer)
+
+### Doom
+  * Chex Quest’s level warp cheat (LEESNYDER##) now behaves more like
+    like the original EXE (thanks Nuke.YKT)
+  * It’s now possible to start multiplayer Chex Quest games.
+  * Freedoom: Phase 1 <= 0.10.1 can now be loaded with mods, with
+    -gameversion older than ultimate (thanks Fabian, chungy)
+  * The IWAD order preference for GOG.com installs matches vanilla
+    Final Doom: doom2, plutonia, tnt, doom (thanks chungy)
+  * There are better safety checks against write failures when saving
+    a game, such as when the directory is read-only (thanks
+    terrorcide)
+  * Versions 1.666, 1.7, and 1.8 are emulated (thanks Nuke.YKT)
+  * Crashes are now handled more gracefully when a linedef references
+    nonexistent sidedefs (thanks Fabian)
+
+### Heretic
+  * Map names were added for Episode 6, fixing a crash after completing
+    a level in this episode (thanks J.Benaim)
+  * Support for unlimited demo/savegames was added (thanks CapnClever)
+  * Demo support is expanded: `-demoextend` allows demos to last longer
+    than a single level; `-shortticfix` adjusts low-resolution turning
+    to match Doom’s handling, and there is now `-maxdemo` and `-longtics`
+    support (thanks CapnClever)
+
+### Hexen
+  * The MRJONES cheat code returns an identical string to vanilla, and
+    enables fully reproducible builds (thanks Fabian)
+  * An issue was fixed where the game crashed while killing the
+    Wraithverge in 64-bit builds (thanks J.Benaim)
+  * Support for unlimited demo/savegames was added (thanks CapnClever)
+  * Mouse buttons for strafe left/right and move backward were added,
+    as well as a “Double click acts as use” mouse option (thanks
+    CapnClever)
+  * Demo support is expanded: `-demoextend` allows demos to last longer
+    than a single level; `-shortticfix` adjusts low-resolution turning
+    to match Doom’s handling, and there is now `-maxdemo` and `-longtics`
+    support (thanks CapnClever)
+
+### Strife
+  * Support was added for automatic loading of the IWAD from the GOG.com
+    release of Strife: Veteran Edition on Windows (thanks chungy)
+  * Jumping can now be bound to a mouse button (thanks Gez)
+  * Gibbing logic was changed to match vanilla behavior (thanks Quasar)
+  * Several constants differences from vanilla were fixed (thanks
+    Nuke.YKT, Quasar)
+  * When using -iwad, voices.wad from the IWAD’s directory is prefered
+    over auto-detected DOS/Steam/GOG.com installs (thanks Quasar)
+
+### libtextscreen
+  * The API for creating and managing tables and columns was simplified.
+  * It’s now possible to cycle through tables with the tab key.
+  * Windows can now have multiple columns.
+
+## 2.2.1 (2015-09-10)
+
+  Chocolate Doom has not seen a great deal of “stable” patch releases
+  in its history. While the development tree sees major new features
+  and changes, the purpose of this release, and hopefully others to
+  follow like it, is to repair some deficiencies that existed
+  in 2.2.0.
+
+### General
+  * Preferences for the OS X launcher are now stored with a unique
+    name to not conflict with other applications. (thanks
+    Xeriphas1994)
+  * Unix desktop entry files are now brought up to full desktop entry
+    specification compliance. (thanks chungy, Fabian)
+  * Unix AppData entries are now included, allowing software centers
+    to display detailed information about the engines. (thanks chungy)
+  * Partial XDG base directory specification compliance on Unix
+    systems now exist to search for IWAD paths.  One benefit is that
+    $HOME/.local/share/games/doom is now a valid location to store and
+    automatically find IWADs. (thanks chungy)
+
+### Build systems
+  * The Microsoft Visual Studio build system was not fully functional
+    in 2.2.0 and has been fixed. (thanks Linguica)
+  * The autoconf build system checks for windres only for Windows
+    toolchains.  Some Linux distributions mistakingly include the
+    program in their native toolchains. (thanks Fabian)
+  * A compiler hint for packed structs has been added, which otherwise
+    broke the games when built under recent GCC releases for
+    Windows. (thanks Fabian)
+
+### Doom
+  * The GOG.com releases of The Ultimate Doom, Doom II, and Final Doom
+    are now detected and supported on Windows. (thanks chungy)
+  * An integer overflow was used in spawn angle calculation, undefined
+    C behavior which broke with Clang optimization.  (thanks David
+    Majnemer for insight)
+
+### Setup tool
+  * The help URL for the level warp menu now points to the proper wiki
+    page, rather than the multiplayer page.
+  * The manifest has been updated for Windows 10 compatibility.
+    (thanks chungy)
+
+## 2.2.0 (2015-06-09)
+
+  * The Hexen four level demo IWAD is now supported. Thanks to Fabian
+    Greffrath for his careful investigation and emulation of the demo
+    game’s behavior in developing this.
+  * OPL music playback has been improved in a number of ways to match
+    the behavior of Vanilla Doom’s DMX library much more closely. OPL3
+    playback is also now supported. Thanks go to Alexey Khokholov for
+    his excellent research into the Vanilla DMX library that enabled
+    these improvements.
+  * New gamepad configurations:
+      - PS4 DualShock 4 (thanks Matt “3nT” Davis).
+      - Xbox One controller on Linux (thanks chungy).
+      - “Super Joy Box 7” USB/PC gameport adapter.
+  * The Doom reload hack has been added back. See the wiki for more
+    context on this: http://doomwiki.org/wiki/Reload_hack
+  * The IWAD file from Strife: Veteran Edition is now detected
+    automatically (thanks chungy).
+  * It’s now possible to build outside of the source directory (thanks
+    Dave Murphy).
+  * MSVC project files were brought up to date (thanks dbrackett16).
+  * M_StringDuplicate() has been added as a safer replacement for
+    strdup() (thanks Quasar). M_StringCopy() now handles short buffers
+    more gracefully.
+  * The netgame discrepancy window is now dismissed by pressing enter
+    to proceed, not escape (thanks AXDOOMER).
+  * A couple of source files that were in the previous release and
+    were GPL3 have been replaced by GPL2 equivalents. Previous
+    releases that included these files should be retroactively
+    considered GPL3.
+
+### Bug fixes
+  * A long-standing bug that could cause every display frame to be
+    rendered twice was fixed (thanks Linguica, Harha, AXDOOMER).
+  * Lots of endianness fixes were integrated that were found by Ronald
+    Lasmanowicz during development of his Wii port of Chocolate Doom,
+    including a fix for a bug that could cause monsters to become
+    partially invisible.
+  * DeHackEd files without a newline character at the EOF are now
+    correctly parsed (thanks Fabian).
+  * An infinite loop that could occur in the weapon cycling code was
+    fixed (thanks raithe, Fabian).
+  * Mouse input triggered by cursor warp was fixed (thanks Super6-4).
+  * Loop tags in substitute music files are ignored if both of the
+    loop tags are equal to zero. This makes us consistent with other
+    source ports that support the tags.
+  * It’s now possible to more conveniently play back demo .lmp files
+    with names that end in the all-caps “.LMP” (thanks Ioan Chera).
+  * Some code that accessed memory after freeing it was fixed. Two new
+    parameters, -zonezero and -zonescan, were added to try to help
+    detect these cases.
+  * Mistaken assumptions about representations of booleans that
+    affected some ARM systems were fixed (thanks floppes).
+  * memcpy() uses on overlapping memory were changed to use memmove(),
+    fixing abort traps on OpenBSD (thanks ryan-sg).
+  * Hyphens in manpages were fixed (thanks chungy, Fabian).
+  * Lots of compiler build warnings were fixed (thanks Fabian).
+
+### Setup tool
+  * The setup tool now has help buttons for its various different
+    screens, which link to articles on the wiki that give more
+    information (thanks to chungy for helping to put the wiki pages
+    together).
+  * A fix was applied for a buffer overrun that could occur if the
+    user had lots of IWAD files installed (thanks Fabian).
+  * A crash related to username lookup was fixed.
+  * It’s now possible to connect via the setup tool to multiplayer
+    servers that are not listening on the default port (thanks
+    AXDOOMER).
+
+### Doom
+  * Sky transitions when emulating the id anthology version of the
+    Final Doom executable were fixed (thanks AXDOOMER, Fabian,
+    chungy).
+  * Structure fields in the stair-building functions were fixed to be
+    deterministic, fixing a desync in mm09-512.lmp (thanks Fabian).
+
+### Hexen
+  * A bug with texture names that had long names was fixed (thanks
+    ETTiNGRiNDER).
+  * Minotaur spawn time is now stored in little endian format, fixing
+    a bug that affected compatibility with Vanilla savegames on big
+    endian systems.
+  * Code that starts ACS scripts is no longer compiler-dependent.
+
+### Strife (all these are thanks to Quasar)
+  * Sound priority was changed, so that the ticking sound that Stalker
+    enemies make while active matches Vanilla behavior (thanks
+    GeoffLedak).
+  * Minor fixes to game behavior to match Vanilla, discovered during
+    development of Strife: Veteran edition.
+  * Behavior of descending stairs was fixed to match Vanilla.
+  * Inventory items beyond the 8-bit range are now allowed in
+    netgames.
+  * Automap behavior better matches Vanilla now.
+  * Multiplayer name changes were fixed.
+  * Sound origin behavior for switches was fixed.
+  * Teleport beacon behavior was fixed.
+  * Default Strife skill level and screen size were changed to match
+    Vanilla.
+  * Bug was fixed where Rowan would not always take Beldin’s ring.
+  * Totally-invisible objects are now displayed correctly, and a
+    Vanilla glitch with Shadow Acolytes is correctly emulated.
+  * The level name for MAP29 (Entity’s Lair) was fixed (thanks
+    chungy).
+
+### libtextscreen
+  * The main loop now exits immediately once all windows are closed
+    (thanks AXDOOMER).
+  * The large font is no longer selected based entirely on screen
+    size.
+
+## 2.1.0 (2014-10-22)
+
+  Chocolate Doom now supports high-quality substitute music packs that
+  are used in place of the original MIDI music tracks. I’m hoping to
+  put together high-quality recordings of the music for all supported
+  games using the Roland SC-55 synthesizer originally used to compose
+  Doom’s music (thanks twipley and MusicallyInspired).
+
+  Support for joysticks and gamepads has been significantly improved
+  in this version. Most gamepads should now work; if they don’t,
+  please report a bug. A number of gamepads are now automatically
+  detected and configured automatically; if yours is not, you can help
+  by sending in details. See the following page:
+
+  http://www.chocolate-doom.org/wiki/index.php/Adding_your_gamepad
+
+  OPL MIDI playback has been significantly improved, and problems with
+  most tracks should now be resolved. Multi-track MIDI files now play
+  back properly, MIDI tempo meta events are now supported and problems
+  with stuttering when playing certain tracks have been fixed. If you
+  still have problems with OPL playback, let me know.
+
+  Also of note is that Chocolate Doom now has a document that
+  describes the philosophy of the project and the reasoning behind its
+  design (see PHILOSOPHY distributed with the source).
+
+### Other new features
+  * There is now a -dehlump command line parameter to load Dehacked
+    files contained inside WAD files (thanks Fabian Greffrath).
+  * PNG format screenshots are now supported, and there is a dedicated
+    key binding for taking screenshots without needing to always use
+    -devparm (thanks Fabian Greffrath). The PrintScreen key can be
+    used as a key binding (thanks AXDOOMER).
+  * There is now a config file variable (snd_maxslicetime_ms) to
+    control the sound buffer size, and the default is more precise to
+    reduce sound latency (thanks Holering).
+  * You can now use an external command for music playback (thanks
+    Holering).
+  * All games now detect if you’re tring to play using the wrong type
+    of IWAD (doom.wad with Hexen, etc.) and exit with a helpful error
+    message. A couple of users made this mistake after the 2.0 release
+    introduced support for the new games.
+  * The OS X app now associates with .hhe and .seh files.
+  * There is now a -nodes parameter that automatically starts a
+    netgame when a desired number of players have joined the game.
+  * There is now more extensive documentation about music
+    configuration (README.Music).
+  * On Linux, a GUI pop-up is used when the game quits with an error
+    to show the error message (thanks Willy Barro).
+  * There are now Linux .desktop files for all supported games (thanks
+    Mike Swanson).
+  * The -geometry command line parameter can now be used to specify
+    fullscreen or windowed modes, eg. -geometry 640x480w or -geometry
+    1024x768f. (thanks Mike Swanson)
+
+### Doom
+  * Minor workarounds were added to allow the BFG Edition IWADs to be
+    used without crashing the game (thanks Fabian Greffrath).
+  * GUS patch files included with the BFG Edition are now
+    automatically detected.
+  * The “no fog on spawn west” Vanilla bug is now correctly emulated
+    (thanks xttl).
+  * Behavior of older versions of Doom back to v1.666 can now be
+    emulated.
+  * The new Freedoom IWAD names are now recognized and supported.
+  * Freedoom’s DEHACKED lump can now be parsed and is automatically
+    loaded when a Freedoom IWAD file is used (thanks Fabian
+    Greffrath). A new command line parameter, -nodeh, can be used to
+    prevent this from being loaded.
+  * Behavior of the M_EPI4 menu item is now correctly emulated based
+    on game version (thanks AXDOOMER).
+  * IDCLEV up to MAP40 is now supported, to match Vanilla (thanks
+    AXDOOMER).
+  * Level warping on the command line (-warp) to episodes higher than
+    4 is possible, matching Vanilla behavior (thanks plumsinus).
+  * The -cdrom command line parameter writes savegames to the correct
+    directory now, matching Vanilla Doom behavior (thanks AXDOOMER).
+  * The Doom II mission pack to use can now be specified manually on
+    the command line with the -pack parameter (thanks chungy)
+
+### Heretic
+  * Weapon cycling keys for mouse and joystick were fixed (thanks
+    Sander van Dijk).
+  * The -timedemo parameter has been fixed, and -playdemo now handles
+    full paths correctly.
+  * A bug when panning the map was fixed (thanks Chris Fielder).
+  * A savegame bug where plat_t structures were not restored correctly
+    was fixed (thanks romeroyakovlev).
+  * Rebinding of the pause key was fixed (thanks Fabian Greffrath).
+
+### Hexen
+  * Music workarounds have been added so that it is possible to play
+    using the Mac version of the Hexen IWAD file.
+  * Weapon cycling keys for mouse and joystick were fixed (thanks
+    Sander van Dijk).
+  * The -timedemo parameter has been fixed, and -playdemo now handles
+    full paths correctly.
+  * There are now key bindings to allow the artifact keys to be
+    rebound (thanks Fabian Greffrath).
+  * Rebinding of the pause key was fixed (thanks Fabian Greffrath).
+  * Maximum level number was extended to MAP60, allowing multiplayer
+    games using the Deathkings add-on.
+  * The startup screen can now be aborted by pressing escape, like in
+    Vanilla.
+  * Desync when playing back DEMO1 was fixed (thanks alexey.lysiuk).
+
+### Strife
+  * “Show mission” key is configured properly in setup (thanks Sander
+    van Dijk).
+  * Default music volume level now matches Vanilla (thanks AXDOOMER).
+  * Teleport beacon allegiance was fixed to match Vanilla (thanks
+    Quasar).
+  * The stair building code now more closely matches Vanilla (thanks
+    Quasar).
+  * Torpedo weapon changing behavior now matches Vanilla (thanks
+    Quasar).
+
+### Cleanups
+  * The copyright headers at the top of all source files have been
+    vastly simplified.
+  * Unsafe string functions have been eliminated from the codebase.
+    Thanks to Theo de Raadt for calling out Chocolate Doom by name
+    (alongside many other packages) for still using unsafe functions
+    like strcpy: http://marc.info/?l=openbsd-tech&m=138733933417096
+  * vldoor_e enum values are now namespaced to avoid potential
+    conflicts with POSIX standard functions.
+
+### Bug fixes
+  * WAD and Dehacked checksums are now sent to clients and checked
+    correctly when setting up netgames.
+  * A bug was fixed that caused sound not to work in multiplayer games
+    (thanks to everyone who reported this, and for AXDOOMER and Quasar
+    for help in fixing it).
+  * The “D_DDTBLU disease” bug affecting certain MIDI files has been
+    fixed (thanks plumsinus, Brad Harding and Quasar).
+  * Calculation of the -devparm “ticker” dots was fixed to match
+    Vanilla behavior (thanks _bruce_ and AXDOOMER).
+  * The PC speaker code now supports the full range of sound
+    frequencies (thanks Gez).
+  * Annoying “jumping” behavior when grabbing the mouse cursor was
+    fixed.
+  * The screen is now initialized at the native bit depth by default,
+    to avoid problems with systems that don’t handle 8-bit
+    screenbuffers very well any more.
+  * The --docdir argument to the configure script is now honored
+    (thanks Jan Engelhardt).
+  * Various issues with the build were fixed (thanks Jan Engelhardt
+    and Fabian Greffrath).
+  * Backwards parameters were fixed in the sound code (thanks
+    proteal).
+  * A crash was fixed when running fullscreen with the -2 parameter
+    (thanks Fabian Greffrath).
+  * A crash when using large values of snd_channels was fixed (thanks
+    AXDOOMER).
+  * A resource leak in the BSD PC speaker code was fixed (thanks
+    Edward-san).
+  * Windows resource files were fixed for Windows 7 (thanks Brad
+    Harding).
+  * A hard to trigger crash caused by a realloc() in the WAD code was
+    fixed (thanks Fabian Greffrath for debugging).
+  * A bug has been fixed where Chocolate Doom would stay running in
+    the background on Windows after quitting. SDL_Quit() is called now
+    (thanks johnsirett, Brad Harding, Quasar).
+  * String replacements in dehacked lumps can now be overridden if a
+    subsequent dehacked patch replaces the same string.
+
+### libtextscreen
+  * Clicking on scrollbars now jumps to the correct position (thanks
+    AXDOOMER).
+  * A use-after-free bug has been fixed where a click in a window that
+    causes the window to close could lead to a crash (thanks DuClare).
+  * Characters that are unprintable in the Extended ASCII chart are
+    just ignored when they’re typed, rather than appearing as an
+    upside-down question mark (thanks AXDOOMER).
+
+## 2.0.0 (2013-12-09)
+
+  This is version 2.0 of Chocolate Doom! This new major version is
+  released to celeberate the 20th anniversary of the first release of
+  Doom in 1993. Happy Birthday Doom!
+
+  This new version has some major changes compared to the 1.0 series:
+
+  * The codebase now includes Chocolate Heretic and Chocolate
+    Hexen. These are based on the GPL source code released by Raven
+    Software.
+  * Also included is Chocolate Strife. This was developed through a
+    mammoth four year reverse engineering project conducted by James
+    “Quasar” Haley and Samuel “Kaiser” Villareal. The result is the
+    most accurate reproduction of Strife to date, including full demo
+    and savegame compatibility. See README.Strife for more
+    information.
+
+### Minor features that are nonetheless worth mentioning
+  * Chocolate Doom now includes a -statdump command line option, which
+    emulates the output of the statdump.exe tool. This is used to
+    implement a form of regression testing (statcheck) that directly
+    compares against the Vanilla behavior.
+  * Chocolate Heretic includes HHE patch file support, and I believe
+    is the first Heretic port to include this feature.
+  * GUS “pseudo-emulation” is now supported. This does not fully
+    emulate a GUS, but Doom’s DMXGUS lump can be used to generate a
+    Timidity configuration file that plays music using the GUS patch
+    set.
+  * The setup tool now includes a built-in server browser, for use
+    when selecting a server to join.
+
+  Version 2.0 of Chocolate Doom has been in development for a long
+  time, and there have been many bugs fixed over this time, too many
+  to list here. Thanks to all the people who have tested it and
+  diligently reported bugs over this time, and to all the people who
+  have tested the beta releases over the past couple of months.  Your
+  contributions have been essential and invaluable.
+
+## 1.7.0 (2012-06-09)
+
+  * Fixed gnome-screensaver desktop file (thanks Rahul Sundaram).
+  * Updated COPYING to current version of GPL2 (thanks Rahul
+    Sundaram).
+  * Running servers now re-resolve the address of the master server
+    occasionally, to adapt to DNS address changes.
+  * Error dialog is no longer shown on OS X when running from the
+    console.
+  * The Makefiles no longer use GNU make extensions, so the package
+    builds on OpenBSD.
+  * There is now an OPL MIDI debug option (-opldev), useful for when
+    developing GENMIDI lumps.
+  * A workaround for SDL mouse lag is now only used on Windows (where
+    it is needed), and not on other systems. This fixes Chocolate Doom
+    on AmigaOS (thanks Timo Sievänen).
+  * UTF-8 usernames are supported, and Windows usernames with
+    non-ASCII characters are now supported (thanks AXDOOMER).
+
+### Compatibility
+  * Palette accuracy is reduced to 6 bits per channel, to more
+    accurately emulate the PC VGA hardware (thanks GhostlyDeath).
+  * Fixed teleport behavior when emulating the alternate Final Doom
+    executable (-gameversion final2) (thanks xttl).
+
+### Bugs fixed
+  * Fixed weapon cycling keys when playing in Shareware Doom and using
+    the IDKFA cheat (thanks AXDOOMER).
+  * Fixed the default mouse buttons in the setup tool (thanks
+    AXDOOMER).
+  * Chat macros now work when vanilla_keyboard_mapping is turned off.
+  * Default chat macros were fixed in the setup tool.
+  * Ping time calculation was fixed for LAN search, and made more
+    accurate for all searches.
+  * Fixed bug with detection of IWAD type by filename (thanks mether).
+
+### libtextscreen
+  * There is now limited UTF-8 text support in the textscreen library,
+    used in the label and input box widgets.
+  * Scroll bar behavior was fixed (thanks AXDOOMER).
+  * Input boxes stop editing and save when they lose their focus,
+    correcting a previous counterintuitive behavior (thanks Twelve).
+  * The numeric keypad now works properly when entering text values
+    (thanks Twelve).
+
+## 1.6.0 (2011-05-17)
+
+  * The instructions in the INSTALL file are now customized for
+    different platforms, and each binary package contains a version
+    with instructions specific to the platform that it is targetting.
+    This should help to avoid confusion that some users have reported
+    experiencing.
+  * The display settings window in the setup tool has been reorganised
+    to a better arrangement.
+  * It is now possible to load .lmp files (and play back demos) with
+    long filenames (thanks blzut3).
+  * In the setup tool, it is now possible to hold down shift when
+    changing key/mouse/joystick bindings to prevent other bindings to
+    the same key from being cleared (thanks myk).
+  * The joystick menu in the setup tool now has a test button (thanks
+    AXDOOMER).
+  * Specifying the -privateserver option implies -server (thanks
+    Porsche Monty).
+  * The Mac OS X .dmg package now has a background and looks generally
+    more polished.
+  * In Mac OS X, it is now possible to simply double click an IWAD
+    file in the Finder to configure its location within the launcher.
+  * Freedesktop.org desktop files are now installed for Doom and the
+    setup tool, which will appear in the main menu on desktop
+    environments such as Gnome and KDE (thanks Adrián Chaves
+    Fernández).
+  * The Chex Quest dehacked patch (chex.deh) will now be detected if
+    it is in the same directory as the IWAD file.
+
+### Compatibility
+  * Added support for the alternate version of the Final Doom
+    executable included in some later versions of the Id Anthology.
+    This version fixed the demo loop crash that occurred with the
+    “original” Final Doom executable.
+
+    This executable can be selected on the command line with
+    -gameversion final2. It has been made the default when playing
+    with the Final Doom IWADs (the original behavior can be selected
+    with -gameversion final).  (thanks Porsche Monty, Enjay).
+  * Very short sound effects are not played, to better emulate the
+    behavior of DMX in Vanilla Doom (thanks to Quasar for help in
+    investigating this).
+  * The null sector dereference emulation code has been imported from
+    Prboom+ - this fixes a desync with CLNJ-506.LMP (thanks entryway).
+  * The IDMUS cheat doesn’t work when emulating the v1.9 executable
+    (thanks AXDOOMER).
+
+### Bugs fixed
+  * Menu navigation when using joystick/joypad (thanks AXDOOMER).
+  * For configuration file value for shift keys, use scan code for
+    right shift, not left shift (thanks AXDOOMER).
+  * Default joystick buttons for the setup tool now match Vanilla
+    (thanks twipley).
+  * Visual Studio project files work again (thanks GhostlyDeath).
+  * The default sfx/music volume set by the setup tool is now 8
+    instead of 15, matching the game itself. (thanks AXDOOMER).
+  * Weapon cycling from the shotgun to the chaingun in Doom 1 now
+    works properly (thanks AXDOOMER).
+  * MIDI playback that locked up when using an empty MUS / MIDI file
+    (thanks AXDOOMER).
+  * Default sampling rate used by setup tool changed to 44100Hz, to
+    match the game default (thanks AXDOOMER).
+  * Cheat codes and menu hot keys now work when shift is held down or
+    capslock turned on (thanks AXDOOMER).
+
+### libtextscreen
+  * The background on GUI controls now lights up when hovering over
+    them, so that it is more obvious what you are selecting.
+  * It is now possible to type a “+” in input boxes (thanks AXDOOMER).
+  * It is possible to use the mouse wheel to scroll through scroll
+    panes.
+  * Clicking on scroll bars now moves the scroll handle to a matching
+    location.
+  * Clicking outside a dropdown list popup window now dismisses the
+    window.
+  * Window hotkeys that are an alphabetical letter now work when shift
+    is held down or capslock turned on (thanks AXDOOMER).
+
+## 1.5.0 (2011-01-02)
+
+  Big changes in this version:
+
+  * The DOSbox OPL emulator (DBOPL) has been imported to replace the
+    older FMOPL code.  The quality of OPL emulation is now therefore
+    much better.
+  * The game can now run in screen modes at any color depth (not just
+    8-bit modes).  This is mainly to work around problems with Windows
+    Vista/7, where 8-bit color modes don’t always work properly.
+  * Multiplayer servers now register themselves with an Internet
+    master server.  Use the -search command line parameter to find
+    servers on the Internet to play on.  You can also use DoomSeeker
+    (http://skulltag.net/doomseeker/) which supports this
+    functionality.
+  * When running in windowed mode, it is now possible to dynamically
+    resize the window by dragging the window borders.
+  * Names can be specified for servers with the -servername command
+    line parameter.
+  * There are now keyboard, mouse and joystick bindings to cycle
+    through available weapons, making play with joypads or mobile
+    devices (ie. without a proper keyboard) much more practical.
+  * There is now a key binding to change the multiplayer spy key
+    (usually F12).
+  * The setup tool now has a “warp” button on the main menu, like
+    Vanilla setup.exe (thanks Proteh).
+  * Up to 8 mouse buttons are now supported (including the
+    mousewheel).
+  * A new command line parameter has been added (-solo-net) which can
+    be used to simulate being in a single player netgame.
+  * There is now a configuration file parameter to set the OPL I/O
+    port, for cards that don’t use port 0x388.
+  * The Python scripts used for building Chocolate Doom now work with
+    Python 3 (but also continue to work with Python 2) (thanks arin).
+  * There is now a NOT-BUGS file included that lists some common
+    Vanilla Doom bugs/limitations that you might encounter (thanks to
+    Sander van Dijk for feedback).
+
+### Compatibility
+  * The -timer and -avg options now work the same as Vanilla when
+    playing back demos (thanks xttl)
+  * A texture lookup bug was fixed that caused the wrong sky to be
+    displayed in Spooky01.wad (thanks Porsche Monty).
+  * The HacX v1.2 IWAD file is now supported, and can be used
+    standalone without the need for the Doom II IWAD (thanks atyth).
+  * The I_Error function doesn’t display “Error:” before the error
+    message, matching the Vanilla behavior.  “Error” has also been
+    removed from the title of the dialog box that appears on Windows
+    when this happens.  This is desirable as not all such messages are
+    actually errors (thanks Proteh).
+  * The setup tool now passes through all command line arguments when
+    launching the game (thanks AXDOOMER).
+  * Demo loop behavior (ie. whether to play DEMO4) now depends on the
+    version being emulated.  When playing Final Doom the game will
+    exit unexpectedly as it tries to play the fourth demo - this is
+    Vanilla behaviour (thanks AXDOOMER).
+
+### Bugs fixed
+  * A workaround has been a bug in old versions of SDL_mixer (v1.2.8
+    and earlier) that could cause the game to lock up.  Please upgrade
+    to a newer version if you haven’t already.
+  * It is now possible to use OPL emulation at 11025Hz sound sampling
+    rate, due to the new OPL emulator (thanks Porsche Monty).
+  * The span renderer function (used for drawing floors and ceilings)
+    now behaves the same as Vanilla Doom, so screenshots are
+    pixel-perfect identical to Vanilla Doom (thanks Porsche Monty).
+  * The zone memory system now aligns allocated memory to 8-byte
+    boundaries on 64-bit systems, which may fix crashes on systems
+    such as sparc64 (thanks Ryan Freeman and Edd Barrett).
+  * The configure script now checks for libm, fixing compile problems
+    on Fedora Linux (thanks Sander van Dijk).
+  * Sound distortion with certain music files when played back using
+    OPL (eg. Heretic title screen).
+  * Error in Windows when reading response files (thanks Porsche
+    Monty, xttl, Janizdreg).
+  * Windows Vista/7 8-bit color mode issues (the default is now to run
+    in 32-bit color depth on these versions) (thanks to everybody who
+    reported this and helped test the fix).
+  * Screen borders no longer flash when running on widescreen
+    monitors, if you choose a true-color screen mode (thanks exp(x)).
+  * The controller player in a netgame is the first player to join,
+    instead of just being someone who gets lucky.
+  * Command line arguments that take an option now check that an
+    option is provided (thanks Sander van Dijk).
+  * Skill level names in the setup tool are now written the same as
+    they are on the in-game “new game” menu (thanks AXDOOMER).
+  * There is no longer a limit on the lengths of filenames provided to
+    the -record command line parameter (thanks AXDOOMER).
+  * Window title is not lost in setup tool when changing video driver
+    (thanks AXDOOMER).
+
+### libtextscreen
+  * The font used for the textscreen library can be forced by setting
+    the TEXTSCREEN_FONT environment variable to “small” or “normal”.
+  * Tables or scroll panes that don’t contain any selectable widgets
+    are now themselves not selectable (thanks Proteh).
+  * The actions displayed at the bottom of windows are now laid out in
+    a more aesthetically pleasing way.
+
+## 1.4.0 (2010-07-10)
+
+  The biggest change in this version is the addition of OPL emulation.
+  This emulates Vanilla Doom’s MIDI playback when using a Yamaha OPL
+  synthesizer chip, as was found on SoundBlaster compatible cards.
+
+  A software OPL emulator is included as most modern computers do not
+  have a hardware OPL chip any more.  If you do have one, you can
+  configure Chocolate Doom to use it; see README.OPL.
+
+  The OPL playback feature is not yet perfect or 100% complete, but is
+  judged to be good enough for general use.  If you find music that
+  does not play back properly, please report it as a bug.
+
+### Other changes
+  * The REJECT overflow emulation code from PrBoom+ has been
+    imported.  This fixes demo desync on some demos, although
+    others will still desync.
+  * Warnings are now generated for invalid dehacked replacements of
+    printf format strings.  Some potential buffer overflows are also
+    checked.
+  * The installation instructions (INSTALL file) have been clarified
+    and made more platform-agnostic.
+  * The mouse is no longer warped to the center of the screen when the
+    demo sequence advances.
+  * Key bindings can now be changed for the demo recording quit key
+    (normally ‘q’) and the multiplayer messaging keys (normally ‘t’,
+    ‘g’, ‘i’, ‘b’ and ‘r’).
+
+## 1.3.0 (2010-02-10)
+
+  * Chocolate Doom now runs on Windows Mobile/Windows CE!
+  * It is possible to rebind most/all of the keys that control the
+    menu, shortcuts, automap and weapon switching.  The main reason
+    for this is to support the Windows CE port and other platforms
+    where a full keyboard may not be present.
+  * Chocolate Doom now includes a proper Mac OS X package; it is no
+    longer necessary to compile binaries for this system by hand.  The
+    package includes a simple graphical launcher program and can be
+    installed simply by dragging the “Chocolate Doom” icon to the
+    Applications folder. (thanks to Rikard Lang for extensive testing
+    and feedback)
+  * The video mode auto-adjust code will automatically choose windowed
+    mode if no fullscreen video modes are available.
+  * The zone memory size is automatically reduced on systems with a
+    small amount of memory.
+  * The “join game” window in the setup tool now has an option to
+    automatically join a game on the local network.
+  * Chocolate Doom includes some initial hacks for compiling under
+    SDL 1.3.
+  * Recent versions of SDL_mixer include rewritten MIDI code on Mac OS
+    X.  If you are using a version of SDL_mixer with the new code,
+    music will now be enabled by default.
+  * Windows Vista and Windows 7 no longer prompt for elevated
+    privileges when running the setup tool (thanks hobbs and MikeRS).
+  * The Windows binaries now have better looking icons (thanks
+    MikeRS).
+  * Magic values specified using the -spechit command line parameter
+    can now be hexadecimal.
+  * DOOMWADDIR/DOOMWADPATH can now specify the complete path to IWAD
+    files, rather than the path to the directory that contains them.
+  * When recording shorttics demos, errors caused by the reduced
+    turning resolution are carried forward, possibly making turning
+    smoother.
+  * The source tarball can now be used to build an RPM package:
+    rpmbuild -tb chocolate-doom-VER.tar.gz
+
+### Compatibility
+  * The A_BossDeath behavior in v1.9 emulation mode was fixed (thanks
+    entryway)
+  * The “loading” disk icon is drawn more like how it is drawn in
+    Vanilla Doom, also fixing a bug with chook3.wad.
+  * Desync on 64-bit systems with ep1-0500.lmp has (at long last) been
+    fixed (thanks exp(x)).
+  * Donut overrun emulation code imported from Prboom+ (thanks
+    entryway).
+  * The correct level name should now be shown in the automap for
+    pl2.wad MAP33 (thanks Janizdreg).
+  * In Chex Quest, the green radiation suit colormap is now used
+    instead of the red colormaps normally used when taking damage or
+    using the berserk pack.  This matches Vanilla chex.exe behavior
+    (thanks Fuzztooth).
+  * Impassible glass now displays and works the same as in Vanilla,
+    fixing wads such as OTTAWAU.WAD (thanks Never_Again).
+
+### Bugs fixed
+  * Memory-mapped WAD I/O is disabled by default, as it caused various
+    issues, including a slowdown/crash with Plutonia 2 MAP23.  It can
+    be explicitly re-enabled using the “-mmap” command line parameter.
+  * Crash when saving games due to the ~/.chocolate-doom/savegames
+    directory not being created (thanks to everyone who reported
+    this).
+  * Chocolate Doom will now run under Win95/98, as the
+    SetProcessAffinityMask function is looked up dynamically.
+  * Compilation under Linux with older versions of libc will now work
+    (the semantics for sched_setaffinity were different in older
+    versions)
+  * Sound clipping when using libsamplerate was improved (thanks David
+    Flater)
+  * The audio buffer size is now calculated based on the sample rate,
+    so there is not a noticeable delay when using a lower sample rate.
+  * The manpage documentation for the DOOMWADPATH variable was fixed
+    (thanks MikeRS).
+  * Compilation with FEATURE_MULTIPLAYER and FEATURE_SOUND disabled
+    was fixed.
+  * Fixed crash when using the donut special type and the joining
+    linedef is one sided (thanks Alexander Waldmann).
+  * Key settings in a configuration file that are out of range do not
+    cause a crash (thanks entryway).
+  * Fix ear-piercing whistle when playing the MAP05 MIDI music using
+    timidity with EAWPATS (thanks entryway / HackNeyed).
+
+### libtextscreen
+  * There is now a second, small textscreen font, so that the ENDOOM
+    screen and setup tool can be used on low resolution devices
+    (eg. PDAs/embedded devices)
+  * The textscreen library now has a scrollable pane widget. Thanks to
+    LionsPhil for contributing code to scroll up and down using the
+    keyboard.
+  * Doxygen documentation was added for the textscreen library.
+
+## 1.2.1 (2008-12-10)
+
+  This version just fixes a crash at the intermission screen when
+  playing Doom 1 levels.
+
+## 1.2.0 (2008-12-10)
+
+  Happy 15th Birthday, Doom!
+
+  * Chocolate Doom now has an icon that is not based on the
+    proprietary Doom artwork.
+  * There is now memory-mapped WAD I/O support, which should be useful
+    on some embedded systems.
+  * Chex quest emulation support is now included, although an
+    auxiliary dehacked patch is needed (chexdeh.zip in the idgames
+    archive).
+
+### Compatibility
+  * The armor class is always set to 2 when picking up a megasphere
+    (thanks entryway).
+  * The quit screen prompts to quit “to dos” instead of just to quit
+    (thanks MikeRS)
+  * The “dimensional shambler” quit message was fixed.
+  * Fix crash related to A_BFGSpray with NULL target when using
+    dehacked patches - discovered with insaned2.deh (thanks CSonicGo)
+  * NUL characters are stripped from dehacked files, to ensure correct
+    behavior with some dehacked patches (eg. the one with portal.wad).
+
+### Bugs fixed
+  * “Python Image Library” should have been “Python Imaging Library”
+    (thanks exp(x)).
+  * The setup tool should no longer ask for elevated permissions on
+    Windows Vista (this fix possibly may not work).
+  * The application icon is set properly when running under Windows XP
+    with the “Luna” theme.
+  * Fix compilation under Cygwin to detect libraries and headers from
+    the correct environment.
+  * The video code does not try to read SDL events before SDL has been
+    properly initialised - this was causing problems with some older
+    versions of SDL.
+
+## 1.1.1 (2008-04-20)
+
+  The previous release (v1.1.0) included a bug that broke compilation
+  when libsamplerate support was enabled.  The only change in this
+  version is to fix this bug.
+
+## 1.1.0 (2008-04-19)
+
+  * The video mode code has been radically restructured.  The video
+    mode is now chosen by directly specifying the mode to use; the
+    scale factor is then chosen to fit the screen.  This is helpful
+    when using widescreen monitors (thanks Linguica)
+  * MSVC build project files (thanks GhostlyDeath and entryway).
+  * Unix manpage improvements; the manpage now lists the environment
+    variables that Chocolate Doom uses.  Manpages have been added for
+    chocolate-setup and chocolate-server, from the versions for the
+    Debian Chocolate Doom package (thanks Jon Dowland).
+  * INSTALL file with installation instructions for installing
+    Chocolate Doom on Unix systems.
+  * Support for high quality resampling of sound effects using
+    libsamplerate (thanks David Flater).
+  * A low pass filter is applied when doing sound resampling in an
+    attempt to filter out high frequency noise from the resampling
+    process.
+  * R_Main progress box is not displayed if stdout is a file (produces
+    cleaner output).
+  * Client/server version checking can be disabled to allow different
+    versions of Chocolate Doom to play together, or Chocolate Doom
+    clients to play with Strawberry Doom clients.
+  * Unix manpages are now generated for the Chocolate Doom
+    configuration files.
+  * The BSD PC speaker driver now works on FreeBSD.
+
+### Compatibility
+  * Use the same spechits compatibility value as PrBoom+, for
+    consistency (thanks Lemonzest).
+  * The intercepts overrun code has been refactored to work on big
+    endian machines.
+  * The default startup delay has been set to one second, to allow
+    time for the screen to settle before starting the game (some
+    monitors have a delay before they come back on after changing
+    modes).
+  * If a savegame buffer overrun occurs, the savegame does not get
+    saved and existing savegames are not overwritten (same behaviour
+    as Vanilla).
+
+### Bugs fixed
+  * Desync with STRAIN demos and dehacked Misc values not being set
+    properly (thanks Lemonzest)
+  * Don’t grab the mouse if the mouse is disabled via -nomouse or
+    use_mouse in the configuration file (thanks MikeRS).
+  * Don’t center the mouse on startup if the mouse is disabled (thanks
+    Siggi).
+  * Reset the palette when the window is restored to clear any screen
+    corruption (thanks Catoptromancy).
+  * mus2mid.c should use `MEM_SEEK_SET`, not `SEEK_SET` (thanks
+    Russell)
+  * Fast/Respawn options were not being exchanged when starting
+    netgames (thanks GhostlyDeath).
+  * Letterbox mode is more accurately described as “pillarboxed” or
+    “windowboxed” where appropriate (thanks MikeRS)
+  * Process affinity mask is set to 1 on Windows, to work around a bug
+    in SDL_mixer that can cause crashes on multi-core machines (thanks
+    entryway).
+  * Bugs in the joystick configuration dialog in the setup tool have
+    been fixed.
+
+## 1.0.0 (2007-12-10)
+
+  This release is dedicated to Dylan “Toke” McIntosh, who was
+  tragically killed in a car crash in 2006.  I knew Dylan from IRC and
+  the Doomworld forums for several years, and he had a deep passion
+  for this game.  He was also a huge help for me while developing
+  Chocolate Doom, as he helped point out a lot of small quirks in
+  Vanilla Doom that I didn’t know about. His death is a great loss.
+  RIP Toke.
+
+  This is the first release to reach full feature parity with Vanilla
+  Doom.  As a result, I have made this version 1.0.0, so Chocolate
+  Doom is no longer beta!
+
+### Big new features
+  * Multiplayer!  This version includes an entirely new multiplayer
+    engine, based on a packet server architecture.  I’d like to thank
+    joe, pritch, Meph and myk, and everyone else who has helped test
+    the new code for their support, feedback and help in testing this.
+    The new code still needs more testing, and I’m eager to hear any
+    feedback on this.
+  * A working setup tool.  This has the same look and feel as the
+    original setup.exe.  I hope people like it!  Note that it has some
+    advantages over the original setup.exe - for example, you can use
+    the mouse.
+
+### Other new features
+  * New mus conversion code thanks to Ben Ryves.  This converts the
+    Doom .mus format to .mid a lot better.  As one example, tnt.wad
+    Map02 is now a lot closer to how Vanilla says.  Also, the music on
+    the deca.wad titlescreen now plays!
+  * x3, x4 and x5 display scale (thanks to MikeRS for x5 scale).
+  * Fullscreen “letterbox” mode allows Chocolate Doom to run on
+    machines where 1.6:1 aspect ratio modes are unavailable
+    (320x200/640x400).  The game runs in 320x240/640x480 instead, with
+    black borders.  The system automatically adjusts to this if closer
+    modes are unavailable.
+  * Aspect ratio correction: you can (also) run at 640x480 without
+    black borders at the top and bottom of the screen.
+  * PC speaker sound effect support.  Chocolate Doom can output real
+    PC speaker sounds on Linux, or emulate a PC speaker through the
+    sound card.
+  * Working three-screen mode, as seen in early versions of Doom!  To
+    test this out, put three computers on a LAN and type:
+
+        chocolate-doom -server
+        chocolate-doom -autojoin -left
+        chocolate-doom -autojoin -right
+
+  * Allow a delay to be specified on startup, to allow the display to
+    settle after changing modes before starting the game.
+  * Allow the full path and filename to be specified when loading
+    demos: It is now possible to type “chocolate-doom -playdemo
+    /tmp/foo.lmp” for example.
+  * Savegames are now stored in separate directories depending on the
+    IWAD: eg. the savegames for Doom II are stored in a different
+    place to those for Doom I, Final Doom, etc. (this does not affect
+    Windows).
+  * New mouse acceleration code works based on a threshold and
+    acceleration.  Hopefully this should be closer to what the DOS
+    drivers do.  There is a ‘test’ feature in the setup tool to help
+    in configuring this.
+  * New “-nwtmerge” command line option that emulates NWT’s “-merge”
+    option.  This allows TiC’s Obituary TC to be played.
+  * The ENDOOM screen no longer closes automatically, you have to
+    click the window to make it go away.
+  * Spechit overrun fixes and improvements.  Thanks to entryway for
+    his continued research on this topic (and because I stole your
+    improvements :-).  Thanks to Quasar for reporting a bug as well.
+  * Multiple dehacked patches can be specified on the command line, in
+    the same way as with WADs - eg. -deh foo.deh bar.deh baz.deh.
+  * Default zone memory size increased to 16MB; this can be controlled
+    using the -mb command-line option.
+  * It is now possible to record demos of unlimited length (by
+    default, the Vanilla limit still applies, but it can now be
+    disabled).
+  * Autoadjusting the screen mode can now be disabled.
+  * On Windows, the registry is queried to detect installed versions
+    of Doom and automatically locate IWAD files.  IWADs installed
+    through Steam are also autodetected.
+  * Added DOOMWADPATH that can be used like PATH to specify multiple
+    locations in which to search for IWAD files.  Also, “-iwad” is now
+    enhanced, so that eg. “-iwad doom.wad” will now search all IWAD
+    search paths for “doom.wad”.
+  * Improved mouse tracking that should no longer lag.  Thanks to
+    entryway for research into this.
+  * The SDL driver can now be specified in the configuration file.
+    The setup tool has an option on Windows to select between DirectX
+    and windib.
+  * Joystick support.
+  * Configuration file option to change the sound sample rate.
+  * More than three mouse buttons are now supported.
+
+### Portability improvements
+  * Chocolate Doom now compiles and runs cleanly on MacOS X.  Huge
+    thanks go to Insomniak who kindly gave me an account on his
+    machine so that I could debug this remotely.  Big thanks also go
+    to athanatos on the Doomworld forums for his patience in testing
+    various ideas as I tried to get Chocolate Doom up and running on
+    MacOS.
+  * Chocolate Doom now compiles and runs natively on AMD64.
+  * Chocolate Doom now compiles and runs on Solaris/SPARC, including
+    the Sun compiler.  Thanks to Mike Spooner for some portability
+    fixes.
+  * Improved audio rate conversion, so that sound should play properly
+    on machines that don’t support low bitrate output.
+
+### Compatibility fixes
+  * Check for IWADs in the same order as Vanilla Doom.
+  * Dehacked code will now not allow string replacements to be longer
+    than those possible through DOS dehacked.
+  * Fix sound effects playing too loud on level 8 (thanks to myk for
+    his continued persistence in getting me to fix this)
+  * Save demos when quitting normally - it is no longer necessary to
+    press ‘q’ to quit and save a demo.
+  * Fix spacing of -devparm mode dots.
+  * Fix sky behavior to be the same as Vanilla Doom - when playing in
+    Doom II, the skies never change from the sky on the first level
+    unless the player loads from a savegame.
+  * Make -nomouse and config file use_mouse work again.
+  * Fix the -nomusic command-line parameter.  Make the snd_sfxdevice
+    snd_musicdevice values in the configuration file work, so that it
+    is possible to disable sound, as with Vanilla.
+  * Repeat key presses when the key is held down (this is the Vanilla
+    behavior) - thanks to Mad_Mac for pointing this out.
+  * Don’t print a list of all arguments read from response files -
+    Vanilla doesn’t do this.
+  * Autorun only when joyb_speed >= 10, not >= 4.  Thanks to Janizdreg
+    for this.
+  * Emulate a bug in DOS dehacked that can overflow the dehacked frame
+    table and corrupt the weaponinfo table.  Note that this means
+    Batman Doom will no longer play properly (identical behavior to
+    Vanilla); vbatman.deh needs to also be applied to fix it.  (Thanks
+    grazza)
+  * Allow dehacked 2.3 patches to be loaded.
+  * Add more dehacked string replacements.
+  * Compatibility option to enable or disable native key mappings.
+    This means that people with non-US keyboards can decide whether to
+    use their correct native mapping or behave like Vanilla mapping
+    (which assumes all keyboards are US).
+  * Emulate overflow bug in P_FindNextHighestFloor.  Thanks to
+    entryway for the fix for this.
+  * Add -netdemo command line parameter, for playing back netgame
+    demos recorded with a single player.
+  * The numeric keypad now behaves like Vanilla Doom does.
+  * Fix some crashes when loading from savegames.
+  * Add intercepts overrun emulation from PrBoom-plus.  Thanks again
+    to entryway for his research on this subject.
+  * Add playeringame overrun emulation.
+
+### Bugs fixed
+  * Fix crash when starting new levels due to the intermission screen
+    being drawn after the WI_ subsystem is shut down (thanks pritch
+    and joe)
+  * Catch failures to initialise sound properly, and fail gracefully.
+  * Fix crasher in 1427uv01.lmp (thanks ultdoomer)
+  * Fix crash in udm1.wad.
+  * Fix crash when loading a savegame with revenant tracer missiles.
+  * Fix crash when loading a savegame when a mancubus was in the
+    middle of firing.
+  * Fix Doom 1 E1-3 intermission screen animations.
+  * Fix loading of dehacked “sound” sections.
+  * Make sure that modified copyright banners always end in a newline
+    - this fixes a bug with av.wad (thanks myk)
+  * Added missing quit message (“are you sure you want to quit this
+    great game?”).
+  * Fix when playing long sound effects - the death sound in
+    marina.wad now plays properly, for example.
+  * Fix buffer overrun on the quicksave prompt screen that caused a
+    mysterious cycling character to appear.
+  * IDCLEV should not work in net games (thanks Janizdreg)
+  * Stop music playing at the ENDOOM screen.
+  * Fix sound sample rate conversion crash.
+  * Fix “pop” heard at the end of sound effects.
+  * Fix crash when playing long sounds.
+  * Fix bug with -timedemo accuracy over multi-level demos.
+  * Fix bug with the automap always following player 1 in multiplayer
+    mode (thanks Janizdreg).
+
+## 0.1.4 (2006-02-13)
+
+  * NWT-style merging command line options (allows Mordeth to be played)
+  * Unix manpage (thanks Jon Dowland)
+  * Dehacked improvements/fixes:
+     * Allow changing the names of graphic lumps used in menu, status bar
+       intermission screen, etc.
+     * Allow changing skies, animated flats + textures
+     * Allow changing more startup strings.
+     * Allow text replacements on music + sfx lump names
+  * Fix for plutonia map12 crash.
+  * Fix bug with playing long sfx at odd sample rates.
+  * Big Endian fixes (for MacOS X).  Thanks to athanatos for helping
+    find some of these.
+  * Install into /usr/games, rather than /usr/bin (thanks Jon Dowland)
+
+## 0.1.3 (2006-01-20)
+
+  * Imported the spechit overrun emulation code from prboom-plus.  Thanks to
+    Andrey Budko for this.
+  * New show_endoom option in the chocolate-doom.cfg config file allows
+    the ENDOOM screen to be disabled.
+  * Chocolate Doom is now savegame-compatible with Vanilla Doom.
+
+  * Fixes for big endian machines (thanks locust)
+  * Fixed the behavior of the dehacked maximum health setting.
+  * Fix the “-skill 0” hack to play without any items (thanks to Janizdreg
+    for pointing out that this was nonfunctional)
+  * Fix playing of sounds at odd sample rates (again).  Sound effects
+    at any sample rate now play, but only sounds with valid headers.
+    This is the *real* way Vanilla Doom behaves.  Thanks to myk for
+    pointing out the incorrect behavior.
+
+## 0.1.2 (2005-10-29)
+
+  * Silence sounds at odd sample rates (rather than bombing out); this
+    is the way Vanilla Doom behaves.
+  * Handle multiple replacements of the same sprite in a PWAD.
+  * Support specifying a specific version to emulate via the command line
+    (-gameversion)
+  * Fix help screen orderings and skull positions.  Behave exactly as
+    the original executables do.
+
+## 0.1.1 (2005-10-18)
+
+  * Display startup “banners” if they have been modified through
+    dehacked.
+  * Dehacked “Misc” section support.
+
+### Bugs fixed
+  * Doom 1 skies always using Episode 1 sky
+  * Crash when switching applications while running fullscreen
+  * Lost soul bounce logic (do not bounce in Registered/Shareware)
+  * Mouse buttons mapped incorrectly (button 1 is right, 2 is middle)
+  * Music not pausing when game is paused, when using SDL_mixer’s
+    native MIDI playback.
+  * Pink icon on startup (palette should be fully set before anything is
+    loaded)
+
+## 0.1.0 (2005-10-09)
+
+  * Dehacked support
+  * WAD merging for TCs
+  * ENDOOM display
+  * Fix bug with invalid MUS files causing crashes
+  * Final Doom fixes
+
+## 0.0.4 (2005-09-27)
+
+  * Application icon and version info included in Windows .exe files
+  * Fixes for non-x86 architectures
+  * Fix uac_dead.wad (platform drop on e1m8 should occur when all
+    bosses die, not just barons)
+  * Fix “loading” icon to work for all graphics modes
+
+## 0.0.3 (2005-09-17)
+
+  * Mouse acceleration code to emulate the behaviour of old DOS mouse
+    drivers (thanks to Toke for information about this and
+    suggestions)
+  * Lock surfaces properly when we have to (fixes crash under
+    Windows 98)
+
+## 0.0.2 (2005-09-13)
+
+  * Remove temporary MIDI files generated by sound code.
+  * Fix sound not playing at the right volume
+  * Allow alt-tab away while running in fullscreen under Windows
+  * Add second configuration file (chocolate-doom.cfg) to allow
+    chocolate-doom specific settings.
+  * Fix switches not changing in Ultimate Doom
+
+## 0.0.1 (2005-09-07)
+
+  First beta release
diff --git a/games/NXDoom/NOT-BUGS.md b/games/NXDoom/NOT-BUGS.md
new file mode 100644
index 000000000..1ef97e3df
--- /dev/null
+++ b/games/NXDoom/NOT-BUGS.md
@@ -0,0 +1,149 @@
+The aim of Chocolate Doom is to behave as closely to Vanilla Doom as
+possible.  As a result, you may experience problems that you would
+also experience when using Vanilla Doom.  These are not “bugs” as
+Chocolate Doom is behaving as intended.
+
+This is not intended to be a comprehensive list of Vanilla Doom bugs.
+For more information, consult the “engine bugs” page of the Doom Wiki.
+
+## Game exits after title screen with message about game version
+
+The game may exit after the title screen is shown, with a message like
+the following:
+
+    Demo is from a different game version!
+    (read 2, should be 109)
+
+    *** You may need to upgrade your version of Doom to v1.9. ***
+        See: https://www.doomworld.com/classicdoom/info/patches.php
+        This appears to be v1.0/v1.1/v1.2.
+
+This usually indicates that your IWAD file that you are using to play
+the game (usually named doom.wad or doom2.wad) is out of date.
+Chocolate Doom only supports versions 1.666 through 1.9.
+
+To fix the problem, you must upgrade your IWAD file, preferably
+to 1.9.  The URL in the message has downloadable upgrade patches that
+you can use to upgrade.
+
+## Game exits in demo loop when playing Final Doom
+
+When playing with the Final Doom IWAD files (tnt.wad, plutonia.wad),
+if you leave the game at the title screen to play through the demo
+loop, it will eventually exit with the following error message:
+
+    W_GetNumForName: demo4 not found!
+
+This is the same behavior as the Vanilla executables that were
+bundled with Final Doom.  When Ultimate Doom was developed, a fourth
+demo was added to the demo loop, and this change was retained in the
+Final Doom version of the executable.  However, the Final Doom IWADs
+do not include a fourth demo, so the game crashes.
+
+An alternate version of Final Doom was included in the Id Anthology
+boxed set, and this version of the game fixed this bug. However, this
+version also changes the teleport behavior, so the default is to
+emulate the most commonly distributed version of the game. To use
+the alternate version, run with:
+
+    chocolate-doom -gameversion final2
+
+## Game exits when accessing the options menu
+
+The game may exit with the message “Bad V_DrawPatch” when accessing
+the options menu, if you have your mouse sensitivity set high.
+
+The Doom options menu has a slider that allows the mouse sensitivity
+to be controlled; however, it has only a very limited range. It is
+common for experienced players to set a mouse sensitivity that is much
+higher than what can be set via the options menu. The setup program
+allows a larger range of values to be set.
+
+However, setting very high sensitivity values causes the game to exit
+when accessing the options menu under Vanilla Doom. Because Chocolate
+Doom aims to emulate Vanilla Doom as closely as possible, it does the
+same thing.
+
+One solution to the problem is to set a lower mouse sensitivity.
+Alternatively, all of the settings in the options menu can be
+controlled through Doom’s key bindings anyway:
+
+Option                     | Key
+---------------------------|-----
+End game                   | F7
+Messages on/off            | F8
+Graphic detail high/low    | F5
+Screen size smaller/larger | -/+
+Sound volume menu          | F4
+
+## Game exits with “Savegame buffer overrun” when saving the game
+
+If you are playing on a particularly large level, it is possible that
+when you save the game, the game will quit with the message “Savegame
+buffer overrun”.
+
+Vanilla Doom has a limited size memory buffer that it uses for saving
+games.  If you are playing on a large level, the buffer may be too
+small for the entire savegame to fit.  Chocolate Doom allows the limit
+to be disabled: in the setup tool, go to the “compatibility” menu and
+disable the “Vanilla savegame limit” option.
+
+If this error happens to you, your game has not been lost!  A file
+named temp.dsg is saved; rename this to doomsav0.dsg to make it appear
+in the first slot in the “load game” menu.  (On Unix systems, you will
+need to look in the .chocolate-doom/savegames directory in your home
+directory)
+
+## Game ends suddenly when recording a demo
+
+If you are recording a very long demo, the game may exit suddenly.
+Vanilla Doom has a limited size memory buffer that it uses to save the
+demo into.  When the buffer is full, the game exits.  You can tell if
+this happens, as the demo file will be around 131,072 bytes in size.
+
+You can work around this by using the -maxdemo command line parameter
+to specify a larger buffer size.  Alternatively, the limit can be
+disabled: in the setup tool, go to the compatibility menu and disable
+the “Vanilla demo limit” option.
+
+## Game exits with a message about “visplanes”
+
+The game may exit with one of these messages:
+
+    R_FindPlane: no more visplanes
+    R_DrawPlanes: visplane overflow (129)
+
+This is known as the “visplane overflow” limit and is one of the most
+well-known Vanilla Doom engine limits.  You should only ever experience
+this when trying to play an add-on level.  The level you are trying to
+play is too complex; it was most likely designed to work with a limit
+removing source port.
+
+More information can be found here (archived link): https://archive.is/s6h7V
+
+## IDMUS## cheat doesn’t work with shareware/registered Doom IWADs
+
+The IDMUS cheat allows the in-game music to be changed.  However, in
+the original v1.9 this cheat didn’t work properly when playing with
+the Doom 1 (shareware and registered) IWADs.  This bug was fixed in
+the Ultimate Doom and Final Doom executables.
+
+Chocolate Doom emulates this bug.  When playing with the shareware or
+registered Doom IWADs, the IDMUS cheat therefore does not work
+properly.  If you are playing with the Ultimate Doom IWAD, the
+Ultimate Doom executable is emulated by default, so the cheat works
+properly.
+
+## Some graphics are wrong when playing with BFG Edition IWADs
+
+If you are playing using the IWAD files from Doom 3: BFG Edition, you
+may notice that certain graphics appear strange or wrong. This
+includes the title screen, and parts of the options menu.
+
+The IWAD files in the new BFG Edition have had some significant
+changes from the IWAD files in older releases. Some of the graphics
+lumps have been removed or changed, and the Doom 2 secret levels are
+also censored. Chocolate Doom includes some small workarounds that
+allow the game to run, but for the best experience, it’s best to get a
+copy of the classic versions of the IWADs. These are still available
+to buy from Steam or GOG.com.
diff --git a/games/NXDoom/PHILOSOPHY.md b/games/NXDoom/PHILOSOPHY.md
new file mode 100644
index 000000000..afd1e68d1
--- /dev/null
+++ b/games/NXDoom/PHILOSOPHY.md
@@ -0,0 +1,214 @@
+Chocolate Doom has been designed around a careful and deliberate
+philosophy that attempts to recreate the original (“Vanilla”) DOS
+executables for Doom, Heretic, Hexen and Strife. This document
+describes some of that philosophy and the reasoning behind it.
+
+This document is descriptive, not proscriptive.
+
+# Vanilla behavior
+
+Ideally Chocolate Doom aims to recreate the behavior of the Vanilla
+binaries, but different aspects of Vanilla behavior are held to
+varying degrees of importance. It can be imagined as different “tiers”
+of compatibility:
+
+ * The game and gameplay itself is of central importance. Here, the
+   Vanilla behavior ought to be maintained as accurately as possible.
+   This includes the look, feel and sound, and things like demo
+   compatibility.
+ * The surrounding aspects of the game that aren’t part of the central
+   gameplay experience can be extended as long as there’s a good
+   reason and Vanilla behavior is respected.
+ * The setup tool is not required to reproduce the behavior of the
+   Vanilla setup tool, even though it reproduces its look and feel.
+
+“Vanilla” is defined as:
+
+ * DOS Doom 1.9 (although there are actually multiple “1.9”s).
+ * DOS Heretic 1.3.
+ * DOS Hexen 1.1 (although there are actually two known “1.1”s).
+ * DOS Strife 1.31.
+ * DOS Chex Quest.
+
+Compatibility with older versions of the DOS binaries is also a
+secondary goal (though not pre-release versions). Other ports (either
+official or unofficial) are out of scope: this includes console ports,
+non-DOS ports, Doom 95 and Doom 3: BFG Edition.
+
+# Compatibility
+
+Chocolate Doom aims to be compatible with Vanilla Doom in several
+different ways. Examples are:
+
+ * Bug compatibility: the aim is to emulate compatibility of the
+   original game down to bugs that were present in the DOS
+   executables. This includes maintaining the limitations of the
+   original engine: for example, the infamous “visplane overflow” bug
+   is intentionally still present, where other source ports have
+   removed it; this allows mappers targeting Vanilla Doom to use
+   Chocolate Doom as a faithful substitute.
+ * Demo compatibility: Doom was one of the first games to develop a
+   ‘speedrunning’ community, and thousands of recordings of Doom
+   gameplay (`.lmp` demo files) exist in the Compet-N archive. Chocolate
+   Doom aims for the highest standard of demo compatibility with
+   Vanilla Doom, a goal that is often complicated by obscure behavior
+   that can be difficult to reproduce.
+ * Configuration file compatibility: Chocolate Doom uses the same
+   configuration file format as Vanilla Doom, such that a user should
+   be able to reuse their existing Vanilla configuration file without
+   making any changes. Extra non-Vanilla options are stored in a
+   separate configuration file.
+ * Savegame file compatibility: Chocolate Doom uses the same savegame
+   file format as Vanilla, such that it should be possible to import
+   and use existing savegame files.
+
+# DOS tools
+
+Chocolate Doom includes some features that aren’t part of Vanilla Doom
+but exist for compatibility with DOS tools that interact with it.
+These are considered part of the Vanilla experience and ought to be
+treated as such. Some examples are:
+
+ * The novert setting, which reproduces the functionality of
+   `novert.exe`.
+ * The `-deh` parameter, which loads Dehacked patches like dehacked.exe
+   does under DOS. Chocolate Doom imposes the same limitations that
+   Vanilla Dehacked does.
+
+# Exceptions
+
+Chocolate Doom differs from Vanilla Doom in a number of ways. In most
+cases these are subtle, minor differences. Nonetheless they deserve
+some explanation and justification. Here are some examples of
+situations where changes are considered acceptable:
+
+ 1. Vanilla behavior can be broken that is harmful, eg. can damage the
+    player’s computer, or is just outright misleading. For example:
+
+    - Vanilla uses unbounded sprintf and strcpy (security issue).
+    - Vanilla has crashes that force the user to reboot the machine.
+    - Vanilla has an out of memory message that recommends tweaking
+      CONFIG.SYS. As Chocolate Doom doesn’t run under DOS, reproducing
+      this message would not be helpful.
+
+ 2. Subtly extending behavior is okay where it’s not clear what the
+    Vanilla behavior is anyway. For example:
+
+    - Opening the menu releases mouse grab in Chocolate Doom.
+    - Chocolate Hexen’s graphical startup screen runs in a window.
+
+ 3. Supporting obsolete technology is not a goal: it’s considered
+    acceptable that Chocolate Doom does not support every type of
+    hardware from 1993. However, Chocolate Doom should aim to recreate
+    the functionality in a modern way. Examples of technologies that
+    aren’t supported are:
+
+    - No support for IPX networks, but TCP/IP is supported instead.
+    - No support for dial-up/serial connections; modern operating
+      systems have features that do that for you.
+    - No MS-DOS version.
+
+ 4. Changes are acceptable that allow the player to be able play the
+    game. For example:
+
+    - There are new key bindings for actions that can’t be rebound with
+      Vanilla Doom, because it’s useful for portability to machines
+      that don’t have a full keyboard.
+    - There are additional mouse and joystick button bindings that let
+      you perform actions with them that can only be done with the
+      keyboard in Vanilla Doom.
+    - Chocolate Doom includes some hacks to support the Doom 3: BFG
+      Edition IWAD files. The assumption is that being able to at least
+      play is better than nothing, even if it’s not Vanilla behavior.
+    - Chocolate Strife does not emulate the save bug from
+      Vanilla 1.31, which could corrupt saves when overwriting a slot,
+      if the old slot was not part of the current game’s progression.
+      Vanilla behavior is unexpected and potentially devastating.
+
+ 5. Adding extra options to Vanilla functionality is acceptable as long
+    as the defaults match Vanilla, it doesn’t change gameplay and
+    there’s a good reason for it. For example:
+
+    - PNG screenshots are supported because PCX is an obsolete format.
+    - Chocolate Doom has the vanilla_keyboard_mapping option that
+      allows the user to use the native keyboard mapping for their
+      computer, rather than always assuming a US layout.
+
+ 6. Changing configuration file defaults is acceptable where there’s a
+    very good reason. For example:
+
+    - Vanilla Doom defaults to no sound or music if a configuration
+      file is not found. Chocolate Doom defaults to having sound
+      effects and music turned on by default, because modern computers
+      support these; there’s no need to configure hardware IRQ settings
+      to get sound working.
+
+ 7. Things can be changed if they’re really just inconsequential. For
+    example:
+
+    - The startup messages in Chocolate Doom are not identical to
+      Vanilla Doom and are not necessarily in the same order.
+    - Vanilla Doom has command line options named `-comdev`, `-shdev`
+      and `-regdev` used by id internally for development; these have
+      been removed.
+
+ 8. Expansions to the vanilla demo formats are allowed, to make
+    recording and playback of vanilla gameplay more convenient, with
+    the following restrictions:
+
+    - Such expansions are not supported in WAD files (they are not
+      an editing feature for WAD authors to use).
+    - Support for these features can be completely disabled using the
+      `-strictdemos` command line argument.
+    - A warning is shown to the user on the console (stdout) when a
+      demo using one of these features is recorded or played back.
+
+A good litmus test of when it’s acceptable to break from Vanilla
+behavior is to ask the question: “Although this is Vanilla behavior,
+is there anyone who would want this?”
+
+For example, emulating Vanilla bugs like the visplane overflow bug is
+something that is useful for people making Vanilla format maps. On the
+other hand, painstakingly emulating Vanilla Doom by starting with no
+sound or music by default is not helpful to anyone.
+
+# Minimalism
+
+Chocolate Doom aims to be minimalist and straightforward to configure;
+in particular, the setup tool should have a sane interface. Part of
+the inspiration for Chocolate Doom came from Boom’s complicated maze
+of options menus (and a desire to avoid them). Too many preferences
+lead to a bad user interface; see Havoc Pennington’s essay on Free
+Software UI:
+
+  http://ometer.com/free-software-ui.html
+
+Chocolate Doom has some options that are quite obscure and only really
+of interest to a small number of people. In these cases, the options
+are hidden away in configuration files and deliberately not exposed in
+the setup tool. The assumption is that if you care enough about those
+obscure features, editing a configuration file by hand should not be a
+huge problem for you.
+
+Also inspirational was the README file from Havoc’s Metacity window
+manager, where the list of features begins:
+
+  > Boring window manager for the adult in you. Many window managers
+  > are like Marshmallow Froot Loops; Metacity is like Cheerios.
+
+I’d like to think that Chocolate Doom’s philosophy towards features is
+similar. The idea is for a source port that is boring. I find the best
+software - both proprietary and open source - is software that is
+“egoless”: it does a job well without pretentions about its importance
+or delusions of grandeur. A couple of other notable examples of
+software that I feel embody this spirit of design in a beautiful way
+are Marco Pesenti Gritti’s Epiphany web browser and Evince PDF viewer.
+
+# Other philosophical aspects
+
+Chocolate Doom aims for maximal portability. That includes running on
+many different CPUs, different operating systems and different devices
+(ie. not just a desktop machine with a keyboard and mouse).
+
+Chocolate Doom is and will always remain Free Software. It will never
+include code that is not compatible with the GNU GPL.
diff --git a/games/NXDoom/README.Music.md b/games/NXDoom/README.Music.md
new file mode 100644
index 000000000..7c1b2925c
--- /dev/null
+++ b/games/NXDoom/README.Music.md
@@ -0,0 +1,173 @@
+Doom has a memorable and atmospheric soundtrack. Like many games of
+the era, it is MIDI-based. Chocolate Doom includes a number of
+different options for music playback, detailed below.
+
+# Native MIDI playback
+
+Most modern operating systems have some kind of built-in support for
+MIDI playback; some have very good quality MIDI playback (Mac OS X for
+example). To use this, choose “Native MIDI” in the sound configuration
+dialog in the setup tool.
+
+# Timidity
+
+Timidity is a software-based MIDI synthesizer, and a version of it is
+included in the SDL2_mixer library used by Chocolate Doom. To use
+Timidity for MIDI playback, first download a sound font. An example of
+a good quality sound font is the eawpats font, which can be downloaded
+from the idgames archive as sounds/eawpats.zip:
+
+  https://www.doomworld.com/idgames/sounds/eawpats
+
+Having installed a sound font, select “Native MIDI” in the sound
+configuration dialog in the setup tool, and use the “Timidity
+configuration file” widget below to enter the path to the Timidity
+configuration file (normally named timidity.cfg).
+
+# Gravis Ultrasound (GUS)
+
+The Gravis Ultrasound (GUS) was a PC sound card popular in the ’90s,
+notable for having wavetable synthesis that provided MIDI playback
+that was superior to most other cards of the era. Chocolate Doom
+includes a “pseudo-GUS emulation” feature that simulates the GUS
+(using Timidity, under the hood).
+
+To use this feature you need a copy of the GUS patch files that were
+distributed with the original GUS patches. If you have Doom 3: BFG
+Edition, these patches are included with its version of classic Doom,
+and are automatically detected. Otherwise, they can be downloaded
+from the idgames archive as music/dgguspat.zip:
+
+  https://www.doomworld.com/idgames/music/dgguspat
+
+Having downloaded the patches, select “GUS (emulated)” in the sound
+configuration dialog in the setup tool, and use the “GUS patch path”
+widget to enter the path to the directory containing the patch files.
+
+For the music not to sound weird, you will almost certainly want to
+load gusgonna.wad (sounds/gusgonna.zip in the idgames archive) when
+you run the game, to work around a bug in vanilla Doom's instrument
+mappings parser:
+
+  https://www.doomworld.com/idgames/sounds/gusgonna
+
+By default a GUS card with 1024KB is simulated; to simulate a 256KB,
+512KB or 768KB card instead, change the gus_ram_kb option in
+chocolate-doom.cfg.
+
+# OPL (Soundblaster / Adlib)
+
+Most people playing Doom in the ’90s had Soundblaster-compatible sound
+cards, which used the Yamaha OPL series of chips for FM-based MIDI
+synthesis. Chocolate Doom includes the ability to emulate these chips
+for a retro experience. OPL emulation is the default MIDI playback,
+but can be selected in the setup tool as “OPL (Adlib/SB)”.
+
+Most modern computers do not include an OPL chip any more, as CPUs are
+fast enough to do decent software MIDI synthesis. However, no software
+emulator sounds exactly like a real (hardware) OPL chip, and a few
+cards do have real hardware OPL. If you have such a card, here’s how
+to configure Chocolate Doom to use it.
+
+## Sound cards with OPL chips
+
+If you have an ISA sound card, it almost certainly includes an OPL
+chip. Modern computers don’t have slots for ISA cards though, so you
+must be running a pretty old machine.
+
+If you have a PCI sound card, you probably don’t have an OPL chip.
+However, there are some exceptions to this. The following cards are
+known to include “legacy” OPL support:
+
+  * C-Media CMI8738 (*)
+  * Forte Media FM801
+  * Cards based on the Yamaha YMF724 (*)
+
+Other cards that apparently have OPL support but have not been tested:
+
+  * S3 SonicVibes
+  * AZTech PCI 168 (AZT 3328 chipset)
+  * ESS Solo-1 sound cards (ES1938, ES1946, ES1969 chipset)
+  * Conexant Riptide Audio/Modem combo cards
+  * Cards based on the Crystal Semiconductors CS4281
+  * Cards based on the Avance Logic ALS300
+  * Cards based on the Avance Logic ALS4000
+
+If you desperately want hardware OPL music, you may be able to find
+one of these cards for sale cheap on eBay.
+
+For the cards listed above with (\*) next to them, OPL support is
+disabled by default and must be explictly enabled in software. See
+sections below for operating system-specific instructions on how you
+may be able to do this.
+
+If your machine is not a PC, you don’t have an OPL chip, and you will
+have to use the software OPL.
+
+## Operating System support
+
+If you’re certain that you have a sound card with hardware OPL, you
+may need to take extra steps to configure your operating system to
+allow access to it. To do hardware OPL, Chocolate Doom must access
+the chip directly, which is usually not possible in modern operating
+systems unless you are running as the superuser (root/Administrator).
+
+### Microsoft Windows
+
+On modern Windows systems it is not possible to directly access the
+OPL chip, even when running as Administrator. Fortunately, it is
+possible to use the “ioperm.sys” driver developed for Cygwin (look for
+iopermsys-0.2.1.tar.bz2):
+
+  http://openwince.sourceforge.net/ioperm/
+
+It is not necessary to have Cygwin installed to use this. Copy the
+ioperm.sys file into the same directory as the Chocolate Doom
+executable and it should be automatically loaded.
+
+You can confirm that hardware OPL is working by checking for this
+message in stdout.txt:
+
+    OPL_Init: Using driver 'Win32'.
+
+If you have a C-Media CMI8738, you may need to enable the `FM_EN`
+flag in Windows Device Manager to access hardware OPL output. See
+[this](http://www.vogons.org/viewtopic.php?f=46&t=36445) thread on
+vogons.org for some more information.
+
+### Linux
+
+If you are using a system based on the Linux kernel, you can access
+the OPL chip directly, but you must be running as root. You can
+confirm that hardware OPL is working, by checking for this message on
+startup:
+
+    OPL_Init: Using driver 'Linux'.
+
+If you are using one of the PCI cards in the list above with a (*)
+next to it, you may need to manually enable FM legacy support. Add
+the following to your /etc/modprobe.conf file to do this:
+
+    options snd-ymfpci fm_port=0x388
+    options snd-cmipci fm_port=0x388
+
+### OpenBSD/NetBSD
+
+You must be running as root to access the hardware OPL directly. You
+can confirm that hardware OPL is working by checking for this message
+on startup:
+
+    OPL_Init: Using driver 'OpenBSD'.
+
+There is no native OPL backend for FreeBSD yet. Sorry!
+
+# Other options
+
+If you have some other favorite MIDI playback option that isn’t
+listed above, you can set a hook to invoke an external command for
+MIDI playback using the ‘snd_musiccmd’ configuration file option. For
+example, set:
+
+    snd_musiccmd    "aplaymidi -p 128:0"
+
+in your chocolate-doom.cfg file.
diff --git a/games/NXDoom/README.Strife.md b/games/NXDoom/README.Strife.md
new file mode 100644
index 000000000..c770449b9
--- /dev/null
+++ b/games/NXDoom/README.Strife.md
@@ -0,0 +1,124 @@
+````````````````````````````````````````````````````````````````````````
+
+          Samuel ‘Kaiser’ Villarreal and James ‘Quasar’ Haley Present
+
+           C      H      O      C      O      L      A      T      E
+            ______________________________._________________________
+           /   _____/\__    ___/\______   \   \_   _____/\_   _____/
+           \_____  \   |    |    |       _/   ||    __)   |    __)_
+           /        \  |    |    |    |   \   ||     \    |        \
+          /_______  /  |____|    |____|_  /___|\___  /   /_______  /
+                  \/                    \/         \/            \/
+
+````````````````````````````````````````````````````````````````````````
+
+## What is it?
+
+Chocolate Strife is the most accurate and complete recreation of Rogue
+Entertainment’s “Strife: Quest for the Sigil.”  It was created through more
+than four years of reverse engineering effort with the blessings of the
+original programmers of the game.
+
+
+## Why?
+
+The source code for Strife was lost, which means, unlike the code for all the
+other commercial DOOM-engine games, it cannot be released. The only access we
+have to the code is the binary executable file. Tools such as IDA Pro have
+been employed to disassemble and decompile the executable, which was cross-
+referenced against the Linux DOOM and DOS Heretic sources and painstakingly
+combed over multiple times, instruction-by-instruction, to ensure that the
+resulting Chocolate Doom-based executable is as close as possible to the
+original.
+
+
+## Is it Legal?
+
+Chocolate Strife was originally reverse-engineered from the DOS Strife
+binaries. Although reverse engineering is legally a protected activity, this
+nonetheless left some open questions about its legal status.
+
+In 2014, a new commercial release of Strife was published (Strife: Veteran
+Edition) based on the Chocolate Strife code, and developed by the authors of
+Chocolate Strife under commercial license. The release of Strife: Veteran
+Edition, along with its GPL-licensed source code, constitutes tacit approval
+for the legal status of Chocolate Strife by its current copyright holder.
+
+
+## Is it Perfect?
+
+Almost, but not entirely! That’s where you come in. Help us by reporting any
+discrepancies you may notice between this executable and the vanilla DOS
+program!
+
+However, do *not* report any glitch that you can replicate in the vanilla EXE
+as a bug. The point of Chocolate Strife, like Chocolate Doom before it, is to
+be as bug-compatible with the original game as possible. Also be aware that
+some glitches are impossible to compatibly recreate, and wherever this is the
+case, Chocolate Strife has erred on the side of not crashing the program,
+for example by initializing pointers to NULL rather than using them without
+setting a value first.
+
+
+## What are some known problems?
+
+The demo version is *not* supported, and there are not any current plans to
+support it in the future, due to the vast number of differences (the demo
+version of Strife is based on an earlier version of Rogue’s
+codebase).
+
+The commercial Strife IWAD version 1.1 may run, but also exhibit issues.  Like
+the demo version, there are no current plans to fully support it.  Make sure
+your copy is updated to at least 1.2.  Strife: Veteran Edition already
+includes the required version.
+
+
+## How do I use it?
+
+From the Run box or a command line, issue a command to Chocolate Strife just
+like you would run Chocolate Doom. Most of the same command line parameters
+are supported.
+
+voices.wad will be read from the same directory as the IWAD, if it can be
+found. If it is not found, then voices will be disabled just as would happen
+with the vanilla executable. Do not add voices.wad using -file, as that is
+redundant and unnecessary.
+
+Some new command-line parameters in Chocolate Strife include the following:
+
+  - -nograph
+    - Disables the graphical introduction sequence. -devparm implies this.
+
+  - -novoice
+    - Disables voices even if voices.wad can be found.
+
+  - -work
+    - Enables Rogue’s playtesting mode. Automatic godmode, and pressing the
+      inventory drop key will toggle noclipping.
+
+  - -flip
+    - Flips player gun graphics. This is buggy, however, because it does not
+      reverse the graphics’ x offsets (this is an accurate emulation of the
+      vanilla engine’s behavior).
+
+  - -random
+    - Randomizes the timing and location of item respawns in deathmatch, when
+      item respawning is enabled.
+
+
+## Copyright
+
+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.
+
+See the “COPYING” file for the full license text. The source code for this
+program is available from the same location where you downloaded this package.
+
+Aside from Chocolate Doom, portions of the code are derived from the Eternity
+Engine, Copyright 2011 Team Eternity, as published under the GNU GPL.
diff --git a/games/NXDoom/README.md b/games/NXDoom/README.md
new file mode 100644
index 000000000..59dfc8263
--- /dev/null
+++ b/games/NXDoom/README.md
@@ -0,0 +1,102 @@
+# Chocolate Doom
+
+Chocolate Doom aims to accurately reproduce the original DOS version of
+Doom and other games based on the Doom engine in a form that can be
+run on modern computers.
+
+Originally, Chocolate Doom was only a Doom source port. The project
+now includes ports of Heretic and Hexen, and Strife.
+
+Chocolate Doom’s aims are:
+
+ * To always be 100% Free and Open Source software.
+ * Portability to as many different operating systems as possible.
+ * Accurate reproduction of the original DOS versions of the games,
+   including bugs.
+ * Compatibility with the DOS demo, configuration and savegame files.
+ * To provide an accurate retro “feel” (display and input should
+   behave the same).
+
+More information about the philosophy and design behind Chocolate Doom
+can be found in the PHILOSOPHY file distributed with the source code.
+
+## Setting up gameplay
+
+For instructions on how to set up Chocolate Doom for play, see the
+INSTALL file.
+
+## Configuration File
+
+Chocolate Doom is compatible with the DOS Doom configuration file
+(normally named `default.cfg`). Existing configuration files for DOS
+Doom should therefore simply work out of the box. However, Chocolate
+Doom also provides some extra settings. These are stored in a
+separate file named `chocolate-doom.cfg`.
+
+The configuration can be edited using the chocolate-setup tool.
+
+## Command line options
+
+Chocolate Doom supports a number of command line parameters, including
+some extras that were not originally suported by the DOS versions. For
+binary distributions, see the CMDLINE file included with your
+download; more information is also available on the Chocolate Doom
+website.
+
+## Playing TCs
+
+With Vanilla Doom there is no way to include sprites in PWAD files.
+Chocolate Doom’s ‘-file’ command line option behaves exactly the same
+as Vanilla Doom, and trying to play TCs by adding the WAD files using
+‘-file’ will not work.
+
+Many Total Conversions (TCs) are distributed as a PWAD file which must
+be merged into the main IWAD. Typically a copy of DEUSF.EXE is
+included which performs this merge. Chocolate Doom includes a new
+option, ‘-merge’, which will simulate this merge. Essentially, the
+WAD directory is merged in memory, removing the need to modify the
+IWAD on disk.
+
+To play TCs using Chocolate Doom, run like this:
+
+```
+chocolate-doom -merge thetc.wad
+```
+
+Here are some examples:
+
+```
+chocolate-doom -merge batman.wad -deh batman.deh vbatman.deh  (Batman Doom)
+chocolate-doom -merge aoddoom1.wad -deh aoddoom1.deh  (Army of Darkness Doom)
+```
+
+## Other information
+
+ * Chocolate Doom includes a number of different options for music
+   playback. See the README.Music file for more details.
+
+ * More information, including information about how to play various
+   classic TCs, is available on the Chocolate Doom website:
+
+     https://www.chocolate-doom.org/
+
+   You are encouraged to sign up and contribute any useful information
+   you may have regarding the port!
+
+ * Chocolate Doom is not perfect. Although it aims to accurately
+   emulate and reproduce the DOS executables, some behavior can be very
+   difficult to reproduce. Because of the nature of the project, you
+   may also encounter Vanilla Doom bugs; these are intentionally
+   present; see the NOT-BUGS file for more information.
+
+   New bug reports, feedback, questions or suggestions can be submitted
+   to the issue tracker on Github:
+
+     https://github.com/chocolate-doom/chocolate-doom/issues
+
+ * Source code patches are welcome, but please follow the style
+   guidelines - see the file named HACKING included with the source
+   distribution.
+
+ * Chocolate Doom is distributed under the GNU GPL. See the COPYING
+   file for more information.
diff --git a/games/NXDoom/RELEASE_NOTES.md b/games/NXDoom/RELEASE_NOTES.md
new file mode 100644
index 000000000..a366537f9
--- /dev/null
+++ b/games/NXDoom/RELEASE_NOTES.md
@@ -0,0 +1,35 @@
+## 3.1.1 (2025-08-14)
+
+### General
+  * Fix compilation on GCC 15 (thanks Fabian).
+  * Hide public IP addresses for privacy.
+  * Use native OpenGL texture format for better performance (thanks Fabian).
+  * Improved directory handling on Windows (thank Roman Fomin):
+      * Fixes problems with postfix "." for non-relative paths.
+      * Support for long NTFS paths (up to 32768 characters).
+  * Fixed metainfo files for latest AppStream spec compliance (thanks Fabian).
+  * Add option to enable or disable smooth pixel scaling (thanks StevenSYS).
+  * Allow spaces in GUS patch folder path (thanks Michael Day).
+  * Add support for non-US backslash key (thanks Michael Day).
+  * Never let SDL Mixer use native midi on Windows (thanks Michael Day).
+  * Use $TMPDIR to find tempdir on Unix (thanks Mr. Myth).
+  * Improve man page formatting (thanks g-branden-robinson).
+
+### Build systems
+  * Can now be built with Emscripten (thanks James Baicoianu).
+  * Misc. improvements (thanks suve, Emmanuel Ferdman, Gabriele Simoni, et al.)
+
+### Setup
+  * Use correct EGA palette colors (thanks Henrique Jorge).
+
+### Doom
+  * Initial support for Doom version 1.5 (thanks Michael Francis).
+
+### Heretic
+  * Fix crash after loading too many saved games (thanks Noseey).
+
+### Hexen
+  * Fix crash with Heresiarch fireballs if player has never touched a wall (thank Noseey).
+
+### Strife
+  * Initialize floor->type and floor->crush fields in EV_BuildStairs() (thanks Fabian).
diff --git a/games/NXDoom/TODO.md b/games/NXDoom/TODO.md
new file mode 100644
index 000000000..3f40d4735
--- /dev/null
+++ b/games/NXDoom/TODO.md
@@ -0,0 +1,36 @@
+This is Chocolate Doom’s “to do” list. Note that this is kind of an arbitrary
+and unstructured wish list of features and improvements. The bug tracker
+(http://chocolate-doom.org/bugs) has more feature requests.
+
+* Multiplayer:
+  - Use UPnP to automatically configure port forwarding for NATed
+    networks.
+  - Multiplayer options and configuration file (server name, etc)
+* Improve multiplayer startup:
+  - Select an IWAD automatically from the server’s game type rather than
+    all players having to specify -iwad.
+  - Send list of WADs to load instead of all clients having to specify -file.
+  - Same applies to dehacked patches and wad merging parameters.
+* Portability improvements:
+  - Test on and fix for architectures where `((-2) >> 1) != -1`
+  - Use size-specific types (eg. `int32_t` instead of int)
+  - Don’t make structure packing assumptions when loading levels.
+  - Port to every OS and architecture under the sun
+  - Port to Emscripten and release a web-based version.
+* Video capture mode
+  - Real-time recording of gameplay
+  - Batch conversion of demos into videos
+* Heretic/Hexen/Strife:
+  - Merge r_draw.c to common version and delete duplicates
+  - Heretic v1.2 emulation (if possible)
+  - Hexen v1.0 emulation (if possible/necessary)
+  - Strife v1.1 emulation (for demo IWAD support)
+  - Screensaver mode
+
+Crazy pie in the sky ideas:
+
+* Automatic WAD installer - download and run TCs from a list automatically
+  (automating the current “instructions on wiki” system).
+* Textscreen interface to the Compet-N database: menu driven system to
+  automatically download and play speedruns.
+* DWANGO-like interface for finding players and setting up games.
diff --git a/games/NXDoom/autogen.sh b/games/NXDoom/autogen.sh
new file mode 100755
index 000000000..b0763a5c1
--- /dev/null
+++ b/games/NXDoom/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+autoreconf -fi
+./configure "$@"
diff --git a/games/NXDoom/check-extern.sh b/games/NXDoom/check-extern.sh
new file mode 100755
index 000000000..b5ad848da
--- /dev/null
+++ b/games/NXDoom/check-extern.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+EXTERN="$(grep -e 'extern[^A-Za-z0-9_]' $(find . -name *.c))"
+if [ -n "$EXTERN" ] ; then
+	echo "extern found in .c files:\n${EXTERN}"
+	exit 1
+fi
diff --git a/games/NXDoom/cmake/FindFluidSynth.cmake b/games/NXDoom/cmake/FindFluidSynth.cmake
new file mode 100644
index 000000000..6702af983
--- /dev/null
+++ b/games/NXDoom/cmake/FindFluidSynth.cmake
@@ -0,0 +1,106 @@
+# FindFluidSynth
+# ---------
+#
+# Try to find the FluidSynth library.
+#
+# This will define the following variables:
+#
+# ``FluidSynth_FOUND``
+#     System has FluidSynth.
+#
+# ``FluidSynth_VERSION``
+#     The version of FluidSynth.
+#
+# ``FluidSynth_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if
+#     the target is not used for linking.
+#
+# ``FluidSynth_LIBRARIES``
+#     The FluidSynth library.
+#     This can be passed to target_link_libraries() instead of
+#     the ``FluidSynth::libfluidsynth`` target
+#
+# If ``FluidSynth_FOUND`` is TRUE, the following imported target
+# will be available:
+#
+# ``FluidSynth::libfluidsynth``
+#     The FluidSynth library
+#
+#=============================================================================
+# Copyright 2018 Christophe Giboudeaux <christophe@krop.fr>
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR 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.
+#=============================================================================
+
+# Cache variable that allows you to point CMake at a directory containing
+# an extracted development library.
+set(FluidSynth_DIR "${FluidSynth_DIR}"
+        CACHE PATH "Location of FluidSynth library directory")
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FluidSynth QUIET fluidsynth>=${FluidSynth_FIND_VERSION})
+
+find_library(FluidSynth_LIBRARIES
+  NAMES fluidsynth
+  HINTS
+  "${FluidSynth_DIR}/lib"
+  ${PC_FluidSynth_LIBDIR}
+)
+
+find_path(FluidSynth_INCLUDE_DIRS
+  NAMES fluidsynth.h
+  HINTS
+  "${FluidSynth_DIR}/include"
+  ${PC_FluidSynth_INCLUDEDIR}
+)
+
+if(NOT FluidSynth_VERSION)
+  if(EXISTS "${FluidSynth_INCLUDE_DIRS}/fluidsynth/version.h")
+    file(STRINGS "${FluidSynth_INCLUDE_DIRS}/fluidsynth/version.h" _FLUIDSYNTH_VERSION_H
+         REGEX "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"[0-9].[0-9].[0-9]\"")
+    string(REGEX REPLACE "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"([0-9].[0-9].[0-9])\".*" "\\1" FluidSynth_VERSION "${_FLUIDSYNTH_VERSION_H}")
+    unset(_FLUIDSYNTH_VERSION_H)
+  endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FluidSynth
+  FOUND_VAR FluidSynth_FOUND
+  REQUIRED_VARS FluidSynth_LIBRARIES FluidSynth_INCLUDE_DIRS
+  VERSION_VAR FluidSynth_VERSION
+)
+
+if(FluidSynth_FOUND AND NOT TARGET FluidSynth::libfluidsynth)
+  add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED)
+  set_target_properties(FluidSynth::libfluidsynth PROPERTIES
+    IMPORTED_LOCATION "${FluidSynth_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${FluidSynth_INCLUDE_DIRS}"
+  )
+  if(WIN32 AND FluidSynth_DIR)
+    # On Windows, we need to figure out the location of our library files
+    # so we can copy and package them.
+    set(FluidSynth_DLL_DIR "${FluidSynth_DIR}/bin" CACHE INTERNAL "")
+  endif()
+endif()
diff --git a/games/NXDoom/cmake/FindSDL2.cmake b/games/NXDoom/cmake/FindSDL2.cmake
new file mode 100644
index 000000000..25006950a
--- /dev/null
+++ b/games/NXDoom/cmake/FindSDL2.cmake
@@ -0,0 +1,114 @@
+# FindSDL2.cmake
+#
+# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
+# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
+#
+# Currently works with the following generators:
+# - Unix Makefiles (Linux, MSYS2)
+# - Ninja (Linux, MSYS2)
+# - Visual Studio
+
+# Cache variable that allows you to point CMake at a directory containing
+# an extracted development library.
+set(SDL2_DIR "${SDL2_DIR}" CACHE PATH "Location of SDL2 library directory")
+
+# Use pkg-config to find library locations in *NIX environments.
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_search_module(PC_SDL2 QUIET sdl2)
+endif()
+
+# Find the include directory.
+find_path(SDL2_INCLUDE_DIR "SDL_version.h"
+    HINTS "${SDL2_DIR}/include" ${PC_SDL2_INCLUDE_DIRS})
+
+# Find the version.  Taken and modified from CMake's FindSDL.cmake.
+if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
+    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
+    set(SDL2_VERSION "${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}")
+    unset(SDL2_VERSION_MAJOR_LINE)
+    unset(SDL2_VERSION_MINOR_LINE)
+    unset(SDL2_VERSION_PATCH_LINE)
+    unset(SDL2_VERSION_MAJOR)
+    unset(SDL2_VERSION_MINOR)
+    unset(SDL2_VERSION_PATCH)
+endif()
+
+# Find the SDL2 and SDL2main libraries
+if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
+    find_library(SDL2_LIBRARY "SDL2"
+        HINTS "${SDL2_DIR}/lib/x64" ${PC_SDL2_LIBRARY_DIRS})
+    find_library(SDL2_MAIN_LIBRARY "SDL2main"
+        HINTS "${SDL2_DIR}/lib/x64" ${PC_SDL2_LIBRARY_DIRS})
+else()
+    find_library(SDL2_LIBRARY "SDL2"
+        HINTS "${SDL2_DIR}/lib/x86" ${PC_SDL2_LIBRARY_DIRS})
+    find_library(SDL2_MAIN_LIBRARY "SDL2main"
+        HINTS "${SDL2_DIR}/lib/x86" ${PC_SDL2_LIBRARY_DIRS})
+endif()
+set(SDL2_LIBRARIES "${SDL2_MAIN_LIBRARY}" "${SDL2_LIBRARY}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2
+    FOUND_VAR SDL2_FOUND
+    REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARIES
+    VERSION_VAR SDL2_VERSION
+)
+
+if(SDL2_FOUND)
+    # SDL2 imported target.
+    add_library(SDL2::SDL2 UNKNOWN IMPORTED)
+    set_target_properties(SDL2::SDL2 PROPERTIES
+                          INTERFACE_COMPILE_OPTIONS "${PC_SDL2_CFLAGS_OTHER}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+                          IMPORTED_LOCATION "${SDL2_LIBRARY}")
+
+    # SDL2main imported target.
+    if(MINGW)
+        # Gross hack to get mingw32 first in the linker order.
+        add_library(SDL2::_SDL2main_detail UNKNOWN IMPORTED)
+        set_target_properties(SDL2::_SDL2main_detail PROPERTIES
+                              IMPORTED_LOCATION "${SDL2_MAIN_LIBRARY}")
+
+        # Ensure that SDL2main comes before SDL2 in the linker order.  CMake
+        # isn't smart enough to keep proper ordering for indirect dependencies
+        # so we have to spell it out here.
+        target_link_libraries(SDL2::_SDL2main_detail INTERFACE SDL2::SDL2)
+
+        add_library(SDL2::SDL2main INTERFACE IMPORTED)
+        set_target_properties(SDL2::SDL2main PROPERTIES
+                              IMPORTED_LIBNAME mingw32)
+        target_link_libraries(SDL2::SDL2main INTERFACE SDL2::_SDL2main_detail)
+    else()
+        add_library(SDL2::SDL2main UNKNOWN IMPORTED)
+        set_target_properties(SDL2::SDL2main PROPERTIES
+                              IMPORTED_LOCATION "${SDL2_MAIN_LIBRARY}")
+    endif()
+endif()
diff --git a/games/NXDoom/cmake/FindSDL2_mixer.cmake b/games/NXDoom/cmake/FindSDL2_mixer.cmake
new file mode 100644
index 000000000..3328c6c38
--- /dev/null
+++ b/games/NXDoom/cmake/FindSDL2_mixer.cmake
@@ -0,0 +1,88 @@
+# FindSDL2_mixer.cmake
+#
+# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
+# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
+#
+# Currently works with the following generators:
+# - Unix Makefiles (Linux, MSYS2)
+# - Ninja (Linux, MSYS2)
+# - Visual Studio
+
+# Cache variable that allows you to point CMake at a directory containing
+# an extracted development library.
+set(SDL2_MIXER_DIR "${SDL2_MIXER_DIR}" CACHE PATH "Location of SDL2_mixer library directory")
+
+# Use pkg-config to find library locations in *NIX environments.
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_search_module(PC_SDL2_MIXER QUIET SDL2_mixer)
+endif()
+
+# Find the include directory.
+find_path(SDL2_MIXER_INCLUDE_DIR "SDL_mixer.h"
+    HINTS "${SDL2_MIXER_DIR}/include" ${PC_SDL2_MIXER_INCLUDE_DIRS})
+
+# Find the version.  Taken and modified from CMake's FindSDL.cmake.
+if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")
+    file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+[0-9]+$")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MAJOR "${SDL2_MIXER_VERSION_MAJOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MINOR "${SDL2_MIXER_VERSION_MINOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_PATCH "${SDL2_MIXER_VERSION_PATCH_LINE}")
+    set(SDL2_MIXER_VERSION "${SDL2_MIXER_VERSION_MAJOR}.${SDL2_MIXER_VERSION_MINOR}.${SDL2_MIXER_VERSION_PATCH}")
+    unset(SDL2_MIXER_VERSION_MAJOR_LINE)
+    unset(SDL2_MIXER_VERSION_MINOR_LINE)
+    unset(SDL2_MIXER_VERSION_PATCH_LINE)
+    unset(SDL2_MIXER_VERSION_MAJOR)
+    unset(SDL2_MIXER_VERSION_MINOR)
+    unset(SDL2_MIXER_VERSION_PATCH)
+endif()
+
+# Find the library.
+if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
+    find_library(SDL2_MIXER_LIBRARY "SDL2_mixer"
+        HINTS "${SDL2_MIXER_DIR}/lib/x64" ${PC_SDL2_MIXER_LIBRARY_DIRS})
+else()
+    find_library(SDL2_MIXER_LIBRARY "SDL2_mixer"
+        HINTS "${SDL2_MIXER_DIR}/lib/x86" ${PC_SDL2_MIXER_LIBRARY_DIRS})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2_mixer
+    FOUND_VAR SDL2_MIXER_FOUND
+    REQUIRED_VARS SDL2_MIXER_INCLUDE_DIR SDL2_MIXER_LIBRARY
+    VERSION_VAR SDL2_MIXER_VERSION
+)
+
+if(SDL2_MIXER_FOUND)
+    # Imported target.
+    add_library(SDL2_mixer::SDL2_mixer UNKNOWN IMPORTED)
+    set_target_properties(SDL2_mixer::SDL2_mixer PROPERTIES
+                          INTERFACE_COMPILE_OPTIONS "${PC_SDL2_MIXER_CFLAGS_OTHER}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_MIXER_INCLUDE_DIR}"
+                          INTERFACE_LINK_LIBRARIES SDL2::SDL2
+                          IMPORTED_LOCATION "${SDL2_MIXER_LIBRARY}")
+endif()
diff --git a/games/NXDoom/cmake/FindSDL2_net.cmake b/games/NXDoom/cmake/FindSDL2_net.cmake
new file mode 100644
index 000000000..96b6cd722
--- /dev/null
+++ b/games/NXDoom/cmake/FindSDL2_net.cmake
@@ -0,0 +1,88 @@
+# FindSDL2_net.cmake
+#
+# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
+# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
+#
+# Currently works with the following generators:
+# - Unix Makefiles (Linux, MSYS2)
+# - Ninja (Linux, MSYS2)
+# - Visual Studio
+
+# Cache variable that allows you to point CMake at a directory containing
+# an extracted development library.
+set(SDL2_NET_DIR "${SDL2_NET_DIR}" CACHE PATH "Location of SDL2_net library directory")
+
+# Use pkg-config to find library locations in *NIX environments.
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_search_module(PC_SDL2_NET QUIET SDL2_net)
+endif()
+
+# Find the include directory.
+find_path(SDL2_NET_INCLUDE_DIR "SDL_net.h"
+    HINTS "${SDL2_NET_DIR}/include" ${PC_SDL2_NET_INCLUDE_DIRS})
+
+# Find the version.  Taken and modified from CMake's FindSDL.cmake.
+if(SDL2_NET_INCLUDE_DIR AND EXISTS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h")
+    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+[0-9]+$")
+    string(REGEX REPLACE "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_MAJOR "${SDL2_NET_VERSION_MAJOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_MINOR "${SDL2_NET_VERSION_MINOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_PATCH "${SDL2_NET_VERSION_PATCH_LINE}")
+    set(SDL2_NET_VERSION "${SDL2_NET_VERSION_MAJOR}.${SDL2_NET_VERSION_MINOR}.${SDL2_NET_VERSION_PATCH}")
+    unset(SDL2_NET_VERSION_MAJOR_LINE)
+    unset(SDL2_NET_VERSION_MINOR_LINE)
+    unset(SDL2_NET_VERSION_PATCH_LINE)
+    unset(SDL2_NET_VERSION_MAJOR)
+    unset(SDL2_NET_VERSION_MINOR)
+    unset(SDL2_NET_VERSION_PATCH)
+endif()
+
+# Find the library.
+if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
+    find_library(SDL2_NET_LIBRARY "SDL2_net"
+        HINTS "${SDL2_NET_DIR}/lib/x64" ${PC_SDL2_NET_LIBRARY_DIRS})
+else()
+    find_library(SDL2_NET_LIBRARY "SDL2_net"
+        HINTS "${SDL2_NET_DIR}/lib/x86" ${PC_SDL2_NET_LIBRARY_DIRS})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2_net
+    FOUND_VAR SDL2_NET_FOUND
+    REQUIRED_VARS SDL2_NET_INCLUDE_DIR SDL2_NET_LIBRARY
+    VERSION_VAR SDL2_NET_VERSION
+)
+
+if(SDL2_NET_FOUND)
+    # Imported target.
+    add_library(SDL2_net::SDL2_net UNKNOWN IMPORTED)
+    set_target_properties(SDL2_net::SDL2_net PROPERTIES
+                          INTERFACE_COMPILE_OPTIONS "${PC_SDL2_NET_CFLAGS_OTHER}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_NET_INCLUDE_DIR}"
+                          INTERFACE_LINK_LIBRARIES SDL2::SDL2
+                          IMPORTED_LOCATION "${SDL2_NET_LIBRARY}")
+endif()
diff --git a/games/NXDoom/cmake/FindSampleRate.cmake b/games/NXDoom/cmake/FindSampleRate.cmake
new file mode 100644
index 000000000..bd72802a0
--- /dev/null
+++ b/games/NXDoom/cmake/FindSampleRate.cmake
@@ -0,0 +1,67 @@
+# Findsamplerate.cmake
+#
+# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
+# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
+#
+# Currently works with the following generators:
+# - Unix Makefiles (Linux, MSYS2)
+# - Ninja (Linux, MSYS2)
+# - Visual Studio
+
+# Use pkg-config to find library locations in *NIX environments.
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_search_module(PC_SAMPLERATE QUIET samplerate)
+endif()
+
+# Find the include directory.
+find_path(SAMPLERATE_INCLUDE_DIR "samplerate.h"
+    HINTS ${PC_SAMPLERATE_INCLUDE_DIRS})
+
+# Find the version.  I don't know if there is a correct way to find this on
+# Windows - the config.h in the tarball is wrong for 0.1.19.
+if(PC_SAMPLERATE_VERSION)
+    set(SAMPLERATE_VERSION "${PC_SAMPLERATE_VERSION}")
+endif()
+
+# Find the library.
+find_library(SAMPLERATE_LIBRARY "samplerate"
+    HINTS ${PC_SAMPLERATE_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SampleRate
+    FOUND_VAR SampleRate_FOUND
+    REQUIRED_VARS SAMPLERATE_INCLUDE_DIR SAMPLERATE_LIBRARY
+    VERSION_VAR SAMPLERATE_VERSION
+)
+
+if(SampleRate_FOUND)
+    # Imported target.
+    add_library(SampleRate::samplerate UNKNOWN IMPORTED)
+    set_target_properties(SampleRate::samplerate PROPERTIES
+        INTERFACE_COMPILE_OPTIONS "${PC_SAMPLERATE_CFLAGS_OTHER}"
+        INTERFACE_INCLUDE_DIRECTORIES "${SAMPLERATE_INCLUDE_DIR}"
+        IMPORTED_LOCATION "${SAMPLERATE_LIBRARY}")
+endif()
diff --git a/games/NXDoom/cmake/Findm.cmake b/games/NXDoom/cmake/Findm.cmake
new file mode 100644
index 000000000..f7a1cfa57
--- /dev/null
+++ b/games/NXDoom/cmake/Findm.cmake
@@ -0,0 +1,36 @@
+# Findm.cmake
+#
+# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
+# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
+#
+# Finds libm, so we can link against it for math functions.  If libm doesn't
+# exist, linking against the m target will have no effect.
+
+find_library(M_LIBRARY m)
+
+add_library(m INTERFACE)
+if(M_LIBRARY)
+    target_link_libraries(m INTERFACE "${M_LIBRARY}")
+endif()
diff --git a/games/NXDoom/cmake/config.h.cin b/games/NXDoom/cmake/config.h.cin
new file mode 100644
index 000000000..6c67239fd
--- /dev/null
+++ b/games/NXDoom/cmake/config.h.cin
@@ -0,0 +1,12 @@
+#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
+#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
+#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
+#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
+#cmakedefine PROGRAM_PREFIX "@PROGRAM_PREFIX@"
+
+#cmakedefine HAVE_FLUIDSYNTH
+#cmakedefine HAVE_LIBSAMPLERATE
+#cmakedefine HAVE_LIBPNG
+#cmakedefine HAVE_DIRENT_H
+#cmakedefine01 HAVE_DECL_STRCASECMP
+#cmakedefine01 HAVE_DECL_STRNCASECMP
diff --git a/games/NXDoom/configure.ac b/games/NXDoom/configure.ac
new file mode 100644
index 000000000..26e6958d5
--- /dev/null
+++ b/games/NXDoom/configure.ac
@@ -0,0 +1,335 @@
+AC_INIT(Chocolate Doom, 3.1.1,
+        chocolate-doom-dev-list@chocolate-doom.org, chocolate-doom)
+
+PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
+PACKAGE_SHORTDESC="Conservative source port"
+PACKAGE_COPYRIGHT="Copyright (C) 1993-2025"
+PACKAGE_LICENSE="GNU General Public License, version 2"
+PACKAGE_MAINTAINER="Simon Howard"
+PACKAGE_URL="https://www.chocolate-doom.org/"
+PACKAGE_RDNS="org.chocolate_doom"
+PACKAGE_BUGREPORT="https://github.com/chocolate-doom/chocolate-doom/issues"
+
+dnl Check for Emscripten environment so we can set necessary environment variables
+AC_ARG_ENABLE(
+  [emscripten],
+  [AS_HELP_STRING([--enable-emscripten=@<:@no/yes@:>@],[compile to JavaScript using Emscripten])],,
+  [AS_CASE([$CC],
+           [*emcc.py], [enable_emscripten="yes"],
+           [*emcc], [enable_emscripten="yes"],
+           [enable_emscripten="no"]
+	  )
+ ]
+)
+
+AS_IF([test "x$enable_emscripten" = "xyes"],
+  AC_MSG_NOTICE([auto-detected use of Emscripten])
+  SDL_CFLAGS="-s USE_SDL=2"
+  SDL_LIBS="-s USE_SDL=2"
+  SDLMIXER_CFLAGS="-s USE_SDL=2 -s USE_SDL_MIXER=2"
+  SDLMIXER_LIBS="-s USE_SDL=2 -s USE_SDL_MIXER=2"
+  SDLNET_CFLAGS="-s USE_SDL=2 -s USE_SDL_NET=2"
+  SDLNET_LIBS="-s USE_SDL=2 -s USE_SDL_NET=2"
+  EM_LDFLAGS="-s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_RUNTIME_METHODS=[ccall,cwrap,FS,ENV,PATH,ERRNO_CODES] -s FORCE_FILESYSTEM"
+)
+
+AC_CONFIG_AUX_DIR(autotools)
+AC_CANONICAL_HOST
+
+orig_CFLAGS="$CFLAGS"
+
+AM_PROG_AR
+AC_PROG_CC_C99
+AC_PROG_RANLIB
+AC_CHECK_PROG(HAVE_PYTHON, python3, true, false)
+
+OPT_LEVEL=2
+
+# If this is gcc, we have some options we'd like to turn on.  Turn on 
+# optimisation and debugging symbols.
+
+if test "$GCC" = "yes"
+then
+        WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
+        CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
+fi
+
+AC_CANONICAL_TARGET
+TARGET_OS=""
+AS_CASE([$target_cpu],
+        [x86_64],
+        [
+            TARGET_OS="x64"
+        ],
+        [aarch64*|arm*],
+        [
+            TARGET_OS="arm"
+        ],
+        [i?86|arm*],
+        [
+            TARGET_OS="32"
+        ])
+AC_SUBST([TARGET_OS])
+
+PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.14])
+# Check for SDL2_mixer
+AC_ARG_ENABLE([sdl2mixer],
+AS_HELP_STRING([--disable-sdl2mixer], [Disable SDL2_mixer support])
+)
+AS_IF([test "x$enable_sdl2mixer" != xno], [
+    PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.2])], [
+    AC_DEFINE([DISABLE_SDL2MIXER], [1], [SDL2_mixer disabled])
+])
+
+# Check for networking
+AC_ARG_ENABLE([sdl2net],
+AS_HELP_STRING([--disable-sdl2net], [Disable SDL2_net support])
+)
+AS_IF([test "x$enable_sdl2net" != xno], [
+    PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0])], [
+    AC_DEFINE([DISABLE_SDL2NET], [1], [SDL2_net disabled])
+])
+
+# Check for bash-completion.
+AC_ARG_ENABLE([bash-completion],
+AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion])
+)
+AS_IF([test "x$enable_bash_completion" != xno], [
+    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
+        AC_MSG_WARN([Building bash-completion requires Python, but Python not found])
+        enable_bash_completion=no
+    ])
+])
+
+# Check for doc.
+AC_ARG_ENABLE([doc],
+AS_HELP_STRING([--disable-doc], [Disable documentation])
+)
+AS_IF([test "x$enable_doc" != xno], [
+    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
+        AC_MSG_WARN([Building documentation requires Python, but Python not found])
+        enable_doc=no
+    ])
+])
+
+# Check for fonts.
+AC_ARG_ENABLE([fonts],
+AS_HELP_STRING([--disable-fonts], [Disable fonts])
+)
+AS_IF([test "x$enable_fonts" != xno], [
+    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
+        AC_MSG_WARN([Building fonts require Python, but Python not found])
+        enable_fonts=no
+    ])
+])
+
+# Check for icons.
+AC_ARG_ENABLE([icons],
+AS_HELP_STRING([--disable-icons], [Disable icons])
+)
+AS_IF([test "x$enable_icons" != xno], [
+    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
+        AC_MSG_WARN([Building icons require Python, but Python not found])
+        enable_icons=no
+    ])
+])
+
+# Check for memory pool debugging.
+AC_ARG_ENABLE([zpool],
+AS_HELP_STRING([--disable-zpool], [Disable memory pools for debugging])
+)
+AS_IF([test "x$enable_zpool" != xno], [], [
+    AC_DEFINE([DISABLE_ZPOOL], [1], [Memory pooling disabled])
+])
+
+# Check for libsamplerate.
+AC_ARG_WITH([libsamplerate],
+AS_HELP_STRING([--without-libsamplerate],
+    [Build without libsamplerate @<:@default=check@:>@]),
+[],
+[
+    [with_libsamplerate=check]
+])
+AS_IF([test "x$with_libsamplerate" != xno], [
+    PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.8, [
+        AC_DEFINE([HAVE_LIBSAMPLERATE], [1], [libsamplerate installed])
+    ], [
+        AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE(
+            [--with-libsamplerate was given, but test for libsamplerate failed])
+        ])
+    ])
+])
+
+# Check for libpng.
+AC_ARG_WITH([libpng],
+AS_HELP_STRING([--without-libpng],
+    [Build without libpng @<:@default=check@:>@]),
+[],
+[
+    [with_libpng=check]
+])
+AS_IF([test "x$with_libpng" != xno], [
+    PKG_CHECK_MODULES(PNG, libpng >= 1.2.50, [
+        AC_DEFINE([HAVE_LIBPNG], [1], [libpng installed])
+    ], [
+        AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE(
+            [--with-libpng was given, but test for libpng failed])
+        ])
+    ])
+])
+
+# Check for fluidsynth.
+AC_ARG_WITH([fluidsynth],
+AS_HELP_STRING([--without-fluidsynth],
+    [Build without fluidsynth @<:@default=check@:>@]),
+[],
+[
+    [with_fluidsynth=check]
+])
+AS_IF([test "x$with_fluidsynth" != xno] && [test "x$enable_sdl2mixer" != xno], [
+    PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth >= 2.2.0, [
+        AC_DEFINE([HAVE_FLUIDSYNTH], [1], [fluidsynth installed])
+    ], [
+        AS_IF([test "x$with_fluidsynth" != xcheck], [AC_MSG_FAILURE(
+            [--with-fluidsynth was given, but test for fluidsynth failed])
+        ])
+    ])
+])
+
+# TODO: We currently link everything against libraries that don't need it.
+# Use the specific library CFLAGS/LIBS variables instead of setting them here.
+CFLAGS="$CFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${FLUIDSYNTH_CFLAGS:-}"
+LDFLAGS="$LDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${FLUIDSYNTH_LIBS:-}"
+case "$host" in
+  *-*-mingw* | *-*-cygwin* | *-*-msvc* )
+    LDFLAGS="$LDFLAGS -lwinmm -lshlwapi"
+    ;;
+  *)
+esac
+
+AC_CHECK_LIB(m, log)
+
+AC_CHECK_HEADERS([dirent.h linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
+AC_CHECK_FUNCS(mmap ioperm)
+AC_CHECK_DECLS([strcasecmp, strncasecmp], [], [], [[#include <strings.h>]])
+
+# OpenBSD I/O i386 library for I/O port access.
+# (64 bit has the same thing with a different name!)
+
+AC_CHECK_LIB(i386, i386_iopl)
+AC_CHECK_LIB(amd64, amd64_iopl)
+
+case "$host" in
+  *-*-mingw* | *-*-cygwin* | *-*-msvc* )
+    AC_CHECK_TOOL(WINDRES, windres, )
+    ;;
+  *)
+    WINDRES=
+    ;;
+esac
+
+AC_CHECK_TOOL(OBJDUMP, objdump, )
+AC_CHECK_TOOL(STRIP, strip, )
+
+AC_ARG_ENABLE([werror], AS_HELP_STRING([--enable-werror], [Treat warnings as errors]))
+
+AS_IF([test "x$enable_werror" = "xyes"], [
+        CFLAGS="$CFLAGS -Werror"
+])
+
+AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
+AM_CONDITIONAL(HAVE_BASH_COMPLETION, [test "x$enable_bash_completion" != xno])
+AM_CONDITIONAL(HAVE_DOC, [test "x$enable_doc" != xno])
+AM_CONDITIONAL(HAVE_FONTS, [test "x$enable_fonts" != xno])
+AM_CONDITIONAL(HAVE_ICONS, [test "x$enable_icons" != xno])
+AM_CONDITIONAL(HAVE_ZPOOL, [test "x$enable_zpool" != xno])
+
+dnl Automake v1.8.0 is required, please upgrade!
+
+AM_INIT_AUTOMAKE([1.8.0 foreign])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION | sed 's/-.*//; s/\./, /g; s/$/, 0/'`
+
+dnl Without a hyphen. This is used for the bash-completion scripts.
+PROGRAM_SPREFIX=$(echo $PACKAGE_SHORTNAME | tr A-Z a-z)
+
+dnl With a hyphen, used almost everywhere else.
+PROGRAM_PREFIX=${PROGRAM_SPREFIX}-
+
+AC_SUBST(PROGRAM_PREFIX)
+AC_DEFINE_UNQUOTED(PROGRAM_PREFIX, "$PROGRAM_PREFIX",
+                   Change this when you create your awesome forked version)
+AC_SUBST(PROGRAM_SPREFIX)
+
+AC_CONFIG_HEADERS(config.h:config.hin)
+
+AC_SUBST(WINDOWS_RC_VERSION)
+AC_SUBST(SDLMIXER_CFLAGS)
+AC_SUBST(SDLMIXER_LIBS)
+AC_SUBST(EM_LDFLAGS)
+
+AC_SUBST(SDLNET_CFLAGS)
+AC_SUBST(SDLNET_LIBS)
+
+AC_SUBST(ac_aux_dir)
+
+AC_SUBST(PACKAGE_SHORTNAME)
+AC_SUBST(PACKAGE_SHORTDESC)
+AC_SUBST(PACKAGE_COPYRIGHT)
+AC_SUBST(PACKAGE_LICENSE)
+AC_SUBST(PACKAGE_MAINTAINER)
+AC_SUBST(PACKAGE_URL)
+AC_SUBST(PACKAGE_RDNS)
+AC_SUBST(PACKAGE_BUGREPORT)
+
+dnl Shut up the datarootdir warnings.
+AC_DEFUN([AC_DATAROOTDIR_CHECKED])
+
+AS_IF([test "x$enable_emscripten" = "xyes"],
+  EXEEXT=".html"
+)
+
+AC_CONFIG_FILES([
+Makefile
+man/Makefile
+man/bash-completion/Makefile
+man/bash-completion/doom.template
+man/bash-completion/heretic.template
+man/bash-completion/hexen.template
+man/bash-completion/strife.template
+opl/Makefile
+opl/examples/Makefile
+pcsound/Makefile
+pkg/Makefile
+pkg/config.make
+pkg/osx/Info.plist
+rpm.spec
+data/Makefile
+src/Makefile
+src/doom-res.rc
+src/Doom.metainfo.xml
+src/Doom.desktop
+src/Doom_Screensaver.desktop
+src/doom/Makefile
+src/heretic-res.rc
+src/Heretic.metainfo.xml
+src/Heretic.desktop
+src/heretic/Makefile
+src/hexen-res.rc
+src/Hexen.metainfo.xml
+src/Hexen.desktop
+src/hexen/Makefile
+src/setup-res.rc
+src/setup/Makefile
+src/setup/Setup.desktop
+src/setup/setup-manifest.xml
+src/strife-res.rc
+src/Strife.metainfo.xml
+src/Strife.desktop
+src/strife/Makefile
+textscreen/Makefile
+textscreen/examples/Makefile
+textscreen/fonts/Makefile
+])
+AC_OUTPUT
diff --git a/games/NXDoom/data/.gitignore b/games/NXDoom/data/.gitignore
new file mode 100644
index 000000000..f1bc7677a
--- /dev/null
+++ b/games/NXDoom/data/.gitignore
@@ -0,0 +1,7 @@
+Makefile.in
+Makefile
+*-doom.png
+*-heretic.png
+*-hexen.png
+*-setup.png
+*-strife.png
diff --git a/games/NXDoom/data/Makefile.am b/games/NXDoom/data/Makefile.am
new file mode 100644
index 000000000..1b6a44c0c
--- /dev/null
+++ b/games/NXDoom/data/Makefile.am
@@ -0,0 +1,39 @@
+
+EXTRA_DIST=              \
+        README           \
+        doom.ico         \
+        doom.png         \
+        heretic.ico      \
+        heretic.png      \
+        hexen.ico        \
+        hexen.png        \
+        setup.ico        \
+        setup.png        \
+        strife.ico       \
+        strife.png       \
+        wadfile.png      \
+        convert-icon
+
+iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
+icons_DATA = @PROGRAM_PREFIX@doom.png    \
+             @PROGRAM_PREFIX@heretic.png \
+             @PROGRAM_PREFIX@hexen.png   \
+             @PROGRAM_PREFIX@setup.png   \
+             @PROGRAM_PREFIX@strife.png
+
+@PROGRAM_PREFIX@doom.png : doom.png
+	cp $(top_srcdir)/data/doom.png $@
+
+@PROGRAM_PREFIX@heretic.png : heretic.png
+	cp $(top_srcdir)/data/heretic.png $@
+
+@PROGRAM_PREFIX@hexen.png : hexen.png
+	cp $(top_srcdir)/data/hexen.png $@
+
+@PROGRAM_PREFIX@setup.png : setup.png
+	cp $(top_srcdir)/data/setup.png $@
+
+@PROGRAM_PREFIX@strife.png : strife.png
+	cp $(top_srcdir)/data/strife.png $@
+
+CLEANFILES = $(icons_DATA)
diff --git a/games/NXDoom/data/README b/games/NXDoom/data/README
new file mode 100644
index 000000000..c3be61a62
--- /dev/null
+++ b/games/NXDoom/data/README
@@ -0,0 +1,16 @@
+The Chocolate Doom icon is based on an image by Chris Metcalf
+(http://www.chrismetcalf.org/) which is copyrighted to him:
+
+    http://www.flickr.com/photos/laffy4k/448920776/
+
+Chris has kindly agreed that the Chocolate Doom icon may be used under
+the GNU GPL, so the copyright status of the icon is the same as that of
+the rest of the project.
+
+The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files
+contain full 32-bit versions, scaled to different sizes and with proper
+alpha masks (as well as the 8-bit versions).  The 8-bit versions are
+used when setting the icon within SDL, as SDL under Windows displays
+full color icons in a very poor quality.  The full-color versions are
+used in the resource files.
+
diff --git a/games/NXDoom/data/convert-icon b/games/NXDoom/data/convert-icon
new file mode 100755
index 000000000..4ecb1955e
--- /dev/null
+++ b/games/NXDoom/data/convert-icon
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+#
+# Copyright(C) 2005-2014 Simon Howard
+#
+# 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.
+#
+#
+# Converts images into C structures to be inserted in programs
+#
+
+import sys
+import os
+import re
+
+try:
+        import Image
+except ImportError:
+        try:
+                from PIL import Image
+        except ImportError:
+                print("WARNING: Could not update %s.  "
+                      "Please install the Python Imaging library or Pillow."
+                      % sys.argv[2])
+                sys.exit(0)
+
+
+def convert_image(filename, output_filename):
+
+    im = Image.open(filename)
+
+    outfile = open(output_filename, "w")
+
+    size = im.size
+
+    struct_name = os.path.basename(output_filename)
+    struct_name = re.sub(re.compile("\\..*$"), "", struct_name)
+    struct_name = re.sub(re.compile("\W"), "_", struct_name)
+
+    outfile.write("static int %s_w = %i;\n" % (struct_name, size[0]))
+    outfile.write("static int %s_h = %i;\n" % (struct_name, size[1]))
+
+    outfile.write("\n")
+    outfile.write("static const unsigned int %s_data[] = {\n" % (struct_name))
+
+    elements_on_line = 0
+
+    outfile.write("    ")
+
+    for y in range(size[1]):
+        for x in range(size[0]):
+            val = im.getpixel((x, y))
+            outfile.write("0x%02x%02x%02x%02x, " % val)
+            elements_on_line += 1
+
+            if elements_on_line >= 6:
+                elements_on_line = 0
+                outfile.write("\n")
+                outfile.write("    ")
+
+    outfile.write("\n")
+    outfile.write("};\n")
+
+convert_image(sys.argv[1], sys.argv[2])
+
diff --git a/games/NXDoom/data/doom.ico b/games/NXDoom/data/doom.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9d89a959ae3aaf4f752f47f3a8585c1c5416db35
GIT binary patch
literal 43344
zcmeIb2|SeD`#(PRHdL}EW8Zh#vW%?|(klCsLS(C~Wh^O62^EDbEz+hWk;IIplosu_
zG=r!f+eB$(n)5sN?cq~BdGz%8`u6+%|IfTSnfpHXea`iMpZ#3dbq0fBz_4PF4+BOR
z6C;Yjc);)T=Z{}|F=H@q;XOXS@$2~67|d!Z3`SUZ{Q4|>u2~s_QHB9||EvTC6J?0O
z7#NISOB-P@(w-Ph!s=C~>~jR>z@*vD%}mxJu}GMOWbL^9EX-5X+}y-)eQ0ZccGv;&
zrU(+@^7+AcIW6uZ<n1Bmisj<ID(PFEB=*gk7qo`wv~cMG!JYHP=WH`M#ARX_!`y(~
z7u8&}L!@|{@%Bz>ePNyA`4;=w#Z*Q2t{2Q;G&k1`KKjyW`=I;7oQ#~S7ykG%WcvKV
zrGa-j?{Y3(I-f%t)ZyFNv}?m)<@rmEpO$R+IA?x>iD;^s_`<*c<1U>R%<$xyXHK~6
zr|SAbYs)5C>o?ni4lL?E!M$}kvlVlcLFQ8VNbOloCd|@|8G|OmqVvss<{R#r#XNsh
z#qj1CVc+Ef!ujf{jH#w3b52{fN;<KKa+**KPA}ccP6W@~8VswLMTcriuJtZREx0Sz
zsMJMIvuGI7^(|+<C(#%@JN-rLcJ&tf+95N$oEPa9Me1AU7C9dEDy@2_J0_>}a5sO{
zs$JM83muq3-?>x*_X2Any5kkci=SutNV9ukopYt<=gpqg8DTNYHu?4*gI1S%muJ-)
zg+UC|0SrdJ(9k}$WKV!<$0LK3OXio;2v}<YgVh|OF)utSgsq=EY7LR>Temnso$SpX
zH|t<;<P9OR*OJ@indDGrQ#N1{;KUwt<H|sJ?&oe^4<OzD#mv~ImBq}MG^S}C`MD#`
znpU<pf4x<Oyt$cS^;-GJKb*Q3WEbbr>kCLheQ%y9S_o_kv7x;y$e~56eZqp}`SQ+%
zSQhD9K1auRL^#=UznF4jbq)uwImDyGM3pn;q@BsW+R|U<<+*ir_cOzf*e8mnPd2d`
z1$lQSl-x@>e|o{AbymrE-F{W^LPscv{od^-p7EbaP_8Ip=zn+6&|n*u`2#Ply8NxM
zaKG{_zIj!?@J4<2$vsi=92`b*VP&igk2TE9mc2|M8`X{&8Za~MU34Ufz|MMu`FbXK
zVf9C8LFNx79Gy#bt>^}MBWx>&NBdVbe|YQKI(Dd}nLlca9X&{uk=}T(iNdSoQs3P+
z*Gr?aWWVIf)#;4q!xkUT*X2064HLzBr7OCfgNfLhzDH^IN0ytE&xIxXMOT_<Mx~vJ
zga5i82(Gg1d8)Wpc9SM-JfJ(-Wf67x2>~nKGMmh;ykgu})S~=zD-s5e6EcETO!%LA
zKdpUorrt09NHznFu<=rX6Z4uC*Iq1QYW{R%dqqz00u%lXPoMV9i)t4p|8d)<QOkh=
z_bJEp{iAbRxA|@BczH|5>!Lq<N_dF69_LYBO^Qu~ds7f8VniC>`JQd{{WpRAJ%X2B
z*$Xa<w2E!{C|MQh$$jb7X!%j5G+p}pF>LK);|=l(mpiV_EhE3}$W62Jy`iO9wy*qJ
z`&et_Cnrw|wWTY-G0DQez1lG%;w{aoFfbyFi?`=RxHHSgkxy#toNhgQuOIG_nCbV)
z0#Bg7|I~RW;axzB&yDLt?M;szNe3hb-&}hBzAx>SLP{j%wcYNw5&m(ipZd9!hkLB#
z9SMsq=)=8Mv=<g-SGt4PKARQBgAaEL)*P3PbIVE!a{MyD;^iNz<!D8%-Jy29<k8}{
zE}t{7wZ_RgbB<nnah*OSaj|Lf6~R4C9yafBO80}4)~)QYzNBueQhjOequ!<X9w*My
zYEDeBNSr%o_5p=KDQj%qiS2_cn%G`_DdnMI@}f?0zS{37l4G&{X&NJ*_F;V^)%r_P
zNC|u?-=2kSP>;ugu5HmF=2@`oHZBl|=zj1TdtWL)_ml2!7x_^pqI>;$tsO-#)emxy
zMpO9>l09CD6>tQxD_O6qOD|hXeD8h5=Vi+&_16}A72Bj2`E<7*8gTgZEK#rPprv&%
zyVCPc9oED7f|5hQP1mJ_bQAsfc;qB(RrIR@Pu8oDsTUXNFd1+%d0pH&n5(I|56cwq
zz4d9oP*oL6`zfDJzq*j58&w@62ihEaUp)`h?9ySiN-i1*9*mLy@V2+&AXEP>O;6Lx
zdVgX{<UZC%#+My$CKW#C;1YHn_@lph==$}dgKbFz%3(PJnN36YMN2mc?C}bZedDkA
z@c`k&=a0UUugevA{O;EU&!Z1syOmQ|WTDCX=vbR`Rk_^zFRW@8tZwR;@i>HcDF$z3
z2*3M&sbb_CbwS*&IcZGl*Bv<Eo36frEEW#6dQwF_q1Q`_4*HX9TLUXwH2tevb_P)D
zmLBmvp;8umt5?m|C)|reW!9U89e(a}8=VRVn;C7LTZs9D-R$*^IVOQ84-`HRy6;rJ
zCn-tcqDI_>=-w<2=c<atjUK^5_bcdM_G=B1XRqhPV#)<Rwhh~6IMofM`{eky9xm18
z+}N8HI$)pO?G>q%z+iIPiL*?}(Rc0+-I_O5JH)Q2KJ$NY5`Q7$$md4Ihg~!p<!H_4
zH9I1hnp~=$@dR(#$`l#kr<h8+_TpIiPA;{ht%EOUg-89|o~N>vcBb!SFcH1IkZFDb
zpT#@_@lEn7nAG?yb(k5uIqUSUn@jIodChs3{c2aLEr0myE{Uc5gR9hX@2!7zDwWS5
zujToGKPlr~mv3pHSN^+ASMM#}F^hgrexWw2-pI#+aMjVq4|hDv-)*W*8hl`IGQAGN
zSh<Eo{FpXUHWF$QI?}pUbd-yMbp1w2;gX@wY}WL+-74mUaJmgs?~)yZm$#LNb_DDC
z_q1DG_2F>t5B1?>p!Ph^HyL^(9emk%?CzM)>ygk~mJip4zDW>R^*qsQsou@dvgj6d
zsmDWlp+yJk53WxsTcr3xlk$h<;HQ>kqiZoqA=zg;R_8~R2eCDh>~G&V?AU){5#=D6
zy~=81S9gZGqeH@*=Ux>uo-(`pWiL1Fx!P*y>d7?!J&!3<iei*mo$V%!=mPfyhIo?$
z60E`tRnqy8n-^E;GLUI=Ns>F(WvnG`ZZXPt74hc`mYy}|;0B|0+=dv-lP1qb^yWQv
zsuAsN6}Ehn?Z<!3+=snT-Rv+hXKoxeFmZEyDz?pQuFqyBlSd}P{iI&LFV9TecJI`~
zVHvBH%DnwV%Suc1aMooFTz7G_fp@-bd8=b(tqiQz8!~%6>A0doI#qxB^p=r!T(E%s
z*cRv9T;r}6Nu|ZoTWX8v7WM1O%dxd7))WuZi=Cp1=L*XupGm9DOxsgDr>IXiQKCkP
zK7@0>Wun;6C|-yS?X2IoYEQhfre@ss@&ku_-QC<obRR#!VnCL5YQ^5=^MrF7Plb>4
zSM(HK+xI4{<L;~So8{#R<%>0yBen^6`^+649>(W1`1hr9zxG+PQBBlm*D={6QRix%
zhI>C&Ivn3(ckKA_x|$ls#3JQ2*-_kg>rV=8X%*Ra?j6}LqFe!&zpc4^VV~oI;7jq2
zmzdiWS?}fB*j|cXd1+RgqKK!zk-E~Eh;T{8cZ~C-MQdm@-ApS``g~=6Ol=&e@wpFj
z9QA<#u(#JbNIG;ZGqdJ|aoiI{9t^S6*V4+$P=+Ockw6mbix)5US!=P{c@eiOGLS<m
zuJ92tqN4Kh^0Ab~8)UgHt*r~Z887vA-cDL9LR)e8@L{b`imP`wV{1pUcUYKq5LeN2
zfuWu3f*ovin9nv!)Fj!oIR^!`4<*jNerdl?)1{B{4w;g!c0A{wdpC9!mz2b=5X<mn
zUzT=NV|DRBlpHOJ&%mXX9e--6B{5LYu`)cUsrb3KIuuaCMv-`VG$e-PwRP+43l}aV
zq$~LQyPYh;h<`r4d_<hJXn*{y{rmT~Wxl9fs-hBo$~0MW6XU@yazmP2MUDUZLK_ur
zZSA4$4EP5wibu!vIpDJi*O(K-IIj)Oxn9c|&(J3=YE<bwxEOy*9Lf9U#}^I}wf;w9
zXY)}Ne2Si4aK4=Ul6fUdP4pkE%y^eg7(EjcTYGx}KK!YKgxP{R!P~?o$yywWE>#B#
z3k&spaZm{RLY`ga7%YA5xsrk}8ij>vX=$lP3LV#L?Ii9ck`D11@Ge-8e)Q<4d4$K(
zmU%7PI-lfQFg4NI8*B<~+~s&N()p{U7wv0x*^v<hxqVT*K~`HZqja==v~+(RX4xWM
z+KT7i-1W)W<Xg<0F{HC=&$({eB${5*8AX!z<2rVBQ2@=%oIEJ15*6RMk95|)urp`Z
z0RNnW9#<3g^C}ILw~#ElxAUj1+;Vp5k+pZaw_hpUdA~jVV|c{bo#(kEj%zs^vkp9M
zI1M|e1q*C!Y{)kT%${IxGp}GFtSNU~QSSKaY3Zpbl9w&l+2^ua5!>y_B*RS@ign3~
zQ!1*|q>)XGXIgNw)TEX9PjW1YrTwYt`{R{$baaYlTduNsPmK69i&ha|$uNI`&Bl$U
z9E3H6Hnj;{QlC|$-Au>WHe9haIk*0gU0+W7g^G&4tlY&53oN2Al1yAA6i%tK)Xhx|
zx}p(vx<eDzr0btv?F!K~JPbkF%Ad5Am(29UsY({XPggh_haj=#D(7rkL}DS#3)b(2
zaU?G(F0;A#Q${DEj7~gKSNtsP_XK8AzN4UEwxCu3CRumr4pCD$kmsIQn#Oo74;$K?
z1#3drjb~*WyNAPG50CnGc&t5GVq$VVVoamw&6~EGf-`3VM*8fcBMq)(&5w;Qs;c5p
zI>-B}U(}sZO-(I8kj=kp)Z-7zV)**}1&&SZo*(bV9GHD9{m!#ziyj`=7JER~i_d0Q
z>R&nMf^x!c({-i2>z%{LmbyIde%aqEtU0vEp=8U;mX&Ajn3_7KVJx_nBk@8K&C)@y
z_dK-Q7h|_~>DDNka$#G+7um{>s&ii1w0&^v+12*JNw4$fouL&c4kWGRF5NQLdw8T^
z{!@I*{SS_h&(&M%rn0i=6z;jX>Q&X8*4CI2`=@cs3$)apCVWhsdrwz~$<n%ul6oqy
z#V*oY4d>(15EH{VYjs1+S{~`^OUz{E&hjv4lo4K7Z{9Z&I=oRRf78RE>i3N#o|M$?
z{=jE?m)zT$J4HuF4)$JIaxL-ZC#^pOtlwT~R}L$M6}{U$)qTOGx!iv4d46+E=fApw
z=MwnjQbkOh9jt)CFh)M146+9D9TlRvX{o(mtg?W57`Fdr4GT)v;PJXkEW(t*MfGJp
zZ)V|$CGa9-KNmIO^xPsKL77WS4R}al5@g5Br?Sv5QL?tI>hy#OimxL3$K|@nMHMp4
zqA^BF(Vj4pg`-`_aYX;RhZtsjG=Z14U2HzvY#4djmp`$90mDcj64>cS&S;x$pv^;*
z6QT_Juu#-6@V#U|pOLh82ExWnQN(1Sw%N44x+fTBy58w~82mw|=)QRdWRmd>Mo`7A
z!!)1DW_ff0%_HM*^8>b&4b<5@&Jp!vl*)QsY(+gb%7^!aS=j>%FN0GLcVi61#1EeA
zU9fleidy@q(xYjX%nS`r&uXLxgwizzD#Q3Wop<wpa*9||Ix-?dquDb+?)zPE3m?ut
z#!X#(Z7c0zBi+<dZ}{M>w+tVeS?FGPCvx0q^8!5Aid5CLO{&jq{s^V*^(Wu;BqX}4
zX@26SIh=l9Do66X#e5-~g^{U9VctCIsz75R!R}&b6TN%Tt%sU%zZT2B=S|1^qdB$K
zUmo)Yc)5A>bx1Lm=Dp`rV{+ADO<|!L5}R;C!?SCxjcct<gtv6usweGfq}BL$MG^-6
zuel1Yqdo}n+q4w}TgV05>fu59yV#EUM-<cA%+ZBaLr-&wmm`Oc7TH}qpic8xvTBnj
zd=QJdq)##SYTeuapf^>0tZOeW^R|!w*ahmR+|L{2tps_f^=5tZgykq)3`u`<TuQmd
z@G{*xJc6E0*4#>37Q_lhb7?vkxh3lt;omX#MQ&ln&sV;3<0VsZ-^bCAJ*3!n?FgJc
zxZ)CJJUY@fOZXn;UXp?1kp&RSy9<|%!u;emiK~ORnP0LgSw))oxBb-Cb&=Sdhe_PD
zjzCXwJS%21BYytst@2%QE}w_{^UAsp_j^QMF7l_nHhq8l8D~wt;B7WMz7T_FO<6#F
z08Fbs+pRy!JHkyfVJ=$@>H1uz(k1xb%5@&uvl&B1sKH_+d#_SkNYn!9LiJ@s{4P|h
zj)%DS%mYGt2^l?0U%FZvkQ>wCI(ciN2LqlfWax7*weF36^iXSqEjzWJnPA?t_tQ-_
zj&7AM%d!x*6g{do2XnDn)WvFly0vpfR5JKON=%aMnevf=;7rMC93G^t@oI}P*1n%P
z0PF6>_{$6?RR!#XQC!d$M*Y#2<Wt2r4g~s+gm8FV+Hm1|#AiH4RyjIPC&iHZKvnAf
zQp|9M2-WIkrRFPQePsWeR3E>jEmsL`u07XGg=TXSV7eL=A#6|3W|zx=$=FLeUS4pi
z@?b;jP_xFEPOXRaOD>_{`Q#Mt5@!4MXn7(wJv$XH;BI$t-Yc-GqrRZ^><Ikqb?>6V
z>eT^vY7Xq+Q|xA@FS_*vQ_K-rMh(0;`rz|ou5Jx#P*m>XV^OBTlH@m9^Y8erEc(I#
zT-8B>#nHgeHG9o$i(CW(5?SO0anZfWy7QVI-r~R+c=05*k((&HUS=-x$TmLq@VT2D
z=ewH5%lyQLnA;5a#Ja&b;aGJL@usosu2N)qP<UDV>|w{t&nbn3(RI{;U8K3#W1-{%
zMRh_nsV;Q0+e5v0v2qF9hPj&#T^=3nXe^nV5=1>kse97bR3b)W&b#@9$QC&m^8SPp
zeu40k#Wcx_a3{r?D7N_O00TiMWg$(l0<)VPb4QWZW?;H_GgGy71#EU>9dD}kVn=Ul
zy6?rtF6q!z;7FFguN^&m7A+wjc2ODou&EzA`T9B4NG$ka@OmTQEA6_?Odt&TQ5KgM
zDK{OD;jLVjGN1N@g?#dUElEh9<`oGjOa@_FSPGmY#Wbi1pZAbTcIw(53z2NAVDk8~
zrp6lfDztg7+sN3eo&ss=+e1>}N4SX{Iw8vrHqB3#W8?q8gv&EXB+GKEM7w@jP^+YX
zVHIGbItZ7QCUq@~BvAH5)qM8QRVTclQl0>TS$MIHGWRQ<2f)gk?9w;SRh~T9tg)3^
zVU%>|69YN&44s>nEtOlFN68A(v$YL4A8@zkYzI<~ZJ3zu2u_@6*hy17v9xO;8?90I
zi=$62TP(@irF!q)<z=kN7lob4$riiWg{e7KRED>qWdHU@Pp<%-YLd2jPYT6&Z0i6E
z9&5$IJ7@m@vu?52mi@f=gYB3c*7>_Vc<9Hx>2KS28zj>n33=ota?;K0PU5ODl(<F?
zV$Dg1=nK1cvRRIPnujCUU~o(rRnEw{uWiBub(^0m(eOoy?D!=fr6JTkbFhl?&ngpK
zErp$_`7A_3cSfA(yCgMQN5m|*g}dTNFRjT&Zg=Hs)!P}?(cL;c-(nyO+sLNO!s7EH
zU%TF7j0_dr7w5v3ALIrfyLO4A4uh+YHV9@_=7FPNcv+DUrR-znSS*fNRFdkDu)JfV
zNYtJhf5}Bb=58%=Ebfeqz*(F%s;_!bYB3k>v2w{#xBBRk05>ygt)hVx4d3kCp_$BA
z(OPq8<F;OoK5qOzJxmX4)V3Ouy^;|1V-%%~r!xvmmw2#%I5?IF`iO}eV@<uysH4{y
zsR9_)d6CQmw%+uEsvp$k6mPNOPCTc@W9hE5IihZC+^6wqkO9AyA>a`ok;Eg!MoaxN
zz=@A#5fZ{*{qmOFWH_om%i_kYLWO98^?Nl8C5G@NfvDfXS*Ff{<-n_Mf$NA_Pd=5@
z98zRfh^|IkFKm6R_$6F4H-^t~xr~lo(YZA=Q+7g&lU0NN?A5(1jd2vyfsLEQf>|-b
z!;~`HgKT(#`FL#Ub+W%i4l~UItIlw58K+e`k+6r#Pi!V)?SxqAUSXeOaj|MVR2kb<
z9QdnoLUy)~wY}O;=|lxnwZk#~Oa>Yq{tiL{^gK!IB77Z7q}*Zg4k>A{P(+5r{OIu#
zNF(htz<4qlq<3gO80_dsKFBaKm%vfu9*w&`?-(mhQjBvByAoT{$OWcs%8qRel-(-v
z4O%pn=d{8KV1M<!38%3Vl{<>lI)W=%uRWdtk0X?jHFpgdx-D-zYv<ftxz)F#U9ddf
zWiF;Aj=-J6LBn*cR*<A7V6qiy9u8Ip#&5_UqjKHnMrAV;?a7ULyR+#F5jzss6@}Y&
zS9k;UOYN5Grv}Dt6lOeT9=od`+5byDLuBu>0WAID;)H#%xIBGdsug3V{6%jaOG3~c
zWU{2rN?Df@AV^tfijSyHHWLaYTDL@#w)HL$l_YZEqbeALFHpohsI%8J2k#|CE#jhi
zprb7&pLT)iLTij<)kX$bKZ@rPIIVOkWd?kU=m)oRFyP`<*$A^gnz>myr0xz&C}0ro
zqSUV+W-2U-CY#DV&?5WiA6K9zELw!&B!-{XA)3n%GTm85d)%tYLEXwpS?5SGZAe*8
z{qk~=BgU$8BeuBBJ(qn2h0EYH+a6NiHcN`BgSuTTNs#wJfN)AS!vQv0JUgB+N?@a!
z-<pNnB7~2LN%VMVGLId@6g}%SGp;k5bR<%k$}Xx>%~^Ad*m#+RxP6{5?Y=TCegXb!
zEmP%5ofTB`bv+#g0S?Zad@(J1v2G0eE{$Hhz4g-zR|;Ei9SiO@3;oVqi|g^eyuwc@
zAw=DIw8m$In1WS=*y@gC1HDDG>QAt9ZOA%oD?s$a6tG8Lm{(g1?mumGTTQJE+7v^=
z#^2XRI(XRd%Q6X`jxm%h0WBUXdl6GLwgj^&22124HeR87>a#vlI&EHy?eOrTMyzIw
z#WFv693j9+k7wAzkH3`6eAS0xb7c=_83TNUj}Pzd#45-`r|b|UBb|x^#_q!Cmu@p&
z*ZI_=yB>7#S`l#6wEX#tY4+sC^R{Ie)wz)=eMEIIw#$;tFZmctJDj}mAc*B!Ok33M
zKZ|C!ki-);nzNj`z>a{W9;MHR-EH9jCGOn^PQZ!x;0jLI6qEZ%U&1cE<4p*6R6fHo
zML!SN9J=+%Anu+^jVX?DRIkHyma9E1!sB7oQGN_T5t9-@6=P}Vrhgh_jVy}Dq{NLK
z+d^F+!-j?Zfgh#!t$8*FZB1t}JD~(KLb#2gQwr4siP)UJt<~1bWeDs|@r=aBm?$_2
z)o6p&J>G&Hf6^6S+gEGt`(C$h`+Q~EeQBD=Cl#Xgvlw9oYJ~k&c7n`eO}Ie3STpFt
z63<32+IFrQ+oCZHXYY(f>QR=p{;=JW_{{AoS*j5BB7#cP#U`4ht|E0dg|sh&gVwVm
zFEGkQh|MGKN)&d^%5}OFwxbMB_h2blg%6+BAak%_hT?fR2I{e~vCu&_rFon<hHF;^
zKJ9KcpN(fMDZi)KMUlfx3bVqQ5(D`%c&i<C(boB~-pAmwB@HGWQd$>yR<J~t_^8aI
zoeq69=l&~9@hn`1_NaSQ<l-Z<YdINTc<vCpF#0&~rGtPVJwPCM1+17Ed$C>*UaR#`
z_RI=#zPOpt;|W(k&6whOk;h)>M@4q*p1tFZq^i^KseTU`XE@a^tdFiBk{Ci|DOo+z
z43!ux8+D_9ci@19sjACx)^2U**{-|!i%cJIZkuZ@h{tp}4_|)O(6x&YCirll_mViv
z+QxPA4j7SCJD(9#>$(U`<PLRxs_FAS|2P+W%$Q3%W^h3c56xrk>S)4-;Sixu>7CKI
zWoCEHEgdj-G-#4W<Yb!bskmG${XV<!IR=7nZyzJ>TH0PEn)!#(Hg9}q6N{@4W|5On
z-~$|Ni>u~{!nNBeE(<2JIdr|}wA2fj!t^M(Q9{HPG_x~GhGj=KQkd2b7ck;<1o;M3
zQp_IU?nIF^sA5i-XsnxUN@qOzO_&lKr|)dPid(2iF^w$QOn&2qk*~+pG#;qIG73|S
z$=E{M#ReW7ao!Kk$Wf%2agB-?2c|pEqFg+k3uBq-%pGq+6=20){d(66Z+vYoF;|y1
zv{aaBOL>d+;}0zKx{fz-IAbQHPFsaB(@i@3<>qi*>0>O>SDk}nroUiV$$>wpG^@L;
zo{x$8AjyCc-h7<c?wrg*iy|sfq(swq<pfb>E`AZA)X&EC&%>$gmWIpz11z*N+`^Qx
z+`#8FZ%?ZBt2s!u?xh^I<6B3SDX!0m#_H5^?xQfl@^HsQ+BU1~#cft$qI`PZS74KQ
zzs^57HG+ETaLgRqDc_MD`>?KF7<Y!qqANrtb#V4pK;u<ToFUn|pa*HSP=%#M<UE^m
zl%XpMRJdqyc>3nnSnrA>6gFGd6|q2M4xI8yXL@+4yNHdC7@GMpA=FR4S8=S=?m$-#
z0VZmN)f`!*q~_}|@y(@L#S*dd;!HSGE>}-X7bbF68pN4w3;Q`ivZf~EY}(zL#(;S#
z1q_>o@R--LX^%e~jz(7DC}_;feG(MYAxlO$gHV11#ai2Z^8_=!xnrYFjrF`G@F6%D
z=3<@!QBo$i89Dh}&*1y4C@C7on2C>#%HaC(fo@N(!W>${bDA#fTXR@2#hirMgyCxo
z`xraOI-0v`2p?<~T&8_GwSAXTa15c|pYaui2@a2rWGPI5f+P4c`&namAoZM;WlrlH
z2PU78?bk>9W&QMUv$vlj&!+8BAFI$!d;nLOaJrU!yiSg!w5em)mWyo~LmSvVt*U*`
zYosvK9~N`k4DX0VSnpyb%x;uPDlT|*wk;}pH97fO&zoj;SIt?o4q##bQn2)VIvbO%
zk3)3iWhOk_ZBR>+qj`KeE@~;gq{W7eEo~u<Rs=58VZz+z#m{*HQ<`mIECV+iu&ba5
zFFQ0zI}%r~5lAOu7t;jU7+d&>_$boF!|M#}wqga~W28OJ@K!W(D^_)uO_4k#x21OQ
zwpHIeOf!x$);(OoB#{p{1@w2tj2A+mCe<o*6@$cbMj#Zad8v%)sv5=>RFhsTp|CMC
z(;4uZmr%k8HU2Nk45j55kEAW5E%l(R%L;rCD?oE2MXXuLLFP!_iM9I(!`EliTDaid
zIjcIq%puG!TeSL*I~DnlHOF+4+sG6-adv`F*q&_5F$0KZjdnPp*1yVOj`W_q+r=#;
zQee_tJY&(;!mB$l!K?x8tvBv6;IAHxnPbmLKSXd!&-!w=iPrOJ+oCsq^YAN@${^BQ
z&5iU|a~ydnS-xqEiK`i?c5%4T%-p=9t-j<9FX<U>4+{g2WCt@Gdf{`gw`nl<VXm%m
z8up6J+BVn78vmL!MtSM$j6j3x)J=Ynu#w(-)X(WNZM9SrUm~n{L`~j}^v$1((r{5V
zE?FiI8Ami}ZXpITwkxZ-sI{aW5(ILkdLW&Ir{5lpROt&-KiC=8e@bHPDd%xo-xr%v
zCYH0tr`tTup7=^FuqU-);$@e0Ub<0Nw(5RP+sRvYo}pvGdQS$gAI}$ickJUA?d4zg
z$M(E3TyoJpHF2B!p|aMsCzaJNTwA-}$He-AnZ0kvvjs20@=p$T9Dj@7*{(5^zoTu{
z)gsKswp9_V`&~figZ)4dQ&EkZ-XH_oY%G288F1cAeiE>{;4`!>!I&>!Wpc^LHAWhK
zhsG+<MrGVG1^&Tcpmj?T(|ACyzxz)_^9-+~+^Gy1`J5~{xvVTjxwPXdGO5Q^q>{7L
zr4D3iN+e{+%kSm=?zPEFQRRy%OGTQ2Hue$F7rq0Q3tR){e1*V@=NwqS=rpifm<=?g
z5>qB$`0fi<>GB~(u?~Qwp%(rYsJXX-75v5Dq_I>o>CkttO<oGA6&;e1cn6R)G!h4Z
z;`K40`du1o(y3FvkJTzZBq=`#kTmpC`+?@|&uALzw$CQzP?0@+crwH9zF=|1hoqLh
z2S^%8yVHPc7!fSX=?Ch&x`2^D8JdQI%#kDCy*7D?H7PkHWi||uG_n#>L3Y?4u>3$5
z(24H`hKp|kLxFOjAeT9H{^lizq&JKJB#oT(bdVR52#)OB4_rbCz)-Lb=m<Rk((<`e
z<6m8RNZOqWkTi-erGkfL0pL;5W{?%U52%X1Ld!)`;pEis+ms!W3H%I@G>)G?1M*H}
zfn&)TKwq~N<rFCw357FLzP~JxnCX*03ak>wfLr1aSiNHqn7j7?OZyg}zN{52H@pSZ
z_0D8X687Dfpp3@zP%{Sx1_nTXe?NHo^eHGWF9#=1oB&Yk0Kx(TfX}A%%I{vAycE`p
z4OpVN14!y@1wxuT0anc&2*Yb083!P&9sm}K+X5k-n1IO_zWXAe730UJfd})1EWuy@
zMxytTXTE!F@>0p}EMCIw2w1EY0YsM{2K?%~frwEmOe+G27^lGNaKNJ;v2*f;@4gsB
zk>;C5k+<P?HoIy1K3*^Ha%Y8%eZ9#<5Hr8LdZBp~$Jeis*)W*@CLsL`G?v3agE-V8
z4ow?c%_Xpm2lV<k{U@ey_K=$JeV~E81C}kR1$u&2z+mxpV8VY1nDP|>bDmSMZ#oIq
zaOZ&aTp3^^*I}R~89!zH{2qpw{3W8QNE^@)eu4IRdO{7r5L<<|b5p(|u#)#8+V`#D
zE&w)*PNDtZGO<MB_vuV^Eh2w~h_soBJk;$;KrVY2=*ttP%tK3j|4*kctZ<bmC*Fhh
zmq;G!o^R0p?(g!@5KsQ;^s&m<h*FY$U?LB7-#@_8TQoEe*_>gZr$qb<4h@OapH5#`
z{TdPJYbWy1*f9W>J^nJ82Z}@P+wxGAJX}2$-{0RC)-EMVsZ-GY9LdAUl>jX7{sHuk
zKpe#Ju|d=B88GI*Hi<)3;>gdZuU|%#(jNj7c?5f&1BARSz}op9!1=eMIJBLcfHCa%
zC-P8|NU!-`&Z(}2jbQr7c=Bf+p}vLSRmB<*Wp@-9dbguo>27I7#}+gXfl{C-nf3GX
zo0Su#*L+0B8zhhL;LD(^)&@j59tYmGMZgMjh4XF$MuJ3Ow73%Bmec`x>0IJe@_v6`
z*b=61{|QXwu{-iAcyr$##B9n#^Qg^p18X+lgX!0TW!Ofv4a&)!{Q2}(-yovn-Jf~j
z6Rv^2=g#0l>RwQu8H{ojV}BH=!}-WW8<dvI|M~PcR1jshjgN;i4kO@MV+5eQa!2z(
zaF7W0z*6_#Wcxt!kdiz1^Xc2c^n=I1L>|8T?}G58n;<0i1_%m+^9`$}$+|ny1|{S!
z{B-&v&Xq)&$S>gQJiacEiF);Q8$|j<%ujwovY$UEy?GCwkVnA%_Rru!Q!l7*cm}TA
z>;U<N4Iul(HIRDvEb#I<2E2U|K}^Jc;OTPg)lVjm*?Z>s)3LEJ@c#XK@aokofXod#
zIy%6kM~~2X0kl2=+1c43H8mCB@p!OjXCMgjIn?p9=?m*dWeaNu0Lf)uKn~{v#C3N9
zAys!EsqG0Q^>zS$c_$zs=LkeJwgEmFd%!JW1BA6BvVS&xUiDpBSfgX;yaAb02pJun
z_B-;<|1IfDSsW=+buIxSCdUBZ(h#8Ha0UI2%wtp>ipIagxs9^JW%Rp%Rute?-f`|{
z<u?g^8ieyLr)g~|9#eC?I4Zy4ELC#VsS)87*&nbbe+~Rv(Ifmi`=EXP|NaL6fT3cr
zGZK)rk$IRf3<fYDo(bp&E&$!&{0<5KFMP17C)Y|#6?Vx;o$r>DJlm}xai&{I;#9Y?
zcwV=Pcux0Hk&GU7k+dES;ln*z!iT$;38!}JV3WIbu?M>Kg%Z0Bm&A7|%kH=SRjd*+
zMK6)Hr-tw|bS%*ox)1c1+<|MSTDX?I0ZjRe(6y)~-vxADw|dbTbX~iV>m)k2b6k)C
zaM<{lzn*_FNktTn``^i+CtVLr;94443!Cy^{#zMv*aXtA<}W6DjfBiMzm`E$y9vk^
zjsjKBmr#b1X=Tt8KJd%=i^!Id<i)$u`RIfU>MPpO`J&9_&p_2{dKq+tlYcpXVYzY=
zviAR42KAL>pjI<JXGLY0hKFS$slT4T(hZWNWIwuAo{&M!svBtDqkSvG-|(O%dg#~l
zSG`F>#`3RaP+k2N=sx@MR~e?@K~v-~`B&?ouqMo3ZG65xA%p(Pm%zA*ipro}_VF7Y
z^fYh%rA}&!ru};U%PL9e{>@i1tT(Fz=Z}Vi<<Cce;mRjK`}E+X40`%^(S4n-+r?7R
z^k2^(2lF?C>j7jB=}#HfuDk<YmRf_tqrt!wcMljEHcpm>uHij&ZGh}8O~{}op7G21
zix^dr(DlMsGOSyD50EO?p)$B>Ujasjk0<Mcp7DdpwZnuAYGPTxp8pC0NqW_v>xn;Q
zSikW;x~4#6*rZbeR^eb@*z^gN0k@(N=3g}_gMlCcC`q39<@ztO66O#0zND@HBZH0e
z1JKi8hsxlpTZYPTIejNu9}LVN!?i~>DuX^;+aTkGqGbNB=f8?bl6Hjaov&orxVaI$
zd*q19;AU735E+pAfXHBK_5c{ceGOf>?=UfDDM%Ikdj4x+{>c8{S2Aqe_89axxu7!a
zb~^(y!VXT>2T$AuxbAxL&3GXzb?(>mx2Yz{c#op{hZ8dFKXw^iGfl`aQ5NkL>w%fl
z{crkeWZaaIzWD3;+r#|f{^f)WGEO6)w<8b?zxMb>hSzr;z}|op-}I9c<EFIqrC-nA
zxrQVY3fFUA$zbf?4O}7~0q2lL;1qBl*m>Ru%gj0_`-h2sa$>xYlqve<{6#m_k<j(t
zcQQ<r#n<iP>ptph86;$ie>s2GlxJ@;YpLMK%@GigPXhsYG_bc|2qd5D1u<D~fqOLE
zg9&*Jd?TI!zwkT2$+I39TQ&d#lWMSfbrEo}y#!XRJpB&yi=WIJU4zIP@y(kza7qo(
zJ!E7bxw*L+Jbd^Nw6wH<s;VkbQc?oWpFa<dA3qKvBO^g#Vj}SH@BoSNaR9#~_0unA
zkIA_DvKPshLZP4m$#-yY5YT8e(A3lf?%ur%u3x{7=6~|!NsyVD37{(iIC}IbaB^}2
z`-8Uwd|>kMujVhIkFODjYguIfTXlH=P%-fbGWxziLfZ=lPav=F4P^DafrzRb5L9#q
zLP{<`Ol=duDmnokNn5}#wGoJFhyL{b)c11osss^)SL6atal6TNF4ia$%$IVRyk25(
z7%Y_8Jb5jscMxzX_)K0SX?&mV&t4<%imW&Z=8HQ_riV2-4i-qeO<oHbrh$cWo|D&t
zxD>ER!FTfd|K<Ee3}PE`fe(S~`fEUH%@w$24+VODcYxf+>*Lp&yMc~(4N$PJK(7U~
zV}Pc|O`z;pg<db#*@tk^@Uwh>|D2w0WrL_eIKb)#1EFO>KoII)1k|?!KD7YAqwEhB
zDf&(sxa7COa&iScszDXsr~9+l%VRoptmArWEMmK=%pytGjKkY6>TPd2t>yDHOJ&oe
zR2kcQ@iMk|e;6dJ%TuvN87HxNM^t|{zu)m3(!bC#n8@D|ki3z73Pe}r3d7_+g*XPo
zHFrF~+y8$4A7emLA-_mjq?WEKTt`<EuBNMF33N@Nn{+Lq8+7d@*XcTf*XVkJSLryx
zBD%riLb{Q_8M?8+Df)8$6Z92)dGr;$IdpRvEO?I7t#~r&R@}$v*4%0IHQa~k>lUTb
z*K!@8YfHpknkiaj#j8G#@437Hn%Jl4-VdTH*IUwn?*AAF-h%pz8ejs~8Y}p(Lfzr`
zJ`kecv*aD$3$lhfK19!l*f}7&zKvXY=$??n!Ytsl;25yrO+@W8W&(qZIB^Wo9sE6p
zI=Du>j_%*Afcseg6vIm1{bMsBJCdf9M9r8ov@e(vgGd9=RlSYsz)bkZ_n`hM1~cBI
z8Ixa9qHYYC|4)TMC8ifhUmOK0TifA!{TkFi|8oqcya#7YehJB2V+vxg(S5fcVNg2p
z5y%xoJr;t&@6|71Sk9L^WAckh-WfymTT@|BJu@<{*ZwasEayKwWAckiHH;zqj#FV+
zS~vn!s>Z&>0QI;3q%IlpADJ=vMWpYIA^P#DFlb&KL3P=G!SE02l953A%*ii*e@s$p
z0JS6d5eDt+RCLb`v0eC83<mr&D8JH!F?8Q{3Jf}xqo}SQ*+>3W3^;+KGseHDDwJR4
z&wbw?V9>Am4D_1le~UrQz2$Gm2YrEznUi1R;TUSeF$D(q<9C5UI~~QKbK@h>D*f=6
za*$7_pnJ)PoyU*H2ff8vGbg_`lppRnPlbV)y%_|bEJZQsUw#jaRPO@ql5a669e+Q$
z7yTm)x{Hs`ocwx?W2h~{6c}nwc!1_Bt3cR^VqkD}2=1BIK@1H*^X8|?a!@`o1m(Xm
zB?cYAoSBo~0LpLtr=89ZFw~v#ME87~iy(%$bHI4XZ4`sfdCFwJq;_Wb&wcP8W6%-I
zo;mrAAB~}UgDEiFI_HDh(jfcRHx79M6R1-~Fd%gavDZTSC5?-S{1bcmf5o7^<iw20
zFJ}69Ov>`ZxE<3EFx)Bh1!Tf{6vNFlZ?JsHT@(XSmnQlp?c!n7&gq93pngVk$@!U+
zf92yb)JAFw3=PG8sQv=Ma5G~YSPu0R2nP4GJCpsAZrKM^mx0)7eT(4+z`^y;Qf%SO
z$-nB!7^?F?Y{`Cr;a+I~=)Pl%VyMdY2gX7VQ4H5pw}M?KE|2$1H$MVn!J6+dQ~_Ox
z6IsWpVK2{|{A-~6hz%K{xA_5v2RF8(c54U*;)wuY1Z~w23`kvSf&EhWi6UTFJ%YCB
z|6r&F+Ct+tZOB?w6?<jo<X``EOxgv?KLv(IgdM2<2eDbJ$=?o)#2%p-kh+AlX{28Y
zPrfkOFBvSkh3caayV!~Kw2H{pnUml4*%+#~ngYY)x**i%4$-64p4$nGq#lEnvJK$L
z6_?3=sqVN7+NKSK?f^BBmcOh;l|--2ocs>Y#$>$y)O-B^!?U{~V4%en#n5@z4cxx4
z9lW^VKG~)bo6hR2EwE1A2Pz_@AFksRMayPReitY|v~&CshRBrb;C;uq{%isRQVvL6
znrPEVzjQo&AC&v`lxrXbu^Tfdzx(qsROj{`21S=)@Zqfw_|W4ChB~*PI=~-ccwD?0
zXe+;(a{YkpYsiaL%$)olFUC+CO+;__9fp&|`Jk<7H)wtm4w@c@f#(gu;OVU$;7N5L
zs4fl%hZC~EQr&LUPW12AK(b<$Gbg`y)0j*+ZQRcE2N<U6m;P?f_x(B!*&~~&{VQ=l
zC_iE+JA)XIJ+c{-Kd@;`HWtc1gBXxKvYC=Uqw*cSuH_@BX&MGM9=``iD(T=z#TRho
z`WJAjatK_lc@2uHI>3eNZ6NW)TM(Jn1HzI>VAp|XASt~D95_?~;trI8Z9A@m^$z7=
z)w-*|YV~>G=9Ufow`GDL-%Q}^ejKVyX6AG6)d+oPXb8N0`*u?IjOa=b-7|9U-Me?7
zp`iiXzI_|KeEAZ<v(M1)Wo2ccxVRV~cFbqbo<;S*(b3T$BqRhRB_)9^Teg7seS1Md
zLIOyPP5?6_JqFXzK0-(2MRe5@x^v_^qO(TiM?T%%-IMYo_SZLV+yJGerKtR8&YS@S
z1qG=5d-m)B@H9e@o}Lc*cLM=iHiH8Y!%WJ5w`Jf9A|stnM=>Dw;%#kh-^h>Hkt5tc
zfBqa02n5uAd_w;G{Cw0F;MlQaAR{9KWMySd%J1jy29AX807(&vGgf~TjDjg@D?@;q
zML5t{wHvH-i3jG+acIz69|cs+p}n<P7*Jjj3iQ|F0d5T*=vnUuS}Vh#t(iZN(DDUh
z8a_Zy#}B9&_yHxT^Os-d4Fu)fz!KR_Kup06NNH@P%vAkZD7$5VOWqsssO+57qa*h2
zNI-P`yi3FXav!k?;L{xUshfBf`8!|29tdc~{^fZjkC~Jou|p7Ek@uH;1(xjtq88`=
za-UB<0*J3F{>y!Y1F3Ztf4Tp!{8N`6!p*<@kGGfKQGa-qy@%B|RRE)qCe#iDu^o|G
zeHko(ZB*I*GFToC{hE+_==~zVCAS60tUUqDBH^6*&-;?AuK;dn-yv?A3M^teChsHh
zJgPeo+m82B*MR>nMno@kR7iI>kX@4p__ZR(gC-uZi>w6#8asgehWu~tbBfsjJ{2FJ
zu<_h~?!))yOV~kdZa~@Y;<xuD9idH=<H!F_%BkNr4ZBB?wTK52%VU7JaTE|Wj07S$
zJizKjfF(M+fuQy-AfOor{f9#VuUZJ?Gx(<h^u+;-<bBXSm`5$RYibGpyBLc-uMgOy
z_I_M<@ZCr2xb9(#*iMQWo-|;x>t(P0j@EZN{x5now?2NY>i(cp!Kr~HYj>ypXM*$w
z0!hrgpnHkIp&lXqq>%qk%75Sf-(&!pk3qL4%;aA(2E&G2|ND1lc=(QQ#7@fqhA0>&
z?X=*HT6lT@68`=C%fSBx1JWudaT1EB?4;3<2mk&j$SLO7{U>DE!82*lpa}me${n*)
zkW05$hCxB@FdCHM-|>)YuOfHI4hc)qkZiY9dLkTv-w)Vnz@ROii2I+w@T+M^OI_(z
zhkN9R?}iriqd?BhSqAk2h#$$<wr7a{q0!=MXn#h4eu$M|g+K)`<1dANfR}(dZy`YZ
z5iNPoqdtk&+-Cvem$-&|+&6IpYKwLf*nVY?hWIHuEjS8X=BGh@$-X~+RsR3>J!O&S
zsLk3x=77Hf+Ob^$W_;tmkUztL4fN6c5eJU*56{@X$aMTDi?%^ML+d}|K%fdNhc<{S
zpbaA83pzCi=YFalI4(&4ZTOX-uPfr``Li4tB5eS*pM&_JFYNyW2M*9SbGmYxsdxo3
z60{j4{S*f}N)Ldp=51&j0_{VfAFc^f2Y!)*uiJwC!pz@>Umn^_j@wQCJqMb)O+e-x
z6-Zrx_J`Zr$Lqj9<pB1FU-yX<9M~>A{@d`&iFZMp#ja^NSnBy2$d^Ff4)lRWIq-e;
zYaDzxE+8Ci<jVbR_+_E5H{!Q89S2Lj;Tc8O$G+h}*`EY$bxQy1wy=Tg#BakdBk=~v
ziocnbgQb3NfpX=z{pZ*9;Fmf0sx7Qvbn>_1mxea4h@Ng*4g%hxKG#3uK;>84!k-+h
zgY%=A>ffhJS5gw%g-i5K%Ypj#KY;q}@iPE^#KDj1fhn9HO*=n;9IWQf|9$wS`%oX+
z={V5X*^AnU%>)P5zZ1V)Kai9jn3e<0kUp@iaokSsf1ZQ0zpwliA$H`viD@{{3>!fG
z{bzy$OP=3|Ulrn4`qS?DZ#dB0JqYxh=|9cEkNU)^`U4BzbHA<prPN{BBj;R9!+|EA
zGH&Dd4>-_T`S34u<sWfi0oTsc_0uyIFQpC7F4Xw*tdGCpVC$9=u;%XDZ#dA4>j7Fd
zqf?Fx8ZJ%aXOn!lUih8^Gw8!MQ~0J!S4x+Ho^>)E2l%bo;MPeOu)e-~k^=*1?{8r8
zXi5$=H#I~2*Qe#cjPEz%H-Px{#?O2CI}Y&Pd7$;`DwG48`Yx0MBX@YNB0T$JDh@O^
zxBh9%{`VZ1!abzv%4w$JrHrA^0dmgEG#o^3JBiwvA{^A8bOJVa;CagM{2^n+FB5Wr
z^J@Fc{6Nd26_$O)v>dE}XTi=CzUk7HGKKg}pxys897Ot^2Cr_cndG1@54Hs-c=iRf
zp+`7C+QRo^qc-FOIWu}X4iG=e>ExWLc&U}J?2+?Hr{N$f@HBen%-0-5*c^lS$NdNl
zH@E#|Y+UB^5<PQtIu4e@dGbu*n=W1HRS>(ypMD2_!$I`UGoXXG{u>VP8#Dj(qqu{%
zh41GFI)3e_9Y1pJ>fdo-4ExCG<eaH^={3XSXDv;`L3C&VYU}(p2a&eNA^wJO4xnEx
z;$QVO2f6{T;NCVo_Z<3^OvQl_Y##>DXJDrAO_#3p`VT;Q?Z;_3h}nG>ysqE)4F{2S
z*{BZ$!hyF<Ay{{}=Nk_6w<Gwgr{utJF%k7`$H8;qr;~H0;-zgNe#B>D8V>g0&!gvG
zea%6nLoP6Zei4W-ON31p92XpcO?~Gi2e_Rih<(Bz<lB0n5ARRtSoD_E|33T<u<Y$1
z{%JVa6LTKCec<p72a(RXzzF(>ARHiVVSH@-4+n<99q8EjJqP;GH{)wP6XG8;Q{_8d
zy3#HXKXTUCG#te4y@2|ke9b|W+X-MK+=z03x6hdz8|zPub6^zKF*!e&;6M+K7vJmJ
zbcF8xKKz?t*}Fpg({Qji;R5J==KKu@(e5Y5{cs=$c!#`i<_9PT+wM-z55~`kyASnD
zP2hW7n>MUJ)0NXq#Y=lY?8td@({QkFe<6AX-PasMd!7PD67c*z=!<k@N6I&2BhnW3
zyC0aGALzh#q9Xe8hk7P0=!-Q|_@+x&W-G++`KRB{-*6C@atREyx_!gJg_M0DcIyd{
z7J3-8SK9w&ez4y?1sxl8;CUvBV&p0HOq$rozYo7Jb^NToX*kHrJ2~!q^Bo6Y_Xo(i
z^Iy*oB5ZQt*@VyG-ummm)i0<EKmC3910a6CKhGPSf&=6{_n|K6f7G%0r#WaV-w4d1
zzEDQu?X-LAOQG$-boF$m;$?P@j-Pcn1qaH`@4@>wzTo2<PxK7NpXDGiAOr5H_Wjh}
zx|+y~--ka0;t%@syvHAKAm{uMbiN7$pL)0c6bBu*oWZ`ZlR!%0=k}Em-Mb1rGjpcO
zce-?C!eQMHh4}x510%m4us5p=#AlU&xMNqrz9TTCUIBX#7J=Br%OEzc5bTL91peD^
z0Bw`5pW09STHlD+U`!|HOvTIKA@*I+?`;|mrkfv3w|{_~&pDNj1+l@HDSXqVD;ovz
zBR*%pkpsjAV>&r!Dqc3024rLY^t<~_93VCrGlg%ubY<fp{(bb{$^l}7F`b+<75}*F
z6L{G(3|e2m2hAOW;BosPD1Sx=<xgRF0>h&(fbeJt+-~dyw;!~F+J;t8RreeeSH1)%
zi+jNF3uKUfx)r2kKLN+`YQc&8>mWPtD#*yX4APEX072mwz~-%IfHVBP99#QL;OLYF
ze0)+sSZET6faf^JgeQZz-O0ZVKjLqP_}cyP#~-NQ;DqnsxXt&t|09`91|uUQ;PK<f
zlRl8h@46ws=Ysg+-Me>h(ig9&s0duVcoCdCcMc#vg@+Cu0x>Z$AS^5l1O)|wl#~?o
zoL+pyZgAkh0n{&Y-@bjn4L^c&!sigd{x$vy|49Tt@<BL2&LBp7Kqv4&d-e=Hj~MYo
zL;`{z!Tvq|h=>Sq<j4`!ClT=pb#-(A`=TQMufUIBLpbQ`>zl-noPXTf+KT#LPT)tL
zL+&GIAWz`0tE-zV`w9GrA1QJ+@<jRX-Mbg{D@FV=5uZ{7zl(!Ch}h-@l4GO6?=F7?
z7xF<kK>U4?_R!wm{zLquqob%lEmH0X50#abKg6GtlY{!BB4v)8QH_M}@$dHW1ev>n
zz|pwa-&X&1ECPW3##mtBupbS}T@C`*;N!q$XBHZqw`YP4-f6(V4#wN=2RNHVptn9A
zn8N4RZ%F~`HYbDCZU?|B=LDc{9SzT`-UXBl!+?T*2$0tc20ANu0RyXDKo9!4>Y0at
zWy^O0aaA86qOcW6DQ^REs$M`z-S)TPpNF+V{X7wWvafwuzyJQ<#&e+QkLUG$+K3D@
zHNH)kE|NF5av+ekt4DnW{~{ao=jD>!0^{$XerP|6N6zY&wXFv{(68-B@$4dNfXv1^
z=#RJOhw;A~KkriLcL?zz{?9*>pIgx%jYoX;eiXk@#vP64*NpyQJg1l~8ZW4O;D_=5
z;{Uz%|KIZexBmbCwf(ch{$FhQ5wL3SYaqMf8j!F$HyMOYkl#AAg1*amG+x2(#$+7w
zoQP>QU>9Buea5|k6?|XCh4@Xpn0X%H5ZeI#uI+)vo=&jT{q{HU;ww)<e{J|X55IBz
zV;5cpB+XL5#zTET#kC&D+t*A6DfoLP?ATRciFP=!J=_PDZfTf|L!OgfUj{ft*F*eU
z(D$``8o!B`-B1n|NH~J|@R<$C?|^Q=({JN9-h^W-{2h(oh+k0sKfl}Yqp|IO;~s~|
z`rkJH*#OTV(r`Knl%Xw);<}?iVQo5)vpxc3RviY?7KebOc?vuaAsPM_coO{m?*jm9
zxE~1N5`myz0$8jQ2avNx{%PQcXQS{g-38}e+tJ@G;a1*Bn{J*qQ}Ju}zkTeK@gCTv
z4FH>zUa&6d9k7mvzxN*71<!`)0Lynl8<yZU0Dpr6Ec1O1G`2nkYFi!wWw!@F-k|}V
z*C2i8KM67$YT&smML>9YHdqYjL;^bT6*GnJXVNtbf2FuQqC>|xf~;*2+@@t5+Nr)G
zv_s7(piR{v;JLD%f3u>2*9&<apGR_9-VbD!ZoMa^?Aj=yV1G~aSAyJz+u~9i%A{mg
wT#^?vI1Yb#<KNG}4E#C+<GUAM|Bs}FY-k{VBme#T{}mq4QS$3@9{>J-0O7AToB#j-

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/doom.png b/games/NXDoom/data/doom.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f6b37b1d80a722b4dd5189b4b730be48cf27dca
GIT binary patch
literal 4551
zcmV;&5jgINP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm0013_
z0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H15mZS;
zK~#90?Va0?B-dTXzvonS_jJ#6&+Odx5+@rwHntb+4KbD-C4dxJ!3!u^%Xlp!Tb7(i
zLA>xn1SUMhFNA*}hzB4-<^g0xVksfnjlqGCcw@9)j5j#D%+BoW?#%AY^z`&?`c`$$
zkB7Q+_jGmjWvb`YQ2mu!UAJ?px<0=;=lp)>)M;R>vBnx}tg*%#YplqLsXRFm*!ruV
z{iG?`;}Q~rG~yshAPG|vfu!V&n2=IPNgO1FDT!-L5^)KVMD{+WF)0j598#K65}8tR
zjY&vJ(qz&Uf(TNIhG8D$Z)5~kHl-#^rdLcuZwS&1l6u1gH|qS#m;ZhF{e!%oj_Xr(
z;-7!*b0_9z;{TbLOr9V~5JG~a^^uYQAt9v%NrIFTQnc)I)-4mU_ft!H2@=hHB&nHR
zSRa56<abICDuzVOl&BigUKXgDgsLe3;Jw-S)Kg#n;kE36T+kkI6(<FNnRM*?6Y0ql
z2YzD4z_`+auT2$Gp5CsP|6bMkl^H-Xojj%L+~L7*snifps5-Z<>cm`+Y5)9_tN7ke
zmyj(~R9%KrB{Yutl#X;vOR2gBWd?Bmoh7_>;lEX#J`}18iM3J#i<2>Bg_5!=;KDmg
zs!km`<!h!g15j21Z0_v3%b$K=5igzjWi;vyT)BK5rVw4zNdkVhRmR0z1$W!Yxhee7
zxhJ4$93Q;5jNMAj_uRJ%HJrbm1CiwkBy=5r_TrP6nV!PZ2dl_ti@xc1ss_IMzgbib
z>2CYeXCK48Cy!!nc^$WIZTY6J7y{>)a>!O1005)=&mFmx8346-VK034QDo+)0RRt{
zD%e@~zkwghB=A35yC~Kym;Osn{UYX$&jA1)I`t9Uxw`6`{zN)~m3$RfvsT;V3!l0V
z_uOkaB){-W_ac7j=RMPJ?Hc&E)g1u9BljG^Bd0$G0C?c^{g8!X+wb#|c^}~)u518M
z+bC651+?CwTFVn#ulhf|08ld|YAugVsa$oJ8-1iFBIIk$cu=8GaWBWH)_bN0fLzsZ
zmn*dfgdJZps`Z}mt@O?FGldqQtORJ)<#(50mMSnC4P3syiKU%t*JFu*<((=TqIs9!
z``{MlVgTnHS8r_K^4+rU`PPdKY?K@B`tte?mVbH$@u?*4-p=B!8#&+f`I^A>T+?$Y
zR}Cy(d>>P@Gbm<r_})?$LUy-;nj!H)HXNQ$C=7rkA%DjTgsl~8xU^mxIFHg+9srQr
zHHJ!GDU_{G%^WIyqf$q%VioC^@04JOgNZcmSL&*Ou|lD-0YqG51BkfB1`u(L4Ittg
z8$iT0Hh_q0Yyc70*Z?A~P#8dK?A#}U+E@Bv!s@am(NOWby@@DnV~)Bj6b5j+WOcw0
z0k@0&b;fw52Y{PHq+c&JAZ#nTRT@0~PTjz+-8pr4w*f=S9x1{jWv2T1lWB5pI%B~7
zGZQE_BsO*%JyLq>o^%2+&ahJG-5cno`BV(ENgda7HP;vh(NtW+htmnH6l$oMgBgIv
z7~WVdDPa)`1Bkj*8bBzjfU(p`S$FVL=U#*a;b<m?%!Icc#wRnFJbKa{y5)XLYTH)J
zZNMm5qjNykhsb`R#CeH?F~nw%1A5$gfrJP`2<ycWYQB78HtML{UT%LWrR7BwDI|oH
z(9_e<XBHr(Xgkh1##yec-9)2Yf)oTzkAZ7(Xe<t{#Zciow!txxOaZH}kNlo{Nm&&@
z<X`?b8V!`oWyIrgWV2ZpQY%<z`Pi{zn46nxOD}|gVHob`=FOW(r_<Qn+(f-zZ%f~r
zCtwXMF$@EyX|{bk%ZxE_&S9D+QmK^ZH96ncu3bYmn}ul#BqlP5PfR18m_}k^8u5t?
z;)y9t@Z0$6D}OMq0vt6O4P>)fNGUNjHPr!k5D^j9*4D7Qy9-^{vADPhT_3*Si^XC{
zr_%s{QmKSeY4E`#jyNME*iAtCk6;?5LT3PmVIY@lj@Si&bUKas`T2qKA|l+nbqnQk
z^9DOcplRB``Nd)}OioU=Z7UXwC=?1^Qgj#Rz+_?@9NmY%9fU$<0ABDNrPFCFEG+b$
z7ZG7~b=C6;)ie$B^Ya54fu?Dgn3(X~m(S;s&*%Hji*ttAOdUEmdLKMug~k9((?mX>
z_k`~#lgVIlaj|D!M1<w#WfY6u$M<WRh9gIg^koE`b0iW8-(zyQ9Cmhgdgi5R9LE=8
zi0R=77KOq9Ow&Z6Q1FHCD3i(H=+UEH_Y)DWU%%d0vCKI~CX)f@-ERY946#_OXI=oX
zy}ga??d`7nHBG~ZKXe4~cz8m^$_>CYO%#j8zTi8Wo}R|BW5+tS6A@NcRtBn*HBH0R
z)Kpg^7__ahwY7z8w)0hgUDt5`$3BAOM1RI~P*Q3DLI{-0<$>Tknwgow@#Dwc^<m&U
z;+!LuN`bY!p+Q7#>w{=>a}%4Jo9?=%X*hN26jCYgHiSwk3j_%vu)DiE6nsZBGc#^L
zXLWVex6bb+&N-6FB&yY_>&Nd$ckkYX5CWWYJpAy(NG6l}&T|w}W&rZ-zeG|`K#FE`
z&xzoHtaVl|Ll)NT?Qo-fAOQ9(FBt-A$vN;u25Gx5nFO^(@|-DRrY_zF8iqYxj593_
zL7H~p#uPAl45jG>m=gAsGUQH8)0$VTR6rt^v!i|lDTJGsBs<Ta5lXXjFxJ+rAQRWY
zpn(_%=Q_YNFldlWT|umFf{34d102kSNfI_xYFj62-M9BxYdL0rK-94hUDk>A?jv`7
zzIC7Hv3vKC=dmOKY;0M-0SrXUwqItiTgwVx4p!F&AWxv=3D^%lTG9pqpZws<0pZ&v
zmmhrVqfYAH4Rktf4ikLZyBrLBQaFN0odHODB-I#xG)n-I&O+4TGmt_PP}lq%Kl#mN
zg>!@`Yy%KLYz*JtuSyE1h#5cmt;eg9+BSf77a|WonpJ?bzV-`WFdc9G#>=?$_-~?=
znzaK*WJeasnR^^W?b~3FE41>lmYHcHozLO;+I2koUq8m9@BRp}Mt$V)Rh9tCOt1dR
zL&S;g`^o?IbFbh>zxuoli28z09`IYYJ9*7)Z{Ty^`YSy7_Jt9`XE2HI(8}d#jR_2*
z*ssS^_>WINHxl?H3AyP7eDkG0#^3(#AHrn%NZ?CSTLma~1F^3<zce`uB0duM&25Aq
zf9edr`RrF9B^wF+Xc|BO4Zhi}b!2jPM+)D`>z!Zw3@&`)ETjW9K={#g0|RL7Ga+&A
z?_LEn%#p%(w*TOn=W&OQLlO@Zek4nPpj^ENue^;H{^n1>40ELLL4^Fw4Bq|tC$ZI-
zg9Hx@ek2VbNI(DMm)^vSfBjX!eobo>@U8v8wMR~)N=eHIT-f`AuhI<+M<j3`@L~J?
zr!T#USgkrz_#_D%Cr*F>RAmBLW7aMS_6I+b-N9}oFaY@NM&u7azFWrer4<mY{X28>
z*jZTU3qDCgIg_!D0Z@?%NMi=Gx-}4WSokVS0JV`o>kb40zZH_-lfSTf8|VJ~>vjSw
z?VXb!#kYR%_mNv%^o0*1m|U~r0t|$jjAPrF#*vscAa!u~45ZKmly?UQ8QUk(U$Nf`
zp9na%asy|-@fUzSNVFS#Ymh0q@Ey=qieuZzba)5-!H=jH5H$Q|osNOvJIlvbZeV(2
z(-*$8y%j#$%QYEC&YW_+gF)b{Yy*VQ4IB=BGp^91!6&E#zO$U($@heRX6ySM@Ie4E
zLX~3JF{dC}y@NjBN7D-k8a|=#*1i{f5Uk?e2ma?b-oVRGo%e+AK&(m~d2`Y#3HpQ|
z(JCNl_?@6Vw{?N<K=6bAr8DO(BkKa+$-YK9@<y^5EP_A$NE*N>26Ob~=L>kkC$Qe|
zoj<4sy27`2p#~iVk%V+%cZW|3>j1S?K!EUF1LzUt0mvIZ?Ca<O-)`Oc!grQylA~Zw
zfWUp>N3sM696q5Z{AND^I^bhZ6+i@>^@1;`FZfn<!%!y;1rfK5z^4aMl|s`7*e`rH
zU0>ndPWS}4FMm4lzvuxUvVZu*00N;-90fDpa?WvIK=APUc=G+=J28Tu@THZiU-;HG
zh6ZsIWXvuJ+OI)IF%A$s{Jo7pFZfO*uM@uY-3NTfRkVLbKk%L78d5`1=xyGC)1#<L
z;dnPN0QheGtapd+KD_`s-~)J;zJt%4x#kNWf`)=`K_)bafuxQU7cC`$x=KJ@6%gQ)
z?~L2;w@cRxJ_F(L2YbVZJ)7t-@EyZz5Kt1D<s!QK)kt|25EOjt(;Gh7CC^^?R%z55
zK1tdad;)=p!61%Z$=x`CDuv+1kYM0jfP2Ar0CmDAFl!o@9`M_}fZ^af#l8U!l0clP
zn<GT&1QCwk9t8ZoUVtZjvgi3hCw#Il$REDlkp%1?KA7bS8UTdCf>_~*AnOJO1s~Eb
z0es-Q-|+6z?G3-Btq}lx*vA@?bOYU|76%63uRq`M1O4IKp8(+l49wY}Kx*B<0O7X+
z^n?Fc`LZW`VgzSAfggMl6exTUDV-)R9ByC$@LlLW@Xv0%f#*K)mN$IoqI}^?INib4
z;roYAjJu6W6;kg81_j^k(d!QXi@o~u`+)EKv0-rVNvQ#-bpwNhPu=_TpV|60UOsaH
z5Y15VUif^1keKZQz6csVvvX3T(6#{vh7Wkc|DDZ$!b?xT*^KZJJmH^uwT{Gs=mFnu
zCm=xh1nZ9z6-k{N7&Lt6=C;6pe(QC-@bp`I!n@w^(+~6mpR98uK=@!FC%B+M%Bz5&
z;I|IxA_C5B{-X!{CO}{a_--UHNcaSmO)=#L5Ey(y8~hia{?{%YJ63T!9DE6DX6NAG
zJL3aXN$vaqLBhAc{oz}g3=f~&&Y+;+TmLj3!A4-<@WJqf!s~eE>5INyx>}rY>TAQp
zx2o%4;YW5rNRaRez}a7a+iK+b^y*E1v>#Wm8+?LM<iW#N=mmtJ3J3;15ktTI`NP78
zAgo`U3=}>wYmzHfQXC2n4!-3Dj28aZdlR_vFPZ;0@ByV&00FYIJ9t0y@Hu||sNlc<
z+5)5u8a`9n22kD?5EOg@vt#)qgfB(`pF^b|7@AOU5HoOE@No#?N3aA48a@Gs^T{U$
zl?Ac-Dj+EMV22bwQ`i%r+6@d4K7k!t`082!A($pEDEN|K!^a_m&y-q#+P8xPgm1+G
z4%?G&=c%p@sJ1U4Q20(8!0`eO3w*%ZuSn{=fPmpQy^6yJKbq6T1q|OR0WdQ7(uKWG
z_~Zp&T_ZqY2@ouNrwSMqe2aSk@L4DP=vDy%!Y2S^h8RBl;773v2pT@IaKrZ~_8s_<
z91<2ZeAf#I8~iSHek**6YzYt`d;-D=->2AbYriOxy4FX)@CgjkIGpe!X#hdPCt|29
z^Fs+=MzakNEPMj6{`v%rJZpo$aVZ%x_^boI$`U|bDA;Wn1p}YJP~X&X_3JZ8{z?OS
zQlfApj?MQ|_VHnX@AW&?NudD%{x@YX_|EZWnWON-6pE6=l+J{VVTNyCpCW~-FJQm$
zn++<$BqMM}hXB5vUXeo67Z4PD0^rQOJIN(<i?wymkiw6y7ce6D&3cs~$p{(?H++?C
z0Of(8QNeeP2Y@6aaE8#rk7x-ndic$o%a8(rvHiiP5y6jS8=yeqK;X9?Kf&xDJS2R#
z!4@$5I;$P%y>FE=1Gp2fZyh9jr<hHEgNFz{0jQ^THV^dXw@8@*lrr?>ind!jDEO`J
zR-6Hhg#&&mxm9KJ<tGmE-nU9!<zwr$$L{+r-Ozs9l*|oEwZAA~-KeIxwV(DL+d1K)
zw9|X$D>($LDLS3)44n2JM=k4`eOBonz&l>*XdT_t+~*ihGgHR6$zsNLzH;T#cQMvj
lV~sV|SYwSf)>sFr{{x~w9vdc(ZGHd%002ovPDHLkV1m}tje-CG

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/heretic.ico b/games/NXDoom/data/heretic.ico
new file mode 100644
index 0000000000000000000000000000000000000000..90ddf8582bcb7e4c222b130d63d23a1117105256
GIT binary patch
literal 44563
zcmeHw2|U!__xGT(M=7F2$-ZVC>x^~AzVCa;mYs?idqkF^R1}fYN~;zz(Y_MVA~O>0
z8EKg^&3*1?#8<xc&9C3%>G?m;*Xwo7+|P3FIq$ojd+s@BP$(wUEEMv`gc3y=OQKLK
z;dfr%(R|Ph6zU+nwqU_%KARnd;*&$6L`6sQHSoDoH55uo>04eLg)%fjp|IG|yp#b7
z^(qvF+F)aa<K__JfJJkg;*IQ(yGUX~s`iMkfpto9nHuRktbO=qr|Y3*T}kCl_V*rt
z`uI2yy)etr?nxw`y*TWCC7<h2LAOowuN+G!T5lLGM5pjwQMBciOerc^wz>k9%48Vz
zMDDgZS@aa@(b4&={3{-8mXqCVYP(cCr-Ms#Wc9P#JI|5c9_gnI+c-YH_v%e`!v1x)
zdA6N-e6lR&r9*O)R-9Aau_^yu-`#P7Ps#G@jS_DK+C3gEK<Rkbe1+qPmaJJ$kht51
z3S*T1iJ-FQ>l!?B*`)M0-&vZ?mKK!9CNyV;QKjw>K|bofnQHc3H=`wUbFvK_=B}Q5
z#9*0G2Jf6|<51Br2VX6@GQ_cTZf8rUzSPp)TWy-9@~$|iN=b5^<YTiE-Mx@4zw;sc
ziPLU<8I@%=p_05F@(-CL*^Cyia{PJ+JaX<z=4@?mTpxVRg@yVMGxFRT6W4px`qq|b
zTbE|2nWg8G^Rf-FoEJyL%(Gps2XVZ@!hA{hhBWj1Qm+c5mb&%T+4)|1B>o_OJ-T~Y
zg9)vT(1tCWJxBl5(+0FvTad6O-<6J8%-pG+)TLDY_Zn;$y3RH#wx)@2H0Fa1yfcLK
zA8T=?TPMET!rG+r=GC_KWx<j@LSMdMz<ouXPu-t^dXrL<>YEc51{|4H8yoK7Wah=+
z)&Dx6nE3ql9Sd#w_QI&99Po8RNe{TW?)KNscKNQ=A~Vgl$6ZS@mwGZRn>={tIDAgJ
zXlv9gif3Ra{kVH%-nsCDJ$J7*7fE(Bm9Ey3knh8~xOpZ<Jq+G<VAYa}gAF!%I&V}h
z+%h34cV)Ji4<CMXf{o{t>~ouX2j;t8><f}M$UM8dCFO3_T%{w4p|vwMzU+tDJ+iEA
zA5JgalA`K3H|L1AQFm*r7dzg=Rw~M^z&*f6ls9Mz?-I6Z_<o4+V0(sJWe!%@v6w&i
zjn(ta=oJsUl!FBWQTcsFZ~U2)-+ke3eE-F==ghec&obMscHEoMFXbY0_Rvj%_*FeK
zv0|5pe7a|{Eb2(4w+}Wp%SMp4ueLk1cbR<MtIXF4OSJDXKXcA$x4P@#?;(sLCVxKf
zEKhTadlS#JX7%}CNk19o+o(p`Kv?6KH;>w_*5BJ0OyYcSWc_8wO+taF<d2tc1xsEC
zF^MC)vY<bnUA-psp=sR?+xXq;w^17p&gib~IQuqcKJ6w?Q$b+4j`2ymzFRjw-Pb<E
z&6^My?|W6dK*r<ofkpAJdAzh*3J8?*H|OVepFV%#gLZ*QzIQH#+}gMB(?|B$!6?O0
zPGkB79EP~P$b8k{BFf?Vx8zrCSFXQa#}pC1s4gn<{ke}MTB}MT<*p_T8`J+%SN+s%
zTt23CN2#`B&qMU{ha5tS2bbFm2bA@FeX4Ts$;_RlG{T2KO!JH3eJ@FdisXl(5q-i=
zDjP;PHBM1!C*O(}HVxkur$6-myx8GxgtyPv$B$O^G?bgtczARPUqjdI&)k`+cV6d;
zBIv%d&0Vgm-tp7yGxUe<&m&{e%<_p}Zp9s0wVL${iPphGc|Ef0P;!@B%<u=<Md5D(
zHnWo4NYCm?39V7(b~$&t@2ljn_jxg${kjo!W+|v&;3042C`<ZiurjLYeFwYM)^h@9
z2~SzQgNQs8<eQfyrHYRQS8AQKdD3Eic=cnjp`6+yL1h{!5kL=Jd|>fJ5uGE_6no$m
zU4Rs`Igr#<M#}G_P-CnE=VFMgw-ttNZiv2;WU@)*h7QYfyPNCi*NTMeOPu*ta^0oT
z^{QP_q-vEL^PZUt-?qIeUsAwvHbS>irz?*1!d_Om{*Gc`39IbzO#a;PD@lr8I);*5
z&-e$TlovHdHJUHphIYD+W~s<!di`cK0rN?ws*7pQNl$LA2+X0~=Nfj**z)>eO}&hM
zSJJ)o+qGKyYUgw)2E9tpX&lEM^m}3`NwM1=mkGOjzD-S~Eet|=zQ5dmuH&P-1=gqU
z%j26*PB+9~eSH45Qs(Zr3%YK95epH#r@wYLWy_;So}awqM^=`yXX+CN4u81$j%*#F
z^U{suT=cr4^LZcNhk4w1yZF%Hx`y*ng|2JkOQH^=9zV_6v8M5h{B6&K&6y_y(stY#
zI2<>7@tb3w3&YBYsUpz<!-a~Zhi~J%)7K1=os+D}FqzT9AJtFA$HwerQM|Zt_gn?u
zUb<JFq6g`vEA#yaha>wzQf^F%f>OQ9-c!j}FP~iJAfxv2eA_OfyJLCR;NbA(gu&|#
zrKHn0U*tY>O<2XvuIj!<<k$##j`m4WL6T~5i0{=8hh@A^9}VyiOV)5@!JD!!SwlM8
zbK(|HrghSX&Wm^J;+`?Nuh|j0AKdBBN*w8ZZt45=s`jBs*sClb9SL)$mPdqJEF&CN
zd*vK{oKStHexNq_&Fqmz;kqp+U(2R!*>d67ET4dYx<gDZu7Yx*C?}^`H-x7DGOzg>
zS5>)ft@G}l?>xWFMd<8BKC2+*9xs*hNBbMDh=rn#E`GhnD=F}N!M#<-TaO6Xys2A}
z&nv%j`6iv`(T6|rNb-S%lC`TFQp^e;U&lIeyRu||*m;;kV@;{^8+KzVE$_{Si;B$U
z=Ncb7&5r-jvshb9!QyUhV{~9a%hofW)`T+EcHdeV&{OrEOng=<fAAw4<w{q*<lLqW
z%Hf(Pnuc}-u%DG%ZXY=>xtFGFt#Ie)v&@Es<N{V!x>5U@A*1a)WnLA}r4%9@sRIe0
zKD@rNyMObItlNq)(Yr5R-hIdU?d!<r)^A@NoR=8UkX9=Y<mHVaUk+C{uM)0KtD<^$
z-Ev#pU6Y&H1Cc*vp^6&e_=gtQcwlG-^`or!)`We^)sfEzqH@HG`zmJLoP9-}d|Clz
zTH&^berCvd&3%av$tbf5m+a<{uuta6_uQ)D=6Su-;A;7@=CIoC*==sEm2)<<@2P6c
zuZ+_zixt|Oe74aW$_?a^#aXOb`>APrsV6$Kx1Kt24^-cEk>lU4SR$=hJZHl@lQow1
zujpvYYbRL>7KcZJp7SOiyG^87ugLeFHC|Mo{p$9m<Xm((d;iu*M<$%~BBrhl`K6@-
zgcn8Ns+0sryA^TI2f9GA&r>C%jJ!PV>;1|{UL8Ag#uW@5n0@8cmsNdNguk*#&CAsp
z>5jo&K73Mwt3`r%mvr!+Onvy{C$AsacZ8@d)=ONlvu4G*m@=uI`7BWh?XA+1GV`?d
zhh^Grs@}3Ce<*IGJGi_Ledy33qtD{aPoAv6@l}djo<HSy(6QTYPIX*I;DdWo{ZIG@
zUILEHcn^)wdZhbX7xmq?k31+f_)e9u*?vpX%mp?}n_IGYh8k)fy=-n~F3|nBz|0a{
z=pE6kk04$CRCU|@;K74sI`PpDuQ3zjJe{1KZOwKUuZV~!NKa31W4Vo;y$(&EPi%O5
zxf3<3FuM*inT2VCCGE4?x#Ix)41MBZ_xhI<NjF#5-isUf?9ByKTgp3c-@e^pNpxhL
z*FQ_5nWq!=#Yuz8Cod-#`Q`nK{oAm-GrCVlRfRs>8_b;FS9jt>hnn}P`uYctN^iQP
zJIycS7{0A*ktuSB>3ww-*;<vGkCIgWs;gFH`>Fo^07#+aR)y?cwDV-^6X(z0qSImj
zb&3s@+p6wcDJH+tx)YUOm`!=!R&}Z}PD5TnA$s8E_6^%o21h*3t$u@tWXQ`OJ$6j_
zW32xBr-~&vlAg6x;R+<2=5CW+FITc=xiFz_R;&He=FUzh5=C-H20OL!&b@=qBkM73
z%Pd4wNl~*#;={ti@*d9^FmHZnH<L4YSt!bL+0s=J5j<SUm6t9V-`=IG&5zK$rYAnj
z?XY^s=iJ;}IYq_5T?*Oc^73+#muHLacD{Z4*5$6#F8eYM&N_;QKX*mCQO3@lJ9qb5
ztIp=5=oH90AK{`s9V|XoU0r?i?#znfN(Y&|*z=|;uWsMA+8gZdA{F_iIMnM-y%>Dg
z*!4nrP;l^um}j>GRxl$OU*FVAmo8Z}UuUKpxt0>27;K2y_e`E9?9VM)eW=&^#EBCZ
z`wB36a~JJ;7WMgE|L)wcj~x_BTwPoiNOM)s%QRThzS-*Tqv+7k&^?h``JZVfhi?~r
zzE7>_*eqUiqx+8^i?gL2&A{ZaZ{(yK^+#`yKBLodrY{B4RwGf@&_J{ouyUoYyDEfg
z;|Yt1h*(9D6uLZP^9pbpHYWyyDP})C<Wm!6YP6O@zCe_K+lGtl$_d@g$r&3pP;-2f
zlapV=9_8gVK>IwLw4GRU@@slXczFKj&z~C$${n&K=k(IQj_4%3uc__p>U4_#_@rHB
zxt?EVzzHS`A-d6x8#i=@F7oLnR}{fU>+W6@6BEOicU(kV0`}eq!>3Q4R8#Ow=xiqK
z+o*<`(@Q4%JfTRw3}9|g!`SY3fH22(mn_cF4&K1_>FwiJA<Pg19Y7mqS%Xz}H5uqQ
z0ns~ltT~fYU<d3En1g#8eI4carTKHi9u-~F+$%n(_wD0zdGWJX96oX+`o&#wPLQG;
zZooUImqICwwBzg%-hFXKXIIw{>>s40HE`(2@aJZ;>GO63F5WRyT%xep2zK%Kf$f2-
zjwZ7SmiToY@hpOzpQ>E->ZZzvrnz75g<S~=IVsfG^<1U(sE^z&kv)BSHdcNH%E3AN
z+TX9pdvTmsAK&=ui>h0y$lMvekLG#i?Qb%OU0~UDud#Odt&(gqzvsY!8QM&3uK?eU
zC%JnU=ib?%%zd~jakEtKhv4g-gAwF=4O{o$5^B#9w_jJiPdD`J>^ZSIm+n7&C?mO8
zdrtoj-YeV&szcco*vdOKr(;Dqs>^}|mp(~0OC>hZoiP#f_%3fj(OdTEWy)MEk(ZV$
zx-*oVcjv?cW4|m_eAtr)`r*YZIq1u1^Ju~?B`4OL*duxJxHQdSsn&YZ;D@~}cU~qG
zT)$)0RXV%r#)r3h3B+3mU)}05*E)9M&T6IJ*o611iX$bY`@FV2Bpl+WcQ=!U5=?RG
zDB5}`l%eEkkB@XkQY}v~4|5TlBYGoDtv^-eH*HiwaVBTII!RfBzRm^r6#N9v<QuiS
zTWkle>af&N+^Odl1yph`fH&x~d)=v}cf&VtR7t@jk4aK*#h_TYk;3XJlFF^9I!a*t
zd0c;BK3SuU`6ev5DYL0xOKWFD4$R2W`00DW#!L||)s&Tm$V(comj$s)IYA+02yDBc
z80HSiQALejAT=k;`Ij-dP_r6(VyXOeKe4`1vh^C}qpSQY;2qYp@XnP*1eVVl5oSu8
z)-Js$m?4rO;N3&cY@%l0Yj->$rCO1>x5*A1dHC@KddK@SjkRlIkKfb)WYtIY1M9p7
z-xWFT`rKy8uh?N@ypzLO?MZmf@fabuJNv`t-Cq}%`dCqZ&f`?q43Z9~(rr}A_6+YC
zUSBq>OQc?TYm7RH?U-{!jA-7d%^c``zwhX?PoKLb6_1_sdcF2M=QABI+C}-uY62m)
z?10E2KNd%3j?B5HN!B3jHDBrz`^BNw33XDh>AlA?lTG}4WQiM_Ydv~LFlTpZ(q2#^
zdvz5fR-f;Y^nMtU)+FDczl$dPNt)lgr^Wp66`$VnBd`TrGemrRmt1^f^Yk_c-Je8r
zYyFV$%qjh7bM4GMQq*dpT_QIZ(Ig(GM9o6MFQ}1o3hq4Sewp5!I%nP9CY*nyF>r;W
zX;uSwN#vc~10!o2Nr^l{(#I&)_yIv8S95s=ctBda!|j%^2u)+)%$Lu6J8K0_f0hh=
z-LpevAx+=$C>_K9GM@ZdZ<l}zb)Qt94AaaF?o2B=2{Vo~oxhn3E`1uh`RO&~D~3>R
zAboQNJ#P*F>7i=1w~0xD?016??n56SAJk0zT2fB#`1B@bpyixgWBm?xn!e=_<<pJV
z$yG*mFZQV9?iduq?ti}d`sMu3r2Ck~RLj@A{$A{;m2>IK#I<?M8$O<Ce;py9yzX6X
z)0wMpoShSz%lF_;tmwNJpic6*`uf^ngyyQ`@J4R>GFcr`%W%t!mWah*mJpGvg@j+&
zallG~5=yK^d**%(rnYx2blPb_?wULQtG#CX(9S0QQtUoj#G-)SJ8rO>E+(_?c9ZsJ
zZrXYu^<0F&+niIxPID90ad@BBba)wTlWnj~bcl-BH?6m35SVB=+Pt)jdpFIb39-qX
z@Q4v(I{X?=9h<Q?Z2K}uMj}c_=JKu-p<k9IKBt7*QXK<DshQOIDQ&%7%v$+Cidyt^
z*{$?Tl{fr*HSREPlx2F#L`Vs7XZJx<PhxGN7R(@|)Kw~{dfQ~ozo$XlphLPc?4H2o
zMpY?^npMb3oq6Hl>Fq=jN9F^mWZbfZnLe@9lPP+uj?B>Epg(oNP=?Zo%@`9wDu>bt
zMT~qemt1wBb|&orB-x-tQk0Ln!Hh4x+4{BME|E0s(bnp6?0QOR5X)u36jg$|3MU5g
zcx?v3^1U9W^#k)4O3g|lom}t|Wf$KWt*F(#`wREnc|nx(&mAjxOR+NbrB=r&JPLhW
zqHS_5gQuGx^4(iS?xLiYpHJ_U(Ua&A+2{H4nYqlO)>MPsbQ6<wkx0c1JQLg9&+S7;
zPFyJOSiCl>;DU*%4;LjjUfpL8(@kZX6t%bf-0khpW}B?{=FCppV!q|*`!|EE1bLe;
zOUnCIc6<e=Q-ai#XqA;sjUsvea`SfXZI`39+&FDUbY1T~Lm{!tY9*y0#=*OZBKZtm
zV$dzn45f?N6y|bKwnxLK=h(d*_JIsD!Dg?7!z|<8mGgeA$;T{rhQ?A%``w`QbBUnH
z#{SZeRgPA570<HGk;-&xa7(^8><}IiU(ayQ#>i;h9%e~9wLSCU@TsGBnn|XY1&MMk
zip=#S7vH{+&-X8gc*L=jr1lP8Y^C5dMX3Zl?+kwW9Dg5i^6O?E(cP5HWS}bGO}IFM
zq4OU0Uq=19W5u8o6DfDchwfu_loO;m^z?-@Y3a`s9n+rhEh&aiwAl21y|CzlK<*0*
z5kb0tlSoiTp}~b)D8le-q7KV8Uux0&8M|86=&j2M)H}Apee3StCi(;8p07ItnkzQZ
z`_1(fY3+yet?7@-y`GZIj<$)~@-7~Em34@4LhF5zcNY;<*$s1FWurf}=FMO;xDeNV
zREdrDVZ#cpqWD_W2cF~X$znC9wUt^f0CJw@k;Jota2*T3MBhu(Z`E5x`^Y>J!Jm~b
z(wZfIrhGZ=+R;>z4tLh|sU!!u=3o`bS*Nurg@d$LwYN2v*c6z3B0L+6J<nRZWqrCg
zwyXPcW*$3T>S&HAn;+kTxdfIZBGEY|kyw!89OdG3nxpAiazcrD@|raj98LR@2^vKl
zO?#8FhAwRsq#Nn;rpS=b-X>BOUTumOPiY`38u7(HJ$$Mu%zMj*3+0OzQkUr0v<s3X
zX#=isvMdy!&e`9@{FI-7ec8Urau)rmJ()FwaMr4#pSHJQFt%7w`3~wTD-D~q{PX8D
zZ%%yNJJ^X>eXCZ~y?_r`KSr|zlrcS>NnmO))aaswGI?&FO>2`h<_&31c!iCC%P$ig
z3W^jlUI&N9Ue=le`!AGBDW_JvP=)gHup1LBS`<zPK~xQTVt$MJr7zpSQ}5nAD?e0+
z;9S-;p>cJBw?q%UddBwlbKw)#^wi$2%E&%7roA(hH-FL>J#E&jWyM3ibsScLMQvfB
zX2uE=$=39j38^E=F5#w<aykp^XomOld*3wKHLu&(I?L#DpPC2zto7b3RsmlqlD_K+
zs>?ULI<U9U4YPe2i#O9dCJeLwJ>j$WlV6I>&)L^J;Jgd{9yV)7b;li>eQMQBueoP7
z@fW(y?TPKRuDqv@U7#`Nl-I!x{5~G+DEM+p@^dcufK5Q}-KP5ky&@%=r){xa^U`b*
zmcIUS+dEMUn-j&HlQ!Zoqv<BMvb;;o`OE{&hlu5gt@^4ZDX+9Fmq@b+6VWU|793iS
zD7kF<j@&chP~4Jvh48wNFUg52|J6V1UP@NtyRLKm&T#!f*>bQ~x#cGm=(F^)vT%#u
zeci&tdm?Vej>iw_`6>%o4!nfR;Wc&PCJuCdd_?mGu7-DsL>}Hf-b~SK$sKco)O)R)
zxmogNSI=qkRX#GKHOezZ5U%^pPv?v7gHttn*A7>zIDNsaC27rJ?007fx-e&}zM`ay
zrY?Pd+`W3uT}p1PXjvGw>Z`$mkQ1GKp!e3cjjC{EC@*^zc-m}mS#MX0!?l^TwigHJ
zGCrHR5@%*78)&A8RPH4{S+Px!b|Jr|SA(OYN4jFo(wHbG)wh>;pPgfIY1>Y$ommzV
zz56&%^6>V7t5BYcX2C3-;mBIj*2^Q4v-3`|Ce`j}qmi@NYJo;CBZ2^j$VaKfhV{Gr
zmQmFzUgo9^FcI_xgO~;cvH4_yN+$hFb9z5%EK(<gZ6Y_C3mx9OYK~|MIaj=Sa9$*x
zFjI4X7Mxq>g}~u(E0Mm?g|$$Ux;sFJsANq~x^%f#L6|%F%g9+nYUuFuBsEo<P@!2P
zS)*<aGSP6*UWkxUu!DD$ZR+`4PdI2%*Vf&CQd&bxk2*tL_~|Dz!<Jg(-3P3~$%Dlj
z5>U$AcDbmD@WqG1X|VP=7kBcTQ|A3A=d!evN4|GsKhrmRX0qQRtX4#z070c3F5cM1
zIbT0eX2xED%g&B3vzzQftemw(@>9HRc+-ZTW$q>mFgcn(JDi!!j|@b1Ld9~?><f=R
zhn9HST?;Zb%-Z-uX<hBvm#|k#D5ubfit_zxD*n5ep0W{`nsZd<!3A4HOY8zq#bUJK
zg<A3OSvT2fZ9|5%vS_%5`Mjp=OHL7ME?_(RXl+Urxi<BP8mMH=^e)Dt9xhx&kgqtP
znO45_@p{-m+xj`0oT#Zab0f3gp7*_!x%YkSwT%S+H#G;~piObVAwZkOkK$5Ay&HOJ
zP0u(S!~CA9$z+ZbBypX>`<a*uo}H<^1v{A9D{iUNYQjIqHX!WuU-K5Jbr6O%84VAq
zXwlLtLeg7mO$%mjOQKrJ(bH3B6$W*d)2?-jzF>vZGqbO805c}V;T{prMD<%msFtgk
zP=?&1_S9GV0(qL)Z0uQDYJ-bWZbuSNXKEb`@u6m#2xG%xQ_h8B?yBKYOqhb!z4>b^
zhG=24l$OziYPe=&gce!%v(mR7x7Y-y%d8d2G1r)zU#3v_?g^`U4%bn{YG8)*w3=kV
zDSo=^7D!S03e0{#-q=gRYy^2*fhP%4Vnm*~=b2kEw2DaC{lnKdX{*iZ{AwF6@C-ez
z;6h<IOi_#G6XtbvU@2lR_)}gqdz0F)6p@HBs9`SD)%i5G=Q%38G&k%4nT1rQed-Hn
zZL(OIw_6)(ak{CJ$zS_yFA)L;LQ~>r6{=7(JLh7P`PNFrp{kk-m>mVV2-#++`1p4k
zRw}hzKHbGWAIeu-k+W*VQ<%uLB`D<-5#s*+P--H6csKks;*7M(HDsvG#IV`fvOpoJ
zMyrO4oE2nqN0gG@Y#L|0>wQtv;*JW+!qZwcskNxjX(D#AGd{34&Fb(~r*NjVD=&C1
zMcq`>(Hh%!e0K6Hf+5n=xCl%&v$f>6rBT^+WN6vsJ(tDavtY2hCC<ovEM>zi_{xFR
zBeTZp95~`lt$MK5L4uN=!{vjb&WSv*U+GOz^2z`&cF{lzOPfy_6S-?ib~!f<m2cgB
zf>&hi3|e;c{!Q9cM=d@sq<J)`OnYjBFW3z}{}6?$YAIipr}gnYE9PQu8XOsqc!<3H
z+=NX*Rw;VD1z%7XEmQniFf}!Hwbs-s=ahk0X^V)8r)2BqT<4=<y9JU{GPPdqOgWY+
zQeoqm)WTyscp>pZ#FJqXmgTB2E#-jb*A^Zd+wIMYtwCLbECi$81kDT*mIv;f-p#@o
z9Y%d^COw~tUr9+Puf3~5LxtOMT;rytsn^bKg#`%Gm}^euW6yWJw0Bg_6v;3UKjQqH
zg)n20VjyMVeP$FK_dR6RRNfP{U(%Yq*tadA@qUnfzL1U*Drnca5YeNJtld%?6iHI(
zSEQYmaZ?@;6>GjwdaB5*c5wP*Bd}ayO4&WDP@BrM|9z8LZOHcgbq>@ei%BF_+R|(2
z6rJXXo=~I|9CeP{%7HhtoA@hcxi<4eb@k|xaq}{Znfh4?DsT`kyAHdc!$>+@GQ}GY
z3&O)1r*=VoXE@X^5u3|71%pv%(nSh)yyPUv%g8YKvtgFzIisGlV}@k0bh7gaQgxpq
z6ah*oEOv2U(!7h_Hy_*=>rY)0(wW=%X}!o3J@`7wh{g>Ujb<KO6^|zKSnU@_h=Rld
z=6#irdA+%XI&iQ2>C(LIfhf%kkrXpv9((Y>^?8J4iyxOXb}LW}Pe}MQk|Vgg7eU$T
zOom9M8ndPloSQ-(H1q5^%M2?qm0^mR)%0@Pt1DjXZ?hFEQfCG?Ft;uw91h<2I3mY)
zEmdFW(ibr}EUwiF4kZ#J7Sm^KMZIIgT<l{)GZUDYZM58}sX^;~3&eWiNVywaZcKf_
z)}-9ZjBJ9MdG<5u$7W%KI9{K)h}NQ^Djh=hlD=HtI@qS(RT@CGpHHx~CJd9|>WqRN
zhppye8>I`!+-Z1oHX$gy=hZCC#W-FS&Sb4srv2IR^HY2(nV#|zmZ+!bZG9dt%vv~~
zCJHNf+>5JpN?HGorD;O|3gTHnF>FAyp6~6t>%p{5oK|STad#mBA18EOkk*N^u$kS<
z8X0<f6NQu9c^UTc%N{_N9AUw_RfSruCZXc*uj11K*`3vR4fVXisodVtFV#C^>kuk7
zLxkzd9a-AIJ(dN|%vZ%|AM8h5s=E$%G5K>Q`z!2!VqY?V-Peh?fy>{}=ZFfXR_fOd
zjhi~OqYfuEX!zmSZrFp!U*2bkq#Ec5;@^@r277t71)-ku(M=+VJqO=Q^nE<O-rJ!;
z%ceFTJ2#Hy6y+HX?mN7CaoFnhGuEVuRGJZ^h$5MfqeD1pylT#!_5B<KZIKlH>msz)
z1#`Q(3Cnh!uh%>}bZz5|CWGFD1ClgTMWRl#;w_Dy1%g4S&lw_iYBW!Bfecf-JyQTH
zCgs2jf822J{xB=YX!fRK!%W+DH#93=oS&#m#tE@R9b51Hymd~EVQ>Yx$eYUj9)Y&)
zb+e*yZ<aqkd<}KUTXys;s=m}(`F+N$8Z!qShB=ePyl-yWG)w6mMPp_=zw_<_@w2av
ze_F|f+4GQkj#wa7+~u-D+nM6G7j}*ZnN1@_m`&{u`D$m<za%F5rC@TrKV*p9jbYkT
z%u3x7HdD#yI0r_zS0KoN5|`@zVy$Q6av~3hWVXbt7n;H@mU1-B&8f498!uRUQw(3u
zuVA4SHh}soh5a(;btPwRTH9H1s{I{P6O=!9G2NU;!wHNm)PV=_658%tpN8iy=@UQu
zxZ`QXPPZ8^5A*WVJ&<);m^zaDu1nw<dc}sf2GwVzO4Vqs0jY(>OVGPqs4>eR0C!LH
zioCv7o){6nK2$MB<1m}*ENamjnpYB&N0a8`!=F_jQAz`6LcM|<@eYw<sPh0PKwYxF
zXy`&ghz0sCJN>zu5yaYn>mmuya#fN>+*CEhp{C|Ut(u$imIIU0UM)gA)Ka_Lp3(5E
zHf}pgKfB$k*g9K!9kuE$@p0dpL>u3AdhXOfXZVC$d>UrM!8Wcgu5z|{J65s?-I@FN
z+A(k8SE5?6%*QBqPHj{}#^AMv#5WWT)FKfYZ#{EtDQ8_ZpG^<BJ`S~Bs+J-qza>(Y
zoaL`aAG)9zyM5lW4;(f;Y9){hWYfC~qHl3pUxn7jx3+;|I4pA^n7XOs01>JbAzpad
z2uk|J<MdN4Jh##_FEe3IbTF}n4Y^Z?#r?REVd%j8d<LdcXh2DVYD@ldcMf4rW}o?y
zUX8X{P!Mit<{2tW*41Lp<0AwKMi!@uY>r~)r|ZCF_Noevd0xWJn+It_P{6w0Wyy-a
zVMBg;+M_vw+>pYcE34B~e}_49co-xrRNOyQ5qp&K%mS_rdmzWn-K(GFW5bQ59IkL;
zjI879Wx^<8Id{W@dhcu>t+_67Va~e4lnW0_Ur;WyB)<#p-&r9}Fplz8NmhKzT4qSK
zJc;!8I~2|~S>h#<b8%Odu1rc%EoUIGu!cI9cJG5nKW@#s%UroFc|kP2V0L68QvZNF
zk3vWCp7?ak0~Z3@ov(YzXU^)O0_`ZWGiNlPQFKO+Y~eVI_0z2DZi(16ADKs96*YaH
zr!Q?R9c$wz!O^tm<3XGJ`Lu!Fh&@bCMd(Im(q(Dp!wLLFshGi&U-{{Hs6B{E#XP8<
zhd#n*7|<(1Yuv_(SrCK@?iZ#n6Rn<ifLyq7#xV*HdsC{F&mpEo0@R{GGwJTl?WpEv
zj1q0uyNJC^@0pLC(UKRTXyiN0%NdeCN%?eI@i7@uFR7$drL59chKr}&X=B!-Q0F^R
z7&XhL>uAEe`it@$^)+s{^8$JY<Gn44w$F-`E2q6!W;`Di-WKdN+|x{Ymb4rPb%t}W
zi+QL;V)Mc;=u01^)R(R5Er9CVMWhwUpH468%4<1F`4r=Au{mm1WJB&(&nI?dw89>;
zg@11Z@ZSuz!|ZubCc9Kkl&-ma5UQFxt<6g7EwUjMYzOwATg67(KfI-{qByfjzIMjI
zC7$IL5D|~Ck=5_7=}?($HnBhNh;yY@MMyTcxG#|C<0ALA<TbsS;i%GUeM%~Fk)tBi
z7VoZMk$I$z$@Gohw=>1`)j;R%TZ3LP3LOJh1QD5c7<iyYcW#?e8As+?Pnv(rKI;?x
zRe58~V3!iC3q^eNNdq&SI$zqZ44CiMezt%$d2V&itT`vE0%y~1_=-2!#8Yy?r^AoH
z43=sWo~2#U7<%(1Z)tfskX_3msW#VgQ|Bzdr7wmKCl#PhIBPDBaw^$Y{mB(~&%3^v
zbk_b#K-!mCoA!F+Sd&9S9Ewk!c5A9hn9XLiv*?RyXqLtEow>TV3;MA(OS|vhYq>+{
zefKz-Yk~9Uz<??LZ3+FFJap7-gnhM+Jv5I)nHpOe9Wn4plY-x&y&W{u8#S(jA1D+w
z(5qt^O^p1ce{zNq0*YGx+ZD8ZOXak^OJ%jZN@X<McS@sO$|TXwr4nk++m{&n3ru=#
zJgcl1QfOmj2rLaSz)W8o7;CEm15IUs(NX|<Xj!1GAqgZk+zQ8EnDj*j6S~>n7!Qy#
z%-vN0&Q>0nSjhroYiWSd94$i%?Y?=^YvWl}{Z*Tta25b5!y-@(;N9f`&Q%8BT%<<n
zfMrObJ&ML(nDj;6Abhi%xeY+dFpt6j{7OZD^OFJi6_UV6Q<YJMtme<(M;k?M_Of*X
zNEsH%RsbKR1@Pf=0KZBSm}sdp%8=LaE}m5FcvcG^vw4NHJ3z`X&+`E$xn{s56Aet_
zr2$?`lTn5o+H1@B3zNQRo5pQk>FEQIGR$|b2D*150p^N5Fv-vaW;)u8B(LrFQ~q@=
z*K7{)TM3Xda7PP)J~0Cr)CU9O5=&r(!2%mY1E8oK@KgLT)(M-#gF^vQhFxhsu-!}m
zHo4)zGQ$%%nV2)$Ww~zPPv3V5%-vD8qZF)9%K!yAc_1Y|5v+#R3NayJz}wCl__??N
zL$mPGNo<d2vx@2t3=a<jc+?Euym<rK+uOmJGiSi=-Maxik_Pcnksu~$-TCnsCVdgr
z&4^s0z6!`{`2aEXP#~u42E;T%fsnK<%m)E}aci(xJ1uh3YvWlVbXxcVbpqg8YytlM
znasG3JTv~nq%VrDH3V^dF<6LB0!xjHfS_6;SYogVmX!pS7#6~O0^nCmik<Y@cov&N
z;>D$qS7BoB`)Y)>ImmfmHIa6^Vl<Y-OlxiCnx@Pie*u0Wv;KDpnP;HAFACc9LK9t4
z_#gg3!`}@vN7LwqKl2~yYi9aJz!a+wa2O0Q*3$uoI+_3r$09~U1?XxlhjWr5&{CHJ
zXf+w2t|kQ})SZ9YKPPjcrn`b@Yh(<p;kZENJac_rfY(Pe#<?M!_w;oXN9Qd~IiQP{
zVa$J0YBt2l<@_wKuIo=k=CX-(m}V>j#^2@=^R+@iUsLJ3I;7R?re3~Y0MXIJj4>|9
z>cEvO04CaKMjaL#<^u*F6Y7vvcbIbdn%I>@XS^ktScmb!xubI#ti!Bq&R<x4t3yu1
z?!wRTn0#GRKZuCTwc~Y|;DKSIC@|C3X4GMNh?}tnA#?W_A9CtWQ!Zc2D46JB?ZBAN
zkvi<H&4B(DRbZwE=TeL&z@6j*I0Lou_CV^8*Kll}Oy|$?y2h)B-uBL5tPTfPYk;|B
z3e0i3z!awijLvZZys64~dmwx${wL+*!-&XQFjj{{fD_Pb_X6gQSYT$S3k)xa08=~V
z@%BLam4b$2%g^YYd|l5plIZX5#aM5UIvk>WfzE>%U~tq07#=cVV1;*A8*dM!UoF>k
znKC|Dizs5C_X;pphXY|1&?036Oj9V(KkLT83hxiwLR*JXhnb!(Sgz$soJ{A>^7@w1
zL}aZRtHWkX3efD|39wD;fWg@i23ELuLtvq;2dv;6f{b%zovD{^U=v4N6&TD|50N^o
z%QgaySI2-&UJS6>5X`^|pK1;4;2bqJ&Xsk1rcA$)?P_8~Xc!o)!!<h{*p_4i=cFj$
zv^E%6Wd{MfXxG2S2b@b(b$q8>zOlnvVsu0#m{`XcRulWx#4(7>i9f@8^7XuugZBpd
z2S86x4|w$O5$Njd0ynPT08Qr`LEVvBu&1&Llx*D!;-X_fbYv9BOil(-fvbBam-DlH
z2~--4jEsPxp&>>ch-}c?+Y4G-TN!czv;+ju1PyH3v<VOh1dtvZ1rj0>dw*8m<m;k3
zDLci`!9Z5i2Po<J0V$nOuvFO<$Y^>28QoAIEaw1|Jy@m@02a#Hf&~)RKvXkn=j3vJ
zmKRW4S1Mw#jUhK6GR0zpl3#vD-uYR1ldn&A`I6?vb;@2Rz!IZvV1eoyu-yG9<2xe9
zEO)OP{SIXtCHGp!cOi5Nn6DJGe=?mv%Nwn2kHdtWp`ingji`7W`Yh*ILzS?q`Y39$
z^Sy}C-;*FZ^`oHn`oN!+H=Wl304OR-WLgqZHX?_K!i0rsTn>X9Kwl`|A?bg@pPXKZ
zoraE6pPIH~znZo~zlxSEOg8<>n%4cxHLd!UG%fp;)XfGI)lCQF)l3HzRPp`tYPfzG
zRTG$uk<=%u;cNZ7yrOkHx{<x7wV^&kp0j}RoEcUdn8LN*L{9_CDk_XU;F!#XfpQ(P
zuhm6MGh{n04RIi?itqm2`ZaakNp?mijQ#IK8cYqKtf8y+O;&<5=qv~N+M}}NWEy1E
zaHQX@UrW!Egsel8X)ukH1h|#r<9k@V_cCDWCps>BPNYFr4gcHqYwLND#$?5bG?*ob
z1AOE%M*YY>8XvqAn5`1|VOz+noBnqFx)^T~viF}%gK4H1z{f8IcqqRh^_xbE0@GMw
zC{zBuKPagEe*Jn_ACe2+ilKj)NCPfk0^rg`8FCsz1Ag6NU`kl@SARhE8sFq+MRjxX
z@3ue2z?X!q<&$Z^ZC3y$d16q;g8B@ohrq)<h-sGKcz>9P!+%ph*3ggSVP(&dw<pqI
zvIp)*N@PcM7?1{Bz7W7~5*Y6fqw@V|TPSH*{5JpkCIKWw_cECV!&+ltRHY8(KqzNI
zJ&MWp1pr?<f4o18>2?qtmj4&^8{k%wd>mXD`k#q37@V~OhDS!_P=p4fDq&!<mv6j3
zAoY*Ypsa2=W%*@tKQS~7A|Z0!WEwD+eW1K;3oLc?7_zWotrRdkD)?7__%<#O8kE(o
ze!G5SvtW|H+vt8`A`QCjQ9!S41u%0r0_JWQpnnnS;u^)r`vap-expI<zo_5DGK7Ta
zzP_Wu!5L^jP6s+&F#yxz4fh7N0DHrTvA40%9qkX};{wv4s%7`v{SRjqMhf!rW9Z+;
zXz=v*1e#BZVEw5;?@AcJG<yTg4SRsS39&HI9q*H7I$FR&Uk|8jIsW$ihqnnQA^V|;
zG$4Bk^gt!hdQ=FoXIBILQ$axQmM_q2bpU3*SVn)a(9s3f2FU(MAE;|P{dWDPwh^RN
zD}xyOr7;@Z5@Hy8CWHq2<X~X8ZUtlCq}$=g=nq!97+_~;JicaWXgmLQ{bu%2Bt(BX
zkp@JMsXo}upuu)SG_YO2YP3JVeXd!eEpRk8`)<8J>$?1Q{pOC*q{vm_U?L4GqN9Op
zCIL97#RIRE{=mb}2RN)*3G8EifRl&g-{xvfUANz^-_kjTgzWbw(=gT+V|{Ys*qppx
zATrG4d1b2k<n?9G&Ye96PMtgnDt7JyyGqMIP4!-IX#WAQduKV=xIP<X5>i1<W){eX
zI^u+wI1uRN3s$(egJ54j5Ciwxo=zbzrdr?R=Z+jF4kCNRXV0ENks2^`$cP^K{{8y^
zdU$~c4<3NV#zp|0iNJva2S8a_8AyhE(wv+euyW-}kdvJSGS()3nq2Nw^EI`^S4h1S
z3Wbr7dItvw0gXljU0q$^+O=!o^y$-#`YS6d!Hyj}z?LmrKuJjn@bvTqxvQf=`s$?N
zsn$37IdMHgvn1LV$Y}WjHKSmlY8V9Mb^YO)i8muD>aBqJ6%4(&h=L<nqT~d`RbAny
zBUm754Hin-fTfyir>x(ZT))8bxF%7Pa=^39b$p*IVz2}7N_vmyg|S6ouC)JnevxiI
z;FAv>&m(0_E_bSV<lQAEm4J7d`*?XGMrB}*l<#<cvHlh?S2l1wzX($Z=E;YR=l>_y
zzXY3c2NQK0$T*w?lD0?To_#IQ4ZjLxollSEH4=e#NHdUkJIBZiX{G^<l?_12qmhwc
zsJ$M+;`&tap8T9{*!k;Au?av#XEj)?6$ch+!~h|+Xs|#f67VZUfO!gGKTUjc!LXft
z0KanFxyj{DHE*2Ot8JY%&}^R3*N9Ihoit2%d`LICYY#fKy>$7C)=knbH?pN&uKh5H
zTc6n^Vz9kZM7LOZs`dSe=aBh@jzT5>iG<XR=qZr1A|IH>^%Tospcu~41TX*l_dg5)
z6<yytV?7hPiJlSNSkI7dq-#Jo)YYdO=wRsjI(l@hjxHUmtwYCXYt!|#H0ipU8gy+9
zb-I?i8eLOe6($urT3wlrR$ETjP*bF<t1Hsg)D-BdYVvdyRav^SiX2@+-R{VA!J@Bc
z^<`A=V*sq69E+UgA+j`bp2yJtVBx+OIq!iwAQN46V5s%izF!~xO%H>X2YTcBAQ_;8
zmind>k^q|O%YdSa+L!5~-$2iD1UbL^B@cR<z(@<xBdIXX!w}mHL~k$^9u!qnN2ZH@
zLp`ezJ7W{ZIp<G#z@Y&S``2097!QWJO27c4@Jk+)RMn=BevI`9LvQvEJeXz*1Jn4$
zjI+YA^IL=mvnXL;v0Ct#?XX-`ecI?Z!q|*Bn3yuopnld4_(G_2fqEZgkB`tl#)J7f
zAz+azFs_UHSzlVNrZH{w8)I!p5PjJ{@qphU0PuN2jI-2<Jea3102bNvemNeL)zH&O
zzum}~-tlKVm{iRNxUCBS4zUCJrt3i3z<eV=uqd4S%Q3B@syS`+o9Nq*Am`)%#Dnpn
zxxlyr>dYYh6L~Nz<^vWxM(qH`#`KToB~>-8X`>%+=rH19YQ;Dw{TUBNrxpO?{m^#d
zn+|l02h&}1fO*yI@$v989#mAPk$xkm5yn3JXFQmg07IfEFg(71aZWyw2mIdI!0Zqg
zw3GO2O#g@nHFfQ2!{5}zdBok)ZdC9410L+malqiB3@|(|@=fOl?K{SF(Y4&bw3ZW?
zU{t@GmnQR|uBJ0>^qb>cM-Us1pYdSlfM@6n5gyDiqjq?RjS3C}*EDEDf<MLuOmNW7
zW76C@kq31(-RYy>)OCcR_x_Ft>+$hm>tP14*P-4Ov3)W9W^V!Y;4laUFg^`!U=SXx
zl)syo#@2^19yHXakA4d?_YuVY<nKI;j%nKfD~7EI!h^YuE-=?Y>_v2dsWp^^pp6Z}
z1KttZdQO^KC-R`7rZ;W)TbX-|_&B;U>~#LlgEg>;uw&?35!)a$w^1ED!h@+Zltmlo
zGkCyx$^UI`Md%;n0j)8O^jmt3FwPBr!h`i%XND~eLub4~A6V#)@?h$t!LUI>c)$n9
zj*sadwS%TQX4>$#w(=hFbM<7{G5x3=tkb=KZfEeQJy0}m^c)28fDhLmotK~;6)r;V
zZ*%L!by`ycJ8ksa+W3wjHc~(1!7^{<sLmYnpnuvGm^niGYI`iS(;6Mq$h?GGqxiSE
zbz(bcsZS&QwtgdwbC;j+V74s+Xm=CFc|dH~kiLYBhp~CdBn8US-_GY4_J5PsX>AR|
zX~W;n-hTwKi~1Q4rd4Yhc54U^MrA(0;5a-_t8)g1TP?<UFwQ}b&r1wjZN!H08xM%R
zp{};cw9)V2uyQ2G*Pmer_ah!~N75K)P>Ai_&)UJL2=1Aoo!r>mI>v(qMvt+d*44&M
zAN@`%M;PZ;KjOjF0~lP|!m#T@&e04j!vXemB+x$@1dK}E#^)u212}-tI>v)J>`PYq
zScc6Xq7%^5!A~3gj?O_Np#g!T=U$U|@bUA9ediEBKd)i%p#7i#U@s&A{iZl*-ybzT
zFJUg*0}Er=2H(zTt@RDQ+fQS3Os9>0XV>5n#0K$aJYeqZA3ei^JQ$tJ8DFQ3PDGE7
zX@e6kz)}~>m|JbX*+Wj;i(+-nrjLHN&=JO&+YfkH5fluxdK-ZHoAV4F^x8^+r@K4w
zaCHUPt108-0eg8RurxIU_69h{dEn%I99GwS+UR%jST%y!X#R)?*9{p!r>7axc?M!#
z2m4Dka9$G%oMHpv+>-<JZl(gvwY5P1QaG@Va2%KUChw>9buFfiepk=1k;t%chMnn;
zc=)He^+)p3kM^R7j%>R0S8m?nBaCy?Y2*RXkxdu<?!J*DF;UTAI(aaJI<o1a|JaFh
z^m`rmz}>rd!L6IO!0A)<p#J13P=DeiIDf7IG+$^2#KtCY_VgLBuc{jC+FlAuHWz~}
zn~Ff$_8nmR))G*>X){PoB!GyZP=Kt30q|To5{{{a*f@|97YE{3MZzPK>G`|=@G<?}
zyLaIE^XKDd&&XK`a`uc|d-380xPJXQxP19C=<e<Yot>SG@AdWd00y83h#hlHO%3B5
zI5jmDtXZ=L<mKf7=tKyz*Jpwa8#aKAX=z}3s7Il?9(2<YdXcm0v9ojJJ91`?(2xA}
z_xF#}kJw+IJ$n|MI(3Rc|K7cO!M=U_81%y^te~i<2yBIR-@d-E4Fde(xqs%g(%;_M
z{S~1RhE`?pfY^&adIas!C(w`Bkt5jOyLS&XH8nBp$H(Z05lb1i0Nb{01KYQ62c@N@
z<MfC7`GVrLF`zIdW!n0WyuoUU7A_cQn}z~Ci!fm8xei#n$1{?#T{O_bhX75JV1PCb
z1je=zz{Dm37+Hq_tXVMh=ko&cXb&Kx?gp0YcmfT5AE1Wu0?NAXV5x!)5Q9ld$qq=W
z2UDi2|IC#Mc*`dj0{EB5j-R6=_U=eR&iVyZ6aID`u?bk9G3rw{_AK(rEA9q_&>4Sw
z9;stG=|}7kL`^FGR<DrOda%@d|KF}JP)h>Ktd9NdI)Z_u{kgwg|Cj!sw;qDczxa=i
zmp{>e1e8LC)mEGX25Y()b|8rDh@?#|m;=YCl3Oh>PIxrodL7`C4FJ-1y8%AAXZ*T^
z%~3EP+IK9&Z35<Lz2n!BviOx_5ZjKSpZ9?O?#>e3wVxO3Bmx=R3LuD19!(kqz`eu{
z2&u;aImhbnuJedFfd$J$fxPqnzplggc*R{IZ@xgu_0ad%B|M-_lgEeuj>@0Ejf=lQ
zkulE(;>KxUnPCc8s-Fy&U<g1&Hwg%9CxS(q>wu6(JoF!43j|cwKs;AZDM4QxFi$R&
zF$eRjtnT|c1^?Y0^Yo`1oi@GtV4wfugLPK_uzAK43Z6iEYqYNWm0rxl7upe>0~*0?
zPnG>{J(2gkPLgrG`gkfy%CU(gX1cFm7`u63v0mPq|BlLk-~K;|03we;w<gs1CmDre
zMe_fCP7e-~@J8&kurQ^-G;XH_FSNku0Z97y?_UJ|cObA_Hw>eo6XvR*6Y}Gv39oAg
zy2}1Et#p&s^!qMJ!Tfkq_jQ%}K@vx<Y5HRRckuALWuSE(Um-D75Wfj41E~9ic4wB*
z?hNreG}nh`l+gFk4BDO{{)c$vtQgv#;q;)d5A+2z)>Q>YI*1(_wBMRw!-a)*Xrumk
zqrQoHFzy86pEzcZrmZ0X5I;r4CJn7F24q#RFMpT*|MopA=(mB`d;Jau#t?%sJ3IsQ
z?_;2@CO&O?kze6sYxtMV+kb)q;)`kwZ4eQEGbH8&VlVT%7@+?k|8_<=hTqPZ?c!80
z!0REgNk)BPM{NuKI}9|{CH`3Z+Zo}Z&E0>1fteaGF&eWI`8x(i`ij8FK<+=9546-J
z{}})F#-lceQ^mk^`#fN}5yq#1b`7JpGT&ohks<(NUd;WE#)6i*)F0#D0s4-OofAz3
z1N=T7V7h~Eod3xfSZ$mOtc!X6qxnEvL;8>L?+9apO+07%6$bda*#KWT2jC|7n@+^Q
zvX~cGmvR3`bE1xh%pc_60@_SY5d&krQ9G*xJkTxx$^t*Yz-lKqu-?rHV_Ydu83SDn
z*+0g=lgX&f=u|MUvd{%4h^^UiZpc5BhbChH?H4WgZ~?15oWR&XY07KkpXA>e2kp~v
zQ^Ua85yn$I3+)6ETQw*Pj`=)~^#dHVf3&FK1eSZDEhHYU0}R>V*K4D$hTI=(e;2$p
z!+&)u7+8A1cvuZEo)^Tx6sJ1MKeX2y>jyZK<-q&^Cj$c$8+k@-gehTw{&W1hn%MwX
z)2U%#>8~|v>jyC~wN?S9$QVHQ|AqnHYB?}F%*nt2=LlnFPEkg}!2QCn<kac9?`A$~
z^E(v`ELUkmTfs#P3{0INuh2H?I}98Z7<Rx21~^ZtAIb+ml$D|X&UEqjt8(2f?SZ?+
z)G)A!)ddDE%NQ8oy%GKqJKPBvc*p_#QBDR1xB!W98R1v`0Q(2|_powc#M+n&1{O)s
zR`HS?0|R^z<R97}e}@4Qr}a3T8zBbxRim+LekLb=*AL*{@mK9MUH3h0oPZ~^xkh4r
z{0alJ^@a@lYXk#)gbG0H(<WkoTO~CrA0QaSF8!f=fW%3eJSXb^LH@mLM{TyJf`M5+
z4q&h8FfhQaRfBeVI^SV{kA-bMW{bWK#>$y2A24j8zuzw){XieB{Kwkg+unr{*A}s1
z`V|KFZ5E7}9|#7xR845-HyZn6tRLVKmyOE@xb(&2>%y3P@UyXi=nkf<fB&jn9|t!^
ztQjP>@2@a0*=-9jw?{EB$<<-lX->odmnktWAK>y9eYZCL69xuol|RP6uai6Qb(|Uo
z#s^$RZJr?p#>EEXHuPf{;PPQi9>f;_$_FM}guY)Je=!z*)lSoOe}%IL!{&Y}7#N;_
zHs5zW7#JAt!jIeFBlfxo21tCUG5Nr_9Px9Sur^MR6UWBE*uK#at@_8>-_I4=?7K`2
z1O28zfW*8(FfiC}4Q*wit{AcP{pL$yQ~~{9zsUzi`xbt`HcpTeCyxaqO|?J9zrUL|
zBi7PXFu-072fAIM3=A-rU7@ZV`e~100CnaD4Qk`^fzeSI19-B0@DmJ-HP!zZ{{bF8
zAi#ZU80g-OAGMYKhJj(FJ@nx~{5bT1(N2T$wUHqsos;-(ZTzRP@F)3S={4#z@hc2G
zY#e}2cRJ91wC+0$#^!^ubzw|C&~K50<Klby;Aa>h<6*kyw_lYT=<PS|bMa3YAhzaO
zq+CYaDFg%Ewn*6K?m+LV4~*{*W8x#S!DaJt`2g|LvoJ!|$bZJb6vjd~!|MDo{t-J{
zB(~I;efQ5WaP#y2=6^DZf!?K9h98aI4H%0IVqmlt#$;>wOFlsQftfj!k0!}T6ZZ?I
zaDG6}+RU-Ke~ka&6)QpTieF>k8Xf>NpO$`y!LP=Gnd7K0%a1THhjH*N_2K$~#JRxg
z{W1PS{6~FWeuaT^d^jTp-53U#W&*GXum^e<qhUO}P++mb9Qw6+j>`wgd|>7cW7B<G
z8z*950b_)Z#i~QjTrD6DzZ$30bw4y9XxwM!pD@7QsDS=I2fo8#;(UO_TpwE-$L2(X
zBc|WU2M7k1dKh@tYV_Tit0nYtnlAo+Rqm?55Js%MF~6aoVPL%@^PB(BUl^F}UIVPN
zLx6SGN?=wx8cTg51||f^|CoFL`+=37KCp+eb&<HT6VDqF->zTLIbHX|pszt#(62GD
zD_IZykIsIFfjx|cKelJGOIY!@wGkh0G3rkRF|ffH00$V?7l~0a`HaQdz~GPZA0D!b
z;j{EB46Ld)Gh#4K#K3lA?D*c<It$vq!x)_t=R{nVJ+RW%2R2wk_}eq1F&ck#)@E&J
z_{aE<2t|CJ{uu-BwX1>pyEdRUbp1OFH2e1hPaiMf;q3u5Nt?fu50LpluQL=_x|soI
z6XcBP=jTi|&<10=`uDHOjSP!m#G3pk3|9KX-xAtY46LiRz_YDQz^Wn-SnbLNcAJs_
zvVTVWwQX{vfn{+Fu-puPYiLt2uq+4wR_ncii^XUx<9|9|Kx{C6Mdx(gj|z_jQQ^PF
zU@9`wRCFjm>IaAo#&q%bt8$|wM}5xzBnF5L#;@p{uKO`jF<{K^?oVNW*kDW-f4?d>
zHYOIt!r%7zlNca27{8)(y6%&DNZ{$yr{KwxCxA>MGknfk@3ex}J9j|q?K|KOj5*8r
zg!$XIZZUiSFI~I@nqUlC#JBM%{Ed_Y`)a_R-Ibsk{#Hs2^r5SQabe4M?E<CHuQ4Mf
z6|9DR44Gep;XE3$G7!W<KTpECM39!02(k!CAUB!t$M{G5?GRtPmoHy3{07H-2S;tb
zNBtkkWHR{p@grz!Ya920M1I!|`OO%_7w^W68{@usb#-;%(4j+M|Ni{|@hRNAc{50Z
zevk3-@gNTRa26I8GUD_SAnzMDZe;jHu3x|YkMWQ2Ip%YS@II0MG5<+~f8-Cr0Et12
z_<)Y_-_g;*h)0b0AtDLkAK`s6|4B(npt!i0;gg8?g!*{6gY_xN|5xyj@P=UU`t|E^
z{*m~{4<9~c_+O6kk35H5M`9q4@qh8+#qqWu;~()OMPeh5wSQ)2Cd023@ykSfN)i6O
z-Q7UasvuC1kqZ8F`y+fIe+UMMzb`T#9zTBkL;gR1{><>FMcN&~;r#jYKjeQG9REmc
zYNXAPPb5v|KQS~A>{u5EO0qKkSpU~Hi-2*LVu6LrYDTj4hzB7txga<?hmnG!HURIS
zG+^Nr3(R3MbBF<WyGUT`wi<W_BmsB-MBw7P7C3pW1~{8gpl$32(1yN19qY~TVKp=l
z0642aU}O;h49)!k7ViV()a-%uavPusKbNaHz)zPy#y^*cCBx4X@h6+;!#er<e|vv6
zqx{jjCYO!SFkS20ugXR0p05-IWL&Q>d<FkT8}#SplL>(LuQL45esmv+)h*+41@J?^
zwjbT+USbQRoi9Rvy!0R5|I_>ns6xL($RFbW{3H73D?~8vBR+dSx<6Oik8xj6BlU;(
zdBj{8_ZR7G{Neq7`Tw*1|KIlixBvhDI{vxg{4Zu)46HJr0vX4XK-_ZwcoH>2e(TT@
z`Ysa~_vKyBj^9I`TY}pOxJ7NC&v*#1gzqo+CVqEc%(Mc`7ITDt*KWW({RvR@yZqh#
zWoA{-UmO0;!yjD#xJ9ji1ilbBZ+;Dy`&<EXZq4IK(xwh@i&z0+%>>|5^ctuJTpz!O
zJSXK)4`wfQfcytA-baVt`R=}q;~6kV+yn5!XB-P&0G-J8@9#S|z_k_rj>aG4f05c>
zzuWPnweA1Jwb@G?{+RsZm`4KYo|Qn!X&X?mF9Gs)TY;=~F_5+@0#fFifrM!xjE7JF
ze+xVh{{HtyAflfO7GrY2BHayOp>`HPVvGEzNf5?H5l~$R<*sPP@0QG0ilzNZPMfa#
zcDc{nJhu-4*DY^>Q{gLMpZ5Zu=?nmij6N6}q8AvidkpkfKLYSKIDl5zJ)j=k4pahK
zfs*enAm@IaA=e;t=YNu<9h+g?l{z45yb~;hGLevW_POceZz|>D6M7VklX|rclgOIb
z)sN7IYoDl@tnF1Xh<v1sjl8F%8*yI&8`LSM9oj034!I?*8hk@i$>)x^yxWbXzmsGg
zFE5jHte2EFIU*;9ErY+j@$cWi2>d<*quPs!|B<o~g$DAO{O{-gD>yJ#$%*Ye`u%?a
DT6H_(

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/heretic.png b/games/NXDoom/data/heretic.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b51d2a0561feaca626dd1bd87c6be276b4df77d
GIT binary patch
literal 5090
zcmZWtcQ_l~*N+vksxfOdwzkx$)+Q*54zp_1E}9zA#ugFOYK_{XW>qP*wTOy{S*`Jl
z8nqH%vu0346TH5^_x<m^&vVXs?s?8V=YH<J&*wSMO*DUShl5p+6#xKmm>3&ao?G<4
z0s@}vZXMU}=Y|oXZ(<EPA4t%Xg!4Izzp)(x01%1)SLjlgcRkLX0s)4$0akF&fMC}b
z9)RHBV0oCIH^SZ3-$Ne$!t3p}mLLGY?QCM8XB|?oRXCF>IqBFBUA1;z(P?U5JlGC%
z|DM8OCzIkXmZ^rb(wEExF&c;J8W^Jo81xflc%m5T63^&ZKwQS?5dAldLK1%Xp2T#i
zM3Mesr^fdAnR_D<n2n%yT1aIT_D8@`z=-t-><d+P=+DPmjaBRM)kmv)nyc2`)>ij#
zjsLIWmRY`m0RQYzK&^YYkEc4wC5F5M%O>>Nf_v<145TKcCtex(xP5wRW(W2K%cgHx
z6*Zdp7`oRq*!0*|YkM@<e6pC3Oax6xTlhTK7tAU-Og`W$Gv(mUd1vs|*5~StHMO5`
z)F~8>Ji0luI(pnTNTEhjnsSC~tg#k_#T}A1#$2zb{*2g1^|;j-esZblmG-6XZT&Q8
zJR$HA#ZA16ZDGA;1n3*9wg<0A6Rt-!P#T8tELboy1AwIZcr0WTpB)8zSG>??e((5%
zwZ75zbTzN{_-;i}gXNX2X3~av_Y}V>{-iT7t5caF*RddC{^9&$40PNn6Z!MuywoFs
z4a;BD!HpgAxN5D%46IdyqoOJ-f4q(BwFi87TwP5W{RoRn?hHH7tZjs_#U?IqJM|nN
zH#X^iv*RVNPu8^!hHW;BT=D{vJ~7(PRH=4Dk7q+s%U(|6tP=BI!$dM9wHNK8S|*N;
zrwa>Lg3SsYNWoC5g_ha=VGG<G&KR+eZQ>>m9^5w|6zP7p{>Mz`NXaIfzxD9&`m@h-
z*xeRduEJSK9AsuCxby5av~SEzdw5Rhs1@PW0jC)ikOx2Cf0hhFw;nC0JRWA(oep#D
zq<!RUYR0hRQnznSVJ6RjIt|v#;TwTLG0k_+Hi~JYtMWw*B!&^_x07JMgXBn9!{Cr_
zaqu(P%wi7e9|3u2VURIu>9(2G@ybzZQm0euajJs@;H&>JyTVrr3Q!cjYqvS<*MAV0
z5o$zfSB22~36&35p$|2Anzb8BiD$o=KyG(O52rS_s6+lYb&+6K&8NpPK|z8;V~Ho^
z0Se$PYL;C!Ize(@p%)b*NxO-Xja(k3FUSIHVgA;5=XL<4U$ursBzrrcM%)caec5K2
z&D(n|L~M84ji)uCtMQy|e_cA^sG}f>%iDK`wuFwpwC?u3wdV5-B|9ZYQWrdllo>tz
z!H~^}2Qjtn@bgZie^Bh)w6t@FjYLC7jcCGk_+($%sxlu?)Mg4>tbyO&1|s+8=SN|i
zHE@P{yVO+P&W5JqQ>GQ$-7=#APl@Y<x_P3+g9rU%A(m~`^dAJ-?sK@{Z{0$(O#TE&
zKel4X_5Xj4<XF09>M%9LocUFxa0|xwb%5O2T$k|;KSWBHw;VgEqay%d#5g}A;-mP%
z0g0aJPl$voh=2REHat(>ZNcY;si+;4Tn0OY8zk+fDO;ViRq#o5{x<Dul2zU`%8ox+
zOURuI3~eyAll9vc))t()Uybk>9?ovX3fxR~y>#7LYre&HdF6qwOPn&m?CR;lL=iWi
zyDK0=J_o4C_Yh~jz2u`t$tXS%=DRYYu<)?TF*UEynKauglV76+qyFf&c{!IHC>Y)@
zlB|^GqnG$uQiZPER)cy8V{O#qW>{~MetGN*PBKM&g4kZz>sy|7d6IQxSfSB>#i#!?
zMXRY-=5u)P?gn+rfNbi~{77%(#<Xmi#afS|vNBuCDJrw2y`tbDo%qT3vn#Krh{OuZ
zkLK0m`Km1^(yI$>{PO<Wvu!C9lk|)I&-Zr@w`Szz<r}|zF}f5dvO6>OGQiD5xc`#7
zhR%MyC2P&CzDp}BE0`jy)8p;-9n0!*Md?zFCIb)8Jk!9u^&dB~@}#bfGkN|Ar_J-D
z!tI%sUcF1OuZjDd9UB{a+dn=n!T)I6as5D}+%j>0b;RnLNGC})=lgj@`udiZ{`q-w
z#+?^1DeH0H`V%k3WJ`B1z;ofIwqN-TZ1t_J1MBPSqp(C!@b;{0WM^OuLV~OXU;8t-
zd}DuqUxc`|z1`T<G$vsLhjHwWbKLBx=q!xu8w6mwMn0b}c2Ct-@wXSp*EqCbbV`d>
z8!#A+OmIk1|BoN{CL?BMW_;jq&VuZTS50@tq(mSQ<b+!)K$j%f@bGq7+T*)-?-oEK
zPY0R}UJ9xD)wj=tqdHeZ3)B&wq7tL_Ry9HJ%9ZKa*(cuK8w1T+W{BN}8_R?cwby-k
zK$6nt=H{Q+Vs98Mu^$robrl6(_<OLy!28|aJ3Bjj6m#TjZfYT)lX{QM#oaw7IXStA
zsy(t8VOCITDFAuYfM8JUt8Z`DyhwZe{rmUFt^Nz6N8<RQx2o|~8QLT6uCApOVD=ds
zTW9AA8_lmjJFWLZ4o}Q(Xe#F_6=oL*>ZVI>?(A?fK_>?XS@{*5eEcBHDEXRO2n3??
z3$LI!p+P%oVq(J9!NJ=vyr_SF1UfSN_(<jDU3CPbl!<<a6O@nkSXNdx0c4WyzcEpR
z4Lr3V*eh#lzTTk@p=c(5NL>u+l6u}lS+b9E3k$WM=a;=vW}r+?I+a<=SJWZ(2&xQe
z;Z(wwBKxoD=?5anUr^ZDkL}f2n%ww0d%F4ypLX{?)3KPNWYyYqNtOxek2wk^`TZa2
zKAMacdAdHw9y}A2wKd7F%QG3{T0a0%+o_VjykY5wlfRzKy!BSKdz{}-?0o$>njlEl
zg*BT(vkp@n2|Qw6K=QQrS#*h>Wo|Tj$<Jv(?DZ3(YH3S^*~~7%Q#VvY_&M$Qo^}Wg
zeEj#IIeaQ<a{5_OD&8>_x4TZdBZN{W>X0=%)g#m$MYLjf_;l26qOZ~>RR0+T&I;go
zP+toD+S1#X7q(Qx@eA#r7=>-<tSGe$F^eiV9v$WstqAo1CbNZ>euPv73O#XOQ-HRN
z5QClxP3A$lT^W;f#a#>n=bYM=zMs*4dE9${k*=<QjIW#bIyHf6I;Gj>FKBT{urj<9
zy6o+2FI8L4U?>y2)5z%m6hL38Uqs{Ve7rcz&5=}@84Y;Xcye5<&-Rq9`q8>pkVkR&
zSvyF);6yiOne(TToz|zDiwVLPHtt3r5ib0v+KXV9CG!$mT9+tWJJlKCTcoB=ey`H)
zJEOu8kM*Pu-%~D})8y56uIN7q+necT`59^c?()karKAk4;|tz^78Ls3I!y?EeYae}
zsf+VZ8d;TCy*CZfzFlVX%;xr~QC{8IZpP;P$IC3xLtfQ0m)O1|(}d4IV?f|=aSHb@
zkQ}C~<)GfQ!)cw32-@_u1_gKA=D<E}dD;2<AaaihA7S{lHoq5ZtS^z!h)|bC#v7uk
z4QP4?Dt6}}7S5>eeB`rrXYL<}vFx4$8Ifrtmn`~YI532gVaLS74x#H@IEXDy5P!B-
zOOEC7gHnueH?4CtAfI>zU4NP)u28to!`Pe+$U+zeq{KxaMivR~qA<@~EF^PVTyjQS
zMDgkO{6l4)W@Nwx+tI5<JoHH;k37C$i{bfmUR@rEe4CZJ=_)75$7MZcCaO$;V9}V|
z5_$V2>^3@;z5!M|%IWS|wfsfiEs|1|HTv=UiLEXj*^m@#27Uk4=PzEB{s(KhavZ@f
zCRkpt_|{qzFi@pycp6JiMmvJ5idiuDN1%6vK9`F|cKo{uGS0KvfbDR)0%0A{+u-Uu
zct~q8kpYEOz~-3oLfN6ges*knJgRjt;f0v71sA={Ym8VBauqUC<|&s0#g22Ip2n@j
z*Zts*%^%N+SSd<WdN<W(^WiXzw+g=}LvP!ty}*3t*o7=Ng;IWNM$5VJ>OHNr)+UrS
z?hn-|ck*5s!WGKqx)sq@cKN>SJZc?X{T8{QU^7K=V$#cv(D<;|+y%P19qw~Fd2jm7
z*Nuk1Z^IoIgy;|oC%$84q!`oGF0NSpHcNevqV*WEBPMz-m5GNAIs^HOfj69W5r3_-
z2JSA3jdTbfUO(KgXM6^t)F57$<yw|!wy=Gx6>Xoe>NpU2p~+`1iUcPJg-HgY!fj~_
zq}4|H=a<~~y@eSlBn<x>AZt`A=y|u$Rit~D%AZm4SV=Fv^o@k6P5Y(|^(@VK#|JY2
zLp*=f74wJ%BJC}c;L(^~NmlV;UK^LY+-Ao^&z;W#T)1|Z%2WNRZeyNuw0qZxcbKd`
zkI-PbWsug;N-10Nsx3~5#O7P{^|IM1;V$??E$CVP6kH^S@~ZMf0|(jZruI4R#1u|Q
z+E4W-Vk#e+9+8Z<y%;Unk&OQsow;@Xef-19c}m@SGspRr`hHrg*}>>v?6mM*HEG()
z!IgVY$k#3pmNF$x+TvJ9Ey&~EiDTwf{>p@m?nl4lL~}>gt}_&1AtlBXaToUlH|-k~
zlTV`ZKpphdpMjnQc)!L01E@-o@}%QcWvQ#!Z#HPFv)j@5wf}H%%96A*ND<<a>I&x@
zw3sq#ARDr<#%BFqC+U-3gVO3o_d6CQiSky|vCstj&Gf)zjJ?r`J;VN{-Xg4A4`kSF
z28l8GM9+%a+h1HPYKq1&<_~oiY@my88NM+#J`DqM2R)beaNXeNEdIgx`1jf5I!S`G
zDy3Ve(Rn&|Bgjl7np2?OG5PCwxP30G^#U0tB>h4xK1EclupKH&^XmX=EU;aq3XYd`
z@oTSfK!bPo>Z#53k_vRJam8~iUSUf%%>7uS;3zm_dfXrZrkTjVpsAvzbzSZo!8@|r
zJB=*!!gavBS0|>6KdNU^yFJWgG(zxEJe-(QOHRH5%2&F&_bq3_q!7~=9!LfRqBLng
z1>R%ua0R+B{2g=O;rBrlBVFe8v}n#ntVW121z=JVrV%PRK>8yz!ukH39Y)2H=uejp
z=~*lHHB;^ou9dJMC0I8QOHVHF2E?ac`KoIKfIPkcY%K;`iy|dOepxw^gy^DA$$F*u
zZ8CT?YS;{`OIbQ7<<{n^j(O|Lgo~@H5SsdX$82Sw8XZFhXW7uDUPOlQ*f6(rF?ap#
zn8mSf{hM8(L>9^T^%Lt=LF`>_|4#W5T?)N%NjqLu$(R7qp}%J1qQ(fRCW{*}5KAR+
z=PVONrt8_!dH<I2m7dq$n$L-gCQ@?eU$VRZOvpu&Y$&QgccGSRPXL4kIN`)7Lr%I~
z<bChJ^4)weqf88^F{8<g5G^7wOqAlX8{JKADEV=Pbhp1Qr}#^sm(fKg+(=N65aF{9
zyGGva_y9b=c_=43dZEQW>%kIA?)+iGZl=p?)9sF_;6xXXrz;q+pv=AJ=ywa%T3DgB
z9VT-*<V7F<5aX7%_ZuKe!u$FelEgI;=1VNdmKQT@B_S00JUU^gF;x)KT4QbO0>mU7
zP!_GQB@;OKVhtq7fix~YjJb_j>J4)^?EnS^OtC;LLd43V6l$8Di?wv1EpT_<e1W+h
z<5F0s_ke$s*UROJ!$u{CcNmG!Z;`P7azsq(k`!)N2Js#U5OKo!-y}Qoo&A?RUd5*B
z=7`O?N+UwHq;$8Ll3aMmV}W!s*uwtob2!E%hL@P{Pf~ue+#Co&H3?0vusy{@aTapR
z#6#0kO2A$GXc9RDb@dWbIyGhKjl=-kor9(J8pb|%x$`@VF2S(>uJTu;ykk_*P~^Ju
z{<Xg5aH1Qj+Vk0e56*?6z8N#udS1M8Gzd4+9#w``XeRs@6Bx(8=F{U*T#k;CL1gB4
zply&MDL^b2?BV?jOQ*pM4i2!jmt;Kx&^estO{I@xWHugr8*@!uMD>}1p11%9vNTj)
zektUEi{KS5tZuvlq<R#5<?R;aNlg*x+6NZM+xtKPCgd_#=i;?<#Ncmney}e~+R%+o
zPNlrE%tsP-CME8nOQe{MSh3JbT?$M{H}G&lBChCLnZ8C9oyfH3ykU3nFL1yH=v@c}
za19(V)AL{izO1(P#*f;p=u5b^WD&zz8%`&IE{+e#JySH$$wT;4U^K1nW;S)x^IiaW
zNeY=3;8xMhApGJ+{4fzHU7|0bL}U3x?-D>RMHo-A{T$6u|7yOMG^Wx6S}^luQPijC
z>wFe^6VO4d&rlD@T+TZN7_mmWX-7#!bK>tMpGUM8?Fg{z=z4UE+tKp!MXn-qq|nsK
zp5+-PJU@xB!3ytx7ty;n!_tl8cUcZAz|dWLRlajaB6i3B=G1asTzQKECoc<xj<-9u
zn$_J07&h=t*v2+gMk`B(=pjIw=TxMp48b$;vRBQSBR6(HlrleZG7Hjw4)`>tcycth
z3*KiHB9*_qsfG`p0t(0fNB8%hBVywvdH;mfanIfe;0}zWuSTcwQbl$(UPo-fGHu+M
zi5^ntnQ^~yBS*4zhR={BGdC8Of2`s;uPQoPCI~_(%RR!Y7x=`zfb~9KCLPbiycN!V
z^S7M$74%)x<ly>C>dNTvJ&?DYD)jv1{Wk<bi|MPh{Vxm9hYxf#X6Ixd$QPOeXcJ};
zYh&PfFZT6%tHBRvVJAg#zEt9U0$A<w$cmCw+NR#<khZC;lCQ;|s9AfO<~|guQW(E%
zlHHtZS4bNx?nEtq*H&<;`uHLL+5ah{(ldq)-z4jr4bQmq|2Tk&;RAzOeV6F}0UVY3
AOaK4?

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/hexen.ico b/games/NXDoom/data/hexen.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b1fe9862ae5a35dc814b90a0303daeba6871d9b8
GIT binary patch
literal 44747
zcmeJG2|SeB|2TjTEsB`U7~9y_?7Qqqq(sRsQ4*1C*%`Z5t(GLws!g;=t3he8L>o$(
zQPDz~QjAQ_|2!jZxw*H?$M^n!|NouW>+qcCdCocS_xo(`^WGj5iVZa#h5Xo1VyJJj
zDAXEwjlm4%eWs#No^mJ@KmSmE(@YeqMiGS)6C27Ohwm-ZMxj(yzvrb<r~z{n%EV+S
zFK3EE9bSh*ZC+w+!Obbi39II|TwrF4JVnwBr0M0s$6=eYH!aQP+C@BlpBq^$WfA+@
z*x4eSGEnEEoMs*`Z9YSY<HgRMx~qAD226#xRut*X5>iNVUiYe;V_n4cR;PgGtG(vU
z+n+l{zn9J|UqOmb=8-C&QL|NP$qa#;(gsO8I}Ye*beCPZdh%0goSk>LqiA>6%P%!d
z^J|Xw+0NO{kH7RgtZAHP{rkTua*w+?KQE&Ud~M<gh)wCM8Mu{7#WCLH%gwyM@B(h`
zR#c+T{fM{0(#yBbkege3ZH7dmn2Thh`Bb)Dn#XWOM|YRvxDQ?6Te?X~;t<B`lXm}X
zGo0B1%u<&N(;u8T)3IFM5wq*azS8Y@tmOr%-A6*7UEeZ4((=%CC;BQ&rW5@_<BHQ&
zO@b=ec4?RBvoyc^A`wA~!7DHF8-C?*&%46a@U1nKeAi`4#3!AANNUga<-G;{2bn%w
zip|$H$X}CRI>RSnVT|ugLSyGktXaX@2lL&W3o`i@JZBR-TC&^Gtu-T1t<C57E5A>t
zGV*S1oj&^u275uf)4rNFt?`7$*+u?hjTpbhQl`8G4|Nk3bowqoog#;oaO=m5Z`VrH
zE7^Us6b#~tAKvzbeV(_1qR@bjeM!CE?%A|Fgb_zf<vRTB%p#Q|OCqYP^P=3OB^;xU
z>l=r?tZ4b_mPNjE<?xG&mH_fcdllW!(F-HPO31u&UQIFqPNoZPih@o*o)wR~Pkwf3
z6e!;zx|bPZOfPI%Ur=&%SDQlLapSIV!ziUr6aHNONH0ofgX3j$6W0uUWGKA$oA&LD
zNl}JSH9_#kg&D*Shx?n?^G`hziBWZ1!14MW2b)*g-12IgYmb<Rp0cCyj0N9lVpm+k
z{4qOg#SXrCXKtsgsflK{6_86`=oa4M;h~7}6Xz4RKB6~cuaDd2hf*#N5=?S=(o<KS
z$7kZ7JnZ&=TXI?hRp0ZVb2WS1z@wRigD3VdX<eG_!4JAm&iS(BK;r!d?`xP~=L!xJ
z$;OW!&!<mO%#s-FYL$(6G2s2xjZk1@$)%W%=c}ICQx$*X<x0w_M?`0x=_oqo!@!j!
z>WPz8!L`{b!IV??iO$}r9kG3yJL0-GP)@a7xN*VGdar^^Blj*BZxo;x?)i2m@gdLS
z;3op*XPVA?dk?rxD<GW=K2)fI>YUD&<*>;AWz4kF>uoM8BHE3%oRTh!?h@XraCGsj
zR+o0EHV%zb%)qeF=NF0$qvA`izp%KoQC!yA{ncd+jTUA1t${0#*6P$NVLMCmqO*m0
zB7u@hTY2l!j*hJUdk?)geeTW6aGrfTrtgJ1F{`QD4?IhA{J7=t#!aj0K8hZA`J$`(
zV$F_{j#n|e3RIL!uXFC}`rv)crCRUy)h{P!%HJ+j>HpS;zP9Vz#y<P3J;Al-0VB3r
zp=x{jw{Y1tk)NORD(!T?)-M+j_i)kDj<VQ<6W-Puv7cfrswo$2J5=%v7Rj&W{yccr
z0K88M5I0u0<5o~ULw{y$lxBSqZE-r~Dn-BQ<J(>n@H&sOnYbd_E7aMq?ry>M^XgZd
zcg50kPe>c}d``&>S|~4~d)9}5ZwzI7O1cGJ+&ZN}pTf8tpQK{&;Ow~oa;r!$Pf5Ur
z>-{Ch4oRXW6$z(`#O{Q4;2xK?2^W!D%~}{OaqqkY7;K!LH@Ysr@UW;x8&uhdJa5t-
z%us2r;VP>85K!N9iMj7}_>q|SEMejHlZNw@UY?eqNDR!%U#!tR-|>ULfRUyVY%L>k
z-r@etAPe+1EMKrv<I-2RQyXidZd{2`q-w7RWgj!!QqJCcpY+kRe8HR2ZPD$IIeb!9
zk}t(KRovF$DSg7BZKU9p%hqrU#Yc4MtFJlLB0A-G({i=-q%vF6(zp9=p31#yZg^F&
zG)+Od^uxQGRj{sLiPJX=uZlhN|N1qE_u!s;*Ux)itPAiE2YiAiLb09A&I=cD%ZLSj
zynLRd@Ur<cr#I2{M!M7$FXx_R8tHnP)0bK&7v&!C6N+OF$mUqdZT387vp95}XiWP}
zs}_gmj}IRzu2^@5TIH?ZCuF6R(LY$#zP(-N&AAV=P4wq)?%>!Fw{f0D(dvlcZI^h}
zVtu!?XHV-`*b;5+F=wH!(e+Btf{sS3@V0CXv#L#o8~YB%?5NrrQoDcus>}PAwB8b1
zu2|V$g^TNZ*0oP5zCXo&d)ya&VZEqi<{iw@qXcE6=<Sam;}*5Q&rR^&inYmgf8n~!
z58aW=>`?1<kKKE}MrN0jMszQZi@0X5N>xYyF{KmfQU*G%uez;kUFJNcTHiyxJMuF5
zyp3_z%&oXK8&TuO=k;n2TrTg*?vnd5@3!*C>x)__yce+<jt+DBAAPiHJ|A-G*~jNw
z4dvba>K=W3Xho`TE$q*-Ij~Yb7`-mk<qQ|?)#|hR*>vYPD|(}>t@&yM;`i*S3Z6ds
zx9yI!#AqshxUX=e>FbC2_3s*v?LT6n^3tud?)3-z*5|u4;<qR(mJEKq_h@?AnwFVL
z>7HAZ%Jxbg5k3Fru946A!q<*b%LeUof;(!|P6fR#oAt_W4=ggcHY{Tg*OQ`NDG7t9
zRcB<|x0XxR*J+i^D<iMp)$dQ<yZZ3gr`huz1Y56DmTZZ9vCg}!_UZv;MT?lLZKn*`
zWBM;&K9C-8`1FAA)A}+Gs~6gNduJL{ac{hRDOj<7)tt7@*Tl=k!e1_s9lHfyNDpkB
zX;^jkiG7*j<H6|O=M7HxUf;Um*+se+6eRt^&%48Ub5wY*J?9FC{=|SejRsmJwVPA!
z#R&QvPCM}8eEpLzk%6bQ`5LuRvRAzhvt3gD3(}wSy@{tq+Zf1v(aA_Dv&c6vII3N$
zk)F7mEjSWobxdM+b^!61!pb$yn~&u;U4A8(Ut$f+8eAkLq%0HdGD{kzByLvAE)`+l
z<a6PSip}gAL9F^Rx67u7O3qlnwB7Z9xvu5Y$+pm*#X*+aHep_Iz1nCYw{5#)=Q8)q
zNAI(aMcjXDgqgb`s=K2rMgEv|UTu0o`i|Ed8DyvI4!@ceJcL*DYr+Ra6NxVzJ9?(I
z^^w612Q}>HtL)bsx4K6@yx4=mDzCV9r=bB;)~#V^m@BfAdx?(7ox)112!6hZ3azHo
zt`{5kNm;6M#C!`r>-6f;iDg~X(jB%ZZXR8fh53k)KK5yC_JQ~XzESeu#1b8~j%eoM
z#N}qGoeOub`Si4|bW4xHj*lOMjujMGrr*BvW<krhv-gW12T$$Uny<B6YExr=%nVM<
ztEF>ARODy_kxa22qP+AZgSlSsI3i;xCN$#GcF%7{2GPn*)0&T%B`?ZSUaDMBTF8S&
zhdlAhI%o%MgqQLLef_-lket7zm6cU-cy}w=kqbrb%ig=!L_WoKOI6kU%&e@^ydaKO
zXEzZ^99>tRHw%=@NJ&`P*f_T72#ScTp_awQY9;7ypA-7djzB&P!R_sO@~|{&F5h5O
zU44Du^Qkc<R&uh%SaRU>;*}*yRG)~5z264<`l_bB(CxUn8SmfOXoII4?6`mb{>1^W
z_3O7+Rka%UH5@N@Jxa^H;lQX6C{Mj0!ZiP;njp6&;=|?FjfE}E&HQ*g-tZLhi1%O#
zO=n+Dj_2C7CkjHjzTqS<uYL1&51+oxJyheaO{y9i4<B7vU$AQzmPc5(0gvBwXp?td
zY?vD(&D_F5Kvc9l>bjU=51O0XKf<`Sw)XRB>78i&tyI2Z5(4irv*agFo^am?c*KR2
z6dj~*6iTHYC(3xx`mWWHR-8Y7-c2XL)OxS5TUA9~wSbAx<{2R&Avvj3pVh0AlQ_^}
zRZ|biz2GorupPBsyQp)=wr#4~+KnHh=5odzT+;j?ET^%tveMM?op!ooSMIhTdef^}
z`6*_}{r&w)uu*QjTvm;+F*)X;_n<?l5Q+5O={hRi_Eqp@fB&M(wR*<J)caSs(HvdW
z*Dc|%Tl9jbH{@Ga1Ze8%RUe$UQEwG{ZX%1^yLRo`{_62eMw*^KyX1{IJnvO>8LoE(
zOmg+ODfi#Jk;`%?_g|zTZRv-ttEn3d6BHC&6%i5P8Yy>lMq>V9B~nOfdskQ2#ZLkx
z`9MYkzdp^VkR<PoB5a<)#l>|q=vfA{)RX-=Y|Y1K)4_uWl?q$98EF^&*gZXO7<At;
z;sAod(@moCm6VmkxXFhL_r|a74d)^sHa%D@ji<*_PJO{)m6u;CUW?}!6>YaT5O+B#
zj^rGGlBj&}z_tkvG$Emv^tKy9>Iv_+_Xarh#~gqq+df~v(q?I<8#id6p`jtP(0I<A
z3a%pZ;Pwb3&w?7?DQ~ox=ANFO%Y&*2ej@qTQ>k)!^?T}HN4s>GueS1tii)b+uxHO6
zVZ*Pc9ALUvA={=IH8nMc8>v1@_%}qR`Q_!?mn%1^pBY^GY{eoo-S7{~UGaPO?|(I4
zCF=gM0F!gh4j)dCZv<!>8Qt3@X`v2>ME9ekWree6&8t*h$El<8`c0Nu@_Fz2;I|Ks
zS}|_koNBQ{B$OUt+jt#gX6EGVEdKT}M|a~cwS*HV<lz{}_CD}dpJ~35Uqa$$(DGP(
zgY`}|wud-46KN+;oe8cRRJx-#MR(wH>0Ntw3w!+>t?QAgR~)0>t~=j!Bv&sw@qEpb
z=%yUO+vm)eyB$xC99-KW@uL6n8s{3v%_R}BnJ1&GvQA!m+SyeKu<}{zMd(xR1s@-;
za*-{$bc9b<A|hpF<^7=aZpqNL!WGZ$-CsM@xFlEM>oFNyvYR#@E#j>y^F1wC@USWE
zalvDk5Z`yaF9&#v`^v>Tl=lZTJ964bN(&w`i6kT~nQ`*ds@*OzdI5O}PTr{SINEbY
z^&<B)`<bV#>)7nFjJSOl__dx%SzY<A>0avN_67;7eO9I?S3bG2x>GhILu2hpFU@s}
zwyK`kx^C8~`jVi5bCDNYGi%Fyn)yz+o>e;?>AEkj;H!W33Fc<a%%|6sgucCBw>y_4
z!vW638@qPDucThO{eEZcbQ&$3UdqTl=em9eJVJ29DLts57ON<3Ky}VS2{U;H8|kih
zC_}I5GyKloLzP#!i+0cgKDIbZb<QfU=!WH+R_C(CCm9R9pb=e|{F#vcfpmRF(*SHS
zbh^hY_(ltlv6C-~hs+VzNxf(E#G7^L%6NYsH83mQoK|}+i5kWj_<UebS+(AjH#*G3
zBx(gE1XgPjSI^XCG(F+th*N=_<fS!~B+BFNM-0~|60mixfzF<F*Ohq4(W~>=X#2h)
z;P!R;-~N^!S~L|uHRT;AGoifm+TO#n#it*5U}WP%QBF&uM7sK}j7(@Eq-14k4dBGh
zgKljs>Sz<1gMLrzz66QzrZpSn^?R)_vrW@Iq-kMLcU{lwDqBVdiCIT?Cvk}`U$D2~
ziCNa|N`<ZTZ%cZNZ^iJ%2v)xrW@@{{hq}eDub_zDEf2s^()Wg+kc*|BPNJOI=F+^w
zyt1fXt1_?fbBWibSZ(o!Cxvj7+cXN8=+HR$9n;buWx6k{y?SJS<l75Ll<A<TRyO&G
zsn1+h$F)^CuT#v9T$JV+^uG(qGo8u4pE&;+J6Yqpwe+)v$yxGE6_llnhvB^ntpf6V
z4q9jLOebIM>P|0Qq`}nYnF5E`^LSAYY?Y+mx|x*h6&96+xVAZr(y0`bq}+;~5w(1l
zi}T+HWPQs$7rJ&DCFQf{QML^t<SCV&FM5tAE4Ar7?A&xYBe+l+WwnW}zWK6)W`|!4
z4_V_xML^lR^A=+FRUJ=eo5<2i@3Wu2$|<&!Y;@|%GXX{&GfUbeUI$aMa7KCPZXQ0e
zOUgAn-1^5@vUHS7h5M<U8icKZbni9}r_;$dUG}O}m|3@-XrwH=sLV5H4o{gg7JTt|
ztH@mQ)$8NjnE^X58LgC|c1oqt1as}$INH>?OR*n`<U4Px*}7>(74CLhyqOmi=Rd{m
zRhjuR(vzKMu<p(kWs}l-%r7h14J6p&7B%3==PP%-jpFwu2;kZ->b~H_a>S9Ci7&A3
zPSOJc^=2Mr`&W>fd6?RQ38B+b&o@%vESef4V4M?BvsPp3JPD?)aFE%}3ip|meBQhn
zdyWM#IP<j>)02+`xoS_Lr0{s;vVG<xhnO6d!CbhLd=aC$ubl9u-I){YPo&<pP&}!4
zl>K<MCbnu-_P&|xILQM>+&p}Os0Izj;y2U_S_!@MoV9Z`yLU)z_c08lyW_b;U7C%U
zJ)B0FHo9+1Hs)2wNF0&LCozR~2~9l`LVt~2FW%u|DK~{${#xOP<Fqm})QkYBC#uYj
zcoM`;uA{zkr^c3qc*-8{!5tkhxhn!X@JfpFRdKdg^=PyJ`A!$qbG;q~njtP^&&{s6
zx?+{C(j8wc?WT1E*p*9a8q}TRVXldEO76?7K7Oh9T7`8AMbvxH<=cbHW*+kFN<tf{
zmEv&nqOLsbGL8@A4$^i{$g$KdwL5vHPiIBBq;H{G!Wu^129-d2wPXBmNn8LK|8>%@
zlKm@;3uvXE)MO2w(_0GB6anc+hn!|RTIH`D5N3KDWZQ76-dIL2C%|jpltXeIwYHZ9
z!TiUqQ=e7@9LrkU_R2PU)#-34<~QG7ok}#PSp$2`S<|L~XnlrK7Y`ih4Ur72Zj#02
zX%`B#YS-?SuiEdd=qOo6>yNoxv#&ggE?F5ab-gt<_=K5!BhTPh?)CB11%6JOuYZ0A
z7cj}rS^2Jqztxm~n|*vmqN#@^%_b`}H1Z;ENZ1Lxx|dwluNP%xmYdVSDhUH;fq7O_
ztraunr6FYOb=x$HM7I_TMn29o2@|ppdm`~9oRELWx-uX$Pl~4Rr7LWaZWeJ(v9_@<
zB_Z23aY@IgUBalmK0{5B0PEdaZE-F)^3tcdaY?XQD`(D87qp#Wz!4|Jn4f@~&wl#W
zmV+is){wTgad5e!8c2*fE4A*PBck+vTMg!#u#4$|VJDWmfvx0nq9J9zm+zOzvx!tr
zLuRU{0k-Y4?M>e!LJr+VO#PJ?;ttcBdWom^s<G9;y14Um=sCrAP0I<Amow=?b(x;`
zvJ>XcmVs=d$;I6|(R5d`FZ&nlSw3qOi_^DmO^uoY-uJYKzRz={-;X(0cz-ahGT_Lx
zEoYlHgyt*H^Mi}^1|c$DI~%RLd~JtLrOJ#s9_sgNRkBXi##HomTIGM)TV7`rBef)g
zJ9hAhFS}(^8`U!Ft2P(KSr#iNb8@}?<GpEwbL(fBOih2M%<M3Ex{QuBy{Bvu+CQUo
z>K61X!n}<3jgE^9^muWH88Nh^a@QA^F6%GJjyqhiv;5_bcON+7A5FcdIDfesZa4ax
zZ{)?^epiJSlAO$zL`p@HH?g{s&m@4RqZZA{mWAH<c;{h}m`gh=(Qj)kTiYs(-P7m_
zg?lzm$x~r)_sz7cS;Q5&hlBDV`mtz()S{`71SJDgg_)tYix;`@RyE%{Z|vlQx}Ho;
zelI^&_~hR5#R-*rI;xi!(Ox@NKbCoN<6zds>FVu|2@-S}Q6s_QwL9dF$ONvLQ~gY>
z*>@mpAl}{KWR)!^`6;e^A-?zw7wUQnHF@uc_?uq>W>&AEt55sro2|dm6!#z#Ro+r<
ziHEBoejzq;i}8b}F&QWfj@vua^9(=toq^U=8bt=zx&(J-yC(ihV&S6#Pgi>Q*IIW<
zt3w;dLutEo%|^IqU`)R7lMfrF#J@bX^NkegZh&>|ml>ziFMG;aup8J3;3NDl=LVH4
ziNxO)_01(4EwWl<qI;e<q<?`)g`<C4-!$@i`yTxK=XQB6dSOaT^QV<p*$O+^KYy*I
z?tQ&noTd@M+9eY5T$MaiKZ<Y~8i{^I?zpDYg|<{H-1b{&rh8R*snxl@nU8LO!J|?s
z?))<toe#q}$#cEJ_e-CvN4=TCG$m<NHgU3rx0NK<y_ufi?j(=5n?7BXGgf51AG@s@
zTh;A!3H{?r1pKB`G7U38=+Y_eq~ti+-u{CEWG``K?fBeYYr{=G&x|mlt#2<$rmFS^
zV_PrsIvy6S?l;)q(>V3hmxUjN7Pe`n6XAkmcUf;|0;P<dWYp8wsTbGt;458WAPUth
zfco5B>z?NjU(_-0L+`ardd{qXxeI3ZVP{mnu8hL_Ovfd-E@8@?+>)^Qfgl{9H_zTX
z(9dz?NkC(FV>b1cd3;Gy{5QQG?>uu}ks6LWzO~V2Iu$#PaL`xp4_xQ0>vTDt;i2sR
zigJDLh1s*P5%?`?OAVG??mQ8dzxBn_`E{YDnZY$}0VQSJklVt{eYZXNOm4rkC>h`D
zBp&~GZ}{Pyd$%M4O+Cs^&z0cWc0`75a&HQEfQt0uw{^ALa_f&988!R9qXnG5qIK>J
zSHqq)#&E4Z@@=Ddp1whb(Fa$KX9X7m51un1u0571SxX}Ky*3o79#Cp45YOv4kz{-|
zF?UKrZwYGlQ%iadaIfPqShnr5@`G1c5gQtK>~>Lj%9(BW%*>Sh2c!tGyzLy1u1w(>
zEG&1YT-Lt3a7y!LxTKsgEq9Z$Dr_`1ncD5JrB8mwk_EHSDz^+Y`7l%ZUK0d&grB)6
zf)At@p(%yu&T};suu;0ch616z`{g2p`8iLnRB_zWVpmnDFeRzGp;ATh7DKPDKjGSK
zdG{~E<Ru2YZ`{}^u~XO}=j3>g`CtxXF(9jVpQo&1FIvy0Tz(4I=B`x5V86ls@=EBH
z^_42+R}aT$NtMi7tJ+qIjpMqCdh31E{xz+j2U-1MzG8P>YG#(1oX|+{do5`??Z&<X
zH_)8uD*vT-Hhz0hUKwzz%a5)2{8#3Cn$Al6oV<cya>qN9mp&l*Gn$MiXY@uK=$+0#
z`1E2kWQRR=(sU|_Tt?wjXS<r`nGZB^QWi!};i42Ou|sy6UyhMhrY>x^*h98b#pKME
zqe*c~Am2JmjA`rKe}843KD(f!kJ@`fX1;Fs+k_Nqr6U`PPp~|{GN4j~H1m?AU7CXS
znfoD(EM9}c&#AN`l_=SY0MB{ldQ;*nQYgOcH`suV&q{W;h?4<_+xn8ds#D8FD0d4q
zyvdL4jv<3-I*I%+rN4Sp{oUG+PmLLrx6;q>W=}{OfppLI^QcAv)GQ-rS-Famv_a9}
zyo4uK(bK_0a%DHs;URH1k1BI*d@RD`bn!9V*R;NR=*@`Jp;Y_E8VWO~NO#T>%YZz4
zUJBKLtGI!6atNbeom=jv!T~vUzMUylBc_rjDv%yP7@RN7yzRyb`@SB&=b9+$VP|0E
zBv?sJqc6%i9d@}(1Kw_#8Rw7t<k#Nz`Qe%j&8uu=S0UKp@kwz5ZAF%!o~;n9pnB0;
z-XQmOCB?m`2Si<ojY?>`8EIrET;UmB?%v{Xb@frU=BdEjl<_!`u4JP<3xK;B{kfI1
z!;`UvG@Z8r)}LaIYo^xIZn(EtUxnKjeAzvPPCOV`ix-)dl2#dKgAp$$t=z1iC^7Ut
zCwzbVQ*OHJ8-!TRY`}dZ-EpNL78S7h`r?X!cR}7xFYXmL<H&pJJ9o2FZ1?+wsLo-8
zpMz%#AsR(L-lnkv+z&3V!S5)cfz|w474Dni`*(6L<NQj*R%G!q0wX0z{HJ}3X{BfJ
zkkZX4a681A5wK-(Of<uokm*_(u;v4&!zG2~&Kh|+FT}}5ec6+yQ3@Bs!&-R-C6ckY
zIk(NXYU<N)4qN=*+6z;svytudS|uPeO`}mcnW+b_RuVo`7Zy8&({4p<Lfcz;ETLsx
z^!l(KzM;=H*oT&5npQt~UcnijQsdVV=V?$&QR=R^EhNTp<0=>Yf*<Uh&QA_G(Y>rq
zJ$z%0Qjbo1D?hrY;?sc((#0>4*|mrp!ePirGa@M4Tjj@w)9gR0if-$5xIHyYoypgW
zf_=*o=S|c3y5Z8zg32nbnpk^-N{;I2kMuBAruG5A8Y15B&T=#As<rS=r}R~;RkHfL
zy7A3H^cHV+WCY~NFua85LeKHapRxltJJ56bVdH3YiDX+TI*yAQj-3p-+HLO|B(LZ3
z@G&-AGErbG&RxI2yx(L43LRik;ZE^Gj-@nO!C~*gTb<0lRIX=uWjjyT(3$HuSwzIG
zjeCmosV#J`BXc245<KqKP?in7ncM^4yg))@cy**auTf(1?@j%Rrlg6$oky2(btdI5
zX!SS{eWM@l7*|&0ZTq;WJt_NxNnBfL056=Rf%I@ugm|qU+v`(9{5xmMow2!fsW1kE
zZl`r8CBFAoix8a30D7klA8^rk?XF*Z_bI(J>Hr0olKqyzH1A6dnIU3~e}B*|oc49~
zett&8dQP{x)1vg2rkTY>)0X7&@Gy%k4c4!C9Xa@g)_p6UY97%2ZJlaOY}>Pa&l809
z%xrZmGaw-%o8FHBd2Hn#73jd{+V#xq>w3K%k0&smc%%+gKGC{5MMvi4wbGb5E8IvV
z=JSlu>BW26isJUz#KvaDmwaXFlgNh$5(Pe>y<I8;K3!4Ercuo{F3r%)-qJ*9ATX4K
zrx)Kt>9J8P!tXKHlovTH-}hpd*uf+FsP6_gFOR%Ei{a(y6St8XJ2<P4L&GnOW5q5j
z`quk|j1MS7{hk(vL454=@?ILprO^2WbS^i)-bK&bBA((0=P7px*er<GI6!y*ByFT2
z<~``UTAEoFxNqRbTL^Q}7FkBsC&KZsrm!E*^*DHRo?(CF(JaW^h`V(3`1$nk8D!B*
zTD=jTUAypAFU#n6m*1RC_cv|}GoH(~Pq4x6-K<$tna3Cx2(*vO?i=m9GG%vW&^-0c
zW?O8M3m$&eVanxhq#AKS%se{jT!G6hUxv;Yyk!KUCG%VlKlK4Nw*!y%GWt?%xmQgW
zB`>R-GN`%fg{-G1yB6bAJ<rWOj6;lw51JCTj$7~DP~kJ0<>5y3(5FwiCdQ{XEiN|C
z7)3r;wb-a>ZQg6YqJ59oCs3Eai&njKXG+CUIF@2Rep<b|FQe%6Gwo+e3=PUPt#d`w
z#J+I6?4S`7iWkKWViWd9C=FEY3FUtDd@AL{%cKfvOqKr2DVm`iv*q0nbcs(l5;$NL
z!1s=w+1nQ2#g)I3jHf55zC5x0hRTedg}U#x3RDh8n7?)7qRfng%_db;Wzw4tkeX}i
zZ&_TKPD#5F4`<$e2O5#)x-wQzkDW57Yfx&NlWoaowJji9;rx-+jyD2k4_>CT=W!_)
zH$G0t+thc~!jvO!<7#(eeBli=eRb<gH-&xIXSO7QDwm*=RIY^|j}%$PclYmeSLThh
zf3XK&wTE0OVB^Y0x&OLy>kN_ZP3Q+F_4DbviZ^Ocrlc}EWqAhEpl}Fd;*TZA?=H{V
z@ik_(vbf{oYjYTJC0#v@m$aY8)jni~9jsMXJ(avMiNE=J?BJIV^nvB7)8txLXeGF8
zHCeL1Zwq&Slg&jQN(zxpv5S4(6mm$sFq%fOj*=?L&=5E?4Ww<ZE=LF24P2Au)F^M^
zq}+WSQZYw_^H>A-^MoP>G5grIB#Oql^V7;3+jL6VDM8a>p2Xw<=_~!VqH<(|kGoXa
zg_&z|HzxKNoXWhs!rfd>gxdQ$vNETlf;tB-v&DuCw$`i1BSS3%1P3=<5Ov`WuCw26
z!4cQ12OhRcQ2Y3<YSXe(sAXqSomWsTDL`v}TS--6MNzy;^ggeQ#VT?lGbA|TrZCsk
zt@ytCqb|;(po*To$fgR1Jv>0aZ@Rg_V5LBW!_2syDxbKGgXk}5-6dU}>@zk!6=crP
zTH;bp{SY~5ZWebunX1hDJf3QuL^UNApP5$tSc76oH(ODX99Q_d|NKg48VO1O$<<|i
zDA$edn8C9A=4B2{E35(Usq)()fpLiJ5PjgZM*M6m*Lcwf-XFV#dM@cdvbt3%kbgw5
zCXkMnV17t5$@Doz&rxLyp0*=o4&(;nilHEn|H8#7l+6P5@|<&HTcKPKcp#E3UZza#
zUbw_pK<NU+e^&k;$fKPV&d!W?uCJ&!sR$4Uy#nz|3uroPZ_k@=lz-(wQXX3}wd_oM
z#`K1@aQkyQerFm|8x6`J-|#WlTtABmCcobq48@VGZTO7{Q*2YY&+$70Vb^Y*GTJeB
zBQ=f9DStf_Ps0NSlz!eOp%GEe^W6A`SVmn};Ldwlc>D*5XSbqrGkd-)J*TL47RSyW
z5>vC|hBa)O1!fjKr~M!*_yA;|L1*dx3aZKzZ`5bLK~3Y8x)^q91zMj-7K&zr8tm>i
zot_&Bn6C(s_jaXBZxCgqaVG3s#>(#uo!(%>co<l<MC=vw*1kE60Zz(MWkjwdL_VCD
z7sg==xe0crwh`Yt$c9a2EOx3On$|-RY<C{)1iNn=^A<+<vcEk988ND#vkyw2gM5B}
z(Z2X3%D!6_R6MfDL#4tsbi&%1x{RF82gNt8uv1c|BtZKXh)Vg+p5*c((W8O%J{*~=
zzqB3|Hk)Z4iH@-mX2vE^%Ra<IsTf4$@cx1sf^WkiNw11Qmbc(WKzxn83wy>9T?X7Q
zAP%Um2u7MI+MvkvR1)Rjrh7NKZ=u#T#Fq!G2{}+15b2}G@Eb6``pq?!YRUmu)af(H
zQzB^zS$FSNxVL~O@2Mip-q2}~XX006)CIpuDmeEX_Dt9SiJ6lXI$d=WT`1+i$&2tX
z{^Wi4)FGxKer^i&6+Ysa^b$)~r6x!a>NQA^xlog#Ap?b7#|x6;G$8-GZ90K`-kK(F
zfE8wL;30G6mM@&bzk$(N#KVB}_~fLM7e;T<!T7Lv+%y9lx-fIGzOMq^wHZ}hkMig%
z52%bmZVKJGT|t$DxR+K0@IA;haT9sMsSlA?f&;t!LlV_2a`t;3U4~Fk5WRFy=ybSL
z-%w7ZzB*`kRDVfn30%i20uGa)u&T_o+ksIxH}B$9$QQGdv3I8FRj9*WO6bmOt)mMa
z4d;sD89YX65hO3MnsvLN*a~)3mHihLKb?C=p87*3BVyqaf*py;{iWuSJC?Cengk3o
z;XI1?+yymVra-0c)A|(Zk-qfRowix66?v)A2Lc0E^{a?n4QxB*BojB_JnKN2j%yUH
zY9Q5gS`oHTUFK2_O=r(%t(UX+P?C(fMekYMO}Lu@KGU<gL@P|6gm-&74B8mSF?aNo
zMTJOorIk#5zvp5qC5X7NCFM%YQ^I|o!7$4lb(h1+@jj3DYj+YC_{r8(QVxENK3$Ty
z;&7`>u%zgFpX9h)UpAUN;dRU!$t~`TPyKJ*r<@jIh6MliPtfOET(DJB+mU6*9ze4`
zl;wPDvooe1iO_x!1?>c(dEt;zApD0yLBqo0DMN{sAN7YzCxFO1+dG?}usVkz@0mlC
z_1G^U>z*Shvm!@OYDJE)`0{K%#nr@7#YVCO<@GyfiC6)&&;o$vp9gpehJYVu00gmm
zfW)H>M7cD8u;hxJBLzlX5L5zpqs5m2Zqh=4AsPc5pAjI8szX@XWA~_HBUz$a$Znj3
z7cA=rc=${KhR^VaIt*EG2>wNRevR<m1lb_KgL?t6ggC%MoX@I*NLUJFagi)s_+?g&
z**?EU<ZgZiAHXZQ9oEqf@VFvak1HVIHbOXzhj5YeNFM=s)P<mC%x*#D0D#nim)HY%
zFbqIIw?jBAMsR`cXN)Q~k`>mD-%U~r0|H7R055(NU<7UgG^PjOATHcQBUT-JvYweE
z1x8(n=qBwJ(~JfDirWA|_BJ5OuLcAeKY-?a2=NF5+=8ZnptyES{6+Lqc1!9c0};(b
zKv*pf4C8{-ffdXKXmMMBSM(dRyxy{`eZJv^V1aWsSnit(7C3DKCN}ZFbV(GD(e?t`
zCaZyhen`$Jut&0?sTWW7^z?uaA3lKh@85%m4<CZdmoEdTUItsYZUvD+fxu@~?DdfX
zqb|e@lLJW_>tS1~fQW`a5K&nUM77pIS}cSA*8;565+I_V7&xlfNLElcaXr5_86b1u
z&;R3C_mOu-3XHl?aXwC#UXTuibYp?U{5?QGD+Y+0?t*p20`Yk}VLl4*X~k|BRcs_{
z5>Lfg#M9OpZ)jer<A2{y(fy9OyvuE~;UsBUv;=1v&ofd0UeGuumXLJ@+9{);EiyDM
z7K4A`4;n0Qo;H+*Zu~oc@k)NXxmoLxB^-Yi0LMQc@Dfb{k=Gay@rFPEu1!LiIY5|4
z2Z+pq>(eX^AR_5D=J*_q1+RinIk%_{T(1@lt$Bj;0si|u=Y#e0<Mdf;jxbsWkhrym
z);}?a^3nB-mFHFTEoZHVtTq<HHPr;*;5_F2zApZ%4Ph~-->#paw5}X0=>*VXwt!o}
z6s|LdL+i|6v>_z!{M+>tmDiW!rI!OVF&!ocxF#?9WgA4i@yI?QAo=_C^Q#7x6XaIH
z^}Ye1vGo8$h=l8$`A=;S2=jm%`T!8Z!8r;0LqKx*Z^O^88eC4Cy$0|~Cjc~_4%?^&
zyjTiA^DP}}gJ23|F-L(AuPbY9XZ44aOT}3IIr_eUT4=d|qA&Qljfdaca0DdGDL~*|
z{!^dxOSo2!u4k;gfO<qZvIhU$MmIq7^Z`DeZh+^F{)twsaV7ct^$Tf6l?$teu-18`
z4L&&^xaTwjH0~>Gg8}g<XYD&bjw^z+%Z;(%9erO|GqzkrJpv$Y2q;FtJ?$L8iQWJh
zxR+q?T>y>lhJEhyQyT;+*PEm387oiHB9|lkorqcj;FFF81i2P~7Yl{`;RUZ(0<6$k
zh{q3Y2$%p~Igj7&Uy^o0xrBBC5Y<cp{A!N@zfu(tP!1aDk00CM5pV?DqSgQ}zq))Z
zct_tC)lDpy(oF^8I$PoXv>Oc5>c>7u+Q5l!1sHKS4<T=bSMd7n`o-p?l*{OE0Z1DN
z9xPgY?~l=KAoCnqOOQ2jG@N7QLsKt2rnbES4;o*9nuaz|TmKZ?x>F0zoWBVU7n}n*
z2abXryY_<BKH<RIHw47T#)DPvk*#CZH~N0cp6d?>1_r>#j~_v6Yb!u_gSNId(9qDp
z;tNilIt6lba{)AV17tE8By9)+L4M@6(e;d#7c+>@71Q!#@e2z2UO;M&KOm{N0%>gz
zAg#9!@XOl+0eL$hrsV~Qa!UcPlnoG@6Pr6$eWULawW4!GP4}|+285>&G0pnhYoyHR
zddA96cKx!8(u>tsTma%`djY>@I8bvv%eqGR7&X`8p=-$7sJa%ht_5}D0YNq7#8~i-
zzHb)sFx1%pGE>*<+<?aN)BTF}#~Cu#hkM1$b3cok{W%HfCiDvEr+SaB=l>!P06;NN
zqLY%4x)DB13?>tpM))uc3bhjQcS!nw;fGQ8x5Y{?e~FcHZpR@>(y1LU?%2*N?$AyU
zvu`Je*me*_m$nl{U?MGP=NGnV7ZkQ`7ZO_BE-Yx(P7<_wDJZ+zX1us!Wmi5!<{5JS
zM9#1n$TMOEAWuh}2lsblz{hJabOyu@@pVFIUDml)gj<uv+lh0k0bwDVXX9-jC%2Ny
zBesM!$A5x>Xu{$zkhAdL!9WtSrjECLyu2qB*&}|00R#C$EaW$b&*FavgOHHTxZ5Yp
zUPHx5I<odD1O{%wc_aME@4_HNS~C9j6}+i9DHnjiz#|O#NPZ*8TNwT$7z9O@j=Oz6
zrL|PNj2pm^Hp4SF<Z<{`K;G8=Z($I?LH_ysm=qAP9e4XgB|j>QClSqnvWI?v!JP(J
z-ZaR&TaF2X0%j9X#z6iCo}~~N1VopOyM2D;^;ABV%pn-^*l&kmz#oEgl;e;V9)E&C
z8kYv!J^=U#Mt{r;v1PRJj(>iY04gGTL15sO34t)YX2F2Pp9KWWeK-$Rjldv++X-Z_
z$KiSJ=ebD~9e?`*szFo%ML(AOX9$L{Kj?tF0C+KvSacxb(&5?Q1cb-<Pjizv0sIA3
zL#RW1-LGN5@_dH!s4gIYLHK&(U(O3Yv1Px_KaK7uLA5ZduuAav^TZ!8;Ka7W`S5k9
zFW}jQfc^mS_8jR8M9w$7KJbazjk|pz^>8X8Kl>2|KDhvZ6^67Hc<~bq$XRn}eK7io
z4!q*aUW~@;ck?8TNUEqtBp8N)I6EHTC7%Ia321^ZbO~TZW8ix5VrX7qUc<2f<(#ZF
z>JJ$36KG#VE1HV%_y`O_Dp7zSu@;_#s-P^g91tX(S@VK*o)AxkFnj_S^p7yWb&?;-
zY$cs(zl-na_e8YFR0-{P);U91?I;jXDFXzBZ-7sBFFZ5-F&;+4faY@rJOXpUEVyrD
zW!%QS{)lSFQ4#qi0)wzt2@uq%1463VKaGds_2EYtu)HUr3}p#x-^9wU7<c<(Itf&%
zIU4~2gSd7Yq(dC5FNVj%=()*)L25m~NqMmLEM)J-$$5;wecfa#>%8|JhT*>WaZLUS
z2E5D)2*c36iSRI^`}KG8?m-2wvk%<{dvYs)e{>O87gY!nx19r9(=Pz>#*@HxZ5FU!
zxgD$t+68<9w*h<iI520vKhQE=11y&K0ei;)FwZjJ?eDfX`n~KUce;@?;_KJ1AxjNd
zGGs)K+}zv@?%lfwpko&(D=PyRE?fX7Po4z(_wNUBadBYFmMvh-nl)g{ri~ybgxoi}
z-rvn<AGzI$v`eScSqW*kySp1OnM}~s)CBI{y$dc~y2NV#(4j+M-@bhyBO?Q3Wn}?3
zH)!}A77Sv7;(C6!z0vPU8<8uev{tdsv+5?kK+V_($m_v#t(FHXDd>9w`8l3I44!d?
z6rg-c$q7iPxd2fm2SAWs0{CT?0Esyfzb&5{-9Aw*lp<!H2hdW^Bj;RE(|rIV>pqev
znd|{LxIZI&I+BD9w*x5W9mykgjIQ^0^GI27^Fsh5<vLQIsM&sig))@k_C)4p0GxvN
zNM6`@C*W1`AIbl}+`hO;a=mfTJuus@1jsHu3(xEkz;OK?px}6ED6bO(^nELVlFL<A
zUT{t#&{=a0s4g#K<%RT95n5FLF1<&;XXt;uTEZj>h#G_e5xr0#tOI3>TET!{BM|VZ
z1^`}V|1lF@5$b2;JOH11=+)8n{%(GLVw=9r#*WHG$uG+m#8FG;MLj=l7~FJ3*Y9DD
z+Ny?K@=i6I<el#RGD+K9-X&_9eMr<WUHy04`#0W0)|WvPD(>G%NZW{<0?`$Dz%(MK
zkV2vGTtf-o{_pqy7zOYOtBZL=tOt2WR)c8ag@YKFu)>yuSfK@jI6;d+oWT4+Jipl>
zFLB-=AD`(UAFuHs)WHo35Mbgp8Wg}A4hrH728FQtgF+a+L1FZqK@wVbPz0?#D9SUG
zND|IxCW|aQlJ;MR<UUY8CH!6XBLrnXg61sw502jq%79FvJ%b7BoH?X-Lu5hly!&0p
z$I>GrdOm39fav-}W(~=N#JJReIHxKQ#TkB`MEC~~J>*~F0A*N+J;t#7=AYsqj5QpX
zEcnrqjsrYmOQHT_3>*Z^SoRZ$ermip2;(LXevFjUz>wVR7dSwjFc#`l5xp%ULmMv+
zLOA0|qd!*KWdI{#|6T6(0}fCIiiU8r&eu>5HW3^I@g|c8zs&LhMECR)4p1l04bR4i
z?h*Z6uZ^7m4g$QB2R}~6Z2&nxjo<+FfWzndVfo`kaS-60J8AUC%efCA`ajkgkhBiU
zDBxKb$^!nEI0z6-Ck=jH`BekF@Qi`rfDwQ?Uo@2UK)EZHHx=4W1w%R0A9CQ|=?8w?
zJh(3m*?$c05Bz-dCJ}zm0Ynyn;D8lA$&wEtIA92|Fopah90Yl7fH5}($YaBXWV+w?
zI3m$((%^@3{{cRE&mo<=@MV_$03v@L!XXCs!)CY!A+p!M?gxHor#FY^2GHO+3T=Gg
zUd^(>8QP~O6MjAg?*YVygN1{vH{=^0{(wUpgx!xNv&8dm9TNvWK3ky9a|g<^PryBT
z?w|H)zDcA%QE}}6BG>vEhX+64@Dla`v<XDNhc+XB#sLrMuE0|b<T1r?e};V0FZOA|
zq{8nzfY_gm2L}wa<&oy82U6(saDSdV<{n4jH=nfePgGhrAfU94Wf$^i97c^L{0?Zl
z^NH0DXg)h2%F_r$Fc;t$oBNmhG=YEqq`?pMHUliV;P2po*d6hFVc{SE*C+w(C6=x3
z-|f@9lL)_nO2B}SO3;wrVN4u;m=DmlX$XfNz=th?Jcj9rE@G_x0iJ;-js5~EK?8`5
z)L-F%CFR4t0NQ0i+bq`F`U4KU_{=farD2|LGU11Mrva9Xdkh@#68>;a?SuOG$G^k@
z%L{F#zw1H9<d*~|Z~h9YZ5TjouYQFCK@!RjNe2L4DjMK~p}vF&_XEPKpZWoZX@FyB
z;SV_cf^QWxXHM4nOISU8KvW}&Wk2>K4t%ovAl%RfUFsmTi+clki%NhIwuHLT)v!Nm
zArAc`W9e^k5SmQ*BL;@_R)65YFSiQd#N(h%Vm`Frd<$&{s{oE<1@o(h_GuQs<N@)x
z_!~GF12oBM(&jHoBWgfgD~_f2Li#~SEeG11?*{@3k$`u0C*<px04E0h0w9m^)Bf-~
zI3V*vcmd!MT{3C#i)h9SAohX7IEZL$0Yd7B08yn2`U`vm1o>Cc_Awm#CH!KK8w&@1
zOV$|zv8_hr8a$#)Ck=j4t=NGfz26WHqMF;F?E3@DW>ZkL4C(;m|8i{|;=O+!OBmiA
z0F9jEzRNYZ#U~Md?YIHNMspYk5uE}kH@^pUhtRfljCJWx{L*kg2o(Y}p%Gw2*8g;#
z=8>?QH2RC{#1Ba8ZDQG(4&yL9mVUJ^jmc}Ua2Ptr{dAs2Y?>tPCk=iHoumOoZ#t<s
zKpEL&t^bm`$pf+mX<$-ufHJblf`9L!n}av*w1A3R&EN{<5!ju36YSo91MJGF1P4!4
zfwLEHvuuh_oGAmTJBmPL(lHPcdjN#R<$x_a^1-IG{UCW$7Fgq-0<0W10CSslV7|2v
zSiUkC_^yipf&P(T&8iTnGMSuTb;HZSPoF-4H*emI=$;W>38H&O?!A5c7F1VPgIl+5
zfoIR2fyTy0)^%xVDL8lT96;=tj~_qI(gP<XB!KYnaFCXk2E4qyz^2p`uzB-lusI<S
zOb+xY)ZO|Qg9yBcu6kH^j$9);YXpAe*WTVf0zYDZedWp(aPi_r7W~JK9Rmdg1uXcJ
zl9B+7u?aFWGr`K0D?y;wYOoE#At7lJ;ir8=U>qDAWZ{6=i?_72`~*K@M~=|`@#DvU
zLZPti$A{rRdh{sE7GUq*y&yX~8|38VjKII%b0tWR2m#w-6DDo^D4B-QHB9}1y6Jl8
zBp(PY9b>@)hZt5ewAujg`vWzTbwJhF4;U>921Zsvz;Iz8&^1SF*P(7-a|P7nyMo!e
z?m)$GB~a3L2MW5&fuOuC5Q0fU(GJLJucc4c_`%Kg`hZ9LN7Ocq=+TGu?TD_Qs2TOA
z`-n{dzs`_P-SE4}e~h#X5Y$cn)B8vplL<d!hahI2|EG2Z^`P&>q7#3*&#x5=q^!^V
z={`aO*=1M%bpJp2$L>9ZHviFo$R6h37(YZ+-yW@1SAl7G6Uz<+u^o|J0)3z1994BG
z0`sF<ez;$Z_#gp!+k;?1T<gevnI+K17TR}6S?mIf65B@ZBX#kqhak2cAIBa66MG_V
z7|}0c5Cdi}%?ARyaYIRm47j1cvY>VdP_&1(h(Fv%OFF=_fgezEJn_eU_#7kc3~^ft
zRGm-%d|w9oUP&$gGBGH}E^QH6L!Z596Of*t2&Cr41BtnDK-`!NL=9sBNk0Y%&xr<t
zI+4(SI06tg!XZ7wek(y=9KZ|hE|E2uPb2K**bq$Y$)coJ+Z=Xvep$Bt?H8Mk?LCW<
zU(gqjsUOUupLH6AJbkMl(Ac4~_Wmn%&$<^%Zq?M;&Uc>wPLi{yP$ex3+DRt6J4B4q
z!Y2mhf2IE~DS+@}(5(qI@}Gu6aUl8s{!b1aM$sFw(=vf69;OjHEqLPwj2?ib|9<~b
z;D12@ezhQDqH>_~NK){3CjO8F;q}kS7v_i4S{Fe%B*FamM3VD%{$-Me_eaudXEAA*
z<h+dk7dVW!4z#pOCnDcOeEoQ!TpjT_{KN0?N82-Ky9ISjyimtSKy1*UFCr4Z0`a**
z><fl{zmPaPf-s&1;+M#ZIWcUDhWIDK*cM3q9WgF-XpaVM(q^gxiJ2;Z#J}L(c;TOD
zImF)`IkWv!8u0NB`9Tu#L;jc(p#fr>H&HysTb||P_)lp7eceWE_@F=P|AGeNg@2;u
z5ZU<e(*W9F!f}t_KAaF=SR_r91{1|&yyb^&2LGN0=Flzy#(sfz6?o|DHjMxOY8;Fg
z{)v|R(Oz$C8dv}f|J)J(zR94$MDZAJdBo57uW11H1Q_!NvA@JX+oxe4$Nx1A#tZ*M
z%VDLU&E}XifVS8$-pY@5A(KUeiQ+Nd@+=+IFKGZ{O2Jrb!?p~QO@r~mKhbi-Hlsg}
z16#l&Xf|XEf#|NG%`SrfWYS=wc#O9^;_Lr24ICi<H=m{VM(kNwHZA`LG#D@Z6D^0>
ztNus>G@%&Ab=n2jJj8Z*$bR_$f(8@CW4z^uZFYxgfZ@9hcz9sk1$+*R21u+iUi`lQ
z$v6<gS&n&L7%%)2Ek}?WviThz2Ux*UmMzXO4Y0gPaPJF*u_pr|J>Ysc&bgq3Nd*?O
z>VX7q`7dcOQ9Q<5o)zoj2O6OH-i_E)4buQagg%WtJ#g>$9@jXSjol39&Uy&#qEACU
z+2ohJ@_6B&Xt^PKV;E!fI}LCm(Dnqzc^I}U`-29MPk`|j2)JX=E`Q!{j{_OpR$##0
z1T@h_&>no=knh$n&I=R8W4z`0XAj$4|44%izoY?{W%rBNn_mAd8c5={10C)bpo%#M
z<poImq91&}M$urr@K3ZHzrv3;+kemiD^mPR8sKnwthvAk*TugY2O_vFK#iLU6w#NU
z%mj(a`PXNriQ+Nd@&XDlro~To>l3Ge5N;b#<bDZc(O2PlaX#zJ_;=@p@xnjRa)OHf
zLvcO+M>ODvV_t^)HIPJKhwCMb-Ta$pritP)-tvM<0YDJO4q(ML8G{BmkzcO|INYi4
zbD@ki7YNXXTb#QSh+@hhuWSbI4aIW(9U6=m{)v_og0V0WTfTA80LGr-W%&{G03x~>
z#_;WiafvG7c>$gs{^5CHqIitAys&cch+XM;Xn=*WkcMd>z(a>)9>zo(2ahyf_$OM9
zq_Tk(TW8pB;csa`D*4mC@FNZQ(TJ~=^FOA+MDZAJd6H@vAgTTy4S40&Ksng0A^(R_
zJkpOe;DdAEk2BMdAHm<9oyQCRM9Yb&g|mDn{+<S2(08H$`r?0u3GttRJmMHMz+>V1
z_tV+=?`bemJjPpIR6P>fXa6+~pe_vHMN<Gq2-;zY?1p|AXW_o~bxa!Iu+X0Y%1i$V
z4aN)qM9Yb)N3-HvjZK3<7<;T5`f&^ZUhxPRKldz*gEjztbZa4go8efv^viL8!=3*}
zG?*wJ<1H@+?ej%7#-M?6AoN=)hw>pNi~$F2qhz6fqUZqhC4zo80x*`nxE;%1cIeFX
z`KL1zvL5^s8jKhIiIx-BB!BmL8BK!_7<<kh;thRaWsbw|P?W%HCcui-K_4*ae+2EX
zMxUK=QvPsG&_?73zfA)eTVkSkjJLc5^!X9j`k4kKb@+`3nG}E*Sp<mEu7Id`k>&q`
zmuiP&e<6&s<?@3M&>!aoM27N@X#nG!AbRKV!avb+h|drbW9~;9kkqrF9q>26FBc8t
z|6OLq|KpWsLK=L9^zi;mUio)vz}g>Se3xOp^F;9&Z+S`WBp{)a_$L~OXlw<7>Q?}t
z$~Qnzf=Pi1{ija;7Oy-O4e+>ga7`SNsiL91!H>H4@xnjRa#AqPA<N%q6b*zlt^uO@
zAmCSj2KZH;K)g@<BR+8~8ej<P5I;VaPu7q6#);xF-tvggmXvPFPc#tK-Uo=<gFry@
zIoun_f6E_?B|rEx4SJ#PCj36b4{=_GX)s>+Ct6N=4)pngu_k|}K?)GjJ_GlK#Ig6r
z@4ni9cV0kffS2}xduA@&JIL_+J-^mBP85&vmY31n41LBn|AGcTuZc+f&9Ql;zm^}c
zXaM7L{;X&ES?@ev_$OLUR&VQfpR<3L1{1|&yya!}(}1l0wtt-l<Ar~s<>U-@09k|W
z|2hpOipO}%-+%NHw6wkkPoA}drYA2z!^2ikTGk9x6DYloq(*SP@-e8o^8kJqr2$ml
ztOeI8w?T2q4Ul*A8pzJO2=-(bfo;2wgUsyXApg(_kdu1^WM$`rJsJB!P*^H(_lg8g
z?!my;X&rD}z7F{Kg@Uk%SP&ga260hwAUP)fU*rD}e>=q2?%lh0EWg2F-@zf9?;-z3
z8jS{edwaqC`}aqDAd&C7A>VUBeDP{(YDRqVii?ZE>C>mdi4!LP;#0VL_im7wm<S>x
zBSC0rDA>7kCo4`bIW`7t+qRA67nz!x`mf=S;5qDbh~WMs{=@#02>!?qp#c(u81Vre
z#{bcyN33|nh#w-75d0C`N8=wG8w=9Y(^)==h)<};a#xTVANT(i_#?O>H0bK;8o?il
zfBf|6Q<nebF#gDU$bBRR@-Y54Z{8f~`(gYMKT;$%@^JsBq@=L?N)f+I#HSR&-`&*(
z#IExJJCYN?zuo@`UdRuj0pjnA%!lXCpZ^m7{{DWJKP}Sl2pz6pzy3@74;(na@<&Db
z9Enklq|x}t_<4hU(V-w~WAeW?{`H{`s?p+bU}7D`O7oY+0uR3(z}<H{Ole@nS{UPd
zWhyYXjsV7sBcR`EI51cU{j--v0z3D3VCzN(HZIY?$}ticSO!4fRd49K>ID?$tb)F*
zD}nC(wZLehFVMH}272aRK-bI@h^smP5d~WysbUZ0)f|C}meaq6|18nPEc<7~pX^5;
z*3s7!ea^$Gf2gg|bt5p0cmJAbIiziZY7m(1e4FJf_$Sz)Z8#o&iw*jEvHZ|}^&E-S
zJ=^Iv;Ddf`zj_YiZUA}5o6sLG>6g#{ZTyLv(C-l9hxkAL3Vs6Ak0H+ypS@o_$HBOH
z$a4XmgkL^K!?>8pb76yRzkL25{{Qay|F8f58~^|RI{&%h`Y$;@9ayKl0<-N)fb`-M
zBT38*`PSiL=(|j2Jy&wRGV%<0PuwCGaKmq|5R`qvVpv|yz5J)=l9u^M%pd4??E)4h
zy#Sh?w|;sqweT?X*M{GD_!sv-ZZT^hvtTE1+}#D#JZ=L;m&%bOyQG*Uqb1FW0#19n
zfTmaV$TQ?UIXh@8DFJmr%3iGUx_<RPJ)doV8NhGpL3y7Yu;1|(7z952`MKjYxVOUZ
zX#9)#3&U?`{%TMAzr4o-^=K32W5!$FK8*^r-3|d&hrK{~Sr$;T%>)WI=|J9k50G25
z8^~Dhgz*q|z;A)4!S8=>1EO=c0ukda@S7)_fsp=2fW#L0r%3?DMj>iOL%u7R_1zMJ
z>V`>+EBJSGvEBOSzFYQ3;GFRRIPB~M%hKKgn@t_SD)}Xh4bcYXM?VL1!&(6R1_#jd
ze+;zOJ_H(G4M25e9Z+<wX7M%1+WAkCynQ8%yHX6q=H~(-$P)?bZ@T(-a8Bm)1yQZa
z^JCle=f%?In1r?H&Wm`VWggL{VH((?ZW8!d)i9u0*~F(&QQxmYLD#oVUUO}Ytg1)7
zw317W#CVc|{Vge3`%+nX^D~N)Ci~%+H~#zmM}hHEU`TrL<6opMM4*BEkNfZc|F6)2
MwM+ik&qLS$AH2!zi~s-t

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/hexen.png b/games/NXDoom/data/hexen.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b94be2e5160fb079034020b86766a3a714907af
GIT binary patch
literal 5033
zcmZWtcTf{fuukY8y(M%AQkBp|dXe5Fg7l7bsi6xoB#3knlp>0tB1O9NPUuP%kq(l8
zfb>wr00ADqdH=kbcXRvg-R|7(&D}Tq$0j~7(W9f`qyYc`bO!p`X4e|^pHNX;W3QUa
z@U<cf)-*7ux*iBBw}k6Gb)ddYFaW?4|DOO~tR1*t8#zLBtV13Kc!Y$z1i1sk!^5H8
z{yxF3E`jdQfFRGedn%j&0E@7J_C526yxn(EDL3_=4ys!$smit~*S%<4iaHyc1wXsb
zt;I-^tjBN9n8uQzsU1U|Xd1(4$SM*;mEcN#%j_nE#4O=uf<C_sw-i;)!Gbd_5uGAf
z<I9~gsyZ80_3z{)Y(w>;)amliX6{_a(~+G$-_fNJt0s9l2L}t)zo!-#Wsl3EoZq7<
zIKBQCI$zb=G*fLI^8|DW+}UcN(7KuC)kpP+DwXO{iseU$E5ub>P?#pwOOJ!ek5SO<
z#ltiiQ)g{gW3Lo_uavONZm{$R85h<>XXD?LxG<!yQ0XJDJW+FhMOu4xW)a5KGXbU2
zO;7dX-a_?-vF#S@nJ*hL8P*xRJa+K&s#q`XB$4UkSAOA3SzUe^uq&e=*j38Z$o^36
zZboE#{U>?-pD8SYqsOL1%36tnN&ZYyEx9}9Bo7(%%r!qS>jGf=`tA%*|C~#X_zjaw
zylONR#YBunDZJvEYuY8h_56pWa;K1Z{Q6mN!-|z(R=_AAE=X%;Uc4<FKPXO^*!IoZ
zofo%m%Rj=t$lv(D$LHby#dlk#LVVXtINl*BU)Fb<vw{O72;*HJ(<}I5fq<2=bC|Fp
z!crrqm4tkt*a;Da1@YF6`UiBC9H<6f=M%(dCgkdH*ny{fCui6C(au9XszR@+5MAum
z82gizzDKLGYsz(q9o6by_?>apr<rCgtsZkC?Byy!ZoC;0!s%fSm!}uio`~DSxQ*i6
zx5L%Bmk1#&+G)&`+IV$Vz5QIy9)9X?!lOEx$l^I;>_iXYRa6<bpQGfrzE}-&n5NaR
z^>B$kJaO_238F>ifQItaJHp8K`0gJa)d?L=MHpUz;vK(@btnTP`Wq+}kBG-_Hvg^t
z;I=Ep6YW(_nosGhg67x`Vt;QrwZ;5|A;0*a)fJ)mj0-5St;532duKT$_}cC2p4;m=
zh|VllN3q3=on+L~z0Y!>@3vY~+3a@Z6-$x8GW3V}AHFpGhJrgy8IIc4rFUnZv4e(F
zhpELILMKT_tYUPV?f)ijZ5!PyYJ?IMp4K7UCrB#(0xBc7O5&++xN9zNd={+ZR&%oX
zYtN(**%`wp=X1KbVNx?mS}8YvwWX8)My$%_*Jk^8vQF2*HQA52FAnNH)oP98<*gn#
zjaKI(KXAg`Iu(P(EJ^6q4`geV2fmGu9(~6tLh4%C%t?ELgFB>;HmOM&1#jmif_hBW
z%89>2KCG(Hc!B`0CCRxAog8luL{9~3ZC(VWo(3%zsfQM8F#3%fu6nqSlhgiW;RI_G
z_&5WeR-u8%Eff^rH~ybti<;ESLD|WbyrJ@#%f?b(BJplLvPmW5cs{>yYKny-u$D0z
zC`cl5wEL8!&MXqO%B3IOie;Iq{G<Kh=y<~iSag>2P*$h_^E%Y*IISXgs|`ACV76)4
zZL!L6*oo_Z*<~`66>0-bEnypEpSijlD0H7bY6l#oDC6V@))E;i=BEFB{k0Wlbjq>-
zJ+ZxaP-~Y77K-otwcY?#90^6Oh>sH`U*!0?G{jBiMZM!3y=;rA@QG8}Pd%G&>`*2f
zX6VS+1DiZ28Ftwp?H~HUq=p$w4Gg<QQq0TdFZ(#We?3?^mm9m!=e_uVSx7z~{7hdq
zkAufEV$l33!c7X20RH&9n4M`I##>@P;+leOhRz${{;=9cVLxfKxW&b}oNYT)?oYXm
zk|$IwU7dHrzF6PPGL)8=2a%RrJ!aA8{#ED6pd7wu|57ap62tFB<WWcF*+U0+c5XM=
z`Wc)}s|ftEW+nr=fT2(B_ZW)RPsh4^#pCfwGnwt3_?{ahqoYi5Oq(O3pGUx-kHMSQ
zc)bqEPEq^jSI``aC1F189A8}I9st+Q?T`m5XCwq}{S-4SVy@b*^_hX%hp+M!Y&`iL
zqzIsSPV!uH<E<XEx6r34xRlSn^Hy=>7$An<8QIz53gXWhmR3}pgF8Zc5?Mq<+269|
zfzhi9JR2KNcm)LojndYRp0I;JRt8^M>*F$x74MV>L@&_)%>-7EshdJ`TpvF!+ilm5
z-Q3({vnyRyFg7s>b0bSzP5<U*nPO*c?d;<6VYj{BatB<A+j72m)mD)&jgq3Zv9`8m
zLVlc>Fb&(CZ}7iPK2fOmZNqALd0&B^g@whB13mpFM5$w4@#yF%PdysB)XuF}7e3S*
z9Oe3@RD_nFR_ppwGqD9;At9MdZQ<3Nk`Qjipih<lHa??&{)k3q*-)X(XvUAGM{i&k
zTY~eH!~Lfs2H^@d(J|&_;n_)*TpHlG-$$p7SP@PxF4ysVRS-9bDUC;YIs+EQ9q)U$
zt&Ax|$x<Qe<aTf{=-1YME4@|6F~3&sNs4!y+Z5oV=tt|@VPxtP1cE};zdgV9Wh$b!
ztxsHhys1RESHjnq|K53pg=Npp%?(5i!kbU#eK>d>pU}EIoMw-?K5H)SM}_=&Z~)hi
z6-|1bpYJ%iQ7uv_r=_K3E}k`@f|Pxen=6n6sh_qF9+jh|qw`Z5_y76^sB&6#)nib!
zYN49Ix35_{F9K$YF-z<jF<?x0Q?22xq6F%{fUT_SW}IoJ>9@zs*uQ5=0Xr(l-3ODU
zPPK_9mUrn2YetF135UDBRN3-=b@VbMi%7B-?76D4Rh|TIF?D4-{3K1gyVyVSSs+DP
zbQfSk%w%3`Y@gpw*yX^0)G13TjtPG?zgG^v47_kMLdY^?|F(+uOLY=Z_m(TOSY7QK
z9yVIBDQfT85wk98|2-R~TJ0q?*QTuSq$3t55;*fLU{ZEg4h1A;%j|r8bHq_k%tlDO
zL9OvR1G?nYxoU~A=|JLTD3Fw3G*ly$Oo0KYh2fq}d6Lm#<r^D9D__p!^xu1rDs9B>
z3$HM67ktOa8z<SA!@8rN@VD3b&hqrYB^KXV<OP~9;Lj(?L%tt6l|zcPXOnU47Opgt
zviN{fYCfBk=6TQnq&Kt^pZG*;I;ZHg3b^dS;QW+v)}$%gJ|qZY!=%Qq_D~;&xzZ5O
zl#``EyG$%Th_RjJC0_0Ty%;(HFpkmH6*+N*TRjCvsbaBKMtxEDF&3}$QIcL{{q&}{
z37QgH4utQd+koxv65h*vIAiScOGZXrGBr`TIPy%YYFZq0?I7jHH10-{XUL+~nop8F
zjeUm<;sdOJb>3vy(?&-%ZrD{pnhKqvgdnTOoPR`Z8zWv7-zTU~CGEEzgo0z+CCNP8
z3GgQ;#+YBvAj+s})V5HMUIZ<ODdKIc5#UY=KP}_ns&{1#@QS07P-2WZ<SP;*NUcy;
zbuuCgP5`@2M0uvectX1sNmbb?!b%YV@}x%GRCBt~E{{KWoWVx8dQDyWBevT1@D_Oz
ze{0QJ6X#Ia@ZRnBbOcS6KSr%j<r5Sf4o}m9u4fJg){`%4xQ2@1`%8w<)|g7=H;?t;
zAR<G6w=9T;c%9fmIMqdZt@NT5%aAbdfx6O;fFZ$e@^t_jqlL!hKpq^=$-jiWHJiqX
zKpD_x?>XS)l>&~mbt1!)n7_Ci4;cGZ{gcM6*w)URx9sJ98-Lp{9mJU~ZPCYa-Qlk2
zQne_{sLrM9j;;)7cIP3CEAe0g`ZUGNv@;wC&ZqxK=FzaF7j3q1sT|?m0XBsXvCBCL
zR@ttC5q)sZ^Z`@E&?L9H^q)!h0))g?^IEi2!1wKX;=<&+-WNBl%pp2ISLl7e9`dJO
z*9%&EI?6h4v$U07@6k5ZehJ$MJvl7XAkL*^jwMA9F=WbZ4xg7@Lm{3TW5m}&3l{<m
zE5TK|oNr;-`x&a}?OvE|RUyt9`n>FnPAa}nqh;ViOH3QfgH#cIt#Kg9srEQ_6*7`Z
zdO{yX+x9pS*jXgZT?Q_OJY(i09jio1rdr#MRTMyIiZCzEYA9!^h;Afn;{Cm1IUJJ;
zXf4cr_kwuUQ7!*Ek?UyQ*!O*;-IGPAm;lZie<+tfRClMAjPGoY+!ugkhAO<d!rOZo
zv-}iba<rg{kXpmPFX7@Bd4RC(UhDJr6c^~X?HhIP4X`veD`g`z7KnMlIYs{_?Q$cT
z3&L5i@(&5+k1>0ZXAT)IjjVV~VEdzphjK}SWFHAu=w8uGwC}gT25;8KAf)=G*H2x$
z%R@qY;i>(=n!_3+EVi0cfKTUlU*J^@B?YpC6HVnxQk{|A6Geekhmw7HLilTaXnXYB
z<pm3QK_&)N|0sZpfn95l3l6@U)MWlPP#GO<7Ru3Cs<sQ<f;!jXU)2;kM^C$kPk09K
z{7(HKWlQzCEN4;-aj#B~)k^zKf$~9WiQo9q!t(%|jxV=fk9NZ%ne}>mY6f#D>~VAg
z_B{3Vm-N^hG|yKmO&3jCDZ2PPfp&E2i45HRp1Rx~Ug*wy1OtWVTjGfB{74TN))G^K
zyuB}~_AWFx5w^^VxOd<xvcrpbKDC^-o2ZJmqgKb+eGeS5cpG>1n(I(dWQ!MJ9^H!a
z@6n4@hw3ao@Okiyk;tdSRA4mKO21sp@&`>Pu!O#v-de{+3p-rxqM*Gwo%WP}n2G<g
z=mLJ-BmxL;K)zfEKRBybxRsRM^5ODg_x$B!7s`0$$GzOFCFc@O74*OzHIcw_JEZc`
zB@2C~B`R9CyQ!lFju=r`H04>7d8Hy+tBm)PBwyeotChnqc%Ozx;=k1g8V3W33o>k%
z3*`rFO>z1NggN(KX=-q;_tVym>0X#x4&C2bB@NZ$8%vi<(8V=sz7w7*X%o`RikJmi
zHjnMMz|J>iheFl!Qt77fQ#ZdD(t*M#{H~1#LnUdSUYqoM*TQqj;ztDe=SH}zr^P+S
zwJe|1u;;~AIFstdK+3|Ez$iZv%9I5m!o?0rBrWm>d)Jx;q1MVbPhFh8X-asGuc(n1
z8QltqWJmsh>>ms*u4UOSq6hsh%~gbF%?M8yNHwZ^U_JjLbuI^Q-C4Y6Vz1`7(2HF4
z6Cfh*pw6y3Xw^@z7W^}+BTjYI6yc|@yIx$F4p%4mUX!gAl}wJ5!L}_A2RAh}_fcJr
zEe|4J&EG*J6L;HCVc6xxb;$TTUW9-UaZQHc$%;U*;8&B)7WdarEqke06%Pmr(Ws7>
zkAm^%KgsKFbiJ!wxPDZ3So7T<i_Nr`eiBE-)E*dQ4-RS`w6m5GCX_}iM&0*V#Y<F?
z%|%-uv-ePniVJKp6K^7_mB%~w5WQb(R}Pu308uxCO}i-<+G4EGl92Wf(`v*v6<lh@
z01E-l1&<ooD9Y${_5a$#-U~}x-X3+$?A<4SMU_<XiLfwlMDUG#Bl}b7SpZxweTq`2
zioyvcZ?O<?8o(gebOw!i#N0o#m|hZkbW&XzS3pbH3m!v@`qP99eEhls_t`a6d#f~*
zQuYH%ylj{Ar6WMn?-QCPcJ~=MmkwelsQ0USU=)adEy0T$d46z8-soMYe)ARjd6cAt
zRnt-}F%&<9C&zKXDsNn&OjBqO3&|0Ea)|L%LhChwiEfyGsPOFbrIzfudr3{t+q^-Y
z9VY=71L;{fQiP9waFL|_L`3Jj86lcgiTHW{fiB!<U}M?rvayl4R(L_V2x7tx1oFkK
zge2dv=IZQO?}bFI|H4=jAW|N*%7s&H7t0AN)7kfqXbKfO=+vS+o?JfLOI9gKj#$CR
zKpUx-x4<>>dvx~nPK^HFxOBHEYPi*?mP6=rIC35i;Xkq1#23_`xR!CV_^}}KTCa<M
z4<<)=gAGTjg40%!Hvcle8?H2EN7uP!2dbe#+#`%L^>gVQw8ss;E5g4D&mkdt<cIyV
zTj+UZ<veDAaQzurB_67fBTBsKYtT_A(N2yu>$VjW{vk2`<8w*JZ|uSmpm7Fh8DC(0
z(GYjQnpzOl#ftmq$?%<mc+=4bY(#BKhYe_mT=|7*zz)Kti4*3}28GC%*FiBSQGn@q
zzQGvHuSK6WDNshF|52G9Cm-#o13u7@Z;jCgNg|SYP`f<$;H3_PZ{?OfHRW5n0FWvX
z84Bb=^Oab53DLH^mjn`?D&Cl-z0OC<As<FbO5l2R;n2+$`=T^X`RgC{@IdLFeIpQN
z9VarF#VkXA2N}H$dA6JbbuPy?iB~2rVF1X5+I^Bn08+4m3^s)m+HfMnp9c#hR6Z}r
zE6l`tliC~O&nL)3fXJXUO<Y+d+qGXJ43OPL=eGS{P!cOR9JB8U`c6ln3)di$!QYqQ
z{%zcTKa5|k(WF)=+w-TuOQ!39-nY`L1Ir(Hy?nf{N=QV{r^}Io4L;W`0M$27*xqMq
z8pzz=xhAVrR@R)!c0jq?D1hE$z)^jtY%2@{OS=U$r){*t?t>G>C3C@%OB7{+Ms71e
zVDwR0;#)*v^o;h9+;)DYS6<z~H|cWs#-$)6S*l5s4Um)khk{?KV+-&}s*lvIhRSRe
v9`n~Gx##Lvi=Qbi$KC%=Lkivc{)+Moog1wmS#`^GTMb~KW1?N9=^XPvetxLW

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/setup.ico b/games/NXDoom/data/setup.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0e1cb849953db335cbccdf99b67e1774a67ab049
GIT binary patch
literal 45885
zcmeFa2Rzm7`#63`(LxbIX7=8DWS3b8SxG_?Wp7DTWUq{nN~I9Vc8oI1EJU1SwTw_Y
z8TbEwpB{c5)$?h5`}Y03{?B>2o%g!$`?{|8J+6IFC_L0U6!O7CF`yi{QK%#En3VMM
zxeWmd^#op{qWXM(c0CFuBY;9NFnm704xf7<i9+%7|8>rSLfNaMQ1bGh&)F4FsBI@u
zsB=16s+%`ZZ-7m2-mRvz54npJBBX1Rlh<LN+@iaccImnIjHS3GJbRp8Xl~m$-rW4Q
zWY)|Uk2d+>p30(AuLy{E<gc%1Ob_%XP$SxTD#4_lMQnY1AWAHKmbi-ayg=W&(|0)T
zoiO$q8!LaLCW)aJN=zw{%9pZoYxYRB9&3wKkyI6$&~A@Z!9SyruES2g;h(<*h}x!1
zPkEmloX0jZleF?}ADHGoA$hk=fsB`1(=d_LPyvN+v3{eBI4x&kAZgnAz=Z=ufuux%
zR*VD`3JmgRpC`1ss|SwUUcWK$h>?N~k;Mi^;lLv;y_a%=NLdvQG6f!4--I6kj0Yrw
z<G4r_5(YesgE#{Dc`P;v8P-)lAWb};7<Zh=SuufFG0iycDovcDAw>y?aNk|-K2mXR
zi&tqhL8MPMr<@XVFfx75esH*SGghGo_3`Cv<x$N<{`nSV7Ull5YKp|Q`*r%$_7de1
z1lAHVGY)wUxf4`x&?2L~t1$8E5(Uw<HS(>Utz}FjJ2)v_B`5+%>{@cXuvPD>@fF^a
zDjYQWFsIN&P7$|FgLQ-Ox=kB5H8C*|;4yzhTPRfKRS#}bC*@y@$2G%75M;sF%Gski
zc-|`OW@@9G)YPd<6B~w3i*)f6yLR3>F-z`sz8ssa&fD7BD#9W6+Dza~!u1T9lVfFV
zl*6UGSoso%2OAA&?~UH&usq%_Y?@t8zgbu_n>91EQrTZFMb2*KuD1b8ml`DsLnSga
zL7b^r;>zV&tKiN`{N(r}H<^<coSEF4)JI23i9M9Z2zEYjIDdNDG}vVDq1)P%7fSD&
z(i$IGzstpvFwXXYGyYc0dMa8X*Jfo`{PT2@c#0_w?^67$e2eR~<e8)h?^HL9j}z>?
z8LeYDpc1GheBTX!>uYxM^b(2#)@h8DxdcI^RM&{y@Dt;<QCnLaVCvptvsP-4Y4*pR
zGf9VRDte>ru53h^cAXw=ASiqHO0<8`St^P1&E(u8Zv)LpMd!_Byo6Q{c!MaVP`RY-
zSO(M6cs(Wf^JA~{Z+$vxU6FOUo-EG)2zqxu=E{wZh9W_OimVvQD{t1IirzeZvd33B
zfdXCCe8jIJE0XfcMt`@iiRY(V+=fc2&*Q0NVXoZih{+DoD?zzikA3hq*d-uuJDr7M
zcfY46I#jyhJl=WCT?pJONjzhzlBh5z8^^XSUi_9Xh$N*-4AB;pJY%M|4`l>=I}Ypm
z5GK(`dZv76y_g~X+W!W5vB|OCy)~UF?-$G}SO}hs`N}?ha^B+od}%x*9i^PfU6PC-
z58Go$E&C{?)*CK>+ZtJzgFc!xBKGC<cB!%s)PxUd6)SVQi##YrHjlwJER2phydDZk
zym!TV*Q4siM|uiZ)XOHcxF~&@-*KSPi#B-7br*<8l6+6|(EFW3mkTjBncca4N~~}v
zW{t#b?nQ3XBKkz1z6$@FIc_?IK5i;;=Dp*i<KdjI1j#nav>V)~_bUs$+#cm<WUVe`
zEVqc?^cGDU#NvL;XB*9%sEt0;7YPL{!_N&^H05<KzEbI-IUtxv+^JtMHAMMjeVuJ$
z?R4*fD<>676#WmI4+@QFhDXs?4!8<>)&_?1%;oM@+`d1`JJar6x|drMNm|wQSA!=?
zgq+SF4Xk@q72OyehJH~bv3F_>`JD8o9deS)O>VEL>zZjJo#&r%)Fj+do%z)1l5!`X
z)%q|NH5d9p(B5Wu^@)8K=@lwaYI#XwUN3S3hgqzyZa2Pnt%}NFZ}kZwRjlK-QnE7D
zjCzCi-dnmyZsoAQDvD%o+!{wYCs;__cs?bjgm!)1qZHZmO4Jk{=i7unPG2~&yYo~i
zIyQ<IrM4Bt^XOc7%fgO@i8W{8Fi|t<?>`ee)O!DA{WFQzLB!0jikk1;50+H19_c)V
zA-_v=j%3&CDB3qPr%-Vhi@jWhcVai~oH4IPsa5xEj&&}m4fOX<ydAsUxHhQ7mD6}@
z)8WMZ)m9?<PdZ}LWr@%n?tZG4?eA#N&*&%>u36|9?2WzSl6%tFr@cJ)g4Ao98|QM&
zAH_ZNS*L&7x8jy<Q}_HjsrHn$YATg?yJxB-Yab?`wLVLd!6k31yv_doBVpI~6K?qS
zc+nSJ#>$M_x(A(~m{06%-G1<8(H0xxl(<Bd*M$acBVzAnGsv1r1NwMOZ*}*y4${f%
zIuX)fjO!9ElCg90q-PbRB=VHLeEIV76AYTiQPJ98+pRF~-p$eGva!@-2Zv@(xCfK$
zqN3OwTOe%E)$!P>8}0C#%=B7AXOPzZV|EdFg>u_DQB1j;q8s_{sl=|;s7jT)UT?I6
z+I4?Nu24z*r>mO_yv=%nuEmY#4ig9GGHEgz?+Lq3PJT*E=Emf4-xM8BJ8C)eB+<?9
zZgi*rr>gze_6DOioVkA;rNh2cWv#ygqW~w0e8aiDcxgInp&L+V6b|X3*vYqM;LE2+
zP;L94dDNeDe^hYLc8QWR&e|>I5d0|ax`%C#+`USsi%VkNTy^kBFPDhC>u|fd&ppwe
z)#d|@GpqZdFouu(A<4H+@3imhyOcC+z+$8ojY+Gie-?d;yze@S=$*bIVQ*4KYLDfH
zs-#|Or#x@Q=LNSfoS0+Gaw}+k+(H<ArEyNm*e1Mq*4HV%>Sp6Z>5GM8H+%8DDW)IO
z;gwYs2(UH9Z+S%*?D~Q{l|M@QQ0)ynZ?EL=a}`Vn=2^4c3U&G@>TMUUk?>fgM$(y-
z)CL6+%VzCal%6~G+({}ythtUqJSp)5YGUHpWtoW5+d0>&l3U5V7lIyS>f0Z)Ykru~
z=2>&YPC8#dyY9656T_DhDDsocmZ<BB-zM`-I&J?JgL1C7A&msoc)>L4Zj5(l@^m`V
z>c=kEkKyBe&^SZ7H^+-BgjSThL>tQ@vDd<gBF>62kO(*=9&r~pJd(bKcn1OG6u7q}
zdklf<tyS+_P2avkS**>uKpvNtpA`~R+j*ra<d*h~9a&STulC-^r1ti$-u?UJ4;tY!
zmc+;2x-?*G*`up(s;I1NrDrPq=+wC5pkq<%4qn=@%dLRdIhdwzp!#a5qm;{eT52sB
z!~J^PMYd0e_el&Oo8O~LP9(2qr2|PHKYpyUZ(l&oKw5S-@BD-CSjmr+Wvy(6DtZ@9
z$4?et6tUZ%({zt}V~21?#bjhnN=k~Jo*w_9`$Q!rCD(7?R<=poD0A1F2mV=5v2b$n
zx(a!BM+7#he~@ewH|^r!;>yU*CN>Rj-{<fwPxp4TDFu;pTl+K80%=XB=Z+MEjuZp%
z&lw(&p9u;nZBiKA5q2m!OiLI9dHcyYg-H^qkuee!6cl`1sA}3TLq}2*OrqK`g&rUx
zz<=9)=d?V7`@4M}9uhS{o15GUP>$lXG4b&kw$zE&+S=O{jE#+fbuymwfz~xNcvxPs
z{df`U6o_8GeqBA)>n=^F5=s@>MasYF^!fAWbLT~^tgJTekQ8=!A7F!Jwmo{Z(Thm@
zuBgc&8o@>qPSifui}Rv%;lYv2sv|4}n`#dB-m~BRCa#6F)n!LcSCVtNu&8KzdsGsJ
z`u>Z@QtX{>j9K$(_zWzb(HK^GMp7bz?h+Tf9G7XVH-vEXmKo`@so9-qO-oDW+qZ8^
z+)iq0Q@&A3eDafe$f@8B{$`{KI_Bo|g?1^S?d|(iE>Oot!zS>LJ<YpnfVD3(<AcB&
z<xmn7&a<$vaO4Dk`t&JzY(06ghBwQjdS1EfsFzz92{v!u%+cf!9fGUbUnXINwLiH9
z|K5DbrT(t0^mN8Ij5=>AHobFA8zQ-k&#+#Bh?<6`BMx)z?%kNS3{`6u0{l~`BvJdz
zSy@@y6MQ^84@Rf0%FIY(&_zW>+GF=-?<FQB<?kzuV!B|VxG82HPIonb(tvB%uF1k)
zFOW{oEgXARBrwL~ce%u)yg&5GM)?lmXUE;pJ$9)_>>+(^`lRXDm{rAxN~dm9>Y?sO
zaNtn0tPO2YBRagtmnOVU(bm>hWh8bz)?RQ2{#80LOBD((EE%M0fJT$U;Cs*QQm)6)
zLr72Ex#=yX3k~cX994twX6)z^uMId$3YBD9n%h5x>}3wtT|H#GSZy7uNXt$hq8msW
zFfwvvQ%!y2{2Uqn(<scfD^~)eqM~HW#b~B_XT%7+Wl5r0Lv^NR{WqWj%<sm<#ocOf
z=!hrHb(_m)L2I5kaUxZra=`I$ftdo)&8(~r;!}Boe7bDm`ctz3Gk6SvX$1u$Z>D-b
zddt>cpo!l{G*eh8X9`CeJ1?)6$0rlh$(?}*XUF><cXee7FGMg7KTMGIke`>eOk;LI
z4IS{MNo}e7_-@c^K49d4Z_?$<Ot9+7l81V^ig2c8*S!kbw7vS_MWL8^4kmjP5u=Tr
zT~qPAsLUDpilM?2rF}(x<AH-re&>_y0!iQY6mZ!RZQ3pv_%z=-(+4l=p<3~^DIT<@
zk<oTCR*kb8@QfEVQeMB|;*H-J-?Yu(xDj??Ae1zqv2o8)JG+d=rlzKg5>D5m<TS68
zGM*(3`0&B?p^407HsxE=>o;#QkrGY5?=l}X^`(K8%XA|x0w-Pzk>)B^_LFh&@mcrW
zwLMyhCQ&P_l{G@|{aALX$kd4OR$$>+9-!Pmbhm1@v+!=mGm1M&both_=nU?t3u)bB
zY4@)VI@%1_Mm^b0bc%(5>8=QIe}H;mCZ$4aYrAqL=4Azo!Tqt4Lk{#u9)t;H1goo?
z#CWMYir>9%9Qj~DxqqLA5~hU9or`ayI+5t{8&@(qFg|nqLZ2wC<E(1?K5+XcJ}*-V
zr)?~1s|mmiwWh=cG!bfc;BDSDS#a%D`nv-!Yj=9S%xKMZ3j%Lu4b+DN^)9SUaPNLv
z-A*eo+y90_R|$QVJv`PxNt?pMgjT}mp`g;kxl&Aj?@ZqsrXz{t;LsZ$CRMf^%SQV>
zcaJN1zS$a?tJ%jl_-5xJ*$~G^WVh5K)B4wEYU`*HvYHlfT|KE#z2=%QI(LsR$58yX
zSNQS`IYS0hZp@}A)Skt=Jux<Y?AVQKv433;j^snZ7k`hVtz_>MCH2;Is6D<cXr@4K
zyfj#gs~QSK$c4)^NJFW|J}JFXX)u3T|M@CYs5joh4CJ|;n^7$2D094es?YU9oj=zv
ziR4A$?redKr_K}?cALe}MwEO5M&?44`SG2b;63Ds(HzB&jh#Qw-@evA%Df@xrAi43
zg0=qjm7#dDzd#LykRFSf-{X7c%ICIG>*+TKq0$?e!LtSH{H|LKFB7$xJO=k`U$4K*
zEelR=%#y`&UN&hkw}D9H9mDP@sg*lECy`0(Wr*(VV%A1CDjW2L*&aCIvTusScSxGR
zKOl~tQT)x2@<JT_^O<N0r`i+KhvL$Q_{fJg`Qyi%qu6+4ge|k)JSL;GaD9A+^V$&K
zPKeF=A;JV{U%lG>Ph)lulB%#Bv9_;v$rz$9gH&SNVC1{`!umm#BgafNY2_$PyWj)+
ztxfOe#m=AJ!LcSSVpz2@AySc@_oTIr>H25KDKk_r5D_P(818WKzdFQ+f)bcQJUszi
zKAKxgwho{h$m(3XYTj19y%lmjHOeoS$rMGvVS>eD4WIBsDK(Ptd$fOKzj)^9xhLD6
zk?Bm4nC;x;UmZt}7tK18vxa}aFC#%TTPXA8k*bsVWLfzYr6vt>FC+L+8%%uhG~U*2
z_g9+Q$e6(I>s*$_M1_CEK!%9xxG5)=P<Cpq{8@!qdZkotJl1G)qN*$B1`n}@x!XG*
zba|qxr_dm07$Jy)$P#FbE3zHbo+6aOW5#FLRl1&@*l^F{u0UrzotIN~2R?P7W?1Da
z1K(M;y2#v_7u|2|sLe3-R$kkF-_VX%_zW6&5QQU;TkmG$sVOf`7ND4e>I$S>V>je)
z93UBAKhw?nz+b)@#jb;8)24dV;_JTWbrz#Cb_|`xD;3TWUB?zHXCjhMHsEmfdTEqj
z+U4O={Nf{zlXU~Hu64>G9qJOfFc>Z!INc(C9!oe8o}Kw2@){Rf=9m!$7sm9F4~cAz
z5MNo4ZQ{9bEZz*0@T?B$=|Q`Z$}3r}!_TiD3yQdT2bD3B%+38M(h2Kxm5x~QARkKB
zWP0sp&D&c#RLhB4^4YK=o5Rdc@}o<pxIZLINZfX5HNaX1qkD2M%02TXX(|6G8E2&|
zD*lXBlZ!Y=p3l5sDsSJ2x1}U1OYW(>ow2ow?1Zxp9s?fIj|OeuT8Rk1{$!bA(9*?!
z(p>_zBgItu!@TkQU=^j&+yjdCSkUWq#A(jK_o1(swsz^l#VENchlNoZES3+1JfY7C
zvGH_E5|;5GdMjbKbu{_j*}*W$voDw^6^M?$rY@ct1vQB-#`!Zmh%B(4s@Ttw1XX`-
z-pY(5%dF&d8*>ortrjnOpJq8a_ekq_w0b4KR}5y5V<af6c|>)THgzi7cjwax46l%8
zwAZ*-6bAFjt*57VFbvDASozA?@o_+LveTzS#N7@@s<EAqMRR8!+u7QZ9G=~{<rM6X
zh)_N(4D09i-eZ2IjLh?P*LdQ(#fixH;@N@tr>45}2AK=97poTh%Huf5=3G<!M2Ev^
z`ztIdDNR3d$r{aBne0#rr)x5@PJXzZjlQaWV7R<_wtw!@2zv3;rkB~9{5B$D4Zg~_
zUtX>Pn_M0bc)Z)v17PKJhqM+p9!sRi$^Lj2EOh0Uy=!J;cpfuIJQ`*dKfuB9S~tmw
z1-(#`)zl(_UStlJezz4hH!c(+gm&X*OU)%H?2VoBURXr2CA&%(bM-oH#pgurJUHZw
z+3bq1(CIZtUp{R>E8=%N_06ZJl*WeO$$l-lcV}f=n7gJ_<7D2y&4L^Bx$@cMwoz=w
zyG~Bt@{`+(8uRIvTG@7Oq`qW+nxrS(dSXG-tT#~`D}=qI&WpYnJK>9;op&q9KNOFl
z?~HtL_mtEQ;^W2R0rU6r<%cL0Ca0TPs)ir8;Xh(H*~P)WrhTnEFYi?G$6FasoocVl
zi`?;t5AnM+x@$>c)#TIG9?&B?O!|s$Q<Ob6nB?8N5OwV)^EaLmH!9N4T`+gBs=0Ri
zai?f&XD6|Loo@A{g<^uN3zLwwMta#pse?m>O}rJ)51SoW6y1E`k<BTJz$U^2$D4`C
z1>q)Q6iv_gaoEaQ@XEua)FThhS{hMI<a~-@OZB)YhB13EYJPk}xccMcM2m@z;ZHln
z-$oQCJ3dqx@pVcqYvK#69DP5Tu~FONsXZW6xK3J6y3fTO75cGucX~eRV!YqPQ(Z&s
z<1umCV!6EY<e3@y(Q|a3LFoB0yo&xZo<%qD-9zEjJ2)?iT1m^5J$KfU8@4%r{+WkN
zGQVbsP)ljpg`|7I6~zZs6y;s;_b7-C5f%;iY@FgmTNz1zeChO7W|k_u=+i9R1PGD}
z$DdPnVQLFU{leKU8HHIHdAw0?6)u`$vsSjhC!C@Ge*MfExNI3u@kz|1h?5E(#(T-4
zt{kf44U>L{&pY3c(_K&+bT(17fbCx2i45iW`}p0a`ZZS#7UQB@N<te=pX_aFwo-jj
zNZcKwI5I|Plg>bzPRj38F}@KGX;$u)%=_*dCrnHPd6T(UlE=o1x<)sHV4mhH^N|;P
zCr)b{dOyRKVLO98q(XAttICQ_8*Ib(QLI4aHl)oHIToMnO+Bjqu9CUs<dl(IdUk~X
z<RXQIMV-b;at0c#&CcCa&(>m;Oxc1SQQEk0L*`TkgEi`~p)X$9$JALT!-X^=;5li_
z`{~tts-TNPSo=*iLydOF2i|4IkIsKOwQa(i_U0KLKeyW=x@Y7i;cjOXK~E4aQy4&)
z>MlX}gk;a;i>YlUo=+SC0)`A1>x~v)e3F~`bbdDDb(|*F++<NSr(zNB-ISZb9-&@6
zqAO?hGNn;L6Fv%)g{TMtEVHu2Sc1pA$5Z_n^4YO?FBuE<-15s&Yr@52gK9_08tAc4
zIHo;37SBl~@E>>X9GZAN<y2=HKK)WRCrWSetfy^akYfy!FyRfRL0kD7)EoJaO^{t4
zCqy0A@Kti;ook_MS^!>abXhO77?#^_fl}CFd%jWm5!0Tj(mq~dSx4e&5~+xHmZ}1t
zkBI_v;cIIOYvk-V#4=9!ObXzk+tlq}phcZN^hK*Ky4X#24jkUUm=gPBeyY%I>Vbi=
z+U~`(e(me=wxPBn9aqn;K?(ArWg3mipHCE;K6<B4IaAskdFYwPY|Z@J9xK}hIcK%)
z@unw<M}2{kcYizG8M~v$2P%Ru4d?iI`Cl99Bq(T$im`p>-p7*c(j%}v*6%?t{ku}R
zXNu}}Qm+~?rhEgFSIBWINVi#?>a(rfQd7a1uaAzjPlt_Odz15W+9*IxfSNk#sonTK
zY8qoT{Y9Y)H*PVEBa2l<`(4+Tq(tN5ff4lNN8QK;>W1Mif5u@mGoOLu-e%h9VG@E(
z<3(=-=zL$q>UfwBP57qlA%d*llnZ{(VYuf%=N;smm93f2K(};`Np<8L3Z-)EUvO-k
zlA<L(UNp`&|317clSfYeVonS&`>^picC1Aqv(Gcmyd&*KaV#OdM>=N8K)>rmLu`}#
z%Xh=uBjk!s3g@rUblFtPXpI_@_x1AZGi^?6adVt}(P6aM(|f}}KqWMrSI)0=&SGER
z6yMyVmZG;&`Ez|-ej~GC!$Ed@nmRQ$So?9mk8APqGFqn43;k@~pxQj&weQ;X;hn78
zuvLqRS)^xGD^T_6^RAI*dRmrQ57uXbgf|YK=rx31?Cm*sGeJId7#Qu=v^U)|1)k4g
zh69|m8@f4)^IOC(!L2~!e!$iy66*JxHOt;NtJ*d>P_Y89u0a!*zEq}9bb@St?i;q@
z?}fZ)aU6y&y|}5(ME3aHbh$Hjq2W!uQjBV<CkG3*?!t}-n&=AY!O=lKm-pdRGDpQ_
z8XTr44EnXanlL?`&2sdwWxeZz<_9=#YYDeG5j6!k<DrI3e7D?T<F{>emS%ZyE-O}v
zyeZG!X*hUy52@)yR!&jGix-zeQ^WaqU7en?U^2z9y9O6Xx`Hl|$9OuRTi#f7x8|M2
zTB-WB%KIO2xlSryi>i;F|1f9W(l2zPz>{=%non$P&iimXMd$Kh5}N8)nRL-7uwz}B
z$wh(b!xePHgx4KxET-dj*iM|$xF{TVtBL*&u|6^)pvXv=ARw~%BCY?vAsD_^|Frf|
z$C0)zgaeK*jUvs7PG#HCp6D)Qio4F@zT=r<cag1E&n{t$d7G0=eo7bL2Cvz=PJVGH
z__-o~#x;#yp_=9nA%?C2p23Fh_p6MeF}zYU5e`9daVEb0w|m{Ln#NCEDcsi-Fu$c#
zKrq<f8!ti?dj^%-MJAA(NTvV8rM!{P|3-9OrU<5jmQy3~;Ka4w`%NS|nAR9qQ|U`l
z1oVck!z7fusqx$U$c0m<PFETn*h;Ns8rs=;FK{~acF*<5ntV<)X~32mX8MzfhQ9vy
z?uFfbv+wn}G1^BL<_Cri8(NylIj6?(<okyRtLt9AI=iLfcp4!VFIh`<|1hP3l1Y2A
zi7(NmF6~0zwprbWx99Vi%uz#oeF=m`3a|30*xtxA!0yt~*H6;N;@!-8^HS5db<+KO
zN4C11vFgW#0Y4{Bw6_I=IjVbTm#=?Z=ZCuw*k_g9XlwUB^4(ipDtR0G!OFqH&BfH_
zV#6?D^$yQhkFVzEZ!8#Y;W@cZ{?ZWPE=yfI8}HYLG?D}b?tMBjwWe%(G4WO-U*N$f
zsz`7C>jzaK6+1h_#*5jpP607^5q#J){<pW4c2HQ3gf{HFdEoFFg2|~Y2P=IjI^^US
z_GQi6KpCU^ZhU#xP1*3NrtKRblOa1y`0?c6hr29&ZmCbJn!GGWw)bAk5i^)vys4ef
z3SNiHWnMmH5KutP<F_|5<f#x_X8GG4Qdu$c5>U{q&zwi~y6JVaJ&ldK^5B88w-YFb
zTqbV`mc&op_^sZxJKQ0?U`jsV{f!6Z&)g=AicFgC#@SP`#+KR*j&5fqoKjC%1LYGs
zC`v8PX|R#<D@^P*t+b494u|R)$!xRyu)0)Fi3}*&xPLe!hCQ}Wn-F_ZjqU<7aca_s
zyfr~pGdBkJ8ZSPB?*<Zjkv_$X8~DzUxT~wTQ%qhNq!@6OVz!P?3)_`l{tnt27nrVM
zuL(ZtaiPI3+@8J9&2nd+w=jBbaEqqb)8p~cz44~C=jwdfjz|>8m{-V02%%1L`(5m+
z@o_V$;XzkWx!H7y_wmf+rVl5(zrB3+!Ol4PwEX;#jl5VEyDs~eh4bd#1!uT&Dq^#<
z>$8ToHifTK<xN)gxLBxNHRvq)@!c7=6AMp9gR(d1O<B`m@fqr-CQ7@U_e;;Rg~`2s
z-s<(q_t;{GdPVrPH#1NvsA<ofdC6xj-~8Mov(cnuPx;VO#BxP1J&(SjW*&iq)3i%`
zZYE={yz9ivU2{|M#yJN+JwCDiKpYEpcqa96YN8GUIZ2X7hJ4GpdF$l6{)FRYVUaaW
ziW9HQ>z+Y|5aDKeS}I;&jjeLXw@4_PY233v$EfAjc3mooLpFPw7CoKTieWs({LrJj
zH+6(2Im|R2_t28HU{vLiyly_#TVv+1K4gSm-b<Cu-2T>Cb6@v&7o*Kp4?4e{*POsy
zuHIGhj4SnyUPARQ(c#&+xJfxN5U3j_#eJL4hqD9WWL{nt%5Wgvs{DelI9n<~%9@X2
z#|ehuhe<UF0?h227d~ZQEx6FwNZs$@w;7J!2bp$affFyI9V^xk(Tm;<4IVG&U@jyG
z=kc-}riMG5grsEYp_?&JdC+S@!ak8e^W4o^{1|O>PK~*GwvAI0B6fnaeJ6N?GB30g
z&40kyIh55&P@0p`b!ko%j)!p<(wld-y&{RfdNNY`<C*f|$1cZ9u_uX>OWkUR3(XDQ
z-Wnk(lxw_q{$}e7A#^XFB}&bmh@aV;D8d%2EoX~If^m__P`!39Yll?wYhm3?jmim<
z$${4eTefLx`x4PHQ3Y+|eG@W|k`sSp7$)~g$_NVLyWpO>Hh4l?)1J(j>!w$>b<Xg)
zFsz7k<;!lyCyf5yDgF`Luq53M6mIhaf_u*Q8O36F=ll$kTimn_X>Y22no>oNm(HtG
z(pRsA;+#Hq%%ZTV;VR{hmWQ^3(OvmnQ}?Hu&clWEDlvMx#qfN`0F(|tyy-n&kw_M9
z9FrDV9O>6k?O`&V@5I!p`(daMBx@0dge62@(VW?rJru6oE`@Kk$dt-Bd{rVEL+2{)
zd>lPY8A>Y<Qwp$$uS?HO*(KIq%%p2zp}a(U=TaUYTIMYe&$%4yyicle9N57K2NH&j
zQ>UL_aFbnM&L%dcT2V1RO6fG3nw|M@l%;nn9=pfLb@1x^$IH5~|8YbFdisfn9V>Ji
z!n_u{))8dn<lVl^nK`9O%xC7v-;`P&5*=pjpUt*acFF}aBsY_`P&|=MgKe&w8y!lJ
zYjd<WC3CoCva$S0>c>yB(x%$OXF{B<@y-VYHRB)F@g<<T){uSkfR>@BnhjlXG-h!+
zhCJWBYM1wD#G323?GE>Ts81dLpy{jG^|86ispwr#h{WJy7N3$Q2CTjAqcVJXPh__x
z+**vZvaQdt-0emoUsBJN<avd^O^DO4NT+g|r2k<RreA7wijA}PUU}50nP+soxlcTg
zv0GHwyl!Tw^}xJ?(@^!Ai%><Q^}4rrvV`y6i9w$7`JEDZ+_!nqM5ct36?$4~PYnI@
zZm0(`GP!ySvddM<dT9+8WFFr*5j3j4*gbIbwWO@s^jdR=8wb6Vw{5<ldAGo2oz#;u
zx}cc31Zi7tUDj|bw8O(AA9M4{I>lVOg?W5W43;13qbq&i5<2f6gU5g|^5?e4j$Lk%
z#XMXHM>iH{@@(ga3oMn$Nh(!dS@A)a1{EK&^3j4q*@m0QuE&<9NikH2$$k5Q5E}7!
z@K0IWRTSS;_fn+{mnjz<Spyd{e2Fy-AyaD}cZxXm?g%F)+MO?e8Fz_KDv|y$(>U1|
zbNaBNFHgh7#tq1-*EH2j*1u4RetOr#+D5{MjG2_b+sG)k(`#LO9J=Hh<9uLRMW@wh
z_5m|rdzbr!Q7l*%<q8y0q$YMP=_HNGTxsdtP7_Ug8OWy+1=G6_Zw!-2h0>{ud_AUo
z+|#e+jf2laWx4VTPQFE<z-!X#=$ph(dhvd;GpXaM85~%lFz4H|nr5_;8zW?}%$a`A
z9lGv3mzpCC_S|xOtYowFO!r3V_s{$kv>WcUi7&)t6c6;!E6V@}20AUOpawa5&x>`b
zzCuUKrBbxu@<6D{Gfx2(3_Mqdz2{%C9>;bJ4!DqNj|_DQx8}aQ<)zKZcI7Cyzgzo@
z>vMSBe0hv=l`-cm-KUE|?eHG%;|B4m24-HtUK3tX`t&*4I)meObF)28)M)g;$qxxK
zF7l0N4?C7Z%sX)!(J{5wpySuHchp6lagvyiaM)R{df6gje*Tl!^=GE4yhD`!+4yOb
z@3ao=)S#7!#Q63qk3wF@AeHPrOHTKlq&a%uxL|s}$WKA6`xbWRGz|~EnARG8F|GZ|
z#UZV5KtpqogbE7LS<>&`ZrD_#(Hhi!`JmComYV9C(cGc44uXf=jod5Ztls6Qnhj!d
zvRMtLdJXVhJIlFZ$@Ym*DBzJ+kh0HB_41AQIB}{|(xEDQCww0I^}CY@d85l`{95FE
zpV{yhPwIu4db(GKgn805-xogRU&WP^^CG>@JmcCuf!#ERLS8gEn_7=28@<i1I~+*r
zJ=qrTy{NyoIEEf7*4Ff&OPBGdZKS8OyUP?hl0f}_;s{+dYuMmr`sDjjX9)M|4K<#d
zAKQ^qR`J4;&gZp@tAWT)qmJSdFNY&TgxgU2NH?KmMxktVe#5DUeGPS^?{jDB6(wF3
zF(*8!al(FL1_m^R(=VpnJe-E9d!$P0u|9M8?9hxBfj@Eoi~xEq(PH#QY>h6>ZK4d8
zs)R+%L(3O|ccd5U?TwyJrB2r*L5%_L-7D2ma@|Z&^Ih@=HB~SiuH@v|mR!-jPw<3L
zc%Od3K*br2OQT|%Trb4YlQ=CugT|$y!gItBq*^Xgez+99?TABX&cewQ<oR)<zORJh
zu4Yty{=8@vDLZpV;kzCqqv$(4=!L@4l1tU`<`tw+3B2y?yl7%R`J>@SFJ<Ok$Fd)F
zL%}8cCU0{8;?VTiV6gaEsDfV?0UydBADHP;jI^u<nNBo0DWx}sJkO*;uLyk?89q6a
zD?{`eQ0!Tw>6`SD)W4!JT*a_+ar}cSu|bzGtGREHO+*u)#X2=N)wEOW=nEt4%BaM)
z<MCH`<do>~55E>$Qzh$9&_qJH*%do1wMe*r78S5b8f#xNOYmv&{v}g=m+i4~o+N4h
z!}0uUpmzHd7t#ivwe4kr^=7q=8GH5nA|?;`JBEC6^yGKnERWZuJyp+hcxa<P9<Lvj
z>Ut(lf_>5S!uWWnOFmr-WSSkmS=m!^?QABIDsQ&qP<*Qol!gwH);o|9pL#r8cq3F|
z8`ZIs7~b{$DKE*>qR<Qxyr^{-=0(G{26m8nr(B*#*~#{`PC!zA%734f@kTFVs_7zr
z``XI1C=9D0!M+Ik=jW`=tm~Rz>qO7-g675pm%yyomJr=3%B}4MWrrWmpOwPjjE`j&
zkZQa2;cUSDsoudx@2knq&nzA$3T!FNnhSNf`|?~Pf$1U&PT%Jbh9^3DI=3fUSu{;l
zUd|Y|zmW{p(xe;wTQzqP#?FflkiIlpoJ7kUAKtLg<Ev)fgs>T&jI9i@^p$&Q%M9yZ
zYY3i-LemuVVrZt`<83;EwWobRR4!gc#NsFRs!6U@?!z$#Q`9C;to;iGXsFRNABuMh
zmv2|}KTCOfuW!=ifczvQ(;i=)smx$!FVwCL^1d{x0t$T47irJpOe8;QgPJc5^kd*#
zznL97sG7+H4uY*So7b=Lua3gh4%D{q*$OS8YzhtZN);$}CD{9TLf9@AKc=lse52|9
z&ME$DxzK&GeVhG{V52qChr+$kSEf#fdZE^G`xTujk)kDNgYEXyzgJhs2FSxE9I-Wz
z9`_NIvtL$fpr7?US2!=)z5~BLu+>yPss@k6@2EbX<52IKh)wCG3?Ce!5$oWVL~g0z
zy>LdNxC9BHm5CzV#f?}!Xaj0@?$)vO(17JJj7)TkSG=tzTUhq^wsi<^O~aQL3}Ae&
z(!e(xhk<@HfrceQN3<*9ISthPvd9t~hLfnz4=ykweT->vN^V0%k!?EF{iZ5rJ`Yyj
z;v^2Qu7?gbDDJ*3oA6lBde9{&@QyQKn;Z$Wyh%c@oV^6I1j+2!VfnTGOvLI=48p1b
z0(%w}6yYf&6EB4H%-Irpe<qG9RBLPCxhORMUN6*nx-E&9o<p?E*<pJ#d-w_7rYN)c
zF{b0oM{aF{knoX1f4typzIdGmZ);8|#A0q38JYU6+42g%^3BVr3EgG}g^oK!uEeZI
z92-e=Zq7a8&Mv__=ZweS{Nx@p#)axFk*4;P&Z8<Wxyqu;o#&5b7oIxnjK}b>Hh+(>
zAF$pjq2R=DxkC1|@#0n)|0ANQ7eidcA{=M@C{BmmjEft?P`^snvHDnH+Ys+}k;OT9
zz~=qB)Op@VhtW~z{ciQ_Jz<@_zfXP_H1}P%IqJRG%PeA$=}6yhQLMjVCiprjmG@M*
z<GqV>o~{eyWA?q-jqh*L5Y_u;-xqLrF(kKExaEawhrmOH>s-upXGv|C6q;Z1?Vs<`
z2oaNzHku_m6?Z1*de{+n=lrVl0&d_q7siG6N)r4h&s?1I?t`=uu%?@Mlcb*#%Ni8?
z>{ixN%2qfSzz&Z|VPSv;acjnXpeu7Od<rRF`!I?bQF5~GzR1C*mh|_cl7gHg_mF44
zRu{R(#i0=)Pfh?<7U`|)fHc`UAPb8eyoWsVt@@no>QO7}if>s9#I~#hk}KLkp7~aN
zZf?ye1&Xz}{)I^iK!DS6;B(C8Z*6d}tHpe)J`ay}lnM<I2y=4)7sJkj(t8Eq&aEsE
z?CuPX8|mWU;9ymY{Z@TGKJBR8j2l7fd4JGQT?uRqbbz(4Cdj&)0o<$(;^5$5QH}dn
zeE}hzC{5PQz}-v-+`D}Pq{T*p_|UW9QcM&uQI-WFkRJa8zmV|0sJ&dIpuVgCOuw51
zm!d*J-1#%0^Kl2boDd7&0Ri|Y`U#8fi_+&O14hEsK!;-scvMpkYD$ZM9MyWDx`P-;
z*MF)nDy|o0B(e=4Z6I)1$g%?y308p6bm_hPQ~kZVM-#)`4gwbgX>iI~7dYz5f+M>{
zft8vB(Bh&6`^7kcl(=5fx9E2|_~Om!>1i-NJ`Tpl#z03$2PiHs2I=YPAS5INc${zq
z4i=8(->T0b6X?hwWD7V%O#q{i4PfHa2TUT?fQn5MFp5|Ka%K%cCl%oMt@_mB0mrFC
zeZeL=4e;f+AMQHx%(v?E8C~~fQHudI;y!>$IT~yi@dk_vk+3Zvz^E7j&piQ!h>!EP
z>dX6MNLBrxACq(Lwh*&#)8jU;SK&BNr?ga<cjxGA-R)1jvi@^I6zW$Bvd+NB2oygo
z%j*mbkvO;Zb6MHf|MoF5)}*&>1Txz;e6>iCZv>KL8-X<ZmWIzD&;HZ+Tn#_>PWj4}
z>($C*DY#}Wty?niSdMHhZv8{*tZwI9=ih37X<d}~N*_PcJ`dZjFW?s?T?=$XdBI*`
zZrpmcx)08svQ^)LclC8%c7;kss&&izfglM1;3ZxM9@Nx;veFVDx`ptIKDd}<t5>)4
zt#f`ZrAlONLHfAhegYgb)&ohA7eHHE8)#@~02faA04psuaKh98EaCAZ?F(=#RjSc%
z02b2R;N81-0Qyma;{05&f0raMkdpw{(^ElZWhE#qECjpR>2ZB<GD+8b3*Ob&1$mS!
z)tNQ|q>uE_(_nI90?4s5fWkZ3;LgqKK!KGW)YsJkucKB#gmfK_R-BB|_gA;`t#e^s
zl}cnkLHh8u)CX^0zXHm9P|*$Xc>er3P~>C+br0?XbG2PS5Vnu>@gwvR5m2er;UEE~
zk~_iko-TlV9L@Fv>;2l`kj`#kt*-^1K79)A-N^-Vj8u>hSPOn+e2NOHRqo^20uG4o
z026OsfwwP*!Q9*@P<}5D6y@FqBg4bsQDXyWsC@twcaY-7*^jg@F059G>{Un~2W41+
z7CQ+zt|^7X1NxVOeNuuzcH26j#kPHU4F5>`5+b`R4TZ>Y`ytW?LM!BbJgh1K4d@b}
zu$>S$c2}+&KhnOW_@2rGVie$OeJqWurTMYc#}BnHp;2inNd<nSj~{72C@AvD&_F-v
zebNfLTI<2%mPXK6_W+dU-2%6-ri1j9L=YPh1{{wZ1P(S<Akf<b95b=%|JHb4eLXTd
zy<=`}4mWrE`}+aH8w?B#0O%cy;|rjhFM$5tATlx%`1<;S)6OS=yUmG#)$M%ioI%<@
zg-P@X<QI$quap^Jm9PPfe0qRG#0YRmS_2vmZ9vPR1(-!F05zKipxmhr7$kgBzSZ99
z>y#p1N%RT{IKBblDd-g9|Kl-IXLUQ@I{)46v#H1A3Yy&oj7kZBO4tnu7~jDiBYcd2
zaqj11$lLH6=irX1#r?rHey1DXf_L?GCHD>&Is4*yajU#JA(LBJZvE>YS+z1gFsP)=
z&?|jewu_(ouw5$1dUZSh8|QFQL48Eg|CWNZjqqU%u*k!*%!fe%&;s&zNcnI0uyF6)
z$4f6X$jcxw{GSRpJ^u&~y#TH(KMU)!aq4OREUr9EqR*Dr$$$D@l4+OZTG_vNJERWM
z#?SW8$0&mNr+$%pl28Uj_{t^Tay1M{8^5D}M0Q`|JH`K!$-f4}uk_E)^mY7^z7f7u
z_%9v>(FuGD23`iC=Rb?T0JA7&NlsmQ4@loaBx`{p>kg0z_oBGa^FWz}7RQTy4F*02
z;h*kbkVOomw0+&Otc>){PqGGZZ(a*5G*oarZFO}uFjtjd<_A~9@GJNWvWa03egT0&
zk#Zdfa<&H=Vtl}Kw<0LMn-5xAT5vGjg!&9)$OCH&Z~%t`dXVoWTpp7=^n%~Lf3AK{
zLhRxgRl4;!eZgrP6Pz4BIy#Emvzs3_fw+*fAUZe@RFsthgbrn8W#Hbud*IL>#pUtv
zEB%XbNMI2C4FW?-un(A-nZd#Eu)Y?E(Nln39E?DLjR8nAP=UKS*~>6E9W-7Z4?J`N
zFIMCAz2~A_5*T&nO<)NIL?%FBIBv2Z$4_H07|`9_4G!*60ycVDxOd@w%=&Nhf_sPH
zPxmjzBZ<Mu3xB~7<8uNaeDHn+38;q(221Y(k*oGe3ggDZ2{S_=0O#e>+~od+_b<*X
zh0%sQI0D07ZVFIQkc;ERLw($Ux(GLDeb@*Z9@GF8J~rTU+!j1}@&w9z;XsU%7zcyY
z*0tbQ)*lHzDGZ{wLSQJoo{H-m`S)RF8rVQth6Bp4?3>qsgPJPfX?GXs?d`?E5EkGI
z$KPkY=dbiHDIkN<g>nJ{gOi>-SX@}Z$vhKpU*ljI8F~R;VES=m64B{3L)izBuM8x3
zm*taR>0e4v7K6w`OE5U<NaOT?#$rsMD*qM^24p<sT)PZpn5n=nN+Kxx@hta^teL;k
zzl@M9#^5h`X$gj<@!)5vi|ZfxXREIPc0rkc^;-R_{mY8VVG#Z0*I+OZqz2Jm_8`jB
z9%yq=;?}5@YxUB8@hkYtiOFM(#VNtJU|2afm)6PEF#JmY^5XIsMBe)q7=ERH*ORWJ
zc^T2*R>}oP=ffbv-4djn_XHVHXFz<QEAX|_1#YGq!2j4m;Ct*4+<UZukt{#Zm*4?r
zdv<}Ndv^nUCGA(=yWXyT?)sJM6Nrq6taHc*(IF!RS#z74n{jikqM`!ay?Ynjym=EO
zCnp0xKR*Bi6~U1sN5J{B!64wI)9mVYzxVvgm7F(7zmt=bxPtUM0d+$2^Yfsqs|&Z@
z!$?$I|CcXc28oGKK8}qA@$vD%)YKG&xSj;39G$1Xx4+fTvB>&XvqIfBJCtXI<Sl`q
z+#$dvX%5&#4!~jrcqL5$w}c7Qi|c_MTsnZBXD?tD&<6}WI#9OV187*)0h5ILckAy~
z_fIL{f@V-j1tdF-mgQV}g+xHgX1;vBLp~a8<v6^2PAd}z$aw6Q&yhA(xBI>4NL@yi
z%YbyJ@p60gO37dgyT$T3-L6=$mCJhhoK`LZkn`9tpZ_=a&nO?*B6p%0aOxERw!L?t
z%<c|kj@JV&gQCypV%|XNXf@zDP>MUJmIwf1N6G-dNd@klMk)xQMdSC<d-ZcN_T`OC
z@}7WR+7-}Ax&T@+CqON75>N>_0t$WyK+bFb%|ga)3*Xa0Kq2T-y1L!(Jy#AGkkSqw
zsa6jhtWfjA6exQ3-I6)kbw%8+BT3*;Yb1wZ(^(F~hOZVD?czv!g^QQzWnu)sx4%E}
z9J0PFqELQ+q9A=EdJ4o=bP$$hJ;hEGifrTO0x$pj`7fgY7pr2fIOWzw2?~;*Dq`fM
zi(=bI7sa=c{8ixbinfrpxmcC6e-~LqXy`sI@ozu!jmYOx(60f}!N?#5>Sb_#4v0Qz
zg-!@*6Y1l3!7sd>X6{GeMxMpN4&^08hlAKE{}T>KAOBb2M_`wLurJy4z6Xc@EAS(*
zi$mC#bXebugV6s0`XjK5Lj5CRClrM`xF5kmn2P$hjUQ2J+W$EI5!i(x?1-InNmubB
zI0#YwzVR<cOFQ>9S$1hoBd`lX{U<-vL)t>UPq2pz2y$}*N3?f;_j?fjo$&A2F^AaT
zzlMV>gq;uSO?aRVlNZ8YRB#vEzkeTRH@|)3`gf0|-${Q7I=VR}>d&^=l{g@<^Aba!
zsm%m99jw6C4FINw!O39=4u~u$M!w;@a1f;Yed9-xo_-Few_Sn5ZiX$ueD^NE3CBCf
zrZqTQKcYWHd?Ow`dbEr~h_5G5<6ywyAWps>7)lER+3h4>tgXKlekS@k)g7PpzDw`n
zR#FVkPoV|seWT9?LLaurIQbjV`K`vGq__wKx;TOxSFhk?<5MT?ar)quYpVd|?^}PQ
zm>K5~AC4s)td&K<J1D~=erSlV#W3_!K<v()5cY_`Q^0DkIyemHZm6FZ&KG8BJ|OyR
zM840@&j(ukY=6T+fa3STFSC<z4$(O;;Slfd0zQ2B0H&s<mT~B4Z2>C$?6|SCG#`*T
zy&LLcON$DZ=kyW|h`;2@{o%L5&&o81_&Y4&phmX=B%XE$(-8h89LzP90qZ7wa7bGX
z6hVKKyV<wEL3L%^x?~3ZUl4yG+?*~i2Pe&qaK1?^_XmCo>iOTr|H!g2&uQ%3g!9u`
z!T}jechVAY@1d{vDd2$XkTRt83pkFDvDDYshZ|2S+$=bss)~|g91iEa+`hWU@o(Gy
z+u)aHXP!fJldEw+=ib2C59+GXfE~i`Y-#$p`GDYX4BC$n`_?UJQ$p6In6qbq0Nf{5
z@6&w06Ml}JbJ}dgIJ?729B!vw1dEG{V4%Mba6o@zEpdME_U+qc91wfVZfFBT=0i2y
z3y^gQSx=FDdL<6XI1>7e{Ld~fmN~??XeACoC#}K9*$;@wjl;ogj{*({*CXbjz2y;T
zfwq+6&@YY+&ItnrspYlxVPhjW2IuY)4v5b&vJd`F{#k*Wbq=w4Ea4F6e-a1x%6~)8
z`+*`i6AlMtEFpFnWIoHX(SxSCTHJg<Y#~eggCn#{Av_b}^NjFOzY~5%9@aU;ziSBx
zcOw-X%~!&Y98Zpqf#@KAV6LeIOrg#4f}bbod)B+WKOpk~!2zbI1o~2NAN~vW-wnSK
zAKRQB?^c{2+!7Aece8NdPft!j+fNqG?+&?u%m>5<v~qty{O~do<H3`TcHDbNi3<B0
z?7tg+Wq$TK#BQ|`2Qx_~5PH%A=<!kD)+NNR5Alm%jYGlhn?OfW5YE>%K!tWQa5LTu
z_Aqbzn@#I?!>=O1KDS@+v!CEf9G2$8(%P!Sz7=N^T*3j1#R7iHO+X0BlPmdF1m4x<
zcaDEmL5?}Z2l0Dw7<)N_dk4tBm%~FqgnS)X;`#mwhu;amnlQ&4VsrZ*9FhXvKurO(
z{lgOL=e*4G{U;oLC;YobIOh-_&F{rw<sP@h^R1R2{x`?Z9#O726A4P3pXu+y;djzs
zU5tAUv77!*9DXbO65MlU(%Yde|M%hWJK@jDNM3BMuLRAt<)9vY4`e5YfZItS;8x;!
za4$0%`jKRVlDsS!Q*{ko3iSuk{!ZY6$1!lh>ja3u5CmdEf<QRjmpzVJ04p68V76Nh
zn5fBvqmVyxu|16Qzjrc&k*&Y!^Q86BA|j{2gzU?<XJmauY|qHGSFc`yM#z`d*4Bb&
z&z^zK&Q9Dh5_gc7mj@6(=Iht5<LtnvPMrd7Zf@Yhg$n?tOa^Cz&VY00&VdkrKk%Et
zM?G$NxQM`u*s7Oo=g2W)vqs=YK8Osw1V7?`4YO(Ee76wzVFG24nVE@$|Mcn8AUZl4
z!0f}o!omVLS{(+V5QpChe_Ko20s<q#+aPcwu^xzT&r0|aKXQcj2!Dx2qjCP@i0>H!
z|JAEkalQZv2?^lh#fu;*DQOx0<CYd6#@z{odwc!1@x!CwIw`JT0VEVHfV7Gw&^9~?
zwDvpVilT-M5LbY)hw|n?RL%@2s#^m^4QrsV#|p?OTL5kmJ-{in53md906uX&AS?s<
zW~u#vUwj{6U{?i<u&{Ee12$3H$=@}8wsKmHlW`vf6avo6c67ww9Vv*dpHkTKi|dF_
z0F~J1n7XBBk#AC#1AtmQ@Qde>K7J?sh#vxjO4=9wQcDH_CiNR%T&EK80XwzwzPOIi
zfK9jbi|hZw|LwPj(B@zIf1WRYV*F6@ADtFCR0<T_x^R9Vi0=rSP7c@t=P3Vy9H8vk
zyW)B-Amg$E9Q)FNnqU9&byl4_U>o%B*r^%`)B^^VuOn?y2s$CY9q+z90)Fidql`P2
zPTCuA?o9*R#r-}PF<-EmaUY--bpqV_SO0dMgn2)p60ie21~>lSby$y-#R%eN0r-t>
z{rx(t3G`_)dH-ure!I4+N7E#y`dPrD8~}DI`U9q2et=QV7tqW2fE`lafL6i_P>XrM
z_+fWIDdYy}>H1v-#^L~SZadr>Od;et_-zP&?T-5Cq0s%2Z{F*My?U=5JUp!)_+nDc
z7c;Kp_3VwTQ_m|Yht3f(+qNM=%SSJGOdBzrM)iH)Q`q&<80OuX!#m`oM(AWOxcwTG
z|JMHBqyWN?!LTOO^7nHTiV!*f_xtzIVHLd*KP`D!{9#%4(}EXjVD<o{{QLQr0{;^f
z;Nj7i<Ko(H^gmbh4{&jPt$f)B()a%a4nNxlA06+T)q1vHIY<0N5I?RZU#=xzG+cb*
zDu1-4e)#BlU;ixpzgkb0obU@h^%7h^`n?+W@1+3(!>{7;v-Rc3Kj$j?QCwF)kKm5P
zKH>b}$OxC;|M$=Uf#GN2|J8c`6Zj*xNd)gDAHW}_!GAOU2=3w#cO(XM$=78m?~K%U
zj)VVJ{1MwI;$O1lWAd{!ko_+l{|N41^TYfZ8X$Ybug>G2tuMdr$Jajuci|PW;H!O6
zf1Cz?4*y*g>%gvUU)pL{ukTCe2<}1<cO>3+rGLz?(BMzLe+5cHoZb3+XdnY|7l61U
zekl@EBrpb48ywxQ1CGLP8|Y6b1+T62*ZSUZAOqLQpB=xyT2B$l{{!Rf5xe(4(E!1n
z5Bj|D5P$Zebva}T9z1w}i$6zf5s1&7Ba9LMxpDC4@K>V#f4K&}MFRwP9*8^QBZl}J
zA~ZPf<AL*aTS<e{&W<?zf1Cz?5PzEWKpFb%F6CQTO#=jXZs_O40sYIk{_;UaXpj~k
z10Ftn_%|BFg`QjXYyS}%NdLj{ue@UeE{^(ZG*I3_0z|fx;{4M%pr02)0|D|)z{$b{
zm$MAXMX{0wMfVE8F+*J-L9zL7<3N_06v$8!f0IW-;&*;^9{+5873im`@|WN9N*bup
zYygjHYru0%Ke!kk0(J{=0ev}fP*+opi$z9kknQd5xcmz%X@KO!$jQ11<DmtCCiE3W
z=0x`GTOcty5=cVd?r*J$KMVh_)>EbboNHq>4Z>ZI;rx!@ym^DOCl3t`0SxrD?1wqL
z5W6fA7yVB(K>YHNH4(}EiP&fnf9hi}7b}AQmo)fu^Iwf|(`TP+B<Ben2g)$_iZ0i7
z@M>fTXM;xk$5+x|$?x}4Oe8p<BnxC1sevpk$Z`CI^Ps-I{)>HKi3VBMGr=x8@-Jv0
z33Ipn>U;dz`n#Dv=Q_dpApJ#yGqxsRc6Jt*_XM%SucW~<`0mZrm7ov$=k;LanuzQR
zh#&WTI7e3Q3oFNg#cqW!<OL*m&CkOBtM&FUZw7l-_^l&39riGhfUJuVU!{S)>3*Eg
zE8?@e3;Mmf95%=KRPTa$BA50?gfBvT*;mq_w6qlXIoJVl7_0InkM!s8SKmntkbF0*
zX@JZHf6M(~?DebVaZq1f1%1dr`}`i%QUyJ54Om(a+S^)jIdKpg@RF<pIX5zwX;1=V
z6Ar@nz7+HI<=*(`@Yi4^hQ6sVKj$}S&{kKoJPyu#yWxDExygvY)2>c{tcl2autbB#
z`Z~b3Wj$^j_}JSn?~PYelKxR%5Q8~be{~%HY<*3(&$)iSMS~HT8xrv~M%IIqhm3JC
z1RA0|U#y8sG(ddu5kApYPkVW9yq9+e=ZpU>nF+~3`?K)>YCSD>QkYwGDemCQanRS*
z0Ty5mAcO`!$E|Vsha_Mg)s<`F%5fmJV;hc7M0lhn{vhY(^<`iFuh9U}7yT+8KU-g$
z^K-7HuhBrAg97wD{hU)4p+RnD2F~{%$-#8}QsNghNRA3$-WQUg|M?PsfaK{Cg|gvN
zJi|&FAUe}OssGa9ggIe3VcZ5g$=}9-rK%{vz?h$vpV<%Zfx=($4~WlqbZ`J@d(;G4
zni@a|j3eMCTaV+F<yq-)aX~A2Bqaat9vHi|k_M6xcSNu7C-L9Qwe@q%#0nZX>FrvM
zTUm)ea@<`100=>T9*M=l<>LA)4uowpK5k#+-L?srpLuCLSV@CM$Qx<HTy{A9!C$!l
zY5ezb!<Y;1zv4#zqJbNX9r>qEXIl#}Qj-3H2D<P!=kBA+zt|U6(m)r+lq}^bThb~0
z$@j0z`#IOxY8up*<oy!~aBE^u=VOp}<0@`lXm5V>#d@%EZ$xO28XNru?tl9I>+zAp
z_>`@<d}}Lda7398U_Z{{Xn=(=T*WujaWMxgiL$gWe2rJmyp#lURfdAzo~Jne;0cT;
z(&T3Ns;%u$zJGoGzhYj#LWAIA#vtj88#o|Bx6C7*ceDU6db^j&u$l&~Fjm+B`fRhq
z^+0^f8pv0XgCP6Ez(H@%S8@N-?|;AGHn3lS43{7LYvW+`zJTzFNa<>B_<{zF52|6T
zH~f7NxF$+Kz0p7E6PM=xpT^%nhys^u??-7+o_%c@f8+oe2e+@JLHwaD5ZV;JN2j_(
zgFiX`4TWLucHz(Y27iPGnbBwehCgx=doBP-Lw)*6J<@7@;u6j)zyBouMxvi{9sVc{
zT=px07tgxE=!<?Z3T1==xF#Iclv~!J{0I&HB>o4)KIhiQ#XSAQIQW*_h{SSzFAe@A
z{>I{;b4@PCuKfWT{7L*xB(~#X#*loQe~Jcw5`R-E>gAZT-$esNr}|HG;ZNdkCQS`i
z#@+oc8vN6G@F(#%m!SdXGTZ+s4gMtly-%9Ki~b&ffqPkBPbcW^Xa)@x`Jka3DS0qn
zJr6Wimw-q0_hF8M`=I`Q6{ta%fzteJkeiVNZl=V5jQB8+5^)x!B}9X(>6buyaw14c
zhyw}mH{*Qa@83CC8~`@(caaXk{MCn{ee8s-74UX-2LA3Y;EabWIOpm1$Mio)yxr38
zDj{)$OR<AX%ncI%i2P0wl4}6Tt+5mXiTth`BI6@E9wZ;rl8qxbHy7Nxbqn0MaRV1q
z7!?%-0s;bnhldAnad80=5fQjNy}mx)AT%@-7Z({66!gdNNAO&VIb4nZQv4)>Kk`9n
zfaD-XVknpJNAg4<wl2iRg%kvT1ozeW`}p{Pn3xz`Od=8!deFoe1i^SvBrfz%<B#Bm
z&;ZG+vh@Cu{Kq{#J-GPGCH#@+kn4zTV+nsGU(eFJU&0@WBSmr}BQd4O`#*CA=8lH>
zk&(DeB&HO>-`w~B?sp->VJ@cs3-~Y502%Mdd_eMmd<}mj-vbg)i@bM)4&^Xc(bw?5
zbm<Z<9u;}#NRDcxtj6El&Ke|oxqx{1dkR0Rzx~yEQhOYLl9nw{(>{VLntDfp^)Wwi
z<ft#MSlRjj6AM?MrU~!EqN-s9l=oNyt$jzq0W&9HXmSGVKi~j#4UPe&-R3|{2KvBA
z=>Z`ayDBKQ7sx9c!|P^X7yRC(Yy@N#3;+kODq!JI0$e<*fR|4l@QE1yG5j~tYvSTO
zk$AF|F|4bPfAu~wuKmw_t!^8E;aA_|&(=r!-o}3da2nO&Vg<i|4aW15aazIq^|&~+
zuiZy-b#ofl0SXw`_O<()8TSGXgZnTZ@AOyi|7rXwg<;$w#1Dyo{u=z-cpY%}k(j-&
z-QUV#iMzjD?9^B9lQ0|N?$b(#e)ayp`2X4Q|L^<%cl`hVb^dRL>p!z{4A43=1UU5z
z0E_00<-(wZ{MMl+j9vD{-RChXS-yun$EcbDHZ$nJnDL`P6V?|nul(D6=G|$4m{}jj
zT^|7Ir(XbJ%i6!)-?=9P#%sghdH93--)06az^WDj45HowfrE8``#|+_Vbl5lw&6do
zyx)IW%c}noli&O|Nj(LZ1F6#p+5VqTDFo>MRIq-F?DHt{TA@4t3#!Ka7XYdW?SJ{-
zrr<KFeE1$<-3q)%V*vdxV~V)916$oj4>3N)kO6D|g!bP5Zx*}gzd_iH|9ZjG|LX=#
z`>*Xk<-exi<p02{tN*KcP5_>V&=0%|ycc-?ch7%$$L{}f_FeyFY&-u;TetrQoh?Et
zmIR)SB5qO*Y<Crb?=2BED52T8poH3mLESGd#?JisKXU53|6vne{}1kc`QN|e*?*sw
z$H2289{zW&zWd*??Dl`)9UT9ya<Be3%e?&GIQ7DRgT%A{b)rv!+cluFlN78OdI)&#
z%7*_6u5<rO1KUJW)*WQu7edH?#K?P8-P3ceeQ51m`@qtn?6!q-#UoR<iigHd1-FeH
z3a%R1=HJkB$hf9soqa*uBI~TCN#<#FgM{;{x>2W<$idp7$5hlqx2tQqt<zC<m;=0d
kV-$>r0Qn&R8oNLRAhUoX;M1<^N9o}b4&Yi6HKsv40PEYb!vFvP

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/setup.png b/games/NXDoom/data/setup.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a775d24ba96063062dd1ab5ac2ef813a6a64423
GIT binary patch
literal 5654
zcmV+x7U}7UP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm0013_
z0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H16{AT+
zK~#90?VWj;996l--*c+hnd#YjwycvtLP$c`qJkL2C1P-4kr)scxI!*F;#D3VB7$)P
zK|ums(JQzlh%qi85(yXC#Ds{Dn-B>}X31psnVzk?XL_qT-~FSydb($Nt4XF$lkWF<
zW~#dCELHXU>MUQKIt3I}R8d70Ra8+$6;*IzGBYOv>so*A`&Gf-D<GheLL4LrB%lf+
zkPw^^(}d83APy3mDu^pg5ODz#MA3arVM2=t;t)a=f=CsDD@;HL5-Jm_rV&91EgVsE
zd5(<0{Hjnim08Brh$XC%5+Pv;tKg9k-+T2dEpO%WcqSd6tc>6J*7-BtmA2RIrOufo
z2%089LjMzj08Ky$0TKiu1cVm1&-ksINOV8N#TOuLd>;uKkFV)}0OjO71qfpifuJf7
zh=}OAhJZ>4s2Tw5uC|q}y!xdBo}3)e1aTRe0zjq9`mDoMIy2`PGX}<`7JLaBQ^hF*
zA^&e><uA<uoG#}QS$XFVeqFw>c809HEwVD^7OS##`+od&XA?XlW3moIs_Y6!O^F3A
zt5PEC7^E4%wtqHZ<8ymtWuF%cX#$<TFzQOJ(h4PMRlsxqY?76A-f1|fN;3dyB|zWM
zXl#AO!a7`j-f0Mj!q~g38LFnGj3)^AcfTL6wU5NMHM+}i>zXs5C>;BCw_tQEm^SbB
zks!7;4}wVV3D_+beE*AQqOzh4P5av5@p#k59|}b9%s~$V5fR&V`^C#Kzp);jEnR4D
z?@t?lETUms(;z%!VE{lR_32K#q!|Fk^}@bz?#U>xsQ>^h@{M7rEBytWRc^=I{iE;(
z^)CHYE0@AO!wmp9amieC?{7;Rf2PZh*5Ls5d-S%)Wgj>Wv*+s_k`qpv58E5>WQ^ZG
z8o|qLLjZtfv#YS|l;Z&a3r|@9G2%@)zhqL6BW&K=3qWq8R9Y1fe}#f^cWfw-{_X{U
zU_>AociZ^<f!KODi}*x@;o!JGXk=t8b~uqhC}Vs87z{*W>tn$%w5We65(s64ug4$H
zpGmX;X(d3scD>mI)i(w;9LBEZJ~RylQidf0T807$YvWgW_r7+xtpMj7`w#VESC2n!
zeqG)$di~+p@0PA1wCvmqTbUC*9Ui=RXfSR3;h=`*!SSApKM+CFYj2^fx)NT`ApY9q
zfhJO0K`<h)&yycLpS&;t5`^Jy-4WL54dRV1pXoGw{lfr&!O_T+;*X8^^}nDxrTF2o
z5C+HeB7Il44-qXlp2j1Uyegomyim~q3S314C~y@Gpukl$fC5+1018}111NA64WPhP
zG=KtEUKl{U?>vnMHLLhjajT2CNK^9PO^ihOHs&a`^1=W*eEI_zBA~;Y-NTq<@d4oQ
z6ykUJ!qB2t)b2AMe<&2eX!PM!&uADCAu`0sA4xOS3mRQyTy(~O1(gnX!vejd;S4d8
zYqrY{D`#jO$^0}hnQBU`sCHV=JQ$1_gBg|C6wGni(K-@DP&H=&3S)Sx%_oILUKl{3
zOQr$jMHNt#JV|>TymHMKp#g|kN}zIk(lDhi7iP?w6>DP=5eNX0hz;i=K^W}shi_yA
zvDO&rVTJM1h!9|mp}MXP7OOS7k068wE&4JE5kV6I;ZO)&ZEboy(qAYs(jX!TO@j~u
zW##3la978@yrMzGy{Mu^Uq0#S=!D<rgU|?y#R{(2pl}<wVu3^9C{YMbrxR$~GR;>!
zxujJAMCr@_a5xOV-w&J329L)R0~!z3SZ`=(fZOd(h_7iHB9Tb!@9^QnaJgLQ>+3@(
z6iSF6pC+IWEQv%SP*pWyX{<BGz&VGiswgQbNqS7i^1y)u@OV5>RSkAWIc$y!*z6Us
zJ1Ssvl*48(gM)YA8@GL>SOpjghr{rAJo=qhRyGN)84(dWJ3BEtItq)$g1WjoSS(X7
z_^ehdTrL*?z~}S9=QBTe#1Ll$J39=B^dp$2Q+a0qkw^rCgX1H10l?*Qp{AzBbXr7&
z_V#x8{o@zdFakwUOs8kHT2WeBny}65^<rdXBt?wW;v6Wo4}c@}@V8tjuM8j=d_yjm
z3$?YiS*JxrXlrXrdWR~Cf|{BdQ%0aD3LFkc(tX3j!x$bO&N?m58LG=eu<%Icz|*X}
zF#uInF+4n+6uzPI@^aMG)n!bJh|to~0<Smq_<luEP*qixl@V~xVYer5s2Um^9K_Jj
zP{y<rg=0po6;?}rIE(Va08~}Q$jC@q_=d{M%TZrnpK?DDp}Dy^t74gRj`H$yaGv@y
zFveiDS~I2v00RR97#J8xxnEHf%$ZdMn=OA_#nKHxRaJPs-mKsos;H<yLqo%)?L>su
z)>cz>vZ5#`D=SNB1ZLX`{r&y$cqYH<Z?Py?aQs|29oZREt|Zj}G);rw?>7bCP-SH$
zX3Uro`#lx-hB)UaDJcPqdqabW5`LReUtb^k`ubwO6-B|4B}-6JlDrKeQ_>tknx<iN
zbaYDa4OLcF>JA)DLt9&0+B!dzIOlLWod^U1v3~rKsHdj~nx=tsj>U@?!|8M$ahlU1
zX$G)i<DX%(SwYd~zeE)C;1LK!1pjCNZQTQLk6R5-A0<2juB|FVMcMcTCL)lgPbVWt
z0}0*Bcc}9fgu`kSaCEvD8lP@P69P61$IRLa-P>qPPZK{CO*H(_$SC?eUI?MZj4(dD
zo@O^1YRchk^+J#UV-_%Q5aZxX0b?92x|Ahpt&v&he2IuSfGA8#G=!wv^_A$Raf3<R
zo*_(hsqc#BWp;bUV>XutXM}M7%LV2M%<4iO`|xE;Vk58!KOZEw1SrCnF6r|F6yeL2
zR6jrwzI;hDfFk_-Q2zA-^pzs~94Wtg0s2Z2ehwwE3IK}m<tsmW0ny(@__>$-UVy$*
zgfB@FCyFEhET`}nFPMW{Z}=RlD#|7v4FF(p$cOL$cq8^5Y%d7-fb41Fa(w4M_`MtP
zzSB-jdq}hDEAZiqz6!>z$2@#MavLDm#s1Po^D-XRvZW_L1o|Pg@G%b`klhQ&A^e)E
za+GE<BFE{l!(Ckg5%55W&@l}kkn9J@6?_n(aaQKh#KuUVxwB`0NP`G?Kw9XSg%3#f
z1m?1}KWBD&1Bic}t8s4hQ${2pLIZ#nIws)*vY!R$D>>=vHO@*slzig*fpcchh=K+n
zG>G5;NQ93$_<-zT;W>iuu-UNu<b_EOA=wM3r=PMEPKP4~nGh`rMEID34@evnSa<qr
z(kN<wCgImrSAYQYd4|%$uW?u4=Cv2&@-^q8a#G(vIecR|H0;I3-#m#8k8DDJ{~+{S
zIJmVM;E7}V-Bm6y#^4#8+NfliV*;faK<#O(Nr0P%zv`Uj*!bXWP&mhPFaHZa-SiAz
zcy*Wlj(;?~!a1(J;(XkG^XE}o;!K)<I{5L+(XjyT{^8H?(_j1!nyTs}d2MbmZo`T*
zm*NYbU5O8`I0cbN1lQkkKVI6t&-Aq@Tmv9x3ck~B!|Pig!t5D|FNrp_cH(~?--=Ct
zcpeU$6&oMA4QIV~Y0A8_g&)7%zH=A;^M*SR42H1!qE-0PWfx-J+=hfO9bLWn<eJ+M
zjF`Kug=qk%UL36gvaj=Rz5Y_%cEhD9(;OWOVstEsx|+(AVWtA#2;0{`0Efel5~m|&
z*oS`lTRi;ORxl;|w}1+ASh(2+-;4$~zH;S-Y11q%aZDS0B7(cRGA(=|1g`k}`IuGX
z1cdqN=443Xvj75!W!>8U&etzTiF4}j))|oAInaWw+g`%k`<v0%r@zTt<F3Mq3+H3y
zN6x~6<K`Zbq1f$K+<5IJSa;{cfEAz=^B?7lq*VbmCx3=CV@Ayk@XtK$L_GWWT~mHp
zQwV`=e|r^oes=?Q?Rh(zCt`WWeiE>3=|Zf#<!YR>;=NNUC5-heul+W5?>z`u%0S$f
z_V^043dp{nzwXA*O&Pw|=f@>i+>8s>T$>R-K-lx|1Gx0^|H75m-46fgm}&S#1R}!P
zFJGkJUYZ|FOl|VZTu8nnD7sA7pSM`d&*uXGJ-r@$_!D2mQ&0a5WKd57pW?P}-S#pr
zyySZHdj?IxH<sh`4RAmk%UdIm`#3nd%;d?t>GlV4pgH~5Kqo2~4B^r%ZpK@C5158;
zXy5);TyxWUgu@Y2@DH_h;RpBs3JI523*@B{$g2W?tl)!ygDqY7;6-1>mM6Dmm9`K9
z>+gC9+h5x?3BJ{$;Id0TjVFG2A6|QLGj_cATRi^Qy}0Bv=fP@?ZxicP&g*aP#eEO{
zI&1jbp5K8hu33+^!@UV<F#t>i!G!#Yq2eX25m>$S0usbc`SwXu@#Qri#J%77I_$RO
z4J#o8+B>?j?0ug`AQYWAItu@|d9$(U=l5dag2tpk_w8@NRoC5)Lx;QKQsi(tZ20S+
z9zjFBJ0<*3D2)3b{tf={)C)+wuXOlv|3KUcigPCyWFs(}JAdMKa0QQUegz-;#1&{c
z)IKT6ac9h?N$_Vj)Z)*-`$<apM1&I-G-C6w??Zi^F)<|vXFw<v#>OX}P6@xGvlmz0
z@ZGH70~}0*@}?w^SOu7aZ)|6rW6!~XN!39-kf)!0(a0paB;57wuc5xqov|pdtF6X2
zZ@mTvd|eFBzqm7HvA^}X?Re+FA!GwTwpWC~gbLY`{(86>_(1f*5#w02Xi+Swcpz=<
zU1)AOoB)5;j5?h6v9q(T$3MRE1DM%hlmZL@LwiRrdU`xb<224`fEoD4Hb(M|;9b!R
zNPr)0sn=BNF5ihjJG*)&wf4_?|LIA?rs~=O!26ajg8|<F+TA;O(rO|?MZ%-z?BK_K
zNj8FaMK53?d?G@L)1DM)zb86dXIxjWrn<_sd$+o}67lc>U}(sjG_2EMxO+{&k2$s&
z7!{xa90`1o{^Tzi(8>zeq<;SJh}RT+eL#p0@$dnL(o$#Auz_F@Q-v>E`P~ah0Usa?
zM(@UnFzRcojpSqhcK&OR=?6QzcJEJs4*<0_l}W?;d}HrQ_&`4Q0@A=I0`@nxCxtP0
z&P>$T*Nle+(A3<9f9!ZOYxp~M?m>Hdcl1bgP<3_HXsDmuiy$Jjck~_sd<L1uke|JP
z4De^xyRqVolaj(9BCJ|@HVpVi8tcAwKfFGFM)+QzAK$<C=h1^?vBiqBP6dFZaZXxt
z9BSNE(Ku$|%a!CR0H)!uJbO9*{`3Pl{p5uyLH@@VE&^ASSQ-Fupy?1UUwa$+J%cIX
z_j`tL{mpmbP+J$`;d6y!^#vbI`8;6J!nt_(M_<MA(-y~_VE)4gfT=xZI|{N_pYSam
zbawDL=lI6WpT~XQxo%PqVB*s4u0(rBH}<}LFfK=iuI@hk?vKwR98uw}Do0saDTEMc
zJ=B5Czu$&+cWgjgdpF|YgE4&a<16r~^H!wwBiQX$d}zffP!x{6Zyy@By-e^K17i$o
zpkw_}zQkEcni-ZK{|S9iXcq8m-Boz(fm>1*`^lEWBVK&!;%m^{+CJel$31+UD*zaT
zph*or1AgP&8Ti?Tbto-yq=Y|lxo2++?%A*zBi^yZG$*b{je|2FIIyFDp9N$n_8+?Y
zCR6Z*5O9^1;?bXc4|TQiADl{b@9Lk9OAWuqU4b90zrhrIBEr(ejkx}*^AppYxSl7y
z0r|av4DdlfRYj>O_{RGD##wl3^Fvs+bRj0fpXlV72!HXSd3f~UZ({bWI@3-hB0_1Y
z1KGnb)LuXq@Ck(bANjp$_{Orn&W$Y_@5lG<xB;~_RmcRtveJd?)~?2X-*>D2n)npp
z3nB32Gdto=HvjH?L(-1IHGh>pC^Q3nqr3RWU#-X4XD%}Zf8sJ23}O4u-FWHm|3YhP
zN7QZ1P~)z|{CP9+f%l(^<)@wqi$$4I`o?ni-WGiOp5H{zG;?o&GeU4+yA&4E44`b@
zD&t!b8Q~LvMaR#^i%<Rtio%Zwj+wAiiKD6-Zn@*<INZ^XY~TYFZ3N0Ofc%&yE(3fJ
zVgJE){A%-aY2g@m`E<b#g(LcxLDGbM?u9o@!Iv%h)5K)~-`IZlkDq{NaAXo3ug{Oi
zH~$46zhEuSyXa~hXlgs^@H;yDapTt?z}lOBh%JA589sktQdplqfGtnG3UlyTT$tQT
zTF#|&&m}?ng~$fJVJMfa{wVIbb1j4rIM8$mzufdE{Nc&}g@4rOb91;#o%q^Km*bMv
zt4u?m2w&4Q{CVp?@QY2)A`lG0xMWU;4IeuDRIFP09?Wd01`*+r$DY9pe}8NIB(s3e
zqHWTU=O2aD1}L3#E(yRCe51#3^5Pj#D2O+AzirecQ6+Zu7M(C3*Iu;-=d92NgqVS^
zX#%hA*o{q_pGRw3;)5Z5l|>gE3y+%#RnyRNsCUx-Oz;T|j8P#Pz{jG!0CVsSk?IGj
z@!thb-Oq2Rufd(`uEu*#Uz`>EH~()x?s?z|cn0Dpd@$kLHv!)W9`d|eSdGA`-1+fh
zmNGDlEBY(Flc%S50I$EXH|t{m&D{rb24A-1y&Zf6@C`9b82|>R8J~ww?d0j~?$5fx
z*V7yS5$NfLFSj=!-xWMX_=cFJ6cjatbRNF$-hr&UhrNA+iSdDHgfCZ8OMoMVZ-^<S
zdSgl*OX=J1N>KtN+t$-JgxtX=Fp2H}xnB$cju^fnrj!7dQsdY7A_`|<(1%bck`aC=
z9KrC&Xk5b63m+uc50GEO!lwv7CdCOdj35p^pu3OT+PgD4hB`X?bq5uYBluH0)uSbe
zRe*j0jv9PJiW3BYi9mG2xQ%c4$rfC5<%K9Mae#<of8!p-F+BR~t$N^`!I#?zlxBa9
zhL4aI?Ft?>`0>($U?Lc|;Yi2rPZ#{?h#=1^1?C4h+IRj$DGm@fCY8!x_<+p&KhFk)
z9CaxU5O?M|e7TK)y!me6v`Mi;a3_lJlS|@9qcHvO4JkH|z=Sz^@&&%k3Lp;#gybwc
zZi}0*FQ4ESY!#4u=|&JYb7#K5m*@zR``I`NB5u_$I~jBI$cIl5Q#zNUp@J#_3<+)p
zm<{;>Uv4!}kOlw%f?EJ)Ow}e6zFZZo0RR(?0FvMr8-Y?4GlBwy4-^dm03f&my**r5
z@PVQM#3Z-^V#ag{g#jNZ8bE@GDIjJ+p}+@<1~5s)c+?1vefWSx18^|;^W>(IZUjos
z;5(VTiKC?%z&xkFUsm4Ph!~H9I=y#(qjRk9s2ubZB+UR$Di>!qI=sQmA>~Og1&m8H
zP4Ml$z>+GQarBPboTOJupFL^eCj*-GQ>vi6eJ&vY4gr1a)@1J;0SR|fR_;9uXR1?)
w{AJ7DgU=kDqb#bZqKYc2sG^E0s;DgW|5Y=g%lS4jEC2ui07*qoM6N<$f{5&*2LJ#7

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/strife.ico b/games/NXDoom/data/strife.ico
new file mode 100644
index 0000000000000000000000000000000000000000..85ef389ec584dae829ec91c5ae28f299c8280ebb
GIT binary patch
literal 44131
zcmeIb2|QKX8$WzBcN-`fG99xrOGP1)QVB)KJX8vmDf1jM4;eCrhARz<Mha2MSV<)!
zoyt^%Ix-yRIM2KGQEpeMZujT!{lD+^`7CFzJ*@S7pS^}>J;T~K935^34*R3SapU3z
za5zhJ%)l^`-#ZP5BcpSytRwm0**M%zVH}Q|dnA7b-Pb9N!%0eh&ZB!{Rd6^ZrIGv+
zWgJe<8ixzns-ZgX54Jy0(epNKRMEn&VrdpuwUNUaRHuN^CY80@T^qVmJ>vNFya<Z9
z=Lo$oQd661Z(VJu-E43*hG8K$-BD(Ke$V1!KUPUu{#Rx~*BzB-$qJT9t(m{_`l`s;
zQnzIVSsmWs?3L<y891U{H*#N{a^cVTl8gOP<YNOK?(R3wcT4yj)GIpeVd<QSuXXHc
zKi1TJtJbkouXdQ^T-((loU=oeIqaUrr62!r23xz(b+ru4$49>KN$Hii{^`%|usrLO
zB_Su{_X-?hrkhrC(w-PKr^`S^Y4*YwENfL5RBTip1#@%9q-!N!%y^W$aNfzQ%-ezo
zc~3Ghed7Fdp5fzy+o~#7HEiXC4vXqQ(jUBUSjf-PBzSKzn^HU@*jY5=n#m0xr<E}h
z`lhMcbh#QBU9k7u7MXpmdG<x-F5hN1-c#C1FYfvr+|{DydthMM)j2z-z6v4S98mCZ
zp69tNE!?G@>DiKbt0in-E}3>!$=rR-!apu1XsR-#`e;y3h*Q+x-B4P?i6dTT9un@%
ze<Z$Ej_r@(8N=~y>FMHZOP=!Z?&YKyo2Q+uS)IOR-y_x!%Uum(8F|`UZ58ki1}vFw
z2IVAW4Hjz1D>t^ascPhxWX1l$w|WhQ99_j$h*z&Nq5BrSsY_F2wV+l=w{zX&KNkI=
zx|pPu9V&6Tajn<KyDs}YO!IB5W|kI;aCw69%z>^Z>b4AyE7!djE!q8yH+wP9=19$g
zft&lu4aS?#ONrwSG&I0snKx{?FOJ67Y_uK_?EC0kS7RN{cp^W$v){Syk?#8qO2(IO
z6`X8ZaW#2k{+zulF6|QC)^vJ3YpRI~`KC2PbgREFX(s9R4dPlQeRGB!$-(QM43diC
zdTVBFB)#IkDckdyo14i$;AGgGZG$JxN!;9le#%Rq-mIB1Re?@(PTH(AiF<36Ogrx^
zkH{8KWH{41HKXP&k^lbC<+DvykFCS!;L7ZYgxJ~g2M-40ITWhqun3h~4m&4UTJc04
z>OP}p%Uh{*XSxz!Daq``l&PYkt%G6NYaTXNo9=a4dUWN9>6Ta4T+vTY+7iH7SmT`V
zlsTMzDsHeUoAVOUF!cUz1@Zfqjm8@cCB<=E3eIU|X$pkyWuiPg*K|s!evDw}U4hQK
zb?nPm%L#}J%$nyrulik>c9;0=g<6+ytrW+Fvrju_YIIKSfzF3pdW7O@`MJ^hMsMmr
zs@=~>5I;50u*)l*MUZ9Hifeftj;2m#BH8&}Y;S6otZOfmbu@Qq>aF7qKYc~s&5BDi
zo06YE-5zI}Kfqup<07qarC7S!m^-r$43kJ%WtT2ZFJ;yx)OnY2lJmNXogLEJO3tc<
zt7p_H_-NWZe7MW?z`hgRxyPxc)Cb$u!_^9M-*?7l>5)Z>6rnxa+^+2Co1KcC_CrF|
zvFdx+mi6?^SO56o-H;(Sv|OA@p(x}YKh)emeS=2Yo;UC9*0m|7JtXRB8ttmc7W-tT
zc}#J*j~whG5Vk+*#_~PhM2-g2B91iXTb}y@7#aHlss1i6E3V1B7hm(tz_I`B?8n-U
z^Ymv{hu`llN@u^YN`2`)0{w%<tpWD=xW1RAMF-2Me~{>2><HLj*KJ*2(9>`w<Uz#{
zyK%NxZG-@cZqdG`qS%dDQl{JXZ@TAtFYVUNCj^+2t6NSV{dUtOtM==M?<>Ap^3u*s
zt?6BEPt*NtGTSfOmf7cZ+&s^|%*S_K<IU%}OZ6R-x3#fIO5i&7wHX(AI6mm#Wvh3$
z?ZTpcJ&|?CoXu?LYgDpI2}|B6RMg%yk=E-g>C|9<@!0T+Ld}yrr$;HlkC>cnH1fSb
z*V>9zQ^1aGus4F!>6u?hQT#G-+!;ok<CSXz)mOqg@l%)VS>0TFKvUvG=lf*Wun2Ob
zyLHWZIk78SJ@m?|mLK5U<;Bxg`*M2HnJd{ntqyyO?AzZbp6g{}eOu&5w>2m;(sY;A
zE#Ya?N*@~StCx?|{PTvao}nP2ZbkbF>17pK{-xZPZ+$q``@|_T-Ie<OG6PW|D#Vd*
zp5aUaJ~=C&$@vXsn&Zx@PIkGbygIX8YpQy8&Y9Pl{Y0wU(AT}i^TC`bg}ePz^EdSk
zyb^0ol$E)2r$zLMS|>TRSovXliAu6+wR-koK}{@6`EG}O4VR|3uD&0kF74(V5SXRu
z%;|5JHtVjVn&-g%r=f;8=__H!2473>Q_Kl-)r-j>E#H|baVama#M9X;y;wVmLp7+~
z&3aes?Sd<sTzl+b{>_;~3pAyj?2kRK*<^XN;MIV-UP(-kqowd&m!Q+(99`K#^L&?G
zZFl^5Lz-#-D$~K1o$Us?cb^7sJ1xFFQVY_Xo8{$hQM2znQ(jqE{`{1XaD#@X1W_?6
z;@U2%fz1YuV|!XuT5FPh`bws^Irh&qj417%vO{#n&Z)%~QmpJa=CIrKxSSnxOK14r
zvyfbg6J_?lL}zx1HGCc}?4H>^-2dj*Ki;lpnb&J@@Q-)#7d>h&vvu4rv#qIc)mz<r
zLm}S9F^6ue*}+@=wJsZ;*{x{YAequv{xr`bGP)>nz1p+2sk=EfaxJNRPHob$eLFs}
zx$Ndvo6U}!?!EF_`Sa(M=lchF<>i+*#gM{^bE~&VG|pe;U=^9<WRke+0_E);j(6uA
zd#c6V<h?IR>9rY0)C6*9>KR{C_3b&9bfAKwUXoXJqR`DY%GF6+iqU?NL}Sg}?lf6P
z{dB&&j^W}h1_lJG`lk8wP6w|JZPpHxSI`3Y{s+f}+8oLvxmIRcgl9OSO6I;Z>RjU$
zf5>o--iHV7$*1_{%zd!3?eX683+xxsACu}NzS<xrn#F-*z9J=sdoMmdtDgo76<>)`
z6u!N7cjdNE2R27{L@tO}op5cn3U~YZa(8iF?vr!6lqLO%jqdwz@2p#J{gYn%N20CB
z)n|JNsw$5R_;?3*M_qfi%W+MZT2AzA>IQ~X#b?{D&X{KGx+d_t+2X55-yG!kIsa+l
zHcPeM-a{nPJ-4IPrYeuTTdyA9U~h3|Ba853<M%}ckwnsr+>D0lCvsk1-N3-Srz|mD
zUhi1KGqwyP4w=K98|+^!xyUZ@0{yZ^GOkmL%gCytSWL^XkUbFRsyz6%j2gd9L#4r3
z>HI2Ja%yMyIu%xScD|%7F?Pm+f`X3>#A0uLlEt%<Rth&9>fgJ3!$7gq`G<x!5vGEA
zea%}0@7CXN-1q$QbS6U!PtO8Le5NE2SErs^onfi8RA_$p>Bp2f(^a-Qc@lx-lQo;0
zn@?3J_TMYB=WzG%NJ>oP=F&Up<aA2KuClH5X<|{<qm>E?&2K1M?zwNRycfZ5$7lay
z<FSqWex0Rrq8Kx-Z$Gx(mZMIc!Cv~z`;X2=3WkwQ)AP2d1bqBxfB8AZ{QTMNp?-dJ
zan>+XRXm}YLh5aCAo(W@4Gq;7xH;xmO(}LVMwzXfPsCXqI1m{a7})3X0>{y2=OBdZ
zoiB5p&Tet=EJjAg^`xm<XSY)sb0c_OxpB2WOcklbKWc2OI<214pv$to()8i|`&$~<
z73<7V**%M~btXH`=5!i`4%L49_U-EdzU^*v=gq6Va3PiFmF)bcrY5Jls!yMmJ33w<
zU0Azf!JZ=lj<dCCPg$%WO>I~(<%UtD^qz-V28NoN^j=<GV&~@&(<veqcu56?2Na5@
znoZbEwS)Hrk7pEJorPbC(_O2Qc<h+bbt~hjix<VOA82ZbVJL5PIJU;iU57OFW`6#=
zuCD#=#?jECDHv;GLLVC&E7rI$Sk=ot=1QWtVm)rhf(7Q**47V*Gq3VabGX5gsgY`M
zg+g~>mY<S$*^PqSx~EUKKUv4UfN?0F<r1;|65ZCB3(Vc!hc36$zwPL-XuQ5(eYT&G
zc-b6@g5t-IA2SVm>FKd3C@9R!o<k%GEesJc=r*&lady7G^qN3(=!0P{UFyP>IBRa+
z`}gk~U82xEnB})`WmO2HkT^NENOwQt(7f|=l$Nd+Wj3rM&M>`#*t`7d_3grUUNP4d
z@DX%x&ro8Dh*3PApP$mzm@C6SjZMHuNjU!G`Sa&_yjCbveK!Ot=?Rzi-wuc`nz0gB
zx%VoC4i#$TRIAe&!<X{Ffin0}<mLNp)n!Ti@tZH4r_We)WaFPF3|HT-IjXI#-Pw_u
zFLFDwOCjKu?1ilsQ;+)wOUlWGwY#am^HJb=BubhZQ^8-cix^71zL+>OOJ<t8yVm>X
z*X~soO<9R6FRE#4YfBdNDUJ_N%6U#ecP|VnVG8u^ys3UcO@)<{v+zB`+pey*<n!5=
ziP?uf(jhifSIZbvebdsooZr`9I?b@7XD_raj4Ip2ztG0p`}};@g$oV`1tp<({G^vm
zCg(Xr?TJCJ4fRs1aRy>ON~o2{xpW(SoY!DYn)>FW>_^vvj9#NTYiDiQvL$P<fJ*hA
z&yn}6vS<UE7#5hDo1bV!R4<y+6{E<_9JV0rp0$PuEIn|3!2)sPo7-ik4Ux$=s6(9+
zWE_92l!N*;L#pq~mnP0#4LS>^_)#K;&h=~#*>FnbRL$<L+ZA#Rfx&hk->fe!D-&rT
z4-LuMz4DERWm4S%+`P)GQ%h}Yr}yac%<?;OWC3beLYis&@+ovRdlxOZ-COWR-|LPN
z!<5@cH=3H_$^BhdQik<>?dhV8IqvYReJVzXGxlyv>SzpY@1QiF*|P5RKIuY>Cp&}>
z2+vo%&=An=6j<(CRg#gpX#>yV-OoLHbG78fjy_|n$*?jw_%2T0Aog)JV|CjfnJtg^
znzHn;Xc7bhtxneLRk13m7|2My(;N`}P+&*7(*h@stHP;~=a&~LtH0GMtc|MDFu$HV
zAUdeFJCk1I>9)?N7J;o<u0~lti$ZM8?FP7GIK{Gb>F5H5ryZKI?f9b2Ob>knlviok
z-#ormb^{mpKBHZh8(vC$RQZ$Jyw>eTWux!`y<}bci`hd@gxjuF%2%};+NO!98(y>Q
zc&eRA*u7$=jrN(G(}_ne7hEXtdQN!yF0-IeSCOgL$VXjGU;WK~p>T&g#hj-NY!75n
z4p-R<w@vqrCsY<$s9Tzw;IKo}Ou=3x31(6HG8c>a=qMgGv&1d3y+F~WvJJBaxY6Ns
zy+wS6ljq(oz~vAPNqQG5IPTBEiNGIyJ4otZPM)if967lnA^TLNj;_J!bJvOe8VLk>
zm^T+EQWT%AGbA&scS>=kZL6u8`e8E@+z!%tYjHy<UGHYJu+Ku(F<CF0i``*rG%urX
z+YR^4RoiQIU*1~KD$zq=z)JVYQ@KLSWuo14ol96x%_`|!LuKOy3i}_}IeK#jv2Y@L
z;?&YqM!Qp$62)(o71v2m4L|L{s_AkiI^xK~4dw3h)3O<Af}e3`IL-{+`zWSJEMMZ@
z^*hZ(tH5{V#5IQ;=WFeo8K|krTh^Z@DnXDbQyVzFjp?KTsWH%vF2}Eh#ZOzh(aqr#
zo5mKCd!8$G7wL!cCTz-@^Ca|*@FR`24VTFVOhelO+vx&VE?~IuNAD6!s_Z>7uf|$$
z9oIDOlZoo8vWl-ATDBjv$+a9z7zlroPUP7_WM`eyHXV1cfU=74TIkeF*OohLPcN&e
z)O@p|%9M0g{W)QgBFU*xliE-%0xc2;cowA_COdn|R;m_VPl_sV3r{189Jyxf-Mg^3
z0Qc66G+lP}&2%4G4-v=buA4qQsxV#E6KWMmzAG*6)9b$o-q-f#UA#=poh?1}_|(?)
z`=34(SLjJDm)o&ae`Y0qi^r#3p>>4iRXS5Oc&0Uo7WpkkFYDlON}1pQ(M70-yLtV}
za0;*TLq-$UkcEy{=6+&QKA!V7BcZC2u;u<7-}$lddQR?#4>wYJ7us@@{MYPZ;dEGK
zZc(~N&1agbPLb{oQcAE}8QsBf%7;E_3Bn^{*sQd4Q^F07a80*CZ_-faHN=l;ZPS%h
z%OyNJ->bQL4&Iz6rWjb1k@NNj$CmqpgK6T|<4t6azayq3;1J&eOsMz>j+UA*iG~lv
zu)XIp<~z^y%r-C)@sURDT3H+d1L>&dZ*}=vs_P6szQOG_oO0``hPU*vj3iE36k_nN
ztIB#xdpXy&NbIAVmaX<&{b5y*?=xMhrG*JDV7oU1*J_tJPm;Emw<eTUNZh=-=D4!T
zbk{V=HC-qCF9cXt*_tu14z4hJT@+oRc==KF&bu<pjj4&14tpD?Uu=}Wtz_XB{5Zbz
z)YgW9YNLC6>-<-=)Xj@ERf!F)J*v1v^HyeJV&CGo_Vye(L>cDZDck`>zB_kW4wTkC
z-cHJX$JyLhC$FX_YG}mNr(zdRD0o1<d?E5Sm$4pdQ7ufR(`F1Edu%`DLA2?8H9Bb*
zy3pL$(LSD+67~o=uh5|y8^;#37HiwY6m5)cCA@6EQkcE`j~!}M9DzkJ(@Xg9yh_t*
z;?M<(O=$tncWVXxo#wlBC%mjW)_{UXB%^(0k*Vog?-Shx>;j4>-I^ZgZ@=9e-=f#z
zGjy!i+@Vy0oiT@)&4Os&MI<-8ep{b*y0WOyCb_H0F|akLwuQcXxi;0~z<pv&p<8Sn
zug?eh>YxgJMSNoIifldasgA|3q<s6UqKcEAUl3j7-O!j-L+z@lic{>_tKFh`&y!lC
z=J?`P^-OV1Dz2JQaF5r@ftxxzr|43v?iJu>9iea^OKy1fDSOD`qKiIp>Jm1&hV<~g
z^YQoX2M=?E?2wGoQn!i6FNj;{IZyk_niTg#3^_#8*{EFwx2OihKJizNH&v0&U)1W*
zGV^U{D;uv5Z-?XH5J!+{9N&Va56l#ZGkrR2mInC7La1FKkzJM<b%TJ7-V0bw-tIp~
z;Y~hq)<i{{!_H9Mo8jWiIFkfQ#hL1+Itlwhvq+VzS|uCGv$s>9F`B!-%q$X-)j$L0
zZZxn4D0wqj9@T1*&wQsk_&{vEtkjK=&Kakl@hcYV6sj3DrMKNzd4IV@Q^j+>Y5MDK
zb_f2GRX(+K8%co_uWBLul&0PJQ}uYUKKU{i$8!X~;54(gm|Vd?qmavMlEyvjGkF)h
zxj(d}YzVnQO-99dnYipsjw-N<B->VA-$Fg^qj~p!!9{4K6Y)_;oi(~Vs+_3px#D9z
z^-|z8!r=36i`f}Yw}~?Y^BdhA3ff!m9=zx1)QZaKR*Y+N@i9M2wl%1<?XF{uwmD6~
zZ7%Lz@ub(CWIHp9;v{9u!p%?g&uO_KHf&za$RZOP-j?SA_jFq6J6_7=lmvAzZks8T
zFYC-xS|0A-Y<=C?t-#gga6*^iIo20836$F^U2~-8B;VRDDe1Zx8v-n6D9vi2pFw9R
z;FA+Y9o9CqyVv~TR?VH`W?m$Ja>$vsm+WnM14Cx+oM#(EeI5n%%$BxNH`UUaH&?f|
zXbWvLG)4&N8FakWTIu`iihA#GL+9Dl7Ehf^2Agw5JXaq!qEZ-d4=lf8WemAfb-jyA
zaI-=vvr3xwrFd6oyLDK|qz~7KpJqA5u0cKSSj}R|@`*^8|1_3RJQo{TcomgQ<(n)>
zRrFQ0$5KOkD}tOqwvf8#3HjXe3Cymrojs^aHArN^-c!JXkmZkFN|Qv}UWIAydtIft
zn7eru`(~^owlO<V2j($l=+)Yq%|bfxKxhzEoU)*7kE7?s)^y6X$PXSCODfX6ZA7Z+
z%S3Ft>`1-C{ylf!pA;vvJ*}h{oT0R_g}%N~W^uCPpn4|f8nVB-=ex2(QOneMd_Iq&
z`punB<h*F@ODI}-7|r;o1yAd@WwY%R^0~lA@%CK(u&k)2tT*ALPG5q;TS=0C=8!?6
zdP3Lyryl#~-lp|4T+oal`#6@HR|YgPUrW=w^wtqHFC|_WV%io|Nl$XVV1D2dC3%`9
zjTEeJ?OI+oZ))?2!Itd4^S6Y8jHoT0vm@!{bgG^v5odOh{MIfN^+_Sb?k}O0PM6&v
zy(n3eY9Q2`n5ga9VJLNLaBqNsgsG!Y75=_qnB^MdbG0Sh7{3J-r_|Xd?NaU8=ig#`
zU&yC#73FF+>2~jYpTXK$nTOTdoX=6#0-HIHwpYk9$B`#m2+_7~HFHkHE4royTY7Hj
z-9vxJUlsRmAIYEb&q0I4>W$uR^N<uXD~Ym}>?fxE;^xk)U1YRe(tLfZ-G)p4B<ZP)
z0`oG``nTIjy-%17=Db5n&Irv}t@I5qy{k64H>>R@w3}|C65BZyE|7*LB<#JnxLl<y
znlVNF#XO7zVZ|2B5|W4nEEe}(qDVTQE_5;}vDWjwh<;>R4W}4ft}8{tjc;@%{slo%
zvP#a>;pP$pRz=cO(t@?VTXY9|v)c!|rHb<Qr3w}aQ}-}q6P_;hc)Hv`WN(<nn*2~o
z*KiAc3q5la<7-FyR@YZ$CVMJP`y7%ExzRB=kfxeAnuWVGIbXN)i?rL{uUBPyYx;0)
znLM>Sm|#z2VJSy)oA3N+#XO%nzuDf+7p4E?z42&&e_f2?UNVv1>sDVJVH;6IK(Lz*
zHBC-lpGV%k4_B=r4r#w<-^kdeN$t2U;aS}-S4N3E;`7{Q=PWe7&aA+{;Cx&8u`ye&
ztn<JzTvw0@)vVU5-#k4tXfxr0KIv|d8{H#w;>^6wz1JIs22*8>cJ;JvInzpin#8u|
zqk2@$;@O21!2?wPv)FA314TY|Aq0<J$s+dw{w67jtHha4+ND2)*bcd_enFgLdDs^f
zcbmvUDCaHcD3<pj_Al_Jo?gX!aefBn_EnY*%YDd+cxzHuF7EWB*TjUPZ60ruT?#GI
zU{H;bV@+Q0sXIbGkNS%lldmu?JV1KTODM+Ga}yI3U5*>}p3gRURqgGT>@k0Lu<Yv?
zyx+0I)$%PYTtS-Nj52V$1h-@5j7QIj33XSm>Gj^K+chZBliJSGQyvpcIuWh7*P}n?
zL$mg7!XE)!ymy=ZfyROyo>mFlPPN&#`Fv%WFH>6gyR^Lxy=LmYl=1)uPi#;_y~ZTs
zG@5Gm*^#R7p9BMQi<EocnLa5Pj!)ixwU9V<uKFLU8VPkA^GWJ2U?$^Kvr|>32Mk}I
z77;IKj{oqSu)TmR`KLwK5mfnyGvdz7%;-J}b{}6=^=2PF{!<^G$#Je3?%ZbL6+88+
ziT46mVu79gYER<%(7wGhEN2vNh$}j}-^scmPRsL^x)gOVz4V6r`6pT=|Nb6)-H8}N
zIUR1xT;B*`#RStQ5&6bzKHlOVXkxQM{ikt2qs3+F9p0itm3_NVOYn^^I;qfhhfH8?
zpK2T0d^2OygE;)FPqJI?2dR3mlfliMi&hkMXWrd1H1cl0V9%kt!kBuztHLo^vcmR_
z>~S|bv({|GC#f=dluCt~-C>P$Npxv9HoCUxRd!EF^p7txQMWDRyQA*$;?0v}fg)U{
z(DK(Ygo0_b<%CG>pT4Hl8ylars=m4(And(#XR9qeMv_l0)wZzI{J7o<9dA13%aXB2
zAC=oiO_iK2;?qQBvTN4JJWHIJtRa3>gL5CUJ6X=4Ju=fn=cD<R78Wz>wLu%a8Kse+
zjYOZbK6O^ND6{U1o!wfF|7696`sNN&-6QZkO(M=Y?nGj26f1ITL^3KWLw&e<_rWKv
zEX5KBERht@OF`1-lq`x!zhcUPTNHsTO4ptHSeXq_v2E!}88z<(8#gHP7A@;NHu8Ke
zRYHA^_MFEDNpxD5?8=Mwr7p&LIAT#FII<j6L$q=0L|@6`67lJjltv3Gk$y<s<D}N2
zH~;;6?Gr~#b+TqjkFcgsaixg7!wXYg=TogLW_l7OO<F>_NLE26wEa9KL^50Ho??~<
zX1Tm<XNOV*E9pPn=y7YIv>{1NOinFz2dU8?Rjfr)J^flOs+d0g$)5?t%<jmW$&LND
zJ8h%vs#a)BwK-RKUs2(d+lNg>0>n9XWbr!!MSiPLvz`{Pk(!=%I7$)s?p|eY{~pI=
z)pSNKx0PiP`J6AEWGlt$^3;#On?KuJiejqpiR*e>qi%d4DhMwpid-_Cn!GN!MNw|P
z52d!1sF$7#Nmth3sh)@Fy~OX<JQ?}}t5ssIjd$}LeL<E#>-S5y&dhU^_#}9T4=(rZ
zp4GOW4o!c)(7(TY*E8>XX_-Nu)Gik0RaeVe@%TuGDwFom)`8`euAN*yq@1!CJ>mT4
z#5o^I*JaE!KVmv}3$Awxj&2(hy;@i8{^dH<kX5qo9hKsBeV?MMgVyvozO_zpA#k?d
z)04~6p$3M3fJiH9+qS4V+FGUullj1JZJs0ji5Szx?#iejZvJ!%PDo<5L3WRUmnJ>Q
z^F!|%8PhIecRpVr_Zd&(9o}PXwUqZUZRJ)E7&BLd-DusNtL#np($V8(RZfMi#SAo*
z(Ct5p_uF^To~1*6bxW_G#2`m~+oRY+pR}liw*{8wmo_Wwn>e3uDe@93aQ7K(k@=*g
zv~DW*G@}0_!g{pUVd);sF?oi@hf{y7ab-RBN6-aIS4n{_9TID%q}<$lhEjVcaFh2m
z?_Ql8TSwW}+=Lm@q5W0#IXkbMR191|BoyLb+N<TY=9ba1u9a;GqOkX5%zSz{0bZ>f
z944Qs|45%gsm+d9N|S%k^inO>efX$PkL94I?ID$`PxrRcqwa_c*x+4mdXk(`cavR<
z%Cg_Tx`1hDVMb|AW%iaA)G{QF9iiMF9(chnLhZ0URSpfEuO(hi8LrUU`L<QYP6YMB
zS(w1~zNzDbpG;{Oxja?WM}A7tFx#L%ndc>4%CKM+eJR&W1}@Un`FMxLX`#d$K@I{n
ztG7_|FZ$8Hm@emDrKi59+_uAs4k;Lxddv(|p&kbpicy@paVSt8h$iiOXJwuM*Ns1<
zCA3Bn=X5UcK3^eGdyNh2dko9aph&ij$ng>JeC@#%mA2$qibMc$K;U)S)KD3YMe`4w
z+VbaPpH%)LKRng<EY@fI8*N<jD9_kAy`5{CYnqe!G6SzPKh`D9%s1Cmd{Hp<K;yii
z>q}1_csDy$yhzKpR2CBrs_^n}HH0tb3*YIcdmz{Cdn`dw51vlBN9ax%h;>oXxqANc
z+Iukv<GV6Kwg<C01?<{V!{o0%d*g<?jvWU?e43FM!u^RjQ$}Iw^f%EJLn_Ag&(7CB
zQ;V-5$@DppbS|ZDCh6Rh*D>1^cm}6&&(eQ3F-3NU*~>a#G~e452~Dp^)aEe@-1HP$
zf*R5(YZd!i^-3#>JX=%z(8RlzICJ=*5K~Cr&Q|)PH)az>*7-2*Gs8XFMx1$22wQXM
z)$M96a=@gFIK@0ds_!m&h|wppOB97<PLr0vO+hc?c>2Wv-o=i>L%GB&-XtkTq?lNT
z1gx72LshouldN(mGY-%t4y-T>s=_~Fnz>a}Z2BEE&WaWJk+JnZ(wp3C^4npOvrjjR
z(n)QR(e#$IXEF0H$6s~2$8>2gRSfBzGAT1Gk(|JgLx+~7F87v(&yH)zqM%ZIlQ6vw
zJ)4%)diitc`Dj8h4{mB1Zsl>xZFON*#t&EHi|X6iTFa1f16LnSWLd|ZrnqrQXS`-E
zF<afccO~8Z#_9FNhzmkHLle(uQR4cx?P<~}w@rf?Gm2*<C>~#gmaOib4-b-Vm*dRt
zR^eZ0mU44d6g|LHY}oSPFq%7Jm&`#+vf8URvkO-xu9`J#10r6)!gq<oE%EF6qze?Y
zH_SLz0Ux`R;Mp~IijT+p%<FuJ>BOeC(sS{jWN?bd6nRLX#__e%A6O`bRw+A35efJ$
zb8-Hy^xb8rl<!~IcZH~TL1-On3{&RDE4~%t(or$aqFgg!_eayk+yq5#uB8D=CnQ9Q
z+z?H=)X;Yy&+vBaASGO5M{OO=Ya%wG>lYolBX_&fmU#x66^nG$F9lc9&rSZUBHBUf
ze74AmX@QV!T0CJcq76-ETeU?`25%oWDXuKCm%?<6=by#l85w$8WF%*y7J(MUp)1xK
z2X<QDZIO|nyN@)5kZc{g`j5K!(4t(Tttcu5t($A(@T|*Kyr*Kb?krU5jnl!}f6(O+
zZTauZ^90AkWt&i0H?M1^$=6?_f~VbYoPt*R_Ua2V>^OI~5|j`evsP18^@~%=&K@hU
zM>S0kpMykeR8sco;HjaPugtS$AW56tTdEaaoQGpg`9!o`CjvLELuD7a%v^bhGAmsC
z)lSyZ>BWwFD80JW(x)v`0x#W;Ou)aoF}t1Pu(=UV-j1Jqu_8(Nks+zhIQD$;a~v^B
zLim>RV=tk@uP+vbJ$#eN@_3KSy_5L|8t@*QmLG~QqFb?Q_eqzNly@AIzHRMA-tWtv
zq?byD&%ycH$|q3CT$~~E`)_2wc&x|z<T^3?ykLgXpS>+U-pV8xP9)>k3>GH&`1>Ww
zyw?vQ2W8_aCAU*+>IC0dUkQ$zA1>@8UAyo^X-nu~gX#-T&ytwPPZOjxg$bYN+^-d7
z^VJ$8T=1-o3psr*ZL6)6aC-jZo971x`kq-0*KIjbaF0W~OppTP9()qinZ10K{!>RK
z%$MoiUaBHzgT@nbq^JmTx58~&uc2~L+3e5~bd3DBklWXYvljZn;gG{u&eV}a%a8fT
zyz3GR`>xz1ww<{ti%oM=SWHkd$W39=&rMmRi;`Au(j5IuEMp!U&2m}iMe}6>a32TY
zOa@?&17Ha!15@A-F#1t}!4rT{J1=_lfiVa8eYr6L7XU`fh#LU5@LpgI9vCfyNjEoU
z%wwZj9=qI_C078jGPpg8fWs^i*wK1}&Hwdi87z7~c-|p5M&t$nRtA?*1mNv10NXM(
zV3*l8N(YO<)!5Mr#~koE<;I8=0emR~qk}`k71)I3fg`GCqzr@W<37K{EjLE;9spK`
z)Y%qTX5<NMVw-_eKLog9yMQD51F#uii5pYxXjZ~AH%8$h09M9s7Z1=h*a@O`slc1q
z2HXknfGZw7Z!tdp<-WNwYIOiu8D8OmVBixDYY)bNgxMkBO?d}=8N<M_d;I5D`{%~!
z69BL>H1D>9d3p|Lh5reP-p64{4u$q!xb}?y{Emd;<oNewaB2Z?ZyW&gM}4sMZVznB
zZH84B+d<{TQ;>4FoH7b{%t6ql>T|ulz0lp=4P9Mb@Z`x8xN+kKoH%g;!otG9&E5`d
zJdz8?JT{u;RtT`;k#_`<wN}6@e-L<A?*v{2M_`dO0&Y2bU=+~@F1bT?qYsQZV3R#`
zfOVxe%;nkw-~Rg0&SUqCd2BQ*p?}6(U}GGx%X$It`dC=J!V`FukD#)=fM;Da%DV&e
z3a^8s4~#ib@+B~+`o7wyc(C4FW`E6gQPc7bOAX3Yz9ha)*;^NG@}2+nW3Oi7aQ`M@
z;|%g2#Yv)sIhoS_kRxfx^pP}jVsid-S>?uXCldjm@Ci8MKB4~e3H8BGXe{^y%z-HR
ze1t_FA7P<eFEBWN0(u7`Flvq8KF6ZK+Z7h`p9SFkb7aipI)=u*#F252HDU;ug9mBj
z)}licSm-k{{w>liEFN3VczJGz!eVR;8CwTO>>zC{Ssd2?O&yDN{Dblj78VO#8W}IY
z)PYax2aY2>z!CZJyLB)b{CfF3&V|KGuK|3i1Ap)`uy1hz_RR-@W0O6wn<N5TXg7R~
zgUKlWm-)lvT3C#YwX`~NsKCBV3pi1^9NLF~ZK*u4^GO27W~aa5U^cpWdpv%RJ<sP}
zSS(sNGM-~~EIIdyHilum;@Wi#*aT&OU1%k6M2w8>7!FpGUoW5Ev#?nFHo(_)(0G+a
zMe|QMuq{zQ<Nvz9y$@E48^28d65qmNY%ch^4)Me%AiN#%1kEdK!l-P$;E}oI^E+Q`
z@$2-99V#qdRW&l-V0EY@<il2db6B%kA4KG~p}Ef;xZ_#?AJ;ir$KqXicgFI0yu4Ik
zVX<-z09J?8Ju29FxPryry`W*Z8zel=0$*}7@Fukbcj7x*9r&a^VBh=e?Q=y?VKFvW
zVRfvoqJnRTFC28S1C_(4K{~t;<hEOb;K8%BI(XAQ()u}v^{<z|I<&BO`-_qJ5UXR?
z<x*r5bp=}wH!!qy8R3<h0q~#b9Bo&e`+mLrH4%lyCT{?~u0y@J1+=m%VDq1)ur~P)
ztUOvi(my`;bIt?5UcSna!s0z|0mjzx^*bNicCj&Wy!Scwd_+NQZR>}R@PgP6^?hV`
z+WsCY9@j!{eKVZ7Qw3=`xp3svIj{;p1~!Kx;81V`So)^F99zzK`Gox1C&=*zK7RZN
zFJHa{Og4D^`ZYXy^oS-GAjcy}O-+R(M~;BEw>S77v<D}jxYy&AH}*WYyl*O>f*q0<
z_JYKE8xT@H2t2EH!cwI@uw<Phut}Q$yR<Rz$n6JKNkd=~(F5*PUa4ct886SW!XpK*
zoJf-!Fqwi&IpL?r*fZmmH}?EQmoKCim$S^|D)6Wz0_$=YkTSePJI3S~DZ`wRV<g*1
z8fMdu*<^izNz(D`SUShctGGUKQrv%oBD?!CS=uOzB&u^}P*CGkKlg^zPk5DY(_&e_
z{>5^K_l#HGM4kr#+#n7=AqguRlf$@CQbK7|4nqq-b0ptk>Hmhm#k($PaU3jdW_K)Y
zWp^lTWwk}=Kxr$>K9sCWTbZp&TbV3T+FjbZ$fC5B(fnR3qgiR|LX*<g1x6?tlr}SL
zyQcZOSUH{UzQER=Jf}wFIehBKI+i10M5bdq0>B!H*0dobYuZKrWZJrRp%2j3w)AcQ
z3wGRn@w@foT}uf3=SJ4Q<I%7<a)`E;Wey^Z$d+ShSZGi}_}%)s-Af2Gd2<{Z*keZI
zPPVYVacN*Q{{8xSJW2>cIiKaxu{0zM(AK}~kwlt2Hy#a4CjX*-?-ByG_8&_F_pv^j
z{K9#p`=>N8ncewq{`2~j5SCsa(La2l0q>X%>?^keo46`X7GxJ)3mozWz;1c&yL@0a
z`+fX;ekBB&JpF}+Y$~uxZ3Q-w^}wOD3(=u9BJ=Vu19o09q+2=h4Gk<7#jk$1{qY?t
zA&3@ymbbsq5O524BOU{-U!0}_r(xtM4IGl|VQhQ&H}wkymJl%A%QrN9)h2mD9|N0^
z+z1T<%aLBE>+dw|{(by{hf4?&cSiI--=zVq3-IRgXl<i3LIcuGjct>xmPNnK|E0kt
z1Z=(VJsLz}9)ggj{m8ljwFis_4#TK#`UUIW->+XRyo9i_Vq`t>g$D85epv5(1e7%l
zVZ}Nf5R%oT(ZH^}2e@OKf$Q_y;tL-ZTm63hQjsMDO!p=86%E_NPk`|*OPZ|yg$4lw
zf8dEDpmoRF5xv?M8e)22@xI@G|0|+P2r7?9^lumqQYBPy@^S+k+kG?|G>ol4BH$YE
zA8SEtpO(*SpTB6p9~%O8+u!g1t71wB*m~#-4YCzf@C)$)H+Kgb4XdJVfJn-7P|`*6
zu0;^=h29^bA?Y3PoEV_Zo1FH)U%x_p2|=rIWWDr-2K&<&;c%b}jRtN1qp;5Z)L-vH
z)e!g+-T?pUfsye6&E1?1zhD2_#1aCgzx<kpbyWl4dh*Xv8os;>Y@NGS%N&Hx_5N+X
z;Bxx?`qw9y5X_M7b1V&5n^Y<x!iH-vKsoz4tT|T?t1_N}#Dz}yX1;Lw{rWehmJqP@
z-gq>8-7m%)Covi3cgKJ48&BKwK9b;4*8s$K0YrBIq`c{av=`kFRr?<7YlyI?tP>pa
z>%rm5LomyF2&$P+K_%@zY&&`bOcU~8i_gV(zgz#sr_DXs8nL~-9f{OH(;;Je<of!0
zc=+%kJb(TiZr!>CSFc`$bLY;%v17-;$HxakLqoyR(h@?0gTOm5cHnpGKU4mq6RY>b
zhYz%b)!Wn40~87c>gwvCqM`!w^73f)pFDXIl9Q7mK0Y225)#1J*cif`9l-lgOz-d3
zFR;e@j?kLDAdK|iE7a^jdb2HvuG<enihEJo17a%HAfjvyysIpLbA>73SDFDI(vjm=
zngFx7J}eg7fv&m!vVLbQoh(vLMcf<Gfu3J~be)S=P6h@c)6qPqQY<W7x@$Dgp%4j-
zVm70Btc<bc{%Rh3mS@9BVBj|#Ef2493>GXgAI)>EjfaIIdq(pdiqWu0Z2xHf|K|F6
zlme<1?H?lj;5881b_uQ7T|wbMIf&@xjpSuKLC*RPh#BP5@@%UPfsADVNE+Ru<=N#9
zW4x&RReq1XPho#yC9je@;N_ixYqb+_$RHic3I|}7wgYBKTUaE%f84|<YK7jD889z%
z${$<qujbbudM&3J)OJTLp!wEDAHubD?oC+=4t0OZ+B`{-vUqf4>5i)4r8_FVn*=m(
z9KkCmoy04|E&J8_CgVPAe4*lSK9iBKx-mTkW-Bs7X;e?akHay}8A<5$e}Dg%ae&h%
zF9#ppO2x-?P`QqDP&uPIs2mX;RQ52GLOZBz!5!4ahfxabptAaRP+9yssLb9SR3<N!
zJUXb0T;Ea|o!?RyI=!PVJot{fz@dZ6VAnyVw?%0`N>;5@#_cyRP83_XL+Xbxy$>(4
z<MEvQtounrHXh8Lhx`~Yn;yr}&pMzOfW^_D^+4eO%pnw-9)>A^449n{^K-y#eG9xl
z>xA3^=v`6TSwA#U^y9<o$(T**pJKp#GiWx-!y~$+A7a>DPo6OP!x8=GN9>%xieYgi
ziDoy%d_#T-gXP50&l6csrs>Uo5d(V+>9bAp)30OLJ8|^$M%9xAvp?(Ieue@0<Y2a8
z_J|QZ+~Tlb#9%dX^z$95Cu4TgpJGTvv}1No<VW*QF)XmDo3QrJ7gJBB=^cN7fji~1
z4l)MmAb$hH!U?3GKdzokvyWrC)9+y5iFgiNc9&7g0Z!W-;Mk9)Y?Lkohu7m@YD<j!
zpG_G51>)<;!nq@U1Y_R=kMm_<6CKfa(d_X;t7*DFHhyWEe*sMoDsKerKJ`EB(~BmM
ze!+x#GN!lv2E#?<6R{lWjzy8~7}@%1dPB^o;CmQE6@lHKFfN8gcC{16f5F6hvS|K@
z-uG`9vMIp3#+at><5WZbSRvKG8~YmYuKCC(PxssRu*GfMwltyiCnNfipU8JHWORW*
zB7tV#7x-#y<%w)U{vGmv$FOwOxZ~0y`zI5|f1#9mGEJW|9)_>_^w$_TR_T4ymN>%N
zzKem$VdCgtl3Gv3{7?Q7hBH*)Sgk+eWAmjy2(CbL!~5^f56q4eNB`2ada}gb5kH+@
z!hqQU_8|YGF@2g{&Hy;anIBjVKAy1lBYL8qOtTyO48vtAEQzcHJ~i7BJHnW8iPI`$
z#GddS46IHQN590Wdh+t}&vu7#Ff2=}gViSPG#dow+r+zE<8K%^<c$Fz-G=;--hUUv
zV&|F(<NvbL^<>N^XFLpRqp!nO0}D{qGN$=vVRn?SF|f<%0Y0pjX3M~QwZ4a8vFoD=
zqkrX@dNQWt{vHOE6BRU{FMYFJG`;^f7*Jc{jjTgH&Le(cn4k0aFf4YPIR39bS5L<L
zyS|6P%0HN9JHh<c{)S<TA<Z|NFZng_Cby3Gn2m#hE4~-ld?!wRR>-O+t3Dm^gZmo8
zvb$vP@;*rOiNow3UofayIDpuZ3J^$Z8L>sBAY0Tp7`PLOz@3id5Wk6|U+H2!8M9lB
z#UN8gruo}_jltCB0Eng3g3yT;SmBWY3Yz91ZW#gmQIEdCz;mnzcu!GjIsp#<iKBmA
zPCa?+^AWq(SPVXiu{7J$7Yr6Io*<Ob0z#)+Ky|P8UwwML9tc?{j$+_T>jr)_$9-8(
za|BEr{i>Ji$(Rq~_b?ddK8C0WkH29s@D2wx-z3;>Y5Vs+t)dHjM_&NnaU?ULIqqv&
zgY)pj(XV!`o{ZVt#>24h!p(0meBB=~Ti};*Nf7l3A>@nvWi9#z16T0G(XWwPPsV&S
ze}qA+unFu=WP(d{Bsc^GfsLO(>~!-5Lq|{0ws8fu-A=IDH3gPlMRW9+bsUBPA2M<D
zZ@W=XwrCykGyM^U@68XtBrhQ!dQ3+)QTi*L{CYBGH=Rffc%&nnDEfC4)|2;j0!$<Z
zOh-0R^k07Yj{5XtAJlaBLgjlRTp|Kwe+0<t0l3=!2@0B8A@BJcxcsCEj@ETT$m0(1
zt84+k+w~B2{T@W*+=7tvH{d`<A?T$S!?whmpn2pHScIPh+lVx9ib{ulVW*JEWMcm6
zKlD?HL?XO>`*zg!jM+*s+cS3V-Me>CSy>6CrKRxV#S3`$>>2GiH#Zk9U%m{OAM=?r
zXJ~d{KR-WkadCl&hzQuddp86h4up`95C{zlg^8gahpR*MWAtLS>Myo)>=?6IWAtNx
zt*x!2^ke?lH*emA>({T-=s$h>G-PIG(&+d1_Xo7oB^*6^6ws!JV7Gf0gd+?SN&l0!
z?qQ5ZDwRsZfcc9zHa7l^e$0;?<9%&yEff_M(fr51(4Uc!LGuMjOiYBNq$Eg5Ng1X8
zz)o|Bb9ID>!=V$_e#DfWKdj#F0&;rpu*Sd>wpj&(=H4J$T5swLt90E#cDoy_)OH1B
zBX3w|><w!Tku6u(4TLw^g3$W?Ah6B`#5Nv)Wm{}Pa`S!=Q?&uk)fUJOyA$|P5?X2X
zVWQg4LgC%rjH1@SEOl_yj*j`eV+phMvn+T2<~-&Tz$!BmQ}^Xw?3Y2n0N7*$zPTT(
zV<PFt{1CV|9RH?Xw$+D$SMBUK=UG>H0l&uOZ_Z;p5Yo>7=KO#3kN@^C-u%b^k^V9n
z?T1Cux_5;|J}A4?(fmL#-w~m$*{}fhQAvYrSnuBW)%hG0N4p!AYMp?MJ}*bl3vRsx
zOvt~3U-by69eO=_9xID^nIq=g@p1eX@b9khD7cci<UK)n+i_Sd>obyMykQ;>@^@b8
z2%<U}e>+dlrwgo7XuQ-r``3B&9D{&9!e$PV`dNQJFKC2(nvDAX9hKuht?E|wL0Byq
z1lAt{{&l{<yVeJI6ukkj;02s=p1`rn1K4ETQ2ekfut>WgemehBLa{ioNYsWl1~W@L
zH;+%jzq_L5-x98Sq_a;u@?D>1P;0MRz?%;ny$Rha9xpoAI5xbKvwhYkV^!0#Z0CbF
zV#bvOVg2%^Ur9@JiU@q0GFv&7V%oUYM7aDrD*t=>|0D-6c?^X$;YNR7;czpt{C~d_
z!-p~a#{9IDQ1V4-)K3eYxQliVz|wzz|8d}d!2xdb%Zi-l*Yr6}zmts6xvvr%I%d=V
zPSQo^#wP7+`YdD9R&?&G#JcUW;{O7}@0P*oUeU>$F%oY$>UWlobXBQe`JN>q-!m-!
z@QeRhEC3dV_{9f}H3G#Wh9N(+P?UlJ`JxR27MD2ci{^{@qoKIO&;Do(9>^EX4Pd@2
zO3vumprYe<>HoLS@tz`$=%@czJow^^7l`oxDi0h<6Q&pW8GrcC3<KYp&whLVmIq-J
zpv8m+4UPCC{wfb#h9?cbz}exExSfB=18lDq%ny(SrGLx=*Ga^Get5*jfyKK1CJz=z
zAzwlikGnV&?LG24JaC^p{DN5sKhn+9Y$U(I1GX=Il;M59&jXLi!!LAk7z8hl_+9=}
z9&p4Bj>MgQ@x%OG9(YY6{_J5|?A$-*!O@XeaE>VChl<66{~I27Paggymk@sBTZP4X
z|0)l-68lGDeq)diE9S@gZ+YNDnY8hL>E+>3TjQ_r;4dH8uKyhmCKLbFVPtRp9Pj^=
zcEFSRi5Bbpmv7GhhzGtyllK0FuOa-`k>Bl4c);yd3>@mtz`n*D*cH&8I>^_GUCt0C
zedNQp1L?PPfnC`W*mpz$yYKUVHXis*p8O}AJ3QjE`vV^Ec;2M#zwno@-<r?+53CyT
z9YuQ(uw(l%@JWp9$-plK>;|#OkN5NbZ9khA{3j8A-Y{*iOq$Q{I6PoqZ8YM)jO{rv
z>hJgy9`J|&`}Uw;YX|;=lh*!4ZX*0Qzw&z?%Y$<Rz`acUFF!-X1J2F%fZv}9oF*~A
zf%*WO;5hAoR}|QtN`B6Rz{$fenm;_U*T#={us0sKmv5!*qskXn^UZpJ%O-PN9&n&|
z<)6w2fdiBF{zVIiK@9V`E<kPIM?66Lu>43qU{~G$eI5uQf9A*!KjuMD|D@p;yM^!<
zA;0Zk;lU4NB(B}5<Bo|O!OcIGktPwpc=0fZ7mxU@{~I3Q9dnQ$`}fC0jtJzB|06jO
z?S=X?J;g*_7r#AB+iT|E@_<v@?{jR+7#^UQ7S3q2Z}N|1<&fS<!!L0c;Ya@F*j_ik
z!vp^F6u|FF99KSIUvG`#0e&JUh7u<Y|FV0-w7shTF%OV`rBGNo@T|A`+uS%-KH%J+
z_1PEy2RsOyJp3!mhC#aQuegI>X$KO>?^;^V5yTa=XnP@zl@CUFAZLWIzx~RWe;ghl
zIdP);_s_~*RWVH4Yw1^bAer?J*4iAV?E@vZaR)69V_Y6cX#oCkHQ?jXzO#ReXZQ{e
zCK12<{b984?8tsoKjMMxnHQk_*;jg#w#koqfMNG6La`hp`$GMc2Wao&pS`Dvx~}wa
zm=-hfBOa`{-VNrq4z&HR^h|cr{Kd!Rfub4k1Xg~I1;OzD0uQ1-Od9@mkA`9Gqmj6g
z@pzycdzKbIvdh})hddBA4gkK`=fIcL_Ejv&Pk4alMXsdDTmP#*9;WRz_9GrR`g((d
zlkK=XP}*(@V!ogEL_={X*uH4L#DlnQWM@P3XUgR1|297zhK(rh2HWfGdpuZiXApdR
zooIWXeUAsKR^G5QsU8H<TR<T7uUMRsz2Ux&Df)Xmz@yEzxQ|n4-|4`oP9A=ZXT!8_
zMU2M-nGzB$ZsdDB(6UF^(~$odisM;wtO?{SJYlt_1&G_kfk4c&&->$jhX;wBD4vH*
z+pCUdb4{B({M+h>LGyFm&v-ltI1>C_9w>)rgV3KS*5qUhtPH*mUyq5)RSjUNWejaR
z;7$6A2Rvw>KHd!S-)*kPCl9|)!!T{Hy&v&l|JiF05$66454InQgQXeGG#;!9zVh99
zK~!VkXglCZc?<lRL*M8Rcuq_n{v9udLAPmSzrpc%pmL80k@11w<-sl|ci8S83fpZx
zV7$4JKei6V=(T~sxuNgd+D=U#ej~y#EoSLwJkTk40nxFCzRLqF4(msAqtMakAb4SD
zd>ae;rp-jjH$N-a^z|?pe~#Pw84uKNw}Vew@;~B%qMkJ@$sYW%jpg*@;kRfWrtLNP
zt31GDq>V-IKqu!u=w}wg_CJeY+wnrsNG*WP$u~h2?E$GAn+Hl!*Fioq55&)n?2q|F
z`vUU8_}P1!sOy%k!?3e$WWUXS!UJp{&L6E8eyUIWT9<}=FeVD$&&suWJ4}l?n^Ybk
zAB>;TIZ@a5cMOB|=eWB`;{o!)m?(TdE7$J*FdRVpyiO_)kPpVs=$xqQFZ%|d`6K!!
zNzX?hboIdV_dRfb0HCTLpt293{1f`^?1lR;o1v=VC6qmDggZ6QAg}f%oNIUor=B#!
zvHMLBUs4MxH%sB<l^c+H@hT*p%YpceEO1H72Fv*KU>cPH`oZa79GC<)fwABg6a`)(
z(QqjA2pkTJnKb-Zyd4&6*U`~IiyQnBJ4kayM*pz*$5*djL4SWg)YR0B#z11<b;G{r
zg2m!hRaK3~;^pMzKvq^3oIQIMu$aP_m>4*8=n%NMxq*|D6GTTx)As50_VR@A@NimO
z<l)1ICk;P_^GnPjhW%^&U*ab*{MaAH18fgsEC%!o{-;l$()J_9;t;Wf;m5F##qZ_i
z1#xk4w3tLJCe+Nx5DxqL{J#P}h7IGv`}glh@nicRH#9WR;xE78$L_<<V|yTf!Cz8R
zGWzbn;K$-fvAvPMy#K(!Kw4ZW7MF>|lw$Zz4Gq9+-(H9c@Po;I{}?Xp590yW-m(7B
z)YSA{{3H^I7Eg=4cZ?5(g@xb6pO%(Ji$}%YIkrbNmd4`uwAlm69!`)D6fkM+Uk>dt
zy>Vv%Y_SQWrERv6VC{bltPZ8XUcVIdt*2x#af^pd)?u&_CDpy5u--Bl)Y1L=2cuz!
zLlj#3gu}Ldp|BQxqjH6wCoI!(2T2s?D!$DH<PAMwt+6L47`TCgz8kF8bq4+o`_Z=)
z(YKmZ4}i!zw4eTp9g~KCE?%7$=ZVFWeI3I(_W0jkpHC})q^_}LV>C?E{PweQvAUTg
z?Lk<-j20{S4Q(i%mr-~(x?WC;L;K!!Y_D$N9c93b;@ZA<eICy?SgKco;_>{ydwsI;
zvn)q(hX@}Q|NK4rnZ#{r*Rhzr?_FQGbSLflVi~{hUZ>~VLA%Z&AO79z|KXq9_W$4e
z|F8Z3|F!?mL*qZ+`Z&-CYyn}NYapP0b~JITVBb1aN4}ljwCiH}H%G5w_wlHv!aVM+
zC}!Lm)Y0=&rp14|&bR3}%;(cVan}Z*=Kltk?=1b>b^gt#P`oz!&ch_mfAhFCKyYI;
z=*7GTDYG&VHMldHgtq3uJiG>Qu5yPRvF~B|?#j_?*nLa3=fZs6?Fj#F+ViqD)qlG#
ztaAev2p9nax<@DK9mv}~`TKRf0yMXx?`TXSevTD?eYfL#bKC!kbMtw&Pn!Ir6G4EL
z#wS5iHxb0O6F^MsD2QkxyM{(AEK!RA!A;R<KZGdsE$|2=vxWnHZ5VJVh60B|2=aYK
z{;g<lk$;*NqrFjBmU|$%%YpXY5+=!ml%L6I6LnoH>}`#4(nrvb?*`rIPSB2c2b#fc
zuqB`w?G5o7)_XL;TIWVU-{64N`)gsP)f153{Rkw@AAqP~B~7lu#?F6|mg?L=`>x~w
z_xe=iM~=R+EEk+VQTTqP+>P!p#n*eimRslbYL$|6qwG4@H!C){zLr+DYh0#eS1YMt
zTQ9D(_nD}i%_9+6>jz7hTU7~3npF#k8C3E9P7={6<rmV)6<WICq9~uzG4$n)|Nj2t
j!0&TlM0@e|f2=G_p@IGS{P+9+6+X~r$*<q@$npOJgiQD?

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/strife.png b/games/NXDoom/data/strife.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fe40676a3e7763702d65eb60814d4f8a9f5c51d
GIT binary patch
literal 4966
zcmV-s6PfIZP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H165~lkK~#90?VWjS9M^rvKW}FCBDqUaqz=o6Y|Bo3M3Lhhc5~TI
zd?0WR6a~_tjZ>tT(FR2kv_M<50U8uZ|7we(%^xYyB1O`oL7KP);wCbhv`t&bjuWf4
z<w&wbNt9$A<cdq~a<4hwuYb%AcPTC@?m@mWcE7-K-^{%CW;mbUyyN%Yn}wl<8fvJa
zh8k+9p$1OM<jF-)7e4>!&-hxsQ=<vQ77NjWXnZY#Xl*G`f!2Z6Vj(*4wOF>&B9=z9
zNaL8Yl@2^D7FzpSi}+eww$f-V+E>~S0ui(hT+iRm|4|8Q+1Ga9E2rXnjvI*WiFRBc
z%d1;Qp8Ub7SGMzd)?A;d6CeBIkM5nCNWPF7&FmE|1c63$_|aM*&}gj@EoiOLLCdjd
zJ2a8TacN1fk)U}@v^3KP;Rj?}{!fii@iaAGQ}uKs98mRzsviKnv?Dq8@RR@fT7FwD
z=qgzzP6{xQO?)?<9o@U_Csqn&87=r$sp9K{SL)0EWa|9J3?P%u+-2(A@xdRe<OcVd
zI=5r$#Fmq=|Lxi1eCPR-<d-U@F2kr&w#D>_LpEWLn7RgI25{&{C;93#FPl1jEL0CP
zua{hQjV6p0O2(>yXMS|j)Tv{q#hP!-0F0FYbA|Fs_`SF9;+H=3Hr%?)k;60iL9lK*
zE%566GS8h`TG_X6YK-6e_<h*6#nG2eQLfZBJomY!8i!^U5D9w%DaYZ9Pu$PM_!uXT
z&XUg;H%wosdOUq1Pu0^a`~K+X-p(!icJunF3!FPQzhU}{7jWq00{MyyfVcj?yX7)w
z0MgP6`{bi<B{w||z?(}I3KurMf!F6!{B*udu@-jefA!(JnYwNYfIIHGiHpZ)H%z}b
zo8t6hmE-xa?ePomxs@Ak2|FZjddn>&e{$@a>F3KH|210x;J^)&95}cifZGq=hF&VJ
z`v2O=zg779k;{PDMyatXp!E*bTAtW?b>pWOpyp|6EssrUxw;Z|H<4aMSgbYuK}$=O
zmCNy}^=qaFSg3j{;Y!UVX!w`BYW<q<!}QJbD}xqbtORJ);TKQhmn!(K%i)<hP8O=`
z#ub56g(_~)yvr{gJ;zi6EX(5fnado$w7lW@E)-oZFS{$-r!EvY_52Z%V;L@;&+{K=
z7B)=3SPPh0X!cx|s~#txdxfzb6BP3ceCK4IK(B8FHBWOiACI0-EDS)juy`?aguPy@
z@skUsj`JwZF9NVo_PR=6Sy~Q1HNUI$Zl%sbB`nepUo7DT+v92MRpzRIp<<z-0Svf?
z1~A|n8o+>SXaEDQp#coIh6XU;8XCZWYiIxiu2>jAtM7aR59+4UcjH#qEs47F-(8(Z
z;x^}KeZ|56&X>Xg7!f#M+}vPHyYv8OyGVbb<PtQj=v=Au^o6=dxiL6(sqErueT@|H
zkug*K*uJbpH(e>XZ6Zz4)m$#S*GSo3H)K;JEXC=iYmWxD)AUG!9T|t2h1!ZSbfU4O
z&5hX<r<ZEf{LT!(R*HX}Eg4}E3j-K*nKXb{Q~^Vold<98hd=%VTEXtUIdT)JwsDf_
zF-CV>zcO`88ZAT-jfif9g?cHES6ysrj7eibNf0g?(HcRK7~2U}GTfHNf)X7x;tDzl
z2>d#g{OLxVMjp{36=~*ar*b%B(~SixjRhwnE8#$gZGy^`vv`#fS_`(5z_OFrDv4z$
zC|4ck7ZvIB2+V$COYir3GFAnMY+U}kuFLZBGRb6;d_Lc}`FiEMHN0of9;T+IR;3Su
z0MGMQK4;IKC7aDMH#bMUUSE~IHBSg9mUy0r@B6F1qp(s6%d+r&pOKM~w$~JWzxLW|
z<nwuaKOmLPkxY-1OpTLDkCRO2NT$X}Tj%-1Kltro6%fgFUGn)nT5HC}#@4{?L?XiL
zufI;YT*h%6cJ11Q<8)u}B@zj;*(?C1Qi)Qj^T{KTEG4AWS<oBLVA@K>&Hy~mV_~5=
zV;3Ns%`!bb-Em$b!nt$jSYB@4;K&GU+wM5OL?XfH=;*3_#bS}ArKNRJtS`%g(bN?z
z)}Q{i9g39!w1Xcho6WLw=gv*%B_hnu&bEC*ZQEvgdb%Scux*=kI^Fiz;^HEUi;J7i
z%d!+Za&;WbyLRL)R%{Hw_k9)@7u&**l*{GVwQJWk^AZtGojOIaxc>Zp+qRjUoZOTV
zSe8X9)xMz`X<=c3LZNWYylmUzx}6CUPCT4Nu`mGN_gPw6+7N!ETrS7%-MiO4E+Wj#
z%xtPywk(TWE{A2Ue;briBoc{h<^^!&$`!6$xw7tY+qSv!`bm<>__&IV8-VZo6pO`8
z!H+aPKF*#!d)Dk15l){z-BF!v+cslkW9u40r)`D#`FZmBwM+dS$L6;EH<3wi&X~4K
zMhzec0+yGTJAxl+Vq${puDfn!yBqkCEX!hKWCYc+LPJDWZFi!%xjE+M=2o_C+vcvj
z?qX!5eH+50j5&gWAfQ|>cLhJv#KZ(5LJ$PZ&dzRF=U+>fWs%8bs8*{h{rFyV>Cz>F
zAi%OL?!5C(GMP-zd2WS_8Gx?*I~mJCRKugE1CY?mhX^7Pc99BKXdGya`$pj~-lPaM
ze~g66Ffkr^2Q@kfny-jyY-cOq#lmel*7#OFVhcLy<2epRcLzbD;m~P)&5Sf(S(8i^
z$xJP@yt=00{0W+IL|$ddo1(5SB04}>4q&0Mu#^MJLMa<DxH{0>3nJV@*fuRN8y|hu
z_NwEJuwK2LZhTh7ZI_RG)plz>Xs|RW&EB+xZsq8Sjl$6b9ECR(Cm$Z%ApS<n$hKMr
z7l&RAw>$W4<8GKw8~AJD(kJ+hgPVzONaofCMn(D%elu)91`R+rZpIM)U>m>?J{YtB
zvu%JO{APSZGFJj<0o4ZhAi^I=188jn3_AS5>;>qS8#IJ(N`?(UZ8`kQ<q3{n*~^*5
z9V}Io6sw8w#neF%dIEz0(SEoc1W03_);<zwbkKUthd`4})p^&xA|E-pgl+Z7SPaSF
zJA$MIT>s&pT-?Jmv-fbZINk!$Zvghgw~Gf2mu+B$F5EyNfeJ4pP>ndC0}vgBHN|C%
zZ_a1Ayb$o~50yekZm%VUA;qT(=o9>!>+safyE%GgZxi|&_^nTQGfumGdQ}PGx0D<{
z|9w2oM-MEqXNL-3_10@OVL<Vy0{R4hp)$rl9)FOz^4ONckMcR6hm;dAnYB^8vEV}-
zT)};UUv-mw?brv%S4Or8eq*0NwJJ#9vm<9WN`fvLh=yd?5!4^}qJ^)&_WtdMuY<;N
zW}#LW7M8+ACSCOo49TD)NQdUvhX&u_x&544obCwzm|bT7<UC2+CHkqEBNrzqxb~*u
zOW<Q!O@MV*Q&^I)I#8YV4$LSXZGax&dx7HnXAg7)|1CSt^PyXgVnsa>0D-gl6bm}N
zY50x`m>SgpEA@Zfg+j?^a?IX*?_e;ifZm^cM00H629~O+O~X&%^6<^a*T4@qgH6NN
zLBL}NYNVVde1$?G)a$TV3TFm2^N$~VFkS-C6MRHCn%~<|oj;jbCZ&Qk@DWx!el~zV
zHRAF3J$3HAS+9XF5-zx`*ELHh#z(C6dj|vU2)f!2&;@)%b7Em<M-9Hks@)boz>Z9f
zQ-QrM{OJ*wNA9li_FH^xwf4!6;3I-kg6j%J5po%8ZSP>{2)e2b&;@+gw<y<~j#~R=
z&*IqpBzH^~u4;e@_uo|D$EVY4;7^QrJbXu$ckQnetrAcOs_`zMcJL$Kbyrvt&3HyN
zj<bHdz<|vA0lI{bXiD{TS6#iQkKM@bdn-()qxS)Y5ccNkeER;2eCOpXmkO{m=kng$
ztK7S<j;)%YHVZ$R>+89iVxY)H)j{Kwrs0F}5`dmY^}@~0`}sxJ;wvxQ%rD+^hF#fO
zOGzNyK3(JXhiX^V&)vgUA}9gR6H4WP?1<Iu9kjL!49RRSpvNKIQK#0mlV_o9@#SZ4
z;PAQZYRGFEXT8IZ@^O7(xgt$xQFI>+mICGspbz8uY1_rY?b^dvtqWiO$rN9Gev0Lq
zbxruK;ZEU)=@hP~DObbvac~3~UKh|kd?dW-w~o*E?B0F(T#`RKw1Xq(8w)qrfxljB
zf3xtTYxaDhT-AtP9mj-XU;y305A%RGPhIYdZ@*X;{`Lo>eC^pZRhKP;AI6u^2x{RH
zxB)H!dV`M$@4W6jX}j8&fgK5aessd(3r{8a>3Owf@T2aaA80By2}=S)ikB<6i#dGh
zM8F4co$U+!XkTGD;7i|yZ~jn+lb5#uew2qF2vygd1;n5V=pKH!EqrkQId0pr&=>g8
zJVEXI9C|U}&;P|`xw<v*qXwYg{0+%%R}2iGH~2{SPyF(`POy7)xi9cn_UV9Q=QUsW
zW}PcVy(REz$;*Vyw*mSzbvu{#_??GNaN~HnZ}3Gx0~ZRypFZVLC~pz`!F2@n2YwVM
zoAUVmM^Ew4?F&sK=n;N&ipxdei{J8yep<L+@I&X)R^I51WzZ4SU-;4fgsu7HeV6&%
z<LBAGv)UK<(f9d+@Ym1yp!)|O!Dt;|z6$6g{MI<PPP=^WBbRyd!2**RuV?tW@%`h|
zn(rOa{evG}vmwQ+8`vlK5gY})?@cxS@`(k0<B>9Za$ZmHqwRlqPE)S;5B>l*0=Eu+
zYkbFo2k!9ri%(Vg%wsOQa^1rhV6h@R^<vOJ_ygGn*e3X`@ofbkc#H6*UlV@wG03KL
z$MB<pyk}kwojCn~Kfoox_Q7wBZ!380Z5ChtOp1pOIvv9ofkH)iaaMYVubP)?LWbJ_
zY&-nc_+x4K?8j0(`B<VO_)!)w%<7)utHEspU=)69{GYuq!AIWVbOc`u9J@r%@MYzi
z%*bpB0LI}*@t=6W!Ll|FUx3r|f*<q-U(r}uY)EF`79JD$h%k{+?3q-XhA#rHR#d&-
z;6tO>F(mU<Kn&nV@kdjehc75ZpyIaX+c|tC45%wOX7CZARP7AD25PSA1AKE9V73H+
z*uby5;iz9H@I@e(q&N5``+yj41H=P90<WCYxIt&|l?4+cJ;GOww1#B93g{EeK!?k)
zx;2(>Jnwe|Ux4d#;Hci<hnbl(0D~)o*fgAtV3uo&zj;P@_SFE_^Eq&%@bm9;IIyqH
zJpXm_KlHNC|D4br!54w|+@gAhZ+bp}VFT#>$^WaTg&!Vm4(uGB33&0O$KCsEo_HX^
zTW_}3&0lNy=jVOC^gX|0_yRn*zd!IzdIHTZ4n?gCXEX4ZYw+B$_M>_)&j$SN-v=Dn
zXY;8C91h+T)^>g%%v{v`-&x^XFZi4<NLTRRej^;%)4b-cpL_u^*ak58qDXpz4^S*?
zw7>C??n`F^K6@r$dQ4Gqg;K2@=+5Ay;J4o0yyjluD<vp{jv(_@K$q|lVQNfa5fE%*
zNO!K(eA0V?uYo7;gE#M@FYsmMe>NlYy@1wm2k;R{IdJf1bxruI0QLy~kvGAo-$CEt
zn{ETd%MsK8{3!k>-k%6xGy+=={}cDX=O1az<ZWDAukcNF0U=I~pf2DeaOd?FpZ-91
z<N2F~KRpJ2@+f@vePFBp!dFTSYBx|=d33vkAI16jdlHPM6o2=9k3vQI2LGl>_|RSO
zi35;I(AQ$W6~4(|6gBS%>Jfev|M7cm?!V3Ae~<gjT+)>5;r`ZF_0gJL>wXD4VzyFD
zj0ihN;NV`xzRA_suvPE}v;=7U=>z;I&Qw<M!MknVeQQg}LIaX)G=WpK<g0r2?RN@)
zFdKn=h9AWrO(`-dD@wEp__XBP`@l|DPyRqx0eyrY#TiY3!lGJ}*ux)A3T+Md0e%!`
zB&o<Gd1JsgR{+F(QfQa(qwq*lkx8le!#CIpjPIn-9^prEG6~2eRD9vLp4)&74+d>5
z{3x7BhWP4UYnu4LAJ8_y_P~$wOeY{^Tf`E+!Ct@{dn};Cc0@WMq@3;V=R-W<gYh=N
z_Q8+hrxTEJVg}!!4VbS2wh?|5PC1ICLww*5Y!zSteiT3Dgr8WzAIuV<@y7uCD4eua
z_@hq)3LoA`V*!1JA8jXWa4f^{4ORh$M*}emzqKS#XnbFpfp4%Bi2qo?7Q>IyCoF|y
zi5d8VX#nwoAB7VZIF1;AZ_WbZI~K6b@T2sOQY0+47rwy~ARaS<AQteWu&qFpLeSd-
z-=F~)D*+aZy8TTt3_sfMSb~Mx7WjpVISVjm05fO&c_5bXqd2w-Z_t)L`6A3L+H+mr
z#-3%&0Ol`e?mu$Et;H4oN_Aj?wT19snX{`G%M<r?eIt96$)RWfzWpoLKb~}~4+kP^
z+atQos>wB_rL29+)_RLArA>r(aj)Lj?pK{QJjYcR+2;CeCB7^A+aLZ`;pug98fvJa
kh8k+9p@tf2sIAfe16Om4l7&%U(*OVf07*qoM6N<$g6ECEtpET3

literal 0
HcmV?d00001

diff --git a/games/NXDoom/data/wadfile.png b/games/NXDoom/data/wadfile.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5888438812c0b270fb26bf1ed949b896b37ba8e
GIT binary patch
literal 8681
zcmZu%cQoA3*Z$aL5xo-xLDcA?vuYyId$+Pml<3jR5;X`SqD4#8=q*~XLZY`Qs|2gF
zI>G8c-}mo#&XjZJ%$b>c=FT(sK6heuw4RdOyMGS=021|QDtdP<;=e)wxvRV6Z3gZd
zLicB;UI4&l^<Tjm=`?wN*U8|mYT~W$X7BB5<7o%@`uYkux;lHoZQShy+&mq!_GIth
z4Wj#Rkm4KfS8kqwhK;)$tFn!Y&1)N1TTeU3#pL_E0Kf{Ut0)@yeclarF6Vq2ys^I+
zoOAYO&-noM!2UOV3f_}ie5ze1njc2xvh}k;u@CWLOm*t5?CN09Sn3KRPs-irFKB;8
zb0<d9+nSToKW&W(iaB~1j*R{xA&Hwz9M1wD5rU6khyV6S6}R4;>+EAN^7Ci^7_8m)
zZZUuLE$@<H$8Fh-;XJ-%5nTHJ$)N%&uZ>QpsS?{VOoGS<&p>{Up}~kaJa$uYEt(gD
z+<%QM>$W|f&-}au1VDZd;uW4Mh5mU#c7yE+y}C(rGW300A`bD}IZnJ`626f^GViOH
z!x~ME&ExgoicTv`!@rD(EEz9eQte-F&ln5lnAspk<ZpUML=JQT0Bk<T<$he|rq(!@
zYTC)I(#O+{_S~6ya6akjt`6ue1r>-hm1f{{f@Z|tB9iP3%rh9m@k|H^*jUrqBA{HF
z$+1i*pGq5FUpoJs$k#6+A&mYP$7l1ti{mv*O}b(dVA<1dxLc9ztu#U_bhJm#cQI~k
zHh@So&@PD_WSYY^B5G?I#Xo}NPkO{$;P{R|YZ)_aXwh`QloPye%EZLfl(rB0x0D-n
z7K&XIG``%hM=aj_{n{~%zQqL;j+Afra%r%c5#%3mm>%^W6AwbG=9H^Y%Af3}=N5mR
zZ;Y(WIowiQUOr$CVq4k^-uE8~^l|l`+du)ifvYSye_PsuL1zocZvlYKb7yxy%(PcY
zHQ|A70|j2?O-(LiX$ts6(_Ir`UT3sOJ+U*Jez2et5z#BEY;&2xz>n+6#;QVU51}Xx
z<eZ+JjUorF^wGDr%3z0^z5Ld<99Sh$lUJ6{v1j`sXO|rbjL))XRP8A`XaQIGbElNL
z#*XN>hl*pBt;YU{I{kVAL?Trntgq!t$#vf1Pn1%7;O%A`eAjaZ>7YdWM*%<_`o(Xz
zqTDegZYm!*Sb@fzb{gkx_Mq*o#cnK&7;x)junxv9Y0n2P1}mI!xRP^vp^%$z!?cQ>
z>mmRo(3hV{A}{rHl~}q|;RQ8^NpaT-+F}gnBNs=~chHm6W)=wrqu*6vR&vf~AE=?>
zV!P;zg*TrAG5i5-@{qS|QC)T}uU(cZ+=3a6o;t&37E(TQgdS}@RR}iDZzlS3&Hzxn
z(R$7q<&;g7X+`pRh+`coR3rM`MbWMT^IA^pvDP~=K{KP5_|lWyv{Dh|Xbb2n!;x%s
zuUB=iX2NPZ*-Ia^8e4^eqtY{OMWu)`LCem`GQls4jIdD_m}65!>Ke`8o1(dzwzi6_
zAF0*Ym1vfb%?E#h%q$#9EJUn#mF}gWjh0YkPY8t%6pqJcDli&k^9N#J`331Al&M~=
zqu<P=RQlTTbEMvi5=?q1NmF!H2~fFb`7X#np7pZu{>K7BZgr@N-)VDkG6&&Ba35~h
z5+&p<j#jpOB-Pwp%PybB)vu=y{5P$Q6M`8h!XY|&w7+L+YN&<51e0<AxoimVf^+Di
z9PZFJCKFISRD;{CIcJ{yN2^lpVPR~2U+qOW!*gYVRnzxdw)c_=i+{Pyx`^XsC<ui;
z3#GhMJ$Ps+nd65qD8{_1^t`#P<%x=7kE2!10F^XPw6DVTX7Qqt+|98rqdWqaQzTah
zPA8|17no;I<J;gij#ImiAk3jOdW595TXYI^T9k5=d>%{z5cK)|ECJ8avU%E$^ZZ^B
zK9VI1aPF{p{>)L}B>1F|4?wsU$5}NdhG=JkLGA;L3y2ghZH%-;%&&d9s{<}=8t2#1
zX6bm;m*ov|G^-D2ZM7%)O4*H5lI(C&B_K<DTa@jJaz7$)rNHEWP_SzCx2g9ePUp2>
zSdBYwWHE5i4|JP^As?+ZJsxs5C!>c-#&caJYl`H}DgIH{?3tP7DD-?*#G?+4y~?rI
z7iGG(VljQ9I<*a#H2Hbc`M|Y#?Ic}`%Wvt32ym|hu5aLp*XtbtsMfuXpjS!HOT<|a
zAji{Gd1V=QjaAE%NfD1%YSROATtD4T)UZw>-82RA*uSJ$exMVnMJg-785I0^+1Do!
zyGaBNvT2OYE*-ZiofXQ^5Xz2c7A4OW<lz03bO&%5Tbva6sO_&QKBK!Qqgy_T>fsU#
zK8#Z+O`Y9@mGa}}9+ps9Ib4<0iA*x`v7lj7ke9~pfUH1C$PoYczbpj<P2Ht9?i6VD
z676Cy`>QppciKNBk*L%9KO6*;n=ZU}D=uB!4z4nD^%LS2V0_gx!yiaH;<vf7WQ(aP
zMM$)rYtjn{I%@ijEOZWszK$AlaT>yp$xYEKZ%}4M)7p-xR*y?PHk3kem7diis+iRX
zej5md?3=w?Y|ec7t*ES}V%#xm%X@hczhb--CQg)87j}2T*KdO@nlBy-Sl$Q-Shh#Z
z&s$c*I6fk{RWp6=aQAP>W!9Lw%xwOJTkiQF*T`U)QP}J;jx3Q*JPvh#%9}x@9_?0;
zncxn4=f^EOyv2(BsxwO4FK=1QbHnM$`Llm-*@la$Cl!<~f!A4GR3eIVuAkKI+osz)
z?ZTv0KW+5Z61Q2AZGU~^l0B_9t1isc&$Fx$v~3Q{1OIfB$D-fv`yF)R?;6;W-pR^s
z47PDx{2tg6R#;js-e<!YK4u8HSc6y>-}*>&rd1Wf#OKG`2eB|rgWT0K(Y*24j0gRt
z@bK%lVA<=zaqL{jd1%vjFOqDrUu9NrK#W<8W-~ed*QKZ*+vGZ`rE)B+?-b_9WW4s3
zq@=824)Xg}x#5SOf`V+3DAdi8;m<-IfPlQOop4w<TgyN;CjYP~0uiyQf$%odB%xyF
z()p@LSTs(oEr0GiJ=6UD4kjnI%(H)SUM;`14ydNto&Q3HjFg?C91=F)x7tzp_oJm=
z8Sn2v;57QG7a{mH0=aK(sL0iJ(1*1B%o8?>!+Gvt55lZuMydz{oKJ@M4~9B!0})}V
zsdk@#Y!$ekm7?U{948JZFq>Hr9asS2AJ!l0`<Zp(OruzxD1Y%^1E8pGKbA@x@Od&|
zy%D@3?QSy|avO>CmR5b1)52AHRLGzsiYq~aNP@}cptl@yRJpd$pUkcHCn9s@nat!H
zHo>?V!b1QO-;%^uWtZ`UkiNAB^7}Hy(#1W51Bu#l+xcL4{%zO)lm7s&V`kpmZr<X)
zO_Lb%=ntilQCdxHOL$=++r_nfOZNK-8qC8Xf{k2%hzjASG~?=qw!%laO_%x652S?!
zLn@||De<AnsrDrGb@mSh#p7Qt|G?R&*Fy5r@9*y|>#wj`QU9xbOJ*PBMb{K)`CWfF
zgwj?&3{jU{<k=*n$b{r%i}<VHel6|e<Kw>8PqSmS_-kQLzzAh@2b5(V=YNQRB!d1B
z0wg=lTZNQ$2Lu7O{049^+W{Upq|qO=fC4FS=)(@BZT-Sz1ZA-Nh&cG91e+r2dZdoY
zvDoxLK%J5}TKO)2mSn@bDopcn7s`Rj?V=62TtNqKOlg}K1!cf_8hrx>hO$uW3Oj4-
zZHNi%GfyB_m)TPwNC?hPzw&uZ+n}53?yB2+_o6_BUw;=m2;Hx+acqhg(-dYR6{aV4
zcXtPHZs<fIzK@260E=hPId1A!%7O7YF-bGJ{^1&c$O-o*hJI0E@S{>PnuxYZk~0XN
zC`|i`xV`=Cgm}|&NK3kd*GRcATK5xMUWyMCFhWgLhq?oZ_Tpto!yPQL3T&;lDCSCx
zszJ%BCJ6grLr4ev@*>c_1+9HXnrR8oXJjf3dTb!#cx4^^mLZ_-UW#Rb5mh>63M!r;
zLM(ONR)~J{`P1X6IVGmNdwvr49v!zStO1$WL^^__s>d4qN&u!LxbUdLH>U*tQ!V<i
zohm*bqtAXIu1w)#Fq#1xE!X}x!Xouh=}V6Ivk%?O3C$(HB%#ykfQ#X%DZ8+)$kdZX
zj=yHiJ)_f~lo3^m21F!E)$f-0Gyzx!y>A5*D9DD{N{+NHm?ip)E<88v1BW74YMcro
zr+vhF;b{<pH6_77W~TjAuwuyTUPI)87<iS0bmgGNdl+i_sW|rJkHE^C`E~R_d%w|~
z++ZcYae}oReQY^l9)}}dP~MOvV&Kr8!5~+#ZL}E~(s~(4)Y|v?Qta&1#z4O7`;3c*
zotmH`{GcQBT2{*^F#V6Z43n9i;R@Li<lDE;7IwI-;?NgNqhH9-?*a}EMJ#K>a&^`&
z)11^BP)ttW@FA4`biREV368q{B%Qat>(Po%+iArY4hU=dD2Ch!4l0hDpM4e+W=wh0
z)W*r|&%E*rUQpX+?q*>kvM;$3HqJerS;9=YFWr1^pI0C*(1{#av_(UP;xpts(^!Wr
z#B|B8r>c5io}@A{Q0Xk7vA8j9l<)h`v~j=X4y7G7F+>v`Ns_*!HL_oE!emW+3UVhc
z!Ou_PCPACkn_}^mRgw+-R3_f-ljf!BxF3*|nOWAt$|#Bb$|CXfOU68k!pkSig`8SF
zBDCl1zHbv0;b7Y9IzzR>1wEsA)D0`727Ey;IG-5!rmlU?cT~r#KXflSUZgxP4z8x~
z*sG^|{Z2Q6ZRay1PVWg4g<+A$W^$!>Hm4KbL`ysXB93bbB+w3G)PYJm6$JewYR-A5
zl6k)xfa221Co!j*FJb~2&f|A;48Rqfn)Et4EJ60}u2<@TWbojL_FG)hPA(%fpLKT~
z%xWk1eikChsgi>!la>;{`jAQHPdmsR`F<wAQa$gY5JLV=qJ#l!R>7xZBIP*C-%F6g
zPY1ru-X2*}z8_R)4|EY&{TP46=zQ_Kr|L*7tsqP4li|eOiOS%3W~xTMRGrHcnIWa6
ztMr_ZEuXl21c-K~SxJ}H{;VHKKr?VvlVYth!wkx9E(}m&1UAmQKCMqj@CjO9;*gp3
z2aLuI>)LF3k80z&^DECNRy{uF)g~?Ya}r?I2RsWrpvG6IKF^0#lYM<8MC`mgUl--}
zB=d%!RlZA_`0;u(fXYnUY!az%+XA}OH=E@67{{4{s_)AVfiEB&+nl{EvIi(m?C%+P
zw>YB3N?Vj_A`9<lY??&azut3T&+BIDp>#Z257%YCS*OZAYYI*EOl~gGK1<4?Jpymg
zx``0EL4XxjLj;@6T!0qF;*&pj@*4yQ(LL_Q&m;HyTGQL{yX?^u=q%v`kt=Q~EV7<I
z!S`rd+KwAp0(!$TbB`<tHSRl}&%;_$@pmV9&cTK~Z)i2vFO1e9EG`b*3n%jHW+smL
zfzD^rcP6r}A7xNs4|~(;i+K6{KH_?R?$Y6~Yn!FUNkQkt?mje&173s{ePdwHhbzU@
zp{g2Adm4h6F&c6pWPTx-Ga31h-K4gj++X=1^&B>Ycc1&HJ?#|=9Qp||>PWhL<AX6X
zw!DPXI9(lJ?_?MFReZWiAoSK=Jz64t){N-QARrFTee>f1hqdX~^r1bYsS!4;V$qj6
zI){jEVH}{Wr~MljPR{liveJvq!|%@UaF^-2n5F>EA_Y|6WgiB=8-1Fj+x7^}$HICz
zxAdFNmOhDh{lY`7`jBvv&I>F@$Gv4tGPv7xvA%z|d?c-*nxf@N6-Ut#ZP?e}n2-dd
z@fLJ#?)!8Jn!ic`LyUnY$-pzl&YX_Ksc9xK$;UV@M9KpjB=vfAs~=BFyICc38rq##
z=3Bo#&N;?Ee{O7F`W?pvX-SxCbMJ3)n4L@?lQFT`jLnwh$20||2CM}j<4>#&l<+>Z
zB5jg$??N7BD!-n80^QmwoWkYRPAwJRC!<$1T63o2jZyM%>}t?fPIft)k3H54^Z*h|
zz7q;br5<z83E?;WZuRA4ZJ%$%;R`jRGd{5^f_89yNCg)-h<incJ^c0oV`vgby9}m2
zZ|6bR%t`XfjAbchBC5(oTW_M?-#R-+64LY(g{Brk2dXd03q(n{yA^qX_*`D!M;rNg
zdxYiS3u5M_=}Voq%o7BJQPPd29T=?zS?<k?l6gta{sQEc!PFp?qSqE<;z#ZMFRCR<
z;=)38_wn8B;(wkCNwM7CtK!$qFE^Uk!+WQOzMVTc_PfROfJMJdmVT`jug-@M1cR1}
z)%Q4(-Bj5-)@nvvzPLl*ffqq^{Hx*~Z=e!VG>9y7?xa4CM+tRCR99r>@-R5X&dwCP
znBrpzeH8nWD7~U6C*xCSh$OBMP>0d24j}$RdS@6#Pz&R%#rBuQ5@;CRIdc+#bx9<1
zn^mF^>nhl~6vHlxt51lxp0_YcEfOa<M7kAo4j8V^9ZPOnxo+~8aQQWKkV5x19YO6!
zjP>>X_=vyh2!kk&+VF^;^=mfvBt!z&rUN*MRUT*k-PcWo%3~;FeYyj9479nRX@L}r
zF(AB|-`+S3OI@}nt#A$I(L}<$Yl%!cuF4WX&_}Pm8;@O}8S-RL`V7>4U4oi-y4hX{
zdjJkXFN=2+nW<R$#-B_PSAxD1Uy)U+OdU^t9GS?+IM{pF#!ZK;vp?e+K^<Kv*Re8u
z_^7OonEioqtk`5#iMd`twQjoCv$C-6tqrJHj?Tx&?BXw@-9Go=rv)EWH16%+>EL00
zRxq8pcIb4tb;IFT4RF(IgIU#9pSpZ_M_LULw?;cC2v`ISihxyR=sv-xB-q`k)ClBN
zT>GN}&l;?YG@)FrF%`uM9Gz7)hhGQzdlxBm@V~MAlF0o;@@e1`TjX}0oqzP#$RF&z
zW{CTFmkfs@E@ApbEKu~p>$`n?dLWeOtjcLveex$ZNlTFaVB7VI+YT2X{4A$YzW9(y
zx?U6=Hyx*w$P~;19SMtT9zNeRjQr@Vx%zo-3{u(H@ejxgji@out1#0lqN_fch)#N+
zTeY#HS`?ZC86_qhf~_eV*-=aWRU@m1_{7uF<0lzd&l0H#G?83_dq}YZ_pUOWu}7J<
z0XXIx50XA8y!gqiR>DtY!X;iaJ{0f>xf@`sMGk)_ojRF!ssYs<pE00v6#O_Ah;vd~
z@q<saXEKC4yK~{1qt%2oBq4#NFg|bYMf*i!2IA-RmH}bTFS9QlzrDGgwrGU8vA`s9
z1TtS{<$rB-23Dv(HE!BQ)1l?Q$iYc+9~oC)XWxd~de)pfEfUwEAsOCT4!RjWwi}^5
z!%t`NV{oDNVC(!x6SlL#g{$T%RrFcb#(Lv@UJXB6H0c$e(yRJ*{rGEoo?hEVO?579
zKQ0n!d&ACxALHvJfIjgjX=k?q?gIu@F3f5%soC-Ebbn358>yaqgt1_GeMUE8zX`{W
zT{-2oJ?*+@)PF;ka#Vc}+iNPfp^YBI#o!q96BrI#&DU;GR?gql_5Z4Fvkwo*hl~Gu
z$yt~F@cWC4>WLgOoxCQLHC~Y2U_8*UqDNY7mTCFX0A+()BwzVsEtHk9{YjEHBz<iE
zEZ!7I>vJZCN!WxY_F8m~4Unqdy*QHABK`zu=F+4yPuD3OJxg~onSI}Vp3$z!#%pa2
ziM@lYq9PYU&dt-$i+C}Y-3W<R4{18$u5b&)ogEooaqPz`Pm_uFBNg`uiNeW$6ek`n
zjAy68UJ{*lv-ULkbxzp($I~@;F7#Te9f$f(Bj_QebqtMPReyZq*r3<RE1Q8%C@$LU
ze!eYU_9QxdSM-MSLx4$XrKs{KTDx)BZ(QGVHlu(?ZQEJC+CJ|kBl0biwt2T0?)yA4
zolRx^Qo%ET<MjPCnai0?v3o=MZ*?M!%|>7-!+3%W4fjRGyeGN$!uopDxj(&E`yh)E
z(<+%Y4D@pSEAtiI3Rp+oZJ?l?DPZO}VpW<{**SdXgS4@U1VlcdsR)Uhf9VqvZnfs>
zS_$`e?CX1M=j;~L+eiAOOf|ajv6%}~-g6A!M4Rk>E?kaef>e#9)TcAsp+Q@R47G=~
z(|EEcrpPl+U6`GY_oVSjb!`i!Plu40$M0%l3Wq56`vkm^x1(tNPM%t1*G{W4k)CA_
zwa|&j?)zIiqy#DVPEc+}O>^^B7z-m2*#$^ng+6@Q&dx~Y2~2Sus-9pNQp%ENwYTF+
zn5F-1dyrfVJG0KP6;gX{LtlIwUon*6dC>MJ-_d*6-6UrxS+q<9?|nR(j?xga_=A5f
zGw$UPo(YZYi=P|mY(f`JJ{vtruUi)6O`{Fiba>8z`W3U@(+m7WwwM?F{0Os`KrZK3
z%}SsHBc*t|^Z}}2M!Fq<&aFYW`YgV=Q2R<@#C-5oiD8>5t=WIpbwN_?RVO~|#8NRD
z=%B~_=qnPg_oe+moqBz9BFds%87`}KT<wx--!=9sqG8Nz6mz6|Fzm+{A#BerqBN%L
zhld3K9q1n^UAmx*iqIAO-we)t<<9kZCmz?siEML0t&XjKC*d2H#J^t!M>I5uQ}g_@
znipjn_&$il8z4)huyT|K5Ke9#IM_c6b<LGNF%q^B_v%<XZzXGYMKL+U@3KS}St_dF
zuU|LR&OsQfSZuXaGT43+h{ikd-5Ibt>m5BJa19DImGGc_+E|=wQue`kictWyc*EEG
zWMAj(<;sSzd4>gJMcT8F@?Y&SwJ3=p;$*sKlJPo{jlh5Gi%u#=u(WLF8fR65!bC1u
zzYxRtn1Tyzcf6mZ*F)UaJYK#}RV{trMl6%0J^$y5^=w3wWmYFan5jE&s2vtaFbplo
zqgE038*VdkzXo(>h}pK_XM;USZrNdFVPaITU{h+&q*z1DwC*n6h}Id`PlETK4h=#H
zsjA^x>xIAWW+>>;IJuncrAN$?iWS#6{GaTNS)Cs{S=QWZARV!*`bm1Qz-49|T(1QY
z%XmUsMWR?Rpjptt3#{tt(Z|f%%<F)4aD%F^2yvzw+17TeXfq8SOe+cz<4ohJ5g^sn
zZ@&1vg(b^FsWQhD^eB1UN+9~z2;~*ac6G8q-|Ks|6{7N3%!ApzL^Ws1AZ^7|iHQqe
zCL72A0qH3>!g4iA@1;ARJ&a9(5jAlhr>lG2H3kq1O<EI;ZWTn&x5_VtxlLAy2*U_(
zUXe_lxlDOh+(?05WprOg3-9VYfTu^(GUBJJd#J_gy~59`Jmn1D;qCLqHyXKf@AF8p
z)FrD;V!yj*`kYyJ;|fkg!ac*NAumirXm)>a7iG*K6y|Fc9~|#?TN7gqsoxm!y<`<n
z?O84l5^p%jl)OgKsycme^N;eUqJvrA=hPv%@N>NXtf8agXDbdiAh?4T`^|q{4rnpt
zv}&=L=sIbs6*K<ZNccG9F_Mq|$e+Jz$H~-apSZu3YxME)zmtFv5#)kQ!7M84*&y>t
z5KF|^E5oq;`ll@n{ci<ltt)qA(-16P<XLZf1#XAbi9~Q{D8~w-Mt91HK}qxfz%ULx
z5_H&YaIOxTD6|Vt)Wk8hL7Y%t#@8cdNBye&f#hs8EjC$s<E4P$<b7sB7TBjp?6m`2
zX1jKLjW)OcuG@>NI<<{!F5hdzTKtRM_9q*25}glry{lDf#o4Q!j~<2=2I)cMQMjQV
z_34s88u!_3#`Ae)h`n?+Y0>zgOYbP`z4ju0%|GdXw@Zys83!B;+gv*lzMDUAe&p<;
z`N#)2o<ll2JGalG=2?jp=~1FIQ(p*@WVbEU*YF4(dv3r)ap2APht(F#qFD!l5iRoq
zr>CcH%70q{FwgP%^uOMTHHUi;QngoSYZsjt7Z9T<Bc?&3%>ncD(?P6iN*?Nsh|`N3
zP!|#zz5={<46~|=*81>}u2~jt7{<#EQk-(zsR#2;1ce5R{p`nhsw`Wo5om1&VB8g{
zt4gAED<}Z6E7h7#S$QZZF)SkVyFsA`k3QY;E|R~B-+W_85@TCn8R$Pq>5^e|A1XYE
z!Q3|*v?sMIXU^Kqau-;ou6>!Cm*;cuYq4fVlJGRK+C<?2&o3sMh^|+Fo`fb2M`|F5
z!HL&UR#yz~c_vX2blvw-?v4Vx3rHx6Cfn1)SJ+@vOMef9amx70Ow6tM>L;JI@hy){
z8daDti|H#hCvh{>1?cT#0Xd-g*il830Wl%Y%nd0SKQ5VffYA9s3`IMSF!!Lyy*&X9
zena7mg}Ra7G{!U>5ho-kO`n$NkDQ`-hC=LZ39CQxzTZB7x83~8m3J5)Px{-Ni<C*n
zFM%GG_c~EqCSTEO`f(c7wc&Rmi)~aDTsm9&&?p>st>@@JqSY98azgU&!jk0`YAOjo
zcy#Hxfs^i<-O`cI4kn2!ZX$97fPx>D3;=fMr&WoWM^ov*CdtJ#(?8(_1>}ui{2hNS
zn>H)Bb;tR8*VK!3!$wgt>`5NuJh=>m9exVyg)ztanfkeBVi0>v{a~kzw=Kj;CE5fx
zd8fR{{B*$mYz;3pUx6u4fk}ndl7IRMs8=gP#Gb%wK856}{9WnXplBiG{sn~T0&r!E
zB8(e?6qAC<`N2)O4-lNRvTR=#{6uQ#lCG0C9=g(KAg1d;le0(?`iv>ahDNKCi1PHg
z-tTn9N#kzSAA{UYFGlfKz;|>k2u48E!dC(kuZL1m<tYSQpzucrYIpP+=Yofti`(Ds
z-%9M`0{nuHUuc^d_zfG*edY~)RjWbksK(~x8Bimp-*(xI`!i2LtY=X^kQPX?J6C<C
zICvLB4=p!YnYagTO2ydx8AtxZOqPXuEO*DEEZV&Z>Dn)4wc0V0cQL}U0g~@JEc&lo
z+?V_<T7n3H>bm1Uxt-a`>Yg5%>Ry77;B!9f;P6f<(Un*(`9vbR+}y@~IB$L&U2cy9
zODHjb9GpSj{ByqR9+v*Bl%${V{$fw*TejVa>BWeG*KMG7w){2A3Ete?oa9N=_~soL
zJzi4G=$MT87gf1VZC=_mX0Y)-<q&5$N6wjp1sKkjIdkqfbk4mZM#!DaM2h2Oq*NBP
z5a+esRHi%tXl?u-0|3s`|Na7)gn27PDO`)5E&5_6O3x^CVMhH^J!Hy{QInJluPX*8
ze;A)mG<)S<C0O51bOEO}3@~D%ACS-@GV;J=%Xo_(rQ(_EtMlCJwUky=Rj@zY`Rm-4
z59$L4gII}z(o?D(pY3n{PuI6>McS~-M1nzEi8tuPkgeOBT)_}RS}fS4`h-h)ND^u}
zZ%RY(oUNe~_#^h}ac7b!-jG;4do9iy4OD6;eM>5s6!t|PzG40%h}0Tff1lvx$7s4Y
z;GTmaTmv&vr0^t{PrK-JZ%)~QxPBAmqMvRFkI=7QtPXbM?Xl#Yhr;6Qr0qD2^Ii=~
zSjT#LZ+h5|H5eA%Lyu0MWgh~}*t_ZTDTdfHT&H!x`w;f^ire&{W%Nq8HQye~*C)U|
z2Yhw+z4Y~BUeP;(=w2QiJy*=gQYc+?d%KkjtTb%$i-(W4-~GS<)K#@qDwSa2{{x5e
Bj!^&r

literal 0
HcmV?d00001

diff --git a/games/NXDoom/man/.gitignore b/games/NXDoom/man/.gitignore
new file mode 100644
index 000000000..d974b54eb
--- /dev/null
+++ b/games/NXDoom/man/.gitignore
@@ -0,0 +1,16 @@
+CMDLINE.doom
+CMDLINE.doom.md
+CMDLINE.heretic
+CMDLINE.heretic.md
+CMDLINE.hexen
+CMDLINE.hexen.md
+CMDLINE.strife
+CMDLINE.strife.md
+INSTALL.doom
+INSTALL.heretic
+INSTALL.hexen
+INSTALL.strife
+Makefile.in
+Makefile
+*.6
+*.5
diff --git a/games/NXDoom/man/CMDLINE.template b/games/NXDoom/man/CMDLINE.template
new file mode 100644
index 000000000..2c5993836
--- /dev/null
+++ b/games/NXDoom/man/CMDLINE.template
@@ -0,0 +1,8 @@
+== Command line parameters ==
+
+This is a full list of the supported command line parameters. A number of
+additional parameters are supported in addition to those present in the DOS
+version.
+
+@content
+
diff --git a/games/NXDoom/man/CMDLINE.template.md b/games/NXDoom/man/CMDLINE.template.md
new file mode 100644
index 000000000..b7c800a70
--- /dev/null
+++ b/games/NXDoom/man/CMDLINE.template.md
@@ -0,0 +1,8 @@
+# Command line parameters
+
+This is a full list of the supported command line parameters. A number of
+additional parameters are supported in addition to those present in the DOS
+version.
+
+@content
+
diff --git a/games/NXDoom/man/INSTALL.template b/games/NXDoom/man/INSTALL.template
new file mode 100644
index 000000000..c889cbdbe
--- /dev/null
+++ b/games/NXDoom/man/INSTALL.template
@@ -0,0 +1,316 @@
+#ifdef DOOM
+#define DEFAULT_IWAD   doom2.wad
+#elif HERETIC
+#define DEFAULT_IWAD   heretic.wad
+#elif HEXEN
+#define DEFAULT_IWAD   hexen.wad
+#elif STRIFE
+#define DEFAULT_IWAD   strife1.wad
+#endif
+# LONG_GAME_NAME installation
+
+These are instructions for how to install and set up LONG_GAME_NAME
+for play.
+
+#if !PRECOMPILED
+# Building LONG_GAME_NAME
+
+Before you can play LONG_GAME_NAME, you need to compile a binary that
+you can run.  For compilation, LONG_GAME_NAME requires the following
+to be installed:
+
+ * A C compiler (gcc is recommended)
+ * make (GNU make is recommended)
+ * SDL2 (see https://www.libsdl.org/)
+ * SDL2_mixer (see https://www.libsdl.org/projects/SDL_mixer/)
+ * SDL2_net (see https://www.libsdl.org/projects/SDL_net/)
+ * Python (optional)
+
+Follow the standard instructions for installing an autotools-based
+package:
+
+ 1. Run `./configure` to initialize the package.
+ 2. Run `make` to compile the package.
+ 3. Run `make install` to install the package.
+
+An automated build script is available that installs the necessary
+dependencies and builds the source code automatically.  See the build
+instructions on the website.
+
+Advanced topics such as cross-compilation are beyond the scope of this
+document.  Please see the GNU autoconf / automake documentation for more
+information.
+
+#endif
+# Obtaining an IWAD file
+
+To play, you need an IWAD file.  This file contains the game data
+(graphics, sounds, etc). The full versions of the games are
+proprietary and need to be bought.  The IWAD file has one of the
+following names:
+
+|  IWAD                      | Game                            |
+| -------------------------- | ------------------------------- |
+#if DOOM
+|  doom1.wad                 | Shareware Doom                  |
+|  doom.wad                  | Registered / Ultimate Doom      |
+|  doom2.wad                 | Doom 2                          |
+|  tnt.wad                   | Final Doom: TNT: Evilution      |
+|  plutonia.wad              | Final Doom: Plutonia Experiment |
+|  chex.wad                  | Chex Quest                      |
+|  freedoom1.wad             | Freedoom: Phase 1               |
+|  freedoom2.wad             | Freedoom: Phase 2               |
+|  freedm.wad                | FreeDM                          |
+#endif
+#if HERETIC
+|  heretic1.wad              | Shareware Heretic               |
+|  heretic.wad               | Registered / Commercial Heretic |
+#endif
+#if HEXEN
+|  hexen.wad                 | Hexen                           |
+#endif
+#if STRIFE
+|  strife1.wad (+voices.wad) | Strife                          |
+#endif
+
+#if DOOM
+If you don’t have a copy of a commercial version, you can download
+the shareware version of Doom (extract the file named doom1.wad):
+
+ * https://www.doomworld.com/idgames/idstuff/doom/win95/doom95
+   (idstuff/doom/win95/doom95.zip in your nearest /idgames mirror)
+
+#endif
+If you have a commercial version on a CD-ROM, obtaining the IWAD
+file is usually straightforward. Simply locate the IWAD file on the
+disc and copy it off.
+
+#if !__MACOSX__
+#if DOOM
+The Doom games are available to purchase for download on Steam
+(https://store.steampowered.com/), all releases containing the classic
+games including Doom 3: BFG Edition are supported.
+#endif
+#if HERETIC
+Heretic is available to purchase for download on Steam
+(https://store.steampowered.com/).
+#endif
+#if HEXEN
+Hexen and its expansion pack are available to purchase for download on
+Steam (https://store.steampowered.com/).
+#endif
+#if STRIFE
+Strife: Veteran Edition is available to purchase for download on Steam
+(https://store.steampowered.com/).
+#endif
+#if !_WIN32
+For Steam on Linux, you need to enable “Steam Play” for all titles in
+order to install the games.  You may do this from the Steam menu,
+Setup, and the Steam Play tab.
+#endif
+LONG_GAME_NAME will autodetect IWADs installed by Steam and you do not
+need to do anything.
+#else
+The Doom, Heretic, Hexen, and Strife games are available to purchase
+for download on Steam (https://store.steampowered.com/), but are only
+available for Windows.  To find the IWAD files on a Windows or Wine
+system, look in the Steam directory (usually within “Program Files”),
+under the “steamapps/common” path.
+#endif
+
+#if DOOM || STRIFE
+The Doom and Strife: Veteran Edition games are available for purchase
+on GOG.com (https://www.gog.com/).
+#if _WIN32
+LONG_GAME_NAME will autodetect IWADs from the standalone or GOG Galaxy
+installers and you do not need to do anything.
+#else
+The games are only available for Windows, but you may find the IWAD
+files on a Windows or Wine system, typically within the “C:\GOG Games”
+or “C:\Program Files\GOG Galaxy” directories.
+#endif
+
+#endif
+#if DOOM || HERETIC
+Older floppy disk versions are harder to deal with. The easiest way
+to install from floppies is to run the original installer program
+inside an emulator such as DOSbox (https://www.dosbox.com/).
+As an alternative to using an emulator, it is possible to extract the
+files manually. On the install disk(s), you will find several files
+with numbered extensions (eg. “doom_se.1”).
+
+From the command line it is possible to combine these files into a
+single large file, using a command similar to the following:
+
+#if _WIN32
+   copy doom_se.1+doom_se.2+doom_se.3+doom_se.4+doom_se.5 doom_se.lzh
+#else
+   cat doom_se.1 doom_se.2 doom_se.3 doom_se.4 doom_se.5 > doom_se.lzh
+#endif
+
+The resulting file is an LHA archive file, and it can be extracted
+using an LHA archive tool (there is one available for almost every
+operating system).
+
+#endif
+# Running the game
+
+#if __MACOSX__
+Once you have an IWAD file, you can specify its location within the
+graphical launcher program.  Click the “Configure...” button, and then
+click “Set...” for each IWAD to choose its location.  From the main
+launcher dialog you can then choose which game you want to play and
+click the “Launch” button to start the game.
+
+If you are an advanced user and like to run Doom from the command
+line, you can use the “Command Prompt...” menu item to open a Terminal
+window.  The DOOMWADPATH environment variable is preconfigured
+to point to the locations of the IWAD files set within the launcher.
+You can launch the game with a specific IWAD file by typing, for
+example:
+
+    LONG_EXE_NAME -iwad tnt.wad
+#else
+LONG_GAME_NAME needs to know where to find your IWAD file. To do this,
+do one of the following:
+
+#if _WIN32
+ * Within Explorer, simply place the IWAD file in the same folder as
+   the LONG_GAME_NAME files, and double-click `LONG_EXE_NAME.exe`.
+
+ * Run LONG_GAME_NAME from the command prompt with the `-iwad` command
+   line parameter to specify the IWAD file to use, eg.
+
+       LONG_EXE_NAME -iwad c:\games\DEFAULT_IWAD
+
+ * Set the environment variable DOOMWADDIR to the location of a
+   directory containing your IWAD files.
+
+ * If you have multiple IWADs in different directories, set the
+   environment variable DOOMWADPATH to be a semicolon-separated list
+   of directories to search (similar to the PATH environment
+   variable).
+#else
+ * Run LONG_GAME_NAME from the Unix console with the `-iwad` command
+   line parameter to specify the IWAD file to use, eg.
+
+       LONG_EXE_NAME -iwad /root/DEFAULT_IWAD
+
+ * Put the file into one of the following directories:
+
+     $HOME/.local/share/games/doom
+     /usr/share/doom
+     /usr/share/games/doom
+     /usr/local/share/doom
+     /usr/local/share/games/doom
+
+ * Set the environment variable DOOMWADDIR to specify the path to a
+   directory containing your IWAD files.
+
+ * If you have multiple IWADs in different directories, set the
+   environment variable DOOMWADPATH to be a colon-separated list of
+   directories to search (similar to the Unix PATH environment
+   variable).
+#endif
+#endif
+
+#if DOOM
+# Playing with Freedoom
+
+Freedoom is an open content project to create a Doom engine-based game
+that is entirely free software. The website can be found here:
+
+  https://freedoom.github.io/
+
+Check out the [Chocolate Doom wiki’s page on
+Freedoom](https://www.chocolate-doom.org/wiki/index.php/Freedoom)
+for more information.
+
+# Playing with Chex Quest
+
+Chex Quest is a game based on Doom with some minor modifications that
+was distributed with boxes of Chex cereal in 1997.  It is possible to
+play Chex Quest using LONG_GAME_NAME.  To do this, the following files
+are needed:
+
+ * The IWAD file “chex.wad”, from the Chex Quest CD.
+
+ * The dehacked patch “chex.deh”, which can be found here:
+   https://www.doomworld.com/idgames/themes/chex/chexdeh
+   (themes/chex/chexdeh.zip in your nearest /idgames mirror)
+
+Copy these files into a directory together and use the `-iwad` command
+line parameter to specify the Chex Quest IWAD file:
+
+   LONG_EXE_NAME -iwad chex.wad
+
+#endif
+# Installing upgrades
+
+#if DOOM
+LONG_GAME_NAME requires a version 1.9 IWAD file.  Generally, if you
+install a recent version of Doom you should have a version 1.9 IWAD.
+#elif HERETIC
+LONG_GAME_NAME requires a version 1.2 (Shareware) or version 1.3
+(Shadow of the Serpent Riders) IWAD file.  Generally, if you install a
+recent version of Heretic you should have a version 1.2 or 1.3 IWAD.
+#elif HEXEN
+LONG_GAME_NAME requires a version 1.1 IWAD file.  Generally, if you
+install a recent version of Hexen you should have a version 1.1 IWAD.
+#elif STRIFE
+LONG_GAME_NAME requires a version 1.2 IWAD file.  Generally, if you
+install a recent version of Strife you should have a version 1.2 IWAD.
+Please note that Strife version 1.3 does not update the IWAD, if your
+version.txt file says “STRIFE(TM) VERSION 1.3”, you are still good.
+#endif
+However, if you are installing from a very old CD version or from
+floppy disks, you might find you have an older version.
+
+The most obvious symptom of an out of date IWAD file is that the game
+will exit at the title screen before the demo starts, with the message
+“Demo is from a different game version!”.  If this happens, your IWAD
+file is out of date and you need to upgrade.
+
+Upgrade patches are available that will update your game to the latest
+version, the following sites have the patches:
+
+#if DOOM
+  * http://www.doom2.net/doom2/utils.html
+  * http://www.gamers.org/pub/idgames/idstuff/doom
+  * http://www.gamers.org/pub/idgames/idstuff/doom2
+#elif HERETIC
+  * http://www.gamers.org/pub/idgames/idstuff/heretic
+#elif HEXEN
+  * http://www.gamers.org/pub/idgames/idstuff/hexen
+#elif STRIFE
+  * http://www.gamers.org/pub/idgames/roguestuff
+#endif
+
+Please see the
+[Doom Wiki’s page on game patches](https://doomwiki.org/wiki/Game_patch)
+for more information.
+
+#if _WIN32
+As the patches are binary patches that run as DOS executables, on
+recent 64-bit versions of Windows you will need to use a DOS emulator
+(such as DOSBox) to run them.
+#else
+As the patches are binary patches that run as DOS executables, you
+will need to use a DOS emulator (such as DOSBox) to run them.
+#endif
+
+# Music support
+
+LONG_GAME_NAME includes OPL emulation code that accurately reproduces
+the way that the in-game music sounded under DOS when using an
+Adlib/Soundblaster card. This is, however, not to everyone’s taste.
+
+LONG_GAME_NAME includes a number of different options for better
+quality MIDI playback; see the file README.Music for more details of
+how to set these up.
+
+#if !PRECOMPILED
+When compiling from source, be sure to compile and install Timidity
+before installing SDL2_mixer.
+
+#endif
diff --git a/games/NXDoom/man/Makefile.am b/games/NXDoom/man/Makefile.am
new file mode 100644
index 000000000..2e1e04745
--- /dev/null
+++ b/games/NXDoom/man/Makefile.am
@@ -0,0 +1,226 @@
+SUBDIRS = bash-completion
+
+MANPAGE_GEN_FILES = environ.man           \
+                    iwad_paths.man        \
+                    doom.template         \
+                    heretic.template      \
+                    hexen.template        \
+                    strife.template       \
+                    docgen                \
+                    default.cfg.template  \
+                    extra.cfg.template    \
+                    server.template       \
+                    setup.template
+
+doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
+hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
+hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
+strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
+
+if HAVE_DOC
+
+GENERATED_MAN_PAGES =               \
+           @PROGRAM_PREFIX@doom.6         \
+           default.cfg.5            \
+           @PROGRAM_PREFIX@doom.cfg.5     \
+           @PROGRAM_PREFIX@heretic.6      \
+           heretic.cfg.5            \
+           @PROGRAM_PREFIX@heretic.cfg.5  \
+           @PROGRAM_PREFIX@hexen.6        \
+           hexen.cfg.5              \
+           @PROGRAM_PREFIX@hexen.cfg.5    \
+           @PROGRAM_PREFIX@strife.6       \
+           strife.cfg.5             \
+           @PROGRAM_PREFIX@strife.cfg.5   \
+           @PROGRAM_PREFIX@server.6
+
+SETUP_MAN_PAGES =                          \
+           @PROGRAM_PREFIX@doom-setup.6    \
+           @PROGRAM_PREFIX@heretic-setup.6 \
+           @PROGRAM_PREFIX@hexen-setup.6   \
+           @PROGRAM_PREFIX@strife-setup.6
+
+man_MANS = $(GENERATED_MAN_PAGES)         \
+           $(SETUP_MAN_PAGES)
+
+doomdocs_DATA    = INSTALL.doom    CMDLINE.doom
+hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic
+hexendocs_DATA   = INSTALL.hexen   CMDLINE.hexen
+strifedocs_DATA  = INSTALL.strife  CMDLINE.strife
+
+if HAVE_WINDRES
+
+WIN32=-D_WIN32
+
+doomdocs_DATA += CMDLINE.doom.md
+hereticdocs_DATA += CMDLINE.heretic.md
+hexendocs_DATA += CMDLINE.hexen.md
+strifedocs_DATA += CMDLINE.strife.md
+
+endif
+
+CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
+             $(doomdocs_DATA) $(hereticdocs_DATA) \
+             $(hexendocs_DATA) $(strifedocs_DATA)
+DOCGEN = $(srcdir)/docgen
+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" \
+		     -s "@PACKAGE_NAME@" \
+		     -z "@PACKAGE_SHORTNAME@" \
+		     -v "@VERSION@"
+
+@PROGRAM_PREFIX@doom.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g doom -m $(srcdir)/doom.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/doom > $@
+
+default.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g doom -m $(srcdir)/default.cfg.template \
+                  -c default $(top_srcdir)/src/m_config.c > $@
+
+@PROGRAM_PREFIX@doom.cfg.5: $(top_srcdir)/src extra.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g doom -m $(srcdir)/extra.cfg.template \
+                  -c extended $(top_srcdir)/src/m_config.c > $@
+
+CMDLINE.doom : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/doom
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -p $(srcdir)/CMDLINE.template \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
+
+CMDLINE.doom.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/doom
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -M $(srcdir)/CMDLINE.template.md \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
+
+CMDLINE.doom.wikitext : $(top_srcdir)/src $(top_srcdir)/src/doom
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -w $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
+
+INSTALL.doom: INSTALL.template
+	$(srcdir)/simplecpp -DDOOM $(WIN32) \
+            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
+            -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
+            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
+
+@PROGRAM_PREFIX@heretic.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) heretic.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -g heretic -m $(srcdir)/heretic.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
+
+heretic.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -g heretic -m $(srcdir)/default.cfg.template \
+                  -c default $(top_srcdir)/src/m_config.c > $@
+
+@PROGRAM_PREFIX@heretic.cfg.5: $(top_srcdir)/src extra.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -g heretic -m $(srcdir)/extra.cfg.template \
+                 -c extended $(top_srcdir)/src/m_config.c > $@
+
+CMDLINE.heretic : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/heretic
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -p $(srcdir)/CMDLINE.template \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
+
+CMDLINE.heretic.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/heretic
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -M $(srcdir)/CMDLINE.template.md \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
+
+INSTALL.heretic: INSTALL.template
+	$(srcdir)/simplecpp -DHERETIC $(WIN32) \
+            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Heretic" \
+            -DLONG_EXE_NAME="@PROGRAM_PREFIX@heretic" \
+            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
+
+
+@PROGRAM_PREFIX@hexen.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -g hexen -m $(srcdir)/hexen.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
+
+hexen.cfg.5: $(top_srcdir)/src default.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -g hexen -m $(srcdir)/default.cfg.template \
+                 -c default $(top_srcdir)/src/m_config.c > $@
+
+@PROGRAM_PREFIX@hexen.cfg.5: $(top_srcdir)/src extra.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                 -g hexen -m $(srcdir)/extra.cfg.template \
+                 -c extended $(top_srcdir)/src/m_config.c > $@
+
+CMDLINE.hexen : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/hexen
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -p $(srcdir)/CMDLINE.template \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
+
+CMDLINE.hexen.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/hexen
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -M $(srcdir)/CMDLINE.template.md \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
+
+INSTALL.hexen: INSTALL.template
+	$(srcdir)/simplecpp -DHEXEN $(WIN32) \
+            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Hexen" \
+            -DLONG_EXE_NAME="@PROGRAM_PREFIX@hexen" \
+            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
+
+@PROGRAM_PREFIX@strife.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g strife -m $(srcdir)/strife.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/strife > $@
+
+@PROGRAM_PREFIX@server.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g server -m $(srcdir)/server.template \
+                  $(top_srcdir)/src > $@
+
+$(SETUP_MAN_PAGES): $(top_srcdir)/src $(MANPAGE_GEN_FILES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g $(patsubst @PROGRAM_PREFIX@%-setup.6,%,$@) \
+                  -m $(srcdir)/setup.template \
+                  $(top_srcdir)/src > $@
+
+strife.cfg.5: $(top_srcdir)/src default.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g strife -m $(srcdir)/default.cfg.template \
+                  -c default $(top_srcdir)/src/m_config.c > $@
+
+@PROGRAM_PREFIX@strife.cfg.5: $(top_srcdir)/src extra.cfg.template
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g strife -m $(srcdir)/extra.cfg.template \
+                  -c extended $(top_srcdir)/src/m_config.c > $@
+
+CMDLINE.strife : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/strife
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -p $(srcdir)/CMDLINE.template \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
+
+CMDLINE.strife.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/strife
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -M $(srcdir)/CMDLINE.template.md \
+                  $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
+
+INSTALL.strife: INSTALL.template
+	$(srcdir)/simplecpp -DSTRIFE $(WIN32) \
+            -DLONG_EXE_NAME="@PROGRAM_PREFIX@strife" \
+            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Strife" \
+            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
+
+
+INSTALL: INSTALL.template
+	$(srcdir)//simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
+            -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
+            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
+
+endif
+
+EXTRA_DIST = $(man_MANS) $(MANPAGE_GEN_FILES)        \
+             wikipages                               \
+             CMDLINE.template                        \
+             CMDLINE.template.md                     \
+             INSTALL.template                        \
+             simplecpp
+
diff --git a/games/NXDoom/man/bash-completion/.gitignore b/games/NXDoom/man/bash-completion/.gitignore
new file mode 100644
index 000000000..488df26aa
--- /dev/null
+++ b/games/NXDoom/man/bash-completion/.gitignore
@@ -0,0 +1,5 @@
+*doom
+*heretic
+*hexen
+*strife
+*.template
diff --git a/games/NXDoom/man/bash-completion/Makefile.am b/games/NXDoom/man/bash-completion/Makefile.am
new file mode 100644
index 000000000..a79fe6239
--- /dev/null
+++ b/games/NXDoom/man/bash-completion/Makefile.am
@@ -0,0 +1,52 @@
+bashcompletiondir=@datadir@/bash-completion/completions
+
+BASH_COMPLETION_TEMPLATES = \
+    doom.template \
+    heretic.template \
+    hexen.template \
+    strife.template
+
+if HAVE_BASH_COMPLETION
+
+BASH_COMPLETION_SCRIPTLETS = \
+    @PROGRAM_PREFIX@doom \
+    @PROGRAM_PREFIX@heretic \
+    @PROGRAM_PREFIX@hexen \
+    @PROGRAM_PREFIX@strife
+
+bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS)
+CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS)
+
+DOCGEN = $(top_srcdir)/man/docgen
+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@"
+
+@PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g doom -b doom.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/doom > $@
+
+@PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g heretic -b heretic.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
+
+@PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g hexen -b hexen.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
+
+@PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
+                  -g strife -b strife.template \
+                  $(top_srcdir)/src $(top_srcdir)/src/strife > $@
+
+EXTRA_DIST = \
+    $(BASH_COMPLETION_TEMPLATES) \
+    $(BASH_COMPLETION_SCRIPTLETS)
+
+else
+
+EXTRA_DIST = \
+    $(BASH_COMPLETION_TEMPLATES)
+
+endif
diff --git a/games/NXDoom/man/bash-completion/doom.template.in b/games/NXDoom/man/bash-completion/doom.template.in
new file mode 100644
index 000000000..6db3baf05
--- /dev/null
+++ b/games/NXDoom/man/bash-completion/doom.template.in
@@ -0,0 +1,51 @@
+# bash completion for @PACKAGE_SHORTNAME@ Doom               -*- shell-script -*-
+
+_@PROGRAM_SPREFIX@_doom()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    # Save the previous switch on the command line in the prevsw variable
+    local i prevsw=""
+    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
+        if [[ ${words[i]} == -* ]]; then
+            prevsw=${words[i]}
+        fi
+    done
+
+    # Allow adding more than one file with the same extension to the same switch
+    case $prevsw in
+        -config|-extraconfig)
+            _filedir cfg
+            ;;
+        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
+            _filedir wad
+            ;;
+        -playdemo|-timedemo)
+            _filedir lmp
+            ;;
+        -deh)
+            _filedir '@(bex|deh)'
+            ;;
+    esac
+
+    case $prev in
+        -pack)
+            COMPREPLY=(doom2 tnt plutonia)
+            ;;
+        -gameversion)
+            COMPREPLY=(1.666 1.7 1.8 1.9 ultimate final final2 hacx chex)
+            ;;
+        -setmem)
+            COMPREPLY=(dos622 dos71 dosbox)
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
+    fi
+} &&
+
+complete -F _@PROGRAM_SPREFIX@_doom @PROGRAM_PREFIX@doom
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/bash-completion/heretic.template.in b/games/NXDoom/man/bash-completion/heretic.template.in
new file mode 100644
index 000000000..a46b19cc3
--- /dev/null
+++ b/games/NXDoom/man/bash-completion/heretic.template.in
@@ -0,0 +1,48 @@
+# bash completion for @PACKAGE_SHORTNAME@ Heretic            -*- shell-script -*-
+
+_@PROGRAM_SPREFIX@_heretic()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    # Save the previous switch on the command line in the prevsw variable
+    local i prevsw=""
+    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
+        if [[ ${words[i]} == -* ]]; then
+            prevsw=${words[i]}
+        fi
+    done
+
+    # Allow adding more than one file with the same extension to the same switch
+    case $prevsw in
+        -config|-extraconfig)
+            _filedir cfg
+            ;;
+        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
+            _filedir wad
+            ;;
+        -playdemo|-timedemo)
+            _filedir lmp
+            ;;
+        -deh)
+            _filedir hhe
+            ;;
+    esac
+
+    case $prev in
+        -hhever)
+            COMPREPLY=(1.0 1.2 1.3)
+            ;;
+        -setmem)
+            COMPREPLY=(dos622 dos71 dosbox)
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
+    fi
+} &&
+
+complete -F _@PROGRAM_SPREFIX@_heretic @PROGRAM_PREFIX@heretic
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/bash-completion/hexen.template.in b/games/NXDoom/man/bash-completion/hexen.template.in
new file mode 100644
index 000000000..e93fc71cb
--- /dev/null
+++ b/games/NXDoom/man/bash-completion/hexen.template.in
@@ -0,0 +1,45 @@
+# bash completion for @PACKAGE_SHORTNAME@ Hexen              -*- shell-script -*-
+
+_@PROGRAM_SPREFIX@_hexen()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    # Save the previous switch on the command line in the prevsw variable
+    local i prevsw=""
+    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
+        if [[ ${words[i]} == -* ]]; then
+            prevsw=${words[i]}
+        fi
+    done
+
+    # Allow adding more than one file with the same extension to the same switch
+    case $prevsw in
+        -config|-extraconfig)
+            _filedir cfg
+            ;;
+        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
+            _filedir wad
+            ;;
+        -playdemo|-timedemo)
+            _filedir lmp
+            ;;
+    esac
+
+    case $prev in
+        -gameversion)
+            COMPREPLY=(1.1 1.1r2)
+            ;;
+        -setmem)
+            COMPREPLY=(dos622 dos71 dosbox)
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
+    fi
+} &&
+
+complete -F _@PROGRAM_SPREFIX@_hexen @PROGRAM_PREFIX@hexen
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/bash-completion/strife.template.in b/games/NXDoom/man/bash-completion/strife.template.in
new file mode 100644
index 000000000..a044ef0b7
--- /dev/null
+++ b/games/NXDoom/man/bash-completion/strife.template.in
@@ -0,0 +1,48 @@
+# bash completion for @PACKAGE_SHORTNAME@ Strife             -*- shell-script -*-
+
+_@PROGRAM_SPREFIX@_strife()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    # Save the previous switch on the command line in the prevsw variable
+    local i prevsw=""
+    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
+        if [[ ${words[i]} == -* ]]; then
+            prevsw=${words[i]}
+        fi
+    done
+
+    # Allow adding more than one file with the same extension to the same switch
+    case $prevsw in
+        -config|-extraconfig)
+            _filedir cfg
+            ;;
+        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
+            _filedir wad
+            ;;
+        -playdemo|-timedemo)
+            _filedir lmp
+            ;;
+        -deh)
+            _filedir seh
+            ;;
+    esac
+
+    case $prev in
+        -gameversion)
+            COMPREPLY=(1.2 1.31)
+            ;;
+        -setmem)
+            COMPREPLY=(dos622 dos71 dosbox)
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
+    fi
+} &&
+
+complete -F _@PROGRAM_SPREFIX@_strife @PROGRAM_PREFIX@strife
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/default.cfg.template b/games/NXDoom/man/default.cfg.template
new file mode 100644
index 000000000..5d07322a6
--- /dev/null
+++ b/games/NXDoom/man/default.cfg.template
@@ -0,0 +1,50 @@
+.TH @CFGFILE@ 5 2017-11-30 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@CFGFILE@ \- @PACKAGE_SHORTNAME@ @GAME_UPPER@ configuration file
+.SH DESCRIPTION
+.PP
+\fI@CFGFILE@\fR
+is the configuration file for \fB@PROGRAM_SPREFIX@\-@GAME@\fR(6).  The configuration
+options stored in the file are the same as those stored in the
+original DOS Vanilla @GAME_UPPER@. 
+Extra @PACKAGE_SHORTNAME@ @GAME_UPPER@-specific options are stored in a separate 
+configuration file, \fB@PROGRAM_SPREFIX@\-@GAME@.cfg\fR.
+.PP
+\fI@CFGFILE@\fR is normally stored in the user's home directory,
+as \fI~/.local/share/@PROGRAM_SPREFIX@\-@GAME@/@CFGFILE@\fR.  The path can be
+overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
+Base Directory Specification).
+.PP
+The \fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6) tool provides a simple to use front-end
+for editing \fI@CFGFILE@\fR.
+.SH FILE FORMAT
+The file is a plain-text file, consisting of a list of configuration
+options and their values, separated by whitespace.  Each option is stored
+on a separate line.  Options have different types; an option may have 
+either an integer, floating point or string value.  If the option is
+of a string type, the value is surrounded by quotes (").
+.PP
+For example:
+.RS
+.PP
+.EX
+integer_value                1
+integer_value2               1
+floating_point_value         4.2
+string_value                 "hello world"
+.EE
+.RE
+.PP
+Invalid lines or comments in the file will be ignored, but it is advisable
+not to put them in the file; the file is rewritten from scratch every time
+the game exits, so any invalid lines or comments will be lost.
+.PP
+Some options are used for keyboard key bindings; these are stored as 
+integer values containing the keyboard scan code of the key to be bound to.
+Boolean values are also stored as integers, with a value of zero usually
+indicating "false" and a non-zero value indicating "true".
+@content
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-@GAME@\fR(6),
+\fB@PROGRAM_SPREFIX@\-@GAME@.cfg\fR(5),
+\fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6)
diff --git a/games/NXDoom/man/docgen b/games/NXDoom/man/docgen
new file mode 100755
index 000000000..8760e8f72
--- /dev/null
+++ b/games/NXDoom/man/docgen
@@ -0,0 +1,624 @@
+#!/usr/bin/env python3
+# 
+# Chocolate Doom self-documentation tool.  This works similar to javadoc
+# or doxygen, but documents command line parameters and configuration
+# file values, generating documentation in Unix manpage, wikitext and
+# plain text forms.
+#
+# Comments are read from the source code in the following form:
+#
+#   //!
+#   // @arg <extra arguments>
+#   // @category Category
+#   // @platform <some platform that the parameter is specific to>
+#   //
+#   // Long description of the parameter
+#   //
+#
+#   something_involving = M_CheckParm("-param");
+#
+# For configuration file values:
+#
+#   //! @begin_config_file myconfig
+#
+#   //!
+#   // Description of the configuration file value.
+#   //
+#
+#   CONFIG_VARIABLE_INT(my_variable,       c_variable),
+#
+
+import io
+import sys
+import os
+import re
+import glob
+import getopt
+
+TEXT_WRAP_WIDTH = 78
+INCLUDE_STATEMENT_RE = re.compile(r"@include\s+(\S+)")
+
+# Use appropriate stdout function for Python 2 or 3
+
+def stdout(buf):
+    if sys.version_info.major < 3:
+        sys.stdout.write(buf)
+    else:
+        sys.stdout.buffer.write(buf)
+
+# Find the maximum width of a list of parameters (for plain text output)
+
+def parameter_list_width(params):
+    w = 0
+
+    for p in params:
+        pw = len(p.name) + 5
+
+        if p.args:
+            pw += len(p.args)
+
+        if pw > w:
+            w = pw
+
+    return w
+
+class ConfigFile:
+    def __init__(self, filename):
+        self.filename = filename
+        self.variables = []
+
+    def add_variable(self, variable):
+        self.variables.append(variable)
+
+    def manpage_output(self):
+        result = ".SH CONFIGURATION VARIABLES\n"
+
+        for v in self.variables:
+            result += ".TP\n"
+            result += v.manpage_output()
+
+        return result
+
+    def plaintext_output(self):
+        result = ""
+
+        w = parameter_list_width(self.variables)
+
+        for p in self.variables:
+            result += p.plaintext_output(w)
+
+        result = result.rstrip() + "\n"
+
+        return result
+
+class Category:
+    def __init__(self, description):
+        self.description = description
+        self.params = []
+
+    def add_param(self, param):
+        self.params.append(param)
+
+    # Plain text output
+
+    def plaintext_output(self):
+        result = "=== %s ===\n\n" % self.description
+
+        self.params.sort()
+
+        w = parameter_list_width(self.params)
+
+        for p in self.params:
+            if p.should_show():
+                result += p.plaintext_output(w)
+
+        result = result.rstrip() + "\n"
+
+        return result
+
+    def markdown_output(self):
+        result = "## %s\n\n| Parameter | Description |\n| - | - |\n" % self.description
+
+        self.params.sort()
+
+        for p in self.params:
+            if p.should_show():
+                result += p.markdown_output()
+
+        result = result.rstrip() + "\n"
+
+        return result
+
+    def completion_output(self):
+        result = ""
+
+        self.params.sort()
+
+        for p in self.params:
+            if p.should_show():
+                result += p.completion_output(0)
+
+        result = result.rstrip()
+
+        return result
+
+    def manpage_output(self):
+        result = ".SH " + self.description.upper() + "\n"
+
+        self.params.sort()
+
+        for p in self.params:
+            if p.should_show():
+                result += ".TP\n"
+                result += p.manpage_output()
+
+        return result
+
+    def wiki_output(self):
+        result = "=== %s ===\n" % self.description
+
+        self.params.sort()
+
+        for p in self.params:
+            if p.should_show():
+                result += "; " + p.wiki_output() + "\n"
+
+        # Escape special HTML characters
+
+        result = result.replace("&", "&amp;")
+        result = result.replace("<", "&lt;")
+        result = result.replace(">", "&gt;")
+
+        return result
+
+categories = (
+    (None,      Category("General options")),
+    ("game",    Category("Game start options")),
+    ("video",   Category("Display options")),
+    ("net",     Category("Networking options")),
+    ("mod",     Category("Dehacked and WAD merging")),
+    ("demo",    Category("Demo options")),
+    ("compat",  Category("Compatibility")),
+    ("obscure", Category("Obscure and less-used options")),
+)
+
+wikipages = []
+config_files = {}
+
+# Show options that are in Vanilla Doom? Or only new options?
+
+show_vanilla_options = True
+
+class Parameter:
+    def __lt__(self, other):
+        return self.name < other.name
+
+    def __init__(self):
+        self.text = ""
+        self.name = ""
+        self.args = None
+        self.platform = None
+        self.category = None
+        self.vanilla_option = False
+        self.games = None
+
+    def should_show(self):
+        return not self.vanilla_option or show_vanilla_options
+
+    def add_text(self, text):
+        if len(text) <= 0:
+            pass
+        elif text[0] == "@":
+            match = re.match(r'@(\S+)\s*(.*)', text)
+
+            if not match:
+                raise "Malformed option line: %s" % text
+
+            option_type = match.group(1)
+            data = match.group(2)
+            
+            if option_type == "arg":
+                self.args = data
+            elif option_type == "platform":
+                self.platform = data
+            elif option_type == "category":
+                self.category = data
+            elif option_type == "vanilla":
+                self.vanilla_option = True
+            elif option_type == "game":
+                self.games = re.split(r'\s+', data.strip())
+            else:
+                raise "Unknown option type '%s'" % option_type
+
+        else:
+            self.text += text + " "
+
+    def _games_only_text(self, pattern="(%s only)"):
+        if not match_game and self.games:
+            games_list = ", ".join(map(str.capitalize, self.games))
+            return " " + (pattern % games_list)
+        else:
+            return ""
+
+    def manpage_output(self):
+        if self.args:
+            # Special cases -- GBR is not proud.
+            if self.args == "[<x> <y> | <xy>]":
+                result = ".BR " + self.name + " \\~\\c\n" \
+                    + ".RI [ x\\~y | xy ]\n"
+            elif self.args == "<WxH>":
+                result = ".BI " + self.name + "\\~ W x H\n"
+            elif self.args == "<x> <y>":
+                result = ".BI " + self.name + "\\~ \"x y\"\n"
+            elif self.args == "<files>":
+                result = ".BI " + self.name + "\\~ \"file\\~\\c\n" \
+                    + "\\&.\\|.\\|.\n"
+            elif self.args == "<save-num> <demo-name>":
+                result = ".BI " + self.name \
+                    + "\\~ \"save-num demo-name\"\n"
+            else:
+                self.args = re.sub(r'[<>]', '', self.args)
+                result = ".BI " + self.name + "\\~ " + self.args + "\n"
+        else:
+            result = ".B " + self.name + "\n"
+
+        if self.platform:
+            result += "[%s only] " % self.platform
+
+        escaped = re.sub(r'\\', r'\\\\', self.text)
+
+        result += escaped + self._games_only_text() + "\n"
+
+        return result
+
+    def wiki_output(self):
+        result = self.name
+
+        if self.args:
+            result += " " + self.args
+
+        result += ": "
+
+        result += add_wiki_links(self.text)
+
+        if self.platform:
+            result += "'''(%s only)'''" % self.platform
+        result += self._games_only_text("'''(%s only)'''")
+
+        return result
+
+    def markdown_output(self):
+        if self.args:
+            name = "%s %s" % (self.name, self.args)
+        else:
+            name = "%s" % self.name
+
+        name = name.replace("|", "\\|")
+
+        text = self.text
+        if self.platform:
+            text += " (%s only)" % self.platform
+
+        text = text.replace("|", "\\|")
+
+        result = "| %s | %s |\n" % (name, text)
+
+        # html escape
+        result = result.replace("<", "&lt;")
+        result = result.replace(">", "&gt;")
+
+        return result
+
+    def plaintext_output(self, indent):
+        # Build the first line, with the argument on
+        start = "  " + self.name
+        if self.args:
+            start += " " + self.args
+
+        # pad up to the plaintext width
+        start += " " * (indent - len(start))
+
+        # Build the description text
+        description = self.text
+        if self.platform:
+            description += " (%s only)" % self.platform
+        description += self._games_only_text()
+
+        # Build the complete text for the argument
+        # Split the description into words and add a word at a time
+        result = ""
+        words = [word for word in re.split(r'\s+', description) if word]
+        maxlen = TEXT_WRAP_WIDTH - indent
+        outlines = [[]]
+        for word in words:
+            linelen = sum(len(w) + 1 for w in outlines[-1])
+            if linelen + len(word) > maxlen:
+                outlines.append([])
+            outlines[-1].append(word)
+
+        linesep = "\n" + " " * indent
+
+        return (start +
+                linesep.join(" ".join(line) for line in outlines) +
+                "\n\n")
+
+    def completion_output(self, w):
+
+        result = self.name + " "
+
+        return result
+
+# Read list of wiki pages
+
+def read_wikipages():
+    f = io.open("wikipages", encoding='UTF-8')
+
+    try:
+        for line in f:
+            line = line.rstrip()
+
+            line = re.sub(r'\#.*$', '', line)
+
+            if not re.match(r'^\s*$', line):
+                wikipages.append(line)
+    finally:
+        f.close()
+
+# Add wiki page links
+
+def add_wiki_links(text):
+    def replace_name(m):
+        linktext = m.group(1)
+        if linktext == pagename:
+            return '[[%s]]' % pagename
+        else:
+            return '[[%s|%s]]' % (pagename, linktext)
+
+    for pagename in wikipages:
+        text = re.sub(r'\b(%s)\b' % re.escape(pagename), replace_name,
+                      text, count=0, flags=re.IGNORECASE)
+
+    return text
+
+def add_parameter(param, line, config_file):
+
+    # If we're only targeting a particular game, check this is one of
+    # the ones we're targeting.
+
+    if match_game and param.games and match_game not in param.games:
+        return
+
+    # Is this documenting a command line parameter?
+
+    match = re.search(r'(M_CheckParm(WithArgs)|M_ParmExists)?\s*\(\s*"(.*?)"',
+                      line)
+
+    if match:
+        param.name = match.group(3)
+        category = dict(categories)[param.category]
+        category.add_param(param)
+        return
+
+    # Documenting a configuration file variable?
+
+    match = re.search(r'CONFIG_VARIABLE_\S+\s*\(\s*(\S+?)\),', line)
+
+    if match:
+        param.name = match.group(1)
+        config_file.add_variable(param)
+        return
+
+    raise Exception(param.text)
+
+def process_file(filename):
+
+    current_config_file = None
+
+    f = io.open(filename, encoding='UTF-8')
+
+    try:
+        param = None
+        waiting_for_checkparm = False
+
+        for line in f:
+            line = line.rstrip()
+
+            # Ignore empty lines
+
+            if re.match(r'\s*$', line):
+                continue
+
+            # Currently reading a doc comment?
+
+            if param:
+                # End of doc comment
+
+                if not re.match(r'\s*//', line):
+                    waiting_for_checkparm = True
+
+                # The first non-empty line after the documentation comment
+                # ends must contain the thing being documented.
+
+                if waiting_for_checkparm:
+                    add_parameter(param, line, current_config_file)
+                    param = None
+                else:
+                    # More documentation text
+
+                    munged_line = re.sub(r'\s*\/\/\s*', '', line, count=1)
+                    munged_line = re.sub(r'\s*$', '', munged_line)
+                    param.add_text(munged_line)
+
+            # Check for start of a doc comment
+
+            if re.search("//!", line):
+                match = re.search(r"@begin_config_file\s*(\S+)", line)
+
+                if match:
+                    # Beginning a configuration file
+                    tagname = match.group(1)
+                    current_config_file = ConfigFile(tagname)
+                    config_files[tagname] = current_config_file
+                else:
+                    # Start of a normal comment
+                    param = Parameter()
+                    waiting_for_checkparm = False
+    finally:
+        f.close()
+
+def process_files(path):
+    # Process all C source files.
+
+    if os.path.isdir(path):
+        files = glob.glob(path + "/*.c")
+
+        for filename in files:
+            process_file(filename)
+    else:
+        # Special case to allow a single file to be specified as a target
+
+        process_file(path)
+
+def print_template(template_file, substs, content):
+    f = io.open(template_file, encoding='UTF-8')
+
+    try:
+        for line in f:
+            match = INCLUDE_STATEMENT_RE.search(line)
+            if match:
+                filename = match.group(1)
+                filename = os.path.join(os.path.dirname(template_file),
+                                        filename)
+                print_template(filename, substs, content)
+            else:
+                line = line.replace("@content", content)
+                for k,v in substs.items():
+                    line = line.replace(k,v)
+                stdout(line.rstrip().encode('UTF-8') + b'\n')
+    finally:
+        f.close()
+
+def manpage_output(targets, substs, template_file):
+
+    content = ""
+
+    for t in targets:
+        content += t.manpage_output()
+
+    content = content.replace("-", "\\-")
+
+    print_template(template_file, substs, content)
+
+def wiki_output(targets, _, template):
+    read_wikipages()
+
+    for t in targets:
+        stdout(t.wiki_output().encode('UTF-8') + b'\n')
+
+def markdown_output(targets, substs, template_file):
+    content = ""
+
+    for t in targets:
+        content += t.markdown_output() + "\n"
+
+    print_template(template_file, substs, content)
+
+def plaintext_output(targets, substs, template_file):
+
+    content = ""
+
+    for t in targets:
+        content += t.plaintext_output() + "\n"
+
+    print_template(template_file, substs, content)
+
+def completion_output(targets, substs, template_file):
+
+    content = ""
+
+    for t in targets:
+        content += t.completion_output() + "\n"
+
+    print_template(template_file, substs, content)
+
+def usage():
+    print("Usage: %s [-V] [-c tag] [-g game] -n program_name -s package_name [ -z shortname ] ( -M | -m | -w | -p ) <dir>..." \
+            % sys.argv[0])
+    print("   -c :  Provide documentation for the specified configuration file")
+    print("         (matches the given tag name in the source file)")
+    print("   -s :  Package name, e.g. Chocolate Doom (for substitution)")
+    print("   -z :  Package short-name, e.g. Chocolate (for substitution)")
+    print("   -v :  Package version, e.g. 7.0 (for substitution)")
+    print("   -n :  Program name, e.g. chocolate (for substitution)")
+    print("   -M :  Markdown output")
+    print("   -m :  Manpage output")
+    print("   -w :  Wikitext output")
+    print("   -p :  Plaintext output")
+    print("   -b :  Bash-Completion output")
+    print("   -V :  Don't show Vanilla Doom options")
+    print("   -g :  Only document options for specified game.")
+    sys.exit(0)
+
+# Parse command line
+
+opts, args = getopt.getopt(sys.argv[1:], "n:s:z:v:M:m:wp:b:c:g:V")
+
+output_function = None
+template = None
+doc_config_file = None
+match_game = None
+substs = {}
+
+for opt in opts:
+    if opt[0] == "-n":
+        substs["@PROGRAM_SPREFIX@"] = opt[1]
+    if opt[0] == "-s":
+        substs["@PACKAGE_NAME@"] = opt[1]
+    if opt[0] == "-z":
+        substs["@PACKAGE_SHORTNAME@"] = opt[1]
+    if opt[0] == "-v":
+        substs["@VERSION@"] = opt[1]
+    if opt[0] == "-m":
+        output_function = manpage_output
+        template = opt[1]
+    elif opt[0] == "-M":
+        output_function = markdown_output
+        template = opt[1]
+    elif opt[0] == "-w":
+        output_function = wiki_output
+    elif opt[0] == "-p":
+        output_function = plaintext_output
+        template = opt[1]
+    elif opt[0] == "-b":
+        output_function = completion_output
+        template = opt[1]
+    elif opt[0] == "-V":
+        show_vanilla_options = False
+    elif opt[0] == "-c":
+        doc_config_file = opt[1]
+    elif opt[0] == "-g":
+        match_game = opt[1]
+        substs["@GAME@"] = opt[1]
+        substs["@GAME_UPPER@"] = opt[1].title()
+        if "doom" == opt[1]:
+            substs["@CFGFILE@"] = "default.cfg"
+        else:
+            substs["@CFGFILE@"] = opt[1] + ".cfg"
+
+if output_function == None or len(args) < 1:
+    usage()
+else:
+    # Process specified files
+
+    for path in args:
+        process_files(path)
+
+    # Build a list of things to document
+    if doc_config_file:
+        documentation_targets = [config_files[doc_config_file]]
+    else:
+        documentation_targets = [c for _, c in categories]
+
+    # Generate the output
+    output_function(documentation_targets, substs, template)
+
diff --git a/games/NXDoom/man/doom.template b/games/NXDoom/man/doom.template
new file mode 100644
index 000000000..bbf1c62aa
--- /dev/null
+++ b/games/NXDoom/man/doom.template
@@ -0,0 +1,45 @@
+.TH @PROGRAM_SPREFIX@\-doom 6 2018-01-09 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-doom \- historically compatible Doom engine
+.SH SYNOPSIS
+.B @PROGRAM_SPREFIX@\-doom
+.RI [ options ]
+.SH DESCRIPTION
+.PP
+@PACKAGE_SHORTNAME@ Doom is a port of Id Software's 1993 game
+.I Doom
+that is designed to behave as similarly to the original DOS version of
+Doom as is possible.
+@content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+.SH ENVIRONMENT
+This section describes environment variables that control
+@PACKAGE_SHORTNAME@ Doom's behavior.
+@include environ.man
+.SH FILES
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/default.cfg
+The main configuration file for @PACKAGE_NAME@.
+See \fBdefault.cfg\fR(5).
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-doom.cfg
+Extra configuration values that are specific to @PACKAGE_NAME@ and not
+present in Vanilla Doom.
+See \fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5).
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-server\fR(6),
+\fB@PROGRAM_SPREFIX@\-setup\fR(6),
+\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
+\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
+\fB@PROGRAM_SPREFIX@\-strife\fR(6)
+.SH AUTHOR
+Chocolate Doom is written and maintained by Simon Howard.
+It is based on the LinuxDoom source code, released by Id Software.
+.SH COPYRIGHT
+Copyright \(co id Software Inc.
+Copyright \(co 2005-2016 Simon Howard.
+.PP
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/environ.man b/games/NXDoom/man/environ.man
new file mode 100644
index 000000000..414f5037e
--- /dev/null
+++ b/games/NXDoom/man/environ.man
@@ -0,0 +1,34 @@
+.TP
+.I DOOMWADDIR
+.TQ
+.I DOOMWADPATH
+See section \(lqIWAD SEARCH PATHS\(rq above.
+.TP
+.I PCSOUND_DRIVER
+When running in PC speaker sound effect mode, this environment variable
+specifies a PC speaker driver to use for sound effect playback.
+Valid options are
+.RB \(lq Linux \(rq
+for the Linux console mode driver,
+.RB \(lq BSD \(rq
+for the NetBSD/OpenBSD PC speaker driver,
+and
+.RB \(lq SDL \(rq
+for SDL-based emulated PC speaker playback (using the digital output).
+.TP
+.I OPL_DRIVER
+When using OPL MIDI playback, this environment variable specifies an
+OPL backend driver to use.
+Valid options are
+.RB \(lq SDL \(rq
+for an SDL-based software emulated OPL chip,
+.RB \(lq Linux \(rq
+for the Linux hardware OPL driver,
+and
+.RB \(lq OpenBSD \(rq
+for the OpenBSD/NetBSD hardware OPL driver.
+.IP
+Generally speaking, a real hardware OPL chip sounds better than software
+emulation; however, modern machines do not often include one.
+If present, it may still require extra work to set up and elevated
+security privileges to access.
diff --git a/games/NXDoom/man/extra.cfg.template b/games/NXDoom/man/extra.cfg.template
new file mode 100644
index 000000000..de6f40666
--- /dev/null
+++ b/games/NXDoom/man/extra.cfg.template
@@ -0,0 +1,28 @@
+.TH @PROGRAM_SPREFIX@\-@GAME@.cfg 5 2024-01-23 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-@GAME@.cfg \- @PACKAGE_SHORTNAME@ @GAME_UPPER@ configuration file
+.SH DESCRIPTION
+.PP
+\fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR
+is a configuration file for \fB@PROGRAM_SPREFIX@\-@GAME@\fR(6).  This file acts
+as an auxiliary configuration file; the main configuration options
+are stored in \fB@CFGFILE@\fR, which contains the same configuration
+options as Vanilla @GAME_UPPER@ (for compatibility).  \fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR
+contains configuration options that are specific to @PACKAGE_SHORTNAME@\-@GAME_UPPER@
+only.
+.PP
+\fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR is normally stored in the user's home directory,
+as \fI~/.local/share/@PROGRAM_SPREFIX@\-@GAME@/@PROGRAM_SPREFIX@\-@GAME@.cfg\fR.  The path can be
+overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
+Base Directory Specification).
+.PP
+The \fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6) tool provides a simple to use front-end
+for editing \fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR.
+.SH FILE FORMAT
+.PP
+The file format is the same as that used for \fB@CFGFILE@\fR(5).
+@content
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-@GAME@\fR(6),
+\fB@CFGFILE@\fR(5),
+\fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6)
diff --git a/games/NXDoom/man/heretic.template b/games/NXDoom/man/heretic.template
new file mode 100644
index 000000000..394af6104
--- /dev/null
+++ b/games/NXDoom/man/heretic.template
@@ -0,0 +1,47 @@
+.TH @PROGRAM_SPREFIX@\-heretic 6 2017-11-27 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-heretic \- historically compatible Heretic engine
+.SH SYNOPSIS
+.B @PROGRAM_SPREFIX@\-heretic
+.RI [ options ]
+.SH DESCRIPTION
+.PP
+@PACKAGE_SHORTNAME@ Heretic is a port of Raven Software's 1994 game
+.I Heretic
+that aims to behave as similar to the original DOS version of Heretic as
+possible.
+@content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+.SH ENVIRONMENT
+This section describes environment variables that control
+@PACKAGE_SHORTNAME@ Heretic's behavior.
+@include environ.man
+.SH FILES
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/heretic.cfg
+The main configuration file for @PACKAGE_SHORTNAME@ Heretic.
+See \fBheretic.cfg\fR(5).
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-heretic.cfg
+Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Heretic and not
+present in Vanilla Heretic.
+See \fB@PROGRAM_SPREFIX@\-heretic.cfg\fR(5).
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
+\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
+\fB@PROGRAM_SPREFIX@\-server\fR(6),
+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
+.SH AUTHOR
+Chocolate Heretic is part of the Chocolate Doom project, written and
+maintained by Simon Howard.
+It is based on the Heretic source code,
+released by Raven Software.
+.SH COPYRIGHT
+Copyright \(co id Software Inc.
+Copyright \(co Raven Software Inc.
+Copyright \(co 2005-2013 Simon Howard.
+.PP
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/hexen.template b/games/NXDoom/man/hexen.template
new file mode 100644
index 000000000..22e900f01
--- /dev/null
+++ b/games/NXDoom/man/hexen.template
@@ -0,0 +1,47 @@
+.TH @PROGRAM_SPREFIX@\-hexen 6 2017-11-27 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-hexen \- historically compatible Hexen engine
+.SH SYNOPSIS
+.B @PROGRAM_SPREFIX@\-hexen
+.RI [ options ]
+.SH DESCRIPTION
+.PP
+@PACKAGE_SHORTNAME@ Hexen is a port of Raven Software's 1995 game
+.I Hexen
+that aims to behave as similar to the original DOS version of Hexen as
+possible.
+@content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+.SH ENVIRONMENT
+This section describes environment variables that control
+@PACKAGE_SHORTNAME@ Hexen's behavior.
+@include environ.man
+.SH FILES
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/hexen.cfg
+The main configuration file for @PACKAGE_SHORTNAME@ Hexen.
+See \fBhexen.cfg\fR(5).
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-hexen.cfg
+Extra configuration values that are specific to @PACKAGE_SHORTNAME@
+Hexen and not present in Vanilla Hexen.
+See \fB@PROGRAM_SPREFIX@\-hexen.cfg\fR(5).
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
+\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
+\fB@PROGRAM_SPREFIX@\-server\fR(6),
+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
+.SH AUTHOR
+Chocolate Hexen is part of the Chocolate Doom project, written and
+maintained by Simon Howard.
+It is based on the Hexen source code,
+released by Raven Software.
+.SH COPYRIGHT
+Copyright \(co id Software Inc.
+Copyright \(co Raven Software Inc.
+Copyright \(co 2005-2013 Simon Howard.
+.PP
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/iwad_paths.man b/games/NXDoom/man/iwad_paths.man
new file mode 100644
index 000000000..5b4268094
--- /dev/null
+++ b/games/NXDoom/man/iwad_paths.man
@@ -0,0 +1,73 @@
+To play, an IWAD file is needed.
+This is a large file containing all of the levels, graphics,
+sound effects, music and other material that make up the game.
+IWAD files are named according to the game; the standard names are:
+.TP
+.IR doom.wad ,\~\c
+.IR doom1.wad ,\~\c
+.IR doom2.wad ,\~\c
+.IR tnt.wad ,\~\c
+.I plutonia.wad
+Doom, Doom II, Final Doom
+.TP
+.IR heretic.wad ,\~\c
+.IR hexen.wad ,\~\c
+.I strife.wad
+Heretic, Hexen and Strife (commercial Doom engine games).
+.TP
+.IR hacx.wad ,\~\c
+.I chex.wad
+Hacx and Chex Quest - more obscure games based on the Doom engine.
+.TP
+.IR freedm.wad ,\~\c
+.IR freedoom1.wad ,\~\c
+.I freedoom2.wad
+The Freedoom open content IWAD files.
+.LP
+The following directory paths are searched in order to find an IWAD:
+.TP
+Current working directory
+Any IWAD files found in the current working directory will be used in
+preference to IWADs found in any other directories.
+.TP
+.I DOOMWADDIR
+This environment variable can be set to contain a path to a single
+directory in which to look for IWAD files.
+This environment variable is supported by most Doom source ports.
+.TP
+.I DOOMWADPATH
+This environment variable, if set, can contain a colon-separated list of
+directories in which to look for IWAD files, or alternatively full paths to
+specific IWAD files.
+.TP
+.I $HOME/.local/share/games/doom
+Writeable directory in the user's home directory.
+The path can be overridden using the
+.I \%XDG_DATA_HOME
+environment variable (see the XDG Base Directory Specification).
+.TP
+.I /usr/local/share/doom
+.TQ
+.I /usr/local/share/games/doom
+.TQ
+.I /usr/share/doom
+.TQ
+.I /usr/share/games/doom
+System-wide locations that can be accessed by all users.
+The path
+.I /usr/share/games/doom
+is a standard path that is supported by most Doom source ports.
+These paths can be overridden using the
+.I \%XDG_DATA_DIRS
+environment variable (see the XDG Base Directory Specification).
+.LP
+The above can be overridden on a one-time basis by using the
+.B \-iwad
+command line parameter to provide the path to an IWAD file to use.This
+parameter can also be used to specify the name of a particular IWAD to use
+from one of the above paths.
+For example,
+.RB \(lq "\-iwad doom.wad" \(rq
+will search the above paths for the file
+.I doom.wad
+to use.
diff --git a/games/NXDoom/man/server.template b/games/NXDoom/man/server.template
new file mode 100644
index 000000000..7ce2a3b37
--- /dev/null
+++ b/games/NXDoom/man/server.template
@@ -0,0 +1,55 @@
+.TH @PROGRAM_SPREFIX@\-server 6 2018-01-15 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-server \- dedicated server for @PROGRAM_SPREFIX@\-doom
+.SH SYNOPSIS
+.B @PROGRAM_SPREFIX@\-server
+.RI [ options ]
+.SH DESCRIPTION
+.PP
+@PACKAGE_NAME@ is a modern Doom engine designed to behave
+as similarly to the original Doom game as is possible.
+.PP
+.I \%@PROGRAM_SPREFIX@\-server
+is a dedicated server for @PACKAGE_SHORTNAME@.
+It is equivalent to running
+\fB@PROGRAM_SPREFIX@-doom\fR(6)
+with the
+.B \%\-dedicated
+option.
+.PP
+Game options are not specified to the server, which merely acts to
+retransmit data between players in the game; parameters for the
+game should be specified by the first player to connect to the server,
+who is designated the controlling player.
+.SH OPTIONS
+.TP
+.B \-ignoreversion
+Ignore version mismatches between the server and the client.
+Using this option may cause game desyncs to occur,
+or differences in protocol may mean the netgame will simply not function
+at all.
+.TP
+.BI \-port\~ n
+Use UDP port
+.I n
+for communications instead of the default (2342).
+.TP
+.B \-privateserver
+Don't register with the global master server.
+.TP
+.BI \-servername\~ name
+Specify a name for the server.
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@-doom\fR(6),
+\fB@PROGRAM_SPREFIX@-setup\fR(6)
+.SH AUTHOR
+Chocolate Doom is written and maintained by Simon Howard.
+.PP
+This manual was written by Jonathan Dowland.
+.SH COPYRIGHT
+Copyright \(co id Software Inc.
+Copyright \(co 2005-8 Simon Howard.
+.PP
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/setup.template b/games/NXDoom/man/setup.template
new file mode 100644
index 000000000..1fd057c66
--- /dev/null
+++ b/games/NXDoom/man/setup.template
@@ -0,0 +1,46 @@
+.TH @PROGRAM_SPREFIX@\-@GAME@-setup 6 2017-11-30 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-@GAME@-setup \- configuration tool for @PROGRAM_SPREFIX@\-@GAME@
+.SH SYNOPSIS
+.B @PROGRAM_SPREFIX@\-@GAME@-setup
+.RI [ options ]
+.SH DESCRIPTION
+.PP
+@PACKAGE_SHORTNAME@ @GAME_UPPER@ is a modern @GAME_UPPER@ engine
+designed to behave as similarly to the original @GAME_UPPER@ game as is
+possible.
+.PP
+.I @PROGRAM_SPREFIX@\-@GAME@-setup
+is a tool for configuring @PACKAGE_SHORTNAME@ @GAME_UPPER@.
+It provides a menu-based interface for the display, joystick, keyboard,
+mouse, sound and compatibility settings.
+.PP
+.I @PROGRAM_SPREFIX@\-@GAME@-setup
+can also be used to start and join network games.
+.PP
+.SH OPTIONS
+.TP
+.BI \-config\~ file
+Load configuration from the specified file,
+instead of
+.IR @CFGFILE@ .
+.TP
+.BI \-extraconfig\~ file
+Load extra configuration from the specified file,
+instead of
+.IR @PROGRAM_SPREFIX@\-@GAME@.cfg .
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-@GAME@\fR(6),
+\fBdefault.cfg\fR(5),
+\fB@PROGRAM_SPREFIX@\-@GAME@.cfg\fR(5)
+.SH AUTHOR
+Chocolate Doom is written and maintained by Simon Howard.
+.PP
+This manual was written by Jonathan Dowland.
+.SH COPYRIGHT
+Copyright \(co id Software Inc.
+Copyright \(co 2005-8 Simon Howard.
+.PP
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/simplecpp b/games/NXDoom/man/simplecpp
new file mode 100755
index 000000000..7749c269a
--- /dev/null
+++ b/games/NXDoom/man/simplecpp
@@ -0,0 +1,228 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Contributors to the Freedoom project.  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 freedoom project 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.
+#
+#
+# simple cpp-style preprocessor
+#
+# Understands most features of the C preprocessor, including:
+#    #if .. #elif .. #else .. #endif
+#        - with expressions
+#    #ifdef
+#    #define
+#    #include
+#
+
+import collections
+import io
+import sys
+import re
+
+debug = False
+defines = collections.defaultdict(lambda: False)
+
+command_re = re.compile(r"\#(\w+)(\s+(.*))?")
+include_re = re.compile(r"\s*\"(.*)\"\s*")
+define_re = re.compile(r"\s*(\S+)\s*(.*?)\s*$")
+
+def debug_msg(message):
+	if debug:
+		sys.stderr.write(message)
+
+# Parse command line options
+
+def parse_cmdline():
+	for arg in sys.argv[1:]:
+		if not arg.startswith("-D"):
+			continue
+
+		name = arg[2:]
+		if '=' in name:
+			name, value = name.split('=', 1)
+		else:
+			value = True
+
+		defines[name] = value
+
+def parse_stream(stream):
+	result = read_block(stream, False)
+
+	if result is not None:
+		raise Exception("Mismatched #if in '%s'" % stream.name)
+
+def parse_file(filename):
+	f = io.open(filename, encoding='UTF-8')
+
+	try:
+		parse_stream(f)
+	finally:
+		f.close()
+
+# Evaluate an expression using Python's eval() function.
+
+def eval_expr(expr):
+	expr = expr.replace("||", " or ")   \
+	           .replace("&&", " and ")  \
+	           .replace("!", "not ")
+
+	code = compile(expr, "", "eval")
+	result = eval(code, {}, defines)
+	return result
+
+# #include
+
+def cmd_include(arg):
+	# Extract the filename
+
+	match = include_re.match(arg)
+
+	if not match:
+		raise Exception("Invalid 'include' command")
+
+	filename = match.group(1)
+
+	# Open the file and process it
+
+	parse_file(filename)
+
+# #define
+
+def cmd_define(arg):
+	match = define_re.match(arg)
+	name = match.group(1)
+	value = match.group(2)
+	if value == '':
+		value = True
+
+	defines[name] = value
+
+# #undef
+
+def cmd_undef(arg):
+	if arg in defines:
+		del defines[arg]
+
+# #ifdef/#ifndef
+
+def cmd_ifdef(arg, command, stream, ignore):
+
+	# Get the define name
+
+	debug_msg("%s %s >\n" % (command, arg))
+
+	# Should we ignore the contents of this block?
+
+	sub_ignore = not eval_expr(arg)
+
+	if "n" in command:
+		sub_ignore = not sub_ignore
+
+	# Parse the block
+
+	result, newarg = read_block(stream, ignore or sub_ignore)
+
+	debug_msg("%s %s < (%s)\n" % (command, arg, result))
+
+	# There may be a second "else" block to parse:
+
+	if result == "else":
+		debug_msg("%s %s else >\n" % (command, arg))
+		result, arg = read_block(stream, ignore or (not sub_ignore))
+		debug_msg("%s %s else < (%s)\n" % (command, arg, result))
+
+	if result == "elif":
+		debug_msg("%s %s elif %s>\n" % (command, arg, newarg))
+		cmd_ifdef(newarg, "if", stream, ignore or (not sub_ignore))
+		result = "endif"
+
+	# Should end in an endif:
+
+	if result != "endif":
+		raise Exception("'if' block did not end in an 'endif'")
+
+commands = {
+	"include" : cmd_include,
+	"define"  : cmd_define,
+	"undef"   : cmd_undef,
+	"if"      : cmd_ifdef,
+	"ifdef"   : cmd_ifdef,
+	"ifn"     : cmd_ifdef,
+	"ifndef"  : cmd_ifdef,
+}
+
+# Recursive block reading function
+# if 'ignore' argument is 1, contents are ignored
+
+def read_block(stream, ignore):
+
+	for line in stream:
+
+		# Remove newline
+
+		line = line[0:-1]
+
+		# Check if this line has a command
+
+		match = command_re.match(line)
+
+		if match:
+			command = match.group(1)
+			arg = match.group(3)
+
+			if command in ("else", "elif", "endif"):
+				return (command, arg)
+			elif command not in commands:
+				raise Exception("Unknown command: '%s'" % \
+						command)
+
+			# Get the callback function.
+
+			func = commands[command]
+
+			# Invoke the callback function. #ifdef commands
+			# are a special case and need extra arguments.
+			# Other commands are only executed if we are not
+			# ignoring this block.
+
+			if func == cmd_ifdef:
+				cmd_ifdef(arg, command=command,
+					       stream=stream,
+					       ignore=ignore)
+			elif not ignore:
+				func(arg)
+		else:
+			if not ignore:
+				for key, value in defines.items():
+					if isinstance(value, str):
+						line = line.replace(key, value)
+				print(line)
+
+parse_cmdline()
+parse_stream(sys.stdin)
+
diff --git a/games/NXDoom/man/strife.template b/games/NXDoom/man/strife.template
new file mode 100644
index 000000000..51defaecb
--- /dev/null
+++ b/games/NXDoom/man/strife.template
@@ -0,0 +1,91 @@
+.TH @PROGRAM_SPREFIX@\-strife 6 2018-01-15 "@PACKAGE_NAME@ @VERSION@"
+.SH NAME
+@PROGRAM_SPREFIX@\-strife \- historically compatible Strife engine
+.SH SYNOPSIS
+.B @PROGRAM_SPREFIX@\-strife
+.RI [ options ]
+.SH DESCRIPTION
+.PP
+@PACKAGE_SHORTNAME@ Strife is an accurate and complete recreation of
+Rogue Entertainment's
+.IR "Strife: Quest for the Sigil" .
+It was created through
+more than two years of reverse engineering effort with the blessings
+of the original programmers of the game;
+see section \(lqHISTORY\(rq below.
+@content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+.SH ENVIRONMENT
+This section describes environment variables that control
+@PACKAGE_SHORTNAME@ Strife's behavior.
+@include environ.man
+.SH FILES
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/strife.cfg
+The main configuration file for @PACKAGE_SHORTNAME@ Strife.
+See \fBstrife.cfg\fR(5).
+.TP
+.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-strife.cfg
+Extra configuration values that are specific to @PACKAGE_SHORTNAME@
+Strife and not present in Vanilla Strife.
+See \fB@PROGRAM_SPREFIX@\-strife.cfg\fR(5).
+.SH SEE ALSO
+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
+\fB@PROGRAM_SPREFIX@\-server\fR(6),
+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
+.SH HISTORY
+The source code for Strife was lost, which means, unlike the code for
+all the other commercial games using the Doom engine, it cannot be
+released.
+The only access we have to the code is the binary executable file.
+Reverse engineering tools were employed to disassemble and decompile the
+executables, which were cross-referenced against the Linux Doom and
+DOS Heretic sources and painstakingly combed over multiple times,
+instruction by instruction, to ensure that the resulting
+Chocolate-Doom-based executable is as close as possible to the original.
+.SH LEGALITY
+Reverse engineering is a protected activity so long as the original code
+is not used directly in the product.
+Due to the vast amount of information lost through the process of
+compilation, and the need to refactor large portions of code in order to
+eliminate non-portable idioms or to adapt them properly to Chocolate
+Doom's framework, the resulting code behaves the same, but is not the
+.I same
+code.
+.PP
+In addition, James Monroe and John Carmack have both stated that they
+have no objections to the project.
+Because they are the original authors of the code, and neither Rogue nor
+their publisher, Velocity, Inc., exist any longer as legal entities,
+this is effectively legal permission.
+.SH BUGS
+@PACKAGE_SHORTNAME@ Strife is almost, but not entirely perfect, in
+recreating the behavior of Vanilla Strife.
+Help us by reporting any discrepancies you might notice between this
+executable and the vanilla DOS program.
+.PP
+However, do
+.I not
+report any glitch that you can replicate in the vanilla EXE as a bug.
+The point of @PACKAGE_SHORTNAME@ Strife, like Chocolate Doom before it,
+is to be as bug-compatible with the original game as possible.
+Also be aware that some glitches are impossible to compatibly recreate,
+and wherever this is the case, @PACKAGE_SHORTNAME@ Strife has erred on
+the side of not crashing the program, for example by initializing
+pointers to
+.I NULL
+rather than using them without setting a value first.
+.SH AUTHORS
+Chocolate Strife is part of the Chocolate Doom project.
+It was reverse engineered from the DOS versions of Strife by James Haley
+and Samuel Villarreal.
+Chocolate Doom was written and maintained by Simon Howard, and is based
+on the LinuxDoom source code released by Id Software.
+.SH COPYRIGHT
+Copyright \(co id Software Inc.
+Copyright \(co 2005-2013 Simon Howard, James Haley, Samuel Villarreal.
+.PP
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/wikipages b/games/NXDoom/man/wikipages
new file mode 100644
index 000000000..429c47dde
--- /dev/null
+++ b/games/NXDoom/man/wikipages
@@ -0,0 +1,7 @@
+# This is a list of wiki pages to automatically link to when generating
+# wikitext output.
+Dehacked
+Doom 1.91
+Merging
+Multiplayer
+Three screen mode
diff --git a/games/NXDoom/opl/.gitignore b/games/NXDoom/opl/.gitignore
new file mode 100644
index 000000000..8aac4e778
--- /dev/null
+++ b/games/NXDoom/opl/.gitignore
@@ -0,0 +1,7 @@
+Makefile.in
+Makefile
+.deps
+libopl.a
+*.rc
+tags
+TAGS
diff --git a/games/NXDoom/opl/CMakeLists.txt b/games/NXDoom/opl/CMakeLists.txt
new file mode 100644
index 000000000..289ca279d
--- /dev/null
+++ b/games/NXDoom/opl/CMakeLists.txt
@@ -0,0 +1,28 @@
+add_library(opl STATIC
+            opl_internal.h
+            opl.c           opl.h
+            opl_linux.c
+            opl_obsd.c
+            opl_queue.c     opl_queue.h
+            opl_sdl.c
+            opl_timer.c     opl_timer.h
+            opl_win32.c
+            ioperm_sys.c    ioperm_sys.h
+            opl3.c          opl3.h)
+target_include_directories(opl
+                           INTERFACE "."
+                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+if (DEFINED EMSCRIPTEN)
+    if(ENABLE_SDL2_MIXER)
+        set_target_properties(opl PROPERTIES COMPILE_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
+        set_target_properties(opl PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
+    else()
+        set_target_properties(opl PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
+        set_target_properties(opl PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+    endif()
+else()
+    target_link_libraries(opl SDL2::SDL2)
+    if(ENABLE_SDL2_MIXER)
+        target_link_libraries(opl SDL2_mixer::SDL2_mixer)
+    endif()
+endif()
diff --git a/games/NXDoom/opl/Makefile.am b/games/NXDoom/opl/Makefile.am
new file mode 100644
index 000000000..430953e33
--- /dev/null
+++ b/games/NXDoom/opl/Makefile.am
@@ -0,0 +1,21 @@
+
+AM_CFLAGS=@SDLMIXER_CFLAGS@
+
+EXTRA_DIST=CMakeLists.txt
+
+SUBDIRS = . examples
+
+noinst_LIBRARIES=libopl.a
+
+libopl_a_SOURCES =                                \
+                            opl_internal.h        \
+        opl.c               opl.h                 \
+        opl_linux.c                               \
+        opl_obsd.c                                \
+        opl_queue.c         opl_queue.h           \
+        opl_sdl.c                                 \
+        opl_timer.c         opl_timer.h           \
+        opl_win32.c                               \
+        ioperm_sys.c        ioperm_sys.h          \
+        opl3.c              opl3.h
+
diff --git a/games/NXDoom/opl/examples/.gitignore b/games/NXDoom/opl/examples/.gitignore
new file mode 100644
index 000000000..4d589c738
--- /dev/null
+++ b/games/NXDoom/opl/examples/.gitignore
@@ -0,0 +1,7 @@
+Makefile.in
+Makefile
+.deps
+droplay
+*.exe
+tags
+TAGS
diff --git a/games/NXDoom/opl/examples/Makefile.am b/games/NXDoom/opl/examples/Makefile.am
new file mode 100644
index 000000000..9afcd513c
--- /dev/null
+++ b/games/NXDoom/opl/examples/Makefile.am
@@ -0,0 +1,8 @@
+
+AM_CFLAGS = -I$(top_srcdir)/opl
+
+noinst_PROGRAMS=droplay
+
+droplay_LDADD = ../libopl.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@
+droplay_SOURCES = droplay.c
+
diff --git a/games/NXDoom/opl/examples/droplay.c b/games/NXDoom/opl/examples/droplay.c
new file mode 100644
index 000000000..16e10c3c9
--- /dev/null
+++ b/games/NXDoom/opl/examples/droplay.c
@@ -0,0 +1,210 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Demonstration program for OPL library to play back DRO
+//     format files.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL.h"
+
+#include "opl.h"
+
+#define HEADER_STRING "DBRAWOPL"
+#define ADLIB_PORT 0x388
+
+void WriteReg(unsigned int reg, unsigned int val)
+{
+    int i;
+
+    // This was recorded from an OPL2, but we are probably playing
+    // back on an OPL3, so we need to enable the original OPL2
+    // channels.  Doom does this already, but other games don't.
+
+    if ((reg & 0xf0) == OPL_REGS_FEEDBACK)
+    {
+        val |= 0x30;
+    }
+
+    OPL_WritePort(OPL_REGISTER_PORT, reg);
+
+    for (i=0; i<6; ++i)
+    {
+        OPL_ReadPort(OPL_REGISTER_PORT);
+    }
+
+    OPL_WritePort(OPL_DATA_PORT, val);
+
+    for (i=0; i<35; ++i)
+    {
+        OPL_ReadPort(OPL_REGISTER_PORT);
+    }
+}
+
+void ClearAllRegs(void)
+{
+    int i;
+
+    for (i=0; i<=0xff; ++i)
+    {
+	WriteReg(i, 0x00);
+    }
+}
+
+void Init(void)
+{
+    if (SDL_Init(SDL_INIT_TIMER) < 0)
+    {
+        fprintf(stderr, "Unable to initialise SDL timer\n");
+        exit(-1);
+    }
+
+    if (!OPL_Init(ADLIB_PORT))
+    {
+        fprintf(stderr, "Unable to initialise OPL layer\n");
+        exit(-1);
+    }
+}
+
+void Shutdown(void)
+{
+    OPL_Shutdown();
+}
+
+struct timer_data
+{
+    int running;
+    FILE *fstream;
+};
+
+void TimerCallback(void *data)
+{
+    struct timer_data *timer_data = data;
+    int delay;
+
+    if (!timer_data->running)
+    {
+        return;
+    }
+
+    // Read data until we must make a delay.
+
+    for (;;)
+    {
+        int reg, val;
+
+        // End of file?
+
+        if (feof(timer_data->fstream))
+        {
+            timer_data->running = 0;
+            return;
+        }
+
+        reg = fgetc(timer_data->fstream);
+        val = fgetc(timer_data->fstream);
+
+        // Register value of 0 or 1 indicates a delay.
+
+        if (reg == 0x00)
+        {
+            delay = val;
+            break;
+        }
+        else if (reg == 0x01)
+        {
+            val |= (fgetc(timer_data->fstream) << 8);
+            delay = val;
+            break;
+        }
+        else
+        {
+            WriteReg(reg, val);
+        }
+    }
+
+    // Schedule the next timer callback.
+
+    OPL_SetCallback(delay * OPL_MS, TimerCallback, timer_data);
+}
+
+void PlayFile(char *filename)
+{
+    struct timer_data timer_data;
+    int running;
+    char buf[8];
+
+    timer_data.fstream = fopen(filename, "rb");
+
+    if (timer_data.fstream == NULL)
+    {
+        fprintf(stderr, "Failed to open %s\n", filename);
+        exit(-1);
+    }
+
+    if (fread(buf, 1, 8, timer_data.fstream) < 8)
+    {
+        fprintf(stderr, "failed to read raw OPL header\n");
+        exit(-1);
+    }
+
+    if (strncmp(buf, HEADER_STRING, 8) != 0)
+    {
+        fprintf(stderr, "Raw OPL header not found\n");
+        exit(-1);
+    }
+
+    fseek(timer_data.fstream, 28, SEEK_SET);
+    timer_data.running = 1;
+
+    // Start callback loop sequence.
+
+    OPL_SetCallback(0, TimerCallback, &timer_data);
+
+    // Sleep until the playback finishes.
+
+    do
+    {
+        OPL_Lock();
+        running = timer_data.running;
+        OPL_Unlock();
+
+        SDL_Delay(100 * OPL_MS);
+    } while (running);
+
+    fclose(timer_data.fstream);
+}
+
+int main(int argc, char *argv[])
+{
+    if (argc < 2)
+    {
+        printf("Usage: %s <filename>\n", argv[0]);
+        exit(-1);
+    }
+
+    Init();
+
+    PlayFile(argv[1]);
+
+    ClearAllRegs();
+    Shutdown();
+
+    return 0;
+}
+
diff --git a/games/NXDoom/opl/ioperm_sys.c b/games/NXDoom/opl/ioperm_sys.c
new file mode 100644
index 000000000..6d0c63a5c
--- /dev/null
+++ b/games/NXDoom/opl/ioperm_sys.c
@@ -0,0 +1,355 @@
+//
+// Copyright(C) 2002, 2003 Marcel Telka
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Interface to the ioperm.sys driver, based on code from the
+//     Cygwin ioperm library.
+//
+
+#ifdef _WIN32
+
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winioctl.h>
+
+#include <errno.h>
+
+#include "ioperm_sys.h"
+
+#define IOPERM_FILE L"\\\\.\\ioperm"
+
+#define IOCTL_IOPERM               \
+    CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA00, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+struct ioperm_data
+{
+    unsigned long from;
+    unsigned long num;
+    int turn_on;
+};
+
+// Function pointers for advapi32.dll.  This DLL does not exist on
+// Windows 9x, so they are dynamically loaded from the DLL at runtime.
+
+// haleyjd 09/09/10: Moved calling conventions into ()'s
+
+static SC_HANDLE (WINAPI *MyOpenSCManagerW)(wchar_t *lpMachineName,
+                                            wchar_t *lpDatabaseName,
+                                            DWORD dwDesiredAccess) = NULL;
+static SC_HANDLE (WINAPI *MyCreateServiceW)(SC_HANDLE hSCManager,
+                                            wchar_t *lpServiceName,
+                                            wchar_t *lpDisplayName,
+                                            DWORD dwDesiredAccess,
+                                            DWORD dwServiceType,
+                                            DWORD dwStartType,
+                                            DWORD dwErrorControl,
+                                            wchar_t *lpBinaryPathName,
+                                            wchar_t *lpLoadOrderGroup,
+                                            LPDWORD lpdwTagId,
+                                            wchar_t *lpDependencies,
+                                            wchar_t *lpServiceStartName,
+                                            wchar_t *lpPassword);
+static SC_HANDLE (WINAPI *MyOpenServiceW)(SC_HANDLE hSCManager,
+                                          wchar_t *lpServiceName,
+                                          DWORD dwDesiredAccess);
+static BOOL (WINAPI *MyStartServiceW)(SC_HANDLE hService,
+                                      DWORD dwNumServiceArgs,
+                                      wchar_t **lpServiceArgVectors);
+static BOOL (WINAPI *MyControlService)(SC_HANDLE hService,
+                                       DWORD dwControl,
+                                       LPSERVICE_STATUS lpServiceStatus);
+static BOOL (WINAPI *MyCloseServiceHandle)(SC_HANDLE hSCObject);
+static BOOL (WINAPI *MyDeleteService)(SC_HANDLE hService);
+
+static struct
+{
+    char *name;
+    void **fn;
+} dll_functions[] = {
+    { "OpenSCManagerW",     (void **) &MyOpenSCManagerW },
+    { "CreateServiceW",     (void **) &MyCreateServiceW },
+    { "OpenServiceW",       (void **) &MyOpenServiceW },
+    { "StartServiceW",      (void **) &MyStartServiceW },
+    { "ControlService",     (void **) &MyControlService },
+    { "CloseServiceHandle", (void **) &MyCloseServiceHandle },
+    { "DeleteService",      (void **) &MyDeleteService },
+};
+
+// Globals
+
+static SC_HANDLE scm = NULL;
+static SC_HANDLE svc = NULL;
+static int service_was_created = 0;
+static int service_was_started = 0;
+
+static int LoadLibraryPointers(void)
+{
+    HMODULE dll;
+    int i;
+
+    // Already loaded?
+
+    if (MyOpenSCManagerW != NULL)
+    {
+        return 1;
+    }
+
+    dll = LoadLibraryW(L"advapi32.dll");
+
+    if (dll == NULL)
+    {
+        fprintf(stderr, "LoadLibraryPointers: Failed to open advapi32.dll\n");
+        return 0;
+    }
+
+    for (i = 0; i < sizeof(dll_functions) / sizeof(*dll_functions); ++i)
+    {
+        *dll_functions[i].fn = GetProcAddress(dll, dll_functions[i].name);
+
+        if (*dll_functions[i].fn == NULL)
+        {
+            fprintf(stderr, "LoadLibraryPointers: Failed to get address "
+                            "for '%s'\n", dll_functions[i].name);
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+int IOperm_EnablePortRange(unsigned int from, unsigned int num, int turn_on)
+{
+    HANDLE h;
+    struct ioperm_data ioperm_data;
+    DWORD BytesReturned;
+    BOOL r;
+
+    h = CreateFileW(IOPERM_FILE, GENERIC_READ, 0, NULL,
+                    OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (h == INVALID_HANDLE_VALUE)
+    {
+        errno = ENODEV;
+        return -1;
+    }
+
+    ioperm_data.from = from;
+    ioperm_data.num = num;
+    ioperm_data.turn_on = turn_on;
+
+    r = DeviceIoControl(h, IOCTL_IOPERM,
+                        &ioperm_data, sizeof ioperm_data,
+                        NULL, 0,
+                        &BytesReturned, NULL);
+
+    if (!r)
+    {
+        errno = EPERM;
+    }
+
+    CloseHandle(h);
+
+    return r != 0;
+}
+
+// Load ioperm.sys driver.
+// Returns 1 for success, 0 for failure.
+// Remember to call IOperm_UninstallDriver to uninstall the driver later.
+
+int IOperm_InstallDriver(void)
+{
+    wchar_t driver_path[MAX_PATH];
+    int error;
+    int result = 1;
+
+    if (!LoadLibraryPointers())
+    {
+        return 0;
+    }
+
+    scm = MyOpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+
+    if (scm == NULL)
+    {
+        error = GetLastError();
+        fprintf(stderr, "IOperm_InstallDriver: OpenSCManager failed (%i).\n",
+                        error);
+        return 0;
+    }
+
+    // Get the full path to the driver file.
+
+    GetFullPathNameW(L"ioperm.sys", MAX_PATH, driver_path, NULL);
+
+    // Create the service.
+
+    svc = MyCreateServiceW(scm,
+                           L"ioperm",
+                           L"ioperm support for Cygwin driver",
+                           SERVICE_ALL_ACCESS,
+                           SERVICE_KERNEL_DRIVER,
+                           SERVICE_AUTO_START,
+                           SERVICE_ERROR_NORMAL,
+                           driver_path,
+                           NULL,
+                           NULL,
+                           NULL,
+                           NULL,
+                           NULL);
+
+    if (svc == NULL)
+    {
+        error = GetLastError();
+
+        if (error != ERROR_SERVICE_EXISTS)
+        {
+            fprintf(stderr,
+                    "IOperm_InstallDriver: Failed to create service (%i).\n",
+                    error);
+        }
+        else
+        {
+            svc = MyOpenServiceW(scm, L"ioperm", SERVICE_ALL_ACCESS);
+
+            if (svc == NULL)
+            {
+                error = GetLastError();
+
+                fprintf(stderr,
+                        "IOperm_InstallDriver: Failed to open service (%i).\n",
+                        error);
+            }
+        }
+
+        if (svc == NULL)
+        {
+            MyCloseServiceHandle(scm);
+            return 0;
+        }
+    }
+    else
+    {
+        service_was_created = 1;
+    }
+
+    // Start the service.  If the service already existed, it might have
+    // already been running as well.
+
+    if (!MyStartServiceW(svc, 0, NULL))
+    {
+        error = GetLastError();
+
+        if (error != ERROR_SERVICE_ALREADY_RUNNING)
+        {
+            fprintf(stderr, "IOperm_InstallDriver: Failed to start service (%i).\n",
+                            error);
+
+            result = 0;
+        }
+        else
+        {
+            printf("IOperm_InstallDriver: ioperm driver already running.\n");
+        }
+    }
+    else
+    {
+        printf("IOperm_InstallDriver: ioperm driver installed.\n");
+        service_was_started = 1;
+    }
+
+    // If we failed to start the driver running, we need to clean up
+    // before finishing.
+
+    if (result == 0)
+    {
+        IOperm_UninstallDriver();
+    }
+
+    return result;
+}
+
+int IOperm_UninstallDriver(void)
+{
+    SERVICE_STATUS stat;
+    int result = 1;
+    int error;
+
+    // If we started the service, stop it.
+
+    if (service_was_started)
+    {
+        if (!MyControlService(svc, SERVICE_CONTROL_STOP, &stat))
+        {
+            error = GetLastError();
+
+            if (error == ERROR_SERVICE_NOT_ACTIVE)
+            {
+                fprintf(stderr,
+                        "IOperm_UninstallDriver: Service not active? (%i)\n",
+                        error);
+            }
+            else
+            {
+                fprintf(stderr,
+                        "IOperm_UninstallDriver: Failed to stop service (%i).\n",
+                        error);
+                result = 0;
+            }
+        }
+    }
+
+    // If we created the service, delete it.
+
+    if (service_was_created)
+    {
+        if (!MyDeleteService(svc))
+        {
+            error = GetLastError();
+
+            fprintf(stderr,
+                    "IOperm_UninstallDriver: DeleteService failed (%i).\n",
+                    error);
+
+            result = 0;
+        }
+        else if (service_was_started)
+        {
+            printf("IOperm_UnInstallDriver: ioperm driver uninstalled.\n");
+        }
+    }
+
+    // Close handles.
+
+    if (svc != NULL)
+    {
+        MyCloseServiceHandle(svc);
+        svc = NULL;
+    }
+
+    if (scm != NULL)
+    {
+        MyCloseServiceHandle(scm);
+        scm = NULL;
+    }
+
+    service_was_created = 0;
+    service_was_started = 0;
+
+    return result;
+}
+
+#endif /* #ifndef _WIN32 */
+
diff --git a/games/NXDoom/opl/ioperm_sys.h b/games/NXDoom/opl/ioperm_sys.h
new file mode 100644
index 000000000..1a27c3f12
--- /dev/null
+++ b/games/NXDoom/opl/ioperm_sys.h
@@ -0,0 +1,28 @@
+//
+// Copyright(C) 2002, 2003 Marcel Telka
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Interface to the ioperm.sys driver, based on code from the
+//     Cygwin ioperm library.
+//
+
+#ifndef IOPERM_SYS_H
+#define IOPERM_SYS_H
+
+int IOperm_EnablePortRange(unsigned int from, unsigned int num, int turn_on);
+int IOperm_InstallDriver(void);
+int IOperm_UninstallDriver(void);
+
+#endif /* #ifndef IOPERM_SYS_H */
+
diff --git a/games/NXDoom/opl/opl.c b/games/NXDoom/opl/opl.c
new file mode 100644
index 000000000..e99821cbb
--- /dev/null
+++ b/games/NXDoom/opl/opl.c
@@ -0,0 +1,530 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL interface.
+//
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL.h"
+
+#include "opl.h"
+#include "opl_internal.h"
+
+//#define OPL_DEBUG_TRACE
+
+#ifdef EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
+
+static opl_driver_t *drivers[] =
+{
+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
+    &opl_linux_driver,
+#endif
+#if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64)
+    &opl_openbsd_driver,
+#endif
+#ifdef _WIN32
+    &opl_win32_driver,
+#endif
+#ifndef DISABLE_SDL2MIXER
+    &opl_sdl_driver,
+#endif // DISABLE_SDL2MIXER
+    NULL
+};
+
+static opl_driver_t *driver = NULL;
+static int init_stage_reg_writes = 1;
+
+unsigned int opl_sample_rate = 22050;
+
+//
+// Init/shutdown code.
+//
+
+// Initialize the specified driver and detect an OPL chip.  Returns
+// true if an OPL is detected.
+
+static opl_init_result_t InitDriver(opl_driver_t *_driver,
+                                    unsigned int port_base)
+{
+    opl_init_result_t result1, result2;
+
+    // Initialize the driver.
+
+    if (!_driver->init_func(port_base))
+    {
+        return OPL_INIT_NONE;
+    }
+
+    // The driver was initialized okay, so we now have somewhere
+    // to write to.  It doesn't mean there's an OPL chip there,
+    // though.  Perform the detection sequence to make sure.
+    // (it's done twice, like how Doom does it).
+
+    driver = _driver;
+    init_stage_reg_writes = 1;
+
+    result1 = OPL_Detect();
+    result2 = OPL_Detect();
+    if (result1 == OPL_INIT_NONE || result2 == OPL_INIT_NONE)
+    {
+        printf("OPL_Init: No OPL detected using '%s' driver.\n", _driver->name);
+        _driver->shutdown_func();
+        driver = NULL;
+        return OPL_INIT_NONE;
+    }
+
+    init_stage_reg_writes = 0;
+
+    printf("OPL_Init: Using driver '%s'.\n", driver->name);
+
+    return result2;
+}
+
+// Find a driver automatically by trying each in the list.
+
+static opl_init_result_t AutoSelectDriver(unsigned int port_base)
+{
+    int i;
+    opl_init_result_t result;
+
+    for (i = 0; drivers[i] != NULL; ++i)
+    {
+        result = InitDriver(drivers[i], port_base);
+        if (result != OPL_INIT_NONE)
+        {
+            return result;
+        }
+    }
+
+    printf("OPL_Init: Failed to find a working driver.\n");
+
+    return OPL_INIT_NONE;
+}
+
+// Initialize the OPL library. Return value indicates type of OPL chip
+// detected, if any.
+
+opl_init_result_t OPL_Init(unsigned int port_base)
+{
+    char *driver_name;
+    int i;
+    int result;
+
+    driver_name = getenv("OPL_DRIVER");
+
+    if (driver_name != NULL)
+    {
+        // Search the list until we find the driver with this name.
+
+        for (i=0; drivers[i] != NULL; ++i)
+        {
+            if (!strcmp(driver_name, drivers[i]->name))
+            {
+                result = InitDriver(drivers[i], port_base);
+                if (result)
+                {
+                    return result;
+                }
+                else
+                {
+                    printf("OPL_Init: Failed to initialize "
+                           "driver: '%s'.\n", driver_name);
+                    return OPL_INIT_NONE;
+                }
+            }
+        }
+
+        printf("OPL_Init: unknown driver: '%s'.\n", driver_name);
+
+        return OPL_INIT_NONE;
+    }
+    else
+    {
+        return AutoSelectDriver(port_base);
+    }
+}
+
+// Shut down the OPL library.
+
+void OPL_Shutdown(void)
+{
+    if (driver != NULL)
+    {
+        driver->shutdown_func();
+        driver = NULL;
+    }
+}
+
+// Set the sample rate used for software OPL emulation.
+
+void OPL_SetSampleRate(unsigned int rate)
+{
+    opl_sample_rate = rate;
+}
+
+void OPL_WritePort(opl_port_t port, unsigned int value)
+{
+    if (driver != NULL)
+    {
+#ifdef OPL_DEBUG_TRACE
+        printf("OPL_write: %i, %x\n", port, value);
+        fflush(stdout);
+#endif
+        driver->write_port_func(port, value);
+    }
+}
+
+unsigned int OPL_ReadPort(opl_port_t port)
+{
+    if (driver != NULL)
+    {
+        unsigned int result;
+
+#ifdef OPL_DEBUG_TRACE
+        printf("OPL_read: %i...\n", port);
+        fflush(stdout);
+#endif
+
+        result = driver->read_port_func(port);
+
+#ifdef OPL_DEBUG_TRACE
+        printf("OPL_read: %i -> %x\n", port, result);
+        fflush(stdout);
+#endif
+
+        return result;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+//
+// Higher-level functions, based on the lower-level functions above
+// (register write, etc).
+//
+
+unsigned int OPL_ReadStatus(void)
+{
+    return OPL_ReadPort(OPL_REGISTER_PORT);
+}
+
+// Write an OPL register value
+
+void OPL_WriteRegister(int reg, int value)
+{
+    int i;
+
+    if (reg & 0x100)
+    {
+        OPL_WritePort(OPL_REGISTER_PORT_OPL3, reg);
+    }
+    else
+    {
+        OPL_WritePort(OPL_REGISTER_PORT, reg);
+    }
+
+    // For timing, read the register port six times after writing the
+    // register number to cause the appropriate delay
+
+    for (i=0; i<6; ++i)
+    {
+        // An oddity of the Doom OPL code: at startup initialization,
+        // the spacing here is performed by reading from the register
+        // port; after initialization, the data port is read, instead.
+
+        if (init_stage_reg_writes)
+        {
+            OPL_ReadPort(OPL_REGISTER_PORT);
+        }
+        else
+        {
+            OPL_ReadPort(OPL_DATA_PORT);
+        }
+    }
+
+    OPL_WritePort(OPL_DATA_PORT, value);
+
+    // Read the register port 24 times after writing the value to
+    // cause the appropriate delay
+
+    for (i=0; i<24; ++i)
+    {
+        OPL_ReadStatus();
+    }
+}
+
+// Detect the presence of an OPL chip
+
+opl_init_result_t OPL_Detect(void)
+{
+    int result1, result2;
+    int i;
+
+    // Reset both timers:
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x60);
+
+    // Enable interrupts:
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x80);
+
+    // Read status
+    result1 = OPL_ReadStatus();
+
+    // Set timer:
+    OPL_WriteRegister(OPL_REG_TIMER1, 0xff);
+
+    // Start timer 1:
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x21);
+
+    // Wait for 80 microseconds
+    // This is how Doom does it:
+
+    for (i=0; i<200; ++i)
+    {
+        OPL_ReadStatus();
+    }
+
+    OPL_Delay(1 * OPL_MS);
+
+    // Read status
+    result2 = OPL_ReadStatus();
+
+    // Reset both timers:
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x60);
+
+    // Enable interrupts:
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x80);
+
+    if ((result1 & 0xe0) == 0x00 && (result2 & 0xe0) == 0xc0)
+    {
+        result1 = OPL_ReadPort(OPL_REGISTER_PORT);
+        result2 = OPL_ReadPort(OPL_REGISTER_PORT_OPL3);
+        if (result1 == 0x00)
+        {
+            return OPL_INIT_OPL3;
+        }
+        else
+        {
+            return OPL_INIT_OPL2;
+        }
+    }
+    else
+    {
+        return OPL_INIT_NONE;
+    }
+}
+
+// Initialize registers on startup
+
+void OPL_InitRegisters(int opl3)
+{
+    int r;
+
+    // Initialize level registers
+
+    for (r=OPL_REGS_LEVEL; r <= OPL_REGS_LEVEL + OPL_NUM_OPERATORS; ++r)
+    {
+        OPL_WriteRegister(r, 0x3f);
+    }
+
+    // Initialize other registers
+    // These two loops write to registers that actually don't exist,
+    // but this is what Doom does ...
+    // Similarly, the <= is also intenational.
+
+    for (r=OPL_REGS_ATTACK; r <= OPL_REGS_WAVEFORM + OPL_NUM_OPERATORS; ++r)
+    {
+        OPL_WriteRegister(r, 0x00);
+    }
+
+    // More registers ...
+
+    for (r=1; r < OPL_REGS_LEVEL; ++r)
+    {
+        OPL_WriteRegister(r, 0x00);
+    }
+
+    // Re-initialize the low registers:
+
+    // Reset both timers and enable interrupts:
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL,      0x60);
+    OPL_WriteRegister(OPL_REG_TIMER_CTRL,      0x80);
+
+    // "Allow FM chips to control the waveform of each operator":
+    OPL_WriteRegister(OPL_REG_WAVEFORM_ENABLE, 0x20);
+
+    if (opl3)
+    {
+        OPL_WriteRegister(OPL_REG_NEW, 0x01);
+
+        // Initialize level registers
+
+        for (r=OPL_REGS_LEVEL; r <= OPL_REGS_LEVEL + OPL_NUM_OPERATORS; ++r)
+        {
+            OPL_WriteRegister(r | 0x100, 0x3f);
+        }
+
+        // Initialize other registers
+        // These two loops write to registers that actually don't exist,
+        // but this is what Doom does ...
+        // Similarly, the <= is also intenational.
+
+        for (r=OPL_REGS_ATTACK; r <= OPL_REGS_WAVEFORM + OPL_NUM_OPERATORS; ++r)
+        {
+            OPL_WriteRegister(r | 0x100, 0x00);
+        }
+
+        // More registers ...
+
+        for (r=1; r < OPL_REGS_LEVEL; ++r)
+        {
+            OPL_WriteRegister(r | 0x100, 0x00);
+        }
+    }
+
+    // Keyboard split point on (?)
+    OPL_WriteRegister(OPL_REG_FM_MODE,         0x40);
+
+    if (opl3)
+    {
+        OPL_WriteRegister(OPL_REG_NEW, 0x01);
+    }
+}
+
+//
+// Timer functions.
+//
+
+void OPL_SetCallback(uint64_t us, opl_callback_t callback, void *data)
+{
+    if (driver != NULL)
+    {
+        driver->set_callback_func(us, callback, data);
+    }
+}
+
+void OPL_ClearCallbacks(void)
+{
+    if (driver != NULL)
+    {
+        driver->clear_callbacks_func();
+    }
+}
+
+void OPL_Lock(void)
+{
+    if (driver != NULL)
+    {
+        driver->lock_func();
+    }
+}
+
+void OPL_Unlock(void)
+{
+    if (driver != NULL)
+    {
+        driver->unlock_func();
+    }
+}
+
+typedef struct
+{
+    int finished;
+
+    SDL_mutex *mutex;
+    SDL_cond *cond;
+} delay_data_t;
+
+static void DelayCallback(void *_delay_data)
+{
+    delay_data_t *delay_data = _delay_data;
+
+    SDL_LockMutex(delay_data->mutex);
+    delay_data->finished = 1;
+
+    SDL_CondSignal(delay_data->cond);
+
+    SDL_UnlockMutex(delay_data->mutex);
+}
+
+// Delay for specified number of microseconds after OPL subsystem is initialized
+
+void OPL_Delay(uint64_t us)
+{
+    delay_data_t delay_data;
+
+    if (driver == NULL)
+    {
+        return;
+    }
+
+    // Create a callback that will signal this thread after the
+    // specified time.
+
+    // Note that this is not just a simple time-based delay, it will ensure
+    // that the OPL system is initialized and the queue has begun processing
+    // before releasing the mutex lock
+
+    delay_data.finished = 0;
+    delay_data.mutex = SDL_CreateMutex();
+    delay_data.cond = SDL_CreateCond();
+
+    OPL_SetCallback(us, DelayCallback, &delay_data);
+
+    // Wait until the callback is invoked.
+
+    SDL_LockMutex(delay_data.mutex);
+
+    while (!delay_data.finished)
+    {
+        SDL_CondWait(delay_data.cond, delay_data.mutex);
+#ifdef EMSCRIPTEN
+        // Use async sleep to avoid locking browser main thread
+        emscripten_sleep(us / 1000);
+#endif
+    }
+
+    SDL_UnlockMutex(delay_data.mutex);
+
+    // Clean up.
+
+    SDL_DestroyMutex(delay_data.mutex);
+    SDL_DestroyCond(delay_data.cond);
+}
+
+void OPL_SetPaused(int paused)
+{
+    if (driver != NULL)
+    {
+        driver->set_paused_func(paused);
+    }
+}
+
+void OPL_AdjustCallbacks(float value)
+{
+    if (driver != NULL)
+    {
+        driver->adjust_callbacks_func(value);
+    }
+}
+
diff --git a/games/NXDoom/opl/opl.h b/games/NXDoom/opl/opl.h
new file mode 100644
index 000000000..deaa442dd
--- /dev/null
+++ b/games/NXDoom/opl/opl.h
@@ -0,0 +1,153 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL interface.
+//
+
+
+#ifndef OPL_OPL_H
+#define OPL_OPL_H
+
+#include <inttypes.h>
+
+typedef void (*opl_callback_t)(void *data);
+
+// Result from OPL_Init(), indicating what type of OPL chip was detected,
+// if any.
+typedef enum
+{
+    OPL_INIT_NONE,
+    OPL_INIT_OPL2,
+    OPL_INIT_OPL3,
+} opl_init_result_t;
+
+typedef enum
+{
+    OPL_REGISTER_PORT = 0,
+    OPL_DATA_PORT = 1,
+    OPL_REGISTER_PORT_OPL3 = 2
+} opl_port_t;
+
+#define OPL_NUM_OPERATORS   21
+#define OPL_NUM_VOICES      9
+
+#define OPL_REG_WAVEFORM_ENABLE   0x01
+#define OPL_REG_TIMER1            0x02
+#define OPL_REG_TIMER2            0x03
+#define OPL_REG_TIMER_CTRL        0x04
+#define OPL_REG_FM_MODE           0x08
+#define OPL_REG_NEW               0x105
+
+// Operator registers (21 of each):
+
+#define OPL_REGS_TREMOLO          0x20
+#define OPL_REGS_LEVEL            0x40
+#define OPL_REGS_ATTACK           0x60
+#define OPL_REGS_SUSTAIN          0x80
+#define OPL_REGS_WAVEFORM         0xE0
+
+// Voice registers (9 of each):
+
+#define OPL_REGS_FREQ_1           0xA0
+#define OPL_REGS_FREQ_2           0xB0
+#define OPL_REGS_FEEDBACK         0xC0
+
+// Times
+
+#define OPL_SECOND ((uint64_t) 1000 * 1000)
+#define OPL_MS     ((uint64_t) 1000)
+#define OPL_US     ((uint64_t) 1)
+
+//
+// Low-level functions.
+//
+
+// Initialize the OPL subsystem.
+
+opl_init_result_t OPL_Init(unsigned int port_base);
+
+// Shut down the OPL subsystem.
+
+void OPL_Shutdown(void);
+
+// Set the sample rate used for software emulation.
+
+void OPL_SetSampleRate(unsigned int rate);
+
+// Write to one of the OPL I/O ports:
+
+void OPL_WritePort(opl_port_t port, unsigned int value);
+
+// Read from one of the OPL I/O ports:
+
+unsigned int OPL_ReadPort(opl_port_t port);
+
+//
+// Higher-level functions.
+//
+
+// Read the cuurrent status byte of the OPL chip.
+
+unsigned int OPL_ReadStatus(void);
+
+// Write to an OPL register.
+
+void OPL_WriteRegister(int reg, int value);
+
+// Perform a detection sequence to determine that an
+// OPL chip is present.
+
+opl_init_result_t OPL_Detect(void);
+
+// Initialize all registers, performed on startup.
+
+void OPL_InitRegisters(int opl3);
+
+//
+// Timer callback functions.
+//
+
+// Set a timer callback.  After the specified number of microseconds
+// have elapsed, the callback will be invoked.
+
+void OPL_SetCallback(uint64_t us, opl_callback_t callback, void *data);
+
+// Adjust callback times by the specified factor. For example, a value of
+// 0.5 will halve all remaining times.
+
+void OPL_AdjustCallbacks(float factor);
+
+// Clear all OPL callbacks that have been set.
+
+void OPL_ClearCallbacks(void);
+
+// Begin critical section, during which, OPL callbacks will not be
+// invoked.
+
+void OPL_Lock(void);
+
+// End critical section.
+
+void OPL_Unlock(void);
+
+// Block until the specified number of microseconds have elapsed.
+
+void OPL_Delay(uint64_t us);
+
+// Pause the OPL callbacks.
+
+void OPL_SetPaused(int paused);
+
+#endif
+
diff --git a/games/NXDoom/opl/opl3.c b/games/NXDoom/opl/opl3.c
new file mode 100644
index 000000000..f5bca4c4e
--- /dev/null
+++ b/games/NXDoom/opl/opl3.c
@@ -0,0 +1,1377 @@
+//
+// Copyright (C) 2013-2018 Alexey Khokholov (Nuke.YKT)
+//
+// 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.
+//
+//
+//  Nuked OPL3 emulator.
+//  Thanks:
+//      MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+//          Feedback and Rhythm part calculation information.
+//      forums.submarine.org.uk(carbon14, opl3):
+//          Tremolo and phase generator calculation information.
+//      OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+//          OPL2 ROMs.
+//      siliconpr0n.org(John McMaster, digshadow):
+//          YMF262 and VRC VII decaps and die shots.
+//
+// version: 1.8
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "opl3.h"
+
+#define RSM_FRAC    10
+
+// Channel types
+
+enum {
+    ch_2op = 0,
+    ch_4op = 1,
+    ch_4op2 = 2,
+    ch_drum = 3
+};
+
+// Envelope key types
+
+enum {
+    egk_norm = 0x01,
+    egk_drum = 0x02
+};
+
+
+//
+// logsin table
+//
+
+static const Bit16u logsinrom[256] = {
+    0x859, 0x6c3, 0x607, 0x58b, 0x52e, 0x4e4, 0x4a6, 0x471,
+    0x443, 0x41a, 0x3f5, 0x3d3, 0x3b5, 0x398, 0x37e, 0x365,
+    0x34e, 0x339, 0x324, 0x311, 0x2ff, 0x2ed, 0x2dc, 0x2cd,
+    0x2bd, 0x2af, 0x2a0, 0x293, 0x286, 0x279, 0x26d, 0x261,
+    0x256, 0x24b, 0x240, 0x236, 0x22c, 0x222, 0x218, 0x20f,
+    0x206, 0x1fd, 0x1f5, 0x1ec, 0x1e4, 0x1dc, 0x1d4, 0x1cd,
+    0x1c5, 0x1be, 0x1b7, 0x1b0, 0x1a9, 0x1a2, 0x19b, 0x195,
+    0x18f, 0x188, 0x182, 0x17c, 0x177, 0x171, 0x16b, 0x166,
+    0x160, 0x15b, 0x155, 0x150, 0x14b, 0x146, 0x141, 0x13c,
+    0x137, 0x133, 0x12e, 0x129, 0x125, 0x121, 0x11c, 0x118,
+    0x114, 0x10f, 0x10b, 0x107, 0x103, 0x0ff, 0x0fb, 0x0f8,
+    0x0f4, 0x0f0, 0x0ec, 0x0e9, 0x0e5, 0x0e2, 0x0de, 0x0db,
+    0x0d7, 0x0d4, 0x0d1, 0x0cd, 0x0ca, 0x0c7, 0x0c4, 0x0c1,
+    0x0be, 0x0bb, 0x0b8, 0x0b5, 0x0b2, 0x0af, 0x0ac, 0x0a9,
+    0x0a7, 0x0a4, 0x0a1, 0x09f, 0x09c, 0x099, 0x097, 0x094,
+    0x092, 0x08f, 0x08d, 0x08a, 0x088, 0x086, 0x083, 0x081,
+    0x07f, 0x07d, 0x07a, 0x078, 0x076, 0x074, 0x072, 0x070,
+    0x06e, 0x06c, 0x06a, 0x068, 0x066, 0x064, 0x062, 0x060,
+    0x05e, 0x05c, 0x05b, 0x059, 0x057, 0x055, 0x053, 0x052,
+    0x050, 0x04e, 0x04d, 0x04b, 0x04a, 0x048, 0x046, 0x045,
+    0x043, 0x042, 0x040, 0x03f, 0x03e, 0x03c, 0x03b, 0x039,
+    0x038, 0x037, 0x035, 0x034, 0x033, 0x031, 0x030, 0x02f,
+    0x02e, 0x02d, 0x02b, 0x02a, 0x029, 0x028, 0x027, 0x026,
+    0x025, 0x024, 0x023, 0x022, 0x021, 0x020, 0x01f, 0x01e,
+    0x01d, 0x01c, 0x01b, 0x01a, 0x019, 0x018, 0x017, 0x017,
+    0x016, 0x015, 0x014, 0x014, 0x013, 0x012, 0x011, 0x011,
+    0x010, 0x00f, 0x00f, 0x00e, 0x00d, 0x00d, 0x00c, 0x00c,
+    0x00b, 0x00a, 0x00a, 0x009, 0x009, 0x008, 0x008, 0x007,
+    0x007, 0x007, 0x006, 0x006, 0x005, 0x005, 0x005, 0x004,
+    0x004, 0x004, 0x003, 0x003, 0x003, 0x002, 0x002, 0x002,
+    0x002, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000
+};
+
+//
+// exp table
+//
+
+static const Bit16u exprom[256] = {
+    0x7fa, 0x7f5, 0x7ef, 0x7ea, 0x7e4, 0x7df, 0x7da, 0x7d4,
+    0x7cf, 0x7c9, 0x7c4, 0x7bf, 0x7b9, 0x7b4, 0x7ae, 0x7a9,
+    0x7a4, 0x79f, 0x799, 0x794, 0x78f, 0x78a, 0x784, 0x77f,
+    0x77a, 0x775, 0x770, 0x76a, 0x765, 0x760, 0x75b, 0x756,
+    0x751, 0x74c, 0x747, 0x742, 0x73d, 0x738, 0x733, 0x72e,
+    0x729, 0x724, 0x71f, 0x71a, 0x715, 0x710, 0x70b, 0x706,
+    0x702, 0x6fd, 0x6f8, 0x6f3, 0x6ee, 0x6e9, 0x6e5, 0x6e0,
+    0x6db, 0x6d6, 0x6d2, 0x6cd, 0x6c8, 0x6c4, 0x6bf, 0x6ba,
+    0x6b5, 0x6b1, 0x6ac, 0x6a8, 0x6a3, 0x69e, 0x69a, 0x695,
+    0x691, 0x68c, 0x688, 0x683, 0x67f, 0x67a, 0x676, 0x671,
+    0x66d, 0x668, 0x664, 0x65f, 0x65b, 0x657, 0x652, 0x64e,
+    0x649, 0x645, 0x641, 0x63c, 0x638, 0x634, 0x630, 0x62b,
+    0x627, 0x623, 0x61e, 0x61a, 0x616, 0x612, 0x60e, 0x609,
+    0x605, 0x601, 0x5fd, 0x5f9, 0x5f5, 0x5f0, 0x5ec, 0x5e8,
+    0x5e4, 0x5e0, 0x5dc, 0x5d8, 0x5d4, 0x5d0, 0x5cc, 0x5c8,
+    0x5c4, 0x5c0, 0x5bc, 0x5b8, 0x5b4, 0x5b0, 0x5ac, 0x5a8,
+    0x5a4, 0x5a0, 0x59c, 0x599, 0x595, 0x591, 0x58d, 0x589,
+    0x585, 0x581, 0x57e, 0x57a, 0x576, 0x572, 0x56f, 0x56b,
+    0x567, 0x563, 0x560, 0x55c, 0x558, 0x554, 0x551, 0x54d,
+    0x549, 0x546, 0x542, 0x53e, 0x53b, 0x537, 0x534, 0x530,
+    0x52c, 0x529, 0x525, 0x522, 0x51e, 0x51b, 0x517, 0x514,
+    0x510, 0x50c, 0x509, 0x506, 0x502, 0x4ff, 0x4fb, 0x4f8,
+    0x4f4, 0x4f1, 0x4ed, 0x4ea, 0x4e7, 0x4e3, 0x4e0, 0x4dc,
+    0x4d9, 0x4d6, 0x4d2, 0x4cf, 0x4cc, 0x4c8, 0x4c5, 0x4c2,
+    0x4be, 0x4bb, 0x4b8, 0x4b5, 0x4b1, 0x4ae, 0x4ab, 0x4a8,
+    0x4a4, 0x4a1, 0x49e, 0x49b, 0x498, 0x494, 0x491, 0x48e,
+    0x48b, 0x488, 0x485, 0x482, 0x47e, 0x47b, 0x478, 0x475,
+    0x472, 0x46f, 0x46c, 0x469, 0x466, 0x463, 0x460, 0x45d,
+    0x45a, 0x457, 0x454, 0x451, 0x44e, 0x44b, 0x448, 0x445,
+    0x442, 0x43f, 0x43c, 0x439, 0x436, 0x433, 0x430, 0x42d,
+    0x42a, 0x428, 0x425, 0x422, 0x41f, 0x41c, 0x419, 0x416,
+    0x414, 0x411, 0x40e, 0x40b, 0x408, 0x406, 0x403, 0x400
+};
+
+//
+// freq mult table multiplied by 2
+//
+// 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 12, 12, 15, 15
+//
+
+static const Bit8u mt[16] = {
+    1, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 20, 24, 24, 30, 30
+};
+
+//
+// ksl table
+//
+
+static const Bit8u kslrom[16] = {
+    0, 32, 40, 45, 48, 51, 53, 55, 56, 58, 59, 60, 61, 62, 63, 64
+};
+
+static const Bit8u kslshift[4] = {
+    8, 1, 2, 0
+};
+
+//
+// envelope generator constants
+//
+
+static const Bit8u eg_incstep[4][4] = {
+    { 0, 0, 0, 0 },
+    { 1, 0, 0, 0 },
+    { 1, 0, 1, 0 },
+    { 1, 1, 1, 0 }
+};
+
+//
+// address decoding
+//
+
+static const Bit8s ad_slot[0x20] = {
+    0, 1, 2, 3, 4, 5, -1, -1, 6, 7, 8, 9, 10, 11, -1, -1,
+    12, 13, 14, 15, 16, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static const Bit8u ch_slot[18] = {
+    0, 1, 2, 6, 7, 8, 12, 13, 14, 18, 19, 20, 24, 25, 26, 30, 31, 32
+};
+
+//
+// Envelope generator
+//
+
+typedef Bit16s(*envelope_sinfunc)(Bit16u phase, Bit16u envelope);
+typedef void(*envelope_genfunc)(opl3_slot *slott);
+
+static Bit16s OPL3_EnvelopeCalcExp(Bit32u level)
+{
+    if (level > 0x1fff)
+    {
+        level = 0x1fff;
+    }
+    return (exprom[level & 0xff] << 1) >> (level >> 8);
+}
+
+static Bit16s OPL3_EnvelopeCalcSin0(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    Bit16u neg = 0;
+    phase &= 0x3ff;
+    if (phase & 0x200)
+    {
+        neg = 0xffff;
+    }
+    if (phase & 0x100)
+    {
+        out = logsinrom[(phase & 0xff) ^ 0xff];
+    }
+    else
+    {
+        out = logsinrom[phase & 0xff];
+    }
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
+}
+
+static Bit16s OPL3_EnvelopeCalcSin1(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    phase &= 0x3ff;
+    if (phase & 0x200)
+    {
+        out = 0x1000;
+    }
+    else if (phase & 0x100)
+    {
+        out = logsinrom[(phase & 0xff) ^ 0xff];
+    }
+    else
+    {
+        out = logsinrom[phase & 0xff];
+    }
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin2(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    phase &= 0x3ff;
+    if (phase & 0x100)
+    {
+        out = logsinrom[(phase & 0xff) ^ 0xff];
+    }
+    else
+    {
+        out = logsinrom[phase & 0xff];
+    }
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin3(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    phase &= 0x3ff;
+    if (phase & 0x100)
+    {
+        out = 0x1000;
+    }
+    else
+    {
+        out = logsinrom[phase & 0xff];
+    }
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin4(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    Bit16u neg = 0;
+    phase &= 0x3ff;
+    if ((phase & 0x300) == 0x100)
+    {
+        neg = 0xffff;
+    }
+    if (phase & 0x200)
+    {
+        out = 0x1000;
+    }
+    else if (phase & 0x80)
+    {
+        out = logsinrom[((phase ^ 0xff) << 1) & 0xff];
+    }
+    else
+    {
+        out = logsinrom[(phase << 1) & 0xff];
+    }
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
+}
+
+static Bit16s OPL3_EnvelopeCalcSin5(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    phase &= 0x3ff;
+    if (phase & 0x200)
+    {
+        out = 0x1000;
+    }
+    else if (phase & 0x80)
+    {
+        out = logsinrom[((phase ^ 0xff) << 1) & 0xff];
+    }
+    else
+    {
+        out = logsinrom[(phase << 1) & 0xff];
+    }
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin6(Bit16u phase, Bit16u envelope)
+{
+    Bit16u neg = 0;
+    phase &= 0x3ff;
+    if (phase & 0x200)
+    {
+        neg = 0xffff;
+    }
+    return OPL3_EnvelopeCalcExp(envelope << 3) ^ neg;
+}
+
+static Bit16s OPL3_EnvelopeCalcSin7(Bit16u phase, Bit16u envelope)
+{
+    Bit16u out = 0;
+    Bit16u neg = 0;
+    phase &= 0x3ff;
+    if (phase & 0x200)
+    {
+        neg = 0xffff;
+        phase = (phase & 0x1ff) ^ 0x1ff;
+    }
+    out = phase << 3;
+    return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
+}
+
+static const envelope_sinfunc envelope_sin[8] = {
+    OPL3_EnvelopeCalcSin0,
+    OPL3_EnvelopeCalcSin1,
+    OPL3_EnvelopeCalcSin2,
+    OPL3_EnvelopeCalcSin3,
+    OPL3_EnvelopeCalcSin4,
+    OPL3_EnvelopeCalcSin5,
+    OPL3_EnvelopeCalcSin6,
+    OPL3_EnvelopeCalcSin7
+};
+
+enum envelope_gen_num
+{
+    envelope_gen_num_attack = 0,
+    envelope_gen_num_decay = 1,
+    envelope_gen_num_sustain = 2,
+    envelope_gen_num_release = 3
+};
+
+static void OPL3_EnvelopeUpdateKSL(opl3_slot *slot)
+{
+    Bit16s ksl = (kslrom[slot->channel->f_num >> 6] << 2)
+               - ((0x08 - slot->channel->block) << 5);
+    if (ksl < 0)
+    {
+        ksl = 0;
+    }
+    slot->eg_ksl = (Bit8u)ksl;
+}
+
+static void OPL3_EnvelopeCalc(opl3_slot *slot)
+{
+    Bit8u nonzero;
+    Bit8u rate;
+    Bit8u rate_hi;
+    Bit8u rate_lo;
+    Bit8u reg_rate = 0;
+    Bit8u ks;
+    Bit8u eg_shift, shift;
+    Bit16u eg_rout;
+    Bit16s eg_inc;
+    Bit8u eg_off;
+    Bit8u reset = 0;
+    slot->eg_out = slot->eg_rout + (slot->reg_tl << 2)
+                 + (slot->eg_ksl >> kslshift[slot->reg_ksl]) + *slot->trem;
+    if (slot->key && slot->eg_gen == envelope_gen_num_release)
+    {
+        reset = 1;
+        reg_rate = slot->reg_ar;
+    }
+    else
+    {
+        switch (slot->eg_gen)
+        {
+        case envelope_gen_num_attack:
+            reg_rate = slot->reg_ar;
+            break;
+        case envelope_gen_num_decay:
+            reg_rate = slot->reg_dr;
+            break;
+        case envelope_gen_num_sustain:
+            if (!slot->reg_type)
+            {
+                reg_rate = slot->reg_rr;
+            }
+            break;
+        case envelope_gen_num_release:
+            reg_rate = slot->reg_rr;
+            break;
+        }
+    }
+    slot->pg_reset = reset;
+    ks = slot->channel->ksv >> ((slot->reg_ksr ^ 1) << 1);
+    nonzero = (reg_rate != 0);
+    rate = ks + (reg_rate << 2);
+    rate_hi = rate >> 2;
+    rate_lo = rate & 0x03;
+    if (rate_hi & 0x10)
+    {
+        rate_hi = 0x0f;
+    }
+    eg_shift = rate_hi + slot->chip->eg_add;
+    shift = 0;
+    if (nonzero)
+    {
+        if (rate_hi < 12)
+        {
+            if (slot->chip->eg_state)
+            {
+                switch (eg_shift)
+                {
+                case 12:
+                    shift = 1;
+                    break;
+                case 13:
+                    shift = (rate_lo >> 1) & 0x01;
+                    break;
+                case 14:
+                    shift = rate_lo & 0x01;
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+        else
+        {
+            shift = (rate_hi & 0x03) + eg_incstep[rate_lo][slot->chip->timer & 0x03];
+            if (shift & 0x04)
+            {
+                shift = 0x03;
+            }
+            if (!shift)
+            {
+                shift = slot->chip->eg_state;
+            }
+        }
+    }
+    eg_rout = slot->eg_rout;
+    eg_inc = 0;
+    eg_off = 0;
+    // Instant attack
+    if (reset && rate_hi == 0x0f)
+    {
+        eg_rout = 0x00;
+    }
+    // Envelope off
+    if ((slot->eg_rout & 0x1f8) == 0x1f8)
+    {
+        eg_off = 1;
+    }
+    if (slot->eg_gen != envelope_gen_num_attack && !reset && eg_off)
+    {
+        eg_rout = 0x1ff;
+    }
+    switch (slot->eg_gen)
+    {
+    case envelope_gen_num_attack:
+        if (!slot->eg_rout)
+        {
+            slot->eg_gen = envelope_gen_num_decay;
+        }
+        else if (slot->key && shift > 0 && rate_hi != 0x0f)
+        {
+            eg_inc = ((~slot->eg_rout) << shift) >> 4;
+        }
+        break;
+    case envelope_gen_num_decay:
+        if ((slot->eg_rout >> 4) == slot->reg_sl)
+        {
+            slot->eg_gen = envelope_gen_num_sustain;
+        }
+        else if (!eg_off && !reset && shift > 0)
+        {
+            eg_inc = 1 << (shift - 1);
+        }
+        break;
+    case envelope_gen_num_sustain:
+    case envelope_gen_num_release:
+        if (!eg_off && !reset && shift > 0)
+        {
+            eg_inc = 1 << (shift - 1);
+        }
+        break;
+    }
+    slot->eg_rout = (eg_rout + eg_inc) & 0x1ff;
+    // Key off
+    if (reset)
+    {
+        slot->eg_gen = envelope_gen_num_attack;
+    }
+    if (!slot->key)
+    {
+        slot->eg_gen = envelope_gen_num_release;
+    }
+}
+
+static void OPL3_EnvelopeKeyOn(opl3_slot *slot, Bit8u type)
+{
+    slot->key |= type;
+}
+
+static void OPL3_EnvelopeKeyOff(opl3_slot *slot, Bit8u type)
+{
+    slot->key &= ~type;
+}
+
+//
+// Phase Generator
+//
+
+static void OPL3_PhaseGenerate(opl3_slot *slot)
+{
+    opl3_chip *chip;
+    Bit16u f_num;
+    Bit32u basefreq;
+    Bit8u rm_xor, n_bit;
+    Bit32u noise;
+    Bit16u phase;
+
+    chip = slot->chip;
+    f_num = slot->channel->f_num;
+    if (slot->reg_vib)
+    {
+        Bit8s range;
+        Bit8u vibpos;
+
+        range = (f_num >> 7) & 7;
+        vibpos = slot->chip->vibpos;
+
+        if (!(vibpos & 3))
+        {
+            range = 0;
+        }
+        else if (vibpos & 1)
+        {
+            range >>= 1;
+        }
+        range >>= slot->chip->vibshift;
+
+        if (vibpos & 4)
+        {
+            range = -range;
+        }
+        f_num += range;
+    }
+    basefreq = (f_num << slot->channel->block) >> 1;
+    phase = (Bit16u)(slot->pg_phase >> 9);
+    if (slot->pg_reset)
+    {
+        slot->pg_phase = 0;
+    }
+    slot->pg_phase += (basefreq * mt[slot->reg_mult]) >> 1;
+    // Rhythm mode
+    noise = chip->noise;
+    slot->pg_phase_out = phase;
+    if (slot->slot_num == 13) // hh
+    {
+        chip->rm_hh_bit2 = (phase >> 2) & 1;
+        chip->rm_hh_bit3 = (phase >> 3) & 1;
+        chip->rm_hh_bit7 = (phase >> 7) & 1;
+        chip->rm_hh_bit8 = (phase >> 8) & 1;
+    }
+    if (slot->slot_num == 17 && (chip->rhy & 0x20)) // tc
+    {
+        chip->rm_tc_bit3 = (phase >> 3) & 1;
+        chip->rm_tc_bit5 = (phase >> 5) & 1;
+    }
+    if (chip->rhy & 0x20)
+    {
+        rm_xor = (chip->rm_hh_bit2 ^ chip->rm_hh_bit7)
+               | (chip->rm_hh_bit3 ^ chip->rm_tc_bit5)
+               | (chip->rm_tc_bit3 ^ chip->rm_tc_bit5);
+        switch (slot->slot_num)
+        {
+        case 13: // hh
+            slot->pg_phase_out = rm_xor << 9;
+            if (rm_xor ^ (noise & 1))
+            {
+                slot->pg_phase_out |= 0xd0;
+            }
+            else
+            {
+                slot->pg_phase_out |= 0x34;
+            }
+            break;
+        case 16: // sd
+            slot->pg_phase_out = (chip->rm_hh_bit8 << 9)
+                               | ((chip->rm_hh_bit8 ^ (noise & 1)) << 8);
+            break;
+        case 17: // tc
+            slot->pg_phase_out = (rm_xor << 9) | 0x80;
+            break;
+        default:
+            break;
+        }
+    }
+    n_bit = ((noise >> 14) ^ noise) & 0x01;
+    chip->noise = (noise >> 1) | (n_bit << 22);
+}
+
+//
+// Slot
+//
+
+static void OPL3_SlotWrite20(opl3_slot *slot, Bit8u data)
+{
+    if ((data >> 7) & 0x01)
+    {
+        slot->trem = &slot->chip->tremolo;
+    }
+    else
+    {
+        slot->trem = (Bit8u*)&slot->chip->zeromod;
+    }
+    slot->reg_vib = (data >> 6) & 0x01;
+    slot->reg_type = (data >> 5) & 0x01;
+    slot->reg_ksr = (data >> 4) & 0x01;
+    slot->reg_mult = data & 0x0f;
+}
+
+static void OPL3_SlotWrite40(opl3_slot *slot, Bit8u data)
+{
+    slot->reg_ksl = (data >> 6) & 0x03;
+    slot->reg_tl = data & 0x3f;
+    OPL3_EnvelopeUpdateKSL(slot);
+}
+
+static void OPL3_SlotWrite60(opl3_slot *slot, Bit8u data)
+{
+    slot->reg_ar = (data >> 4) & 0x0f;
+    slot->reg_dr = data & 0x0f;
+}
+
+static void OPL3_SlotWrite80(opl3_slot *slot, Bit8u data)
+{
+    slot->reg_sl = (data >> 4) & 0x0f;
+    if (slot->reg_sl == 0x0f)
+    {
+        slot->reg_sl = 0x1f;
+    }
+    slot->reg_rr = data & 0x0f;
+}
+
+static void OPL3_SlotWriteE0(opl3_slot *slot, Bit8u data)
+{
+    slot->reg_wf = data & 0x07;
+    if (slot->chip->newm == 0x00)
+    {
+        slot->reg_wf &= 0x03;
+    }
+}
+
+static void OPL3_SlotGenerate(opl3_slot *slot)
+{
+    slot->out = envelope_sin[slot->reg_wf](slot->pg_phase_out + *slot->mod, slot->eg_out);
+}
+
+static void OPL3_SlotCalcFB(opl3_slot *slot)
+{
+    if (slot->channel->fb != 0x00)
+    {
+        slot->fbmod = (slot->prout + slot->out) >> (0x09 - slot->channel->fb);
+    }
+    else
+    {
+        slot->fbmod = 0;
+    }
+    slot->prout = slot->out;
+}
+
+//
+// Channel
+//
+
+static void OPL3_ChannelSetupAlg(opl3_channel *channel);
+
+static void OPL3_ChannelUpdateRhythm(opl3_chip *chip, Bit8u data)
+{
+    opl3_channel *channel6;
+    opl3_channel *channel7;
+    opl3_channel *channel8;
+    Bit8u chnum;
+
+    chip->rhy = data & 0x3f;
+    if (chip->rhy & 0x20)
+    {
+        channel6 = &chip->channel[6];
+        channel7 = &chip->channel[7];
+        channel8 = &chip->channel[8];
+        channel6->out[0] = &channel6->slots[1]->out;
+        channel6->out[1] = &channel6->slots[1]->out;
+        channel6->out[2] = &chip->zeromod;
+        channel6->out[3] = &chip->zeromod;
+        channel7->out[0] = &channel7->slots[0]->out;
+        channel7->out[1] = &channel7->slots[0]->out;
+        channel7->out[2] = &channel7->slots[1]->out;
+        channel7->out[3] = &channel7->slots[1]->out;
+        channel8->out[0] = &channel8->slots[0]->out;
+        channel8->out[1] = &channel8->slots[0]->out;
+        channel8->out[2] = &channel8->slots[1]->out;
+        channel8->out[3] = &channel8->slots[1]->out;
+        for (chnum = 6; chnum < 9; chnum++)
+        {
+            chip->channel[chnum].chtype = ch_drum;
+        }
+        OPL3_ChannelSetupAlg(channel6);
+        OPL3_ChannelSetupAlg(channel7);
+        OPL3_ChannelSetupAlg(channel8);
+        //hh
+        if (chip->rhy & 0x01)
+        {
+            OPL3_EnvelopeKeyOn(channel7->slots[0], egk_drum);
+        }
+        else
+        {
+            OPL3_EnvelopeKeyOff(channel7->slots[0], egk_drum);
+        }
+        //tc
+        if (chip->rhy & 0x02)
+        {
+            OPL3_EnvelopeKeyOn(channel8->slots[1], egk_drum);
+        }
+        else
+        {
+            OPL3_EnvelopeKeyOff(channel8->slots[1], egk_drum);
+        }
+        //tom
+        if (chip->rhy & 0x04)
+        {
+            OPL3_EnvelopeKeyOn(channel8->slots[0], egk_drum);
+        }
+        else
+        {
+            OPL3_EnvelopeKeyOff(channel8->slots[0], egk_drum);
+        }
+        //sd
+        if (chip->rhy & 0x08)
+        {
+            OPL3_EnvelopeKeyOn(channel7->slots[1], egk_drum);
+        }
+        else
+        {
+            OPL3_EnvelopeKeyOff(channel7->slots[1], egk_drum);
+        }
+        //bd
+        if (chip->rhy & 0x10)
+        {
+            OPL3_EnvelopeKeyOn(channel6->slots[0], egk_drum);
+            OPL3_EnvelopeKeyOn(channel6->slots[1], egk_drum);
+        }
+        else
+        {
+            OPL3_EnvelopeKeyOff(channel6->slots[0], egk_drum);
+            OPL3_EnvelopeKeyOff(channel6->slots[1], egk_drum);
+        }
+    }
+    else
+    {
+        for (chnum = 6; chnum < 9; chnum++)
+        {
+            chip->channel[chnum].chtype = ch_2op;
+            OPL3_ChannelSetupAlg(&chip->channel[chnum]);
+            OPL3_EnvelopeKeyOff(chip->channel[chnum].slots[0], egk_drum);
+            OPL3_EnvelopeKeyOff(chip->channel[chnum].slots[1], egk_drum);
+        }
+    }
+}
+
+static void OPL3_ChannelWriteA0(opl3_channel *channel, Bit8u data)
+{
+    if (channel->chip->newm && channel->chtype == ch_4op2)
+    {
+        return;
+    }
+    channel->f_num = (channel->f_num & 0x300) | data;
+    channel->ksv = (channel->block << 1)
+                 | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
+    OPL3_EnvelopeUpdateKSL(channel->slots[0]);
+    OPL3_EnvelopeUpdateKSL(channel->slots[1]);
+    if (channel->chip->newm && channel->chtype == ch_4op)
+    {
+        channel->pair->f_num = channel->f_num;
+        channel->pair->ksv = channel->ksv;
+        OPL3_EnvelopeUpdateKSL(channel->pair->slots[0]);
+        OPL3_EnvelopeUpdateKSL(channel->pair->slots[1]);
+    }
+}
+
+static void OPL3_ChannelWriteB0(opl3_channel *channel, Bit8u data)
+{
+    if (channel->chip->newm && channel->chtype == ch_4op2)
+    {
+        return;
+    }
+    channel->f_num = (channel->f_num & 0xff) | ((data & 0x03) << 8);
+    channel->block = (data >> 2) & 0x07;
+    channel->ksv = (channel->block << 1)
+                 | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
+    OPL3_EnvelopeUpdateKSL(channel->slots[0]);
+    OPL3_EnvelopeUpdateKSL(channel->slots[1]);
+    if (channel->chip->newm && channel->chtype == ch_4op)
+    {
+        channel->pair->f_num = channel->f_num;
+        channel->pair->block = channel->block;
+        channel->pair->ksv = channel->ksv;
+        OPL3_EnvelopeUpdateKSL(channel->pair->slots[0]);
+        OPL3_EnvelopeUpdateKSL(channel->pair->slots[1]);
+    }
+}
+
+static void OPL3_ChannelSetupAlg(opl3_channel *channel)
+{
+    if (channel->chtype == ch_drum)
+    {
+        if (channel->ch_num == 7 || channel->ch_num == 8)
+        {
+            channel->slots[0]->mod = &channel->chip->zeromod;
+            channel->slots[1]->mod = &channel->chip->zeromod;
+            return;
+        }
+        switch (channel->alg & 0x01)
+        {
+        case 0x00:
+            channel->slots[0]->mod = &channel->slots[0]->fbmod;
+            channel->slots[1]->mod = &channel->slots[0]->out;
+            break;
+        case 0x01:
+            channel->slots[0]->mod = &channel->slots[0]->fbmod;
+            channel->slots[1]->mod = &channel->chip->zeromod;
+            break;
+        }
+        return;
+    }
+    if (channel->alg & 0x08)
+    {
+        return;
+    }
+    if (channel->alg & 0x04)
+    {
+        channel->pair->out[0] = &channel->chip->zeromod;
+        channel->pair->out[1] = &channel->chip->zeromod;
+        channel->pair->out[2] = &channel->chip->zeromod;
+        channel->pair->out[3] = &channel->chip->zeromod;
+        switch (channel->alg & 0x03)
+        {
+        case 0x00:
+            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
+            channel->pair->slots[1]->mod = &channel->pair->slots[0]->out;
+            channel->slots[0]->mod = &channel->pair->slots[1]->out;
+            channel->slots[1]->mod = &channel->slots[0]->out;
+            channel->out[0] = &channel->slots[1]->out;
+            channel->out[1] = &channel->chip->zeromod;
+            channel->out[2] = &channel->chip->zeromod;
+            channel->out[3] = &channel->chip->zeromod;
+            break;
+        case 0x01:
+            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
+            channel->pair->slots[1]->mod = &channel->pair->slots[0]->out;
+            channel->slots[0]->mod = &channel->chip->zeromod;
+            channel->slots[1]->mod = &channel->slots[0]->out;
+            channel->out[0] = &channel->pair->slots[1]->out;
+            channel->out[1] = &channel->slots[1]->out;
+            channel->out[2] = &channel->chip->zeromod;
+            channel->out[3] = &channel->chip->zeromod;
+            break;
+        case 0x02:
+            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
+            channel->pair->slots[1]->mod = &channel->chip->zeromod;
+            channel->slots[0]->mod = &channel->pair->slots[1]->out;
+            channel->slots[1]->mod = &channel->slots[0]->out;
+            channel->out[0] = &channel->pair->slots[0]->out;
+            channel->out[1] = &channel->slots[1]->out;
+            channel->out[2] = &channel->chip->zeromod;
+            channel->out[3] = &channel->chip->zeromod;
+            break;
+        case 0x03:
+            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
+            channel->pair->slots[1]->mod = &channel->chip->zeromod;
+            channel->slots[0]->mod = &channel->pair->slots[1]->out;
+            channel->slots[1]->mod = &channel->chip->zeromod;
+            channel->out[0] = &channel->pair->slots[0]->out;
+            channel->out[1] = &channel->slots[0]->out;
+            channel->out[2] = &channel->slots[1]->out;
+            channel->out[3] = &channel->chip->zeromod;
+            break;
+        }
+    }
+    else
+    {
+        switch (channel->alg & 0x01)
+        {
+        case 0x00:
+            channel->slots[0]->mod = &channel->slots[0]->fbmod;
+            channel->slots[1]->mod = &channel->slots[0]->out;
+            channel->out[0] = &channel->slots[1]->out;
+            channel->out[1] = &channel->chip->zeromod;
+            channel->out[2] = &channel->chip->zeromod;
+            channel->out[3] = &channel->chip->zeromod;
+            break;
+        case 0x01:
+            channel->slots[0]->mod = &channel->slots[0]->fbmod;
+            channel->slots[1]->mod = &channel->chip->zeromod;
+            channel->out[0] = &channel->slots[0]->out;
+            channel->out[1] = &channel->slots[1]->out;
+            channel->out[2] = &channel->chip->zeromod;
+            channel->out[3] = &channel->chip->zeromod;
+            break;
+        }
+    }
+}
+
+static void OPL3_ChannelWriteC0(opl3_channel *channel, Bit8u data)
+{
+    channel->fb = (data & 0x0e) >> 1;
+    channel->con = data & 0x01;
+    channel->alg = channel->con;
+    if (channel->chip->newm)
+    {
+        if (channel->chtype == ch_4op)
+        {
+            channel->pair->alg = 0x04 | (channel->con << 1) | (channel->pair->con);
+            channel->alg = 0x08;
+            OPL3_ChannelSetupAlg(channel->pair);
+        }
+        else if (channel->chtype == ch_4op2)
+        {
+            channel->alg = 0x04 | (channel->pair->con << 1) | (channel->con);
+            channel->pair->alg = 0x08;
+            OPL3_ChannelSetupAlg(channel);
+        }
+        else
+        {
+            OPL3_ChannelSetupAlg(channel);
+        }
+    }
+    else
+    {
+        OPL3_ChannelSetupAlg(channel);
+    }
+    if (channel->chip->newm)
+    {
+        channel->cha = ((data >> 4) & 0x01) ? ~0 : 0;
+        channel->chb = ((data >> 5) & 0x01) ? ~0 : 0;
+    }
+    else
+    {
+        channel->cha = channel->chb = (Bit16u)~0;
+    }
+}
+
+static void OPL3_ChannelKeyOn(opl3_channel *channel)
+{
+    if (channel->chip->newm)
+    {
+        if (channel->chtype == ch_4op)
+        {
+            OPL3_EnvelopeKeyOn(channel->slots[0], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->slots[1], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->pair->slots[0], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->pair->slots[1], egk_norm);
+        }
+        else if (channel->chtype == ch_2op || channel->chtype == ch_drum)
+        {
+            OPL3_EnvelopeKeyOn(channel->slots[0], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->slots[1], egk_norm);
+        }
+    }
+    else
+    {
+        OPL3_EnvelopeKeyOn(channel->slots[0], egk_norm);
+        OPL3_EnvelopeKeyOn(channel->slots[1], egk_norm);
+    }
+}
+
+static void OPL3_ChannelKeyOff(opl3_channel *channel)
+{
+    if (channel->chip->newm)
+    {
+        if (channel->chtype == ch_4op)
+        {
+            OPL3_EnvelopeKeyOff(channel->slots[0], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->slots[1], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->pair->slots[0], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->pair->slots[1], egk_norm);
+        }
+        else if (channel->chtype == ch_2op || channel->chtype == ch_drum)
+        {
+            OPL3_EnvelopeKeyOff(channel->slots[0], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->slots[1], egk_norm);
+        }
+    }
+    else
+    {
+        OPL3_EnvelopeKeyOff(channel->slots[0], egk_norm);
+        OPL3_EnvelopeKeyOff(channel->slots[1], egk_norm);
+    }
+}
+
+static void OPL3_ChannelSet4Op(opl3_chip *chip, Bit8u data)
+{
+    Bit8u bit;
+    Bit8u chnum;
+    for (bit = 0; bit < 6; bit++)
+    {
+        chnum = bit;
+        if (bit >= 3)
+        {
+            chnum += 9 - 3;
+        }
+        if ((data >> bit) & 0x01)
+        {
+            chip->channel[chnum].chtype = ch_4op;
+            chip->channel[chnum + 3].chtype = ch_4op2;
+        }
+        else
+        {
+            chip->channel[chnum].chtype = ch_2op;
+            chip->channel[chnum + 3].chtype = ch_2op;
+        }
+    }
+}
+
+static Bit16s OPL3_ClipSample(Bit32s sample)
+{
+    if (sample > 32767)
+    {
+        sample = 32767;
+    }
+    else if (sample < -32768)
+    {
+        sample = -32768;
+    }
+    return (Bit16s)sample;
+}
+
+void OPL3_Generate(opl3_chip *chip, Bit16s *buf)
+{
+    Bit8u ii;
+    Bit8u jj;
+    Bit16s accm;
+    Bit8u shift = 0;
+
+    buf[1] = OPL3_ClipSample(chip->mixbuff[1]);
+
+    for (ii = 0; ii < 15; ii++)
+    {
+        OPL3_SlotCalcFB(&chip->slot[ii]);
+        OPL3_EnvelopeCalc(&chip->slot[ii]);
+        OPL3_PhaseGenerate(&chip->slot[ii]);
+        OPL3_SlotGenerate(&chip->slot[ii]);
+    }
+
+    chip->mixbuff[0] = 0;
+    for (ii = 0; ii < 18; ii++)
+    {
+        accm = 0;
+        for (jj = 0; jj < 4; jj++)
+        {
+            accm += *chip->channel[ii].out[jj];
+        }
+        chip->mixbuff[0] += (Bit16s)(accm & chip->channel[ii].cha);
+    }
+
+    for (ii = 15; ii < 18; ii++)
+    {
+        OPL3_SlotCalcFB(&chip->slot[ii]);
+        OPL3_EnvelopeCalc(&chip->slot[ii]);
+        OPL3_PhaseGenerate(&chip->slot[ii]);
+        OPL3_SlotGenerate(&chip->slot[ii]);
+    }
+
+    buf[0] = OPL3_ClipSample(chip->mixbuff[0]);
+
+    for (ii = 18; ii < 33; ii++)
+    {
+        OPL3_SlotCalcFB(&chip->slot[ii]);
+        OPL3_EnvelopeCalc(&chip->slot[ii]);
+        OPL3_PhaseGenerate(&chip->slot[ii]);
+        OPL3_SlotGenerate(&chip->slot[ii]);
+    }
+
+    chip->mixbuff[1] = 0;
+    for (ii = 0; ii < 18; ii++)
+    {
+        accm = 0;
+        for (jj = 0; jj < 4; jj++)
+        {
+            accm += *chip->channel[ii].out[jj];
+        }
+        chip->mixbuff[1] += (Bit16s)(accm & chip->channel[ii].chb);
+    }
+
+    for (ii = 33; ii < 36; ii++)
+    {
+        OPL3_SlotCalcFB(&chip->slot[ii]);
+        OPL3_EnvelopeCalc(&chip->slot[ii]);
+        OPL3_PhaseGenerate(&chip->slot[ii]);
+        OPL3_SlotGenerate(&chip->slot[ii]);
+    }
+
+    if ((chip->timer & 0x3f) == 0x3f)
+    {
+        chip->tremolopos = (chip->tremolopos + 1) % 210;
+    }
+    if (chip->tremolopos < 105)
+    {
+        chip->tremolo = chip->tremolopos >> chip->tremoloshift;
+    }
+    else
+    {
+        chip->tremolo = (210 - chip->tremolopos) >> chip->tremoloshift;
+    }
+
+    if ((chip->timer & 0x3ff) == 0x3ff)
+    {
+        chip->vibpos = (chip->vibpos + 1) & 7;
+    }
+
+    chip->timer++;
+
+    chip->eg_add = 0;
+    if (chip->eg_timer)
+    {
+        while (shift < 36 && ((chip->eg_timer >> shift) & 1) == 0)
+        {
+            shift++;
+        }
+        if (shift > 12)
+        {
+            chip->eg_add = 0;
+        }
+        else
+        {
+            chip->eg_add = shift + 1;
+        }
+    }
+
+    if (chip->eg_timerrem || chip->eg_state)
+    {
+        if (chip->eg_timer == 0xfffffffff)
+        {
+            chip->eg_timer = 0;
+            chip->eg_timerrem = 1;
+        }
+        else
+        {
+            chip->eg_timer++;
+            chip->eg_timerrem = 0;
+        }
+    }
+
+    chip->eg_state ^= 1;
+
+    while (chip->writebuf[chip->writebuf_cur].time <= chip->writebuf_samplecnt)
+    {
+        if (!(chip->writebuf[chip->writebuf_cur].reg & 0x200))
+        {
+            break;
+        }
+        chip->writebuf[chip->writebuf_cur].reg &= 0x1ff;
+        OPL3_WriteReg(chip, chip->writebuf[chip->writebuf_cur].reg,
+                      chip->writebuf[chip->writebuf_cur].data);
+        chip->writebuf_cur = (chip->writebuf_cur + 1) % OPL_WRITEBUF_SIZE;
+    }
+    chip->writebuf_samplecnt++;
+}
+
+void OPL3_GenerateResampled(opl3_chip *chip, Bit16s *buf)
+{
+    while (chip->samplecnt >= chip->rateratio)
+    {
+        chip->oldsamples[0] = chip->samples[0];
+        chip->oldsamples[1] = chip->samples[1];
+        OPL3_Generate(chip, chip->samples);
+        chip->samplecnt -= chip->rateratio;
+    }
+    buf[0] = (Bit16s)((chip->oldsamples[0] * (chip->rateratio - chip->samplecnt)
+                     + chip->samples[0] * chip->samplecnt) / chip->rateratio);
+    buf[1] = (Bit16s)((chip->oldsamples[1] * (chip->rateratio - chip->samplecnt)
+                     + chip->samples[1] * chip->samplecnt) / chip->rateratio);
+    chip->samplecnt += 1 << RSM_FRAC;
+}
+
+void OPL3_Reset(opl3_chip *chip, Bit32u samplerate)
+{
+    Bit8u slotnum;
+    Bit8u channum;
+
+    memset(chip, 0, sizeof(opl3_chip));
+    for (slotnum = 0; slotnum < 36; slotnum++)
+    {
+        chip->slot[slotnum].chip = chip;
+        chip->slot[slotnum].mod = &chip->zeromod;
+        chip->slot[slotnum].eg_rout = 0x1ff;
+        chip->slot[slotnum].eg_out = 0x1ff;
+        chip->slot[slotnum].eg_gen = envelope_gen_num_release;
+        chip->slot[slotnum].trem = (Bit8u*)&chip->zeromod;
+        chip->slot[slotnum].slot_num = slotnum;
+    }
+    for (channum = 0; channum < 18; channum++)
+    {
+        chip->channel[channum].slots[0] = &chip->slot[ch_slot[channum]];
+        chip->channel[channum].slots[1] = &chip->slot[ch_slot[channum] + 3];
+        chip->slot[ch_slot[channum]].channel = &chip->channel[channum];
+        chip->slot[ch_slot[channum] + 3].channel = &chip->channel[channum];
+        if ((channum % 9) < 3)
+        {
+            chip->channel[channum].pair = &chip->channel[channum + 3];
+        }
+        else if ((channum % 9) < 6)
+        {
+            chip->channel[channum].pair = &chip->channel[channum - 3];
+        }
+        chip->channel[channum].chip = chip;
+        chip->channel[channum].out[0] = &chip->zeromod;
+        chip->channel[channum].out[1] = &chip->zeromod;
+        chip->channel[channum].out[2] = &chip->zeromod;
+        chip->channel[channum].out[3] = &chip->zeromod;
+        chip->channel[channum].chtype = ch_2op;
+        chip->channel[channum].cha = 0xffff;
+        chip->channel[channum].chb = 0xffff;
+        chip->channel[channum].ch_num = channum;
+        OPL3_ChannelSetupAlg(&chip->channel[channum]);
+    }
+    chip->noise = 1;
+    chip->rateratio = (samplerate << RSM_FRAC) / 49716;
+    chip->tremoloshift = 4;
+    chip->vibshift = 1;
+}
+
+void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v)
+{
+    Bit8u high = (reg >> 8) & 0x01;
+    Bit8u regm = reg & 0xff;
+    switch (regm & 0xf0)
+    {
+    case 0x00:
+        if (high)
+        {
+            switch (regm & 0x0f)
+            {
+            case 0x04:
+                OPL3_ChannelSet4Op(chip, v);
+                break;
+            case 0x05:
+                chip->newm = v & 0x01;
+                break;
+            }
+        }
+        else
+        {
+            switch (regm & 0x0f)
+            {
+            case 0x08:
+                chip->nts = (v >> 6) & 0x01;
+                break;
+            }
+        }
+        break;
+    case 0x20:
+    case 0x30:
+        if (ad_slot[regm & 0x1f] >= 0)
+        {
+            OPL3_SlotWrite20(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
+        }
+        break;
+    case 0x40:
+    case 0x50:
+        if (ad_slot[regm & 0x1f] >= 0)
+        {
+            OPL3_SlotWrite40(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
+        }
+        break;
+    case 0x60:
+    case 0x70:
+        if (ad_slot[regm & 0x1f] >= 0)
+        {
+            OPL3_SlotWrite60(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
+        }
+        break;
+    case 0x80:
+    case 0x90:
+        if (ad_slot[regm & 0x1f] >= 0)
+        {
+            OPL3_SlotWrite80(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
+        }
+        break;
+    case 0xe0:
+    case 0xf0:
+        if (ad_slot[regm & 0x1f] >= 0)
+        {
+            OPL3_SlotWriteE0(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
+        }
+        break;
+    case 0xa0:
+        if ((regm & 0x0f) < 9)
+        {
+            OPL3_ChannelWriteA0(&chip->channel[9 * high + (regm & 0x0f)], v);
+        }
+        break;
+    case 0xb0:
+        if (regm == 0xbd && !high)
+        {
+            chip->tremoloshift = (((v >> 7) ^ 1) << 1) + 2;
+            chip->vibshift = ((v >> 6) & 0x01) ^ 1;
+            OPL3_ChannelUpdateRhythm(chip, v);
+        }
+        else if ((regm & 0x0f) < 9)
+        {
+            OPL3_ChannelWriteB0(&chip->channel[9 * high + (regm & 0x0f)], v);
+            if (v & 0x20)
+            {
+                OPL3_ChannelKeyOn(&chip->channel[9 * high + (regm & 0x0f)]);
+            }
+            else
+            {
+                OPL3_ChannelKeyOff(&chip->channel[9 * high + (regm & 0x0f)]);
+            }
+        }
+        break;
+    case 0xc0:
+        if ((regm & 0x0f) < 9)
+        {
+            OPL3_ChannelWriteC0(&chip->channel[9 * high + (regm & 0x0f)], v);
+        }
+        break;
+    }
+}
+
+void OPL3_WriteRegBuffered(opl3_chip *chip, Bit16u reg, Bit8u v)
+{
+    Bit64u time1, time2;
+
+    if (chip->writebuf[chip->writebuf_last].reg & 0x200)
+    {
+        OPL3_WriteReg(chip, chip->writebuf[chip->writebuf_last].reg & 0x1ff,
+                      chip->writebuf[chip->writebuf_last].data);
+
+        chip->writebuf_cur = (chip->writebuf_last + 1) % OPL_WRITEBUF_SIZE;
+        chip->writebuf_samplecnt = chip->writebuf[chip->writebuf_last].time;
+    }
+
+    chip->writebuf[chip->writebuf_last].reg = reg | 0x200;
+    chip->writebuf[chip->writebuf_last].data = v;
+    time1 = chip->writebuf_lasttime + OPL_WRITEBUF_DELAY;
+    time2 = chip->writebuf_samplecnt;
+
+    if (time1 < time2)
+    {
+        time1 = time2;
+    }
+
+    chip->writebuf[chip->writebuf_last].time = time1;
+    chip->writebuf_lasttime = time1;
+    chip->writebuf_last = (chip->writebuf_last + 1) % OPL_WRITEBUF_SIZE;
+}
+
+void OPL3_GenerateStream(opl3_chip *chip, Bit16s *sndptr, Bit32u numsamples)
+{
+    Bit32u i;
+
+    for(i = 0; i < numsamples; i++)
+    {
+        OPL3_GenerateResampled(chip, sndptr);
+        sndptr += 2;
+    }
+}
diff --git a/games/NXDoom/opl/opl3.h b/games/NXDoom/opl/opl3.h
new file mode 100644
index 000000000..2a64037a5
--- /dev/null
+++ b/games/NXDoom/opl/opl3.h
@@ -0,0 +1,150 @@
+//
+// Copyright (C) 2013-2018 Alexey Khokholov (Nuke.YKT)
+//
+// 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.
+//
+//
+//  Nuked OPL3 emulator.
+//  Thanks:
+//      MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+//          Feedback and Rhythm part calculation information.
+//      forums.submarine.org.uk(carbon14, opl3):
+//          Tremolo and phase generator calculation information.
+//      OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+//          OPL2 ROMs.
+//      siliconpr0n.org(John McMaster, digshadow):
+//          YMF262 and VRC VII decaps and die shots.
+//
+// version: 1.8
+//
+
+#ifndef OPL_OPL3_H
+#define OPL_OPL3_H
+
+#include <inttypes.h>
+
+#define OPL_WRITEBUF_SIZE   1024
+#define OPL_WRITEBUF_DELAY  2
+
+typedef uintptr_t       Bitu;
+typedef intptr_t        Bits;
+typedef uint64_t        Bit64u;
+typedef int64_t         Bit64s;
+typedef uint32_t        Bit32u;
+typedef int32_t         Bit32s;
+typedef uint16_t        Bit16u;
+typedef int16_t         Bit16s;
+typedef uint8_t         Bit8u;
+typedef int8_t          Bit8s;
+
+typedef struct _opl3_slot opl3_slot;
+typedef struct _opl3_channel opl3_channel;
+typedef struct _opl3_chip opl3_chip;
+
+struct _opl3_slot {
+    opl3_channel *channel;
+    opl3_chip *chip;
+    Bit16s out;
+    Bit16s fbmod;
+    Bit16s *mod;
+    Bit16s prout;
+    Bit16s eg_rout;
+    Bit16s eg_out;
+    Bit8u eg_inc;
+    Bit8u eg_gen;
+    Bit8u eg_rate;
+    Bit8u eg_ksl;
+    Bit8u *trem;
+    Bit8u reg_vib;
+    Bit8u reg_type;
+    Bit8u reg_ksr;
+    Bit8u reg_mult;
+    Bit8u reg_ksl;
+    Bit8u reg_tl;
+    Bit8u reg_ar;
+    Bit8u reg_dr;
+    Bit8u reg_sl;
+    Bit8u reg_rr;
+    Bit8u reg_wf;
+    Bit8u key;
+    Bit32u pg_reset;
+    Bit32u pg_phase;
+    Bit16u pg_phase_out;
+    Bit8u slot_num;
+};
+
+struct _opl3_channel {
+    opl3_slot *slots[2];
+    opl3_channel *pair;
+    opl3_chip *chip;
+    Bit16s *out[4];
+    Bit8u chtype;
+    Bit16u f_num;
+    Bit8u block;
+    Bit8u fb;
+    Bit8u con;
+    Bit8u alg;
+    Bit8u ksv;
+    Bit16u cha, chb;
+    Bit8u ch_num;
+};
+
+typedef struct _opl3_writebuf {
+    Bit64u time;
+    Bit16u reg;
+    Bit8u data;
+} opl3_writebuf;
+
+struct _opl3_chip {
+    opl3_channel channel[18];
+    opl3_slot slot[36];
+    Bit16u timer;
+    Bit64u eg_timer;
+    Bit8u eg_timerrem;
+    Bit8u eg_state;
+    Bit8u eg_add;
+    Bit8u newm;
+    Bit8u nts;
+    Bit8u rhy;
+    Bit8u vibpos;
+    Bit8u vibshift;
+    Bit8u tremolo;
+    Bit8u tremolopos;
+    Bit8u tremoloshift;
+    Bit32u noise;
+    Bit16s zeromod;
+    Bit32s mixbuff[2];
+    Bit8u rm_hh_bit2;
+    Bit8u rm_hh_bit3;
+    Bit8u rm_hh_bit7;
+    Bit8u rm_hh_bit8;
+    Bit8u rm_tc_bit3;
+    Bit8u rm_tc_bit5;
+    //OPL3L
+    Bit32s rateratio;
+    Bit32s samplecnt;
+    Bit16s oldsamples[2];
+    Bit16s samples[2];
+
+    Bit64u writebuf_samplecnt;
+    Bit32u writebuf_cur;
+    Bit32u writebuf_last;
+    Bit64u writebuf_lasttime;
+    opl3_writebuf writebuf[OPL_WRITEBUF_SIZE];
+};
+
+void OPL3_Generate(opl3_chip *chip, Bit16s *buf);
+void OPL3_GenerateResampled(opl3_chip *chip, Bit16s *buf);
+void OPL3_Reset(opl3_chip *chip, Bit32u samplerate);
+void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v);
+void OPL3_WriteRegBuffered(opl3_chip *chip, Bit16u reg, Bit8u v);
+void OPL3_GenerateStream(opl3_chip *chip, Bit16s *sndptr, Bit32u numsamples);
+#endif
diff --git a/games/NXDoom/opl/opl_internal.h b/games/NXDoom/opl/opl_internal.h
new file mode 100644
index 000000000..68fd0b82f
--- /dev/null
+++ b/games/NXDoom/opl/opl_internal.h
@@ -0,0 +1,71 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL internal interface.
+//
+
+
+#ifndef OPL_INTERNAL_H
+#define OPL_INTERNAL_H
+
+#include "opl.h"
+
+typedef int (*opl_init_func)(unsigned int port_base);
+typedef void (*opl_shutdown_func)(void);
+typedef unsigned int (*opl_read_port_func)(opl_port_t port);
+typedef void (*opl_write_port_func)(opl_port_t port, unsigned int value);
+typedef void (*opl_set_callback_func)(uint64_t us,
+                                      opl_callback_t callback,
+                                      void *data);
+typedef void (*opl_clear_callbacks_func)(void);
+typedef void (*opl_lock_func)(void);
+typedef void (*opl_unlock_func)(void);
+typedef void (*opl_set_paused_func)(int paused);
+typedef void (*opl_adjust_callbacks_func)(float value);
+
+typedef struct
+{
+    const char *name;
+
+    opl_init_func init_func;
+    opl_shutdown_func shutdown_func;
+    opl_read_port_func read_port_func;
+    opl_write_port_func write_port_func;
+    opl_set_callback_func set_callback_func;
+    opl_clear_callbacks_func clear_callbacks_func;
+    opl_lock_func lock_func;
+    opl_unlock_func unlock_func;
+    opl_set_paused_func set_paused_func;
+    opl_adjust_callbacks_func adjust_callbacks_func;
+} opl_driver_t;
+
+// Sample rate to use when doing software emulation.
+
+extern unsigned int opl_sample_rate;
+
+
+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
+extern opl_driver_t opl_linux_driver;
+#endif
+#if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64)
+extern opl_driver_t opl_openbsd_driver;
+#endif
+#ifdef _WIN32
+extern opl_driver_t opl_win32_driver;
+#endif
+extern opl_driver_t opl_sdl_driver;
+
+
+#endif /* #ifndef OPL_INTERNAL_H */
+
diff --git a/games/NXDoom/opl/opl_linux.c b/games/NXDoom/opl/opl_linux.c
new file mode 100644
index 000000000..03160fa1b
--- /dev/null
+++ b/games/NXDoom/opl/opl_linux.c
@@ -0,0 +1,103 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL Linux interface.
+//
+
+#include "config.h"
+
+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/io.h>
+
+#include "opl.h"
+#include "opl_internal.h"
+#include "opl_timer.h"
+
+static unsigned int opl_port_base;
+
+static int OPL_Linux_Init(unsigned int port_base)
+{
+    // Try to get permissions:
+
+    if (ioperm(port_base, 3, 1) < 0)
+    {
+        fprintf(stderr, "Failed to get I/O port permissions for 0x%x: %s\n",
+                        port_base, strerror(errno));
+
+        if (errno == EPERM)
+        {
+            fprintf(stderr,
+                    "\tYou may need to run the program as root in order\n"
+                    "\tto acquire I/O port permissions for OPL MIDI playback.\n");
+        }
+
+        return 0;
+    }
+
+    opl_port_base = port_base;
+
+    // Start callback thread
+
+    if (!OPL_Timer_StartThread())
+    {
+        ioperm(port_base, 2, 0);
+        return 0;
+    }
+
+    return 1;
+}
+
+static void OPL_Linux_Shutdown(void)
+{
+    // Stop callback thread
+
+    OPL_Timer_StopThread();
+
+    // Release permissions
+
+    ioperm(opl_port_base, 2, 0);
+}
+
+static unsigned int OPL_Linux_PortRead(opl_port_t port)
+{
+    return inb(opl_port_base + port);
+}
+
+static void OPL_Linux_PortWrite(opl_port_t port, unsigned int value)
+{
+    outb(value, opl_port_base + port);
+}
+
+opl_driver_t opl_linux_driver =
+{
+    "Linux",
+    OPL_Linux_Init,
+    OPL_Linux_Shutdown,
+    OPL_Linux_PortRead,
+    OPL_Linux_PortWrite,
+    OPL_Timer_SetCallback,
+    OPL_Timer_ClearCallbacks,
+    OPL_Timer_Lock,
+    OPL_Timer_Unlock,
+    OPL_Timer_SetPaused,
+    OPL_Timer_AdjustCallbacks,
+};
+
+#endif /* #if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) */
+
diff --git a/games/NXDoom/opl/opl_obsd.c b/games/NXDoom/opl/opl_obsd.c
new file mode 100644
index 000000000..39e0c1560
--- /dev/null
+++ b/games/NXDoom/opl/opl_obsd.c
@@ -0,0 +1,118 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL OpenBSD interface (also NetBSD)
+//
+
+#include "config.h"
+
+// OpenBSD has a i386_iopl on i386 and amd64_iopl on x86_64,
+// even though they do the same thing.  Take care of this
+// here, and map set_iopl to point to the appropriate name.
+
+#if defined(HAVE_LIBI386)
+
+#include <sys/types.h>
+#include <machine/sysarch.h>
+#include <i386/pio.h>
+#define set_iopl i386_iopl
+
+#elif defined(HAVE_LIBAMD64)
+
+#include <sys/types.h>
+#include <machine/sysarch.h>
+#include <amd64/pio.h>
+#define set_iopl amd64_iopl
+
+#else
+#define NO_OBSD_DRIVER
+#endif
+
+// If the above succeeded, proceed with the rest.
+
+#ifndef NO_OBSD_DRIVER
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include "opl.h"
+#include "opl_internal.h"
+#include "opl_timer.h"
+
+static unsigned int opl_port_base;
+
+static int OPL_OpenBSD_Init(unsigned int port_base)
+{
+    // Try to get permissions:
+
+    if (set_iopl(3) < 0)
+    {
+        fprintf(stderr, "Failed to get raise I/O privilege level: "
+                        "check that you are running as root.\n");
+        return 0;
+    }
+
+    opl_port_base = port_base;
+
+    // Start callback thread
+
+    if (!OPL_Timer_StartThread())
+    {
+        set_iopl(0);
+        return 0;
+    }
+
+    return 1;
+}
+
+static void OPL_OpenBSD_Shutdown(void)
+{
+    // Stop callback thread
+
+    OPL_Timer_StopThread();
+
+    // Release I/O port permissions:
+
+    set_iopl(0);
+}
+
+static unsigned int OPL_OpenBSD_PortRead(opl_port_t port)
+{
+    return inb(opl_port_base + port);
+}
+
+static void OPL_OpenBSD_PortWrite(opl_port_t port, unsigned int value)
+{
+    outb(opl_port_base + port, value);
+}
+
+opl_driver_t opl_openbsd_driver =
+{
+    "OpenBSD",
+    OPL_OpenBSD_Init,
+    OPL_OpenBSD_Shutdown,
+    OPL_OpenBSD_PortRead,
+    OPL_OpenBSD_PortWrite,
+    OPL_Timer_SetCallback,
+    OPL_Timer_ClearCallbacks,
+    OPL_Timer_Lock,
+    OPL_Timer_Unlock,
+    OPL_Timer_SetPaused,
+    OPL_Timer_AdjustCallbacks,
+};
+
+#endif /* #ifndef NO_OBSD_DRIVER */
+
diff --git a/games/NXDoom/opl/opl_queue.c b/games/NXDoom/opl/opl_queue.c
new file mode 100644
index 000000000..e948b6413
--- /dev/null
+++ b/games/NXDoom/opl/opl_queue.c
@@ -0,0 +1,285 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Queue of waiting callbacks, stored in a binary min heap, so that we
+//     can always get the first callback.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "opl_queue.h"
+
+#define MAX_OPL_QUEUE 64
+
+typedef struct
+{
+    opl_callback_t callback;
+    void *data;
+    uint64_t time;
+} opl_queue_entry_t;
+
+struct opl_callback_queue_s
+{
+    opl_queue_entry_t entries[MAX_OPL_QUEUE];
+    unsigned int num_entries;
+};
+
+opl_callback_queue_t *OPL_Queue_Create(void)
+{
+    opl_callback_queue_t *queue;
+
+    queue = malloc(sizeof(opl_callback_queue_t));
+    queue->num_entries = 0;
+
+    return queue;
+}
+
+void OPL_Queue_Destroy(opl_callback_queue_t *queue)
+{
+    free(queue);
+}
+
+int OPL_Queue_IsEmpty(opl_callback_queue_t *queue)
+{
+    return queue->num_entries == 0;
+}
+
+void OPL_Queue_Clear(opl_callback_queue_t *queue)
+{
+    queue->num_entries = 0;
+}
+
+void OPL_Queue_Push(opl_callback_queue_t *queue,
+                    opl_callback_t callback, void *data,
+                    uint64_t time)
+{
+    int entry_id;
+    int parent_id;
+
+    if (queue->num_entries >= MAX_OPL_QUEUE)
+    {
+        fprintf(stderr, "OPL_Queue_Push: Exceeded maximum callbacks\n");
+        return;
+    }
+
+    // Add to last queue entry.
+
+    entry_id = queue->num_entries;
+    ++queue->num_entries;
+
+    // Shift existing entries down in the heap.
+
+    while (entry_id > 0)
+    {
+        parent_id = (entry_id - 1) / 2;
+
+        // Is the heap condition satisfied?
+
+        if (time >= queue->entries[parent_id].time)
+        {
+            break;
+        }
+
+        // Move the existing entry down in the heap.
+
+        memcpy(&queue->entries[entry_id],
+               &queue->entries[parent_id],
+               sizeof(opl_queue_entry_t));
+
+        // Advance to the parent.
+
+        entry_id = parent_id;
+    }
+
+    // Insert new callback data.
+
+    queue->entries[entry_id].callback = callback;
+    queue->entries[entry_id].data = data;
+    queue->entries[entry_id].time = time;
+}
+
+int OPL_Queue_Pop(opl_callback_queue_t *queue,
+                  opl_callback_t *callback, void **data)
+{
+    opl_queue_entry_t *entry;
+    int child1, child2;
+    int i, next_i;
+
+    // Empty?
+
+    if (queue->num_entries <= 0)
+    {
+        return 0;
+    }
+
+    // Store the result:
+
+    *callback = queue->entries[0].callback;
+    *data = queue->entries[0].data;
+
+    // Decrease the heap size, and keep pointer to the last entry in
+    // the heap, which must now be percolated down from the top.
+
+    --queue->num_entries;
+    entry = &queue->entries[queue->num_entries];
+
+    // Percolate down.
+
+    i = 0;
+
+    for (;;)
+    {
+        child1 = i * 2 + 1;
+        child2 = i * 2 + 2;
+
+        if (child1 < queue->num_entries
+         && queue->entries[child1].time < entry->time)
+        {
+            // Left child is less than entry.
+            // Use the minimum of left and right children.
+
+            if (child2 < queue->num_entries
+             && queue->entries[child2].time < queue->entries[child1].time)
+            {
+                next_i = child2;
+            }
+            else
+            {
+                next_i = child1;
+            }
+        }
+        else if (child2 < queue->num_entries
+              && queue->entries[child2].time < entry->time)
+        {
+            // Right child is less than entry.  Go down the right side.
+
+            next_i = child2;
+        }
+        else
+        {
+            // Finished percolating.
+            break;
+        }
+
+        // Percolate the next value up and advance.
+
+        memcpy(&queue->entries[i],
+               &queue->entries[next_i],
+               sizeof(opl_queue_entry_t));
+        i = next_i;
+    }
+
+    // Store the old last-entry at its new position.
+
+    memcpy(&queue->entries[i], entry, sizeof(opl_queue_entry_t));
+
+    return 1;
+}
+
+uint64_t OPL_Queue_Peek(opl_callback_queue_t *queue)
+{
+    if (queue->num_entries > 0)
+    {
+        return queue->entries[0].time;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+void OPL_Queue_AdjustCallbacks(opl_callback_queue_t *queue,
+                               uint64_t time, float factor)
+{
+    int64_t offset;
+    int i;
+
+    for (i = 0; i < queue->num_entries; ++i)
+    {
+        offset = queue->entries[i].time - time;
+        queue->entries[i].time = time + (uint64_t) (offset / factor);
+    }
+}
+
+#ifdef TEST
+
+#include <assert.h>
+
+static void PrintQueueNode(opl_callback_queue_t *queue, int node, int depth)
+{
+    int i;
+
+    if (node >= queue->num_entries)
+    {
+        return;
+    }
+
+    for (i=0; i<depth * 3; ++i)
+    {
+        printf(" ");
+    }
+
+    printf("%i\n", queue->entries[node].time);
+
+    PrintQueueNode(queue, node * 2 + 1, depth + 1);
+    PrintQueueNode(queue, node * 2 + 2, depth + 1);
+}
+
+static void PrintQueue(opl_callback_queue_t *queue)
+{
+    PrintQueueNode(queue, 0, 0);
+}
+
+int main()
+{
+    opl_callback_queue_t *queue;
+    int iteration;
+
+    queue = OPL_Queue_Create();
+
+    for (iteration=0; iteration<5000; ++iteration)
+    {
+        opl_callback_t callback;
+        void *data;
+        unsigned int time;
+        unsigned int newtime;
+        int i;
+
+        for (i=0; i<MAX_OPL_QUEUE; ++i)
+        {
+            time = rand() % 0x10000;
+            OPL_Queue_Push(queue, NULL, NULL, time);
+        }
+
+        time = 0;
+
+        for (i=0; i<MAX_OPL_QUEUE; ++i)
+        {
+            assert(!OPL_Queue_IsEmpty(queue));
+            newtime = OPL_Queue_Peek(queue);
+            assert(OPL_Queue_Pop(queue, &callback, &data));
+
+            assert(newtime >= time);
+            time = newtime;
+        }
+
+        assert(OPL_Queue_IsEmpty(queue));
+        assert(!OPL_Queue_Pop(queue, &callback, &data));
+    }
+}
+
+#endif
+
diff --git a/games/NXDoom/opl/opl_queue.h b/games/NXDoom/opl/opl_queue.h
new file mode 100644
index 000000000..8b4f0dbee
--- /dev/null
+++ b/games/NXDoom/opl/opl_queue.h
@@ -0,0 +1,39 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL callback queue.
+//
+
+#ifndef OPL_QUEUE_H
+#define OPL_QUEUE_H
+
+#include "opl.h"
+
+typedef struct opl_callback_queue_s opl_callback_queue_t;
+
+opl_callback_queue_t *OPL_Queue_Create(void);
+int OPL_Queue_IsEmpty(opl_callback_queue_t *queue);
+void OPL_Queue_Clear(opl_callback_queue_t *queue);
+void OPL_Queue_Destroy(opl_callback_queue_t *queue);
+void OPL_Queue_Push(opl_callback_queue_t *queue,
+                    opl_callback_t callback, void *data,
+                    uint64_t time);
+int OPL_Queue_Pop(opl_callback_queue_t *queue,
+                  opl_callback_t *callback, void **data);
+uint64_t OPL_Queue_Peek(opl_callback_queue_t *queue);
+void OPL_Queue_AdjustCallbacks(opl_callback_queue_t *queue,
+                               uint64_t time, float factor);
+
+#endif /* #ifndef OPL_QUEUE_H */
+
diff --git a/games/NXDoom/opl/opl_sdl.c b/games/NXDoom/opl/opl_sdl.c
new file mode 100644
index 000000000..2517de15c
--- /dev/null
+++ b/games/NXDoom/opl/opl_sdl.c
@@ -0,0 +1,521 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL SDL interface.
+//
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "SDL.h"
+#ifndef DISABLE_SDL2MIXER
+#include "SDL_mixer.h"
+#endif  // DISABLE_SDL2MIXER
+
+#include "opl3.h"
+
+#include "opl.h"
+#include "opl_internal.h"
+
+#include "opl_queue.h"
+
+
+#ifndef DISABLE_SDL2MIXER
+
+
+#define MAX_SOUND_SLICE_TIME 100 /* ms */
+
+typedef struct
+{
+    unsigned int rate;        // Number of times the timer is advanced per sec.
+    unsigned int enabled;     // Non-zero if timer is enabled.
+    unsigned int value;       // Last value that was set.
+    uint64_t expire_time;     // Calculated time that timer will expire.
+} opl_timer_t;
+
+// When the callback mutex is locked using OPL_Lock, callback functions
+// are not invoked.
+
+static SDL_mutex *callback_mutex = NULL;
+
+// Queue of callbacks waiting to be invoked.
+
+static opl_callback_queue_t *callback_queue;
+
+// Mutex used to control access to the callback queue.
+
+static SDL_mutex *callback_queue_mutex = NULL;
+
+// Current time, in us since startup:
+
+static uint64_t current_time;
+
+// If non-zero, playback is currently paused.
+
+static int opl_sdl_paused;
+
+// Time offset (in us) due to the fact that callbacks
+// were previously paused.
+
+static uint64_t pause_offset;
+
+// OPL software emulator structure.
+
+static opl3_chip opl_chip;
+static int opl_opl3mode;
+
+// Temporary mixing buffer used by the mixing callback.
+
+static uint8_t *mix_buffer = NULL;
+
+// Register number that was written.
+
+static int register_num = 0;
+
+// Timers; DBOPL does not do timer stuff itself.
+
+static opl_timer_t timer1 = { 12500, 0, 0, 0 };
+static opl_timer_t timer2 = { 3125, 0, 0, 0 };
+
+// SDL parameters.
+
+static int sdl_was_initialized = 0;
+static int mixing_freq, mixing_channels;
+static Uint16 mixing_format;
+
+static int SDLIsInitialized(void)
+{
+    int freq, channels;
+    Uint16 format;
+
+    return Mix_QuerySpec(&freq, &format, &channels);
+}
+
+// Advance time by the specified number of samples, invoking any
+// callback functions as appropriate.
+
+static void AdvanceTime(unsigned int nsamples)
+{
+    opl_callback_t callback;
+    void *callback_data;
+    uint64_t us;
+
+    SDL_LockMutex(callback_queue_mutex);
+
+    // Advance time.
+
+    us = ((uint64_t) nsamples * OPL_SECOND) / mixing_freq;
+    current_time += us;
+
+    if (opl_sdl_paused)
+    {
+        pause_offset += us;
+    }
+
+    // Are there callbacks to invoke now?  Keep invoking them
+    // until there are no more left.
+
+    while (!OPL_Queue_IsEmpty(callback_queue)
+        && current_time >= OPL_Queue_Peek(callback_queue) + pause_offset)
+    {
+        // Pop the callback from the queue to invoke it.
+
+        if (!OPL_Queue_Pop(callback_queue, &callback, &callback_data))
+        {
+            break;
+        }
+
+        // The mutex stuff here is a bit complicated.  We must
+        // hold callback_mutex when we invoke the callback (so that
+        // the control thread can use OPL_Lock() to prevent callbacks
+        // from being invoked), but we must not be holding
+        // callback_queue_mutex, as the callback must be able to
+        // call OPL_SetCallback to schedule new callbacks.
+
+        SDL_UnlockMutex(callback_queue_mutex);
+
+        SDL_LockMutex(callback_mutex);
+        callback(callback_data);
+        SDL_UnlockMutex(callback_mutex);
+
+        SDL_LockMutex(callback_queue_mutex);
+    }
+
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+// Call the OPL emulator code to fill the specified buffer.
+
+static void FillBuffer(uint8_t *buffer, unsigned int nsamples)
+{
+    // This seems like a reasonable assumption.  mix_buffer is
+    // 1 second long, which should always be much longer than the
+    // SDL mix buffer.
+    assert(nsamples < mixing_freq);
+
+    // OPL output is generated into temporary buffer and then mixed
+    // (to avoid overflows etc.)
+    OPL3_GenerateStream(&opl_chip, (Bit16s *) mix_buffer, nsamples);
+    SDL_MixAudioFormat(buffer, mix_buffer, AUDIO_S16SYS, nsamples * 4,
+                       SDL_MIX_MAXVOLUME);
+}
+
+// Callback function to fill a new sound buffer:
+
+static void OPL_Mix_Callback(int chan, void *stream, int len, void *udata)
+{
+    unsigned int filled, buffer_samples;
+    Uint8 *buffer = (Uint8*)stream;
+
+    // Repeatedly call the OPL emulator update function until the buffer is
+    // full.
+    filled = 0;
+    buffer_samples = len / 4;
+
+    while (filled < buffer_samples)
+    {
+        uint64_t next_callback_time;
+        uint64_t nsamples;
+
+        SDL_LockMutex(callback_queue_mutex);
+
+        // Work out the time until the next callback waiting in
+        // the callback queue must be invoked.  We can then fill the
+        // buffer with this many samples.
+
+        if (opl_sdl_paused || OPL_Queue_IsEmpty(callback_queue))
+        {
+            nsamples = buffer_samples - filled;
+        }
+        else
+        {
+            next_callback_time = OPL_Queue_Peek(callback_queue) + pause_offset;
+
+            nsamples = (next_callback_time - current_time) * mixing_freq;
+            nsamples = (nsamples + OPL_SECOND - 1) / OPL_SECOND;
+
+            if (nsamples > buffer_samples - filled)
+            {
+                nsamples = buffer_samples - filled;
+            }
+        }
+
+        SDL_UnlockMutex(callback_queue_mutex);
+
+        // Add emulator output to buffer.
+
+        FillBuffer(buffer + filled * 4, nsamples);
+        filled += nsamples;
+
+        // Invoke callbacks for this point in time.
+
+        AdvanceTime(nsamples);
+    }
+}
+
+static void OPL_SDL_Shutdown(void)
+{
+    Mix_HookMusic(NULL, NULL);
+
+    if (sdl_was_initialized)
+    {
+        Mix_CloseAudio();
+        SDL_QuitSubSystem(SDL_INIT_AUDIO);
+        OPL_Queue_Destroy(callback_queue);
+        free(mix_buffer);
+        sdl_was_initialized = 0;
+    }
+
+/*
+    if (opl_chip != NULL)
+    {
+        OPLDestroy(opl_chip);
+        opl_chip = NULL;
+    }
+    */
+
+    if (callback_mutex != NULL)
+    {
+        SDL_DestroyMutex(callback_mutex);
+        callback_mutex = NULL;
+    }
+
+    if (callback_queue_mutex != NULL)
+    {
+        SDL_DestroyMutex(callback_queue_mutex);
+        callback_queue_mutex = NULL;
+    }
+}
+
+static unsigned int GetSliceSize(void)
+{
+    int limit;
+    int n;
+
+    limit = (opl_sample_rate * MAX_SOUND_SLICE_TIME) / 1000;
+
+    // Try all powers of two, not exceeding the limit.
+
+    for (n=0;; ++n)
+    {
+        // 2^n <= limit < 2^n+1 ?
+
+        if ((1 << (n + 1)) > limit)
+        {
+            return (1 << n);
+        }
+    }
+
+    // Should never happen?
+
+    return 1024;
+}
+
+static int OPL_SDL_Init(unsigned int port_base)
+{
+    // Check if SDL_mixer has been opened already
+    // If not, we must initialize it now
+
+    if (!SDLIsInitialized())
+    {
+        if (SDL_Init(SDL_INIT_AUDIO) < 0)
+        {
+            fprintf(stderr, "Unable to set up sound.\n");
+            return 0;
+        }
+
+        if (Mix_OpenAudioDevice(opl_sample_rate, AUDIO_S16SYS, 2, GetSliceSize(), NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
+        {
+            fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
+
+            SDL_QuitSubSystem(SDL_INIT_AUDIO);
+            return 0;
+        }
+
+        SDL_PauseAudio(0);
+
+        // When this module shuts down, it has the responsibility to 
+        // shut down SDL.
+
+        sdl_was_initialized = 1;
+    }
+    else
+    {
+        sdl_was_initialized = 0;
+    }
+
+    opl_sdl_paused = 0;
+    pause_offset = 0;
+
+    // Queue structure of callbacks to invoke.
+
+    callback_queue = OPL_Queue_Create();
+    current_time = 0;
+
+    // Get the mixer frequency, format and number of channels.
+
+    Mix_QuerySpec(&mixing_freq, &mixing_format, &mixing_channels);
+
+    // Only supports AUDIO_S16SYS
+
+    if (mixing_format != AUDIO_S16SYS || mixing_channels != 2)
+    {
+        fprintf(stderr, 
+                "OPL_SDL only supports native signed 16-bit LSB, "
+                "stereo format!\n");
+
+        OPL_SDL_Shutdown();
+        return 0;
+    }
+
+    // Mix buffer: four bytes per sample (16 bits * 2 channels):
+    mix_buffer = malloc(mixing_freq * 4);
+
+    // Create the emulator structure:
+
+    OPL3_Reset(&opl_chip, mixing_freq);
+    opl_opl3mode = 0;
+
+    callback_mutex = SDL_CreateMutex();
+    callback_queue_mutex = SDL_CreateMutex();
+
+    // Set postmix that adds the OPL music. This is deliberately done
+    // as a postmix and not using Mix_HookMusic() as the latter disables
+    // normal SDL_mixer music mixing.
+    Mix_RegisterEffect(MIX_CHANNEL_POST, OPL_Mix_Callback, NULL, NULL);
+
+    return 1;
+}
+
+static unsigned int OPL_SDL_PortRead(opl_port_t port)
+{
+    unsigned int result = 0;
+
+    if (port == OPL_REGISTER_PORT_OPL3)
+    {
+        return 0xff;
+    }
+
+    if (timer1.enabled && current_time > timer1.expire_time)
+    {
+        result |= 0x80;   // Either have expired
+        result |= 0x40;   // Timer 1 has expired
+    }
+
+    if (timer2.enabled && current_time > timer2.expire_time)
+    {
+        result |= 0x80;   // Either have expired
+        result |= 0x20;   // Timer 2 has expired
+    }
+
+    return result;
+}
+
+static void OPLTimer_CalculateEndTime(opl_timer_t *timer)
+{
+    int tics;
+
+    // If the timer is enabled, calculate the time when the timer
+    // will expire.
+
+    if (timer->enabled)
+    {
+        tics = 0x100 - timer->value;
+        timer->expire_time = current_time
+                           + ((uint64_t) tics * OPL_SECOND) / timer->rate;
+    }
+}
+
+static void WriteRegister(unsigned int reg_num, unsigned int value)
+{
+    switch (reg_num)
+    {
+        case OPL_REG_TIMER1:
+            timer1.value = value;
+            OPLTimer_CalculateEndTime(&timer1);
+            break;
+
+        case OPL_REG_TIMER2:
+            timer2.value = value;
+            OPLTimer_CalculateEndTime(&timer2);
+            break;
+
+        case OPL_REG_TIMER_CTRL:
+            if (value & 0x80)
+            {
+                timer1.enabled = 0;
+                timer2.enabled = 0;
+            }
+            else
+            {
+                if ((value & 0x40) == 0)
+                {
+                    timer1.enabled = (value & 0x01) != 0;
+                    OPLTimer_CalculateEndTime(&timer1);
+                }
+
+                if ((value & 0x20) == 0)
+                {
+                    timer2.enabled = (value & 0x02) != 0;
+                    OPLTimer_CalculateEndTime(&timer2);
+                }
+            }
+
+            break;
+
+        case OPL_REG_NEW:
+            opl_opl3mode = value & 0x01;
+
+        default:
+            OPL3_WriteRegBuffered(&opl_chip, reg_num, value);
+            break;
+    }
+}
+
+static void OPL_SDL_PortWrite(opl_port_t port, unsigned int value)
+{
+    if (port == OPL_REGISTER_PORT)
+    {
+        register_num = value;
+    }
+    else if (port == OPL_REGISTER_PORT_OPL3)
+    {
+        register_num = value | 0x100;
+    }
+    else if (port == OPL_DATA_PORT)
+    {
+        WriteRegister(register_num, value);
+    }
+}
+
+static void OPL_SDL_SetCallback(uint64_t us, opl_callback_t callback,
+                                void *data)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    OPL_Queue_Push(callback_queue, callback, data,
+                   current_time - pause_offset + us);
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+static void OPL_SDL_ClearCallbacks(void)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    OPL_Queue_Clear(callback_queue);
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+static void OPL_SDL_Lock(void)
+{
+    SDL_LockMutex(callback_mutex);
+}
+
+static void OPL_SDL_Unlock(void)
+{
+    SDL_UnlockMutex(callback_mutex);
+}
+
+static void OPL_SDL_SetPaused(int paused)
+{
+    opl_sdl_paused = paused;
+}
+
+static void OPL_SDL_AdjustCallbacks(float factor)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    OPL_Queue_AdjustCallbacks(callback_queue, current_time, factor);
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+opl_driver_t opl_sdl_driver =
+{
+    "SDL",
+    OPL_SDL_Init,
+    OPL_SDL_Shutdown,
+    OPL_SDL_PortRead,
+    OPL_SDL_PortWrite,
+    OPL_SDL_SetCallback,
+    OPL_SDL_ClearCallbacks,
+    OPL_SDL_Lock,
+    OPL_SDL_Unlock,
+    OPL_SDL_SetPaused,
+    OPL_SDL_AdjustCallbacks,
+};
+
+
+#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/opl/opl_timer.c b/games/NXDoom/opl/opl_timer.c
new file mode 100644
index 000000000..2c4ce273e
--- /dev/null
+++ b/games/NXDoom/opl/opl_timer.c
@@ -0,0 +1,250 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL timer thread.
+//     Once started using OPL_Timer_StartThread, the thread sleeps,
+//     waking up to invoke callbacks set using OPL_Timer_SetCallback.
+//
+
+#include "SDL.h"
+
+#include "opl_timer.h"
+#include "opl_queue.h"
+
+typedef enum
+{
+    THREAD_STATE_STOPPED,
+    THREAD_STATE_RUNNING,
+    THREAD_STATE_STOPPING,
+} thread_state_t;
+
+static SDL_Thread *timer_thread = NULL;
+static thread_state_t timer_thread_state;
+static uint64_t current_time;
+
+// If non-zero, callbacks are currently paused.
+
+static int opl_timer_paused;
+
+// Offset in microseconds to adjust time due to the fact that playback
+// was paused.
+
+static uint64_t pause_offset = 0;
+
+// Queue of callbacks waiting to be invoked.
+// The callback queue mutex is held while the callback queue structure
+// or current_time is being accessed.
+
+static opl_callback_queue_t *callback_queue;
+static SDL_mutex *callback_queue_mutex;
+
+// The timer mutex is held while timer callback functions are being
+// invoked, so that the calling code can prevent clashes.
+
+static SDL_mutex *timer_mutex;
+
+// Returns true if there is a callback at the head of the queue ready
+// to be invoked.  Otherwise, next_time is set to the time when the
+// timer thread must wake up again to check.
+
+static int CallbackWaiting(uint64_t *next_time)
+{
+    // If paused, just wait in 50ms increments until unpaused.
+    // Update pause_offset so after we unpause, the callback 
+    // times will be right.
+
+    if (opl_timer_paused)
+    {
+        *next_time = current_time + 50 * OPL_MS;
+        pause_offset += 50 * OPL_MS;
+        return 0;
+    }
+
+    // If there are no queued callbacks, sleep for 50ms at a time
+    // until a callback is added.
+
+    if (OPL_Queue_IsEmpty(callback_queue))
+    {
+        *next_time = current_time + 50 * OPL_MS;
+        return 0;
+    }
+
+    // Read the time of the first callback in the queue.
+    // If the time for the callback has not yet arrived,
+    // we must sleep until the callback time.
+
+    *next_time = OPL_Queue_Peek(callback_queue) + pause_offset;
+
+    return *next_time <= current_time;
+}
+
+static uint64_t GetNextTime(void)
+{
+    opl_callback_t callback;
+    void *callback_data;
+    uint64_t next_time;
+    int have_callback;
+
+    // Keep running through callbacks until there are none ready to
+    // run. When we run out of callbacks, next_time will be set.
+
+    do
+    {
+        SDL_LockMutex(callback_queue_mutex);
+
+        // Check if the callback at the head of the list is ready to
+        // be invoked.  If so, pop from the head of the queue.
+
+        have_callback = CallbackWaiting(&next_time);
+
+        if (have_callback)
+        {
+            OPL_Queue_Pop(callback_queue, &callback, &callback_data);
+        }
+
+        SDL_UnlockMutex(callback_queue_mutex);
+
+        // Now invoke the callback, if we have one.
+        // The timer mutex is held while the callback is invoked.
+
+        if (have_callback)
+        {
+            SDL_LockMutex(timer_mutex);
+            callback(callback_data);
+            SDL_UnlockMutex(timer_mutex);
+        }
+    } while (have_callback);
+
+    return next_time;
+}
+
+static int ThreadFunction(void *unused)
+{
+    uint64_t next_time;
+    uint64_t now;
+
+    // Keep running until OPL_Timer_StopThread is called.
+
+    while (timer_thread_state == THREAD_STATE_RUNNING)
+    {
+        // Get the next time that we must sleep until, and
+        // wait until that time.
+
+        next_time = GetNextTime();
+        now = SDL_GetTicks() * OPL_MS;
+
+        if (next_time > now)
+        {
+            SDL_Delay((next_time - now) / OPL_MS);
+        }
+
+        // Update the current time.
+
+        SDL_LockMutex(callback_queue_mutex);
+        current_time = next_time;
+        SDL_UnlockMutex(callback_queue_mutex);
+    }
+
+    timer_thread_state = THREAD_STATE_STOPPED;
+
+    return 0;
+}
+
+static void InitResources(void)
+{
+    callback_queue = OPL_Queue_Create();
+    timer_mutex = SDL_CreateMutex();
+    callback_queue_mutex = SDL_CreateMutex();
+}
+
+static void FreeResources(void)
+{
+    OPL_Queue_Destroy(callback_queue);
+    SDL_DestroyMutex(callback_queue_mutex);
+    SDL_DestroyMutex(timer_mutex);
+}
+
+int OPL_Timer_StartThread(void)
+{
+    InitResources();
+
+    timer_thread_state = THREAD_STATE_RUNNING;
+    current_time = SDL_GetTicks();
+    opl_timer_paused = 0;
+    pause_offset = 0;
+
+    timer_thread = SDL_CreateThread(ThreadFunction, "OPL timer thread", NULL);
+
+    if (timer_thread == NULL)
+    {
+        timer_thread_state = THREAD_STATE_STOPPED;
+        FreeResources();
+
+        return 0;
+    }
+
+    return 1;
+}
+
+void OPL_Timer_StopThread(void)
+{
+    timer_thread_state = THREAD_STATE_STOPPING;
+
+    while (timer_thread_state != THREAD_STATE_STOPPED)
+    {
+        SDL_Delay(1);
+    }
+
+    FreeResources();
+}
+
+void OPL_Timer_SetCallback(uint64_t us, opl_callback_t callback, void *data)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    OPL_Queue_Push(callback_queue, callback, data,
+                   current_time + us - pause_offset);
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+void OPL_Timer_ClearCallbacks(void)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    OPL_Queue_Clear(callback_queue);
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+void OPL_Timer_AdjustCallbacks(float factor)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    OPL_Queue_AdjustCallbacks(callback_queue, current_time, factor);
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
+void OPL_Timer_Lock(void)
+{
+    SDL_LockMutex(timer_mutex);
+}
+
+void OPL_Timer_Unlock(void)
+{
+    SDL_UnlockMutex(timer_mutex);
+}
+
+void OPL_Timer_SetPaused(int paused)
+{
+    SDL_LockMutex(callback_queue_mutex);
+    opl_timer_paused = paused;
+    SDL_UnlockMutex(callback_queue_mutex);
+}
+
diff --git a/games/NXDoom/opl/opl_timer.h b/games/NXDoom/opl/opl_timer.h
new file mode 100644
index 000000000..adf815038
--- /dev/null
+++ b/games/NXDoom/opl/opl_timer.h
@@ -0,0 +1,33 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL timer thread.
+//
+
+#ifndef OPL_TIMER_H
+#define OPL_TIMER_H
+
+#include "opl.h"
+
+int OPL_Timer_StartThread(void);
+void OPL_Timer_StopThread(void);
+void OPL_Timer_SetCallback(uint64_t us, opl_callback_t callback, void *data);
+void OPL_Timer_ClearCallbacks(void);
+void OPL_Timer_Lock(void);
+void OPL_Timer_Unlock(void);
+void OPL_Timer_SetPaused(int paused);
+void OPL_Timer_AdjustCallbacks(float factor);
+
+#endif /* #ifndef OPL_TIMER_H */
+
diff --git a/games/NXDoom/opl/opl_win32.c b/games/NXDoom/opl/opl_win32.c
new file mode 100644
index 000000000..f0fd31c36
--- /dev/null
+++ b/games/NXDoom/opl/opl_win32.c
@@ -0,0 +1,192 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     OPL Win32 native interface.
+//
+
+#include "config.h"
+
+#ifdef _WIN32
+
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include "opl.h"
+#include "opl_internal.h"
+#include "opl_timer.h"
+
+#include "ioperm_sys.h"
+
+static unsigned int opl_port_base;
+
+// MingW?
+
+#if defined(__GNUC__) && defined(__i386__)
+
+static unsigned int OPL_Win32_PortRead(opl_port_t port)
+{
+    unsigned char result;
+
+    __asm__ volatile (
+       "movl %1, %%edx\n"
+       "inb  %%dx, %%al\n"
+       "movb %%al, %0"
+       :   "=m" (result)
+       :   "r" (opl_port_base + port)
+       :   "edx", "al", "memory"
+    );
+
+    return result;
+}
+
+static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
+{
+    __asm__ volatile (
+       "movl %0, %%edx\n"
+       "movb %1, %%al\n"
+       "outb %%al, %%dx"
+       :
+       :   "r" (opl_port_base + port), "r" ((unsigned char) value)
+       :   "edx", "al"
+    );
+}
+
+// haleyjd 20110417: MSVC version
+#elif defined(_MSC_VER) && defined(_M_IX86)
+
+static unsigned int OPL_Win32_PortRead(opl_port_t port)
+{
+    unsigned char result;
+    opl_port_t dst_port = opl_port_base + port;
+    
+    __asm    
+    {
+        mov edx, dword ptr [dst_port]
+        in al, dx
+        mov byte ptr [result], al
+    }
+    
+    return result;
+}
+
+static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
+{
+    opl_port_t dst_port = opl_port_base + port;
+    
+    __asm    
+    {
+        mov edx, dword ptr [dst_port]
+        mov al, byte ptr [value]
+        out dx, al
+    }
+}
+
+#else
+
+// Not x86, or don't know how to do port R/W on this compiler.
+
+#define NO_PORT_RW
+
+static unsigned int OPL_Win32_PortRead(opl_port_t port)
+{
+    return 0;
+}
+
+static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
+{
+}
+
+#endif
+
+static int OPL_Win32_Init(unsigned int port_base)
+{
+
+    OSVERSIONINFO version_info;
+
+    opl_port_base = port_base;
+
+    // Check the OS version.
+
+    memset(&version_info, 0, sizeof(version_info));
+    version_info.dwOSVersionInfoSize = sizeof(version_info);
+
+    GetVersionEx(&version_info);
+
+#ifndef NO_PORT_RW
+    // On NT-based systems, we must acquire I/O port permissions
+    // using the ioperm.sys driver.
+
+    if (version_info.dwPlatformId == VER_PLATFORM_WIN32_NT)
+    {
+        // Install driver.
+
+        if (!IOperm_InstallDriver())
+        {
+            return 0;
+        }
+
+        // Open port range.
+
+        if (!IOperm_EnablePortRange(opl_port_base, 2, 1))
+        {
+            IOperm_UninstallDriver();
+            return 0;
+        }
+    }
+
+    // Start callback thread
+
+    if (!OPL_Timer_StartThread())
+    {
+        IOperm_UninstallDriver();
+        return 0;
+    }
+
+    return 1;
+
+#endif
+
+    return 0;
+}
+
+static void OPL_Win32_Shutdown(void)
+{
+    // Stop callback thread
+
+    OPL_Timer_StopThread();
+
+    // Unload IOperm library.
+
+    IOperm_UninstallDriver();
+}
+
+opl_driver_t opl_win32_driver =
+{
+    "Win32",
+    OPL_Win32_Init,
+    OPL_Win32_Shutdown,
+    OPL_Win32_PortRead,
+    OPL_Win32_PortWrite,
+    OPL_Timer_SetCallback,
+    OPL_Timer_ClearCallbacks,
+    OPL_Timer_Lock,
+    OPL_Timer_Unlock,
+    OPL_Timer_SetPaused,
+    OPL_Timer_AdjustCallbacks,
+};
+
+#endif /* #ifdef _WIN32 */
+
diff --git a/games/NXDoom/pcsound/.gitignore b/games/NXDoom/pcsound/.gitignore
new file mode 100644
index 000000000..022c663ee
--- /dev/null
+++ b/games/NXDoom/pcsound/.gitignore
@@ -0,0 +1,8 @@
+Makefile.in
+Makefile
+.deps
+libpcsound.a
+*.rc
+tags
+TAGS
+
diff --git a/games/NXDoom/pcsound/CMakeLists.txt b/games/NXDoom/pcsound/CMakeLists.txt
new file mode 100644
index 000000000..6f1990181
--- /dev/null
+++ b/games/NXDoom/pcsound/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_library(pcsound STATIC
+            pcsound.c       pcsound.h
+            pcsound_bsd.c
+            pcsound_sdl.c
+            pcsound_linux.c
+            pcsound_win32.c
+                            pcsound_internal.h)
+target_include_directories(pcsound
+                           INTERFACE "."
+                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+if (DEFINED EMSCRIPTEN)
+    if(ENABLE_SDL2_MIXER)
+        set_target_properties(pcsound PROPERTIES COMPILE_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
+        set_target_properties(pcsound PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
+    else()
+        set_target_properties(pcsound PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
+        set_target_properties(pcsound PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+    endif()
+else()
+    target_link_libraries(pcsound SDL2::SDL2)
+    if(ENABLE_SDL2_MIXER)
+        target_link_libraries(pcsound SDL2_mixer::SDL2_mixer)
+    endif()
+endif()
diff --git a/games/NXDoom/pcsound/Makefile.am b/games/NXDoom/pcsound/Makefile.am
new file mode 100644
index 000000000..12b2ae49d
--- /dev/null
+++ b/games/NXDoom/pcsound/Makefile.am
@@ -0,0 +1,15 @@
+
+AM_CFLAGS=@SDLMIXER_CFLAGS@
+
+EXTRA_DIST=CMakeLists.txt
+
+noinst_LIBRARIES=libpcsound.a
+
+libpcsound_a_SOURCES =                            \
+        pcsound.c           pcsound.h             \
+        pcsound_bsd.c                             \
+        pcsound_sdl.c                             \
+        pcsound_linux.c                           \
+        pcsound_win32.c                           \
+                            pcsound_internal.h
+
diff --git a/games/NXDoom/pcsound/pcsound.c b/games/NXDoom/pcsound/pcsound.c
new file mode 100644
index 000000000..b57fe73a6
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound.c
@@ -0,0 +1,119 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker interface.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "pcsound.h"
+#include "pcsound_internal.h"
+
+
+static pcsound_driver_t *drivers[] = 
+{
+#ifdef HAVE_LINUX_KD_H
+    &pcsound_linux_driver,
+#endif
+#ifdef HAVE_BSD_SPEAKER
+    &pcsound_bsd_driver,
+#endif
+#ifdef _WIN32
+    &pcsound_win32_driver,
+#endif
+#ifndef DISABLE_SDL2MIXER
+    &pcsound_sdl_driver,
+#endif // DISABLE_SDL2MIXER
+    NULL,
+};
+
+static pcsound_driver_t *pcsound_driver = NULL;
+
+int pcsound_sample_rate;
+
+void PCSound_SetSampleRate(int rate)
+{
+    pcsound_sample_rate = rate;
+}
+
+int PCSound_Init(pcsound_callback_func callback_func)
+{
+    char *driver_name;
+    int i;
+
+    if (pcsound_driver != NULL)
+    {
+        return 1;
+    }
+
+    // Check if the environment variable is set
+
+    driver_name = getenv("PCSOUND_DRIVER");
+
+    if (driver_name != NULL)
+    {
+        for (i=0; drivers[i] != NULL; ++i)
+        {
+            if (!strcmp(drivers[i]->name, driver_name))
+            {
+                // Found the driver!
+
+                if (drivers[i]->init_func(callback_func))
+                {
+                    pcsound_driver = drivers[i];
+                }
+                else
+                {
+                    printf("Failed to initialize PC sound driver: %s\n",
+                           drivers[i]->name);
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        // Try all drivers until we find a working one
+
+        for (i=0; drivers[i] != NULL; ++i)
+        {
+            if (drivers[i]->init_func(callback_func)) 
+            {
+                pcsound_driver = drivers[i];
+                break;
+            }
+        }
+    }
+    
+    if (pcsound_driver != NULL)
+    {
+        printf("Using PC sound driver: %s\n", pcsound_driver->name);
+        return 1;
+    }
+    else
+    {
+        printf("Failed to find a working PC sound driver.\n");
+        return 0;
+    }
+}
+
+void PCSound_Shutdown(void)
+{
+    pcsound_driver->shutdown_func();
+    pcsound_driver = NULL;
+}
+
diff --git a/games/NXDoom/pcsound/pcsound.h b/games/NXDoom/pcsound/pcsound.h
new file mode 100644
index 000000000..4d567f240
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound.h
@@ -0,0 +1,38 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker interface.
+//
+
+#ifndef PCSOUND_H
+#define PCSOUND_H
+
+typedef void (*pcsound_callback_func)(int *duration, int *frequency);
+
+// Initialise the PC speaker subsystem.  The given function is called
+// periodically to request more sound data to play.
+
+int PCSound_Init(pcsound_callback_func callback_func);
+
+// Shut down the PC speaker subsystem.
+
+void PCSound_Shutdown(void);
+
+// Set the preferred output sample rate when emulating a PC speaker. 
+// This must be called before PCSound_Init.
+
+void PCSound_SetSampleRate(int rate);
+
+#endif /* #ifndef PCSOUND_H */
+
diff --git a/games/NXDoom/pcsound/pcsound_bsd.c b/games/NXDoom/pcsound/pcsound_bsd.c
new file mode 100644
index 000000000..a3055e7db
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound_bsd.c
@@ -0,0 +1,321 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker driver for [Open]BSD 
+//    (Should be NetBSD as well, but untested).
+//
+
+#include "config.h"
+
+// OpenBSD/NetBSD:
+
+#ifdef HAVE_DEV_ISA_SPKRIO_H
+#define HAVE_BSD_SPEAKER
+#include <dev/isa/spkrio.h>
+#endif
+
+// FreeBSD
+
+#ifdef HAVE_DEV_SPEAKER_SPEAKER_H
+#define HAVE_BSD_SPEAKER
+#include <dev/speaker/speaker.h>
+#endif
+
+#ifdef HAVE_BSD_SPEAKER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "SDL.h"
+#include "SDL_thread.h"
+
+#include "pcsound.h"
+#include "pcsound_internal.h"
+
+#define SPEAKER_DEVICE "/dev/speaker"
+
+//
+// This driver is far more complicated than it should be, because 
+// OpenBSD has sucky support for threads.  Because multithreading
+// is done in userspace, invoking the ioctl to make the speaker
+// beep will lock all threads until the beep has completed.  
+// 
+// Thus, to get the beeping to occur in real-time, we must invoke
+// the ioctl in a separate process.  To do this, a separate 
+// sound server is forked that listens on a socket for tones to
+// play.  When a tone is received, a reply is sent back to the
+// main process and the tone played.
+//
+// Meanwhile, back in the main process, there is a sound thread
+// that runs, invoking the pcsound callback function to get 
+// more tones.  This blocks on the sound server socket, waiting
+// for replies.  In this way, when the sound server finishes 
+// playing a tone, the next one is sent.
+//
+// This driver is a bit less accurate than the others, because
+// we can only specify sound durations in 1/100ths of a second,
+// as opposed to the normal millisecond durations.
+
+static pcsound_callback_func callback;
+static int sound_server_pid;
+static int sleep_adjust = 0;
+static int sound_thread_running;
+static SDL_Thread *sound_thread_handle;
+static int sound_server_pipe[2];
+
+// Play a sound, checking how long the system call takes to complete
+// and autoadjusting for drift.
+
+static void AdjustedBeep(int speaker_handle, int ms, int freq)
+{
+    unsigned int start_time;
+    unsigned int end_time;
+    unsigned int actual_time;
+    tone_t tone;
+
+    // Adjust based on previous error to keep the tempo right
+
+    if (sleep_adjust > ms)
+    {
+        sleep_adjust -= ms;
+        return;
+    }
+    else
+    {
+        ms -= sleep_adjust;
+    }
+
+    // Invoke the system call and time how long it takes
+
+    start_time = SDL_GetTicks();
+
+    tone.duration = ms / 10;        // in 100ths of a second
+    tone.frequency = freq;
+
+    // Always a positive duration
+
+    if (tone.duration < 1)
+    {
+        tone.duration = 1;
+    }
+
+    if (ioctl(speaker_handle, SPKRTONE, &tone) != 0)
+    {
+        perror("ioctl");
+        return;
+    }
+    
+    end_time = SDL_GetTicks();
+
+    if (end_time > start_time)
+    {
+        actual_time = end_time - start_time;
+    }
+    else
+    {
+        actual_time = ms;
+    }
+
+    if (actual_time < ms)
+    {
+        actual_time = ms;
+    }
+
+    // Save sleep_adjust for next time
+
+    sleep_adjust = actual_time - ms;
+}
+
+static void SoundServer(int speaker_handle)
+{
+    tone_t tone;
+    int result;
+
+    // Run in a loop, invoking the callback
+
+    for (;;)
+    {
+        result = read(sound_server_pipe[1], &tone, sizeof(tone_t));
+
+        if (result < 0)
+        {
+            perror("read");
+            return;
+        }
+
+        // Send back a response, so the main process knows to send another
+
+        write(sound_server_pipe[1], &tone, sizeof(tone_t));
+
+        // Beep! (blocks until complete)
+
+        AdjustedBeep(speaker_handle, tone.duration, tone.frequency);
+    }
+}
+
+// Start up the sound server.  Returns non-zero if successful.
+
+static int StartSoundServer(void)
+{
+    int result;
+    int speaker_handle;
+
+    // Try to open the speaker device
+
+    speaker_handle = open(SPEAKER_DEVICE, O_WRONLY);
+
+    if (speaker_handle == -1)
+    {
+        // Don't have permissions for the console device?
+
+	fprintf(stderr, "StartSoundServer: Failed to open '%s': %s\n",
+                        SPEAKER_DEVICE, strerror(errno));
+        return 0;
+    }
+
+    // Create a pipe for communications
+
+    if (socketpair(AF_UNIX, SOCK_STREAM, 0, sound_server_pipe) < 0)
+    {
+        perror("socketpair");
+        close(speaker_handle);
+        return 0;
+    }
+
+    // Start a separate process to generate PC speaker output
+    // We can't use the SDL threading functions because OpenBSD's
+    // threading sucks :-(
+    
+    result = fork();
+
+    if (result < 0)
+    {
+        fprintf(stderr, "Failed to fork sound server!\n");
+        close(speaker_handle);
+        return 0;
+    }
+    else if (result == 0)
+    {
+        // This is the child (sound server)
+
+        SoundServer(speaker_handle);
+        close(speaker_handle);
+
+        exit(0);
+    }
+    else
+    {
+        // This is the parent
+
+        sound_server_pid = result;
+        close(speaker_handle);
+    }
+
+    return 1;
+}
+
+static void StopSoundServer(void)
+{
+    int status;
+
+    kill(sound_server_pid, SIGINT);
+    waitpid(sound_server_pid, &status, 0);
+}
+
+static int SoundThread(void *unused)
+{
+    tone_t tone;
+    int duration;
+    int frequency;
+
+    while (sound_thread_running)
+    {
+        // Get the next frequency to play
+
+        callback(&duration, &frequency);
+
+//printf("dur: %i, freq: %i\n", duration, frequency);
+
+        // Build up a tone structure and send to the sound server
+
+        tone.frequency = frequency;
+        tone.duration = duration;
+
+        if (write(sound_server_pipe[0], &tone, sizeof(tone_t)) < 0) 
+        {
+            perror("write");
+            break;
+        }
+
+        // Wait until the sound server responds before sending another
+
+        if (read(sound_server_pipe[0], &tone, sizeof(tone_t)) < 0)
+        {
+            perror("read");
+            break;
+        }
+    }
+
+    return 0;
+}
+
+static int PCSound_BSD_Init(pcsound_callback_func callback_func)
+{
+    callback = callback_func;
+
+    if (!StartSoundServer())
+    {
+        fprintf(stderr, "PCSound_BSD_Init: Failed to start sound server.\n");
+        return 0;
+    }
+
+    sound_thread_running = 1;
+    sound_thread_handle =
+        SDL_CreateThread(SoundThread, "PC speaker thread", NULL);
+
+    return 1;
+}
+
+static void PCSound_BSD_Shutdown(void)
+{
+    // Stop the sound thread
+
+    sound_thread_running = 0;
+
+    SDL_WaitThread(sound_thread_handle, NULL);
+
+    // Stop the sound server
+
+    StopSoundServer();
+}
+
+pcsound_driver_t pcsound_bsd_driver =
+{
+    "BSD",
+    PCSound_BSD_Init,
+    PCSound_BSD_Shutdown,
+};
+
+#endif /* #ifdef HAVE_BSD_SPEAKER */
+
diff --git a/games/NXDoom/pcsound/pcsound_internal.h b/games/NXDoom/pcsound/pcsound_internal.h
new file mode 100644
index 000000000..7611c595f
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound_internal.h
@@ -0,0 +1,62 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker interface.
+//
+
+#ifndef PCSOUND_INTERNAL_H
+#define PCSOUND_INTERNAL_H
+
+#include "pcsound.h"
+
+#ifdef HAVE_DEV_ISA_SPKRIO_H
+#define HAVE_BSD_SPEAKER
+#endif
+#ifdef HAVE_DEV_SPEAKER_SPEAKER_H
+#define HAVE_BSD_SPEAKER
+#endif
+
+#define PCSOUND_8253_FREQUENCY 1193280
+
+typedef struct pcsound_driver_s pcsound_driver_t;
+typedef int (*pcsound_init_func)(pcsound_callback_func callback);
+typedef void (*pcsound_shutdown_func)(void);
+
+struct pcsound_driver_s
+{
+    const char *name;
+    pcsound_init_func init_func;
+    pcsound_shutdown_func shutdown_func;
+};
+
+extern int pcsound_sample_rate;
+
+
+#ifdef _WIN32
+extern pcsound_driver_t pcsound_win32_driver;
+#endif
+
+#ifdef HAVE_BSD_SPEAKER
+extern pcsound_driver_t pcsound_bsd_driver;
+#endif
+
+#ifdef HAVE_LINUX_KD_H
+extern pcsound_driver_t pcsound_linux_driver;
+#endif
+
+extern pcsound_driver_t pcsound_sdl_driver;
+
+
+#endif /* #ifndef PCSOUND_INTERNAL_H */
+
diff --git a/games/NXDoom/pcsound/pcsound_linux.c b/games/NXDoom/pcsound/pcsound_linux.c
new file mode 100644
index 000000000..7cb59c9b9
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound_linux.c
@@ -0,0 +1,171 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker driver for Linux.
+//
+
+#include "config.h"
+
+#ifdef HAVE_LINUX_KD_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <linux/kd.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "SDL.h"
+#include "SDL_thread.h"
+
+#include "pcsound.h"
+#include "pcsound_internal.h"
+
+#define CONSOLE_DEVICE "/dev/console"
+
+static int console_handle;
+static pcsound_callback_func callback;
+static int sound_thread_running = 0;
+static SDL_Thread *sound_thread_handle;
+static int sleep_adjust = 0;
+
+static void AdjustedSleep(unsigned int ms)
+{
+    unsigned int start_time;
+    unsigned int end_time;
+    unsigned int actual_time;
+
+    // Adjust based on previous error to keep the tempo right
+
+    if (sleep_adjust > ms)
+    {
+        sleep_adjust -= ms;
+        return;
+    }
+    else
+    {
+        ms -= sleep_adjust;
+    }
+
+    // Do the sleep and record how long it takes
+
+    start_time = SDL_GetTicks();
+
+    SDL_Delay(ms);
+    
+    end_time = SDL_GetTicks();
+
+    if (end_time > start_time)
+    {
+        actual_time = end_time - start_time;
+    }
+    else
+    {
+        actual_time = ms;
+    }
+
+    if (actual_time < ms)
+    {
+        actual_time = ms;
+    }
+
+    // Save sleep_adjust for next time
+
+    sleep_adjust = actual_time - ms;
+}
+
+static int SoundThread(void *unused)
+{
+    int current_freq = 0;
+    int frequency;
+    int duration;
+    int cycles;
+    
+    while (sound_thread_running)
+    {
+        callback(&duration, &frequency);
+
+        if (current_freq != frequency)
+        {
+            current_freq = frequency;
+            if (frequency != 0)
+            {
+                cycles = PCSOUND_8253_FREQUENCY / frequency;
+            }
+            else
+            {
+                cycles = 0;
+            }
+
+            ioctl(console_handle, KIOCSOUND, cycles);
+        }
+
+        AdjustedSleep(duration);
+    }
+
+    return 0;
+}
+
+static int PCSound_Linux_Init(pcsound_callback_func callback_func)
+{
+    // Try to open the console
+
+    console_handle = open(CONSOLE_DEVICE, O_WRONLY);
+
+    if (console_handle == -1)
+    {
+        // Don't have permissions for the console device?
+
+	fprintf(stderr, "PCSound_Linux_Init: Failed to open '%s': %s\n",
+			CONSOLE_DEVICE, strerror(errno));
+        return 0;
+    }
+
+    if (ioctl(console_handle, KIOCSOUND, 0) < 0)
+    {
+        // KIOCSOUND not supported: non-PC linux?
+
+        close(console_handle);
+        return 0;
+    }
+
+    // Start a thread up to generate PC speaker output
+    
+    callback = callback_func;
+    sound_thread_running = 1;
+
+    sound_thread_handle =
+        SDL_CreateThread(SoundThread, "PC speaker thread", NULL);
+
+    return 1;
+}
+
+static void PCSound_Linux_Shutdown(void)
+{
+    sound_thread_running = 0;
+    SDL_WaitThread(sound_thread_handle, NULL);
+    close(console_handle);
+}
+
+pcsound_driver_t pcsound_linux_driver =
+{
+    "Linux",
+    PCSound_Linux_Init,
+    PCSound_Linux_Shutdown,
+};
+
+#endif /* #ifdef HAVE_LINUX_KD_H */
+
diff --git a/games/NXDoom/pcsound/pcsound_sdl.c b/games/NXDoom/pcsound/pcsound_sdl.c
new file mode 100644
index 000000000..d38a97b82
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound_sdl.c
@@ -0,0 +1,254 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker interface.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "config.h"
+
+#include "SDL.h"
+
+#include "pcsound.h"
+#include "pcsound_internal.h"
+
+
+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+
+#define MAX_SOUND_SLICE_TIME 70 /* ms */
+#define SQUARE_WAVE_AMP 0x2000
+
+// If true, we initialized SDL and have the responsibility to shut it 
+// down
+
+static int sdl_was_initialized = 0;
+
+// Callback function to invoke when we want new sound data
+
+static pcsound_callback_func callback;
+
+// Output sound format
+
+static int mixing_freq;
+static Uint16 mixing_format;
+static int mixing_channels;
+
+// Currently playing sound
+// current_remaining is the number of remaining samples that must be played
+// before we invoke the callback to get the next frequency.
+
+static int current_remaining;
+static int current_freq;
+
+static int phase_offset = 0;
+
+// Mixer function that does the PC speaker emulation
+
+static void PCSound_Mix_Callback(int chan, void *stream, int len, void *udata)
+{
+    Sint16 *leftptr;
+    Sint16 *rightptr;
+    Sint16 this_value;
+    int frequency;
+    int i;
+    int nsamples;
+
+    // Number of samples is quadrupled, because of 16-bit and stereo
+
+    nsamples = len / 4;
+
+    leftptr = (Sint16 *) stream;
+    rightptr = ((Sint16 *) stream) + 1;
+    
+    // Fill the output buffer
+
+    for (i=0; i<nsamples; ++i)
+    {
+        // Has this sound expired? If so, invoke the callback to get 
+        // the next frequency.
+
+        while (current_remaining == 0) 
+        {
+            // Get the next frequency to play
+
+            callback(&current_remaining, &frequency);
+
+            if (current_freq != frequency)
+            {
+                current_freq = frequency;
+                phase_offset = 0;
+            }
+
+            current_remaining = (current_remaining * mixing_freq) / 1000;
+        }
+
+        // Set the value for this sample.
+        
+        if (current_freq == 0)
+        {
+            // Silence
+
+            this_value = 0;
+        }
+        else 
+        {
+            int frac;
+
+            // Determine whether we are at a peak or trough in the current
+            // sound.  Multiply by 2 so that frac % 2 will give 0 or 1 
+            // depending on whether we are at a peak or trough.
+
+            frac = (phase_offset * current_freq * 2) / mixing_freq;
+
+            if ((frac % 2) == 0) 
+            {
+                this_value = SQUARE_WAVE_AMP;
+            }
+            else
+            {
+                this_value = -SQUARE_WAVE_AMP;
+            }
+
+            ++phase_offset;
+        }
+
+        --current_remaining;
+
+        // Use the same value for the left and right channels.
+
+        *leftptr += this_value;
+        *rightptr += this_value;
+
+        leftptr += 2;
+        rightptr += 2;
+    }
+}
+
+static int SDLIsInitialized(void)
+{
+    int freq, channels;
+    Uint16 format;
+
+    return Mix_QuerySpec(&freq, &format, &channels);
+}
+
+static void PCSound_SDL_Shutdown(void)
+{
+    if (sdl_was_initialized)
+    {
+        Mix_CloseAudio();
+        SDL_QuitSubSystem(SDL_INIT_AUDIO);
+        sdl_was_initialized = 0;
+    }
+}
+
+// Calculate slice size, based on MAX_SOUND_SLICE_TIME.
+// The result must be a power of two.
+
+static int GetSliceSize(void)
+{
+    int limit;
+    int n;
+
+    limit = (pcsound_sample_rate * MAX_SOUND_SLICE_TIME) / 1000;
+
+    // Try all powers of two, not exceeding the limit.
+
+    for (n=0;; ++n)
+    {
+        // 2^n <= limit < 2^n+1 ?
+
+        if ((1 << (n + 1)) > limit)
+        {
+            return (1 << n);
+        }
+    }
+
+    // Should never happen?
+
+    return 1024;
+}
+
+static int PCSound_SDL_Init(pcsound_callback_func callback_func)
+{
+    int slicesize;
+
+    // Check if SDL_mixer has been opened already
+    // If not, we must initialize it now
+
+    if (!SDLIsInitialized())
+    {
+        if (SDL_Init(SDL_INIT_AUDIO) < 0)
+        {
+            fprintf(stderr, "Unable to set up sound.\n");
+            return 0;
+        }
+
+        slicesize = GetSliceSize();
+
+        if (Mix_OpenAudioDevice(pcsound_sample_rate, AUDIO_S16SYS, 2, slicesize, NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
+        {
+            fprintf(stderr, "Error initializing SDL_mixer: %s\n", Mix_GetError());
+
+            SDL_QuitSubSystem(SDL_INIT_AUDIO);
+            return 0;
+        }
+
+        SDL_PauseAudio(0);
+
+        // When this module shuts down, it has the responsibility to 
+        // shut down SDL.
+
+        sdl_was_initialized = 1;
+    }
+
+    // Get the mixer frequency, format and number of channels.
+
+    Mix_QuerySpec(&mixing_freq, &mixing_format, &mixing_channels);
+
+    // Only supports AUDIO_S16SYS
+
+    if (mixing_format != AUDIO_S16SYS || mixing_channels != 2)
+    {
+        fprintf(stderr, 
+                "PCSound_SDL only supports native signed 16-bit LSB, "
+                "stereo format!\n");
+
+        PCSound_SDL_Shutdown();
+        return 0;
+    }
+
+    callback = callback_func;
+    current_freq = 0;
+    current_remaining = 0;
+
+    Mix_RegisterEffect(MIX_CHANNEL_POST, PCSound_Mix_Callback, NULL, NULL);
+
+    return 1;
+}
+
+pcsound_driver_t pcsound_sdl_driver = 
+{
+    "SDL",
+    PCSound_SDL_Init,
+    PCSound_SDL_Shutdown,
+};
+
+
+#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/pcsound/pcsound_win32.c b/games/NXDoom/pcsound/pcsound_win32.c
new file mode 100644
index 000000000..91885f685
--- /dev/null
+++ b/games/NXDoom/pcsound/pcsound_win32.c
@@ -0,0 +1,106 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    PC speaker interface.
+//
+
+#ifdef _WIN32
+
+#include "SDL.h"
+#include "SDL_thread.h"
+#include <windows.h>
+
+#include "pcsound.h"
+#include "pcsound_internal.h"
+
+static SDL_Thread *sound_thread_handle;
+static int sound_thread_running;
+static pcsound_callback_func callback;
+
+static int SoundThread(void *unused)
+{
+    int frequency;
+    int duration;
+    
+    while (sound_thread_running)
+    {
+        callback(&duration, &frequency);
+
+        if (frequency != 0) 
+        {
+            Beep(frequency, duration);
+        }
+        else
+        {
+            Sleep(duration);
+        }
+    }
+    
+    return 0;    
+}
+
+static int PCSound_Win32_Init(pcsound_callback_func callback_func)
+{
+    OSVERSIONINFO osvi;
+    BOOL result;
+
+    // Temporarily disabled - the Windows scheduler is strange and 
+    // stupid.
+   
+    return 0;
+
+    // Find the OS version
+
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+
+    result = GetVersionEx(&osvi);
+
+    if (!result)
+    {
+        return 0;
+    }
+
+    // Beep() ignores its arguments on win9x, so this driver will
+    // not work there.
+    if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT)
+    {
+        return 0;
+    }
+
+    // Start a thread to play sound.
+
+    callback = callback_func;
+    sound_thread_running = 1;
+
+    sound_thread_handle =
+        SDL_CreateThread(SoundThread, "PC speaker thread", NULL);
+
+    return 1;
+}
+
+static void PCSound_Win32_Shutdown(void)
+{
+    sound_thread_running = 0;
+    SDL_WaitThread(sound_thread_handle, NULL);
+}
+
+pcsound_driver_t pcsound_win32_driver = 
+{
+    "Windows",
+    PCSound_Win32_Init,
+    PCSound_Win32_Shutdown,
+};
+
+#endif /* #ifdef _WIN32 */
+
diff --git a/games/NXDoom/pkg/.gitignore b/games/NXDoom/pkg/.gitignore
new file mode 100644
index 000000000..a1dd1cde4
--- /dev/null
+++ b/games/NXDoom/pkg/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+config.make
diff --git a/games/NXDoom/pkg/Makefile.am b/games/NXDoom/pkg/Makefile.am
new file mode 100644
index 000000000..3a287b246
--- /dev/null
+++ b/games/NXDoom/pkg/Makefile.am
@@ -0,0 +1,25 @@
+
+OSX_FILES=                                                              \
+osx/Resources/app.png                                                   \
+osx/Resources/launcher.nib/designable.nib                               \
+osx/Resources/launcher.nib/keyedobjects.nib                             \
+osx/disk/dir.DS_Store                                                   \
+osx/disk/background.png                                                 \
+osx/GNUmakefile                                                         \
+osx/Info.plist.in                                                       \
+osx/PkgInfo                                                             \
+osx/cp-with-libs                                                        \
+osx/dmgfix                                                              \
+osx/main.m                                                              \
+osx/AppController.m     osx/AppController.h                             \
+osx/Execute.m           osx/Execute.h                                   \
+osx/IWADController.m    osx/IWADController.h                            \
+osx/LauncherManager.m   osx/LauncherManager.h
+
+WIN32_FILES=                                                            \
+win32/GNUmakefile                                                       \
+win32/cp-with-libs                                                      \
+win32/README
+
+EXTRA_DIST=style.html $(OSX_FILES) $(WIN32_FILES)
+
diff --git a/games/NXDoom/pkg/config.make.in b/games/NXDoom/pkg/config.make.in
new file mode 100644
index 000000000..972be10e4
--- /dev/null
+++ b/games/NXDoom/pkg/config.make.in
@@ -0,0 +1,30 @@
+# Shared file included by the makefiles used to build packages.
+# This contains various information needed by the makefiles,
+# and is autogenerated by configure to include various
+# necessary details.
+
+# Tools needed:
+
+CC = @CC@
+OBJDUMP = @OBJDUMP@
+STRIP = @STRIP@
+LDFLAGS = @LDFLAGS@
+
+# Package name and version number:
+
+PROGRAM_PREFIX = @PROGRAM_PREFIX@
+PACKAGE = @PACKAGE@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
+TARGET_OS = @TARGET_OS@
+
+# Documentation files to distribute with packages.
+
+DOC_FILES = README.md        \
+            README.Music.md  \
+            COPYING.md       \
+            NEWS.md
+
diff --git a/games/NXDoom/pkg/osx/.gitignore b/games/NXDoom/pkg/osx/.gitignore
new file mode 100644
index 000000000..a2b2f72de
--- /dev/null
+++ b/games/NXDoom/pkg/osx/.gitignore
@@ -0,0 +1,10 @@
+Info.plist
+app.iconset
+app.icns
+wadfile.iconset
+wadfile.icns
+launcher
+*.o
+*.d
+*.dmg
+staging
diff --git a/games/NXDoom/pkg/osx/AppController.h b/games/NXDoom/pkg/osx/AppController.h
new file mode 100644
index 000000000..37340ca2c
--- /dev/null
+++ b/games/NXDoom/pkg/osx/AppController.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef LAUNCHER_APPCONTROLLER_H
+#define LAUNCHER_APPCONTROLLER_H
+
+#include <AppKit/AppKit.h>
+
+#include "LauncherManager.h"
+
+@interface AppController : NSObject
+{
+    LauncherManager *launcherManager;
+    BOOL filesAdded;
+}
+
++ (void)initialize;
+
+- (id)init;
+- (void)dealloc;
+
+- (void)awakeFromNib;
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotif;
+- (BOOL)applicationShouldTerminate:(id)sender;
+- (void)applicationWillTerminate:(NSNotification *)aNotif;
+- (BOOL)application:(NSApplication *)application openFile:(NSString *)fileName;
+
+- (void)showPrefPanel:(id)sender;
+
+@end
+
+#endif
+
diff --git a/games/NXDoom/pkg/osx/AppController.m b/games/NXDoom/pkg/osx/AppController.m
new file mode 100644
index 000000000..428eb9d07
--- /dev/null
+++ b/games/NXDoom/pkg/osx/AppController.m
@@ -0,0 +1,146 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include "AppController.h"
+
+#include "config.h"
+
+@implementation AppController
+
++ (void)initialize
+{
+    NSMutableDictionary *defaults = [NSMutableDictionary dictionary];
+
+    /*
+     * Register your app's defaults here by adding objects to the
+     * dictionary, eg
+     *
+     * [defaults setObject:anObject forKey:keyForThatObject];
+     *
+     */
+
+    [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+- (id)init
+{
+    if ((self = [super init]))
+    {
+    }
+
+    self->filesAdded = NO;
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [super dealloc];
+}
+
+- (void)awakeFromNib
+{
+    [[NSApp mainMenu] setTitle:@PACKAGE_NAME];
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotif
+{
+// Uncomment if your application is Renaissance-based
+//  [NSBundle loadGSMarkupNamed:@"Main" owner:self];
+}
+
+- (BOOL)applicationShouldTerminate:(id)sender
+{
+    return YES;
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotif
+{
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)_ {
+    return YES;
+}
+
+- (BOOL) application:(NSApplication *) application
+         openFile:(NSString *) fileName
+{
+    NSString *extension;
+
+    // This may be an IWAD.  If so, add it to the IWAD configuration;
+    // don't add it like a PWAD.
+
+    if ([self->launcherManager addIWADPath: fileName])
+    {
+        return YES;
+    }
+
+    // If this is the first file added, clear out the existing
+    // command line.  This allows us to select multiple files
+    // in the finder and open them all together (for TCs, etc).
+
+    if (!self->filesAdded)
+    {
+        [self->launcherManager clearCommandLine];
+    }
+
+    // Add file with appropriate command line option based on extension:
+
+    extension = [fileName pathExtension];
+
+    if (![extension caseInsensitiveCompare: @"wad"])
+    {
+        [self->launcherManager addFileToCommandLine: fileName
+                               forArgument: @"-merge"];
+    }
+    else if (![extension caseInsensitiveCompare: @"lmp"])
+    {
+        [self->launcherManager addFileToCommandLine: fileName
+                               forArgument: @"-playdemo"];
+    }
+    else if (![extension caseInsensitiveCompare: @"deh"])
+    {
+        [self->launcherManager addFileToCommandLine: fileName
+                               forArgument: @"-deh"];
+        [self->launcherManager selectGameByName: "doom"];
+    }
+    else if (![extension caseInsensitiveCompare: @"hhe"])
+    {
+        [self->launcherManager addFileToCommandLine: fileName
+                               forArgument: @"-deh"];
+        [self->launcherManager selectGameByName: "heretic"];
+    }
+    else if (![extension caseInsensitiveCompare: @"seh"])
+    {
+        [self->launcherManager addFileToCommandLine: fileName
+                               forArgument: @"-deh"];
+        [self->launcherManager selectGameByName: "strife"];
+    }
+    else
+    {
+        return NO;
+    }
+
+    self->filesAdded = YES;
+
+    return YES;
+}
+
+- (void)showPrefPanel:(id)sender
+{
+}
+
+@end
+
diff --git a/games/NXDoom/pkg/osx/Execute.h b/games/NXDoom/pkg/osx/Execute.h
new file mode 100644
index 000000000..fbb19c6f8
--- /dev/null
+++ b/games/NXDoom/pkg/osx/Execute.h
@@ -0,0 +1,24 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef LAUNCHER_EXECUTE_H
+#define LAUNCHER_EXECUTE_H
+
+void SetProgramLocation(const char *path);
+void ExecuteProgram(const char *executable, const char *iwad, const char *args);
+void OpenTerminalWindow(const char *doomwadpath);
+void OpenDocumentation(const char *filename);
+
+#endif /* #ifndef LAUNCHER_EXECUTE_H */
+
diff --git a/games/NXDoom/pkg/osx/Execute.m b/games/NXDoom/pkg/osx/Execute.m
new file mode 100644
index 000000000..2d5d59310
--- /dev/null
+++ b/games/NXDoom/pkg/osx/Execute.m
@@ -0,0 +1,226 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <AppKit/AppKit.h>
+
+#include "config.h"
+
+#define RESPONSE_FILE "/tmp/launcher.rsp"
+#define TEMP_SCRIPT "/tmp/tempscript.sh"
+#define WINDOW_TITLE PACKAGE_STRING " command prompt"
+
+static char *executable_path;
+
+// Called on startup to save the location of the launcher program
+// (within a package, other executables should be in the same directory)
+
+void SetProgramLocation(const char *path)
+{
+    char *p;
+
+    executable_path = strdup(path);
+
+    p = strrchr(executable_path, '/');
+    *p = '\0';
+}
+
+// Write out the response file containing command line arguments.
+
+static void WriteResponseFile(const char *iwad, const char *args)
+{
+    FILE *fstream;
+
+    fstream = fopen(RESPONSE_FILE, "w");
+
+    if (iwad != NULL)
+    {
+        fprintf(fstream, "-iwad \"%s\"", iwad);
+    }
+
+    if (args != NULL)
+    {
+        fprintf(fstream, "%s", args);
+    }
+
+    fclose(fstream);
+}
+
+static void DoExec(const char *executable, const char *iwad, const char *args)
+{
+    char *argv[3];
+
+    asprintf(&argv[0], "%s/%s", executable_path, executable);
+
+    if (iwad != NULL || args != NULL)
+    {
+        WriteResponseFile(iwad, args);
+
+        argv[1] = "@" RESPONSE_FILE;
+        argv[2] = NULL;
+    }
+    else
+    {
+        argv[1] = NULL;
+    }
+
+    execv(argv[0], argv);
+    exit(-1);
+}
+
+// Execute the specified executable contained in the same directory
+// as the launcher, with the specified arguments.
+
+void ExecuteProgram(const char *executable, const char *iwad, const char *args)
+{
+    pid_t childpid;
+    char *homedir;
+
+    childpid = fork();
+
+    if (childpid == 0)
+    {
+        signal(SIGCHLD, SIG_DFL);
+
+        // Change directory to home dir before launch, so that any demos
+        // are saved somewhere sensible.
+
+        homedir = getenv("HOME");
+
+        if (homedir != NULL)
+        {
+            chdir(homedir);
+        }
+
+        DoExec(executable, iwad, args);
+    }
+    else
+    {
+        signal(SIGCHLD, SIG_IGN);
+    }
+}
+
+// Write a sequence of commands that will display the specified message
+// via shell commands.
+
+static void WriteMessage(FILE *script, char *msg)
+{
+    char *p;
+
+    fprintf(script, "echo \"");
+
+    for (p=msg; *p != '\0'; ++p)
+    {
+        // Start new line?
+
+        if (*p == '\n')
+        {
+            fprintf(script, "\"\necho \"");
+            continue;
+        }
+
+        // Escaped character?
+
+        if (*p == '\\' || *p == '\"')
+        {
+            fprintf(script, "\\");
+        }
+
+        fprintf(script, "%c", *p);
+    }
+
+    fprintf(script, "\"\n");
+}
+
+// Open a terminal window with the PATH set appropriately, and DOOMWADPATH
+// set to the specified value.
+
+void OpenTerminalWindow(const char *doomwadpath)
+{
+    FILE *stream;
+
+    // Generate a shell script that sets the PATH to include the location
+    // where the Doom binaries are, and DOOMWADPATH to include the
+    // IWAD files that have been configured in the launcher interface.
+    // The script then deletes itself and starts a shell.
+
+    stream = fopen(TEMP_SCRIPT, "w");
+
+    fprintf(stream, "#!/bin/sh\n");
+    //fprintf(stream, "set -x\n");
+    fprintf(stream, "PATH=\"%s:$PATH\"\n", executable_path);
+
+    // MANPATH is set to point to the directory within the bundle that
+    // contains the Unix manpages.  However, the bundle name or path to
+    // it can contain a space, and OS X doesn't like this!  As a
+    // workaround, create a symlink in /tmp to point to the real directory,
+    // and put *this* in MANPATH.
+
+    fprintf(stream, "rm -f \"/tmp/%s.man\"\n", PACKAGE_TARNAME);
+    fprintf(stream, "ln -s \"%s/man\" \"/tmp/%s.man\"\n",
+                    executable_path, PACKAGE_TARNAME);
+    fprintf(stream, "MANPATH=\"/tmp/%s.man:$(manpath)\"\n", PACKAGE_TARNAME);
+    fprintf(stream, "export MANPATH\n");
+
+    fprintf(stream, "DOOMWADPATH=\"%s\"\n", doomwadpath);
+    fprintf(stream, "export DOOMWADPATH\n");
+    fprintf(stream, "rm -f \"%s\"\n", TEMP_SCRIPT);
+
+    // Window title to something more interesting than "tempscript":
+    fprintf(stream, "echo -en \"\\033]0;%s\\a\"\n", WINDOW_TITLE);
+
+    // Display a useful message:
+
+    fprintf(stream, "clear\n");
+    WriteMessage(stream,
+        "\n"
+        "This command line has the PATH variable configured so that you may\n"
+        "launch the game with whatever parameters you desire.\n"
+        "\n"
+        "For example:\n"
+        "\n"
+        "   " PACKAGE_TARNAME " -iwad doom2.wad -file sid.wad -warp 1\n"
+        "\n"
+        "Type 'exit' to exit.\n");
+
+    fprintf(stream, "exec $SHELL\n");
+    fprintf(stream, "\n");
+
+    fclose(stream);
+
+    chmod(TEMP_SCRIPT, 0755);
+
+    // Tell the terminal to open a window to run the script.
+
+    [[NSWorkspace sharedWorkspace] openFile: @TEMP_SCRIPT
+                                   withApplication: @"Terminal"];
+}
+
+void OpenDocumentation(const char *filename)
+{
+    NSString *path;
+
+    path = [NSString stringWithFormat: @"%s/Documentation/%s",
+                     executable_path, filename];
+
+    [[NSWorkspace sharedWorkspace] openFile: path];
+}
+
diff --git a/games/NXDoom/pkg/osx/GNUmakefile b/games/NXDoom/pkg/osx/GNUmakefile
new file mode 100644
index 000000000..55d7ac810
--- /dev/null
+++ b/games/NXDoom/pkg/osx/GNUmakefile
@@ -0,0 +1,132 @@
+# Makefile for building the OS X launcher program and DMG package.
+
+include ../config.make
+
+DOC_FILES += README.Strife.md NOT-BUGS.md
+
+export MACOSX_DEPLOYMENT_TARGET=10.7
+
+ifeq ($(TARGET_OS),arm)
+    POSTFIX=arm64
+else
+    POSTFIX=x86
+endif
+
+STAGING_DIR=staging
+DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-$(POSTFIX).dmg
+
+TOPLEVEL=../..
+TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES))
+
+# DMG file containing package:
+
+$(DMG) : tmp.dmg
+	rm -f $@
+	sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
+	./dmgfix "$(realpath tmp.dmg)" "$(PACKAGE_STRING)" "$(PACKAGE_NAME).app"
+	hdiutil convert -format UDBZ -o $@ tmp.dmg
+	rm -f tmp.dmg
+
+tmp.dmg : $(STAGING_DIR)
+	rm -f $@
+	hdiutil makehybrid -hfs -hfs-volume-name "$(PACKAGE_STRING)"     \
+	                   -hfs-openfolder $(STAGING_DIR) $(STAGING_DIR) \
+			   -o tmp.dmg
+
+# Staging dir build for package:
+
+APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app
+
+APP_TOP_DIR=$(APP_DIR)/Contents
+APP_BIN_DIR=$(APP_DIR)/Contents/MacOS
+SRC_INFO_PLIST=Info.plist
+
+APP_DOC_DIR=$(APP_BIN_DIR)/Documentation
+APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR))
+
+$(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns wadfile.icns
+	rm -rf $(STAGING_DIR)
+	mkdir $(STAGING_DIR)
+
+	mkdir -p "$(APP_TOP_DIR)"
+	cp -R Resources "$(APP_TOP_DIR)"
+	cp app.icns wadfile.icns "$(APP_TOP_DIR)/Resources"
+	cp $(TOPLEVEL)/data/doom.png "$(APP_TOP_DIR)/Resources/128x128.png"
+	cp PkgInfo "$(APP_TOP_DIR)"
+	cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)"
+
+	mkdir -p "$(APP_BIN_DIR)"
+
+	mkdir -p "$(APP_DOC_DIR)"
+	cp $(TOPLEVEL_DOCS) "$(APP_DOC_DIR)"
+
+	mv "$(APP_DOC_DIR)/README.md" "$(APP_DOC_DIR)/README"
+	mv "$(APP_DOC_DIR)/COPYING.md" "$(APP_DOC_DIR)/COPYING"
+	ln -s "$(APP_DOC_RELDIR)/COPYING" "$(STAGING_DIR)/Software License"
+	ln -s "$(APP_DOC_RELDIR)/README" "$(STAGING_DIR)/README"
+	ln -s /Applications "$(STAGING_DIR)"
+
+	cp launcher "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/launcher"
+
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)strife "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)strife"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"
+
+	$(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__  \
+	                -DDOOM -DHERETIC -DHEXEN -DSTRIFE     \
+	             < $(TOPLEVEL)/man/INSTALL.template       \
+	             > "$(APP_DOC_DIR)/INSTALL"
+
+	mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6"
+	cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5"
+	cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6"
+	for game in doom heretic hexen strife; do       \
+		cp $(TOPLEVEL)/man/CMDLINE.$$game       \
+		   "$(APP_DOC_DIR)/CMDLINE-$$game";     \
+	done
+	cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store
+	cp disk/background.png $(STAGING_DIR)/background.png
+
+app.icns: $(TOPLEVEL)/data/doom.png
+	mkdir -p app.iconset
+	sips -z 64 64 $< --out app.iconset/icon_32x32@2x.png
+	iconutil -c icns app.iconset
+
+wadfile.icns: $(TOPLEVEL)/data/wadfile.png
+	mkdir -p wadfile.iconset
+	sips -z 64 64 $< --out wadfile.iconset/icon_32x32@2x.png
+	iconutil -c icns wadfile.iconset
+
+clean : launcher_clean
+	rm -f $(DMG)
+	rm -rf $(STAGING_DIR)
+	rm -rf app.icns app.iconset wadfile.icns wadfile.iconset
+
+# Launcher build:
+CFLAGS = -Wall -I$(TOPLEVEL)
+LDFLAGS = -framework Cocoa
+
+LAUNCHER_OBJS= \
+        AppController.o \
+        Execute.o \
+        IWADController.o \
+        LauncherManager.o \
+        main.o
+
+launcher : $(LAUNCHER_OBJS)
+	$(CC) $(LDFLAGS) $(LAUNCHER_OBJS) -o $@
+
+%.o : %.m
+	$(CC) -c $(CFLAGS) $^ -o $@
+
+launcher_clean :
+	rm -f $(LAUNCHER_OBJS) launcher
+
diff --git a/games/NXDoom/pkg/osx/IWADController.h b/games/NXDoom/pkg/osx/IWADController.h
new file mode 100644
index 000000000..404bffad0
--- /dev/null
+++ b/games/NXDoom/pkg/osx/IWADController.h
@@ -0,0 +1,57 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef LAUNCHER_IWADCONTROLLER_H
+#define LAUNCHER_IWADCONTROLLER_H
+
+#include <AppKit/AppKit.h>
+#include <AppKit/NSNibLoading.h>
+
+@interface IWADController : NSObject
+{
+    id iwadSelector;
+    id configWindow;
+
+    id chex;
+    id doom1;
+    id doom2;
+    id plutonia;
+    id tnt;
+    id freedoom1;
+    id freedoom2;
+    id freedm;
+
+    id heretic;
+    id hexen;
+    id strife;
+}
+
+- (void) closeConfigWindow: (id)sender;
+- (void) openConfigWindow: (id)sender;
+- (NSString *) getIWADLocation;
+- (NSString *) autoloadPath;
+- (void) awakeFromNib;
+- (BOOL) setDropdownList;
+- (void) setDropdownSelection;
+- (void) saveConfig;
+- (char *) doomWadPath;
+- (void) setEnvironment;
+- (const char *) getGameName;
+- (BOOL) addIWADPath: (NSString *) path;
+- (BOOL) selectGameByName: (const char *) name;
+
+@end
+
+#endif /* #ifndef LAUNCHER_IWADCONTROLLER_H */
+
diff --git a/games/NXDoom/pkg/osx/IWADController.m b/games/NXDoom/pkg/osx/IWADController.m
new file mode 100644
index 000000000..c131105c3
--- /dev/null
+++ b/games/NXDoom/pkg/osx/IWADController.m
@@ -0,0 +1,482 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include <AppKit/AppKit.h>
+
+#include "config.h"
+#include "IWADController.h"
+
+typedef enum
+{
+    IWAD_DOOM1,
+    IWAD_DOOM2,
+    IWAD_TNT,
+    IWAD_PLUTONIA,
+    IWAD_CHEX,
+    IWAD_HERETIC,
+    IWAD_HEXEN,
+    IWAD_STRIFE,
+    IWAD_FREEDOOM1,
+    IWAD_FREEDOOM2,
+    IWAD_FREEDM,
+    NUM_IWAD_TYPES
+} IWAD;
+
+static NSString *IWADLabels[NUM_IWAD_TYPES] =
+{
+    @"Doom",
+    @"Doom II: Hell on Earth",
+    @"Final Doom: TNT: Evilution",
+    @"Final Doom: Plutonia Experiment",
+    @"Chex Quest",
+    @"Heretic",
+    @"Hexen",
+    @"Strife",
+    @"Freedoom: Phase 1",
+    @"Freedoom: Phase 2",
+    @"FreeDM",
+};
+
+static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] =
+{
+    @"doom.wad",
+    @"doom2.wad",
+    @"tnt.wad",
+    @"plutonia.wad",
+    @"chex.wad",
+    @"heretic.wad",
+    @"hexen.wad",
+    @"strife.wad",
+    @"freedoom1.wad",
+    @"freedoom2.wad",
+    @"freedm.wad",
+    @"undefined"
+};
+
+@implementation IWADController
+
+- (void) getIWADList: (NSPathControl **) iwadList
+{
+    iwadList[IWAD_DOOM1] = self->doom1;
+    iwadList[IWAD_DOOM2] = self->doom2;
+    iwadList[IWAD_TNT] = self->tnt;
+    iwadList[IWAD_PLUTONIA] = self->plutonia;
+    iwadList[IWAD_CHEX] = self->chex;
+    iwadList[IWAD_HERETIC] = self->heretic;
+    iwadList[IWAD_HEXEN] = self->hexen;
+    iwadList[IWAD_STRIFE] = self->strife;
+    iwadList[IWAD_FREEDOOM1] = self->freedoom1;
+    iwadList[IWAD_FREEDOOM2] = self->freedoom2;
+    iwadList[IWAD_FREEDM] = self->freedm;
+}
+
+- (IWAD) getSelectedIWAD
+{
+    unsigned int i;
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        if ([self->iwadSelector titleOfSelectedItem] == IWADLabels[i])
+        {
+            return i;
+        }
+    }
+
+    return NUM_IWAD_TYPES;
+}
+
+// Get the location of the selected IWAD.
+
+- (NSString *) getIWADLocation
+{
+    IWAD selectedIWAD;
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+
+    selectedIWAD = [self getSelectedIWAD];
+
+    if (selectedIWAD == NUM_IWAD_TYPES)
+    {
+        return nil;
+    }
+    else
+    {
+        [self getIWADList: iwadList];
+
+	return [[iwadList[selectedIWAD] URL] path];
+    }
+}
+
+static const char *NameForIWAD(IWAD iwad)
+{
+    switch (iwad)
+    {
+        case IWAD_HERETIC:
+            return "heretic";
+
+        case IWAD_HEXEN:
+            return "hexen";
+
+        case IWAD_STRIFE:
+            return "strife";
+
+        default:
+            return "doom";
+    }
+}
+
+// Get the name used for the executable for the selected IWAD.
+
+- (const char *) getGameName
+{
+    return NameForIWAD([self getSelectedIWAD]);
+}
+
+- (void) setIWADConfig
+{
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+    NSUserDefaults *defaults;
+    NSString *key;
+    NSString *value;
+    unsigned int i;
+
+    [self getIWADList: iwadList];
+
+    // Load IWAD filename paths
+
+    defaults = [NSUserDefaults standardUserDefaults];
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        key = IWADFilenames[i];
+        value = [defaults stringForKey:key];
+
+        if (value != nil)
+        {
+            [iwadList[i] setURL: [NSURL fileURLWithPath: value]];
+        }
+    }
+}
+
+// On startup, set the selected item in the IWAD dropdown
+
+- (void) setDropdownSelection
+{
+    NSUserDefaults *defaults;
+    NSString *selected;
+    unsigned int i;
+
+    defaults = [NSUserDefaults standardUserDefaults];
+    selected = [defaults stringForKey: @"selected_iwad"];
+
+    if (selected == nil)
+    {
+        return;
+    }
+
+    // Find this IWAD in the filenames list, and select it.
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        if ([selected isEqualToString:IWADFilenames[i]])
+        {
+            [self->iwadSelector selectItemWithTitle:IWADLabels[i]];
+            break;
+        }
+    }
+}
+
+// Set the dropdown list to include an entry for each IWAD that has
+// been configured.  Returns true if at least one IWAD is configured.
+
+- (BOOL) setDropdownList
+{
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+    BOOL have_wads;
+    id location;
+    unsigned int i;
+    unsigned int enabled_wads;
+
+    // Build the new list.
+
+    [self getIWADList: iwadList];
+    [self->iwadSelector removeAllItems];
+
+    enabled_wads = 0;
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        location = [[iwadList[i] URL] path];
+
+        if (location != nil && [location length] > 0)
+        {
+            [self->iwadSelector addItemWithTitle: IWADLabels[i]];
+            ++enabled_wads;
+        }
+    }
+
+    // Enable/disable the dropdown depending on whether there
+    // were any configured IWADs.
+
+    have_wads = enabled_wads > 0;
+    [self->iwadSelector setEnabled: have_wads];
+
+    // Restore the old selection.
+
+    [self setDropdownSelection];
+
+    return have_wads;
+}
+
+- (void) saveConfig
+{
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+    IWAD selectedIWAD;
+    NSUserDefaults *defaults;
+    NSString *key;
+    NSString *value;
+    unsigned int i;
+
+    [self getIWADList: iwadList];
+
+    // Store all IWAD locations to user defaults.
+
+    defaults = [NSUserDefaults standardUserDefaults];
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        key = IWADFilenames[i];
+        value = [[iwadList[i] URL] path];
+
+        [defaults setObject:value forKey:key];
+    }
+
+    // Save currently selected IWAD.
+
+    selectedIWAD = [self getSelectedIWAD];
+    [defaults setObject:IWADFilenames[selectedIWAD]
+              forKey:@"selected_iwad"];
+}
+
+// Callback method invoked when the configuration button in the main
+// window is clicked.
+
+- (void) openConfigWindow: (id)sender
+{
+    if (![self->configWindow isVisible])
+    {
+        [self->configWindow makeKeyAndOrderFront: sender];
+    }
+}
+
+// Callback method invoked when the close button is clicked.
+
+- (void) closeConfigWindow: (id)sender
+{
+    [self->configWindow orderOut: sender];
+    [self saveConfig];
+    [self setDropdownList];
+}
+
+- (void) awakeFromNib
+{
+    [self->configWindow center];
+
+    // Set configuration for all IWADs from configuration file.
+
+    [self setIWADConfig];
+
+    // Populate the dropdown IWAD list.
+
+    if ([self setDropdownList])
+    {
+        [self setDropdownSelection];
+    }
+}
+
+// Generate a value to set for the DOOMWADPATH environment variable
+// that contains each of the configured IWAD files.
+
+- (char *) doomWadPath
+{
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+    NSString *location;
+    unsigned int i;
+    BOOL first;
+    char *env;
+    size_t env_len;
+
+    [self getIWADList: iwadList];
+
+    // Calculate length of environment string.
+
+    env_len = 0;
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        location = [[iwadList[i] URL] path];
+
+        if (location != nil && [location length] > 0)
+        {
+            env_len += [location length] + 1;
+        }
+    }
+
+    // Build string.
+
+    env = malloc(env_len);
+    strlcpy(env, "", env_len);
+
+    first = YES;
+
+    for (i=0; i<NUM_IWAD_TYPES; ++i)
+    {
+        location = [[iwadList[i] URL] path];
+
+        if (location != nil && [location length] > 0)
+        {
+            if (!first)
+            {
+                strlcat(env, ":", env_len);
+            }
+
+            strlcat(env, [location UTF8String], env_len);
+            first = NO;
+        }
+    }
+
+    return env;
+}
+
+- (NSString *) autoloadPath
+{
+    NSArray *array = NSSearchPathForDirectoriesInDomains(
+        NSApplicationSupportDirectory, NSUserDomainMask, YES);
+    if ([array count] == 0)
+    {
+        return nil;
+    }
+
+    IWAD selectedIWAD = [self getSelectedIWAD];
+    if (selectedIWAD == NUM_IWAD_TYPES)
+    {
+        return nil;
+    }
+
+    NSString *base = [array objectAtIndex:0];
+    return [NSString pathWithComponents:
+        [NSArray arrayWithObjects: base, @PACKAGE_TARNAME, @"autoload",
+                                   IWADFilenames[selectedIWAD], nil]];
+}
+
+// Set the DOOMWADPATH environment variable to contain the path to each
+// of the configured IWAD files.
+
+- (void) setEnvironment
+{
+    char *doomwadpath;
+    char *env;
+
+    // Get the value for the path.
+
+    doomwadpath = [self doomWadPath];
+
+    asprintf(&env, "DOOMWADPATH=%s", doomwadpath);
+
+    free(doomwadpath);
+
+    // Load into environment:
+
+    putenv(env);
+
+    //free(env);
+}
+
+// Examine a path to a WAD and determine whether it is an IWAD file.
+// If so, it is added to the IWAD configuration, and true is returned.
+
+- (BOOL) addIWADPath: (NSString *) path
+{
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+    NSArray *pathComponents;
+    NSString *filename;
+    unsigned int i;
+
+    [self getIWADList: iwadList];
+
+    // Find an IWAD file that matches the filename in the path that we
+    // have been given.
+
+    pathComponents = [path pathComponents];
+    filename = [pathComponents objectAtIndex: [pathComponents count] - 1];
+
+    for (i = 0; i < NUM_IWAD_TYPES; ++i)
+    {
+        if ([filename caseInsensitiveCompare: IWADFilenames[i]] == 0)
+        {
+            // Configure this IWAD.
+
+            [iwadList[i] setURL: [NSURL fileURLWithPath: path]];
+
+            // Rebuild dropdown list and select the new IWAD.
+
+            [self setDropdownList];
+            [self->iwadSelector selectItemWithTitle:IWADLabels[i]];
+            return YES;
+        }
+    }
+
+    // No IWAD found with this name.
+
+    return NO;
+}
+
+- (BOOL) selectGameByName: (const char *) name
+{
+    NSPathControl *iwadList[NUM_IWAD_TYPES];
+    NSString *location;
+    const char *name2;
+    int i;
+
+    // Already selected an IWAD of the desired type? Just return
+    // success.
+    if (!strcmp(name, [self getGameName]))
+    {
+        return YES;
+    }
+
+    // Search through the configured IWADs and try to select the
+    // desired game.
+    [self getIWADList: iwadList];
+
+    for (i = 0; i < NUM_IWAD_TYPES; ++i)
+    {
+        location = [[iwadList[i] URL] path];
+        name2 = NameForIWAD(i);
+
+        if (!strcmp(name, name2)
+         && location != nil && [location length] > 0)
+        {
+            [self->iwadSelector selectItemWithTitle:IWADLabels[i]];
+            return YES;
+        }
+    }
+
+    // User hasn't configured any WAD(s) for the desired game type.
+    return NO;
+}
+
+@end
+
diff --git a/games/NXDoom/pkg/osx/Info.plist.in b/games/NXDoom/pkg/osx/Info.plist.in
new file mode 100644
index 000000000..13da040dd
--- /dev/null
+++ b/games/NXDoom/pkg/osx/Info.plist.in
@@ -0,0 +1,104 @@
+<?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>CFBundleIdentifier</key>
+        <string>org.chocolate-doom.launcher</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>@PACKAGE_NAME@</string>
+	<key>CFBundleExecutable</key>
+	<string>launcher</string>
+	<key>CFBundleGetInfoString</key>
+	<string>@PACKAGE_STRING@</string>
+	<key>CFBundleIconFile</key>
+	<string>app.icns</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>@PACKAGE_NAME@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@PACKAGE_VERSION@</string>
+	<key>CFBundleVersion</key>
+	<string>@PACKAGE_VERSION@</string>
+        <key>NSHighResolutionCapable</key>
+        <string>true</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSMainNibFile</key>
+	<string>launcher</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>Copyright (C) 1993-2015, id Software and Raven Software, Simon Howard, James Haley, Samuel Villarreal and other contributors.
+
+Licensed under the GNU GPL v2.</string>
+
+        <!-- file associations: -->
+
+        <key>CFBundleDocumentTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleTypeName</key>
+                        <string>Doom WAD file</string>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>wadfile.icns</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>wad</string>
+                        </array>
+                </dict>
+                <dict>
+                        <key>CFBundleTypeName</key>
+                        <string>Doom demo recording</string>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>wadfile.icns</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>lmp</string>
+                        </array>
+                </dict>
+                <dict>
+                        <key>CFBundleTypeName</key>
+                        <string>Doom Dehacked patch</string>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>wadfile.icns</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>deh</string>
+                        </array>
+                </dict>
+                <dict>
+                        <key>CFBundleTypeName</key>
+                        <string>Heretic HHE patch</string>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>wadfile.icns</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>hhe</string>
+                        </array>
+                </dict>
+                <dict>
+                        <key>CFBundleTypeName</key>
+                        <string>Strife Sehacked patch</string>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>wadfile.icns</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>seh</string>
+                        </array>
+                </dict>
+        </array>
+</dict>
+</plist>
diff --git a/games/NXDoom/pkg/osx/LauncherManager.h b/games/NXDoom/pkg/osx/LauncherManager.h
new file mode 100644
index 000000000..fb8a5cf5d
--- /dev/null
+++ b/games/NXDoom/pkg/osx/LauncherManager.h
@@ -0,0 +1,51 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef LAUNCHER_LAUNCHERMANAGER_H
+#define LAUNCHER_LAUNCHERMANAGER_H
+
+#include <AppKit/AppKit.h>
+#include <AppKit/NSNibLoading.h>
+#include "IWADController.h"
+
+@interface LauncherManager : NSObject
+{
+    IWADController *iwadController;
+
+    id launcherWindow;
+    id launchButton;
+
+    id commandLineArguments;
+}
+
+- (void) launch: (id)sender;
+- (void) runSetup: (id)sender;
+- (void) awakeFromNib;
+- (void) clearCommandLine;
+- (BOOL) addIWADPath: (NSString *) path;
+- (void) addFileToCommandLine: (NSString *) fileName
+         forArgument: (NSString *) args;
+- (BOOL) selectGameByName: (const char *) name;
+- (void) openTerminal: (id) sender;
+
+- (void) openREADME: (id) sender;
+- (void) openINSTALL: (id) sender;
+- (void) openCMDLINE: (id) sender;
+- (void) openCOPYING: (id) sender;
+- (void) openDocumentation: (id) sender;
+
+@end
+
+#endif /* #ifndef LAUNCHER_LAUNCHERMANAGER_H */
+
diff --git a/games/NXDoom/pkg/osx/LauncherManager.m b/games/NXDoom/pkg/osx/LauncherManager.m
new file mode 100644
index 000000000..4e6e33e52
--- /dev/null
+++ b/games/NXDoom/pkg/osx/LauncherManager.m
@@ -0,0 +1,410 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <AppKit/AppKit.h>
+#include "Execute.h"
+#include "LauncherManager.h"
+#include "config.h"
+
+@implementation LauncherManager
+
+// Save configuration.  Invoked when we launch the game or quit.
+
+- (void) saveConfig
+{
+    NSUserDefaults *defaults;
+
+    // Save IWAD configuration and selected IWAD.
+
+    [self->iwadController saveConfig];
+
+    // Save command line arguments.
+
+    defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:[self->commandLineArguments stringValue]
+              forKey:@"command_line_args"];
+}
+
+// Load configuration, invoked on startup.
+
+- (void) setConfig
+{
+    NSUserDefaults *defaults;
+    NSString *args;
+
+    defaults = [NSUserDefaults standardUserDefaults];
+
+    args = [defaults stringForKey:@"command_line_args"];
+
+    if (args != nil)
+    {
+        [self->commandLineArguments setStringValue:args];
+    }
+}
+
+// Get the next command line argument from the command line.
+// The position counter used to iterate over arguments is in 'pos'.
+// The index of the argument that was found is saved in arg_pos.
+
+static NSString *GetNextArgument(NSString *commandLine, int *pos, int *arg_pos)
+{
+    NSRange arg_range;
+
+    // Skip past any whitespace
+
+    while (*pos < [commandLine length]
+        && isspace([commandLine characterAtIndex: *pos]))
+    {
+        ++*pos;
+    }
+
+    if (*pos >= [commandLine length])
+    {
+        *arg_pos = *pos;
+        return nil;
+    }
+
+    // We are at the start of the argument.  This may be a quoted
+    // string argument, or a "normal" one.
+
+    if ([commandLine characterAtIndex: *pos] == '\"')
+    {
+        // Quoted string, skip past first quote
+
+        ++*pos;
+
+        // Save start position:
+
+        *arg_pos = *pos;
+
+        while (*pos < [commandLine length]
+            && [commandLine characterAtIndex: *pos] != '\"')
+        {
+            ++*pos;
+        }
+
+        // Unexpected end of string?
+
+        if (*pos >= [commandLine length])
+        {
+            return nil;
+        }
+
+        arg_range = NSMakeRange(*arg_pos, *pos - *arg_pos);
+
+        // Skip past last quote
+
+        ++*pos;
+    }
+    else
+    {
+        // Normal argument
+
+        // Save position:
+
+        *arg_pos = *pos;
+
+        // Read until end:
+
+        while (*pos < [commandLine length]
+            && !isspace([commandLine characterAtIndex: *pos]))
+        {
+            ++*pos;
+        }
+
+        arg_range = NSMakeRange(*arg_pos, *pos - *arg_pos);
+    }
+
+    return [commandLine substringWithRange: arg_range];
+}
+
+// Given the specified command line argument, find the index
+// to insert the new file within the command line.  Returns -1 if the 
+// argument is not already within the arguments string.
+
+static int GetFileInsertIndex(NSString *commandLine, NSString *needle)
+{
+    NSString *arg;
+    int arg_pos;
+    int pos;
+
+    pos = 0;
+
+    // Find the command line parameter we are searching
+    // for (-merge, -deh, etc)
+
+    for (;;)
+    {
+        arg = GetNextArgument(commandLine, &pos, &arg_pos);
+
+        // Searched to end of string and never found?
+
+        if (arg == nil)
+        {
+            return -1;
+        }
+
+        if (![arg caseInsensitiveCompare: needle])
+        {
+            break;
+        }
+    }
+
+    // Now skip over existing files.  For example, if we
+    // have -file foo.wad bar.wad, the new file should be appended
+    // to the end of the list.
+
+    for (;;)
+    {
+        arg = GetNextArgument(commandLine, &pos, &arg_pos);
+
+        // If we search to the end of the string now, it is fine;
+        // the new string should be added to the end of the command
+        // line.  Otherwise, if we find an argument that begins
+        // with '-', it is a new command line parameter and the end
+        // of the list.
+
+        if (arg == nil || [arg characterAtIndex: 0] == '-')
+        {
+            break;
+        }
+    }
+
+    // arg_pos should now contain the offset to insert the new filename.
+
+    return arg_pos;
+}
+
+// Given the specified string, append a filename, quoted if necessary.
+
+static NSString *AppendQuotedFilename(NSString *str, NSString *fileName)
+{
+    int i;
+
+    // Search the filename for spaces, and quote if necessary.
+
+    for (i=0; i<[fileName length]; ++i)
+    {
+        if (isspace([fileName characterAtIndex: i]))
+        {
+            str = [str stringByAppendingString: @" \""];
+            str = [str stringByAppendingString: fileName];
+            str = [str stringByAppendingString: @"\" "];
+
+            return str;
+        }
+    }
+
+    str = [str stringByAppendingString: @" "];
+    str = [str stringByAppendingString: fileName];
+
+    return str;
+}
+
+// Clear out the existing command line options.
+// Invoked before the first file is added.
+
+- (void) clearCommandLine
+{
+    [self->commandLineArguments setStringValue: @""];
+}
+
+// Add a file to the command line to load with the game.
+
+- (void) addFileToCommandLine: (NSString *) fileName
+         forArgument: (NSString *) arg
+{
+    NSString *commandLine;
+    int insert_pos;
+
+    // Get the current command line
+
+    commandLine = [self->commandLineArguments stringValue];
+
+    // Find the location to insert the new filename:
+
+    insert_pos = GetFileInsertIndex(commandLine, arg);
+
+    // If position < 0, we should add the new argument and filename
+    // to the end.  Otherwise, append the new filename to the existing
+    // list of files.
+
+    if (insert_pos < 0)
+    {
+        commandLine = [commandLine stringByAppendingString: @" "];
+        commandLine = [commandLine stringByAppendingString: arg];
+        commandLine = AppendQuotedFilename(commandLine, fileName);
+    }
+    else
+    {
+        NSString *start;
+        NSString *end;
+
+        // Divide existing command line in half:
+
+        start = [commandLine substringToIndex: insert_pos];
+        end = [commandLine substringFromIndex: insert_pos];
+
+        // Construct new command line:
+
+        commandLine = AppendQuotedFilename(start, fileName);
+        commandLine = [commandLine stringByAppendingString: @" "];
+        commandLine = [commandLine stringByAppendingString: end];
+    }
+
+    [self->commandLineArguments setStringValue: commandLine];
+}
+
+- (void) launch: (id)sender
+{
+    NSString *iwad;
+    NSString *args;
+    char *executable_name;
+    const char *game_name;
+
+    [self saveConfig];
+
+    iwad = [self->iwadController getIWADLocation];
+    args = [self->commandLineArguments stringValue];
+
+    if (iwad == nil)
+    {
+        NSRunAlertPanel(@"No IWAD selected",
+                        @"You have not selected an IWAD (game) file.\n\n"
+                         "You must configure and select a valid IWAD file "
+                         "in order to launch the game.",
+                        @"OK", nil, nil);
+        return;
+    }
+
+    game_name = [self->iwadController getGameName];
+    asprintf(&executable_name, "%s%s", PROGRAM_PREFIX, game_name);
+
+    ExecuteProgram(executable_name, [iwad UTF8String],
+                                    [args UTF8String]);
+    [NSApp terminate:sender];
+}
+
+// Invoked when the "Setup Tool" button is clicked, to run the setup tool:
+
+- (void) runSetup: (id)sender
+{
+    const char *game_name;
+    char *arg;
+
+    [self saveConfig];
+    [self->iwadController setEnvironment];
+
+    // Provide the -game command line parameter to select the game
+    // to configure, based on the game selected in the dropdown.
+
+    game_name = [self->iwadController getGameName];
+    asprintf(&arg, "-game %s", game_name);
+
+    ExecuteProgram(PROGRAM_PREFIX "setup", NULL, arg);
+
+    free(arg);
+}
+
+// Invoked when the "Terminal" option is selected from the menu, to open
+// a terminal window.
+
+- (void) openTerminal: (id) sender
+{
+    char *doomwadpath;
+
+    [self saveConfig];
+
+    doomwadpath = [self->iwadController doomWadPath];
+
+    OpenTerminalWindow(doomwadpath);
+
+    free(doomwadpath);
+}
+
+- (void) openREADME: (id) sender
+{
+    OpenDocumentation("README");
+}
+
+- (void) openINSTALL: (id) sender
+{
+    OpenDocumentation("INSTALL");
+}
+
+- (void) openCMDLINE: (id) sender
+{
+    const char *game_name;
+    char filename[32];
+
+    // We need to open the appropriate doc file for the currently
+    // selected game.
+
+    game_name = [self->iwadController getGameName];
+    snprintf(filename, sizeof(filename), "CMDLINE-%s", game_name);
+
+    OpenDocumentation(filename);
+}
+
+- (void) openCOPYING: (id) sender
+{
+    OpenDocumentation("COPYING");
+}
+
+- (void) openDocumentation: (id) sender
+{
+    OpenDocumentation("");
+}
+
+- (void) openAutoload: (id) sender
+{
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSString *path = [self->iwadController autoloadPath];
+
+    if (path == nil)
+    {
+        return;
+    }
+
+    if (![fm fileExistsAtPath:path])
+    {
+        [fm createDirectoryAtPath:path
+            withIntermediateDirectories:YES
+            attributes:nil
+            error:nil];
+    }
+
+    [[NSWorkspace sharedWorkspace] openFile:path withApplication:@"Finder"];
+}
+
+- (void) awakeFromNib
+{
+    [self->launcherWindow setTitle: @PACKAGE_NAME " Launcher"];
+    [self->launcherWindow center];
+    [self->launcherWindow setDefaultButtonCell: [self->launchButton cell]];
+    [self setConfig];
+}
+
+- (BOOL) addIWADPath: (NSString *) path
+{
+    return [self->iwadController addIWADPath: path];
+}
+
+- (BOOL) selectGameByName: (const char *) name
+{
+    return [self->iwadController selectGameByName: name];
+}
+
+@end
+
diff --git a/games/NXDoom/pkg/osx/PkgInfo b/games/NXDoom/pkg/osx/PkgInfo
new file mode 100644
index 000000000..6f749b0f3
--- /dev/null
+++ b/games/NXDoom/pkg/osx/PkgInfo
@@ -0,0 +1 @@
+APPL????
diff --git a/games/NXDoom/pkg/osx/Resources/app.png b/games/NXDoom/pkg/osx/Resources/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b932e8cf86ca68c79b71a41458df6c1809011f3
GIT binary patch
literal 4597
zcmV<R5en{!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L009O7009O8&C@fy00007bV*G`2iXY`
z5H$-ml?{Rb01<UbL_t(&-qo6UkQ`@u#(#Zx&porVv!`}-u5QVeg(YEQY*984LnsO=
z*aby^N(c~aY?DB$C{i3Qhz%IZR0s|+n8V1}#5RX79LuL{OO~`=t*$*K?P{;tnVp?`
zx_i1ie`r>kT^*L4B9(Mi*Z$G7)9>>>&-=XZ_k9EZ&oALE{*MeOwZAT4*KV)&8Snop
z01?oD2oM7TfCH3(GEl7nsnl+}2Jp`YNP3gO>p%indCSc={naD)eD~f&Q`6G_dj6#{
z(Dd%>uDxVvXxIS4HK0Nb;GYe|n_)l!8i6%G|H18dH06(OGA)~}AGrxx_v5*z;_L0{
zv4+Nzuk6};V9(EfdH-X;F<`pJh*x{3P$xC-e*=IBgn$)y|MSh?+_oh8?w|kqL9D7v
z)UOc@Xb@~f^K4eET*dNrm*Q3mOqIN2*L?H~p9PKrQ#DD+HFl&LJ7%5K{wxxj(|rrD
z_LfiG@bP2)M}nK)^#MM4>sQ!(#deCWN=4B4=x1&t5b!fRFvt@R@4zTdM#Ei~SGo`M
zj@RnM0eqkCNL;2%Qrl?R)N9PTZ&hZ}MYxT>7W|qYe)G$>Y+18-?dmPp(9yM)^uT_K
zQzuxlVKaWwBH7nXw7HE$>mt@%eicq7&*f{DZd!HOw$`VgeWACO?ZCB(h7Voc)b!oU
zB7xQ2*=*W$J)su-n+76XAb6!#j2*!Gf4}S7w_d$=(UpnSTbOwL1*VU_h9l{;ZM+ge
z5E$9FlcNXrG2QnX@#c1fs>O-%NnU#9Dc-Yb=~A`1EBo5M?oq&47xr!beJ*&_fwH>v
z=FZsmC5D{XH(N;6*!F5nT~vKY7bw^Wu<VwbK6k^HKJ}rmE)l0!$_?!dAL+#^WXNj`
zB*F$-xDmx4rm=GsAq}3}ca&&jD~4bZZ;0}(`~E=O5ZSmmzV5-Ddv^ii>VSXEj1b)1
zQxb%yvyu_je5?Pyv*BF|4g<w<v6jG#0wSG9^Fd(A7jC}k#*c4q`eIYmXC$XnWYg1(
zkB*QX?q=7nUHtq%pX7#5{vCEHk7Ji9Cr?tEI?ivOc%GHbA^f2zf?cAJNzoFN)$Q;5
zVDyjAywtxcpm*kl&}ApBQywyG3gWXlDX=9H*nDGa^vbDnC6l!5YAqhO?tVi6Vomdl
zfJ=V;ty}KU{2`ur{4s)}Ng-e4<=wjx1%Z)tfxEu{ePqLrU7Tfj*W>Kk`4me!+nLSH
za(r~0<sD5d?`$X1+<{%rlb$#kdurdnt1J9Qvnhoy9kGPdF6aV1B~jj6Qero>gx|3}
z9=zmWwlGz8T`p7~(m8@}1vc#b%{_Nir;mjM)u26UFnD}~!O;m63EJ8haqZhTQ<@wk
zIoQMVk3YiR*Lw))Dy~(=b{w8NGR5+sjo#3PS4@#uaVgehpZ@TkW6v-1=`lwMUvk_O
z&a&}}3%d%UI%=zJH+4q0uMFz#`!l&|@06_Eg^f|F3*M-?&HAT*@%_7+b-UfnB*~?d
zy!!fK%9$kZxpq72H*ThD{U*}0Ssr_OCwmU`V@NIqvr5UTV%jc>BJo)FNj5BMK=mw^
zZQMpWm87YCDfj;V`IkEVdRW#YmkgB!@qF5zbp)QtNxG^UT{kUnd{;;jIGimeYa@$Q
z1A<t`L>O55>QfKj)uKD?f*>LY(Ad_=+NEu5yZTyQ=@}%MO7X%oPt$*>hmbB|RvmnP
z1J`vqJT}9L={&tBGU$p3qKIYN%nbFgc=aVzig|#5g(oS}#r4o#SwZ~Lu-vHlTR#82
zE$i+EnreM%o`f`@<<77E!&lZf2yaUdA7El^4A*se`GuWKjF0nbcQ10az|`mod~S(U
zW|ore5Y$!Ns>5J1M>1=YGcBfb72dug!Czi?6_c4F5)M_{WbDu$-uZ!#X|M0zlZl4o
zYx~QRC`uxtC~|$&p(;w`JPA=0=iP`Rhf1P!MO;*#Jvs45AYE&W$o1Ve9t*3EW1$#+
zD$~a~a(IF#d&gPa=%+IlM3*G8WsAe(84@9#235wVYaBf}L)5R4&Rdwa!#mfs(cqUk
zI(UMJP@-f<P|_158sh|lZo7#)WEiTa8uIB(uQe*PGfgBG<Do*B@#-0M%~h?SRV2Vy
zU%PUh30PE3duDhTNi%r9dkEKa=^LMA&(Jit{l!{r$HDVFLWWAAQe{OV#50E{7?{ek
zED>TuN0?1Znh1pg?Cc&UnH{7h;$!#lAYDyiwqCl1-V@1*swY%6LqRq4GeOE(em^mR
zAx&|8Ya6qnCVp3r&a)gzbA(#(V!iWFo8xCc^^dpzWV9%Z{r2Sn)~#BBu1d&~$i|K+
z9qYF6wsl=-ibVfJ7EL!usx7Qo+Cf)KlnpDF@{#vk&9bhQcnG+z$Nm!;9@#s>k+BS!
zqDeM6jx5Q=HbW8OeqB}#gSlJMC47dApo%=6nxILuQR<$nhC#&8{I!^cg$y`A4jA7#
zRCp{s*!Ss?VMxRxeDQ-@x&9-cAlSB?N-mAw*~|5Yj%1g}O^uMAEV4Sbi2lhL9)9{o
zuHUwikfCwi)-|k7<`D2GI3maLV&;(4-h2CZ@7eM0j>e6$CZih0nd~a30Gu8LGyzpK
z<~J#=D4h?0TN|_rKfV9K?%n@(8-vp&-gfy``d<7U-~9U5dGDr9Y)|6kRGQhcO=rwc
zAQ;4ROoDzN%NBRg7H_~GZ=p0ZftAY<mQ12SAED+B%#rHYSAXyy_XAU+$P(Q*AAl%}
z_;k50SOHaD06<q*u%19((9{$_+xhw+o$c*d`5FH3@*!UAn`Am)LKG!dG>2*MtDHy|
zX{@?5_!S(pLTgJ5&#@>bM@UVLGg~NgB3-1@lb9$R<I2uO>uUa8sX|HBmH7;a@;nA4
zO+fV)GN7EbhN%aj0)c0Lx8qiIrk`*y$YYQEmV#Nuth#iyM#1&yK9)jLMcQKlI^upN
zvlTjG63NMNvLy>e6e-ybBk2PBkEO_$ZS1N`xsc}*AG>kGeZSf<ZM&YM8w(g<zJz2|
zK$VPngM)mE0nP_N0yM=lJFSU+{<J%b<T<#WhptGh?MN^(HN*BbE#%EA9x#;55!7VH
zXG`dci0gu;NSL<6#B7O0@el)(Ibs0~yXvrQRZG`>u(RyC&O!!6cL4xRKvj%+J}T+z
zSvwx}034vwbKuZ(ZTXq2qmsq0iCN-}&3u0ICVu&+muQdq=x7WQ@hMbn2T_pF6&Xzt
zaXknc3ga^+_8d#m)f}QN=3`Y`lqb56(;U|EQl;HM(ej*%W=Qh@$W;lyz5sx>um<FX
ztzjMj3z$7Rmfl;%yZZ3JNw%$ON5#cxjBxwkypJ7E?IN8snH5diV?F}9icb@9T!De9
z9Q%e+qzWc)?}{^>tB}rDSds{`e9N`39h^)({Mg+;ei9HY&#R;-CaX@*;nSLMm*nQx
zfStiP^yoYQnai8b+NN0uAoIg}e)`PqxBcxE*Q~X+P0ki6TNaVZ5t6P)wqzjy)A<VB
zBQr<>1T=-|e1#1wL+D|Tu2!8HuSh7O(AF9Py~sUx|KeWYHDDBoih@wJr$?&R;E^)`
zTH^Qu(KFfhir9k#^98?ZlYJoxxj+#}$%>LYIFu$=u_=^ox)#HM{tWGLKk2;1rp0kI
zMIu+W7%Zjms~%(dBI$y~(ujef3FOQQ!4k;YmAj$;1TbFfHGW5+DrwTZKm-YV`kCoo
za?c+21XUCy2^{APi28BXtL@#S|LKk&{W#*+m<g>o?!-zQ&u8!_H1?jz67(qy6lZuP
znc}6fDO_N~>JUrY4K7_B#HUF##dX>eK3Wq7i3Yt=3%oqHM05qg71jBZv@3e}jZ;?Y
zGh`I~Yyh4tVyKdMzCJKl$a!GY*Vfgq9-q-Rt&bwhBFS`_v8>5Jd792v9|_kbHLFlE
z9mXar1pP9i0HL5v#d1+(fw5$T=74C`5>q|>5*JT36m+dF<0|+J`E+U(TbTF!R38vg
z6-A=#%=H6rApjRB0HdG#&aeI&*tqg5@Bc=NHkz1Bnq0G`fqlI>UfDlGYm<&F3oL3f
zNM$TmE(uUE9pVv%P*5Wp)+m&!Jk^~&v;ctTfvbl!B4O>!=%9=E3<<B6TuqVYJqJ+z
zD#{x$Fjvf3U<3#_Qe)q2emHU2`VjjM<ygHUNOPl#B!M6bv?X*J!ZH)nCO$)?T=DR*
zaH>@nwFS9<$AkOp0C)hF>v%>`AskZY1JLEu0K}?DB&_1qRf^&h1x**_Hv%v>7tH{Z
zgCnK=*KhK@<M2=x5s`AmCR?xx`4w85R1Ws%0a)J^B9nJmzcNBN6hu)3W->);jGFbk
z3NC`H`!ph<Ga1%&sm6c^PKI=@LO3{|0Y#C}WJRi*hdlWLt2rAe{`9^F_I&t?ZL~N0
za9qgdZMJWTb8@nRED3B_-Ha?&nMmeoZ#I~jEi*k+A>fzj8*dq_t(>g7ja|>S9Z%Cl
zFA_e(fTn>@cPSOe>FckON=rn-^J_p;M08CO&u63OVxkOWN0VA5pUvtazeKTAMbi{S
zv5bd6-_R86SBB_p3(?xzjx1UD4GGV)87;OQUs%9%->qsA;W`Fn$tIJYVCa~F>&k>f
zX9pz9B8Db8a|`-60^rpE%$B9Kd%6}Eu6q3WB#Ya9j80aF#bPwa6%50NuDC#zTxNu7
z6&yjqtW;36#db|TPW|`Vw(DxLM5L|;3I&CHULX`WcQC4^(A*L!7fffmj?oJOp!V`?
zZ(q8*bCY+~`>tuiaTTVsRa`62%lj&1^EO*IwK8-f$HvtW6i*`LSFo%iN0Qj}TOg-x
z)Nwpj6VGy)^Id^Rzzw%FPuzOvuCE>Ln;x25&|eGy8_3`Lvj<*%|K_b<P!*RWgIRLL
zD%-DINi>=w;8)4zN-S=bDU}MuV?IVsrdiZt(0w>_mW2XXmgB05<kh>-`L1wd+#H?t
zdOrNghyTU0oTEVU%`o8B0>}<dwT@?}ds{cGin1aQW?#=BmgUjZ=%ZMcNi@btrOQZ4
zki{J$k`m<CJ09A9jvDYB@Dx>?=R#-gdCC$>G?9DY$>HC8=O?fI1{kiL^pr2Q2Iewm
z0(pO=eejZ{>DI#oDJmm5x|YR>H8fJGm{_KTNQsfLG#$+XimGw&@bPn6XdMHn;d3(}
zD7u?>gHxaV+H-gA>797FHUwsBnRhSNh3Xqy(YBq6B17k*78*iT_8v?!natrhE}=-2
zXsm^mU49gwK{i*WBCj8VL-iIq-_vCY|2Y^a34Zh7aOJ>9Z+q~L@+rwo)W)0YxxVLO
z0N6nB<}d&2gZut?<8=r74pJ)0MB|;bGzch)PPvq!FngS!5x^?tn9Wp>)g|Y%&{GnT
z1pI2<>jjZy#h<(H(Se7){o~y`YLZFS9Zj9{x)=a+2XUoRK1+LR7(ozla#NUPl|MW^
z$u(OWFufRxS0-=8Ni>$3O=4XDz`R3?swcanv)a^WzV^(WdwNbwX7*h2dn*9uPU6ds
zV`7>%g+hf`Q#*!kbIlb|{A!M4qbF%x9-&%HGE=ab$vWo)-~m-ZI2BmdHq4&ka_<c{
zKYB;ma*n)_WZnvZxt%-nc+$u>hpNFq(1+k==^MykS3Q<?MCe@9Ov&<)6_=K1f{%as
z-iPW=?-w#!P!z>WS3@)RJ=*`s?LXT6K%L86P%>{7fDM%LcH4nQ@6Z)T2d3$0^|NAG
zCqci=#AFgfE#lZN2ohF#hT7`RJV!7#kg9s}<mbNe-0gpQ@mN1_@?s_PKVhJ3Ru!{Y
zEYr2DnN(_qzTqL3v>AwM3_+|ik#=YZ!RVyTg5OHaJA?s}tKa*R_nIcv8qmVUO6FV#
zdR$~7+k0Lg?`vs_<5mk8{s^m<H=<}EEVIb*kraxMBkXtaltmMDM?vSZ<(z3US?j8~
f1;2E8Q`dh3au&TP<1S&o00000NkvXXu0mjfxvk%a

literal 0
HcmV?d00001

diff --git a/games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib b/games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib
new file mode 100644
index 000000000..226678bd2
--- /dev/null
+++ b/games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib
@@ -0,0 +1,607 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1070" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="270" id="271"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="(Package Name) Launcher" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="21" userLabel="Launcher Window">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="350" y="488" width="532" height="195"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <value key="minSize" type="size" width="243.529" height="107"/>
+            <view key="contentView" id="2">
+                <rect key="frame" x="0.0" y="0.0" width="532" height="195"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="209">
+                        <rect key="frame" x="18" y="173" width="360" height="11"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="325">
+                            <font key="font" metaFont="miniSystem"/>
+                            <string key="title">Select a game:
+</string>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <popUpButton verticalHuggingPriority="750" id="211">
+                        <rect key="frame" x="18" y="141" width="250" height="26"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <popUpButtonCell key="cell" type="push" title="Game name" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="213" id="326">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="menu"/>
+                            <menu key="menu" title="OtherViews" id="212">
+                                <items>
+                                    <menuItem title="Game name" state="on" id="213"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                    </popUpButton>
+                    <imageView id="216">
+                        <rect key="frame" x="384" y="47" width="128" height="128"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="128x128" id="327"/>
+                    </imageView>
+                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="218">
+                        <rect key="frame" x="18" y="125" width="350" height="11"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="329">
+                            <font key="font" metaFont="miniSystem"/>
+                            <string key="title">Command line arguments:
+</string>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="219">
+                        <rect key="frame" x="20" y="49" width="346" height="68"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="border" drawsBackground="YES" id="330">
+                            <font key="font" metaFont="fixedUser" size="11"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="5zZ-CS-NR1">
+                        <rect key="frame" x="372" y="46" width="25" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Eln-B1-5BH">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="openCMDLINE:" target="206" id="abcde-98765"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="217">
+                        <rect key="frame" x="273" y="143" width="93" height="23"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="squareTextured" title="Configure..." bezelStyle="texturedSquare" alignment="center" borderStyle="border" inset="2" id="328">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="openConfigWindow:" target="225" id="226"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="221">
+                        <rect key="frame" x="14" y="13" width="149" height="32"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Run Setup Tool..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="332">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="runSetup:" target="206" id="223"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="220">
+                        <rect key="frame" x="389" y="13" width="129" height="32"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Launch Game" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="331">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="launch:" target="206" id="224"/>
+                        </connections>
+                    </button>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="481" y="360.5"/>
+        </window>
+        <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+            <items>
+                <menuItem title="Launcher" id="56">
+                    <menu key="submenu" title="Launcher" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About..." id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Command Prompt..." keyEquivalent="t" id="320">
+                                <connections>
+                                    <action selector="openTerminal:" target="206" id="321"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="196">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="IWAD configuration..." keyEquivalent="," id="129">
+                                <connections>
+                                    <action selector="openConfigWindow:" target="225" id="268"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Autoload..." id="N6e-BR-aby">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openAutoload:" target="206" id="340"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="143">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-2" id="152"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-2" id="146"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-2" id="153"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit" keyEquivalent="q" id="136">
+                                <connections>
+                                    <action selector="terminate:" target="-2" id="139"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="274">
+                    <menu key="submenu" title="Edit" id="275">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="290">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="313"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="293">
+                                <connections>
+                                    <action selector="redo:" target="-1" id="318"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="301">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="281">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="310"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="282">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="315"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="287">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="306"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="289">
+                                <connections>
+                                    <action selector="delete:" target="-1" id="307"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="291">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="317"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="197">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="198"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="369">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="370">
+                        <items>
+                            <menuItem title="Introduction" keyEquivalent="?" id="371">
+                                <connections>
+                                    <action selector="openREADME:" target="206" id="382"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Set up guide" id="373">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openINSTALL:" target="206" id="374"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Command line reference" id="375">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openCMDLINE:" target="206" id="376"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="More documentation..." id="377">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openDocumentation:" target="206" id="378"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="379"/>
+                            <menuItem title="Software license" id="380">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openCOPYING:" target="206" id="381"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <customObject id="206" userLabel="LauncherManager" customClass="LauncherManager">
+            <connections>
+                <outlet property="commandLineArguments" destination="219" id="222"/>
+                <outlet property="iwadController" destination="225" id="269"/>
+                <outlet property="launchButton" destination="220" id="322"/>
+                <outlet property="launcherWindow" destination="21" id="207"/>
+            </connections>
+        </customObject>
+        <customObject id="225" userLabel="IWADController" customClass="IWADController">
+            <connections>
+                <outlet property="chex" destination="Lk6-np-Wql" id="xyzzy-12345"/>
+                <outlet property="configWindow" destination="227" id="265"/>
+                <outlet property="doom1" destination="AlQ-U8-wym" id="XjI-7B-upb"/>
+                <outlet property="doom2" destination="BpX-4L-Bf7" id="9tZ-Ld-Ave"/>
+                <outlet property="freedm" destination="A8Y-Bc-ep0" id="foobar-9901"/>
+                <outlet property="freedoom1" destination="ui6-B4-dSB" id="iwad-freedoom1"/>
+                <outlet property="freedoom2" destination="zrE-cJ-E5z" id="iwad-freedoom2"/>
+                <outlet property="heretic" destination="7O9-NO-XLA" id="VqX-Pb-Fsq"/>
+                <outlet property="hexen" destination="ngU-dW-hTF" id="AYw-fH-1fY"/>
+                <outlet property="iwadSelector" destination="211" id="266"/>
+                <outlet property="plutonia" destination="BBS-Yh-DIl" id="0I3-ji-w4t"/>
+                <outlet property="strife" destination="wCO-QO-xIA" id="wfl-pn-GoX"/>
+                <outlet property="tnt" destination="4yg-SA-mta" id="u31-8P-PXf"/>
+            </connections>
+        </customObject>
+        <window title="IWAD configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="227" userLabel="Configuration Window">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="377" y="417" width="470" height="376"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <value key="minSize" type="size" width="213" height="107"/>
+            <view key="contentView" id="228">
+                <rect key="frame" x="0.0" y="0.0" width="470" height="376"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="BpX-4L-Bf7">
+                        <rect key="frame" x="225" y="304" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select doom2.wad" pathStyle="popUp" id="7IJ-Hw-vbF">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="4yg-SA-mta">
+                        <rect key="frame" x="225" y="276" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select tnt.wad" pathStyle="popUp" id="Eos-nO-gEh">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="BBS-Yh-DIl">
+                        <rect key="frame" x="225" y="248" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select plutonia.wad" pathStyle="popUp" id="BPR-GP-htf">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="7O9-NO-XLA">
+                        <rect key="frame" x="225" y="220" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select heretic.wad" pathStyle="popUp" id="JMx-XN-a9Y">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="ngU-dW-hTF">
+                        <rect key="frame" x="225" y="192" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select hexen.wad" pathStyle="popUp" id="gzx-DJ-3f1">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="wCO-QO-xIA">
+                        <rect key="frame" x="225" y="164" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select strife1.wad" pathStyle="popUp" id="OXq-d6-Zdl">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="Lk6-np-Wql">
+                        <rect key="frame" x="225" y="136" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select chex.wad" pathStyle="popUp" id="HVV-Yk-Awv">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="Wgq-Ur-mWw">
+                        <rect key="frame" x="18" y="252" width="204" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Final Doom: Plutonia Experiment:" id="LaP-df-7lY">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="0w5-iR-7C5">
+                        <rect key="frame" x="178" y="336" width="44" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Doom:" id="wiP-4D-kso">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="kTD-c1-mVC">
+                        <rect key="frame" x="168" y="308" width="54" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Doom II:" id="ucj-hk-PmE">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="s5l-jK-qkw">
+                        <rect key="frame" x="55" y="280" width="167" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Final Doom: TNT: Evilution:" id="LZC-z3-CHF">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="2kB-0c-PG2">
+                        <rect key="frame" x="170" y="224" width="52" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Heretic:" id="qPW-Co-8Wz">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="lI6-dr-25E">
+                        <rect key="frame" x="176" y="196" width="46" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Hexen:" id="4hb-dZ-XUu">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="iDb-XT-j0E">
+                        <rect key="frame" x="181" y="168" width="41" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Strife:" id="ecs-y3-DUG">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="g5t-SY-4aL">
+                        <rect key="frame" x="143" y="140" width="79" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Chex Quest:" id="MK2-8j-Xab">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" id="250">
+                        <rect key="frame" x="374" y="13" width="82" height="32"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="348">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="closeConfigWindow:" target="225" id="259"/>
+                        </connections>
+                    </button>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="AlQ-U8-wym">
+                        <rect key="frame" x="225" y="332" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select doom.wad" pathStyle="popUp" id="IgE-nz-OsF">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="A8Y-Bc-ep0">
+                        <rect key="frame" x="225" y="52" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedm.wad" pathStyle="popUp" id="3z7-y0-giQ">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="zrE-cJ-E5z">
+                        <rect key="frame" x="225" y="80" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedoom2.wad" pathStyle="popUp" id="QsB-AM-ggZ">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="ui6-B4-dSB">
+                        <rect key="frame" x="225" y="108" width="228" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedoom1.wad" pathStyle="popUp" id="6Xt-KL-S0L">
+                            <font key="font" metaFont="system"/>
+                            <allowedTypes>
+                                <string>WAD</string>
+                                <string>wad</string>
+                            </allowedTypes>
+                        </pathCell>
+                    </pathControl>
+                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="383">
+                        <rect key="frame" x="18" y="16" width="25" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="384">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="openINSTALL:" target="206" id="385"/>
+                        </connections>
+                    </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="2Lv-nA-R1p">
+                        <rect key="frame" x="164" y="56" width="56" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="FreeDM:" id="Tjv-BA-EVD">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="F1P-c6-eGn">
+                        <rect key="frame" x="99" y="112" width="123" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Freedoom: Phase 1:" id="t6G-N3-giu">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="d6S-OS-s0a">
+                        <rect key="frame" x="97" y="84" width="125" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Freedoom: Phase 2:" id="dUG-Vr-seO">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="481" y="-38"/>
+        </window>
+        <customObject id="270" userLabel="AppController" customClass="AppController">
+            <connections>
+                <outlet property="launcherManager" destination="206" id="272"/>
+            </connections>
+        </customObject>
+        <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="hvy-aL-lDB">
+            <rect key="frame" x="0.0" y="0.0" width="200" height="20"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <pathCell key="cell" controlSize="small" selectable="YES" editable="YES" alignment="left" id="rhB-xt-2yE">
+                <font key="font" metaFont="smallSystem"/>
+                <url key="url" string="file://localhost/Applications/"/>
+                <color key="backgroundColor" red="0.89803921568627454" green="0.92549019607843142" blue="0.97254901960784312" alpha="1" colorSpace="deviceRGB"/>
+            </pathCell>
+        </pathControl>
+        <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="oIL-Qy-yZu">
+            <rect key="frame" x="0.0" y="0.0" width="228" height="26"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedm.wad" pathStyle="popUp" id="Zlj-9z-QQX">
+                <font key="font" metaFont="system"/>
+                <allowedTypes>
+                    <string>WAD</string>
+                    <string>wad</string>
+                </allowedTypes>
+            </pathCell>
+            <point key="canvasLocation" x="647" y="54"/>
+        </pathControl>
+    </objects>
+    <resources>
+        <image name="128x128" width="128" height="128"/>
+    </resources>
+</document>
diff --git a/games/NXDoom/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/games/NXDoom/pkg/osx/Resources/launcher.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..7e7859ae3ed051b76c381ded90e1a05bbd97aa25
GIT binary patch
literal 31078
zcmeEv2Xqrh5a{hnI>{$v4%3@0+qm1ZCHLNC%T2cBf=w|l!WOQ$P(pw^LJ7S?D4~WH
z2qc8wA@mx02@nV&5JCt6k`O}R&z@XFOY;AJ|God-|28L|?)G-d&d$!x%ngOr<;L1N
zZ|`#yqA(?*#FT`h<$dG@-MbAi)YKZQD!X^9D(q({s;kZIR!~z^YJ|&~-Ri2Uttm8m
z(YjW61|_9rlr7~zb)(!UFDjkNp!8HGl|>a$71aCGP--$Yh5Cq^L(Qj_Q!A*I)ECrN
zYA3aqIzSz!PEaSQv(zQ(I(3)&iTZ_lh+3g`s1xdpx*%`lhx}0}3Pa&23dJD}ibshk
z3F%M<%0WF)8LC9@p&{sfG!zX(!x4vgGy;8q#-I<;G&Bp%Msv}}XgOMe)}hbQR<sQr
zKu6Ir^ffw-E}&cJ2XqJBMUT-R=uh+)rm+QPupGC+ZLtD7;BMFhd*VPGf<ti}*5G)o
z#fdlxC*u^HhCjgL@gzJMPr)<r96TR?j2GagcsX8ySK`m`TKpy6fVbiU_!#~gpT=kK
zb^I;<9^b}4;Jf%feu#g?zl$UyS|k<8L=GaQ$VcQW3K4~hqD0A}bWw&VSCl8p7xfcW
ziK;~dMT0~`MIVYLiYAF>ie`!CiI$62i`Iy~6m1Y~73~)t5giqs7M&4Y6x|ekC%Ps2
zS@b~kSoB2nLiAEB70bld;@0BM;x1w*v9s7q>@5x!hlpduvEo#*PMjm|E-n-oiOa<0
z;sN4;;^AUWJYGCWJXt(j{E>L6c%^ui_;c|W;!Wbc;)CKt;*;W2;&b9}#ovo>i|>nn
z7C#dIEx{6zgptT4tfaHVMq(>*mZ&6ZNw6eD5+~6}QYAV`t|U)VC@GQ@OAL~}k}^rT
zq`#y_GEg!|GE_25@_}TeWUOSIWU^$6WTs@6WS(TcWU*w4WQAm<<TJ@y$$H6F$!^IW
z$zI6;$q~udlGBnilCzRal5Zv7OKwYkko+WhBzY`(BKb}7j7Bu3MYNc<pjo;VZB4hP
zJJ1T+j<%<rX(jDNd(*yj2pvj?(b04aoj_~pR9Z)8(phva-G?rw4Rl|+gf63N=vumt
zuBQjn9L>`s=nv>I^dx#RJ%ye@&!gwlAJYryCG;x#Q+hSMhW?!1OmCsL(%b0W^g;R%
zeV9H%pQO*zSLko(tMoPcJNifZ9{m&jkp6>yO8-f}kV>SqR4TQUwwAV$wv~30c9trn
zc2Xy)r&KBRlCGAnm9CR+kZzRjkRFmAmL8E_mVPh&S^9_csq}9dB||bs)>_s^W+Ste
zxygKFVX|;poGewQljX|tWJR)aS%s`pHb^#9Hca-RY?5rUY?^GAY_4pfY?bU&*;?5;
z*_X0yvhA|nvOTh+vQx6JWfx_aWY;Wm85&tp$<$irOJ)PLluBbZGMkvq%ob)VvyIu#
z>|k~>yO`a~9%e7IkNJw(&m3S5GKZMM%n{}&bBsC8oM28er<kvq)65y>EOU-I&s<<G
zGMAXk%oXMv<|=cIxz2pc++c1p-!ZqC@0r`o56m6rF7qREkNJtY&-~0hV18j9GQTp9
zn8(Z$<~Qbd<`3#6^OX6MdB*(3JZJu9UNA4^lpM*iTqGCEC30FWmCNK7az-wfTgqF=
zt>i7`th|-nTHadTM&4H5PTpSLLEcf`N#0rBMc!3zBe#_+<aTm<xr4l$+)?f%cb2=z
zUFB|ace#h$Q?8VI$-U(&xmxZc_m%s}{pA7jKzWcnSRNt|m50g0<q`5od6Ya_9wU#H
z$H_JFczJ?cD^HXs$&=+N@>ID_o+eM1XUO&POnH_(Tb?7&llRK%R#{(O{tab8F_fIL
zq*_o`R7;AbT2a<iYpM;^mTE_}r#es_sZMZop}JBw*{S-Bs;atPsrs0z%1TheppR>N
zrs{RZ;@a$j@_IvUKHCz$niRC@3N&u`o@5vd_dBNQql$_QwYA1VW4W<zu=%rWsy^EY
zH_8n;#>(QVfzZ7DTbjSUqXv|!YHG8)6_pp%*5;WIBds~i4d&4gJo=tTD|tMPlfVa$
zr}B6@k8Yo#6hN~bW#0n`BTuFlR2VoBCkEW3s$oScDj<}ep&ThE%9(P>Gxc8yt-6~|
z4Yj@D(fZoDstOaaOQ4-=_eRpsQ0@T0gHi%Y$|@6g7E_)a&BcGqwxYZ#6{V(pC|}Bt
z@}~l*Kq?5D2U8(bC>2J9QxQ}o6-7l;F;pxSM`@^d_|;O0R1!>$6e<<&rNJPWSe5~!
zlFxQc)o0ZjYP6MghMK+wMFwr1p+Z}1sH`*gH5zJwEK}o5V_mr+H&vffFi3BF&(PFK
zw$U(<TsBsc%lT}Z#s{>u83rJ-rT~U0pY0?x(SQ``i)svpN*IAUfMI%u+$<RM)|&vw
z^neN3c8$F^Jl_NsM9G9_bU{&>v9bhE%E{D}7nIaCQ6LN#3>(2%IL~KWH9n=U8(eNk
zDX1;uq#VV`xB;A;tGD0=!fzcnh+|l6-DeO*aTXlKO7qzcLx%YHd3z{)0|SS8D2Dj?
zs67;_AitqQK?q&a0E2=OgMvtgt0K9ezOty)Py+*OLa_G`wXcuTPaOo0cn1u<KxI=o
zRCg*DhA|I@rzh15KJ%$Q!t_Wr45|Y*R##OP8)`rz^!0@U0R37ZLsJ9&6aE2#sm8+0
zs`{eR=mG*~fIv6UVae6NXKgD)nWU<aDqlqvQN@&j>PwYSrIeBCN0o6cID0OHOXV`S
zJg$%{<tn&tSEx#=imC>jvZ?-nS1wgU)lzj-JvD$D2%;5B^#LrCDGf~X7(;n^P6Iyq
ztPRYA@^YAu$yFsV8OoCj23OVB#Tsi&DgY4I*H;^A2o?FPW2!zADAX7Y<;79u#*)ek
zkO?x<+R9o(U2V3>jDxX^t0ZDn%(djKWSkugj+~<`^4WGnhNuF8j{!bp7<~L;NK~q!
zLoZXqsNsM+NAc7M>H}&dHHsPygnvklrN+Uem_SXWCXopYm^aD@5vZD~@&<7R9ILBp
zV0M6n5Q!?Osj9Cmj;SiIs)5mmCrb-z3W{LHq#29K3^fhtL6?Lap&1NTgNzcb*91vz
zEv7(@T5t-k71zds>&mg#Y$Qd&XzLB-K)IqoQ33-S%$%d9Qq!pEK*kJeCN+zi4Xh@^
z4FlX)KpMUi5p#&NhaTalm6Z)=&9%;Ft(8O*8T5l|VJc^7H9(n3AI+ua!9(Qx5^65x
zdLH`zm|8$Bq!v+&sU@&zenKrHY$0Tlt_kAgTwe`(0mLk(pst|2s)XEv0T*s@UAT5E
z&9&v)XPe;lEHW`txO<*jMSThoRs*Cp)MwOMY8|y09?dB=)|q;*0MUjq2kmVQJqlW}
z8Dz4z(%)Mhpz`wx@S#%SOXE*~LdA->4qTUW)OzYmY6En?k=jIUrnY3J>b0?1@DURO
za8jy@4dtu_*O8^T&S$7?&~7`m18yjbffQY<R;9qU(gNTX1_oAu1jJ`V<#x}_Q%JAE
z&Y(Rka!RUYK~ZgWR9adxVR9v)Oa8w4^ZNzZgTT*OPtw<`_x|;pq}Whf1g-YKF}S$4
zsDh$UC`C!{7FE~OQIthDxb85pu9}=Dz<Hap%#0W~?@3WI%Z6v+GG!ZYs5I0VixlxS
z1%nmw1r-$q3bj(LNUN#pYb<{Y*5sl8ou7*GdV)9kv4z93woIP{f0cm$$l`)navlih
z>x&BF^bP0t1{kwb;XIO}uzhu1bOxL!!g*nRSymLBd%*dczBQUGI1h*OOQrP*<lL8{
zMD5-y&CG#w8#qs_EKJqGc`%%p7S+b&!MO{ZFDW%>$v6SeL`RKv+DteHc%lb2RT-qc
z8%2pjiw&`Hrt9LqWmQQ82be<Q4YdRG<hp?Kd!;c1Pk<%9(61md4bGk5{E4AFp0tO4
zB%P}3(nz21T@qVao=V_G!uc#itw1k)mt3eT%_L){rYPFJt|pT_3%JpleT^C|oNM5G
zP-#s9xeoNwyQ<3tIRl>1&ui*42<<?lRAZ>jB0MB=!4=fR#lt!9O1gu}Mg^eGtEfWw
zECQ{46AYAEQ0xPQvl3w^TL9P8&|VG3fC1VVK${z(RT*3_f%Dr<_sMs%_pN}>YPeGc
z3x$y?hvyovDum_3^c?A<3J&s(^m|w6w+Px2cuF{8Y?i^Ap@604KHM*bvlQxvaAgqS
zR{`H+;A%bGD}i%!D5mGr1YAuxkoyG6j}1_&;E7@ZmgzYHl`L(fPb0K@5AG4%1j@zj
zVfW|*M~FCC947XL>+#S}0X3NN6t0H~*BYTVQ%-36u?cE_z?DECTqD$zvu4hic)S<*
zRR>qgfkLv1l2)~V&2xCBtl??%XMj&rI@P;WSI?T1uI;@XTAQ#?jHt;s7M+^>uz~Kk
zjoO>gJzp6&ow-~Hl2ZJJTmXF7m3}R`E;&aj;P3a6^OC!8_KoB!{9bOtCk^m#ln26l
z6Awy&52kO;l2s&JA!AVvzhqqA#It$KO#P5HW<4O00GG&Yl+X*gTLA|dS%bh+)A-fH
zIk8Ln3Qv1d=2*TiQPA6=_jh!l6c;A!IYKGcuv-r|QKvXB-qQ1|<)QccR!-?uUEO>6
z`+pg#o9~iwFpNq4J(U{a;r+SyeeX}a*LXknzTVuz`=a;H-sim+!=0Z*(?uIaJHf-T
zO>~@6z_)Fpy`rtc*&5Lf`2C{kxmP9J#DiBQoXA^IgG3V!)iubJx$Kkq+BnAvzZ$tk
z+Bc3=KY?p+j)b|ykP-WD7@7BDnstqH!ZbR<T(EMmQdvo@+^qbpqO6dW9sH`TBH_%z
z%HAs3sy*CIuyVGFwd&l&k9c7m2_B{yY83vG`O-{bF5GRD1VUda+^Z2<6g1FlKEH?z
zDJXL)iAFP;&nnacW~K>}NhiE6IYgH!UYS{00LcipFqxIL0KXi*4}PtUY2Fjus!$JM
z4Bs*n#5Q7;SPPm-M=8WnVn1<Y!#UAbq3}y|l}WRBiX-4|IQYK;i5@ej0D5oMXm7{f
zd}bKvVDKu%(au8O0(EpO_>?r1f>x31;BQKV^B~fy4s2RjZ>X56>cKU}lF~YbU|%Y<
zl|@Pqh1y#Ms~fSINE?cJoG#cxsNM0R`kDczYsBUS?<@oMR2y&**nr2?1x7>-8`uz7
zGvmMp(1G7Im+B34l)^~X0B7F^>wPpe9z3u!!CGAi#_1|BAlHMHw*x$|2dQJ!*VK9H
z8(2?nga7p*^*i+!LP&~Qpw_4(vPF)_9jQ?ucwpmDGWcC{Q6E$Se%E^Nx_*GhgP(OS
zT8vhqFTlUL7aal5>Sc5j{fHi+XIO+S!JFC@J7F*Iqeg-6G!ys2CAdF+503=z=|^}8
zUV}H`z2GH1k8j|g@NXhYBp0<4*@-+wfub0Z4!od!MKz*fqH*B&Tq0TvI^dA#tmua5
zzUWUe4Sr39*b_!EL7W9X%>LqG;tArp;IrH$-Y-5YzA1hvej#Zg=^}9lZ=_bzT~Y!*
z$I;+nTrSxNzQpt3J^Y=f>2@$a0Wfa4bU%6sJpp`s>*zi7Y5ErZ8~ErtO5LSlQk}Fw
zS|=SXog-Z%-7P&My)AtzlY{q7Ez^L<tx`4u{A-`ecFE4j?#TYKU@aUif-Q6w#TJ7t
zCR==BvCZO?#chkfm{yE46UJmR{TQD4h*=BXv#ZQw@LJh}cPU+NgdN#O^3Uam<u~Pj
zT3TDWS;koQw5+$BWVym}kL6{{$1Pg4aB30RBCkbVi%Bh3wfL&V^%hU9T3actv{uDd
z!>#67ZL&IJ^`NCiOUIT`Eqk|oujQ<kU$#8e@;+<9I<YZq0XvMH$8KdWvcI)z-AdI;
z*Q%n`gjS!nI@0Q{wba_lI?lS-dZhJI>#wYDwHCE@XdTnKsPzY}KWTlS_3buv8|OCK
zHvQU+Z}VB3lWiWhwQlR%HoNVhw)5KVY<r`fsGU<gZM*VzliRItccI<0_FdaYwKudM
z+kS2PGwuKA(78io2SbN(9oBU?-{DzDMaQ^~WgVw>+}!b6CvhjYPU)Qnc3RNsK&Shi
z+jI`;T-147=k=YhbirNRx@2@2(q(Cv<6VC1YST5oYjxK-UBBvj-=>{Sq)k7Y88*9Y
zeza|E8*Xc~ongD%_MW1xB1%!N_(-u|@zAb|U4mV`-D10wc7NGB+h^I2uwQ3?&4F<U
zbm;3a!(pGp!)~_SQo6n0ZFRRRjuwuAj-`&X9S=GF;pFU;<21%;v(sJY4$fNV_ncQd
zUv+8W65-O{Wr@o<SK2kuwaoQn*RS2Mo1a^$+dQ{Z?%3Vm-RS<Y`)Ln}N03LQ#}bc=
zo|c|bo&!8rd)`#GQzk1%C^st~cy;s2^P1{)$m@l-pLaQ|Zr`Y^Rf(z*s%@%AYBzO}
zdY<~6PYWN7&v2hDKEL|9`x<-~_+IjB?U&*=#&4hB-~IvqHU4Y;e+=jr&?jJiz{S8e
zfoXvg0uKjCf}(?l2ki*@GuS`4E_i+LFCm^GWg(x2+zoXOHH3Z=dMnI6tRQT0*o|;S
zc%Se^;Wr}eA_^jwM0^+N5Lq0#Jn~MIYgE6eHBk?uy`yWQH%9*v6C5)%W>2grHa>P-
z?8!LmxU9Ijao08Wni9=w&BJ)V_#yFo5+n&p2~!g;YP)KSw5zla69W>5ChkwNOwuRK
zP5Lg`Ex9InTMAA|Oqrf?HPtb-GIg_#(rI<mb=T6I)B2}vPp8w<(&wfBkfF+WKjV<T
zwLV|}ss8uO=*-EP-(<OD)o1O?ZkgRPdsX%yIk7p@a&C0@>OQplvD{9%#@sD=(!A`v
z<$1sLi0d)4$L*eeJxBMv(95~kpk7CMcj{f<duM*j{DS;1`$+oa^!c>U^8#JLl7im~
zwT1Hw9~Q+F%`W<>II?&~@sEZu!!*O4zF~c*^}SmXRx-Wh$I^(>S*7=lF~+&ZU;8EW
zTiEZ9GF{n<vX|vK<?AYB6@4nUR$5n<Rqn5{sTx#uy4t;ZboGt?!To3Ue^`@Lv%D77
z_Nv`d*9JD2$Ln3{N7dgP5I$hufTshq2YxxI)u75j#|OI&9y|EXdz$x_4G|A18nW+w
zyZ8C`Zw`$bx_B5GRyb_maEIX|hu`Mnxs^P_m+>b?c#oJi;>ia&A8Z@hbtE_P)~NVV
zt4CXnt{HuCOvsppABsOTet2@M&)7L*UyLgrcXYh>_*vthPbivjbfRkFM-yL8>O1M=
zWdF$vrqEL=r(BpCF?Hp%R@2^_c58ad^i4AqGsew$GBbbXky*a87S3j7*U!H3QSwJy
z=5(7gWzO@trE|~Ei=MY`ewX=U=l}6>@yBNtL@rpnu<OF{3!g1AF1oZhe(|OyPD^Gj
zrI!v^`okyLpB!2ixNOz(PRqwH|9eH{iW@64R_<RFuxiz(T|S+>8n3Qj{o|URYrg(0
z_OmT(J=ZQ?*KXbT&#BMrKfm`ypD!+~Pg=k4%fK(!ZgAW%e`D*7<2Ip9gEu|gT)O$j
zmfS6;w<d1gw=HDb#_h`OD|XoJn76a-&dIx&T_bnB-2L9}-}Y4Rxxcq$@2!3L`@Z?A
z`&Z}or|&;`AnCy2gPMb19f~@%`*7Id9Y=zXY&{xybn`L)W1Eiq9p8Au@5IKF{wFt`
z3OKdp>!7c<oen*{>rBL%y=P<39z3T#ckF!X`O_D&E?m0U^Wu$5#h310F2DTil>t}&
z`i27|e%v+o+N|qct}pr4_1kqf{BP{M8GG~iclz(Xxm9%Qr|)aOe|~%94=sL}b;tJ3
zs=MmDJATys`1QRW_iq1G{nKCfNB`XF=lKs@9&Gp}@|WWeyFa}BYt64OA5D1N@$rf$
zzEAf3miF8A-z$Fq>yL3yJ3d|cXW*ZQp5;8d^Vh)V(&r!j?fUn&7fCO!zN~oplIvu0
zLG7Y;gCi-WzK;0wV!;Wsl-dQJ4_EL@k#D9(`>3y8aXl@e_EWB}TrssfNF8eQLoES=
z;5CQVQNf{g96VGu;GeS1XW0hVRFjX++&y&)tO>zA741#Mcq>%IyJUiLjyf;+Vw*gb
z#F_UAb&k3~T@=uY5`r7#Do{cGn4Y^#U1@L#3jWPy)MYSMu2R=1S8!-Hx*JXIXlU2u
z<!yGo<}^89YpHL+%o#v^N8M_2zG^rp&QZn%a}EveP?L}MN2+`g*Uf~%ed=e3H8e0g
zss`LbOJN`WfN}+{316E%sJ<%VK~)o{w%UK_&~Mq+)UVVd@S{Gao>0GmZS@CuR7X)y
zsXr->dPe;PyV<|NoA!cwNv%Z`*j*TjkQhm*VkD(B$O17)4&Dt7vO+BpD|q+Pz&TY_
zY%CHY4Fd|w1*WFe82TD&Y7E73#U%#tnWh*j>q!J6pKVPX$>3qFET}UydQw4jqU-DG
zswxEssL%m~Y~uRY8=*gNBf=P)J*BMxH@qqI(9kPkGWb}VT+J|E1fU6%2J~VL<pqNU
zgdr?aOK{QDR8^2>0A0YSR$m7=2@e4ms|Kc3)f!3A2Y79UotjN*{StmgMpBWSJLhUm
zkBFo=H_nB#ZzZEFI1kRb6`EpU!6Gh*MNQsbWQ|%AZ?8in_?XB~D@j}8)-`X?o-|-t
zayc#S8`PEh6WM^l3y~>ghwPC9>ITNI6AXe2az$=n24m`5q=cdHB6F|OP*GKBEK05_
z65QL33<O^(34nlm*(A>(q`FFhg)l6Qjo@x(K~0IF4kSp32*F>08!$UljDrlt!UNXB
zfo{&j8X|-g=gTQMKh71T)ss`71>{tKrW*MmUy%C7;jZQUxd1LO7rd4RMJ0TkMFG$(
z5Cx%N6heH`jj=XhGK^wXeNB;p_@Oy3PQ`fx77c?9aUjxXOsS!$tfHW%Oqd8L0!0d<
zVRA4xKEDJ-P_E{HVujv(gr=kyfue@NZk1nMRh?B$<iW(BU{lu#NNXmxOHcykny0IS
zfDefz)CzMFB~#^#5dtAF%}bPq(i<di2}+|}O&#e`rZ6691dK_Jh%Q-<^e78uo0JWi
z&43p{g4_e9H#ao((jDc(7@PI69Cb%|jfw|`&-B1G*t3%OP9=%%pq`*;tWhs22la+M
zm<IKs2B1PA#-pKPQC}(wl_Db*1$4$08wJg6n$YDC7AUPMhtQP3eHf<Lnu3zd!PSOZ
z3ob#%X*szCD5n$%LWOc+oGA*0z$YYVD2Q{SDoVKuRipl>2GycE*qRMM1JNKZoQvQh
zxhO80i{WCqI8MXG=d)f#RTWC&UpFYL3m~*nSXEF{tgME~X{<FAdlDbFC(-br2R!Ql
z2Z$e=_Ni&H8b$LH3e!D@=H4JA0?&e*oODEZn_{RdAgdARj)oqzF_~|6p-MG$&s4-!
z78O+2)|Z1yC{}<fsDpT=vARw%Kn1?{H^6F(2UjW!O8wQvzBL1UOX>p$7x@>%K6&84
z0-r$@@K;q*R$O0Oq4M_itsc~WaD8ckx_VIUfPvlyKfl7-ih)H10mVMGg#$rp*$D76
zwHl3LfUnZ~O<;}mr^df|udRt{GS_O;1Xhx9GYQd1G>Xh;(;}@m)Gb9L(P+vQ!Yc3u
zLYxr&4D^NQX8>6<RB94|QwI(mdI^>bYcv*(gU$5>A?UUlO+=H>Bw-ntf~JyXheY`V
zr2zp~5U8k1V+C-omRy2pp@B<gK{qB^W6*r&Q*)*;HIs4x&>%QWcz%TDfXoT9N2bG4
z^buK+P50)Z`HlC;Ok9TMHBN%&1=cLKi58%Ru)w|&+vL(X-P@v#YCj>`NY=`CM;rS#
zM;p;vY7&H3n<9Sc5JHTpg78dbv7+2qX;6Sht*;<auwdrx$bEs<zkysPr#DBg?T{gA
z5|IuPaP#%|Q24`;TxpDiqU}N~bR<MWN1+|yAN&yQhGE$Y2Zng)BtiAS>>XI!9PSjB
zuNjLd1d(9{mu11_Sb!ey+Po4SM2FB}vQ$B6g#5I^)?7B%x)<oE@+!{^LkY}^npdKX
z=mas!&?zv=x`R=c3(Gw5E;Yk^J#2{1ptB8jnTm>0ne4J}KyQKeLKndTF*B0TC3G1y
z*Ei@Yx<<?-bOU_H8iBHe`jQgJ3P=MBqy`d6xZYe(8P|&|;Cc|_sTHz>aI#5Pe=lgK
zd=~iW698d-Uw@Nf1a=X`_w$AXkYR_9q1V7b8V07(6EKcO3FgsAK!+Gd#3&jKjwB2Q
z(S0z9O5yAw`W4C1BY~x(M}Q&V%DGv~fM;M2<iVFdTt2(FnX}gD30dP?iQAAx-Xzi4
z=;<eo3xVlM9(uN{S-HQ9E6>s2z?GNiDn^7W6p7qxxV~Jmj57cSip<SNENvhkBJ1h^
z9}sX~A+#O@r)nQUzhEN%&(UwhtciZynve|?7jh*6#fqL_+4VJ+)Yll4O65BU!0mAR
z1_C;p5m3hUGZA2Xg#f$e@l%10QVHm*d?DMyM?Lg^V$k|w*M>o38;~yL$_dgSPZ{-<
z3ebf0)r!ojs`7upT#3CJF!wRTyqc>rVP5$P=0VM@_X#A~AtuyGqR79Zj>F94tqeyu
zqHeN4iI|xfU%~Y!H1sfKrH~-8A+I@oMUX1$Do$8x+NTJ!0L0x}(DS~&a2gm8Fm$MS
z3X3`jl3rjH@HYPe<juc&56vDTbRz)3saPkNSPh9qhKg#kcrL-IM0bN#fYYh+b*wke
zz<O}IX5nm{gS+EgoQHehp5TV<jq`CIT!0I45iZ6C+!q|PrPzr3;WAu~D{v*Q!qwoa
zt--ap4%g!Wcpx5x2ZQT&2!0<A#l!G$%we8;j~mW?z>VR?a^tzVJZjIQjy&qjqpm!%
z<&hna9C+l&BWE7D^2nV>o;>p6ksptOc@)8;SRQG4l**$F9%b_=k4HUu)SE|rcvQ%v
zQXW<CsD?)acr=7Z9FIovXdI8G@Ms2)KH|}Q9xdY05*~fRbvp-6<xzMv=#Mt|Lp&Cb
z14B(O*tlTK#X=gD5q3ea!+=#XxuDQc4moN=xS`xIAsY=(pzOK#Ap;F;m4<C)IpiBb
z=7XUG_-f+$R6I?{&4NrJT|H!SL6VA)l~+}>6i>y|DOWHp;a=0#CXDb*sszu*<2Vjh
zff0=$=K@Hc6T=>;F~2FLpb~alkR8(o3@fs<CBw=V)wr;kb%z(>#X@%@xzUZ?eFEK$
z;>5kRIZ?6AB=j~8EP$LFAuk6gGV6mX!>ffpD!321VLi)*94nJ$Yu?Hee<8G@xpCaE
z-lkTD8k5*Hw_5~${LRpABsYPZ!wqZDLNFF!9w1^6=TWtI8{Uq0Py_HTyc>S^f=PUX
zY;QsIoA&aiw5Pa1)diI#`JAYROk;H|H<g<r<38dh!tW$lW-MOI_`-+qVbI8s@dak`
zLLRk&Kc;;HK29l@ph5T~*uRsB1>9iIWo0D4Y0rUCrdInAtzlZQh*d^*@(sCA_$<ZY
za}cYzK#jr|f#S<}6Z(}(##iw*YBLyOu<aGZ1&pS&g1S;6Ax_wYr!`yo`nnoeL_tyn
zQVqp|rElFv0T#jpZZ;hG+%#@Fv2Gv_vP@A|rKmOKG(iH~ASDc@X?owlx0c|W_&aU}
zH<O#ChcVX+_ejd*1AJ!*@lcqg_D6gVP$T#d`|cC`lW7}dcFol8XZ(QddPqByxGclJ
zG@5&_-pC}Vn2-Hq{6rZ0c|2;z4g2=Lq*&rVs3`m=6$66s9E6}D#ZrWuQ!KgpFo+*>
z1GtGiYTKMfxPasjnz9E20>HFT2?n%p0O&@a02nLSRgoE>C~8;~g*gvPu8J(gkSi##
zPh>%~V+Rof;U-H_3z3zmCEg@zC9)Q^7PS$zg%DJGQ3p{+Q72JnQ5R8Hk&Vb!q!8J0
zi@4?78g4zeh1&%qwVyl2o#M`N7rAe^Z@F9C9qvB&h<nPt;E|X|G9Fp-h~>JyV={=k
zi5wdzgUGFMGH^?|C5@84m`J(_U$57sxKUDlynO}J>K`Rl#Nf*!hDfR?NEA$M1~O*D
zk<Wd?ErSX1x}X(TRaK~)Buy0diln`Zm}pT<6EO)*#H`|0HWIU<nV6J!5Tl0iBM!8G
zCPog#$OU3@MBRay<v`4GAm&qUHEgS1C#J5lu9=h`|A~}7qJkz;$i7`rQrtRjZ6hh4
zHIq{IE>e7jq}G2S#S%!d6iBHT4FFQs04ZyLl+U>@^4Tu0lTuw?4_-TCK{Gvr{}VmK
zM8lit8QDb7Ms7nRJzqA{GxlBds0I7wU+8H8^t2G@nJ$_E^sEPZ)&o78xXt-&=hx{0
z|Bj)~Skz3;?Egg0e9^~E<Sc0-XFIp8k({l~<g9oHIjSJ_e~>gQAje7|=L->p%wg8g
zh9jTb!R>s@v;m!HsB9)?<9{M%n`nCzF?*Vb*~{%|BxZLrF$dm7jQ@Yp0WE=;mI5)S
zL|+3jyMUNoK+HbwtGA3zEv!;~4XS2x&c2NtVe@F_01#ag!RAr)4K<Lg@WR#+(wn(M
z+yNPPkh2q(Z?lwRwV!DeyvZH|Ok%PzQkgb}Z^=FueJ^SSJMLd8$UYX`6a6H*Z!Ko2
zNYKIxAOq5Xk8p<}4Ok3|gF*wgUb!L`6j`t$tzp_Iz^VZEH1QDxzp|eeJ!}ec93?@H
zymDe53Y%#2-IO_<zlnZ-3!Nvp<8RU#05*h=$)50Sp!4m-SvM0WrbYK*ZE2$GWR^h6
zJFpR3h?%!wbDI15O>F!LHr}R$`+vlywHY>@0Gm_I*qrH3uu*8W!S6z-tJvl(2%YE7
zy@8M)SX=5q)85D*mUAKoZ)Z;%GlZ0Y(Aj2$E`R`=k9cNkX0Re|fDr~BY{++FsS>N-
zg5_oI(i>Q+h;^Y>3)9Sxyr%F@EZdr484XxoY{v3R_XLx|dnZD1V$E9+y2f373qs(V
zQUwXiC2>=|8=-b)2xS98-!vn1Jv)J@taqZ5E6#fhIybo+Z=w?j(^dt(GFZKR$>}@!
z)7}i7et^!m&FFlWLrmkohIisqA+CH2KDW8=-^9mP@VW?M6+pZI@5HBr89u`RpIgoN
z{LljeAcGX?@Rn8GD>#{X%f!5RgvmJ}9!*qUgJ0+#_oK-<akoL`2}YcFLbF@NCxFa8
z!8s8K0`;%H33FeVsH1pBqi>?YC2@!QiMS-PV#=#(4ev0~#B;=R8`m1~!lt$67w$ph
zTJv+$S|k4C9czsbVEXSSS|?a*I+3+TyjHvp)|&gU*4zgr{gC_hEgKtRZ#FG7;`MJ^
zXkOn)iZ_e5G|{rNiI(5ECylf`Zl-15YqSuz9NFbHtUmv2ZFUAyIt!#67oPx99swzj
zfRx|4KOnO4x=GU)Udt*rBj)S>M9g{dg(hOYX(Hw??pY%-e>M|y;~m79bm+g>XI+4p
zE&?(4#6JNsPl1@HK+JRQZ+M68t;D>t7Z5-APxL$%KWU=p&qjK91g~dPjTF6Xrs&0M
z6g6&bRHkL>Ur6c-By}YuNn{cWAn65=^n%Oh5$2KTABbu;Z6ua&BkFa(xTKZD8fH59
z#U<^Uj2jJ)q&%VpFF21R=9690rD3wSX?VTr6&Lt__IrzLn*H9Uxej|vIDyIjj>T8v
zB5{3FP4bB0k;SWu61?*&e^5hy0&0H$xQy5~>q$wF=sxUjn-nFF<T)CU``DCMw4|B2
zBng#-y$vNR9<_KCC77B)L|>}}Eu&HsHU3WBtuVtWh2UgqhEq%M0}!l;aseB#w4m0Y
zP`wkuG)el~5VYn|t5*>Oo&|xK5-6AgD#2IuPW<f5@GBtrv1a(SehYr;;JhJCj*Lc^
z1^9-^>tNvEf5Yb{>Lf7=ei!Jw12-&-(5f=?%ZM0Bm2e+?q@5b>tIh9smedRPAMvOQ
zH!Rzvz04bQl?)LYfJeiI8<s0HcpXR=2`{vH$|HqYn^yp}kc<)9tmlzEH!P=N=VuPd
zN-|Msv4uz7099c#Wp<w`mP{A!+w;f?yp_bOX?oYM%FL&^NMtFQBQ#sXBNuL1_r@)=
zSx=&tl7&K(T|9CFqD?y;^9FLsGNHk89(i!X^x#2gzWX7bDIs3dAsjfPmE16J-Zr{K
z8=SXi!3_;gXvsRs=aMgY<jo@=9{FA}C73{HSApyxe*;oWBws>mi94j0V993U6IVfo
zhmr#?xtdd-gN7>PAlZg|B|9WLCA%QiLCDky<k3DJ?d8#ake_JcNmPIzk$4Fq!G`4S
zv@C!WrOFb6wo<rYO0baZlfWhqqSYqvG<io8e0=1Ea&TS4O~?#;&2`;K#X-p-LWMt%
zg8rEb$qC8HCMtLYcm{Cl?(k}{u>#(=OeeWWu>0y;RZ~H(71Y(&z~$g3#=>heZ6p^6
zs1S%Mpl|?20+WBDu1yScmt28-9Kx<^$cuvrLa2#dVXw05rsO-xEe_yAU+Z|Zy?az4
zygLi=C0GoqY9P%*;0q+AR2D<(gK#sgpwduohRYqiNb)1WC6XJ-qnLLPe#JC=l3yeb
z3E`n+_;?h}qbN=d%zo1e2{@#CK;)~cT6lH4X-1nt{vEjRlt7LnTuAsA$S))>%^=6~
zNW-Z!6O6@%^wO+S_|x1mEuq@bQqplE={V(|JEmLER%RV1^C$^APOmrCrT5Q+Y_bXx
zNipxe4fNiQ^sXblr@yOrx)TC<m%N~Dgx;;G4ishL8sMJBse2II6++@qEo9XZ5`-@#
zf25%%K&=@~4gl4WK-CkdS?_|{ILl~{CYs1B%LMV%msSlV^9O*{R}ye={tB>$X#lTt
zs0pAP9_79ROw(khg9w<W$=n?{mj^1dXM^;U^JW?-BVI&DO1^+#E=XDr==&e#141@4
zX$>^5AnK<VG|w?<AG03&L6c-?Qc9YD9psx^Q(q|rTALe*Is(`XXmp2wEfBz37m>XK
zsD);^Y@|M$&LPwn@u&ovzD1SMc_t>)z3ASA`eM_l_T`bGDP4^&pbL>Nk9P8C7Z(Vx
zDc7YB$}Fm{3vPr`N*f6jBah1e1xgiNZ3d-`NBw}w<i(owqO2nL)70evdLZetl1Kgj
zrOTo8FtaYJc~r%zv(iY0RQiByApxnW(~<Nj(rGP^>i@Y@gy{)Qof46&<J8$CL{w+U
zA%R7hLXEUfrKgcT2lD8>f9{k1h@R8bCy$`W#vq_Q3yOE7zn2AX*H<-lxsYB&x_qBU
z!~dnr<@5@(E{E}GD5uVAc#$3^M0!D<DFOxOO}&3cuO+?nJOTmwN0Hb-Z#3)u10Ib4
zgfqY{OV7)Kl+~(csie1q=<X!ljwZ4@_U#?RDj+PI^jGwL(s6^{{g6jvh~910m=r`(
z(W;5wPp|7mG;XFzZ<*<N`Y6CVPT-9v@Fu?<9(}3--WmEVfj7Y<+mm=S@s)*#zDQr9
zFO!Am5RVS>=txh<(XFW}t``!U(<6EiBr@WnVpHPGNWKmz+#o1SB`82~lsA_>KtNdb
z=sTumZ-Qyro5rbo!n9UE0!2wZsIH!*e=TH`MkObk0k{tU9uNRC34q!E2;jF@0L&un
zY}d$6A;(I{Gd5HfnSjNl#3pM~&8c|?z@8Iea|keq2ELmbspu78bA>fCrK-lDD6T3J
z61jxHov?0O6VhVMFE<k?mEoCEhQR!oz=YWEKfrAD3d{urCabUNTQ{%(;KCAPfQlIc
zA7gZBx!TnDW-uZf0Mmhh5fd<r0nFPOPL)DK8&Iuzq}|fSc5m=XY7gzYkq(!UhAZBN
zccZ~0bvNPNVDK!5l`;xKLFH8i#lRmyx*NZPy$8u3Qg3`~9XnX6qC6pGrU>44Er#S}
z3xp^GDx~_N1yl+80#d3jQAYHf>WACG!lINWNVSqHl5_NSX^P~I)Lxn<O_yd!_3(~d
z8`?pdLrbK&bRIpG{!H47&ZbN00rW_Ep|nWyrQ{&3l9ou;NsaU=`Y3&!zE3}sR*{i`
zJcY-2H-uTcL7+7nLaluu*g6ctt@A}KMcW{Pz8!+Dmmuu=o2a$eLexgwRn%6j615Y@
ziQ0>EMIFQy;Oyc>oy2oQoyD6)UBu@_UB!<@Hj-8%TZxNEAqf@PNz(9#(&f?>(v{Lx
zJX*!kkPy^@YsuL|wzLQ23x_}oZ7QT8W^kD>D7|5+?F)-z8LXk8=2!D*E$9$1J3;I4
z2=*tDFd{tql1CeOw24Ps!4?C%28;|IZ3FX(M>}AB6I3-Qzum&B2ul_$F|Z(jvfTq~
zzhEzet?-p#{vQCH0V)QjI7~vA8az5I2rJ}D%ma_XB8d1d=T<@7Zym(SHbQ`DJH%!7
zauXouVLyaUj&Ucz`F<Mw-RHrZd>I_L*T8Ff6Fil-VfnrXezjk~A@v*hasDEKXC%a)
zr9$`_w)~bnvVx5#kF2>NJUYgslRUc4qnq3;A?-!FhO+0;r>|FDGTVMgzmTq%eo55Y
zXFOWNqodtZ3XGK`f!ZW#o2c?nq*`gNv`7kU0A2!nfCmR4?ET7?$6mS<wmsy9QYUFb
zqe%whc17}?^Z@dLM0qI71F;!cQ&$rWOV&#m7WlW0N1ubOmfTPSsCTWYT~h)%k@uri
z`Dd?5u9@7vV{~61TBz95h_dtw*>*_3Y1pX=OAcgtx*;)qiiKAIw6%IeH59OcEfnPW
zYHMSSwL*CvVMVe40^BShO;7!wyL|1rcXF?B{X-ZgXNL3%;hylUiDw|P@Nc7uXL?d2
z2x@<skLNRZ<T)A7%|f#+reS>1;H_$zPx6yZPmw|XUq%0a^|_t^Uq}}xz~9M(W(fj?
zlt&ksc+ey_Fg@WP7@8nAnIzj@pi!ov%2&RwzTP#F-zf_wQ`cM;1ar4}!2bi%pfSIc
z?0gMr&>HY>uYh#6$<<>*I|61{qlPutEbm0o<XCtWMc9utqu3jmY=TfLj4|0}H+UwR
zrYW%42?^c_(CMe>ORr%I8V&w|nL}8dU?{IP;o5^LUv9nvyhZPIyG$k-0SA+;X^Mf7
z1Hj1SGEJ}sI}4_eFpGKs#smsMmz+21Ad=}_jY&zO?1n6}?o_RG1>|{a@GdG!R!2el
zh77)e;*(iG0vW}l<K*LnDX&I0_!Z}KE~I~xNS}9e3=*HEc-e50h>tHym*dN_5z^(d
zk+M;;(Xuf@GN378s-XlE$*_WT;1~yn))_(Hp5@Uw9-XqLAQ}IxY%FCh8wYqzkWGX%
zL}ej(B_UT#Sp%<2)j?%dg4t;veGRWAkT)@cy}Zh+Afdk$UWo8A-<Ns`8C$X`vZ?So
z0c5f*kxijon-iZ8%BBm6&z4<C;`3SAY^WY(E&B*ks}@81jQD6B>+G!z3<~u22~w;4
z0u<iLAhn-wkT*mWRpd)R<2Q=DzXu9dHjgS_BAYM!m`CS%bcO3Cyrv*qL;=Q-4G-Lr
zEtV~jEtQRcZ1@SX6|$8k#7Lp8NFH70(M4bgm&0}C(FJQ3i>aO|1x3cnx~kezMMA7O
zV<5RkV8SJ^<=<d}iSEy3kRAiCw!OjnWwP~+uN1z$!Q0W^*nsv{*-8P|t4+9m)6<;o
z=4kF}K=T^7mEJ(p{Gqpt=&B|WJt&CiVIrb88%6Y6()o=B5k2<0h&BYQ-kOvsU5PJC
zSCV*$?7Zv(1v>sZk;UsIBJv%NZvA`AN_P2`aENL6uM74h)SYP4U{S`JEK0C04RG{@
zqXdppIE--ggQJXU(_m4OMZV!zn%;Ou{=$7?QNHpE*N8<a{K7f0D4Tu-_-#xUC0Lbm
zI4t340f!YFEg>$m3I4W%!y1m(aI}G=EgTTD5w(Y-0~{UU=mbY+IJ&^m6%HFXY~fJA
zVMpLdm&36Va)fb%K`C!ADCJ;K%E6$NgFz_=gHjF#r5p@OIT)1ShH5e>O~#A)Cm59G
zUrp!GeuuDJnHH_rKH=^jVO=n-4)6(AOa`S%12=pMc;W_oaw6E16TzOG2=?SeuqP*i
zJvkBV$%$Z3P6T^$BG{7?!JeE5_T)scCnthEIT7s1iC|Ao1bcEK*pm~%o}37QG|0Ua
zlMfmBup}QWfkjjtd|W4HB&Y|AJR%>T0>}QJ+j0CKPp}6z|NlJ=$*2AIJ<b0$?;@CH
z1tS$^1tViD7>1EEmP`xAifPHPPzT1EY0b1@+A{5!_Dlz+Bh!iL%yeP8GB%7YqhRb9
zd&Yt3#yB!gP%*}Zab?^XcgBP9WR#2-<ISiTHRHqhGJcFd6Tk#AK};|c!h}L?nQ$h8
ziDaUfXeNe<W#SkO6VD_tS|*W6Vv?B@CY8}KX-qnk!RVn5O%{{Q<S^ZtTqcj{!SrN$
zF}<05rVmrV6f#9jF=Jr*G9^qYV}yz|WlT9!!BjF;Of}P=sbOlFI;Nf(zzk#tF@u@+
zm?6yj%ur?+Go0a|y3GjY17;*MiW$v}VLoKWGUJ%>%mij4Gl`kZOkt)n)0pYZ3}z-X
zi<u3TaON;`nR(27=3{07vyfTDEM}H4OPNoYWz2GB1+$V_#eB-FX4WvDLCu_X%;(G(
zJi5c9yFB`lNB4O26OZom=w}{1;L$HUddQ<+c?2=d$2@w%qu+S+JCFY0(NiA%$)jgH
z`in=;dGt4rV88s5#}tndk1>x$JQnj9!kILWr977L*n-ClkL5hJ<Z%lgTk*Ihk69kK
z;;}W4Tl2ULkK6LN9go}dxC4(n^0*U^JM*{;kGt~NhR3!%R`A%4$M!sS;Bhw|JM!3x
z$Id)<;jt@^-FWQIV-FsC@>t1ZFCKgISjA&Ck9~OT%VR$t`|~(}$ALT!;&CvKLwFp@
z<1ikF^EiUXkvxv#aWs!(cpS^)I38<w9M9tf9&34=$m1j)C-XRk$EiHl@i>jg={(Nh
zv7X17JkH{AHji_7+?~g{JkH~B4<7gAaW5YC=5aoc`|!Ac$AvsD;&CyL4Lt74;}Ra1
z^4Q4ZempMYaXF7GcwEWjDjrw!xId3;cwEclIv&^acmR(F@^}!B2lMzn9uML1`#c`X
z<6%4=&SQ?pJda24_yZn~<nbsTkLK|h9)HN=u@GA3@pv9j;PFHrPvY@p9#7$Bv0_%j
z%Al?h!^&Apwgqd&wq#kh71V)k&9-6NvhCRRYzMX@+llSWc451+HmohHVC`6Y)`9KD
zIzl}pXV!&vW!+eJ)`RtAm8=)*&8k>6>%;o8eyl$mzy`8GY%m+bhO%L7I2*x6vQca_
z)KQ9M<5&$F&nB>1HjzzcQ`l5i$ELCAYzC`mGubRQo6TXnv$<>@+k@@N_F{WO@rFK7
zf2oiyVvAV=+m|h2OIah^k1b=%*$TFjtzxU${%j3f%hs{=>;QHkJBS_3zQ+z>-)DzH
z-KOCz$MWn5_5*e#JBl66j$uD!$Fk$t@$3Y4B0Gtl%uZpaveVe<><o4$JByvoe#FjU
z=R&=w`RvE+0(K$0h+WJsVVAO>u*=xx><V@zyNdl(SiR-lh0VX|98%;LkyRbuBa!!(
z=R;Un8*M7FO<v|+BJWMP3Pl^Bn1P`<s^LF`I3q8V7a=QoF_@RyXl1QXG?$df&8jYj
zNMS<>;$CpeRE!%g7I2UZ1ZB+Z!G7?A@|+Ry-vacPERZY%({B%yQoJE~PPe38p^REG
zodc!0deFTgf>aE}`HgfrT?GaD>*-<iI4IXO3Ci&=gA)8(q3r$%`U3qel-mE9{)PTk
z8YqpE8l<(-q0({E8BkRJFqG|j1ZBIr%A93>vM5=WEC&ka_mK6H<;x0Wg|cE<Us<WF
zAC%9pl-0`WWdmh{Wiy~${$|-h*|)M^WzQ{S7VRu-E$l2Dpum^2g{y^!g`Y)&MWRKr
zMXE)bMTSMDMYctEi#&^-7NaaCSj@24XtCGgM~lZ6zghfY@zmm(#dC`n48<T&_Yt6w
zb3w@t1XZ{I6x=2#ufG#Y>+coH>K}xX`X``J{zK*uD0MG|a`vsEkbQe7PwxjM=%b*d
ze4)HbK2$zRK1M!PK3+aiK3P6XzEr+NzDIsS{+;|6`3p<R5?hKb+gf(AR9Lz|F)<HI
zrKPuJkY!ZY&$_Pbx~1#Et|z*l>w2y0y{^A>eQqPMX<=h+<80$<<8I?=<7E?VlVg)-
z)7z$xO`%Ph%}|@sHq&k9+AOtMXS2;_zs)h5i?)<4wiVk-Y^AmqwsPARwk>U0+m5!K
zY`fSx+WOjt*v8oQv|Vkx$M%fvHQUDuq-d>hQp6|{6+IRG6~h%%6^j&06sr}VDb^`A
zC^jj!D7GnfDt0OMDE281C=MzPDUK+PDNZP^EAA-nDefyCC|=qjJMi|}(RNZhU%P0#
zY`c6rqg|cdP`gof6Yb{OErfz!%k5U$eQLMHZmr$tcI)jn*zL7DVRy>zwB1>|Yj*eS
zez%v{OYJS}<@T-Z9qpC&QT7^pJ(LH_vCp+Hx99A~+Rw0`WB-Z$XZD}lueaY|zteud
z{So^!_CMG^cEAoT9XdETIrun)I`nsV-(jl5#|{e|7C9_-Sn9CMVY$Ofhff{WIIMN}
z++n@Lc847fyBrQVTyePSaNXgC!*>qfJN)2q*WsSSeTN6#6x~9*6?Plm?aOX29TkqD
zj+u_V9Q!%;cO2+A)p5P!HphLACmhc^UUa<dc*XIm<4wm0jt?ClIX-cG?j&()<<!B+
z&dJj$(5b+w$jRW;*QwO0pHsP0rBjvDhfbe4t#kUq=}V`LPMe&zIBjz}@ASf%a>mXg
zXNj}a*}_@wZ0X$1ImNlaxu0{nbER{&bARVr=Q`&B&V!uCI!|++={(zcj`IrV9nQO)
z_c-r!-tT<H`4{I$&c8c9b$;gJ>=NP<2F1`KU7}rLT{JEUE{QHFE;^Sqmt2=Tm!2+l
zF2h|mxa@S<?XuV9pvz&Gqb|o?PP%;Ua>nJB%MUJhUGBL&c6sh9ab;b@Tq9hgT%%oM
zT{W%=u8FS6uBom%*Y2*lu034qT!*`EaNXp(#dVwO4%c0-dtCRq?sq-y`ofKZvTGtY
ziJR2T!cFeh!mXtn>(<e&lUo-zUpJ#$nOlWhm0N$eTDN+)fo|j7wzzF`+u^p;ZMWNA
zx3Am|xE*pk;&#;StlK%a3vR!-cXRi2_i|Uc`?&kL2e=2hhq%YPXSnxpFLZy;eXRQ$
z_b=UdxSw)A=YGv2(j(d<)<ffw;F0K&?2+n`?vd${<B{jl%cGA+kw;$-qer<%l}C+7
zy~iMrAs)j#c#n}DV?4%rO!S!IG2LU9#~hFO9t)u?+%k`q9;-dpdVJxr!DF+>HjkYi
zdpy4KIOuW2<Cw=)kJ}!PJ^u3e+vBAt@)SV<IV(@r)5g=;)7vxNGu5+~XQgMgXN_ka
zl$9Iq$$Ng_In#5E=T6Vvo_jsN@;u;q((`N2GoCj+A1aYjq?9P7N((4G=d5&9x+^`E
zUdnK#PMNOME3=e2%8|+y%2mqM$~DTh%FmVSl^c|spg`Rg<!R+v<$2{L<rU>s<!$9X
z<$dJ?<wGw^FDI`guWYYEuR&g8ye4=}@|xl`&1;6&EU%BezVzDRwb$z_uLDrl?wHpp
zuS;InyngWd)$5tJ#M{cdi?=hBx(oJB@=o#Ad1rWMde8Iz*n1(Ac3tYd%zLHxD(}_a
zpLwtI{=)l9?~UG@z0Y{x@qXm}mrALEQkW`VmA@)b6|4$Xg{vY}(W+RLMwI{s^O9Am
zsx(!GDpQrM%2oAL<*N!+#j2^Q>8hEkS*njzb5-+I3sj3#i&aZht5u(?)~hzCHmSZ=
z{igau^{47D)!(X@YNYO}c2c{mJ=I=nmAbdOkGfD@q&BEa)JAogx<Xy4u2K(D4^<CW
z^Xd=OAFKDN_p1-8537%=kE>6r@2Y=Q|E_+jex`oz<Lcw?<LRUH@%B;s`1<(!1o{N|
z1pCDJB={uyB>SZLl=@8cnd~#wXS&Z!pV>ZhptRp!pMyS!eUADZ_xaQ3FQ31CUiebJ
z*jMaJ`^tPRd>P-?z8!o!`F8QO@eTCt<(uzY;9CTx084z0zGHl+_|Ej5?K{VJp6_Ab
zqrS&|PxzklJ?(qe_q^{#-%GxieZTX)<NKrUPrg6<N&P(hlz!fR;KlRv_Y3sP^y}qU
z=vVC5*RRxXrr&J8Iev5f=KC%1TjaOI?-Rdee#`yV`EBsq<hR9do8LLVKmGpl``hoO
zKk^s(OZ*-DJ^WSvKK_1Cg0R@XuYak((Z9^U!oSMDzkjWNo&QAtkNkJ~@AKd9f6)K1
z|55*A{wMrT`JeOuBfv7iDu4~J4rmi#8;~538ju!{9-t4%3djk_4d@ZjGoU_TE|fA{
z5U?m<Nx;&8WdSP!J`1=Ka5dn1z_$T618xP}4!9HWW5B&YQJ_npTcAgvGSE9v73dS_
z7Z@H`7FZEj6<8fu6Id5GAaGFNdx1j&X9R8y+#a|yaChL|z<q)H0}lp%AJi(Sbx_-&
zc0nD2It6tJvI$ZI*#!j$<p&i66$KfBN`gv*`URB-)dwvJ`Xp$1(2Af{L92s43tAWS
zMbP@7V?hst9tAxK`aS4r(4Rqn1^pc?4ps&G1p7g$#lYa;;Lzak;K<;p;Jo1B!F=!s
z!J~r51b-MjE_g!ljNrY&Uj-isJ{WvB_-OF);FG~$2cHhU7t%7MRY>cQwju39I)roz
z=@Q}+k`<B@k{gm2(lexYNS~0xkm8WOAtfQzA^k&YL&k^f3E3C2KjdJ@;gF*t$3sqr
zoC`&vqEJaF9V!cDLM=nBLfOz(q1K_DLlvR+q1{5ALL;H*V@aqnv@EnDv?{cJ=!DRj
zp>sp$hb{<R6nY}`ROso@Goj}~FN9tSy%Ksg^jhfk&^w{`Lmz}b41E+P5AzOFhxvy2
zhXsZOhlPgah82dDgc-xi!Yab%hRqLK5VjBsNiGdr7Pca6RoJIttHU;gZ4KKVwli#Z
z*rl+)!(N7?a8bA<TpDf>?i#KR4+swm4+#$o?-yPXULD>)yf(Z(d|>$C@FC&vhYt-O
z9X>vMV)*3nso|@`zYaeWelGk%_@(e~!mo$Fh>%8DMp#9#5!MkA5z!HG5t@jEh{TAL
z2wg;aggzoOqE|%kh&~YmBi2N$jrcrbeZ<Cy%@JE8wnyBJ_$lH+#4i!QMm&!AE#i-e
zKO>$+T1N&%21kZQhDSz5Mn%R%Y9do3heQsG<ReE!j*J`~`C;U^$O(}XBbP@Wi#!?m
zb>x}IbCKsGFGgO8{3WVOlx>uKltYwblyj78lzWtClrl;aRTfnlRUK6mRTotsH8ASE
zsL4@tqn1UjkNPU=K-8hAqfy7B&P3gcx*c^V>R#0Ss7KMFXi2m*nu)fIZXMk%+9}#4
z+CADcIv_eBIx#vqS{I!j-6Og@x-z;tx;DB#dT8{d=qb_DqGv|Wj{Z1$ZS?2S>!B>?
z=IH&==c6x1Uyi;SeLeb4^wa2P(a)n_#-JEkOvjkcF<oO6G4?S|F#$0_F(EPGF_AGD
zG5IltF@~7Zn6WVvVkX5*iJ2BNGiG+o%9wRAU&L&P*&MSi=2Xnhn0v7})*`k;tYfT8
ztb437Ru`KQn;DxOn;Y9Rws&kvtTA?Y?3CE)u`^>oik%m`C3aiv&e+|tdt>*<9*n&h
zdpY)M?6<Ms#r_m0kLwa=8)p~SEzUVEAucH{B~BNY0mVae;;Q2M$Bl}c6*nhtUfhDX
z#c})M4#XXbI}&$1?o{0AxC?QY;;zU2689+XN!%ZC&orGiHW~$#8+FvUXxubj8kHtg
zlcGt}WN5N9-8F+X?`wF?2bxiu4>jX86E$-*>os3#4r&f-j%iM6e$hPAJkk8Fd8+wK
z^LIQQZyWCs?-j3xqNUmKx$!;Xd&TF+7seOI8{-GWkBJ`}KR$j^{M7hm@tfke#BYn=
z8NVm~aQx-?Z{n}T--y2z|8x9{1S$bTu~S(>*95l&&jjxTpM=bWoP^wj9tph@3KEJE
zsuOAx1|$qhct2rS!UqXc5~e52N|=+dEn#QE?u5Mw`x6c&97#Bt@O8q4gj)$eB>b3g
zU)w^<YOS?xwC%N>v|Y6J+HP8RZJ;(p8?KGg7HSRJ60K2NrmfUgYX@qFYbR(YYo}>v
zYBy=OYPV~5YWHZr(jL$r)gITL(SED_PJ3H>H_;-|GSMoLO>CXmF0n(RL!x7%cVbv#
zWMWLBCb1;3Ut)P;Wn%xty2JsAL!eCS2Z=KhXD7}{oS(QbaZln`i3bu7B_2&Yk$5Wc
zR^si%$4TNOX_5t$a&4L9o#d0`mlTi`oD`N6k(8E{k(8CxJ*h`hX;QzW0ZC($#wATi
znw&H(X<gD6NgI+jC2dLCp0qRRXwt=`yGcJK{hahL>2WffY@OUTxqWiS<SxlJ$pOi+
z$yv$Wlk<{$CHF}lnmjytMDobw(aB?z$0sjM-jaMI`FQfl<kQLLl7CHpocw$8)8uE#
ze<#08u}-l~@lNqc@k<Fz2}wyv$xZ2z(krD;N>NI63ZF7EWpv8elnE)TQdXy|P5C@!
zeagm^%_(1{oKCrtdMfoy>bcYlsh3i(q+U(Eo_ZtoyVUPfe@MNXdN1{U>VwpWsgF{h
zKtcMasn1fMr@qi3omeN;F}fByR@YkBPS;V_MQ5wC*E#B3bnZH(PNnnJ1?YlxVY*0N
zj7|eZZIg96U4|}8*Im~`*IQShE7q0h`spfk)w){U0Nr5S5ZzGSa2>DvKsQP^MmJVB
zUN=!USvM7m;m*{}*3Hq)(|xR4s9UUCs#~U8p<AU}t@}*3PWOfGOWj7@X5CiZcHK_h
zZrxtpSGohbL%JinW4aT%Q@S&{^SVpAZ*<pnH+A3Z?&$96?(2ThJ<|QAd#ZbuCQ75z
zWNGc7*sg1uN19ifIxQqEHZ3JBElr=6otB%{BkjYqX=yXlW~a?bo0qmAZE@NsX)DrJ
zrL9lfn|3tqcG}&vpVA(r{hIb9?T@r)X@93v=^`lEYmsi5Zj~O89+#exo|T@H-aS1p
zy=Qu_^!)UK^l|AE(<i4-NuQQJBYkH2?DRS52h)$FA4@-xek%P;`uX%r>EEPZOaCGL
zkMuv&pQpdfz!~xk%M7awMTRybIU_Ygmyw>K&&bTk&gh=OXN=4koiQe3Y{vME2^o_z
zreu7aaWvyZ#;J_c8D}#tWL(a;n(=MM&5R#1e$i8Uk)GCD=q>dv_15~f`VRU|`WU@N
zpP<+3lk_Qih!N^D^uzTd^dt47^&jfT>nG`_>SyR@=|9#l*RRvB*KgEs(Qnu9)c>IW
zQU8<vzW#y!q5fC>WBqTL;!Mv>?@V>3Z>E1{P-bXm1QaNa&D3UQWaeiUW*Ra}Gs`k7
zGy7-OW`2}8FZ1Kfg_(;omt-!@T$Z^a^UKWLnRhdP%DkWXbLKCZzh*wk{5|u}%x77m
zELj$lWtnA_)gdb^D>Ex6D>tiWR(@7tmLaP&t0L>YtPxq0vZiEB&zhCBIcrbW!K`Ch
zSF^s&x|ww=>tWXK*@|rYZ1-&MY@clZ?7-~Y?ELKF?2_z$*%jGU+5NNYvIl36&Yqq<
zGy9|LdD-i-w`Bj1n(q9!=R1xAcwBKbb);yDrj9wfqH{EL)45VdI;7rxecrG4=k<Di
z5yK2I#1%sf=`ce&tV6ohT&rWwy6?_?bdIKIimqsirfAB#F3X-jyq^EWE05>Z(f39d
zoBAfiG&W(TsR=jDO$XD%^fG<TrzT*M%}TS%d{>DquQe%Vz4_6knsl?n>@pc<kI6KT
zOul(y{xZ)@k$IUEoYXj}X;OGnL{f{Sk12v$P%COpZ7GtXr~^e)C+b2m6ieNyC-tVj
z6i5AOAPuH?8cM?{fkskd<t~sVpFm@2JWZs@G?k{)OqxyeXaOyvCA5r^X(g?uwUj~|
zD3vx-8l}@V+DRF-m-f>k%B16Tiq6sn%A!kjg|5*Jx<%P^hwf1h<<djSqkMWo1yo4S
zsfdc{6_rpay`?fLrw>%&Rq?8MH7X(L+Fp<s?A7xccp+XRFVqY3ntI`0gxA9R$ZO+8
zdQo0S?-Q?!7vsfxJ-l9CUoXxZVz<~dn{I!#+wD&Ko84{q+TZN~d&nNKN9}QY(w??w
z?Rk6A{$VfMtM<CRX|wHJn`0l?Jp0%d*k`uLzO*IwjV-h9Z3S258eEHmxGp!~h8)UG
zIGmevD{jM)+@7Pkb0u=!jeBw*j^hD5n1}FiPT&zdiWAu|v1P}?;4wUo$MXc9#FKdn
zPvhx4gJ<z<p3C!j0Wajmyo8tXa!%$Iyoy)z8eYdKyq-65DsSQ~oW|+AjdyYe@8$h`
zh%@;(pX4)qp0oHeU*+q3lW+5%e3$QYE<fUYe#(XXf{Xbzm-0I<=f7PQSKZZgbzHEk
z??PN-7v`F|2-niJcI{l0>*zYUt}fQ~aJ^kW*WV3t@otz)a3fu!Gfw@3{t^F}f6_nW
zpZBx;%l<Y0rl0NK^>h3OexCo>FYurFMgB{_#DC+L`S1M-sVX(3mIO&%X&?<HRGLV*
zG?!M=Mk1xXL`!Fhk#5pc`beA%kijxUhRbI%N=6F_i%3Am$>%ajzLaV5mCTYkGGD%y
z#qy0Tmv3d2d@t+d2iYh;$rkxpw#s(dCA(#x9FW6uR8GigIVTt8l3bM=a$D}meaV$a
zk}prCP+mx}yp~dVC*|_DR?+HOQ|oB3*4GeitYO+rBebQq)^-}D9kr8o)mZJJy|thA
z*FhSu!!$uhYN95oRbQcFb-Yg0$vRc1>r9=k^K^kO(j~e~lXa!8*0q|V8#GlnYnrC(
zHr=Tix>xt>K|QRQdQ4B~DLtd-^nzyTCB358^oHKjY`vrRG)Hswq2_76KG6a#)aP2H
z#rjH1v{c_}nU?DZtw0r2Lk-kKZ3H10_0RwzXoOINp((-<ffi_m)@X}JM4<zs(Ft7;
zgIIJ&PxMA##GyY1Vld({6vHcN_7NC`L>Le(90b4^jKg?Lz$8q@6imZ(%)l(n#$3$D
z0xZO0EWuJNM>1Am6;@*n)*%J!u@R}*ge^$JFW8E0*nwThz#i<wejLPMWa1c3;1tf_
z94;UWmv9Bwa09oHjXSu99OU95@{o@wC_o{eqX@-#g%XtFEy_@i52y&#3e*k+1sVn#
m1wsSO1JQx5fkA<Uz!!lzl{Q>us#d=E{F|V0|MmYjFz+8?l+_ym

literal 0
HcmV?d00001

diff --git a/games/NXDoom/pkg/osx/cp-with-libs b/games/NXDoom/pkg/osx/cp-with-libs
new file mode 100755
index 000000000..f4869063f
--- /dev/null
+++ b/games/NXDoom/pkg/osx/cp-with-libs
@@ -0,0 +1,107 @@
+#!/bin/bash
+#
+# Copy a program to the specified destination, along
+# with libraries it depends upon.
+
+src_bin=$1
+dest_dir=$2
+
+# Returns true if the specified file is a dylib.
+
+is_dylib() {
+	case "$1" in
+		*.dylib)
+			true
+			;;
+		*)
+			false
+			;;
+	esac
+}
+
+# Returns true if the specified file is in a system location
+# (/System or /usr):
+
+is_sys_lib() {
+	case "$1" in
+		/System/*)
+			true
+			;;
+		/usr/local/*)  # homebrew/manual install
+			false
+			;;
+		/usr/*)
+			true
+			;;
+		*)
+			false
+			;;
+	esac
+}
+
+# Install the specified file to the location in dest_dir, along with
+# any libraries it depends upon (recursively):
+
+install_with_deps() {
+	local src_file
+	local bin_name
+	local dest_file
+	local lib_name
+
+	src_file=$1
+	bin_name=$(basename "$src_file")
+	dest_file="$dest_dir/$bin_name"
+
+	# Already copied into the package? Don't copy again.
+	# Prevents endless recursion.
+
+	if [ -e "$dest_file" ]; then
+		return
+	fi
+
+	echo "Installing $bin_name..."
+
+	# Copy file into package.
+
+	cp "$src_file" "$dest_file"
+
+	# Copy libraries that this file depends on:
+
+	otool -L "$src_file" | tail -n +2 | sed 's/^.//; s/ (.*//' | while read; do
+		# Don't copy system libraries
+
+		if is_sys_lib "$REPLY"; then
+			continue
+		fi
+
+		#echo "    - $bin_name depends on $REPLY"
+
+		# Copy this library into the package, and:
+		# recursively install any libraries that _this_ library depends on:
+
+		install_with_deps "$REPLY"
+
+		# Change destination binary to depend on the
+		# copy inside the package:
+
+		lib_name=$(basename "$REPLY")
+		install_name_tool -change "$REPLY" "@executable_path/$lib_name" \
+		                  "$dest_file"
+	done
+
+	# If this is a library that we have installed, change its id:
+
+	if is_dylib "$dest_file"; then
+		install_name_tool -id "@executable_path/$bin_name" "$dest_file"
+	fi
+
+	# The install_name_tool calls above break signatures. Recent versions
+	# of macOS make signatures mandatory, even if just ad-hoc ones.
+	codesign --remove-signature "$dest_file"
+	codesign --force -s - "$dest_file"  # ad-hoc signature
+}
+
+# Install the file, and recursively install any libraries:
+
+install_with_deps "$src_bin"
+
diff --git a/games/NXDoom/pkg/osx/disk/background.png b/games/NXDoom/pkg/osx/disk/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7063aee73d9cf2f67ed6ea05ad8f9ea910fe7c7
GIT binary patch
literal 227363
zcmV)&K#aeMP)<h;3K|Lk000e1NJLTq00LM500F`X0ssI2yb&NX00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-#p3l$hIvGxZT001BWNkl<Zc-ri}XRs{Wbso0X+PlNd
zNjJWP@DK<FL`E<fgcu}~lnl|N#3DsnMU{$D6)l%7L*+mfT`m_bIj}6MTqTRNf>{zQ
zmT57lM8bfCKrjf26o`xm;Nb<leDAyWoHL=j_g-uH$L{Xw?&(SA%sJ=Yhu4L0?#!O<
z-8-%LeG5POu3v$3zmN!#!rvkcs$}fepR(l6Dxxa$-8hSv74~|!-MPMs>FAk9J}trs
zkQHt`nO?nq-<9k4=F^cc@_aG^&^X;O*4}*fDI&6#0MHmqWRQrxV|L+I##jIp@v3S}
zgotD;BHDNWpa7sMpn7z4G#ZVrU%zgQF~$O-s;UaRqBFTFVx!pDsK_SuI2apw?+=fT
ziRixjAMoC>D?&Gj3?kV$MSvooh_Epc64@vTgNcas{mDkwMo&NWq=+2s?^$aBz<VB#
zM^Tc#={tXry<2k(>lHY^>X!YA3=*B^u4M1Rq^$b`Rb~%>#@h4krw<F}EH)GXkTC!_
z|M?kRDk8%0m3M{Rz3Avxk!nZV&UCCC#@;(O8_aJmdqIPM7d#0Vwi3dN*Md_xNFb<>
zYy?mh5mg1mFmwu9YY(alpsHG}K&?KmKdDDs>yuOwd*=cXv3kn34xIi^s_sL0FU0Uh
z2mladutM3HdUK(%5hwt*cI=kVM^L<gEs4$T(b+BSmOA@aHE8G3O*|thcyVXZi>J{1
zT14HtuxO6++?ZST9udiy^L$Sg)~+tbXQt&Xyz_iF?v_i~tHN20nD8@?d@7q9?_IuE
z*pV?v<Xy3|e{kjAmjXyOIts?<VCSGd6Vo&`#@ZwWg(4dRlCcpP8zsu#340L_0Eh<B
z7#krX*%$!CJ5Uv21wa510YFz|LdHfhl!hbOC{a*$IU*q$RaFoX0q?ZdB2|oyTcacr
zJP-yVRb_S-5<nud02n1{HH2uBfp@vf#$+O6toM$+yK?0UsE)_u36DJsAzDMg#b-bC
zP8Ma)*Ix3fYcF|KzZgIyqUJV6B81h_9g)b;3HE=b^Ww?Qo?zqo!T}%}6C}NgfC>@;
zQfarVXmGStst$X1(v_&eE3n?HN#iGFr`Na3*S6hNgSNL-gRg7WgaxmQRJ5;%i<xV!
zw-!LE+Ofac*Z)*wqqa*TG{(*_)^}c{3O9Z=vk32yY0$gy&KEaWdbaPy-g%b^J7Euq
z2#NrNWTHsC3nC2wkT94<3P6a6NMy8OQ6T~VA$R}`_9M~E><C}0LTPxl4K)Q-P^{N0
zA}W9aQ0qWx{c!&Lntg%*jROvYQb?8RS^hh?XKM@BSQEM@A}j)ghy<WTJ{3{#S=b|>
zE}RQIfiL9Lrm&voN5Qg3rRqafRZvA}nEu)x>eGmg(!sFWKCZhMjPtXzM)X{cAl0u>
z`L|-Bs&25J%f@=5EubAi2&!=5PHH04yH-?%knSAsfr>OwJp>HC<|PBT=7QhQ!=~Mb
zh@5_BA>wp&OV~SC2$$!-%X3l5^8%xEPzx?$VUI|N2%rc!$#QF$RS^IYnZ2*{vfw{-
z-m7Y40TD%%j4?I}-o@}XL69O6Ab9ph$wmp0nR#D9kxUpXM4~bhiQW|eYN7-IjkVQ4
zs4%yW8zKVs1we4+p|A@U7$Abm{Qgl<08NtET9Y8Dh%54NBSeZ5J00DA`q9tsU%7X<
zcd7ZTW&}b-O6RJos+QWrGSMI)>#qY<k)VW})=!H~aVVulI8zIxHUVc1=0$k$sE1!6
zEQyAO#>>q?5e{n%k&rMLqauQ*5QM5yPCBTHo_xnH*uwSHYpLQ107_$CmTFGhIior&
z@QgjXgjl{&*e{)fJ*cx`?iQVp;rv9v`8LfLX&$q^joYr5a(ArLXIrg}i&jti1)->j
z65<^r2u0e*B_cxDQL^PbZ>U;rC!S9<Il9Td@I}F*D#FY~k&DPQE8>AK*OrP1D|;oQ
zh(v^l(=4~vGkYRT)6{$KT+3~h7iDS>Ap&?~qc{ar(8`;KNJJ(~HhZr`DIyXzUk!;=
z%ajwsD1;JK1wd^S6Inzg761&pt0kNe5sh~RRGB-o^bl<v-*bm%9LE4)Y*ZA*bUFn9
z%MwL4Nz&=)_U-4MisEFre;HcOqUKEysfsuXC@o*ls;bKCAL~IaKnhOFQ>;UsQ_GrW
zVta5FEcj9}D!ZY8W}(zaq*aHtsxT4&njkenK$TVGR2FEE6Nbv^*q)ar_@&KE5K28t
z&EY!Rqjs(vXD<j5sr1r_`t~xJeHG?z$tqqnGR^ox(-XdA7;D=JRT*TRKHH6kc(G+x
z<sBfd?ex$&XOZ6V9!`W4`Z)9?cV1gR-HL)K?A3?!4omkO5)n0%=v0G`O2gOX>SPuX
zYppS443)N;DzTI{JsBjj(pexHmcK}uO(P=O9!?QK5oWG4Rmzl{VE&>88LYvPDxx4r
zRJqY+?L!zs8nK@;Gp5oULvS)|A}Eu1aDJW<z!(FdRJs8K0LU0-@3N_?0HTfJmKju8
zRBPKXdUC(t*}EwF?Z-u{c)7fX;BLi5J0-Z-RiWjTJ*}8HD?hVt;jo%JMf)d3SFE1p
zr}P;egUb#fJ<S=V3RuT4HrPT<$-3z0vrgF!PDv3H#l7x}N`F*iquKfB9TN4U7nns$
zJ0PUGE(v;zFx;u>#ad>NuNt}&Z(vn+`6)fa<#|1)Axh~|E3L6x&pvkhxi9Zsz88_K
zA&4j%>{|9wGGOnI$BzgzyUaT$-cc0AY0S*3a`VQGJkMVK;491MAeo(mtG>vJY%(1m
zkB<-cE??W(zXS@ZeDmoq7kLH%!aN<_1_0+cNYE^IS?)^RA3#+{N4F7RoE3&BiCYWF
zd3K(Y$Qn}`SSrVWnxwnFimtPF;TjBg2fO>XpMU;%bi9+sh#1EP0Cx7TD6@09isaeE
zkV(>^cSVs;Y?PQ9_MjT>MugX{T?<Eio=wN2qc}--_x5i*{`oI|{u6O*jEx@rx^Erq
zUG5m@s;bo|L16dTM`QqWK8(MvUC1XlZkFus#U32f{CN`-f=Fmqn<Fa1!bG;V3ww8p
zs<4-nZJi~KuC+WUYwYfxv+YFrJM*V#@1(56TGRj-?+QZ(>m-!Mk$cLkld-b&eAd%v
zGo8TKRsW=sdZUE1(U|Y^Cg$^k7=AOIp>bs6vg3Qpnei{&3-R3Iqm^f};kXMPF)2Mf
z*wm_2OWm{dLX=2@%KKOUDW$)z%!n!DzLlZYwwW5cy_r5!12fu+edCVdDYImm^5HNG
z(v)}%Y`IAhOWU{p7na6j`7fOLzsqb-EKOo5P3N%qiHwaRV<TfM8G8y)>|MAo=5uFG
zYg?S9|K^U}=)I?C&pC<fpB!_50o=}sboUG_wgz}vxA6~u>;LFDWU((?cgEOlon^hN
zGP@IuH4^n^+-&#SZn}1@H8Fb|C4ea2Z6$8e&cj@5eUENElZ|d4AKns?C^7(g^}bgs
z2mpESAA9(rz5V_D{R1L{#)vDJ{pjensvcavYNOZ{89*8JDNRE}GKP$G+0?t-<r4rH
z>|QoeR7}TYjIl|`AZdymVHRO(SYx{fSD4uqnToi48YP2dup6d3{E)p1-cdxH9N$ur
zBA+1QVE3|(;&?E;@ywGqo_Q*XqsUSim8|eAGE7>!ZEcw5g^wd^2zPdNk<b-+9o|p{
zA{y)*1l@c(orb6(AV!7|F-cNT`Py&$fip#6FR-zgnQg->bK(PJ9XwS7eSc2azLoY+
zBVtO;5Z%fBF{hYB5!TA&J&SYWZoHaE_FASiX&jbL@fO6yqRZYHY81})(n&QAJcph)
z0M}d91zTusxVQ;ubs>arv}H+^f2juhv9uUVq1&>zW;ZGE=!8V2={Ga@%9vw4^9{37
z>$_;vaIAzpsEC9ZA6B+tjpSDq0i^Kw%67#-2vDsw1?`;QrDcO{i?J~pVV3GuT5B5`
zyn<K(NC3)>jfnHOsIwFl=YJzTHz_#t1T5d_8-!!e+{n{lh@8o}ao4)IE>ujcD+omx
z`qikjokeDM$|o%D`D_Z>dWW>WA_LVa-@v-gO~mQ)5rm!gZ(U?xbUcJhU$z_elTDQ0
zX0Av5ZllrY#xqY}yLJy5QuZq1i$cWvA{XY8=q2!asAQ9IHXU8N|3M;?PmYUx+A+t2
z6f5$HE2e}75Q!`R1ka(3Q&9CqrV7Fi$q*5<XYYc8v2eMnI_Fembaac1P16B@W|L#@
z3-1eKV;d#DnEE0w1unCK5E(6LnTWk(=km!&+%%2t?!o1BxaW(hs<Lw;93_J`CJhk*
zMkCK7krLvMNKu@CLQzbRjI}WUOh>oLSYx8Wa5&uA9gRlQ>6AqgF;2u<`|zK9K$!D9
zvr+u&H+~0uuG}rOIqY2n99uXr21E^4f^VwWf!c1(v!)T%QxTabBdl=!3nd^Tof{E{
z1a>-O%z|i+DhPWbi#8VaA#6GCqYi9+>z~>cdmNsa2u;|7oJ0x=I~6fe(rfycol!M5
z21H?Z0*@Ucl8NfWNxUaxaJgSim3>iyaA{TJ-qBb$JMv7##QGK?TugrEcGRV%`Bb_*
zKdrS}&Pd~4wpcG(VH6Se99)hf0#wKJL`rY%j66+Mg}ID}Ezu9cuPJ~`T2VIzow2f2
z5yb$62=-ohvWNuzrfyuuEGw%}q}*D8#k4xyvBV0N5lRiVnlV-aD-Chbe&(bGLKP*|
zhDd0btpS)J;WI)aV}j+^yo)a~VR89Xb&<`a+gRRR*w%?O?nUs1rAl}C<@p<53wjH|
zG>7HT6vR!({S<)3P89qkv#pB_<2IIDPxch-JWh2TV!!guPHKCfF1Pt?t{O)eP{_K7
z5m<%wY^br%RoK?Bp1C-jsGuUOm*%S_Ky8C%fOy*EZ*8oD`Q46fT*8tMp%KGtb}t<a
z_Agz+GSuXR{b0{>gM`j|H=T^)WDqBVbhvAxSeR8<ychOltimieGPnsl<E$YO2Bo>M
zopZ*hwKf<T0Xl7?L{&rnr}M0>H5sI^g94hSRS=u89k#rYh**J&yvy_HaX?awcwr9D
zGBys@Rlr9QYMQ3O(#rB26e3$TtE^(RHm;(fqLscMM-~yBbKd(XG9i6O*x!2kktiJw
z_O1k^{E1`0h&2yRN$h}RU~adr##2}MLF>xAxo!l(f1c>x@=#ie#xmuiBQ**QRCVVF
zH%LL9+UVd2cV6lR?cNiSfMy{ZEzxr89s)?zLpNK&1hJ&JEAbUoV{Ce#Hnk41O+_8<
zfNh#UKt!6+#mNFPvv9YD38+iB<^$vxXLzTLPV{gB=**=z*J8P7YY4&y92)_^^a?^z
zWw^Tq;ZpvWO;EZaP4T?6pr%_#o4(CnL8x6sD=rd*&6^-%nhxOLlJ`zU%5n`RnrVoL
z>|HitV`H*$Vxtr>B(N}hVJ?X&>xD!V>PGY|%+@TF(k{STgR=#Z$XZp!Yzn~63zD?G
zTO#V)v!J4Z)G-p_YJX}ax)2fB6$SfvxC?;HKG4dLF~&p+Anchv``p+#P18`<;_0WJ
z6z1U|HU{Hlw+1BD{>cD-5APYrh7hy7U>1W(NMjZD&p-Xh{?!MDdskIueWZN9Gqb(_
zd&@oqW(Ko3-#CbiIT5>&U;Vr(E&>_C3frb~)0xHmrP%N)Z?N-N0w`qJ^XIVJojzj^
z-hBCV8|*y;gpq7F647a_%9}cJ=L(O6f;<M}&f2J(3A2h{)O#cYswy*I=weWf>WO%<
znvQP8KAws-L|Y{Yt9*s}yhdG0oVdYEw%d1lx#;udU)2U%uUn>zKh++L|C+sh!Cmw2
zyWV95EyiJ;Wr=9ukg+9`O9hE&i1-%V0Ym`nbP}wet{O1XIP<PxPd7@l28oOza@7*Y
z3f(cU>tmI^Q}s$`OQJ+<C;+00*8HO3R@zzuSovQCg@dj@#t=~r!{~Jpw)=tFU_L#)
z&}d+a`;@BoAg-q3Z22-82}v!#q4sY76TV7!?>C;fzK0NT6JOa%W^?R}oG!tGH}kd@
zr4L}~Hed24eJl;DJeQpoxXFUTRar$V9*%(_7?&KmRl~*i#45`SH(Ks%dv@#cHGRxb
z>xwq8WsXL}9A2VIu*=tf855^vWECKU;<3(EVISC>0U!i>Te?gMAy=d>Bul)TW!%~p
z)Ku6jd$Lg-zZLIP#Kh^`oqMj(jnkvoPipBYEpWWluy@3@sOILI)tNQRf6nY&o)!6|
zT8O2=M>bX@0FBf1^5rYcTuetk&z#HB;eN=*4EAF1Nvf)d6H#B`plvjWlGNoBRb^iY
zfQjN@cY<mZ+3@rLWOPMVRtiKM?(G>9ncL488`~%XK*aq;26j5wLo!7+E*&z6R4Ieb
z`7C$F*a&SlISiO(W1=`6)=DLrD2O^{&m1U4^<aOGh?3#HiQ=aoeaJ@9V6d}XrAT6n
zh<WZ+HFutfc6U!pcC{q$R7FHQlBrFEjp7%<rVO)YOti>z5fq>k_uoWGll@$k#XB+<
zX(j3Z(#D8fWc{|yDn!4rF{m(yY$G#EKk01@aeX{4N$y`Gfwpa3=}NpgcFt!+T8sAp
zu{X<R<<PYz-A3UQl}ZKd9Jy69i)g}&chO%fyV0|rS-ivbz_^XkKxM~%+3CGpw4Il$
zb5@bAWbj(p<Jnie=RPjt%Rxjff7@u&Ok7?GPCrNV`W<RDLbKkRVm+7@<e{<~v{V<d
zYjQSjfHO53XR-_1Q#{A@->5Kvoscaq^Dzf3eCTt9&<{Oo`v|n9A8J!^?7U1xF0IY7
zi;L6|T;d2{Q-e9lY$2XvGtS!wx~3JmEe&u(oQ7^{)2tC_D08*e<ab;~Bc}76T*m3u
z7;{|S%l0I1X%+(iJFWposTV)uT;s|CgF2g|vaz0c&7A0Gx^!VLw`c(X>;@9MsYC=(
zA0}V8)>ylDn`s27!tAE=UFoPiT}8O93(w5QVBXFD#5;hNlC@ItS=o)#s`KlG<(D+u
z7#+Xr{?s7I4_Oa&o@A2j04TFpk$ikeCQ5fNf$GcSD4$NBd-{pNa5o+9*f_Pxph+n*
zt00e*40c^nFlVJ!TjT}%C>a1^2t2SWpu!Org}2s5QDmdU#z|-p@+~LFw*ln#aTZ5D
z;PXm+g^ij4!k|`%A`Ae4WRhf{s`=!&`~YN_#&HypjdphS0iejn;(cfwB?DER9^aCN
zGHavQn0P!oQdRE@BC~&R**W*zjhg^4NTM(!0fW!%>SgV{h-i`+RY+4S0?$47tlGiB
z^&YB(l3&mjWv;)f_s*F0veH%A<wT}N8LtVbuSr=EOQ5$g_DsY7OZH%sO=8w~LI39)
zpDtKH#>DkOWoG<a4WKvKwq<OVf+(<S+$=U9g&7cyjaOT)&D)FcmSCwSisutk=TRb2
zx>Fsw<$r4{)<y}Y!=^f7Y|_wIPj+NQ<-t<h#O&75c+glgw}wlEPsL@tWaw;_1G|p1
zzMWjF?fPU@R{a9yw+`EAS2*jEXn|Jh!Haxs=jW;IZ0w*omo(Sd6AuV-R77fxu>?af
zm(z-XL@?*wt%wAg=yj~jxH_&diw?FL69#xzwVo7b0fuIULTp%>SUYm(w`n`&u13n2
zQ3%9N5kvtf>jU+A78<m1+Vy4h`ysI51X+Kz<GdlewvfODH(B3`+=5BlWs_Lwm08gE
zy!XZig#oryYpFx|u)QRPzFTQC(pIrX;G9y9_3l#LY=k!M*l7s-nsNtp>3wXJ4yz=z
z)ej@H+uXm^hqmooTht}1mA$An!z=<(NxI$RZz2lr`&nLcV-KuUrsn5Z&Wq^i1U6hB
z$o;IY&Qr=X%!X!D6a{;KFx(57iUF-$C9qUUDXK&yBFB?Sk>&T^|3D2aQiWu=f91ZR
zuoL0i&)>Xt`*4tESUNCanmZzltx?r!?jjauhCD|Yg>{$}4iwTfGK9k<0>sI9RCYJd
z5z(=D&pSJVG$~`i%nYFE&c3iOvM~TA!~Gzd-Ds5MQ&BK^wzEeex7%1OIS#UM5c1;H
zIZo0vPSTL+?tI7~H^xTO@gW&|?b<a&N{73n<HK9e-%MlMVFPb&XJ$df%a<+>27})1
z#mp$oE=Mw|AuAml)DUF>_uz5qO%QMMNGJd<&WF?{`d)<_ZfIQvO;Er!Bb~ZtKvCF(
zaEnc1ON~!?(JUB=r@M~<BH`W)^KOdfnu+L0WC*u+Of`}!Lt>g*h#F%KK*n|w5Sygi
z=b(z560<iGNea3+yxLr{>m*{V`(ba7nzn#88I2bOQEDpWQ$4t9u5dP?ju)a;s9IvD
z%A_w{6wyIM6=jho$_-S=kc}cnKt=#$5vg34S_&-^C73aBx71w`sW8HIA^R5mLztO6
z<poM&wvZ-@ph#3#h!t&M{$_>+cImvUnoWSBb&wEeS+9l&$&j^Jrl>9rtf>YP+$EK9
zw3YCtT{}P(kaUHkNtga}9R*xht_Q?TdDk}4{nsjGb~=3e=I3Yc8MY}Ne^n|etZ*2d
zrFGuS5=NXkX_|e)&J*#x574d2+NC|WNCXOID^z%hodWI)7Za9b9Z=(5?IJly&Bp7V
z;C-*GpazoGDv;90wf>Z>&l|Z?Db~g4_{FMCKUi?n#=UraW-jt9K+57|fay?#5yWK^
z07W!5N`||}7$fWe36QesL{+Rc!!%J9&{@@pBAa-Z2fK<uhJ(~vgCVX!L^ekN1QAup
zosHtba2V!0n4V-J1+~@?A+r#fC`nbp=TkD4tWD7XS%U%<XJ{y16H-s3I1NTm<)sxw
zU{*oR^Q<fu4@!PkuEja8Dl94@D#GkUI7#B*=@elR#Q-){b=eezlQ@JnBXj~#-YSYB
z095r2mtHN)MMav1U0`Ow#U_-hLglRy6;KG-p}na2y87edB_|-ItEets3Za<BeAV>I
zlUycj$TD9`vuKH`0?77@uxklnEGvyvAJ(u)5kAc!jlmXgmoM)gTq?^Cnf@_{5^c0h
zB3%e@3o%rX4+n9tk7^@9R02}9*Oo;@QW3o)A!;^s9br4=j0Jcd4x{<UnPsdE8}w}n
zB_P5Ka=Wte!oCFm%=V<<2C}eWH?LkyOB?qILSpZWJVzo#+`F_N#c`31Rf8uAO%z8q
zifPC`XIGGk$Y4Gli%1;D6s0N>^3hADU*UttFZgl>X%e2B40nu;tevQ;ce${rs<qK@
zcRx@ca*?rjQB+quL1PMI?O?d4pc8gBPNF!Cl0lpfv++@pO|TTyap-)=z1EV;RO&KP
zETRfU5QKBnG0hzrGKeA~!h!fSPKH&nLt&Q6DiW7ZP&rK^Ya?r8!lI6=*eD`0c{ZcQ
zuj8sJqQXt&Z{VpgQM%+9of$&G1xjXN6>=37h7J`-S5j60WNNOEo?{x3s_I%I0?RGJ
zP)B~g&)arXl+ox;Bs;JLtq?YAn6Y*0P_GM0TjMMnJ!%D!&Bcj^8B0UoSDW7r7g=7x
zEw6Y&%GNU%gxho#;<*z}bk@=;0JF~JHm}*?2L1w1wUVnFbu%0)i+pK+mT*Egq#a_z
zn}Pk4(yR_qr7w}OHu%sHRYjPasb3Y|F3@`l8HI|eJe-)#(bb9!aprlfvZ!ii8EoJR
z%32cji)hQ~SQWgJu6MK~x@%5Cn+jk~+n|bHwCWO7@2iO35E)~jl!aAoMJVMK5g}nc
z5tS>m^dXxH%wH9_s4{;lue^5q)^<Lv<qFePn$uP(`CC+y7m`i0kuU%BvIXm9j4N1+
zPvH$-`!K8h^l-Oa%X5`m3;m9JDcj4^bn?qY7q%5bva&H|ak@^|v1#l&>r8o;22D2V
z-5G1u8>@)hE96PzfD2fDRU0S$)snGdA!vFn!W71-s<3lm{{-TK(73|7F4}1gw6d|6
z?|JF|m3#8Zk+460{+a1<mX^sTpep&~IDlP6l)da6TplEY{ma(?)O)8Tb3!S}ihL4M
zMF0c<3eV2@{oMf(X5%AJ80=kA)i{co8Ezl?BA*^TA9ACD0BMe=b1dTW=@=?ErLZri
z<06|NqOp-Lawyp&%lt47xc-W?A@pizI7ng}5B37xnh3{(9Yi!X7G`<s(VhKE`<Jgh
zfAhwTo6iMFlR6>7!C*+n?CkDUqOA;R0swpGU6H2A-rnwWH*ShZ5;;VSV~YsZQjLoU
z^9v;?s9u0E7+P{_Q-dvRRugoN4Xak+4bj#%l&Z2vq&tUUScCz1zMq}6cxk5Bo!}`a
zDT%&KE2oj}q?@J$p0yu!etfVh3%b%KW?>?0Yy@}Swe=-_VMe~rCmO7w$gSh&Y()!t
zwLzW7y)M3w&Syr<K3tfUp#AB;+Q{{v-9Z~A+Hq-;Mb#3k@((TJ7h7o5z@!VxWqKQy
zA(N`}xJXg2jiWN0Qzvq1=W$eFBxZzgHJ+fsvW6AQ8qRE>MlHlD9j1r9ZDy`kWcx6y
zXAi0%?Lls!Cz{y&ZgRA09Uj#h;ZX`LJ>8b+Fan%+d`0j4jo<5;x|^92o5c(9T+2P4
ze39S=uXaaX%LL(E8Z<K3iOaZzkm)=xW>@vrz)BeMiQp5VhTMvAT#J_=Fp%}18gV)V
zMDc!67PVOfln#4l#v~UM$!NV=pe1}2k;aG5jt`$7A3i4{)<o9EuE>MQg^1B$N7;K<
z>|cFg@6tVoH=jJd`OI+dQm}Xwnt9lm4tANHcSRJZHcGSUILb5cgMsKP%5M`TgQl;<
z`=Y@~jZlKqB}uF*6#2Mbgn2fO;xvj=S4>@zh3p1Q24rj?dGbZBs^VR!uNGOelg4>o
z9FHcK4#XgevWSq05QD`p2<Y8(a(E-Qc;CJEcvrA5BY)X+ETVC22`P%xFbl$36h2AQ
zG)V(H>b0v^Ky^BuFR<3-001BWNkl<ZF!N}f8AC}DAt-x?h&D=lYMywf!ZQ}Yr570s
zo0tE?1?FS>&Sw5BBQj`A(;d=Yjqypge}7?dH70_PC$&9EuPVw+wiEr)V7)a<lb*O9
z$aan0-b1E|6$v~N9Y(#5x1gNv^$NJJvo=}-+Gi^Veunk$fw(oN1rcpp5b@kB!t+-~
zHrN>((7ARWqN}{yYiRzuFyB7J#Y!6B{%7e5gFxp1;xoH*HTP~wPhOg3+A^>Z5r7c6
z4&XtjgE&X1UOl^f9c?l#;5>SIS&HF&_W1&uJ*-pJ%VJ42P(2uIrB)MIu}cP5nDOwH
zb}O~0!y9&Yh5E-u5xUwApWQ%3fe>+VNy0mu<z00<Td!qe<M|m13(HG2Yn|T_7T0Pk
zwyty!xH@5V+XdXW`J#8^-Rx2&#V<McYg256#zA#1nN~M!L2gA@Rg7uW-L9$_6H%yX
zSC-%k*%>E(c|>EQmA{?`nbv0_0-TQDXjwtWFdm`6dZj!`DI%6u(pqGEs+2TZYq2GS
z1a$TtktED{mZ@r1_%uy-hJzv--+uNn02u5Y2(zlsCS%V&O%g<^&DM}wBkWy1CB!sM
zi=t4~!Z8c)A6yoZA{z?}02piHbRf(%(qGtzJicmeV3>%am_|`zOA|_?co-);$49qR
zSjUG57$?I@^a8U31OpUBaTLWxo?BBKk0x3f3`x493c`*>rny(hvC6n<<{s_rUkW9e
zB5MXB6=9PiB72uB8ykfsjR4k?hz^FAh|okas7^+=276bGjk=bHLZ}bkEPx<oSdO-}
z)m7_~LoGo4IyMTZtSPBOM0WoE!n}@=SNCw4d3U0)--3XjRtxNW&Aw_h0;5B7=z1Lh
z*bJ73M1-=kOOr*RrI$3Od!x0nbqyrEV7PysYeq8~hb<ZXsAj!sT(S69T7+9v3AO#d
zxb!~SH)~tb5LfCLbGdmf1K>0Y<QhR`?2HRmAu8N(iC{y8Tz#J6f_bP(XPCJp^K2Y>
z5|EfG<qpR=itEZmnz5UfD02+u3oF@BTB42kXpMxdX}YmNl}0mSZ=y2RDO#c6wQYj8
zxZFf_hLoRKt#z`h^m<^7F(F&F2A<X-z}C8~$RR?CDUm6`8)Xa?7tM9`W@VZ6Z7a@t
z;*;joE!Sk$K7XU^Ld?JosKar^AaCnr*1LPCx8zc>YwB585`b~Nd9g*@ETKko$8#M@
z4~N5it}v`LY5iv)*;WRLK)afJNV0FjY1dI~I|oh&|68euqM+Eu6$b$F)+e<W@+?(7
zXso<>jZ)ehAB&Yc6YH6(U%5W+iA-Ip8%y?+8h~Puu*fqq(cYzNs-m}_x7KhKiin~V
zjcF^eGh;mj4sDc%hdJ-PF9D{Oh!DNY0l-8tiogsDQ5F0PEN-A6SmML#ir6B|o_rCE
z-SB>%SwxJXmcoKyZH$5Bp<G>J3|T`uEAt-8+eQjqqgho&)EElkPmh=;k+n8XcK|e-
zjA4PM<~=hDVosGEA0-15ML}Q(P`0X;1@5~g%dxlU{5sPed?z!O2BPj_Uc%~L1L_eP
zz6VuNY><Ce6GZiXsW3lO=@za1(oqtcKd%pt5_wiPSWxWm;!)Uvmk5{DGV5hIXdW+3
zZk!54w6LU?sGzQujoCWc0O!x@wdIvAf5DB!Qzx|CBy(6}J+IY`AV-!n71Zmkxj3tx
zQq}DSv}?i}L&56?jC2O()h4{O3+C0TjLqDl(jGA||DK(S-Y3B7_CsF@I=F(mbnEgC
zY{zZTYoUt(XwCO=vQpZeqp^M-RD}*oA4@3LXCf65@MW7uT~;C@W1RDeiT5sFRS}ns
z5J{LtScQ#=3`8C2uFW?z7LkNKd*?i7Sw2W2L^OsBfGaXGHjM{d3PMrlroo3~5R}n@
zf(Rp#0R>QIMPx!p#u`fsN(i1sgk$Zv&9O=@;9ANOVPtDT2*ONc$QXrr4o_fKqLT4n
z9i)jhHjdLBRT&>2^*XCn)p=%SfZUKFV-P8d2gb%krX(vCQ1yW%WxixNohbN^NJs<%
z^>PghshMxOq!?R60%5~X+k#Qf4ti4&qRuCtEZZ-Y%4J##bO83x&b9v3Zn*HPR2k>a
zjrRNXu^dzi9CRu$$tvEw^)UP0J0l`c=*>xnZOIF6t~i|hEM2o3t0|p3>zU_0?P2?`
zn=G>+<D$1#_NL>1Q9)hZ>Q37fQLDX!&;aw|!m+|t4uNjIXji-HR0^Cq=_;tXsDNNe
z1`!;X<@+fjmhz!;U6z?XWUyM75{$44m)=Y-nI+AZDw0<Eug<U*0H9JX*Wg)|Rw9as
zBB_WFqN)-hD7D=rtubt8B9zbu4S@Pe{NoJv5MFauqe4{?rOXow_8d}!P!Q{CR&!&m
zL9?GvWl{y)-T_}$*=WCitKPhZhbnfKJ>sS-xlTCK4Kvj)+DEq$kM>++#Gb&#!rtq;
zN1W>E&c8-~w9kBAaZt?ltzoxr+e42hnXe_30_$cz_O0jk2qA)96FoXtU#TBLegZ72
zSr65If@?`OcHoXY**&2r-CV_cG}O^z7ByaizHfpM$k@`X>0}~=5V|fZCSFRf+Q{y5
zCNy%U13IE~W|Bcf??r@*VyvoH?|A?~v&l$RO1c^G)+Ui1SQ|me=T<E|XIb&GEB6-p
zbad-k5zeNql5&VROrp@;!g&@6p*>UNfxOE*HyIr}mQd|MRrhyOL>x~G4%sw@b}Gkd
zUbw<dBWtX|!El$-!T#=!isVJ%9H#?NDG}Bk=q|G|a~xX$@Lp6kPKT;N%*!B&k~oQz
z)cb<HBSK?LQH1_vi0GV%cw;7ru)B9K&8El4qcn+(A@<H|5hp_cu!ay!aBUU&6cI#Z
zP+aZ=mxZ^Pq%gmp`!n5D*f)Kb+QsCkcCg{9qTH@kGMDeL(YtgSZ<Kt0`lDbSz(8-~
zdZ$2O*ic?n2bR~zXodWjZJd7MUEODes8m{oWhsbazUVyrLfHrDVWMP<Okv@K*?2wA
zFVSk~ymy97CqUD;;(67xSl5S7oEZ)hdsLg{iqB?W=^1obdtK4}dEr~>!0D<BtYxig
z4PzG-sWU%=JFz`Y8d}$Nqp+()ceCNOgSaRS);d44$~);4ysT1Bv|DozDtZ^F3{aMe
zEW74>nV*LyLte;0ZzSXNSlK~UY*uG$0P3~VZb?ED!kwDSj(9gQc->Lsrg(>qKejgD
zvO{T^m4;QRAA~LQWuCBV#iAj?jY@B>zSb3l+vO1I$ZSLu?`D}6-AY}oBISA2q4Oze
zw8F@AvSU?5&IqQ}I~t30+galhOcKmTvm6njbF^(D3~K~**K9T$Bk@SaS~EI2eD=x5
z9(d)~7-O^Xk@qh65M4eEbJQ%CaqH&I$#fe2PLpVNkc<wW7iI-T#KB+?VsB)kV2=i>
zQdNEa)-9i9m#$t1q(BY_%Erbvipf}Gqq2m(cOse<w>%d+gUFa@XaACl9NxMS?zVU7
zo-5bx@$AI=-OKkNl86U|Y;s&G^#BNvXVd9)6xNLM>^u)N0>EIH!p-N9(3mor$ho2@
z@=$cXx#OaEV2mk>!}$S>;&iyXH=T@%Y&x0VR@KOwnwvC9hX9&QM<Bw^Eu>0_;w@Gl
z-{|5~ROoCPOpAct%U509xYLc3pu&TRU<{I3Lb0a0fyK5_<KCU9XH#BO*z1Blt}5*E
z_0QfVjTe1o)*=tt;9QzpNZiq)7cuK@bk;3*NnSjleg<l8m<*lpFEkYSh57=X(j|R<
zZ+z}*_)6@=jHPU5zO<@DH8B{aN-_(HDJW=(Qm;XLHEmgw#;lVKfe14`IIW=?4d#Ky
z&FTU!4K8lz)UxiD2ye2gg&#nZ46m84ASJ}UQ^$VI1G6+kv8jXW-LM$9xs7pMt-sS4
zv7ZHLBUE@zk8sCOtesgm5b@$(aM5I)_JC@nDfG?jSzmUYq(rRh46t`KuB+G8UQviO
zMSTZ1ign%XhQTCl3veOUb%|km7Qu!^FyWR?C9TA{RSKA2v$vs&dKgkX0ieF6^)D+~
zZfvX~-WPF_9$dNh<l~R1N*Y^4*t>L1gk7GgO3k0(y<_&_pZj||RJjE6@v(vmJ471n
zUh=N+MOG59wb9UsI2|7XAWcWro0iPZA}rpqcQ#HDG>I*tCP`v!6c2_0kY@}HC=!>A
zo_`hy5h$M=hlx;;C`m=cyBq=I!44UWA```fC{FWy;_~Tm_YxpYMn~Qim#*HUp>z@A
zezN1T@pOFXS@J>*QB~Ggz027*^L^A6(|{CK5oVvHX*w8YlVedS3NNg~K@0${n6Bd#
zV((6Y^sBd3&zHtV<;XPdUqPEoo{CM6!MdJe8;-pQ=)K5S-)KDNmOd#e95*5XSbvN=
zsPN8-q{}drYd=FODmztUV?Y#k3-5e^V3I%|-*`o`wmzMf^?6S8k*UZxgq_PvWH6Zy
zYufVTYlh;JHt)*X;**(!YjhoMusJ<jadFG#lUGrNAue7qcMR>6u0@=777G7XZ@NzT
z?~(?H*^98)s!mxsq1xzC%}@<gMGBz|C<fMPtq^|8h(dxC=^5~u)rghtfE8Q!%t#G<
zLkI*I)T6-TS{BY#(Pq*c2HXZA5r$0?<TnuoqHRPn#(JWFrL3vQ8&f>nz}k#!f`Td%
zg);Od2DHhtwxwmZ>bJUTiNfg*>%N}q>2A1$m;9ut@Us#Ur(_J+d~okr0>1fv;>LZ}
zo&zE5uhXt5JxK}$*nqp7sW|~R8qo2L8rE~@PMt4Ck8`;pi*Tc=3UUTDtXHdDGCLVp
z0g&rHFM@(L+V_mcD$RNoVzh#~LmzImsg{NSYS(1!AZ+FvltI)Ia|D3G&KH>>Bs8iZ
zEh&X@vQxMspH7oBO_G#l!Ym6&z=6G!77qXd60{>^VQqx)KwbP+RXjUpM{L7ehH#w-
zXOklpHP!&Y3?ikfASxUR0jdhSqISs!p6)14$runpK*Ca0^o<Nv6;V`nxdz?PT4N(Z
zM8fGb(~1cPW)*+5vW@D}^I8{KwAK)bjbdiW^Bh1UOLd5JfuF+%HRJ>d1@#i`BVN!-
zQcI_jBMJsmpc7bx95Vhl21)h5VCXp-bCP$j7(C`Rs`~g^6s1F=`m9^|l-W#)2Zq{1
zqkYHjVgr5Is5bi<*3yZOM_pXmw58H*$>pfZAkE;zx>wl#onEOZ09Wi$3&$1_kW2?7
zzx>Q!;TjDof^`-6@?0n_Pi&Rao_mco1b07f^z3R_ub8nKoIpfmRA%Is^JS^EB~y60
zQnP8<<z_|irDju~R0F_9&BAb;_0V2xi{vBVpu6|i$~#5K>|K#rgP|x>bHWiRN{5B#
ztnl%`#OcsG&)(reSCVT6^Q+}PzbiEq(F;0<2nPT@d&edU!H6ITRX7_T0e~?i(jrj{
zrGA5uYG*fSkximFjp9K~PlIGaB#A|w=Ma4i9u@Bj5f1=1vZkZ}#pBULM8a_yS))3m
z*hR!ZWm9FZmcqdr0)y7ZsxB`)0>sv+21unWaE<1OhHP}=J)t7K*%Q4WdObyc!711U
zsrLm#;Y<UGp6pyEQ->$!9A~}d?91+yg_Ji$oeQ%HlZk3>_CEb}V?n6fo1hC2geQ$j
z_41AexDJv*Lra#fBAP&qwH&0sU~TjW!kK>FtP<BdO&x6GX`!I!E(e#I_)E)DpMmGI
zgQwoK6t(si+rtfhq1u{64Mt-bg`eZYt037kFC{M0`&+qATA3YHCQP?+%Y`}vA=K3i
zYi7|vQO3-=?pq_Zc;jG}ZrziY(ctrG2f6F~m!R{CXhr@mz5cPFw1li5!jdYs2Hh`M
zTe!&W_<~BZSy0&>5EK+wF@((DM`vU-+D}g0sMFaQbZt4|PjHs>8$Wu{lcuUK*wuo#
z&WdU=3N+WooUPEjt%Y`p=LQB-Riz!bY?Mph9u)Lq26;UIa?^a=_AIZ0Hm~w3%-wD+
z+-T2P!M?O_Oq3)$flah1iV#B<4gNih(}6)4BsNV4@o;xK9rr5QL>3y^@ZJ@!$c?dN
zXgnH;2y>aBfkaW1hBh`%5b=0Y{FR^kC%tE28pl^J?Y#EY4}8nl-234Dmm_Obq&Kyl
z*&$-61u@vURF)eK))=C(ac{X?3}pX}uzV1KX>3J=SwwZ3yUKY$*RJkqmgTt%kw#zS
z-WQ1YJAd%m(IgkquX*tL8@}qk-C>MGHcAP}<x}WYoE69zRcTh9t9*u9aloGUC9NO=
zZfU_6i*}f-Kq)Aat@F{E_mPme(bq$+YK!$-;YD_0>J(uQe5z4}1`Yi>jpx<P&ZNvY
zmQ^mn(4f<ern*K%7k550%L-F(8Sq2%uJ}|XW3dKlun+MF2$ePG;1f*@X8pG|$6uGo
z=NIUO=b++UJhU01RquXg-v!#d;Ia?s23(cbUbaDOWL5PP!C2E#qYBf!`0_Kwm!G-y
zo)3QJFMi(}zyI66x<?UT<OL{uf_1@)1|SmpC>>^<(#Gk~#OYx3mpbeJJOA*rw~nR&
z;91`In)^i+8_()bF~f^ocX!Jc?AEYstMexrz!#YWUeN1h!2yd<QOkGQ*d=mRyaRAu
zHEOnd&uS%g0GrCbu8bI@cULbcYb=-!hG9whZ(*<O$wuoGI6ft8v&$jZK>oJIc7ak{
zGe@^fa}#ZSCkuO*XT$x=h<JQ>i<v{6_r3jnRT&@Mj0eN(_q`;WjGle$A!*Qph7$I{
z_HsprM7#Ufvgv4ie3YcabTBM|4Uth*SD|HyOuDlV0KUjnw3v?9sc^|6zxwWvrLld>
zH@p&211(&f3;{9E#>(E9xGpH@UBT?UD}sMC@PM-`0(&<ix_ny09E)tsjWh@6a$yH5
zh`4`nV6DAz;|3ry3yVDc%(LNmW|mpul!jPyo^vM$`}+u*O^@Tj?h=}zCCd9Ehw7U4
zM9uya{%+oFk*T-R7Cfb;vg9YdHcG<?+YaHt5=&_Q(VfOMsqCgBbIQhRu8LC{sVl#_
zKpSx@=UeX*3J!)10rhxZwvlR|k-E%~>aPRd5C6o9N$4W9Lc|RU&LQ?0i}S|%HVncB
zsuk*reKoor8#Wvw&e1)TCE){vpixJ#cjX{plcKr?Nz@I#`^{hX=fC%x*cGahW%-lO
z-Tt>9`s_oGJ{P|If8YCwZ+`7d)5Kzxsa6H|bl%eHvL%;j`L1C)3sz#AB789pB&5h}
zt8&eY*NfMS*F{}+O*QcRu6gHgLyRpk8iYN}Mb2OmQP4Stl({E*hZ~GWAHTNCGXStr
zT;eEZplNNAZU<yShvlGO4iW}xmC5L~f+9*}DM|(+?28Okjfp|gyTaILxOe6F_;4~A
z$8mxP%pL)<EK`NtIRy0n*-*f}$g`rzBWsN@-gE6)JsM?XiaaY2F^=Ov=k4;DzBY*A
zo?Sp1AYhi6mtGrw%h%rb_x{E2fBf@L0l;XIf8dWF{_byn_0G=D@BRCS|Ic6l0{}SK
z9sI+e{fi&_++)A-zE3{(%<Z4~3*YgUH@^WLsp!WZdg6T_{lXU?zi~Xt<H%guAHL@0
z*WUcvm)&#y8W|g>!+^#1#q^11ZvN)`KmDmMK7BOFFYOK9^7XI$^WXKl|KXS4`Kd2H
z4FKQz`j`LJw|xsDq!ouavp+n%9Yyp%{nPh-=8<RX{=erVUwF?)zVOD^-2Y$y)c2%=
zU1MyK=kNU8kG%hbfAa8SPaTh@!$I=W`>%b+H@@zNfAB3kgLI3E{Gw)^pRBYhPGELy
z<tMULTC!lotof8hkKT0XUZ|Id+&P_D)5EcuAiT4#C5vqN`s*)dcHv7_w>}!pI_yoe
zrsuavs%!K?Yxfk-JFT!LzN^6F&;*7CoTG?_0!g5?>~C<bwLnG^P=xG>0-95rn9f?X
z6ChwIp#ktmzWWV95CXu*9(wAn-}tJ|;C%GckN<D)cz^l0s><lE{Ogar>)(BLrbBoh
zPm9N&x&7XceBsBx|M*A#^fw_<uoFN1@Y6s4%l}{D%Ff@sJ^s!2fAWzhpPw6BBr0Qn
ztiUYR;=-9%MWn;=^zHxa|NhXIzFdEEG@5++^N)S{^N;=dyMF%{{`Oyg^@9(*sFk1P
ziJ~tK!i(23L8z*C!iu>NGqeE(Ek7V*OLTlFN;k)Crd1vJi%pWQ^xP6p+A2gI;Qv}y
zeh1+-C9yC&=Z1Ti5HXt^i+81P(yDS3Vz5wIb77B&Sy2$;a5yy9I_Ho~GTcJ|)WCIw
z!d`^Q7$maRs;V(o6^xCLFtQOKghHkYn(=h@f;LKr`(=gq!Csh@*B)Fs*c%)kPXXY|
z&mCUAdfghTL#=t?f9co%usNO6$>@`x|8i3b?(HPrOP&AutMB^gx4q%z_gxo2m}bQ<
z{K~s)DOg`0d+13+*cf?4MCL$js>YasjS%%)-|+GW@4x)MKl)-`cmR0C16RKG!Rz;5
z+jCy5m7o9R-+bsxPxcP`^S6)R{`0@|fBnMWI@sH32vB{|<NCrDfh&RDxL!bRE4<!!
z<9gFRVDi=k;YBT-ixGtLP*7t*8$|&DppEMcwGj-)7n{+CGlviN`I;JqnAe<41Qv0H
zONV<%lugDg73u&K%BqTG5<Ghs1Yw>Rh`6(N5XDJkrzVOAyO#i<$VP|;5ZM*p<wORN
zjJ2Q|QitMn7{ClLBU3fweAZWE;$*lN{!WLxqQc&T!prWzc6j_a08FMuvU3oT)B*gg
za8ST7jo<LqFB`^qWq&vwkKX&?&y^x@n7sWbzU%tsoivI5@Z*pE<KOylFj7DH`6u=V
z765+x4?c4=Ds#bJ^WeQd{{7#)H;g~_*+>7MfAc4SgQn~l5dd&iqA!kZlqBr(?|buW
zrkVTTCm#!f@M|Bu{-fXbCeQ3Wzwe`;|Lnu16nx!RKlnHP^4nhVl6#+f{_vmt+PmKW
z!H)yLt;6Gg^sB$~H~;Dnx0Ri3)e3)65Z;O1S_$+v>t&KJU<^3Hk+PcN<4&I0Q%<yf
zajVQLM@`QbcB&=R3e;Tw%_2AEqFL;Mx0lGMB`s%2sYOMxH=w%=Rb;8Ir_gZ0HyokC
zFfzsxsA5GwB&wu!c59tl)1rWZDxp(^1I1na6@tuB+Ll(A2&)9bIUOdmI---wbbn}@
zbS*Et@ABV$`(N5k%<<t36;Yro2g7fE?aKh*4X?iMrT1QPo(-ATzVhDsC*!OjV-Voq
zef+WT$?h=uxxe-UX=GL9{wsq)V*k-^et1rAgBjPTlof;9sll_M`!^pdP0~Rc|DC_}
zQ+vBZKz!-_*M9Cl`%4c$_S9ofJ_i8r{=Gl`nV)=Hl0=R9yWmhg;E5K}oqpkp-M{Y7
z^>l~KT5WKH{%mE!^$dpeE^&?CA^kXg7<MaZKAp^(MYzs+{I7{p6)$U)PYa8Vj8$E0
z@cZBst$P_8H`(KAlaa_QEv4NZJwlD+C?DNcfN7Q&&S&EzK(sbe)jS)A>`P{4mV>MJ
z?Cf7IrlX4C46-aU&arohX0Us}?6}B-+2?)E-dP&~V6e8wM>ma$lHnczYOn~&NCPOX
zs=^#f433K&stDzHGO61X<J)70#dP+`k9_YpT-qDvSvDGHMCN6$eC1#Nv3p%H1;DIu
z4?p(w6VKjy_V)Dm|M&~_PogNfeC@tzRy=v5EI0V(*FT7yO`S3eB7WQJU;fX3=Z~|Z
ziM59)G9v1|uy?umC{E%i^}eoA44x%(9s!EnKm6qz;lsCn>l^oWhh!`g1%kRC{O&jZ
z!*~2P0OW=H+#^qX!|T544pFvix{OU1(w!~_msY4>S@PmMM?=oHK4q8UW9@5Mah?|i
z;aAo*t9OnYv|n4iuRsmYu<9+w@CJ~4J+)5D$Rf^e+6#Es5IgLcjGcyU@I<9@HmX5X
zMd?5nzhJ27)~r!~IGR?zQ`#A(!Y#6rSHARmgAO8ihV?_A_|k8^?_&==`iw3FLCEum
zqx#ziuI<kX7OEP=s|PzzJlCwsi#0h{0|zqaoKXOT!%<d${=mIg%YmqVUw#4r0MFjI
zeJ8DFY#FB8s>yzb8;h$d?R_PU##fj{c$yN-J=V!$pm)=(ISVD?1Ub!H!-}ZRs0L2(
z>m`f<BH8$;JZa|`11dGPP?e668u+EwWDE$sNQQfRm+vKGRTak*EsD$cyv(^gA0Mem
zQFv=@6h(ubVVn-9qr>OE{E)RVA|-=eW9@J_M5GW(EV6NPx)IRY*w_dFoXb?$n1qb6
zHc|jLnc65daZEO9Ef?<s5%$i(brEKlAC0poo-GB^{nz%DizrH>bT~8bkhAe2vmYdu
zh}gS-_1=&E<KOuGy1_kH_Fnz6Yj6Cj2Y%^a{z0_{$mdy}&GK|2YvW|c7+VKo<ER`%
zL+CssVidJjZ=PjiKi=KjuUB;v+r6D+Jk6UmH;gf+ddKhwEna@}Nb|G4*cbDM+E$8y
z*X|W)RPGEB=u_6(Ji#e(%A)gI8jTmuCE`Ku`nTAwMYz;<X@2!$Ivlk5eikzZ;Bv-*
zrlLCk*;=^!%7m&3vg^QJ&DMxGD@9o4)K*3PW<~oDb?wUTx>~Em3YcHL-UmMVxmwqG
z{j2T+z#eN9XXbWZ_;>uyhr-{ldD*r9{3pKW{(G*ncjIYZ3&K!|ad$W)GkW^wF*Jjk
zsy7cOGaGL<8zBU$4X*GOrX?t5`#Xc0)a{9<Z+2es$!DLh|Gs|p;0{=j=eF$Y|HlOj
z@<qVIi`U&M2$wtA8)dx~m+V4ZuiE=rX*Y5{lmadI|A`p`RzAghK)=$C21G&%)rhk3
zZ4n8|yUVAp$j75&5t$ZlHy#Z4FL%x;EvxYf2BS4j0DxT&z4CN2hEVN~B4Z;gp9t2*
zsPyq+001BWNkl<Zs*+ERWsa1Yj3EHWKsdiL)1zBR^z_Zquf6-D^;h5e`j^98`5_Un
z>^=Le@I?6JBTr-%QsRfd=Z#nP;%stgqx8v!pOcIwW3OJ`uYnmK`ox$1lRx+7*o4A|
z{K+poc{DD~{Sf9<)ycH5mg0DswM~R+5)IS%6%Snf(i1lT;CDaxC;#bRe%tQOpdR~o
zzW*bo85-HwzUIMGdN?*T(ApL1*XMZXE36m{yQ(bW@?ZOwy3pZ*M-(m)agGLgbCFBt
zV(|dY(Kzv$CUdd>UIV(G6hy3@K%ole+QW6Orum(AZT-!4@qgB8dEwd4=huVYLNN7*
zYks?;nv5>{NmYm)8t{CTuzRbTL!w&ZD8k`B2R715l4I=?=(X-b#X*_*16rJC-C@6d
zJpICB&wlao8()0<xsQMT%fI&SkN!8m_%Dwuf%Mu}-uqQAyVlVmW|LRFmT$lwf>kFX
z<7x4Kzw;yW2JxF;|Elos=Z_}8_>T8J`}}d?{6|0e=r6wGz4L}^pvYNZ$^Zalxv!by
z{`9whUHEW3&HnZ;{L?Qz{<Nq*bK}<E{RjWzOOHPtzWToZ;2YCMLhO02_bNeG*Z;w(
zpSWUEY-taE1=*C^|IRO3)oWXXOEfs73t{8bW|!(p(-$cAv~l3xQJB+3)f<A5hwWzb
zJ#SINsIqsy$c&9i6)^{ZWVlB*_uet{B)cWTE}tS<6GfuREOBg+DBOBF&26MnI#|?I
zV@%x*6#-R7SL(c>=1^naKk!Enec+EC>b=$OF!|{pdUKVc(pnp2B2Y!dB({k7^85D<
zQK+}|EC2c<pZLO4Eb{4xpP6Jc)6;vWB7pEi-~08y`_az^K>de5`RIo~`DoKiQPpIW
zG)+qdUs=VM_3aUjA?J!gT!sLD?_*zj^2X8EJb2HK{+Vxh>o>gOJs<kq7axBX06zAq
zFZ|To|Ci1i?e7kM`p16o+>8_~%PY#Zm!d4%O)9+EL86=g1On_*!)$^AfGA+VV%Bij
zkT+T?Eg=>VfaGmbqi*9$&rwxSDOcU9fJ3|Rx-988hE%KikXf8R5yp90ZB?z#Puz@D
zYvG+&o02mz5o&$kT`EM8O+>t1wjcDOYN7F5FYs)Rg>^A@diMyzk{}-%sK-@;u*CMU
z_eGZO9+X*~s_|ftOeEfU@8H%gW?y8JC>hu&5>a76V=EgGCt02@jWbzmn^TO4z}N(S
ztTP?=T-p1ZKk?S<S9U3|y-@3@Dl<?B<Jcl#I*8x)-EaJj_k0WhoaYaH^3gCVZ+q+O
zfA8NveCuce0M8$eR2dZSyR!E;e(bG({~hn+cG2>$d*!{;+&}W<&2XNjX^Mz8PF<em
z*>SLzjX`UvD2lIp<vk(4)Or5wBhMyrY;9Cz<DdO&f9~gh`FCpjuX!Ep?flRG?N495
zynj9mX49JNo7`F#f61^h1?i?gK{QrX>K_JH2{HhHA{AjTB2iTNN?3&v4YU)=dKx#x
zvnnH*)m#T%SH+T&9aPnAt_Yu(IO^6gm&^O;HfM0@52<<hz+J^=rz-jMh+Tdc!6(kI
zeEi*V)ma$Z5YJ_i1*zcSWJsBtycJjm66(?tCDKep5X%HeVGgMLwf0q@Os(9Ri;ieS
z*xwo4dv*Uizy4K!>YKhQj;JopS~+rCj=oTfR}mE8$N$4`x_&Tt_Xj`s#IuKSWM1`>
ztAF+_uY1#L9(d%*n?Vr1>kmKkXTR%B_gvWnfNy)lE3W^{5B#eSeC9J>dU`x9u3p;t
z_BTBEAHC(ZKl=~f8SWlgqbdL-A_@vfM8UO)!7lvK?|aiAO+NCe$8Ovnd6p7t0&w|Y
z=a>J^fAP-uf8=*R{P8b7`qXGVP1E?L_g(*vZ+h*I{J>l4sNq>`^v3?!&?xI~uWPv7
zaP@uW*b`>ng0l1@Zu*+40xH_5`lx-ZybHoKn;tv5;AJ=4adUH2e}boQ`Qp+UJpUv5
zZa7Q-?LYe;*J($_+?gWBG;{9HK+^QqS0j3XM3w9MYDDJdQx6|K|CILvfWw_#V~mNC
z5PN6#PdxtE{=vbe%U3`Fkn-tKJ{=ABt^nZp=(hI-5vg{K)Fn0o5yf!~09lr?XyLpy
z6j|e0oaamXyNFm6g{q9Fg)x*w77>GIvfl3FX*S97VHy)+9LHf^JoE8rLPS@uTy{l~
zWz%#pOwvK9sZ@GmnN>O6xm4N1>hfu@Zk@}$E21bh)+#{Z{9pO+{#jsI`=LMey1($f
zZzx$tZ5%}j5*cF;4-bz=ql3MHA+k||Xo`Fkf|NnjA6&ct`b%G}=T6?=i-=ffT`Wmw
zD>nk?izFqItqrD`b=7wHbnYLPjg4YNbVW`?>+kCsBBGQiI4{vd$;`7DVKPxIc!b^h
zCriuL++f49%F?MR@2uhrH0Ja<M=$J4RYuQ0?e8j!aDlO~-LiZyUS$BOQ;EKzy*6t9
z;S8&Q^Y)xpg0ZdO>)Z{?2X?H5E^}P1CfDa(5VSLIjMltoO+BW8KdB!)1Krop`FsET
zeUCl;eDJpZmp}QIm)w&gqKN+bdp=fkjlSw7S1UM28CODWc%HRc+7N3aM?&RZy^yKI
z(=3A%-5FaLiQWc_@j|D{+3x=#-qky?J&d^aoYpl#UpyX{yVT0@><YqW5^Xd6SLTZ9
zb%3!KV>qgEJLi78Q2j+I>>JhH?)~{GK^jX8)A=IWiyGH&p{gQmY@81Ef^r>deZ}dH
zh%d4!Gb5rfyCNrJjg65^6sONT{gf(Py>@*sj>Ccpz=?p40K|B(lMHsU(NR7f85;qh
ziDDv?jSmB@8mOi_JX?EYCZnT#GDbu|+Pidx$nLWvGA4=vz&jT#3hy#kWY@0WJJ`E4
zJw8+wL{tT1t#<_rtH|-;Z7*6lo@9mUVG<ilq>VY6PG>m!`>qT>_=zutzyGVh|J$#4
z;7S_Xr*0h8Ai{gE?7rzW_cx3!&)yjm8yf{G_Ba_3(R4Cl_VwTs(ZS`b>2UW<&m$4u
zs<}DiA)7};^cs0>bJ8oclKy>>FVA-i!^OU={h_M94}o(E%eZT+*=RdCx*J%59ZQ6l
zzo4@BA`->PN$-p*tiTO3-3sTc4lc7c1;<%RsD>C4UaNji>nFl1LzRdDD#oGc(1|U=
zd0_0Fp?|#y)jyrwpP6hSXxPX<MGUnFDI}^iGQ`@bg=Szz8%6IM#%2@p(M(>&Muu)(
z89pRt(#&?8smWzH5SonOsHJkIb&E<ZXt`>e&jo-V{LZia{Np!1_3$$Q;90)#_>Jb!
zTs_!%`%iwCX_q1?mp?YM=4KtMt<7_&;);NGuG+s|6@_!Q1nT(uooo)4OoUtLXFn0+
z-C#fC8MLfU3M9nR&twCoR*k#tsZ6v;?P~*LE9vdK3+{aNi@Df_o@o$qQ&V#N1}C!-
zYjM@Kl4(ifiW?M-iENZiT@ETWvM?BVq3F_dI?eOk8nVWugJCk*yQi!a$n0_?Qx$Zq
zQ?c>Zji)EmX=I2HtTl*eqa^5V!p!+J#M`WmY@E7c>WV}50)Qf31euQjbg+B5URuIl
zL6sQ*jEUI0>G;SOS)C%0Pew?zcW|Y24XKK7k!N|H4TrmNl9oP7DFJIl#wIDKdYAwA
zKl2}d?6Z%)|Bt@#=#w{Z9v*wo!!&;2`u;b+_Q5~%ov%aAYPsn>M^O}~3434UlX}%5
zVmcUvUFN+%9*q!b$WHkzc)66l-wF>)fMa(+-}7*65eK^2vzYz1*14{s<2M^G@wfzw
zvy-l)pm@GDKQK`0tFZ6Gil_nrclx=8j5mGYeHE{;+O$&P>ipLb{tOtQ>M%d2P+CI_
zt?SzDGBd29J5EQ3B0k_~EWm0=%wn0khSa?X%jQMn?qvFBAi-|ra^h@9hO7i;1T7&_
zNTFh_FKhqyB;zrQD+-D&5UHX9hPuIMs0kP?18XIHn+7EqQ5&Jk#>_UMETu^}%hFL5
zR3xH0poj>;hD9PWrfi6TH(ZIxkWm0)52)Yx+6UkKrmwbfGC97LPe;e&8~_gX_oB$=
z+&PpHkSe%X2ggzh#hH10XRmf$^JCroaa+o#*Nq`@o3{zE=W{$f0^NM5MYeDbwz+!r
z1kJSC+Ap-j94ohfun4;l$P(ST;FpbP0TP{KwX9Pq7p*?urGlzk$w8MlXf~Vws=u+Y
zuty}M64k`)gt?Z2agwBI8by(fVpLFJ(K;oB!Z?@pD~Loyg$X51B11%kMd1~|c?E!j
zgUcd7WE7OW17C#WGERm?o^fSAArd06_kax~ev_+D1iTNw752fx3;hot5*e~qv)r>3
zd9EVH8mI!>ga&N+e!j>d)IL-Zk>Kzc3{n6P=0c>@iODJiiX35IXoWU0gv?$A8{13=
zgOre>WMHCrxq-5_nyd|1^Onzu)=|(0#|~S*fj6(+FpLdAXJAJNLPfW?{+qaneg|y3
z@m;X1Rb@*SbE*01He*A9nqY?0-SEyAPuLb#U>|}L!&W8(pmDlOWV*~Up~WHr*7TY#
zX?90l4R}79yHgO(XV$DK2p9Q?7D!DI_JpLMB3?wqJCPZ#IgaD~{R11PQ8LKJN5yok
z^?mUFXYakE?l_J+(W>sAnVY_d97q66V9ul@Qh}DJoTXz~vV!Hc*0xr**U$Eo9M`+6
zwY~C_?Df;JpVyWwhhs^USILq|1xh4M5+K0<Mi3-&1`)n=)68^t)%&Ao=FUxD1_)5R
zhv)Fa+`0G8^mKPs{i^EsLnfPc$D>r9C1Z7r0D<pN2W&KBVg@ioG(5T#fl&xxX13Ol
zHQEn~exYQH0f=*;E|S%N=w@xlv}UsD=FOH2TPq8dq@^smFr~bJv9663QD}7(6kIu|
zVJ0d4M2(c$=+qDrk+s$uW+)a4h!{2-)>zM%fGCy6%p^5HOUD2agg~;I^V_iyrD73<
z@PeXJ{xr>=vo(ZFr!?KzwiR&Cc_<Tam^*iK0TR;$s&gbxwJ*4cC(rvMi?BN_7&A|t
z-BUoU>Zl1se?g%cM)OSAY?0aay*v~`fC@?jQUz+>v+^Z4@yxfME!PNVc{1l)4_v!C
zk#%LR3A;8CrKKpx$E*M8kG`CJ<^ylO{++MBEc3=N0XLJ95fms0*s;O1C`of=FU&-i
zn3?<8hE9F(N1r+HnSZ#`{r#C=ee0U#1HkmalY9T{pAv%5|K~T~xAFXQ9Q%dCe$#Ru
zXz|dc7s-rCFMfK1?qBF4K12YtWb?$F-`ljk85?V9{i@;XFFnT{-178+|M#nj_S2vI
z=XYJcad5tTX1s_H(JUI(XN3&57v?Y^fDm2UGP6#$^|S0*tISKUnIm1Cr3bu#X_NmU
zo*m-HX9OhJyV?lzejJfebD~9m0d*nH-q)$<zMt_sg;crB_N<DJnZd-d^W%h&0J2e=
zwANPZO#mnt17zE*O-esBQIm)O@xI4)=jYh{kL`Z<Yp-^NHbN*FcyScPaio+G0xKmS
z0E{7P$qNcb$5B{ka-}hB3=uVS+-!y>)+US%A`TA)j+hN|1^q<U>R!ruOaK^1jeM=V
z(P3B}2OAfHq-H9P<7|Z&iXI?Z9Wj7ZzR_B1YeF4s8~92|p>-V*%L7A7c}7RZnDOyR
z04S#4cKfDh9Yf9QZn)sOOV8<E_a+J(Q)7stG&o9gsgPRSjtFKpaa~AXDu3G5O*6(Q
zC=|8=at$DYLWS6JS|}%k6tgXnLn71ti-_oI+!nWq;%v8q%JYeAhr&<4oQTn}kWwyq
z$7V8FPCjYXw{e;U@84^|o$`|})UfrPifK`KZQ?ip|3v9-@Qd({n0p>fD>!(zcby8Z
zcP}tzN(xd^lr~dI{P&03c(L~%8QXtkEWa8VTJB^bVv$^1+U|>eo=&P@-(#ImXG^-@
zYf~tMc2+j0DA>KNWD#p7G|2NQ6v>6g^FZoOfj5matd2SJfwun7Jg?!&luvqmobyx(
z^ZW8yeX1u1TR;7rekV`!%{)6zo*5P_w~&&TqU1&JDl+62PiHyo3-XduogxVLG*hgl
z;a%sREu})l4zF1ViBirLQ*wwo07g;dHaH?$zIq)BT)D1djXtzzyAZ-!El2^NG10Dl
zM-Lnw>-e6#AA05kZ@i{Z8te#Yn7K4CiikRDk~Q^-<J{`6W2Kbm`O@>1@=?@O6grS@
za&pRAyJGn=W-@UIh<;EcCmf&1>9t;-7x+P0D({Mo-lu*(VPadgbPxcvv5hbeJS7lT
zoO`|ya_sqoQP}VcWk8V1XC@OT&Gnv=z9+5aNE=TnM4+@D$5U$A(k1RR9qTA+_8jMp
z>z4iIhhFXeUb$pYc|JH1j28~*Lqsna=(mSD03ewNb8z9AtaN)fqC`2XD6pfE-049I
z=_kPlQ(Fw=2Ph;8#pI~P=5otY36$2x(+@ieg+el!q*nw{2-T@ihrn#vn%*a)AQSce
z<{7xTTW$5NlM$%zHS;W^ZA4Kh4d%o2bhH;vBY;8%XSH2G#M=1L#?+WsC}*?%C8+a7
z8T!tB!*#hHY;(q4Z&eP@Yhx0<|M7%}r4V@Mty#Kl_YnZt{N(-*yz$yr;0Oo+-@Wgd
zul?|G09d(n=r4Zjy_+82bH}FbhmK7Mfft^;?5#I%yzKndS%CPRd!G904;}@8<s+5<
z{>yK8_?biZ-?r)C^Akddi`FfF?;CEobi>N&Z~d7)M?RM(4*%rW-g*AorI18<5XI)U
zf7`U_u^oqwp47$;4U{&nU-_n2Uw!q(=XQL_<2#Pr``GTihsUdpDDc&i;mT#_ue#;B
z3pcDu4B@B0@V#gDJfD5!M-T1%(L+10yl~a0e(sj%_8<R?uOvCbPk;PPqobpc=HINP
zJMP|c*XGA|?K@JfHA<zz+LcRhy6&>~y!n;oVv9!g2lqbmN1y*^_xF##{Fw)~ZvX0c
z?%uuss5a)@)yv-S>g(S9hMPLPvB$RU`sVjHZQHSLvf8MWi_4Y_U4Qw7Z@=~BE0>L&
zN<@U`em?i215N1adY?bN;%4tymou7&nHNhdD#ct3+Hn<Ka-La6HT!4xH_yOxkQ<Hc
zWbU|Tp6?#Oonbo9Nay{N6B3G4KOlLEFB!u5ycS5YHs_z~qfJjb0szsT^&zq_$J~+-
z0+ncn(b#0Q;QK;gd0<E?FK$#BpfNSZOo&1%KPVJk^(La&^u%8G@#`*Kcjbj^oFP0p
zQQx}#;1w6FN|8hcXbI#p)0e)z>3f^Ex3=$R4?Xtmq4)gM<?nd)W%WkW5{Ge=t>pjn
zqbKj&vLicr>-Ga%w;y=ltyjJCmdg-31+|ID8V!i~NK{JC3ko9Ez;N_r^?!Zkz7rGm
z?A?<SwM~!h-1OMaTVH<Ze|+~V($T<w{@&IfJkUaYO*5`H$Mzo?yW_s6Kk&xu-gE0U
z{Zf6_QlqJ($aFkDcS#ddwNL)>-#okfVD{EjwZ5%d-?n4lH@<i8XMgXP&R@668q?wO
zf9FRJ{`nWbk^OVW-orcg9)9%6o&V#velDA1|M2x6{=?Vr%+8sZs!dGQcI-LyFSp<O
z$zOc$t*^Rn#>lQ;LwzT6Ra(kBP579Xu+OR))AoGq6O<qTh~5AdCg0O7PQ)OjV(6#C
zj%io;%z!bX%0;x;4aopVa956)$u@D)bHd6m_1g&g;+&nM(Jrf*yTN$}J^&Kf@4nZU
zHgGo<CJxhwi{hp6IBSBue){r#J<Zww2M9pK)+Q}tBJDkABC<(2gKNEU``XjH4v(cI
zoHt!{{*6~`5b2tK;HiC-<O4gET2GAE@>Vc=edDgDwmy5vwJl_yI62kGTfyx0wL2ew
z<e7tgk|hl7X+K0j6bKk=`}y1M&s)L#>&^$Z-JRw;x9>Tgw}OM^AS;alfUo}Gkz-?3
z0J!O@4R5*m;)0*-Qx}}O{0%SPc-_To`aBaRqTl_~zsp;}{A+BY`kVjbe@|BH-C3f~
z|HHSTt0rRe)@L4k>{<8smdBsXtl(g!bj8N?>((q!Ot`h5`{FmpCu{Qx>$vm1S$4;_
zwe<Bk*6Y6+-|F>lD_uR;@0|Yo``F8jD-QEN4f!LT|IK2Adi`kI4bJnw{57`@zGMa4
z-H|kIelbUc!~_iD1>%sM6C>1ueu!+>PjTLnpT(sTSsMhw(9n=0G1oe>RtppfBR8?J
z#8G4{`M&S_{ynML2z<5i+$Dm|#T!;^+kF%Owmy5fP#SbCf@Cd|$q0@uv8Ut*-gNCX
zmu_e_<L}(_*yc2>{Pw>;bHf$q8ErD5C2}Xf`TC324qFy?KD7JZN0P1on|E(})s0sQ
zA-%$6b{Aey2#N!Z+LX?f)kRU*Y}B-l?|XdD^J9rUxaQ(>KK!;D2TH+~C-;2mUmrA<
z0N{@MpMKe8YXRV%t-IZ6l~VA@58tw8`JhsA)8l*p_ctDJw&3Yqhi<xZ!!6gHN7inB
za(@^b0Jvnsiuc`m6*I?ioZoGPkVZ#D_Kv%^JpEj9vzKpN|7#z8_qw$!j*m@#@vC>-
zwfQjs7@w?u;j4H2U%&944);__@!KE&nOEO%c@*ov`O59z`O$;!_#;p5c=<IK1Hc`3
zKje;VSi9n{KK&~}-~+(sN1yq<&;C6CM6tf_;iupJx|hu~6?-+CVw*H~T3?Vd8(_bt
z>6{9D&LGW_f`ey<TSV6ZaSAI)5av2`vx?VF={27*uYTJvgH!5EiH!x$sXB~vyj1g!
zD}?g0zWEokAxuW<g)oGt%?d&nziaC!<m?S06WJgL28V_w$4(Mi2O1Pg13*AT#H5Wi
zmcl45GcognPbPc%RTr)@It-ikmDgV63}L+)Z`(h1!xbCYTB~EDBj0O9R3CoZ%is8l
zjpd;wWbH-kSNz6j|HT!W?mc|68N*Py5ENP}wI6xMO>cY6Rkg_zeo(yr+A9zK_b=@^
zcnkpc96Hf3a@mp*ztGCkDZl8KDibG<nOysXj>51}H^x4^EeXXcMgN!Hbwl7w0CUq7
z=RCLX`FkGS4FLO&jMwVTa?u|dDBf_{Ib`YL^~;wImz+@I#T%CA@XUseqmF3G8tvp2
zO?!2_5Yp(Fto`;6H@hRnLhvV_`q*Hl1OVr(TJ~Rl{lmNVAKriH7yx|#o`*m2k#`n?
zwi)~Wx83sES6l@EO39CZ=xul0{jjkX08WfgCDCLW@YS2q^Cu_IUA+tdUUBUuzy2TI
zt+fGw^=ntmY+A7AVeDstn5o|^#y-K&EGal<<T~!|)P4cUJ?8z>XA2?8f`>=+^Dc-@
zCb%}&a0P+w0t}%me-Kh-Gx#SYM>sF#=obN++6RtlozU3_ExPP^i`X**p&s70uMsBI
zZZEs+TnD3Gf9bh@o0b~f_2APtT(%B!ogCShyym(K^PukQZru2#ZzmRF@8J_yoWCMZ
zCHk7{FJz*mF`wv-ue|cFznWlxyZ0YmGBQB9B10x(YaPvK`$`lHbl}*8J8;?gD~rWK
zB4v)^gKxS1r(b^!F;}Z~&sS2a_rK{{DX<YnleKX7p|RuRwG)$#El=&AVS-G<pa$HG
z;^%f9aR0pJ6<0Ycm{>~0x4rh|fAvrQ>Y}%2cJ9CCvJ3JbfB7{RXN}B-z#kr}oEV$T
zTio?)S3J3W4*(oHIq}io`s_KYmR)`6d6!?b{-$d$Svop2$7O;GSSQnbd>Xy`7n3!3
z33#04n&=oVJS_vxZkHg=bOT${@5OHjyQRoxjMYv<6X<NzCl=DA!DMZF1%Xt4+r(rx
zI+9YM(~AI5Uf`E1IDP^Ej3H)LDt4(j1S|%gltM~jjlFA2lIJV<-m71J6`P339y>X{
zVfE<lLt_B2<%wO@YPD1>kTGO*RuexmQ1XO{W9`QkM{T-hd26Shn5;JH<tR*2k3*G$
zq$p}=DLuA!{Mi1{V$19uKX$A-HW)Rk*^y>#ygJU6fx$wlWo8P+(!kJ&o~UKI!E08n
zSh8YG)Tmmc{bE@N>3H4tJh!b>9$2z$h0*cmt<V0;_qOahaJ=UeQeMIH1Tz@Zx*nwh
z6oQGA6sj$dVy*4uc#YD>y=KMIjxSuja!L00u@e&=?=Be`c5-Qsm$I8C@I&u<?Y&!`
zoR~_|p9hW{KXBx@Lr|}|?EGK)*|%P_Va;rzg@k}{7LZqGWeqVAqUad`^!#R*MefG%
z&r;To)3a~9s8Cb65UdX8Dl5dyWKFX+)|fm2C=dl(%Sb;_5#dX(KHzLxK#cw0cOB&^
zf=ab!^yJQ??wl~zKm8kj)&1SEHV;0z=cjJGBxxs4k9(d>`{a|K%-7#4B_Y>H?kNc%
zGF^E@kuOpAltdJHmk@haIxsV{$#IuB&EcGaVynsD1;F3Ed+XnP?XK+nWy9t3)-JjH
z{FPt)_Lg=x2HQOu#@=B!aC<>~_bJn7M}(Nc?OirH^u^Eo#%=$0&yVigdUB$ge{1X0
zyMFb*{?%uH_di~-as5kE{-xJX^oz56WJ0^&=H1TnOQcjFg#8I%JYwdKAQFXmK`L%$
zY|@xh$mptII&2+T11`mg7&WHqQ)3++&DK&J8%WeAN~Oxs=50^9>XPYS|Nh91pStl9
z_ji`Go2WJ{F#r%V3RxT&9k1_g*)~Cln6=4I)|ycq`JRx{N0ffxpPXv7Ee}<S9W5%t
z3yK57W5<p(>b2YuNdPGLt@BQt9FH1R6Guc=D(}e2>d~=%z*L=@xT0J<ynn|(e(PR$
z=7r}h{q+yMZrMnsTCG;=VJ?*6LUF)aEkvA;Z=$flOtCg?<0Hh-@W`NF5r{4*JaqJA
z$5<Uc);h9c=}5o)aT0J~Yg%Sb@zNzDpZLhTKK{YC@7j0h@n?2F`qa)xp1F4|7XSbt
z07*naRN5IvuI|Zv;kNJn#eezbS$ODP|3yJ;tx&2T7=<XN$w~M8W)vdph;VssA>{&4
zGA3hC%F`@*aOzk)UV1IE=P!hmQb?KbKPcyvCs5f-5#cOG@FyXuor?l9hoA*v0V5;<
z&^-@7JDV?j;<*D8)kdYz=0HTTdGwhB*KS;umY>6&o1e}uVD0kZ_OQ}E_Uxe>FF!X4
ztN?zz<=HH#I(PLb<jq3*q<U3qU@`Dlj8<IL=o32*Sz<^T)V_Sjmir#v0RRJ~;4eS*
z?p;U6T@@$*yz`dJmW`Ad01=-btIj-25V&XUC2%S5&tJcK$DTs~aL)sef8rzWsFaJ@
zIN$!`2h)gIU3$^FIX$@JCnx^&ufOL0e$N|ky7B6Z&O3M2yWe<o7{$N!$6wgCV;=zQ
zJ^1{>{ll}xk9}#sdg(P?P}q}y8&SFR!;G_wh)#{l_F3@CwWzb~?-ZZTS3VZ(88|Mm
zqhBe3h+!D|L2=cFO8}rgag2!$96Y>j*CBV#l^3r0@LR8E24gi7pkQFQZ|k1hH*E(1
zBEI*L=ic;+jfvNszW(+b5B&T)uD|h$LNn4|zw^-@`x2D(@(b52Upj0}oWJV7``3pU
z;Mz;pMcRJr?x%JhIG&t*!J0~`0MI5jW}-%;da~oL<2WL#iR|^4p7U?_Jp%w^ll8y+
z%8!5cP1hC!?}3N5Z+>i7ayu8SjA9eTt(woHC#K@434pam^o_fo%EdRbR-KZvEnC-&
zv|Ce3N|j4~gv~}27K75@J6?a&=l<qj0HEFsfB&;z`t@IU@A`9A9zQwpg|FPc=Rh(D
zuYcurg}?^@k-LlO<Nkq4Y3sI~t~#_@Z(M%Kc?0Dl0Qj6h%>XbuGys57scv4n+4@N+
zQHg#tpRAcvyH4L=H~Th3oHGW4;)Ph7IqghbSkmjI*Xa#z(j{i1keOyTbr9yud;8+?
zC4S;&N@`-2@);O~1m^o5+m&UzUUlsSYgY^da~#J+<av@AZoYcGGlT$;8p1X?m|8RX
z{B8HcZTGkDv+y%-yj}=F?Pjdjj6Z+d{Q#XOzwZs#b(?wa=@TT$KzQ>_8}E8}mn(Mt
z_eXdB`=dMaXB7kQ%{O1d%xjko34yM%=Bqz={JH%ni23PV&pSJp?9|Lm1VR8{G4RHr
z2>|yzyyM`}v5VF%d(SPGxBq@ZEb#VQU-6wgH$S)gAOLKAdgssm#%DUNbg)wT#h-oa
zT%S`R@Na$PwRhaL1puDex&Ph2_+QtpS)rsnaO7CMk-)jPzVhnDLk&*TV#7203SWvr
z&&o}$SF@s9o?_ZKGSMk@^<XblXZo2ie2(iDg*Zbhq&fGR`HZet_flr&H0OkXAf-~u
zE0oI0^TPT>RG(zB#B~2-Nwc{W;>Ih^%a27A8*S|BrGv{yD(=XR{l}gkt17Pmx%!v4
zz3P(g-RlEyyzY|oR;8mYvZ(Z}uk1P*;pg7|@{7)0nkojjE<x)gp36^mW35Y$E*T#D
zjSs&z@Ot1M#lZW&Kl+Ac!zC$1x#+*;ri;_h(w3(WJiP5-80)v(eDUZ|*&QFBtowxm
z2oc5RlC-~28@qk)v3-ZfIT3_vU9wWXkjnFeKmFa0pLg!+o{wv2u=3g8|K%kkgY%dS
zzxvU4U3Ss>Y!G(tJ+yt-{>%#Abls)zfBS1)SefW@yUDzGnXQhhrG<YRo`qRA=0#S{
zdg-;eySR><wee$dSkKQ@W_A^%)8e8`oK~GDIbr%qL`Sota6E%n9nb8h_CKd{qe;4>
zg;X9OAfr%93hDa=APVaVd&|B<Ck{NH6!%|o(b|E5a@?q89&s2MDKYTW)f-o56lM2q
z-Sz&r+?4;h_rKwq<)f7!KeYSEiAhh%i`K1p&DG~#x$)c_!i5=n@xeFWuzK0>4<6Wl
z^hDM3<i>R?-f_zn7q46HYAaB+xpA?!VPwh$FMn^AtTkFnPb%-4OE-M}_doRQJ0E%c
zxq~OhYs9={xP0v;=f3N8*NqMqC&x~>>wNEPuUI}>xpT{o!^furPpw-$^46O#x$2@-
zhmP0AChGuj$9+$|@f8;jl)Ny~?|#kYzLJk@KQuPkFqQxXGi0qA?mndQq*6kt<;zCD
z^yk0x-8(nkwQ1|ly$5TxW})DpvwHc>H(c?)xBgTyn5UyzE*3uj-+twL_dImh=ErvJ
zJ6x?boMpXe!<t)PdEIMox;oDUCNez)f<Efqb6+5fD#mg~D4Wl3Q4%wt6ff~so`HKf
zm^iFWJl{?V!D*O?c+c1VtiK&}83jx_{}HXx-74WTff9U{4Oo}(TpA0`<Pe@cZfr-|
z$pwkc>bQ>T6UUDdQBVkk5MEGXBBP^39DvChqx`^8rZIzwn#|;&(PkJ6DSRanQA#0%
z5JD=?mtOGoA8h&O+aGcf;g|mKXNYX6GVGca$kOo>CrYJKrBX3EGCIC}({o?_{-f^X
zfBf`^5P-;0eyikCiL5os^QH0;0fjhm{J3L7WdKM1i3r5d4CBC8g}`%$P%2Ld>5^n_
zJus6?M-kbHlgEV+nVdBd6O+sKd7c6U-!DQ-)1JaGs?{5wl3toTD-=tJSg+T$)*~Y$
z)|w~`0iakaRYq2fuH4Y3Q=gG)BrB4sf5R)Cf;eN|`NDZ2nmrXKPU(7ip<4A(DmCri
z$X$TQi)2?h!%@9Pb*y^wh!d=LT=03S4>i4O*5Tdcdl<7GgX!!9v$f_d8ZW6lAe!?v
zGaI9&n5`t+3;yc4u?EG8ACycSS)=2yt|MJ259>Ir*J=Rlc?r*?j>yIl05EW|GK`2q
z)XB*g2$WI)KpY#Tlw%h&I?{2g&7j_lwK3L=A)-{m(YrL8&1N%^1I#PPOXVrgpEz+$
zdA=7E0JvG7(%LpcJvcZxP$)&snvR?0q5{YS=nWz&C78JhK*U;G6uu`tB4c&j+F6)Y
zP)aQkG$LILykfz#maQe<mqK`28vs;ZAaW9q%p8Rca=r6PC?%EWE9KX!Q$%Em0Wgjl
zNwXnB95%XpSKJX-x@~ndolL>0Q89GY<ksj#QAwOrLw){aX3J>+ook<1kiL1pR{hfx
z7j`sX<+n#iiO_FH?H)8HlAaGQy%xhQl0tbwG4KC5U`hD}oPYZSx0JNFS3CCEI$S-4
z17>-HFN#rUEz~ycc<%UjPHzyo)tN4!jnh3VRcRZfM3)Cz0bbvn5U2X*nGyn1UiF?6
z_Fc+xz_ooe?V$y9v;p~TIuT7wFNw1YOmO9v4eC-|z#N@4_Clrer_IdE{NnfevHvmb
z4;tZ%_TF319jC+0W<24g*CK%j^B234%Aeh7-uy3+h{y_|P@KjkF^_9TRA;&4hKSAD
zcvzo|n{^kZDd`g#Ddp(0mCV$vPP+X%C=C?LgC~w1otPLaH5vlZ4+0@@Xk;0aH97*s
z!I42COV;{@l2<5|2KMEUBgtBiu2>BW((?gvr5{+MO&mEhR@`<ZyCkVRK(S=`Dp%%#
zC<d0StWS+io_O9<l9>mFmwSFe>xe8JJ9;P#8<m33%vxJSv2w+79miqVjKXHvY~=4Z
z(#BdY7rbnb87K#2xmFLQYylyjCo}P>c3&QeNE;&JIJQa}#Co|hh=@*WqEM_DW5Q~c
znZt+*+H`Da(hFw!ToCcpK%>?rJ{D>Ih#5%UnLF6wnW%$bn>rh`m}Y~`Aa=)^9ib$V
z&9LaxT=Yj|`m%^K_n^7xg&ZvWHLLv2i`o&hWa6+cgv!Rj?elKiIinlu8Mu$6^&(?L
znNQ9+KNSI;%5^>|+MXcgq=P#b`s7dGv#YiUQ}rBXz~o*y7kMG%NZB$BD+35}+kDoy
z%8>tG?o>+RMc1dF0|0w8q^CLU3@ZdmInmNfgG|Rf7X{|4WU&vd(fU!MwlnkGa?Tue
z=WDP{GY)gtlkvAD!SQtP<_i`ME}}Z!nG?0(izkv??A86!7)(QsGF`FE83NUv(np9w
zoIJG4T5WYiM1D|WwnoQ9Tx*2ILa|&fSrZ$hmFEkgble00<@tz0`30@xiSY>pE|&r!
zrIfz4+8XWo1tH|f%JpXp4=*CtCXYw8Npj4XM9eHbpR9?SH9+)(l8&P&Y`Dmb$XaWM
zMwSX8$ZBRX#xPMF$A}md3PMP!JZA}n5YEanbA4(;>v+lXRm{Z1%w*!orE{1pGc}q~
z7)6y*kV2hY9$b=fgSzaI(Xr<T$}d<QTdSR|wPcyt^E_fQaf}FFP%=8wanlvcI3wlS
zuHA(d$^%5!#vw4ER3?t1sP2%`C^oUSN(w{>e9sYnB1+E>m^qFbv9@8_TqvbL;K9Km
zAyDgx$@+y#irE4)4UDc_vg*8iu?!jAV!7xE$S-nskgYN8CSsmno)@4`BRP#iAgbQq
ziAW|w6ett`lhuo7sko2c{la3~Gp0-GRD!g;5UlQOM7$bPW0NNiC4EG>_92&<R%iYl
zoN5n&tR|z4iJ2@ZkH{Jm6Hy#To)ly~V`6JGB7kITVrCa12$aeit>X{@tPe~I7_8CO
z#zF{AT2qoh1`%^D4cN<><}+l*03ahHWQj5YPJ%@uMkD}oPew=~gd{S+m={-KB2I%#
zCd)4D#unDs0<xIN8UYFf5R(&0vE($8+KoZ_&A=>@ItVAvl;C>;5hS7zg3|OK=C#CK
z_yz(KB5!6AQXv2d2@JxOx~4&|V;CpI^fHntv!@lwm!G9*fWxC)(zKg68yOh*^gnSv
z1z*7cG+j`bzy<k4`x%_{;ump3?k73dI789$i;Zivn=P|<AqF!8#?7jUL!%?I))-4f
z7)8Vs$2vho(@nI~xwZxYr1D(<ECXn5m8X=Dh$b87>ex}&zl=iE>kTQTlV3MFa@XbH
zIHi;jqBOV!PgnM$yX}_|t&ZZTq5NWYzs{Ig%K)t7CL$Kg1MWR*w6(_Q7!lc87u*OT
zd_TyHTvk5k*cigF$waX>##j?aneqcMArpc?6ev&$;YkscDnbah)-`9f#UDg*9Hp9{
zEQGST=t_`eCij4K90IVEzEny`<+>DHj2?weYqb}YiHze8B*WGkYuRaME2Wh3g+N49
zN(v$B^%^3@h7d9E0%K!lEhWlS&ca&bXbAwN5F!=PW^1%HhR9^)k%$f)<{tbw%nRI+
z-NSW>5F(3dMccHSKlOeelg<uA0f-LjPfl)25;*wUPQM8=*`yqF(E>tXZl%x`%5cVz
z>JqSXR2E?`I)eepS@!<F2r`RIwl;N4hYhkCz;ld`Oo_kj9`}oobUPPt^fiQTAxF(>
zV`|Lkh>4A{L<}4ebDnTAWzA@%1HskZCbT=&{gO6TNESlaG?#?{)$yauth_)<_588p
zzVD9=4+B8hth%#YrGBAUR8kfyBl7eZLgwxUGDI{wj>5X~3Xn5|nDkn((V-U<i^U2v
z1ELO_Mn@fLB#7wwo->n7WQh{t4uL3S95$>aZH%>KboAYOpKeAPfG=1(dez2rM7nWE
zDU}q3;((CS;nf|UthF|dB19piL`0O5b(GnUO^@&Vvw!-r`}@<s^oH}-t#HIHi6LYw
zq+$TAV;zU3il(Gy1b{4AOT?DQS}K>zK@em+ETYg8lK|FIEQBbRMuo8e{NsmqMcOj+
zhSj6jU%HkFJ-^@@1CZGQF@rUltl?bgJf|$Fn;+fwsXzH!ckmzn>{I8RyNa1NJ+ke0
zKJx{4@b5qO$qnbMoYUiVBPJ06k=uLw`_G6z;VC;H)S{4ximYip3+_g8?My#nx!2rV
z&?~XcjEIN}g-H<{%s`72JDt%KIkS8a^2|2pvs@9?v7^jvtwtds0eJ{fGBW@Hzo_*H
zyDI$>?;vdxL;w&%Ivh)&0Kq~CAeK^cGExZ18cT)rgh*;E5}y&J5DefN$lHD!1qz9r
zc>S)$+)XJV9RCP8i6^(KSQBSRV2g7ZVOG_-bHPJ+8cZmyI&nEdq68ge1|lHhgkT}r
z_$Vo^!30Zei)fPm3XxU0pb&zSiW^|Q{l0BuQw;!k%gq;Geet=uq8N7~F=5(@hiMqa
zttdUQB_gj1*!j4#XuhQ%m=r)k|GYV(vtmhxFDsLAPm0(&=fGLAA3V5YqS^$2*T3w-
z>n>RfT}f?pdP9p=2hTHa<~^aGnLfkQy_a5mn{p-33SdN>2A?{EfK5y>ZREKiY}q)R
z9#ioGummswp8fqTu1zY}SDK%n2ynJVgmY5h>sDYu6xGS2#}DrGgOcY5Dkv2PN9y$&
z5tYhiXa6z_8ih5bB#~8K;1|j+!&mZ00Ki%U%+_e7<ml)KA_^}^c3UBs!SjoLsiJ}s
z1M9HCWCtq+l+wYi#maD_UZ0wptdvXTN=fS|j+#gIJju+BW~>d33>MvkQl5X##v5tA
zqy%g&@oY=v$&%LAT8l`Hdes^Oz(U9%2#9%nVk(HWjYGds3W^nNOtTpli$z3~QVAh+
z9C406K`PG=in*jA6^mtN(sl~0O)6Yk@QYM_!9`A<@B2XzH>#Z4KEF@~1Supi8?p{z
zX0l<UDy7Q0^oWe}EpoF(Iz};LVv3qxP?VnUP+2Je{m%GXNc24ER);aVUW?phaD5TO
z!^6gyTCK*+<KyGp4mL<3!bk(4RDLo`lSWHXEDtHa&_!1?XT+(y9eetd=de<Q#6BNE
zY|%srk(E~<*{I*QS!>wZRP4=bTZ4$o3z)4nrgvc4KgZEG&5<70QHWxGrLZid5<(K`
znYI+!k-s1^z$9eQ6M11vv)-)4OdzBaToj0>xBa94M0%lwTIc8I2%)6%AgL+<0M2Vk
z{$%M9CXB;Ux-!L7{2W?Q0|VyDJ~|3DT5xM_S4+wnDJ_ubVEIg!FaslZ_^r(O{&f_N
z%1%m@Qn}wpA%&3Ler`8l*!TI*iR}Qped_iG0PO7)cWltPUI=a*s#aS?TO8M;_9Wf&
z5E;_WjrLHhmCDTD?#1g@{`P-(qbpclv1A|@n<fxXE54jIu4s8tn6%uxjAoyGyLAEC
zg`ZWm3AmV~*@!&-@XiF`%o9<>c{haMY+KhmryQq|@`4|CkCnxJF0%6)UIdfo6klh{
zmuUT~ExJZ!jb6ksT1xMf0?G^NEVf1;+qcycX-$673(7-rSkujVBaE2Y3&=wmg*7Rp
z7Zf1duM@%g7==U>&MOa_4P(sE@CaEO$4x{Giqg$UDOI63NG5Jfo{Xag0DFG1!-=y-
z2fnvr`7*bgdS2jpf$|H?5b5KV;_<15=Xpbeg8;ni@w+>Ql&xKT{?&`ly(E?JJXstZ
z5kmTf5|Ndj&(`Xw0f6h)FR^5;Hoz2z4Jn~iDnXJLEC}i8v?Cr7gJQ+#usZR)=NGe_
zSsXPTJ^%mu%6&TyoXCFn_D#>;zUkSkE?V<@AA3_WK4kBGZ14SBckMlVqSlB?1%K7D
zp=&p;ee=zi4GffxG0kSv^E{XQLm~1!VcYi}{j-1ik^B3PKJnI4K~dbi|A~G7-~ZX{
z4u0j2Km6$SL*KgliG$BiTH-a!hhKBu1#i0P(vHH;XZ9TX!2{3jI&`wyh$=;Y$x!90
zi_f|BWfzq_iHPOOz#shOzdp04C3yS2&Ch;s^Rri+zw(nmcZ<<bDB`2f9Qe_e?K=+~
zpQ?ui-&?+P^qR{qc=IhcUbtaRZa%l+y4};;HH$3D+N8dEqD*9fNT?ufZ<u%VU^_BT
zv$^;l`HMb*@625D^MXbZk&GdjIfiy_bQ<!4V^l|+E<T?1_S9k05QXZdh;u9iOqMw*
z$`jI`-<G@Z&MqQ*R>&~8DJ_)}%I9>7GP7}1k<5z@jh^XgRUs9z>4J`1&OsJ7bm=d;
z2q7(;=>fWShi$G48{5JU?6qiJ8mc`=Ovwb2HkT~=NvO=E6jEl*<c?@;p*y9M*~^D&
zltjgt5~AfYA_&kKF6U#lq{Ae63703E#?#N<ovbzg_zU0PeW+zAtM#y251-rn{P#9(
z`@>&;`^qKdd@wlUgzI=LKiab63*UMm`{$lRC-xjV@#K!fpZw_SvopW(<0tb<ypy$X
zvKH<>bmCv{e*72Sal=hluAk|*_)Fh@;P(4k-%vAAZU2$o`;UD6j(b1${<nPiJ-5!o
zon0)qxc6JQSYgfCh7#c%A(L5zyo)k?(_L7Wti_i)<!8p60mXDpxy;Oqog?fC{m<WS
z39*>PyUbBoLzJE;*~DRO0;QC$NHVR$(Ar7~N)aFyN<#p|#92TSM^UMq+l7S`fPPTQ
zTQy^}HIY=FlrEvdMn@SsN;y623<!$DQ0v(9nt)L7Mc@_upqN97&{)#i5;GB%%cWvz
zaPM<ZGQdEkETt4uDK97wFIx!3FardIG7l|9L?&CSPUt8c8ePt8UAy1d@#kIkj;v*}
zT5DrW5CnOfL_}I^0EoiSSc<jrBIBv1v7{{pDq$kM?&38Y*RQzq!DqwR0KkUTqZhAV
zzH;fn<m6;*?4N)6-n<pezb2~9|Mu74{hz<~4l=rkLMe!%&|2&Je!pEq2-Qm30RX_?
ze`ia#<MPNe`ybnJ`05K+T7V~Z9LcO;r4+1LHdt%wL&qinz*_qI?>>CprR$+Ob>n5{
zY*;<=<A-*-yI8+!<njwvuUS4)C=G1ebu@1U2g?Ox$!P)uz!z`3<JMPRyK4Dp_u6sG
zCm&QzU)o0tV6<n>i{~)_kd3GD{mBww9zkc!kr6VJHC9NWrft*aUNK_Fv*X#zhxJM;
z&NV2U6BtX@x;nDfQ|tc-L@tHq?ph=%?bdG_qlJ_`Gi}p8T<!>WdJmVFE}=-)&dKj_
zIxT0H6|_b-t78CM9$9X5q?-*lce5fsL{S-CAw7T5bA)GfUWAzuIbAS>AbT!CPPw6(
zbM5ZLWNmldR(F?SpM+WOxy4!UHc{39E`;plC36jT#IABx>zJ9X@m;J&i@{%$o9M{}
zwc5{^i43!9(U|pdu{dKFBO-ENgVtJWEX$;B;#JpdSTZtn|Kod{3E8-A+52w25&*QZ
z_dm90$NuB)t1jNK^5@@m^V;RZC&ngj`@z;tkM9P6iE86(KivA>TQ13dXnM4~)k>cs
zz(Rcdr(b#Xg)74-{^mW~?tCzjPJH6ogI8a;5&-UgWS2X#cE!-AfBB7`Qodh!Wc$I-
zeCY=O5NrGJGY4LA*_zkgaDfoG`N@6RU3~a$FLS}~j~{wAHG#qJ{lcvq)~+a4mTZ3d
z&>#Qhm)$i#xqWxHA<Tggr)LpycMrr2C+AuxI*999sKB%q1<(F=_0DNOyF2Qy56TPP
zOZoKd)qGY4{H`>Hg(xD#0MuPGA*2-2Q%uxeS9)gM1k42Z%|2vgU~36cN-2p6Ol*t+
zz(NoJfK*-rnj^}DK`kI1>o`QGtXC)s<q72hup!pQdW8~MOGX2N@`5mIHtRJaL)ID#
zQd+Hz6DM-Cr2?5ba)2x`+l03SfXT&m2uNgdTfA|LM@c0Le$wbIB{M52m^qHMF~;{j
z296q4AyuI~#A#*!+!22wt6j{B0%bmDCPblBaa7b&c}fJ@)QpY8C`KWaUlg36xW)2-
zdnncz6-81CDW$a5w}e0d?0bqNNv{>dDL*Jxh5*56v+2qG?qDJC{@_2oXP^`SK)F)>
z<j2<j${+pH!J}gUaNpKlA9~x%N`*j4fkFzYtxX!e(}Zs3585b>h`^XuT=nLgFS&N(
zDqt=Z{P({0%DW!kX)OW3iHWK)8UUv1Nxr8Unz5;9_3{EBUVrJiAA9#ru{PG)6(bd=
zHf7su0<CdOV`5~Wc;n^kfZ_7<m#<nf&}@dP5MO!8h8EUZttZjgOizlZYkX#=`8TJ#
zY1TX9%u&mB?*4fh#awrMt2lTrdoMG0bIZ<n-91ijWfSHc5hhehE(w4L045IIuE;r}
za93w%t+mE@ejt@{&qaAb(o)rRqeRqEQ<w1@WW$`aQE}VY<D!(IFaQyv?PtiHz~?j{
zPv`}hpv9|n=9<FZ1;egym03p(Yc-(Al3|Wm3J~M4E_9?4aq=_r26^T#-MQ&OlO>km
zs4@+cwQQ{|R|ZfBr`igMP`fXL@PncTFmWh^6jJ$8L4afpGg)G7j31P&(Hao}{6eYO
z3~RMo+BHZ*pf(l&l$2@tA!QqdwG?S91qy+_FO`&1dWcBcW+7;{r%R~<FUZH5N=YWt
zIwm54#6(fECY34;j?%m+Dlv)r43Tk@O60@@5V26IFj+EMD5bmr>J4qIv4n`FvX!g=
zKnPhVRX_+Sm5C$eZV!dW1k6sNPf7q5$_ui!?s<M`U<d$e_1fOUWA5N9ue*43WH^6?
zZ+i7LU-;UO03g=p$ar|gg-ac3Ev2m2YMJdfx&<g%GI10~+Ugu)fAP8{POw)ZlC=Y+
zz%>HKu{PRBiECF3Z{K?i08UQUfAi13y?WWuW#_NDc>T)jFI_iS_UrXJ04OCKNR}TW
zYYh@gAwT$*8-(<%)njAh&+IvN`1s^R<CzDa+S{7gsVExF?6Poww}zSR0;5N2&kFa8
zdpc3amak?z7p%3jU)?>T66SeCW62QlJnaRxcUYS!bnQLNq~p;2fKZ-NejG<}6qU+@
zez8bK1EP?g=%*z~WZND2o`chU+Ns-)a|6g?CP|-^UchF=kWOdqOpX0|(-*kFz(xj=
z%6vz(L|{oM9}wfH0l6F@_cW(%J7qt2Ajg;S0$J4Ap%V;wnhjSXpP=*1-AE*-edS5r
ze6sj0Q&K@fWSJ@9-*j{yPOk^i(N-EuNko{IQ@Y8=Oema;yX)aV*T2q;X~Bvk+Z3ts
z<BT>8Qz<;x#gB-N#?x8@fJR4<^xw^E=#me*N*zWNjMayIQUCxT07*naRIQ1@#MW96
z7SI5qQeIXK!zl`xDA^OWs(8`{jI8gzB{JB)K*uK<*+N~pbSQDrlB>a0OIvpF_*m6Z
ze`U#-EVRgr0STdmREpc0_J%4YDWy{)R7z%nZzi|&o}apE%TxQO>Y+P+`1s`E<C8yp
zU^@U@cK)jO+;Z8vRl_q5>y{^XfAhy%ckDm5P%MzSKZoZWOh~_I=#0V}ahgqL`kkHU
zjPhmf1)>1qC=wC|2TGF=Ef*x$Ns|D?Ks&$4jI?w`EEBd#v9vo2?VbbxxOM%4Q<q_n
zZNI(ki#boOJIzizJ(D{wcvoN0ENw;nt?XD*XXI)P-Cn9vh^42iVp8m-cP(#vT2jl)
z49YK^UR%hsFD|!6HzO^i=lf2$+>|RrL9wKxM(W!p@Q%@us~ItI7)1?bwN%=e$eM&W
zpR7g1`owWgt3q|u6u?WCjApvnD8%t&$B3w0u6Uku)ILH;CaPD*f`YG<@1E0CwN|S)
zi`pWBwM5L;SRqxhR07~QYFKNm(SX1V$_te8lo9~K_lqb53K_@ov7?6ppgMMFV06`z
zRp-wV9nFJ3?(&R|m|1J1wGB!GMn_~~w_L&~oERT>pIW|Z&GJ=i9bH*io3uuILD4Bl
z5VJK6L=;k4qn+an%$`>O0IfqHYvPbwVY)FoVj`OhFRYHkdez}hI%=X2Ou0}`hdOKk
zvqP;1hDWo#raV~9P8%Fqx^($cOSZgkEIYVl$>@^dN)*<}n2}|xWZEt6d46SRl*tAK
z`?=qI&o}OTbkh@iCu?DTxSrm1<hgy%|ISBWd(paO)9eg)-2e37eQR^}&*h^78#k=J
z@!HEj_qSiqffJ@9L}0SL4jQuYjC(<M-@=0OUb8--_i>&kiUkz1`vjw72iDCsN2B9t
zKIW5bvpNna09Yztd7g=5YmK!Un5|`I)|R9YL7?(Gs+7X>B!jg&s@JNn1Ybzu1tliy
z7zc$^E<<ij?3OJs`#}j1bsRF;pimLYD^!O2ZIyF^bmp|*=1+D+!CAQzCDX6PPpLY-
zoO`y`Fbb8G<Yd{LTn27FU0#mZFA4OdKbz;<EpO@kaKBg~vSEG7fnGVTD|GD>$`8b}
ztt4sX#;k_hO~x}_sy-tJOY?9<DG{=B9P-u3*%8PUTqM<om>(18%nAld+Yb^R;&!*5
z(|D*=5RoaM=ju7Kp7tbmauV<@qOx?^Cyf@Zwtu%!l}tD?X4g=WYujk+^Jq^}U`t3L
zD>ZTo6IpoIw%9TUy2U$;*>6C~Nzm>yB90D~vr5|MPfles(7leHm}(ibp$g`eAlxJA
z?s-XAz1wKJDG9n0x%<4FMCRuYRf<3JhHKvWnoIT{o!oig#ID2RPwhP77-+Sj+kW`?
zAAIcAUicv(LZr=??|9f9x$xYjpZMvU*Q{Jts0@QYkT-<0?p2swlQ=GLT_B&HGL~#U
z@M7G?v<*33p-+CyF%#lRWl8ebMqVI`(*om+ez1)V0y~6GAl*gMuAu}LNe?onghL|b
zHSM3QnEP7`2oT$A%5YX=n==zG*zII1$7#_io;Fo8m-*j!b_mFmMECz`HBHTQyUW?>
z3uLAqg+$0af_b{7r%AVu*$ay0;Uzk3#9_lP7X3nrt!1`RSYx6_q<zNHfI@({S+`^X
z(Hd=ZTqqBghnB_7Dp_jAQvjBk0fiS7fjMs0ELo!?KPdTyAPQ?q${je48b)JKD1%ev
zV?tLeueDUZ@_Z?TlA=->NcGK4X~2az!diRm_*kLf6$4KxUwOWcqcE;^R6=^5TDEiv
z5gj{mvJvi|IB{@z={ZBo&Y5w+ph(o%5rxrlqdHa@TILoiAV!TTYqX9dB07BJ=*W^~
z7hZBj($NuzakJX2O#*XJ8W2*EHN@6NaVrgG4NBP|dnSb^u&pN6DL6{y6@9gS^^!e@
zP5{8>CwBk*yTb|s0K{PfQGEZt$CH~?^1^eMleNs`ls!xwI#h$0bkxWtz^v6#OS7=u
zr9;GKbv#pqU~6m~ot&)y^}pQfcC@#?>Wb^H+<5(!8<`=}`VT(;&0Pmi0>HszlUf_k
z3kC)&`6Z^c1%SOrj%7N9Z@c-@;Yz{b4f_usZOhEf63_2iP$rHR2x-p7=JnK+PQ@8$
z_8YM^nuwf;V+!81Nmn>-Gv)dDlUpfJ9nbq_U75Aj5da9~Aqo?RLP{?v67z|%3Fq4l
z3=9qgMKp$)OO+8oVNIN&?hesce!*e<LiwIgQc4t}g2I)Q0Dz5~0K#=gD8FD$?4k_-
z_WY9ceB}iI;B%RorBp`8&mY)@LM&UouDcj&n)sN=k}*Q6OlqSCyOFcL?N2Zl3AKmr
zy6^sP^sGz+=&0M3aj_;dMUAO`ym+$&0A^{Sx`&}YagxYH^(g>Qe!(qOS0hR$wxHeC
z<U+}L<J5S1i)nFDe$i$8Fb&b%Jj%Cxw|pUiDOYlOEKQRlwz}_g{vaTN=qlFFMWQ%O
zZYB*<bKGu8?1d>GStqw|7Qwba&b07BphO{r5GWiqBF=vHq<7SLaYBfs$b-n0cy!!5
zbW<+jOikPX01!qx3x;3+ic8#|%`pDV7w_1A<Rk!`n5g~bZTB2Fn%2==eO?fF`H`58
z$zeL~{2rRmm15!PT}K|<e&Dg~2fp_GhpUayJr^lNmQ5Ti7npn8MY4V5N=e764R=nx
z8GZ4#?=K>(@q#Cp=ANhN^#$CylVAr5HCNoPm5dkp87<Ip;%9kl=+Qco<{PtShgNM+
zixZIhq-`;0mh!6-+V}+1b&W|zT6EuIE)>I_>l1Lgn$l?~D;5Z=&SG=Mp4&<L3HdYe
z)EbO5OEnwYHSai#=V_?3AhP`u`*(LDvvB|d0-#U;Vt&W~0xw^-3<cJw#vDw?L`-&a
za@^?=GB6@qZN^WY$Z$x3K*YpMG^L_?7-}N6#v<b6<Rkz9P6!m0N;%eXy&eXJf;d#3
zUn~vPn<toh&__+xn#E$FTq;>(TnaFo`pOFc0^?+iOcel@EnVWKR2)auTD@GZlq$m$
z<72KQMTn%MUr32UE?qL}1ZJZ~_1OMrPzYccT((vSm7kscl-m$-YH|!1hzXeeLYbKS
z(ttH)d@{+sk<nzeHQE{-lm`*OnphjHb=)dG>Voenk<aC%!U(Y#B$47hkL)~reCm?(
zSAXy=FMIvVFa5#&Pwzc41^`d(JoKOc=U2K6Rq(#oUt^+XqO6ouG_b?^0WmMu(X-jn
z{kjke0KK5l0)wSw0OaWAt2W&I$W8#*vH#e|{_r2yEFV@<96mmob;RFt!^XkkktmEN
zCdPxb6Zifn_8mD{-MD`FJ6?086v7e#z(3#d=(gR@qYzK+I@)MP`G}B6rxJawtf9kQ
z_|(u=Ww3UKPMLc`%sgYjH{*r5zI&-!t6M510d=n^RtPDiAR?pV6u)EuusY`X>_=3u
zo>YFp4@$LKtyZrM3=9+tMYohDCa1L4YuBCUBxO7ySFT!POr*nx?+LO-dA{@lwwjp3
zX2V+R=-1t<@DqPorpyBd30)Pm=Ld<-jH>_uh?`YQ#^_iI<p(81Bx`h72SA}bA;hsG
z2OTIXglJ5Tp;XHA^OYg)x%6(;cWoHf_G?t>%|OZ^6(P#5!!v}8^G;GS^NazdwdNF=
zKp_>Ph?_M;;TOwpdbmDmhfJ`gT*o*7z(OjQcme;-9xqOEH!a@h1>oaS3It5KAuuhD
zaZyfE4bR}D^sGCWrQw*Jb~<rt+>#GkOJp(4*D{ey^P&(v>#3NX9<Q5ueG+W!`p3wj
zf3BJ_Rc>-cl4(IJQ%gP_QMyu86iye{nk4@}i}6o>KPkK5L}A@&>SE$e=QhwpAW1m2
zjrMHi^eKTP0eZy+s}p3!*loLy>^gAVJ)mFz;4Q0{4)*-~K)LYSKmWSnfkKys!?|QN
zayb#`ct*fXA9>pi7p+^KUEAKnCwCq=o>{@`FJ1Sp*IpxpL_{LGWJBxBXZIc7dw6W1
zTzJPVS7g!QL)#8)d1_xXjNbqD*DM`L?rVIqmZY58Q<}4QK&L2WFuTmne2`b{$VPWO
zwEP0k&#qZaryge5dCWv)jY%xJTO`(6Yef<wB(j%M<oPrZQ847`B3kfF&z&cIw{uFh
zt{>Zcj>Ka_wAK>YtT4S*l-~AR0Qqs~9*~~zwqJJcQ@wjtPH`G)rbezlx3IwfxUH#%
z9k|yPEcbevicUXkD!W3G-n>fP@k%?Pk#1$XQOqf}X0nv3!x&?=G14z0ibA1CWQ~rA
zD2j~`qEIM0?1IT!6Qe-Eth~VUJY(v_<ZM#0SWLWZL_ndGS1y&5r#w%&R>eHFlBCKI
zCF0=Fu;(cu6>F`vb(Nx8#{z}&JVZ<-*RzHcY%LlhvNi|;W)?`mER|=iZ8RDHP%H#V
zldiR74Y9VCiuEa>lwT-|q(e4o?B!&Zv{~z*SONg6BWvAEbx^4FloY^ZjkP9q6fBcv
z7X=Do;s}Ir`nSf!h{Ev^BPQWd%kc!3%KPx!UtTN~A9#G%@v$jm$+f;B;!vgVsgJzo
ziQOk2d}`nRqhs}ET=2bB%Z9GI<eWF(d|AP7+2*W~IccYp=*m{}F;;gFLq;1NxfCN=
z-L5pt08lFWpZ>%<?tbXmO^@&1cVw*Ah#VZcZq>-mS8cfYnhSt55eR|BV(~+7xuH}j
zY<YU`*kr?4BH}oX-}~AtmXDObzj^z?=O+SRoxgV3yI+69O*dY>W6!}8<5K|etsicF
z%Pm)}TsoZZBP8z8T$ml~4(y<#AssQ_rqbI7X?2-kx-~=EpaRzDZfC+Z5#`ea9ie{5
zzailznoSy#$jQMka62K=aY$sN*r2eUXQY6@SDxod&sWS$q+*@YH(4^8IUzpugOb~A
z$Qoj1GS0;$;wUx<fC2>yKR~Uu)<#O9q;P12)ASKip^!RmppXiK#LXkHmH;g<xO|=)
znK%j|l_qs7os*U+n=Xw-jEp)xyy+ea17PB0BMP3I$;@XdvSKK1aW72Y8`_IwZ-JOC
zlckgqq9X;HWuQ8lU2p%}-+?pWl{bW{zpjEcI^zbE)3O@&O1he{Bl}z?xfw>yFdALD
zd|+res#lq995$Hk#8lJw{o&zZM<%1AFbb<~$oxXt^NWqz7!yUYv6e<hM;*?aPtFUe
zg!IV9OmuQ=oS8}mUkDr+Ue>xtsep)?>a|*<UL|I0xfm#CgN0OaRLi0qzfg8=PNUJR
zHyQ&2m0}@q-=uX&)>ej=#&I-u@+2ZIT{7xSrZw7Ht+kD{S+aDwRH{6@+-2<B;VFSB
zjlkH^JyT;x%7aS~F>F+=iI=S0KxD1aWbN4TBgOJSWpLQ&n5;>l(NYCbxPY}jH7=#{
z3Pom!8da&h>^ZuR<e#=*tT=FtnN8eGZ&nB?r>3UrjmBWPAfyOV<DJbAvc{#m^KPe(
z8VukEMHI@!4QAFlLIBS%C0G`<cs28dGg5jegc}w_v?h+DhUXWR7dVf@HI3;w%3C8u
z%)Z&l5ll@@)$4V)dIMhxM9-7VV2l+)3=EA(&-a4TBCeF)yqc~QYnFtNy?PkBmz6^Z
zgjC%EiXA*YFVxE#9o8qTrKwt2E)@p`Dn`dfN5z4WpjffiFi~~lq>jU-E6*jXb<}jg
zo$><Z7l4VGvMI{UVH8<Q+E_$XQV1c2hK3r=MzvZm1YY1P&o4+7Fc|=po+pH?P8^p~
z`9TQ~$XcUy6oo>dl*021(hHpRjhao@BP69P6ifLvI14?(Ij5iI@hLZ-7v)D2>pr{7
z=$4;cpe;ni>e%!7FL5cujChNgrBazWJX7@ud$L`0=RBr`d9aVIb@I7VN=!2%?3&O)
zWHh8i0M<J6FTq8VLK{rWYmk|M5d>x8cud5C0g|eGDFmgR5RL}SokqrB3WB*$3X%2f
zCSg;?t<~~qa$0v;Vhj?s^w!_)^HNADEfMq)2z9Aa2M8w_zLqzL3~hKz4tBsiho{T`
zCA<Qb(jI!U)@B0n(4rxQlmHMJ1>{^aPSD`A&&0*Q;8+M+k|0T;QxYgsf)Tse0&NmK
z6LU*Vfm@C$U`kT}0E~HXjMFw4=R6Y;k(9EFav&+k=1le@9eg1KB8XOyo!qar7A2n+
zg~AN;!P%bNB_-cyS+#MEE)s~kX!x6(0*Jk~52AGOCdacxX`&;YMaGDL!hu!pG?8*F
zxQUVG9WaxiNxHIIuu!faBUeq<Ix3|=u*NXw;~ret6URlKLJMf5VeX_X>25JvSc^T*
zX(h})bXJSfKhz`r-sQCR<CyP0KAW=L{@!RS?Ctnwvc>`QaU2)Rm66e<*2K-~c;XQ#
zA5kb73goC+W9DWvE|$vW%21<GZ#L^FVgzu}gAft3jhb~x8D0vdK^^O6qvrbsKS%<v
z;o%`>uGQ+snDE$9rBu06VW#o%3Ex+NrvR~3^itcFsXK8{C>vv@rm6rO$Hw=3zgQHA
zN}waJF*;1S@vu=Hvkqh;o|u>jg1{*S0&uZZ^8LcmqelU-I5^rJ5i*lCiH-Dv;=u4S
ztz#f7g+!S|awck8YnzdgzAh#t`m)8b!Car3Fh(~bEd>T%!;QRYhEc3NB|RlQ&+|Ml
ziXtM4w6#R#C=yZ@if!}@aTLZ;<Y?P!jTjN4SR=r|;1Hsap6^<EnXDn>B#WDkdK@<0
zmSc4c$c5s7C92jVA+S&=6A_V-%2!^&Rf$@ooRwy>rNI%lR>u)D#ZgmA85GJ<7&hwT
zZgk3(0Tiv)C=|l;3Wz9_=PIq-2)dnkWOyjmrpM~!gv${!o9fY{LnBKHrOHeh6P^a@
zaj<$W<JOU{YB8nt<0i#cY~4E9v@fE5%ZjWeyEr)%CW9#R2^(gMxneHoB(=gLXQ&bp
zwAN@Ob0%yUYpV6I&)}hs8f0x4#c`}n9J-ny1n>|Wjpo#e6V9g@9vLZ@2b5o6=6dt6
z*3rmd354*x0003+sZ=hN%AAtpvo&6!42ULfvax<pb{LXdNtT#HR$dSkiZ0QPWC3wt
zXjCe-Z_h5@heEM)CC*;XKL0r(RZsIUyOOKUakfkg(R>AnyCBmx9#x@K?|Qm?>coj)
z_X2V|<I8EN8`2g4_j6=T#&YEXA(58TI}Kg6h*t2-cuiZfpT#r`S^S-Pz<G&zx9$YC
zIWU=UQYsqQdKdE`d52$`N*rd;M<Ub*E!HJyr>DpE>WTK&{ajIUt4Ibg?F~<3FGnuR
zvu3Hl)VFmx+)RQ4TEtR49&{S<rI~7MH6SzRE)|l*OG`wf!|~*-F5M+T(>`2@$=Ya@
z=p^A+${g4#nipw{OIt&K))A6>knXv=aZ3j?-}~RDP2Wl%Vk?Ty)q1oSL?rWUAs*`K
zT`mZxTM+_hJksk7?7n7f>&@qmP&fIaw1GVz`g5+>xD}~)_!iKDKt#sGk)SvtT_6ly
z^7Ng3P6;OQ|Fie*F_vv<ec1O{Ywvv?RbBnKckax<Fc=&Y8<P-BgkuPgkQgM!CIQK@
zBEZ3kArVeU6bq272-z`7EbM=*D8wNITR4u0qsSr&mTYWrBoqb6!w_T3FkxV3?%dnA
zySnN;_TFo)@B8w{+Rt;Us;jH}US^Ds`bxK|&e>-_*5iBp9`nEA%!uvfZYI9cCxP$c
z!^K<LUg8lkf3{3Le?lF$x~Bj%JLs(EvvMzw)wW5nc0+`FdzGeFC310i9E56pmQsWD
zPExbI*q4j7FPHnvr)FAID`K}?cp~R~sj3&78mUHzBIX^dgr*K<wL+v$?d7n%jz!^k
z)Vj<7>lxS~V@V3nZc>QP+TY$gM2n%xbC8%H+`kW90VlTg*3=5`>ivGZ-HI9jtQJN7
zI`94a-Z%p!B9{li<>lq&Wqoo&i1^0)-;cz_Q95`qS|x?h?8f%n0K@Aqm5|sMxtP4$
zZ<~6TMfo3n;KSu&wLO1}$gwXV>-U?PO54=+ez!V(usXeOV3^}C!W4t1RBxZ<XXJe0
zifY*<rWHFcDVl1tyHrW%PaYR#b?@ORA{C1@5wmlf^LL&-eS3=e-tJmaT}Dyu_W#Z0
zMYcuEgP|<kAkm%^)4HywH-VX$F-DC^L`_5%t2H5Id&sug4g)Kb^ivGZ7e3!u#L(75
zcwH3E42T4Y-}vBX6FtB5a+7QEk=(>l#fg4%jRCSCJ9Yr$=T1yLw4pcv1cAXJL}>g-
z3hfZ^RjX4~$u^mf-+7{@F|^K?)$-KLLcL3&)hxbchU^HCeUa~VwYK|@G{sh8Kq6HM
z^+t765=TH{r)rPiervH<EEWq%Q6z|1O6mTisu#A!w%M|CB|Ah=5lJbELR(8}tHs)v
z%evW{iS0LtfJiB&^Ye2=TrRxxr7sp!)0phVJ=U?Nt4E*okC~9!ogM0LzRy?nlm%W)
z{KN*?HY6r?nv%kESrgZnKu7ZaA(TWVbsR0T6dF}wS4@P29GICVU#*L36`Ng(SuztO
zwqUQKM~H9@TlUi~3dVV#qvOpFSx?Tf3?`~!*0-g4JoNA<oCSB#eKt$Bk@b>uIymzU
zSOd$-ZbpMIeV=Si&ELlyWUL@#|2xDiPcx|nPoU>x@H@w&->z1EQ`;a%JUyn&)Oz|y
zcTIpsgCAkvRXtSlog{x(T)-5+4u^<woP6E!elUe=s~Jv2(>k%G=}pbl=7YjbpVao6
z;7HTZ(vE{poVVHF2n(I<nAOn6#P_AzB%j8w_u!gxZbxIOW7Itx)VC*QnbTxlr&z>n
zObR0jsTWt6w~Xg%i-#wX*N<`8#!-)PmXUNFYO_w1{)$Qg;yg{l>yy9v>H{w!u<(M#
zfIb<+cfZ^Hd?Ajbe0m}gheJkqrM1a1j|2h1r4$j7pSQ_p@YR)g&M}BUlo*F^a^r^l
zY4I{siLIm<qZCD1R>f{tKY4P#T6jbZ?QRsuB*&<W(pSsXa(z0gc_HP!ZNINmjEl-A
z)w+p9RFtVGtHsG#o(mE}O6}R}pM^+jhDaa#m4ATbveV&%_br?KZhQHRn3yOgi7DM*
zoDpG4!BmQBsiOPc766>1d=o`ACh?w2_P#g;07*erR;LeR3{RdsMZ^d9&ti%x21oqp
z;e$LIB}ODsNqFe@J6~bUklet&f=>4UedS0Jz|*$gpFjR&Od3;q_}UxyU;kikCxm7f
z_FFJDiK$0qb$(XPSBpicx3S%;BmnFE+w$gVh`_!CFbR!F(v$)-634a%Gm&Vfr)LiU
ztleKCAp3&YnN#Qd`t*J-v}W|ziJ2j$wnoI&dJTYC*-KSI+q6x+zIVS`o}^G80Yql8
zK&5J?``xZ->htqw!?ZbB6@!k>q{B_fZkh&(sH%;0Y%rC??42(F36aebn5L9orY3ne
zH}-dPhobA6Rd>uVdzmEcd9h}eLL(_OZ32Mx={@J1rUYG3h>*Q4Paou9P-2^6V&}-<
z?4AdJXHVYtzC5}A2mn&s<dr=OC}z2@E{DkI-)hzMlFb|w^QgEKqJ)@smrsZ~%eKzO
zOvKDWvkg&V67P$mtN<aeIcBz4uGsmDP0j32)+-|NWo4>5@5@fIKs?H>?5KTvD_Z&t
z7uF@#4PH~syG4>`HynBXwQgcxbC>GlmAKOkB{_EcxZ#|MT~RJfq}e{pf%i1Eb+?_3
zw|QHRtY$jKpH8nnR{_XeS2EQkV&=zGW6T^gij+F;onnu^?Me4Th;Kc^9y=D@*cBw#
zY3ugXoKajUZ;&Ia7N&y|kuvyk2I4cA9|1FupNJ4>3ehxELZ0B=pU>2`gOnMEz_0HP
zj=W@%lsfxjk(~2&Oar@GA0Pt(vXBI^;2{@&q#<`W(N2E8YbX+tnW{(!;qC3HD0BHc
zLGUgpmqB3*5sA?hvGc1UVrHkrHxrepYy2SsB-O*z^XP-W_>VsE;Wtjfo;y)+(%k*W
zF(Z7nDd9CPiJ1&Ic@}n<TMg{ezQ{H-<Wxl6uoi3g6l`8!oZAf8D0X;MCd|%jGmk&(
zlh1idIvG5}p{RSY*zHZ~?d6s~JT9-_DWA04Rx;nsLcxngft^hdfytHl8ketQaGJih
zHr6+dZa;iqfU0lsGUSyPdZ}7W>WYkqCeOrfX03@tUC{s`H|Mf0u!?}C9QrvTaKx@q
zNC2_R*iz74>bR+rL{ez$tOA2XOq}}%2ofc#gu*jB&&&ovM6*O$j7e3K?oBNvK?LWr
za44&SWZy#3rfCq7nVc&^vri(92@&^ojn<Ja#3Fmo?04HOATCZ5-QY=WIIXX?ZIqO%
z6tbO+0lfD94}nIL;6+nP2o~xc%r`#+v%K5oAP!MfQc8KoAND8AG(|%|iO|vbqNGU9
z<xLFGG=ZvZw_9enT&=Q#IVVRPY&Oyq0CM8)%4)LZ46G7MqA@f~)RES8%<|cJ0F#t*
zLl-kwpU`_Q$OD4&B_cTzRom}t>lKMa(qH-OKlgWj{#U-?D}LwK{oa3SXcf;f<QChS
z*a3o#=`zq=Nn;1-%@<o{umdOeaSt-PS$WCq1~T<cz)_s4@ZNIL-%zpd(Tu%ONeH2B
z8t>Q_l}K&S>H6l$<*TJrU9Vg3I5c}=CUV&bEXB|l_Mt2*V$PWm07^<RwkDz~1v_Gw
zoe1;$dr^o&QDaKJTx6p$L@Epcp!4G-BBU6Voq7NSbiOi(s#=tVFBjP<EIm6nRbuao
za>C=v#ArRfcmTMiliJH9@kgpkHr=XwRteo=N77sD!gx1WrHy`%hvNs~Icl`lt6m|q
zsHA$^i7;n|3=z(Fgl1}The`Mf-~3)}glGmaNvWAiNZzq?e)fbW#eGRB*v=OVDi<b6
zH4!^7V9vA5>!i<>Qk2wAb;x47@4N{SnTcbl<zWB-AOJ~3K~yl;F|65d5Yc<*oOiwu
z(HLV45fDO5ss<tT*$HBm_v}L1SOg5jEQSUV*Xy-&uC2EQ;FtiQ-tWC*?^#s<68nOk
zubalq&Qdh*ZwlPZhT?w+v5oOG1{DdRX6N7cIiKIwn|61hDk_4Yq1p3feebK!X~<gh
z78PSGibF>+Vs9$RT2MgjE;b_(fO2)3pr?rK_uH~soSr=}uz2xAokQeK+M}<d0a!|{
zid4%JJL(|js&Z&sG|lH6V{0nR1u-)_1IV$9q?Wk==a~Q;`?4aUa(TkeH@nLi<G$Vu
zhyC%t_4j`I7k(80{^$Sg@4s`t{f=+?GIHFr9>>WTL*vRtM~>_#8WF$zMtE1i_9QPk
zhT&Wvzg}l&KV80GWGcc9n{F?Q)%_Sk*lxF{r>A9AxfrHkT_h^1rJ1c$FxA-XxhS1S
z07Q1yHpBQV$_l_FwgBjgQY1C|UEWQ7xgd7g7qgQ*O@SzL<TXTD0J);-JM>1NSvV=j
zQZWhiI$q9Kh=?FXQM#fccI=#pY2FBDm^I64K1ans>U!|+X6gF?)?}SA&WJwCJRIcb
z08?)XL6{!-#Zy1KKK!~lW$d6&<h+EYt@pkteNh4ubjs|XhJ^Z;0(1;5@GFcR4$ux`
zqt%AMhmJ$+OhO>yyw+#&%^Ws&%3)LK+mVh9LqXBZ0Ceao9pHX3x9dAI`h&f=ce<b+
z+26weMk<AYs)|T%x#e#dIKMq~Kvk8P!JfBhBB-f|<{BtF=X1o=i%6*?m86|40AXKE
zzP7{PpX$WH<FN5Qx4AGF&<BG;f0k2oj)`&tfrK!yCgx*47r<;1%np7YM~TREKfpQc
z0B7QoxmVSR(Pq>u4+s3h&wKyh{XajNc`N_>Fa7$yjeq<P{l2R3FtV8DG>lgl%wI8F
zUrFuKCehFpZArWu>T$>7n&A<)=(?{aBxags`J<KsVz)!vG&(Rdz$x;oZw+)Bzp4np
zxkh4rGTiMDNQ7#gUW2J3cD`a+BXp(^(S_GtivT*zUDi3&PRnqTV|7OZP}QkR#+482
zH=(zLw_R*MZQ5PO^mMyovRKXld$C!V*TVtaA$|2X>2*u*D?Z5H=8>{WIwow6mS$$I
zs0y`3>6t(!<*5@xGh3s{mBePYZ^CK0T%SE^_Luw3({i!)<w8;d0AH?%@Drc-MBa4}
zplx@=z9^R|1xe94&s?<4F2h5ZT@=M6LuZ?vbFNG=w9O6;avBE!A&HqSD~|}y5hD3w
z(W#56Md`qz+3V-o#igo#@Pi+el(5|a;$nH4Wl<!CltOIwZM}W%^*4x|FN&MT|8~1Q
zf9LVCDwz3wAN+7xt=f8rgaBlw7w>#LG|hguIXQc{K6@DIU2N+<leE6tsUWF~a|zKH
z5xmdcO3Q{12$=Ozi5zj3SZl1Oy%*&ov~>)-YI%xC)pBL3_Z}>>HJzCi<qESb+*E-!
zB>-@)92`YLv(KX?A9)~&BVr5<05CgX&Y46H3io;Yj3G4AILE|T@AtWmN}as`K6>=1
zn>oJx?9cuD1pGrk{xkVEfA1f?`Dgx{pZe}U{1vCGswlXBg6NBd<Kk5<Y6pNdBt~+k
zVwzsXx?*rWiU&&`n`fHIc$!HDFR*6kNT<s?XVFYX<X!op<!V`#zUTX!nbo_?A-DGJ
z9s!XZ0(I7gF^D8nX`0r|+9)FO=suD2)%w&-H&5Rxm+MDoAIe4Y6lw`g4vm&oVWr#c
zTP6}oSzfAb_80GbVk#LEV-0}pPT9Gb1R%8aHV3dNS%@j6i?+V>zI3k0J7`;PG&YVI
zOfN4liRkR?>^gC^O#FX!S%zwg<lGSeM}`FPpgeHrqQ!M5aG)44Wr^IqP1u)M5DAD<
zy9YC3M$Uw#flwcr*{x0h2l+5F73)ufVC044#M<pMu$hk|cYPKPOf2W^sNFl*WgQB&
z&mCNQi^9RRe#p%_z}g_JH3@QU;;)VfQ@eFIY^}|M;fZ{_&1zYb_;yy)03B8sv%^q2
z+q6GF$*@rcEhnl|E5zQh5ocl7)YTpjbCpTRGDkEZ9;|^qgv4y_yg293172M`xIQVu
zBb&5IduIH)D{4E~=cv%<r8GUs9>`-~`6a*o8^7vz4IlfpH_w0INB{QYXWJ>!|6PuV
z?_$(&Q&r{$uadc;0nF~+t^e5po^Jl9Ys_kF<|@#+TMrJP6FTXE!@!UYOa@+djPC~6
zkV=jseElp!z^TU};G9h}r8Er-(0l^qk5Co~?7m}4tC&iB{FB$apXyFEl@8-emDC5t
zgG7@dGZ7JcBz`{T^*TcR?Q+fB;JKwX>vKhZZy;=%nS?sD?XC%aak4ypP(OZqS8q;F
z7KF4sdC>KovUh_d0BGyoJD;laCGPf5LrnKhDk5@4Nyzt4m!h_-TU9&1+;i^2<^UEQ
zGt^BoQ*L7)LZ-*>Ji%<mhvpESFW41%e(W|IGi5|{R1{9tvg5hgPSsM9vZ@|Fe3*~_
z<jGStd-(97_r6%1v`ziw$umTFSS(TsSv?s5vgmeEb?$w~4Wa3@e)#D1hmT&%W%b>~
zJC~0?Q7qQb$4!W+GoSa~dfqIBRwOw|mi5NWMB=m_O3Xxl@N!et*w(6&LTjo`+c@XF
z_e4z2I}tEQp#cC_l;n%2kKc6Ouhyrza=^~BqoE8SDHi1d5LE?Koi9v{*r{r}-{cGQ
zj<G5V@5vWMXIN+e;LAl0z0IuNoM+nyW?}~C3+IYw&z`A@YDcAa&Mnuc8T1q+Hv26|
z`lhe>q9*9y_}O31?|J*__CNWNpZczE{ue&y1NTLZi5`~K3p8%{E~FzQMtC*xJG+Bg
z)6Kai-nuS3?bAz6;*Wp=#nF`QH>4J0P8Q7`yzw~zRBz8U#i!@z-Z^#!BAO&qRY}Ei
zT`o?V{YBXC9=!H`Ky3FLm9*dQo$I~b5hccUzlouap<(vJBIbOBgfUzY({V-0xgw=@
zcK&9Cciig^meq-*;9Q%M?CY>ZHw7dCK;fAv+lF$nI_<RjZq**Xd(w|c=;*3};|^Bi
zD|!7_Cy_5F6n;w($t@E{GX>Gyf|VG|WZ-p}X<KiLYFRGUQ~mvXKXZIf^N=2UfvJh;
z)bkR=8yX;Z%bohYiwf|79NTvg5sp%iS&P<2-|FEHnv;T?WXvW+-z!YQu+K=w&cR_y
za&(_;?yhY%3z;X1&oC!~-@+EBYl!uIk}k^b%LV<Ay7GxnjqOKGE24?o+0pxl!8R(T
z4RN|n67d{VA7tfMtipIr^K6<g;+Ta@)5@_VGP$dV8Te%2;80A;=liYS@TI@^i#~Vw
zrp>PX!N2l%fBx@({4+D&KhDyg`{oxdXkBNscYP8$Gpx__^8<VPe$3FwXCHm#?NExJ
zCWEVMaP&S_d3tNlw(rk(Vs|%JVHipmz5IQz1U||Nc0{1=Dr{cCu-o3Y_eu=Uj+VcJ
z2mZ3YurGWvcPo>;$Z_0YJ~Ca=ay>W4DZ{FCNd6*6*%L0e3a)E8+%DL8d8M~29F|QF
zlt)qw8AOy~Q*WPDg)3iswA*eCw5SA;cblg~ob{dWom9>j-e((FU9$tE++9~mU{)<p
zRE4R|_zUN}E2?Y(Q<RmjmM3avd51&h9kDN~6#z&I`6g%VH8B(OX0s6yQ8TlB9hiB!
zTmx8&O@{KDrncGjE3)N;H8HX;5cJWbhpKx1>}gSyi^VFmA%vEh7VMWN_lTT<&2Mrx
zT<iltL`_ju>g`2`S4K1uVlLMYOy%;OPx@;4;PnpxK<JT^nH-XDduaFAxp)Hr#3W6d
z@`+ZZ7Csi$Dlbn&mQozb&~+QVsEBY3M0<A5`J&$M%naHV0qT%gRP-5`)oolX7AGes
zIkIEteNlyWKU8%yq9?R_FmT=j5+SKIkdjE$CRU3RL{t@nF7NDH>8QzK6kil&QHaE*
z-kzMC4Et_q_sld@s3oPgZG2JWXZl_L`d4oD?JxbxCx^@b;lKWWeDl}-v)}YDeer>O
zaE9GF=iy3+KMB_bak<Gle{;MslC+~7>$b1l@ikQ>MtH>l0wQnj;IiWlhBJt`-(Frk
zeX>|AilVr9{0ReN_8roM$Q2bLNDOToHoIN1Z=5@?s^wyRuianf5{0RGpU2BeMBje<
z?ZSKSI3|fn3ZDq!?9uy)Ikk<coIQL!6J&Fjpr{tr@+1qa#~5OiT=`s=OJ6P)mGi~o
z<o;`5u-`l_s^#MJL1zhTYGAMX%1n2c7j<2WC<71^nuh(BoMU&Z$Hc@rUIpxN|9Gv&
z`dy!m0r+`*cs!`wv_^ecnZQ@=hH<-GsngbA2iO^_rQWj-0IStK1dO2}Vq%wR$~o6G
zRRg8xL~hqu9$x{@`Sc8J4`Zrf!L*!&F|$qNbX7%7rn+26!;6`jh>5sQeR2aJN0pG-
zemOQk>KaQKr_`~H2#I-O<}&zLW;4w3r0q}`4CXCD?cb#tFNZxpSLBfTgF}1o=DX8B
zR@F37j<CM{NotyDX9r5bQ`XTz*pZ=@+WFw<&?V`l(#Bxjh7j6Ra`SckRUcEUi1t6u
ztMUXxz}`!4^>ICR-a0tZRUegq=bgf#vkM3vk;{f>pT+p5_)nYI_aLHo{3pKcYd`#f
z2h*GS*Z$W3{TKfGp9xW3B(%RND|&(Vzsl)}ulOGxzQ%zu|2O7#W4;Bd8NF;r1qQHe
zPcI$$6_K-<R~{R^_BtVAZ?x49DYfBocj{8a{c}g6(KT?^#fKhan!)(&GrcOS{xUmu
zjyP-9IL_SJ&bzo*`k&95=Qr|)92nmnFvs-%U#Ijo@tnHi1mA_;-V3bwcmxd@(xjsz
z(DdLgv@H_3o@$->aXH-11H$@B?g2R=M@wiOd&au#XJpZ3)PDY@E2?ZO@NVvUhKG_n
z2WvgV7>RJTT2|G<6;;lG%Bq4snaFc4Bh$L-FtMZ{DR?3TmK1Umv9t2)_9SHIi6{f@
zV^kNDa1aT-=uF>)*QAyyO5BOwnx@#ss8v<<Ija&O_puebLPTQh`g7iUb`CIP*L!AC
z6%|b}m}zc54C8>=vE$g*o$biM;22^WoK}fvxeFwSp)phM%Uo*DF5l2w7y^LAXeLFq
z#Ln#xh{cz*Jau`oAxmbG`N(;TB4SmEZ7m|1#dUh`UZ#s=pNhrmB-@Ca>d9$E#8tIW
zmHk_vN-1r(TS7ntN(qs2ekr1AhP2CO!T`{=k(eBF2qEie0~k_+n8QG$zSCo7F(xw=
zwU}a;x2eU@0-|$%m`J8Noj)ofDdZ(`QTp%u_TT>}|BIh^e7+st@U#EVM?dw>#rOTO
zk9_#_zD+Bt*_l!my2$i)Rg>uxw8K7q#sZ9PO?J1HkVffDq$%xvO7zb0$Jn09JC@yX
ztwZCRPuKgRsw(e`Ub0I=2mt6kJ0erDzBKL~13*k#ikPO9l9{HI)XX~;RZUS<y<_Lt
zIfq0n;+PRJ!&Y+^7}{NjV8~qzRf)k=GET=awNX$lw0kfCM3q!;p8)_lpJAvu0L>QJ
zgbZLsQ8?!^OkG3~ky0e**m<*C-l(2Kg_vtGrgR)689-)kyt|nOb<5<HyCA;6K7E%C
zLT@ZO6+5KdyB(SGh}039W$0*juo%-^zRCmMh0rpybA6<bl>G-p2M;j4@<dHFgCFu2
zm`Y~Gz|3OUR0N6Gd65L~=0*rNielu2JH=R3)v~O(s9d>-W+17m7Wqy|ig~x{Ow4nf
zN|fgSyMi60IH}=`W<$VSAZEEijY)ipF0qWcd3ORT$qZ78&S6*QFiSC{)Gk){5V38#
z7A_Iz@YVSuNfTnq4=95;x>5-{=Uf*6#}>f6&-NFYN@&F17iH!-_;PWCNIJ??j=I@q
zhM@)k=S!8;)*F%T$sgSN^}XfvM_(?g<yulyNo~Cg^{$wl0Q*8yG*!T4W<^<@K6pLH
zUTwXL&AwVzVAkwSQ>@mf#BQ-ZO)<UwsW)ScF-FIfm%QOogqTDOC;B*b+ZiIpBuNxR
z&494Jl5ASHG0Xp?G=lg;2#CnUz0bhF73*f7s-$G>k&yu4>}2sh-}==*@ZbK_)64yE
z@Q;4t$$#*l|JCpP&TsnXzv#F3Gj`nD?DiYs_09l@gxJ;1a1@-o%QiTHKV*4poe=Cs
zqW4sn#6)}O=AHA9=Wm3I#e$sAyk0N}A&BT|S>&)L&s;+Ej$_i8L?r7PB{j`sgF2nH
zWTxJ+V|LE5sWN6I8cop<b6Fxb`>EWTs>on{fWVHVi3Sjw+EPS>yb&VO^5niqify+M
z#!#miigJmFMOh#cSTMts1koe~XB9ht=U%d1nT5S4&1u9Vf=6~(>uO!}0-=z}9lm}l
zpq=Rx8X7ZWcGe@di8*sevNcNPL(j{(Sq_s%So~zF_oV3w{rp9W(KBR6wjPIBQERA2
z&1$W9R~eqWR7`saM5kV8mTlJicnj4Au1S~tN!|pmiNE?9pdCO+j$tL!l3@Qf>Lc%w
zz|cW*G(#D=e^9y2hJ!3z?#WNSE0^qyhzv|}LVx?adVnJ_5K)og(va9WS1>#33&n$i
z+LT(LA}PicV~jDM-V{5KJ9$INH1{t}HT&gug{uBRiAWYXRh9nRaQfAmD9hPGd_1eJ
z3Oz9yN1lJM`+v^$D`e_QSmTig%8|{W5A#P%)6o0%2kY<owy(N>GV@*C?%O~4=l{DO
z{_($=l3cq;+10KZw|;8<5@hhwqLkPCbY(;2R;Oyu`G34sDa=$wB!4I?$4-n_x|u>*
z!)e^syUqmDKtbwFUyrBf*alLdDei3Id^y%~p=VDV^ngd}%@KVz>p#F?a6c`#zRKbu
zUQvI(^9x?&-(5a3LB_!qR-(5%NdQniey06Oa;-i=e&X)r-u+><%@XRN*%#Gvu{;gU
zF1B@1EzDqhaUMc@@9h2*P&Xh6O%#p<pK^IBqeAwZ^SnXlGP<NBDQ0%OYRWq$IbW?h
zi2Mu8T9s?TGS|a!GR&HYv0OZP{FbR^xw6Y`QxwI$(^CW6KD&^l653pJ*=@ElJ@bwc
zaj{rVqj(j4eDSn!u5c7ZW0Kr}@WlcEVraB;7^kc>h|Mm>Sl3NiRz+E|^Tb{|nP~%n
z7=;;}H&ESfH)U1bzkff*HpP(Bp!Kpev+P#?^vM(N{d&F5Qk+>$-}_>Ha&NcWUS3?B
zot+V}nf8i+H*s205>+jVt}q)@+&p^*0E@!2bKd*a*=y^w*W3MNZ1=eqmlNL%Ad;@X
zh|O->H2ah^BsqKVV7)qNb{EiL(<#(D1CtnX6+vRGx0gA6lo%w%a(RNC;wxS}eeBp}
zw(^6sdtFW6m+VV0HPbxOm|d>y594#yhw!%FhqzxY7iHm!#YvY#fDwBnWLKz&zWK4$
z>DkHsNBIQuW?b(sOto!mGut<jIj&3)sjQayE1WN@#WE-5<6d}w{XO6I)&JR#{+(yr
zncv}$|F1v$i~sP~zxR**!AJK`oG<3lXJ-xXe5sl=C1Q7b-9a-MS{SMk0EqovQbMyE
zK<(3OyaCE@CIdbw;}KL6bo%wCDIpUgXP{QrvY&FduRby&67P4rdcRvPOCmbGcaMGX
z^sP@ik5+=2J$v?SeR}V~Yah6H_OuP>$c|jOTtQZNFtd~bfaU^bhI%<)h$NJ5I>b<e
zftsjlwOFf43@sv7%Tqu=WHT{U^d-2$x5-Q;29q!e{dK>2ns=gXY*~2cdftMm078sH
zM9vWr53H@bCji&XWna7!)i8q>>SEsAhHt?Bh@_O&VsDWQQ@(rzXm^{??22mHF{yI6
zp_Zh9o+4$vV#5^FBQcmM*>jU<dx2Rr|I8dxG1AZbp6@kG?6D;aczX+GgBMX~J2sP>
z8JNwf^+zgV(;oiBM;>5IAg0;hh&D2tTb;u+ghHYt@4G3Zz^2{3!-v-4YX;x+o5Jwt
zk4T*36b2H=X#UnGes;+5#~JZqNURQc5Ol;$?tuwo&^?J1d-+nF;%cTc|5swWCWxF_
zwmY$|(<A%C19aGUQ8WC_?EYMF6W{k>{k?zWtM9E38HB(5s~`WaKlLL&_lv)JaQU-Q
z+1-Tq7-;Znku{V5pPTv3eB)j?RUK8KbLC_h9YZf>#4%>VIvhS+JTM*vJa`K8;WUMM
zO-4}fgV9$?4tx+{LixdYdPX?YGlq8!b!e~R--}W<?u^wM?_odho_}tWEc=>e4sTob
z!2j{jf9LR1iZOeIcRm1py(<SZ(Cev8!?)oSa$1vt^&N}3T&U_;SfBL{bF}EXFmtFE
znDqji&`F^KAdl69qFNDi4DB7pg@}Ce<G;RMtxitXlA=iR<&s^I`NG7Gh<@YOKUS9I
z+1VK)nkFQdyPKLKF(a}{RI`hVi?$7){h`kh5ltaqeu`~q>)gX*SF$f2f9eyea(a5k
zj(xf8!K!lp_|4_&bai@vb9uhKyihYy^Gt|Pm7WO8YCV8QW2n1EjF^ZyM|}*0MNws8
zBt#<T^98O}%aipw-%oa)oR<{AfW5!D2$R#h%kw9y(u5?ctEwof#p@sVFaT^Xo|vkn
z(8F*%&T2>4?6*TBS|l<vk&7{kq!6VIy%vElvtD_2uoFq2dh?Tus$5njd(W;&G34YD
z0MumQX*ge+L1_2BsEV?aokJobx4V2|rbV?P$~6D%45#((BA=m(sadv>JG*y6nLc5%
zSlveiB39Llr;m%OEXxXP3}|Aghi&uZ{`*pFHy7us8j~29h^<!3)pD7;yhXVJfVQb~
zIhvWDY{K{d(EoC=ZI18uN51Au{^&P<P2pcb*lwo8?!Z!1G9;uZ-;>SHkQgze($isD
zU_kC=Pa}mU#U{3UiQ%0mPgQlf@Q&$X(>SK(qUajxMOl>V?dEc`xm+z5rOyta5JMv(
z>$BH1rP%I8^!#E|cy^q*OC+Kx$-M`!5s{=|syVlCzBB-dK_#ZPVPCQ@oG;n=e3hD#
z0o0dIh?t8--t#t_%kw8soFgU@(WJU4JR-C)iCW>ZYz6^>s+`<=bpQ1ah{P9iDY$M?
zJzkkV17CNMSyf4rQeMpSo+2qsTT#rOT%i&VR9RfPzys+7JjDDQR=00RFAfEBujVu2
z^-m7x|Bc1sqf;8?iY5fxYZ1NkRC+jpE;PGRJbi?8!(7OB>T!m%z)mN6T{g;+^*nLJ
zx!P9m@Cv<l!Lj=Am7-r)sT|uOYkx-W>0*o9Mc)~D*h?7O(0b{$#d|5Lx$N~2ljBtd
zf-X7kJsBoK!_%;_PZXwd0Fy)7wUOy0f4x2kwA{t-P6Ycbm3j`#kb&VuNp6<2+Ci0I
z(B(SHg2$U}@WI#5{^RfX`jgca+rUr!?O*ugfBHv0`WtV(8q@+@iDk$4N;i4nMI7J%
zSAy~%>qE2P-{#-m3%L)4r}0r{BKw5iK3T2oh?{@K2!m0PVbo~@JAkH4Sv*%QlQxl0
z9HF`J89+sQPhWSs8&@>25Br5zbPxM)bMs}8R8nkqFtOnt1rhq?kBDuqb~a$AksS8>
zO%^`Rv(fn~g*LR?YIUz#-P>P2t+$ueay=B6Lc3?@s^vWZOQD8=s7FM^NF=dU1C`An
zDv{NfxM%+6D=Nw*`=aM-UlBdAFRJyuX19rT<8i^hkhnE7)0D4HQo49{ZU8B!YEiA0
zs}R}@qlez@D5F32o2P0fNf2?dTu<?YDF#U~rlhKy%L_zIqTUzx&dzeiyx(mvFE>o!
zJUcTpSguxxC@I(kK$Xe$-m`b?i=tvL5)Yavx!DO|#Pr&u2fkbs)vB#G?SAXc9AH~-
z0iaslL#7+n(q^}7_S=W=`z&G(O|2?nzj1}ndwU9vnMz9RJh5w=oup7M)&SVlyOh#u
zwa&H`nb)D3Bn2WW%aSNDCFdLfwoRiV_a44Jt*H{TFBhgd;A~ZMX4$#DBO*KBrHPV4
zvnTfKT!u1j_pPa}fS7qob1cebej=G69NN}#*lhQ`Gl!Mc$_!MZsMc*VXc0Qd4m%>8
z2~F%SpCHm=xylrywrO^|Ei)6l5ZV~EX)ggFiKyD?y2?GLH|{UK?~i=-fBK_8z1bb+
zg}?FUlkfh4zw~eZYhU$^U;CvmgAvP^Mm>;|&0azWF5bt1_f>KkcUZWHg-AOUJrxzr
z+hRr`U8@ps>wU1<J=<SC&0LPsGk`m}|EMUcUH$(#9y$tWDiT{0LBxIC?CWN|DiN@5
zLQLuGwWX@KqEHc$=zZyYfyBfd+I<RbX!qCy-!j8zzc~j0?<*woMWrgS*-G-vzTRD!
zsq;l|#-b^<85&NQPS+JqD5qt)M4}UNfGDvQk^O#;0A=a;<+Qc08#!0|@XXuN2XFg~
zOCk?K)q}ww+C7oWMG+(?s?zMcNSr+qIbQ)nsJ9jycXh5kGhFFH`q}qSZ`m|a!)ft$
zywPJS)>l?DTA>f|u!DwUSJ$8O9kJKTp6MH9!$qURUeL^v_3FDfE|+*T1~Mnt%%sbN
zW|eCroPz?goeB*>puu6sD&s+t2(b(&X{Jd8fw-ghS?;6>!U4po(|LlKh5dDx*75y2
zQ&S!2`PVBZ&7Ql8kjq5iK#F1J(m4rwJ3?Jow^Y$dRi__1{X>|_Pv_gN^ZE9%H_xL!
zTP&BI%uRN_(F6b@24?Jth+R>FLEG#(ix)8G(mDcOTwa*kqAGF)b>hc6t2L#VB*l<)
z@ZY-kc-KdJcDdOWK3h4OsS(rh3e&szBD0I3-Pd(hRb^R)woWl-JNx{+R?A}Aeg1}j
z@pu2#pZvKip-KPskN?!q|KhLyhu{7U56@0svO;=Y-R!2e%qv^_Y%Z;SU^ZwkdF<?&
zJXvqD*EJvGGln%{=<!}?wU+<@AOJ~3K~w=|R=rJH*ETk;iSmK~eLu!bGiNMAhqC+w
zf&mhMOr~`*HDetM8NIp@0!$Sw5IaFjW(GtP8btQreOdP3BCo^AYBK=G2-NS(a5#|}
zF*9?WkxK6>iAQ~G>|0WH{Rwn51Jj}Sm8BLC##NA=E2<@$g=R}c<#L@V-r1kCsFsM-
z$vSt#lTwN)w%!+P4i3<&2!zz{pkswiQpni-VO}u%;q*>V?>R@!?jnRnwPOPu;9rQS
zsulo7ZNr2q1p_5QW>3r^G{e5jTp;SC{Z7n9=7{A<lIw3}RWY;ecCN>Fi7F9Qg#!ao
zrOEbYY9bcf77z&00G7)I5i*mh1!<T$N2bGL+U@tw`6V%ci9}9LB_SZYA|(lNhi1>u
zH_V*#)pB+D>>LpY6u^pdLChK3DJcMes<JC`AC8!F9e^EU@0Hj^Ii?H_eP4M*$vxU(
zY0knQ`OQE1v;XjyKKj;g<w^ViuRu`0fBo{W{kz})!~fp5eEskH=YGd9ji(_9zWRmY
zIr+p3Z&hlVX{iR?Fu)tW_Rf2~sTv{WyegP27K_{k1^^KyMq*d^LQBbQ?6NArtO=Kh
z(AL|meUW1<L_v(u5pN2tNJlAc%-Ho@;gA$m3A5k^p!JFplYk}=68rMHjeLw^bJYi+
zEK5XS$Apx5S?@}b(G2Iq>E@^Z8MG(cv>l#ec8kPGx55`y&#%q8E<}#IB}i4xBsLwX
z%Av~zJsfEGlj%1^!PniRsS8QZ5I_K+&i|LEip#{VAkL*%az(jZYf7Ccj#*JwW+FXt
zf{@4;A+&8%<6(PmjLzW*Y@J~~)7zDq0~zIUdhcEgO|!cYH4*KI1oKUvh^oZ`01y)N
z6<}uag?B|&*R^Vw(y;TWq9)jRJW_T=FtbeN&0gzOSvl`RQ|Gd3X67+d>0L+?qaxW5
zP-YHN2rVLJH@n4RnXfuX8`^fUT>GM$)_!;Uy7Z|me0TZmIHg=mj7`%t&7$(R;VL=r
zn3s<qKUUS%q9DT4`>*FRud1XJI*E2dVu!hMBniNndFZxv04PbBl-E0vA|j@VV1G8U
zhgWKN_8I-!?3zFGL;ut7|MGw4JOA*%oDnqBLYBRX74cnV=$hHU-yn9x?~1>vDu|f(
zl$!`Dsj4b7jiJqjbZ<cHy!Qy|i;A4jTy@;;05H^BB$rjtR8&v^6p7gZJMXY)WjplO
zQwm6wrG{g>A24Fs<T9%ijq!I3#*STaHG>OABrpP`6p6X2s-cm2pcwZqZ5T%lGklk#
zqW35V9M}91n|(j_Mym?v%W(!t%;q+Oa!@8-0RX!K(7B_VhDQ~ZD_wwZtjSEkCgY<R
zK`GeJOz7hkfVorDfQ=rsI)^&j!MAtSHtn@7jsdht1Mb5n$QUzFl^g?3{m?rlakJ6E
zyz8zbBC>NRY9KHexD)5?Giw}X|0-fe0Ok%}F$fHrsrKgSdcaHQ^R@$!(81kR%beoT
zBHJ+&b3W$@{I<KFy+$HV4cw0(+3>t*j<CowPT0jmIPwiL32b0;caH$*AbshpscJ@j
zKiB|7BrgEZH%k01^IDX}7ku6ay>p*-E6&lRJ4`gMK*o)J@i%v>ZeRD+tdMsV1AfNy
z87U3De}GPDF#Q<Ju!g?M3BA*OuW4$|xxtALvY>Deq*CkHbvd=j@QCg>*rlzigSLqo
zfQka;%*-b8wy3JV<@^Y*k;1v{P@I2ckeNN$!Dc__?pt3YJUET4&FKID2S-*FID#1F
zGGi7n>~@_AQ{Geu4L9p`@W^>)m*rR_g`Uuw?JUNF57`4`AAr8sNbK@Qyf6H{B6ILl
z4`fF`o!H&^#k$#Vcbm&<xhfY+6H%2(UJJflND3*oW-76j7-N)_Y47Jxx6hv5d-!^m
zBSFMR5AU-ps`XhmbVg<(ZkxKP_tmN>s@3bOGXQIM7ZO9YIvb+|gw4gXciwsY@U{2d
zKYK0TpU~`8Wpn<{ez!?#7Gu4AW@e%$AvJBx`;VxanRj(3%zaIsq-sgDy}V3G9zA-<
zgekVF>5cb)5E0pzs_F9LoH%gc>`GV`)pEHcS0Iurie4+y4gkc&%$>ljltmT@?ImgY
z`gmEbVvJ3_Cu$KuBxy>ElY0PI@3tw$U42;;#r^yD5iz^Hn~JKaq!44>#%1XdF~lTh
zO?%EvtA#fMz<<&sfq(k*KKLJf`$yh*?d<j)zE@K>d*02@)aG92`rxzVoQER?3>6vP
zoJBLHpGq<0@%BP%X9($X+bkDFS@2ZYC$u~2ng#moatGKDL02VX_SLf4oM*Wr0O-x@
zTT?3vR)v%_#x3l&*@I$Q5Bt#Pex9b3QUJ4}#G+glt5XS$q_Epww)I}r%pmO=Ra-3z
zGuiDM0Pv2IScoah`(;0w&GyOgL=n+@?|lWP+s)+)uw0(Z3IG#y#c|yK+<`H?=Rn!&
zmY;f86GV3ISWfSFMY{Imz8JR56xs}EkQjPHjLtJP=R52R0P9T$872VFtkoAo1O0a9
z<{2M8KM{RS7JlH;e$`RzfCGS?7x*-soaBXe2%fjuDckr?IP8wXK+x_X%QSny6Dj;Y
zEjuLUPyOgRZ~D%O&|p*<HW)=Nq2qlY1Ud7(8gp=Khd}E&!l>)F9$6mt7Vp@FF|$D2
zW^vE$kuoqw%j3i9nGq9I_`nX%$@)};Z!StOBO0p?QnU!5rbFuZEnok|qGJR2^z>x8
zT!m(DW+^2z+c&{ET2_UbZFUWI@LhIH)nZwei_PUTGxgphVzoN8UUd8L8b#DpG<6Ey
zqWA7U?9As>Hy7tcQ5I#DRg&3xX20L<0IaMQ%)H%PI_Ju20cJ7OAxYDw<zlf|bTzL1
zZmVjdVrGT+h`>yM=zaAI|KOAV)&KC*SI=#tf8!5)`8R*vmod?2=q~=EN#0%7SA-)0
z4C^6uS7#eIP<_az;eY2&qP<B893~XA4A`c#5^iD6dc2EtIjarijvlTt9P~wZof~rW
zm)yN>%Kl%?P=UK6l#dovm}qAlLL_f<AEs~rYk%%LCZSv;azlD|93u>-^N8qtp^{Pz
z9m&CYB2F1gqGD#9gL(J4gvedvkXd6;Nk|Nx*p+6b@57~eSW{K6RRuF6=PC0FQk;&z
zw%&;(LUcuS^5A`Duz&VArr6fC^WJ+`RO@1~{P@RyO;sK|d{ma@_Tn+IE6Syrwe`lA
zi?UjWb|2e%BJP5|sEAx!Z+b)kFHasI0ufzYJiB=IY*`gW!Ff`Z)ry?2x99ANYI&-v
z@4Wq{%U$xWh6-j-lnX?1z9i-+Z@*~<ZOkg^wp=bw*6ZDFzuWImPS&gCa&viMX1R$N
zLS%N;Vvzw#MY$|iC+&V4>TTckWI$wBTz3z1)F0bj3T-AZgb+mJ;p^|0l-ha=h}H5m
zhB`F6{E@neAr5X$sH$J^yT3Rz_2%hYX5h=pmy2?-R!O2#lvO4_sOrZ*_N)8N<?r~y
zFHSKu`z;_8<pP<RT)w@{_M)w~zFeBw)2B~D8>TDZ%zeS2@a!0yHW@(a9Z`o$Z9_uD
zMLB92BR~+1QI?elzz~zDE=!Mu%me@_b>-_^Em%~(@Gd1WgM6Q36vV9VKxMhAn|ia^
zu2-w&YMDZtQpVV#D=H@b)LW0e<K?0t!e9F6lRx{H{$_T_I(U878xQ})AN|PZf6g0s
zUbf!L4eXlu35&A4!|JKIkM7)10yz)?$mt_9v-3|Lf9lEGpITH!;j?1^F4p(i`PkN`
z(l$F)+w7XEDwkC`T{oMyHM5XJl6>&9KZHodV%2|_NDL}s63G`xom<Y+C-1avd+($|
z<f5o@pts-G7nhfd%9n-rMaf)*b`M~_sED|!H$*PK835|Kx!i23(wBwvzH;8T&2BKY
zKEJGqI%nYJqNtW9i_?ej=~p0qNlFjTs|7v4(BHj(jF{S?a0tFAd*q#{N@(_}tvi1S
z6|gMw(9y2iX5R^s3?3A!zO1_buBkiPA?>*v`fZ}O8|^};3Dzt}x;ApW;Y)if>gz`m
zPIJb2{n!R5$JGBCM`|$6#|4gbdK`7yru^~_E=xqjHc`=@OL)QPel!L;LvIi#71!C7
zPx%;wMtKi$8WYwRF0R?EJv?(Z8TH?0ssLR`JI&LzC-NWh>N^xWj8x*WO=5kDja^^I
zdQ#1hRBP`DHXEJY5h#0!n$5TXQ#gB<t-|0(X<buij`8o?%s5ELO==1_<mg0KE5na+
zYjfR+|M#PB{or5z=__}^Z}{pj`Sx%6s*G~_$E@RX+r)4L6WA@H_6gj;@F0l;>~!~V
z;zuxDat0N|>A{9UW@;IFYSTe<2z%&23oy3zvr6+U-8`0R>peBEYK7%NKZ-P7b<sC2
zlAn2_C2I)3+-S@BbieNDtrNea(bK<ruVGa{U|(cXbHAt)%tST8mkTo!NjX@XF0-1V
zz>LPOlCTp&9-Bsnm<_Lovms^x?uZirQwg{0mhpV#f!Zi3fh3%ixic%VsFr;v5<{~C
zz;bayp#ift#O;22MnzFBog)<s^)|J;qFiC`9Gf#)iEWB0M#*V`_X|Lf6r;9fxzvtD
zYbiEO)9&{B!qL5T)rNGjsqdfN%U~ayOdSMRE(!q5hD~iSCL)5Awg8B@1;C>4YKGLE
z1|x)aUli_P`M{T@FRIJSjjF^n$SRK3IVsdBwmA`WMMchMA9nUW^E3=hQpz@a-SZ+s
zBvnZ<ba7lth`7CYr#I?@XP4W&kvm6@Ia_m_o~(KZjMdu<)im^dV_RqMMgU8pK_pXA
zQ<a2Bo2PF<=iFx7^S515xT4A_x2h03Uz7$=mIZ;{d+<g|vEE)z$3s~yi)x`Uh=gjf
z9QJ5-UR7gk5wKjYQ*1)B_eEzvDUzJ`08oXXlFnZLpr#a>9Uz>RtJv)7-NowUVYyt#
zw$>DO^`)v}3kFaXPDJZA0)VT7sP^2S8HFyzHpO;Pc_RFk-+1TG{n*dMbSRy5vZ}uO
zTfXl1eBp=5p<UxmcAbd)E#sVNqv+txQ%RsJTTstU9}g5e(~Y$KF-2epW+}yKl~Ymz
z6zCmuroF>lcACap&Xr|VW|1ICK~u=GM_I=DL!bNkv8`jXC33xb5v<nE42saI%5L+7
z*k!GTQ194z_ET$k%m>UTR+LKsKxQ**>MgT-^zcE`G?&|Ewc-V5rEFkdF#EQzl)wSm
z8H~O6<tl_441Bp{b{CtP*`KUed2wZOsxmY(4ZyjpW1|!!F%h|${Bd3_pC^rdo8ffJ
z(RG8I+jNAad3&PsE`13zzJruNVo0HF>+QH=XSwYz?dt;e93nHjoc8##^wm;g*7uJC
z2GdQVqg&KW4qC5v5XacT4s16S)a^Ef;M=99U1X1QsAUE^4hWIF>E_g?57WjdvFrLB
zIJwWQk%lbLzyK79P;Fu!-+9wf=ecTQsyX+WAw)gUMC$_CZbUINj*zv^(VY;otxzv6
z3|As)%?wPi4`TBBdyNFVwx@!fKJhf>91JncOj5%Bx{SK}LW5pfCr@l+xHt9fQZ?)f
z=Dl!?45rbYgVh8+*Jas#%FE2AdN3e~h@CS@D7m)TFYZL0A0u|o@-XPS5dknE0Rj<%
z5wp*S${hJb*;SaF^Adw0%@BT>Wvylair20?*58?5`{enb{mVbyhC?rfFZgXA_}+i}
z51gG;qd&~m)5G2^W7X^HI=3m7+SOUj-J3lVdB$U7@tI6VU;ohKZ_WFMq_(@II1%H>
zj~mcb4Lg+#RUvZ|-G_;%(yY~uLlq&@;SbC>pDXXzRZ{=~ZK5v-!$j_{ZYmvp)dR}r
zP@h3bp}o`!|NO+RGd@Z%wH)sxh_BkY1}6k!zyy61+hGo-@$BG4cu;~GN=Add1#|)m
z*e#%--7-oY)hrLY*=mTR!*yT&($UoG`WcwB;HkU8prV-XMW>}Q0c%WDUPk5vnC>?h
zfI!Se;i1z@n{5lRZHG9b4Jlu`nKGlOhN#)VGkX=K{XXx0h{!H$=HgJRaZGL74(<z0
zNY2m~DR(S7_jw|wuG-d>3Fo#F1~9a#ET+tT?1&sh&ikRRtI{QTc@o7Kl8B_lE-SDQ
zjFevMonOdcCbNV9Ng^1;B$8x(ateq@-pqVcONyaw7R%LQx!P|xR_~|#Xbg>+NeT!!
z=%w}gFW8SOb<E~iQbZzSX8<$GN_Kses1oxyVn)qQs=hF@IJO)_Qv}lyHKl4`48CuR
zf~16izNpxFA{K}$l9PZCQjFmwwklCo0I-wh0!X2);UbS)$D~~$7eu?Ln~2sYr)}Hr
z_xlu6UDw$SD)$<*sMtq8{^SRL>}PWNIDP%AU;BH$^$&hIbEb|#u95U4^p^t5TnBUL
zks8<hX^fh$O$QI0*Y1X=upWPYc-oneFufaBwy_Dy!e#K$^!K~{o{+pRh)6YMJe0-=
zkbF_F^D#>UikMkU;v5uZCyAbA(ei_Cn<gb;9K8%A#k{1cY8z4#aL!bOnPQBpnll^S
z*F<d_5>Ymz145KED34=oTS?lq(M+T4>DJuYE;q$l33wDP7;kH4F&zd~2VbPmvw+5-
zw{pZFzhN^Q(vMM*^~SOE3h`O7-l+-@85pPyYR1FL-|=HqY*tOw%vL9M5E?McZGUHj
ztporJT!>@g=5Do>gSaxwG=mP_5j5OE>uT<!3107T-HVrIk+eQvx)PoPlc;QR>uI?A
zri#Es+1~7G>p?_Ba%#HUUY1o=mJ9D8JGUOZIrP33c_W10?Td&)jBQATkJN317E;|+
zcM;1XY9^m_zaeG|ApigqB4Qgv4Hs21vlxY$nUI<0DJZ6-2ioPiu-40GSa#$kMBpsr
zN!eX5ga#3eeZEyO#-?f12Vz{V?<0>A%m_G$jvnS5h@EqrNKC0*tN<xvyNms%t@oNj
zwOFpt9*U$Co9TyBXaP(lAyMUu6dQ>FvBF+t01yGlF@bSPftZ~ZdB!4UgAvV{x}@wP
zoi{?t5KvzfW}VbPUMBJeIkkf8<lC^5LsE%E?2C%nAv1uf=DZd|j7`&~(B!IARuWN7
zfS6*NV&i?q&U?qIn52{38`_5JlT)+Je!ovCsS5X7c`g9H`OfACf9z*=^^8=oUY7s<
zxBM$#`h~wOSKP<NZb*GzVj~<1m3Ec2?@jyGH6J`Ks2(f@cUZdgs_BVH#GDs>y<S~~
z39B-1gajbNne6s;>HXr~DG_OwrZo{U5oKR^_L4Sc*;(3}HWmsCNm(rxdhQk?woS9E
z>t*QyQB46*B&b?SnwJ75%Zd<86k}?d);os?G3@~$CP7pul7lBv9qv#Jt!mwdXa*3{
z?KcVQB@7Q6?zb_iz(W?6si+9upu;|_y=FJ$w^y&vN2A5wWdR2;ZR<@o-sz+njjsI0
zgF%%c<;0Ge`&^%qC`+szxG8oNa=Za6Jf)jV5&X|D^BxL>4`qP4xdhx;UhN^JS1~2~
zlJTrRo8N)6a$r}A%mjt5e$mqfw4d-u)DI3E%;<;+z?k}sv-@4=YmP)jMmDX1%rg7l
zqOU8%bU}vd+*9wkHjamW0#}U4p%BPK4Ad7xZxO<Gz6{{Z3^5H-n_2cEcRsq1QRIgH
z0Rnb4)vFuT<6majr70JsQw7Y|L!&R`5&M3yg22%`ZLH7^MdzV1fp9<o$4R*Y=9HfC
z><Q62cr)}?*aDzE@3V_$GM?yDPcHw|U;N3--OMTM^FRBw@A<br^4f!wYuBLnl1%xE
zkovD`NxKERXM%0X0P=qD(BL97YD@O1P1X>ZJZ*N4m|+3}=woc{>io<INTg;mNRpZv
zK<o`HI)Ii9a~Kf;W0GNQAtE(E)V?*57q~RYW97na56*)5N;Qi4zWRs$Jae9xS6IX6
zRTrK=CXcX6I9WJ`anLI~Pj?lZuLyWkI%}HsK!+=K+wF!OFBYo_6-*_?l!EgG_pAoY
zT`R=ig?zZTc~s3-kx?<I4@^{Ij>0m@y4UgMzM`e<iXkf>F)ylSnl+Yl>^2%+!+_YF
zGbPy}(R3tnmn7Lx1|)W!)Qf70?aBINxX(q|owKUO_)bw&)nXk(onp&G-ceC5h^S)D
z$Wn>v^6~<as^v+cvRY|2O|GiGX9j@GgtXniIqZUGXJ;ZQ#a6{)Ox0ppmgV{RxrmCY
z86;5z9E`2S43bn;wOA}}T$K>XxuPtWYhQ26dY4k0VpQ!#;BE}qtJP_>JON}gwa1?f
zO%2GZY4_~0fq^NAc<&^&yUQmM+T&@1$i67RY<KxiuC$0Srbxs{EGd{-6Jm@pZ~Xvu
zUXj>&W+!F_YN{eJg$5Csy>mrVZwGY67<;M?4_zhYUzllZ5s`dZnOSJ|-~fqI4A$29
z{I1-eJD-HC`3Hw>s`Yxs&TTHAL9Z6Fy?6%zPS+K4!Oo`?B!+5n^5kOor~l&LczUs)
z9^uQr@I(L3ANtCB_fM}|-Q0vGe1}BvmS~roKRz?ndWmDcC>BFf5=aLCA2{N7=inyA
zCbavrN1ug6v8`3*bX^f~-l1Z%>uZt*i1mJ3@3+%r<&F1$U}!}T7^N7R6dER|3U~JK
zbwsMS=P8DAaS8}TEF#<eCz)|k`4}Z8DNFAh7Uc?&Tv;)@H$VQdL2&rw-h&jI*w(J7
zoG+1x*)?x|QbkJ7h*%U(R5zPT09;lcnG1w2as@!dyZNo&{2Gpb)8jCC$>Ddm(K2u?
z0MKl3sONr3F94v~J`)MK^qol*MYYQ2f{26}V}%%F3)U%D9})j@2%8|8L>p2aH9^Vr
z3A+VO$IOncBwirCxXP1ywl>@K2_#OFxaXK#+m#2wu~0t8WWWgg8_#G$V4r%6*|44V
z4poy}W$5pr;dJ92t<A4EQJXnIX9Mm-?2%1K{!>i<kV;M(rt_eu+lv+KMs(5@Md(@I
z6f&j1+mU<V2wr>lk5CW8ITFBOnZfMJBFtDDxGFQgVXWf8Sj$=b)RJ+U;v66|=6UNR
zU73sFVQ1XfJ(+<KbFtZf|9|-t?>yU05Bia>_?_SQRlmzSzREAHzXR_nhs<tqGk=p`
zS1zUl&b%YE%tqm0O9>-8>8My|{USEiGa506HZ3J695?O9S>E9va=};0u1GmXrqryh
z)BR{O2Twcz7`}8Cj_*Y(|1L#GGqBR+dG*LA>-}AaR1xjS2@{`FjGT<H{6FsO!K1N|
zsy*6}h@H<_VE$BR4d2$1;&!t^gw^^)Rj$Os`m!S8Or`7zUZx@{^%(A%xw88I$$OKS
z$+j&$XsxxIbE5g1%-hv_#jC~?wuLRr$TFSiEFp^lk{N<6gn%&&5Ms!L0V5_zj6Cs#
z0V5=Ym?8!YKnxhzGDa?{jO*2Vb#LCx{Qo~9PP6w~i^1CGoP8qV&-`zb)ljMTuI|l@
zKQiK+efC~!eH|bQClwJ+X0=_dH<_d9K$Hq!8Rxdo*w|_4W{*xp63HMdC+<m@fkf^%
z|LMOnbcg=<q^dcOE(BNpI`i%2c`=IWm?Q*N&dzzFeba(jI_0Dxwg?#7EsK~llW+;r
zE86PiUSMo@&ei!6@^pCe-Z@9@W*g#W98Ra>!`<B-02~g7obztm%opnR?!I2oL*J!w
z?8hts$8MNf3V(llhX}%HJdMNYiHOMg{r*10wm&_BY8@zlb?Z62|E4=Uw40p*o=)93
zjz%O=&Z;u>M<3el{vOFW=L)N+Oq>D{72{*`EAnyvvZ+6^^GI|$9z=wh0d%w3kn_#<
z20(}76Nn6_M?^P;fvAryBAM28yT2FaVK^4TJ<E{trbR#5ax$kgRM^xqAvQUu;qc!3
z=zLIN5wVCqi>%|EChJ!n`y+D(K<}gT5gidyhz?B0GHt=ZJLB5GJSuVEee6g0&;OhM
z;TPXL%pW5L_aFT`f9+rROTQ^1q1ncEt1lGGy`Zu-3})68+fUR+XlLGL)AZXRc@?%G
z@0U?F_=U;ommK;Ro_1Fct@AA<wy?W5#`W+0zrQQOyKUp0d;i$Q818%ofN?l_-)y!w
zNRFHr&S%n;?&-amduY`p<(zXa*1?DOe}IS~ZkqOnb1FgAOOy?mYnqM9<}fD6I;QNL
z^Nv*Yba-0}7A238i)`33>+1o|?)Ehx{pc;As-~fzqsnY*!ptT|`7pNl^2zxR<i%WF
zqC}3OPh-~~pHu}zOom~-_0&E_5&rg<KW}%t-Tux5^{OH)A+`m%C`OxxZAsrf`p|^9
zMLb`Dc7MHIG0erqCVPc$;Tewj%vgCHAEPUc#hD7bu3%nJ$zFrUDwO9VeQm8^Sa{ip
zfI87}$cRE`^48^I=(?3W`(Epfp!ii^Nu#+AzG|J8v=)xf{S9KdIcs2csg@Khcilb@
zLM;ZL&BW`$JIvw`<9QqD7H57FNPUA!507}M^sndgHN8-u*&J1ChpVZ+M?hH9(Y3m}
z2y;<?R?-!j{JMQqUDJ(qx+%*jV&TbED}Cb7<Hyle`@E-a{4f6Y|Mc_f6nu5F`A`4d
zzxHQ;^QTMG_ffZsYe(Hjis!Y0;Os8Ihnx04X}?O_Haq-H!J}*chgvSJDl$>&6&BA6
ztRhd(Je;ZGKhA&C+0eMwP}X(}%UM!y1zNd6&z~9ahnbCi2T*Ww=Rm|izH@-fV2mm7
zpmHiX$CayR^&?29u6OZ^e+AI<^a-TkLa>A<qbM2UcIci!0i6SY{mmU9h8Qi(yFOqh
z2kk*scXyxLP){Vk|AXH%+pV02oW|H}ToHPg0RlM>CeHvMa+7_W*}bplgtIm?r^)5}
zqDYyh?aK}!EX;3y{{N^NwxocloH-3?JgGu#_s;uY{^A!ghTGd)6@^1@h+<BIrSZ-0
zpVMF-a#L95t^D!;03ZNKL_t)j4*k)E#=O~>NADZw!#JE&jjuJ6SR4RY<hs32PNVa_
zX?NC9<(xCG_`2h85&>p5im7*@x!v%?gNp8UTgzk@;r?_40PkJOxgYX=zu)a|-oJfw
zI-M-SJH|i=?e<nAr=bUg*zQ8JX}34FCcFzoJ~UeZ#KQ>@`{Uz;%g)!4$G#WNT|W+E
zjt$JFqs|9W;XESJW`95Qr|x)Y+D+4La!xsoF-BF*+%pJsA_JRMIcFtB=TL}9PW^B?
z_RWTgG>?NwKAn!%=poYn=C<qmF&#x%B-`oIZ1yulr-r>uH9_Pphs*g8Vq-3V^RxiT
zwfj2&6yZE}oW_^zFy1>6WftbtKlcCS-}#?^=jY$fFZj)0{p>&aTmRCl{q}S`AY!}O
ze(!nU$1s(3iS7K7Y;|?ID6Al#=pg*woxz7y{Pr*7&>tV)HEkP0yuZ6u)ie&{n7;h-
zO8_83W_f(-c6-`4o^wt^=R@OS+aDiP)hzXy6OoI}1^{wO-bWW396JE1`Tu?2sVwD}
zD#YML^y$z~pLm=<`R&a<gkX(9&J2jqgLmXT<vf~cTrrkWFe0%%kKQ>%I33=HxQUya
zPjOR>MhjQ={SQ=E0%tnOkCB;Q;^lqymvK!HK!o$q+jvEpne$v~%u9U=$|WQ;CDpB2
zc$cQ2yugLV0wbYFrwN?{)yP}ZHCatc&b!cX9?hE@0sXb^iSPp6vtkp~WP$|6*yZ}g
zEo?pOKM+u9ib5$d(B&LDLroB1Emnm!Z|FPSfb&|iB(P^A*{?A;J3A4{naUoKbhhoe
z28dRW(QNmv<!WFBi_IT<MTI)!wa?oBNxQA9i25q(UZ--{NQy9v6m_AVqXkD86fD9y
zCj^Ix!l-C`E3u_!K*wTMG<m7b{kf_sBi*XDD%teKk6;A_+MEE@1}wU^2gUP(WpU-6
z9@I(rscTERiU55jGP87_24u?W37qP6P`v0P>wzJaHFA}={K4I09QnWcZ~vEn_>bSr
zzw;OW$)EgZ|NdVm9j1&P`a?Z+@FkO#?+z*cF~E-I#3CY^nU&7DrL57}pLnL-krq-Y
zO&z&T`(^=CRuhO)F4V;40#k{o)PnbF4zz{<Ydl%ixT{k004BNxS&u9FNiXpag$Y0T
zXR|9JDxg3}Vj)G76~@(tZM!ATuff%P1`ri%HaO04P0IzTIJEX7em&VkRS{0AQuehf
z+2CySC!8;R0Ihr=L{-RXEKr|FjIDD45y*KT4I0cBY<P4&n#_&!Xlf5~r8Y3mq4Vb%
zv*rae*{YQ|gvlA8uu@G}hN?==B6)p?-UlC|^YQ8FNmYDggk(LILFH}qF`5YzlJmB8
zllL%7d=Q=YyWI`|LKBGm9DGPF_}FTt%W0zb-r04xLAI*oWC+Com~g`9&3z3K%?!*O
z?~I_&EJVhT)GF<PoTu&09jL10hQ#?8yyu*P_q*-Zd53_G&~7i5N(uoW=dn9HSXaks
zw6w};G^ow?&Mt+BFbg6hj+wLVNC?o6BOwMBM2t-XYIA=g=R;^V+g)t8&1Q>zm&d_6
z%e`-eWwULOD8yD+j*sui4vb2xsv_pLK;&Ri5bHSh#tbx0G1~`oy`AeeIaAdvf`B2U
z=^0a1O<5FxK<1&WsS=q55C|cs#G;ZCq#R@Pp~S^8W+A>jds62A`oH^M|NifOJ^#)>
z_ZNTtKmMElS`1<6hw3vA<U-MPT+=Ck2)n&Rc59-?Crvgs4OQ_f2GEJ-t@1Gn@`v_S
z`Hl`-WvowVO7?Ng+wGQ!d<f)R8hb>vN6*<-V1-`JfP)A#TeT+u5SlF^`PiyR-yM-W
zsMu;Ha)4x6Zy|)4u_BypGzAKxWUDT=n-H6vMg;I7l5<V;a}yInBt&xNCW9{6%>8K5
z!6ItxigD;c!NbR6uzpOMRJE3b`9(GkD*B9_%}b}P7wY>f+#+GKWwAotmK-{F>D*e&
zDyDp0sYpoHw^`Xzb^`!xHv4H)DKrA+!M+r80)>^cU!k=WktwZ#H$9t73SVpuwqhoc
z1E)d3<ewUv*3L-hymPB~vuXrS#rhAC^O*DK5r{~E0MV>X$@xjlvw*8Q?Q{TYvdYp!
zl)glaDFX=Pl!cikHa;{PI|#?j!o1-u2)pfex-;4|A%^HfL*$)AJJCaI0gGX|s(O#x
z?e<K*ssQA@k1dcZbRLnm@kGv^l@MDM70JfNX3fH~X+kk?LyNF?rd{DQBBFC7tRj|7
z#8MkQAv$txyH(Zk^yCqn25bTxf)ByhZiH4MI2UZea2oT_VPOpnsyyjR6#&}ZEpz5H
zBIh~LyQr2G5OEkrgQgLn-E37693T-n=VL=eu{Dy&91jM~)&Zc84FZyLoKs4PNUDJe
zLy5YywL$Aa@nC9Yn@n1a9AQ^4#VLIPS`KIDR?56-Lg`i!$3pq(ZC-6gZ=6RfM4WTX
zCaBF<eSQDV|M-9W-QWJ@{GWgQpa1j!!N2t{E*#tHGyBj~!PL*rQLdpS^!!$ZR_cAK
za}Wen%;Rp_lmh^Yr0?HnOz_8dZG7z!=!et~X|vrDQ3z21#_oX5g@CH+oMD8*%sFRO
zVH$;bZWCj(1w<bjVNNMocs&uJkK_Z9&#4CmA3`x=6iI4!MKg6sbLQP{zuDgo$0t=W
z*Ty!^DZUt+b{aAfBH6<wJgUerW&qjW+>XQ0cil^_0DZDrr{uQ2X!5DgAFSWs4)<(X
zs4A*hsIdSLfvP(XS6YMiXXB#f#Fc5T1OUQFwAs88PIDASPJ^V;g#dt(ldAgfQkk8h
z_g7&_J&Od>TH9WcAFk?_iXGZC_nSK32^hy`|LQUr)CrlMskbx3#Dw5>xohlD1y^cL
ztr#j52YRABhzhFt6$zF|V+GX(n^|c0v%99il^pg-)JOz2@+89Il&Qt1q#Dglq;Q)N
zp{}N;qDoUWAd7pzVwf&hN6Y2fki&%=K=pdcc{DFznQV$og-H%YlZaTqG7GtiI{{J^
z9KoEk^=kInih`3F5CuU*%!gnWJs>M+MkM<mpq4+KMqa3ZC{%u_bA=@_u@?wL5E%fR
z_x4EGpEw7iV4`V93LwsTyR}#xM+>vvDkqc5Yvl?Hi$8$^z`y*LfAfF)d;i#yCH}_0
z`WOD~f8(#7%~r8;vV8g0U(=aZMfc^y_d|^QU)+y<iYeJSx&M07{nektH8aS%Oye22
zdR8_Wd&-LNr!c9L9RPw#g^<YQSJd-Uc~U*Cj|W{jE>9-LC1}O0G7NJfB@pImO}?zD
z`V_Yq*OW&1J~1Lcq8IM$0}4opGLcvHJYrB3aNY}7RwIifrmTwUtN~mTu5?a=fZ6)d
zJSvNpbK1@44OE4J{M6(*7ozQL0II@3=X0Kde=hT!rB#}?NKp|N;{1bFeC4qRkUVq%
zK+Y4=W_M?Y5jpdcznKMpmSAAaU{y`y*qw@at8F(vgyNqhtRl^3r=rY>nZNnwP20rn
zCRlIAISFU;le7ys4krM}nE@~aCz8`p7j85hA62FAx}5Xf{k<@cV~>c<=5`);BLMT5
zM|XO9Tbl8;%4Jq}m`47xhO%1K#xekynTMeO$U~CJ&Kq(XR7O>B-W#K`@16_-iS0JF
zJL}PpkKd|FY<JVWC@xKslW#W7W}k*r8ai^maeg9V0TKP9-~I>Ax!ooLKsV$Kx)}Y<
z{TDZ{zIy!j_fHRRHaD-3NJSK&dwS<Xv$=T%pu_2r&;e2R^!{o51Lr(W?wXtiVUF!~
zUf_4HJ}c`Ukr3a%d)E&`v%7W9a~@Tt-QFOP^HEj1r*|UUros6*q3BQu*0BM=&HjGq
zyWy8VC!)`P^6RNT4c);l@(B*j1^`lj63*MZ&&|^fX8d?6Fnw$-SU`jy-oH<2tSh!L
z<q+Io`m;az5C6tr{oDWj|Nig&n}6kB|7ZUx&OHOhxS5jAV6sF|=LyNd2jjm>oMDJl
zKjAGQZ+@O_&@!=J*yP?ndLLMgY6#sY06102`?J)0%Udw|+XsHs5e4ro#w4Xdg#nS7
zPu(Mt`|_)w7$8R}tM(zbO}kZiuOd0i<e|aCsRPxU+dB~+`jd0sMyzLkN$U^^aNc|0
z^nIT>NoLMTpJ{+>4*>;RbvX|v`Ub@9en;pIk8cog(|90ink_m1fg&TnfW7rYhTp}N
zLKWB1A0ImZzRRjx_c?3FtST+p^gP}qMibFh(#YdL-UFcXj>z>xheRZ-3d$KAAv*Kx
zK*?6M7Y|McmUV>WjB!cM2j}z9jYAjPt>2ZN-Zw2E`H!FaXI)_(4SyXfxZ;R*;WrPp
zDC6qlKj)`>n8`jXJr*H6!s6Sd&uFyIZ`o8~UkOT_gXw1TwOaLYQJPmwjSpU%OIH0H
zU3OM3t$Nwz&*zUvc*c`{HXh-FG!VOt#s^;5Ksv=f7JnnHT2vd;7M9IiwwJG8T*#JM
z-UtfS0I_n$I{VHQ#Xz)5D6BX()!=4kB2;oTsf`ipputI|TIWNqBMs|DaQUlX&0vCm
z<)8U8zx7Xi_R}x!s<R9)6Y2D2{nVL!8_x3;boK9lG&B}{b{h1uAD)9Dt8b$(wx(Rn
zFs%I-UAbXsHR`an3CsPJx>dhgj^L`5zj&hSl7)yW0o6)AVWcmt^%u0P!7^9F#T@dF
z!><<vLoU~7HRStoST;6p(b;8W^#-#JWYyWNXD=T-71nq3Vn;@_JVMkftjM$PV!zX$
z4yM!wq_Ejlso^9%7B^U{?8(7m=Z)lpst9MBOQ4FG?G~ylfaC=BQx``dry+?rALcLR
ze5~(ayWMYZUU42d4L(G2KIb&$Ymn(cgfpss@!7qqa3!}##FUwt!*H@pLvplhcK|x{
zr@4U>&O_giV}EmVhZR+UkXq;T>@y>BP8S;)D5#mk&0A*9V@{(F%~XqN8V3<>H(2eq
zx@p^+o5o%oW9xi4JUtq`p{jSE{WOik!`p8FG=x=U!#QzI&1OFz)S=mki1CJnGpFG=
z_C$_+NW&?QLwb5ZbU*tuf4<r5tb!i<Q%d9GZ~tGR+3a3@rXq)TzZkkFmTW|uX0vxb
zoK7d_TpkBgysC`C*|2Qpq^i!%`dO5m3M8zW#-1FR?>0H76<v1d4xGmA%_~vn?l3uj
zl&@ww93R>=c3Ny4LVtLla<=Q1hc2a_)5v*LHC{s)PEWHd&++{mL~_n40OwR^Sf{Z|
z<H@RlyVtJ}$Rsp&#)sH4=R6L5-{0-pVaUd2QiaFETV}O3+6E!Fcb~Zs@%ibKkIkxC
zG#Bzq;@qkz_n&A-{OCKAi+~`jv^i8|m297Ujaej6CD#Cm`7F)>^yJ(b6Xa48a@G$y
zM`03-_Cro7ef5)H73NJIRps&RFGFlYvmH}9_G4(bNUmvj06;z>QXWcPiijMZ9?jGO
ziHuB7<bL^!-xuK~BqB&z98uGFRqgr&FajKnJNo9$H~P)j_6XnK-NhKjk%`EAQq@zR
zh{zE#3+M4nzdWy#oEd;so<iKjPfB`vSz{;sQs;!19CC={y#Mf7zZB#O?e5m5ASxn~
zt%5-!=NeNqiG`aM5I6$>`2Z#OaD*gt@=vu;%W_iY$2Y%UOy&@gD35&}I@`DVhc_bZ
z;k%>;;)gWrxH^VkR5erw{D<bvA1@YlYF0kfiLO{SSU9+oz~4$na>hZG`9onH1CNA@
z({90YW;gDoC7AGu1?km!q>i;s-5mVBKqfeMvU;ToKlhH(#m#NDiJI3rkxZK7x;0t)
zEv;0>b)SeZWy%}+A{TJZ;_Nn;lJ#|(>o`=@y5f8}zEF9zEyEIoXIJBrEqP&^hKmQl
z1ct7v+x6APv(kUM)}?FFQaCO?zZ1#jvh11gY5a)G>y>r;$NHCE!<#4XY`pj)leg5h
zuXfgg;AMY&mddF`;G~yr^1>yko<Xk4{<Cgd>x`XRtYle`_0u&6<5V7C^>?5Bv)1DS
zte)FB@l&Uepm}Ztf6}7o@kf0bO!h1bV7dqvmWb0y)QRu`7nkS3%qp>9IiZ%QdSBNC
z!r3?i29_YwJUgAe%@&DSPEc*DFhkG?dF;V}t_h4K=L^LE5z&FFR3=aQ+&7sC+!WS?
z)g__6MDYn5_8=lGW3i754FVc~gorBI_r1x|hyK)`O2fBpJyN{6{~|W+@BYJo&~7%L
z-Q9`E!^2}_;5??xmc|0AZ{NM2AEM^;$fC2`mMRz-2UMNQM3|=Bmg(5bZcOE*5oHk*
z0K~wKaJ$>tW1+YTLqUYhnR^qD<1h?e-&?j+h^@u25yE!61H{;Ft$*#h{_VSm-EPyw
zh|W*4cjR%HA$n`F=iR~iNaS5k05BZi=l(Fymo1eyk3;wP)`jRplQXBpL;*l^8j*8>
z95@wmJ!IxY=nQ6?cbvjALgTx*f)B0DBM>2vgF5F!Tlkjq70!v7Q)2JE_Z}3OlMgKb
zNY27c>-Aid%F;Nfo_uIcq@gO!_GTtQIPdc~4#Uy=;9Nj*L^KSYs@ioPhi*P(hv8`Z
zTa0nD{o;5yoVsqmZHREQ-4xh6=cmH~AjA8&oBi#Lv1iXfuSv&p4XhId!HLTB!#6MI
zt=wiK0bRa;b9(vPRe)vrD&XQ}c|zo;-&D}Bez?V+Zp&`d;*6~4-6sGdJUu=>Jaw->
z|LU{byFB(PisXb@auVio=u931l)caPbUZyiK0Q9&?l*||{^2pD^c%nR=L*$cq1oSA
zg`&(N%xN6@@%8K1cIjuvixqd<n^#bz-{k@#lH}34c_O;Gdo>?tP0N=A8W)<mu8zXY
z(htW9MgF5GXTEPzeBJiV<;nCLH1FK`<;zLu`=6CF=Uf(#B`7chsPoa>^i|jr->QR&
zERfHf69A_u$7+^oK%=Vq5M5|;>NzF*`OW^mPN-iOSTD2TzVh!gO|e#$ev}#Y9Gdm~
z=Q#ICsGY;6Kf{Z_>*YhqBtTH`!JJVXxnS}WM8cBEC?Y5#vq1w-wl9W2s4O9BcB+-j
zAOe8)FcGc_PAG0WMQJNVYKfplDNwsG;}yWPW(=b#oF>kZiAfYq{Wd8z=N8TaWUfLY
zH3(X+4>B0}l&F~Mfr<!;uDeUKz16D?jg{7G#miJM<Luv!7rj`~DSwPpS8g|6X1HAc
zB~>_?uEH!969EBTH{gqhv()Zg)x2&BF2~Y{<5Z%Rluu?A{dnj5>?ZLkjIr>?eh0ix
z7r^IVpg1FGaD`#M!tww>MG?vSz-a^$OE{V+ExMX_fK}!)_g^B+%tTHmt3D@_38yL;
zyIW*R_XJg?YEPpgXP(@ii4YwqPiwDI;~@~}1-^q+d3Yigcv1CF$_(H;;m7c@hY_A9
zhMXA}XcdA-fO2V|y_k^TM~yaZ7FexIB3#HavoqNxEHN*yI(niWZK$Yfed<g;DKbwE
z1X3aX&k27;e|9~{V@{d4E>&4VW@o&O%Ev%Lf|Ao@40vV$Wnl$KnM2cV_cuAExnOZ*
zI>kXn961C{V-En^?XCo;0|I2{qjNr|B&x$OFthiONbMRTlBfs^%=1CQ!{G=b-XRj2
z54AloIStOafK;AOyODN3V&gQr5IJ*qI+`fT5qVFhoU_jyLPSJW&Y4Z@Z%zVM3L%mA
zu8H1<=wov{9zmhqY|MrOXWjn#UR%3hGB2Z0#&)YBIgiZ6`YyzVT!0e3h|YOa4I+~F
z-Z|$(oJP=C^bY_4ga|4|dI7j}axxQt0tBj;trpiboVSm;i#6XIoHW!hnK>A1*96XT
zo||Y|m5E?s{V}3*ev+K5G)cm2`U+b}XGfA<14NSIt}x>fc_v*q(E(tHu^6CK5iWC8
zewN8@r3?TgEaf)-pz!(<wK=mqo`W7uz;p5R%O?sku*&Qr3JRa4av-MRbb10L4{FGL
zA{Q(;*W~J60m%jLo9IH^kdHAq0KjfATv<#js>*pVZ*I<s)0lJ0IR}wBn|e%{h+>SO
zY6;I+4qib;1uipCW<@dA4!d4CkD$OJB`eVeq2x?@gr;6aXxr9MPa^*T`=Q!(WPX{x
zEMfEyVMKn;FR2+xFMpHi>@d5J*}bGXv5b<Z<g!lP-Xs<;1M70Kn0*SMBKXiuhMM4G
zE1Wr}l2R$G!sG*j8F5TyQHiF!hLe{&fex-E$ZKV|yadOa^H9}#D^J9k$sVi-dY%il
zst(k%d>mN&Y|ZQj5Kv{)|4L4__{e#3CC6L=Qp)JU_U3gOIy>zaUdcEz45rDoFucun
zR|F&g2ol>i#5Rw;h@_O5+4)GS#^FbD_TqV?A)@2)qzKNDbJVo0l^UudJbLe)Z<x)E
zP;<5*Pzo;CyRnR?uCt1^i7t3D{kS7Sgb*VlrqnAlyD$l03iAk&ymxKmLkK>!r{mWm
z;=Mx%(+olYz{v5lk%D=zS<fV#LD2bNbes7gG*_T0_ZP|gLV7|9-jnm8*??+J1J=qJ
zL_}w*n|VM=mGyDKewOW^fR`*hA96l;m>ug&w{DZPl4<M^0Z~N|HAasB^N-gbqyC+o
z2DDgRJ=d|>mS<0d$vV$-#gNSLKus1_&12`+#Ndq{;=I4Qah+$f+kI43WwRx*5dy*w
z39qkI7RD=oZrXX3vLT?#@QF^s3-^F$naqd)Fb*f+VSDr1QfqQfu?3NG5UOfaAm@GX
z4g2l>CT@1jSw)Z@%R$Io9B$J<AtE~AoYRm~$~mhr5He>G?)%YuA3`YLi&e}}l)N*h
zV1?r>wNO>gqllS6VTqklB^S_wf04$q_daa4Tbq28tl*b)S#zhMe`KWLiw5qJW%->y
zm?98TX^n`e?4?p0p)LDT#R;D#J9a3zl0Kw><WRxK#%?zPhGv_`-t5VQvkmzi5*Cj$
z6VzWmqn`x3#S2ahuKqGSpL;$ZaG|TQ7U*h@x_lj(Nb-d%VJ5A@Y1x1lj)}q<fqtI1
zR4RLYmdT?4*O<5Uf31CbtSd6Y&3OQg*|`;o0Z!(wrQRS~*ePo2Oi*UFCvCQQo4M*{
z%>9A+A=dhmwIQg2p6P%J>1{=02LxbIAieUf7iLfmPFE(!)psx56`;A*RBgg?V9sg>
zxF$ZC$7q&Ob{RpY)&HlSbyZZALSg!BlZaYZoTk;+d+{hyKSDgi=l)|s0>0Oz^jSwV
z<U+=qM@)4Kf)=E%!qX7O&5X11o3<1ew@*>g+A;Y@!#H&wYZ2Qdsd(;`E>~oU3S4nl
zL{tQ-aXzj>A6A96sG<~k{=5Ln8bGl`DrUClspbQ+wK7C23e+@AU-lywT{u?X)ob*R
zb%f-PaHK9<?8JP;GyGz@AJ#!x$p|I?^>SY>3I!X5udg$f0+A+6M7_=x4b)!7cvUrd
zHS_oK1!c=P=LI<Dqh&``c>6`nuWHK4kwfRoH$ho2&ua<wGsnw-G2p@sHZ8p5j6^Op
z4)7;G-Ht=|<`=&c+g)t7Ce=?vCn9O=RoFVSxwL0axhScTa|Z1%PGj=T22_XcaBeES
zpiNg+v~ZT3oR6{D=F=(VLK86aHj|j{w+$j%q6GjXK4l&^+s&qJeQd2$QIWXW4@3X$
z*S|!>FFyaQEEUc+w&t8Z`}|9r^y$Prp2ERLLWk2`m_pk8oP3(oID5+2Hpe+l(2R``
zW-kwX_wd-X?d#ZJX(WU>F)Opg7@c#p7Ok2LR#nIDk;s#CLw6d-A+sRSyKmnR(cP=p
zJ~T);Q}MdPL)m<%Mab)mOx~wao{j?%w(YL^y9k{lBx?waN7L+XW-Krb9T7F{Zs_~&
z^whSS5aT#>02%?1C^kD)P7_dXqq%ZFmA!NLVcyzmA}XP2UcR-}wq)N`I8h#oXIj8t
z{?6acd359fAZ~V?^Xc$ZeE7VNA&9W3gwT-l+uP498XiQR-hb^v-0bcUAg5%*tK;c(
zI3Ane9pQF=<D9?y;%DYy@T2^4J~r*<n{U2R)z829a<jVya!9n_wZi;(=yMuQhqtz#
zna4B`r$I$jcyjFk7aCQ~c3E>G=bLSi<5N!QbUXmSkXS@w@XY-9_=o`B6N`$7IThdB
z>^E&YyLKSJn{VI7818RxCxlyAWX!@WmNF5e0>HQ5zDX(VH_g1IkHaYf`mnj;{3K#y
ztsii@ECvxDRO5VX?M?OUr}BH72AH<(&SfYtsH*90Y+jv)j)l9^iJbfDXTO!lJ`J7G
z1FJ&>U5H4oKRqEKkq1C~nVlVFY({=_bB{=;$9J4Z|6CIe_~Tpqyy)%lLlN}PB-G=x
zSpCEmSvM#&gN$0wXe!!&g-c=GD&Yc6&faZj2^#qEZ0PGXGOlR_I8DNzV=yh`Y@E!;
zXEpKMM<L?*{OuVo!+C7{Y|>U`MpLm*oJAzdl{2e-Ew)lM>lNW@UiK_4C~sHW6u_b@
zq4|m<kXAPYmXfPj>n+-qTFg?1*TJ%W7UnuuZ?(F5vr9oWJD3`6{BA}1_m~*zr|khs
zCq<5^==q4el7+_LT&WNsC>t7Tbq^6KVEIAo$%v;nEH)oR(^5hFv9}P#%II#wl6BTA
zREejPFv$e$MRyCc*khh{=wz^fxJuisXG2S@DB^5_Uq67)&kNyl<wLz5@kJAaKb^mx
zF(lEmA>jFzs27m)?3Pl`5tql=f_V{VyD}>xIFC6e3u2xR>Key@>waw6m?OF-T$S!B
zXExRRM09+v%k-fE!`n>1QK2<g6Y50^#j%2$6aYfIC30i;q$+9X%umQUx7prs&i&z`
z+3Z5Q?Yl>_zO-d7%!j8(Rp^E>1RuRina9j`w_&%7Uw{3z4IvTn?c2BBhnrhKL>D5b
z!5H?c5SxwJb6>7y5q<Y?+U+(s`+ZL1&>wh8OIM=hlFk-@giG`X;?Vbb96~r{`5RXN
z03ZNKL_t)Td;*b%(?iM(sz|Qc-X5PGAKt&6j)GprG%aRCUZ|LE(xSo=+@Y(P7!e|k
z{SnE<&7PS7-X4#~<MHSn1@96|&irureFV7K?;PQu`wM@0K?o3s)6?nkooW`zDW#Os
zWv6mHJgI6o<PcnRR9n7!hlu#*o3EK=*G5(yicDp-=fvQ>qqBvC0B!UD@bvILi;gKz
zh@JC9wd|~`jE@mORHraVMC??@$3w4*cXuHYJw3d41==wiEi}y1`#9!f%AG<u8)xRs
zNVM6-GaD@=$|=DIa^%r}(rpkC5AS|?dVE_<@R?QR;oUdhhnu@sw!As#oQ4A85c$}A
z^Yh;k(am<}oI?Z=9=emgIHj@gI`8QIcFQa|GnT>W_wEt+vi(JLNa1$hs;bJ6hGd&v
z)9yt0@i2(!IF=C?xe)=(tY1Nh==Xl__u6*z<*)qIdDnh^D`K0{$Z6Q!+~2(VJdeGK
zynXkMhhe*kh!kQ|Oa@d{#UchzegE+A_{Ha+Ip;&OC30VV39}e(d-LjaJdWLC+k~54
z<9y>>QK^0Y`R7FR^Pm5mh`PQ<#O-9f@Z13Dhlm`06q7vq!w~zI14wdmA^O;+p_{xd
zH5bcu4~VKEAZ_;d0C0MIM>N|ht17EzGY{c3Y90`2R^LM&$$Q^y3jtm-sE+*r=0F+0
zsW>}2@9XAZ<)F6mbHeArh62}>VfuyX_PJX5Md!bMyqR1j)W7I?!?_fjT9|dIt~G+S
zBn{d>MfAgD=an^=K40EV@mmYvxXMz;m6Bl&w7&d{v9e`Ggvs3-p3B>tpqxrXU!5GN
zFl$bho_KmKo<{%{w|H6lDg-HzXH{>_Dw+#;^4z_Bh4|I#R0K0ESo^6}jodkITUt+D
z*^-yqP(fEvvesVDinxORW`#KD%KM;tMi4%v4)`HW&!=t%wA846g|aVh#sCv^t(BLR
zDHclPn*st5t*(LAEJsBAF>RR_M0TD~z-$vgPXd*$yIGcHK#LR~=NpJCnNq!YKt+m?
zO`Qw65^GhP#k`o$mys$>Puy%2d^w!aKgAtj!GoZZ!c6e$6<5kdQ;wGo4$r%;O@Q4j
zP^+{{-qJ>f@d+k}Yv)2}cdffOlj6k)P1VNh!U<HFGx=bdCMvnv>|Kay=v7rY*{DH;
z^KdGZ4Ig}H&7qBRQl3C~W4#NjN*V`1h;cJ5`Z<<?RL^su=7f5C*?AR%C^;+U$wr_U
z1NQyU^^Z5VcQ>!Tv~9lG?3ZEsQ|HL<ZtjTijy$Jv9FCjaeJG^_+~41+NY`~K=llD6
zm>BRxj+~FpmYgH!g}HVRR@KmKOi@V=e)VU+HZ|(XoZ5D?-MZLp6yWLcz4ZzTYGFV(
z3h113fe5|BwrOJ1<kYL`RImdgefHUBh%lTU9nq`TpXD@i9zu+v*}VDYYgN6yz4hLO
zW}9<5JiZ6O&2}a6&UN2544}}qEi)gxZ|p4D?sm7gcg}fJrvhLaI}piZ&z$??lL|{t
zfW<$d+1_#*+}b6}804H2ku&t@hVv}(M!?hQFmzoA4iTFss_M<_uT<FFw#fM@T6p9%
zhS)kEa+(FUIK?+QBx-hd!YQXT_Fdl{_jj+_?Y=I{#{Pgtg|&;Rpvo3l;d~(HUF=jO
zjbj>ze#n4)>IXz@f-|j2@Dc(GX9P%D2+@egFa_BoVonK*{Jb`C4%bZA&?Mv^!fcr5
zw)=Zm>j*IP{qgWPBteAxSFeK)+uP4n#4aYM(NeT>8gdemESdT-t7>e7l$v(Oncu#9
zAfhk6{7L~r9-R-~hpy`~%hS^nk=x#Xb>W-#9a@BWdyCQE?pyEB2;ord%IN+3_Y+ru
zzWVAbJG>UUgsS&J0q*Yt034p4Vko`r;qBMt9Fogv<TRwA2Y}FSuoC<cl0}Ek51MnH
z$cF}R3;kVr>=|$zPR@te?yRk;H4lX3e0Y3#ud3Va)_M=;{LOxc04eqV|32YljZa@C
zPdOjAx35+8`2HItlAN9Q<o2Zp$q7K2E1Lr2O8KB-+pJ-JM2NQk%=7c5+C$7^e|mZs
z+ihsJ^MJudWy0CdL<p_2)Ta<KHB->3LbN%Z%m`wMvqvcf=JX}&Ajb)<tp`^tSw5`N
zZDfj4{5VYVAsi0zjEhvqw=lB;qH}Y&IRGdwaU>S-<Gi<MM$6Z;Ez((Zo@t<pu1G5w
z38(xZt}Uf-m8=F-=DjAP)Co|T5+#fIg^DPl)k;(kyNND_fe6l#)hjqz0?P!F7+1LP
zp@^PC4W~qPtXe4%70!9$(UA9^oF`|58d4q=G2>j1o1_6PNM-G~Ht!2lzez}rijcYz
zp;HCe5~11R3xX482@G~GRY>i+IfqPeh6@oPk#i0}-6WJIa?T`5(<_Mx$vNj#fjCbz
zSy3@gA~_-jNX3Am@Y4_hl(cRUW>(_GGMt>bt^vaMeZy_fh7jMk!7><RLPLqXS7yws
zYdPDuYn{D5^?SCEDjdD2m9>Nq{b>ClR*-ys<>nPj0ItyMu1uNE0BB2QMM6+oF%>Uv
z$_44q1oaM)%m=3qZbL-StNRiz>i+3ZSLQx{itxZIdpaT_c~n^-z$$MG@NCRBTi~I>
z*~5ibp0&yib0(!<PH_sPXO<{L$Ra$Bm^1VPf`CYDTL5HEDgsC<Jh=}ObDHJDIrYLh
zTfMeCEfivjsdORw*jPCaL=K}!wp4l({ED!d6}r%<u+E$EM@mP+iJmd<;IjyGH6cOt
zp-~_aA?2|<l=w}Z=#(l=^h9_%odCdlPY5Bl!rUF73|$h=px_A5JL^$Q5bC^VmNX9D
zs|VnmMe?R?RDmU@%yBr)p;Y~FBx?x^k%@IGL_+Y+m9r}6WauL(Fpr?(%=2C~#En`K
zmO|Hc<W&3KV&aXLE0O`xDyB`_DyVY~0F*PR#-@cL+nQVs5Sz`m+3b#o2T*Oddvcx-
zJV0n~MEL3bx1c=qM<3eIU{NJA7mXA-n;A?&6XhXKIrsfw3)DpJI0=)Hh;z1k!#RmX
ztElFDPH~)KkS#_B7cD8R1X!j*vom$>JI&F}mc%%8BJ2wsUSvt+%424}O_MB4z-~>>
z0N_LP0mw&~1pD4O5~iF(3?W2xv1y_2PhiAuu)3sVY;YcZY{<Df6>oYz3Ghb@b<^n<
zyrkzsBHV5^PznnfPX|>QZK$K-$T{yp!MW(jPpOkY&KtC;3c))hav^%r1|X$$Je^WX
zqT0sjoc}S%GR0EBhiGcEoJ9eeP4J<y6D7ttPy2=0{4C7)sXlDl?T*NC>L>IOZRjP!
z6O4y-n}SHpSyhk6Q;ab-(TEPBAZm_L*fb3}WL5=ELswj>rn!{&0g+VMyku}q9!3Q3
z1EB+vPdyi1;v3gT(hIfxKLGus`ft3t9z=NT4s(d>e80+PK8s<WthMI4XmVzt%86w;
zGlesNreOe3BURW$(|jD~R?Sz!3?*{H%$&^niwF_GIfsNf4a#g%$28iWyUm<<EXi<r
z8~}z|<WQ7HRCpPNg7P@zl*tA3PLtX$gGA(lNVYU77ow>Pp6mQB6Y5p2_+O~#DohyB
zg$5B31VF~_NY2d>eZpCU+a@r}>3CFt;HYUgyZyfJPD6k2-py1oN9f4qJTB)wfG}I)
zIT11^&Z%v;0Pyhmlu}Op35Y^yMD+Od;E2ri)HxDi0A@}AV7IEIV<!Lr@1rFxsEVDD
z_A<kS0W>`wNJLnWsA;#VDW`sd9))w-Y+3-Y_RA&}(?N(}G4Mo)6q`20O?P|}kal+)
zn>Gy{ITza<=iEKLMUk;TnMo<<B%CI~h@aoN$nvIZo-_BuXt&IJENsFlYNNQwyC9s?
z*fGzEPOHsg9!vp%09XCo`XHn!P<NV#a8A?O5I`LJZs<;J+ajVl+&dR%e9T6IvrvIq
z=XS@G0LFReX)@^~XVeg)4^3#CbMACHGP9`6HZJCSlXHry#a!lM0{EkHLoI0fMF$}f
z5@EC1nE#20jNL(0$FZzxv6&E&^TG5jQ=9Ir&Ty*U*|?-pKyq#vACAY9!L&`&IPZz*
zhkqp%AtXO#&SVx<ARj~1f+`U;O=EG;R`nA&bk@bMtb#WCI~B>}0Dvww$}F5jvMM76
za;|R7ypOZ^`gl44V!PRlJdER*GN;VJyXg!jW>JL%Wn-MTCd<j0YRyaF3Z0Kc^rIX(
zFIgLxG|LZ3`Q=CWRI3s9Gk=!|kNsh3%`1|@*=Il^RAqC3nk^wsp}hFxL#>%sWfkd<
zkFnjv&8{R7Ap#URjlI}cWCJ{F)z9x;tuUwzWiF2>6}7PmB1$!kker!WgpnKy>J*g;
z00K#c3l3=cingIl<F&Fwl{AIgAxtf19SVKp{3g%fVx4S+ctL-!+4F?;<f^XYF1>Z|
z8umTSh_ps1u_9Vyr9U{=Xse)e3ShYUJdc{bx;@}xV;HP?|I384m`{i(;*@`;AMQO+
zYqJJn6Wj=*a2Cn+U}}1-im#il%sGu_K{FGn5KN}25sN5rt%0$Qd}0XAd<|XRxnA7$
zD9UIHOOn9qGCpHbf-^5?k?Kx_9#yQOAkWi3&bYM|M@&FbmCV46Y;rnDLTVah6)-ZH
zB>XVyCwv@2(C4$-%nDbhwV_CkRF;AN3?+yliYnof0Y0Zx+JKa;5=8_%@0VXcEWdC?
zCb0)<<<+UP^k!N8vrW?KTYxS$UB2SV)O`i%+TP(>;X*`&q=-U>2IKMwEYX7t2dpry
z3iqnoNn|=5Kh_I=LK)3Rxr;wkL5KJOYD|^odcM!<ieIVMX_HmbhZYF$ivKMF0xg5X
z6}N3BJt6oso&eBH(8rN+!u`mh_w=0mpQ?_-@xuHJ)7S%)FKIkxn_cYoH{Ic}?~8wb
z)0kTMWI!~L>$@lCd~EjsdU|>XQ{Ur5Y<D-!_U7@;FGSc1s5G3&g=TvLs@>sTXtr^)
z8%~F@I~W*SU;`fzaqN$(W*>?zVoF2b_aOxDeSLU`&?16}dS&NGRZrbzHnhgL1;jM=
zQdF4~LVM{R;C&3C8TzA$5JK?o)TI!7Y@I_5-dTTX<ole5$#5O|?j$TXclXTP^$Bq)
zk%-VaH;nyw$lFaMLLWDTZqo(;NXfKZkTO3Wd%H24hGTHe_6E^%<i#?&rVx)b)%c!#
zRF;uXwyI7K-`XLEh=cd48e^F2M9yg(PH8x8Z$Cq%)SsBMMXMJxDj&>?fDmu@t^MFQ
z=A7Z__$Fum*{}V&Ss$p#)8m6B!`T<?`qYnkTRtQg|5&8ZG@xKCA@dU#VK3}lFxfki
zM*tV1s&GZ0IUDlK9gnKEn*fNM1_f|F=9E(6%#t$K!VH_P4E>=xj=}j5n{7^GcYHLV
z(f!>m0Ho9lbGx~z>1~qp!<(Pm*65p-$nWpJe8~*+qs}Z<Pz+tt<%KgK&77LK#74xf
zA0H2WY<G@SIjidS?zM0ZLodRIr$_sduIo=-e{-|nZZ=Kysw#QR%2wIhzHxl_wQXzB
z)90VPJ|2&K->1}zIHMNJGm8F~|MH=2_m;1jZ*C1a(wxToyE`ODJ^-ktQUJiI>rP$Y
z#NZv-PB|nt&)yI>_h0=QfF9p}qvXJ>ViUL+W4jwqPa*;$05J4N8<Wgr9CE&Cw@tI@
zyW@b}&D}i}AtrT0iVf{<ZV(rG2<J5P5@H)dG!wY(O>m(xL)yp3M?~Ci0w_4&)I0n%
zDKYbqA0VF~Jd20?s2hVW?S#&Gen0Z*i+Fl^Uu0bXKDJX*Ao<uD_acpb9($rdfl9XP
zbV=)>r=cD>4QcF}cIQH4b41fx*uc+)Xufw;B`J~jL@tlLs@gH(KTsBwIuYS4hy6Up
z9T)7s*l6L|G`!CBEAr<FpHrOK9W$|FRZ3$m6TqdA!}_hEb_iQ_dpN1R6)%wXwQ{z^
zt?QJ)4psdtB1B*m-#M3B>-@Xw^)RI^&x{ihT^KG!dq7nki`BKQA_^xZg|6ulOFZH_
z*kLVFnIYyfa5!@~yH*h{hptt=Gkmyq9fCPp@%hpcS6O})(2cNm9YR>YKb*}c5OGx(
zA{Jk|6+x-aDML6*uhtJ_n4I&CXHR)t-1jQx$fdZbvR_znE?^}^FiF>BB|KXQeDomH
zPu>jF(2-v6genoj@{G-n!Zreibt9!K6TTnk)7B%iX^A?mMiCcIh+6dx3U&Lp_5rLI
z7I-n~sXCH{_*7q_bECaFmY}wAnBV1GL$pNWEswX(e{glGu@IO(9M+28=Su5$_}Q!G
zA+;Srky6ijg7cnyHb_GR{7&7kE~Y3`J`B!Onw7L(C%Xj2>#Q>Xi(#7LlA&o_365EU
z4)Az50DyIeLw`_(oCN?vaPuk6d8{veN$;x))1f;6K#WuLiKM<89XUj6A{79c^V7py
zBaGO~hQ2!;k3)9~;Z05hs0xUEVI&&+BPfjH$qh$;h?$dcvacSS4FKj-FCqxwWBdA7
zegjlb4{s(C7c=YOc<RS=w{MB4-Q5!TO}n!XlXH6b-QNze0o9xPFFyat*5Iqt(_3L4
z#+*{xZDUIL{o}Vp{#SqYYdK5G((c;r-D}H6|Lj+O!-TX%^nd@o{}agj*do!FySwAz
z@!{RK0K?gmWfc_|)3=0Z<omN_W?Y)5V-En^4Lic^{*`dH23=KSaQ8PG8w0eP8y}mv
z*@432+h3-!Z#Vl{vNF3Uh_H@bXm_FA;Jdc~@bGkG=AZubr<2z$zk4|D_xs!1J9FH2
z6x6XWBZ~8$oO7`?D+YT+2^_eXb51Gk_P24f%|ov$eb?0`9stg(!un%?KDe<Pk}5RO
zBY+RljAAX2P=Gm)q20!2$9bFza3t@M9FGG!XEX}Q$v2zW?)2$h8ZY~Mi0uv#oR6xK
z$0Fd}?Y6I*_VMX(ICXb7EfJjw!x6D*_snCz_SJJfsOs_YFbv~;VTv`XFr1$35o?+@
zHVvnd)9~%-aef@h2bc)Av-IBBxtsl~xY@((@2qlGr+-*9ef7mQ<K493{&ut3-y%9t
z0nq;VP~2e<Vl41^@DAG;V<aDJWRk`**FkdT|M&RtzG<4K-E>`dI-U0W{pX*5E;cz=
zm7Ii!Yg|F|*fYzkkL-VGIQFN5)%Zqw`u5vzGt2$$mYnxKB2lxu1r=f0-3RAme|#9a
z<L>r#v4vAP9UqzV+u#3fKrB`UNTJ!qb|;+r!$X0KyaUkVX>^1}mN9#_<NI%%56(wI
zXqqr|j{w+iZ(VQ*Ak6*g!74EVe094`iBH`avxIEq3GI&WQ%^B?B5a$0NU_-n^Xcim
zb8c?eiWQuXb5PIJ7RRCQy5k`>ZH#eq^Qzh2oSxnm2I5)ple^-{@SR%ox-os`rgUjI
zHJg2CHfiRXDGdFA$obG(n@-L<A32XXk3KZc1rw!orxSC&iLI(+;~6=xDwZlrE~tv6
ze0lcT%FJo7s$qBgI<&jg9me6bzyH$QJcJXHM@v{jZFaY+GV@L(CziqBi9DV_)t?Pr
zzi)BzolB2Z5}elE8(bsTy17cKKsEx@%0UYkUB{GAefC3VuGp|-7vmZd((|J6(l-g}
zpT<fTk2Ch53-w8_w<B1$+Ot#~W>jx2!!NT76Zy{9Yl(H9{$p~ShD8mHYqsLE(|o)F
z7q1~wgmc#e)pKxpLI+p%-rSom#rdRF23Sn9s_y!#7ySGpSc{kS$|}6pvTE&K|6CgM
zg^501ONM;57)KyPn1vu$pq8o~#6rop`%OfX$M@`JM^i&nIw3d*P}Uvr8FZ-6(EoH{
z-_0!+7D_r!6?7#b*Ry63>-JIWKV4!0KlEHr6D0ij?t%44iE8=#Y|~dGO;9~ERr91c
zQ4YW&u2v4PxK`g^{P~KVasDIAU<_xyw(S@zo&_%ci__*%G5qTx$u;Yes()OrYyCuC
z?{;1`8_;KfS(rQ{mtADF$<5P0Bn3s#^37nT2H<RIS%1{&-a)l_RgV?E{F7ffyB1fH
z54=$|Q&d17;#O4<hnbgP{Tz!r=Nvf*OBzIMwj$>*Hgso=kj<%<YVG6I7t1-f#cHwT
zmvdwZ?BkHn&Jq<#W2Xu!34l5W!kQ9?;JowQ=``c{A-J4|hc`b*#CCgY7<z2?o82Ct
z9te;1#p<5knWV~GcTGl?$HBr}3LXOxgZB=`F;A%#GIUR%X}gJ>j*oA;vgt3`^caHo
z1cqH5yCXSwe}8X(I*!9Q47>de06sn)QcBxRoCqQqo7TR%3(@;v1}@)x{RcC9=-u0I
zRUuD079`g++cAx492JgZe@a7#NIpa#qB&a-qWN)~@VwNaX%H#bIR+ns8~aW{jODT0
zG@R4dUw^&bZnm2Zfcg;0d2=RHHH1cT8qA|$9EPFqi6{g=^vCY>w7-3Y4u@d?fZ_DC
zKJ<)(Kv&Bk&dIiBMD)#uI1_oBB@lTZ19JwIoJSRn&1NoUIcI<#K!?8XhZKS*gqyop
zSaMcz>`z3bawX)15QC><Hv+)66_aU_^+2FQcevbrIA;Kj-Z_j9hn^6f8xWz1J_O%x
zcD5krWIMy`=3~rxFQShR@0zBKO)EKZ9+h+N-xo$Mk*SPkj=pd<GPdMYe1`!z4XQ9{
zG{O03xkYD}HN?$!|LXMgZr(#451sdJx7i@!W`9TM&{4?QoT*ji_Wm;f$aw^jaXigl
zeYf|oi|W#a&34y!r+4q(-Q3(bM=D8$avCo$7eadBo{hyu08WQPKlDv-MD)e4{M7mQ
z^!68koQAIO0CO6KzBG2u5mA450JMBfO-Y<*uYf42KTU&577_2`lmP%u^uc3FqM(P<
zpjGwAIon%(puUgIb|T%3Dg&O=3Bl;5b7_i14wsZou!QcCw50Wqb54j7g7e;!58czd
z<NG(Z4>X(o+JZoZ(}#_=g|mW6&NfXUBqW+qWCf6%Vbb2kW~(ZkM+9`CVM&}4IUi!1
z#(wCJwI5W|Y)d%>Dxi{+QQ`?*z1gy87CjxG$hpmSf96WB&-p9Ou4zRrlZAQcj)a6r
zr>A!l9He7+AQ#+(A6HhOvNSEAIS(r0E1ToxVAVxkifd4f5N#~2AMPNhcU#Id<H4@<
zj4vP=U63>{+O*0MYM!y5;~YkrrG?pF%tvauH<}fNDf-t;PUBzJR_=HnPz<wFLsgU~
z+Bd^wM^M8^7Q5x9IKUYttqh<S;1DL`XEF);I>;3Pm<1LuC_yE_lCY{GO2$vqV%7(8
z1$J4t2<7ixVyUD+5h~2G7#z>wZ0P`XV&}n}g*1oD%9Jj)s=DVUwKTK%LBK=n%T<=w
zWJRZ?yq0zUHS3V(kZ3c8E+s0b2|!Z4QU)V33u4vlOi`=Puu@CgVQK^*M1fjsezBCX
z>ItT5o4F_^C;m7vmmw86HR6fUq(O!A9MUoe<8jGsThtDE)urAxzKI-x2vbJ1pf1fQ
z5$UvR6A>UH<7A49wF@;Aq#qQ3XNpH{SoVE;mL>m0M3^BE06FKp54AyJasHDc9@HtQ
z8MKNQt|Bm}EmyQCn5UBo7q|KHW_meLxcG$gY-4t6Uv_<cPO?x|z@@eHGdo^|nioqH
zQNd^S&6ix+CHD<4*RquBqg-${E29^|p8`_7Z_H;q*0v9&zddiy?4c5oXHM%EERa%5
z3n(bT<Z@77E<GQ=ol{T?r0u6_G?;6e0r}4RfP^Y3=WOn`hyc)ao$+;Gp87$F@3LoL
zRUq?1G-tN457Kw>;Vtee7w>$|`&Z#S5@Ki?1Q8JvGV4V;UP<6&5nZMGs%jnwq$D{T
zQQOQ|Y(&mE3lCP0+XL@>bfBm1aelHgk7xWYEGI#^%`D<%k@D1=zWH()akT!#MciqL
zaZ6D!uX}VpIOp1yV1g1=nVB>9Ddn8mdGEZpmy3!y)>Ym;6$M5W-BRx~?S{xHr^#kj
z0l*Qp4T|vT)Y--nLk5JLvxo%eL}eTkA|jobGa%YEw14KYM+AFrXD>HZ9aHjN9g%7l
z01!F5+ox_ILhl^{=FIb^4*--iBITSwHRmj<h=ZzT5dd%qESi~fN^^xV_NRHg#yJs@
z6IRu(8!Ra}rIeUcN+RmrqJl_?onl}yR<Jo95S<_1BAP{ZyRDft1H#o!w3KV}=(5Bo
zYHS+s1CbL;#5D(^;ucFbXqqO0h(#_r3MbClsCTwajl-a-v1vG`;rIY(5swIH({+}T
z)-9^#q%$(J^8x3SR4wy>l8VC_RMR-xZv%+100QTvVE0;0DCM0qsx5Q2oUac*=BsJ$
zWpL*7J0W<4P0AyHG&v(B+lDwNK=eL{YRX&^=0bGNkK>@z+F%w@pkV~iaU9!ryV>6u
zn;HaEjmM}dj{wlL8&P#WgKEwx#^^&7$-+#|JLmhZQ&2NmxVgP0L{DIupq7IeV&hz}
zdle%CKy0_(`@Vligv<bdDW5_JP17t#^<+9z5Ue!J&4fj+m&Q~&E!<t5J<4@H7;NIF
z3Mdn#ATu>gR3=j`s2Rm}5#}?a+3b;MbMxBA=Iej-_ZJ1Qf|X~03@|b?mz>2?4>awf
zO>&d^6LH?F%efF^@Zuez!Qq8Orc>&kuD!`>F45%BU2&kWtXL#KAQuoR4M!EpV?S#w
zrU@-c&dkYG?tdlH!MUKS%n1>lBj>&Map?P$#+2FS42Up}Jt6uvI6sZl^>Rn34@C=V
z|4ulfloCWg&?s1TDCgvSh%V+l2xs#G&RNb7P)<X(lh6z}s&}nb+l4M9YIBPueHu<K
zHvb=KZ?h}OvZM={nY+hNX0BCL`{#6@?%RO62Z#X^o&t#%fGHABa)rc@M__OzB%S~y
z227DaNDS_kxPsfi=bS!!*WX&184>PoW(>^3!y_|S?cKLa-AB8s@oQcE001BWNkl<Z
zvT|icgu9!4_Wd~WrdGB|d&*o}6VCC@+sU3SM27$<qAc=IqiWZjIkl5WRj_tsV+?OV
zVmZm2^UnLBJVQ=Zm+6IBVu~!nECZ71f>*TR4gPcqye+^50`$W%bp83uPpXwR1<p|*
zTw<Q)rIaas0>GFvvmAy_RF{}rgkM#y213LXCoCZtQ0-$>b%|L-gLf%&%F=hPeZUal
zIxo&)CmsPBdeLq57*l3e!lizUVU>Is7tG#onWvkJ?>UL+^*RUdf_E_`%b-wzZp}1C
zgqX5d=zB&)=Q~Z&p75I>Lc8+s-W`~Ep00cD?mgqK0zqZt==#Aqk3?v&sR{_J(JNE|
zQbQWhksSlY-yrlvre4*wESYoHb)3_DeNk1($s{qHlhGEu56q^)D!dq14nkZh)Upm_
z6#>mYH^<1P9l}zP<TNwu64|Ylu5(l+F26<qpl@_Pu*VO42;Te4r!`5Y^n7LGg7qM@
z&p!f^_xXAim6&p=$%;dsUgy}2r}6k~n^&5r9A~527ejzyG~x!R#zkESz8i9!g|l<s
zcSAm3Dn<6`=~-1dMMOaIpbP+k0`_DrXWvBt?T68Yo`3#X!6B-uT$lNDJdTHha23>+
z!^w=3);v@|q^>^*W&p@Ji9{PSnUx)LF5MfbG6SFw;ep?q9T+*OiVuC|&8^pXcc;4X
z<b3%4&;M$C`tT3`_W$x-AHuNh7ow1}>0?D|Y|E}~t>F2#&2H?rVjg1Obn{>VB{CHU
zR~TULi&BgdRc5GuiY5;eCLaLFhn}2^^F>uwBVujACsD~ckqevYwh4W1Pnxy!Ee7+e
zDx5Y_|Gm(n<@eW_XG5&G!^#1^#k;Mb+x<J=Xv53T(QkPI6`}VHCeY?qHwzM1>V+7)
z)P%>P0;0eTKzA?Dh9(IewFISC)}dCb3quR{%zK0#!TR?2zu!z%+bC_>;ufh$gICgx
ztg!Z~N^Z2MP_vuW9=<|Q<l?=#O|XcNP|cgut`#|lfX)gAlarHqF}hj{R1C^K3^hc!
z#<-H4b1X_^wk$}5pt#D?HzK)tEWz%fMFmAwM-EWQIS_Ro&<Jm(VgOMja@N)FqyU8E
z9IQMP=e!wct+~tgg+LX&4<<0JVt=bLYq{3=C#-t^9g*T&@??CI!&KEFcuN|(eHpEb
zXNB68ZWd#utrrYal?aQH2lt3l)1`?Bt;=D1AXZON07WDKsU93}vBUnEzlzP?+G=Ry
zpzEB2ZRho>b{MSr7-BcRq(Bg29h29ApT$<MU#AEdHgAW03XHa3;1(yd=CMGPaR^9N
z=B<yE?BH^@ewS(lxRIPxakEOjkqpsl=exZC_IuY`MMd2<9_E8?oG2BM42+y&j&mu$
z_7WKYs+=d<9jN*%ln}QWj@ZcKcmAO@;bgUpF6^xbeiEpnfMO;PtM|1f>rlgI+%Q$u
z0^<71`Rtq@#&M5oX66KdKDdCc?i(S{w?~6kdVB8>^>}(}4D!)rkL&xZh@`wr7k3W(
zK7c|>Mc40$sz{@GXGn>OOz#hU7tH)Hr<j)OLvXw#!y(qxDb6uYXUPc>Z5|#xA!1CK
z5Y4Qa5U<zE<#O(V58f^DDxzzDOo(_GdJ!?H>~%`PQwYxc;6rEM>+9DqBH~=}-^`gm
zeg1-oV;^FiGhc>b7{`%WQnE6(JQ4O=Q!8&|<rrt4y?3r8wrh$rXE?q44Rf3?FScEF
zoj)9U)3k)458d$P(@!e;{Qf)Vz3&F$JYQe!F6O-C6n*Ht@8WXJ=1HdT`sL%g!I?0?
z|M_43Cvm<k*UND=%4s}Z*Ti<=ZaO2<@%cNGIj3dH%T!1G0N}fRwF;6PXBN3kOFtey
zeD}lk{PlW%F`>>d90AaGJ&_anxsJQueg9)xuFG@|-RMJa&ZRld7L8)3Y~9FK&f~7m
z_1yrge<`^@&UM2f=luEeza9=BzW?!0;&e^R)spATE-R&3IRDvy@RxC!KL7N4)8u5)
zn2IBQ7qTa;)4t$+T&}B!(JIVz-W+t_It9y~9y)9CZ1;4&_x%vBuPW-WKyQXXl=6ZI
z(Yertel(1foC9!&Q@Gb%8BfPKA7G5jw9Mzj=^Y~FxQIvyiU?_$Y)^7NxX{hl%XGaG
zp(8X+%g_e|I6Xh*lwMz75$U@hez=^^={h?{A-E;xl)0|le*%I0?LXuk=j*GTb$xKE
zdOg1&z-39pF#hI;KSk8*%ja=CJUzdEeR+9#`HIey?+?dqx;$N99XW6A$08iBAAkSX
ztIotDQjaGrwr3@PFvSTF`{4-NNr*YkIn8$LagGQwPp>sBwfW3bUf~=&uF^7bid`^c
zIx<C>s$4H$vH2M58$<wbE|^`s{VWxAE`;F7xz*J+RUi}}QLQ=WoTE{Kt;J^+5ruhn
z-i_nYs(EX3IYrKKo~N|LWxf(oj<XN_Fg|UwjOEI#nUx3#37rzbp+DAJ7Uyfh!+^Rq
zx91zcIEYAE)Yw34*H?mUMTX-u0OmLevk#pxr}<iUrz+k>BJbSg<+G~xX+)&wAO0+-
zIG;ZQ;PCVzFH>4BIVWqf5plX+0n}7#9^WJ=;5{$(mvh&5b<;XV#5zg-6?|B13D9>Q
zs?DFQH(pyV!%f%N$p7o(SUt!=YnVW*sc-D|_tcwvFH_N7s0K8OaNVm4+DHwB2lMx)
zQdxi2wvB3|&#eURonU$6A#XzdR$GdXcbt2FINg7xCcL*^Gh8c5S)uuxOi|t3a`$Fk
zm3zH{vA5xE?PJs4+kLK_Ze)EGXtEzf1c`PUiCubGL-$_~Nh3ySy$8Dg*L!Klozfh3
z28CK17XWbWL%Pp9$6uWPS625gkp^(5JkdAxIge=<EB4Sb^a@vTFM8M>yH)k9+f7%{
zy{p>eC+na4Yt=%*&3fOVtBo5*^K~A(rZru3O{c*s+o?zdHsH#`z43wc{!Wrn{nhTM
ze7ciQ>^v9ie;eGS?LBFCux~s?&Bxt!S-VH~R-IA6F3G7R<9JgJ7%rgSBHc7MUU!(_
z&bzL$OTis2^WoxXgeDK%K%3U^w)5S6HEk6z_s860#~o&2R`2Q8b6c2|S-ivcBopB@
zUjV?;%VNwnDRd5<b6s#Z-zb$58(Nix`B(Kr3yNNd$cF(D$$3%Hbq*0zPKh@xYB%<i
zKmPpb```TbKmCvYvt>TVWg_Q>Vfgy>tE!$(C+|y;v@NLl`r^aT^(7pUd?4q|jH=34
zML5nEy9GXUp&L`2r|au*eC~$h`vwLK;o^K44o?7(R))8s+sCI4)_BDsFT&gp$L3*H
zlkr~8FX!{CwWOPr5b^xwC!_TP=u$}G^{8ga$$O_N)A_T4_QMI*Nnr)+4Idm1&q$7Q
z0#N5X5KXV2o$va?699bv$G=sPoT4g=a0o+TRUi$Aqx0SG{`&vHl6FL9XggnCR7IJ6
z*OLp*cL2IfXU^&A!*58v?*`5pzP>Kg<?GK2iy99l^!?@aMHP-Npu?^!1W0o*As71L
zXaja~o}7FA@=1ip@!-7w!$1DfJ7-B3L*Kiu3;iL^msqZhj)!-EnByYC{diR2ML~s6
zhe6Zy@elvb)^bcaCO!xdVb_n;A6`HI5fM*M&$i^Id5*8=)A4vXjP2Gp9G;yIm#;q;
zk2sOfpFWKT3O%lF6&b`FFAXoj#*d;N@?|$?P7t-)l!Gd#2rF$tIN1`Y(-T7EmGurQ
zJAlZo%t>6eeIP6`=Fp|;3ln4RhVi>U`4^yidHKXSUe8~A=stY-V03|@4~RI72O{dn
zql$#CGjaOU^Yig|v`d#?zUKMz^>rqq@mYRN9^qS1YAs*pC4GLGo}W+SFbv~XqJ?k)
zfUiIQz3CQ^oDW3^p`5BoLRw}P9uH3<Y{rL|IgJAy552X>%vm^dTB^?Pdj7JKqRIIn
z!eR+LWk>1|ua==!oZ?rvMI?)CllI#Uhi61m$*TJF{9c4pTvX+JiNi1)k4Mf)IOmu$
zb9;C^zk82Jt{VU}&DShxo+fi<uow8S?H*<39lGswNA#g{KG@*7OnK8RBK>gGrt;0p
zvRp4^8i{}q|MUO)zYYE2|M*}2hcAEpySQ8{wlR!PDMr<aXqCXNpEspNg@qLmOoaCN
z^C$beVHk#C2%#@|M5<;+*bgTFwHVRia4JJ6PQuxsqviTqiyltJufx>$<UBgBoP|^9
z556Bw&e)Gn<iqRF|6ne2pt@XMI7g04<2$a$(+L1mnpMPC#xOLcH{R!P?XlRm)UkK<
z@<#T(|F<pGzHN-Y&7m(P{4LoS@72?9dH={Rfb7<(c}u6(mG@uAU1D)bTcdN+U+k&y
ztEQl+5z2(Qg%dZ)J=Sck`}r9@ygYTp*-(+!$u2&)8tt^9vbJxFxH`-zA|P#|tQ-{9
zk_}lJ9|M~m6K;vLn*^iw8VyUk8lg3LihELfX~m(j3%48pkQiPH&y`cKejLPgB#4`O
zp$gbxo4p_^QhOZ`+jniv-teyKY@Zp$M#+tEr!msIPHrn#>mabTh|{~_;@vXS`y2hJ
ziM+8WswTEKjaxf9LVR4NuW9e)eyBduO+odtsD=RF)NViCRLB75eX9G;N_*Yzu@T+Z
zkG~p-!_A+YP|C~?X=Mh%jcH_IIqKaH6x}KnyA--UoMqN^*PK~PSF~{|=ClW!@5LKs
zK|>w*hMnQBoUq<JG8KSoSsVy^Fb=Wxwr<rRx_4%OQ~Xhx6Z-*oAs9c{>hH0)$FUN3
zGtZhvxLt5+rm<vn>rH02#~OW^y2S|q`{8K$LHF0uhn|SyG8vl@R?{^?5|xKplySLM
z^R|>;i68{uiY7xC0U_t8B@NMyhY?h-*UNtHm^ddB=J&%$M5gYn-fZoL<A}hQWN;rk
zL}#wz>p&Lc_59@ze~r$WuN44hE=$5WH(y`slVKBJ=R;bi6sK-Dg$_9_6+kmJu9Xp8
zHv*zE=bWcGA<YDsmZ^!?s;8sI<?4Osd{7n1vOOINISVr*UJ=QMUR5vW*RJpTesH9R
zv1>{a3|(*Y14MG6L%{L$VY;5be*Nq{c}J=uoLU#s%lXy3tt+^jGv|B-xE@aLhQl#V
zmpb!5y!&1_&*!hI${bsYQ_eBxNE86!dVW#RIWnREfOCon<Q&qd!XmO|@mMIa!?awj
z&@S{>ABMwIii?T*<7|<qkmD>lTBw`3rlmN62y;dxa3DD;r#U7O@gafAI0R5wVzvz_
zgvzNiGM>2@vn^20NdY(|7M_<BM8i6lWfm66SrAoqMugCfb>StOSU9)L%RDa@A~_z8
z0C4{Lvx@jI)J1U^yWpKLm#=U2MTv7lb2mmr1E9=atA#N%ryCntQ#!RmH5<^9^GHtP
zvSW>{FLut=gfHP7LI@#TE*Aheo=(AgRYAhb*Pm7OdVZ}>h;W``T4Ek7QPMf@!|(p#
z??MQt;{g%lJmq9c_JUzPKMnTr;`JrZmx4~@1c)K@c1BeR<68q4Rhh1r5W24GP5;h0
z#zhPYD$K_IV9Y>OP0KaTSANlyG9sSOm-FR%Jah;+%`r23--~ccOhkY2AN`euZ|7ys
zX%P|7TXris*A1r<_@zz(e1E`=2Z*X#;#BPkR|Q1h4V)9pQg*rF;DgP@fixINGN(A5
zFQD3a=bckkyLZ0Bn~};gpAm`TvO+xkFz^RdLB)52io|6Cgb+rPU6Larr^+TIT2KAL
z0Ty9<F%r1~!Xanq`osVBKmGSe?)m)>-~ZWPeg5O$U?FhYaS)Eq-P*y_cmP)u8R`A|
zcg&e{bl%y%!8x17n(cM1)*{8|{Kn30oP9711Cm>=FD>9KoPpVQeSdgL^VI_Gi&BeX
zD;AwDm#W8Glg|NQHeM_G-q+(6Tl?ULV0WqPu!6kncnTjTiR`&aCN+F8p=v9MN-4Y@
zIhAH*gYRpx_DHO{Nz}2?Ag+aih-9O}YAft4b<SO^_Dbuz^%}S-OG-PWO(>A)!xCYW
z_u@^zv?o#NP346*Kzd_3RqGuC+}1Sp$E<V_Ad>yuPAfZZGeT1(A{7)BxcegOZv_-f
z3Qs#|tvww+K;(<rI_x_XtctyDBD;PtEY8lLkRMWK>ul9j?1in{%u2PLjR4*ZT68Vb
z+evOS7gfDexXCKru?7KEuo7->=s68_x^-Z_85I|ks^;U}KW}%wcDNrcC;&a`2RHBU
z+wpL7g^MDxY!z!Pw%(;&**=joH$*{M|8JdZY*(s)XR2a3aN+_I7RlP?@$vW|<eZ%a
zj;?W0kD}JFl^qM07(yw(S2K(=y<Pn#J_JLR@BNH6<3B*E$;oABA=o)2)c>`~G~>;#
zR`klQ#Y$@4n5w!)OO6lx(y-Y5-|*q_TP%w;z^=G_?8vTqx2@I}??U1L5$E$)AbNiP
z19@Kq6Sm7vzcTicR8cm2HeF?ow_1zs`NoGH{>DqccY)M(9HT0{RV2GP@or;p*La<Y
zdS)p?Ms1rjy!m|08HMf7jPInPLP9{_$kQq>R#4FU=S?`30fuFTATTEjQn6x<nK@_U
zuiL5<$qLx+P0st`IlEo@a(FeL8HqeOcz*7PAg9FxnoSov-==A#B;=?Iox#?|!!EI|
zafvB`uoXmm82~Ux3ll*!V>MJ&asgDUZ&~}@nRCiwx+`nx>~ay|-n0arBT&gHw%@U=
zYTs<>A^?#1iU^0}$<nthy4H6C6os{{ce6bGEiuLjmgYb$IoFuL5PDt9`O4I<L>yJk
zEX>?_Xa5bVX_?V^W6vtcI(yF*mLPIQxLA7v;ha|MOG3m|oTnmeiL3@x5IJ)J7tRW1
z=ZW5t;LbcSc&7>}Gh%kRu<z_TuM;&~1=P0gC3tepGiuO+ZCcKGB;*`zo>c$2`AU00
z0A$hj2qQ-Zg(HFwog;r^pHWCXvH{wrK!-Jkr99PGUtC-@ImO*v&@^Y|d#Q3>@k9WC
zWxf(Q-<5b+kYcY&<d_p@?)w3(eMb}#awb23zVCIVgJqV`b)g#^0RrX}b529=O)QA3
zWY&Zx)fLQ~j6}F}T39C2IWOd#qac!*vl%>@49+=k`MUKYb$w5WIY$$dS>}83&tnnQ
z)6+Xyl@FK8CHT<wz4M$iI~S0sA39K-;|l=$(34{`E}qX{OMb<=C@jw&0nAU)haM18
zoK324m)K-*K6K7^Ye$s<&^ce%2&KpzIVV7Hp;O_sTuq&6Kblhn;b9n5RV5>BC&YRM
zr21v~(3v&I%HuLYJx5q<DM_jSO5Kb^-Eaf|LQ;q2$tf(Ng3XlOiJYpMwJoo%9k#l2
z=9JR$`2#tZ)2tWHaaj%9HbSB_ENDyTcI36VJef2Fa#?*{EjSQM033^`!aUCwtqe%M
z>j8k{Qj*1*!ZXJiR!lp_h-<pIg4(>_&>h<(V~ipa_J*CtPBlHZbL5DuhGoo1=#6$^
zQQF*)eQ#vKt!=p-lfnXK$?yvm0lrnk7-Capm4<d!Eu8b6@FHS|c4@aoa{B`j!TXLm
z)kDI(j&DEnYBoO}hZN^Hosm2hv;W=2N}2t-SLX7dmu4s~bIR<U<p|!8jFfW(*O_v~
zQR!=J)0D*bAbRG!EZhYbg0pc}Z7khBVcc@FbB;HNS>xHeP99V_&gA^z_*ACNM2Hl+
zPF3R)4byItZ|^%*F#&8c@{tN6_^wxxc{<~!VWM^>%OWYuaSSZVEDDh0?E8^?SWRF|
z?;mRukIofJ$l4QdPU}lcURbGnRFIqjYX*1QULe9CtmMcnajB&^f_J2<(~^nMXLK%D
z%sLXT;&jx8OM=3|?~?zBR^<;`UZacCnVeryWl#lH?U1}9bCYQ+P$H)y3<7}OcTFcz
z-`@d%Xtq>!MFhyJ3e+KyK*qHXpmGorAnG!K^UnFU-9#b;lANl!hW*vDEZ&FE4~W1e
zs+NfylG7Y>UW~+HC4vZ(BMYqP`ax7A+b<dWL)Z7r8ARrJ%9)2gK#8=h4=T0jt>L}K
zM5tU612CNi^u#$cM+m(qC!AElk-zC#yRH|>IYn!-$vNk{xLj3qNtrXh`~Ek`*(%F<
zNzR47ADDCS9J+ygF!&wM7uD#xo<y8yRhced9XTXtOtb<Lt{5(J9uH5#9OGmS9+6Wd
zPBAW5#Ag@!%$A#B!In=dl5;|Y>^$eh9KG+I?{ZpljvX8j(FFu>oEHG>`(9P!!mS6U
zx}8s$DtL=V;aHC9LZQmMZf>Sz?>kRqNyV<~M*!s%O@mh6Swxv#=l~JGtsDharTxxN
zL@sAumiU|J56=7f{58#&looO>gnmcx7BLf1FlZMyzmDQX0BT0He)X5BZ2;J@q&m;D
z_uj0mLN}}`JG|-Cb6Qlz`A%3<TmZnfH2}!6z-otLrQ3A9<eWcz_;3@}ZKt4!dXLUw
zN~{8i83nwxmHTpaMU0v__&X?n7dh52-77H{ABZa+P*<?U!CD@46?)?@u+8tWvfIJx
zT1k;Go6m6#QLBjUKJAdK{9Lo@S0$Kh^l2hUWXOjRCh!KUBx2?@p3xLwWW!pmQW-L%
zTUe2(lI6%ORLzrQBO*1Z9`4E0HzHaoH{&ho$y-oV3B=K2GO0DBQCetZ{SU1HAY@*$
zx+QsR&GapTxxtwC_=f^CT%JlQ(RHuK8%k1rgj7LHtqhHhW(($Mx%3rd-%)Q?+Qq%G
z7ZeFU{t^el+VWq=1=-)7YJ+&og}KRttRH!uWzhCy=mXA0wKA^@qIqC+rN#&|tW2ne
zTBY|Fu!{BZPVI+x+9HANE|^q9cDjmHzM$KPNgqELwmmzyG4BwFoH|hRHBo^!RHV6u
z#&ByXaEMs*X`n{dY?o){CrO=OY{QP#NdPRWvp#1A-eOIx$Kvx)zw+u`A*MmEnDgzp
z;XdZD{s^e+i>inP0UX?-clCJQ;!&G164oEIefS$j7#IOggpsjzVJ$9tjb5u99H{qR
zK&`oMi#!!xE&?F|Y2z7LyN;EmQ#YCQpNhyD)qro13OCq#JCNGp06sQy^~cl6RJ!X&
z6k#dZQ9d}=#pO~XDcbLuGTTQqe2-aK7|g_5?$;!kYNGwK(2Xm5l~>t&d2X0<To?eq
zEz4C^%i(KUB@k7~TGjW^MpeYGcKe587?1Dbe9dY3@ctbDxMDxAh!lnc67`2?RTgGD
zGLNTI=nvPIPa?d`S7!O{$KR@o_nj7<6QOg1^Ig|DKe*8S^oM^C;pgY~&b!bb)&rDd
z%>6K&P9r%_KD>VYayfrFj6D&CZg9^3;UE9#oa;lfCN%`t1>b5~tYPB3WYr#zhy+y0
zt->kh9CM0YKUS|lv;Hc0^*z3i80Tx6FNde^kf<9Eh{(*sdA_~?z%V|EWX{?7Kt4#0
zIi=xvLPXA-9bTsB9GPx`ImygvnL^k5e&iG-&6U<~mUxZX!tGGOxnTC8L=M1NQ8}L8
z1L%AyRsi02)~X`H5}AdkIV!+u=%Dc;Se?y@T(G+drHMgM_5GoqBiAL3eHe#Ogg|~n
zW;idLf1!#%#OZpm1eG>)r%rs!NuY{E<N~KyPX%(p%zO|r^e5)TxpdFY_r4o)NqMwR
z%ZwHyA`PeaYX1Il$#F*K$Qg2I@(Fo<|DAzUfY|k;7M_tAtx3uP(-{CR*Cl2Cv)}${
zJ-0$XsxW63ol=U%8nZ2JI2=KBna@ZrgrV?#$eG9Hx)$({fBd6}ynpu`x<QNXV>WU6
zW)SFtArW0S0zg_O79I{yEq9v8Qy01(PU{{Tx)A{mp(FCIpZ@@>u-YEHWxgOf>w3NK
zmg!ZQRTvRDEr1yM1F6s)ocBbIoJVv-W{;Xzq#Bp`0);pVDP9fK_n{lcqpGCo?0sKJ
z#nbiGId9seHlaSJ7`na>r)9Z-N?ZUy`{Bv1hN`B-h#mswoa3^L<eV>QDz;Mk;e<%O
z8vrz?NUj)+)ve#2hqTPab)9)$zCz<|Rz~>3ENp)$hW&Outd+ilZWCMyhv1#V>zAKu
zT$*{ZU#Az)G6P10emIOr(_p}S{kpSKA{V*=K;v@FDb3Stin!4AT^QnWQGmngNa&XN
z?3}mZ^!4SV^PLMF=fpXi-N)0rA8U-pPk;P95&5+wV$L}&R=oPqSD3^Rf_HJbAiB`?
z0Gbjz=R$DAN{Ei`a$XDHx9On}e^K(QZ;Wm6SLh$0O_aVBY3%gLzm{YD?Y{FyWN}YJ
zH~5{P;bmZ@zO)tbMkA`!4&8n2GM}#0O2p<tYFmv5-w<y|#`^~Mj(G}qnSeJ+;YWJr
z%?S@4c+KBbRrd<n2lfegkFLT#CW6*!G}YSkhU~6e2Lh<K1or(0+vE*R2&LA*h?}og
znIQFraMSd(ItslZf8Ts*d`RiQEqg<EjpyS>@DZ)-UgWchPww;v_jYSdrF|z(*di_Q
zhF6Ar(m}mKxcgMM(e%Z$d%dcAo%kc^#!aVypqk=r<~9#J7B^iw-UWi*O0ZWOCfr%(
zwKDb^D7dl)R$od4pq7VUHb9X!)X<0~xcLm+i&nIa6RiE;+IO~&VcOUgnDlVBruOll
z?X7Rg<~PO^dQbRzv<YGbTH4S?c;uvU3-~qWh7a8!^xh~_+Yiu)8tSdPVS%mY9IM7+
zyLH?0YWAc$IK+m$TTvu@fTqAci}cNt0{_*&{4Wt*2)%;FWwPc^R7Ic*&imU_(Uj}}
z8kebEc}B!Po}LiV1e>sVn?VS!Fv@&zuDj#Ft<gx^0LJ|Bmz<)VIaO=_@A1p*%8=;z
z^nHrgWxCh~-5*Y&Kg8*5=ra=i!{7g1Yq~Iw!}IC1#3jWT6UUU_J&lNXonmG_^g-8a
zay&id9CKQH=)Ldkt9|_RMMR847gO%K?)&e5M|WbT001BWNkl<ZP|%mpA6ayXdFcJn
zc@`Bhryt0fMYQh&5_#XZlEkzuahdyJ3|$|Wiz;;eU}9TB@?Ebg)9dFL)Af2KLP8vd
z(TCteuK;m+70EF&5n7*AFKO5HUEi1b>-}$#T$N+T7(f2}ld6urUv2h+_dcamjk9B7
z7CDZ6B~sPr!8vk-HaoO(-d=ndy2fk2oG~eL$~+FC@BGVoR)s!zBHW+KkXd6YNgcfj
z7Z3qpNts2D>rFwV)6-L2mU-{8U05V3GwX2(+6)DSHL*SX>KxKed#7FS<lHzO03a^c
zn0Q_iSy~HG<(G|zL#^5M4WMr&xfB{soGw6Q{c&NtkTbH33tg>qIVTYb!vU&qoT|N8
zI16X;!8xCnsd4V#LJ2HWu+R{QmifBOvniUK3q<tO$Io2|@83Nmk?)4f<^1LI=hN|c
zJRWR`p3kqUIv$SR`;Q+#bzOLRey6IRKK`r<nR)2L(0eNc%=q4v11key8K2(&7yr$F
z_iz69|M~y?U;oF@b&k-5-utl3R{+^8CCP=Z2L&^FG+^AgDx8yDKOcJ2!`N>{_@|#g
z9>(D?4k@LSl0B&NJgaKVTy3C=#1rv2j!#cVAWuZY;kg?R%k{#XKmGKFWuE@zw|~AS
zG?mmqB8tm3&X?o!_ru|Nx_oV;;l1z1=MMnDIiFv?{`}J)-o5|u{O$wiC}o<6<I{WJ
z_5b!?|KHBpU<3|hhv*FYCFfFFI7jb00CX-Op|MoRdGj`NKJ4dhx6T7MBn-<3tsW`n
zk!fKOH!tqGZWs?KEu5n7dLrKqM?f?i0b~5ORq5*0mPJG)_x;hHVMMfm7jjNjF0bcq
z=!ao6c**AUQfx`Ghz#S2Gf&e65s#;*hM~Q3i*hpj0Ey0DKdNHPj0iTRzWJ3BuS!oa
z?|y>{y3QHW^VS*RcVWZ0rgK=D#9Q4QJQe`bKrO#DK77rCs<*WV+vgzudkIBv3Ai^c
zsg~+YQK5-1ETd6{H7RTD1Fc8FMtge`q>MEf9_t|WP9+U*n3)wBEo}LFmNT#ulEZGC
z))tesE?*lQ*!@2?<A+KL-DHo|`0S=Zyb&=sy7Fr0y)_kDGBmVi6zFOe0ECZj5AI|Y
zcxyl1uF0DMQ+I`LYcaKZhW0t+?Kn)oX#}CIw6^ujd(?BUVO3RcWcCOS9)<lq21VMT
z#l1;H>ke@9UOVT3J1c>=mgjxXxNjD9XCPj}ZtjxAO*2k}w}$)e9KM}yZf5k&JbN=^
z+pWzzoaj#I+)Sg^@nl`#tC)Rr`feZT9g?AU8`sXI4cn&;8&`eN#&4}`1$fhj@3RNX
zGPyxz)~iunvYRonwkj!Y7N$PTa74sk?P-1^(b1b3p5AH<-e&*bvoT7ai}$FL-51zh
z7TDZ1ko1>3m+A_q4cJifPU{k{rjIxOdUHEyC1?1pvjhLtzx=P-f<mNNvWn_Bj$PNK
zINez+qAH}64fZvxKXc@q>Bi}C?FgIbdAyG;6j5s#SE;_Ud&VqvTJr`lg`pdSSvc7Y
ztm}Fog5mGXA|l7rQ+-0oxs>8OO-6M5@ZArmckf?6{$5s<#pkc*5W@5GGXPv(zk2Vz
zr<6G*9>+sJ46iR=L?mZnksp8fPFQkY0I*v}fK8?@e*E-VRo^{7hpv11@+pMw`21c)
zKK}g25G?VBV`A%S){anA)h461_(B-V)yT<+tg0|CNkI=o@0_JukPm}`#`)rWSLcGp
z1~mEVbp9+k<w8BT8kU$PCbkb_SG(&%wO{CmBNF*;RF%uupF=l>VGP}&8;@Up`rYf7
zpWc1=k%&y%;hY!Y6lc?J6L~YGbIyruv9Vu1e~vN!>2Lq6nu;#hvspkfXU@qvPtKWF
z+;Dg@kbs=;$CIjFUp}T7r|b1_dLB<triL~WZ=A2pc|5)o&gPYDPQfcXlv*{Ut?J?U
zB*GkLP(bH%T$bfxJDDlc4#%VU&mjQ$z&X9Xd_~05>11y;&-1b@wIhTk9Zf}J&Hy-c
z)=cZ+>HXp9U79aB&h51S@a_lUl;#OkilTtXx{V@q)1Au7sIID-<LpD{LN9jdLg$=c
zrt?Yx!-fM@c@}F5rt?THFIQEy6p<JgL-*^L2g%v_kYda^O-ls8=ckkRUR9a-e7Pdx
z`}gl{5G9;N@)C1QdFTQndhY<C>(<plG#=ljILG<goD_J&KWMiJlVjU&=Ox)Y6VdaB
zAAQ%QWh!}u0L;9^c)d=2=Yw~yQOiuzm6?ZOAm@j}Gk}_Lmx_>cM9zhP<V;cU@uz=W
zmc=>ey|=9(&gYb6j=2l2^W?kUyDlzQ1@*o|baA<ob4Gyop|fV%*gePNaU4hMfzFp}
z&aA@TyTjpt04dF(>wOrA96Db@q(uN!s`wpS4g}{MoeR$SwhJ^GV3T=NbY;BRD6S;~
zDCb-+vI&{2<wZncHo2Dwcm2Ws#NN3oB5H|<WZpd{JX-+3JWPx_nbM-FF(w~E7eWn!
zmYvGBM*A`%x-gjD)KFCC9g$m>D`;_anWr<6GpCUpC-T9$Ae?y1tlw5j*B?|QXA7hh
zs?`jk?RAIa2@&Uc5@!DhAbvbFx|c9-5IIs~5&LUexK;_UX_rN0ZJBnG;(PzLO)NpA
zDkz(I?oE*Ijo`0_2}@C}HKnmu>4<}kLs*Is<E@o1UWEjtO*8$5k3JDK1@(Ff8U;S+
z8)id_yP=hl*$VA=&5kEf6|yk16$INPJG61znj%J3c9&GQrb>hxe`-M>?|os75)oN=
zYcMXNnO2Zk_LAjwturZmIT1F}hGHhCS_6`dGe&D{kgh5^J6C803@wgaRj9ZJ06FqL
zNKTls2AQH*%RsHW?sfnuw)1>dA?Fc5$bka62H*q$1OXsRX?J9|QIKkQ)<)-hgZn3{
z!eXg?JJrP9Y{t}Vh@khK>wTfVcNx~Z(4E_Vf^RCF$vL(JCBzbDwB|=bNjC5*EXu2n
zXzMD>Ns^h@dt^_fDdlyKL+XZ|s7~iEP%bROTh;O1)W5#lx?QX~6C_<vZsTwm^RT|3
zS#{UwB}e4E2T(^Oo7sYK$puW8T@K*t7+~LCIA?VTg-);;2&_y4RAEJJHW|6;qB!T2
zQt+<LEh>})YL@EO=qTKgA>Rlv&_^@low3}_puG-F;dVNQ)ie^?e7DWTrv4CW26Y?K
z1Z{`DX0bIxp8W@1qpx<@V2dF&y>dwdH0QiKM+IoL#Gu83<DrY4rP(xdMgLZ7>WEY&
z=X8IxnTtr@_qNzogdy4%<BGEh18AFu>U}4|`&s~QMnvs|=~v^TMX*WEdvfHY)diY9
zGH(g*K;#g>d(UFR&FTCV!f>bxIe48!WS%C|ux1t#%*>*?EQ?XEWaVei^SsJsKy<cM
zY7--AZfA;7g+-N_Q=II%VwQ+tHq*>1QZk-x?R1^9tV;wW7j4Zm%Mx=4p$nnpX3#BB
z$a_=z3uk7|)=Zco6*Dulou<VSK@01r#B2gM2gBjHfcRqCAWU%<;c1SnSU7d6k`n;t
z7>No2#FB%A?J=nGQ!c^iu-UgDBF9CI7_F+xq7Dm9jzv^6R2L}WJe=MmKwKtJbzM((
z!E;W_RLn}GL~`5xC8X*^T-HB<WzQCto$4}A%qjFok*wtnl{qsj(Y7zg7!fgaJs}BX
z5w^3Eb29YV5sl;6*14gxbX;KOoW)$KE&PRZit{DMCFfKwIFU8$Dk7Xf!7c)>yni8X
z&ssETjq}6dgsTfV=fyNZ$~g-oBBBEY1tD^(CB#uhkbuaEu&Ts)64jg{0GysbxX{J<
z0t!e@!D@d=aa#Qi9AckxQ3S5Lc9nv&o$)y*D-?ovq3aM)g;gLe3#<ZPUT>D27mf%C
zoC}5DsAB)U$-){6y2ZpBX)wiW&NJt<<q04<qM;8&$SmgPk~x7w%FN6@X9W~as+x1O
z7H|!qU}dT1KC1fk^wc7&A$aFIP+?~0)^HKHL01t}({iy6wF@D1o%i1QT2&c_q3efb
zx@-$JbO4az<a}^0lqrTty&5H?w=7ay#DXY<qH8Bt_AcB4I80i;=4KRs2J6V*nv1-Z
z;<SH>tZ=2(91O~JLj!=M5lYmf);fSiFlX=4J7-=!wNhS3*Q%0B(}D%<DBm5)LgQ0P
zs!7-s@NuW;A#xamv#>N<B39}(A~-@&Flz`O0$?(21DZREb8j7lU=J~8xj%cD1(C)>
z&zy?m$*M&)6)mhv^rlY_!0^^VSijV-54&iT?8)*7>24lrl%t(>ssjM<-e;ELk+@9X
z|LI>8{EbNU_aaj170ki_rooIc=A3vfm=STF=T?bts_Nh<c(+Y#0a98xqbjg)T4wtj
z7SU9WAKM!C5zn|%tI_8~&J+2ZWnNO~`mXC?4YR(vZw890NX{`ua|cy(lVZ*yV!j0J
zb+-Rz76ZD6;}elHHnwfYX_=U1nio|;%{CykGsZ^oW>z4aMZ`!kP0f^5q+oqbb)3^u
z*MNwiFo`okm@V}X9HQEz{L~Gc(=uHEq3aL!y_i#4lMYu)ni710RBT$)GCAjv9Bu1E
ziJStY6jPiJr?k~)!dB+2CI*0rDMmBbL<f>tnH}x?4V({MKQ8lJ;m58oH13@9JkN+U
zjE8xiQjDBqoG#{0Voas33xqhGKO;~bE9?@O?^aBVIrRO(y)y$aRgsjfr7(9lS`QVd
zpbjE}GPCVIs3I(JSyEauD-yj6eLo(=07fEE&1Nr@7Uw$WgY(`a&dZ{zYg1nB7@-ny
z0FYS;5gm11j|g#|MJ2|?2y4}R*lIpj?Spg9Y@UEQDYJ839d6lSP``WMb!3VQfV5m?
z^(YQqZ+nP$)OX(IJ6dX~sH&McX9+ngAm<FKIY;k%7rN#VQWaObt<&kWGX7Kne7Vun
zJf$5&drNLAQ>(aKIST-Wt}_T-*K~+}I5-#P>C$uvy>LpFZg@inwY0dBE^C%IY~Co+
z6kd)@`CP-li++Q}Tzi~VfvO_HjzVq19;6`LM|tggPFZ!brn#`YW8t!O!@TKIP2HP|
z6v~3Rag{cCKy+a!KD3({x-i8GIOKzhO!Fl(2S=)cnA+~oL{`G0lCe=_wL8Ca#4MS$
zLuc_9)wRI;P~;PDHCu1|VH*mjkATnn&V9=&Yv4h+Aq4)DSfDrmaQ|p-N)Wv>v@`{A
z0S^q=TemPpFtX*kC7EWHN_kayOjIA&f(Wf>q*08Ju!?eR`y~TwMQT&uc!lboZc`Em
z8f|{XLj;O>8?>nr72qfsS@8`L&^GGp7C?9?v@pLuC`B9#v-iF&j2ba-_4j*xYi=aL
z-}Xdkzbf3so>*#j*$t~4UK@klU0~z(d?K!aLmRiHge7dO9sI`AwJY}VhLMd8grhaG
z10RST5V7PnHZ*_TeR5bs9O{FGcXF2-3q}RA@U9SCxpg8UiYQR^;3!p!0ZmwO!;Ate
z?Tef9n)0Z{L={98S02qazYsBp9s7bTLa4M(8CLHFsl+Z^t&`fE5Gvdm+6n#3Jfh{?
zS0@L(r<!l#gc1+4LuFeXH{k|z)_F%A$~f<cJURyo&N&-`lxIXs&{9DXoinv=;noom
zk;Pit>LBvYvG+n|UuMs6F}PSgkXMY|Ts`bQz-`n;vu!rM!#9xe4Mocw4Q=+a5#JDZ
zqOB4}kJX*(E@pH0&~NvGTB)5CRj`W;)m^XynpmV^9Nrw0M$>|_y0=lA?v+0J3+a|S
z9m^Zb*)9XyD%n<VWsNofW|6&jol8klX6Fz94eX+oa9<CyxLoglXiC#Vn~AtwMKot|
z4xJ-rWiDEaYQpsEyTGnLTA)|4Ip*A2J*h(99{`c3D~nW^4iUTYkmC~Piz66%e|&y_
zI6eRT`@dJ=!|B<1|9l#q^WAVz)%o%ghOr+`m-FlOa_)k64sC#JNm_@~d*&SH3nCq#
zzc(EG<>l+k*RSKy4ZSx~ZZ{ms`RV-G`EEEoi^%0Nb)D~mxAa7B8TJaM1V@0-jZ`oY
z?D`{fT$ZaRd_E4L>zxm<Agu0mp+7LE>HHNDhQqr#UeD*(uJc`R%$hSJ`7)}5+oQ_|
zKa4%Dqd1%TXwIL0{&}9KfAJUpVde3SedvdA7!RtNQw&|#^+Q^&Z3#lO86XH}$;oxS
z?*>>sMIT}h&IRu}-wnkMKsKMh&>x)h=dVB4woiqXQwScE<8t+(cP>~tS*7~5BUC6Y
zW6n{QDfFWYU5<;YIs)u&<^1G!1`etag2QGJ6Vc&#5|PXK71vN=;l!-<#h@ab&2h>*
z0?_I5rC38K$9Odwch`AaiL9KG7;4yBPqh9Cwn)8qgpgTvSzbT=0m>O>%W9LU41EUx
zF%|Tc5S=G`kk*w_3|aw7=R3WAnqNO1-~X6%jMG^~=4B~8@qA60+dbvw<pn^$`|djs
z9y%|gKmYu(@BBD~dC5!6<Iwe;&uIq0&<*RO#VIa`V5`2Jpd-5J@<ml0IWURg#_~{d
zK6FD)v3B8w!UKQ+*ExBwJ}6lFMB-^lrsBw1QksfCfOnmD3c#FSzI-fSEiW+7DRWHu
zw}0`MAAbC;VG><G3a6YRAtE_u{`z`-@5iUZlMlmiI4$#enJ$Ot?}=PD9=z{<_q*SZ
zhvU<C&qOqyKB$TofPv9DNB*aue^SxI^U#gs`*%xbetmrfQ14vV_5E-V=A6?Cj2GZd
zL;>deO`XWykY$`JuEHvkBdMxWC30AX@yH@&1dSN_5fO8WmQ13m%*m=HquQyp1Bigd
zPSOhhet5E=R<pqDyf+Uy&dJK+oRf<9(6t{~ggNIMGt07;0eCvsGK+IE83|N(mz2o|
z`ew7lIdhJHNOzO98WKq^q&PFP<hV?U*=FHWeG>1<G9~b@%|HgN)%VV&`O%q&Zxz|C
z=5e1nfp0Ru@!>I#-<H)Q>MmHUp%7Gg<`zjV1}j_XRN%W}Y2Ap~8*|Rqj=xrD8xy@P
zX12&etwM$-482XiP~2$*Zpi{047DkR8`e7R6{d#u@4E1}%PGBef`>McyrEz0vKih;
zy}L16__i`;i(l7USmrilq3sXgUTX}yE*T$q73^Bh2g>g^KA`@R{CzWeyMZ<yrC<Zx
z>zE&;c)oS7u!?pHHEF&3js3^I$-e*1?pZ2@yw<CF>-4bo^o=Z~8WENrabr5P?Xo^{
zX1GC>DmO!S5{rtKv>Kuv4@lQwK+!i?{ss8a2T3uwH)?1YRj4~3hC9%rRn+Wt<=AM@
zv{~kx5*!eUXWix?(SmEOKf_}VQ6mj{0ASt=@86hseG8u1NoH<`i1_CIu_Ly$4H~q2
z<2SV#H|SLRDA!e{-)3FDtsdE;cvLIF2XN=T;X`mW?Y)Y5EDpXJ+bDqfMvli&(N%Ju
zbINgUM;bN>6_5&5Wwtuk*$B;vI3i|ck<0nDP(@UU5D?scNNDhks1n||16;nnfnCn$
z7KXLDKt%rj@Bi*F4#&f&DYbC6nq}0w(48-W=p5&?Oo(_Ki;vpc2P0ykhu9@c%k?@<
zudnBE2p^sg(;Pp2z5Mw7cg9831~Er~)3H~D7@6-{;hfpNAdAG5RrU4qQwXkG^(P`1
zS}rLG06Hg*=x_h#uY>o;Lx+f$*UyM}7(3q$A@nMWsGmRnq#}JERxG;AX+m(EGv{Pa
zX$ZaZA<dHl97aEMqe+{)@dT?Qt8#Xs^P!(FFUx#3<?n7t>B8eeh&;!6^=|~u(P~On
z&C3NH0SrVAd~l&d01LC^xG<*UyB}1Tb5s#?;j*F_k-QH!p;T35BGN*zwzxh-=EQNb
zV2~82v|R0Yi!qDvK^XoiXvCU=30>!nlg(^osT*Tb<rK?bv})hXDRJNVz7H|x2EcG4
z&|)(-)o>2H@5p(?$x_;x6%m+qnv*S6B6PGnXt@k`ja}j%k1qgx=t9>o^TpOOk;`!c
z)&BSdB1o^!cg}}po|gG~czQREr!OD>QN-j-uuQM$oGGB0zxG`}j0c5@S?n?E`U3#1
z%AY8rF=j*zowALUghklW-pk8`0brRfCDj43?+?P9;}T<9Vtn`A^Wo`zoG$=yc>dsA
zc>VMTqXb(8dwPEN<8R+_j-0a#!MU(Zuk~mk=S6s#&X&DumVu|P58ZHi{rLa>;jf=R
zd{0Pmxp2<o>4W)LFf$^~*VoVgIBoDP()INdBIf*Lrs^>+zx&(&&pG$~kAE8DHBRRc
z2Hy?9SxO5bFQ5M492zcaw8nSuKiJ`xW#Jrs*N1Mj(?obTA4Q}vj5#f7nO3sfM(mH%
zMTA3{v{h@s#LHy*kj%;Elm=R;s_%yC#1<^cLB#faB|`B=q_Rm~>FMXoYSzj*Eji7q
zMe1%ZzFR2<p^@`lK~Oj|a|j)*6fm|%f1Sv9-+AY(nTB=CHSTe6)OF5A<A_M1FNDv~
zg|6qEI49YznD)b|5?`<9&u^uAhptC#$TF%Ac>A!0-tItp{6>lJV4&Fk5w>;27OQ)I
z;=?~nXb-n8-n+TNU6FX>g0{A>us817$r-UtvTn*@ggYrIHYPwfrO|y|v-v}<iR)O?
z-u03DS5rnd+3;Je;4e2mxQU2&A&IMyMfWr_ZTZ#@73*6r_0H5z_k%gz^#Hqnt9z~N
z_DvoXwYW2qZg1=(L2@&tx|NyhBNfD>vbnMN+83{NXnSK=wYEN6&$ROu|AmqkZ+hgN
zAKW%0#rlzMuJA+mKD-HixA;j_qcW>Bm`4fLwCP)kx@>H;Zhx)FhYcm$Wxk7he9#l?
zL*tF@OX3b1S<Tt8#g<fSo4AI4?KYx~(J$>SF5WJMnSy{ft`9Akur_&h!K|u!8~)jX
zz4uSwlsu0UO`$O}(?@;-x;bL#V|wH5^VFId-mnS)9(cTMoCJKl9hXO6+9B@kU+$)F
z)oSj6ea9+YYXcu2wx64o&F)RAuC9IXw&jM+=v42Q+s%gMb7n+Qom%BtwOThqiDeTj
zsLM$Ul?!r~m3zE$z*s`l57@XRgze{dg>+m!kr4nwpqqz3XE7VF$HoD_!joV;9NW8G
z0-iwMJ&oQ6A37v*j%?u1tiqC60d(ktaDM&rNmZw1>4NXOQY*|c$CyvY9uZ?=W*J7z
z8Rn(Tv<T$+X;9IWvM3-ziZc=U&=I+5&fbG_v#MUFWSX_$osrx`)UHX4%)-ahQ_gvb
z7ju6Um6Wv~`o15SQyYn;sz3hlJ&5ES5h3)4d6_Tg>*>_>W00Ig<oVruRbA$*nW7b$
z^ZL(omR0t%U|Po0dqSKiO)-BsJPGF<=Np^^0hT4dp67Q@!8!EZ=zK`=V}&)saL6g9
zIFWNC-q<eDq$6VbiU35;2LSDc11K!l*HVp&uy8+~jGF|2IZnD+B7_+8>v<mfe(1Xt
zm$+QJ;aKsmu^-k$*OU_CM1(VQ>V{+JhUNNN_uDvM%}#73>20*;uJ4Jw)x3{HI~+nd
zo(`Oo(Q(aE4p!s3YU2Pv{cz%(a*kRuIk-yDOynCAQ@JUcvozu|mr~?;w#jjQ6gS9(
zrIGPzrC;t|qZ*ftNL@d!={c;zmpRQboeqJBd_RV+|NFoBcOitQrxPLe$LFf%bk2F_
zIH$wmSh4C#5kSOo2;I<ye$1J3iXrqN1Uou>H<0t6fBL=i{`B-75Y)QBF%$zcS+^R*
zZa5N=<SaG53qXLGlXEbR;d=h^`t|es@4iE%FF*Z`b9N5Qj8IjlIVnZ&mz3rlXLHlG
zhQs8W#jJ~rtk{#VAWhfl<EPKT5fRPPE24#Vb(}LI;3HpnlRBh0-A=oS5cTr%k;tuT
z^o->8b*uKnG3OlPMOByS>|Ai6gH3vvjOk`>7|VPia@J8<dJ(NE-rDx9S_O+$5!;{F
zs(`aFWCcJ+&Qd&$QoF>waqmS}W38>w8^+PP?Si<F>&KIs+ci-ZrCo4Es{jCML{J}k
zRavI9_nq^>sw0a+ZUOJEA4S+MW<MOurxs>TR053^0LSr&L~*%@K;ndmhtM-8&WT)b
z&Ks&>5BM_A%#3)wFRPeE1Pqe&eiIz~8~O}_?qO>MMcpP{QvXs!5D6SU>I81IjrRvV
zz6Cz3;?DjX@Sola)+XwvY0%=DzV#J&Gs~;$*;W+1iD>F;WIr5S12YMctFKuT#|--{
zc)f8{t99zi$!aY|8yfCo=9DYYtJbd6q|X~YZ?zP7;L59TQ^c)v4ujp?%42#EURdQZ
z_YU8<pJ_H^Nxhl6SiZDL3>(m1SAzb|sAwhHLZi&7)a^Q5aBV1+nxYzEW#iJm)Za|M
z?){(Fe6G9xx%PraGM2l%vbOkaJ*n?9=UdXNu_d*2(km7Ry4Jq<2I01`C&LG2`hEPQ
zu5=ECP%|)c&aQ;omA+;rN}3sAkuBa3WA_1Mby7`R2ZvPBh=>YuTQbQ&PywZ}-a|wO
z$Ow2}0h<^u=VX7w%;v&V*P3k37^~+W*6&X3l*&Gru1WFC><Iu#E&bH5F+PvyX}X))
z<JPd3{zL@u8+HLDrfoO)Yi$p=zG`iEpb1pEn}WBQq`SUa+l8$yi@vpUD~dQNxyqmo
z72?h;u&hdQHh<lbQFjw+f?Y(K?jeu|Q*m8s{QE#L-Oc`qVE@_n><zdT_P+s!l^u2e
zw<V<1@=%OH1pCRRp|0B%T$$p|-9#sX);PMi4U-CHLTiTgx>@Yhevf{wQvIx|)$iv%
zq24T$T>!MS5!J?as2q~yJR+fUfGEt)l}K*|uopXzB63|4Ip6gMQ_#DtMC?OHM4>+z
z`B)JxI@tTJglsvJ?rA6DgD;jVL@Yw9+-)335y?4OU@Snc7=o72FR*@5LHoYP(#CnK
zZ3%H+va0m!<U>gVf~ro_1OUgwfs!!Q$N&H!07*naR6wWeIp@rokEbI58YSL<f|Luq
zRi*R*;2a?0GF|PVb>4mc_(udN^9W&Pi7639a#LI)BF-@qq5u)O%vlv}>ZyPxPPY#C
zo=cK*0w9sAg2pA<dFGvS&Seu4>XuDm6E9`~P)C@HpO)mDZJEVosSBQRwuNn~G8W;?
zmXH|Z%*^w=lsF{B>$D)DOAH8}(1hWJZJ<-<ASM=(lyw!Ts1-q(1#`w_v3PW5VG&cu
zTm57P*(-f&eNV#R*9;rofa87`HhIE&FlS+N5i%KE&D&rR#8N6tA-0+StKcsFqB<y*
zUBg-jShouAXy}8AGKgemYI)Z>Pv>%4r~pWekp-ZbW*`DCk%?4w0fn4J=g9n;Q!Fe&
zj?Q_|lJ*XODw5aqR0IZ0mVaw#q-~v?lVCPwi1Xn-@k5HgjUp%!Dxn1cFeg>*f(Mm(
zy5^ix${~Pvuo_5-c@b=K%-0tJKvd?88!15$k(?*zC1<;wMD+f<?+Fx@(U}IH5U?Mg
z6f~!lVl=e6<SSd`S&XZwhKi{JQp%Dt`w)2(Q;OBG%@M`U2W<SuY0ZUSA)F#kUu6J~
zw|lcIQYmJ82HUb^v&<8*{J8ROz3BE>!shBw_ieMq$d=)Sq{21#dj;!Da;a6ZE17BY
z)_GuFCKlpIg=v8x%tZsFoAYhW$3_5VU73x$_hCq|hC0;N!uhar@pM@htkDjHi0TMM
z6j9N6XVh4e3@ZS0x<4vaZx6*f%zrpPK|pQO9BuP;n|!dwZWQ%BfazYp+58o$z9a?}
z=R0F3-zU_IC^PqE_MVm5?abOu>gSP^)*I|S)wa#K&hQWx0evCoLqD1}ImJvEedwKY
zp+Asw^X04Yl1)_pR+5p?I%GSCa2&^FS(asij-2b-r@0z8A)*fs%`tB$QE-Sp^QAsv
zCNVZ5z}GKd$8kI!4{@32YoUgZhXWCAmQea2FtW<>=ILroeed1pk3R+PPsgzg<YT&A
zr`DfoS)yG-TKDB8X2h~%0)R+@luWAM)_^Hx07xmS>a-+#PwyyrXBiZrdtv_i&SMu$
zRU#H1SH|h{4H#HooLQE{!Bg-qE(^di$D|5<=N;m8Ud+Q15zN8TbPF+M9|SvGVipn0
zjxRUGkt(Dt0I7aW7G+T)%i&TH<s8L4I25Zxw{t{+?yq}4jK!j;)Io-zN`*-+U(-24
z(9A-J<cl|u81yejwZFZs%-fyb<OhZYd2$YOW@TZ{n5ku{&DYDSE=A{PUeXdR$PoI@
zTPfz;%6DMNye!LNq<ayD%m&g*PP%SPb`Uxj1hQte821nc^ubI%S1XXhZhJ5%GbajN
zRmg;)>zQ+$|9{fnZb_0PSrgJ9Gk1@O%&h9_o;hcB54*?$B5;9l$sNzb)9@xd3)~<e
z$Rg~*a(;TIyQ?xYBHZ0fRk=_zbMuJE>e;g`M~?JVXGMCro13YA`u$u0EJjw<Wxl2?
zDJvo}c_mQ_^hQTAv+Ht+fn(sFqvR(UapX8OO&1Y={^4_8=XHMPIC2=x#6;qFFo18r
z{!?C8?`gCs1-)C{RrUm6gei-v9`Y(uh?F8${K7V1$q>i3o6{ayRn?SI4f0g|km`j<
z1PX}eCpS?*A`k*IH9@pEjyK^|+fB}^n<BMow;x&_W{Jd-ljOx6>*~%K0ZXhz_fgu0
z%@3((rEzcmj*`u8%t-r$FA!h+yM7y*qsvX(Q<{@<(=HyP=(b3{9px<Uvq;{ubaUnZ
z)PL*&!Tk3rEeNGa{0_6DOzErR#LhVXZt(t5tRW(~i`535Rgw6HVb*-I9Th+e@(B%g
zQGAG1-gm?I2#c5bmBXoa$1U0b6Svy3$BgO<y=r@Q^$OK1DPmx?2UGM92+U^10@1H5
z#vufD+hVtp2{G<qD+B~&CP#z_O55r=M1C0+6RTx`14GRI%*`N3^^+)`tgc%Py=^?I
zxwxO035fwapKH8bZ)%7F034&Duo{;*Q@`z8y$v@nc#i<1V)|%Y;f|V$ZeY7`cJ=W0
z3LX|4mrBK<qI<HczsK(jg1xlwQp7iC^rOFZ6Ay=XM!!A!T`3dP@tn{p*;u*_12F3F
z9I8fhJ>b>IMTqFdO_jBgw*$QufSG#j4iAhjdzt;tard5R20KGw@L$@ZDEjKNvl=!)
zt)H)L&V;*6_FO-M$f_$Z6hjPerQ21gWN-bg1Tz)CcsCm(qRndu-RQ0PYVGpV2@%R7
z)55c9H*t$`{+>2$$4|B!Mit)vZNyuhL)G<LHw0?~G<?X?xjmD1A%KlyQ%?}QrBr?d
z4c-Z*zR!6yQ`O#SgdWLEDtYS8?xWhFFz!@F+ld-{FQ|jxee@s}O#iPYs(@GeEgBxG
z0kmdCMno)OZ=C^kPK&Bcho@d6fB)In%LTwg`*2+@?ftn)s4r64b-tf3BH}nbt?T^y
z>z_FkM=LNpzWj)Y^X1i5`2{Ylc7J)DC9gRrL_8b@$7YuEtAUM&C%v;gc3MO?9>rlg
z^-6YAeSd!ofscnV=X`!&L*OEsHef^y+?WU+Le_)NA&#L`J(km=Qar0UjtF=-L;zdn
z%Q&4*FF$BrC1>9+m=TOVfSrli=Yn=Tod7Vcv*h$&{MY}jNX|Lsl>Xhn{ojB1@sI!d
z@BWRMfSLPDdi}M|7gK%z`ZI@Na*_qdyw1z@-K$YQC)VWxU{9wb0*p_eh<H4lDi{C&
zkk=)r_4W1JysSU`;crWEXAp<cA4J*gJen@8k`{E^Wz%i132|MP<>!AS=D+<{|J8DS
zyS{&o(=m?6`TT92&!?xszo1I~;SYc6CYNsSDXyw^!>}KJ{IT+AtTp}qyK-8V`4U3p
zFua}5c}+1G08V2-#AV4uB?Xf?&`2RhkJGz<ZRX2s?-x{G91Kh$a9yV$x%pn3?t6M7
zBw`0(>oeWn!2tj|vW&l~*Z24H`TB>SzA!VG=5;<y0}=UBKRrD=@U_g>WxgWf5IBhd
z00&~CpPs*zuo1-L>GLvQu9tIbLjfSAGa{azUpT~RngBo~A>uHdij(9JA|9;F<FlEy
zSxKw;J)xe*cs^g=FW2KVe0rKVL?jxf6PP)Y6o&(VF7ss=rZ^qn-`>`@w-APLI+&f!
zG-p+n<MD{Z!*o<t{q@iO-c5%ohA~T0kq`$&)V!{FUFLIREW0HFBCN|5z{bN<h=-gO
zFdN4ah9U5|9twPT{-QalB;Pj*b1*cIBbbh#R5Rf_AdcfnHA`BF1CN7A5!6G?k>@z}
zV<mrjs?y{N?mWO80QhEgHT%PIkYw>6@T$)%<{B3hZ%|9zaxJo{@-Tv`A1EAxnF1{J
z2#LgTzI-#YI7~#tmZ7L7YA8b0E1=Jj2P=aHf9(K^wc)PS1M!GK|C4bHh!o-kUESyW
zM}ISx`2t|$I6219@wvh<p2pLQq*c=DHN)W)eOP8H;X936JAD7+UC_Qq4Bs;aa8EO~
z?}|e4QSE?_es?b)zER}5O>NJj?FOKah|;}WwF^?-8?o=5kvFXfJ}?E?gts45e)ZFC
zZ{r7YSnNg!TftU|?^>!S`+coTrRtP<o0dGTZE#iKdox#vQO5~tt+Q<ji_P8t#<2l9
zbNY?#vK!!6erfBE3nB&xH%$F%o_kA2ss+66Nc~`HP$?<pL$y#jtOcvo=s~MF64lDM
zV<z;FPseZm00r9P77x@bkNEP|nJs(}^ZD1jn)R;Tcanv}R9*bkZh`%safEY8_J$I$
zNp<#30PgJQtPhpzy(w;5oSqeOqq;)aH%vRNNJkJ+-JVKkW&zDBq^{v+>RW8|H~a?s
zx46>wc3P?Jg)DLggYtvh@4D5a*|x}g`8kxoR)|vduG;1sco(pG_tcwMWiLGGMjm(T
z?)&cAdxUV?Lw9enq20&h-RyMzuK2)c&35vT?`Q#PYc5F8n)S+Gv>to&hg>+c`<Jyo
z<$7mTxAciV`8~#6QJFf&-`3>ya_o;TIt~YBUgmeR;tmxDF2hXTtah3>9RQd4-H9xK
zfDaOwi+@#!qsIuCeW!iw5hrlTaQ}?VY#2||(H*C<?{LHTgi{FtPwT9z0O&J9;>emM
zFOqZDs{wHoNq$@B>suJ6ae6W^pL}o_migTbOht3U--64Wi=Jd0Lm2Amby2f5OU}Bk
znTe<4san~!jA<o`Az+n)9zqBY`Gg_~m#h0vbBJKZOkgOFrh_7yvz?wlO^4I<{hOJF
zaf)zQ=Zl$0&XO|#s^q*}tgc8ieZ9Pa*?4>+4#RXpB**JDyT$`e)j*MmLrm-3*md*!
zHwvMs-#mWIxe}7y;x(t)v{Y%AZ@&<8h@%0d<?2|JZ)ZdSiG4&g98N^6IT6|qpPmu%
z{Owndr&zA<*Y~f?F~os502rnf5wCB*A+b9``S5?+Q&n5O&t?MPPtZ)#3W($M)Qnxs
z>~wk}BDV~5C3{MOWQXoPrzGOj;?8!XkhR<kzmDFS$YZtpH}s}ByVuK``Ran4Rn>-p
zKZ2W{pPrtdp8SJ6?Cr@6-Qmpi^7?BWr#KwPaT<nUndfy~KK=BiL5Qzke<h|6xYzk{
zAR_cV#7*Sa`65JN7&S{uE252K-X#-BHW8vwa-jOCGP9OYzqu12<aI_L=VI)oME+k(
zf+GNO<Ty<`%T^<1jsvO2AutC-VvcU>45-U|Zq?`Iy2covUp_$zQAs(iB_TB$4&XCt
zgI)G2fT;f2OM;X&C3$*!9;bsxUZgaGN=|F7>+JRGZ*d%kVe%`a5C}q?jsPVZJ`9t&
zC$(Ftg)ofcPJS>Q_i?S({MPqMn=B%67;oqc<Mec|HV!x<LaKb9TkTL<0m|a{>&)vy
z6aXNnMO6>SXE!?pz)zpQs3gf{piY29l-8wmu_5}mKE@aKZmivEAxI)o2+6Eu9{k;Z
z^WUqup&Ep6xSoGIfBiG;y=)L+7!Mqxe;SocJwn9w`qsP25QjF`47YuZ7sz;rN?R|?
z-_Yfj(7boxYCcFkXZ(YXu501C3^VBd@TSPIjTd(}k942l?!Q|%0Ns_SRVS>30dBmA
zoe{dN4{ZYDevF5$D)|uHwmww4FI1tsj?LDtG%yM`5d`p9W4k$QQQ@T_Zpnx{H7z3k
zRh`4ulvh`M+$9=zpWakNxF?G@tL5EQ-gugowwqd)4Ig*MojadxeMWKB-oEmE3%^s&
zmrPph?xJ=5`V9ly`a-zdXz)&bf`7#%96NioO0w^(?ME1jeV9_Ydk5~@`kUKe4?+$%
z0Hcjk>I@XxsH{v3`$?g7Hvs#uv;EMGHx^WB+T&EX54wY!X7)~P-D{<9@RF_X@Dw)b
zKBWz8fwo~+CyL)M+PxO&?*A8Q{NB^KiU-j4s8p|E$2z3k73XdI`un}w2idXRV)|&n
zhdq;}wovvVh|n8Tly~6)DdM}!|E7DjM^IK%Dm?mLH&%7q4vAZrzqhl$|1}-#fgfE<
zc>eT5&9F8fv2YkPr{bfE<RasmUz`DOGy|kK9V917OAFL)gA0cv52sHX&4hy%o+o}3
z_KTH6p_+Tdqs*DAX%+w=F&Wdyk0gWyfTp?P2~|)>Y^ras-`p5_oTlmY$!mdM{^{>k
z<@EH-oh>X8etMdQX+Yu-CyT&2sib%~Arcb<(Q<hor^Da;>0g?etXCq+X|d+Gg>-!R
z5zLnBTTaW%)1jKl(&6;UV;ngIs_1-(qk&B)*=$`4st2BhI}j04&WqQrW_EsmN5m}3
zL@_cLTuWLy>6}#G1A8Q!0zeFOV@DH00RV`Qh$OGq_pe+6(q@%Bo?cu~?=Dkq2&%aR
zJWWq80FdU3N)E$hCV5R;T`IYh8pMc16dVZk%sEqCukYTDbcEQ#mR8Bdp%KhuQ(V{Y
zw!Fw(rYRBCN}uhxEpZUhZ?Eq}^oQf~J{EP=BGvbc!8lHh%@D>zPD`54u4(aEZ}C`P
z7gtswQLqsaomHqR*{4C0d@@bcV?mCipvTAOyrd*43llL>h=e7IQezBvpyh{_kcTO@
zeM+-p$0cV*=HOgYW(<MWRh-mHghM3>rnIJYoesxgoZer*nc3-?LLC0`%dbs<tE$7Q
zhbb*<Ue;VH$G5lky9iOt(vlG%rC+nini64SFj*G!_l`sO_U&5;;dpuifV7q!W0OU3
z$hG6S*}FLoo=~qU?Z&8N9}FYnUw-+umuA5wA-<^@BEG%8zP-M^JRK16e4TTa!x+^p
z<zK4Ga0Ni;D*IDg)@)!*gb0UeFtcx8e>13bQ!5&S%jIppo^uN^*gI{uJhi}hnBuz3
z*Xt#VHc<2vk%%s90)T0Z#8gt!#Oa`DoqdsSzi#D%6ig+jwQaeo!eysJK#;VyLyYzj
zd#-5-!|2I$s?rFS{&Kl!q#=;1;>PiX)t{Un?uxb8E7_5li6v(M3vmS4!pmw3ii!#$
zF-KL^b)}M1wy5eb9{O_tk&AbBjas~|4G=jDs`~cpKRAoke`Gj5hw;GgU(M7cC&{jK
zFADDp_TWa}qn@4`h)UpcEt-fZ0I89bpWZ%b3sdn8%Sg0X4-n8TxbK;-x|!P&7AhBh
zT(S@#pwZ353m<tEBYrg3BvFr~#;u-2GIZ4r7xJG+nHTE0!d?4S)%TkN86Xh_L?RAN
zaLmM32y+PgKrcdSX4<a3-V%T-s}1+GJnUX70o|)`37H{d`z0=WDgrz8=mzhS3ZGs8
zh)_iQwM4wv;qFGM&c?@XyaIN|e(s#co8Y~m2;EQKOzdtP_1XvR46yrYSs~5#h(yKr
z!Fsd-?al$*>;qbPujsE?K)4%Ow@jtJgWnHz{Hkw4;tl#BncJCea}(&jmCInR$<Y6L
zN?L0}KbWhOW^X^v+||NbJr_0^I)Hd8aYy@X|3H=Yw+4ckHqb-G3fy~x3Y8AXKg7SN
z{zuZ&ca~Z`Zec~SM~LufS@!|)Zfsf&fN~ElDS|3Cd6*e^kQxz)lpD1bf(GnC&}b?O
z-z7m<Y5v4RUHWOUPb%*`wcS=3p&Qm(=XQY`58be}TODH7z&!iTl)AV)?zo+|b4Q<%
z?|MCJ&1m}u_j_jbrc)>YOwT_6+(UxRp=EQ}EF`>J2Tywh_^3+LFFF5~ob0WjCbz5Q
z!Nhdm5mwviuKCQXlelo}v0M&lJ<8<coO*V$mXlPsO;EKXhG>Nmc0L8LA*%u(062(*
z#LxrZAInI6H{XT!)o?*mO<9mA1Xhu}%xa1NqFTbh%_OIyjtBFYl5*u0Y>_kr;5B76
zjZBs$>kI(s-Ch@#jl}D6^>^@I3R3mX(!ezjJ%`PRVWSB9$L5@LT|9<<7{ts%h=e#1
zW0icUS%^c7Lr!bXDaL_A^aK{rWL6VW%6MOx*?DDHYn>e(VSlc>yB<{4X*2KO5SfFd
z^?rpBF<==F`v&AG!KEtWP#%3FM|WH`bP&HHus)nqQ*=dhIktU~2p9-t0OL3!Q4H?Q
zw(R4dh{#QT(Px~VNmQoRHFWfWy5}B)RH-7)K+J2hrZs%HBx_Xc*79j*+0!f(ic*Rm
z7kU2YE~DIXSp9t3O$W9jiJ80}a^;D8tb2C3_v}Py1}Z77`gA%qfX_?=a|kSoA{ygB
z98A{c49rAkM##QB1`Z((y;t&aI3N`kdsA*%`Qk$LD8svm64!3mZKotm#27im7y>hS
zUlQVoL@%E{qx*=NUM|;R7{+N*5tST<kvI;K0RXQHSUx_zsM=T#NcB!V#uy5<5-F^(
z<)jKC#=w9u9Zx<SDL!Oi2o?->`&$JwiW{dYf&v&b0m3*P>NW^wLPUpy3nhh!ISw2L
z#HW%YUsFG!CXD)gnnNrpMI~Hn0D~GT&VaySsO+<n9AKtyo}SYpc_rimKAHIh&TS5x
zT8YEpQDu@BB;EqZLL?#%BNC2>=jHl7zkhZ2xM4blVY<Hk>Ym*IFdm)^TJEC}2j)P`
z#K9lUbo%7HYk$^Ts;h4Zs?H2|Jc&5~J6~g%FRz_WUwcW0k0({c!?!(W3X$BtPV)u!
z94IxZCM{y7;U){v!>czAR*@e;IU2F(qzbLpO4zKgcLgwMdsEpo%i^fvw|6im^kpO>
z-VHer2yZ-WJ_@&cNU3rtUq#g1)*&KtVSWR+6TGKBo2ulMI0VPy(rQrcCu=X~X?E}L
z?>Xl$U%sfwx?T}+I=*ZJTPwxEynK6jsT&_s)zp>anAYoVN=XzeW>}HEye#uH9l|h-
zLk55tCnVxwGF2%P_#DS^oKEX<NsA8C!Er?Zn=fxFX&k3kldj8!xll!Jp!Rm5y~D5X
z9*Bq`c2yxb>3n_tjfidlnI6OOqIj5&%<Sk^UH7sDQWta@RWg{i{1d1w71H8o;c`Q)
z&Rb>%DrPpFh=`nW;$E-KF47&mdYgO?FZ8YCuEO1hDE5GdB@NjlW|~*~9a64CMAlh#
z^n{UewwZy5)w1gTAS6Wa@WPV9RP{)Ym}2G{^HyLp2iLHx7F%=E?I2Xir>7H^v_J3%
z1THtsX_}^CoO~O)nd6#4N;$?bPSd(9>$>>&JsuA|j!KP!tAe;?e%Qme0}+Axg!&<R
z%m^XTe0ejlI7~?V^69gw$U2M2`Fx4P@cjIe*CnTUJUtKN(XDNeUd`<I^s;5C=bY2L
z&hK#;LmUwah++zDZ*|{M7r-2!Uev_4uCBed<#w4061jIrIc0Nlbe#wh>G<@7b<A{m
z|H@o)(wF&+L>$HtBgaA3rP+HG|36|=b<z+y>#e?u<TnJd@{CAhGBX!c5CzvI4AW_t
zPI<ZJy!d>9LTuc<@o+LTq~O;)98TlmdAYu&Ww!(aF^70~`i#Vf)2H+6FY3P2BGc*R
z@cbpOSD#*)+41EERY}Y2{$E_q<47Uqb;)V*&yh5n>2f{${tSQ=f=ZUOa)`u1C8+?1
zO{uk9UaO~A2`t=3Hfhc4QtrmUNQ`+!BJXO}`GR}X08<6e#E=YT;luI%9&7r}aNF!7
z?*PQ_^K`qMfg7&vKZhj#JK6xis>W?QlfQ1Y%4@u6yV0=s1fUx_Z=;GB-0cq!Y4n?I
zREM?^;Z0C|ff2AHnpf6Ft@!$#!%@Wgq<#D7H6e|GP4<9zZO}~d`|K)g9zgh*v$1yy
zuq__qW1Gf~gbw%dAb3OIz6A_7eqIj}?Gr<KtZ$2Y*fcurn*xCC43WznCbJ!?_F>|t
zZ+M8PXb%}FcT!>^1T)%D+3j0Z{d#Ghdix%tKHLBieNsgLP?HSw_AXVl7&p;4S{-~C
z7`W+(?c6tA9`Tr+gH7@M*Qlg#q&!H>uK29gdS}nrF1K?Ys8~pWD*A-cP5@pkk3l=&
z!W#vL*nDlcCU~DJS{N1R&a@jzu=D10sfh0w_%MoOqr5d!lJ-V-;T^Sy+{NoOK~Nha
zm9qFD!{q_!T8$Bk`)kQxv>q&N*JSqb7HwN=QIYJ%E4;TDGjk5%Rx&o=|MujtM>3D{
z7^|r;)>ybk$J#CfDmUlWC!*B8-=(Hi6}TZfAZOk&@2F@SL)@SR^J1523EPcO6TKI6
z6eu$%U(J$JPAgZ|^7aCA^cigrs5W(HZxHG&IXFxBE;-X{gj-|N{Y!ZB?_NGQ7p51P
zzC0bgLrv?v%<tpjDbn%jIGQOlwZWTfBoNWm8b8}iT1C%<#^g4D<HUEh0!q$c*9XEd
z%~rG!S<>Q>;vo<sj^hz_b_v@&NhC{7fEXj^w9eP-)ALJ1$MQNmKn}pufh8wTN(1!E
znB96m#xcgRAD;Oq=bXmlvzLK+UA(<>J66{!#OX*PW=2RHqIv@-StN%zww-gH=QxbR
z;e<|buTf{c00sakFmceF%v7rRWRC#*8d=tbh=%dNanSYztMJPzEN@y1XvFG!_m(Bk
zYeK~5m%-DkISe6A&JvXz%uGd0<@oZ0iKKNg({;Hr^EjQ}&*%5wzA+O5juY&{RGZtf
zS<ZQ$ukJ;VbH<NP!DT*kh@MB`h)vGRIGw70>8@^^I^`UgaTq8BNeRHbB^uMxbT}T?
zp_=!|LH`l~B22Zh9S%>2=P!;p&F62+^<1n_;=ml1>zO%l9NU0#%NZqNj&V5b)o~s=
zZ!xmB;LPL_timoq91l;#(c|va3=D?p2t-tux@%^f$ZnF&ERKhQCz&~Q3oCu24p7Vt
zB&|lGdFiVY$$7cFaU7@PvzevkDrs>$7-(**n<Q+E&y)W_UavVVA-Zf}Hq&`dA%v%=
zCqz_9RUs|~%m{J5yqekJ^oc?gGXTp)AcP_*r!{9yS&qlkI1XlF;?5?Vk`P%F&U1{@
z=_SpV<?`mQYVmZ9W2F%!TnZqMZT4ms#=|&0y?^`JRI|=?rrt&~XxVqItg_}br*-Zn
zlBOAmkRqDOx`a5!>Eu$YFpM1H{QlKUJA|Nmn9NsahasTRZsdj@gyQ?VNEa5sJ~c#U
zHg~7O>G(n%uIFzE<mTyVnb}<}bIR)+#)-${dVOy=gy+c=rkLahWdkvQUC*zol9CW&
zyu48epa1x;IxqtzEh=f5FZI(Pe3#1ny)0wfqNP6!FaD2d<m~$$9sc$0-`=k2z9VT>
zrxQ?a^uJ{UQ23_(@n0D((B*o;Z9?E?s#V-EY~#Xjv4vamSG|(^{4%_$g1XDZ=5$p!
zD_ez8Ujk^QRUNn7ayf1p6gx6`cP{N*wmiv#D#ru2mIHSoXM1AK&IGBk+i?>qKo=F*
z5v%>ySWn59P48@b^RkEbOZ!-a{=_XdYrPHHM)^nDnWJ^RIo<_oBW_l255pfGgi}09
zi^MyHaVr^H>Wlk|0<{ygNPr&1%I{itr<=Fmty_-4E}stXWhVgr-F+-{wk_syOVe!K
zOwXk%XS1p8-M(4d@c;lI07*naRM>ix$6X*p$A<4z;n=8f{kp2`B<kML!jkhVBBC4T
zvnIMABrKFyw@bxG&$@BkdZEcpu6m;!Vi%zUEs&wNDZ^f^^w@q3_qLT*1^;L_APb=N
zth-LnQWYKd&#%2l*ypI$*XJ%8vMzSwE<K}e3;VXOz7{uoPJ5GDC}@W<e9*4iqj*vK
zm?mPqkqLA<AKRT>cS?@``G5K!?_VDGA=PyeS)JeS1zKe{7$C+tIDx#Uv-h1@H!iZg
z%*gBo?CyBKnGQHoyq}Ozh(saH?;dA$vp_jSzl_=o1|m*rt?@dj)%{jf|MHiTndg4H
zYm$_U<)Cw>Q+AqfVe!O3F;YsJsxxo>7X+|R&j(dq*4z}>Epa|D6GD=bfq*q<#KXkf
zhxF!2F?cv)v(bX;Y=A_-M53muZXH`f#+eae7(y1kTowcH4{2D<5IIJAeVYy7)2Ejh
z!rsFZ%~Yk3MBd)cm+R#)4v4TM5z)^thb9SqJFor5Jq{t1_$OG_EUHMvh{MM=3vk<H
zpetun5@vE|=XuHg1|Noii1V6!e%9Wj!#MO<=!O`ZEh&rW=`gC=nld0xL&&0QDr;jL
zs$Utvl0;OGW4xEv^;0*0Qp|(^Lky}mugRaOfr*rWcxjV+1g4#T1|meJVVcIn3A+iC
zFMfZm?jq}UiyzS$4Um?rX(k?=*wI%>W@4(yOh_d^vKuy+S6H%}@u_4}IiKI>>(#mb
zW8}7<Gn1Kpd!L8ELtr&i10o>6>zd8XS6#n`U6#;{I7C$yVjv{?@eh9+htaPv%@+XV
zIP~%fH?_FgeCk%P-LC89a=D!Q)ie%)34eRNY$IXO*l8g`sL4VGm$?`jG>hEBSb|dB
z<o*8spAJK-9rNz1m65}78URs5%wSF8mUx@$T*NmS|KGWDvPfBxfRPX(Fda`XPoKXy
z(9&Okv)G8EsiftCNXM5i%Y2^CZ+^@ImLhl?3`<tY^W_y0pFaJhg?a<U+CqgL!YSDf
zHB-rKozFx}>|s^LVL)PU=_D<x8pk6PJ8V-?WFiX1oyozW;m}vHBI)w>8zMe^{^JIv
znt?}Q_~Lhq?X)71;}Fil)U;BF#KCEC>H6+Y2(8F)oIrB&x#k8ni^TEZ^N~i=u3WKw
zA>j4}9HAO0hJR+CwsS2re2hNdFkkM|>L2!P-}UUVTTP@rPyp~i55I%o&nmW36A>Sd
zIX7G0&2$aAU^wig@x{oeYh7*`y0)20wK<60HP2hwa62Eo$@K;-oc;SiqlePs{cy`3
zYm|4fWZ3zMdre|3D8zQbinV4jMTIWU-p$o)v!vR-<30h<Y-<N?n<aGf!W#G3Tk^NO
zdu#pmj;X)-_qQ1JZ9r1WdGlBdw2mNdca7A8X-au^Z4|Z3J#QM5ZAEs;itQ_YAGEOV
z7!uy%1l=m$)^@#)TSc|?S~oPj2{5;vIb7HL*I7=Dqq%J<>RoNx7TZl)@vfh+k5nM`
zT@0xYmU`T5V@H25x)~|$?LJ!E-Tu{l*eaR9$FC$-r-H}k{%}7C?|c(#p=5U#@MsnE
zL6)_9u2g31!!Nt2cI(vWo+DWa{oVW@n!3MNZ{e-!<sRiB07HU1&uiLUKM^Y3G<;o0
z*l-8*bp<!@KyStIp~*lmXSzE%HVej$eEWU>`f$^c)s%3_tAH7DqfyZYK67wk?Eb|N
zmF(xXw;evKaCDxWqfcz8X5z%$enxl?_-?pRVVrI-W-nH9^P$T4KodzK#r036j2r;K
zj3fN*pGM6&r`aFw@#)2J|N2(r&p-bhLiqIQ6C!xb695vYz$t{0Ls;gEXJKcNaXP68
z;*1E}_@vp;BmVNsFJ?LnfeGVyER;Oc`TFi5*RG;XSyGbY>4Zo*Eg~{bCsRpj0f0F8
z*a)uke7Rf?hr={Z-Jl)-kX2L-k)CU5nbRtH32|TwKYlsDKF^^$Kem7W;m4nT{F@l!
z2ncDuipVgIr6x5!yngjM)CB`^IB*zpUchX<o?WIz<YZ-#v^ak{4pSJXyv~x6za_&|
zCV3u00RWn_KaRuZa4JQOYXD}4r%zgqsbpQkFb>l(Epu9DBJNj(8H5;3bX~59I6b|1
z4ElUIU(au!fBc)%%MZ(ZF>{jbV^5nx&Q@vjRKIna6B2vrs<KK>>vE056yoR;EbrUg
z;XbuwD8#_Qz)Z5gwH(JG2FdAzvh8;0;&a(nD|iX7c?G2L`0UI;AO?s&!RkNC9Rr-x
zGaXJM*&_p;4X>(Se)vo-zye&COQrJKXO1BRW~T?M<fNLHH3Q=5=@ghL#GKN%Z{LXM
zhoAl?XLlgWDrsKxvgW6!CuT-45zmVA$-RN8X3@1$2fXn2WgH?PNm{(_H`BaaIRp;z
za5xSzA`&32^ShbFVI<;d$sxw$)3Y;;D@oV@&{V8ia}47V0N&r;LX3yga}5Y&WRkSz
zw6=!B%+Bv`Ip-J|k>Yp&v-$cShbfN7v|iIXtC)zKo}P#ZyJ@-yo2W=i>3Y4!z#&i^
zCJw`LeK)Xidg2iO@gM#^g!ue)@&`RkBNSr+w@QG#&b0)mysljeu7zPbd5)j~$D!D9
znB}yX2_YHS)90UxprUY+ljbZeAX3~CB%7HoS0oO@<crqKG-uy(BOni>ZB-PS38<-N
zD;Yjc(Lz89Lx6TD%oi8unAs2~Ky<xX7g(sK!lzG2=nMl{=fZtMWDZSRWoEiAxuT2>
zA)xYn3);aLT@>U}kmBIql7SHr!v4fiQ|&Przfs|LsFokWT)Wu@ZZ+v`*JHQbsycy#
zzuNPwMwH=Sd!4niwWeyVwF)z%sY<C|n20#&zAkGMuZ|goPFVNAm1Y#VcQGR`ts3LM
z`jwZ_k=v+xU=21$0u|drVk#>Tftak0;o5`8ZTxUc{&aV>YRlp=I%S#xxMhvQ_XfX4
z#395GBLHeh{%MZOnJSmu9pn&*LkI)M!J|?+1e7usWe#9w%I-Wz%pt^L=;|`85SRlI
zLD@I}*mgs*at9j3Y9U5dDg-M^#O%&5<j<p<Pk73brwAeWdnH!yEOX!(IR!I?4x+!k
z5w6GRK`M`E_lSqUU;xHOQkMj|i2*YeU>~VVfpPRn`lxOoy0x79j-33~Hw$Y|V70Nv
zoza{1IwIWc3W!j#2ULA*=KlcDHYD~G6r`fpH0Z-2eVE2XTE8PPlL`@;Vm0uF?a`P$
zU{tr4tKT#3;&ocBMnvXs7VV;)s-BCB9~|}LD^;WYkgw1+DnXY^=9Y5%i@g_@-vaYF
zvX4xV2+_7NGBPnBxl1Y$70pBIuJ#jjuQ{5zoo_N5-{7`U+*3q1Iax`pbBCg`IY<Jv
z!Z6+f;$4bFw?SamIc99`Zq2k(VV@|_^<EDR)e7ID&U*Xsxy{tA9;>~n1-6+{PvHRU
zeKqX&Fv^EC=8r`X_85W*H`4XqigWW$djN-Sd1Icw=-e|^@i!ldOYK<)fra3!Hyn){
zRs%I5Q9Y4d4WsuzPi5ii{U4h){XQWDFjY-pmUAkWZ^X##%}rV^C7zL}5vhBMK=}%Y
zX2u+e44ZlyF&2v;dvrX1FJ4h(^+`amt<f)*!Fwh9P9G*BdA-?NtOQJ#A%RG8CZUR$
zT8LvgBdfz~6_k|rPHXm%<h;%o0~5bdc5<bv|CJ)rAEr2rW<YuI<IRbGfCQ?NR)AuJ
zMjUcl(>nXQ_FPsXR)-l>M8v?<$FxKq)IvyrC}}k?k&^$8Env*NIb8Ow&n9vwW;dm4
zQv_2Lkt{M_&q!Fg#7ngqDw<-+B@~p9+|o}Zd(q?cVAq(cM5wm+9S`0B&^t&^8<w01
zDZ~h1X}!AGwg@~_rCRYdjzbSb_wRA1Dr*gE1~9i0ESc|J2)3D(L`e=%V#>`>4N!7+
z#}q%|?%*%vI8-Z6h#dS|bX)mAoZR@zw*@c@%x+y&;;}dY0%v6wkqo9VOf5>KB$DrQ
zSCG)9(-j-Y9ec}&XbY6M%U&_Fah#|N?=cn8RG*;i2903Hrx$9nQLls){Ko<_adbX`
znt6ab5>W{5C1Pfp6EP3tF{K4ekpq=<^(JX01Cu<9h^it6=13fgqr)4jf__UIq0CjU
zA?BPUuU;<u!ADF)LDEwGqQY`{?~^CZlsSuJFi=S~JFMTR(UH04U0%CzMk6=8^k%&}
z_IlA40LerOfXa+Ujd$1enzm_b+bS(2K{8b|^`5O2`bg+BR8>J!RP{tC1a#QXh|M<v
zKYH%Az+#iF3I-|}uvkL31<{bp9qP5E>eMr$$1+t7x*6e)D&`XuBH|#L5bQw@rwWYi
z{U;90tc$;;?7jx=6j8}Lv#xE%Q_bIejvu0#<$Nuq7!Jh2H0vYsCouz<WW7C4nX|60
zY6moAHt{_|WnG{Wc{mP4frxWnO(j;Wyk?5Fs?$%9O_;IOIA(|x;s9pZ5r7-jzkMvy
zR25a`=n3^yf0P>?>4U%8C$sO>)`*CvStYfLQ5CZshS4iwCrT85dZ@kKIJx-O%v93l
z?YG8JBnnVSiGUn(TCbP0Z?#&ostF7vCsQE~W*{nHra56G4sp4>E!X#9JcKx=^=ie6
z#d|Un$qsJ2&dlZB97m?;VdW_$Rb8%U=6E<gp}WZCoMHBYrbBQ1)E6uGWH|`S4wiGu
zI$zHwtAnm7EvCXekZ1N5d;TnW;V^_Sh-8tJk|1J?BQocl7%WIGLZzbR(49Sk*?PTt
zgeNomd7RdnL&PxD%CZMt8LL#Gn-p~Phnx%@C@xj4N^U+CE-Tt(7`CO1x$%lQrm97;
zQ<^8DmU~`Pe-NtN#g})8gUiy9n24PzSlwg@k=*ehhGszwM2zMA6Q-<^z^DV?iwl80
zqP)9IOC&W$o_7xgJTJqG2WgtaIAZ7KrCwxEAZC@^?z3uEl}|tZ)I7bUNJT{po;+~~
zs@czLQFWY_I2gK6M^!S1NW<iwM8yL+r}~*53a^q^5fwFeL-Dt)_=a@0Y$a}jn20?p
z!LQuw;0mt<Rc%rMy}r|CIsvAtoSYcg_%HobxLJUyWa5ZhGtB^qv^H9M<tboi_#m~7
z<T~na6kFO&g&W<err#E&gnxp=SFHkr;y+LuH+12I_^P(*ZSnyCSnUfG%pCW&%A5By
zukX8hgR_>{RjR<70o)x~#<tGX8rt~*tL2tu+Yik31GC59mp(kOv$DTJoUtEQVsDCG
z_AG09PN>E=h}dynKKd2KqmWA1qFW|~S2P_nrDR`_-s$7_CB){{1l4lH`b6)JUXOLi
z-Nm&dxi=f_xHBy;&^A6uvEWifATz{ANoJ)Tw2gdWdn!0??j+Dz!gd@6+r<q+FNy6J
zrI(m@O8kvT<eY0P9Z$!<*a@cL&KI$Zb%%~YV5WG7<uom|RjJFaenx67OH-t5>)Cc>
zihB;s-iBhkLBE^-vE82g<*cftHH~+F9`w2Pws8kG=F>)c0yFi71AKV`GIKHAMJA$@
z*Ro$D=A1=T)d);M`%4m4&_0jFOJOT+Rdp>DC%hX=#g1ci_w>3vnJr1M{-?Sy3dUQU
z7mHVmcYeNysv4l8k={^vtk`2!YF8l>78`h#B9PtAP6ae^TXY4gwrn8el6_HW>4s`X
zXdnW%<=Q)zFCu`s#bP#gl6&A8h|kyi_)>qrth3DZTX)xuSkK~Xi{WveJ#;U4dBws#
zOQ@%D?WuViQ>5@~T3!h=6$OPao+3`VV<PP)-&kX3+(PfpX>Tvwx}kSjA7=DB|J19s
z4-yf}?+)ENZ<;fQNE{VWLEOWy=yRF-dI1rK=^#1fb-{|DiWc?ddVRN&Yr46nmD<_;
zuZvXQZVobst*px0oag<4I?9@Gm^dH@FHBU$B$fV>8Hm>T+&HpcgENO^o|o6J<KZw2
zBiw+i+j!3;r<|5$&GV8zefo4doqqoLXQ>$)-@bhdAwIvbvkxRK>vHvPJB)`oOb=60
zRPEc_^>jKuKb@9kzFyywXv%U(N`!~QkvO=bKbL0rLL5UF%Um-I<8=7TFTbkl=`e&q
zmuqrYNd#EeSC=B>EGc=B2=nq45uaaPLWnm=a!$)SUv?dpdUgT(vL+7W@fiS?%bQnH
z9ES1uoR+KP#my`vC6UZ=0M(M09R|l_a?U9Uz}oglNvmQ$Jbh9T$NfYSAP{hf1C0k&
zF_B?%R5q*XbxBe2c!FXJ7X}OJ`=C06yB|!OsXO6GP8?zw#{S_}e<ot4VLDnh_$Lk=
z;xHc4Ixq7%4&ykSuJcz_d4GHJlgvzq8V#(fDG8EtnQ^*Fo;JS_HRtRUYc~qfL>k!G
z&*~(v)e-?rGjpV2^sAlEuj_K|y^p8EGZJGMz)bQ2ikm6`sqxNSYvdAdck**xe~5!0
zn$t8sJwF=|B94a>$Kl`oAOB0a2D9sus&_;SlqfIh*RNky^>i4`Ow<7Mw_kth)dkFi
zX2<6*%)CuTiDMicHgBx=YKc%Nb#9}KN~XFl*Wx^-A~}txm+|=IApGI<2>`<|GKXLO
z;r}*(dC33}nX>AdB!(jJ??+H(@b=r!W|p(|m3_{#iXN6_95^Lu7Tca{QS?rtW0b=r
zDdjau2t-J4KmTl19JOX4#6XCI$HNGqh;X@HFV`y*5kVFMfTL<)0zi@c?b|m4NGU%*
zzkIHGi82%)53ZKcV%JPzm~I92-u}wG1%VN*=Wp&@>VL>gM8QyM*e{A~W(%Kw{M($@
z<^1YP#p|K8T+(t4<HQ`|bV5Yuzo=xQFdR;Wejzz0b0f5IdJ4m|%x`Y=s4B#4o*L+>
z1c8`?NLF!I;r#s5-%+txv-$E?0@12>8gbwdf)CmR>K`%~aEL0BmWvZGRkC(|Dfg#1
z5)n_X4+(J`rc++$y!Y|&#Eh_4s{W3Qen)7w@1DXR%ro(KKYbq#2mhRZu;(2YVZa7^
z?lc39$Nw<Ms+CtaVT2!XcFM)?6S5!4V;>BGH!(MUM4Gs5KCH`m#JgGYoxvU6I}7;z
zX%lAKQRJ=LvK@SAcH!3dUtK$Vr@_9Hq~rEHtW&8sJ=`tz+`d0;y(=3#WlNW$_mT5L
zC(`&x_4v>`@Zs`oLVx>E>1!YGx<0lj>qh<F#XczZZ?!kLalCwaH;zLkaX?i}mO9=k
z9<Wn|-+#l7LxeY$4>t;Z>vRKK?&HHJ(S+6Q*;j1PdL4Ho4s~IERulwfP4)Fqp8#t6
z$J(!uJ3Qf$*YW1`U{xwm_3BL&yGcp#k=A?be>#AznL2#H{-`}e6<^@?Ot*KP+6~9e
zm$Cl@Y!Q+TmT2}~_j#^6gNobj^kEbs{HGdVK3*3evc~{F{#y@-lYfmIuv)Bb3@#38
zrt8x8#nsHoJGKN!X3{Q{<FE&0<>t*v%hiM5ydr3ob(^dpbEAiq)VHcYuuToKGa7F;
z%B2p?t1VZc!dz-qxmjof46hCjPoKQNoQ_Y&=g$sn98NC{$r%EN;Cyapd4&*$moHDl
z;mJo1KmDXC^6m9?UDHp0_+vwdI0Wao4~OUR@FZ!LoL-)$;wb2@Z-^X*fcT&Pn`g->
zuk$!g<2dEKYED*Kv^lMII6kWitup|Q(@FBWT;HXN`c?H0KmFKl`*e5`k?ZA*NS}ZD
z(>h<4>l+gRgPXT`s9qt<^vV;TFcG`4jid!YQxY>91|p($J{Om2)9dARIzIp5U;JxR
zOUw24K?C^ol*3@A^Z6CP3fZLo$S@uoZpk6!tj=9R#6o~ZCSnJvoN4v+=`(YD`}$8D
zh7ckk9!@{pFX&F34(og_OxL};UVokKe>%|#iOuZ#_M2)^7XUy`Yg(7jpFgz;+%mrt
zkx8}+4trQ8$H8jqf&ru~A~r-OqH#I`*iw6LB8GnHB61jr$T=GImZDm=wa$z~nDBJ^
z{0Bg~zW*l44KCcx3*&f@yvi~ob8+k6Or=*8^!Imq`C?}D_M6{-?|suc=j(Z0E`a#M
zAODUyeE#tdIp<%0{S^`a#h?CmS?2kA9ma7OMyHa6@#xrqs?6tC075WCh>?k72*deu
zIbW`UnF-hV>|zGT28cNf2LRBtK<9*@Ihn2glDbXfU;gp`qe8i$>2MO!oKk-K?ehMc
zZve0F3jloi@uy)J0gwZKI-YzFPidX6*APMoA&v(QvGXF3v@S?A9fOCNP>5le@^baa
zdmnt7+1GEcBI}?2=8yiei0GgH@|Q52PM>~A^Cc}8QOjBW@Z%Ts;0Wgb=imRkaU6g6
z;fG=g3A4@V>FIPj9{p?n<(FSn?Qr@$j??+_ADC$xBO(psAr6OOI*QNfC9CATTpN_>
za}Y;3Izj*!?ik{_TmUS@$ysJ*n%5%TN%KV{5d~uQ)#Zsg4p$tWzi9V<YR;;2POGHV
zkAm}S!Yzq5sbonrAckQoQ%O?*xW50U^5>3?X_8r0+!Ye@DjAZQFHy%BU;q3cn#!=?
zD|`8zN=oyCN^?1XtBD!C$#509a_JDZNvDa-tN)3lWzK2GMDzW@3=qR#)zRHnq4>|~
z(CUB(zw=}E{Xh8lZ+@?`x~&*)(B~~Ut?yb8J5%Rf0Cdag+k@auhrem_i<%qUBy1l+
zweKD5A*z3O<E>K3?>n118QSN}*O-BhVEUmQwmm4Ru#N<1^A~8v=|}aNb*keo#%wQ@
z?PKqI<*@B!1AV{tu&emkkbT##Jd~r`?vHV2BWCbD*YF2b=C)uys6ICjfx7~>xQIV`
z^{l!`<DIP(?r&!I4DF%WTMJCs6#dOlyUg3P&X{2f&C@z-)bggdg+~qk+NDm`Ds&f_
z-fJUz-a7s+-m@vgi=H2#?+<ZfRBSE{wwv$nb1{28f?5CX)>@mEif+5#54|L1NBA?f
zE<d$%OW3KuZp7X<GhWztZ8ysU?+i2U-2Cc|y>;zqiKjO}f}vq$uR!OF(E7&>x5vE)
zAvO)Z0U;5w5u2KMn_3uxI}1A7qJ#baDrwm-tRykr#_s|?YSZtLF*CUFiFj~=;6wDN
zf1md$#*!QP)lBal>Uwfoy$*FY!OpvjxNpV4KyoI+VLIMxAsWTGt>+qxv#<J{yV=ce
zT_dsCEBNg|MC6Y`z7gSao!?$x#~}<c1W#F01F&^Dy8tie{O#*+h&T=$;xtUh^ZVN`
zKmSvVMTKYvOfbYSUtarbWDeu>1OV&xobxI<xy<1G{XOMO^a@BJj;8kZ_R2L7pkbvU
zaJzrYd^W4O*l_kA8e$kCFY9u-TzxWeJRaH8$Pi;B09=<#rAph~Y*GM(<6s>Y@2PAx
z-E5@8Y5nyt0LmdShn!YZU9Rtl`1JBq&g<K6{}jR);y}zT^x2<FTCUA2xuHhPL}Vel
zb}#^fsv^Mk?YBm@NJ*GE#=v3VIQld<rv=RB^D6+notGGuIeHNn!ob7mzz&7MgSp#k
ziQ_><(mI2A_93ZiU^<ME(6Xdym=Mv~My+=CeN?lhBykvqIAlpG`Eow{x4^qGWHt6s
z)11?q^Xk?Isxx7Bhw-#teOHjYUUTx`Mh=5V1G;}z1{lVJ$7zAt_5CYS<PdyhJB&vP
zak;#imJyLk@<a!-Vt>`xvxp32)A1P)*UOu;96|N+`YR%i$L9{w#z-d^0WV}`*SBxi
z_iu-nFQcRof|-d(jAQ&f`Ofdm#`Cv7gTe9TOBlxU|NDQ1Fg!oK0Q$bcMEvyhd^$Z#
znsZt_<WEh()K^_zE^Y!KX)T(Z?%gSD7s)T5zifD%vnoBEr|c&d1DU~keb4K;N@W9p
z&DVD#o~CJ8)BEM^bj-sLdv>l!B4cI-uywgm=Df~1t&-OeMhZof$4o=y`Fcj8I2@du
z<ZW5)T#+cG^$Lh1Jt1-oOlZseMo4j(2q^|O&C7faaSCzpH$w87(1sWgF=s)fIHIIw
zK8rtY-{mUEG$5g*6%a!ltjl}p<g+-^Ga?L!XLfFZI)fbmAZuQi#r+cEaNrO_6=?y$
z+h6{^F$b*?dd)aQSEgxR4M6H9rDmEFAV^NWQ@y`^Tju3(JPgC&oEOhZG)t{laHnrX
zHWd_H=j*!8hvQR!SQP3aU>qk^@vKn)zy{+>&TaTt*nb?tFb;>4cd`3Jp#eoT$JCin
zroCB(TWS~+!Ur9peMbQIpeDBcNaOwh@)F4fr1*PHo_((ueTY$id}R--Oc8N`Hguuq
z-3eX7qs_>xC1>n2nKRutDez8qZDzb>Yg8*_L{J0Oopo7_tH$qKWHHRbO(<FRVlxq?
zI~L+?n&8K#1^AuuEK#jkTlHjS3QpS2U?Rra@l<VRBI@?aj|8F{BhGKPD(tiDH(4$j
zsNtqnb*e|R$7>#5HJ|;4RgVPNUE!{(?K5Ani_X583L_GsG-@>v-B#Z>$Vf+vec++D
z&2$UL9eSO6jVmG|Hr3A8p}2|@k&A!&Tx!I=McFO>!r$AS+EU7Jvs>XVlDi_9i}s9}
z*-RyiU(}}Ib1SGClx<C<k6_ZpQ4?+@e%Fkb-1Xhy`Tp(pLznK?<v#AbJ{tWn6RL%b
zHuT(8$6KG!mh0nDF@kB;*WKlGRzwf)-afmD#M&cuJ%F)`Y;Vl*&OOf!4;rM=*2B%j
zZWDUCne%3RSQy83CTctU0HJEW=~lPCH;3!ll)k4mb(xCfoKyzbXy<f$uQn2MdupCB
zNzgNT&3e!MjaO`Upj9KM79@}#x@LZ`<+VV%h8Ns)gbrF(L4DErwwdbYp5CuWy*ux$
zxijqI>|1KG3tQ{edOl=1!}q;r!D`xZ0xpBaZZu`xYY(7?olilpAlWMgGJ?gx%-nw$
z0A!9p7NfJ*3;<FV;udEGM1cd>F9<|Z_o?8?U}m;13o|=06%n1TO$f}Ck`iMa2+7>3
zxdlo9y&V7mAOJ~3K~z6^<<UP)4$;&llDE&5iDD>i_;sF%obIo#5>uPqHYKa&EM|U8
ztVkG#k-XRMkV1FQ;t<?IS8_T&e+IC$%(Behth@OA?e!ah5wVJ_I(zC%2m}D@vWUpx
zu)EV)B&C{Q1sH?P%TkjNAO>z3)>#x#5HX3uybvKFEXx7_fsqJeU?xauEelB(5fK#;
z9mg@oSVWM%kGNlt$L@fEfEljqnz8_bAujWbh&g9fBVGw{7@|)!MY5<Z>zYLTHoEdk
zL<~UHh}7R4Q5BJt)gXx&Gln?0!Z(gnL_iY&+;ksU`<{9*d&}#|N**BW-yo+25QqoK
zDXnw)5FaQIf}vY3xRqT_i;K96)Q=j3Q!ueG9!wR|>U`Z>oohuHy%9;vwUT>lZcf<(
z3Cu*&bbKkj(Q=&*$7azIr(?fkvgh1xbrLof%wEgy@_%+}C;)_ELL|v+wV3hBSpjTa
zZCUd$3^9fgxV7o)vLLcIOeu>R5R%(}6A^P**Tu}%EMSnc5E&vFz&tO^90KQ@bIvIn
z(mKWf2+W8`q6RAIe5nL@mAvMh{k1Z43k#%W(crUiUDk|<%*j+rX0oWSy%LVSENe<x
znoL=**K3S}dl>?fGZjJz?ii<<+^HZ85x~>U2mmMq=IA8(-Z3ht#jT`#y>N)*R20Tx
zm_i(LS{mvvrp-~W_|$lUyk=ixWzTo}z4?sbmJ7v^2a$%+5HXGu#Rxe==fu*{PHJA5
z8GsGbF-}L5+~sL#1N>ZiNgO04$!kpqd#~!!o^A~sM=;In?8a4|)mr!G5@GN1SnufZ
zfqx-kv3JwZzZDw^r5m~Vae|C>DdT2ivBUbUr9+tNHaV$r_Mm&T(~LOQX}R9SJGv;s
zR8&d{PZR)AI%lkcqx$PwW3g~2*Hh@k?*;qygRuB};SQWZjCnD`Yyu?}K};3Rn2?#7
zW3|T5q>b+o{dup;vMiTj90z717ipYL4H1|qWeGJEmdTMt{Gd-W4ufU^T<?n;Pi&ai
zY-aPk-27J&bqkZ6B}?gM%vM4SaRkEMP#WE*Wkn(m<SBipmoI?u>(76mmZh(wuIJZj
z98bq7rIhpHp8bb00^pjnh>imRpnE>4O3pH`xeW^m;e4K3jd`4g_Q{@OfHenTj3F@1
zYXXDgVL&9e@K0;I8yR4!p#jE(BFSm-s>(#0N=!x7L^Nf|qC^Np>oS|cnhTL9FcTh1
z=%b3N<($-3PcAqfA|lR9QZ@gCVzMJeKBl^+v>uPgVHjQXG98Z;V&OaNb%CY!LIfno
z28ja_=4Ey-8#BvkCT2vCoY(nEoq)^>c{k=C4=0DU&5V37K};b~HM??K&NxgeV)gji
z*T!P1#Ie9fNNKrjeMaYGR&=)_$Cn=vak;#wv`mL%`)YAKsBE!_A&$mTC7VI-^ihJ(
zuq0iWS`A-iwTu8^m^j4i>ryx9`u9vlZC=taOd$+J4I{zp<w^lLj-Eef22`?Gea{H_
za#7PYmB-CQfzb@E^AZEAu&)h(Y-V(tN|8#OlBn6T&IN!_%{k>PIjhHr#=wX`IIEzj
zsaX~!#BoT4Ii)55Dy!B&llvD|^$LLFGyxD$VU&d7fB^I5twpiNaWb=9V_BIa52Gyx
z<(rmjL()ps-^a|D1J~Oa;^ZIFz>*TI=$?ou9ELDXvMxDQH3cyshBy-Oa(zc4A5Rph
znZke=LhuDyoJ8GXhPc)~Kp|GpLQQp;p29f2|Mq7v=||Vd+^kN#DA&A(Fobbh&abN4
z8v=M+7vh-Lt7olj7AQVelj4B@#BTbi<)y&eaa)B|!d;Pwzo-1QjyC+z3T~6RAYq#%
z@3G5zYkc-@PG8zG8>~vTTy~0^QH$*XlRXDvqj6JX=ijp!8YtwyqR)W1x09>N_M&e!
z5Qoc4apAgJAl_)oTc$X1Ffvv|vYgiTTZZvK)UK;h4z$fjnIi&uNG1_h2{{4+nl|i+
zi0^n+HIST)44B!y${%LQm2Id*x|Ca2Hjx&7?VhM+l*Eq#cf3$Q_2h8?QZfUg#x5=w
zz|@;J0#}zsGh=46t(rn4W>!E$B6bH)z1fc4#ilJ$W;8eR>ufW9s8rKLJ*eDJfyhwZ
zbF=_ttnBxnnd|$I-0um=P}Ngzb}aO|k%MR4nR-3$4wQ|sAfg7jLQ)S1Xcf~T+~;04
z=Znr5;f6G}g(-MMPNlJ^dFY-SI_M^GQHP<bnfcyaYNG`eGS2Sxw41O|Eb<8i+gT!5
zxmwYxuiaD-H^_52Q*}ptz`~6z(3>h!wb$>o3!Tx#o<Q!JY{_Oyn;V<~6q|A)1SKzz
z{9!Q%wJk@`t$R07MAt4jQru=Gh=i!6GpEWMae6CNN(*&)h1B9Z0ZGwrjVAi9wo`YR
z-XMamxX0g_`PA5z8%A1VF}aMp`h@JXcV&y!dzTWI^>155#g(@-(FXZiQ;2msoF2XR
zRBhEhV0D+KX|~0ydZxSqZXLre)TN~UA%1_9*Ym=@Gjt0*@o-(vAq;K`zIoT)4k4`Z
z_(gI~ONc`VLwyak?S1FBR}Nu19J`)uhgGKeVgNbKX1cE80d<Hpj0ggfmUUUzWu6Yl
zFbvDvJAlRUShNj9R2A!HqB#)<q+ps|9RY~*`PFiY(@9m*as^c<$B*L}hB3tH>(^h;
z@9%zjEoF_6LLf6pS%PHKEFz+IzFeRN)cFsejziA*{B|Y^|MEZkS82^z^bp3w(+_#M
zrZj*4!{7P#O+^3a|MtHkM~-70rvLK4`yb}>+x7faau!+hvPfRjaz?;UfB4VBFoig%
z=5>Bok;~gR)123tn2FeJ$*#+<i1_1AKMliB*h(s<I$yrILs%^X2jbw`<i<Agchot`
zL^O;iVkQcjS1^71<sS`T91qjsxX$M|PA@<HNmYLPhkuWRW^j7?G@V`~uT7k=T+fo%
zmmmLys^nThAJm>T=d|QB69q8%!ymsOp^2E8Lw0#xMDqFa^LRM^@a0FJljU@klun(;
zrrCRl<KgKC0K0tqH4IZ2CO3^NQ5!jdng3xJ4z*QsDXzLZspOU8=n3qI=)>BkX%Uh0
z-~aokmmi+L{3K~r$;<V9U9Nrs;}FUWj5vhR9mp=1%h#`8$7wtrk0oGlK~wqlmp^CG
z(_tuQB!U@mh#?Hs^f_=CrsH#)PK7wsaBUdzNmZ_IzpZOp)*MEQ^+4rXHH)P5?d%n}
z<ebtx9-apdd2hiA0Pny3jObgxzW(;>csL%8Pg_`Y?GIY0Taz%^en{bO+~xI`CVcD<
zjU|6w*LA*Lr^9hN9El?_$I*#n@6Ex$M<Hpx03yfHPeD^Lk?Hi}|7p$X`1vO&4lh=6
z50H_r0Fd*t%$|FWahL!&#sDU7zx^Ws9u7ks#yB3|-`>`gL?x}u;dpA78it98hr>xk
z*7@K5|D3(ql59(orlqQ8wgz{Ph`rC0Q&mwtNwomoB5=WV-|+%G0tj649w2?iTR@BS
zW55+6%ndY6W@VkqJj32Gx%*mXrm9@1nJrr$v9qK}sXCPs6~`lD4Q8gQ|Ns4A7(yr>
z_F+B^<Kg+!A4)N&diU_L$w0f;YE@aicSM*H1HgQ^cOi)6hT0Fqfm|d)OD3@|TAY0t
zCabQXrM<`Oy?0^EX%)$k0g0Ei_WD>AUS1vnOMYJKm{plLs%nZ0l3Ool7s6y24u}>y
zpVn)R*Suci^*rByM5OidB01S~kc|NB0&})Nq3v?{008UtRXC4_I}uBiEajw-Bj^1v
zDJM?rW_yPcHc5!aPcXI|g~1I|PHS9Voga$o7cs5ZHepS18Rz3L%{~mne6qKDJbqA>
zv|bGq*ZLXf#~;iYg6Q;CD9{NU@@h)~IcM@f73t?<&JU)x>TK-#ciZ0e9hpq8kH=o^
z0eb6O#Tz5A>X&~48U$HY3EzOwv@6`|IT3qKd$0Q0yC86v4c4Q}diT8cL+N)t(#?#q
z`7v}0qA!OXt%Ff4LrUhv2EpMhl1(jU9=MjFXVj(6@m=%wtV@(L=cE9fGdmJy3!t=t
zU+GSFvUb>|pm#X<+8<XzMb^fz+746FB=ybtqPvXsa*Qvd$EH5%5}{iI-IN5n*V^|6
z65K?{+Uwx8Biid$7T|`v>xf)6K5_R8+#CqoMYZ~)>hZQeP4qT0u-t2{@sPd#zF<3g
z!8+7`VkZ`Zas_+B!21%g&1a48paTl5xm-}d4t<9=0mxfz^1ez6|1GUhU+NZZ84GXZ
zSo#GAR_BI6+{v}Hy`xneg>P9I*f*$J9-iv0`l)|&#X3-`U~SnB*U<l`FF$(=kZNbI
z(CwLR5B|F~S_kTDU8S8)tJ*bosSN%4a?332r5-mClKAe@t=;p3f5N2o9u2Ldj_8-*
z9B*PZ`)tuZpwx^#Z<)*$E!qB8d#l^d{q)YGtM3HOLg&}or(^2dj86anFPw$>dc6?2
zkKg`AI9c*Qvr?FQ(FT$(3<#*MGAR8JhC>*qFdjHZ<}7Iifbnoo&L1DX70K~>1^_oq
zb`Um%Pk-J0Fe1QVXACp=AOHFv{QKYi`Ct9(|K)%9{@?uXzx=bmByybAH|aSVro(Ce
zHeSzhxkygJdAYol1JO9g<>Guee)v{Zug^a(%lh>E^zh;1!{IaygXVa;yF<hjR}ntU
zfn1mlcg*sKzx`e~t;;!tFwY<RgqJFx!<6!6Nh<vG)87EV@i=mP`TWOcA4ccGa(*to
zcmM#L?>_wF|L8wPaxb6$;K%XczcK%;X+3`U?f=F(J^t`p1pLL{`zIW)FQ5LX%qgwT
z4}P4_uP-l8pa1GV{AYjukN)Z9`DYcryguf*{_-#Xy||nofBZcno<4r}^Y{Py_y5=b
zXn9Yf62chQv#Jim+``J+12mmJ96x*)#%Y+2pa1yV^W%@p@~SF6t)Tkw?Qc}nAWUJL
z#EP%woa172B|8Dkrw2e<UZ0@Ll}s_NYpD*+q;JlBVV2Um1ajUU$+TY2k3Uw`1^{61
zh4+3y!1esBpv;LJsd!dFDIO`a&lgu$P9_IemFxM*Rt9Dj(ew2sru^~Yj?6xxJRd(I
zf?8GpU{2S|(@%Eb5ayfLJw|p8Y({*3{**Ge-N#^jrt~wZ#rYZ?;SfAIy8rN1O)wDQ
ze17~Xb5sFDOChJ6BROBV2PK~`2Qdk*WdRBRFh=`pq2?qbc^8PB1J(8NEG!~COoz53
zIzNc;_528c_YWU8WF<h(Yg(82^niWXeaUZY$4f@qHrJj-u=jUUN;#(N2Wj=C<;*!3
zTo`g(Raw(UCl}6{6XzJh<a}5-13->z8Sd_Lzg3uxgZgHvGxS7UmzqInm&>5%J`AJn
zjcHw2cmj}&w!R^l8-6s<N4&nS=a>2T0Eo-wS#q*s`}Oq|0Ol!JMeBt@*@wZoA-}#@
zMWvFv?xwEGOWh6xgkLY0WmyjMU{g2ee0<47<UJw6Ft}kD#`z@UY`D2%C$qdWq!ib-
zRvLATb0+5zVVIA@d`#=2pw4-6jvN&zT*-vt9GBKUR_5jPv284Fm_Ur6spiSqeCRdg
z6)OwW+Se`&+w2KZIH&b$7=$n#?Ozn(!~I9$v|e5S@p%7rj@PtYsOBhmAJ*%uX=GIN
z?wemJb55&>#OrIkUUH0B6JV;jOFIyzS`&UcK8R$=DU5R%4{13!cAEVxH%ylF0yPlV
zo?&#8aF(1+`y)B3ir+nOEnMau*4VpkSiJ#tcGW;TSnt!s-^!i41a{b(sPzP8R)o^L
z{$g1My@Pkt>)#xG_Gwrp!9zrpunCO-NqT4SE=7GSG6Y0{sIMLOb!7AS_UB6#5eqIe
z&F$NCFKZVNb@^T!&kEZJqDhHcq;Q#--qh;Mj3rruT_B|mpH#DDHt6;~+o>^Po9w<n
zOzw)0@}9JUTzl8^uHdf!=cXA@2QUPkX}YTj6?WQc+_Z@G(|Xx;wfr~xL}xSK3Mbs=
z8M|VOzT`aV{kZ!dhhL%;yrn#B&Sl)s<n*o4UiW{j?k+%kDD>|jG4%CG@4<(^n^vLl
zZvi)c(@DC`zr?o}qAzEmA4k4JmhO{A`hr7hh1dB`c7-(77qMLYI)8>;+QOSss&|CH
zA$WB)TTvVAeDDQb2(1XiFFi;t<N)80mvQeL-__0iBJd^ywp}*r9}0!deW9>TslG%l
z=}~K1Us&z%=+IYsEnH7`iGRB3J(^RY?63Pxp>8`SZ|s)5)(h+zCjWo_qqi8!n;5cx
z@z4MBYFQ(j{g@7CD|795HH?Uk(=L_XMB5fiZO>^KXM5HZAPkd=m`vPa*enC6%8_+C
z-Xmg8QACF6Ae`fJMu0FKtJ1;Q8H!wZef(pwLm`^8n0x?4Bcc(xxL(tG<+O5&hKp^J
z;p&&toFX8q0y*c1TCBv5TB6P5QDaJ_OJ_8nxJ7BlML{hU$$5|Ds-`)czSLr6nt5@Y
zPv8B;Ujg9x>5m9#(Ld%M1=aJ@&nj#!#OZJ%=cnU?s-B;IPH9=suQmzv!|44W!iaQy
z_}UNS;}3s>ShxfwD7Gf9{rVsM2jBeWA6{P`RmD={*Yk@i$Lm>`U!Q(F+<$%d)h{_k
z=6wGA$Ls6ooNE3N^H<;fnmH|(7aK9!$vlknFdoc_JRR>Efy@g1lJ+N=(BQ(HbIvR&
z^WAYGD$1tA=>q_g56t|xfAiPVIM|`Pm>;SlnORgd1lK#~Y?bg~^uw6rl5@<70q}6T
zH?6iYomFLBF3yK0b&Km7Q*>2oq#|Ga;x~3`7UA>ji`fq>eU(|5&3=pHG&|>BU!J}9
z<22i2wXX4UxeP-Xf_v+`N{L&zO$eTx^M0^oI3GrGp=Z>E@n8}5eWi81UaptRJdGg)
zI|-O4hnyGTxL!cPIlskPH6fDsn_!JI)U4gx<W8cd38yk}vTIim<n~(Gc(tgVEe(#@
z02(%(w_j|zUSD3GkH^z|DA0^85T`<er2Z_G;!092STzf94}NTEP*skQH{xB2J`7C;
zX*qU&n95cp{POrm=K_(tF6(7kr{KMJeE`Zl&mxj?R?*9{TA=b_p5}S7U83ZIaaNUr
zcogeYLm1{^I$qAN*UPJ=)|gD%j?0JRQAEtmG9MpOS`01Oq$;+QOow~t!}q`cYwz7W
z4FLLbUJr-)bUKw2u=7Z6u^!AYAiDiv1DP|Y=zJjWC1>XBytnIs&OQJ9x6X%gJXB!|
z-t-L1%`Hw-ghs&V62-O83RaElg*hLNA6jmV^Mm~ttJuOgyD);Xjp9^fd$epuK+bv3
zIhR45O-aoWfux*~(4sJGqzX07KF5`F#qSLxq7w_CFX}IDZX6RK+g*EW7z98U1}%A8
zWx!M)QEaTyK4ZPlNZt<{0B<i-BmGnxbvwCtcIF#^GVjAUsKRS3TBT^kN&>s#$W!)y
z2*U^^A@8kGvNokvJMq$O`=&WGOeR)?h_NX!JHwMnozeMbCJ}uvMGb1|G}PdDB!?=f
z1Vlgt+}j=;b*V9R3@-ISEG`jyZ8#@HBJ!rvgf1S83k=Z0m@?=PudiFemZ~4e!s0_U
z;JWpK5>c_;h$FYQ2@;XxGRM>kDc6n<RRV7jU3(IsVPN0X<+X;E8@-ikA6uk1ht4MM
z!hMGIF1coRS9L@36i3ZlGT9rsCL-;yc4|7n)@&#eaKIL>Rm|@149Do5pR{vIbXaE<
zRcd3=+F9CKJ?I?D9^TqbAKx&#whPwkcr129xaDazFE18N`Tpxp^wz7|CAak@t-c-m
z6<LA)UBHI!6mv7?+0X%dG}^nxCRNqWzG@;wAm`);ZlJpuqn)slOB#bI)unT`_l=(}
z>m1=WmaB!PRi!IZD;$wrYe9E|uI+E`Cfi`iQOc}jXU&EyQnf(0+b2R)S%gr?LLnTH
zBB?5>?gy#;7!}_XwcV)v3nSG{#cIN(UdD{QnwpSES<4k@uUMm1mutekq(aMMNumN$
zO>k9MZo>RMc>ucrGTZp1eC5qMsC)2UEt%iD2=#k?F#TRy71YAS{V>}CZ6~`hPPH_&
z_)RivNLm*FAh4S4SR>C^x4e5$QHw0Mn8`5S*}1?r<Q&%mx)sTBX<=Y-xuE@+aSr30
z<8pcVRL*F+=?<)Yteg$EZIzjbX6CRx!XV6AXUHb;R}rhyEi}B2B@h5|j`pkeeF+1|
zVz5xZIt9UOM;;=lpgFCW38{D_ns^cbQcNs7O;ZWHZ3h~A0Yp-~a*oDQI(_)g57W!f
z->d5D(~qE<mNSt%efY-KlN^^qvjw=mzFaStFi!1{B_GTfJ50x6I;!yV&)-{#Z}P1i
zV{KF5INu@BdVMixu5e~%LQ+J4)Sft-z?D*ug_&IqBNZ0JlCN7e^G-os%^pT`8j<r}
z?2@L$EHX|>?ZUDhQGFPu!ev!s?u)8A2bLq>EHPYW2A1<4iy9ULjJ>WLhN<Cf&5E(P
z2tbIi!vSGVtE!N5BA7CJ??MILdG7#%x%mG?)6o#XQsb*`)_)d3#AzxPC?W?in6<+X
z69D9O5n-zZ%fy09oau}%j586MeWuC8&9lX9Cx*--#N2nbkrDv-5X@7kDmFW*!Qvn-
z1RNQO5a?E}(p)rB;ae&yVuD+&;_#Xj0Xapx*CIKmE0OQcK+;Z8hB6`N`i+n|<=jIa
zs&Sd9czen!XgX(ZQFO)cWSR1unR$&lcnrZ?y)_Jjm7A)1y_{1@_a6=-;=-sZqA$)l
zBxgu*>&=uCWE55Qe%ML^L?kE7&iiSet$I_A02+p&!n)A=p;Q~yBu?aN1C>l`#hj1F
zgCp|Zsp>T5;9Xm-Rav<Hf#k?JP7yXW5IAx;Ol385u0rh8Oq?Qu%$$>5XGCYXZ56TX
z>uN&lTI56}92-1ZWE7(0ERvlMHICILNY>KBX1`Nm6)k$##>-TDNlRafa}wvx-=d<K
zQ&z}17Mlc7iVHbEIIp0Wmrq2NW2{i?%ZhRokZdHj#)K|i@h$6-eVE#=U*T#Q6m9dm
zjTCNjKTz+7NrWvBJg<u%r!XEQC&)=9vxpz&mP%zMgb$;Ntk*Ll2!P4i?R>GEU)qjk
zR)5LSumwI0)8Q_z*R(EKSZl(79XE1Zp(5|nk|+#5pbz8W{;Q`Set&uSM4MH=bsV^E
zhi=R0Qpwez-D4rOU=BigObZXF8hh(Pp5o%X_u<$c?z$01=RMSK<`$g+h|YnEA@z#a
z)dypZ4&wm;mgSmrp2o4+gS6-cEDKcAdReb$TPTkY-^_O(KmYN!#JpZ!s-)%N`0%y;
zKFj$jEob}nUSD5w&R>1?RXa`l>1cn-eEM+r)h|=LKL7N6gHG9Vsa0(@&L>rg*B5&u
zN~0r;y04;~AIx_z0wOBR!r4d-_DFD!D(w8QiB8FhWaUicEZ5h}HpckKnakL+{#N9i
zS-(ZtICcyf3!aKv*GN@!PDIZ7u_mY?asWw-Iv@|@T&0;x<Qmw>lGvOhRc<FjPHSnK
z0H@47<-mFGTu3S1#*5w*hUA<ZRM#7}mYvm7W+HOc%|gy08SnsXBTVbnuBW{q0FWVB
z`zVYvk;`ed6P_KvR0YW+H9EF@X;w#;nCiSLq_`qN7!HWr!A?mKFieLxtiD3Pkd6i*
z%*;HPl|rP|!^X8SeF`En=M-fa4}DO06Gz$}e^VrJPMjh->ioxSy4Zg6Zf_#gj1EWM
z^c1F^V3B2I1EF~5g7;yV$Ok*doiCS^d6*6b%_@@PCHT>Wq1di+X3pa{8=nPKn=qu2
zMnu><=jVepjW4gCR3Qu_krz&g<b3gf+P`Rk*8UUhSG7or@@fysaKWv8+(1G|4xO*L
zIt>-)9a$~NL=K!!%f+?;1uz0qPN^KcoFf-RRWtzxbRIar$(bSrWo9V(G=$_>Q%=c*
zb;8OlMp{pCK_rtPm9kis)5^(=69vMT(~9H*j;fH>t2oEmTj7{flmbHrB1hm-T)ZE2
zJb=jM`LiF!FwAwhE7pXsS4K*+Zfm-j$bn7!#>^HjSg%!3Va>^&DH|H8i0ZESVkZe-
zvRIK2R8ef4)liUSqrzP{Ru>{s*smrY(H+jNnm|ntZJT2K<X-Mw1H4pgJfi^&?POs>
zvO3i+!;URc?ba?~yNT~W9<XQL>&}|J&nH8Ks#3AFgeo^~%U|w=D$Rjl4MiIwQUzx;
zH93(Z(syGA%ps3d7*|M6IOnw54qE4_R_`XQrsfuBMum^FOIqu-M(xUOYtja^+tQNl
zlIn(UF2Adt0?RE!hor!Qgcg>x$HKjpWp{|tE=YZAGqyYW1s%73LEEjWRcV5_$MAnK
zu4Koz+(!m>_|ltv%664Rg_&C;tJm^ap|gp?IuK=z(u1l}p>nm6K(P`Ei>I>y=c;*I
z5kWw-<iK|(_wuDC*L=sOur;P|`?l=`0zwjN<HIJi+9};{UDen$uUP-y=C|6~-sSIg
zH;~0!3COKxtzi>-eLud{IFvwd)muUQ&GU!2J;EjNt+}YA9nhQ4rrNHw2b2KpvLkT!
zd}%KUdDAz>PA#GvZd9qut870-$=j6I5qWgZR#7C^jA77t7d^vM-^h-z+~{&}++<&(
zTTX_2Nk7sSD+R^Uz28zG%brwDrMS!S*!r$`qxdVCUqn3(xR6ZVnB2<zr782@Mt$l{
z=fCgM+WYu+9Vqi%ZP?BCGC@tb<6j?tbbdJ8f2FF+%jX=|_4-QW$q~8159R^T>3Hw_
zaC!L*fSjUXQ~WrM^C>Rp>&s(zLCLuQMAw&3<idRS6#%T4XO8h@`D3%<I_HP^gox|q
zMJ01ufQZN;p&w?E%z1tM;dej%^}iYqcYc_{IGgF%;_Cn;=iC!+>|@RU<-Py_AOJ~3
zK~xW?hvS3eoDg7`k3@dGzBXT{wWPv)OzSmQ7e@zkg7I)~ZxJHScVC(C*N4%E(L(aZ
z`D6{5Mq#if(l8#z!`<=W>*f5sUS0+l%4!I3|1bbx3p%hy1eVDn0^m5`4dc=NpN~KM
zF30ts{ImaLIX`{+{$H!=;r{E#AAbMiU;m$Wb{odINe1p8KGe}^@kONdYJwDHMgUG}
zT`rY#od7hh>-L}siwfr~IhsLUB*!(|VvC5cPd}CBI=SQh*D+oYUdQ<`pFUikKCR1n
zb`MClNte-A?eAslc3M{@E=!C>W)-{(-cHI$&WQ-X^S;^W5D7ehswC^QB<I60pG4&4
z`N?~Aj%t!aa6YWd+D>`h2DZsA>^m(rFa$6jn;Gis!B*xmjKesLlU4KfKlbW8Jw1yk
zAVN&%>jD7Yk<mvl*Xyz@-nl(653XxMLQjN<aXtGm4&!0DUY6@+nr0tDyq*!jdGABW
zaRtO|LixP{)lfH54)O>9vYu-{nT~h&Wo6mWgSakd0QKIZ^Bh-n{_yaPo!rU!ofZYa
zG9v7nuh&-_V1UZ<`nVylT!=4eUDtK}vHcpu;DmLF+3u-r;@*$*@f6pyMKB`bFdb`W
z8!bt(K>+L_48s_PV_D8Cpr<s}RMUEe+Gz1%Jiop!%hfxFh~5j`9;1|qoD0ItoPZAA
z59{?snGOCKudjd<#u*e+V%6w!3gf}~kWyZj1<T&aP!4Za1L1fm*V(!z1XOBb1r?TJ
zJw%{ZOiL3w<{UZ4VLVvSJdwM+elAC37ry@0-?z5Mbowx#J}$3MalKrge->fMNjQ!3
zscCjNEjClp&BE-$Flp7l+&z4(Pmpo%QeGEZ`r~?$oQHYC3$)lDM4a!xQqG){<jl$d
z=)+*03?DqAF4waoH;l8*AZ)wJIp!3{>EOcHAD)KkpjCh~pFRkuoT92I3pww@z&SN7
zOG?bFoPS2dX+A-hM2kr1$c523tIBye+?iXtfTIoT;~XN!^~#09p;b<?mh}XHQ$#Yb
zgTtLJ1Pn&%>uExJz4ivkuVQos=-EiPKlSWw@=e)Jbu-Ya|E4ca)e*Ot_#%O;pdG+!
zlx>?!^H=Mh{f4RnQgKoJ0ZKd9>z709wu9LIlRMqQKKrT{iFE($Pu0E4*X(^;-eLW;
z9!gn|{{={II!xJ1ysO1Ww}il2yf$cSEBIKq3alewmGTxh>%xt?NVn5FsMKR8_6~$j
zlzwCAzO`0=skOMHac<Nr)Kd2%;4Po5_7Qdp^8ORx#@f*(z3=QC-PsX$;;Y`=yXCdr
zdU1Li@17oko%;Y$|Fku|Wjkz9<A`r+*>|kOb_!FXy5x4=9_S!gH?9Ny6F{mh815Yx
z`}TX{mT}S%wxsho;d|b4(1y+HkPjk)V(&!<7*MQ6^6G!+T}gWDj;Np1(*4>KLP$al
zheKcm6KNN&w`m0{Sanx~bkF=g+fVnhuTB6VLEgS6h`U;)Z#T5Nx#7>c#jo{o8m<g=
z2X253Gf?dcwbCK18E5v$Z@R~>Aq0JJOuxiQbBr0H58+LeV;9zdyNdUX21nnjQM$NP
z)pvXlt;>R4M$K*A)>M3Yt9fbp?O$~J^gfoYUEd`p{mcL6zih)fG|qMBWi~A=A|38N
zx?y<w@%!eAvl-ZMxD!sotZIYPr2>D8d+~Vxm8v{{`XlXQ<xLz32+ogyB%H|k@o-l*
z^PF;uCU~8X55wX3{PQ1FWS9;}E-sfEPoZf!JLkz4b?h*o{5UNykE%k3_Fu2g`(ZjZ
zi9dAuy>`D{7?FtMLgd19F!wz=Pvoo~wKv%!`i%GE!q93UJAH_77!SjAjLSK%SEMbA
zBaDagsDZW|0PJqNA0{9QVYEXl=d_%k$oXIX<-faLUaqf?#@Wen<(x{w82|z<ua8Ks
zD460h9**<z!+5wG4|j+AZ^pyD<W+M1+kf*vFP9e^25YS_R7513^4O5amWucC`HyM6
z-hcHAA~zoHa!UXA|M5S$sy1%V>oj;oSQDE9g$T#s5g`P>#(Z7kG=^ym%v%)pnliH-
zra<JT`5>x4fBHOl7aXO`iA(SO{xl)t`5G-rz&Sch0TFW6%o0-$-g!qM1n>R2uKfU9
zR4oT!9z78`N6VVlnC&Gx7$`jDEb`5Vdvm2T>(8G)JBK~P2oZ9pv<!{}fLWY#zxwr`
z#pSYGU&1hjVKxq5(GNR^NSBw-ZDv1Chk`JSYg*TFo<kVzZMMmZsT(TA&4X@ad2?7B
zgU!C#zIb_kLBzX<uX2t#u09M~`5VS^B2?fUZ%&F^@#F%M=d`p|>gDCL4Qs7>vo$fN
znDaVLM;|8PWHc|~eE;>YQ(Rvje@2A+4`20*rsTvq4fC<}>JJ~jQ4xDXKmYjqaXw9l
zhcHgVIOm*1czJzP(ZY~Jmvemi{FBy5OXrYTnPr;hFbuus{POyloFAtnlADhYm)ED~
z&p)*_3IVQhD?aAYw_S6I*_spfQ_SHrje!trGU(3enX{}h&+|ObGr54|tUj|n`wu_-
z7`!vC-Z&lCb-i3JA-LdaJ4Yz2F*D2QIOZ(pYb57>_3J+q&Ya^opT_yLu9qBFTPit4
z6&{ZFHsS_A^8OY$R8RcOSw(Ej42a77{PQ2i!>PE=naBAUhAF4G5fxIhF^4J$$1og*
z!<})u<8ro8Lsea`XA6TYU36P=!{CRhwZw{Y4YaJHDK=JL;di6kX6=Z1y&4l7i5@@w
zRPh2dAMfAl&g^%#goZwwzE4xI{}+<C#kK}Hl%Z@ju;rZA!`;XE^l`mB$K^cCcc#PN
z8S2}?_GTlkT1VY!tKsH|tsAI!oBZnL$J8&<PInDo-4s@EL+IMF<)~7wU_Tdl)At2@
zzY?iatM{oqUlM|EY0~&5!Etki<1KQi{ux9FHXXtp5^p=hl|`ye2b*ZBdBxsWsn=BP
z_c2<18qVf7?`81XB>DE=JE{1d(N>SS+9{+}q}=G;m;_sW-#YaB5J~MZaQX&ihpqnD
zRKU7Nm+jl3x=RYIE?wO=@0Rii-N2w)Jyn}kv?pM_Kl0N4Xxh({^u~nnMs@xkc&x3w
z_GfApI^%7{hC7_smsyBkV5;rknQp?`7}B>t7Q2#gBjZVDVnN*(0a}IrCBGANKb6A0
zJLDZd6n^=o)Lm{n_Wwo79IN}bJ#elY^1a3Q=}vizg_?YGC7Z0Fe>&bBR^mnsxV_<9
z6HYtBcuxWWc%MC4L;Ln72e@rwbs>nY{#V!^{p*bP=A+sz>ELkHK|$3)*S)HJ52<%t
z^ff<}p?>#cD@m~c8nI(#Rt=8Uf~wSc^ahn!NNMc}+^4a=b9-uM?gsH-o5g?kU;k(1
z{4n1EKu)WQm;wq*oQ<3wzC$9;u~yAm20z!cT^APy9|k*;sMv&w4a%jubE%gkYv(v6
z;nWl&Rsxdq<8)Af_3~n0Y=BftYF0ZzE8KtcXPo1Dc~%k5t7Oh;bs<>xH=?uYPCsF;
zPkcF;n9?;Zmx6>g*SuMVL2W`7rUU0_^BV*R<G~H%dU>(4ZM7k~FdtQQeSIo+WMR%J
z3==tTC8_fR60PSa*pfANN1iawVVsuNXEkSxsijSBjyOywJGiB|<X9#v7Cu0wZ!F~e
zIG+@By}X+A;O^ru@4x<Kyk1gVRFbN!*Ru$(=a-iAIZQ`RspMI!qH~DO4hgT%pL2{K
zzWGHnvWZAq*X8<Jj%h3@^TXZAId}Z<jSJ)D>1WFU0Dv$~!a2ogf0_ZS$T?Mbeg2%{
z`tb2<L<-|1BCn4>c^_ODh#WdsF*l+rkB?6=rFjU>`{U_eRbQSyiRzm8bUYnTCqq$K
zcDap&Q@pB3T(1Z?&PS-~dqCp2<{W(pMt~E}AAj*@l5<>)0ywATay>s*R<a`C%gYm}
zj^j+;Jv~0QKG*R$F-uN%Oh)Gj5JH#`G3VIY+RTE8hvP}?xyUJ}G|qDfn~oHK;&L{}
zi>h2+KKD|gFiceD&A=&&iVuS_$7u0A2iPSWBO=7OR96XvaV}1F)tsXBHga52Tx`<Z
ztS^YTTwcigVLWd6(nVTj4<nDqdqe_dFaclA*UJk6&d1Y@_@xx4bz_s9ZMhNQ=f_Xu
zG>zkI8Zl9BL$4A_XJ7$ShA}%IoFC$Pj>{#4$$4*TixjUa9Ks|j%n6ZB58uANJUxE?
zbU4h1dA1eF6adR|73N{^#;E`WyXNFPr)WTSa#oA$`TUYo`uf{n)M($<QU=2djE7Sg
z59#`9;6MX3w#KLP;c~gYyu6Hq9|vzQm+2v_HvQ?xAARtr<B`Z6?!PkdX&B}(9@2U#
zoG{g#qcXc;#G?B*@fw$)K0g#Ctuf8XA!1yvwaC-;{2Zn^j7Otp`Y^f>(sI=Td8cAl
zcFw9U%Q&=MpL1?rXXd0L!#InI1;I;BMUE>{d^ki!!tFdFAo)IzR!!sTJ-J}-br`04
z9>DAQrOJKK4};}jj)%MHcz=C;jMrCk20~j!1p!4kE*C%?%<sTl(g^B(M1Y(YVRm8E
z((KgI?=@3Ojho)$>{We{fWAM<C<#wQ&RS}=JEAH8)q_{3FWt=#8)v#E9qO)7fQ@5+
zd+-qvw@(08?oQpR<eUiYWPidIDOEM)dfP-UsfyI8OR3KcF(7o$fh8i@9WS9J^Ym<6
ztY5}vI^^tCV6%Z*(#w}pRIKuIb<AUCj|M0J&e1uq=%5u|75AgK3##r5H2cFuGUq6g
z8lBRjuilkX_RaRbNH;Z*_rad^y*t>N5<Y~1oU<E&HMz+miitcpDP+-#*f1@b;S5TS
zjWscyR}y2b7t^{z%e&cleyXjjqgBRf>l$Te+5vO6VAn=d=bR8BnL8Vlh`hRrs_}sx
z)!Rjz0pB8C_b3N*P<4|+AnIGQa$`>Kb;e(sOc#Ho^5)iW`%0-|dtOA-qhjA9Qowdf
zEA?^XJ=ZB*F>>n;QLRm9`Q9|sW=ORja-a%(lhRuYe{JDx7N%`pZcn3tY}@TtW@`!m
zvcPR2i>pQ2f$%E03y4rkz0yCuM5IcVPpJT8Lfk4V2LMMU@JopV(GijJD!D<l5gido
zyMqV_AXwmJxXq6XF5_m|yeW}4Vo5dBll=nN9&l<!;l|RgfS8t7^|nQ0cfHcow3%q(
z7Sq;HXKy+)+mw}SdC8l!)t(<B<Q*vGz0E@LhJa}M0uo@003)cUhtkrlnJVQHRlv0m
zlXJnSH1=MQ&F|VAvAh?u$pz|!cq{I)UuF@Idi88yka%()(Q&ckm=n{N)F>h%7q2fy
zjxLst;;j}D_QU9hqcw<So3fTtI*fBIawRU;5;$qKW+f;9pf%icTopN|SXIrXuL1yJ
znB6cgua7Dvy>5AZv`|w;;k+U_H;i`l^L}t)jLW6<673H$+g39V*qUCjWEMpRtewf!
z5N?>0N}=K8ysC<gNo)}sk9Vrd^(!V|HUcamsX5ApV~PqIhN)$;D`#`Ik@L<4OD{5T
zQ8lV(MB0F1!kX8d)|^&yj*y%mdYdgGrnnR>kAi|O=Vy~?iE@rhlUkK6#ryu~Q^Kju
znQQT|nKO%N_RLwF<Ep|I=SI$hjpYy(biKTkES36N+0R09R<heNT0WUAP?r?caBfZ8
zttd*8)5<CNVMIXhoO<@&o4Qg(93cV*@4%pOO%Sh|tHMxKZMTzby$wVyNq8dcXas;5
zb4u|pt-{7=Moz0qZOhW!-fIPs40%_?8=RzWmgOtK{B14(Y2Jo&$~jpY91)G<<h-w*
zq9Tzs41#&EEELA1(K)9WBh}P1sdJ!uW<qm<GbiUfk+*jT(IJ+ZirtrD5F=7mNzpm)
z4tH<by=J>Cov54>b(DE@&XcndyKRQ%%9k4cQ1S?=N-GOzi`pOpZ_tirVX73az6V=%
z{|bOEjDV=p^kRr5T3MM{MQsRbPWGIl_jGr6PYCO>nEEAi0)>=0=X|<<C>}6X7DjQU
z^CB$5D8=+`O10(siiq9^RgLRnYj4hpS!i8V?MD~IKNk>(H@}%~U`4SrVv2D`1}%Y<
zCKcWe87AH~C4mK&31<ZWNYD!Nl9^R-VwOQB-Xl^@E0F^n?AIgbTn?&Y`a1(mmSas}
zDU=Islx^@Wh;(z5lJn|-jk{Tz&rUn;!QYWzD}`oke~6t0xW#_elbLWb47wyMMhOw)
za?WY3Lp~{qiB_gpW{V-#Opii!PxZspngLqrJVXv1aawbXSc1h|<!P!X=dtW_D#kT;
z9_+~ghve4FYdb!;Fo8V*sv<(<r^DTPd0ktegehWFt^O_ZMd9W3nMUu2xfc=HLrg9>
z?-vyj$Z56v0@^df=IL<1US8TEYdJp=xnVvjkuHElo<{p-7lvUzSbIu}d0Y_4M8>uy
z*m7UFb2T@du`lP17?O!v5ymN6{*lS?6=0n2I7i!Z+5yK8lON~2E@m@V)wEuj(}(Z=
zq7Z6SRalf$T!!(0fmAqi_Ty|VVpRpsi0Fq=Rdc)wD=_4==D4_F1ae`Rai?IEwn*7=
zalJe*=ch2vJ`C~tsue0|?`mQCRY4j#@4~2Q70ET>k5lHfUJQf)peZf@>KyqHi~^&=
zw(YE!S5-aSeUNf!P|m5?S5-L0#;Uh1Hf07RP_|A>tE2%D#c_&py@X)`LhlKbyb)jg
zpd#cD6~O~mV2YXF0Whss6){jPRv|kP0XQwWuO&(s0AotavKnR7ln6ORk!(%!@@+QR
z08=9LsBL9#Z<krj?JH_q1|a4w4u0Ddy&s$pl`IGab%f-6FoG_qdOz4Vh^R=E7;gr_
zQzyJ5a>B{3u=8Yvn<+3Yj^O<A**Q;xQCgh6ykVT%BYFb|z&h|Vo3n2%TyjM2dVW?F
zM;<DoK}7A)Xe$PRLkFC5&e8gBy=bxNVi5t!DYMN2kmwx<swyD3FetORl^Vbz#<d;l
zIVY2|nPAO3H{9PZm-F@VYGj#$3Smx}r^B5v8%k7|g@nrA%PL$SXWJNcxtyKz?&wu@
zU9Q#9ucAu02*+|l@B<O#oSgIJ<SN`Gy&{6-!#KS>eeMe1;sORlGw-W*0L7g8P)W{Z
zQ{38R!ez`<D6AGA;Sq_`s^qO7!<>k{Ikkvf=})@Q3iKApV8EuWQKq%nC2KMfAjb3a
zHcqa1fr`%gQ~!~|^cP`3RVe+%RJp|B`~WJP5+ZmRImNhMZG$fCXoy9FR_ifU!7_{A
zFgFxJ`Q$nm=({rHoO7PMU(cG>rLa_p5I{7mg0D|#$0gUjhj)vq!~HxN3n#30L172G
zLy@e7m({wOytk=#W&qreFmY3Ps4#Ov*c|<Pded%@ZO5>;28lfwv%Y>`(34kvRAqFO
zfH~^&((E2*X)UIvVyIo|jgh!(o3y@$F-Gjrt#y=*n*^gASnL~Xq@+o$kiswmQi1ZM
z*kT`UnlaFcWAVmwUBC_6a<8iVg@AyZb9SgVYN9s#yTEOJdiikKCxmD}neGww2!yCw
z0vB7iv))H(HwAaXD-g+VF=jj7e`yEFEd;fPe7>hd*hXTvs*Em5ZOf7e*c<Ab#$82$
z3i@ehR4NNS_BwBC{fSD8Tf7}llm;>)v{ZLAQ!}BXGCR=Pz`%|RvzZ!*HpPEA(peH#
z&X#%kCH-2}Z8RGY_8TU?p*i<@naZl)#Q!bWugw0SH4omI7i{6Cn}xiS1Pc?A5-7Zl
z9uyH$;0Cw4c}m#`fy~{<YTsGuyL^TK>PG;8<&<=zSiAizx_g1-%<Ry~<Io3hZ}C<u
z<86CzFRoD`wMAb=P;yI41^_C&3v+)s8=%_hb`Sfl(9~W)RKeUgl0bVlkhy7@6}tIP
zcUQMgEa;8U7WRPP(j7p&QUAcsv$r+mc9KcN{-bf9-_es%P3zHi?AxG{ZQ;T_N=ZC(
zCg(z!tabt6EV-z#I73Z@IzD{mhw0Pz|F5NLSt+W_mzPIGbi*id&76Y8e}f{rryu@?
ze3(uTw$bFYrnuO!)cK(({>%J1^*MRAeH03!57*bnmrs8<e)tBFjPzy)jrIHth~$H^
zh-4oI(+981rAPZ)$!lFc=R;br>*Zy>`#7IIT9LF~o?DyC_~>Ce+5SY%hv_hkbC_mM
zStO@*u_^~to`3#B+f;_>$ebmo9It7;n$bH&M!@@Te(l4!E*AjIwL{{3aA63;<cE2^
zKIe7ioa<Cv$%kP)eE7w`qbi^O_}hoCfAjHIe=o-?$2BhJxV(P*=YNIdUmt%E&cFR%
z|9i8PHkD>o7*S433nVjRY2UKAnl1w|$AwEShfaq(Kn!85QQf71Jj_S?V^ds~%X7aP
z*weI}p9zV)Z+$$D2Ad~G<jBSAA|k<&n}*Btr#9&-lYn88oYK0m<jNmFA_$=j^PhhD
zTbrl84N2}#&}qF|lWO;CkSoa&VQ6Z<R)pCh<9dGVXB#O;&dIs$E1AVP8iPl~5J*IG
zE(AvVLoSyyB6#mw8j$ydMDyXnk|5XXOT50aXwH29;VVL1UO#ir<9uqnrmKj{ahj)T
z4#Vt*VLiW?{T~pG?ckTu7A@z44}&fG&Koey)lr<x$A?<F$>sc7myegW0v?a2wxn*_
zbXDg9ktg!KTgHCLaXvXe#OsR)V~iz4MYv?z8B@;O7p$Cf>wh}$Rn<{35{g($z_;@|
zIR{9F8ZeGSQ_R^h@p`$e@#&lIe(9Vu)%$vVwWEd!{Z%1n6J=x0Ii=KsossC%58sRE
znld6hoMz6+ww<AZ32iE5H~jA5qgX>vH3Vk~_2<iFS)=z3+|E#cn`CRufpI#Wj@AeA
zo&d;)5s|+8_-zYiTh32@JPgy3bByaUjMFe3%Y?|TNps<lfB5z{oKw!ZaUv1%dVW-4
zBXG^rQAN^vL8Oo0{dtZtr&V%RVRQAgq(&fGFE7|m+ro+{jID{4^V*u?#-#2Y3)Z4_
zu2h6--(c-1-Mx>E3+<hE-fwg?RpBI@rAVs=JG+qggFA-t;D<v_QKR*Htg_Tf?HHRs
zbMsA!ut;2%atHtj^U-jER;K5in9nNQ6I1}ej}x?n`WsBq+pl%GObGATC*UR^092Yi
zT6<?jr3mhL^N2Sk(`FF<(@gsJoDpw@KiZTCdx!9slDMEZUF%-1ev4Crk}TMa2kkIi
zYg_F|_B(vlrWNin>pKI$cIgpBI5z|gGi`xh`VLnfJNW&Vj4RD<)!hQ!#=QDg(9v;Q
zHUe31Tj(u5n+d-Au-i}Gq&@wYq@e`0vvVk5o%YK+zv2EvcUNztEcLa8?9P%~bKuqv
zyw`SHsY|L~^vK^lLFGBx1T(si;kfxA>CfHGuCT?TtAI*x$+>BI=)Q#7`v`k!xxUSV
z=w#-q@2L1UtIMu$)3W#Qjgo9n-Fx?SeaAn&Aq_Tp8dl{Q^u`P9lp)Pr4?Ct-eaf`Q
zE$Dm5!*+if#`)%*0DWVIs4?iUAs0KFNhfaVK3w!R!LncFcA*e`eomJgT9F#i`;Qu6
z5qoUuo8}2>X<9URx%QmA_KyznuvNX<V##~>gzAlVq&@6-6TN}Bs~m4Rx48Xl)B!s1
zmY%W6GjC%}p^x3X6@I>}2{kk5zxe0>#rD=ot{Eb=)xbPV$2Q<8+ne=>E8)g6*2m*r
z7!PT=7>E|ht(WJjr$-ki=e-YOS}$q2%%=}wKG^lYJb&UGO(|yP^c<Jzct78LW$$T<
z7fx|GKecgP@hwaTRkd?XT`t6jiF~N9dMkugm;up+QFF>^B_Et0tQ~KIke18U9v4>z
zB!xz;%32ZRA`Bw){nv=-Lr{ej7sH6RW=5g@mxH{uK}tTH_klS}iqq*~I^M6#C9TWp
z!*_^ye*7V)qC;`c1JXF3*30wt`O~ld!9V@w-~T5_o?LkP@pqiopTGZq*5z!TldeU{
zoUNwUVLlAw;pxZU3$q_)axPw8pmZJp0K+ha>6q3_TCd~-lH<7SfD4xU2*7b6ACSCr
zj=V2J&=PquSl|XZZ+iXp^4bqJhUw_X>H6~7@au@^!qhszJ`5aViWhrW!#MjeUS2-6
zakou?+Bb`^WUDnjvjORE4?WHY+?9-M$!+BPTDkC*PFEhJ<@K|{lpFG-o<PA5vl*z{
z+4FLK`hr6heHe+{%kz^etSQ?Pb2uFC@9*tj8RwH9=gafYsyfbh&WFp>PYr!C9`88D
z6t8{9Z#sQM#O3vob3A?gg~1k}1Ruuba+yzehvS`9X8nF6oUFB8(ncjq&dv`m1VhL!
zm*+1uoa@rRd0n-PHdPVv^Uput2v*HT;+@NxQ_iQmdm`!^X-2?WmSvo#>2R`nn0>?0
zv%e8lIIUL%80J&XiBr5T>vdTz*7O&@{1p+c*JsIji&0d#E@?i@r@MPj(P)TaoY(71
zd#^3+T_hvoFdkrwgQgy0VD;88-`SqRIe-8A-<?jU`}_M87f!1SgL6Y%&j2tU?z|s<
z|JT18hT-GKk3{5$nK^P?ogc^#CSm>lZ+<5tA3uBuA&kd+<y?mP<Sf3;W@%<cs9=Nv
z$z_Y;vC;l8#pSY|pIn&yFbK1VSVUiAnAm%VNW<Zz)ts&t9mzZ$?f}Weu|ABP<MR55
zNDtrr#vWePZ1O-vT(4(ylo?<_B**KST=?!U{_)G_KRo{7xAmcQHz%C5UJW9z0BOCD
z3(gNJT(s_`OK0LQ9**}~dILqnXp5LFl>q2N06^xXqG1^OBZ3LVu_2cMQd~e`m=1dt
zkLHw|b4Z@kx&_&HrJ=t$2z9~A`vZm@(535==sWSqjkkk4(?R3?bch_iK}PM1jN9|$
zdkyF}+0Xa|w=%pr)$fa4ZN^dTm`XcuEFviC?)0r+fCB&^H^asN03ZNKL_t*C2+<p7
zsk65BWUzP3Q)?#GyvFj+!u2jvZ^qJ^xWOdXS(x5H5*iu0R0ieTyZPwhef@kVzD8&$
zrdpt2^PqegT!+2IU3(rG>K?*yJG0$luB*qt17bJpHhv+?`}WFWyE474p&hvGKy~X2
zw-KG<J|(fl(cM-S+GdBXa)mC)UhDB&y0I2-wCgW$&+yg&T&q~Tfo|iUaM5dTqR{<K
zf9Hs;``WH75V*C4Zv52v9?-ZOMD05Q*xjr>oUh|h)X`jz;JTeeVx=)QD}61S_DPo7
z8HB`cQ)L6T`m^1;n-USavIO<rilU>a0p2tvwwu_#LrZt4Z>(X<m+B}YZ%ip<$sz?U
z(&Mb*4a`D!Mvg5dpd&&wN`nEGTga8R#@u@=X%CxJ_#)P<wI`&cZTCoZ?Ckq`JMG_>
z<NLp?%T~l5t+4R{_thsrCvo_4EAhYmul`dPhQr-QL_!xhuQ@I`t~oAYI{IOX*B6tb
zm1(UibFw;M(_U5({&2WML~B@wVHB1WuLjx;!x*MRj%!Y<^8-3>2~ExR<b0S;4=VEd
z_>)D2RnRT7<Z(VBVq7jN*@dZMhqeZn?H0zGip#kiU`;yc{4gI2L|?dBR&B6sCyo-t
z#aV^p^$bY!-AB%;X!NZ*!8)LJ&NN!J1!3K?%@4GtA=j7B`A~U3=z?9kWd0?)wP8FU
zLR>D}zldlek;C0rcVGQ7F6X#j4aI9kdGST0RQX%2Yf?^L!*uk+nAQbU{V-xR!<hJI
zIz1>03v*7AlPXJ*J{BYb6}*60rDCq|GX7jIIj$y&#_o7kLa$7MoD-3e_3henCk(_r
z=m+Y3RObRZs*v=86gTjKJxJKLUVO)!heZ-yRh_sUx2<5ZNm$NNm`@+R?MXwhXFhO_
zlUc|S5%K!+8Ohmv!h+&#7}Hda)A1e<({dHg!*n#Dc}Luks&NfSKBol%4-en?Fszqn
z5sAyWg^<D?+tErfQ1#=%M(C=toS#c>pCM|EDn1^tv~Xm<NZGuN3-zjTf2u8YHD7-L
zE3=tUjW}-)zxM$Um@~*e^A@38-W<)ljWq$r`G80{F3{0Ks)R>DVOcI|UF{lX7F7-2
zwMMQF-WJ{^re#gX<6#=dVLAZ7^V8>?qCHDPaH@J;(&2czd-#~vYg#X6yXyN8IY)AS
z7-pMTN=`YgnVB<Z=9uy~-+Y6J*UKyCd{?<~!u-PzKa4{dg0}_Qdq+emWk5Wh9{ezT
z|NGzB92yZ%$5B{v=3$!0aS|0&`03}LMPvvb06u*9sQor%52_EYuBc%;AfV|GotfEG
z5P)2;iK9t^4G`hN0M$HdGCg5I#9=<ZGu<eOI%WYFB&EyiX9S$@J|bar;8^+~r?op)
z+6_Y_9On~r;*?sBxiraJb>LJp2_U&)oX7cYy}qoMS7?nffG~{a>u-&mFpT!#kB9s5
zaF>=#PVxNoqX?I6qMJH6=Zl%7PEkOGTxi>P5u1>+G4^(tAyQKVbv2!@V`+y(&gu*k
zOI30TbgtV*$k7T~zLAZUBbL4PU23x#P<BLTE#d6_-6AAu1H{sL)lL0@Jsu2i_$<3a
znYP~j_Q{)}$!wLdh3^zKGn9#DEt}{~2fNpU6&6>E7Pq98?x6IJV0B;0nzPNUNR=e?
zCPG@7%}NoMbB>Fo$T?CNaif<B0IJgd)L&IuX0zMC*j<zydC?5kOtWmscV-}^D8fyG
zwMG2Aq33pHRRGv0zkfl)3$Q=>nbo@A2`aiw+xT#IqJ5|I?|zL!fRMr;=d8}#sNOW|
zTgZD4L#scc<-(MDu0Am2yjJ>Ry`)Oy5z$ob<ULA<Xb=&WU6G^>%4~^9tt%q<){$M6
z5rE|z&^5Ccww&(P%zSq&S1v+})!kQMb{0XB9t+qjX*Vi5px$bsL2VpRuN4t(kTawn
zozauo3vNagMVhF`5q3(0-8)XrXb;`Y^d>vKPX*G37NfmD5qsT-NYRrPPpT9a&;B87
zXSG(--*y9-nb7#Xazo*-I&-;|yXzYanAW-w+LKwdkS*J*GC-j04TyRx8h`KQxak}<
z3^#(Pkm8oISGzuab*$B5$T_#+!i{hOx44C}uA1WA`9S1r*SAH^Q*!~9H_Lf@37roX
zP+Ccos(1tHwC75oUnWGr)vcjc)oooZ?KmWSPo?b12S7^e1%SvUBea?tQ-srcX~8<?
z^eYjA&4anWz9wHpB2bc?TCO3OnK!4ZMPy)YO0A0OFbx=n@u<SW2~-uNr~?pob9F>N
zjG&rx!WMcbBErCgM5wgA4kB^6Kym&Sf^B;da*7CO%bG9)8kh>wdZ{T8y)dNEURr>k
zeM(MCm=5D~;1qMaGOgpJYT>I^n4)vSp0l&KOY(tgIEV`)nJU$mKcrzkAyT}a<9bQ!
z)t=MC-3LUvzCKD$?Q~z2J6MC5fjMb}0-RGtqPU!qobv%yE%?{i8O{eKA}Ov0hc#xh
zriACXnzs@v4!BAjjYDDDOLd0G5k^z`SxlqxS++eG)Rfs)OEK5UQxlGtXN=I*Z|<bk
zZ%~wem`cTInR!SqxMGC2rMWB?AfST}NMww1B!`y82#5$GWVJgv@0<siCFf?jC309<
z2L*7gK*9Sk)@V>|WEo*@C14FvGE1*3WI-4J!EB>#Tx2VURaZqsXVfu+`-BlnK(XYw
z0O&9s$}?Y0ZJxaGLAG#=8k<1QGbfI*7suA5YeK>>OszlR!hj|1Xh3p4jO0C$v)EN(
zZfuPz+7zg<*e>Yi;kfB&S#g8ThF*v?9x#lv;UETbMzYct15g7*$?Gt|Fa+nlEp0;>
zymL86N6w;ReP#my<;>S*Wl@(CXA>52*@v+7Z=Ro@JmJ1EfjLDxlsZQxr*mUgfOFI`
z+G-E%3y_tPpu#z=W|JypzPktS!*o0f=eS;r_P&_J)j$MhcW(Zic2?5@JgGasQ!~uP
z_0o=!Y{Fe6s4)Poin1-I#hWXrgJC}qE(RM!G`Z{>H(pr~00G4ElPxRJ@D)v(j_nd5
znl?Da^=ir3J<!UIyqwlLk0Y0pFc-!rVp^{zptYwL!IrWP76Vw)XOV21<eWfZn2tm~
z$BR9>Mi1>(rqYF4m-(y7wc~Q#4-e6%P$|Xv?gIj@*H=}M%=SA0DCgX(dZ1%jLCuow
zE$X0P(1dy?Hp4$4v9JiQ*E1r`cOP?HjNwwTKzch4MDii1^~%V#uBNa6<l^fux+zfQ
zxWrx{Zb0<PFiZXYCg;b)NmZBEr#-x?z}yOwW?$5#b+O!uRYY6#VE1B}xqFx@$WbIa
z&pEQHbDmrg&ATvI-XQ=e0|JKmh=_4{P0J;(S8`rK=hH`WE-vSr=e2Zbk&GB8IhR0r
z01yG9b-6h22}x1b>kE-b=g9?f9>}Q*n4=#608JiJvd7}$$H|A;G!AyeDZgz=PIqlL
z=F;mgt5{oz+x1{wiVUX)#v?+J{!2kil>3Fmy7Z>+w^OJv9S|wSMMX48`((&^b7)l+
z=R-LPG$nUeC0h^N`9R(~=U+elU~~K8{IxD3Ze@yd!H+Y?6*3fFt@)^#w`kYuM<VB|
z0t=uh&XRC8ae*0}eHb{!vcVXM*Evpt0B#s<HX)o-T&$zTX_d%LVUNyn@n~-YD0|hz
zIAbKqxgV8?h;_*jDRiPF7e*2`t^|^EVX$*&DWP(*cnW*RH?xXpW)7l#h|yk8iz<TP
zt^Z8q>_=Z-KB;OL=T_Y^Crj?Mx%l9G4S7e4xEY235Y{CZU508%i*p13Dd+353bS+6
zX>rSwXMgp}^Yc7S$HUk^OF6C9wRH}qxIVU8r}p!)vs1o1byC|kRXHbiVIbEw!Vlv#
zxiD~wX<Y!+htX_T2KgwzMqDa~b~mEswAxzNFn&lB&zD9yV2(&Ggwe>fy^e`oKq4Tj
z9dfy`e5k4@*M(7pa~P)Hbf_wlvQ<=KO&0<zIpnSzknP5CDw1=A^=1z%d<!Mu6rtK8
zg+n#eqdBD8h{QPuNStGjfVXoYm4FMx0w{oSI{IO{zA*VPOh?eIfnflR`g(42F5gq+
zyDE53>D=vhH+jUpR@&q?W$V(`bL;g2b{e&o9XY_gdKjB)zCT4a>5cSls{$h0GU~eP
zf2)r!5jG_bSNE~z{Q!JNOvf!o5j%af)ev~A+%0Ao1Go0``8Tc6owT}iBDjY%?l)Nh
za(2I=(hzJB!NN7!Qk&};4Y#;BB8Oo&dsldK?~MIe>hDgLg*R3NE8NRKV$-!K?7CE&
z;$VBawDTQfGhoOjb}<&YQj=Hoe)E1pzB6hx@eX#s1NNVc@5$Y}7OP_8=I(xwA>TI3
zZTFlM8f4M(LF-0tJ1f@KS!ZC`I*s~9*R-{>c509|nX&J&@cOMNDU+cs!l{0<R^v~3
z9&{INUT#E*KEIVaw4l5lIzvT`^<@(WL?im*-cMyc1A9bUcYX_$L;_G0x8?6`LQQEA
z2j!XX@?i>0r1W?ccOjH}=e6z<E{Vu$EZn;!3~_0s+d`Lh;M7yQCVQ=$_n}&Kx0{A7
zGNP*ep;#YX-=!>Ab~2xPZP803By>{5o}y`=RUdeRfsy(GOrX*`G3BJq#t>1=Yu`Z?
zy2fSAf7tRFq}}hD<hM(F+y@p`VkK-{U)-IyO47<cWO0{y(DS7gZncCrJd>{Bzw?;f
zq~GqF|8>PtDShmcd<Pw+xtC;aKiTKy+(dn19E2k3b#@ci^D`j0FnS+!6M&QnVr}x0
z?NTNRx7)m2Uz{K2(?>+)xR7&hn21?a%)x#7>brK3cRmm~H%tH!mkT0VFfjnCWWl_i
zpNkLO2T)PbHI^tf^kJ9|IVGeBpdjqW2>{cQjFsj5aJc_yA>h{ait9D4SLH06U3U;R
z^FUq~Ky+bJWyvXwQy33%Ij8mF!vsinF3ans&5XwRgbJ6JN9X)_xXbI3(`tW07mihK
z&3Zk9s&%1NSgz-GTaNc%xnaCKr;4Z2xLi&jzWwmsUjX2GeLb8$_+k9;?Vl65v|i(K
zUM?@25wLn)B`4<9PqPox>BDyb`25q~<g}!eRcUD1p!Ec*oDH*x&<-jx9Uqu;tXDoR
zlH;0^WfzRjg|e%N0w|=_;u38P&YV+Xq-?EGP$l8on$WU{=d^p<IDwW`z+y(4-@Fu*
zs)mfRexu|h22|x-gQ`h50V7-5`z?@KjVUTj2y0urE%Yj0Uxw*q{8+<Fa=me8x$WP{
z6xU%o-hKRKPKyCxtF1`Mc|cq*FJS%|q{Hb!m_@SGruWUfSS1UTzFV$sXYU6;jFv}e
zt=PDnMc5BB0QlhmDwpR^E{s+wI_LUtmYhI&JlqNAxSSCYWVGX*G5e?E{V*M0AAeM3
zD8Wif&Y8P>sjeh)ewYsH<@K_DGUk>KV;JXXvVK2QG%f<b@$SQiZw@J5IYl)sTTY<r
z#@RVH)`*)N*JR61!DQj{^Rud+PU5{Y*NWY{;cyqP=jHqqhS^YmT4(C$ysFN}2itzN
zOc`^Ii`CP^I316NPoF+DS%k5!ksKj>`_0z|P6{$wb}5mwf06uvWm;rKzyFKB_YYIN
zu9sKaK#T`6Ofw?d9OV8q)zcEqcOSK*_84FO<HrxG%5lA>=$zLgp|GKqvxc?^8=tS_
zjQ}9v<@u*D98Mp9VaIV*Zi_H;7MA&VkBDxVh{8|5|5wf%$r3BSv=B>53h7n@V7y+`
zyh*C-<<*7Y!^Almj7=rySmFlFe$Wu9)+`iG(m7#GMCP2Tb(oRJmx@-C2pedPZBkge
zM~I;6hY1v{aau~hFuE}L;gDlw?i(1|LN|8}NISUZEGjuA1zj%B<gP>{!t3Q(L35S%
zh_Du82DlK4cpkFv<okGQTG)q1-(>ZvQTJ|j3T3dlQ)V~)w7$uQdK32k#y+pzQN550
zI^i*POg6pEDZJ6o-|BJS2=4Vg?eAVAealM2ZkS%xecFYd-6W!I?Kl7c0^m1t@HYzh
z(jMmjkFj^zkt|ux^~}uO*Ciq{v#NV{@7v)4MF=<o^j4Zs1K~i>6KE_z98iGfnhGLB
zXsXB1L?aH4fCG|y_oXT`Bi35(W~PDpZLNr`%^ncln^{>A>*DTa_W$26964>w5t*7>
zyNm%45An~PRb$Uq+nW;_$_{tHgi>jDDw5Jg#GPZjHQp;F=@?hvS*LqV3f>Ly5qeuc
z>OM&k4*IN$+wX?+_a<)WFMIobRMHA+|Epg7s_7s?25l{kgPj2Mfy!p@Eb5XnbES$8
zjOD7vlf#2u;-lZ$@$0J1xEGxj<vjNCe{ARdk7F<%*^gROUah_K2+Qip1YNR0t(Ch_
z@|OAzyD0aa@x0~YVo%@NNot$-NnsbIx1%5QL4(~NtMf4E9OQjgh<4`gW9Ygb6IQW(
zBJ4>H<-w~xo`!0}hnKt*g_12@z3(XF7kB2)_CkvSw&2fRuU4gVdBv(K!mO((KuU%7
zFE$r<yGQTQliLL=_G+cJj$zwDFqg-bmsV=&GE>ApU!>DC{RNr|HtUeRp}Ma!5m7&I
zPITIH{D;5$Z|zVF0BOCE_v8l<DcN|~8gxc)Q#I83{QO<oZrjzkO=??x(~AQbVmqI&
zZ?D62p3cv4xyJQIF62a{^5$64z#L6n>-^BBDVDCVyaT}b(+@t3=3ZZ~uiBX?#`$SH
zU4&UwxS!IY>+%TE0=;|~U6||?W?#)taOSlbPfws4*Z0g{wsChUmV2_7ouE~9dHuz%
z1Cl==eDaDw4n#PvT4Z3%X}-M7mrrb-jpb&tAXT-Pa!wnOyL|p(e*XUX`#+BJWjsA^
z%Nxh-pa1FqNpXGu@~5;d=TASTwBEk{f{3T*@0p{?ltkE^>~BB+izSDY4TI2m>naH+
zi5t2=&KohH1+bx^@gXA-8Xk#&2t*EW&OXNT{q?INvgkaY=J^ELez^Eg+9fj5Rh!Y0
zM@Ld73bol{GX|p{RDrkIX|V#j0F7xtdyezAuIriw2$$zigt)Hn!s+t-y#iQ8nAUeY
zN87WP;=(cJJSK8zqtF~B0RS3?DU2s8>%%zbv#M%bZz60{t6X6?Z@<&J5u747`452V
zFwGpd>(`&}39jfok}L3QM8w<MuQpIr)wH~$BSh!I;KP)*h11&RAF5%#sEQQdx({O*
zCtL30x}>-sVT2iymjj{1>H`t0w)>A~RbYP~E6K$qqtoRRBCgk0;b>K?{QyTp_9yI+
z&32(o4TR3;HnQ;T>n}i{3O<ZB!W5C|{EUc|w%CTvX(Q*6yrhlO){G^H<LQa~@XLSx
zC-OcFvn|uiF>PzMBCt)SvpfP3-@bmaIpz*d1)vJ!d=A6u{p(Ml62_Uxt;<{IOBNr-
zFr3!qx-K{Gi85h`&QG7o1#?er*H-`t^TkXr)kIHSm>(c+*RM$4!dU7nCL&foB9SSr
zd>D*jQsp6iSJNIywDAg{O0w?VFkim^{oeq<?d=zG9?^5!EcXo^S>wuj-OKwcsHW`(
zXp`wJ#hg$ZhS`N7ZMU42AwoVBo`xFT+xgI<=T(tV6_)oe%(0v~J!XUmwv%2>0JjM@
zxo$?7bw<L;g&}K>RIabTfa-X9s-bVr2Mc%1#V8^oZtIP=)tH5yp<espNjpvLe7snl
z;19f}odI;O`R;4A?sVCo1Q9sfkc$!jF)~X(wt8n<Y&$(2L!4nRss?-@_c~~cTOpz!
zpG4X*Sc>W$3;n29%7N~$T_2`=2xi|8wW`O1oOPkIZIqlR;d)ZR?!sa#SGA~=2?RRB
zgErxI361Uq$NI?C&>(q=iv85E%Z~5)X1PONMrC({(mGzOXB6l?^8L~Zy>p{d*}5TX
zeFzVUKQ*$TWOAY28*BQqtigYAM+WN#&!$hyUmHyaB-kUM4r<8{jm90MtTTXDgI)KU
z^w8?=8fV~l&Asdj-paMG;={mGJv!q!9aq@lF|ePv;i0QhngI9m-Ohcpw-06Vm4)x&
zE+)JeC3Zz@xwCLcQ9ts!YG`|Fmzl3Xto~3DMHCSf5fK#KRYf0^2zLbp-uJWm1*0(o
zYF%}}W-E05`Q3bMKkvdjI!28|z&#Qj+j9Ex;s{+1J=WK1_ocK>un~8N^Y%<OyyD*3
zqi`s@@8}(M`YHWL7!)7FH|j&&zkk>jnsDa}LOg;7^MjA&B`pO^`wfV96cqf&zyI${
zS*EISc^}5pFrPIa)mKT$bU4-mo}WGmr}g%3SZzr$#U+fVFrCtRGjv&wb`u`vClxm6
z^DtlXP)E3g<Lq98m*4zBgyXi_?u{jPLOA(haz5C{D0*j9RgPOX=+CdxFkSpOEw8_t
zcK--HP<3JO!)$6jJBwMipPglz#ub#4LAf0H!TEvXT7^%U<7X1n`GQ0~Oros9wig-w
zC~b=!!?6avI%n$H;*Mxsmi6{lN6MKhYwiN6A+%~dZs)@C{w0^}g*a?#X++HQxVUlJ
zvT#Gh9J|$^W&-8u@{;13)+J1*VLGkX*SK6M3^neA{GcilH)B0lPn^vgnA80934r4I
zF3diR_M6Mu#KgnRjA>{E`-0Qu6B1bvd|Yp$YU9${zQ32um0&g)#(6wl*4z8GT(QH}
z*cY_>Vq)6o-~2IK>4jBN+?KSh84#E@JGxd)x${9%Oxt1(2XjOm7DN%=mUjRg#@Xt;
z6qmTI&gbl#`bMtHHMfNbr}?RG{Q5AG51i9;k_exkzN;p`xZaE&C&Fej0Z>28rX3d*
z5FzKxE`9xy=XRQN(?C^yu6Urx%~gaE(2sL*pb(Ku+gf9oN_gS5$!?r;F1TQi{bq06
z`Q>{=T$gKRBiQXm%u$*-*wTq4<KWvs5s9|jTb;$G^;!@ULoTDy80)=9*M-rzcfaPm
zDi@p&_6}OF$RyL#`9+z{LO|r1Ii(cFaTo>*I`wvooi_?#kuqt#y_fCW)<2I#Vzabt
zPL~|uei#-(hMQaO#LUns=F}}DIz4?Sk~k%E$Jh3Kr@A67umxeZ6q>r_0caRcb&l}<
z<tG=0>HJcZ=MITDZYi#Q7|9Lx#`!QJxwl{bg`5xLbT?j6Xq}kclDvNT$q(cC<p)IA
zTFw+_r<^1sGuX$lHQ(gi^V6pkH$y5~yb+fCqjIW-lFlvHFF&1LzJLDicPZ86JLI^i
z%6feh=4_uRIn0Ozgr;>jf?EAkRZoOwv+>?uZF40loApaFx1_;T0aUm3M$Q?)gq$k@
z?>odA9*;gm*u^CE9d^roE<krFL7-+*Y3|Oxp0GGTBC;I7>e<}iCP8wTSuoP4hm<~f
zvAS2XRHyuDcu%9jB5Gfj>0S9qguEwK10HPQB^I%UOB3wFo(~gKavr2VmbMh3c2=jn
z=H^a_wwNTX5P-c!1i%>n*@CGeei+rWc}tuh0C(9~Du)oFPW#tRlv+LV*x0RvU3Jmx
z7E7&3Wf+5{rqUvw&YD2%EHV8YyFJJCid%}Eb82Qj5kygd<6nJW)SD90`TImrZ1bd&
zW90|nq{v99g3O61L2K~tPokY-@O~V*uNkygf|h6=Y!-40nzsi~s44NZM?)38t8@Wa
zR=$;yr|zeo+NN$~$<IC6AnW1^wCn(iYg{zd$1_x-ZuX`o(L4;TZAM^4@Po5_BU+GV
zSY25h?i2&CtGfFcp*F$uu0+6Y>SdB(5fOV8%><G+7*1Y7rzNjF#lDfN2RQ;}1zc)~
zGNO7Iy{j3UwiAzbLo|aEBHNLp_NcmbPoR<Oxh-;i_4eo$e%zMYUnqDm$-4(YHUW91
z0Cs3VQzY=NMArs1gHBR`RW#6UQyB*4MpSkIx~}P^Oe&Dqd_p57*kcC|%f3A+?g&Q&
zEe!Fh5|<u9UxG;UtNRej?Q=SWYS!eaCOea6oX<9$o-I>Yg|~GnitP-op)e>Q#|;$7
z`TRuMTIjuM?%f$9pp09nJ>}&!-qxELl<YX~eDK4_DN1r??6qNDW-CyanNlYAilRiK
zoYut_moT1)oEcZMKbM>-*$mcf?`QUJnN^&VnX(PQp=CN%W09@qXvcp<t6w=KazxHa
zO2Sc!1JY!2^|eX3)+N+%U(N?3oE>-Unr2c~F<ZMW7pcguj%(2{Uu;nq!b6YRii7F$
zsg|wgj7B11-qxF_VdQF-6X*6{UOslTn*4c+>kLUn5>}sIYo=u?P)XHMOQPXz6+)4e
zXN1t__T@uYeHVIIogMlRz&Y>3Sas6%-LMzfj8M1NpNPB*As0-DE(}(tYa^d23uhOd
z3x0rn91autkYio9MMZ373}MVCYXcxS55r_sYctMU)00_=C=3JGqYGG_(abSFRFJ#J
z+wI-{J+DPc)%<P%B1xI8KIXJ3iwWO34GLi1K4ErY$XA2ed7rUxfJUVNV6~E$qrJ$6
zM9`cg4<d{z)(pt^m{YyW=)78$kdh)w+L%)qPkAXQFG4-~7=_>dxQHOInM#ZM-c?*&
zcEKVPqc`Wn95QpND^i}*JLfcDQPYHBc3#HQS%k?45aARtb4<K773}3wP>2u4DK=pu
z=a8H#Ys%9BJ54gDJh>{itKvT<y8|L@SIU?x)lk97uq4U0-W1mqw_%(S$%SAE@dmRo
zBt=#s5fM@!y6eI~<ScmIJOG@cAS0pV@OoC=jO<@aYU7oco{IG(s7lbSqO!VB#3*_Z
zy99+cEq2b@0M;Dx<D?=<S46Z2xW+S>a9hja-j>JaxByg<6yvsD<9fBsHQ}vFL(r}<
zV2N(cgFzK>-dQK0HsSKHTzk)YYkr`GdqWN$H^r$HruoS<KC|=96t1-*G?h{Yg#?SU
z^23a_5yox&?itBlzy2heiRlF>l+b%WSY-eJ03ZNKL_t*NhU!Tt7dWjYiin&Ks+#*D
z+hVF{LIP?hw5CVzezR~2VI0OekxRJQ7q&d>LfguwX)}ftZ6n#T8+kFnisiG%xFG-w
z*EnMfoygXH09!b0CTwwo8aEV?e6&|dk#)<C)aD_on*YuEs9~JKc#hjr9!hmC03xT=
zo|}q8b753Tk|H_h!@y}1PWNs@Ye3bq43W%3CBpb97#fkr(~~6(^wn5amMg2uFwT+#
zx`g9mk6lSEs2Ucn9vHy=IXau+r0IsxIIYg0f9;10H$a6mxy7FPadytXfB6X!p?DaG
z9GaHLQBxc4KY#gGw!fX6_roZhpkuf|!7UoG;rjLGaXOQKE`3gNp5k)tnb(k)JcmSt
zNZzMyNpW@OX`G+7<xPb-uA+iKh}O<+S-94{F$YoMc`*Pm3zD;C&aj1A|GE?fcPQFz
zdAD8}BH9KcW?^z(m^p6N_2sy!IRQ*Mgy_R$@z>4=azWC@7_HA~@|Lt-wX~|74=PE8
z*|xyEf>7o<0n|tkRgG~o<OLFuI$<{ZJR+JLe>y#J1E^x{cH{>)ZU)yaEefm%+%hJ}
zKdBvTLCVu5f>ItQ6+sn3B68pX%~h=$h8Y0H`642Im{s`p`m6Kp1V-eXAMAG9G5QdC
zs>&Q!fYFh&&smZML`AaIiku=jqDD4y-k1-)L!1g*wbTqrg^@fuFY7hMWf)ID<cE>S
z3rFOXwnY_P$?r690Wb(>A(9_va^CxZ<ZS5^j{9hl1f0@(Q}bepjMGI$48iI{sNJgi
zR@QrJ6fGgn8=)`(VBrs-^R6HyZM8hVT$qz(`<eEN$l0K(sbK0^KBvY@@w5o1ZM(fK
z?_W$-)}s^q6~oofDI%0I+QOa<W>ua}PnypVX0-_9M@!5=M0=6#yA#p2E=0Bsi7E)k
zw5>$0pg&M-x5^t~=g7?`_ZAd@fF#27FuJd6f$9z+*g-1_&aRuo-}kz9wZG=%Ig<rS
z)e+SBX{QDjt1_%^$vWWLAH!;^Y$NT~;ZfIY-W6ggnoltz3QFYbe6=$B`&LO?pi2s2
z*&%S>fxyfRQw7l-bV|Xh&zwup1QOap=R0>t#s{0>$xKoE(RCl=zLRfcsRD|yR8OgP
zAFzO@Tb9IL`m~prXt@^x@@Vee(W22oQK_^MBi@Mt4jTNOs-v{~ii`{^k)ZGD6#7~l
z##ptX2Z3uvI_wd(U08wUBR|I?R%&O@2dSLpc_$>rT*-PLTv4<tVrQGae^ape5fJa}
z_T|ySJMS=n+U+j;hjm&@q?%;IbBmjhG9m;izqUWu_3ro*F<8V_*uQ$ckm+&5u0s$M
z3DVsa+szmDI<-2C&|*l}F7^alqqwjs%GO?DN9%pin)=Z77^)!wO?7+_#pG_P{l6ZX
zL~`s3KCsl(b*9AEib!T4WOFy)M@hEVtGt%^7K#*r&E8s5K0p=AU``FNrHFbl4?YTW
z?^qMo)o+MV>mmxcVoQ<SB<t9@j~lQb$552n9`yn+tX;~-eje-^TG@eP@w`@r7s3wL
z6rH--btwEAcT%NoggcCQ`OE&{@BS9a*?87DFPuuKUVb^#b~E|%(Mpl;RI<NpoG&?Z
zuD7pNj>AFGt0K%MgEoQno=@QlJ}z4gvi+bpr<dNv<<pNy=$v1#Z|n7y{D9;Dq(%eT
zFt&b}aXwGy7yEXcl1SQ?8>lD<Dx?(c(-FCsAOBs7Yg`x217v1S^V4Um#t`uR%b(kf
zAs>R&lny!GtkmNmVm8|pR~6aT8#$_6BHMZ`quGx$Isg9apNPDP!c$zG^XR;A;<P<~
z|A+I-4}bdq{$JrV03bo%zMP(%^QObjhc)If&cl3B+weGvo#R@BkRUqeg91og%~R}r
zARi0@K!gBjwQR2+ODQ_TeWh3%DVbDBy8%h9S4<Q$Up`;oe%`KcwUV={qOW32Tu>O|
zIf`0Ux8;pfnodvI(*ls<W=B!UghsZ010bHBK06=Q+k4%Dhv~#|i`#nOpY#t>7DRMw
zu@wX&Nm9Ce{?ST#0I(iAWZWX|i5nu!Pv8I6<mnlzS1d7{l35YRd34?u=k4~UsunqE
zvZiwKjff6*e$)20)d`=0<JaXqgvpOq$zfWT6qotwGa@lZ5HY)V_B%a&axS=G?1oQP
zJ($#@j~bS^E|t0Jd|2MUY|FK5v8*D)=}Cmsx*$TBF65BNOLYR2RoG_R^W~G?ZSWRE
zW0IDd^#}lNn4ELtd@;6$U52<Vysbv$9Ht8(ru8P0PS4*9vzgyrn8=Z9jjs$)tVjK{
zEq%VGAEq#$<9bV_9hC_f996`RbN<Z=wQkFoj+xDnfEcC|IlsLAdgx(@@V2howul0=
ze){y1LFB5#=}AR8j+!kXo}5c@mAK`inFs*p%jddi$8{;8yGb~OVRplC{rZcFn7gT<
z0}%RTT{viuOYM<ow>w^RjBB!cp<t1X$}B1&4E6r`VX}UVi46_Rv#mGC&oj1JsmSf^
zmvO#KmrwmdWKUhi99BbpMe|s9-J}M+bUBs4A4_MnDQxf9_8}m;%jX|`n124}e?mZ8
z7_HgKxqq9#@pgN!%^}~QHIFvrR=IpUtKCILJ&x_h`^Y?m$GHqmMV$G|^(J*RuO5n4
z?Q1n<{NUDj^y}?~ZuJtN9U*%cZKn^G2S!!QhpDcBuIhxW6~+bwJ2>+ddbUy<NB1IN
zsd9sRmwg}J+#J?LE{wS6Q0=N8vhy|6tiOXpy(i|0)N@md3_n`hAD0BsrQSU>o!q-q
zFuRelSuj4-2oS=~b#W()(kju$j{>U?NgKF}v#g0)MRu$E+{4bso9ikp0&#?voNySd
zHqJsf`OmQ}{SWLp44R=?d+3CAK?=3-ffh4@TJCjYHS}Ncz^<wi4Xk+`dQjkZQY-Cj
zby)g1-S6)*Zt%{WaO@oH?KcOgUy;+-T!|fn19zTlJ$Q4v=d<=e_9CJ~J4#z0#3J;L
zlDd7ZQq&jvm+anqZ4N&0Wi>!#2kpc5Y*M539jRm5TTJRx`t6X*DkkrZ=dBX}caDE-
zdeD2VRpTI3J4gNZJUekYK)V&_ANbZDTGaYap=~{^&Jw*dy6EnYV`aVd&(3b~`9J>W
zzpWSHShsQF6wjZ3K&0jMS5BKBPpTQC)iS=FCm%FL=IDnB0PPs~^!@K8MT;{`(M+1Y
z{br6&pMQ&l%k^D^n*~1C6Rov4o}SFPT)#%HSrI{Gy}eH7=hM^YxGr&9`t8-me)ehG
z6_Lbg8|SC#{ItA%S#R$-yI>DOv(tzDW<-bN<N6+p;(R(k5jp24RpGSlE@&REdnA8*
z`&mVezh#w*^|FWgY?<sxft)M5yJdQ8!s)v|{Ffq0ISTXZFaK)ynp{BgMftL2M}aC4
zk_*%2lZ{$cxCVdM4tsgAfw!9<=BMv}2Y~DC)%eZzrc`6EX*7QG@BV`bb6Q0t;|q$R
zm3*j7#R}cdP(;<ZyiKR)`T6s<T({+Fy&4;IvrT8qWEViwwpxK-H(OPC`u_JwPU5Ed
zAiV2CaFJH;Ul_HMeto6GbTLtb74-MjRs9X7GcxFY7Wg<v7NiGoe*VsdVOtjw-mY&&
zpO*b0#(3nIKL75o$$688lN&j$@4x=5s#aK_aFi6u57``27qyPZn_WXzF{_?lelwn4
zzWnJw3CFmtmg`w9A68rElDE_iVVn`Lq+tLvzrDQ^(QkhD2i~?6Z%B?x_skxZ>HJL2
z$89w!86r-X&;9FQ`Z6Dex^Tw)S|K8aaS~4DMU!E^4CCqj^%ui)=k25jztfh>8XrbC
zjB3Am7;W896=$lSxFNac?|--6-fnNdk_+U6Y%B9-GmBw5lXG!htgr<{=SP*qDej+*
z!{A-a6&|Lu*+}AgOJ&`dp9})<#&P@Z_kSJZdj0Y<Ak0tSrS%rqs|Di`d7Im1wF^<&
zmJ$t*!+bHuVQ%W0P>cMYCXp2Yhq}#b&2hfe70HUrb$PdunDgF<B5}J-r{^%8b86rt
zxj=5T?6XnrGXvr{Uqm=<i->HuH<v|2V*M}$m@l6Ial5@4hf+ms*)eR$fp%t63FDk)
znna4Kx@|Wbz7sjy4u#ndWA1*DOL4QLaVX|@>+z)Z=Elhtv5Zyr_lH_jFqtC8l6;V8
zoS&T!?_d7ZTVU_%V~ER}_A^4*yEPvjoI7IEAy-ZWsH?#Aa01Lz7kro{pOIbP)Cc#2
z!^Udr4gJ^`Z#%Ni!;F-wr><vY?0x^z0j#n2612X2`R&C>DtGm7hao_H<dg3T+<P3{
z0gBxl#_#GI+>yzk|7<nm8yelNQ>f#yp|5>Ws=I2tc-VDU{u+L~r$ZeMs#;ATj}CgO
z$6kXT4{DX2bztn`u^X|=qwC>kjqCP^1_poeA8hDgJsPDCc))B&K_U?Cl<;@8GM1h1
zVaX0%gnfk)=sm2vIi8QtRnMi{10?eJ<bgE=cS$mc$Jy6Dc@%c`jQ(e8s7%YXs|kzc
zcH<o(Tboe7!tTk^*t-h1ZzXgyGu+$6TV?z)Ne=g4`v?KBj}6+}l<PBNGqr4ixN8yU
zF%uN5h3{y`HHUj9AL8Rt+y2|%KTO{SH#{2JA^at7nI1pJU1MY4-l`P!zN=HI+t97I
zM|T$PVhwkK^R~D(Q1^q6t#!uVwu6Q<{R<bS3$*{g{@4G(BvOFj{HV&3vZUCiWjUO0
zxiY8A=O2aBwp>+(<2KHh>HK0e>i&aT+_@i5HJXysYV@OWz}z@RYdwwg6M0_{Wo3@)
z92#m!)jS3!F*ikAKEV}P<2aqi%d;|zYP`M2?bb6$OPp1x!;&15=bVjyO<y1!h56-&
zKb8POS>L}xR=8QBw<-W{YqrNKJbm}uetk-Di|fsn92Hh(%u$O;MX5VLwLI7?tz_Y3
z&&71Hv&_%!U3E6Kh71++9?@}JtwsbyF-NL>FXwX#IXWT|Lus2(I|M{xW^yhJld5jF
zH=9fpsaNp;WQh}S+MEyb(`WnJ)3$84SNkJYBGji%RnMP(5J_=eY#njVlM6ZCvg?6Z
zan|=9$a$#k`!X@jaSO~Ue0up!5kzQQul8^X*Q?Q+E+8&f7lzZ*XH~s^{Tc5dx5al4
z$GKs_YL^pq6MD=~pPdg#K{(#tel4hR6W@Czr<_DmQKctk`TV>8LL^DrRApNik;L29
zw_)w3R5=Eb^TVVn%iEV>J{wEgWc{G9ynj&<gMee}!Dhc^2^KGIlav5tTW;n~QB`Ik
zr1Q&Xjxoj6htY*0?>hMrHT7()=PvT$&dyV0NG@2R(|4$ZQ;Mr|fy&@#oG(a-=n-*w
z|Dw4DszlGMbhT@e;#PO@ZF#TVcqBrg%mxz4>VeK+=f}BmDvI4mI0;9afA3)$qb&k`
zn=&Vx`%vrqVVaQ~$4!K{+Z7OenCu|vhtUrs$7t8KZl<@_pKbL;=PsXqNO9w|ag0WN
z1Ek&`Rb~CPZR3Z@2pDBkq<SDKK6lIE${)kpwsxkmn%)f)5n0#Aj8BHf=92B#-^y)W
zgwuR}(H2RPC*!KwmM+Zm`MG2PWnHizCICojGuT4)&Swd$YTRyx0#R>~w3&)YRfY3(
z(8$+D?Z_(VG3ODILvo<3B1T!k90>79oKz?T#;&Uyui2KMM7*gACniTk&ZL+oxV4LB
zmLqK^M^oBs7rmu=jA+R-s5}vEva7uoZkH~t_o710<PN->;vA0(HHt;Mpy{?2?C?BY
z*{b)={T^LbbGoI?W{8{tnF<R^RTapXwg{cjR1ZM1KEXuuV(N0LY8@Tv&Kr85nX3W<
zArbkC^9Mu+zMDyCw%B2js%D{YW=a)KF1AzizGm%+pdum;1;E`6bn`K;Mm;peSAOnM
z6+pxsoh7H#)xXGQTD?tY_ciZo5#4#TQA-r9fi8;_(B^2Jp0-sIt#Q!os(Tdbo$nq#
zQo8nDk$qejm4V#Dvo_k6Ux+X{O)yXB4(~v_DXpL}S+9zqrG_CPdb6~3C*vw0Yn%k!
ziH8v|fk2MS=_~bW;@*b@nf<?n>;OE9hTn}6sh@{8z-%YTQdLDlqlsGTuemF`4i1(D
zx*zkP%{#P=>Xn&DEjl!_zB-F4h%}KfDsa7``SaXWUi(R8FP!KW93<zQPutpmBdFjB
z@=B~q`*UqKq$MIE>9(I^Q$!D9Y%Fs9uCP9U<*>*mq(Zl;ZwWL)0oHgjX+4acDjQT;
zaz2Lc^OMVcEF$ECsuhW9uoPzSVHX{xmQRQK#fI){SUfZ^I>w$B?RvqsWYCX8EYs-w
zx=>rpUyp6v2|Do6cF?v7Z<gUI@gnEP;VHY;h!9=cZYl~y1U_zSb}1krqNt>}bSE_w
zN&PUheM;M1B$i=h2;&sjn*~TpUN{W+3&IS=!K%WLKsbfzRE_y2(R7%-+oBTJTekT(
z<2>%)_RJqc08xQP0#TPK!+>JiC$W@vsSq4iffR<>g;2^GR+VkN^{ZQH`e*kH6p>gN
zq;367+_oYgMn6nxz187diW`eq^x)z2lTjlo%H@7>)C@PzZ<JLPnGQv?2}|0-I0KRo
z10rq9dwDI*!-NL0Gul}-y_lzKzPuok8Hbspm917W`!LcpZ_CXh)<AVzuPUtBWo+kn
zv<){56M1h}BXTN-R;XPELpK<#APf@?=IYV3E-Y+kTf3@ZoSQ-<C)*WclXCztUtRzp
zF7M@aBGW@wAG06Edd}UJYuD+m#ZCUZRCPQ*S(PlDhS|g2_8`n4>|F3Z*vQr)Df#vG
zmX*V0l-n6e!M+Hz7_3z-vq{wuW$X1VgAs&P#XNHxTx+%Je5m=F*%(@FP^t>xT(H3m
zB3b=yHH6{8$__*o42D3QTE4k??M?VsmsE5P0huExxDcQa^^mAI#u!pAE^e=YgnpQj
zTwIqfbjkH4T@L>uZ|{{_+H>jm<osUOU|N9ChDIVpq@Wx(%>b|*WoNXF8f;_>w2=iZ
zcqqliIz4p-whN00X<M11Ej8p^LtB8EFcS+)rX1uiGM%5zObh_)^);(!Rgs(pJUQ=+
zs}hWOSNju|Q%2;3oMFH$c{r<xQ>-U9-d3Xo*aK;6h{fj`^{^gBbLdhb=44BLsqLH#
z2o#2~L@U?r-x0G2t2o5kPKYYv!yuAHn|9?*Iu4~L#Br^SiUOa@!C2%59|n8)(RoMS
zn{?R}q-pJ#W)57jPDxgeTiYOqf@NL@SoofaOU)Z2lHz6;Emw{yu60l0xH88SH#?SD
zapL_@G9ShF0co6~4};~i1As9$Uw^uq85tezk$|KHr`bl+(xZ3!Z9l87?V$|QJWOZP
zO>l|;o1MsPIZn_aJw;eVRp#?E5-rzv<#d>Ys}?;4fOVYmMsoL0CIseO**u0JTU+z*
zxoKz0E?s_BVVq7rjMhLi7es>q?5FW&psuT}Ewh}qs&UYQZlQ4=#!0L%glMWFNRga_
zhm0|#^6{VwPv*-f`yUZ;7$+&#V6quLvn@u&WO}PDcXEbr-<<Qqd=cJ+nd}8)vDaJd
z`6_gkauQcRpNILJw$;uIpc<EJ&jL{3d_uRByK!dbjKGkbAczGxXB^tR_sr*UKG!G%
zNYObb01OE+$ET?ZkSk@a2uIb7ESb*F9JlN1FNJuB-LybKGz=q>vo_uG{uMEwVC*ob
zjferN5~dRoE!Q_rX_!tmKY8~}g)O45p2h%RyS?>4RJ`G=oYyHo&WL1A_Ovb{qL!QC
zyfClbA6Jp-hfn5+-~?ddi>1@9BEs=7=r!aGWz0&L&M&I^{^id|WU$3McA9H=w!FDU
z0+&reY@%5v@PH^Ws<0czBFj?iJJpRsI7zk#;CM>pd|Gc{>9>fE+-?-diJ9$ulcLxt
z1XLN4QB0j_@$&Hw>tV=pOx2vyv9z6Q1H*Yqk(o2Pg&YEMyrJ_xoD?)}iyabj7f-UB
zN&(WgLRTH4DyIyDG7mr|VK$ec&X*VFv|is-WPN`v3^r%79U>RP0Ej6@08KVXDzu6c
zxb4V!7Y64%$2Id=h<IBdGhZ~tEzsn`V5cjSjrr4rgxhizPPS(hlZ$~#U7K@pTLuZq
z52G+wO9MGV@=A=HR0M@g(adpUPR<2I22;c^3q;$+ozJ-_Wg~DUq0i!CG^IF9j(ku~
z%3=`^eweUyeb(DsvHhWQjmc02KIUC9(P`(@qA;G)ws6|aASle5(s&BhM#;D6oF^O<
zG{%Kf+?H$KQ3x+Tl;bJ-#)AN`xDYO%067Vewn!^=F4W$jaVD#~pm-IjqjYL>MK|6(
z0uZQnzHiV&yW&Bs3Pl9V?46u%?)77Qc^1pogaiZXSTCvSclSC^z^?6pSR?56KtKD;
z1-IR$EmNgKJv5foW?JKDt0Iv3!tLPMnF;hT{NK&E$yrCcZ<uHSeB^MV(io6TLCh^m
z6_RQPY110b{&cqU*RIE9F4|lTpaTNn&ham~tJ5%{y=h(BAiLJkot1bWELSmIS@FM9
zrc{=0LDx3ROTX3C(~s_Hh=<0EsFE2Fdyd4;nn7so0s$2+JxFNRwsysf*vd9!?Ili+
zT8q05orra7@>79$r-|>}KAeDDEde{ZY1i$++8;9;rePeMG2XO)0kM;|_dTQ|9ya&h
z$$9HNXzfMk#(;cayu#+w&!-k@sTxgxm6J=$$*HAq^j&n_HIoarLU&^YYrVGEf#!my
z`cPFZHxOZ_5bV2hEdZr+v+Vls*o%s~CDn%6k^#2G*WcVzmQJGxcW$ENYS%4{8KH@X
zRwEw#7Wqiu_#1nPR8G6hv^?#`M!A5~{x{dih_WqUy^Ouh+hsXXb;|Glc<&WK=R9Jc
z+Ljj}MYMOhEaOn|F<oo3trEpAMCHE=?E0YUQMGEUwrHyXscyF|>awS-{NMlE|JXml
z>-FvW<<EImX^D%3RkrY(zxuB@ZQJb?0Q@+|<+{9oG3mj4c^Rg&y>iztKXFc?Xw)?F
z9w`tJI%g{fHf2o}-&28pv82u3%+_p#3@QHZ_kW$zX6LWoZ?2rk59l0kYbitJH-GgX
zIIcFXw-9Oz0j~|Er_VoDG4!@v%hbJviRa-^#v*8ekqVM`-p`j$s`C2Nzx0R-^5KA-
z=5294n;e$+FZMen#nKYoWo^1)hHT7eFUoZJG+jR5-hSS0@3!x{FaQ#m(8e&TqQ-+4
zPRwizwUu<uBcT%4n~99b9M&dp@xj#0U58*ZIRQHN^!c~jcH3^(3PsCuXUlwVp1CsT
zQ<fBc82vED^_I5P4I=<5CslF71VxR_oD47E$2km><-;wv_v)AL@^6*5Wth(6`6*i>
z`@tW11md)a@Opjwz@&<HqlKeN)^pjrVeuURFrF^s=_xL^7*`voyD(%US8fKXijwmb
z1~H9;s;Y+hVwq}4w7h?<H?%{SNd>`Jq{GwaAN?@eQ<rQ=Q7+wq;etr#=kMJxynp$*
zDLz2WeQ$gN3&F74Z4H?7=N~yP@4x=pa!b4){5Z7<w@EE_$Cv!rONxG)$N9<mF$~lD
zuYbC||60`l4w07YE0HrLUHxi$XWUFFDzgcxQf6R!Gr;t}ZCkFY8pg>!f3>uQ=|Yr=
zoxH7(!_Wsr^23Paw%a>7=fh+%Ce}w4ZW66wIvHNh_<nhUpVH6&{7*iN1|#JZ{Wy6)
zn%B#k=LgD%siML-4dc8n*SIdFid|JCtv4Tr)64g&dVT%XhoS!F-H_3)d3n<Ml9!E9
zY=IRYOFCT`!*r4qIVH2zKcuK1DL4gq5|^9WAW4!R=F&-`>GI6mYRdws&X-Ta>GJy1
zKbzY@Rh%CRE#EzT|GVw>zFc1o@iCoV!hE{D{-VO`@-Cdl>B;mdNHm?E<91uGZ~3js
zkLaoj-UlT5_2)mkn)|34hB1t%wu+K7e~1eM09rdYrBr5liPKufA6$CuNA?*Kjpt{M
zTPA3VkZb#*HJSbXAW%{g+8q0lR$TWarc4CFZwL>%QF~6eI>ylNkWyIlsJe<1AM$$+
zVfOoU?7c!lcc-Mi*P=Q|4@r2~PKaQ_LVm2C$8UMIp)+}^-e*|fM<MP_zVML4-b@ai
z0HIopO@7h=^y*aoFm2XK5yJ`_>xTRl!-ac0PSc&&*#I7F>8+W7JHfpkrBf;jq>UM0
zT+&)d_B+9IPwMYvGM(_^Tgvbn8s1&@UMS!9?WDKi;9lUa6_ub50<iITx%N`6LvgmV
zk!vp^$ayi;%s|Z;quN5P|AG>}bmMbS#$yQ^G$E1{;c#!fdGM4!vS*3uJRiK8)kFci
zOo{gB0v=No+IoOh3Z9?UW-P!e_4v?UqV0B-N?_+-siubxa{v!s!>*FRW{}#)3U&#7
z`^Vw%Mt@`^zrW79ZxHPL9(T$S)!qRw?VTvyyp~0}Gb*+3tq-IqdK8lNMO*G}HG1PN
z(o(D4UU%$(M>5H7*~DGTqb@<aQPIwL@fh@h*oSl$RtbVtUv>5W-~Xro#)s+Y`#-44
z*Ps5gMOo&<+I~YuB-5tbQ0o2Hf9)ge?ZlLSc$ko=WXqw=DoyHb{|kBV$gS5`tyCVQ
ze9pBJfe6Ws^Th_1s%EGZj$6$i=>BR)WFg(ddV7!SGK>@C{5IX*zgQ<NcXz|!!{o!@
z!?@nw(t4vXnAusG$IDAmqPDqX4*{4ipD~+EqYE?CyeFiR=q;)S^~YhpSj?L;yK$~&
zG>IEEya3wCu0Kszoi~!ZeEMNqubWj!%FYkyeD9*|^sD5@N%H`?JsEb!JiYwJh2i$~
z=lY6pisT$pEvC!uE|%NEH`wg|hUq+>p1N~x{%1Nr87;StNlKX>ENjgwfYZ|_L|krf
z!p!Tf2Bf|G@K?f7C8fBfo}D^I001BWNkl<ZxTUyo%z>2cW85JTrt_!i{K<H`*0kJ~
z_fiL_>_1`89fqD5UcaEt$qFCRXb<z#cW=M^OVu&)wwU$-5q%g$*u)WlXehh>)5hDI
zAI9^iAF7LE_fDEV+cGFj)I(L$vRiSizRaAka;mX}0dnrskAJnT*X?#K#DJ=)(<0XJ
zK8%;ozb(;~i0GE<m-YG;9;XuvN8_=*2q%uQoO0Udve^3J^juSGsz-j9FXQPF*ISBP
zTHaM53?mY$MG$Pu{oZQ<qU-flGtEGcLwyxfrqBU2uL=k$#=575`2yKu6r2y}92QH=
zZf6t*K<5Wl7UuFgbcZAx+U?BJY_FB=Z$6C9`=S&(oO@_IT}&NQppU^yNdPM!d6+Jl
zwpgdRRuQIcIGu-ae*NiRN=|ClW1E1e;xcUXsFEZlH%z-L=KVBZtVcDTF4N^@y}qv3
zH*;|e<7^&zPVv(Ze@t<`e*IYitT1(9;1o-38hiFtHq;lwnIFetJQ*a<5MWQ=|DMR(
z{N~qx{ZCm`WjUsMM}OTxoikBAx9iL)jPo!*rMPljE6NU3Z|`3?#naR0KJ~CR3v2j^
zu?XUFmBXy6G1x{wjApi7uU|{NhWf7UT@|s_2B5n$6ZSwOZDXE}GS%i5sz<mH=+OrL
zFvS}mvwO-y@XaIey-7nem%Gf~aze4Tlyhl@<0>O*Zd`<WCwDtLccpFhrh%GZa+j*r
zF+@84bj@y-k_y%z3AK@c>aS5erg1$u*zZYcyPdMfPt^l*iN3?0kaR!sq=!J=-J$;e
zB-@Wj_i~P$5`M7gYS;E}WMbVvHF)4wA7Iw~o^f}59-*Hf3}frVjNRx69<v7b2I}rW
zdK_Kf4}~6m!jGTm{`oAPqP;x^@5I`7fbTmFa0jQLBU!7N?RM59Z3sZ<Jm%&0^*QC)
zaY5~D-)IbQSDWHT-y1*3*uxzT0JV!U$HtDYZ<PV6b@vK&W-IL=a62$|hy3gQyBbvT
zW?Gs%3g37b4qrjF4dFg&Z}tHCF8^}}rug8ADK|`dzQhp&a#uz5K8*VYU*@5g8oGP5
zZHy~_!Qy}DRqS?({R|Z!tu8yi$G#`=t>8wyYh~;W_5bJJ|3@rf&$QiYV||#;al54$
zGgha_3OYJ)s<DO2Y{#o%zL>ntjt}Hq7-vvemn#ujxhYo9m1)hf_yDxv469>IK`zYa
zPd^}0TzBc%_Ilc2plJ+r*9+`hkvX&-a6COtr)QC<!YL(HiMMwX$JX(<>rSIc&gwSj
z$8MLz{4p#tt@Pr@(`8$iJnB$$bm%SuCRZM5n9sv>+BNwA5b*Z)CHKCJ!VG9*RB}$U
zblbNTY(I>&zf#IsNmb7;-yza^edAm=6xFC7x&%%@bU>(?QG2*40IKB8BQGj!8q1!Y
zn3k&v?jeVuIdaZy!r65$2^1{nEa%LXfI4&jj`PznUqq5-#=LH~S5DD|v7SaPaKrrC
z!|7t*@%H+Qh*15_2#&mkT=uw%Z0_vpHcN!bgBGJ<6|#X{Bzqu@`fbS`X<M{A+EAXR
z_v?}Q`ri?qO+-%5-^Jy+TwnX{ne&60-wi7E4RSvsnmqto=zPYzzx?Kp3X0&?+t>B_
zH7A920)nhnZig5IfMGfh(?vC@iUAOS93o!7{JDnGHB~|r@1W(;&zDc+gDac|b0yi^
z!6|Wy#-`{kw&h*M%5m)8O3|$Q)wr!DZ6xQ1>1=1yzMd#wP&#-J)dPX3P%izCpwlc;
z>#Bsq_F>Jf{s+Q1i;ARFj7H6R7{-(HgZ<TUeV6<a<%<!<S%h=wDJPrf+1xQdhn#Xk
zJ%S%5EAon6tvbQmJBUOUHo3lk-DlV6?p1Be9Gj3Kr+E0_!kD(3)%u7yo}Zix%k>pZ
zrjFqJ2+Bo6mj}1~e#$ZShiMnaFrKPBRZ_Cl*kL+5=ik5nT<Im_`8mZkbprbiftl%a
z`y6Sii7`D2z>GG-e69#dFy`Da#C1vAQo_K$39&A_ZJ1^s#<e5?0BDZUDiIqEA7Pf>
z<J1qEJ{wy{9~BX#1y=&^UgHA`d1qyPI9VeCuEt1Kw&m%;rrv+K&H;@dwdd>k*CM&i
ze~!pj?Uo}=g-B_ES@&W0qKbWaRKAUrPI!h4SOVwcLIklxLeqhjP~u&xJ|w#;yWgX@
z1C2d6ETh)To+C6%)^0m3+zDv)TPL}kGu3G(`%9n})SNqzeIcTyI5UT$BWL{+0Ld;u
zVa;bLMRexu5)jlKg)Yy-6yfdwm@{H5@wIr&ABYGZVb$>Au^rJuF!Gq72#W!`(cp(i
z&N2r_i`^-r(0ex31M1)h1!rlo=-o?>NQl-0+!ck`RWowu`pA(QiWS~nX-8Q343C5t
z2pR3zJm84ryr7l%si62|-#$@oL;^a@-m0Fk%SqP{p^pzQyH>TV?$?I)62OBPDZG;~
z=s~)xt(sTp{K#fi%rBQ}#X<B{mmOVl2Tv8irl(jS{?hacB0zwaoAs?CO8e;gj|wg6
znvJSV5UN_TMAs2HXSABm(hmF90)DI820bG@gXtAJ!Z>!%=QqUD$4N65bcz%-J@#jn
zBOK0*F^G>gg>USGeBVU#W;Y4rWJeD>%cQu$^(_bPKxGe>hea3=hw*F&4x=%}^~#(i
zr6#QgP}LM;5g9@eHy-HY?OzP`YA2@B&z(3$=GbG^4h&fp1z@cV1+C{qR?*Y*cb3d)
zvnzA|aN5@E*B<X=zd08)Wev?daVh1g^8f^R92z6y{PexamdJ$^H%YOYaPu;j1&~tD
zGG&5zyMN)$t82E)D!#o7PWz}ooWsLJ*oV<Xbfp`-Ya`U_+*YVP;=f&Ivv}HZ)!d@0
z1{Evfni^1^7h(|xPUdyN&W@4;;)U~4f*8W2l9(eBrFfGR&9ZGn_DtH#UtjyM5ddV4
zlF~4qYR870t2W_bnhzFFlPg<VdVvdToupcI;)lr(V@jK(JhI}rl_Y0lXMk~}ups<x
z^)3$&fb!|-J5lCs1;p+4p5oRHH#>`Mc1@WKQUT14X}Pjl%v@98$(f+q4yuN07iN*D
zs(zSk$IXBnL*<E(bAFtm_#@3awk>a_QEWk4HPNo9g6)TEIv^sMMLKOOr|5Rbz|GqG
z9HVgZVF+&CZtpwQ6}BN{Z~wPV!3tUD2g+Gp&PdH+oQzyp@H7pSlYzQKpnwilRg*dV
zq<ZjG#fW<Otrsr1A6;+nCLM&rIYac4Gfe>i(t0z;1%Sr&n!A{pAHAvyCbIcx&hRT2
zF4XiKXEdaNoExUIRh+daXSlK)$DSSNT*cT34WtLGk+0Q*QMG$Ef2km`dc-H^cRRjF
zT5oE&0CHx*OmRcJOXbWQl43*b?AixJN!DE}Ac84f%^JvYvu7hu@0#vUGrmAXHP2<u
zLuuJqhmze+OZ_%sAEq<1*Y6gYBc~0+h(Q0AlM{l=0cFAp>cfawXkLDp?9y`FOw(Vr
z`_}oP{6X_RMC69)l$TL*L|)Ps?e#;f&y$Ll@cM@NNB2<yYZiqJXaE2|Ow;)#ZVPi<
z-@arO@4kakj=cK=EZJ1wfFKtG5UB79U+toEiYadPSaaOE%wE@T&E!1!A#FE_3;E#z
z(q6%m3g)NpM50a9Q{4C%caRq*^JpS~_roxs<9aI_;cizeo?_`Q-C^|hv0yqQRFs)U
zAI8}v^7?>^lA3d_k?MAC@p?YAhL4Jn?Sqoc+;*rt`=CB!2G-Pj`*3Mnq->C*4<?CX
zi7rLql(r>pt3^m!^MsrS6@)w4umYfYsh88!r@oUT%-gyk;OXh*u71Mx_HJZZl_cUj
zMFiVw?z|u8Gc1_YB0F+(*!l!S4i!Whv3Q5`v!`H0JyjK%pT6U?-uP!#U2E)F12$3V
z7TB7SoC`jTs=D&m40G_{$bm>b;1fAOLW+pw!cf-^TS|=9VO~;D=>j)=7*7VJ6k&i(
zIBlFbZjv_g9!lU;dj_&&Rf_}^5gj^bum#h+NSN-QJyTt|`8>?$xZJ9RyFbJ2bQ8PI
zBzPKH89@$-hWTvARx@IoPN%0f_gid1@+A+G;R}Ql`JvPe#IRcWrU<9FIPnIc$y+bl
z5xgCY$ay~x#@VRB5#)S|8<pltid+9?VL`9i4o!eS&Z*kWC~h~+n=zUBo#O_GuJBQn
z93dG5AjQ=jp;7{WpvPe&f)d^>hSo^M!%ZoRxoxzTvAS2;<W?3`yntC(J1yklUf2Gl
zDaEXtn&PU=VLoR#;=!IvE;n`ZV(*>z*yorUaB3G;1?`g)ZSP+*nIWHq#I$>dli6R`
z2hE;mVTy<b_whM#t#eZ!meo$^no*?L1J_PZD8LGjk)hvq81(Xuh8XXT@V29<$UP1p
z57}H@0zmDpqf)kVgSpG;zCG2Nx4p3ed;csEc@se1yCdxAs^xR$Blewr!t#lzY}|RM
z{(<uc$$<(gSuI&;`nro*uOf~*!$&}LfM#(eMX^0`H@!cGSCsE(IVP%DfWHT!P=OF?
zqdVsoZbmEc5rx0AMOPse5}`Wh1C~yv3WG>jJ;079sX)$wDheJ$9i^!J3#7Z$=rv4=
zdxuHkt84Er-yylNlW5=dQTGY*2uB6{?!t;BF^6?c;YQsBlT>3b?s2}>)W!THYcr?U
z@ItW-7!~)or_)pc?Wme&S3kl95Q=TLQFYoNK>G{Qt-jb>JMJ~T<qX8yNy)nR3#&-8
zGVwp|2wV7u3AM0A3KUH1eZQ{8YjoBW?UEsyma4aEG`mBmAZ?kNaHl&}v1U#E&pvov
zq{!c-Sz<Cjp}w%9n%zwwrl43wS=qV0y2qp%crY7ac@d6`T<q30MeWxCEnU+?yA_dK
zk0q&!f!)6son3B?6ue)haO87glczLafBv|4r}F|9)}~xKG9NlsV}4^?^=-GAu~}^4
zuGws}ydJ@-qDuIW|I2^h`w08dwCP{YpMI!y(t3MGBGbypUCtl$cg6Nd@*$h1O={8Q
z5$=|ZwB^7;AI8&@s>a(J>>_OuKrQL8KVR6#XmNTfDl(m(!gNa8s;U-Y7`Fw9ybHE)
zs~PIm;^@MDZ!4#axFO<jdh&iK?oKqNe*Q5R5J-5n-mj``xA!JvD<_(2a!}PzKm4&S
zVb`y}n2e$&dUsbtm_PsiZ&X+%s_Jrm3&ZHcxUDyH!g5OE>B-Lcs<7Q&4Zx4+=BLlb
zkLPX8Y0ldC=up6YO%X7R!*oU>B)`0W-Ill0(`O>GqWt>x=k~NYcYnCzZAFC3r{B6^
zx_<q0Ef;bhSfn;R>Yp(o_@^KLJ;&|#_H&!RmRDEAC|xUvY|E9?_Pf9NuT$Li9(int
z3QlH#vH#T=l7_}NXgH!9#wkpv<?YLMd$$+KS_@$q#UOvGhJZlwVI0FauWw)1<-I@K
zg>jau*~xyPEE1{1{}ybC=zKUmeKu3Mq?F?NP;ILKyxp81=BLjH5K~lUPMftx`}huf
zt(Nz%mfz-_fBxYQ9Jjcw*%cl}=e^x%i;=U>CL%<1`TScO$C|h!J2gcSVLUxK=Kzp7
znW?EJ0F?87Kq5PIn~1-*aQbpVm{n2>6GjXrbFSKWhUsiMdE~rvjydJ4s=Ka?RZd|#
z7l}>qKG<LR`t#0RaInEtiF{g@ls1!4?RyohcDtP?AL<lCRjq-^X;Tp+nPu2;d6jC7
zC7h=73m}?lCk!o3#fMQFawTsWVVLRxeOs<o%2P9Ta#<4w%OOFcaegA_*X!3>Mq4*n
zREO~t##3D1Ypal)N2KNb*Q$^>`a7+EyE_gkIX}!#^`2(Sgld@1ew>%rUn;%J4O6|s
zE=(#(QuO0&4JS^C<I=!hszgMYzSi;5@^8+*eo32jik{jGb3Rx|<j%imx4X+RuU~B#
z=V3nGUcaoj*ZJu?L|oo}O>sNF{6;u!>$N{>^v_0LiTMYScrA*0pThlt@e>h0vM=ae
zI0HUlGGU*GjD7LgcJC}k>GkpVz133DYK<naZdSH7bQ*BuJ6Cqvw<fuJmu%fFJ4w0r
z6~aLyaCc>P^~eWBvetNyPI0bXoQCdQu-X#m?rzXdTYT@m?fosfb5I}jFb^)2*~`lD
zt<jYl?Md%A0Ge~#`;&0XmTTI^o$&ozwt^Dx-eiJ30t-950PfSwKN_v;V;Q?1A_1F_
zs%tLQl2nL7pV$5^8B&eYe)N(bpU5n=$i9;nr-^s+`!3QX|Nju+Ljgnw9NRwuosV!|
zEShpApY1vcXw6SnDM|OJozC;2@4YFoc0W=pHfgYhQbj4~F0dXSr246fs>4U95AC)3
zxwvVmh}}mjrScKaL3b})Q5_Yb7IqE}Q_pokvOCF7?*{3;MmybZedrpCu8RXLH|Rn8
zM;pAi`z}XG(YHlOe>pX_4{gQcp7LND+l9&IqikIu>x%Rtce8s)<$ej$-mY`ldh8{w
z@dJQ>|L}Kz>-=zf{?3X#bF`F5sw5)3EdWY>K%^Z1t(tw%l2p>R-r~9_C+1|5iZbCF
zt+xpxn?;sCeNJ(;IV~dE+4HXTgycj2g@^eR!ia7F)%RcjHLkapAOEN#oRTWv-oDlx
zkUIMA#nZekewfameo%$w?H4hKRObJgyv5f7v>kj9O(9K0_ED&&OJ_{8#?4~lBa-{{
z<G)YalHzjjH@EMW)+?f;e5%ErF*au_dsF`-((?981#q}9TKU_`M?~Hh06f2Z=lrl-
zUk#gNMM?jg`@+=u0f@NM=2Rj3Fiv5dg_(s@AxGP>u5Mu5k%%prVwlfqGwOd-+3CJg
z+;XobWAa5(dimjxxvWHd{pC;21rxJyip+_(Rl1X-Eh(4JKZbF7{rOK7nd8I2!jh7~
zu5yX+>z}mPCw4xZFdCVG<C5aq%lFIiaL9Dv4qE2?V1^A*=})767?pWjuK?iuNREiS
zRcx8qB8-Tq=kHt?miO13@P~AI{=6;Mj>Sy(Va2LqbD$E^%}Bnhv{IGVe*W!WDGPH_
zmF4<cv}}lvxAv|{ud>@GtX|A+q6;~1nQ&Pu5;ql*w2h~y@$^(>W!dB)Z0z!3e!|uf
zOwI-K<f!ay#Lfo`a98Eq>n|*c*Tt6g+$1;qj`N6U;<YlDmFe_6KYd@G$z&H90CFd0
zdAHz90CdAxuzaE-!*uq;WNo3$2@8X*8+Nc$VM!ag;Cx8i!f|s}w{<tA&m=hf<MQ;8
zss$*mi<Mqh)^Lhag3L@gVwvpQ?TrdQ!EP?cZQHhOTTYjkaXOg_CKH33^8`wrO=QAd
z=MbH60?4%MgBOrvjN8?R$q%E^DlVUXB%-+8tcqoh%lqs7rpIX$j$xQ<b1N=a=fiY<
z27ucAYV~o7Pv8HR$fXoPVZFUo`^5b8*^VrxhcG8q>3&6{EgAtFRM+L|eDK-VAK~Bp
zkE(`YbYWO;?_hG=Zs$g%VLqj8sR^tW$+_LG_1xyabx^%OHuo;$$6oI4k9;T>$2($M
zKI}Y7GcN&^y8%@_qdbhDr=AI<jki%LKS$eUUGCc%e@C{?%~&lyHlx>mOZk2<bSvP|
z2ELz9RLQa$FP8Q<a$m|k1Uk3&J$`W9K9uJ5xZ0OfA0W!~&Tm_J2)Q78RI7;=rTCH3
zbO;N@u9~hO@Opmi=>&CD32peJc31c8x;;an`?FTW6v<q7vd%+}Ix&*sDcaA3^&!LW
z*g7~Kz7=*8m&e84zxAEh{o@T4+4WKB{0K+cUFU}7Yf!BHt%Up8_#+j3{ifPG<Z<7>
zz;1+qyB1V`hTZA-+cw`O$8`?3qbeSq`415rdU!8d2k9^A?z<JNRWMyypK%|R?*M(M
z>Ta@iEC;d7z7ALCuxPZ_Q*LsUb#1q3<DsIgfW0nDRr~j%Edbrq)g>M7o+X8yLkEx7
zT8~S=HdD@hE%%{G<3R`OTM`&cQLLYRryjxbP%7a4f^FaEAOHS8c9L$JtR-~L_|%-@
z)92r1C%f==d#yLg53?OjtdJ;bqX>ZW<%N8(AbYb?q6^kE$TTk(kf<c<`fRza`2xj)
zoh!m=_QPaa_PAb|+4+_}(d;-<3MSRjvXzDFTdk7)JpFyLk%ovM;OY6Z(X)hky}bj#
zIG<FkrZu5?w#}BuK|lTQM^4dx7|9VKVjk**aq?l@mYaqBBGK*b3l_ao6;%$?d6>^B
zZk%G;ZZ=p&Bu*Qm^I-r0&Uq_&j4_>_!Z@$XwKj-2MMAPecU-Q{4=xO*+A=Uzsui$;
zN^&ktmuCf7-d{_u%@oFYy}p@SyoiJ!4`8zN5kRd^aKGNDrfnIf(|CH4oV2wuCo1A>
z8>iPdTx!sSr4BnsL>yyH`H(K}cRIh==sE{p3zwz^PM4SbU_eHfrFAhSy%l-6xs)fz
zt4KOszH1h}>Vh?wh}uBzi`8m{*@(v9GQ^s&Sm1Tq*34<MIQuZH*Eb^P!=Ruk=BULI
zh|DcvphSvi^n_6+L|B-}ks~hQh&k6#Op+%S!*+W9&g$fCy~g#r7jQ-u$?XI`<f&Vh
zIU9G_RZE{GQFC0JALi%pL3O!)&BO!qEp+Rw!45IoHS;{r`QXBsb;Zur*|3>M?PZsg
zv>uOaTFGg?yoBk@MJQkoPtLyu6^lruT<(n1$q%CoQx6uA6tAy8TYWFWl2QfgX17TW
z0u*ynaY_|RE|My~^guxEl=>>7<9wbjpH)(Ji3qRPS5P4rpokt#j-UMii1*dG4ga!$
zJVihV<7{@dbzPTbIh{_!Fqp<QOf!+Yz5Y_~pmn5b9$`O9G6ZI}5vJ7kZeiyGIq!$b
z`N5J7%dm;DtQ(w?O%Z(<eVF2QO>v!0FMw!?v&JkGVRKS(T({+BD};qQW$jzfFi{1>
zaXwplr>b{*TlOX)Ip+f)2CI?_LCqFk$x&b7+xy}$%|48Mz(BtuMH@m_e6$H0K{4-E
z-uFiGykV%IQnjd~bJ<|jn&_YaB22j^YZ8Wxp~^WDt%Xg+wqGg)t-`U|^@4h~Ju0bc
zf=h{6k$&WGEG}CkKFb<03uo?K)P>$=YR0U}C9UZ^IkT{sUbPE7H=t<sN~^E}p`+Tt
zAfiT4dT<N1%x{XwZFgA9!!GSi$E90>6`+vgbyOA2P}T7Nio4(#?I)y|Q`YWI^;)by
zAB_O;=u0hO;*Z8@S+#4`bWU&B+m`pmHx|Y+Avqw%Ozr8)UrQ$L$U&7Noweje@`~tk
z8d2#+QuZUFsF<)8s_(v%30l(<N$vMgD;#rDS(jn-DDb+kgmOGkPOi=gWxX=GoAPEc
zHb_xfl$T>SNzKN)4EG@-$cB3SXkv5JqwBrE4M3a8HK)CIZ(i5u><#h?nr-AN3B{2C
z2!ykSMjHgq0?s;Jn6}ax(em8)aK|ck%xAsw827WcA~Pp0JTTmY9ve%nnrN$ZO!qCU
zqq%vfRj|ehIp+mIg@qVFkBY>)LMnW$39nPfEa1d@8G;&XqkL0++<e+|6Z?_a5$oTq
zY2;u(RRmNdLRG<x4o4z%&K}oHx<RrZ>$BtStOa#sOjr}0cHgrbroe-0c!w!BtZFx!
z-DwN{VxQ!$dfvYZwzBQO=+c^C)kj#&f=)nzP5)}_q_ExIjG6|jCi~2lmN2U*W_xcI
z-vinREx`sIFg{Ph>Oojp*_v|ZN73>0tRj|H>_dR!_Tv~+Tx&hljpDO3u@}cf36tZL
zuoyf_N;m^zm`>UYHHi?=AsIu+N<-VL0kOo{h{d?b4uA=&v|e9T!MU8h-XRn)#Z^)?
zaWF#y26I5$slRTe&fpY?NHk1m03bggk)%{ncKJA8+CeqH+sIV8O{zIv)`!uk2xg5^
zVdiB28N!G}8HWv^h$h1m6&1BF+bj)5*wRj;m<K`RT$zn!v%lR4a!w@!=N@j3U3@x}
zU|#BqOf%c&l8Fkp%)CAwD|v*pC0;9ZH+zf#Qi@p9wMsg%WvGg9+SZ(aicOv#3scZ|
z9CjEIW*aQ!pi%R!i<I<D1ywGXX<=4oEwkGUV^a0QY_%GqhG7;-bu@mj_qTV)rkFmA
zcI3g{Ytj1Td4aaUcH9=*l2Y92cy*XBh!8=AQB{C7>5`u}AAA_?EWDE|kwXBEAe`3g
zS47LZG5lOQ@GHnURWhfInff^aAoP`Pwy#xH%bj=IVh)i=ShjUBS*8yoqKid&XbVt2
zbXxdoN)eX0t#$hf<4J}6kb|!9ZdTGc?#blhoZ>MDW^bIW7X=$d3pvH*{fia8pj!@0
zB2wrtBcVc=PUV3iA}S#Poxh?5l7lYq*=?ed32Ok(k4UH@tdWHY06As$BzF5{r-cz_
zL@9CYpa7DR?PMZiJp6JN(avdrmDpGBTH0=AIW>=?&0O<6v)o<tj<}Eo*mv6d-p<6F
zELlEp5cZLn?}b9DV3zJ`<s)*=2g*}es_vKL14#~vL}XiUyWd<LijTZ0gjm-K5%ww!
zIV&8|IaIDPEp&mL-<Ed(K<5y4w#PicH`jCU2Gh5N!1NLQY1TQ%46VQt0T3XUxtPjN
z(}g*TG6D?KsTA*$bTtt{lR{MRc-bA12y(#z#xJPig4(Z8W+d`{VA!PN7oY=xyo^G5
zjB<ak%*id`uUKTN#~iHvHO!ZLk3Vl~<m5~`WG+!6az2dbPTJ#yH{pncq~ymL5S<?p
zU7tB#f7r-1s+=op5oL=-bZTh>fG)G%Gp#?RWZ~MjwAm(#L^dmRVNg+!q$(+HMhNYd
z`YMbF77s#1q5>&drv(#&nrJ%*ixW8oP8&l8);-(|>#LFgUE2r=iJSl^=O|!5&UU!5
zUIMBb7R2-p0IPK8Dm%v6{mOc-Y}K%<5$y#d7pw_WopZJQl?^=3<><S(T9@+j`9~s$
zggJ&(D?>{S001BWNkl<ZByKCHq_|Q|!R#NW@>cs{t}Ch^LtL(sA~}zH7fNq_vX<a5
zo$7gOr-R=guI($wb;(BT&NJwT!3GvNYYjjP5WtZyt^ly)@wzNnH6z07^(zuReg17Z
zbS{T=$97Fyh>Nr*4;prY3yvSF5>1mw*)6jg1{229vk#-H+4k+0c~t?)#X56hPSwGZ
z7gm5Ui~yQqtf({CTlI^zX4{30+<mH^EK?A&TsFdu(>k7B!gx}!gLOvT?8<9G?<Wz)
zl<XbsNu-cPh_R4H+QdOcoN;tjeHiS_`u}tGE<chaNt&OCsM^C{5s_J$)!oxQJ$wwX
z1bE>eMsThKPdxF!8#zbvLVy5|oD+E<f&E{I;qK0KS5;<4xVxFDst6Av`Y>~gtO6U2
z-JYzh2zN6zH5HNX`+dy9DM4*<4FwUkd8+gt#rclpT-WQlN;Ny`dW>PA0z`GW9RdbC
zL2@}7H|l>Sr5KmoezPMofh*G}<-%yMWrI;`7mQ9Z$T?<^q&z9d&Gfx-w&+BI4NS(|
zA5P8>+rbO-ie#%+I^V}IZz3e~uIu)7Bzb3MW=P5BV{(mW%YCQS*pra*X_pOz*1DKm
z!AFy=TmlP)8TApeEU5Z)WZ!7Aq6clRkP`r@-7=c@DCk>RPhQ1GseRU5r%V3%)>3SH
zn-3j7*-Ao6m;W6!s;+}96Bpdbf@<VN?)2nnX1hdag9^QPR&#I?luB$eT{Pt<T&h|`
z<gwA(Hl0dKp^Uz=fCq~YJs&OMk-OOZiw{C5*;P`Nj9UOi#h8_6_+ey%Rot(A7&G?U
zm(gWINK9CLsJ3|tv}qsjD$#MR|3M?bHO<>1oWT{#!9u}w-LjcS(9i^Hr}+k@YqM%V
zz*yg53^~mG;kAIfX>!dpC3lVFJsT4u0O{gFL_lY85U@5RRA~wq(~Nz6*e-iS(wew2
zrP0PFTL>?*ciKS&YWnlo_JQRw*agU0ph4z8KvruDa6Lemtw2nr1*Msv4F%FzcOC-~
zcN8%tcqe0%8*NeZLrT9@>p2l2W6#!{Q5$eDL;e<pSJ3`4A}`3!<z3V^6VT*vgWa&9
z^{9y9i}f2Hguz%|!}T`pG8i9o2(nX<YJU>fY8jQF2;o+9RG_;0saAfhJ)2zB{SlHB
zFC3?J2qh_Y73__(MPjL$XMKN_X#jct@+-0$C|KRPr3wCD|I2@?3UXndr<-#gos*Q9
zSyC_<KhpW-M`h%z`BOMuU%!wg{HjXWwU8bVQRb7PN9XI;@$`In`ZV8Pm-}0jBSoj@
zPre)8zWi(9r^GCr?Z-oJ5!e{RT!K<=-~QV5httcC0I*DNHr$ROg+)WUi!nolUq1gS
z57^T6>o3lGvT1V?Ns?H73#=~Mj2+r$&J_#!+9MyseEs@Uu_83PVf8`l^VtnYk)&$u
z{FiMvXoJNc{CkqZtdF)Pr>7K!WqSLvheZaffnqQOg9vlFeEgkqZSw6%iv?9r`fDhk
z9BaphS%l9YJ{NaR3=3MhpR(*8uynDChTaaCUO1+(jOXX^{H%M2rjT33oDcO#?(*?>
zI{0$FC)X<>meVW%MBQ34r;UI)%=gtn`}^x&k1Woq88U+)1OVeQk@LF7;!3VvLn2j^
z;=BIs>rcD3ha5Ved^ZAOn68`>c~8y{#|sE7)6E9qO7Ll@Y1;V-%iNlFtoccfoYTlR
zvWLsPgJ(jHOA7OFdMY#tb%i(8DymLBAKo#BSzYZG;7&BZeI@6+@hBqm^(&Io;VKf1
z$LDT5w&aoN_7&FPz*0{Phm-3D-}UPLK|pfFKEccMX01FuM{*M8emq)?TuLzp@B72$
z10YITLYSBPZ4bl|^jzzGcX;{;BDdEs`gEsdii_eATubfP9%P+E^3M0Z>-3RZ%;+6N
z*mdKI4CS12J}gsQCY3(vV`YYc5-p-FZcv)&!S`d=AId$|h=w>{Ri7fv)AbtyXdsVh
zH2mT8^{@X<ua$`O<I(yMAXpyN9L@k)z2&?oq_E6|H4&$)5(C;ANS`}Z1zO8(nE;?0
zPb+^RYpcm40H?sriW1ed7UPtzU$4IF5kbF{zStDMfaGnYZMwXpx7`nYKM=XsU;YCk
zauzi@=biUR9?6C28pAx@URMyi{MKx@T(eL3ewnT-mjhAP4<Znz8`uXp^uuAEt^oBw
z3cn>p)81Bl_TH?ZweWdSKACkpcWsT2v1)|@#thc<&6D%Tu;W7d!A477w^u-vef4eo
z-e|slg}Y~Yd_hC6DQ>vRN_{VlFOz=qmM85|cuyV%J8_0(`i+}p<w`8WM>|F~DhZS%
zEPR($S40Ge^~&a>a)UC_uZg%FK0V5LN-eu~F0Wrs<q9Aa6dbp<k2O?mb=JoA%4}>a
zuu`knOtm&|8h)$5x`4CtSH?#YP$T0oO4fT?n8!6(nRG}<QXT9l>u}0<(EuyOU0D_H
zBe=HJb#a2jcO&by*hO4<Hn3LM)=fdew!^TI1(o&xAb-f!I6me(?8%9?9;?=iQ2iM4
zZUm{0MYhwX{g_kv&K<zIZ<u-J@!yczU%;FRvQy3DCLSGYUcu^at!y^MC||(t`h=QB
zPq$D+eAj6p(6ahkJ5>4HWq;eU6?S(;X}}as1m>O~1@UqB+HO|(a3ym}t!(#pEkl9n
zo$~#ir{_H~fOfE3qY1*+@{frB`~Ub~m5;3xa%<eD#4)58o<9BF>IuZ_m!HZzkHeA^
zdM%U$iCX_DIqzI|xO~vRjpWJoVZMg>7MEFPR{&rp)9HrR+r;5`(K26U2;~e5BFlW^
zl>BhO%->T@wsnn#5uJ!Uefk@fLa2^|GdN1mzetWBpxFCcC)(tIQ#^n8aXfwCIE(Of
zf8&@^ob8JvlJ6w(TAK>RCJdP|U+maA@Y5!~S(syJ=M9aSSA2iy$D_96m-!mz86P64
zay?;Fv2Hl{;ozJn=fXUTa9k$NQ3Kw0T6t@!BoCyw=E)Y0i(UzIet+_8W6?=+O6ALs
ze~OC!TILw0ErCeH4F|*T*)cO8y2&Muyhf;V3eI<j^9$rLj|y9m9LFVv;4|P#0K)xR
zdY-DGc;s$tNy^NJ^9!diUB3x)nD4IZoa@H(vl@p1fLt#CVZN!)fjKU>H{HgF*2qAk
z8~`*#J>A-FuV0<_S+)xN@CDN{xvoDxeMF>O6UP{q80M}&_^!Xc{-P3gV<i{ZRX=hJ
zC5){fPp%(0MgR`e{o$Sp0s*1U(aC$4`w$Ad(gkxke-PofFMsh}@4H@`b<_2mx}nOD
zqCcDp1Ym<$(=hbo`56#z-+oSULDMVRL_>2euxX!Z3H<W;&)s;?;pP4H=PW?OW`-9z
zrP59S#OduzHyoZn{SgqRw{NOEQvO^@>%R=(G+F=vK;k@+_o^1mIwQV({C#FV(6^ud
z16Dcx!|l#*FSV)oekA9|<5`$rfBDyq<Pk)CKLSEhxT9$}IsxFk4JxtEaBHeeBqt(I
zKm0DkLwK2P-`}sgVdRulLY2alTR1VL<h$Ngj9CUmXe^>-r#Nyx&QlC?iXnyNaQR@M
zbFl)nVC{61k&JgP^-6!dIM?02{gl;<SOOQxd2-JAo^q09<J7XYS(xwSoO8~12j3r3
zm{JPOs18)HVjlVN&>|P5(P}OCYf7;jj>1tJQ8s>MX>-?9ai-1_j}6MbJr~RRKc%_5
zs-N<4q8d~iI%s=3Fx_qa*QNA$5q6Fk^*ywHbytB=Va{6a5?X9es~m4WIJVB#JwL#H
zfn~!qGcm7S<Hd?@Mq9ym-lme{zw4<I+JO7!&k(X!y^LKO&3hhZ;dhIJBKu?(vZl)}
z@Bm=9&R);{<X5}yrPz|~@3Fdz_D<*RslN{K)NxTzy&G6s-i3Lm3sFkjY(&XqtnXDM
zB`B{P+f9X3TqyEhY4MQe$Xr&!`apxt2gF}5G20pDe$oF<TclnwS@+m0(jE}kfrYDv
z(;6V&g4)|(Ud?uUIE#`#iEWm8wvKF*L2*rTP?mJ&uA^*4vk%2_OQ&nZhm8|yBPn4i
zPNk-P$b&J2$DT}CRJh-E$4w3lZrt~)K{aX+DQ+^=1uK(U(^%^;K0APurSt*5OJR6u
zS0c#wOLCEi$N#~*zxuxsAO6|nzS{gzL*+KoA(6h|3z4wc9}%P$+|@zUZbh{>Ae)V8
z9b8&Ko7J@;^(JPK#)`s@|MZXl&<wUzbtC=ZG8`@}QBqR&|2*B8lV)^nuAPoa4(FF{
zJR&+k6pjFLd;Mx=l*T?m&O7f7-ljE>DTX^e3W<QE;C%1;;c<`FS!T93v4AGSL2g=d
ze>ivjsPS)E9XGc|$*Q?n|8P~hx^Ad84-r3%!+4U+mon;4O|X=b&l%<^XO*pe&;Tk^
zEZkweU^(@^{<V|>0G^&cI^U7&1z1vK=IQpWlI9WiarH$D=RB~8q~Z899G~=2;j|Q$
zhmQK3_ab6+Iz-79i*njHoS(`0@-aksneT1pXAzeoz;L|i59Ao{Z(o%mP!pJQqJ@nd
zBms*KqDnM;olLL_kL7sz0Eo+U<CN5(!YSr=?JCnlDaoMm<%n^a8f4(aaapF@2J8f&
zMj-6^K{zebO~q)3^ULMK?@|oRyxiZya`#;iIn8dq-vFeoFv?hHJYM{8(57MxGc%{C
zW(f!8u+~|=Bj>aPF+f*|#V&$ma!NvvaY<oOFNdU9*0bvdmEnOvN>QN}oD40-DV{(4
z9*L&wSDn||a8aa;NwW0|bzB61c`7y(F<~CzqjD+^rw{${e0%*_I7wmw&U&JU7aLNF
z3&-I5v9v?<@k}Y`$I&Z*<S4_{Qe0H0&78*L6C(QFK<XT043q16owTXXy5Oi%2$(H~
zahZq1c|1RtJkG5B79tM-!|`msevxIqDfQbVuN*nCejc>|<>_fJ!t?D_2UjM^_P!kN
znoDQV@SM_kyo{HRahZ~V{jv-@e}2WLs~{}n9@%0mScD@Yj^}4`-gk#=0+F!Xh#aC9
zNg_$pAEQ1*t<s4ch{U*TWPrF{x7+9yP0v=zC?{t2{h-}GL`-2aLZnEFi*8?>jYA^h
zx*kE(&M_``6OH9+L2r7Bsx6T5_>@(Ucz^rFxvm?J_1uZ*EWS<5)79+KCHHYWKDTj!
zn>Ug+vrG@K#$Zlt6n+~vb;ALXx_&U5PBX0ICOy<u2@d8M<<>5ZtK^#un((IdYFsm7
zf=y;l+Ic`!O&Q9{WNK$Wu9~a8)9=Ql+3LYW^iyn{?~mon{^7bQ(MqjK&f3Bd7FlIr
zwiB}EKnH6d^v>xW0TKvposk)~lH+EOMWtG}G8+GSah5qx<rv<C?G}9|lzSu(SuhCe
zkHHpYzV`waJINCw2yvbZr(M06_2*EkNE0_EeZeg8t$;e~EAu`eUZr9pKzZa~Q2#p4
zStWaeSWsL$QZ-|@cfJ=9=1>SM+C<TXxmyaG!=FeMhZqS_BqbptLTF*ff+Dmt_RF%S
zV%MzcGfjp1;Jc74$|WSba%%ll(0nu0p;ma=lta=gB+3KZ{!M1i3V5&YIY9<_7gb+b
z2YTteIkIJ2Zah4LA}K8?MovMk-;G;}H#W*uYE^m7h{d8wo~YTAD@8L!%yll>_E)g+
zBAZD`CmKYs>Yj*-fFEXFt7v$0-#f=CFXIgGYfx)g@8jy(mX!rQXG;Ny0$dF8z_KC8
zx4!bV%pTuk0q!*-8UVajtMr|HtnIpEZK18P2`&Dj^cwR=ReuG+))6ARVnAH6_354F
z7$RZTPUme<HOyG+TGTuS{V$R4$CC)_iHzCnQqv6UB2+DJL3@ptTBqx~{-9?@a$arA
zO}n$MU46RLRU?5j9fQlpR2@8+3AT&TpMBSp>$>3ph;f;$uU%8hwJ#|IPMl~^qLNcI
zeNG)?NToB`><-QQQayH7xr%<Im_nFuZ~Bhcoc9*n$SFGSRRl%kl{*XuN0vvgg{h4N
zfV}Gl?VdA7B2UiGw^!YKA%+-2mTZ(Ex}_3!{lRsEqLPdrkOGJ%=9+yN1XEb%+t=)x
zNaYonV$fVl^Kxj!mG52GYfY>Ns1Rn1fn2B^Vnx0*2OKS-berRx#Yn!l8D4ErnWv>j
z$$;7}W%F`1elZ|`gk?s;Y=i<}s45I-BiRTLa$x}=a(e!ZsE2xv%Osfsp=r{9q}557
zH5}MUN_mgt6qot_YH)KA%>p$QiNV>ybsdO=`L3Tpm<19ubBwKHNl|%r>?5kKa3Vp(
zNBt-2+RF)i4PX|L&|zB*OEK*sTKru~EDV}+$q7l&IRbIs=c6jQe#pzdyqLu(@I;xm
ziUkr~BH#(Ujz^vAgzV2X;>!Ep_IDz6e3SDjE*xWwOFjp)tPe5h$Wt#5-C6H@LU*`)
z%#Z|0mImbokW*4SHaV(qAKjN6iU@H^Dcs+_mT*302;>+hSf*>1>}j#f%$$Q>i3p8E
z;XSB|P-?Dtd0;KairJQ{bHJKLFAjSU;1p7d)9p2dIprKE?>j(DDP}1daY{x(%10mP
zeBKPBnHnR+5Q-bpITbeqPC+pdRetO`B+~7-c^_|gImju*uyVCaQn>)R9MwWn+Gb*L
zQ5FKMj4c$Ue<Pp(1Mhe2?bkB1q}Enn?S>+%9o4m9m;yj<Qihx_&3psqDUKudv&zwP
ztSN6^rbHyU58-^TXG(OL<56BW&TI75iIp9ok9z)yOGza(Ke(Z1N^-i0ct4D%XXaQ!
z&X(!T%H(E(s`o}|{Tel}IVr5&xQZlA9A>=`<h<*!AJ0fcsMwTAggG%_!BbVM6Q^VY
z*vMi@U8d!ge8e@Zi9!HW%i9eZBgC9o&wW~YTZ5Mf?Y9G>Ggr8H*Nuqi2jsAX<;E$c
z6n9Vt&gEk=AfW5|;c(VV=exmd5Ba}o)z-*|1|&rE{Wu&i(;FL@h6rYTO}Y%H2Ly_7
z3Cm3_<oQwYfCiGVc7}l#!FBz3dXCGKa+ZQVQAkURW<cA)bpQz<X*|7<qv`rJ<xn>p
z$ZPXT)KFEewJMJ`=ubU{OT#zNf{A080BJm)$@#d<l5?PJU7;dL?Zcq+c}~fvmrp4y
z)Ab8;3d^h#0PW$3zR86}I4o02X*it99xeJW+}~F6dMx=Hs<x-DA63pyIlo&aUD~BA
zCsgf+XEsom$vF0N0Wij8JqkoUy{$T33a1mQL)U_x&f&vax0<%lq>o7ih#Vqz!)Rbq
z01rc(&{9Sf<@bl%E23RhUf&cwCFpB4A&Md*k-A~9P6Iha=exo6gC_iGAJrg}>#}3V
zX`V$K<oIy;pdCobswn-CtmRb(oK~1d{@P3~sdUJ7*<_rw{iQqea{X2{+emup2)q;$
z0yBU(*MWt7ilk^VuJXVNFVii}lT)F)h~xnfkW(X#0(v+_;Yh9nq<%c;?vYz|r9wB+
zkgaDeQj=4M38%UhAky*joKj3-iD53XMBN0O@5s40-vy`?Di6C{HqPo+R{dR&!UDc`
zT5gi=rIca~iL~pPf*qJByGxypICs#D%?pnUwh0(=FG>kJ(RYU$z{C;I0V1SA<x7;`
zgo+Ij=D6IEsEfxesm<0M-uO*B1s5QIH}XSOdzIV(twR(K#_xHs5Q$sELmq|ap0l-&
z?7zZoZCmsYxhFuoEI4aL)@EW2v^29nkv-m)X24b&7}!DV)J&AAUAP(HY-;Xm9o0+;
zu2In?>2Ng<C)~(w%Te9bN{VSVcRa8990=`*TUi7Ky=<;qo)m7J6|h4469SO}xC=-g
zGozuAFcjP<ZQ|K*EfGR=Ma0f2v1rF%_SLh}(B;LtKO#wovrsYwq$O>%b8_7G*f#f~
zDb}6UTar_CHm!18hdyT0H|BAa(odZ8b?ZlclQ~r_>Gnj<3vv<Z+pel(dX$aKhm056
zlxsvPRBqb!Rm3K3P~VF5kAQ9Z;!31qU|74YCL(!Pu!OjB0ZGntV>WG0gH|vTG3p4V
zxHY(_2Ue00yXk_3Gh8`;A|h&ulZNy!2%I8D9RViTfmdvx0jp+w4najdwOETNi*6de
zhpd(It1!+sd$M*%VKqYA3=vv{2syIqw)T*u2yiTKOVJ-ijk06Rpez$1$gfyoE_Wl#
z!dz`pHORNsiO1UVt#ogzqf)tkK4Ex!aB6<b-jGQfX%9a4)&I`RbO&WXlwV9x=V;_g
zKHaW~9vcHjo_M?y>!=^EY-?5PsiYL6ZE!KOK{3klV?=JFUfNzdX*4eQfBaAXwes)H
z$zE9layWnJ59j;!OF7vk1;cBN)eX7zW#;ix<S|EKDU#wgj5|!XA_7*fo3l8;l?RdI
z5|?>Ay^QA<=Ad0G$!k#&M9z1@>Gh|7>BeI}9(_0Z;SlDlwP#g)0T7otTS0lgy=KCh
zCvyGq)b|I~rni2H;$(MSuQPu_jLV#K$gi1mzF+1^B!%f}98Kn=vVNqTP>PMH5_~_L
zUw)@|F)q_Qy=r;dA5L92q!>ia_2}Nd{?r=DIfb-L{o&jnPGOl;AfPT<n~*hz9g(D{
z)i%bxIBHuS*l@gP(%~{)m+7h}bZ;qZ?j13s-e@>I{V<%KZ?8WY=?z4WsG0ccv=qx>
zhAD$6w<+Y>WYhDsMum;X=WaZiP388QVnpH6lg?l#XXyGEG(`^)k58YR?_;<**LCB$
zY(Uo2w$m7X`}yAs^YQY5eAf*}5KbvtCp<23x%>Xu^`ky!^ZivVJtFe-@ee75WqJeV
z7=t>jwU7Gf(3oy-tvF5H@ytn5^8G-rYiT91F&!25W2<)$IV5uH%(3K7EN>1G>l}=y
zi*tUS?ll3193i1|oI+Amp6~P@`F_xaRGKt#zN?UbJim<RmpI>33aUicdFJ!yzfCEG
z`DU_yF~TCY@1)=E@?6OctS3oCmmhx5DW;fGT=oO%gmb>RC>ztTTF$9`BG;N8k@Pz2
zX^*pTV>n!f<2l6`V>n(uSl7oyrW}`>3bizarUczciqs9du@I4J<+O6eN{-ICU5H6-
zD%oq{y8iU^N#_M3tSbNce$}IYeP98)VQg=`h8H&aGXC_(zene8-+qo^diwY`d2$4R
zxZGcFufMDk7IP<NWns#-tk#z*1wur{3$$-RZS`vqtlH;9<oxpEaC&ymiO83K{eMhQ
zX_huCHZcGEI>XCxq4l;Z1wz=UpMd0h@;)t7X=BC^2#LIQ2w43Xh0&qKALL{tn|Fku
zI#A}sF?8dp8;@<1%m#3K1J&lhfcr*NX%zi{1pu}=>*1d9xAaRlp>Zo;az3$2m7F61
z2qHsMTu4o&*!+_1n>C-)n>p`pFxbO)v>@(WNN)dmp_Z9S_(5$funua=n@uh{idek-
zJ55kKTAr%Z{CEUx5VyFtJnlGCcfVbMBw!nT0KEQzxNpwTt{N1kS0-s~!wuTgtH3*U
z*H-Oc{LHQV9d~gJW%WH+b&;rAYh=%QTdN@uVc?cp*SPDk%|~fQ^nkLBL6=ffZIwY*
z?38<qD~!Rr*%eJvUn7HCFWc5@zfvf)VJ6#gP1XlB7HHfA)#D>LE!SY>Q^6{|A+KLE
z22dLdvkfy9SbOuUF3lc$QwfS~EKRky5qRt;x<IQ=de<M4)deDtZirl5?A_AZA>bOv
zw|Tg5CsF+!3x@0~K}u6+zqVSpdD__!wp0d$RfPSoBwjvP5hSzV*Eyk$R|i)PF<FZl
zx7HOM<<=Jp?dx?~xJRi-x51_D9mO4(!!AMr8!SMxjLTKS|NDRa?>L6r+b?B~S`PAY
zxu<1z{o!4#LkU;P(SVnae?WB0{gpXxf{e8y(d>f9Ju%F8-wns7AJlyxmTA7dwO0yj
zqt*6KJ(3K^Cr*h|Sm%B=Ua>6jMWV~g=gjTZ17_L8zIRIP$Fq(H0Oa=iCHI}0eDiJD
z#CiY;^BobNfBaL|AGD1e=DP^TWpQ2Sjp1ZBY`(u~`65bl6;XZ1^XEU718K^qFoO&!
z4%>C*daAu7A87^lPUX&bhw}#jnD5^>rl`i-!kdLWP6x7-aJB)pKIF%j&*$gQ)9vdr
zT_Mxg3NTN_7pf7UtV!07Bo8Jq{cF#k|C~F+iaoo>IQwqEEH0SdzCsgK@!o%&_lOvl
zMW+eXyICW3v}@`?L=pQx{@s7hDWo_Hr`zk-X1A2~u}wMKZ}aEn|44B$M?@}jbwH?S
z2t-I>33gJ37T;<cA4h=Z3yO%O@$@pDp7pc%u2VO$a8yKGicwWU#s{d0-l&rO%g5il
zZd4I=iZgS%y?(*k;WRL2VG6d^<}AZ0d_g&!KMaS<_3K~sSgjKZBHxXNk`7i(&HZ@l
z`or6oe-+`w`GfO)O3IK6h;(}SoMMP!AtIf%1LAc3l9v$7_qUey1;QyMwPO#*=YBkL
zTts-fy=`dVAPnCrLq+^BW^XYls4S(VCjH#jQlj1uzU$w<{Iog(mG(H1t>-fIwJEiY
z;x^qBeWB{wNGk5g?ZnKy#?}dHyC}Ih-$eNS_SOEfh-g|Co9c>u=bTsiS_zSMz8lX^
zN@lQFM@hmGrfUdOiVFxh-vLpY@94bmM*xV+)RO=D@!))~1+KFCfSfRAE7~gFtC>a#
z$5=WjQ9qc-c)A=eAL6paxJcTDnXqPA*hNE;q;4)wNw4-!6CfoU!;@2tzVqEO-C7#E
z%5a1^ER+7_={{Yruj4q5<6y6B=aK02^wD*_-!byGy;S_wkl@m4#~pKHD|lV?ogWhF
zGZ4&DX$+HytvS2RfG#%cLW66$K|5z*bH-atbNd}_7k;;&(}-@@=TSQ|)<3s=iuQzF
zz5Vq}P31sdO{Lh(9b1-pKKB1gpx1uow?hnA^SB>%)$-2IE+Q_@v!5)=m+w&o-uB2B
z)Bpe=07*naR5|<BTB;e!Ho5ofbtl{6?tKD6sReUWX8mOdnz2Ti2o^(q6Cu8`NY`w@
z?Vq<79RW6xo$VnuQ~K(04S(f6R@#E>9dW<^JeGNw?37alx%W=XCVP?UN7bv-7VNDN
zBf}S|tsi$F1l!WQom9#0a#h>@9(%C;y}zviyZ>Aif4gn!d7h<E)>@o>ua?^>t#>ah
zKKe{bm02H2D4i(GTOGF3SqnwVdyHx$0qg9sSORj!LN?ZI1Q6{GDJ!eP?!|_OfoN@S
zwbxe4mMF5qAjo5r0k#?jsWtQ_Rk0Y!-YaDHs%P0JS2jTY@<;#Y|NP%nYx7P64b-c!
z`@6__?>ja(Xp)pHWrkVStF1{QTx)ZX4yPyeY3h3li4NzNk|(EDbk$*6eg)EW`vL+Q
zF;m=T=K4~0?dejaK{gl=Km@JKs?nPqAob%B5mN{vGTpuiOKeTkx&2$Th4n0>1(T_Z
zJKvAP;he&fQs5X;ve+{{G5N07EHqi$eaa52g4+~>u=L}BoYTxEbk1UM<B|&QHj8ov
zr0d7B!<F*1`mC#hiG}(2`~x65*NgCU{bCTNCb`M(LrGc?NhxSYzaNjo@kuxV@N&N{
z^S$Uc*HwF-`yv$wn24+vk}x^nk4H^J;}qjEX;<lRdhW*4GGC1Vu5jVHj<G$uKAzU(
zJy1?wrP^apDRPW|^Y{Nnit}{+X1VDpraUIcR%)c*!seQdkI1gG)34zBp}6--`k(^L
z^yuolq01zCW&W*m0M-e;IV-r~DRDb;M)mxN6!zHags$8y-w89v1rW#6Q@e45Wr~>~
z56W{{iK&e9qV{T4NgOXfAQE!`VRC)hZhU{3Z{Kd;ep34c*cANUs(f=Zin`$-DJ71p
z^M2lH*7-2#ytgSYRu?RDLWJ@7Ouk#DH(@DOt5x%f91^vwE?dYU;}}WW({1ZK7GY+s
zt^gp+lj<ajA`j7qTdnk6a)5jDT2z_3`qOH+lZdnwOEDr*<LghHQa6kUpk#TSDPBJQ
z9suJq>)?`8(jUs4I4p&J<*mLK5GYRb@$@_#pK^#?5aDIItM#jK_ljcrEttKbE~^?-
ztE)`pPvr`0Y{*tBDl2ECuvml~vq<8U4wnyQYPigIQW$;BZ?eacki<3<li}zFs5A_0
zJ=PXao5=SC5TU_`%X|ZbzCVOznWlR`41FdtDx0Dk4q7<NJN(?;A;NBZG}{Jqc6@G3
z?Hw-G(j5e@f+7)?0D_24xfhnq(-=fl(Oylk@6|7>(ASb0k0m6?wrp~Uq(qWt1?&t?
zK+<;{sbySB<d_J#XvSL90q+KhHD~5ZR4RMystlC};g?CV<>Ay;4@K=il-&Mm=YTtB
zKwOUmBopnB$axmF_bc<(ZCl1mO%{^0wb8mRFv*Ot(p({<)ewt|S<w=|RdeyKOc5SN
zm6eZ-Ee{>u!xkWZr@F;D-^KQfoFCEbIU}3zmfzdbG&bUGo6zhJYi&XAowXq!ZlZ`F
zE6GB|>(q97^7&h!>P?%qg$*wv-y`D&fJ!SJG|RrG7DE&6lRa(C8ndRNFv|mRP2NMx
zRZ%XRvd^{#XQ^Tjw;T6TuUZlBPVRa6E%o>)8KADiUD<Hr-rE`L+hrZ0+R7x_+t>mw
zRc$EhgXD&X1;{RnAVH-ztr(Edw7Asj0EJs*9u1^~vOCGnTNY(gV2vt!AH?{m18*j)
zRlbKwFKO8Wi>$Xf-!@y7iHNb~dTKyLW+Kt!G1ru+4e_oF|M9(Dp?M|wA_!`o(s={g
zTKClvRhqmO_grGOvLm(iLbUhNcRgnTA)8VkV^}byVzU#G>Gn+@6$>sGwpi3$IEVRO
z2L4??Y5}9KGL__I@hZ1P5^N|l*#(?p00c=UF;yEI>_>OPqfOoqV@U{_?{D=v-(<2k
znV(vCtv`&A??Ax*U*`}pEK^w}YDd*f78dsX0RcslPO!3|3tczp6sOb>k}E2`M=>l)
zxhjN1yZyA^1xM$`@dZSd`M!M!iaM@Yd96$X>j9C4rP!MUWH>yPR2M+(hC@G|m`#+M
z;;du2Qm8>2Pa&Xj#FWj#`g`R8t5KcB`gl+Q$^bb5#J6AmMM>rMm%<_`iD=DXqSLaT
zZH!SGs+nt}B`{f~VsaRzn(6#Q53p(~U{1N!TPzJ3THU;;>>KSJPYpQ7slaG9Mpd?<
zc-@**eY(t(rkd*M#C5~ra!gUxjLDvqOif@;3PaJ)?0oN4uZu*~nJ7twvlSJIe0C3K
z!i(E9(Au`EMWtuHl72#RPJ}SW#g*dB*b#cW&HIQkE^2HqnJ^;kyP@k3wfk*WPH83%
z#;FL?UCqH#n;-epp@jyE$UI%OrXlD2;VI8KSpC`?6mLmIweg46uex)y2NCC#2pBa{
zJ$E>Sp}0a73BtM_%2k`LUsY<ZchGf%)ty;lTCA?+07bsXoaeqwZ~5m(6|Y*}FHt`p
z+PAg2PLbNSM>!`L6~u}bMK}mFn855PTcsxDv~4yQHDWg$k(||ShjU&?ZKKfTGpRIx
zA^<}hL~8w*6eTiwkJ#&@no`KI?W#1y7=uV6(kfQpdZK1u)z$lT*<`N@?RFAaUSwIq
zuInYGVipnR#H^pDb)?qQfLOJwh|z95a*QcOjscS0!Wb-qp!^#3qH+q5mvWBN6ICIn
zxF9;$bx6*4ec}W$3L^-+uJ4CaDpU)RR&Bhmz=mt9PR<&1bie*06eJqP6ClR0<OPSj
z70Q|z;DFO6+*T#^&Urv8V3hWk4TrN{z!<}DI3to?!29dZNT^gyO==FNT`FVOdg#-u
zt=NucH*cKs+c&)*PcJ*<d({Uvc!5^-o3mu45zEvjt%wYVi^g7S72XYp;c$t|6vM<E
zW0<)yVyjLk`?{<>Xl=u67GCd1nBPMQRt`nVU2c`d;p;E|(hY~FPk*#-q(F)bbMath
zHwZdFcsv)DEuP2;Qi_XiWVsV=?|yP#n1utUYBb6<Nl8v_HX~tRey`xL^ac&r&WkEr
z)T6As_t0Pp!hF}z0KGw%kEg@sLzr$N66TxnQK4Qs?Z@lLgL>z>KEvDcUICohuz=`R
zoZcpq;^AqqDw#z^;Gple7Tr(;5qV@I28Uu5>8Rm-NllrkSAzyO94~EimDuH@238-p
zBr`maW91dsG7%bOrY!fXjs;xT566qaLt;>Vf=(l3O>GorBmi`}dl7;#I_E{ebsZ9k
zOzn_GL?mqyzV*fdh{$yPCL$bXVM!?-FCU$CI}J#L%?TTr5zzTwx3a{Mb7+HDCVK*r
zn4<GtTQ+2sO4P@}ZR5ib^ShZjK}?(yq6w7pKJU~-TkZ<kQG-i{A|iFek(>+DjXC=M
zC>(VZQWrVqGfI9zYAZ{>VA;k=t-!*fJ{I4rT8CqZD+Z|=GlVP>boC<CX_Q~<N}$vS
ztS@0Aq{5)e-JEqN1vjaC4U9l35~cPkXMEW+RcyL*c~XK^@@_F{b_@rp^{aJgHRico
z(ENu@>9gg`uBv`)b<${d{wyQbKBSVP#iW&;8RV-1rEN>X`@s$J9jQZ;l#XjNMAi5(
zCrxV7KgG<);$lB<nkL)!n#d*wy=I_i@BB)p#Kl2u0B*>VdD-8r1s=ry@3f7Ia|0XO
z#GYh)+xo_~r}EGq-%koy+1s%;LhN}i6f~4#2ij=Z*IoU_?XxRJZ^Y}lBTv|r(JlVJ
zDVy-oc(7g%Qaee)jY&MeSxZm80UcB~6dI?djC?jtvPVy(AllrR6QVS;v@Dg`lLQ0)
zTC~fy6_3q=gcTC?-HZjO?aKNba<x%_y<@b(%GcGpO*{Iq=C_wKRXx)e0!HBtiq=4n
z9Q<b7S|c80ts-j-B)c)F+J|tiwm{iyn@>rKS=8flS6T~S?EvNN=)q%Pt)Ozr)U@YZ
z<{UdFmnRw<E82cKpdKy>d_6;0oyg@8Lt!ABgGqkVvm{|=jHP63w{56q64OLV+tU_+
zvYE?9(IaZ`Z!21@`&l?^h*nD&MDU;fhyOC;D1c)aPfv%-53TAm%vVL-i12VYarU+s
z7qCf+Q{r62DB$DM-~Jm;A%$62M2gEYPX@GY+T7(aMkLn_AQHmjedqfj2R;Ze0}%jr
z!)Uc|N}5eYzVG^BIGj>OL^5;NE1|zbB=tmxc}9e8IB<%se;JyzbP#d<frxxRAh~`x
z`F<FV=lS-!++XMWHB8s1&woqgQka-iH(rEeTqfakd;8LMuD$Qbxv<QQHZ`qU(7$Ek
z#ajTC>v|muM&-{j3y9h$Wc@sIijtz<St9?CZ!S%1!Cc{+{#!l-7{9+T2l~UQACKDK
zUhY?QaBn}k9x93K&>chGE7A7@A|5XvE9F&jmx#-J3-e9aqGCdo)#rT2oZ>v`W8j=8
z6NvyiM@TG!Mm3|7SZ08T{42<Jny=Y7D^N$jYN$^!jHjp5^XC}n6qh(pDa_i{bj|@$
z3Udb2=l&VC*)-6IkR|hSC%rRz?}p>kczjB6W{z>5L^#Y7b0S4(`W^ttcV?R2@rQJU
z0HRypeEa76u^$d8#*{+?RQ%PxyjxjE=~#1G;xd2!+kZpOhxsa;-oF0)9>o}>(luEV
zU;xPb;rN6(WX<peoFt{hNfYYZ30X!DYPR1_3Z`+r?IpdGzg%v&{`^+uq4W&vcFwnc
zJPpT-uIdycbDG}1+AY(35<M9sW}OjmlK|tpjmd!&Fk9Zt!jV%PPcQv=wtbfah=gS>
z?z9v`tAk517O_v+=(2qRQe239v1Dv+HvoM6{eQ$MDUgp-5=f$y>TC^i-V4BTf8`Xr
z95E=&^K^4=|2j9q0!cBFbI+guR{1S@AH#GF7MTM1*_@hMN`-e;tM!Lt*A1>eB0vgL
z?jD&Vx*HEEhA?L+rj}yP1L|`pVY=rtD0bt?Iq&<S%9BCt7IV^;UO8Sn-&IMrp*D<}
z;Cu&&r>9Q^j4)k)Nh!v8>V{EsH=Xm>uRke?LPUHu=wb;i`xTkC6vb^D^4E9_jAU5l
zAySjfYK)nD_psQ$vN?nH%g^RD$*VowVG}@z8!7vH$JOT4+~(xTgY<dDtkS=m!`|^X
zh&KLz{ipUe^^mBml@LWxP~Nw>G^T8<HfY-MNIb?zKa^hr++J#F?(%AGjx~S{3VnU6
zG+Dj0rJQZCjjNQca(g5Ae)zb?2WWGhBugAt{Jd>lu7`S^7;PX1w(9g;Dr@=m_bQ&&
z7u?dU3M8!dMpt*DUIO_ov4tS8F`4hY!%!YS8)5~8)Pmz(hrcu#2%tF1vY~6o*?M{_
zEu0k9&98fYn#;P?*)?J&SxY;hO0lfnx>}9cwiD_Gv<YOd7wADg+7jJL=~Ltw59P?7
zaOA-PuOFu2wuvAk(7VYpxd5tZ_BFR}RhMToH>_`g?ElE7Wso~SnOC`Oe3Z!0=GNd!
zgD3T2Ynn;f)xWY*KoQdCE59Z<RNq9Yk}F?P9yai{GgR2cje=$s;lf2zW1qWuit(TR
z@gH)U9clz%J*q2oSa~@y2(up!&69`Bk@KNDH_#A~&L4hselY$>3L-M!uhNJ(^vCL0
zt09}1YCnZZdu8MCX*fQ$yPyuwoFCM%U(yl^aSph|Z-DOxM9RdbCC^+Pxvp&lkwvDZ
zW<)R9$&hq#0tkxYJzidlfmGE8nwg$OJ!}ec0LY>9Rw8KQA&)}aBh}-7(lQ}A@*N`f
z<4Kv$R^$<Z<g5%LJ*<JvO|d_mIdSuoC8uLsR>Sq{U!3n%NpELHB0Ut7_f&$ka<j|o
z36Z2x+9Jp2Pp9Y4ioEKEBcd6-^(Z~x-lQDf)6!@VMdR-D^!N1f4<gJdl-X@qrj_cF
zbl8x}*|4C@wFA)}<h2jc4M!rQZRv!Ge1{G4N_9qYzFWs0TA_iYsN-QdTwV_656n?-
zZnMv%vNh;U*D&<QVOUcfs(vquu%y%<&%@!|?m_eY`rrx|B8SekC4yEe+4e9KIkniA
zK7U)&ThKvaMw^0KI7W1Y=)!c>iLWq!{`0>vNEKq3-b7fJ(|1}FD-oF_3kb|g{loc#
zG7;5Z5tqBc$;vZm34BRKwAG-J)omM1pzamw9m)i<m=!nt<DdVt6k}X&NOXGsQK8!+
zNjPagDTR5xuOrm1OjdFt5_xo#ay`-VU9~?!M78rFA|Sm*=z+@jFc+pdja@<T+!AaG
z>B4uz>E%a6N8WP`DK25Thk1H@Wx3|oYiLojUDS@b$ICO4>xLsa|MulCrNO3kAvdmn
zRl-0{s8`(o>E%ZNxWD~O&O7H*44gs?3&)rb57ZR9i*-1<KJ!4@lfR@8^tTX^6912v
z=fsKghtcLxb}#g;NvS<7C^}Iid_Vl|@6fsF?Mq5QKb36=+393(0|Cj4pJQZU=euI)
z^1~tHN~EUpVnrGF$MIhM$E!%<5;?yH?Uc5D^@M^HCsv8isc}$ywN4u_uFa)3!s=av
zYQuVNYmxH5?C8f*NLWPWjIma-ZQA!48>REo>bg+Bs%t*g76DbyGX-yH7l)xTj;T3@
zJ_f0)e^%4c*2*;87Pa}DX!JJOc$0JCR^6ylXL##*#tNGx`{hSDWHkX>xz&ca`!ALQ
zcR82~v<H7FTyA<evi`=h8e11*_O$1#g9swuuhpfxR<QBEV@BF-Dw`Ey{QENcO&N+c
zt36ZGgf}bP(i%$@kZlPiJa3JT<R)vfg)*0cD+7Qw4zlQ4ikG*95*Yriex%<3(pb&m
z*IJn0G7NvjR^&ys{yA6x8o0Sg($;0QM9KMc?d*Q#BYY41xJHFx>nYs$6S4!J8neJ^
z^oQ?O@Y3v(O$QFzxbG%PFb5(wtv9Yc`D{Y6UTYHu*>Gy4W%@NWC9WfREju1DmWREl
zqShXywzsi$+TjWUh=9$Xp-%O3+86H1BOVq9?i9z3qPQs+TLXr14J#jG!&_SuMa3#Y
z%mbvg=mlB=Y&$`29V2Qs;28VkrRxuQNeTkqzWrP_CIOW%1)E_aYI<1~hOr6Fk;r+a
z8*8h*tO=F<q&TZB#saSq`|)J_<q(txRIE$gcqAf~x9E*DLwb9%%jt%?R_c_ZXp{1~
z<rGtjDrY)9e|FuV<f`R<)vKT|=&blpqTV<F*A0Mpe)(*H*UVpk`gaJDVi=B3!{MTU
z*~fl}{-m(n^EO?(5UV+`NJDlfivz6uPb5T(L&&Sp3aQXm$sR%WvO0}gD*(gcQdkG`
z{WZ*Y-}h)cmozOJQ3rQ<A;q|`4Nh!I`t-veSdwOi8@#Pd|H&hf&IlW=Z(YectH=gn
z7D;N1)q*n2R_g$w??>DmAIeUY198ZA<M9~)m_r5^#FV1tugcmVnV(JPy@m{M3LJy$
z26EnP9^?=)s7*K%fwe%<*PibNB!9TPAUaqFSBmg*do2Nwg|ej2n%cU__c<n)#?y0{
zZx$UTa=3gL4rd*`=;Az_KBTzZuV1ZFBqFrL&7AGm0l<9!mSQ+P{UB^=fcgFn>+x5w
zGiS<)w2K1(&~=^CBvO>DTvc>H%q2pt>C1LcIU!3}*%UgFJzib_G+J4d$Q6P;*AFul
z>4sz3i&8X6r#|fC>A4?HAxwq8I^VBZYKzYMltR+ko=86)$@jzItY`}@9SV#v%oC_Y
z)=KAF46}t7k_V8}%kLz`u-tSwM~)C3Ip@fwlsH9gPDpLyk%sfl_pA54>pJIq=X-q{
zy?yzM1|N!ub54XcpcK(5+FN6)G98<WFM^y`oVPhHbc@#5MF3461q6;!Hz~U*BFvFv
zjA1@LeLP%#5Dp?dU0+4Sd0*ZdEVZw$cJ-76w>G%drbSq)4^>-b$%LcF%ZL7W3DZ@C
zl^DQ{V$1p7fCDB<XBIA^#UgqK0U|nFJ~9XW*fA_<arQYI3!onkn(ipg9%478=_hHb
z;?_R#ZX^F8(x{5@EODIBd9>kV(1G{*ty2a$JE!Jsz7YT+@1-#yHV4Mld`?6ZH80yj
zwtZU4H~~<EaTk|V(cU{>9~*lqGoxUw`PK&ww24<a>9>b{y`AJdLn@8^8U&B@ILTy4
zAh_Cr_XfDRR-ipKSCh!B2j{|*lt)bSdnb4);%VnQrKng(A|=5M)~*?Gty8ybS_~z-
zr<P*4VWI8wlws|Ku;HRGw2TE1F8+-M@BSblE#KW<UHX`75f&|us$L@6I@wpV&y6!U
zqr}@m4k99Igf0t{FoF))-1^9ijdtuojPuYS$@VxqeiAuy9b4QI5sLFZbI72qG(G9J
z*@VDGummd8(6Veyl-(fES8YSEqyW-rZWj5i!qMg&uV*N-Z$V};0%2iPXCVUa^w2Py
z>zycSDrePZFoV<mf%4&d>*22_T|I@lHKGsI&_>Qx6+te6v&WS6%CnMA*La@7KWR%P
ztXg#D6qy`}x8J35$2O5bnzlS43a(~*m<?|!skt_@4y4RS1*;%gPd|)|z}jr!6!Xh6
zsgVGQ0GwX&(mLMC>MMF;6Nj}Su0a{j6;CsfM++u|+KE{=s%k={n8egMFRQ_(ni?62
zi~DFbM7C9%xf3lV93Klr^qe9RIq*fatssnCx8=}t-52uzR^ehEV2u6Y>|9q{K<EIV
z>&N^m269eu=GG|JGEunHsN?B_jo*p1w#$`}&E#$3Xffy>1YE`qH-!<Q)00F3fE1Pl
z&<%%;N~R4;MkMEaDQI#;@^;i?;VFkpcCB%Wv!0B6*Mmr0CV)yQWDo@K&O^?FR(E^~
zi_(e#7@)IQ9{~Z=c6R+}+B{BSz5}ynD&hJOZd(7)2BSa7(_42$wMkj7*xI*Lj6OPx
zW#-e<4<f8HBt+-PFVj`QPKNGnK9xGPbE!&gwMs<jJm-Wa1VD5|2p+8t5Z3(h^6q5j
z{g_N03c!lH5$C%mydzSI(Ymoj-Eh<gAkOzN-@C)9>qc#Uq!^4nO-`Q_9s5~YY#Ydh
z4;q6q02Izz#M)-$lmL=7Ey_8Rs2j!<14rk4=UlhUS8Nfo6_U5unXSY~85YjA;qmxX
z$SGmD6@UmLgfPJ^m%W^fOwCcZjxgVI8;y)C<($4oUDpAEK5;t7!fZOKR_KyND%Inx
zs!@Hv#$_sDNn+e{Tc{QhWrJriQ*$FqBvrH{AmDs^1CxBC??=pingj`oPZ66@Wf{X0
zS+~Hp^<}=l>b%^!4hj3=$ZX}lq$HJ(BPj)&I_GGl6a#a*!!JtPP*b1{I9SwNm>0av
z_cuejBc7gq$ZnI!oFs>jwz)B-1*-vA`e6-{hp419PC@cTv$sGF9xsgt74cTx8K)TL
z`?sI6;h+$-JU2H{Z#p?Ir2aV#g72K~5Mj~iF@Utp0?-dfjXe_9#VPvAAaWXMYfLWZ
z%4XiUHo@ZQB<f3sg~M{!evf_@wJB=}UMMz7S=~lf>Vs;pJf5dFNin6sDRGMZcyzwU
z0)5Ps2F(3f3vE{5Wj|_?c{#6pPLaUn!-X9UC<7)6EI_G0C5je6H0MtPy^fcUDHB1<
zLDdfjW{Ybl@(f7{=EXglJBK|09?mc2w436R!W@^o8h5mtn$-;~k`M<#YhgE-n+Amw
zL9O({sSRgPGf_2S8wA9cXO%g$>EKm>o}wcA3P+z~)KGih4I&(t*%pDGK*5*ZZx(di
zTL6Rz5+J9z#GrC>*A2S7tYaKwn64SpLAX|AaE8ri6YH)7Z<7|(oCXNnw!DH7GPc73
zKv*V@(SQC^L93AS9Of`z^`@w+p*46|>tEek>q1aBN=Xq!h`gxaLdX#SfCJ>Th|Hx%
z!4he*3X!PWo{Axalj=%T|Kj_D;wr!r!>Jn%+DH%6eVK3l;q3cE*AJQxx7L)a=!qNY
z3hr3e+F39s=0wir0D3N~x^{`J87MT2-Ebgs5f|rs=e)5-6+nRm@5uc0w;<IV`Qh}G
z1KfGOe&uFd9hZq?XtSy3`)gHvOgHr)5xL?KB0}9V5HT)y1DM$jlI#+U&Gfo?l$;xn
zPg(|Xn8R{2tH72ZQTnL)QME+L+Uv=02n2xn_KM`ldnDJ7XMGKDLVGLc&Jr~`3*9<&
zqfkC7#Gu=V`6hcr!Qt=}<AT#wGHgM)Ga#B*XYMc6l4!nN3UjWdd)M_<e29>>egFW=
z{Z;!VMDF<f1IG}<66V{IZ7}LSbZc?~0Qhbw)KIW&2R=Xlh(swZ1*6&~1aJySS)zrg
z?@Q-<`{F6y!i-46`Pob(nwrbj@hC|4Ea#~=$oI@CF88-QI++2GT&ENp;lvz-g<~M+
z1xYnQ`K*Q;<Ht%F&TJ@SPGP>qtY8wr@$|wehHw|=Fx^&Q?Jf5otAkKvxxbb1lZbdf
z^rt7Mn|Vqlj9xc1L|mpTr$uA5eRoi0Xf?d8+b{S)69=gJ3T<s^MWymWb24yBoC!Lc
zqIfMtZleaYTbP5zHGn>k6Y~(bVZW~$ck-U>p)qn4Q^zU;y%>V3`RM_sS02k2kS)T>
zm1r^WMhcfgt;DL?eN+Z*Z)%G|q5K#(Qg5}&LT-Gob=-ih|6JPsu!v~4s`yMYzFAuY
zlu12pe@|T?sC%w+9on%&Rt|Wi&5(Wjz4E|tUBVKg=B+f?xh8eqmI_-XDN?DhO<SWd
zTo3?A99w_imP$^Tpsb_DyaH7!=yWuwCo@I3*=~{{Ucjvm%am5I6U2grJ3-`$T+%A4
zxC^k_F3U^+OYyTw7n2s;ypFW69#LzNA+d-20gIa7TlOtBA&ynfRP!Dm1TIY?N-O`b
z!P?U1?Nx+CCU;|-O!=5^uDlCj+?*{M;%n_aO6F4KhzYFsSnNRq!aZ5V2KACF)ZD$Z
zNF&)a{%bI3mRL7?;|>^NWi@D|X&htDvX{1iUfKUQo{{x&i*0RTC;$K;07*naR5_t-
ztz5i4MMx#0YVp$TbdViL=$!6I<&za^Ls>t7?Rt~k^j?jU3JwDRm?I}w#3=>KfQ9>C
zyKCFKfO!H}`VeI&X@K^rmEf62h3EmJA?wuw`Q6c|&r(VvsNPV!CN>vfyPlAByec$p
zcCvr^$A2JlRirD8maO?smP&=xpwOo<-=^C)(mv`+S0|98;cH#RiBqsTng{?dAAeUE
z(CW3<{-N)Bbl!J;ld=ZwaXTkD#G))WyhTc`A4rw=AZeMb(`9TRR8@uk98QUxM~g@<
zGD{}s$J3MQ)J@}%J;h}MvdXwwJSBM`#f8J-`;mO7G8}Rake2(kY!m%(&`d;K>%Qxe
z+~NG9!*E#9K6L9|Vwl=g1ikai?Uhq>1vw9xQ`X{mdKyp9_t#(M`<p6ePS2mbAHw|R
zT-P5iBI(=D|Kfe;yhn7HFPgPA5D@9xU;o*4!{PLz2Txskak=ZkS(tU%gk|EC`e9^d
zRqdxRJLhv1E93FGA5Zi22H9HL^@A|S7)tVq%_?#i*Y_g;a!MkSmOB!W?}^;gr$44R
zr?}{))H%7$5|nzQYfeod!bn7xwn(v@@zvqP{P7R}sRq-lSt!LAaxk0vbC>&DDeq3t
zpQOlbQuM=dI9~L~d4Kz5zP%pKACX8n0KnTXe?hhC1Bl3Yyc{kc_1O&bEyXE@%8=7b
zS6PECG?fSem9W*1N3~Tr=f~3v3%~yK@AYINd4?^(DlymkxKR2K(e<OGq@ETLIbMF~
z4`=PdE%!IG+=!$MP;|~a?^B8?CJh(UgnFxDL0mVSo<AcZrv*%@bPx07yk94hH-29c
zwSQy-Od{7g=VDkkFAQx^rxXsSm($CSG0Z6~VY+FdR$h0$<S8Qd!=Z4D4clfI1QXvr
zef)#IoS6CT%fIHAM0sUu^fzj6Mxzj8v{)WTj{FKeq0FqX+&Lw!4l{q1wNarOG>%J-
zb%f1nwcQFzXPi?c@5^@d^!d-iNjLx?xn3j*$CP4<5t`&LNl7G~o<7I8++TmOw!d@E
zS=_wuN9X%?%esF13prn^y?Uxf<Yi7NSOYVkhFg9@*NxqH3d=1n_mmQ+WV8oukOGLX
z?*F=%5|Qq(^ZhMM_x^A;J--Mumx3h4(2u9_^du>Yq<OmO$f*II44aBYvtP_gp>&jD
z|LaF`t{;!esLMPuHn8(r7US!=GCPO!5fwABv?*t{%{D2~bUPC89i1`)a277=Q3AK-
zQ~31|L^~T6d937LiZ$(h<1%h&Vg;yQ%F_ySdO!EBqIjXz<hF&;rWILvMyn$wu4V3(
zj3w2yu`e}mp#)rc1#7L)+LryERvlOJpjKF~#!ItDmytE(vt;|j*1yrBK}&{4Rz+2-
z_9o^spAaqAP>Ye`)|H|UZ{mfqk@#0e+1hSl<zr<l6ly50|D=Sg?@MxIUp!@asz?2|
zz`Cx<)A?et$WQ)z`4(&Y&BkIR4Fqwk8(QDjmF2087g%8rtlvki`(jta)+A~^h_p5V
zkWCN*?j@yQ<7dE?6-8tnoKm01Oj;-kmDTZcL%f5>(>QF3cxci9R(D4iyf*TMf%Cf|
zzxD*Ego(6e@Xp>;><lX<AhvZ<{gOp5rXt~nbcjg$OLrt}vO=3c!)O3m1yW*@$u7Gb
zxRr!#wb^IwSeBk6;VRgseAP9t4mTVAcGrNliRD29B@GV{))BMSe}Z*mukY^_XP{mH
zLKJG|1-c<^0Fd}k|M(B(eiv)-GF_MZ+w<o?9WOtq1}V%}tFH1`Zu5hz&HeaD71S~_
za~w}E<N2jv<H|i-?%zNlrGyCGaExJEraLyfin_v8Y?8^v3^@=(n3as0!kprw{XNr)
zrs(^_<%d7y7i8iTeSh%%n8K1`Z13*v+g~k_TrwXIXy@x}J-=$$Y$Ulkl<v_agG9&k
zvz`LdGRH8hnO6s0w&|~ma?D;@RvecIJpJ$oavq&WMD?gH_t%UeHAAZ^(2BmP9s*Q`
z1D4e;0K?(jkEgC5T-V=Ue-TcxB;7weG!}=Zp#<Gf1i3Fi{+*QAZp0L3bu#E(Q%-u#
z6f`|Y*!SnI8vuoYN93M9{Ykf#u-w9Yw|sW}3+Bn`_n?S`M9NBT|GXcMiU3wa2xK*u
zMWYA<IxvY-^8G>6-XT|<h@fK<wR~v7REoSp^vR66bhvyxUOuK6IHl{izX~Ty?nJ^h
zcYYHBo-%@5m_PmT@0p{r*{)yyC71HLHVx{n3~WFO_t)}XRH#@JkQ6zl)5|9vb0WGJ
zCJ;y|s+2}H1Tw^^L+ebZGphi(mmmLxh)5l$g;NOg6oU!~a6Da{?^3dulpVq5>hQr0
z_FA`{yKqWj(beAdgY*3|-M04P^;2o3SXc_%ENd|e5WM^NhyMft(7EE>&bMIIq$MN)
z3CrAetYer`T(p}NmWdOu#N$XTi9_fQ=l*bBKRW?LQsUCv^WC7!B!)Qv^FR#0hFP^G
zmmmHH5x@QQpTl(PkC#HVtV1~GDz&4509ayNjG#}Ap4yy8a^vx-8;?*_{UXbBQ~QK8
zqDmr9&M`+$?7JQ^le&@5^K!omr(}+M@ZCVpT|WE{iBbx}Lat+u%l&Qb@T|AqHBzbd
zdeGfH>PklQ-494~IDc@yPjNybq)wRcZ@*AJ$(6Q^iLjUfBrLOD2eIf3kIpORkR<_&
z(l_IB7iOOe3$CXm!0N|UY}MvayrcC;*j6EEEmm2{fTbl7*YjyPIFvC-74$d0V=T<>
z_c2tsIakV7;BJG%`oZe<T)qoo^?kp?m0o#qq4le(<EOAX8<(zKmx^a>(Nc}`Z|yx_
zUE?y9G@3Tx#$1v2y#^SDc?4KR)Kovy%5;n?THa2U`pUVE<_chy^fu>zSd(yT%zG0A
z*iISc9p?tZJ2$$(+ptO*@wd9Sw+52xwtm-ZEzsEQt9vF-DYl&qsYlQ6I8uJIWqobY
zX`4lP9Gfw46<{cs`Bw-JQQ#(TZmR93FY^8Pwlcl6L=Mt0cWOtF%>z<a^%f>4jo@q7
zFjMaluB<rOn1sKfc?4@l8nu^H-wBz;MO#02tw9^}`~GElCqvON1r3KyRv$^~U^qYW
z0(;E)hi_UX9eLei?K-R;!@8*;u4l1%=GO`unjxID;q@E#o)l=^&Wk{`2K&o*JzD;5
z!w+#))n`acAt3U`5nqXqlIa0l4=BtG$W*jW%#{PG-l2c{zy0?Q>hvTQLe`P<%28Do
zlt#&CPES{K^GdJb6thP@F{cl||Br>Eo}hg<a*C>h+6)7<E)4UX(6o^n^ORGB_;C55
zKN^@Sg;`j_e6@p*YI)HW!kIpZz8_0LE;?t5i?NcOLv;Ok>c>+`i>W8_jb83o<H<GK
zud2Os8dL%S3oB2tgn5sr=MpbK<nC|3EYnq6|A+H4IZv)Ha+~S;Z50gE^f<7j+2z-D
zmf+j9I$l2Z<4I>Q*KdDKVc`@dABrtzrNpxMj>zkGFL^6wcn2Wg4TsC|>7#y<FyCXG
z%|2h7jVpu1YM8-EYqAf&`@3#DD$*$|HxZ7@LXJx8kz`?d32~jLYe^eWalCp$GM2Xr
z4YRlm2py6;zx>D?Qi^fDFY_I&O$w+vR@%iO(sfwU!O1xy&$(bi#KZZ66700d6Xxmq
zRreGHBNX8o<T&UCumAvz<jcWUgYh(hFNKLy(guceULo?`a2Uq3et(^1-mhQRv2CQ(
zG-hrf1GXKfuz(qCfPC+KH=dpWAkJ52Y06wFa!pfNrzjvCqcrZRxXf{xR89B%`OoA$
zR=5yzT$FUIdipvQLtJie*&WYyf6-LVe(1&{k$2t!Iz*apuNJ<e&mECAZ{jlRuj__m
zHymxp=8~MApaf}Uubvb+6(We7o<HftSA^&MC_M_A6eOYfVmglp;Tk0&G9I4}mk+ws
zQ`8u>Yr*d54fVsQ7#mTxnLSqOgiECi)r8bm<zFxt!+7q7gX$!8rJ?hLWP21+4AXLd
zQ;jqtNv4QsZ#MI-oQBXrBc@Y}k*-ITq_oE+=goHy4SQLecE_iW-uI^L2~(Npm6hBE
zr0C+GZ?ELMTG8@NvG*@Cmz)F1xWckF@*vQPqVag~!=a5m2=m>f@@RQ&T(s8CAvtZ@
z9iM*i-SG9V|8Liir{_;B{Pi#Y?7N;^r&faD_}mXi-Mj8@zof7npFT0ixJ*cRIK4<Q
z<5A_27OmQrlvthKOxdc^;FZ_NB4`iH^;~a~FLI8RhJZlM3kZp0c|f7tqr#1>jaSE4
zB4;EK5b}(yL+KWdUgrgNoM@usNFb|hL4*LnVUtzV96V*~>)fDp07;)Ed!yhsG)jRH
zx^yZ%z+Cf$N=-xILdK#T=C>C<l#A50Sdp?`Kg0Oj>)GU1w<Hw?5ujG>X9YyPwi!aP
zLxO&{#zNsFx@kGD=MvldI0@;Hqt=i0V5{9)Y)-20<iD?~`7$Pw23=NiwAXXCJ>c7_
z=+yH{ZPPXbOjEn9#88A~3~WCcw;@xRIb7D&W&)!lhB^@bPEEK@Mw8mA5e<IR8q`n#
zz{ndpE7v)(a#pdOP@5GK8+mOz_|`?<j9&JqhwCReGIzoP7U!M=N&&e99W=JpMj1f%
zB1E%_@219QF@^Qc%ypi^js_EU3g1=~T8;QIHs&9cjN)uxgywxz@ubvA0gA&Kp0i%J
z8=Rl<9rcqojhsv{H_3pcwvuis#CbJZ>fAbwpk1_U28fErMF6?2sC4mEsIO>VAmB>J
zxgm%aXMLWlnS`}oyVV48=LJ!DZ`zJ(#I(42VAm)VXokZ@ldsKrY`aLPdIr*L>KZSg
z^9!d<@19plPxb%P7Pp`8Z&+XNdMZ!4LFqoLaVowW#C5(O%j4NZCOQiSisq!&^zixm
zO=}<k2+N|sH>q56)wQ#(J(Sd_6x9#p`@#7h5#yo}JP_uaF?`LMQ-6epqgIT1zKQzl
zPS2mps4}GpAaS{~n9sKb{eeZaKt7=)$=qbdpd=wMWT=XqSwuq4pVC{d=Pd6#K<fI@
z`96k4vvx(8j3PnB+l~UT+LEv)tBLr2?8l>?&2^lxOgD8D>9(fQ=_(z`kadnhQqse9
z@wbsPAG98L40OaPg^*InC-JIg)=}azUpGz$03OeZAm`XbS?S^fAbrd<ITM^!D*B+4
z4P)$vm>Wd1Z^-CPElb6b?}wu~KrG)pqaLJDfHbwFedYK1e03aPTm{VvHtUW6Izu~^
zJ?n5eGN&9Ah1w)gmYxkq#VaOC1$)&<UPfOkatn;YT|eY?RTnBCIB)vH6oZ1)L8QNY
zM8p(k&I>Otx4en+hEa)4#w4dCwXn9Y-jAol`K4?|mBzv>z$pe0%a><Pc0DwV6A_U7
zFdE20fLYmTDa9qs$k8X?`F;f7llLai6I|}!fT4izvt2mU<a9}TG|%Vqa^ToH5D;*=
zzh%>2KO9cw?H;BpAZ3qiAw+T>_93Sxu-EyN!u|CZeePV>cf(QlA45xrMbqT%v2MzD
zNilJ9zRMo@{IQ$8y=?R;%ron}%{g!Qcuq3kzNsuDr2v4=d2)_Z<m}}&0brKAY73{B
z%c}3nIjn8i`U<zCT(ziaEok*6Ec2D(tZfF(qwf!A00w3xC!TeT-P#*;&}cS=lq@GX
zUrNe|53QYQT9ckCTs?#Xpr%|k>@Y)5AklbyD&f@z%@J|JAfWC;{UX!#tB3#sbCO`s
zSDfz|aIX$>*05hr0T6GmKkF(eLYlf+>5Fi=zqYzwO(@opskTtgAAdx2>QeCiNeciG
zS#DpO;|Z+cwhjTN+qdezNYOei+9i|h6Ohsj^d;y(Qbh3J$aTYTeBv<2aMx4YGF>?Z
zz#R*@3FRBBem3Pq@`vNo4|@0w^E6LyDTc7zA9WeIEz@*;^+K~i(qZg5KbcZPCJ|%)
zY1$&z-|e~)$@%`^yIx=6A<Sx7BS+=8<e{Ex#p9*NB>=u3j+YNHEHNx1F@@>=_KPqR
zRt%D+ki$xn3X)hvhVG1rAzR3i2G#wml0Gc=ocjnMqURoln7v`ncY|<BZ*z7ImC8&G
z=NCPA#xRi^$}-SxR2`7y9DoBrk-03A(pMLexZKyrSt94S)t~|(Qa7IJ%r$r9tjKS|
zcj^gLgku1reNAKr(-_1Ru|HmflTPVVibP)f+*-l_^Wpp<hFQ}L5TLk;m0M_et&N{2
z<7%Z0!wi9zB5?5ipi+zcF>Fif#?Fy<{TQaJa8d*7@$vzY?$<A+I~V4=B1ks0y#J4~
zcj=WaS<-~e%zZr~V!zHKpZ8W>sIG^Y@t+tXH6uVs3>Y)(W<m=wV2Xsg2Mt1u`4=EH
zl&I>edv9i*v(MfUYb|#-V_^O;UlIG{t!$|)Z)To|6>Ir&H~Z{+bbf4*ZDRU>3mNC9
z)8j|Z0itJhQ4wLq;?(2UkB1uKQA!I2B2+UJB3RBMEI|`y5(5P0<UEB<J3^Ojl?Ft&
zo<9SyM7DCn6t~pHh=b4Cr;cfGJwe)*S42EMe9$VnKG1D>p_b>BV=J@}FM+XW+yH!v
zAuMNf4v|ie-wfkHA6r<FnNjh*bR!~0H!(kqnv0v+9~BG)u$Wd1n{3N4euLz+txa)b
z&Y^v}3>0ql;~dtDq}7vytCS_ZW@Z+MmT8}9G6qcr&ZcYRT7n>Qk}{hQ>lpx5IIjeg
z)6=({f^ejwWT@bLM!$;*v!drj&Y)ccm`yF5Eepz4W+Ns5AjR0~RAW6s;HTrg+QgI^
zVo51GK!x?9*f^)SynfdDx7CrLI+hT&wSlfBnp8yA^NY%XtnpU%j?gHienush1zj<n
zGGxwv@A~yDjFtu6g28SiN~5t<*bynK1!eB)KuEj-hEhBi)S#$T_jEhy;6@%8AtIAg
zsw5z?2y>J&A#cQ9fopuY%8+e<0vJNU-gZD>CwSMkPtiga-lvdD_c?t6Ut^SDK@v(#
zyg+r?Cfae6jYb}83cN5^6jvvm9qri8sCPMVT3Y7X1#AFG$t*<^BrVsbXwtJe%r4Ca
zry@&aSB$o%b6rVVEZe?=k&P)@(@%5;4APYTxfhqztAT26nRJ=~O~vFWl3E&i(}oxZ
zR(9CQzb2b^xLhgcO!-}|LcfZHnUN_)Zf*w1DFL#zM*tH(((%i0TMVIf;MH)k{N?$z
zy1uJoLPac03?K}g=SOCVW>*&=(yk%5xf*J3A68kk73}P>IH`^cMr<J0oxQTqt(&W^
zZFE#PA5@@GD>1T+4=SikxhIuNRvXGjyRfQ_3I+-^G1!jaVjnB1TCP~Zd4QBP@>S0+
ztzbeu2urlR5s68M)tAXpjYw>!n1v}#<XGLfh^Uxc>Kmu-oy@5?Z#4V5j8-~l@k+eX
zMPTPXh+PeKwW01t2|BLJT%z*J^b~9kL~ZxG-ldHdMZXv9Jw`0)t~dJVKJNecpZ*(Q
z4lxLGST9gg;zX3>3Qynt2knFxiDCWn^FP>)jL4BAef%mwR*#}A<1L17DI1NqN@o}+
zL|8Acsz`NyJUxA@%Qvp)<@~JZQ0bQ(s%aV8w2>R9h@vitczpcm{iG3wF)YlyeEEcq
z5J($eP2=0~UA4m11HcXAFwWNj?nTitnUIPyKOj%ekMo@$MpcD}<qLCq{rod|KTZd|
z;uN-Ry{ItXxzTyIt;=q6*BATr_)X%-F{+}!bZ^-$1raq{u3H}!ZHrrqQN<D}J^uLH
zzhRCXH<3&V*AhXk33U2cuV6X907wj>u(8`+Iz4<Cj}MYvKLZGC%S*N3YUo@M23Q|B
zM7+FysVmZHCVNdLvCpw&g}Y%q-hTjqu)M?+!g47ZA%|U57Bmuvi7?E2N={Cnkle$E
zABJ&$eg0#Wy_54XY#J<=c}9Jp#FbuCLC3Z>^4vBCX7=Okhw1+P_t~K^tMCJ-O<gU>
zsgOBlkf%gBTAGrgFXVh&m+UW!txboXa;}mO5wOwlkoi_I6WJvP!f^}_-~9IU_%SSJ
zX1=`qQnNz!33)#-CytT4#?(a}Sky}7aJpyauwHbNB67|--LJy7rnuSOt{I||yMO<k
zDVT7*yu|gQ>@%HB4%4A!!n{4DR?*kT-~LsG3hUqtF@`N_oCN@<O+>=FaEjyMRI3J6
zYUg&A6Q>Zj^_xHY8xvNF$|7M-FQ0y2dH>`+hb`qvZGKcn`hwZEt)JOdX^jYf^V`3U
z+w%JSM~%DD#b38+5q|pS&yieMU-C4B$oWYH1G+D%2B1M%Irf$7NEMN$<D-7#>*qhb
ze)_}xhaZj)AJ*4THbPD~g>BWE;QBHiKKw|<+mBOVPV41MMQBO}JD1n0i_EO|&<~SF
zTafdaJV6xJ3joZ=JLiVAG^Y8B;-<Nb0`l<whvUPC<@`yQm-EYYcTUbJ#X$;v&yp=t
zN|kk0#;d3tj_c**Yi3@q94!sL@LbVSid!_2b%g5_rqvX9KmOl!E{J;_v527bs?FMr
z68t(lUOLmLCh#pBGHPUZG(F$#I{NE8cV+1Gyb=*Xuo96fMwO<Nzbf6Ui+~Lm1fW7v
z;?f~uNBXGB+fIp`loD6!@!Cd|;g=CRTI2=bmhu-fp#~a>re#^0<_1dtiu+;^jj;Dx
zvMx2R<BdCA#B=SMu@P*3U6Am00D?_|L&M<RF|e$2!rM&!U6LAB@LW5|k_4dQW6C#K
z-EE-3AwBQWe4qdjp~%-3KbkV=`sze1Xn`e#01UMr5Wk{0!LKMB^8ZC8qRHNJqR_G$
zY<olK-sJ7g0B+Zw;%*d-6%oNJ--#}yrKUz${kfPVO{w<;uGbZI0ETiqwSB9zj2>1J
zfPF4w;kzh6V}#?9*LIF6)wfig)w1}7Gr6V^bNVf!-4Vf({3$n`LF}I1OA>_bTh;eW
z*o&BUxr}6$`|Vx3`C=N*3%>o@W{lU;w<;iqdnCys2YoWASVsZlmVjU3|KY#>m;c<7
zv$O*Beke5#t{3G@Ct)6@LrqpB=dUA=;(96SPOAAYx%t=wiJ}>VcaI<4Fez-UT-@{X
z&*}?o@!X=BZR}w+ql$4;XK^hz?w-D#@18DSey$IgnVI8uIooYfn-4!s<h<J2s%E+G
zHFuy&?ltXL(Pqy1ahm2MqC@iA`VzObnzv!G`|`u6^cm))&Q&UAP~|To-GBJO53`<F
z+wua4hts28cvvrCI}g*z5A(~X-xsB`R4y`+d-(7p5>+T%55KT28V4`J^YM{WTrOV_
zV4Uwuw5L-l7m@q?^FIiuaXOLn&p-b?0BDNj<F|jVQ-n9r4+z_;6}0~QoG@U{TO9zC
z9{^xFoa!CcKbUz*DUtU?zOrvb_~UQ>N?rApfSyXt*r0{!kgaX5A{B+jaPYF#s#;rV
zpT{XKug{Pp1}(b4P>9UV7&7H$c^zAZs8`4_Fvs`b|An;b4Y%dX<;yQxN9#Q4{{8nz
zE-bGi>E)L{AW@dp4`We1Cv^cNaxreTmh|I<<pPxFQpY*uJ!MaQNHK5;1*}U~dqKU7
z`R;L??qawo(V**V5q<BQtP1O<?Lms$T4gG`7Qt*unM<N?wn_*TLf4Rug2VBL-~P38
z!}ZW4tQXDp)90>cTDq=cScTd7A-9jhDXi3t{Z#1f6%JAD&=o_z6<EcXEp;B~C2s!x
z4}XzIxtus#6w#MYzqh9I))HYi6|(~~0f_5TLZAG*Z~t63_ZXJAUFOr%FrSLsK34I}
z>+??{DTd&@BN{Sp6$5j$jtT{S0})7JQ>QltNF^nfq*GOu{cP)E9Y6Qh-kg-8s1IbA
z4&;Z!-8&?j4krZ|&R>4cp|g;2h!|E*X*%8;QE`)9)hQ#H)uoyctS?$O(O>{jq(pt0
zKK|L?a0*G4GnZF|$Eypm3a3g*OD~`PQ0E}y;f@nqI&M?<4<jP^ma>$UstBENR~ZHX
zOVtm6-0*^emWpiu0ls111jY8cBWepFN+*7JtNAnKY`$eejlSQFrf!r0Ds0GtN`o*d
z*{}R|vF?}6(x*|SS)_V)bJO|eGq|N<DQO(`bo4iJ*!ya>ByJn6y%nSPihCAzT&@wJ
znwUd1D9X%xyg5p$Dsj^r8Bcb+t@6IXmbPqlJ5w{cVR(ZjkJ4<RFk1)IlG#KiHuS$A
zM&Ia~@M{fy>(2#lWTsykI)6pJE#0cm4R}*RV-+I-U_Z7nrX8}wRciHZht_*<ZtHN?
zhpuJNB6s|?a>}Y6+0R`q$gsZ^^0oQO*W~vFv#=nE^-^u$h>fdU00uK8yR}|5ypXxt
zN$bqd?d;iZ{i55?4~@%q8GP**D%N1ajvk1A!pbYp*Y=&exs2F(q|(WYM`2qCMLF0~
z>G$@E8G^El9If8#CZ=-hZb%nGShtA+(<2oA8Wa`M-g)7=73{tjyMJEu$QpgZ-YaP@
zrrCq@n44%9GHCsoOtbz5MD#!ZxBm$_Kg=g0cYJuC!WP4l4K0g@dM%1MMJn?Nl_#gT
zVV8#@+CwlKBiaJ!S8C#PdKjlu440gIhID@UL`diyT(ysS)GMdi7Hid}c{)9u9zJS<
z{5T!lFs_%E5;ccqcExITg(a{Fkfy`^I3Hhr`9~3+@1DG$zWnm<$@yVAfyi?H?1y<6
z4>~?)^&_avY;||z6t)Wj4(g>;aHg=FLs*o>s--KC!-g1XxO33Fd;3Q1b|(b%<CL2N
zrG_ISphogFdn6G~TDtx-ReBU5%9c`8FD2)FMlS(Od#!M8(X(@o;jY%$8q1Pp=7=`{
zYQ)3cBe@}Li;}8EWIMlr$$xNu$YG&ngQ&)Mk_p@hh8?Hf6(T%*{EZ)GjpPpNxw&L1
zk(XJNNTn>qd^f5bTT)CQNdp~=JdQO7d_FyD3nCiG?|%RQAOJ~3K~x3r%I@Tlt?X_Z
zykPEuZtu(rEog!D?)$&s6qHL$Zrm<k&R=rv?3`B*^pXJr=Py4IIp@b5K*g*s#?Jdp
zWVfz8{r*)P1H98|lbVVZ!A~w~oOgcs=Fk56_0u1pfBHKSk(5sFzB}AKrMT&<DZ;~a
zkd%rg!cs_siBnQ?zqQ65#<B9lN}dDTekg7$fDH4I$f<pE;iFE%B9fT7CbEeL65hZ6
zp?W}X%WI~ys*^iNWAtS<b<Uj2jFr~ou{AC(044&6FP6>ftgZcoW$VP&xQHL-D&#a-
zZ>({x065=0B9dYx>*cjJe7CDFJ*zu9C~KH-wZsIX!|8FH@AOV;QrL7jl?e%7UO$x#
z-I!v`24k%r%$}|(Y=AHrJ9153&B{U$^@O{^PBdTu0Yvkpbn2W^gq+r^@`Eb&&WS_E
zhY$1dUX$)qTt(#a@)^6X4#5;;9f;bpZA!>b%b9Y;qmV_^N+tPmuCsqX&eP#;zI)OS
z49jbZ>$WZ#YZM-)L+xl&ic~96fW%2y`{R7~ybUBG=OrZ*meB>8G~`xUNw*3_lU%$j
z0&0Xx<^qxPl&C?x%tC<DDdoRj*jF7GLUj_6QXo;LpV?GJ=-}^?CF06)tKI@R5~-r2
zs>ehm60Fdw+IEm1BxM#{7w%OYr8D&dZ)COS>IwHHk{Cj;7RH<k{N)^p+p$Z#Oq?<h
zt~&axZRaE+ByLCSZq`KkY>t)x&76Q4aIRTYoT5T^H=ekN%~%CsX<{ldj!OHq`rN8^
zyhmt<lO~L}I7u7Sg2>X}*d0pIh}j@4*)vbN0Hnq&a7E(%l_`Rh!OO387g`JvBBR;9
zr4b;@b|8HhQcK2WuZ|9tD}N)L9c~DaZFAa!uClOBJt0l6QwiZhq{X3^>O&^b4asi|
z5lOiwZ{GyD87l`!hzvk>-Ea!XWzM8Q8pQ|8D%r2a30M9PwTVPa8r(J3()HzX8&$yS
z0527P%L6>!!_?3U3c*{7%ge2KHTFcfGB^~?k5rfx#nSJ~JTDj5P76E%hTf(5YLjdh
z-e8RZtK%cwG~n(X0rC!}lglO!sG`z}DvJmqksC4yM}#{%dd~XBUH0M4z1=vsuo*dH
zAs)A+nu>W=KadQ<H{-PIyV4DA&G518zWJZ{!~OfxzRL3YteL;sgy~z6k6(1;oKl$V
zbu%YaGPR-*YNvz*lylFO-8dcYvpP6agW_`jtSy~Uzh;emQ<|54R5kBSC<8#w&v#E+
zH<6<(h6`H^3n9g@3259XF>_J=g2tfN9Ve=a3ju(_dQNd=P7q;R&N<&ItQwQ#hN*ZE
zH+7NfnY7B|7*Yx;<XH}<m^kWfRkaBk@usTB^N_T7K9ns$v+>YG_4P-iu&_{paI>P$
zx%uvi$Y~aFN}*=A?(B(oVpu~JK_o}zT|z`~`ZHxvv0CK^Wzl&J*ubzZF>G3MId?>)
zaXMtLK1`f4liQjWrWlAw>pNM`+S&MFa>Eq2ON!fcxYNE+y}mT&4G@Rvn3t#<Xz*b@
zOIn8MgosG1a2n@ReY-M|lGzeiR1xLJS()XP1mT=#VJ;%4>%VL{pS{_%%*^FZmd^t@
z0K9zpCI1mZa)a~ZFwW!$mwn)JqoMCe)^7GrX(>i6fJ)-AL3)U^bJ7b?+(pr2<<S9P
z)S)Q?5jj60(dR$@eOO-A&zb;J+_uY?ZM|d#A+sN65zwIN6a)0C6is7Ra}NM1+;Tk<
zFz<%ds9i)Ox-2x8CqSh_(LniP3+Vu0IX~m&<?iVlBpilWgn2y^fH<ea^eO?WdfCPa
zRN*<YSniK>lzLTXWu|@%rbf?z$E}Q0Kmawj%Z&e0U4``wh$*fLH4(XSIs%gOKE*9;
zONaE7_^0xX`Trp~t;O_R-Yze3Tc-I=EuV;7F$6$FoDTQOtqALRTh2``S&D<~iB|4&
z*;p76qc9?|a1JcvG#>A3>N1gY<Zzg(gIF=dZ~L=#Ohq8Uio|To`B@P=O$lxkB&5Ur
z2W#KY963cv2@r<qi0FoCt`{2%n?V<pFf(U&9zPyxkK{}Te|h<&_cnzsr7+GXDDD9*
zx3Ws7T8T&K6iqFx(c}GlR$d14`kFQJ;>4lOEvY0{6VX5v5e-${SP*H@K`n9-U9;vB
zH%tdIM76M8(xs#0J3mwbuLg<bgV3e{n1c}AFrS_PAgnI{dB==lRg#`AI6qD*cQYgo
zaEd~x&)&Ag?SkZ$ilUolDrR>g65|GO1-L8XcdQC!5!sfr^P`${q!{D2EazuUEl|_#
z?!DrKh<aCBtX*+D@0gqbDAWuA`lN4RF4jENeHajj`J|Vz2`A>5VyJb~j`e`(d^tyZ
z2%4mB86`bK&y22JV`fY?5GQOGgP)%eahPU}8`NO&@-$mG38#RN6DLwwSp<OHFwV#O
z3#S;?>3FC5jTGZJA1gC`m=1AWVp#n!57QyVO;#DkgHrxD#pC^ZMUUQU*vJ+EMgdLU
zOANO_(dO7-<{c>IFmT0jN=FF}2@o$YzmOXbcTYs*ym!Osr+FBUemrOfHK$E&TtrgA
zB$om+mIgiK`;0kNIMZ|qd=Y^$AUJZl1V-g!&D8-_i=JVeMfmxrzeglcc*{`=+bUe_
zpOU0>_x^iL85Ci+Ej!n%{2T#TVx~UTd%=1|V~QJ;8`uOM`4gzp*7Gi@4j8)rofnby
z^)sh<_wHLn^5dMHm<YjnhLnmAt<swG9ju~Q=tQZVhO!ne=$z(jXN6VakZVKcoV(#4
znW3`oec>2bAZ%yNBh;7I57RK8h-jFO>++JK`YNZs-AUJr%FrfcTV6OO=SLzxPBRkK
zvlEEM!+quW7Y_u^Wj$ABX$|9)dIBM0sZZ+YDjx2iI6>l)Dn^bxYUaCgqq=!I5$-qv
zc~*ic25mxgZ|E9JN5}j3DQ-2@HHIbO7G*_%aXOJ74tI}LSaNy(#d?-;iW+u^AT*4s
z_b6iy3EL${c9<sNaQ~jj>6x{>e$IpEoh%q6!!2g9_~H)L8Rzwc5vVQa4wIBNtCwr`
zN3j=yItDB4SJ6UVQ|fzPj6TvK7lR@ol8~_2OxN@?X%}MyvWfz|+BbtG*f#mWe(qhp
zZ@{E8XGts)5>WQtFXV_yI#tR4jwV|RVX#>RHtL~mIk%D!I&3AETp}W(*_(PJ?DO8U
z8>B@Ih{&(Odsyi+B3IMzek5GR*HUg2W_18LRA)#v;3)3c3TXglXNRT*Vb0;YN-Hmv
z?)EiBFqfrsIf)lU5@^Se?IKyO1sUxiH#XwJ*o-i+bgl-T61fGB;$F*NGp_oawI;wQ
zKe-eTP1m34X}ZC6+3#|5?x26iRd0Ydh+x+S5v7|!t3}4<$|gWkhmlg~PE|5x^aj^g
zR2LO@q#I`I61n%Or~#ZEGD)E3=FGbAnz!{0aR`=xb=gD2B4)Lh#c2>1>9NopN6;_z
zD<P1{fFQy=`YJO>6#{W$P=_`q@(fHjRRUMrTGxzfPJp)iLY%Q8ZTE*hZXV@U7i)um
zs|?64>4LYZeL-`K&^N3>ysfJi!@7E##VEUs$jn|&R^g`^zr~6<V-L_AJu`%p!`-?%
z%x+`G1l9Tspc*_?Yr`s5(V#RWr_Z`bdyN?5U;m5$wD>RF(0`~tx6Yi$`5?@BW?qEY
zxwcM0ozClF`R?1_vFJQpjf>99`B}MMI=RhZ=vn$5?1NM>Z*OYMi1hH`M?W22KmQ@e
zoU+u<)Pw=y$SHy~T}%;;$f088N(OO$EMxg-<r7GByniajp<4=D%Gm`-M2{bT9LB@T
z=S<HP=F7{c41Ad-UYX5^uxZ{xxjW7eq>iTb98rU-6ouK3Q(d=J9g%6!N~Oq5^dyNt
z{@LGfikvom9a9V`Y?(u$QUpW3w|^P7cjr+6h{HG$xouq}OOF-4qdxQ%R4|}_By9_p
z{16bC?;h31tMoCrEiWQMl=(y{#pU&jJ*}0$o=;kGi0Frrh}PxO^tpauPN_JNIzLoN
zT**Rn#jPJ|Pi(*$jN4*et^IU(`sU9;{cI6YiR@uj52vuL^$IQdUPr<roWs^rWM=N?
zyMCDN-hJ2PdWb3j(61h*BLIZ;RXDB7#aM+UEwPOQPM&0IFk6Pp+e5)y^SR8xY`%Rp
z0ifT~bt_3Ruy7Rv5V^aj?{t?>VM}QX>m_aL?$AY2=S8f08XNG&j(1e)l-ei+ixG$0
z`6qzL^74tC_v1`{c>n!>xSXFaUw$d;lQnw2-Q;nSl(zMfMLW)s8`8GKZS~VkZq!bu
zwtB@p4E!*XbL7XcoVVqy|I@YzMioxOba2i&@AJAzsrb^>nNDKnv@Pnoe0u!&`0+Q<
zICh#b5Qgn6%<J+B#rwBLqo^vpz&xbJ4tg`m`FG#_u9}l^iaG&VUZ1rZuC_9Mm;fX!
z7fsqB=bUqD@|>sg22-sv6)f){r|75IxgmF!oJ3@tkHYo|?)4`MjdnhfN^HuB86YX8
z6iyExrV=HjPvr9YtOQH}Szo^tLYXUFc*P#19Y#C81t(5H)iP?X8<w-?Y!Hzq@H~9@
zQIEal{CPb;!<9<hXXgueTX!r{vk=f!!D3B)s*cfeH=uE9(WKm6NrUB9?Tb5~^-KY;
zuWKWbW9?tc;7Wdt*nO=X#=hAF+(jXy4LI&x=nQeIHq9l&1Ds8f{+bg&Uw>eezP9PK
zt5y!u*f3RrYg*ziki}GkJNG+;KS81W#?(JI*K+NcVA)cICxX!FK5FN)+r+iN?#TbU
z9z9Pt1*;cS*O*{7UMTF==0t_E%c5(FQmnSO0`T=z2sBgzt60Wn>h|VhlbuAtXoq-z
zA52y9C&caT@&=_uN#BTZFuiM&C|6vr9RoQ(3(yENt_}Hm1PGxE3V_b70B#AH5O#2a
zVTn5=hv<w4g_Mkljs%YYHrTV6wprJSt{KI>)c{z6o4pvcMgnM-GoX=9h%{-4IbhH}
z5_?h5tUlg;qILC}^o$(+n74<Nr25kVSdocMQN;a^G(@US6D0O}zp^hVG4A&261W9X
zG&Z6j6H;euP+Y^a-ch)*Qupb$wWhjJ_(@4~DaqqXZ{@e&Vl?B=@~i*NfA^n3j_U)p
z!cuXe;Ri~E1Xb8jC-+$qA<QY=fB0d(duN$q>-o7_A*2|xs2mB1IBco7E?GO*w4*5_
z0pi`$H}mOXTP`|*Cvu;D|F_kFGn4Q8`(pozW^I>Ar&E)pRBfh<Mqalh)o#aa72)Ol
zoWd5?S8c23yQgtF<$gbHQds*H79YlWm`*WV;<gOa(T|5OKmEP>v=O<>mrvLP$f&kM
z%t@?okY*Pk#%&p<!_&v#h{(_X__z1(zkB-j&z9Hc_57l@beInasKSgQ)t>+$td|tG
z91U;Vbi{F*iQH0ZE<p6d$T4!<Xc(OzHL4prO97=4Hw*G=mDCmTF=&pwj;Ii6K0V|E
zn^_l$KJL054&$V`+q+H+Y|MHsTCwv=E`OtSbVxC&puV7|vH9MCkQ-EUokv7Sz)90W
zYVf+gjdxGq>aPylC2orr!tz$EF0*P9?5fLrfoup)ew-gZ{E+EdSJb{D%tu80^oPI8
zwKJ$?xkqx&d*=t0kmrO>ZMFoEoSzPeIE+)-*|?ZDLNX!;dwF5K_;FGm6BHs+<>?sd
zEvQe0{?Nny)8X!2w#(SgHL339(@)kU&q|w(V)eG(R8-fW<2xd!=!OXa^tKz-7x{5k
zXhHY&?ffNdmy{w1hjkTBZWsZfI)OPqkRLckjm3CtTPVi*4RhO;*Qhb{h~s?J?OT|2
zaI1}`>rDoBYWiI(sjVl+aJYLK<|DbGZt<5dKSPdF?S_RF@44RTv&tpA5XgM@sDYFf
zRt@XIoW*R)>LNFY6dNfOjKK}Syi&AmW2%nx<#h}qT&gRs?P)bG5Kbv|7Hi}OVWnj>
z|6#>Bjt}pq!yUO%n@AD4ynF%>4x7!9w^!-fCu53hJ@=IY(%U#(&5@c!zVr+!rWEd;
zzMD>uRbLAt9;#pydM9hF3~W;xnbC_F*B{#~6+KHGj&vn400RSSo&y@ot}=v!s&i-7
zOef(SBHRM8Zl*TxZ^E0yFoe!Yt5y_w<8IRUTDnOWsnvQHsf7x3Nz-i%SbGK8=QYB0
z8-clhvH@{#*eJIS2!Ou|++$yW;;x62>w(g*(DiR~<r@G8RM-$&Y8Eh{Q&9Js@cq-X
zb>%H*ujZF^n*=WVn%f5aRRz7lh;od8Qn9ieUgWEdJoaq+t7?qj(1KfwFT~w_klHK?
zbYOz5Ub|;m<~TJm4&_&&hn<QDc2>wJ4VBTkUDb`CNzCpBNoF`H=6xyIb!HOP+@fzx
zznc$47HAaNxB$0^8|ifhfH$7>)hT%OKjp1OeCw&@fokWab=$!qAK_J<f?4KImBDxe
z6tn&VZ-~CJfth$^IbyTtq`V$-`^Vk9V6n~;)~-z3z!t;VBWSxxIsO_NXWzlPTDrmJ
z8<+?7V8$DYms^|wJ5q(*{NnW%iU0Or{g>umus$|5V4V(kemp2~_VV&e3hVv*ABs)8
z0ALL3wp{cf4C73G)c!_IYqUyDVMD~)ERur1g&QFv=jWfow!Hi9cX3-@KmQRCA3prp
zY5tmtrG)h?%;zt^z;%pdt!t37dK~}|!dkqb3fn4f7lmI`4{`tD2O_80DAVyCN?>88
zU8(sQKuRH{I1FRe$m{4ehOHrenGI2Au?YaD<DKU9$gbth;n6(~keiYf>!6EM4g19+
zD=YzxBFx|Z?mtQ?g!PgUt`uX~H0@oPy67ALa*5h0!4aS-Xl~FHa@E+@K$)c3D3U8*
z&5JQE@-1*x!nWk9YMk%ie-D6ReXZ)6+VbjXnViQ$M5><vEulVH=*D7%dV|OLz|3`i
zT*X6x;D?dOg;htDq$=7RZ`@^aqNUG?a=rn8c{<+D_wNaboQvC%(zY#&a(KF(6w!OH
zp~%@jEJfzjq!Ge*Pv1fz<!i3D9jz70yPThYN^y%}&9c^7C>1t*>q_-z3J>FfnPXUT
zf6Sax80X_K9hI2iD#TKBKFmdf)%L7xHxZVzfT$69pQop_a_qc6L;&&r-FJSN*5$Qs
zPTP9cEBC{s9Aglf4tIdCU0#{_<<sw-_saf_A++I1iEgO534kW;y^0-)#`!cI?zF#I
z&d-$(6}P4LPHWx_`S|Ir8FzXZ=Y80gxUH2mkZ}}E5Uhi)l1f-N8J(Wiy)H{_!?tgH
zH3+w?)%*89`04P=zyEj8ByON)2zIViF{-`fx18}MX1z{lXg)paAl6h?n8K#>NY3;S
z8Rv$b<PgdtOS6QX8g1VZ^-KG~%+7hrK#LSpEop#Ft$Wn0-v}J<-hFqtd$Rrz=g)u0
zd9KZ0tlb&xW4X#4ips&yDZ4%71rWEjqQ%2>K+xS!#a95#F@_X3%^57l?f@XZ9p(tY
zg8ia53NTR6hMVb^iT(mCf$0nY)EZSOsl-m-ZAF9|q+c2@a^;^RYNTgLuQpLWMJ2wA
z|GrVZbrn!12$!adg%d+zE=hL9WKJYkWex#BNeb0G$&wUWWB-~jl(YlUxY-(>v<RgA
zb>c2NTe!xC8T&_0k@Xf8d&y9AjR{P#d87I&V}`E9u}%l*G*_{jr|8j9xMIR0CMW!Q
zU<NigFsDMJS=Be1DeMP|bs~7(1>!Z8y-VH8cbh@5dOqbST@(}D4!0SYh?Sz5s-FO=
z^`Jwhy@{RWH`cMZzAVh(EYRi4?tplMdD~{vT&S~zd-wX?>07oALS$Waf-IaQCE?79
z1ZMQNyKKWpE%P*LQr-S;W1R-&&CcHc>^V_sI9zY2dAo)DfCxygLUM#8ovS!YXN#Q6
znw@)*2umtfh`lTNt&#s*Z9KjSWQcX_BSe(c5fQH$#8O<nZh<M+pmZi-R%f}YDt^1I
z*%4x)A39o!ZvN=(jeu7_P?|$qm!YtG7jHOa?@7IHc<l9er?7LcX4rPma~WbSToBwn
zkGG$i*)35diCk;*#mqqs#U0V?8<@l84EM*Qb#NzQ&MBRMnA97rA;q$spFxT*da2)Y
z)ux-cCd$T|*uqL}58GMWmwe#0B(h8vSYAG5=^MlO^B?u557Tj&4&{qbr-;I-<ttW&
zc-iZ#0I`He=K{Q@u!=}_SOplSgY%=RN;TkK`_~fd1I)P$*W#n8o-><tRr6aY?)5gW
zD$BDpk+}tJn-{E{#JkX(CRr;BqcUDNCC=x~P!y?{!ln}uWvoGQ%&L?s{R$!{<UsEX
zKqeW-VoSvxWkZKj-MB)y83qAn<I2nsV&-)J?mNWngcn1|q9S#0%}h~31a<03A=E{#
zr+Z3CKS=GJ#LV+083H{LKrHlVaejcpeM>1KCza}(vzCZRNR>7%7rST&2nB_lfH)7%
z4?ZIYLgd5^ntWR%<T10oZL)m%4G7-M0!0<2*=#H<ewb=s$Z>;gv%oQ|`nn;KnDc<h
z>s__tMRHy!4_)*XAm>H0xp`a{=ETD4NUo(cnt(b_UV-;IP((mC&iw#M>gcqsykb?9
zf7+K{R&v99tT>nR9<$91r?_QKW7q)m7+X`+V+>iqr)GgS2ANzL_E<%SiBk$;IZIME
z4|Ky=@04bcv679;8<Zb9GfT>gK^Os(QPv_6GXf;24Q1JnbSp3<8Z4eunSPvG0G)uP
zgxI;gSc6>Mh_b#-qd-Lt_wOoro>HjE@+yyO117N{j+wlqWq~0i<uS>&ys95o$tI)u
z^r(N&CU6ERk981H;)aDBv@T~GNMb#CEE6%mL1p%@Y4YkC(H@Pi-r5_CbBZB`)en;!
zMrJ;L`T1~qL?Y%S49<@LGGfm6E-{lz0ZG8klFg2$Kw7q!Ff+s&Q*8KXNd!eg74x8R
zpalfWb<mjBDwjkFOZ|cvHVB(dfm+Ych~$SsL}H;+*YZ$r4~Sr@VbGcioAZU0|AItd
z>QDviE-#<dWexydKmSqx=<)HR9}g|FIP2Y$v*!(Sf#3^_jtI;GLO_*CUzS}2<4iG5
z$LaVG)-y}ebnI|>Mc2aKQ2$VB^bM0fftFCN>frrBm|Z}VFki*HU~?Ij-U&*?+Tzvi
z%w9&}q&&G{OmVBi{9qmB%j8vUnfy3WB}}W(UGJu`*r+A;Zljl-uN7pjd^sUmQan9=
zlj4@OC}9&5XNr&~C5016VYyV!j^f5KETu#p$ot+#V9!dZ8%?fR5E~4bf{1I*d07qZ
zs)!<K2aow;^g~dwLO=Ln%!#<<2*B5@8Ne7WDqhrQy6aQXIW-xnZ;DxaGM^s&bkKjR
z1z!xSh#ng$Z$6dC3PjE`L?~Vs^)^<HM$Q>1KQqOsw2u7RLe2!$i2#|@i(X6u#W%Rh
zyr4!fmi|x6KCbeE%gZmE(!1|}SC>TlWDzx0N!z;OOI<I{kNMqEQ(VeVWPcEr6;-cR
zt1NYz4eKkp0TA!s|3LNf^4jeCf?Sp-PKgTDLNYj<cXp@VK-CDMntK%kMV*Q0E8~2A
z1Pl>1_OHB3*CBaod7)cbes`GX(<8ZooD-45-IL<>ARM-H4reeDrXA575z6mHW)zej
zCj<Zp%WH+x$q(d))6++C&X03@+=yvAiwL;^fG7(LkU7P$xQs*ME=|canv$9~Y~rLV
zIlwRzc*S&d7bQ2@iho<roZ>Ja=i|fW<<sT->2P{LL?ylJ+HignVNM$tb_k*qW&ySX
zvQ+=4h=z@1gf`_<pcJz8MX(cfl)CZu%sWu8Q2=B{tV-=)p-4z3wjh2@h;1k#XlMYp
zg41f_Q$66c48!U`Uu76=T5enK5-oO<x_*U~WC(;zs(7W6o3bb)z4e=~BH5(-nKy>-
zNJxTGEr73u6jmc)=|3t9#kU0?`Niglky=26=(zwl-7)&y40(&dZDR8FVr^+p5N(94
z-q701YI>1X@b=J!K(WKv-K{pC?;$}uEjC0Ac>_Wu>|&N}X4#HEgDs5?#DXdvTdHi(
z8X%rc{BHnoVq6)aqipC!b8V@2!F9U;!Zr`ME#BBMA$w9)MrQ<jb|9mmw#9Ya{uYJ*
z3Yj$HiF|`SmB(FQ6gvsA0So*6qzI+)mK8wb>43?%1FNG!0aR~m719uS6AOy=Rmye{
zP`}FpaoF6S%`e=MGw`jK&ul?iDCxXpTQbndr!H$%otPSpr7WVx-J`liAQ0|7MzDu-
z@r}qDY&<eCb}IEHD6u@vr8!fq^t7X9?jg51dewSD?NP-Eh){N{1p_=L3vkufM@4>!
zq{W|bD%A-Z3^@buduxl^nJ5j9Mk}Ovi#t=L__^a$<2?dI{5SvdpXUZ20G-D@4=gj$
zyP>6y{W>Ch9t`;LQ2Gfr^kNCyR#nM67P3lzm20aLS|T@0$NBV_Q)4*h^eGWZNr2xl
z9~KbSU~wyK*p_oGwa59OKYl(wOs5CEZ*jYbfFDP7YAji>>G|h>(EFvj0yTcKU#JeS
zxyvLXa^wfyio74tIV|;{B2faILf8opN`?lg2Ee%i3C~|XUClzkCL@+{It%lM-~1(~
zm{bFf6vDDy&ev4NjwzRy1zjso8WPUzs)2pR^g;|P5oOcDytCsl9|7>g4}YPEx^TLD
z`AK22R7TTC==}(KGdUgZ-U+8p>3@s;l!fHZ>Cu!ss<4LTth@g(9^5dl%NdFQv^qBJ
zF}KXi=sL?5$tDuF<@oUa;lmHxdJgM_oL2>r_CT7SR}=WE%fVX{$h2K*b(K<>j`xSV
zC!^oOuq}{(Q{T)uFOsBC6?9nV#~Bb)*t(IPNQ^<vMU_I8SH2oR=K%+)nPA>v46T4u
z5>Ayf)f#ki01%e5^-WJPNQx4xIyV3SAOJ~3K~y>bc=-4mKOVyJQjOeRKmEZRpW^(8
z<TMH~hM@5y_1|WOf-n`y_U>`l{F7_aqk5t$0C;@(;JlLZQVOcW8AXzCjG=gXAu54I
zsrJsflH<kea(3j<xePcVDp|%lg6_z)^?Xes6qHp-Wbn;z|7tlu|MCC(zYyKGfBrYB
z=GI580+`&ckwa84FfYsP{EW^MdFCXX*-Yn`PZdq6i5cCSSZQTF^HWuDy3Ia)`#T#(
zzg?cU^<3O42rUPycA<Sb<8GIBepCaqVLGG~)rYwzVk-BF+(<;P&ws4#O^Ts9fGaJ_
z`BA+!bO^G%e5wKiH_m>XO5P!)7*jqbCAK+Tlav^uvFOfkb-H8u9Mulx$IVGnI^4gT
zjt{S&elH@Y$B)jBK8M<UO^t9<DG9g8&$-HY!`$jmV&Z2cI(rsW{x0NLgI+*;qwle^
zcdYshO<r!IX5)!aUFxw#c~u?@BK%Wy1YLgFz7e_M8_@DgQT{1kgHXleR4Gf+So{6M
zvcraomA}C&=%g^$a+J<$GY7~)b_~}?BX7}|_iS$gdE1cw);}~t9;uJ5H3ByF@KzUf
ztN-Yj$#`3*Qs)X+o$*&+7TMMDs3yWYI>MVD^>s4;?mt8X>@bkGv>ry=j#Wo}i&7$c
z>5d3%Y&zxnP?ZMl-xMQKvpF`sHU|D_e_d($t1O{8AR35ee~31+2%DTvl`1tMlMOU4
z>^w1S|4uN|auk~*fjLy9q_*rt0_Kvi+sY~+x1*m3lxyxDkz6ZKcGyP=AZ)G$S;A4M
zWVY=?*z54*EAodv;l2zhgp8!ca+;`PeCF9RA(Y(Nitr-#UyfirDB6l@9XvPr8_0FA
zRKIMh6+#9lD~%}Uhy2_B{y(p1jE!Hv79CXwcU3rYiW>jz>QOAL>3v!TUbpVG*2|O@
zW!98&lyK5Y{KIelN|oTkDN|7p&tE>b&#bfMKjAM<(GBD2;iJlToc9|1R((Cx*Zj*b
z|7iVND;?2}_oVT99Uz6}6_9Qkica&<4deBLsU=$zr+d{Dr&g8kOoR)yubGb*)i%c<
zoKy~fdi+LLRod2VeQnH#6z|{vfJm>;e~jzp$G`lK*UQT<|M2e+@b2CB%#k@_nKPx7
zG^Rt@4cVfsygw?;s5_|$-#>ke&LKGjOkph<$$WYJ3?j@iw;)$Q->wxfo2_E~j#H>6
z056|^B6L*fA!RGcL*Fc=Ky+R`SKB@k!<N$+tke3gnJW)PL=JcF?%sc=WR0+1Qe3y?
zEQK0lYx9CICHT5=s}z4{L;;+S57Y4>-#y-Hq{qwWpQtdc>SD_ZA5JCmrFBK-OHnv+
z+^naGzQy{hvs$KPC<-S|IT~J4N}Q@gx8eZS0;aYFBJ%Lzhr|7Q9sMe7_0!+|-?j_1
z$1)lH#`WVCPL_abZMsTIRFNVe4&$6M+EH9*jX+xuHb2hyAASUo%kxie7@Z$DrIcbd
zh(N^S<45mDDX)a(9j}*{ZOQLT3M(SszyHyXb68)<`C+;Pkg(>Fb}}x{&JVQ+STAP*
zQJ+ZXeF|GxFHq*<!u;XKf0iZuh}-2AKvG<_Ac=7c%Q>gw4I??P{&|PHcg_#xnnOOq
zQ;Nl$ljD{`D7&#rYbGQ&9_}&EYeU#BxiQTQrnO>;R@Fmhew?S~c6UWg+hQsL6lRWL
zzI&QakLqovED&A5ug}$NVecEz(pt)2Ia@~ag%DEMqM|7xr>Ae{(__h%P9U(HKa=yr
zcmxDVTS_skiytOG3`o9SGjpi!)|!(#&L_k5gJ^nsas+_Bww7-er;^pW8B^XDEOL7U
zb7Q0>HxLgI8(}WYf|YQUZN!R3*bb%S)|Bzhk!E>+s0QR=J4dmyZ1D}NIT5+>ucVCA
zI(EC5kaxN^o4=Np!alU`&5rvP_}%B173-i}EA2*s&4^m|W6J)4S~9diOAYE0%ZzhE
z_WQo6d60h!ARv3$?OWX{82O5sMMyteDH6@{fQ=DzXV9D}MVaGQ-4Bc~w0414m;2R4
z-)rZw<ybXYI)X@+sEBkOnsoj3TlNC76O+9CF37H{2i#dJ?ya$_v?EIxvp6dAjN~nU
zK)i(>y{SF#nflUG=;duR>Sop<UI_v^V~E^?Az0S|yt;c>Q}MC^h}iu4+bgms01^Nh
zbr}NIp(&btb*y5_-3}u+bx{4nz1k79K2B8Px4=fK89TiSk=<T1c=Z~VO#-{6V=%KK
zeL^t0GV`K#o98X$K<Y%ZjyWybA(k~z|4XRx<F~H3bTUn!)~}T2!dMhR|NH;=U)Og!
zhBaHS)-p}RkF!p_5HW0<68sS9c>lyH#u$lQ6$|Als1aaltx=57+AJLa!n#;|%#ZW^
zyYG;kYOd?=3Ss3C!gdA#=SM_${_@8>-Bme~I=%H6Is*9dKtw4;=ZE?9s4>mC`and0
z7*=h1ifp{&fVI+<9FemL_1z7nqTL1%fE2eBHs!NvhIJ{0sE(;sP}Ny-LS^d_A}z1a
z6^W_dMb$RfAZ#McAAbBx=~=j(l8CAiA}6-PMNNC(mWwKmogXv{$&M`{``$H7R0KF~
zY$&GChURp*f9JAcRc<@ZUw+Pdsa<JVuG$TwFsBqipbtlcZadz^X9$QY3Xpo#N-a=O
zJ;(FLUHP{}IbsDsL<zU~+s@BF5A*Ty<8O$HH)#np-<FrKp8J9Tulm<&smwMluOjSu
z0L;}NfB^7#|86|o75C(%9|Xb`EzmQW5RoXXOAIR&mjk^3{6GW062fK>!70`dxEu5e
zr8ufw)Q=puur0<sJx}P%d&I*y-+%Z)t;zj34b!o4cbJO+84+Q5{Z!q(x68}U29IpI
zkWs|q6&OI|kg&|G9k%@QsMK^fjDDChM3fRsQZ~vsolvbgFc)xPIfD+cQ&e(qHgLe*
zvAU0DH~Tgt;@!LN{Wuq!v@9pj;`FAnsDcD{J;krZH<u~TFwS|O5kB631YoU>4#kXc
zIX^G2pLJ}OvZJ2tO0KvqeNK);!p8CydHVLZ)dZDe)U}(!s%B;gurBA?5&B`25_0SO
zz$JdJK0%iq)o&azDQ;n1h;pizj+PPeaR1KvA#5wu6oI&=7-|Zh)h`ayAwTi1T<0v8
zLMWE~nWv*V6CFPzk{jk2*07#4y5=1fThLTw){s5qkbKwjW@==9RS5vRJuQtD?|$%B
zjDkwn0gN?=9j$3K+(>GXE}Yq<*LRWPs4|qDMIj=_piCl7_95~+SMHl#th5?D4|+^&
zM~g_`Gq2ws#US90E?7Iis@<-RS@~qzG3GRL$I#kx+NULcmE<GD-5l|zCmHH9mZX6U
zg#trLQ&bdQx&A`VLw1#96Yl75N!|sa`$Ft3tvbGYiz(lCgl~?V8*%Sul=mKME>zgg
z={j#Wczc+3(`<8h))pncxGMvTGE5NowO?}G@H7`dn^9$ED&_NZowEQCy0TtPpJDXg
zU5XHZ;Mdzwyq@kiO1_Ao;8pV>Wi+TeP9jHc(7iIFaJKvsY-la<SBU2IRCts7*Refq
z(`r3$ZGcqStEy@XMC!%|up^f1XEuGvuV;{<3A`1N*d{x|*J})+EyIrBh8kEdC5Jmn
zVesibpyn0ioJO$|Iqao-0=q=+65rh}R7z_n1R$toF6X#uo1)b=E4*eZzh&-@Z^1k^
z?_QE|+N10aPEP9!R3mM~ep!}0yv9H3d(u`#Mec$04lbyNKps`15Sr6YIv%s(0kt9~
z|3?e}KB}8no=>=%`@)#)uB9ZmVLGK45H1!hs$%n=$ekC8F%`?^GwqrL5K$F2al4Qo
zbTGh4iAEXt*18~Wi-4pU0EuG|a<)u{mI;zsBw7M%lxwAvs8lg*i;0RgHm3+yI^*0R
zkUukXOo(Jh)-vff`BIBb9cT)!<d%p_CN+R*ETv9Nu{f_Ih=#&*HnWbKUXr5x`a`GV
zeKE1)xGkJwSQld@gHZ3bWMxb$9jD3l22}eoqm-}QqO7wnKaiXUiRl*B%N#Lv8-yRm
zB0VP6>b1S8=tJ_^41h>Y=v|`1tg10P$7Ky@ww*(hR(QoO!D8bF%!$LQjeCaN!=|=p
zMDG6G_ih-o(Ro<0=GqHuGm)}3F=>Q-6-WAE5=}$bYa~ZCchD$U6fLMhqs6|7IVJre
z>R+h8o$#OwB&86ym4?y#QR$$=bgU0W2Wc(jwy+h1)lrWUr;@dnWh{ET#`!L7>y~+v
zN$<0trYg-A5pr&MeJ+bRY|D$@SvQPC-Xe23_$@^c!F{rX*r7ySmL(f26{M2XSFa@w
z%HA_*7-u9*adUncrej!MdA&>r4R9X-(2p~xux?9cEN9~>uAsCUZa~osR-0)zjP~U%
z7eG25*6DH?uY&q1IzQ!rb-Ri6U2OS}^@Pi$3PIA%UH|Oz`WaD+e!RSXCi2b?h;BUG
zrMRWI<rr|p{J85~pAJ@@TcM_U{GXqHt`JG>=7}6+Oa17E5hU-KdN;JI<`}C#FqBk<
z7&mnjQ09DtLyI7|pv;1R!XlW~%NJUmJspscocF`b*-XD=;E1HKF_O}5`|g4iDRgQ<
zkPpW;CRbErnD4=l07!0A;0KZ7w(Pl5MEbr+5uFn{DNth7fB6_zBpRp~ZRiO>j7&`i
zBoenJ#c;U$&{ZhKgsYPkVpjl5ai6L1N=N)fO?5b4UVc$rOGMIkuD+ltZhAa7Gdj(g
z6VBUoJ!rW?RYHD3A`J)}=3}uB1qJuwdPc(|mp)ZF(~A+EpOuZRWaVsP1bo9)2)Z{x
zy%ms<Qv%2=7&|W9jqP+<b#ck#RJGeNtZEgZh8=pt$HN_wQ(;NmE}Y_e`J#s(k=M7k
zix@1VBqg#}f2_O{*>0k^W$N<FLLWpw&RBRudu%Di9W%=LLG3s5Ys2dDz`58eCs}<2
zWw6e*D5-e@mD8l?x*JAOz(n0iuJC|TkmWEli6Ja!H%^|WQVAtQoDO%+`_tn)L~_F@
z!n~v+%nz!DR^vSpVUEH{!EH50q1kZ)q&%*u9p1iOs7`FqB$s*-N=L%xZQ%e0Es{ip
z`8<$w<LpvMDGbxGE)U(ouUm8G<o!U-X@;T#QyM{#!it3R@ge#J9ffUC_Za{g=40n5
z#A$i`T%TYHo9=pt`*-8ve)o;pRpT}vpbZ+U$2vKm&4;z*&!XwnWQfja2Z;dCPcx^O
zwsn{e^YNbJwykGf{CcR2^C50{$v8(AtM!GdiVhus=;F}@FpM*ELId^JYu?s#&Mk4n
zJWPm?I0wAMO%iYBnvq&QlnxGrV<bORnVJR-)xJbHt>@1~Zh$*P4BIk{^DrHeXqZp@
z5@Xm#RU(?|p}ba}g*it1(6Jt|BIhr^RKR(hPo)}j1f)K+s?ky%j>+H1jFK`P$TMJW
zW~wf3OHGh1u141MLoI}4J%6!z5r{Y)P5^)-#Q^2e<nB;+dq2%Pn=~W@W)>zl^kl@m
zM8mq~@Fqm(#}s@l-tOCa-W3X3Z)JfBaAWHr@*3-@>8r{74gAW&CMDE3gKtG&47+&c
zuQFDen`)liu+DE%3d~$Qgm%UXZ7{o=J~q8XM`XYZ+!t>uVOEBr><0wR%Gt6=8eC8Z
z=G`B8)A$@a2+b%Kc4+EX)F<|bmr}aub4fYMh=hVl8<i4*ddn{IHXylYv|oGbcNze(
zXQS-Tn?gEo>es#!%fWI~0x79;m@}g322|T@<c48VtyPH}ivTBmE%El*lRq${PkzWw
zJ>&@5KC1yqh=M9kRmOQn`&$ScWDTgA-?Ft_c!R)H7O=6-+3&XMJ5-W1b4Hk+t3}H%
z%zET&{iuU~r3!cCEYlY<yGF*jA{V3-a_DOp8&Nq{#*a-3n?SY3`fO4XC<0{2zDPtQ
zuv0WO3u3wAMHI8|ya|x=tks+L$Bj6RcJ_e9peGmd#oR~F9#-qMl7)k{SF_l4o@=xb
zs&oV!=;8h9-oXlKW<aQzta39#lRgvhrtqWkM~WK*7=sIeDn~(Z+Uec^+$%j$+N;+i
z<Xx<z0B{kH7S;$6?R3Lp5OLglp>&d=9CqI%5Yp|&w?#@iLQ_$u%B-D-yu7mkXFErF
zh_uC+K%Ytr#euKzjn(Y4WRMY&YeujgjX-V+PFm&szy7QL0*zykQO9EzOP1P4OA--Q
z-_fuw&W|>R>aF8Y^^8<!jfnT}zdzi)yS#qll$MuYYTtdGVV2nkM4UtKHW9X8iik0+
z)v`;O;&)HqYW)rXDQe7EMoOxFR;vj+)!#XfC|n>ZL9wx~14V_W+%SsTBUR>zIw1js
zZLQgUkW--vou3ZJO6V~3ilHK1DpOT3HpPvcfA{@gq`2wCJI2j9@0@>q{@J>N+E=Ea
z1g&&vy{}H1O3E4nxM8XlnWf=y@kg~jVZ}r-aSFq9^5difkoojb46)jXKO5_a_6?Vq
zP3ZIfrA}rx5;BGjGX~O(3seU^9Uf8&%gZMudiv(K%j@UY=bulHAC3<nC54Pf0fcqo
zln{YAh3!(%u+fi)6qXp)VLtg`a&9PF23}r%DoC{e;4sd^e6sHgW<mX@6t{7jt=~VV
zph}D`Bf`jmwB;po4<CP{&pND^uwAe$S`hHlk;p&)^mon=<Kd(mi7J%KJ`yEmANFxR
zk@M#-zYsd|PLt(z*V0gzVLJL@z80mVxT&VaktgqJ1)~_Rx(YM%FdYGynHxVQ!!5`u
z){RvK$fy=&aRmVKV~Shc79>}W#{A{m@@iT%L3GE5Cr&ZNI34ci<Nf*N(|Y;x@csvK
zPBChQPgP@}qwG5J*)A_(yYv>g;)dz&>08~$Q(VJ(hCEm);FFcsh@_Md!3`FX%X^*f
z2Ab`sSL+5<p2#?z=F@|I+Vb*wTVAxG$!~YFAkWrcCRDF-1<?7SMOEk~06>n2+;n)D
zj`x0?oF89){`VbDQ-y6J<i}y0b;l3uYYc1I=UD(^{_Q%KNr&U(>G6G;@<zqX0c2ZV
zR06+aEs?_J<*Ui`n!3L^KNcaJFh}b&qC_fJTj8ckg2VmO-P1Q(QitU=Y>Sow%lSn;
zH;O+h`eC%H<+d@3tYsmQ^V8v^KAOxaC$|6|?%s{_DWw1+DJ&wgUS7Ie=Ui=q6|d5R
ze;B3$K*^q43i1Y19}xt5w*OZ$sIVhO6j_zzxfEL{awo(5Dz#qT@Iki)E>{jp$Bhtd
zF^QF6EjM}am2m%di*<AOuaLPdju1=+VwWwYHziXmOlM?t72K(Wr6@palPovb$oOW*
zDSIogM$s`|MK?JthR<33?z);AK<5Q$wdi6=`pv-Xx^&7vg+&VcrqIc%^nTZx8-2DV
zxOR`Gm?z}!mW5d`8EQS+lD0%w+zb$4xW)T!{*YDEEsa%SGD>m@U2XgjNor+SCLFax
zgvJAE%eBt$73@*oZ|z)b?wyoBeuW5-)gxAA)Sk0qF$wb@)V{pn6VldzfN`gj9tWy|
z_dI>Rt$gT3&-+Jcte<o3Zx^O<42Qxf!ChK}>?RVuie~?gl<omr1Yi*$2pZD=E$7AS
z)&rqq((D5z`pm*A$bXZ8q~xbceX?nSeU7J*t7Bc|O|Nz9_IGltH)UM6$!+o#njr%2
zgj`xf)M~rs@a$wAXal+WE(r;co8tv$DyCK7TQQV&-<@0!i+!f3pgvdq(lA_XBP-$b
zCfeD(V6c-PXi|2HtIo9N<HPasqk>P{<t1#3M(81Vz&DbtO|+2J0GMbe3G1bfwW_Jz
z<2Qe1oW-&HG&TF*w&miS*I~GVWC~#IuD_NKJ7H<%c5{kE<c3LGRUN+qQNu25hBY}W
z<<U~8SYAotd(z{_AN?>_izeap`uX=I#9&LsMphsDG@o?Hr0t_BMufG<sw69{{=bIp
zjfmifDQwGndDWFM9gf2|7qa-uC9gx%+E}?5<eVQ=bm9D<$&_(hxa7H;h_Cj7_;IR2
z_~YF>KTN;;<NxcY`Cbco#O?BWdHp;e@2BIv`YNH-DuOVlu)Nr<M|)F0j^sQi&O|D`
z=Hla}&UwR_g~Q`?azzwh>RjX$F0Y?J`)0`mA20v_A|CGExncVBkN;1WXpp;m`j#b1
zikwo4VLm+$^U<pQw#&J4C@LlqL&)nyOd@0E0ZF-d@Z&VjC(hg`oeNI2VvEIGTP@Z)
zrU!WedHUwJL@vc(3Gu@G^7#+fHiy~5dzg@@1fW}OOr|Pu3_4`03eMBxduv>vpX~hT
zhKbY0G5T=^!1eMa#qjX{hm>O6F1qo=ZCNj`xlSiSLPe#=!;#3Ruyy{WSHut_sFw!L
zBOtlM>GAmZO<XTZtdC*UYeqCfxBA-+1QNrRVi?QBR6__Yyf#e7@o-mmxvfm=6)lL3
z4TR{66oFHe6v+?h{C0T(k?DA!9sfCn^-`Z2I<E)A;r`t?-<ADyQ2~ao5JVit>3Xt5
zZmfwDmzSSKIIOG6uCjn5Zo2A3<l)0_N|FYym(R6a3+vervmYmOqcDW65shy(9@dG?
zJ{nsL#jsVUXb{mL#`_OH5_!d&e);|1UVpf@r|lB}{5T_#q*$9g<-4JCu_Q`@h<5P0
zp&d^5Vrp<AU(D?=Y_D-smj)p35%$?-aveYXRWWSqtZJ}LUBm@UlQQ{hmd#iQDRRZj
zg}qq*YbM~>8Rpeejdvy9E=ZyFTi4ab73O|b*zKea(5T6^f|bIH=<Pi#>MQMlmzsKG
zbmDcIqWtJ0*4ZmVb?Wfz+7G$u4<LeVNYH+MoiyygbOGC$wK81|jY&(?PQBZ;*2O0e
zup2f&Gg#tcBbf)f?dC%7*knY#*<MbgWhBpm%(SMw(NxzSmLjn8`V#AZU0L1K^vKve
zxZ3EdcE61r#*GxC>)s4R5!(|qZ5B#JR@%kmjbZI|Tfg5v-ZnhDS)=dJfg6qvVqG5$
zDukVcb1&$$qo(}|Ea|&gMJ7e&NE+cmM4S^b<xg1E*3heYYFC5b#$ALP(jK|}d*5I@
zG?GOB|Jj?+yxZjJgXN8FtKI>C9Ma;lv=NP~^o`jQ-e~MajQxXQfhr?i7z<Sd?a!<i
zU%D&l0D^sc+KN&5b!v!MVGv{+xz3cF6BwWZ0p2h#6u9~G%Oj}CxW+M{+`($qQhrPJ
zYXK1fQah0U?SJ^Mz9vGdvUi2!t$A(;$^v!6<c2YAYf3@=uAaXAt@@T#wbpWeCPRI^
zcEZd~<T1~CoF9fU&#qF6yRKBqxUXwWi4gH{dK~9dovvrRjX7p<v=m{0L-IPi%A{Vv
zoF>|v{~ESZwm;p6NR<66PtyJ1hC%P88|Lnprnp|dAkyjSo3Oktub=0;cZa*DV!hqJ
zIGkcwh12r-j3$n&(lSeqXgT~-Y~m*XLPDaP{8BhIAb`&AG(FnRmZCmW!fGbFbAFuf
ziWWH4lykK|j$xB><m=ifub;w@DIaVmR8O}&EvPGVXFA>=?%qi)Glkdlb1e}h>jCoP
z+qpDh70H>=z1mr)uz~;!J3qQ%)I(lFeDoGvUOrXefjMdqRJh6=LkI!3T*3n&`eADB
z{spYNd-|s3A}Jh_RuD-sGRG7`m$8Gl7*YU!7?^X2BO*CJRO2zzC}>9uJF1l48SP7^
z<2}(3x7Si`u?|@+sY^tr!<~`j-gy0O+f<p`!u-vj|4qsGY=Zi2dChiZB6`F1t=!h7
z#ong`H@r!?p|54ihzNe13nq{QJ~<_|_~@X|X42-#`RQ;!9q+?-NnzWTmn<FY^CdV1
zYeAkP2oP0WV5oI$rE|l0@Z&)*NyGEj%S(!Jm=0i~E?Y0IihiORORimVmK7COwk$}e
zj8UojUcY{v@0gRij`?8}Nhu~BD|SZ$0;-ey)s%;ITLu8cuwKdv<d47kE1jH)$a?-<
z;%Z}xk-RUNpy<7?uxg4Ck*32vb5QquZV``r`~IDwrfnkIk`}&u`j%4)+gZ<ZPEj2?
zg}Io>Q|EioOkwn<QQX!TR&q|Y=H`cIp$?II`0%5i-{d{HA#9hlt$r9w;1c++$(e7+
z-qF~4an&#tNn=uE3A3iM>MpsCh^3)Vt-fv`u5^W7Eqvvx*lc&X&Z$1e?l5SqZ%c_}
z;+AUQPVtdLxRry$*MlP1_aFI_b#f!RCAAMI5DmEj$pI2MSCb^`!z(H%Fg{OjO<yb8
zUaz)Hsx%R3R|(_wQ?7mpRp&{C(UuP$MN<)g1+Y_9m&-$ZOCsIi`u4|?*<o83PtI}S
zL||tC0dfl^y9LpsZA%nw=$5ESoyBVPP%ROp^q1F%fstC4OG?*6#J$h9u_NrZ)VJuS
z`A-pmayzMb#O*!6ZukrL{BrD=z?nyi*Y`}sj$z&ib=m!-3Y_|!6PXEnxECWaS66sR
zQOxUh^Cq`9QLz89P{z-1x*SL+>x}@Sl1fCUEkbYJo=1t<Cc2<;*f;C@tw*e#H(m?O
z<>p<x;XMsGs=Be&vAJZIz0}%MT$N0>4A_hZ;uXugY3f^KH?x}2XakxV-FYKP!meOV
zrhOAL<&k90zngh{rd#jb?UiO#pO=azE4Q%}_eN>1{3(GyfqUN@#1(?H=<qI=DaxKD
zRXA3roBxX3flFw3_N>xHro(!o`Sg@h<QUvI`C*z4cUffxQ1i7*%mAxiEybW(R79?1
zfLt9Yjnny}>x4Sl;^M`pJ6Uy3nop1Ui6R13Q97>6>o6V=A#4{;X*}Fn@^=<Mqa#Ot
zn2_8!wVS8FwDwggMortT6n6XkI--FTCu~kBM%~sCNgZ$XIE>q>F1Uzze*P)NO*pNW
z7f#9fL0L-zIip$IptvrXSuU_UgOlkXE8ks8{Y7<S%1X{yQ^>I#cUoW;a^^fthpPXr
zTauF8{5Xlo^72`h*N=+;03ZNKL_t)9QwjxFX<WXtTA~L1WS$H;6tCW9CTFgtqhSv^
zr4;pCjA2PJNFF+JeZ)EqRY-?3?KWf4R1(rbpe36_6P4?V9j9ZKQI~+$5S9|BESw^W
z5CNh#oteG}B9JG8zHLQaK_KIN^24NSuu18YsI^s24ytjWS{_Lqba5j$^wufaD7+lx
z1zBp32~Z2=WXteegA$S>1JL$`;XffxrJ%$J&X2{^0xn;ER$l^zpt91ylq{^vxUeC5
zT~}*p%4;RIBSgrLJ5yB~jz{QrKZt7$#GEj*bI({dR&C&vqPZ?FnY2dehEYW|+GPr*
zYEz(f4_+1EIgUzRhjDg(^nTJM$IQ+T%qhy69kLv$|G*9Dl!zauq6raZZ|&4e!uD%%
zW{~;#$msnzYwywes&f1}BhFEgyZ(#1MN~J5V&kC8PuADZNNzsfA%LnX)wm!pR1tKp
z7;a>*K1CG5cGhYhkPy>Ohgw59u*FdngtA%ow0p9gpM{yz28h$)j#6@d<P=g2x{t*e
zED~1ls_vNz<oIFEg8H!N0KOxgFkim>lK+(R<eVR-VLGI+ltB^tx3OKekexEH6M!1i
zk@M5(iQ}5$=7-r0llrEou!=|wxocMUqpXqQEw0NAG8;AJ7CPJ5?i_{`T`an6r}m+k
zVyJ=vB2q8;VVDIlZc7a7bhxuvUtTdHh~$RJ4bwg!(M;o=^W?l*7g~%+mFzp<R9zv|
zB@htFQQR&WBO<q)pDWxNgIe3T?ee;wUk-Oq<KZrIyW?6@D-{oM!z4LLySp~4Uhn3s
zhDRsDz^KZTtm_A^s_;5{AI7-?KK8G1K1!jMDAU2Jl{-!o0H;XgXdJ8fj}SRURn=#f
zSAjUXcn#+OvAEP@4C}U>Yv_DES3C}xxWP%;&&>`O52n8-`&5eKEfLamxSLK7%gb}o
z?P1(5<orOIo13WYG*v8|RZv+wG!)jA@zfU);bEBOl7m<es-%@)l~R<gUv-V;4ULi+
z{$Qok)xtw78H=1ZwV&4bz+k+MlogP_kR0D22Uc41pL`OQd+UZ#7p4GSzWnU`Kt=SX
zPBgYrE;NdC{k~gp8#!_F?W}bR`C(Gw4OoY4M77trfydOwT|@yuH%!hAnz4Yig2?6d
zGZ7(qK=j6Zl2cR|&&l}p@oI`&467Rk@0`m9D?_!7<>K^~b<$aG#Kj0HuMPE-slaK4
zf=Y}lt4)FP9@JD)kjQ~Z43}19<fSTP%ubEpkhB|L0su6zvi2U!`LiFU>2O3OKg^sq
z;RNIy49bln9EvHUHZz%L6xWLz=V6?Y5>b!V#4T@(C}>#a&3ohu6<1VNZ<-$t;#tXh
zk(OMou8Rm~rKul)ImJ!INy14|BImJKh=f%{*wN12f^`T|jvKmv`gS-ztmn_d3EhBz
zUgsqy&bZA^i$9hCh;yDX6a5ui&sY$mWXA-SGD}v*T`sAVs=!>CnO358o1c42&w%6*
zKqx^m(#!UJrDR4#VXO#vl>w+S#wfrt&Z5TL0Kf_1YMX&3S=fP-A_9CB^lGHU1O_$8
zGTutN%I`yyifesr#WRSk>j(?H44IA6norAMvQf^}0$9n@s5Vi}5j!Ix#vwLOTNO~c
z0@=7tp-ft1uSG5P8X$mgI5Svt29Yi?(eRb3*+1@#czZYxn6FY><rXoh4`qawoz|ML
z9A{stBfTkNuFtIA15AnscC!L$#1>;Ri(jFkSI(mmK3g!%+_(BS-4C}cj7GDqi?Ftt
zUk!?q+r)RoUW{C|MzDj3t?>cafQ7yp+SAqQEhj>z8=!qdxzWbK?{<a?E%YAk4Gt+$
z42DhtJ6DXVxHUAQeWI$MA*JZq*-z=D%wDlo529{iZ1ylxQD%-;13}d^XUUfu?jRLc
zkjA&HTKX)wkw4KPxvifoWZXHgVeyEJ<O;E+(A)A@$G!qpF_rzu&EV#0cPf7nEVO-d
z%3}fxnPYWn7hyz~qpSqYiP~m!*Ltu#Q^ex;dj+0XYF>&t<{Fs=5&zHs<zFy!ST9oY
zlogwbVVh5n(|lT&FCZ`;?#a2F=>;Op%j+-x|7Y!8dM#O&G$Av0kBIfyYiI7Andfz@
zZ&g=yH`U@L{uKixga8Q%F@zx!LahcQn7|YPDi92M&QD+h-84{Lx9&YBUwf~$BEsFx
z7??lIBVz5`r@C`+mFMPu#ES56H~Z{+bo*{N%+uLVmwvbt*EnV#&!3~8Pmez`lTcl*
z&!3#@t#e$Q_0g0Ft5SLw{GpV+1*yA#_Y)dBU!EcbYYa(Z8Q`!#&Et7If04)2?GCQn
z$zzjFD9n@civZX6-Eaug)z70f4vh)H7o6SogR!>XohnVx*pks@jGf14A`+RfD`r=i
zoc$IiHQMSo_i&hi8UO$o4)?pmy(X8Y<_}X#Shn1<L(kJS>O?)}<J)&k6oW@&?;pM&
zuTPh!&%5LOZhtb)AzDGGo<IIB%;Wz49fdGmp8#Rlonn|oQWAqtGuq1LqPO4uaZY}x
zd3=&LM4RNvv^jshIJwx3d7;wb`RQ8BCY*?xnY-O#cewZSHTp4lPbv6t1Fw%hNfFSv
zjZi~L4Q%a6ONG8azUg*%)Ab7!-vFIF4oDoy3x~o=yqWw85g^O18s=-G1O;H`<Nf2X
zKgnr3&lif(x`8SB`TCk2D<`M3?)8mz#&zUpqJYK$z%rye%Y@54mq3rZx8E7#x?w=H
zejb@A`iVJSpTDMwh{~L^HH)L6ue)JKAyAwt#u%e@&Y-dV4guy#K44esu;cxEDV6+q
z@zXhV+kWO6EYrlSYxYD^F-dYu{(#DU4;iQ!{94zcapU=m&R#En>4%}fUxh9wc(v_z
z#@Nf(KWI|uDo%u5zsv7n+UI1f5Q{m6f}kJ1|KoCzq9c-vmnMOtz-I~SmmU9b|L9!*
z`RBiM-EcTP0Q33j7wZPs@BDb4$Fs2((JD<UbbZm7n{GI)Ch|CsPx3L>Ck#_8KugS*
zA#03c`0(4m@5js6U;Yvh?;pR9A%x(?P{nmS!6!M(DKAeYVi3Dw7lRLe5|Kl0J)-ol
zB5XiJ>AXutD*Mcu-r>4FAEq>q7hMwVPY=WX&QDh+l6O$kdWE33bQ~1AQ?lGsl)w@c
zlfrpOERl<9*j4qzk~5aff3i3)G5{G$AFGk(G$LOmCs1^1ox8_*tiUyhE5{A%>~tY~
z=oGr<F6O{xlLIi3vot)nJJ~C!TE#0;y~xFkR2&Q&LXO4`01NMbk!-GPu9y7gZC`>#
zZZfaL8CCXLu&gEwyP5@T1f;cbfem}RQOj1TJ7@lS+i)0YcKnU>^F@!cen~fqYyC9y
zVl8uFtUQ*DqBqaa7A&<@BnWR)J~%%pmCWA6K=KWl5O48-xFzEoV~kA2u*fSAUzx<n
zOAkM6N!%}bI^2>q6))DjqVVPqz}u=QgqvcFf^kS7nqr*gasG;+uhbyT6W~pq#db%H
z+XRi;Oe>AYLdR1ZJJ^n_(e;g16|{7W?b}dR6E~zkWNrGeFzJQ0=2m(`(ywkwN-o}g
zn~r8T<Ob!vP5TDxJqR;&l!t0q5_C|*0hNt|wc|Af#$axxbg6j9En4*ET`x@}YO8A0
zrfZc$#0{2GrEa`>Xj|q0*#RC?Hf3HofAJ6hUFH&ACC3lDVek5#PyjT5FppPeieX}+
zX}qM$PEwh`Fe0mQ#p&UP;HUGKpAqry;d>?_b400AV(@nl-y`CDeU4#1y!jCQB-Y!*
z{v_!U6laP)%u@&je6Osz7(zKyC8)YEKBCH+cm1wlQALcborLsE^}FBxOB91rl9st3
zj+ZZfyvU7k{jQw)oWo0t#aj7!$weNLw@@{g&J(7t-*tl!#4-38fYCSvaQ%Tf3W?u!
z`!J8w_&n_I`rR=VR*1knp1)=<G%%^GM%NGB?ob@MlcO8JusaxQujj9&(V-ZOb++q8
zk*X$+$*leTPk$DJpT;v&oX%f_k3bZeqPWwknTJ^@Km=59T_+;eLZ{Y~lH>h*0F2R7
z^f6l{O_!%Rn<NyPwGOrvlRq@hSR4El=V^ccP#D$Y`AdPPij7w8ymJH~NaQycwK4#7
z3m5znc+Kqnn7H6Xex4AM^L0Ur;xq<7-oO8&;u|nszLp%1?D@d!S!|3xOPb(@X1RJ&
zZ)uj1I8qw|UMZnO58wYucI*pZKmOG^8`9-mLjdseBs_vLq?a@psqs@J6SH)L`k{zt
zUjD|k$X%a}!V#}ue=a3s`Z?`kB8y+Xc)p&kb=~g3%+uwov0dptqn{L9q+HFiRzYuf
zuIr7pr-vWW7(YH!47ST#0nsD~M^gY*XMYAb-aizvOAKDVSbX*F-hS8}?q%RIoj;5J
z0~#wH0(D;Ir{E{&dh4w8$1B?%_Gw4rvay$5Q=C2kYE=<~k71g}i?vpwQ7DG48vs!w
zYBhVnSYx|Pz)6yBv1tX6U!5w>`SP^8yFZ*B=J6^rApzlxv7+lw3J<pfrt$na#u)vC
z)sHjnbxZ_6uHTErNA{3&)^&nI80W098ZAgbi=P0X+a2`Ai=|-C#(p8pm=VPB>6g?_
z#SmlccYE6n)ViqaeWR}G;Ei(ztt`3Z{hc;+W3aV*)(spWWRD5cWL)JLA#lklF6VhF
z8HxjM`i^XJmec1=*4h(;4!hS@I@(%i*$v=odb3e%Z_ZcNdZ|`yR2^pP{7;$E0&i4}
zo8@}T%NAY+Hc{!R%dECq+5i{T{a%OMs>-~m^s+46G_FM0aH*TY!J<dSHnppmk@E}n
zC%*FkXKo{?FqM9Jm)F;XH)7DGwp~maVL=vOjF(nM4cqNrt5d+Oren)}+!!rwTm>{L
zF#xXoyuQ&bs+xSm;Dc3zweTE3iHA%6$Z62UONj5K^hjKW$lYi_vK(R=^_kj4M&+2C
zS%?X?F~C%&XkvB+)#;v#5f{`f(~RFY0fbbD)1abonsyU)_@Z)0%PwVrToIb`jH_~H
zxx=7pj@oy&ET5&f!6G@JP4Zi;6ScUJWp}Jn3FWs3jR;M1U6W&Ali#lHncCcv*Mz#_
zGGI2^*&-1hGQ@<uPR>eLA**R|+T7N=<_miTs~uRwL`u_;8eCTE?G<APb*Qx*l>g};
z{5#3Q2f+0^!3?{8=lWgO@2%^MHNY@lo+!q7d_pur;E58hy%1DUgd~9{QH+Z9pX&y3
z`;k!N{qepZj+}T#BN0iRD8-AP&KzS%rnCtqw9Wxwv23nxsugP<YP6N|GnCjDW4ogK
zUEDHb9irKv-ddX^;WFEcVTxh)(^Udvw4$>g4#t`-*bI3kHw=Cjg1Fo|W9<F=Kl0Og
zx;|OgTi5$}q%cb%CcZ&=3RuJs^_6a8kP}_AwhK8tL5j5+>c<st%^5f9nkCVmh>2{!
zGsYa>ytm!p#|!5WwOJW5m4MJHl+15H`G1%w7P0M8MVD^-?)XNw06*m^ug;oSGKVEV
z!X-EA;Kg89uzo;X94+!SvJrH{z8m(|^~QCHLPdVly-$-Km0E@Yz)vF@6y}l4rvV^_
zNlc`O;=7;zPU&6d@wphqNOztb^<39=gRvb&Uw}|?Ge}_?$xJwIot7%8Bh6WxR6+n~
zQAgMx@433e#73=bY;jbN(Tje$ZaUckPA=X$XN(JB22R>@HS-1l9uB9&-GcxIUB9zk
zKVQ$xEFGtC*<@%`Hn#Edbv%DPzInI5d;96H{~x9}9PW*AIc4*Ti2eQ~+kOmQ#@GN5
z!lYk3V_Y{JnCbHLvFmnj*!$_?$II^SO+OqdyCp1K46<M@JA~OzQliQkGF`t~*Y*1o
zFkhZNVh)C*7-SH$JKQB_SAfiO#!VDg@s)T1z?Lj~`OZkOJQ{1AtX|vohtmTB%AhL7
z5au!Zk)g8inyFDbD2<w1<q)@I6+!^5-Dp;_7r8Anm7JrJlq;f+{oMmm;20o>9w#4v
zW|RFg^~^gtb#zTa!{Tg8kR+2a)<}q3wz#7hQiv;)b-n9`ySE<zz|W&xsxi)3Cs}F1
zPmrAdS;s}>!mFJ_R7)0iIc=xL-k^$!$flzu&Yi#jfQ6USmooFGoi@g#UrW}WHfC>l
zo!tdMc{UmOmiPBJdyhsV+~}Iu1qo*Iy0OVTv-ZR(<8Y-J$D8Aot;d`>v<07bo$=13
zds{sx%Mib@rEas8u}v<#@hb`0EM`76Hf#N`k~_Atvo+RQHxXqwZf+*XTiKKAsm04o
zbSU=0C?sCWkQd@IFQ#P(Dyamh83iZ~epXCU_Pr6o`z_uY-YOm2M^3=D)v5~(h*k>|
z6_t{!1K-Ag3UATMU+lJ5H@N~Wiy5`fYEK1z3whwyTeYN<6z_1cEn0T0GR`punGq;+
z+^`1xpoA|v{d-fgSYkEjD>MedNGuTm+I%>%A;JimLdPxj#yZEuLT$6w1;Is(G1iig
zoA+?pz@?j`{#9l%LV91#P`EXnS$3a_k-A{H!eac}4!kiXC`C|aV<zV$2zgQkjjaF*
z1-Dd|B{FVxVYqr#nL@r2s&ZT7u)XLs9W1A#*aR|H1G6Q#xaLNzke2HEzdb~x7?>j(
zOQL8LULL2sbYm?iXaUz4*XGAwyxmUBA3E0=V~=k?$V@^Ok)N+LKD(~RJev{oUwIP7
z8b&Ips1$=r>Yz1eTuwFD4PC#twiAtdf`E+?K$&tdn=t^ne4r2{4JtV{<zcv}??p+S
z>X;aWAE>RLMR=6GMM@qW7TsvFb7iLJi$N3vi{>3b8N)+T<1N&hTxsjL&S*8plGq3u
z*X@qR+O+W*D+5<)xze=5&ou%m3($mDg4P<aD(YSCbK}a+6%?Z66UI<Q?wCLpEMZAd
zVJl-DWG`|CWM<b79HXBuGF^~;s!3hQCf5m=VkT$=cA7M#NuFK5&yj3kt+lq3kR!47
zRtfCcFuj49Imz4GHP0M@fhZI>2#pivY_^$3RSSj{K@oHYn*l__vMlS}&I^esR@1nu
zls5(7MdLE`#1w-y7V`iprZzXd4u}SgYj!2$j3J4+N#TEr{w^p9seLe?XELo<Od!DM
zXGCLNpZ7OPo4ZNtU;fv2op{%2v@^Y2M#?yuIhhLNOUsz<A;jRv%U9P8ZrDji8-s2L
zq@p|LvrWv>g6np{&zGl<^0D(9mt5-*gnCM1%*CAfeiW;Z2s0B+{491KVZIUtYu(}W
z==vQR+wYDAJMq)CoG(cLmK8O|SVSxPkEr;G2!fx+=cEU#>6>Xcph%ePE0Lmy;u4Sz
z9GanE^$^bRCBlM!jDTpJ!2~Invo;1lU7p0lgqcinYeN7)Kc1CU2yYXoa>c_;s7l9@
zf267V$u1*zM#gq%Oz=~d#YDL$66luOM|Ry%+E6hQkXO^vAcIxWoal;K9MobAm@A%0
zDa?SCL`rlf#&y7n*>HXSjK=iC5zv*8NHm72vt0+w;$DKp1;5Oq7caNH8hGV*(8+j1
za@y`6e+Yi^^CW`haDAS}r+%l>v0dL*$kAj`nwARWAgi^y7F;(Bhx-)MO;i#f<9KF4
zoDf~NGu9Mpvga#^BXi<U=M|~cqs4DiHlsilQcGx+BCKj*Mmh-5h<DCBo=e3*wP7{c
zsg`XwV5{d<$3Fntb!m@zGc&Fm_IGGf$}1X2F%bDA59g|~5SKX2@FNp3%RXx<c*@>m
zCR-J+Cva2^T60yNK5z47YAy>Bo~I`nt{Wmuk^z|uL5r%W57V{vodS+@qls6BbIilx
zL_}ep5ZD;&T*t$nVyuD(YuB~E?uR6SFX?S06(N?C@N_)%`@4R3INZNW;v~sW5G`UB
zfk-*29IMmKL~F&ap$v`6f=Nb2Ma3*|6JQEHMI+jf9FRiHS8JU$Mm}Hy8?8fQjO~rJ
zwi~qA1M<iqg3pXpvjiDv>1?pJe3bLaSnF_?S$QF;7fO{TL#7SUOZq`lYiB8f)#V*9
z$28u<7-qTzb9(Ih-8^06Jjt_;dGBM2^LPe?uHRGi(a*Nuxo#i*<fpUTdkQlZDyr$y
zSU~}pG0YTwHLlE`U1IqtMv4)p>+$V}{rw|kvxsUimQ@glXtR~EPWb>L0OBNUkCAJ9
zM-wV8ez}=Hm28R7LVA6SvDR3p*K@gtn=nKzztDoo1E$OnjO?fDS7W>5+Yd>hVQfqi
za^vR_ZUh8vFoVUZUuAJrI}t>;d5+3!J6)yVk^z%JgVvVu0W%*?Z<Hiv(4fLRUBWyO
zMQ9c{TI)m(4roPL7d<c#M_P3J^1>Hr`uhCYSi3vCF{WmT)N+<t<`LpznK)dC<R?Fu
zywzB00ox5mr19lMjoGk6s<3>*<4U2~6l5C|<UB1aez5s+xm50e^)D$zp@uK>3oY$R
z^P4V2S%mTpb_VOhzYyN)O66~|KUT`470W~gNi>6Md4H<UA;&E4F1mQkINl0nLuKc`
z$e_3hH(;_dU{Hx=x4zgEAF@O>$fX4p!*2P2g_prOuVAH~-T*W+Jqjg$D3coM0C54)
zwED0`8v7!Q8`L3IdU3gFynw4zIzdt;OVd+f`Gr?ulO(W+QC#2uWTI<|lWG0-%v@i4
zwG%UzK@nsbbpZo%#Nds$Y_Zib-_lYjGKJAi^vwX1*FoIM@mvMAgQn3dCR(n{m2yB&
zajKig0<JCECv0NVZ)^{UOhh?}jF^y7Kj^d)W6X<pvAtpPC4QaxPEJ)Z3$;LDJY*i6
z=JemRIN$zAc~=yRN~r1A6%Sa#_{$)AMVi2k`NZv^Q`0<R&d#pr7p@ZIlW4D$+9+;q
z;woN`4=fUUWp1oOW;V7I)S)X#6aXwlEOCUz2Pe5QrB1B+e#mealLKPHc+#K${V)E@
zR3lS7fB89$Skt7c+5jd>^l--%qpu=_D6T@8J)w2bg~)EZ{)fN)uL!_3U!UjkS*|8V
zFB(iPaEn#GM|H%wLA5|Mw(B9QU-ee9ATk9%E6NB6UFC3k+~2>8VWtrLbRnYg{5k7h
z<ua<s!6=q+Hyp}+_0x6JF;3FpV(_LS68!eV-y#Zr8k2SXJk8S?Yv3(+!vV6Doo23f
zT~92CX0=3F(%6)Pm$b&#b=LLsbW!SiW`=%$tUG(Y!^7b;?C%wsIQ{VP`6K7fzBI~c
ztT8Fcx*K)?m|Mn;KNKTTkkEOFA3NN?Pp;_9G39<pRX%TgdpT}PXrGi6){^r7(+uOw
zm!FG{g_-tu52wc;+5lh>whJ>!kiB5Y!{IGaVDg&oJ3fCY-|MF<-X2pk^X~4AF?JB^
ziEf}6=JA=C{XAJ~(O79dr0BG@G{ouhoTp#*^zKIrKFpKtdh2?@aIVjvm}66eVs$Pp
zxz-fsxVk6S^@r0VU;+ja(N9;OZ2>l_OGy?~x~U|Q1PJrEE;K7Qoq2cnc7OL4lG)X@
zEY9oGFNLF+@U$4kqgWFw{WLO1A~x3cxs#K`N7?JUt~b`r<5|4mWet~=8N4roE@C>I
z9{Sy#Y|zoqQl>Bylb6cSxt$yK>j!yx{zzdKa;q^0Uaa#l!=c*4w(MXO!?3^WcKhp7
zH385wg4T`N=vtwW%Ce0M`{@G2G5X`%?~ZRia14b@;ipTUE2aAx{VZk+M3G|(qn1@i
zs=PDRj&a+`Js$y>DI*e#NJPw3DJ^PbgTYTaCaK>Y#SRmVjbWnb<#ze$8e`laPZXob
zNVFuTvep$2!3_|SfU$0O?1n=(>|MY6^t*q|MECE1(+!8OKmWh38}_HiBq2>1I1Gr_
z=g-sS>2P{Lw9+j&MYe6+4s+p2Ix7!rwO+>i*l<Y{{Jc<#un6RvnywlW-C&MmsjmQE
zZI8H8b%WNT6LKPsQgOp7e>Ay&qgLVyGazoW$+2Sc)m11@*R>|oG@8@uL$BaO)@AaG
z;n7=62i_RnGp@~}imh`S;DA`X-(q_^v5Hx%*p_cgzY!WSEH(P^tTk?(Ao9PGAUW0K
zNjC)QTdGEeC}MVGYOVSc5usjj9q(s{?l$WKo9KDec3!-SS?7i>WO$2^v;rGyf}jfZ
z#C*<`kET@BOI?OGU~BZx3ynn)s}vsgW_nH;p|`Gh%f`J`{nyvChS&2JGi9+w6k$+#
zMYAWN4yCIxoTdBJt&A28==qbxkQqyvX@X4zAmoTBqYBEJSq==p?$4SjvlhC%Rxty&
zx_^U)4I^7jVF1dg1bE9aCygE%^;*JBYTLK|hzpZ=`SMl>#&Qo-s++~C$Eu`Y6=EYY
zyv0GtO#q8#x@!NHY*?L)K~P2BCxr<WgI!#Z_0m21U;pd>usom`gX?+;A2%*pugZY2
zAMT8G*XLgfXUWe~iH0vLJNU6EBHw)YZ9Ub|1V7E=Gb*I38+HI7d~WOd)*Np6BF*C^
zIY%2K<aKd`p~`exo~e3FxI4ZrBR65G6vTPDiv78GXvN|!yZBLv3vPyF`)LktvrRD3
zyPy87P}0v|KNj$I9-n1vpjg`)J?TkK!Ds;3XQy&?pKq3^3*l0ebciKs)`%8`nfJ%H
zhqoVqi2?k0_S3Z=4h(R8{uG1HDRC&g6QZKsW@E)UT1*Q&IUkwgJdLYVQa(O>x4(Pv
z(*+n@*P}7>ct(@7+kU)A_p|wGp)o)IfB$DU>`#wBFvX95^-tuv4~P3SY!*wWRt_gi
z&`;Owz2IZ;Qk!4Cd}JmW49mbj_zBVM?;qBXV^LUxHabTv;aL=XK@KEOz|R+oQP@CI
zS(agW@Yk9zUk!b*43=cvrNTzI8^qLN;T1`l#e+m4%#(GUXqLt9ppg~zyVK*3f@S&n
zI$xi2Uw8@1cS3D1YwVGwrxzuUwGIvXlFrz?Zp_5h87nX8r%%5VAYsvhtn_&Z!2RyU
zb)|Oz03ZNKL_t)jmp8>2!(@yz30^a`L}9kp62*BOn=G>&^4u7qA!c+0nd9Z_&qePK
z42L)Gve_Zb*Jq0H{PpM6rNS-F_TrwaT&lM6T&1dM0gQ4FUiLtRI>+KZ$V^OkZ@=3e
z-(*|-D8~rJFkZd@Ge~ra+JTpY9sQHV>&_HFPEup*W%R?YkU!^XT5r@{Ka`QpbUnA)
z2+BZ(lC2tZ|M-LJ20_9$OE<ZHp}vDSkLPlH1V73V82udlBpE&eGKu?ndNG*+At^T)
zY}Yy0hcL$wTtAfSacc6+D~}^qtwpZQwaTI}54Fos9t&6cjJW?pgYR=a-kJFuh&<o&
z=|X%lzaCd4V`er8tR$KSVUcssTW|QPoX49qEjeRKrIR>fxWw$muDs1jZy@~?l?Bb{
zv4uuo$mQBR!rSz4reY%i#gtBKV0n{*T<XELA&WIFNIM-bHME&df<^F-Mfr;h&0K{I
z%Ai!YEXCBENX6ah%wcL=@p6eMV~L`JU}!J3dBmwZz~ywON^i=qOXH#q<1EU9)%9R+
z4NV&Li*mEL=uy6@N51tMrRFW^b6;LL8$bEmg5`XRF|&*Fln9s?h5%)3`3;W8hEt*P
zKF`wo_3Kd7Uuh+CGYEv06NN-HR2hK4M~h?c*7e>*L>4d3O>isiqA$yPs>xb%>#v6U
zF_yW0`3U%$r`6nWthiL0-mTt`4V@3Owt~aVIBg&qY`5!#e1KLKHDPnLHmaB_uR8&q
zS%$_SMY%nIfEX(?AQe4DqEiI_`Fj4h|K>kZQXbAE`^ZFMaVtDsSx;Yn{>$}Uh{02s
z<>HQSze__=fNt1PjA6dy`CW`*MpMXs!dp$d?L0o0h3UF(a|Q#z!OtR=eE9*#;L8n@
zY1!faF*RYq2Y<~(c26M%DpA!Vub#AmbH$xVzQFan5)BWnsChWv_rn2=6GeY=3^K;L
zJ|{j%=7Z0%i)>8S8nkL)I8y5#kalnhSrq%F7!a_G0F`_mB#cc~VltmYG{)Y)|BW%u
zcD+zcWu7OcbQw8lc5G^|yFofR1Poy+|NQQ!Kl9_|%g_G|5%1sq6r+#9M?b|diOeH}
zIT`#j_q#hm)P;m5+o#EE1BEVFo~EBFh#P}O;iRxFowv-H@=Hk5^$D|Lfnsp3H_px1
zGXq=K3mvoYnhY9kRk9x8T%JCazKkeBq7+K@Vpj(5hx<qChSK>VqU#5_{nPb%x<1`t
zpx|a{<vK9|SiB2VM!Dipk-(*`>}c!y!~MGjl?)N5^OsUzOYkJ5Jc*c%&`8A@Rtgve
zUuYnk^`bxpr+2?G#)>d^x}J-MYSBt=ao|u_TM`_qa0n-fU~<8(+ld)r7G)P%XL7(7
zj()#CB`XGsGGY{7Xz*e)o!asHcfUbnr^}OsYZ8T7<P#Zgg%u;OdekwCeg8T~nwk4y
zUs?#CDYg2GW0<3#UB9=j>U^ER1<WDL(a+K!%cb7G|H*c{ZrD={^O(}!qo4hB(OS~x
zWZGJRDKE`hG*(1tvZ`fFn<Ef-L7qT_;C=ZOs|{T8hhj{pHDM|DvrE2=PVe9Sre<2@
zC`uXRFB@ozm#2?HC{2%}DiM<a1C`RT8}?QBTfB;r+7+NA)Gr1GX`#rGU7->YdYjdK
z%$|HiD0!fXk8Tht&lhMxSU_ZLvRnp`h_GpewH2xH;*@NKRkrEgX`r;+I1pd+vm46T
z=4{g#v@RFIHOMfV%^@HyvYRvJvqei=nJ;JJ3N&5;xZF>1Q~6%R!p0R}=2Cxs)2T>x
z_G*&EU~Gq??L#36O9;57OkNOU&pPrfB5f7r!@2WX<VQ9}LS^0y1Uf4q-5AQ&%BoY$
zJ0I5UQ)<=-1L=6%6_o%1<%GzuVPwg!%I@tZH@gT+wSy3XU(>FAb4s*@Ql!M6TYM$h
zr0pX%4r*l%$9mb}rVPD|qqZ#HDo3<P?wH9KlfqqrZ++Jia8LjV>hQASUX8ksN!v&Z
zJR}uoZmHAKqk>xqZIw-);*)w&7>&`c6pMJ_#WbSD6}CRn%Bg>i+!R{MH?}xb)fh!_
zy5TY^<C-FHJIVbvU{H5p+^9>IRwSqoj$5%FndVLUi!u8~H6F!jLq*WxQ@Sv1Q8%ns
zI?Hsfjgc)kr`6(yI8(wh7Ja%H{xX;B3|$jJ)+EYfkS@Vk=ei*yFBJS$+)NZqDpkMB
zSDs&8f?<CrnmlHX(Hk^dvkLL7Gm2G()@=|?>rTWx9PSZQ1{fBvCeals5@rzyE7Ec@
zl`v=$`AYq(2=J5qlZ)bj`r*(G2iNZk^Qg=8_af$_7_94@-G%AuiEP(d+l|*}VA$Wi
zv93FR{iT?}ce|s=7&O^i<^;w#1~$epkx*E>VK3p%)^^6a;AaZ+u)ixn6Ak;q(I5&y
z$ixz_D32p0(QtzG%j`-lyz_)Owr~faG0&g=nt}%+M!r6Mglw}=$vD-v5ejQjBSmsl
zWv2TI<kGUyQdk&+w>?>iB4qIs$~-V-<A~!W0b4zcEG0`;zM!7{xUMgNk1-^+WSI#W
zBSmW+BTv^SKVQqSEkd1=(PmvI`-Jv<&}RdsAY+sLOL5adSNsbp1|q<6v@^74c`A*k
z>k}Hgzk6Ux*_=RRoD;D*WUD+eb5D<3x+|_4%HmTY4jB4f5JI@vSBgxnJRpfgkD-(Q
zU}i)YqYv}=QurS(C!$%)OH3j0_|pbm6vJq(Ww1b8%stAF3Vy_3T)zWg=XwAzwxck6
zL>Xa;Rl<1wg2q_eOX9r6uHW4;lU!|q*F<BX&uwEJGN&+MKQ11Zu&g&%sY(S;0o3BU
zTu{5T9?-O?a#1#?G4p&qhk3NFXNoz{5TNV(?0yivCrb0h3QYsI=UH<1<`f60XHYer
z#=0)az?lk>uCmsF75Ou{6I5b5=Q<KtdD;mHmCv95z(Byz4ZAMc(_@&cqh7|(fa|f^
zRCtLxYb=5(8#ty6$joDpL0)g`>W;b<>IN$L7NXbpPEC)6931Dd+a2Ao8xE&_I4FH9
zML$-bA9*nl(O6?#{Z#o)+uc17ktD87*C(*fnoYrwK_p%F00BY%zLh+x7(CR2ux^^-
z6JMaJ7<~+L8{(llDdffen{KNy5~Z!{BdKUw%Tsp!u84W_ujm%<c?{mTuHPLbjoNkl
zes{P$e`cm`cj$M==g)tgxGlztk0La(A{@_8rHn|}CKDib{XWbX!)#sO4SS*(X6ko$
zTUAA3e>4?YvKN42OIQ@CF?a#JqaVwwuI{0E{`A*{N_u_zB()L6q;g+)(kjk~<_jd9
zIJc#%yo3g9J}RnBv(#p{3S6;mV>OXt77k&8xOJyw(NGlc35A5W2cbG*834%m0@QGf
zqD`DGPmKuAn0|LCq0s4vB*D{q_h(572V`T4)ODLfgo0hJ{yD=lk(r~Pk`=A%?jF96
zVFu}miHz-PI!d}Ec`s~6`6`J+`&0<fUEdU??k_XfLc~Dp08nlB&<*=(d=AqUGHG-D
z0d;R7%g4ITpcUqmUd*~uNn4o(2o+JtT7pS3>jf(otSroqfrFpQD|~(aY>YiU{$TrE
zn63cOTPHxY_HWXrmD%vq0kSn9_k8WhNL!ls<m9>Zl1*++h&GjCXpFOqZ!BA!tkrou
zGtuGnPFxt%&R}}$dLdFx*K?Rh?Wm&QBL({rNR~YS2&GPcfrwSCb1_CBVxsJ*z)m@h
zU}f1<HaH^YogbMeU`A{5LY4P1p1=G-zUS`k2N85(>l>~PLf$q;q!c5+5L*|*TJ=w0
zHtHmF3rr(jXo-etm`+&378t}Mm|btIt%!+q_nFPx)_Xb(E7dqnU6qF%n>GFmzNWm2
zfJkxn!oL@DfTmK$EucdYF-otKLA-5S)umk9B-aUsCZ?PhVg&{!rjX^avXdl0oMTYq
zKvd9Q*(q5fH!J-ohVq|8Vu_&KwW}u_s@NG?rgZDP!v-x$-MqXT2AH-yU>A(vJh`N-
zO~%$A^w*NpZ~iel`YJifqw+0+6}M%@;jia8WwQ4M37MCmyD~t>!Yx<GRSCueB%-V$
zSCr!>zne2deKDTUM1$q0c@4)ur`1D&(leI3c;#h%C2*dx$W&A)15+}6NU&;z#pk_=
z<t|eZ#1uX;?`|o<`DM=9I<0=0Wxtq@V3x!c-n;6Dn)8?_Vk5`I;$c*=Xed$(5*$@5
zykvW=#T>659xv%BD4zZpSYnpZ%62c)U$Ng?6tc+Hl<@jY_F-dWbiG{kWDL6^GiW(9
zi-~3nsPa~{OWCV6>!$^?^`ct9zh(8K(m>-nB$-I?wsaPhj~^9PkYUNlYjNEsnsl*F
z%6FAT`H%kF|G3<eLM})$I~2z1rM&t=(T-s@)_wS+zbgv$80P3x$h)7;Io||ox+K)T
zO+HuGA8ps?fq$v(f=~(CFRo!}FHIGaOK<uhr^g?SvC>~w{EBJ1e90@@VKT%M_^Z|D
z<{21M5OHWZ9QE5+(%K-$l;6MqO=1Mh*D%kRt7EP%Q_l#{?G6;Y_fyyJUB8cUrVujL
zk?XJQG9|vJMI{paM8QiQmd>3i*dh=|iu=2_`@6T+^(OfdgX;!N)^}mLJQdKNVvyjD
zs<jY|8X%0%#N@{-*GbKK1b~{EEgv?_qp{Z74vaxW=lYUl9fQwDRCS|Oi8eR=#8t*L
z6&dfF_dgx(-^qW5d6H!i!+iPr3(J=DEe3gNd70<wnoZ!!l$2dxkYt#y=Pec$iZm$t
zIe!WR$&8RQjy)w|z_9PKg4@_$NA|?vFVCNVxor{3{MD&D95zp!axj#f1j*${oEqyM
zfBf4_RLy_@5b^T$V_}!{`@6EG<;09B#VPqYM!!2g6hv;ke6DA9)9#=^a3B8Y@2N%*
zLAi%;j1+^PFMhgG^ko^8LS6$cbrWC)HAfc~Oz^WY)^!r1*)vDEKZqFo6jw=&#=2p5
zmr=)**=dZCiAgrw6!q8NlGq%%f-sHK^*Lh$Lpd6!>r)K#n-9MY)Ai}&KSMMRKmKV9
zv*>DKm}O>^jU!?q)hEYP=C0p$`{ViZAD%z`{>}T}93MXX{-6FI6ywA9e=I-|ZcYsm
z{dn<nGD+B<9$Ytk{{25iTul98*q?^O{pOn+!+d@I#8oI7t?O;qi!$8L)2;TS3=#Ao
zsW|)V+4HbJ7Rp}qvn+$%@j(PUMA3FV5EF&$oI$cY<fSH}?|%E|X(1tAKL1=c^YQ#;
zP1n-dDe^&N&j{-Hs4=2*Ro!T}UsKf)Ow0yq;$X|6E*y}|Grn=KZ`q<NJ0<4VbOu<M
zOD}!BW*8S1hA_74yfCYkUnVW+p;cWyxCtMFauF;PjH2XJDM&2g1;*rzAye*l@iMLH
z=FnR00kh2Q<x9ErK#O#2L<GY~y8h%!qERMoSyK$jucV@p*$W`;S(1v0a5Fh}%`n1B
zL0jB#{??Ozy}WlpF-VJq8;!)T`-2<Hwvlt-O%e)c3o(PaQP4JKSfweNSfTqv?d7&i
z(_STpY`<bv?q9?IRMvSl%F00j<*G`NpT&#JK$OKW*=P>R%g)SM+n$?$(if!@teQ@!
zZn$DGs9w_7s6TL#FSFDgFA%1DrMReDv|WIFfs&-lpbnQyk>ML2cf|w|UzJC*4G34a
z1I~^fh48fwV{ef#X6fnIq(YhOw3>S;F%j8AUo9=J=*p`$N;&zAdhb>9uZ@TSH7<x+
z{Zd&k%3m<smSCH?sL(jxd^NW$$n({zx1)KR@PGWz|LyXn!B4mXfC|N&nU8PY8RLe-
zNqc(D<9WJ1V@ieYlIIph2`(=j2Z|xglfbL{<J&G1{ez!4#%_O<x`2qT&!1E#2P>D2
zre@R(_3{z+cMtvkZW_;}r#yfCxxy0-=-SwnSl1Vj$E1Rhh(x!rT(l)8&-KIU;RmUP
zDEQL0O4~V}KTFOspqS64)3M*55Gyzq{7gyjk#79%cq)rsBGD6NH+Q!>S4`H2RM2JO
zI~-2K{*)C3*9!ZDN!BVePvd#mpZ0fe)kwxXfBIdu5#Mqr*qT>a)ndgpaz!yvn1#eY
zUC*hzZRQ-<P6SJ<K{ZG$izO&V!H$^u_~yfKILRv^2F=pq&zW+aN+=?tDBf(!bFM<#
z%jP3<uhvcEvIml!J=Ym)iHI2}wkCPn37ulPKg`FsAIir!wquTzwJ0%oKaZ{(gh?-i
zdtMpi={w)=?}q)|`22agJe}VCh-fZfe~ErNK75~d7BlSc#`EXr&%Zz1zdPQ)8_%ET
z>si=FySqo_^PW0jiZS?E&5_WL7XTQJ_ttgi&p%t&4afV9@&(JYdubPyOuHzK1PH)9
zU7x6R9^YIW<qj}&X*fjlBXRcHRQmGtxi~K-ram)TdwTp)kdiRhnfGvb({xnKF$QJ|
z^Cde**>cY*&P8o?dH!Nd5}`>7rUYmhL|(X;F(2N%FPj_18I-#fMIj<sL@>6?3G$TU
z;Q*L83WU=Qe!j$PW|jpl2C+<Jk)rq0C^iRoZ$9jf;uwIgAByy79xo{jB=}5WOa2K3
z_fm$;>9VcuOvdf3>x}89Yh^8D^*ta0+Frs|v!_2dWJW+eJ#G0GC^X~Z(Lo%4`m=vs
z))f(r&!1&+___L2BoDb5n921A<|yxbd1^)7Cy&0$U^EU>2Af*gU#)Ix*(4&0YObc5
zCe1)u&00!I{i4Hb1iQR)r-db~UjKFBdd*74Tdv_&e}J!UJ8pq>LRL`JQ^b~4jg3=O
zE5^qSrEtDKmAKemDmK+=R#s>wxD2dx3SFf*BLW-Kh}_%kh~iEJ|3d#1%}7?n<F6hQ
z;?3ulq^PLm7yn}Z@U1@Z#cwEHXbfA<q@^R&#e3F2uu6AluH9JMLlj!MmYOq{_N<vr
zt4RtbuVf>G)xt_uwt1BxrY2a;{HUxn6+d_5xioU1Wlmy|u5%HV@hcYv-hMYX)dDN6
zeeMcV-zz8|mf5+<wrx%0kmMg|iod^ZKt)2+5>FVnys{WH(Fjx+eFb%joLPR|COo#v
z0mil$T<pE3`pHSkT^f|8kj@kUKvY4dEkf_=KI7VDLZAA~GL9~OjK3yd7L-Is?l&=_
z5yGz22M9F^5o;@pYI|H;j58L482uRj(SP@!l+RSK?2I5+gRU68=z$Q8b%O*b%f0jS
z7z!J{2?{_x=3Tou?(W_q8ks6dK`PVcoD&wa^n#dEe6~zbH(vtR@4J34ISMfZ0P@pi
z!IEm1joD^17h;I*h$?kO%K5^iVy64YpBUH}%goa3mP-orDAZX{GT2gDyJ62IvOM*0
zEX-ytwCMT)lyg;T&=Jw#JdWjaWqk|gk-**l?m;@Pl6A$*etf3vTMcN?*we!g(iR6l
zrIHHq`uwRd<2AB`TS+~9BmYHg<~c=Z8ZpSWU7xC-?3i461UDvm#q+&Ut)w;`8Q}Ql
z{qAs5Bwhl*;&!dLR17y=rWRa%mWM*Y6Sb6gG`BiJoiQgwEd|JPF=rR2^7T1^0JiH7
z_wS4`uHS`uoUdmAo4Vbh>v!ibe_*EJ@W#6S{Q0kqb*|sbhEC#Bfd&yNdZJ*AWq>e^
zM4=mwobuVz^d*EO#MTv3H|+BBRmleHbEYIG3j?TCsw|qh7`7DF%puJC<J;rIcM`p+
zO`opMA4~So<~Ujpc%17|+XgM;sL~JcViYd&t+u&5+&`Wke-H#%8dDMb?~eDzxja>3
zW)9QUxXxy)Ha}j2pXTY@CX?XHWI9N$9o+BkO14)FvjRP_9zA(5IP6Yp`~)$C;KwWh
zirUCqWbY+eNwx(d+VaOuKiziXG-6yo$eZG)%RHVb_?W|i(b$53RyRRKHk4z^_5DJ6
zm~cBkDPz3c_)^U@j`O%FtX$0>NY-Xrveup+zE|;Tve+>AD<nzVQm&e!mK57V9I*X#
zB_gNcDdW0kn8!`Cm`_(MUQMN7y-}gvO#jJeUbUUl<HoGlAx(V8Vp6r;pm7Zg)n?yJ
zf0JGy`F?Fym-^0H_322pBZ{fNo^a%zpuIE8z&UIf<QijdlXPT>)PW_76s$3}uE9!`
zNQo>uo(A;5Rf+aZ`SY*5t(9Z?Yrl0xRFP_M*>P>XPW;-z(?9oTOY!X*V!g@zA$@&D
z%qY+p;}9#OQV5nsNtrU11y!#2imClX7OkrMt;B06S;Qj5R+%cz#n5d?GvjG$(Nhh0
zTONceg_TUje1wytwb;tp{?!j7XQk`4v8f+VXXNUi62sG2+17{%O{P*C9aoDfYZ41T
z8C47czXUJc06rR0rDg{6YARW>+*(R<CZ*r#g<JM)`gt*~pDgCsXQ}3M`aCwHv0I-`
zWtu{v;;;V@!40dB`a@nc0nb$q0s>`GyAh_Y5O$0~GV8mzD2&$J)Y{ZDyXpF*0z?cN
zQ*@49KUmkP+=ld96BHh2q8Nkc)$yAM)@>MiCgd12mYFRgQNWZF0D0;|;{Ba)+N!%p
z8LliJKbn4jlq<Bh6HBKkJhXhl39Pqv4PCNYPa;4`(;Z=p2j8BfB3VmAJ|o^S6r-PW
zN_7zX=B(dOWm+ka3w4HqPZm%_k-db%o5pFE(4dIujq9++n<cfdULxXu?Xq{R>w1b2
zk}=X8a>jZguNvou{e3YIh|v>8G)8i3vk_m~9du?}@g$Rfx>;l(TI({DmkM_4Tr=TU
z<n@}iSalr<(bFP&${D$w`l^&!fwJe`nqq3}dSIxYVNeLtCDtGXbD~*p{i}5+wgaHN
zpvo5$6R@(R5vgnWk8BaIW2<Ff7OOcwUyZTd?ob|a^s{w+IznP}{T|Us%$}6PVICE0
zm{Qe4%nTxiD{n63jOfL%JjQ^8m;)@eDHkeh3(Ddsfp8k$ur-JsE1F7@bvGn7lI*@P
zU!On!LDc=j{?3VXnz`E@Z0r+O7iU$`5-N>d9ZVo=)323FexWq8%}m-dk&&RNr%%6g
z{l4pWqS_Lkp~M-M7dF{tRL+I?@fqPHCj=<WP2_@dTNHkG(^5Buto~f7rpcYR5x!%4
zZh^73a{EEKfdjH-XhSv%cMrtlr)Jxw;yJCl>1ti)`kmyW0~$($TObNdv05cml2N)J
z5;2_=NEC~&LIFuB5^~s>_$t2$b^7vhkfhEO@%xm!cK-Yav1hSepUBvVnYLDqmRN~g
z*9sg?5!2wN%M%kNY?IjteO54{H}AWwk!L2x^g4;NK$y=IMX0`>mK()pYPTnYIUw6I
z1%@;e)=J43ruENUPtoO*4EuZadLU7VN+Da8gdmXXr0+^(;J^&okb*#ktyj1b#ZS`g
z4kz2~<n+wM8A0UEDj!ZCgc!qIXnonGB}t-X8EIz&#vFc)C|X?vAs3KH<n)_wth27)
zAKzq`6DA613>p`M57TvVVj1Ih$NQ|EiZSU!EYa1^*Jgu*)uXdjv={m2497Uv#K%|*
zh+&?Xr7)_!X%-HPj}N7@kn^_SlG#5|jM>9INn#XbR31SIn&0eWpjdzDb8*qB0=E7V
zX%}0tA`!9c_sKf~#<Fy8kVG0ed2N!2pcN0z<CE+QySq1cB~>8!7`%0TODm%o1Lyfg
zn6I!R&1Z=IS|-xY><}SGq#EtSl<MHE;5TC(X1GHBPofA!TIM0Ih8V}BVFpFX;*d8^
zK5RPs5&b+${v0!P{Z7)!0iYj_>D8m?Cn;qq=fCC6j7XDNVCx{PMt<UyRyK#$x6{v8
zKV9~x$5MmJeU@62qHl&_tY)+_x+u5{BFrPJp|5rh6N{7l>KWZRvF_fq#!d`ii`|bN
z+z4Ut#vfC3;Rwo-H$5HzfVgZH=kYnwj&?^h4$;_dKs3>$yoh=9tdwx-EUa&Ld21+A
zF$BoDxWF8tO}a=Q5PLbg*0W^Z>fX{$lHcX?mp`~}aQ$v?AG+Zn-M@H8Coo)ocOBns
zcnC{7Yyce8kvA`rte9eqVLeN0?I`gjX6+WUc?&2o?c@))A+_emV$NS(+utQ~9c<o;
zRL<Zg-Iljnem!Z;zgiTp8IXj9I20Q|RS7nWt)mh=RIq(xys8J$Twj$&W1Vap)4m2J
zDV~x8fFz)TW>^Tts{&$5_rEESXqoz%cg_vXi8t6xilfZxa$zgR0&kMDfr-J;q7~37
zhH9+HRZ`uMKKM4@6>m@P(|o>|LM+|*lU*FPuvK+rX8wlYBqwKV1)Jnz8llY&<SI*5
zm^Qr#D4N28(sYJ(9?(l*auYfa$>vaXjnKq+)*ZgCc|>jujm!NpV&=CouutOs#24H;
z=DE!vT<;aD1+2ses|CKucwm{)YRl6mcF`Daj>hUK(Kxua6oK?inVM-!vj=QW4G><G
z?=0RLwTs}^ir+?TnVBin0Ke>EjcAh{J;Npl)HpwsWDnR#LtQO0M!1csev30Dv-#|C
zmelt|fhBq{&DX??5OSNy%Nr{FD<b~)|LMP3&rg8Fi><dN-oN`v9r!`LN}ggUse~(|
zhsGzV8}@odHLYGq_F#oE(GB~k3|3+cHDNi+Cv4Xr@87S*g|fNN<FhpKxKQFVizj%Y
ztu8#$G&4ICiF7V}5b^PcKQ-3*`I^5nfxz?S3sF?^i8WsiwU|WuHpzX&^z)?}4P~_z
z;dvoLr?`W*jClLux7kQqto?~8FfjxBY1E&BDE|1T|5{;)U7tSb7mvc6XU^Ny7-O9=
zUGU>(%MP%?IBh6oEwe_b+laU;`VEzW8$|1>%sik5fCO>xW9Iw!Kke@xyI}{2ah`}0
z(Oha+Oj3mF60k~n3oYZL!c(?vb1H0-8$+_Pwr#NtWY_HgKr{f-q4vX0-zbVPs;m-0
zJIj%o8b{`ScQ+jGWk(gEcQ@=2z)xqQm>eDe7&v2n%`v>n)>)Rr6hjQ&Za(YH001BW
zNkl<Zb-lUWTU5GJz9(g!NTQ@X+R$oI@@o}2lI?e8Ka|u!p`W;ZAN=H}tI7Jd#U`T%
zT@-_#uJiSY;iZbAbl$wmzi!tv0#I`QNNM$PfA_dQJ-DvN<bll7<tYX~?2kmGjV@&k
zSl7vb=$F6x$FfIpayT+wze`gCip7;JHNn$0xh3T2u`E_Z>zs8x=Smh4L-4@WC+ybg
zr#Hq8-d~nCtWB8p+Sa`d1MgDIr>ZRSNF~NF7WMt=k_7!~ED`(+uko7S&Wx+PxkfM4
z&~Rp5*lF_G{ktE<7_xl9booLt%+r{iYN|d&GAP^&6-L&5<3brx!=hiyCx2NB4@yq}
zu#~Th(Kc4(ml2w_WF7sTY|OwI-m(IzIath#+4Ai@oi)6+*kX!|WJ~gazh)(D62q}+
zw%SvWS*40JKQk+i5f^0Lbp5y_t+1}6H&WABEjZll`}yThyLF#I2VX#jE)6nAUeJX=
zD7aP()GAw{>V1mFfSG@-_<<Lbm77mvIn~FdfS1)^rcwL6{1dlc46K$rs*p7r{P-3d
z=vIL9hIIqH_=+}v|HgOWf_9Y^`3%Z{Q7{`s1Y@xs&1$KZ`epo5T;i)fj`ljJ+Nvxp
z!Hvyp<!_)^E?m<Z>QB~_Layy#K51$%vZP9Koh5zqQ+#t*S^6Em!q~95XEYB2YsL#v
z0|vEg3AI1N7PasdOKW?Xev?3lh&n^Kh=Pg$BbELO*h0VT2>3tzXaANSc`u#;Gav5W
zl(3$xgHDDwah~SsIU#E?3g<$~WCRdz`^|SXhOkJMSAh~@W}mFYnTTTuVSfKdf6uzk
zbpsmf$8)J`{B+G`IDsj-;O`D^0rC3uDaN@tcCKFu<2vIym4KW}pj>MhYmM#oDR}qx
zhtkz`!=8wupP1?T{27$|V~qyr=A#)^GTZFfBxc7%)DOFIpDE6{(Wyjexv_VTKe~R9
zif=kU0YX3Q<#@V0eZD?_!kjjjE{6H^{x?OcUk6BA4a9oob^Wf}9k0)y#^=x7aImfy
z6>SkYH2LN$%5Lo*inJNgpgG*XAFof>r;o?`_s2KyFHgT*pFaKgr~j%9Yyk1;<L{HT
zd<-9d_kZ8L{c!*Or{cy?8hQzx2bre&iDG>I{CjL~b#*GY4iJs)$|$>t9NPHF0Eqpt
zGsaGrXUNQvilDg8x<2?RhIw~<E4+hhLQOGMf@okdpRU*gG;<*9c6V>@-hMZaXFp!D
z?qV+C$&<u4E<hJ!l1zn`c4h6SC#7FzsD{X<;CPG9Y~h~=i2d%)7)P-JEd>Z^W7Z7-
zx~|97j?YBW^hi%uJoBvU01W`!ZV<dDZ!+gZg@~beS-gUqj2cJ);IyLh<K{|^qpshZ
zPF@ppeDmIRgPQenm`2-m#`W49N9Hf%^XI$*(`!|%_^j*70(0FC5XG`C&g0SngV}by
zYmx}%LExI_iN;cx>tuSxMwa<2FdNsou1Axi=Miu`f8N}k7PnMf^6L^M`swff8x%qa
zvs}4uKBnuF&%u@%@;8V^ve<+~^1>t2o1p?NYJP|-vMYe#XJbrpTq8gG>5A4F>o|tw
z(+1G*4l*@!{qFwVZzRUpU(eU`=j^#3GQlO)AFfgUzBEnQtTnkE+iiX|*KSXhvM<#F
z8!vDaiUczOAraNsuq{NoQs2@nscJNEISaZ`xQK5jBATcwe%j2!Ziu*l14n7x=riyY
zk3f;rs@rTC$6!G`a_O`l<gCfgI=E50>$S5IZky3+(Js7_1UnPyS!W^*8cY*%NrW_@
z2xiJ0uSrZ-UhjG8$-qsE-*RBGCm6%_R5;J~@Lzxdcq_DNy{DO9F5s6NL@j~W^fvrf
ziJUs(l=k^5Ey64Oz*ez@xVW8sD`N0Q7#_A{C84ySK9AKM&DN)RIn(QW8E>^b$ckE1
zBVy2^vBp?t>4;3CZZ%t7+r8yeU+m&mGtSZh^CtPAnXr~EQSD_f2R6Q{FRba__=;uD
zEf$7(?hXmA&B5-VUbZ}JCOspB+av#%)<zwT$z$Ti<$!ZylnChZ#v)NrhKc2P5CU4U
zJ0M;TY0}Tca?N$b{6GH}|9(}`Vr^dvG4F8qMkt7@%1$Ubp(Ok*u(Cvvl1$FUd}xKP
z+zPyA=EMDCzq=D9`(hHwOxLH+)^*mpEVUq_CM-#OuH{}^H|Ql1!z`+Hq31PD{MNns
z@JF!H$;z-HhM7ym4>M6bOK=h=3O>cKQ0-_}p#tAGgedufe6ZB~Ghm9Lv{NY=E(SzA
zJ^mnbsTk(V)5qj!OeE5BCK~pqZg;qR{kg<kJpS}|%HOX~pY=Vrt~1t+m#@hO0HAfM
zrG9tZ9p5GyZxTEtAF8ysSkn&&X1YFq>H1yK7$_DAef{OH{CN59kN><ZFh5;Hu7c|I
z_2ZeD5G`P($uZMBo>L~L$%2!Ng6{7g3O}>BoJ%tugV$Xb065p7F*Pe(j~O(&rPyvI
z&!g=xtE*Bs?6PH)*wGuC$BH?{w?1+`nQlYdd4GC5J$#>RpktsI=j+#%%@u48aSMHn
zBQfY1=aLOXF>nmFA8^A}veJW%wbt0EtpKp%PBQ8e-D>i_XqWxEF^w@SyjUTt`pQ>Y
z*NY)v#R{`E1OQIw&t)jSE-cC%9SxQ&h?<9LO*ia;A*3;LGKWe}(K^iY(bKyhb9slh
z>xm*O(rHCkjYVUwPoDrFMh`7>L=68*7@-`G{r*1xm4Y8pot)y@As*}f?#`@6_0=GT
zAx2;NLQVCFF>vl#g&tfUO37D3K(v-KmAAZNv7{8`M<cY`RQ85hgRJ|zhyCe6o<+)}
z^P@=kSyFK_Ekkn-5OKOb=TnNU>zQMiM`PT>4}UUWpQp>$ZhzMg$J9*syHY3p@>l;?
zH|+1;ewWDPF%%Ajb)77JW<G!ULzu_MAO4g%X5C%dIkN&QaE$X<ZQ)$f{2?uh30_c^
zwtKjCkhXP_!B({K%b4$~ceX8Ppr5)j5zX6ZA*do&60y44cHpr|Tujop?puC|3(I3}
z>adq*qWI$UKULX$qp~iu5L}czkh<rP?M}@CV5#gF#!aq^%7#Ym36M1#Lho)|zbUsq
zBI}V70gWyG3_A8xG)BgDNg~3W8RJ$CZ$xX1mDpP}1SwszP=5_YiqRWm!E!sbUha&^
z<YhC_0`b+ex|dgPHpZ&952a|X5Gx~Z#C|D8ttu{|vBz6+j=t6NV2)CvTk}C^e(UCF
zjb9-AHS)DY#D2XHel-Bw$ZcQ05hlOah&O~Ht8QsUP-b2*!RuC+=a&M&i7>h#WHQOz
z^ajZ^8C!nJ20e0Nu`MwGNhz<qDbrCyS>$70_JMfWq8<^`C(Qu~>+!R`_1iaJ1=2-7
z!zz0<Sx149nuD2Rad~ARMbTWU%$r_0e{iHqfKL!T>sl&FoDq$6+0LnguGV!DD3r<?
z2ICw>gjka)P5J^hL}Z$s!Bu?*r@DzW(2wBf3DI=JA)lyR6vS!!lj5<-e;_?5mNjKv
z@4B6o=dK^D>!<58Fn7aV;<ii7y6bjw3u5#XyqF|a^$Y?N8)MzDPX>#|Sl0zV1rZ-H
zb^X4??HcQhac<bjjZoBcB#Ob0!~PBsr}Nhs=Kblh)In`q2CAE8V=SZb)3s>Fx_&Rs
z2N9w2sVaN4j{hZ!W|c8k6xL$fR>@KGm_oFTN!xu4yW^XZsU+Xi@9&s+9-mz|;INlh
zPaNa=-GPZ?oSEWud4fb+S41LNiD4GDTZ*Q`q6bYrxfK0$ePUh`(5>xcry$_@`YdiH
z(NB;hgF+b>7d^0DKj3M;d@Xbcsm&7sil}@{$QVc}dvjGN`qw%_rg*r2XRIwWNG7WO
zUMegmZT*7qq+s#9?Av*pEJ)#1LkV#AGa{l*yPg(M7k_|8sDv_9(<5-%1Ss8nehHqG
zEJ>mWG1zWM?;SG<PKb+nn2{YwOc->Js9U9mIF&Lxm-|%F4QD4d35Yh>T2ExZF<}i@
zIR_Atu!yfM-oWI_YlVms9A<JYU%Hy{{6$YvT`!U4006`BjhK^(gI7i=8-OtxR^-~W
zn1rA)`9(|2`{b)4kGra{b$TrrW6?=KV9Q5C@t`rhQ83h|*k<c(v5bm-f+DNOw7C-i
z6Qi*v({?D%Ooo{1<cgwoz3X?G_#G2nGw)8uIwl5))lw(veA=rMn=nMFLB%0b<bbA0
z_blG!h{l5`|Kxo^0OshY@#&K+AxiV(gE3CX=eFxpG(y_w5K$aF!tVG60Q_``A)Fq6
zNO%b#F<ILUhZ7>s<8wanBq)Q#i4f7u*JnspZ83T;>n+AvwuZFl7<>8pi;(jxmWIZ5
zy%0(f!SzF;aRH}x!K4!|*3nL024S914yW|UX+b<O#x7cTWf+*f3>d8Khr?+e&oPE>
z*!R0TKV1cI%jS4qsNprydmcSem`6WdyME9z0P6<Z@5-FWy3S8mVSh05P%_yOjd8Y9
zdh=?dgJHffvjn*N@e-py+&|WjpPKq6yE(s3)*z1OujP{5aES91!^BJ+H`_d&Y!IP(
zIHldE2*x#1Avt+TI1hj}wN1m}-dGp?EIU3LGwe@H(NE9T_1*4J0uY$F8;$}t5{3Et
z1gSDomMcumF@^|$6g+3@wyZ+Ic#Sa>!+d>SbtgFN@6rhrxwy{8Fr_p*7OxKKh6AE;
z-Qc?2bp4uXbSmGx5tvu$NDRJ2RY<a^MME*f5QIq8?~m5?={yD?jO3>bMKsg^O#Nj#
zwXAiVFQEK(sZlbU%m^<Zjiu-jO?fnEZ0U@dqrk9>CW<*~TM1lFPw|D55RE~w7-ot8
z27us4rYP7=6{;)1T*?A1_%muDEnZtR$qs~>HwX*N^<HJUYI+YiFjr}F3bn^-2%XR1
z4giV#+OV{+G!YR9D9_k1@7hc>p1&|NN!mN};m!Mgm*Nt4yL$li<As>y4#xsJBUmN;
zs0nk%X(os+|Ipg<xG97>|5KN2tz~1@@Nwl6!A-Y%u^JG-kSHQ^40B!2`92^s011X6
zWm7Q=Ee|FH-w$lvKr!U~oef$*<mknL0!&o(H#K(04am<><J!Q_qw5D_9U5bkHii_Q
znV-J=Z}5T}rQSo8ZimxDHyjGoFZ!2!nx;#l;P2kN2Q-o>e*gFbr71}~fB9%!H@JQt
zpQr0{KkSX|#E@31K!FA&7}6M1<6Hn@uw_;vE+v<*zbx%fnTO-Oyu#^F%W#WZOxj-r
zT~fuBB#JVM+xGV};?T{&$)bv>XdY4`8pT{hmwBWDva{86MRT%YS7mRAz(vdyleso3
z_FBQD#6TsKMNkG3l&lv6vXPQ12H%*ENP{9RLdj*;3WZcfmaJ;r!oIe!U);)mUQR%n
zvxog+!_4z+BlQmg%E@P}Gt%*-N~*LeVzFVxie)Lj1f2=@ZF%cTsaA4JXazR%7AVcD
z&;W)uZ*1ct>b$)w)**-2AOvHqoMLs3g($e~>gTLd;FtPWUc$~P(pD#;QL$WkIZhp0
zym9L#TjG<vmBo;IP|nlY1*N5|tCdejc^w*mak$ZwZn>nE)H=nV;2KcVBoAQSOw=o*
zRZ(l|1TN!b5Dfqob`UdD^x3MZOlwd!YYUhMqVmv{&9CU<bGg8JB#>wG+1waR#^s8y
z8WVw8@VCl|n%dzUG?5MYZu=XfV)xzp_xcx=@LKE&g^<=*VkK*MF4ek@m`z*f)&njS
z2ieoBoTlCA%38=*QisG0OQ2gQBgr|-I%G_KPnmEdtk-N$Z_v0j1QA(h-9igfuZnJ3
z|72`QL%e)(GU~9%U=))|`43}Ed86@v`LF(i@*{k1KGrDB>G6BPXN<9~ABgDk^<y{e
zhn#Ay=`G{)r|72~yM@d&UC)I%%^Y)_{g_M(Gb=;_jzgG%I8v~#7jQ4rHL>e=#aWv&
z>XkP7W#&<XOj278Qw$V>o~gtzrx{h@I3N(k=)>K^hr74m2|ZVt4KbjhFkhZNDclJw
znv^V^nuy&Z^ZaJo5fjbR6<}j7LKJ`alYiNEy&R9@<%x;r@r=ft9)CzyoG9Yq$V`5^
zGC<c4Xx#bJ@0r=pmzBT9i>Z5Rn-dcNt*N3g6H#svwx_&kjCIAI9;fTq8hz0B6k`Zp
zyBvsY8FFkGEK>bK&<tCl?VTQfu&(cS$KuvuyKcTboxlE~D@Wb^l&r^=iI8Ua<tu}q
ziD=mEiKtMnF(ro-&PXHA5A&$9yY0(`MIsu66tcL#dvm;hU$QFIU<MKK^7IR?);St0
zhlKQn?Fk;|>lqMt`y)V=6NuI4H)|bZtg%)uLvR8?qz|XZ^1jdG6E?}KOI~(?ZKSQy
zKY78UQ5TN@G>_Lx)*^cN{<p`s@8xTR5`rMM<Q-G|`th$_*IU;IKW1qV4~I7ZFrGgL
zKc60dT+-hVD%USBxZUyI*p7*!pPoMb4vl&H;kPl&+C3m!VdHQ(S=U{@eoXLwic`fG
zL;~xYNwfd*9YEVT8IE!c<Mj*-UEkN#@qBy5Tw-^;7a%>Q11SbS#n5UkqybKc2W4<V
z4&4}h@|I(^-Jn@xMT?S{;Q(Q7IzpwN!EQLb{o#)V9w!Phc$3_ZLyXZnn=2V}`T7TI
zyJ3G~;PL#qNKmV9K=4~WLA8cgOfl!D3jpN6MPyEv2!f+h2xx6_6*xWqSa1$^Teh&l
z66ZYifs!m-V#<_QAq!}?=*wxmlI6yjTz#eDVMxI}jP#=27wTZ!8xE}-GYNgPD`x?d
z`Mb$=9t)^#z!(zjH!gP#EOi=aGeq7FJO7*T^tI+h)fq)H!HFl&%Yq22Q8X8tFu$Zx
zS>0rQ>80HW=>9c~i7hTcLpfHIhumPat^(Lr=0(t(0@%fw;hX$&TqZD;x#=<y08tSK
zTG{m4W`gyX|4nHA2?3^+vmn3jcD|^Sz?M<+D-;%~s>K!m0pX@G*ak^IHCz0xi_c>E
zBJRw2id=vPiRH;~PGOp)?HEf)J=~-M<=16>l@d6SerbY*jHbIQM{88=@;|2>hoRX?
z>T3)tf~x%xnh9tCjW&G*Mpz;o+-A$?8Fp)E@Zw&P-7AvWp)Pl_rC+*lSYixV5n}*c
z;(h~_+ncBfnRRjdeZPI*aN*j)3tc}0m`Y(IeJ<c%{KJ0_aty~pVQri<Xq7%ce)#R*
zuV$v1j~@IS{47+3e0rmh3yPJn>vxIj3IGzE7GsW)VFpO{;kW;!DU>XTG!np^1E4-?
zMbFW=UKO^@OhqcM99&*(hhRanSF?n8|Nb|J)1%-XCAFC;`stk8Q_O>C64rZ)yf793
zbi~!VJY?q8Uy`n0qynW=Io!YB9mHpRxl;hMpDuD4*13fx*!B6N1lN^cG>;bvz9^NK
zglkI^v*@Y^N%_cH)R)?bOt>Y<vS>X!vd8-TVrh&Ey>J1Drt8^SYiyVM$(nPvyL)4c
zKwc1z@hVkk47GIKQWU5USkwjNDMp3Lm;4aaB$TS+0PxcYz>8b=GS*CLFubU&yWyBE
zDX_*X%Dc?M24bNF7s-VFMT=m+G;9W7fUe&qLxbw0O^__7({G9MB<VTET5BCzXV3~B
zaeew26OBH7y8dvgRQn8v$Q8;ZN!(q-<~1%kU@RC$Wn>;aGZ#yN+7`wjW(#tklT9Eq
z8q*){gCG5Ph1}efCOgbmN>*V^F(QC<9p@Xh^yp7VNGx4Tw>t<qW!T>jhm&z#iJpjl
z61|o*A2~DN#wM2HBdUn2ya;7%r1NSP(Tu{1Y#Yb)-(k8+J6Mb@cE?j1BAU+Fj%Y5g
zt#yTO!P5U3*JrkQIpPz2FZhWo)GTZ>qZfZv8$uDGiN%_6?z`XqdGtO;kC{q>i1Tz!
z3=G6-+etKDz6jydcD;3-7NKb)1t~sUzgxdMDP3#jzn_jRM7@2L^}tN-MaYKO+$8TR
zgwJ46Tvi#TOt45#l5r^*M_ow2;><@CJzvX(r3=!APuq3@(Sj2E`mq=^^B9DsFEef^
zpI1rKw|URJa8na2?E-b>seoy2oCMz1X%niEtpyaj2Mde3l^M2&mD{#&FB>P70dN5f
zma1QT-4OCc&oI`ag*pU9;Efgy5I23dZ`r*ypH!{#nuxjaCRCcphBMu-0s!*oOVvYi
zYQ{QTf5|BPRW~$omzBmyr5`LjsJLj`Q3ceOrnhComp&2moQD5~Pq=;7xBzm{7F`-I
zTNc)zAm22j=JGPnW04kN7Vc~Y9jIv~h}NE@Bu%X21stLaFxpn^Y%a5n={4WVr^Orb
zhODa+D6}l2=IGzTCwRR%;%YIx9)L)whG1!AB1BY<7l43_&7qL8n^gaIgMjj_=J4h=
z&TYc3BGAcRs%L~@x}vo<Eiyiw-VKLSn5VM7x~?yW2Lr@;oTqc<d67=*fZEQJ1k@1|
z$Cxn5?2na^N$mQe$u4QUks8_$H?u1=&S4pol%K3hJSW#oF^PhzWmGygqMyrUD`_)Y
zm#Tz*ckFjZ`S}{HnlE3N*w15mV{5=d6_((-3v69P^Tnu1k}!2s1`zYGKMu#Y@-tn(
zv#y)YUvu1vFn$$IXq*&Z@*B~ZU;gT!r1bVodF}e4pscaVgc*`rBY{`88|sxK+B6lb
z8us94UB>3XSkU#Orth=<2eIgtp;3*DF$-$n)^-4_+`O3i^zfaq*cU|H;s`&FXBi%-
zW4P`TDde^oYP3_UMC?jA#)*5We8{+BMfvt_mQM?rZ1SZ;1VCAJ(ga)A%cnZNd4ITn
zN5NAJ^23YOyVz)PW_2b8=u(Xn7IaWuTvH6jI5cVRv92$%d6_^?MWL|}--&;RpU%ae
zZMb_A{Z#B1WQpedM=C`8Ha`ekYYSgqp(Gk+X5iqx@Gt7H8PT}T7<>QjCpYZERI(UT
zbf2uW7=yK)vG(%xvDilYY0SVjSl0<_U&Tsboi?TXBP`s<)Lq%mSa*E$ZrGnxkIu&R
zOq6#L4)Zu&#e0%<C~58pd)27;I(oN#8jAa|){*VNOq*pJYmG75^2yJ$Zh~|@DBs!*
z`%+Gcd1QuOn#WOf{aY=9s32s4Ev!*e-zJ9gF$khC>`%MXL#b*Iak_j-ych&OUX8V4
zz9EtrA!;OkVv1X73KNr)es$*E3;Tx5rzIjnvjK|ZU&9(*a2J7P0^b=M7Hw16Lh@5d
zO!1r9)_SmnwU^3;HWqOAn+HE{4oe%t1Fj4HB>LW>>Xj&PJpx~BWTF#aFA3#B%QtAZ
z_>Hn<TWE#(WHq_WwpIzDk_8d-X0M5g;w#H0%XBKYq&7N;uPv<fXb^APC2dC^sJiH-
zUx)BY!fHEA!j*vMH8by~<_CD8o8#@F?XpLG4T!M%saSSfiJ#2xe0tW!9$QLuUJToQ
zO?$OCm6<7Xx)D}J_szU^qoFqXMZt2kFRbSk%k(up2rMlBd8;izOvXt`JBVsxPZi2$
z%3-w1ou4Utv}5(bzS(o=+m&`XqR6F)X$o4E!<689hUJL&o6lz<r>P7i-hS5D2C%nM
zLDGY6-s(j0W^W4ot#$lLKMIb@|5kU+nN%#&qYVrD7qPluhq~~sy&zkQAcBh_=oi{{
z!|wQ|;4^-@Pz+@uQHa^+kz?@btQH0hF_e(*GWn=2f`<8$`c*uW<SzaHt$j(4BuRGO
zduHbD5s^z}t=-cz91h7LC_xa!f2OM-fLHwi-2{Or{QzAA@t_}|e;`r^0Yiy1n4Vs$
zDl-;$H+xTqXUj8l_sFas79_BzDl@{}*0+31P)|k_FrjAhg<loW(V!?M7vp6wO!npU
zPzcEhHpQeB=uUD(d493lkpNH#9tjH7j4V+!R8Rfb<ko4j^kP&wO8st9x-*fz3!LHp
zO)Xn!(IF93{5+1QN7wJVVK4d)!st&L-{nAeT`z!w5auw>DSooxATtZ4t(!?^85tx;
zZ8RJXA(N0Ou%v?=vD!vM3S-L$k;upDYdkoXUEUJAg?VN~h`PhJB#FtaSg#i&SgK8l
z#X{(0=G%u4Ng0cc2t-5|**N3#cy5ZNd77{on+OXH1;$)z8(MX?z_zQ>d~RlB?p@@-
zB=AOdsAmAcP&qXSNgzQ$MJqzEc7R}9ZzL~FC!3CM?9y;RzetT56q-#IdEgKTLbg7y
zPCtV{rZU=;&)OZB$<GrAOc9MSUGSry#^C4ZDJ=yXsaR|U8B7iQs&-LFV+=&-I76!#
zz{c3voKp)!295mer;CDJu&o5DIMd-H^`3Q@o`e_De``^TX*`ACMTkR125AmM=CdQL
zixq?l;SrhdAp;aL<m5_eBy~)Ak<P_b$0o&qlx#3F_<77nkhLU?k-BIhTL-c-=d#S3
z;DnAS6!+a|lgWBZa2jW0Z2kdeDu4;Z>2hKwsSZXtG$xBVVT-C4tks2+mIx7GRJXyU
zC~k8ZA{y&DPz{XagN4lO8dQSob^-|zMYyI}O<~M2*K|2aO(|+&YXoNSX$Q6yo3iLR
zsn#Z&525{MGdZZ;v2}4t$S6t55-ChENL<5k1mQ45B8y$2XGJkRFH$T_B)r<Z1eYlD
zB)?OW%LVTWRFsyuc<IWs<z-i5wDuy5W`V3wLVg~Z$yjGxNAnbd7vgQS-c<(ct{Wn<
zW1Od0oB?B<vDVLXw%ikzt7y_Uxs>Z|>X1iIfJk6+Ju`C%#sDfI%7lM0v2i34A!}%w
z@<oV#yZ~aLfQVgpXee|`T}?#AEM7D`M1@3F(fzw`5~`N1bwmV2)^*8(!_3pAAsAo*
zqu0dNnm|(hRs!xeSRUQgSN#u$D3?PSz8hMYOkO858e^=~d;}+DB^b4?N5pwN<?q$4
zgog1QCBnp((O@$X1uU0rJ>up<1hDn-ZNTudk!I|kzr=~s001BWNkl<ZC<N~j(YoGP
z2R)9bPky?Pp9y9(2G9)32zvd1iXx)Ax)tg(*BWD`HBRI?P-+Or?gNFWGLw~NWzgpF
zJdLMDO;=?qUXI3yY^Zg}L_G?Mj6g>e0OCb8T~5qTwi`_0)O+<pApsy^6%)5`!pTf?
z`FnP5m&F#C=W9ck_4L(F$>evUXboQ?V5J^RHW*{gFyte>P_?;4duZ1%`H0pS@MW@=
zurF0NMPm#x3vrH#vIcMBwh<>_U<z<pHKA=R$fN3IB$e2-(+sTo+E;ZW<4nK6<;4@l
z>9;f1p~0AEU<FU%Ml!Tvp>gF9RQ?86D+64W1#>YIGidlFnJ=#aqo1vVEyUn4*MG7Q
zA!9Tq$Yy1xDdDI~eF3}J@UmEunyh8~c@@-Nbj4guH??JX;oYX@DQO{z#*}qQ=%ymc
zUuv?%?fD*mc!eVl75y4DR_F?pyqV(4&m9+p1YTlER?d+Gt%&JJi<~JkRfwkW;3Mov
zBd;WX!VMrpnWl(VU#)DT_7sl-*4dLUHa6x-DiDb1=P8e$wS7sE7b{9Ydq9*BQJXtJ
z@CcylC|5l}i=|)b2;#GQDj7A1Xk3F_#b{Q*YY2q};_QXqb=kQFDFh0$fRND`Y=}lg
zDG`6RSd1l0SO`575xT`1rr=9%5sXCrT-7;~oM-_MK{;n|OMF9$6HC3+XI^D#R}b2<
zIVUQrpRGzGIjBddgr@O&Wmg&0RF)yd2S=T+TT4#^uSz?xCc>`-6o9a7s8r}bT($((
z0e}GbU;pF3l`5IB-P>>ee7YRR)1yx6#S3koF4_Dj8&WR7@wn-drP$C+1Tk$w0JL4#
z94IMqZW8{osW6ISS8~#tG`%%z${?Pqf+w?|r&zMU0*LSTw};y(ug)Qm5}`)K<EL*m
z8)55P<!DxA8MIE~P^)u_`EpJ!NbS%a?%%w6`;9!tJe~bCi6T3PnVDU`%U0UV?7Gf%
z!*n@Kms2c0<koaTOyt3I{m>0Jx>+`!K4~3WVhY}iPQFY?x4X$=S8FwsC_Kwyj$o*@
zZRG0!FjlVI;JO|8F{o9<y2hUD%~p?8$zr8kPhmE$`|6kfGAPuw0^G*mKYjWR6y-yk
zA(NkiFpDK&BC=i26vS$r0bD<HyBlp#R}Dpi*Bk5JeEny~kAL{|{Xa>|>hAT2!`<s|
zfAjam;oZ;wayZ=o<Nx}fvgB;nfAbfAeR}-<@rU0Z?%wS0UdxC1>8!EiA^6MF$4bda
zl$y~%WhjUgW;C|z_rN?|p0<v(q|6@C<Ta*FF>Wgw%#eEV?B}Q+z{FH6T-MtPT|X?B
zji9c!t|}dWt7-u;g|GhXUvpwFoS!}?Y}C_uep+UtT#I5$VM%wsLsI5z7N_g_;OAny
z7_IMEz)g@4|2MDRl|)cVWpTT~cz$fS5ZOoojYV`sb6o|M_JpLloN9*rd;>ToOkqw0
zm}34AHC^ZFQjSW2q>Jig+ST2#&ki}uRIhTZM2rd^n!@jAU=}Y90O)tOyW0mfYn2k=
z=`jnTp|vJzYbaLIV(sDTg3O1ls(cu&VM0mK6qt>3*1CC`ig=r<)DshBWuM02u4NzB
z0X@E)@LL79T>VFTZ@<988=gzWUK~)VytaaekV-Gsny@eHgjdcr>-uUHFTXCs=7Ms=
zTj!EaF%-Oig)hME+!QN#XOlUlT#(cMDbX`-@}U80ueq!F$J#a8@bX)9l41sL1^Z|$
zGBew#8O<iDtg#lHgWNg8XOJwLWvP^QBqz0`%$K@Np_IqPxQdnYV%GYFT8FF%hbYw~
zT<9{C{GP9lH@}#sz*kbstG@?YH7xf9t^q=DsqpvHwyXgI!U)o33|Q0^uD|&goLI`&
zlQ~O_3ZMxJ8N33Q#WUiWVMSQ<zY%oV=jFq)zQuU8rj<4lSCE@>4rYiJw#c9>93EbR
z$eP9nH%VHhc=*R2<r|4fEc;^~9F0ng8KLWkyVqaGa&7Rz&wjehQ>5QUaQXJ1DEO<c
z`e$9FQFz=;aS2zE8X9YjwI;Ghk;s#>(r6ArC4GyCMt(RaG$@D?73b#WmN8C#xTVvo
zvD_W*4tKAMqzgk1b5v~pBQqP@F^9&sDJo(w>z~YMZH*>}_AyZOZ|(itZ-@vIS;D&B
zIJY!>;kpz#o*$?4W5h`(>13|+>@Z)9aTp(ib#gCY86Bch)mNiocWb*!%D~tTfJimZ
zi3FqXn0@rM*!Yt?%9$Cgb;&(y^#TgS(!|v(&;Wp+lcQu(dteF@4)05L6+dP?JyDqD
z5^GcxM6Qe~w42^oXso?|E1gIV-UmOqZZNJJPagr`_TekZ{=+;yef&KF-n{;5x*W&j
zC)r~CaO3*j<Hv7Pb%aH{H$VAqf494PEjXRX-H!7$G4SQ-2dx&{gxGDsUJzKZhNF>U
zO)w#%5F$XWr6-zZ_>vE>T9t_jlXZYb6^hu;^HN;xg$G;Gd?=7b>pIu(?%#d`h<>_I
z2w@)O-R9{M{CI`Zr|AE{!Bg<4%sQ4=xG^S?#}N^y^Aj`0jIj1llvPKeQ1wNCUOq|I
zTcc`ZyTNvYpDq-p)mvPW$cz{&l7ZHNlK6mx-0O!uQJ}o(qJb!FZNT-5je$ZSrr~f~
z>9!*Pn537v(37)W#J@0$WZ><qcbp0&XuIRb-{+5-r*U~cFV0L%s%a}t)<U94TsZ3-
zqJhF?<9R%bF2vg6M*wiD=@?Z}lVnoD4?P!JB^}!@N(YrkbBTpP8v|W6Qr`;Lc@c5^
zq~Ic2YH@1AQfc62F|g8?`qD2_soN$^Riv?z*$~%NT;L5=YpAU5OKyc5J;)}Dz?Zc)
zOSilU?NdgZeeQ6j{qbxZi%<n_TS8o=6L6Iwk@T_ZEE;oGh08<>7};ca8x(yyR^}nN
zSf8v!>>8CUP>iLh=#^y$3Ys*dfYM!+2f6JLG}_;QYgyon1kd1VR==^WP-_T$@mKI_
z!|e-tU@g5#@_uWvC@tx146kp)rvLcjETgde3Rn><dnq&sA-Als&@mANidgmUO8ISb
z7%Q>|U&;QlY;Im_vR+lIXomy0dggd-(y=W@=uRYZQP5s6L$1#kKR-hyrQ~Pkw&p_N
z|M)NeAwN*^&=ELN_EgFHv!0dWSY1OylZV5ys-U>Wx#}4IXFnXcy@s+1k*DChewQgk
z{q9!$lJ(djN@6N6Fy}*Dr~;Tcm^p%0rgtU2kT!ty!$hGC(d-WQ!{JWMy5twmPoG2^
ziCeSELiC2D70?J?$SV;O1(JWX&SuwXqCgZL-v2V1UZUCG+_wa)QaiCZn>;`Ln4RR9
zqASow)X&0+&Y(p7;S#*dM|E8vA@WKqIiu`|!r|^M8WX}?`ODXZkf;HuELYQ+DSo7>
z-=-Ui4M3c7%K<^WDzBVKqzttq$Sclfbx#~#y}Nn!UQQ)>9SJoqPd}=fKRY*c!=9B}
z>u__QkGA8d?;&}-U5=k(9$-7`I%a|#uappkQ<p{h4s5IuWIv+0oS$le>1eHPohy#s
z%)6WWe%Q<VO8aem`Z2?Hv<x)V{9?)J3r><b1aGZ1){(e10RpgYv}eC96-QXTE63BL
zEK5jEWcl-%$On&`)koIm%xWiAft2e96XAa>v@WiFW#tqSB{LnA8DoueZ@&IjTG#-H
z=f@u|r$=2w(tTFf^(wDQkie*NppfdRGm;6%$|NT_J(bxm-wpu7;eL0xXB8C@1!l@Z
zfXsY3eJ;j<T=_Xz=hUDr@^9uqfr%=Oi#jxxrg+&YI+3c3w19%Qu6JFZ%=3z^SOUR{
zr~Rf9nV+WxtS!Fd;qLX_o3ArCQEb@~cf>sX@VopAbFJ~I&n4IQnCwwQ2m<ZYo#Vtf
zD&sFFzw*~~StCU(GV~XS6Ju=5uI0Jwwn5cxiZAH^U5x`7z?e;;HM!?eNg1I*Aa1_9
zEO_JwNwh}Q=4)R^NmHAcvq(QCXtCsowAAcb1V$Js(iM1-IfE)$cW5$f8H{zQOH_n-
zt_>+l(~8PPc)j_-yb&sKBjNy><)(8griv$9Bz|!{MpLnB9scoZ_Hi{le1S&W>M~Xx
z$iyD2Imyv&9CBzV)%7$HHnoVbfNoM@xtx!oG?k-DOTFbdQfV6-C0XS8!$KMgVud_e
z>;2$MGoB2PgBNvTuu;}-B+<FT=auS6LkCjWlNQWehwYqNZO=SfQ|e@9;2<$28X@7s
zwm{dSZNJt++a5+<!1wA3v~PD=Io42ksh}BUny>+DKJr&Y@TFA`D;gJ9GRp0uUc8nt
zFOg+`^!e?!X*8yx=@Nf8wWYEgUQ{hudz@6LTRTkJb-6HA1*d4jOo7rfsWaMIgf_7d
zC1?tPqR$^1YjZadtwlCE0Kv8Nv?!K|T5Exg7)cn7bz)L1Md$dW0`6+o4FeD(=Ke&`
zVKP(*UBkkkSMJ^{Md}o@80*m3yEk9UiQM)3ZrJN^a@gN7(|CFWG~!O>{U~XKF}*R)
z`ziRT8xGl6V>&;gwOzkU*GTD^NiRVlXYyd<`O#R{?{1{kv7B<(?_?Y#?Gy8qcr?}Q
z#-=rm$(9-lm42lvTvjTeb)B|rjz<g{W1OEafa2vFy5T0eh)EU57=xCP@&m|vKw}V$
zApPW9Oa|HK$6|_1L?Q+tB1EGDSSc<={a=m(s>+P}+7^l(Qz8KFcL&HW_Qn|Fq)krb
zt?P}km#0q}yC6#F%oIt!sf{XFvn-y#>06=<RgxhFX2M{s)s1b)E(6u&!LA#u>y2?$
z3y|6NyFAGe1*gIwSS9|acZdp{fGQ7e?d%ihL1L-g@uf6D@f=V2eNcJcwUQ>bUYla&
zV^SCwMY)hr2NtP^XOf^ju@5mnuF;H$$V#JG=ychOT!u9GlC#Rh8EduBL^dXbB(0#j
zR8bw1V<5qLkI2&|5k5-gr3*a%7#Su)R_k{4rW5Qa0)QbB8(RT9$IoOeu~X!AF=hP+
zL}Q&^_D#mdm<X@w%3Ri0Vl4`RDTG;+9W8S~M;1-1CCW)DHe@QQJgKp6*xxeqczTRM
zq;z@1T(twmBs``s1l!(p6aqjHM!fh+=KCebPno114;EtqI7&#0+Mj%NLfhs3E&x>9
zOoPkwYa4J4WHcRZ2EZppKJIYGh*D?E=#1;_gB*P~P!Y+8n8+Asi~}R=f+yurHLZ=+
zI(NcVauQNQ1tKV<Z$vD-4w)QlU4Q@fYl-fqDnfqFvYh??))+g9N?tcG6Q80(p6hn5
z-@*Bj!Ymh|eByY1w8nPBO>7I1k994?@$@-_^X}$VmU{W&xBtftyWPz_0Q&K~40Bw+
zM?gPMvY$!extH;Hdl8n(mt96irO1}L7qY#L^=%Y`=;slD$$O$O>~C}1BUi!^ipe$c
zMI`4H`XDlY^<!9L0WjbgGx9(r+JpHbOx=>m@=Sjn!u*m(tqd~33=I8nU}ithfbkGv
z<`CvET?`tu-TCRqe2wjHUvuDjzKAO)6LBhKuYL`vvN^|k3*}zIBAUh~@vycNno1kG
zimf&U7KpqA84!wG2~kPy7a#~$qTVe>zSy`k2N5mOg*D3SA>V3O08q;%SFw<Va&9tQ
zl3-0m1+CGCPoPo>=jg><zJ<tZPX<H{ou4HN(Fd!s#u!IX9R*bdVMUs;XdYLW3T3oC
zhr(XJ_~|6_r19kK23rOh5W%`Zfu1A?BOC24%L_6EKt$towbQ!JSnES66r*dk4-<SW
zM}Y+`MWX%_3r;92*;r>PoPpBLWe!ajqnw#hmA70Uw(IwI%p|qnC=La{KKflOv0Vwd
zj2joB2WBxyL1Qo#&(m3CS(Q?3^lY}w1U?rmlA2SBw{5q}59|t%F&F4G9XQoLvTWF*
ztcV+%dD)rd?Oh^G<|yi;%_rl&eb%}G*Rd1Nkci9qyC%M;Ku3^W7||5Cyh!^b_)NUv
zfRo`15C=mMfRQw=eT=v%5CwVnjEIZ(2gOo&%(jhLX}K`Pyf%&4v*pBmOg_WI&Yf-r
z;D9=RQI*w_a7g!25i1)by_%(86){lp@41wbaD6H<<3W_i1#bjgQd>4kbD**H$eM@E
zqL#_3{7Lk|wA6d6x&_=WdqiCR0yd5l)q@d*h-+O7<nw*9CFZ%tux@IAsD`u|0KQsj
z=B5>~Qc`G!Qz6TindmjxPK_hN+y<x%de*tpF;cv*l8-KyQ{GA2!BeFfRe1N$LCMrb
z%0+2pp@&pVcVbu(IT$9H#n*JT7!Yu=r(j@W!d8=0^){9q0<Hna8->iK;7b~PCY??b
zjfRj>5DAo$(YU#dwfVYP0C$_X95w2pk=j@+En2s;Tvfw{mb{@rg)N#0|L$-9hM6eZ
zn^|pdwk(BbIsY70<>agzcGeAzqI}80MC;wp8c*2uLrRSe0t7#u9)Eyb%t5fOw_UG<
zXr#ew8vL>1T7a<*(5AD*>k{ZPHySU;c^qZxtaV^aNazFWy03oquVk(J=^}>X%+T*|
zMSM<#2RT}n$6v9o8_!SU`EhAfE5~S!Za{UiNBz=n*rTyhxD&^N*I)m+LM<ctNvgOE
zJe{9X;vWkIN<=CJb%;gn9&tK9nr(6d0D3>wvO#DxLB*JC=*0l@<ye*=ps`lUxvCD?
z8S6rrIrxM!AF?rK^g^?JI+uNZQz|O$IA4ysfvTL7^&K3aG0Yczog8jo-@g7J%OH3k
zg14^APdHspXiydp`Dk*<6qtjb$1u<FNHR93xso5x<5|~EjO+3Wtmi!F?xTj4YG8#H
zzKU2i@)Ak7u18~T9zNt*kiKIGo+&(i`h!y6HCuhuWnrMft+Z0+ite38*i)doI6qv^
z0yRgz>jxqdVZX=$Kn(Mg{Q{S5$dr6!+*xt6yBt4DVkALKzq@(&^Iywm6r1w6oX9hU
z@qEmh4Ac4Zl?%9OB7}L$MnSIMW&OP1XMvcBdtbCRtEXGdW9;?1t~bWsym~9Lw`h#W
z8qecJxk`(->)git>XE}dX5WtxyntMCl$AAgrEG3mdCOQ!(*wSJ6hv(EG@j(WTsPdl
z{=m$SKm6`+`}*+kK~liSAAWcI^xgYE`4=WZQLM2^eVXTK>W5voJLKnYstDQ1m6<Nb
zA0f*=A&8u08y>|I32S^}Eau4p>s*(R+C}F`L&;=|*$9V35Q#Oc^0_N0)unM)bs;Y<
z>Wqir!ppAOzg#JFCCM<(6y0dX^c?P^)(?9Tmjkg55LEcUnI8>B#wMmQjOv1ktpd%X
zsI7b=)V9QExXEgY?z>T0(U<98a{NoDt_>Su6-mK5AjNu^mJ|8R$Z4m0%@*Kji&4Y<
zF(0#x&AdMc?odea%3ow1eUHVWy8T;@!BFL5uclGU!WDKgCe}kKj_6t<KKuOF5{x>1
zWM1SJs9CkJv1T}82JnxuKwK}YV3Yme7a<vzU<6(@Gx?Gy#G(a=I+%{`Z<W6RtKqq3
zdGhi<mFs6i>$(O3WF3#DinL)48T_Q=)?yQxl@|l>!f!Q2_Lw%~hOGkP3YKcsyoc(8
zJ(@UzlE$t6jR;D$jtitKbB$8zC9R+$K@16VzUU~k0@jhL5p9*Mn!^hja2pA=JScD_
z+suB1fT#_=Q~8ecTs8|@Oy~1WD}hf<lUT0*mj9b2`I*R1BO2V@KKN-AlQxk7%T9Pj
z9XLHzCYdh3DtN!>uMCkyKTqDzu^U`xQNquS>oqBCmF`6ijT7F29Ap%{pGIS?VnB}&
z&EAZk#!UhK;E8-OKO_3)*Z(Gs5;K!HdS_G-QJBXIGl}nZ)lx}8nX%58u1?U$xadW5
zORLj`DN~*`W_r=pR|;fd4q>6Iq?Vg;U6WNvVk+I5mz<vU@})4(ONolA_E5yVVm`sl
zyPH>s`*)y@r1SA(UV+gzue_A^^OWVD5N#tFm=v2-e<G>r=ZtO3bRMFgm-X``!0w1{
zDD=djJru2V##%ug-@X3OR7WWReCEsPa{7F|KetW~cg`e{zo<o^TW;0Yv9a=kyq1MC
zd5_j0+GXES3jR)bIMWCTi)&q{t>Kp^Mn>3+enL#e>I<8Re*Tw#tvgl5mYu>;Tca4g
ze*D8fRe8Kt?TG6c)TCf~X3jfWYlN<}<m+znQuNVS3(W8S<gW_!OvFD^LL*tMZuI0`
zCW&eA(>z_|IJd?b=YIVCZ-iZz(jBG{0I`c%ENWhV^T&4m&HXzj`tkR_k!Iok?)BmB
z&F3F}cl`K=Z+`vP#=6fx{ML`7q*?pBHz4pm2D!1Aq3d_H>rbD*OY)5(pomq7nsA8Z
z=iuizU;io(Db<Q=vGh2e=jl98mynK4y;IgNekB$mH~chSOvESVts1fyqXh2d*xwEp
zaOupq5-2g}LU;wRMtm-~QnhjvzZ+mCppEaX8cz7!(Ft1|N*&(U{gM>X6d6*i$3be|
zxF|hhl{g}<Hr}6!d6flB@>Hiq5X8wp*5G=`!&m<&s=gX5WYwO@pP#XG=aq<bqfPab
zBJwK|-nc269Otx-sZsxbRIy}X=-^c`2dGu<_*(1w3to}8@`;>D=uSw?DHHR5Ls;wD
z)8kfKZtFhXd_OFzW{7RC^tvWJuTZtqucTeYP47=fLXr+@mpiR7rfusn*Jj$z_d<+9
z2_o_ub?7G~lAuaNHQZsrqS2XTGA&3SCWHy?`xvt^t|6ubj7b}^NS>}0m?-~0m6dVy
zz>&0167Ia0#W*+Dy)Z{Dh?TuvP3O=IB{Y?QZOSTjY*Bo~q+0eeG}aoZX?^W$rSJF;
z|NTGz`^8itQ^@99%lbwo?-YVoJnDCcTu^E*D!C^TUAn~M)A<<ueE;s}QEZLE@zZyR
zrAgcG4o=_d*PLJ_3ZtTVUYEjiV&_wT0wQtM-oN{q>vwV)YtMQF2;OHO=V?4PNTH~O
zJ)VuR`Q60}*LHn@_9h#V*vblXm?qh7##a4gW`6kUmzYx3SVK>B!Rd1J)1|IG>Wsx~
zg#yF`O#N`n8TbPT5Qu^X-)|)}H4`X~t<usfh2*lyh+N-i<laKpH2zq2sF&L=)Ah=l
zNw!K1ylAHdN-I#jc=Fd6YwzFw0+N|rh6Ky)IG#U8?m=R1bp4P@I%01I%lbzNbW-`~
zx&2rs#wK!+$W>HUg04$_dJwX3E;Y*z5@J%nyIB>I&T(7tr2!+@&cyCmXb9EL7%NqA
zjP?#mOS4p!<zeP&EYh~Mb9!}X#AD$`!(SUb4FY&S=T6>udNjre82fVkY;9+xW+U!;
z$zbnr|IWHj$}L?#AYwNhIJPIpxP=wYT;nZ)d7e)4LLx69+80D2-`(A?OKm@fE4cm!
z4^f{*OVlnAz5V7dGV8$gJ7}b26A<Wf{1p6j^Xfy~YfR_I@4Noc?QZ7rIFBb8c-!wQ
zdYicJ>4Q<tzNqw7AxxIJU?vJudlNtd5h0)(cE-B%=O2V%Bx+~Vcp8tNWC8TU!S;jJ
zg>Nh%WFh5BlJqroV(naic=c{^*RY>1QdDE$dAuz6xVg|`nyX5D4!U7iODh|QOf#R0
ze}z7=RixV1YFcf!trusn=LBMln-G{53?Tri9)1bJ7U;XHVHmIGop6N=i(sr1mn@<n
z;v-G<ItFC5Z3S1=CoY{{0f@s|f~eC#)<I|$81e#757Ak>==-e_0iWr*8H43k$f8vI
zZ1ZMy9veA}H4pTcb<x_SVa;CxS36Z)QS-A3m#_?-Tbx8(qxoYTiUpXwh7Z(uiff~d
z*OD;AdhsoU)0%&*kJK32<0|#jEL$MgwW@GsMi8zjrX{`#FVj120N87jtNg-NLx<`N
zC1Q*oksJb>3J$7en}lbD$uX|5*BRCrZwk_!yunj{E6LrJmLgZJ?ti8~F#u&{SJx)Q
zm;tB2#6;2JR3NA!2n8aM99ft=I*b;}wygtqOKL;-h$Tod7Qs<C3nNwpV-sF1o~0=<
zWnNPCw@m>dy2Vv0zO=$_#3=b`FnU34L!cRW#aaMpO-4m6HeE`|7okdKnL;qef^|}Y
zYk)=>O%xAev|1B^DX^GI1FmA#V$Om90P{4Za)!wP1v5F<bCGEf%SwMmr8k=?13)d>
zRA4NmoZq3w1QQW5`0)bD0H8?)GB|ciT0$g9qA~*lfD^d@Y=1rl(JbiP?0w_q-~0Vt
z{>9wrYUeXMy%A;Z_OrK_yqBNOlAnk@Z>Fr2yC*d*n&~TDedhS3;)Im~luZA~u?wOR
ztf0(7W19uaSh$dA)<W;fvb_BS>4;FS6Wu<1$hUG7Nk|}k@^gq(vnZvcSq&M&kZt*L
zO)V#>Sk50xmYtllx2;()*5+s_*R_l>Tvu!(UlXnL#dMdY-`}D!&JDR4FS!e3C~s8T
zvH+Sw9^qP1FHUp`j43#xiU<KArRG@blNtD6nne|#L}Lh&hIJz+&A=RjJV4X1cij;D
z9Kw8a|5iAK2F>N^leKPt`x+4X-OW5*#?#|)xEl_45{Amj(Dl1GVshHVmOP>{iR>8r
zzIhyswZ#rDGub0XB`}dJ{@iG;oJXNmZ)rAHwNql<-Jn5=94AD8-Qf;J-y_xNICx1~
zD7{+TkIX`^n$C}<2Zb2?Je{BXe4!BJ$NY3ra4JT?IVxqQ?f~eHqX#I;g^}zV2P$xy
zXi-L#;?Q(C86#O{3FpM$D6wwH&tvdjb>dClJH}dL4Pqx9Q?xFZM&xA~n8JK{`Vr7r
z>*NehY7&+c;=LQh!PhI_T6xCMdh*1^fuZ1eA<_%X`6{tC8_RP-jpkU1m?@y`tW>lR
zbH!<S=NDT}s^kh0%_31$#V#A?U_2eO-He_*+x5DtK+F*Qm9vJK*GbK4>LS=FIlotn
zm<TW$F2Wk5m?$ixf#zH&h#NW5Z7w)eT>-=NVE_OYen~_@RI^M96pMr0)sJN*H2tu*
z-7YC%gk{{G{a-S?0<JrNYb_6EKV8rm)9;xf)3H<Jl?w>KfmU`nRC30MMqV@3<t9Z^
z;#`xAj1lIv<)DGIv>or|D=1vXvd~m;MgYKk^YA_nW|l5YzZAmk8}znrN)*3^rntw(
zIDzvfB!Y}jk?;}Kk*zR1M=H?}F-d{9TO{dAh-0@3=6E>V>2Qacd5$H63{?wRfFc(I
znUX5MJaRCIwLnjuHl>kd05mp5x7^r`$ufwhcR;F*X|<n2o*_=A?ag#&!KUEH!~GlC
z4#v7~|M7nt>-KjKGD^oEzde2W&h_tZUcHmm=%)*}#9{#EFi&U<vcn>R8Y|)A*`&DJ
zoSE$MV}8B_nzW+wvZ~n>K$b~oEe#sc$4F6Y7tjocJ13qk#pWgQy~WqU&trC<Fa`l}
zx;*I(LSdf5tQ$;zzBKkvAyi1N<wLrzhvXZo4lXP|%tS;?o|$R%%zU_eQ>*1!B{Lhs
zJZqp(fj%K3Iz$V`ik-dUFfb)a>fq<|(?<dL<RxZZkEWb2-C&r3g6@nUh1tWj9{M9L
zs24FR&H6jiKJYXHh#w*9dI{&?8d@fMm1F&+KNa5s4FZ{!11^W(&(-VFKRy3E-27N9
z07SLx2u4VK{u=%D90;PI1J=TYt-Dht=0yw-frya2G0&RRtnwVLi4&^VK<4GI^Xh-r
zW+kj~U<<&6fo%l?j@kOP%qclj;_Bg2t)JSVx*TwZAlf%3dkOujs<>Wa{DnZ~iiJ97
zF7k`p1ncq<8~?iL9+wJv$qYS*!-bZfAX=3yJ_A~t<jRyqqFUq|L}QhlCtOEWLsm<g
zwLv+iU^*2RjdduUX^NH;qSZ&i$2h>46#Q5s0?fWbMzVQhqSUH!U2GK>gNZgK2OZED
z%xZ;P+J30))SFqx#R6zLDdw5lehcf<5fy4bpHk3MrO47uL8v4tRxCbNZ)a|b{|ZU5
z!fDIxQo~HfM>03FvZa(oWiSRh*x0h>iioaN*E$j!Nmm453%ZbV;Jc#LEva60D@A5g
zIb`A!u1yWLq`P%8kD!V~B@O@XZ~taV1+Dg~nh60EG@Oc<^H%QFcG+GQBjyBTnn^^1
z(!VOEd2H>d(rBO%hW*VNBbYN1{n}a~62;C=wWgWq{@pkGyEn1|#`BYWqjqvoH}VVO
z{kZECg+Cq*rOYVBobh}FrbcQ=QgCTny#DZ~RVT9YdYq~D_LEtV+C?I#3j^9;j|{H-
zK=jE|UgyTSD2b2@5n`W>3890?6sGY4b+)a-Oa{b$cgTL(EdiMsB>k#;pEVKzDa>KI
z=w|!<yI<r)C#v`-o%AqY#><nYjcfBlQEXa04i{LM_JU+$BCn1O=!SizUzLFDF2&BW
zQ$&d)J&}=8Rc=OmKWV*64uPV+IrjSqma(?m-`*n{+YOZ>&syV9U^vV)o{zfk758AQ
z5%p-yc>avi5K3~R!TUsVU}g|<lxhhZn~+dlx9j#d<MH!&`YcqaH$VGxH1_lNzZFlL
zZa6%A_$5>L_8<TLaR2u9;X||{B`?dSxXt(rmxPS1>ut9ec1Q3N`DwU$$Zsb)ENCM<
zButm_{L~GHZg;pmeVopZ(%jnLyfW6AZh-PFlV&MgPM@dqQL5ryzc<F_8WkeCZXf)l
z|0cIfHMlI6fql^f()l-{$%J|e{(SrdBA6G$w!jojH(1-rU!0#l20!g??qG4`CR@au
zQ?fp06+ErrQ}i(_^2_Pdta0x3SHJSpdA^96BOBw;TJm!a7cZwzy2Kit4zbEAbV*Oj
zXt@+5-GRnGKvda+&&Ocl4#_ci`|y5uxYy!B^4;@1LXpOW5N2871xZ=E;4snU_<8mE
zK*Yn{8|ymvQWOj<RS%!XKs=Kg)-bZR1OI|gU-FjLUqtEA7YuO3UX!*y(e!zEna#no
z1M#B#S+zN@zBM-doW-E>)n@euqIB(Fx%w8~7+A$E;pe6+MaMZLT+U`RrPL67TpIwy
z+{%q^8wE~fq|vUd>~Yg=am9Av<uhLM7I4GwerX)I;MkNbYe`dxBIzct%r@OkKePB6
zE~VANvdGJWYc_YP^~Fe^p#cfEh;!uBd@VBXNft37;N;VYDdv$(B=LcU##c!g0s@9s
zi7gsk0$M~98{}AsK=rVr&XFNWs$$vKQUEOGr;+{@pIqdrQ{q|VK$x`%<(F@*NEPR{
zx~5bDD4|da8whc^6JPk1*VIu8_&IfUYqJhqWKJ);AXZPWnykOrK-{Q!s`X$pYp6;I
zY9rgU87RvoX0XvU1f|MQ<IJwoC$_GcH6vqPRn~r2Y!#on5&H>2$>Xk&9Ab<RAppjq
z!IvCMu%;|ET~4}cA=dEwyEljXH&Fy=JTr5cCqZKp1;tO;gg=zdgy_93b;g@tF@|du
zW}T2R^ZnbOr3Md2i{~WXCX!CUkHJUGy0oTok+Sr=Tkj`7T{f<8R?#9?Vop)T%FNS6
zN4SMTo&^E&VZG)L{Omd*?_<5o*lrj^(o949)~-{fyp_W3+lTkJ4<AJ9Kn`W`40-(i
zpMb&pIm2XH1NSVm#5t|$D{6=8tTbW^GJ}X{yIu?41V4p&w%yPWDsmq%JE!Y^+^Vfb
z{V<hGb55qw+`ayg<!x;@gn67UXPwDrP75L)KY!QtyW5BNdS8cm^7G`n-Uv2<+0P?~
z(C=?Ev}`<o3i8Z=07&F@`p!%bAN~}WM0|I5^NRfJ#Tq`1qw5AtoY&9a{Xf_54zJ!b
z)A8eX@<#n`-|cS3<HzZ86eSTK=6GwW(bmJ?^*if2>9-y3-&oiC;>{w2H=kwO<oNQl
zNKcFcFLJ}~{_QuweEj%rRLSpmuG?wiS&$!IT4oCBGL``_gc)L1%c~U*JzV#1zcGpz
zL?KL<#{_P`TrF^}v(6nKKQd9W`RZf85OS{O^r8v#*n<0{jLBe<aKXaz(=$;ml84>y
zu)legEm}heS`eeDBu|&8^W%@OuI4YrziZ-cdMA>)2%5aD>1Q#~hhP4cv@e^#7ve{T
zl8xubw%k<%ou=_DYMO|+yM3^>bMVvuTouAzX|!k!TjVMa;Ozj1Ur1wJe$KMh2*m@l
z5X<D@5Rt)rc^3GS2X84jS0F85wUSfe_Qtapx57ibA}+Knq;EG;*HGgKSNo=oYxB0E
z0_wKva}wc;za}QJEFzMAeu!ie&h&|l$itVd;r8lfSm$!AynoS@YL=-OxWj@vsk@cD
zevXuAeJPN@(XT1dC1Zvp(9kBmD%uM<vTmw6l5A0a=Zubt5s7fsF_R-$8PHN`0dOq-
zCm3z+RK<5l4;{n&d__S?L`piiOz!FpZE_-22`N-#%-WVmbyAIVvJ)%-Ra#(*oo$&+
z5Q+Vgc2>ss++;ai3CTjkK1}?L{EdZrQYErj+0-*Pe41948kY@aUIQ##(+AI?wuyd(
zDD_O;GHhg~O3eDA6#0veMD16KPzY%Wh`<<S*jj#%o)uoGNOD;loV6Dr<N6W*+kg6Z
zh(@Hj@+~UK!87-{?Q}V2p3X_JI+8TIeyBTnrU47A-doU8HKZ96<lomltW}S$iF_N;
zZD!uzKHR?kfXZ@DYB<MF-}!m05JTw~1!$zR*wkeSE0itf4R1DF6qi{#MtaO|UcJwK
zmu#XY%?A0O)A=}0=Zp?-T4;j*tkkf$wmv|VWHd@PEcNiXmQ7c@8m17UGBsH1&{*9d
zq2P_RuHP58@94(IjjkRucm1%nIVpq?{Oazq*@e8ICB=uM1X!QH|1Bn#!#rNDui<Xk
zr41LyS(~Qvg7UF69!h<n$i<M-0x>Bl4|e^2tFIuqUmd;rc}Br{)Fl=~+~2*iu2&f?
zO_!s(x!5{qjFG)HUQQIeuw0BFff<JVVSn>5o}Z@6QO^AR?VF6pjwiA7+c;t!$J66@
z`mDp&-OVd&oiR4uokn_`(aJG+9hiy=ph%O*&ZSxoO~|Ifk8xSn_73w@K_Vr??shk+
z;RIrRo|z!a_WAMCAM`5CG&^zigGM`+0wC^g9&%~w{PYn3_qVT$H!?s7Gm{Tl1fZ<G
z7;SXjuG<}^%W1wG<=WWYyf!B4J}2==0tTX)g7<#bY7!aTj$&%q+9Owx=6*P+lT#$+
zObsK7Y=|r{mS{y)N1UN(^hhiE)%#y011V^>5>pV~i=>-P`lahA4N}LtZtG@Yj*x8K
z-DC>h`}`^0u(z%|+`R_CT<R0s+Av>|Cm<NxRTUSec{~}{2~-#Xrpwbbo^D@#km(=}
znn%cA()U9EEf<7}%*&gh_ZM~(Yn&Co)Wce>lEvx6h?uP=Rk7YEC!;OR9$2qCzchp7
z)hfH{=my%zXcf!O#Kz1<AjVA5>{KNuOQ~pHLqe_mO@nh&`4X>1qfwtXwmR@i1^a5o
zw%KfCX5)HnFukkl;Yoq)>g;g6hIzeDdi^cxr5d|+T&LCRbn>;Aj6`62r6aCU?8z3p
z>e6M13=@ehB60G&rwZ1wV*8N0A!w8KOjRZkWtogqh)E7+5MW!^DvH?YF{&TPaz9(^
zppNU6{)5oJ65qU1D6G%-nigD9t+1uuGX<=jftW((lIOkv;(GHf%|#^pCy;M#uFIL*
zhvmJQHyS)xyNoSX4Ra+!&$uSS9$zVK$yKV4wA%fm*NW<PsIzlpk-`h=XZ-ThzCp<?
z)wGkPMq~0E5#5C}*(^mctlO2b)PTlXG)8PE9U6n8Eu@r65;4}~TPJmxL3Nle3b-XU
z$3~w_#l3o~zSNplb5q`w3Otk?9K^#~qmP6xoKy!1kvM^ODdlk1b-SB;*%jTe7bBrY
z-5{rNc?6?VE3k}@rs`LP)<!=C3!fCAuJ#nATCVXU*+2^C@$CIH9PSHz!dS?lVIpH(
zKOFpg$xQZ0*G;RHiHRdZJ#ux`L=+F}1hHDGB-fu@ULn=u3ZAH072=Qv*?}=Nqlu)(
zQ^?)vtR@*=W{O$|7%Tp}n+HUk$8)xq+TT7H>jZy6AxI6&7z=3pbV&r>WavVPFTZf_
z5LmwkWhIYqY|ijzwv)7X%0JQwBzU6)!sr}CIf(QaVV;sPV)3SLI>fpXE5z0$lq!9!
zLHGa^W^LzWU7rc&IhGPI-m)x#2qDbl`Iyxq5MjDJWmZOVG>MpA*YCRF#`U}1?SuXp
z+x5oS@}&&qX9_-qS=C^19*@i%>5LVzB)j!7K!{ecoB;}K(8zU#2#K{V>X#ge%fx^}
zkwk8B^9jX`K;DNiiBwxI5#{a3rAEn2lx*}208Y~hXJd?|D7^;L<w-Z2jdjLat?&`s
zX=x8y+lhr1z^!D;^0ne0C?lK|@F9@GiPRV(5SO|px~Hv6hU1+;Tb?ACEQ^zE4wugT
zLgD6e{FKqTMdUI9Wn&S`x?UmtRkt<^ydtguWY!9S%NqfWHHaoNH&|$yG@d@AvAdf)
z5gQ3XBrqA#m8b*sQwf%?m<GyPlDdc#4qbGUr=YzHa^*NHtBNRgT_cKxL{8PAhD#f&
z_yS+j+gmVvlmBhaKdsuZnCwg%v<|S~GV(E+A5TmMT4HrWSyR;GrHXtB7ZzN81Oo<f
zRW}>~sHq9(1ecP8<C&RuhkI7VHx;vyvCg`F8jqD>CZLG!=W9ULkepK?GIG@Io|hW8
z6skpe3bfn?Mp-{obu_D+P<l?J7Y`DOue46#Sgnw(Mu@42+wX4BSU*pYF2dW_9}tby
zqtp^d>x`c+<#a$~CYjvjszY4J*e_;~*Y%vRp}WW?XXdDTz$}K>)>r`aaE?m6z<!>L
zF~}Ctnt071gU<zv))AK*4JzpR0nq>x1u~j);|2;-o-!f=APskFU%}54Kk3|MJU^{&
zQfA)WzUp^3qW`k;Vd|6#ehz+|FDKXU<-|mUX*_A&nUx4wIz1dq+!<UXuri7#QkU^g
z9D<mXNqlTG?X0fuVA{5U=isMo(Fa(~AeQbRRdSR7^LPd(W4rV>JYA03TyS@|x81>F
zk!c<Fx69JEb-i_cD)r|Z0%A#DBs9<=23=ZjBFjcmi;3#uF)y3^$cBLtZF2`|u4wGk
zYT(`i)p0p~%3I{syI<&HLphqP3*um^eQK#Ffi#er<>qQG!fG~+L9n)#g<}er)1$TB
zt9L(_MKYbA#_0lz!jX6^qt;SqqCivr6f`z=7UZVS^*t?$uwpEpFVdzAg<2)Cl~sEQ
z`~FJ}3f6x<DWxy4oi?5Rm4IX`3%r%WGha{czx2@;|GNdfqp=9)YK0k-VHjvlqZPxQ
zrQtZY!hp>=jN1dQkhh>k@oQ{Drhie)nZ)Wgxjdr&Mh0VD62jozZ)0XQvBY6q@>@1e
z@&ITz5^wmbZw_EW$-~09vSCvs*hG2RO)hCYoVnDO^5zU{(1{vv)njx0EhcCp5!;fK
zOUZ;Q@D3LF^X;vtt8Lo@CGvP2rv^7vbL(f10<-)_BhKnGWEDimA~nD%Sd7FE?F?#M
z?r-b3^99_Y&6WXTEF*%Fn-9T572MXXcg2rc{3S<F&Wp#TQPa*Ie(7X*`N(4tEktac
zV!2V+*ic?&0A-B&++qIZOgjW^IiQuGLK3DS3aRR_sg}EFCt<VrBUr|D9Vi3(h6-9b
z`L(H@^nP{!V4lY8N*Et^p0B^@((Yi(Q(lreBI<WH(ihhmo1aHNjpap+efNuB54#&y
zFlf;-2Y}!wKhMb$9aqf@U--<6Oy5Z5R@GXqw5YWg2RGVa(N)>rKD?KD7c58!6%0E1
zEsRpIMT6G%%siex)gs^`GUCcJGb0+~nlMd!(M14Glcu*sg2)QT6mXz%9R)v~9yNN<
z2<l2(QiLF_s&3dneE20%_{0DG2RX=YA3of@{vbZ`va<Jg4@n8#Pv@fqo=fj7(cH?0
zi{c-$y)7A(e5fuU7~|wEa$Cy{`((CG*>XmfSI)4Tos#Wu)WsHkT2yI)yWxO{VIG@t
z&QI0vZo1*7?ze@eaWGw;P>D9k&}Em+27RV^BhM^#=A;lyasl5yyx-lt%Gy^EwXa?|
z_-G(17bsCsWrNKOKo-vx9VJ8ze$HwesmGILPML{Zzq@<;GXT`AA!Z)-H?AM#ZO>1i
zg7<zpmI|uviM*mS5pQySiv48F3)L&70z>6Uv%7t`efW^-l%6Tb!C0yh46?}Q@hJG!
z(A20_>ltyNVoNp}xK~0yfM{Lc$7K5I@nuw(WS&|qOy+gSTfhI4zbu*_M7k=IJWmjS
z{XA|DBLJ}NhU>CfE1bQQFCc=59w?4!xh%V3FK30iEJ`7CJU?02D_OXvd|3GrGCpge
zx4}+px|e@U1n}&)ZIr$jO9x};Db{$6g-z2}_-7QD-~5IZg2y`AWdn2yEk&WqW@F%s
zE8n`3w=F&w`S~b$J2EY~7DKa0ae=;3l$MBhP&7djc6`xrC&Ca<J$#mHfiIg!yuOOo
zj3n_3SI8nqT*6YGgXHj1C~|EM^ylC|7x^cD5Za<nhA)$bh@1`HsDiv;X?;n#s6bwq
z-KNylQ(ij7oqWCi{iW$@A*bWU^5PA^aK`1maFiAcVF5bRGB00lo7iGu>g08e$<zKP
qf62c1DTTDw&ZkAz{DjM-{Q3Wm1glWbNi&210000<MNUMnLSTZ{m0)%N

literal 0
HcmV?d00001

diff --git a/games/NXDoom/pkg/osx/disk/dir.DS_Store b/games/NXDoom/pkg/osx/disk/dir.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a2817224966db5891927e1f724ca4753bb17db89
GIT binary patch
literal 28196
zcmeI$yKWOf6b9fkAwrQb!35DzAU9NCFCZSkaW*0miHL|GQo6mxUS+*w?XK;(ONVF>
z6(vtWnJS_nQg{Qz6Yvi3&+a%EBj_j)|3vojnar7){d~(rL{w)OJ`!1w^IN@!<h4lS
z8lq`)RS?s!MCvwWpa2CZKmiI+;2##aQtf@geBa;0_q+L?XQKcG{x1PF?{2#tTr>X2
z|7|nBYvX3(VHL~axGT>Ii1X+^YsecWL2TQ2SVi=pDSNz7woH|05z}9tGgMWMyluxH
zR<SA<Rj!Khc2#ALGHA*kQ&hub$lGP$9R(=xt3Y+OZ*`tMb^S#97*N{^iVog4yLPaW
z*80k;=f2j7dFvtF8^;gr;JSRqkIa3EgLHIWus6=fiB7v0dq%yyr!!0tR<p#xNZVN&
zc>F}RQk_P=F8a1=8bYjDt~-c>qN=DihkJYo)Hb~!P79s)8f)&f#>V5*-R|0bB$GEE
z7JV<+?`C?KhONQb)@BO+luq8Bo*aGuG#&B-O=P_>&C6IfpJK<S8#~Bun#U(c-#+5;
zqTI#J7f%A&m#$=@WhkkH(vksUS8m81{G(;F91)|Zz=&LW_!L|dSC(YwWgca@6DM94
zdrr{Pflj<4YKB_(9e)@n;Y?>UAEnM<zw7AyzzOrb&{@<x=qJvs!!1#c$Zc3&H&=v)
z=XjJCNii8j_Ia(zGWI!;L}FZlhuy{4Un==}qJy*7f~a?>4vmbRX-QUa4H`8XwWcn@
z6}iZ?^l|N;nf3A<@_1&BtMWotvAzqP)tRyHG4|_)_3E;XnfI{H7;|UkY8&OABePqH
zF4wCEGxbQ>C_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbF
zC_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbFC_n)UP=Epy
ipa2CZKmiI+fC3bt00k&O0SZun0u-PC1t{<r1bza=3ApP3

literal 0
HcmV?d00001

diff --git a/games/NXDoom/pkg/osx/dmgfix b/games/NXDoom/pkg/osx/dmgfix
new file mode 100755
index 000000000..e802a6f7d
--- /dev/null
+++ b/games/NXDoom/pkg/osx/dmgfix
@@ -0,0 +1,67 @@
+#!/usr/bin/osascript
+--
+-- Copyright(C) 2009-2014 Simon Howard
+--
+-- 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.
+--
+--
+-- AppleScript script to automatically set the view properties in a
+-- .dmg file - ie. the background image, other Finder view options
+-- and icon positions.
+--
+-- Usage: dmgfix <absolute path to dmg> <disk name> <name of app>
+--
+
+on run argv
+    set dmgFile to POSIX file (item 1 of argv)
+    set diskName to item 2 of argv
+    set appName to item 3 of argv
+
+    tell application "Finder"
+        --activate
+        open dmgFile
+        delay 1
+        set theDisk to disk diskName
+        open POSIX file "/"
+
+        -- window options:
+
+        set bgfile to file "background.png" of theDisk
+        set win to the front Finder window
+        tell win
+            set target to theDisk
+            set current view to icon view
+            set sidebar width to 0
+            set toolbar visible to false
+            set statusbar visible to false
+            set bounds to {200, 200, 717, 545}
+        end tell
+        tell icon view options of win
+            set icon size to 96
+            set background picture to bgfile
+        end tell
+
+        -- hide background file:
+
+        set bgloc to quoted form of POSIX path of (bgfile as text)
+        do shell script "SetFile -a V " & bgloc
+
+        -- icon positions:
+
+        set position of file "README" of theDisk to {110, 220}
+        set position of file "Software License" of theDisk to {400, 220}
+        set position of file appName of theDisk to {110, 80}
+        set position of file "Applications" of theDisk to {400, 80}
+
+        eject theDisk
+    end tell
+end run
+
diff --git a/games/NXDoom/pkg/osx/main.m b/games/NXDoom/pkg/osx/main.m
new file mode 100644
index 000000000..d9e08032e
--- /dev/null
+++ b/games/NXDoom/pkg/osx/main.m
@@ -0,0 +1,24 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <AppKit/AppKit.h>
+#include "Execute.h"
+
+int main(int argc, const char *argv[])
+{
+    SetProgramLocation(argv[0]);
+
+    return NSApplicationMain (argc, argv);
+}
+
diff --git a/games/NXDoom/pkg/style.html b/games/NXDoom/pkg/style.html
new file mode 100644
index 000000000..4ae291a3c
--- /dev/null
+++ b/games/NXDoom/pkg/style.html
@@ -0,0 +1,48 @@
+
+<!-- Tweaks to the pandoc output style to make the resulting HTML
+     look much nicer. -->
+
+<style>
+body {
+    background-color: white;
+    margin-top: 1.5em;
+    margin-bottom: 4em;
+
+    max-width: 38em;
+    margin-left: auto;
+    margin-right: auto;
+    box-sizing: border-box;
+
+    padding: 0;
+    padding-left: 1.3em;
+    padding-right: 1.3em;
+
+    font-size: large;
+    color: #555;
+    line-height: 1.6;
+
+    text-align: justify;
+    overflow-wrap: break-word;
+}
+
+header {
+      font-family: serif;
+      margin-top: 0;
+      margin-bottom: 0.2em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+      margin-top: 0.5em;
+      margin-bottom: 0.2em;
+}
+
+p {
+      margin-top: 0;
+      margin-bottom: 0.8em;
+}
+
+dl {
+      margin-block-start: 0.5em;
+}
+</style>
+
diff --git a/games/NXDoom/pkg/win32/.gitignore b/games/NXDoom/pkg/win32/.gitignore
new file mode 100644
index 000000000..dec280709
--- /dev/null
+++ b/games/NXDoom/pkg/win32/.gitignore
@@ -0,0 +1,2 @@
+staging-*
+*.zip
diff --git a/games/NXDoom/pkg/win32/GNUmakefile b/games/NXDoom/pkg/win32/GNUmakefile
new file mode 100644
index 000000000..da5fea005
--- /dev/null
+++ b/games/NXDoom/pkg/win32/GNUmakefile
@@ -0,0 +1,65 @@
+
+include ../config.make
+
+TOPLEVEL=../..
+
+ifeq ($(TARGET_OS),x64)
+    POSTFIX=win64
+else
+    POSTFIX=win32
+endif
+
+PANDOC_FLAGS = -f gfm -s --template=default.html5 -H ../style.html
+
+DOOM_ZIP=$(PROGRAM_PREFIX)doom-$(PACKAGE_VERSION)-$(POSTFIX).zip
+HERETIC_ZIP=$(PROGRAM_PREFIX)heretic-$(PACKAGE_VERSION)-$(POSTFIX).zip
+HEXEN_ZIP=$(PROGRAM_PREFIX)hexen-$(PACKAGE_VERSION)-$(POSTFIX).zip
+STRIFE_ZIP=$(PROGRAM_PREFIX)strife-$(PACKAGE_VERSION)-$(POSTFIX).zip
+ZIPS=$(DOOM_ZIP) $(HERETIC_ZIP) $(HEXEN_ZIP) $(STRIFE_ZIP)
+
+DLL_FILES=$(TOPLEVEL)/src/SDL.dll                      \
+          $(TOPLEVEL)/src/SDL_mixer.dll                \
+          $(TOPLEVEL)/src/SDL_net.dll
+
+all: $(ZIPS)
+
+$(ZIPS):
+	zip -j -r $@ $</*
+
+$(DOOM_ZIP): staging-doom hook-doom
+$(HERETIC_ZIP): staging-heretic
+$(HEXEN_ZIP): staging-hexen
+$(STRIFE_ZIP): staging-strife hook-strife
+
+# Special hooks to custom modify files for particular games.
+
+hook-doom: staging-doom
+	-pandoc $(PANDOC_FLAGS) -o $</NOT-BUGS.html $(TOPLEVEL)/NOT-BUGS.md
+
+# Chocolate Strife has its own custom README file:
+
+hook-strife: staging-strife
+	-pandoc $(PANDOC_FLAGS) -o $</README.html $(TOPLEVEL)/README.Strife.md
+
+# Build up a staging dir for a particular game.
+
+staging-%:
+	mkdir $@
+	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" --dll_path="$(MSYSTEM_PREFIX)/bin" \
+	               $(TOPLEVEL)/src/$(PROGRAM_PREFIX)$*.exe $@
+	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" --dll_path="$(MSYSTEM_PREFIX)/bin" \
+	               $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup.exe \
+	               $@/$(PROGRAM_PREFIX)$*-setup.exe
+
+	$(STRIP) $@/*.exe $@/*.dll
+
+	-for f in $(DOC_FILES); do                              \
+		pandoc $(PANDOC_FLAGS) $@/$$(basename $$f .md).html  \
+		       $(TOPLEVEL)/$$f;                     \
+	done
+	-pandoc $(PANDOC_FLAGS) -o $@/CMDLINE.html $(TOPLEVEL)/man/CMDLINE.$*.md
+	-pandoc $(PANDOC_FLAGS) -o $@/INSTALL.html $(TOPLEVEL)/man/INSTALL.$*
+
+clean:
+	rm -f $(ZIPS)
+	rm -rf staging-*
diff --git a/games/NXDoom/pkg/win32/README b/games/NXDoom/pkg/win32/README
new file mode 100644
index 000000000..6b0c145ed
--- /dev/null
+++ b/games/NXDoom/pkg/win32/README
@@ -0,0 +1,2 @@
+Makefile to build Windows packages.  Requires zip and unix2dos
+packages to be installed.
diff --git a/games/NXDoom/pkg/win32/cp-with-libs b/games/NXDoom/pkg/win32/cp-with-libs
new file mode 100755
index 000000000..fa3be4e51
--- /dev/null
+++ b/games/NXDoom/pkg/win32/cp-with-libs
@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+#
+# Copyright(C) 2016 Simon Howard
+#
+# 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.
+#
+
+#
+# This script copies a Windows .exe file from a source to a destination
+# (like cp); however, it also uses the binutils objdump command to
+# recursively determine all its DLL dependencies and copy those too.
+#
+
+import argparse
+import os
+import re
+import shlex
+import shutil
+import sys
+import subprocess
+
+DLL_NAME_RE = re.compile('\s+DLL Name: (.*\.dll)')
+
+# DLLs that are bundled with Windows, and we don't need to copy.
+# Thanks to Martin Preisler; this is from mingw-bundledlls.
+WIN32_DLLS = {
+	"advapi32.dll",
+	"comctl32.dll",
+	"comdlg32.dll",
+	"crypt32.dll",
+	"d3d9.dll",
+	"dnsapi.dll",
+	"dsound.dll",
+	"gdi32.dll",
+	"glu32.dll",
+	"imm32.dll",
+	"iphlpapi.dll",
+	"kernel32.dll",
+	"mpr.dll",
+	"msimg32.dll",
+	"msvcrt.dll",
+	"ntdll.dll",
+	"ole32.dll",
+	"oleaut32.dll",
+	"opengl32.dll",
+	"setupapi.dll",
+	"shell32.dll",
+	"shlwapi.dll",
+	"user32.dll",
+	"version.dll",
+	"winmm.dll",
+	"winspool.drv",
+	"wldap32.dll",
+	"ws2_32.dll",
+}
+
+parser = argparse.ArgumentParser(description='Copy EXE with DLLs.')
+parser.add_argument('--objdump', type=str, default='objdump',
+                    help='name of objdump binary to invoke')
+parser.add_argument('--dll_path', type=str, nargs='*', default=(),
+                    help='list of paths to check for DLLs')
+parser.add_argument('--ldflags', type=str, default="",
+                    help='linker flags, which can be used to automatically '
+                         'determine the DLL path')
+parser.add_argument('source', type=str,
+                    help='path to binary to copy')
+parser.add_argument('destination', type=str,
+                    help='destination to copy binary')
+
+def file_dependencies(filename, objdump):
+	"""Get the direct DLL dependencies of the given file.
+
+	The DLLs depended on by the given file are determined by invoking
+	the provided objdump binary. DLLs which are part of the standard
+	Win32 API are excluded from the result.
+
+	Args:
+	  filename: Path to a file to query.
+	  objdump: Name of objdump binary to invoke.
+	Returns:
+	  List of filenames (not fully qualified paths).
+	"""
+	cmd = subprocess.Popen([objdump, '-p', filename],
+	                       stdout=subprocess.PIPE)
+	try:
+		result = []
+		for line in cmd.stdout:
+			m = DLL_NAME_RE.match(line.decode())
+			if m:
+				dll = m.group(1)
+				# APISet forwarder DLLs
+				if dll.lower().startswith("api-ms-win-"):
+					continue
+				if dll.lower() not in WIN32_DLLS:
+					result.append(dll)
+
+		return result
+	finally:
+		cmd.wait()
+		assert cmd.returncode == 0, (
+			'%s invocation for %s exited with %d' % (
+				objdump, filename, cmd.returncode))
+
+def find_dll(filename, dll_paths):
+	"""Search the given list of paths for a DLL with the given name."""
+	for path in dll_paths:
+		full_path = os.path.join(path, filename)
+		if os.path.exists(full_path):
+			return full_path
+
+	raise IOError('DLL file %s not found in path: %s' % (
+		filename, dll_paths))
+
+def all_dependencies(filename, objdump, dll_paths):
+	"""Recursively find all dependencies of the given executable file.
+
+	Args:
+	  filename: Executable file to examine.
+	  objdump: Command to invoke to find dependencies.
+	  dll_paths: List of directories to search for DLL files.
+	Returns:
+	  Tuple containing:
+	    Set containing paths to all DLL dependencies of the file.
+	    Set of filenames of missing DLLs.
+	"""
+	result, missing = set(), set()
+	to_process = {filename}
+	while len(to_process) > 0:
+		filename = to_process.pop()
+		for dll in file_dependencies(filename, objdump):
+			try:
+				dll = find_dll(dll, dll_paths)
+				if dll not in result:
+					result |= {dll}
+					to_process |= {dll}
+			except IOError as e:
+				missing |= {dll}
+
+	return result, missing
+
+def get_dll_path():
+	"""Examine command line arguments and determine the DLL search path.
+
+	If the --path argument is provided, paths from this are added.
+	Furthermore, if --ldflags is provided, this is interpreted as a list of
+	linker flags and the -L paths are used to find associated paths that are
+	likely to contain DLLs, with the assumption that autotools usually
+	installs DLLs to ${prefix}/bin when installing Unix-style libraries into
+	${prefix}/lib.
+
+	Returns:
+	  List of filesystem paths to check for DLLs.
+	"""
+	result = set(args.dll_path)
+
+	if args.ldflags != '':
+		for arg in shlex.split(args.ldflags):
+			if arg.startswith("-L"):
+				prefix, libdir = os.path.split(arg[2:])
+				if libdir != "lib":
+					continue
+				bindir = os.path.join(prefix, "bin")
+				if os.path.exists(bindir):
+					result |= {bindir}
+
+	return list(result)
+
+args = parser.parse_args()
+
+dll_path = get_dll_path()
+dll_files, missing = all_dependencies(args.source, args.objdump, dll_path)
+
+# Exit with failure if DLLs are missing.
+if missing:
+	sys.stderr.write("Missing DLLs not found in path %s:\n" % (dll_path,))
+	for filename in missing:
+		sys.stderr.write("\t%s\n" % filename)
+	sys.exit(1)
+
+# Destination may be a full path (rename) or may be a directory to copy into:
+#   cp foo.exe bar/baz.exe
+#   cp foo.exe bar/
+if os.path.isdir(args.destination):
+	dest_dir = args.destination
+else:
+	dest_dir = os.path.dirname(args.destination)
+
+# Copy .exe and DLLs.
+shutil.copy(args.source, args.destination)
+for filename in dll_files:
+	shutil.copy(filename, dest_dir)
+
diff --git a/games/NXDoom/rpm.spec.in b/games/NXDoom/rpm.spec.in
new file mode 100644
index 000000000..330523104
--- /dev/null
+++ b/games/NXDoom/rpm.spec.in
@@ -0,0 +1,121 @@
+
+Name: @PACKAGE@
+Summary: @PACKAGE_SHORTDESC@
+Version: @VERSION@
+Release: 1
+Source: https://www.chocolate-doom.org/downloads/@VERSION@/@PACKAGE@-@VERSION@.tar.gz
+URL: @PACKAGE_URL@
+Group: Amusements/Games
+BuildRoot: /var/tmp/@PACKAGE@-buildroot
+License: @PACKAGE_LICENSE@
+Packager: @PACKAGE_MAINTAINER@ <@PACKAGE_BUGREPORT@>
+Prefix: %{_prefix}
+Autoreq: 0
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+
+%setup -q
+
+%build
+./configure \
+ 	--prefix=/usr \
+	--exec-prefix=/usr \
+	--bindir=/usr/bin \
+	--sbindir=/usr/sbin \
+	--sysconfdir=/etc \
+	--datadir=/usr/share \
+	--includedir=/usr/include \
+	--libdir=/usr/lib \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var/lib \
+	--sharedstatedir=/usr/com \
+	--mandir=/usr/share/man \
+	--infodir=/usr/share/info
+make
+
+%install
+%makeinstall
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%description
+%(sed -n "/##/ q; p " < README.md)
+
+See @PACKAGE_URL@ for more information.
+
+%package -n @PROGRAM_PREFIX@heretic
+Summary: @PACKAGE_SHORTDESC@ (Heretic binaries)
+Group: Amusements/Games
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
+%files
+%{_mandir}/man5/@PROGRAM_PREFIX@doom.cfg.5*
+%{_mandir}/man5/default.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@doom.6*
+%{_mandir}/man6/@PROGRAM_PREFIX@setup.6*
+%{_mandir}/man6/@PROGRAM_PREFIX@server.6*
+/usr/share/doc/@PACKAGE@/*
+/usr/games/@PROGRAM_PREFIX@doom
+/usr/games/@PROGRAM_PREFIX@server
+/usr/games/@PROGRAM_PREFIX@doom-setup
+/usr/share/icons/hicolor/128x128/apps/*
+/usr/share/applications/*
+
+%description -n @PROGRAM_PREFIX@heretic
+%(sed -n "/##/ q; p " < README.md)
+
+These are the Heretic binaries.
+
+See @PACKAGE_URL@ for more information.
+
+%files -n @PROGRAM_PREFIX@heretic
+%{_mandir}/man5/@PROGRAM_PREFIX@heretic.cfg.5*
+%{_mandir}/man5/heretic.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@heretic.6*
+/usr/share/doc/@PROGRAM_PREFIX@heretic/*
+/usr/games/@PROGRAM_PREFIX@heretic
+/usr/games/@PROGRAM_PREFIX@heretic-setup
+
+%package -n @PROGRAM_PREFIX@hexen
+Summary: @PACKAGE_SHORTDESC@ (Hexen binaries)
+Group: Amusements/Games
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
+%description -n @PROGRAM_PREFIX@hexen
+%(sed -n "/##/ q; p " < README.md)
+
+These are the Hexen binaries.
+
+See @PACKAGE_URL@ for more information.
+
+%files -n @PROGRAM_PREFIX@hexen
+%{_mandir}/man5/@PROGRAM_PREFIX@hexen.cfg.5*
+%{_mandir}/man5/hexen.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@hexen.6*
+/usr/share/doc/@PROGRAM_PREFIX@hexen/*
+/usr/games/@PROGRAM_PREFIX@hexen
+/usr/games/@PROGRAM_PREFIX@hexen-setup
+
+%package -n @PROGRAM_PREFIX@strife
+Summary: @PACKAGE_SHORTDESC@ (Strife binaries)
+Group: Amusements/Games
+Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
+
+%description -n @PROGRAM_PREFIX@strife
+%(sed -n "/##/ q; p " < README.md)
+
+These are the Strife binaries.
+
+See @PACKAGE_URL@ for more information.
+
+%files -n @PROGRAM_PREFIX@strife
+%{_mandir}/man5/@PROGRAM_PREFIX@strife.cfg.5*
+%{_mandir}/man5/strife.cfg.5*
+%{_mandir}/man6/@PROGRAM_PREFIX@strife.6*
+/usr/share/doc/@PROGRAM_PREFIX@strife/*
+/usr/games/@PROGRAM_PREFIX@strife
+/usr/games/@PROGRAM_PREFIX@strife-setup
+
diff --git a/games/NXDoom/src/.gitignore b/games/NXDoom/src/.gitignore
new file mode 100644
index 000000000..a3127e6bd
--- /dev/null
+++ b/games/NXDoom/src/.gitignore
@@ -0,0 +1,22 @@
+Makefile
+Makefile.in
+.deps
+*.rc
+chocolate-doom
+chocolate-heretic
+chocolate-hexen
+chocolate-server
+chocolate-strife
+chocolate-doom-setup
+chocolate-heretic-setup
+chocolate-hexen-setup
+chocolate-strife-setup
+chocolate-setup
+*.cfg
+*.exe
+*.desktop
+*.txt
+!CMakeLists.txt
+*.metainfo.xml
+tags
+TAGS
diff --git a/games/NXDoom/src/CMakeLists.txt b/games/NXDoom/src/CMakeLists.txt
new file mode 100644
index 000000000..336a5241c
--- /dev/null
+++ b/games/NXDoom/src/CMakeLists.txt
@@ -0,0 +1,287 @@
+foreach(SUBDIR doom heretic hexen strife setup)
+    add_subdirectory("${SUBDIR}")
+endforeach()
+
+# Common source files used by absolutely everything:
+
+set(COMMON_SOURCE_FILES
+    i_main.c
+    i_system.c           i_system.h
+    m_argv.c             m_argv.h
+    m_misc.c             m_misc.h)
+
+# Dedicated server (chocolate-server):
+
+set(DEDSERV_FILES
+    d_dedicated.c
+    d_iwad.c            d_iwad.h
+    d_mode.c            d_mode.h
+    deh_str.c           deh_str.h
+    i_timer.c           i_timer.h
+    m_config.c          m_config.h
+    net_common.c        net_common.h
+    net_dedicated.c     net_dedicated.h
+    net_io.c            net_io.h
+    net_packet.c        net_packet.h
+    net_sdl.c           net_sdl.h
+    net_query.c         net_query.h
+    net_server.c        net_server.h
+    net_structrw.c      net_structrw.h
+    z_native.c          z_zone.h)
+
+add_executable("${PROGRAM_PREFIX}server" WIN32 ${COMMON_SOURCE_FILES} ${DEDSERV_FILES})
+target_include_directories("${PROGRAM_PREFIX}server"
+                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+
+if (DEFINED EMSCRIPTEN)
+    set(SDL_FLAGS "-s USE_SDL=2")
+    if(ENABLE_SDL2_MIXER)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_SDL_MIXER=2")
+    endif()
+    if(ENABLE_SDL2_NET)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_SDL_NET=2")
+    endif()
+else()
+    set(SDL_LINK_LIBS SDL2::SDL2main SDL2::SDL2)
+    if(ENABLE_SDL2_MIXER)
+        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
+    endif()
+    if(ENABLE_SDL2_NET)
+        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
+    endif()
+endif()
+
+target_link_libraries("${PROGRAM_PREFIX}server" ${SDL_LINK_LIBS})
+set_target_properties("${PROGRAM_PREFIX}server" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+set_target_properties("${PROGRAM_PREFIX}server" PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
+
+# Source files used by the game binaries (chocolate-doom, etc.)
+
+set(GAME_SOURCE_FILES
+    aes_prng.c          aes_prng.h
+    d_event.c           d_event.h
+                        doomkeys.h
+                        doomtype.h
+    d_iwad.c            d_iwad.h
+    d_loop.c            d_loop.h
+    d_mode.c            d_mode.h
+                        d_ticcmd.h
+    deh_str.c           deh_str.h
+    gusconf.c           gusconf.h
+    i_cdmus.c           i_cdmus.h
+    i_endoom.c          i_endoom.h
+    i_flmusic.c
+    i_glob.c            i_glob.h
+    i_input.c           i_input.h
+    i_joystick.c        i_joystick.h
+                        i_swap.h
+    i_musicpack.c
+    i_oplmusic.c
+    i_pcsound.c
+    i_sdlmusic.c
+    i_sdlsound.c
+    i_sound.c           i_sound.h
+    i_timer.c           i_timer.h
+    i_video.c           i_video.h
+    i_videohr.c         i_videohr.h
+    i_winmusic.c
+    midifallback.c      midifallback.h
+    midifile.c          midifile.h
+    mus2mid.c           mus2mid.h
+    m_bbox.c            m_bbox.h
+    m_cheat.c           m_cheat.h
+    m_config.c          m_config.h
+    m_controls.c        m_controls.h
+    m_fixed.c           m_fixed.h
+    net_client.c        net_client.h
+    net_common.c        net_common.h
+    net_dedicated.c     net_dedicated.h
+    net_defs.h
+    net_gui.c           net_gui.h
+    net_io.c            net_io.h
+    net_loop.c          net_loop.h
+    net_packet.c        net_packet.h
+    net_petname.c       net_petname.h
+    net_query.c         net_query.h
+    net_sdl.c           net_sdl.h
+    net_server.c        net_server.h
+    net_structrw.c      net_structrw.h
+    p_rejectpad.c       p_rejectpad.h
+    sha1.c              sha1.h
+    memio.c             memio.h
+    tables.c            tables.h
+    v_diskicon.c        v_diskicon.h
+    v_video.c           v_video.h
+                        v_patch.h
+    w_checksum.c        w_checksum.h
+    w_main.c            w_main.h
+    w_wad.c             w_wad.h
+    w_file.c            w_file.h
+    w_file_stdc.c
+    w_file_posix.c
+    w_file_win32.c
+    w_merge.c           w_merge.h
+    z_zone.c            z_zone.h)
+
+set(GAME_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/../")
+
+if(WIN32)
+    list(APPEND GAME_SOURCE_FILES
+         "../win32/win_opendir.c" "../win32/win_opendir.h")
+
+    list(APPEND GAME_INCLUDE_DIRS
+         "${PROJECT_SOURCE_DIR}/win32/")
+endif()
+
+set(DEHACKED_SOURCE_FILES
+    deh_defs.h
+    deh_io.c            deh_io.h
+    deh_main.c          deh_main.h
+    deh_mapping.c       deh_mapping.h
+    deh_text.c)
+
+# Some games support dehacked patches, some don't:
+
+set(SOURCE_FILES ${COMMON_SOURCE_FILES} ${GAME_SOURCE_FILES})
+set(SOURCE_FILES_WITH_DEH ${SOURCE_FILES} ${DEHACKED_SOURCE_FILES})
+
+set(EXTRA_LIBS ${SDL_LINK_LIBS} textscreen pcsound opl)
+if(SampleRate_FOUND)
+    list(APPEND EXTRA_LIBS SampleRate::samplerate)
+endif()
+if(PNG_FOUND)
+    list(APPEND EXTRA_LIBS PNG::PNG)
+endif()
+if(FluidSynth_FOUND)
+    list(APPEND EXTRA_LIBS FluidSynth::libfluidsynth)
+endif()
+if(WIN32)
+	list(APPEND EXTRA_LIBS winmm shlwapi)
+endif()
+
+if(WIN32)
+    add_executable("${PROGRAM_PREFIX}doom" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/doom-res.rc")
+else()
+    add_executable("${PROGRAM_PREFIX}doom" ${SOURCE_FILES_WITH_DEH})
+endif()
+
+target_include_directories("${PROGRAM_PREFIX}doom" PRIVATE ${GAME_INCLUDE_DIRS})
+target_link_libraries("${PROGRAM_PREFIX}doom" doom ${EXTRA_LIBS})
+set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+
+if(MSVC)
+    set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES
+                          LINK_FLAGS "/MANIFEST:NO")
+endif()
+
+if(WIN32)
+    add_executable("${PROGRAM_PREFIX}heretic" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/heretic-res.rc")
+else()
+    add_executable("${PROGRAM_PREFIX}heretic" ${SOURCE_FILES_WITH_DEH})
+endif()
+
+target_include_directories("${PROGRAM_PREFIX}heretic" PRIVATE ${GAME_INCLUDE_DIRS})
+target_link_libraries("${PROGRAM_PREFIX}heretic" heretic ${EXTRA_LIBS})
+set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+
+if(MSVC)
+    set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES
+                          LINK_FLAGS "/MANIFEST:NO")
+endif()
+
+if(WIN32)
+    add_executable("${PROGRAM_PREFIX}hexen" WIN32 ${SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/hexen-res.rc")
+else()
+    add_executable("${PROGRAM_PREFIX}hexen" ${SOURCE_FILES})
+endif()
+
+target_include_directories("${PROGRAM_PREFIX}hexen" PRIVATE ${GAME_INCLUDE_DIRS})
+target_link_libraries("${PROGRAM_PREFIX}hexen" hexen ${EXTRA_LIBS})
+set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+
+if(MSVC)
+    set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES
+                          LINK_FLAGS "/MANIFEST:NO")
+endif()
+
+if(WIN32)
+    add_executable("${PROGRAM_PREFIX}strife" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/strife-res.rc")
+else()
+    add_executable("${PROGRAM_PREFIX}strife" ${SOURCE_FILES_WITH_DEH})
+endif()
+
+target_include_directories("${PROGRAM_PREFIX}strife" PRIVATE ${GAME_INCLUDE_DIRS})
+target_link_libraries("${PROGRAM_PREFIX}strife" strife ${EXTRA_LIBS})
+set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+
+if(MSVC)
+    set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES
+                          LINK_FLAGS "/MANIFEST:NO")
+endif()
+
+# Source files needed for chocolate-setup:
+
+set(SETUP_FILES
+    deh_str.c           deh_str.h
+    d_mode.c            d_mode.h
+    d_iwad.c            d_iwad.h
+    i_timer.c           i_timer.h
+    m_config.c          m_config.h
+    m_controls.c        m_controls.h
+    net_io.c            net_io.h
+    net_packet.c        net_packet.h
+    net_petname.c       net_petname.h
+    net_sdl.c           net_sdl.h
+    net_query.c         net_query.h
+    net_structrw.c      net_structrw.h
+    z_native.c          z_zone.h)
+
+if(WIN32)
+    add_executable("${PROGRAM_PREFIX}setup" WIN32 ${SETUP_FILES} ${COMMON_SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/setup-res.rc")
+else()
+    add_executable("${PROGRAM_PREFIX}setup" ${SETUP_FILES} ${COMMON_SOURCE_FILES})
+endif()
+
+target_include_directories("${PROGRAM_PREFIX}setup"
+                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+target_link_libraries("${PROGRAM_PREFIX}setup" ${SDL_LINK_LIBS} setup textscreen)
+set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+
+if(WIN32)
+    target_link_libraries("${PROGRAM_PREFIX}setup" winmm)
+endif()
+
+if(MSVC)
+    set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES
+                          LINK_FLAGS "/MANIFEST:NO")
+endif()
+
+if (DEFINED EMSCRIPTEN)
+    set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
+    set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
+    set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
+    set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
+    set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
+endif()
+
+add_executable(midiread midifile.c z_native.c i_system.c m_argv.c m_misc.c d_iwad.c deh_str.c m_config.c)
+target_compile_definitions(midiread PRIVATE "-DTEST")
+target_include_directories(midiread PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+if (DEFINED EMSCRIPTEN)
+    set_target_properties(midiread PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
+    set_target_properties(midiread PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+else()
+    target_link_libraries(midiread SDL2::SDL2)
+endif()
+
+add_executable(mus2mid mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c d_iwad.c deh_str.c m_config.c)
+target_compile_definitions(mus2mid PRIVATE "-DSTANDALONE")
+target_include_directories(mus2mid PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+if (DEFINED EMSCRIPTEN)
+    set_target_properties(mus2mid PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
+    set_target_properties(mus2mid PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+else()
+    target_link_libraries(mus2mid SDL2::SDL2)
+endif()
diff --git a/games/NXDoom/src/Doom.desktop.in b/games/NXDoom/src/Doom.desktop.in
new file mode 100644
index 000000000..1ec35b371
--- /dev/null
+++ b/games/NXDoom/src/Doom.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Doom
+Exec=@PROGRAM_PREFIX@doom
+Icon=@PROGRAM_PREFIX@doom
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;vanilla;
diff --git a/games/NXDoom/src/Doom.metainfo.xml.in b/games/NXDoom/src/Doom.metainfo.xml.in
new file mode 100644
index 000000000..32b9172ea
--- /dev/null
+++ b/games/NXDoom/src/Doom.metainfo.xml.in
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>@PACKAGE_RDNS@.Doom</id>
+  <launchable type="desktop-id">@PACKAGE_RDNS@.Doom.desktop</launchable>
+  <name>@PACKAGE_SHORTNAME@ Doom</name>
+  <summary>@PACKAGE_SHORTDESC@</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
+  <url type="homepage">@PACKAGE_URL@</url>
+  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
+  <description>
+    <p>
+      @PACKAGE_SHORTNAME@ Doom is a conservative,
+      historically-accurate Doom source port, which is compatible with
+      the thousands of mods and levels that were made before the Doom
+      source code was released.  Unlike other source ports, the goal
+      is to preserve the original look, feel, limitations, and bugs of
+      the original DOS executable.
+    </p>
+    <p>
+      Full support for single- and multi-player games is provided, for
+      all of the original Doom games, Chex Quest, and Hacx.  Unlike
+      the original executable, network play is implemented on the IP
+      network stack, allowing it to function on modern LANs and the
+      Internet.
+    </p>
+    <p>
+      The easiest way to run @PACKAGE_SHORTNAME@ Doom is to copy a
+      supported game file (known as a "WAD") to the root of your home
+      directory and launch the application.  If you have trouble with
+      the automatic game file detection or need to manage multiple WAD
+      files, you can run the application from the command line with a
+      path to the selected game file:
+    </p>
+    <p>
+      flatpak run @PACKAGE_RDNS@.Doom -iwad ~/PATH/TO/GAME.WAD
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.chocolate-doom.org/wiki/images/9/97/GNOME_FreeDM_DEMO4.png</image>
+      <caption>FreeDM, DM05: Metal</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/a/a6/GNOME_Doom_II_DEMO2.png</image>
+      <caption>Doom II, Level 5: The Waste Tunnels</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/4/41/GNOME_Doomsday_of_UAC.png</image>
+      <caption>Doomsday of UAC (uac_dead.wad)</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/2/2a/GNOME_Freedoom_DTWID_DEMO3.png</image>
+      <caption>Doom the Way id Did, on Freedoom. Level 3-2: City of Corpses</caption>
+    </screenshot>
+  </screenshots>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-fantasy">intense</content_attribute>
+    <content_attribute id="violence-realistic">intense</content_attribute>
+    <content_attribute id="violence-bloodshed">intense</content_attribute>
+    <content_attribute id="violence-desecration">intense</content_attribute>
+    <content_attribute id="social-chat">intense</content_attribute>
+  </content_rating>
+  <releases>
+    <release version="3.0.1" date="2020-06-25"/> 
+    <release version="3.0.0 " date="2017-12-30"/>
+    <release version="2.3.0" date="2016-12-29"/>
+    <release version="2.2.1" date="2016-04-09"/>
+    <release version="2.2.0" date="2015-06-10"/>
+    <release version="2.1.0" date="2014-10-22"/>
+  </releases>
+</component>
diff --git a/games/NXDoom/src/Doom_Screensaver.desktop.in b/games/NXDoom/src/Doom_Screensaver.desktop.in
new file mode 100644
index 000000000..deb7274aa
--- /dev/null
+++ b/games/NXDoom/src/Doom_Screensaver.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Doom
+Comment=@PACKAGE_SHORTDESC@
+TryExec=@PROGRAM_PREFIX@doom
+Exec=@PROGRAM_PREFIX@doom
+StartupNotify=false
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;MATE;
+Categories=Screensaver;
diff --git a/games/NXDoom/src/Heretic.desktop.in b/games/NXDoom/src/Heretic.desktop.in
new file mode 100644
index 000000000..ed841628b
--- /dev/null
+++ b/games/NXDoom/src/Heretic.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Heretic
+Exec=@PROGRAM_PREFIX@heretic
+Icon=@PROGRAM_PREFIX@heretic
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;doom;vanilla;
diff --git a/games/NXDoom/src/Heretic.metainfo.xml.in b/games/NXDoom/src/Heretic.metainfo.xml.in
new file mode 100644
index 000000000..9f4bdc316
--- /dev/null
+++ b/games/NXDoom/src/Heretic.metainfo.xml.in
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>@PACKAGE_RDNS@.Heretic</id>
+  <launchable type="desktop-id">@PACKAGE_RDNS@.Heretic.desktop</launchable>
+  <name>@PACKAGE_SHORTNAME@ Heretic</name>
+  <summary>@PACKAGE_SHORTDESC@</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
+  <url type="homepage">@PACKAGE_URL@</url>
+  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
+  <description>
+    <p>
+      @PACKAGE_SHORTNAME@ Heretic is a conservative,
+      historically-accurate Heretic source port, which is compatible
+      with mods and levels that were made before the Heretic source
+      code was released.  Unlike other source ports, the goal is to
+      preserve the original look, feel, limitations, and bugs of the
+      original DOS executable.
+    </p>
+    <p>
+      Full support for single- and multi-player games is provided.
+      Unlike the original executable, network play is implemented on
+      the IP network stack, allowing it to function on modern LANs and
+      the Internet.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.chocolate-doom.org/wiki/images/9/93/GNOME_Heretic_E5M4.png</image>
+      <caption>Level E5M4: Courtyard</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/1/14/GNOME_Heretic_Shareware_DEMO3.png</image>
+      <caption>Shareware Level E1M9: The Graveyard</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/3/34/GNOME_Heretic_E4M1.png</image>
+      <caption>Level E4M1: Catafalque</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/4/42/GNOME_Heretic_Shareware_DEMO1.png</image>
+      <caption>Shareware Level E1M3: The Gatehouse</caption>
+    </screenshot>
+  </screenshots>
+</component>
diff --git a/games/NXDoom/src/Hexen.desktop.in b/games/NXDoom/src/Hexen.desktop.in
new file mode 100644
index 000000000..4854efcae
--- /dev/null
+++ b/games/NXDoom/src/Hexen.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Hexen
+Exec=@PROGRAM_PREFIX@hexen
+Icon=@PROGRAM_PREFIX@hexen
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;doom;vanilla;
diff --git a/games/NXDoom/src/Hexen.metainfo.xml.in b/games/NXDoom/src/Hexen.metainfo.xml.in
new file mode 100644
index 000000000..933701522
--- /dev/null
+++ b/games/NXDoom/src/Hexen.metainfo.xml.in
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>@PACKAGE_RDNS@.Hexen</id>
+  <launchable type="desktop-id">@PACKAGE_RDNS@.Hexen.desktop</launchable>
+  <name>@PACKAGE_SHORTNAME@ Hexen</name>
+  <summary>@PACKAGE_SHORTDESC@</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
+  <url type="homepage">@PACKAGE_URL@</url>
+  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
+  <description>
+    <p>
+      @PACKAGE_SHORTNAME@ Hexen is a conservative,
+      historically-accurate Hexen source port, which is compatible
+      with mods and levels that were made before the Hexen source code
+      was released.  Unlike other source ports, the goal is to
+      preserve the original look, feel, limitations, and bugs of the
+      original DOS executable.
+    </p>
+    <p>
+      Full support for single- and multi-player games is provided.
+      Unlike the original executable, network play is implemented on
+      the IP network stack, allowing it to function on modern LANs and
+      the Internet.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.chocolate-doom.org/wiki/images/0/0f/GNOME_Hexen_Guardian_of_Fire.png</image>
+      <caption>Level "Guardian of Fire"</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/5/5c/GNOME_Hexen_Effluvium.png</image>
+      <caption>Level "Effluvium"</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/c/c1/GNOME_Hexen_Dragon_Chapel.png</image>
+      <caption>Level "Dragon Chapel"</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/a/a7/GNOME_Hexen_Darkmere.png</image>
+      <caption>Level "Darkmere"</caption>
+    </screenshot>
+  </screenshots>
+</component>
diff --git a/games/NXDoom/src/Makefile.am b/games/NXDoom/src/Makefile.am
new file mode 100644
index 000000000..4fbade07b
--- /dev/null
+++ b/games/NXDoom/src/Makefile.am
@@ -0,0 +1,299 @@
+
+SUBDIRS = doom heretic hexen strife setup
+
+execgamesdir = ${bindir}
+
+execgames_PROGRAMS = @PROGRAM_PREFIX@doom     \
+                     @PROGRAM_PREFIX@heretic  \
+                     @PROGRAM_PREFIX@hexen    \
+                     @PROGRAM_PREFIX@strife   \
+                     @PROGRAM_PREFIX@server
+
+noinst_PROGRAMS = @PROGRAM_PREFIX@setup
+
+SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT)    \
+                 @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \
+                 @PROGRAM_PREFIX@hexen-setup$(EXEEXT)   \
+                 @PROGRAM_PREFIX@strife-setup$(EXEEXT)
+
+execgames_SCRIPTS = $(SETUP_BINARIES)
+
+AM_CFLAGS = -I$(top_srcdir)/textscreen            \
+            -I$(top_srcdir)/opl                   \
+            -I$(top_srcdir)/pcsound               \
+            -I$(top_srcdir)/win32                 \
+            @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+
+# Common source files used by absolutely everything:
+
+COMMON_SOURCE_FILES=\
+i_main.c                                   \
+i_system.c           i_system.h            \
+m_argv.c             m_argv.h              \
+m_misc.c             m_misc.h
+
+# Dedicated server (chocolate-server):
+
+DEDSERV_FILES=\
+d_dedicated.c                              \
+d_iwad.c             d_iwad.h              \
+d_mode.c             d_mode.h              \
+deh_str.c            deh_str.h             \
+i_timer.c            i_timer.h             \
+m_config.c           m_config.h            \
+net_common.c         net_common.h          \
+net_dedicated.c      net_dedicated.h       \
+net_io.c             net_io.h              \
+net_packet.c         net_packet.h          \
+net_sdl.c            net_sdl.h             \
+net_query.c          net_query.h           \
+net_server.c         net_server.h          \
+net_structrw.c       net_structrw.h        \
+z_native.c           z_zone.h
+
+@PROGRAM_PREFIX@server_SOURCES=$(COMMON_SOURCE_FILES) $(DEDSERV_FILES)
+@PROGRAM_PREFIX@server_LDADD = @LDFLAGS@ @SDLNET_LIBS@
+
+# Source files used by the game binaries (chocolate-doom, etc.)
+
+GAME_BASE_FILES=\
+aes_prng.c           aes_prng.h            \
+d_event.c            d_event.h             \
+                     doomkeys.h            \
+                     doomtype.h            \
+d_iwad.c             d_iwad.h              \
+d_loop.c             d_loop.h              \
+d_mode.c             d_mode.h              \
+                     d_ticcmd.h            \
+deh_str.c            deh_str.h             \
+gusconf.c            gusconf.h             \
+i_cdmus.c            i_cdmus.h             \
+i_endoom.c           i_endoom.h            \
+i_flmusic.c                                \
+i_glob.c             i_glob.h              \
+i_input.c            i_input.h             \
+i_joystick.c         i_joystick.h          \
+                     i_swap.h              \
+i_musicpack.c                              \
+i_oplmusic.c                               \
+i_pcsound.c                                \
+i_sdlmusic.c                               \
+i_sdlsound.c                               \
+i_sound.c            i_sound.h             \
+i_timer.c            i_timer.h             \
+i_video.c            i_video.h             \
+i_videohr.c          i_videohr.h           \
+i_winmusic.c                               \
+midifallback.c       midifallback.h        \
+midifile.c           midifile.h            \
+mus2mid.c            mus2mid.h             \
+m_bbox.c             m_bbox.h              \
+m_cheat.c            m_cheat.h             \
+m_config.c           m_config.h            \
+m_controls.c         m_controls.h          \
+m_fixed.c            m_fixed.h             \
+net_client.c         net_client.h          \
+net_common.c         net_common.h          \
+net_dedicated.c      net_dedicated.h       \
+net_defs.h                                 \
+net_gui.c            net_gui.h             \
+net_io.c             net_io.h              \
+net_loop.c           net_loop.h            \
+net_packet.c         net_packet.h          \
+net_petname.c        net_petname.h         \
+net_query.c          net_query.h           \
+net_sdl.c            net_sdl.h             \
+net_server.c         net_server.h          \
+net_structrw.c       net_structrw.h        \
+p_rejectpad.c        p_rejectpad.h         \
+sha1.c               sha1.h                \
+memio.c              memio.h               \
+tables.c             tables.h              \
+v_diskicon.c         v_diskicon.h          \
+v_video.c            v_video.h             \
+                     v_patch.h             \
+w_checksum.c         w_checksum.h          \
+w_main.c             w_main.h              \
+w_wad.c              w_wad.h               \
+w_file.c             w_file.h              \
+w_file_stdc.c                              \
+w_file_posix.c                             \
+w_file_win32.c                             \
+w_merge.c            w_merge.h             \
+$(top_builddir)/win32/win_opendir.c        \
+$(top_builddir)/win32/win_opendir.h
+
+
+MEMORY_NATIVE_SOURCE_FILES=\
+z_native.c           z_zone.h
+
+MEMORY_ZONE_SOURCE_FILES=\
+z_zone.c             z_zone.h
+
+if HAVE_ZPOOL
+GAME_SOURCE_FILES=$(GAME_BASE_FILES) $(MEMORY_ZONE_SOURCE_FILES)
+else
+GAME_SOURCE_FILES=$(GAME_BASE_FILES) $(MEMORY_NATIVE_SOURCE_FILES)
+endif
+
+DEHACKED_SOURCE_FILES =                    \
+deh_defs.h                                 \
+deh_io.c             deh_io.h              \
+deh_main.c           deh_main.h            \
+deh_mapping.c        deh_mapping.h         \
+deh_text.c
+
+# Some games support dehacked patches, some don't:
+
+SOURCE_FILES = $(COMMON_SOURCE_FILES) $(GAME_SOURCE_FILES)
+SOURCE_FILES_WITH_DEH = $(SOURCE_FILES) $(DEHACKED_SOURCE_FILES)
+
+EXTRA_LIBS =                                               \
+               $(top_builddir)/textscreen/libtextscreen.a  \
+               $(top_builddir)/pcsound/libpcsound.a        \
+               $(top_builddir)/opl/libopl.a                \
+               @LDFLAGS@                                   \
+               @EM_LDFLAGS@                                \
+               @SDL_LIBS@                                  \
+               @SDLMIXER_LIBS@                             \
+               @SDLNET_LIBS@
+
+if HAVE_WINDRES
+@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) doom-res.rc
+else
+@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH)
+endif
+
+@PROGRAM_PREFIX@doom_LDADD = doom/libdoom.a $(EXTRA_LIBS)
+
+if HAVE_WINDRES
+@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH) heretic-res.rc
+else
+@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH)
+endif
+
+@PROGRAM_PREFIX@heretic_LDADD = heretic/libheretic.a $(EXTRA_LIBS)
+
+if HAVE_WINDRES
+@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES) hexen-res.rc
+else
+@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES)
+endif
+
+@PROGRAM_PREFIX@hexen_LDADD = hexen/libhexen.a $(EXTRA_LIBS)
+
+if HAVE_WINDRES
+@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH) strife-res.rc
+else
+@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH)
+endif
+
+@PROGRAM_PREFIX@strife_LDADD = strife/libstrife.a $(EXTRA_LIBS)
+
+$(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT)
+	cp @PROGRAM_PREFIX@setup$(EXEEXT) $@
+
+# Make "make" aware of convenience libraries in subdirectories
+
+doom/libdoom.a:
+	$(MAKE) -C doom
+
+heretic/libheretic.a:
+	$(MAKE) -C heretic
+
+hexen/libhexen.a:
+	$(MAKE) -C hexen
+
+strife/libstrife.a:
+	$(MAKE) -C strife
+
+# Source files needed for chocolate-setup:
+
+SETUP_FILES=                               \
+deh_str.c            deh_str.h             \
+d_mode.c             d_mode.h              \
+d_iwad.c             d_iwad.h              \
+i_timer.c            i_timer.h             \
+m_config.c           m_config.h            \
+m_controls.c         m_controls.h          \
+net_io.c             net_io.h              \
+net_packet.c         net_packet.h          \
+net_petname.c        net_petname.h         \
+net_sdl.c            net_sdl.h             \
+net_query.c          net_query.h           \
+net_structrw.c       net_structrw.h        \
+z_native.c           z_zone.h
+
+if HAVE_WINDRES
+@PROGRAM_PREFIX@setup_SOURCES=$(SETUP_FILES) $(COMMON_SOURCE_FILES) setup-res.rc
+else
+@PROGRAM_PREFIX@setup_SOURCES=$(SETUP_FILES) $(COMMON_SOURCE_FILES)
+endif
+@PROGRAM_PREFIX@setup_LDADD = setup/libsetup.a                             \
+                        $(top_builddir)/textscreen/libtextscreen.a   \
+                        @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
+
+EXTRA_DIST =                        \
+        CMakeLists.txt              \
+        Doom_Screensaver.desktop.in \
+        manifest.xml
+
+metainfodir = $(prefix)/share/metainfo
+metainfo_DATA =                             \
+        @PACKAGE_RDNS@.Doom.metainfo.xml    \
+        @PACKAGE_RDNS@.Heretic.metainfo.xml \
+        @PACKAGE_RDNS@.Hexen.metainfo.xml   \
+        @PACKAGE_RDNS@.Strife.metainfo.xml
+
+@PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml
+	cp Doom.metainfo.xml $@
+
+@PACKAGE_RDNS@.Heretic.metainfo.xml : Heretic.metainfo.xml
+	cp Heretic.metainfo.xml $@
+
+@PACKAGE_RDNS@.Hexen.metainfo.xml : Hexen.metainfo.xml
+	cp Hexen.metainfo.xml $@
+
+@PACKAGE_RDNS@.Strife.metainfo.xml : Strife.metainfo.xml
+	cp Strife.metainfo.xml $@
+
+appdir = $(prefix)/share/applications
+app_DATA =                                 \
+           @PACKAGE_RDNS@.Doom.desktop    \
+           @PACKAGE_RDNS@.Heretic.desktop \
+           @PACKAGE_RDNS@.Hexen.desktop   \
+           @PACKAGE_RDNS@.Strife.desktop
+
+@PACKAGE_RDNS@.Doom.desktop : Doom.desktop
+	cp Doom.desktop $@
+
+@PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop
+	cp Heretic.desktop $@
+
+@PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop
+	cp Hexen.desktop $@
+
+@PACKAGE_RDNS@.Strife.desktop : Strife.desktop
+	cp Strife.desktop $@
+
+screensaverdir = $(prefix)/share/applications/screensavers
+screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop
+
+@PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop
+	cp Doom_Screensaver.desktop $@
+
+CLEANFILES = $(execgames_SCRIPTS) $(metainfo_DATA) $(app_DATA) $(screensaver_DATA)
+
+.rc.o:
+	$(WINDRES) $< -o $@
+%.o : %.rc
+	$(WINDRES) $< -o $@
+
+midiread : midifile.c
+	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ midifile.c -o $@
+
+MUS2MID_SRC_FILES = mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c
+mus2mid : $(MUS2MID_SRC_FILES)
+	$(CC) -DSTANDALONE -I$(top_builddir) $(CFLAGS) @LDFLAGS@ \
+              $(MUS2MID_SRC_FILES) -o $@
+
diff --git a/games/NXDoom/src/Strife.desktop.in b/games/NXDoom/src/Strife.desktop.in
new file mode 100644
index 000000000..862d20749
--- /dev/null
+++ b/games/NXDoom/src/Strife.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Strife
+Exec=@PROGRAM_PREFIX@strife
+Icon=@PROGRAM_PREFIX@strife
+Type=Application
+Comment=@PACKAGE_SHORTDESC@
+Categories=Game;ActionGame;
+Keywords=first;person;shooter;doom;vanilla;
diff --git a/games/NXDoom/src/Strife.metainfo.xml.in b/games/NXDoom/src/Strife.metainfo.xml.in
new file mode 100644
index 000000000..4fdd16a70
--- /dev/null
+++ b/games/NXDoom/src/Strife.metainfo.xml.in
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>@PACKAGE_RDNS@.Strife</id>
+  <launchable type="desktop-id">@PACKAGE_RDNS@.Strife.desktop</launchable>
+  <name>@PACKAGE_SHORTNAME@ Strife</name>
+  <summary>@PACKAGE_SHORTDESC@</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
+  <url type="homepage">@PACKAGE_URL@</url>
+  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
+  <description>
+    <p>
+      @PACKAGE_SHORTNAME@ Strife is a conservative,
+      historically-accurate recreation of the Strife engine.  It is
+      completely compatible with the original game and mods created
+      with the original engine in mind.  Made with a great reverse
+      engineering effort, it has the goal of preserving the original
+      look, feel, limitations, and bugs of the original DOS
+      executable.
+    </p>
+    <p>
+      Full support for single- and multi-player games is provided.
+      Unlike the original executable, network play is implemented on
+      the IP network stack, allowing it to function on modern LANs and
+      the Internet.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.chocolate-doom.org/wiki/images/b/b2/GNOME_Strife_Rowan.png</image>
+      <caption>Talking to Rowan</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/1/1f/GNOME_Strife_Town.png</image>
+      <caption>The Town</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/8/8a/GNOME_Strife_Opening.png</image>
+      <caption>Opening Cinematic</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://www.chocolate-doom.org/wiki/images/c/c4/GNOME_Strife_Sewage.png</image>
+      <caption>In the sewage</caption>
+    </screenshot>
+  </screenshots>
+</component>
diff --git a/games/NXDoom/src/aes_prng.c b/games/NXDoom/src/aes_prng.c
new file mode 100644
index 000000000..aad0a38a1
--- /dev/null
+++ b/games/NXDoom/src/aes_prng.c
@@ -0,0 +1,956 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// This implements a cryptographically secure pseudorandom number
+// generator for implementing secure demos. The approach taken is to
+// use the AES (Rijndael) stream cipher in "counter" mode, encrypting
+// an incrementing counter. The cipher key acts as the random seed.
+// Cryptanalysis of AES used in this way has shown it to be an
+// effective PRNG (see: Empirical Evidence concerning AES, Hellekalek
+// & Wegenkittl, 2003).
+//
+// AES implementation is taken from the Linux kernel's AES
+// implementation, found in crypto/aes_generic.c. It has been hacked
+// up to work independently.
+//
+
+#include <stdint.h>
+
+#include "aes_prng.h"
+#include "doomtype.h"
+#include "i_swap.h"
+
+/*
+ * Cryptographic API.
+ *
+ * AES Cipher Algorithm.
+ *
+ * Based on Brian Gladman's code.
+ *
+ * Linux developers:
+ *  Alexander Kjeldaas <astor@fast.no>
+ *  Herbert Valerio Riedel <hvr@hvrlab.org>
+ *  Kyle McMartin <kyle@debian.org>
+ *  Adam J. Richter <adam@yggdrasil.com> (conversion to 2.5 API).
+ *
+ * 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.
+ *
+ * ---------------------------------------------------------------------------
+ * Copyright (c) 2002, Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK.
+ * All rights reserved.
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ * ---------------------------------------------------------------------------
+ */
+
+#define AES_MIN_KEY_SIZE        16
+#define AES_MAX_KEY_SIZE        32
+#define AES_KEYSIZE_128         16
+#define AES_KEYSIZE_192         24
+#define AES_KEYSIZE_256         32
+#define AES_BLOCK_SIZE          16
+#define AES_MAX_KEYLENGTH       (15 * 16)
+#define AES_MAX_KEYLENGTH_U32   (AES_MAX_KEYLENGTH / sizeof(uint32_t))
+
+/*
+ * Please ensure that the first two fields are 16-byte aligned
+ * relative to the start of the structure, i.e., don't move them!
+ */
+typedef struct
+{
+    uint32_t key_enc[AES_MAX_KEYLENGTH_U32];
+    uint32_t key_dec[AES_MAX_KEYLENGTH_U32];
+    uint32_t key_length;
+} aes_context_t;
+
+static inline uint8_t get_byte(const uint32_t x, const unsigned n)
+{
+    return x >> (n << 3);
+}
+
+static const uint32_t rco_tab[10] = { 1, 2, 4, 8, 16, 32, 64, 128, 27, 54 };
+
+static const uint32_t crypto_ft_tab[4][256] = {
+    {
+        0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
+        0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
+        0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
+        0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
+        0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
+        0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
+        0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
+        0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
+        0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
+        0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
+        0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
+        0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
+        0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
+        0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
+        0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
+        0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
+        0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
+        0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
+        0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
+        0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
+        0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
+        0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
+        0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
+        0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
+        0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
+        0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
+        0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
+        0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
+        0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
+        0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
+        0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
+        0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
+        0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
+        0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
+        0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
+        0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
+        0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
+        0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
+        0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
+        0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
+        0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
+        0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
+        0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
+        0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
+        0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
+        0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
+        0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
+        0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
+        0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
+        0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
+        0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
+        0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
+        0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
+        0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
+        0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
+        0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
+        0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
+        0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
+        0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
+        0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
+        0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
+        0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
+        0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
+        0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c,
+    }, {
+        0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d,
+        0xf2f2ff0d, 0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154,
+        0x30306050, 0x01010203, 0x6767cea9, 0x2b2b567d,
+        0xfefee719, 0xd7d7b562, 0xabab4de6, 0x7676ec9a,
+        0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87,
+        0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b,
+        0xadad41ec, 0xd4d4b367, 0xa2a25ffd, 0xafaf45ea,
+        0x9c9c23bf, 0xa4a453f7, 0x7272e496, 0xc0c09b5b,
+        0xb7b775c2, 0xfdfde11c, 0x93933dae, 0x26264c6a,
+        0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f,
+        0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908,
+        0x7171e293, 0xd8d8ab73, 0x31316253, 0x15152a3f,
+        0x0404080c, 0xc7c79552, 0x23234665, 0xc3c39d5e,
+        0x18183028, 0x969637a1, 0x05050a0f, 0x9a9a2fb5,
+        0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d,
+        0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f,
+        0x0909121b, 0x83831d9e, 0x2c2c5874, 0x1a1a342e,
+        0x1b1b362d, 0x6e6edcb2, 0x5a5ab4ee, 0xa0a05bfb,
+        0x5252a4f6, 0x3b3b764d, 0xd6d6b761, 0xb3b37dce,
+        0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397,
+        0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c,
+        0x20204060, 0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed,
+        0x6a6ad4be, 0xcbcb8d46, 0xbebe67d9, 0x3939724b,
+        0x4a4a94de, 0x4c4c98d4, 0x5858b0e8, 0xcfcf854a,
+        0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16,
+        0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194,
+        0x45458acf, 0xf9f9e910, 0x02020406, 0x7f7ffe81,
+        0x5050a0f0, 0x3c3c7844, 0x9f9f25ba, 0xa8a84be3,
+        0x5151a2f3, 0xa3a35dfe, 0x404080c0, 0x8f8f058a,
+        0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104,
+        0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263,
+        0x10102030, 0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d,
+        0xcdcd814c, 0x0c0c1814, 0x13132635, 0xececc32f,
+        0x5f5fbee1, 0x979735a2, 0x444488cc, 0x17172e39,
+        0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47,
+        0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695,
+        0x6060c0a0, 0x81811998, 0x4f4f9ed1, 0xdcdca37f,
+        0x22224466, 0x2a2a547e, 0x90903bab, 0x88880b83,
+        0x46468cca, 0xeeeec729, 0xb8b86bd3, 0x1414283c,
+        0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76,
+        0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e,
+        0x494992db, 0x06060c0a, 0x2424486c, 0x5c5cb8e4,
+        0xc2c29f5d, 0xd3d3bd6e, 0xacac43ef, 0x6262c4a6,
+        0x919139a8, 0x959531a4, 0xe4e4d337, 0x7979f28b,
+        0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7,
+        0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0,
+        0x6c6cd8b4, 0x5656acfa, 0xf4f4f307, 0xeaeacf25,
+        0x6565caaf, 0x7a7af48e, 0xaeae47e9, 0x08081018,
+        0xbaba6fd5, 0x7878f088, 0x25254a6f, 0x2e2e5c72,
+        0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751,
+        0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21,
+        0x4b4b96dd, 0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85,
+        0x7070e090, 0x3e3e7c42, 0xb5b571c4, 0x6666ccaa,
+        0x484890d8, 0x03030605, 0xf6f6f701, 0x0e0e1c12,
+        0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0,
+        0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9,
+        0xe1e1d938, 0xf8f8eb13, 0x98982bb3, 0x11112233,
+        0x6969d2bb, 0xd9d9a970, 0x8e8e0789, 0x949433a7,
+        0x9b9b2db6, 0x1e1e3c22, 0x87871592, 0xe9e9c920,
+        0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a,
+        0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17,
+        0xbfbf65da, 0xe6e6d731, 0x424284c6, 0x6868d0b8,
+        0x414182c3, 0x999929b0, 0x2d2d5a77, 0x0f0f1e11,
+        0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6, 0x16162c3a,
+    }, {
+        0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b,
+        0xf2ff0df2, 0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5,
+        0x30605030, 0x01020301, 0x67cea967, 0x2b567d2b,
+        0xfee719fe, 0xd7b562d7, 0xab4de6ab, 0x76ec9a76,
+        0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d,
+        0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0,
+        0xad41ecad, 0xd4b367d4, 0xa25ffda2, 0xaf45eaaf,
+        0x9c23bf9c, 0xa453f7a4, 0x72e49672, 0xc09b5bc0,
+        0xb775c2b7, 0xfde11cfd, 0x933dae93, 0x264c6a26,
+        0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc,
+        0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1,
+        0x71e29371, 0xd8ab73d8, 0x31625331, 0x152a3f15,
+        0x04080c04, 0xc79552c7, 0x23466523, 0xc39d5ec3,
+        0x18302818, 0x9637a196, 0x050a0f05, 0x9a2fb59a,
+        0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2,
+        0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75,
+        0x09121b09, 0x831d9e83, 0x2c58742c, 0x1a342e1a,
+        0x1b362d1b, 0x6edcb26e, 0x5ab4ee5a, 0xa05bfba0,
+        0x52a4f652, 0x3b764d3b, 0xd6b761d6, 0xb37dceb3,
+        0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784,
+        0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced,
+        0x20406020, 0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b,
+        0x6ad4be6a, 0xcb8d46cb, 0xbe67d9be, 0x39724b39,
+        0x4a94de4a, 0x4c98d44c, 0x58b0e858, 0xcf854acf,
+        0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb,
+        0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485,
+        0x458acf45, 0xf9e910f9, 0x02040602, 0x7ffe817f,
+        0x50a0f050, 0x3c78443c, 0x9f25ba9f, 0xa84be3a8,
+        0x51a2f351, 0xa35dfea3, 0x4080c040, 0x8f058a8f,
+        0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5,
+        0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321,
+        0x10203010, 0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2,
+        0xcd814ccd, 0x0c18140c, 0x13263513, 0xecc32fec,
+        0x5fbee15f, 0x9735a297, 0x4488cc44, 0x172e3917,
+        0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d,
+        0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573,
+        0x60c0a060, 0x81199881, 0x4f9ed14f, 0xdca37fdc,
+        0x22446622, 0x2a547e2a, 0x903bab90, 0x880b8388,
+        0x468cca46, 0xeec729ee, 0xb86bd3b8, 0x14283c14,
+        0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db,
+        0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a,
+        0x4992db49, 0x060c0a06, 0x24486c24, 0x5cb8e45c,
+        0xc29f5dc2, 0xd3bd6ed3, 0xac43efac, 0x62c4a662,
+        0x9139a891, 0x9531a495, 0xe4d337e4, 0x79f28b79,
+        0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d,
+        0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9,
+        0x6cd8b46c, 0x56acfa56, 0xf4f307f4, 0xeacf25ea,
+        0x65caaf65, 0x7af48e7a, 0xae47e9ae, 0x08101808,
+        0xba6fd5ba, 0x78f08878, 0x254a6f25, 0x2e5c722e,
+        0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6,
+        0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f,
+        0x4b96dd4b, 0xbd61dcbd, 0x8b0d868b, 0x8a0f858a,
+        0x70e09070, 0x3e7c423e, 0xb571c4b5, 0x66ccaa66,
+        0x4890d848, 0x03060503, 0xf6f701f6, 0x0e1c120e,
+        0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9,
+        0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e,
+        0xe1d938e1, 0xf8eb13f8, 0x982bb398, 0x11223311,
+        0x69d2bb69, 0xd9a970d9, 0x8e07898e, 0x9433a794,
+        0x9b2db69b, 0x1e3c221e, 0x87159287, 0xe9c920e9,
+        0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf,
+        0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d,
+        0xbf65dabf, 0xe6d731e6, 0x4284c642, 0x68d0b868,
+        0x4182c341, 0x9929b099, 0x2d5a772d, 0x0f1e110f,
+        0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb, 0x162c3a16,
+    }, {
+        0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b,
+        0xff0df2f2, 0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5,
+        0x60503030, 0x02030101, 0xcea96767, 0x567d2b2b,
+        0xe719fefe, 0xb562d7d7, 0x4de6abab, 0xec9a7676,
+        0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d,
+        0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0,
+        0x41ecadad, 0xb367d4d4, 0x5ffda2a2, 0x45eaafaf,
+        0x23bf9c9c, 0x53f7a4a4, 0xe4967272, 0x9b5bc0c0,
+        0x75c2b7b7, 0xe11cfdfd, 0x3dae9393, 0x4c6a2626,
+        0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc,
+        0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1,
+        0xe2937171, 0xab73d8d8, 0x62533131, 0x2a3f1515,
+        0x080c0404, 0x9552c7c7, 0x46652323, 0x9d5ec3c3,
+        0x30281818, 0x37a19696, 0x0a0f0505, 0x2fb59a9a,
+        0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2,
+        0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575,
+        0x121b0909, 0x1d9e8383, 0x58742c2c, 0x342e1a1a,
+        0x362d1b1b, 0xdcb26e6e, 0xb4ee5a5a, 0x5bfba0a0,
+        0xa4f65252, 0x764d3b3b, 0xb761d6d6, 0x7dceb3b3,
+        0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484,
+        0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded,
+        0x40602020, 0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b,
+        0xd4be6a6a, 0x8d46cbcb, 0x67d9bebe, 0x724b3939,
+        0x94de4a4a, 0x98d44c4c, 0xb0e85858, 0x854acfcf,
+        0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb,
+        0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585,
+        0x8acf4545, 0xe910f9f9, 0x04060202, 0xfe817f7f,
+        0xa0f05050, 0x78443c3c, 0x25ba9f9f, 0x4be3a8a8,
+        0xa2f35151, 0x5dfea3a3, 0x80c04040, 0x058a8f8f,
+        0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5,
+        0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121,
+        0x20301010, 0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2,
+        0x814ccdcd, 0x18140c0c, 0x26351313, 0xc32fecec,
+        0xbee15f5f, 0x35a29797, 0x88cc4444, 0x2e391717,
+        0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d,
+        0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373,
+        0xc0a06060, 0x19988181, 0x9ed14f4f, 0xa37fdcdc,
+        0x44662222, 0x547e2a2a, 0x3bab9090, 0x0b838888,
+        0x8cca4646, 0xc729eeee, 0x6bd3b8b8, 0x283c1414,
+        0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb,
+        0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a,
+        0x92db4949, 0x0c0a0606, 0x486c2424, 0xb8e45c5c,
+        0x9f5dc2c2, 0xbd6ed3d3, 0x43efacac, 0xc4a66262,
+        0x39a89191, 0x31a49595, 0xd337e4e4, 0xf28b7979,
+        0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d,
+        0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9,
+        0xd8b46c6c, 0xacfa5656, 0xf307f4f4, 0xcf25eaea,
+        0xcaaf6565, 0xf48e7a7a, 0x47e9aeae, 0x10180808,
+        0x6fd5baba, 0xf0887878, 0x4a6f2525, 0x5c722e2e,
+        0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6,
+        0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f,
+        0x96dd4b4b, 0x61dcbdbd, 0x0d868b8b, 0x0f858a8a,
+        0xe0907070, 0x7c423e3e, 0x71c4b5b5, 0xccaa6666,
+        0x90d84848, 0x06050303, 0xf701f6f6, 0x1c120e0e,
+        0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9,
+        0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e,
+        0xd938e1e1, 0xeb13f8f8, 0x2bb39898, 0x22331111,
+        0xd2bb6969, 0xa970d9d9, 0x07898e8e, 0x33a79494,
+        0x2db69b9b, 0x3c221e1e, 0x15928787, 0xc920e9e9,
+        0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf,
+        0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d,
+        0x65dabfbf, 0xd731e6e6, 0x84c64242, 0xd0b86868,
+        0x82c34141, 0x29b09999, 0x5a772d2d, 0x1e110f0f,
+        0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb, 0x2c3a1616,
+    }
+};
+
+static const uint32_t crypto_fl_tab[4][256] = {
+    {
+        0x00000063, 0x0000007c, 0x00000077, 0x0000007b,
+        0x000000f2, 0x0000006b, 0x0000006f, 0x000000c5,
+        0x00000030, 0x00000001, 0x00000067, 0x0000002b,
+        0x000000fe, 0x000000d7, 0x000000ab, 0x00000076,
+        0x000000ca, 0x00000082, 0x000000c9, 0x0000007d,
+        0x000000fa, 0x00000059, 0x00000047, 0x000000f0,
+        0x000000ad, 0x000000d4, 0x000000a2, 0x000000af,
+        0x0000009c, 0x000000a4, 0x00000072, 0x000000c0,
+        0x000000b7, 0x000000fd, 0x00000093, 0x00000026,
+        0x00000036, 0x0000003f, 0x000000f7, 0x000000cc,
+        0x00000034, 0x000000a5, 0x000000e5, 0x000000f1,
+        0x00000071, 0x000000d8, 0x00000031, 0x00000015,
+        0x00000004, 0x000000c7, 0x00000023, 0x000000c3,
+        0x00000018, 0x00000096, 0x00000005, 0x0000009a,
+        0x00000007, 0x00000012, 0x00000080, 0x000000e2,
+        0x000000eb, 0x00000027, 0x000000b2, 0x00000075,
+        0x00000009, 0x00000083, 0x0000002c, 0x0000001a,
+        0x0000001b, 0x0000006e, 0x0000005a, 0x000000a0,
+        0x00000052, 0x0000003b, 0x000000d6, 0x000000b3,
+        0x00000029, 0x000000e3, 0x0000002f, 0x00000084,
+        0x00000053, 0x000000d1, 0x00000000, 0x000000ed,
+        0x00000020, 0x000000fc, 0x000000b1, 0x0000005b,
+        0x0000006a, 0x000000cb, 0x000000be, 0x00000039,
+        0x0000004a, 0x0000004c, 0x00000058, 0x000000cf,
+        0x000000d0, 0x000000ef, 0x000000aa, 0x000000fb,
+        0x00000043, 0x0000004d, 0x00000033, 0x00000085,
+        0x00000045, 0x000000f9, 0x00000002, 0x0000007f,
+        0x00000050, 0x0000003c, 0x0000009f, 0x000000a8,
+        0x00000051, 0x000000a3, 0x00000040, 0x0000008f,
+        0x00000092, 0x0000009d, 0x00000038, 0x000000f5,
+        0x000000bc, 0x000000b6, 0x000000da, 0x00000021,
+        0x00000010, 0x000000ff, 0x000000f3, 0x000000d2,
+        0x000000cd, 0x0000000c, 0x00000013, 0x000000ec,
+        0x0000005f, 0x00000097, 0x00000044, 0x00000017,
+        0x000000c4, 0x000000a7, 0x0000007e, 0x0000003d,
+        0x00000064, 0x0000005d, 0x00000019, 0x00000073,
+        0x00000060, 0x00000081, 0x0000004f, 0x000000dc,
+        0x00000022, 0x0000002a, 0x00000090, 0x00000088,
+        0x00000046, 0x000000ee, 0x000000b8, 0x00000014,
+        0x000000de, 0x0000005e, 0x0000000b, 0x000000db,
+        0x000000e0, 0x00000032, 0x0000003a, 0x0000000a,
+        0x00000049, 0x00000006, 0x00000024, 0x0000005c,
+        0x000000c2, 0x000000d3, 0x000000ac, 0x00000062,
+        0x00000091, 0x00000095, 0x000000e4, 0x00000079,
+        0x000000e7, 0x000000c8, 0x00000037, 0x0000006d,
+        0x0000008d, 0x000000d5, 0x0000004e, 0x000000a9,
+        0x0000006c, 0x00000056, 0x000000f4, 0x000000ea,
+        0x00000065, 0x0000007a, 0x000000ae, 0x00000008,
+        0x000000ba, 0x00000078, 0x00000025, 0x0000002e,
+        0x0000001c, 0x000000a6, 0x000000b4, 0x000000c6,
+        0x000000e8, 0x000000dd, 0x00000074, 0x0000001f,
+        0x0000004b, 0x000000bd, 0x0000008b, 0x0000008a,
+        0x00000070, 0x0000003e, 0x000000b5, 0x00000066,
+        0x00000048, 0x00000003, 0x000000f6, 0x0000000e,
+        0x00000061, 0x00000035, 0x00000057, 0x000000b9,
+        0x00000086, 0x000000c1, 0x0000001d, 0x0000009e,
+        0x000000e1, 0x000000f8, 0x00000098, 0x00000011,
+        0x00000069, 0x000000d9, 0x0000008e, 0x00000094,
+        0x0000009b, 0x0000001e, 0x00000087, 0x000000e9,
+        0x000000ce, 0x00000055, 0x00000028, 0x000000df,
+        0x0000008c, 0x000000a1, 0x00000089, 0x0000000d,
+        0x000000bf, 0x000000e6, 0x00000042, 0x00000068,
+        0x00000041, 0x00000099, 0x0000002d, 0x0000000f,
+        0x000000b0, 0x00000054, 0x000000bb, 0x00000016,
+    }, {
+        0x00006300, 0x00007c00, 0x00007700, 0x00007b00,
+        0x0000f200, 0x00006b00, 0x00006f00, 0x0000c500,
+        0x00003000, 0x00000100, 0x00006700, 0x00002b00,
+        0x0000fe00, 0x0000d700, 0x0000ab00, 0x00007600,
+        0x0000ca00, 0x00008200, 0x0000c900, 0x00007d00,
+        0x0000fa00, 0x00005900, 0x00004700, 0x0000f000,
+        0x0000ad00, 0x0000d400, 0x0000a200, 0x0000af00,
+        0x00009c00, 0x0000a400, 0x00007200, 0x0000c000,
+        0x0000b700, 0x0000fd00, 0x00009300, 0x00002600,
+        0x00003600, 0x00003f00, 0x0000f700, 0x0000cc00,
+        0x00003400, 0x0000a500, 0x0000e500, 0x0000f100,
+        0x00007100, 0x0000d800, 0x00003100, 0x00001500,
+        0x00000400, 0x0000c700, 0x00002300, 0x0000c300,
+        0x00001800, 0x00009600, 0x00000500, 0x00009a00,
+        0x00000700, 0x00001200, 0x00008000, 0x0000e200,
+        0x0000eb00, 0x00002700, 0x0000b200, 0x00007500,
+        0x00000900, 0x00008300, 0x00002c00, 0x00001a00,
+        0x00001b00, 0x00006e00, 0x00005a00, 0x0000a000,
+        0x00005200, 0x00003b00, 0x0000d600, 0x0000b300,
+        0x00002900, 0x0000e300, 0x00002f00, 0x00008400,
+        0x00005300, 0x0000d100, 0x00000000, 0x0000ed00,
+        0x00002000, 0x0000fc00, 0x0000b100, 0x00005b00,
+        0x00006a00, 0x0000cb00, 0x0000be00, 0x00003900,
+        0x00004a00, 0x00004c00, 0x00005800, 0x0000cf00,
+        0x0000d000, 0x0000ef00, 0x0000aa00, 0x0000fb00,
+        0x00004300, 0x00004d00, 0x00003300, 0x00008500,
+        0x00004500, 0x0000f900, 0x00000200, 0x00007f00,
+        0x00005000, 0x00003c00, 0x00009f00, 0x0000a800,
+        0x00005100, 0x0000a300, 0x00004000, 0x00008f00,
+        0x00009200, 0x00009d00, 0x00003800, 0x0000f500,
+        0x0000bc00, 0x0000b600, 0x0000da00, 0x00002100,
+        0x00001000, 0x0000ff00, 0x0000f300, 0x0000d200,
+        0x0000cd00, 0x00000c00, 0x00001300, 0x0000ec00,
+        0x00005f00, 0x00009700, 0x00004400, 0x00001700,
+        0x0000c400, 0x0000a700, 0x00007e00, 0x00003d00,
+        0x00006400, 0x00005d00, 0x00001900, 0x00007300,
+        0x00006000, 0x00008100, 0x00004f00, 0x0000dc00,
+        0x00002200, 0x00002a00, 0x00009000, 0x00008800,
+        0x00004600, 0x0000ee00, 0x0000b800, 0x00001400,
+        0x0000de00, 0x00005e00, 0x00000b00, 0x0000db00,
+        0x0000e000, 0x00003200, 0x00003a00, 0x00000a00,
+        0x00004900, 0x00000600, 0x00002400, 0x00005c00,
+        0x0000c200, 0x0000d300, 0x0000ac00, 0x00006200,
+        0x00009100, 0x00009500, 0x0000e400, 0x00007900,
+        0x0000e700, 0x0000c800, 0x00003700, 0x00006d00,
+        0x00008d00, 0x0000d500, 0x00004e00, 0x0000a900,
+        0x00006c00, 0x00005600, 0x0000f400, 0x0000ea00,
+        0x00006500, 0x00007a00, 0x0000ae00, 0x00000800,
+        0x0000ba00, 0x00007800, 0x00002500, 0x00002e00,
+        0x00001c00, 0x0000a600, 0x0000b400, 0x0000c600,
+        0x0000e800, 0x0000dd00, 0x00007400, 0x00001f00,
+        0x00004b00, 0x0000bd00, 0x00008b00, 0x00008a00,
+        0x00007000, 0x00003e00, 0x0000b500, 0x00006600,
+        0x00004800, 0x00000300, 0x0000f600, 0x00000e00,
+        0x00006100, 0x00003500, 0x00005700, 0x0000b900,
+        0x00008600, 0x0000c100, 0x00001d00, 0x00009e00,
+        0x0000e100, 0x0000f800, 0x00009800, 0x00001100,
+        0x00006900, 0x0000d900, 0x00008e00, 0x00009400,
+        0x00009b00, 0x00001e00, 0x00008700, 0x0000e900,
+        0x0000ce00, 0x00005500, 0x00002800, 0x0000df00,
+        0x00008c00, 0x0000a100, 0x00008900, 0x00000d00,
+        0x0000bf00, 0x0000e600, 0x00004200, 0x00006800,
+        0x00004100, 0x00009900, 0x00002d00, 0x00000f00,
+        0x0000b000, 0x00005400, 0x0000bb00, 0x00001600,
+    }, {
+        0x00630000, 0x007c0000, 0x00770000, 0x007b0000,
+        0x00f20000, 0x006b0000, 0x006f0000, 0x00c50000,
+        0x00300000, 0x00010000, 0x00670000, 0x002b0000,
+        0x00fe0000, 0x00d70000, 0x00ab0000, 0x00760000,
+        0x00ca0000, 0x00820000, 0x00c90000, 0x007d0000,
+        0x00fa0000, 0x00590000, 0x00470000, 0x00f00000,
+        0x00ad0000, 0x00d40000, 0x00a20000, 0x00af0000,
+        0x009c0000, 0x00a40000, 0x00720000, 0x00c00000,
+        0x00b70000, 0x00fd0000, 0x00930000, 0x00260000,
+        0x00360000, 0x003f0000, 0x00f70000, 0x00cc0000,
+        0x00340000, 0x00a50000, 0x00e50000, 0x00f10000,
+        0x00710000, 0x00d80000, 0x00310000, 0x00150000,
+        0x00040000, 0x00c70000, 0x00230000, 0x00c30000,
+        0x00180000, 0x00960000, 0x00050000, 0x009a0000,
+        0x00070000, 0x00120000, 0x00800000, 0x00e20000,
+        0x00eb0000, 0x00270000, 0x00b20000, 0x00750000,
+        0x00090000, 0x00830000, 0x002c0000, 0x001a0000,
+        0x001b0000, 0x006e0000, 0x005a0000, 0x00a00000,
+        0x00520000, 0x003b0000, 0x00d60000, 0x00b30000,
+        0x00290000, 0x00e30000, 0x002f0000, 0x00840000,
+        0x00530000, 0x00d10000, 0x00000000, 0x00ed0000,
+        0x00200000, 0x00fc0000, 0x00b10000, 0x005b0000,
+        0x006a0000, 0x00cb0000, 0x00be0000, 0x00390000,
+        0x004a0000, 0x004c0000, 0x00580000, 0x00cf0000,
+        0x00d00000, 0x00ef0000, 0x00aa0000, 0x00fb0000,
+        0x00430000, 0x004d0000, 0x00330000, 0x00850000,
+        0x00450000, 0x00f90000, 0x00020000, 0x007f0000,
+        0x00500000, 0x003c0000, 0x009f0000, 0x00a80000,
+        0x00510000, 0x00a30000, 0x00400000, 0x008f0000,
+        0x00920000, 0x009d0000, 0x00380000, 0x00f50000,
+        0x00bc0000, 0x00b60000, 0x00da0000, 0x00210000,
+        0x00100000, 0x00ff0000, 0x00f30000, 0x00d20000,
+        0x00cd0000, 0x000c0000, 0x00130000, 0x00ec0000,
+        0x005f0000, 0x00970000, 0x00440000, 0x00170000,
+        0x00c40000, 0x00a70000, 0x007e0000, 0x003d0000,
+        0x00640000, 0x005d0000, 0x00190000, 0x00730000,
+        0x00600000, 0x00810000, 0x004f0000, 0x00dc0000,
+        0x00220000, 0x002a0000, 0x00900000, 0x00880000,
+        0x00460000, 0x00ee0000, 0x00b80000, 0x00140000,
+        0x00de0000, 0x005e0000, 0x000b0000, 0x00db0000,
+        0x00e00000, 0x00320000, 0x003a0000, 0x000a0000,
+        0x00490000, 0x00060000, 0x00240000, 0x005c0000,
+        0x00c20000, 0x00d30000, 0x00ac0000, 0x00620000,
+        0x00910000, 0x00950000, 0x00e40000, 0x00790000,
+        0x00e70000, 0x00c80000, 0x00370000, 0x006d0000,
+        0x008d0000, 0x00d50000, 0x004e0000, 0x00a90000,
+        0x006c0000, 0x00560000, 0x00f40000, 0x00ea0000,
+        0x00650000, 0x007a0000, 0x00ae0000, 0x00080000,
+        0x00ba0000, 0x00780000, 0x00250000, 0x002e0000,
+        0x001c0000, 0x00a60000, 0x00b40000, 0x00c60000,
+        0x00e80000, 0x00dd0000, 0x00740000, 0x001f0000,
+        0x004b0000, 0x00bd0000, 0x008b0000, 0x008a0000,
+        0x00700000, 0x003e0000, 0x00b50000, 0x00660000,
+        0x00480000, 0x00030000, 0x00f60000, 0x000e0000,
+        0x00610000, 0x00350000, 0x00570000, 0x00b90000,
+        0x00860000, 0x00c10000, 0x001d0000, 0x009e0000,
+        0x00e10000, 0x00f80000, 0x00980000, 0x00110000,
+        0x00690000, 0x00d90000, 0x008e0000, 0x00940000,
+        0x009b0000, 0x001e0000, 0x00870000, 0x00e90000,
+        0x00ce0000, 0x00550000, 0x00280000, 0x00df0000,
+        0x008c0000, 0x00a10000, 0x00890000, 0x000d0000,
+        0x00bf0000, 0x00e60000, 0x00420000, 0x00680000,
+        0x00410000, 0x00990000, 0x002d0000, 0x000f0000,
+        0x00b00000, 0x00540000, 0x00bb0000, 0x00160000,
+    }, {
+        0x63000000, 0x7c000000, 0x77000000, 0x7b000000,
+        0xf2000000, 0x6b000000, 0x6f000000, 0xc5000000,
+        0x30000000, 0x01000000, 0x67000000, 0x2b000000,
+        0xfe000000, 0xd7000000, 0xab000000, 0x76000000,
+        0xca000000, 0x82000000, 0xc9000000, 0x7d000000,
+        0xfa000000, 0x59000000, 0x47000000, 0xf0000000,
+        0xad000000, 0xd4000000, 0xa2000000, 0xaf000000,
+        0x9c000000, 0xa4000000, 0x72000000, 0xc0000000,
+        0xb7000000, 0xfd000000, 0x93000000, 0x26000000,
+        0x36000000, 0x3f000000, 0xf7000000, 0xcc000000,
+        0x34000000, 0xa5000000, 0xe5000000, 0xf1000000,
+        0x71000000, 0xd8000000, 0x31000000, 0x15000000,
+        0x04000000, 0xc7000000, 0x23000000, 0xc3000000,
+        0x18000000, 0x96000000, 0x05000000, 0x9a000000,
+        0x07000000, 0x12000000, 0x80000000, 0xe2000000,
+        0xeb000000, 0x27000000, 0xb2000000, 0x75000000,
+        0x09000000, 0x83000000, 0x2c000000, 0x1a000000,
+        0x1b000000, 0x6e000000, 0x5a000000, 0xa0000000,
+        0x52000000, 0x3b000000, 0xd6000000, 0xb3000000,
+        0x29000000, 0xe3000000, 0x2f000000, 0x84000000,
+        0x53000000, 0xd1000000, 0x00000000, 0xed000000,
+        0x20000000, 0xfc000000, 0xb1000000, 0x5b000000,
+        0x6a000000, 0xcb000000, 0xbe000000, 0x39000000,
+        0x4a000000, 0x4c000000, 0x58000000, 0xcf000000,
+        0xd0000000, 0xef000000, 0xaa000000, 0xfb000000,
+        0x43000000, 0x4d000000, 0x33000000, 0x85000000,
+        0x45000000, 0xf9000000, 0x02000000, 0x7f000000,
+        0x50000000, 0x3c000000, 0x9f000000, 0xa8000000,
+        0x51000000, 0xa3000000, 0x40000000, 0x8f000000,
+        0x92000000, 0x9d000000, 0x38000000, 0xf5000000,
+        0xbc000000, 0xb6000000, 0xda000000, 0x21000000,
+        0x10000000, 0xff000000, 0xf3000000, 0xd2000000,
+        0xcd000000, 0x0c000000, 0x13000000, 0xec000000,
+        0x5f000000, 0x97000000, 0x44000000, 0x17000000,
+        0xc4000000, 0xa7000000, 0x7e000000, 0x3d000000,
+        0x64000000, 0x5d000000, 0x19000000, 0x73000000,
+        0x60000000, 0x81000000, 0x4f000000, 0xdc000000,
+        0x22000000, 0x2a000000, 0x90000000, 0x88000000,
+        0x46000000, 0xee000000, 0xb8000000, 0x14000000,
+        0xde000000, 0x5e000000, 0x0b000000, 0xdb000000,
+        0xe0000000, 0x32000000, 0x3a000000, 0x0a000000,
+        0x49000000, 0x06000000, 0x24000000, 0x5c000000,
+        0xc2000000, 0xd3000000, 0xac000000, 0x62000000,
+        0x91000000, 0x95000000, 0xe4000000, 0x79000000,
+        0xe7000000, 0xc8000000, 0x37000000, 0x6d000000,
+        0x8d000000, 0xd5000000, 0x4e000000, 0xa9000000,
+        0x6c000000, 0x56000000, 0xf4000000, 0xea000000,
+        0x65000000, 0x7a000000, 0xae000000, 0x08000000,
+        0xba000000, 0x78000000, 0x25000000, 0x2e000000,
+        0x1c000000, 0xa6000000, 0xb4000000, 0xc6000000,
+        0xe8000000, 0xdd000000, 0x74000000, 0x1f000000,
+        0x4b000000, 0xbd000000, 0x8b000000, 0x8a000000,
+        0x70000000, 0x3e000000, 0xb5000000, 0x66000000,
+        0x48000000, 0x03000000, 0xf6000000, 0x0e000000,
+        0x61000000, 0x35000000, 0x57000000, 0xb9000000,
+        0x86000000, 0xc1000000, 0x1d000000, 0x9e000000,
+        0xe1000000, 0xf8000000, 0x98000000, 0x11000000,
+        0x69000000, 0xd9000000, 0x8e000000, 0x94000000,
+        0x9b000000, 0x1e000000, 0x87000000, 0xe9000000,
+        0xce000000, 0x55000000, 0x28000000, 0xdf000000,
+        0x8c000000, 0xa1000000, 0x89000000, 0x0d000000,
+        0xbf000000, 0xe6000000, 0x42000000, 0x68000000,
+        0x41000000, 0x99000000, 0x2d000000, 0x0f000000,
+        0xb0000000, 0x54000000, 0xbb000000, 0x16000000,
+    }
+};
+
+/* initialise the key schedule from the user supplied key */
+
+static uint32_t aes_ror32(uint32_t word, unsigned int shift)
+{
+    return (word >> shift) | (word << (32 - shift));
+}
+
+#define cpu_to_le32(x) SDL_SwapLE32(x)
+#define le32_to_cpu(x) SDL_SwapLE32(x)
+
+#define star_x(x) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b)
+
+#define imix_col(y, x)  do {        \
+    u       = star_x(x);        \
+    v       = star_x(u);        \
+    w       = star_x(v);        \
+    t       = w ^ (x);          \
+    (y)     = u ^ v ^ w;        \
+    (y)     ^= aes_ror32(u ^ t, 8) ^    \
+        aes_ror32(v ^ t, 16) ^      \
+        aes_ror32(t, 24);       \
+} while (0)
+
+#define ls_box(x)           \
+    crypto_fl_tab[0][get_byte(x, 0)] ^  \
+    crypto_fl_tab[1][get_byte(x, 1)] ^  \
+    crypto_fl_tab[2][get_byte(x, 2)] ^  \
+    crypto_fl_tab[3][get_byte(x, 3)]
+
+#define loop4(i)    do {        \
+    t = aes_ror32(t, 8);        \
+    t = ls_box(t) ^ rco_tab[i];     \
+    t ^= ctx->key_enc[4 * i];           \
+    ctx->key_enc[4 * i + 4] = t;        \
+    t ^= ctx->key_enc[4 * i + 1];       \
+    ctx->key_enc[4 * i + 5] = t;        \
+    t ^= ctx->key_enc[4 * i + 2];       \
+    ctx->key_enc[4 * i + 6] = t;        \
+    t ^= ctx->key_enc[4 * i + 3];       \
+    ctx->key_enc[4 * i + 7] = t;        \
+} while (0)
+
+#define loop6(i)    do {        \
+    t = aes_ror32(t, 8);        \
+    t = ls_box(t) ^ rco_tab[i];     \
+    t ^= ctx->key_enc[6 * i];           \
+    ctx->key_enc[6 * i + 6] = t;        \
+    t ^= ctx->key_enc[6 * i + 1];       \
+    ctx->key_enc[6 * i + 7] = t;        \
+    t ^= ctx->key_enc[6 * i + 2];       \
+    ctx->key_enc[6 * i + 8] = t;        \
+    t ^= ctx->key_enc[6 * i + 3];       \
+    ctx->key_enc[6 * i + 9] = t;        \
+    t ^= ctx->key_enc[6 * i + 4];       \
+    ctx->key_enc[6 * i + 10] = t;       \
+    t ^= ctx->key_enc[6 * i + 5];       \
+    ctx->key_enc[6 * i + 11] = t;       \
+} while (0)
+
+#define loop8tophalf(i) do {            \
+    t = aes_ror32(t, 8);            \
+    t = ls_box(t) ^ rco_tab[i];         \
+    t ^= ctx->key_enc[8 * i];               \
+    ctx->key_enc[8 * i + 8] = t;            \
+    t ^= ctx->key_enc[8 * i + 1];           \
+    ctx->key_enc[8 * i + 9] = t;            \
+    t ^= ctx->key_enc[8 * i + 2];           \
+    ctx->key_enc[8 * i + 10] = t;           \
+    t ^= ctx->key_enc[8 * i + 3];           \
+    ctx->key_enc[8 * i + 11] = t;           \
+} while (0)
+
+#define loop8(i)    do {                \
+    loop8tophalf(i);                \
+    t  = ctx->key_enc[8 * i + 4] ^ ls_box(t);       \
+    ctx->key_enc[8 * i + 12] = t;           \
+    t ^= ctx->key_enc[8 * i + 5];           \
+    ctx->key_enc[8 * i + 13] = t;           \
+    t ^= ctx->key_enc[8 * i + 6];           \
+    ctx->key_enc[8 * i + 14] = t;           \
+    t ^= ctx->key_enc[8 * i + 7];           \
+    ctx->key_enc[8 * i + 15] = t;           \
+} while (0)
+
+/**
+ * AES_ExpandKey - Expands the AES key as described in FIPS-197
+ * @ctx:    The location where the computed key will be stored.
+ * @in_key:     The supplied key.
+ * @key_len:    The length of the supplied key.
+ *
+ * Returns 0 on success. The function fails only if an invalid key size (or
+ * pointer) is supplied.
+ * The expanded key size is 240 bytes (max of 14 rounds with a unique 16 bytes
+ * key schedule plus a 16 bytes key which is used before the first round).
+ * The decryption key is prepared for the "Equivalent Inverse Cipher" as
+ * described in FIPS-197. The first slot (16 bytes) of each key (enc or dec) is
+ * for the initial combination, the second slot for the first round and so on.
+ */
+static int AES_ExpandKey(aes_context_t *ctx, const uint8_t *in_key,
+                         unsigned int key_len)
+{
+    const uint32_t *key = (const uint32_t *)in_key;
+    uint32_t i, t, u, v, w, j;
+
+    if (key_len != AES_KEYSIZE_128 && key_len != AES_KEYSIZE_192 &&
+        key_len != AES_KEYSIZE_256)
+        return -1;
+
+    ctx->key_length = key_len;
+
+    ctx->key_dec[key_len + 24] = ctx->key_enc[0] = le32_to_cpu(key[0]);
+    ctx->key_dec[key_len + 25] = ctx->key_enc[1] = le32_to_cpu(key[1]);
+    ctx->key_dec[key_len + 26] = ctx->key_enc[2] = le32_to_cpu(key[2]);
+    ctx->key_dec[key_len + 27] = ctx->key_enc[3] = le32_to_cpu(key[3]);
+
+    switch (key_len) {
+        case AES_KEYSIZE_128:
+            t = ctx->key_enc[3];
+            for (i = 0; i < 10; ++i)
+                loop4(i);
+            break;
+
+        case AES_KEYSIZE_192:
+            ctx->key_enc[4] = le32_to_cpu(key[4]);
+            t = ctx->key_enc[5] = le32_to_cpu(key[5]);
+            for (i = 0; i < 8; ++i)
+                loop6(i);
+            break;
+
+        case AES_KEYSIZE_256:
+            ctx->key_enc[4] = le32_to_cpu(key[4]);
+            ctx->key_enc[5] = le32_to_cpu(key[5]);
+            ctx->key_enc[6] = le32_to_cpu(key[6]);
+            t = ctx->key_enc[7] = le32_to_cpu(key[7]);
+            for (i = 0; i < 6; ++i)
+                loop8(i);
+            loop8tophalf(i);
+            break;
+    }
+
+    ctx->key_dec[0] = ctx->key_enc[key_len + 24];
+    ctx->key_dec[1] = ctx->key_enc[key_len + 25];
+    ctx->key_dec[2] = ctx->key_enc[key_len + 26];
+    ctx->key_dec[3] = ctx->key_enc[key_len + 27];
+
+    for (i = 4; i < key_len + 24; ++i) {
+        j = key_len + 24 - (i & ~3) + (i & 3);
+        imix_col(ctx->key_dec[j], ctx->key_enc[i]);
+    }
+    return 0;
+}
+
+/**
+ * AES_SetKey - Set the AES key.
+ * @ctx:        AES context struct.
+ * @in_key:     The input key.
+ * @key_len:    The size of the key.
+ *
+ * Returns 0 on success, on failure -1 is returned.
+ * The function uses AES_ExpandKey() to expand the key.
+ */
+static int AES_SetKey(aes_context_t *ctx, const uint8_t *in_key,
+                      unsigned int key_len)
+{
+    int ret;
+
+    ret = AES_ExpandKey(ctx, in_key, key_len);
+    if (!ret)
+        return 0;
+
+    return -1;
+}
+
+/* encrypt a block of text */
+
+#define f_rn(bo, bi, n, k)      do {                \
+    bo[n] = crypto_ft_tab[0][get_byte(bi[n], 0)] ^              \
+        crypto_ft_tab[1][get_byte(bi[(n + 1) & 3], 1)] ^        \
+        crypto_ft_tab[2][get_byte(bi[(n + 2) & 3], 2)] ^        \
+        crypto_ft_tab[3][get_byte(bi[(n + 3) & 3], 3)] ^ *(k + n);  \
+} while (0)
+
+#define f_nround(bo, bi, k)     do {\
+    f_rn(bo, bi, 0, k);     \
+    f_rn(bo, bi, 1, k);     \
+    f_rn(bo, bi, 2, k);     \
+    f_rn(bo, bi, 3, k);     \
+    k += 4;         \
+} while (0)
+
+#define f_rl(bo, bi, n, k)      do {                \
+    bo[n] = crypto_fl_tab[0][get_byte(bi[n], 0)] ^              \
+        crypto_fl_tab[1][get_byte(bi[(n + 1) & 3], 1)] ^        \
+        crypto_fl_tab[2][get_byte(bi[(n + 2) & 3], 2)] ^        \
+        crypto_fl_tab[3][get_byte(bi[(n + 3) & 3], 3)] ^ *(k + n);  \
+} while (0)
+
+#define f_lround(bo, bi, k)     do {\
+    f_rl(bo, bi, 0, k);     \
+    f_rl(bo, bi, 1, k);     \
+    f_rl(bo, bi, 2, k);     \
+    f_rl(bo, bi, 3, k);     \
+} while (0)
+
+static void AES_Encrypt(aes_context_t *ctx, uint8_t *out,
+                        const uint8_t *in)
+{
+    const uint32_t *src = (const uint32_t *)in;
+    uint32_t *dst = (uint32_t *)out;
+    uint32_t b0[4], b1[4];
+    const uint32_t *kp = ctx->key_enc + 4;
+    const int key_len = ctx->key_length;
+
+    b0[0] = le32_to_cpu(src[0]) ^ ctx->key_enc[0];
+    b0[1] = le32_to_cpu(src[1]) ^ ctx->key_enc[1];
+    b0[2] = le32_to_cpu(src[2]) ^ ctx->key_enc[2];
+    b0[3] = le32_to_cpu(src[3]) ^ ctx->key_enc[3];
+
+    if (key_len > 24) {
+        f_nround(b1, b0, kp);
+        f_nround(b0, b1, kp);
+    }
+
+    if (key_len > 16) {
+        f_nround(b1, b0, kp);
+        f_nround(b0, b1, kp);
+    }
+
+    f_nround(b1, b0, kp);
+    f_nround(b0, b1, kp);
+    f_nround(b1, b0, kp);
+    f_nround(b0, b1, kp);
+    f_nround(b1, b0, kp);
+    f_nround(b0, b1, kp);
+    f_nround(b1, b0, kp);
+    f_nround(b0, b1, kp);
+    f_nround(b1, b0, kp);
+    f_lround(b0, b1, kp);
+
+    dst[0] = cpu_to_le32(b0[0]);
+    dst[1] = cpu_to_le32(b0[1]);
+    dst[2] = cpu_to_le32(b0[2]);
+    dst[3] = cpu_to_le32(b0[3]);
+}
+
+static boolean prng_enabled = false;
+static aes_context_t prng_context;
+static uint32_t prng_input_counter;
+static uint32_t prng_values[4];
+static unsigned int prng_value_index = 0;
+
+// Initialize Pseudo-RNG using the specified 128-bit key.
+
+void PRNG_Start(prng_seed_t key)
+{
+    AES_SetKey(&prng_context, key, sizeof(prng_seed_t));
+    prng_value_index = 4;
+    prng_input_counter = 0;
+    prng_enabled = true;
+}
+
+void PRNG_Stop(void)
+{
+    prng_enabled = false;
+}
+
+// Generate a set of new PRNG values by encrypting a new block.
+
+static void PRNG_Generate(void)
+{
+    byte input[16], output[16];
+    unsigned int i;
+
+    // Input for the cipher is a consecutively increasing 32-bit counter.
+
+    for (i = 0; i < 4; ++i)
+    {
+        input[4*i] = prng_input_counter & 0xff;
+        input[4*i + 1] = (prng_input_counter >> 8) & 0xff;
+        input[4*i + 2] = (prng_input_counter >> 16) & 0xff;
+        input[4*i + 3] = (prng_input_counter >> 24) & 0xff;
+        ++prng_input_counter;
+    }
+
+    AES_Encrypt(&prng_context, output, input);
+
+    for (i = 0; i < 4; ++i)
+    {
+        prng_values[i] = output[4*i]
+                       | (output[4*i + 1] << 8)
+                       | (output[4*i + 2] << 16)
+                       | (output[4*i + 3] << 24);
+    }
+
+    prng_value_index = 0;
+}
+
+// Read a random 32-bit integer from the PRNG.
+
+unsigned int PRNG_Random(void)
+{
+    unsigned int result;
+
+    if (!prng_enabled)
+    {
+        return 0;
+    }
+
+    if (prng_value_index >= 4)
+    {
+        PRNG_Generate();
+    }
+
+    result = prng_values[prng_value_index];
+    ++prng_value_index;
+
+    return result;
+}
+
diff --git a/games/NXDoom/src/aes_prng.h b/games/NXDoom/src/aes_prng.h
new file mode 100644
index 000000000..f255db175
--- /dev/null
+++ b/games/NXDoom/src/aes_prng.h
@@ -0,0 +1,32 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Pseudo-random number generator for secure demos.
+//
+
+#ifndef __AES_PRNG_H__
+#define __AES_PRNG_H__
+
+#include "doomtype.h"
+
+// Nonce value used as random seed for secure demos.
+
+typedef byte prng_seed_t[16];
+
+void PRNG_Start(prng_seed_t seed);
+void PRNG_Stop(void);
+unsigned int PRNG_Random(void);
+
+#endif /* #ifndef __AES_PRNG_H__ */
+
diff --git a/games/NXDoom/src/d_dedicated.c b/games/NXDoom/src/d_dedicated.c
new file mode 100644
index 000000000..722200499
--- /dev/null
+++ b/games/NXDoom/src/d_dedicated.c
@@ -0,0 +1,47 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Code specific to the standalone dedicated server.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "config.h"
+
+#include "m_argv.h"
+#include "net_defs.h"
+
+#include "net_dedicated.h"
+#include "net_server.h"
+#include "z_zone.h"
+
+void NET_CL_Run(void)
+{
+    // No client present :-)
+    //
+    // This is here because the server code sometimes runs this 
+    // to let the client do some processing if it needs to.
+    // In a standalone dedicated server, we don't have a client.
+}
+
+void D_DoomMain(void)
+{
+    printf(PACKAGE_NAME " standalone dedicated server\n");
+
+    Z_Init();
+
+    NET_DedicatedServer();
+}
+
diff --git a/games/NXDoom/src/d_event.c b/games/NXDoom/src/d_event.c
new file mode 100644
index 000000000..3eef57282
--- /dev/null
+++ b/games/NXDoom/src/d_event.c
@@ -0,0 +1,63 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION: Event handling.
+//
+// Events are asynchronous inputs generally generated by the game user.
+// Events can be discarded if no responder claims them
+//
+
+#include <stdlib.h>
+#include "d_event.h"
+
+#define MAXEVENTS 64
+
+static event_t events[MAXEVENTS];
+static int eventhead;
+static int eventtail;
+
+//
+// D_PostEvent
+// Called by the I/O functions when input is detected
+//
+void D_PostEvent (event_t* ev)
+{
+    events[eventhead] = *ev;
+    eventhead = (eventhead + 1) % MAXEVENTS;
+}
+
+// Read an event from the queue.
+
+event_t *D_PopEvent(void)
+{
+    event_t *result;
+
+    // No more events waiting.
+
+    if (eventtail == eventhead)
+    {
+        return NULL;
+    }
+    
+    result = &events[eventtail];
+
+    // Advance to the next event in the queue.
+
+    eventtail = (eventtail + 1) % MAXEVENTS;
+
+    return result;
+}
+
+
diff --git a/games/NXDoom/src/d_event.h b/games/NXDoom/src/d_event.h
new file mode 100644
index 000000000..bc1050aeb
--- /dev/null
+++ b/games/NXDoom/src/d_event.h
@@ -0,0 +1,147 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//    
+
+
+#ifndef __D_EVENT__
+#define __D_EVENT__
+
+
+#include "doomtype.h"
+
+
+//
+// Event handling.
+//
+
+// Input event types.
+typedef enum
+{
+    // Key press/release events.
+    //    data1: Key code (from doomkeys.h) of the key that was
+    //           pressed or released. This is the key as it appears
+    //           on a US keyboard layout, and does not change with
+    //           layout.
+    // For ev_keydown only:
+    //    data2: ASCII representation of the key that was pressed that
+    //           changes with the keyboard layout; eg. if 'Z' is
+    //           pressed on a German keyboard, data1='y',data2='z'.
+    //           Not affected by modifier keys.
+    //    data3: ASCII input, fully modified according to keyboard
+    //           layout and any modifier keys that are held down.
+    //           Only set if I_StartTextInput() has been called.
+    ev_keydown,
+    ev_keyup,
+
+    // Mouse movement event.
+    //    data1: Bitfield of buttons currently held down.
+    //           (bit 0 = left; bit 1 = right; bit 2 = middle).
+    //    data2: X axis mouse movement (turn).
+    //    data3: Y axis mouse movement (forward/backward).
+    ev_mouse,
+
+    // Joystick state.
+    //    data1: Bitfield of buttons currently pressed.
+    //    data2: X axis mouse movement (turn).
+    //    data3: Y axis mouse movement (forward/backward).
+    //    data4: Third axis mouse movement (strafe).
+    //    data5: Fourth axis mouse movement (look)
+    //    data6: Dpad and analog stick direction.
+    ev_joystick,
+
+    // Quit event. Triggered when the user clicks the "close" button
+    // to terminate the application.
+    ev_quit
+} evtype_t;
+
+// Event structure.
+typedef struct
+{
+    evtype_t type;
+
+    // Event-specific data; see the descriptions given above.
+    int data1, data2, data3, data4, data5, data6;
+} event_t;
+
+ 
+//
+// Button/action code definitions.
+//
+typedef enum
+{
+    // Press "Fire".
+    BT_ATTACK		= 1,
+    // Use button, to open doors, activate switches.
+    BT_USE		= 2,
+
+    // Flag: game events, not really buttons.
+    BT_SPECIAL		= 128,
+    BT_SPECIALMASK	= 3,
+    
+    // Flag, weapon change pending.
+    // If true, the next 3 bits hold weapon num.
+    BT_CHANGE		= 4,
+    // The 3bit weapon mask and shift, convenience.
+    BT_WEAPONMASK	= (8+16+32),
+    BT_WEAPONSHIFT	= 3,
+
+    // Pause the game.
+    BTS_PAUSE		= 1,
+    // Save the game at each console.
+    BTS_SAVEGAME	= 2,
+
+    // Savegame slot numbers
+    //  occupy the second byte of buttons.    
+    BTS_SAVEMASK	= (4+8+16),
+    BTS_SAVESHIFT 	= 2,
+  
+} buttoncode_t;
+
+// villsa [STRIFE] Strife specific buttons
+// TODO - not finished
+typedef enum
+{
+    // Player view look up
+    BT2_LOOKUP          = 1,
+    // Player view look down
+    BT2_LOOKDOWN        = 2,
+    // Center player's view
+    BT2_CENTERVIEW      = 4,
+    // Use inventory item
+    BT2_INVUSE          = 8,
+    // Drop inventory item
+    BT2_INVDROP         = 16,
+    // Jump up and down
+    BT2_JUMP            = 32,
+    // Use medkit
+    BT2_HEALTH          = 128,
+  
+} buttoncode2_t;
+
+
+
+
+// Called by IO functions when input is detected.
+void D_PostEvent (event_t *ev);
+
+// Read an event from the event queue
+
+event_t *D_PopEvent(void);
+
+
+#endif
+
diff --git a/games/NXDoom/src/d_iwad.c b/games/NXDoom/src/d_iwad.c
new file mode 100644
index 000000000..e05b75f0f
--- /dev/null
+++ b/games/NXDoom/src/d_iwad.c
@@ -0,0 +1,1047 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Search for and locate an IWAD file, and initialize according
+//     to the IWAD type.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "deh_str.h"
+#include "doomkeys.h"
+#include "d_iwad.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+static const iwad_t iwads[] =
+{
+    { "doom2.wad",    doom2,     commercial, "Doom II" },
+    { "plutonia.wad", pack_plut, commercial, "Final Doom: Plutonia Experiment" },
+    { "tnt.wad",      pack_tnt,  commercial, "Final Doom: TNT: Evilution" },
+    { "doom.wad",     doom,      retail,     "Doom" },
+    { "doom1.wad",    doom,      shareware,  "Doom Shareware" },
+    { "doom2f.wad",   doom2,     commercial, "Doom II: L'Enfer sur Terre" },
+    { "chex.wad",     pack_chex, retail,     "Chex Quest" },
+    { "hacx.wad",     pack_hacx, commercial, "Hacx" },
+    { "freedoom2.wad", doom2,    commercial, "Freedoom: Phase 2" },
+    { "freedoom1.wad", doom,     retail,     "Freedoom: Phase 1" },
+    { "freedm.wad",   doom2,     commercial, "FreeDM" },
+    { "heretic.wad",  heretic,   retail,     "Heretic" },
+    { "heretic1.wad", heretic,   shareware,  "Heretic Shareware" },
+    { "hexen.wad",    hexen,     commercial, "Hexen" },
+    //{ "strife0.wad",  strife,    commercial, "Strife" }, // haleyjd: STRIFE-FIXME
+    { "strife1.wad",  strife,    commercial, "Strife" },
+};
+
+boolean D_IsIWADName(const char *name)
+{
+    int i;
+
+    for (i = 0; i < arrlen(iwads); i++)
+    {
+        if (!strcasecmp(name, iwads[i].name))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Array of locations to search for IWAD files
+//
+// "128 IWAD search directories should be enough for anybody".
+
+#define MAX_IWAD_DIRS 128
+
+static boolean iwad_dirs_built = false;
+static const char *iwad_dirs[MAX_IWAD_DIRS];
+static int num_iwad_dirs = 0;
+
+static void AddIWADDir(const char *dir)
+{
+    if (num_iwad_dirs < MAX_IWAD_DIRS)
+    {
+        iwad_dirs[num_iwad_dirs] = dir;
+        ++num_iwad_dirs;
+    }
+}
+
+// This is Windows-specific code that automatically finds the location
+// of installed IWAD files.  The registry is inspected to find special
+// keys installed by the Windows installers for various CD versions
+// of Doom.  From these keys we can deduce where to find an IWAD.
+
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+typedef struct 
+{
+    HKEY root;
+    char *path;
+    char *value;
+} registry_value_t;
+
+#define UNINSTALLER_STRING "\\uninstl.exe /S "
+
+// Keys installed by the various CD editions.  These are actually the 
+// commands to invoke the uninstaller and look like this:
+//
+// C:\Program Files\Path\uninstl.exe /S C:\Program Files\Path
+//
+// With some munging we can find where Doom was installed.
+
+// [AlexMax] From the persepctive of a 64-bit executable, 32-bit registry
+// keys are located in a different spot.
+#if _WIN64
+#define SOFTWARE_KEY "Software\\Wow6432Node"
+#else
+#define SOFTWARE_KEY "Software"
+#endif
+
+static registry_value_t uninstall_values[] =
+{
+    // Ultimate Doom, CD version (Depths of Doom trilogy)
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
+            "Uninstall\\Ultimate Doom for Windows 95",
+        "UninstallString",
+    },
+
+    // Doom II, CD version (Depths of Doom trilogy)
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
+            "Uninstall\\Doom II for Windows 95",
+        "UninstallString",
+    },
+
+    // Final Doom
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
+            "Uninstall\\Final Doom for Windows 95",
+        "UninstallString",
+    },
+
+    // Shareware version
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
+            "Uninstall\\Doom Shareware for Windows 95",
+        "UninstallString",
+    },
+};
+
+// Values installed by the GOG.com and Collector's Edition versions
+
+static registry_value_t root_path_keys[] =
+{
+    // Doom Collector's Edition
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\Activision\\DOOM Collector's Edition\\v1.0",
+        "INSTALLPATH",
+    },
+
+    // Doom II
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1435848814",
+        "PATH",
+    },
+
+    // Doom 3: BFG Edition
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1135892318",
+        "PATH",
+    },
+
+    // Final Doom
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1435848742",
+        "PATH",
+    },
+
+    // Ultimate Doom
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1435827232",
+        "PATH",
+    },
+
+    // Strife: Veteran Edition
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1432899949",
+        "PATH",
+    },
+
+    // Heretic
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1290366318",
+        "PATH",
+    },
+
+    // Hexen
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1247951670",
+        "PATH",
+    },
+
+    // Hexen: Deathkings of a Dark Citadel
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1983497091",
+        "PATH",
+    },
+
+    // Heretic + Hexen Rerelease
+
+    {
+        HKEY_LOCAL_MACHINE,
+        SOFTWARE_KEY "\\GOG.com\\Games\\1776058590",
+        "PATH"
+    },
+};
+
+// Subdirectories of the above install path, where IWADs are installed.
+
+static char *root_path_subdirs[] =
+{
+    "Doom2",
+    "Final Doom",
+    "Ultimate Doom",
+    "Plutonia",
+    "TNT",
+    "base\\wads",
+    "dos\\base\\heretic",
+    "dos\\base\\hexen",
+    ".",
+};
+
+// Location where Steam is installed
+
+static registry_value_t steam_install_location =
+{
+    HKEY_LOCAL_MACHINE,
+    SOFTWARE_KEY "\\Valve\\Steam",
+    "InstallPath",
+};
+
+// Subdirs of the steam install directory where IWADs are found
+
+static char *steam_install_subdirs[] =
+{
+    "steamapps\\common\\doom 2\\base",
+    "steamapps\\common\\doom 2\\finaldoombase",
+    "steamapps\\common\\final doom\\base",
+    "steamapps\\common\\ultimate doom\\base",
+    "steamapps\\common\\heretic shadow of the serpent riders\\base",
+    "steamapps\\common\\hexen\\base",
+    "steamapps\\common\\hexen deathkings of the dark citadel\\base",
+
+    // From Doom 3: BFG Edition:
+
+    "steamapps\\common\\DOOM 3 BFG Edition\\base\\wads",
+
+    // From Heretic + Hexen Rerelease:
+
+    "steamapps\\common\\Heretic + Hexen\\dos\\base\\heretic",
+    "steamapps\\common\\Heretic + Hexen\\dos\\base\\hexen",
+
+    // From Strife: Veteran Edition:
+
+    "steamapps\\common\\Strife",
+};
+
+#define STEAM_BFG_GUS_PATCHES \
+    "steamapps\\common\\DOOM 3 BFG Edition\\base\\classicmusic\\instruments"
+
+static char *GetRegistryString(registry_value_t *reg_val)
+{
+    HKEY key;
+    DWORD len;
+    DWORD valtype;
+    char *result;
+
+    // Open the key (directory where the value is stored)
+
+    if (RegOpenKeyEx(reg_val->root, reg_val->path,
+                     0, KEY_READ, &key) != ERROR_SUCCESS)
+    {
+        return NULL;
+    }
+
+    result = NULL;
+
+    // Find the type and length of the string, and only accept strings.
+
+    if (RegQueryValueEx(key, reg_val->value,
+                        NULL, &valtype, NULL, &len) == ERROR_SUCCESS
+     && valtype == REG_SZ)
+    {
+        // Allocate a buffer for the value and read the value
+
+        result = malloc(len + 1);
+
+        if (RegQueryValueEx(key, reg_val->value, NULL, &valtype,
+                            (unsigned char *) result, &len) != ERROR_SUCCESS)
+        {
+            free(result);
+            result = NULL;
+        }
+        else
+        {
+            // Ensure the value is null-terminated
+            result[len] = '\0';
+        }
+    }
+
+    // Close the key
+
+    RegCloseKey(key);
+
+    return result;
+}
+
+// Check for the uninstall strings from the CD versions
+
+static void CheckUninstallStrings(void)
+{
+    unsigned int i;
+
+    for (i=0; i<arrlen(uninstall_values); ++i)
+    {
+        char *val;
+        char *path;
+        char *unstr;
+
+        val = GetRegistryString(&uninstall_values[i]);
+
+        if (val == NULL)
+        {
+            continue;
+        }
+
+        unstr = strstr(val, UNINSTALLER_STRING);
+
+        if (unstr == NULL)
+        {
+            free(val);
+        }
+        else
+        {
+            path = unstr + strlen(UNINSTALLER_STRING);
+
+            AddIWADDir(path);
+        }
+    }
+}
+
+// Check for GOG.com and Doom: Collector's Edition
+
+static void CheckInstallRootPaths(void)
+{
+    unsigned int i;
+
+    for (i=0; i<arrlen(root_path_keys); ++i)
+    {
+        char *install_path;
+        char *subpath;
+        unsigned int j;
+
+        install_path = GetRegistryString(&root_path_keys[i]);
+
+        if (install_path == NULL)
+        {
+            continue;
+        }
+
+        for (j=0; j<arrlen(root_path_subdirs); ++j)
+        {
+            subpath = M_StringJoin(install_path, DIR_SEPARATOR_S,
+                                   root_path_subdirs[j], NULL);
+            AddIWADDir(subpath);
+        }
+
+        free(install_path);
+    }
+}
+
+
+// Check for Doom downloaded via Steam
+
+static void CheckSteamEdition(void)
+{
+    char *install_path;
+    char *subpath;
+    size_t i;
+
+    install_path = GetRegistryString(&steam_install_location);
+
+    if (install_path == NULL)
+    {
+        return;
+    }
+
+    for (i=0; i<arrlen(steam_install_subdirs); ++i)
+    {
+        subpath = M_StringJoin(install_path, DIR_SEPARATOR_S,
+                               steam_install_subdirs[i], NULL);
+
+        AddIWADDir(subpath);
+    }
+
+    free(install_path);
+}
+
+// The BFG edition ships with a full set of GUS patches. If we find them,
+// we can autoconfigure to use them.
+
+static void CheckSteamGUSPatches(void)
+{
+    const char *current_path;
+    char *install_path;
+    char *test_patch_path, *patch_path;
+
+    // Already configured? Don't stomp on the user's choices.
+    current_path = M_GetStringVariable("gus_patch_path");
+    if (current_path != NULL && strlen(current_path) > 0)
+    {
+        return;
+    }
+
+    install_path = GetRegistryString(&steam_install_location);
+
+    if (install_path == NULL)
+    {
+        return;
+    }
+
+    patch_path = M_StringJoin(install_path, "\\", STEAM_BFG_GUS_PATCHES,
+                              NULL);
+    test_patch_path = M_StringJoin(patch_path, "\\ACBASS.PAT", NULL);
+
+    // Does acbass.pat exist? If so, then set gus_patch_path.
+    if (M_FileExists(test_patch_path))
+    {
+        M_SetVariable("gus_patch_path", patch_path);
+    }
+
+    free(test_patch_path);
+    free(patch_path);
+    free(install_path);
+}
+
+// Default install directories for DOS Doom
+
+static void CheckDOSDefaults(void)
+{
+    // These are the default install directories used by the deice
+    // installer program:
+
+    AddIWADDir("\\doom2");              // Doom II
+    AddIWADDir("\\plutonia");           // Final Doom
+    AddIWADDir("\\tnt");
+    AddIWADDir("\\doom_se");            // Ultimate Doom
+    AddIWADDir("\\doom");               // Shareware / Registered Doom
+    AddIWADDir("\\dooms");              // Shareware versions
+    AddIWADDir("\\doomsw");
+
+    AddIWADDir("\\heretic");            // Heretic
+    AddIWADDir("\\hrtic_se");           // Heretic Shareware from Quake disc
+
+    AddIWADDir("\\hexen");              // Hexen
+    AddIWADDir("\\hexendk");            // Hexen Deathkings of the Dark Citadel
+
+    AddIWADDir("\\strife");             // Strife
+}
+
+#endif
+
+// Returns true if the specified path is a path to a file
+// of the specified name.
+
+static boolean DirIsFile(const char *path, const char *filename)
+{
+    return strchr(path, DIR_SEPARATOR) != NULL
+        && !strcasecmp(M_BaseName(path), filename);
+}
+
+// Check if the specified directory contains the specified IWAD
+// file, returning the full path to the IWAD if found, or NULL
+// if not found.
+
+static char *CheckDirectoryHasIWAD(const char *dir, const char *iwadname)
+{
+    char *filename; 
+    char *probe;
+
+    // As a special case, the "directory" may refer directly to an
+    // IWAD file if the path comes from DOOMWADDIR or DOOMWADPATH.
+
+    probe = M_FileCaseExists(dir);
+    if (DirIsFile(dir, iwadname) && probe != NULL)
+    {
+        return probe;
+    }
+
+    // Construct the full path to the IWAD if it is located in
+    // this directory, and check if it exists.
+
+    if (!strcmp(dir, "."))
+    {
+        filename = M_StringDuplicate(iwadname);
+    }
+    else
+    {
+        filename = M_StringJoin(dir, DIR_SEPARATOR_S, iwadname, NULL);
+    }
+
+    free(probe);
+    probe = M_FileCaseExists(filename);
+    free(filename);
+    if (probe != NULL)
+    {
+        return probe;
+    }
+
+    return NULL;
+}
+
+// Search a directory to try to find an IWAD
+// Returns the location of the IWAD if found, otherwise NULL.
+
+static char *SearchDirectoryForIWAD(const char *dir, int mask, GameMission_t *mission)
+{
+    char *filename;
+    size_t i;
+
+    for (i=0; i<arrlen(iwads); ++i) 
+    {
+        if (((1 << iwads[i].mission) & mask) == 0)
+        {
+            continue;
+        }
+
+        filename = CheckDirectoryHasIWAD(dir, DEH_String(iwads[i].name));
+
+        if (filename != NULL)
+        {
+            *mission = iwads[i].mission;
+
+            return filename;
+        }
+    }
+
+    return NULL;
+}
+
+// When given an IWAD with the '-iwad' parameter,
+// attempt to identify it by its name.
+
+static GameMission_t IdentifyIWADByName(const char *name, int mask)
+{
+    size_t i;
+    GameMission_t mission;
+
+    name = M_BaseName(name);
+    mission = none;
+
+    for (i=0; i<arrlen(iwads); ++i)
+    {
+        // Check if the filename is this IWAD name.
+
+        // Only use supported missions:
+
+        if (((1 << iwads[i].mission) & mask) == 0)
+            continue;
+
+        // Check if it ends in this IWAD name.
+
+        if (!strcasecmp(name, iwads[i].name))
+        {
+            mission = iwads[i].mission;
+            break;
+        }
+    }
+
+    return mission;
+}
+
+// Add IWAD directories parsed from splitting a path string containing
+// paths separated by PATH_SEPARATOR. 'suffix' is a string to concatenate
+// to the end of the paths before adding them.
+static void AddIWADPath(const char *path, const char *suffix)
+{
+    char *left, *p, *dup_path;
+
+    dup_path = M_StringDuplicate(path);
+
+    // Split into individual dirs within the list.
+    left = dup_path;
+
+    for (;;)
+    {
+        p = strchr(left, PATH_SEPARATOR);
+        if (p != NULL)
+        {
+            // Break at the separator and use the left hand side
+            // as another iwad dir
+            *p = '\0';
+
+            AddIWADDir(M_StringJoin(left, suffix, NULL));
+            left = p + 1;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    AddIWADDir(M_StringJoin(left, suffix, NULL));
+
+    free(dup_path);
+}
+
+#ifndef _WIN32
+// Add standard directories where IWADs are located on Unix systems.
+// To respect the freedesktop.org specification we support overriding
+// using standard environment variables. See the XDG Base Directory
+// Specification:
+// <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>
+static void AddXdgDirs(void)
+{
+    const char *env;
+    char *tmp_env;
+
+    // Quote:
+    // > $XDG_DATA_HOME defines the base directory relative to which
+    // > user specific data files should be stored. If $XDG_DATA_HOME
+    // > is either not set or empty, a default equal to
+    // > $HOME/.local/share should be used.
+    env = getenv("XDG_DATA_HOME");
+    tmp_env = NULL;
+
+    if (env == NULL)
+    {
+        const char *homedir = getenv("HOME");
+        if (homedir == NULL)
+        {
+            homedir = "/";
+        }
+
+        tmp_env = M_StringJoin(homedir, "/.local/share", NULL);
+        env = tmp_env;
+    }
+
+    // We support $XDG_DATA_HOME/games/doom (which will usually be
+    // ~/.local/share/games/doom) as a user-writeable extension to
+    // the usual /usr/share/games/doom location.
+    AddIWADDir(M_StringJoin(env, "/games/doom", NULL));
+    free(tmp_env);
+
+    // Quote:
+    // > $XDG_DATA_DIRS defines the preference-ordered set of base
+    // > directories to search for data files in addition to the
+    // > $XDG_DATA_HOME base directory. The directories in $XDG_DATA_DIRS
+    // > should be seperated with a colon ':'.
+    // >
+    // > If $XDG_DATA_DIRS is either not set or empty, a value equal to
+    // > /usr/local/share/:/usr/share/ should be used.
+    env = getenv("XDG_DATA_DIRS");
+    if (env == NULL)
+    {
+        // (Trailing / omitted from paths, as it is added below)
+        env = "/usr/local/share:/usr/share";
+    }
+
+    // The "standard" location for IWADs on Unix that is supported by most
+    // source ports is /usr/share/games/doom - we support this through the
+    // XDG_DATA_DIRS mechanism, through which it can be overridden.
+    AddIWADPath(env, "/games/doom");
+    AddIWADPath(env, "/doom");
+
+    // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG
+    // Edition into this directory, under which includes the Doom
+    // Classic WADs.
+    AddIWADPath(env, "/games/doom3bfg/base/wads");
+}
+
+#ifndef __MACOSX__
+// Steam on Linux allows installing some select Windows games,
+// including the classic Doom series (running DOSBox via Wine).  We
+// could parse *.vdf files to more accurately detect installation
+// locations, but the defaults are likely to be good enough for just
+// about everyone.
+static void AddSteamDirs(void)
+{
+    const char *homedir;
+    char *steampath;
+
+    homedir = getenv("HOME");
+    if (homedir == NULL)
+    {
+        homedir = "/";
+    }
+    steampath = M_StringJoin(homedir, "/.steam/root/steamapps/common", NULL);
+
+    AddIWADPath(steampath, "/Doom 2/base");
+    AddIWADPath(steampath, "/Doom 2/finaldoombase");
+    AddIWADPath(steampath, "/Master Levels of Doom/doom2");
+    AddIWADPath(steampath, "/Ultimate Doom/base");
+    AddIWADPath(steampath, "/Final Doom/base");
+    AddIWADPath(steampath, "/DOOM 3 BFG Edition/base/wads");
+    AddIWADPath(steampath, "/Heretic Shadow of the Serpent Riders/base");
+    AddIWADPath(steampath, "/Hexen/base");
+    AddIWADPath(steampath, "/Hexen Deathkings of the Dark Citadel/base");
+    AddIWADPath(steampath, "/Heretic + Hexen/dos/base/heretic");
+    AddIWADPath(steampath, "/Heretic + Hexen/dos/base/hexen");
+    AddIWADPath(steampath, "/Strife");
+    free(steampath);
+}
+#endif // __MACOSX__
+#endif // !_WIN32
+
+//
+// Build a list of IWAD files
+//
+
+static void BuildIWADDirList(void)
+{
+    char *env;
+
+    if (iwad_dirs_built)
+    {
+        return;
+    }
+
+    // Look in the current directory.  Doom always does this.
+    AddIWADDir(".");
+
+    // Next check the directory where the executable is located. This might
+    // be different from the current directory.
+    AddIWADDir(M_DirName(myargv[0]));
+
+    // Add DOOMWADDIR if it is in the environment
+    env = M_getenv("DOOMWADDIR");
+    if (env != NULL)
+    {
+        AddIWADDir(env);
+    }
+
+    // Add dirs from DOOMWADPATH:
+    env = M_getenv("DOOMWADPATH");
+    if (env != NULL)
+    {
+        AddIWADPath(env, "");
+    }
+
+#ifdef _WIN32
+
+    // Search the registry and find where IWADs have been installed.
+
+    CheckUninstallStrings();
+    CheckInstallRootPaths();
+    CheckSteamEdition();
+    CheckDOSDefaults();
+
+    // Check for GUS patches installed with the BFG edition!
+
+    CheckSteamGUSPatches();
+
+#else
+    AddXdgDirs();
+#ifndef __MACOSX__
+    AddSteamDirs();
+#endif
+#endif
+
+    // Don't run this function again.
+
+    iwad_dirs_built = true;
+}
+
+//
+// Searches WAD search paths for an WAD with a specific filename.
+// 
+
+char *D_FindWADByName(const char *name)
+{
+    char *path;
+    char *probe;
+    int i;
+    
+    // Absolute path?
+
+    probe = M_FileCaseExists(name);
+    if (probe != NULL)
+    {
+        return probe;
+    }
+
+    BuildIWADDirList();
+
+    // Search through all IWAD paths for a file with the given name.
+
+    for (i=0; i<num_iwad_dirs; ++i)
+    {
+        // As a special case, if this is in DOOMWADDIR or DOOMWADPATH,
+        // the "directory" may actually refer directly to an IWAD
+        // file.
+
+        probe = M_FileCaseExists(iwad_dirs[i]);
+        if (DirIsFile(iwad_dirs[i], name) && probe != NULL)
+        {
+            return probe;
+        }
+        free(probe);
+
+        // Construct a string for the full path
+
+        path = M_StringJoin(iwad_dirs[i], DIR_SEPARATOR_S, name, NULL);
+
+        probe = M_FileCaseExists(path);
+        if (probe != NULL)
+        {
+            return probe;
+        }
+
+        free(path);
+    }
+
+    // File not found
+
+    return NULL;
+}
+
+//
+// D_TryWADByName
+//
+// Searches for a WAD by its filename, or returns a copy of the filename
+// if not found.
+//
+
+char *D_TryFindWADByName(const char *filename)
+{
+    char *result;
+
+    result = D_FindWADByName(filename);
+
+    if (result != NULL)
+    {
+        return result;
+    }
+    else
+    {
+        return M_StringDuplicate(filename);
+    }
+}
+
+//
+// FindIWAD
+// Checks availability of IWAD files by name,
+// to determine whether registered/commercial features
+// should be executed (notably loading PWADs).
+//
+
+char *D_FindIWAD(int mask, GameMission_t *mission)
+{
+    char *result;
+    const char *iwadfile;
+    int iwadparm;
+    int i;
+
+    // Check for the -iwad parameter
+
+    //!
+    // Specify an IWAD file to use.
+    //
+    // @arg <file>
+    //
+
+    iwadparm = M_CheckParmWithArgs("-iwad", 1);
+
+    if (iwadparm)
+    {
+        // Search through IWAD dirs for an IWAD with the given name.
+
+        iwadfile = myargv[iwadparm + 1];
+
+        result = D_FindWADByName(iwadfile);
+
+        if (result == NULL)
+        {
+            I_Error("IWAD file '%s' not found!", iwadfile);
+        }
+        
+        *mission = IdentifyIWADByName(result, mask);
+    }
+    else
+    {
+        // Search through the list and look for an IWAD
+
+        result = NULL;
+
+        BuildIWADDirList();
+    
+        for (i=0; result == NULL && i<num_iwad_dirs; ++i)
+        {
+            result = SearchDirectoryForIWAD(iwad_dirs[i], mask, mission);
+        }
+    }
+
+    return result;
+}
+
+// Find all IWADs in the IWAD search path matching the given mask.
+
+const iwad_t **D_FindAllIWADs(int mask)
+{
+    const iwad_t **result;
+    int result_len;
+    char *filename;
+    int i;
+
+    result = malloc(sizeof(iwad_t *) * (arrlen(iwads) + 1));
+    result_len = 0;
+
+    // Try to find all IWADs
+
+    for (i=0; i<arrlen(iwads); ++i)
+    {
+        if (((1 << iwads[i].mission) & mask) == 0)
+        {
+            continue;
+        }
+
+        filename = D_FindWADByName(iwads[i].name);
+
+        if (filename != NULL)
+        {
+            result[result_len] = &iwads[i];
+            ++result_len;
+        }
+    }
+
+    // End of list
+
+    result[result_len] = NULL;
+
+    return result;
+}
+
+//
+// Get the IWAD name used for savegames.
+//
+
+const char *D_SaveGameIWADName(GameMission_t gamemission, GameVariant_t gamevariant)
+{
+    size_t i;
+
+    // Determine the IWAD name to use for savegames.
+    // This determines the directory the savegame files get put into.
+    //
+    // Note that we match on gamemission rather than on IWAD name.
+    // This ensures that doom1.wad and doom.wad saves are stored
+    // in the same place.
+
+    if (gamevariant == freedoom)
+    {
+        if (gamemission == doom)
+        {
+            return "freedoom1.wad";
+        }
+        else if (gamemission == doom2)
+        {
+            return "freedoom2.wad";
+        }
+    }
+    else if (gamevariant == freedm && gamemission == doom2)
+    {
+        return "freedm.wad";
+    }
+
+    for (i=0; i<arrlen(iwads); ++i)
+    {
+        if (gamemission == iwads[i].mission)
+        {
+            return iwads[i].name;
+        }
+    }
+
+    // Default fallback:
+
+    return "unknown.wad";
+}
+
+const char *D_SuggestIWADName(GameMission_t mission, GameMode_t mode)
+{
+    int i;
+
+    for (i = 0; i < arrlen(iwads); ++i)
+    {
+        if (iwads[i].mission == mission && iwads[i].mode == mode)
+        {
+            return iwads[i].name;
+        }
+    }
+
+    return "unknown.wad";
+}
+
+const char *D_SuggestGameName(GameMission_t mission, GameMode_t mode)
+{
+    int i;
+
+    for (i = 0; i < arrlen(iwads); ++i)
+    {
+        if (iwads[i].mission == mission
+         && (mode == indetermined || iwads[i].mode == mode))
+        {
+            return iwads[i].description;
+        }
+    }
+
+    return "Unknown game?";
+}
+
diff --git a/games/NXDoom/src/d_iwad.h b/games/NXDoom/src/d_iwad.h
new file mode 100644
index 000000000..7a49e9827
--- /dev/null
+++ b/games/NXDoom/src/d_iwad.h
@@ -0,0 +1,53 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Find IWAD and initialize according to IWAD type.
+//
+
+
+#ifndef __D_IWAD__
+#define __D_IWAD__
+
+#include "d_mode.h"
+
+#define IWAD_MASK_DOOM    ((1 << doom)           \
+                         | (1 << doom2)          \
+                         | (1 << pack_tnt)       \
+                         | (1 << pack_plut)      \
+                         | (1 << pack_chex)      \
+                         | (1 << pack_hacx))
+#define IWAD_MASK_HERETIC (1 << heretic)
+#define IWAD_MASK_HEXEN   (1 << hexen)
+#define IWAD_MASK_STRIFE  (1 << strife)
+
+typedef struct
+{
+    const char *name;
+    GameMission_t mission;
+    GameMode_t mode;
+    const char *description;
+} iwad_t;
+
+boolean D_IsIWADName(const char *name);
+char *D_FindWADByName(const char *filename);
+char *D_TryFindWADByName(const char *filename);
+char *D_FindIWAD(int mask, GameMission_t *mission);
+const iwad_t **D_FindAllIWADs(int mask);
+const char *D_SaveGameIWADName(GameMission_t gamemission, GameVariant_t gamevariant);
+const char *D_SuggestIWADName(GameMission_t mission, GameMode_t mode);
+const char *D_SuggestGameName(GameMission_t mission, GameMode_t mode);
+void D_CheckCorrectIWAD(GameMission_t mission);
+
+#endif
+
diff --git a/games/NXDoom/src/d_loop.c b/games/NXDoom/src/d_loop.c
new file mode 100644
index 000000000..b963054a4
--- /dev/null
+++ b/games/NXDoom/src/d_loop.c
@@ -0,0 +1,881 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Main loop code.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "d_event.h"
+#include "d_loop.h"
+#include "d_ticcmd.h"
+
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+
+#include "m_argv.h"
+#include "m_fixed.h"
+
+#include "net_client.h"
+#include "net_gui.h"
+#include "net_io.h"
+#include "net_query.h"
+#include "net_server.h"
+#include "net_sdl.h"
+#include "net_loop.h"
+
+// The complete set of data for a particular tic.
+
+typedef struct
+{
+    ticcmd_t cmds[NET_MAXPLAYERS];
+    boolean ingame[NET_MAXPLAYERS];
+} ticcmd_set_t;
+
+// Maximum time that we wait in TryRunTics() for netgame data to be
+// received before we bail out and render a frame anyway.
+// Vanilla Doom used 20 for this value, but we use a smaller value
+// instead for better responsiveness of the menu when we're stuck.
+#define MAX_NETGAME_STALL_TICS  5
+
+//
+// gametic is the tic about to (or currently being) run
+// maketic is the tic that hasn't had control made for it yet
+// recvtic is the latest tic received from the server.
+//
+// a gametic cannot be run until ticcmds are received for it
+// from all players.
+//
+
+static ticcmd_set_t ticdata[BACKUPTICS];
+
+// The index of the next tic to be made (with a call to BuildTiccmd).
+
+static int maketic;
+
+// The number of complete tics received from the server so far.
+
+static int recvtic;
+
+// The number of tics that have been run (using RunTic) so far.
+
+int gametic;
+
+// When set to true, a single tic is run each time TryRunTics() is called.
+// This is used for -timedemo mode.
+
+boolean singletics = false;
+
+// Index of the local player.
+
+static int localplayer;
+
+// Used for original sync code.
+
+static int      skiptics = 0;
+
+// Reduce the bandwidth needed by sampling game input less and transmitting
+// less.  If ticdup is 2, sample half normal, 3 = one third normal, etc.
+
+int		ticdup;
+
+// Amount to offset the timer for game sync.
+
+fixed_t         offsetms;
+
+// Use new client syncronisation code
+
+static boolean  new_sync = true;
+
+// Callback functions for loop code.
+
+static loop_interface_t *loop_interface = NULL;
+
+// Current players in the multiplayer game.
+// This is distinct from playeringame[] used by the game code, which may
+// modify playeringame[] when playing back multiplayer demos.
+
+static boolean local_playeringame[NET_MAXPLAYERS];
+
+// Requested player class "sent" to the server on connect.
+// If we are only doing a single player game then this needs to be remembered
+// and saved in the game settings.
+
+static int player_class;
+
+
+// 35 fps clock adjusted by offsetms milliseconds
+
+static int GetAdjustedTime(void)
+{
+    int time_ms;
+
+    time_ms = I_GetTimeMS();
+
+    if (new_sync)
+    {
+	// Use the adjustments from net_client.c only if we are
+	// using the new sync mode.
+
+        time_ms += (offsetms / FRACUNIT);
+    }
+
+    return (time_ms * TICRATE) / 1000;
+}
+
+static boolean BuildNewTic(void)
+{
+    int	gameticdiv;
+    ticcmd_t cmd;
+
+    gameticdiv = gametic/ticdup;
+
+    I_StartTic ();
+    loop_interface->ProcessEvents();
+
+    // Always run the menu
+
+    loop_interface->RunMenu();
+
+    if (drone)
+    {
+        // In drone mode, do not generate any ticcmds.
+
+        return false;
+    }
+
+    if (new_sync)
+    {
+       // If playing single player, do not allow tics to buffer
+       // up very far
+
+       if (!net_client_connected && maketic - gameticdiv > 2)
+           return false;
+
+       // Never go more than ~200ms ahead
+
+       if (maketic - gameticdiv > 8)
+           return false;
+    }
+    else
+    {
+       if (maketic - gameticdiv >= 5)
+           return false;
+    }
+
+    //printf ("mk:%i ",maketic);
+    memset(&cmd, 0, sizeof(ticcmd_t));
+    loop_interface->BuildTiccmd(&cmd, maketic);
+
+    if (net_client_connected)
+    {
+        NET_CL_SendTiccmd(&cmd, maketic);
+    }
+
+    ticdata[maketic % BACKUPTICS].cmds[localplayer] = cmd;
+    ticdata[maketic % BACKUPTICS].ingame[localplayer] = true;
+
+    ++maketic;
+
+    return true;
+}
+
+//
+// NetUpdate
+// Builds ticcmds for console player,
+// sends out a packet
+//
+int      lasttime;
+
+void NetUpdate (void)
+{
+    int nowtime;
+    int newtics;
+    int	i;
+
+    // If we are running with singletics (timing a demo), this
+    // is all done separately.
+
+    if (singletics)
+        return;
+
+    // Run network subsystems
+
+    NET_CL_Run();
+    NET_SV_Run();
+
+    // check time
+    nowtime = GetAdjustedTime() / ticdup;
+    newtics = nowtime - lasttime;
+
+    lasttime = nowtime;
+
+    if (skiptics <= newtics)
+    {
+        newtics -= skiptics;
+        skiptics = 0;
+    }
+    else
+    {
+        skiptics -= newtics;
+        newtics = 0;
+    }
+
+    // build new ticcmds for console player
+
+    for (i=0 ; i<newtics ; i++)
+    {
+        if (!BuildNewTic())
+        {
+            break;
+        }
+    }
+}
+
+static void D_Disconnected(void)
+{
+    // In drone mode, the game cannot continue once disconnected.
+
+    if (drone)
+    {
+        I_Error("Disconnected from server in drone mode.");
+    }
+
+    // disconnected from server
+
+    printf("Disconnected from server.\n");
+}
+
+//
+// Invoked by the network engine when a complete set of ticcmds is
+// available.
+//
+
+void D_ReceiveTic(ticcmd_t *ticcmds, boolean *players_mask)
+{
+    int i;
+
+    // Disconnected from server?
+
+    if (ticcmds == NULL && players_mask == NULL)
+    {
+        D_Disconnected();
+        return;
+    }
+
+    for (i = 0; i < NET_MAXPLAYERS; ++i)
+    {
+        if (!drone && i == localplayer)
+        {
+            // This is us.  Don't overwrite it.
+        }
+        else
+        {
+            ticdata[recvtic % BACKUPTICS].cmds[i] = ticcmds[i];
+            ticdata[recvtic % BACKUPTICS].ingame[i] = players_mask[i];
+        }
+    }
+
+    ++recvtic;
+}
+
+//
+// Start game loop
+//
+// Called after the screen is set but before the game starts running.
+//
+
+void D_StartGameLoop(void)
+{
+    lasttime = GetAdjustedTime() / ticdup;
+}
+
+//
+// Block until the game start message is received from the server.
+//
+
+static void BlockUntilStart(net_gamesettings_t *settings,
+                            netgame_startup_callback_t callback)
+{
+    while (!NET_CL_GetSettings(settings))
+    {
+        NET_CL_Run();
+        NET_SV_Run();
+
+        if (!net_client_connected)
+        {
+            I_Error("Lost connection to server");
+        }
+
+        if (callback != NULL && !callback(net_client_wait_data.ready_players,
+                                          net_client_wait_data.num_players))
+        {
+            I_Error("Netgame startup aborted.");
+        }
+
+        I_Sleep(100);
+    }
+}
+
+void D_StartNetGame(net_gamesettings_t *settings,
+                    netgame_startup_callback_t callback)
+{
+    int i;
+
+    offsetms = 0;
+    recvtic = 0;
+
+    settings->consoleplayer = 0;
+    settings->num_players = 1;
+    settings->player_classes[0] = player_class;
+
+    //!
+    // @category net
+    //
+    // Use original network client sync code rather than the improved
+    // sync code.
+    //
+    settings->new_sync = !M_ParmExists("-oldsync");
+
+    //!
+    // @category net
+    // @arg <n>
+    //
+    // Send n extra tics in every packet as insurance against dropped
+    // packets.
+    //
+
+    i = M_CheckParmWithArgs("-extratics", 1);
+
+    if (i > 0)
+        settings->extratics = atoi(myargv[i+1]);
+    else
+        settings->extratics = 1;
+
+    //!
+    // @category net
+    // @arg <n>
+    //
+    // Reduce the resolution of the game by a factor of n, reducing
+    // the amount of network bandwidth needed.
+    //
+
+    i = M_CheckParmWithArgs("-dup", 1);
+
+    if (i > 0)
+        settings->ticdup = atoi(myargv[i+1]);
+    else
+        settings->ticdup = 1;
+
+    if (net_client_connected)
+    {
+        // Send our game settings and block until game start is received
+        // from the server.
+
+        NET_CL_StartGame(settings);
+        BlockUntilStart(settings, callback);
+
+        // Read the game settings that were received.
+
+        NET_CL_GetSettings(settings);
+    }
+
+    if (drone)
+    {
+        settings->consoleplayer = 0;
+    }
+
+    // Set the local player and playeringame[] values.
+
+    localplayer = settings->consoleplayer;
+
+    for (i = 0; i < NET_MAXPLAYERS; ++i)
+    {
+        local_playeringame[i] = i < settings->num_players;
+    }
+
+    // Copy settings to global variables.
+
+    ticdup = settings->ticdup;
+    new_sync = settings->new_sync;
+
+    if (ticdup < 1)
+    {
+        I_Error("D_StartNetGame: invalid ticdup value (%d)", ticdup);
+    }
+
+    // TODO: Message disabled until we fix new_sync.
+    //if (!new_sync)
+    //{
+    //    printf("Syncing netgames like Vanilla Doom.\n");
+    //}
+}
+
+boolean D_InitNetGame(net_connect_data_t *connect_data)
+{
+    boolean result = false;
+    net_addr_t *addr = NULL;
+    int i;
+
+    // Call D_QuitNetGame on exit:
+
+    I_AtExit(D_QuitNetGame, true);
+
+    player_class = connect_data->player_class;
+
+    //!
+    // @category net
+    //
+    // Start a multiplayer server, listening for connections.
+    //
+
+    if (M_CheckParm("-server") > 0
+     || M_CheckParm("-privateserver") > 0)
+    {
+        NET_SV_Init();
+        NET_SV_AddModule(&net_loop_server_module);
+        NET_SV_AddModule(&net_sdl_module);
+        NET_SV_RegisterWithMaster();
+
+        net_loop_client_module.InitClient();
+        addr = net_loop_client_module.ResolveAddress(NULL);
+        NET_ReferenceAddress(addr);
+    }
+    else
+    {
+        //!
+        // @category net
+        //
+        // Automatically search the local LAN for a multiplayer
+        // server and join it.
+        //
+
+        i = M_CheckParm("-autojoin");
+
+        if (i > 0)
+        {
+            addr = NET_FindLANServer();
+
+            if (addr == NULL)
+            {
+                I_Error("No server found on local LAN");
+            }
+        }
+
+        //!
+        // @arg <address>
+        // @category net
+        //
+        // Connect to a multiplayer server running on the given
+        // address.
+        //
+
+        i = M_CheckParmWithArgs("-connect", 1);
+
+        if (i > 0)
+        {
+            net_sdl_module.InitClient();
+            addr = net_sdl_module.ResolveAddress(myargv[i+1]);
+            NET_ReferenceAddress(addr);
+
+            if (addr == NULL)
+            {
+                I_Error("Unable to resolve '%s'\n", myargv[i+1]);
+            }
+        }
+    }
+
+    if (addr != NULL)
+    {
+        if (M_CheckParm("-drone") > 0)
+        {
+            connect_data->drone = true;
+        }
+
+        if (!NET_CL_Connect(addr, connect_data))
+        {
+            I_Error("D_InitNetGame: Failed to connect to %s:\n%s\n",
+                    NET_AddrToString(addr), net_client_reject_reason);
+        }
+
+        printf("D_InitNetGame: Connected to %s\n", NET_AddrToString(addr));
+        NET_ReleaseAddress(addr);
+
+        // Wait for launch message received from server.
+
+        NET_WaitForLaunch();
+
+        result = true;
+    }
+
+    return result;
+}
+
+
+//
+// D_QuitNetGame
+// Called before quitting to leave a net game
+// without hanging the other players
+//
+void D_QuitNetGame (void)
+{
+    NET_SV_Shutdown();
+    NET_CL_Disconnect();
+}
+
+static int GetLowTic(void)
+{
+    int lowtic;
+
+    lowtic = maketic;
+
+    if (net_client_connected)
+    {
+        if (drone || recvtic < lowtic)
+        {
+            lowtic = recvtic;
+        }
+    }
+
+    return lowtic;
+}
+
+static int frameon;
+static int frameskip[4];
+static int oldnettics;
+
+static void OldNetSync(void)
+{
+    unsigned int i;
+    int keyplayer = -1;
+
+    frameon++;
+
+    // ideally maketic should be 1 - 3 tics above lowtic
+    // if we are consistantly slower, speed up time
+
+    for (i=0 ; i<NET_MAXPLAYERS ; i++)
+    {
+        if (local_playeringame[i])
+        {
+            keyplayer = i;
+            break;
+        }
+    }
+
+    if (keyplayer < 0)
+    {
+        // If there are no players, we can never advance anyway
+
+        return;
+    }
+
+    if (localplayer == keyplayer)
+    {
+        // the key player does not adapt
+    }
+    else
+    {
+        if (maketic <= recvtic)
+        {
+            lasttime--;
+            // printf ("-");
+        }
+
+        frameskip[frameon & 3] = oldnettics > recvtic;
+        oldnettics = maketic;
+
+        if (frameskip[0] && frameskip[1] && frameskip[2] && frameskip[3])
+        {
+            skiptics = 1;
+            // printf ("+");
+        }
+    }
+}
+
+// Returns true if there are players in the game:
+
+static boolean PlayersInGame(void)
+{
+    boolean result = false;
+    unsigned int i;
+
+    // If we are connected to a server, check if there are any players
+    // in the game.
+
+    if (net_client_connected)
+    {
+        for (i = 0; i < NET_MAXPLAYERS; ++i)
+        {
+            result = result || local_playeringame[i];
+        }
+    }
+
+    // Whether single or multi-player, unless we are running as a drone,
+    // we are in the game.
+
+    if (!drone)
+    {
+        result = true;
+    }
+
+    return result;
+}
+
+// When using ticdup, certain values must be cleared out when running
+// the duplicate ticcmds.
+
+static void TicdupSquash(ticcmd_set_t *set)
+{
+    ticcmd_t *cmd;
+    unsigned int i;
+
+    for (i = 0; i < NET_MAXPLAYERS ; ++i)
+    {
+        cmd = &set->cmds[i];
+        cmd->chatchar = 0;
+        if (cmd->buttons & BT_SPECIAL)
+            cmd->buttons = 0;
+    }
+}
+
+// When running in single player mode, clear all the ingame[] array
+// except the local player.
+
+static void SinglePlayerClear(ticcmd_set_t *set)
+{
+    unsigned int i;
+
+    for (i = 0; i < NET_MAXPLAYERS; ++i)
+    {
+        if (i != localplayer)
+        {
+            set->ingame[i] = false;
+        }
+    }
+}
+
+//
+// TryRunTics
+//
+
+void TryRunTics (void)
+{
+    int	i;
+    int	lowtic;
+    int	entertic;
+    static int oldentertics;
+    int realtics;
+    int	availabletics;
+    int	counts;
+
+    // get real tics
+    entertic = I_GetTime() / ticdup;
+    realtics = entertic - oldentertics;
+    oldentertics = entertic;
+
+    // in singletics mode, run a single tic every time this function
+    // is called.
+
+    if (singletics)
+    {
+        BuildNewTic();
+    }
+    else
+    {
+        NetUpdate ();
+    }
+
+    lowtic = GetLowTic();
+
+    availabletics = lowtic - gametic/ticdup;
+
+    // decide how many tics to run
+
+    if (new_sync)
+    {
+	counts = availabletics;
+    }
+    else
+    {
+        // decide how many tics to run
+        if (realtics < availabletics-1)
+            counts = realtics+1;
+        else if (realtics < availabletics)
+            counts = realtics;
+        else
+            counts = availabletics;
+
+        if (counts < 1)
+            counts = 1;
+
+        if (net_client_connected)
+        {
+            OldNetSync();
+        }
+    }
+
+    if (counts < 1)
+	counts = 1;
+
+    // wait for new tics if needed
+    while (!PlayersInGame() || lowtic < gametic/ticdup + counts)
+    {
+	NetUpdate ();
+
+        lowtic = GetLowTic();
+
+	if (lowtic < gametic/ticdup)
+	    I_Error ("TryRunTics: lowtic < gametic");
+
+        // Still no tics to run? Sleep until some are available.
+        if (lowtic < gametic/ticdup + counts)
+        {
+            // If we're in a netgame, we might spin forever waiting for
+            // new network data to be received. So don't stay in here
+            // forever - give the menu a chance to work.
+            if (I_GetTime() / ticdup - entertic >= MAX_NETGAME_STALL_TICS)
+            {
+                return;
+            }
+
+            I_Sleep(1);
+        }
+    }
+
+    // run the count * ticdup dics
+    while (counts--)
+    {
+        ticcmd_set_t *set;
+
+        if (!PlayersInGame())
+        {
+            return;
+        }
+
+        set = &ticdata[(gametic / ticdup) % BACKUPTICS];
+
+        if (!net_client_connected)
+        {
+            SinglePlayerClear(set);
+        }
+
+	for (i=0 ; i<ticdup ; i++)
+	{
+            if (gametic/ticdup > lowtic)
+                I_Error ("gametic>lowtic");
+
+            memcpy(local_playeringame, set->ingame, sizeof(local_playeringame));
+
+            loop_interface->RunTic(set->cmds, set->ingame);
+	    gametic++;
+
+	    // modify command for duplicated tics
+
+            TicdupSquash(set);
+	}
+
+	NetUpdate ();	// check for new console commands
+    }
+}
+
+void D_RegisterLoopCallbacks(loop_interface_t *i)
+{
+    loop_interface = i;
+}
+
+// TODO: Move nonvanilla demo functions into a dedicated file.
+#include "m_misc.h"
+#include "w_wad.h"
+
+static boolean StrictDemos(void)
+{
+    //!
+    // @category demo
+    //
+    // When recording or playing back demos, disable any extensions
+    // of the vanilla demo format - record demos as vanilla would do,
+    // and play back demos as vanilla would do.
+    //
+    return M_ParmExists("-strictdemos");
+}
+
+// If the provided conditional value is true, we're trying to record
+// a demo file that will include a non-vanilla extension. The function
+// will return true if the conditional is true and it's allowed to use
+// this extension (no extensions are allowed if -strictdemos is given
+// on the command line). A warning is shown on the console using the
+// provided string describing the non-vanilla expansion.
+boolean D_NonVanillaRecord(boolean conditional, const char *feature)
+{
+    if (!conditional || StrictDemos())
+    {
+        return false;
+    }
+
+    printf("Warning: Recording a demo file with a non-vanilla extension "
+           "(%s). Use -strictdemos to disable this extension.\n",
+           feature);
+
+    return true;
+}
+
+// Returns true if the given lump number corresponds to data from a .lmp
+// file, as opposed to a WAD.
+static boolean IsDemoFile(int lumpnum)
+{
+    char *lower;
+    boolean result;
+
+    lower = M_StringDuplicate(lumpinfo[lumpnum]->wad_file->path);
+    M_ForceLowercase(lower);
+    result = M_StringEndsWith(lower, ".lmp");
+    free(lower);
+
+    return result;
+}
+
+// If the provided conditional value is true, we're trying to play back
+// a demo that includes a non-vanilla extension. We return true if the
+// conditional is true and it's allowed to use this extension, checking
+// that:
+//  - The -strictdemos command line argument is not provided.
+//  - The given lumpnum identifying the demo to play back identifies a
+//    demo that comes from a .lmp file, not a .wad file.
+//  - Before proceeding, a warning is shown to the user on the console.
+boolean D_NonVanillaPlayback(boolean conditional, int lumpnum,
+                             const char *feature)
+{
+    if (!conditional || StrictDemos())
+    {
+        return false;
+    }
+
+    if (!IsDemoFile(lumpnum))
+    {
+        printf("Warning: WAD contains demo with a non-vanilla extension "
+               "(%s)\n", feature);
+        return false;
+    }
+
+    printf("Warning: Playing back a demo file with a non-vanilla extension "
+           "(%s). Use -strictdemos to disable this extension.\n",
+           feature);
+
+    return true;
+}
+
diff --git a/games/NXDoom/src/d_loop.h b/games/NXDoom/src/d_loop.h
new file mode 100644
index 000000000..c154be3a6
--- /dev/null
+++ b/games/NXDoom/src/d_loop.h
@@ -0,0 +1,96 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Main loop stuff.
+//
+
+#ifndef __D_LOOP__
+#define __D_LOOP__
+
+#include "net_defs.h"
+#include "m_fixed.h"
+
+
+// Callback function invoked while waiting for the netgame to start.
+// The callback is invoked when new players are ready. The callback
+// should return true, or return false to abort startup.
+
+typedef boolean (*netgame_startup_callback_t)(int ready_players,
+                                              int num_players);
+
+typedef struct
+{
+    // Read events from the event queue, and process them.
+
+    void (*ProcessEvents)();
+
+    // Given the current input state, fill in the fields of the specified
+    // ticcmd_t structure with data for a new tic.
+
+    void (*BuildTiccmd)(ticcmd_t *cmd, int maketic);
+
+    // Advance the game forward one tic, using the specified player input.
+
+    void (*RunTic)(ticcmd_t *cmds, boolean *ingame);
+
+    // Run the menu (runs independently of the game).
+
+    void (*RunMenu)();
+} loop_interface_t;
+
+// Register callback functions for the main loop code to use.
+void D_RegisterLoopCallbacks(loop_interface_t *i);
+
+// Create any new ticcmds and broadcast to other players.
+void NetUpdate (void);
+
+// Broadcasts special packets to other players
+//  to notify of game exit
+void D_QuitNetGame (void);
+
+//? how many ticks to run?
+void TryRunTics (void);
+
+// Called at start of game loop to initialize timers
+void D_StartGameLoop(void);
+
+// Initialize networking code and connect to server.
+
+boolean D_InitNetGame(net_connect_data_t *connect_data);
+
+// Start game with specified settings. The structure will be updated
+// with the actual settings for the game.
+
+void D_StartNetGame(net_gamesettings_t *settings,
+                    netgame_startup_callback_t callback);
+
+extern boolean singletics;
+extern int gametic, ticdup;
+
+// Check if it is permitted to record a demo with a non-vanilla feature.
+boolean D_NonVanillaRecord(boolean conditional, const char *feature);
+
+// Check if it is permitted to play back a demo with a non-vanilla feature.
+boolean D_NonVanillaPlayback(boolean conditional, int lumpnum,
+                             const char *feature);
+
+void D_ReceiveTic(ticcmd_t *ticcmds, boolean *playeringame);
+
+
+extern fixed_t offsetms;
+
+
+#endif
+
diff --git a/games/NXDoom/src/d_mode.c b/games/NXDoom/src/d_mode.c
new file mode 100644
index 000000000..95f6bb182
--- /dev/null
+++ b/games/NXDoom/src/d_mode.c
@@ -0,0 +1,233 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:
+//   Functions and definitions relating to the game type and operational
+//   mode.
+//
+
+#include "doomtype.h"
+#include "d_mode.h"
+
+// Valid game mode/mission combinations, with the number of
+// episodes/maps for each.
+
+static struct
+{
+    GameMission_t mission;
+    GameMode_t mode;
+    int episode;
+    int map;
+} valid_modes[] = {
+    { pack_chex, retail,     1, 5 },
+    { doom,      shareware,  1, 9 },
+    { doom,      registered, 3, 9 },
+    { doom,      retail,     4, 9 },
+    { doom2,     commercial, 1, 32 },
+    { pack_tnt,  commercial, 1, 32 },
+    { pack_plut, commercial, 1, 32 },
+    { pack_hacx, commercial, 1, 32 },
+    { heretic,   shareware,  1, 9 },
+    { heretic,   registered, 3, 9 },
+    { heretic,   retail,     5, 9 },
+    { hexen,     commercial, 1, 60 },
+    { strife,    commercial, 1, 34 },
+};
+
+// Check that a gamemode+gamemission received over the network is valid.
+
+boolean D_ValidGameMode(GameMission_t mission, GameMode_t mode)
+{
+    int i;
+
+    for (i=0; i<arrlen(valid_modes); ++i)
+    {
+        if (valid_modes[i].mode == mode && valid_modes[i].mission == mission)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+boolean D_ValidEpisodeMap(GameMission_t mission, GameMode_t mode,
+                          int episode, int map)
+{
+    int i;
+
+    // Hacks for Heretic secret episodes
+
+    if (mission == heretic)
+    {
+        if (mode == retail && episode == 6)
+        {
+            return map >= 1 && map <= 3;
+        }
+        else if (mode == registered && episode == 4)
+        {
+            return map == 1;
+        }
+    }
+
+    // Find the table entry for this mission/mode combination.
+
+    for (i=0; i<arrlen(valid_modes); ++i) 
+    {
+        if (mission == valid_modes[i].mission
+         && mode == valid_modes[i].mode)
+        {
+            return episode >= 1 && episode <= valid_modes[i].episode
+                && map >= 1 && map <= valid_modes[i].map;
+        }
+    }
+
+    // Unknown mode/mission combination
+
+    return false;
+}
+
+// Get the number of valid episodes for the specified mission/mode.
+
+int D_GetNumEpisodes(GameMission_t mission, GameMode_t mode)
+{
+    int episode;
+
+    episode = 1;
+
+    while (D_ValidEpisodeMap(mission, mode, episode, 1))
+    {
+        ++episode;
+    }
+
+    return episode - 1;
+}
+
+// Table of valid versions
+
+static struct {
+    GameMission_t mission;
+    GameVersion_t version;
+} valid_versions[] = {
+    { doom,     exe_doom_1_2 },
+    { doom,     exe_doom_1_5 },
+    { doom,     exe_doom_1_666 },
+    { doom,     exe_doom_1_7 },
+    { doom,     exe_doom_1_8 },
+    { doom,     exe_doom_1_9 },
+    { doom,     exe_hacx },
+    { doom,     exe_ultimate },
+    { doom,     exe_final },
+    { doom,     exe_final2 },
+    { doom,     exe_chex },
+    { heretic,  exe_heretic_1_3 },
+    { hexen,    exe_hexen_1_1 },
+    { hexen,    exe_hexen_1_1r2 },
+    { strife,   exe_strife_1_2 },
+    { strife,   exe_strife_1_31 },
+};
+
+boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version)
+{
+    int i;
+
+    // All Doom variants can use the Doom versions.
+
+    if (mission == doom2 || mission == pack_plut || mission == pack_tnt
+     || mission == pack_hacx || mission == pack_chex)
+    {
+        mission = doom;
+    }
+
+    for (i=0; i<arrlen(valid_versions); ++i) 
+    {
+        if (valid_versions[i].mission == mission 
+         && valid_versions[i].version == version)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Does this mission type use ExMy form, rather than MAPxy form?
+
+boolean D_IsEpisodeMap(GameMission_t mission)
+{
+    switch (mission)
+    {
+        case doom:
+        case heretic:
+        case pack_chex:
+            return true;
+
+        case none:
+        case hexen:
+        case doom2:
+        case pack_hacx:
+        case pack_tnt:
+        case pack_plut:
+        case strife:
+        default:
+            return false;
+    }
+}
+
+const char *D_GameMissionString(GameMission_t mission)
+{
+    switch (mission)
+    {
+        case none:
+        default:
+            return "none";
+        case doom:
+            return "doom";
+        case doom2:
+            return "doom2";
+        case pack_tnt:
+            return "tnt";
+        case pack_plut:
+            return "plutonia";
+        case pack_hacx:
+            return "hacx";
+        case pack_chex:
+            return "chex";
+        case heretic:
+            return "heretic";
+        case hexen:
+            return "hexen";
+        case strife:
+            return "strife";
+    }
+}
+
+const char *D_GameModeString(GameMode_t mode)
+{
+    switch (mode)
+    {
+        case shareware:
+            return "shareware";
+        case registered:
+            return "registered";
+        case commercial:
+            return "commercial";
+        case retail:
+            return "retail";
+        case indetermined:
+        default:
+            return "unknown";
+    }
+}
+
diff --git a/games/NXDoom/src/d_mode.h b/games/NXDoom/src/d_mode.h
new file mode 100644
index 000000000..138d58835
--- /dev/null
+++ b/games/NXDoom/src/d_mode.h
@@ -0,0 +1,112 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Functions and definitions relating to the game type and operational
+//   mode.
+//
+
+#ifndef __D_MODE__
+#define __D_MODE__
+
+#include "doomtype.h"
+
+// The "mission" controls what game we are playing.
+
+typedef enum
+{
+    doom,            // Doom 1
+    doom2,           // Doom 2
+    pack_tnt,        // Final Doom: TNT: Evilution
+    pack_plut,       // Final Doom: The Plutonia Experiment
+    pack_chex,       // Chex Quest (modded doom)
+    pack_hacx,       // Hacx (modded doom2)
+    heretic,         // Heretic
+    hexen,           // Hexen
+    strife,          // Strife
+    doom2f,          // Doom 2: L'Enfer sur Terre
+
+    none
+} GameMission_t;
+
+// The "mode" allows more accurate specification of the game mode we are
+// in: eg. shareware vs. registered.  So doom1.wad and doom.wad are the
+// same mission, but a different mode.
+
+typedef enum
+{
+    shareware,       // Doom/Heretic shareware
+    registered,      // Doom/Heretic registered
+    commercial,      // Doom II/Hexen
+    retail,          // Ultimate Doom
+    indetermined     // Unknown.
+} GameMode_t;
+
+// What version are we emulating?
+
+typedef enum
+{
+    exe_doom_1_2,    // Doom 1.2: shareware and registered
+    exe_doom_1_5,    // Doom 1.5: "
+    exe_doom_1_666,  // Doom 1.666: for shareware, registered and commercial
+    exe_doom_1_7,    // Doom 1.7/1.7a: "
+    exe_doom_1_8,    // Doom 1.8: "
+    exe_doom_1_9,    // Doom 1.9: "
+    exe_hacx,        // Hacx
+    exe_ultimate,    // Ultimate Doom (retail)
+    exe_final,       // Final Doom
+    exe_final2,      // Final Doom (alternate exe)
+    exe_chex,        // Chex Quest executable (based on Final Doom)
+
+    exe_heretic_1_3, // Heretic 1.3
+
+    exe_hexen_1_1,   // Hexen 1.1
+    exe_hexen_1_1r2, // Hexen 1.1 (alternate exe)
+    exe_strife_1_2,  // Strife v1.2
+    exe_strife_1_31  // Strife v1.31
+} GameVersion_t;
+
+// What IWAD variant are we using?
+
+typedef enum
+{
+    vanilla,    // Vanilla Doom
+    freedoom,   // FreeDoom: Phase 1 + 2
+    freedm,     // FreeDM
+    bfgedition, // Doom Classic (Doom 3: BFG Edition)
+} GameVariant_t;
+
+// Skill level.
+
+typedef enum
+{
+    sk_noitems = -1,        // the "-skill 0" hack
+    sk_baby = 0,
+    sk_easy,
+    sk_medium,
+    sk_hard,
+    sk_nightmare
+} skill_t;
+
+boolean D_ValidGameMode(GameMission_t mission, GameMode_t mode);
+boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version);
+boolean D_ValidEpisodeMap(GameMission_t mission, GameMode_t mode,
+                          int episode, int map);
+int D_GetNumEpisodes(GameMission_t mission, GameMode_t mode);
+boolean D_IsEpisodeMap(GameMission_t mission);
+const char *D_GameMissionString(GameMission_t mission);
+const char *D_GameModeString(GameMode_t mode);
+
+#endif /* #ifndef __D_MODE__ */
+
diff --git a/games/NXDoom/src/d_ticcmd.h b/games/NXDoom/src/d_ticcmd.h
new file mode 100644
index 000000000..daf0da318
--- /dev/null
+++ b/games/NXDoom/src/d_ticcmd.h
@@ -0,0 +1,56 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __D_TICCMD__
+#define __D_TICCMD__
+
+#include "doomtype.h"
+
+
+// The data sampled per tick (single player)
+// and transmitted to other peers (multiplayer).
+// Mainly movements/button commands per game tick,
+// plus a checksum for internal state consistency.
+
+typedef struct
+{
+    signed char	forwardmove;	// *2048 for move
+    signed char	sidemove;	// *2048 for move
+    short angleturn;            // <<16 for angle delta
+    byte chatchar;
+    byte buttons;
+    // villsa [STRIFE] according to the asm,
+    // consistancy is a short, not a byte
+    byte consistancy;           // checks for net game
+
+    // villsa - Strife specific:
+
+    byte buttons2;
+    int inventory;
+   
+    // Heretic/Hexen specific:
+
+    byte lookfly;               // look/fly up/down/centering
+    byte arti;                  // artitype_t to use
+} ticcmd_t;
+
+
+
+#endif
diff --git a/games/NXDoom/src/deh_defs.h b/games/NXDoom/src/deh_defs.h
new file mode 100644
index 000000000..58b61e7cc
--- /dev/null
+++ b/games/NXDoom/src/deh_defs.h
@@ -0,0 +1,85 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Definitions for use in the dehacked code
+//
+
+#ifndef DEH_DEFS_H
+#define DEH_DEFS_H
+
+#include "sha1.h"
+
+typedef struct deh_context_s deh_context_t;
+typedef struct deh_section_s deh_section_t;
+typedef void (*deh_section_init_t)(void);
+typedef void *(*deh_section_start_t)(deh_context_t *context, char *line);
+typedef void (*deh_section_end_t)(deh_context_t *context, void *tag);
+typedef void (*deh_line_parser_t)(deh_context_t *context, char *line, void *tag);
+typedef void (*deh_sha1_hash_t)(sha1_context_t *context);
+
+struct deh_section_s
+{
+    const char *name;
+
+    // Called on startup to initialize code
+
+    deh_section_init_t init;
+    
+    // This is called when a new section is started.  The pointer
+    // returned is used as a tag for the following calls.
+
+    deh_section_start_t start;
+
+    // This is called for each line in the section
+
+    deh_line_parser_t line_parser;
+
+    // This is called at the end of the section for any cleanup
+
+    deh_section_end_t end;
+
+    // Called when generating an SHA1 sum of the dehacked state
+
+    deh_sha1_hash_t sha1_hash;
+};
+
+
+extern deh_section_t *deh_section_types[];
+extern const char *deh_signatures[];
+
+// deh_ammo.c:
+extern deh_section_t deh_section_ammo;
+// deh_cheat.c:
+extern deh_section_t deh_section_cheat;
+// deh_frame.c:
+extern deh_section_t deh_section_frame;
+// deh_misc.c:
+extern deh_section_t deh_section_misc;
+// deh_ptr.c:
+extern deh_section_t deh_section_pointer;
+// deh_sound.c
+extern deh_section_t deh_section_sound;
+// deh_text.c:
+extern deh_section_t deh_section_text;
+// deh_thing.c:
+extern deh_section_t deh_section_thing;
+// deh_weapon.c:
+extern deh_section_t deh_section_weapon;
+// deh_bexstr.c:
+extern deh_section_t deh_section_bexstr;
+
+
+#endif /* #ifndef DEH_DEFS_H */
+
+
diff --git a/games/NXDoom/src/deh_io.c b/games/NXDoom/src/deh_io.c
new file mode 100644
index 000000000..b276a28c4
--- /dev/null
+++ b/games/NXDoom/src/deh_io.c
@@ -0,0 +1,357 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dehacked I/O code (does all reads from dehacked files)
+//
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "m_misc.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+
+typedef enum
+{
+    DEH_INPUT_FILE,
+    DEH_INPUT_LUMP
+} deh_input_type_t;
+
+struct deh_context_s
+{
+    deh_input_type_t type;
+    char *filename;
+
+    // If the input comes from a memory buffer, pointer to the memory
+    // buffer.
+    unsigned char *input_buffer;
+    size_t input_buffer_len;
+    unsigned int input_buffer_pos;
+    int lumpnum;
+
+    // If the input comes from a file, the file stream for reading
+    // data.
+    FILE *stream;
+
+    // Current line number that we have reached:
+    int linenum;
+
+    // Used by DEH_ReadLine:
+    boolean last_was_newline;
+    char *readbuffer;
+    int readbuffer_size;
+
+    // Error handling.
+    boolean had_error;
+};
+
+static deh_context_t *DEH_NewContext(void)
+{
+    deh_context_t *context;
+
+    context = Z_Malloc(sizeof(*context), PU_STATIC, NULL);
+
+    // Initial read buffer size of 128 bytes
+
+    context->readbuffer_size = 128;
+    context->readbuffer = Z_Malloc(context->readbuffer_size, PU_STATIC, NULL);
+    context->linenum = 0;
+    context->last_was_newline = true;
+
+    context->had_error = false;
+
+    return context;
+}
+
+// Open a dehacked file for reading
+// Returns NULL if open failed
+
+deh_context_t *DEH_OpenFile(const char *filename)
+{
+    FILE *fstream;
+    deh_context_t *context;
+
+    fstream = M_fopen(filename, "r");
+
+    if (fstream == NULL)
+        return NULL;
+
+    context = DEH_NewContext();
+
+    context->type = DEH_INPUT_FILE;
+    context->stream = fstream;
+    context->filename = M_StringDuplicate(filename);
+
+    return context;
+}
+
+// Open a WAD lump for reading.
+
+deh_context_t *DEH_OpenLump(int lumpnum)
+{
+    deh_context_t *context;
+    void *lump;
+
+    lump = W_CacheLumpNum(lumpnum, PU_STATIC);
+
+    context = DEH_NewContext();
+
+    context->type = DEH_INPUT_LUMP;
+    context->lumpnum = lumpnum;
+    context->input_buffer = lump;
+    context->input_buffer_len = W_LumpLength(lumpnum);
+    context->input_buffer_pos = 0;
+
+    context->filename = malloc(9);
+    M_StringCopy(context->filename, lumpinfo[lumpnum]->name, 9);
+
+    return context;
+}
+
+// Close dehacked file
+
+void DEH_CloseFile(deh_context_t *context)
+{
+    if (context->type == DEH_INPUT_FILE)
+    {
+        fclose(context->stream);
+    }
+    else if (context->type == DEH_INPUT_LUMP)
+    {
+        W_ReleaseLumpNum(context->lumpnum);
+    }
+
+    free(context->filename);
+    Z_Free(context->readbuffer);
+    Z_Free(context);
+}
+
+int DEH_GetCharFile(deh_context_t *context)
+{
+    if (feof(context->stream))
+    {
+        // end of file
+
+        return -1;
+    }
+
+    return fgetc(context->stream);
+}
+
+int DEH_GetCharLump(deh_context_t *context)
+{
+    int result;
+
+    if (context->input_buffer_pos >= context->input_buffer_len)
+    {
+        return -1;
+    }
+
+    result = context->input_buffer[context->input_buffer_pos];
+    ++context->input_buffer_pos;
+
+    return result;
+}
+
+// Reads a single character from a dehacked file
+
+int DEH_GetChar(deh_context_t *context)
+{
+    int result = 0;
+    boolean last_was_cr = false;
+
+    // Track the current line number
+
+    if (context->last_was_newline)
+    {
+        ++context->linenum;
+    }
+
+    // Read characters, converting CRLF to LF
+
+    do
+    {
+        switch (context->type)
+        {
+            case DEH_INPUT_FILE:
+                result = DEH_GetCharFile(context);
+                break;
+
+            case DEH_INPUT_LUMP:
+                result = DEH_GetCharLump(context);
+                break;
+        }
+
+        // Handle \r characters not paired with \n
+        if (last_was_cr && result != '\n')
+        {
+            switch (context->type)
+            {
+                case DEH_INPUT_FILE:
+                    ungetc(result, context->stream);
+                    break;
+
+                case DEH_INPUT_LUMP:
+                    --context->input_buffer_pos;
+                    break;
+            }
+
+            return '\r';
+        }
+
+        last_was_cr = result == '\r';
+
+    } while (last_was_cr);
+
+    context->last_was_newline = result == '\n';
+
+    return result;
+}
+
+// Increase the read buffer size
+
+static void IncreaseReadBuffer(deh_context_t *context)
+{
+    char *newbuffer;
+    int newbuffer_size;
+
+    newbuffer_size = context->readbuffer_size * 2;
+    newbuffer = Z_Malloc(newbuffer_size, PU_STATIC, NULL);
+
+    memcpy(newbuffer, context->readbuffer, context->readbuffer_size);
+
+    Z_Free(context->readbuffer);
+
+    context->readbuffer = newbuffer;
+    context->readbuffer_size = newbuffer_size;
+}
+
+// Read a whole line
+
+char *DEH_ReadLine(deh_context_t *context, boolean extended)
+{
+    int c;
+    int pos;
+    boolean escaped = false;
+
+    for (pos = 0;;)
+    {
+        c = DEH_GetChar(context);
+
+        if (c < 0 && pos == 0)
+        {
+            // end of file
+
+            return NULL;
+        }
+
+        // cope with lines of any length: increase the buffer size
+
+        if (pos >= context->readbuffer_size)
+        {
+            IncreaseReadBuffer(context);
+        }
+
+        // extended string support
+        if (extended && c == '\\')
+        {
+            c = DEH_GetChar(context);
+
+            // "\n" in the middle of a string indicates an internal linefeed
+            if (c == 'n')
+            {
+                context->readbuffer[pos] = '\n';
+                ++pos;
+                continue;
+            }
+
+            // values to be assigned may be split onto multiple lines by ending
+            // each line that is to be continued with a backslash
+            if (c == '\n')
+            {
+                escaped = true;
+                continue;
+            }
+        }
+
+        // blanks before the backslash are included in the string
+        // but indentation after the linefeed is not
+        if (escaped && c >= 0 && isspace(c) && c != '\n')
+        {
+            continue;
+        }
+        else
+        {
+            escaped = false;
+        }
+
+        if (c == '\n' || c < 0)
+        {
+            // end of line: a full line has been read
+
+            context->readbuffer[pos] = '\0';
+            break;
+        }
+        else if (c != '\0')
+        {
+            // normal character; don't allow NUL characters to be
+            // added.
+
+            context->readbuffer[pos] = (char) c;
+            ++pos;
+        }
+    }
+    
+    return context->readbuffer;
+}
+
+void DEH_Warning(deh_context_t *context, const char *msg, ...)
+{
+    va_list args;
+
+    va_start(args, msg);
+
+    fprintf(stderr, "%s:%i: warning: ", context->filename, context->linenum);
+    vfprintf(stderr, msg, args);
+    fprintf(stderr, "\n");
+
+    va_end(args);
+}
+
+void DEH_Error(deh_context_t *context, const char *msg, ...)
+{
+    va_list args;
+
+    va_start(args, msg);
+
+    fprintf(stderr, "%s:%i: ", context->filename, context->linenum);
+    vfprintf(stderr, msg, args);
+    fprintf(stderr, "\n");
+
+    va_end(args);
+
+    context->had_error = true;
+}
+
+boolean DEH_HadError(deh_context_t *context)
+{
+    return context->had_error;
+}
+
diff --git a/games/NXDoom/src/deh_io.h b/games/NXDoom/src/deh_io.h
new file mode 100644
index 000000000..de6720e61
--- /dev/null
+++ b/games/NXDoom/src/deh_io.h
@@ -0,0 +1,33 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dehacked I/O code (does all reads from dehacked files)
+//
+
+#ifndef DEH_IO_H
+#define DEH_IO_H
+
+#include "deh_defs.h"
+
+deh_context_t *DEH_OpenFile(const char *filename);
+deh_context_t *DEH_OpenLump(int lumpnum);
+void DEH_CloseFile(deh_context_t *context);
+int DEH_GetChar(deh_context_t *context);
+char *DEH_ReadLine(deh_context_t *context, boolean extended);
+void DEH_Error(deh_context_t *context, const char *msg, ...) PRINTF_ATTR(2, 3);
+void DEH_Warning(deh_context_t *context, const char *msg, ...) PRINTF_ATTR(2, 3);
+boolean DEH_HadError(deh_context_t *context);
+
+#endif /* #ifndef DEH_IO_H */
+
diff --git a/games/NXDoom/src/deh_main.c b/games/NXDoom/src/deh_main.c
new file mode 100644
index 000000000..3ef8a25c3
--- /dev/null
+++ b/games/NXDoom/src/deh_main.c
@@ -0,0 +1,519 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Main dehacked code
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "doomtype.h"
+#include "i_glob.h"
+#include "i_system.h"
+#include "d_iwad.h"
+#include "m_argv.h"
+#include "w_wad.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+
+
+static boolean deh_initialized = false;
+
+// If true, we can parse [STRINGS] sections in BEX format.
+
+boolean deh_allow_extended_strings = false;
+
+// If true, we can do long string replacements.
+
+boolean deh_allow_long_strings = false;
+
+// If true, we can do cheat replacements longer than the originals.
+
+boolean deh_allow_long_cheats = false;
+
+// If false, dehacked cheat replacements are ignored.
+
+boolean deh_apply_cheats = true;
+
+void DEH_Checksum(sha1_digest_t digest)
+{
+    sha1_context_t sha1_context;
+    unsigned int i;
+
+    SHA1_Init(&sha1_context);
+
+    for (i=0; deh_section_types[i] != NULL; ++i)
+    {
+        if (deh_section_types[i]->sha1_hash != NULL)
+        {
+            deh_section_types[i]->sha1_hash(&sha1_context);
+        }
+    }
+
+    SHA1_Final(digest, &sha1_context);
+}
+
+// Called on startup to call the Init functions
+
+static void InitializeSections(void)
+{
+    unsigned int i;
+
+    for (i=0; deh_section_types[i] != NULL; ++i)
+    {
+        if (deh_section_types[i]->init != NULL)
+        {
+            deh_section_types[i]->init();
+        }
+    }
+}
+
+static void DEH_Init(void)
+{
+    //!
+    // @category mod
+    //
+    // Ignore cheats in dehacked files.
+    //
+
+    if (M_CheckParm("-nocheats") > 0) 
+    {
+	deh_apply_cheats = false;
+    }
+
+    // Call init functions for all the section definitions.
+    InitializeSections();
+
+    deh_initialized = true;
+}
+
+// Given a section name, get the section structure which corresponds
+
+static deh_section_t *GetSectionByName(char *name)
+{
+    unsigned int i;
+
+    // we explicitely do not recognize [STRINGS] sections at all
+    // if extended strings are not allowed
+
+    if (!deh_allow_extended_strings && !strncasecmp("[STRINGS]", name, 9))
+    {
+        return NULL;
+    }
+
+    for (i=0; deh_section_types[i] != NULL; ++i)
+    {
+        if (!strcasecmp(deh_section_types[i]->name, name))
+        {
+            return deh_section_types[i];
+        }
+    }
+
+    return NULL;
+}
+
+// Is the string passed just whitespace?
+
+static boolean IsWhitespace(char *s)
+{
+    for (; *s; ++s)
+    {
+        if (!isspace(*s))
+            return false;
+    }
+
+    return true;
+}
+
+// Strip whitespace from the start and end of a string
+
+static char *CleanString(char *s)
+{
+    char *strending;
+
+    // Leading whitespace
+
+    while (*s && isspace(*s))
+        ++s;
+
+    // Trailing whitespace
+   
+    strending = s + strlen(s) - 1;
+
+    while (strlen(s) > 0 && isspace(*strending))
+    {
+        *strending = '\0';
+        --strending;
+    }
+
+    return s;
+}
+
+// This pattern is used a lot of times in different sections, 
+// an assignment is essentially just a statement of the form:
+//
+// Variable Name = Value
+//
+// The variable name can include spaces or any other characters.
+// The string is split on the '=', essentially.
+//
+// Returns true if read correctly
+
+boolean DEH_ParseAssignment(char *line, char **variable_name, char **value)
+{
+    char *p;
+
+    // find the equals
+    
+    p = strchr(line, '=');
+
+    if (p == NULL)
+    {
+        return false;
+    }
+
+    // variable name at the start
+    // turn the '=' into a \0 to terminate the string here
+
+    *p = '\0';
+    *variable_name = CleanString(line);
+    
+    // value immediately follows the '='
+    
+    *value = CleanString(p+1);
+    
+    return true;
+}
+
+static boolean CheckSignatures(deh_context_t *context)
+{
+    size_t i;
+    char *line;
+    
+    // Read the first line
+
+    line = DEH_ReadLine(context, false);
+
+    if (line == NULL)
+    {
+        return false;
+    }
+
+    // Check all signatures to see if one matches
+
+    for (i=0; deh_signatures[i] != NULL; ++i)
+    {
+        if (!strcmp(deh_signatures[i], line))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Parses a comment string in a dehacked file.
+
+static void DEH_ParseComment(char *comment)
+{
+    //
+    // Welcome, to the super-secret Chocolate Doom-specific Dehacked
+    // overrides function.
+    //
+    // Putting these magic comments into your Dehacked lumps will
+    // allow you to go beyond the normal limits of Vanilla Dehacked.
+    // Because of this, these comments are deliberately undocumented,
+    // and if you're using them you should be aware that your mod
+    // is not compatible with Vanilla Doom and you're probably a
+    // very naughty person.
+    //
+
+    // Allow comments containing this special value to allow string
+    // replacements longer than those permitted by DOS dehacked.
+    // This allows us to use a dehacked patch for doing string 
+    // replacements for emulating Chex Quest.
+    //
+    // If you use this, your dehacked patch may not work in Vanilla
+    // Doom.
+
+    if (strstr(comment, "*allow-long-strings*") != NULL)
+    {
+        deh_allow_long_strings = true;
+    }
+
+    // Allow magic comments to allow longer cheat replacements than
+    // those permitted by DOS dehacked.  This is also for Chex
+    // Quest.
+
+    if (strstr(comment, "*allow-long-cheats*") != NULL)
+    {
+        deh_allow_long_cheats = true;
+    }
+
+    // Allow magic comments to allow parsing [STRINGS] section
+    // that are usually only found in BEX format files. This allows
+    // for substitution of map and episode names when loading
+    // Freedoom/FreeDM IWADs.
+
+    if (strstr(comment, "*allow-extended-strings*") != NULL)
+    {
+        deh_allow_extended_strings = true;
+    }
+}
+
+// Parses a dehacked file by reading from the context
+
+static void DEH_ParseContext(deh_context_t *context)
+{
+    deh_section_t *current_section = NULL;
+    char section_name[20];
+    void *tag = NULL;
+    boolean extended;
+    char *line;
+
+    // Read the header and check it matches the signature
+
+    if (!CheckSignatures(context))
+    {
+        DEH_Error(context, "This is not a valid dehacked patch file!");
+    }
+
+    // Read the file
+
+    while (!DEH_HadError(context))
+    {
+        // Read the next line. We only allow the special extended parsing
+        // for the BEX [STRINGS] section.
+        extended = current_section != NULL
+                && !strcasecmp(current_section->name, "[STRINGS]");
+        line = DEH_ReadLine(context, extended);
+
+        // end of file?
+
+        if (line == NULL)
+        {
+            return;
+        }
+
+        while (line[0] != '\0' && isspace(line[0]))
+            ++line;
+
+        if (line[0] == '#')
+        {
+            // comment
+
+            DEH_ParseComment(line);
+            continue;
+        }
+
+        if (IsWhitespace(line))
+        {
+            if (current_section != NULL)
+            {
+                // end of section
+
+                if (current_section->end != NULL)
+                {
+                    current_section->end(context, tag);
+                }
+
+                //printf("end %s tag\n", current_section->name);
+                current_section = NULL;
+            }
+        }
+        else
+        {
+            if (current_section != NULL)
+            {
+                // parse this line
+
+                current_section->line_parser(context, line, tag);
+            }
+            else
+            {
+                // possibly the start of a new section
+
+                sscanf(line, "%19s", section_name);
+
+                current_section = GetSectionByName(section_name);
+
+                if (current_section != NULL)
+                {
+                    tag = current_section->start(context, line);
+                    //printf("started %s tag\n", section_name);
+                }
+                else
+                {
+                    //printf("unknown section name %s\n", section_name);
+                }
+            }
+        }
+    }
+}
+
+// Parses a dehacked file
+
+int DEH_LoadFile(const char *filename)
+{
+    deh_context_t *context;
+    boolean had_error;
+
+    if (!deh_initialized)
+    {
+        DEH_Init();
+    }
+
+    // Before parsing a new file, reset special override flags to false.
+    // Magic comments should only apply to the file in which they were
+    // defined, and shouldn't carry over to subsequent files as well.
+    deh_allow_long_strings = false;
+    deh_allow_long_cheats = false;
+    deh_allow_extended_strings = false;
+
+    printf(" loading %s\n", filename);
+
+    context = DEH_OpenFile(filename);
+
+    if (context == NULL)
+    {
+        fprintf(stderr, "DEH_LoadFile: Unable to open %s\n", filename);
+        return 0;
+    }
+
+    DEH_ParseContext(context);
+
+    had_error = DEH_HadError(context);
+
+    DEH_CloseFile(context);
+
+    if (had_error)
+    {
+        I_Error("Error parsing dehacked file");
+    }
+
+    return 1;
+}
+
+// Load all dehacked patches from the given directory.
+void DEH_AutoLoadPatches(const char *path)
+{
+    const char *filename;
+    glob_t *glob;
+
+    glob = I_StartMultiGlob(path, GLOB_FLAG_NOCASE|GLOB_FLAG_SORTED,
+                            "*.deh", "*.hhe", "*.seh", NULL);
+    for (;;)
+    {
+        filename = I_NextGlob(glob);
+        if (filename == NULL)
+        {
+            break;
+        }
+        printf(" [autoload]");
+        DEH_LoadFile(filename);
+    }
+
+    I_EndGlob(glob);
+}
+
+// Load dehacked file from WAD lump.
+// If allow_long is set, allow long strings and cheats just for this lump.
+
+int DEH_LoadLump(int lumpnum, boolean allow_long, boolean allow_error)
+{
+    deh_context_t *context;
+    boolean had_error;
+
+    if (!deh_initialized)
+    {
+        DEH_Init();
+    }
+
+    // Reset all special flags to defaults.
+    deh_allow_long_strings = allow_long;
+    deh_allow_long_cheats = allow_long;
+    deh_allow_extended_strings = false;
+
+    context = DEH_OpenLump(lumpnum);
+
+    if (context == NULL)
+    {
+        fprintf(stderr, "DEH_LoadFile: Unable to open lump %i\n", lumpnum);
+        return 0;
+    }
+
+    DEH_ParseContext(context);
+
+    had_error = DEH_HadError(context);
+
+    DEH_CloseFile(context);
+
+    // If there was an error while parsing, abort with an error, but allow
+    // errors to just be ignored if allow_error=true.
+    if (!allow_error && had_error)
+    {
+        I_Error("Error parsing dehacked lump");
+    }
+
+    return 1;
+}
+
+int DEH_LoadLumpByName(const char *name, boolean allow_long, boolean allow_error)
+{
+    int lumpnum;
+
+    lumpnum = W_CheckNumForName(name);
+
+    if (lumpnum == -1)
+    {
+        fprintf(stderr, "DEH_LoadLumpByName: '%s' lump not found\n", name);
+        return 0;
+    }
+
+    return DEH_LoadLump(lumpnum, allow_long, allow_error);
+}
+
+// Check the command line for -deh argument, and others.
+void DEH_ParseCommandLine(void)
+{
+    char *filename;
+    int p;
+
+    //!
+    // @arg <files>
+    // @category mod
+    //
+    // Load the given dehacked patch(es)
+    //
+
+    p = M_CheckParm("-deh");
+
+    if (p > 0)
+    {
+        ++p;
+
+        while (p < myargc && myargv[p][0] != '-')
+        {
+            filename = D_TryFindWADByName(myargv[p]);
+            DEH_LoadFile(filename);
+            free(filename);
+            ++p;
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/deh_main.h b/games/NXDoom/src/deh_main.h
new file mode 100644
index 000000000..9ab870402
--- /dev/null
+++ b/games/NXDoom/src/deh_main.h
@@ -0,0 +1,48 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dehacked entrypoint and common code
+//
+
+#ifndef DEH_MAIN_H
+#define DEH_MAIN_H
+
+#include "doomtype.h"
+#include "deh_str.h"
+#include "sha1.h"
+
+// These are the limits that dehacked uses (from dheinit.h in the dehacked
+// source).  If these limits are exceeded, it does not generate an error, but
+// a warning is displayed.
+
+#define DEH_VANILLA_NUMSTATES 966
+#define DEH_VANILLA_NUMSFX 107
+
+void DEH_ParseCommandLine(void);
+int DEH_LoadFile(const char *filename);
+void DEH_AutoLoadPatches(const char *path);
+int DEH_LoadLump(int lumpnum, boolean allow_long, boolean allow_error);
+int DEH_LoadLumpByName(const char *name, boolean allow_long, boolean allow_error);
+
+boolean DEH_ParseAssignment(char *line, char **variable_name, char **value);
+
+void DEH_Checksum(sha1_digest_t digest);
+
+extern boolean deh_allow_extended_strings;
+extern boolean deh_allow_long_strings;
+extern boolean deh_allow_long_cheats;
+extern boolean deh_apply_cheats;
+
+#endif /* #ifndef DEH_MAIN_H */
+
diff --git a/games/NXDoom/src/deh_mapping.c b/games/NXDoom/src/deh_mapping.c
new file mode 100644
index 000000000..f96508b9c
--- /dev/null
+++ b/games/NXDoom/src/deh_mapping.c
@@ -0,0 +1,200 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dehacked "mapping" code
+// Allows the fields in structures to be mapped out and accessed by
+// name
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_misc.h"
+
+#include "deh_mapping.h"
+
+static deh_mapping_entry_t *GetMappingEntryByName(deh_context_t *context,
+                                                  deh_mapping_t *mapping,
+                                                  char *name)
+{
+    int i;
+
+    for (i=0; mapping->entries[i].name != NULL; ++i)
+    {
+        deh_mapping_entry_t *entry = &mapping->entries[i];
+
+        if (!strcasecmp(entry->name, name))
+        {
+            if (entry->location == NULL)
+            {
+                DEH_Warning(context, "Field '%s' is unsupported", name);
+                return NULL;
+            }
+
+            return entry;
+        }
+    }
+
+    // Not found.
+
+    DEH_Warning(context, "Field named '%s' not found", name);
+
+    return NULL;
+}
+
+//
+// Get the location of the specified field in the specified structure.
+//
+
+static void *GetStructField(void *structptr,
+                            deh_mapping_t *mapping,
+                            deh_mapping_entry_t *entry)
+{
+    unsigned int offset;
+
+    offset = (uint8_t *)entry->location - (uint8_t *)mapping->base;
+
+    return (uint8_t *)structptr + offset;
+}
+
+//
+// Set the value of a particular field in a structure by name
+//
+
+boolean DEH_SetMapping(deh_context_t *context, deh_mapping_t *mapping,
+                       void *structptr, char *name, int value)
+{
+    deh_mapping_entry_t *entry;
+    void *location;
+
+    entry = GetMappingEntryByName(context, mapping, name);
+
+    if (entry == NULL)
+    {
+        return false;
+    }
+
+    // Sanity check:
+
+    if (entry->is_string)
+    {
+        DEH_Error(context, "Tried to set '%s' as integer (BUG)", name);
+        return false;
+    }
+
+    location = GetStructField(structptr, mapping, entry);
+
+    //       printf("Setting %p::%s to %i (%i bytes)\n",
+    //               structptr, name, value, entry->size);
+
+    // Set field content based on its type:
+
+    switch (entry->size)
+    {
+        case 1:
+            * ((uint8_t *) location) = value;
+            break;
+        case 2:
+            * ((uint16_t *) location) = value;
+            break;
+        case 4:
+            * ((uint32_t *) location) = value;
+            break;
+        default:
+            DEH_Error(context, "Unknown field type for '%s' (BUG)", name);
+            return false;
+    }
+
+    return true;
+}
+
+//
+// Set the value of a string field in a structure by name
+//
+
+boolean DEH_SetStringMapping(deh_context_t *context, deh_mapping_t *mapping,
+                             void *structptr, char *name, char *value)
+{
+    deh_mapping_entry_t *entry;
+    void *location;
+
+    entry = GetMappingEntryByName(context, mapping, name);
+
+    if (entry == NULL)
+    {
+        return false;
+    }
+
+    // Sanity check:
+
+    if (!entry->is_string)
+    {
+        DEH_Error(context, "Tried to set '%s' as string (BUG)", name);
+        return false;
+    }
+
+    location = GetStructField(structptr, mapping, entry);
+
+    // Copy value into field:
+
+    M_StringCopy(location, value, entry->size);
+
+    return true;
+}
+
+void DEH_StructSHA1Sum(sha1_context_t *context, deh_mapping_t *mapping,
+                       void *structptr)
+{
+    int i;
+
+    // Go through each mapping
+
+    for (i=0; mapping->entries[i].name != NULL; ++i)
+    {
+        deh_mapping_entry_t *entry = &mapping->entries[i];
+        void *location;
+
+        if (entry->location == NULL)
+        {
+            // Unsupported field
+
+            continue;
+        }
+
+        // Add in data for this field
+
+        location = (uint8_t *)structptr + ((uint8_t *)entry->location - (uint8_t *)mapping->base);
+
+        switch (entry->size)
+        {
+            case 1:
+                SHA1_UpdateInt32(context, *((uint8_t *) location));
+                break;
+            case 2:
+                SHA1_UpdateInt32(context, *((uint16_t *) location));
+                break;
+            case 4:
+                SHA1_UpdateInt32(context, *((uint32_t *) location));
+                break;
+            default:
+                I_Error("Unknown dehacked mapping field type for '%s' (BUG)", 
+                        entry->name);
+                break;
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/deh_mapping.h b/games/NXDoom/src/deh_mapping.h
new file mode 100644
index 000000000..e71468c4f
--- /dev/null
+++ b/games/NXDoom/src/deh_mapping.h
@@ -0,0 +1,93 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dehacked "mapping" code
+// Allows the fields in structures to be mapped out and accessed by
+// name
+//
+
+#ifndef DEH_MAPPING_H
+#define DEH_MAPPING_H
+
+#include "doomtype.h"
+#include "deh_io.h"
+#include "sha1.h"
+
+#define DEH_BEGIN_MAPPING(mapping_name, structname)           \
+    static structname deh_mapping_base;                       \
+    static deh_mapping_t mapping_name =                       \
+    {                                                         \
+        &deh_mapping_base,                                    \
+        {
+
+#define DEH_MAPPING(deh_name, fieldname)                      \
+             {deh_name, &deh_mapping_base.fieldname,          \
+                 sizeof(deh_mapping_base.fieldname),          \
+                 false},
+
+#define DEH_MAPPING_STRING(deh_name, fieldname)               \
+             {deh_name, &deh_mapping_base.fieldname,          \
+                 sizeof(deh_mapping_base.fieldname),          \
+                 true},
+
+#define DEH_UNSUPPORTED_MAPPING(deh_name)                     \
+             {deh_name, NULL, -1, false},
+
+#define DEH_END_MAPPING                                       \
+             {NULL, NULL, -1}                                 \
+        }                                                     \
+    };
+
+
+
+#define MAX_MAPPING_ENTRIES 32
+
+typedef struct deh_mapping_s deh_mapping_t;
+typedef struct deh_mapping_entry_s deh_mapping_entry_t;
+
+struct deh_mapping_entry_s 
+{
+    // field name
+   
+    const char *name;
+
+    // location relative to the base in the deh_mapping_t struct
+    // If this is NULL, it is an unsupported mapping
+
+    void *location;
+
+    // field size
+
+    int size;
+
+    // if true, this is a string value.
+
+    boolean is_string;
+};
+
+struct deh_mapping_s
+{
+    void *base;
+    deh_mapping_entry_t entries[MAX_MAPPING_ENTRIES];
+};
+
+boolean DEH_SetMapping(deh_context_t *context, deh_mapping_t *mapping,
+                       void *structptr, char *name, int value);
+boolean DEH_SetStringMapping(deh_context_t *context, deh_mapping_t *mapping,
+                             void *structptr, char *name, char *value);
+void DEH_StructSHA1Sum(sha1_context_t *context, deh_mapping_t *mapping,
+                       void *structptr);
+
+#endif /* #ifndef DEH_MAPPING_H */
+
diff --git a/games/NXDoom/src/deh_str.c b/games/NXDoom/src/deh_str.c
new file mode 100644
index 000000000..76af188ae
--- /dev/null
+++ b/games/NXDoom/src/deh_str.c
@@ -0,0 +1,433 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses Text substitution sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "doomtype.h"
+#include "deh_str.h"
+#include "m_misc.h"
+
+#include "z_zone.h"
+
+typedef struct 
+{
+    char *from_text;
+    char *to_text;
+} deh_substitution_t;
+
+static deh_substitution_t **hash_table = NULL;
+static int hash_table_entries;
+static int hash_table_length = -1;
+
+// This is the algorithm used by glib
+
+static unsigned int strhash(const char *s)
+{
+    const char *p = s;
+    unsigned int h = *p;
+  
+    if (h)
+    {
+        for (p += 1; *p; p++)
+            h = (h << 5) - h + *p;
+    }
+
+    return h;
+}
+
+static deh_substitution_t *SubstitutionForString(const char *s)
+{
+    int entry;
+
+    // Fallback if we have not initialized the hash table yet
+    if (hash_table_length < 0)
+	return NULL;
+
+    entry = strhash(s) % hash_table_length;
+
+    while (hash_table[entry] != NULL)
+    {
+        if (!strcmp(hash_table[entry]->from_text, s))
+        {
+            // substitution found!
+            return hash_table[entry];
+        }
+
+        entry = (entry + 1) % hash_table_length;
+    }
+
+    // no substitution found
+    return NULL;
+}
+
+// Look up a string to see if it has been replaced with something else
+// This will be used throughout the program to substitute text
+
+const char *DEH_String(const char *s)
+{
+    deh_substitution_t *subst;
+
+    subst = SubstitutionForString(s);
+
+    if (subst != NULL)
+    {
+        return subst->to_text;
+    }
+    else
+    {
+        return s;
+    }
+}
+
+static void InitHashTable(void)
+{
+    // init hash table
+    
+    hash_table_entries = 0;
+    hash_table_length = 16;
+    hash_table = Z_Malloc(sizeof(deh_substitution_t *) * hash_table_length,
+                          PU_STATIC, NULL);
+    memset(hash_table, 0, sizeof(deh_substitution_t *) * hash_table_length);
+}
+
+static void DEH_AddToHashtable(deh_substitution_t *sub);
+
+static void IncreaseHashtable(void)
+{
+    deh_substitution_t **old_table;
+    int old_table_length;
+    int i;
+    
+    // save the old table
+
+    old_table = hash_table;
+    old_table_length = hash_table_length;
+    
+    // double the size 
+
+    hash_table_length *= 2;
+    hash_table = Z_Malloc(sizeof(deh_substitution_t *) * hash_table_length,
+                          PU_STATIC, NULL);
+    memset(hash_table, 0, sizeof(deh_substitution_t *) * hash_table_length);
+
+    // go through the old table and insert all the old entries
+
+    for (i=0; i<old_table_length; ++i)
+    {
+        if (old_table[i] != NULL)
+        {
+            DEH_AddToHashtable(old_table[i]);
+        }
+    }
+
+    // free the old table
+
+    Z_Free(old_table);
+}
+
+static void DEH_AddToHashtable(deh_substitution_t *sub)
+{
+    int entry;
+
+    // if the hash table is more than 60% full, increase its size
+
+    if ((hash_table_entries * 10) / hash_table_length > 6)
+    {
+        IncreaseHashtable();
+    }
+
+    // find where to insert it
+    entry = strhash(sub->from_text) % hash_table_length;
+
+    while (hash_table[entry] != NULL)
+    {
+        entry = (entry + 1) % hash_table_length;
+    }
+
+    hash_table[entry] = sub;
+    ++hash_table_entries;
+}
+
+void DEH_AddStringReplacement(const char *from_text, const char *to_text)
+{
+    deh_substitution_t *sub;
+    size_t len;
+
+    // Initialize the hash table if this is the first time
+    if (hash_table_length < 0)
+    {
+        InitHashTable();
+    }
+
+    // Check to see if there is an existing substitution already in place.
+    sub = SubstitutionForString(from_text);
+
+    if (sub != NULL)
+    {
+        Z_Free(sub->to_text);
+
+        len = strlen(to_text) + 1;
+        sub->to_text = Z_Malloc(len, PU_STATIC, NULL);
+        memcpy(sub->to_text, to_text, len);
+    }
+    else
+    {
+        // We need to allocate a new substitution.
+        sub = Z_Malloc(sizeof(*sub), PU_STATIC, 0);
+
+        // We need to create our own duplicates of the provided strings.
+        len = strlen(from_text) + 1;
+        sub->from_text = Z_Malloc(len, PU_STATIC, NULL);
+        memcpy(sub->from_text, from_text, len);
+
+        len = strlen(to_text) + 1;
+        sub->to_text = Z_Malloc(len, PU_STATIC, NULL);
+        memcpy(sub->to_text, to_text, len);
+
+        DEH_AddToHashtable(sub);
+    }
+}
+
+typedef enum
+{
+    FORMAT_ARG_INVALID,
+    FORMAT_ARG_INT,
+    FORMAT_ARG_FLOAT,
+    FORMAT_ARG_CHAR,
+    FORMAT_ARG_STRING,
+    FORMAT_ARG_PTR,
+    FORMAT_ARG_SAVE_POS
+} format_arg_t;
+
+// Get the type of a format argument.
+// We can mix-and-match different format arguments as long as they
+// are for the same data type.
+
+static format_arg_t FormatArgumentType(char c)
+{
+    switch (c)
+    {
+        case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
+            return FORMAT_ARG_INT;
+
+        case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
+        case 'a': case 'A':
+            return FORMAT_ARG_FLOAT;
+
+        case 'c': case 'C':
+            return FORMAT_ARG_CHAR;
+
+        case 's': case 'S':
+            return FORMAT_ARG_STRING;
+
+        case 'p':
+            return FORMAT_ARG_PTR;
+
+        case 'n':
+            return FORMAT_ARG_SAVE_POS;
+
+        default:
+            return FORMAT_ARG_INVALID;
+    }
+}
+
+// Given the specified string, get the type of the first format
+// string encountered.
+
+static format_arg_t NextFormatArgument(const char **str)
+{
+    format_arg_t argtype;
+
+    // Search for the '%' starting the next string.
+
+    while (**str != '\0')
+    {
+        if (**str == '%')
+        {
+            ++*str;
+
+            // Don't stop for double-%s.
+
+            if (**str != '%')
+            {
+                break;
+            }
+        }
+
+        ++*str;
+    }
+
+    // Find the type of the format string.
+
+    while (**str != '\0')
+    {
+        argtype = FormatArgumentType(**str);
+
+        if (argtype != FORMAT_ARG_INVALID)
+        {
+            ++*str;
+
+            return argtype;
+        }
+
+        ++*str;
+    }
+
+    // Stop searching, we have reached the end.
+
+    *str = NULL;
+
+    return FORMAT_ARG_INVALID;
+}
+
+// Check if the specified argument type is a valid replacement for
+// the original.
+
+static boolean ValidArgumentReplacement(format_arg_t original,
+                                        format_arg_t replacement)
+{
+    // In general, the original and replacement types should be
+    // identical.  However, there are some cases where the replacement
+    // is valid and the types don't match.
+
+    // Characters can be represented as ints.
+
+    if (original == FORMAT_ARG_CHAR && replacement == FORMAT_ARG_INT)
+    {
+        return true;
+    }
+
+    // Strings are pointers.
+
+    if (original == FORMAT_ARG_STRING && replacement == FORMAT_ARG_PTR)
+    {
+        return true;
+    }
+
+    return original == replacement;
+}
+
+// Return true if the specified string contains no format arguments.
+
+static boolean ValidFormatReplacement(const char *original, const char *replacement)
+{
+    const char *rover1;
+    const char *rover2;
+    int argtype1, argtype2;
+
+    // Check each argument in turn and compare types.
+
+    rover1 = original; rover2 = replacement;
+
+    for (;;)
+    {
+        argtype1 = NextFormatArgument(&rover1);
+        argtype2 = NextFormatArgument(&rover2);
+
+        if (argtype2 == FORMAT_ARG_INVALID)
+        {
+            // No more arguments left to read from the replacement string.
+
+            break;
+        }
+        else if (argtype1 == FORMAT_ARG_INVALID)
+        {
+            // Replacement string has more arguments than the original.
+
+            return false;
+        }
+        else if (!ValidArgumentReplacement(argtype1, argtype2))
+        {
+            // Not a valid replacement argument.
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// Get replacement format string, checking arguments.
+
+static const char *FormatStringReplacement(const char *s)
+{
+    const char *repl;
+
+    repl = DEH_String(s);
+
+    if (!ValidFormatReplacement(s, repl))
+    {
+        printf("WARNING: Unsafe dehacked replacement provided for "
+               "printf format string: %s\n", s);
+
+        return s;
+    }
+
+    return repl;
+}
+
+// printf(), performing a replacement on the format string.
+
+void DEH_printf(const char *fmt, ...)
+{
+    va_list args;
+    const char *repl;
+
+    repl = FormatStringReplacement(fmt);
+
+    va_start(args, fmt);
+
+    vprintf(repl, args);
+
+    va_end(args);
+}
+
+// fprintf(), performing a replacement on the format string.
+
+void DEH_fprintf(FILE *fstream, const char *fmt, ...)
+{
+    va_list args;
+    const char *repl;
+
+    repl = FormatStringReplacement(fmt);
+
+    va_start(args, fmt);
+
+    vfprintf(fstream, repl, args);
+
+    va_end(args);
+}
+
+// snprintf(), performing a replacement on the format string.
+
+void DEH_snprintf(char *buffer, size_t len, const char *fmt, ...)
+{
+    va_list args;
+    const char *repl;
+
+    repl = FormatStringReplacement(fmt);
+
+    va_start(args, fmt);
+
+    M_vsnprintf(buffer, len, repl, args);
+
+    va_end(args);
+}
+
diff --git a/games/NXDoom/src/deh_str.h b/games/NXDoom/src/deh_str.h
new file mode 100644
index 000000000..d547de6b9
--- /dev/null
+++ b/games/NXDoom/src/deh_str.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dehacked string replacements
+//
+
+#ifndef DEH_STR_H
+#define DEH_STR_H
+
+#include <stdio.h>
+
+#include "doomtype.h"
+
+// Used to do dehacked text substitutions throughout the program
+
+const char *DEH_String(const char *s) PRINTF_ARG_ATTR(1);
+void DEH_printf(const char *fmt, ...) PRINTF_ATTR(1, 2);
+void DEH_fprintf(FILE *fstream, const char *fmt, ...) PRINTF_ATTR(2, 3);
+void DEH_snprintf(char *buffer, size_t len, const char *fmt, ...) PRINTF_ATTR(3, 4);
+void DEH_AddStringReplacement(const char *from_text, const char *to_text);
+
+
+#if 0
+// Static macro versions of the functions above
+
+#define DEH_String(x) (x)
+#define DEH_printf printf
+#define DEH_fprintf fprintf
+#define DEH_snprintf snprintf
+
+#endif
+
+#endif /* #ifndef DEH_STR_H */
+
diff --git a/games/NXDoom/src/deh_text.c b/games/NXDoom/src/deh_text.c
new file mode 100644
index 000000000..9e621b438
--- /dev/null
+++ b/games/NXDoom/src/deh_text.c
@@ -0,0 +1,113 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses Text substitution sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "z_zone.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+
+// Given a string length, find the maximum length of a 
+// string that can replace it.
+
+static int TXT_MaxStringLength(int len)
+{
+    // Enough bytes for the string and the NUL terminator
+
+    len += 1;
+
+    // All strings in doom.exe are on 4-byte boundaries, so we may be able
+    // to support a slightly longer string.
+    // Extend up to the next 4-byte boundary
+
+    len += (4 - (len % 4)) % 4;
+            
+    // Less one for the NUL terminator.
+
+    return len - 1;
+}
+
+static void *DEH_TextStart(deh_context_t *context, char *line)
+{
+    char *from_text, *to_text;
+    int fromlen, tolen;
+    int i;
+
+    if (sscanf(line, "Text %i %i", &fromlen, &tolen) != 2)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    // Only allow string replacements that are possible in Vanilla Doom.  
+    // Chocolate Doom is unforgiving!
+
+    if (!deh_allow_long_strings && tolen > TXT_MaxStringLength(fromlen))
+    {
+        DEH_Error(context, "Replacement string is longer than the maximum "
+                           "possible in doom.exe");
+        return NULL;
+    }
+
+    from_text = malloc(fromlen + 1);
+    to_text = malloc(tolen + 1);
+
+    // read in the "from" text
+
+    for (i=0; i<fromlen; ++i)
+    {
+        from_text[i] = DEH_GetChar(context);
+    }
+    from_text[fromlen] = '\0';
+
+    // read in the "to" text
+
+    for (i=0; i<tolen; ++i)
+    {
+        to_text[i] = DEH_GetChar(context);
+    }
+    to_text[tolen] = '\0';
+
+    DEH_AddStringReplacement(from_text, to_text);
+
+    free(from_text);
+    free(to_text);
+
+    return NULL;
+}
+
+static void DEH_TextParseLine(deh_context_t *context, char *line, void *tag)
+{
+    // not used
+}
+
+deh_section_t deh_section_text =
+{
+    "Text",
+    NULL,
+    DEH_TextStart,
+    DEH_TextParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/doom-res.rc.in b/games/NXDoom/src/doom-res.rc.in
new file mode 100644
index 000000000..52d296609
--- /dev/null
+++ b/games/NXDoom/src/doom-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/doom.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+  BLOCK "040904E4"
+  {
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+   VALUE "FileDescription", "@PACKAGE_STRING@"
+   VALUE "InternalName", "@PACKAGE_TARNAME@"
+   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+   VALUE "ProductName", "@PACKAGE_NAME@"
+   VALUE "ProductVersion", "@PACKAGE_VERSION@"
+  }
+ }
+ BLOCK "VarFileInfo"
+ {
+  VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/games/NXDoom/src/doom/.gitignore b/games/NXDoom/src/doom/.gitignore
new file mode 100644
index 000000000..d4e88e5a2
--- /dev/null
+++ b/games/NXDoom/src/doom/.gitignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+tags
+TAGS
diff --git a/games/NXDoom/src/doom/CMakeLists.txt b/games/NXDoom/src/doom/CMakeLists.txt
new file mode 100644
index 000000000..6e878a0f1
--- /dev/null
+++ b/games/NXDoom/src/doom/CMakeLists.txt
@@ -0,0 +1,91 @@
+add_library(doom STATIC
+            am_map.c        am_map.h
+            deh_ammo.c
+            deh_bexstr.c
+            deh_cheat.c
+            deh_doom.c
+            deh_frame.c
+            deh_misc.c      deh_misc.h
+            deh_ptr.c
+            deh_sound.c
+            deh_thing.c
+            deh_weapon.c
+                            d_englsh.h
+            d_items.c       d_items.h
+            d_main.c        d_main.h
+            d_net.c
+                            doomdata.h
+            doomdef.c       doomdef.h
+            doomstat.c      doomstat.h
+                            d_player.h
+            dstrings.c      dstrings.h
+                            d_textur.h
+                            d_think.h
+            f_finale.c      f_finale.h
+            f_wipe.c        f_wipe.h
+            g_game.c        g_game.h
+            hu_lib.c        hu_lib.h
+            hu_stuff.c      hu_stuff.h
+            info.c          info.h
+            m_menu.c        m_menu.h
+            m_random.c      m_random.h
+            p_ceilng.c
+            p_doors.c
+            p_enemy.c
+            p_floor.c
+            p_inter.c       p_inter.h
+            p_lights.c
+                            p_local.h
+            p_map.c
+            p_maputl.c
+            p_mobj.c        p_mobj.h
+            p_plats.c
+            p_pspr.c        p_pspr.h
+            p_saveg.c       p_saveg.h
+            p_setup.c       p_setup.h
+            p_sight.c
+            p_spec.c        p_spec.h
+            p_switch.c
+            p_telept.c
+            p_tick.c        p_tick.h
+            p_user.c
+            r_bsp.c         r_bsp.h
+            r_data.c        r_data.h
+                            r_defs.h
+            r_draw.c        r_draw.h
+                            r_local.h
+            r_main.c        r_main.h
+            r_plane.c       r_plane.h
+            r_segs.c        r_segs.h
+            r_sky.c         r_sky.h
+                            r_state.h
+            r_things.c      r_things.h
+            s_sound.c       s_sound.h
+            sounds.c        sounds.h
+            statdump.c      statdump.h
+            st_lib.c        st_lib.h
+            st_stuff.c      st_stuff.h
+            wi_stuff.c      wi_stuff.h)
+
+target_include_directories(doom PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
+
+if (DEFINED EMSCRIPTEN)
+    set(SDL_FLAGS "-s USE_SDL=2")
+    if(ENABLE_SDL2_MIXER)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
+    endif()
+    if(ENABLE_SDL2_NET)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
+    endif()
+else()
+    set(SDL_LINK_LIBS SDL2::SDL2)
+    if(ENABLE_SDL2_MIXER)
+        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
+    endif()
+    if(ENABLE_SDL2_NET)
+        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
+    endif()
+endif()
+target_link_libraries(doom ${SDL_LINK_LIBS})
+set_target_properties(doom PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+set_target_properties(doom PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/doom/Makefile.am b/games/NXDoom/src/doom/Makefile.am
new file mode 100644
index 000000000..1f4e8c48e
--- /dev/null
+++ b/games/NXDoom/src/doom/Makefile.am
@@ -0,0 +1,83 @@
+AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+
+EXTRA_DIST =                    \
+        CMakeLists.txt          \
+        doom_icon.c
+
+noinst_LIBRARIES=libdoom.a
+
+libdoom_a_SOURCES =             \
+am_map.c           am_map.h     \
+deh_ammo.c                      \
+deh_bexstr.c                    \
+deh_cheat.c                     \
+deh_doom.c                      \
+deh_frame.c                     \
+deh_misc.c         deh_misc.h   \
+deh_ptr.c                       \
+deh_sound.c                     \
+deh_thing.c                     \
+deh_weapon.c                    \
+                   d_englsh.h   \
+d_items.c          d_items.h    \
+d_main.c           d_main.h     \
+d_net.c                         \
+                   doomdata.h   \
+doomdef.c          doomdef.h    \
+doomstat.c         doomstat.h   \
+                   d_player.h   \
+dstrings.c         dstrings.h   \
+                   d_textur.h   \
+                   d_think.h    \
+f_finale.c         f_finale.h   \
+f_wipe.c           f_wipe.h     \
+g_game.c           g_game.h     \
+hu_lib.c           hu_lib.h     \
+hu_stuff.c         hu_stuff.h   \
+info.c             info.h       \
+m_menu.c           m_menu.h     \
+m_random.c         m_random.h   \
+p_ceilng.c                      \
+p_doors.c                       \
+p_enemy.c                       \
+p_floor.c                       \
+p_inter.c          p_inter.h    \
+p_lights.c                      \
+                   p_local.h    \
+p_map.c                         \
+p_maputl.c                      \
+p_mobj.c           p_mobj.h     \
+p_plats.c                       \
+p_pspr.c           p_pspr.h     \
+p_saveg.c          p_saveg.h    \
+p_setup.c          p_setup.h    \
+p_sight.c                       \
+p_spec.c           p_spec.h     \
+p_switch.c                      \
+p_telept.c                      \
+p_tick.c           p_tick.h     \
+p_user.c                        \
+r_bsp.c            r_bsp.h      \
+r_data.c           r_data.h     \
+                   r_defs.h     \
+r_draw.c           r_draw.h     \
+                   r_local.h    \
+r_main.c           r_main.h     \
+r_plane.c          r_plane.h    \
+r_segs.c           r_segs.h     \
+r_sky.c            r_sky.h      \
+                   r_state.h    \
+r_things.c         r_things.h   \
+s_sound.c          s_sound.h    \
+sounds.c           sounds.h     \
+statdump.c         statdump.h   \
+st_lib.c           st_lib.h     \
+st_stuff.c         st_stuff.h   \
+wi_stuff.c         wi_stuff.h
+
+if HAVE_ICONS
+
+doom_icon.c : $(top_builddir)/data/doom.png
+	$(top_builddir)/data/convert-icon $(top_builddir)/data/doom.png $@
+
+endif
diff --git a/games/NXDoom/src/doom/am_map.c b/games/NXDoom/src/doom/am_map.c
new file mode 100644
index 000000000..150098eda
--- /dev/null
+++ b/games/NXDoom/src/doom/am_map.c
@@ -0,0 +1,1374 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:  the automap code
+//
+
+
+#include <stdio.h>
+
+#include "deh_main.h"
+
+#include "z_zone.h"
+#include "doomkeys.h"
+#include "doomdef.h"
+#include "st_stuff.h"
+#include "p_local.h"
+#include "w_wad.h"
+
+#include "m_cheat.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "dstrings.h"
+
+#include "am_map.h"
+
+
+// For use if I do walls with outsides/insides
+#define REDS		(256-5*16)
+#define REDRANGE	16
+#define BLUES		(256-4*16+8)
+#define BLUERANGE	8
+#define GREENS		(7*16)
+#define GREENRANGE	16
+#define GRAYS		(6*16)
+#define GRAYSRANGE	16
+#define BROWNS		(4*16)
+#define BROWNRANGE	16
+#define YELLOWS		(256-32+7)
+#define YELLOWRANGE	1
+#define BLACK		0
+#define WHITE		(256-47)
+
+// Automap colors
+#define BACKGROUND	BLACK
+#define YOURCOLORS	WHITE
+#define YOURRANGE	0
+#define WALLCOLORS	REDS
+#define WALLRANGE	REDRANGE
+#define TSWALLCOLORS	GRAYS
+#define TSWALLRANGE	GRAYSRANGE
+#define FDWALLCOLORS	BROWNS
+#define FDWALLRANGE	BROWNRANGE
+#define CDWALLCOLORS	YELLOWS
+#define CDWALLRANGE	YELLOWRANGE
+#define THINGCOLORS	GREENS
+#define THINGRANGE	GREENRANGE
+#define SECRETWALLCOLORS WALLCOLORS
+#define SECRETWALLRANGE WALLRANGE
+#define GRIDCOLORS	(GRAYS + GRAYSRANGE/2)
+#define GRIDRANGE	0
+#define XHAIRCOLORS	GRAYS
+
+// drawing stuff
+
+#define AM_NUMMARKPOINTS 10
+
+// scale on entry
+#define INITSCALEMTOF (.2*FRACUNIT)
+// how much the automap moves window per tic in frame-buffer coordinates
+// moves 140 pixels in 1 second
+#define F_PANINC	4
+// how much zoom-in per tic
+// goes to 2x in 1 second
+#define M_ZOOMIN        ((int) (1.02*FRACUNIT))
+// how much zoom-out per tic
+// pulls out to 0.5x in 1 second
+#define M_ZOOMOUT       ((int) (FRACUNIT/1.02))
+
+// translates between frame-buffer and map distances
+#define FTOM(x) FixedMul(((x)<<FRACBITS),scale_ftom)
+#define MTOF(x) (FixedMul((x),scale_mtof)>>FRACBITS)
+// translates between frame-buffer and map coordinates
+#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
+#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
+
+// the following is crap
+#define LINE_NEVERSEE ML_DONTDRAW
+
+typedef struct
+{
+    int x, y;
+} fpoint_t;
+
+typedef struct
+{
+    fpoint_t a, b;
+} fline_t;
+
+typedef struct
+{
+    fixed_t		x,y;
+} mpoint_t;
+
+typedef struct
+{
+    mpoint_t a, b;
+} mline_t;
+
+typedef struct
+{
+    fixed_t slp, islp;
+} islope_t;
+
+
+
+//
+// The vector graphics for the automap.
+//  A line drawing of the player pointing right,
+//   starting from the middle.
+//
+#define R ((8*PLAYERRADIUS)/7)
+mline_t player_arrow[] = {
+    { { -R+R/8, 0 }, { R, 0 } }, // -----
+    { { R, 0 }, { R-R/2, R/4 } },  // ----->
+    { { R, 0 }, { R-R/2, -R/4 } },
+    { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
+    { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
+    { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
+    { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
+};
+#undef R
+
+#define R ((8*PLAYERRADIUS)/7)
+mline_t cheat_player_arrow[] = {
+    { { -R+R/8, 0 }, { R, 0 } }, // -----
+    { { R, 0 }, { R-R/2, R/6 } },  // ----->
+    { { R, 0 }, { R-R/2, -R/6 } },
+    { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
+    { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
+    { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
+    { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
+    { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
+    { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
+    { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
+    { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
+    { { -R/6, -R/6 }, { 0, -R/6 } },
+    { { 0, -R/6 }, { 0, R/4 } },
+    { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
+    { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
+    { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
+};
+#undef R
+
+#define R (FRACUNIT)
+mline_t triangle_guy[] = {
+    { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
+    { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0      ), (fixed_t)(R    ) } },
+    { { (fixed_t)(0      ), (fixed_t)(R    ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
+};
+#undef R
+
+#define R (FRACUNIT)
+mline_t thintriangle_guy[] = {
+    { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
+    { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+    { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
+};
+#undef R
+
+
+
+
+static int 	cheating = 0;
+static int 	grid = 0;
+
+boolean    	automapactive = false;
+static int 	finit_width = SCREENWIDTH;
+static int 	finit_height = SCREENHEIGHT - ST_HEIGHT;
+
+// location of window on screen
+static int 	f_x;
+static int	f_y;
+
+// size of window on screen
+static int 	f_w;
+static int	f_h;
+
+static int 	lightlev; 		// used for funky strobing effect
+static pixel_t*	fb; 			// pseudo-frame buffer
+static int 	amclock;
+
+static mpoint_t m_paninc; // how far the window pans each tic (map coords)
+static fixed_t 	mtof_zoommul; // how far the window zooms in each tic (map coords)
+static fixed_t 	ftom_zoommul; // how far the window zooms in each tic (fb coords)
+
+static fixed_t 	m_x, m_y;   // LL x,y where the window is on the map (map coords)
+static fixed_t 	m_x2, m_y2; // UR x,y where the window is on the map (map coords)
+
+//
+// width/height of window on map (map coords)
+//
+static fixed_t 	m_w;
+static fixed_t	m_h;
+
+// based on level size
+static fixed_t 	min_x;
+static fixed_t	min_y; 
+static fixed_t 	max_x;
+static fixed_t  max_y;
+
+static fixed_t 	max_w; // max_x-min_x,
+static fixed_t  max_h; // max_y-min_y
+
+// based on player size
+static fixed_t 	min_w;
+static fixed_t  min_h;
+
+
+static fixed_t 	min_scale_mtof; // used to tell when to stop zooming out
+static fixed_t 	max_scale_mtof; // used to tell when to stop zooming in
+
+// old stuff for recovery later
+static fixed_t old_m_w, old_m_h;
+static fixed_t old_m_x, old_m_y;
+
+// old location used by the Follower routine
+static mpoint_t f_oldloc;
+
+// used by MTOF to scale from map-to-frame-buffer coords
+static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
+// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
+static fixed_t scale_ftom;
+
+static player_t *plr; // the player represented by an arrow
+
+static patch_t *marknums[10]; // numbers used for marking by the automap
+static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
+static int markpointnum = 0; // next point to be assigned
+
+static int followplayer = 1; // specifies whether to follow the player around
+
+cheatseq_t cheat_amap = CHEAT("iddt", 0);
+
+static boolean stopped = true;
+
+// Calculates the slope and slope according to the x-axis of a line
+// segment in map coordinates (with the upright y-axis n' all) so
+// that it can be used with the brain-dead drawing stuff.
+
+void
+AM_getIslope
+( mline_t*	ml,
+  islope_t*	is )
+{
+    int dx, dy;
+
+    dy = ml->a.y - ml->b.y;
+    dx = ml->b.x - ml->a.x;
+    if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
+    else is->islp = FixedDiv(dx, dy);
+    if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
+    else is->slp = FixedDiv(dy, dx);
+
+}
+
+//
+//
+//
+void AM_activateNewScale(void)
+{
+    m_x += m_w/2;
+    m_y += m_h/2;
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+    m_x -= m_w/2;
+    m_y -= m_h/2;
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+//
+//
+//
+void AM_saveScaleAndLoc(void)
+{
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+}
+
+//
+//
+//
+void AM_restoreScaleAndLoc(void)
+{
+
+    m_w = old_m_w;
+    m_h = old_m_h;
+    if (!followplayer)
+    {
+	m_x = old_m_x;
+	m_y = old_m_y;
+    } else {
+	m_x = plr->mo->x - m_w/2;
+	m_y = plr->mo->y - m_h/2;
+    }
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+
+    // Change the scaling multipliers
+    scale_mtof = FixedDiv(f_w<<FRACBITS, m_w);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+//
+// adds a marker at the current location
+//
+void AM_addMark(void)
+{
+    markpoints[markpointnum].x = m_x + m_w/2;
+    markpoints[markpointnum].y = m_y + m_h/2;
+    markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
+
+}
+
+//
+// Determines bounding box of all vertices,
+// sets global variables controlling zoom range.
+//
+void AM_findMinMaxBoundaries(void)
+{
+    int i;
+    fixed_t a;
+    fixed_t b;
+
+    min_x = min_y =  INT_MAX;
+    max_x = max_y = -INT_MAX;
+  
+    for (i=0;i<numvertexes;i++)
+    {
+	if (vertexes[i].x < min_x)
+	    min_x = vertexes[i].x;
+	else if (vertexes[i].x > max_x)
+	    max_x = vertexes[i].x;
+    
+	if (vertexes[i].y < min_y)
+	    min_y = vertexes[i].y;
+	else if (vertexes[i].y > max_y)
+	    max_y = vertexes[i].y;
+    }
+  
+    max_w = max_x - min_x;
+    max_h = max_y - min_y;
+
+    min_w = 2*PLAYERRADIUS; // const? never changed?
+    min_h = 2*PLAYERRADIUS;
+
+    a = FixedDiv(f_w<<FRACBITS, max_w);
+    b = FixedDiv(f_h<<FRACBITS, max_h);
+  
+    min_scale_mtof = a < b ? a : b;
+    max_scale_mtof = FixedDiv(f_h<<FRACBITS, 2*PLAYERRADIUS);
+
+}
+
+
+//
+//
+//
+void AM_changeWindowLoc(void)
+{
+    if (m_paninc.x || m_paninc.y)
+    {
+	followplayer = 0;
+	f_oldloc.x = INT_MAX;
+    }
+
+    m_x += m_paninc.x;
+    m_y += m_paninc.y;
+
+    if (m_x + m_w/2 > max_x)
+	m_x = max_x - m_w/2;
+    else if (m_x + m_w/2 < min_x)
+	m_x = min_x - m_w/2;
+  
+    if (m_y + m_h/2 > max_y)
+	m_y = max_y - m_h/2;
+    else if (m_y + m_h/2 < min_y)
+	m_y = min_y - m_h/2;
+
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+
+//
+//
+//
+void AM_initVariables(void)
+{
+    int pnum;
+    static event_t st_notify = { ev_keyup, AM_MSGENTERED, 0, 0 };
+
+    automapactive = true;
+    fb = I_VideoBuffer;
+
+    f_oldloc.x = INT_MAX;
+    amclock = 0;
+    lightlev = 0;
+
+    m_paninc.x = m_paninc.y = 0;
+    ftom_zoommul = FRACUNIT;
+    mtof_zoommul = FRACUNIT;
+
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+
+    // find player to center on initially
+    if (playeringame[consoleplayer])
+    {
+        plr = &players[consoleplayer];
+    }
+    else
+    {
+        plr = &players[0];
+
+	for (pnum=0;pnum<MAXPLAYERS;pnum++)
+        {
+	    if (playeringame[pnum])
+            {
+                plr = &players[pnum];
+		break;
+            }
+        }
+    }
+
+    m_x = plr->mo->x - m_w/2;
+    m_y = plr->mo->y - m_h/2;
+    AM_changeWindowLoc();
+
+    // for saving & restoring
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+
+    // inform the status bar of the change
+    ST_Responder(&st_notify);
+
+}
+
+//
+// 
+//
+void AM_loadPics(void)
+{
+    int i;
+    char namebuf[9];
+  
+    for (i=0;i<10;i++)
+    {
+	DEH_snprintf(namebuf, 9, "AMMNUM%d", i);
+	marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
+    }
+
+}
+
+void AM_unloadPics(void)
+{
+    int i;
+    char namebuf[9];
+  
+    for (i=0;i<10;i++)
+    {
+	DEH_snprintf(namebuf, 9, "AMMNUM%d", i);
+	W_ReleaseLumpName(namebuf);
+    }
+}
+
+void AM_clearMarks(void)
+{
+    int i;
+
+    for (i=0;i<AM_NUMMARKPOINTS;i++)
+	markpoints[i].x = -1; // means empty
+    markpointnum = 0;
+}
+
+//
+// should be called at the start of every level
+// right now, i figure it out myself
+//
+void AM_LevelInit(void)
+{
+    f_x = f_y = 0;
+    f_w = finit_width;
+    f_h = finit_height;
+
+    AM_clearMarks();
+
+    AM_findMinMaxBoundaries();
+    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7*FRACUNIT));
+    if (scale_mtof > max_scale_mtof)
+	scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+
+
+
+//
+//
+//
+void AM_Stop (void)
+{
+    static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED, 0 };
+
+    AM_unloadPics();
+    automapactive = false;
+    ST_Responder(&st_notify);
+    stopped = true;
+}
+
+//
+//
+//
+void AM_Start (void)
+{
+    static int lastlevel = -1, lastepisode = -1;
+
+    if (!stopped) AM_Stop();
+    stopped = false;
+    if (lastlevel != gamemap || lastepisode != gameepisode)
+    {
+	AM_LevelInit();
+	lastlevel = gamemap;
+	lastepisode = gameepisode;
+    }
+    AM_initVariables();
+    AM_loadPics();
+}
+
+//
+// set the window scale to the maximum size
+//
+void AM_minOutWindowScale(void)
+{
+    scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+//
+// set the window scale to the minimum size
+//
+void AM_maxOutWindowScale(void)
+{
+    scale_mtof = max_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+
+//
+// Handle events (user inputs) in automap mode
+//
+boolean
+AM_Responder
+( event_t*	ev )
+{
+
+    int rc;
+    static int bigstate=0;
+    static char buffer[20];
+    int key;
+
+    rc = false;
+
+    if (ev->type == ev_joystick && joybautomap >= 0
+        && (ev->data1 & (1 << joybautomap)) != 0)
+    {
+        joywait = I_GetTime() + 5;
+
+        if (!automapactive)
+        {
+            AM_Start ();
+            viewactive = false;
+        }
+        else
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+        }
+
+        return true;
+    }
+
+    if (!automapactive)
+    {
+	if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
+	{
+	    AM_Start ();
+	    viewactive = false;
+	    rc = true;
+	}
+    }
+    else if (ev->type == ev_keydown)
+    {
+	rc = true;
+        key = ev->data1;
+
+        if (key == key_map_east)          // pan right
+        {
+            if (!followplayer) m_paninc.x = FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_west)     // pan left
+        {
+            if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_north)    // pan up
+        {
+            if (!followplayer) m_paninc.y = FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_south)    // pan down
+        {
+            if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_zoomout)  // zoom out
+        {
+            mtof_zoommul = M_ZOOMOUT;
+            ftom_zoommul = M_ZOOMIN;
+        }
+        else if (key == key_map_zoomin)   // zoom in
+        {
+            mtof_zoommul = M_ZOOMIN;
+            ftom_zoommul = M_ZOOMOUT;
+        }
+        else if (key == key_map_toggle)
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+        }
+        else if (key == key_map_maxzoom)
+        {
+            bigstate = !bigstate;
+            if (bigstate)
+            {
+                AM_saveScaleAndLoc();
+                AM_minOutWindowScale();
+            }
+            else AM_restoreScaleAndLoc();
+        }
+        else if (key == key_map_follow)
+        {
+            followplayer = !followplayer;
+            f_oldloc.x = INT_MAX;
+            if (followplayer)
+                plr->message = DEH_String(AMSTR_FOLLOWON);
+            else
+                plr->message = DEH_String(AMSTR_FOLLOWOFF);
+        }
+        else if (key == key_map_grid)
+        {
+            grid = !grid;
+            if (grid)
+                plr->message = DEH_String(AMSTR_GRIDON);
+            else
+                plr->message = DEH_String(AMSTR_GRIDOFF);
+        }
+        else if (key == key_map_mark)
+        {
+            M_snprintf(buffer, sizeof(buffer), "%s %d",
+                       DEH_String(AMSTR_MARKEDSPOT), markpointnum);
+            plr->message = buffer;
+            AM_addMark();
+        }
+        else if (key == key_map_clearmark)
+        {
+            AM_clearMarks();
+            plr->message = DEH_String(AMSTR_MARKSCLEARED);
+        }
+        else
+        {
+            rc = false;
+        }
+
+        if ((!deathmatch || gameversion <= exe_doom_1_8)
+         && cht_CheckCheat(&cheat_amap, ev->data2))
+        {
+            rc = false;
+            cheating = (cheating + 1) % 3;
+        }
+    }
+    else if (ev->type == ev_keyup)
+    {
+        rc = false;
+        key = ev->data1;
+
+        if (key == key_map_east)
+        {
+            if (!followplayer) m_paninc.x = 0;
+        }
+        else if (key == key_map_west)
+        {
+            if (!followplayer) m_paninc.x = 0;
+        }
+        else if (key == key_map_north)
+        {
+            if (!followplayer) m_paninc.y = 0;
+        }
+        else if (key == key_map_south)
+        {
+            if (!followplayer) m_paninc.y = 0;
+        }
+        else if (key == key_map_zoomout || key == key_map_zoomin)
+        {
+            mtof_zoommul = FRACUNIT;
+            ftom_zoommul = FRACUNIT;
+        }
+    }
+
+    return rc;
+
+}
+
+
+//
+// Zooming
+//
+void AM_changeWindowScale(void)
+{
+
+    // Change the scaling multipliers
+    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+
+    if (scale_mtof < min_scale_mtof)
+	AM_minOutWindowScale();
+    else if (scale_mtof > max_scale_mtof)
+	AM_maxOutWindowScale();
+    else
+	AM_activateNewScale();
+}
+
+
+//
+//
+//
+void AM_doFollowPlayer(void)
+{
+
+    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
+    {
+	m_x = FTOM(MTOF(plr->mo->x)) - m_w/2;
+	m_y = FTOM(MTOF(plr->mo->y)) - m_h/2;
+	m_x2 = m_x + m_w;
+	m_y2 = m_y + m_h;
+	f_oldloc.x = plr->mo->x;
+	f_oldloc.y = plr->mo->y;
+
+	//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
+	//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
+	//  m_x = plr->mo->x - m_w/2;
+	//  m_y = plr->mo->y - m_h/2;
+
+    }
+
+}
+
+//
+//
+//
+void AM_updateLightLev(void)
+{
+    static int nexttic = 0;
+    //static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
+    static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
+    static int litelevelscnt = 0;
+   
+    // Change light level
+    if (amclock>nexttic)
+    {
+	lightlev = litelevels[litelevelscnt++];
+	if (litelevelscnt == arrlen(litelevels)) litelevelscnt = 0;
+	nexttic = amclock + 6 - (amclock % 6);
+    }
+
+}
+
+
+//
+// Updates on Game Tick
+//
+void AM_Ticker (void)
+{
+
+    if (!automapactive)
+	return;
+
+    amclock++;
+
+    if (followplayer)
+	AM_doFollowPlayer();
+
+    // Change the zoom if necessary
+    if (ftom_zoommul != FRACUNIT)
+	AM_changeWindowScale();
+
+    // Change x,y location
+    if (m_paninc.x || m_paninc.y)
+	AM_changeWindowLoc();
+
+    // Update light level
+    // AM_updateLightLev();
+
+}
+
+
+//
+// Clear automap frame buffer.
+//
+void AM_clearFB(int color)
+{
+    memset(fb, color, f_w*f_h*sizeof(*fb));
+}
+
+
+//
+// Automap clipping of lines.
+//
+// Based on Cohen-Sutherland clipping algorithm but with a slightly
+// faster reject and precalculated slopes.  If the speed is needed,
+// use a hash algorithm to handle  the common cases.
+//
+boolean
+AM_clipMline
+( mline_t*	ml,
+  fline_t*	fl )
+{
+    enum
+    {
+	LEFT	=1,
+	RIGHT	=2,
+	BOTTOM	=4,
+	TOP	=8
+    };
+    
+    register int	outcode1 = 0;
+    register int	outcode2 = 0;
+    register int	outside;
+    
+    fpoint_t	tmp;
+    int		dx;
+    int		dy;
+
+    
+#define DOOUTCODE(oc, mx, my) \
+    (oc) = 0; \
+    if ((my) < 0) (oc) |= TOP; \
+    else if ((my) >= f_h) (oc) |= BOTTOM; \
+    if ((mx) < 0) (oc) |= LEFT; \
+    else if ((mx) >= f_w) (oc) |= RIGHT;
+
+    
+    // do trivial rejects and outcodes
+    if (ml->a.y > m_y2)
+	outcode1 = TOP;
+    else if (ml->a.y < m_y)
+	outcode1 = BOTTOM;
+
+    if (ml->b.y > m_y2)
+	outcode2 = TOP;
+    else if (ml->b.y < m_y)
+	outcode2 = BOTTOM;
+    
+    if (outcode1 & outcode2)
+	return false; // trivially outside
+
+    if (ml->a.x < m_x)
+	outcode1 |= LEFT;
+    else if (ml->a.x > m_x2)
+	outcode1 |= RIGHT;
+    
+    if (ml->b.x < m_x)
+	outcode2 |= LEFT;
+    else if (ml->b.x > m_x2)
+	outcode2 |= RIGHT;
+    
+    if (outcode1 & outcode2)
+	return false; // trivially outside
+
+    // transform to frame-buffer coordinates.
+    fl->a.x = CXMTOF(ml->a.x);
+    fl->a.y = CYMTOF(ml->a.y);
+    fl->b.x = CXMTOF(ml->b.x);
+    fl->b.y = CYMTOF(ml->b.y);
+
+    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+
+    if (outcode1 & outcode2)
+	return false;
+
+    while (outcode1 | outcode2)
+    {
+	// may be partially inside box
+	// find an outside point
+	if (outcode1)
+	    outside = outcode1;
+	else
+	    outside = outcode2;
+	
+	// clip to each side
+	if (outside & TOP)
+	{
+	    dy = fl->a.y - fl->b.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.x = fl->a.x + (dx*(fl->a.y))/dy;
+	    tmp.y = 0;
+	}
+	else if (outside & BOTTOM)
+	{
+	    dy = fl->a.y - fl->b.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.x = fl->a.x + (dx*(fl->a.y-f_h))/dy;
+	    tmp.y = f_h-1;
+	}
+	else if (outside & RIGHT)
+	{
+	    dy = fl->b.y - fl->a.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.y = fl->a.y + (dy*(f_w-1 - fl->a.x))/dx;
+	    tmp.x = f_w-1;
+	}
+	else if (outside & LEFT)
+	{
+	    dy = fl->b.y - fl->a.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.y = fl->a.y + (dy*(-fl->a.x))/dx;
+	    tmp.x = 0;
+	}
+        else
+        {
+            tmp.x = 0;
+            tmp.y = 0;
+        }
+
+	if (outside == outcode1)
+	{
+	    fl->a = tmp;
+	    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+	}
+	else
+	{
+	    fl->b = tmp;
+	    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+	}
+	
+	if (outcode1 & outcode2)
+	    return false; // trivially outside
+    }
+
+    return true;
+}
+#undef DOOUTCODE
+
+
+//
+// Classic Bresenham w/ whatever optimizations needed for speed
+//
+void
+AM_drawFline
+( fline_t*	fl,
+  int		color )
+{
+    register int x;
+    register int y;
+    register int dx;
+    register int dy;
+    register int sx;
+    register int sy;
+    register int ax;
+    register int ay;
+    register int d;
+    
+    static int fuck = 0;
+
+    // For debugging only
+    if (      fl->a.x < 0 || fl->a.x >= f_w
+	   || fl->a.y < 0 || fl->a.y >= f_h
+	   || fl->b.x < 0 || fl->b.x >= f_w
+	   || fl->b.y < 0 || fl->b.y >= f_h)
+    {
+        DEH_fprintf(stderr, "fuck %d \r", fuck++);
+	return;
+    }
+
+#define PUTDOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)
+
+    dx = fl->b.x - fl->a.x;
+    ax = 2 * (dx<0 ? -dx : dx);
+    sx = dx<0 ? -1 : 1;
+
+    dy = fl->b.y - fl->a.y;
+    ay = 2 * (dy<0 ? -dy : dy);
+    sy = dy<0 ? -1 : 1;
+
+    x = fl->a.x;
+    y = fl->a.y;
+
+    if (ax > ay)
+    {
+	d = ay - ax/2;
+	while (1)
+	{
+	    PUTDOT(x,y,color);
+	    if (x == fl->b.x) return;
+	    if (d>=0)
+	    {
+		y += sy;
+		d -= ax;
+	    }
+	    x += sx;
+	    d += ay;
+	}
+    }
+    else
+    {
+	d = ax - ay/2;
+	while (1)
+	{
+	    PUTDOT(x, y, color);
+	    if (y == fl->b.y) return;
+	    if (d >= 0)
+	    {
+		x += sx;
+		d -= ay;
+	    }
+	    y += sy;
+	    d += ax;
+	}
+    }
+}
+
+
+//
+// Clip lines, draw visible part sof lines.
+//
+void
+AM_drawMline
+( mline_t*	ml,
+  int		color )
+{
+    static fline_t fl;
+
+    if (AM_clipMline(ml, &fl))
+	AM_drawFline(&fl, color); // draws it on frame buffer using fb coords
+}
+
+
+
+//
+// Draws flat (floor/ceiling tile) aligned grid lines.
+//
+void AM_drawGrid(int color)
+{
+    fixed_t x, y;
+    fixed_t start, end;
+    mline_t ml;
+
+    // Figure out start of vertical gridlines
+    start = m_x;
+    if ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS))
+	start += (MAPBLOCKUNITS<<FRACBITS)
+	    - ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS));
+    end = m_x + m_w;
+
+    // draw vertical gridlines
+    ml.a.y = m_y;
+    ml.b.y = m_y+m_h;
+    for (x=start; x<end; x+=(MAPBLOCKUNITS<<FRACBITS))
+    {
+	ml.a.x = x;
+	ml.b.x = x;
+	AM_drawMline(&ml, color);
+    }
+
+    // Figure out start of horizontal gridlines
+    start = m_y;
+    if ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS))
+	start += (MAPBLOCKUNITS<<FRACBITS)
+	    - ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS));
+    end = m_y + m_h;
+
+    // draw horizontal gridlines
+    ml.a.x = m_x;
+    ml.b.x = m_x + m_w;
+    for (y=start; y<end; y+=(MAPBLOCKUNITS<<FRACBITS))
+    {
+	ml.a.y = y;
+	ml.b.y = y;
+	AM_drawMline(&ml, color);
+    }
+
+}
+
+//
+// Determines visible lines, draws them.
+// This is LineDef based, not LineSeg based.
+//
+void AM_drawWalls(void)
+{
+    int i;
+    static mline_t l;
+
+    for (i=0;i<numlines;i++)
+    {
+	l.a.x = lines[i].v1->x;
+	l.a.y = lines[i].v1->y;
+	l.b.x = lines[i].v2->x;
+	l.b.y = lines[i].v2->y;
+	if (cheating || (lines[i].flags & ML_MAPPED))
+	{
+	    if ((lines[i].flags & LINE_NEVERSEE) && !cheating)
+		continue;
+	    if (!lines[i].backsector)
+	    {
+		AM_drawMline(&l, WALLCOLORS+lightlev);
+	    }
+	    else
+	    {
+		if (lines[i].special == 39)
+		{ // teleporters
+		    AM_drawMline(&l, WALLCOLORS+WALLRANGE/2);
+		}
+		else if (lines[i].flags & ML_SECRET) // secret door
+		{
+		    if (cheating) AM_drawMline(&l, SECRETWALLCOLORS + lightlev);
+		    else AM_drawMline(&l, WALLCOLORS+lightlev);
+		}
+		else if (lines[i].backsector->floorheight
+			   != lines[i].frontsector->floorheight) {
+		    AM_drawMline(&l, FDWALLCOLORS + lightlev); // floor level change
+		}
+		else if (lines[i].backsector->ceilingheight
+			   != lines[i].frontsector->ceilingheight) {
+		    AM_drawMline(&l, CDWALLCOLORS+lightlev); // ceiling level change
+		}
+		else if (cheating) {
+		    AM_drawMline(&l, TSWALLCOLORS+lightlev);
+		}
+	    }
+	}
+	else if (plr->powers[pw_allmap])
+	{
+	    if (!(lines[i].flags & LINE_NEVERSEE)) AM_drawMline(&l, GRAYS+3);
+	}
+    }
+}
+
+
+//
+// Rotation in 2D.
+// Used to rotate player arrow line character.
+//
+void
+AM_rotate
+( fixed_t*	x,
+  fixed_t*	y,
+  angle_t	a )
+{
+    fixed_t tmpx;
+
+    tmpx =
+	FixedMul(*x,finecosine[a>>ANGLETOFINESHIFT])
+	- FixedMul(*y,finesine[a>>ANGLETOFINESHIFT]);
+    
+    *y   =
+	FixedMul(*x,finesine[a>>ANGLETOFINESHIFT])
+	+ FixedMul(*y,finecosine[a>>ANGLETOFINESHIFT]);
+
+    *x = tmpx;
+}
+
+void
+AM_drawLineCharacter
+( mline_t*	lineguy,
+  int		lineguylines,
+  fixed_t	scale,
+  angle_t	angle,
+  int		color,
+  fixed_t	x,
+  fixed_t	y )
+{
+    int		i;
+    mline_t	l;
+
+    for (i=0;i<lineguylines;i++)
+    {
+	l.a.x = lineguy[i].a.x;
+	l.a.y = lineguy[i].a.y;
+
+	if (scale)
+	{
+	    l.a.x = FixedMul(scale, l.a.x);
+	    l.a.y = FixedMul(scale, l.a.y);
+	}
+
+	if (angle)
+	    AM_rotate(&l.a.x, &l.a.y, angle);
+
+	l.a.x += x;
+	l.a.y += y;
+
+	l.b.x = lineguy[i].b.x;
+	l.b.y = lineguy[i].b.y;
+
+	if (scale)
+	{
+	    l.b.x = FixedMul(scale, l.b.x);
+	    l.b.y = FixedMul(scale, l.b.y);
+	}
+
+	if (angle)
+	    AM_rotate(&l.b.x, &l.b.y, angle);
+	
+	l.b.x += x;
+	l.b.y += y;
+
+	AM_drawMline(&l, color);
+    }
+}
+
+void AM_drawPlayers(void)
+{
+    int		i;
+    player_t*	p;
+    static int 	their_colors[] = { GREENS, GRAYS, BROWNS, REDS };
+    int		their_color = -1;
+    int		color;
+
+    if (!netgame)
+    {
+	if (cheating)
+	    AM_drawLineCharacter
+		(cheat_player_arrow, arrlen(cheat_player_arrow), 0,
+		 plr->mo->angle, WHITE, plr->mo->x, plr->mo->y);
+	else
+	    AM_drawLineCharacter
+		(player_arrow, arrlen(player_arrow), 0, plr->mo->angle,
+		 WHITE, plr->mo->x, plr->mo->y);
+	return;
+    }
+
+    for (i=0;i<MAXPLAYERS;i++)
+    {
+	their_color++;
+	p = &players[i];
+
+	if ( (deathmatch && !singledemo) && p != plr)
+	    continue;
+
+	if (!playeringame[i])
+	    continue;
+
+	if (p->powers[pw_invisibility])
+	    color = 246; // *close* to black
+	else
+	    color = their_colors[their_color];
+	
+	AM_drawLineCharacter
+	    (player_arrow, arrlen(player_arrow), 0, p->mo->angle,
+	     color, p->mo->x, p->mo->y);
+    }
+
+}
+
+void
+AM_drawThings
+( int	colors,
+  int 	colorrange)
+{
+    int		i;
+    mobj_t*	t;
+
+    for (i=0;i<numsectors;i++)
+    {
+	t = sectors[i].thinglist;
+	while (t)
+	{
+	    AM_drawLineCharacter
+		(thintriangle_guy, arrlen(thintriangle_guy),
+		 16<<FRACBITS, t->angle, colors+lightlev, t->x, t->y);
+	    t = t->snext;
+	}
+    }
+}
+
+void AM_drawMarks(void)
+{
+    int i, fx, fy, w, h;
+
+    for (i=0;i<AM_NUMMARKPOINTS;i++)
+    {
+	if (markpoints[i].x != -1)
+	{
+	    //      w = SHORT(marknums[i]->width);
+	    //      h = SHORT(marknums[i]->height);
+	    w = 5; // because something's wrong with the wad, i guess
+	    h = 6; // because something's wrong with the wad, i guess
+	    fx = CXMTOF(markpoints[i].x);
+	    fy = CYMTOF(markpoints[i].y);
+	    if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
+		V_DrawPatch(fx, fy, marknums[i]);
+	}
+    }
+
+}
+
+void AM_drawCrosshair(int color)
+{
+    fb[(f_w*(f_h+1))/2] = color; // single point for now
+
+}
+
+void AM_Drawer (void)
+{
+    if (!automapactive) return;
+
+    AM_clearFB(BACKGROUND);
+    if (grid)
+	AM_drawGrid(GRIDCOLORS);
+    AM_drawWalls();
+    AM_drawPlayers();
+    if (cheating==2)
+	AM_drawThings(THINGCOLORS, THINGRANGE);
+    AM_drawCrosshair(XHAIRCOLORS);
+
+    AM_drawMarks();
+
+    V_MarkRect(f_x, f_y, f_w, f_h);
+
+}
diff --git a/games/NXDoom/src/doom/am_map.h b/games/NXDoom/src/doom/am_map.h
new file mode 100644
index 000000000..572d2389b
--- /dev/null
+++ b/games/NXDoom/src/doom/am_map.h
@@ -0,0 +1,49 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  AutoMap module.
+//
+
+#ifndef __AMMAP_H__
+#define __AMMAP_H__
+
+#include "d_event.h"
+#include "m_cheat.h"
+
+// Used by ST StatusBar stuff.
+#define AM_MSGHEADER (('a'<<24)+('m'<<16))
+#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
+#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
+
+
+// Called by main loop.
+boolean AM_Responder (event_t* ev);
+
+// Called by main loop.
+void AM_Ticker (void);
+
+// Called by main loop,
+// called instead of view drawer if automap active.
+void AM_Drawer (void);
+
+// Called to force the automap to quit
+// if the level is completed while it is up.
+void AM_Stop (void);
+
+
+extern cheatseq_t cheat_amap;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/d_englsh.h b/games/NXDoom/src/doom/d_englsh.h
new file mode 100644
index 000000000..cfb05722c
--- /dev/null
+++ b/games/NXDoom/src/doom/d_englsh.h
@@ -0,0 +1,693 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Printed strings for translation.
+//	English language support (default).
+//
+
+#ifndef __D_ENGLSH__
+#define __D_ENGLSH__
+
+//
+//	Printed strings for translation
+//
+
+//
+// D_Main.C
+//
+#define D_DEVSTR	"Development mode ON.\n"
+#define D_CDROM	"CD-ROM Version: default.cfg from c:\\doomdata\n"
+
+//
+//	M_Menu.C
+//
+#define PRESSKEY 	"press a key."
+#define PRESSYN 	"press y or n."
+#define QUITMSG	"are you sure you want to\nquit this great game?"
+#define LOADNET 	"you can't do load while in a net game!\n\n"PRESSKEY
+#define QLOADNET	"you can't quickload during a netgame!\n\n"PRESSKEY
+#define QSAVESPOT	"you haven't picked a quicksave slot yet!\n\n"PRESSKEY
+#define SAVEDEAD 	"you can't save if you aren't playing!\n\n"PRESSKEY
+#define QSPROMPT 	"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
+#define QLPROMPT	"do you want to quickload the game named\n\n'%s'?\n\n"PRESSYN
+
+#define NEWGAME	\
+"you can't start a new game\n"\
+"while in a network game.\n\n"PRESSKEY
+
+#define NIGHTMARE	\
+"are you sure? this skill level\n"\
+"isn't even remotely fair.\n\n"PRESSYN
+
+#define SWSTRING	\
+"this is the shareware version of doom.\n\n"\
+"you need to order the entire trilogy.\n\n"PRESSKEY
+
+#define MSGOFF	"Messages OFF"
+#define MSGON		"Messages ON"
+#define NETEND	"you can't end a netgame!\n\n"PRESSKEY
+#define ENDGAME	"are you sure you want to end the game?\n\n"PRESSYN
+
+#define DOSY		"(press y to quit to dos.)"
+
+#define DETAILHI	"High detail"
+#define DETAILLO	"Low detail"
+#define GAMMALVL0	"Gamma correction OFF"
+#define GAMMALVL1	"Gamma correction level 1"
+#define GAMMALVL2	"Gamma correction level 2"
+#define GAMMALVL3	"Gamma correction level 3"
+#define GAMMALVL4	"Gamma correction level 4"
+#define EMPTYSTRING	"empty slot"
+
+//
+//	P_inter.C
+//
+#define GOTARMOR	"Picked up the armor."
+#define GOTMEGA	"Picked up the MegaArmor!"
+#define GOTHTHBONUS	"Picked up a health bonus."
+#define GOTARMBONUS	"Picked up an armor bonus."
+#define GOTSTIM	"Picked up a stimpack."
+#define GOTMEDINEED	"Picked up a medikit that you REALLY need!"
+#define GOTMEDIKIT	"Picked up a medikit."
+#define GOTSUPER	"Supercharge!"
+
+#define GOTBLUECARD	"Picked up a blue keycard."
+#define GOTYELWCARD	"Picked up a yellow keycard."
+#define GOTREDCARD	"Picked up a red keycard."
+#define GOTBLUESKUL	"Picked up a blue skull key."
+#define GOTYELWSKUL	"Picked up a yellow skull key."
+#define GOTREDSKULL	"Picked up a red skull key."
+
+#define GOTINVUL	"Invulnerability!"
+#define GOTBERSERK	"Berserk!"
+#define GOTINVIS	"Partial Invisibility"
+#define GOTSUIT	"Radiation Shielding Suit"
+#define GOTMAP	"Computer Area Map"
+#define GOTVISOR	"Light Amplification Visor"
+#define GOTMSPHERE	"MegaSphere!"
+
+#define GOTCLIP	"Picked up a clip."
+#define GOTCLIPBOX	"Picked up a box of bullets."
+#define GOTROCKET	"Picked up a rocket."
+#define GOTROCKBOX	"Picked up a box of rockets."
+#define GOTCELL	"Picked up an energy cell."
+#define GOTCELLBOX	"Picked up an energy cell pack."
+#define GOTSHELLS	"Picked up 4 shotgun shells."
+#define GOTSHELLBOX	"Picked up a box of shotgun shells."
+#define GOTBACKPACK	"Picked up a backpack full of ammo!"
+
+#define GOTBFG9000	"You got the BFG9000!  Oh, yes."
+#define GOTCHAINGUN	"You got the chaingun!"
+#define GOTCHAINSAW	"A chainsaw!  Find some meat!"
+#define GOTLAUNCHER	"You got the rocket launcher!"
+#define GOTPLASMA	"You got the plasma gun!"
+#define GOTSHOTGUN	"You got the shotgun!"
+#define GOTSHOTGUN2	"You got the super shotgun!"
+
+//
+// P_Doors.C
+//
+#define PD_BLUEO	"You need a blue key to activate this object"
+#define PD_REDO	"You need a red key to activate this object"
+#define PD_YELLOWO	"You need a yellow key to activate this object"
+#define PD_BLUEK	"You need a blue key to open this door"
+#define PD_REDK	"You need a red key to open this door"
+#define PD_YELLOWK	"You need a yellow key to open this door"
+
+//
+//	G_game.C
+//
+#define GGSAVED	"game saved."
+
+//
+//	HU_stuff.C
+//
+#define HUSTR_MSGU	"[Message unsent]"
+
+#define HUSTR_E1M1	"E1M1: Hangar"
+#define HUSTR_E1M2	"E1M2: Nuclear Plant"
+#define HUSTR_E1M3	"E1M3: Toxin Refinery"
+#define HUSTR_E1M4	"E1M4: Command Control"
+#define HUSTR_E1M5	"E1M5: Phobos Lab"
+#define HUSTR_E1M6	"E1M6: Central Processing"
+#define HUSTR_E1M7	"E1M7: Computer Station"
+#define HUSTR_E1M8	"E1M8: Phobos Anomaly"
+#define HUSTR_E1M9	"E1M9: Military Base"
+
+#define HUSTR_E2M1	"E2M1: Deimos Anomaly"
+#define HUSTR_E2M2	"E2M2: Containment Area"
+#define HUSTR_E2M3	"E2M3: Refinery"
+#define HUSTR_E2M4	"E2M4: Deimos Lab"
+#define HUSTR_E2M5	"E2M5: Command Center"
+#define HUSTR_E2M6	"E2M6: Halls of the Damned"
+#define HUSTR_E2M7	"E2M7: Spawning Vats"
+#define HUSTR_E2M8	"E2M8: Tower of Babel"
+#define HUSTR_E2M9	"E2M9: Fortress of Mystery"
+
+#define HUSTR_E3M1	"E3M1: Hell Keep"
+#define HUSTR_E3M2	"E3M2: Slough of Despair"
+#define HUSTR_E3M3	"E3M3: Pandemonium"
+#define HUSTR_E3M4	"E3M4: House of Pain"
+#define HUSTR_E3M5	"E3M5: Unholy Cathedral"
+#define HUSTR_E3M6	"E3M6: Mt. Erebus"
+#define HUSTR_E3M7	"E3M7: Limbo"
+#define HUSTR_E3M8	"E3M8: Dis"
+#define HUSTR_E3M9	"E3M9: Warrens"
+
+#define HUSTR_E4M1	"E4M1: Hell Beneath"
+#define HUSTR_E4M2	"E4M2: Perfect Hatred"
+#define HUSTR_E4M3	"E4M3: Sever The Wicked"
+#define HUSTR_E4M4	"E4M4: Unruly Evil"
+#define HUSTR_E4M5	"E4M5: They Will Repent"
+#define HUSTR_E4M6	"E4M6: Against Thee Wickedly"
+#define HUSTR_E4M7	"E4M7: And Hell Followed"
+#define HUSTR_E4M8	"E4M8: Unto The Cruel"
+#define HUSTR_E4M9	"E4M9: Fear"
+
+#define HUSTR_1	"level 1: entryway"
+#define HUSTR_2	"level 2: underhalls"
+#define HUSTR_3	"level 3: the gantlet"
+#define HUSTR_4	"level 4: the focus"
+#define HUSTR_5	"level 5: the waste tunnels"
+#define HUSTR_6	"level 6: the crusher"
+#define HUSTR_7	"level 7: dead simple"
+#define HUSTR_8	"level 8: tricks and traps"
+#define HUSTR_9	"level 9: the pit"
+#define HUSTR_10	"level 10: refueling base"
+#define HUSTR_11	"level 11: 'o' of destruction!"
+
+#define HUSTR_12	"level 12: the factory"
+#define HUSTR_13	"level 13: downtown"
+#define HUSTR_14	"level 14: the inmost dens"
+#define HUSTR_15	"level 15: industrial zone"
+#define HUSTR_16	"level 16: suburbs"
+#define HUSTR_17	"level 17: tenements"
+#define HUSTR_18	"level 18: the courtyard"
+#define HUSTR_19	"level 19: the citadel"
+#define HUSTR_20	"level 20: gotcha!"
+
+#define HUSTR_21	"level 21: nirvana"
+#define HUSTR_22	"level 22: the catacombs"
+#define HUSTR_23	"level 23: barrels o' fun"
+#define HUSTR_24	"level 24: the chasm"
+#define HUSTR_25	"level 25: bloodfalls"
+#define HUSTR_26	"level 26: the abandoned mines"
+#define HUSTR_27	"level 27: monster condo"
+#define HUSTR_28	"level 28: the spirit world"
+#define HUSTR_29	"level 29: the living end"
+#define HUSTR_30	"level 30: icon of sin"
+
+#define HUSTR_31	"level 31: wolfenstein"
+#define HUSTR_32	"level 32: grosse"
+
+#define PHUSTR_1	"level 1: congo"
+#define PHUSTR_2	"level 2: well of souls"
+#define PHUSTR_3	"level 3: aztec"
+#define PHUSTR_4	"level 4: caged"
+#define PHUSTR_5	"level 5: ghost town"
+#define PHUSTR_6	"level 6: baron's lair"
+#define PHUSTR_7	"level 7: caughtyard"
+#define PHUSTR_8	"level 8: realm"
+#define PHUSTR_9	"level 9: abattoire"
+#define PHUSTR_10	"level 10: onslaught"
+#define PHUSTR_11	"level 11: hunted"
+
+#define PHUSTR_12	"level 12: speed"
+#define PHUSTR_13	"level 13: the crypt"
+#define PHUSTR_14	"level 14: genesis"
+#define PHUSTR_15	"level 15: the twilight"
+#define PHUSTR_16	"level 16: the omen"
+#define PHUSTR_17	"level 17: compound"
+#define PHUSTR_18	"level 18: neurosphere"
+#define PHUSTR_19	"level 19: nme"
+#define PHUSTR_20	"level 20: the death domain"
+
+#define PHUSTR_21	"level 21: slayer"
+#define PHUSTR_22	"level 22: impossible mission"
+#define PHUSTR_23	"level 23: tombstone"
+#define PHUSTR_24	"level 24: the final frontier"
+#define PHUSTR_25	"level 25: the temple of darkness"
+#define PHUSTR_26	"level 26: bunker"
+#define PHUSTR_27	"level 27: anti-christ"
+#define PHUSTR_28	"level 28: the sewers"
+#define PHUSTR_29	"level 29: odyssey of noises"
+#define PHUSTR_30	"level 30: the gateway of hell"
+
+#define PHUSTR_31	"level 31: cyberden"
+#define PHUSTR_32	"level 32: go 2 it"
+
+#define THUSTR_1	"level 1: system control"
+#define THUSTR_2	"level 2: human bbq"
+#define THUSTR_3	"level 3: power control"
+#define THUSTR_4	"level 4: wormhole"
+#define THUSTR_5	"level 5: hanger"
+#define THUSTR_6	"level 6: open season"
+#define THUSTR_7	"level 7: prison"
+#define THUSTR_8	"level 8: metal"
+#define THUSTR_9	"level 9: stronghold"
+#define THUSTR_10	"level 10: redemption"
+#define THUSTR_11	"level 11: storage facility"
+
+#define THUSTR_12	"level 12: crater"
+#define THUSTR_13	"level 13: nukage processing"
+#define THUSTR_14	"level 14: steel works"
+#define THUSTR_15	"level 15: dead zone"
+#define THUSTR_16	"level 16: deepest reaches"
+#define THUSTR_17	"level 17: processing area"
+#define THUSTR_18	"level 18: mill"
+#define THUSTR_19	"level 19: shipping/respawning"
+#define THUSTR_20	"level 20: central processing"
+
+#define THUSTR_21	"level 21: administration center"
+#define THUSTR_22	"level 22: habitat"
+#define THUSTR_23	"level 23: lunar mining project"
+#define THUSTR_24	"level 24: quarry"
+#define THUSTR_25	"level 25: baron's den"
+#define THUSTR_26	"level 26: ballistyx"
+#define THUSTR_27	"level 27: mount pain"
+#define THUSTR_28	"level 28: heck"
+#define THUSTR_29	"level 29: river styx"
+#define THUSTR_30	"level 30: last call"
+
+#define THUSTR_31	"level 31: pharaoh"
+#define THUSTR_32	"level 32: caribbean"
+
+#define HUSTR_CHATMACRO1	"I'm ready to kick butt!"
+#define HUSTR_CHATMACRO2	"I'm OK."
+#define HUSTR_CHATMACRO3	"I'm not looking too good!"
+#define HUSTR_CHATMACRO4	"Help!"
+#define HUSTR_CHATMACRO5	"You suck!"
+#define HUSTR_CHATMACRO6	"Next time, scumbag..."
+#define HUSTR_CHATMACRO7	"Come here!"
+#define HUSTR_CHATMACRO8	"I'll take care of it."
+#define HUSTR_CHATMACRO9	"Yes"
+#define HUSTR_CHATMACRO0	"No"
+
+#define HUSTR_TALKTOSELF1	"You mumble to yourself"
+#define HUSTR_TALKTOSELF2	"Who's there?"
+#define HUSTR_TALKTOSELF3	"You scare yourself"
+#define HUSTR_TALKTOSELF4	"You start to rave"
+#define HUSTR_TALKTOSELF5	"You've lost it..."
+
+#define HUSTR_MESSAGESENT	"[Message Sent]"
+
+// The following should NOT be changed unless it seems
+// just AWFULLY necessary
+
+#define HUSTR_PLRGREEN	"Green: "
+#define HUSTR_PLRINDIGO	"Indigo: "
+#define HUSTR_PLRBROWN	"Brown: "
+#define HUSTR_PLRRED		"Red: "
+
+#define HUSTR_KEYGREEN	'g'
+#define HUSTR_KEYINDIGO	'i'
+#define HUSTR_KEYBROWN	'b'
+#define HUSTR_KEYRED	'r'
+
+//
+//	AM_map.C
+//
+
+#define AMSTR_FOLLOWON	"Follow Mode ON"
+#define AMSTR_FOLLOWOFF	"Follow Mode OFF"
+
+#define AMSTR_GRIDON	"Grid ON"
+#define AMSTR_GRIDOFF	"Grid OFF"
+
+#define AMSTR_MARKEDSPOT	"Marked Spot"
+#define AMSTR_MARKSCLEARED	"All Marks Cleared"
+
+//
+//	ST_stuff.C
+//
+
+#define STSTR_MUS		"Music Change"
+#define STSTR_NOMUS		"IMPOSSIBLE SELECTION"
+#define STSTR_DQDON		"Degreelessness Mode On"
+#define STSTR_DQDOFF	"Degreelessness Mode Off"
+
+#define STSTR_KFAADDED	"Very Happy Ammo Added"
+#define STSTR_FAADDED	"Ammo (no keys) Added"
+
+#define STSTR_NCON		"No Clipping Mode ON"
+#define STSTR_NCOFF		"No Clipping Mode OFF"
+
+#define STSTR_BEHOLD	"inVuln, Str, Inviso, Rad, Allmap, or Lite-amp"
+#define STSTR_BEHOLDX	"Power-up Toggled"
+
+#define STSTR_CHOPPERS	"... doesn't suck - GM"
+#define STSTR_CLEV		"Changing Level..."
+
+//
+//	F_Finale.C
+//
+#define E1TEXT \
+"Once you beat the big badasses and\n"\
+"clean out the moon base you're supposed\n"\
+"to win, aren't you? Aren't you? Where's\n"\
+"your fat reward and ticket home? What\n"\
+"the hell is this? It's not supposed to\n"\
+"end this way!\n"\
+"\n" \
+"It stinks like rotten meat, but looks\n"\
+"like the lost Deimos base.  Looks like\n"\
+"you're stuck on The Shores of Hell.\n"\
+"The only way out is through.\n"\
+"\n"\
+"To continue the DOOM experience, play\n"\
+"The Shores of Hell and its amazing\n"\
+"sequel, Inferno!\n"
+
+
+#define E2TEXT \
+"You've done it! The hideous cyber-\n"\
+"demon lord that ruled the lost Deimos\n"\
+"moon base has been slain and you\n"\
+"are triumphant! But ... where are\n"\
+"you? You clamber to the edge of the\n"\
+"moon and look down to see the awful\n"\
+"truth.\n" \
+"\n"\
+"Deimos floats above Hell itself!\n"\
+"You've never heard of anyone escaping\n"\
+"from Hell, but you'll make the bastards\n"\
+"sorry they ever heard of you! Quickly,\n"\
+"you rappel down to  the surface of\n"\
+"Hell.\n"\
+"\n" \
+"Now, it's on to the final chapter of\n"\
+"DOOM! -- Inferno."
+
+
+#define E3TEXT \
+"The loathsome spiderdemon that\n"\
+"masterminded the invasion of the moon\n"\
+"bases and caused so much death has had\n"\
+"its ass kicked for all time.\n"\
+"\n"\
+"A hidden doorway opens and you enter.\n"\
+"You've proven too tough for Hell to\n"\
+"contain, and now Hell at last plays\n"\
+"fair -- for you emerge from the door\n"\
+"to see the green fields of Earth!\n"\
+"Home at last.\n" \
+"\n"\
+"You wonder what's been happening on\n"\
+"Earth while you were battling evil\n"\
+"unleashed. It's good that no Hell-\n"\
+"spawn could have come through that\n"\
+"door with you ..."
+
+
+#define E4TEXT \
+"the spider mastermind must have sent forth\n"\
+"its legions of hellspawn before your\n"\
+"final confrontation with that terrible\n"\
+"beast from hell.  but you stepped forward\n"\
+"and brought forth eternal damnation and\n"\
+"suffering upon the horde as a true hero\n"\
+"would in the face of something so evil.\n"\
+"\n"\
+"besides, someone was gonna pay for what\n"\
+"happened to daisy, your pet rabbit.\n"\
+"\n"\
+"but now, you see spread before you more\n"\
+"potential pain and gibbitude as a nation\n"\
+"of demons run amok among our cities.\n"\
+"\n"\
+"next stop, hell on earth!"
+
+
+// after level 6, put this:
+
+#define C1TEXT \
+"YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
+"STARPORT. BUT SOMETHING IS WRONG. THE\n" \
+"MONSTERS HAVE BROUGHT THEIR OWN REALITY\n" \
+"WITH THEM, AND THE STARPORT'S TECHNOLOGY\n" \
+"IS BEING SUBVERTED BY THEIR PRESENCE.\n" \
+"\n"\
+"AHEAD, YOU SEE AN OUTPOST OF HELL, A\n" \
+"FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n" \
+"YOU CAN PENETRATE INTO THE HAUNTED HEART\n" \
+"OF THE STARBASE AND FIND THE CONTROLLING\n" \
+"SWITCH WHICH HOLDS EARTH'S POPULATION\n" \
+"HOSTAGE."
+
+// After level 11, put this:
+
+#define C2TEXT \
+"YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
+"HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"\
+"THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"\
+"HUMAN LEFT ON THE FACE OF THE PLANET.\n"\
+"CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"\
+"AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"\
+"YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"\
+"THAT YOU HAVE SAVED YOUR SPECIES.\n"\
+"\n"\
+"BUT THEN, EARTH CONTROL BEAMS DOWN A\n"\
+"MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"\
+"THE SOURCE OF THE ALIEN INVASION. IF YOU\n"\
+"GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"\
+"ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"\
+"YOUR OWN HOME CITY, NOT FAR FROM THE\n"\
+"STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"\
+"UP AND RETURN TO THE FRAY."
+
+
+// After level 20, put this:
+
+#define C3TEXT \
+"YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
+"SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"\
+"YOU SEE NO WAY TO DESTROY THE CREATURES'\n"\
+"ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"\
+"TEETH AND PLUNGE THROUGH IT.\n"\
+"\n"\
+"THERE MUST BE A WAY TO CLOSE IT ON THE\n"\
+"OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"\
+"GOT TO GO THROUGH HELL TO GET TO IT?"
+
+
+// After level 29, put this:
+
+#define C4TEXT \
+"THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
+"DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"\
+"YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"\
+"HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"\
+"UP AND DIES, ITS THRASHING LIMBS\n"\
+"DEVASTATING UNTOLD MILES OF HELL'S\n"\
+"SURFACE.\n"\
+"\n"\
+"YOU'VE DONE IT. THE INVASION IS OVER.\n"\
+"EARTH IS SAVED. HELL IS A WRECK. YOU\n"\
+"WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"\
+"DIE, NOW. WIPING THE SWEAT FROM YOUR\n"\
+"FOREHEAD YOU BEGIN THE LONG TREK BACK\n"\
+"HOME. REBUILDING EARTH OUGHT TO BE A\n"\
+"LOT MORE FUN THAN RUINING IT WAS.\n"
+
+
+
+// Before level 31, put this:
+
+#define C5TEXT \
+"CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
+"LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"\
+"HUMANS, RATHER THAN DEMONS. YOU WONDER\n"\
+"WHO THE INMATES OF THIS CORNER OF HELL\n"\
+"WILL BE."
+
+
+// Before level 32, put this:
+
+#define C6TEXT \
+"CONGRATULATIONS, YOU'VE FOUND THE\n"\
+"SUPER SECRET LEVEL!  YOU'D BETTER\n"\
+"BLAZE THROUGH THIS ONE!\n"
+
+
+// after map 06	
+
+#define P1TEXT  \
+"You gloat over the steaming carcass of the\n"\
+"Guardian.  With its death, you've wrested\n"\
+"the Accelerator from the stinking claws\n"\
+"of Hell.  You relax and glance around the\n"\
+"room.  Damn!  There was supposed to be at\n"\
+"least one working prototype, but you can't\n"\
+"see it. The demons must have taken it.\n"\
+"\n"\
+"You must find the prototype, or all your\n"\
+"struggles will have been wasted. Keep\n"\
+"moving, keep fighting, keep killing.\n"\
+"Oh yes, keep living, too."
+
+
+// after map 11
+
+#define P2TEXT \
+"Even the deadly Arch-Vile labyrinth could\n"\
+"not stop you, and you've gotten to the\n"\
+"prototype Accelerator which is soon\n"\
+"efficiently and permanently deactivated.\n"\
+"\n"\
+"You're good at that kind of thing."
+
+
+// after map 20
+
+#define P3TEXT \
+"You've bashed and battered your way into\n"\
+"the heart of the devil-hive.  Time for a\n"\
+"Search-and-Destroy mission, aimed at the\n"\
+"Gatekeeper, whose foul offspring is\n"\
+"cascading to Earth.  Yeah, he's bad. But\n"\
+"you know who's worse!\n"\
+"\n"\
+"Grinning evilly, you check your gear, and\n"\
+"get ready to give the bastard a little Hell\n"\
+"of your own making!"
+
+// after map 30
+
+#define P4TEXT \
+"The Gatekeeper's evil face is splattered\n"\
+"all over the place.  As its tattered corpse\n"\
+"collapses, an inverted Gate forms and\n"\
+"sucks down the shards of the last\n"\
+"prototype Accelerator, not to mention the\n"\
+"few remaining demons.  You're done. Hell\n"\
+"has gone back to pounding bad dead folks \n"\
+"instead of good live ones.  Remember to\n"\
+"tell your grandkids to put a rocket\n"\
+"launcher in your coffin. If you go to Hell\n"\
+"when you die, you'll need it for some\n"\
+"final cleaning-up ..."
+
+// before map 31
+
+#define P5TEXT \
+"You've found the second-hardest level we\n"\
+"got. Hope you have a saved game a level or\n"\
+"two previous.  If not, be prepared to die\n"\
+"aplenty. For master marines only."
+
+// before map 32
+
+#define P6TEXT \
+"Betcha wondered just what WAS the hardest\n"\
+"level we had ready for ya?  Now you know.\n"\
+"No one gets out alive."
+
+
+#define T1TEXT \
+"You've fought your way out of the infested\n"\
+"experimental labs.   It seems that UAC has\n"\
+"once again gulped it down.  With their\n"\
+"high turnover, it must be hard for poor\n"\
+"old UAC to buy corporate health insurance\n"\
+"nowadays..\n"\
+"\n"\
+"Ahead lies the military complex, now\n"\
+"swarming with diseased horrors hot to get\n"\
+"their teeth into you. With luck, the\n"\
+"complex still has some warlike ordnance\n"\
+"laying around."
+
+
+#define T2TEXT \
+"You hear the grinding of heavy machinery\n"\
+"ahead.  You sure hope they're not stamping\n"\
+"out new hellspawn, but you're ready to\n"\
+"ream out a whole herd if you have to.\n"\
+"They might be planning a blood feast, but\n"\
+"you feel about as mean as two thousand\n"\
+"maniacs packed into one mad killer.\n"\
+"\n"\
+"You don't plan to go down easy."
+
+
+#define T3TEXT \
+"The vista opening ahead looks real damn\n"\
+"familiar. Smells familiar, too -- like\n"\
+"fried excrement. You didn't like this\n"\
+"place before, and you sure as hell ain't\n"\
+"planning to like it now. The more you\n"\
+"brood on it, the madder you get.\n"\
+"Hefting your gun, an evil grin trickles\n"\
+"onto your face. Time to take some names."
+
+#define T4TEXT \
+"Suddenly, all is silent, from one horizon\n"\
+"to the other. The agonizing echo of Hell\n"\
+"fades away, the nightmare sky turns to\n"\
+"blue, the heaps of monster corpses start \n"\
+"to evaporate along with the evil stench \n"\
+"that filled the air. Jeeze, maybe you've\n"\
+"done it. Have you really won?\n"\
+"\n"\
+"Something rumbles in the distance.\n"\
+"A blue light begins to glow inside the\n"\
+"ruined skull of the demon-spitter."
+
+
+#define T5TEXT \
+"What now? Looks totally different. Kind\n"\
+"of like King Tut's condo. Well,\n"\
+"whatever's here can't be any worse\n"\
+"than usual. Can it?  Or maybe it's best\n"\
+"to let sleeping gods lie.."
+
+
+#define T6TEXT \
+"Time for a vacation. You've burst the\n"\
+"bowels of hell and by golly you're ready\n"\
+"for a break. You mutter to yourself,\n"\
+"Maybe someone else can kick Hell's ass\n"\
+"next time around. Ahead lies a quiet town,\n"\
+"with peaceful flowing water, quaint\n"\
+"buildings, and presumably no Hellspawn.\n"\
+"\n"\
+"As you step off the transport, you hear\n"\
+"the stomp of a cyberdemon's iron shoe."
+
+
+
+//
+// Character cast strings F_FINALE.C
+//
+#define CC_ZOMBIE	"ZOMBIEMAN"
+#define CC_SHOTGUN	"SHOTGUN GUY"
+#define CC_HEAVY	"HEAVY WEAPON DUDE"
+#define CC_IMP	"IMP"
+#define CC_DEMON	"DEMON"
+#define CC_LOST	"LOST SOUL"
+#define CC_CACO	"CACODEMON"
+#define CC_HELL	"HELL KNIGHT"
+#define CC_BARON	"BARON OF HELL"
+#define CC_ARACH	"ARACHNOTRON"
+#define CC_PAIN	"PAIN ELEMENTAL"
+#define CC_REVEN	"REVENANT"
+#define CC_MANCU	"MANCUBUS"
+#define CC_ARCH	"ARCH-VILE"
+#define CC_SPIDER	"THE SPIDER MASTERMIND"
+#define CC_CYBER	"THE CYBERDEMON"
+#define CC_HERO	"OUR HERO"
+
+
+#endif
diff --git a/games/NXDoom/src/doom/d_items.c b/games/NXDoom/src/doom/d_items.c
new file mode 100644
index 000000000..33f310c63
--- /dev/null
+++ b/games/NXDoom/src/doom/d_items.c
@@ -0,0 +1,128 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+
+
+// We are referring to sprite numbers.
+#include "info.h"
+
+#include "d_items.h"
+
+
+//
+// PSPRITE ACTIONS for waepons.
+// This struct controls the weapon animations.
+//
+// Each entry is:
+//   ammo/amunition type
+//  upstate
+//  downstate
+// readystate
+// atkstate, i.e. attack/fire/hit frame
+// flashstate, muzzle flash
+//
+weaponinfo_t	weaponinfo[NUMWEAPONS] =
+{
+    {
+	// fist
+	am_noammo,
+	S_PUNCHUP,
+	S_PUNCHDOWN,
+	S_PUNCH,
+	S_PUNCH1,
+	S_NULL
+    },	
+    {
+	// pistol
+	am_clip,
+	S_PISTOLUP,
+	S_PISTOLDOWN,
+	S_PISTOL,
+	S_PISTOL1,
+	S_PISTOLFLASH
+    },	
+    {
+	// shotgun
+	am_shell,
+	S_SGUNUP,
+	S_SGUNDOWN,
+	S_SGUN,
+	S_SGUN1,
+	S_SGUNFLASH1
+    },
+    {
+	// chaingun
+	am_clip,
+	S_CHAINUP,
+	S_CHAINDOWN,
+	S_CHAIN,
+	S_CHAIN1,
+	S_CHAINFLASH1
+    },
+    {
+	// missile launcher
+	am_misl,
+	S_MISSILEUP,
+	S_MISSILEDOWN,
+	S_MISSILE,
+	S_MISSILE1,
+	S_MISSILEFLASH1
+    },
+    {
+	// plasma rifle
+	am_cell,
+	S_PLASMAUP,
+	S_PLASMADOWN,
+	S_PLASMA,
+	S_PLASMA1,
+	S_PLASMAFLASH1
+    },
+    {
+	// bfg 9000
+	am_cell,
+	S_BFGUP,
+	S_BFGDOWN,
+	S_BFG,
+	S_BFG1,
+	S_BFGFLASH1
+    },
+    {
+	// chainsaw
+	am_noammo,
+	S_SAWUP,
+	S_SAWDOWN,
+	S_SAW,
+	S_SAW1,
+	S_NULL
+    },
+    {
+	// super shotgun
+	am_shell,
+	S_DSGUNUP,
+	S_DSGUNDOWN,
+	S_DSGUN,
+	S_DSGUN1,
+	S_DSGUNFLASH1
+    },	
+};
+
+
+
+
+
+
+
+
diff --git a/games/NXDoom/src/doom/d_items.h b/games/NXDoom/src/doom/d_items.h
new file mode 100644
index 000000000..3d22a0630
--- /dev/null
+++ b/games/NXDoom/src/doom/d_items.h
@@ -0,0 +1,41 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Items: key cards, artifacts, weapon, ammunition.
+//
+
+
+#ifndef __D_ITEMS__
+#define __D_ITEMS__
+
+#include "doomdef.h"
+
+
+
+// Weapon info: sprite frames, ammunition use.
+typedef struct
+{
+    ammotype_t	ammo;
+    int		upstate;
+    int		downstate;
+    int		readystate;
+    int		atkstate;
+    int		flashstate;
+
+} weaponinfo_t;
+
+extern  weaponinfo_t    weaponinfo[NUMWEAPONS];
+
+#endif
diff --git a/games/NXDoom/src/doom/d_main.c b/games/NXDoom/src/doom/d_main.c
new file mode 100644
index 000000000..014e48721
--- /dev/null
+++ b/games/NXDoom/src/doom/d_main.c
@@ -0,0 +1,2002 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM main program (D_DoomMain) and game loop (D_DoomLoop),
+//	plus functions to determine game mode (shareware, registered),
+//	parse command line parameters, configure game parameters (turbo),
+//	and call the startup functions.
+//
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "deh_main.h"
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "dstrings.h"
+#include "sounds.h"
+
+#include "d_iwad.h"
+
+#include "z_zone.h"
+#include "w_main.h"
+#include "w_wad.h"
+#include "s_sound.h"
+#include "v_diskicon.h"
+#include "v_video.h"
+
+#include "f_finale.h"
+#include "f_wipe.h"
+
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "p_saveg.h"
+
+#include "i_endoom.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+
+#include "g_game.h"
+
+#include "hu_stuff.h"
+#include "wi_stuff.h"
+#include "st_stuff.h"
+#include "am_map.h"
+#include "net_client.h"
+#include "net_dedicated.h"
+#include "net_query.h"
+
+#include "p_setup.h"
+#include "r_local.h"
+#include "statdump.h"
+
+#include "d_main.h"
+
+#include "doom_icon.c"
+
+//
+// D-DoomLoop()
+// Not a globally visible function,
+//  just included for source reference,
+//  called by D_DoomMain, never exits.
+// Manages timing and IO,
+//  calls all ?_Responder, ?_Ticker, and ?_Drawer,
+//  calls I_GetTime, I_StartFrame, and I_StartTic
+//
+void D_DoomLoop (void);
+
+static char *gamedescription;
+
+// Location where savegames are stored
+
+char *          savegamedir;
+
+// location of IWAD and WAD files
+
+char *          iwadfile;
+
+
+boolean		devparm;	// started game with -devparm
+boolean         nomonsters;	// checkparm of -nomonsters
+boolean         respawnparm;	// checkparm of -respawn
+boolean         fastparm;	// checkparm of -fast
+
+
+
+skill_t		startskill;
+int             startepisode;
+int		startmap;
+boolean		autostart;
+int             startloadgame;
+
+boolean		advancedemo;
+
+// Store demo, do not accept any inputs
+boolean         storedemo;
+
+// If true, the main game loop has started.
+boolean         main_loop_started = false;
+
+int             show_endoom = 1;
+int             show_diskicon = 1;
+
+
+void D_ConnectNetGame(void);
+void D_CheckNetGame(void);
+
+
+//
+// D_ProcessEvents
+// Send all the events of the given timestamp down the responder chain
+//
+void D_ProcessEvents (void)
+{
+    event_t*	ev;
+	
+    // IF STORE DEMO, DO NOT ACCEPT INPUT
+    if (storedemo)
+        return;
+	
+    while ((ev = D_PopEvent()) != NULL)
+    {
+	if (M_Responder (ev))
+	    continue;               // menu ate the event
+	G_Responder (ev);
+    }
+}
+
+
+
+
+//
+// D_Display
+//  draw current display, possibly wiping it from the previous
+//
+
+// wipegamestate can be set to -1 to force a wipe on the next draw
+gamestate_t     wipegamestate = GS_DEMOSCREEN;
+
+boolean D_Display (void)
+{
+    static  boolean		viewactivestate = false;
+    static  boolean		menuactivestate = false;
+    static  boolean		inhelpscreensstate = false;
+    static  boolean		fullscreen = false;
+    static  gamestate_t		oldgamestate = -1;
+    static  int			borderdrawcount;
+    int				y;
+    boolean			wipe;
+    boolean			redrawsbar;
+		
+    redrawsbar = false;
+    
+    // change the view size if needed
+    if (setsizeneeded)
+    {
+	R_ExecuteSetViewSize ();
+	oldgamestate = -1;                      // force background redraw
+	borderdrawcount = 3;
+    }
+
+    // save the current screen if about to wipe
+    if (gamestate != wipegamestate)
+    {
+	wipe = true;
+	wipe_StartScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+    }
+    else
+	wipe = false;
+
+    if (gamestate == GS_LEVEL && gametic)
+	HU_Erase();
+    
+    // do buffered drawing
+    switch (gamestate)
+    {
+      case GS_LEVEL:
+	if (!gametic)
+	    break;
+	if (automapactive)
+	    AM_Drawer ();
+	if (wipe || (viewheight != SCREENHEIGHT && fullscreen))
+	    redrawsbar = true;
+	if (inhelpscreensstate && !inhelpscreens)
+	    redrawsbar = true;              // just put away the help screen
+	ST_Drawer (viewheight == SCREENHEIGHT, redrawsbar );
+	fullscreen = viewheight == SCREENHEIGHT;
+	break;
+
+      case GS_INTERMISSION:
+	WI_Drawer ();
+	break;
+
+      case GS_FINALE:
+	F_Drawer ();
+	break;
+
+      case GS_DEMOSCREEN:
+	D_PageDrawer ();
+	break;
+    }
+    
+    // draw buffered stuff to screen
+    I_UpdateNoBlit ();
+    
+    // draw the view directly
+    if (gamestate == GS_LEVEL && !automapactive && gametic)
+	R_RenderPlayerView (&players[displayplayer]);
+
+    if (gamestate == GS_LEVEL && gametic)
+	HU_Drawer ();
+    
+    // clean up border stuff
+    if (gamestate != oldgamestate && gamestate != GS_LEVEL)
+	I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
+
+    // see if the border needs to be initially drawn
+    if (gamestate == GS_LEVEL && oldgamestate != GS_LEVEL)
+    {
+	viewactivestate = false;        // view was not active
+	R_FillBackScreen ();    // draw the pattern into the back screen
+    }
+
+    // see if the border needs to be updated to the screen
+    if (gamestate == GS_LEVEL && !automapactive && scaledviewwidth != SCREENWIDTH)
+    {
+	if (menuactive || menuactivestate || !viewactivestate)
+	    borderdrawcount = 3;
+	if (borderdrawcount)
+	{
+	    R_DrawViewBorder ();    // erase old menu stuff
+	    borderdrawcount--;
+	}
+
+    }
+
+    if (testcontrols)
+    {
+        // Box showing current mouse speed
+
+        V_DrawMouseSpeedBox(testcontrols_mousespeed);
+    }
+
+    menuactivestate = menuactive;
+    viewactivestate = viewactive;
+    inhelpscreensstate = inhelpscreens;
+    oldgamestate = wipegamestate = gamestate;
+    
+    // draw pause pic
+    if (paused)
+    {
+	if (automapactive)
+	    y = 4;
+	else
+	    y = viewwindowy+4;
+	V_DrawPatchDirect(viewwindowx + (scaledviewwidth - 68) / 2, y,
+                          W_CacheLumpName (DEH_String("M_PAUSE"), PU_CACHE));
+    }
+
+
+    // menus go directly to the screen
+    M_Drawer ();          // menu is drawn even on top of everything
+    NetUpdate ();         // send out any new accumulation
+
+    return wipe;
+}
+
+static void EnableLoadingDisk(void)
+{
+    const char *disk_lump_name;
+
+    if (show_diskicon)
+    {
+        if (M_CheckParm("-cdrom") > 0)
+        {
+            disk_lump_name = DEH_String("STCDROM");
+        }
+        else
+        {
+            disk_lump_name = DEH_String("STDISK");
+        }
+
+        V_EnableLoadingDisk(disk_lump_name,
+                            SCREENWIDTH - LOADING_DISK_W,
+                            SCREENHEIGHT - LOADING_DISK_H);
+    }
+}
+
+//
+// Add configuration file variable bindings.
+//
+
+
+static const char * const chat_macro_defaults[10] =
+{
+    HUSTR_CHATMACRO0,
+    HUSTR_CHATMACRO1,
+    HUSTR_CHATMACRO2,
+    HUSTR_CHATMACRO3,
+    HUSTR_CHATMACRO4,
+    HUSTR_CHATMACRO5,
+    HUSTR_CHATMACRO6,
+    HUSTR_CHATMACRO7,
+    HUSTR_CHATMACRO8,
+    HUSTR_CHATMACRO9
+};
+
+
+void D_BindVariables(void)
+{
+    int i;
+
+    M_ApplyPlatformDefaults();
+
+    I_BindInputVariables();
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
+
+    M_BindBaseControls();
+    M_BindWeaponControls();
+    M_BindMapControls();
+    M_BindMenuControls();
+    M_BindChatControls(MAXPLAYERS);
+
+    key_multi_msgplayer[0] = HUSTR_KEYGREEN;
+    key_multi_msgplayer[1] = HUSTR_KEYINDIGO;
+    key_multi_msgplayer[2] = HUSTR_KEYBROWN;
+    key_multi_msgplayer[3] = HUSTR_KEYRED;
+
+    NET_BindVariables();
+
+    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
+    M_BindIntVariable("sfx_volume",             &sfxVolume);
+    M_BindIntVariable("music_volume",           &musicVolume);
+    M_BindIntVariable("show_messages",          &showMessages);
+    M_BindIntVariable("screenblocks",           &screenblocks);
+    M_BindIntVariable("detaillevel",            &detailLevel);
+    M_BindIntVariable("snd_channels",           &snd_channels);
+    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
+    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
+    M_BindIntVariable("show_endoom",            &show_endoom);
+    M_BindIntVariable("show_diskicon",          &show_diskicon);
+
+    // Multiplayer chat macros
+
+    for (i=0; i<10; ++i)
+    {
+        char buf[12];
+
+        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
+        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
+        M_BindStringVariable(buf, &chat_macros[i]);
+    }
+}
+
+//
+// D_GrabMouseCallback
+//
+// Called to determine whether to grab the mouse pointer
+//
+
+boolean D_GrabMouseCallback(void)
+{
+    // Drone players don't need mouse focus
+
+    if (drone)
+        return false;
+
+    // when menu is active or game is paused, release the mouse 
+ 
+    if (menuactive || paused)
+        return false;
+
+    // only grab mouse when playing levels (but not demos)
+
+    return (gamestate == GS_LEVEL) && !demoplayback && !advancedemo;
+}
+
+//
+//  D_RunFrame
+//
+void D_RunFrame()
+{
+    int nowtime;
+    int tics;
+    static int wipestart;
+    static boolean wipe;
+
+    if (wipe)
+    {
+        do
+        {
+            nowtime = I_GetTime ();
+            tics = nowtime - wipestart;
+            I_Sleep(1);
+        } while (tics <= 0);
+
+        wipestart = nowtime;
+        wipe = !wipe_ScreenWipe(wipe_Melt
+                               , 0, 0, SCREENWIDTH, SCREENHEIGHT, tics);
+        I_UpdateNoBlit ();
+        M_Drawer ();                            // menu is drawn even on top of wipes
+        I_FinishUpdate ();                      // page flip or blit buffer
+        return;
+    }
+
+    // frame syncronous IO operations
+    I_StartFrame ();
+
+    TryRunTics (); // will run at least one tic
+
+    S_UpdateSounds (players[consoleplayer].mo);// move positional sounds
+
+    // Update display, next frame, with current state if no profiling is on
+    if (screenvisible && !nodrawers)
+    {
+        if ((wipe = D_Display ()))
+        {
+            // start wipe on this frame
+            wipe_EndScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+            wipestart = I_GetTime () - 1;
+        } else {
+            // normal update
+            I_FinishUpdate ();              // page flip or blit buffer
+        }
+    }
+}
+
+//
+//  D_DoomLoop
+//
+void D_DoomLoop (void)
+{
+    if (gamevariant == bfgedition &&
+        (demorecording || (gameaction == ga_playdemo) || netgame))
+    {
+        printf(" WARNING: You are playing using one of the Doom Classic\n"
+               " IWAD files shipped with the Doom 3: BFG Edition. These are\n"
+               " known to be incompatible with the regular IWAD files and\n"
+               " may cause demos and network games to get out of sync.\n");
+    }
+
+    if (demorecording)
+	G_BeginRecording ();
+
+    main_loop_started = true;
+
+    I_SetWindowTitle(gamedescription);
+    I_GraphicsCheckCommandLine();
+    I_SetGrabMouseCallback(D_GrabMouseCallback);
+    I_RegisterWindowIcon(doom_icon_data, doom_icon_w, doom_icon_h);
+    I_InitGraphics();
+    EnableLoadingDisk();
+
+    TryRunTics();
+
+    V_RestoreBuffer();
+    R_ExecuteSetViewSize();
+
+    D_StartGameLoop();
+
+    if (testcontrols)
+    {
+        wipegamestate = gamestate;
+    }
+
+    while (1)
+    {
+        D_RunFrame();
+    }
+}
+
+
+
+//
+//  DEMO LOOP
+//
+int             demosequence;
+int             pagetic;
+const char                    *pagename;
+
+
+//
+// D_PageTicker
+// Handles timing for warped projection
+//
+void D_PageTicker (void)
+{
+    if (--pagetic < 0)
+	D_AdvanceDemo ();
+}
+
+
+
+//
+// D_PageDrawer
+//
+void D_PageDrawer (void)
+{
+    V_DrawPatch (0, 0, W_CacheLumpName(pagename, PU_CACHE));
+}
+
+
+//
+// D_AdvanceDemo
+// Called after each demo or intro demosequence finishes
+//
+void D_AdvanceDemo (void)
+{
+    advancedemo = true;
+}
+
+
+//
+// This cycles through the demo sequences.
+// FIXME - version dependend demo numbers?
+//
+void D_DoAdvanceDemo (void)
+{
+    players[consoleplayer].playerstate = PST_LIVE;  // not reborn
+    advancedemo = false;
+    usergame = false;               // no save / end game here
+    paused = false;
+    gameaction = ga_nothing;
+
+    // The Ultimate Doom executable changed the demo sequence to add
+    // a DEMO4 demo.  Final Doom was based on Ultimate, so also
+    // includes this change; however, the Final Doom IWADs do not
+    // include a DEMO4 lump, so the game bombs out with an error
+    // when it reaches this point in the demo sequence.
+
+    // However! There is an alternate version of Final Doom that
+    // includes a fixed executable.
+
+    if (gameversion == exe_ultimate || gameversion == exe_final)
+      demosequence = (demosequence+1)%7;
+    else
+      demosequence = (demosequence+1)%6;
+    
+    switch (demosequence)
+    {
+      case 0:
+	if ( gamemode == commercial )
+	    pagetic = TICRATE * 11;
+	else
+	    pagetic = 170;
+	gamestate = GS_DEMOSCREEN;
+	pagename = DEH_String("TITLEPIC");
+	if ( gamemode == commercial )
+	  S_StartMusic(mus_dm2ttl);
+	else
+	  S_StartMusic (mus_intro);
+	break;
+      case 1:
+	G_DeferedPlayDemo(DEH_String("demo1"));
+	break;
+      case 2:
+	pagetic = 200;
+	gamestate = GS_DEMOSCREEN;
+	pagename = DEH_String("CREDIT");
+	break;
+      case 3:
+	G_DeferedPlayDemo(DEH_String("demo2"));
+	break;
+      case 4:
+	gamestate = GS_DEMOSCREEN;
+	if ( gamemode == commercial)
+	{
+	    pagetic = TICRATE * 11;
+	    pagename = DEH_String("TITLEPIC");
+	    S_StartMusic(mus_dm2ttl);
+	}
+	else
+	{
+	    pagetic = 200;
+
+	    if (gameversion >= exe_ultimate)
+	      pagename = DEH_String("CREDIT");
+	    else
+	      pagename = DEH_String("HELP2");
+	}
+	break;
+      case 5:
+	G_DeferedPlayDemo(DEH_String("demo3"));
+	break;
+        // THE DEFINITIVE DOOM Special Edition demo
+      case 6:
+	G_DeferedPlayDemo(DEH_String("demo4"));
+	break;
+    }
+
+    // The Doom 3: BFG Edition version of doom2.wad does not have a
+    // TITLETPIC lump. Use INTERPIC instead as a workaround.
+    if (gamevariant == bfgedition && !strcasecmp(pagename, "TITLEPIC")
+        && W_CheckNumForName("titlepic") < 0)
+    {
+        pagename = DEH_String("INTERPIC");
+    }
+}
+
+
+
+//
+// D_StartTitle
+//
+void D_StartTitle (void)
+{
+    gameaction = ga_nothing;
+    demosequence = -1;
+    D_AdvanceDemo ();
+}
+
+// Strings for dehacked replacements of the startup banner
+//
+// These are from the original source: some of them are perhaps
+// not used in any dehacked patches
+
+static const char *banners[] =
+{
+    // doom2.wad
+    "                         "
+    "DOOM 2: Hell on Earth v%i.%i"
+    "                           ",
+    // doom2.wad v1.666
+    "                         "
+    "DOOM 2: Hell on Earth v%i.%i66"
+    "                          ",
+    // doom1.wad
+    "                            "
+    "DOOM Shareware Startup v%i.%i"
+    "                           ",
+    // doom.wad
+    "                            "
+    "DOOM Registered Startup v%i.%i"
+    "                           ",
+    // Registered DOOM uses this
+    "                          "
+    "DOOM System Startup v%i.%i"
+    "                          ",
+    // Doom v1.666
+    "                          "
+    "DOOM System Startup v%i.%i66"
+    "                          "
+    // doom.wad (Ultimate DOOM)
+    "                         "
+    "The Ultimate DOOM Startup v%i.%i"
+    "                        ",
+    // tnt.wad
+    "                     "
+    "DOOM 2: TNT - Evilution v%i.%i"
+    "                           ",
+    // plutonia.wad
+    "                   "
+    "DOOM 2: Plutonia Experiment v%i.%i"
+    "                           ",
+};
+
+//
+// Get game name: if the startup banner has been replaced, use that.
+// Otherwise, use the name given
+// 
+
+static char *GetGameName(const char *gamename)
+{
+    size_t i;
+
+    for (i=0; i<arrlen(banners); ++i)
+    {
+        const char *deh_sub;
+        // Has the banner been replaced?
+
+        deh_sub = DEH_String(banners[i]);
+
+        if (deh_sub != banners[i])
+        {
+            size_t gamename_size;
+            int version;
+            char *deh_gamename;
+
+            // Has been replaced.
+            // We need to expand via printf to include the Doom version number
+            // We also need to cut off spaces to get the basic name
+
+            gamename_size = strlen(deh_sub) + 10;
+            deh_gamename = malloc(gamename_size);
+            if (deh_gamename == NULL)
+            {
+                I_Error("GetGameName: Failed to allocate new string");
+            }
+            version = G_VanillaVersionCode();
+            DEH_snprintf(deh_gamename, gamename_size, banners[i],
+                         version / 100, version % 100);
+
+            while (deh_gamename[0] != '\0' && isspace(deh_gamename[0]))
+            {
+                memmove(deh_gamename, deh_gamename + 1, gamename_size - 1);
+            }
+
+            while (deh_gamename[0] != '\0' && isspace(deh_gamename[strlen(deh_gamename)-1]))
+            {
+                deh_gamename[strlen(deh_gamename) - 1] = '\0';
+            }
+
+            return deh_gamename;
+        }
+    }
+
+    return M_StringDuplicate(gamename);
+}
+
+static void SetMissionForPackName(const char *pack_name)
+{
+    int i;
+    static const struct
+    {
+        const char *name;
+        int mission;
+    } packs[] = {
+        { "doom2",    doom2 },
+        { "tnt",      pack_tnt },
+        { "plutonia", pack_plut },
+    };
+
+    for (i = 0; i < arrlen(packs); ++i)
+    {
+        if (!strcasecmp(pack_name, packs[i].name))
+        {
+            gamemission = packs[i].mission;
+            return;
+        }
+    }
+
+    printf("Valid mission packs are:\n");
+
+    for (i = 0; i < arrlen(packs); ++i)
+    {
+        printf("\t%s\n", packs[i].name);
+    }
+
+    I_Error("Unknown mission pack name: %s", pack_name);
+}
+
+//
+// Find out what version of Doom is playing.
+//
+
+void D_IdentifyVersion(void)
+{
+    // gamemission is set up by the D_FindIWAD function.  But if 
+    // we specify '-iwad', we have to identify using 
+    // IdentifyIWADByName.  However, if the iwad does not match
+    // any known IWAD name, we may have a dilemma.  Try to 
+    // identify by its contents.
+
+    if (gamemission == none)
+    {
+        unsigned int i;
+
+        for (i=0; i<numlumps; ++i)
+        {
+            if (!strncasecmp(lumpinfo[i]->name, "MAP01", 8))
+            {
+                gamemission = doom2;
+                break;
+            } 
+            else if (!strncasecmp(lumpinfo[i]->name, "E1M1", 8))
+            {
+                gamemission = doom;
+                break;
+            }
+        }
+
+        if (gamemission == none)
+        {
+            // Still no idea.  I don't think this is going to work.
+
+            I_Error("Unknown or invalid IWAD file.");
+        }
+    }
+
+    // Make sure gamemode is set up correctly
+
+    if (logical_gamemission == doom)
+    {
+        // Doom 1.  But which version?
+
+        if (W_CheckNumForName("E4M1") > 0)
+        {
+            // Ultimate Doom
+
+            gamemode = retail;
+        } 
+        else if (W_CheckNumForName("E3M1") > 0)
+        {
+            gamemode = registered;
+        }
+        else
+        {
+            gamemode = shareware;
+        }
+    }
+    else
+    {
+        int p;
+
+        // Doom 2 of some kind.
+        gamemode = commercial;
+
+        // We can manually override the gamemission that we got from the
+        // IWAD detection code. This allows us to eg. play Plutonia 2
+        // with Freedoom and get the right level names.
+
+        //!
+        // @category compat
+        // @arg <pack>
+        //
+        // Explicitly specify a Doom II "mission pack" to run as, instead of
+        // detecting it based on the filename. Valid values are: "doom2",
+        // "tnt" and "plutonia".
+        //
+        p = M_CheckParmWithArgs("-pack", 1);
+        if (p > 0)
+        {
+            SetMissionForPackName(myargv[p + 1]);
+        }
+    }
+}
+
+// Set the gamedescription string
+
+static void D_SetGameDescription(void)
+{
+    if (logical_gamemission == doom)
+    {
+        // Doom 1.  But which version?
+
+        if (gamevariant == freedoom)
+        {
+            gamedescription = GetGameName("Freedoom: Phase 1");
+        }
+        else if (gamemode == retail)
+        {
+            // Ultimate Doom
+
+            gamedescription = GetGameName("The Ultimate DOOM");
+        }
+        else if (gamemode == registered)
+        {
+            gamedescription = GetGameName("DOOM Registered");
+        }
+        else if (gamemode == shareware)
+        {
+            gamedescription = GetGameName("DOOM Shareware");
+        }
+    }
+    else
+    {
+        // Doom 2 of some kind.  But which mission?
+
+        if (gamevariant == freedm)
+        {
+            gamedescription = GetGameName("FreeDM");
+        }
+        else if (gamevariant == freedoom)
+        {
+            gamedescription = GetGameName("Freedoom: Phase 2");
+        }
+        else if (logical_gamemission == doom2)
+        {
+            gamedescription = GetGameName("DOOM 2: Hell on Earth");
+        }
+        else if (logical_gamemission == pack_plut)
+        {
+            gamedescription = GetGameName("DOOM 2: Plutonia Experiment"); 
+        }
+        else if (logical_gamemission == pack_tnt)
+        {
+            gamedescription = GetGameName("DOOM 2: TNT - Evilution");
+        }
+    }
+
+    if (gamedescription == NULL)
+    {
+        gamedescription = M_StringDuplicate("Unknown");
+    }
+}
+
+//      print title for every printed line
+char            title[128];
+
+static boolean D_AddFile(char *filename)
+{
+    wad_file_t *handle;
+
+    printf(" adding %s\n", filename);
+    handle = W_AddFile(filename);
+
+    return handle != NULL;
+}
+
+// Copyright message banners
+// Some dehacked mods replace these.  These are only displayed if they are 
+// replaced by dehacked.
+
+static const char *copyright_banners[] =
+{
+    "===========================================================================\n"
+    "ATTENTION:  This version of DOOM has been modified.  If you would like to\n"
+    "get a copy of the original game, call 1-800-IDGAMES or see the readme file.\n"
+    "        You will not receive technical support for modified games.\n"
+    "                      press enter to continue\n"
+    "===========================================================================\n",
+
+    "===========================================================================\n"
+    "                 Commercial product - do not distribute!\n"
+    "         Please report software piracy to the SPA: 1-800-388-PIR8\n"
+    "===========================================================================\n",
+
+    "===========================================================================\n"
+    "                                Shareware!\n"
+    "===========================================================================\n"
+};
+
+// Prints a message only if it has been modified by dehacked.
+
+void PrintDehackedBanners(void)
+{
+    size_t i;
+
+    for (i=0; i<arrlen(copyright_banners); ++i)
+    {
+        const char *deh_s;
+
+        deh_s = DEH_String(copyright_banners[i]);
+
+        if (deh_s != copyright_banners[i])
+        {
+            printf("%s", deh_s);
+
+            // Make sure the modified banner always ends in a newline character.
+            // If it doesn't, add a newline.  This fixes av.wad.
+
+            if (deh_s[strlen(deh_s) - 1] != '\n')
+            {
+                printf("\n");
+            }
+        }
+    }
+}
+
+static const struct
+{
+    const char *description;
+    const char *cmdline;
+    GameVersion_t version;
+} gameversions[] = {
+    {"Doom 1.2",             "1.2",        exe_doom_1_2},
+    {"Doom 1.5",             "1.5",        exe_doom_1_5},
+    {"Doom 1.666",           "1.666",      exe_doom_1_666},
+    {"Doom 1.7/1.7a",        "1.7",        exe_doom_1_7},
+    {"Doom 1.8",             "1.8",        exe_doom_1_8},
+    {"Doom 1.9",             "1.9",        exe_doom_1_9},
+    {"Hacx",                 "hacx",       exe_hacx},
+    {"Ultimate Doom",        "ultimate",   exe_ultimate},
+    {"Final Doom",           "final",      exe_final},
+    {"Final Doom (alt)",     "final2",     exe_final2},
+    {"Chex Quest",           "chex",       exe_chex},
+    { NULL,                  NULL,         0},
+};
+
+// Initialize the game version
+
+static void InitGameVersion(void)
+{
+    byte *demolump;
+    char demolumpname[6];
+    int demoversion;
+    int p;
+    int i;
+    boolean status;
+
+    //!
+    // @arg <version>
+    // @category compat
+    //
+    // Emulate a specific version of Doom. Valid values are "1.2", 
+    // "1.5", "1.666", "1.7", "1.8", "1.9", "ultimate", "final", 
+    // "final2", "hacx" and "chex".
+    //
+
+    p = M_CheckParmWithArgs("-gameversion", 1);
+
+    if (p)
+    {
+        for (i=0; gameversions[i].description != NULL; ++i)
+        {
+            if (!strcmp(myargv[p+1], gameversions[i].cmdline))
+            {
+                gameversion = gameversions[i].version;
+                break;
+            }
+        }
+
+        if (gameversions[i].description == NULL)
+        {
+            printf("Supported game versions:\n");
+
+            for (i=0; gameversions[i].description != NULL; ++i)
+            {
+                printf("\t%s (%s)\n", gameversions[i].cmdline,
+                        gameversions[i].description);
+            }
+
+            I_Error("Unknown game version '%s'", myargv[p+1]);
+        }
+    }
+    else
+    {
+        // Determine automatically
+
+        if (gamemission == pack_chex)
+        {
+            // chex.exe - identified by iwad filename
+
+            gameversion = exe_chex;
+        }
+        else if (gamemission == pack_hacx)
+        {
+            // hacx.exe: identified by iwad filename
+
+            gameversion = exe_hacx;
+        }
+        else if (gamemode == shareware || gamemode == registered
+              || (gamemode == commercial && gamemission == doom2))
+        {
+            // original
+            gameversion = exe_doom_1_9;
+
+            // Detect version from demo lump
+            for (i = 1; i <= 3; ++i)
+            {
+                M_snprintf(demolumpname, 6, "demo%i", i);
+                if (W_CheckNumForName(demolumpname) > 0)
+                {
+                    demolump = W_CacheLumpName(demolumpname, PU_STATIC);
+                    demoversion = demolump[0];
+                    W_ReleaseLumpName(demolumpname);
+                    status = true;
+                    switch (demoversion)
+                    {
+                        case 0:
+                        case 1:
+                        case 2:
+                        case 3:
+                        case 4:
+                            gameversion = exe_doom_1_2;
+                            break;
+                        case 106:
+                            gameversion = exe_doom_1_666;
+                            break;
+                        case 107:
+                            gameversion = exe_doom_1_7;
+                            break;
+                        case 108:
+                            gameversion = exe_doom_1_8;
+                            break;
+                        case 109:
+                            gameversion = exe_doom_1_9;
+                            break;
+                        default:
+                            status = false;
+                            break;
+                    }
+                    if (status)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+        else if (gamemode == retail)
+        {
+            gameversion = exe_ultimate;
+        }
+        else if (gamemode == commercial)
+        {
+            // Final Doom: tnt or plutonia
+            // Defaults to emulating the first Final Doom executable,
+            // which has the crash in the demo loop; however, having
+            // this as the default should mean that it plays back
+            // most demos correctly.
+
+            gameversion = exe_final;
+        }
+    }
+
+    // Deathmatch 2.0 did not exist until Doom v1.4
+    if (gameversion <= exe_doom_1_2 && deathmatch == 2)
+    {
+        deathmatch = 1;
+    }
+
+    // The original exe does not support retail - 4th episode not supported
+
+    if (gameversion < exe_ultimate && gamemode == retail)
+    {
+        gamemode = registered;
+    }
+
+    // EXEs prior to the Final Doom exes do not support Final Doom.
+
+    if (gameversion < exe_final && gamemode == commercial
+     && (gamemission == pack_tnt || gamemission == pack_plut))
+    {
+        gamemission = doom2;
+    }
+}
+
+void PrintGameVersion(void)
+{
+    int i;
+
+    for (i=0; gameversions[i].description != NULL; ++i)
+    {
+        if (gameversions[i].version == gameversion)
+        {
+            printf("Emulating the behavior of the "
+                   "'%s' executable.\n", gameversions[i].description);
+            break;
+        }
+    }
+}
+
+// Function called at exit to display the ENDOOM screen
+
+static void D_Endoom(void)
+{
+    byte *endoom;
+
+    // Don't show ENDOOM if we have it disabled, or we're running
+    // in screensaver or control test mode. Only show it once the
+    // game has actually started.
+
+    if (!show_endoom || !main_loop_started
+     || screensaver_mode || M_CheckParm("-testcontrols") > 0)
+    {
+        return;
+    }
+
+    endoom = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC);
+
+    I_Endoom(endoom);
+}
+
+boolean IsFrenchIWAD(void)
+{
+    return (gamemission == doom2 && W_CheckNumForName("M_RDTHIS") < 0
+          && W_CheckNumForName("M_EPISOD") < 0 && W_CheckNumForName("M_EPI1") < 0
+          && W_CheckNumForName("M_EPI2") < 0 && W_CheckNumForName("M_EPI3") < 0
+          && W_CheckNumForName("WIOSTF") < 0 && W_CheckNumForName("WIOBJ") >= 0);
+}
+
+// Load dehacked patches needed for certain IWADs.
+static void LoadIwadDeh(void)
+{
+    // The Freedoom IWADs have DEHACKED lumps that must be loaded.
+    if (gamevariant == freedoom || gamevariant == freedm)
+    {
+        // Old versions of Freedoom (before 2014-09) did not have technically
+        // valid DEHACKED lumps, so ignore errors and just continue if this
+        // is an old IWAD.
+        DEH_LoadLumpByName("DEHACKED", false, true);
+    }
+
+    // If this is the HACX IWAD, we need to load the DEHACKED lump.
+    if (gameversion == exe_hacx)
+    {
+        if (!DEH_LoadLumpByName("DEHACKED", true, false))
+        {
+            I_Error("DEHACKED lump not found.  Please check that this is the "
+                    "Hacx v1.2 IWAD.");
+        }
+    }
+
+    // Chex Quest needs a separate Dehacked patch which must be downloaded
+    // and installed next to the IWAD.
+    if (gameversion == exe_chex)
+    {
+        char *chex_deh = NULL;
+        char *dirname;
+
+        // Look for chex.deh in the same directory as the IWAD file.
+        dirname = M_DirName(iwadfile);
+        chex_deh = M_StringJoin(dirname, DIR_SEPARATOR_S, "chex.deh", NULL);
+        free(dirname);
+
+        // If the dehacked patch isn't found, try searching the WAD
+        // search path instead.  We might find it...
+        if (!M_FileExists(chex_deh))
+        {
+            free(chex_deh);
+            chex_deh = D_FindWADByName("chex.deh");
+        }
+
+        // Still not found?
+        if (chex_deh == NULL)
+        {
+            I_Error("Unable to find Chex Quest dehacked file (chex.deh).\n"
+                    "The dehacked file is required in order to emulate\n"
+                    "chex.exe correctly.  It can be found in your nearest\n"
+                    "/idgames repository mirror at:\n\n"
+                    "   themes/chex/chexdeh.zip");
+        }
+
+        if (!DEH_LoadFile(chex_deh))
+        {
+            I_Error("Failed to load chex.deh needed for emulating chex.exe.");
+        }
+    }
+
+    if (IsFrenchIWAD())
+    {
+        char *french_deh = NULL;
+        char *dirname;
+
+        // Look for french.deh in the same directory as the IWAD file.
+        dirname = M_DirName(iwadfile);
+        french_deh = M_StringJoin(dirname, DIR_SEPARATOR_S, "french.deh", NULL);
+        printf("French version\n");
+        free(dirname);
+
+        // If the dehacked patch isn't found, try searching the WAD
+        // search path instead.  We might find it...
+        if (!M_FileExists(french_deh))
+        {
+            free(french_deh);
+            french_deh = D_FindWADByName("french.deh");
+        }
+
+        // Still not found?
+        if (french_deh == NULL)
+        {
+            I_Error("Unable to find French Doom II dehacked file\n"
+                    "(french.deh).  The dehacked file is required in order to\n"
+                    "emulate French doom2.exe correctly.  It can be found in\n"
+                    "your nearest /idgames repository mirror at:\n\n"
+                    "   utils/exe_edit/patches/french.zip");
+        }
+
+        if (!DEH_LoadFile(french_deh))
+        {
+            I_Error("Failed to load french.deh needed for emulating French\n"
+                    "doom2.exe.");
+        }
+    }
+}
+
+static void G_CheckDemoStatusAtExit (void)
+{
+    G_CheckDemoStatus();
+}
+
+//
+// D_DoomMain
+//
+void D_DoomMain (void)
+{
+    int p;
+    char file[256];
+    char demolumpname[9];
+
+    I_AtExit(D_Endoom, false);
+
+    // print banner
+
+    I_PrintBanner(PACKAGE_STRING);
+
+    DEH_printf("Z_Init: Init zone memory allocation daemon. \n");
+    Z_Init ();
+
+    //!
+    // @category net
+    //
+    // Start a dedicated server, routing packets but not participating
+    // in the game itself.
+    //
+
+    if (M_CheckParm("-dedicated") > 0)
+    {
+        printf("Dedicated server mode.\n");
+        NET_DedicatedServer();
+
+        // Never returns
+    }
+
+    //!
+    // @category net
+    //
+    // Query the Internet master server for a global list of active
+    // servers.
+    //
+
+    if (M_CheckParm("-search"))
+    {
+        NET_MasterQuery();
+        exit(0);
+    }
+
+    //!
+    // @arg <address>
+    // @category net
+    //
+    // Query the status of the server running on the given IP
+    // address.
+    //
+
+    p = M_CheckParmWithArgs("-query", 1);
+
+    if (p)
+    {
+        NET_QueryAddress(myargv[p+1]);
+        exit(0);
+    }
+
+    //!
+    // @category net
+    //
+    // Search the local LAN for running servers.
+    //
+
+    if (M_CheckParm("-localsearch"))
+    {
+        NET_LANQuery();
+        exit(0);
+    }
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Disable monsters.
+    //
+	
+    nomonsters = M_CheckParm ("-nomonsters");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Monsters respawn after being killed.
+    //
+
+    respawnparm = M_CheckParm ("-respawn");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Monsters move faster.
+    //
+
+    fastparm = M_CheckParm ("-fast");
+
+    //!
+    // @vanilla
+    //
+    // Developer mode. F1 saves a screenshot in the current working
+    // directory.
+    //
+
+    devparm = M_CheckParm ("-devparm");
+
+    I_DisplayFPSDots(devparm);
+
+    //!
+    // @category net
+    // @vanilla
+    //
+    // Start a deathmatch game.
+    //
+
+    if (M_CheckParm ("-deathmatch"))
+	deathmatch = 1;
+
+    //!
+    // @category net
+    // @vanilla
+    //
+    // Start a deathmatch 2.0 game.  Weapons do not stay in place and
+    // all items respawn after 30 seconds.
+    //
+
+    if (M_CheckParm ("-altdeath"))
+	deathmatch = 2;
+
+    if (devparm)
+	DEH_printf(D_DEVSTR);
+    
+    // find which dir to use for config files
+
+#ifdef _WIN32
+
+    //!
+    // @category obscure
+    // @platform windows
+    // @vanilla
+    //
+    // Save configuration data and savegames in c:\doomdata,
+    // allowing play from CD.
+    //
+
+    if (M_ParmExists("-cdrom"))
+    {
+        printf(D_CDROM);
+
+        M_SetConfigDir("c:\\doomdata\\");
+    }
+    else
+#endif
+    {
+        // Auto-detect the configuration dir.
+
+        M_SetConfigDir(NULL);
+    }
+
+    //!
+    // @category game
+    // @arg <x>
+    // @vanilla
+    //
+    // Turbo mode.  The player's speed is multiplied by x%.  If unspecified,
+    // x defaults to 200.  Values are rounded up to 10 and down to 400.
+    //
+
+    if ( (p=M_CheckParm ("-turbo")) )
+    {
+	int     scale = 200;
+	
+	if (p<myargc-1)
+	    scale = atoi (myargv[p+1]);
+	if (scale < 10)
+	    scale = 10;
+	if (scale > 400)
+	    scale = 400;
+        DEH_printf("turbo scale: %i%%\n", scale);
+	forwardmove[0] = forwardmove[0]*scale/100;
+	forwardmove[1] = forwardmove[1]*scale/100;
+	sidemove[0] = sidemove[0]*scale/100;
+	sidemove[1] = sidemove[1]*scale/100;
+    }
+    
+    // init subsystems
+    DEH_printf("V_Init: allocate screens.\n");
+    V_Init ();
+
+    // Load configuration files before initialising other subsystems.
+    DEH_printf("M_LoadDefaults: Load system defaults.\n");
+    M_SetConfigFilenames("default.cfg", PROGRAM_PREFIX "doom.cfg");
+    D_BindVariables();
+    M_LoadDefaults();
+
+    // Save configuration at exit.
+    I_AtExit(M_SaveDefaults, false);
+
+    // Find main IWAD file and load it.
+    iwadfile = D_FindIWAD(IWAD_MASK_DOOM, &gamemission);
+
+    // None found?
+
+    if (iwadfile == NULL)
+    {
+        I_Error("Game mode indeterminate.  No IWAD file was found.  Try\n"
+                "specifying one with the '-iwad' command line parameter.\n");
+    }
+
+    modifiedgame = false;
+
+    DEH_printf("W_Init: Init WADfiles.\n");
+    D_AddFile(iwadfile);
+
+    W_CheckCorrectIWAD(doom);
+
+    // Now that we've loaded the IWAD, we can figure out what gamemission
+    // we're playing and which version of Vanilla Doom we need to emulate.
+    D_IdentifyVersion();
+    InitGameVersion();
+
+    // Check which IWAD variant we are using.
+
+    if (W_CheckNumForName("FREEDOOM") >= 0)
+    {
+        if (W_CheckNumForName("FREEDM") >= 0)
+        {
+            gamevariant = freedm;
+        }
+        else
+        {
+            gamevariant = freedoom;
+        }
+    }
+    else if (W_CheckNumForName("DMENUPIC") >= 0)
+    {
+        gamevariant = bfgedition;
+    }
+
+    //!
+    // @category mod
+    //
+    // Disable automatic loading of Dehacked patches for certain
+    // IWAD files.
+    //
+    if (!M_ParmExists("-nodeh"))
+    {
+        // Some IWADs have dehacked patches that need to be loaded for
+        // them to be played properly.
+        LoadIwadDeh();
+    }
+
+    // Doom 3: BFG Edition includes modified versions of the classic
+    // IWADs which can be identified by an additional DMENUPIC lump.
+    // Furthermore, the M_GDHIGH lumps have been modified in a way that
+    // makes them incompatible to Vanilla Doom and the modified version
+    // of doom2.wad is missing the TITLEPIC lump.
+    // We specifically check for DMENUPIC here, before PWADs have been
+    // loaded which could probably include a lump of that name.
+
+    if (gamevariant == bfgedition)
+    {
+        printf("BFG Edition: Using workarounds as needed.\n");
+
+        // BFG Edition changes the names of the secret levels to
+        // censor the Wolfenstein references. It also has an extra
+        // secret level (MAP33). In Vanilla Doom (meaning the DOS
+        // version), MAP33 overflows into the Plutonia level names
+        // array, so HUSTR_33 is actually PHUSTR_1.
+        DEH_AddStringReplacement(HUSTR_31, "level 31: idkfa");
+        DEH_AddStringReplacement(HUSTR_32, "level 32: keen");
+        DEH_AddStringReplacement(PHUSTR_1, "level 33: betray");
+
+        // The BFG edition doesn't have the "low detail" menu option (fair
+        // enough). But bizarrely, it reuses the M_GDHIGH patch as a label
+        // for the options menu (says "Fullscreen:"). Why the perpetrators
+        // couldn't just add a new graphic lump and had to reuse this one,
+        // I don't know.
+        //
+        // The end result is that M_GDHIGH is too wide and causes the game
+        // to crash. As a workaround to get a minimum level of support for
+        // the BFG edition IWADs, use the "ON"/"OFF" graphics instead.
+        DEH_AddStringReplacement("M_GDHIGH", "M_MSGON");
+        DEH_AddStringReplacement("M_GDLOW", "M_MSGOFF");
+
+        // The BFG edition's "Screen Size:" graphic has also been changed
+        // to say "Gamepad:". Fortunately, it (along with the original
+        // Doom IWADs) has an unused graphic that says "Display". So we
+        // can swap this in instead, and it kind of makes sense.
+        DEH_AddStringReplacement("M_SCRNSZ", "M_DISP");
+    }
+
+    //!
+    // @category mod
+    //
+    // Disable auto-loading of .wad and .deh files.
+    //
+    if (!M_ParmExists("-noautoload") && gamemode != shareware)
+    {
+        char *autoload_dir;
+
+        // common auto-loaded files for all Doom flavors
+
+        if (gamemission < pack_chex)
+        {
+            autoload_dir = M_GetAutoloadDir("doom-all");
+            if (autoload_dir != NULL)
+            {
+                DEH_AutoLoadPatches(autoload_dir);
+                W_AutoLoadWADs(autoload_dir);
+                free(autoload_dir);
+            }
+        }
+
+        // auto-loaded files per IWAD
+        autoload_dir = M_GetAutoloadDir(D_SaveGameIWADName(gamemission, gamevariant));
+        if (autoload_dir != NULL)
+        {
+            DEH_AutoLoadPatches(autoload_dir);
+            W_AutoLoadWADs(autoload_dir);
+            free(autoload_dir);
+        }
+    }
+
+    // Load Dehacked patches specified on the command line with -deh.
+    // Note that there's a very careful and deliberate ordering to how
+    // Dehacked patches are loaded. The order we use is:
+    //  1. IWAD dehacked patches.
+    //  2. Command line dehacked patches specified with -deh.
+    //  3. PWAD dehacked patches in DEHACKED lumps.
+    DEH_ParseCommandLine();
+
+    // Load PWAD files.
+    modifiedgame = W_ParseCommandLine();
+
+    // Debug:
+//    W_PrintDirectory();
+
+    //!
+    // @arg <demo>
+    // @category demo
+    // @vanilla
+    //
+    // Play back the demo named demo.lmp.
+    //
+
+    p = M_CheckParmWithArgs ("-playdemo", 1);
+
+    if (!p)
+    {
+        //!
+        // @arg <demo>
+        // @category demo
+        // @vanilla
+        //
+        // Play back the demo named demo.lmp, determining the framerate
+        // of the screen.
+        //
+	p = M_CheckParmWithArgs("-timedemo", 1);
+
+    }
+
+    if (p)
+    {
+        char *uc_filename = strdup(myargv[p + 1]);
+        M_ForceUppercase(uc_filename);
+
+        // With Vanilla you have to specify the file without extension,
+        // but make that optional.
+        if (M_StringEndsWith(uc_filename, ".LMP"))
+        {
+            M_StringCopy(file, myargv[p + 1], sizeof(file));
+        }
+        else
+        {
+            DEH_snprintf(file, sizeof(file), "%s.lmp", myargv[p+1]);
+        }
+
+        free(uc_filename);
+
+        if (D_AddFile(file))
+        {
+            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
+                         sizeof(demolumpname));
+        }
+        else
+        {
+            // If file failed to load, still continue trying to play
+            // the demo in the same way as Vanilla Doom.  This makes
+            // tricks like "-playdemo demo1" possible.
+
+            M_StringCopy(demolumpname, myargv[p + 1], sizeof(demolumpname));
+        }
+
+        printf("Playing demo %s.\n", file);
+    }
+
+    I_AtExit(G_CheckDemoStatusAtExit, true);
+
+    // Generate the WAD hash table.  Speed things up a bit.
+    W_GenerateHashTable();
+
+    // Load DEHACKED lumps from WAD files - but only if we give the right
+    // command line parameter.
+
+    //!
+    // @category mod
+    //
+    // Load Dehacked patches from DEHACKED lumps contained in one of the
+    // loaded PWAD files.
+    //
+    if (M_ParmExists("-dehlump"))
+    {
+        int i, loaded = 0;
+        int numiwadlumps = numlumps;
+
+        while (!W_IsIWADLump(lumpinfo[numiwadlumps - 1]))
+        {
+            numiwadlumps--;
+        }
+
+        for (i = numiwadlumps; i < numlumps; ++i)
+        {
+            if (!strncmp(lumpinfo[i]->name, "DEHACKED", 8))
+            {
+                DEH_LoadLump(i, false, false);
+                loaded++;
+            }
+        }
+
+        printf("  loaded %i DEHACKED lumps from PWAD files.\n", loaded);
+    }
+
+    // Set the gamedescription string. This is only possible now that
+    // we've finished loading Dehacked patches.
+    D_SetGameDescription();
+
+    savegamedir = M_GetSaveGameDir(D_SaveGameIWADName(gamemission, gamevariant));
+
+    // Check for -file in shareware
+    if (modifiedgame && (gamevariant != freedoom))
+    {
+	// These are the lumps that will be checked in IWAD,
+	// if any one is not present, execution will be aborted.
+	char name[23][8]=
+	{
+	    "e2m1","e2m2","e2m3","e2m4","e2m5","e2m6","e2m7","e2m8","e2m9",
+	    "e3m1","e3m3","e3m3","e3m4","e3m5","e3m6","e3m7","e3m8","e3m9",
+	    "dphoof","bfgga0","heada1","cybra1","spida1d1"
+	};
+	int i;
+	
+	if ( gamemode == shareware)
+	    I_Error(DEH_String("\nYou cannot -file with the shareware "
+			       "version. Register!"));
+
+	// Check for fake IWAD with right name,
+	// but w/o all the lumps of the registered version. 
+	if (gamemode == registered)
+	    for (i = 0;i < 23; i++)
+		if (W_CheckNumForName(name[i])<0)
+		    I_Error(DEH_String("\nThis is not the registered version."));
+    }
+
+    if (W_CheckNumForName("SS_START") >= 0
+     || W_CheckNumForName("FF_END") >= 0)
+    {
+        I_PrintDivider();
+        printf(" WARNING: The loaded WAD file contains modified sprites or\n"
+               " floor textures.  You may want to use the '-merge' command\n"
+               " line option instead of '-file'.\n");
+    }
+
+    I_PrintStartupBanner(gamedescription);
+    PrintDehackedBanners();
+
+    DEH_printf("I_Init: Setting up machine state.\n");
+    I_CheckIsScreensaver();
+    I_InitTimer();
+    I_InitJoystick();
+    I_InitSound(doom);
+    I_InitMusic();
+
+    printf ("NET_Init: Init network subsystem.\n");
+    NET_Init ();
+
+    // Initial netgame startup. Connect to server etc.
+    D_ConnectNetGame();
+
+    // get skill / episode / map from parms
+    startskill = sk_medium;
+    startepisode = 1;
+    startmap = 1;
+    autostart = false;
+
+    //!
+    // @category game
+    // @arg <skill>
+    // @vanilla
+    //
+    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
+    // 0 disables all monsters.
+    //
+
+    p = M_CheckParmWithArgs("-skill", 1);
+
+    if (p)
+    {
+	startskill = myargv[p+1][0]-'1';
+	autostart = true;
+    }
+
+    //!
+    // @category game
+    // @arg <n>
+    // @vanilla
+    //
+    // Start playing episode n (1-4).
+    //
+
+    p = M_CheckParmWithArgs("-episode", 1);
+
+    if (p)
+    {
+	startepisode = myargv[p+1][0]-'0';
+	startmap = 1;
+	autostart = true;
+    }
+	
+    timelimit = 0;
+
+    //! 
+    // @arg <n>
+    // @category net
+    // @vanilla
+    //
+    // For multiplayer games: exit each level after n minutes.
+    //
+
+    p = M_CheckParmWithArgs("-timer", 1);
+
+    if (p)
+    {
+	timelimit = atoi(myargv[p+1]);
+    }
+
+    //!
+    // @category net
+    // @vanilla
+    //
+    // Austin Virtual Gaming: end levels after 20 minutes.
+    //
+
+    p = M_CheckParm ("-avg");
+
+    if (p)
+    {
+	timelimit = 20;
+    }
+
+    //!
+    // @category game
+    // @arg [<x> <y> | <xy>]
+    // @vanilla
+    //
+    // Start a game immediately, warping to ExMy (Doom 1) or MAPxy
+    // (Doom 2).
+    //
+
+    p = M_CheckParmWithArgs("-warp", 1);
+
+    if (p)
+    {
+        if (gamemode == commercial)
+            startmap = atoi (myargv[p+1]);
+        else
+        {
+            startepisode = myargv[p+1][0]-'0';
+
+            if (p + 2 < myargc)
+            {
+                startmap = myargv[p+2][0]-'0';
+            }
+            else
+            {
+                startmap = 1;
+            }
+        }
+        autostart = true;
+    }
+
+    // Undocumented:
+    // Invoked by setup to test the controls.
+
+    p = M_CheckParm("-testcontrols");
+
+    if (p > 0)
+    {
+        startepisode = 1;
+        startmap = 1;
+        autostart = true;
+        testcontrols = true;
+    }
+
+    // Check for load game parameter
+    // We do this here and save the slot number, so that the network code
+    // can override it or send the load slot to other players.
+
+    //!
+    // @category game
+    // @arg <s>
+    // @vanilla
+    //
+    // Load the game in slot s.
+    //
+
+    p = M_CheckParmWithArgs("-loadgame", 1);
+    
+    if (p)
+    {
+        startloadgame = atoi(myargv[p+1]);
+    }
+    else
+    {
+        // Not loading a game
+        startloadgame = -1;
+    }
+
+    DEH_printf("M_Init: Init miscellaneous info.\n");
+    M_Init ();
+
+    DEH_printf("R_Init: Init DOOM refresh daemon - ");
+    R_Init ();
+
+    DEH_printf("\nP_Init: Init Playloop state.\n");
+    P_Init ();
+
+    DEH_printf("S_Init: Setting up sound.\n");
+    S_Init (sfxVolume * 8, musicVolume * 8);
+
+    DEH_printf("D_CheckNetGame: Checking network game status.\n");
+    D_CheckNetGame ();
+
+    PrintGameVersion();
+
+    DEH_printf("HU_Init: Setting up heads up display.\n");
+    HU_Init ();
+
+    DEH_printf("ST_Init: Init status bar.\n");
+    ST_Init ();
+
+    // If Doom II without a MAP01 lump, this is a store demo.
+    // Moved this here so that MAP01 isn't constantly looked up
+    // in the main loop.
+
+    if (gamemode == commercial && W_CheckNumForName("map01") < 0)
+        storedemo = true;
+
+    if (M_CheckParmWithArgs("-statdump", 1))
+    {
+        I_AtExit(StatDump, true);
+        DEH_printf("External statistics registered.\n");
+    }
+
+    //!
+    // @arg <x>
+    // @category demo
+    // @vanilla
+    //
+    // Record a demo named x.lmp.
+    //
+
+    p = M_CheckParmWithArgs("-record", 1);
+
+    if (p)
+    {
+	G_RecordDemo (myargv[p+1]);
+	autostart = true;
+    }
+
+    p = M_CheckParmWithArgs("-playdemo", 1);
+    if (p)
+    {
+	singledemo = true;              // quit after one demo
+	G_DeferedPlayDemo (demolumpname);
+	D_DoomLoop ();  // never returns
+    }
+	
+    p = M_CheckParmWithArgs("-timedemo", 1);
+    if (p)
+    {
+	G_TimeDemo (demolumpname);
+	D_DoomLoop ();  // never returns
+    }
+	
+    if (startloadgame >= 0)
+    {
+        M_StringCopy(file, P_SaveGameFile(startloadgame), sizeof(file));
+	G_LoadGame(file);
+    }
+	
+    if (gameaction != ga_loadgame )
+    {
+	if (autostart || netgame)
+	    G_InitNew (startskill, startepisode, startmap);
+	else
+	    D_StartTitle ();                // start up intro loop
+    }
+
+    D_DoomLoop ();  // never returns
+}
+
diff --git a/games/NXDoom/src/doom/d_main.h b/games/NXDoom/src/doom/d_main.h
new file mode 100644
index 000000000..8e430f85f
--- /dev/null
+++ b/games/NXDoom/src/doom/d_main.h
@@ -0,0 +1,53 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __D_MAIN__
+#define __D_MAIN__
+
+#include "doomdef.h"
+
+
+
+
+// Read events from all input devices
+
+void D_ProcessEvents (void); 
+	
+
+//
+// BASE LEVEL
+//
+void D_PageTicker (void);
+void D_PageDrawer (void);
+void D_AdvanceDemo (void);
+void D_DoAdvanceDemo (void);
+void D_StartTitle (void);
+ 
+//
+// GLOBAL VARIABLES
+//
+
+extern  gameaction_t    gameaction;
+extern boolean advancedemo;
+
+extern const char *pagename;
+
+
+#endif
+
diff --git a/games/NXDoom/src/doom/d_net.c b/games/NXDoom/src/doom/d_net.c
new file mode 100644
index 000000000..f8969fe02
--- /dev/null
+++ b/games/NXDoom/src/doom/d_net.c
@@ -0,0 +1,287 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM Network game communication and protocol,
+//	all OS independend parts.
+//
+
+#include <stdlib.h>
+
+#include "d_main.h"
+#include "m_argv.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "g_game.h"
+#include "doomdef.h"
+#include "doomstat.h"
+#include "w_checksum.h"
+#include "w_wad.h"
+
+#include "deh_main.h"
+
+#include "d_loop.h"
+
+ticcmd_t *netcmds;
+
+// Called when a player leaves the game
+
+static void PlayerQuitGame(player_t *player)
+{
+    static char exitmsg[80];
+    unsigned int player_num;
+
+    player_num = player - players;
+
+    // Do this the same way as Vanilla Doom does, to allow dehacked
+    // replacements of this message
+
+    M_StringCopy(exitmsg, DEH_String("Player 1 left the game"),
+                 sizeof(exitmsg));
+
+    exitmsg[7] += player_num;
+
+    playeringame[player_num] = false;
+    players[consoleplayer].message = exitmsg;
+
+    // TODO: check if it is sensible to do this:
+
+    if (demorecording) 
+    {
+        G_CheckDemoStatus ();
+    }
+}
+
+static void RunTic(ticcmd_t *cmds, boolean *ingame)
+{
+    unsigned int i;
+
+    // Check for player quits.
+
+    for (i = 0; i < MAXPLAYERS; ++i)
+    {
+        if (!demoplayback && playeringame[i] && !ingame[i])
+        {
+            PlayerQuitGame(&players[i]);
+        }
+    }
+
+    netcmds = cmds;
+
+    // check that there are players in the game.  if not, we cannot
+    // run a tic.
+
+    if (advancedemo)
+        D_DoAdvanceDemo ();
+
+    G_Ticker ();
+}
+
+static loop_interface_t doom_loop_interface = {
+    D_ProcessEvents,
+    G_BuildTiccmd,
+    RunTic,
+    M_Ticker
+};
+
+
+// Load game settings from the specified structure and
+// set global variables.
+
+static void LoadGameSettings(net_gamesettings_t *settings)
+{
+    unsigned int i;
+
+    deathmatch = settings->deathmatch;
+    startepisode = settings->episode;
+    startmap = settings->map;
+    startskill = settings->skill;
+    startloadgame = settings->loadgame;
+    lowres_turn = settings->lowres_turn;
+    nomonsters = settings->nomonsters;
+    fastparm = settings->fast_monsters;
+    respawnparm = settings->respawn_monsters;
+    timelimit = settings->timelimit;
+    consoleplayer = settings->consoleplayer;
+
+    if (lowres_turn)
+    {
+        printf("NOTE: Turning resolution is reduced; this is probably "
+               "because there is a client recording a Vanilla demo.\n");
+    }
+
+    for (i = 0; i < MAXPLAYERS; ++i)
+    {
+        playeringame[i] = i < settings->num_players;
+    }
+}
+
+// Save the game settings from global variables to the specified
+// game settings structure.
+
+static void SaveGameSettings(net_gamesettings_t *settings)
+{
+    // Fill in game settings structure with appropriate parameters
+    // for the new game
+
+    settings->deathmatch = deathmatch;
+    settings->episode = startepisode;
+    settings->map = startmap;
+    settings->skill = startskill;
+    settings->loadgame = startloadgame;
+    settings->gameversion = gameversion;
+    settings->nomonsters = nomonsters;
+    settings->fast_monsters = fastparm;
+    settings->respawn_monsters = respawnparm;
+    settings->timelimit = timelimit;
+
+    settings->lowres_turn = (M_ParmExists("-record")
+                         && !M_ParmExists("-longtics"))
+                          || M_ParmExists("-shorttics");
+}
+
+static void InitConnectData(net_connect_data_t *connect_data)
+{
+    boolean shorttics;
+
+    connect_data->max_players = MAXPLAYERS;
+    connect_data->drone = false;
+
+    //!
+    // @category net
+    //
+    // Run as the left screen in three screen mode.
+    //
+
+    if (M_CheckParm("-left") > 0)
+    {
+        viewangleoffset = ANG90;
+        connect_data->drone = true;
+    }
+
+    //! 
+    // @category net
+    //
+    // Run as the right screen in three screen mode.
+    //
+
+    if (M_CheckParm("-right") > 0)
+    {
+        viewangleoffset = ANG270;
+        connect_data->drone = true;
+    }
+
+    //
+    // Connect data
+    //
+
+    // Game type fields:
+
+    connect_data->gamemode = gamemode;
+    connect_data->gamemission = gamemission;
+
+    //!
+    // @category demo
+    //
+    // Play with low turning resolution to emulate demo recording.
+    //
+
+    shorttics = M_ParmExists("-shorttics");
+
+    // Are we recording a demo? Possibly set lowres turn mode
+
+    connect_data->lowres_turn = (M_ParmExists("-record")
+                             && !M_ParmExists("-longtics"))
+                              || shorttics;
+
+    // Read checksums of our WAD directory and dehacked information
+
+    W_Checksum(connect_data->wad_sha1sum);
+    DEH_Checksum(connect_data->deh_sha1sum);
+
+    // Are we playing with the Freedoom IWAD?
+
+    connect_data->is_freedoom = W_CheckNumForName("FREEDOOM") >= 0;
+}
+
+void D_ConnectNetGame(void)
+{
+    net_connect_data_t connect_data;
+
+    InitConnectData(&connect_data);
+    netgame = D_InitNetGame(&connect_data);
+
+    //!
+    // @category net
+    //
+    // Start the game playing as though in a netgame with a single
+    // player.  This can also be used to play back single player netgame
+    // demos.
+    //
+
+    if (M_CheckParm("-solo-net") > 0)
+    {
+        netgame = true;
+    }
+}
+
+//
+// D_CheckNetGame
+// Works out player numbers among the net participants
+//
+void D_CheckNetGame (void)
+{
+    net_gamesettings_t settings;
+
+    if (netgame)
+    {
+        autostart = true;
+    }
+
+    D_RegisterLoopCallbacks(&doom_loop_interface);
+
+    SaveGameSettings(&settings);
+    D_StartNetGame(&settings, NULL);
+    LoadGameSettings(&settings);
+
+    DEH_printf("startskill %i  deathmatch: %i  startmap: %i  startepisode: %i\n",
+               startskill, deathmatch, startmap, startepisode);
+
+    DEH_printf("player %i of %i (%i nodes)\n",
+               consoleplayer+1, settings.num_players, settings.num_players);
+
+    // Show players here; the server might have specified a time limit
+
+    if (timelimit > 0 && deathmatch)
+    {
+        // Gross hack to work like Vanilla:
+
+        if (timelimit == 20 && M_CheckParm("-avg"))
+        {
+            DEH_printf("Austin Virtual Gaming: Levels will end "
+                           "after 20 minutes\n");
+        }
+        else
+        {
+            DEH_printf("Levels will end after %d minute", timelimit);
+            if (timelimit > 1)
+                printf("s");
+            printf(".\n");
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/doom/d_player.h b/games/NXDoom/src/doom/d_player.h
new file mode 100644
index 000000000..d78482d0e
--- /dev/null
+++ b/games/NXDoom/src/doom/d_player.h
@@ -0,0 +1,209 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//
+
+
+#ifndef __D_PLAYER__
+#define __D_PLAYER__
+
+
+// The player data structure depends on a number
+// of other structs: items (internal inventory),
+// animation states (closely tied to the sprites
+// used to represent them, unfortunately).
+#include "d_items.h"
+#include "p_pspr.h"
+
+// In addition, the player is just a special
+// case of the generic moving object/actor.
+#include "p_mobj.h"
+
+// Finally, for odd reasons, the player input
+// is buffered within the player data struct,
+// as commands per game tick.
+#include "d_ticcmd.h"
+
+#include "net_defs.h"
+
+
+
+
+//
+// Player states.
+//
+typedef enum
+{
+    // Playing or camping.
+    PST_LIVE,
+    // Dead on the ground, view follows killer.
+    PST_DEAD,
+    // Ready to restart/respawn???
+    PST_REBORN		
+
+} playerstate_t;
+
+
+//
+// Player internal flags, for cheats and debug.
+//
+typedef enum
+{
+    // No clipping, walk through barriers.
+    CF_NOCLIP		= 1,
+    // No damage, no health loss.
+    CF_GODMODE		= 2,
+    // Not really a cheat, just a debug aid.
+    CF_NOMOMENTUM	= 4
+
+} cheat_t;
+
+
+//
+// Extended player object info: player_t
+//
+typedef struct player_s
+{
+    mobj_t*		mo;
+    playerstate_t	playerstate;
+    ticcmd_t		cmd;
+
+    // Determine POV,
+    //  including viewpoint bobbing during movement.
+    // Focal origin above r.z
+    fixed_t		viewz;
+    // Base height above floor for viewz.
+    fixed_t		viewheight;
+    // Bob/squat speed.
+    fixed_t         	deltaviewheight;
+    // bounded/scaled total momentum.
+    fixed_t         	bob;	
+
+    // This is only used between levels,
+    // mo->health is used during levels.
+    int			health;	
+    int			armorpoints;
+    // Armor type is 0-2.
+    int			armortype;	
+
+    // Power ups. invinc and invis are tic counters.
+    int			powers[NUMPOWERS];
+    boolean		cards[NUMCARDS];
+    boolean		backpack;
+    
+    // Frags, kills of other players.
+    int			frags[MAXPLAYERS];
+    weapontype_t	readyweapon;
+    
+    // Is wp_nochange if not changing.
+    weapontype_t	pendingweapon;
+
+    int                 weaponowned[NUMWEAPONS];
+    int			ammo[NUMAMMO];
+    int			maxammo[NUMAMMO];
+
+    // True if button down last tic.
+    int			attackdown;
+    int			usedown;
+
+    // Bit flags, for cheats and debug.
+    // See cheat_t, above.
+    int			cheats;		
+
+    // Refired shots are less accurate.
+    int			refire;		
+
+     // For intermission stats.
+    int			killcount;
+    int			itemcount;
+    int			secretcount;
+
+    // Hint messages.
+    const char		*message;
+    
+    // For screen flashing (red or bright).
+    int			damagecount;
+    int			bonuscount;
+
+    // Who did damage (NULL for floors/ceilings).
+    mobj_t*		attacker;
+    
+    // So gun flashes light up areas.
+    int			extralight;
+
+    // Current PLAYPAL, ???
+    //  can be set to REDCOLORMAP for pain, etc.
+    int			fixedcolormap;
+
+    // Player skin colorshift,
+    //  0-3 for which color to draw player.
+    int			colormap;	
+
+    // Overlay view sprites (gun, etc).
+    pspdef_t		psprites[NUMPSPRITES];
+
+    // True if secret level has been done.
+    boolean		didsecret;	
+
+} player_t;
+
+
+//
+// INTERMISSION
+// Structure passed e.g. to WI_Start(wb)
+//
+typedef struct
+{
+    boolean	in;	// whether the player is in game
+    
+    // Player stats, kills, collected items etc.
+    int		skills;
+    int		sitems;
+    int		ssecret;
+    int		stime; 
+    int		frags[4];
+    int		score;	// current score on entry, modified on return
+  
+} wbplayerstruct_t;
+
+typedef struct
+{
+    int		epsd;	// episode # (0-2)
+
+    // if true, splash the secret level
+    boolean	didsecret;
+    
+    // previous and next levels, origin 0
+    int		last;
+    int		next;	
+    
+    int		maxkills;
+    int		maxitems;
+    int		maxsecret;
+    int		maxfrags;
+
+    // the par time
+    int		partime;
+    
+    // index of this player in game
+    int		pnum;	
+
+    wbplayerstruct_t	plyr[MAXPLAYERS];
+
+} wbstartstruct_t;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/d_textur.h b/games/NXDoom/src/doom/d_textur.h
new file mode 100644
index 000000000..1afe040eb
--- /dev/null
+++ b/games/NXDoom/src/doom/d_textur.h
@@ -0,0 +1,43 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Typedefs related to to textures etc.,
+//	 isolated here to make it easier separating modules.
+//    
+
+
+#ifndef __D_TEXTUR__
+#define __D_TEXTUR__
+
+#include "doomtype.h"
+
+
+
+
+//
+// Flats?
+//
+// a pic is an unmasked block of pixels
+typedef struct
+{
+    byte		width;
+    byte		height;
+    byte		data;
+} pic_t;
+
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/d_think.h b/games/NXDoom/src/doom/d_think.h
new file mode 100644
index 000000000..0966ad960
--- /dev/null
+++ b/games/NXDoom/src/doom/d_think.h
@@ -0,0 +1,68 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  MapObj data. Map Objects or mobjs are actors, entities,
+//  thinker, take-your-pick... anything that moves, acts, or
+//  suffers state changes of more or less violent nature.
+//
+
+
+#ifndef __D_THINK__
+#define __D_THINK__
+
+
+
+
+
+//
+// Experimental stuff.
+// To compile this as "ANSI C with classes"
+//  we will need to handle the various
+//  action functions cleanly.
+//
+typedef  void (*actionf_v)();
+typedef  void (*actionf_p1)( void* );
+typedef  void (*actionf_p2)( void*, void* );
+
+typedef union
+{
+  actionf_v	acv;
+  actionf_p1	acp1;
+  actionf_p2	acp2;
+
+} actionf_t;
+
+
+
+
+
+// Historically, "think_t" is yet another
+//  function pointer to a routine to handle
+//  an actor.
+typedef actionf_t  think_t;
+
+
+// Doubly linked list of actors.
+typedef struct thinker_s
+{
+    struct thinker_s*	prev;
+    struct thinker_s*	next;
+    think_t		function;
+    
+} thinker_t;
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/deh_ammo.c b/games/NXDoom/src/doom/deh_ammo.c
new file mode 100644
index 000000000..dd8bee546
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_ammo.c
@@ -0,0 +1,103 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Ammo" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomdef.h"
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "p_local.h"
+
+static void *DEH_AmmoStart(deh_context_t *context, char *line)
+{
+    int ammo_number = 0;
+
+    if (sscanf(line, "Ammo %i", &ammo_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (ammo_number < 0 || ammo_number >= NUMAMMO)
+    {
+        DEH_Warning(context, "Invalid ammo number: %i", ammo_number);
+        return NULL;
+    }
+    
+    return &maxammo[ammo_number];
+}
+
+static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    int ivalue;
+    int ammo_number;
+
+    if (tag == NULL)
+        return;
+
+    ammo_number = ((int *) tag) - maxammo;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    // maxammo
+
+    if (!strcasecmp(variable_name, "Per ammo"))
+        clipammo[ammo_number] = ivalue;
+    else if (!strcasecmp(variable_name, "Max ammo"))
+        maxammo[ammo_number] = ivalue;
+    else
+    {
+        DEH_Warning(context, "Field named '%s' not found", variable_name);
+    }
+}
+
+static void DEH_AmmoSHA1Hash(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        SHA1_UpdateInt32(context, clipammo[i]);
+        SHA1_UpdateInt32(context, maxammo[i]);
+    }
+}
+
+deh_section_t deh_section_ammo =
+{
+    "Ammo",
+    NULL,
+    DEH_AmmoStart,
+    DEH_AmmoParseLine,
+    NULL,
+    DEH_AmmoSHA1Hash,
+};
+
diff --git a/games/NXDoom/src/doom/deh_bexstr.c b/games/NXDoom/src/doom/deh_bexstr.c
new file mode 100644
index 000000000..f9235f205
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_bexstr.c
@@ -0,0 +1,376 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2014 Fabian Greffrath
+//
+// 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.
+//
+//
+// Parses [STRINGS] sections in BEX files
+//
+
+#include <stdio.h>
+#include <string.h>
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+
+#include "dstrings.h"
+
+typedef struct {
+    const char *macro;
+    const char *string;
+} bex_string_t;
+
+// mnemonic keys table
+static const bex_string_t bex_stringtable[] = {
+    // part 1 - general initialization and prompts
+    {"D_DEVSTR", D_DEVSTR},
+    {"D_CDROM", D_CDROM},
+    {"QUITMSG", QUITMSG},
+    {"LOADNET", LOADNET},
+    {"QLOADNET", QLOADNET},
+    {"QSAVESPOT", QSAVESPOT},
+    {"SAVEDEAD", SAVEDEAD},
+    {"QSPROMPT", QSPROMPT},
+    {"QLPROMPT", QLPROMPT},
+    {"NEWGAME", NEWGAME},
+    {"NIGHTMARE", NIGHTMARE},
+    {"SWSTRING", SWSTRING},
+    {"MSGOFF", MSGOFF},
+    {"MSGON", MSGON},
+    {"NETEND", NETEND},
+    {"ENDGAME", ENDGAME},
+    {"DETAILHI", DETAILHI},
+    {"DETAILLO", DETAILLO},
+    {"GAMMALVL0", GAMMALVL0},
+    {"GAMMALVL1", GAMMALVL1},
+    {"GAMMALVL2", GAMMALVL2},
+    {"GAMMALVL3", GAMMALVL3},
+    {"GAMMALVL4", GAMMALVL4},
+    {"EMPTYSTRING", EMPTYSTRING},
+    {"GGSAVED", GGSAVED},
+    {"SAVEGAMENAME", SAVEGAMENAME},
+    // part 2 - messages when the player gets things
+    {"GOTARMOR", GOTARMOR},
+    {"GOTMEGA", GOTMEGA},
+    {"GOTHTHBONUS", GOTHTHBONUS},
+    {"GOTARMBONUS", GOTARMBONUS},
+    {"GOTSTIM", GOTSTIM},
+    {"GOTMEDINEED", GOTMEDINEED},
+    {"GOTMEDIKIT", GOTMEDIKIT},
+    {"GOTSUPER", GOTSUPER},
+    {"GOTBLUECARD", GOTBLUECARD},
+    {"GOTYELWCARD", GOTYELWCARD},
+    {"GOTREDCARD", GOTREDCARD},
+    {"GOTBLUESKUL", GOTBLUESKUL},
+    {"GOTYELWSKUL", GOTYELWSKUL},
+    {"GOTREDSKULL", GOTREDSKULL},
+    {"GOTINVUL", GOTINVUL},
+    {"GOTBERSERK", GOTBERSERK},
+    {"GOTINVIS", GOTINVIS},
+    {"GOTSUIT", GOTSUIT},
+    {"GOTMAP", GOTMAP},
+    {"GOTVISOR", GOTVISOR},
+    {"GOTMSPHERE", GOTMSPHERE},
+    {"GOTCLIP", GOTCLIP},
+    {"GOTCLIPBOX", GOTCLIPBOX},
+    {"GOTROCKET", GOTROCKET},
+    {"GOTROCKBOX", GOTROCKBOX},
+    {"GOTCELL", GOTCELL},
+    {"GOTCELLBOX", GOTCELLBOX},
+    {"GOTSHELLS", GOTSHELLS},
+    {"GOTSHELLBOX", GOTSHELLBOX},
+    {"GOTBACKPACK", GOTBACKPACK},
+    {"GOTBFG9000", GOTBFG9000},
+    {"GOTCHAINGUN", GOTCHAINGUN},
+    {"GOTCHAINSAW", GOTCHAINSAW},
+    {"GOTLAUNCHER", GOTLAUNCHER},
+    {"GOTPLASMA", GOTPLASMA},
+    {"GOTSHOTGUN", GOTSHOTGUN},
+    {"GOTSHOTGUN2", GOTSHOTGUN2},
+    // part 3 - messages when keys are needed
+    {"PD_BLUEO", PD_BLUEO},
+    {"PD_REDO", PD_REDO},
+    {"PD_YELLOWO", PD_YELLOWO},
+    {"PD_BLUEK", PD_BLUEK},
+    {"PD_REDK", PD_REDK},
+    {"PD_YELLOWK", PD_YELLOWK},
+    // part 4 - multiplayer messaging
+    {"HUSTR_MSGU", HUSTR_MSGU},
+    {"HUSTR_MESSAGESENT", HUSTR_MESSAGESENT},
+    {"HUSTR_CHATMACRO0", HUSTR_CHATMACRO0},
+    {"HUSTR_CHATMACRO1", HUSTR_CHATMACRO1},
+    {"HUSTR_CHATMACRO2", HUSTR_CHATMACRO2},
+    {"HUSTR_CHATMACRO3", HUSTR_CHATMACRO3},
+    {"HUSTR_CHATMACRO4", HUSTR_CHATMACRO4},
+    {"HUSTR_CHATMACRO5", HUSTR_CHATMACRO5},
+    {"HUSTR_CHATMACRO6", HUSTR_CHATMACRO6},
+    {"HUSTR_CHATMACRO7", HUSTR_CHATMACRO7},
+    {"HUSTR_CHATMACRO8", HUSTR_CHATMACRO8},
+    {"HUSTR_CHATMACRO9", HUSTR_CHATMACRO9},
+    {"HUSTR_TALKTOSELF1", HUSTR_TALKTOSELF1},
+    {"HUSTR_TALKTOSELF2", HUSTR_TALKTOSELF2},
+    {"HUSTR_TALKTOSELF3", HUSTR_TALKTOSELF3},
+    {"HUSTR_TALKTOSELF4", HUSTR_TALKTOSELF4},
+    {"HUSTR_TALKTOSELF5", HUSTR_TALKTOSELF5},
+    {"HUSTR_PLRGREEN", HUSTR_PLRGREEN},
+    {"HUSTR_PLRINDIGO", HUSTR_PLRINDIGO},
+    {"HUSTR_PLRBROWN", HUSTR_PLRBROWN},
+    {"HUSTR_PLRRED", HUSTR_PLRRED},
+    // part 5 - level names in the automap
+    {"HUSTR_E1M1", HUSTR_E1M1},
+    {"HUSTR_E1M2", HUSTR_E1M2},
+    {"HUSTR_E1M3", HUSTR_E1M3},
+    {"HUSTR_E1M4", HUSTR_E1M4},
+    {"HUSTR_E1M5", HUSTR_E1M5},
+    {"HUSTR_E1M6", HUSTR_E1M6},
+    {"HUSTR_E1M7", HUSTR_E1M7},
+    {"HUSTR_E1M8", HUSTR_E1M8},
+    {"HUSTR_E1M9", HUSTR_E1M9},
+    {"HUSTR_E2M1", HUSTR_E2M1},
+    {"HUSTR_E2M2", HUSTR_E2M2},
+    {"HUSTR_E2M3", HUSTR_E2M3},
+    {"HUSTR_E2M4", HUSTR_E2M4},
+    {"HUSTR_E2M5", HUSTR_E2M5},
+    {"HUSTR_E2M6", HUSTR_E2M6},
+    {"HUSTR_E2M7", HUSTR_E2M7},
+    {"HUSTR_E2M8", HUSTR_E2M8},
+    {"HUSTR_E2M9", HUSTR_E2M9},
+    {"HUSTR_E3M1", HUSTR_E3M1},
+    {"HUSTR_E3M2", HUSTR_E3M2},
+    {"HUSTR_E3M3", HUSTR_E3M3},
+    {"HUSTR_E3M4", HUSTR_E3M4},
+    {"HUSTR_E3M5", HUSTR_E3M5},
+    {"HUSTR_E3M6", HUSTR_E3M6},
+    {"HUSTR_E3M7", HUSTR_E3M7},
+    {"HUSTR_E3M8", HUSTR_E3M8},
+    {"HUSTR_E3M9", HUSTR_E3M9},
+    {"HUSTR_E4M1", HUSTR_E4M1},
+    {"HUSTR_E4M2", HUSTR_E4M2},
+    {"HUSTR_E4M3", HUSTR_E4M3},
+    {"HUSTR_E4M4", HUSTR_E4M4},
+    {"HUSTR_E4M5", HUSTR_E4M5},
+    {"HUSTR_E4M6", HUSTR_E4M6},
+    {"HUSTR_E4M7", HUSTR_E4M7},
+    {"HUSTR_E4M8", HUSTR_E4M8},
+    {"HUSTR_E4M9", HUSTR_E4M9},
+    {"HUSTR_1", HUSTR_1},
+    {"HUSTR_2", HUSTR_2},
+    {"HUSTR_3", HUSTR_3},
+    {"HUSTR_4", HUSTR_4},
+    {"HUSTR_5", HUSTR_5},
+    {"HUSTR_6", HUSTR_6},
+    {"HUSTR_7", HUSTR_7},
+    {"HUSTR_8", HUSTR_8},
+    {"HUSTR_9", HUSTR_9},
+    {"HUSTR_10", HUSTR_10},
+    {"HUSTR_11", HUSTR_11},
+    {"HUSTR_12", HUSTR_12},
+    {"HUSTR_13", HUSTR_13},
+    {"HUSTR_14", HUSTR_14},
+    {"HUSTR_15", HUSTR_15},
+    {"HUSTR_16", HUSTR_16},
+    {"HUSTR_17", HUSTR_17},
+    {"HUSTR_18", HUSTR_18},
+    {"HUSTR_19", HUSTR_19},
+    {"HUSTR_20", HUSTR_20},
+    {"HUSTR_21", HUSTR_21},
+    {"HUSTR_22", HUSTR_22},
+    {"HUSTR_23", HUSTR_23},
+    {"HUSTR_24", HUSTR_24},
+    {"HUSTR_25", HUSTR_25},
+    {"HUSTR_26", HUSTR_26},
+    {"HUSTR_27", HUSTR_27},
+    {"HUSTR_28", HUSTR_28},
+    {"HUSTR_29", HUSTR_29},
+    {"HUSTR_30", HUSTR_30},
+    {"HUSTR_31", HUSTR_31},
+    {"HUSTR_32", HUSTR_32},
+    {"PHUSTR_1", PHUSTR_1},
+    {"PHUSTR_2", PHUSTR_2},
+    {"PHUSTR_3", PHUSTR_3},
+    {"PHUSTR_4", PHUSTR_4},
+    {"PHUSTR_5", PHUSTR_5},
+    {"PHUSTR_6", PHUSTR_6},
+    {"PHUSTR_7", PHUSTR_7},
+    {"PHUSTR_8", PHUSTR_8},
+    {"PHUSTR_9", PHUSTR_9},
+    {"PHUSTR_10", PHUSTR_10},
+    {"PHUSTR_11", PHUSTR_11},
+    {"PHUSTR_12", PHUSTR_12},
+    {"PHUSTR_13", PHUSTR_13},
+    {"PHUSTR_14", PHUSTR_14},
+    {"PHUSTR_15", PHUSTR_15},
+    {"PHUSTR_16", PHUSTR_16},
+    {"PHUSTR_17", PHUSTR_17},
+    {"PHUSTR_18", PHUSTR_18},
+    {"PHUSTR_19", PHUSTR_19},
+    {"PHUSTR_20", PHUSTR_20},
+    {"PHUSTR_21", PHUSTR_21},
+    {"PHUSTR_22", PHUSTR_22},
+    {"PHUSTR_23", PHUSTR_23},
+    {"PHUSTR_24", PHUSTR_24},
+    {"PHUSTR_25", PHUSTR_25},
+    {"PHUSTR_26", PHUSTR_26},
+    {"PHUSTR_27", PHUSTR_27},
+    {"PHUSTR_28", PHUSTR_28},
+    {"PHUSTR_29", PHUSTR_29},
+    {"PHUSTR_30", PHUSTR_30},
+    {"PHUSTR_31", PHUSTR_31},
+    {"PHUSTR_32", PHUSTR_32},
+    {"THUSTR_1", THUSTR_1},
+    {"THUSTR_2", THUSTR_2},
+    {"THUSTR_3", THUSTR_3},
+    {"THUSTR_4", THUSTR_4},
+    {"THUSTR_5", THUSTR_5},
+    {"THUSTR_6", THUSTR_6},
+    {"THUSTR_7", THUSTR_7},
+    {"THUSTR_8", THUSTR_8},
+    {"THUSTR_9", THUSTR_9},
+    {"THUSTR_10", THUSTR_10},
+    {"THUSTR_11", THUSTR_11},
+    {"THUSTR_12", THUSTR_12},
+    {"THUSTR_13", THUSTR_13},
+    {"THUSTR_14", THUSTR_14},
+    {"THUSTR_15", THUSTR_15},
+    {"THUSTR_16", THUSTR_16},
+    {"THUSTR_17", THUSTR_17},
+    {"THUSTR_18", THUSTR_18},
+    {"THUSTR_19", THUSTR_19},
+    {"THUSTR_20", THUSTR_20},
+    {"THUSTR_21", THUSTR_21},
+    {"THUSTR_22", THUSTR_22},
+    {"THUSTR_23", THUSTR_23},
+    {"THUSTR_24", THUSTR_24},
+    {"THUSTR_25", THUSTR_25},
+    {"THUSTR_26", THUSTR_26},
+    {"THUSTR_27", THUSTR_27},
+    {"THUSTR_28", THUSTR_28},
+    {"THUSTR_29", THUSTR_29},
+    {"THUSTR_30", THUSTR_30},
+    {"THUSTR_31", THUSTR_31},
+    {"THUSTR_32", THUSTR_32},
+    // part 6 - messages as a result of toggling states
+    {"AMSTR_FOLLOWON", AMSTR_FOLLOWON},
+    {"AMSTR_FOLLOWOFF", AMSTR_FOLLOWOFF},
+    {"AMSTR_GRIDON", AMSTR_GRIDON},
+    {"AMSTR_GRIDOFF", AMSTR_GRIDOFF},
+    {"AMSTR_MARKEDSPOT", AMSTR_MARKEDSPOT},
+    {"AMSTR_MARKSCLEARED", AMSTR_MARKSCLEARED},
+    {"STSTR_MUS", STSTR_MUS},
+    {"STSTR_NOMUS", STSTR_NOMUS},
+    {"STSTR_DQDON", STSTR_DQDON},
+    {"STSTR_DQDOFF", STSTR_DQDOFF},
+    {"STSTR_KFAADDED", STSTR_KFAADDED},
+    {"STSTR_FAADDED", STSTR_FAADDED},
+    {"STSTR_NCON", STSTR_NCON},
+    {"STSTR_NCOFF", STSTR_NCOFF},
+    {"STSTR_BEHOLD", STSTR_BEHOLD},
+    {"STSTR_BEHOLDX", STSTR_BEHOLDX},
+    {"STSTR_CHOPPERS", STSTR_CHOPPERS},
+    {"STSTR_CLEV", STSTR_CLEV},
+    // part 7 - episode intermission texts
+    {"E1TEXT", E1TEXT},
+    {"E2TEXT", E2TEXT},
+    {"E3TEXT", E3TEXT},
+    {"E4TEXT", E4TEXT},
+    {"C1TEXT", C1TEXT},
+    {"C2TEXT", C2TEXT},
+    {"C3TEXT", C3TEXT},
+    {"C4TEXT", C4TEXT},
+    {"C5TEXT", C5TEXT},
+    {"C6TEXT", C6TEXT},
+    {"P1TEXT", P1TEXT},
+    {"P2TEXT", P2TEXT},
+    {"P3TEXT", P3TEXT},
+    {"P4TEXT", P4TEXT},
+    {"P5TEXT", P5TEXT},
+    {"P6TEXT", P6TEXT},
+    {"T1TEXT", T1TEXT},
+    {"T2TEXT", T2TEXT},
+    {"T3TEXT", T3TEXT},
+    {"T4TEXT", T4TEXT},
+    {"T5TEXT", T5TEXT},
+    {"T6TEXT", T6TEXT},
+    // part 8 - creature names for the finale
+    {"CC_ZOMBIE", CC_ZOMBIE},
+    {"CC_SHOTGUN", CC_SHOTGUN},
+    {"CC_HEAVY", CC_HEAVY},
+    {"CC_IMP", CC_IMP},
+    {"CC_DEMON", CC_DEMON},
+    {"CC_LOST", CC_LOST},
+    {"CC_CACO", CC_CACO},
+    {"CC_HELL", CC_HELL},
+    {"CC_BARON", CC_BARON},
+    {"CC_ARACH", CC_ARACH},
+    {"CC_PAIN", CC_PAIN},
+    {"CC_REVEN", CC_REVEN},
+    {"CC_MANCU", CC_MANCU},
+    {"CC_ARCH", CC_ARCH},
+    {"CC_SPIDER", CC_SPIDER},
+    {"CC_CYBER", CC_CYBER},
+    {"CC_HERO", CC_HERO},
+    // part 9 - intermission tiled backgrounds
+    {"BGFLATE1", "FLOOR4_8"},
+    {"BGFLATE2", "SFLR6_1"},
+    {"BGFLATE3", "MFLR8_4"},
+    {"BGFLATE4", "MFLR8_3"},
+    {"BGFLAT06", "SLIME16"},
+    {"BGFLAT11", "RROCK14"},
+    {"BGFLAT20", "RROCK07"},
+    {"BGFLAT30", "RROCK17"},
+    {"BGFLAT15", "RROCK13"},
+    {"BGFLAT31", "RROCK19"},
+    {"BGCASTCALL", "BOSSBACK"},
+};
+
+static void *DEH_BEXStrStart(deh_context_t *context, char *line)
+{
+    char s[10];
+
+    if (sscanf(line, "%9s", s) == 0 || strncmp("[STRINGS]", s, sizeof(s)))
+    {
+	DEH_Warning(context, "Parse error on section start");
+    }
+
+    return NULL;
+}
+
+static void DEH_BEXStrParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    int i;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+	DEH_Warning(context, "Failed to parse assignment");
+	return;
+    }
+
+    for (i = 0; i < arrlen(bex_stringtable); i++)
+    {
+	if (!strcmp(bex_stringtable[i].macro, variable_name))
+	{
+	    DEH_AddStringReplacement(bex_stringtable[i].string, value);
+	}
+    }
+}
+
+deh_section_t deh_section_bexstr =
+{
+    "[STRINGS]",
+    NULL,
+    DEH_BEXStrStart,
+    DEH_BEXStrParseLine,
+    NULL,
+    NULL,
+};
diff --git a/games/NXDoom/src/doom/deh_cheat.c b/games/NXDoom/src/doom/deh_cheat.c
new file mode 100644
index 000000000..8e269c04e
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_cheat.c
@@ -0,0 +1,146 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Cheat" sections in dehacked files
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "am_map.h"
+#include "st_stuff.h"
+
+typedef struct 
+{
+    const char *name;
+    cheatseq_t *seq;
+} deh_cheat_t;
+
+static deh_cheat_t allcheats[] =
+{
+    {"Change music",        &cheat_mus },
+    {"Chainsaw",            &cheat_choppers },
+    {"God mode",            &cheat_god },
+    {"Ammo & Keys",         &cheat_ammo },
+    {"Ammo",                &cheat_ammonokey },
+    {"No Clipping 1",       &cheat_noclip },
+    {"No Clipping 2",       &cheat_commercial_noclip },
+    {"Invincibility",       &cheat_powerup[0] },
+    {"Berserk",             &cheat_powerup[1] },
+    {"Invisibility",        &cheat_powerup[2] },
+    {"Radiation Suit",      &cheat_powerup[3] },
+    {"Auto-map",            &cheat_powerup[4] },
+    {"Lite-Amp Goggles",    &cheat_powerup[5] },
+    {"BEHOLD menu",         &cheat_powerup[6] },
+    {"Level Warp",          &cheat_clev },
+    {"Player Position",     &cheat_mypos },
+    {"Map cheat",           &cheat_amap },
+};
+
+static deh_cheat_t *FindCheatByName(char *name)
+{
+    size_t i;
+    
+    for (i=0; i<arrlen(allcheats); ++i)
+    {
+        if (!strcasecmp(allcheats[i].name, name))
+            return &allcheats[i];
+    }
+
+    return NULL;
+}
+
+static void *DEH_CheatStart(deh_context_t *context, char *line)
+{
+    return NULL;
+}
+
+static void DEH_CheatParseLine(deh_context_t *context, char *line, void *tag)
+{
+    deh_cheat_t *cheat;
+    char *variable_name;
+    char *value;
+    unsigned char *unsvalue;
+    unsigned int i;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    unsvalue = (unsigned char *) value;
+
+    cheat = FindCheatByName(variable_name);
+
+    if (cheat == NULL)
+    {
+        DEH_Warning(context, "Unknown cheat '%s'", variable_name);
+        return;
+    }
+
+    // write the value into the cheat sequence
+
+    i = 0;
+
+    while (unsvalue[i] != 0 && unsvalue[i] != 0xff)
+    {
+        // If the cheat length exceeds the Vanilla limit, stop.  This
+        // does not apply if we have the limit turned off.
+
+        if (!deh_allow_long_cheats && i >= cheat->seq->sequence_len)
+        {
+            DEH_Warning(context, "Cheat sequence longer than supported by "
+                                 "Vanilla dehacked");
+            break;
+        }
+
+	if (deh_apply_cheats)
+	{
+	    cheat->seq->sequence[i] = unsvalue[i];
+	}
+        ++i;
+
+        // Absolute limit - don't exceed
+
+        if (i >= MAX_CHEAT_LEN - cheat->seq->parameter_chars)
+        {
+            DEH_Error(context, "Cheat sequence too long!");
+            return;
+        }
+    }
+
+    if (deh_apply_cheats)
+    {
+        cheat->seq->sequence[i] = '\0';
+    }
+}
+
+deh_section_t deh_section_cheat =
+{
+    "Cheat",
+    NULL,
+    DEH_CheatStart,
+    DEH_CheatParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/doom/deh_doom.c b/games/NXDoom/src/doom/deh_doom.c
new file mode 100644
index 000000000..b7ff04a73
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_doom.c
@@ -0,0 +1,48 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Top-level dehacked definitions for Doom dehacked.
+//
+
+#include <stdlib.h>
+#include "deh_defs.h"
+#include "deh_main.h"
+
+const char *deh_signatures[] =
+{
+    "Patch File for DeHackEd v2.3",
+    "Patch File for DeHackEd v3.0",
+    NULL
+};
+
+
+//
+// List of section types:
+//
+
+deh_section_t *deh_section_types[] =
+{
+    &deh_section_ammo,
+    &deh_section_cheat,
+    &deh_section_frame,
+    &deh_section_misc,
+    &deh_section_pointer,
+    &deh_section_sound,
+    &deh_section_text,
+    &deh_section_thing,
+    &deh_section_weapon,
+    &deh_section_bexstr,
+    NULL
+};
+
diff --git a/games/NXDoom/src/doom/deh_frame.c b/games/NXDoom/src/doom/deh_frame.c
new file mode 100644
index 000000000..e1cd59da7
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_frame.c
@@ -0,0 +1,161 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Frame" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "d_items.h"
+#include "info.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+DEH_BEGIN_MAPPING(state_mapping, state_t)
+  DEH_MAPPING("Sprite number",    sprite)
+  DEH_MAPPING("Sprite subnumber", frame)
+  DEH_MAPPING("Duration",         tics)
+  DEH_MAPPING("Next frame",       nextstate)
+  DEH_MAPPING("Unknown 1",        misc1)
+  DEH_MAPPING("Unknown 2",        misc2)
+  DEH_UNSUPPORTED_MAPPING("Codep frame")
+DEH_END_MAPPING
+
+static void *DEH_FrameStart(deh_context_t *context, char *line)
+{
+    int frame_number = 0;
+    state_t *state;
+    
+    if (sscanf(line, "Frame %i", &frame_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+    
+    if (frame_number < 0 || frame_number >= NUMSTATES)
+    {
+        DEH_Warning(context, "Invalid frame number: %i", frame_number);
+        return NULL;
+    }
+
+    if (frame_number >= DEH_VANILLA_NUMSTATES) 
+    {
+        DEH_Warning(context, "Attempt to modify frame %i: this will cause "
+                             "problems in Vanilla dehacked.", frame_number);
+    }
+
+    state = &states[frame_number];
+
+    return state;
+}
+
+// Simulate a frame overflow: Doom has 967 frames in the states[] array, but
+// DOS dehacked internally only allocates memory for 966.  As a result, 
+// attempts to set frame 966 (the last frame) will overflow the dehacked
+// array and overwrite the weaponinfo[] array instead.
+//
+// This is noticable in Batman Doom where it is impossible to switch weapons
+// away from the fist once selected.
+
+static void DEH_FrameOverflow(deh_context_t *context, char *varname, int value)
+{
+    if (!strcasecmp(varname, "Duration"))
+    {
+        weaponinfo[0].ammo = value;
+    }
+    else if (!strcasecmp(varname, "Codep frame")) 
+    {
+        weaponinfo[0].upstate = value;
+    }
+    else if (!strcasecmp(varname, "Next frame")) 
+    {
+        weaponinfo[0].downstate = value;
+    }
+    else if (!strcasecmp(varname, "Unknown 1"))
+    {
+        weaponinfo[0].readystate = value;
+    }
+    else if (!strcasecmp(varname, "Unknown 2"))
+    {
+        weaponinfo[0].atkstate = value;
+    }
+    else
+    {
+        DEH_Error(context, "Unable to simulate frame overflow: field '%s'",
+                  varname);
+    }
+}
+
+static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
+{
+    state_t *state;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    state = (state_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    if (state == &states[NUMSTATES - 1])
+    {
+        DEH_FrameOverflow(context, variable_name, ivalue);
+    }
+    else
+    {
+        // set the appropriate field
+
+        DEH_SetMapping(context, &state_mapping, state, variable_name, ivalue);
+    }
+}
+
+static void DEH_FrameSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
+    }
+}
+
+deh_section_t deh_section_frame =
+{
+    "Frame",
+    NULL,
+    DEH_FrameStart,
+    DEH_FrameParseLine,
+    NULL,
+    DEH_FrameSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/doom/deh_misc.c b/games/NXDoom/src/doom/deh_misc.c
new file mode 100644
index 000000000..9b76a429c
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_misc.c
@@ -0,0 +1,228 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Misc" sections in dehacked files
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "deh_misc.h"
+
+// Dehacked: "Initial Health" 
+// This is the initial health a player has when starting anew.
+// See G_PlayerReborn in g_game.c
+
+int deh_initial_health = DEH_DEFAULT_INITIAL_HEALTH;
+
+// Dehacked: "Initial bullets"
+// This is the number of bullets the player has when starting anew.
+// See G_PlayerReborn in g_game.c
+
+int deh_initial_bullets = DEH_DEFAULT_INITIAL_BULLETS;
+
+// Dehacked: "Max Health"
+// This is the maximum health that can be reached using health
+// potions. See P_TouchSpecialThing in p_inter.c
+
+int deh_max_health = DEH_DEFAULT_MAX_HEALTH;
+
+// Dehacked: "Max Armor"
+// This is the maximum armor which can be reached by picking up
+// armor helmets. See P_TouchSpecialThing in p_inter.c
+
+int deh_max_armor = DEH_DEFAULT_MAX_ARMOR;
+
+// Dehacked: "Green Armor Class"
+// This is the armor class that is given when picking up the green 
+// armor or an armor helmet. See P_TouchSpecialThing in p_inter.c
+//
+// DOS dehacked only modifies the behavior of the green armor shirt,
+// the armor class set by armor helmets is not affected.
+
+int deh_green_armor_class = DEH_DEFAULT_GREEN_ARMOR_CLASS;
+
+// Dehacked: "Blue Armor Class"
+// This is the armor class that is given when picking up the blue 
+// armor or a megasphere. See P_TouchSpecialThing in p_inter.c
+//
+// DOS dehacked only modifies the MegaArmor behavior and not
+// the MegaSphere, which always gives armor type 2.
+
+int deh_blue_armor_class = DEH_DEFAULT_BLUE_ARMOR_CLASS;
+
+// Dehacked: "Max soulsphere"
+// The maximum health which can be reached by picking up the
+// soulsphere.  See P_TouchSpecialThing in p_inter.c
+
+int deh_max_soulsphere = DEH_DEFAULT_MAX_SOULSPHERE;
+
+// Dehacked: "Soulsphere health"
+// The amount of health bonus that picking up a soulsphere
+// gives.  See P_TouchSpecialThing in p_inter.c
+
+int deh_soulsphere_health = DEH_DEFAULT_SOULSPHERE_HEALTH;
+
+// Dehacked: "Megasphere health"
+// This is what the health is set to after picking up a 
+// megasphere.  See P_TouchSpecialThing in p_inter.c
+
+int deh_megasphere_health = DEH_DEFAULT_MEGASPHERE_HEALTH;
+
+// Dehacked: "God mode health"
+// This is what the health value is set to when cheating using
+// the IDDQD god mode cheat.  See ST_Responder in st_stuff.c
+
+int deh_god_mode_health = DEH_DEFAULT_GOD_MODE_HEALTH;
+
+// Dehacked: "IDFA Armor"
+// This is what the armor is set to when using the IDFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idfa_armor = DEH_DEFAULT_IDFA_ARMOR;
+
+// Dehacked: "IDFA Armor Class"
+// This is what the armor class is set to when using the IDFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idfa_armor_class = DEH_DEFAULT_IDFA_ARMOR_CLASS;
+
+// Dehacked: "IDKFA Armor"
+// This is what the armor is set to when using the IDKFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idkfa_armor = DEH_DEFAULT_IDKFA_ARMOR;
+
+// Dehacked: "IDKFA Armor Class"
+// This is what the armor class is set to when using the IDKFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idkfa_armor_class = DEH_DEFAULT_IDKFA_ARMOR_CLASS;
+
+// Dehacked: "BFG Cells/Shot"
+// This is the number of CELLs firing the BFG uses up.
+// See P_CheckAmmo and A_FireBFG in p_pspr.c
+
+int deh_bfg_cells_per_shot = DEH_DEFAULT_BFG_CELLS_PER_SHOT;
+
+// Dehacked: "Monsters infight"
+// This controls whether monsters can harm other monsters of the same 
+// species.  For example, whether an imp fireball will damage other
+// imps.  The value of this in dehacked patches is weird - '202' means
+// off, while '221' means on.
+//
+// See PIT_CheckThing in p_map.c
+
+int deh_species_infighting = DEH_DEFAULT_SPECIES_INFIGHTING;
+
+static struct
+{
+    const char *deh_name;
+    int *value;
+} misc_settings[] = {
+    {"Initial Health",      &deh_initial_health},
+    {"Initial Bullets",     &deh_initial_bullets},
+    {"Max Health",          &deh_max_health},
+    {"Max Armor",           &deh_max_armor},
+    {"Green Armor Class",   &deh_green_armor_class},
+    {"Blue Armor Class",    &deh_blue_armor_class},
+    {"Max Soulsphere",      &deh_max_soulsphere},
+    {"Soulsphere Health",   &deh_soulsphere_health},
+    {"Megasphere Health",   &deh_megasphere_health},
+    {"God Mode Health",     &deh_god_mode_health},
+    {"IDFA Armor",          &deh_idfa_armor},
+    {"IDFA Armor Class",    &deh_idfa_armor_class},
+    {"IDKFA Armor",         &deh_idkfa_armor},
+    {"IDKFA Armor Class",   &deh_idkfa_armor_class},
+    {"BFG Cells/Shot",      &deh_bfg_cells_per_shot},
+};
+
+static void *DEH_MiscStart(deh_context_t *context, char *line)
+{
+    return NULL;
+}
+
+static void DEH_MiscParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    int ivalue;
+    size_t i;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    if (!strcasecmp(variable_name, "Monsters Infight"))
+    {
+        // See notes above.
+ 
+        if (ivalue == 202)
+        {
+            deh_species_infighting = 0;
+        }
+        else if (ivalue == 221)
+        {
+            deh_species_infighting = 1;
+        }
+        else
+        {
+            DEH_Warning(context, 
+                        "Invalid value for 'Monsters Infight': %i", ivalue);
+        }
+        
+        return;
+    }
+
+    for (i=0; i<arrlen(misc_settings); ++i)
+    {
+        if (!strcasecmp(variable_name, misc_settings[i].deh_name))
+        {
+            *misc_settings[i].value = ivalue;
+            return;
+        }
+    }
+
+    DEH_Warning(context, "Unknown Misc variable '%s'", variable_name);
+}
+
+static void DEH_MiscSHA1Sum(sha1_context_t *context)
+{
+    unsigned int i;
+
+    for (i=0; i<arrlen(misc_settings); ++i)
+    {
+        SHA1_UpdateInt32(context, *misc_settings[i].value);
+    }
+}
+
+deh_section_t deh_section_misc =
+{
+    "Misc",
+    NULL,
+    DEH_MiscStart,
+    DEH_MiscParseLine,
+    NULL,
+    DEH_MiscSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/doom/deh_misc.h b/games/NXDoom/src/doom/deh_misc.h
new file mode 100644
index 000000000..f29428f55
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_misc.h
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Misc" sections in dehacked files
+//
+
+#ifndef DEH_MISC_H
+#define DEH_MISC_H
+
+#define DEH_DEFAULT_INITIAL_HEALTH 100
+#define DEH_DEFAULT_INITIAL_BULLETS 50
+#define DEH_DEFAULT_MAX_HEALTH 200
+#define DEH_DEFAULT_MAX_ARMOR 200
+#define DEH_DEFAULT_GREEN_ARMOR_CLASS 1
+#define DEH_DEFAULT_BLUE_ARMOR_CLASS 2
+#define DEH_DEFAULT_MAX_SOULSPHERE 200
+#define DEH_DEFAULT_SOULSPHERE_HEALTH 100
+#define DEH_DEFAULT_MEGASPHERE_HEALTH 200
+#define DEH_DEFAULT_GOD_MODE_HEALTH 100
+#define DEH_DEFAULT_IDFA_ARMOR 200
+#define DEH_DEFAULT_IDFA_ARMOR_CLASS 2
+#define DEH_DEFAULT_IDKFA_ARMOR 200
+#define DEH_DEFAULT_IDKFA_ARMOR_CLASS 2
+#define DEH_DEFAULT_BFG_CELLS_PER_SHOT 40
+#define DEH_DEFAULT_SPECIES_INFIGHTING 0
+
+extern int deh_initial_health;
+extern int deh_initial_bullets;
+extern int deh_max_health;
+extern int deh_max_armor;
+extern int deh_green_armor_class;
+extern int deh_blue_armor_class;
+extern int deh_max_soulsphere;
+extern int deh_soulsphere_health;
+extern int deh_megasphere_health;
+extern int deh_god_mode_health;
+extern int deh_idfa_armor;
+extern int deh_idfa_armor_class;
+extern int deh_idkfa_armor;
+extern int deh_idkfa_armor_class;
+extern int deh_bfg_cells_per_shot;
+extern int deh_species_infighting;
+
+#if 0
+
+// To compile without dehacked, it's possible to use these:
+
+#define deh_initial_health      DEH_DEFAULT_INITIAL_HEALTH
+#define deh_initial_bullets     DEH_DEFAULT_INITIAL_BULLETS
+#define deh_max_health          DEH_DEFAULT_MAX_HEALTH
+#define deh_max_armor           DEH_DEFAULT_MAX_ARMOR
+#define deh_green_armor_class   DEH_DEFAULT_GREEN_ARMOR_CLASS
+#define deh_blue_armor_class    DEH_DEFAULT_BLUE_ARMOR_CLASS
+#define deh_max_soulsphere      DEH_DEFAULT_MAX_SOULSPHERE
+#define deh_soulsphere_health   DEH_DEFAULT_SOULSPHERE_HEALTH
+#define deh_megasphere_health   DEH_DEFAULT_MEGASPHERE_HEALTH
+#define deh_god_mode_health     DEH_DEFAULT_GOD_MODE_HEALTH
+#define deh_idfa_armor          DEH_DEFAULT_IDFA_ARMOR
+#define deh_idfa_armor_class    DEH_DEFAULT_IDFA_ARMOR_CLASS
+#define deh_idkfa_armor         DEH_DEFAULT_IDKFA_ARMOR
+#define deh_idkfa_armor_class   DEH_DEFAULT_IDKFA_ARMOR_CLASS
+#define deh_bfg_cells_per_shot  DEH_DEFAULT_BFG_CELLS_PER_SHOT
+#define deh_species_infighting  DEH_DEFAULT_SPECIES_INFIGHTING
+
+#endif
+
+#endif /* #ifndef DEH_MISC_H */
+
diff --git a/games/NXDoom/src/doom/deh_ptr.c b/games/NXDoom/src/doom/deh_ptr.c
new file mode 100644
index 000000000..5ca3116f2
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_ptr.c
@@ -0,0 +1,142 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses Action Pointer entries in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "info.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+
+static actionf_t codeptrs[NUMSTATES];
+
+static int CodePointerIndex(actionf_t *ptr)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        if (!memcmp(&codeptrs[i], ptr, sizeof(actionf_t)))
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+static void DEH_PointerInit(void)
+{
+    int i;
+    
+    // Initialize list of dehacked pointers
+
+    for (i=0; i<NUMSTATES; ++i)
+        codeptrs[i] = states[i].action;
+}
+
+static void *DEH_PointerStart(deh_context_t *context, char *line)
+{
+    int frame_number = 0;
+    
+    // FIXME: can the third argument here be something other than "Frame"
+    // or are we ok?
+
+    if (sscanf(line, "Pointer %*i (%*s %i)", &frame_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (frame_number < 0 || frame_number >= NUMSTATES)
+    {
+        DEH_Warning(context, "Invalid frame number: %i", frame_number);
+        return NULL;
+    }
+
+    return &states[frame_number];
+}
+
+static void DEH_PointerParseLine(deh_context_t *context, char *line, void *tag)
+{
+    state_t *state;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    state = (state_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+//    printf("Set %s to %s for state\n", variable_name, value);
+
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    // set the appropriate field
+
+    if (!strcasecmp(variable_name, "Codep frame"))
+    {
+        if (ivalue < 0 || ivalue >= NUMSTATES)
+        {
+            DEH_Warning(context, "Invalid state '%i'", ivalue);
+        }
+        else
+        {        
+            state->action = codeptrs[ivalue];
+        }
+    }
+    else
+    {
+        DEH_Warning(context, "Unknown variable name '%s'", variable_name);
+    }
+}
+
+static void DEH_PointerSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        SHA1_UpdateInt32(context, CodePointerIndex(&states[i].action));
+    }
+}
+
+deh_section_t deh_section_pointer =
+{
+    "Pointer",
+    DEH_PointerInit,
+    DEH_PointerStart,
+    DEH_PointerParseLine,
+    NULL,
+    DEH_PointerSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/doom/deh_sound.c b/games/NXDoom/src/doom/deh_sound.c
new file mode 100644
index 000000000..8d178c785
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_sound.c
@@ -0,0 +1,102 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Sound" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+#include "sounds.h"
+
+DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t)
+    DEH_UNSUPPORTED_MAPPING("Offset")
+    DEH_UNSUPPORTED_MAPPING("Zero/One")
+    DEH_MAPPING("Value", priority)
+    DEH_MAPPING("Zero 1", link)
+    DEH_MAPPING("Zero 2", pitch)
+    DEH_MAPPING("Zero 3", volume)
+    DEH_UNSUPPORTED_MAPPING("Zero 4")
+    DEH_MAPPING("Neg. One 1", usefulness)
+    DEH_MAPPING("Neg. One 2", lumpnum)
+DEH_END_MAPPING
+
+static void *DEH_SoundStart(deh_context_t *context, char *line)
+{
+    int sound_number = 0;
+    
+    if (sscanf(line, "Sound %i", &sound_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (sound_number < 0 || sound_number >= NUMSFX)
+    {
+        DEH_Warning(context, "Invalid sound number: %i", sound_number);
+        return NULL;
+    }
+
+    if (sound_number >= DEH_VANILLA_NUMSFX)
+    {
+        DEH_Warning(context, "Attempt to modify SFX %i.  This will cause "
+                             "problems in Vanilla dehacked.", sound_number); 
+    }
+
+    return &S_sfx[sound_number];
+}
+
+static void DEH_SoundParseLine(deh_context_t *context, char *line, void *tag)
+{
+    sfxinfo_t *sfx;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    sfx = (sfxinfo_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    // Set the field value
+
+    DEH_SetMapping(context, &sound_mapping, sfx, variable_name, ivalue);
+}
+
+deh_section_t deh_section_sound =
+{
+    "Sound",
+    NULL,
+    DEH_SoundStart,
+    DEH_SoundParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/doom/deh_thing.c b/games/NXDoom/src/doom/deh_thing.c
new file mode 100644
index 000000000..a6baff1d7
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_thing.c
@@ -0,0 +1,131 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Thing" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+#include "info.h"
+
+DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
+  DEH_MAPPING("ID #",                doomednum)
+  DEH_MAPPING("Initial frame",       spawnstate)
+  DEH_MAPPING("Hit points",          spawnhealth)
+  DEH_MAPPING("First moving frame",  seestate)
+  DEH_MAPPING("Alert sound",         seesound)
+  DEH_MAPPING("Reaction time",       reactiontime)
+  DEH_MAPPING("Attack sound",        attacksound)
+  DEH_MAPPING("Injury frame",        painstate)
+  DEH_MAPPING("Pain chance",         painchance)
+  DEH_MAPPING("Pain sound",          painsound)
+  DEH_MAPPING("Close attack frame",  meleestate)
+  DEH_MAPPING("Far attack frame",    missilestate)
+  DEH_MAPPING("Death frame",         deathstate)
+  DEH_MAPPING("Exploding frame",     xdeathstate)
+  DEH_MAPPING("Death sound",         deathsound)
+  DEH_MAPPING("Speed",               speed)
+  DEH_MAPPING("Width",               radius)
+  DEH_MAPPING("Height",              height)
+  DEH_MAPPING("Mass",                mass)
+  DEH_MAPPING("Missile damage",      damage)
+  DEH_MAPPING("Action sound",        activesound)
+  DEH_MAPPING("Bits",                flags)
+  DEH_MAPPING("Respawn frame",       raisestate)
+DEH_END_MAPPING
+
+static void *DEH_ThingStart(deh_context_t *context, char *line)
+{
+    int thing_number = 0;
+    mobjinfo_t *mobj;
+    
+    if (sscanf(line, "Thing %i", &thing_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    // dehacked files are indexed from 1
+    --thing_number;
+
+    if (thing_number < 0 || thing_number >= NUMMOBJTYPES)
+    {
+        DEH_Warning(context, "Invalid thing number: %i", thing_number);
+        return NULL;
+    }
+    
+    mobj = &mobjinfo[thing_number];
+    
+    return mobj;
+}
+
+static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
+{
+    mobjinfo_t *mobj;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    mobj = (mobjinfo_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+//    printf("Set %s to %s for mobj\n", variable_name, value);
+
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    // Set the field value
+
+    DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
+}
+
+static void DEH_ThingSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMMOBJTYPES; ++i)
+    {
+        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
+    }
+}
+
+deh_section_t deh_section_thing =
+{
+    "Thing",
+    NULL,
+    DEH_ThingStart,
+    DEH_ThingParseLine,
+    NULL,
+    DEH_ThingSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/doom/deh_weapon.c b/games/NXDoom/src/doom/deh_weapon.c
new file mode 100644
index 000000000..2c1804758
--- /dev/null
+++ b/games/NXDoom/src/doom/deh_weapon.c
@@ -0,0 +1,101 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Weapon" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "d_items.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
+  DEH_MAPPING("Ammo type",        ammo)
+  DEH_MAPPING("Deselect frame",   upstate)
+  DEH_MAPPING("Select frame",     downstate)
+  DEH_MAPPING("Bobbing frame",    readystate)
+  DEH_MAPPING("Shooting frame",   atkstate)
+  DEH_MAPPING("Firing frame",     flashstate)
+DEH_END_MAPPING
+
+static void *DEH_WeaponStart(deh_context_t *context, char *line)
+{
+    int weapon_number = 0;
+
+    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (weapon_number < 0 || weapon_number >= NUMWEAPONS)
+    {
+        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
+        return NULL;
+    }
+    
+    return &weaponinfo[weapon_number];
+}
+
+static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    weaponinfo_t *weapon;
+    int ivalue;
+    
+    if (tag == NULL)
+        return;
+
+    weapon = (weaponinfo_t *) tag;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
+}
+
+static void DEH_WeaponSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMWEAPONS ;++i)
+    {
+        DEH_StructSHA1Sum(context, &weapon_mapping, &weaponinfo[i]);
+    }
+}
+
+deh_section_t deh_section_weapon =
+{
+    "Weapon",
+    NULL,
+    DEH_WeaponStart,
+    DEH_WeaponParseLine,
+    NULL,
+    DEH_WeaponSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/doom/doom_icon.c b/games/NXDoom/src/doom/doom_icon.c
new file mode 100644
index 000000000..4fb45212e
--- /dev/null
+++ b/games/NXDoom/src/doom/doom_icon.c
@@ -0,0 +1,2736 @@
+static int doom_icon_w = 128;
+static int doom_icon_h = 128;
+
+static const unsigned int doom_icon_data[] = {
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
+    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
+    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
+    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
+    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
+    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
+    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
+    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
+    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
+    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
+    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
+    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
+    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
+    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
+    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
+    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
+    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
+    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
+    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
+    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
+    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
+    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
+    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
+    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
+    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
+    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
+    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
+    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
+    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
+    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
+    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
+    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
+    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
+    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
+    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
+    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
+    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
+    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
+    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
+    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
+    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
+    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
+    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
+    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
+    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
+    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x93756aff, 0x917569ff, 0xa8836eff, 0xb68b70ff, 
+    0xb68b70ff, 0xb68b70ff, 0xb68b70ff, 0xb68b70ff, 0xb68b70ff, 0xbc967eff, 
+    0xc7ad9dff, 0xc6ac9cff, 0xc6ac9cff, 0xc5ab9bff, 0xc5ab9bff, 0xc4a99aff, 
+    0xc3a899ff, 0xc3a899ff, 0xc2a798ff, 0xba9581ff, 0xb58870ff, 0xb58870ff, 
+    0xb58770ff, 0xb58670ff, 0xb4856fff, 0xb2836dff, 0xb0816bff, 0xae7e69ff, 
+    0xad7f6aff, 0xb29183ff, 0xb29589ff, 0xb19387ff, 0xb09286ff, 0xad8f83ff, 
+    0xab8d81ff, 0xaa8c80ff, 0xa88a7eff, 0xa6877cff, 0xa28175ff, 0x986553ff, 
+    0x966351ff, 0x956150ff, 0x935f4eff, 0x915d4cff, 0x8f5a4aff, 0x8e5949ff, 
+    0x8c5647ff, 0x895445ff, 0x8d6154ff, 0x917169ff, 0x8f6f66ff, 0x8e6d65ff, 
+    0x8c6b63ff, 0x8a6961ff, 0x896860ff, 0x87655eff, 0x85635cff, 0x84625bff, 
+    0x7a473dff, 0x743b30ff, 0x72382fff, 0x753c34ff, 0x773f3aff, 0x7a4040ff, 
+    0x7c4345ff, 0x724549ff, 0x5f454bff, 0x674e55ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
+    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
+    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
+    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
+    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
+    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
+    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
+    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
+    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
+    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
+    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
+    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
+    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
+    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
+    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
+    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
+    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
+    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
+    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
+    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
+    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfac394ff, 0xfac79bff, 
+    0xf8c49aff, 0xf8c49aff, 0xf7c299ff, 0xf7c199ff, 0xf6c098ff, 0xf6bf98ff, 
+    0xf5bd97ff, 0xf6b68bff, 0xfda770ff, 0xfda670ff, 0xfca570ff, 0xfca470ff, 
+    0xfca370ff, 0xfca270ff, 0xfca070ff, 0xfc9f70ff, 0xfc9e70ff, 0xf4a783ff, 
+    0xedae91ff, 0xecac90ff, 0xecac90ff, 0xeba98fff, 0xe9a78dff, 0xe8a58cff, 
+    0xe6a38aff, 0xe5a189ff, 0xe39e87ff, 0xef8c6bff, 0xef8666ff, 0xed8364ff, 
+    0xec8163ff, 0xe97e61ff, 0xe87c60ff, 0xe6785eff, 0xe5775dff, 0xe3735aff, 
+    0xdf755fff, 0xd28474ff, 0xce8274ff, 0xcd8072ff, 0xcb7d71ff, 0xca7b6fff, 
+    0xc8796eff, 0xc6776cff, 0xc5756bff, 0xc37269ff, 0xc8655aff, 0xcf5348ff, 
+    0xcd5046ff, 0xcb4e45ff, 0xc94b42ff, 0xc84941ff, 0xc6453fff, 0xc4443eff, 
+    0xc2403cff, 0xc13e3bff, 0xb4504eff, 0xaf5656ff, 0xad5454ff, 0xad5658ff, 
+    0xae565bff, 0xad575dff, 0xaf5961ff, 0xaf5a64ff, 0xb05a67ff, 0xae5b69ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfc8929ff, 0xfe892aff, 0xfe882aff, 0xfe862aff, 0xfd842aff, 0xfd822aff, 
+    0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 
+    0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 
+    0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
+    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
+    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
+    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
+    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23c27ff, 0xf13a27ff, 
+    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
+    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
+    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
+    0xe6242bff, 0xe3242bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfb8729ff, 0xfe882aff, 0xfe862aff, 0xfd842aff, 
+    0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 
+    0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 
+    0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
+    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
+    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
+    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
+    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
+    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
+    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
+    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
+    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe2242bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfb8629ff, 0xfe862aff, 
+    0xfd842aff, 0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 
+    0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 
+    0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 
+    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
+    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
+    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
+    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
+    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
+    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
+    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
+    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe1232cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfb8429ff, 0xfd842aff, 0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 
+    0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 
+    0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 
+    0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
+    0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
+    0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
+    0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
+    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
+    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
+    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
+    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
+    0xe3232dff, 0xe0232dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfa8229ff, 0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 
+    0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 
+    0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 
+    0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
+    0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
+    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
+    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
+    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
+    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
+    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
+    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
+    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xdf232dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfa8029ff, 0xfd8129ff, 
+    0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 
+    0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 
+    0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 
+    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 
+    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
+    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
+    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
+    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
+    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
+    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
+    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xde232eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfa7f28ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 
+    0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 
+    0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
+    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
+    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
+    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
+    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
+    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
+    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
+    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
+    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
+    0xe0232fff, 0xdd222fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfa7e28ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 
+    0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 
+    0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
+    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
+    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
+    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
+    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
+    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
+    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
+    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
+    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
+    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xdc222fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf97c28ff, 0xfc7b29ff, 
+    0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 
+    0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 
+    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
+    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
+    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
+    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
+    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
+    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
+    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
+    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
+    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdb2230ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf97a28ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 
+    0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 
+    0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
+    0xf45f2cff, 0xb3a38eff, 0x80d8d8ff, 0x73e2eaff, 0x72e1eaff, 0x71dfe9ff, 
+    0x70dde8ff, 0x70dce7ff, 0x6fdae6ff, 0x6ed8e6ff, 0x6dd7e5ff, 0x6cd5e4ff, 
+    0x6cd4e3ff, 0x6bd2e2ff, 0x6bd0e1ff, 0x6acfe0ff, 0x69cde0ff, 0x69cbdfff, 
+    0x68cadeff, 0x69c6daff, 0x76b6c8ff, 0x8f9ba5ff, 0xbd6b6aff, 0xeb392dff, 
+    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
+    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
+    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
+    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
+    0xdd2231ff, 0xda2231ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf97928ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 
+    0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 
+    0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
+    0xf75e28ff, 0xf75c28ff, 0xa7b1a1ff, 0x6aeef8ff, 0x6aecf8ff, 0x69ebf7ff, 
+    0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 0x66e4f3ff, 0x65e2f3ff, 0x64e1f2ff, 
+    0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 
+    0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 
+    0x5acce7ff, 0x6ab9d0ff, 0xb8686cff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
+    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
+    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
+    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
+    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xd82131ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf87728ff, 0xfb7629ff, 
+    0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 
+    0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 
+    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf06232ff, 0x6bedf6ff, 0x6aecf8ff, 
+    0x69ebf7ff, 0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 0x66e4f3ff, 0x65e2f3ff, 
+    0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 
+    0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 
+    0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x91889aff, 
+    0xeb2f2aff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
+    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
+    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
+    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd72132ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf87528ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 
+    0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
+    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xe36d44ff, 
+    0x6aecf8ff, 0x69ebf7ff, 0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 0x66e4f3ff, 
+    0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 
+    0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 
+    0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 
+    0x57c5e3ff, 0x56c3e3ff, 0x8a829fff, 0xed2827ff, 0xee2726ff, 0xed2626ff, 
+    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
+    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
+    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
+    0xd92133ff, 0xd62133ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf87428ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 
+    0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
+    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
+    0xf65928ff, 0xf5582aff, 0x78dae0ff, 0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 
+    0x66e4f3ff, 0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 0x62dcefff, 
+    0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 
+    0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 
+    0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0xa75a77ff, 
+    0xec2627ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
+    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
+    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
+    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd52033ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf87228ff, 0xfa7129ff, 
+    0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 
+    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
+    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xce7e61ff, 0x69e4f2ff, 
+    0x67e6f4ff, 0x66e4f3ff, 0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 
+    0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 
+    0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 
+    0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 
+    0x53bee0ff, 0x62abceff, 0xd32540ff, 0xea2529ff, 0xea2528ff, 0xe92529ff, 
+    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
+    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
+    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd42034ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf77028ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 
+    0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
+    0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
+    0xf55228ff, 0xc5826cff, 0x68e1f0ff, 0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 
+    0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 
+    0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 
+    0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 
+    0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0xa15579ff, 0xd51f3cff, 
+    0xe8252aff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
+    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
+    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
+    0xd62035ff, 0xd32035ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf76e28ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 
+    0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
+    0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
+    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xc57e6bff, 0x65e0f0ff, 
+    0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 
+    0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 
+    0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 
+    0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 
+    0x7b82a8ff, 0xcc1e45ff, 0xd31f3dff, 0xe6242bff, 0xe6242bff, 0xe5242cff, 
+    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
+    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
+    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd22035ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf76d28ff, 0xf96c29ff, 
+    0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 
+    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 
+    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
+    0xf44b27ff, 0x6ad8e7ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 
+    0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 
+    0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 
+    0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 
+    0x51badeff, 0x50b8ddff, 0x649cc2ff, 0xcb1e45ff, 0xca1d44ff, 0xd21f3dff, 
+    0xe4242dff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
+    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
+    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd11f36ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf66b28ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
+    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
+    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
+    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0x6ad7e6ff, 0x62dcefff, 0x61daeeff, 
+    0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 
+    0x62c5ddff, 0x7ba1bcff, 0x7aa1bbff, 0x799fbbff, 0x68b2cfff, 0x57c7e4ff, 
+    0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 
+    0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x58aad0ff, 0xca1d44ff, 
+    0xc91d44ff, 0xc81d44ff, 0xd01f3dff, 0xe2232eff, 0xe2232eff, 0xe1232eff, 
+    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
+    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
+    0xd31f37ff, 0xd01f37ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf66928ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
+    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
+    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
+    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0x69d5e5ff, 
+    0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 
+    0x5cd0e9ff, 0x5bcfe8ff, 0x77a6c1ff, 0xd12943ff, 0xd12842ff, 0xd12742ff, 
+    0xd12542ff, 0xb84462ff, 0x67acccff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 
+    0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 
+    0x54acd3ff, 0xc91d44ff, 0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 0xcf1e3dff, 
+    0xe0232fff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
+    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 
+    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xcf1f37ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf66728ff, 0xf96728ff, 
+    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
+    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
+    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
+    0xf34627ff, 0x68d2e4ff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 
+    0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x76a5c0ff, 0xd12842ff, 
+    0xd12742ff, 0xd12542ff, 0xd02442ff, 0xd02342ff, 0xb74162ff, 0x55bfe0ff, 
+    0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 
+    0x4fb5dbff, 0x4eb3daff, 0x52aad2ff, 0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 
+    0xc71d44ff, 0xc61d43ff, 0xcd1e3dff, 0xde2231ff, 0xde2230ff, 0xdd2231ff, 
+    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
+    0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xce1f38ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf66627ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
+    0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
+    0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
+    0xf34827ff, 0xf34627ff, 0xf34427ff, 0x67d1e3ff, 0x5fd7edff, 0x5fd5ecff, 
+    0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 
+    0x76a4bfff, 0xd12742ff, 0xd12542ff, 0xd02442ff, 0xd02342ff, 0xd02142ff, 
+    0xcf2042ff, 0x64a8caff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 
+    0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x51a9d2ff, 0xc91d43ff, 
+    0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xcc1e3dff, 
+    0xdc2232ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
+    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 
+    0xd01f39ff, 0xcd1e39ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf56427ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
+    0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
+    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
+    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0x66cfe3ff, 
+    0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 
+    0x5acce7ff, 0x59cae6ff, 0x75a1beff, 0xd12542ff, 0xd02442ff, 0xd02342ff, 
+    0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 0x7197baff, 0x52bbdeff, 0x51badeff, 
+    0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 
+    0x9a948aff, 0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 
+    0xc41d42ff, 0xc31d42ff, 0xcb1e3eff, 0xd92133ff, 0xd92133ff, 0xd82134ff, 
+    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 
+    0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xcc1e39ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf56227ff, 0xf86228ff, 
+    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 
+    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
+    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
+    0xf24127ff, 0x66cde2ff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 
+    0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x74a0bdff, 0xd02442ff, 
+    0xd02342ff, 0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 0xcf1e42ff, 0x6f95b9ff, 
+    0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 
+    0x4cb0d9ff, 0x9b998aff, 0xfcd843ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 
+    0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 0xc91d3eff, 
+    0xd72135ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
+    0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcb1e3aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf56127ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
+    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
+    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
+    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0x65cce1ff, 0x5dd2eaff, 0x5cd0e9ff, 
+    0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 
+    0x749fbdff, 0xd02342ff, 0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 0xcf1e42ff, 
+    0xce1e43ff, 0x6f95b9ff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 
+    0x4db1d9ff, 0x4cb0d9ff, 0x9b998aff, 0xffe243ff, 0xfcd642ff, 0xc61d43ff, 
+    0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 
+    0xc11c42ff, 0xc11c42ff, 0xc71c3eff, 0xd52036ff, 0xd52036ff, 0xd42036ff, 
+    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 
+    0xcd1e3bff, 0xca1e3bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf45f27ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
+    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
+    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
+    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0x64cae0ff, 
+    0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 
+    0x57c7e4ff, 0x57c5e3ff, 0x739cbdff, 0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 
+    0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 0x6e93b8ff, 0x4fb6dcff, 0x4fb5dbff, 
+    0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9b998aff, 0xffe243ff, 0xffdf42ff, 
+    0xfbd440ff, 0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 
+    0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xc61d3fff, 
+    0xd32037ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 
+    0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xc91d3bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf45d27ff, 0xf75c28ff, 
+    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
+    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
+    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
+    0xf23b27ff, 0x63c8dfff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 
+    0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x739cbcff, 0xcf2042ff, 
+    0xcf1f42ff, 0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 0xcc1e44ff, 0x6d91b8ff, 
+    0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9b998aff, 0xffe243ff, 
+    0xffdf42ff, 0xfedd40ff, 0xfbd23fff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 
+    0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 
+    0xbf1c42ff, 0xbe1b41ff, 0xc41c3fff, 0xd21f39ff, 0xd11f38ff, 0xd01f39ff, 
+    0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xc81d3cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf45b27ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
+    0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
+    0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
+    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0x62c7deff, 0x5bcde8ff, 0x5acce7ff, 
+    0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 
+    0x729abbff, 0xcf1f42ff, 0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 0xcc1e44ff, 
+    0xcc1e45ff, 0x6d91b8ff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9c998aff, 
+    0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfbcf3eff, 0xc41d42ff, 
+    0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 
+    0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xc31c3fff, 
+    0xd01f3aff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 
+    0xca1d3dff, 0xc71d3dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf45a27ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
+    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
+    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
+    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0x62c6deff, 
+    0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 
+    0x55c2e2ff, 0x54c0e1ff, 0x7198baff, 0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 
+    0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 0x6b8fb6ff, 0x4db1d9ff, 0x4cb0d9ff, 
+    0x9c998aff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 
+    0xfbcd3dff, 0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 
+    0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 
+    0xbc1b41ff, 0xbc1b41ff, 0xc11b40ff, 0xce1e3bff, 0xcd1e3bff, 0xcc1e3cff, 
+    0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc61d3dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf35827ff, 0xf65728ff, 
+    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
+    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
+    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
+    0xf13627ff, 0x61c5ddff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 
+    0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x7197baff, 0xce1e43ff, 
+    0xcd1e44ff, 0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 0xca1d44ff, 0x6b8eb5ff, 
+    0x4cb0d9ff, 0x9c998aff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 
+    0xfed83eff, 0xfed63dff, 0xfacb3cff, 0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 
+    0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 
+    0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xbf1c40ff, 
+    0xcc1e3dff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc41c3eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf35627ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
+    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
+    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
+    0xf13827ff, 0xf13627ff, 0xf03527ff, 0x60c3dcff, 0x58c8e5ff, 0x57c7e4ff, 
+    0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 
+    0x6f95b9ff, 0xcd1e44ff, 0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 0xca1d44ff, 
+    0xc91d44ff, 0x6a8db5ff, 0x9c998aff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 
+    0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfac93bff, 0xc21c42ff, 
+    0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 
+    0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 
+    0xba1a42ff, 0xb91a43ff, 0xbe1b41ff, 0xc91d3eff, 0xc91d3eff, 0xc81d3eff, 
+    0xc61c3fff, 0xc31c3fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf35427ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
+    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
+    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
+    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0x60c0dbff, 
+    0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 
+    0x53bddfff, 0x52bbdeff, 0x6f95b9ff, 0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 
+    0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 0xbd8c69ff, 0xffe243ff, 0xffdf42ff, 
+    0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 
+    0xfac63aff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 
+    0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 
+    0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xbd1b42ff, 
+    0xc71d3fff, 0xc61c3fff, 0xc51c40ff, 0xc21c3fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf25327ff, 0xf55228ff, 
+    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
+    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
+    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
+    0xf03126ff, 0x5fbfdaff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 
+    0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x6e93b8ff, 0xcc1e45ff, 
+    0xcb1e45ff, 0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 0xc91d43ff, 0xf2b343ff, 
+    0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 
+    0xfdd23bff, 0xfdcf3aff, 0xfac438ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 
+    0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 
+    0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 
+    0xb81a43ff, 0xb71a42ff, 0xba1a42ff, 0xc41c40ff, 0xc41c40ff, 0xc11c40ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf25127ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
+    0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
+    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
+    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0x5fbdd9ff, 0x56c3e3ff, 0x55c2e2ff, 
+    0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 
+    0x6d91b8ff, 0xcb1e45ff, 0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 0xc91d43ff, 
+    0xc81d43ff, 0xf2b142ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 
+    0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xf9c237ff, 0xc01c42ff, 
+    0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 
+    0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 
+    0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb91a42ff, 
+    0xc21c41ff, 0xc01b41ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf24f27ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
+    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
+    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
+    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0x5ebbd9ff, 
+    0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 
+    0x50b8ddff, 0x4fb6dcff, 0x6d91b8ff, 0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 
+    0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 0xf0af41ff, 0xfedb3fff, 0xfed83eff, 
+    0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 
+    0xf9c036ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 
+    0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 
+    0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb81a44ff, 0xbe1b41ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf24e27ff, 0xf44d27ff, 
+    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
+    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
+    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
+    0xef2c26ff, 0x5dbad8ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 
+    0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x6b8fb6ff, 0xc91d44ff, 
+    0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 0xf0ae40ff, 
+    0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 
+    0xfccb37ff, 0xfcc836ff, 0xf9be36ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 
+    0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 
+    0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb51a43ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf14c26ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
+    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
+    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
+    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0x5cb8d8ff, 0x53bee0ff, 0x53bddfff, 
+    0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 
+    0x6b8eb5ff, 0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 
+    0xc51d43ff, 0xf0ab3fff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 
+    0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xf9bc35ff, 0xbe1b41ff, 
+    0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 
+    0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 
+    0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb01945ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf14b26ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
+    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
+    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
+    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0x5bb6d7ff, 
+    0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 
+    0x4eb3daff, 0x4db1d9ff, 0x6a8db5ff, 0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 
+    0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xf0aa3eff, 0xfdd43cff, 0xfdd23bff, 
+    0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
+    0xf9ba34ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 
+    0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 
+    0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb11844ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf14926ff, 0xf34827ff, 
+    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
+    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
+    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
+    0xee2726ff, 0x5bb5d6ff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 
+    0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9d8184ff, 0xc81d43ff, 
+    0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 0xefa83eff, 
+    0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
+    0xfcc434ff, 0xfcc233ff, 0xf8b732ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 
+    0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 
+    0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
+    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xaf1946ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf04826ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
+    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
+    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
+    0xee2826ff, 0xee2726ff, 0xed2626ff, 0x5ab3d5ff, 0x51badeff, 0x50b8ddff, 
+    0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9c998aff, 
+    0xf2b343ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 
+    0xc31d42ff, 0xefa73dff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 
+    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xf8b531ff, 0xbc1b41ff, 
+    0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 
+    0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 
+    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
+    0xb11947ff, 0xae1946ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xf04626ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
+    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
+    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
+    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0x59b3d5ff, 
+    0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 
+    0x9c998aff, 0xffe243ff, 0xf2b142ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 
+    0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xeea43cff, 0xfdcd38ff, 0xfccb37ff, 
+    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
+    0xf8b330ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 
+    0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
+    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xad1946ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf04426ff, 0xf34227ff, 
+    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
+    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
+    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
+    0xeb2528ff, 0x58b1d4ff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 
+    0x4cb0d9ff, 0x9d9b89ff, 0xffe243ff, 0xffdf42ff, 0xf0af41ff, 0xc51d43ff, 
+    0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc52541ff, 0xf5b63aff, 
+    0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
+    0xfbbd30ff, 0xfbbb2fff, 0xf8b02fff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 
+    0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
+    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xad1946ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf04226ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
+    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
+    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
+    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0x57afd3ff, 0x4fb5dbff, 0x4eb3daff, 
+    0x4db1d9ff, 0x4cb0d9ff, 0xa09a87ff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 
+    0xf0ae40ff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc52541ff, 
+    0xefa63aff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 
+    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xf7ae2eff, 0xbb1a42ff, 
+    0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 
+    0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
+    0xaf1847ff, 0xad1947ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xef4126ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
+    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
+    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
+    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0x57aed2ff, 
+    0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0xa39b84ff, 0xffe243ff, 0xffdf42ff, 
+    0xfedd40ff, 0xfedb3fff, 0xf0ab3fff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 
+    0xc52541ff, 0xefa63aff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
+    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
+    0xf7ad2dff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 
+    0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 
+    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xac1946ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xef3f26ff, 0xf23d27ff, 
+    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
+    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
+    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
+    0xe8252aff, 0x56acd1ff, 0x4db1d9ff, 0x4cb0d9ff, 0xa29a85ff, 0xffe243ff, 
+    0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xf0aa3eff, 0xc31d42ff, 
+    0xc31d42ff, 0xc52541ff, 0xefa63aff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
+    0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
+    0xfab62dff, 0xfab42cff, 0xf7ab2bff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 
+    0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
+    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 
+    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xac1948ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xef3d26ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
+    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
+    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
+    0xe92529ff, 0xe8252aff, 0xe7242aff, 0x55aad0ff, 0x4cb0d9ff, 0xa29a85ff, 
+    0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 
+    0xefa83eff, 0xc31d42ff, 0xc52541ff, 0xefa63aff, 0xfccb37ff, 0xfcc836ff, 
+    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 
+    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xf7a82aff, 0xb91a42ff, 
+    0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 
+    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
+    0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
+    0xad1849ff, 0xab1849ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xef3b26ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
+    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
+    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
+    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0x54a9d0ff, 
+    0xa29a85ff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 
+    0xfed63dff, 0xfdd43cff, 0xefa73dff, 0xc52541ff, 0xefa63aff, 0xfccb37ff, 
+    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
+    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
+    0xf6a629ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
+    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
+    0xae1847ff, 0xad1849ff, 0xad174aff, 0xab1848ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xee3a26ff, 0xf13827ff, 
+    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
+    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
+    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
+    0xe5242cff, 0xae9a7bff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 
+    0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xf2ad3bff, 0xefa53aff, 
+    0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
+    0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
+    0xfaaf29ff, 0xf9ad28ff, 0xf6a428ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
+    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
+    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xaa1849ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xee3826ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
+    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
+    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
+    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xfed942ff, 0xffdf42ff, 0xfedd40ff, 
+    0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 
+    0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 
+    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 
+    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf19629ff, 0xb71a42ff, 
+    0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
+    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
+    0xac174aff, 0xaa194bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xee3626ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
+    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
+    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
+    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xfed741ff, 
+    0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 
+    0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
+    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
+    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
+    0xd75e34ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 
+    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
+    0xad1749ff, 0xac174aff, 0xab184cff, 0xa9184aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xed3526ff, 0xf03326ff, 
+    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
+    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
+    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
+    0xe2232eff, 0xfdd53fff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 
+    0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
+    0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
+    0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
+    0xf9a826ff, 0xe4792eff, 0xb71b42ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
+    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 
+    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
+    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xa9184aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xed3325ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
+    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
+    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
+    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xfdd33eff, 0xfed83eff, 0xfed63dff, 
+    0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 
+    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 
+    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 
+    0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
+    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
+    0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
+    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
+    0xaa174cff, 0xa8184cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xed3125ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
+    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
+    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
+    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xfcd03dff, 
+    0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 
+    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
+    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
+    0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
+    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
+    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
+    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa8174bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xed2f25ff, 0xef2e26ff, 
+    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
+    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
+    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
+    0xdf2230ff, 0xfcce3cff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 
+    0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
+    0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
+    0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
+    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
+    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
+    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa8164cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xec2e25ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
+    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
+    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
+    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xfbcc3bff, 0xfdd23bff, 0xfdcf3aff, 
+    0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 
+    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 
+    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 
+    0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
+    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
+    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
+    0xa9154eff, 0xa8164eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xec2c25ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
+    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
+    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
+    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xfbca3aff, 
+    0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
+    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
+    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
+    0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 
+    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
+    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
+    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa6164eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xec2a25ff, 0xee2826ff, 
+    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
+    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
+    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
+    0xdc2232ff, 0xfbc739ff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
+    0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
+    0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
+    0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
+    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 
+    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
+    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
+    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa5164eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xeb2825ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
+    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
+    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
+    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xfbc537ff, 0xfccb37ff, 0xfcc836ff, 
+    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 
+    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 
+    0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
+    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
+    0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
+    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
+    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
+    0xa61550ff, 0xa5154fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xeb2725ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
+    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
+    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
+    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xfac336ff, 
+    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
+    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
+    0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
+    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
+    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
+    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 
+    0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa5164fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xea2625ff, 0xec2627ff, 
+    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
+    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
+    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
+    0xd82134ff, 0xfac135ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
+    0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
+    0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
+    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
+    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
+    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
+    0xa9154fff, 0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa61551ff, 0xa41651ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xe92626ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
+    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
+    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
+    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xfabf35ff, 0xfcc434ff, 0xfcc233ff, 
+    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 
+    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 
+    0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
+    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
+    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
+    0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa61551ff, 
+    0xa51553ff, 0xa31552ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe82527ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
+    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
+    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
+    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xfabd35ff, 
+    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
+    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
+    0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 
+    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
+    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
+    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
+    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa31551ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xe72527ff, 0xe92529ff, 
+    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
+    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
+    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
+    0xd52036ff, 0xfabb34ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
+    0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
+    0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
+    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 
+    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
+    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
+    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 
+    0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa21553ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xe62528ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
+    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
+    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
+    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xf9b732ff, 0xfbbd30ff, 0xfbbb2fff, 
+    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 
+    0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
+    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
+    0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
+    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
+    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
+    0xa61550ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 
+    0xa31455ff, 0xa21554ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe52529ff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
+    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
+    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
+    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xf9b531ff, 
+    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
+    0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
+    0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
+    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
+    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 
+    0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 
+    0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa11454ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xe42429ff, 0xe6242bff, 
+    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
+    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
+    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
+    0xd21f38ff, 0xf9b330ff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
+    0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
+    0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
+    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
+    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
+    0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 
+    0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21356ff, 0xa01455ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xe3242aff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
+    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
+    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
+    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xf9b02fff, 0xfab62dff, 0xfab42cff, 
+    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 
+    0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 
+    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
+    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
+    0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 
+    0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21356ff, 
+    0xa11357ff, 0x9f1456ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe3242bff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
+    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
+    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 
+    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xf7ab2eff, 
+    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
+    0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 
+    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
+    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
+    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
+    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 
+    0xa21356ff, 0xa11357ff, 0xa01358ff, 0x9e1457ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xe2242bff, 0xe3232dff, 
+    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
+    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
+    0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 
+    0xcf1e3aff, 0xed8930ff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
+    0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
+    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 
+    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
+    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
+    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 
+    0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 
+    0xa31456ff, 0xa21356ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9c1357ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xe1232cff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
+    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
+    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 
+    0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xd33438ff, 0xf5a22bff, 0xf9ad28ff, 
+    0xf9ab27ff, 0xf9a826ff, 0xe2752fff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
+    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
+    0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
+    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
+    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
+    0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 
+    0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 
+    0x9d1259ff, 0x9b1358ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe0232dff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
+    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
+    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 
+    0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 
+    0xce293bff, 0xd75d35ff, 0xdb6633ff, 0xcc4639ff, 0xb61943ff, 0xb51944ff, 
+    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
+    0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
+    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
+    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 
+    0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 
+    0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 
+    0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9a1359ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xdf232dff, 0xe0232fff, 
+    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
+    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
+    0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 
+    0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc81d3fff, 0xba1b41ff, 0xb61943ff, 
+    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
+    0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
+    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
+    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
+    0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 
+    0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 
+    0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x991359ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xde232eff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
+    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
+    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 
+    0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 
+    0xc51c40ff, 0xb81a42ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
+    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 
+    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
+    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
+    0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 
+    0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 
+    0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 
+    0x9a125bff, 0x98125aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xdd222fff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
+    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 
+    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 
+    0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 
+    0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc31c40ff, 0xb81a43ff, 0xb31944ff, 
+    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 
+    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
+    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
+    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
+    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 
+    0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 
+    0x9b125bff, 0x9a125bff, 0x99115cff, 0x97125bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xdc222fff, 0xdd2231ff, 
+    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
+    0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 
+    0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 
+    0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 
+    0xc11b42ff, 0xb61a44ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 
+    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
+    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
+    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 
+    0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 
+    0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 
+    0x9c125aff, 0x9b125bff, 0x9a125bff, 0x99115cff, 0x98115dff, 0x96125bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xdb2230ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
+    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 
+    0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 
+    0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 
+    0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 0xbf1b43ff, 0xb41a45ff, 0xb21845ff, 
+    0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
+    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
+    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
+    0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 
+    0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 
+    0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x9a125bff, 0x99115cff, 0x98115dff, 
+    0x97115dff, 0x95125cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xda2231ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
+    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 
+    0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 
+    0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 
+    0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 0xc01b43ff, 0xbf1b44ff, 
+    0xbe1a44ff, 0xb31946ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
+    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
+    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa8154fff, 
+    0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 
+    0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 
+    0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x9a125bff, 0x99115cff, 
+    0x98115dff, 0x97115dff, 0x96115eff, 0x94115dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xcb212eff, 0xd92133ff, 
+    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
+    0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 
+    0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 
+    0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 0xc01b43ff, 
+    0xbf1b44ff, 0xbe1a44ff, 0xbd1a45ff, 0xbb1a46ff, 0xb21946ff, 0xaf1847ff, 
+    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
+    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
+    0xa8154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 
+    0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 
+    0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x9a125bff, 
+    0x99115cff, 0x98115dff, 0x97115dff, 0x96115eff, 0x95105fff, 0x8d1255ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xb22727ea, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
+    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 
+    0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 
+    0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 
+    0xc01b43ff, 0xbf1b44ff, 0xbe1a44ff, 0xbd1a45ff, 0xbc1a46ff, 0xbb1a46ff, 
+    0xb91948ff, 0xb11848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
+    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
+    0xa9154eff, 0xa8154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 
+    0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 
+    0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 
+    0x9a125bff, 0x99115cff, 0x98115dff, 0x97115dff, 0x96115eff, 0x95105fff, 
+    0x94105fff, 0x861c44e9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xa5352622, 0xb72429f7, 0xd62035ff, 0xd52036ff, 
+    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 
+    0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 
+    0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 
+    0xc11b42ff, 0xc01b43ff, 0xbf1b44ff, 0xbe1a44ff, 0xbd1a45ff, 0xbc1a46ff, 
+    0xbb1a46ff, 0xba1947ff, 0xb91948ff, 0xb71948ff, 0xaf1949ff, 0xad174aff, 
+    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
+    0xa9164dff, 0xa9154eff, 0xa8154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
+    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 
+    0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 
+    0x9b125bff, 0x9a125bff, 0x99115cff, 0x98115dff, 0x97115dff, 0x96115eff, 
+    0x95105fff, 0x94105fff, 0x87194af6, 0x87303820, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xa333224b, 0xa72e2597, 0xa32c269b, 0xa32c269b, 0xa32c269b, 0xa12c269b, 
+    0xa12c269b, 0xa12c269b, 0xa12c279b, 0xa02c279b, 0xa02c279b, 0xa02c279b, 
+    0xa02c299b, 0x9e2c299b, 0x9e2b299b, 0x9e2b299b, 0x9c2b299b, 0x9c2b299b, 
+    0x9c2b2b9b, 0x9b2b2b9b, 0x9b2b2b9b, 0x9b2b2b9b, 0x9b2b2b9b, 0x992b2b9b, 
+    0x992b2c9b, 0x992b2c9b, 0x992b2c9b, 0x972b2c9b, 0x972b2c9b, 0x972b2c9b, 
+    0x97292e9b, 0x94292f9d, 0x94292f9d, 0x92292f9d, 0x92292f9d, 0x9329319c, 
+    0x9329319c, 0x9129319c, 0x9129319c, 0x9129319c, 0x9029319c, 0x8e29319c, 
+    0x8e29319c, 0x9129319b, 0x9129319b, 0x8f27319b, 0x8f27319b, 0x8f27339b, 
+    0x8d27339b, 0x8d27339b, 0x8d27339b, 0x8d27339b, 0x8c27359b, 0x8c27359b, 
+    0x8c27359b, 0x8a27359b, 0x8a27359b, 0x8a27369b, 0x8a27369b, 0x8927369b, 
+    0x8927369b, 0x8926369b, 0x8a273897, 0x8b2c334b, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+};
diff --git a/games/NXDoom/src/doom/doomdata.h b/games/NXDoom/src/doom/doomdata.h
new file mode 100644
index 000000000..6e42be6fc
--- /dev/null
+++ b/games/NXDoom/src/doom/doomdata.h
@@ -0,0 +1,213 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  all external data is defined here
+//  most of the data is loaded into different structures at run time
+//  some internal structures shared by many modules are here
+//
+
+#ifndef __DOOMDATA__
+#define __DOOMDATA__
+
+// The most basic types we use, portability.
+#include "doomtype.h"
+
+// Some global defines, that configure the game.
+#include "doomdef.h"
+
+
+
+//
+// Map level types.
+// The following data structures define the persistent format
+// used in the lumps of the WAD files.
+//
+
+// Lump order in a map WAD: each map needs a couple of lumps
+// to provide a complete scene geometry description.
+enum
+{
+  ML_LABEL,		// A separator, name, ExMx or MAPxx
+  ML_THINGS,		// Monsters, items..
+  ML_LINEDEFS,		// LineDefs, from editing
+  ML_SIDEDEFS,		// SideDefs, from editing
+  ML_VERTEXES,		// Vertices, edited and BSP splits generated
+  ML_SEGS,		// LineSegs, from LineDefs split by BSP
+  ML_SSECTORS,		// SubSectors, list of LineSegs
+  ML_NODES,		// BSP nodes
+  ML_SECTORS,		// Sectors, from editing
+  ML_REJECT,		// LUT, sector-sector visibility	
+  ML_BLOCKMAP		// LUT, motion clipping, walls/grid element
+};
+
+
+// A single Vertex.
+typedef PACKED_STRUCT (
+{
+  short		x;
+  short		y;
+}) mapvertex_t;
+
+
+// A SideDef, defining the visual appearance of a wall,
+// by setting textures and offsets.
+typedef PACKED_STRUCT (
+{
+  short		textureoffset;
+  short		rowoffset;
+  char		toptexture[8];
+  char		bottomtexture[8];
+  char		midtexture[8];
+  // Front sector, towards viewer.
+  short		sector;
+}) mapsidedef_t;
+
+
+
+// A LineDef, as used for editing, and as input
+// to the BSP builder.
+typedef PACKED_STRUCT (
+{
+  short		v1;
+  short		v2;
+  short		flags;
+  short		special;
+  short		tag;
+  // sidenum[1] will be -1 if one sided
+  short		sidenum[2];		
+}) maplinedef_t;
+
+
+//
+// LineDef attributes.
+//
+
+// Solid, is an obstacle.
+#define ML_BLOCKING		1
+
+// Blocks monsters only.
+#define ML_BLOCKMONSTERS	2
+
+// Backside will not be present at all
+//  if not two sided.
+#define ML_TWOSIDED		4
+
+// If a texture is pegged, the texture will have
+// the end exposed to air held constant at the
+// top or bottom of the texture (stairs or pulled
+// down things) and will move with a height change
+// of one of the neighbor sectors.
+// Unpegged textures allways have the first row of
+// the texture at the top pixel of the line for both
+// top and bottom textures (use next to windows).
+
+// upper texture unpegged
+#define ML_DONTPEGTOP		8
+
+// lower texture unpegged
+#define ML_DONTPEGBOTTOM	16	
+
+// In AutoMap: don't map as two sided: IT'S A SECRET!
+#define ML_SECRET		32
+
+// Sound rendering: don't let sound cross two of these.
+#define ML_SOUNDBLOCK		64
+
+// Don't draw on the automap at all.
+#define ML_DONTDRAW		128
+
+// Set if already seen, thus drawn in automap.
+#define ML_MAPPED		256
+
+
+
+
+// Sector definition, from editing.
+typedef	PACKED_STRUCT (
+{
+  short		floorheight;
+  short		ceilingheight;
+  char		floorpic[8];
+  char		ceilingpic[8];
+  short		lightlevel;
+  short		special;
+  short		tag;
+}) mapsector_t;
+
+// SubSector, as generated by BSP.
+typedef PACKED_STRUCT (
+{
+  short		numsegs;
+  // Index of first one, segs are stored sequentially.
+  short		firstseg;	
+}) mapsubsector_t;
+
+
+// LineSeg, generated by splitting LineDefs
+// using partition lines selected by BSP builder.
+typedef PACKED_STRUCT (
+{
+  short		v1;
+  short		v2;
+  short		angle;		
+  short		linedef;
+  short		side;
+  short		offset;
+}) mapseg_t;
+
+
+
+// BSP node structure.
+
+// Indicate a leaf.
+#define	NF_SUBSECTOR	0x8000
+
+typedef PACKED_STRUCT (
+{
+  // Partition line from (x,y) to x+dx,y+dy)
+  short		x;
+  short		y;
+  short		dx;
+  short		dy;
+
+  // Bounding box for each child,
+  // clip against view frustum.
+  short		bbox[2][4];
+
+  // If NF_SUBSECTOR its a subsector,
+  // else it's a node of another subtree.
+  unsigned short	children[2];
+
+}) mapnode_t;
+
+
+
+
+// Thing definition, position, orientation and type,
+// plus skill/visibility flags and attributes.
+typedef PACKED_STRUCT (
+{
+    short		x;
+    short		y;
+    short		angle;
+    short		type;
+    short		options;
+}) mapthing_t;
+
+
+
+
+
+#endif			// __DOOMDATA__
diff --git a/games/NXDoom/src/doom/doomdef.c b/games/NXDoom/src/doom/doomdef.c
new file mode 100644
index 000000000..d31f3efa2
--- /dev/null
+++ b/games/NXDoom/src/doom/doomdef.c
@@ -0,0 +1,28 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  DoomDef - basic defines for DOOM, e.g. Version, game mode
+//   and skill level, and display parameters.
+//
+
+
+
+#include "doomdef.h"
+
+// Location for any defines turned variables.
+
+// None.
+
+
diff --git a/games/NXDoom/src/doom/doomdef.h b/games/NXDoom/src/doom/doomdef.h
new file mode 100644
index 000000000..62d729ddb
--- /dev/null
+++ b/games/NXDoom/src/doom/doomdef.h
@@ -0,0 +1,168 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Internally used data structures for virtually everything,
+//   lots of other stuff.
+//
+
+#ifndef __DOOMDEF__
+#define __DOOMDEF__
+
+#include <stdio.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "i_timer.h"
+#include "d_mode.h"
+
+//
+// Global parameters/defines.
+//
+// DOOM version
+#define DOOM_VERSION 109
+
+// Version code for cph's longtics hack ("v1.91")
+#define DOOM_191_VERSION 111
+
+
+// If rangecheck is undefined,
+// most parameter validation debugging code will not be compiled
+#define RANGECHECK
+
+// The maximum number of players, multiplayer/networking.
+#define MAXPLAYERS 4
+
+// The current state of the game: whether we are
+// playing, gazing at the intermission screen,
+// the game final animation, or a demo. 
+typedef enum
+{
+    GS_LEVEL,
+    GS_INTERMISSION,
+    GS_FINALE,
+    GS_DEMOSCREEN,
+} gamestate_t;
+
+typedef enum
+{
+    ga_nothing,
+    ga_loadlevel,
+    ga_newgame,
+    ga_loadgame,
+    ga_savegame,
+    ga_playdemo,
+    ga_completed,
+    ga_victory,
+    ga_worlddone,
+    ga_screenshot
+} gameaction_t;
+
+//
+// Difficulty/skill settings/filters.
+//
+
+// Skill flags.
+#define	MTF_EASY		1
+#define	MTF_NORMAL		2
+#define	MTF_HARD		4
+
+// Deaf monsters/do not react to sound.
+#define	MTF_AMBUSH		8
+
+
+//
+// Key cards.
+//
+typedef enum
+{
+    it_bluecard,
+    it_yellowcard,
+    it_redcard,
+    it_blueskull,
+    it_yellowskull,
+    it_redskull,
+    
+    NUMCARDS
+    
+} card_t;
+
+
+
+// The defined weapons,
+//  including a marker indicating
+//  user has not changed weapon.
+typedef enum
+{
+    wp_fist,
+    wp_pistol,
+    wp_shotgun,
+    wp_chaingun,
+    wp_missile,
+    wp_plasma,
+    wp_bfg,
+    wp_chainsaw,
+    wp_supershotgun,
+
+    NUMWEAPONS,
+    
+    // No pending weapon change.
+    wp_nochange
+
+} weapontype_t;
+
+
+// Ammunition types defined.
+typedef enum
+{
+    am_clip,	// Pistol / chaingun ammo.
+    am_shell,	// Shotgun / double barreled shotgun.
+    am_cell,	// Plasma rifle, BFG.
+    am_misl,	// Missile launcher.
+    NUMAMMO,
+    am_noammo	// Unlimited for chainsaw / fist.	
+
+} ammotype_t;
+
+
+// Power up artifacts.
+typedef enum
+{
+    pw_invulnerability,
+    pw_strength,
+    pw_invisibility,
+    pw_ironfeet,
+    pw_allmap,
+    pw_infrared,
+    NUMPOWERS
+    
+} powertype_t;
+
+
+
+//
+// Power up durations,
+//  how many seconds till expiration,
+//  assuming TICRATE is 35 ticks/second.
+//
+typedef enum
+{
+    INVULNTICS	= (30*TICRATE),
+    INVISTICS	= (60*TICRATE),
+    INFRATICS	= (120*TICRATE),
+    IRONTICS	= (60*TICRATE)
+    
+} powerduration_t;
+
+#endif          // __DOOMDEF__
diff --git a/games/NXDoom/src/doom/doomstat.c b/games/NXDoom/src/doom/doomstat.c
new file mode 100644
index 000000000..f8e83f3cb
--- /dev/null
+++ b/games/NXDoom/src/doom/doomstat.c
@@ -0,0 +1,35 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Put all global tate variables here.
+//
+
+#include <stdio.h>
+
+#include "doomstat.h"
+
+
+// Game Mode - identify IWAD as shareware, retail etc.
+GameMode_t gamemode = indetermined;
+GameMission_t	gamemission = doom;
+GameVersion_t   gameversion = exe_final2;
+GameVariant_t   gamevariant = vanilla;
+
+// Set if homebrew PWAD stuff has been added.
+boolean	modifiedgame;
+
+
+
+
diff --git a/games/NXDoom/src/doom/doomstat.h b/games/NXDoom/src/doom/doomstat.h
new file mode 100644
index 000000000..689f59503
--- /dev/null
+++ b/games/NXDoom/src/doom/doomstat.h
@@ -0,0 +1,277 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   All the global variables that store the internal state.
+//   Theoretically speaking, the internal state of the engine
+//    should be found by looking at the variables collected
+//    here, and every relevant module will have to include
+//    this header file.
+//   In practice, things are a bit messy.
+//
+
+
+#ifndef __D_STATE__
+#define __D_STATE__
+
+// We need globally shared data structures,
+//  for defining the global state variables.
+#include "doomdata.h"
+#include "d_loop.h"
+
+// We need the playr data structure as well.
+#include "d_player.h"
+
+// Game mode/mission
+#include "d_mode.h"
+
+#include "net_defs.h"
+
+
+
+// ------------------------
+// Command line parameters.
+//
+extern  boolean	nomonsters;	// checkparm of -nomonsters
+extern  boolean	respawnparm;	// checkparm of -respawn
+extern  boolean	fastparm;	// checkparm of -fast
+
+extern  boolean	devparm;	// DEBUG: launched with -devparm
+
+
+// -----------------------------------------------------
+// Game Mode - identify IWAD as shareware, retail etc.
+//
+extern GameMode_t	gamemode;
+extern GameMission_t	gamemission;
+extern GameVersion_t    gameversion;
+extern GameVariant_t    gamevariant;
+
+// Convenience macro.
+// 'gamemission' can be equal to pack_chex or pack_hacx, but these are
+// just modified versions of doom and doom2, and should be interpreted
+// as the same most of the time.
+
+#define logical_gamemission                             \
+    (gamemission == pack_chex ? doom :                  \
+     gamemission == pack_hacx ? doom2 : gamemission)
+
+// Set if homebrew PWAD stuff has been added.
+extern  boolean	modifiedgame;
+
+
+// -------------------------------------------
+// Selected skill type, map etc.
+//
+
+// Defaults for menu, methinks.
+extern  skill_t		startskill;
+extern  int             startepisode;
+extern	int		startmap;
+
+// Savegame slot to load on startup.  This is the value provided to
+// the -loadgame option.  If this has not been provided, this is -1.
+
+extern  int             startloadgame;
+
+extern  boolean		autostart;
+
+// Selected by user. 
+extern  skill_t         gameskill;
+extern  int		gameepisode;
+extern  int		gamemap;
+
+// If non-zero, exit the level after this number of minutes
+extern  int             timelimit;
+
+// Nightmare mode flag, single player.
+extern  boolean         respawnmonsters;
+
+// Netgame? Only true if >1 player.
+extern  boolean	netgame;
+
+// 0=Cooperative; 1=Deathmatch; 2=Altdeath
+extern int deathmatch;
+
+// -------------------------
+// Internal parameters for sound rendering.
+// These have been taken from the DOS version,
+//  but are not (yet) supported with Linux
+//  (e.g. no sound volume adjustment with menu.
+
+// From m_menu.c:
+//  Sound FX volume has default, 0 - 15
+//  Music volume has default, 0 - 15
+// These are multiplied by 8.
+extern int sfxVolume;
+extern int musicVolume;
+
+// Current music/sfx card - index useless
+//  w/o a reference LUT in a sound module.
+// Ideally, this would use indices found
+//  in: /usr/include/linux/soundcard.h
+extern int snd_MusicDevice;
+extern int snd_SfxDevice;
+// Config file? Same disclaimer as above.
+extern int snd_DesiredMusicDevice;
+extern int snd_DesiredSfxDevice;
+
+
+// -------------------------
+// Status flags for refresh.
+//
+
+// Depending on view size - no status bar?
+// Note that there is no way to disable the
+//  status bar explicitely.
+extern  boolean statusbaractive;
+
+extern  boolean automapactive;	// In AutoMap mode?
+extern  boolean	menuactive;	// Menu overlayed?
+extern  boolean	paused;		// Game Pause?
+
+
+extern  boolean		viewactive;
+
+extern  boolean		nodrawers;
+
+
+extern  boolean         testcontrols;
+extern  int             testcontrols_mousespeed;
+
+
+
+
+// This one is related to the 3-screen display mode.
+// ANG90 = left side, ANG270 = right
+extern  int	viewangleoffset;
+
+// Player taking events, and displaying.
+extern  int	consoleplayer;	
+extern  int	displayplayer;
+
+
+// -------------------------------------
+// Scores, rating.
+// Statistics on a given map, for intermission.
+//
+extern  int	totalkills;
+extern	int	totalitems;
+extern	int	totalsecret;
+
+// Timer, for scores.
+extern  int	levelstarttic;	// gametic at level start
+extern  int	leveltime;	// tics in game play for par
+
+
+
+// --------------------------------------
+// DEMO playback/recording related stuff.
+// No demo, there is a human player in charge?
+// Disable save/end game?
+extern  boolean	usergame;
+
+//?
+extern  boolean	demoplayback;
+extern  boolean	demorecording;
+
+// Round angleturn in ticcmds to the nearest 256.  This is used when
+// recording Vanilla demos in netgames.
+
+extern boolean lowres_turn;
+
+// Quit after playing a demo from cmdline.
+extern  boolean		singledemo;	
+
+
+
+
+//?
+extern  gamestate_t     gamestate;
+
+
+
+
+
+
+//-----------------------------
+// Internal parameters, fixed.
+// These are set by the engine, and not changed
+//  according to user inputs. Partly load from
+//  WAD, partly set at startup time.
+
+
+
+// Bookkeeping on players - state.
+extern	player_t	players[MAXPLAYERS];
+
+// Alive? Disconnected?
+extern  boolean		playeringame[MAXPLAYERS];
+
+
+// Player spawn spots for deathmatch.
+#define MAX_DM_STARTS   10
+extern  mapthing_t      deathmatchstarts[MAX_DM_STARTS];
+extern  mapthing_t*	deathmatch_p;
+
+// Player spawn spots.
+extern  mapthing_t      playerstarts[MAXPLAYERS];
+extern  boolean         playerstartsingame[MAXPLAYERS];
+// Intermission stats.
+// Parameters for world map / intermission.
+extern  wbstartstruct_t		wminfo;	
+
+
+
+
+
+
+
+//-----------------------------------------
+// Internal parameters, used for engine.
+//
+
+// File handling stuff.
+extern  char        *savegamedir;
+
+// if true, load all graphics at level load
+extern  boolean         precache;
+
+
+// wipegamestate can be set to -1
+//  to force a wipe on the next draw
+extern  gamestate_t     wipegamestate;
+
+extern  int             mouseSensitivity;
+
+extern  int             bodyqueslot;
+
+
+
+// Needed to store the number of the dummy sky flat.
+// Used for rendering,
+//  as well as tracking projectiles etc.
+extern int		skyflatnum;
+
+
+
+// Netgame stuff (buffers and pointers, i.e. indices).
+
+
+extern	int		rndindex;
+
+extern  ticcmd_t       *netcmds;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/dstrings.c b/games/NXDoom/src/doom/dstrings.c
new file mode 100644
index 000000000..86433ab28
--- /dev/null
+++ b/games/NXDoom/src/doom/dstrings.c
@@ -0,0 +1,73 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Globally defined strings.
+// 
+
+
+
+#include "dstrings.h"
+
+const char *doom1_endmsg[] =
+{
+  "are you sure you want to\nquit this great game?",
+  "please don't leave, there's more\ndemons to toast!",
+  "let's beat it -- this is turning\ninto a bloodbath!",
+  "i wouldn't leave if i were you.\ndos is much worse.",
+  "you're trying to say you like dos\nbetter than me, right?",
+  "don't leave yet -- there's a\ndemon around that corner!",
+  "ya know, next time you come in here\ni'm gonna toast ya.",
+  "go ahead and leave. see if i care.",
+};
+
+const char *doom2_endmsg[] =
+{
+  // QuitDOOM II messages
+  "are you sure you want to\nquit this great game?",
+  "you want to quit?\nthen, thou hast lost an eighth!",
+  "don't go now, there's a \ndimensional shambler waiting\nat the dos prompt!",
+  "get outta here and go back\nto your boring programs.",
+  "if i were your boss, i'd \n deathmatch ya in a minute!",
+  "look, bud. you leave now\nand you forfeit your body count!",
+  "just leave. when you come\nback, i'll be waiting with a bat.",
+  "you're lucky i don't smack\nyou for thinking about leaving.",
+};
+
+#if 0
+
+// UNUSED messages included in the source release
+
+char* endmsg[] =
+{
+  // DOOM1
+  QUITMSG,
+  // FinalDOOM?
+  "fuck you, pussy!\nget the fuck out!",
+  "you quit and i'll jizz\nin your cystholes!",
+  "if you leave, i'll make\nthe lord drink my jizz.",
+  "hey, ron! can we say\n'fuck' in the game?",
+  "i'd leave: this is just\nmore monsters and levels.\nwhat a load.",
+  "suck it down, asshole!\nyou're a fucking wimp!",
+  "don't quit now! we're \nstill spending your money!",
+
+  // Internal debug. Different style, too.
+  "THIS IS NO MESSAGE!\nPage intentionally left blank."
+};
+
+#endif
+
+  
+
+
diff --git a/games/NXDoom/src/doom/dstrings.h b/games/NXDoom/src/doom/dstrings.h
new file mode 100644
index 000000000..81115792a
--- /dev/null
+++ b/games/NXDoom/src/doom/dstrings.h
@@ -0,0 +1,41 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:
+//	DOOM strings, by language.
+//
+
+
+#ifndef __DSTRINGS__
+#define __DSTRINGS__
+
+
+// All important printed strings.
+
+#include "d_englsh.h"
+
+// Misc. other strings.
+#define SAVEGAMENAME	"doomsav"
+
+
+// QuitDOOM messages
+// 8 per each game type
+#define NUM_QUITMESSAGES   8
+
+extern const char *doom1_endmsg[];
+extern const char *doom2_endmsg[];
+
+
+#endif
diff --git a/games/NXDoom/src/doom/f_finale.c b/games/NXDoom/src/doom/f_finale.c
new file mode 100644
index 000000000..0acd6e398
--- /dev/null
+++ b/games/NXDoom/src/doom/f_finale.c
@@ -0,0 +1,718 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Game completion, final screen animation.
+//
+
+
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+// Functions.
+#include "deh_main.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "z_zone.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "s_sound.h"
+
+// Data.
+#include "d_main.h"
+#include "dstrings.h"
+#include "sounds.h"
+
+#include "doomstat.h"
+#include "r_state.h"
+
+typedef enum
+{
+    F_STAGE_TEXT,
+    F_STAGE_ARTSCREEN,
+    F_STAGE_CAST,
+} finalestage_t;
+
+// ?
+//#include "doomstat.h"
+//#include "r_local.h"
+//#include "f_finale.h"
+
+// Stage of animation:
+finalestage_t finalestage;
+
+unsigned int finalecount;
+
+#define	TEXTSPEED	3
+#define	TEXTWAIT	250
+
+typedef struct
+{
+    GameMission_t mission;
+    int episode, level;
+    const char *background;
+    const char *text;
+} textscreen_t;
+
+static textscreen_t textscreens[] =
+{
+    { doom,      1, 8,  "FLOOR4_8",  E1TEXT},
+    { doom,      2, 8,  "SFLR6_1",   E2TEXT},
+    { doom,      3, 8,  "MFLR8_4",   E3TEXT},
+    { doom,      4, 8,  "MFLR8_3",   E4TEXT},
+
+    { doom2,     1, 6,  "SLIME16",   C1TEXT},
+    { doom2,     1, 11, "RROCK14",   C2TEXT},
+    { doom2,     1, 20, "RROCK07",   C3TEXT},
+    { doom2,     1, 30, "RROCK17",   C4TEXT},
+    { doom2,     1, 15, "RROCK13",   C5TEXT},
+    { doom2,     1, 31, "RROCK19",   C6TEXT},
+
+    { pack_tnt,  1, 6,  "SLIME16",   T1TEXT},
+    { pack_tnt,  1, 11, "RROCK14",   T2TEXT},
+    { pack_tnt,  1, 20, "RROCK07",   T3TEXT},
+    { pack_tnt,  1, 30, "RROCK17",   T4TEXT},
+    { pack_tnt,  1, 15, "RROCK13",   T5TEXT},
+    { pack_tnt,  1, 31, "RROCK19",   T6TEXT},
+
+    { pack_plut, 1, 6,  "SLIME16",   P1TEXT},
+    { pack_plut, 1, 11, "RROCK14",   P2TEXT},
+    { pack_plut, 1, 20, "RROCK07",   P3TEXT},
+    { pack_plut, 1, 30, "RROCK17",   P4TEXT},
+    { pack_plut, 1, 15, "RROCK13",   P5TEXT},
+    { pack_plut, 1, 31, "RROCK19",   P6TEXT},
+};
+
+const char *finaletext;
+const char *finaleflat;
+
+void	F_StartCast (void);
+void	F_CastTicker (void);
+boolean F_CastResponder (event_t *ev);
+void	F_CastDrawer (void);
+
+//
+// F_StartFinale
+//
+void F_StartFinale (void)
+{
+    size_t i;
+
+    gameaction = ga_nothing;
+    gamestate = GS_FINALE;
+    viewactive = false;
+    automapactive = false;
+
+    if (logical_gamemission == doom)
+    {
+        S_ChangeMusic(mus_victor, true);
+    }
+    else
+    {
+        S_ChangeMusic(mus_read_m, true);
+    }
+
+    // Find the right screen and set the text and background
+
+    for (i=0; i<arrlen(textscreens); ++i)
+    {
+        textscreen_t *screen = &textscreens[i];
+
+        // Hack for Chex Quest
+
+        if (gameversion == exe_chex && screen->mission == doom)
+        {
+            screen->level = 5;
+        }
+
+        if (logical_gamemission == screen->mission
+         && (logical_gamemission != doom || gameepisode == screen->episode)
+         && gamemap == screen->level)
+        {
+            finaletext = screen->text;
+            finaleflat = screen->background;
+        }
+    }
+
+    // Do dehacked substitutions of strings
+  
+    finaletext = DEH_String(finaletext);
+    finaleflat = DEH_String(finaleflat);
+    
+    finalestage = F_STAGE_TEXT;
+    finalecount = 0;
+	
+}
+
+
+
+boolean F_Responder (event_t *event)
+{
+    if (finalestage == F_STAGE_CAST)
+	return F_CastResponder (event);
+	
+    return false;
+}
+
+
+//
+// F_Ticker
+//
+void F_Ticker (void)
+{
+    size_t		i;
+    
+    // check for skipping
+    if ( (gamemode == commercial)
+      && ( finalecount > 50) )
+    {
+      // go on to the next level
+      for (i=0 ; i<MAXPLAYERS ; i++)
+	if (players[i].cmd.buttons)
+	  break;
+				
+      if (i < MAXPLAYERS)
+      {	
+	if (gamemap == 30)
+	  F_StartCast ();
+	else
+	  gameaction = ga_worlddone;
+      }
+    }
+    
+    // advance animation
+    finalecount++;
+	
+    if (finalestage == F_STAGE_CAST)
+    {
+	F_CastTicker ();
+	return;
+    }
+	
+    if ( gamemode == commercial)
+	return;
+		
+    if (finalestage == F_STAGE_TEXT
+     && finalecount>strlen (finaletext)*TEXTSPEED + TEXTWAIT)
+    {
+	finalecount = 0;
+	finalestage = F_STAGE_ARTSCREEN;
+	wipegamestate = -1;		// force a wipe
+	if (gameepisode == 3)
+	    S_StartMusic (mus_bunny);
+    }
+}
+
+
+
+//
+// F_TextWrite
+//
+
+#include "hu_stuff.h"
+
+
+void F_TextWrite (void)
+{
+    byte*	src;
+    pixel_t*	dest;
+    
+    int		x,y,w;
+    signed int	count;
+    const char *ch;
+    int		c;
+    int		cx;
+    int		cy;
+    
+    // erase the entire screen to a tiled background
+    src = W_CacheLumpName ( finaleflat , PU_CACHE);
+    dest = I_VideoBuffer;
+	
+    for (y=0 ; y<SCREENHEIGHT ; y++)
+    {
+	for (x=0 ; x<SCREENWIDTH/64 ; x++)
+	{
+	    memcpy (dest, src+((y&63)<<6), 64);
+	    dest += 64;
+	}
+	if (SCREENWIDTH&63)
+	{
+	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63);
+	    dest += (SCREENWIDTH&63);
+	}
+    }
+
+    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
+    
+    // draw some of the text onto the screen
+    cx = 10;
+    cy = 10;
+    ch = finaletext;
+	
+    count = ((signed int) finalecount - 10) / TEXTSPEED;
+    if (count < 0)
+	count = 0;
+    for ( ; count ; count-- )
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	if (c == '\n')
+	{
+	    cx = 10;
+	    cy += 11;
+	    continue;
+	}
+		
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c >= HU_FONTSIZE)
+	{
+	    cx += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	if (cx+w > SCREENWIDTH)
+	    break;
+	V_DrawPatch(cx, cy, hu_font[c]);
+	cx+=w;
+    }
+	
+}
+
+//
+// Final DOOM 2 animation
+// Casting by id Software.
+//   in order of appearance
+//
+typedef struct
+{
+    const char	*name;
+    mobjtype_t	type;
+} castinfo_t;
+
+castinfo_t	castorder[] = {
+    {CC_ZOMBIE, MT_POSSESSED},
+    {CC_SHOTGUN, MT_SHOTGUY},
+    {CC_HEAVY, MT_CHAINGUY},
+    {CC_IMP, MT_TROOP},
+    {CC_DEMON, MT_SERGEANT},
+    {CC_LOST, MT_SKULL},
+    {CC_CACO, MT_HEAD},
+    {CC_HELL, MT_KNIGHT},
+    {CC_BARON, MT_BRUISER},
+    {CC_ARACH, MT_BABY},
+    {CC_PAIN, MT_PAIN},
+    {CC_REVEN, MT_UNDEAD},
+    {CC_MANCU, MT_FATSO},
+    {CC_ARCH, MT_VILE},
+    {CC_SPIDER, MT_SPIDER},
+    {CC_CYBER, MT_CYBORG},
+    {CC_HERO, MT_PLAYER},
+
+    {NULL,0}
+};
+
+int		castnum;
+int		casttics;
+state_t*	caststate;
+boolean		castdeath;
+int		castframes;
+int		castonmelee;
+boolean		castattacking;
+
+
+//
+// F_StartCast
+//
+void F_StartCast (void)
+{
+    wipegamestate = -1;		// force a screen wipe
+    castnum = 0;
+    caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+    casttics = caststate->tics;
+    castdeath = false;
+    finalestage = F_STAGE_CAST;
+    castframes = 0;
+    castonmelee = 0;
+    castattacking = false;
+    S_ChangeMusic(mus_evil, true);
+}
+
+
+//
+// F_CastTicker
+//
+void F_CastTicker (void)
+{
+    int		st;
+    int		sfx;
+	
+    if (--casttics > 0)
+	return;			// not time to change state yet
+		
+    if (caststate->tics == -1 || caststate->nextstate == S_NULL)
+    {
+	// switch from deathstate to next monster
+	castnum++;
+	castdeath = false;
+	if (castorder[castnum].name == NULL)
+	    castnum = 0;
+	if (mobjinfo[castorder[castnum].type].seesound)
+	    S_StartSound (NULL, mobjinfo[castorder[castnum].type].seesound);
+	caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+	castframes = 0;
+    }
+    else
+    {
+	// just advance to next state in animation
+	if (caststate == &states[S_PLAY_ATK1])
+	    goto stopattack;	// Oh, gross hack!
+	st = caststate->nextstate;
+	caststate = &states[st];
+	castframes++;
+	
+	// sound hacks....
+	switch (st)
+	{
+	  case S_PLAY_ATK1:	sfx = sfx_dshtgn; break;
+	  case S_POSS_ATK2:	sfx = sfx_pistol; break;
+	  case S_SPOS_ATK2:	sfx = sfx_shotgn; break;
+	  case S_VILE_ATK2:	sfx = sfx_vilatk; break;
+	  case S_SKEL_FIST2:	sfx = sfx_skeswg; break;
+	  case S_SKEL_FIST4:	sfx = sfx_skepch; break;
+	  case S_SKEL_MISS2:	sfx = sfx_skeatk; break;
+	  case S_FATT_ATK8:
+	  case S_FATT_ATK5:
+	  case S_FATT_ATK2:	sfx = sfx_firsht; break;
+	  case S_CPOS_ATK2:
+	  case S_CPOS_ATK3:
+	  case S_CPOS_ATK4:	sfx = sfx_shotgn; break;
+	  case S_TROO_ATK3:	sfx = sfx_claw; break;
+	  case S_SARG_ATK2:	sfx = sfx_sgtatk; break;
+	  case S_BOSS_ATK2:
+	  case S_BOS2_ATK2:
+	  case S_HEAD_ATK2:	sfx = sfx_firsht; break;
+	  case S_SKULL_ATK2:	sfx = sfx_sklatk; break;
+	  case S_SPID_ATK2:
+	  case S_SPID_ATK3:	sfx = sfx_shotgn; break;
+	  case S_BSPI_ATK2:	sfx = sfx_plasma; break;
+	  case S_CYBER_ATK2:
+	  case S_CYBER_ATK4:
+	  case S_CYBER_ATK6:	sfx = sfx_rlaunc; break;
+	  case S_PAIN_ATK3:	sfx = sfx_sklatk; break;
+	  default: sfx = 0; break;
+	}
+		
+	if (sfx)
+	    S_StartSound (NULL, sfx);
+    }
+	
+    if (castframes == 12)
+    {
+	// go into attack frame
+	castattacking = true;
+	if (castonmelee)
+	    caststate=&states[mobjinfo[castorder[castnum].type].meleestate];
+	else
+	    caststate=&states[mobjinfo[castorder[castnum].type].missilestate];
+	castonmelee ^= 1;
+	if (caststate == &states[S_NULL])
+	{
+	    if (castonmelee)
+		caststate=
+		    &states[mobjinfo[castorder[castnum].type].meleestate];
+	    else
+		caststate=
+		    &states[mobjinfo[castorder[castnum].type].missilestate];
+	}
+    }
+	
+    if (castattacking)
+    {
+	if (castframes == 24
+	    ||	caststate == &states[mobjinfo[castorder[castnum].type].seestate] )
+	{
+	  stopattack:
+	    castattacking = false;
+	    castframes = 0;
+	    caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+	}
+    }
+	
+    casttics = caststate->tics;
+    if (casttics == -1)
+	casttics = 15;
+}
+
+
+//
+// F_CastResponder
+//
+
+boolean F_CastResponder (event_t* ev)
+{
+    if (ev->type != ev_keydown)
+	return false;
+		
+    if (castdeath)
+	return true;			// already in dying frames
+		
+    // go into death frame
+    castdeath = true;
+    caststate = &states[mobjinfo[castorder[castnum].type].deathstate];
+    casttics = caststate->tics;
+    castframes = 0;
+    castattacking = false;
+    if (mobjinfo[castorder[castnum].type].deathsound)
+	S_StartSound (NULL, mobjinfo[castorder[castnum].type].deathsound);
+	
+    return true;
+}
+
+
+void F_CastPrint (const char *text)
+{
+    const char *ch;
+    int		c;
+    int		cx;
+    int		w;
+    int		width;
+    
+    // find width
+    ch = text;
+    width = 0;
+	
+    while (ch)
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c >= HU_FONTSIZE)
+	{
+	    width += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	width += w;
+    }
+    
+    // draw it
+    cx = SCREENWIDTH/2-width/2;
+    ch = text;
+    while (ch)
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c >= HU_FONTSIZE)
+	{
+	    cx += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	V_DrawPatch(cx, 180, hu_font[c]);
+	cx+=w;
+    }
+	
+}
+
+
+//
+// F_CastDrawer
+//
+
+void F_CastDrawer (void)
+{
+    spritedef_t*	sprdef;
+    spriteframe_t*	sprframe;
+    int			lump;
+    boolean		flip;
+    patch_t*		patch;
+    
+    // erase the entire screen to a background
+    V_DrawPatch (0, 0, W_CacheLumpName (DEH_String("BOSSBACK"), PU_CACHE));
+
+    F_CastPrint (DEH_String(castorder[castnum].name));
+    
+    // draw the current frame in the middle of the screen
+    sprdef = &sprites[caststate->sprite];
+    sprframe = &sprdef->spriteframes[ caststate->frame & FF_FRAMEMASK];
+    lump = sprframe->lump[0];
+    flip = (boolean)sprframe->flip[0];
+			
+    patch = W_CacheLumpNum (lump+firstspritelump, PU_CACHE);
+    if (flip)
+	V_DrawPatchFlipped(SCREENWIDTH/2, 170, patch);
+    else
+	V_DrawPatch(SCREENWIDTH/2, 170, patch);
+}
+
+
+//
+// F_DrawPatchCol
+//
+void
+F_DrawPatchCol
+( int		x,
+  patch_t*	patch,
+  int		col )
+{
+    column_t*	column;
+    byte*	source;
+    pixel_t*	dest;
+    pixel_t*	desttop;
+    int		count;
+	
+    column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+    desttop = I_VideoBuffer + x;
+
+    // step through the posts in a column
+    while (column->topdelta != 0xff )
+    {
+	source = (byte *)column + 3;
+	dest = desttop + column->topdelta*SCREENWIDTH;
+	count = column->length;
+		
+	while (count--)
+	{
+	    *dest = *source++;
+	    dest += SCREENWIDTH;
+	}
+	column = (column_t *)(  (byte *)column + column->length + 4 );
+    }
+}
+
+
+//
+// F_BunnyScroll
+//
+void F_BunnyScroll (void)
+{
+    signed int  scrolled;
+    int		x;
+    patch_t*	p1;
+    patch_t*	p2;
+    char	name[10];
+    int		stage;
+    static int	laststage;
+		
+    p1 = W_CacheLumpName (DEH_String("PFUB2"), PU_LEVEL);
+    p2 = W_CacheLumpName (DEH_String("PFUB1"), PU_LEVEL);
+
+    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
+	
+    scrolled = (SCREENWIDTH - ((signed int) finalecount-230)/2);
+    if (scrolled > SCREENWIDTH)
+	scrolled = SCREENWIDTH;
+    if (scrolled < 0)
+	scrolled = 0;
+		
+    for ( x=0 ; x<SCREENWIDTH ; x++)
+    {
+	if (x+scrolled < SCREENWIDTH)
+	    F_DrawPatchCol (x, p1, x+scrolled);
+	else
+	    F_DrawPatchCol (x, p2, x+scrolled - SCREENWIDTH);		
+    }
+	
+    if (finalecount < 1130)
+	return;
+    if (finalecount < 1180)
+    {
+        V_DrawPatch((SCREENWIDTH - 13 * 8) / 2,
+                    (SCREENHEIGHT - 8 * 8) / 2, 
+                    W_CacheLumpName(DEH_String("END0"), PU_CACHE));
+	laststage = 0;
+	return;
+    }
+	
+    stage = (finalecount-1180) / 5;
+    if (stage > 6)
+	stage = 6;
+    if (stage > laststage)
+    {
+	S_StartSound (NULL, sfx_pistol);
+	laststage = stage;
+    }
+	
+    DEH_snprintf(name, 10, "END%i", stage);
+    V_DrawPatch((SCREENWIDTH - 13 * 8) / 2, 
+                (SCREENHEIGHT - 8 * 8) / 2, 
+                W_CacheLumpName (name,PU_CACHE));
+}
+
+static void F_ArtScreenDrawer(void)
+{
+    const char *lumpname;
+    
+    if (gameepisode == 3)
+    {
+        F_BunnyScroll();
+    }
+    else
+    {
+        switch (gameepisode)
+        {
+            case 1:
+                if (gameversion >= exe_ultimate)
+                {
+                    lumpname = "CREDIT";
+                }
+                else
+                {
+                    lumpname = "HELP2";
+                }
+                break;
+            case 2:
+                lumpname = "VICTORY2";
+                break;
+            case 4:
+                lumpname = "ENDPIC";
+                break;
+            default:
+                return;
+        }
+
+        lumpname = DEH_String(lumpname);
+
+        V_DrawPatch (0, 0, W_CacheLumpName(lumpname, PU_CACHE));
+    }
+}
+
+//
+// F_Drawer
+//
+void F_Drawer (void)
+{
+    switch (finalestage)
+    {
+        case F_STAGE_CAST:
+            F_CastDrawer();
+            break;
+        case F_STAGE_TEXT:
+            F_TextWrite();
+            break;
+        case F_STAGE_ARTSCREEN:
+            F_ArtScreenDrawer();
+            break;
+    }
+}
+
+
diff --git a/games/NXDoom/src/doom/f_finale.h b/games/NXDoom/src/doom/f_finale.h
new file mode 100644
index 000000000..daa71c32a
--- /dev/null
+++ b/games/NXDoom/src/doom/f_finale.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//    
+
+
+#ifndef __F_FINALE__
+#define __F_FINALE__
+
+
+#include "doomtype.h"
+#include "d_event.h"
+//
+// FINALE
+//
+
+// Called by main loop.
+boolean F_Responder (event_t* ev);
+
+// Called by main loop.
+void F_Ticker (void);
+
+// Called by main loop.
+void F_Drawer (void);
+
+
+void F_StartFinale (void);
+
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/f_wipe.c b/games/NXDoom/src/doom/f_wipe.c
new file mode 100644
index 000000000..0fa7754dd
--- /dev/null
+++ b/games/NXDoom/src/doom/f_wipe.c
@@ -0,0 +1,294 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Mission begin melt/wipe screen special effect.
+//
+
+#include <string.h>
+
+#include "z_zone.h"
+#include "i_video.h"
+#include "v_video.h"
+#include "m_random.h"
+
+#include "doomtype.h"
+
+#include "f_wipe.h"
+
+//
+//                       SCREEN WIPE PACKAGE
+//
+
+// when zero, stop the wipe
+static boolean	go = 0;
+
+static pixel_t*	wipe_scr_start;
+static pixel_t*	wipe_scr_end;
+static pixel_t*	wipe_scr;
+
+
+void
+wipe_shittyColMajorXform
+( dpixel_t*	array,
+  int		width,
+  int		height )
+{
+    int		x;
+    int		y;
+    dpixel_t*	dest;
+
+    dest = (dpixel_t*) Z_Malloc(width*height*sizeof(*dest), PU_STATIC, 0);
+
+    for(y=0;y<height;y++)
+	for(x=0;x<width;x++)
+	    dest[x*height+y] = array[y*width+x];
+
+    memcpy(array, dest, width*height*sizeof(*dest));
+
+    Z_Free(dest);
+
+}
+
+int
+wipe_initColorXForm
+( int	width,
+  int	height,
+  int	ticks )
+{
+    memcpy(wipe_scr, wipe_scr_start, width*height*sizeof(*wipe_scr));
+    return 0;
+}
+
+int
+wipe_doColorXForm
+( int	width,
+  int	height,
+  int	ticks )
+{
+    boolean	changed;
+    pixel_t*	w;
+    pixel_t*	e;
+    int		newval;
+
+    changed = false;
+    w = wipe_scr;
+    e = wipe_scr_end;
+    
+    while (w!=wipe_scr+width*height)
+    {
+	if (*w != *e)
+	{
+	    if (*w > *e)
+	    {
+		newval = *w - ticks;
+		if (newval < *e)
+		    *w = *e;
+		else
+		    *w = newval;
+		changed = true;
+	    }
+	    else if (*w < *e)
+	    {
+		newval = *w + ticks;
+		if (newval > *e)
+		    *w = *e;
+		else
+		    *w = newval;
+		changed = true;
+	    }
+	}
+	w++;
+	e++;
+    }
+
+    return !changed;
+
+}
+
+int
+wipe_exitColorXForm
+( int	width,
+  int	height,
+  int	ticks )
+{
+    return 0;
+}
+
+
+static int*	y;
+
+int
+wipe_initMelt
+( int	width,
+  int	height,
+  int	ticks )
+{
+    int i, r;
+    
+    // copy start screen to main screen
+    memcpy(wipe_scr, wipe_scr_start, width*height*sizeof(*wipe_scr));
+    
+    // makes this wipe faster (in theory)
+    // to have stuff in column-major format
+    wipe_shittyColMajorXform((dpixel_t*)wipe_scr_start, width/2, height);
+    wipe_shittyColMajorXform((dpixel_t*)wipe_scr_end, width/2, height);
+    
+    // setup initial column positions
+    // (y<0 => not ready to scroll yet)
+    y = (int *) Z_Malloc(width*sizeof(int), PU_STATIC, 0);
+    y[0] = -(M_Random()%16);
+    for (i=1;i<width;i++)
+    {
+	r = (M_Random()%3) - 1;
+	y[i] = y[i-1] + r;
+	if (y[i] > 0) y[i] = 0;
+	else if (y[i] == -16) y[i] = -15;
+    }
+
+    return 0;
+}
+
+int
+wipe_doMelt
+( int	width,
+  int	height,
+  int	ticks )
+{
+    int		i;
+    int		j;
+    int		dy;
+    int		idx;
+    
+    dpixel_t*	s;
+    dpixel_t*	d;
+    boolean	done = true;
+
+    width/=2;
+
+    while (ticks--)
+    {
+	for (i=0;i<width;i++)
+	{
+	    if (y[i]<0)
+	    {
+		y[i]++; done = false;
+	    }
+	    else if (y[i] < height)
+	    {
+		dy = (y[i] < 16) ? y[i]+1 : 8;
+		if (y[i]+dy >= height) dy = height - y[i];
+		s = &((dpixel_t *)wipe_scr_end)[i*height+y[i]];
+		d = &((dpixel_t *)wipe_scr)[y[i]*width+i];
+		idx = 0;
+		for (j=dy;j;j--)
+		{
+		    d[idx] = *(s++);
+		    idx += width;
+		}
+		y[i] += dy;
+		s = &((dpixel_t *)wipe_scr_start)[i*height];
+		d = &((dpixel_t *)wipe_scr)[y[i]*width+i];
+		idx = 0;
+		for (j=height-y[i];j;j--)
+		{
+		    d[idx] = *(s++);
+		    idx += width;
+		}
+		done = false;
+	    }
+	}
+    }
+
+    return done;
+
+}
+
+int
+wipe_exitMelt
+( int	width,
+  int	height,
+  int	ticks )
+{
+    Z_Free(y);
+    Z_Free(wipe_scr_start);
+    Z_Free(wipe_scr_end);
+    return 0;
+}
+
+int
+wipe_StartScreen
+( int	x,
+  int	y,
+  int	width,
+  int	height )
+{
+    wipe_scr_start = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*wipe_scr_start), PU_STATIC, NULL);
+    I_ReadScreen(wipe_scr_start);
+    return 0;
+}
+
+int
+wipe_EndScreen
+( int	x,
+  int	y,
+  int	width,
+  int	height )
+{
+    wipe_scr_end = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*wipe_scr_end), PU_STATIC, NULL);
+    I_ReadScreen(wipe_scr_end);
+    V_DrawBlock(x, y, width, height, wipe_scr_start); // restore start scr.
+    return 0;
+}
+
+int
+wipe_ScreenWipe
+( int	wipeno,
+  int	x,
+  int	y,
+  int	width,
+  int	height,
+  int	ticks )
+{
+    int rc;
+    static int (*wipes[])(int, int, int) =
+    {
+	wipe_initColorXForm, wipe_doColorXForm, wipe_exitColorXForm,
+	wipe_initMelt, wipe_doMelt, wipe_exitMelt
+    };
+
+    // initial stuff
+    if (!go)
+    {
+	go = 1;
+	// wipe_scr = (pixel_t *) Z_Malloc(width*height, PU_STATIC, 0); // DEBUG
+	wipe_scr = I_VideoBuffer;
+	(*wipes[wipeno*3])(width, height, ticks);
+    }
+
+    // do a piece of wipe-in
+    V_MarkRect(0, 0, width, height);
+    rc = (*wipes[wipeno*3+1])(width, height, ticks);
+    //  V_DrawBlock(x, y, 0, width, height, wipe_scr); // DEBUG
+
+    // final stuff
+    if (rc)
+    {
+	go = 0;
+	(*wipes[wipeno*3+2])(width, height, ticks);
+    }
+
+    return !go;
+}
+
diff --git a/games/NXDoom/src/doom/f_wipe.h b/games/NXDoom/src/doom/f_wipe.h
new file mode 100644
index 000000000..f48a9ca65
--- /dev/null
+++ b/games/NXDoom/src/doom/f_wipe.h
@@ -0,0 +1,63 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Mission start screen wipe/melt, special effects.
+//	
+
+
+#ifndef __F_WIPE_H__
+#define __F_WIPE_H__
+
+//
+//                       SCREEN WIPE PACKAGE
+//
+
+enum
+{
+    // simple gradual pixel change for 8-bit only
+    wipe_ColorXForm,
+    
+    // weird screen melt
+    wipe_Melt,	
+
+    wipe_NUMWIPES
+};
+
+int
+wipe_StartScreen
+( int		x,
+  int		y,
+  int		width,
+  int		height );
+
+
+int
+wipe_EndScreen
+( int		x,
+  int		y,
+  int		width,
+  int		height );
+
+
+int
+wipe_ScreenWipe
+( int		wipeno,
+  int		x,
+  int		y,
+  int		width,
+  int		height,
+  int		ticks );
+
+#endif
diff --git a/games/NXDoom/src/doom/g_game.c b/games/NXDoom/src/doom/g_game.c
new file mode 100644
index 000000000..425871217
--- /dev/null
+++ b/games/NXDoom/src/doom/g_game.c
@@ -0,0 +1,2408 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+
+
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "doomdef.h" 
+#include "doomkeys.h"
+#include "doomstat.h"
+
+#include "deh_main.h"
+#include "deh_misc.h"
+
+#include "z_zone.h"
+#include "f_finale.h"
+#include "m_argv.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "m_random.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_input.h"
+#include "i_swap.h"
+#include "i_video.h"
+
+#include "p_setup.h"
+#include "p_saveg.h"
+#include "p_tick.h"
+
+#include "d_main.h"
+
+#include "wi_stuff.h"
+#include "hu_stuff.h"
+#include "st_stuff.h"
+#include "am_map.h"
+#include "statdump.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+#include "w_wad.h"
+
+#include "p_local.h" 
+
+#include "s_sound.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+// SKY handling - still the wrong place.
+#include "r_data.h"
+#include "r_sky.h"
+
+
+
+#include "g_game.h"
+
+
+#define SAVEGAMESIZE	0x2c000
+
+void	G_ReadDemoTiccmd (ticcmd_t* cmd); 
+void	G_WriteDemoTiccmd (ticcmd_t* cmd); 
+void	G_PlayerReborn (int player); 
+ 
+void	G_DoReborn (int playernum); 
+ 
+void	G_DoLoadLevel (void); 
+void	G_DoNewGame (void); 
+void	G_DoPlayDemo (void); 
+void	G_DoCompleted (void); 
+void	G_DoVictory (void); 
+void	G_DoWorldDone (void); 
+void	G_DoSaveGame (void); 
+ 
+// Gamestate the last time G_Ticker was called.
+
+gamestate_t     oldgamestate; 
+ 
+gameaction_t    gameaction; 
+gamestate_t     gamestate; 
+skill_t         gameskill; 
+boolean		respawnmonsters;
+int             gameepisode; 
+int             gamemap; 
+
+// If non-zero, exit the level after this number of minutes.
+
+int             timelimit;
+
+boolean         paused; 
+boolean         sendpause;             	// send a pause event next tic 
+boolean         sendsave;             	// send a save event next tic 
+boolean         usergame;               // ok to save / end game 
+ 
+boolean         timingdemo;             // if true, exit with report on completion 
+boolean         nodrawers;              // for comparative timing purposes 
+int             starttime;          	// for comparative timing purposes  	 
+ 
+boolean         viewactive; 
+ 
+int             deathmatch;           	// only if started as net death 
+boolean         netgame;                // only true if packets are broadcast 
+boolean         playeringame[MAXPLAYERS]; 
+player_t        players[MAXPLAYERS]; 
+
+boolean         turbodetected[MAXPLAYERS];
+ 
+int             consoleplayer;          // player taking events and displaying 
+int             displayplayer;          // view being displayed 
+int             levelstarttic;          // gametic at level start 
+int             totalkills, totalitems, totalsecret;    // for intermission 
+ 
+char           *demoname;
+boolean         demorecording; 
+boolean         longtics;               // cph's doom 1.91 longtics hack
+boolean         lowres_turn;            // low resolution turning for longtics
+boolean         demoplayback; 
+boolean		netdemo; 
+byte*		demobuffer;
+byte*		demo_p;
+byte*		demoend; 
+boolean         singledemo;            	// quit after playing a demo from cmdline 
+ 
+boolean         precache = true;        // if true, load all graphics at start 
+
+boolean         testcontrols = false;    // Invoked by setup to test controls
+int             testcontrols_mousespeed;
+ 
+
+ 
+wbstartstruct_t wminfo;               	// parms for world map / intermission 
+ 
+byte		consistancy[MAXPLAYERS][BACKUPTICS]; 
+ 
+#define MAXPLMOVE		(forwardmove[1]) 
+ 
+#define TURBOTHRESHOLD	0x32
+
+fixed_t         forwardmove[2] = {0x19, 0x32}; 
+fixed_t         sidemove[2] = {0x18, 0x28}; 
+fixed_t         angleturn[3] = {640, 1280, 320};    // + slow turn 
+
+static int *weapon_keys[] = {
+    &key_weapon1,
+    &key_weapon2,
+    &key_weapon3,
+    &key_weapon4,
+    &key_weapon5,
+    &key_weapon6,
+    &key_weapon7,
+    &key_weapon8
+};
+
+// Set to -1 or +1 to switch to the previous or next weapon.
+
+static int next_weapon = 0;
+
+// Used for prev/next weapon keys.
+
+static const struct
+{
+    weapontype_t weapon;
+    weapontype_t weapon_num;
+} weapon_order_table[] = {
+    { wp_fist,            wp_fist },
+    { wp_chainsaw,        wp_fist },
+    { wp_pistol,          wp_pistol },
+    { wp_shotgun,         wp_shotgun },
+    { wp_supershotgun,    wp_shotgun },
+    { wp_chaingun,        wp_chaingun },
+    { wp_missile,         wp_missile },
+    { wp_plasma,          wp_plasma },
+    { wp_bfg,             wp_bfg }
+};
+
+#define SLOWTURNTICS	6 
+ 
+#define NUMKEYS		256 
+#define MAX_JOY_BUTTONS 20
+
+static boolean  gamekeydown[NUMKEYS]; 
+static int      turnheld;		// for accelerative turning 
+ 
+static boolean  mousearray[MAX_MOUSE_BUTTONS + 1];
+static boolean *mousebuttons = &mousearray[1];  // allow [-1]
+
+// mouse values are used once 
+int             mousex;
+int             mousey;         
+
+static int      dclicktime;
+static boolean  dclickstate;
+static int      dclicks; 
+static int      dclicktime2;
+static boolean  dclickstate2;
+static int      dclicks2;
+
+// joystick values are repeated 
+static int      joyxmove;
+static int      joyymove;
+static int      joystrafemove;
+static boolean  joyarray[MAX_JOY_BUTTONS + 1]; 
+static boolean *joybuttons = &joyarray[1];		// allow [-1] 
+ 
+static int      savegameslot; 
+static char     savedescription[32]; 
+ 
+#define	BODYQUESIZE	32
+
+mobj_t*		bodyque[BODYQUESIZE]; 
+int		bodyqueslot; 
+ 
+int             vanilla_savegame_limit = 1;
+int             vanilla_demo_limit = 1;
+ 
+int G_CmdChecksum (ticcmd_t* cmd) 
+{ 
+    size_t		i;
+    int		sum = 0; 
+	 
+    for (i=0 ; i< sizeof(*cmd)/4 - 1 ; i++) 
+	sum += ((int *)cmd)[i]; 
+		 
+    return sum; 
+} 
+
+static boolean WeaponSelectable(weapontype_t weapon)
+{
+    // Can't select the super shotgun in Doom 1.
+
+    if (weapon == wp_supershotgun && logical_gamemission == doom)
+    {
+        return false;
+    }
+
+    // These weapons aren't available in shareware.
+
+    if ((weapon == wp_plasma || weapon == wp_bfg)
+     && gamemission == doom && gamemode == shareware)
+    {
+        return false;
+    }
+
+    // Can't select a weapon if we don't own it.
+
+    if (!players[consoleplayer].weaponowned[weapon])
+    {
+        return false;
+    }
+
+    // Can't select the fist if we have the chainsaw, unless
+    // we also have the berserk pack.
+
+    if (weapon == wp_fist
+     && players[consoleplayer].weaponowned[wp_chainsaw]
+     && !players[consoleplayer].powers[pw_strength])
+    {
+        return false;
+    }
+
+    return true;
+}
+
+static int G_NextWeapon(int direction)
+{
+    weapontype_t weapon;
+    int start_i, i;
+
+    // Find index in the table.
+
+    if (players[consoleplayer].pendingweapon == wp_nochange)
+    {
+        weapon = players[consoleplayer].readyweapon;
+    }
+    else
+    {
+        weapon = players[consoleplayer].pendingweapon;
+    }
+
+    for (i=0; i<arrlen(weapon_order_table); ++i)
+    {
+        if (weapon_order_table[i].weapon == weapon)
+        {
+            break;
+        }
+    }
+
+    // The current weapon must be present in weapon_order_table
+    // otherwise something has gone terribly wrong
+    if (i >= arrlen(weapon_order_table)) {
+        I_Error("Internal error: weapon %d not present in weapon_order_table", weapon);
+    }
+
+    // Switch weapon. Don't loop forever.
+    start_i = i;
+    do
+    {
+        i += direction;
+        i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
+    } while (i != start_i && !WeaponSelectable(weapon_order_table[i].weapon));
+
+    return weapon_order_table[i].weapon_num;
+}
+
+//
+// G_BuildTiccmd
+// Builds a ticcmd from all of the available inputs
+// or reads it from the demo buffer. 
+// If recording a demo, write it out 
+// 
+void G_BuildTiccmd (ticcmd_t* cmd, int maketic) 
+{ 
+    int		i; 
+    boolean	strafe;
+    boolean	bstrafe; 
+    int		speed;
+    int		tspeed; 
+    int		forward;
+    int		side;
+
+    memset(cmd, 0, sizeof(ticcmd_t));
+
+    cmd->consistancy = 
+	consistancy[consoleplayer][maketic%BACKUPTICS]; 
+ 
+    strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe] 
+	|| joybuttons[joybstrafe]; 
+
+    // fraggle: support the old "joyb_speed = 31" hack which
+    // allowed an autorun effect
+
+    speed = key_speed >= NUMKEYS
+         || joybspeed >= MAX_JOY_BUTTONS
+         || gamekeydown[key_speed] 
+         || joybuttons[joybspeed]
+         || mousebuttons[mousebspeed];
+ 
+    forward = side = 0;
+    
+    // use two stage accelerative turning
+    // on the keyboard and joystick
+    if (joyxmove < 0
+	|| joyxmove > 0  
+	|| gamekeydown[key_right]
+	|| gamekeydown[key_left]
+	|| mousebuttons[mousebturnright]
+	|| mousebuttons[mousebturnleft])
+	turnheld += ticdup; 
+    else 
+	turnheld = 0; 
+
+    if (turnheld < SLOWTURNTICS) 
+	tspeed = 2;             // slow turn 
+    else 
+	tspeed = speed;
+    
+    // let movement keys cancel each other out
+    if (strafe) 
+    { 
+	if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+	{
+	    // fprintf(stderr, "strafe right\n");
+	    side += sidemove[speed]; 
+	}
+	if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+	{
+	    //	fprintf(stderr, "strafe left\n");
+	    side -= sidemove[speed]; 
+	}
+        if (use_analog && joyxmove)
+        {
+            joyxmove = joyxmove * joystick_move_sensitivity / 10;
+            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
+            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
+            side += FixedMul(sidemove[speed], joyxmove);
+        }
+        else if (joystick_move_sensitivity)
+        {
+            if (joyxmove > 0)
+                side += sidemove[speed];
+            if (joyxmove < 0)
+                side -= sidemove[speed];
+        }
+    } 
+    else 
+    { 
+	if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+	    cmd->angleturn -= angleturn[tspeed]; 
+	if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+	    cmd->angleturn += angleturn[tspeed]; 
+        if (use_analog && joyxmove)
+        {
+            // Cubic response curve allows for finer control when stick
+            // deflection is small.
+            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
+            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
+            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
+        }
+        else if (joystick_turn_sensitivity)
+        {
+            if (joyxmove > 0)
+                cmd->angleturn -= angleturn[tspeed];
+            if (joyxmove < 0)
+                cmd->angleturn += angleturn[tspeed];
+        }
+    } 
+ 
+    if (gamekeydown[key_up]) 
+    {
+	// fprintf(stderr, "up\n");
+	forward += forwardmove[speed]; 
+    }
+    if (gamekeydown[key_down]) 
+    {
+	// fprintf(stderr, "down\n");
+	forward -= forwardmove[speed]; 
+    }
+
+    if (use_analog && joyymove)
+    {
+        joyymove = joyymove * joystick_move_sensitivity / 10;
+        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
+        joyymove = (joyymove < -FRACUNIT) ? -FRACUNIT : joyymove;
+        forward -= FixedMul(forwardmove[speed], joyymove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joyymove < 0)
+            forward += forwardmove[speed];
+        if (joyymove > 0)
+            forward -= forwardmove[speed];
+    }
+
+    if (gamekeydown[key_strafeleft]
+     || joybuttons[joybstrafeleft]
+     || mousebuttons[mousebstrafeleft])
+    {
+        side -= sidemove[speed];
+    }
+
+    if (gamekeydown[key_straferight]
+     || joybuttons[joybstraferight]
+     || mousebuttons[mousebstraferight])
+    {
+        side += sidemove[speed]; 
+    }
+
+    if (use_analog && joystrafemove)
+    {
+        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
+        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
+        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
+        side += FixedMul(sidemove[speed], joystrafemove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joystrafemove < 0)
+            side -= sidemove[speed];
+        if (joystrafemove > 0)
+            side += sidemove[speed];
+    }
+
+    // buttons
+    cmd->chatchar = HU_dequeueChatChar(); 
+ 
+    if (gamekeydown[key_fire] || mousebuttons[mousebfire] 
+	|| joybuttons[joybfire]) 
+	cmd->buttons |= BT_ATTACK; 
+ 
+    if (gamekeydown[key_use]
+     || joybuttons[joybuse]
+     || mousebuttons[mousebuse])
+    { 
+	cmd->buttons |= BT_USE;
+	// clear double clicks if hit use button 
+	dclicks = 0;                   
+    } 
+
+    // If the previous or next weapon button is pressed, the
+    // next_weapon variable is set to change weapons when
+    // we generate a ticcmd.  Choose a new weapon.
+
+    if (gamestate == GS_LEVEL && next_weapon != 0)
+    {
+        i = G_NextWeapon(next_weapon);
+        cmd->buttons |= BT_CHANGE;
+        cmd->buttons |= i << BT_WEAPONSHIFT;
+    }
+    else
+    {
+        // Check weapon keys.
+
+        for (i=0; i<arrlen(weapon_keys); ++i)
+        {
+            int key = *weapon_keys[i];
+
+            if (gamekeydown[key])
+            {
+                cmd->buttons |= BT_CHANGE;
+                cmd->buttons |= i<<BT_WEAPONSHIFT;
+                break;
+            }
+        }
+    }
+
+    next_weapon = 0;
+
+    // mouse
+    if (mousebuttons[mousebforward]) 
+    {
+	forward += forwardmove[speed];
+    }
+    if (mousebuttons[mousebbackward])
+    {
+        forward -= forwardmove[speed];
+    }
+
+    if (dclick_use)
+    {
+        // forward double click
+        if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1 ) 
+        { 
+            dclickstate = mousebuttons[mousebforward]; 
+            if (dclickstate) 
+                dclicks++; 
+            if (dclicks == 2) 
+            { 
+                cmd->buttons |= BT_USE; 
+                dclicks = 0; 
+            } 
+            else 
+                dclicktime = 0; 
+        } 
+        else 
+        { 
+            dclicktime += ticdup; 
+            if (dclicktime > 20) 
+            { 
+                dclicks = 0; 
+                dclickstate = 0; 
+            } 
+        }
+        
+        // strafe double click
+        bstrafe =
+            mousebuttons[mousebstrafe] 
+            || joybuttons[joybstrafe]; 
+        if (bstrafe != dclickstate2 && dclicktime2 > 1 ) 
+        { 
+            dclickstate2 = bstrafe; 
+            if (dclickstate2) 
+                dclicks2++; 
+            if (dclicks2 == 2) 
+            { 
+                cmd->buttons |= BT_USE; 
+                dclicks2 = 0; 
+            } 
+            else 
+                dclicktime2 = 0; 
+        } 
+        else 
+        { 
+            dclicktime2 += ticdup; 
+            if (dclicktime2 > 20) 
+            { 
+                dclicks2 = 0; 
+                dclickstate2 = 0; 
+            } 
+        } 
+    }
+
+    forward += mousey; 
+
+    if (strafe) 
+	side += mousex*2; 
+    else 
+	cmd->angleturn -= mousex*0x8; 
+
+    if (mousex == 0)
+    {
+        // No movement in the previous frame
+
+        testcontrols_mousespeed = 0;
+    }
+    
+    mousex = mousey = 0; 
+	 
+    if (forward > MAXPLMOVE) 
+	forward = MAXPLMOVE; 
+    else if (forward < -MAXPLMOVE) 
+	forward = -MAXPLMOVE; 
+    if (side > MAXPLMOVE) 
+	side = MAXPLMOVE; 
+    else if (side < -MAXPLMOVE) 
+	side = -MAXPLMOVE; 
+ 
+    cmd->forwardmove += forward; 
+    cmd->sidemove += side;
+    
+    // special buttons
+    if (sendpause) 
+    { 
+	sendpause = false; 
+	cmd->buttons = BT_SPECIAL | BTS_PAUSE; 
+    } 
+ 
+    if (sendsave) 
+    { 
+	sendsave = false; 
+	cmd->buttons = BT_SPECIAL | BTS_SAVEGAME | (savegameslot<<BTS_SAVESHIFT); 
+    } 
+
+    // low-res turning
+
+    if (lowres_turn)
+    {
+        static signed short carry = 0;
+        signed short desired_angleturn;
+
+        desired_angleturn = cmd->angleturn + carry;
+
+        // round angleturn to the nearest 256 unit boundary
+        // for recording demos with single byte values for turn
+
+        cmd->angleturn = (desired_angleturn + 128) & 0xff00;
+
+        // Carry forward the error from the reduced resolution to the
+        // next tic, so that successive small movements can accumulate.
+
+        carry = desired_angleturn - cmd->angleturn;
+    }
+} 
+ 
+
+//
+// G_DoLoadLevel 
+//
+void G_DoLoadLevel (void) 
+{ 
+    int             i; 
+
+    // Set the sky map.
+    // First thing, we have a dummy sky texture name,
+    //  a flat. The data is in the WAD only because
+    //  we look for an actual index, instead of simply
+    //  setting one.
+
+    skyflatnum = R_FlatNumForName(DEH_String(SKYFLATNAME));
+
+    // The "Sky never changes in Doom II" bug was fixed in
+    // the id Anthology version of doom2.exe for Final Doom.
+    if ((gamemode == commercial)
+     && (gameversion == exe_final2 || gameversion == exe_chex))
+    {
+        const char *skytexturename;
+
+        if (gamemap < 12)
+        {
+            skytexturename = "SKY1";
+        }
+        else if (gamemap < 21)
+        {
+            skytexturename = "SKY2";
+        }
+        else
+        {
+            skytexturename = "SKY3";
+        }
+
+        skytexturename = DEH_String(skytexturename);
+
+        skytexture = R_TextureNumForName(skytexturename);
+    }
+
+    levelstarttic = gametic;        // for time calculation
+    
+    if (wipegamestate == GS_LEVEL) 
+	wipegamestate = -1;             // force a wipe 
+
+    gamestate = GS_LEVEL; 
+
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+    { 
+	turbodetected[i] = false;
+	if (playeringame[i] && players[i].playerstate == PST_DEAD) 
+	    players[i].playerstate = PST_REBORN; 
+	memset (players[i].frags,0,sizeof(players[i].frags)); 
+    } 
+		 
+    P_SetupLevel (gameepisode, gamemap, 0, gameskill);    
+    displayplayer = consoleplayer;		// view the guy you are playing    
+    gameaction = ga_nothing; 
+    Z_CheckHeap ();
+    
+    // clear cmd building stuff
+
+    memset (gamekeydown, 0, sizeof(gamekeydown));
+    joyxmove = joyymove = joystrafemove = 0;
+    mousex = mousey = 0;
+    sendpause = sendsave = paused = false;
+    memset(mousearray, 0, sizeof(mousearray));
+    memset(joyarray, 0, sizeof(joyarray));
+
+    if (testcontrols)
+    {
+        players[consoleplayer].message = "Press escape to quit.";
+    }
+} 
+
+static void SetJoyButtons(unsigned int buttons_mask)
+{
+    int i;
+
+    for (i=0; i<MAX_JOY_BUTTONS; ++i)
+    {
+        int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!joybuttons[i] && button_on)
+        {
+            // Weapon cycling:
+
+            if (i == joybprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == joybnextweapon)
+            {
+                next_weapon = 1;
+            }
+        }
+
+        joybuttons[i] = button_on;
+    }
+}
+
+static void SetMouseButtons(unsigned int buttons_mask)
+{
+    int i;
+
+    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
+    {
+        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!mousebuttons[i] && button_on)
+        {
+            if (i == mousebprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == mousebnextweapon)
+            {
+                next_weapon = 1;
+            }
+        }
+
+	mousebuttons[i] = button_on;
+    }
+}
+
+//
+// G_Responder  
+// Get info needed to make ticcmd_ts for the players.
+// 
+boolean G_Responder (event_t* ev) 
+{ 
+    // allow spy mode changes even during the demo
+    if (gamestate == GS_LEVEL && ev->type == ev_keydown 
+     && ev->data1 == key_spy && (singledemo || !deathmatch) )
+    {
+	// spy mode 
+	do 
+	{ 
+	    displayplayer++; 
+	    if (displayplayer == MAXPLAYERS) 
+		displayplayer = 0; 
+	} while (!playeringame[displayplayer] && displayplayer != consoleplayer); 
+	return true; 
+    }
+    
+    // any other key pops up menu if in demos
+    if (gameaction == ga_nothing && !singledemo && 
+	(demoplayback || gamestate == GS_DEMOSCREEN) 
+	) 
+    { 
+	if (ev->type == ev_keydown ||  
+	    (ev->type == ev_mouse && ev->data1) || 
+	    (ev->type == ev_joystick && ev->data1) ) 
+	{ 
+	    M_StartControlPanel (); 
+	    joywait = I_GetTime() + 5;
+	    return true; 
+	} 
+	return false; 
+    } 
+
+    if (gamestate == GS_LEVEL) 
+    { 
+#if 0 
+	if (devparm && ev->type == ev_keydown && ev->data1 == ';') 
+	{ 
+	    G_DeathMatchSpawnPlayer (0); 
+	    return true; 
+	} 
+#endif 
+	if (HU_Responder (ev)) 
+	    return true;	// chat ate the event 
+	if (ST_Responder (ev)) 
+	    return true;	// status window ate it 
+	if (AM_Responder (ev)) 
+	    return true;	// automap ate it 
+    } 
+	 
+    if (gamestate == GS_FINALE) 
+    { 
+	if (F_Responder (ev)) 
+	    return true;	// finale ate the event 
+    } 
+
+    if (testcontrols && ev->type == ev_mouse)
+    {
+        // If we are invoked by setup to test the controls, save the 
+        // mouse speed so that we can display it on-screen.
+        // Perform a low pass filter on this so that the thermometer 
+        // appears to move smoothly.
+
+        testcontrols_mousespeed = abs(ev->data2);
+    }
+
+    // If the next/previous weapon keys are pressed, set the next_weapon
+    // variable to change weapons when the next ticcmd is generated.
+
+    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
+    {
+        next_weapon = -1;
+    }
+    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
+    {
+        next_weapon = 1;
+    }
+
+    switch (ev->type) 
+    { 
+      case ev_keydown: 
+	if (ev->data1 == key_pause) 
+	{ 
+	    sendpause = true; 
+	}
+        else if (ev->data1 <NUMKEYS) 
+        {
+	    gamekeydown[ev->data1] = true; 
+        }
+
+	return true;    // eat key down events 
+ 
+      case ev_keyup: 
+	if (ev->data1 <NUMKEYS) 
+	    gamekeydown[ev->data1] = false; 
+	return false;   // always let key up events filter down 
+		 
+      case ev_mouse: 
+        SetMouseButtons(ev->data1);
+	mousex = ev->data2*(mouseSensitivity+5)/10; 
+	mousey = ev->data3*(mouseSensitivity+5)/10; 
+	return true;    // eat events 
+ 
+      case ev_joystick: 
+        SetJoyButtons(ev->data1);
+	joyxmove = ev->data2; 
+	joyymove = ev->data3; 
+        joystrafemove = ev->data4;
+	return true;    // eat events 
+ 
+      default: 
+	break; 
+    } 
+ 
+    return false; 
+} 
+ 
+ 
+ 
+//
+// G_Ticker
+// Make ticcmd_ts for the players.
+//
+void G_Ticker (void) 
+{ 
+    int		i;
+    int		buf; 
+    ticcmd_t*	cmd;
+    
+    // do player reborns if needed
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+	if (playeringame[i] && players[i].playerstate == PST_REBORN) 
+	    G_DoReborn (i);
+    
+    // do things to change the game state
+    while (gameaction != ga_nothing) 
+    { 
+	switch (gameaction) 
+	{ 
+	  case ga_loadlevel: 
+	    G_DoLoadLevel (); 
+	    break; 
+	  case ga_newgame: 
+	    G_DoNewGame (); 
+	    break; 
+	  case ga_loadgame: 
+	    G_DoLoadGame (); 
+	    break; 
+	  case ga_savegame: 
+	    G_DoSaveGame (); 
+	    break; 
+	  case ga_playdemo: 
+	    G_DoPlayDemo (); 
+	    break; 
+	  case ga_completed: 
+	    G_DoCompleted (); 
+	    break; 
+	  case ga_victory: 
+	    F_StartFinale (); 
+	    break; 
+	  case ga_worlddone: 
+	    G_DoWorldDone (); 
+	    break; 
+	  case ga_screenshot: 
+	    V_ScreenShot("DOOM%02i.%s"); 
+            players[consoleplayer].message = DEH_String("screen shot");
+	    gameaction = ga_nothing; 
+	    break; 
+	  case ga_nothing: 
+	    break; 
+	} 
+    }
+    
+    // get commands, check consistancy,
+    // and build new consistancy check
+    buf = (gametic/ticdup)%BACKUPTICS; 
+ 
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i]) 
+	{ 
+	    cmd = &players[i].cmd; 
+
+	    memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
+
+	    if (demoplayback) 
+		G_ReadDemoTiccmd (cmd); 
+	    if (demorecording) 
+		G_WriteDemoTiccmd (cmd);
+	    
+	    // check for turbo cheats
+
+            // check ~ 4 seconds whether to display the turbo message. 
+            // store if the turbo threshold was exceeded in any tics
+            // over the past 4 seconds.  offset the checking period
+            // for each player so messages are not displayed at the
+            // same time.
+
+            if (cmd->forwardmove > TURBOTHRESHOLD)
+            {
+                turbodetected[i] = true;
+            }
+
+            if ((gametic & 31) == 0 
+             && ((gametic >> 5) % MAXPLAYERS) == i
+             && turbodetected[i])
+            {
+                static char turbomessage[80];
+                M_snprintf(turbomessage, sizeof(turbomessage),
+                           "%s is turbo!", player_names[i]);
+                players[consoleplayer].message = turbomessage;
+                turbodetected[i] = false;
+            }
+
+	    if (netgame && !netdemo && !(gametic%ticdup) ) 
+	    { 
+		if (gametic > BACKUPTICS 
+		    && consistancy[i][buf] != cmd->consistancy) 
+		{ 
+		    I_Error ("consistency failure (%i should be %i)",
+			     cmd->consistancy, consistancy[i][buf]); 
+		} 
+		if (players[i].mo) 
+		    consistancy[i][buf] = players[i].mo->x; 
+		else 
+		    consistancy[i][buf] = rndindex; 
+	    } 
+	}
+    }
+    
+    // check for special buttons
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i]) 
+	{ 
+	    if (players[i].cmd.buttons & BT_SPECIAL) 
+	    { 
+		switch (players[i].cmd.buttons & BT_SPECIALMASK) 
+		{ 
+		  case BTS_PAUSE: 
+		    paused ^= 1; 
+		    if (paused) 
+			S_PauseSound (); 
+		    else 
+			S_ResumeSound (); 
+		    break; 
+					 
+		  case BTS_SAVEGAME: 
+		    if (!savedescription[0]) 
+                    {
+                        M_StringCopy(savedescription, "NET GAME",
+                                     sizeof(savedescription));
+                    }
+
+		    savegameslot =  
+			(players[i].cmd.buttons & BTS_SAVEMASK)>>BTS_SAVESHIFT; 
+		    gameaction = ga_savegame; 
+		    break; 
+		} 
+	    } 
+	}
+    }
+
+    // Have we just finished displaying an intermission screen?
+
+    if (oldgamestate == GS_INTERMISSION && gamestate != GS_INTERMISSION)
+    {
+        WI_End();
+    }
+
+    oldgamestate = gamestate;
+    
+    // do main actions
+    switch (gamestate) 
+    { 
+      case GS_LEVEL: 
+	P_Ticker (); 
+	ST_Ticker (); 
+	AM_Ticker (); 
+	HU_Ticker ();            
+	break; 
+	 
+      case GS_INTERMISSION: 
+	WI_Ticker (); 
+	break; 
+			 
+      case GS_FINALE: 
+	F_Ticker (); 
+	break; 
+ 
+      case GS_DEMOSCREEN: 
+	D_PageTicker (); 
+	break;
+    }        
+} 
+ 
+ 
+//
+// PLAYER STRUCTURE FUNCTIONS
+// also see P_SpawnPlayer in P_Things
+//
+
+//
+// G_InitPlayer 
+// Called at the start.
+// Called by the game initialization functions.
+//
+void G_InitPlayer (int player) 
+{
+    // clear everything else to defaults
+    G_PlayerReborn (player); 
+}
+ 
+ 
+
+//
+// G_PlayerFinishLevel
+// Can when a player completes a level.
+//
+void G_PlayerFinishLevel (int player) 
+{ 
+    player_t*	p; 
+	 
+    p = &players[player]; 
+	 
+    memset (p->powers, 0, sizeof (p->powers)); 
+    memset (p->cards, 0, sizeof (p->cards)); 
+    p->mo->flags &= ~MF_SHADOW;		// cancel invisibility 
+    p->extralight = 0;			// cancel gun flashes 
+    p->fixedcolormap = 0;		// cancel ir gogles 
+    p->damagecount = 0;			// no palette changes 
+    p->bonuscount = 0; 
+} 
+ 
+
+//
+// G_PlayerReborn
+// Called after a player dies 
+// almost everything is cleared and initialized 
+//
+void G_PlayerReborn (int player) 
+{ 
+    player_t*	p; 
+    int		i; 
+    int		frags[MAXPLAYERS]; 
+    int		killcount;
+    int		itemcount;
+    int		secretcount; 
+	 
+    memcpy (frags,players[player].frags,sizeof(frags)); 
+    killcount = players[player].killcount; 
+    itemcount = players[player].itemcount; 
+    secretcount = players[player].secretcount; 
+	 
+    p = &players[player]; 
+    memset (p, 0, sizeof(*p)); 
+ 
+    memcpy (players[player].frags, frags, sizeof(players[player].frags)); 
+    players[player].killcount = killcount; 
+    players[player].itemcount = itemcount; 
+    players[player].secretcount = secretcount; 
+ 
+    p->usedown = p->attackdown = true;	// don't do anything immediately 
+    p->playerstate = PST_LIVE;       
+    p->health = deh_initial_health;     // Use dehacked value
+    p->readyweapon = p->pendingweapon = wp_pistol; 
+    p->weaponowned[wp_fist] = true; 
+    p->weaponowned[wp_pistol] = true; 
+    p->ammo[am_clip] = deh_initial_bullets; 
+	 
+    for (i=0 ; i<NUMAMMO ; i++) 
+	p->maxammo[i] = maxammo[i]; 
+		 
+}
+
+//
+// G_CheckSpot  
+// Returns false if the player cannot be respawned
+// at the given mapthing_t spot  
+// because something is occupying it 
+//
+void P_SpawnPlayer (mapthing_t* mthing); 
+ 
+boolean
+G_CheckSpot
+( int		playernum,
+  mapthing_t*	mthing ) 
+{ 
+    fixed_t		x;
+    fixed_t		y; 
+    subsector_t*	ss; 
+    mobj_t*		mo; 
+    int			i;
+	
+    if (!players[playernum].mo)
+    {
+	// first spawn of level, before corpses
+	for (i=0 ; i<playernum ; i++)
+	    if (players[i].mo->x == mthing->x << FRACBITS
+		&& players[i].mo->y == mthing->y << FRACBITS)
+		return false;	
+	return true;
+    }
+		
+    x = mthing->x << FRACBITS; 
+    y = mthing->y << FRACBITS; 
+	 
+    if (!P_CheckPosition (players[playernum].mo, x, y) ) 
+	return false; 
+ 
+    // flush an old corpse if needed 
+    if (bodyqueslot >= BODYQUESIZE) 
+	P_RemoveMobj (bodyque[bodyqueslot%BODYQUESIZE]); 
+    bodyque[bodyqueslot%BODYQUESIZE] = players[playernum].mo; 
+    bodyqueslot++; 
+
+    // spawn a teleport fog
+    ss = R_PointInSubsector (x,y);
+
+
+    // The code in the released source looks like this:
+    //
+    //    an = ( ANG45 * (((unsigned int) mthing->angle)/45) )
+    //         >> ANGLETOFINESHIFT;
+    //    mo = P_SpawnMobj (x+20*finecosine[an], y+20*finesine[an]
+    //                     , ss->sector->floorheight
+    //                     , MT_TFOG);
+    //
+    // But 'an' can be a signed value in the DOS version. This means that
+    // we get a negative index and the lookups into finecosine/finesine
+    // end up dereferencing values in finetangent[].
+    // A player spawning on a deathmatch start facing directly west spawns
+    // "silently" with no spawn fog. Emulate this.
+    //
+    // This code is imported from PrBoom+.
+
+    {
+        fixed_t xa, ya;
+        signed int an;
+
+        // This calculation overflows in Vanilla Doom, but here we deliberately
+        // avoid integer overflow as it is undefined behavior, so the value of
+        // 'an' will always be positive.
+        an = (ANG45 >> ANGLETOFINESHIFT) * ((signed int) mthing->angle / 45);
+
+        switch (an)
+        {
+            case 4096:  // -4096:
+                xa = finetangent[2048];    // finecosine[-4096]
+                ya = finetangent[0];       // finesine[-4096]
+                break;
+            case 5120:  // -3072:
+                xa = finetangent[3072];    // finecosine[-3072]
+                ya = finetangent[1024];    // finesine[-3072]
+                break;
+            case 6144:  // -2048:
+                xa = finesine[0];          // finecosine[-2048]
+                ya = finetangent[2048];    // finesine[-2048]
+                break;
+            case 7168:  // -1024:
+                xa = finesine[1024];       // finecosine[-1024]
+                ya = finetangent[3072];    // finesine[-1024]
+                break;
+            case 0:
+            case 1024:
+            case 2048:
+            case 3072:
+                xa = finecosine[an];
+                ya = finesine[an];
+                break;
+            case 8192:  // 360 deg:
+                xa = tantoangle[0];        // finecosine[8192]
+                ya = finesine[8192];       // finesine[8192]
+                break;
+            default:
+                I_Error("G_CheckSpot: unexpected angle %d\n", an);
+                xa = ya = 0;
+                break;
+        }
+        mo = P_SpawnMobj(x + 20 * xa, y + 20 * ya,
+                         ss->sector->floorheight, MT_TFOG);
+    }
+
+    if (players[consoleplayer].viewz != 1) 
+	S_StartSound (mo, sfx_telept);	// don't start sound on first frame 
+ 
+    return true; 
+} 
+
+
+//
+// G_DeathMatchSpawnPlayer 
+// Spawns a player at one of the random death match spots 
+// called at level load and each death 
+//
+void G_DeathMatchSpawnPlayer (int playernum) 
+{ 
+    int             i,j; 
+    int				selections; 
+	 
+    selections = deathmatch_p - deathmatchstarts; 
+    if (selections < 4) 
+	I_Error ("Only %i deathmatch spots, 4 required", selections); 
+ 
+    for (j=0 ; j<20 ; j++) 
+    { 
+	i = P_Random() % selections; 
+	if (G_CheckSpot (playernum, &deathmatchstarts[i]) ) 
+	{ 
+	    deathmatchstarts[i].type = playernum+1; 
+	    P_SpawnPlayer (&deathmatchstarts[i]); 
+	    return; 
+	} 
+    } 
+ 
+    // no good spot, so the player will probably get stuck 
+    P_SpawnPlayer (&playerstarts[playernum]); 
+} 
+
+//
+// G_DoReborn 
+// 
+void G_DoReborn (int playernum) 
+{ 
+    int                             i; 
+	 
+    if (!netgame)
+    {
+	// reload the level from scratch
+	gameaction = ga_loadlevel;  
+    }
+    else 
+    {
+	// respawn at the start
+
+	// first dissasociate the corpse 
+	players[playernum].mo->player = NULL;   
+		 
+	// spawn at random spot if in death match 
+	if (deathmatch) 
+	{ 
+	    G_DeathMatchSpawnPlayer (playernum); 
+	    return; 
+	} 
+		 
+	if (G_CheckSpot (playernum, &playerstarts[playernum]) ) 
+	{ 
+	    P_SpawnPlayer (&playerstarts[playernum]); 
+	    return; 
+	}
+	
+	// try to spawn at one of the other players spots 
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (G_CheckSpot (playernum, &playerstarts[i]) ) 
+	    { 
+		playerstarts[i].type = playernum+1;	// fake as other player 
+		P_SpawnPlayer (&playerstarts[i]); 
+		playerstarts[i].type = i+1;		// restore 
+		return; 
+	    }	    
+	    // he's going to be inside something.  Too bad.
+	}
+	P_SpawnPlayer (&playerstarts[playernum]); 
+    } 
+} 
+ 
+ 
+void G_ScreenShot (void) 
+{ 
+    gameaction = ga_screenshot; 
+} 
+ 
+
+
+// DOOM Par Times
+static const int pars[4][10] =
+{ 
+    {0}, 
+    {0,30,75,120,90,165,180,180,30,165}, 
+    {0,90,90,90,120,90,360,240,30,170}, 
+    {0,90,45,90,150,90,90,165,30,135} 
+}; 
+
+// DOOM II Par Times
+static const int cpars[32] =
+{
+    30,90,120,120,90,150,120,120,270,90,	//  1-10
+    210,150,150,150,210,150,420,150,210,150,	// 11-20
+    240,150,180,150,150,300,330,420,300,180,	// 21-30
+    120,30					// 31-32
+};
+
+// Chex Quest Par Times
+static const int chexpars[6] =
+{ 
+    0,120,360,480,200,360
+}; 
+ 
+
+//
+// G_DoCompleted 
+//
+boolean		secretexit; 
+ 
+void G_ExitLevel (void) 
+{ 
+    secretexit = false; 
+    gameaction = ga_completed; 
+} 
+
+// Here's for the german edition.
+void G_SecretExitLevel (void) 
+{ 
+    // IF NO WOLF3D LEVELS, NO SECRET EXIT!
+    if ( (gamemode == commercial)
+      && (W_CheckNumForName("map31")<0))
+	secretexit = false;
+    else
+	secretexit = true; 
+    gameaction = ga_completed; 
+} 
+ 
+void G_DoCompleted (void) 
+{ 
+    int             i; 
+	 
+    gameaction = ga_nothing; 
+ 
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+	if (playeringame[i]) 
+	    G_PlayerFinishLevel (i);        // take away cards and stuff 
+	 
+    if (automapactive) 
+	AM_Stop (); 
+	
+    if (gamemode != commercial)
+    {
+        // Chex Quest ends after 5 levels, rather than 8.
+
+        if (gameversion == exe_chex)
+        {
+            if (gamemap == 5)
+            {
+                gameaction = ga_victory;
+                return;
+            }
+        }
+        else
+        {
+            switch(gamemap)
+            {
+              case 8:
+                gameaction = ga_victory;
+                return;
+              case 9: 
+                for (i=0 ; i<MAXPLAYERS ; i++) 
+                    players[i].didsecret = true; 
+                break;
+            }
+        }
+    }
+
+//#if 0  Hmmm - why?
+    if ( (gamemap == 8)
+	 && (gamemode != commercial) ) 
+    {
+	// victory 
+	gameaction = ga_victory; 
+	return; 
+    } 
+	 
+    if ( (gamemap == 9)
+	 && (gamemode != commercial) ) 
+    {
+	// exit secret level 
+	for (i=0 ; i<MAXPLAYERS ; i++) 
+	    players[i].didsecret = true; 
+    } 
+//#endif
+    
+	 
+    wminfo.didsecret = players[consoleplayer].didsecret; 
+    wminfo.epsd = gameepisode -1; 
+    wminfo.last = gamemap -1;
+    
+    // wminfo.next is 0 biased, unlike gamemap
+    if ( gamemode == commercial)
+    {
+	if (secretexit)
+	    switch(gamemap)
+	    {
+	      case 15: wminfo.next = 30; break;
+	      case 31: wminfo.next = 31; break;
+	    }
+	else
+	    switch(gamemap)
+	    {
+	      case 31:
+	      case 32: wminfo.next = 15; break;
+	      default: wminfo.next = gamemap;
+	    }
+    }
+    else
+    {
+	if (secretexit) 
+	    wminfo.next = 8; 	// go to secret level 
+	else if (gamemap == 9) 
+	{
+	    // returning from secret level 
+	    switch (gameepisode) 
+	    { 
+	      case 1: 
+		wminfo.next = 3; 
+		break; 
+	      case 2: 
+		wminfo.next = 5; 
+		break; 
+	      case 3: 
+		wminfo.next = 6; 
+		break; 
+	      case 4:
+		wminfo.next = 2;
+		break;
+	    }                
+	} 
+	else 
+	    wminfo.next = gamemap;          // go to next level 
+    }
+		 
+    wminfo.maxkills = totalkills; 
+    wminfo.maxitems = totalitems; 
+    wminfo.maxsecret = totalsecret; 
+    wminfo.maxfrags = 0; 
+
+    // Set par time. Exceptions are added for purposes of
+    // statcheck regression testing.
+    if (gamemode == commercial)
+    {
+        // map33 reads its par time from beyond the cpars[] array
+        if (gamemap == 33)
+        {
+            int cpars32;
+
+            memcpy(&cpars32, DEH_String(GAMMALVL0), sizeof(int));
+            cpars32 = LONG(cpars32);
+
+            wminfo.partime = TICRATE*cpars32;
+        }
+        else
+        {
+            wminfo.partime = TICRATE*cpars[gamemap-1];
+        }
+    }
+    // Doom episode 4 doesn't have a par time, so this
+    // overflows into the cpars array.
+    else if (gameepisode < 4)
+    {
+        if (gameversion == exe_chex && gameepisode == 1 && gamemap < 6)
+        {
+            wminfo.partime = TICRATE*chexpars[gamemap];
+        }
+        else
+        {
+            wminfo.partime = TICRATE*pars[gameepisode][gamemap];
+        }
+    }
+    else
+    {
+        wminfo.partime = TICRATE*cpars[gamemap];
+    }
+
+    wminfo.pnum = consoleplayer; 
+ 
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+    { 
+	wminfo.plyr[i].in = playeringame[i]; 
+	wminfo.plyr[i].skills = players[i].killcount; 
+	wminfo.plyr[i].sitems = players[i].itemcount; 
+	wminfo.plyr[i].ssecret = players[i].secretcount; 
+	wminfo.plyr[i].stime = leveltime; 
+	memcpy (wminfo.plyr[i].frags, players[i].frags 
+		, sizeof(wminfo.plyr[i].frags)); 
+    } 
+ 
+    gamestate = GS_INTERMISSION; 
+    viewactive = false; 
+    automapactive = false; 
+
+    StatCopy(&wminfo);
+ 
+    WI_Start (&wminfo); 
+} 
+
+
+//
+// G_WorldDone 
+//
+void G_WorldDone (void) 
+{ 
+    gameaction = ga_worlddone; 
+
+    if (secretexit) 
+	players[consoleplayer].didsecret = true; 
+
+    if ( gamemode == commercial )
+    {
+	switch (gamemap)
+	{
+	  case 15:
+	  case 31:
+	    if (!secretexit)
+		break;
+	  case 6:
+	  case 11:
+	  case 20:
+	  case 30:
+	    F_StartFinale ();
+	    break;
+	}
+    }
+} 
+ 
+void G_DoWorldDone (void) 
+{        
+    gamestate = GS_LEVEL; 
+    gamemap = wminfo.next+1; 
+    G_DoLoadLevel (); 
+    gameaction = ga_nothing; 
+    viewactive = true; 
+} 
+ 
+
+
+//
+// G_InitFromSavegame
+// Can be called by the startup code or the menu task. 
+//
+
+char	savename[256];
+
+void G_LoadGame (char* name) 
+{ 
+    M_StringCopy(savename, name, sizeof(savename));
+    gameaction = ga_loadgame; 
+} 
+
+void G_DoLoadGame (void) 
+{ 
+    int savedleveltime;
+	 
+    gameaction = ga_nothing; 
+	 
+    save_stream = M_fopen(savename, "rb");
+
+    if (save_stream == NULL)
+    {
+        I_Error("Could not load savegame %s", savename);
+    }
+
+    savegame_error = false;
+
+    if (!P_ReadSaveGameHeader())
+    {
+        fclose(save_stream);
+        return;
+    }
+
+    savedleveltime = leveltime;
+    
+    // load a base level 
+    G_InitNew (gameskill, gameepisode, gamemap); 
+ 
+    leveltime = savedleveltime;
+
+    // dearchive all the modifications
+    P_UnArchivePlayers (); 
+    P_UnArchiveWorld (); 
+    P_UnArchiveThinkers (); 
+    P_UnArchiveSpecials (); 
+ 
+    if (!P_ReadSaveGameEOF())
+	I_Error ("Bad savegame");
+
+    fclose(save_stream);
+    
+    if (setsizeneeded)
+	R_ExecuteSetViewSize ();
+    
+    // draw the pattern into the back screen
+    R_FillBackScreen ();   
+} 
+ 
+
+//
+// G_SaveGame
+// Called by the menu task.
+// Description is a 24 byte text string 
+//
+void
+G_SaveGame
+( int	slot,
+  char*	description )
+{
+    savegameslot = slot;
+    M_StringCopy(savedescription, description, sizeof(savedescription));
+    sendsave = true;
+}
+
+void G_DoSaveGame (void) 
+{ 
+    char *savegame_file;
+    char *temp_savegame_file;
+    char *recovery_savegame_file;
+
+    recovery_savegame_file = NULL;
+    temp_savegame_file = P_TempSaveGameFile();
+    savegame_file = P_SaveGameFile(savegameslot);
+
+    // Open the savegame file for writing.  We write to a temporary file
+    // and then rename it at the end if it was successfully written.
+    // This prevents an existing savegame from being overwritten by
+    // a corrupted one, or if a savegame buffer overrun occurs.
+    save_stream = M_fopen(temp_savegame_file, "wb");
+
+    if (save_stream == NULL)
+    {
+        // Failed to save the game, so we're going to have to abort. But
+        // to be nice, save to somewhere else before we call I_Error().
+        recovery_savegame_file = M_TempFile("recovery.dsg");
+        save_stream = M_fopen(recovery_savegame_file, "wb");
+        if (save_stream == NULL)
+        {
+            I_Error("Failed to open either '%s' or '%s' to write savegame.",
+                    temp_savegame_file, recovery_savegame_file);
+        }
+    }
+
+    savegame_error = false;
+
+    P_WriteSaveGameHeader(savedescription);
+
+    P_ArchivePlayers ();
+    P_ArchiveWorld ();
+    P_ArchiveThinkers ();
+    P_ArchiveSpecials ();
+
+    P_WriteSaveGameEOF();
+
+    // Enforce the same savegame size limit as in Vanilla Doom,
+    // except if the vanilla_savegame_limit setting is turned off.
+
+    if (vanilla_savegame_limit && ftell(save_stream) > SAVEGAMESIZE)
+    {
+        I_Error("Savegame buffer overrun");
+    }
+
+    // Finish up, close the savegame file.
+
+    fclose(save_stream);
+
+    if (recovery_savegame_file != NULL)
+    {
+        // We failed to save to the normal location, but we wrote a
+        // recovery file to the temp directory. Now we can bomb out
+        // with an error.
+        I_Error("Failed to open savegame file '%s' for writing.\n"
+                "But your game has been saved to '%s' for recovery.",
+                temp_savegame_file, recovery_savegame_file);
+    }
+
+    // Now rename the temporary savegame file to the actual savegame
+    // file, overwriting the old savegame if there was one there.
+
+    M_remove(savegame_file);
+    M_rename(temp_savegame_file, savegame_file);
+
+    gameaction = ga_nothing;
+    M_StringCopy(savedescription, "", sizeof(savedescription));
+
+    players[consoleplayer].message = DEH_String(GGSAVED);
+
+    // draw the pattern into the back screen
+    R_FillBackScreen ();
+}
+ 
+
+//
+// G_InitNew
+// Can be called by the startup code or the menu task,
+// consoleplayer, displayplayer, playeringame[] should be set. 
+//
+skill_t	d_skill; 
+int     d_episode; 
+int     d_map; 
+ 
+void
+G_DeferedInitNew
+( skill_t	skill,
+  int		episode,
+  int		map) 
+{ 
+    d_skill = skill; 
+    d_episode = episode; 
+    d_map = map; 
+    gameaction = ga_newgame; 
+} 
+
+
+void G_DoNewGame (void) 
+{
+    demoplayback = false; 
+    netdemo = false;
+    netgame = false;
+    deathmatch = false;
+    playeringame[1] = playeringame[2] = playeringame[3] = 0;
+    respawnparm = false;
+    fastparm = false;
+    nomonsters = false;
+    consoleplayer = 0;
+    G_InitNew (d_skill, d_episode, d_map); 
+    gameaction = ga_nothing; 
+} 
+
+
+void
+G_InitNew
+( skill_t	skill,
+  int		episode,
+  int		map )
+{
+    const char *skytexturename;
+    int             i;
+
+    if (paused)
+    {
+	paused = false;
+	S_ResumeSound ();
+    }
+
+    /*
+    // Note: This commented-out block of code was added at some point
+    // between the DOS version(s) and the Doom source release. It isn't
+    // found in disassemblies of the DOS version and causes IDCLEV and
+    // the -warp command line parameter to behave differently.
+    // This is left here for posterity.
+
+    // This was quite messy with SPECIAL and commented parts.
+    // Supposedly hacks to make the latest edition work.
+    // It might not work properly.
+    if (episode < 1)
+      episode = 1;
+
+    if ( gamemode == retail )
+    {
+      if (episode > 4)
+	episode = 4;
+    }
+    else if ( gamemode == shareware )
+    {
+      if (episode > 1)
+	   episode = 1;	// only start episode 1 on shareware
+    }
+    else
+    {
+      if (episode > 3)
+	episode = 3;
+    }
+    */
+
+    if (skill > sk_nightmare)
+	skill = sk_nightmare;
+
+    if (gameversion >= exe_ultimate)
+    {
+        if (episode == 0)
+        {
+            episode = 4;
+        }
+    }
+    else
+    {
+        if (episode < 1)
+        {
+            episode = 1;
+        }
+        if (episode > 3)
+        {
+            episode = 3;
+        }
+    }
+
+    if (episode > 1 && gamemode == shareware)
+    {
+        episode = 1;
+    }
+
+    if (map < 1)
+	map = 1;
+
+    if ( (map > 9)
+	 && ( gamemode != commercial) )
+      map = 9;
+
+    M_ClearRandom ();
+
+    if (skill == sk_nightmare || respawnparm )
+	respawnmonsters = true;
+    else
+	respawnmonsters = false;
+
+    if (fastparm || (skill == sk_nightmare && gameskill != sk_nightmare) )
+    {
+	for (i=S_SARG_RUN1 ; i<=S_SARG_PAIN2 ; i++)
+	    states[i].tics >>= 1;
+	mobjinfo[MT_BRUISERSHOT].speed = 20*FRACUNIT;
+	mobjinfo[MT_HEADSHOT].speed = 20*FRACUNIT;
+	mobjinfo[MT_TROOPSHOT].speed = 20*FRACUNIT;
+    }
+    else if (skill != sk_nightmare && gameskill == sk_nightmare)
+    {
+	for (i=S_SARG_RUN1 ; i<=S_SARG_PAIN2 ; i++)
+	    states[i].tics <<= 1;
+	mobjinfo[MT_BRUISERSHOT].speed = 15*FRACUNIT;
+	mobjinfo[MT_HEADSHOT].speed = 10*FRACUNIT;
+	mobjinfo[MT_TROOPSHOT].speed = 10*FRACUNIT;
+    }
+
+    // force players to be initialized upon first level load
+    for (i=0 ; i<MAXPLAYERS ; i++)
+	players[i].playerstate = PST_REBORN;
+
+    usergame = true;                // will be set false if a demo
+    paused = false;
+    demoplayback = false;
+    automapactive = false;
+    viewactive = true;
+    gameepisode = episode;
+    gamemap = map;
+    gameskill = skill;
+
+    // Set the sky to use.
+    //
+    // Note: This IS broken, but it is how Vanilla Doom behaves.
+    // See http://doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
+    //
+    // Because we set the sky here at the start of a game, not at the
+    // start of a level, the sky texture never changes unless we
+    // restore from a saved game.  This was fixed before the Doom
+    // source release, but this IS the way Vanilla DOS Doom behaves.
+
+    if (gamemode == commercial)
+    {
+        skytexturename = DEH_String("SKY3");
+        skytexture = R_TextureNumForName(skytexturename);
+        if (gamemap < 21)
+        {
+            skytexturename = DEH_String(gamemap < 12 ? "SKY1" : "SKY2");
+            skytexture = R_TextureNumForName(skytexturename);
+        }
+    }
+    else
+    {
+        switch (gameepisode)
+        {
+          default:
+          case 1:
+            skytexturename = "SKY1";
+            break;
+          case 2:
+            skytexturename = "SKY2";
+            break;
+          case 3:
+            skytexturename = "SKY3";
+            break;
+          case 4:        // Special Edition sky
+            skytexturename = "SKY4";
+            break;
+        }
+        skytexturename = DEH_String(skytexturename);
+        skytexture = R_TextureNumForName(skytexturename);
+    }
+
+    G_DoLoadLevel ();
+}
+
+
+//
+// DEMO RECORDING 
+// 
+#define DEMOMARKER		0x80
+
+
+void G_ReadDemoTiccmd (ticcmd_t* cmd) 
+{ 
+    if (*demo_p == DEMOMARKER) 
+    {
+	// end of demo data stream 
+	G_CheckDemoStatus (); 
+	return; 
+    } 
+    cmd->forwardmove = ((signed char)*demo_p++); 
+    cmd->sidemove = ((signed char)*demo_p++); 
+
+    // If this is a longtics demo, read back in higher resolution
+
+    if (longtics)
+    {
+        cmd->angleturn = *demo_p++;
+        cmd->angleturn |= (*demo_p++) << 8;
+    }
+    else
+    {
+        cmd->angleturn = ((unsigned char) *demo_p++)<<8; 
+    }
+
+    cmd->buttons = (unsigned char)*demo_p++; 
+} 
+
+// Increase the size of the demo buffer to allow unlimited demos
+
+static void IncreaseDemoBuffer(void)
+{
+    int current_length;
+    byte *new_demobuffer;
+    byte *new_demop;
+    int new_length;
+
+    // Find the current size
+
+    current_length = demoend - demobuffer;
+    
+    // Generate a new buffer twice the size
+    new_length = current_length * 2;
+    
+    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
+    new_demop = new_demobuffer + (demo_p - demobuffer);
+
+    // Copy over the old data
+
+    memcpy(new_demobuffer, demobuffer, current_length);
+
+    // Free the old buffer and point the demo pointers at the new buffer.
+
+    Z_Free(demobuffer);
+
+    demobuffer = new_demobuffer;
+    demo_p = new_demop;
+    demoend = demobuffer + new_length;
+}
+
+void G_WriteDemoTiccmd (ticcmd_t* cmd) 
+{ 
+    byte *demo_start;
+
+    if (gamekeydown[key_demo_quit])           // press q to end demo recording 
+	G_CheckDemoStatus (); 
+
+    demo_start = demo_p;
+
+    *demo_p++ = cmd->forwardmove; 
+    *demo_p++ = cmd->sidemove; 
+
+    // If this is a longtics demo, record in higher resolution
+ 
+    if (longtics)
+    {
+        *demo_p++ = (cmd->angleturn & 0xff);
+        *demo_p++ = (cmd->angleturn >> 8) & 0xff;
+    }
+    else
+    {
+        *demo_p++ = cmd->angleturn >> 8; 
+    }
+
+    *demo_p++ = cmd->buttons; 
+
+    // reset demo pointer back
+    demo_p = demo_start;
+
+    if (demo_p > demoend - 16)
+    {
+        if (vanilla_demo_limit)
+        {
+            // no more space 
+            G_CheckDemoStatus (); 
+            return; 
+        }
+        else
+        {
+            // Vanilla demo limit disabled: unlimited
+            // demo lengths!
+
+            IncreaseDemoBuffer();
+        }
+    } 
+	
+    G_ReadDemoTiccmd (cmd);         // make SURE it is exactly the same 
+} 
+ 
+ 
+ 
+//
+// G_RecordDemo
+//
+void G_RecordDemo (const char *name)
+{
+    size_t demoname_size;
+    int i;
+    int maxsize;
+
+    usergame = false;
+    demoname_size = strlen(name) + 5;
+    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
+    M_snprintf(demoname, demoname_size, "%s.lmp", name);
+    maxsize = 0x20000;
+
+    //!
+    // @arg <size>
+    // @category demo
+    // @vanilla
+    //
+    // Specify the demo buffer size (KiB)
+    //
+
+    i = M_CheckParmWithArgs("-maxdemo", 1);
+    if (i)
+	maxsize = atoi(myargv[i+1])*1024;
+    demobuffer = Z_Malloc (maxsize,PU_STATIC,NULL); 
+    demoend = demobuffer + maxsize;
+	
+    demorecording = true; 
+} 
+
+// Get the demo version code appropriate for the version set in gameversion.
+int G_VanillaVersionCode(void)
+{
+    switch (gameversion)
+    {
+        case exe_doom_1_666:
+            return 106;
+        case exe_doom_1_7:
+            return 107;
+        case exe_doom_1_8:
+            return 108;
+        case exe_doom_1_9:
+        default:  // All other versions are variants on v1.9:
+            return 109;
+    }
+}
+
+void G_BeginRecording (void) 
+{ 
+    int             i; 
+
+    demo_p = demobuffer;
+
+    //!
+    // @category demo
+    //
+    // Record a high resolution "Doom 1.91" demo.
+    //
+
+    longtics = D_NonVanillaRecord(M_ParmExists("-longtics"),
+                                  "Doom 1.91 demo format");
+
+    // If not recording a longtics demo, record in low res
+    lowres_turn = !longtics;
+
+    if (longtics)
+    {
+        *demo_p++ = DOOM_191_VERSION;
+    }
+    else if (gameversion > exe_doom_1_2)
+    {
+        *demo_p++ = G_VanillaVersionCode();
+    }
+
+    *demo_p++ = gameskill; 
+    *demo_p++ = gameepisode; 
+    *demo_p++ = gamemap; 
+    if (longtics || gameversion > exe_doom_1_2)
+    {
+        *demo_p++ = deathmatch; 
+        *demo_p++ = respawnparm;
+        *demo_p++ = fastparm;
+        *demo_p++ = nomonsters;
+        *demo_p++ = consoleplayer;
+    }
+	 
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+	*demo_p++ = playeringame[i]; 		 
+} 
+ 
+
+//
+// G_PlayDemo 
+//
+
+static const char *defdemoname;
+ 
+void G_DeferedPlayDemo(const char *name)
+{ 
+    defdemoname = name; 
+    gameaction = ga_playdemo; 
+} 
+
+// Generate a string describing a demo version
+
+static const char *DemoVersionDescription(int version)
+{
+    static char resultbuf[16];
+
+    switch (version)
+    {
+        case 104:
+            return "v1.4";
+        case 105:
+            return "v1.5";
+        case 106:
+            return "v1.6/v1.666";
+        case 107:
+            return "v1.7/v1.7a";
+        case 108:
+            return "v1.8";
+        case 109:
+            return "v1.9";
+        case 111:
+            return "v1.91 hack demo?";
+        default:
+            break;
+    }
+
+    // Unknown version.  Perhaps this is a pre-v1.4 IWAD?  If the version
+    // byte is in the range 0-4 then it can be a v1.0-v1.2 demo.
+
+    if (version >= 0 && version <= 4)
+    {
+        return "v1.0/v1.1/v1.2";
+    }
+    else
+    {
+        M_snprintf(resultbuf, sizeof(resultbuf),
+                   "%i.%i (unknown)", version / 100, version % 100);
+        return resultbuf;
+    }
+}
+
+void G_DoPlayDemo (void)
+{
+    skill_t skill;
+    int i, lumpnum, episode, map;
+    int demoversion;
+    boolean olddemo = false;
+
+    lumpnum = W_GetNumForName(defdemoname);
+    gameaction = ga_nothing;
+    demobuffer = W_CacheLumpNum(lumpnum, PU_STATIC);
+    demo_p = demobuffer;
+
+    demoversion = *demo_p++;
+
+    if (demoversion >= 0 && demoversion <= 4)
+    {
+        olddemo = true;
+        demo_p--;
+    }
+
+    longtics = false;
+
+    // Longtics demos use the modified format that is generated by cph's
+    // hacked "v1.91" doom exe. This is a non-vanilla extension.
+    if (D_NonVanillaPlayback(demoversion == DOOM_191_VERSION, lumpnum,
+                             "Doom 1.91 demo format"))
+    {
+        longtics = true;
+    }
+    else if (demoversion != G_VanillaVersionCode() &&
+             !(gameversion <= exe_doom_1_2 && olddemo))
+    {
+        const char *message = "Demo is from a different game version!\n"
+                              "(read %i, should be %i)\n"
+                              "\n"
+                              "*** You may need to upgrade your version "
+                                  "of Doom to v1.9. ***\n"
+                              "    See: https://www.doomworld.com/classicdoom"
+                                        "/info/patches.php\n"
+                              "    This appears to be %s.";
+
+        I_Error(message, demoversion, G_VanillaVersionCode(),
+                         DemoVersionDescription(demoversion));
+    }
+
+    skill = *demo_p++; 
+    episode = *demo_p++; 
+    map = *demo_p++; 
+    if (!olddemo)
+    {
+        deathmatch = *demo_p++;
+        respawnparm = *demo_p++;
+        fastparm = *demo_p++;
+        nomonsters = *demo_p++;
+        consoleplayer = *demo_p++;
+    }
+    else
+    {
+        deathmatch = 0;
+        respawnparm = 0;
+        fastparm = 0;
+        nomonsters = 0;
+        consoleplayer = 0;
+    }
+    
+        
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+	playeringame[i] = *demo_p++; 
+
+    if (playeringame[1] || M_CheckParm("-solo-net") > 0
+                        || M_CheckParm("-netdemo") > 0)
+    {
+	netgame = true;
+	netdemo = true;
+    }
+
+    // don't spend a lot of time in loadlevel 
+    precache = false;
+    G_InitNew (skill, episode, map); 
+    precache = true; 
+    starttime = I_GetTime (); 
+
+    usergame = false; 
+    demoplayback = true; 
+} 
+
+//
+// G_TimeDemo 
+//
+void G_TimeDemo (char* name) 
+{
+    //!
+    // @category video
+    // @vanilla
+    //
+    // Disable rendering the screen entirely.
+    //
+
+    nodrawers = M_CheckParm ("-nodraw");
+
+    timingdemo = true; 
+    singletics = true; 
+
+    defdemoname = name; 
+    gameaction = ga_playdemo; 
+} 
+ 
+ 
+/* 
+=================== 
+= 
+= G_CheckDemoStatus 
+= 
+= Called after a death or level completion to allow demos to be cleaned up 
+= Returns true if a new demo loop action will take place 
+=================== 
+*/ 
+ 
+boolean G_CheckDemoStatus (void) 
+{ 
+    int             endtime; 
+	 
+    if (timingdemo) 
+    { 
+        float fps;
+        int realtics;
+
+	endtime = I_GetTime (); 
+        realtics = endtime - starttime;
+        fps = ((float) gametic * TICRATE) / realtics;
+
+        // Prevent recursive calls
+        timingdemo = false;
+        demoplayback = false;
+
+	I_Error ("timed %i gametics in %i realtics (%f fps)",
+                 gametic, realtics, fps);
+    } 
+	 
+    if (demoplayback) 
+    { 
+        W_ReleaseLumpName(defdemoname);
+	demoplayback = false; 
+	netdemo = false;
+	netgame = false;
+	deathmatch = false;
+	playeringame[1] = playeringame[2] = playeringame[3] = 0;
+	respawnparm = false;
+	fastparm = false;
+	nomonsters = false;
+	consoleplayer = 0;
+        
+        if (singledemo) 
+            I_Quit (); 
+        else 
+            D_AdvanceDemo (); 
+
+	return true; 
+    } 
+ 
+    if (demorecording) 
+    { 
+	*demo_p++ = DEMOMARKER; 
+	M_WriteFile (demoname, demobuffer, demo_p - demobuffer); 
+	Z_Free (demobuffer); 
+	demorecording = false; 
+	I_Error ("Demo %s recorded",demoname); 
+    } 
+	 
+    return false; 
+} 
+ 
+ 
+ 
diff --git a/games/NXDoom/src/doom/g_game.h b/games/NXDoom/src/doom/g_game.h
new file mode 100644
index 000000000..1e8729d18
--- /dev/null
+++ b/games/NXDoom/src/doom/g_game.h
@@ -0,0 +1,88 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Duh.
+// 
+
+
+#ifndef __G_GAME__
+#define __G_GAME__
+
+#include "doomdef.h"
+#include "d_event.h"
+#include "d_ticcmd.h"
+#include "m_fixed.h"
+
+
+//
+// GAME
+//
+void G_DeathMatchSpawnPlayer (int playernum);
+
+void G_InitNew (skill_t skill, int episode, int map);
+
+// Can be called by the startup code or M_Responder.
+// A normal game starts at map 1,
+// but a warp test can start elsewhere
+void G_DeferedInitNew (skill_t skill, int episode, int map);
+
+void G_DeferedPlayDemo (const char* demo);
+
+// Can be called by the startup code or M_Responder,
+// calls P_SetupLevel or W_EnterWorld.
+void G_LoadGame (char* name);
+
+void G_DoLoadGame (void);
+
+// Called by M_Responder.
+void G_SaveGame (int slot, char* description);
+
+// Only called by startup code.
+void G_RecordDemo (const char* name);
+
+void G_BeginRecording (void);
+
+void G_PlayDemo (char* name);
+void G_TimeDemo (char* name);
+boolean G_CheckDemoStatus (void);
+
+void G_ExitLevel (void);
+void G_SecretExitLevel (void);
+
+void G_WorldDone (void);
+
+// Read current data from inputs and build a player movement command.
+
+void G_BuildTiccmd (ticcmd_t *cmd, int maketic); 
+
+void G_Ticker (void);
+boolean G_Responder (event_t*	ev);
+
+void G_ScreenShot (void);
+
+void G_DrawMouseSpeedBox(void);
+int G_VanillaVersionCode(void);
+
+extern int vanilla_savegame_limit;
+extern int vanilla_demo_limit;
+
+extern fixed_t forwardmove[2];
+extern fixed_t sidemove[2];
+
+extern boolean sendpause;
+
+
+#endif
+
diff --git a/games/NXDoom/src/doom/hu_lib.c b/games/NXDoom/src/doom/hu_lib.c
new file mode 100644
index 000000000..d32c2004d
--- /dev/null
+++ b/games/NXDoom/src/doom/hu_lib.c
@@ -0,0 +1,347 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  heads-up text and input code
+//
+
+
+#include <ctype.h>
+
+#include "doomdef.h"
+#include "doomkeys.h"
+#include "doomstat.h"
+
+#include "v_video.h"
+#include "i_swap.h"
+
+#include "hu_lib.h"
+#include "r_local.h"
+#include "r_draw.h"
+
+// boolean : whether the screen is always erased
+#define noterased viewwindowx
+
+
+void HUlib_init(void)
+{
+}
+
+void HUlib_clearTextLine(hu_textline_t* t)
+{
+    t->len = 0;
+    t->l[0] = 0;
+    t->needsupdate = true;
+}
+
+void
+HUlib_initTextLine
+( hu_textline_t*	t,
+  int			x,
+  int			y,
+  patch_t**		f,
+  int			sc )
+{
+    t->x = x;
+    t->y = y;
+    t->f = f;
+    t->sc = sc;
+    HUlib_clearTextLine(t);
+}
+
+boolean
+HUlib_addCharToTextLine
+( hu_textline_t*	t,
+  char			ch )
+{
+
+    if (t->len == HU_MAXLINELENGTH)
+	return false;
+    else
+    {
+	t->l[t->len++] = ch;
+	t->l[t->len] = 0;
+	t->needsupdate = 4;
+	return true;
+    }
+
+}
+
+boolean HUlib_delCharFromTextLine(hu_textline_t* t)
+{
+
+    if (!t->len) return false;
+    else
+    {
+	t->l[--t->len] = 0;
+	t->needsupdate = 4;
+	return true;
+    }
+
+}
+
+void
+HUlib_drawTextLine
+( hu_textline_t*	l,
+  boolean		drawcursor )
+{
+
+    int			i;
+    int			w;
+    int			x;
+    unsigned char	c;
+
+    // draw the new stuff
+    x = l->x;
+    for (i=0;i<l->len;i++)
+    {
+	c = toupper(l->l[i]);
+	if (c != ' '
+	    && c >= l->sc
+	    && c <= '_')
+	{
+	    w = SHORT(l->f[c - l->sc]->width);
+	    if (x+w > SCREENWIDTH)
+		break;
+	    V_DrawPatchDirect(x, l->y, l->f[c - l->sc]);
+	    x += w;
+	}
+	else
+	{
+	    x += 4;
+	    if (x >= SCREENWIDTH)
+		break;
+	}
+    }
+
+    // draw the cursor if requested
+    if (drawcursor
+	&& x + SHORT(l->f['_' - l->sc]->width) <= SCREENWIDTH)
+    {
+	V_DrawPatchDirect(x, l->y, l->f['_' - l->sc]);
+    }
+}
+
+
+// sorta called by HU_Erase and just better darn get things straight
+void HUlib_eraseTextLine(hu_textline_t* l)
+{
+    int			lh;
+    int			y;
+    int			yoffset;
+
+    // Only erases when NOT in automap and the screen is reduced,
+    // and the text must either need updating or refreshing
+    // (because of a recent change back from the automap)
+
+    if (!automapactive &&
+	viewwindowx && l->needsupdate)
+    {
+	lh = SHORT(l->f[0]->height) + 1;
+	for (y=l->y,yoffset=y*SCREENWIDTH ; y<l->y+lh ; y++,yoffset+=SCREENWIDTH)
+	{
+	    if (y < viewwindowy || y >= viewwindowy + viewheight)
+		R_VideoErase(yoffset, SCREENWIDTH); // erase entire line
+	    else
+	    {
+		R_VideoErase(yoffset, viewwindowx); // erase left border
+		R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
+		// erase right border
+	    }
+	}
+    }
+
+    if (l->needsupdate) l->needsupdate--;
+
+}
+
+void
+HUlib_initSText
+( hu_stext_t*	s,
+  int		x,
+  int		y,
+  int		h,
+  patch_t**	font,
+  int		startchar,
+  boolean*	on )
+{
+
+    int i;
+
+    s->h = h;
+    s->on = on;
+    s->laston = true;
+    s->cl = 0;
+    for (i=0;i<h;i++)
+	HUlib_initTextLine(&s->l[i],
+			   x, y - i*(SHORT(font[0]->height)+1),
+			   font, startchar);
+
+}
+
+void HUlib_addLineToSText(hu_stext_t* s)
+{
+
+    int i;
+
+    // add a clear line
+    if (++s->cl == s->h)
+	s->cl = 0;
+    HUlib_clearTextLine(&s->l[s->cl]);
+
+    // everything needs updating
+    for (i=0 ; i<s->h ; i++)
+	s->l[i].needsupdate = 4;
+
+}
+
+void
+HUlib_addMessageToSText
+( hu_stext_t*	s,
+  const char*	prefix,
+  const char*	msg )
+{
+    HUlib_addLineToSText(s);
+    if (prefix)
+	while (*prefix)
+	    HUlib_addCharToTextLine(&s->l[s->cl], *(prefix++));
+
+    while (*msg)
+	HUlib_addCharToTextLine(&s->l[s->cl], *(msg++));
+}
+
+void HUlib_drawSText(hu_stext_t* s)
+{
+    int i, idx;
+    hu_textline_t *l;
+
+    if (!*s->on)
+	return; // if not on, don't draw
+
+    // draw everything
+    for (i=0 ; i<s->h ; i++)
+    {
+	idx = s->cl - i;
+	if (idx < 0)
+	    idx += s->h; // handle queue of lines
+	
+	l = &s->l[idx];
+
+	// need a decision made here on whether to skip the draw
+	HUlib_drawTextLine(l, false); // no cursor, please
+    }
+
+}
+
+void HUlib_eraseSText(hu_stext_t* s)
+{
+
+    int i;
+
+    for (i=0 ; i<s->h ; i++)
+    {
+	if (s->laston && !*s->on)
+	    s->l[i].needsupdate = 4;
+	HUlib_eraseTextLine(&s->l[i]);
+    }
+    s->laston = *s->on;
+
+}
+
+void
+HUlib_initIText
+( hu_itext_t*	it,
+  int		x,
+  int		y,
+  patch_t**	font,
+  int		startchar,
+  boolean*	on )
+{
+    it->lm = 0; // default left margin is start of text
+    it->on = on;
+    it->laston = true;
+    HUlib_initTextLine(&it->l, x, y, font, startchar);
+}
+
+
+// The following deletion routines adhere to the left margin restriction
+void HUlib_delCharFromIText(hu_itext_t* it)
+{
+    if (it->l.len != it->lm)
+	HUlib_delCharFromTextLine(&it->l);
+}
+
+void HUlib_eraseLineFromIText(hu_itext_t* it)
+{
+    while (it->lm != it->l.len)
+	HUlib_delCharFromTextLine(&it->l);
+}
+
+// Resets left margin as well
+void HUlib_resetIText(hu_itext_t* it)
+{
+    it->lm = 0;
+    HUlib_clearTextLine(&it->l);
+}
+
+void
+HUlib_addPrefixToIText
+( hu_itext_t*	it,
+  char*		str )
+{
+    while (*str)
+	HUlib_addCharToTextLine(&it->l, *(str++));
+    it->lm = it->l.len;
+}
+
+// wrapper function for handling general keyed input.
+// returns true if it ate the key
+boolean
+HUlib_keyInIText
+( hu_itext_t*	it,
+  unsigned char ch )
+{
+    ch = toupper(ch);
+
+    if (ch >= ' ' && ch <= '_') 
+  	HUlib_addCharToTextLine(&it->l, (char) ch);
+    else 
+	if (ch == KEY_BACKSPACE) 
+	    HUlib_delCharFromIText(it);
+	else 
+	    if (ch != KEY_ENTER) 
+		return false; // did not eat key
+
+    return true; // ate the key
+
+}
+
+void HUlib_drawIText(hu_itext_t* it)
+{
+
+    hu_textline_t *l = &it->l;
+
+    if (!*it->on)
+	return;
+    HUlib_drawTextLine(l, true); // draw the line w/ cursor
+
+}
+
+void HUlib_eraseIText(hu_itext_t* it)
+{
+    if (it->laston && !*it->on)
+	it->l.needsupdate = 4;
+    HUlib_eraseTextLine(&it->l);
+    it->laston = *it->on;
+}
+
diff --git a/games/NXDoom/src/doom/hu_lib.h b/games/NXDoom/src/doom/hu_lib.h
new file mode 100644
index 000000000..ca5eb8d8c
--- /dev/null
+++ b/games/NXDoom/src/doom/hu_lib.h
@@ -0,0 +1,182 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+#ifndef __HULIB__
+#define __HULIB__
+
+// We are referring to patches.
+#include "r_defs.h"
+
+// font stuff
+#define HU_CHARERASE	KEY_BACKSPACE
+
+#define HU_MAXLINES		4
+#define HU_MAXLINELENGTH	80
+
+//
+// Typedefs of widgets
+//
+
+// Text Line widget
+//  (parent of Scrolling Text and Input Text widgets)
+typedef struct
+{
+    // left-justified position of scrolling text window
+    int		x;
+    int		y;
+    
+    patch_t**	f;			// font
+    int		sc;			// start character
+    char	l[HU_MAXLINELENGTH+1];	// line of text
+    int		len;		      	// current line length
+
+    // whether this line needs to be udpated
+    int		needsupdate;	      
+
+} hu_textline_t;
+
+
+
+// Scrolling Text window widget
+//  (child of Text Line widget)
+typedef struct
+{
+    hu_textline_t	l[HU_MAXLINES];	// text lines to draw
+    int			h;		// height in lines
+    int			cl;		// current line number
+
+    // pointer to boolean stating whether to update window
+    boolean*		on;
+    boolean		laston;		// last value of *->on.
+
+} hu_stext_t;
+
+
+
+// Input Text Line widget
+//  (child of Text Line widget)
+typedef struct
+{
+    hu_textline_t	l;		// text line to input on
+
+     // left margin past which I am not to delete characters
+    int			lm;
+
+    // pointer to boolean stating whether to update window
+    boolean*		on; 
+    boolean		laston; // last value of *->on;
+
+} hu_itext_t;
+
+
+//
+// Widget creation, access, and update routines
+//
+
+// initializes heads-up widget library
+void HUlib_init(void);
+
+//
+// textline code
+//
+
+// clear a line of text
+void	HUlib_clearTextLine(hu_textline_t *t);
+
+void	HUlib_initTextLine(hu_textline_t *t, int x, int y, patch_t **f, int sc);
+
+// returns success
+boolean HUlib_addCharToTextLine(hu_textline_t *t, char ch);
+
+// returns success
+boolean HUlib_delCharFromTextLine(hu_textline_t *t);
+
+// draws tline
+void	HUlib_drawTextLine(hu_textline_t *l, boolean drawcursor);
+
+// erases text line
+void	HUlib_eraseTextLine(hu_textline_t *l); 
+
+
+//
+// Scrolling Text window widget routines
+//
+
+// ?
+void
+HUlib_initSText
+( hu_stext_t*	s,
+  int		x,
+  int		y,
+  int		h,
+  patch_t**	font,
+  int		startchar,
+  boolean*	on );
+
+// add a new line
+void HUlib_addLineToSText(hu_stext_t* s);  
+
+// ?
+void
+HUlib_addMessageToSText
+( hu_stext_t*	s,
+  const char*	prefix,
+  const char*	msg );
+
+// draws stext
+void HUlib_drawSText(hu_stext_t* s);
+
+// erases all stext lines
+void HUlib_eraseSText(hu_stext_t* s); 
+
+// Input Text Line widget routines
+void
+HUlib_initIText
+( hu_itext_t*	it,
+  int		x,
+  int		y,
+  patch_t**	font,
+  int		startchar,
+  boolean*	on );
+
+// enforces left margin
+void HUlib_delCharFromIText(hu_itext_t* it);
+
+// enforces left margin
+void HUlib_eraseLineFromIText(hu_itext_t* it);
+
+// resets line and left margin
+void HUlib_resetIText(hu_itext_t* it);
+
+// left of left-margin
+void
+HUlib_addPrefixToIText
+( hu_itext_t*	it,
+  char*		str );
+
+// whether eaten
+boolean
+HUlib_keyInIText
+( hu_itext_t*	it,
+  unsigned char ch );
+
+void HUlib_drawIText(hu_itext_t* it);
+
+// erases all itext lines
+void HUlib_eraseIText(hu_itext_t* it); 
+
+#endif
diff --git a/games/NXDoom/src/doom/hu_stuff.c b/games/NXDoom/src/doom/hu_stuff.c
new file mode 100644
index 000000000..bb2002964
--- /dev/null
+++ b/games/NXDoom/src/doom/hu_stuff.c
@@ -0,0 +1,707 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  Heads-up displays
+//
+
+
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "doomkeys.h"
+
+#include "z_zone.h"
+
+#include "deh_main.h"
+#include "i_input.h"
+#include "i_swap.h"
+#include "i_video.h"
+
+#include "hu_stuff.h"
+#include "hu_lib.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "w_wad.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+//
+// Locally used constants, shortcuts.
+//
+#define HU_TITLE	(mapnames[(gameepisode-1)*9+gamemap-1])
+#define HU_TITLE2	(mapnames_commercial[gamemap-1])
+#define HU_TITLEP	(mapnames_commercial[gamemap-1 + 32])
+#define HU_TITLET	(mapnames_commercial[gamemap-1 + 64])
+#define HU_TITLE_CHEX   (mapnames_chex[(gameepisode-1)*9+gamemap-1])
+#define HU_TITLEHEIGHT	1
+#define HU_TITLEX	0
+#define HU_TITLEY	(167 - SHORT(hu_font[0]->height))
+
+#define HU_INPUTTOGGLE	't'
+#define HU_INPUTX	HU_MSGX
+#define HU_INPUTY	(HU_MSGY + HU_MSGHEIGHT*(SHORT(hu_font[0]->height) +1))
+#define HU_INPUTWIDTH	64
+#define HU_INPUTHEIGHT	1
+
+
+
+char *chat_macros[10];
+
+const char *player_names[] =
+{
+    HUSTR_PLRGREEN,
+    HUSTR_PLRINDIGO,
+    HUSTR_PLRBROWN,
+    HUSTR_PLRRED
+};
+
+char			chat_char; // remove later.
+static player_t*	plr;
+patch_t*		hu_font[HU_FONTSIZE];
+static hu_textline_t	w_title;
+boolean			chat_on;
+static hu_itext_t	w_chat;
+static boolean		always_off = false;
+static char		chat_dest[MAXPLAYERS];
+static hu_itext_t w_inputbuffer[MAXPLAYERS];
+
+static boolean		message_on;
+boolean			message_dontfuckwithme;
+static boolean		message_nottobefuckedwith;
+
+static hu_stext_t	w_message;
+static int		message_counter;
+
+
+static boolean		headsupactive = false;
+
+//
+// Builtin map names.
+// The actual names can be found in DStrings.h.
+//
+
+const char *mapnames[] =	// DOOM shareware/registered/retail (Ultimate) names.
+{
+
+    HUSTR_E1M1,
+    HUSTR_E1M2,
+    HUSTR_E1M3,
+    HUSTR_E1M4,
+    HUSTR_E1M5,
+    HUSTR_E1M6,
+    HUSTR_E1M7,
+    HUSTR_E1M8,
+    HUSTR_E1M9,
+
+    HUSTR_E2M1,
+    HUSTR_E2M2,
+    HUSTR_E2M3,
+    HUSTR_E2M4,
+    HUSTR_E2M5,
+    HUSTR_E2M6,
+    HUSTR_E2M7,
+    HUSTR_E2M8,
+    HUSTR_E2M9,
+
+    HUSTR_E3M1,
+    HUSTR_E3M2,
+    HUSTR_E3M3,
+    HUSTR_E3M4,
+    HUSTR_E3M5,
+    HUSTR_E3M6,
+    HUSTR_E3M7,
+    HUSTR_E3M8,
+    HUSTR_E3M9,
+
+    HUSTR_E4M1,
+    HUSTR_E4M2,
+    HUSTR_E4M3,
+    HUSTR_E4M4,
+    HUSTR_E4M5,
+    HUSTR_E4M6,
+    HUSTR_E4M7,
+    HUSTR_E4M8,
+    HUSTR_E4M9,
+
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL"
+};
+
+const char *mapnames_chex[] =   // Chex Quest names.
+{
+
+    HUSTR_E1M1,
+    HUSTR_E1M2,
+    HUSTR_E1M3,
+    HUSTR_E1M4,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+    HUSTR_E1M5,
+
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL",
+    "NEWLEVEL"
+};
+
+// List of names for levels in commercial IWADs
+// (doom2.wad, plutonia.wad, tnt.wad).  These are stored in a
+// single large array; WADs like pl2.wad have a MAP33, and rely on
+// the layout in the Vanilla executable, where it is possible to
+// overflow the end of one array into the next.
+
+const char *mapnames_commercial[] =
+{
+    // DOOM 2 map names.
+
+    HUSTR_1,
+    HUSTR_2,
+    HUSTR_3,
+    HUSTR_4,
+    HUSTR_5,
+    HUSTR_6,
+    HUSTR_7,
+    HUSTR_8,
+    HUSTR_9,
+    HUSTR_10,
+    HUSTR_11,
+	
+    HUSTR_12,
+    HUSTR_13,
+    HUSTR_14,
+    HUSTR_15,
+    HUSTR_16,
+    HUSTR_17,
+    HUSTR_18,
+    HUSTR_19,
+    HUSTR_20,
+	
+    HUSTR_21,
+    HUSTR_22,
+    HUSTR_23,
+    HUSTR_24,
+    HUSTR_25,
+    HUSTR_26,
+    HUSTR_27,
+    HUSTR_28,
+    HUSTR_29,
+    HUSTR_30,
+    HUSTR_31,
+    HUSTR_32,
+
+    // Plutonia WAD map names.
+
+    PHUSTR_1,
+    PHUSTR_2,
+    PHUSTR_3,
+    PHUSTR_4,
+    PHUSTR_5,
+    PHUSTR_6,
+    PHUSTR_7,
+    PHUSTR_8,
+    PHUSTR_9,
+    PHUSTR_10,
+    PHUSTR_11,
+	
+    PHUSTR_12,
+    PHUSTR_13,
+    PHUSTR_14,
+    PHUSTR_15,
+    PHUSTR_16,
+    PHUSTR_17,
+    PHUSTR_18,
+    PHUSTR_19,
+    PHUSTR_20,
+	
+    PHUSTR_21,
+    PHUSTR_22,
+    PHUSTR_23,
+    PHUSTR_24,
+    PHUSTR_25,
+    PHUSTR_26,
+    PHUSTR_27,
+    PHUSTR_28,
+    PHUSTR_29,
+    PHUSTR_30,
+    PHUSTR_31,
+    PHUSTR_32,
+    
+    // TNT WAD map names.
+
+    THUSTR_1,
+    THUSTR_2,
+    THUSTR_3,
+    THUSTR_4,
+    THUSTR_5,
+    THUSTR_6,
+    THUSTR_7,
+    THUSTR_8,
+    THUSTR_9,
+    THUSTR_10,
+    THUSTR_11,
+	
+    THUSTR_12,
+    THUSTR_13,
+    THUSTR_14,
+    THUSTR_15,
+    THUSTR_16,
+    THUSTR_17,
+    THUSTR_18,
+    THUSTR_19,
+    THUSTR_20,
+	
+    THUSTR_21,
+    THUSTR_22,
+    THUSTR_23,
+    THUSTR_24,
+    THUSTR_25,
+    THUSTR_26,
+    THUSTR_27,
+    THUSTR_28,
+    THUSTR_29,
+    THUSTR_30,
+    THUSTR_31,
+    THUSTR_32,
+
+    // Emulation: TNT maps 33-35 can be warped to and played if they exist
+    // so include blank names instead of spilling over
+    "",
+    "",
+    ""
+};
+
+void HU_Init(void)
+{
+
+    int		i;
+    int		j;
+    char	buffer[9];
+
+    // load the heads-up font
+    j = HU_FONTSTART;
+    for (i=0;i<HU_FONTSIZE;i++)
+    {
+	DEH_snprintf(buffer, 9, "STCFN%.3d", j++);
+	hu_font[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
+    }
+
+}
+
+void HU_Stop(void)
+{
+    headsupactive = false;
+}
+
+void HU_Start(void)
+{
+
+    int		i;
+    const char *s;
+
+    if (headsupactive)
+	HU_Stop();
+
+    plr = &players[consoleplayer];
+    message_on = false;
+    message_dontfuckwithme = false;
+    message_nottobefuckedwith = false;
+    chat_on = false;
+
+    // create the message widget
+    HUlib_initSText(&w_message,
+		    HU_MSGX, HU_MSGY, HU_MSGHEIGHT,
+		    hu_font,
+		    HU_FONTSTART, &message_on);
+
+    // create the map title widget
+    HUlib_initTextLine(&w_title,
+		       HU_TITLEX, HU_TITLEY,
+		       hu_font,
+		       HU_FONTSTART);
+    
+    switch ( logical_gamemission )
+    {
+      case doom:
+	s = HU_TITLE;
+	break;
+      case doom2:
+	 s = HU_TITLE2;
+         // Pre-Final Doom compatibility: map33-map35 names don't spill over
+         if (gameversion <= exe_doom_1_9 && gamemap >= 33)
+         {
+             s = "";
+         }
+	 break;
+      case pack_plut:
+	s = HU_TITLEP;
+	break;
+      case pack_tnt:
+	s = HU_TITLET;
+	break;
+      default:
+         s = "Unknown level";
+         break;
+    }
+
+    if (logical_gamemission == doom && gameversion == exe_chex)
+    {
+        s = HU_TITLE_CHEX;
+    }
+
+    // dehacked substitution to get modified level name
+
+    s = DEH_String(s);
+    
+    while (*s)
+	HUlib_addCharToTextLine(&w_title, *(s++));
+
+    // create the chat widget
+    HUlib_initIText(&w_chat,
+		    HU_INPUTX, HU_INPUTY,
+		    hu_font,
+		    HU_FONTSTART, &chat_on);
+
+    // create the inputbuffer widgets
+    for (i=0 ; i<MAXPLAYERS ; i++)
+	HUlib_initIText(&w_inputbuffer[i], 0, 0, 0, 0, &always_off);
+
+    headsupactive = true;
+
+}
+
+void HU_Drawer(void)
+{
+
+    HUlib_drawSText(&w_message);
+    HUlib_drawIText(&w_chat);
+    if (automapactive)
+	HUlib_drawTextLine(&w_title, false);
+
+}
+
+void HU_Erase(void)
+{
+
+    HUlib_eraseSText(&w_message);
+    HUlib_eraseIText(&w_chat);
+    HUlib_eraseTextLine(&w_title);
+
+}
+
+void HU_Ticker(void)
+{
+
+    int i, rc;
+    char c;
+
+    // tick down message counter if message is up
+    if (message_counter && !--message_counter)
+    {
+	message_on = false;
+	message_nottobefuckedwith = false;
+    }
+
+    if (showMessages || message_dontfuckwithme)
+    {
+
+	// display message if necessary
+	if ((plr->message && !message_nottobefuckedwith)
+	    || (plr->message && message_dontfuckwithme))
+	{
+	    HUlib_addMessageToSText(&w_message, 0, plr->message);
+	    plr->message = 0;
+	    message_on = true;
+	    message_counter = HU_MSGTIMEOUT;
+	    message_nottobefuckedwith = message_dontfuckwithme;
+	    message_dontfuckwithme = 0;
+	}
+
+    } // else message_on = false;
+
+    // check for incoming chat characters
+    if (netgame)
+    {
+	for (i=0 ; i<MAXPLAYERS; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+	    if (i != consoleplayer
+		&& (c = players[i].cmd.chatchar))
+	    {
+		if (c <= HU_BROADCAST)
+		    chat_dest[i] = c;
+		else
+		{
+		    rc = HUlib_keyInIText(&w_inputbuffer[i], c);
+		    if (rc && c == KEY_ENTER)
+		    {
+			if (w_inputbuffer[i].l.len
+			    && (chat_dest[i] == consoleplayer+1
+				|| chat_dest[i] == HU_BROADCAST))
+			{
+			    HUlib_addMessageToSText(&w_message,
+						    DEH_String(player_names[i]),
+						    w_inputbuffer[i].l.l);
+			    
+			    message_nottobefuckedwith = true;
+			    message_on = true;
+			    message_counter = HU_MSGTIMEOUT;
+			    if ( gamemode == commercial )
+			      S_StartSound(0, sfx_radio);
+			    else if (gameversion > exe_doom_1_2)
+			      S_StartSound(0, sfx_tink);
+			}
+			HUlib_resetIText(&w_inputbuffer[i]);
+		    }
+		}
+		players[i].cmd.chatchar = 0;
+	    }
+	}
+    }
+
+}
+
+#define QUEUESIZE		128
+
+static char	chatchars[QUEUESIZE];
+static int	head = 0;
+static int	tail = 0;
+
+
+void HU_queueChatChar(char c)
+{
+    if (((head + 1) & (QUEUESIZE-1)) == tail)
+    {
+	plr->message = DEH_String(HUSTR_MSGU);
+    }
+    else
+    {
+	chatchars[head] = c;
+	head = (head + 1) & (QUEUESIZE-1);
+    }
+}
+
+char HU_dequeueChatChar(void)
+{
+    char c;
+
+    if (head != tail)
+    {
+	c = chatchars[tail];
+	tail = (tail + 1) & (QUEUESIZE-1);
+    }
+    else
+    {
+	c = 0;
+    }
+
+    return c;
+}
+
+static void StartChatInput(int dest)
+{
+    chat_on = true;
+    HUlib_resetIText(&w_chat);
+    HU_queueChatChar(HU_BROADCAST);
+
+    I_StartTextInput(0, 8, SCREENWIDTH, 16);
+}
+
+static void StopChatInput(void)
+{
+    chat_on = false;
+    I_StopTextInput();
+}
+
+boolean HU_Responder(event_t *ev)
+{
+
+    static char		lastmessage[HU_MAXLINELENGTH+1];
+    const char		*macromessage;
+    boolean		eatkey = false;
+    static boolean	altdown = false;
+    unsigned char 	c;
+    int			i;
+    int			numplayers;
+    
+    static int		num_nobrainers = 0;
+
+    numplayers = 0;
+    for (i=0 ; i<MAXPLAYERS ; i++)
+	numplayers += playeringame[i];
+
+    if (ev->data1 == KEY_RSHIFT)
+    {
+	return false;
+    }
+    else if (ev->data1 == KEY_RALT || ev->data1 == KEY_LALT)
+    {
+	altdown = ev->type == ev_keydown;
+	return false;
+    }
+
+    if (ev->type != ev_keydown)
+	return false;
+
+    if (!chat_on)
+    {
+	if (ev->data1 == key_message_refresh)
+	{
+	    message_on = true;
+	    message_counter = HU_MSGTIMEOUT;
+	    eatkey = true;
+	}
+	else if (netgame && ev->data2 == key_multi_msg)
+	{
+	    eatkey = true;
+            StartChatInput(HU_BROADCAST);
+	}
+	else if (netgame && numplayers > 2)
+	{
+	    for (i=0; i<MAXPLAYERS ; i++)
+	    {
+		if (ev->data2 == key_multi_msgplayer[i])
+		{
+		    if (playeringame[i] && i!=consoleplayer)
+		    {
+			eatkey = true;
+                        StartChatInput(i + 1);
+			break;
+		    }
+		    else if (i == consoleplayer)
+		    {
+			num_nobrainers++;
+			if (num_nobrainers < 3)
+			    plr->message = DEH_String(HUSTR_TALKTOSELF1);
+			else if (num_nobrainers < 6)
+			    plr->message = DEH_String(HUSTR_TALKTOSELF2);
+			else if (num_nobrainers < 9)
+			    plr->message = DEH_String(HUSTR_TALKTOSELF3);
+			else if (num_nobrainers < 32)
+			    plr->message = DEH_String(HUSTR_TALKTOSELF4);
+			else
+			    plr->message = DEH_String(HUSTR_TALKTOSELF5);
+		    }
+		}
+	    }
+	}
+    }
+    else
+    {
+	// send a macro
+	if (altdown)
+	{
+	    c = ev->data1 - '0';
+	    if (c > 9)
+		return false;
+	    // fprintf(stderr, "got here\n");
+	    macromessage = chat_macros[c];
+
+	    // kill last message with a '\n'
+	    HU_queueChatChar(KEY_ENTER); // DEBUG!!!
+
+	    // send the macro message
+	    while (*macromessage)
+		HU_queueChatChar(*macromessage++);
+	    HU_queueChatChar(KEY_ENTER);
+
+            // leave chat mode and notify that it was sent
+            StopChatInput();
+            M_StringCopy(lastmessage, chat_macros[c], sizeof(lastmessage));
+            plr->message = lastmessage;
+            eatkey = true;
+	}
+	else
+	{
+            c = ev->data3;
+
+	    eatkey = HUlib_keyInIText(&w_chat, c);
+	    if (eatkey)
+	    {
+		// static unsigned char buf[20]; // DEBUG
+		HU_queueChatChar(c);
+
+		// M_snprintf(buf, sizeof(buf), "KEY: %d => %d", ev->data1, c);
+		//        plr->message = buf;
+	    }
+	    if (c == KEY_ENTER)
+	    {
+		StopChatInput();
+                if (w_chat.l.len)
+                {
+                    M_StringCopy(lastmessage, w_chat.l.l, sizeof(lastmessage));
+                    plr->message = lastmessage;
+                }
+	    }
+	    else if (c == KEY_ESCAPE)
+	    {
+                StopChatInput();
+            }
+	}
+    }
+
+    return eatkey;
+}
diff --git a/games/NXDoom/src/doom/hu_stuff.h b/games/NXDoom/src/doom/hu_stuff.h
new file mode 100644
index 000000000..c5757af67
--- /dev/null
+++ b/games/NXDoom/src/doom/hu_stuff.h
@@ -0,0 +1,68 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  Head up display
+//
+
+#ifndef __HU_STUFF_H__
+#define __HU_STUFF_H__
+
+#include "d_event.h"
+#include "v_patch.h"
+
+
+//
+// Globally visible constants.
+//
+#define HU_FONTSTART	'!'	// the first font characters
+#define HU_FONTEND	'_'	// the last font characters
+
+// Calculate # of glyphs in font.
+#define HU_FONTSIZE	(HU_FONTEND - HU_FONTSTART + 1)	
+
+#define HU_BROADCAST	5
+
+#define HU_MSGX		0
+#define HU_MSGY		0
+#define HU_MSGWIDTH	64	// in characters
+#define HU_MSGHEIGHT	1	// in lines
+
+#define HU_MSGTIMEOUT	(4*TICRATE)
+
+//
+// HEADS UP TEXT
+//
+
+void HU_Init(void);
+void HU_Start(void);
+
+boolean HU_Responder(event_t* ev);
+
+void HU_Ticker(void);
+void HU_Drawer(void);
+char HU_dequeueChatChar(void);
+void HU_Erase(void);
+
+extern const char *player_names[4];
+extern char *chat_macros[10];
+
+extern patch_t *hu_font[HU_FONTSIZE];
+
+extern boolean message_dontfuckwithme;
+
+extern boolean chat_on;
+
+
+#endif
+
diff --git a/games/NXDoom/src/doom/info.c b/games/NXDoom/src/doom/info.c
new file mode 100644
index 000000000..11ea1abf7
--- /dev/null
+++ b/games/NXDoom/src/doom/info.c
@@ -0,0 +1,4662 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Thing frame/state LUT,
+//	generated by multigen utilitiy.
+//	This one is the original DOOM version, preserved.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+// Data.
+#include "sounds.h"
+#include "m_fixed.h"
+
+#include "info.h"
+
+#include "p_mobj.h"
+
+const char *sprnames[] = {
+    "TROO","SHTG","PUNG","PISG","PISF","SHTF","SHT2","CHGG","CHGF","MISG",
+    "MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2",
+    "PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY","POSS",
+    "SPOS","VILE","FIRE","FATB","FBXP","SKEL","MANF","FATT","CPOS","SARG",
+    "HEAD","BAL7","BOSS","BOS2","SKUL","SPID","BSPI","APLS","APBX","CYBR",
+    "PAIN","SSWV","KEEN","BBRN","BOSF","ARM1","ARM2","BAR1","BEXP","FCAN",
+    "BON1","BON2","BKEY","RKEY","YKEY","BSKU","RSKU","YSKU","STIM","MEDI",
+    "SOUL","PINV","PSTR","PINS","MEGA","SUIT","PMAP","PVIS","CLIP","AMMO",
+    "ROCK","BROK","CELL","CELP","SHEL","SBOX","BPAK","BFUG","MGUN","CSAW",
+    "LAUN","PLAS","SHOT","SGN2","COLU","SMT2","GOR1","POL2","POL5","POL4",
+    "POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2",
+    "COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU",
+    "COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2","HDB3",
+    "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2", NULL
+};
+
+
+// Doesn't work with g++, needs actionf_p1
+void  A_Light0();
+void A_WeaponReady();
+void A_Lower();
+void A_Raise();
+void A_Punch();
+void A_ReFire();
+void A_FirePistol();
+void A_Light1();
+void A_FireShotgun();
+void A_Light2();
+void A_FireShotgun2();
+void A_CheckReload();
+void A_OpenShotgun2();
+void A_LoadShotgun2();
+void A_CloseShotgun2();
+void A_FireCGun();
+void A_GunFlash();
+void A_FireMissile();
+void A_Saw();
+void A_FirePlasma();
+void A_BFGsound();
+void A_FireBFG();
+void A_BFGSpray();
+void A_Explode();
+void A_Pain();
+void A_PlayerScream();
+void A_Fall();
+void A_XScream();
+void A_Look();
+void A_Chase();
+void A_FaceTarget();
+void A_PosAttack();
+void A_Scream();
+void A_SPosAttack();
+void A_VileChase();
+void A_VileStart();
+void A_VileTarget();
+void A_VileAttack();
+void A_StartFire();
+void A_Fire();
+void A_FireCrackle();
+void A_Tracer();
+void A_SkelWhoosh();
+void A_SkelFist();
+void A_SkelMissile();
+void A_FatRaise();
+void A_FatAttack1();
+void A_FatAttack2();
+void A_FatAttack3();
+void A_BossDeath();
+void A_CPosAttack();
+void A_CPosRefire();
+void A_TroopAttack();
+void A_SargAttack();
+void A_HeadAttack();
+void A_BruisAttack();
+void A_SkullAttack();
+void A_Metal();
+void A_SpidRefire();
+void A_BabyMetal();
+void A_BspiAttack();
+void A_Hoof();
+void A_CyberAttack();
+void A_PainAttack();
+void A_PainDie();
+void A_KeenDie();
+void A_BrainPain();
+void A_BrainScream();
+void A_BrainDie();
+void A_BrainAwake();
+void A_BrainSpit();
+void A_SpawnSound();
+void A_SpawnFly();
+void A_BrainExplode();
+
+
+state_t	states[NUMSTATES] = {
+    {SPR_TROO,0,-1,{NULL},S_NULL,0,0},	// S_NULL
+    {SPR_SHTG,4,0,{A_Light0},S_NULL,0,0},	// S_LIGHTDONE
+    {SPR_PUNG,0,1,{A_WeaponReady},S_PUNCH,0,0},	// S_PUNCH
+    {SPR_PUNG,0,1,{A_Lower},S_PUNCHDOWN,0,0},	// S_PUNCHDOWN
+    {SPR_PUNG,0,1,{A_Raise},S_PUNCHUP,0,0},	// S_PUNCHUP
+    {SPR_PUNG,1,4,{NULL},S_PUNCH2,0,0},		// S_PUNCH1
+    {SPR_PUNG,2,4,{A_Punch},S_PUNCH3,0,0},	// S_PUNCH2
+    {SPR_PUNG,3,5,{NULL},S_PUNCH4,0,0},		// S_PUNCH3
+    {SPR_PUNG,2,4,{NULL},S_PUNCH5,0,0},		// S_PUNCH4
+    {SPR_PUNG,1,5,{A_ReFire},S_PUNCH,0,0},	// S_PUNCH5
+    {SPR_PISG,0,1,{A_WeaponReady},S_PISTOL,0,0},// S_PISTOL
+    {SPR_PISG,0,1,{A_Lower},S_PISTOLDOWN,0,0},	// S_PISTOLDOWN
+    {SPR_PISG,0,1,{A_Raise},S_PISTOLUP,0,0},	// S_PISTOLUP
+    {SPR_PISG,0,4,{NULL},S_PISTOL2,0,0},	// S_PISTOL1
+    {SPR_PISG,1,6,{A_FirePistol},S_PISTOL3,0,0},// S_PISTOL2
+    {SPR_PISG,2,4,{NULL},S_PISTOL4,0,0},	// S_PISTOL3
+    {SPR_PISG,1,5,{A_ReFire},S_PISTOL,0,0},	// S_PISTOL4
+    {SPR_PISF,32768,7,{A_Light1},S_LIGHTDONE,0,0},	// S_PISTOLFLASH
+    {SPR_SHTG,0,1,{A_WeaponReady},S_SGUN,0,0},	// S_SGUN
+    {SPR_SHTG,0,1,{A_Lower},S_SGUNDOWN,0,0},	// S_SGUNDOWN
+    {SPR_SHTG,0,1,{A_Raise},S_SGUNUP,0,0},	// S_SGUNUP
+    {SPR_SHTG,0,3,{NULL},S_SGUN2,0,0},	// S_SGUN1
+    {SPR_SHTG,0,7,{A_FireShotgun},S_SGUN3,0,0},	// S_SGUN2
+    {SPR_SHTG,1,5,{NULL},S_SGUN4,0,0},	// S_SGUN3
+    {SPR_SHTG,2,5,{NULL},S_SGUN5,0,0},	// S_SGUN4
+    {SPR_SHTG,3,4,{NULL},S_SGUN6,0,0},	// S_SGUN5
+    {SPR_SHTG,2,5,{NULL},S_SGUN7,0,0},	// S_SGUN6
+    {SPR_SHTG,1,5,{NULL},S_SGUN8,0,0},	// S_SGUN7
+    {SPR_SHTG,0,3,{NULL},S_SGUN9,0,0},	// S_SGUN8
+    {SPR_SHTG,0,7,{A_ReFire},S_SGUN,0,0},	// S_SGUN9
+    {SPR_SHTF,32768,4,{A_Light1},S_SGUNFLASH2,0,0},	// S_SGUNFLASH1
+    {SPR_SHTF,32769,3,{A_Light2},S_LIGHTDONE,0,0},	// S_SGUNFLASH2
+    {SPR_SHT2,0,1,{A_WeaponReady},S_DSGUN,0,0},	// S_DSGUN
+    {SPR_SHT2,0,1,{A_Lower},S_DSGUNDOWN,0,0},	// S_DSGUNDOWN
+    {SPR_SHT2,0,1,{A_Raise},S_DSGUNUP,0,0},	// S_DSGUNUP
+    {SPR_SHT2,0,3,{NULL},S_DSGUN2,0,0},	// S_DSGUN1
+    {SPR_SHT2,0,7,{A_FireShotgun2},S_DSGUN3,0,0},	// S_DSGUN2
+    {SPR_SHT2,1,7,{NULL},S_DSGUN4,0,0},	// S_DSGUN3
+    {SPR_SHT2,2,7,{A_CheckReload},S_DSGUN5,0,0},	// S_DSGUN4
+    {SPR_SHT2,3,7,{A_OpenShotgun2},S_DSGUN6,0,0},	// S_DSGUN5
+    {SPR_SHT2,4,7,{NULL},S_DSGUN7,0,0},	// S_DSGUN6
+    {SPR_SHT2,5,7,{A_LoadShotgun2},S_DSGUN8,0,0},	// S_DSGUN7
+    {SPR_SHT2,6,6,{NULL},S_DSGUN9,0,0},	// S_DSGUN8
+    {SPR_SHT2,7,6,{A_CloseShotgun2},S_DSGUN10,0,0},	// S_DSGUN9
+    {SPR_SHT2,0,5,{A_ReFire},S_DSGUN,0,0},	// S_DSGUN10
+    {SPR_SHT2,1,7,{NULL},S_DSNR2,0,0},	// S_DSNR1
+    {SPR_SHT2,0,3,{NULL},S_DSGUNDOWN,0,0},	// S_DSNR2
+    {SPR_SHT2,32776,5,{A_Light1},S_DSGUNFLASH2,0,0},	// S_DSGUNFLASH1
+    {SPR_SHT2,32777,4,{A_Light2},S_LIGHTDONE,0,0},	// S_DSGUNFLASH2
+    {SPR_CHGG,0,1,{A_WeaponReady},S_CHAIN,0,0},	// S_CHAIN
+    {SPR_CHGG,0,1,{A_Lower},S_CHAINDOWN,0,0},	// S_CHAINDOWN
+    {SPR_CHGG,0,1,{A_Raise},S_CHAINUP,0,0},	// S_CHAINUP
+    {SPR_CHGG,0,4,{A_FireCGun},S_CHAIN2,0,0},	// S_CHAIN1
+    {SPR_CHGG,1,4,{A_FireCGun},S_CHAIN3,0,0},	// S_CHAIN2
+    {SPR_CHGG,1,0,{A_ReFire},S_CHAIN,0,0},	// S_CHAIN3
+    {SPR_CHGF,32768,5,{A_Light1},S_LIGHTDONE,0,0},	// S_CHAINFLASH1
+    {SPR_CHGF,32769,5,{A_Light2},S_LIGHTDONE,0,0},	// S_CHAINFLASH2
+    {SPR_MISG,0,1,{A_WeaponReady},S_MISSILE,0,0},	// S_MISSILE
+    {SPR_MISG,0,1,{A_Lower},S_MISSILEDOWN,0,0},	// S_MISSILEDOWN
+    {SPR_MISG,0,1,{A_Raise},S_MISSILEUP,0,0},	// S_MISSILEUP
+    {SPR_MISG,1,8,{A_GunFlash},S_MISSILE2,0,0},	// S_MISSILE1
+    {SPR_MISG,1,12,{A_FireMissile},S_MISSILE3,0,0},	// S_MISSILE2
+    {SPR_MISG,1,0,{A_ReFire},S_MISSILE,0,0},	// S_MISSILE3
+    {SPR_MISF,32768,3,{A_Light1},S_MISSILEFLASH2,0,0},	// S_MISSILEFLASH1
+    {SPR_MISF,32769,4,{NULL},S_MISSILEFLASH3,0,0},	// S_MISSILEFLASH2
+    {SPR_MISF,32770,4,{A_Light2},S_MISSILEFLASH4,0,0},	// S_MISSILEFLASH3
+    {SPR_MISF,32771,4,{A_Light2},S_LIGHTDONE,0,0},	// S_MISSILEFLASH4
+    {SPR_SAWG,2,4,{A_WeaponReady},S_SAWB,0,0},	// S_SAW
+    {SPR_SAWG,3,4,{A_WeaponReady},S_SAW,0,0},	// S_SAWB
+    {SPR_SAWG,2,1,{A_Lower},S_SAWDOWN,0,0},	// S_SAWDOWN
+    {SPR_SAWG,2,1,{A_Raise},S_SAWUP,0,0},	// S_SAWUP
+    {SPR_SAWG,0,4,{A_Saw},S_SAW2,0,0},	// S_SAW1
+    {SPR_SAWG,1,4,{A_Saw},S_SAW3,0,0},	// S_SAW2
+    {SPR_SAWG,1,0,{A_ReFire},S_SAW,0,0},	// S_SAW3
+    {SPR_PLSG,0,1,{A_WeaponReady},S_PLASMA,0,0},	// S_PLASMA
+    {SPR_PLSG,0,1,{A_Lower},S_PLASMADOWN,0,0},	// S_PLASMADOWN
+    {SPR_PLSG,0,1,{A_Raise},S_PLASMAUP,0,0},	// S_PLASMAUP
+    {SPR_PLSG,0,3,{A_FirePlasma},S_PLASMA2,0,0},	// S_PLASMA1
+    {SPR_PLSG,1,20,{A_ReFire},S_PLASMA,0,0},	// S_PLASMA2
+    {SPR_PLSF,32768,4,{A_Light1},S_LIGHTDONE,0,0},	// S_PLASMAFLASH1
+    {SPR_PLSF,32769,4,{A_Light1},S_LIGHTDONE,0,0},	// S_PLASMAFLASH2
+    {SPR_BFGG,0,1,{A_WeaponReady},S_BFG,0,0},	// S_BFG
+    {SPR_BFGG,0,1,{A_Lower},S_BFGDOWN,0,0},	// S_BFGDOWN
+    {SPR_BFGG,0,1,{A_Raise},S_BFGUP,0,0},	// S_BFGUP
+    {SPR_BFGG,0,20,{A_BFGsound},S_BFG2,0,0},	// S_BFG1
+    {SPR_BFGG,1,10,{A_GunFlash},S_BFG3,0,0},	// S_BFG2
+    {SPR_BFGG,1,10,{A_FireBFG},S_BFG4,0,0},	// S_BFG3
+    {SPR_BFGG,1,20,{A_ReFire},S_BFG,0,0},	// S_BFG4
+    {SPR_BFGF,32768,11,{A_Light1},S_BFGFLASH2,0,0},	// S_BFGFLASH1
+    {SPR_BFGF,32769,6,{A_Light2},S_LIGHTDONE,0,0},	// S_BFGFLASH2
+    {SPR_BLUD,2,8,{NULL},S_BLOOD2,0,0},	// S_BLOOD1
+    {SPR_BLUD,1,8,{NULL},S_BLOOD3,0,0},	// S_BLOOD2
+    {SPR_BLUD,0,8,{NULL},S_NULL,0,0},	// S_BLOOD3
+    {SPR_PUFF,32768,4,{NULL},S_PUFF2,0,0},	// S_PUFF1
+    {SPR_PUFF,1,4,{NULL},S_PUFF3,0,0},	// S_PUFF2
+    {SPR_PUFF,2,4,{NULL},S_PUFF4,0,0},	// S_PUFF3
+    {SPR_PUFF,3,4,{NULL},S_NULL,0,0},	// S_PUFF4
+    {SPR_BAL1,32768,4,{NULL},S_TBALL2,0,0},	// S_TBALL1
+    {SPR_BAL1,32769,4,{NULL},S_TBALL1,0,0},	// S_TBALL2
+    {SPR_BAL1,32770,6,{NULL},S_TBALLX2,0,0},	// S_TBALLX1
+    {SPR_BAL1,32771,6,{NULL},S_TBALLX3,0,0},	// S_TBALLX2
+    {SPR_BAL1,32772,6,{NULL},S_NULL,0,0},	// S_TBALLX3
+    {SPR_BAL2,32768,4,{NULL},S_RBALL2,0,0},	// S_RBALL1
+    {SPR_BAL2,32769,4,{NULL},S_RBALL1,0,0},	// S_RBALL2
+    {SPR_BAL2,32770,6,{NULL},S_RBALLX2,0,0},	// S_RBALLX1
+    {SPR_BAL2,32771,6,{NULL},S_RBALLX3,0,0},	// S_RBALLX2
+    {SPR_BAL2,32772,6,{NULL},S_NULL,0,0},	// S_RBALLX3
+    {SPR_PLSS,32768,6,{NULL},S_PLASBALL2,0,0},	// S_PLASBALL
+    {SPR_PLSS,32769,6,{NULL},S_PLASBALL,0,0},	// S_PLASBALL2
+    {SPR_PLSE,32768,4,{NULL},S_PLASEXP2,0,0},	// S_PLASEXP
+    {SPR_PLSE,32769,4,{NULL},S_PLASEXP3,0,0},	// S_PLASEXP2
+    {SPR_PLSE,32770,4,{NULL},S_PLASEXP4,0,0},	// S_PLASEXP3
+    {SPR_PLSE,32771,4,{NULL},S_PLASEXP5,0,0},	// S_PLASEXP4
+    {SPR_PLSE,32772,4,{NULL},S_NULL,0,0},	// S_PLASEXP5
+    {SPR_MISL,32768,1,{NULL},S_ROCKET,0,0},	// S_ROCKET
+    {SPR_BFS1,32768,4,{NULL},S_BFGSHOT2,0,0},	// S_BFGSHOT
+    {SPR_BFS1,32769,4,{NULL},S_BFGSHOT,0,0},	// S_BFGSHOT2
+    {SPR_BFE1,32768,8,{NULL},S_BFGLAND2,0,0},	// S_BFGLAND
+    {SPR_BFE1,32769,8,{NULL},S_BFGLAND3,0,0},	// S_BFGLAND2
+    {SPR_BFE1,32770,8,{A_BFGSpray},S_BFGLAND4,0,0},	// S_BFGLAND3
+    {SPR_BFE1,32771,8,{NULL},S_BFGLAND5,0,0},	// S_BFGLAND4
+    {SPR_BFE1,32772,8,{NULL},S_BFGLAND6,0,0},	// S_BFGLAND5
+    {SPR_BFE1,32773,8,{NULL},S_NULL,0,0},	// S_BFGLAND6
+    {SPR_BFE2,32768,8,{NULL},S_BFGEXP2,0,0},	// S_BFGEXP
+    {SPR_BFE2,32769,8,{NULL},S_BFGEXP3,0,0},	// S_BFGEXP2
+    {SPR_BFE2,32770,8,{NULL},S_BFGEXP4,0,0},	// S_BFGEXP3
+    {SPR_BFE2,32771,8,{NULL},S_NULL,0,0},	// S_BFGEXP4
+    {SPR_MISL,32769,8,{A_Explode},S_EXPLODE2,0,0},	// S_EXPLODE1
+    {SPR_MISL,32770,6,{NULL},S_EXPLODE3,0,0},	// S_EXPLODE2
+    {SPR_MISL,32771,4,{NULL},S_NULL,0,0},	// S_EXPLODE3
+    {SPR_TFOG,32768,6,{NULL},S_TFOG01,0,0},	// S_TFOG
+    {SPR_TFOG,32769,6,{NULL},S_TFOG02,0,0},	// S_TFOG01
+    {SPR_TFOG,32768,6,{NULL},S_TFOG2,0,0},	// S_TFOG02
+    {SPR_TFOG,32769,6,{NULL},S_TFOG3,0,0},	// S_TFOG2
+    {SPR_TFOG,32770,6,{NULL},S_TFOG4,0,0},	// S_TFOG3
+    {SPR_TFOG,32771,6,{NULL},S_TFOG5,0,0},	// S_TFOG4
+    {SPR_TFOG,32772,6,{NULL},S_TFOG6,0,0},	// S_TFOG5
+    {SPR_TFOG,32773,6,{NULL},S_TFOG7,0,0},	// S_TFOG6
+    {SPR_TFOG,32774,6,{NULL},S_TFOG8,0,0},	// S_TFOG7
+    {SPR_TFOG,32775,6,{NULL},S_TFOG9,0,0},	// S_TFOG8
+    {SPR_TFOG,32776,6,{NULL},S_TFOG10,0,0},	// S_TFOG9
+    {SPR_TFOG,32777,6,{NULL},S_NULL,0,0},	// S_TFOG10
+    {SPR_IFOG,32768,6,{NULL},S_IFOG01,0,0},	// S_IFOG
+    {SPR_IFOG,32769,6,{NULL},S_IFOG02,0,0},	// S_IFOG01
+    {SPR_IFOG,32768,6,{NULL},S_IFOG2,0,0},	// S_IFOG02
+    {SPR_IFOG,32769,6,{NULL},S_IFOG3,0,0},	// S_IFOG2
+    {SPR_IFOG,32770,6,{NULL},S_IFOG4,0,0},	// S_IFOG3
+    {SPR_IFOG,32771,6,{NULL},S_IFOG5,0,0},	// S_IFOG4
+    {SPR_IFOG,32772,6,{NULL},S_NULL,0,0},	// S_IFOG5
+    {SPR_PLAY,0,-1,{NULL},S_NULL,0,0},	// S_PLAY
+    {SPR_PLAY,0,4,{NULL},S_PLAY_RUN2,0,0},	// S_PLAY_RUN1
+    {SPR_PLAY,1,4,{NULL},S_PLAY_RUN3,0,0},	// S_PLAY_RUN2
+    {SPR_PLAY,2,4,{NULL},S_PLAY_RUN4,0,0},	// S_PLAY_RUN3
+    {SPR_PLAY,3,4,{NULL},S_PLAY_RUN1,0,0},	// S_PLAY_RUN4
+    {SPR_PLAY,4,12,{NULL},S_PLAY,0,0},	// S_PLAY_ATK1
+    {SPR_PLAY,32773,6,{NULL},S_PLAY_ATK1,0,0},	// S_PLAY_ATK2
+    {SPR_PLAY,6,4,{NULL},S_PLAY_PAIN2,0,0},	// S_PLAY_PAIN
+    {SPR_PLAY,6,4,{A_Pain},S_PLAY,0,0},	// S_PLAY_PAIN2
+    {SPR_PLAY,7,10,{NULL},S_PLAY_DIE2,0,0},	// S_PLAY_DIE1
+    {SPR_PLAY,8,10,{A_PlayerScream},S_PLAY_DIE3,0,0},	// S_PLAY_DIE2
+    {SPR_PLAY,9,10,{A_Fall},S_PLAY_DIE4,0,0},	// S_PLAY_DIE3
+    {SPR_PLAY,10,10,{NULL},S_PLAY_DIE5,0,0},	// S_PLAY_DIE4
+    {SPR_PLAY,11,10,{NULL},S_PLAY_DIE6,0,0},	// S_PLAY_DIE5
+    {SPR_PLAY,12,10,{NULL},S_PLAY_DIE7,0,0},	// S_PLAY_DIE6
+    {SPR_PLAY,13,-1,{NULL},S_NULL,0,0},	// S_PLAY_DIE7
+    {SPR_PLAY,14,5,{NULL},S_PLAY_XDIE2,0,0},	// S_PLAY_XDIE1
+    {SPR_PLAY,15,5,{A_XScream},S_PLAY_XDIE3,0,0},	// S_PLAY_XDIE2
+    {SPR_PLAY,16,5,{A_Fall},S_PLAY_XDIE4,0,0},	// S_PLAY_XDIE3
+    {SPR_PLAY,17,5,{NULL},S_PLAY_XDIE5,0,0},	// S_PLAY_XDIE4
+    {SPR_PLAY,18,5,{NULL},S_PLAY_XDIE6,0,0},	// S_PLAY_XDIE5
+    {SPR_PLAY,19,5,{NULL},S_PLAY_XDIE7,0,0},	// S_PLAY_XDIE6
+    {SPR_PLAY,20,5,{NULL},S_PLAY_XDIE8,0,0},	// S_PLAY_XDIE7
+    {SPR_PLAY,21,5,{NULL},S_PLAY_XDIE9,0,0},	// S_PLAY_XDIE8
+    {SPR_PLAY,22,-1,{NULL},S_NULL,0,0},	// S_PLAY_XDIE9
+    {SPR_POSS,0,10,{A_Look},S_POSS_STND2,0,0},	// S_POSS_STND
+    {SPR_POSS,1,10,{A_Look},S_POSS_STND,0,0},	// S_POSS_STND2
+    {SPR_POSS,0,4,{A_Chase},S_POSS_RUN2,0,0},	// S_POSS_RUN1
+    {SPR_POSS,0,4,{A_Chase},S_POSS_RUN3,0,0},	// S_POSS_RUN2
+    {SPR_POSS,1,4,{A_Chase},S_POSS_RUN4,0,0},	// S_POSS_RUN3
+    {SPR_POSS,1,4,{A_Chase},S_POSS_RUN5,0,0},	// S_POSS_RUN4
+    {SPR_POSS,2,4,{A_Chase},S_POSS_RUN6,0,0},	// S_POSS_RUN5
+    {SPR_POSS,2,4,{A_Chase},S_POSS_RUN7,0,0},	// S_POSS_RUN6
+    {SPR_POSS,3,4,{A_Chase},S_POSS_RUN8,0,0},	// S_POSS_RUN7
+    {SPR_POSS,3,4,{A_Chase},S_POSS_RUN1,0,0},	// S_POSS_RUN8
+    {SPR_POSS,4,10,{A_FaceTarget},S_POSS_ATK2,0,0},	// S_POSS_ATK1
+    {SPR_POSS,5,8,{A_PosAttack},S_POSS_ATK3,0,0},	// S_POSS_ATK2
+    {SPR_POSS,4,8,{NULL},S_POSS_RUN1,0,0},	// S_POSS_ATK3
+    {SPR_POSS,6,3,{NULL},S_POSS_PAIN2,0,0},	// S_POSS_PAIN
+    {SPR_POSS,6,3,{A_Pain},S_POSS_RUN1,0,0},	// S_POSS_PAIN2
+    {SPR_POSS,7,5,{NULL},S_POSS_DIE2,0,0},	// S_POSS_DIE1
+    {SPR_POSS,8,5,{A_Scream},S_POSS_DIE3,0,0},	// S_POSS_DIE2
+    {SPR_POSS,9,5,{A_Fall},S_POSS_DIE4,0,0},	// S_POSS_DIE3
+    {SPR_POSS,10,5,{NULL},S_POSS_DIE5,0,0},	// S_POSS_DIE4
+    {SPR_POSS,11,-1,{NULL},S_NULL,0,0},	// S_POSS_DIE5
+    {SPR_POSS,12,5,{NULL},S_POSS_XDIE2,0,0},	// S_POSS_XDIE1
+    {SPR_POSS,13,5,{A_XScream},S_POSS_XDIE3,0,0},	// S_POSS_XDIE2
+    {SPR_POSS,14,5,{A_Fall},S_POSS_XDIE4,0,0},	// S_POSS_XDIE3
+    {SPR_POSS,15,5,{NULL},S_POSS_XDIE5,0,0},	// S_POSS_XDIE4
+    {SPR_POSS,16,5,{NULL},S_POSS_XDIE6,0,0},	// S_POSS_XDIE5
+    {SPR_POSS,17,5,{NULL},S_POSS_XDIE7,0,0},	// S_POSS_XDIE6
+    {SPR_POSS,18,5,{NULL},S_POSS_XDIE8,0,0},	// S_POSS_XDIE7
+    {SPR_POSS,19,5,{NULL},S_POSS_XDIE9,0,0},	// S_POSS_XDIE8
+    {SPR_POSS,20,-1,{NULL},S_NULL,0,0},	// S_POSS_XDIE9
+    {SPR_POSS,10,5,{NULL},S_POSS_RAISE2,0,0},	// S_POSS_RAISE1
+    {SPR_POSS,9,5,{NULL},S_POSS_RAISE3,0,0},	// S_POSS_RAISE2
+    {SPR_POSS,8,5,{NULL},S_POSS_RAISE4,0,0},	// S_POSS_RAISE3
+    {SPR_POSS,7,5,{NULL},S_POSS_RUN1,0,0},	// S_POSS_RAISE4
+    {SPR_SPOS,0,10,{A_Look},S_SPOS_STND2,0,0},	// S_SPOS_STND
+    {SPR_SPOS,1,10,{A_Look},S_SPOS_STND,0,0},	// S_SPOS_STND2
+    {SPR_SPOS,0,3,{A_Chase},S_SPOS_RUN2,0,0},	// S_SPOS_RUN1
+    {SPR_SPOS,0,3,{A_Chase},S_SPOS_RUN3,0,0},	// S_SPOS_RUN2
+    {SPR_SPOS,1,3,{A_Chase},S_SPOS_RUN4,0,0},	// S_SPOS_RUN3
+    {SPR_SPOS,1,3,{A_Chase},S_SPOS_RUN5,0,0},	// S_SPOS_RUN4
+    {SPR_SPOS,2,3,{A_Chase},S_SPOS_RUN6,0,0},	// S_SPOS_RUN5
+    {SPR_SPOS,2,3,{A_Chase},S_SPOS_RUN7,0,0},	// S_SPOS_RUN6
+    {SPR_SPOS,3,3,{A_Chase},S_SPOS_RUN8,0,0},	// S_SPOS_RUN7
+    {SPR_SPOS,3,3,{A_Chase},S_SPOS_RUN1,0,0},	// S_SPOS_RUN8
+    {SPR_SPOS,4,10,{A_FaceTarget},S_SPOS_ATK2,0,0},	// S_SPOS_ATK1
+    {SPR_SPOS,32773,10,{A_SPosAttack},S_SPOS_ATK3,0,0},	// S_SPOS_ATK2
+    {SPR_SPOS,4,10,{NULL},S_SPOS_RUN1,0,0},	// S_SPOS_ATK3
+    {SPR_SPOS,6,3,{NULL},S_SPOS_PAIN2,0,0},	// S_SPOS_PAIN
+    {SPR_SPOS,6,3,{A_Pain},S_SPOS_RUN1,0,0},	// S_SPOS_PAIN2
+    {SPR_SPOS,7,5,{NULL},S_SPOS_DIE2,0,0},	// S_SPOS_DIE1
+    {SPR_SPOS,8,5,{A_Scream},S_SPOS_DIE3,0,0},	// S_SPOS_DIE2
+    {SPR_SPOS,9,5,{A_Fall},S_SPOS_DIE4,0,0},	// S_SPOS_DIE3
+    {SPR_SPOS,10,5,{NULL},S_SPOS_DIE5,0,0},	// S_SPOS_DIE4
+    {SPR_SPOS,11,-1,{NULL},S_NULL,0,0},	// S_SPOS_DIE5
+    {SPR_SPOS,12,5,{NULL},S_SPOS_XDIE2,0,0},	// S_SPOS_XDIE1
+    {SPR_SPOS,13,5,{A_XScream},S_SPOS_XDIE3,0,0},	// S_SPOS_XDIE2
+    {SPR_SPOS,14,5,{A_Fall},S_SPOS_XDIE4,0,0},	// S_SPOS_XDIE3
+    {SPR_SPOS,15,5,{NULL},S_SPOS_XDIE5,0,0},	// S_SPOS_XDIE4
+    {SPR_SPOS,16,5,{NULL},S_SPOS_XDIE6,0,0},	// S_SPOS_XDIE5
+    {SPR_SPOS,17,5,{NULL},S_SPOS_XDIE7,0,0},	// S_SPOS_XDIE6
+    {SPR_SPOS,18,5,{NULL},S_SPOS_XDIE8,0,0},	// S_SPOS_XDIE7
+    {SPR_SPOS,19,5,{NULL},S_SPOS_XDIE9,0,0},	// S_SPOS_XDIE8
+    {SPR_SPOS,20,-1,{NULL},S_NULL,0,0},	// S_SPOS_XDIE9
+    {SPR_SPOS,11,5,{NULL},S_SPOS_RAISE2,0,0},	// S_SPOS_RAISE1
+    {SPR_SPOS,10,5,{NULL},S_SPOS_RAISE3,0,0},	// S_SPOS_RAISE2
+    {SPR_SPOS,9,5,{NULL},S_SPOS_RAISE4,0,0},	// S_SPOS_RAISE3
+    {SPR_SPOS,8,5,{NULL},S_SPOS_RAISE5,0,0},	// S_SPOS_RAISE4
+    {SPR_SPOS,7,5,{NULL},S_SPOS_RUN1,0,0},	// S_SPOS_RAISE5
+    {SPR_VILE,0,10,{A_Look},S_VILE_STND2,0,0},	// S_VILE_STND
+    {SPR_VILE,1,10,{A_Look},S_VILE_STND,0,0},	// S_VILE_STND2
+    {SPR_VILE,0,2,{A_VileChase},S_VILE_RUN2,0,0},	// S_VILE_RUN1
+    {SPR_VILE,0,2,{A_VileChase},S_VILE_RUN3,0,0},	// S_VILE_RUN2
+    {SPR_VILE,1,2,{A_VileChase},S_VILE_RUN4,0,0},	// S_VILE_RUN3
+    {SPR_VILE,1,2,{A_VileChase},S_VILE_RUN5,0,0},	// S_VILE_RUN4
+    {SPR_VILE,2,2,{A_VileChase},S_VILE_RUN6,0,0},	// S_VILE_RUN5
+    {SPR_VILE,2,2,{A_VileChase},S_VILE_RUN7,0,0},	// S_VILE_RUN6
+    {SPR_VILE,3,2,{A_VileChase},S_VILE_RUN8,0,0},	// S_VILE_RUN7
+    {SPR_VILE,3,2,{A_VileChase},S_VILE_RUN9,0,0},	// S_VILE_RUN8
+    {SPR_VILE,4,2,{A_VileChase},S_VILE_RUN10,0,0},	// S_VILE_RUN9
+    {SPR_VILE,4,2,{A_VileChase},S_VILE_RUN11,0,0},	// S_VILE_RUN10
+    {SPR_VILE,5,2,{A_VileChase},S_VILE_RUN12,0,0},	// S_VILE_RUN11
+    {SPR_VILE,5,2,{A_VileChase},S_VILE_RUN1,0,0},	// S_VILE_RUN12
+    {SPR_VILE,32774,0,{A_VileStart},S_VILE_ATK2,0,0},	// S_VILE_ATK1
+    {SPR_VILE,32774,10,{A_FaceTarget},S_VILE_ATK3,0,0},	// S_VILE_ATK2
+    {SPR_VILE,32775,8,{A_VileTarget},S_VILE_ATK4,0,0},	// S_VILE_ATK3
+    {SPR_VILE,32776,8,{A_FaceTarget},S_VILE_ATK5,0,0},	// S_VILE_ATK4
+    {SPR_VILE,32777,8,{A_FaceTarget},S_VILE_ATK6,0,0},	// S_VILE_ATK5
+    {SPR_VILE,32778,8,{A_FaceTarget},S_VILE_ATK7,0,0},	// S_VILE_ATK6
+    {SPR_VILE,32779,8,{A_FaceTarget},S_VILE_ATK8,0,0},	// S_VILE_ATK7
+    {SPR_VILE,32780,8,{A_FaceTarget},S_VILE_ATK9,0,0},	// S_VILE_ATK8
+    {SPR_VILE,32781,8,{A_FaceTarget},S_VILE_ATK10,0,0},	// S_VILE_ATK9
+    {SPR_VILE,32782,8,{A_VileAttack},S_VILE_ATK11,0,0},	// S_VILE_ATK10
+    {SPR_VILE,32783,20,{NULL},S_VILE_RUN1,0,0},	// S_VILE_ATK11
+    {SPR_VILE,32794,10,{NULL},S_VILE_HEAL2,0,0},	// S_VILE_HEAL1
+    {SPR_VILE,32795,10,{NULL},S_VILE_HEAL3,0,0},	// S_VILE_HEAL2
+    {SPR_VILE,32796,10,{NULL},S_VILE_RUN1,0,0},	// S_VILE_HEAL3
+    {SPR_VILE,16,5,{NULL},S_VILE_PAIN2,0,0},	// S_VILE_PAIN
+    {SPR_VILE,16,5,{A_Pain},S_VILE_RUN1,0,0},	// S_VILE_PAIN2
+    {SPR_VILE,16,7,{NULL},S_VILE_DIE2,0,0},	// S_VILE_DIE1
+    {SPR_VILE,17,7,{A_Scream},S_VILE_DIE3,0,0},	// S_VILE_DIE2
+    {SPR_VILE,18,7,{A_Fall},S_VILE_DIE4,0,0},	// S_VILE_DIE3
+    {SPR_VILE,19,7,{NULL},S_VILE_DIE5,0,0},	// S_VILE_DIE4
+    {SPR_VILE,20,7,{NULL},S_VILE_DIE6,0,0},	// S_VILE_DIE5
+    {SPR_VILE,21,7,{NULL},S_VILE_DIE7,0,0},	// S_VILE_DIE6
+    {SPR_VILE,22,7,{NULL},S_VILE_DIE8,0,0},	// S_VILE_DIE7
+    {SPR_VILE,23,5,{NULL},S_VILE_DIE9,0,0},	// S_VILE_DIE8
+    {SPR_VILE,24,5,{NULL},S_VILE_DIE10,0,0},	// S_VILE_DIE9
+    {SPR_VILE,25,-1,{NULL},S_NULL,0,0},	// S_VILE_DIE10
+    {SPR_FIRE,32768,2,{A_StartFire},S_FIRE2,0,0},	// S_FIRE1
+    {SPR_FIRE,32769,2,{A_Fire},S_FIRE3,0,0},	// S_FIRE2
+    {SPR_FIRE,32768,2,{A_Fire},S_FIRE4,0,0},	// S_FIRE3
+    {SPR_FIRE,32769,2,{A_Fire},S_FIRE5,0,0},	// S_FIRE4
+    {SPR_FIRE,32770,2,{A_FireCrackle},S_FIRE6,0,0},	// S_FIRE5
+    {SPR_FIRE,32769,2,{A_Fire},S_FIRE7,0,0},	// S_FIRE6
+    {SPR_FIRE,32770,2,{A_Fire},S_FIRE8,0,0},	// S_FIRE7
+    {SPR_FIRE,32769,2,{A_Fire},S_FIRE9,0,0},	// S_FIRE8
+    {SPR_FIRE,32770,2,{A_Fire},S_FIRE10,0,0},	// S_FIRE9
+    {SPR_FIRE,32771,2,{A_Fire},S_FIRE11,0,0},	// S_FIRE10
+    {SPR_FIRE,32770,2,{A_Fire},S_FIRE12,0,0},	// S_FIRE11
+    {SPR_FIRE,32771,2,{A_Fire},S_FIRE13,0,0},	// S_FIRE12
+    {SPR_FIRE,32770,2,{A_Fire},S_FIRE14,0,0},	// S_FIRE13
+    {SPR_FIRE,32771,2,{A_Fire},S_FIRE15,0,0},	// S_FIRE14
+    {SPR_FIRE,32772,2,{A_Fire},S_FIRE16,0,0},	// S_FIRE15
+    {SPR_FIRE,32771,2,{A_Fire},S_FIRE17,0,0},	// S_FIRE16
+    {SPR_FIRE,32772,2,{A_Fire},S_FIRE18,0,0},	// S_FIRE17
+    {SPR_FIRE,32771,2,{A_Fire},S_FIRE19,0,0},	// S_FIRE18
+    {SPR_FIRE,32772,2,{A_FireCrackle},S_FIRE20,0,0},	// S_FIRE19
+    {SPR_FIRE,32773,2,{A_Fire},S_FIRE21,0,0},	// S_FIRE20
+    {SPR_FIRE,32772,2,{A_Fire},S_FIRE22,0,0},	// S_FIRE21
+    {SPR_FIRE,32773,2,{A_Fire},S_FIRE23,0,0},	// S_FIRE22
+    {SPR_FIRE,32772,2,{A_Fire},S_FIRE24,0,0},	// S_FIRE23
+    {SPR_FIRE,32773,2,{A_Fire},S_FIRE25,0,0},	// S_FIRE24
+    {SPR_FIRE,32774,2,{A_Fire},S_FIRE26,0,0},	// S_FIRE25
+    {SPR_FIRE,32775,2,{A_Fire},S_FIRE27,0,0},	// S_FIRE26
+    {SPR_FIRE,32774,2,{A_Fire},S_FIRE28,0,0},	// S_FIRE27
+    {SPR_FIRE,32775,2,{A_Fire},S_FIRE29,0,0},	// S_FIRE28
+    {SPR_FIRE,32774,2,{A_Fire},S_FIRE30,0,0},	// S_FIRE29
+    {SPR_FIRE,32775,2,{A_Fire},S_NULL,0,0},	// S_FIRE30
+    {SPR_PUFF,1,4,{NULL},S_SMOKE2,0,0},	// S_SMOKE1
+    {SPR_PUFF,2,4,{NULL},S_SMOKE3,0,0},	// S_SMOKE2
+    {SPR_PUFF,1,4,{NULL},S_SMOKE4,0,0},	// S_SMOKE3
+    {SPR_PUFF,2,4,{NULL},S_SMOKE5,0,0},	// S_SMOKE4
+    {SPR_PUFF,3,4,{NULL},S_NULL,0,0},	// S_SMOKE5
+    {SPR_FATB,32768,2,{A_Tracer},S_TRACER2,0,0},	// S_TRACER
+    {SPR_FATB,32769,2,{A_Tracer},S_TRACER,0,0},	// S_TRACER2
+    {SPR_FBXP,32768,8,{NULL},S_TRACEEXP2,0,0},	// S_TRACEEXP1
+    {SPR_FBXP,32769,6,{NULL},S_TRACEEXP3,0,0},	// S_TRACEEXP2
+    {SPR_FBXP,32770,4,{NULL},S_NULL,0,0},	// S_TRACEEXP3
+    {SPR_SKEL,0,10,{A_Look},S_SKEL_STND2,0,0},	// S_SKEL_STND
+    {SPR_SKEL,1,10,{A_Look},S_SKEL_STND,0,0},	// S_SKEL_STND2
+    {SPR_SKEL,0,2,{A_Chase},S_SKEL_RUN2,0,0},	// S_SKEL_RUN1
+    {SPR_SKEL,0,2,{A_Chase},S_SKEL_RUN3,0,0},	// S_SKEL_RUN2
+    {SPR_SKEL,1,2,{A_Chase},S_SKEL_RUN4,0,0},	// S_SKEL_RUN3
+    {SPR_SKEL,1,2,{A_Chase},S_SKEL_RUN5,0,0},	// S_SKEL_RUN4
+    {SPR_SKEL,2,2,{A_Chase},S_SKEL_RUN6,0,0},	// S_SKEL_RUN5
+    {SPR_SKEL,2,2,{A_Chase},S_SKEL_RUN7,0,0},	// S_SKEL_RUN6
+    {SPR_SKEL,3,2,{A_Chase},S_SKEL_RUN8,0,0},	// S_SKEL_RUN7
+    {SPR_SKEL,3,2,{A_Chase},S_SKEL_RUN9,0,0},	// S_SKEL_RUN8
+    {SPR_SKEL,4,2,{A_Chase},S_SKEL_RUN10,0,0},	// S_SKEL_RUN9
+    {SPR_SKEL,4,2,{A_Chase},S_SKEL_RUN11,0,0},	// S_SKEL_RUN10
+    {SPR_SKEL,5,2,{A_Chase},S_SKEL_RUN12,0,0},	// S_SKEL_RUN11
+    {SPR_SKEL,5,2,{A_Chase},S_SKEL_RUN1,0,0},	// S_SKEL_RUN12
+    {SPR_SKEL,6,0,{A_FaceTarget},S_SKEL_FIST2,0,0},	// S_SKEL_FIST1
+    {SPR_SKEL,6,6,{A_SkelWhoosh},S_SKEL_FIST3,0,0},	// S_SKEL_FIST2
+    {SPR_SKEL,7,6,{A_FaceTarget},S_SKEL_FIST4,0,0},	// S_SKEL_FIST3
+    {SPR_SKEL,8,6,{A_SkelFist},S_SKEL_RUN1,0,0},	// S_SKEL_FIST4
+    {SPR_SKEL,32777,0,{A_FaceTarget},S_SKEL_MISS2,0,0},	// S_SKEL_MISS1
+    {SPR_SKEL,32777,10,{A_FaceTarget},S_SKEL_MISS3,0,0},	// S_SKEL_MISS2
+    {SPR_SKEL,10,10,{A_SkelMissile},S_SKEL_MISS4,0,0},	// S_SKEL_MISS3
+    {SPR_SKEL,10,10,{A_FaceTarget},S_SKEL_RUN1,0,0},	// S_SKEL_MISS4
+    {SPR_SKEL,11,5,{NULL},S_SKEL_PAIN2,0,0},	// S_SKEL_PAIN
+    {SPR_SKEL,11,5,{A_Pain},S_SKEL_RUN1,0,0},	// S_SKEL_PAIN2
+    {SPR_SKEL,11,7,{NULL},S_SKEL_DIE2,0,0},	// S_SKEL_DIE1
+    {SPR_SKEL,12,7,{NULL},S_SKEL_DIE3,0,0},	// S_SKEL_DIE2
+    {SPR_SKEL,13,7,{A_Scream},S_SKEL_DIE4,0,0},	// S_SKEL_DIE3
+    {SPR_SKEL,14,7,{A_Fall},S_SKEL_DIE5,0,0},	// S_SKEL_DIE4
+    {SPR_SKEL,15,7,{NULL},S_SKEL_DIE6,0,0},	// S_SKEL_DIE5
+    {SPR_SKEL,16,-1,{NULL},S_NULL,0,0},	// S_SKEL_DIE6
+    {SPR_SKEL,16,5,{NULL},S_SKEL_RAISE2,0,0},	// S_SKEL_RAISE1
+    {SPR_SKEL,15,5,{NULL},S_SKEL_RAISE3,0,0},	// S_SKEL_RAISE2
+    {SPR_SKEL,14,5,{NULL},S_SKEL_RAISE4,0,0},	// S_SKEL_RAISE3
+    {SPR_SKEL,13,5,{NULL},S_SKEL_RAISE5,0,0},	// S_SKEL_RAISE4
+    {SPR_SKEL,12,5,{NULL},S_SKEL_RAISE6,0,0},	// S_SKEL_RAISE5
+    {SPR_SKEL,11,5,{NULL},S_SKEL_RUN1,0,0},	// S_SKEL_RAISE6
+    {SPR_MANF,32768,4,{NULL},S_FATSHOT2,0,0},	// S_FATSHOT1
+    {SPR_MANF,32769,4,{NULL},S_FATSHOT1,0,0},	// S_FATSHOT2
+    {SPR_MISL,32769,8,{NULL},S_FATSHOTX2,0,0},	// S_FATSHOTX1
+    {SPR_MISL,32770,6,{NULL},S_FATSHOTX3,0,0},	// S_FATSHOTX2
+    {SPR_MISL,32771,4,{NULL},S_NULL,0,0},	// S_FATSHOTX3
+    {SPR_FATT,0,15,{A_Look},S_FATT_STND2,0,0},	// S_FATT_STND
+    {SPR_FATT,1,15,{A_Look},S_FATT_STND,0,0},	// S_FATT_STND2
+    {SPR_FATT,0,4,{A_Chase},S_FATT_RUN2,0,0},	// S_FATT_RUN1
+    {SPR_FATT,0,4,{A_Chase},S_FATT_RUN3,0,0},	// S_FATT_RUN2
+    {SPR_FATT,1,4,{A_Chase},S_FATT_RUN4,0,0},	// S_FATT_RUN3
+    {SPR_FATT,1,4,{A_Chase},S_FATT_RUN5,0,0},	// S_FATT_RUN4
+    {SPR_FATT,2,4,{A_Chase},S_FATT_RUN6,0,0},	// S_FATT_RUN5
+    {SPR_FATT,2,4,{A_Chase},S_FATT_RUN7,0,0},	// S_FATT_RUN6
+    {SPR_FATT,3,4,{A_Chase},S_FATT_RUN8,0,0},	// S_FATT_RUN7
+    {SPR_FATT,3,4,{A_Chase},S_FATT_RUN9,0,0},	// S_FATT_RUN8
+    {SPR_FATT,4,4,{A_Chase},S_FATT_RUN10,0,0},	// S_FATT_RUN9
+    {SPR_FATT,4,4,{A_Chase},S_FATT_RUN11,0,0},	// S_FATT_RUN10
+    {SPR_FATT,5,4,{A_Chase},S_FATT_RUN12,0,0},	// S_FATT_RUN11
+    {SPR_FATT,5,4,{A_Chase},S_FATT_RUN1,0,0},	// S_FATT_RUN12
+    {SPR_FATT,6,20,{A_FatRaise},S_FATT_ATK2,0,0},	// S_FATT_ATK1
+    {SPR_FATT,32775,10,{A_FatAttack1},S_FATT_ATK3,0,0},	// S_FATT_ATK2
+    {SPR_FATT,8,5,{A_FaceTarget},S_FATT_ATK4,0,0},	// S_FATT_ATK3
+    {SPR_FATT,6,5,{A_FaceTarget},S_FATT_ATK5,0,0},	// S_FATT_ATK4
+    {SPR_FATT,32775,10,{A_FatAttack2},S_FATT_ATK6,0,0},	// S_FATT_ATK5
+    {SPR_FATT,8,5,{A_FaceTarget},S_FATT_ATK7,0,0},	// S_FATT_ATK6
+    {SPR_FATT,6,5,{A_FaceTarget},S_FATT_ATK8,0,0},	// S_FATT_ATK7
+    {SPR_FATT,32775,10,{A_FatAttack3},S_FATT_ATK9,0,0},	// S_FATT_ATK8
+    {SPR_FATT,8,5,{A_FaceTarget},S_FATT_ATK10,0,0},	// S_FATT_ATK9
+    {SPR_FATT,6,5,{A_FaceTarget},S_FATT_RUN1,0,0},	// S_FATT_ATK10
+    {SPR_FATT,9,3,{NULL},S_FATT_PAIN2,0,0},	// S_FATT_PAIN
+    {SPR_FATT,9,3,{A_Pain},S_FATT_RUN1,0,0},	// S_FATT_PAIN2
+    {SPR_FATT,10,6,{NULL},S_FATT_DIE2,0,0},	// S_FATT_DIE1
+    {SPR_FATT,11,6,{A_Scream},S_FATT_DIE3,0,0},	// S_FATT_DIE2
+    {SPR_FATT,12,6,{A_Fall},S_FATT_DIE4,0,0},	// S_FATT_DIE3
+    {SPR_FATT,13,6,{NULL},S_FATT_DIE5,0,0},	// S_FATT_DIE4
+    {SPR_FATT,14,6,{NULL},S_FATT_DIE6,0,0},	// S_FATT_DIE5
+    {SPR_FATT,15,6,{NULL},S_FATT_DIE7,0,0},	// S_FATT_DIE6
+    {SPR_FATT,16,6,{NULL},S_FATT_DIE8,0,0},	// S_FATT_DIE7
+    {SPR_FATT,17,6,{NULL},S_FATT_DIE9,0,0},	// S_FATT_DIE8
+    {SPR_FATT,18,6,{NULL},S_FATT_DIE10,0,0},	// S_FATT_DIE9
+    {SPR_FATT,19,-1,{A_BossDeath},S_NULL,0,0},	// S_FATT_DIE10
+    {SPR_FATT,17,5,{NULL},S_FATT_RAISE2,0,0},	// S_FATT_RAISE1
+    {SPR_FATT,16,5,{NULL},S_FATT_RAISE3,0,0},	// S_FATT_RAISE2
+    {SPR_FATT,15,5,{NULL},S_FATT_RAISE4,0,0},	// S_FATT_RAISE3
+    {SPR_FATT,14,5,{NULL},S_FATT_RAISE5,0,0},	// S_FATT_RAISE4
+    {SPR_FATT,13,5,{NULL},S_FATT_RAISE6,0,0},	// S_FATT_RAISE5
+    {SPR_FATT,12,5,{NULL},S_FATT_RAISE7,0,0},	// S_FATT_RAISE6
+    {SPR_FATT,11,5,{NULL},S_FATT_RAISE8,0,0},	// S_FATT_RAISE7
+    {SPR_FATT,10,5,{NULL},S_FATT_RUN1,0,0},	// S_FATT_RAISE8
+    {SPR_CPOS,0,10,{A_Look},S_CPOS_STND2,0,0},	// S_CPOS_STND
+    {SPR_CPOS,1,10,{A_Look},S_CPOS_STND,0,0},	// S_CPOS_STND2
+    {SPR_CPOS,0,3,{A_Chase},S_CPOS_RUN2,0,0},	// S_CPOS_RUN1
+    {SPR_CPOS,0,3,{A_Chase},S_CPOS_RUN3,0,0},	// S_CPOS_RUN2
+    {SPR_CPOS,1,3,{A_Chase},S_CPOS_RUN4,0,0},	// S_CPOS_RUN3
+    {SPR_CPOS,1,3,{A_Chase},S_CPOS_RUN5,0,0},	// S_CPOS_RUN4
+    {SPR_CPOS,2,3,{A_Chase},S_CPOS_RUN6,0,0},	// S_CPOS_RUN5
+    {SPR_CPOS,2,3,{A_Chase},S_CPOS_RUN7,0,0},	// S_CPOS_RUN6
+    {SPR_CPOS,3,3,{A_Chase},S_CPOS_RUN8,0,0},	// S_CPOS_RUN7
+    {SPR_CPOS,3,3,{A_Chase},S_CPOS_RUN1,0,0},	// S_CPOS_RUN8
+    {SPR_CPOS,4,10,{A_FaceTarget},S_CPOS_ATK2,0,0},	// S_CPOS_ATK1
+    {SPR_CPOS,32773,4,{A_CPosAttack},S_CPOS_ATK3,0,0},	// S_CPOS_ATK2
+    {SPR_CPOS,32772,4,{A_CPosAttack},S_CPOS_ATK4,0,0},	// S_CPOS_ATK3
+    {SPR_CPOS,5,1,{A_CPosRefire},S_CPOS_ATK2,0,0},	// S_CPOS_ATK4
+    {SPR_CPOS,6,3,{NULL},S_CPOS_PAIN2,0,0},	// S_CPOS_PAIN
+    {SPR_CPOS,6,3,{A_Pain},S_CPOS_RUN1,0,0},	// S_CPOS_PAIN2
+    {SPR_CPOS,7,5,{NULL},S_CPOS_DIE2,0,0},	// S_CPOS_DIE1
+    {SPR_CPOS,8,5,{A_Scream},S_CPOS_DIE3,0,0},	// S_CPOS_DIE2
+    {SPR_CPOS,9,5,{A_Fall},S_CPOS_DIE4,0,0},	// S_CPOS_DIE3
+    {SPR_CPOS,10,5,{NULL},S_CPOS_DIE5,0,0},	// S_CPOS_DIE4
+    {SPR_CPOS,11,5,{NULL},S_CPOS_DIE6,0,0},	// S_CPOS_DIE5
+    {SPR_CPOS,12,5,{NULL},S_CPOS_DIE7,0,0},	// S_CPOS_DIE6
+    {SPR_CPOS,13,-1,{NULL},S_NULL,0,0},	// S_CPOS_DIE7
+    {SPR_CPOS,14,5,{NULL},S_CPOS_XDIE2,0,0},	// S_CPOS_XDIE1
+    {SPR_CPOS,15,5,{A_XScream},S_CPOS_XDIE3,0,0},	// S_CPOS_XDIE2
+    {SPR_CPOS,16,5,{A_Fall},S_CPOS_XDIE4,0,0},	// S_CPOS_XDIE3
+    {SPR_CPOS,17,5,{NULL},S_CPOS_XDIE5,0,0},	// S_CPOS_XDIE4
+    {SPR_CPOS,18,5,{NULL},S_CPOS_XDIE6,0,0},	// S_CPOS_XDIE5
+    {SPR_CPOS,19,-1,{NULL},S_NULL,0,0},	// S_CPOS_XDIE6
+    {SPR_CPOS,13,5,{NULL},S_CPOS_RAISE2,0,0},	// S_CPOS_RAISE1
+    {SPR_CPOS,12,5,{NULL},S_CPOS_RAISE3,0,0},	// S_CPOS_RAISE2
+    {SPR_CPOS,11,5,{NULL},S_CPOS_RAISE4,0,0},	// S_CPOS_RAISE3
+    {SPR_CPOS,10,5,{NULL},S_CPOS_RAISE5,0,0},	// S_CPOS_RAISE4
+    {SPR_CPOS,9,5,{NULL},S_CPOS_RAISE6,0,0},	// S_CPOS_RAISE5
+    {SPR_CPOS,8,5,{NULL},S_CPOS_RAISE7,0,0},	// S_CPOS_RAISE6
+    {SPR_CPOS,7,5,{NULL},S_CPOS_RUN1,0,0},	// S_CPOS_RAISE7
+    {SPR_TROO,0,10,{A_Look},S_TROO_STND2,0,0},	// S_TROO_STND
+    {SPR_TROO,1,10,{A_Look},S_TROO_STND,0,0},	// S_TROO_STND2
+    {SPR_TROO,0,3,{A_Chase},S_TROO_RUN2,0,0},	// S_TROO_RUN1
+    {SPR_TROO,0,3,{A_Chase},S_TROO_RUN3,0,0},	// S_TROO_RUN2
+    {SPR_TROO,1,3,{A_Chase},S_TROO_RUN4,0,0},	// S_TROO_RUN3
+    {SPR_TROO,1,3,{A_Chase},S_TROO_RUN5,0,0},	// S_TROO_RUN4
+    {SPR_TROO,2,3,{A_Chase},S_TROO_RUN6,0,0},	// S_TROO_RUN5
+    {SPR_TROO,2,3,{A_Chase},S_TROO_RUN7,0,0},	// S_TROO_RUN6
+    {SPR_TROO,3,3,{A_Chase},S_TROO_RUN8,0,0},	// S_TROO_RUN7
+    {SPR_TROO,3,3,{A_Chase},S_TROO_RUN1,0,0},	// S_TROO_RUN8
+    {SPR_TROO,4,8,{A_FaceTarget},S_TROO_ATK2,0,0},	// S_TROO_ATK1
+    {SPR_TROO,5,8,{A_FaceTarget},S_TROO_ATK3,0,0},	// S_TROO_ATK2
+    {SPR_TROO,6,6,{A_TroopAttack},S_TROO_RUN1,0,0},	// S_TROO_ATK3
+    {SPR_TROO,7,2,{NULL},S_TROO_PAIN2,0,0},	// S_TROO_PAIN
+    {SPR_TROO,7,2,{A_Pain},S_TROO_RUN1,0,0},	// S_TROO_PAIN2
+    {SPR_TROO,8,8,{NULL},S_TROO_DIE2,0,0},	// S_TROO_DIE1
+    {SPR_TROO,9,8,{A_Scream},S_TROO_DIE3,0,0},	// S_TROO_DIE2
+    {SPR_TROO,10,6,{NULL},S_TROO_DIE4,0,0},	// S_TROO_DIE3
+    {SPR_TROO,11,6,{A_Fall},S_TROO_DIE5,0,0},	// S_TROO_DIE4
+    {SPR_TROO,12,-1,{NULL},S_NULL,0,0},	// S_TROO_DIE5
+    {SPR_TROO,13,5,{NULL},S_TROO_XDIE2,0,0},	// S_TROO_XDIE1
+    {SPR_TROO,14,5,{A_XScream},S_TROO_XDIE3,0,0},	// S_TROO_XDIE2
+    {SPR_TROO,15,5,{NULL},S_TROO_XDIE4,0,0},	// S_TROO_XDIE3
+    {SPR_TROO,16,5,{A_Fall},S_TROO_XDIE5,0,0},	// S_TROO_XDIE4
+    {SPR_TROO,17,5,{NULL},S_TROO_XDIE6,0,0},	// S_TROO_XDIE5
+    {SPR_TROO,18,5,{NULL},S_TROO_XDIE7,0,0},	// S_TROO_XDIE6
+    {SPR_TROO,19,5,{NULL},S_TROO_XDIE8,0,0},	// S_TROO_XDIE7
+    {SPR_TROO,20,-1,{NULL},S_NULL,0,0},	// S_TROO_XDIE8
+    {SPR_TROO,12,8,{NULL},S_TROO_RAISE2,0,0},	// S_TROO_RAISE1
+    {SPR_TROO,11,8,{NULL},S_TROO_RAISE3,0,0},	// S_TROO_RAISE2
+    {SPR_TROO,10,6,{NULL},S_TROO_RAISE4,0,0},	// S_TROO_RAISE3
+    {SPR_TROO,9,6,{NULL},S_TROO_RAISE5,0,0},	// S_TROO_RAISE4
+    {SPR_TROO,8,6,{NULL},S_TROO_RUN1,0,0},	// S_TROO_RAISE5
+    {SPR_SARG,0,10,{A_Look},S_SARG_STND2,0,0},	// S_SARG_STND
+    {SPR_SARG,1,10,{A_Look},S_SARG_STND,0,0},	// S_SARG_STND2
+    {SPR_SARG,0,2,{A_Chase},S_SARG_RUN2,0,0},	// S_SARG_RUN1
+    {SPR_SARG,0,2,{A_Chase},S_SARG_RUN3,0,0},	// S_SARG_RUN2
+    {SPR_SARG,1,2,{A_Chase},S_SARG_RUN4,0,0},	// S_SARG_RUN3
+    {SPR_SARG,1,2,{A_Chase},S_SARG_RUN5,0,0},	// S_SARG_RUN4
+    {SPR_SARG,2,2,{A_Chase},S_SARG_RUN6,0,0},	// S_SARG_RUN5
+    {SPR_SARG,2,2,{A_Chase},S_SARG_RUN7,0,0},	// S_SARG_RUN6
+    {SPR_SARG,3,2,{A_Chase},S_SARG_RUN8,0,0},	// S_SARG_RUN7
+    {SPR_SARG,3,2,{A_Chase},S_SARG_RUN1,0,0},	// S_SARG_RUN8
+    {SPR_SARG,4,8,{A_FaceTarget},S_SARG_ATK2,0,0},	// S_SARG_ATK1
+    {SPR_SARG,5,8,{A_FaceTarget},S_SARG_ATK3,0,0},	// S_SARG_ATK2
+    {SPR_SARG,6,8,{A_SargAttack},S_SARG_RUN1,0,0},	// S_SARG_ATK3
+    {SPR_SARG,7,2,{NULL},S_SARG_PAIN2,0,0},	// S_SARG_PAIN
+    {SPR_SARG,7,2,{A_Pain},S_SARG_RUN1,0,0},	// S_SARG_PAIN2
+    {SPR_SARG,8,8,{NULL},S_SARG_DIE2,0,0},	// S_SARG_DIE1
+    {SPR_SARG,9,8,{A_Scream},S_SARG_DIE3,0,0},	// S_SARG_DIE2
+    {SPR_SARG,10,4,{NULL},S_SARG_DIE4,0,0},	// S_SARG_DIE3
+    {SPR_SARG,11,4,{A_Fall},S_SARG_DIE5,0,0},	// S_SARG_DIE4
+    {SPR_SARG,12,4,{NULL},S_SARG_DIE6,0,0},	// S_SARG_DIE5
+    {SPR_SARG,13,-1,{NULL},S_NULL,0,0},	// S_SARG_DIE6
+    {SPR_SARG,13,5,{NULL},S_SARG_RAISE2,0,0},	// S_SARG_RAISE1
+    {SPR_SARG,12,5,{NULL},S_SARG_RAISE3,0,0},	// S_SARG_RAISE2
+    {SPR_SARG,11,5,{NULL},S_SARG_RAISE4,0,0},	// S_SARG_RAISE3
+    {SPR_SARG,10,5,{NULL},S_SARG_RAISE5,0,0},	// S_SARG_RAISE4
+    {SPR_SARG,9,5,{NULL},S_SARG_RAISE6,0,0},	// S_SARG_RAISE5
+    {SPR_SARG,8,5,{NULL},S_SARG_RUN1,0,0},	// S_SARG_RAISE6
+    {SPR_HEAD,0,10,{A_Look},S_HEAD_STND,0,0},	// S_HEAD_STND
+    {SPR_HEAD,0,3,{A_Chase},S_HEAD_RUN1,0,0},	// S_HEAD_RUN1
+    {SPR_HEAD,1,5,{A_FaceTarget},S_HEAD_ATK2,0,0},	// S_HEAD_ATK1
+    {SPR_HEAD,2,5,{A_FaceTarget},S_HEAD_ATK3,0,0},	// S_HEAD_ATK2
+    {SPR_HEAD,32771,5,{A_HeadAttack},S_HEAD_RUN1,0,0},	// S_HEAD_ATK3
+    {SPR_HEAD,4,3,{NULL},S_HEAD_PAIN2,0,0},	// S_HEAD_PAIN
+    {SPR_HEAD,4,3,{A_Pain},S_HEAD_PAIN3,0,0},	// S_HEAD_PAIN2
+    {SPR_HEAD,5,6,{NULL},S_HEAD_RUN1,0,0},	// S_HEAD_PAIN3
+    {SPR_HEAD,6,8,{NULL},S_HEAD_DIE2,0,0},	// S_HEAD_DIE1
+    {SPR_HEAD,7,8,{A_Scream},S_HEAD_DIE3,0,0},	// S_HEAD_DIE2
+    {SPR_HEAD,8,8,{NULL},S_HEAD_DIE4,0,0},	// S_HEAD_DIE3
+    {SPR_HEAD,9,8,{NULL},S_HEAD_DIE5,0,0},	// S_HEAD_DIE4
+    {SPR_HEAD,10,8,{A_Fall},S_HEAD_DIE6,0,0},	// S_HEAD_DIE5
+    {SPR_HEAD,11,-1,{NULL},S_NULL,0,0},	// S_HEAD_DIE6
+    {SPR_HEAD,11,8,{NULL},S_HEAD_RAISE2,0,0},	// S_HEAD_RAISE1
+    {SPR_HEAD,10,8,{NULL},S_HEAD_RAISE3,0,0},	// S_HEAD_RAISE2
+    {SPR_HEAD,9,8,{NULL},S_HEAD_RAISE4,0,0},	// S_HEAD_RAISE3
+    {SPR_HEAD,8,8,{NULL},S_HEAD_RAISE5,0,0},	// S_HEAD_RAISE4
+    {SPR_HEAD,7,8,{NULL},S_HEAD_RAISE6,0,0},	// S_HEAD_RAISE5
+    {SPR_HEAD,6,8,{NULL},S_HEAD_RUN1,0,0},	// S_HEAD_RAISE6
+    {SPR_BAL7,32768,4,{NULL},S_BRBALL2,0,0},	// S_BRBALL1
+    {SPR_BAL7,32769,4,{NULL},S_BRBALL1,0,0},	// S_BRBALL2
+    {SPR_BAL7,32770,6,{NULL},S_BRBALLX2,0,0},	// S_BRBALLX1
+    {SPR_BAL7,32771,6,{NULL},S_BRBALLX3,0,0},	// S_BRBALLX2
+    {SPR_BAL7,32772,6,{NULL},S_NULL,0,0},	// S_BRBALLX3
+    {SPR_BOSS,0,10,{A_Look},S_BOSS_STND2,0,0},	// S_BOSS_STND
+    {SPR_BOSS,1,10,{A_Look},S_BOSS_STND,0,0},	// S_BOSS_STND2
+    {SPR_BOSS,0,3,{A_Chase},S_BOSS_RUN2,0,0},	// S_BOSS_RUN1
+    {SPR_BOSS,0,3,{A_Chase},S_BOSS_RUN3,0,0},	// S_BOSS_RUN2
+    {SPR_BOSS,1,3,{A_Chase},S_BOSS_RUN4,0,0},	// S_BOSS_RUN3
+    {SPR_BOSS,1,3,{A_Chase},S_BOSS_RUN5,0,0},	// S_BOSS_RUN4
+    {SPR_BOSS,2,3,{A_Chase},S_BOSS_RUN6,0,0},	// S_BOSS_RUN5
+    {SPR_BOSS,2,3,{A_Chase},S_BOSS_RUN7,0,0},	// S_BOSS_RUN6
+    {SPR_BOSS,3,3,{A_Chase},S_BOSS_RUN8,0,0},	// S_BOSS_RUN7
+    {SPR_BOSS,3,3,{A_Chase},S_BOSS_RUN1,0,0},	// S_BOSS_RUN8
+    {SPR_BOSS,4,8,{A_FaceTarget},S_BOSS_ATK2,0,0},	// S_BOSS_ATK1
+    {SPR_BOSS,5,8,{A_FaceTarget},S_BOSS_ATK3,0,0},	// S_BOSS_ATK2
+    {SPR_BOSS,6,8,{A_BruisAttack},S_BOSS_RUN1,0,0},	// S_BOSS_ATK3
+    {SPR_BOSS,7,2,{NULL},S_BOSS_PAIN2,0,0},	// S_BOSS_PAIN
+    {SPR_BOSS,7,2,{A_Pain},S_BOSS_RUN1,0,0},	// S_BOSS_PAIN2
+    {SPR_BOSS,8,8,{NULL},S_BOSS_DIE2,0,0},	// S_BOSS_DIE1
+    {SPR_BOSS,9,8,{A_Scream},S_BOSS_DIE3,0,0},	// S_BOSS_DIE2
+    {SPR_BOSS,10,8,{NULL},S_BOSS_DIE4,0,0},	// S_BOSS_DIE3
+    {SPR_BOSS,11,8,{A_Fall},S_BOSS_DIE5,0,0},	// S_BOSS_DIE4
+    {SPR_BOSS,12,8,{NULL},S_BOSS_DIE6,0,0},	// S_BOSS_DIE5
+    {SPR_BOSS,13,8,{NULL},S_BOSS_DIE7,0,0},	// S_BOSS_DIE6
+    {SPR_BOSS,14,-1,{A_BossDeath},S_NULL,0,0},	// S_BOSS_DIE7
+    {SPR_BOSS,14,8,{NULL},S_BOSS_RAISE2,0,0},	// S_BOSS_RAISE1
+    {SPR_BOSS,13,8,{NULL},S_BOSS_RAISE3,0,0},	// S_BOSS_RAISE2
+    {SPR_BOSS,12,8,{NULL},S_BOSS_RAISE4,0,0},	// S_BOSS_RAISE3
+    {SPR_BOSS,11,8,{NULL},S_BOSS_RAISE5,0,0},	// S_BOSS_RAISE4
+    {SPR_BOSS,10,8,{NULL},S_BOSS_RAISE6,0,0},	// S_BOSS_RAISE5
+    {SPR_BOSS,9,8,{NULL},S_BOSS_RAISE7,0,0},	// S_BOSS_RAISE6
+    {SPR_BOSS,8,8,{NULL},S_BOSS_RUN1,0,0},	// S_BOSS_RAISE7
+    {SPR_BOS2,0,10,{A_Look},S_BOS2_STND2,0,0},	// S_BOS2_STND
+    {SPR_BOS2,1,10,{A_Look},S_BOS2_STND,0,0},	// S_BOS2_STND2
+    {SPR_BOS2,0,3,{A_Chase},S_BOS2_RUN2,0,0},	// S_BOS2_RUN1
+    {SPR_BOS2,0,3,{A_Chase},S_BOS2_RUN3,0,0},	// S_BOS2_RUN2
+    {SPR_BOS2,1,3,{A_Chase},S_BOS2_RUN4,0,0},	// S_BOS2_RUN3
+    {SPR_BOS2,1,3,{A_Chase},S_BOS2_RUN5,0,0},	// S_BOS2_RUN4
+    {SPR_BOS2,2,3,{A_Chase},S_BOS2_RUN6,0,0},	// S_BOS2_RUN5
+    {SPR_BOS2,2,3,{A_Chase},S_BOS2_RUN7,0,0},	// S_BOS2_RUN6
+    {SPR_BOS2,3,3,{A_Chase},S_BOS2_RUN8,0,0},	// S_BOS2_RUN7
+    {SPR_BOS2,3,3,{A_Chase},S_BOS2_RUN1,0,0},	// S_BOS2_RUN8
+    {SPR_BOS2,4,8,{A_FaceTarget},S_BOS2_ATK2,0,0},	// S_BOS2_ATK1
+    {SPR_BOS2,5,8,{A_FaceTarget},S_BOS2_ATK3,0,0},	// S_BOS2_ATK2
+    {SPR_BOS2,6,8,{A_BruisAttack},S_BOS2_RUN1,0,0},	// S_BOS2_ATK3
+    {SPR_BOS2,7,2,{NULL},S_BOS2_PAIN2,0,0},	// S_BOS2_PAIN
+    {SPR_BOS2,7,2,{A_Pain},S_BOS2_RUN1,0,0},	// S_BOS2_PAIN2
+    {SPR_BOS2,8,8,{NULL},S_BOS2_DIE2,0,0},	// S_BOS2_DIE1
+    {SPR_BOS2,9,8,{A_Scream},S_BOS2_DIE3,0,0},	// S_BOS2_DIE2
+    {SPR_BOS2,10,8,{NULL},S_BOS2_DIE4,0,0},	// S_BOS2_DIE3
+    {SPR_BOS2,11,8,{A_Fall},S_BOS2_DIE5,0,0},	// S_BOS2_DIE4
+    {SPR_BOS2,12,8,{NULL},S_BOS2_DIE6,0,0},	// S_BOS2_DIE5
+    {SPR_BOS2,13,8,{NULL},S_BOS2_DIE7,0,0},	// S_BOS2_DIE6
+    {SPR_BOS2,14,-1,{NULL},S_NULL,0,0},	// S_BOS2_DIE7
+    {SPR_BOS2,14,8,{NULL},S_BOS2_RAISE2,0,0},	// S_BOS2_RAISE1
+    {SPR_BOS2,13,8,{NULL},S_BOS2_RAISE3,0,0},	// S_BOS2_RAISE2
+    {SPR_BOS2,12,8,{NULL},S_BOS2_RAISE4,0,0},	// S_BOS2_RAISE3
+    {SPR_BOS2,11,8,{NULL},S_BOS2_RAISE5,0,0},	// S_BOS2_RAISE4
+    {SPR_BOS2,10,8,{NULL},S_BOS2_RAISE6,0,0},	// S_BOS2_RAISE5
+    {SPR_BOS2,9,8,{NULL},S_BOS2_RAISE7,0,0},	// S_BOS2_RAISE6
+    {SPR_BOS2,8,8,{NULL},S_BOS2_RUN1,0,0},	// S_BOS2_RAISE7
+    {SPR_SKUL,32768,10,{A_Look},S_SKULL_STND2,0,0},	// S_SKULL_STND
+    {SPR_SKUL,32769,10,{A_Look},S_SKULL_STND,0,0},	// S_SKULL_STND2
+    {SPR_SKUL,32768,6,{A_Chase},S_SKULL_RUN2,0,0},	// S_SKULL_RUN1
+    {SPR_SKUL,32769,6,{A_Chase},S_SKULL_RUN1,0,0},	// S_SKULL_RUN2
+    {SPR_SKUL,32770,10,{A_FaceTarget},S_SKULL_ATK2,0,0},	// S_SKULL_ATK1
+    {SPR_SKUL,32771,4,{A_SkullAttack},S_SKULL_ATK3,0,0},	// S_SKULL_ATK2
+    {SPR_SKUL,32770,4,{NULL},S_SKULL_ATK4,0,0},	// S_SKULL_ATK3
+    {SPR_SKUL,32771,4,{NULL},S_SKULL_ATK3,0,0},	// S_SKULL_ATK4
+    {SPR_SKUL,32772,3,{NULL},S_SKULL_PAIN2,0,0},	// S_SKULL_PAIN
+    {SPR_SKUL,32772,3,{A_Pain},S_SKULL_RUN1,0,0},	// S_SKULL_PAIN2
+    {SPR_SKUL,32773,6,{NULL},S_SKULL_DIE2,0,0},	// S_SKULL_DIE1
+    {SPR_SKUL,32774,6,{A_Scream},S_SKULL_DIE3,0,0},	// S_SKULL_DIE2
+    {SPR_SKUL,32775,6,{NULL},S_SKULL_DIE4,0,0},	// S_SKULL_DIE3
+    {SPR_SKUL,32776,6,{A_Fall},S_SKULL_DIE5,0,0},	// S_SKULL_DIE4
+    {SPR_SKUL,9,6,{NULL},S_SKULL_DIE6,0,0},	// S_SKULL_DIE5
+    {SPR_SKUL,10,6,{NULL},S_NULL,0,0},	// S_SKULL_DIE6
+    {SPR_SPID,0,10,{A_Look},S_SPID_STND2,0,0},	// S_SPID_STND
+    {SPR_SPID,1,10,{A_Look},S_SPID_STND,0,0},	// S_SPID_STND2
+    {SPR_SPID,0,3,{A_Metal},S_SPID_RUN2,0,0},	// S_SPID_RUN1
+    {SPR_SPID,0,3,{A_Chase},S_SPID_RUN3,0,0},	// S_SPID_RUN2
+    {SPR_SPID,1,3,{A_Chase},S_SPID_RUN4,0,0},	// S_SPID_RUN3
+    {SPR_SPID,1,3,{A_Chase},S_SPID_RUN5,0,0},	// S_SPID_RUN4
+    {SPR_SPID,2,3,{A_Metal},S_SPID_RUN6,0,0},	// S_SPID_RUN5
+    {SPR_SPID,2,3,{A_Chase},S_SPID_RUN7,0,0},	// S_SPID_RUN6
+    {SPR_SPID,3,3,{A_Chase},S_SPID_RUN8,0,0},	// S_SPID_RUN7
+    {SPR_SPID,3,3,{A_Chase},S_SPID_RUN9,0,0},	// S_SPID_RUN8
+    {SPR_SPID,4,3,{A_Metal},S_SPID_RUN10,0,0},	// S_SPID_RUN9
+    {SPR_SPID,4,3,{A_Chase},S_SPID_RUN11,0,0},	// S_SPID_RUN10
+    {SPR_SPID,5,3,{A_Chase},S_SPID_RUN12,0,0},	// S_SPID_RUN11
+    {SPR_SPID,5,3,{A_Chase},S_SPID_RUN1,0,0},	// S_SPID_RUN12
+    {SPR_SPID,32768,20,{A_FaceTarget},S_SPID_ATK2,0,0},	// S_SPID_ATK1
+    {SPR_SPID,32774,4,{A_SPosAttack},S_SPID_ATK3,0,0},	// S_SPID_ATK2
+    {SPR_SPID,32775,4,{A_SPosAttack},S_SPID_ATK4,0,0},	// S_SPID_ATK3
+    {SPR_SPID,32775,1,{A_SpidRefire},S_SPID_ATK2,0,0},	// S_SPID_ATK4
+    {SPR_SPID,8,3,{NULL},S_SPID_PAIN2,0,0},	// S_SPID_PAIN
+    {SPR_SPID,8,3,{A_Pain},S_SPID_RUN1,0,0},	// S_SPID_PAIN2
+    {SPR_SPID,9,20,{A_Scream},S_SPID_DIE2,0,0},	// S_SPID_DIE1
+    {SPR_SPID,10,10,{A_Fall},S_SPID_DIE3,0,0},	// S_SPID_DIE2
+    {SPR_SPID,11,10,{NULL},S_SPID_DIE4,0,0},	// S_SPID_DIE3
+    {SPR_SPID,12,10,{NULL},S_SPID_DIE5,0,0},	// S_SPID_DIE4
+    {SPR_SPID,13,10,{NULL},S_SPID_DIE6,0,0},	// S_SPID_DIE5
+    {SPR_SPID,14,10,{NULL},S_SPID_DIE7,0,0},	// S_SPID_DIE6
+    {SPR_SPID,15,10,{NULL},S_SPID_DIE8,0,0},	// S_SPID_DIE7
+    {SPR_SPID,16,10,{NULL},S_SPID_DIE9,0,0},	// S_SPID_DIE8
+    {SPR_SPID,17,10,{NULL},S_SPID_DIE10,0,0},	// S_SPID_DIE9
+    {SPR_SPID,18,30,{NULL},S_SPID_DIE11,0,0},	// S_SPID_DIE10
+    {SPR_SPID,18,-1,{A_BossDeath},S_NULL,0,0},	// S_SPID_DIE11
+    {SPR_BSPI,0,10,{A_Look},S_BSPI_STND2,0,0},	// S_BSPI_STND
+    {SPR_BSPI,1,10,{A_Look},S_BSPI_STND,0,0},	// S_BSPI_STND2
+    {SPR_BSPI,0,20,{NULL},S_BSPI_RUN1,0,0},	// S_BSPI_SIGHT
+    {SPR_BSPI,0,3,{A_BabyMetal},S_BSPI_RUN2,0,0},	// S_BSPI_RUN1
+    {SPR_BSPI,0,3,{A_Chase},S_BSPI_RUN3,0,0},	// S_BSPI_RUN2
+    {SPR_BSPI,1,3,{A_Chase},S_BSPI_RUN4,0,0},	// S_BSPI_RUN3
+    {SPR_BSPI,1,3,{A_Chase},S_BSPI_RUN5,0,0},	// S_BSPI_RUN4
+    {SPR_BSPI,2,3,{A_Chase},S_BSPI_RUN6,0,0},	// S_BSPI_RUN5
+    {SPR_BSPI,2,3,{A_Chase},S_BSPI_RUN7,0,0},	// S_BSPI_RUN6
+    {SPR_BSPI,3,3,{A_BabyMetal},S_BSPI_RUN8,0,0},	// S_BSPI_RUN7
+    {SPR_BSPI,3,3,{A_Chase},S_BSPI_RUN9,0,0},	// S_BSPI_RUN8
+    {SPR_BSPI,4,3,{A_Chase},S_BSPI_RUN10,0,0},	// S_BSPI_RUN9
+    {SPR_BSPI,4,3,{A_Chase},S_BSPI_RUN11,0,0},	// S_BSPI_RUN10
+    {SPR_BSPI,5,3,{A_Chase},S_BSPI_RUN12,0,0},	// S_BSPI_RUN11
+    {SPR_BSPI,5,3,{A_Chase},S_BSPI_RUN1,0,0},	// S_BSPI_RUN12
+    {SPR_BSPI,32768,20,{A_FaceTarget},S_BSPI_ATK2,0,0},	// S_BSPI_ATK1
+    {SPR_BSPI,32774,4,{A_BspiAttack},S_BSPI_ATK3,0,0},	// S_BSPI_ATK2
+    {SPR_BSPI,32775,4,{NULL},S_BSPI_ATK4,0,0},	// S_BSPI_ATK3
+    {SPR_BSPI,32775,1,{A_SpidRefire},S_BSPI_ATK2,0,0},	// S_BSPI_ATK4
+    {SPR_BSPI,8,3,{NULL},S_BSPI_PAIN2,0,0},	// S_BSPI_PAIN
+    {SPR_BSPI,8,3,{A_Pain},S_BSPI_RUN1,0,0},	// S_BSPI_PAIN2
+    {SPR_BSPI,9,20,{A_Scream},S_BSPI_DIE2,0,0},	// S_BSPI_DIE1
+    {SPR_BSPI,10,7,{A_Fall},S_BSPI_DIE3,0,0},	// S_BSPI_DIE2
+    {SPR_BSPI,11,7,{NULL},S_BSPI_DIE4,0,0},	// S_BSPI_DIE3
+    {SPR_BSPI,12,7,{NULL},S_BSPI_DIE5,0,0},	// S_BSPI_DIE4
+    {SPR_BSPI,13,7,{NULL},S_BSPI_DIE6,0,0},	// S_BSPI_DIE5
+    {SPR_BSPI,14,7,{NULL},S_BSPI_DIE7,0,0},	// S_BSPI_DIE6
+    {SPR_BSPI,15,-1,{A_BossDeath},S_NULL,0,0},	// S_BSPI_DIE7
+    {SPR_BSPI,15,5,{NULL},S_BSPI_RAISE2,0,0},	// S_BSPI_RAISE1
+    {SPR_BSPI,14,5,{NULL},S_BSPI_RAISE3,0,0},	// S_BSPI_RAISE2
+    {SPR_BSPI,13,5,{NULL},S_BSPI_RAISE4,0,0},	// S_BSPI_RAISE3
+    {SPR_BSPI,12,5,{NULL},S_BSPI_RAISE5,0,0},	// S_BSPI_RAISE4
+    {SPR_BSPI,11,5,{NULL},S_BSPI_RAISE6,0,0},	// S_BSPI_RAISE5
+    {SPR_BSPI,10,5,{NULL},S_BSPI_RAISE7,0,0},	// S_BSPI_RAISE6
+    {SPR_BSPI,9,5,{NULL},S_BSPI_RUN1,0,0},	// S_BSPI_RAISE7
+    {SPR_APLS,32768,5,{NULL},S_ARACH_PLAZ2,0,0},	// S_ARACH_PLAZ
+    {SPR_APLS,32769,5,{NULL},S_ARACH_PLAZ,0,0},	// S_ARACH_PLAZ2
+    {SPR_APBX,32768,5,{NULL},S_ARACH_PLEX2,0,0},	// S_ARACH_PLEX
+    {SPR_APBX,32769,5,{NULL},S_ARACH_PLEX3,0,0},	// S_ARACH_PLEX2
+    {SPR_APBX,32770,5,{NULL},S_ARACH_PLEX4,0,0},	// S_ARACH_PLEX3
+    {SPR_APBX,32771,5,{NULL},S_ARACH_PLEX5,0,0},	// S_ARACH_PLEX4
+    {SPR_APBX,32772,5,{NULL},S_NULL,0,0},	// S_ARACH_PLEX5
+    {SPR_CYBR,0,10,{A_Look},S_CYBER_STND2,0,0},	// S_CYBER_STND
+    {SPR_CYBR,1,10,{A_Look},S_CYBER_STND,0,0},	// S_CYBER_STND2
+    {SPR_CYBR,0,3,{A_Hoof},S_CYBER_RUN2,0,0},	// S_CYBER_RUN1
+    {SPR_CYBR,0,3,{A_Chase},S_CYBER_RUN3,0,0},	// S_CYBER_RUN2
+    {SPR_CYBR,1,3,{A_Chase},S_CYBER_RUN4,0,0},	// S_CYBER_RUN3
+    {SPR_CYBR,1,3,{A_Chase},S_CYBER_RUN5,0,0},	// S_CYBER_RUN4
+    {SPR_CYBR,2,3,{A_Chase},S_CYBER_RUN6,0,0},	// S_CYBER_RUN5
+    {SPR_CYBR,2,3,{A_Chase},S_CYBER_RUN7,0,0},	// S_CYBER_RUN6
+    {SPR_CYBR,3,3,{A_Metal},S_CYBER_RUN8,0,0},	// S_CYBER_RUN7
+    {SPR_CYBR,3,3,{A_Chase},S_CYBER_RUN1,0,0},	// S_CYBER_RUN8
+    {SPR_CYBR,4,6,{A_FaceTarget},S_CYBER_ATK2,0,0},	// S_CYBER_ATK1
+    {SPR_CYBR,5,12,{A_CyberAttack},S_CYBER_ATK3,0,0},	// S_CYBER_ATK2
+    {SPR_CYBR,4,12,{A_FaceTarget},S_CYBER_ATK4,0,0},	// S_CYBER_ATK3
+    {SPR_CYBR,5,12,{A_CyberAttack},S_CYBER_ATK5,0,0},	// S_CYBER_ATK4
+    {SPR_CYBR,4,12,{A_FaceTarget},S_CYBER_ATK6,0,0},	// S_CYBER_ATK5
+    {SPR_CYBR,5,12,{A_CyberAttack},S_CYBER_RUN1,0,0},	// S_CYBER_ATK6
+    {SPR_CYBR,6,10,{A_Pain},S_CYBER_RUN1,0,0},	// S_CYBER_PAIN
+    {SPR_CYBR,7,10,{NULL},S_CYBER_DIE2,0,0},	// S_CYBER_DIE1
+    {SPR_CYBR,8,10,{A_Scream},S_CYBER_DIE3,0,0},	// S_CYBER_DIE2
+    {SPR_CYBR,9,10,{NULL},S_CYBER_DIE4,0,0},	// S_CYBER_DIE3
+    {SPR_CYBR,10,10,{NULL},S_CYBER_DIE5,0,0},	// S_CYBER_DIE4
+    {SPR_CYBR,11,10,{NULL},S_CYBER_DIE6,0,0},	// S_CYBER_DIE5
+    {SPR_CYBR,12,10,{A_Fall},S_CYBER_DIE7,0,0},	// S_CYBER_DIE6
+    {SPR_CYBR,13,10,{NULL},S_CYBER_DIE8,0,0},	// S_CYBER_DIE7
+    {SPR_CYBR,14,10,{NULL},S_CYBER_DIE9,0,0},	// S_CYBER_DIE8
+    {SPR_CYBR,15,30,{NULL},S_CYBER_DIE10,0,0},	// S_CYBER_DIE9
+    {SPR_CYBR,15,-1,{A_BossDeath},S_NULL,0,0},	// S_CYBER_DIE10
+    {SPR_PAIN,0,10,{A_Look},S_PAIN_STND,0,0},	// S_PAIN_STND
+    {SPR_PAIN,0,3,{A_Chase},S_PAIN_RUN2,0,0},	// S_PAIN_RUN1
+    {SPR_PAIN,0,3,{A_Chase},S_PAIN_RUN3,0,0},	// S_PAIN_RUN2
+    {SPR_PAIN,1,3,{A_Chase},S_PAIN_RUN4,0,0},	// S_PAIN_RUN3
+    {SPR_PAIN,1,3,{A_Chase},S_PAIN_RUN5,0,0},	// S_PAIN_RUN4
+    {SPR_PAIN,2,3,{A_Chase},S_PAIN_RUN6,0,0},	// S_PAIN_RUN5
+    {SPR_PAIN,2,3,{A_Chase},S_PAIN_RUN1,0,0},	// S_PAIN_RUN6
+    {SPR_PAIN,3,5,{A_FaceTarget},S_PAIN_ATK2,0,0},	// S_PAIN_ATK1
+    {SPR_PAIN,4,5,{A_FaceTarget},S_PAIN_ATK3,0,0},	// S_PAIN_ATK2
+    {SPR_PAIN,32773,5,{A_FaceTarget},S_PAIN_ATK4,0,0},	// S_PAIN_ATK3
+    {SPR_PAIN,32773,0,{A_PainAttack},S_PAIN_RUN1,0,0},	// S_PAIN_ATK4
+    {SPR_PAIN,6,6,{NULL},S_PAIN_PAIN2,0,0},	// S_PAIN_PAIN
+    {SPR_PAIN,6,6,{A_Pain},S_PAIN_RUN1,0,0},	// S_PAIN_PAIN2
+    {SPR_PAIN,32775,8,{NULL},S_PAIN_DIE2,0,0},	// S_PAIN_DIE1
+    {SPR_PAIN,32776,8,{A_Scream},S_PAIN_DIE3,0,0},	// S_PAIN_DIE2
+    {SPR_PAIN,32777,8,{NULL},S_PAIN_DIE4,0,0},	// S_PAIN_DIE3
+    {SPR_PAIN,32778,8,{NULL},S_PAIN_DIE5,0,0},	// S_PAIN_DIE4
+    {SPR_PAIN,32779,8,{A_PainDie},S_PAIN_DIE6,0,0},	// S_PAIN_DIE5
+    {SPR_PAIN,32780,8,{NULL},S_NULL,0,0},	// S_PAIN_DIE6
+    {SPR_PAIN,12,8,{NULL},S_PAIN_RAISE2,0,0},	// S_PAIN_RAISE1
+    {SPR_PAIN,11,8,{NULL},S_PAIN_RAISE3,0,0},	// S_PAIN_RAISE2
+    {SPR_PAIN,10,8,{NULL},S_PAIN_RAISE4,0,0},	// S_PAIN_RAISE3
+    {SPR_PAIN,9,8,{NULL},S_PAIN_RAISE5,0,0},	// S_PAIN_RAISE4
+    {SPR_PAIN,8,8,{NULL},S_PAIN_RAISE6,0,0},	// S_PAIN_RAISE5
+    {SPR_PAIN,7,8,{NULL},S_PAIN_RUN1,0,0},	// S_PAIN_RAISE6
+    {SPR_SSWV,0,10,{A_Look},S_SSWV_STND2,0,0},	// S_SSWV_STND
+    {SPR_SSWV,1,10,{A_Look},S_SSWV_STND,0,0},	// S_SSWV_STND2
+    {SPR_SSWV,0,3,{A_Chase},S_SSWV_RUN2,0,0},	// S_SSWV_RUN1
+    {SPR_SSWV,0,3,{A_Chase},S_SSWV_RUN3,0,0},	// S_SSWV_RUN2
+    {SPR_SSWV,1,3,{A_Chase},S_SSWV_RUN4,0,0},	// S_SSWV_RUN3
+    {SPR_SSWV,1,3,{A_Chase},S_SSWV_RUN5,0,0},	// S_SSWV_RUN4
+    {SPR_SSWV,2,3,{A_Chase},S_SSWV_RUN6,0,0},	// S_SSWV_RUN5
+    {SPR_SSWV,2,3,{A_Chase},S_SSWV_RUN7,0,0},	// S_SSWV_RUN6
+    {SPR_SSWV,3,3,{A_Chase},S_SSWV_RUN8,0,0},	// S_SSWV_RUN7
+    {SPR_SSWV,3,3,{A_Chase},S_SSWV_RUN1,0,0},	// S_SSWV_RUN8
+    {SPR_SSWV,4,10,{A_FaceTarget},S_SSWV_ATK2,0,0},	// S_SSWV_ATK1
+    {SPR_SSWV,5,10,{A_FaceTarget},S_SSWV_ATK3,0,0},	// S_SSWV_ATK2
+    {SPR_SSWV,32774,4,{A_CPosAttack},S_SSWV_ATK4,0,0},	// S_SSWV_ATK3
+    {SPR_SSWV,5,6,{A_FaceTarget},S_SSWV_ATK5,0,0},	// S_SSWV_ATK4
+    {SPR_SSWV,32774,4,{A_CPosAttack},S_SSWV_ATK6,0,0},	// S_SSWV_ATK5
+    {SPR_SSWV,5,1,{A_CPosRefire},S_SSWV_ATK2,0,0},	// S_SSWV_ATK6
+    {SPR_SSWV,7,3,{NULL},S_SSWV_PAIN2,0,0},	// S_SSWV_PAIN
+    {SPR_SSWV,7,3,{A_Pain},S_SSWV_RUN1,0,0},	// S_SSWV_PAIN2
+    {SPR_SSWV,8,5,{NULL},S_SSWV_DIE2,0,0},	// S_SSWV_DIE1
+    {SPR_SSWV,9,5,{A_Scream},S_SSWV_DIE3,0,0},	// S_SSWV_DIE2
+    {SPR_SSWV,10,5,{A_Fall},S_SSWV_DIE4,0,0},	// S_SSWV_DIE3
+    {SPR_SSWV,11,5,{NULL},S_SSWV_DIE5,0,0},	// S_SSWV_DIE4
+    {SPR_SSWV,12,-1,{NULL},S_NULL,0,0},	// S_SSWV_DIE5
+    {SPR_SSWV,13,5,{NULL},S_SSWV_XDIE2,0,0},	// S_SSWV_XDIE1
+    {SPR_SSWV,14,5,{A_XScream},S_SSWV_XDIE3,0,0},	// S_SSWV_XDIE2
+    {SPR_SSWV,15,5,{A_Fall},S_SSWV_XDIE4,0,0},	// S_SSWV_XDIE3
+    {SPR_SSWV,16,5,{NULL},S_SSWV_XDIE5,0,0},	// S_SSWV_XDIE4
+    {SPR_SSWV,17,5,{NULL},S_SSWV_XDIE6,0,0},	// S_SSWV_XDIE5
+    {SPR_SSWV,18,5,{NULL},S_SSWV_XDIE7,0,0},	// S_SSWV_XDIE6
+    {SPR_SSWV,19,5,{NULL},S_SSWV_XDIE8,0,0},	// S_SSWV_XDIE7
+    {SPR_SSWV,20,5,{NULL},S_SSWV_XDIE9,0,0},	// S_SSWV_XDIE8
+    {SPR_SSWV,21,-1,{NULL},S_NULL,0,0},	// S_SSWV_XDIE9
+    {SPR_SSWV,12,5,{NULL},S_SSWV_RAISE2,0,0},	// S_SSWV_RAISE1
+    {SPR_SSWV,11,5,{NULL},S_SSWV_RAISE3,0,0},	// S_SSWV_RAISE2
+    {SPR_SSWV,10,5,{NULL},S_SSWV_RAISE4,0,0},	// S_SSWV_RAISE3
+    {SPR_SSWV,9,5,{NULL},S_SSWV_RAISE5,0,0},	// S_SSWV_RAISE4
+    {SPR_SSWV,8,5,{NULL},S_SSWV_RUN1,0,0},	// S_SSWV_RAISE5
+    {SPR_KEEN,0,-1,{NULL},S_KEENSTND,0,0},	// S_KEENSTND
+    {SPR_KEEN,0,6,{NULL},S_COMMKEEN2,0,0},	// S_COMMKEEN
+    {SPR_KEEN,1,6,{NULL},S_COMMKEEN3,0,0},	// S_COMMKEEN2
+    {SPR_KEEN,2,6,{A_Scream},S_COMMKEEN4,0,0},	// S_COMMKEEN3
+    {SPR_KEEN,3,6,{NULL},S_COMMKEEN5,0,0},	// S_COMMKEEN4
+    {SPR_KEEN,4,6,{NULL},S_COMMKEEN6,0,0},	// S_COMMKEEN5
+    {SPR_KEEN,5,6,{NULL},S_COMMKEEN7,0,0},	// S_COMMKEEN6
+    {SPR_KEEN,6,6,{NULL},S_COMMKEEN8,0,0},	// S_COMMKEEN7
+    {SPR_KEEN,7,6,{NULL},S_COMMKEEN9,0,0},	// S_COMMKEEN8
+    {SPR_KEEN,8,6,{NULL},S_COMMKEEN10,0,0},	// S_COMMKEEN9
+    {SPR_KEEN,9,6,{NULL},S_COMMKEEN11,0,0},	// S_COMMKEEN10
+    {SPR_KEEN,10,6,{A_KeenDie},S_COMMKEEN12,0,0},// S_COMMKEEN11
+    {SPR_KEEN,11,-1,{NULL},S_NULL,0,0},		// S_COMMKEEN12
+    {SPR_KEEN,12,4,{NULL},S_KEENPAIN2,0,0},	// S_KEENPAIN
+    {SPR_KEEN,12,8,{A_Pain},S_KEENSTND,0,0},	// S_KEENPAIN2
+    {SPR_BBRN,0,-1,{NULL},S_NULL,0,0},		// S_BRAIN
+    {SPR_BBRN,1,36,{A_BrainPain},S_BRAIN,0,0},	// S_BRAIN_PAIN
+    {SPR_BBRN,0,100,{A_BrainScream},S_BRAIN_DIE2,0,0},	// S_BRAIN_DIE1
+    {SPR_BBRN,0,10,{NULL},S_BRAIN_DIE3,0,0},	// S_BRAIN_DIE2
+    {SPR_BBRN,0,10,{NULL},S_BRAIN_DIE4,0,0},	// S_BRAIN_DIE3
+    {SPR_BBRN,0,-1,{A_BrainDie},S_NULL,0,0},	// S_BRAIN_DIE4
+    {SPR_SSWV,0,10,{A_Look},S_BRAINEYE,0,0},	// S_BRAINEYE
+    {SPR_SSWV,0,181,{A_BrainAwake},S_BRAINEYE1,0,0},	// S_BRAINEYESEE
+    {SPR_SSWV,0,150,{A_BrainSpit},S_BRAINEYE1,0,0},	// S_BRAINEYE1
+    {SPR_BOSF,32768,3,{A_SpawnSound},S_SPAWN2,0,0},	// S_SPAWN1
+    {SPR_BOSF,32769,3,{A_SpawnFly},S_SPAWN3,0,0},	// S_SPAWN2
+    {SPR_BOSF,32770,3,{A_SpawnFly},S_SPAWN4,0,0},	// S_SPAWN3
+    {SPR_BOSF,32771,3,{A_SpawnFly},S_SPAWN1,0,0},	// S_SPAWN4
+    {SPR_FIRE,32768,4,{A_Fire},S_SPAWNFIRE2,0,0},	// S_SPAWNFIRE1
+    {SPR_FIRE,32769,4,{A_Fire},S_SPAWNFIRE3,0,0},	// S_SPAWNFIRE2
+    {SPR_FIRE,32770,4,{A_Fire},S_SPAWNFIRE4,0,0},	// S_SPAWNFIRE3
+    {SPR_FIRE,32771,4,{A_Fire},S_SPAWNFIRE5,0,0},	// S_SPAWNFIRE4
+    {SPR_FIRE,32772,4,{A_Fire},S_SPAWNFIRE6,0,0},	// S_SPAWNFIRE5
+    {SPR_FIRE,32773,4,{A_Fire},S_SPAWNFIRE7,0,0},	// S_SPAWNFIRE6
+    {SPR_FIRE,32774,4,{A_Fire},S_SPAWNFIRE8,0,0},	// S_SPAWNFIRE7
+    {SPR_FIRE,32775,4,{A_Fire},S_NULL,0,0},		// S_SPAWNFIRE8
+    {SPR_MISL,32769,10,{NULL},S_BRAINEXPLODE2,0,0},	// S_BRAINEXPLODE1
+    {SPR_MISL,32770,10,{NULL},S_BRAINEXPLODE3,0,0},	// S_BRAINEXPLODE2
+    {SPR_MISL,32771,10,{A_BrainExplode},S_NULL,0,0},	// S_BRAINEXPLODE3
+    {SPR_ARM1,0,6,{NULL},S_ARM1A,0,0},	// S_ARM1
+    {SPR_ARM1,32769,7,{NULL},S_ARM1,0,0},	// S_ARM1A
+    {SPR_ARM2,0,6,{NULL},S_ARM2A,0,0},	// S_ARM2
+    {SPR_ARM2,32769,6,{NULL},S_ARM2,0,0},	// S_ARM2A
+    {SPR_BAR1,0,6,{NULL},S_BAR2,0,0},	// S_BAR1
+    {SPR_BAR1,1,6,{NULL},S_BAR1,0,0},	// S_BAR2
+    {SPR_BEXP,32768,5,{NULL},S_BEXP2,0,0},	// S_BEXP
+    {SPR_BEXP,32769,5,{A_Scream},S_BEXP3,0,0},	// S_BEXP2
+    {SPR_BEXP,32770,5,{NULL},S_BEXP4,0,0},	// S_BEXP3
+    {SPR_BEXP,32771,10,{A_Explode},S_BEXP5,0,0},	// S_BEXP4
+    {SPR_BEXP,32772,10,{NULL},S_NULL,0,0},	// S_BEXP5
+    {SPR_FCAN,32768,4,{NULL},S_BBAR2,0,0},	// S_BBAR1
+    {SPR_FCAN,32769,4,{NULL},S_BBAR3,0,0},	// S_BBAR2
+    {SPR_FCAN,32770,4,{NULL},S_BBAR1,0,0},	// S_BBAR3
+    {SPR_BON1,0,6,{NULL},S_BON1A,0,0},	// S_BON1
+    {SPR_BON1,1,6,{NULL},S_BON1B,0,0},	// S_BON1A
+    {SPR_BON1,2,6,{NULL},S_BON1C,0,0},	// S_BON1B
+    {SPR_BON1,3,6,{NULL},S_BON1D,0,0},	// S_BON1C
+    {SPR_BON1,2,6,{NULL},S_BON1E,0,0},	// S_BON1D
+    {SPR_BON1,1,6,{NULL},S_BON1,0,0},	// S_BON1E
+    {SPR_BON2,0,6,{NULL},S_BON2A,0,0},	// S_BON2
+    {SPR_BON2,1,6,{NULL},S_BON2B,0,0},	// S_BON2A
+    {SPR_BON2,2,6,{NULL},S_BON2C,0,0},	// S_BON2B
+    {SPR_BON2,3,6,{NULL},S_BON2D,0,0},	// S_BON2C
+    {SPR_BON2,2,6,{NULL},S_BON2E,0,0},	// S_BON2D
+    {SPR_BON2,1,6,{NULL},S_BON2,0,0},	// S_BON2E
+    {SPR_BKEY,0,10,{NULL},S_BKEY2,0,0},	// S_BKEY
+    {SPR_BKEY,32769,10,{NULL},S_BKEY,0,0},	// S_BKEY2
+    {SPR_RKEY,0,10,{NULL},S_RKEY2,0,0},	// S_RKEY
+    {SPR_RKEY,32769,10,{NULL},S_RKEY,0,0},	// S_RKEY2
+    {SPR_YKEY,0,10,{NULL},S_YKEY2,0,0},	// S_YKEY
+    {SPR_YKEY,32769,10,{NULL},S_YKEY,0,0},	// S_YKEY2
+    {SPR_BSKU,0,10,{NULL},S_BSKULL2,0,0},	// S_BSKULL
+    {SPR_BSKU,32769,10,{NULL},S_BSKULL,0,0},	// S_BSKULL2
+    {SPR_RSKU,0,10,{NULL},S_RSKULL2,0,0},	// S_RSKULL
+    {SPR_RSKU,32769,10,{NULL},S_RSKULL,0,0},	// S_RSKULL2
+    {SPR_YSKU,0,10,{NULL},S_YSKULL2,0,0},	// S_YSKULL
+    {SPR_YSKU,32769,10,{NULL},S_YSKULL,0,0},	// S_YSKULL2
+    {SPR_STIM,0,-1,{NULL},S_NULL,0,0},	// S_STIM
+    {SPR_MEDI,0,-1,{NULL},S_NULL,0,0},	// S_MEDI
+    {SPR_SOUL,32768,6,{NULL},S_SOUL2,0,0},	// S_SOUL
+    {SPR_SOUL,32769,6,{NULL},S_SOUL3,0,0},	// S_SOUL2
+    {SPR_SOUL,32770,6,{NULL},S_SOUL4,0,0},	// S_SOUL3
+    {SPR_SOUL,32771,6,{NULL},S_SOUL5,0,0},	// S_SOUL4
+    {SPR_SOUL,32770,6,{NULL},S_SOUL6,0,0},	// S_SOUL5
+    {SPR_SOUL,32769,6,{NULL},S_SOUL,0,0},	// S_SOUL6
+    {SPR_PINV,32768,6,{NULL},S_PINV2,0,0},	// S_PINV
+    {SPR_PINV,32769,6,{NULL},S_PINV3,0,0},	// S_PINV2
+    {SPR_PINV,32770,6,{NULL},S_PINV4,0,0},	// S_PINV3
+    {SPR_PINV,32771,6,{NULL},S_PINV,0,0},	// S_PINV4
+    {SPR_PSTR,32768,-1,{NULL},S_NULL,0,0},	// S_PSTR
+    {SPR_PINS,32768,6,{NULL},S_PINS2,0,0},	// S_PINS
+    {SPR_PINS,32769,6,{NULL},S_PINS3,0,0},	// S_PINS2
+    {SPR_PINS,32770,6,{NULL},S_PINS4,0,0},	// S_PINS3
+    {SPR_PINS,32771,6,{NULL},S_PINS,0,0},	// S_PINS4
+    {SPR_MEGA,32768,6,{NULL},S_MEGA2,0,0},	// S_MEGA
+    {SPR_MEGA,32769,6,{NULL},S_MEGA3,0,0},	// S_MEGA2
+    {SPR_MEGA,32770,6,{NULL},S_MEGA4,0,0},	// S_MEGA3
+    {SPR_MEGA,32771,6,{NULL},S_MEGA,0,0},	// S_MEGA4
+    {SPR_SUIT,32768,-1,{NULL},S_NULL,0,0},	// S_SUIT
+    {SPR_PMAP,32768,6,{NULL},S_PMAP2,0,0},	// S_PMAP
+    {SPR_PMAP,32769,6,{NULL},S_PMAP3,0,0},	// S_PMAP2
+    {SPR_PMAP,32770,6,{NULL},S_PMAP4,0,0},	// S_PMAP3
+    {SPR_PMAP,32771,6,{NULL},S_PMAP5,0,0},	// S_PMAP4
+    {SPR_PMAP,32770,6,{NULL},S_PMAP6,0,0},	// S_PMAP5
+    {SPR_PMAP,32769,6,{NULL},S_PMAP,0,0},	// S_PMAP6
+    {SPR_PVIS,32768,6,{NULL},S_PVIS2,0,0},	// S_PVIS
+    {SPR_PVIS,1,6,{NULL},S_PVIS,0,0},	// S_PVIS2
+    {SPR_CLIP,0,-1,{NULL},S_NULL,0,0},	// S_CLIP
+    {SPR_AMMO,0,-1,{NULL},S_NULL,0,0},	// S_AMMO
+    {SPR_ROCK,0,-1,{NULL},S_NULL,0,0},	// S_ROCK
+    {SPR_BROK,0,-1,{NULL},S_NULL,0,0},	// S_BROK
+    {SPR_CELL,0,-1,{NULL},S_NULL,0,0},	// S_CELL
+    {SPR_CELP,0,-1,{NULL},S_NULL,0,0},	// S_CELP
+    {SPR_SHEL,0,-1,{NULL},S_NULL,0,0},	// S_SHEL
+    {SPR_SBOX,0,-1,{NULL},S_NULL,0,0},	// S_SBOX
+    {SPR_BPAK,0,-1,{NULL},S_NULL,0,0},	// S_BPAK
+    {SPR_BFUG,0,-1,{NULL},S_NULL,0,0},	// S_BFUG
+    {SPR_MGUN,0,-1,{NULL},S_NULL,0,0},	// S_MGUN
+    {SPR_CSAW,0,-1,{NULL},S_NULL,0,0},	// S_CSAW
+    {SPR_LAUN,0,-1,{NULL},S_NULL,0,0},	// S_LAUN
+    {SPR_PLAS,0,-1,{NULL},S_NULL,0,0},	// S_PLAS
+    {SPR_SHOT,0,-1,{NULL},S_NULL,0,0},	// S_SHOT
+    {SPR_SGN2,0,-1,{NULL},S_NULL,0,0},	// S_SHOT2
+    {SPR_COLU,32768,-1,{NULL},S_NULL,0,0},	// S_COLU
+    {SPR_SMT2,0,-1,{NULL},S_NULL,0,0},	// S_STALAG
+    {SPR_GOR1,0,10,{NULL},S_BLOODYTWITCH2,0,0},	// S_BLOODYTWITCH
+    {SPR_GOR1,1,15,{NULL},S_BLOODYTWITCH3,0,0},	// S_BLOODYTWITCH2
+    {SPR_GOR1,2,8,{NULL},S_BLOODYTWITCH4,0,0},	// S_BLOODYTWITCH3
+    {SPR_GOR1,1,6,{NULL},S_BLOODYTWITCH,0,0},	// S_BLOODYTWITCH4
+    {SPR_PLAY,13,-1,{NULL},S_NULL,0,0},	// S_DEADTORSO
+    {SPR_PLAY,18,-1,{NULL},S_NULL,0,0},	// S_DEADBOTTOM
+    {SPR_POL2,0,-1,{NULL},S_NULL,0,0},	// S_HEADSONSTICK
+    {SPR_POL5,0,-1,{NULL},S_NULL,0,0},	// S_GIBS
+    {SPR_POL4,0,-1,{NULL},S_NULL,0,0},	// S_HEADONASTICK
+    {SPR_POL3,32768,6,{NULL},S_HEADCANDLES2,0,0},	// S_HEADCANDLES
+    {SPR_POL3,32769,6,{NULL},S_HEADCANDLES,0,0},	// S_HEADCANDLES2
+    {SPR_POL1,0,-1,{NULL},S_NULL,0,0},	// S_DEADSTICK
+    {SPR_POL6,0,6,{NULL},S_LIVESTICK2,0,0},	// S_LIVESTICK
+    {SPR_POL6,1,8,{NULL},S_LIVESTICK,0,0},	// S_LIVESTICK2
+    {SPR_GOR2,0,-1,{NULL},S_NULL,0,0},	// S_MEAT2
+    {SPR_GOR3,0,-1,{NULL},S_NULL,0,0},	// S_MEAT3
+    {SPR_GOR4,0,-1,{NULL},S_NULL,0,0},	// S_MEAT4
+    {SPR_GOR5,0,-1,{NULL},S_NULL,0,0},	// S_MEAT5
+    {SPR_SMIT,0,-1,{NULL},S_NULL,0,0},	// S_STALAGTITE
+    {SPR_COL1,0,-1,{NULL},S_NULL,0,0},	// S_TALLGRNCOL
+    {SPR_COL2,0,-1,{NULL},S_NULL,0,0},	// S_SHRTGRNCOL
+    {SPR_COL3,0,-1,{NULL},S_NULL,0,0},	// S_TALLREDCOL
+    {SPR_COL4,0,-1,{NULL},S_NULL,0,0},	// S_SHRTREDCOL
+    {SPR_CAND,32768,-1,{NULL},S_NULL,0,0},	// S_CANDLESTIK
+    {SPR_CBRA,32768,-1,{NULL},S_NULL,0,0},	// S_CANDELABRA
+    {SPR_COL6,0,-1,{NULL},S_NULL,0,0},	// S_SKULLCOL
+    {SPR_TRE1,0,-1,{NULL},S_NULL,0,0},	// S_TORCHTREE
+    {SPR_TRE2,0,-1,{NULL},S_NULL,0,0},	// S_BIGTREE
+    {SPR_ELEC,0,-1,{NULL},S_NULL,0,0},	// S_TECHPILLAR
+    {SPR_CEYE,32768,6,{NULL},S_EVILEYE2,0,0},	// S_EVILEYE
+    {SPR_CEYE,32769,6,{NULL},S_EVILEYE3,0,0},	// S_EVILEYE2
+    {SPR_CEYE,32770,6,{NULL},S_EVILEYE4,0,0},	// S_EVILEYE3
+    {SPR_CEYE,32769,6,{NULL},S_EVILEYE,0,0},	// S_EVILEYE4
+    {SPR_FSKU,32768,6,{NULL},S_FLOATSKULL2,0,0},	// S_FLOATSKULL
+    {SPR_FSKU,32769,6,{NULL},S_FLOATSKULL3,0,0},	// S_FLOATSKULL2
+    {SPR_FSKU,32770,6,{NULL},S_FLOATSKULL,0,0},	// S_FLOATSKULL3
+    {SPR_COL5,0,14,{NULL},S_HEARTCOL2,0,0},	// S_HEARTCOL
+    {SPR_COL5,1,14,{NULL},S_HEARTCOL,0,0},	// S_HEARTCOL2
+    {SPR_TBLU,32768,4,{NULL},S_BLUETORCH2,0,0},	// S_BLUETORCH
+    {SPR_TBLU,32769,4,{NULL},S_BLUETORCH3,0,0},	// S_BLUETORCH2
+    {SPR_TBLU,32770,4,{NULL},S_BLUETORCH4,0,0},	// S_BLUETORCH3
+    {SPR_TBLU,32771,4,{NULL},S_BLUETORCH,0,0},	// S_BLUETORCH4
+    {SPR_TGRN,32768,4,{NULL},S_GREENTORCH2,0,0},	// S_GREENTORCH
+    {SPR_TGRN,32769,4,{NULL},S_GREENTORCH3,0,0},	// S_GREENTORCH2
+    {SPR_TGRN,32770,4,{NULL},S_GREENTORCH4,0,0},	// S_GREENTORCH3
+    {SPR_TGRN,32771,4,{NULL},S_GREENTORCH,0,0},	// S_GREENTORCH4
+    {SPR_TRED,32768,4,{NULL},S_REDTORCH2,0,0},	// S_REDTORCH
+    {SPR_TRED,32769,4,{NULL},S_REDTORCH3,0,0},	// S_REDTORCH2
+    {SPR_TRED,32770,4,{NULL},S_REDTORCH4,0,0},	// S_REDTORCH3
+    {SPR_TRED,32771,4,{NULL},S_REDTORCH,0,0},	// S_REDTORCH4
+    {SPR_SMBT,32768,4,{NULL},S_BTORCHSHRT2,0,0},	// S_BTORCHSHRT
+    {SPR_SMBT,32769,4,{NULL},S_BTORCHSHRT3,0,0},	// S_BTORCHSHRT2
+    {SPR_SMBT,32770,4,{NULL},S_BTORCHSHRT4,0,0},	// S_BTORCHSHRT3
+    {SPR_SMBT,32771,4,{NULL},S_BTORCHSHRT,0,0},	// S_BTORCHSHRT4
+    {SPR_SMGT,32768,4,{NULL},S_GTORCHSHRT2,0,0},	// S_GTORCHSHRT
+    {SPR_SMGT,32769,4,{NULL},S_GTORCHSHRT3,0,0},	// S_GTORCHSHRT2
+    {SPR_SMGT,32770,4,{NULL},S_GTORCHSHRT4,0,0},	// S_GTORCHSHRT3
+    {SPR_SMGT,32771,4,{NULL},S_GTORCHSHRT,0,0},	// S_GTORCHSHRT4
+    {SPR_SMRT,32768,4,{NULL},S_RTORCHSHRT2,0,0},	// S_RTORCHSHRT
+    {SPR_SMRT,32769,4,{NULL},S_RTORCHSHRT3,0,0},	// S_RTORCHSHRT2
+    {SPR_SMRT,32770,4,{NULL},S_RTORCHSHRT4,0,0},	// S_RTORCHSHRT3
+    {SPR_SMRT,32771,4,{NULL},S_RTORCHSHRT,0,0},	// S_RTORCHSHRT4
+    {SPR_HDB1,0,-1,{NULL},S_NULL,0,0},	// S_HANGNOGUTS
+    {SPR_HDB2,0,-1,{NULL},S_NULL,0,0},	// S_HANGBNOBRAIN
+    {SPR_HDB3,0,-1,{NULL},S_NULL,0,0},	// S_HANGTLOOKDN
+    {SPR_HDB4,0,-1,{NULL},S_NULL,0,0},	// S_HANGTSKULL
+    {SPR_HDB5,0,-1,{NULL},S_NULL,0,0},	// S_HANGTLOOKUP
+    {SPR_HDB6,0,-1,{NULL},S_NULL,0,0},	// S_HANGTNOBRAIN
+    {SPR_POB1,0,-1,{NULL},S_NULL,0,0},	// S_COLONGIBS
+    {SPR_POB2,0,-1,{NULL},S_NULL,0,0},	// S_SMALLPOOL
+    {SPR_BRS1,0,-1,{NULL},S_NULL,0,0},		// S_BRAINSTEM
+    {SPR_TLMP,32768,4,{NULL},S_TECHLAMP2,0,0},	// S_TECHLAMP
+    {SPR_TLMP,32769,4,{NULL},S_TECHLAMP3,0,0},	// S_TECHLAMP2
+    {SPR_TLMP,32770,4,{NULL},S_TECHLAMP4,0,0},	// S_TECHLAMP3
+    {SPR_TLMP,32771,4,{NULL},S_TECHLAMP,0,0},	// S_TECHLAMP4
+    {SPR_TLP2,32768,4,{NULL},S_TECH2LAMP2,0,0},	// S_TECH2LAMP
+    {SPR_TLP2,32769,4,{NULL},S_TECH2LAMP3,0,0},	// S_TECH2LAMP2
+    {SPR_TLP2,32770,4,{NULL},S_TECH2LAMP4,0,0},	// S_TECH2LAMP3
+    {SPR_TLP2,32771,4,{NULL},S_TECH2LAMP,0,0}	// S_TECH2LAMP4
+};
+
+
+mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
+
+    {		// MT_PLAYER
+	-1,		// doomednum
+	S_PLAY,		// spawnstate
+	100,		// spawnhealth
+	S_PLAY_RUN1,		// seestate
+	sfx_None,		// seesound
+	0,		// reactiontime
+	sfx_None,		// attacksound
+	S_PLAY_PAIN,		// painstate
+	255,		// painchance
+	sfx_plpain,		// painsound
+	S_NULL,		// meleestate
+	S_PLAY_ATK1,		// missilestate
+	S_PLAY_DIE1,		// deathstate
+	S_PLAY_XDIE1,		// xdeathstate
+	sfx_pldeth,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_POSSESSED
+	3004,		// doomednum
+	S_POSS_STND,		// spawnstate
+	20,		// spawnhealth
+	S_POSS_RUN1,		// seestate
+	sfx_posit1,		// seesound
+	8,		// reactiontime
+	sfx_pistol,		// attacksound
+	S_POSS_PAIN,		// painstate
+	200,		// painchance
+	sfx_popain,		// painsound
+	0,		// meleestate
+	S_POSS_ATK1,		// missilestate
+	S_POSS_DIE1,		// deathstate
+	S_POSS_XDIE1,		// xdeathstate
+	sfx_podth1,		// deathsound
+	8,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_posact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_POSS_RAISE1		// raisestate
+    },
+
+    {		// MT_SHOTGUY
+	9,		// doomednum
+	S_SPOS_STND,		// spawnstate
+	30,		// spawnhealth
+	S_SPOS_RUN1,		// seestate
+	sfx_posit2,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_SPOS_PAIN,		// painstate
+	170,		// painchance
+	sfx_popain,		// painsound
+	0,		// meleestate
+	S_SPOS_ATK1,		// missilestate
+	S_SPOS_DIE1,		// deathstate
+	S_SPOS_XDIE1,		// xdeathstate
+	sfx_podth2,		// deathsound
+	8,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_posact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_SPOS_RAISE1		// raisestate
+    },
+
+    {		// MT_VILE
+	64,		// doomednum
+	S_VILE_STND,		// spawnstate
+	700,		// spawnhealth
+	S_VILE_RUN1,		// seestate
+	sfx_vilsit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_VILE_PAIN,		// painstate
+	10,		// painchance
+	sfx_vipain,		// painsound
+	0,		// meleestate
+	S_VILE_ATK1,		// missilestate
+	S_VILE_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_vildth,		// deathsound
+	15,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	500,		// mass
+	0,		// damage
+	sfx_vilact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_FIRE
+	-1,		// doomednum
+	S_FIRE1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_UNDEAD
+	66,		// doomednum
+	S_SKEL_STND,		// spawnstate
+	300,		// spawnhealth
+	S_SKEL_RUN1,		// seestate
+	sfx_skesit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_SKEL_PAIN,		// painstate
+	100,		// painchance
+	sfx_popain,		// painsound
+	S_SKEL_FIST1,		// meleestate
+	S_SKEL_MISS1,		// missilestate
+	S_SKEL_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_skedth,		// deathsound
+	10,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	500,		// mass
+	0,		// damage
+	sfx_skeact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_SKEL_RAISE1		// raisestate
+    },
+
+    {		// MT_TRACER
+	-1,		// doomednum
+	S_TRACER,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_skeatk,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_TRACEEXP1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_barexp,		// deathsound
+	10*FRACUNIT,		// speed
+	11*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	10,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_SMOKE
+	-1,		// doomednum
+	S_SMOKE1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_FATSO
+	67,		// doomednum
+	S_FATT_STND,		// spawnstate
+	600,		// spawnhealth
+	S_FATT_RUN1,		// seestate
+	sfx_mansit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_FATT_PAIN,		// painstate
+	80,		// painchance
+	sfx_mnpain,		// painsound
+	0,		// meleestate
+	S_FATT_ATK1,		// missilestate
+	S_FATT_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_mandth,		// deathsound
+	8,		// speed
+	48*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	1000,		// mass
+	0,		// damage
+	sfx_posact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_FATT_RAISE1		// raisestate
+    },
+
+    {		// MT_FATSHOT
+	-1,		// doomednum
+	S_FATSHOT1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_firsht,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_FATSHOTX1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	20*FRACUNIT,		// speed
+	6*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	8,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_CHAINGUY
+	65,		// doomednum
+	S_CPOS_STND,		// spawnstate
+	70,		// spawnhealth
+	S_CPOS_RUN1,		// seestate
+	sfx_posit2,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_CPOS_PAIN,		// painstate
+	170,		// painchance
+	sfx_popain,		// painsound
+	0,		// meleestate
+	S_CPOS_ATK1,		// missilestate
+	S_CPOS_DIE1,		// deathstate
+	S_CPOS_XDIE1,		// xdeathstate
+	sfx_podth2,		// deathsound
+	8,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_posact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_CPOS_RAISE1		// raisestate
+    },
+
+    {		// MT_TROOP
+	3001,		// doomednum
+	S_TROO_STND,		// spawnstate
+	60,		// spawnhealth
+	S_TROO_RUN1,		// seestate
+	sfx_bgsit1,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_TROO_PAIN,		// painstate
+	200,		// painchance
+	sfx_popain,		// painsound
+	S_TROO_ATK1,		// meleestate
+	S_TROO_ATK1,		// missilestate
+	S_TROO_DIE1,		// deathstate
+	S_TROO_XDIE1,		// xdeathstate
+	sfx_bgdth1,		// deathsound
+	8,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_bgact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_TROO_RAISE1		// raisestate
+    },
+
+    {		// MT_SERGEANT
+	3002,		// doomednum
+	S_SARG_STND,		// spawnstate
+	150,		// spawnhealth
+	S_SARG_RUN1,		// seestate
+	sfx_sgtsit,		// seesound
+	8,		// reactiontime
+	sfx_sgtatk,		// attacksound
+	S_SARG_PAIN,		// painstate
+	180,		// painchance
+	sfx_dmpain,		// painsound
+	S_SARG_ATK1,		// meleestate
+	0,		// missilestate
+	S_SARG_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_sgtdth,		// deathsound
+	10,		// speed
+	30*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	400,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_SARG_RAISE1		// raisestate
+    },
+
+    {		// MT_SHADOWS
+	58,		// doomednum
+	S_SARG_STND,		// spawnstate
+	150,		// spawnhealth
+	S_SARG_RUN1,		// seestate
+	sfx_sgtsit,		// seesound
+	8,		// reactiontime
+	sfx_sgtatk,		// attacksound
+	S_SARG_PAIN,		// painstate
+	180,		// painchance
+	sfx_dmpain,		// painsound
+	S_SARG_ATK1,		// meleestate
+	0,		// missilestate
+	S_SARG_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_sgtdth,		// deathsound
+	10,		// speed
+	30*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	400,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_SHADOW|MF_COUNTKILL,		// flags
+	S_SARG_RAISE1		// raisestate
+    },
+
+    {		// MT_HEAD
+	3005,		// doomednum
+	S_HEAD_STND,		// spawnstate
+	400,		// spawnhealth
+	S_HEAD_RUN1,		// seestate
+	sfx_cacsit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_HEAD_PAIN,		// painstate
+	128,		// painchance
+	sfx_dmpain,		// painsound
+	0,		// meleestate
+	S_HEAD_ATK1,		// missilestate
+	S_HEAD_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_cacdth,		// deathsound
+	8,		// speed
+	31*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	400,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL,		// flags
+	S_HEAD_RAISE1		// raisestate
+    },
+
+    {		// MT_BRUISER
+	3003,		// doomednum
+	S_BOSS_STND,		// spawnstate
+	1000,		// spawnhealth
+	S_BOSS_RUN1,		// seestate
+	sfx_brssit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_BOSS_PAIN,		// painstate
+	50,		// painchance
+	sfx_dmpain,		// painsound
+	S_BOSS_ATK1,		// meleestate
+	S_BOSS_ATK1,		// missilestate
+	S_BOSS_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_brsdth,		// deathsound
+	8,		// speed
+	24*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	1000,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_BOSS_RAISE1		// raisestate
+    },
+
+    {		// MT_BRUISERSHOT
+	-1,		// doomednum
+	S_BRBALL1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_firsht,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_BRBALLX1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	15*FRACUNIT,		// speed
+	6*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	8,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_KNIGHT
+	69,		// doomednum
+	S_BOS2_STND,		// spawnstate
+	500,		// spawnhealth
+	S_BOS2_RUN1,		// seestate
+	sfx_kntsit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_BOS2_PAIN,		// painstate
+	50,		// painchance
+	sfx_dmpain,		// painsound
+	S_BOS2_ATK1,		// meleestate
+	S_BOS2_ATK1,		// missilestate
+	S_BOS2_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_kntdth,		// deathsound
+	8,		// speed
+	24*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	1000,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_BOS2_RAISE1		// raisestate
+    },
+
+    {		// MT_SKULL
+	3006,		// doomednum
+	S_SKULL_STND,		// spawnstate
+	100,		// spawnhealth
+	S_SKULL_RUN1,		// seestate
+	0,		// seesound
+	8,		// reactiontime
+	sfx_sklatk,		// attacksound
+	S_SKULL_PAIN,		// painstate
+	256,		// painchance
+	sfx_dmpain,		// painsound
+	0,		// meleestate
+	S_SKULL_ATK1,		// missilestate
+	S_SKULL_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	8,		// speed
+	16*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	50,		// mass
+	3,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_SPIDER
+	7,		// doomednum
+	S_SPID_STND,		// spawnstate
+	3000,		// spawnhealth
+	S_SPID_RUN1,		// seestate
+	sfx_spisit,		// seesound
+	8,		// reactiontime
+	sfx_shotgn,		// attacksound
+	S_SPID_PAIN,		// painstate
+	40,		// painchance
+	sfx_dmpain,		// painsound
+	0,		// meleestate
+	S_SPID_ATK1,		// missilestate
+	S_SPID_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_spidth,		// deathsound
+	12,		// speed
+	128*FRACUNIT,		// radius
+	100*FRACUNIT,		// height
+	1000,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BABY
+	68,		// doomednum
+	S_BSPI_STND,		// spawnstate
+	500,		// spawnhealth
+	S_BSPI_SIGHT,		// seestate
+	sfx_bspsit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_BSPI_PAIN,		// painstate
+	128,		// painchance
+	sfx_dmpain,		// painsound
+	0,		// meleestate
+	S_BSPI_ATK1,		// missilestate
+	S_BSPI_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_bspdth,		// deathsound
+	12,		// speed
+	64*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	600,		// mass
+	0,		// damage
+	sfx_bspact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_BSPI_RAISE1		// raisestate
+    },
+
+    {		// MT_CYBORG
+	16,		// doomednum
+	S_CYBER_STND,		// spawnstate
+	4000,		// spawnhealth
+	S_CYBER_RUN1,		// seestate
+	sfx_cybsit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_CYBER_PAIN,		// painstate
+	20,		// painchance
+	sfx_dmpain,		// painsound
+	0,		// meleestate
+	S_CYBER_ATK1,		// missilestate
+	S_CYBER_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_cybdth,		// deathsound
+	16,		// speed
+	40*FRACUNIT,		// radius
+	110*FRACUNIT,		// height
+	1000,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_PAIN
+	71,		// doomednum
+	S_PAIN_STND,		// spawnstate
+	400,		// spawnhealth
+	S_PAIN_RUN1,		// seestate
+	sfx_pesit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_PAIN_PAIN,		// painstate
+	128,		// painchance
+	sfx_pepain,		// painsound
+	0,		// meleestate
+	S_PAIN_ATK1,		// missilestate
+	S_PAIN_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_pedth,		// deathsound
+	8,		// speed
+	31*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	400,		// mass
+	0,		// damage
+	sfx_dmact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL,		// flags
+	S_PAIN_RAISE1		// raisestate
+    },
+
+    {		// MT_WOLFSS
+	84,		// doomednum
+	S_SSWV_STND,		// spawnstate
+	50,		// spawnhealth
+	S_SSWV_RUN1,		// seestate
+	sfx_sssit,		// seesound
+	8,		// reactiontime
+	0,		// attacksound
+	S_SSWV_PAIN,		// painstate
+	170,		// painchance
+	sfx_popain,		// painsound
+	0,		// meleestate
+	S_SSWV_ATK1,		// missilestate
+	S_SSWV_DIE1,		// deathstate
+	S_SSWV_XDIE1,		// xdeathstate
+	sfx_ssdth,		// deathsound
+	8,		// speed
+	20*FRACUNIT,		// radius
+	56*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_posact,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_SSWV_RAISE1		// raisestate
+    },
+
+    {		// MT_KEEN
+	72,		// doomednum
+	S_KEENSTND,		// spawnstate
+	100,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_KEENPAIN,		// painstate
+	256,		// painchance
+	sfx_keenpn,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_COMMKEEN,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_keendt,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	72*FRACUNIT,		// height
+	10000000,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY|MF_SHOOTABLE|MF_COUNTKILL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BOSSBRAIN
+	88,		// doomednum
+	S_BRAIN,		// spawnstate
+	250,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_BRAIN_PAIN,		// painstate
+	255,		// painchance
+	sfx_bospn,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_BRAIN_DIE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_bosdth,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	10000000,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SHOOTABLE,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BOSSSPIT
+	89,		// doomednum
+	S_BRAINEYE,		// spawnstate
+	1000,		// spawnhealth
+	S_BRAINEYESEE,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	32*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BOSSTARGET
+	87,		// doomednum
+	S_NULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	32*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_SPAWNSHOT
+	-1,		// doomednum
+	S_SPAWN1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_bospit,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	10*FRACUNIT,		// speed
+	6*FRACUNIT,		// radius
+	32*FRACUNIT,		// height
+	100,		// mass
+	3,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_NOCLIP,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_SPAWNFIRE
+	-1,		// doomednum
+	S_SPAWNFIRE1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BARREL
+	2035,		// doomednum
+	S_BAR1,		// spawnstate
+	20,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_BEXP,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_barexp,		// deathsound
+	0,		// speed
+	10*FRACUNIT,		// radius
+	42*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_TROOPSHOT
+	-1,		// doomednum
+	S_TBALL1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_firsht,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_TBALLX1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	10*FRACUNIT,		// speed
+	6*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	3,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_HEADSHOT
+	-1,		// doomednum
+	S_RBALL1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_firsht,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_RBALLX1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	10*FRACUNIT,		// speed
+	6*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	5,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_ROCKET
+	-1,		// doomednum
+	S_ROCKET,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_rlaunc,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_EXPLODE1,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_barexp,		// deathsound
+	20*FRACUNIT,		// speed
+	11*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	20,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_PLASMA
+	-1,		// doomednum
+	S_PLASBALL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_plasma,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_PLASEXP,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	25*FRACUNIT,		// speed
+	13*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	5,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BFG
+	-1,		// doomednum
+	S_BFGSHOT,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	0,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_BFGLAND,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_rxplod,		// deathsound
+	25*FRACUNIT,		// speed
+	13*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	100,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_ARACHPLAZ
+	-1,		// doomednum
+	S_ARACH_PLAZ,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_plasma,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_ARACH_PLEX,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_firxpl,		// deathsound
+	25*FRACUNIT,		// speed
+	13*FRACUNIT,		// radius
+	8*FRACUNIT,		// height
+	100,		// mass
+	5,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_PUFF
+	-1,		// doomednum
+	S_PUFF1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_BLOOD
+	-1,		// doomednum
+	S_BLOOD1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_TFOG
+	-1,		// doomednum
+	S_TFOG,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_IFOG
+	-1,		// doomednum
+	S_IFOG,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_TELEPORTMAN
+	14,		// doomednum
+	S_NULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_EXTRABFG
+	-1,		// doomednum
+	S_BFGEXP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC0
+	2018,		// doomednum
+	S_ARM1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC1
+	2019,		// doomednum
+	S_ARM2,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC2
+	2014,		// doomednum
+	S_BON1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC3
+	2015,		// doomednum
+	S_BON2,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC4
+	5,		// doomednum
+	S_BKEY,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC5
+	13,		// doomednum
+	S_RKEY,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC6
+	6,		// doomednum
+	S_YKEY,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC7
+	39,		// doomednum
+	S_YSKULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC8
+	38,		// doomednum
+	S_RSKULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC9
+	40,		// doomednum
+	S_BSKULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_NOTDMATCH,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC10
+	2011,		// doomednum
+	S_STIM,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC11
+	2012,		// doomednum
+	S_MEDI,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC12
+	2013,		// doomednum
+	S_SOUL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_INV
+	2022,		// doomednum
+	S_PINV,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC13
+	2023,		// doomednum
+	S_PSTR,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_INS
+	2024,		// doomednum
+	S_PINS,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC14
+	2025,		// doomednum
+	S_SUIT,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC15
+	2026,		// doomednum
+	S_PMAP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC16
+	2045,		// doomednum
+	S_PVIS,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MEGA
+	83,		// doomednum
+	S_MEGA,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_CLIP
+	2007,		// doomednum
+	S_CLIP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC17
+	2048,		// doomednum
+	S_AMMO,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC18
+	2010,		// doomednum
+	S_ROCK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC19
+	2046,		// doomednum
+	S_BROK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC20
+	2047,		// doomednum
+	S_CELL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC21
+	17,		// doomednum
+	S_CELP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC22
+	2008,		// doomednum
+	S_SHEL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC23
+	2049,		// doomednum
+	S_SBOX,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC24
+	8,		// doomednum
+	S_BPAK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC25
+	2006,		// doomednum
+	S_BFUG,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_CHAINGUN
+	2002,		// doomednum
+	S_MGUN,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC26
+	2005,		// doomednum
+	S_CSAW,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC27
+	2003,		// doomednum
+	S_LAUN,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC28
+	2004,		// doomednum
+	S_PLAS,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_SHOTGUN
+	2001,		// doomednum
+	S_SHOT,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_SUPERSHOTGUN
+	82,		// doomednum
+	S_SHOT2,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPECIAL,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC29
+	85,		// doomednum
+	S_TECHLAMP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC30
+	86,		// doomednum
+	S_TECH2LAMP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC31
+	2028,		// doomednum
+	S_COLU,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC32
+	30,		// doomednum
+	S_TALLGRNCOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC33
+	31,		// doomednum
+	S_SHRTGRNCOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC34
+	32,		// doomednum
+	S_TALLREDCOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC35
+	33,		// doomednum
+	S_SHRTREDCOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC36
+	37,		// doomednum
+	S_SKULLCOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC37
+	36,		// doomednum
+	S_HEARTCOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC38
+	41,		// doomednum
+	S_EVILEYE,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC39
+	42,		// doomednum
+	S_FLOATSKULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC40
+	43,		// doomednum
+	S_TORCHTREE,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC41
+	44,		// doomednum
+	S_BLUETORCH,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC42
+	45,		// doomednum
+	S_GREENTORCH,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC43
+	46,		// doomednum
+	S_REDTORCH,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC44
+	55,		// doomednum
+	S_BTORCHSHRT,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC45
+	56,		// doomednum
+	S_GTORCHSHRT,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC46
+	57,		// doomednum
+	S_RTORCHSHRT,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC47
+	47,		// doomednum
+	S_STALAGTITE,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC48
+	48,		// doomednum
+	S_TECHPILLAR,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC49
+	34,		// doomednum
+	S_CANDLESTIK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC50
+	35,		// doomednum
+	S_CANDELABRA,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC51
+	49,		// doomednum
+	S_BLOODYTWITCH,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	68*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC52
+	50,		// doomednum
+	S_MEAT2,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	84*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC53
+	51,		// doomednum
+	S_MEAT3,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	84*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC54
+	52,		// doomednum
+	S_MEAT4,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	68*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC55
+	53,		// doomednum
+	S_MEAT5,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	52*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC56
+	59,		// doomednum
+	S_MEAT2,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	84*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC57
+	60,		// doomednum
+	S_MEAT4,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	68*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC58
+	61,		// doomednum
+	S_MEAT3,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	52*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC59
+	62,		// doomednum
+	S_MEAT5,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	52*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC60
+	63,		// doomednum
+	S_BLOODYTWITCH,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	68*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC61
+	22,		// doomednum
+	S_HEAD_DIE6,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC62
+	15,		// doomednum
+	S_PLAY_DIE7,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC63
+	18,		// doomednum
+	S_POSS_DIE5,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC64
+	21,		// doomednum
+	S_SARG_DIE6,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC65
+	23,		// doomednum
+	S_SKULL_DIE6,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC66
+	20,		// doomednum
+	S_TROO_DIE5,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC67
+	19,		// doomednum
+	S_SPOS_DIE5,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC68
+	10,		// doomednum
+	S_PLAY_XDIE9,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC69
+	12,		// doomednum
+	S_PLAY_XDIE9,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC70
+	28,		// doomednum
+	S_HEADSONSTICK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC71
+	24,		// doomednum
+	S_GIBS,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC72
+	27,		// doomednum
+	S_HEADONASTICK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC73
+	29,		// doomednum
+	S_HEADCANDLES,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC74
+	25,		// doomednum
+	S_DEADSTICK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC75
+	26,		// doomednum
+	S_LIVESTICK,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC76
+	54,		// doomednum
+	S_BIGTREE,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	32*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC77
+	70,		// doomednum
+	S_BBAR1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC78
+	73,		// doomednum
+	S_HANGNOGUTS,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	88*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC79
+	74,		// doomednum
+	S_HANGBNOBRAIN,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	88*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC80
+	75,		// doomednum
+	S_HANGTLOOKDN,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC81
+	76,		// doomednum
+	S_HANGTSKULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC82
+	77,		// doomednum
+	S_HANGTLOOKUP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC83
+	78,		// doomednum
+	S_HANGTNOBRAIN,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	64*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC84
+	79,		// doomednum
+	S_COLONGIBS,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC85
+	80,		// doomednum
+	S_SMALLPOOL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// MT_MISC86
+	81,		// doomednum
+	S_BRAINSTEM,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	sfx_None,		// seesound
+	8,		// reactiontime
+	sfx_None,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	sfx_None,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	sfx_None,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	sfx_None,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+    }
+};
+
diff --git a/games/NXDoom/src/doom/info.h b/games/NXDoom/src/doom/info.h
new file mode 100644
index 000000000..c426d07bf
--- /dev/null
+++ b/games/NXDoom/src/doom/info.h
@@ -0,0 +1,1331 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Thing frame/state LUT,
+//	generated by multigen utilitiy.
+//	This one is the original DOOM version, preserved.
+//
+
+#ifndef __INFO__
+#define __INFO__
+
+// Needed for action function pointer handling.
+#include "d_think.h"
+
+typedef enum
+{
+    SPR_TROO,
+    SPR_SHTG,
+    SPR_PUNG,
+    SPR_PISG,
+    SPR_PISF,
+    SPR_SHTF,
+    SPR_SHT2,
+    SPR_CHGG,
+    SPR_CHGF,
+    SPR_MISG,
+    SPR_MISF,
+    SPR_SAWG,
+    SPR_PLSG,
+    SPR_PLSF,
+    SPR_BFGG,
+    SPR_BFGF,
+    SPR_BLUD,
+    SPR_PUFF,
+    SPR_BAL1,
+    SPR_BAL2,
+    SPR_PLSS,
+    SPR_PLSE,
+    SPR_MISL,
+    SPR_BFS1,
+    SPR_BFE1,
+    SPR_BFE2,
+    SPR_TFOG,
+    SPR_IFOG,
+    SPR_PLAY,
+    SPR_POSS,
+    SPR_SPOS,
+    SPR_VILE,
+    SPR_FIRE,
+    SPR_FATB,
+    SPR_FBXP,
+    SPR_SKEL,
+    SPR_MANF,
+    SPR_FATT,
+    SPR_CPOS,
+    SPR_SARG,
+    SPR_HEAD,
+    SPR_BAL7,
+    SPR_BOSS,
+    SPR_BOS2,
+    SPR_SKUL,
+    SPR_SPID,
+    SPR_BSPI,
+    SPR_APLS,
+    SPR_APBX,
+    SPR_CYBR,
+    SPR_PAIN,
+    SPR_SSWV,
+    SPR_KEEN,
+    SPR_BBRN,
+    SPR_BOSF,
+    SPR_ARM1,
+    SPR_ARM2,
+    SPR_BAR1,
+    SPR_BEXP,
+    SPR_FCAN,
+    SPR_BON1,
+    SPR_BON2,
+    SPR_BKEY,
+    SPR_RKEY,
+    SPR_YKEY,
+    SPR_BSKU,
+    SPR_RSKU,
+    SPR_YSKU,
+    SPR_STIM,
+    SPR_MEDI,
+    SPR_SOUL,
+    SPR_PINV,
+    SPR_PSTR,
+    SPR_PINS,
+    SPR_MEGA,
+    SPR_SUIT,
+    SPR_PMAP,
+    SPR_PVIS,
+    SPR_CLIP,
+    SPR_AMMO,
+    SPR_ROCK,
+    SPR_BROK,
+    SPR_CELL,
+    SPR_CELP,
+    SPR_SHEL,
+    SPR_SBOX,
+    SPR_BPAK,
+    SPR_BFUG,
+    SPR_MGUN,
+    SPR_CSAW,
+    SPR_LAUN,
+    SPR_PLAS,
+    SPR_SHOT,
+    SPR_SGN2,
+    SPR_COLU,
+    SPR_SMT2,
+    SPR_GOR1,
+    SPR_POL2,
+    SPR_POL5,
+    SPR_POL4,
+    SPR_POL3,
+    SPR_POL1,
+    SPR_POL6,
+    SPR_GOR2,
+    SPR_GOR3,
+    SPR_GOR4,
+    SPR_GOR5,
+    SPR_SMIT,
+    SPR_COL1,
+    SPR_COL2,
+    SPR_COL3,
+    SPR_COL4,
+    SPR_CAND,
+    SPR_CBRA,
+    SPR_COL6,
+    SPR_TRE1,
+    SPR_TRE2,
+    SPR_ELEC,
+    SPR_CEYE,
+    SPR_FSKU,
+    SPR_COL5,
+    SPR_TBLU,
+    SPR_TGRN,
+    SPR_TRED,
+    SPR_SMBT,
+    SPR_SMGT,
+    SPR_SMRT,
+    SPR_HDB1,
+    SPR_HDB2,
+    SPR_HDB3,
+    SPR_HDB4,
+    SPR_HDB5,
+    SPR_HDB6,
+    SPR_POB1,
+    SPR_POB2,
+    SPR_BRS1,
+    SPR_TLMP,
+    SPR_TLP2,
+    NUMSPRITES
+
+} spritenum_t;
+
+typedef enum
+{
+    S_NULL,
+    S_LIGHTDONE,
+    S_PUNCH,
+    S_PUNCHDOWN,
+    S_PUNCHUP,
+    S_PUNCH1,
+    S_PUNCH2,
+    S_PUNCH3,
+    S_PUNCH4,
+    S_PUNCH5,
+    S_PISTOL,
+    S_PISTOLDOWN,
+    S_PISTOLUP,
+    S_PISTOL1,
+    S_PISTOL2,
+    S_PISTOL3,
+    S_PISTOL4,
+    S_PISTOLFLASH,
+    S_SGUN,
+    S_SGUNDOWN,
+    S_SGUNUP,
+    S_SGUN1,
+    S_SGUN2,
+    S_SGUN3,
+    S_SGUN4,
+    S_SGUN5,
+    S_SGUN6,
+    S_SGUN7,
+    S_SGUN8,
+    S_SGUN9,
+    S_SGUNFLASH1,
+    S_SGUNFLASH2,
+    S_DSGUN,
+    S_DSGUNDOWN,
+    S_DSGUNUP,
+    S_DSGUN1,
+    S_DSGUN2,
+    S_DSGUN3,
+    S_DSGUN4,
+    S_DSGUN5,
+    S_DSGUN6,
+    S_DSGUN7,
+    S_DSGUN8,
+    S_DSGUN9,
+    S_DSGUN10,
+    S_DSNR1,
+    S_DSNR2,
+    S_DSGUNFLASH1,
+    S_DSGUNFLASH2,
+    S_CHAIN,
+    S_CHAINDOWN,
+    S_CHAINUP,
+    S_CHAIN1,
+    S_CHAIN2,
+    S_CHAIN3,
+    S_CHAINFLASH1,
+    S_CHAINFLASH2,
+    S_MISSILE,
+    S_MISSILEDOWN,
+    S_MISSILEUP,
+    S_MISSILE1,
+    S_MISSILE2,
+    S_MISSILE3,
+    S_MISSILEFLASH1,
+    S_MISSILEFLASH2,
+    S_MISSILEFLASH3,
+    S_MISSILEFLASH4,
+    S_SAW,
+    S_SAWB,
+    S_SAWDOWN,
+    S_SAWUP,
+    S_SAW1,
+    S_SAW2,
+    S_SAW3,
+    S_PLASMA,
+    S_PLASMADOWN,
+    S_PLASMAUP,
+    S_PLASMA1,
+    S_PLASMA2,
+    S_PLASMAFLASH1,
+    S_PLASMAFLASH2,
+    S_BFG,
+    S_BFGDOWN,
+    S_BFGUP,
+    S_BFG1,
+    S_BFG2,
+    S_BFG3,
+    S_BFG4,
+    S_BFGFLASH1,
+    S_BFGFLASH2,
+    S_BLOOD1,
+    S_BLOOD2,
+    S_BLOOD3,
+    S_PUFF1,
+    S_PUFF2,
+    S_PUFF3,
+    S_PUFF4,
+    S_TBALL1,
+    S_TBALL2,
+    S_TBALLX1,
+    S_TBALLX2,
+    S_TBALLX3,
+    S_RBALL1,
+    S_RBALL2,
+    S_RBALLX1,
+    S_RBALLX2,
+    S_RBALLX3,
+    S_PLASBALL,
+    S_PLASBALL2,
+    S_PLASEXP,
+    S_PLASEXP2,
+    S_PLASEXP3,
+    S_PLASEXP4,
+    S_PLASEXP5,
+    S_ROCKET,
+    S_BFGSHOT,
+    S_BFGSHOT2,
+    S_BFGLAND,
+    S_BFGLAND2,
+    S_BFGLAND3,
+    S_BFGLAND4,
+    S_BFGLAND5,
+    S_BFGLAND6,
+    S_BFGEXP,
+    S_BFGEXP2,
+    S_BFGEXP3,
+    S_BFGEXP4,
+    S_EXPLODE1,
+    S_EXPLODE2,
+    S_EXPLODE3,
+    S_TFOG,
+    S_TFOG01,
+    S_TFOG02,
+    S_TFOG2,
+    S_TFOG3,
+    S_TFOG4,
+    S_TFOG5,
+    S_TFOG6,
+    S_TFOG7,
+    S_TFOG8,
+    S_TFOG9,
+    S_TFOG10,
+    S_IFOG,
+    S_IFOG01,
+    S_IFOG02,
+    S_IFOG2,
+    S_IFOG3,
+    S_IFOG4,
+    S_IFOG5,
+    S_PLAY,
+    S_PLAY_RUN1,
+    S_PLAY_RUN2,
+    S_PLAY_RUN3,
+    S_PLAY_RUN4,
+    S_PLAY_ATK1,
+    S_PLAY_ATK2,
+    S_PLAY_PAIN,
+    S_PLAY_PAIN2,
+    S_PLAY_DIE1,
+    S_PLAY_DIE2,
+    S_PLAY_DIE3,
+    S_PLAY_DIE4,
+    S_PLAY_DIE5,
+    S_PLAY_DIE6,
+    S_PLAY_DIE7,
+    S_PLAY_XDIE1,
+    S_PLAY_XDIE2,
+    S_PLAY_XDIE3,
+    S_PLAY_XDIE4,
+    S_PLAY_XDIE5,
+    S_PLAY_XDIE6,
+    S_PLAY_XDIE7,
+    S_PLAY_XDIE8,
+    S_PLAY_XDIE9,
+    S_POSS_STND,
+    S_POSS_STND2,
+    S_POSS_RUN1,
+    S_POSS_RUN2,
+    S_POSS_RUN3,
+    S_POSS_RUN4,
+    S_POSS_RUN5,
+    S_POSS_RUN6,
+    S_POSS_RUN7,
+    S_POSS_RUN8,
+    S_POSS_ATK1,
+    S_POSS_ATK2,
+    S_POSS_ATK3,
+    S_POSS_PAIN,
+    S_POSS_PAIN2,
+    S_POSS_DIE1,
+    S_POSS_DIE2,
+    S_POSS_DIE3,
+    S_POSS_DIE4,
+    S_POSS_DIE5,
+    S_POSS_XDIE1,
+    S_POSS_XDIE2,
+    S_POSS_XDIE3,
+    S_POSS_XDIE4,
+    S_POSS_XDIE5,
+    S_POSS_XDIE6,
+    S_POSS_XDIE7,
+    S_POSS_XDIE8,
+    S_POSS_XDIE9,
+    S_POSS_RAISE1,
+    S_POSS_RAISE2,
+    S_POSS_RAISE3,
+    S_POSS_RAISE4,
+    S_SPOS_STND,
+    S_SPOS_STND2,
+    S_SPOS_RUN1,
+    S_SPOS_RUN2,
+    S_SPOS_RUN3,
+    S_SPOS_RUN4,
+    S_SPOS_RUN5,
+    S_SPOS_RUN6,
+    S_SPOS_RUN7,
+    S_SPOS_RUN8,
+    S_SPOS_ATK1,
+    S_SPOS_ATK2,
+    S_SPOS_ATK3,
+    S_SPOS_PAIN,
+    S_SPOS_PAIN2,
+    S_SPOS_DIE1,
+    S_SPOS_DIE2,
+    S_SPOS_DIE3,
+    S_SPOS_DIE4,
+    S_SPOS_DIE5,
+    S_SPOS_XDIE1,
+    S_SPOS_XDIE2,
+    S_SPOS_XDIE3,
+    S_SPOS_XDIE4,
+    S_SPOS_XDIE5,
+    S_SPOS_XDIE6,
+    S_SPOS_XDIE7,
+    S_SPOS_XDIE8,
+    S_SPOS_XDIE9,
+    S_SPOS_RAISE1,
+    S_SPOS_RAISE2,
+    S_SPOS_RAISE3,
+    S_SPOS_RAISE4,
+    S_SPOS_RAISE5,
+    S_VILE_STND,
+    S_VILE_STND2,
+    S_VILE_RUN1,
+    S_VILE_RUN2,
+    S_VILE_RUN3,
+    S_VILE_RUN4,
+    S_VILE_RUN5,
+    S_VILE_RUN6,
+    S_VILE_RUN7,
+    S_VILE_RUN8,
+    S_VILE_RUN9,
+    S_VILE_RUN10,
+    S_VILE_RUN11,
+    S_VILE_RUN12,
+    S_VILE_ATK1,
+    S_VILE_ATK2,
+    S_VILE_ATK3,
+    S_VILE_ATK4,
+    S_VILE_ATK5,
+    S_VILE_ATK6,
+    S_VILE_ATK7,
+    S_VILE_ATK8,
+    S_VILE_ATK9,
+    S_VILE_ATK10,
+    S_VILE_ATK11,
+    S_VILE_HEAL1,
+    S_VILE_HEAL2,
+    S_VILE_HEAL3,
+    S_VILE_PAIN,
+    S_VILE_PAIN2,
+    S_VILE_DIE1,
+    S_VILE_DIE2,
+    S_VILE_DIE3,
+    S_VILE_DIE4,
+    S_VILE_DIE5,
+    S_VILE_DIE6,
+    S_VILE_DIE7,
+    S_VILE_DIE8,
+    S_VILE_DIE9,
+    S_VILE_DIE10,
+    S_FIRE1,
+    S_FIRE2,
+    S_FIRE3,
+    S_FIRE4,
+    S_FIRE5,
+    S_FIRE6,
+    S_FIRE7,
+    S_FIRE8,
+    S_FIRE9,
+    S_FIRE10,
+    S_FIRE11,
+    S_FIRE12,
+    S_FIRE13,
+    S_FIRE14,
+    S_FIRE15,
+    S_FIRE16,
+    S_FIRE17,
+    S_FIRE18,
+    S_FIRE19,
+    S_FIRE20,
+    S_FIRE21,
+    S_FIRE22,
+    S_FIRE23,
+    S_FIRE24,
+    S_FIRE25,
+    S_FIRE26,
+    S_FIRE27,
+    S_FIRE28,
+    S_FIRE29,
+    S_FIRE30,
+    S_SMOKE1,
+    S_SMOKE2,
+    S_SMOKE3,
+    S_SMOKE4,
+    S_SMOKE5,
+    S_TRACER,
+    S_TRACER2,
+    S_TRACEEXP1,
+    S_TRACEEXP2,
+    S_TRACEEXP3,
+    S_SKEL_STND,
+    S_SKEL_STND2,
+    S_SKEL_RUN1,
+    S_SKEL_RUN2,
+    S_SKEL_RUN3,
+    S_SKEL_RUN4,
+    S_SKEL_RUN5,
+    S_SKEL_RUN6,
+    S_SKEL_RUN7,
+    S_SKEL_RUN8,
+    S_SKEL_RUN9,
+    S_SKEL_RUN10,
+    S_SKEL_RUN11,
+    S_SKEL_RUN12,
+    S_SKEL_FIST1,
+    S_SKEL_FIST2,
+    S_SKEL_FIST3,
+    S_SKEL_FIST4,
+    S_SKEL_MISS1,
+    S_SKEL_MISS2,
+    S_SKEL_MISS3,
+    S_SKEL_MISS4,
+    S_SKEL_PAIN,
+    S_SKEL_PAIN2,
+    S_SKEL_DIE1,
+    S_SKEL_DIE2,
+    S_SKEL_DIE3,
+    S_SKEL_DIE4,
+    S_SKEL_DIE5,
+    S_SKEL_DIE6,
+    S_SKEL_RAISE1,
+    S_SKEL_RAISE2,
+    S_SKEL_RAISE3,
+    S_SKEL_RAISE4,
+    S_SKEL_RAISE5,
+    S_SKEL_RAISE6,
+    S_FATSHOT1,
+    S_FATSHOT2,
+    S_FATSHOTX1,
+    S_FATSHOTX2,
+    S_FATSHOTX3,
+    S_FATT_STND,
+    S_FATT_STND2,
+    S_FATT_RUN1,
+    S_FATT_RUN2,
+    S_FATT_RUN3,
+    S_FATT_RUN4,
+    S_FATT_RUN5,
+    S_FATT_RUN6,
+    S_FATT_RUN7,
+    S_FATT_RUN8,
+    S_FATT_RUN9,
+    S_FATT_RUN10,
+    S_FATT_RUN11,
+    S_FATT_RUN12,
+    S_FATT_ATK1,
+    S_FATT_ATK2,
+    S_FATT_ATK3,
+    S_FATT_ATK4,
+    S_FATT_ATK5,
+    S_FATT_ATK6,
+    S_FATT_ATK7,
+    S_FATT_ATK8,
+    S_FATT_ATK9,
+    S_FATT_ATK10,
+    S_FATT_PAIN,
+    S_FATT_PAIN2,
+    S_FATT_DIE1,
+    S_FATT_DIE2,
+    S_FATT_DIE3,
+    S_FATT_DIE4,
+    S_FATT_DIE5,
+    S_FATT_DIE6,
+    S_FATT_DIE7,
+    S_FATT_DIE8,
+    S_FATT_DIE9,
+    S_FATT_DIE10,
+    S_FATT_RAISE1,
+    S_FATT_RAISE2,
+    S_FATT_RAISE3,
+    S_FATT_RAISE4,
+    S_FATT_RAISE5,
+    S_FATT_RAISE6,
+    S_FATT_RAISE7,
+    S_FATT_RAISE8,
+    S_CPOS_STND,
+    S_CPOS_STND2,
+    S_CPOS_RUN1,
+    S_CPOS_RUN2,
+    S_CPOS_RUN3,
+    S_CPOS_RUN4,
+    S_CPOS_RUN5,
+    S_CPOS_RUN6,
+    S_CPOS_RUN7,
+    S_CPOS_RUN8,
+    S_CPOS_ATK1,
+    S_CPOS_ATK2,
+    S_CPOS_ATK3,
+    S_CPOS_ATK4,
+    S_CPOS_PAIN,
+    S_CPOS_PAIN2,
+    S_CPOS_DIE1,
+    S_CPOS_DIE2,
+    S_CPOS_DIE3,
+    S_CPOS_DIE4,
+    S_CPOS_DIE5,
+    S_CPOS_DIE6,
+    S_CPOS_DIE7,
+    S_CPOS_XDIE1,
+    S_CPOS_XDIE2,
+    S_CPOS_XDIE3,
+    S_CPOS_XDIE4,
+    S_CPOS_XDIE5,
+    S_CPOS_XDIE6,
+    S_CPOS_RAISE1,
+    S_CPOS_RAISE2,
+    S_CPOS_RAISE3,
+    S_CPOS_RAISE4,
+    S_CPOS_RAISE5,
+    S_CPOS_RAISE6,
+    S_CPOS_RAISE7,
+    S_TROO_STND,
+    S_TROO_STND2,
+    S_TROO_RUN1,
+    S_TROO_RUN2,
+    S_TROO_RUN3,
+    S_TROO_RUN4,
+    S_TROO_RUN5,
+    S_TROO_RUN6,
+    S_TROO_RUN7,
+    S_TROO_RUN8,
+    S_TROO_ATK1,
+    S_TROO_ATK2,
+    S_TROO_ATK3,
+    S_TROO_PAIN,
+    S_TROO_PAIN2,
+    S_TROO_DIE1,
+    S_TROO_DIE2,
+    S_TROO_DIE3,
+    S_TROO_DIE4,
+    S_TROO_DIE5,
+    S_TROO_XDIE1,
+    S_TROO_XDIE2,
+    S_TROO_XDIE3,
+    S_TROO_XDIE4,
+    S_TROO_XDIE5,
+    S_TROO_XDIE6,
+    S_TROO_XDIE7,
+    S_TROO_XDIE8,
+    S_TROO_RAISE1,
+    S_TROO_RAISE2,
+    S_TROO_RAISE3,
+    S_TROO_RAISE4,
+    S_TROO_RAISE5,
+    S_SARG_STND,
+    S_SARG_STND2,
+    S_SARG_RUN1,
+    S_SARG_RUN2,
+    S_SARG_RUN3,
+    S_SARG_RUN4,
+    S_SARG_RUN5,
+    S_SARG_RUN6,
+    S_SARG_RUN7,
+    S_SARG_RUN8,
+    S_SARG_ATK1,
+    S_SARG_ATK2,
+    S_SARG_ATK3,
+    S_SARG_PAIN,
+    S_SARG_PAIN2,
+    S_SARG_DIE1,
+    S_SARG_DIE2,
+    S_SARG_DIE3,
+    S_SARG_DIE4,
+    S_SARG_DIE5,
+    S_SARG_DIE6,
+    S_SARG_RAISE1,
+    S_SARG_RAISE2,
+    S_SARG_RAISE3,
+    S_SARG_RAISE4,
+    S_SARG_RAISE5,
+    S_SARG_RAISE6,
+    S_HEAD_STND,
+    S_HEAD_RUN1,
+    S_HEAD_ATK1,
+    S_HEAD_ATK2,
+    S_HEAD_ATK3,
+    S_HEAD_PAIN,
+    S_HEAD_PAIN2,
+    S_HEAD_PAIN3,
+    S_HEAD_DIE1,
+    S_HEAD_DIE2,
+    S_HEAD_DIE3,
+    S_HEAD_DIE4,
+    S_HEAD_DIE5,
+    S_HEAD_DIE6,
+    S_HEAD_RAISE1,
+    S_HEAD_RAISE2,
+    S_HEAD_RAISE3,
+    S_HEAD_RAISE4,
+    S_HEAD_RAISE5,
+    S_HEAD_RAISE6,
+    S_BRBALL1,
+    S_BRBALL2,
+    S_BRBALLX1,
+    S_BRBALLX2,
+    S_BRBALLX3,
+    S_BOSS_STND,
+    S_BOSS_STND2,
+    S_BOSS_RUN1,
+    S_BOSS_RUN2,
+    S_BOSS_RUN3,
+    S_BOSS_RUN4,
+    S_BOSS_RUN5,
+    S_BOSS_RUN6,
+    S_BOSS_RUN7,
+    S_BOSS_RUN8,
+    S_BOSS_ATK1,
+    S_BOSS_ATK2,
+    S_BOSS_ATK3,
+    S_BOSS_PAIN,
+    S_BOSS_PAIN2,
+    S_BOSS_DIE1,
+    S_BOSS_DIE2,
+    S_BOSS_DIE3,
+    S_BOSS_DIE4,
+    S_BOSS_DIE5,
+    S_BOSS_DIE6,
+    S_BOSS_DIE7,
+    S_BOSS_RAISE1,
+    S_BOSS_RAISE2,
+    S_BOSS_RAISE3,
+    S_BOSS_RAISE4,
+    S_BOSS_RAISE5,
+    S_BOSS_RAISE6,
+    S_BOSS_RAISE7,
+    S_BOS2_STND,
+    S_BOS2_STND2,
+    S_BOS2_RUN1,
+    S_BOS2_RUN2,
+    S_BOS2_RUN3,
+    S_BOS2_RUN4,
+    S_BOS2_RUN5,
+    S_BOS2_RUN6,
+    S_BOS2_RUN7,
+    S_BOS2_RUN8,
+    S_BOS2_ATK1,
+    S_BOS2_ATK2,
+    S_BOS2_ATK3,
+    S_BOS2_PAIN,
+    S_BOS2_PAIN2,
+    S_BOS2_DIE1,
+    S_BOS2_DIE2,
+    S_BOS2_DIE3,
+    S_BOS2_DIE4,
+    S_BOS2_DIE5,
+    S_BOS2_DIE6,
+    S_BOS2_DIE7,
+    S_BOS2_RAISE1,
+    S_BOS2_RAISE2,
+    S_BOS2_RAISE3,
+    S_BOS2_RAISE4,
+    S_BOS2_RAISE5,
+    S_BOS2_RAISE6,
+    S_BOS2_RAISE7,
+    S_SKULL_STND,
+    S_SKULL_STND2,
+    S_SKULL_RUN1,
+    S_SKULL_RUN2,
+    S_SKULL_ATK1,
+    S_SKULL_ATK2,
+    S_SKULL_ATK3,
+    S_SKULL_ATK4,
+    S_SKULL_PAIN,
+    S_SKULL_PAIN2,
+    S_SKULL_DIE1,
+    S_SKULL_DIE2,
+    S_SKULL_DIE3,
+    S_SKULL_DIE4,
+    S_SKULL_DIE5,
+    S_SKULL_DIE6,
+    S_SPID_STND,
+    S_SPID_STND2,
+    S_SPID_RUN1,
+    S_SPID_RUN2,
+    S_SPID_RUN3,
+    S_SPID_RUN4,
+    S_SPID_RUN5,
+    S_SPID_RUN6,
+    S_SPID_RUN7,
+    S_SPID_RUN8,
+    S_SPID_RUN9,
+    S_SPID_RUN10,
+    S_SPID_RUN11,
+    S_SPID_RUN12,
+    S_SPID_ATK1,
+    S_SPID_ATK2,
+    S_SPID_ATK3,
+    S_SPID_ATK4,
+    S_SPID_PAIN,
+    S_SPID_PAIN2,
+    S_SPID_DIE1,
+    S_SPID_DIE2,
+    S_SPID_DIE3,
+    S_SPID_DIE4,
+    S_SPID_DIE5,
+    S_SPID_DIE6,
+    S_SPID_DIE7,
+    S_SPID_DIE8,
+    S_SPID_DIE9,
+    S_SPID_DIE10,
+    S_SPID_DIE11,
+    S_BSPI_STND,
+    S_BSPI_STND2,
+    S_BSPI_SIGHT,
+    S_BSPI_RUN1,
+    S_BSPI_RUN2,
+    S_BSPI_RUN3,
+    S_BSPI_RUN4,
+    S_BSPI_RUN5,
+    S_BSPI_RUN6,
+    S_BSPI_RUN7,
+    S_BSPI_RUN8,
+    S_BSPI_RUN9,
+    S_BSPI_RUN10,
+    S_BSPI_RUN11,
+    S_BSPI_RUN12,
+    S_BSPI_ATK1,
+    S_BSPI_ATK2,
+    S_BSPI_ATK3,
+    S_BSPI_ATK4,
+    S_BSPI_PAIN,
+    S_BSPI_PAIN2,
+    S_BSPI_DIE1,
+    S_BSPI_DIE2,
+    S_BSPI_DIE3,
+    S_BSPI_DIE4,
+    S_BSPI_DIE5,
+    S_BSPI_DIE6,
+    S_BSPI_DIE7,
+    S_BSPI_RAISE1,
+    S_BSPI_RAISE2,
+    S_BSPI_RAISE3,
+    S_BSPI_RAISE4,
+    S_BSPI_RAISE5,
+    S_BSPI_RAISE6,
+    S_BSPI_RAISE7,
+    S_ARACH_PLAZ,
+    S_ARACH_PLAZ2,
+    S_ARACH_PLEX,
+    S_ARACH_PLEX2,
+    S_ARACH_PLEX3,
+    S_ARACH_PLEX4,
+    S_ARACH_PLEX5,
+    S_CYBER_STND,
+    S_CYBER_STND2,
+    S_CYBER_RUN1,
+    S_CYBER_RUN2,
+    S_CYBER_RUN3,
+    S_CYBER_RUN4,
+    S_CYBER_RUN5,
+    S_CYBER_RUN6,
+    S_CYBER_RUN7,
+    S_CYBER_RUN8,
+    S_CYBER_ATK1,
+    S_CYBER_ATK2,
+    S_CYBER_ATK3,
+    S_CYBER_ATK4,
+    S_CYBER_ATK5,
+    S_CYBER_ATK6,
+    S_CYBER_PAIN,
+    S_CYBER_DIE1,
+    S_CYBER_DIE2,
+    S_CYBER_DIE3,
+    S_CYBER_DIE4,
+    S_CYBER_DIE5,
+    S_CYBER_DIE6,
+    S_CYBER_DIE7,
+    S_CYBER_DIE8,
+    S_CYBER_DIE9,
+    S_CYBER_DIE10,
+    S_PAIN_STND,
+    S_PAIN_RUN1,
+    S_PAIN_RUN2,
+    S_PAIN_RUN3,
+    S_PAIN_RUN4,
+    S_PAIN_RUN5,
+    S_PAIN_RUN6,
+    S_PAIN_ATK1,
+    S_PAIN_ATK2,
+    S_PAIN_ATK3,
+    S_PAIN_ATK4,
+    S_PAIN_PAIN,
+    S_PAIN_PAIN2,
+    S_PAIN_DIE1,
+    S_PAIN_DIE2,
+    S_PAIN_DIE3,
+    S_PAIN_DIE4,
+    S_PAIN_DIE5,
+    S_PAIN_DIE6,
+    S_PAIN_RAISE1,
+    S_PAIN_RAISE2,
+    S_PAIN_RAISE3,
+    S_PAIN_RAISE4,
+    S_PAIN_RAISE5,
+    S_PAIN_RAISE6,
+    S_SSWV_STND,
+    S_SSWV_STND2,
+    S_SSWV_RUN1,
+    S_SSWV_RUN2,
+    S_SSWV_RUN3,
+    S_SSWV_RUN4,
+    S_SSWV_RUN5,
+    S_SSWV_RUN6,
+    S_SSWV_RUN7,
+    S_SSWV_RUN8,
+    S_SSWV_ATK1,
+    S_SSWV_ATK2,
+    S_SSWV_ATK3,
+    S_SSWV_ATK4,
+    S_SSWV_ATK5,
+    S_SSWV_ATK6,
+    S_SSWV_PAIN,
+    S_SSWV_PAIN2,
+    S_SSWV_DIE1,
+    S_SSWV_DIE2,
+    S_SSWV_DIE3,
+    S_SSWV_DIE4,
+    S_SSWV_DIE5,
+    S_SSWV_XDIE1,
+    S_SSWV_XDIE2,
+    S_SSWV_XDIE3,
+    S_SSWV_XDIE4,
+    S_SSWV_XDIE5,
+    S_SSWV_XDIE6,
+    S_SSWV_XDIE7,
+    S_SSWV_XDIE8,
+    S_SSWV_XDIE9,
+    S_SSWV_RAISE1,
+    S_SSWV_RAISE2,
+    S_SSWV_RAISE3,
+    S_SSWV_RAISE4,
+    S_SSWV_RAISE5,
+    S_KEENSTND,
+    S_COMMKEEN,
+    S_COMMKEEN2,
+    S_COMMKEEN3,
+    S_COMMKEEN4,
+    S_COMMKEEN5,
+    S_COMMKEEN6,
+    S_COMMKEEN7,
+    S_COMMKEEN8,
+    S_COMMKEEN9,
+    S_COMMKEEN10,
+    S_COMMKEEN11,
+    S_COMMKEEN12,
+    S_KEENPAIN,
+    S_KEENPAIN2,
+    S_BRAIN,
+    S_BRAIN_PAIN,
+    S_BRAIN_DIE1,
+    S_BRAIN_DIE2,
+    S_BRAIN_DIE3,
+    S_BRAIN_DIE4,
+    S_BRAINEYE,
+    S_BRAINEYESEE,
+    S_BRAINEYE1,
+    S_SPAWN1,
+    S_SPAWN2,
+    S_SPAWN3,
+    S_SPAWN4,
+    S_SPAWNFIRE1,
+    S_SPAWNFIRE2,
+    S_SPAWNFIRE3,
+    S_SPAWNFIRE4,
+    S_SPAWNFIRE5,
+    S_SPAWNFIRE6,
+    S_SPAWNFIRE7,
+    S_SPAWNFIRE8,
+    S_BRAINEXPLODE1,
+    S_BRAINEXPLODE2,
+    S_BRAINEXPLODE3,
+    S_ARM1,
+    S_ARM1A,
+    S_ARM2,
+    S_ARM2A,
+    S_BAR1,
+    S_BAR2,
+    S_BEXP,
+    S_BEXP2,
+    S_BEXP3,
+    S_BEXP4,
+    S_BEXP5,
+    S_BBAR1,
+    S_BBAR2,
+    S_BBAR3,
+    S_BON1,
+    S_BON1A,
+    S_BON1B,
+    S_BON1C,
+    S_BON1D,
+    S_BON1E,
+    S_BON2,
+    S_BON2A,
+    S_BON2B,
+    S_BON2C,
+    S_BON2D,
+    S_BON2E,
+    S_BKEY,
+    S_BKEY2,
+    S_RKEY,
+    S_RKEY2,
+    S_YKEY,
+    S_YKEY2,
+    S_BSKULL,
+    S_BSKULL2,
+    S_RSKULL,
+    S_RSKULL2,
+    S_YSKULL,
+    S_YSKULL2,
+    S_STIM,
+    S_MEDI,
+    S_SOUL,
+    S_SOUL2,
+    S_SOUL3,
+    S_SOUL4,
+    S_SOUL5,
+    S_SOUL6,
+    S_PINV,
+    S_PINV2,
+    S_PINV3,
+    S_PINV4,
+    S_PSTR,
+    S_PINS,
+    S_PINS2,
+    S_PINS3,
+    S_PINS4,
+    S_MEGA,
+    S_MEGA2,
+    S_MEGA3,
+    S_MEGA4,
+    S_SUIT,
+    S_PMAP,
+    S_PMAP2,
+    S_PMAP3,
+    S_PMAP4,
+    S_PMAP5,
+    S_PMAP6,
+    S_PVIS,
+    S_PVIS2,
+    S_CLIP,
+    S_AMMO,
+    S_ROCK,
+    S_BROK,
+    S_CELL,
+    S_CELP,
+    S_SHEL,
+    S_SBOX,
+    S_BPAK,
+    S_BFUG,
+    S_MGUN,
+    S_CSAW,
+    S_LAUN,
+    S_PLAS,
+    S_SHOT,
+    S_SHOT2,
+    S_COLU,
+    S_STALAG,
+    S_BLOODYTWITCH,
+    S_BLOODYTWITCH2,
+    S_BLOODYTWITCH3,
+    S_BLOODYTWITCH4,
+    S_DEADTORSO,
+    S_DEADBOTTOM,
+    S_HEADSONSTICK,
+    S_GIBS,
+    S_HEADONASTICK,
+    S_HEADCANDLES,
+    S_HEADCANDLES2,
+    S_DEADSTICK,
+    S_LIVESTICK,
+    S_LIVESTICK2,
+    S_MEAT2,
+    S_MEAT3,
+    S_MEAT4,
+    S_MEAT5,
+    S_STALAGTITE,
+    S_TALLGRNCOL,
+    S_SHRTGRNCOL,
+    S_TALLREDCOL,
+    S_SHRTREDCOL,
+    S_CANDLESTIK,
+    S_CANDELABRA,
+    S_SKULLCOL,
+    S_TORCHTREE,
+    S_BIGTREE,
+    S_TECHPILLAR,
+    S_EVILEYE,
+    S_EVILEYE2,
+    S_EVILEYE3,
+    S_EVILEYE4,
+    S_FLOATSKULL,
+    S_FLOATSKULL2,
+    S_FLOATSKULL3,
+    S_HEARTCOL,
+    S_HEARTCOL2,
+    S_BLUETORCH,
+    S_BLUETORCH2,
+    S_BLUETORCH3,
+    S_BLUETORCH4,
+    S_GREENTORCH,
+    S_GREENTORCH2,
+    S_GREENTORCH3,
+    S_GREENTORCH4,
+    S_REDTORCH,
+    S_REDTORCH2,
+    S_REDTORCH3,
+    S_REDTORCH4,
+    S_BTORCHSHRT,
+    S_BTORCHSHRT2,
+    S_BTORCHSHRT3,
+    S_BTORCHSHRT4,
+    S_GTORCHSHRT,
+    S_GTORCHSHRT2,
+    S_GTORCHSHRT3,
+    S_GTORCHSHRT4,
+    S_RTORCHSHRT,
+    S_RTORCHSHRT2,
+    S_RTORCHSHRT3,
+    S_RTORCHSHRT4,
+    S_HANGNOGUTS,
+    S_HANGBNOBRAIN,
+    S_HANGTLOOKDN,
+    S_HANGTSKULL,
+    S_HANGTLOOKUP,
+    S_HANGTNOBRAIN,
+    S_COLONGIBS,
+    S_SMALLPOOL,
+    S_BRAINSTEM,
+    S_TECHLAMP,
+    S_TECHLAMP2,
+    S_TECHLAMP3,
+    S_TECHLAMP4,
+    S_TECH2LAMP,
+    S_TECH2LAMP2,
+    S_TECH2LAMP3,
+    S_TECH2LAMP4,
+    NUMSTATES
+} statenum_t;
+
+
+typedef struct
+{
+    spritenum_t sprite;
+    int frame;
+    int tics;
+    // void (*action) ();
+    actionf_t action;
+    statenum_t nextstate;
+    int misc1;
+    int misc2;
+} state_t;
+
+extern state_t	states[NUMSTATES];
+extern const char *sprnames[];
+
+typedef enum {
+    MT_PLAYER,
+    MT_POSSESSED,
+    MT_SHOTGUY,
+    MT_VILE,
+    MT_FIRE,
+    MT_UNDEAD,
+    MT_TRACER,
+    MT_SMOKE,
+    MT_FATSO,
+    MT_FATSHOT,
+    MT_CHAINGUY,
+    MT_TROOP,
+    MT_SERGEANT,
+    MT_SHADOWS,
+    MT_HEAD,
+    MT_BRUISER,
+    MT_BRUISERSHOT,
+    MT_KNIGHT,
+    MT_SKULL,
+    MT_SPIDER,
+    MT_BABY,
+    MT_CYBORG,
+    MT_PAIN,
+    MT_WOLFSS,
+    MT_KEEN,
+    MT_BOSSBRAIN,
+    MT_BOSSSPIT,
+    MT_BOSSTARGET,
+    MT_SPAWNSHOT,
+    MT_SPAWNFIRE,
+    MT_BARREL,
+    MT_TROOPSHOT,
+    MT_HEADSHOT,
+    MT_ROCKET,
+    MT_PLASMA,
+    MT_BFG,
+    MT_ARACHPLAZ,
+    MT_PUFF,
+    MT_BLOOD,
+    MT_TFOG,
+    MT_IFOG,
+    MT_TELEPORTMAN,
+    MT_EXTRABFG,
+    MT_MISC0,
+    MT_MISC1,
+    MT_MISC2,
+    MT_MISC3,
+    MT_MISC4,
+    MT_MISC5,
+    MT_MISC6,
+    MT_MISC7,
+    MT_MISC8,
+    MT_MISC9,
+    MT_MISC10,
+    MT_MISC11,
+    MT_MISC12,
+    MT_INV,
+    MT_MISC13,
+    MT_INS,
+    MT_MISC14,
+    MT_MISC15,
+    MT_MISC16,
+    MT_MEGA,
+    MT_CLIP,
+    MT_MISC17,
+    MT_MISC18,
+    MT_MISC19,
+    MT_MISC20,
+    MT_MISC21,
+    MT_MISC22,
+    MT_MISC23,
+    MT_MISC24,
+    MT_MISC25,
+    MT_CHAINGUN,
+    MT_MISC26,
+    MT_MISC27,
+    MT_MISC28,
+    MT_SHOTGUN,
+    MT_SUPERSHOTGUN,
+    MT_MISC29,
+    MT_MISC30,
+    MT_MISC31,
+    MT_MISC32,
+    MT_MISC33,
+    MT_MISC34,
+    MT_MISC35,
+    MT_MISC36,
+    MT_MISC37,
+    MT_MISC38,
+    MT_MISC39,
+    MT_MISC40,
+    MT_MISC41,
+    MT_MISC42,
+    MT_MISC43,
+    MT_MISC44,
+    MT_MISC45,
+    MT_MISC46,
+    MT_MISC47,
+    MT_MISC48,
+    MT_MISC49,
+    MT_MISC50,
+    MT_MISC51,
+    MT_MISC52,
+    MT_MISC53,
+    MT_MISC54,
+    MT_MISC55,
+    MT_MISC56,
+    MT_MISC57,
+    MT_MISC58,
+    MT_MISC59,
+    MT_MISC60,
+    MT_MISC61,
+    MT_MISC62,
+    MT_MISC63,
+    MT_MISC64,
+    MT_MISC65,
+    MT_MISC66,
+    MT_MISC67,
+    MT_MISC68,
+    MT_MISC69,
+    MT_MISC70,
+    MT_MISC71,
+    MT_MISC72,
+    MT_MISC73,
+    MT_MISC74,
+    MT_MISC75,
+    MT_MISC76,
+    MT_MISC77,
+    MT_MISC78,
+    MT_MISC79,
+    MT_MISC80,
+    MT_MISC81,
+    MT_MISC82,
+    MT_MISC83,
+    MT_MISC84,
+    MT_MISC85,
+    MT_MISC86,
+    NUMMOBJTYPES
+
+} mobjtype_t;
+
+typedef struct
+{
+    int	doomednum;
+    int	spawnstate;
+    int	spawnhealth;
+    int	seestate;
+    int	seesound;
+    int	reactiontime;
+    int	attacksound;
+    int	painstate;
+    int	painchance;
+    int	painsound;
+    int	meleestate;
+    int	missilestate;
+    int	deathstate;
+    int	xdeathstate;
+    int	deathsound;
+    int	speed;
+    int	radius;
+    int	height;
+    int	mass;
+    int	damage;
+    int	activesound;
+    int	flags;
+    int	raisestate;
+
+} mobjinfo_t;
+
+extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
+
+#endif
diff --git a/games/NXDoom/src/doom/m_menu.c b/games/NXDoom/src/doom/m_menu.c
new file mode 100644
index 000000000..71b47cbf6
--- /dev/null
+++ b/games/NXDoom/src/doom/m_menu.c
@@ -0,0 +1,2128 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM selection menu, options, episode etc.
+//	Sliders and icons. Kinda widget stuff.
+//
+
+
+#include <stdlib.h>
+#include <ctype.h>
+
+
+#include "doomdef.h"
+#include "doomkeys.h"
+#include "dstrings.h"
+
+#include "d_main.h"
+#include "deh_main.h"
+
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "m_misc.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "r_local.h"
+
+
+#include "hu_stuff.h"
+
+#include "g_game.h"
+
+#include "m_argv.h"
+#include "m_controls.h"
+#include "p_saveg.h"
+#include "p_setup.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+// Data.
+#include "sounds.h"
+
+#include "m_menu.h"
+
+
+//
+// defaulted values
+//
+int			mouseSensitivity = 5;
+
+// Show messages has default, 0 = off, 1 = on
+int			showMessages = 1;
+	
+
+// Blocky mode, has default, 0 = high, 1 = normal
+int			detailLevel = 0;
+int			screenblocks = 9;
+
+// temp for screenblocks (0-9)
+int			screenSize;
+
+// -1 = no quicksave slot picked!
+int			quickSaveSlot;
+
+ // 1 = message to be printed
+int			messageToPrint;
+// ...and here is the message string!
+const char		*messageString;
+
+// message x & y
+int			messx;
+int			messy;
+int			messageLastMenuActive;
+
+// timed message = no input from user
+boolean			messageNeedsInput;
+
+void    (*messageRoutine)(int response);
+
+char gammamsg[5][26] =
+{
+    GAMMALVL0,
+    GAMMALVL1,
+    GAMMALVL2,
+    GAMMALVL3,
+    GAMMALVL4
+};
+
+// we are going to be entering a savegame string
+int			saveStringEnter;              
+int             	saveSlot;	// which slot to save in
+int			saveCharIndex;	// which char we're editing
+static boolean          joypadSave = false; // was the save action initiated by joypad?
+// old save description before edit
+char			saveOldString[SAVESTRINGSIZE];  
+
+boolean			inhelpscreens;
+boolean			menuactive;
+
+#define SKULLXOFF		-32
+#define LINEHEIGHT		16
+
+char			savegamestrings[10][SAVESTRINGSIZE];
+
+char	endstring[160];
+
+static boolean opldev;
+
+//
+// MENU TYPEDEFS
+//
+typedef struct
+{
+    // 0 = no cursor here, 1 = ok, 2 = arrows ok
+    short	status;
+    
+    char	name[10];
+    
+    // choice = menu item #.
+    // if status = 2,
+    //   choice=0:leftarrow,1:rightarrow
+    void	(*routine)(int choice);
+    
+    // hotkey in menu
+    char	alphaKey;			
+} menuitem_t;
+
+
+
+typedef struct menu_s
+{
+    short		numitems;	// # of menu items
+    struct menu_s*	prevMenu;	// previous menu
+    menuitem_t*		menuitems;	// menu items
+    void		(*routine)();	// draw routine
+    short		x;
+    short		y;		// x,y of menu
+    short		lastOn;		// last item user was on in menu
+} menu_t;
+
+short		itemOn;			// menu item skull is on
+short		skullAnimCounter;	// skull animation counter
+short		whichSkull;		// which skull to draw
+
+// graphic name of skulls
+// warning: initializer-string for array of chars is too long
+const char *skullName[2] = {"M_SKULL1","M_SKULL2"};
+
+// current menudef
+menu_t*	currentMenu;                          
+
+//
+// PROTOTYPES
+//
+static void M_NewGame(int choice);
+static void M_Episode(int choice);
+static void M_ChooseSkill(int choice);
+static void M_LoadGame(int choice);
+static void M_SaveGame(int choice);
+static void M_Options(int choice);
+static void M_EndGame(int choice);
+static void M_ReadThis(int choice);
+static void M_ReadThis2(int choice);
+static void M_QuitDOOM(int choice);
+
+static void M_ChangeMessages(int choice);
+static void M_ChangeSensitivity(int choice);
+static void M_SfxVol(int choice);
+static void M_MusicVol(int choice);
+static void M_ChangeDetail(int choice);
+static void M_SizeDisplay(int choice);
+static void M_Sound(int choice);
+
+static void M_FinishReadThis(int choice);
+static void M_LoadSelect(int choice);
+static void M_SaveSelect(int choice);
+static void M_ReadSaveStrings(void);
+static void M_QuickSave(void);
+static void M_QuickLoad(void);
+
+static void M_DrawMainMenu(void);
+static void M_DrawReadThis1(void);
+static void M_DrawReadThis2(void);
+static void M_DrawNewGame(void);
+static void M_DrawEpisode(void);
+static void M_DrawOptions(void);
+static void M_DrawSound(void);
+static void M_DrawLoad(void);
+static void M_DrawSave(void);
+
+static void M_DrawSaveLoadBorder(int x,int y);
+static void M_SetupNextMenu(menu_t *menudef);
+static void M_DrawThermo(int x,int y,int thermWidth,int thermDot);
+static void M_WriteText(int x, int y, const char *string);
+static int  M_StringWidth(const char *string);
+static int  M_StringHeight(const char *string);
+static void M_StartMessage(const char *string, void *routine, boolean input);
+static void M_ClearMenus (void);
+
+
+
+
+//
+// DOOM MENU
+//
+enum
+{
+    newgame = 0,
+    options,
+    loadgame,
+    savegame,
+    readthis,
+    quitdoom,
+    main_end
+} main_e;
+
+menuitem_t MainMenu[]=
+{
+    {1,"M_NGAME",M_NewGame,'n'},
+    {1,"M_OPTION",M_Options,'o'},
+    {1,"M_LOADG",M_LoadGame,'l'},
+    {1,"M_SAVEG",M_SaveGame,'s'},
+    // Another hickup with Special edition.
+    {1,"M_RDTHIS",M_ReadThis,'r'},
+    {1,"M_QUITG",M_QuitDOOM,'q'}
+};
+
+menu_t  MainDef =
+{
+    main_end,
+    NULL,
+    MainMenu,
+    M_DrawMainMenu,
+    97,64,
+    0
+};
+
+
+//
+// EPISODE SELECT
+//
+enum
+{
+    ep1,
+    ep2,
+    ep3,
+    ep4,
+    ep_end
+} episodes_e;
+
+menuitem_t EpisodeMenu[]=
+{
+    {1,"M_EPI1", M_Episode,'k'},
+    {1,"M_EPI2", M_Episode,'t'},
+    {1,"M_EPI3", M_Episode,'i'},
+    {1,"M_EPI4", M_Episode,'t'}
+};
+
+menu_t  EpiDef =
+{
+    ep_end,		// # of menu items
+    &MainDef,		// previous menu
+    EpisodeMenu,	// menuitem_t ->
+    M_DrawEpisode,	// drawing routine ->
+    48,63,              // x,y
+    ep1			// lastOn
+};
+
+//
+// NEW GAME
+//
+enum
+{
+    killthings,
+    toorough,
+    hurtme,
+    violence,
+    nightmare,
+    newg_end
+} newgame_e;
+
+menuitem_t NewGameMenu[]=
+{
+    {1,"M_JKILL",	M_ChooseSkill, 'i'},
+    {1,"M_ROUGH",	M_ChooseSkill, 'h'},
+    {1,"M_HURT",	M_ChooseSkill, 'h'},
+    {1,"M_ULTRA",	M_ChooseSkill, 'u'},
+    {1,"M_NMARE",	M_ChooseSkill, 'n'}
+};
+
+menu_t  NewDef =
+{
+    newg_end,		// # of menu items
+    &EpiDef,		// previous menu
+    NewGameMenu,	// menuitem_t ->
+    M_DrawNewGame,	// drawing routine ->
+    48,63,              // x,y
+    hurtme		// lastOn
+};
+
+
+
+//
+// OPTIONS MENU
+//
+enum
+{
+    endgame,
+    messages,
+    detail,
+    scrnsize,
+    option_empty1,
+    mousesens,
+    option_empty2,
+    soundvol,
+    opt_end
+} options_e;
+
+menuitem_t OptionsMenu[]=
+{
+    {1,"M_ENDGAM",	M_EndGame,'e'},
+    {1,"M_MESSG",	M_ChangeMessages,'m'},
+    {1,"M_DETAIL",	M_ChangeDetail,'g'},
+    {2,"M_SCRNSZ",	M_SizeDisplay,'s'},
+    {-1,"",0,'\0'},
+    {2,"M_MSENS",	M_ChangeSensitivity,'m'},
+    {-1,"",0,'\0'},
+    {1,"M_SVOL",	M_Sound,'s'}
+};
+
+menu_t  OptionsDef =
+{
+    opt_end,
+    &MainDef,
+    OptionsMenu,
+    M_DrawOptions,
+    60,37,
+    0
+};
+
+//
+// Read This! MENU 1 & 2
+//
+enum
+{
+    rdthsempty1,
+    read1_end
+} read_e;
+
+menuitem_t ReadMenu1[] =
+{
+    {1,"",M_ReadThis2,0}
+};
+
+menu_t  ReadDef1 =
+{
+    read1_end,
+    &MainDef,
+    ReadMenu1,
+    M_DrawReadThis1,
+    280,185,
+    0
+};
+
+enum
+{
+    rdthsempty2,
+    read2_end
+} read_e2;
+
+menuitem_t ReadMenu2[]=
+{
+    {1,"",M_FinishReadThis,0}
+};
+
+menu_t  ReadDef2 =
+{
+    read2_end,
+    &ReadDef1,
+    ReadMenu2,
+    M_DrawReadThis2,
+    330,175,
+    0
+};
+
+//
+// SOUND VOLUME MENU
+//
+enum
+{
+    sfx_vol,
+    sfx_empty1,
+    music_vol,
+    sfx_empty2,
+    sound_end
+} sound_e;
+
+menuitem_t SoundMenu[]=
+{
+    {2,"M_SFXVOL",M_SfxVol,'s'},
+    {-1,"",0,'\0'},
+    {2,"M_MUSVOL",M_MusicVol,'m'},
+    {-1,"",0,'\0'}
+};
+
+menu_t  SoundDef =
+{
+    sound_end,
+    &OptionsDef,
+    SoundMenu,
+    M_DrawSound,
+    80,64,
+    0
+};
+
+//
+// LOAD GAME MENU
+//
+enum
+{
+    load1,
+    load2,
+    load3,
+    load4,
+    load5,
+    load6,
+    load_end
+} load_e;
+
+menuitem_t LoadMenu[]=
+{
+    {1,"", M_LoadSelect,'1'},
+    {1,"", M_LoadSelect,'2'},
+    {1,"", M_LoadSelect,'3'},
+    {1,"", M_LoadSelect,'4'},
+    {1,"", M_LoadSelect,'5'},
+    {1,"", M_LoadSelect,'6'}
+};
+
+menu_t  LoadDef =
+{
+    load_end,
+    &MainDef,
+    LoadMenu,
+    M_DrawLoad,
+    80,54,
+    0
+};
+
+//
+// SAVE GAME MENU
+//
+menuitem_t SaveMenu[]=
+{
+    {1,"", M_SaveSelect,'1'},
+    {1,"", M_SaveSelect,'2'},
+    {1,"", M_SaveSelect,'3'},
+    {1,"", M_SaveSelect,'4'},
+    {1,"", M_SaveSelect,'5'},
+    {1,"", M_SaveSelect,'6'}
+};
+
+menu_t  SaveDef =
+{
+    load_end,
+    &MainDef,
+    SaveMenu,
+    M_DrawSave,
+    80,54,
+    0
+};
+
+
+//
+// M_ReadSaveStrings
+//  read the strings from the savegame files
+//
+void M_ReadSaveStrings(void)
+{
+    FILE   *handle;
+    int     i;
+    char    name[256];
+
+    for (i = 0;i < load_end;i++)
+    {
+        int retval;
+        M_StringCopy(name, P_SaveGameFile(i), sizeof(name));
+
+	handle = M_fopen(name, "rb");
+        if (handle == NULL)
+        {
+            M_StringCopy(savegamestrings[i], EMPTYSTRING, SAVESTRINGSIZE);
+            LoadMenu[i].status = 0;
+            continue;
+        }
+        retval = fread(&savegamestrings[i], 1, SAVESTRINGSIZE, handle);
+	fclose(handle);
+        LoadMenu[i].status = retval == SAVESTRINGSIZE;
+    }
+}
+
+
+//
+// M_LoadGame & Cie.
+//
+void M_DrawLoad(void)
+{
+    int             i;
+	
+    V_DrawPatchDirect(72, 28, 
+                      W_CacheLumpName(DEH_String("M_LOADG"), PU_CACHE));
+
+    for (i = 0;i < load_end; i++)
+    {
+	M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
+	M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
+    }
+}
+
+
+
+//
+// Draw border for the savegame description
+//
+void M_DrawSaveLoadBorder(int x,int y)
+{
+    int             i;
+	
+    V_DrawPatchDirect(x - 8, y + 7,
+                      W_CacheLumpName(DEH_String("M_LSLEFT"), PU_CACHE));
+	
+    for (i = 0;i < 24;i++)
+    {
+	V_DrawPatchDirect(x, y + 7,
+                          W_CacheLumpName(DEH_String("M_LSCNTR"), PU_CACHE));
+	x += 8;
+    }
+
+    V_DrawPatchDirect(x, y + 7, 
+                      W_CacheLumpName(DEH_String("M_LSRGHT"), PU_CACHE));
+}
+
+
+
+//
+// User wants to load this game
+//
+void M_LoadSelect(int choice)
+{
+    char    name[256];
+	
+    M_StringCopy(name, P_SaveGameFile(choice), sizeof(name));
+
+    G_LoadGame (name);
+    M_ClearMenus ();
+}
+
+//
+// Selected from DOOM menu
+//
+void M_LoadGame (int choice)
+{
+    if (netgame)
+    {
+	M_StartMessage(DEH_String(LOADNET),NULL,false);
+	return;
+    }
+	
+    M_SetupNextMenu(&LoadDef);
+    M_ReadSaveStrings();
+}
+
+
+//
+//  M_SaveGame & Cie.
+//
+void M_DrawSave(void)
+{
+    int             i;
+	
+    V_DrawPatchDirect(72, 28, W_CacheLumpName(DEH_String("M_SAVEG"), PU_CACHE));
+    for (i = 0;i < load_end; i++)
+    {
+	M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
+	M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
+    }
+	
+    if (saveStringEnter)
+    {
+	i = M_StringWidth(savegamestrings[saveSlot]);
+	M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*saveSlot,"_");
+    }
+}
+
+//
+// M_Responder calls this when user is finished
+//
+void M_DoSave(int slot)
+{
+    G_SaveGame (slot,savegamestrings[slot]);
+    M_ClearMenus ();
+
+    // PICK QUICKSAVE SLOT YET?
+    if (quickSaveSlot == -2)
+	quickSaveSlot = slot;
+}
+
+//
+// Generate a default save slot name when the user saves to
+// an empty slot via the joypad.
+//
+static void SetDefaultSaveName(int slot)
+{
+    // map from IWAD or PWAD?
+    if (W_IsIWADLump(maplumpinfo) && strcmp(savegamedir, ""))
+    {
+        M_snprintf(savegamestrings[itemOn], SAVESTRINGSIZE,
+                   "%s", maplumpinfo->name);
+    }
+    else
+    {
+        char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpinfo));
+        char *ext = strrchr(wadname, '.');
+
+        if (ext != NULL)
+        {
+            *ext = '\0';
+        }
+
+        M_snprintf(savegamestrings[itemOn], SAVESTRINGSIZE,
+                   "%s (%s)", maplumpinfo->name,
+                   wadname);
+        free(wadname);
+    }
+    M_ForceUppercase(savegamestrings[itemOn]);
+    joypadSave = false;
+}
+
+//
+// User wants to save. Start string input for M_Responder
+//
+void M_SaveSelect(int choice)
+{
+    int x, y;
+
+    // we are going to be intercepting all chars
+    saveStringEnter = 1;
+
+    // We need to turn on text input:
+    x = LoadDef.x - 11;
+    y = LoadDef.y + choice * LINEHEIGHT - 4;
+    I_StartTextInput(x, y, x + 8 + 24 * 8 + 8, y + LINEHEIGHT - 2);
+
+    saveSlot = choice;
+    M_StringCopy(saveOldString,savegamestrings[choice], SAVESTRINGSIZE);
+    if (!strcmp(savegamestrings[choice], EMPTYSTRING))
+    {
+        savegamestrings[choice][0] = 0;
+
+        if (joypadSave)
+        {
+            SetDefaultSaveName(choice);
+        }
+    }
+    saveCharIndex = strlen(savegamestrings[choice]);
+}
+
+//
+// Selected from DOOM menu
+//
+void M_SaveGame (int choice)
+{
+    if (!usergame)
+    {
+	M_StartMessage(DEH_String(SAVEDEAD),NULL,false);
+	return;
+    }
+	
+    if (gamestate != GS_LEVEL)
+	return;
+	
+    M_SetupNextMenu(&SaveDef);
+    M_ReadSaveStrings();
+}
+
+
+
+//
+//      M_QuickSave
+//
+static char tempstring[90];
+
+void M_QuickSaveResponse(int key)
+{
+    if (key == key_menu_confirm)
+    {
+	M_DoSave(quickSaveSlot);
+	S_StartSound(NULL,sfx_swtchx);
+    }
+}
+
+void M_QuickSave(void)
+{
+    if (!usergame)
+    {
+	S_StartSound(NULL,sfx_oof);
+	return;
+    }
+
+    if (gamestate != GS_LEVEL)
+	return;
+	
+    if (quickSaveSlot < 0)
+    {
+	M_StartControlPanel();
+	M_ReadSaveStrings();
+	M_SetupNextMenu(&SaveDef);
+	quickSaveSlot = -2;	// means to pick a slot now
+	return;
+    }
+    DEH_snprintf(tempstring, sizeof(tempstring),
+                 QSPROMPT, savegamestrings[quickSaveSlot]);
+    M_StartMessage(tempstring, M_QuickSaveResponse, true);
+}
+
+
+
+//
+// M_QuickLoad
+//
+void M_QuickLoadResponse(int key)
+{
+    if (key == key_menu_confirm)
+    {
+	M_LoadSelect(quickSaveSlot);
+	S_StartSound(NULL,sfx_swtchx);
+    }
+}
+
+
+void M_QuickLoad(void)
+{
+    if (netgame)
+    {
+	M_StartMessage(DEH_String(QLOADNET),NULL,false);
+	return;
+    }
+	
+    if (quickSaveSlot < 0)
+    {
+	M_StartMessage(DEH_String(QSAVESPOT),NULL,false);
+	return;
+    }
+    DEH_snprintf(tempstring, sizeof(tempstring),
+                 QLPROMPT, savegamestrings[quickSaveSlot]);
+    M_StartMessage(tempstring, M_QuickLoadResponse, true);
+}
+
+
+
+
+//
+// Read This Menus
+// Had a "quick hack to fix romero bug"
+//
+void M_DrawReadThis1(void)
+{
+    inhelpscreens = true;
+
+    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP2"), PU_CACHE));
+}
+
+
+
+//
+// Read This Menus - optional second page.
+//
+void M_DrawReadThis2(void)
+{
+    inhelpscreens = true;
+
+    // We only ever draw the second page if this is 
+    // gameversion == exe_doom_1_9 and gamemode == registered
+
+    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE));
+}
+
+void M_DrawReadThisCommercial(void)
+{
+    inhelpscreens = true;
+
+    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP"), PU_CACHE));
+}
+
+
+//
+// Change Sfx & Music volumes
+//
+void M_DrawSound(void)
+{
+    V_DrawPatchDirect (60, 38, W_CacheLumpName(DEH_String("M_SVOL"), PU_CACHE));
+
+    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_vol+1),
+		 16,sfxVolume);
+
+    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(music_vol+1),
+		 16,musicVolume);
+}
+
+void M_Sound(int choice)
+{
+    M_SetupNextMenu(&SoundDef);
+}
+
+void M_SfxVol(int choice)
+{
+    switch(choice)
+    {
+      case 0:
+	if (sfxVolume)
+	    sfxVolume--;
+	break;
+      case 1:
+	if (sfxVolume < 15)
+	    sfxVolume++;
+	break;
+    }
+	
+    S_SetSfxVolume(sfxVolume * 8);
+}
+
+void M_MusicVol(int choice)
+{
+    switch(choice)
+    {
+      case 0:
+	if (musicVolume)
+	    musicVolume--;
+	break;
+      case 1:
+	if (musicVolume < 15)
+	    musicVolume++;
+	break;
+    }
+	
+    S_SetMusicVolume(musicVolume * 8);
+}
+
+
+
+
+//
+// M_DrawMainMenu
+//
+void M_DrawMainMenu(void)
+{
+    V_DrawPatchDirect(94, 2,
+                      W_CacheLumpName(DEH_String("M_DOOM"), PU_CACHE));
+}
+
+
+
+
+//
+// M_NewGame
+//
+void M_DrawNewGame(void)
+{
+    V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NEWG"), PU_CACHE));
+    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_SKILL"), PU_CACHE));
+}
+
+void M_NewGame(int choice)
+{
+    if (netgame && !demoplayback)
+    {
+	M_StartMessage(DEH_String(NEWGAME),NULL,false);
+	return;
+    }
+	
+    // Chex Quest disabled the episode select screen, as did Doom II.
+
+    if (gamemode == commercial || gameversion == exe_chex)
+	M_SetupNextMenu(&NewDef);
+    else
+	M_SetupNextMenu(&EpiDef);
+}
+
+
+//
+//      M_Episode
+//
+int     epi;
+
+void M_DrawEpisode(void)
+{
+    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_EPISOD"), PU_CACHE));
+}
+
+void M_VerifyNightmare(int key)
+{
+    if (key != key_menu_confirm)
+	return;
+		
+    G_DeferedInitNew(nightmare,epi+1,1);
+    M_ClearMenus ();
+}
+
+void M_ChooseSkill(int choice)
+{
+    if (choice == nightmare)
+    {
+	M_StartMessage(DEH_String(NIGHTMARE),M_VerifyNightmare,true);
+	return;
+    }
+	
+    G_DeferedInitNew(choice,epi+1,1);
+    M_ClearMenus ();
+}
+
+void M_Episode(int choice)
+{
+    if ( (gamemode == shareware)
+	 && choice)
+    {
+	M_StartMessage(DEH_String(SWSTRING),NULL,false);
+	M_SetupNextMenu(&ReadDef1);
+	return;
+    }
+
+    epi = choice;
+    M_SetupNextMenu(&NewDef);
+}
+
+
+
+//
+// M_Options
+//
+static const char *detailNames[2] = {"M_GDHIGH","M_GDLOW"};
+static const char *msgNames[2] = {"M_MSGOFF","M_MSGON"};
+
+void M_DrawOptions(void)
+{
+    V_DrawPatchDirect(108, 15, W_CacheLumpName(DEH_String("M_OPTTTL"),
+                                               PU_CACHE));
+	
+    V_DrawPatchDirect(OptionsDef.x + 175, OptionsDef.y + LINEHEIGHT * detail,
+		      W_CacheLumpName(DEH_String(detailNames[detailLevel]),
+			              PU_CACHE));
+
+    V_DrawPatchDirect(OptionsDef.x + 120, OptionsDef.y + LINEHEIGHT * messages,
+                      W_CacheLumpName(DEH_String(msgNames[showMessages]),
+                                      PU_CACHE));
+
+    M_DrawThermo(OptionsDef.x, OptionsDef.y + LINEHEIGHT * (mousesens + 1),
+		 10, mouseSensitivity);
+
+    M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(scrnsize+1),
+		 9,screenSize);
+}
+
+void M_Options(int choice)
+{
+    M_SetupNextMenu(&OptionsDef);
+}
+
+
+
+//
+//      Toggle messages on/off
+//
+void M_ChangeMessages(int choice)
+{
+    // warning: unused parameter `int choice'
+    choice = 0;
+    showMessages = 1 - showMessages;
+	
+    if (!showMessages)
+	players[consoleplayer].message = DEH_String(MSGOFF);
+    else
+	players[consoleplayer].message = DEH_String(MSGON);
+
+    message_dontfuckwithme = true;
+}
+
+
+//
+// M_EndGame
+//
+void M_EndGameResponse(int key)
+{
+    if (key != key_menu_confirm)
+	return;
+		
+    currentMenu->lastOn = itemOn;
+    M_ClearMenus ();
+    D_StartTitle ();
+}
+
+void M_EndGame(int choice)
+{
+    choice = 0;
+    if (!usergame)
+    {
+	S_StartSound(NULL,sfx_oof);
+	return;
+    }
+	
+    if (netgame)
+    {
+	M_StartMessage(DEH_String(NETEND),NULL,false);
+	return;
+    }
+	
+    M_StartMessage(DEH_String(ENDGAME),M_EndGameResponse,true);
+}
+
+
+
+
+//
+// M_ReadThis
+//
+void M_ReadThis(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&ReadDef1);
+}
+
+void M_ReadThis2(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&ReadDef2);
+}
+
+void M_FinishReadThis(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&MainDef);
+}
+
+
+
+
+//
+// M_QuitDOOM
+//
+int     quitsounds[8] =
+{
+    sfx_pldeth,
+    sfx_dmpain,
+    sfx_popain,
+    sfx_slop,
+    sfx_telept,
+    sfx_posit1,
+    sfx_posit3,
+    sfx_sgtatk
+};
+
+int     quitsounds2[8] =
+{
+    sfx_vilact,
+    sfx_getpow,
+    sfx_boscub,
+    sfx_slop,
+    sfx_skeswg,
+    sfx_kntdth,
+    sfx_bspact,
+    sfx_sgtatk
+};
+
+
+
+void M_QuitResponse(int key)
+{
+    if (key != key_menu_confirm)
+	return;
+    if (!netgame)
+    {
+	if (gamemode == commercial)
+	    S_StartSound(NULL,quitsounds2[(gametic>>2)&7]);
+	else
+	    S_StartSound(NULL,quitsounds[(gametic>>2)&7]);
+	I_WaitVBL(105);
+    }
+    I_Quit ();
+}
+
+
+static const char *M_SelectEndMessage(void)
+{
+    const char **endmsg;
+
+    if (logical_gamemission == doom)
+    {
+        // Doom 1
+
+        endmsg = doom1_endmsg;
+    }
+    else
+    {
+        // Doom 2
+        
+        endmsg = doom2_endmsg;
+    }
+
+    return endmsg[gametic % NUM_QUITMESSAGES];
+}
+
+
+void M_QuitDOOM(int choice)
+{
+    DEH_snprintf(endstring, sizeof(endstring), "%s\n\n" DOSY,
+                 DEH_String(M_SelectEndMessage()));
+
+    M_StartMessage(endstring,M_QuitResponse,true);
+}
+
+
+
+
+void M_ChangeSensitivity(int choice)
+{
+    switch(choice)
+    {
+      case 0:
+	if (mouseSensitivity)
+	    mouseSensitivity--;
+	break;
+      case 1:
+	if (mouseSensitivity < 9)
+	    mouseSensitivity++;
+	break;
+    }
+}
+
+
+
+
+void M_ChangeDetail(int choice)
+{
+    choice = 0;
+    detailLevel = 1 - detailLevel;
+
+    R_SetViewSize (screenblocks, detailLevel);
+
+    if (!detailLevel)
+	players[consoleplayer].message = DEH_String(DETAILHI);
+    else
+	players[consoleplayer].message = DEH_String(DETAILLO);
+}
+
+
+
+
+void M_SizeDisplay(int choice)
+{
+    switch(choice)
+    {
+      case 0:
+	if (screenSize > 0)
+	{
+	    screenblocks--;
+	    screenSize--;
+	}
+	break;
+      case 1:
+	if (screenSize < 8)
+	{
+	    screenblocks++;
+	    screenSize++;
+	}
+	break;
+    }
+	
+
+    R_SetViewSize (screenblocks, detailLevel);
+}
+
+
+
+
+//
+//      Menu Functions
+//
+void
+M_DrawThermo
+( int	x,
+  int	y,
+  int	thermWidth,
+  int	thermDot )
+{
+    int		xx;
+    int		i;
+
+    xx = x;
+    V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERML"), PU_CACHE));
+    xx += 8;
+    for (i=0;i<thermWidth;i++)
+    {
+	V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERMM"), PU_CACHE));
+	xx += 8;
+    }
+    V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERMR"), PU_CACHE));
+
+    V_DrawPatchDirect((x + 8) + thermDot * 8, y,
+		      W_CacheLumpName(DEH_String("M_THERMO"), PU_CACHE));
+}
+
+
+void
+M_StartMessage
+( const char	*string,
+  void*		routine,
+  boolean	input )
+{
+    messageLastMenuActive = menuactive;
+    messageToPrint = 1;
+    messageString = string;
+    messageRoutine = routine;
+    messageNeedsInput = input;
+    menuactive = true;
+    return;
+}
+
+
+//
+// Find string width from hu_font chars
+//
+int M_StringWidth(const char *string)
+{
+    size_t             i;
+    int             w = 0;
+    int             c;
+	
+    for (i = 0;i < strlen(string);i++)
+    {
+	c = toupper(string[i]) - HU_FONTSTART;
+	if (c < 0 || c >= HU_FONTSIZE)
+	    w += 4;
+	else
+	    w += SHORT (hu_font[c]->width);
+    }
+		
+    return w;
+}
+
+
+
+//
+//      Find string height from hu_font chars
+//
+int M_StringHeight(const char* string)
+{
+    size_t             i;
+    int             h;
+    int             height = SHORT(hu_font[0]->height);
+	
+    h = height;
+    for (i = 0;i < strlen(string);i++)
+	if (string[i] == '\n')
+	    h += height;
+		
+    return h;
+}
+
+
+//
+//      Write a string using the hu_font
+//
+void
+M_WriteText
+( int		x,
+  int		y,
+  const char *string)
+{
+    int		w;
+    const char *ch;
+    int		c;
+    int		cx;
+    int		cy;
+		
+
+    ch = string;
+    cx = x;
+    cy = y;
+	
+    while(1)
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	if (c == '\n')
+	{
+	    cx = x;
+	    cy += 12;
+	    continue;
+	}
+		
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c>= HU_FONTSIZE)
+	{
+	    cx += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	if (cx+w > SCREENWIDTH)
+	    break;
+	V_DrawPatchDirect(cx, cy, hu_font[c]);
+	cx+=w;
+    }
+}
+
+// These keys evaluate to a "null" key in Vanilla Doom that allows weird
+// jumping in the menus. Preserve this behavior for accuracy.
+
+static boolean IsNullKey(int key)
+{
+    return key == KEY_PAUSE || key == KEY_CAPSLOCK
+        || key == KEY_SCRLCK || key == KEY_NUMLOCK;
+}
+
+//
+// CONTROL PANEL
+//
+
+//
+// M_Responder
+//
+boolean M_Responder (event_t* ev)
+{
+    int             ch;
+    int             key;
+    int             i;
+    static  int     mousewait = 0;
+    static  int     mousey = 0;
+    static  int     lasty = 0;
+    static  int     mousex = 0;
+    static  int     lastx = 0;
+    int dir;
+
+    // In testcontrols mode, none of the function keys should do anything
+    // - the only key is escape to quit.
+
+    if (testcontrols)
+    {
+        if (ev->type == ev_quit
+         || (ev->type == ev_keydown
+          && (ev->data1 == key_menu_activate || ev->data1 == key_menu_quit)))
+        {
+            I_Quit();
+            return true;
+        }
+
+        return false;
+    }
+
+    // "close" button pressed on window?
+    if (ev->type == ev_quit)
+    {
+        // First click on close button = bring up quit confirm message.
+        // Second click on close button = confirm quit
+
+        if (menuactive && messageToPrint && messageRoutine == M_QuitResponse)
+        {
+            M_QuitResponse(key_menu_confirm);
+        }
+        else
+        {
+            S_StartSound(NULL,sfx_swtchn);
+            M_QuitDOOM(0);
+        }
+
+        return true;
+    }
+
+    // key is the key pressed, ch is the actual character typed
+  
+    ch = 0;
+    key = -1;
+	
+    if (ev->type == ev_joystick)
+    {
+        // Simulate key presses from joystick events to interact with the menu.
+
+        if (menuactive)
+        {
+            if (JOY_GET_DPAD(ev->data6) != JOY_DIR_NONE)
+            {
+                dir = JOY_GET_DPAD(ev->data6);
+            }
+            else if (JOY_GET_LSTICK(ev->data6) != JOY_DIR_NONE)
+            {
+                dir = JOY_GET_LSTICK(ev->data6);
+            }
+            else
+            {
+                dir = JOY_GET_RSTICK(ev->data6);
+            }
+
+            if (dir & JOY_DIR_UP)
+            {
+                key = key_menu_up;
+                joywait = I_GetTime() + 5;
+            }
+            else if (dir & JOY_DIR_DOWN)
+            {
+                key = key_menu_down;
+                joywait = I_GetTime() + 5;
+            }
+            if (dir & JOY_DIR_LEFT)
+            {
+                key = key_menu_left;
+                joywait = I_GetTime() + 5;
+            }
+            else if (dir & JOY_DIR_RIGHT)
+            {
+                key = key_menu_right;
+                joywait = I_GetTime() + 5;
+            }
+
+#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
+#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (ev->data1 & (1 << (x))) != 0)
+
+            if (JOY_BUTTON_PRESSED(joybfire))
+            {
+                // Simulate a 'Y' keypress when Doom show a Y/N dialog with Fire button.
+                if (messageToPrint && messageNeedsInput)
+                {
+                    key = key_menu_confirm;
+                }
+                // Simulate pressing "Enter" when we are supplying a save slot name
+                else if (saveStringEnter)
+                {
+                    key = KEY_ENTER;
+                }
+                else
+                {
+                    // if selecting a save slot via joypad, set a flag
+                    if (currentMenu == &SaveDef)
+                    {
+                        joypadSave = true;
+                    }
+                    key = key_menu_forward;
+                }
+                joywait = I_GetTime() + 5;
+            }
+            if (JOY_BUTTON_PRESSED(joybuse))
+            {
+                // Simulate a 'N' keypress when Doom show a Y/N dialog with Use button.
+                if (messageToPrint && messageNeedsInput)
+                {
+                    key = key_menu_abort;
+                }
+                // If user was entering a save name, back out
+                else if (saveStringEnter)
+                {
+                    key = KEY_ESCAPE;
+                }
+                else
+                {
+                    key = key_menu_back;
+                }
+                joywait = I_GetTime() + 5;
+            }
+        }
+        if (JOY_BUTTON_PRESSED(joybmenu))
+        {
+            key = key_menu_activate;
+            joywait = I_GetTime() + 5;
+        }
+    }
+    else
+    {
+	if (ev->type == ev_mouse && mousewait < I_GetTime() && menuactive)
+	{
+	    mousey += ev->data3;
+	    if (mousey < lasty-30)
+	    {
+		key = key_menu_down;
+		mousewait = I_GetTime() + 5;
+		mousey = lasty -= 30;
+	    }
+	    else if (mousey > lasty+30)
+	    {
+		key = key_menu_up;
+		mousewait = I_GetTime() + 5;
+		mousey = lasty += 30;
+	    }
+		
+	    mousex += ev->data2;
+	    if (mousex < lastx-30)
+	    {
+		key = key_menu_left;
+		mousewait = I_GetTime() + 5;
+		mousex = lastx -= 30;
+	    }
+	    else if (mousex > lastx+30)
+	    {
+		key = key_menu_right;
+		mousewait = I_GetTime() + 5;
+		mousex = lastx += 30;
+	    }
+		
+	    if (ev->data1&1)
+	    {
+		key = key_menu_forward;
+		mousewait = I_GetTime() + 15;
+	    }
+			
+	    if (ev->data1&2)
+	    {
+		key = key_menu_back;
+		mousewait = I_GetTime() + 15;
+	    }
+	}
+	else
+	{
+	    if (ev->type == ev_keydown)
+	    {
+		key = ev->data1;
+		ch = ev->data2;
+	    }
+	}
+    }
+    
+    if (key == -1)
+	return false;
+
+    // Save Game string input
+    if (saveStringEnter)
+    {
+	switch(key)
+	{
+	  case KEY_BACKSPACE:
+	    if (saveCharIndex > 0)
+	    {
+		saveCharIndex--;
+		savegamestrings[saveSlot][saveCharIndex] = 0;
+	    }
+	    break;
+
+          case KEY_ESCAPE:
+            saveStringEnter = 0;
+            I_StopTextInput();
+            M_StringCopy(savegamestrings[saveSlot], saveOldString,
+                         SAVESTRINGSIZE);
+            break;
+
+	  case KEY_ENTER:
+	    saveStringEnter = 0;
+            I_StopTextInput();
+	    if (savegamestrings[saveSlot][0])
+		M_DoSave(saveSlot);
+	    break;
+
+	  default:
+            // Savegame name entry. This is complicated.
+            // Vanilla has a bug where the shift key is ignored when entering
+            // a savegame name. If vanilla_keyboard_mapping is on, we want
+            // to emulate this bug by using ev->data1. But if it's turned off,
+            // it implies the user doesn't care about Vanilla emulation:
+            // instead, use ev->data3 which gives the fully-translated and
+            // modified key input.
+
+            if (ev->type != ev_keydown)
+            {
+                break;
+            }
+            if (vanilla_keyboard_mapping)
+            {
+                ch = ev->data1;
+            }
+            else
+            {
+                ch = ev->data3;
+            }
+
+            ch = toupper(ch);
+
+            if (ch != ' '
+             && (ch - HU_FONTSTART < 0 || ch - HU_FONTSTART >= HU_FONTSIZE))
+            {
+                break;
+            }
+
+	    if (ch >= 32 && ch <= 127 &&
+		saveCharIndex < SAVESTRINGSIZE-1 &&
+		M_StringWidth(savegamestrings[saveSlot]) <
+		(SAVESTRINGSIZE-2)*8)
+	    {
+		savegamestrings[saveSlot][saveCharIndex++] = ch;
+		savegamestrings[saveSlot][saveCharIndex] = 0;
+	    }
+	    break;
+	}
+	return true;
+    }
+
+    // Take care of any messages that need input
+    if (messageToPrint)
+    {
+	if (messageNeedsInput)
+        {
+            if (key != ' ' && key != KEY_ESCAPE
+             && key != key_menu_confirm && key != key_menu_abort)
+            {
+                return false;
+            }
+	}
+
+	menuactive = messageLastMenuActive;
+	messageToPrint = 0;
+	if (messageRoutine)
+	    messageRoutine(key);
+
+	menuactive = false;
+	S_StartSound(NULL,sfx_swtchx);
+	return true;
+    }
+
+    if ((devparm && key == key_menu_help) ||
+        (key != 0 && key == key_menu_screenshot))
+    {
+	G_ScreenShot ();
+	return true;
+    }
+
+    // F-Keys
+    if (!menuactive)
+    {
+	if (key == key_menu_decscreen)      // Screen size down
+        {
+	    if (automapactive || chat_on)
+		return false;
+	    M_SizeDisplay(0);
+	    S_StartSound(NULL,sfx_stnmov);
+	    return true;
+	}
+        else if (key == key_menu_incscreen) // Screen size up
+        {
+	    if (automapactive || chat_on)
+		return false;
+	    M_SizeDisplay(1);
+	    S_StartSound(NULL,sfx_stnmov);
+	    return true;
+	}
+        else if (key == key_menu_help)     // Help key
+        {
+	    M_StartControlPanel ();
+
+	    if (gameversion >= exe_ultimate)
+	      currentMenu = &ReadDef2;
+	    else
+	      currentMenu = &ReadDef1;
+
+	    itemOn = 0;
+	    S_StartSound(NULL,sfx_swtchn);
+	    return true;
+	}
+        else if (key == key_menu_save)     // Save
+        {
+	    M_StartControlPanel();
+	    S_StartSound(NULL,sfx_swtchn);
+	    M_SaveGame(0);
+	    return true;
+        }
+        else if (key == key_menu_load)     // Load
+        {
+	    M_StartControlPanel();
+	    S_StartSound(NULL,sfx_swtchn);
+	    M_LoadGame(0);
+	    return true;
+        }
+        else if (key == key_menu_volume)   // Sound Volume
+        {
+	    M_StartControlPanel ();
+	    currentMenu = &SoundDef;
+	    itemOn = sfx_vol;
+	    S_StartSound(NULL,sfx_swtchn);
+	    return true;
+	}
+        else if (key == key_menu_detail)   // Detail toggle
+        {
+	    M_ChangeDetail(0);
+	    S_StartSound(NULL,sfx_swtchn);
+	    return true;
+        }
+        else if (key == key_menu_qsave)    // Quicksave
+        {
+	    S_StartSound(NULL,sfx_swtchn);
+	    M_QuickSave();
+	    return true;
+        }
+        else if (key == key_menu_endgame)  // End game
+        {
+	    S_StartSound(NULL,sfx_swtchn);
+	    M_EndGame(0);
+	    return true;
+        }
+        else if (key == key_menu_messages) // Toggle messages
+        {
+	    M_ChangeMessages(0);
+	    S_StartSound(NULL,sfx_swtchn);
+	    return true;
+        }
+        else if (key == key_menu_qload)    // Quickload
+        {
+	    S_StartSound(NULL,sfx_swtchn);
+	    M_QuickLoad();
+	    return true;
+        }
+        else if (key == key_menu_quit)     // Quit DOOM
+        {
+	    S_StartSound(NULL,sfx_swtchn);
+	    M_QuitDOOM(0);
+	    return true;
+        }
+        else if (key == key_menu_gamma)    // gamma toggle
+        {
+	    usegamma++;
+	    if (usegamma > 4)
+		usegamma = 0;
+	    players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
+            I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
+	    return true;
+	}
+    }
+
+    // Pop-up menu?
+    if (!menuactive)
+    {
+	if (key == key_menu_activate)
+	{
+	    M_StartControlPanel ();
+	    S_StartSound(NULL,sfx_swtchn);
+	    return true;
+	}
+	return false;
+    }
+
+    // Keys usable within menu
+
+    if (key == key_menu_down)
+    {
+        // Move down to next item
+
+        do
+	{
+	    if (itemOn+1 > currentMenu->numitems-1)
+		itemOn = 0;
+	    else itemOn++;
+	    S_StartSound(NULL,sfx_pstop);
+	} while(currentMenu->menuitems[itemOn].status==-1);
+
+	return true;
+    }
+    else if (key == key_menu_up)
+    {
+        // Move back up to previous item
+
+	do
+	{
+	    if (!itemOn)
+		itemOn = currentMenu->numitems-1;
+	    else itemOn--;
+	    S_StartSound(NULL,sfx_pstop);
+	} while(currentMenu->menuitems[itemOn].status==-1);
+
+	return true;
+    }
+    else if (key == key_menu_left)
+    {
+        // Slide slider left
+
+	if (currentMenu->menuitems[itemOn].routine &&
+	    currentMenu->menuitems[itemOn].status == 2)
+	{
+	    S_StartSound(NULL,sfx_stnmov);
+	    currentMenu->menuitems[itemOn].routine(0);
+	}
+	return true;
+    }
+    else if (key == key_menu_right)
+    {
+        // Slide slider right
+
+	if (currentMenu->menuitems[itemOn].routine &&
+	    currentMenu->menuitems[itemOn].status == 2)
+	{
+	    S_StartSound(NULL,sfx_stnmov);
+	    currentMenu->menuitems[itemOn].routine(1);
+	}
+	return true;
+    }
+    else if (key == key_menu_forward)
+    {
+        // Activate menu item
+
+	if (currentMenu->menuitems[itemOn].routine &&
+	    currentMenu->menuitems[itemOn].status)
+	{
+	    currentMenu->lastOn = itemOn;
+	    if (currentMenu->menuitems[itemOn].status == 2)
+	    {
+		currentMenu->menuitems[itemOn].routine(1);      // right arrow
+		S_StartSound(NULL,sfx_stnmov);
+	    }
+	    else
+	    {
+		currentMenu->menuitems[itemOn].routine(itemOn);
+		S_StartSound(NULL,sfx_pistol);
+	    }
+	}
+	return true;
+    }
+    else if (key == key_menu_activate)
+    {
+        // Deactivate menu
+
+	currentMenu->lastOn = itemOn;
+	M_ClearMenus ();
+	S_StartSound(NULL,sfx_swtchx);
+	return true;
+    }
+    else if (key == key_menu_back)
+    {
+        // Go back to previous menu
+
+	currentMenu->lastOn = itemOn;
+	if (currentMenu->prevMenu)
+	{
+	    currentMenu = currentMenu->prevMenu;
+	    itemOn = currentMenu->lastOn;
+	    S_StartSound(NULL,sfx_swtchn);
+	}
+	return true;
+    }
+
+    // Keyboard shortcut?
+    // Vanilla Doom has a weird behavior where it jumps to the scroll bars
+    // when the certain keys are pressed, so emulate this.
+
+    else if (ch != 0 || IsNullKey(key))
+    {
+	for (i = itemOn+1;i < currentMenu->numitems;i++)
+        {
+	    if (currentMenu->menuitems[i].alphaKey == ch)
+	    {
+		itemOn = i;
+		S_StartSound(NULL,sfx_pstop);
+		return true;
+	    }
+        }
+
+	for (i = 0;i <= itemOn;i++)
+        {
+	    if (currentMenu->menuitems[i].alphaKey == ch)
+	    {
+		itemOn = i;
+		S_StartSound(NULL,sfx_pstop);
+		return true;
+	    }
+        }
+    }
+
+    return false;
+}
+
+
+
+//
+// M_StartControlPanel
+//
+void M_StartControlPanel (void)
+{
+    // intro might call this repeatedly
+    if (menuactive)
+	return;
+    
+    menuactive = 1;
+    currentMenu = &MainDef;         // JDC
+    itemOn = currentMenu->lastOn;   // JDC
+}
+
+// Display OPL debug messages - hack for GENMIDI development.
+
+static void M_DrawOPLDev(void)
+{
+    char debug[1024];
+    char *curr, *p;
+    int line;
+
+    I_OPL_DevMessages(debug, sizeof(debug));
+    curr = debug;
+    line = 0;
+
+    for (;;)
+    {
+        p = strchr(curr, '\n');
+
+        if (p != NULL)
+        {
+            *p = '\0';
+        }
+
+        M_WriteText(0, line * 8, curr);
+        ++line;
+
+        if (p == NULL)
+        {
+            break;
+        }
+
+        curr = p + 1;
+    }
+}
+
+//
+// M_Drawer
+// Called after the view has been rendered,
+// but before it has been blitted.
+//
+void M_Drawer (void)
+{
+    static short	x;
+    static short	y;
+    unsigned int	i;
+    unsigned int	max;
+    char		string[80];
+    const char          *name;
+    int			start;
+
+    inhelpscreens = false;
+    
+    // Horiz. & Vertically center string and print it.
+    if (messageToPrint)
+    {
+	start = 0;
+	y = SCREENHEIGHT/2 - M_StringHeight(messageString) / 2;
+	while (messageString[start] != '\0')
+	{
+	    boolean foundnewline = false;
+
+            for (i = 0; messageString[start + i] != '\0'; i++)
+            {
+                if (messageString[start + i] == '\n')
+                {
+                    M_StringCopy(string, messageString + start,
+                                 sizeof(string));
+                    if (i < sizeof(string))
+                    {
+                        string[i] = '\0';
+                    }
+
+                    foundnewline = true;
+                    start += i + 1;
+                    break;
+                }
+            }
+
+            if (!foundnewline)
+            {
+                M_StringCopy(string, messageString + start, sizeof(string));
+                start += strlen(string);
+            }
+
+	    x = SCREENWIDTH/2 - M_StringWidth(string) / 2;
+	    M_WriteText(x, y, string);
+	    y += SHORT(hu_font[0]->height);
+	}
+
+	return;
+    }
+
+    if (opldev)
+    {
+        M_DrawOPLDev();
+    }
+
+    if (!menuactive)
+	return;
+
+    if (currentMenu->routine)
+	currentMenu->routine();         // call Draw routine
+    
+    // DRAW MENU
+    x = currentMenu->x;
+    y = currentMenu->y;
+    max = currentMenu->numitems;
+
+    for (i=0;i<max;i++)
+    {
+        name = DEH_String(currentMenu->menuitems[i].name);
+
+	if (name[0] && W_CheckNumForName(name) > 0)
+	{
+	    V_DrawPatchDirect (x, y, W_CacheLumpName(name, PU_CACHE));
+	}
+	y += LINEHEIGHT;
+    }
+
+    
+    // DRAW SKULL
+    V_DrawPatchDirect(x + SKULLXOFF, currentMenu->y - 5 + itemOn*LINEHEIGHT,
+		      W_CacheLumpName(DEH_String(skullName[whichSkull]),
+				      PU_CACHE));
+}
+
+
+//
+// M_ClearMenus
+//
+void M_ClearMenus (void)
+{
+    menuactive = 0;
+    // if (!netgame && usergame && paused)
+    //       sendpause = true;
+}
+
+
+
+
+//
+// M_SetupNextMenu
+//
+void M_SetupNextMenu(menu_t *menudef)
+{
+    currentMenu = menudef;
+    itemOn = currentMenu->lastOn;
+}
+
+
+//
+// M_Ticker
+//
+void M_Ticker (void)
+{
+    if (--skullAnimCounter <= 0)
+    {
+	whichSkull ^= 1;
+	skullAnimCounter = 8;
+    }
+}
+
+
+//
+// M_Init
+//
+void M_Init (void)
+{
+    currentMenu = &MainDef;
+    menuactive = 0;
+    itemOn = currentMenu->lastOn;
+    whichSkull = 0;
+    skullAnimCounter = 10;
+    screenSize = screenblocks - 3;
+    messageToPrint = 0;
+    messageString = NULL;
+    messageLastMenuActive = menuactive;
+    quickSaveSlot = -1;
+
+    // Here we could catch other version dependencies,
+    //  like HELP1/2, and four episodes.
+
+    // The same hacks were used in the original Doom EXEs.
+
+    if (gameversion >= exe_ultimate)
+    {
+        MainMenu[readthis].routine = M_ReadThis2;
+        ReadDef2.prevMenu = NULL;
+    }
+
+    if (gameversion >= exe_final && gameversion <= exe_final2)
+    {
+        ReadDef2.routine = M_DrawReadThisCommercial;
+    }
+
+    if (gamemode == commercial)
+    {
+        MainMenu[readthis] = MainMenu[quitdoom];
+        MainDef.numitems--;
+        MainDef.y += 8;
+        NewDef.prevMenu = &MainDef;
+        ReadDef1.routine = M_DrawReadThisCommercial;
+        ReadDef1.x = 330;
+        ReadDef1.y = 165;
+        ReadMenu1[rdthsempty1].routine = M_FinishReadThis;
+    }
+
+    // Versions of doom.exe before the Ultimate Doom release only had
+    // three episodes; if we're emulating one of those then don't try
+    // to show episode four. If we are, then do show episode four
+    // (should crash if missing).
+    if (gameversion < exe_ultimate)
+    {
+        EpiDef.numitems--;
+    }
+    // chex.exe shows only one episode.
+    else if (gameversion == exe_chex)
+    {
+        EpiDef.numitems = 1;
+    }
+
+    opldev = M_CheckParm("-opldev") > 0;
+}
+
diff --git a/games/NXDoom/src/doom/m_menu.h b/games/NXDoom/src/doom/m_menu.h
new file mode 100644
index 000000000..2c7867f12
--- /dev/null
+++ b/games/NXDoom/src/doom/m_menu.h
@@ -0,0 +1,62 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Menu widget stuff, episode selection and such.
+//    
+
+
+#ifndef __M_MENU__
+#define __M_MENU__
+
+
+
+#include "d_event.h"
+
+//
+// MENUS
+//
+// Called by main loop,
+// saves config file and calls I_Quit when user exits.
+// Even when the menu is not displayed,
+// this can resize the view and change game parameters.
+// Does all the real work of the menu interaction.
+boolean M_Responder (event_t *ev);
+
+
+// Called by main loop,
+// only used for menu (skull cursor) animation.
+void M_Ticker (void);
+
+// Called by main loop,
+// draws the menus directly into the screen buffer.
+void M_Drawer (void);
+
+// Called by D_DoomMain,
+// loads the config file.
+void M_Init (void);
+
+// Called by intro code to force menu up upon a keypress,
+// does nothing if menu is already up.
+void M_StartControlPanel (void);
+
+
+extern int detailLevel;
+extern int screenblocks;
+
+extern boolean inhelpscreens;
+extern int showMessages;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/m_random.c b/games/NXDoom/src/doom/m_random.c
new file mode 100644
index 000000000..b4f59b33f
--- /dev/null
+++ b/games/NXDoom/src/doom/m_random.c
@@ -0,0 +1,72 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Random number LUT.
+//
+
+//
+// M_Random
+// Returns a 0-255 number
+//
+
+static const unsigned char rndtable[256] = {
+    0,   8, 109, 220, 222, 241, 149, 107,  75, 248, 254, 140,  16,  66 ,
+    74,  21, 211,  47,  80, 242, 154,  27, 205, 128, 161,  89,  77,  36 ,
+    95, 110,  85,  48, 212, 140, 211, 249,  22,  79, 200,  50,  28, 188 ,
+    52, 140, 202, 120,  68, 145,  62,  70, 184, 190,  91, 197, 152, 224 ,
+    149, 104,  25, 178, 252, 182, 202, 182, 141, 197,   4,  81, 181, 242 ,
+    145,  42,  39, 227, 156, 198, 225, 193, 219,  93, 122, 175, 249,   0 ,
+    175, 143,  70, 239,  46, 246, 163,  53, 163, 109, 168, 135,   2, 235 ,
+    25,  92,  20, 145, 138,  77,  69, 166,  78, 176, 173, 212, 166, 113 ,
+    94, 161,  41,  50, 239,  49, 111, 164,  70,  60,   2,  37, 171,  75 ,
+    136, 156,  11,  56,  42, 146, 138, 229,  73, 146,  77,  61,  98, 196 ,
+    135, 106,  63, 197, 195,  86,  96, 203, 113, 101, 170, 247, 181, 113 ,
+    80, 250, 108,   7, 255, 237, 129, 226,  79, 107, 112, 166, 103, 241 ,
+    24, 223, 239, 120, 198,  58,  60,  82, 128,   3, 184,  66, 143, 224 ,
+    145, 224,  81, 206, 163,  45,  63,  90, 168, 114,  59,  33, 159,  95 ,
+    28, 139, 123,  98, 125, 196,  15,  70, 194, 253,  54,  14, 109, 226 ,
+    71,  17, 161,  93, 186,  87, 244, 138,  20,  52, 123, 251,  26,  36 ,
+    17,  46,  52, 231, 232,  76,  31, 221,  84,  37, 216, 165, 212, 106 ,
+    197, 242,  98,  43,  39, 175, 254, 145, 190,  84, 118, 222, 187, 136 ,
+    120, 163, 236, 249
+};
+
+int	rndindex = 0;
+int	prndindex = 0;
+
+// Which one is deterministic?
+int P_Random (void)
+{
+    prndindex = (prndindex+1)&0xff;
+    return rndtable[prndindex];
+}
+
+int M_Random (void)
+{
+    rndindex = (rndindex+1)&0xff;
+    return rndtable[rndindex];
+}
+
+void M_ClearRandom (void)
+{
+    rndindex = prndindex = 0;
+}
+
+// inspired by the same routine in Eternity, thanks haleyjd
+int P_SubRandom (void)
+{
+    int r = P_Random();
+    return r - P_Random();
+}
diff --git a/games/NXDoom/src/doom/m_random.h b/games/NXDoom/src/doom/m_random.h
new file mode 100644
index 000000000..902691f1d
--- /dev/null
+++ b/games/NXDoom/src/doom/m_random.h
@@ -0,0 +1,40 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//    
+
+
+#ifndef __M_RANDOM__
+#define __M_RANDOM__
+
+
+#include "doomtype.h"
+
+
+// Returns a number from 0 to 255,
+// from a lookup table.
+int M_Random (void);
+
+// As M_Random, but used only by the play simulation.
+int P_Random (void);
+
+// Fix randoms for demos.
+void M_ClearRandom (void);
+
+// Defined version of P_Random() - P_Random()
+int P_SubRandom (void);
+
+#endif
diff --git a/games/NXDoom/src/doom/p_ceilng.c b/games/NXDoom/src/doom/p_ceilng.c
new file mode 100644
index 000000000..d1e61c898
--- /dev/null
+++ b/games/NXDoom/src/doom/p_ceilng.c
@@ -0,0 +1,324 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
+//
+
+
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+//
+// CEILINGS
+//
+
+
+ceiling_t*	activeceilings[MAXCEILINGS];
+
+
+//
+// T_MoveCeiling
+//
+
+void T_MoveCeiling (ceiling_t* ceiling)
+{
+    result_e	res;
+	
+    switch(ceiling->direction)
+    {
+      case 0:
+	// IN STASIS
+	break;
+      case 1:
+	// UP
+	res = T_MovePlane(ceiling->sector,
+			  ceiling->speed,
+			  ceiling->topheight,
+			  false,1,ceiling->direction);
+	
+	if (!(leveltime&7))
+	{
+	    switch(ceiling->type)
+	    {
+	      case silentCrushAndRaise:
+		break;
+	      default:
+		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
+		// ?
+		break;
+	    }
+	}
+	
+	if (res == pastdest)
+	{
+	    switch(ceiling->type)
+	    {
+	      case raiseToHighest:
+		P_RemoveActiveCeiling(ceiling);
+		break;
+		
+	      case silentCrushAndRaise:
+		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
+	      case fastCrushAndRaise:
+	      case crushAndRaise:
+		ceiling->direction = -1;
+		break;
+		
+	      default:
+		break;
+	    }
+	    
+	}
+	break;
+	
+      case -1:
+	// DOWN
+	res = T_MovePlane(ceiling->sector,
+			  ceiling->speed,
+			  ceiling->bottomheight,
+			  ceiling->crush,1,ceiling->direction);
+	
+	if (!(leveltime&7))
+	{
+	    switch(ceiling->type)
+	    {
+	      case silentCrushAndRaise: break;
+	      default:
+		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
+	    }
+	}
+	
+	if (res == pastdest)
+	{
+	    switch(ceiling->type)
+	    {
+	      case silentCrushAndRaise:
+		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
+	      case crushAndRaise:
+		ceiling->speed = CEILSPEED;
+	      case fastCrushAndRaise:
+		ceiling->direction = 1;
+		break;
+
+	      case lowerAndCrush:
+	      case lowerToFloor:
+		P_RemoveActiveCeiling(ceiling);
+		break;
+
+	      default:
+		break;
+	    }
+	}
+	else // ( res != pastdest )
+	{
+	    if (res == crushed)
+	    {
+		switch(ceiling->type)
+		{
+		  case silentCrushAndRaise:
+		  case crushAndRaise:
+		  case lowerAndCrush:
+		    ceiling->speed = CEILSPEED / 8;
+		    break;
+
+		  default:
+		    break;
+		}
+	    }
+	}
+	break;
+    }
+}
+
+
+//
+// EV_DoCeiling
+// Move a ceiling up/down and all around!
+//
+int
+EV_DoCeiling
+( line_t*	line,
+  ceiling_e	type )
+{
+    int		secnum;
+    int		rtn;
+    sector_t*	sec;
+    ceiling_t*	ceiling;
+	
+    secnum = -1;
+    rtn = 0;
+    
+    //	Reactivate in-stasis ceilings...for certain types.
+    switch(type)
+    {
+      case fastCrushAndRaise:
+      case silentCrushAndRaise:
+      case crushAndRaise:
+	P_ActivateInStasisCeiling(line);
+      default:
+	break;
+    }
+	
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	sec = &sectors[secnum];
+	if (sec->specialdata)
+	    continue;
+	
+	// new door thinker
+	rtn = 1;
+	ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVSPEC, 0);
+	P_AddThinker (&ceiling->thinker);
+	sec->specialdata = ceiling;
+	ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+	ceiling->sector = sec;
+	ceiling->crush = false;
+	
+	switch(type)
+	{
+	  case fastCrushAndRaise:
+	    ceiling->crush = true;
+	    ceiling->topheight = sec->ceilingheight;
+	    ceiling->bottomheight = sec->floorheight + (8*FRACUNIT);
+	    ceiling->direction = -1;
+	    ceiling->speed = CEILSPEED * 2;
+	    break;
+
+	  case silentCrushAndRaise:
+	  case crushAndRaise:
+	    ceiling->crush = true;
+	    ceiling->topheight = sec->ceilingheight;
+	  case lowerAndCrush:
+	  case lowerToFloor:
+	    ceiling->bottomheight = sec->floorheight;
+	    if (type != lowerToFloor)
+		ceiling->bottomheight += 8*FRACUNIT;
+	    ceiling->direction = -1;
+	    ceiling->speed = CEILSPEED;
+	    break;
+
+	  case raiseToHighest:
+	    ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
+	    ceiling->direction = 1;
+	    ceiling->speed = CEILSPEED;
+	    break;
+	}
+		
+	ceiling->tag = sec->tag;
+	ceiling->type = type;
+	P_AddActiveCeiling(ceiling);
+    }
+    return rtn;
+}
+
+
+//
+// Add an active ceiling
+//
+void P_AddActiveCeiling(ceiling_t* c)
+{
+    int		i;
+    
+    for (i = 0; i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i] == NULL)
+	{
+	    activeceilings[i] = c;
+	    return;
+	}
+    }
+}
+
+
+
+//
+// Remove a ceiling's thinker
+//
+void P_RemoveActiveCeiling(ceiling_t* c)
+{
+    int		i;
+	
+    for (i = 0;i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i] == c)
+	{
+	    activeceilings[i]->sector->specialdata = NULL;
+	    P_RemoveThinker (&activeceilings[i]->thinker);
+	    activeceilings[i] = NULL;
+	    break;
+	}
+    }
+}
+
+
+
+//
+// Restart a ceiling that's in-stasis
+//
+void P_ActivateInStasisCeiling(line_t* line)
+{
+    int		i;
+	
+    for (i = 0;i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i]
+	    && (activeceilings[i]->tag == line->tag)
+	    && (activeceilings[i]->direction == 0))
+	{
+	    activeceilings[i]->direction = activeceilings[i]->olddirection;
+	    activeceilings[i]->thinker.function.acp1
+	      = (actionf_p1)T_MoveCeiling;
+	}
+    }
+}
+
+
+
+//
+// EV_CeilingCrushStop
+// Stop a ceiling from crushing!
+//
+int	EV_CeilingCrushStop(line_t	*line)
+{
+    int		i;
+    int		rtn;
+	
+    rtn = 0;
+    for (i = 0;i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i]
+	    && (activeceilings[i]->tag == line->tag)
+	    && (activeceilings[i]->direction != 0))
+	{
+	    activeceilings[i]->olddirection = activeceilings[i]->direction;
+	    activeceilings[i]->thinker.function.acv = (actionf_v)NULL;
+	    activeceilings[i]->direction = 0;		// in-stasis
+	    rtn = 1;
+	}
+    }
+    
+
+    return rtn;
+}
diff --git a/games/NXDoom/src/doom/p_doors.c b/games/NXDoom/src/doom/p_doors.c
new file mode 100644
index 000000000..b0947248a
--- /dev/null
+++ b/games/NXDoom/src/doom/p_doors.c
@@ -0,0 +1,779 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION: Door animation code (opening/closing)
+//
+
+
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "deh_main.h"
+#include "p_local.h"
+#include "i_system.h"
+
+#include "s_sound.h"
+
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+#if 0
+//
+// Sliding door frame information
+//
+slidename_t	slideFrameNames[MAXSLIDEDOORS] =
+{
+    {"GDOORF1","GDOORF2","GDOORF3","GDOORF4",	// front
+     "GDOORB1","GDOORB2","GDOORB3","GDOORB4"},	// back
+	 
+    {"\0","\0","\0","\0"}
+};
+#endif
+
+
+//
+// VERTICAL DOORS
+//
+
+//
+// T_VerticalDoor
+//
+void T_VerticalDoor (vldoor_t* door)
+{
+    result_e	res;
+	
+    switch(door->direction)
+    {
+      case 0:
+	// WAITING
+	if (!--door->topcountdown)
+	{
+	    switch(door->type)
+	    {
+	      case vld_blazeRaise:
+		door->direction = -1; // time to go back down
+		S_StartSound(&door->sector->soundorg, sfx_bdcls);
+		break;
+		
+	      case vld_normal:
+		door->direction = -1; // time to go back down
+		S_StartSound(&door->sector->soundorg, sfx_dorcls);
+		break;
+		
+	      case vld_close30ThenOpen:
+		door->direction = 1;
+		S_StartSound(&door->sector->soundorg, sfx_doropn);
+		break;
+		
+	      default:
+		break;
+	    }
+	}
+	break;
+	
+      case 2:
+	//  INITIAL WAIT
+	if (!--door->topcountdown)
+	{
+	    switch(door->type)
+	    {
+	      case vld_raiseIn5Mins:
+		door->direction = 1;
+		door->type = vld_normal;
+		S_StartSound(&door->sector->soundorg, sfx_doropn);
+		break;
+		
+	      default:
+		break;
+	    }
+	}
+	break;
+	
+      case -1:
+	// DOWN
+	res = T_MovePlane(door->sector,
+			  door->speed,
+			  door->sector->floorheight,
+			  false,1,door->direction);
+	if (res == pastdest)
+	{
+	    switch(door->type)
+	    {
+	      case vld_blazeRaise:
+	      case vld_blazeClose:
+		door->sector->specialdata = NULL;
+		P_RemoveThinker (&door->thinker);  // unlink and free
+		S_StartSound(&door->sector->soundorg, sfx_bdcls);
+		break;
+		
+	      case vld_normal:
+	      case vld_close:
+		door->sector->specialdata = NULL;
+		P_RemoveThinker (&door->thinker);  // unlink and free
+		break;
+		
+	      case vld_close30ThenOpen:
+		door->direction = 0;
+		door->topcountdown = TICRATE*30;
+		break;
+		
+	      default:
+		break;
+	    }
+	}
+	else if (res == crushed)
+	{
+	    switch(door->type)
+	    {
+	      case vld_blazeClose:
+	      case vld_close:		// DO NOT GO BACK UP!
+		break;
+		
+	      default:
+		door->direction = 1;
+		S_StartSound(&door->sector->soundorg, sfx_doropn);
+		break;
+	    }
+	}
+	break;
+	
+      case 1:
+	// UP
+	res = T_MovePlane(door->sector,
+			  door->speed,
+			  door->topheight,
+			  false,1,door->direction);
+	
+	if (res == pastdest)
+	{
+	    switch(door->type)
+	    {
+	      case vld_blazeRaise:
+	      case vld_normal:
+		door->direction = 0; // wait at top
+		door->topcountdown = door->topwait;
+		break;
+		
+	      case vld_close30ThenOpen:
+	      case vld_blazeOpen:
+	      case vld_open:
+		door->sector->specialdata = NULL;
+		P_RemoveThinker (&door->thinker);  // unlink and free
+		break;
+		
+	      default:
+		break;
+	    }
+	}
+	break;
+    }
+}
+
+
+//
+// EV_DoLockedDoor
+// Move a locked door up/down
+//
+
+int
+EV_DoLockedDoor
+( line_t*	line,
+  vldoor_e	type,
+  mobj_t*	thing )
+{
+    player_t*	p;
+	
+    p = thing->player;
+	
+    if (!p)
+	return 0;
+		
+    switch(line->special)
+    {
+      case 99:	// Blue Lock
+      case 133:
+	if (!p->cards[it_bluecard] && !p->cards[it_blueskull])
+	{
+	    p->message = DEH_String(PD_BLUEO);
+	    S_StartSound(NULL,sfx_oof);
+	    return 0;
+	}
+	break;
+	
+      case 134: // Red Lock
+      case 135:
+	if (!p->cards[it_redcard] && !p->cards[it_redskull])
+	{
+	    p->message = DEH_String(PD_REDO);
+	    S_StartSound(NULL,sfx_oof);
+	    return 0;
+	}
+	break;
+	
+      case 136:	// Yellow Lock
+      case 137:
+	if (!p->cards[it_yellowcard] &&
+	    !p->cards[it_yellowskull])
+	{
+	    p->message = DEH_String(PD_YELLOWO);
+	    S_StartSound(NULL,sfx_oof);
+	    return 0;
+	}
+	break;	
+    }
+
+    return EV_DoDoor(line,type);
+}
+
+
+int
+EV_DoDoor
+( line_t*	line,
+  vldoor_e	type )
+{
+    int		secnum,rtn;
+    sector_t*	sec;
+    vldoor_t*	door;
+	
+    secnum = -1;
+    rtn = 0;
+    
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	sec = &sectors[secnum];
+	if (sec->specialdata)
+	    continue;
+		
+	
+	// new door thinker
+	rtn = 1;
+	door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+	P_AddThinker (&door->thinker);
+	sec->specialdata = door;
+
+	door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
+	door->sector = sec;
+	door->type = type;
+	door->topwait = VDOORWAIT;
+	door->speed = VDOORSPEED;
+		
+	switch(type)
+	{
+	  case vld_blazeClose:
+	    door->topheight = P_FindLowestCeilingSurrounding(sec);
+	    door->topheight -= 4*FRACUNIT;
+	    door->direction = -1;
+	    door->speed = VDOORSPEED * 4;
+	    S_StartSound(&door->sector->soundorg, sfx_bdcls);
+	    break;
+	    
+	  case vld_close:
+	    door->topheight = P_FindLowestCeilingSurrounding(sec);
+	    door->topheight -= 4*FRACUNIT;
+	    door->direction = -1;
+	    S_StartSound(&door->sector->soundorg, sfx_dorcls);
+	    break;
+	    
+	  case vld_close30ThenOpen:
+	    door->topheight = sec->ceilingheight;
+	    door->direction = -1;
+	    S_StartSound(&door->sector->soundorg, sfx_dorcls);
+	    break;
+	    
+	  case vld_blazeRaise:
+	  case vld_blazeOpen:
+	    door->direction = 1;
+	    door->topheight = P_FindLowestCeilingSurrounding(sec);
+	    door->topheight -= 4*FRACUNIT;
+	    door->speed = VDOORSPEED * 4;
+	    if (door->topheight != sec->ceilingheight)
+		S_StartSound(&door->sector->soundorg, sfx_bdopn);
+	    break;
+	    
+	  case vld_normal:
+	  case vld_open:
+	    door->direction = 1;
+	    door->topheight = P_FindLowestCeilingSurrounding(sec);
+	    door->topheight -= 4*FRACUNIT;
+	    if (door->topheight != sec->ceilingheight)
+		S_StartSound(&door->sector->soundorg, sfx_doropn);
+	    break;
+	    
+	  default:
+	    break;
+	}
+		
+    }
+    return rtn;
+}
+
+
+//
+// EV_VerticalDoor : open a door manually, no tag value
+//
+void
+EV_VerticalDoor
+( line_t*	line,
+  mobj_t*	thing )
+{
+    player_t*	player;
+    sector_t*	sec;
+    vldoor_t*	door;
+    int		side;
+	
+    side = 0;	// only front sides can be used
+
+    //	Check for locks
+    player = thing->player;
+		
+    switch(line->special)
+    {
+      case 26: // Blue Lock
+      case 32:
+	if ( !player )
+	    return;
+	
+	if (!player->cards[it_bluecard] && !player->cards[it_blueskull])
+	{
+	    player->message = DEH_String(PD_BLUEK);
+	    S_StartSound(NULL,sfx_oof);
+	    return;
+	}
+	break;
+	
+      case 27: // Yellow Lock
+      case 34:
+	if ( !player )
+	    return;
+	
+	if (!player->cards[it_yellowcard] &&
+	    !player->cards[it_yellowskull])
+	{
+	    player->message = DEH_String(PD_YELLOWK);
+	    S_StartSound(NULL,sfx_oof);
+	    return;
+	}
+	break;
+	
+      case 28: // Red Lock
+      case 33:
+	if ( !player )
+	    return;
+	
+	if (!player->cards[it_redcard] && !player->cards[it_redskull])
+	{
+	    player->message = DEH_String(PD_REDK);
+	    S_StartSound(NULL,sfx_oof);
+	    return;
+	}
+	break;
+    }
+	
+    // if the sector has an active thinker, use it
+
+    if (line->sidenum[side^1] == -1)
+    {
+        I_Error("EV_VerticalDoor: DR special type on 1-sided linedef");
+    }
+
+    sec = sides[ line->sidenum[side^1]] .sector;
+
+    if (sec->specialdata)
+    {
+	door = sec->specialdata;
+	switch(line->special)
+	{
+	  case	1: // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
+	  case	26:
+	  case	27:
+	  case	28:
+	  case	117:
+	    if (door->direction == -1)
+		door->direction = 1;	// go back up
+	    else
+	    {
+		if (!thing->player)
+		    return;		// JDC: bad guys never close doors
+
+                // When is a door not a door?
+                // In Vanilla, door->direction is set, even though
+                // "specialdata" might not actually point at a door.
+
+                if (door->thinker.function.acp1 == (actionf_p1) T_VerticalDoor)
+                {
+                    door->direction = -1;	// start going down immediately
+                }
+                else if (door->thinker.function.acp1 == (actionf_p1) T_PlatRaise)
+                {
+                    // Erm, this is a plat, not a door.
+                    // This notably causes a problem in ep1-0500.lmp where
+                    // a plat and a door are cross-referenced; the door
+                    // doesn't open on 64-bit.
+                    // The direction field in vldoor_t corresponds to the wait
+                    // field in plat_t.  Let's set that to -1 instead.
+
+                    plat_t *plat;
+
+                    plat = (plat_t *) door;
+                    plat->wait = -1;
+                }
+                else
+                {
+                    // This isn't a door OR a plat.  Now we're in trouble.
+
+                    fprintf(stderr, "EV_VerticalDoor: Tried to close "
+                                    "something that wasn't a door.\n");
+
+                    // Try closing it anyway. At least it will work on 32-bit
+                    // machines.
+
+                    door->direction = -1;
+                }
+	    }
+	    return;
+	}
+    }
+	
+    // for proper sound
+    switch(line->special)
+    {
+      case 117:	// BLAZING DOOR RAISE
+      case 118:	// BLAZING DOOR OPEN
+	S_StartSound(&sec->soundorg,sfx_bdopn);
+	break;
+	
+      case 1:	// NORMAL DOOR SOUND
+      case 31:
+	S_StartSound(&sec->soundorg,sfx_doropn);
+	break;
+	
+      default:	// LOCKED DOOR SOUND
+	S_StartSound(&sec->soundorg,sfx_doropn);
+	break;
+    }
+	
+    
+    // new door thinker
+    door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+    P_AddThinker (&door->thinker);
+    sec->specialdata = door;
+    door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 1;
+    door->speed = VDOORSPEED;
+    door->topwait = VDOORWAIT;
+
+    switch(line->special)
+    {
+      case 1:
+      case 26:
+      case 27:
+      case 28:
+	door->type = vld_normal;
+	break;
+	
+      case 31:
+      case 32:
+      case 33:
+      case 34:
+	door->type = vld_open;
+	line->special = 0;
+	break;
+	
+      case 117:	// blazing door raise
+	door->type = vld_blazeRaise;
+	door->speed = VDOORSPEED*4;
+	break;
+      case 118:	// blazing door open
+	door->type = vld_blazeOpen;
+	line->special = 0;
+	door->speed = VDOORSPEED*4;
+	break;
+    }
+    
+    // find the top and bottom of the movement range
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4*FRACUNIT;
+}
+
+
+//
+// Spawn a door that closes after 30 seconds
+//
+void P_SpawnDoorCloseIn30 (sector_t* sec)
+{
+    vldoor_t*	door;
+	
+    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
+
+    P_AddThinker (&door->thinker);
+
+    sec->specialdata = door;
+    sec->special = 0;
+
+    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 0;
+    door->type = vld_normal;
+    door->speed = VDOORSPEED;
+    door->topcountdown = 30 * TICRATE;
+}
+
+//
+// Spawn a door that opens after 5 minutes
+//
+void
+P_SpawnDoorRaiseIn5Mins
+( sector_t*	sec,
+  int		secnum )
+{
+    vldoor_t*	door;
+	
+    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
+    
+    P_AddThinker (&door->thinker);
+
+    sec->specialdata = door;
+    sec->special = 0;
+
+    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 2;
+    door->type = vld_raiseIn5Mins;
+    door->speed = VDOORSPEED;
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4*FRACUNIT;
+    door->topwait = VDOORWAIT;
+    door->topcountdown = 5 * 60 * TICRATE;
+}
+
+
+
+// UNUSED
+// Separate into p_slidoor.c?
+
+#if 0		// ABANDONED TO THE MISTS OF TIME!!!
+//
+// EV_SlidingDoor : slide a door horizontally
+// (animate midtexture, then set noblocking line)
+//
+
+
+slideframe_t slideFrames[MAXSLIDEDOORS];
+
+void P_InitSlidingDoorFrames(void)
+{
+    int		i;
+    int		f1;
+    int		f2;
+    int		f3;
+    int		f4;
+	
+    // DOOM II ONLY...
+    if ( gamemode != commercial)
+	return;
+	
+    for (i = 0;i < MAXSLIDEDOORS; i++)
+    {
+	if (!slideFrameNames[i].frontFrame1[0])
+	    break;
+			
+	f1 = R_TextureNumForName(slideFrameNames[i].frontFrame1);
+	f2 = R_TextureNumForName(slideFrameNames[i].frontFrame2);
+	f3 = R_TextureNumForName(slideFrameNames[i].frontFrame3);
+	f4 = R_TextureNumForName(slideFrameNames[i].frontFrame4);
+
+	slideFrames[i].frontFrames[0] = f1;
+	slideFrames[i].frontFrames[1] = f2;
+	slideFrames[i].frontFrames[2] = f3;
+	slideFrames[i].frontFrames[3] = f4;
+		
+	f1 = R_TextureNumForName(slideFrameNames[i].backFrame1);
+	f2 = R_TextureNumForName(slideFrameNames[i].backFrame2);
+	f3 = R_TextureNumForName(slideFrameNames[i].backFrame3);
+	f4 = R_TextureNumForName(slideFrameNames[i].backFrame4);
+
+	slideFrames[i].backFrames[0] = f1;
+	slideFrames[i].backFrames[1] = f2;
+	slideFrames[i].backFrames[2] = f3;
+	slideFrames[i].backFrames[3] = f4;
+    }
+}
+
+
+//
+// Return index into "slideFrames" array
+// for which door type to use
+//
+int P_FindSlidingDoorType(line_t*	line)
+{
+    int		i;
+    int		val;
+	
+    for (i = 0;i < MAXSLIDEDOORS;i++)
+    {
+	val = sides[line->sidenum[0]].midtexture;
+	if (val == slideFrames[i].frontFrames[0])
+	    return i;
+    }
+	
+    return -1;
+}
+
+void T_SlidingDoor (slidedoor_t*	door)
+{
+    switch(door->status)
+    {
+      case sd_opening:
+	if (!door->timer--)
+	{
+	    if (++door->frame == SNUMFRAMES)
+	    {
+		// IF DOOR IS DONE OPENING...
+		sides[door->line->sidenum[0]].midtexture = 0;
+		sides[door->line->sidenum[1]].midtexture = 0;
+		door->line->flags &= ML_BLOCKING^0xff;
+					
+		if (door->type == sdt_openOnly)
+		{
+		    door->frontsector->specialdata = NULL;
+		    P_RemoveThinker (&door->thinker);
+		    break;
+		}
+					
+		door->timer = SDOORWAIT;
+		door->status = sd_waiting;
+	    }
+	    else
+	    {
+		// IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
+		door->timer = SWAITTICS;
+					
+		sides[door->line->sidenum[0]].midtexture =
+		    slideFrames[door->whichDoorIndex].
+		    frontFrames[door->frame];
+		sides[door->line->sidenum[1]].midtexture =
+		    slideFrames[door->whichDoorIndex].
+		    backFrames[door->frame];
+	    }
+	}
+	break;
+			
+      case sd_waiting:
+	// IF DOOR IS DONE WAITING...
+	if (!door->timer--)
+	{
+	    // CAN DOOR CLOSE?
+	    if (door->frontsector->thinglist != NULL ||
+		door->backsector->thinglist != NULL)
+	    {
+		door->timer = SDOORWAIT;
+		break;
+	    }
+
+	    //door->frame = SNUMFRAMES-1;
+	    door->status = sd_closing;
+	    door->timer = SWAITTICS;
+	}
+	break;
+			
+      case sd_closing:
+	if (!door->timer--)
+	{
+	    if (--door->frame < 0)
+	    {
+		// IF DOOR IS DONE CLOSING...
+		door->line->flags |= ML_BLOCKING;
+		door->frontsector->specialdata = NULL;
+		P_RemoveThinker (&door->thinker);
+		break;
+	    }
+	    else
+	    {
+		// IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
+		door->timer = SWAITTICS;
+					
+		sides[door->line->sidenum[0]].midtexture =
+		    slideFrames[door->whichDoorIndex].
+		    frontFrames[door->frame];
+		sides[door->line->sidenum[1]].midtexture =
+		    slideFrames[door->whichDoorIndex].
+		    backFrames[door->frame];
+	    }
+	}
+	break;
+    }
+}
+
+
+
+void
+EV_SlidingDoor
+( line_t*	line,
+  mobj_t*	thing )
+{
+    sector_t*		sec;
+    slidedoor_t*	door;
+	
+    // DOOM II ONLY...
+    if (gamemode != commercial)
+	return;
+    
+    // Make sure door isn't already being animated
+    sec = line->frontsector;
+    door = NULL;
+    if (sec->specialdata)
+    {
+	if (!thing->player)
+	    return;
+			
+	door = sec->specialdata;
+	if (door->type == sdt_openAndClose)
+	{
+	    if (door->status == sd_waiting)
+		door->status = sd_closing;
+	}
+	else
+	    return;
+    }
+    
+    // Init sliding door vars
+    if (!door)
+    {
+	door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+	P_AddThinker (&door->thinker);
+	sec->specialdata = door;
+		
+	door->type = sdt_openAndClose;
+	door->status = sd_opening;
+	door->whichDoorIndex = P_FindSlidingDoorType(line);
+
+	if (door->whichDoorIndex < 0)
+	    I_Error("EV_SlidingDoor: Can't use texture for sliding door!");
+			
+	door->frontsector = sec;
+	door->backsector = line->backsector;
+	door->thinker.function = T_SlidingDoor;
+	door->timer = SWAITTICS;
+	door->frame = 0;
+	door->line = line;
+    }
+}
+#endif
diff --git a/games/NXDoom/src/doom/p_enemy.c b/games/NXDoom/src/doom/p_enemy.c
new file mode 100644
index 000000000..c6acf390e
--- /dev/null
+++ b/games/NXDoom/src/doom/p_enemy.c
@@ -0,0 +1,2024 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Enemy thinking, AI.
+//	Action Pointer Functions
+//	that are associated with states/frames. 
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "m_random.h"
+#include "i_system.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+#include "g_game.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+
+
+
+typedef enum
+{
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+    
+} dirtype_t;
+
+
+//
+// P_NewChaseDir related LUT.
+//
+dirtype_t opposite[] =
+{
+  DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST,
+  DI_EAST, DI_NORTHEAST, DI_NORTH, DI_NORTHWEST, DI_NODIR
+};
+
+dirtype_t diags[] =
+{
+    DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST
+};
+
+
+
+
+
+void A_Fall (mobj_t *actor);
+
+
+//
+// ENEMY THINKING
+// Enemies are allways spawned
+// with targetplayer = -1, threshold = 0
+// Most monsters are spawned unaware of all players,
+// but some can be made preaware
+//
+
+
+//
+// Called by P_NoiseAlert.
+// Recursively traverse adjacent sectors,
+// sound blocking lines cut off traversal.
+//
+
+mobj_t*		soundtarget;
+
+void
+P_RecursiveSound
+( sector_t*	sec,
+  int		soundblocks )
+{
+    int		i;
+    line_t*	check;
+    sector_t*	other;
+	
+    // wake up all monsters in this sector
+    if (sec->validcount == validcount
+	&& sec->soundtraversed <= soundblocks+1)
+    {
+	return;		// already flooded
+    }
+    
+    sec->validcount = validcount;
+    sec->soundtraversed = soundblocks+1;
+    sec->soundtarget = soundtarget;
+	
+    for (i=0 ;i<sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	if (! (check->flags & ML_TWOSIDED) )
+	    continue;
+	
+	P_LineOpening (check);
+
+	if (openrange <= 0)
+	    continue;	// closed door
+	
+	if ( sides[ check->sidenum[0] ].sector == sec)
+	    other = sides[ check->sidenum[1] ] .sector;
+	else
+	    other = sides[ check->sidenum[0] ].sector;
+	
+	if (check->flags & ML_SOUNDBLOCK)
+	{
+	    if (!soundblocks)
+		P_RecursiveSound (other, 1);
+	}
+	else
+	    P_RecursiveSound (other, soundblocks);
+    }
+}
+
+
+
+//
+// P_NoiseAlert
+// If a monster yells at a player,
+// it will alert other monsters to the player.
+//
+void
+P_NoiseAlert
+( mobj_t*	target,
+  mobj_t*	emmiter )
+{
+    soundtarget = target;
+    validcount++;
+    P_RecursiveSound (emmiter->subsector->sector, 0);
+}
+
+
+
+
+//
+// P_CheckMeleeRange
+//
+boolean P_CheckMeleeRange (mobj_t*	actor)
+{
+    mobj_t*	pl;
+    fixed_t	dist;
+    fixed_t range;
+	
+    if (!actor->target)
+	return false;
+		
+    pl = actor->target;
+    dist = P_AproxDistance (pl->x-actor->x, pl->y-actor->y);
+
+    if (gameversion < exe_doom_1_5)
+        range = MELEERANGE;
+    else
+        range = MELEERANGE-20*FRACUNIT+pl->info->radius;
+
+    if (dist >= range)
+        return false;
+
+	
+    if (! P_CheckSight (actor, actor->target) )
+	return false;
+							
+    return true;		
+}
+
+//
+// P_CheckMissileRange
+//
+boolean P_CheckMissileRange (mobj_t* actor)
+{
+    fixed_t	dist;
+	
+    if (! P_CheckSight (actor, actor->target) )
+	return false;
+	
+    if ( actor->flags & MF_JUSTHIT )
+    {
+	// the target just hit the enemy,
+	// so fight back!
+	actor->flags &= ~MF_JUSTHIT;
+	return true;
+    }
+	
+    if (actor->reactiontime)
+	return false;	// do not attack yet
+		
+    // OPTIMIZE: get this from a global checksight
+    dist = P_AproxDistance ( actor->x-actor->target->x,
+			     actor->y-actor->target->y) - 64*FRACUNIT;
+    
+    if (!actor->info->meleestate)
+	dist -= 128*FRACUNIT;	// no melee attack, so fire more
+
+    dist >>= FRACBITS;
+
+    if (actor->type == MT_VILE)
+    {
+	if (dist > 14*64)	
+	    return false;	// too far away
+    }
+	
+
+    if (actor->type == MT_UNDEAD)
+    {
+	if (dist < 196)	
+	    return false;	// close for fist attack
+	dist >>= 1;
+    }
+	
+
+    if (actor->type == MT_CYBORG
+	|| actor->type == MT_SPIDER
+	|| actor->type == MT_SKULL)
+    {
+	dist >>= 1;
+    }
+    
+    if (dist > 200)
+	dist = 200;
+		
+    if (actor->type == MT_CYBORG && dist > 160)
+	dist = 160;
+		
+    if (P_Random () < dist)
+	return false;
+		
+    return true;
+}
+
+
+//
+// P_Move
+// Move in the current direction,
+// returns false if the move is blocked.
+//
+fixed_t	xspeed[8] = {FRACUNIT,47000,0,-47000,-FRACUNIT,-47000,0,47000};
+fixed_t yspeed[8] = {0,47000,FRACUNIT,47000,0,-47000,-FRACUNIT,-47000};
+
+boolean P_Move (mobj_t*	actor)
+{
+    fixed_t	tryx;
+    fixed_t	tryy;
+    
+    line_t*	ld;
+    
+    // warning: 'catch', 'throw', and 'try'
+    // are all C++ reserved words
+    boolean	try_ok;
+    boolean	good;
+		
+    if (actor->movedir == DI_NODIR)
+	return false;
+		
+    if ((unsigned)actor->movedir >= 8)
+	I_Error ("Weird actor->movedir!");
+		
+    tryx = actor->x + actor->info->speed*xspeed[actor->movedir];
+    tryy = actor->y + actor->info->speed*yspeed[actor->movedir];
+
+    try_ok = P_TryMove (actor, tryx, tryy);
+
+    if (!try_ok)
+    {
+	// open any specials
+	if (actor->flags & MF_FLOAT && floatok)
+	{
+	    // must adjust height
+	    if (actor->z < tmfloorz)
+		actor->z += FLOATSPEED;
+	    else
+		actor->z -= FLOATSPEED;
+
+	    actor->flags |= MF_INFLOAT;
+	    return true;
+	}
+		
+	if (!numspechit)
+	    return false;
+			
+	actor->movedir = DI_NODIR;
+	good = false;
+	while (numspechit--)
+	{
+	    ld = spechit[numspechit];
+	    // if the special is not a door
+	    // that can be opened,
+	    // return false
+	    if (P_UseSpecialLine (actor, ld,0))
+		good = true;
+	}
+	return good;
+    }
+    else
+    {
+	actor->flags &= ~MF_INFLOAT;
+    }
+	
+	
+    if (! (actor->flags & MF_FLOAT) )	
+	actor->z = actor->floorz;
+    return true; 
+}
+
+
+//
+// TryWalk
+// Attempts to move actor on
+// in its current (ob->moveangle) direction.
+// If blocked by either a wall or an actor
+// returns FALSE
+// If move is either clear or blocked only by a door,
+// returns TRUE and sets...
+// If a door is in the way,
+// an OpenDoor call is made to start it opening.
+//
+boolean P_TryWalk (mobj_t* actor)
+{	
+    if (!P_Move (actor))
+    {
+	return false;
+    }
+
+    actor->movecount = P_Random()&15;
+    return true;
+}
+
+
+
+
+void P_NewChaseDir (mobj_t*	actor)
+{
+    fixed_t	deltax;
+    fixed_t	deltay;
+    
+    dirtype_t	d[3];
+    
+    int		tdir;
+    dirtype_t	olddir;
+    
+    dirtype_t	turnaround;
+
+    if (!actor->target)
+	I_Error ("P_NewChaseDir: called with no target");
+		
+    olddir = actor->movedir;
+    turnaround=opposite[olddir];
+
+    deltax = actor->target->x - actor->x;
+    deltay = actor->target->y - actor->y;
+
+    if (deltax>10*FRACUNIT)
+	d[1]= DI_EAST;
+    else if (deltax<-10*FRACUNIT)
+	d[1]= DI_WEST;
+    else
+	d[1]=DI_NODIR;
+
+    if (deltay<-10*FRACUNIT)
+	d[2]= DI_SOUTH;
+    else if (deltay>10*FRACUNIT)
+	d[2]= DI_NORTH;
+    else
+	d[2]=DI_NODIR;
+
+    // try direct route
+    if (d[1] != DI_NODIR
+	&& d[2] != DI_NODIR)
+    {
+	actor->movedir = diags[((deltay<0)<<1)+(deltax>0)];
+	if (actor->movedir != (int) turnaround && P_TryWalk(actor))
+	    return;
+    }
+
+    // try other directions
+    if (P_Random() > 200
+	||  abs(deltay)>abs(deltax))
+    {
+	tdir=d[1];
+	d[1]=d[2];
+	d[2]=tdir;
+    }
+
+    if (d[1]==turnaround)
+	d[1]=DI_NODIR;
+    if (d[2]==turnaround)
+	d[2]=DI_NODIR;
+	
+    if (d[1]!=DI_NODIR)
+    {
+	actor->movedir = d[1];
+	if (P_TryWalk(actor))
+	{
+	    // either moved forward or attacked
+	    return;
+	}
+    }
+
+    if (d[2]!=DI_NODIR)
+    {
+	actor->movedir =d[2];
+
+	if (P_TryWalk(actor))
+	    return;
+    }
+
+    // there is no direct path to the player,
+    // so pick another direction.
+    if (olddir!=DI_NODIR)
+    {
+	actor->movedir =olddir;
+
+	if (P_TryWalk(actor))
+	    return;
+    }
+
+    // randomly determine direction of search
+    if (P_Random()&1) 	
+    {
+	for ( tdir=DI_EAST;
+	      tdir<=DI_SOUTHEAST;
+	      tdir++ )
+	{
+	    if (tdir != (int) turnaround)
+	    {
+		actor->movedir =tdir;
+		
+		if ( P_TryWalk(actor) )
+		    return;
+	    }
+	}
+    }
+    else
+    {
+	for ( tdir=DI_SOUTHEAST;
+	      tdir != (DI_EAST-1);
+	      tdir-- )
+	{
+	    if (tdir != (int) turnaround)
+	    {
+		actor->movedir = tdir;
+		
+		if ( P_TryWalk(actor) )
+		    return;
+	    }
+	}
+    }
+
+    if (turnaround !=  DI_NODIR)
+    {
+	actor->movedir =turnaround;
+	if ( P_TryWalk(actor) )
+	    return;
+    }
+
+    actor->movedir = DI_NODIR;	// can not move
+}
+
+
+
+//
+// P_LookForPlayers
+// If allaround is false, only look 180 degrees in front.
+// Returns true if a player is targeted.
+//
+boolean
+P_LookForPlayers
+( mobj_t*	actor,
+  boolean	allaround )
+{
+    int		c;
+    int		stop;
+    player_t*	player;
+    angle_t	an;
+    fixed_t	dist;
+
+    c = 0;
+    stop = (actor->lastlook-1)&3;
+	
+    for ( ; ; actor->lastlook = (actor->lastlook+1)&3 )
+    {
+	if (!playeringame[actor->lastlook])
+	    continue;
+			
+	if (c++ == 2
+	    || actor->lastlook == stop)
+	{
+	    // done looking
+	    return false;	
+	}
+	
+	player = &players[actor->lastlook];
+
+	if (player->health <= 0)
+	    continue;		// dead
+
+	if (!P_CheckSight (actor, player->mo))
+	    continue;		// out of sight
+			
+	if (!allaround)
+	{
+	    an = R_PointToAngle2 (actor->x,
+				  actor->y, 
+				  player->mo->x,
+				  player->mo->y)
+		- actor->angle;
+	    
+	    if (an > ANG90 && an < ANG270)
+	    {
+		dist = P_AproxDistance (player->mo->x - actor->x,
+					player->mo->y - actor->y);
+		// if real close, react anyway
+		if (dist > MELEERANGE)
+		    continue;	// behind back
+	    }
+	}
+		
+	actor->target = player->mo;
+	return true;
+    }
+
+    return false;
+}
+
+
+//
+// A_KeenDie
+// DOOM II special, map 32.
+// Uses special tag 666.
+//
+void A_KeenDie (mobj_t* mo)
+{
+    thinker_t*	th;
+    mobj_t*	mo2;
+    line_t	junk;
+
+    A_Fall (mo);
+    
+    // scan the remaining thinkers
+    // to see if all Keens are dead
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+	if (th->function.acp1 != (actionf_p1)P_MobjThinker)
+	    continue;
+
+	mo2 = (mobj_t *)th;
+	if (mo2 != mo
+	    && mo2->type == mo->type
+	    && mo2->health > 0)
+	{
+	    // other Keen not dead
+	    return;		
+	}
+    }
+
+    junk.tag = 666;
+    EV_DoDoor(&junk, vld_open);
+}
+
+
+//
+// ACTION ROUTINES
+//
+
+//
+// A_Look
+// Stay in state until a player is sighted.
+//
+void A_Look (mobj_t* actor)
+{
+    mobj_t*	targ;
+	
+    actor->threshold = 0;	// any shot will wake up
+    targ = actor->subsector->sector->soundtarget;
+
+    if (targ
+	&& (targ->flags & MF_SHOOTABLE) )
+    {
+	actor->target = targ;
+
+	if ( actor->flags & MF_AMBUSH )
+	{
+	    if (P_CheckSight (actor, actor->target))
+		goto seeyou;
+	}
+	else
+	    goto seeyou;
+    }
+	
+	
+    if (!P_LookForPlayers (actor, false) )
+	return;
+		
+    // go into chase state
+  seeyou:
+    if (actor->info->seesound)
+    {
+	int		sound;
+		
+	switch (actor->info->seesound)
+	{
+	  case sfx_posit1:
+	  case sfx_posit2:
+	  case sfx_posit3:
+	    sound = sfx_posit1+P_Random()%3;
+	    break;
+
+	  case sfx_bgsit1:
+	  case sfx_bgsit2:
+	    sound = sfx_bgsit1+P_Random()%2;
+	    break;
+
+	  default:
+	    sound = actor->info->seesound;
+	    break;
+	}
+
+	if (actor->type==MT_SPIDER
+	    || actor->type == MT_CYBORG)
+	{
+	    // full volume
+	    S_StartSound (NULL, sound);
+	}
+	else
+	    S_StartSound (actor, sound);
+    }
+
+    P_SetMobjState (actor, actor->info->seestate);
+}
+
+
+//
+// A_Chase
+// Actor has a melee attack,
+// so it tries to close as fast as possible
+//
+void A_Chase (mobj_t*	actor)
+{
+    int		delta;
+
+    if (actor->reactiontime)
+	actor->reactiontime--;
+				
+
+    // modify target threshold
+    if  (actor->threshold)
+    {
+        if (gameversion > exe_doom_1_2 && 
+            (!actor->target || actor->target->health <= 0))
+	{
+	    actor->threshold = 0;
+	}
+	else
+	    actor->threshold--;
+    }
+    
+    // turn towards movement direction if not there yet
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+	delta = actor->angle - (actor->movedir << 29);
+	
+	if (delta > 0)
+	    actor->angle -= ANG90/2;
+	else if (delta < 0)
+	    actor->angle += ANG90/2;
+    }
+
+    if (!actor->target
+	|| !(actor->target->flags&MF_SHOOTABLE))
+    {
+	// look for a new target
+	if (P_LookForPlayers(actor,true))
+	    return; 	// got a new target
+	
+	P_SetMobjState (actor, actor->info->spawnstate);
+	return;
+    }
+    
+    // do not attack twice in a row
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+	actor->flags &= ~MF_JUSTATTACKED;
+	if (gameskill != sk_nightmare && !fastparm)
+	    P_NewChaseDir (actor);
+	return;
+    }
+    
+    // check for melee attack
+    if (actor->info->meleestate
+	&& P_CheckMeleeRange (actor))
+    {
+	if (actor->info->attacksound)
+	    S_StartSound (actor, actor->info->attacksound);
+
+	P_SetMobjState (actor, actor->info->meleestate);
+	return;
+    }
+    
+    // check for missile attack
+    if (actor->info->missilestate)
+    {
+	if (gameskill < sk_nightmare
+	    && !fastparm && actor->movecount)
+	{
+	    goto nomissile;
+	}
+	
+	if (!P_CheckMissileRange (actor))
+	    goto nomissile;
+	
+	P_SetMobjState (actor, actor->info->missilestate);
+	actor->flags |= MF_JUSTATTACKED;
+	return;
+    }
+
+    // ?
+  nomissile:
+    // possibly choose another target
+    if (netgame
+	&& !actor->threshold
+	&& !P_CheckSight (actor, actor->target) )
+    {
+	if (P_LookForPlayers(actor,true))
+	    return;	// got a new target
+    }
+    
+    // chase towards player
+    if (--actor->movecount<0
+	|| !P_Move (actor))
+    {
+	P_NewChaseDir (actor);
+    }
+    
+    // make active sound
+    if (actor->info->activesound
+	&& P_Random () < 3)
+    {
+	S_StartSound (actor, actor->info->activesound);
+    }
+}
+
+
+//
+// A_FaceTarget
+//
+void A_FaceTarget (mobj_t* actor)
+{	
+    if (!actor->target)
+	return;
+    
+    actor->flags &= ~MF_AMBUSH;
+	
+    actor->angle = R_PointToAngle2 (actor->x,
+				    actor->y,
+				    actor->target->x,
+				    actor->target->y);
+    
+    if (actor->target->flags & MF_SHADOW)
+	actor->angle += P_SubRandom() << 21;
+}
+
+
+//
+// A_PosAttack
+//
+void A_PosAttack (mobj_t* actor)
+{
+    int		angle;
+    int		damage;
+    int		slope;
+	
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+    angle = actor->angle;
+    slope = P_AimLineAttack (actor, angle, MISSILERANGE);
+
+    S_StartSound (actor, sfx_pistol);
+    angle += P_SubRandom() << 20;
+    damage = ((P_Random()%5)+1)*3;
+    P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
+}
+
+void A_SPosAttack (mobj_t* actor)
+{
+    int		i;
+    int		angle;
+    int		bangle;
+    int		damage;
+    int		slope;
+	
+    if (!actor->target)
+	return;
+
+    S_StartSound (actor, sfx_shotgn);
+    A_FaceTarget (actor);
+    bangle = actor->angle;
+    slope = P_AimLineAttack (actor, bangle, MISSILERANGE);
+
+    for (i=0 ; i<3 ; i++)
+    {
+	angle = bangle + (P_SubRandom() << 20);
+	damage = ((P_Random()%5)+1)*3;
+	P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
+    }
+}
+
+void A_CPosAttack (mobj_t* actor)
+{
+    int		angle;
+    int		bangle;
+    int		damage;
+    int		slope;
+	
+    if (!actor->target)
+	return;
+
+    S_StartSound (actor, sfx_shotgn);
+    A_FaceTarget (actor);
+    bangle = actor->angle;
+    slope = P_AimLineAttack (actor, bangle, MISSILERANGE);
+
+    angle = bangle + (P_SubRandom() << 20);
+    damage = ((P_Random()%5)+1)*3;
+    P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
+}
+
+void A_CPosRefire (mobj_t* actor)
+{	
+    // keep firing unless target got out of sight
+    A_FaceTarget (actor);
+
+    if (P_Random () < 40)
+	return;
+
+    if (!actor->target
+	|| actor->target->health <= 0
+	|| !P_CheckSight (actor, actor->target) )
+    {
+	P_SetMobjState (actor, actor->info->seestate);
+    }
+}
+
+
+void A_SpidRefire (mobj_t* actor)
+{	
+    // keep firing unless target got out of sight
+    A_FaceTarget (actor);
+
+    if (P_Random () < 10)
+	return;
+
+    if (!actor->target
+	|| actor->target->health <= 0
+	|| !P_CheckSight (actor, actor->target) )
+    {
+	P_SetMobjState (actor, actor->info->seestate);
+    }
+}
+
+void A_BspiAttack (mobj_t *actor)
+{	
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+
+    // launch a missile
+    P_SpawnMissile (actor, actor->target, MT_ARACHPLAZ);
+}
+
+
+//
+// A_TroopAttack
+//
+void A_TroopAttack (mobj_t* actor)
+{
+    int		damage;
+	
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+    if (P_CheckMeleeRange (actor))
+    {
+	S_StartSound (actor, sfx_claw);
+	damage = (P_Random()%8+1)*3;
+	P_DamageMobj (actor->target, actor, actor, damage);
+	return;
+    }
+
+    
+    // launch a missile
+    P_SpawnMissile (actor, actor->target, MT_TROOPSHOT);
+}
+
+
+void A_SargAttack (mobj_t* actor)
+{
+    int		damage;
+
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+
+    if (gameversion >= exe_doom_1_5)
+    {
+        if (!P_CheckMeleeRange (actor))
+            return;
+    }
+
+    damage = ((P_Random()%10)+1)*4;
+
+    if (gameversion <= exe_doom_1_2)
+        P_LineAttack(actor, actor->angle, MELEERANGE, 0, damage);
+    else
+        P_DamageMobj (actor->target, actor, actor, damage);
+}
+
+void A_HeadAttack (mobj_t* actor)
+{
+    int		damage;
+	
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+    if (P_CheckMeleeRange (actor))
+    {
+	damage = (P_Random()%6+1)*10;
+	P_DamageMobj (actor->target, actor, actor, damage);
+	return;
+    }
+    
+    // launch a missile
+    P_SpawnMissile (actor, actor->target, MT_HEADSHOT);
+}
+
+void A_CyberAttack (mobj_t* actor)
+{	
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+    P_SpawnMissile (actor, actor->target, MT_ROCKET);
+}
+
+
+void A_BruisAttack (mobj_t* actor)
+{
+    int		damage;
+	
+    if (!actor->target)
+	return;
+		
+    if (P_CheckMeleeRange (actor))
+    {
+	S_StartSound (actor, sfx_claw);
+	damage = (P_Random()%8+1)*10;
+	P_DamageMobj (actor->target, actor, actor, damage);
+	return;
+    }
+    
+    // launch a missile
+    P_SpawnMissile (actor, actor->target, MT_BRUISERSHOT);
+}
+
+
+//
+// A_SkelMissile
+//
+void A_SkelMissile (mobj_t* actor)
+{	
+    mobj_t*	mo;
+	
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+    actor->z += 16*FRACUNIT;	// so missile spawns higher
+    mo = P_SpawnMissile (actor, actor->target, MT_TRACER);
+    actor->z -= 16*FRACUNIT;	// back to normal
+
+    mo->x += mo->momx;
+    mo->y += mo->momy;
+    mo->tracer = actor->target;
+}
+
+int	TRACEANGLE = 0xc000000;
+
+void A_Tracer (mobj_t* actor)
+{
+    angle_t	exact;
+    fixed_t	dist;
+    fixed_t	slope;
+    mobj_t*	dest;
+    mobj_t*	th;
+		
+    if (gametic & 3)
+	return;
+    
+    // spawn a puff of smoke behind the rocket		
+    P_SpawnPuff (actor->x, actor->y, actor->z);
+	
+    th = P_SpawnMobj (actor->x-actor->momx,
+		      actor->y-actor->momy,
+		      actor->z, MT_SMOKE);
+    
+    th->momz = FRACUNIT;
+    th->tics -= P_Random()&3;
+    if (th->tics < 1)
+	th->tics = 1;
+    
+    // adjust direction
+    dest = actor->tracer;
+	
+    if (!dest || dest->health <= 0)
+	return;
+    
+    // change angle	
+    exact = R_PointToAngle2 (actor->x,
+			     actor->y,
+			     dest->x,
+			     dest->y);
+
+    if (exact != actor->angle)
+    {
+	if (exact - actor->angle > 0x80000000)
+	{
+	    actor->angle -= TRACEANGLE;
+	    if (exact - actor->angle < 0x80000000)
+		actor->angle = exact;
+	}
+	else
+	{
+	    actor->angle += TRACEANGLE;
+	    if (exact - actor->angle > 0x80000000)
+		actor->angle = exact;
+	}
+    }
+	
+    exact = actor->angle>>ANGLETOFINESHIFT;
+    actor->momx = FixedMul (actor->info->speed, finecosine[exact]);
+    actor->momy = FixedMul (actor->info->speed, finesine[exact]);
+    
+    // change slope
+    dist = P_AproxDistance (dest->x - actor->x,
+			    dest->y - actor->y);
+    
+    dist = dist / actor->info->speed;
+
+    if (dist < 1)
+	dist = 1;
+    slope = (dest->z+40*FRACUNIT - actor->z) / dist;
+
+    if (slope < actor->momz)
+	actor->momz -= FRACUNIT/8;
+    else
+	actor->momz += FRACUNIT/8;
+}
+
+
+void A_SkelWhoosh (mobj_t*	actor)
+{
+    if (!actor->target)
+	return;
+    A_FaceTarget (actor);
+    S_StartSound (actor,sfx_skeswg);
+}
+
+void A_SkelFist (mobj_t*	actor)
+{
+    int		damage;
+
+    if (!actor->target)
+	return;
+		
+    A_FaceTarget (actor);
+	
+    if (P_CheckMeleeRange (actor))
+    {
+	damage = ((P_Random()%10)+1)*6;
+	S_StartSound (actor, sfx_skepch);
+	P_DamageMobj (actor->target, actor, actor, damage);
+    }
+}
+
+
+
+//
+// PIT_VileCheck
+// Detect a corpse that could be raised.
+//
+mobj_t*		corpsehit;
+mobj_t*		vileobj;
+fixed_t		viletryx;
+fixed_t		viletryy;
+
+boolean PIT_VileCheck (mobj_t*	thing)
+{
+    int		maxdist;
+    boolean	check;
+	
+    if (!(thing->flags & MF_CORPSE) )
+	return true;	// not a monster
+    
+    if (thing->tics != -1)
+	return true;	// not lying still yet
+    
+    if (thing->info->raisestate == S_NULL)
+	return true;	// monster doesn't have a raise state
+    
+    maxdist = thing->info->radius + mobjinfo[MT_VILE].radius;
+	
+    if ( abs(thing->x - viletryx) > maxdist
+	 || abs(thing->y - viletryy) > maxdist )
+	return true;		// not actually touching
+		
+    corpsehit = thing;
+    corpsehit->momx = corpsehit->momy = 0;
+    corpsehit->height <<= 2;
+    check = P_CheckPosition (corpsehit, corpsehit->x, corpsehit->y);
+    corpsehit->height >>= 2;
+
+    if (!check)
+	return true;		// doesn't fit here
+		
+    return false;		// got one, so stop checking
+}
+
+
+
+//
+// A_VileChase
+// Check for ressurecting a body
+//
+void A_VileChase (mobj_t* actor)
+{
+    int			xl;
+    int			xh;
+    int			yl;
+    int			yh;
+    
+    int			bx;
+    int			by;
+
+    mobjinfo_t*		info;
+    mobj_t*		temp;
+	
+    if (actor->movedir != DI_NODIR)
+    {
+	// check for corpses to raise
+	viletryx =
+	    actor->x + actor->info->speed*xspeed[actor->movedir];
+	viletryy =
+	    actor->y + actor->info->speed*yspeed[actor->movedir];
+
+	xl = (viletryx - bmaporgx - MAXRADIUS*2)>>MAPBLOCKSHIFT;
+	xh = (viletryx - bmaporgx + MAXRADIUS*2)>>MAPBLOCKSHIFT;
+	yl = (viletryy - bmaporgy - MAXRADIUS*2)>>MAPBLOCKSHIFT;
+	yh = (viletryy - bmaporgy + MAXRADIUS*2)>>MAPBLOCKSHIFT;
+	
+	vileobj = actor;
+	for (bx=xl ; bx<=xh ; bx++)
+	{
+	    for (by=yl ; by<=yh ; by++)
+	    {
+		// Call PIT_VileCheck to check
+		// whether object is a corpse
+		// that canbe raised.
+		if (!P_BlockThingsIterator(bx,by,PIT_VileCheck))
+		{
+		    // got one!
+		    temp = actor->target;
+		    actor->target = corpsehit;
+		    A_FaceTarget (actor);
+		    actor->target = temp;
+					
+		    P_SetMobjState (actor, S_VILE_HEAL1);
+		    S_StartSound (corpsehit, sfx_slop);
+		    info = corpsehit->info;
+		    
+		    P_SetMobjState (corpsehit,info->raisestate);
+		    corpsehit->height <<= 2;
+		    corpsehit->flags = info->flags;
+		    corpsehit->health = info->spawnhealth;
+		    corpsehit->target = NULL;
+
+		    return;
+		}
+	    }
+	}
+    }
+
+    // Return to normal attack.
+    A_Chase (actor);
+}
+
+
+//
+// A_VileStart
+//
+void A_VileStart (mobj_t* actor)
+{
+    S_StartSound (actor, sfx_vilatk);
+}
+
+
+//
+// A_Fire
+// Keep fire in front of player unless out of sight
+//
+void A_Fire (mobj_t* actor);
+
+void A_StartFire (mobj_t* actor)
+{
+    S_StartSound(actor,sfx_flamst);
+    A_Fire(actor);
+}
+
+void A_FireCrackle (mobj_t* actor)
+{
+    S_StartSound(actor,sfx_flame);
+    A_Fire(actor);
+}
+
+void A_Fire (mobj_t* actor)
+{
+    mobj_t*	dest;
+    mobj_t*     target;
+    unsigned	an;
+		
+    dest = actor->tracer;
+    if (!dest)
+	return;
+
+    target = P_SubstNullMobj(actor->target);
+		
+    // don't move it if the vile lost sight
+    if (!P_CheckSight (target, dest) )
+	return;
+
+    an = dest->angle >> ANGLETOFINESHIFT;
+
+    P_UnsetThingPosition (actor);
+    actor->x = dest->x + FixedMul (24*FRACUNIT, finecosine[an]);
+    actor->y = dest->y + FixedMul (24*FRACUNIT, finesine[an]);
+    actor->z = dest->z;
+    P_SetThingPosition (actor);
+}
+
+
+
+//
+// A_VileTarget
+// Spawn the hellfire
+//
+void A_VileTarget (mobj_t*	actor)
+{
+    mobj_t*	fog;
+	
+    if (!actor->target)
+	return;
+
+    A_FaceTarget (actor);
+
+    fog = P_SpawnMobj (actor->target->x,
+		       actor->target->x,
+		       actor->target->z, MT_FIRE);
+    
+    actor->tracer = fog;
+    fog->target = actor;
+    fog->tracer = actor->target;
+    A_Fire (fog);
+}
+
+
+
+
+//
+// A_VileAttack
+//
+void A_VileAttack (mobj_t* actor)
+{	
+    mobj_t*	fire;
+    int		an;
+	
+    if (!actor->target)
+	return;
+    
+    A_FaceTarget (actor);
+
+    if (!P_CheckSight (actor, actor->target) )
+	return;
+
+    S_StartSound (actor, sfx_barexp);
+    P_DamageMobj (actor->target, actor, actor, 20);
+    actor->target->momz = 1000*FRACUNIT/actor->target->info->mass;
+	
+    an = actor->angle >> ANGLETOFINESHIFT;
+
+    fire = actor->tracer;
+
+    if (!fire)
+	return;
+		
+    // move the fire between the vile and the player
+    fire->x = actor->target->x - FixedMul (24*FRACUNIT, finecosine[an]);
+    fire->y = actor->target->y - FixedMul (24*FRACUNIT, finesine[an]);	
+    P_RadiusAttack (fire, actor, 70 );
+}
+
+
+
+
+//
+// Mancubus attack,
+// firing three missiles (bruisers)
+// in three different directions?
+// Doesn't look like it. 
+//
+#define	FATSPREAD	(ANG90/8)
+
+void A_FatRaise (mobj_t *actor)
+{
+    A_FaceTarget (actor);
+    S_StartSound (actor, sfx_manatk);
+}
+
+
+void A_FatAttack1 (mobj_t* actor)
+{
+    mobj_t*	mo;
+    mobj_t*     target;
+    int		an;
+
+    A_FaceTarget (actor);
+
+    // Change direction  to ...
+    actor->angle += FATSPREAD;
+    target = P_SubstNullMobj(actor->target);
+    P_SpawnMissile (actor, target, MT_FATSHOT);
+
+    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
+    mo->angle += FATSPREAD;
+    an = mo->angle >> ANGLETOFINESHIFT;
+    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
+    mo->momy = FixedMul (mo->info->speed, finesine[an]);
+}
+
+void A_FatAttack2 (mobj_t* actor)
+{
+    mobj_t*	mo;
+    mobj_t*     target;
+    int		an;
+
+    A_FaceTarget (actor);
+    // Now here choose opposite deviation.
+    actor->angle -= FATSPREAD;
+    target = P_SubstNullMobj(actor->target);
+    P_SpawnMissile (actor, target, MT_FATSHOT);
+
+    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
+    mo->angle -= FATSPREAD*2;
+    an = mo->angle >> ANGLETOFINESHIFT;
+    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
+    mo->momy = FixedMul (mo->info->speed, finesine[an]);
+}
+
+void A_FatAttack3 (mobj_t*	actor)
+{
+    mobj_t*	mo;
+    mobj_t*     target;
+    int		an;
+
+    A_FaceTarget (actor);
+
+    target = P_SubstNullMobj(actor->target);
+    
+    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
+    mo->angle -= FATSPREAD/2;
+    an = mo->angle >> ANGLETOFINESHIFT;
+    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
+    mo->momy = FixedMul (mo->info->speed, finesine[an]);
+
+    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
+    mo->angle += FATSPREAD/2;
+    an = mo->angle >> ANGLETOFINESHIFT;
+    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
+    mo->momy = FixedMul (mo->info->speed, finesine[an]);
+}
+
+
+//
+// SkullAttack
+// Fly at the player like a missile.
+//
+#define	SKULLSPEED		(20*FRACUNIT)
+
+void A_SkullAttack (mobj_t* actor)
+{
+    mobj_t*		dest;
+    angle_t		an;
+    int			dist;
+
+    if (!actor->target)
+	return;
+		
+    dest = actor->target;	
+    actor->flags |= MF_SKULLFLY;
+
+    S_StartSound (actor, actor->info->attacksound);
+    A_FaceTarget (actor);
+    an = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul (SKULLSPEED, finecosine[an]);
+    actor->momy = FixedMul (SKULLSPEED, finesine[an]);
+    dist = P_AproxDistance (dest->x - actor->x, dest->y - actor->y);
+    dist = dist / SKULLSPEED;
+    
+    if (dist < 1)
+	dist = 1;
+    actor->momz = (dest->z+(dest->height>>1) - actor->z) / dist;
+}
+
+
+//
+// A_PainShootSkull
+// Spawn a lost soul and launch it at the target
+//
+void
+A_PainShootSkull
+( mobj_t*	actor,
+  angle_t	angle )
+{
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	z;
+    
+    mobj_t*	newmobj;
+    angle_t	an;
+    int		prestep;
+    int		count;
+    thinker_t*	currentthinker;
+
+    // count total number of skull currently on the level
+    count = 0;
+
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+	if (   (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
+	    && ((mobj_t *)currentthinker)->type == MT_SKULL)
+	    count++;
+	currentthinker = currentthinker->next;
+    }
+
+    // if there are allready 20 skulls on the level,
+    // don't spit another one
+    if (count > 20)
+	return;
+
+
+    // okay, there's playe for another one
+    an = angle >> ANGLETOFINESHIFT;
+    
+    prestep =
+	4*FRACUNIT
+	+ 3*(actor->info->radius + mobjinfo[MT_SKULL].radius)/2;
+    
+    x = actor->x + FixedMul (prestep, finecosine[an]);
+    y = actor->y + FixedMul (prestep, finesine[an]);
+    z = actor->z + 8*FRACUNIT;
+		
+    newmobj = P_SpawnMobj (x , y, z, MT_SKULL);
+
+    // Check for movements.
+    if (!P_TryMove (newmobj, newmobj->x, newmobj->y))
+    {
+	// kill it immediately
+	P_DamageMobj (newmobj,actor,actor,10000);	
+	return;
+    }
+		
+    newmobj->target = actor->target;
+    A_SkullAttack (newmobj);
+}
+
+
+//
+// A_PainAttack
+// Spawn a lost soul and launch it at the target
+// 
+void A_PainAttack (mobj_t* actor)
+{
+    if (!actor->target)
+	return;
+
+    A_FaceTarget (actor);
+    A_PainShootSkull (actor, actor->angle);
+}
+
+
+void A_PainDie (mobj_t* actor)
+{
+    A_Fall (actor);
+    A_PainShootSkull (actor, actor->angle+ANG90);
+    A_PainShootSkull (actor, actor->angle+ANG180);
+    A_PainShootSkull (actor, actor->angle+ANG270);
+}
+
+
+
+
+
+
+void A_Scream (mobj_t* actor)
+{
+    int		sound;
+	
+    switch (actor->info->deathsound)
+    {
+      case 0:
+	return;
+		
+      case sfx_podth1:
+      case sfx_podth2:
+      case sfx_podth3:
+	sound = sfx_podth1 + P_Random ()%3;
+	break;
+		
+      case sfx_bgdth1:
+      case sfx_bgdth2:
+	sound = sfx_bgdth1 + P_Random ()%2;
+	break;
+	
+      default:
+	sound = actor->info->deathsound;
+	break;
+    }
+
+    // Check for bosses.
+    if (actor->type==MT_SPIDER
+	|| actor->type == MT_CYBORG)
+    {
+	// full volume
+	S_StartSound (NULL, sound);
+    }
+    else
+	S_StartSound (actor, sound);
+}
+
+
+void A_XScream (mobj_t* actor)
+{
+    S_StartSound (actor, sfx_slop);	
+}
+
+void A_Pain (mobj_t* actor)
+{
+    if (actor->info->painsound)
+	S_StartSound (actor, actor->info->painsound);	
+}
+
+
+
+void A_Fall (mobj_t *actor)
+{
+    // actor is on ground, it can be walked over
+    actor->flags &= ~MF_SOLID;
+
+    // So change this if corpse objects
+    // are meant to be obstacles.
+}
+
+
+//
+// A_Explode
+//
+void A_Explode (mobj_t* thingy)
+{
+    P_RadiusAttack(thingy, thingy->target, 128);
+}
+
+// Check whether the death of the specified monster type is allowed
+// to trigger the end of episode special action.
+//
+// This behavior changed in v1.9, the most notable effect of which
+// was to break uac_dead.wad
+
+static boolean CheckBossEnd(mobjtype_t motype)
+{
+    if (gameversion < exe_ultimate)
+    {
+        if (gamemap != 8)
+        {
+            return false;
+        }
+
+        // Baron death on later episodes is nothing special.
+
+        if (motype == MT_BRUISER && gameepisode != 1)
+        {
+            return false;
+        }
+
+        return true;
+    }
+    else
+    {
+        // New logic that appeared in Ultimate Doom.
+        // Looks like the logic was overhauled while adding in the
+        // episode 4 support.  Now bosses only trigger on their
+        // specific episode.
+
+	switch(gameepisode)
+	{
+            case 1:
+                return gamemap == 8 && motype == MT_BRUISER;
+
+            case 2:
+                return gamemap == 8 && motype == MT_CYBORG;
+
+            case 3:
+                return gamemap == 8 && motype == MT_SPIDER;
+
+	    case 4:
+                return (gamemap == 6 && motype == MT_CYBORG)
+                    || (gamemap == 8 && motype == MT_SPIDER);
+
+            default:
+                return gamemap == 8;
+	}
+    }
+}
+
+//
+// A_BossDeath
+// Possibly trigger special effects
+// if on first boss level
+//
+void A_BossDeath (mobj_t* mo)
+{
+    thinker_t*	th;
+    mobj_t*	mo2;
+    line_t	junk;
+    int		i;
+		
+    if ( gamemode == commercial)
+    {
+	if (gamemap != 7)
+	    return;
+		
+	if ((mo->type != MT_FATSO)
+	    && (mo->type != MT_BABY))
+	    return;
+    }
+    else
+    {
+        if (!CheckBossEnd(mo->type))
+        {
+            return;
+        }
+    }
+
+    // make sure there is a player alive for victory
+    for (i=0 ; i<MAXPLAYERS ; i++)
+	if (playeringame[i] && players[i].health > 0)
+	    break;
+    
+    if (i==MAXPLAYERS)
+	return;	// no one left alive, so do not end game
+    
+    // scan the remaining thinkers to see
+    // if all bosses are dead
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+	if (th->function.acp1 != (actionf_p1)P_MobjThinker)
+	    continue;
+	
+	mo2 = (mobj_t *)th;
+	if (mo2 != mo
+	    && mo2->type == mo->type
+	    && mo2->health > 0)
+	{
+	    // other boss not dead
+	    return;
+	}
+    }
+	
+    // victory!
+    if ( gamemode == commercial)
+    {
+	if (gamemap == 7)
+	{
+	    if (mo->type == MT_FATSO)
+	    {
+		junk.tag = 666;
+		EV_DoFloor(&junk,lowerFloorToLowest);
+		return;
+	    }
+	    
+	    if (mo->type == MT_BABY)
+	    {
+		junk.tag = 667;
+		EV_DoFloor(&junk,raiseToTexture);
+		return;
+	    }
+	}
+    }
+    else
+    {
+	switch(gameepisode)
+	{
+	  case 1:
+	    junk.tag = 666;
+	    EV_DoFloor (&junk, lowerFloorToLowest);
+	    return;
+	    break;
+	    
+	  case 4:
+	    switch(gamemap)
+	    {
+	      case 6:
+		junk.tag = 666;
+		EV_DoDoor (&junk, vld_blazeOpen);
+		return;
+		break;
+		
+	      case 8:
+		junk.tag = 666;
+		EV_DoFloor (&junk, lowerFloorToLowest);
+		return;
+		break;
+	    }
+	}
+    }
+	
+    G_ExitLevel ();
+}
+
+
+void A_Hoof (mobj_t* mo)
+{
+    S_StartSound (mo, sfx_hoof);
+    A_Chase (mo);
+}
+
+void A_Metal (mobj_t* mo)
+{
+    S_StartSound (mo, sfx_metal);
+    A_Chase (mo);
+}
+
+void A_BabyMetal (mobj_t* mo)
+{
+    S_StartSound (mo, sfx_bspwlk);
+    A_Chase (mo);
+}
+
+void
+A_OpenShotgun2
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    S_StartSound (player->mo, sfx_dbopn);
+}
+
+void
+A_LoadShotgun2
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    S_StartSound (player->mo, sfx_dbload);
+}
+
+void
+A_ReFire
+( player_t*	player,
+  pspdef_t*	psp );
+
+void
+A_CloseShotgun2
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    S_StartSound (player->mo, sfx_dbcls);
+    A_ReFire(player,psp);
+}
+
+
+
+mobj_t*		braintargets[32];
+int		numbraintargets;
+int		braintargeton = 0;
+
+void A_BrainAwake (mobj_t* mo)
+{
+    thinker_t*	thinker;
+    mobj_t*	m;
+	
+    // find all the target spots
+    numbraintargets = 0;
+    braintargeton = 0;
+
+    for (thinker = thinkercap.next ;
+	 thinker != &thinkercap ;
+	 thinker = thinker->next)
+    {
+	if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
+	    continue;	// not a mobj
+
+	m = (mobj_t *)thinker;
+
+	if (m->type == MT_BOSSTARGET )
+	{
+	    braintargets[numbraintargets] = m;
+	    numbraintargets++;
+	}
+    }
+	
+    S_StartSound (NULL,sfx_bossit);
+}
+
+
+void A_BrainPain (mobj_t*	mo)
+{
+    S_StartSound (NULL,sfx_bospn);
+}
+
+
+void A_BrainScream (mobj_t*	mo)
+{
+    int		x;
+    int		y;
+    int		z;
+    mobj_t*	th;
+	
+    for (x=mo->x - 196*FRACUNIT ; x< mo->x + 320*FRACUNIT ; x+= FRACUNIT*8)
+    {
+	y = mo->y - 320*FRACUNIT;
+	z = 128 + P_Random()*2*FRACUNIT;
+	th = P_SpawnMobj (x,y,z, MT_ROCKET);
+	th->momz = P_Random()*512;
+
+	P_SetMobjState (th, S_BRAINEXPLODE1);
+
+	th->tics -= P_Random()&7;
+	if (th->tics < 1)
+	    th->tics = 1;
+    }
+	
+    S_StartSound (NULL,sfx_bosdth);
+}
+
+
+
+void A_BrainExplode (mobj_t* mo)
+{
+    int		x;
+    int		y;
+    int		z;
+    mobj_t*	th;
+	
+    x = mo->x +  P_SubRandom() * 2048;
+    y = mo->y;
+    z = 128 + P_Random()*2*FRACUNIT;
+    th = P_SpawnMobj (x,y,z, MT_ROCKET);
+    th->momz = P_Random()*512;
+
+    P_SetMobjState (th, S_BRAINEXPLODE1);
+
+    th->tics -= P_Random()&7;
+    if (th->tics < 1)
+	th->tics = 1;
+}
+
+
+void A_BrainDie (mobj_t*	mo)
+{
+    G_ExitLevel ();
+}
+
+void A_BrainSpit (mobj_t*	mo)
+{
+    mobj_t*	targ;
+    mobj_t*	newmobj;
+    
+    static int	easy = 0;
+	
+    easy ^= 1;
+    if (gameskill <= sk_easy && (!easy))
+	return;
+		
+    // shoot a cube at current target
+    targ = braintargets[braintargeton];
+    if (numbraintargets == 0)
+    {
+        I_Error("A_BrainSpit: numbraintargets was 0 (vanilla crashes here)");
+    }
+    braintargeton = (braintargeton+1)%numbraintargets;
+
+    // spawn brain missile
+    newmobj = P_SpawnMissile (mo, targ, MT_SPAWNSHOT);
+    newmobj->target = targ;
+    newmobj->reactiontime =
+	((targ->y - mo->y)/newmobj->momy) / newmobj->state->tics;
+
+    S_StartSound(NULL, sfx_bospit);
+}
+
+
+
+void A_SpawnFly (mobj_t* mo);
+
+// travelling cube sound
+void A_SpawnSound (mobj_t* mo)	
+{
+    S_StartSound (mo,sfx_boscub);
+    A_SpawnFly(mo);
+}
+
+void A_SpawnFly (mobj_t* mo)
+{
+    mobj_t*	newmobj;
+    mobj_t*	fog;
+    mobj_t*	targ;
+    int		r;
+    mobjtype_t	type;
+	
+    if (--mo->reactiontime)
+	return;	// still flying
+	
+    targ = P_SubstNullMobj(mo->target);
+
+    // First spawn teleport fog.
+    fog = P_SpawnMobj (targ->x, targ->y, targ->z, MT_SPAWNFIRE);
+    S_StartSound (fog, sfx_telept);
+
+    // Randomly select monster to spawn.
+    r = P_Random ();
+
+    // Probability distribution (kind of :),
+    // decreasing likelihood.
+    if ( r<50 )
+	type = MT_TROOP;
+    else if (r<90)
+	type = MT_SERGEANT;
+    else if (r<120)
+	type = MT_SHADOWS;
+    else if (r<130)
+	type = MT_PAIN;
+    else if (r<160)
+	type = MT_HEAD;
+    else if (r<162)
+	type = MT_VILE;
+    else if (r<172)
+	type = MT_UNDEAD;
+    else if (r<192)
+	type = MT_BABY;
+    else if (r<222)
+	type = MT_FATSO;
+    else if (r<246)
+	type = MT_KNIGHT;
+    else
+	type = MT_BRUISER;		
+
+    newmobj	= P_SpawnMobj (targ->x, targ->y, targ->z, type);
+    if (P_LookForPlayers (newmobj, true) )
+	P_SetMobjState (newmobj, newmobj->info->seestate);
+	
+    // telefrag anything in this spot
+    P_TeleportMove (newmobj, newmobj->x, newmobj->y);
+
+    // remove self (i.e., cube).
+    P_RemoveMobj (mo);
+}
+
+
+
+void A_PlayerScream (mobj_t* mo)
+{
+    // Default death sound.
+    int		sound = sfx_pldeth;
+	
+    if ( (gamemode == commercial)
+	&& 	(mo->health < -50))
+    {
+	// IF THE PLAYER DIES
+	// LESS THAN -50% WITHOUT GIBBING
+	sound = sfx_pdiehi;
+    }
+    
+    S_StartSound (mo, sound);
+}
diff --git a/games/NXDoom/src/doom/p_floor.c b/games/NXDoom/src/doom/p_floor.c
new file mode 100644
index 000000000..2bf42e55d
--- /dev/null
+++ b/games/NXDoom/src/doom/p_floor.c
@@ -0,0 +1,561 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Floor animation: raising stairs.
+//
+
+
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+// Data.
+#include "sounds.h"
+
+//e6y
+#define STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE 10
+
+//
+// FLOORS
+//
+
+//
+// Move a plane (floor or ceiling) and check for crushing
+//
+result_e
+T_MovePlane
+( sector_t*	sector,
+  fixed_t	speed,
+  fixed_t	dest,
+  boolean	crush,
+  int		floorOrCeiling,
+  int		direction )
+{
+    boolean	flag;
+    fixed_t	lastpos;
+	
+    switch(floorOrCeiling)
+    {
+      case 0:
+	// FLOOR
+	switch(direction)
+	{
+	  case -1:
+	    // DOWN
+	    if (sector->floorheight - speed < dest)
+	    {
+		lastpos = sector->floorheight;
+		sector->floorheight = dest;
+		flag = P_ChangeSector(sector,crush);
+		if (flag == true)
+		{
+		    sector->floorheight =lastpos;
+		    P_ChangeSector(sector,crush);
+		    //return crushed;
+		}
+		return pastdest;
+	    }
+	    else
+	    {
+		lastpos = sector->floorheight;
+		sector->floorheight -= speed;
+		flag = P_ChangeSector(sector,crush);
+		if (flag == true)
+		{
+		    sector->floorheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    return crushed;
+		}
+	    }
+	    break;
+						
+	  case 1:
+	    // UP
+	    if (sector->floorheight + speed > dest)
+	    {
+		lastpos = sector->floorheight;
+		sector->floorheight = dest;
+		flag = P_ChangeSector(sector,crush);
+		if (flag == true)
+		{
+		    sector->floorheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    //return crushed;
+		}
+		return pastdest;
+	    }
+	    else
+	    {
+		// COULD GET CRUSHED
+		lastpos = sector->floorheight;
+		sector->floorheight += speed;
+		flag = P_ChangeSector(sector,crush);
+		if (flag == true)
+		{
+		    if (crush == true)
+			return crushed;
+		    sector->floorheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    return crushed;
+		}
+	    }
+	    break;
+	}
+	break;
+									
+      case 1:
+	// CEILING
+	switch(direction)
+	{
+	  case -1:
+	    // DOWN
+	    if (sector->ceilingheight - speed < dest)
+	    {
+		lastpos = sector->ceilingheight;
+		sector->ceilingheight = dest;
+		flag = P_ChangeSector(sector,crush);
+
+		if (flag == true)
+		{
+		    sector->ceilingheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    //return crushed;
+		}
+		return pastdest;
+	    }
+	    else
+	    {
+		// COULD GET CRUSHED
+		lastpos = sector->ceilingheight;
+		sector->ceilingheight -= speed;
+		flag = P_ChangeSector(sector,crush);
+
+		if (flag == true)
+		{
+		    if (crush == true)
+			return crushed;
+		    sector->ceilingheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    return crushed;
+		}
+	    }
+	    break;
+						
+	  case 1:
+	    // UP
+	    if (sector->ceilingheight + speed > dest)
+	    {
+		lastpos = sector->ceilingheight;
+		sector->ceilingheight = dest;
+		flag = P_ChangeSector(sector,crush);
+		if (flag == true)
+		{
+		    sector->ceilingheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    //return crushed;
+		}
+		return pastdest;
+	    }
+	    else
+	    {
+		lastpos = sector->ceilingheight;
+		sector->ceilingheight += speed;
+		flag = P_ChangeSector(sector,crush);
+// UNUSED
+#if 0
+		if (flag == true)
+		{
+		    sector->ceilingheight = lastpos;
+		    P_ChangeSector(sector,crush);
+		    return crushed;
+		}
+#endif
+	    }
+	    break;
+	}
+	break;
+		
+    }
+    return ok;
+}
+
+
+//
+// MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
+//
+void T_MoveFloor(floormove_t* floor)
+{
+    result_e	res;
+	
+    res = T_MovePlane(floor->sector,
+		      floor->speed,
+		      floor->floordestheight,
+		      floor->crush,0,floor->direction);
+    
+    if (!(leveltime&7))
+	S_StartSound(&floor->sector->soundorg, sfx_stnmov);
+    
+    if (res == pastdest)
+    {
+	floor->sector->specialdata = NULL;
+
+	if (floor->direction == 1)
+	{
+	    switch(floor->type)
+	    {
+	      case donutRaise:
+		floor->sector->special = floor->newspecial;
+		floor->sector->floorpic = floor->texture;
+	      default:
+		break;
+	    }
+	}
+	else if (floor->direction == -1)
+	{
+	    switch(floor->type)
+	    {
+	      case lowerAndChange:
+		floor->sector->special = floor->newspecial;
+		floor->sector->floorpic = floor->texture;
+	      default:
+		break;
+	    }
+	}
+	P_RemoveThinker(&floor->thinker);
+
+	S_StartSound(&floor->sector->soundorg, sfx_pstop);
+    }
+
+}
+
+//
+// HANDLE FLOOR TYPES
+//
+int
+EV_DoFloor
+( line_t*	line,
+  floor_e	floortype )
+{
+    int			secnum;
+    int			rtn;
+    int			i;
+    sector_t*		sec;
+    floormove_t*	floor;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	sec = &sectors[secnum];
+		
+	// ALREADY MOVING?  IF SO, KEEP GOING...
+	if (sec->specialdata)
+	    continue;
+	
+	// new floor thinker
+	rtn = 1;
+	floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+	P_AddThinker (&floor->thinker);
+	sec->specialdata = floor;
+	floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+	floor->type = floortype;
+	floor->crush = false;
+
+	switch(floortype)
+	{
+	  case lowerFloor:
+	    floor->direction = -1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = 
+		P_FindHighestFloorSurrounding(sec);
+	    break;
+
+	  case lowerFloorToLowest:
+	    floor->direction = -1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = 
+		P_FindLowestFloorSurrounding(sec);
+	    break;
+
+	  case turboLower:
+	    floor->direction = -1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED * 4;
+	    floor->floordestheight = 
+		P_FindHighestFloorSurrounding(sec);
+	    if (gameversion <= exe_doom_1_2 ||
+	        floor->floordestheight != sec->floorheight)
+		floor->floordestheight += 8*FRACUNIT;
+	    break;
+
+	  case raiseFloorCrush:
+	    floor->crush = true;
+	  case raiseFloor:
+	    floor->direction = 1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = 
+		P_FindLowestCeilingSurrounding(sec);
+	    if (floor->floordestheight > sec->ceilingheight)
+		floor->floordestheight = sec->ceilingheight;
+	    floor->floordestheight -= (8*FRACUNIT)*
+		(floortype == raiseFloorCrush);
+	    break;
+
+	  case raiseFloorTurbo:
+	    floor->direction = 1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED*4;
+	    floor->floordestheight = 
+		P_FindNextHighestFloor(sec,sec->floorheight);
+	    break;
+
+	  case raiseFloorToNearest:
+	    floor->direction = 1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = 
+		P_FindNextHighestFloor(sec,sec->floorheight);
+	    break;
+
+	  case raiseFloor24:
+	    floor->direction = 1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = floor->sector->floorheight +
+		24 * FRACUNIT;
+	    break;
+	  case raiseFloor512:
+	    floor->direction = 1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = floor->sector->floorheight +
+		512 * FRACUNIT;
+	    break;
+
+	  case raiseFloor24AndChange:
+	    floor->direction = 1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = floor->sector->floorheight +
+		24 * FRACUNIT;
+	    sec->floorpic = line->frontsector->floorpic;
+	    sec->special = line->frontsector->special;
+	    break;
+
+	  case raiseToTexture:
+	  {
+	      int	minsize = INT_MAX;
+	      side_t*	side;
+				
+	      floor->direction = 1;
+	      floor->sector = sec;
+	      floor->speed = FLOORSPEED;
+	      for (i = 0; i < sec->linecount; i++)
+	      {
+		  if (twoSided (secnum, i) )
+		  {
+		      side = getSide(secnum,i,0);
+		      if (side->bottomtexture >= 0)
+			  if (textureheight[side->bottomtexture] < 
+			      minsize)
+			      minsize = 
+				  textureheight[side->bottomtexture];
+		      side = getSide(secnum,i,1);
+		      if (side->bottomtexture >= 0)
+			  if (textureheight[side->bottomtexture] < 
+			      minsize)
+			      minsize = 
+				  textureheight[side->bottomtexture];
+		  }
+	      }
+	      floor->floordestheight =
+		  floor->sector->floorheight + minsize;
+	  }
+	  break;
+	  
+	  case lowerAndChange:
+	    floor->direction = -1;
+	    floor->sector = sec;
+	    floor->speed = FLOORSPEED;
+	    floor->floordestheight = 
+		P_FindLowestFloorSurrounding(sec);
+	    floor->texture = sec->floorpic;
+
+	    for (i = 0; i < sec->linecount; i++)
+	    {
+		if ( twoSided(secnum, i) )
+		{
+		    if (getSide(secnum,i,0)->sector-sectors == secnum)
+		    {
+			sec = getSector(secnum,i,1);
+
+			if (sec->floorheight == floor->floordestheight)
+			{
+			    floor->texture = sec->floorpic;
+			    floor->newspecial = sec->special;
+			    break;
+			}
+		    }
+		    else
+		    {
+			sec = getSector(secnum,i,0);
+
+			if (sec->floorheight == floor->floordestheight)
+			{
+			    floor->texture = sec->floorpic;
+			    floor->newspecial = sec->special;
+			    break;
+			}
+		    }
+		}
+	    }
+	  default:
+	    break;
+	}
+    }
+    return rtn;
+}
+
+
+
+
+//
+// BUILD A STAIRCASE!
+//
+int
+EV_BuildStairs
+( line_t*	line,
+  stair_e	type )
+{
+    int			secnum;
+    int			height;
+    int			i;
+    int			newsecnum;
+    int			texture;
+    int			ok;
+    int			rtn;
+    
+    sector_t*		sec;
+    sector_t*		tsec;
+
+    floormove_t*	floor;
+    
+    fixed_t		stairsize = 0;
+    fixed_t		speed = 0;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	sec = &sectors[secnum];
+		
+	// ALREADY MOVING?  IF SO, KEEP GOING...
+	if (sec->specialdata)
+	    continue;
+	
+	// new floor thinker
+	rtn = 1;
+	floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+	P_AddThinker (&floor->thinker);
+	sec->specialdata = floor;
+	floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+	floor->direction = 1;
+	floor->sector = sec;
+	switch(type)
+	{
+	  case build8:
+	    speed = FLOORSPEED/4;
+	    stairsize = 8*FRACUNIT;
+	    break;
+	  case turbo16:
+	    speed = FLOORSPEED*4;
+	    stairsize = 16*FRACUNIT;
+	    break;
+	}
+	floor->speed = speed;
+	height = sec->floorheight + stairsize;
+	floor->floordestheight = height;
+	// Initialize
+	floor->type = lowerFloor;
+	// e6y
+	// Uninitialized crush field will not be equal to 0 or 1 (true)
+	// with high probability. So, initialize it with any other value
+	floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
+		
+	texture = sec->floorpic;
+	
+	// Find next sector to raise
+	// 1.	Find 2-sided line with same sector side[0]
+	// 2.	Other side is the next sector to raise
+	do
+	{
+	    ok = 0;
+	    for (i = 0;i < sec->linecount;i++)
+	    {
+		if ( !((sec->lines[i])->flags & ML_TWOSIDED) )
+		    continue;
+					
+		tsec = (sec->lines[i])->frontsector;
+		newsecnum = tsec-sectors;
+		
+		if (secnum != newsecnum)
+		    continue;
+
+		tsec = (sec->lines[i])->backsector;
+		newsecnum = tsec - sectors;
+
+		if (tsec->floorpic != texture)
+		    continue;
+					
+		height += stairsize;
+
+		if (tsec->specialdata)
+		    continue;
+					
+		sec = tsec;
+		secnum = newsecnum;
+		floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+
+		P_AddThinker (&floor->thinker);
+
+		sec->specialdata = floor;
+		floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+		floor->direction = 1;
+		floor->sector = sec;
+		floor->speed = speed;
+		floor->floordestheight = height;
+		// Initialize
+		floor->type = lowerFloor;
+		// e6y
+		// Uninitialized crush field will not be equal to 0 or 1 (true)
+		// with high probability. So, initialize it with any other value
+		floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
+		ok = 1;
+		break;
+	    }
+	} while(ok);
+    }
+    return rtn;
+}
+
diff --git a/games/NXDoom/src/doom/p_inter.c b/games/NXDoom/src/doom/p_inter.c
new file mode 100644
index 000000000..b6e403298
--- /dev/null
+++ b/games/NXDoom/src/doom/p_inter.c
@@ -0,0 +1,931 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Handling interactions (i.e., collisions).
+//
+
+
+
+
+// Data.
+#include "doomdef.h"
+#include "dstrings.h"
+#include "sounds.h"
+
+#include "deh_main.h"
+#include "deh_misc.h"
+#include "doomstat.h"
+
+#include "m_random.h"
+#include "i_system.h"
+
+#include "am_map.h"
+
+#include "p_local.h"
+
+#include "s_sound.h"
+
+#include "p_inter.h"
+
+
+#define BONUSADD	6
+
+
+
+
+// a weapon is found with two clip loads,
+// a big item has five clip loads
+int	maxammo[NUMAMMO] = {200, 50, 300, 50};
+int	clipammo[NUMAMMO] = {10, 4, 20, 1};
+
+
+//
+// GET STUFF
+//
+
+//
+// P_GiveAmmo
+// Num is the number of clip loads,
+// not the individual count (0= 1/2 clip).
+// Returns false if the ammo can't be picked up at all
+//
+
+boolean
+P_GiveAmmo
+( player_t*	player,
+  ammotype_t	ammo,
+  int		num )
+{
+    int		oldammo;
+	
+    if (ammo == am_noammo)
+	return false;
+		
+    if (ammo >= NUMAMMO)
+	I_Error ("P_GiveAmmo: bad type %i", ammo);
+		
+    if ( player->ammo[ammo] == player->maxammo[ammo]  )
+	return false;
+		
+    if (num)
+	num *= clipammo[ammo];
+    else
+	num = clipammo[ammo]/2;
+    
+    if (gameskill == sk_baby
+	|| gameskill == sk_nightmare)
+    {
+	// give double ammo in trainer mode,
+	// you'll need in nightmare
+	num <<= 1;
+    }
+    
+		
+    oldammo = player->ammo[ammo];
+    player->ammo[ammo] += num;
+
+    if (player->ammo[ammo] > player->maxammo[ammo])
+	player->ammo[ammo] = player->maxammo[ammo];
+
+    // If non zero ammo, 
+    // don't change up weapons,
+    // player was lower on purpose.
+    if (oldammo)
+	return true;	
+
+    // We were down to zero,
+    // so select a new weapon.
+    // Preferences are not user selectable.
+    switch (ammo)
+    {
+      case am_clip:
+	if (player->readyweapon == wp_fist)
+	{
+	    if (player->weaponowned[wp_chaingun])
+		player->pendingweapon = wp_chaingun;
+	    else
+		player->pendingweapon = wp_pistol;
+	}
+	break;
+	
+      case am_shell:
+	if (player->readyweapon == wp_fist
+	    || player->readyweapon == wp_pistol)
+	{
+	    if (player->weaponowned[wp_shotgun])
+		player->pendingweapon = wp_shotgun;
+	}
+	break;
+	
+      case am_cell:
+	if (player->readyweapon == wp_fist
+	    || player->readyweapon == wp_pistol)
+	{
+	    if (player->weaponowned[wp_plasma])
+		player->pendingweapon = wp_plasma;
+	}
+	break;
+	
+      case am_misl:
+	if (player->readyweapon == wp_fist)
+	{
+	    if (player->weaponowned[wp_missile])
+		player->pendingweapon = wp_missile;
+	}
+      default:
+	break;
+    }
+	
+    return true;
+}
+
+
+//
+// P_GiveWeapon
+// The weapon name may have a MF_DROPPED flag ored in.
+//
+boolean
+P_GiveWeapon
+( player_t*	player,
+  weapontype_t	weapon,
+  boolean	dropped )
+{
+    boolean	gaveammo;
+    boolean	gaveweapon;
+	
+    if (netgame
+	&& (deathmatch!=2)
+	 && !dropped )
+    {
+	// leave placed weapons forever on net games
+	if (player->weaponowned[weapon])
+	    return false;
+
+	player->bonuscount += BONUSADD;
+	player->weaponowned[weapon] = true;
+
+	if (deathmatch)
+	    P_GiveAmmo (player, weaponinfo[weapon].ammo, 5);
+	else
+	    P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
+	player->pendingweapon = weapon;
+
+	if (player == &players[consoleplayer])
+	    S_StartSound (NULL, sfx_wpnup);
+	return false;
+    }
+	
+    if (weaponinfo[weapon].ammo != am_noammo)
+    {
+	// give one clip with a dropped weapon,
+	// two clips with a found weapon
+	if (dropped)
+	    gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 1);
+	else
+	    gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
+    }
+    else
+	gaveammo = false;
+	
+    if (player->weaponowned[weapon])
+	gaveweapon = false;
+    else
+    {
+	gaveweapon = true;
+	player->weaponowned[weapon] = true;
+	player->pendingweapon = weapon;
+    }
+	
+    return (gaveweapon || gaveammo);
+}
+
+ 
+
+//
+// P_GiveBody
+// Returns false if the body isn't needed at all
+//
+boolean
+P_GiveBody
+( player_t*	player,
+  int		num )
+{
+    if (player->health >= MAXHEALTH)
+	return false;
+		
+    player->health += num;
+    if (player->health > MAXHEALTH)
+	player->health = MAXHEALTH;
+    player->mo->health = player->health;
+	
+    return true;
+}
+
+
+
+//
+// P_GiveArmor
+// Returns false if the armor is worse
+// than the current armor.
+//
+boolean
+P_GiveArmor
+( player_t*	player,
+  int		armortype )
+{
+    int		hits;
+	
+    hits = armortype*100;
+    if (player->armorpoints >= hits)
+	return false;	// don't pick up
+		
+    player->armortype = armortype;
+    player->armorpoints = hits;
+	
+    return true;
+}
+
+
+
+//
+// P_GiveCard
+//
+void
+P_GiveCard
+( player_t*	player,
+  card_t	card )
+{
+    if (player->cards[card])
+	return;
+    
+    player->bonuscount = BONUSADD;
+    player->cards[card] = 1;
+}
+
+
+//
+// P_GivePower
+//
+boolean
+P_GivePower
+( player_t*	player,
+  int /*powertype_t*/	power )
+{
+    if (power == pw_invulnerability)
+    {
+	player->powers[power] = INVULNTICS;
+	return true;
+    }
+    
+    if (power == pw_invisibility)
+    {
+	player->powers[power] = INVISTICS;
+	player->mo->flags |= MF_SHADOW;
+	return true;
+    }
+    
+    if (power == pw_infrared)
+    {
+	player->powers[power] = INFRATICS;
+	return true;
+    }
+    
+    if (power == pw_ironfeet)
+    {
+	player->powers[power] = IRONTICS;
+	return true;
+    }
+    
+    if (power == pw_strength)
+    {
+	P_GiveBody (player, 100);
+	player->powers[power] = 1;
+	return true;
+    }
+	
+    if (player->powers[power])
+	return false;	// already got it
+		
+    player->powers[power] = 1;
+    return true;
+}
+
+
+
+//
+// P_TouchSpecialThing
+//
+void
+P_TouchSpecialThing
+( mobj_t*	special,
+  mobj_t*	toucher )
+{
+    player_t*	player;
+    int		i;
+    fixed_t	delta;
+    int		sound;
+		
+    delta = special->z - toucher->z;
+
+    if (delta > toucher->height
+	|| delta < -8*FRACUNIT)
+    {
+	// out of reach
+	return;
+    }
+    
+	
+    sound = sfx_itemup;	
+    player = toucher->player;
+
+    // Dead thing touching.
+    // Can happen with a sliding player corpse.
+    if (toucher->health <= 0)
+	return;
+
+    // Identify by sprite.
+    switch (special->sprite)
+    {
+	// armor
+      case SPR_ARM1:
+	if (!P_GiveArmor (player, deh_green_armor_class))
+	    return;
+	player->message = DEH_String(GOTARMOR);
+	break;
+		
+      case SPR_ARM2:
+	if (!P_GiveArmor (player, deh_blue_armor_class))
+	    return;
+	player->message = DEH_String(GOTMEGA);
+	break;
+	
+	// bonus items
+      case SPR_BON1:
+	player->health++;		// can go over 100%
+	if (player->health > deh_max_health)
+	    player->health = deh_max_health;
+	player->mo->health = player->health;
+	player->message = DEH_String(GOTHTHBONUS);
+	break;
+	
+      case SPR_BON2:
+	player->armorpoints++;		// can go over 100%
+	if (player->armorpoints > deh_max_armor && gameversion > exe_doom_1_2)
+	    player->armorpoints = deh_max_armor;
+        // deh_green_armor_class only applies to the green armor shirt;
+        // for the armor helmets, armortype 1 is always used.
+	if (!player->armortype)
+	    player->armortype = 1;
+	player->message = DEH_String(GOTARMBONUS);
+	break;
+	
+      case SPR_SOUL:
+	player->health += deh_soulsphere_health;
+	if (player->health > deh_max_soulsphere)
+	    player->health = deh_max_soulsphere;
+	player->mo->health = player->health;
+	player->message = DEH_String(GOTSUPER);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+      case SPR_MEGA:
+	if (gamemode != commercial)
+	    return;
+	player->health = deh_megasphere_health;
+	player->mo->health = player->health;
+        // We always give armor type 2 for the megasphere; dehacked only 
+        // affects the MegaArmor.
+	P_GiveArmor (player, 2);
+	player->message = DEH_String(GOTMSPHERE);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+	// cards
+	// leave cards for everyone
+      case SPR_BKEY:
+	if (!player->cards[it_bluecard])
+	    player->message = DEH_String(GOTBLUECARD);
+	P_GiveCard (player, it_bluecard);
+	if (!netgame)
+	    break;
+	return;
+	
+      case SPR_YKEY:
+	if (!player->cards[it_yellowcard])
+	    player->message = DEH_String(GOTYELWCARD);
+	P_GiveCard (player, it_yellowcard);
+	if (!netgame)
+	    break;
+	return;
+	
+      case SPR_RKEY:
+	if (!player->cards[it_redcard])
+	    player->message = DEH_String(GOTREDCARD);
+	P_GiveCard (player, it_redcard);
+	if (!netgame)
+	    break;
+	return;
+	
+      case SPR_BSKU:
+	if (!player->cards[it_blueskull])
+	    player->message = DEH_String(GOTBLUESKUL);
+	P_GiveCard (player, it_blueskull);
+	if (!netgame)
+	    break;
+	return;
+	
+      case SPR_YSKU:
+	if (!player->cards[it_yellowskull])
+	    player->message = DEH_String(GOTYELWSKUL);
+	P_GiveCard (player, it_yellowskull);
+	if (!netgame)
+	    break;
+	return;
+	
+      case SPR_RSKU:
+	if (!player->cards[it_redskull])
+	    player->message = DEH_String(GOTREDSKULL);
+	P_GiveCard (player, it_redskull);
+	if (!netgame)
+	    break;
+	return;
+	
+	// medikits, heals
+      case SPR_STIM:
+	if (!P_GiveBody (player, 10))
+	    return;
+	player->message = DEH_String(GOTSTIM);
+	break;
+	
+      case SPR_MEDI:
+	if (!P_GiveBody (player, 25))
+	    return;
+
+	if (player->health < 25)
+	    player->message = DEH_String(GOTMEDINEED);
+	else
+	    player->message = DEH_String(GOTMEDIKIT);
+	break;
+
+	
+	// power ups
+      case SPR_PINV:
+	if (!P_GivePower (player, pw_invulnerability))
+	    return;
+	player->message = DEH_String(GOTINVUL);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+      case SPR_PSTR:
+	if (!P_GivePower (player, pw_strength))
+	    return;
+	player->message = DEH_String(GOTBERSERK);
+	if (player->readyweapon != wp_fist)
+	    player->pendingweapon = wp_fist;
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+      case SPR_PINS:
+	if (!P_GivePower (player, pw_invisibility))
+	    return;
+	player->message = DEH_String(GOTINVIS);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+      case SPR_SUIT:
+	if (!P_GivePower (player, pw_ironfeet))
+	    return;
+	player->message = DEH_String(GOTSUIT);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+      case SPR_PMAP:
+	if (!P_GivePower (player, pw_allmap))
+	    return;
+	player->message = DEH_String(GOTMAP);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+      case SPR_PVIS:
+	if (!P_GivePower (player, pw_infrared))
+	    return;
+	player->message = DEH_String(GOTVISOR);
+	if (gameversion > exe_doom_1_2)
+	    sound = sfx_getpow;
+	break;
+	
+	// ammo
+      case SPR_CLIP:
+	if (special->flags & MF_DROPPED)
+	{
+	    if (!P_GiveAmmo (player,am_clip,0))
+		return;
+	}
+	else
+	{
+	    if (!P_GiveAmmo (player,am_clip,1))
+		return;
+	}
+	player->message = DEH_String(GOTCLIP);
+	break;
+	
+      case SPR_AMMO:
+	if (!P_GiveAmmo (player, am_clip,5))
+	    return;
+	player->message = DEH_String(GOTCLIPBOX);
+	break;
+	
+      case SPR_ROCK:
+	if (!P_GiveAmmo (player, am_misl,1))
+	    return;
+	player->message = DEH_String(GOTROCKET);
+	break;
+	
+      case SPR_BROK:
+	if (!P_GiveAmmo (player, am_misl,5))
+	    return;
+	player->message = DEH_String(GOTROCKBOX);
+	break;
+	
+      case SPR_CELL:
+	if (!P_GiveAmmo (player, am_cell,1))
+	    return;
+	player->message = DEH_String(GOTCELL);
+	break;
+	
+      case SPR_CELP:
+	if (!P_GiveAmmo (player, am_cell,5))
+	    return;
+	player->message = DEH_String(GOTCELLBOX);
+	break;
+	
+      case SPR_SHEL:
+	if (!P_GiveAmmo (player, am_shell,1))
+	    return;
+	player->message = DEH_String(GOTSHELLS);
+	break;
+	
+      case SPR_SBOX:
+	if (!P_GiveAmmo (player, am_shell,5))
+	    return;
+	player->message = DEH_String(GOTSHELLBOX);
+	break;
+	
+      case SPR_BPAK:
+	if (!player->backpack)
+	{
+	    for (i=0 ; i<NUMAMMO ; i++)
+		player->maxammo[i] *= 2;
+	    player->backpack = true;
+	}
+	for (i=0 ; i<NUMAMMO ; i++)
+	    P_GiveAmmo (player, i, 1);
+	player->message = DEH_String(GOTBACKPACK);
+	break;
+	
+	// weapons
+      case SPR_BFUG:
+	if (!P_GiveWeapon (player, wp_bfg, false) )
+	    return;
+	player->message = DEH_String(GOTBFG9000);
+	sound = sfx_wpnup;	
+	break;
+	
+      case SPR_MGUN:
+        if (!P_GiveWeapon(player, wp_chaingun,
+                          (special->flags & MF_DROPPED) != 0))
+            return;
+	player->message = DEH_String(GOTCHAINGUN);
+	sound = sfx_wpnup;	
+	break;
+	
+      case SPR_CSAW:
+	if (!P_GiveWeapon (player, wp_chainsaw, false) )
+	    return;
+	player->message = DEH_String(GOTCHAINSAW);
+	sound = sfx_wpnup;	
+	break;
+	
+      case SPR_LAUN:
+	if (!P_GiveWeapon (player, wp_missile, false) )
+	    return;
+	player->message = DEH_String(GOTLAUNCHER);
+	sound = sfx_wpnup;	
+	break;
+	
+      case SPR_PLAS:
+	if (!P_GiveWeapon (player, wp_plasma, false) )
+	    return;
+	player->message = DEH_String(GOTPLASMA);
+	sound = sfx_wpnup;	
+	break;
+	
+      case SPR_SHOT:
+        if (!P_GiveWeapon(player, wp_shotgun,
+                          (special->flags & MF_DROPPED) != 0))
+            return;
+	player->message = DEH_String(GOTSHOTGUN);
+	sound = sfx_wpnup;	
+	break;
+		
+      case SPR_SGN2:
+        if (!P_GiveWeapon(player, wp_supershotgun,
+                          (special->flags & MF_DROPPED) != 0))
+            return;
+	player->message = DEH_String(GOTSHOTGUN2);
+	sound = sfx_wpnup;	
+	break;
+		
+      default:
+	I_Error ("P_SpecialThing: Unknown gettable thing");
+    }
+	
+    if (special->flags & MF_COUNTITEM)
+	player->itemcount++;
+    P_RemoveMobj (special);
+    player->bonuscount += BONUSADD;
+    if (player == &players[consoleplayer])
+	S_StartSound (NULL, sound);
+}
+
+
+//
+// KillMobj
+//
+void
+P_KillMobj
+( mobj_t*	source,
+  mobj_t*	target )
+{
+    mobjtype_t	item;
+    mobj_t*	mo;
+	
+    target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SKULLFLY);
+
+    if (target->type != MT_SKULL)
+	target->flags &= ~MF_NOGRAVITY;
+
+    target->flags |= MF_CORPSE|MF_DROPOFF;
+    target->height >>= 2;
+
+    if (source && source->player)
+    {
+	// count for intermission
+	if (target->flags & MF_COUNTKILL)
+	    source->player->killcount++;	
+
+	if (target->player)
+	    source->player->frags[target->player-players]++;
+    }
+    else if (!netgame && (target->flags & MF_COUNTKILL) )
+    {
+	// count all monster deaths,
+	// even those caused by other monsters
+	players[0].killcount++;
+    }
+    
+    if (target->player)
+    {
+	// count environment kills against you
+	if (!source)	
+	    target->player->frags[target->player-players]++;
+			
+	target->flags &= ~MF_SOLID;
+	target->player->playerstate = PST_DEAD;
+	P_DropWeapon (target->player);
+
+	if (target->player == &players[consoleplayer]
+	    && automapactive)
+	{
+	    // don't die in auto map,
+	    // switch view prior to dying
+	    AM_Stop ();
+	}
+	
+    }
+
+    if (target->health < -target->info->spawnhealth 
+	&& target->info->xdeathstate)
+    {
+	P_SetMobjState (target, target->info->xdeathstate);
+    }
+    else
+	P_SetMobjState (target, target->info->deathstate);
+    target->tics -= P_Random()&3;
+
+    if (target->tics < 1)
+	target->tics = 1;
+		
+    //	I_StartSound (&actor->r, actor->info->deathsound);
+
+    // In Chex Quest, monsters don't drop items.
+
+    if (gameversion == exe_chex)
+    {
+        return;
+    }
+
+    // Drop stuff.
+    // This determines the kind of object spawned
+    // during the death frame of a thing.
+    switch (target->type)
+    {
+      case MT_WOLFSS:
+      case MT_POSSESSED:
+	item = MT_CLIP;
+	break;
+	
+      case MT_SHOTGUY:
+	item = MT_SHOTGUN;
+	break;
+	
+      case MT_CHAINGUY:
+	item = MT_CHAINGUN;
+	break;
+	
+      default:
+	return;
+    }
+
+    mo = P_SpawnMobj (target->x,target->y,ONFLOORZ, item);
+    mo->flags |= MF_DROPPED;	// special versions of items
+}
+
+
+
+
+//
+// P_DamageMobj
+// Damages both enemies and players
+// "inflictor" is the thing that caused the damage
+//  creature or missile, can be NULL (slime, etc)
+// "source" is the thing to target after taking damage
+//  creature or NULL
+// Source and inflictor are the same for melee attacks.
+// Source can be NULL for slime, barrel explosions
+// and other environmental stuff.
+//
+void
+P_DamageMobj
+( mobj_t*	target,
+  mobj_t*	inflictor,
+  mobj_t*	source,
+  int 		damage )
+{
+    unsigned	ang;
+    int		saved;
+    player_t*	player;
+    fixed_t	thrust;
+    int		temp;
+	
+    if ( !(target->flags & MF_SHOOTABLE) )
+	return;	// shouldn't happen...
+		
+    if (target->health <= 0)
+	return;
+
+    if ( target->flags & MF_SKULLFLY )
+    {
+	target->momx = target->momy = target->momz = 0;
+    }
+	
+    player = target->player;
+    if (player && gameskill == sk_baby)
+	damage >>= 1; 	// take half damage in trainer mode
+		
+
+    // Some close combat weapons should not
+    // inflict thrust and push the victim out of reach,
+    // thus kick away unless using the chainsaw.
+    if (inflictor
+	&& !(target->flags & MF_NOCLIP)
+	&& (!source
+	    || !source->player
+	    || source->player->readyweapon != wp_chainsaw))
+    {
+	ang = R_PointToAngle2 ( inflictor->x,
+				inflictor->y,
+				target->x,
+				target->y);
+		
+	thrust = damage*(FRACUNIT>>3)*100/target->info->mass;
+
+	// make fall forwards sometimes
+	if ( damage < 40
+	     && damage > target->health
+	     && target->z - inflictor->z > 64*FRACUNIT
+	     && (P_Random ()&1) )
+	{
+	    ang += ANG180;
+	    thrust *= 4;
+	}
+		
+	ang >>= ANGLETOFINESHIFT;
+	target->momx += FixedMul (thrust, finecosine[ang]);
+	target->momy += FixedMul (thrust, finesine[ang]);
+    }
+    
+    // player specific
+    if (player)
+    {
+	// end of game hell hack
+	if (target->subsector->sector->special == 11
+	    && damage >= target->health)
+	{
+	    damage = target->health - 1;
+	}
+	
+
+	// Below certain threshold,
+	// ignore damage in GOD mode, or with INVUL power.
+	if ( damage < 1000
+	     && ( (player->cheats&CF_GODMODE)
+		  || player->powers[pw_invulnerability] ) )
+	{
+	    return;
+	}
+	
+	if (player->armortype)
+	{
+	    if (player->armortype == 1)
+		saved = damage/3;
+	    else
+		saved = damage/2;
+	    
+	    if (player->armorpoints <= saved)
+	    {
+		// armor is used up
+		saved = player->armorpoints;
+		player->armortype = 0;
+	    }
+	    player->armorpoints -= saved;
+	    damage -= saved;
+	}
+	player->health -= damage; 	// mirror mobj health here for Dave
+	if (player->health < 0)
+	    player->health = 0;
+	
+	player->attacker = source;
+	player->damagecount += damage;	// add damage after armor / invuln
+
+	if (player->damagecount > 100)
+	    player->damagecount = 100;	// teleport stomp does 10k points...
+	
+	temp = damage < 100 ? damage : 100;
+
+	if (player == &players[consoleplayer])
+	    I_Tactile (40,10,40+temp*2);
+    }
+    
+    // do the damage	
+    target->health -= damage;	
+    if (target->health <= 0)
+    {
+	P_KillMobj (source, target);
+	return;
+    }
+
+    if ( (P_Random () < target->info->painchance)
+	 && !(target->flags&MF_SKULLFLY) )
+    {
+	target->flags |= MF_JUSTHIT;	// fight back!
+	
+	P_SetMobjState (target, target->info->painstate);
+    }
+			
+    target->reactiontime = 0;		// we're awake now...	
+
+    if ( (!target->threshold || target->type == MT_VILE)
+	 && source && (source != target || gameversion < exe_doom_1_5)
+	 && source->type != MT_VILE)
+    {
+	// if not intent on another player,
+	// chase after this one
+	target->target = source;
+	target->threshold = BASETHRESHOLD;
+	if (target->state == &states[target->info->spawnstate]
+	    && target->info->seestate != S_NULL)
+	    P_SetMobjState (target, target->info->seestate);
+    }
+			
+}
+
diff --git a/games/NXDoom/src/doom/p_inter.h b/games/NXDoom/src/doom/p_inter.h
new file mode 100644
index 000000000..5764d5dab
--- /dev/null
+++ b/games/NXDoom/src/doom/p_inter.h
@@ -0,0 +1,30 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//
+
+
+#ifndef __P_INTER__
+#define __P_INTER__
+
+
+
+
+boolean	P_GivePower(player_t*, int);
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/p_lights.c b/games/NXDoom/src/doom/p_lights.c
new file mode 100644
index 000000000..863338dcf
--- /dev/null
+++ b/games/NXDoom/src/doom/p_lights.c
@@ -0,0 +1,350 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Handle Sector base lighting effects.
+//	Muzzle flash?
+//
+
+
+
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+
+// State.
+#include "r_state.h"
+
+//
+// FIRELIGHT FLICKER
+//
+
+//
+// T_FireFlicker
+//
+void T_FireFlicker (fireflicker_t* flick)
+{
+    int	amount;
+	
+    if (--flick->count)
+	return;
+	
+    amount = (P_Random()&3)*16;
+    
+    if (flick->sector->lightlevel - amount < flick->minlight)
+	flick->sector->lightlevel = flick->minlight;
+    else
+	flick->sector->lightlevel = flick->maxlight - amount;
+
+    flick->count = 4;
+}
+
+
+
+//
+// P_SpawnFireFlicker
+//
+void P_SpawnFireFlicker (sector_t*	sector)
+{
+    fireflicker_t*	flick;
+	
+    // Note that we are resetting sector attributes.
+    // Nothing special about it during gameplay.
+    sector->special = 0; 
+	
+    flick = Z_Malloc ( sizeof(*flick), PU_LEVSPEC, 0);
+
+    P_AddThinker (&flick->thinker);
+
+    flick->thinker.function.acp1 = (actionf_p1) T_FireFlicker;
+    flick->sector = sector;
+    flick->maxlight = sector->lightlevel;
+    flick->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel)+16;
+    flick->count = 4;
+}
+
+
+
+//
+// BROKEN LIGHT FLASHING
+//
+
+
+//
+// T_LightFlash
+// Do flashing lights.
+//
+void T_LightFlash (lightflash_t* flash)
+{
+    if (--flash->count)
+	return;
+	
+    if (flash->sector->lightlevel == flash->maxlight)
+    {
+	flash-> sector->lightlevel = flash->minlight;
+	flash->count = (P_Random()&flash->mintime)+1;
+    }
+    else
+    {
+	flash-> sector->lightlevel = flash->maxlight;
+	flash->count = (P_Random()&flash->maxtime)+1;
+    }
+
+}
+
+
+
+
+//
+// P_SpawnLightFlash
+// After the map has been loaded, scan each sector
+// for specials that spawn thinkers
+//
+void P_SpawnLightFlash (sector_t*	sector)
+{
+    lightflash_t*	flash;
+
+    // nothing special about it during gameplay
+    sector->special = 0;	
+	
+    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
+
+    P_AddThinker (&flash->thinker);
+
+    flash->thinker.function.acp1 = (actionf_p1) T_LightFlash;
+    flash->sector = sector;
+    flash->maxlight = sector->lightlevel;
+
+    flash->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
+    flash->maxtime = 64;
+    flash->mintime = 7;
+    flash->count = (P_Random()&flash->maxtime)+1;
+}
+
+
+
+//
+// STROBE LIGHT FLASHING
+//
+
+
+//
+// T_StrobeFlash
+//
+void T_StrobeFlash (strobe_t*		flash)
+{
+    if (--flash->count)
+	return;
+	
+    if (flash->sector->lightlevel == flash->minlight)
+    {
+	flash-> sector->lightlevel = flash->maxlight;
+	flash->count = flash->brighttime;
+    }
+    else
+    {
+	flash-> sector->lightlevel = flash->minlight;
+	flash->count =flash->darktime;
+    }
+
+}
+
+
+
+//
+// P_SpawnStrobeFlash
+// After the map has been loaded, scan each sector
+// for specials that spawn thinkers
+//
+void
+P_SpawnStrobeFlash
+( sector_t*	sector,
+  int		fastOrSlow,
+  int		inSync )
+{
+    strobe_t*	flash;
+	
+    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
+
+    P_AddThinker (&flash->thinker);
+
+    flash->sector = sector;
+    flash->darktime = fastOrSlow;
+    flash->brighttime = STROBEBRIGHT;
+    flash->thinker.function.acp1 = (actionf_p1) T_StrobeFlash;
+    flash->maxlight = sector->lightlevel;
+    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
+		
+    if (flash->minlight == flash->maxlight)
+	flash->minlight = 0;
+
+    // nothing special about it during gameplay
+    sector->special = 0;	
+
+    if (!inSync)
+	flash->count = (P_Random()&7)+1;
+    else
+	flash->count = 1;
+}
+
+
+//
+// Start strobing lights (usually from a trigger)
+//
+void EV_StartLightStrobing(line_t*	line)
+{
+    int		secnum;
+    sector_t*	sec;
+	
+    secnum = -1;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	sec = &sectors[secnum];
+	if (sec->specialdata)
+	    continue;
+	
+	P_SpawnStrobeFlash (sec,SLOWDARK, 0);
+    }
+}
+
+
+
+//
+// TURN LINE'S TAG LIGHTS OFF
+//
+void EV_TurnTagLightsOff(line_t* line)
+{
+    int			i;
+    int			j;
+    int			min;
+    sector_t*		sector;
+    sector_t*		tsec;
+    line_t*		templine;
+	
+    sector = sectors;
+    
+    for (j = 0;j < numsectors; j++, sector++)
+    {
+	if (sector->tag == line->tag)
+	{
+	    min = sector->lightlevel;
+	    for (i = 0;i < sector->linecount; i++)
+	    {
+		templine = sector->lines[i];
+		tsec = getNextSector(templine,sector);
+		if (!tsec)
+		    continue;
+		if (tsec->lightlevel < min)
+		    min = tsec->lightlevel;
+	    }
+	    sector->lightlevel = min;
+	}
+    }
+}
+
+
+//
+// TURN LINE'S TAG LIGHTS ON
+//
+void
+EV_LightTurnOn
+( line_t*	line,
+  int		bright )
+{
+    int		i;
+    int		j;
+    sector_t*	sector;
+    sector_t*	temp;
+    line_t*	templine;
+	
+    sector = sectors;
+	
+    for (i=0;i<numsectors;i++, sector++)
+    {
+	if (sector->tag == line->tag)
+	{
+	    // bright = 0 means to search
+	    // for highest light level
+	    // surrounding sector
+	    if (!bright)
+	    {
+		for (j = 0;j < sector->linecount; j++)
+		{
+		    templine = sector->lines[j];
+		    temp = getNextSector(templine,sector);
+
+		    if (!temp)
+			continue;
+
+		    if (temp->lightlevel > bright)
+			bright = temp->lightlevel;
+		}
+	    }
+	    sector-> lightlevel = bright;
+	}
+    }
+}
+
+    
+//
+// Spawn glowing light
+//
+
+void T_Glow(glow_t*	g)
+{
+    switch(g->direction)
+    {
+      case -1:
+	// DOWN
+	g->sector->lightlevel -= GLOWSPEED;
+	if (g->sector->lightlevel <= g->minlight)
+	{
+	    g->sector->lightlevel += GLOWSPEED;
+	    g->direction = 1;
+	}
+	break;
+	
+      case 1:
+	// UP
+	g->sector->lightlevel += GLOWSPEED;
+	if (g->sector->lightlevel >= g->maxlight)
+	{
+	    g->sector->lightlevel -= GLOWSPEED;
+	    g->direction = -1;
+	}
+	break;
+    }
+}
+
+
+void P_SpawnGlowingLight(sector_t*	sector)
+{
+    glow_t*	g;
+	
+    g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
+
+    P_AddThinker(&g->thinker);
+
+    g->sector = sector;
+    g->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
+    g->maxlight = sector->lightlevel;
+    g->thinker.function.acp1 = (actionf_p1) T_Glow;
+    g->direction = -1;
+
+    sector->special = 0;
+}
+
diff --git a/games/NXDoom/src/doom/p_local.h b/games/NXDoom/src/doom/p_local.h
new file mode 100644
index 000000000..411596762
--- /dev/null
+++ b/games/NXDoom/src/doom/p_local.h
@@ -0,0 +1,305 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Play functions, animation, global header.
+//
+
+
+#ifndef __P_LOCAL__
+#define __P_LOCAL__
+
+#ifndef __R_LOCAL__
+#include "r_local.h"
+#endif
+
+#define FLOATSPEED		(FRACUNIT*4)
+
+
+#define MAXHEALTH		100
+#define VIEWHEIGHT		(41*FRACUNIT)
+
+// mapblocks are used to check movement
+// against lines and things
+#define MAPBLOCKUNITS	128
+#define MAPBLOCKSIZE	(MAPBLOCKUNITS*FRACUNIT)
+#define MAPBLOCKSHIFT	(FRACBITS+7)
+#define MAPBMASK		(MAPBLOCKSIZE-1)
+#define MAPBTOFRAC		(MAPBLOCKSHIFT-FRACBITS)
+
+
+// player radius for movement checking
+#define PLAYERRADIUS	16*FRACUNIT
+
+// MAXRADIUS is for precalculated sector block boxes
+// the spider demon is larger,
+// but we do not have any moving sectors nearby
+#define MAXRADIUS		32*FRACUNIT
+
+#define GRAVITY		FRACUNIT
+#define MAXMOVE		(30*FRACUNIT)
+
+#define USERANGE		(64*FRACUNIT)
+#define MELEERANGE		(64*FRACUNIT)
+#define MISSILERANGE	(32*64*FRACUNIT)
+
+// follow a player exlusively for 3 seconds
+#define	BASETHRESHOLD	 	100
+
+
+
+//
+// P_TICK
+//
+
+// both the head and tail of the thinker list
+extern	thinker_t	thinkercap;	
+
+
+void P_InitThinkers (void);
+void P_AddThinker (thinker_t* thinker);
+void P_RemoveThinker (thinker_t* thinker);
+
+
+//
+// P_PSPR
+//
+void P_SetupPsprites (player_t* curplayer);
+void P_MovePsprites (player_t* curplayer);
+void P_DropWeapon (player_t* player);
+
+
+//
+// P_USER
+//
+void	P_PlayerThink (player_t* player);
+
+
+//
+// P_MOBJ
+//
+#define ONFLOORZ		INT_MIN
+#define ONCEILINGZ		INT_MAX
+
+// Time interval for item respawning.
+#define ITEMQUESIZE		128
+
+extern mapthing_t	itemrespawnque[ITEMQUESIZE];
+extern int		itemrespawntime[ITEMQUESIZE];
+extern int		iquehead;
+extern int		iquetail;
+
+
+void P_RespawnSpecials (void);
+
+mobj_t*
+P_SpawnMobj
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z,
+  mobjtype_t	type );
+
+void 	P_RemoveMobj (mobj_t* th);
+mobj_t* P_SubstNullMobj (mobj_t* th);
+boolean	P_SetMobjState (mobj_t* mobj, statenum_t state);
+void 	P_MobjThinker (mobj_t* mobj);
+
+void	P_SpawnPuff (fixed_t x, fixed_t y, fixed_t z);
+void 	P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage);
+mobj_t* P_SpawnMissile (mobj_t* source, mobj_t* dest, mobjtype_t type);
+void	P_SpawnPlayerMissile (mobj_t* source, mobjtype_t type);
+
+
+//
+// P_ENEMY
+//
+void P_NoiseAlert (mobj_t* target, mobj_t* emmiter);
+
+
+//
+// P_MAPUTL
+//
+typedef struct
+{
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	dx;
+    fixed_t	dy;
+    
+} divline_t;
+
+typedef struct
+{
+    fixed_t	frac;		// along trace line
+    boolean	isaline;
+    union {
+	mobj_t*	thing;
+	line_t*	line;
+    }			d;
+} intercept_t;
+
+// Extended MAXINTERCEPTS, to allow for intercepts overrun emulation.
+
+#define MAXINTERCEPTS_ORIGINAL 128
+#define MAXINTERCEPTS          (MAXINTERCEPTS_ORIGINAL + 61)
+
+extern intercept_t	intercepts[MAXINTERCEPTS];
+extern intercept_t*	intercept_p;
+
+typedef boolean (*traverser_t) (intercept_t *in);
+
+fixed_t P_AproxDistance (fixed_t dx, fixed_t dy);
+int 	P_PointOnLineSide (fixed_t x, fixed_t y, line_t* line);
+int 	P_PointOnDivlineSide (fixed_t x, fixed_t y, divline_t* line);
+void 	P_MakeDivline (line_t* li, divline_t* dl);
+fixed_t P_InterceptVector (divline_t* v2, divline_t* v1);
+int 	P_BoxOnLineSide (fixed_t* tmbox, line_t* ld);
+
+extern fixed_t		opentop;
+extern fixed_t 		openbottom;
+extern fixed_t		openrange;
+extern fixed_t		lowfloor;
+
+void 	P_LineOpening (line_t* linedef);
+
+boolean P_BlockLinesIterator (int x, int y, boolean(*func)(line_t*) );
+boolean P_BlockThingsIterator (int x, int y, boolean(*func)(mobj_t*) );
+
+#define PT_ADDLINES		1
+#define PT_ADDTHINGS	2
+#define PT_EARLYOUT		4
+
+extern divline_t	trace;
+
+boolean
+P_PathTraverse
+( fixed_t	x1,
+  fixed_t	y1,
+  fixed_t	x2,
+  fixed_t	y2,
+  int		flags,
+  boolean	(*trav) (intercept_t *));
+
+void P_UnsetThingPosition (mobj_t* thing);
+void P_SetThingPosition (mobj_t* thing);
+
+
+//
+// P_MAP
+//
+
+// If "floatok" true, move would be ok
+// if within "tmfloorz - tmceilingz".
+extern boolean		floatok;
+extern fixed_t		tmfloorz;
+extern fixed_t		tmceilingz;
+
+
+extern	line_t*		ceilingline;
+
+// fraggle: I have increased the size of this buffer.  In the original Doom,
+// overrunning past this limit caused other bits of memory to be overwritten,
+// affecting demo playback.  However, in doing so, the limit was still
+// exceeded.  So we have to support more than 8 specials.
+//
+// We keep the original limit, to detect what variables in memory were
+// overwritten (see SpechitOverrun())
+
+#define MAXSPECIALCROSS 		20
+#define MAXSPECIALCROSS_ORIGINAL	8
+
+extern	line_t*	spechit[MAXSPECIALCROSS];
+extern	int	numspechit;
+
+boolean P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y);
+boolean P_TryMove (mobj_t* thing, fixed_t x, fixed_t y);
+boolean P_TeleportMove (mobj_t* thing, fixed_t x, fixed_t y);
+void	P_SlideMove (mobj_t* mo);
+boolean P_CheckSight (mobj_t* t1, mobj_t* t2);
+void 	P_UseLines (player_t* player);
+
+boolean P_ChangeSector (sector_t* sector, boolean crunch);
+
+extern mobj_t*	linetarget;	// who got hit (or NULL)
+
+
+extern fixed_t attackrange;
+
+// slopes to top and bottom of target
+extern fixed_t	topslope;
+extern fixed_t	bottomslope;
+
+
+fixed_t
+P_AimLineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance );
+
+void
+P_LineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance,
+  fixed_t	slope,
+  int		damage );
+
+void
+P_RadiusAttack
+( mobj_t*	spot,
+  mobj_t*	source,
+  int		damage );
+
+
+
+//
+// P_SETUP
+//
+extern byte*		rejectmatrix;	// for fast sight rejection
+extern short*		blockmaplump;	// offsets in blockmap are from here
+extern short*		blockmap;
+extern int		bmapwidth;
+extern int		bmapheight;	// in mapblocks
+extern fixed_t		bmaporgx;
+extern fixed_t		bmaporgy;	// origin of block map
+extern mobj_t**		blocklinks;	// for thing chains
+
+
+
+//
+// P_INTER
+//
+extern int		maxammo[NUMAMMO];
+extern int		clipammo[NUMAMMO];
+
+void
+P_TouchSpecialThing
+( mobj_t*	special,
+  mobj_t*	toucher );
+
+void
+P_DamageMobj
+( mobj_t*	target,
+  mobj_t*	inflictor,
+  mobj_t*	source,
+  int		damage );
+
+
+//
+// P_SPEC
+//
+#include "p_spec.h"
+
+
+#endif	// __P_LOCAL__
diff --git a/games/NXDoom/src/doom/p_map.c b/games/NXDoom/src/doom/p_map.c
new file mode 100644
index 000000000..425416ce7
--- /dev/null
+++ b/games/NXDoom/src/doom/p_map.c
@@ -0,0 +1,1445 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard, Andrey Budko
+//
+// 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.
+//
+// DESCRIPTION:
+//	Movement, collision handling.
+//	Shooting and aiming.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "deh_misc.h"
+
+#include "m_bbox.h"
+#include "m_random.h"
+#include "i_system.h"
+
+#include "doomdef.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+// Data.
+#include "sounds.h"
+
+// Spechit overrun magic value.
+//
+// This is the value used by PrBoom-plus.  I think the value below is 
+// actually better and works with more demos.  However, I think
+// it's better for the spechits emulation to be compatible with
+// PrBoom-plus, at least so that the big spechits emulation list
+// on Doomworld can also be used with Chocolate Doom.
+
+#define DEFAULT_SPECHIT_MAGIC 0x01C09C98
+
+// This is from a post by myk on the Doomworld forums, 
+// outputted from entryway's spechit_magic generator for
+// s205n546.lmp.  The _exact_ value of this isn't too
+// important; as long as it is in the right general
+// range, it will usually work.  Otherwise, we can use
+// the generator (hacked doom2.exe) and provide it 
+// with -spechit.
+
+//#define DEFAULT_SPECHIT_MAGIC 0x84f968e8
+
+
+fixed_t		tmbbox[4];
+mobj_t*		tmthing;
+int		tmflags;
+fixed_t		tmx;
+fixed_t		tmy;
+
+
+// If "floatok" true, move would be ok
+// if within "tmfloorz - tmceilingz".
+boolean		floatok;
+
+fixed_t		tmfloorz;
+fixed_t		tmceilingz;
+fixed_t		tmdropoffz;
+
+// keep track of the line that lowers the ceiling,
+// so missiles don't explode against sky hack walls
+line_t*		ceilingline;
+
+// keep track of special lines as they are hit,
+// but don't process them until the move is proven valid
+
+line_t*		spechit[MAXSPECIALCROSS];
+int		numspechit;
+
+
+
+//
+// TELEPORT MOVE
+// 
+
+//
+// PIT_StompThing
+//
+boolean PIT_StompThing (mobj_t* thing)
+{
+    fixed_t	blockdist;
+		
+    if (!(thing->flags & MF_SHOOTABLE) )
+	return true;
+		
+    blockdist = thing->radius + tmthing->radius;
+    
+    if ( abs(thing->x - tmx) >= blockdist
+	 || abs(thing->y - tmy) >= blockdist )
+    {
+	// didn't hit it
+	return true;
+    }
+    
+    // don't clip against self
+    if (thing == tmthing)
+	return true;
+    
+    // monsters don't stomp things except on boss level
+    if ( !tmthing->player && gamemap != 30)
+	return false;	
+		
+    P_DamageMobj (thing, tmthing, tmthing, 10000);
+	
+    return true;
+}
+
+
+//
+// P_TeleportMove
+//
+boolean
+P_TeleportMove
+( mobj_t*	thing,
+  fixed_t	x,
+  fixed_t	y )
+{
+    int			xl;
+    int			xh;
+    int			yl;
+    int			yh;
+    int			bx;
+    int			by;
+    
+    subsector_t*	newsubsec;
+    
+    // kill anything occupying the position
+    tmthing = thing;
+    tmflags = thing->flags;
+	
+    tmx = x;
+    tmy = y;
+	
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector (x,y);
+    ceilingline = NULL;
+    
+    // The base floor/ceiling is from the subsector
+    // that contains the point.
+    // Any contacted lines the step closer together
+    // will adjust them.
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+			
+    validcount++;
+    numspechit = 0;
+    
+    // stomp on any things contacted
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
+
+    for (bx=xl ; bx<=xh ; bx++)
+	for (by=yl ; by<=yh ; by++)
+	    if (!P_BlockThingsIterator(bx,by,PIT_StompThing))
+		return false;
+    
+    // the move is ok,
+    // so link the thing into its new position
+    P_UnsetThingPosition (thing);
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;	
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition (thing);
+	
+    return true;
+}
+
+
+//
+// MOVEMENT ITERATOR FUNCTIONS
+//
+
+static void SpechitOverrun(line_t *ld);
+
+//
+// PIT_CheckLine
+// Adjusts tmfloorz and tmceilingz as lines are contacted
+//
+boolean PIT_CheckLine (line_t* ld)
+{
+    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
+	|| tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
+	|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
+	|| tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP] )
+	return true;
+
+    if (P_BoxOnLineSide (tmbbox, ld) != -1)
+	return true;
+		
+    // A line has been hit
+    
+    // The moving thing's destination position will cross
+    // the given line.
+    // If this should not be allowed, return false.
+    // If the line is special, keep track of it
+    // to process later if the move is proven ok.
+    // NOTE: specials are NOT sorted by order,
+    // so two special lines that are only 8 pixels apart
+    // could be crossed in either order.
+    
+    if (!ld->backsector)
+	return false;		// one sided line
+		
+    if (!(tmthing->flags & MF_MISSILE) )
+    {
+	if ( ld->flags & ML_BLOCKING )
+	    return false;	// explicitly blocking everything
+
+	if ( !tmthing->player && ld->flags & ML_BLOCKMONSTERS )
+	    return false;	// block monsters only
+    }
+
+    // set openrange, opentop, openbottom
+    P_LineOpening (ld);	
+	
+    // adjust floor / ceiling heights
+    if (opentop < tmceilingz)
+    {
+	tmceilingz = opentop;
+	ceilingline = ld;
+    }
+
+    if (openbottom > tmfloorz)
+	tmfloorz = openbottom;	
+
+    if (lowfloor < tmdropoffz)
+	tmdropoffz = lowfloor;
+		
+    // if contacted a special line, add it to the list
+    if (ld->special)
+    {
+        spechit[numspechit] = ld;
+	numspechit++;
+
+        // fraggle: spechits overrun emulation code from prboom-plus
+        if (numspechit > MAXSPECIALCROSS_ORIGINAL)
+        {
+            SpechitOverrun(ld);
+        }
+    }
+
+    return true;
+}
+
+//
+// PIT_CheckThing
+//
+boolean PIT_CheckThing (mobj_t* thing)
+{
+    fixed_t		blockdist;
+    boolean		solid;
+    int			damage;
+		
+    if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE) ))
+	return true;
+    
+    blockdist = thing->radius + tmthing->radius;
+
+    if ( abs(thing->x - tmx) >= blockdist
+	 || abs(thing->y - tmy) >= blockdist )
+    {
+	// didn't hit it
+	return true;	
+    }
+    
+    // don't clip against self
+    if (thing == tmthing)
+	return true;
+    
+    // check for skulls slamming into things
+    if (tmthing->flags & MF_SKULLFLY)
+    {
+	damage = ((P_Random()%8)+1)*tmthing->info->damage;
+	
+	P_DamageMobj (thing, tmthing, tmthing, damage);
+	
+	tmthing->flags &= ~MF_SKULLFLY;
+	tmthing->momx = tmthing->momy = tmthing->momz = 0;
+	
+	P_SetMobjState (tmthing, tmthing->info->spawnstate);
+	
+	return false;		// stop moving
+    }
+
+    
+    // missiles can hit other things
+    if (tmthing->flags & MF_MISSILE)
+    {
+	// see if it went over / under
+	if (tmthing->z > thing->z + thing->height)
+	    return true;		// overhead
+	if (tmthing->z+tmthing->height < thing->z)
+	    return true;		// underneath
+		
+	if (tmthing->target 
+         && (tmthing->target->type == thing->type || 
+	    (tmthing->target->type == MT_KNIGHT && thing->type == MT_BRUISER)||
+	    (tmthing->target->type == MT_BRUISER && thing->type == MT_KNIGHT) ) )
+	{
+	    // Don't hit same species as originator.
+	    if (thing == tmthing->target)
+		return true;
+
+            // sdh: Add deh_species_infighting here.  We can override the
+            // "monsters of the same species cant hurt each other" behavior
+            // through dehacked patches
+
+	    if (thing->type != MT_PLAYER && !deh_species_infighting)
+	    {
+		// Explode, but do no damage.
+		// Let players missile other players.
+		return false;
+	    }
+	}
+	
+	if (! (thing->flags & MF_SHOOTABLE) )
+	{
+	    // didn't do any damage
+	    return !(thing->flags & MF_SOLID);	
+	}
+	
+	// damage / explode
+	damage = ((P_Random()%8)+1)*tmthing->info->damage;
+	P_DamageMobj (thing, tmthing, tmthing->target, damage);
+
+	// don't traverse any more
+	return false;				
+    }
+    
+    // check for special pickup
+    if (thing->flags & MF_SPECIAL)
+    {
+	solid = (thing->flags & MF_SOLID) != 0;
+	if (tmflags&MF_PICKUP)
+	{
+	    // can remove thing
+	    P_TouchSpecialThing (thing, tmthing);
+	}
+	return !solid;
+    }
+	
+    return !(thing->flags & MF_SOLID);
+}
+
+
+//
+// MOVEMENT CLIPPING
+//
+
+//
+// P_CheckPosition
+// This is purely informative, nothing is modified
+// (except things picked up).
+// 
+// in:
+//  a mobj_t (can be valid or invalid)
+//  a position to be checked
+//   (doesn't need to be related to the mobj_t->x,y)
+//
+// during:
+//  special things are touched if MF_PICKUP
+//  early out on solid lines?
+//
+// out:
+//  newsubsec
+//  floorz
+//  ceilingz
+//  tmdropoffz
+//   the lowest point contacted
+//   (monsters won't move to a dropoff)
+//  speciallines[]
+//  numspeciallines
+//
+boolean
+P_CheckPosition
+( mobj_t*	thing,
+  fixed_t	x,
+  fixed_t	y )
+{
+    int			xl;
+    int			xh;
+    int			yl;
+    int			yh;
+    int			bx;
+    int			by;
+    subsector_t*	newsubsec;
+
+    tmthing = thing;
+    tmflags = thing->flags;
+	
+    tmx = x;
+    tmy = y;
+	
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector (x,y);
+    ceilingline = NULL;
+    
+    // The base floor / ceiling is from the subsector
+    // that contains the point.
+    // Any contacted lines the step closer together
+    // will adjust them.
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+			
+    validcount++;
+    numspechit = 0;
+
+    if ( tmflags & MF_NOCLIP )
+	return true;
+    
+    // Check things first, possibly picking things up.
+    // The bounding box is extended by MAXRADIUS
+    // because mobj_ts are grouped into mapblocks
+    // based on their origin point, and can overlap
+    // into adjacent blocks by up to MAXRADIUS units.
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
+
+    for (bx=xl ; bx<=xh ; bx++)
+	for (by=yl ; by<=yh ; by++)
+	    if (!P_BlockThingsIterator(bx,by,PIT_CheckThing))
+		return false;
+    
+    // check lines
+    xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
+
+    for (bx=xl ; bx<=xh ; bx++)
+	for (by=yl ; by<=yh ; by++)
+	    if (!P_BlockLinesIterator (bx,by,PIT_CheckLine))
+		return false;
+
+    return true;
+}
+
+
+//
+// P_TryMove
+// Attempt to move to a new position,
+// crossing special lines unless MF_TELEPORT is set.
+//
+boolean
+P_TryMove
+( mobj_t*	thing,
+  fixed_t	x,
+  fixed_t	y )
+{
+    fixed_t	oldx;
+    fixed_t	oldy;
+    int		side;
+    int		oldside;
+    line_t*	ld;
+
+    floatok = false;
+    if (!P_CheckPosition (thing, x, y))
+	return false;		// solid wall or thing
+    
+    if ( !(thing->flags & MF_NOCLIP) )
+    {
+	if (tmceilingz - tmfloorz < thing->height)
+	    return false;	// doesn't fit
+
+	floatok = true;
+	
+	if ( !(thing->flags&MF_TELEPORT) 
+	     &&tmceilingz - thing->z < thing->height)
+	    return false;	// mobj must lower itself to fit
+
+	if ( !(thing->flags&MF_TELEPORT)
+	     && tmfloorz - thing->z > 24*FRACUNIT )
+	    return false;	// too big a step up
+
+	if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT))
+	     && tmfloorz - tmdropoffz > 24*FRACUNIT )
+	    return false;	// don't stand over a dropoff
+    }
+    
+    // the move is ok,
+    // so link the thing into its new position
+    P_UnsetThingPosition (thing);
+
+    oldx = thing->x;
+    oldy = thing->y;
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;	
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition (thing);
+    
+    // if any special lines were hit, do the effect
+    if (! (thing->flags&(MF_TELEPORT|MF_NOCLIP)) )
+    {
+	while (numspechit--)
+	{
+	    // see if the line was crossed
+	    ld = spechit[numspechit];
+	    side = P_PointOnLineSide (thing->x, thing->y, ld);
+	    oldside = P_PointOnLineSide (oldx, oldy, ld);
+	    if (side != oldside)
+	    {
+		if (ld->special)
+		    P_CrossSpecialLine (ld-lines, oldside, thing);
+	    }
+	}
+    }
+
+    return true;
+}
+
+
+//
+// P_ThingHeightClip
+// Takes a valid thing and adjusts the thing->floorz,
+// thing->ceilingz, and possibly thing->z.
+// This is called for all nearby monsters
+// whenever a sector changes height.
+// If the thing doesn't fit,
+// the z will be set to the lowest value
+// and false will be returned.
+//
+boolean P_ThingHeightClip (mobj_t* thing)
+{
+    boolean		onfloor;
+	
+    onfloor = (thing->z == thing->floorz);
+	
+    P_CheckPosition (thing, thing->x, thing->y);	
+    // what about stranding a monster partially off an edge?
+	
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+	
+    if (onfloor)
+    {
+	// walking monsters rise and fall with the floor
+	thing->z = thing->floorz;
+    }
+    else
+    {
+	// don't adjust a floating monster unless forced to
+	if (thing->z+thing->height > thing->ceilingz)
+	    thing->z = thing->ceilingz - thing->height;
+    }
+	
+    if (thing->ceilingz - thing->floorz < thing->height)
+	return false;
+		
+    return true;
+}
+
+
+
+//
+// SLIDE MOVE
+// Allows the player to slide along any angled walls.
+//
+fixed_t		bestslidefrac;
+fixed_t		secondslidefrac;
+
+line_t*		bestslideline;
+line_t*		secondslideline;
+
+mobj_t*		slidemo;
+
+fixed_t		tmxmove;
+fixed_t		tmymove;
+
+
+
+//
+// P_HitSlideLine
+// Adjusts the xmove / ymove
+// so that the next move will slide along the wall.
+//
+void P_HitSlideLine (line_t* ld)
+{
+    int			side;
+
+    angle_t		lineangle;
+    angle_t		moveangle;
+    angle_t		deltaangle;
+    
+    fixed_t		movelen;
+    fixed_t		newlen;
+	
+	
+    if (ld->slopetype == ST_HORIZONTAL)
+    {
+	tmymove = 0;
+	return;
+    }
+    
+    if (ld->slopetype == ST_VERTICAL)
+    {
+	tmxmove = 0;
+	return;
+    }
+	
+    side = P_PointOnLineSide (slidemo->x, slidemo->y, ld);
+	
+    lineangle = R_PointToAngle2 (0,0, ld->dx, ld->dy);
+
+    if (side == 1)
+	lineangle += ANG180;
+
+    moveangle = R_PointToAngle2 (0,0, tmxmove, tmymove);
+    deltaangle = moveangle-lineangle;
+
+    if (deltaangle > ANG180)
+	deltaangle += ANG180;
+    //	I_Error ("SlideLine: ang>ANG180");
+
+    lineangle >>= ANGLETOFINESHIFT;
+    deltaangle >>= ANGLETOFINESHIFT;
+	
+    movelen = P_AproxDistance (tmxmove, tmymove);
+    newlen = FixedMul (movelen, finecosine[deltaangle]);
+
+    tmxmove = FixedMul (newlen, finecosine[lineangle]);	
+    tmymove = FixedMul (newlen, finesine[lineangle]);	
+}
+
+
+//
+// PTR_SlideTraverse
+//
+boolean PTR_SlideTraverse (intercept_t* in)
+{
+    line_t*	li;
+	
+    if (!in->isaline)
+	I_Error ("PTR_SlideTraverse: not a line?");
+		
+    li = in->d.line;
+    
+    if ( ! (li->flags & ML_TWOSIDED) )
+    {
+	if (P_PointOnLineSide (slidemo->x, slidemo->y, li))
+	{
+	    // don't hit the back side
+	    return true;		
+	}
+	goto isblocking;
+    }
+
+    // set openrange, opentop, openbottom
+    P_LineOpening (li);
+    
+    if (openrange < slidemo->height)
+	goto isblocking;		// doesn't fit
+		
+    if (opentop - slidemo->z < slidemo->height)
+	goto isblocking;		// mobj is too high
+
+    if (openbottom - slidemo->z > 24*FRACUNIT )
+	goto isblocking;		// too big a step up
+
+    // this line doesn't block movement
+    return true;		
+	
+    // the line does block movement,
+    // see if it is closer than best so far
+  isblocking:		
+    if (in->frac < bestslidefrac)
+    {
+	secondslidefrac = bestslidefrac;
+	secondslideline = bestslideline;
+	bestslidefrac = in->frac;
+	bestslideline = li;
+    }
+	
+    return false;	// stop
+}
+
+
+
+//
+// P_SlideMove
+// The momx / momy move is bad, so try to slide
+// along a wall.
+// Find the first line hit, move flush to it,
+// and slide along it
+//
+// This is a kludgy mess.
+//
+void P_SlideMove (mobj_t* mo)
+{
+    fixed_t		leadx;
+    fixed_t		leady;
+    fixed_t		trailx;
+    fixed_t		traily;
+    fixed_t		newx;
+    fixed_t		newy;
+    int			hitcount;
+		
+    slidemo = mo;
+    hitcount = 0;
+    
+  retry:
+    if (++hitcount == 3)
+	goto stairstep;		// don't loop forever
+
+    
+    // trace along the three leading corners
+    if (mo->momx > 0)
+    {
+	leadx = mo->x + mo->radius;
+	trailx = mo->x - mo->radius;
+    }
+    else
+    {
+	leadx = mo->x - mo->radius;
+	trailx = mo->x + mo->radius;
+    }
+	
+    if (mo->momy > 0)
+    {
+	leady = mo->y + mo->radius;
+	traily = mo->y - mo->radius;
+    }
+    else
+    {
+	leady = mo->y - mo->radius;
+	traily = mo->y + mo->radius;
+    }
+		
+    bestslidefrac = FRACUNIT+1;
+	
+    P_PathTraverse ( leadx, leady, leadx+mo->momx, leady+mo->momy,
+		     PT_ADDLINES, PTR_SlideTraverse );
+    P_PathTraverse ( trailx, leady, trailx+mo->momx, leady+mo->momy,
+		     PT_ADDLINES, PTR_SlideTraverse );
+    P_PathTraverse ( leadx, traily, leadx+mo->momx, traily+mo->momy,
+		     PT_ADDLINES, PTR_SlideTraverse );
+    
+    // move up to the wall
+    if (bestslidefrac == FRACUNIT+1)
+    {
+	// the move most have hit the middle, so stairstep
+      stairstep:
+	if (!P_TryMove (mo, mo->x, mo->y + mo->momy))
+	    P_TryMove (mo, mo->x + mo->momx, mo->y);
+	return;
+    }
+
+    // fudge a bit to make sure it doesn't hit
+    bestslidefrac -= 0x800;	
+    if (bestslidefrac > 0)
+    {
+	newx = FixedMul (mo->momx, bestslidefrac);
+	newy = FixedMul (mo->momy, bestslidefrac);
+	
+	if (!P_TryMove (mo, mo->x+newx, mo->y+newy))
+	    goto stairstep;
+    }
+    
+    // Now continue along the wall.
+    // First calculate remainder.
+    bestslidefrac = FRACUNIT-(bestslidefrac+0x800);
+    
+    if (bestslidefrac > FRACUNIT)
+	bestslidefrac = FRACUNIT;
+    
+    if (bestslidefrac <= 0)
+	return;
+    
+    tmxmove = FixedMul (mo->momx, bestslidefrac);
+    tmymove = FixedMul (mo->momy, bestslidefrac);
+
+    P_HitSlideLine (bestslideline);	// clip the moves
+
+    mo->momx = tmxmove;
+    mo->momy = tmymove;
+		
+    if (!P_TryMove (mo, mo->x+tmxmove, mo->y+tmymove))
+    {
+	goto retry;
+    }
+}
+
+
+//
+// P_LineAttack
+//
+mobj_t*		linetarget;	// who got hit (or NULL)
+mobj_t*		shootthing;
+
+// Height if not aiming up or down
+// ???: use slope for monsters?
+fixed_t		shootz;	
+
+int		la_damage;
+fixed_t		attackrange;
+
+fixed_t		aimslope;
+
+
+//
+// PTR_AimTraverse
+// Sets linetaget and aimslope when a target is aimed at.
+//
+boolean
+PTR_AimTraverse (intercept_t* in)
+{
+    line_t*		li;
+    mobj_t*		th;
+    fixed_t		slope;
+    fixed_t		thingtopslope;
+    fixed_t		thingbottomslope;
+    fixed_t		dist;
+		
+    if (in->isaline)
+    {
+	li = in->d.line;
+	
+	if ( !(li->flags & ML_TWOSIDED) )
+	    return false;		// stop
+	
+	// Crosses a two sided line.
+	// A two sided line will restrict
+	// the possible target ranges.
+	P_LineOpening (li);
+	
+	if (openbottom >= opentop)
+	    return false;		// stop
+	
+	dist = FixedMul (attackrange, in->frac);
+
+        if (li->backsector == NULL
+         || li->frontsector->floorheight != li->backsector->floorheight)
+	{
+	    slope = FixedDiv (openbottom - shootz , dist);
+	    if (slope > bottomslope)
+		bottomslope = slope;
+	}
+		
+	if (li->backsector == NULL
+         || li->frontsector->ceilingheight != li->backsector->ceilingheight)
+	{
+	    slope = FixedDiv (opentop - shootz , dist);
+	    if (slope < topslope)
+		topslope = slope;
+	}
+		
+	if (topslope <= bottomslope)
+	    return false;		// stop
+			
+	return true;			// shot continues
+    }
+    
+    // shoot a thing
+    th = in->d.thing;
+    if (th == shootthing)
+	return true;			// can't shoot self
+    
+    if (!(th->flags&MF_SHOOTABLE))
+	return true;			// corpse or something
+
+    // check angles to see if the thing can be aimed at
+    dist = FixedMul (attackrange, in->frac);
+    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
+
+    if (thingtopslope < bottomslope)
+	return true;			// shot over the thing
+
+    thingbottomslope = FixedDiv (th->z - shootz, dist);
+
+    if (thingbottomslope > topslope)
+	return true;			// shot under the thing
+    
+    // this thing can be hit!
+    if (thingtopslope > topslope)
+	thingtopslope = topslope;
+    
+    if (thingbottomslope < bottomslope)
+	thingbottomslope = bottomslope;
+
+    aimslope = (thingtopslope+thingbottomslope)/2;
+    linetarget = th;
+
+    return false;			// don't go any farther
+}
+
+
+//
+// PTR_ShootTraverse
+//
+boolean PTR_ShootTraverse (intercept_t* in)
+{
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+    fixed_t		frac;
+    
+    line_t*		li;
+    
+    mobj_t*		th;
+
+    fixed_t		slope;
+    fixed_t		dist;
+    fixed_t		thingtopslope;
+    fixed_t		thingbottomslope;
+		
+    if (in->isaline)
+    {
+	li = in->d.line;
+	
+	if (li->special)
+	    P_ShootSpecialLine (shootthing, li);
+
+	if ( !(li->flags & ML_TWOSIDED) )
+	    goto hitline;
+	
+	// crosses a two sided line
+	P_LineOpening (li);
+		
+	dist = FixedMul (attackrange, in->frac);
+
+        // e6y: emulation of missed back side on two-sided lines.
+        // backsector can be NULL when emulating missing back side.
+
+        if (li->backsector == NULL)
+        {
+            slope = FixedDiv (openbottom - shootz , dist);
+            if (slope > aimslope)
+                goto hitline;
+
+            slope = FixedDiv (opentop - shootz , dist);
+            if (slope < aimslope)
+                goto hitline;
+        }
+        else
+        {
+            if (li->frontsector->floorheight != li->backsector->floorheight)
+            {
+                slope = FixedDiv (openbottom - shootz , dist);
+                if (slope > aimslope)
+                    goto hitline;
+            }
+
+            if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+            {
+                slope = FixedDiv (opentop - shootz , dist);
+                if (slope < aimslope)
+                    goto hitline;
+            }
+        }
+
+	// shot continues
+	return true;
+	
+	
+	// hit line
+      hitline:
+	// position a bit closer
+	frac = in->frac - FixedDiv (4*FRACUNIT,attackrange);
+	x = trace.x + FixedMul (trace.dx, frac);
+	y = trace.y + FixedMul (trace.dy, frac);
+	z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
+
+	if (li->frontsector->ceilingpic == skyflatnum)
+	{
+	    // don't shoot the sky!
+	    if (z > li->frontsector->ceilingheight)
+		return false;
+	    
+	    // it's a sky hack wall
+	    if	(li->backsector && li->backsector->ceilingpic == skyflatnum)
+		return false;		
+	}
+
+	// Spawn bullet puffs.
+	P_SpawnPuff (x,y,z);
+	
+	// don't go any farther
+	return false;	
+    }
+    
+    // shoot a thing
+    th = in->d.thing;
+    if (th == shootthing)
+	return true;		// can't shoot self
+    
+    if (!(th->flags&MF_SHOOTABLE))
+	return true;		// corpse or something
+		
+    // check angles to see if the thing can be aimed at
+    dist = FixedMul (attackrange, in->frac);
+    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
+
+    if (thingtopslope < aimslope)
+	return true;		// shot over the thing
+
+    thingbottomslope = FixedDiv (th->z - shootz, dist);
+
+    if (thingbottomslope > aimslope)
+	return true;		// shot under the thing
+
+    
+    // hit thing
+    // position a bit closer
+    frac = in->frac - FixedDiv (10*FRACUNIT,attackrange);
+
+    x = trace.x + FixedMul (trace.dx, frac);
+    y = trace.y + FixedMul (trace.dy, frac);
+    z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
+
+    // Spawn bullet puffs or blod spots,
+    // depending on target type.
+    if (in->d.thing->flags & MF_NOBLOOD)
+	P_SpawnPuff (x,y,z);
+    else
+	P_SpawnBlood (x,y,z, la_damage);
+
+    if (la_damage)
+	P_DamageMobj (th, shootthing, shootthing, la_damage);
+
+    // don't go any farther
+    return false;
+	
+}
+
+
+//
+// P_AimLineAttack
+//
+fixed_t
+P_AimLineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance )
+{
+    fixed_t	x2;
+    fixed_t	y2;
+
+    t1 = P_SubstNullMobj(t1);
+	
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    
+    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
+    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
+    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
+
+    // can't shoot outside view angles
+    topslope = (SCREENHEIGHT/2)*FRACUNIT/(SCREENWIDTH/2);	
+    bottomslope = -(SCREENHEIGHT/2)*FRACUNIT/(SCREENWIDTH/2);
+    
+    attackrange = distance;
+    linetarget = NULL;
+	
+    P_PathTraverse ( t1->x, t1->y,
+		     x2, y2,
+		     PT_ADDLINES|PT_ADDTHINGS,
+		     PTR_AimTraverse );
+		
+    if (linetarget)
+	return aimslope;
+
+    return 0;
+}
+ 
+
+//
+// P_LineAttack
+// If damage == 0, it is just a test trace
+// that will leave linetarget set.
+//
+void
+P_LineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance,
+  fixed_t	slope,
+  int		damage )
+{
+    fixed_t	x2;
+    fixed_t	y2;
+	
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    la_damage = damage;
+    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
+    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
+    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
+    attackrange = distance;
+    aimslope = slope;
+		
+    P_PathTraverse ( t1->x, t1->y,
+		     x2, y2,
+		     PT_ADDLINES|PT_ADDTHINGS,
+		     PTR_ShootTraverse );
+}
+ 
+
+
+//
+// USE LINES
+//
+mobj_t*		usething;
+
+boolean	PTR_UseTraverse (intercept_t* in)
+{
+    int		side;
+	
+    if (!in->d.line->special)
+    {
+	P_LineOpening (in->d.line);
+	if (openrange <= 0)
+	{
+	    S_StartSound (usething, sfx_noway);
+	    
+	    // can't use through a wall
+	    return false;	
+	}
+	// not a special line, but keep checking
+	return true ;		
+    }
+	
+    side = 0;
+    if (P_PointOnLineSide (usething->x, usething->y, in->d.line) == 1)
+	side = 1;
+    
+    //	return false;		// don't use back side
+	
+    P_UseSpecialLine (usething, in->d.line, side);
+
+    // can't use for than one special line in a row
+    return false;
+}
+
+
+//
+// P_UseLines
+// Looks for special lines in front of the player to activate.
+//
+void P_UseLines (player_t*	player) 
+{
+    int		angle;
+    fixed_t	x1;
+    fixed_t	y1;
+    fixed_t	x2;
+    fixed_t	y2;
+	
+    usething = player->mo;
+		
+    angle = player->mo->angle >> ANGLETOFINESHIFT;
+
+    x1 = player->mo->x;
+    y1 = player->mo->y;
+    x2 = x1 + (USERANGE>>FRACBITS)*finecosine[angle];
+    y2 = y1 + (USERANGE>>FRACBITS)*finesine[angle];
+	
+    P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse );
+}
+
+
+//
+// RADIUS ATTACK
+//
+mobj_t*		bombsource;
+mobj_t*		bombspot;
+int		bombdamage;
+
+
+//
+// PIT_RadiusAttack
+// "bombsource" is the creature
+// that caused the explosion at "bombspot".
+//
+boolean PIT_RadiusAttack (mobj_t* thing)
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	dist;
+	
+    if (!(thing->flags & MF_SHOOTABLE) )
+	return true;
+
+    // Boss spider and cyborg
+    // take no damage from concussion.
+    if (thing->type == MT_CYBORG
+	|| thing->type == MT_SPIDER)
+	return true;	
+		
+    dx = abs(thing->x - bombspot->x);
+    dy = abs(thing->y - bombspot->y);
+    
+    dist = dx>dy ? dx : dy;
+    dist = (dist - thing->radius) >> FRACBITS;
+
+    if (dist < 0)
+	dist = 0;
+
+    if (dist >= bombdamage)
+	return true;	// out of range
+
+    if ( P_CheckSight (thing, bombspot) )
+    {
+	// must be in direct path
+	P_DamageMobj (thing, bombspot, bombsource, bombdamage - dist);
+    }
+    
+    return true;
+}
+
+
+//
+// P_RadiusAttack
+// Source is the creature that caused the explosion at spot.
+//
+void
+P_RadiusAttack
+( mobj_t*	spot,
+  mobj_t*	source,
+  int		damage )
+{
+    int		x;
+    int		y;
+    
+    int		xl;
+    int		xh;
+    int		yl;
+    int		yh;
+    
+    fixed_t	dist;
+	
+    dist = (damage+MAXRADIUS)<<FRACBITS;
+    yh = (spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
+    yl = (spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
+    xh = (spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
+    xl = (spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
+    bombspot = spot;
+    bombsource = source;
+    bombdamage = damage;
+	
+    for (y=yl ; y<=yh ; y++)
+	for (x=xl ; x<=xh ; x++)
+	    P_BlockThingsIterator (x, y, PIT_RadiusAttack );
+}
+
+
+
+//
+// SECTOR HEIGHT CHANGING
+// After modifying a sectors floor or ceiling height,
+// call this routine to adjust the positions
+// of all things that touch the sector.
+//
+// If anything doesn't fit anymore, true will be returned.
+// If crunch is true, they will take damage
+//  as they are being crushed.
+// If Crunch is false, you should set the sector height back
+//  the way it was and call P_ChangeSector again
+//  to undo the changes.
+//
+boolean		crushchange;
+boolean		nofit;
+
+
+//
+// PIT_ChangeSector
+//
+boolean PIT_ChangeSector (mobj_t*	thing)
+{
+    mobj_t*	mo;
+	
+    if (P_ThingHeightClip (thing))
+    {
+	// keep checking
+	return true;
+    }
+    
+
+    // crunch bodies to giblets
+    if (thing->health <= 0)
+    {
+	P_SetMobjState (thing, S_GIBS);
+
+    if (gameversion > exe_doom_1_2)
+	    thing->flags &= ~MF_SOLID;
+	thing->height = 0;
+	thing->radius = 0;
+
+	// keep checking
+	return true;		
+    }
+
+    // crunch dropped items
+    if (thing->flags & MF_DROPPED)
+    {
+	P_RemoveMobj (thing);
+	
+	// keep checking
+	return true;		
+    }
+
+    if (! (thing->flags & MF_SHOOTABLE) )
+    {
+	// assume it is bloody gibs or something
+	return true;			
+    }
+    
+    nofit = true;
+
+    if (crushchange && !(leveltime&3) )
+    {
+	P_DamageMobj(thing,NULL,NULL,10);
+
+	// spray blood in a random direction
+	mo = P_SpawnMobj (thing->x,
+			  thing->y,
+			  thing->z + thing->height/2, MT_BLOOD);
+	
+	mo->momx = P_SubRandom() << 12;
+	mo->momy = P_SubRandom() << 12;
+    }
+
+    // keep checking (crush other things)	
+    return true;	
+}
+
+
+
+//
+// P_ChangeSector
+//
+boolean
+P_ChangeSector
+( sector_t*	sector,
+  boolean	crunch )
+{
+    int		x;
+    int		y;
+	
+    nofit = false;
+    crushchange = crunch;
+	
+    // re-check heights for all things near the moving sector
+    for (x=sector->blockbox[BOXLEFT] ; x<= sector->blockbox[BOXRIGHT] ; x++)
+	for (y=sector->blockbox[BOXBOTTOM];y<= sector->blockbox[BOXTOP] ; y++)
+	    P_BlockThingsIterator (x, y, PIT_ChangeSector);
+	
+	
+    return nofit;
+}
+
+// Code to emulate the behavior of Vanilla Doom when encountering an overrun
+// of the spechit array.  This is by Andrey Budko (e6y) and comes from his
+// PrBoom plus port.  A big thanks to Andrey for this.
+
+static void SpechitOverrun(line_t *ld)
+{
+    static unsigned int baseaddr = 0;
+    unsigned int addr;
+   
+    if (baseaddr == 0)
+    {
+        int p;
+
+        // This is the first time we have had an overrun.  Work out
+        // what base address we are going to use.
+        // Allow a spechit value to be specified on the command line.
+
+        //!
+        // @category compat
+        // @arg <n>
+        //
+        // Use the specified magic value when emulating spechit overruns.
+        //
+
+        p = M_CheckParmWithArgs("-spechit", 1);
+        
+        if (p > 0)
+        {
+            M_StrToInt(myargv[p+1], (int *) &baseaddr);
+        }
+        else
+        {
+            baseaddr = DEFAULT_SPECHIT_MAGIC;
+        }
+    }
+    
+    // Calculate address used in doom2.exe
+
+    addr = baseaddr + (ld - lines) * 0x3E;
+
+    switch(numspechit)
+    {
+        case 9: 
+        case 10:
+        case 11:
+        case 12:
+            tmbbox[numspechit-9] = addr;
+            break;
+        case 13: 
+            crushchange = addr; 
+            break;
+        case 14: 
+            nofit = addr; 
+            break;
+        default:
+            fprintf(stderr, "SpechitOverrun: Warning: unable to emulate"
+                            "an overrun where numspechit=%i\n",
+                            numspechit);
+            break;
+    }
+}
+
diff --git a/games/NXDoom/src/doom/p_maputl.c b/games/NXDoom/src/doom/p_maputl.c
new file mode 100644
index 000000000..cb74c942f
--- /dev/null
+++ b/games/NXDoom/src/doom/p_maputl.c
@@ -0,0 +1,1002 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2005, 2006 Andrey Budko
+//
+// 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.
+//
+// DESCRIPTION:
+//	Movement/collision utility functions,
+//	as used by function in p_map.c. 
+//	BLOCKMAP Iterator functions,
+//	and some PIT_* functions to use for iteration.
+//
+
+
+
+#include <stdlib.h>
+
+
+#include "m_bbox.h"
+#include "m_misc.h"
+
+#include "doomdef.h"
+#include "doomstat.h"
+#include "p_local.h"
+
+
+// State.
+#include "r_state.h"
+
+//
+// P_AproxDistance
+// Gives an estimation of distance (not exact)
+//
+
+fixed_t
+P_AproxDistance
+( fixed_t	dx,
+  fixed_t	dy )
+{
+    dx = abs(dx);
+    dy = abs(dy);
+    if (dx < dy)
+	return dx+dy-(dx>>1);
+    return dx+dy-(dy>>1);
+}
+
+
+//
+// P_PointOnLineSide
+// Returns 0 or 1
+//
+int
+P_PointOnLineSide
+( fixed_t	x,
+  fixed_t	y,
+  line_t*	line )
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    if (!line->dx)
+    {
+	if (x <= line->v1->x)
+	    return line->dy > 0;
+	
+	return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+	if (y <= line->v1->y)
+	    return line->dx < 0;
+	
+	return line->dx > 0;
+    }
+	
+    dx = (x - line->v1->x);
+    dy = (y - line->v1->y);
+	
+    left = FixedMul ( line->dy>>FRACBITS , dx );
+    right = FixedMul ( dy , line->dx>>FRACBITS );
+	
+    if (right < left)
+	return 0;		// front side
+    return 1;			// back side
+}
+
+
+
+//
+// P_BoxOnLineSide
+// Considers the line to be infinite
+// Returns side 0 or 1, -1 if box crosses the line.
+//
+int
+P_BoxOnLineSide
+( fixed_t*	tmbox,
+  line_t*	ld )
+{
+    int		p1 = 0;
+    int		p2 = 0;
+	
+    switch (ld->slopetype)
+    {
+      case ST_HORIZONTAL:
+	p1 = tmbox[BOXTOP] > ld->v1->y;
+	p2 = tmbox[BOXBOTTOM] > ld->v1->y;
+	if (ld->dx < 0)
+	{
+	    p1 ^= 1;
+	    p2 ^= 1;
+	}
+	break;
+	
+      case ST_VERTICAL:
+	p1 = tmbox[BOXRIGHT] < ld->v1->x;
+	p2 = tmbox[BOXLEFT] < ld->v1->x;
+	if (ld->dy < 0)
+	{
+	    p1 ^= 1;
+	    p2 ^= 1;
+	}
+	break;
+	
+      case ST_POSITIVE:
+	p1 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXTOP], ld);
+	p2 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
+	break;
+	
+      case ST_NEGATIVE:
+	p1 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
+	p2 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
+	break;
+    }
+
+    if (p1 == p2)
+	return p1;
+    return -1;
+}
+
+
+//
+// P_PointOnDivlineSide
+// Returns 0 or 1.
+//
+int
+P_PointOnDivlineSide
+( fixed_t	x,
+  fixed_t	y,
+  divline_t*	line )
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    if (!line->dx)
+    {
+	if (x <= line->x)
+	    return line->dy > 0;
+	
+	return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+	if (y <= line->y)
+	    return line->dx < 0;
+
+	return line->dx > 0;
+    }
+	
+    dx = (x - line->x);
+    dy = (y - line->y);
+	
+    // try to quickly decide by looking at sign bits
+    if ( (line->dy ^ line->dx ^ dx ^ dy)&0x80000000 )
+    {
+	if ( (line->dy ^ dx) & 0x80000000 )
+	    return 1;		// (left is negative)
+	return 0;
+    }
+	
+    left = FixedMul ( line->dy>>8, dx>>8 );
+    right = FixedMul ( dy>>8 , line->dx>>8 );
+	
+    if (right < left)
+	return 0;		// front side
+    return 1;			// back side
+}
+
+
+
+//
+// P_MakeDivline
+//
+void
+P_MakeDivline
+( line_t*	li,
+  divline_t*	dl )
+{
+    dl->x = li->v1->x;
+    dl->y = li->v1->y;
+    dl->dx = li->dx;
+    dl->dy = li->dy;
+}
+
+
+
+//
+// P_InterceptVector
+// Returns the fractional intercept point
+// along the first divline.
+// This is only called by the addthings
+// and addlines traversers.
+//
+fixed_t
+P_InterceptVector
+( divline_t*	v2,
+  divline_t*	v1 )
+{
+#if 1
+    fixed_t	frac;
+    fixed_t	num;
+    fixed_t	den;
+	
+    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
+
+    if (den == 0)
+	return 0;
+    //	I_Error ("P_InterceptVector: parallel");
+    
+    num =
+	FixedMul ( (v1->x - v2->x)>>8 ,v1->dy )
+	+FixedMul ( (v2->y - v1->y)>>8, v1->dx );
+
+    frac = FixedDiv (num , den);
+
+    return frac;
+#else	// UNUSED, float debug.
+    float	frac;
+    float	num;
+    float	den;
+    float	v1x;
+    float	v1y;
+    float	v1dx;
+    float	v1dy;
+    float	v2x;
+    float	v2y;
+    float	v2dx;
+    float	v2dy;
+
+    v1x = (float)v1->x/FRACUNIT;
+    v1y = (float)v1->y/FRACUNIT;
+    v1dx = (float)v1->dx/FRACUNIT;
+    v1dy = (float)v1->dy/FRACUNIT;
+    v2x = (float)v2->x/FRACUNIT;
+    v2y = (float)v2->y/FRACUNIT;
+    v2dx = (float)v2->dx/FRACUNIT;
+    v2dy = (float)v2->dy/FRACUNIT;
+	
+    den = v1dy*v2dx - v1dx*v2dy;
+
+    if (den == 0)
+	return 0;	// parallel
+    
+    num = (v1x - v2x)*v1dy + (v2y - v1y)*v1dx;
+    frac = num / den;
+
+    return frac*FRACUNIT;
+#endif
+}
+
+
+//
+// P_LineOpening
+// Sets opentop and openbottom to the window
+// through a two sided line.
+// OPTIMIZE: keep this precalculated
+//
+fixed_t opentop;
+fixed_t openbottom;
+fixed_t openrange;
+fixed_t	lowfloor;
+
+
+void P_LineOpening (line_t* linedef)
+{
+    sector_t*	front;
+    sector_t*	back;
+	
+    if (linedef->sidenum[1] == -1)
+    {
+	// single sided line
+	openrange = 0;
+	return;
+    }
+	 
+    front = linedef->frontsector;
+    back = linedef->backsector;
+	
+    if (front->ceilingheight < back->ceilingheight)
+	opentop = front->ceilingheight;
+    else
+	opentop = back->ceilingheight;
+
+    if (front->floorheight > back->floorheight)
+    {
+	openbottom = front->floorheight;
+	lowfloor = back->floorheight;
+    }
+    else
+    {
+	openbottom = back->floorheight;
+	lowfloor = front->floorheight;
+    }
+	
+    openrange = opentop - openbottom;
+}
+
+
+//
+// THING POSITION SETTING
+//
+
+
+//
+// P_UnsetThingPosition
+// Unlinks a thing from block map and sectors.
+// On each position change, BLOCKMAP and other
+// lookups maintaining lists ot things inside
+// these structures need to be updated.
+//
+void P_UnsetThingPosition (mobj_t* thing)
+{
+    int		blockx;
+    int		blocky;
+
+    if ( ! (thing->flags & MF_NOSECTOR) )
+    {
+	// inert things don't need to be in blockmap?
+	// unlink from subsector
+	if (thing->snext)
+	    thing->snext->sprev = thing->sprev;
+
+	if (thing->sprev)
+	    thing->sprev->snext = thing->snext;
+	else
+	    thing->subsector->sector->thinglist = thing->snext;
+    }
+	
+    if ( ! (thing->flags & MF_NOBLOCKMAP) )
+    {
+	// inert things don't need to be in blockmap
+	// unlink from block map
+	if (thing->bnext)
+	    thing->bnext->bprev = thing->bprev;
+	
+	if (thing->bprev)
+	    thing->bprev->bnext = thing->bnext;
+	else
+	{
+	    blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
+	    blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
+
+	    if (blockx>=0 && blockx < bmapwidth
+		&& blocky>=0 && blocky <bmapheight)
+	    {
+		blocklinks[blocky*bmapwidth+blockx] = thing->bnext;
+	    }
+	}
+    }
+}
+
+
+//
+// P_SetThingPosition
+// Links a thing into both a block and a subsector
+// based on it's x y.
+// Sets thing->subsector properly
+//
+void
+P_SetThingPosition (mobj_t* thing)
+{
+    subsector_t*	ss;
+    sector_t*		sec;
+    int			blockx;
+    int			blocky;
+    mobj_t**		link;
+
+    
+    // link into subsector
+    ss = R_PointInSubsector (thing->x,thing->y);
+    thing->subsector = ss;
+    
+    if ( ! (thing->flags & MF_NOSECTOR) )
+    {
+	// invisible things don't go into the sector links
+	sec = ss->sector;
+	
+	thing->sprev = NULL;
+	thing->snext = sec->thinglist;
+
+	if (sec->thinglist)
+	    sec->thinglist->sprev = thing;
+
+	sec->thinglist = thing;
+    }
+
+    
+    // link into blockmap
+    if ( ! (thing->flags & MF_NOBLOCKMAP) )
+    {
+	// inert things don't need to be in blockmap		
+	blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
+	blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
+
+	if (blockx>=0
+	    && blockx < bmapwidth
+	    && blocky>=0
+	    && blocky < bmapheight)
+	{
+	    link = &blocklinks[blocky*bmapwidth+blockx];
+	    thing->bprev = NULL;
+	    thing->bnext = *link;
+	    if (*link)
+		(*link)->bprev = thing;
+
+	    *link = thing;
+	}
+	else
+	{
+	    // thing is off the map
+	    thing->bnext = thing->bprev = NULL;
+	}
+    }
+}
+
+
+
+//
+// BLOCK MAP ITERATORS
+// For each line/thing in the given mapblock,
+// call the passed PIT_* function.
+// If the function returns false,
+// exit with false without checking anything else.
+//
+
+
+//
+// P_BlockLinesIterator
+// The validcount flags are used to avoid checking lines
+// that are marked in multiple mapblocks,
+// so increment validcount before the first call
+// to P_BlockLinesIterator, then make one or more calls
+// to it.
+//
+boolean
+P_BlockLinesIterator
+( int			x,
+  int			y,
+  boolean(*func)(line_t*) )
+{
+    int			offset;
+    short*		list;
+    line_t*		ld;
+	
+    if (x<0
+	|| y<0
+	|| x>=bmapwidth
+	|| y>=bmapheight)
+    {
+	return true;
+    }
+    
+    offset = y*bmapwidth+x;
+	
+    offset = *(blockmap+offset);
+
+    for ( list = blockmaplump+offset ; *list != -1 ; list++)
+    {
+	ld = &lines[*list];
+
+	if (ld->validcount == validcount)
+	    continue; 	// line has already been checked
+
+	ld->validcount = validcount;
+		
+	if ( !func(ld) )
+	    return false;
+    }
+    return true;	// everything was checked
+}
+
+
+//
+// P_BlockThingsIterator
+//
+boolean
+P_BlockThingsIterator
+( int                   x,
+  int                   y,
+  boolean(*func)(mobj_t*) )
+{
+    mobj_t*             mobj;
+
+    if ( x<0
+         || y<0
+         || x>=bmapwidth
+         || y>=bmapheight)
+    {
+        return true;
+    }
+
+    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
+
+    for (mobj = blocklinks[y*bmapwidth+x] ;
+         mobj ;
+         mobj = mobj->bnext)
+    {
+        if (!func( mobj ) )
+            return false;
+    }
+    return true;
+}
+
+
+
+//
+// INTERCEPT ROUTINES
+//
+intercept_t	intercepts[MAXINTERCEPTS];
+intercept_t*	intercept_p;
+
+divline_t 	trace;
+boolean 	earlyout;
+int		ptflags;
+
+static void InterceptsOverrun(int num_intercepts, intercept_t *intercept);
+
+//
+// PIT_AddLineIntercepts.
+// Looks for lines in the given block
+// that intercept the given trace
+// to add to the intercepts list.
+//
+// A line is crossed if its endpoints
+// are on opposite sides of the trace.
+// Returns true if earlyout and a solid line hit.
+//
+boolean
+PIT_AddLineIntercepts (line_t* ld)
+{
+    int			s1;
+    int			s2;
+    fixed_t		frac;
+    divline_t		dl;
+	
+    // avoid precision problems with two routines
+    if ( trace.dx > FRACUNIT*16
+	 || trace.dy > FRACUNIT*16
+	 || trace.dx < -FRACUNIT*16
+	 || trace.dy < -FRACUNIT*16)
+    {
+	s1 = P_PointOnDivlineSide (ld->v1->x, ld->v1->y, &trace);
+	s2 = P_PointOnDivlineSide (ld->v2->x, ld->v2->y, &trace);
+    }
+    else
+    {
+	s1 = P_PointOnLineSide (trace.x, trace.y, ld);
+	s2 = P_PointOnLineSide (trace.x+trace.dx, trace.y+trace.dy, ld);
+    }
+    
+    if (s1 == s2)
+	return true;	// line isn't crossed
+    
+    // hit the line
+    P_MakeDivline (ld, &dl);
+    frac = P_InterceptVector (&trace, &dl);
+
+    if (frac < 0)
+	return true;	// behind source
+	
+    // try to early out the check
+    if (earlyout
+	&& frac < FRACUNIT
+	&& !ld->backsector)
+    {
+	return false;	// stop checking
+    }
+    
+	
+    intercept_p->frac = frac;
+    intercept_p->isaline = true;
+    intercept_p->d.line = ld;
+    InterceptsOverrun(intercept_p - intercepts, intercept_p);
+    intercept_p++;
+
+    return true;	// continue
+}
+
+
+
+//
+// PIT_AddThingIntercepts
+//
+boolean PIT_AddThingIntercepts (mobj_t* thing)
+{
+    fixed_t		x1;
+    fixed_t		y1;
+    fixed_t		x2;
+    fixed_t		y2;
+    
+    int			s1;
+    int			s2;
+    
+    boolean		tracepositive;
+
+    divline_t		dl;
+    
+    fixed_t		frac;
+	
+    tracepositive = (trace.dx ^ trace.dy)>0;
+		
+    // check a corner to corner crossection for hit
+    if (tracepositive)
+    {
+	x1 = thing->x - thing->radius;
+	y1 = thing->y + thing->radius;
+		
+	x2 = thing->x + thing->radius;
+	y2 = thing->y - thing->radius;			
+    }
+    else
+    {
+	x1 = thing->x - thing->radius;
+	y1 = thing->y - thing->radius;
+		
+	x2 = thing->x + thing->radius;
+	y2 = thing->y + thing->radius;			
+    }
+    
+    s1 = P_PointOnDivlineSide (x1, y1, &trace);
+    s2 = P_PointOnDivlineSide (x2, y2, &trace);
+
+    if (s1 == s2)
+	return true;		// line isn't crossed
+	
+    dl.x = x1;
+    dl.y = y1;
+    dl.dx = x2-x1;
+    dl.dy = y2-y1;
+    
+    frac = P_InterceptVector (&trace, &dl);
+
+    if (frac < 0)
+	return true;		// behind source
+
+    intercept_p->frac = frac;
+    intercept_p->isaline = false;
+    intercept_p->d.thing = thing;
+    InterceptsOverrun(intercept_p - intercepts, intercept_p);
+    intercept_p++;
+
+    return true;		// keep going
+}
+
+
+//
+// P_TraverseIntercepts
+// Returns true if the traverser function returns true
+// for all lines.
+// 
+boolean
+P_TraverseIntercepts
+( traverser_t	func,
+  fixed_t	maxfrac )
+{
+    int			count;
+    fixed_t		dist;
+    intercept_t*	scan;
+    intercept_t*	in;
+	
+    count = intercept_p - intercepts;
+    
+    in = 0;			// shut up compiler warning
+	
+    while (count--)
+    {
+	dist = INT_MAX;
+	for (scan = intercepts ; scan<intercept_p ; scan++)
+	{
+	    if (scan->frac < dist)
+	    {
+		dist = scan->frac;
+		in = scan;
+	    }
+	}
+	
+	if (dist > maxfrac)
+	    return true;	// checked everything in range		
+
+#if 0  // UNUSED
+    {
+	// don't check these yet, there may be others inserted
+	in = scan = intercepts;
+	for ( scan = intercepts ; scan<intercept_p ; scan++)
+	    if (scan->frac > maxfrac)
+		*in++ = *scan;
+	intercept_p = in;
+	return false;
+    }
+#endif
+
+        if ( !func (in) )
+	    return false;	// don't bother going farther
+
+	in->frac = INT_MAX;
+    }
+	
+    return true;		// everything was traversed
+}
+
+
+// Intercepts Overrun emulation, from PrBoom-plus.
+// Thanks to Andrey Budko (entryway) for researching this and his 
+// implementation of Intercepts Overrun emulation in PrBoom-plus
+// which this is based on.
+
+typedef struct
+{
+    int len;
+    void *addr;
+    boolean int16_array;
+} intercepts_overrun_t;
+
+// Intercepts memory table.  This is where various variables are located
+// in memory in Vanilla Doom.  When the intercepts table overflows, we
+// need to write to them.
+//
+// Almost all of the values to overwrite are 32-bit integers, except for
+// playerstarts, which is effectively an array of 16-bit integers and
+// must be treated differently.
+
+static intercepts_overrun_t intercepts_overrun[] =
+{
+    {4,   NULL,                          false},
+    {4,   NULL, /* &earlyout, */         false},
+    {4,   NULL, /* &intercept_p, */      false},
+    {4,   &lowfloor,                     false},
+    {4,   &openbottom,                   false},
+    {4,   &opentop,                      false},
+    {4,   &openrange,                    false},
+    {4,   NULL,                          false},
+    {120, NULL, /* &activeplats, */      false},
+    {8,   NULL,                          false},
+    {4,   &bulletslope,                  false},
+    {4,   NULL, /* &swingx, */           false},
+    {4,   NULL, /* &swingy, */           false},
+    {4,   NULL,                          false},
+    {40,  &playerstarts,                 true},
+    {4,   NULL, /* &blocklinks, */       false},
+    {4,   &bmapwidth,                    false},
+    {4,   NULL, /* &blockmap, */         false},
+    {4,   &bmaporgx,                     false},
+    {4,   &bmaporgy,                     false},
+    {4,   NULL, /* &blockmaplump, */     false},
+    {4,   &bmapheight,                   false},
+    {0,   NULL,                          false},
+};
+
+// Overwrite a specific memory location with a value.
+
+static void InterceptsMemoryOverrun(int location, int value)
+{
+    int i, offset;
+    int index;
+    void *addr;
+
+    i = 0;
+    offset = 0;
+
+    // Search down the array until we find the right entry
+
+    while (intercepts_overrun[i].len != 0)
+    {
+        if (offset + intercepts_overrun[i].len > location)
+        {
+            addr = intercepts_overrun[i].addr;
+
+            // Write the value to the memory location.
+            // 16-bit and 32-bit values are written differently.
+
+            if (addr != NULL)
+            {
+                if (intercepts_overrun[i].int16_array)
+                {
+                    index = (location - offset) / 2;
+                    ((short *) addr)[index] = value & 0xffff;
+                    ((short *) addr)[index + 1] = (value >> 16) & 0xffff;
+                }
+                else
+                {
+                    index = (location - offset) / 4;
+                    ((int *) addr)[index] = value;
+                }
+            }
+
+            break;
+        }
+
+        offset += intercepts_overrun[i].len;
+        ++i;
+    }
+}
+
+// Emulate overruns of the intercepts[] array.
+
+static void InterceptsOverrun(int num_intercepts, intercept_t *intercept)
+{
+    int location;
+
+    if (num_intercepts <= MAXINTERCEPTS_ORIGINAL)
+    {
+        // No overrun
+
+        return;
+    }
+
+    location = (num_intercepts - MAXINTERCEPTS_ORIGINAL - 1) * 12;
+
+    // Overwrite memory that is overwritten in Vanilla Doom, using
+    // the values from the intercept structure.
+    //
+    // Note: the ->d.{thing,line} member should really have its
+    // address translated into the correct address value for 
+    // Vanilla Doom.
+
+    InterceptsMemoryOverrun(location, intercept->frac);
+    InterceptsMemoryOverrun(location + 4, intercept->isaline);
+    InterceptsMemoryOverrun(location + 8, (intptr_t) intercept->d.thing);
+}
+
+
+//
+// P_PathTraverse
+// Traces a line from x1,y1 to x2,y2,
+// calling the traverser function for each.
+// Returns true if the traverser function returns true
+// for all lines.
+//
+boolean
+P_PathTraverse
+( fixed_t		x1,
+  fixed_t		y1,
+  fixed_t		x2,
+  fixed_t		y2,
+  int			flags,
+  boolean (*trav) (intercept_t *))
+{
+    fixed_t	xt1;
+    fixed_t	yt1;
+    fixed_t	xt2;
+    fixed_t	yt2;
+    
+    fixed_t	xstep;
+    fixed_t	ystep;
+    
+    fixed_t	partial;
+    
+    fixed_t	xintercept;
+    fixed_t	yintercept;
+    
+    int		mapx;
+    int		mapy;
+    
+    int		mapxstep;
+    int		mapystep;
+
+    int		count;
+		
+    earlyout = (flags & PT_EARLYOUT) != 0;
+		
+    validcount++;
+    intercept_p = intercepts;
+	
+    if ( ((x1-bmaporgx)&(MAPBLOCKSIZE-1)) == 0)
+	x1 += FRACUNIT;	// don't side exactly on a line
+    
+    if ( ((y1-bmaporgy)&(MAPBLOCKSIZE-1)) == 0)
+	y1 += FRACUNIT;	// don't side exactly on a line
+
+    trace.x = x1;
+    trace.y = y1;
+    trace.dx = x2 - x1;
+    trace.dy = y2 - y1;
+
+    x1 -= bmaporgx;
+    y1 -= bmaporgy;
+    xt1 = x1>>MAPBLOCKSHIFT;
+    yt1 = y1>>MAPBLOCKSHIFT;
+
+    x2 -= bmaporgx;
+    y2 -= bmaporgy;
+    xt2 = x2>>MAPBLOCKSHIFT;
+    yt2 = y2>>MAPBLOCKSHIFT;
+
+    if (xt2 > xt1)
+    {
+	mapxstep = 1;
+	partial = FRACUNIT - ((x1>>MAPBTOFRAC)&(FRACUNIT-1));
+	ystep = FixedDiv (y2-y1,abs(x2-x1));
+    }
+    else if (xt2 < xt1)
+    {
+	mapxstep = -1;
+	partial = (x1>>MAPBTOFRAC)&(FRACUNIT-1);
+	ystep = FixedDiv (y2-y1,abs(x2-x1));
+    }
+    else
+    {
+	mapxstep = 0;
+	partial = FRACUNIT;
+	ystep = 256*FRACUNIT;
+    }	
+
+    yintercept = (y1>>MAPBTOFRAC) + FixedMul (partial, ystep);
+
+	
+    if (yt2 > yt1)
+    {
+	mapystep = 1;
+	partial = FRACUNIT - ((y1>>MAPBTOFRAC)&(FRACUNIT-1));
+	xstep = FixedDiv (x2-x1,abs(y2-y1));
+    }
+    else if (yt2 < yt1)
+    {
+	mapystep = -1;
+	partial = (y1>>MAPBTOFRAC)&(FRACUNIT-1);
+	xstep = FixedDiv (x2-x1,abs(y2-y1));
+    }
+    else
+    {
+	mapystep = 0;
+	partial = FRACUNIT;
+	xstep = 256*FRACUNIT;
+    }	
+    xintercept = (x1>>MAPBTOFRAC) + FixedMul (partial, xstep);
+    
+    // Step through map blocks.
+    // Count is present to prevent a round off error
+    // from skipping the break.
+    mapx = xt1;
+    mapy = yt1;
+	
+    for (count = 0 ; count < 64 ; count++)
+    {
+	if (flags & PT_ADDLINES)
+	{
+	    if (!P_BlockLinesIterator (mapx, mapy,PIT_AddLineIntercepts))
+		return false;	// early out
+	}
+	
+	if (flags & PT_ADDTHINGS)
+	{
+	    if (!P_BlockThingsIterator (mapx, mapy,PIT_AddThingIntercepts))
+		return false;	// early out
+	}
+		
+	if (mapx == xt2
+	    && mapy == yt2)
+	{
+	    break;
+	}
+	
+	if ( (yintercept >> FRACBITS) == mapy)
+	{
+	    yintercept += ystep;
+	    mapx += mapxstep;
+	}
+	else if ( (xintercept >> FRACBITS) == mapx)
+	{
+	    xintercept += xstep;
+	    mapy += mapystep;
+	}
+		
+    }
+    // go through the sorted list
+    return P_TraverseIntercepts ( trav, FRACUNIT );
+}
+
+
+
diff --git a/games/NXDoom/src/doom/p_mobj.c b/games/NXDoom/src/doom/p_mobj.c
new file mode 100644
index 000000000..481c52822
--- /dev/null
+++ b/games/NXDoom/src/doom/p_mobj.c
@@ -0,0 +1,1072 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Moving object handling. Spawn functions.
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+#include "sounds.h"
+
+#include "st_stuff.h"
+#include "hu_stuff.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+
+void G_PlayerReborn (int player);
+void P_SpawnMapThing (mapthing_t*	mthing);
+
+
+//
+// P_SetMobjState
+// Returns true if the mobj is still present.
+//
+int test;
+
+// Use a heuristic approach to detect infinite state cycles: Count the number
+// of times the loop in P_SetMobjState() executes and exit with an error once
+// an arbitrary very large limit is reached.
+
+#define MOBJ_CYCLE_LIMIT 1000000
+
+boolean
+P_SetMobjState
+( mobj_t*	mobj,
+  statenum_t	state )
+{
+    state_t*	st;
+    int	cycle_counter = 0;
+
+    do
+    {
+	if (state == S_NULL)
+	{
+	    mobj->state = (state_t *) S_NULL;
+	    P_RemoveMobj (mobj);
+	    return false;
+	}
+
+	st = &states[state];
+	mobj->state = st;
+	mobj->tics = st->tics;
+	mobj->sprite = st->sprite;
+	mobj->frame = st->frame;
+
+	// Modified handling.
+	// Call action functions when the state is set
+	if (st->action.acp1)		
+	    st->action.acp1(mobj);	
+	
+	state = st->nextstate;
+
+	if (cycle_counter++ > MOBJ_CYCLE_LIMIT)
+	{
+	    I_Error("P_SetMobjState: Infinite state cycle detected!");
+	}
+    } while (!mobj->tics);
+				
+    return true;
+}
+
+
+//
+// P_ExplodeMissile  
+//
+void P_ExplodeMissile (mobj_t* mo)
+{
+    mo->momx = mo->momy = mo->momz = 0;
+
+    P_SetMobjState (mo, mobjinfo[mo->type].deathstate);
+
+    mo->tics -= P_Random()&3;
+
+    if (mo->tics < 1)
+	mo->tics = 1;
+
+    mo->flags &= ~MF_MISSILE;
+
+    if (mo->info->deathsound)
+	S_StartSound (mo, mo->info->deathsound);
+}
+
+
+//
+// P_XYMovement  
+//
+#define STOPSPEED		0x1000
+#define FRICTION		0xe800
+
+void P_XYMovement (mobj_t* mo) 
+{ 	
+    fixed_t 	ptryx;
+    fixed_t	ptryy;
+    player_t*	player;
+    fixed_t	xmove;
+    fixed_t	ymove;
+			
+    if (!mo->momx && !mo->momy)
+    {
+	if (mo->flags & MF_SKULLFLY)
+	{
+	    // the skull slammed into something
+	    mo->flags &= ~MF_SKULLFLY;
+	    mo->momx = mo->momy = mo->momz = 0;
+
+	    P_SetMobjState (mo, mo->info->spawnstate);
+	}
+	return;
+    }
+	
+    player = mo->player;
+		
+    if (mo->momx > MAXMOVE)
+	mo->momx = MAXMOVE;
+    else if (mo->momx < -MAXMOVE)
+	mo->momx = -MAXMOVE;
+
+    if (mo->momy > MAXMOVE)
+	mo->momy = MAXMOVE;
+    else if (mo->momy < -MAXMOVE)
+	mo->momy = -MAXMOVE;
+		
+    xmove = mo->momx;
+    ymove = mo->momy;
+	
+    do
+    {
+	if (xmove > MAXMOVE/2 || ymove > MAXMOVE/2)
+	{
+	    ptryx = mo->x + xmove/2;
+	    ptryy = mo->y + ymove/2;
+	    xmove >>= 1;
+	    ymove >>= 1;
+	}
+	else
+	{
+	    ptryx = mo->x + xmove;
+	    ptryy = mo->y + ymove;
+	    xmove = ymove = 0;
+	}
+		
+	if (!P_TryMove (mo, ptryx, ptryy))
+	{
+	    // blocked move
+	    if (mo->player)
+	    {	// try to slide along it
+		P_SlideMove (mo);
+	    }
+	    else if (mo->flags & MF_MISSILE)
+	    {
+		// explode a missile
+		if (ceilingline &&
+		    ceilingline->backsector &&
+		    ceilingline->backsector->ceilingpic == skyflatnum)
+		{
+		    // Hack to prevent missiles exploding
+		    // against the sky.
+		    // Does not handle sky floors.
+		    P_RemoveMobj (mo);
+		    return;
+		}
+		P_ExplodeMissile (mo);
+	    }
+	    else
+		mo->momx = mo->momy = 0;
+	}
+    } while (xmove || ymove);
+    
+    // slow down
+    if (player && player->cheats & CF_NOMOMENTUM)
+    {
+	// debug option for no sliding at all
+	mo->momx = mo->momy = 0;
+	return;
+    }
+
+    if (mo->flags & (MF_MISSILE | MF_SKULLFLY) )
+	return; 	// no friction for missiles ever
+		
+    if (mo->z > mo->floorz)
+	return;		// no friction when airborne
+
+    if (mo->flags & MF_CORPSE)
+    {
+	// do not stop sliding
+	//  if halfway off a step with some momentum
+	if (mo->momx > FRACUNIT/4
+	    || mo->momx < -FRACUNIT/4
+	    || mo->momy > FRACUNIT/4
+	    || mo->momy < -FRACUNIT/4)
+	{
+	    if (mo->floorz != mo->subsector->sector->floorheight)
+		return;
+	}
+    }
+
+    if (mo->momx > -STOPSPEED
+	&& mo->momx < STOPSPEED
+	&& mo->momy > -STOPSPEED
+	&& mo->momy < STOPSPEED
+	&& (!player
+	    || (player->cmd.forwardmove== 0
+		&& player->cmd.sidemove == 0 ) ) )
+    {
+	// if in a walking frame, stop moving
+	if ( player&&(unsigned)((player->mo->state - states)- S_PLAY_RUN1) < 4)
+	    P_SetMobjState (player->mo, S_PLAY);
+	
+	mo->momx = 0;
+	mo->momy = 0;
+    }
+    else
+    {
+	mo->momx = FixedMul (mo->momx, FRICTION);
+	mo->momy = FixedMul (mo->momy, FRICTION);
+    }
+}
+
+//
+// P_ZMovement
+//
+void P_ZMovement (mobj_t* mo)
+{
+    fixed_t	dist;
+    fixed_t	delta;
+    
+    // check for smooth step up
+    if (mo->player && mo->z < mo->floorz)
+    {
+	mo->player->viewheight -= mo->floorz-mo->z;
+
+	mo->player->deltaviewheight
+	    = (VIEWHEIGHT - mo->player->viewheight)>>3;
+    }
+    
+    // adjust height
+    mo->z += mo->momz;
+	
+    if ( mo->flags & MF_FLOAT
+	 && mo->target)
+    {
+	// float down towards target if too close
+	if ( !(mo->flags & MF_SKULLFLY)
+	     && !(mo->flags & MF_INFLOAT) )
+	{
+	    dist = P_AproxDistance (mo->x - mo->target->x,
+				    mo->y - mo->target->y);
+	    
+	    delta =(mo->target->z + (mo->height>>1)) - mo->z;
+
+	    if (delta<0 && dist < -(delta*3) )
+		mo->z -= FLOATSPEED;
+	    else if (delta>0 && dist < (delta*3) )
+		mo->z += FLOATSPEED;			
+	}
+	
+    }
+    
+    // clip movement
+    if (mo->z <= mo->floorz)
+    {
+	// hit the floor
+
+	// Note (id):
+	//  somebody left this after the setting momz to 0,
+	//  kinda useless there.
+	//
+	// cph - This was the a bug in the linuxdoom-1.10 source which
+	//  caused it not to sync Doom 2 v1.9 demos. Someone
+	//  added the above comment and moved up the following code. So
+	//  demos would desync in close lost soul fights.
+	// Note that this only applies to original Doom 1 or Doom2 demos - not
+	//  Final Doom and Ultimate Doom.  So we test demo_compatibility *and*
+	//  gamemission. (Note we assume that Doom1 is always Ult Doom, which
+	//  seems to hold for most published demos.)
+        //  
+        //  fraggle - cph got the logic here slightly wrong.  There are three
+        //  versions of Doom 1.9:
+        //
+        //  * The version used in registered doom 1.9 + doom2 - no bounce
+        //  * The version used in ultimate doom - has bounce
+        //  * The version used in final doom - has bounce
+        //
+        // So we need to check that this is either retail or commercial
+        // (but not doom2)
+	
+	int correct_lost_soul_bounce = gameversion >= exe_ultimate;
+
+	if (correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
+	{
+	    // the skull slammed into something
+	    mo->momz = -mo->momz;
+	}
+	
+	if (mo->momz < 0)
+	{
+	    if (mo->player
+		&& mo->momz < -GRAVITY*8)	
+	    {
+		// Squat down.
+		// Decrease viewheight for a moment
+		// after hitting the ground (hard),
+		// and utter appropriate sound.
+		mo->player->deltaviewheight = mo->momz>>3;
+		S_StartSound (mo, sfx_oof);
+	    }
+	    mo->momz = 0;
+	}
+	mo->z = mo->floorz;
+
+
+	// cph 2001/05/26 -
+	// See lost soul bouncing comment above. We need this here for bug
+	// compatibility with original Doom2 v1.9 - if a soul is charging and
+	// hit by a raising floor this incorrectly reverses its Y momentum.
+	//
+
+        if (!correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
+            mo->momz = -mo->momz;
+
+	if ( (mo->flags & MF_MISSILE)
+	     && !(mo->flags & MF_NOCLIP) )
+	{
+	    P_ExplodeMissile (mo);
+	    return;
+	}
+    }
+    else if (! (mo->flags & MF_NOGRAVITY) )
+    {
+	if (mo->momz == 0)
+	    mo->momz = -GRAVITY*2;
+	else
+	    mo->momz -= GRAVITY;
+    }
+	
+    if (mo->z + mo->height > mo->ceilingz)
+    {
+	// hit the ceiling
+	if (mo->momz > 0)
+	    mo->momz = 0;
+	{
+	    mo->z = mo->ceilingz - mo->height;
+	}
+
+	if (mo->flags & MF_SKULLFLY)
+	{	// the skull slammed into something
+	    mo->momz = -mo->momz;
+	}
+	
+	if ( (mo->flags & MF_MISSILE)
+	     && !(mo->flags & MF_NOCLIP) )
+	{
+	    P_ExplodeMissile (mo);
+	    return;
+	}
+    }
+} 
+
+
+
+//
+// P_NightmareRespawn
+//
+void
+P_NightmareRespawn (mobj_t* mobj)
+{
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z; 
+    subsector_t*	ss; 
+    mobj_t*		mo;
+    mapthing_t*		mthing;
+		
+    x = mobj->spawnpoint.x << FRACBITS; 
+    y = mobj->spawnpoint.y << FRACBITS; 
+
+    // somthing is occupying it's position?
+    if (!P_CheckPosition (mobj, x, y) ) 
+	return;	// no respwan
+
+    // spawn a teleport fog at old spot
+    // because of removal of the body?
+    mo = P_SpawnMobj (mobj->x,
+		      mobj->y,
+		      mobj->subsector->sector->floorheight , MT_TFOG); 
+    // initiate teleport sound
+    S_StartSound (mo, sfx_telept);
+
+    // spawn a teleport fog at the new spot
+    ss = R_PointInSubsector (x,y); 
+
+    mo = P_SpawnMobj (x, y, ss->sector->floorheight , MT_TFOG); 
+
+    S_StartSound (mo, sfx_telept);
+
+    // spawn the new monster
+    mthing = &mobj->spawnpoint;
+	
+    // spawn it
+    if (mobj->info->flags & MF_SPAWNCEILING)
+	z = ONCEILINGZ;
+    else
+	z = ONFLOORZ;
+
+    // inherit attributes from deceased one
+    mo = P_SpawnMobj (x,y,z, mobj->type);
+    mo->spawnpoint = mobj->spawnpoint;	
+    mo->angle = ANG45 * (mthing->angle/45);
+
+    if (mthing->options & MTF_AMBUSH)
+	mo->flags |= MF_AMBUSH;
+
+    mo->reactiontime = 18;
+	
+    // remove the old monster,
+    P_RemoveMobj (mobj);
+}
+
+
+//
+// P_MobjThinker
+//
+void P_MobjThinker (mobj_t* mobj)
+{
+    // momentum movement
+    if (mobj->momx
+	|| mobj->momy
+	|| (mobj->flags&MF_SKULLFLY) )
+    {
+	P_XYMovement (mobj);
+
+	// FIXME: decent NOP/NULL/Nil function pointer please.
+	if (mobj->thinker.function.acv == (actionf_v) (-1))
+	    return;		// mobj was removed
+    }
+    if ( (mobj->z != mobj->floorz)
+	 || mobj->momz )
+    {
+	P_ZMovement (mobj);
+	
+	// FIXME: decent NOP/NULL/Nil function pointer please.
+	if (mobj->thinker.function.acv == (actionf_v) (-1))
+	    return;		// mobj was removed
+    }
+
+    
+    // cycle through states,
+    // calling action functions at transitions
+    if (mobj->tics != -1)
+    {
+	mobj->tics--;
+		
+	// you can cycle through multiple states in a tic
+	if (!mobj->tics)
+	    if (!P_SetMobjState (mobj, mobj->state->nextstate) )
+		return;		// freed itself
+    }
+    else
+    {
+	// check for nightmare respawn
+	if (! (mobj->flags & MF_COUNTKILL) )
+	    return;
+
+	if (!respawnmonsters)
+	    return;
+
+	mobj->movecount++;
+
+	if (mobj->movecount < 12*TICRATE)
+	    return;
+
+	if ( leveltime&31 )
+	    return;
+
+	if (P_Random () > 4)
+	    return;
+
+	P_NightmareRespawn (mobj);
+    }
+
+}
+
+
+//
+// P_SpawnMobj
+//
+mobj_t*
+P_SpawnMobj
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z,
+  mobjtype_t	type )
+{
+    mobj_t*	mobj;
+    state_t*	st;
+    mobjinfo_t*	info;
+	
+    mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
+    memset (mobj, 0, sizeof (*mobj));
+    info = &mobjinfo[type];
+	
+    mobj->type = type;
+    mobj->info = info;
+    mobj->x = x;
+    mobj->y = y;
+    mobj->radius = info->radius;
+    mobj->height = info->height;
+    mobj->flags = info->flags;
+    mobj->health = info->spawnhealth;
+
+    if (gameskill != sk_nightmare)
+	mobj->reactiontime = info->reactiontime;
+    
+    mobj->lastlook = P_Random () % MAXPLAYERS;
+    // do not set the state with P_SetMobjState,
+    // because action routines can not be called yet
+    st = &states[info->spawnstate];
+
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+
+    // set subsector and/or block links
+    P_SetThingPosition (mobj);
+	
+    mobj->floorz = mobj->subsector->sector->floorheight;
+    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+
+    if (z == ONFLOORZ)
+	mobj->z = mobj->floorz;
+    else if (z == ONCEILINGZ)
+	mobj->z = mobj->ceilingz - mobj->info->height;
+    else 
+	mobj->z = z;
+
+    mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+	
+    P_AddThinker (&mobj->thinker);
+
+    return mobj;
+}
+
+
+//
+// P_RemoveMobj
+//
+mapthing_t	itemrespawnque[ITEMQUESIZE];
+int		itemrespawntime[ITEMQUESIZE];
+int		iquehead;
+int		iquetail;
+
+
+void P_RemoveMobj (mobj_t* mobj)
+{
+    if ((mobj->flags & MF_SPECIAL)
+	&& !(mobj->flags & MF_DROPPED)
+	&& (mobj->type != MT_INV)
+	&& (mobj->type != MT_INS))
+    {
+	itemrespawnque[iquehead] = mobj->spawnpoint;
+	itemrespawntime[iquehead] = leveltime;
+	iquehead = (iquehead+1)&(ITEMQUESIZE-1);
+
+	// lose one off the end?
+	if (iquehead == iquetail)
+	    iquetail = (iquetail+1)&(ITEMQUESIZE-1);
+    }
+	
+    // unlink from sector and block lists
+    P_UnsetThingPosition (mobj);
+    
+    // stop any playing sound
+    S_StopSound (mobj);
+    
+    // free block
+    P_RemoveThinker ((thinker_t*)mobj);
+}
+
+
+
+
+//
+// P_RespawnSpecials
+//
+void P_RespawnSpecials (void)
+{
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+    
+    subsector_t*	ss; 
+    mobj_t*		mo;
+    mapthing_t*		mthing;
+    
+    int			i;
+
+    // only respawn items in deathmatch
+    if (deathmatch != 2)
+	return;	// 
+
+    // nothing left to respawn?
+    if (iquehead == iquetail)
+	return;		
+
+    // wait at least 30 seconds
+    if (leveltime - itemrespawntime[iquetail] < 30*TICRATE)
+	return;			
+
+    mthing = &itemrespawnque[iquetail];
+	
+    x = mthing->x << FRACBITS; 
+    y = mthing->y << FRACBITS; 
+	  
+    // spawn a teleport fog at the new spot
+    ss = R_PointInSubsector (x,y); 
+    mo = P_SpawnMobj (x, y, ss->sector->floorheight , MT_IFOG); 
+    S_StartSound (mo, sfx_itmbk);
+
+    // find which type to spawn
+    for (i=0 ; i< NUMMOBJTYPES ; i++)
+    {
+	if (mthing->type == mobjinfo[i].doomednum)
+	    break;
+    }
+
+    if (i >= NUMMOBJTYPES)
+    {
+        I_Error("P_RespawnSpecials: Failed to find mobj type with doomednum "
+                "%d when respawning thing. This would cause a buffer overrun "
+                "in vanilla Doom", mthing->type);
+    }
+
+    // spawn it
+    if (mobjinfo[i].flags & MF_SPAWNCEILING)
+	z = ONCEILINGZ;
+    else
+	z = ONFLOORZ;
+
+    mo = P_SpawnMobj (x,y,z, i);
+    mo->spawnpoint = *mthing;	
+    mo->angle = ANG45 * (mthing->angle/45);
+
+    // pull it from the que
+    iquetail = (iquetail+1)&(ITEMQUESIZE-1);
+}
+
+
+
+
+//
+// P_SpawnPlayer
+// Called when a player is spawned on the level.
+// Most of the player structure stays unchanged
+//  between levels.
+//
+void P_SpawnPlayer (mapthing_t* mthing)
+{
+    player_t*		p;
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+
+    mobj_t*		mobj;
+
+    int			i;
+
+    if (mthing->type == 0)
+    {
+        return;
+    }
+
+    // not playing?
+    if (!playeringame[mthing->type-1])
+	return;					
+		
+    p = &players[mthing->type-1];
+
+    if (p->playerstate == PST_REBORN)
+	G_PlayerReborn (mthing->type-1);
+
+    x 		= mthing->x << FRACBITS;
+    y 		= mthing->y << FRACBITS;
+    z		= ONFLOORZ;
+    mobj	= P_SpawnMobj (x,y,z, MT_PLAYER);
+
+    // set color translations for player sprites
+    if (mthing->type > 1)		
+	mobj->flags |= (mthing->type-1)<<MF_TRANSSHIFT;
+		
+    mobj->angle	= ANG45 * (mthing->angle/45);
+    mobj->player = p;
+    mobj->health = p->health;
+
+    p->mo = mobj;
+    p->playerstate = PST_LIVE;	
+    p->refire = 0;
+    p->message = NULL;
+    p->damagecount = 0;
+    p->bonuscount = 0;
+    p->extralight = 0;
+    p->fixedcolormap = 0;
+    p->viewheight = VIEWHEIGHT;
+
+    // setup gun psprite
+    P_SetupPsprites (p);
+    
+    // give all cards in death match mode
+    if (deathmatch)
+	for (i=0 ; i<NUMCARDS ; i++)
+	    p->cards[i] = true;
+			
+    if (mthing->type-1 == consoleplayer)
+    {
+	// wake up the status bar
+	ST_Start ();
+	// wake up the heads up text
+	HU_Start ();		
+    }
+}
+
+
+//
+// P_SpawnMapThing
+// The fields of the mapthing should
+// already be in host byte order.
+//
+void P_SpawnMapThing (mapthing_t* mthing)
+{
+    int			i;
+    int			bit;
+    mobj_t*		mobj;
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+		
+    // count deathmatch start positions
+    if (mthing->type == 11)
+    {
+	if (deathmatch_p < &deathmatchstarts[10])
+	{
+	    memcpy (deathmatch_p, mthing, sizeof(*mthing));
+	    deathmatch_p++;
+	}
+	return;
+    }
+
+    if (mthing->type <= 0)
+    {
+        // Thing type 0 is actually "player -1 start".  
+        // For some reason, Vanilla Doom accepts/ignores this.
+
+        return;
+    }
+	
+    // check for players specially
+    if (mthing->type <= 4)
+    {
+	// save spots for respawning in network games
+	playerstarts[mthing->type-1] = *mthing;
+	playerstartsingame[mthing->type-1] = true;
+	if (!deathmatch)
+	    P_SpawnPlayer (mthing);
+
+	return;
+    }
+
+    // check for appropriate skill level
+    if (!netgame && (mthing->options & 16) )
+	return;
+		
+    if (gameskill == sk_baby)
+	bit = 1;
+    else if (gameskill == sk_nightmare)
+	bit = 4;
+    else
+        // avoid undefined behavior (left shift by negative value and rhs too big)
+        // by accurately emulating what doom.exe did: reduce mod 32.
+        // For more details check:
+        // https://github.com/chocolate-doom/chocolate-doom/issues/1677
+        bit = (int) (1U << ((gameskill - 1) & 0x1F));
+
+    if (!(mthing->options & bit) )
+	return;
+	
+    // find which type to spawn
+    for (i=0 ; i< NUMMOBJTYPES ; i++)
+	if (mthing->type == mobjinfo[i].doomednum)
+	    break;
+	
+    if (i==NUMMOBJTYPES)
+	I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",
+		 mthing->type,
+		 mthing->x, mthing->y);
+		
+    // don't spawn keycards and players in deathmatch
+    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
+	return;
+		
+    // don't spawn any monsters if -nomonsters
+    if (nomonsters
+	&& ( i == MT_SKULL
+	     || (mobjinfo[i].flags & MF_COUNTKILL)) )
+    {
+	return;
+    }
+    
+    // spawn it
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+
+    if (mobjinfo[i].flags & MF_SPAWNCEILING)
+	z = ONCEILINGZ;
+    else
+	z = ONFLOORZ;
+    
+    mobj = P_SpawnMobj (x,y,z, i);
+    mobj->spawnpoint = *mthing;
+
+    if (mobj->tics > 0)
+	mobj->tics = 1 + (P_Random () % mobj->tics);
+    if (mobj->flags & MF_COUNTKILL)
+	totalkills++;
+    if (mobj->flags & MF_COUNTITEM)
+	totalitems++;
+		
+    mobj->angle = ANG45 * (mthing->angle/45);
+    if (mthing->options & MTF_AMBUSH)
+	mobj->flags |= MF_AMBUSH;
+}
+
+
+
+//
+// GAME SPAWN FUNCTIONS
+//
+
+
+//
+// P_SpawnPuff
+//
+
+void
+P_SpawnPuff
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z )
+{
+    mobj_t*	th;
+	
+    z += (P_SubRandom() << 10);
+
+    th = P_SpawnMobj (x,y,z, MT_PUFF);
+    th->momz = FRACUNIT;
+    th->tics -= P_Random()&3;
+
+    if (th->tics < 1)
+	th->tics = 1;
+	
+    // don't make punches spark on the wall
+    if (attackrange == MELEERANGE)
+	P_SetMobjState (th, S_PUFF3);
+}
+
+
+
+//
+// P_SpawnBlood
+// 
+void
+P_SpawnBlood
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z,
+  int		damage )
+{
+    mobj_t*	th;
+	
+    z += (P_SubRandom() << 10);
+    th = P_SpawnMobj (x,y,z, MT_BLOOD);
+    th->momz = FRACUNIT*2;
+    th->tics -= P_Random()&3;
+
+    if (th->tics < 1)
+	th->tics = 1;
+		
+    if (damage <= 12 && damage >= 9)
+	P_SetMobjState (th,S_BLOOD2);
+    else if (damage < 9)
+	P_SetMobjState (th,S_BLOOD3);
+}
+
+
+
+//
+// P_CheckMissileSpawn
+// Moves the missile forward a bit
+//  and possibly explodes it right there.
+//
+void P_CheckMissileSpawn (mobj_t* th)
+{
+    th->tics -= P_Random()&3;
+    if (th->tics < 1)
+	th->tics = 1;
+    
+    // move a little forward so an angle can
+    // be computed if it immediately explodes
+    th->x += (th->momx>>1);
+    th->y += (th->momy>>1);
+    th->z += (th->momz>>1);
+
+    if (!P_TryMove (th, th->x, th->y))
+	P_ExplodeMissile (th);
+}
+
+// Certain functions assume that a mobj_t pointer is non-NULL,
+// causing a crash in some situations where it is NULL.  Vanilla
+// Doom did not crash because of the lack of proper memory 
+// protection. This function substitutes NULL pointers for
+// pointers to a dummy mobj, to avoid a crash.
+
+mobj_t *P_SubstNullMobj(mobj_t *mobj)
+{
+    if (mobj == NULL)
+    {
+        static mobj_t dummy_mobj;
+
+        dummy_mobj.x = 0;
+        dummy_mobj.y = 0;
+        dummy_mobj.z = 0;
+        dummy_mobj.flags = 0;
+
+        mobj = &dummy_mobj;
+    }
+
+    return mobj;
+}
+
+//
+// P_SpawnMissile
+//
+mobj_t*
+P_SpawnMissile
+( mobj_t*	source,
+  mobj_t*	dest,
+  mobjtype_t	type )
+{
+    mobj_t*	th;
+    angle_t	an;
+    int		dist;
+
+    th = P_SpawnMobj (source->x,
+		      source->y,
+		      source->z + 4*8*FRACUNIT, type);
+    
+    if (th->info->seesound)
+	S_StartSound (th, th->info->seesound);
+
+    th->target = source;	// where it came from
+    an = R_PointToAngle2 (source->x, source->y, dest->x, dest->y);
+
+    // fuzzy player
+    if (dest->flags & MF_SHADOW)
+	an += P_SubRandom() << 20;
+
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul (th->info->speed, finecosine[an]);
+    th->momy = FixedMul (th->info->speed, finesine[an]);
+	
+    dist = P_AproxDistance (dest->x - source->x, dest->y - source->y);
+    dist = dist / th->info->speed;
+
+    if (dist < 1)
+	dist = 1;
+
+    th->momz = (dest->z - source->z) / dist;
+    P_CheckMissileSpawn (th);
+	
+    return th;
+}
+
+
+//
+// P_SpawnPlayerMissile
+// Tries to aim at a nearby monster
+//
+void
+P_SpawnPlayerMissile
+( mobj_t*	source,
+  mobjtype_t	type )
+{
+    mobj_t*	th;
+    angle_t	an;
+    
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	z;
+    fixed_t	slope;
+    
+    // see which target is to be aimed at
+    an = source->angle;
+    slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
+    
+    if (!linetarget)
+    {
+	an += 1<<26;
+	slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
+
+	if (!linetarget)
+	{
+	    an -= 2<<26;
+	    slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
+	}
+
+	if (!linetarget)
+	{
+	    an = source->angle;
+	    slope = 0;
+	}
+    }
+		
+    x = source->x;
+    y = source->y;
+    z = source->z + 4*8*FRACUNIT;
+	
+    th = P_SpawnMobj (x,y,z, type);
+
+    if (th->info->seesound)
+	S_StartSound (th, th->info->seesound);
+
+    th->target = source;
+    th->angle = an;
+    th->momx = FixedMul( th->info->speed,
+			 finecosine[an>>ANGLETOFINESHIFT]);
+    th->momy = FixedMul( th->info->speed,
+			 finesine[an>>ANGLETOFINESHIFT]);
+    th->momz = FixedMul( th->info->speed, slope);
+
+    P_CheckMissileSpawn (th);
+}
+
diff --git a/games/NXDoom/src/doom/p_mobj.h b/games/NXDoom/src/doom/p_mobj.h
new file mode 100644
index 000000000..90ed764b9
--- /dev/null
+++ b/games/NXDoom/src/doom/p_mobj.h
@@ -0,0 +1,284 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Map Objects, MObj, definition and handling.
+//
+
+
+#ifndef __P_MOBJ__
+#define __P_MOBJ__
+
+// Basics.
+#include "tables.h"
+#include "m_fixed.h"
+
+// We need the thinker_t stuff.
+#include "d_think.h"
+
+// We need the WAD data structure for Map things,
+// from the THINGS lump.
+#include "doomdata.h"
+
+// States are tied to finite states are
+//  tied to animation frames.
+// Needs precompiled tables/data structures.
+#include "info.h"
+
+
+
+
+
+
+//
+// NOTES: mobj_t
+//
+// mobj_ts are used to tell the refresh where to draw an image,
+// tell the world simulation when objects are contacted,
+// and tell the sound driver how to position a sound.
+//
+// The refresh uses the next and prev links to follow
+// lists of things in sectors as they are being drawn.
+// The sprite, frame, and angle elements determine which patch_t
+// is used to draw the sprite if it is visible.
+// The sprite and frame values are allmost allways set
+// from state_t structures.
+// The statescr.exe utility generates the states.h and states.c
+// files that contain the sprite/frame numbers from the
+// statescr.txt source file.
+// The xyz origin point represents a point at the bottom middle
+// of the sprite (between the feet of a biped).
+// This is the default origin position for patch_ts grabbed
+// with lumpy.exe.
+// A walking creature will have its z equal to the floor
+// it is standing on.
+//
+// The sound code uses the x,y, and subsector fields
+// to do stereo positioning of any sound effited by the mobj_t.
+//
+// The play simulation uses the blocklinks, x,y,z, radius, height
+// to determine when mobj_ts are touching each other,
+// touching lines in the map, or hit by trace lines (gunshots,
+// lines of sight, etc).
+// The mobj_t->flags element has various bit flags
+// used by the simulation.
+//
+// Every mobj_t is linked into a single sector
+// based on its origin coordinates.
+// The subsector_t is found with R_PointInSubsector(x,y),
+// and the sector_t can be found with subsector->sector.
+// The sector links are only used by the rendering code,
+// the play simulation does not care about them at all.
+//
+// Any mobj_t that needs to be acted upon by something else
+// in the play world (block movement, be shot, etc) will also
+// need to be linked into the blockmap.
+// If the thing has the MF_NOBLOCK flag set, it will not use
+// the block links. It can still interact with other things,
+// but only as the instigator (missiles will run into other
+// things, but nothing can run into a missile).
+// Each block in the grid is 128*128 units, and knows about
+// every line_t that it contains a piece of, and every
+// interactable mobj_t that has its origin contained.  
+//
+// A valid mobj_t is a mobj_t that has the proper subsector_t
+// filled in for its xy coordinates and is linked into the
+// sector from which the subsector was made, or has the
+// MF_NOSECTOR flag set (the subsector_t needs to be valid
+// even if MF_NOSECTOR is set), and is linked into a blockmap
+// block or has the MF_NOBLOCKMAP flag set.
+// Links should only be modified by the P_[Un]SetThingPosition()
+// functions.
+// Do not change the MF_NO? flags while a thing is valid.
+//
+// Any questions?
+//
+
+//
+// Misc. mobj flags
+//
+typedef enum
+{
+    // Call P_SpecialThing when touched.
+    MF_SPECIAL		= 1,
+    // Blocks.
+    MF_SOLID		= 2,
+    // Can be hit.
+    MF_SHOOTABLE	= 4,
+    // Don't use the sector links (invisible but touchable).
+    MF_NOSECTOR		= 8,
+    // Don't use the blocklinks (inert but displayable)
+    MF_NOBLOCKMAP	= 16,                    
+
+    // Not to be activated by sound, deaf monster.
+    MF_AMBUSH		= 32,
+    // Will try to attack right back.
+    MF_JUSTHIT		= 64,
+    // Will take at least one step before attacking.
+    MF_JUSTATTACKED	= 128,
+    // On level spawning (initial position),
+    //  hang from ceiling instead of stand on floor.
+    MF_SPAWNCEILING	= 256,
+    // Don't apply gravity (every tic),
+    //  that is, object will float, keeping current height
+    //  or changing it actively.
+    MF_NOGRAVITY	= 512,
+
+    // Movement flags.
+    // This allows jumps from high places.
+    MF_DROPOFF		= 0x400,
+    // For players, will pick up items.
+    MF_PICKUP		= 0x800,
+    // Player cheat. ???
+    MF_NOCLIP		= 0x1000,
+    // Player: keep info about sliding along walls.
+    MF_SLIDE		= 0x2000,
+    // Allow moves to any height, no gravity.
+    // For active floaters, e.g. cacodemons, pain elementals.
+    MF_FLOAT		= 0x4000,
+    // Don't cross lines
+    //   ??? or look at heights on teleport.
+    MF_TELEPORT		= 0x8000,
+    // Don't hit same species, explode on block.
+    // Player missiles as well as fireballs of various kinds.
+    MF_MISSILE		= 0x10000,	
+    // Dropped by a demon, not level spawned.
+    // E.g. ammo clips dropped by dying former humans.
+    MF_DROPPED		= 0x20000,
+    // Use fuzzy draw (shadow demons or spectres),
+    //  temporary player invisibility powerup.
+    MF_SHADOW		= 0x40000,
+    // Flag: don't bleed when shot (use puff),
+    //  barrels and shootable furniture shall not bleed.
+    MF_NOBLOOD		= 0x80000,
+    // Don't stop moving halfway off a step,
+    //  that is, have dead bodies slide down all the way.
+    MF_CORPSE		= 0x100000,
+    // Floating to a height for a move, ???
+    //  don't auto float to target's height.
+    MF_INFLOAT		= 0x200000,
+
+    // On kill, count this enemy object
+    //  towards intermission kill total.
+    // Happy gathering.
+    MF_COUNTKILL	= 0x400000,
+    
+    // On picking up, count this item object
+    //  towards intermission item total.
+    MF_COUNTITEM	= 0x800000,
+
+    // Special handling: skull in flight.
+    // Neither a cacodemon nor a missile.
+    MF_SKULLFLY		= 0x1000000,
+
+    // Don't spawn this object
+    //  in death match mode (e.g. key cards).
+    MF_NOTDMATCH    	= 0x2000000,
+
+    // Player sprites in multiplayer modes are modified
+    //  using an internal color lookup table for re-indexing.
+    // If 0x4 0x8 or 0xc,
+    //  use a translation table for player colormaps
+    MF_TRANSLATION  	= 0xc000000,
+    // Hmm ???.
+    MF_TRANSSHIFT	= 26
+
+} mobjflag_t;
+
+
+// Map Object definition.
+typedef struct mobj_s
+{
+    // List: thinker links.
+    thinker_t		thinker;
+
+    // Info for drawing: position.
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+
+    // More list: links in sector (if needed)
+    struct mobj_s*	snext;
+    struct mobj_s*	sprev;
+
+    //More drawing info: to determine current sprite.
+    angle_t		angle;	// orientation
+    spritenum_t		sprite;	// used to find patch_t and flip value
+    int			frame;	// might be ORed with FF_FULLBRIGHT
+
+    // Interaction info, by BLOCKMAP.
+    // Links in blocks (if needed).
+    struct mobj_s*	bnext;
+    struct mobj_s*	bprev;
+    
+    struct subsector_s*	subsector;
+
+    // The closest interval over all contacted Sectors.
+    fixed_t		floorz;
+    fixed_t		ceilingz;
+
+    // For movement checking.
+    fixed_t		radius;
+    fixed_t		height;	
+
+    // Momentums, used to update position.
+    fixed_t		momx;
+    fixed_t		momy;
+    fixed_t		momz;
+
+    // If == validcount, already checked.
+    int			validcount;
+
+    mobjtype_t		type;
+    mobjinfo_t*		info;	// &mobjinfo[mobj->type]
+    
+    int			tics;	// state tic counter
+    state_t*		state;
+    int			flags;
+    int			health;
+
+    // Movement direction, movement generation (zig-zagging).
+    int			movedir;	// 0-7
+    int			movecount;	// when 0, select a new dir
+
+    // Thing being chased/attacked (or NULL),
+    // also the originator for missiles.
+    struct mobj_s*	target;
+
+    // Reaction time: if non 0, don't attack yet.
+    // Used by player to freeze a bit after teleporting.
+    int			reactiontime;   
+
+    // If >0, the target will be chased
+    // no matter what (even if shot)
+    int			threshold;
+
+    // Additional info record for player avatars only.
+    // Only valid if type == MT_PLAYER
+    struct player_s*	player;
+
+    // Player number last looked for.
+    int			lastlook;	
+
+    // For nightmare respawn.
+    mapthing_t		spawnpoint;	
+
+    // Thing being chased/attacked for tracers.
+    struct mobj_s*	tracer;	
+    
+} mobj_t;
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/p_plats.c b/games/NXDoom/src/doom/p_plats.c
new file mode 100644
index 000000000..9e773d55c
--- /dev/null
+++ b/games/NXDoom/src/doom/p_plats.c
@@ -0,0 +1,304 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Plats (i.e. elevator platforms) code, raising/lowering.
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+
+plat_t*		activeplats[MAXPLATS];
+
+
+
+//
+// Move a plat up and down
+//
+void T_PlatRaise(plat_t* plat)
+{
+    result_e	res;
+	
+    switch(plat->status)
+    {
+      case up:
+	res = T_MovePlane(plat->sector,
+			  plat->speed,
+			  plat->high,
+			  plat->crush,0,1);
+					
+	if (plat->type == raiseAndChange
+	    || plat->type == raiseToNearestAndChange)
+	{
+	    if (!(leveltime&7))
+		S_StartSound(&plat->sector->soundorg, sfx_stnmov);
+	}
+	
+				
+	if (res == crushed && (!plat->crush))
+	{
+	    plat->count = plat->wait;
+	    plat->status = down;
+	    S_StartSound(&plat->sector->soundorg, sfx_pstart);
+	}
+	else
+	{
+	    if (res == pastdest)
+	    {
+		plat->count = plat->wait;
+		plat->status = waiting;
+		S_StartSound(&plat->sector->soundorg, sfx_pstop);
+
+		switch(plat->type)
+		{
+		  case blazeDWUS:
+		  case downWaitUpStay:
+		    P_RemoveActivePlat(plat);
+		    break;
+		    
+		  case raiseAndChange:
+		  case raiseToNearestAndChange:
+		    P_RemoveActivePlat(plat);
+		    break;
+		    
+		  default:
+		    break;
+		}
+	    }
+	}
+	break;
+	
+      case	down:
+	res = T_MovePlane(plat->sector,plat->speed,plat->low,false,0,-1);
+
+	if (res == pastdest)
+	{
+	    plat->count = plat->wait;
+	    plat->status = waiting;
+	    S_StartSound(&plat->sector->soundorg,sfx_pstop);
+	}
+	break;
+	
+      case	waiting:
+	if (!--plat->count)
+	{
+	    if (plat->sector->floorheight == plat->low)
+		plat->status = up;
+	    else
+		plat->status = down;
+	    S_StartSound(&plat->sector->soundorg,sfx_pstart);
+	}
+      case	in_stasis:
+	break;
+    }
+}
+
+
+//
+// Do Platforms
+//  "amount" is only used for SOME platforms.
+//
+int
+EV_DoPlat
+( line_t*	line,
+  plattype_e	type,
+  int		amount )
+{
+    plat_t*	plat;
+    int		secnum;
+    int		rtn;
+    sector_t*	sec;
+	
+    secnum = -1;
+    rtn = 0;
+
+    
+    //	Activate all <type> plats that are in_stasis
+    switch(type)
+    {
+      case perpetualRaise:
+	P_ActivateInStasis(line->tag);
+	break;
+	
+      default:
+	break;
+    }
+	
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	sec = &sectors[secnum];
+
+	if (sec->specialdata)
+	    continue;
+	
+	// Find lowest & highest floors around sector
+	rtn = 1;
+	plat = Z_Malloc( sizeof(*plat), PU_LEVSPEC, 0);
+	P_AddThinker(&plat->thinker);
+		
+	plat->type = type;
+	plat->sector = sec;
+	plat->sector->specialdata = plat;
+	plat->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
+	plat->crush = false;
+	plat->tag = line->tag;
+	
+	switch(type)
+	{
+	  case raiseToNearestAndChange:
+	    plat->speed = PLATSPEED/2;
+	    sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+	    plat->high = P_FindNextHighestFloor(sec,sec->floorheight);
+	    plat->wait = 0;
+	    plat->status = up;
+	    // NO MORE DAMAGE, IF APPLICABLE
+	    sec->special = 0;		
+
+	    S_StartSound(&sec->soundorg,sfx_stnmov);
+	    break;
+	    
+	  case raiseAndChange:
+	    plat->speed = PLATSPEED/2;
+	    sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+	    plat->high = sec->floorheight + amount*FRACUNIT;
+	    plat->wait = 0;
+	    plat->status = up;
+
+	    S_StartSound(&sec->soundorg,sfx_stnmov);
+	    break;
+	    
+	  case downWaitUpStay:
+	    plat->speed = PLATSPEED * 4;
+	    plat->low = P_FindLowestFloorSurrounding(sec);
+
+	    if (plat->low > sec->floorheight)
+		plat->low = sec->floorheight;
+
+	    plat->high = sec->floorheight;
+	    plat->wait = TICRATE*PLATWAIT;
+	    plat->status = down;
+	    S_StartSound(&sec->soundorg,sfx_pstart);
+	    break;
+	    
+	  case blazeDWUS:
+	    plat->speed = PLATSPEED * 8;
+	    plat->low = P_FindLowestFloorSurrounding(sec);
+
+	    if (plat->low > sec->floorheight)
+		plat->low = sec->floorheight;
+
+	    plat->high = sec->floorheight;
+	    plat->wait = TICRATE*PLATWAIT;
+	    plat->status = down;
+	    S_StartSound(&sec->soundorg,sfx_pstart);
+	    break;
+	    
+	  case perpetualRaise:
+	    plat->speed = PLATSPEED;
+	    plat->low = P_FindLowestFloorSurrounding(sec);
+
+	    if (plat->low > sec->floorheight)
+		plat->low = sec->floorheight;
+
+	    plat->high = P_FindHighestFloorSurrounding(sec);
+
+	    if (plat->high < sec->floorheight)
+		plat->high = sec->floorheight;
+
+	    plat->wait = TICRATE*PLATWAIT;
+	    plat->status = P_Random()&1;
+
+	    S_StartSound(&sec->soundorg,sfx_pstart);
+	    break;
+	}
+	P_AddActivePlat(plat);
+    }
+    return rtn;
+}
+
+
+
+void P_ActivateInStasis(int tag)
+{
+    int		i;
+	
+    for (i = 0;i < MAXPLATS;i++)
+	if (activeplats[i]
+	    && (activeplats[i])->tag == tag
+	    && (activeplats[i])->status == in_stasis)
+	{
+	    (activeplats[i])->status = (activeplats[i])->oldstatus;
+	    (activeplats[i])->thinker.function.acp1
+	      = (actionf_p1) T_PlatRaise;
+	}
+}
+
+void EV_StopPlat(line_t* line)
+{
+    int		j;
+	
+    for (j = 0;j < MAXPLATS;j++)
+	if (activeplats[j]
+	    && ((activeplats[j])->status != in_stasis)
+	    && ((activeplats[j])->tag == line->tag))
+	{
+	    (activeplats[j])->oldstatus = (activeplats[j])->status;
+	    (activeplats[j])->status = in_stasis;
+	    (activeplats[j])->thinker.function.acv = (actionf_v)NULL;
+	}
+}
+
+void P_AddActivePlat(plat_t* plat)
+{
+    int		i;
+    
+    for (i = 0;i < MAXPLATS;i++)
+	if (activeplats[i] == NULL)
+	{
+	    activeplats[i] = plat;
+	    return;
+	}
+    I_Error ("P_AddActivePlat: no more plats!");
+}
+
+void P_RemoveActivePlat(plat_t* plat)
+{
+    int		i;
+    for (i = 0;i < MAXPLATS;i++)
+	if (plat == activeplats[i])
+	{
+	    (activeplats[i])->sector->specialdata = NULL;
+	    P_RemoveThinker(&(activeplats[i])->thinker);
+	    activeplats[i] = NULL;
+	    
+	    return;
+	}
+    I_Error ("P_RemoveActivePlat: can't find plat!");
+}
diff --git a/games/NXDoom/src/doom/p_pspr.c b/games/NXDoom/src/doom/p_pspr.c
new file mode 100644
index 000000000..c8c1776ca
--- /dev/null
+++ b/games/NXDoom/src/doom/p_pspr.c
@@ -0,0 +1,887 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Weapon sprite animation, weapon objects.
+//	Action functions for weapons.
+//
+
+
+#include "doomdef.h"
+#include "d_event.h"
+
+#include "deh_misc.h"
+
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+
+// Data.
+#include "sounds.h"
+
+#include "p_pspr.h"
+
+#define LOWERSPEED		FRACUNIT*6
+#define RAISESPEED		FRACUNIT*6
+
+#define WEAPONBOTTOM	128*FRACUNIT
+#define WEAPONTOP		32*FRACUNIT
+
+
+
+//
+// P_SetPsprite
+//
+void
+P_SetPsprite
+( player_t*	player,
+  int		position,
+  statenum_t	stnum ) 
+{
+    pspdef_t*	psp;
+    state_t*	state;
+	
+    psp = &player->psprites[position];
+	
+    do
+    {
+	if (!stnum)
+	{
+	    // object removed itself
+	    psp->state = NULL;
+	    break;	
+	}
+	
+	state = &states[stnum];
+	psp->state = state;
+	psp->tics = state->tics;	// could be 0
+
+	if (state->misc1)
+	{
+	    // coordinate set
+	    psp->sx = state->misc1 << FRACBITS;
+	    psp->sy = state->misc2 << FRACBITS;
+	}
+	
+	// Call action routine.
+	// Modified handling.
+	if (state->action.acp2)
+	{
+	    state->action.acp2(player, psp);
+	    if (!psp->state)
+		break;
+	}
+	
+	stnum = psp->state->nextstate;
+	
+    } while (!psp->tics);
+    // an initial state of 0 could cycle through
+}
+
+
+
+//
+// P_CalcSwing
+//	
+fixed_t		swingx;
+fixed_t		swingy;
+
+void P_CalcSwing (player_t*	player)
+{
+    fixed_t	swing;
+    int		angle;
+	
+    // OPTIMIZE: tablify this.
+    // A LUT would allow for different modes,
+    //  and add flexibility.
+
+    swing = player->bob;
+
+    angle = (FINEANGLES/70*leveltime)&FINEMASK;
+    swingx = FixedMul ( swing, finesine[angle]);
+
+    angle = (FINEANGLES/70*leveltime+FINEANGLES/2)&FINEMASK;
+    swingy = -FixedMul ( swingx, finesine[angle]);
+}
+
+
+
+//
+// P_BringUpWeapon
+// Starts bringing the pending weapon up
+// from the bottom of the screen.
+// Uses player
+//
+void P_BringUpWeapon (player_t* player)
+{
+    statenum_t	newstate;
+	
+    if (player->pendingweapon == wp_nochange)
+	player->pendingweapon = player->readyweapon;
+		
+    if (player->pendingweapon == wp_chainsaw)
+	S_StartSound (player->mo, sfx_sawup);
+		
+    newstate = weaponinfo[player->pendingweapon].upstate;
+
+    player->pendingweapon = wp_nochange;
+    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+
+    P_SetPsprite (player, ps_weapon, newstate);
+}
+
+//
+// P_CheckAmmo
+// Returns true if there is enough ammo to shoot.
+// If not, selects the next weapon to use.
+//
+boolean P_CheckAmmo (player_t* player)
+{
+    ammotype_t		ammo;
+    int			count;
+
+    ammo = weaponinfo[player->readyweapon].ammo;
+
+    // Minimal amount for one shot varies.
+    if (player->readyweapon == wp_bfg)
+	count = deh_bfg_cells_per_shot;
+    else if (player->readyweapon == wp_supershotgun)
+	count = 2;	// Double barrel.
+    else
+	count = 1;	// Regular.
+
+    // Some do not need ammunition anyway.
+    // Return if current ammunition sufficient.
+    if (ammo == am_noammo || player->ammo[ammo] >= count)
+	return true;
+		
+    // Out of ammo, pick a weapon to change to.
+    // Preferences are set here.
+    do
+    {
+	if (player->weaponowned[wp_plasma]
+	    && player->ammo[am_cell]
+	    && (gamemode != shareware) )
+	{
+	    player->pendingweapon = wp_plasma;
+	}
+	else if (player->weaponowned[wp_supershotgun] 
+		 && player->ammo[am_shell]>2
+		 && (gamemode == commercial) )
+	{
+	    player->pendingweapon = wp_supershotgun;
+	}
+	else if (player->weaponowned[wp_chaingun]
+		 && player->ammo[am_clip])
+	{
+	    player->pendingweapon = wp_chaingun;
+	}
+	else if (player->weaponowned[wp_shotgun]
+		 && player->ammo[am_shell])
+	{
+	    player->pendingweapon = wp_shotgun;
+	}
+	else if (player->ammo[am_clip])
+	{
+	    player->pendingweapon = wp_pistol;
+	}
+	else if (player->weaponowned[wp_chainsaw])
+	{
+	    player->pendingweapon = wp_chainsaw;
+	}
+	else if (player->weaponowned[wp_missile]
+		 && player->ammo[am_misl])
+	{
+	    player->pendingweapon = wp_missile;
+	}
+	else if (player->weaponowned[wp_bfg]
+		 && player->ammo[am_cell]>40
+		 && (gamemode != shareware) )
+	{
+	    player->pendingweapon = wp_bfg;
+	}
+	else
+	{
+	    // If everything fails.
+	    player->pendingweapon = wp_fist;
+	}
+	
+    } while (player->pendingweapon == wp_nochange);
+
+    // Now set appropriate weapon overlay.
+    P_SetPsprite (player,
+		  ps_weapon,
+		  weaponinfo[player->readyweapon].downstate);
+
+    return false;	
+}
+
+
+//
+// P_FireWeapon.
+//
+void P_FireWeapon (player_t* player)
+{
+    statenum_t	newstate;
+	
+    if (!P_CheckAmmo (player))
+	return;
+	
+    P_SetMobjState (player->mo, S_PLAY_ATK1);
+    newstate = weaponinfo[player->readyweapon].atkstate;
+    P_SetPsprite (player, ps_weapon, newstate);
+    P_NoiseAlert (player->mo, player->mo);
+}
+
+
+
+//
+// P_DropWeapon
+// Player died, so put the weapon away.
+//
+void P_DropWeapon (player_t* player)
+{
+    P_SetPsprite (player,
+		  ps_weapon,
+		  weaponinfo[player->readyweapon].downstate);
+}
+
+
+
+//
+// A_WeaponReady
+// The player can fire the weapon
+// or change to another weapon at this time.
+// Follows after getting weapon up,
+// or after previous attack/fire sequence.
+//
+void
+A_WeaponReady
+( player_t*	player,
+  pspdef_t*	psp )
+{	
+    statenum_t	newstate;
+    int		angle;
+    
+    // get out of attack state
+    if (player->mo->state == &states[S_PLAY_ATK1]
+	|| player->mo->state == &states[S_PLAY_ATK2] )
+    {
+	P_SetMobjState (player->mo, S_PLAY);
+    }
+    
+    if (player->readyweapon == wp_chainsaw
+	&& psp->state == &states[S_SAW])
+    {
+	S_StartSound (player->mo, sfx_sawidl);
+    }
+    
+    // check for change
+    //  if player is dead, put the weapon away
+    if (player->pendingweapon != wp_nochange || !player->health)
+    {
+	// change weapon
+	//  (pending weapon should allready be validated)
+	newstate = weaponinfo[player->readyweapon].downstate;
+	P_SetPsprite (player, ps_weapon, newstate);
+	return;	
+    }
+    
+    // check for fire
+    //  the missile launcher and bfg do not auto fire
+    if (player->cmd.buttons & BT_ATTACK)
+    {
+	if ( !player->attackdown
+	     || (player->readyweapon != wp_missile
+		 && player->readyweapon != wp_bfg) )
+	{
+	    player->attackdown = true;
+	    P_FireWeapon (player);		
+	    return;
+	}
+    }
+    else
+	player->attackdown = false;
+    
+    // bob the weapon based on movement speed
+    angle = (128*leveltime)&FINEMASK;
+    psp->sx = FRACUNIT + FixedMul (player->bob, finecosine[angle]);
+    angle &= FINEANGLES/2-1;
+    psp->sy = WEAPONTOP + FixedMul (player->bob, finesine[angle]);
+}
+
+
+
+//
+// A_ReFire
+// The player can re-fire the weapon
+// without lowering it entirely.
+//
+void A_ReFire
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    
+    // check for fire
+    //  (if a weaponchange is pending, let it go through instead)
+    if ( (player->cmd.buttons & BT_ATTACK) 
+	 && player->pendingweapon == wp_nochange
+	 && player->health)
+    {
+	player->refire++;
+	P_FireWeapon (player);
+    }
+    else
+    {
+	player->refire = 0;
+	P_CheckAmmo (player);
+    }
+}
+
+
+void
+A_CheckReload
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    P_CheckAmmo (player);
+#if 0
+    if (player->ammo[am_shell]<2)
+	P_SetPsprite (player, ps_weapon, S_DSNR1);
+#endif
+}
+
+
+
+//
+// A_Lower
+// Lowers current weapon,
+//  and changes weapon at bottom.
+//
+void
+A_Lower
+( player_t*	player,
+  pspdef_t*	psp )
+{	
+    psp->sy += LOWERSPEED;
+
+    // Is already down.
+    if (psp->sy < WEAPONBOTTOM )
+	return;
+
+    // Player is dead.
+    if (player->playerstate == PST_DEAD)
+    {
+	psp->sy = WEAPONBOTTOM;
+
+	// don't bring weapon back up
+	return;		
+    }
+    
+    // The old weapon has been lowered off the screen,
+    // so change the weapon and start raising it
+    if (!player->health)
+    {
+	// Player is dead, so keep the weapon off screen.
+	P_SetPsprite (player,  ps_weapon, S_NULL);
+	return;	
+    }
+	
+    player->readyweapon = player->pendingweapon; 
+
+    P_BringUpWeapon (player);
+}
+
+
+//
+// A_Raise
+//
+void
+A_Raise
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    statenum_t	newstate;
+	
+    psp->sy -= RAISESPEED;
+
+    if (psp->sy > WEAPONTOP )
+	return;
+    
+    psp->sy = WEAPONTOP;
+    
+    // The weapon has been raised all the way,
+    //  so change to the ready state.
+    newstate = weaponinfo[player->readyweapon].readystate;
+
+    P_SetPsprite (player, ps_weapon, newstate);
+}
+
+
+
+//
+// A_GunFlash
+//
+void
+A_GunFlash
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    P_SetMobjState (player->mo, S_PLAY_ATK2);
+    P_SetPsprite (player,ps_flash,weaponinfo[player->readyweapon].flashstate);
+}
+
+
+
+//
+// WEAPON ATTACKS
+//
+
+
+//
+// A_Punch
+//
+void
+A_Punch
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    angle_t	angle;
+    int		damage;
+    int		slope;
+	
+    damage = (P_Random ()%10+1)<<1;
+
+    if (player->powers[pw_strength])	
+	damage *= 10;
+
+    angle = player->mo->angle;
+    angle += P_SubRandom() << 18;
+    slope = P_AimLineAttack (player->mo, angle, MELEERANGE);
+    P_LineAttack (player->mo, angle, MELEERANGE, slope, damage);
+
+    // turn to face target
+    if (linetarget)
+    {
+	S_StartSound (player->mo, sfx_punch);
+	player->mo->angle = R_PointToAngle2 (player->mo->x,
+					     player->mo->y,
+					     linetarget->x,
+					     linetarget->y);
+    }
+}
+
+
+//
+// A_Saw
+//
+void
+A_Saw
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    angle_t	angle;
+    int		damage;
+    int		slope;
+
+    damage = 2*(P_Random ()%10+1);
+    angle = player->mo->angle;
+    angle += P_SubRandom() << 18;
+    
+    // use meleerange + 1 se the puff doesn't skip the flash
+    slope = P_AimLineAttack (player->mo, angle, MELEERANGE+1);
+    P_LineAttack (player->mo, angle, MELEERANGE+1, slope, damage);
+
+    if (!linetarget)
+    {
+	S_StartSound (player->mo, sfx_sawful);
+	return;
+    }
+    S_StartSound (player->mo, sfx_sawhit);
+	
+    // turn to face target
+    angle = R_PointToAngle2 (player->mo->x, player->mo->y,
+			     linetarget->x, linetarget->y);
+    if (angle - player->mo->angle > ANG180)
+    {
+	if ((signed int) (angle - player->mo->angle) < -ANG90/20)
+	    player->mo->angle = angle + ANG90/21;
+	else
+	    player->mo->angle -= ANG90/20;
+    }
+    else
+    {
+	if (angle - player->mo->angle > ANG90/20)
+	    player->mo->angle = angle - ANG90/21;
+	else
+	    player->mo->angle += ANG90/20;
+    }
+    player->mo->flags |= MF_JUSTATTACKED;
+}
+
+// Doom does not check the bounds of the ammo array.  As a result,
+// it is possible to use an ammo type > 4 that overflows into the
+// maxammo array and affects that instead.  Through dehacked, for
+// example, it is possible to make a weapon that decreases the max
+// number of ammo for another weapon.  Emulate this.
+
+static void DecreaseAmmo(player_t *player, int ammonum, int amount)
+{
+    if (ammonum < NUMAMMO)
+    {
+        player->ammo[ammonum] -= amount;
+    }
+    else
+    {
+        player->maxammo[ammonum - NUMAMMO] -= amount;
+    }
+}
+
+
+//
+// A_FireMissile
+//
+void
+A_FireMissile
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
+    P_SpawnPlayerMissile (player->mo, MT_ROCKET);
+}
+
+
+//
+// A_FireBFG
+//
+void
+A_FireBFG
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 
+                 deh_bfg_cells_per_shot);
+    P_SpawnPlayerMissile (player->mo, MT_BFG);
+}
+
+
+
+//
+// A_FirePlasma
+//
+void
+A_FirePlasma
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+    P_SetPsprite (player,
+		  ps_flash,
+		  weaponinfo[player->readyweapon].flashstate+(P_Random ()&1) );
+
+    P_SpawnPlayerMissile (player->mo, MT_PLASMA);
+}
+
+
+
+//
+// P_BulletSlope
+// Sets a slope so a near miss is at aproximately
+// the height of the intended target
+//
+fixed_t		bulletslope;
+
+
+void P_BulletSlope (mobj_t*	mo)
+{
+    angle_t	an;
+    
+    // see which target is to be aimed at
+    an = mo->angle;
+    bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+
+    if (!linetarget)
+    {
+	an += 1<<26;
+	bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+	if (!linetarget)
+	{
+	    an -= 2<<26;
+	    bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+	}
+    }
+}
+
+
+//
+// P_GunShot
+//
+void
+P_GunShot
+( mobj_t*	mo,
+  boolean	accurate )
+{
+    angle_t	angle;
+    int		damage;
+	
+    damage = 5*(P_Random ()%3+1);
+    angle = mo->angle;
+
+    if (!accurate)
+	angle += P_SubRandom() << 18;
+
+    P_LineAttack (mo, angle, MISSILERANGE, bulletslope, damage);
+}
+
+
+//
+// A_FirePistol
+//
+void
+A_FirePistol
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    S_StartSound (player->mo, sfx_pistol);
+
+    P_SetMobjState (player->mo, S_PLAY_ATK2);
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+    P_SetPsprite (player,
+		  ps_flash,
+		  weaponinfo[player->readyweapon].flashstate);
+
+    P_BulletSlope (player->mo);
+    P_GunShot (player->mo, !player->refire);
+}
+
+
+//
+// A_FireShotgun
+//
+void
+A_FireShotgun
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    int		i;
+	
+    S_StartSound (player->mo, sfx_shotgn);
+    P_SetMobjState (player->mo, S_PLAY_ATK2);
+
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+    P_SetPsprite (player,
+		  ps_flash,
+		  weaponinfo[player->readyweapon].flashstate);
+
+    P_BulletSlope (player->mo);
+	
+    for (i=0 ; i<7 ; i++)
+	P_GunShot (player->mo, false);
+}
+
+
+
+//
+// A_FireShotgun2
+//
+void
+A_FireShotgun2
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    int		i;
+    angle_t	angle;
+    int		damage;
+		
+	
+    S_StartSound (player->mo, sfx_dshtgn);
+    P_SetMobjState (player->mo, S_PLAY_ATK2);
+
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 2);
+
+    P_SetPsprite (player,
+		  ps_flash,
+		  weaponinfo[player->readyweapon].flashstate);
+
+    P_BulletSlope (player->mo);
+	
+    for (i=0 ; i<20 ; i++)
+    {
+	damage = 5*(P_Random ()%3+1);
+	angle = player->mo->angle;
+	angle += P_SubRandom() << ANGLETOFINESHIFT;
+	P_LineAttack (player->mo,
+		      angle,
+		      MISSILERANGE,
+		      bulletslope + (P_SubRandom() << 5), damage);
+    }
+}
+
+
+//
+// A_FireCGun
+//
+void
+A_FireCGun
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    S_StartSound (player->mo, sfx_pistol);
+
+    if (!player->ammo[weaponinfo[player->readyweapon].ammo])
+	return;
+		
+    P_SetMobjState (player->mo, S_PLAY_ATK2);
+    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+    P_SetPsprite (player,
+		  ps_flash,
+		  weaponinfo[player->readyweapon].flashstate
+		  + psp->state
+		  - &states[S_CHAIN1] );
+
+    P_BulletSlope (player->mo);
+	
+    P_GunShot (player->mo, !player->refire);
+}
+
+
+
+//
+// ?
+//
+void A_Light0 (player_t *player, pspdef_t *psp)
+{
+    player->extralight = 0;
+}
+
+void A_Light1 (player_t *player, pspdef_t *psp)
+{
+    player->extralight = 1;
+}
+
+void A_Light2 (player_t *player, pspdef_t *psp)
+{
+    player->extralight = 2;
+}
+
+
+//
+// A_BFGSpray
+// Spawn a BFG explosion on every monster in view
+//
+void A_BFGSpray (mobj_t* mo) 
+{
+    int			i;
+    int			j;
+    int			damage;
+    angle_t		an;
+	
+    // offset angles from its attack angle
+    for (i=0 ; i<40 ; i++)
+    {
+	an = mo->angle - ANG90/2 + ANG90/40*i;
+
+	// mo->target is the originator (player)
+	//  of the missile
+	P_AimLineAttack (mo->target, an, 16*64*FRACUNIT);
+
+	if (!linetarget)
+	    continue;
+
+	P_SpawnMobj (linetarget->x,
+		     linetarget->y,
+		     linetarget->z + (linetarget->height>>2),
+		     MT_EXTRABFG);
+	
+	damage = 0;
+	for (j=0;j<15;j++)
+	    damage += (P_Random()&7) + 1;
+
+	P_DamageMobj (linetarget, mo->target,mo->target, damage);
+    }
+}
+
+
+//
+// A_BFGsound
+//
+void
+A_BFGsound
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    S_StartSound (player->mo, sfx_bfg);
+}
+
+
+
+//
+// P_SetupPsprites
+// Called at start of level for each player.
+//
+void P_SetupPsprites (player_t* player) 
+{
+    int	i;
+	
+    // remove all psprites
+    for (i=0 ; i<NUMPSPRITES ; i++)
+	player->psprites[i].state = NULL;
+		
+    // spawn the gun
+    player->pendingweapon = player->readyweapon;
+    P_BringUpWeapon (player);
+}
+
+
+
+
+//
+// P_MovePsprites
+// Called every tic by player thinking routine.
+//
+void P_MovePsprites (player_t* player) 
+{
+    int		i;
+    pspdef_t*	psp;
+	
+    psp = &player->psprites[0];
+    for (i=0 ; i<NUMPSPRITES ; i++, psp++)
+    {
+	// a null state means not active
+	if (psp->state)
+	{
+	    // drop tic count and possibly change state
+
+	    // a -1 tic count never changes
+	    if (psp->tics != -1)	
+	    {
+		psp->tics--;
+		if (!psp->tics)
+		    P_SetPsprite (player, i, psp->state->nextstate);
+	    }				
+	}
+    }
+    
+    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
+    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
+}
+
+
diff --git a/games/NXDoom/src/doom/p_pspr.h b/games/NXDoom/src/doom/p_pspr.h
new file mode 100644
index 000000000..2616bd476
--- /dev/null
+++ b/games/NXDoom/src/doom/p_pspr.h
@@ -0,0 +1,75 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Sprite animation.
+//
+
+
+#ifndef __P_PSPR__
+#define __P_PSPR__
+
+// Basic data types.
+// Needs fixed point, and BAM angles.
+#include "m_fixed.h"
+#include "tables.h"
+
+
+//
+// Needs to include the precompiled
+//  sprite animation tables.
+// Header generated by multigen utility.
+// This includes all the data for thing animation,
+// i.e. the Thing Atrributes table
+// and the Frame Sequence table.
+#include "info.h"
+
+
+
+//
+// Frame flags:
+// handles maximum brightness (torches, muzzle flare, light sources)
+//
+#define FF_FULLBRIGHT	0x8000	// flag in thing->frame
+#define FF_FRAMEMASK	0x7fff
+
+
+
+//
+// Overlay psprites are scaled shapes
+// drawn directly on the view screen,
+// coordinates are given for a 320*200 view screen.
+//
+typedef enum
+{
+    ps_weapon,
+    ps_flash,
+    NUMPSPRITES
+
+} psprnum_t;
+
+typedef struct
+{
+    state_t*	state;	// a NULL state means not active
+    int		tics;
+    fixed_t	sx;
+    fixed_t	sy;
+
+} pspdef_t;
+
+
+extern fixed_t bulletslope;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/p_saveg.c b/games/NXDoom/src/doom/p_saveg.c
new file mode 100644
index 000000000..1192bff90
--- /dev/null
+++ b/games/NXDoom/src/doom/p_saveg.c
@@ -0,0 +1,1888 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Archiving: SaveGame I/O.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dstrings.h"
+#include "deh_main.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "p_local.h"
+#include "p_saveg.h"
+
+// State.
+#include "doomstat.h"
+#include "g_game.h"
+#include "m_misc.h"
+#include "r_state.h"
+
+FILE *save_stream;
+int savegamelength;
+boolean savegame_error;
+
+// Get the filename of a temporary file to write the savegame to.  After
+// the file has been successfully saved, it will be renamed to the 
+// real file.
+
+char *P_TempSaveGameFile(void)
+{
+    static char *filename = NULL;
+
+    if (filename == NULL)
+    {
+        filename = M_StringJoin(savegamedir, "temp.dsg", NULL);
+    }
+
+    return filename;
+}
+
+// Get the filename of the save game file to use for the specified slot.
+
+char *P_SaveGameFile(int slot)
+{
+    static char *filename = NULL;
+    static size_t filename_size = 0;
+    char basename[32];
+
+    if (filename == NULL)
+    {
+        filename_size = strlen(savegamedir) + 32;
+        filename = malloc(filename_size);
+    }
+
+    DEH_snprintf(basename, 32, SAVEGAMENAME "%d.dsg", slot);
+    M_snprintf(filename, filename_size, "%s%s", savegamedir, basename);
+
+    return filename;
+}
+
+// Endian-safe integer read/write functions
+
+static byte saveg_read8(void)
+{
+    byte result = -1;
+
+    if (fread(&result, 1, 1, save_stream) < 1)
+    {
+        if (!savegame_error)
+        {
+            fprintf(stderr, "saveg_read8: Unexpected end of file while "
+                            "reading save game\n");
+
+            savegame_error = true;
+        }
+    }
+
+    return result;
+}
+
+static void saveg_write8(byte value)
+{
+    if (fwrite(&value, 1, 1, save_stream) < 1)
+    {
+        if (!savegame_error)
+        {
+            fprintf(stderr, "saveg_write8: Error while writing save game\n");
+
+            savegame_error = true;
+        }
+    }
+}
+
+static short saveg_read16(void)
+{
+    int result;
+
+    result = saveg_read8();
+    result |= saveg_read8() << 8;
+
+    return result;
+}
+
+static void saveg_write16(short value)
+{
+    saveg_write8(value & 0xff);
+    saveg_write8((value >> 8) & 0xff);
+}
+
+static int saveg_read32(void)
+{
+    int result;
+
+    result = saveg_read8();
+    result |= saveg_read8() << 8;
+    result |= saveg_read8() << 16;
+    result |= saveg_read8() << 24;
+
+    return result;
+}
+
+static void saveg_write32(int value)
+{
+    saveg_write8(value & 0xff);
+    saveg_write8((value >> 8) & 0xff);
+    saveg_write8((value >> 16) & 0xff);
+    saveg_write8((value >> 24) & 0xff);
+}
+
+// Pad to 4-byte boundaries
+
+static void saveg_read_pad(void)
+{
+    unsigned long pos;
+    int padding;
+    int i;
+
+    pos = ftell(save_stream);
+
+    padding = (4 - (pos & 3)) & 3;
+
+    for (i=0; i<padding; ++i)
+    {
+        saveg_read8();
+    }
+}
+
+static void saveg_write_pad(void)
+{
+    unsigned long pos;
+    int padding;
+    int i;
+
+    pos = ftell(save_stream);
+
+    padding = (4 - (pos & 3)) & 3;
+
+    for (i=0; i<padding; ++i)
+    {
+        saveg_write8(0);
+    }
+}
+
+
+// Pointers
+
+static void *saveg_readp(void)
+{
+    return (void *) (intptr_t) saveg_read32();
+}
+
+static void saveg_writep(const void *p)
+{
+    saveg_write32((intptr_t) p);
+}
+
+// Enum values are 32-bit integers.
+
+#define saveg_read_enum saveg_read32
+#define saveg_write_enum saveg_write32
+
+//
+// Structure read/write functions
+//
+
+//
+// mapthing_t
+//
+
+static void saveg_read_mapthing_t(mapthing_t *str)
+{
+    // short x;
+    str->x = saveg_read16();
+
+    // short y;
+    str->y = saveg_read16();
+
+    // short angle;
+    str->angle = saveg_read16();
+
+    // short type;
+    str->type = saveg_read16();
+
+    // short options;
+    str->options = saveg_read16();
+}
+
+static void saveg_write_mapthing_t(mapthing_t *str)
+{
+    // short x;
+    saveg_write16(str->x);
+
+    // short y;
+    saveg_write16(str->y);
+
+    // short angle;
+    saveg_write16(str->angle);
+
+    // short type;
+    saveg_write16(str->type);
+
+    // short options;
+    saveg_write16(str->options);
+}
+
+//
+// actionf_t
+// 
+
+static void saveg_read_actionf_t(actionf_t *str)
+{
+    // actionf_p1 acp1;
+    str->acp1 = saveg_readp();
+}
+
+static void saveg_write_actionf_t(actionf_t *str)
+{
+    // actionf_p1 acp1;
+    saveg_writep(str->acp1);
+}
+
+//
+// think_t
+//
+// This is just an actionf_t.
+//
+
+#define saveg_read_think_t saveg_read_actionf_t
+#define saveg_write_think_t saveg_write_actionf_t
+
+//
+// thinker_t
+//
+
+static void saveg_read_thinker_t(thinker_t *str)
+{
+    // struct thinker_s* prev;
+    str->prev = saveg_readp();
+
+    // struct thinker_s* next;
+    str->next = saveg_readp();
+
+    // think_t function;
+    saveg_read_think_t(&str->function);
+}
+
+static void saveg_write_thinker_t(thinker_t *str)
+{
+    // struct thinker_s* prev;
+    saveg_writep(str->prev);
+
+    // struct thinker_s* next;
+    saveg_writep(str->next);
+
+    // think_t function;
+    saveg_write_think_t(&str->function);
+}
+
+//
+// mobj_t
+//
+
+static void saveg_read_mobj_t(mobj_t *str)
+{
+    int pl;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // fixed_t x;
+    str->x = saveg_read32();
+
+    // fixed_t y;
+    str->y = saveg_read32();
+
+    // fixed_t z;
+    str->z = saveg_read32();
+
+    // struct mobj_s* snext;
+    str->snext = saveg_readp();
+
+    // struct mobj_s* sprev;
+    str->sprev = saveg_readp();
+
+    // angle_t angle;
+    str->angle = saveg_read32();
+
+    // spritenum_t sprite;
+    str->sprite = saveg_read_enum();
+
+    // int frame;
+    str->frame = saveg_read32();
+
+    // struct mobj_s* bnext;
+    str->bnext = saveg_readp();
+
+    // struct mobj_s* bprev;
+    str->bprev = saveg_readp();
+
+    // struct subsector_s* subsector;
+    str->subsector = saveg_readp();
+
+    // fixed_t floorz;
+    str->floorz = saveg_read32();
+
+    // fixed_t ceilingz;
+    str->ceilingz = saveg_read32();
+
+    // fixed_t radius;
+    str->radius = saveg_read32();
+
+    // fixed_t height;
+    str->height = saveg_read32();
+
+    // fixed_t momx;
+    str->momx = saveg_read32();
+
+    // fixed_t momy;
+    str->momy = saveg_read32();
+
+    // fixed_t momz;
+    str->momz = saveg_read32();
+
+    // int validcount;
+    str->validcount = saveg_read32();
+
+    // mobjtype_t type;
+    str->type = saveg_read_enum();
+
+    // mobjinfo_t* info;
+    str->info = saveg_readp();
+
+    // int tics;
+    str->tics = saveg_read32();
+
+    // state_t* state;
+    str->state = &states[saveg_read32()];
+
+    // int flags;
+    str->flags = saveg_read32();
+
+    // int health;
+    str->health = saveg_read32();
+
+    // int movedir;
+    str->movedir = saveg_read32();
+
+    // int movecount;
+    str->movecount = saveg_read32();
+
+    // struct mobj_s* target;
+    str->target = saveg_readp();
+
+    // int reactiontime;
+    str->reactiontime = saveg_read32();
+
+    // int threshold;
+    str->threshold = saveg_read32();
+
+    // struct player_s* player;
+    pl = saveg_read32();
+
+    if (pl > 0)
+    {
+        str->player = &players[pl - 1];
+        str->player->mo = str;
+    }
+    else
+    {
+        str->player = NULL;
+    }
+
+    // int lastlook;
+    str->lastlook = saveg_read32();
+
+    // mapthing_t spawnpoint;
+    saveg_read_mapthing_t(&str->spawnpoint);
+
+    // struct mobj_s* tracer;
+    str->tracer = saveg_readp();
+}
+
+static void saveg_write_mobj_t(mobj_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // fixed_t x;
+    saveg_write32(str->x);
+
+    // fixed_t y;
+    saveg_write32(str->y);
+
+    // fixed_t z;
+    saveg_write32(str->z);
+
+    // struct mobj_s* snext;
+    saveg_writep(str->snext);
+
+    // struct mobj_s* sprev;
+    saveg_writep(str->sprev);
+
+    // angle_t angle;
+    saveg_write32(str->angle);
+
+    // spritenum_t sprite;
+    saveg_write_enum(str->sprite);
+
+    // int frame;
+    saveg_write32(str->frame);
+
+    // struct mobj_s* bnext;
+    saveg_writep(str->bnext);
+
+    // struct mobj_s* bprev;
+    saveg_writep(str->bprev);
+
+    // struct subsector_s* subsector;
+    saveg_writep(str->subsector);
+
+    // fixed_t floorz;
+    saveg_write32(str->floorz);
+
+    // fixed_t ceilingz;
+    saveg_write32(str->ceilingz);
+
+    // fixed_t radius;
+    saveg_write32(str->radius);
+
+    // fixed_t height;
+    saveg_write32(str->height);
+
+    // fixed_t momx;
+    saveg_write32(str->momx);
+
+    // fixed_t momy;
+    saveg_write32(str->momy);
+
+    // fixed_t momz;
+    saveg_write32(str->momz);
+
+    // int validcount;
+    saveg_write32(str->validcount);
+
+    // mobjtype_t type;
+    saveg_write_enum(str->type);
+
+    // mobjinfo_t* info;
+    saveg_writep(str->info);
+
+    // int tics;
+    saveg_write32(str->tics);
+
+    // state_t* state;
+    saveg_write32(str->state - states);
+
+    // int flags;
+    saveg_write32(str->flags);
+
+    // int health;
+    saveg_write32(str->health);
+
+    // int movedir;
+    saveg_write32(str->movedir);
+
+    // int movecount;
+    saveg_write32(str->movecount);
+
+    // struct mobj_s* target;
+    saveg_writep(str->target);
+
+    // int reactiontime;
+    saveg_write32(str->reactiontime);
+
+    // int threshold;
+    saveg_write32(str->threshold);
+
+    // struct player_s* player;
+    if (str->player)
+    {
+        saveg_write32(str->player - players + 1);
+    }
+    else
+    {
+        saveg_write32(0);
+    }
+
+    // int lastlook;
+    saveg_write32(str->lastlook);
+
+    // mapthing_t spawnpoint;
+    saveg_write_mapthing_t(&str->spawnpoint);
+
+    // struct mobj_s* tracer;
+    saveg_writep(str->tracer);
+}
+
+
+//
+// ticcmd_t
+//
+
+static void saveg_read_ticcmd_t(ticcmd_t *str)
+{
+
+    // signed char forwardmove;
+    str->forwardmove = saveg_read8();
+
+    // signed char sidemove;
+    str->sidemove = saveg_read8();
+
+    // short angleturn;
+    str->angleturn = saveg_read16();
+
+    // short consistancy;
+    str->consistancy = saveg_read16();
+
+    // byte chatchar;
+    str->chatchar = saveg_read8();
+
+    // byte buttons;
+    str->buttons = saveg_read8();
+}
+
+static void saveg_write_ticcmd_t(ticcmd_t *str)
+{
+
+    // signed char forwardmove;
+    saveg_write8(str->forwardmove);
+
+    // signed char sidemove;
+    saveg_write8(str->sidemove);
+
+    // short angleturn;
+    saveg_write16(str->angleturn);
+
+    // short consistancy;
+    saveg_write16(str->consistancy);
+
+    // byte chatchar;
+    saveg_write8(str->chatchar);
+
+    // byte buttons;
+    saveg_write8(str->buttons);
+}
+
+//
+// pspdef_t
+//
+
+static void saveg_read_pspdef_t(pspdef_t *str)
+{
+    int state;
+
+    // state_t* state;
+    state = saveg_read32();
+
+    if (state > 0)
+    {
+        str->state = &states[state];
+    }
+    else
+    {
+        str->state = NULL;
+    }
+
+    // int tics;
+    str->tics = saveg_read32();
+
+    // fixed_t sx;
+    str->sx = saveg_read32();
+
+    // fixed_t sy;
+    str->sy = saveg_read32();
+}
+
+static void saveg_write_pspdef_t(pspdef_t *str)
+{
+    // state_t* state;
+    if (str->state)
+    {
+        saveg_write32(str->state - states);
+    }
+    else
+    {
+        saveg_write32(0);
+    }
+
+    // int tics;
+    saveg_write32(str->tics);
+
+    // fixed_t sx;
+    saveg_write32(str->sx);
+
+    // fixed_t sy;
+    saveg_write32(str->sy);
+}
+
+//
+// player_t
+//
+
+static void saveg_read_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t* mo;
+    str->mo = saveg_readp();
+
+    // playerstate_t playerstate;
+    str->playerstate = saveg_read_enum();
+
+    // ticcmd_t cmd;
+    saveg_read_ticcmd_t(&str->cmd);
+
+    // fixed_t viewz;
+    str->viewz = saveg_read32();
+
+    // fixed_t viewheight;
+    str->viewheight = saveg_read32();
+
+    // fixed_t deltaviewheight;
+    str->deltaviewheight = saveg_read32();
+
+    // fixed_t bob;
+    str->bob = saveg_read32();
+
+    // int health;
+    str->health = saveg_read32();
+
+    // int armorpoints;
+    str->armorpoints = saveg_read32();
+
+    // int armortype;
+    str->armortype = saveg_read32();
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        str->powers[i] = saveg_read32();
+    }
+
+    // boolean cards[NUMCARDS];
+    for (i=0; i<NUMCARDS; ++i)
+    {
+        str->cards[i] = saveg_read32();
+    }
+
+    // boolean backpack;
+    str->backpack = saveg_read32();
+
+    // int frags[MAXPLAYERS];
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        str->frags[i] = saveg_read32();
+    }
+
+    // weapontype_t readyweapon;
+    str->readyweapon = saveg_read_enum();
+
+    // weapontype_t pendingweapon;
+    str->pendingweapon = saveg_read_enum();
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        str->weaponowned[i] = saveg_read32();
+    }
+
+    // int ammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        str->ammo[i] = saveg_read32();
+    }
+
+    // int maxammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        str->maxammo[i] = saveg_read32();
+    }
+
+    // int attackdown;
+    str->attackdown = saveg_read32();
+
+    // int usedown;
+    str->usedown = saveg_read32();
+
+    // int cheats;
+    str->cheats = saveg_read32();
+
+    // int refire;
+    str->refire = saveg_read32();
+
+    // int killcount;
+    str->killcount = saveg_read32();
+
+    // int itemcount;
+    str->itemcount = saveg_read32();
+
+    // int secretcount;
+    str->secretcount = saveg_read32();
+
+    // char* message;
+    str->message = saveg_readp();
+
+    // int damagecount;
+    str->damagecount = saveg_read32();
+
+    // int bonuscount;
+    str->bonuscount = saveg_read32();
+
+    // mobj_t* attacker;
+    str->attacker = saveg_readp();
+
+    // int extralight;
+    str->extralight = saveg_read32();
+
+    // int fixedcolormap;
+    str->fixedcolormap = saveg_read32();
+
+    // int colormap;
+    str->colormap = saveg_read32();
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        saveg_read_pspdef_t(&str->psprites[i]);
+    }
+
+    // boolean didsecret;
+    str->didsecret = saveg_read32();
+}
+
+static void saveg_write_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t* mo;
+    saveg_writep(str->mo);
+
+    // playerstate_t playerstate;
+    saveg_write_enum(str->playerstate);
+
+    // ticcmd_t cmd;
+    saveg_write_ticcmd_t(&str->cmd);
+
+    // fixed_t viewz;
+    saveg_write32(str->viewz);
+
+    // fixed_t viewheight;
+    saveg_write32(str->viewheight);
+
+    // fixed_t deltaviewheight;
+    saveg_write32(str->deltaviewheight);
+
+    // fixed_t bob;
+    saveg_write32(str->bob);
+
+    // int health;
+    saveg_write32(str->health);
+
+    // int armorpoints;
+    saveg_write32(str->armorpoints);
+
+    // int armortype;
+    saveg_write32(str->armortype);
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        saveg_write32(str->powers[i]);
+    }
+
+    // boolean cards[NUMCARDS];
+    for (i=0; i<NUMCARDS; ++i)
+    {
+        saveg_write32(str->cards[i]);
+    }
+
+    // boolean backpack;
+    saveg_write32(str->backpack);
+
+    // int frags[MAXPLAYERS];
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        saveg_write32(str->frags[i]);
+    }
+
+    // weapontype_t readyweapon;
+    saveg_write_enum(str->readyweapon);
+
+    // weapontype_t pendingweapon;
+    saveg_write_enum(str->pendingweapon);
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        saveg_write32(str->weaponowned[i]);
+    }
+
+    // int ammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        saveg_write32(str->ammo[i]);
+    }
+
+    // int maxammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        saveg_write32(str->maxammo[i]);
+    }
+
+    // int attackdown;
+    saveg_write32(str->attackdown);
+
+    // int usedown;
+    saveg_write32(str->usedown);
+
+    // int cheats;
+    saveg_write32(str->cheats);
+
+    // int refire;
+    saveg_write32(str->refire);
+
+    // int killcount;
+    saveg_write32(str->killcount);
+
+    // int itemcount;
+    saveg_write32(str->itemcount);
+
+    // int secretcount;
+    saveg_write32(str->secretcount);
+
+    // char* message;
+    saveg_writep(str->message);
+
+    // int damagecount;
+    saveg_write32(str->damagecount);
+
+    // int bonuscount;
+    saveg_write32(str->bonuscount);
+
+    // mobj_t* attacker;
+    saveg_writep(str->attacker);
+
+    // int extralight;
+    saveg_write32(str->extralight);
+
+    // int fixedcolormap;
+    saveg_write32(str->fixedcolormap);
+
+    // int colormap;
+    saveg_write32(str->colormap);
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        saveg_write_pspdef_t(&str->psprites[i]);
+    }
+
+    // boolean didsecret;
+    saveg_write32(str->didsecret);
+}
+
+
+//
+// ceiling_t
+//
+
+static void saveg_read_ceiling_t(ceiling_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // ceiling_e type;
+    str->type = saveg_read_enum();
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // fixed_t bottomheight;
+    str->bottomheight = saveg_read32();
+
+    // fixed_t topheight;
+    str->topheight = saveg_read32();
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+
+    // boolean crush;
+    str->crush = saveg_read32();
+
+    // int direction;
+    str->direction = saveg_read32();
+
+    // int tag;
+    str->tag = saveg_read32();
+
+    // int olddirection;
+    str->olddirection = saveg_read32();
+}
+
+static void saveg_write_ceiling_t(ceiling_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // ceiling_e type;
+    saveg_write_enum(str->type);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // fixed_t bottomheight;
+    saveg_write32(str->bottomheight);
+
+    // fixed_t topheight;
+    saveg_write32(str->topheight);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+
+    // boolean crush;
+    saveg_write32(str->crush);
+
+    // int direction;
+    saveg_write32(str->direction);
+
+    // int tag;
+    saveg_write32(str->tag);
+
+    // int olddirection;
+    saveg_write32(str->olddirection);
+}
+
+//
+// vldoor_t
+//
+
+static void saveg_read_vldoor_t(vldoor_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // vldoor_e type;
+    str->type = saveg_read_enum();
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // fixed_t topheight;
+    str->topheight = saveg_read32();
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+
+    // int direction;
+    str->direction = saveg_read32();
+
+    // int topwait;
+    str->topwait = saveg_read32();
+
+    // int topcountdown;
+    str->topcountdown = saveg_read32();
+}
+
+static void saveg_write_vldoor_t(vldoor_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // vldoor_e type;
+    saveg_write_enum(str->type);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // fixed_t topheight;
+    saveg_write32(str->topheight);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+
+    // int direction;
+    saveg_write32(str->direction);
+
+    // int topwait;
+    saveg_write32(str->topwait);
+
+    // int topcountdown;
+    saveg_write32(str->topcountdown);
+}
+
+//
+// floormove_t
+//
+
+static void saveg_read_floormove_t(floormove_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // floor_e type;
+    str->type = saveg_read_enum();
+
+    // boolean crush;
+    str->crush = saveg_read32();
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int direction;
+    str->direction = saveg_read32();
+
+    // int newspecial;
+    str->newspecial = saveg_read32();
+
+    // short texture;
+    str->texture = saveg_read16();
+
+    // fixed_t floordestheight;
+    str->floordestheight = saveg_read32();
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+}
+
+static void saveg_write_floormove_t(floormove_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // floor_e type;
+    saveg_write_enum(str->type);
+
+    // boolean crush;
+    saveg_write32(str->crush);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int direction;
+    saveg_write32(str->direction);
+
+    // int newspecial;
+    saveg_write32(str->newspecial);
+
+    // short texture;
+    saveg_write16(str->texture);
+
+    // fixed_t floordestheight;
+    saveg_write32(str->floordestheight);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+}
+
+//
+// plat_t
+//
+
+static void saveg_read_plat_t(plat_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+
+    // fixed_t low;
+    str->low = saveg_read32();
+
+    // fixed_t high;
+    str->high = saveg_read32();
+
+    // int wait;
+    str->wait = saveg_read32();
+
+    // int count;
+    str->count = saveg_read32();
+
+    // plat_e status;
+    str->status = saveg_read_enum();
+
+    // plat_e oldstatus;
+    str->oldstatus = saveg_read_enum();
+
+    // boolean crush;
+    str->crush = saveg_read32();
+
+    // int tag;
+    str->tag = saveg_read32();
+
+    // plattype_e type;
+    str->type = saveg_read_enum();
+}
+
+static void saveg_write_plat_t(plat_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+
+    // fixed_t low;
+    saveg_write32(str->low);
+
+    // fixed_t high;
+    saveg_write32(str->high);
+
+    // int wait;
+    saveg_write32(str->wait);
+
+    // int count;
+    saveg_write32(str->count);
+
+    // plat_e status;
+    saveg_write_enum(str->status);
+
+    // plat_e oldstatus;
+    saveg_write_enum(str->oldstatus);
+
+    // boolean crush;
+    saveg_write32(str->crush);
+
+    // int tag;
+    saveg_write32(str->tag);
+
+    // plattype_e type;
+    saveg_write_enum(str->type);
+}
+
+//
+// lightflash_t
+//
+
+static void saveg_read_lightflash_t(lightflash_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int count;
+    str->count = saveg_read32();
+
+    // int maxlight;
+    str->maxlight = saveg_read32();
+
+    // int minlight;
+    str->minlight = saveg_read32();
+
+    // int maxtime;
+    str->maxtime = saveg_read32();
+
+    // int mintime;
+    str->mintime = saveg_read32();
+}
+
+static void saveg_write_lightflash_t(lightflash_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int count;
+    saveg_write32(str->count);
+
+    // int maxlight;
+    saveg_write32(str->maxlight);
+
+    // int minlight;
+    saveg_write32(str->minlight);
+
+    // int maxtime;
+    saveg_write32(str->maxtime);
+
+    // int mintime;
+    saveg_write32(str->mintime);
+}
+
+//
+// strobe_t
+//
+
+static void saveg_read_strobe_t(strobe_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int count;
+    str->count = saveg_read32();
+
+    // int minlight;
+    str->minlight = saveg_read32();
+
+    // int maxlight;
+    str->maxlight = saveg_read32();
+
+    // int darktime;
+    str->darktime = saveg_read32();
+
+    // int brighttime;
+    str->brighttime = saveg_read32();
+}
+
+static void saveg_write_strobe_t(strobe_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int count;
+    saveg_write32(str->count);
+
+    // int minlight;
+    saveg_write32(str->minlight);
+
+    // int maxlight;
+    saveg_write32(str->maxlight);
+
+    // int darktime;
+    saveg_write32(str->darktime);
+
+    // int brighttime;
+    saveg_write32(str->brighttime);
+}
+
+//
+// glow_t
+//
+
+static void saveg_read_glow_t(glow_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int minlight;
+    str->minlight = saveg_read32();
+
+    // int maxlight;
+    str->maxlight = saveg_read32();
+
+    // int direction;
+    str->direction = saveg_read32();
+}
+
+static void saveg_write_glow_t(glow_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int minlight;
+    saveg_write32(str->minlight);
+
+    // int maxlight;
+    saveg_write32(str->maxlight);
+
+    // int direction;
+    saveg_write32(str->direction);
+}
+
+//
+// Write the header for a savegame
+//
+
+void P_WriteSaveGameHeader(char *description)
+{
+    char name[VERSIONSIZE]; 
+    int i; 
+	
+    for (i=0; description[i] != '\0'; ++i)
+        saveg_write8(description[i]);
+    for (; i<SAVESTRINGSIZE; ++i)
+        saveg_write8(0);
+
+    memset(name, 0, sizeof(name));
+    M_snprintf(name, sizeof(name), "version %i", G_VanillaVersionCode());
+
+    for (i=0; i<VERSIONSIZE; ++i)
+        saveg_write8(name[i]);
+	 
+    saveg_write8(gameskill);
+    saveg_write8(gameepisode);
+    saveg_write8(gamemap);
+
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+        saveg_write8(playeringame[i]);
+
+    saveg_write8((leveltime >> 16) & 0xff);
+    saveg_write8((leveltime >> 8) & 0xff);
+    saveg_write8(leveltime & 0xff);
+}
+
+// 
+// Read the header for a savegame
+//
+
+boolean P_ReadSaveGameHeader(void)
+{
+    int	 i; 
+    byte a, b, c; 
+    char vcheck[VERSIONSIZE]; 
+    char read_vcheck[VERSIONSIZE];
+	 
+    // skip the description field 
+
+    for (i=0; i<SAVESTRINGSIZE; ++i)
+        saveg_read8();
+    
+    for (i=0; i<VERSIONSIZE; ++i)
+        read_vcheck[i] = saveg_read8();
+
+    memset(vcheck, 0, sizeof(vcheck));
+    M_snprintf(vcheck, sizeof(vcheck), "version %i", G_VanillaVersionCode());
+    if (strcmp(read_vcheck, vcheck) != 0)
+	return false;				// bad version 
+
+    gameskill = saveg_read8();
+    gameepisode = saveg_read8();
+    gamemap = saveg_read8();
+
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+	playeringame[i] = saveg_read8();
+
+    // get the times 
+    a = saveg_read8();
+    b = saveg_read8();
+    c = saveg_read8();
+    leveltime = (a<<16) + (b<<8) + c; 
+
+    return true;
+}
+
+//
+// Read the end of file marker.  Returns true if read successfully.
+// 
+
+boolean P_ReadSaveGameEOF(void)
+{
+    int value;
+
+    value = saveg_read8();
+
+    return value == SAVEGAME_EOF;
+}
+
+//
+// Write the end of file marker
+//
+
+void P_WriteSaveGameEOF(void)
+{
+    saveg_write8(SAVEGAME_EOF);
+}
+
+//
+// P_ArchivePlayers
+//
+void P_ArchivePlayers (void)
+{
+    int		i;
+		
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (!playeringame[i])
+	    continue;
+	
+	saveg_write_pad();
+
+        saveg_write_player_t(&players[i]);
+    }
+}
+
+
+
+//
+// P_UnArchivePlayers
+//
+void P_UnArchivePlayers (void)
+{
+    int		i;
+	
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (!playeringame[i])
+	    continue;
+	
+	saveg_read_pad();
+
+        saveg_read_player_t(&players[i]);
+	
+	// will be set when unarc thinker
+	players[i].mo = NULL;	
+	players[i].message = NULL;
+	players[i].attacker = NULL;
+    }
+}
+
+
+//
+// P_ArchiveWorld
+//
+void P_ArchiveWorld (void)
+{
+    int			i;
+    int			j;
+    sector_t*		sec;
+    line_t*		li;
+    side_t*		si;
+    
+    // do sectors
+    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+    {
+	saveg_write16(sec->floorheight >> FRACBITS);
+	saveg_write16(sec->ceilingheight >> FRACBITS);
+	saveg_write16(sec->floorpic);
+	saveg_write16(sec->ceilingpic);
+	saveg_write16(sec->lightlevel);
+	saveg_write16(sec->special);		// needed?
+	saveg_write16(sec->tag);		// needed?
+    }
+
+    
+    // do lines
+    for (i=0, li = lines ; i<numlines ; i++,li++)
+    {
+	saveg_write16(li->flags);
+	saveg_write16(li->special);
+	saveg_write16(li->tag);
+	for (j=0 ; j<2 ; j++)
+	{
+	    if (li->sidenum[j] == -1)
+		continue;
+	    
+	    si = &sides[li->sidenum[j]];
+
+	    saveg_write16(si->textureoffset >> FRACBITS);
+	    saveg_write16(si->rowoffset >> FRACBITS);
+	    saveg_write16(si->toptexture);
+	    saveg_write16(si->bottomtexture);
+	    saveg_write16(si->midtexture);	
+	}
+    }
+}
+
+
+
+//
+// P_UnArchiveWorld
+//
+void P_UnArchiveWorld (void)
+{
+    int			i;
+    int			j;
+    sector_t*		sec;
+    line_t*		li;
+    side_t*		si;
+    
+    // do sectors
+    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+    {
+	sec->floorheight = saveg_read16() << FRACBITS;
+	sec->ceilingheight = saveg_read16() << FRACBITS;
+	sec->floorpic = saveg_read16();
+	sec->ceilingpic = saveg_read16();
+	sec->lightlevel = saveg_read16();
+	sec->special = saveg_read16();		// needed?
+	sec->tag = saveg_read16();		// needed?
+	sec->specialdata = 0;
+	sec->soundtarget = 0;
+    }
+    
+    // do lines
+    for (i=0, li = lines ; i<numlines ; i++,li++)
+    {
+	li->flags = saveg_read16();
+	li->special = saveg_read16();
+	li->tag = saveg_read16();
+	for (j=0 ; j<2 ; j++)
+	{
+	    if (li->sidenum[j] == -1)
+		continue;
+	    si = &sides[li->sidenum[j]];
+	    si->textureoffset = saveg_read16() << FRACBITS;
+	    si->rowoffset = saveg_read16() << FRACBITS;
+	    si->toptexture = saveg_read16();
+	    si->bottomtexture = saveg_read16();
+	    si->midtexture = saveg_read16();
+	}
+    }
+}
+
+
+
+
+
+//
+// Thinkers
+//
+typedef enum
+{
+    tc_end,
+    tc_mobj
+
+} thinkerclass_t;
+
+
+//
+// P_ArchiveThinkers
+//
+void P_ArchiveThinkers (void)
+{
+    thinker_t*		th;
+
+    // save off the current thinkers
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+	if (th->function.acp1 == (actionf_p1)P_MobjThinker)
+	{
+            saveg_write8(tc_mobj);
+	    saveg_write_pad();
+            saveg_write_mobj_t((mobj_t *) th);
+
+	    continue;
+	}
+		
+	// I_Error ("P_ArchiveThinkers: Unknown thinker function");
+    }
+
+    // add a terminating marker
+    saveg_write8(tc_end);
+}
+
+
+
+//
+// P_UnArchiveThinkers
+//
+void P_UnArchiveThinkers (void)
+{
+    byte		tclass;
+    thinker_t*		currentthinker;
+    thinker_t*		next;
+    mobj_t*		mobj;
+    
+    // remove all the current thinkers
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+	next = currentthinker->next;
+	
+	if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
+	    P_RemoveMobj ((mobj_t *)currentthinker);
+	else
+	    Z_Free (currentthinker);
+
+	currentthinker = next;
+    }
+    P_InitThinkers ();
+    
+    // read in saved thinkers
+    while (1)
+    {
+	tclass = saveg_read8();
+	switch (tclass)
+	{
+	  case tc_end:
+	    return; 	// end of list
+			
+	  case tc_mobj:
+	    saveg_read_pad();
+	    mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
+            saveg_read_mobj_t(mobj);
+
+	    mobj->target = NULL;
+            mobj->tracer = NULL;
+	    P_SetThingPosition (mobj);
+	    mobj->info = &mobjinfo[mobj->type];
+	    mobj->floorz = mobj->subsector->sector->floorheight;
+	    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+	    mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+	    P_AddThinker (&mobj->thinker);
+	    break;
+
+	  default:
+	    I_Error ("Unknown tclass %i in savegame",tclass);
+	}
+	
+    }
+
+}
+
+
+//
+// P_ArchiveSpecials
+//
+enum
+{
+    tc_ceiling,
+    tc_door,
+    tc_floor,
+    tc_plat,
+    tc_flash,
+    tc_strobe,
+    tc_glow,
+    tc_endspecials
+
+} specials_e;	
+
+
+
+//
+// Things to handle:
+//
+// T_MoveCeiling, (ceiling_t: sector_t * swizzle), - active list
+// T_VerticalDoor, (vldoor_t: sector_t * swizzle),
+// T_MoveFloor, (floormove_t: sector_t * swizzle),
+// T_LightFlash, (lightflash_t: sector_t * swizzle),
+// T_StrobeFlash, (strobe_t: sector_t *),
+// T_Glow, (glow_t: sector_t *),
+// T_PlatRaise, (plat_t: sector_t *), - active list
+//
+void P_ArchiveSpecials (void)
+{
+    thinker_t*		th;
+    int			i;
+	
+    // save off the current thinkers
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+	if (th->function.acv == (actionf_v)NULL)
+	{
+	    for (i = 0; i < MAXCEILINGS;i++)
+		if (activeceilings[i] == (ceiling_t *)th)
+		    break;
+	    
+	    if (i<MAXCEILINGS)
+	    {
+                saveg_write8(tc_ceiling);
+		saveg_write_pad();
+                saveg_write_ceiling_t((ceiling_t *) th);
+	    }
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
+	{
+            saveg_write8(tc_ceiling);
+	    saveg_write_pad();
+            saveg_write_ceiling_t((ceiling_t *) th);
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_VerticalDoor)
+	{
+            saveg_write8(tc_door);
+	    saveg_write_pad();
+            saveg_write_vldoor_t((vldoor_t *) th);
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_MoveFloor)
+	{
+            saveg_write8(tc_floor);
+	    saveg_write_pad();
+            saveg_write_floormove_t((floormove_t *) th);
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_PlatRaise)
+	{
+            saveg_write8(tc_plat);
+	    saveg_write_pad();
+            saveg_write_plat_t((plat_t *) th);
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_LightFlash)
+	{
+            saveg_write8(tc_flash);
+	    saveg_write_pad();
+            saveg_write_lightflash_t((lightflash_t *) th);
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_StrobeFlash)
+	{
+            saveg_write8(tc_strobe);
+	    saveg_write_pad();
+            saveg_write_strobe_t((strobe_t *) th);
+	    continue;
+	}
+			
+	if (th->function.acp1 == (actionf_p1)T_Glow)
+	{
+            saveg_write8(tc_glow);
+	    saveg_write_pad();
+            saveg_write_glow_t((glow_t *) th);
+	    continue;
+	}
+    }
+	
+    // add a terminating marker
+    saveg_write8(tc_endspecials);
+
+}
+
+
+//
+// P_UnArchiveSpecials
+//
+void P_UnArchiveSpecials (void)
+{
+    byte		tclass;
+    ceiling_t*		ceiling;
+    vldoor_t*		door;
+    floormove_t*	floor;
+    plat_t*		plat;
+    lightflash_t*	flash;
+    strobe_t*		strobe;
+    glow_t*		glow;
+	
+	
+    // read in saved thinkers
+    while (1)
+    {
+	tclass = saveg_read8();
+
+	switch (tclass)
+	{
+	  case tc_endspecials:
+	    return;	// end of list
+			
+	  case tc_ceiling:
+	    saveg_read_pad();
+	    ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL);
+            saveg_read_ceiling_t(ceiling);
+	    ceiling->sector->specialdata = ceiling;
+
+	    if (ceiling->thinker.function.acp1)
+		ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+
+	    P_AddThinker (&ceiling->thinker);
+	    P_AddActiveCeiling(ceiling);
+	    break;
+				
+	  case tc_door:
+	    saveg_read_pad();
+	    door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL);
+            saveg_read_vldoor_t(door);
+	    door->sector->specialdata = door;
+	    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+	    P_AddThinker (&door->thinker);
+	    break;
+				
+	  case tc_floor:
+	    saveg_read_pad();
+	    floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL);
+            saveg_read_floormove_t(floor);
+	    floor->sector->specialdata = floor;
+	    floor->thinker.function.acp1 = (actionf_p1)T_MoveFloor;
+	    P_AddThinker (&floor->thinker);
+	    break;
+				
+	  case tc_plat:
+	    saveg_read_pad();
+	    plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL);
+            saveg_read_plat_t(plat);
+	    plat->sector->specialdata = plat;
+
+	    if (plat->thinker.function.acp1)
+		plat->thinker.function.acp1 = (actionf_p1)T_PlatRaise;
+
+	    P_AddThinker (&plat->thinker);
+	    P_AddActivePlat(plat);
+	    break;
+				
+	  case tc_flash:
+	    saveg_read_pad();
+	    flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL);
+            saveg_read_lightflash_t(flash);
+	    flash->thinker.function.acp1 = (actionf_p1)T_LightFlash;
+	    P_AddThinker (&flash->thinker);
+	    break;
+				
+	  case tc_strobe:
+	    saveg_read_pad();
+	    strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL);
+            saveg_read_strobe_t(strobe);
+	    strobe->thinker.function.acp1 = (actionf_p1)T_StrobeFlash;
+	    P_AddThinker (&strobe->thinker);
+	    break;
+				
+	  case tc_glow:
+	    saveg_read_pad();
+	    glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL);
+            saveg_read_glow_t(glow);
+	    glow->thinker.function.acp1 = (actionf_p1)T_Glow;
+	    P_AddThinker (&glow->thinker);
+	    break;
+				
+	  default:
+	    I_Error ("P_UnarchiveSpecials:Unknown tclass %i "
+		     "in savegame",tclass);
+	}
+	
+    }
+
+}
+
diff --git a/games/NXDoom/src/doom/p_saveg.h b/games/NXDoom/src/doom/p_saveg.h
new file mode 100644
index 000000000..518a5b706
--- /dev/null
+++ b/games/NXDoom/src/doom/p_saveg.h
@@ -0,0 +1,65 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Savegame I/O, archiving, persistence.
+//
+
+
+#ifndef __P_SAVEG__
+#define __P_SAVEG__
+
+#include <stdio.h>
+
+#define SAVEGAME_EOF 0x1d
+#define VERSIONSIZE 16
+
+// maximum size of a savegame description
+
+#define SAVESTRINGSIZE 24
+
+// temporary filename to use while saving.
+
+char *P_TempSaveGameFile(void);
+
+// filename to use for a savegame slot
+
+char *P_SaveGameFile(int slot);
+
+// Savegame file header read/write functions
+
+boolean P_ReadSaveGameHeader(void);
+void P_WriteSaveGameHeader(char *description);
+
+// Savegame end-of-file read/write functions
+
+boolean P_ReadSaveGameEOF(void);
+void P_WriteSaveGameEOF(void);
+
+// Persistent storage/archiving.
+// These are the load / save game routines.
+void P_ArchivePlayers (void);
+void P_UnArchivePlayers (void);
+void P_ArchiveWorld (void);
+void P_UnArchiveWorld (void);
+void P_ArchiveThinkers (void);
+void P_UnArchiveThinkers (void);
+void P_ArchiveSpecials (void);
+void P_UnArchiveSpecials (void);
+
+extern FILE *save_stream;
+extern boolean savegame_error;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/p_setup.c b/games/NXDoom/src/doom/p_setup.c
new file mode 100644
index 000000000..fbb1a180d
--- /dev/null
+++ b/games/NXDoom/src/doom/p_setup.c
@@ -0,0 +1,833 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Do all the WAD I/O, get map description,
+//	set up initial state and misc. LUTs.
+//
+
+
+
+#include <math.h>
+#include <stdlib.h>
+
+#include "z_zone.h"
+
+#include "deh_main.h"
+#include "i_swap.h"
+#include "m_argv.h"
+#include "m_bbox.h"
+
+#include "g_game.h"
+
+#include "i_system.h"
+#include "w_wad.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+#include "p_rejectpad.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+
+void	P_SpawnMapThing (mapthing_t*	mthing);
+
+
+//
+// MAP related Lookup tables.
+// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
+//
+int		numvertexes;
+vertex_t*	vertexes;
+
+int		numsegs;
+seg_t*		segs;
+
+int		numsectors;
+sector_t*	sectors;
+
+int		numsubsectors;
+subsector_t*	subsectors;
+
+int		numnodes;
+node_t*		nodes;
+
+int		numlines;
+line_t*		lines;
+
+int		numsides;
+side_t*		sides;
+
+static int      totallines;
+
+// BLOCKMAP
+// Created from axis aligned bounding box
+// of the map, a rectangular array of
+// blocks of size ...
+// Used to speed up collision detection
+// by spatial subdivision in 2D.
+//
+// Blockmap size.
+int		bmapwidth;
+int		bmapheight;	// size in mapblocks
+short*		blockmap;	// int for larger maps
+// offsets in blockmap are from here
+short*		blockmaplump;		
+// origin of block map
+fixed_t		bmaporgx;
+fixed_t		bmaporgy;
+// for thing chains
+mobj_t**	blocklinks;		
+
+
+// REJECT
+// For fast sight rejection.
+// Speeds up enemy AI by skipping detailed
+//  LineOf Sight calculation.
+// Without special effect, this could be
+//  used as a PVS lookup as well.
+//
+byte*		rejectmatrix;
+
+
+// Maintain single and multi player starting spots.
+#define MAX_DEATHMATCH_STARTS	10
+
+mapthing_t	deathmatchstarts[MAX_DEATHMATCH_STARTS];
+mapthing_t*	deathmatch_p;
+mapthing_t	playerstarts[MAXPLAYERS];
+boolean     playerstartsingame[MAXPLAYERS];
+
+
+
+
+
+//
+// P_LoadVertexes
+//
+void P_LoadVertexes (int lump)
+{
+    byte*		data;
+    int			i;
+    mapvertex_t*	ml;
+    vertex_t*		li;
+
+    // Determine number of lumps:
+    //  total lump length / vertex record length.
+    numvertexes = W_LumpLength (lump) / sizeof(mapvertex_t);
+
+    // Allocate zone memory for buffer.
+    vertexes = Z_Malloc (numvertexes*sizeof(vertex_t),PU_LEVEL,0);	
+
+    // Load data into cache.
+    data = W_CacheLumpNum (lump, PU_STATIC);
+	
+    ml = (mapvertex_t *)data;
+    li = vertexes;
+
+    // Copy and convert vertex coordinates,
+    // internal representation as fixed.
+    for (i=0 ; i<numvertexes ; i++, li++, ml++)
+    {
+	li->x = SHORT(ml->x)<<FRACBITS;
+	li->y = SHORT(ml->y)<<FRACBITS;
+    }
+
+    // Free buffer memory.
+    W_ReleaseLumpNum(lump);
+}
+
+//
+// GetSectorAtNullAddress
+//
+sector_t* GetSectorAtNullAddress(void)
+{
+    static boolean null_sector_is_initialized = false;
+    static sector_t null_sector;
+
+    if (!null_sector_is_initialized)
+    {
+        memset(&null_sector, 0, sizeof(null_sector));
+        I_GetMemoryValue(0, &null_sector.floorheight, 4);
+        I_GetMemoryValue(4, &null_sector.ceilingheight, 4);
+        null_sector_is_initialized = true;
+    }
+
+    return &null_sector;
+}
+
+//
+// P_LoadSegs
+//
+void P_LoadSegs (int lump)
+{
+    byte*		data;
+    int			i;
+    mapseg_t*		ml;
+    seg_t*		li;
+    line_t*		ldef;
+    int			linedef;
+    int			side;
+    int                 sidenum;
+	
+    numsegs = W_LumpLength (lump) / sizeof(mapseg_t);
+    segs = Z_Malloc (numsegs*sizeof(seg_t),PU_LEVEL,0);	
+    memset (segs, 0, numsegs*sizeof(seg_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    ml = (mapseg_t *)data;
+    li = segs;
+    for (i=0 ; i<numsegs ; i++, li++, ml++)
+    {
+	li->v1 = &vertexes[SHORT(ml->v1)];
+	li->v2 = &vertexes[SHORT(ml->v2)];
+
+	li->angle = (SHORT(ml->angle))<<FRACBITS;
+	li->offset = (SHORT(ml->offset))<<FRACBITS;
+	linedef = SHORT(ml->linedef);
+	ldef = &lines[linedef];
+	li->linedef = ldef;
+	side = SHORT(ml->side);
+
+        // e6y: check for wrong indexes
+        if ((unsigned)ldef->sidenum[side] >= (unsigned)numsides)
+        {
+            I_Error("P_LoadSegs: linedef %d for seg %d references a non-existent sidedef %d",
+                    linedef, i, (unsigned)ldef->sidenum[side]);
+        }
+
+	li->sidedef = &sides[ldef->sidenum[side]];
+	li->frontsector = sides[ldef->sidenum[side]].sector;
+
+        if (ldef-> flags & ML_TWOSIDED)
+        {
+            sidenum = ldef->sidenum[side ^ 1];
+
+            // If the sidenum is out of range, this may be a "glass hack"
+            // impassible window.  Point at side #0 (this may not be
+            // the correct Vanilla behavior; however, it seems to work for
+            // OTTAWAU.WAD, which is the one place I've seen this trick
+            // used).
+
+            if (sidenum < 0 || sidenum >= numsides)
+            {
+                li->backsector = GetSectorAtNullAddress();
+            }
+            else
+            {
+                li->backsector = sides[sidenum].sector;
+            }
+        }
+        else
+        {
+	    li->backsector = 0;
+        }
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadSubsectors
+//
+void P_LoadSubsectors (int lump)
+{
+    byte*		data;
+    int			i;
+    mapsubsector_t*	ms;
+    subsector_t*	ss;
+	
+    numsubsectors = W_LumpLength (lump) / sizeof(mapsubsector_t);
+    subsectors = Z_Malloc (numsubsectors*sizeof(subsector_t),PU_LEVEL,0);	
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    ms = (mapsubsector_t *)data;
+    memset (subsectors,0, numsubsectors*sizeof(subsector_t));
+    ss = subsectors;
+    
+    for (i=0 ; i<numsubsectors ; i++, ss++, ms++)
+    {
+	ss->numlines = SHORT(ms->numsegs);
+	ss->firstline = SHORT(ms->firstseg);
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+
+//
+// P_LoadSectors
+//
+void P_LoadSectors (int lump)
+{
+    byte*		data;
+    int			i;
+    mapsector_t*	ms;
+    sector_t*		ss;
+	
+    numsectors = W_LumpLength (lump) / sizeof(mapsector_t);
+    sectors = Z_Malloc (numsectors*sizeof(sector_t),PU_LEVEL,0);	
+    memset (sectors, 0, numsectors*sizeof(sector_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    ms = (mapsector_t *)data;
+    ss = sectors;
+    for (i=0 ; i<numsectors ; i++, ss++, ms++)
+    {
+	ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
+	ss->ceilingheight = SHORT(ms->ceilingheight)<<FRACBITS;
+	ss->floorpic = R_FlatNumForName(ms->floorpic);
+	ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
+	ss->lightlevel = SHORT(ms->lightlevel);
+	ss->special = SHORT(ms->special);
+	ss->tag = SHORT(ms->tag);
+	ss->thinglist = NULL;
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadNodes
+//
+void P_LoadNodes (int lump)
+{
+    byte*	data;
+    int		i;
+    int		j;
+    int		k;
+    mapnode_t*	mn;
+    node_t*	no;
+	
+    numnodes = W_LumpLength (lump) / sizeof(mapnode_t);
+    nodes = Z_Malloc (numnodes*sizeof(node_t),PU_LEVEL,0);	
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    mn = (mapnode_t *)data;
+    no = nodes;
+    
+    for (i=0 ; i<numnodes ; i++, no++, mn++)
+    {
+	no->x = SHORT(mn->x)<<FRACBITS;
+	no->y = SHORT(mn->y)<<FRACBITS;
+	no->dx = SHORT(mn->dx)<<FRACBITS;
+	no->dy = SHORT(mn->dy)<<FRACBITS;
+	for (j=0 ; j<2 ; j++)
+	{
+	    no->children[j] = SHORT(mn->children[j]);
+	    for (k=0 ; k<4 ; k++)
+		no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
+	}
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadThings
+//
+void P_LoadThings (int lump)
+{
+    byte               *data;
+    int			i;
+    mapthing_t         *mt;
+    mapthing_t          spawnthing;
+    int			numthings;
+    boolean		spawn;
+
+    data = W_CacheLumpNum (lump,PU_STATIC);
+    numthings = W_LumpLength (lump) / sizeof(mapthing_t);
+	
+    mt = (mapthing_t *)data;
+    for (i=0 ; i<numthings ; i++, mt++)
+    {
+	spawn = true;
+
+	// Do not spawn cool, new monsters if !commercial
+	if (gamemode != commercial)
+	{
+	    switch (SHORT(mt->type))
+	    {
+	      case 68:	// Arachnotron
+	      case 64:	// Archvile
+	      case 88:	// Boss Brain
+	      case 89:	// Boss Shooter
+	      case 69:	// Hell Knight
+	      case 67:	// Mancubus
+	      case 71:	// Pain Elemental
+	      case 65:	// Former Human Commando
+	      case 66:	// Revenant
+	      case 84:	// Wolf SS
+		spawn = false;
+		break;
+	    }
+	}
+	if (spawn == false)
+	    break;
+
+	// Do spawn all other stuff. 
+	spawnthing.x = SHORT(mt->x);
+	spawnthing.y = SHORT(mt->y);
+	spawnthing.angle = SHORT(mt->angle);
+	spawnthing.type = SHORT(mt->type);
+	spawnthing.options = SHORT(mt->options);
+	
+	P_SpawnMapThing(&spawnthing);
+    }
+
+    if (!deathmatch)
+    {
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            if (playeringame[i] && !playerstartsingame[i])
+            {
+                I_Error("P_LoadThings: Player %d start missing (vanilla crashes here)", i + 1);
+            }
+            playerstartsingame[i] = false;
+        }
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadLineDefs
+// Also counts secret lines for intermissions.
+//
+void P_LoadLineDefs (int lump)
+{
+    byte*		data;
+    int			i;
+    maplinedef_t*	mld;
+    line_t*		ld;
+    vertex_t*		v1;
+    vertex_t*		v2;
+	
+    numlines = W_LumpLength (lump) / sizeof(maplinedef_t);
+    lines = Z_Malloc (numlines*sizeof(line_t),PU_LEVEL,0);	
+    memset (lines, 0, numlines*sizeof(line_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    mld = (maplinedef_t *)data;
+    ld = lines;
+    for (i=0 ; i<numlines ; i++, mld++, ld++)
+    {
+	ld->flags = SHORT(mld->flags);
+	ld->special = SHORT(mld->special);
+	ld->tag = SHORT(mld->tag);
+	v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
+	v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
+	ld->dx = v2->x - v1->x;
+	ld->dy = v2->y - v1->y;
+	
+	if (!ld->dx)
+	    ld->slopetype = ST_VERTICAL;
+	else if (!ld->dy)
+	    ld->slopetype = ST_HORIZONTAL;
+	else
+	{
+	    if (FixedDiv (ld->dy , ld->dx) > 0)
+		ld->slopetype = ST_POSITIVE;
+	    else
+		ld->slopetype = ST_NEGATIVE;
+	}
+		
+	if (v1->x < v2->x)
+	{
+	    ld->bbox[BOXLEFT] = v1->x;
+	    ld->bbox[BOXRIGHT] = v2->x;
+	}
+	else
+	{
+	    ld->bbox[BOXLEFT] = v2->x;
+	    ld->bbox[BOXRIGHT] = v1->x;
+	}
+
+	if (v1->y < v2->y)
+	{
+	    ld->bbox[BOXBOTTOM] = v1->y;
+	    ld->bbox[BOXTOP] = v2->y;
+	}
+	else
+	{
+	    ld->bbox[BOXBOTTOM] = v2->y;
+	    ld->bbox[BOXTOP] = v1->y;
+	}
+
+	ld->sidenum[0] = SHORT(mld->sidenum[0]);
+	ld->sidenum[1] = SHORT(mld->sidenum[1]);
+
+	if (ld->sidenum[0] != -1)
+	    ld->frontsector = sides[ld->sidenum[0]].sector;
+	else
+	    ld->frontsector = 0;
+
+	if (ld->sidenum[1] != -1)
+	    ld->backsector = sides[ld->sidenum[1]].sector;
+	else
+	    ld->backsector = 0;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadSideDefs
+//
+void P_LoadSideDefs (int lump)
+{
+    byte*		data;
+    int			i;
+    mapsidedef_t*	msd;
+    side_t*		sd;
+	
+    numsides = W_LumpLength (lump) / sizeof(mapsidedef_t);
+    sides = Z_Malloc (numsides*sizeof(side_t),PU_LEVEL,0);	
+    memset (sides, 0, numsides*sizeof(side_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    msd = (mapsidedef_t *)data;
+    sd = sides;
+    for (i=0 ; i<numsides ; i++, msd++, sd++)
+    {
+	sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
+	sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
+	sd->toptexture = R_TextureNumForName(msd->toptexture);
+	sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+	sd->midtexture = R_TextureNumForName(msd->midtexture);
+	sd->sector = &sectors[SHORT(msd->sector)];
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadBlockMap
+//
+void P_LoadBlockMap (int lump)
+{
+    int i;
+    int count;
+    int lumplen;
+
+    lumplen = W_LumpLength(lump);
+    count = lumplen / 2;
+	
+    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
+    W_ReadLump(lump, blockmaplump);
+    blockmap = blockmaplump + 4;
+
+    // Swap all short integers to native byte ordering.
+  
+    for (i=0; i<count; i++)
+    {
+	blockmaplump[i] = SHORT(blockmaplump[i]);
+    }
+		
+    // Read the header
+
+    bmaporgx = blockmaplump[0]<<FRACBITS;
+    bmaporgy = blockmaplump[1]<<FRACBITS;
+    bmapwidth = blockmaplump[2];
+    bmapheight = blockmaplump[3];
+	
+    // Clear out mobj chains
+
+    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
+    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
+    memset(blocklinks, 0, count);
+}
+
+
+
+//
+// P_GroupLines
+// Builds sector line lists and subsector sector numbers.
+// Finds block bounding boxes for sectors.
+//
+void P_GroupLines (void)
+{
+    line_t**		linebuffer;
+    int			i;
+    int			j;
+    line_t*		li;
+    sector_t*		sector;
+    subsector_t*	ss;
+    seg_t*		seg;
+    fixed_t		bbox[4];
+    int			block;
+	
+    // look up sector number for each subsector
+    ss = subsectors;
+    for (i=0 ; i<numsubsectors ; i++, ss++)
+    {
+	seg = &segs[ss->firstline];
+	ss->sector = seg->sidedef->sector;
+    }
+
+    // count number of lines in each sector
+    li = lines;
+    totallines = 0;
+    for (i=0 ; i<numlines ; i++, li++)
+    {
+	totallines++;
+	li->frontsector->linecount++;
+
+	if (li->backsector && li->backsector != li->frontsector)
+	{
+	    li->backsector->linecount++;
+	    totallines++;
+	}
+    }
+
+    // build line tables for each sector	
+    linebuffer = Z_Malloc (totallines*sizeof(line_t *), PU_LEVEL, 0);
+
+    for (i=0; i<numsectors; ++i)
+    {
+        // Assign the line buffer for this sector
+
+        sectors[i].lines = linebuffer;
+        linebuffer += sectors[i].linecount;
+
+        // Reset linecount to zero so in the next stage we can count
+        // lines into the list.
+
+        sectors[i].linecount = 0;
+    }
+
+    // Assign lines to sectors
+
+    for (i=0; i<numlines; ++i)
+    { 
+        li = &lines[i];
+
+        if (li->frontsector != NULL)
+        {
+            sector = li->frontsector;
+
+            sector->lines[sector->linecount] = li;
+            ++sector->linecount;
+        }
+
+        if (li->backsector != NULL && li->frontsector != li->backsector)
+        {
+            sector = li->backsector;
+
+            sector->lines[sector->linecount] = li;
+            ++sector->linecount;
+        }
+    }
+    
+    // Generate bounding boxes for sectors
+	
+    sector = sectors;
+    for (i=0 ; i<numsectors ; i++, sector++)
+    {
+	M_ClearBox (bbox);
+
+	for (j=0 ; j<sector->linecount; j++)
+	{
+            li = sector->lines[j];
+
+            M_AddToBox (bbox, li->v1->x, li->v1->y);
+            M_AddToBox (bbox, li->v2->x, li->v2->y);
+	}
+
+	// set the degenmobj_t to the middle of the bounding box
+	sector->soundorg.x = (bbox[BOXRIGHT]+bbox[BOXLEFT])/2;
+	sector->soundorg.y = (bbox[BOXTOP]+bbox[BOXBOTTOM])/2;
+		
+	// adjust bounding box to map blocks
+	block = (bbox[BOXTOP]-bmaporgy+MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block >= bmapheight ? bmapheight-1 : block;
+	sector->blockbox[BOXTOP]=block;
+
+	block = (bbox[BOXBOTTOM]-bmaporgy-MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block < 0 ? 0 : block;
+	sector->blockbox[BOXBOTTOM]=block;
+
+	block = (bbox[BOXRIGHT]-bmaporgx+MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block >= bmapwidth ? bmapwidth-1 : block;
+	sector->blockbox[BOXRIGHT]=block;
+
+	block = (bbox[BOXLEFT]-bmaporgx-MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block < 0 ? 0 : block;
+	sector->blockbox[BOXLEFT]=block;
+    }
+	
+}
+
+
+static void P_LoadReject(int lumpnum)
+{
+    int minlength;
+    int lumplen;
+
+    // Calculate the size that the REJECT lump *should* be.
+
+    minlength = (numsectors * numsectors + 7) / 8;
+
+    // If the lump meets the minimum length, it can be loaded directly.
+    // Otherwise, we need to allocate a buffer of the correct size
+    // and pad it with appropriate data.
+
+    lumplen = W_LumpLength(lumpnum);
+
+    if (lumplen >= minlength)
+    {
+        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
+    }
+    else
+    {
+        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
+        W_ReadLump(lumpnum, rejectmatrix);
+
+        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
+    }
+}
+
+// pointer to the current map lump info struct
+lumpinfo_t *maplumpinfo;
+
+//
+// P_SetupLevel
+//
+void
+P_SetupLevel
+( int		episode,
+  int		map,
+  int		playermask,
+  skill_t	skill)
+{
+    int		i;
+    char	lumpname[9];
+    int		lumpnum;
+	
+    totalkills = totalitems = totalsecret = wminfo.maxfrags = 0;
+    wminfo.partime = 180;
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	players[i].killcount = players[i].secretcount 
+	    = players[i].itemcount = 0;
+    }
+
+    // Initial height of PointOfView
+    // will be set by player think.
+    players[consoleplayer].viewz = 1; 
+
+    // Make sure all sounds are stopped before Z_FreeTags.
+    S_Start ();			
+
+    Z_FreeTags (PU_LEVEL, PU_PURGELEVEL-1);
+
+    // UNUSED W_Profile ();
+    P_InitThinkers ();
+
+    // if working with a devlopment map, reload it
+    W_Reload ();
+
+    // find map name
+    if ( gamemode == commercial)
+    {
+	if (map<10)
+	    DEH_snprintf(lumpname, 9, "map0%i", map);
+	else
+	    DEH_snprintf(lumpname, 9, "map%i", map);
+    }
+    else
+    {
+	lumpname[0] = 'E';
+	lumpname[1] = '0' + episode;
+	lumpname[2] = 'M';
+	lumpname[3] = '0' + map;
+	lumpname[4] = 0;
+    }
+
+    lumpnum = W_GetNumForName (lumpname);
+	
+    maplumpinfo = lumpinfo[lumpnum];
+
+    leveltime = 0;
+	
+    // note: most of this ordering is important	
+    P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
+    P_LoadVertexes (lumpnum+ML_VERTEXES);
+    P_LoadSectors (lumpnum+ML_SECTORS);
+    P_LoadSideDefs (lumpnum+ML_SIDEDEFS);
+
+    P_LoadLineDefs (lumpnum+ML_LINEDEFS);
+    P_LoadSubsectors (lumpnum+ML_SSECTORS);
+    P_LoadNodes (lumpnum+ML_NODES);
+    P_LoadSegs (lumpnum+ML_SEGS);
+
+    P_GroupLines ();
+    P_LoadReject (lumpnum+ML_REJECT);
+
+    bodyqueslot = 0;
+    deathmatch_p = deathmatchstarts;
+    P_LoadThings (lumpnum+ML_THINGS);
+    
+    // if deathmatch, randomly spawn the active players
+    if (deathmatch)
+    {
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	    if (playeringame[i])
+	    {
+		players[i].mo = NULL;
+		G_DeathMatchSpawnPlayer (i);
+	    }
+			
+    }
+
+    // clear special respawning que
+    iquehead = iquetail = 0;		
+	
+    // set up world state
+    P_SpawnSpecials ();
+	
+    // build subsector connect matrix
+    //	UNUSED P_ConnectSubsectors ();
+
+    // preload graphics
+    if (precache)
+	R_PrecacheLevel ();
+
+    //printf ("free memory: 0x%x\n", Z_FreeMemory());
+
+}
+
+
+
+//
+// P_Init
+//
+void P_Init (void)
+{
+    P_InitSwitchList ();
+    P_InitPicAnims ();
+    R_InitSprites (sprnames);
+}
+
+
+
diff --git a/games/NXDoom/src/doom/p_setup.h b/games/NXDoom/src/doom/p_setup.h
new file mode 100644
index 000000000..97ca104ef
--- /dev/null
+++ b/games/NXDoom/src/doom/p_setup.h
@@ -0,0 +1,39 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Setup a game, startup stuff.
+//
+
+
+#ifndef __P_SETUP__
+#define __P_SETUP__
+
+#include "w_wad.h"
+
+
+extern lumpinfo_t *maplumpinfo;
+
+// NOT called by W_Ticker. Fixme.
+void
+P_SetupLevel
+( int		episode,
+  int		map,
+  int		playermask,
+  skill_t	skill);
+
+// Called by startup code.
+void P_Init (void);
+
+#endif
diff --git a/games/NXDoom/src/doom/p_sight.c b/games/NXDoom/src/doom/p_sight.c
new file mode 100644
index 000000000..6457417e4
--- /dev/null
+++ b/games/NXDoom/src/doom/p_sight.c
@@ -0,0 +1,394 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	LineOfSight/Visibility checks, uses REJECT Lookup Table.
+//
+
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "i_system.h"
+#include "p_local.h"
+
+// State.
+#include "r_state.h"
+
+//
+// P_CheckSight
+//
+fixed_t		sightzstart;		// eye z of looker
+fixed_t		topslope;
+fixed_t		bottomslope;		// slopes to top and bottom of target
+
+divline_t	strace;			// from t1 to t2
+fixed_t		t2x;
+fixed_t		t2y;
+
+int		sightcounts[2];
+
+
+// PTR_SightTraverse() for Doom 1.2 sight calculations
+// taken from prboom-plus/src/p_sight.c:69-102
+boolean PTR_SightTraverse(intercept_t *in)
+{
+    line_t *li;
+    fixed_t slope;
+
+    li = in->d.line;
+
+    //
+    // crosses a two sided line
+    //
+    P_LineOpening(li);
+
+    if (openbottom >= opentop) // quick test for totally closed doors
+        return false;          // stop
+
+    if (li->frontsector->floorheight != li->backsector->floorheight)
+    {
+        slope = FixedDiv(openbottom - sightzstart, in->frac);
+        if (slope > bottomslope)
+            bottomslope = slope;
+    }
+
+    if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+    {
+        slope = FixedDiv(opentop - sightzstart, in->frac);
+        if (slope < topslope)
+            topslope = slope;
+    }
+
+    if (topslope <= bottomslope)
+        return false; // stop
+
+    return true; // keep going
+}
+
+
+//
+// P_DivlineSide
+// Returns side 0 (front), 1 (back), or 2 (on).
+//
+int
+P_DivlineSide
+( fixed_t	x,
+  fixed_t	y,
+  divline_t*	node )
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+
+    if (!node->dx)
+    {
+	if (x==node->x)
+	    return 2;
+	
+	if (x <= node->x)
+	    return node->dy > 0;
+
+	return node->dy < 0;
+    }
+    
+    if (!node->dy)
+    {
+	if (x==node->y)
+	    return 2;
+
+	if (y <= node->y)
+	    return node->dx < 0;
+
+	return node->dx > 0;
+    }
+	
+    dx = (x - node->x);
+    dy = (y - node->y);
+
+    left =  (node->dy>>FRACBITS) * (dx>>FRACBITS);
+    right = (dy>>FRACBITS) * (node->dx>>FRACBITS);
+	
+    if (right < left)
+	return 0;	// front side
+    
+    if (left == right)
+	return 2;
+    return 1;		// back side
+}
+
+
+//
+// P_InterceptVector2
+// Returns the fractional intercept point
+// along the first divline.
+// This is only called by the addthings and addlines traversers.
+//
+fixed_t
+P_InterceptVector2
+( divline_t*	v2,
+  divline_t*	v1 )
+{
+    fixed_t	frac;
+    fixed_t	num;
+    fixed_t	den;
+	
+    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
+
+    if (den == 0)
+	return 0;
+    //	I_Error ("P_InterceptVector: parallel");
+    
+    num = FixedMul ( (v1->x - v2->x)>>8 ,v1->dy) + 
+	FixedMul ( (v2->y - v1->y)>>8 , v1->dx);
+    frac = FixedDiv (num , den);
+
+    return frac;
+}
+
+//
+// P_CrossSubsector
+// Returns true
+//  if strace crosses the given subsector successfully.
+//
+boolean P_CrossSubsector (int num)
+{
+    seg_t*		seg;
+    line_t*		line;
+    int			s1;
+    int			s2;
+    int			count;
+    subsector_t*	sub;
+    sector_t*		front;
+    sector_t*		back;
+    fixed_t		opentop;
+    fixed_t		openbottom;
+    divline_t		divl;
+    vertex_t*		v1;
+    vertex_t*		v2;
+    fixed_t		frac;
+    fixed_t		slope;
+	
+#ifdef RANGECHECK
+    if (num>=numsubsectors)
+	I_Error ("P_CrossSubsector: ss %i with numss = %i",
+		 num,
+		 numsubsectors);
+#endif
+
+    sub = &subsectors[num];
+    
+    // check lines
+    count = sub->numlines;
+    seg = &segs[sub->firstline];
+
+    for ( ; count ; seg++, count--)
+    {
+	line = seg->linedef;
+
+	// allready checked other side?
+	if (line->validcount == validcount)
+	    continue;
+	
+	line->validcount = validcount;
+
+	v1 = line->v1;
+	v2 = line->v2;
+	s1 = P_DivlineSide (v1->x,v1->y, &strace);
+	s2 = P_DivlineSide (v2->x, v2->y, &strace);
+
+	// line isn't crossed?
+	if (s1 == s2)
+	    continue;
+	
+	divl.x = v1->x;
+	divl.y = v1->y;
+	divl.dx = v2->x - v1->x;
+	divl.dy = v2->y - v1->y;
+	s1 = P_DivlineSide (strace.x, strace.y, &divl);
+	s2 = P_DivlineSide (t2x, t2y, &divl);
+
+	// line isn't crossed?
+	if (s1 == s2)
+	    continue;	
+
+        // Backsector may be NULL if this is an "impassible
+        // glass" hack line.
+
+        if (line->backsector == NULL)
+        {
+            return false;
+        }
+
+	// stop because it is not two sided anyway
+	// might do this after updating validcount?
+	if ( !(line->flags & ML_TWOSIDED) )
+	    return false;
+	
+	// crosses a two sided line
+	front = seg->frontsector;
+	back = seg->backsector;
+
+	// no wall to block sight with?
+	if (front->floorheight == back->floorheight
+	    && front->ceilingheight == back->ceilingheight)
+	    continue;	
+
+	// possible occluder
+	// because of ceiling height differences
+	if (front->ceilingheight < back->ceilingheight)
+	    opentop = front->ceilingheight;
+	else
+	    opentop = back->ceilingheight;
+
+	// because of ceiling height differences
+	if (front->floorheight > back->floorheight)
+	    openbottom = front->floorheight;
+	else
+	    openbottom = back->floorheight;
+		
+	// quick test for totally closed doors
+	if (openbottom >= opentop)	
+	    return false;		// stop
+	
+	frac = P_InterceptVector2 (&strace, &divl);
+		
+	if (front->floorheight != back->floorheight)
+	{
+	    slope = FixedDiv (openbottom - sightzstart , frac);
+	    if (slope > bottomslope)
+		bottomslope = slope;
+	}
+		
+	if (front->ceilingheight != back->ceilingheight)
+	{
+	    slope = FixedDiv (opentop - sightzstart , frac);
+	    if (slope < topslope)
+		topslope = slope;
+	}
+		
+	if (topslope <= bottomslope)
+	    return false;		// stop				
+    }
+    // passed the subsector ok
+    return true;		
+}
+
+
+
+//
+// P_CrossBSPNode
+// Returns true
+//  if strace crosses the given node successfully.
+//
+boolean P_CrossBSPNode (int bspnum)
+{
+    node_t*	bsp;
+    int		side;
+
+    if (bspnum & NF_SUBSECTOR)
+    {
+	if (bspnum == -1)
+	    return P_CrossSubsector (0);
+	else
+	    return P_CrossSubsector (bspnum&(~NF_SUBSECTOR));
+    }
+		
+    bsp = &nodes[bspnum];
+    
+    // decide which side the start point is on
+    side = P_DivlineSide (strace.x, strace.y, (divline_t *)bsp);
+    if (side == 2)
+	side = 0;	// an "on" should cross both sides
+
+    // cross the starting side
+    if (!P_CrossBSPNode (bsp->children[side]) )
+	return false;
+	
+    // the partition plane is crossed here
+    if (side == P_DivlineSide (t2x, t2y,(divline_t *)bsp))
+    {
+	// the line doesn't touch the other side
+	return true;
+    }
+    
+    // cross the ending side		
+    return P_CrossBSPNode (bsp->children[side^1]);
+}
+
+
+//
+// P_CheckSight
+// Returns true
+//  if a straight line between t1 and t2 is unobstructed.
+// Uses REJECT.
+//
+boolean
+P_CheckSight
+( mobj_t*	t1,
+  mobj_t*	t2 )
+{
+    int		s1;
+    int		s2;
+    int		pnum;
+    int		bytenum;
+    int		bitnum;
+    
+    // First check for trivial rejection.
+
+    // Determine subsector entries in REJECT table.
+    s1 = (t1->subsector->sector - sectors);
+    s2 = (t2->subsector->sector - sectors);
+    pnum = s1*numsectors + s2;
+    bytenum = pnum>>3;
+    bitnum = 1 << (pnum&7);
+
+    // Check in REJECT table.
+    if (rejectmatrix[bytenum]&bitnum)
+    {
+	sightcounts[0]++;
+
+	// can't possibly be connected
+	return false;	
+    }
+
+    // An unobstructed LOS is possible.
+    // Now look from eyes of t1 to any part of t2.
+    sightcounts[1]++;
+
+    validcount++;
+	
+    sightzstart = t1->z + t1->height - (t1->height>>2);
+    topslope = (t2->z+t2->height) - sightzstart;
+    bottomslope = (t2->z) - sightzstart;
+	
+    if (gameversion <= exe_doom_1_2)
+    {
+        return P_PathTraverse(t1->x, t1->y, t2->x, t2->y,
+                              PT_EARLYOUT | PT_ADDLINES, PTR_SightTraverse);
+    }
+
+    strace.x = t1->x;
+    strace.y = t1->y;
+    t2x = t2->x;
+    t2y = t2->y;
+    strace.dx = t2->x - t1->x;
+    strace.dy = t2->y - t1->y;
+
+    // the head node is the last node output
+    return P_CrossBSPNode (numnodes-1);	
+}
+
+
diff --git a/games/NXDoom/src/doom/p_spec.c b/games/NXDoom/src/doom/p_spec.c
new file mode 100644
index 000000000..8d890ce2e
--- /dev/null
+++ b/games/NXDoom/src/doom/p_spec.c
@@ -0,0 +1,1519 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Implements special effects:
+//	Texture animation, height or lighting changes
+//	 according to adjacent sectors, respective
+//	 utility functions, etc.
+//	Line Tag handling. Line and Sector triggers.
+//
+
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "deh_main.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+#include "p_local.h"
+
+#include "g_game.h"
+
+#include "s_sound.h"
+
+// State.
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+
+//
+// Animating textures and planes
+// There is another anim_t used in wi_stuff, unrelated.
+//
+typedef struct
+{
+    boolean	istexture;
+    int		picnum;
+    int		basepic;
+    int		numpics;
+    int		speed;
+    
+} anim_t;
+
+//
+//      source animation definition
+//
+typedef struct
+{
+    int 	istexture;	// if false, it is a flat
+    char	endname[9];
+    char	startname[9];
+    int		speed;
+} animdef_t;
+
+
+
+#define MAXANIMS                32
+
+
+//
+// P_InitPicAnims
+//
+
+// Floor/ceiling animation sequences,
+//  defined by first and last frame,
+//  i.e. the flat (64x64 tile) name to
+//  be used.
+// The full animation sequence is given
+//  using all the flats between the start
+//  and end entry, in the order found in
+//  the WAD file.
+//
+animdef_t		animdefs[] =
+{
+    {false,	"NUKAGE3",	"NUKAGE1",	8},
+    {false,	"FWATER4",	"FWATER1",	8},
+    {false,	"SWATER4",	"SWATER1", 	8},
+    {false,	"LAVA4",	"LAVA1",	8},
+    {false,	"BLOOD3",	"BLOOD1",	8},
+
+    // DOOM II flat animations.
+    {false,	"RROCK08",	"RROCK05",	8},		
+    {false,	"SLIME04",	"SLIME01",	8},
+    {false,	"SLIME08",	"SLIME05",	8},
+    {false,	"SLIME12",	"SLIME09",	8},
+
+    {true,	"BLODGR4",	"BLODGR1",	8},
+    {true,	"SLADRIP3",	"SLADRIP1",	8},
+
+    {true,	"BLODRIP4",	"BLODRIP1",	8},
+    {true,	"FIREWALL",	"FIREWALA",	8},
+    {true,	"GSTFONT3",	"GSTFONT1",	8},
+    {true,	"FIRELAVA",	"FIRELAV3",	8},
+    {true,	"FIREMAG3",	"FIREMAG1",	8},
+    {true,	"FIREBLU2",	"FIREBLU1",	8},
+    {true,	"ROCKRED3",	"ROCKRED1",	8},
+
+    {true,	"BFALL4",	"BFALL1",	8},
+    {true,	"SFALL4",	"SFALL1",	8},
+    {true,	"WFALL4",	"WFALL1",	8},
+    {true,	"DBRAIN4",	"DBRAIN1",	8},
+	
+    {-1,        "",             "",             0},
+};
+
+anim_t		anims[MAXANIMS];
+anim_t*		lastanim;
+
+
+//
+//      Animating line specials
+//
+#define MAXLINEANIMS            64
+// version <= 1.2 did not have a limit and could handle up to 66 scrolling
+// linedefs before displaying adverse effects. All other versions have a limit
+// of 64.
+#define MAXLINEANIMS1_2         66
+
+short numlinespecials;
+line_t *linespeciallist[MAXLINEANIMS1_2];
+
+
+
+void P_InitPicAnims (void)
+{
+    int		i;
+
+    
+    //	Init animation
+    lastanim = anims;
+    for (i=0 ; animdefs[i].istexture != -1 ; i++)
+    {
+        const char *startname, *endname;
+
+        startname = DEH_String(animdefs[i].startname);
+        endname = DEH_String(animdefs[i].endname);
+
+	if (animdefs[i].istexture)
+	{
+	    // different episode ?
+	    if (R_CheckTextureNumForName(startname) == -1)
+		continue;	
+
+	    lastanim->picnum = R_TextureNumForName(endname);
+	    lastanim->basepic = R_TextureNumForName(startname);
+	}
+	else
+	{
+	    if (W_CheckNumForName(startname) == -1)
+		continue;
+
+	    lastanim->picnum = R_FlatNumForName(endname);
+	    lastanim->basepic = R_FlatNumForName(startname);
+	}
+
+	lastanim->istexture = animdefs[i].istexture;
+	lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
+
+	if (lastanim->numpics < 2)
+	    I_Error ("P_InitPicAnims: bad cycle from %s to %s",
+		     startname, endname);
+	
+	lastanim->speed = animdefs[i].speed;
+	lastanim++;
+    }
+	
+}
+
+
+
+//
+// UTILITIES
+//
+
+
+
+//
+// getSide()
+// Will return a side_t*
+//  given the number of the current sector,
+//  the line number, and the side (0/1) that you want.
+//
+side_t*
+getSide
+( int		currentSector,
+  int		line,
+  int		side )
+{
+    return &sides[ (sectors[currentSector].lines[line])->sidenum[side] ];
+}
+
+
+//
+// getSector()
+// Will return a sector_t*
+//  given the number of the current sector,
+//  the line number and the side (0/1) that you want.
+//
+sector_t*
+getSector
+( int		currentSector,
+  int		line,
+  int		side )
+{
+    return sides[ (sectors[currentSector].lines[line])->sidenum[side] ].sector;
+}
+
+
+//
+// twoSided()
+// Given the sector number and the line number,
+//  it will tell you whether the line is two-sided or not.
+//
+int
+twoSided
+( int	sector,
+  int	line )
+{
+    return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
+}
+
+
+
+
+//
+// getNextSector()
+// Return sector_t * of sector next to current.
+// NULL if not two-sided line
+//
+sector_t*
+getNextSector
+( line_t*	line,
+  sector_t*	sec )
+{
+    if (!(line->flags & ML_TWOSIDED))
+	return NULL;
+		
+    if (line->frontsector == sec)
+	return line->backsector;
+	
+    return line->frontsector;
+}
+
+
+
+//
+// P_FindLowestFloorSurrounding()
+// FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+fixed_t	P_FindLowestFloorSurrounding(sector_t* sec)
+{
+    int			i;
+    line_t*		check;
+    sector_t*		other;
+    fixed_t		floor = sec->floorheight;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+
+	if (!other)
+	    continue;
+	
+	if (other->floorheight < floor)
+	    floor = other->floorheight;
+    }
+    return floor;
+}
+
+
+
+//
+// P_FindHighestFloorSurrounding()
+// FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+fixed_t	P_FindHighestFloorSurrounding(sector_t *sec)
+{
+    int			i;
+    line_t*		check;
+    sector_t*		other;
+    fixed_t		floor = -500*FRACUNIT;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+	
+	if (!other)
+	    continue;
+	
+	if (other->floorheight > floor)
+	    floor = other->floorheight;
+    }
+    return floor;
+}
+
+
+
+//
+// P_FindNextHighestFloor
+// FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
+// Note: this should be doable w/o a fixed array.
+
+// Thanks to entryway for the Vanilla overflow emulation.
+
+// 20 adjoining sectors max!
+#define MAX_ADJOINING_SECTORS     20
+
+fixed_t
+P_FindNextHighestFloor
+( sector_t* sec,
+  int       currentheight )
+{
+    int         i;
+    int         h;
+    int         min;
+    line_t*     check;
+    sector_t*   other;
+    fixed_t     height = currentheight;
+    fixed_t     heightlist[MAX_ADJOINING_SECTORS + 2];
+
+    for (i=0, h=0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check,sec);
+
+        if (!other)
+            continue;
+        
+        if (other->floorheight > height)
+        {
+            // Emulation of memory (stack) overflow
+            if (h == MAX_ADJOINING_SECTORS + 1)
+            {
+                height = other->floorheight;
+            }
+            else if (h == MAX_ADJOINING_SECTORS + 2)
+            {
+                // Fatal overflow: game crashes at 22 sectors
+                I_Error("Sector with more than 22 adjoining sectors. "
+                        "Vanilla will crash here");
+            }
+
+            heightlist[h++] = other->floorheight;
+        }
+    }
+    
+    // Find lowest height in list
+    if (!h)
+    {
+        return currentheight;
+    }
+        
+    min = heightlist[0];
+    
+    // Range checking? 
+    for (i = 1; i < h; i++)
+    {
+        if (heightlist[i] < min)
+        {
+            min = heightlist[i];
+        }
+    }
+
+    return min;
+}
+
+//
+// FIND LOWEST CEILING IN THE SURROUNDING SECTORS
+//
+fixed_t
+P_FindLowestCeilingSurrounding(sector_t* sec)
+{
+    int			i;
+    line_t*		check;
+    sector_t*		other;
+    fixed_t		height = INT_MAX;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+
+	if (!other)
+	    continue;
+
+	if (other->ceilingheight < height)
+	    height = other->ceilingheight;
+    }
+    return height;
+}
+
+
+//
+// FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
+//
+fixed_t	P_FindHighestCeilingSurrounding(sector_t* sec)
+{
+    int		i;
+    line_t*	check;
+    sector_t*	other;
+    fixed_t	height = 0;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+
+	if (!other)
+	    continue;
+
+	if (other->ceilingheight > height)
+	    height = other->ceilingheight;
+    }
+    return height;
+}
+
+
+
+//
+// RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
+//
+int
+P_FindSectorFromLineTag
+( line_t*	line,
+  int		start )
+{
+    int	i;
+	
+    for (i=start+1;i<numsectors;i++)
+	if (sectors[i].tag == line->tag)
+	    return i;
+    
+    return -1;
+}
+
+
+
+
+//
+// Find minimum light from an adjacent sector
+//
+int
+P_FindMinSurroundingLight
+( sector_t*	sector,
+  int		max )
+{
+    int		i;
+    int		min;
+    line_t*	line;
+    sector_t*	check;
+	
+    min = max;
+    for (i=0 ; i < sector->linecount ; i++)
+    {
+	line = sector->lines[i];
+	check = getNextSector(line,sector);
+
+	if (!check)
+	    continue;
+
+	if (check->lightlevel < min)
+	    min = check->lightlevel;
+    }
+    return min;
+}
+
+
+
+//
+// EVENTS
+// Events are operations triggered by using, crossing,
+// or shooting special lines, or by timed thinkers.
+//
+
+//
+// P_CrossSpecialLine - TRIGGER
+// Called every time a thing origin is about
+//  to cross a line with a non 0 special.
+//
+void
+P_CrossSpecialLine
+( int		linenum,
+  int		side,
+  mobj_t*	thing )
+{
+    line_t*	line;
+    int		ok;
+
+    line = &lines[linenum];
+    
+    if (gameversion <= exe_doom_1_2)
+    {
+        if (line->special > 98 && line->special != 104)
+        {
+            return;
+        }
+    }
+    else
+    {
+        //	Triggers that other things can activate
+        if (!thing->player)
+        {
+            // Things that should NOT trigger specials...
+            switch(thing->type)
+            {
+                case MT_ROCKET:
+                case MT_PLASMA:
+                case MT_BFG:
+                case MT_TROOPSHOT:
+                case MT_HEADSHOT:
+                case MT_BRUISERSHOT:
+                    return;
+
+                default: break;
+            }
+        }
+    }
+
+    if (!thing->player)
+    {
+	ok = 0;
+	switch(line->special)
+	{
+	  case 39:	// TELEPORT TRIGGER
+	  case 97:	// TELEPORT RETRIGGER
+	  case 125:	// TELEPORT MONSTERONLY TRIGGER
+	  case 126:	// TELEPORT MONSTERONLY RETRIGGER
+	  case 4:	// RAISE DOOR
+	  case 10:	// PLAT DOWN-WAIT-UP-STAY TRIGGER
+	  case 88:	// PLAT DOWN-WAIT-UP-STAY RETRIGGER
+	    ok = 1;
+	    break;
+	}
+	if (!ok)
+	    return;
+    }
+
+    
+    // Note: could use some const's here.
+    switch (line->special)
+    {
+	// TRIGGERS.
+	// All from here to RETRIGGERS.
+      case 2:
+	// Open Door
+	EV_DoDoor(line,vld_open);
+	line->special = 0;
+	break;
+
+      case 3:
+	// Close Door
+	EV_DoDoor(line,vld_close);
+	line->special = 0;
+	break;
+
+      case 4:
+	// Raise Door
+	EV_DoDoor(line,vld_normal);
+	line->special = 0;
+	break;
+	
+      case 5:
+	// Raise Floor
+	EV_DoFloor(line,raiseFloor);
+	line->special = 0;
+	break;
+	
+      case 6:
+	// Fast Ceiling Crush & Raise
+	EV_DoCeiling(line,fastCrushAndRaise);
+	line->special = 0;
+	break;
+	
+      case 8:
+	// Build Stairs
+	EV_BuildStairs(line,build8);
+	line->special = 0;
+	break;
+	
+      case 10:
+	// PlatDownWaitUp
+	EV_DoPlat(line,downWaitUpStay,0);
+	line->special = 0;
+	break;
+	
+      case 12:
+	// Light Turn On - brightest near
+	EV_LightTurnOn(line,0);
+	line->special = 0;
+	break;
+	
+      case 13:
+	// Light Turn On 255
+	EV_LightTurnOn(line,255);
+	line->special = 0;
+	break;
+	
+      case 16:
+	// Close Door 30
+	EV_DoDoor(line,vld_close30ThenOpen);
+	line->special = 0;
+	break;
+	
+      case 17:
+	// Start Light Strobing
+	EV_StartLightStrobing(line);
+	line->special = 0;
+	break;
+	
+      case 19:
+	// Lower Floor
+	EV_DoFloor(line,lowerFloor);
+	line->special = 0;
+	break;
+	
+      case 22:
+	// Raise floor to nearest height and change texture
+	EV_DoPlat(line,raiseToNearestAndChange,0);
+	line->special = 0;
+	break;
+	
+      case 25:
+	// Ceiling Crush and Raise
+	EV_DoCeiling(line,crushAndRaise);
+	line->special = 0;
+	break;
+	
+      case 30:
+	// Raise floor to shortest texture height
+	//  on either side of lines.
+	EV_DoFloor(line,raiseToTexture);
+	line->special = 0;
+	break;
+	
+      case 35:
+	// Lights Very Dark
+	EV_LightTurnOn(line,35);
+	line->special = 0;
+	break;
+	
+      case 36:
+	// Lower Floor (TURBO)
+	EV_DoFloor(line,turboLower);
+	line->special = 0;
+	break;
+	
+      case 37:
+	// LowerAndChange
+	EV_DoFloor(line,lowerAndChange);
+	line->special = 0;
+	break;
+	
+      case 38:
+	// Lower Floor To Lowest
+	EV_DoFloor( line, lowerFloorToLowest );
+	line->special = 0;
+	break;
+	
+      case 39:
+	// TELEPORT!
+	EV_Teleport( line, side, thing );
+	line->special = 0;
+	break;
+
+      case 40:
+	// RaiseCeilingLowerFloor
+	EV_DoCeiling( line, raiseToHighest );
+	EV_DoFloor( line, lowerFloorToLowest );
+	line->special = 0;
+	break;
+	
+      case 44:
+	// Ceiling Crush
+	EV_DoCeiling( line, lowerAndCrush );
+	line->special = 0;
+	break;
+	
+      case 52:
+	// EXIT!
+	G_ExitLevel ();
+	break;
+	
+      case 53:
+	// Perpetual Platform Raise
+	EV_DoPlat(line,perpetualRaise,0);
+	line->special = 0;
+	break;
+	
+      case 54:
+	// Platform Stop
+	EV_StopPlat(line);
+	line->special = 0;
+	break;
+
+      case 56:
+	// Raise Floor Crush
+	EV_DoFloor(line,raiseFloorCrush);
+	line->special = 0;
+	break;
+
+      case 57:
+	// Ceiling Crush Stop
+	EV_CeilingCrushStop(line);
+	line->special = 0;
+	break;
+	
+      case 58:
+	// Raise Floor 24
+	EV_DoFloor(line,raiseFloor24);
+	line->special = 0;
+	break;
+
+      case 59:
+	// Raise Floor 24 And Change
+	EV_DoFloor(line,raiseFloor24AndChange);
+	line->special = 0;
+	break;
+	
+      case 104:
+	// Turn lights off in sector(tag)
+	EV_TurnTagLightsOff(line);
+	line->special = 0;
+	break;
+	
+      case 108:
+	// Blazing Door Raise (faster than TURBO!)
+	EV_DoDoor (line,vld_blazeRaise);
+	line->special = 0;
+	break;
+	
+      case 109:
+	// Blazing Door Open (faster than TURBO!)
+	EV_DoDoor (line,vld_blazeOpen);
+	line->special = 0;
+	break;
+	
+      case 100:
+	// Build Stairs Turbo 16
+	EV_BuildStairs(line,turbo16);
+	line->special = 0;
+	break;
+	
+      case 110:
+	// Blazing Door Close (faster than TURBO!)
+	EV_DoDoor (line,vld_blazeClose);
+	line->special = 0;
+	break;
+
+      case 119:
+	// Raise floor to nearest surr. floor
+	EV_DoFloor(line,raiseFloorToNearest);
+	line->special = 0;
+	break;
+	
+      case 121:
+	// Blazing PlatDownWaitUpStay
+	EV_DoPlat(line,blazeDWUS,0);
+	line->special = 0;
+	break;
+	
+      case 124:
+	// Secret EXIT
+	G_SecretExitLevel ();
+	break;
+		
+      case 125:
+	// TELEPORT MonsterONLY
+	if (!thing->player)
+	{
+	    EV_Teleport( line, side, thing );
+	    line->special = 0;
+	}
+	break;
+	
+      case 130:
+	// Raise Floor Turbo
+	EV_DoFloor(line,raiseFloorTurbo);
+	line->special = 0;
+	break;
+	
+      case 141:
+	// Silent Ceiling Crush & Raise
+	EV_DoCeiling(line,silentCrushAndRaise);
+	line->special = 0;
+	break;
+	
+	// RETRIGGERS.  All from here till end.
+      case 72:
+	// Ceiling Crush
+	EV_DoCeiling( line, lowerAndCrush );
+	break;
+
+      case 73:
+	// Ceiling Crush and Raise
+	EV_DoCeiling(line,crushAndRaise);
+	break;
+
+      case 74:
+	// Ceiling Crush Stop
+	EV_CeilingCrushStop(line);
+	break;
+	
+      case 75:
+	// Close Door
+	EV_DoDoor(line,vld_close);
+	break;
+	
+      case 76:
+	// Close Door 30
+	EV_DoDoor(line,vld_close30ThenOpen);
+	break;
+	
+      case 77:
+	// Fast Ceiling Crush & Raise
+	EV_DoCeiling(line,fastCrushAndRaise);
+	break;
+	
+      case 79:
+	// Lights Very Dark
+	EV_LightTurnOn(line,35);
+	break;
+	
+      case 80:
+	// Light Turn On - brightest near
+	EV_LightTurnOn(line,0);
+	break;
+	
+      case 81:
+	// Light Turn On 255
+	EV_LightTurnOn(line,255);
+	break;
+	
+      case 82:
+	// Lower Floor To Lowest
+	EV_DoFloor( line, lowerFloorToLowest );
+	break;
+	
+      case 83:
+	// Lower Floor
+	EV_DoFloor(line,lowerFloor);
+	break;
+
+      case 84:
+	// LowerAndChange
+	EV_DoFloor(line,lowerAndChange);
+	break;
+
+      case 86:
+	// Open Door
+	EV_DoDoor(line,vld_open);
+	break;
+	
+      case 87:
+	// Perpetual Platform Raise
+	EV_DoPlat(line,perpetualRaise,0);
+	break;
+	
+      case 88:
+	// PlatDownWaitUp
+	EV_DoPlat(line,downWaitUpStay,0);
+	break;
+	
+      case 89:
+	// Platform Stop
+	EV_StopPlat(line);
+	break;
+	
+      case 90:
+	// Raise Door
+	EV_DoDoor(line,vld_normal);
+	break;
+	
+      case 91:
+	// Raise Floor
+	EV_DoFloor(line,raiseFloor);
+	break;
+	
+      case 92:
+	// Raise Floor 24
+	EV_DoFloor(line,raiseFloor24);
+	break;
+	
+      case 93:
+	// Raise Floor 24 And Change
+	EV_DoFloor(line,raiseFloor24AndChange);
+	break;
+	
+      case 94:
+	// Raise Floor Crush
+	EV_DoFloor(line,raiseFloorCrush);
+	break;
+	
+      case 95:
+	// Raise floor to nearest height
+	// and change texture.
+	EV_DoPlat(line,raiseToNearestAndChange,0);
+	break;
+	
+      case 96:
+	// Raise floor to shortest texture height
+	// on either side of lines.
+	EV_DoFloor(line,raiseToTexture);
+	break;
+	
+      case 97:
+	// TELEPORT!
+	EV_Teleport( line, side, thing );
+	break;
+	
+      case 98:
+	// Lower Floor (TURBO)
+	EV_DoFloor(line,turboLower);
+	break;
+
+      case 105:
+	// Blazing Door Raise (faster than TURBO!)
+	EV_DoDoor (line,vld_blazeRaise);
+	break;
+	
+      case 106:
+	// Blazing Door Open (faster than TURBO!)
+	EV_DoDoor (line,vld_blazeOpen);
+	break;
+
+      case 107:
+	// Blazing Door Close (faster than TURBO!)
+	EV_DoDoor (line,vld_blazeClose);
+	break;
+
+      case 120:
+	// Blazing PlatDownWaitUpStay.
+	EV_DoPlat(line,blazeDWUS,0);
+	break;
+	
+      case 126:
+	// TELEPORT MonsterONLY.
+	if (!thing->player)
+	    EV_Teleport( line, side, thing );
+	break;
+	
+      case 128:
+	// Raise To Nearest Floor
+	EV_DoFloor(line,raiseFloorToNearest);
+	break;
+	
+      case 129:
+	// Raise Floor Turbo
+	EV_DoFloor(line,raiseFloorTurbo);
+	break;
+    }
+}
+
+
+
+//
+// P_ShootSpecialLine - IMPACT SPECIALS
+// Called when a thing shoots a special line.
+//
+void
+P_ShootSpecialLine
+( mobj_t*	thing,
+  line_t*	line )
+{
+    int		ok;
+    
+    //	Impacts that other things can activate.
+    if (!thing->player)
+    {
+	ok = 0;
+	switch(line->special)
+	{
+	  case 46:
+	    // OPEN DOOR IMPACT
+	    ok = 1;
+	    break;
+	}
+	if (!ok)
+	    return;
+    }
+
+    switch(line->special)
+    {
+      case 24:
+	// RAISE FLOOR
+	EV_DoFloor(line,raiseFloor);
+	P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 46:
+	// OPEN DOOR
+	EV_DoDoor(line,vld_open);
+	P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 47:
+	// RAISE FLOOR NEAR AND CHANGE
+	EV_DoPlat(line,raiseToNearestAndChange,0);
+	P_ChangeSwitchTexture(line,0);
+	break;
+    }
+}
+
+
+
+//
+// P_PlayerInSpecialSector
+// Called every tic frame
+//  that the player origin is in a special sector
+//
+void P_PlayerInSpecialSector (player_t* player)
+{
+    sector_t*	sector;
+	
+    sector = player->mo->subsector->sector;
+
+    // Falling, not all the way down yet?
+    if (player->mo->z != sector->floorheight)
+	return;	
+
+    // Has hitten ground.
+    switch (sector->special)
+    {
+      case 5:
+	// HELLSLIME DAMAGE
+	if (!player->powers[pw_ironfeet])
+	    if (!(leveltime&0x1f))
+		P_DamageMobj (player->mo, NULL, NULL, 10);
+	break;
+	
+      case 7:
+	// NUKAGE DAMAGE
+	if (!player->powers[pw_ironfeet])
+	    if (!(leveltime&0x1f))
+		P_DamageMobj (player->mo, NULL, NULL, 5);
+	break;
+	
+      case 16:
+	// SUPER HELLSLIME DAMAGE
+      case 4:
+	// STROBE HURT
+	if (!player->powers[pw_ironfeet]
+	    || (P_Random()<5) )
+	{
+	    if (!(leveltime&0x1f))
+		P_DamageMobj (player->mo, NULL, NULL, 20);
+	}
+	break;
+			
+      case 9:
+	// SECRET SECTOR
+	player->secretcount++;
+	sector->special = 0;
+	break;
+			
+      case 11:
+	// EXIT SUPER DAMAGE! (for E1M8 finale)
+	player->cheats &= ~CF_GODMODE;
+
+	if (!(leveltime&0x1f))
+	    P_DamageMobj (player->mo, NULL, NULL, 20);
+
+	if (player->health <= 10)
+	    G_ExitLevel();
+	break;
+			
+      default:
+	I_Error ("P_PlayerInSpecialSector: "
+		 "unknown special %i",
+		 sector->special);
+	break;
+    };
+}
+
+
+
+
+//
+// P_UpdateSpecials
+// Animate planes, scroll walls, etc.
+//
+boolean		levelTimer;
+int		levelTimeCount;
+
+void P_UpdateSpecials (void)
+{
+    anim_t*	anim;
+    int		pic;
+    int		i;
+    line_t*	line;
+
+    
+    //	LEVEL TIMER
+    if (levelTimer == true)
+    {
+	levelTimeCount--;
+	if (!levelTimeCount)
+	    G_ExitLevel();
+    }
+    
+    //	ANIMATE FLATS AND TEXTURES GLOBALLY
+    for (anim = anims ; anim < lastanim ; anim++)
+    {
+	for (i=anim->basepic ; i<anim->basepic+anim->numpics ; i++)
+	{
+	    pic = anim->basepic + ( (leveltime/anim->speed + i)%anim->numpics );
+	    if (anim->istexture)
+		texturetranslation[i] = pic;
+	    else
+		flattranslation[i] = pic;
+	}
+    }
+
+    
+    //	ANIMATE LINE SPECIALS
+    for (i = 0; i < numlinespecials; i++)
+    {
+	line = linespeciallist[i];
+	switch(line->special)
+	{
+	  case 48:
+	    // EFFECT FIRSTCOL SCROLL +
+	    sides[line->sidenum[0]].textureoffset += FRACUNIT;
+	    break;
+	}
+    }
+
+    
+    //	DO BUTTONS
+    for (i = 0; i < MAXBUTTONS; i++)
+	if (buttonlist[i].btimer)
+	{
+	    buttonlist[i].btimer--;
+	    if (!buttonlist[i].btimer)
+	    {
+		switch(buttonlist[i].where)
+		{
+		  case top:
+		    sides[buttonlist[i].line->sidenum[0]].toptexture =
+			buttonlist[i].btexture;
+		    break;
+		    
+		  case middle:
+		    sides[buttonlist[i].line->sidenum[0]].midtexture =
+			buttonlist[i].btexture;
+		    break;
+		    
+		  case bottom:
+		    sides[buttonlist[i].line->sidenum[0]].bottomtexture =
+			buttonlist[i].btexture;
+		    break;
+		}
+		S_StartSound(&buttonlist[i].soundorg,sfx_swtchn);
+		memset(&buttonlist[i],0,sizeof(button_t));
+	    }
+	}
+}
+
+
+//
+// Donut overrun emulation
+//
+// Derived from the code from PrBoom+.  Thanks go to Andrey Budko (entryway)
+// as usual :-)
+//
+
+#define DONUT_FLOORHEIGHT_DEFAULT 0x00000000
+#define DONUT_FLOORPIC_DEFAULT 0x16
+
+static void DonutOverrun(fixed_t *s3_floorheight, short *s3_floorpic,
+                         line_t *line, sector_t *pillar_sector)
+{
+    static int first = 1;
+    static int tmp_s3_floorheight;
+    static int tmp_s3_floorpic;
+
+    if (first)
+    {
+        int p;
+
+        // This is the first time we have had an overrun.
+        first = 0;
+
+        // Default values
+        tmp_s3_floorheight = DONUT_FLOORHEIGHT_DEFAULT;
+        tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
+
+        //!
+        // @category compat
+        // @arg <x> <y>
+        //
+        // Use the specified magic values when emulating behavior caused
+        // by memory overruns from improperly constructed donuts.
+        // In Vanilla Doom this can differ depending on the operating
+        // system.  The default (if this option is not specified) is to
+        // emulate the behavior when running under Windows 98.
+
+        p = M_CheckParmWithArgs("-donut", 2);
+
+        if (p > 0)
+        {
+            // Dump of needed memory: (fixed_t)0000:0000 and (short)0000:0008
+            //
+            // C:\>debug
+            // -d 0:0
+            //
+            // DOS 6.22:
+            // 0000:0000    (57 92 19 00) F4 06 70 00-(16 00)
+            // DOS 7.1:
+            // 0000:0000    (9E 0F C9 00) 65 04 70 00-(16 00)
+            // Win98:
+            // 0000:0000    (00 00 00 00) 65 04 70 00-(16 00)
+            // DOSBox under XP:
+            // 0000:0000    (00 00 00 F1) ?? ?? ?? 00-(07 00)
+
+            M_StrToInt(myargv[p + 1], &tmp_s3_floorheight);
+            M_StrToInt(myargv[p + 2], &tmp_s3_floorpic);
+
+            if (tmp_s3_floorpic >= numflats)
+            {
+                fprintf(stderr,
+                        "DonutOverrun: The second parameter for \"-donut\" "
+                        "switch should be greater than 0 and less than number "
+                        "of flats (%d). Using default value (%d) instead. \n",
+                        numflats, DONUT_FLOORPIC_DEFAULT);
+                tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
+            }
+        }
+    }
+
+    /*
+    fprintf(stderr,
+            "Linedef: %d; Sector: %d; "
+            "New floor height: %d; New floor pic: %d\n",
+            line->iLineID, pillar_sector->iSectorID,
+            tmp_s3_floorheight >> 16, tmp_s3_floorpic);
+     */
+
+    *s3_floorheight = (fixed_t) tmp_s3_floorheight;
+    *s3_floorpic = (short) tmp_s3_floorpic;
+}
+
+
+//
+// Special Stuff that can not be categorized
+//
+int EV_DoDonut(line_t*	line)
+{
+    sector_t*		s1;
+    sector_t*		s2;
+    sector_t*		s3;
+    int			secnum;
+    int			rtn;
+    int			i;
+    floormove_t*	floor;
+    fixed_t s3_floorheight;
+    short s3_floorpic;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	s1 = &sectors[secnum];
+
+	// ALREADY MOVING?  IF SO, KEEP GOING...
+	if (s1->specialdata)
+	    continue;
+
+	rtn = 1;
+	s2 = getNextSector(s1->lines[0],s1);
+
+        // Vanilla Doom does not check if the linedef is one sided.  The
+        // game does not crash, but reads invalid memory and causes the
+        // sector floor to move "down" to some unknown height.
+        // DOSbox prints a warning about an invalid memory access.
+        //
+        // I'm not sure exactly what invalid memory is being read.  This
+        // isn't something that should be done, anyway.
+        // Just print a warning and return.
+
+        if (s2 == NULL)
+        {
+            fprintf(stderr,
+                    "EV_DoDonut: linedef had no second sidedef! "
+                    "Unexpected behavior may occur in Vanilla Doom. \n");
+	    break;
+        }
+
+	for (i = 0; i < s2->linecount; i++)
+	{
+	    s3 = s2->lines[i]->backsector;
+
+	    if (s3 == s1)
+		continue;
+
+            if (s3 == NULL)
+            {
+                // e6y
+                // s3 is NULL, so
+                // s3->floorheight is an int at 0000:0000
+                // s3->floorpic is a short at 0000:0008
+                // Trying to emulate
+
+                fprintf(stderr,
+                        "EV_DoDonut: WARNING: emulating buffer overrun due to "
+                        "NULL back sector. "
+                        "Unexpected behavior may occur in Vanilla Doom.\n");
+
+                DonutOverrun(&s3_floorheight, &s3_floorpic, line, s1);
+            }
+            else
+            {
+                s3_floorheight = s3->floorheight;
+                s3_floorpic = s3->floorpic;
+            }
+
+	    //	Spawn rising slime
+	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+	    P_AddThinker (&floor->thinker);
+	    s2->specialdata = floor;
+	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+	    floor->type = donutRaise;
+	    floor->crush = false;
+	    floor->direction = 1;
+	    floor->sector = s2;
+	    floor->speed = FLOORSPEED / 2;
+	    floor->texture = s3_floorpic;
+	    floor->newspecial = 0;
+	    floor->floordestheight = s3_floorheight;
+	    
+	    //	Spawn lowering donut-hole
+	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+	    P_AddThinker (&floor->thinker);
+	    s1->specialdata = floor;
+	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+	    floor->type = lowerFloor;
+	    floor->crush = false;
+	    floor->direction = -1;
+	    floor->sector = s1;
+	    floor->speed = FLOORSPEED / 2;
+	    floor->floordestheight = s3_floorheight;
+	    break;
+	}
+    }
+    return rtn;
+}
+
+
+
+//
+// SPECIAL SPAWNING
+//
+
+//
+// P_SpawnSpecials
+// After the map has been loaded, scan for specials
+//  that spawn thinkers
+//
+
+static unsigned int NumScrollers()
+{
+    unsigned int i, scrollers = 0;
+
+    for (i = 0; i < numlines; i++)
+    {
+        if (48 == lines[i].special)
+        {
+            scrollers++;
+        }
+    }
+    return scrollers;
+}
+
+// Parses command line parameters.
+void P_SpawnSpecials (void)
+{
+    sector_t*	sector;
+    int		i;
+    short maxlineanims = (gameversion <= exe_doom_1_2) ? MAXLINEANIMS1_2
+        : MAXLINEANIMS;
+
+    // See if -TIMER was specified.
+
+    if (timelimit > 0 && deathmatch)
+    {
+        levelTimer = true;
+        levelTimeCount = timelimit * 60 * TICRATE;
+    }
+    else
+    {
+	levelTimer = false;
+    }
+
+    //	Init special SECTORs.
+    sector = sectors;
+    for (i=0 ; i<numsectors ; i++, sector++)
+    {
+	if (!sector->special)
+	    continue;
+	
+	switch (sector->special)
+	{
+	  case 1:
+	    // FLICKERING LIGHTS
+	    P_SpawnLightFlash (sector);
+	    break;
+
+	  case 2:
+	    // STROBE FAST
+	    P_SpawnStrobeFlash(sector,FASTDARK,0);
+	    break;
+	    
+	  case 3:
+	    // STROBE SLOW
+	    P_SpawnStrobeFlash(sector,SLOWDARK,0);
+	    break;
+	    
+	  case 4:
+	    // STROBE FAST/DEATH SLIME
+	    P_SpawnStrobeFlash(sector,FASTDARK,0);
+	    sector->special = 4;
+	    break;
+	    
+	  case 8:
+	    // GLOWING LIGHT
+	    P_SpawnGlowingLight(sector);
+	    break;
+	  case 9:
+	    // SECRET SECTOR
+	    totalsecret++;
+	    break;
+	    
+	  case 10:
+	    // DOOR CLOSE IN 30 SECONDS
+	    P_SpawnDoorCloseIn30 (sector);
+	    break;
+	    
+	  case 12:
+	    // SYNC STROBE SLOW
+	    P_SpawnStrobeFlash (sector, SLOWDARK, 1);
+	    break;
+
+	  case 13:
+	    // SYNC STROBE FAST
+	    P_SpawnStrobeFlash (sector, FASTDARK, 1);
+	    break;
+
+	  case 14:
+	    // DOOR RAISE IN 5 MINUTES
+	    P_SpawnDoorRaiseIn5Mins (sector, i);
+	    break;
+	    
+        case 17:
+            // first introduced in official v1.4 beta
+            if (gameversion > exe_doom_1_2)
+            {
+                P_SpawnFireFlicker(sector);
+            }
+            break;
+	}
+    }
+
+    
+    //	Init line EFFECTs
+    numlinespecials = 0;
+    for (i = 0;i < numlines; i++)
+    {
+	switch(lines[i].special)
+	{
+	  case 48:
+            if (numlinespecials >= maxlineanims)
+            {
+                I_Error("P_SpawnSpecials: Too many scrolling wall linedefs "
+                        "(%d)! (Vanilla limit is %d)", NumScrollers(),
+                        maxlineanims);
+            }
+	    // EFFECT FIRSTCOL SCROLL+
+	    linespeciallist[numlinespecials] = &lines[i];
+	    numlinespecials++;
+	    break;
+	}
+    }
+
+    
+    //	Init other misc stuff
+    for (i = 0;i < MAXCEILINGS;i++)
+	activeceilings[i] = NULL;
+
+    for (i = 0;i < MAXPLATS;i++)
+	activeplats[i] = NULL;
+    
+    for (i = 0;i < MAXBUTTONS;i++)
+	memset(&buttonlist[i],0,sizeof(button_t));
+
+    // UNUSED: no horizonal sliders.
+    //	P_InitSlidingDoorFrames();
+}
diff --git a/games/NXDoom/src/doom/p_spec.h b/games/NXDoom/src/doom/p_spec.h
new file mode 100644
index 000000000..a1343bfa3
--- /dev/null
+++ b/games/NXDoom/src/doom/p_spec.h
@@ -0,0 +1,637 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//	Implements special effects:
+//	Texture animation, height or lighting changes
+//	 according to adjacent sectors, respective
+//	 utility functions, etc.
+//
+
+
+#ifndef __P_SPEC__
+#define __P_SPEC__
+
+
+//
+// End-level timer (-TIMER option)
+//
+extern	boolean levelTimer;
+extern	int	levelTimeCount;
+
+
+//      Define values for map objects
+#define MO_TELEPORTMAN          14
+
+
+// at game start
+void    P_InitPicAnims (void);
+
+// at map load
+void    P_SpawnSpecials (void);
+
+// every tic
+void    P_UpdateSpecials (void);
+
+// when needed
+boolean
+P_UseSpecialLine
+( mobj_t*	thing,
+  line_t*	line,
+  int		side );
+
+void
+P_ShootSpecialLine
+( mobj_t*	thing,
+  line_t*	line );
+
+void
+P_CrossSpecialLine
+( int		linenum,
+  int		side,
+  mobj_t*	thing );
+
+void    P_PlayerInSpecialSector (player_t* player);
+
+int
+twoSided
+( int		sector,
+  int		line );
+
+sector_t*
+getSector
+( int		currentSector,
+  int		line,
+  int		side );
+
+side_t*
+getSide
+( int		currentSector,
+  int		line,
+  int		side );
+
+fixed_t P_FindLowestFloorSurrounding(sector_t* sec);
+fixed_t P_FindHighestFloorSurrounding(sector_t* sec);
+
+fixed_t
+P_FindNextHighestFloor
+( sector_t*	sec,
+  int		currentheight );
+
+fixed_t P_FindLowestCeilingSurrounding(sector_t* sec);
+fixed_t P_FindHighestCeilingSurrounding(sector_t* sec);
+
+int
+P_FindSectorFromLineTag
+( line_t*	line,
+  int		start );
+
+int
+P_FindMinSurroundingLight
+( sector_t*	sector,
+  int		max );
+
+sector_t*
+getNextSector
+( line_t*	line,
+  sector_t*	sec );
+
+
+//
+// SPECIAL
+//
+int EV_DoDonut(line_t* line);
+
+
+
+//
+// P_LIGHTS
+//
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		count;
+    int		maxlight;
+    int		minlight;
+    
+} fireflicker_t;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		count;
+    int		maxlight;
+    int		minlight;
+    int		maxtime;
+    int		mintime;
+    
+} lightflash_t;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		count;
+    int		minlight;
+    int		maxlight;
+    int		darktime;
+    int		brighttime;
+    
+} strobe_t;
+
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		minlight;
+    int		maxlight;
+    int		direction;
+
+} glow_t;
+
+
+#define GLOWSPEED			8
+#define STROBEBRIGHT		5
+#define FASTDARK			15
+#define SLOWDARK			35
+
+void    P_SpawnFireFlicker (sector_t* sector);
+void    T_LightFlash (lightflash_t* flash);
+void    P_SpawnLightFlash (sector_t* sector);
+void    T_StrobeFlash (strobe_t* flash);
+
+void
+P_SpawnStrobeFlash
+( sector_t*	sector,
+  int		fastOrSlow,
+  int		inSync );
+
+void    EV_StartLightStrobing(line_t* line);
+void    EV_TurnTagLightsOff(line_t* line);
+
+void
+EV_LightTurnOn
+( line_t*	line,
+  int		bright );
+
+void    T_Glow(glow_t* g);
+void    P_SpawnGlowingLight(sector_t* sector);
+
+
+
+
+//
+// P_SWITCH
+//
+typedef struct
+{
+    char	name1[9];
+    char	name2[9];
+    short	episode;
+    
+} switchlist_t;
+
+
+typedef enum
+{
+    top,
+    middle,
+    bottom
+
+} bwhere_e;
+
+
+typedef struct
+{
+    line_t*	line;
+    bwhere_e	where;
+    int		btexture;
+    int		btimer;
+    degenmobj_t *soundorg;
+
+} button_t;
+
+
+
+
+ // max # of wall switches in a level
+#define MAXSWITCHES		50
+
+ // 4 players, 4 buttons each at once, max.
+#define MAXBUTTONS		16
+
+ // 1 second, in ticks. 
+#define BUTTONTIME      35             
+
+extern button_t	buttonlist[MAXBUTTONS]; 
+
+void
+P_ChangeSwitchTexture
+( line_t*	line,
+  int		useAgain );
+
+void P_InitSwitchList(void);
+
+
+//
+// P_PLATS
+//
+typedef enum
+{
+    up,
+    down,
+    waiting,
+    in_stasis
+
+} plat_e;
+
+
+
+typedef enum
+{
+    perpetualRaise,
+    downWaitUpStay,
+    raiseAndChange,
+    raiseToNearestAndChange,
+    blazeDWUS
+
+} plattype_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    fixed_t	speed;
+    fixed_t	low;
+    fixed_t	high;
+    int		wait;
+    int		count;
+    plat_e	status;
+    plat_e	oldstatus;
+    boolean	crush;
+    int		tag;
+    plattype_e	type;
+    
+} plat_t;
+
+
+
+#define PLATWAIT		3
+#define PLATSPEED		FRACUNIT
+#define MAXPLATS		30
+
+
+extern plat_t*	activeplats[MAXPLATS];
+
+void    T_PlatRaise(plat_t*	plat);
+
+int
+EV_DoPlat
+( line_t*	line,
+  plattype_e	type,
+  int		amount );
+
+void    P_AddActivePlat(plat_t* plat);
+void    P_RemoveActivePlat(plat_t* plat);
+void    EV_StopPlat(line_t* line);
+void    P_ActivateInStasis(int tag);
+
+
+//
+// P_DOORS
+//
+typedef enum
+{
+    vld_normal,
+    vld_close30ThenOpen,
+    vld_close,
+    vld_open,
+    vld_raiseIn5Mins,
+    vld_blazeRaise,
+    vld_blazeOpen,
+    vld_blazeClose
+
+} vldoor_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    vldoor_e	type;
+    sector_t*	sector;
+    fixed_t	topheight;
+    fixed_t	speed;
+
+    // 1 = up, 0 = waiting at top, -1 = down
+    int             direction;
+    
+    // tics to wait at the top
+    int             topwait;
+    // (keep in case a door going down is reset)
+    // when it reaches 0, start going down
+    int             topcountdown;
+    
+} vldoor_t;
+
+
+
+#define VDOORSPEED		FRACUNIT*2
+#define VDOORWAIT		150
+
+void
+EV_VerticalDoor
+( line_t*	line,
+  mobj_t*	thing );
+
+int
+EV_DoDoor
+( line_t*	line,
+  vldoor_e	type );
+
+int
+EV_DoLockedDoor
+( line_t*	line,
+  vldoor_e	type,
+  mobj_t*	thing );
+
+void    T_VerticalDoor (vldoor_t* door);
+void    P_SpawnDoorCloseIn30 (sector_t* sec);
+
+void
+P_SpawnDoorRaiseIn5Mins
+( sector_t*	sec,
+  int		secnum );
+
+
+
+#if 0 // UNUSED
+//
+//      Sliding doors...
+//
+typedef enum
+{
+    sd_opening,
+    sd_waiting,
+    sd_closing
+
+} sd_e;
+
+
+
+typedef enum
+{
+    sdt_openOnly,
+    sdt_closeOnly,
+    sdt_openAndClose
+
+} sdt_e;
+
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sdt_e	type;
+    line_t*	line;
+    int		frame;
+    int		whichDoorIndex;
+    int		timer;
+    sector_t*	frontsector;
+    sector_t*	backsector;
+    sd_e	 status;
+
+} slidedoor_t;
+
+
+
+typedef struct
+{
+    char	frontFrame1[9];
+    char	frontFrame2[9];
+    char	frontFrame3[9];
+    char	frontFrame4[9];
+    char	backFrame1[9];
+    char	backFrame2[9];
+    char	backFrame3[9];
+    char	backFrame4[9];
+    
+} slidename_t;
+
+
+
+typedef struct
+{
+    int             frontFrames[4];
+    int             backFrames[4];
+
+} slideframe_t;
+
+
+
+// how many frames of animation
+#define SNUMFRAMES		4
+
+#define SDOORWAIT		35*3
+#define SWAITTICS		4
+
+// how many diff. types of anims
+#define MAXSLIDEDOORS	5                            
+
+void P_InitSlidingDoorFrames(void);
+
+void
+EV_SlidingDoor
+( line_t*	line,
+  mobj_t*	thing );
+#endif
+
+
+
+//
+// P_CEILNG
+//
+typedef enum
+{
+    lowerToFloor,
+    raiseToHighest,
+    lowerAndCrush,
+    crushAndRaise,
+    fastCrushAndRaise,
+    silentCrushAndRaise
+
+} ceiling_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    ceiling_e	type;
+    sector_t*	sector;
+    fixed_t	bottomheight;
+    fixed_t	topheight;
+    fixed_t	speed;
+    boolean	crush;
+
+    // 1 = up, 0 = waiting, -1 = down
+    int		direction;
+
+    // ID
+    int		tag;                   
+    int		olddirection;
+    
+} ceiling_t;
+
+
+
+
+
+#define CEILSPEED		FRACUNIT
+#define CEILWAIT		150
+#define MAXCEILINGS		30
+
+extern ceiling_t*	activeceilings[MAXCEILINGS];
+
+int
+EV_DoCeiling
+( line_t*	line,
+  ceiling_e	type );
+
+void    T_MoveCeiling (ceiling_t* ceiling);
+void    P_AddActiveCeiling(ceiling_t* c);
+void    P_RemoveActiveCeiling(ceiling_t* c);
+int	EV_CeilingCrushStop(line_t* line);
+void    P_ActivateInStasisCeiling(line_t* line);
+
+
+//
+// P_FLOOR
+//
+typedef enum
+{
+    // lower floor to highest surrounding floor
+    lowerFloor,
+    
+    // lower floor to lowest surrounding floor
+    lowerFloorToLowest,
+    
+    // lower floor to highest surrounding floor VERY FAST
+    turboLower,
+    
+    // raise floor to lowest surrounding CEILING
+    raiseFloor,
+    
+    // raise floor to next highest surrounding floor
+    raiseFloorToNearest,
+
+    // raise floor to shortest height texture around it
+    raiseToTexture,
+    
+    // lower floor to lowest surrounding floor
+    //  and change floorpic
+    lowerAndChange,
+  
+    raiseFloor24,
+    raiseFloor24AndChange,
+    raiseFloorCrush,
+
+     // raise to next highest floor, turbo-speed
+    raiseFloorTurbo,       
+    donutRaise,
+    raiseFloor512
+    
+} floor_e;
+
+
+
+
+typedef enum
+{
+    build8,	// slowly build by 8
+    turbo16	// quickly build by 16
+    
+} stair_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    floor_e	type;
+    boolean	crush;
+    sector_t*	sector;
+    int		direction;
+    int		newspecial;
+    short	texture;
+    fixed_t	floordestheight;
+    fixed_t	speed;
+
+} floormove_t;
+
+
+
+#define FLOORSPEED		FRACUNIT
+
+typedef enum
+{
+    ok,
+    crushed,
+    pastdest
+    
+} result_e;
+
+result_e
+T_MovePlane
+( sector_t*	sector,
+  fixed_t	speed,
+  fixed_t	dest,
+  boolean	crush,
+  int		floorOrCeiling,
+  int		direction );
+
+int
+EV_BuildStairs
+( line_t*	line,
+  stair_e	type );
+
+int
+EV_DoFloor
+( line_t*	line,
+  floor_e	floortype );
+
+void T_MoveFloor( floormove_t* floor);
+
+//
+// P_TELEPT
+//
+int
+EV_Teleport
+( line_t*	line,
+  int		side,
+  mobj_t*	thing );
+
+#endif
diff --git a/games/NXDoom/src/doom/p_switch.c b/games/NXDoom/src/doom/p_switch.c
new file mode 100644
index 000000000..b9ef2195a
--- /dev/null
+++ b/games/NXDoom/src/doom/p_switch.c
@@ -0,0 +1,641 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:
+//	Switches, buttons. Two-state animation. Exits.
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "deh_main.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "g_game.h"
+
+#include "s_sound.h"
+
+// Data.
+#include "sounds.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+
+//
+// CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
+//
+switchlist_t alphSwitchList[] =
+{
+    // Doom shareware episode 1 switches
+    {"SW1BRCOM",	"SW2BRCOM",	1},
+    {"SW1BRN1",	"SW2BRN1",	1},
+    {"SW1BRN2",	"SW2BRN2",	1},
+    {"SW1BRNGN",	"SW2BRNGN",	1},
+    {"SW1BROWN",	"SW2BROWN",	1},
+    {"SW1COMM",	"SW2COMM",	1},
+    {"SW1COMP",	"SW2COMP",	1},
+    {"SW1DIRT",	"SW2DIRT",	1},
+    {"SW1EXIT",	"SW2EXIT",	1},
+    {"SW1GRAY",	"SW2GRAY",	1},
+    {"SW1GRAY1",	"SW2GRAY1",	1},
+    {"SW1METAL",	"SW2METAL",	1},
+    {"SW1PIPE",	"SW2PIPE",	1},
+    {"SW1SLAD",	"SW2SLAD",	1},
+    {"SW1STARG",	"SW2STARG",	1},
+    {"SW1STON1",	"SW2STON1",	1},
+    {"SW1STON2",	"SW2STON2",	1},
+    {"SW1STONE",	"SW2STONE",	1},
+    {"SW1STRTN",	"SW2STRTN",	1},
+
+    // Doom registered episodes 2&3 switches
+    {"SW1BLUE",	"SW2BLUE",	2},
+    {"SW1CMT",		"SW2CMT",	2},
+    {"SW1GARG",	"SW2GARG",	2},
+    {"SW1GSTON",	"SW2GSTON",	2},
+    {"SW1HOT",		"SW2HOT",	2},
+    {"SW1LION",	"SW2LION",	2},
+    {"SW1SATYR",	"SW2SATYR",	2},
+    {"SW1SKIN",	"SW2SKIN",	2},
+    {"SW1VINE",	"SW2VINE",	2},
+    {"SW1WOOD",	"SW2WOOD",	2},
+
+    // Doom II switches
+    {"SW1PANEL",	"SW2PANEL",	3},
+    {"SW1ROCK",	"SW2ROCK",	3},
+    {"SW1MET2",	"SW2MET2",	3},
+    {"SW1WDMET",	"SW2WDMET",	3},
+    {"SW1BRIK",	"SW2BRIK",	3},
+    {"SW1MOD1",	"SW2MOD1",	3},
+    {"SW1ZIM",		"SW2ZIM",	3},
+    {"SW1STON6",	"SW2STON6",	3},
+    {"SW1TEK",		"SW2TEK",	3},
+    {"SW1MARB",	"SW2MARB",	3},
+    {"SW1SKULL",	"SW2SKULL",	3},
+};
+
+int		switchlist[MAXSWITCHES * 2];
+int		numswitches;
+button_t        buttonlist[MAXBUTTONS];
+
+//
+// P_InitSwitchList
+// Only called at game initialization.
+//
+void P_InitSwitchList(void)
+{
+    int i, slindex, episode;
+
+    // Note that this is called "episode" here but it's actually something
+    // quite different. As we progress from Shareware->Registered->Doom II
+    // we support more switch textures.
+    switch (gamemode)
+    {
+        case registered:
+        case retail:
+            episode = 2;
+            break;
+        case commercial:
+            episode = 3;
+            break;
+        default:
+            episode = 1;
+            break;
+    }
+
+    slindex = 0;
+
+    for (i = 0; i < arrlen(alphSwitchList); i++)
+    {
+	if (alphSwitchList[i].episode <= episode)
+	{
+	    switchlist[slindex++] =
+                R_TextureNumForName(DEH_String(alphSwitchList[i].name1));
+	    switchlist[slindex++] =
+                R_TextureNumForName(DEH_String(alphSwitchList[i].name2));
+	}
+    }
+
+    numswitches = slindex / 2;
+    switchlist[slindex] = -1;
+}
+
+
+//
+// Start a button counting down till it turns off.
+//
+void
+P_StartButton
+( line_t*	line,
+  bwhere_e	w,
+  int		texture,
+  int		time )
+{
+    int		i;
+    
+    // See if button is already pressed
+    for (i = 0;i < MAXBUTTONS;i++)
+    {
+	if (buttonlist[i].btimer
+	    && buttonlist[i].line == line)
+	{
+	    
+	    return;
+	}
+    }
+    
+
+    
+    for (i = 0;i < MAXBUTTONS;i++)
+    {
+	if (!buttonlist[i].btimer)
+	{
+	    buttonlist[i].line = line;
+	    buttonlist[i].where = w;
+	    buttonlist[i].btexture = texture;
+	    buttonlist[i].btimer = time;
+	    buttonlist[i].soundorg = &line->frontsector->soundorg;
+	    return;
+	}
+    }
+    
+    I_Error("P_StartButton: no button slots left!");
+}
+
+
+
+
+
+//
+// Function that changes wall texture.
+// Tell it if switch is ok to use again (1=yes, it's a button).
+//
+void
+P_ChangeSwitchTexture
+( line_t*	line,
+  int 		useAgain )
+{
+    int     texTop;
+    int     texMid;
+    int     texBot;
+    int     i;
+    int     sound;
+	
+    if (!useAgain)
+	line->special = 0;
+
+    texTop = sides[line->sidenum[0]].toptexture;
+    texMid = sides[line->sidenum[0]].midtexture;
+    texBot = sides[line->sidenum[0]].bottomtexture;
+	
+    sound = sfx_swtchn;
+
+    // EXIT SWITCH?
+    if (line->special == 11)                
+	sound = sfx_swtchx;
+	
+    for (i = 0;i < numswitches*2;i++)
+    {
+	if (switchlist[i] == texTop)
+	{
+	    S_StartSound(buttonlist->soundorg,sound);
+	    sides[line->sidenum[0]].toptexture = switchlist[i^1];
+
+	    if (useAgain)
+		P_StartButton(line,top,switchlist[i],BUTTONTIME);
+
+	    return;
+	}
+	else
+	{
+	    if (switchlist[i] == texMid)
+	    {
+		S_StartSound(buttonlist->soundorg,sound);
+		sides[line->sidenum[0]].midtexture = switchlist[i^1];
+
+		if (useAgain)
+		    P_StartButton(line, middle,switchlist[i],BUTTONTIME);
+
+		return;
+	    }
+	    else
+	    {
+		if (switchlist[i] == texBot)
+		{
+		    S_StartSound(buttonlist->soundorg,sound);
+		    sides[line->sidenum[0]].bottomtexture = switchlist[i^1];
+
+		    if (useAgain)
+			P_StartButton(line, bottom,switchlist[i],BUTTONTIME);
+
+		    return;
+		}
+	    }
+	}
+    }
+}
+
+
+
+
+
+
+//
+// P_UseSpecialLine
+// Called when a thing uses a special line.
+// Only the front sides of lines are usable.
+//
+boolean
+P_UseSpecialLine
+( mobj_t*	thing,
+  line_t*	line,
+  int		side )
+{               
+
+    // Err...
+    // Use the back sides of VERY SPECIAL lines...
+    if (side)
+    {
+	switch(line->special)
+	{
+	  case 124:
+	    // Sliding door open&close
+	    // UNUSED?
+	    break;
+
+	  default:
+	    return false;
+	    break;
+	}
+    }
+
+    
+    // Switches that other things can activate.
+    if (!thing->player)
+    {
+	// never open secret doors
+	if (line->flags & ML_SECRET)
+	    return false;
+	
+	switch(line->special)
+	{
+	  case 1: 	// MANUAL DOOR RAISE
+	  case 32:	// MANUAL BLUE
+	  case 33:	// MANUAL RED
+	  case 34:	// MANUAL YELLOW
+	    break;
+	    
+	  default:
+	    return false;
+	    break;
+	}
+    }
+
+    
+    // do something  
+    switch (line->special)
+    {
+	// MANUALS
+      case 1:		// Vertical Door
+      case 26:		// Blue Door/Locked
+      case 27:		// Yellow Door /Locked
+      case 28:		// Red Door /Locked
+
+      case 31:		// Manual door open
+      case 32:		// Blue locked door open
+      case 33:		// Red locked door open
+      case 34:		// Yellow locked door open
+
+      case 117:		// Blazing door raise
+      case 118:		// Blazing door open
+	EV_VerticalDoor (line, thing);
+	break;
+	
+	//UNUSED - Door Slide Open&Close
+	// case 124:
+	// EV_SlidingDoor (line, thing);
+	// break;
+
+	// SWITCHES
+      case 7:
+	// Build Stairs
+	if (EV_BuildStairs(line,build8))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+
+      case 9:
+	// Change Donut
+	if (EV_DoDonut(line))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 11:
+	// Exit level
+	P_ChangeSwitchTexture(line,0);
+	G_ExitLevel ();
+	break;
+	
+      case 14:
+	// Raise Floor 32 and change texture
+	if (EV_DoPlat(line,raiseAndChange,32))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 15:
+	// Raise Floor 24 and change texture
+	if (EV_DoPlat(line,raiseAndChange,24))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 18:
+	// Raise Floor to next highest floor
+	if (EV_DoFloor(line, raiseFloorToNearest))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 20:
+	// Raise Plat next highest floor and change texture
+	if (EV_DoPlat(line,raiseToNearestAndChange,0))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 21:
+	// PlatDownWaitUpStay
+	if (EV_DoPlat(line,downWaitUpStay,0))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 23:
+	// Lower Floor to Lowest
+	if (EV_DoFloor(line,lowerFloorToLowest))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 29:
+	// Raise Door
+	if (EV_DoDoor(line,vld_normal))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 41:
+	// Lower Ceiling to Floor
+	if (EV_DoCeiling(line,lowerToFloor))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 71:
+	// Turbo Lower Floor
+	if (EV_DoFloor(line,turboLower))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 49:
+	// Ceiling Crush And Raise
+	if (EV_DoCeiling(line,crushAndRaise))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 50:
+	// Close Door
+	if (EV_DoDoor(line,vld_close))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 51:
+	// Secret EXIT
+	P_ChangeSwitchTexture(line,0);
+	G_SecretExitLevel ();
+	break;
+	
+      case 55:
+	// Raise Floor Crush
+	if (EV_DoFloor(line,raiseFloorCrush))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 101:
+	// Raise Floor
+	if (EV_DoFloor(line,raiseFloor))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 102:
+	// Lower Floor to Surrounding floor height
+	if (EV_DoFloor(line,lowerFloor))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 103:
+	// Open Door
+	if (EV_DoDoor(line,vld_open))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 111:
+	// Blazing Door Raise (faster than TURBO!)
+	if (EV_DoDoor (line,vld_blazeRaise))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 112:
+	// Blazing Door Open (faster than TURBO!)
+	if (EV_DoDoor (line,vld_blazeOpen))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 113:
+	// Blazing Door Close (faster than TURBO!)
+	if (EV_DoDoor (line,vld_blazeClose))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 122:
+	// Blazing PlatDownWaitUpStay
+	if (EV_DoPlat(line,blazeDWUS,0))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 127:
+	// Build Stairs Turbo 16
+	if (EV_BuildStairs(line,turbo16))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 131:
+	// Raise Floor Turbo
+	if (EV_DoFloor(line,raiseFloorTurbo))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 133:
+	// BlzOpenDoor BLUE
+      case 135:
+	// BlzOpenDoor RED
+      case 137:
+	// BlzOpenDoor YELLOW
+	if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+      case 140:
+	// Raise Floor 512
+	if (EV_DoFloor(line,raiseFloor512))
+	    P_ChangeSwitchTexture(line,0);
+	break;
+	
+	// BUTTONS
+      case 42:
+	// Close Door
+	if (EV_DoDoor(line,vld_close))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 43:
+	// Lower Ceiling to Floor
+	if (EV_DoCeiling(line,lowerToFloor))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 45:
+	// Lower Floor to Surrounding floor height
+	if (EV_DoFloor(line,lowerFloor))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 60:
+	// Lower Floor to Lowest
+	if (EV_DoFloor(line,lowerFloorToLowest))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 61:
+	// Open Door
+	if (EV_DoDoor(line,vld_open))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 62:
+	// PlatDownWaitUpStay
+	if (EV_DoPlat(line,downWaitUpStay,1))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 63:
+	// Raise Door
+	if (EV_DoDoor(line,vld_normal))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 64:
+	// Raise Floor to ceiling
+	if (EV_DoFloor(line,raiseFloor))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 66:
+	// Raise Floor 24 and change texture
+	if (EV_DoPlat(line,raiseAndChange,24))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 67:
+	// Raise Floor 32 and change texture
+	if (EV_DoPlat(line,raiseAndChange,32))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 65:
+	// Raise Floor Crush
+	if (EV_DoFloor(line,raiseFloorCrush))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 68:
+	// Raise Plat to next highest floor and change texture
+	if (EV_DoPlat(line,raiseToNearestAndChange,0))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 69:
+	// Raise Floor to next highest floor
+	if (EV_DoFloor(line, raiseFloorToNearest))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 70:
+	// Turbo Lower Floor
+	if (EV_DoFloor(line,turboLower))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 114:
+	// Blazing Door Raise (faster than TURBO!)
+	if (EV_DoDoor (line,vld_blazeRaise))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 115:
+	// Blazing Door Open (faster than TURBO!)
+	if (EV_DoDoor (line,vld_blazeOpen))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 116:
+	// Blazing Door Close (faster than TURBO!)
+	if (EV_DoDoor (line,vld_blazeClose))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 123:
+	// Blazing PlatDownWaitUpStay
+	if (EV_DoPlat(line,blazeDWUS,0))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 132:
+	// Raise Floor Turbo
+	if (EV_DoFloor(line,raiseFloorTurbo))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 99:
+	// BlzOpenDoor BLUE
+      case 134:
+	// BlzOpenDoor RED
+      case 136:
+	// BlzOpenDoor YELLOW
+	if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
+	    P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 138:
+	// Light Turn On
+	EV_LightTurnOn(line,255);
+	P_ChangeSwitchTexture(line,1);
+	break;
+	
+      case 139:
+	// Light Turn Off
+	EV_LightTurnOn(line,35);
+	P_ChangeSwitchTexture(line,1);
+	break;
+			
+    }
+	
+    return true;
+}
+
diff --git a/games/NXDoom/src/doom/p_telept.c b/games/NXDoom/src/doom/p_telept.c
new file mode 100644
index 000000000..8e2d5e16c
--- /dev/null
+++ b/games/NXDoom/src/doom/p_telept.c
@@ -0,0 +1,132 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Teleportation.
+//
+
+
+
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "s_sound.h"
+
+#include "p_local.h"
+
+
+// Data.
+#include "sounds.h"
+
+// State.
+#include "r_state.h"
+
+
+
+//
+// TELEPORTATION
+//
+int
+EV_Teleport
+( line_t*	line,
+  int		side,
+  mobj_t*	thing )
+{
+    int		i;
+    int		tag;
+    mobj_t*	m;
+    mobj_t*	fog;
+    unsigned	an;
+    thinker_t*	thinker;
+    sector_t*	sector;
+    fixed_t	oldx;
+    fixed_t	oldy;
+    fixed_t	oldz;
+
+    // don't teleport missiles
+    if (thing->flags & MF_MISSILE)
+	return 0;		
+
+    // Don't teleport if hit back of line,
+    //  so you can get out of teleporter.
+    if (side == 1)		
+	return 0;	
+
+    
+    tag = line->tag;
+    for (i = 0; i < numsectors; i++)
+    {
+	if (sectors[ i ].tag == tag )
+	{
+	    for (thinker = thinkercap.next;
+		 thinker != &thinkercap;
+		 thinker = thinker->next)
+	    {
+		// not a mobj
+		if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
+		    continue;	
+
+		m = (mobj_t *)thinker;
+		
+		// not a teleportman
+		if (m->type != MT_TELEPORTMAN )
+		    continue;		
+
+		sector = m->subsector->sector;
+		// wrong sector
+		if (sector-sectors != i )
+		    continue;	
+
+		oldx = thing->x;
+		oldy = thing->y;
+		oldz = thing->z;
+				
+		if (!P_TeleportMove (thing, m->x, m->y))
+		    return 0;
+
+                // The first Final Doom executable does not set thing->z
+                // when teleporting. This quirk is unique to this
+                // particular version; the later version included in
+                // some versions of the Id Anthology fixed this.
+
+                if (gameversion != exe_final)
+		    thing->z = thing->floorz;
+
+		if (thing->player)
+		    thing->player->viewz = thing->z+thing->player->viewheight;
+
+		// spawn teleport fog at source and destination
+		fog = P_SpawnMobj (oldx, oldy, oldz, MT_TFOG);
+		S_StartSound (fog, sfx_telept);
+		an = m->angle >> ANGLETOFINESHIFT;
+		fog = P_SpawnMobj (m->x+20*finecosine[an], m->y+20*finesine[an]
+				   , thing->z, MT_TFOG);
+
+		// emit sound, where?
+		S_StartSound (fog, sfx_telept);
+		
+		// don't move for a bit
+		if (thing->player)
+		    thing->reactiontime = 18;	
+
+		thing->angle = m->angle;
+		thing->momx = thing->momy = thing->momz = 0;
+		return 1;
+	    }	
+	}
+    }
+    return 0;
+}
+
diff --git a/games/NXDoom/src/doom/p_tick.c b/games/NXDoom/src/doom/p_tick.c
new file mode 100644
index 000000000..5a93b80f1
--- /dev/null
+++ b/games/NXDoom/src/doom/p_tick.c
@@ -0,0 +1,153 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Archiving: SaveGame I/O.
+//	Thinker, Ticker.
+//
+
+
+#include "z_zone.h"
+#include "p_local.h"
+
+#include "doomstat.h"
+
+
+int	leveltime;
+
+//
+// THINKERS
+// All thinkers should be allocated by Z_Malloc
+// so they can be operated on uniformly.
+// The actual structures will vary in size,
+// but the first element must be thinker_t.
+//
+
+
+
+// Both the head and tail of the thinker list.
+thinker_t	thinkercap;
+
+
+//
+// P_InitThinkers
+//
+void P_InitThinkers (void)
+{
+    thinkercap.prev = thinkercap.next  = &thinkercap;
+}
+
+
+
+
+//
+// P_AddThinker
+// Adds a new thinker at the end of the list.
+//
+void P_AddThinker (thinker_t* thinker)
+{
+    thinkercap.prev->next = thinker;
+    thinker->next = &thinkercap;
+    thinker->prev = thinkercap.prev;
+    thinkercap.prev = thinker;
+}
+
+
+
+//
+// P_RemoveThinker
+// Deallocation is lazy -- it will not actually be freed
+// until its thinking turn comes up.
+//
+void P_RemoveThinker (thinker_t* thinker)
+{
+  // FIXME: NOP.
+  thinker->function.acv = (actionf_v)(-1);
+}
+
+
+
+//
+// P_AllocateThinker
+// Allocates memory and adds a new thinker at the end of the list.
+//
+void P_AllocateThinker (thinker_t*	thinker)
+{
+}
+
+
+
+//
+// P_RunThinkers
+//
+void P_RunThinkers (void)
+{
+    thinker_t *currentthinker, *nextthinker;
+
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+	if ( currentthinker->function.acv == (actionf_v)(-1) )
+	{
+	    // time to remove it
+            nextthinker = currentthinker->next;
+	    currentthinker->next->prev = currentthinker->prev;
+	    currentthinker->prev->next = currentthinker->next;
+	    Z_Free(currentthinker);
+	}
+	else
+	{
+	    if (currentthinker->function.acp1)
+		currentthinker->function.acp1 (currentthinker);
+            nextthinker = currentthinker->next;
+	}
+	currentthinker = nextthinker;
+    }
+}
+
+
+
+//
+// P_Ticker
+//
+
+void P_Ticker (void)
+{
+    int		i;
+    
+    // run the tic
+    if (paused)
+	return;
+		
+    // pause if in menu and at least one tic has been run
+    if ( !netgame
+	 && menuactive
+	 && !demoplayback
+	 && players[consoleplayer].viewz != 1)
+    {
+	return;
+    }
+    
+		
+    for (i=0 ; i<MAXPLAYERS ; i++)
+	if (playeringame[i])
+	    P_PlayerThink (&players[i]);
+			
+    P_RunThinkers ();
+    P_UpdateSpecials ();
+    P_RespawnSpecials ();
+
+    // for par times
+    leveltime++;	
+}
diff --git a/games/NXDoom/src/doom/p_tick.h b/games/NXDoom/src/doom/p_tick.h
new file mode 100644
index 000000000..ddfcd74fc
--- /dev/null
+++ b/games/NXDoom/src/doom/p_tick.h
@@ -0,0 +1,33 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	?
+//
+
+
+#ifndef __P_TICK__
+#define __P_TICK__
+
+
+
+
+// Called by C_Ticker,
+// can call G_PlayerExited.
+// Carries out all thinking of monsters and players.
+void P_Ticker (void);
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/p_user.c b/games/NXDoom/src/doom/p_user.c
new file mode 100644
index 000000000..772871ef9
--- /dev/null
+++ b/games/NXDoom/src/doom/p_user.c
@@ -0,0 +1,379 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Player related stuff.
+//	Bobbing POV/weapon, movement.
+//	Pending weapon.
+//
+
+
+
+
+#include "doomdef.h"
+#include "d_event.h"
+
+#include "p_local.h"
+
+#include "doomstat.h"
+
+
+
+// Index of the special effects (INVUL inverse) map.
+#define INVERSECOLORMAP		32
+
+
+//
+// Movement.
+//
+
+// 16 pixels of bob
+#define MAXBOB	0x100000	
+
+boolean		onground;
+
+
+//
+// P_Thrust
+// Moves the given origin along a given angle.
+//
+void
+P_Thrust
+( player_t*	player,
+  angle_t	angle,
+  fixed_t	move ) 
+{
+    angle >>= ANGLETOFINESHIFT;
+    
+    player->mo->momx += FixedMul(move,finecosine[angle]); 
+    player->mo->momy += FixedMul(move,finesine[angle]);
+}
+
+
+
+
+//
+// P_CalcHeight
+// Calculate the walking / running height adjustment
+//
+void P_CalcHeight (player_t* player) 
+{
+    int		angle;
+    fixed_t	bob;
+    
+    // Regular movement bobbing
+    // (needs to be calculated for gun swing
+    // even if not on ground)
+    // OPTIMIZE: tablify angle
+    // Note: a LUT allows for effects
+    //  like a ramp with low health.
+    player->bob =
+	FixedMul (player->mo->momx, player->mo->momx)
+	+ FixedMul (player->mo->momy,player->mo->momy);
+    
+    player->bob >>= 2;
+
+    if (player->bob>MAXBOB)
+	player->bob = MAXBOB;
+
+    if ((player->cheats & CF_NOMOMENTUM) || !onground)
+    {
+	player->viewz = player->mo->z + VIEWHEIGHT;
+
+	if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
+	    player->viewz = player->mo->ceilingz-4*FRACUNIT;
+
+	player->viewz = player->mo->z + player->viewheight;
+	return;
+    }
+		
+    angle = (FINEANGLES/20*leveltime)&FINEMASK;
+    bob = FixedMul ( player->bob/2, finesine[angle]);
+
+    
+    // move viewheight
+    if (player->playerstate == PST_LIVE)
+    {
+	player->viewheight += player->deltaviewheight;
+
+	if (player->viewheight > VIEWHEIGHT)
+	{
+	    player->viewheight = VIEWHEIGHT;
+	    player->deltaviewheight = 0;
+	}
+
+	if (player->viewheight < VIEWHEIGHT/2)
+	{
+	    player->viewheight = VIEWHEIGHT/2;
+	    if (player->deltaviewheight <= 0)
+		player->deltaviewheight = 1;
+	}
+	
+	if (player->deltaviewheight)	
+	{
+	    player->deltaviewheight += FRACUNIT/4;
+	    if (!player->deltaviewheight)
+		player->deltaviewheight = 1;
+	}
+    }
+    player->viewz = player->mo->z + player->viewheight + bob;
+
+    if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
+	player->viewz = player->mo->ceilingz-4*FRACUNIT;
+}
+
+
+
+//
+// P_MovePlayer
+//
+void P_MovePlayer (player_t* player)
+{
+    ticcmd_t*		cmd;
+	
+    cmd = &player->cmd;
+	
+    player->mo->angle += (cmd->angleturn<<FRACBITS);
+
+    // Do not let the player control movement
+    //  if not onground.
+    onground = (player->mo->z <= player->mo->floorz);
+	
+    if (cmd->forwardmove && onground)
+	P_Thrust (player, player->mo->angle, cmd->forwardmove*2048);
+    
+    if (cmd->sidemove && onground)
+	P_Thrust (player, player->mo->angle-ANG90, cmd->sidemove*2048);
+
+    if ( (cmd->forwardmove || cmd->sidemove) 
+	 && player->mo->state == &states[S_PLAY] )
+    {
+	P_SetMobjState (player->mo, S_PLAY_RUN1);
+    }
+}	
+
+
+
+//
+// P_DeathThink
+// Fall on your face when dying.
+// Decrease POV height to floor height.
+//
+#define ANG5   	(ANG90/18)
+
+void P_DeathThink (player_t* player)
+{
+    angle_t		angle;
+    angle_t		delta;
+
+    P_MovePsprites (player);
+	
+    // fall to the ground
+    if (player->viewheight > 6*FRACUNIT)
+	player->viewheight -= FRACUNIT;
+
+    if (player->viewheight < 6*FRACUNIT)
+	player->viewheight = 6*FRACUNIT;
+
+    player->deltaviewheight = 0;
+    onground = (player->mo->z <= player->mo->floorz);
+    P_CalcHeight (player);
+	
+    if (player->attacker && player->attacker != player->mo)
+    {
+	angle = R_PointToAngle2 (player->mo->x,
+				 player->mo->y,
+				 player->attacker->x,
+				 player->attacker->y);
+	
+	delta = angle - player->mo->angle;
+	
+	if (delta < ANG5 || delta > (unsigned)-ANG5)
+	{
+	    // Looking at killer,
+	    //  so fade damage flash down.
+	    player->mo->angle = angle;
+
+	    if (player->damagecount)
+		player->damagecount--;
+	}
+	else if (delta < ANG180)
+	    player->mo->angle += ANG5;
+	else
+	    player->mo->angle -= ANG5;
+    }
+    else if (player->damagecount)
+	player->damagecount--;
+	
+
+    if (player->cmd.buttons & BT_USE)
+	player->playerstate = PST_REBORN;
+}
+
+
+
+//
+// P_PlayerThink
+//
+void P_PlayerThink (player_t* player)
+{
+    ticcmd_t*		cmd;
+    weapontype_t	newweapon;
+	
+    // fixme: do this in the cheat code
+    if (player->cheats & CF_NOCLIP)
+	player->mo->flags |= MF_NOCLIP;
+    else
+	player->mo->flags &= ~MF_NOCLIP;
+    
+    // chain saw run forward
+    cmd = &player->cmd;
+    if (player->mo->flags & MF_JUSTATTACKED)
+    {
+	cmd->angleturn = 0;
+	cmd->forwardmove = 0xc800/512;
+	cmd->sidemove = 0;
+	player->mo->flags &= ~MF_JUSTATTACKED;
+    }
+			
+	
+    if (player->playerstate == PST_DEAD)
+    {
+	P_DeathThink (player);
+	return;
+    }
+    
+    // Move around.
+    // Reactiontime is used to prevent movement
+    //  for a bit after a teleport.
+    if (player->mo->reactiontime)
+	player->mo->reactiontime--;
+    else
+	P_MovePlayer (player);
+    
+    P_CalcHeight (player);
+
+    if (player->mo->subsector->sector->special)
+	P_PlayerInSpecialSector (player);
+    
+    // Check for weapon change.
+
+    // A special event has no other buttons.
+    if (cmd->buttons & BT_SPECIAL)
+	cmd->buttons = 0;			
+		
+    if (cmd->buttons & BT_CHANGE)
+    {
+	// The actual changing of the weapon is done
+	//  when the weapon psprite can do it
+	//  (read: not in the middle of an attack).
+	newweapon = (cmd->buttons&BT_WEAPONMASK)>>BT_WEAPONSHIFT;
+	
+	if (newweapon == wp_fist
+	    && player->weaponowned[wp_chainsaw]
+	    && !(player->readyweapon == wp_chainsaw
+		 && player->powers[pw_strength]))
+	{
+	    newweapon = wp_chainsaw;
+	}
+	
+	if ( (gamemode == commercial)
+	    && newweapon == wp_shotgun 
+	    && player->weaponowned[wp_supershotgun]
+	    && player->readyweapon != wp_supershotgun)
+	{
+	    newweapon = wp_supershotgun;
+	}
+	
+
+	if (player->weaponowned[newweapon]
+	    && newweapon != player->readyweapon)
+	{
+	    // Do not go to plasma or BFG in shareware,
+	    //  even if cheated.
+	    if ((newweapon != wp_plasma
+		 && newweapon != wp_bfg)
+		|| (gamemode != shareware) )
+	    {
+		player->pendingweapon = newweapon;
+	    }
+	}
+    }
+    
+    // check for use
+    if (cmd->buttons & BT_USE)
+    {
+	if (!player->usedown)
+	{
+	    P_UseLines (player);
+	    player->usedown = true;
+	}
+    }
+    else
+	player->usedown = false;
+    
+    // cycle psprites
+    P_MovePsprites (player);
+    
+    // Counters, time dependend power ups.
+
+    // Strength counts up to diminish fade.
+    if (player->powers[pw_strength])
+	player->powers[pw_strength]++;	
+		
+    if (player->powers[pw_invulnerability])
+	player->powers[pw_invulnerability]--;
+
+    if (player->powers[pw_invisibility])
+	if (! --player->powers[pw_invisibility] )
+	    player->mo->flags &= ~MF_SHADOW;
+			
+    if (player->powers[pw_infrared])
+	player->powers[pw_infrared]--;
+		
+    if (player->powers[pw_ironfeet])
+	player->powers[pw_ironfeet]--;
+		
+    if (player->damagecount)
+	player->damagecount--;
+		
+    if (player->bonuscount)
+	player->bonuscount--;
+
+    
+    // Handling colormaps.
+    if (player->powers[pw_invulnerability])
+    {
+	if (player->powers[pw_invulnerability] > 4*32
+	    || (player->powers[pw_invulnerability]&8) )
+	    player->fixedcolormap = INVERSECOLORMAP;
+	else
+	    player->fixedcolormap = 0;
+    }
+    else if (player->powers[pw_infrared])	
+    {
+	if (player->powers[pw_infrared] > 4*32
+	    || (player->powers[pw_infrared]&8) )
+	{
+	    // almost full bright
+	    player->fixedcolormap = 1;
+	}
+	else
+	    player->fixedcolormap = 0;
+    }
+    else
+	player->fixedcolormap = 0;
+}
+
+
diff --git a/games/NXDoom/src/doom/r_bsp.c b/games/NXDoom/src/doom/r_bsp.c
new file mode 100644
index 000000000..755d2eefc
--- /dev/null
+++ b/games/NXDoom/src/doom/r_bsp.c
@@ -0,0 +1,583 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	BSP traversal, handling of LineSegs for rendering.
+//
+
+
+
+
+#include "doomdef.h"
+
+#include "m_bbox.h"
+
+#include "i_system.h"
+
+#include "r_main.h"
+#include "r_plane.h"
+#include "r_things.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+//#include "r_local.h"
+
+
+
+seg_t*		curline;
+side_t*		sidedef;
+line_t*		linedef;
+sector_t*	frontsector;
+sector_t*	backsector;
+
+drawseg_t	drawsegs[MAXDRAWSEGS];
+drawseg_t*	ds_p;
+
+
+void
+R_StoreWallRange
+( int	start,
+  int	stop );
+
+
+
+
+//
+// R_ClearDrawSegs
+//
+void R_ClearDrawSegs (void)
+{
+    ds_p = drawsegs;
+}
+
+
+
+//
+// ClipWallSegment
+// Clips the given range of columns
+// and includes it in the new clip list.
+//
+typedef	struct
+{
+    int	first;
+    int last;
+    
+} cliprange_t;
+
+// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
+// that can be generated in a scene by the DOOM engine. This was determined by
+// Lee Killough during BOOM development to be a function of the screensize.
+// The simplest thing we can do, other than fix this bug, is to let the game
+// render overage and then bomb out by detecting the overflow after the 
+// fact. -haleyjd
+//#define MAXSEGS 32
+#define MAXSEGS (SCREENWIDTH / 2 + 1)
+
+// newend is one past the last valid seg
+cliprange_t*	newend;
+cliprange_t	solidsegs[MAXSEGS];
+
+
+
+
+//
+// R_ClipSolidWallSegment
+// Does handle solid walls,
+//  e.g. single sided LineDefs (middle texture)
+//  that entirely block the view.
+// 
+void
+R_ClipSolidWallSegment
+( int			first,
+  int			last )
+{
+    cliprange_t*	next;
+    cliprange_t*	start;
+
+    // Find the first range that touches the range
+    //  (adjacent pixels are touching).
+    start = solidsegs;
+    while (start->last < first-1)
+	start++;
+
+    if (first < start->first)
+    {
+	if (last < start->first-1)
+	{
+	    // Post is entirely visible (above start),
+	    //  so insert a new clippost.
+	    R_StoreWallRange (first, last);
+	    next = newend;
+	    newend++;
+	    
+	    while (next != start)
+	    {
+		*next = *(next-1);
+		next--;
+	    }
+	    next->first = first;
+	    next->last = last;
+	    return;
+	}
+		
+	// There is a fragment above *start.
+	R_StoreWallRange (first, start->first - 1);
+	// Now adjust the clip size.
+	start->first = first;	
+    }
+
+    // Bottom contained in start?
+    if (last <= start->last)
+	return;			
+		
+    next = start;
+    while (last >= (next+1)->first-1)
+    {
+	// There is a fragment between two posts.
+	R_StoreWallRange (next->last + 1, (next+1)->first - 1);
+	next++;
+	
+	if (last <= next->last)
+	{
+	    // Bottom is contained in next.
+	    // Adjust the clip size.
+	    start->last = next->last;	
+	    goto crunch;
+	}
+    }
+	
+    // There is a fragment after *next.
+    R_StoreWallRange (next->last + 1, last);
+    // Adjust the clip size.
+    start->last = last;
+	
+    // Remove start+1 to next from the clip list,
+    // because start now covers their area.
+  crunch:
+    if (next == start)
+    {
+	// Post just extended past the bottom of one post.
+	return;
+    }
+    
+
+    while (next++ != newend)
+    {
+	// Remove a post.
+	*++start = *next;
+    }
+
+    newend = start+1;
+}
+
+
+
+//
+// R_ClipPassWallSegment
+// Clips the given range of columns,
+//  but does not includes it in the clip list.
+// Does handle windows,
+//  e.g. LineDefs with upper and lower texture.
+//
+void
+R_ClipPassWallSegment
+( int	first,
+  int	last )
+{
+    cliprange_t*	start;
+
+    // Find the first range that touches the range
+    //  (adjacent pixels are touching).
+    start = solidsegs;
+    while (start->last < first-1)
+	start++;
+
+    if (first < start->first)
+    {
+	if (last < start->first-1)
+	{
+	    // Post is entirely visible (above start).
+	    R_StoreWallRange (first, last);
+	    return;
+	}
+		
+	// There is a fragment above *start.
+	R_StoreWallRange (first, start->first - 1);
+    }
+
+    // Bottom contained in start?
+    if (last <= start->last)
+	return;			
+		
+    while (last >= (start+1)->first-1)
+    {
+	// There is a fragment between two posts.
+	R_StoreWallRange (start->last + 1, (start+1)->first - 1);
+	start++;
+	
+	if (last <= start->last)
+	    return;
+    }
+	
+    // There is a fragment after *next.
+    R_StoreWallRange (start->last + 1, last);
+}
+
+
+
+//
+// R_ClearClipSegs
+//
+void R_ClearClipSegs (void)
+{
+    solidsegs[0].first = -0x7fffffff;
+    solidsegs[0].last = -1;
+    solidsegs[1].first = viewwidth;
+    solidsegs[1].last = 0x7fffffff;
+    newend = solidsegs+2;
+}
+
+//
+// R_AddLine
+// Clips the given segment
+// and adds any visible pieces to the line list.
+//
+void R_AddLine (seg_t*	line)
+{
+    int			x1;
+    int			x2;
+    angle_t		angle1;
+    angle_t		angle2;
+    angle_t		span;
+    angle_t		tspan;
+    
+    curline = line;
+
+    // OPTIMIZE: quickly reject orthogonal back sides.
+    angle1 = R_PointToAngle (line->v1->x, line->v1->y);
+    angle2 = R_PointToAngle (line->v2->x, line->v2->y);
+    
+    // Clip to view edges.
+    // OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW).
+    span = angle1 - angle2;
+    
+    // Back side? I.e. backface culling?
+    if (span >= ANG180)
+	return;		
+
+    // Global angle needed by segcalc.
+    rw_angle1 = angle1;
+    angle1 -= viewangle;
+    angle2 -= viewangle;
+	
+    tspan = angle1 + clipangle;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return;
+	
+	angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return;	
+	angle2 = -clipangle;
+    }
+    
+    // The seg is in the view range,
+    // but not necessarily visible.
+    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
+    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
+    x1 = viewangletox[angle1];
+    x2 = viewangletox[angle2];
+
+    // Does not cross a pixel?
+    if (x1 == x2)
+	return;				
+	
+    backsector = line->backsector;
+
+    // Single sided line?
+    if (!backsector)
+	goto clipsolid;		
+
+    // Closed door.
+    if (backsector->ceilingheight <= frontsector->floorheight
+	|| backsector->floorheight >= frontsector->ceilingheight)
+	goto clipsolid;		
+
+    // Window.
+    if (backsector->ceilingheight != frontsector->ceilingheight
+	|| backsector->floorheight != frontsector->floorheight)
+	goto clippass;	
+		
+    // Reject empty lines used for triggers
+    //  and special events.
+    // Identical floor and ceiling on both sides,
+    // identical light levels on both sides,
+    // and no middle texture.
+    if (backsector->ceilingpic == frontsector->ceilingpic
+	&& backsector->floorpic == frontsector->floorpic
+	&& backsector->lightlevel == frontsector->lightlevel
+	&& curline->sidedef->midtexture == 0)
+    {
+	return;
+    }
+    
+				
+  clippass:
+    R_ClipPassWallSegment (x1, x2-1);	
+    return;
+		
+  clipsolid:
+    R_ClipSolidWallSegment (x1, x2-1);
+}
+
+
+//
+// R_CheckBBox
+// Checks BSP node/subtree bounding box.
+// Returns true
+//  if some part of the bbox might be visible.
+//
+int	checkcoord[12][4] =
+{
+    {3,0,2,1},
+    {3,0,2,0},
+    {3,1,2,0},
+    {0},
+    {2,0,2,1},
+    {0,0,0,0},
+    {3,1,3,0},
+    {0},
+    {2,0,3,1},
+    {2,1,3,1},
+    {2,1,3,0}
+};
+
+
+boolean R_CheckBBox (fixed_t*	bspcoord)
+{
+    int			boxx;
+    int			boxy;
+    int			boxpos;
+
+    fixed_t		x1;
+    fixed_t		y1;
+    fixed_t		x2;
+    fixed_t		y2;
+    
+    angle_t		angle1;
+    angle_t		angle2;
+    angle_t		span;
+    angle_t		tspan;
+    
+    cliprange_t*	start;
+
+    int			sx1;
+    int			sx2;
+    
+    // Find the corners of the box
+    // that define the edges from current viewpoint.
+    if (viewx <= bspcoord[BOXLEFT])
+	boxx = 0;
+    else if (viewx < bspcoord[BOXRIGHT])
+	boxx = 1;
+    else
+	boxx = 2;
+		
+    if (viewy >= bspcoord[BOXTOP])
+	boxy = 0;
+    else if (viewy > bspcoord[BOXBOTTOM])
+	boxy = 1;
+    else
+	boxy = 2;
+		
+    boxpos = (boxy<<2)+boxx;
+    if (boxpos == 5)
+	return true;
+	
+    x1 = bspcoord[checkcoord[boxpos][0]];
+    y1 = bspcoord[checkcoord[boxpos][1]];
+    x2 = bspcoord[checkcoord[boxpos][2]];
+    y2 = bspcoord[checkcoord[boxpos][3]];
+    
+    // check clip list for an open space
+    angle1 = R_PointToAngle (x1, y1) - viewangle;
+    angle2 = R_PointToAngle (x2, y2) - viewangle;
+	
+    span = angle1 - angle2;
+
+    // Sitting on a line?
+    if (span >= ANG180)
+	return true;
+    
+    tspan = angle1 + clipangle;
+
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return false;	
+
+	angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return false;
+	
+	angle2 = -clipangle;
+    }
+
+
+    // Find the first clippost
+    //  that touches the source post
+    //  (adjacent pixels are touching).
+    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
+    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
+    sx1 = viewangletox[angle1];
+    sx2 = viewangletox[angle2];
+
+    // Does not cross a pixel.
+    if (sx1 == sx2)
+	return false;			
+    sx2--;
+	
+    start = solidsegs;
+    while (start->last < sx2)
+	start++;
+    
+    if (sx1 >= start->first
+	&& sx2 <= start->last)
+    {
+	// The clippost contains the new span.
+	return false;
+    }
+
+    return true;
+}
+
+
+
+//
+// R_Subsector
+// Determine floor/ceiling planes.
+// Add sprites of things in sector.
+// Draw one or more line segments.
+//
+void R_Subsector (int num)
+{
+    int			count;
+    seg_t*		line;
+    subsector_t*	sub;
+	
+#ifdef RANGECHECK
+    if (num>=numsubsectors)
+	I_Error ("R_Subsector: ss %i with numss = %i",
+		 num,
+		 numsubsectors);
+#endif
+
+    sscount++;
+    sub = &subsectors[num];
+    frontsector = sub->sector;
+    count = sub->numlines;
+    line = &segs[sub->firstline];
+
+    if (frontsector->floorheight < viewz)
+    {
+	floorplane = R_FindPlane (frontsector->floorheight,
+				  frontsector->floorpic,
+				  frontsector->lightlevel);
+    }
+    else
+	floorplane = NULL;
+    
+    if (frontsector->ceilingheight > viewz 
+	|| frontsector->ceilingpic == skyflatnum)
+    {
+	ceilingplane = R_FindPlane (frontsector->ceilingheight,
+				    frontsector->ceilingpic,
+				    frontsector->lightlevel);
+    }
+    else
+	ceilingplane = NULL;
+		
+    R_AddSprites (frontsector);	
+
+    while (count--)
+    {
+	R_AddLine (line);
+	line++;
+    }
+
+    // check for solidsegs overflow - extremely unsatisfactory!
+    if(newend > &solidsegs[32])
+        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
+}
+
+
+
+
+//
+// RenderBSPNode
+// Renders all subsectors below a given node,
+//  traversing subtree recursively.
+// Just call with BSP root.
+void R_RenderBSPNode (int bspnum)
+{
+    node_t*	bsp;
+    int		side;
+
+    // Found a subsector?
+    if (bspnum & NF_SUBSECTOR)
+    {
+	if (bspnum == -1)			
+	    R_Subsector (0);
+	else
+	    R_Subsector (bspnum&(~NF_SUBSECTOR));
+	return;
+    }
+		
+    bsp = &nodes[bspnum];
+    
+    // Decide which side the view point is on.
+    side = R_PointOnSide (viewx, viewy, bsp);
+
+    // Recursively divide front space.
+    R_RenderBSPNode (bsp->children[side]); 
+
+    // Possibly divide back space.
+    if (R_CheckBBox (bsp->bbox[side^1]))	
+	R_RenderBSPNode (bsp->children[side^1]);
+}
+
+
diff --git a/games/NXDoom/src/doom/r_bsp.h b/games/NXDoom/src/doom/r_bsp.h
new file mode 100644
index 000000000..1723e6861
--- /dev/null
+++ b/games/NXDoom/src/doom/r_bsp.h
@@ -0,0 +1,61 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh module, BSP traversal and handling.
+//
+
+
+#ifndef __R_BSP__
+#define __R_BSP__
+
+
+
+extern seg_t*		curline;
+extern side_t*		sidedef;
+extern line_t*		linedef;
+extern sector_t*	frontsector;
+extern sector_t*	backsector;
+
+extern int		rw_x;
+extern int		rw_stopx;
+
+extern boolean		segtextured;
+
+// false if the back side is the same plane
+extern boolean		markfloor;		
+extern boolean		markceiling;
+
+extern boolean		skymap;
+
+extern drawseg_t	drawsegs[MAXDRAWSEGS];
+extern drawseg_t*	ds_p;
+
+extern lighttable_t**	hscalelight;
+extern lighttable_t**	vscalelight;
+extern lighttable_t**	dscalelight;
+
+
+typedef void (*drawfunc_t) (int start, int stop);
+
+
+// BSP?
+void R_ClearClipSegs (void);
+void R_ClearDrawSegs (void);
+
+
+void R_RenderBSPNode (int bspnum);
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_data.c b/games/NXDoom/src/doom/r_data.c
new file mode 100644
index 000000000..7f1bbbe00
--- /dev/null
+++ b/games/NXDoom/src/doom/r_data.c
@@ -0,0 +1,904 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Preparation of data for rendering,
+//	generation of lookups, caching, retrieval by name.
+//
+
+#include <stdio.h>
+
+#include "deh_main.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "z_zone.h"
+
+
+#include "w_wad.h"
+
+#include "doomdef.h"
+#include "m_misc.h"
+#include "r_local.h"
+#include "p_local.h"
+
+#include "doomstat.h"
+#include "r_sky.h"
+
+
+#include "r_data.h"
+
+//
+// Graphics.
+// DOOM graphics for walls and sprites
+// is stored in vertical runs of opaque pixels (posts).
+// A column is composed of zero or more posts,
+// a patch or sprite is composed of zero or more columns.
+// 
+
+
+
+//
+// Texture definition.
+// Each texture is composed of one or more patches,
+// with patches being lumps stored in the WAD.
+// The lumps are referenced by number, and patched
+// into the rectangular texture space using origin
+// and possibly other attributes.
+//
+typedef PACKED_STRUCT (
+{
+    short	originx;
+    short	originy;
+    short	patch;
+    short	stepdir;
+    short	colormap;
+}) mappatch_t;
+
+
+//
+// Texture definition.
+// A DOOM wall texture is a list of patches
+// which are to be combined in a predefined order.
+//
+typedef PACKED_STRUCT (
+{
+    char		name[8];
+    int			masked;	
+    short		width;
+    short		height;
+    int                 obsolete;
+    short		patchcount;
+    mappatch_t	patches[1];
+}) maptexture_t;
+
+
+// A single patch from a texture definition,
+//  basically a rectangular area within
+//  the texture rectangle.
+typedef struct
+{
+    // Block origin (allways UL),
+    // which has allready accounted
+    // for the internal origin of the patch.
+    short	originx;	
+    short	originy;
+    int		patch;
+} texpatch_t;
+
+
+// A maptexturedef_t describes a rectangular texture,
+//  which is composed of one or more mappatch_t structures
+//  that arrange graphic patches.
+
+typedef struct texture_s texture_t;
+
+struct texture_s
+{
+    // Keep name for switch changing, etc.
+    char	name[8];		
+    short	width;
+    short	height;
+
+    // Index in textures list
+
+    int         index;
+
+    // Next in hash table chain
+
+    texture_t  *next;
+    
+    // All the patches[patchcount]
+    //  are drawn back to front into the cached texture.
+    short	patchcount;
+    texpatch_t	patches[1];		
+};
+
+
+
+int		firstflat;
+int		lastflat;
+int		numflats;
+
+int		firstpatch;
+int		lastpatch;
+int		numpatches;
+
+int		firstspritelump;
+int		lastspritelump;
+int		numspritelumps;
+
+int		numtextures;
+texture_t**	textures;
+texture_t**     textures_hashtable;
+
+
+int*			texturewidthmask;
+// needed for texture pegging
+fixed_t*		textureheight;		
+int*			texturecompositesize;
+short**			texturecolumnlump;
+unsigned short**	texturecolumnofs;
+byte**			texturecomposite;
+
+// for global animation
+int*		flattranslation;
+int*		texturetranslation;
+
+// needed for pre rendering
+fixed_t*	spritewidth;	
+fixed_t*	spriteoffset;
+fixed_t*	spritetopoffset;
+
+lighttable_t	*colormaps;
+
+
+//
+// MAPTEXTURE_T CACHING
+// When a texture is first needed,
+//  it counts the number of composite columns
+//  required in the texture and allocates space
+//  for a column directory and any new columns.
+// The directory will simply point inside other patches
+//  if there is only one patch in a given column,
+//  but any columns with multiple patches
+//  will have new column_ts generated.
+//
+
+
+
+//
+// R_DrawColumnInCache
+// Clip and draw a column
+//  from a patch into a cached post.
+//
+void
+R_DrawColumnInCache
+( column_t*	patch,
+  byte*		cache,
+  int		originy,
+  int		cacheheight )
+{
+    int		count;
+    int		position;
+    byte*	source;
+
+    while (patch->topdelta != 0xff)
+    {
+	source = (byte *)patch + 3;
+	count = patch->length;
+	position = originy + patch->topdelta;
+
+	if (position < 0)
+	{
+	    count += position;
+	    position = 0;
+	}
+
+	if (position + count > cacheheight)
+	    count = cacheheight - position;
+
+	if (count > 0)
+	    memcpy (cache + position, source, count);
+		
+	patch = (column_t *)(  (byte *)patch + patch->length + 4); 
+    }
+}
+
+
+
+//
+// R_GenerateComposite
+// Using the texture definition,
+//  the composite texture is created from the patches,
+//  and each column is cached.
+//
+void R_GenerateComposite (int texnum)
+{
+    byte*		block;
+    texture_t*		texture;
+    texpatch_t*		patch;	
+    patch_t*		realpatch;
+    int			x;
+    int			x1;
+    int			x2;
+    int			i;
+    column_t*		patchcol;
+    short*		collump;
+    unsigned short*	colofs;
+	
+    texture = textures[texnum];
+
+    block = Z_Malloc (texturecompositesize[texnum],
+		      PU_STATIC, 
+		      &texturecomposite[texnum]);	
+
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+    
+    // Composite the columns together.
+    for (i=0 , patch = texture->patches;
+	 i<texture->patchcount;
+	 i++, patch++)
+    {
+	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
+	x1 = patch->originx;
+	x2 = x1 + SHORT(realpatch->width);
+
+	if (x1<0)
+	    x = 0;
+	else
+	    x = x1;
+	
+	if (x2 > texture->width)
+	    x2 = texture->width;
+
+	for ( ; x<x2 ; x++)
+	{
+	    // Column does not have multiple patches?
+	    if (collump[x] >= 0)
+		continue;
+	    
+	    patchcol = (column_t *)((byte *)realpatch
+				    + LONG(realpatch->columnofs[x-x1]));
+	    R_DrawColumnInCache (patchcol,
+				 block + colofs[x],
+				 patch->originy,
+				 texture->height);
+	}
+						
+    }
+
+    // Now that the texture has been built in column cache,
+    //  it is purgable from zone memory.
+    Z_ChangeTag (block, PU_CACHE);
+}
+
+
+
+//
+// R_GenerateLookup
+//
+void R_GenerateLookup (int texnum)
+{
+    texture_t*		texture;
+    byte*		patchcount;	// patchcount[texture->width]
+    texpatch_t*		patch;	
+    patch_t*		realpatch;
+    int			x;
+    int			x1;
+    int			x2;
+    int			i;
+    short*		collump;
+    unsigned short*	colofs;
+	
+    texture = textures[texnum];
+
+    // Composited texture not created yet.
+    texturecomposite[texnum] = 0;
+    
+    texturecompositesize[texnum] = 0;
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+    
+    // Now count the number of columns
+    //  that are covered by more than one patch.
+    // Fill in the lump / offset, so columns
+    //  with only a single patch are all done.
+    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
+    memset (patchcount, 0, texture->width);
+
+    for (i=0 , patch = texture->patches;
+	 i<texture->patchcount;
+	 i++, patch++)
+    {
+	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
+	x1 = patch->originx;
+	x2 = x1 + SHORT(realpatch->width);
+	
+	if (x1 < 0)
+	    x = 0;
+	else
+	    x = x1;
+
+	if (x2 > texture->width)
+	    x2 = texture->width;
+	for ( ; x<x2 ; x++)
+	{
+	    patchcount[x]++;
+	    collump[x] = patch->patch;
+	    colofs[x] = LONG(realpatch->columnofs[x-x1])+3;
+	}
+    }
+	
+    for (x=0 ; x<texture->width ; x++)
+    {
+	if (!patchcount[x])
+	{
+	    printf ("R_GenerateLookup: column without a patch (%s)\n",
+		    texture->name);
+	    return;
+	}
+	// I_Error ("R_GenerateLookup: column without a patch");
+	
+	if (patchcount[x] > 1)
+	{
+	    // Use the cached block.
+	    collump[x] = -1;	
+	    colofs[x] = texturecompositesize[texnum];
+	    
+	    if (texturecompositesize[texnum] > 0x10000-texture->height)
+	    {
+		I_Error ("R_GenerateLookup: texture %i is >64k",
+			 texnum);
+	    }
+	    
+	    texturecompositesize[texnum] += texture->height;
+	}
+    }
+
+    Z_Free(patchcount);
+}
+
+
+
+
+//
+// R_GetColumn
+//
+byte*
+R_GetColumn
+( int		tex,
+  int		col )
+{
+    int		lump;
+    int		ofs;
+	
+    col &= texturewidthmask[tex];
+    lump = texturecolumnlump[tex][col];
+    ofs = texturecolumnofs[tex][col];
+    
+    if (lump > 0)
+	return (byte *)W_CacheLumpNum(lump,PU_CACHE)+ofs;
+
+    if (!texturecomposite[tex])
+	R_GenerateComposite (tex);
+
+    return texturecomposite[tex] + ofs;
+}
+
+
+static void GenerateTextureHashTable(void)
+{
+    texture_t **rover;
+    int i;
+    int key;
+
+    textures_hashtable 
+            = Z_Malloc(sizeof(texture_t *) * numtextures, PU_STATIC, 0);
+
+    memset(textures_hashtable, 0, sizeof(texture_t *) * numtextures);
+
+    // Add all textures to hash table
+
+    for (i=0; i<numtextures; ++i)
+    {
+        // Store index
+
+        textures[i]->index = i;
+
+        // Vanilla Doom does a linear search of the texures array
+        // and stops at the first entry it finds.  If there are two
+        // entries with the same name, the first one in the array
+        // wins. The new entry must therefore be added at the end
+        // of the hash chain, so that earlier entries win.
+
+        key = W_LumpNameHash(textures[i]->name) % numtextures;
+
+        rover = &textures_hashtable[key];
+
+        while (*rover != NULL)
+        {
+            rover = &(*rover)->next;
+        }
+
+        // Hook into hash table
+
+        textures[i]->next = NULL;
+        *rover = textures[i];
+    }
+}
+
+
+//
+// R_InitTextures
+// Initializes the texture list
+//  with the textures from the world map.
+//
+void R_InitTextures (void)
+{
+    maptexture_t*	mtexture;
+    texture_t*		texture;
+    mappatch_t*		mpatch;
+    texpatch_t*		patch;
+
+    int			i;
+    int			j;
+
+    int*		maptex;
+    int*		maptex2;
+    int*		maptex1;
+    
+    char		name[9];
+    char*		names;
+    char*		name_p;
+    
+    int*		patchlookup;
+    
+    int			nummappatches;
+    int			offset;
+    int			maxoff;
+    int			maxoff2;
+    int			numtextures1;
+    int			numtextures2;
+
+    int*		directory;
+    
+    int			temp1;
+    int			temp2;
+    int			temp3;
+
+    
+    // Load the patch names from pnames.lmp.
+    name[8] = 0;
+    names = W_CacheLumpName (DEH_String("PNAMES"), PU_STATIC);
+    nummappatches = LONG ( *((int *)names) );
+    name_p = names + 4;
+    patchlookup = Z_Malloc(nummappatches*sizeof(*patchlookup), PU_STATIC, NULL);
+
+    for (i = 0; i < nummappatches; i++)
+    {
+        M_StringCopy(name, name_p + i * 8, sizeof(name));
+        patchlookup[i] = W_CheckNumForName(name);
+    }
+    W_ReleaseLumpName(DEH_String("PNAMES"));
+
+    // Load the map texture definitions from textures.lmp.
+    // The data is contained in one or two lumps,
+    //  TEXTURE1 for shareware, plus TEXTURE2 for commercial.
+    maptex = maptex1 = W_CacheLumpName (DEH_String("TEXTURE1"), PU_STATIC);
+    numtextures1 = LONG(*maptex);
+    maxoff = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE1")));
+    directory = maptex+1;
+	
+    if (W_CheckNumForName (DEH_String("TEXTURE2")) != -1)
+    {
+	maptex2 = W_CacheLumpName (DEH_String("TEXTURE2"), PU_STATIC);
+	numtextures2 = LONG(*maptex2);
+	maxoff2 = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE2")));
+    }
+    else
+    {
+	maptex2 = NULL;
+	numtextures2 = 0;
+	maxoff2 = 0;
+    }
+    numtextures = numtextures1 + numtextures2;
+	
+    textures = Z_Malloc (numtextures * sizeof(*textures), PU_STATIC, 0);
+    texturecolumnlump = Z_Malloc (numtextures * sizeof(*texturecolumnlump), PU_STATIC, 0);
+    texturecolumnofs = Z_Malloc (numtextures * sizeof(*texturecolumnofs), PU_STATIC, 0);
+    texturecomposite = Z_Malloc (numtextures * sizeof(*texturecomposite), PU_STATIC, 0);
+    texturecompositesize = Z_Malloc (numtextures * sizeof(*texturecompositesize), PU_STATIC, 0);
+    texturewidthmask = Z_Malloc (numtextures * sizeof(*texturewidthmask), PU_STATIC, 0);
+    textureheight = Z_Malloc (numtextures * sizeof(*textureheight), PU_STATIC, 0);
+
+    //	Really complex printing shit...
+    temp1 = W_GetNumForName (DEH_String("S_START"));  // P_???????
+    temp2 = W_GetNumForName (DEH_String("S_END")) - 1;
+    temp3 = ((temp2-temp1+63)/64) + ((numtextures+63)/64);
+
+    // If stdout is a real console, use the classic vanilla "filling
+    // up the box" effect, which uses backspace to "step back" inside
+    // the box.  If stdout is a file, don't draw the box.
+
+    if (I_ConsoleStdout())
+    {
+        printf("[");
+        for (i = 0; i < temp3 + 9; i++)
+            printf(" ");
+        printf("]");
+        for (i = 0; i < temp3 + 10; i++)
+            printf("\b");
+    }
+	
+    for (i=0 ; i<numtextures ; i++, directory++)
+    {
+	if (!(i&63))
+	    printf (".");
+
+	if (i == numtextures1)
+	{
+	    // Start looking in second texture file.
+	    maptex = maptex2;
+	    maxoff = maxoff2;
+	    directory = maptex+1;
+	}
+		
+	offset = LONG(*directory);
+
+	if (offset > maxoff)
+	    I_Error ("R_InitTextures: bad texture directory");
+	
+	mtexture = (maptexture_t *) ( (byte *)maptex + offset);
+
+	texture = textures[i] =
+	    Z_Malloc (sizeof(texture_t)
+		      + sizeof(texpatch_t)*(SHORT(mtexture->patchcount)-1),
+		      PU_STATIC, 0);
+	
+	texture->width = SHORT(mtexture->width);
+	texture->height = SHORT(mtexture->height);
+	texture->patchcount = SHORT(mtexture->patchcount);
+	
+	memcpy (texture->name, mtexture->name, sizeof(texture->name));
+	mpatch = &mtexture->patches[0];
+	patch = &texture->patches[0];
+
+	for (j=0 ; j<texture->patchcount ; j++, mpatch++, patch++)
+	{
+	    patch->originx = SHORT(mpatch->originx);
+	    patch->originy = SHORT(mpatch->originy);
+	    patch->patch = patchlookup[SHORT(mpatch->patch)];
+	    if (patch->patch == -1)
+	    {
+		I_Error ("R_InitTextures: Missing patch in texture %s",
+			 texture->name);
+	    }
+	}		
+	texturecolumnlump[i] = Z_Malloc (texture->width*sizeof(**texturecolumnlump), PU_STATIC,0);
+	texturecolumnofs[i] = Z_Malloc (texture->width*sizeof(**texturecolumnofs), PU_STATIC,0);
+
+	j = 1;
+	while (j*2 <= texture->width)
+	    j<<=1;
+
+	texturewidthmask[i] = j-1;
+	textureheight[i] = texture->height<<FRACBITS;
+    }
+
+    Z_Free(patchlookup);
+
+    W_ReleaseLumpName(DEH_String("TEXTURE1"));
+    if (maptex2)
+        W_ReleaseLumpName(DEH_String("TEXTURE2"));
+    
+    // Precalculate whatever possible.	
+
+    for (i=0 ; i<numtextures ; i++)
+	R_GenerateLookup (i);
+    
+    // Create translation table for global animation.
+    texturetranslation = Z_Malloc ((numtextures+1)*sizeof(*texturetranslation), PU_STATIC, 0);
+    
+    for (i=0 ; i<numtextures ; i++)
+	texturetranslation[i] = i;
+
+    GenerateTextureHashTable();
+}
+
+
+
+//
+// R_InitFlats
+//
+void R_InitFlats (void)
+{
+    int		i;
+	
+    firstflat = W_GetNumForName (DEH_String("F_START")) + 1;
+    lastflat = W_GetNumForName (DEH_String("F_END")) - 1;
+    numflats = lastflat - firstflat + 1;
+	
+    // Create translation table for global animation.
+    flattranslation = Z_Malloc ((numflats+1)*sizeof(*flattranslation), PU_STATIC, 0);
+    
+    for (i=0 ; i<numflats ; i++)
+	flattranslation[i] = i;
+}
+
+
+//
+// R_InitSpriteLumps
+// Finds the width and hoffset of all sprites in the wad,
+//  so the sprite does not need to be cached completely
+//  just for having the header info ready during rendering.
+//
+void R_InitSpriteLumps (void)
+{
+    int		i;
+    patch_t	*patch;
+	
+    firstspritelump = W_GetNumForName (DEH_String("S_START")) + 1;
+    lastspritelump = W_GetNumForName (DEH_String("S_END")) - 1;
+    
+    numspritelumps = lastspritelump - firstspritelump + 1;
+    spritewidth = Z_Malloc (numspritelumps*sizeof(*spritewidth), PU_STATIC, 0);
+    spriteoffset = Z_Malloc (numspritelumps*sizeof(*spriteoffset), PU_STATIC, 0);
+    spritetopoffset = Z_Malloc (numspritelumps*sizeof(*spritetopoffset), PU_STATIC, 0);
+	
+    for (i=0 ; i< numspritelumps ; i++)
+    {
+	if (!(i&63))
+	    printf (".");
+
+	patch = W_CacheLumpNum (firstspritelump+i, PU_CACHE);
+	spritewidth[i] = SHORT(patch->width)<<FRACBITS;
+	spriteoffset[i] = SHORT(patch->leftoffset)<<FRACBITS;
+	spritetopoffset[i] = SHORT(patch->topoffset)<<FRACBITS;
+    }
+}
+
+
+
+//
+// R_InitColormaps
+//
+void R_InitColormaps (void)
+{
+    int	lump;
+
+    // Load in the light tables, 
+    //  256 byte align tables.
+    lump = W_GetNumForName(DEH_String("COLORMAP"));
+    colormaps = W_CacheLumpNum(lump, PU_STATIC);
+}
+
+
+
+//
+// R_InitData
+// Locates all the lumps
+//  that will be used by all views
+// Must be called after W_Init.
+//
+void R_InitData (void)
+{
+    R_InitTextures ();
+    printf (".");
+    R_InitFlats ();
+    printf (".");
+    R_InitSpriteLumps ();
+    printf (".");
+    R_InitColormaps ();
+}
+
+
+
+//
+// R_FlatNumForName
+// Retrieval, get a flat number for a flat name.
+//
+int R_FlatNumForName(const char *name)
+{
+    int		i;
+    char	namet[9];
+
+    i = W_CheckNumForName (name);
+
+    if (i == -1)
+    {
+	namet[8] = 0;
+	memcpy (namet, name,8);
+	I_Error ("R_FlatNumForName: %s not found",namet);
+    }
+    return i - firstflat;
+}
+
+
+
+
+//
+// R_CheckTextureNumForName
+// Check whether texture is available.
+// Filter out NoTexture indicator.
+//
+int R_CheckTextureNumForName(const char *name)
+{
+    texture_t *texture;
+    int key;
+
+    // "NoTexture" marker.
+    if (name[0] == '-')		
+	return 0;
+		
+    key = W_LumpNameHash(name) % numtextures;
+
+    texture=textures_hashtable[key]; 
+    
+    while (texture != NULL)
+    {
+	if (!strncasecmp (texture->name, name, 8) )
+	    return texture->index;
+
+        texture = texture->next;
+    }
+    
+    return -1;
+}
+
+
+
+//
+// R_TextureNumForName
+// Calls R_CheckTextureNumForName,
+//  aborts with error message.
+//
+int R_TextureNumForName(const char *name)
+{
+    int		i;
+	
+    i = R_CheckTextureNumForName (name);
+
+    if (i==-1)
+    {
+	I_Error ("R_TextureNumForName: %s not found",
+		 name);
+    }
+    return i;
+}
+
+
+
+
+//
+// R_PrecacheLevel
+// Preloads all relevant graphics for the level.
+//
+int		flatmemory;
+int		texturememory;
+int		spritememory;
+
+void R_PrecacheLevel (void)
+{
+    char*		flatpresent;
+    char*		texturepresent;
+    char*		spritepresent;
+
+    int			i;
+    int			j;
+    int			k;
+    int			lump;
+    
+    texture_t*		texture;
+    thinker_t*		th;
+    spriteframe_t*	sf;
+
+    if (demoplayback)
+	return;
+    
+    // Precache flats.
+    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
+    memset (flatpresent,0,numflats);	
+
+    for (i=0 ; i<numsectors ; i++)
+    {
+	flatpresent[sectors[i].floorpic] = 1;
+	flatpresent[sectors[i].ceilingpic] = 1;
+    }
+	
+    flatmemory = 0;
+
+    for (i=0 ; i<numflats ; i++)
+    {
+	if (flatpresent[i])
+	{
+	    lump = firstflat + i;
+	    flatmemory += lumpinfo[lump]->size;
+	    W_CacheLumpNum(lump, PU_CACHE);
+	}
+    }
+
+    Z_Free(flatpresent);
+    
+    // Precache textures.
+    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
+    memset (texturepresent,0, numtextures);
+	
+    for (i=0 ; i<numsides ; i++)
+    {
+	texturepresent[sides[i].toptexture] = 1;
+	texturepresent[sides[i].midtexture] = 1;
+	texturepresent[sides[i].bottomtexture] = 1;
+    }
+
+    // Sky texture is always present.
+    // Note that F_SKY1 is the name used to
+    //  indicate a sky floor/ceiling as a flat,
+    //  while the sky texture is stored like
+    //  a wall texture, with an episode dependend
+    //  name.
+    texturepresent[skytexture] = 1;
+	
+    texturememory = 0;
+    for (i=0 ; i<numtextures ; i++)
+    {
+	if (!texturepresent[i])
+	    continue;
+
+	texture = textures[i];
+	
+	for (j=0 ; j<texture->patchcount ; j++)
+	{
+	    lump = texture->patches[j].patch;
+	    texturememory += lumpinfo[lump]->size;
+	    W_CacheLumpNum(lump , PU_CACHE);
+	}
+    }
+
+    Z_Free(texturepresent);
+    
+    // Precache sprites.
+    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
+    memset (spritepresent,0, numsprites);
+	
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+	if (th->function.acp1 == (actionf_p1)P_MobjThinker)
+	    spritepresent[((mobj_t *)th)->sprite] = 1;
+    }
+	
+    spritememory = 0;
+    for (i=0 ; i<numsprites ; i++)
+    {
+	if (!spritepresent[i])
+	    continue;
+
+	for (j=0 ; j<sprites[i].numframes ; j++)
+	{
+	    sf = &sprites[i].spriteframes[j];
+	    for (k=0 ; k<8 ; k++)
+	    {
+		lump = firstspritelump + sf->lump[k];
+		spritememory += lumpinfo[lump]->size;
+		W_CacheLumpNum(lump , PU_CACHE);
+	    }
+	}
+    }
+
+    Z_Free(spritepresent);
+}
+
+
+
+
diff --git a/games/NXDoom/src/doom/r_data.h b/games/NXDoom/src/doom/r_data.h
new file mode 100644
index 000000000..1b273088d
--- /dev/null
+++ b/games/NXDoom/src/doom/r_data.h
@@ -0,0 +1,55 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Refresh module, data I/O, caching, retrieval of graphics
+//  by name.
+//
+
+
+#ifndef __R_DATA__
+#define __R_DATA__
+
+#include "r_defs.h"
+#include "r_state.h"
+
+
+// Retrieve column data for span blitting.
+byte*
+R_GetColumn
+( int		tex,
+  int		col );
+
+
+// I/O, setting up the stuff.
+void R_InitData (void);
+void R_PrecacheLevel (void);
+
+
+// Retrieval.
+// Floor/ceiling opaque texture tiles,
+// lookup by name. For animation?
+int R_FlatNumForName(const char *name);
+
+
+// Called by P_Ticker for switches and animations,
+// returns the texture number for the texture name.
+int R_TextureNumForName(const char *name);
+int R_CheckTextureNumForName(const char *name);
+
+
+extern int numflats;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_defs.h b/games/NXDoom/src/doom/r_defs.h
new file mode 100644
index 000000000..d87ca38a9
--- /dev/null
+++ b/games/NXDoom/src/doom/r_defs.h
@@ -0,0 +1,448 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Refresh/rendering module, shared data struct definitions.
+//
+
+
+#ifndef __R_DEFS__
+#define __R_DEFS__
+
+
+// Screenwidth.
+#include "doomdef.h"
+
+// Some more or less basic data types
+// we depend on.
+#include "m_fixed.h"
+
+// We rely on the thinker data struct
+// to handle sound origins in sectors.
+#include "d_think.h"
+// SECTORS do store MObjs anyway.
+#include "p_mobj.h"
+
+#include "i_video.h"
+
+#include "v_patch.h"
+
+
+
+
+// Silhouette, needed for clipping Segs (mainly)
+// and sprites representing things.
+#define SIL_NONE		0
+#define SIL_BOTTOM		1
+#define SIL_TOP			2
+#define SIL_BOTH		3
+
+#define MAXDRAWSEGS		256
+
+
+
+
+
+//
+// INTERNAL MAP TYPES
+//  used by play and refresh
+//
+
+//
+// Your plain vanilla vertex.
+// Note: transformed values not buffered locally,
+//  like some DOOM-alikes ("wt", "WebView") did.
+//
+typedef struct
+{
+    fixed_t	x;
+    fixed_t	y;
+    
+} vertex_t;
+
+
+// Forward of LineDefs, for Sectors.
+struct line_s;
+
+// Each sector has a degenmobj_t in its center
+//  for sound origin purposes.
+// I suppose this does not handle sound from
+//  moving objects (doppler), because
+//  position is prolly just buffered, not
+//  updated.
+typedef struct
+{
+    thinker_t		thinker;	// not used for anything
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+
+} degenmobj_t;
+
+//
+// The SECTORS record, at runtime.
+// Stores things/mobjs.
+//
+typedef	struct
+{
+    fixed_t	floorheight;
+    fixed_t	ceilingheight;
+    short	floorpic;
+    short	ceilingpic;
+    short	lightlevel;
+    short	special;
+    short	tag;
+
+    // 0 = untraversed, 1,2 = sndlines -1
+    int		soundtraversed;
+
+    // thing that made a sound (or null)
+    mobj_t*	soundtarget;
+
+    // mapblock bounding box for height changes
+    int		blockbox[4];
+
+    // origin for any sounds played by the sector
+    degenmobj_t	soundorg;
+
+    // if == validcount, already checked
+    int		validcount;
+
+    // list of mobjs in sector
+    mobj_t*	thinglist;
+
+    // thinker_t for reversable actions
+    void*	specialdata;
+
+    int			linecount;
+    struct line_s**	lines;	// [linecount] size
+    
+} sector_t;
+
+
+
+
+//
+// The SideDef.
+//
+
+typedef struct
+{
+    // add this to the calculated texture column
+    fixed_t	textureoffset;
+    
+    // add this to the calculated texture top
+    fixed_t	rowoffset;
+
+    // Texture indices.
+    // We do not maintain names here. 
+    short	toptexture;
+    short	bottomtexture;
+    short	midtexture;
+
+    // Sector the SideDef is facing.
+    sector_t*	sector;
+    
+} side_t;
+
+
+
+//
+// Move clipping aid for LineDefs.
+//
+typedef enum
+{
+    ST_HORIZONTAL,
+    ST_VERTICAL,
+    ST_POSITIVE,
+    ST_NEGATIVE
+
+} slopetype_t;
+
+
+
+typedef struct line_s
+{
+    // Vertices, from v1 to v2.
+    vertex_t*	v1;
+    vertex_t*	v2;
+
+    // Precalculated v2 - v1 for side checking.
+    fixed_t	dx;
+    fixed_t	dy;
+
+    // Animation related.
+    short	flags;
+    short	special;
+    short	tag;
+
+    // Visual appearance: SideDefs.
+    //  sidenum[1] will be -1 if one sided
+    short	sidenum[2];			
+
+    // Neat. Another bounding box, for the extent
+    //  of the LineDef.
+    fixed_t	bbox[4];
+
+    // To aid move clipping.
+    slopetype_t	slopetype;
+
+    // Front and back sector.
+    // Note: redundant? Can be retrieved from SideDefs.
+    sector_t*	frontsector;
+    sector_t*	backsector;
+
+    // if == validcount, already checked
+    int		validcount;
+
+    // thinker_t for reversable actions
+    void*	specialdata;		
+} line_t;
+
+
+
+
+//
+// A SubSector.
+// References a Sector.
+// Basically, this is a list of LineSegs,
+//  indicating the visible walls that define
+//  (all or some) sides of a convex BSP leaf.
+//
+typedef struct subsector_s
+{
+    sector_t*	sector;
+    short	numlines;
+    short	firstline;
+    
+} subsector_t;
+
+
+
+//
+// The LineSeg.
+//
+typedef struct
+{
+    vertex_t*	v1;
+    vertex_t*	v2;
+    
+    fixed_t	offset;
+
+    angle_t	angle;
+
+    side_t*	sidedef;
+    line_t*	linedef;
+
+    // Sector references.
+    // Could be retrieved from linedef, too.
+    // backsector is NULL for one sided lines
+    sector_t*	frontsector;
+    sector_t*	backsector;
+    
+} seg_t;
+
+
+
+//
+// BSP node.
+//
+typedef struct
+{
+    // Partition line.
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	dx;
+    fixed_t	dy;
+
+    // Bounding box for each child.
+    fixed_t	bbox[2][4];
+
+    // If NF_SUBSECTOR its a subsector.
+    unsigned short children[2];
+    
+} node_t;
+
+
+
+
+// PC direct to screen pointers
+//B UNUSED - keep till detailshift in r_draw.c resolved
+//extern byte*	destview;
+//extern byte*	destscreen;
+
+
+
+
+
+//
+// OTHER TYPES
+//
+
+// This could be wider for >8 bit display.
+// Indeed, true color support is posibble
+//  precalculating 24bpp lightmap/colormap LUT.
+//  from darkening PLAYPAL to all black.
+// Could even us emore than 32 levels.
+typedef pixel_t		lighttable_t;
+
+
+
+
+//
+// ?
+//
+typedef struct drawseg_s
+{
+    seg_t*		curline;
+    int			x1;
+    int			x2;
+
+    fixed_t		scale1;
+    fixed_t		scale2;
+    fixed_t		scalestep;
+
+    // 0=none, 1=bottom, 2=top, 3=both
+    int			silhouette;
+
+    // do not clip sprites above this
+    fixed_t		bsilheight;
+
+    // do not clip sprites below this
+    fixed_t		tsilheight;
+    
+    // Pointers to lists for sprite clipping,
+    //  all three adjusted so [x1] is first value.
+    short*		sprtopclip;		
+    short*		sprbottomclip;	
+    short*		maskedtexturecol;
+    
+} drawseg_t;
+
+
+
+// A vissprite_t is a thing
+//  that will be drawn during a refresh.
+// I.e. a sprite object that is partly visible.
+typedef struct vissprite_s
+{
+    // Doubly linked list.
+    struct vissprite_s*	prev;
+    struct vissprite_s*	next;
+    
+    int			x1;
+    int			x2;
+
+    // for line side calculation
+    fixed_t		gx;
+    fixed_t		gy;		
+
+    // global bottom / top for silhouette clipping
+    fixed_t		gz;
+    fixed_t		gzt;
+
+    // horizontal position of x1
+    fixed_t		startfrac;
+    
+    fixed_t		scale;
+    
+    // negative if flipped
+    fixed_t		xiscale;	
+
+    fixed_t		texturemid;
+    int			patch;
+
+    // for color translation and shadow draw,
+    //  maxbright frames as well
+    lighttable_t*	colormap;
+   
+    int			mobjflags;
+    
+} vissprite_t;
+
+
+//	
+// Sprites are patches with a special naming convention
+//  so they can be recognized by R_InitSprites.
+// The base name is NNNNFx or NNNNFxFx, with
+//  x indicating the rotation, x = 0, 1-7.
+// The sprite and frame specified by a thing_t
+//  is range checked at run time.
+// A sprite is a patch_t that is assumed to represent
+//  a three dimensional object and may have multiple
+//  rotations pre drawn.
+// Horizontal flipping is used to save space,
+//  thus NNNNF2F5 defines a mirrored patch.
+// Some sprites will only have one picture used
+// for all views: NNNNF0
+//
+typedef struct
+{
+    // If false use 0 for any position.
+    // Note: as eight entries are available,
+    //  we might as well insert the same name eight times.
+    boolean	rotate;
+
+    // Lump to use for view angles 0-7.
+    short	lump[8];
+
+    // Flip bit (1 = flip) to use for view angles 0-7.
+    byte	flip[8];
+    
+} spriteframe_t;
+
+
+
+//
+// A sprite definition:
+//  a number of animation frames.
+//
+typedef struct
+{
+    int			numframes;
+    spriteframe_t*	spriteframes;
+
+} spritedef_t;
+
+
+
+//
+// Now what is a visplane, anyway?
+// 
+typedef struct
+{
+  fixed_t		height;
+  int			picnum;
+  int			lightlevel;
+  int			minx;
+  int			maxx;
+  
+  // leave pads for [minx-1]/[maxx+1]
+  
+  byte		pad1;
+  // Here lies the rub for all
+  //  dynamic resize/change of resolution.
+  byte		top[SCREENWIDTH];
+  byte		pad2;
+  byte		pad3;
+  // See above.
+  byte		bottom[SCREENWIDTH];
+  byte		pad4;
+
+} visplane_t;
+
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_draw.c b/games/NXDoom/src/doom/r_draw.c
new file mode 100644
index 000000000..4fc41b5d5
--- /dev/null
+++ b/games/NXDoom/src/doom/r_draw.c
@@ -0,0 +1,959 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The actual span/column drawing functions.
+//	Here find the main potential for optimization,
+//	 e.g. inline assembly, different algorithms.
+//
+
+
+
+
+#include "doomdef.h"
+#include "deh_main.h"
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+
+// Needs access to LFB (guess what).
+#include "v_video.h"
+
+// State.
+#include "doomstat.h"
+
+
+// ?
+#define MAXWIDTH			1120
+#define MAXHEIGHT			832
+
+// status bar height at bottom of screen
+#define SBARHEIGHT		32
+
+//
+// All drawing to the view buffer is accomplished in this file.
+// The other refresh files only know about ccordinates,
+//  not the architecture of the frame buffer.
+// Conveniently, the frame buffer is a linear one,
+//  and we need only the base address,
+//  and the total size == width*height*depth/8.,
+//
+
+
+byte*		viewimage; 
+int		viewwidth;
+int		scaledviewwidth;
+int		viewheight;
+int		viewwindowx;
+int		viewwindowy; 
+pixel_t*		ylookup[MAXHEIGHT];
+int		columnofs[MAXWIDTH]; 
+
+// Color tables for different players,
+//  translate a limited part to another
+//  (color ramps used for  suit colors).
+//
+byte		translations[3][256];	
+ 
+// Backing buffer containing the bezel drawn around the screen and 
+// surrounding background.
+
+static pixel_t *background_buffer = NULL;
+
+
+//
+// R_DrawColumn
+// Source is the top of the column to scale.
+//
+lighttable_t*		dc_colormap; 
+int			dc_x; 
+int			dc_yl; 
+int			dc_yh; 
+fixed_t			dc_iscale; 
+fixed_t			dc_texturemid;
+
+// first pixel in a column (possibly virtual) 
+byte*			dc_source;		
+
+// just for profiling 
+int			dccount;
+
+//
+// A column is a vertical slice/span from a wall texture that,
+//  given the DOOM style restrictions on the view orientation,
+//  will always have constant z depth.
+// Thus a special case loop for very fast rendering can
+//  be used. It has also been used with Wolfenstein 3D.
+// 
+void R_DrawColumn (void) 
+{ 
+    int			count; 
+    pixel_t*		dest;
+    fixed_t		frac;
+    fixed_t		fracstep;	 
+ 
+    count = dc_yh - dc_yl; 
+
+    // Zero length, column does not exceed a pixel.
+    if (count < 0) 
+	return; 
+				 
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+	|| dc_yl < 0
+	|| dc_yh >= SCREENHEIGHT) 
+	I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x); 
+#endif 
+
+    // Framebuffer destination address.
+    // Use ylookup LUT to avoid multiply with ScreenWidth.
+    // Use columnofs LUT for subwindows? 
+    dest = ylookup[dc_yl] + columnofs[dc_x];  
+
+    // Determine scaling,
+    //  which is the only mapping to be done.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    // Inner loop that does the actual texture mapping,
+    //  e.g. a DDA-lile scaling.
+    // This is as fast as it gets.
+    do 
+    {
+	// Re-map color indices from wall texture column
+	//  using a lighting/special effects LUT.
+	*dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
+	
+	dest += SCREENWIDTH; 
+	frac += fracstep;
+	
+    } while (count--); 
+} 
+
+
+
+// UNUSED.
+// Loop unrolled.
+#if 0
+void R_DrawColumn (void) 
+{ 
+    int			count; 
+    byte*		source;
+    byte*		dest;
+    byte*		colormap;
+    
+    unsigned		frac;
+    unsigned		fracstep;
+    unsigned		fracstep2;
+    unsigned		fracstep3;
+    unsigned		fracstep4;	 
+ 
+    count = dc_yh - dc_yl + 1; 
+
+    source = dc_source;
+    colormap = dc_colormap;		 
+    dest = ylookup[dc_yl] + columnofs[dc_x];  
+	 
+    fracstep = dc_iscale<<9; 
+    frac = (dc_texturemid + (dc_yl-centery)*dc_iscale)<<9; 
+ 
+    fracstep2 = fracstep+fracstep;
+    fracstep3 = fracstep2+fracstep;
+    fracstep4 = fracstep3+fracstep;
+	
+    while (count >= 8) 
+    { 
+	dest[0] = colormap[source[frac>>25]]; 
+	dest[SCREENWIDTH] = colormap[source[(frac+fracstep)>>25]]; 
+	dest[SCREENWIDTH*2] = colormap[source[(frac+fracstep2)>>25]]; 
+	dest[SCREENWIDTH*3] = colormap[source[(frac+fracstep3)>>25]];
+	
+	frac += fracstep4; 
+
+	dest[SCREENWIDTH*4] = colormap[source[frac>>25]]; 
+	dest[SCREENWIDTH*5] = colormap[source[(frac+fracstep)>>25]]; 
+	dest[SCREENWIDTH*6] = colormap[source[(frac+fracstep2)>>25]]; 
+	dest[SCREENWIDTH*7] = colormap[source[(frac+fracstep3)>>25]]; 
+
+	frac += fracstep4; 
+	dest += SCREENWIDTH*8; 
+	count -= 8;
+    } 
+	
+    while (count > 0)
+    { 
+	*dest = colormap[source[frac>>25]]; 
+	dest += SCREENWIDTH; 
+	frac += fracstep; 
+	count--;
+    } 
+}
+#endif
+
+
+void R_DrawColumnLow (void) 
+{ 
+    int			count; 
+    pixel_t*		dest;
+    pixel_t*		dest2;
+    fixed_t		frac;
+    fixed_t		fracstep;	 
+    int                 x;
+ 
+    count = dc_yh - dc_yl; 
+
+    // Zero length.
+    if (count < 0) 
+	return; 
+				 
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+	|| dc_yl < 0
+	|| dc_yh >= SCREENHEIGHT)
+    {
+	
+	I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+    }
+    //	dccount++; 
+#endif 
+    // Blocky mode, need to multiply by 2.
+    x = dc_x << 1;
+    
+    dest = ylookup[dc_yl] + columnofs[x];
+    dest2 = ylookup[dc_yl] + columnofs[x+1];
+    
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep;
+    
+    do 
+    {
+	// Hack. Does not work corretly.
+	*dest2 = *dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
+	dest += SCREENWIDTH;
+	dest2 += SCREENWIDTH;
+	frac += fracstep; 
+
+    } while (count--);
+}
+
+
+//
+// Spectre/Invisibility.
+//
+#define FUZZTABLE		50 
+#define FUZZOFF	(SCREENWIDTH)
+
+
+int	fuzzoffset[FUZZTABLE] =
+{
+    FUZZOFF,-FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,
+    FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,
+    FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,
+    FUZZOFF,-FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,
+    FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,-FUZZOFF,FUZZOFF,
+    FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,
+    FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF 
+}; 
+
+int	fuzzpos = 0; 
+
+
+//
+// Framebuffer postprocessing.
+// Creates a fuzzy image by copying pixels
+//  from adjacent ones to left and right.
+// Used with an all black colormap, this
+//  could create the SHADOW effect,
+//  i.e. spectres and invisible players.
+//
+void R_DrawFuzzColumn (void) 
+{ 
+    int			count; 
+    pixel_t*		dest;
+
+    // Adjust borders. Low... 
+    if (!dc_yl) 
+	dc_yl = 1;
+
+    // .. and high.
+    if (dc_yh == viewheight-1) 
+	dc_yh = viewheight - 2; 
+		 
+    count = dc_yh - dc_yl; 
+
+    // Zero length.
+    if (count < 0) 
+	return; 
+
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+	|| dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    {
+	I_Error ("R_DrawFuzzColumn: %i to %i at %i",
+		 dc_yl, dc_yh, dc_x);
+    }
+#endif
+    
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    // Looks like an attempt at dithering,
+    //  using the colormap #6 (of 0-31, a bit
+    //  brighter than average).
+    do 
+    {
+	// Lookup framebuffer, and retrieve
+	//  a pixel that is either one column
+	//  left or right of the current one.
+	// Add index from colormap to index.
+	*dest = colormaps[6*256+dest[fuzzoffset[fuzzpos]]]; 
+
+	// Clamp table lookup index.
+	if (++fuzzpos == FUZZTABLE) 
+	    fuzzpos = 0;
+	
+	dest += SCREENWIDTH;
+    } while (count--); 
+} 
+
+// low detail mode version
+ 
+void R_DrawFuzzColumnLow (void) 
+{ 
+    int			count; 
+    pixel_t*		dest;
+    pixel_t*		dest2;
+    int x;
+
+    // Adjust borders. Low... 
+    if (!dc_yl) 
+	dc_yl = 1;
+
+    // .. and high.
+    if (dc_yh == viewheight-1) 
+	dc_yh = viewheight - 2; 
+		 
+    count = dc_yh - dc_yl; 
+
+    // Zero length.
+    if (count < 0) 
+	return; 
+
+    // low detail mode, need to multiply by 2
+    
+    x = dc_x << 1;
+    
+#ifdef RANGECHECK 
+    if ((unsigned)x >= SCREENWIDTH
+	|| dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    {
+	I_Error ("R_DrawFuzzColumn: %i to %i at %i",
+		 dc_yl, dc_yh, dc_x);
+    }
+#endif
+    
+    dest = ylookup[dc_yl] + columnofs[x];
+    dest2 = ylookup[dc_yl] + columnofs[x+1];
+
+    // Looks like an attempt at dithering,
+    //  using the colormap #6 (of 0-31, a bit
+    //  brighter than average).
+    do 
+    {
+	// Lookup framebuffer, and retrieve
+	//  a pixel that is either one column
+	//  left or right of the current one.
+	// Add index from colormap to index.
+	*dest = colormaps[6*256+dest[fuzzoffset[fuzzpos]]]; 
+	*dest2 = colormaps[6*256+dest2[fuzzoffset[fuzzpos]]]; 
+
+	// Clamp table lookup index.
+	if (++fuzzpos == FUZZTABLE) 
+	    fuzzpos = 0;
+	
+	dest += SCREENWIDTH;
+	dest2 += SCREENWIDTH;
+    } while (count--); 
+} 
+ 
+  
+  
+ 
+
+//
+// R_DrawTranslatedColumn
+// Used to draw player sprites
+//  with the green colorramp mapped to others.
+// Could be used with different translation
+//  tables, e.g. the lighter colored version
+//  of the BaronOfHell, the HellKnight, uses
+//  identical sprites, kinda brightened up.
+//
+byte*	dc_translation;
+byte*	translationtables;
+
+void R_DrawTranslatedColumn (void) 
+{ 
+    int			count; 
+    pixel_t*		dest;
+    fixed_t		frac;
+    fixed_t		fracstep;	 
+ 
+    count = dc_yh - dc_yl; 
+    if (count < 0) 
+	return; 
+				 
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+	|| dc_yl < 0
+	|| dc_yh >= SCREENHEIGHT)
+    {
+	I_Error ( "R_DrawColumn: %i to %i at %i",
+		  dc_yl, dc_yh, dc_x);
+    }
+    
+#endif 
+
+
+    dest = ylookup[dc_yl] + columnofs[dc_x]; 
+
+    // Looks familiar.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    // Here we do an additional index re-mapping.
+    do 
+    {
+	// Translation tables are used
+	//  to map certain colorramps to other ones,
+	//  used with PLAY sprites.
+	// Thus the "green" ramp of the player 0 sprite
+	//  is mapped to gray, red, black/indigo. 
+	*dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
+	dest += SCREENWIDTH;
+	
+	frac += fracstep; 
+    } while (count--); 
+} 
+
+void R_DrawTranslatedColumnLow (void) 
+{ 
+    int			count; 
+    pixel_t*		dest;
+    pixel_t*		dest2;
+    fixed_t		frac;
+    fixed_t		fracstep;	 
+    int                 x;
+ 
+    count = dc_yh - dc_yl; 
+    if (count < 0) 
+	return; 
+
+    // low detail, need to scale by 2
+    x = dc_x << 1;
+				 
+#ifdef RANGECHECK 
+    if ((unsigned)x >= SCREENWIDTH
+	|| dc_yl < 0
+	|| dc_yh >= SCREENHEIGHT)
+    {
+	I_Error ( "R_DrawColumn: %i to %i at %i",
+		  dc_yl, dc_yh, x);
+    }
+    
+#endif 
+
+
+    dest = ylookup[dc_yl] + columnofs[x]; 
+    dest2 = ylookup[dc_yl] + columnofs[x+1]; 
+
+    // Looks familiar.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    // Here we do an additional index re-mapping.
+    do 
+    {
+	// Translation tables are used
+	//  to map certain colorramps to other ones,
+	//  used with PLAY sprites.
+	// Thus the "green" ramp of the player 0 sprite
+	//  is mapped to gray, red, black/indigo. 
+	*dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
+	*dest2 = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
+	dest += SCREENWIDTH;
+	dest2 += SCREENWIDTH;
+	
+	frac += fracstep; 
+    } while (count--); 
+} 
+
+
+
+
+//
+// R_InitTranslationTables
+// Creates the translation tables to map
+//  the green color ramp to gray, brown, red.
+// Assumes a given structure of the PLAYPAL.
+// Could be read from a lump instead.
+//
+void R_InitTranslationTables (void)
+{
+    int		i;
+	
+    translationtables = Z_Malloc (256*3, PU_STATIC, 0);
+    
+    // translate just the 16 green colors
+    for (i=0 ; i<256 ; i++)
+    {
+	if (i >= 0x70 && i<= 0x7f)
+	{
+	    // map green ramp to gray, brown, red
+	    translationtables[i] = 0x60 + (i&0xf);
+	    translationtables [i+256] = 0x40 + (i&0xf);
+	    translationtables [i+512] = 0x20 + (i&0xf);
+	}
+	else
+	{
+	    // Keep all other colors as is.
+	    translationtables[i] = translationtables[i+256] 
+		= translationtables[i+512] = i;
+	}
+    }
+}
+
+
+
+
+//
+// R_DrawSpan 
+// With DOOM style restrictions on view orientation,
+//  the floors and ceilings consist of horizontal slices
+//  or spans with constant z depth.
+// However, rotation around the world z axis is possible,
+//  thus this mapping, while simpler and faster than
+//  perspective correct texture mapping, has to traverse
+//  the texture at an angle in all but a few cases.
+// In consequence, flats are not stored by column (like walls),
+//  and the inner loop has to step in texture space u and v.
+//
+int			ds_y; 
+int			ds_x1; 
+int			ds_x2;
+
+lighttable_t*		ds_colormap; 
+
+fixed_t			ds_xfrac; 
+fixed_t			ds_yfrac; 
+fixed_t			ds_xstep; 
+fixed_t			ds_ystep;
+
+// start of a 64*64 tile image 
+byte*			ds_source;	
+
+// just for profiling
+int			dscount;
+
+
+//
+// Draws the actual span.
+void R_DrawSpan (void) 
+{ 
+    unsigned int position, step;
+    pixel_t *dest;
+    int count;
+    int spot;
+    unsigned int xtemp, ytemp;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1
+	|| ds_x1<0
+	|| ds_x2>=SCREENWIDTH
+	|| (unsigned)ds_y>SCREENHEIGHT)
+    {
+	I_Error( "R_DrawSpan: %i to %i at %i",
+		 ds_x1,ds_x2,ds_y);
+    }
+//	dscount++;
+#endif
+
+    // Pack position and step variables into a single 32-bit integer,
+    // with x in the top 16 bits and y in the bottom 16 bits.  For
+    // each 16-bit part, the top 6 bits are the integer part and the
+    // bottom 10 bits are the fractional part of the pixel position.
+
+    position = ((ds_xfrac << 10) & 0xffff0000)
+             | ((ds_yfrac >> 6)  & 0x0000ffff);
+    step = ((ds_xstep << 10) & 0xffff0000)
+         | ((ds_ystep >> 6)  & 0x0000ffff);
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+
+    // We do not check for zero spans here?
+    count = ds_x2 - ds_x1;
+
+    do
+    {
+	// Calculate current texture index in u,v.
+        ytemp = (position >> 4) & 0x0fc0;
+        xtemp = (position >> 26);
+        spot = xtemp | ytemp;
+
+	// Lookup pixel from flat texture tile,
+	//  re-index using light/colormap.
+	*dest++ = ds_colormap[ds_source[spot]];
+
+        position += step;
+
+    } while (count--);
+}
+
+
+
+// UNUSED.
+// Loop unrolled by 4.
+#if 0
+void R_DrawSpan (void) 
+{ 
+    unsigned	position, step;
+
+    byte*	source;
+    byte*	colormap;
+    pixel_t*	dest;
+    
+    unsigned	count;
+    usingned	spot; 
+    unsigned	value;
+    unsigned	temp;
+    unsigned	xtemp;
+    unsigned	ytemp;
+		
+    position = ((ds_xfrac<<10)&0xffff0000) | ((ds_yfrac>>6)&0xffff);
+    step = ((ds_xstep<<10)&0xffff0000) | ((ds_ystep>>6)&0xffff);
+		
+    source = ds_source;
+    colormap = ds_colormap;
+    dest = ylookup[ds_y] + columnofs[ds_x1];	 
+    count = ds_x2 - ds_x1 + 1; 
+	
+    while (count >= 4) 
+    { 
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[0] = colormap[source[spot]]; 
+
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[1] = colormap[source[spot]];
+	
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[2] = colormap[source[spot]];
+	
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[3] = colormap[source[spot]]; 
+		
+	count -= 4;
+	dest += 4;
+    } 
+    while (count > 0) 
+    { 
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	*dest++ = colormap[source[spot]]; 
+	count--;
+    } 
+} 
+#endif
+
+
+//
+// Again..
+//
+void R_DrawSpanLow (void)
+{
+    unsigned int position, step;
+    unsigned int xtemp, ytemp;
+    pixel_t *dest;
+    int count;
+    int spot;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1
+	|| ds_x1<0
+	|| ds_x2>=SCREENWIDTH
+	|| (unsigned)ds_y>SCREENHEIGHT)
+    {
+	I_Error( "R_DrawSpan: %i to %i at %i",
+		 ds_x1,ds_x2,ds_y);
+    }
+//	dscount++; 
+#endif
+
+    position = ((ds_xfrac << 10) & 0xffff0000)
+             | ((ds_yfrac >> 6)  & 0x0000ffff);
+    step = ((ds_xstep << 10) & 0xffff0000)
+         | ((ds_ystep >> 6)  & 0x0000ffff);
+
+    count = (ds_x2 - ds_x1);
+
+    // Blocky mode, need to multiply by 2.
+    ds_x1 <<= 1;
+    ds_x2 <<= 1;
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+
+    do
+    {
+	// Calculate current texture index in u,v.
+        ytemp = (position >> 4) & 0x0fc0;
+        xtemp = (position >> 26);
+        spot = xtemp | ytemp;
+
+	// Lowres/blocky mode does it twice,
+	//  while scale is adjusted appropriately.
+	*dest++ = ds_colormap[ds_source[spot]];
+	*dest++ = ds_colormap[ds_source[spot]];
+
+	position += step;
+
+    } while (count--);
+}
+
+//
+// R_InitBuffer 
+// Creats lookup tables that avoid
+//  multiplies and other hazzles
+//  for getting the framebuffer address
+//  of a pixel to draw.
+//
+void
+R_InitBuffer
+( int		width,
+  int		height ) 
+{ 
+    int		i; 
+
+    // Handle resize,
+    //  e.g. smaller view windows
+    //  with border and/or status bar.
+    viewwindowx = (SCREENWIDTH-width) >> 1; 
+
+    // Column offset. For windows.
+    for (i=0 ; i<width ; i++) 
+	columnofs[i] = viewwindowx + i;
+
+    // Samw with base row offset.
+    if (width == SCREENWIDTH) 
+	viewwindowy = 0; 
+    else 
+	viewwindowy = (SCREENHEIGHT-SBARHEIGHT-height) >> 1; 
+
+    // Preclaculate all row offsets.
+    for (i=0 ; i<height ; i++) 
+	ylookup[i] = I_VideoBuffer + (i+viewwindowy)*SCREENWIDTH; 
+} 
+ 
+ 
+
+
+//
+// R_FillBackScreen
+// Fills the back screen with a pattern
+//  for variable screen sizes
+// Also draws a beveled edge.
+//
+void R_FillBackScreen (void) 
+{ 
+    byte*	src;
+    pixel_t*	dest;
+    int		x;
+    int		y; 
+    patch_t*	patch;
+
+    // DOOM border patch.
+    const char *name1 = DEH_String("FLOOR7_2");
+
+    // DOOM II border patch.
+    const char *name2 = DEH_String("GRNROCK");
+
+    const char *name;
+
+    // If we are running full screen, there is no need to do any of this,
+    // and the background buffer can be freed if it was previously in use.
+
+    if (scaledviewwidth == SCREENWIDTH)
+    {
+        if (background_buffer != NULL)
+        {
+            Z_Free(background_buffer);
+            background_buffer = NULL;
+        }
+
+	return;
+    }
+
+    // Allocate the background buffer if necessary
+	
+    if (background_buffer == NULL)
+    {
+        background_buffer = Z_Malloc(SCREENWIDTH * (SCREENHEIGHT - SBARHEIGHT) * sizeof(*background_buffer),
+                                     PU_STATIC, NULL);
+    }
+
+    if (gamemode == commercial)
+	name = name2;
+    else
+	name = name1;
+    
+    src = W_CacheLumpName(name, PU_CACHE); 
+    dest = background_buffer;
+	 
+    for (y=0 ; y<SCREENHEIGHT-SBARHEIGHT ; y++) 
+    { 
+	for (x=0 ; x<SCREENWIDTH/64 ; x++) 
+	{ 
+	    memcpy (dest, src+((y&63)<<6), 64); 
+	    dest += 64; 
+	} 
+
+	if (SCREENWIDTH&63) 
+	{ 
+	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63); 
+	    dest += (SCREENWIDTH&63); 
+	} 
+    } 
+     
+    // Draw screen and bezel; this is done to a separate screen buffer.
+
+    V_UseBuffer(background_buffer);
+
+    patch = W_CacheLumpName(DEH_String("brdr_t"),PU_CACHE);
+
+    for (x=0 ; x<scaledviewwidth ; x+=8)
+	V_DrawPatch(viewwindowx+x, viewwindowy-8, patch);
+    patch = W_CacheLumpName(DEH_String("brdr_b"),PU_CACHE);
+
+    for (x=0 ; x<scaledviewwidth ; x+=8)
+	V_DrawPatch(viewwindowx+x, viewwindowy+viewheight, patch);
+    patch = W_CacheLumpName(DEH_String("brdr_l"),PU_CACHE);
+
+    for (y=0 ; y<viewheight ; y+=8)
+	V_DrawPatch(viewwindowx-8, viewwindowy+y, patch);
+    patch = W_CacheLumpName(DEH_String("brdr_r"),PU_CACHE);
+
+    for (y=0 ; y<viewheight ; y+=8)
+	V_DrawPatch(viewwindowx+scaledviewwidth, viewwindowy+y, patch);
+
+    // Draw beveled edge. 
+    V_DrawPatch(viewwindowx-8,
+                viewwindowy-8,
+                W_CacheLumpName(DEH_String("brdr_tl"),PU_CACHE));
+    
+    V_DrawPatch(viewwindowx+scaledviewwidth,
+                viewwindowy-8,
+                W_CacheLumpName(DEH_String("brdr_tr"),PU_CACHE));
+    
+    V_DrawPatch(viewwindowx-8,
+                viewwindowy+viewheight,
+                W_CacheLumpName(DEH_String("brdr_bl"),PU_CACHE));
+    
+    V_DrawPatch(viewwindowx+scaledviewwidth,
+                viewwindowy+viewheight,
+                W_CacheLumpName(DEH_String("brdr_br"),PU_CACHE));
+
+    V_RestoreBuffer();
+} 
+ 
+
+//
+// Copy a screen buffer.
+//
+void
+R_VideoErase
+( unsigned	ofs,
+  int		count ) 
+{ 
+  // LFB copy.
+  // This might not be a good idea if memcpy
+  //  is not optiomal, e.g. byte by byte on
+  //  a 32bit CPU, as GNU GCC/Linux libc did
+  //  at one point.
+
+    if (background_buffer != NULL)
+    {
+        memcpy(I_VideoBuffer + ofs, background_buffer + ofs, count * sizeof(*I_VideoBuffer));
+    }
+} 
+
+
+//
+// R_DrawViewBorder
+// Draws the border around the view
+//  for different size windows?
+//
+void R_DrawViewBorder (void) 
+{ 
+    int		top;
+    int		side;
+    int		ofs;
+    int		i; 
+ 
+    if (scaledviewwidth == SCREENWIDTH) 
+	return; 
+  
+    top = ((SCREENHEIGHT-SBARHEIGHT)-viewheight)/2; 
+    side = (SCREENWIDTH-scaledviewwidth)/2; 
+ 
+    // copy top and one line of left side 
+    R_VideoErase (0, top*SCREENWIDTH+side); 
+ 
+    // copy one line of right side and bottom 
+    ofs = (viewheight+top)*SCREENWIDTH-side; 
+    R_VideoErase (ofs, top*SCREENWIDTH+side); 
+ 
+    // copy sides using wraparound 
+    ofs = top*SCREENWIDTH + SCREENWIDTH-side; 
+    side <<= 1;
+    
+    for (i=1 ; i<viewheight ; i++) 
+    { 
+	R_VideoErase (ofs, side); 
+	ofs += SCREENWIDTH; 
+    } 
+
+    // ? 
+    V_MarkRect (0,0,SCREENWIDTH, SCREENHEIGHT-SBARHEIGHT); 
+} 
+ 
+ 
diff --git a/games/NXDoom/src/doom/r_draw.h b/games/NXDoom/src/doom/r_draw.h
new file mode 100644
index 000000000..5b0c818b5
--- /dev/null
+++ b/games/NXDoom/src/doom/r_draw.h
@@ -0,0 +1,104 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __R_DRAW__
+#define __R_DRAW__
+
+
+
+
+extern lighttable_t*	dc_colormap;
+extern int		dc_x;
+extern int		dc_yl;
+extern int		dc_yh;
+extern fixed_t		dc_iscale;
+extern fixed_t		dc_texturemid;
+
+// first pixel in a column
+extern byte*		dc_source;		
+
+
+// The span blitting interface.
+// Hook in assembler or system specific BLT
+//  here.
+void 	R_DrawColumn (void);
+void 	R_DrawColumnLow (void);
+
+// The Spectre/Invisibility effect.
+void 	R_DrawFuzzColumn (void);
+void 	R_DrawFuzzColumnLow (void);
+
+// Draw with color translation tables,
+//  for player sprite rendering,
+//  Green/Red/Blue/Indigo shirts.
+void	R_DrawTranslatedColumn (void);
+void	R_DrawTranslatedColumnLow (void);
+
+void
+R_VideoErase
+( unsigned	ofs,
+  int		count );
+
+extern int		ds_y;
+extern int		ds_x1;
+extern int		ds_x2;
+
+extern lighttable_t*	ds_colormap;
+
+extern fixed_t		ds_xfrac;
+extern fixed_t		ds_yfrac;
+extern fixed_t		ds_xstep;
+extern fixed_t		ds_ystep;
+
+// start of a 64*64 tile image
+extern byte*		ds_source;		
+
+extern byte*		translationtables;
+extern byte*		dc_translation;
+
+
+// Span blitting for rows, floor/ceiling.
+// No Sepctre effect needed.
+void 	R_DrawSpan (void);
+
+// Low resolution mode, 160x200?
+void 	R_DrawSpanLow (void);
+
+
+void
+R_InitBuffer
+( int		width,
+  int		height );
+
+
+// Initialize color translation tables,
+//  for player rendering etc.
+void	R_InitTranslationTables (void);
+
+
+
+// Rendering function.
+void R_FillBackScreen (void);
+
+// If the view size is not full screen, draws a border around it.
+void R_DrawViewBorder (void);
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_local.h b/games/NXDoom/src/doom/r_local.h
new file mode 100644
index 000000000..1b9249210
--- /dev/null
+++ b/games/NXDoom/src/doom/r_local.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh (R_*) module, global header.
+//	All the rendering/drawing stuff is here.
+//
+
+#ifndef __R_LOCAL__
+#define __R_LOCAL__
+
+// Binary Angles, sine/cosine/atan lookups.
+#include "tables.h"
+
+// Screen size related parameters.
+#include "doomdef.h"
+
+// Include the refresh/render data structs.
+#include "r_data.h"
+
+
+
+//
+// Separate header file for each module.
+//
+#include "r_main.h"
+#include "r_bsp.h"
+#include "r_segs.h"
+#include "r_plane.h"
+#include "r_data.h"
+#include "r_things.h"
+#include "r_draw.h"
+
+#endif		// __R_LOCAL__
diff --git a/games/NXDoom/src/doom/r_main.c b/games/NXDoom/src/doom/r_main.c
new file mode 100644
index 000000000..970bd19b6
--- /dev/null
+++ b/games/NXDoom/src/doom/r_main.c
@@ -0,0 +1,890 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Rendering main loop and setup functions,
+//	 utility functions (BSP, geometry, trigonometry).
+//	See tables.c, too.
+//
+
+
+
+
+
+#include <stdlib.h>
+#include <math.h>
+
+
+#include "doomdef.h"
+#include "d_loop.h"
+
+#include "m_bbox.h"
+#include "m_menu.h"
+
+#include "r_local.h"
+#include "r_sky.h"
+
+
+
+
+
+// Fineangles in the SCREENWIDTH wide window.
+#define FIELDOFVIEW		2048	
+
+
+
+int			viewangleoffset;
+
+// increment every time a check is made
+int			validcount = 1;		
+
+
+lighttable_t*		fixedcolormap;
+
+int			centerx;
+int			centery;
+
+fixed_t			centerxfrac;
+fixed_t			centeryfrac;
+fixed_t			projection;
+
+// just for profiling purposes
+int			framecount;	
+
+int			sscount;
+int			linecount;
+int			loopcount;
+
+fixed_t			viewx;
+fixed_t			viewy;
+fixed_t			viewz;
+
+angle_t			viewangle;
+
+fixed_t			viewcos;
+fixed_t			viewsin;
+
+player_t*		viewplayer;
+
+// 0 = high, 1 = low
+int			detailshift;	
+
+//
+// precalculated math tables
+//
+angle_t			clipangle;
+
+// The viewangletox[viewangle + FINEANGLES/4] lookup
+// maps the visible view angles to screen X coordinates,
+// flattening the arc to a flat projection plane.
+// There will be many angles mapped to the same X. 
+int			viewangletox[FINEANGLES/2];
+
+// The xtoviewangleangle[] table maps a screen pixel
+// to the lowest viewangle that maps back to x ranges
+// from clipangle to -clipangle.
+angle_t			xtoviewangle[SCREENWIDTH+1];
+
+lighttable_t*		scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+lighttable_t*		scalelightfixed[MAXLIGHTSCALE];
+lighttable_t*		zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+// bumped light from gun blasts
+int			extralight;			
+
+
+
+void (*colfunc) (void);
+void (*basecolfunc) (void);
+void (*fuzzcolfunc) (void);
+void (*transcolfunc) (void);
+void (*spanfunc) (void);
+
+
+
+//
+// R_AddPointToBox
+// Expand a given bbox
+// so that it encloses a given point.
+//
+void
+R_AddPointToBox
+( int		x,
+  int		y,
+  fixed_t*	box )
+{
+    if (x< box[BOXLEFT])
+	box[BOXLEFT] = x;
+    if (x> box[BOXRIGHT])
+	box[BOXRIGHT] = x;
+    if (y< box[BOXBOTTOM])
+	box[BOXBOTTOM] = y;
+    if (y> box[BOXTOP])
+	box[BOXTOP] = y;
+}
+
+
+//
+// R_PointOnSide
+// Traverse BSP (sub) tree,
+//  check point against partition plane.
+// Returns side 0 (front) or 1 (back).
+//
+int
+R_PointOnSide
+( fixed_t	x,
+  fixed_t	y,
+  node_t*	node )
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    if (!node->dx)
+    {
+	if (x <= node->x)
+	    return node->dy > 0;
+	
+	return node->dy < 0;
+    }
+    if (!node->dy)
+    {
+	if (y <= node->y)
+	    return node->dx < 0;
+	
+	return node->dx > 0;
+    }
+	
+    dx = (x - node->x);
+    dy = (y - node->y);
+	
+    // Try to quickly decide by looking at sign bits.
+    if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
+    {
+	if  ( (node->dy ^ dx) & 0x80000000 )
+	{
+	    // (left is negative)
+	    return 1;
+	}
+	return 0;
+    }
+
+    left = FixedMul ( node->dy>>FRACBITS , dx );
+    right = FixedMul ( dy , node->dx>>FRACBITS );
+	
+    if (right < left)
+    {
+	// front side
+	return 0;
+    }
+    // back side
+    return 1;			
+}
+
+
+int
+R_PointOnSegSide
+( fixed_t	x,
+  fixed_t	y,
+  seg_t*	line )
+{
+    fixed_t	lx;
+    fixed_t	ly;
+    fixed_t	ldx;
+    fixed_t	ldy;
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    lx = line->v1->x;
+    ly = line->v1->y;
+	
+    ldx = line->v2->x - lx;
+    ldy = line->v2->y - ly;
+	
+    if (!ldx)
+    {
+	if (x <= lx)
+	    return ldy > 0;
+	
+	return ldy < 0;
+    }
+    if (!ldy)
+    {
+	if (y <= ly)
+	    return ldx < 0;
+	
+	return ldx > 0;
+    }
+	
+    dx = (x - lx);
+    dy = (y - ly);
+	
+    // Try to quickly decide by looking at sign bits.
+    if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
+    {
+	if  ( (ldy ^ dx) & 0x80000000 )
+	{
+	    // (left is negative)
+	    return 1;
+	}
+	return 0;
+    }
+
+    left = FixedMul ( ldy>>FRACBITS , dx );
+    right = FixedMul ( dy , ldx>>FRACBITS );
+	
+    if (right < left)
+    {
+	// front side
+	return 0;
+    }
+    // back side
+    return 1;			
+}
+
+
+//
+// R_PointToAngle
+// To get a global angle from cartesian coordinates,
+//  the coordinates are flipped until they are in
+//  the first octant of the coordinate system, then
+//  the y (<=x) is scaled and divided by x to get a
+//  tangent (slope) value which is looked up in the
+//  tantoangle[] table.
+
+//
+
+
+
+
+angle_t
+R_PointToAngle
+( fixed_t	x,
+  fixed_t	y )
+{	
+    x -= viewx;
+    y -= viewy;
+    
+    if ( (!x) && (!y) )
+	return 0;
+
+    if (x>= 0)
+    {
+	// x >=0
+	if (y>= 0)
+	{
+	    // y>= 0
+
+	    if (x>y)
+	    {
+		// octant 0
+		return tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 1
+		return ANG90-1-tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+	else
+	{
+	    // y<0
+	    y = -y;
+
+	    if (x>y)
+	    {
+		// octant 8
+		return -tantoangle[SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 7
+		return ANG270+tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+    }
+    else
+    {
+	// x<0
+	x = -x;
+
+	if (y>= 0)
+	{
+	    // y>= 0
+	    if (x>y)
+	    {
+		// octant 3
+		return ANG180-1-tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 2
+		return ANG90+ tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+	else
+	{
+	    // y<0
+	    y = -y;
+
+	    if (x>y)
+	    {
+		// octant 4
+		return ANG180+tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		 // octant 5
+		return ANG270-1-tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+    }
+    return 0;
+}
+
+
+angle_t
+R_PointToAngle2
+( fixed_t	x1,
+  fixed_t	y1,
+  fixed_t	x2,
+  fixed_t	y2 )
+{	
+    viewx = x1;
+    viewy = y1;
+    
+    return R_PointToAngle (x2, y2);
+}
+
+
+fixed_t
+R_PointToDist
+( fixed_t	x,
+  fixed_t	y )
+{
+    int		angle;
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	temp;
+    fixed_t	dist;
+    fixed_t     frac;
+	
+    dx = abs(x - viewx);
+    dy = abs(y - viewy);
+	
+    if (dy>dx)
+    {
+	temp = dx;
+	dx = dy;
+	dy = temp;
+    }
+
+    // Fix crashes in udm1.wad
+
+    if (dx != 0)
+    {
+        frac = FixedDiv(dy, dx);
+    }
+    else
+    {
+	frac = 0;
+    }
+	
+    angle = (tantoangle[frac>>DBITS]+ANG90) >> ANGLETOFINESHIFT;
+
+    // use as cosine
+    dist = FixedDiv (dx, finesine[angle] );	
+	
+    return dist;
+}
+
+
+
+
+//
+// R_InitPointToAngle
+//
+void R_InitPointToAngle (void)
+{
+    // UNUSED - now getting from tables.c
+#if 0
+    int	i;
+    long	t;
+    float	f;
+//
+// slope (tangent) to angle lookup
+//
+    for (i=0 ; i<=SLOPERANGE ; i++)
+    {
+	f = atan( (float)i/SLOPERANGE )/(3.141592657*2);
+	t = 0xffffffff*f;
+	tantoangle[i] = t;
+    }
+#endif
+}
+
+
+//
+// R_ScaleFromGlobalAngle
+// Returns the texture mapping scale
+//  for the current line (horizontal span)
+//  at the given angle.
+// rw_distance must be calculated first.
+//
+fixed_t R_ScaleFromGlobalAngle (angle_t visangle)
+{
+    fixed_t		scale;
+    angle_t		anglea;
+    angle_t		angleb;
+    int			sinea;
+    int			sineb;
+    fixed_t		num;
+    int			den;
+
+    // UNUSED
+#if 0
+{
+    fixed_t		dist;
+    fixed_t		z;
+    fixed_t		sinv;
+    fixed_t		cosv;
+	
+    sinv = finesine[(visangle-rw_normalangle)>>ANGLETOFINESHIFT];	
+    dist = FixedDiv (rw_distance, sinv);
+    cosv = finecosine[(viewangle-visangle)>>ANGLETOFINESHIFT];
+    z = abs(FixedMul (dist, cosv));
+    scale = FixedDiv(projection, z);
+    return scale;
+}
+#endif
+
+    anglea = ANG90 + (visangle-viewangle);
+    angleb = ANG90 + (visangle-rw_normalangle);
+
+    // both sines are allways positive
+    sinea = finesine[anglea>>ANGLETOFINESHIFT];	
+    sineb = finesine[angleb>>ANGLETOFINESHIFT];
+    num = FixedMul(projection,sineb)<<detailshift;
+    den = FixedMul(rw_distance,sinea);
+
+    if (den > num>>FRACBITS)
+    {
+	scale = FixedDiv (num, den);
+
+	if (scale > 64*FRACUNIT)
+	    scale = 64*FRACUNIT;
+	else if (scale < 256)
+	    scale = 256;
+    }
+    else
+	scale = 64*FRACUNIT;
+	
+    return scale;
+}
+
+
+
+//
+// R_InitTables
+//
+void R_InitTables (void)
+{
+    // UNUSED: now getting from tables.c
+#if 0
+    int		i;
+    float	a;
+    float	fv;
+    int		t;
+    
+    // viewangle tangent table
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	a = (i-FINEANGLES/4+0.5)*PI*2/FINEANGLES;
+	fv = FRACUNIT*tan (a);
+	t = fv;
+	finetangent[i] = t;
+    }
+    
+    // finesine table
+    for (i=0 ; i<5*FINEANGLES/4 ; i++)
+    {
+	// OPTIMIZE: mirror...
+	a = (i+0.5)*PI*2/FINEANGLES;
+	t = FRACUNIT*sin (a);
+	finesine[i] = t;
+    }
+#endif
+
+}
+
+
+
+//
+// R_InitTextureMapping
+//
+void R_InitTextureMapping (void)
+{
+    int			i;
+    int			x;
+    int			t;
+    fixed_t		focallength;
+    
+    // Use tangent table to generate viewangletox:
+    //  viewangletox will give the next greatest x
+    //  after the view angle.
+    //
+    // Calc focallength
+    //  so FIELDOFVIEW angles covers SCREENWIDTH.
+    focallength = FixedDiv (centerxfrac,
+			    finetangent[FINEANGLES/4+FIELDOFVIEW/2] );
+	
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	if (finetangent[i] > FRACUNIT*2)
+	    t = -1;
+	else if (finetangent[i] < -FRACUNIT*2)
+	    t = viewwidth+1;
+	else
+	{
+	    t = FixedMul (finetangent[i], focallength);
+	    t = (centerxfrac - t+FRACUNIT-1)>>FRACBITS;
+
+	    if (t < -1)
+		t = -1;
+	    else if (t>viewwidth+1)
+		t = viewwidth+1;
+	}
+	viewangletox[i] = t;
+    }
+    
+    // Scan viewangletox[] to generate xtoviewangle[]:
+    //  xtoviewangle will give the smallest view angle
+    //  that maps to x.	
+    for (x=0;x<=viewwidth;x++)
+    {
+	i = 0;
+	while (viewangletox[i]>x)
+	    i++;
+	xtoviewangle[x] = (i<<ANGLETOFINESHIFT)-ANG90;
+    }
+    
+    // Take out the fencepost cases from viewangletox.
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	t = FixedMul (finetangent[i], focallength);
+	t = centerx - t;
+	
+	if (viewangletox[i] == -1)
+	    viewangletox[i] = 0;
+	else if (viewangletox[i] == viewwidth+1)
+	    viewangletox[i]  = viewwidth;
+    }
+	
+    clipangle = xtoviewangle[0];
+}
+
+
+
+//
+// R_InitLightTables
+// Only inits the zlight table,
+//  because the scalelight table changes with view size.
+//
+#define DISTMAP		2
+
+void R_InitLightTables (void)
+{
+    int		i;
+    int		j;
+    int		level;
+    int		startmap; 	
+    int		scale;
+    
+    // Calculate the light levels to use
+    //  for each level / distance combination.
+    for (i=0 ; i< LIGHTLEVELS ; i++)
+    {
+	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
+	for (j=0 ; j<MAXLIGHTZ ; j++)
+	{
+	    scale = FixedDiv ((SCREENWIDTH/2*FRACUNIT), (j+1)<<LIGHTZSHIFT);
+	    scale >>= LIGHTSCALESHIFT;
+	    level = startmap - scale/DISTMAP;
+	    
+	    if (level < 0)
+		level = 0;
+
+	    if (level >= NUMCOLORMAPS)
+		level = NUMCOLORMAPS-1;
+
+	    zlight[i][j] = colormaps + level*256;
+	}
+    }
+}
+
+
+
+//
+// R_SetViewSize
+// Do not really change anything here,
+//  because it might be in the middle of a refresh.
+// The change will take effect next refresh.
+//
+boolean		setsizeneeded;
+int		setblocks;
+int		setdetail;
+
+
+void
+R_SetViewSize
+( int		blocks,
+  int		detail )
+{
+    setsizeneeded = true;
+    setblocks = blocks;
+    setdetail = detail;
+}
+
+
+//
+// R_ExecuteSetViewSize
+//
+void R_ExecuteSetViewSize (void)
+{
+    fixed_t	cosadj;
+    fixed_t	dy;
+    int		i;
+    int		j;
+    int		level;
+    int		startmap; 	
+
+    setsizeneeded = false;
+
+    if (setblocks == 11)
+    {
+	scaledviewwidth = SCREENWIDTH;
+	viewheight = SCREENHEIGHT;
+    }
+    else
+    {
+	scaledviewwidth = setblocks*32;
+	viewheight = (setblocks*168/10)&~7;
+    }
+    
+    detailshift = setdetail;
+    viewwidth = scaledviewwidth>>detailshift;
+	
+    centery = viewheight/2;
+    centerx = viewwidth/2;
+    centerxfrac = centerx<<FRACBITS;
+    centeryfrac = centery<<FRACBITS;
+    projection = centerxfrac;
+
+    if (!detailshift)
+    {
+	colfunc = basecolfunc = R_DrawColumn;
+	fuzzcolfunc = R_DrawFuzzColumn;
+	transcolfunc = R_DrawTranslatedColumn;
+	spanfunc = R_DrawSpan;
+    }
+    else
+    {
+	colfunc = basecolfunc = R_DrawColumnLow;
+	fuzzcolfunc = R_DrawFuzzColumnLow;
+	transcolfunc = R_DrawTranslatedColumnLow;
+	spanfunc = R_DrawSpanLow;
+    }
+
+    R_InitBuffer (scaledviewwidth, viewheight);
+	
+    R_InitTextureMapping ();
+    
+    // psprite scales
+    pspritescale = FRACUNIT*viewwidth/SCREENWIDTH;
+    pspriteiscale = FRACUNIT*SCREENWIDTH/viewwidth;
+    
+    // thing clipping
+    for (i=0 ; i<viewwidth ; i++)
+	screenheightarray[i] = viewheight;
+    
+    // planes
+    for (i=0 ; i<viewheight ; i++)
+    {
+	dy = ((i-viewheight/2)<<FRACBITS)+FRACUNIT/2;
+	dy = abs(dy);
+	yslope[i] = FixedDiv ( (viewwidth<<detailshift)/2*FRACUNIT, dy);
+    }
+	
+    for (i=0 ; i<viewwidth ; i++)
+    {
+	cosadj = abs(finecosine[xtoviewangle[i]>>ANGLETOFINESHIFT]);
+	distscale[i] = FixedDiv (FRACUNIT,cosadj);
+    }
+    
+    // Calculate the light levels to use
+    //  for each level / scale combination.
+    for (i=0 ; i< LIGHTLEVELS ; i++)
+    {
+	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
+	for (j=0 ; j<MAXLIGHTSCALE ; j++)
+	{
+	    level = startmap - j*SCREENWIDTH/(viewwidth<<detailshift)/DISTMAP;
+	    
+	    if (level < 0)
+		level = 0;
+
+	    if (level >= NUMCOLORMAPS)
+		level = NUMCOLORMAPS-1;
+
+	    scalelight[i][j] = colormaps + level*256;
+	}
+    }
+}
+
+
+
+//
+// R_Init
+//
+
+
+
+void R_Init (void)
+{
+    R_InitData ();
+    printf (".");
+    R_InitPointToAngle ();
+    printf (".");
+    R_InitTables ();
+    // viewwidth / viewheight / detailLevel are set by the defaults
+    printf (".");
+
+    R_SetViewSize (screenblocks, detailLevel);
+    R_InitPlanes ();
+    printf (".");
+    R_InitLightTables ();
+    printf (".");
+    R_InitSkyMap ();
+    R_InitTranslationTables ();
+    printf (".");
+	
+    framecount = 0;
+}
+
+
+//
+// R_PointInSubsector
+//
+subsector_t*
+R_PointInSubsector
+( fixed_t	x,
+  fixed_t	y )
+{
+    node_t*	node;
+    int		side;
+    int		nodenum;
+
+    // single subsector is a special case
+    if (!numnodes)				
+	return subsectors;
+		
+    nodenum = numnodes-1;
+
+    while (! (nodenum & NF_SUBSECTOR) )
+    {
+	node = &nodes[nodenum];
+	side = R_PointOnSide (x, y, node);
+	nodenum = node->children[side];
+    }
+	
+    return &subsectors[nodenum & ~NF_SUBSECTOR];
+}
+
+
+
+//
+// R_SetupFrame
+//
+void R_SetupFrame (player_t* player)
+{		
+    int		i;
+    
+    viewplayer = player;
+    viewx = player->mo->x;
+    viewy = player->mo->y;
+    viewangle = player->mo->angle + viewangleoffset;
+    extralight = player->extralight;
+
+    viewz = player->viewz;
+    
+    viewsin = finesine[viewangle>>ANGLETOFINESHIFT];
+    viewcos = finecosine[viewangle>>ANGLETOFINESHIFT];
+	
+    sscount = 0;
+	
+    if (player->fixedcolormap)
+    {
+	fixedcolormap =
+	    colormaps
+	    + player->fixedcolormap*256;
+	
+	walllights = scalelightfixed;
+
+	for (i=0 ; i<MAXLIGHTSCALE ; i++)
+	    scalelightfixed[i] = fixedcolormap;
+    }
+    else
+	fixedcolormap = 0;
+		
+    framecount++;
+    validcount++;
+}
+
+
+
+//
+// R_RenderView
+//
+void R_RenderPlayerView (player_t* player)
+{	
+    R_SetupFrame (player);
+
+    // Clear buffers.
+    R_ClearClipSegs ();
+    R_ClearDrawSegs ();
+    R_ClearPlanes ();
+    R_ClearSprites ();
+    
+    // check for new console commands.
+    NetUpdate ();
+
+    // The head node is the last node output.
+    R_RenderBSPNode (numnodes-1);
+    
+    // Check for new console commands.
+    NetUpdate ();
+    
+    R_DrawPlanes ();
+    
+    // Check for new console commands.
+    NetUpdate ();
+    
+    R_DrawMasked ();
+
+    // Check for new console commands.
+    NetUpdate ();				
+}
diff --git a/games/NXDoom/src/doom/r_main.h b/games/NXDoom/src/doom/r_main.h
new file mode 100644
index 000000000..f97bd817e
--- /dev/null
+++ b/games/NXDoom/src/doom/r_main.h
@@ -0,0 +1,165 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __R_MAIN__
+#define __R_MAIN__
+
+#include "d_player.h"
+#include "r_data.h"
+
+
+
+
+//
+// POV related.
+//
+extern fixed_t		viewcos;
+extern fixed_t		viewsin;
+
+extern int		viewwindowx;
+extern int		viewwindowy;
+
+
+
+extern int		centerx;
+extern int		centery;
+
+extern fixed_t		centerxfrac;
+extern fixed_t		centeryfrac;
+extern fixed_t		projection;
+
+extern int		validcount;
+
+extern int		linecount;
+extern int		loopcount;
+
+extern  boolean setsizeneeded;
+
+
+//
+// Lighting LUT.
+// Used for z-depth cuing per column/row,
+//  and other lighting effects (sector ambient, flash).
+//
+
+// Lighting constants.
+// Now why not 32 levels here?
+#define LIGHTLEVELS	        16
+#define LIGHTSEGSHIFT	         4
+
+#define MAXLIGHTSCALE		48
+#define LIGHTSCALESHIFT		12
+#define MAXLIGHTZ	       128
+#define LIGHTZSHIFT		20
+
+extern lighttable_t*	scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+extern lighttable_t*	scalelightfixed[MAXLIGHTSCALE];
+extern lighttable_t*	zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+extern int		extralight;
+extern lighttable_t*	fixedcolormap;
+
+
+// Number of diminishing brightness levels.
+// There a 0-31, i.e. 32 LUT in the COLORMAP lump.
+#define NUMCOLORMAPS		32
+
+
+// Blocky/low detail mode.
+//B remove this?
+//  0 = high, 1 = low
+extern	int		detailshift;	
+
+
+//
+// Function pointers to switch refresh/drawing functions.
+// Used to select shadow mode etc.
+//
+extern void		(*colfunc) (void);
+extern void		(*transcolfunc) (void);
+extern void		(*basecolfunc) (void);
+extern void		(*fuzzcolfunc) (void);
+// No shadow effects on floors.
+extern void		(*spanfunc) (void);
+
+
+//
+// Utility functions.
+int
+R_PointOnSide
+( fixed_t	x,
+  fixed_t	y,
+  node_t*	node );
+
+int
+R_PointOnSegSide
+( fixed_t	x,
+  fixed_t	y,
+  seg_t*	line );
+
+angle_t
+R_PointToAngle
+( fixed_t	x,
+  fixed_t	y );
+
+angle_t
+R_PointToAngle2
+( fixed_t	x1,
+  fixed_t	y1,
+  fixed_t	x2,
+  fixed_t	y2 );
+
+fixed_t
+R_PointToDist
+( fixed_t	x,
+  fixed_t	y );
+
+
+fixed_t R_ScaleFromGlobalAngle (angle_t visangle);
+
+subsector_t*
+R_PointInSubsector
+( fixed_t	x,
+  fixed_t	y );
+
+void
+R_AddPointToBox
+( int		x,
+  int		y,
+  fixed_t*	box );
+
+
+
+//
+// REFRESH - the actual rendering functions.
+//
+
+// Called by G_Drawer.
+void R_RenderPlayerView (player_t *player);
+
+// Called by startup code.
+void R_Init (void);
+
+// Called by M_Responder.
+void R_SetViewSize (int blocks, int detail);
+
+void R_ExecuteSetViewSize(void);
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_plane.c b/games/NXDoom/src/doom/r_plane.c
new file mode 100644
index 000000000..b63b20fd2
--- /dev/null
+++ b/games/NXDoom/src/doom/r_plane.c
@@ -0,0 +1,449 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Here is a core component: drawing the floors and ceilings,
+//	 while maintaining a per column clipping list only.
+//	Moreover, the sky areas have to be determined.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "r_local.h"
+#include "r_sky.h"
+
+
+
+planefunction_t		floorfunc;
+planefunction_t		ceilingfunc;
+
+//
+// opening
+//
+
+// Here comes the obnoxious "visplane".
+#define MAXVISPLANES	128
+visplane_t		visplanes[MAXVISPLANES];
+visplane_t*		lastvisplane;
+visplane_t*		floorplane;
+visplane_t*		ceilingplane;
+
+// ?
+#define MAXOPENINGS	SCREENWIDTH*64
+short			openings[MAXOPENINGS];
+short*			lastopening;
+
+
+//
+// Clip values are the solid pixel bounding the range.
+//  floorclip starts out SCREENHEIGHT
+//  ceilingclip starts out -1
+//
+short			floorclip[SCREENWIDTH];
+short			ceilingclip[SCREENWIDTH];
+
+//
+// spanstart holds the start of a plane span
+// initialized to 0 at start
+//
+int			spanstart[SCREENHEIGHT];
+int			spanstop[SCREENHEIGHT];
+
+//
+// texture mapping
+//
+lighttable_t**		planezlight;
+fixed_t			planeheight;
+
+fixed_t			yslope[SCREENHEIGHT];
+fixed_t			distscale[SCREENWIDTH];
+fixed_t			basexscale;
+fixed_t			baseyscale;
+
+fixed_t			cachedheight[SCREENHEIGHT];
+fixed_t			cacheddistance[SCREENHEIGHT];
+fixed_t			cachedxstep[SCREENHEIGHT];
+fixed_t			cachedystep[SCREENHEIGHT];
+
+
+
+//
+// R_InitPlanes
+// Only at game startup.
+//
+void R_InitPlanes (void)
+{
+  // Doh!
+}
+
+
+//
+// R_MapPlane
+//
+// Uses global vars:
+//  planeheight
+//  ds_source
+//  basexscale
+//  baseyscale
+//  viewx
+//  viewy
+//
+// BASIC PRIMITIVE
+//
+void
+R_MapPlane
+( int		y,
+  int		x1,
+  int		x2 )
+{
+    angle_t	angle;
+    fixed_t	distance;
+    fixed_t	length;
+    unsigned	index;
+	
+#ifdef RANGECHECK
+    if (x2 < x1
+     || x1 < 0
+     || x2 >= viewwidth
+     || y > viewheight)
+    {
+	I_Error ("R_MapPlane: %i, %i at %i",x1,x2,y);
+    }
+#endif
+
+    if (planeheight != cachedheight[y])
+    {
+	cachedheight[y] = planeheight;
+	distance = cacheddistance[y] = FixedMul (planeheight, yslope[y]);
+	ds_xstep = cachedxstep[y] = FixedMul (distance,basexscale);
+	ds_ystep = cachedystep[y] = FixedMul (distance,baseyscale);
+    }
+    else
+    {
+	distance = cacheddistance[y];
+	ds_xstep = cachedxstep[y];
+	ds_ystep = cachedystep[y];
+    }
+	
+    length = FixedMul (distance,distscale[x1]);
+    angle = (viewangle + xtoviewangle[x1])>>ANGLETOFINESHIFT;
+    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
+    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
+
+    if (fixedcolormap)
+	ds_colormap = fixedcolormap;
+    else
+    {
+	index = distance >> LIGHTZSHIFT;
+	
+	if (index >= MAXLIGHTZ )
+	    index = MAXLIGHTZ-1;
+
+	ds_colormap = planezlight[index];
+    }
+	
+    ds_y = y;
+    ds_x1 = x1;
+    ds_x2 = x2;
+
+    // high or low detail
+    spanfunc ();	
+}
+
+
+//
+// R_ClearPlanes
+// At begining of frame.
+//
+void R_ClearPlanes (void)
+{
+    int		i;
+    angle_t	angle;
+    
+    // opening / clipping determination
+    for (i=0 ; i<viewwidth ; i++)
+    {
+	floorclip[i] = viewheight;
+	ceilingclip[i] = -1;
+    }
+
+    lastvisplane = visplanes;
+    lastopening = openings;
+    
+    // texture calculation
+    memset (cachedheight, 0, sizeof(cachedheight));
+
+    // left to right mapping
+    angle = (viewangle-ANG90)>>ANGLETOFINESHIFT;
+	
+    // scale will be unit scale at SCREENWIDTH/2 distance
+    basexscale = FixedDiv (finecosine[angle],centerxfrac);
+    baseyscale = -FixedDiv (finesine[angle],centerxfrac);
+}
+
+
+
+
+//
+// R_FindPlane
+//
+visplane_t*
+R_FindPlane
+( fixed_t	height,
+  int		picnum,
+  int		lightlevel )
+{
+    visplane_t*	check;
+	
+    if (picnum == skyflatnum)
+    {
+	height = 0;			// all skys map together
+	lightlevel = 0;
+    }
+	
+    for (check=visplanes; check<lastvisplane; check++)
+    {
+	if (height == check->height
+	    && picnum == check->picnum
+	    && lightlevel == check->lightlevel)
+	{
+	    break;
+	}
+    }
+    
+			
+    if (check < lastvisplane)
+	return check;
+		
+    if (lastvisplane - visplanes == MAXVISPLANES)
+	I_Error ("R_FindPlane: no more visplanes");
+		
+    lastvisplane++;
+
+    check->height = height;
+    check->picnum = picnum;
+    check->lightlevel = lightlevel;
+    check->minx = SCREENWIDTH;
+    check->maxx = -1;
+    
+    memset (check->top,0xff,sizeof(check->top));
+		
+    return check;
+}
+
+
+//
+// R_CheckPlane
+//
+visplane_t*
+R_CheckPlane
+( visplane_t*	pl,
+  int		start,
+  int		stop )
+{
+    int		intrl;
+    int		intrh;
+    int		unionl;
+    int		unionh;
+    int		x;
+	
+    if (start < pl->minx)
+    {
+	intrl = pl->minx;
+	unionl = start;
+    }
+    else
+    {
+	unionl = pl->minx;
+	intrl = start;
+    }
+	
+    if (stop > pl->maxx)
+    {
+	intrh = pl->maxx;
+	unionh = stop;
+    }
+    else
+    {
+	unionh = pl->maxx;
+	intrh = stop;
+    }
+
+    for (x=intrl ; x<= intrh ; x++)
+	if (pl->top[x] != 0xff)
+	    break;
+
+    if (x > intrh)
+    {
+	pl->minx = unionl;
+	pl->maxx = unionh;
+
+	// use the same one
+	return pl;		
+    }
+	
+    // make a new visplane
+    lastvisplane->height = pl->height;
+    lastvisplane->picnum = pl->picnum;
+    lastvisplane->lightlevel = pl->lightlevel;
+    
+    if (lastvisplane - visplanes == MAXVISPLANES)
+	I_Error ("R_CheckPlane: no more visplanes");
+
+    pl = lastvisplane++;
+    pl->minx = start;
+    pl->maxx = stop;
+
+    memset (pl->top,0xff,sizeof(pl->top));
+		
+    return pl;
+}
+
+
+//
+// R_MakeSpans
+//
+void
+R_MakeSpans
+( int		x,
+  int		t1,
+  int		b1,
+  int		t2,
+  int		b2 )
+{
+    while (t1 < t2 && t1<=b1)
+    {
+	R_MapPlane (t1,spanstart[t1],x-1);
+	t1++;
+    }
+    while (b1 > b2 && b1>=t1)
+    {
+	R_MapPlane (b1,spanstart[b1],x-1);
+	b1--;
+    }
+	
+    while (t2 < t1 && t2<=b2)
+    {
+	spanstart[t2] = x;
+	t2++;
+    }
+    while (b2 > b1 && b2>=t2)
+    {
+	spanstart[b2] = x;
+	b2--;
+    }
+}
+
+
+
+//
+// R_DrawPlanes
+// At the end of each frame.
+//
+void R_DrawPlanes (void)
+{
+    visplane_t*		pl;
+    int			light;
+    int			x;
+    int			stop;
+    int			angle;
+    int                 lumpnum;
+				
+#ifdef RANGECHECK
+    if (ds_p - drawsegs > MAXDRAWSEGS)
+	I_Error ("R_DrawPlanes: drawsegs overflow (%td)",
+		 ds_p - drawsegs);
+    
+    if (lastvisplane - visplanes > MAXVISPLANES)
+	I_Error ("R_DrawPlanes: visplane overflow (%td)",
+		 lastvisplane - visplanes);
+    
+    if (lastopening - openings > MAXOPENINGS)
+	I_Error ("R_DrawPlanes: opening overflow (%td)",
+		 lastopening - openings);
+#endif
+
+    for (pl = visplanes ; pl < lastvisplane ; pl++)
+    {
+	if (pl->minx > pl->maxx)
+	    continue;
+
+	
+	// sky flat
+	if (pl->picnum == skyflatnum)
+	{
+	    dc_iscale = pspriteiscale>>detailshift;
+	    
+	    // Sky is allways drawn full bright,
+	    //  i.e. colormaps[0] is used.
+	    // Because of this hack, sky is not affected
+	    //  by INVUL inverse mapping.
+	    dc_colormap = colormaps;
+	    dc_texturemid = skytexturemid;
+	    for (x=pl->minx ; x <= pl->maxx ; x++)
+	    {
+		dc_yl = pl->top[x];
+		dc_yh = pl->bottom[x];
+
+		if (dc_yl <= dc_yh)
+		{
+		    angle = (viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
+		    dc_x = x;
+		    dc_source = R_GetColumn(skytexture, angle);
+		    colfunc ();
+		}
+	    }
+	    continue;
+	}
+	
+	// regular flat
+        lumpnum = firstflat + flattranslation[pl->picnum];
+	ds_source = W_CacheLumpNum(lumpnum, PU_STATIC);
+	
+	planeheight = abs(pl->height-viewz);
+	light = (pl->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+	if (light >= LIGHTLEVELS)
+	    light = LIGHTLEVELS-1;
+
+	if (light < 0)
+	    light = 0;
+
+	planezlight = zlight[light];
+
+	pl->top[pl->maxx+1] = 0xff;
+	pl->top[pl->minx-1] = 0xff;
+		
+	stop = pl->maxx + 1;
+
+	for (x=pl->minx ; x<= stop ; x++)
+	{
+	    R_MakeSpans(x,pl->top[x-1],
+			pl->bottom[x-1],
+			pl->top[x],
+			pl->bottom[x]);
+	}
+	
+        W_ReleaseLumpNum(lumpnum);
+    }
+}
diff --git a/games/NXDoom/src/doom/r_plane.h b/games/NXDoom/src/doom/r_plane.h
new file mode 100644
index 000000000..57b50e5bc
--- /dev/null
+++ b/games/NXDoom/src/doom/r_plane.h
@@ -0,0 +1,76 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh, visplane stuff (floor, ceilings).
+//
+
+
+#ifndef __R_PLANE__
+#define __R_PLANE__
+
+
+#include "r_data.h"
+
+
+
+// Visplane related.
+extern  short*		lastopening;
+
+
+typedef void (*planefunction_t) (int top, int bottom);
+
+extern planefunction_t	floorfunc;
+extern planefunction_t	ceilingfunc_t;
+
+extern short		floorclip[SCREENWIDTH];
+extern short		ceilingclip[SCREENWIDTH];
+
+extern fixed_t		yslope[SCREENHEIGHT];
+extern fixed_t		distscale[SCREENWIDTH];
+
+void R_InitPlanes (void);
+void R_ClearPlanes (void);
+
+void
+R_MapPlane
+( int		y,
+  int		x1,
+  int		x2 );
+
+void
+R_MakeSpans
+( int		x,
+  int		t1,
+  int		b1,
+  int		t2,
+  int		b2 );
+
+void R_DrawPlanes (void);
+
+visplane_t*
+R_FindPlane
+( fixed_t	height,
+  int		picnum,
+  int		lightlevel );
+
+visplane_t*
+R_CheckPlane
+( visplane_t*	pl,
+  int		start,
+  int		stop );
+
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_segs.c b/games/NXDoom/src/doom/r_segs.c
new file mode 100644
index 000000000..06881a520
--- /dev/null
+++ b/games/NXDoom/src/doom/r_segs.c
@@ -0,0 +1,743 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	All the clipping: columns, horizontal spans, sky columns.
+//
+
+
+
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "i_system.h"
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "r_local.h"
+#include "r_sky.h"
+
+
+// OPTIMIZE: closed two sided lines as single sided
+
+// True if any of the segs textures might be visible.
+boolean		segtextured;	
+
+// False if the back side is the same plane.
+boolean		markfloor;	
+boolean		markceiling;
+
+boolean		maskedtexture;
+int		toptexture;
+int		bottomtexture;
+int		midtexture;
+
+
+angle_t		rw_normalangle;
+// angle to line origin
+int		rw_angle1;	
+
+//
+// regular wall
+//
+int		rw_x;
+int		rw_stopx;
+angle_t		rw_centerangle;
+fixed_t		rw_offset;
+fixed_t		rw_distance;
+fixed_t		rw_scale;
+fixed_t		rw_scalestep;
+fixed_t		rw_midtexturemid;
+fixed_t		rw_toptexturemid;
+fixed_t		rw_bottomtexturemid;
+
+int		worldtop;
+int		worldbottom;
+int		worldhigh;
+int		worldlow;
+
+fixed_t		pixhigh;
+fixed_t		pixlow;
+fixed_t		pixhighstep;
+fixed_t		pixlowstep;
+
+fixed_t		topfrac;
+fixed_t		topstep;
+
+fixed_t		bottomfrac;
+fixed_t		bottomstep;
+
+
+lighttable_t**	walllights;
+
+short*		maskedtexturecol;
+
+
+
+//
+// R_RenderMaskedSegRange
+//
+void
+R_RenderMaskedSegRange
+( drawseg_t*	ds,
+  int		x1,
+  int		x2 )
+{
+    unsigned	index;
+    column_t*	col;
+    int		lightnum;
+    int		texnum;
+    
+    // Calculate light table.
+    // Use different light tables
+    //   for horizontal / vertical / diagonal. Diagonal?
+    // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+    curline = ds->curline;
+    frontsector = curline->frontsector;
+    backsector = curline->backsector;
+    texnum = texturetranslation[curline->sidedef->midtexture];
+	
+    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+    if (curline->v1->y == curline->v2->y)
+	lightnum--;
+    else if (curline->v1->x == curline->v2->x)
+	lightnum++;
+
+    if (lightnum < 0)		
+	walllights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+	walllights = scalelight[LIGHTLEVELS-1];
+    else
+	walllights = scalelight[lightnum];
+
+    maskedtexturecol = ds->maskedtexturecol;
+
+    rw_scalestep = ds->scalestep;		
+    spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
+    mfloorclip = ds->sprbottomclip;
+    mceilingclip = ds->sprtopclip;
+    
+    // find positioning
+    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
+    {
+	dc_texturemid = frontsector->floorheight > backsector->floorheight
+	    ? frontsector->floorheight : backsector->floorheight;
+	dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
+    }
+    else
+    {
+	dc_texturemid =frontsector->ceilingheight<backsector->ceilingheight
+	    ? frontsector->ceilingheight : backsector->ceilingheight;
+	dc_texturemid = dc_texturemid - viewz;
+    }
+    dc_texturemid += curline->sidedef->rowoffset;
+			
+    if (fixedcolormap)
+	dc_colormap = fixedcolormap;
+    
+    // draw the columns
+    for (dc_x = x1 ; dc_x <= x2 ; dc_x++)
+    {
+	// calculate lighting
+	if (maskedtexturecol[dc_x] != SHRT_MAX)
+	{
+	    if (!fixedcolormap)
+	    {
+		index = spryscale>>LIGHTSCALESHIFT;
+
+		if (index >=  MAXLIGHTSCALE )
+		    index = MAXLIGHTSCALE-1;
+
+		dc_colormap = walllights[index];
+	    }
+			
+	    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
+	    dc_iscale = 0xffffffffu / (unsigned)spryscale;
+	    
+	    // draw the texture
+	    col = (column_t *)( 
+		(byte *)R_GetColumn(texnum,maskedtexturecol[dc_x]) -3);
+			
+	    R_DrawMaskedColumn (col);
+	    maskedtexturecol[dc_x] = SHRT_MAX;
+	}
+	spryscale += rw_scalestep;
+    }
+	
+}
+
+
+
+
+//
+// R_RenderSegLoop
+// Draws zero, one, or two textures (and possibly a masked
+//  texture) for walls.
+// Can draw or mark the starting pixel of floor and ceiling
+//  textures.
+// CALLED: CORE LOOPING ROUTINE.
+//
+#define HEIGHTBITS		12
+#define HEIGHTUNIT		(1<<HEIGHTBITS)
+
+void R_RenderSegLoop (void)
+{
+    angle_t		angle;
+    unsigned		index;
+    int			yl;
+    int			yh;
+    int			mid;
+    fixed_t		texturecolumn;
+    int			top;
+    int			bottom;
+
+    for ( ; rw_x < rw_stopx ; rw_x++)
+    {
+	// mark floor / ceiling areas
+	yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
+
+	// no space above wall?
+	if (yl < ceilingclip[rw_x]+1)
+	    yl = ceilingclip[rw_x]+1;
+	
+	if (markceiling)
+	{
+	    top = ceilingclip[rw_x]+1;
+	    bottom = yl-1;
+
+	    if (bottom >= floorclip[rw_x])
+		bottom = floorclip[rw_x]-1;
+
+	    if (top <= bottom)
+	    {
+		ceilingplane->top[rw_x] = top;
+		ceilingplane->bottom[rw_x] = bottom;
+	    }
+	}
+		
+	yh = bottomfrac>>HEIGHTBITS;
+
+	if (yh >= floorclip[rw_x])
+	    yh = floorclip[rw_x]-1;
+
+	if (markfloor)
+	{
+	    top = yh+1;
+	    bottom = floorclip[rw_x]-1;
+	    if (top <= ceilingclip[rw_x])
+		top = ceilingclip[rw_x]+1;
+	    if (top <= bottom)
+	    {
+		floorplane->top[rw_x] = top;
+		floorplane->bottom[rw_x] = bottom;
+	    }
+	}
+	
+	// texturecolumn and lighting are independent of wall tiers
+	if (segtextured)
+	{
+	    // calculate texture offset
+	    angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
+	    texturecolumn = rw_offset-FixedMul(finetangent[angle],rw_distance);
+	    texturecolumn >>= FRACBITS;
+	    // calculate lighting
+	    index = rw_scale>>LIGHTSCALESHIFT;
+
+	    if (index >=  MAXLIGHTSCALE )
+		index = MAXLIGHTSCALE-1;
+
+	    dc_colormap = walllights[index];
+	    dc_x = rw_x;
+	    dc_iscale = 0xffffffffu / (unsigned)rw_scale;
+	}
+        else
+        {
+            // purely to shut up the compiler
+
+            texturecolumn = 0;
+        }
+	
+	// draw the wall tiers
+	if (midtexture)
+	{
+	    // single sided line
+	    dc_yl = yl;
+	    dc_yh = yh;
+	    dc_texturemid = rw_midtexturemid;
+	    dc_source = R_GetColumn(midtexture,texturecolumn);
+	    colfunc ();
+	    ceilingclip[rw_x] = viewheight;
+	    floorclip[rw_x] = -1;
+	}
+	else
+	{
+	    // two sided line
+	    if (toptexture)
+	    {
+		// top wall
+		mid = pixhigh>>HEIGHTBITS;
+		pixhigh += pixhighstep;
+
+		if (mid >= floorclip[rw_x])
+		    mid = floorclip[rw_x]-1;
+
+		if (mid >= yl)
+		{
+		    dc_yl = yl;
+		    dc_yh = mid;
+		    dc_texturemid = rw_toptexturemid;
+		    dc_source = R_GetColumn(toptexture,texturecolumn);
+		    colfunc ();
+		    ceilingclip[rw_x] = mid;
+		}
+		else
+		    ceilingclip[rw_x] = yl-1;
+	    }
+	    else
+	    {
+		// no top wall
+		if (markceiling)
+		    ceilingclip[rw_x] = yl-1;
+	    }
+			
+	    if (bottomtexture)
+	    {
+		// bottom wall
+		mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
+		pixlow += pixlowstep;
+
+		// no space above wall?
+		if (mid <= ceilingclip[rw_x])
+		    mid = ceilingclip[rw_x]+1;
+		
+		if (mid <= yh)
+		{
+		    dc_yl = mid;
+		    dc_yh = yh;
+		    dc_texturemid = rw_bottomtexturemid;
+		    dc_source = R_GetColumn(bottomtexture,
+					    texturecolumn);
+		    colfunc ();
+		    floorclip[rw_x] = mid;
+		}
+		else
+		    floorclip[rw_x] = yh+1;
+	    }
+	    else
+	    {
+		// no bottom wall
+		if (markfloor)
+		    floorclip[rw_x] = yh+1;
+	    }
+			
+	    if (maskedtexture)
+	    {
+		// save texturecol
+		//  for backdrawing of masked mid texture
+		maskedtexturecol[rw_x] = texturecolumn;
+	    }
+	}
+		
+	rw_scale += rw_scalestep;
+	topfrac += topstep;
+	bottomfrac += bottomstep;
+    }
+}
+
+
+
+
+//
+// R_StoreWallRange
+// A wall segment will be drawn
+//  between start and stop pixels (inclusive).
+//
+void
+R_StoreWallRange
+( int	start,
+  int	stop )
+{
+    fixed_t		hyp;
+    fixed_t		sineval;
+    angle_t		distangle, offsetangle;
+    fixed_t		vtop;
+    int			lightnum;
+
+    // don't overflow and crash
+    if (ds_p == &drawsegs[MAXDRAWSEGS])
+	return;		
+		
+#ifdef RANGECHECK
+    if (start >=viewwidth || start > stop)
+	I_Error ("Bad R_RenderWallRange: %i to %i", start , stop);
+#endif
+    
+    sidedef = curline->sidedef;
+    linedef = curline->linedef;
+
+    // mark the segment as visible for auto map
+    linedef->flags |= ML_MAPPED;
+    
+    // calculate rw_distance for scale calculation
+    rw_normalangle = curline->angle + ANG90;
+    offsetangle = abs((int)rw_normalangle-(int)rw_angle1);
+    
+    if (offsetangle > ANG90)
+	offsetangle = ANG90;
+
+    distangle = ANG90 - offsetangle;
+    hyp = R_PointToDist (curline->v1->x, curline->v1->y);
+    sineval = finesine[distangle>>ANGLETOFINESHIFT];
+    rw_distance = FixedMul (hyp, sineval);
+		
+	
+    ds_p->x1 = rw_x = start;
+    ds_p->x2 = stop;
+    ds_p->curline = curline;
+    rw_stopx = stop+1;
+    
+    // calculate scale at both ends and step
+    ds_p->scale1 = rw_scale = 
+	R_ScaleFromGlobalAngle (viewangle + xtoviewangle[start]);
+    
+    if (stop > start )
+    {
+	ds_p->scale2 = R_ScaleFromGlobalAngle (viewangle + xtoviewangle[stop]);
+	ds_p->scalestep = rw_scalestep = 
+	    (ds_p->scale2 - rw_scale) / (stop-start);
+    }
+    else
+    {
+	// UNUSED: try to fix the stretched line bug
+#if 0
+	if (rw_distance < FRACUNIT/2)
+	{
+	    fixed_t		trx,try;
+	    fixed_t		gxt,gyt;
+
+	    trx = curline->v1->x - viewx;
+	    try = curline->v1->y - viewy;
+			
+	    gxt = FixedMul(trx,viewcos); 
+	    gyt = -FixedMul(try,viewsin); 
+	    ds_p->scale1 = FixedDiv(projection, gxt-gyt)<<detailshift;
+	}
+#endif
+	ds_p->scale2 = ds_p->scale1;
+    }
+    
+    // calculate texture boundaries
+    //  and decide if floor / ceiling marks are needed
+    worldtop = frontsector->ceilingheight - viewz;
+    worldbottom = frontsector->floorheight - viewz;
+	
+    midtexture = toptexture = bottomtexture = maskedtexture = 0;
+    ds_p->maskedtexturecol = NULL;
+	
+    if (!backsector)
+    {
+	// single sided line
+	midtexture = texturetranslation[sidedef->midtexture];
+	// a single sided line is terminal, so it must mark ends
+	markfloor = markceiling = true;
+	if (linedef->flags & ML_DONTPEGBOTTOM)
+	{
+	    vtop = frontsector->floorheight +
+		textureheight[sidedef->midtexture];
+	    // bottom of texture at bottom
+	    rw_midtexturemid = vtop - viewz;	
+	}
+	else
+	{
+	    // top of texture at top
+	    rw_midtexturemid = worldtop;
+	}
+	rw_midtexturemid += sidedef->rowoffset;
+
+	ds_p->silhouette = SIL_BOTH;
+	ds_p->sprtopclip = screenheightarray;
+	ds_p->sprbottomclip = negonearray;
+	ds_p->bsilheight = INT_MAX;
+	ds_p->tsilheight = INT_MIN;
+    }
+    else
+    {
+	// two sided line
+	ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
+	ds_p->silhouette = 0;
+	
+	if (frontsector->floorheight > backsector->floorheight)
+	{
+	    ds_p->silhouette = SIL_BOTTOM;
+	    ds_p->bsilheight = frontsector->floorheight;
+	}
+	else if (backsector->floorheight > viewz)
+	{
+	    ds_p->silhouette = SIL_BOTTOM;
+	    ds_p->bsilheight = INT_MAX;
+	    // ds_p->sprbottomclip = negonearray;
+	}
+	
+	if (frontsector->ceilingheight < backsector->ceilingheight)
+	{
+	    ds_p->silhouette |= SIL_TOP;
+	    ds_p->tsilheight = frontsector->ceilingheight;
+	}
+	else if (backsector->ceilingheight < viewz)
+	{
+	    ds_p->silhouette |= SIL_TOP;
+	    ds_p->tsilheight = INT_MIN;
+	    // ds_p->sprtopclip = screenheightarray;
+	}
+		
+	if (backsector->ceilingheight <= frontsector->floorheight)
+	{
+	    ds_p->sprbottomclip = negonearray;
+	    ds_p->bsilheight = INT_MAX;
+	    ds_p->silhouette |= SIL_BOTTOM;
+	}
+	
+	if (backsector->floorheight >= frontsector->ceilingheight)
+	{
+	    ds_p->sprtopclip = screenheightarray;
+	    ds_p->tsilheight = INT_MIN;
+	    ds_p->silhouette |= SIL_TOP;
+	}
+	
+	worldhigh = backsector->ceilingheight - viewz;
+	worldlow = backsector->floorheight - viewz;
+		
+	// hack to allow height changes in outdoor areas
+	if (frontsector->ceilingpic == skyflatnum 
+	    && backsector->ceilingpic == skyflatnum)
+	{
+	    worldtop = worldhigh;
+	}
+	
+			
+	if (worldlow != worldbottom 
+	    || backsector->floorpic != frontsector->floorpic
+	    || backsector->lightlevel != frontsector->lightlevel)
+	{
+	    markfloor = true;
+	}
+	else
+	{
+	    // same plane on both sides
+	    markfloor = false;
+	}
+	
+			
+	if (worldhigh != worldtop 
+	    || backsector->ceilingpic != frontsector->ceilingpic
+	    || backsector->lightlevel != frontsector->lightlevel)
+	{
+	    markceiling = true;
+	}
+	else
+	{
+	    // same plane on both sides
+	    markceiling = false;
+	}
+	
+	if (backsector->ceilingheight <= frontsector->floorheight
+	    || backsector->floorheight >= frontsector->ceilingheight)
+	{
+	    // closed door
+	    markceiling = markfloor = true;
+	}
+	
+
+	if (worldhigh < worldtop)
+	{
+	    // top texture
+	    toptexture = texturetranslation[sidedef->toptexture];
+	    if (linedef->flags & ML_DONTPEGTOP)
+	    {
+		// top of texture at top
+		rw_toptexturemid = worldtop;
+	    }
+	    else
+	    {
+		vtop =
+		    backsector->ceilingheight
+		    + textureheight[sidedef->toptexture];
+		
+		// bottom of texture
+		rw_toptexturemid = vtop - viewz;	
+	    }
+	}
+	if (worldlow > worldbottom)
+	{
+	    // bottom texture
+	    bottomtexture = texturetranslation[sidedef->bottomtexture];
+
+	    if (linedef->flags & ML_DONTPEGBOTTOM )
+	    {
+		// bottom of texture at bottom
+		// top of texture at top
+		rw_bottomtexturemid = worldtop;
+	    }
+	    else	// top of texture at top
+		rw_bottomtexturemid = worldlow;
+	}
+	rw_toptexturemid += sidedef->rowoffset;
+	rw_bottomtexturemid += sidedef->rowoffset;
+	
+	// allocate space for masked texture tables
+	if (sidedef->midtexture)
+	{
+	    // masked midtexture
+	    maskedtexture = true;
+	    ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
+	    lastopening += rw_stopx - rw_x;
+	}
+    }
+    
+    // calculate rw_offset (only needed for textured lines)
+    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
+
+    if (segtextured)
+    {
+	offsetangle = rw_normalangle-rw_angle1;
+	
+	if (offsetangle > ANG180)
+	    offsetangle = -offsetangle;
+
+	if (offsetangle > ANG90)
+	    offsetangle = ANG90;
+
+	sineval = finesine[offsetangle >>ANGLETOFINESHIFT];
+	rw_offset = FixedMul (hyp, sineval);
+
+	if (rw_normalangle-rw_angle1 < ANG180)
+	    rw_offset = -rw_offset;
+
+	rw_offset += sidedef->textureoffset + curline->offset;
+	rw_centerangle = ANG90 + viewangle - rw_normalangle;
+	
+	// calculate light table
+	//  use different light tables
+	//  for horizontal / vertical / diagonal
+	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+	if (!fixedcolormap)
+	{
+	    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+	    if (curline->v1->y == curline->v2->y)
+		lightnum--;
+	    else if (curline->v1->x == curline->v2->x)
+		lightnum++;
+
+	    if (lightnum < 0)		
+		walllights = scalelight[0];
+	    else if (lightnum >= LIGHTLEVELS)
+		walllights = scalelight[LIGHTLEVELS-1];
+	    else
+		walllights = scalelight[lightnum];
+	}
+    }
+    
+    // if a floor / ceiling plane is on the wrong side
+    //  of the view plane, it is definitely invisible
+    //  and doesn't need to be marked.
+    
+  
+    if (frontsector->floorheight >= viewz)
+    {
+	// above view plane
+	markfloor = false;
+    }
+    
+    if (frontsector->ceilingheight <= viewz 
+	&& frontsector->ceilingpic != skyflatnum)
+    {
+	// below view plane
+	markceiling = false;
+    }
+
+    
+    // calculate incremental stepping values for texture edges
+    worldtop >>= 4;
+    worldbottom >>= 4;
+	
+    topstep = -FixedMul (rw_scalestep, worldtop);
+    topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
+
+    bottomstep = -FixedMul (rw_scalestep,worldbottom);
+    bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
+	
+    if (backsector)
+    {	
+	worldhigh >>= 4;
+	worldlow >>= 4;
+
+	if (worldhigh < worldtop)
+	{
+	    pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
+	    pixhighstep = -FixedMul (rw_scalestep,worldhigh);
+	}
+	
+	if (worldlow > worldbottom)
+	{
+	    pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
+	    pixlowstep = -FixedMul (rw_scalestep,worldlow);
+	}
+    }
+    
+    // render it
+    if (markceiling)
+	ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
+    
+    if (markfloor)
+	floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
+
+    R_RenderSegLoop ();
+
+    
+    // save sprite clipping info
+    if ( ((ds_p->silhouette & SIL_TOP) || maskedtexture)
+	 && !ds_p->sprtopclip)
+    {
+	memcpy (lastopening, ceilingclip+start, sizeof(*lastopening)*(rw_stopx-start));
+	ds_p->sprtopclip = lastopening - start;
+	lastopening += rw_stopx - start;
+    }
+    
+    if ( ((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
+	 && !ds_p->sprbottomclip)
+    {
+	memcpy (lastopening, floorclip+start, sizeof(*lastopening)*(rw_stopx-start));
+	ds_p->sprbottomclip = lastopening - start;
+	lastopening += rw_stopx - start;	
+    }
+
+    if (maskedtexture && !(ds_p->silhouette&SIL_TOP))
+    {
+	ds_p->silhouette |= SIL_TOP;
+	ds_p->tsilheight = INT_MIN;
+    }
+    if (maskedtexture && !(ds_p->silhouette&SIL_BOTTOM))
+    {
+	ds_p->silhouette |= SIL_BOTTOM;
+	ds_p->bsilheight = INT_MAX;
+    }
+    ds_p++;
+}
+
diff --git a/games/NXDoom/src/doom/r_segs.h b/games/NXDoom/src/doom/r_segs.h
new file mode 100644
index 000000000..8e6a768f4
--- /dev/null
+++ b/games/NXDoom/src/doom/r_segs.h
@@ -0,0 +1,34 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh module, drawing LineSegs from BSP.
+//
+
+
+#ifndef __R_SEGS__
+#define __R_SEGS__
+
+
+extern lighttable_t **walllights;
+
+
+void
+R_RenderMaskedSegRange
+( drawseg_t*	ds,
+  int		x1,
+  int		x2 );
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_sky.c b/games/NXDoom/src/doom/r_sky.c
new file mode 100644
index 000000000..bcd5a75bb
--- /dev/null
+++ b/games/NXDoom/src/doom/r_sky.c
@@ -0,0 +1,52 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Sky rendering. The DOOM sky is a texture map like any
+//  wall, wrapping around. A 1024 columns equal 360 degrees.
+//  The default sky map is 256 columns and repeats 4 times
+//  on a 320 screen?
+//  
+//
+
+
+
+// Needed for FRACUNIT.
+#include "m_fixed.h"
+
+// Needed for Flat retrieval.
+#include "r_data.h"
+
+
+#include "r_sky.h"
+
+//
+// sky mapping
+//
+int			skyflatnum;
+int			skytexture;
+int			skytexturemid;
+
+
+
+//
+// R_InitSkyMap
+// Called whenever the view size changes.
+//
+void R_InitSkyMap (void)
+{
+  // skyflatnum = R_FlatNumForName ( SKYFLATNAME );
+    skytexturemid = SCREENHEIGHT/2*FRACUNIT;
+}
+
diff --git a/games/NXDoom/src/doom/r_sky.h b/games/NXDoom/src/doom/r_sky.h
new file mode 100644
index 000000000..8ad6680aa
--- /dev/null
+++ b/games/NXDoom/src/doom/r_sky.h
@@ -0,0 +1,37 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Sky rendering.
+//
+
+
+#ifndef __R_SKY__
+#define __R_SKY__
+
+
+
+// SKY, store the number for name.
+#define			SKYFLATNAME  "F_SKY1"
+
+// The sky map is 256*128*4 maps.
+#define ANGLETOSKYSHIFT		22
+
+extern  int		skytexture;
+extern int		skytexturemid;
+
+// Called whenever the view size changes.
+void R_InitSkyMap (void);
+
+#endif
diff --git a/games/NXDoom/src/doom/r_state.h b/games/NXDoom/src/doom/r_state.h
new file mode 100644
index 000000000..2a60e2fe8
--- /dev/null
+++ b/games/NXDoom/src/doom/r_state.h
@@ -0,0 +1,127 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh/render internal state variables (global).
+//
+
+
+#ifndef __R_STATE__
+#define __R_STATE__
+
+// Need data structure definitions.
+#include "d_player.h"
+#include "r_data.h"
+
+
+
+
+
+
+//
+// Refresh internal data structures,
+//  for rendering.
+//
+
+// needed for texture pegging
+extern fixed_t*		textureheight;
+
+// needed for pre rendering (fracs)
+extern fixed_t*		spritewidth;
+
+extern fixed_t*		spriteoffset;
+extern fixed_t*		spritetopoffset;
+
+extern lighttable_t*	colormaps;
+
+extern int		viewwidth;
+extern int		scaledviewwidth;
+extern int		viewheight;
+
+extern int		firstflat;
+
+// for global animation
+extern int*		flattranslation;	
+extern int*		texturetranslation;	
+
+
+// Sprite....
+extern int		firstspritelump;
+extern int		lastspritelump;
+extern int		numspritelumps;
+
+
+
+//
+// Lookup tables for map data.
+//
+extern int		numsprites;
+extern spritedef_t*	sprites;
+
+extern int		numvertexes;
+extern vertex_t*	vertexes;
+
+extern int		numsegs;
+extern seg_t*		segs;
+
+extern int		numsectors;
+extern sector_t*	sectors;
+
+extern int		numsubsectors;
+extern subsector_t*	subsectors;
+
+extern int		numnodes;
+extern node_t*		nodes;
+
+extern int		numlines;
+extern line_t*		lines;
+
+extern int		numsides;
+extern side_t*		sides;
+
+
+//
+// POV data.
+//
+extern fixed_t		viewx;
+extern fixed_t		viewy;
+extern fixed_t		viewz;
+
+extern angle_t		viewangle;
+extern player_t*	viewplayer;
+
+
+// ?
+extern angle_t		clipangle;
+
+extern int		viewangletox[FINEANGLES/2];
+extern angle_t		xtoviewangle[SCREENWIDTH+1];
+//extern fixed_t		finetangent[FINEANGLES/2];
+
+extern fixed_t		rw_distance;
+extern angle_t		rw_normalangle;
+
+
+
+// angle to line origin
+extern int		rw_angle1;
+
+// Segs count?
+extern int		sscount;
+
+extern visplane_t*	floorplane;
+extern visplane_t*	ceilingplane;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/r_things.c b/games/NXDoom/src/doom/r_things.c
new file mode 100644
index 000000000..5533fd9bf
--- /dev/null
+++ b/games/NXDoom/src/doom/r_things.c
@@ -0,0 +1,982 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh of things, i.e. objects represented by sprites.
+//
+
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+
+#include "deh_main.h"
+#include "doomdef.h"
+
+#include "i_swap.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+
+#include "doomstat.h"
+
+
+
+#define MINZ				(FRACUNIT*4)
+#define BASEYCENTER			(SCREENHEIGHT/2)
+
+//void R_DrawColumn (void);
+//void R_DrawFuzzColumn (void);
+
+
+
+typedef struct
+{
+    int		x1;
+    int		x2;
+	
+    int		column;
+    int		topclip;
+    int		bottomclip;
+
+} maskdraw_t;
+
+
+
+//
+// Sprite rotation 0 is facing the viewer,
+//  rotation 1 is one angle turn CLOCKWISE around the axis.
+// This is not the same as the angle,
+//  which increases counter clockwise (protractor).
+// There was a lot of stuff grabbed wrong, so I changed it...
+//
+fixed_t		pspritescale;
+fixed_t		pspriteiscale;
+
+lighttable_t**	spritelights;
+
+// constant arrays
+//  used for psprite clipping and initializing clipping
+short		negonearray[SCREENWIDTH];
+short		screenheightarray[SCREENWIDTH];
+
+
+//
+// INITIALIZATION FUNCTIONS
+//
+
+// variables used to look up
+//  and range check thing_t sprites patches
+spritedef_t*	sprites;
+int		numsprites;
+
+spriteframe_t	sprtemp[29];
+int		maxframe;
+const char	*spritename;
+
+
+
+
+//
+// R_InstallSpriteLump
+// Local function for R_InitSprites.
+//
+void
+R_InstallSpriteLump
+( int		lump,
+  unsigned	frame,
+  unsigned	rotation,
+  boolean	flipped )
+{
+    int		r;
+	
+    if (frame >= 29 || rotation > 8)
+	I_Error("R_InstallSpriteLump: "
+		"Bad frame characters in lump %i", lump);
+	
+    if ((int)frame > maxframe)
+	maxframe = frame;
+		
+    if (rotation == 0)
+    {
+	// the lump should be used for all rotations
+	if (sprtemp[frame].rotate == false)
+	    I_Error ("R_InitSprites: Sprite %s frame %c has "
+		     "multip rot=0 lump", spritename, 'A'+frame);
+
+	if (sprtemp[frame].rotate == true)
+	    I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
+		     "and a rot=0 lump", spritename, 'A'+frame);
+			
+	sprtemp[frame].rotate = false;
+	for (r=0 ; r<8 ; r++)
+	{
+	    sprtemp[frame].lump[r] = lump - firstspritelump;
+	    sprtemp[frame].flip[r] = (byte)flipped;
+	}
+	return;
+    }
+	
+    // the lump is only used for one rotation
+    if (sprtemp[frame].rotate == false)
+	I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
+		 "and a rot=0 lump", spritename, 'A'+frame);
+		
+    sprtemp[frame].rotate = true;
+
+    // make 0 based
+    rotation--;		
+    if (sprtemp[frame].lump[rotation] != -1)
+	I_Error ("R_InitSprites: Sprite %s : %c : %c "
+		 "has two lumps mapped to it",
+		 spritename, 'A'+frame, '1'+rotation);
+		
+    sprtemp[frame].lump[rotation] = lump - firstspritelump;
+    sprtemp[frame].flip[rotation] = (byte)flipped;
+}
+
+
+
+
+//
+// R_InitSpriteDefs
+// Pass a null terminated list of sprite names
+//  (4 chars exactly) to be used.
+// Builds the sprite rotation matrixes to account
+//  for horizontally flipped sprites.
+// Will report an error if the lumps are inconsistant. 
+// Only called at startup.
+//
+// Sprite lump names are 4 characters for the actor,
+//  a letter for the frame, and a number for the rotation.
+// A sprite that is flippable will have an additional
+//  letter/number appended.
+// The rotation character can be 0 to signify no rotations.
+//
+void R_InitSpriteDefs(const char **namelist)
+{ 
+    const char **check;
+    int		i;
+    int		l;
+    int		frame;
+    int		rotation;
+    int		start;
+    int		end;
+    int		patched;
+		
+    // count the number of sprite names
+    check = namelist;
+    while (*check != NULL)
+	check++;
+
+    numsprites = check-namelist;
+	
+    if (!numsprites)
+	return;
+		
+    sprites = Z_Malloc(numsprites *sizeof(*sprites), PU_STATIC, NULL);
+	
+    start = firstspritelump-1;
+    end = lastspritelump+1;
+	
+    // scan all the lump names for each of the names,
+    //  noting the highest frame letter.
+    // Just compare 4 characters as ints
+    for (i=0 ; i<numsprites ; i++)
+    {
+	spritename = DEH_String(namelist[i]);
+	memset (sprtemp,-1, sizeof(sprtemp));
+		
+	maxframe = -1;
+	
+	// scan the lumps,
+	//  filling in the frames for whatever is found
+	for (l=start+1 ; l<end ; l++)
+	{
+	    if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
+	    {
+		frame = lumpinfo[l]->name[4] - 'A';
+		rotation = lumpinfo[l]->name[5] - '0';
+
+		if (modifiedgame)
+		    patched = W_GetNumForName (lumpinfo[l]->name);
+		else
+		    patched = l;
+
+		R_InstallSpriteLump (patched, frame, rotation, false);
+
+		if (lumpinfo[l]->name[6])
+		{
+		    frame = lumpinfo[l]->name[6] - 'A';
+		    rotation = lumpinfo[l]->name[7] - '0';
+		    R_InstallSpriteLump (l, frame, rotation, true);
+		}
+	    }
+	}
+	
+	// check the frames that were found for completeness
+	if (maxframe == -1)
+	{
+	    sprites[i].numframes = 0;
+	    continue;
+	}
+		
+	maxframe++;
+	
+	for (frame = 0 ; frame < maxframe ; frame++)
+	{
+	    switch ((int)sprtemp[frame].rotate)
+	    {
+	      case -1:
+		// no rotations were found for that frame at all
+		I_Error ("R_InitSprites: No patches found "
+			 "for %s frame %c", spritename, frame+'A');
+		break;
+		
+	      case 0:
+		// only the first rotation is needed
+		break;
+			
+	      case 1:
+		// must have all 8 frames
+		for (rotation=0 ; rotation<8 ; rotation++)
+		    if (sprtemp[frame].lump[rotation] == -1)
+			I_Error ("R_InitSprites: Sprite %s frame %c "
+				 "is missing rotations",
+				 spritename, frame+'A');
+		break;
+	    }
+	}
+	
+	// allocate space for the frames present and copy sprtemp to it
+	sprites[i].numframes = maxframe;
+	sprites[i].spriteframes = 
+	    Z_Malloc (maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
+	memcpy (sprites[i].spriteframes, sprtemp, maxframe*sizeof(spriteframe_t));
+    }
+
+}
+
+
+
+
+//
+// GAME FUNCTIONS
+//
+vissprite_t	vissprites[MAXVISSPRITES];
+vissprite_t*	vissprite_p;
+int		newvissprite;
+
+
+
+//
+// R_InitSprites
+// Called at program start.
+//
+void R_InitSprites(const char **namelist)
+{
+    int		i;
+	
+    for (i=0 ; i<SCREENWIDTH ; i++)
+    {
+	negonearray[i] = -1;
+    }
+	
+    R_InitSpriteDefs (namelist);
+}
+
+
+
+//
+// R_ClearSprites
+// Called at frame start.
+//
+void R_ClearSprites (void)
+{
+    vissprite_p = vissprites;
+}
+
+
+//
+// R_NewVisSprite
+//
+vissprite_t	overflowsprite;
+
+vissprite_t* R_NewVisSprite (void)
+{
+    if (vissprite_p == &vissprites[MAXVISSPRITES])
+	return &overflowsprite;
+    
+    vissprite_p++;
+    return vissprite_p-1;
+}
+
+
+
+//
+// R_DrawMaskedColumn
+// Used for sprites and masked mid textures.
+// Masked means: partly transparent, i.e. stored
+//  in posts/runs of opaque pixels.
+//
+short*		mfloorclip;
+short*		mceilingclip;
+
+fixed_t		spryscale;
+fixed_t		sprtopscreen;
+
+void R_DrawMaskedColumn (column_t* column)
+{
+    int		topscreen;
+    int 	bottomscreen;
+    fixed_t	basetexturemid;
+	
+    basetexturemid = dc_texturemid;
+	
+    for ( ; column->topdelta != 0xff ; ) 
+    {
+	// calculate unclipped screen coordinates
+	//  for post
+	topscreen = sprtopscreen + spryscale*column->topdelta;
+	bottomscreen = topscreen + spryscale*column->length;
+
+	dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
+	dc_yh = (bottomscreen-1)>>FRACBITS;
+		
+	if (dc_yh >= mfloorclip[dc_x])
+	    dc_yh = mfloorclip[dc_x]-1;
+	if (dc_yl <= mceilingclip[dc_x])
+	    dc_yl = mceilingclip[dc_x]+1;
+
+	if (dc_yl <= dc_yh)
+	{
+	    dc_source = (byte *)column + 3;
+	    dc_texturemid = basetexturemid - (column->topdelta<<FRACBITS);
+	    // dc_source = (byte *)column + 3 - column->topdelta;
+
+	    // Drawn by either R_DrawColumn
+	    //  or (SHADOW) R_DrawFuzzColumn.
+	    colfunc ();	
+	}
+	column = (column_t *)(  (byte *)column + column->length + 4);
+    }
+	
+    dc_texturemid = basetexturemid;
+}
+
+
+
+//
+// R_DrawVisSprite
+//  mfloorclip and mceilingclip should also be set.
+//
+void
+R_DrawVisSprite
+( vissprite_t*		vis,
+  int			x1,
+  int			x2 )
+{
+    column_t*		column;
+    int			texturecolumn;
+    fixed_t		frac;
+    patch_t*		patch;
+	
+	
+    patch = W_CacheLumpNum (vis->patch+firstspritelump, PU_CACHE);
+
+    dc_colormap = vis->colormap;
+    
+    if (!dc_colormap)
+    {
+	// NULL colormap = shadow draw
+	colfunc = fuzzcolfunc;
+    }
+    else if (vis->mobjflags & MF_TRANSLATION)
+    {
+	colfunc = transcolfunc;
+	dc_translation = translationtables - 256 +
+	    ( (vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT-8) );
+    }
+	
+    dc_iscale = abs(vis->xiscale)>>detailshift;
+    dc_texturemid = vis->texturemid;
+    frac = vis->startfrac;
+    spryscale = vis->scale;
+    sprtopscreen = centeryfrac - FixedMul(dc_texturemid,spryscale);
+	
+    for (dc_x=vis->x1 ; dc_x<=vis->x2 ; dc_x++, frac += vis->xiscale)
+    {
+	texturecolumn = frac>>FRACBITS;
+#ifdef RANGECHECK
+	if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
+	    I_Error ("R_DrawSpriteRange: bad texturecolumn");
+#endif
+	column = (column_t *) ((byte *)patch +
+			       LONG(patch->columnofs[texturecolumn]));
+	R_DrawMaskedColumn (column);
+    }
+
+    colfunc = basecolfunc;
+}
+
+
+
+//
+// R_ProjectSprite
+// Generates a vissprite for a thing
+//  if it might be visible.
+//
+void R_ProjectSprite (mobj_t* thing)
+{
+    fixed_t		tr_x;
+    fixed_t		tr_y;
+    
+    fixed_t		gxt;
+    fixed_t		gyt;
+    
+    fixed_t		tx;
+    fixed_t		tz;
+
+    fixed_t		xscale;
+    
+    int			x1;
+    int			x2;
+
+    spritedef_t*	sprdef;
+    spriteframe_t*	sprframe;
+    int			lump;
+    
+    unsigned		rot;
+    boolean		flip;
+    
+    int			index;
+
+    vissprite_t*	vis;
+    
+    angle_t		ang;
+    fixed_t		iscale;
+    
+    // transform the origin point
+    tr_x = thing->x - viewx;
+    tr_y = thing->y - viewy;
+	
+    gxt = FixedMul(tr_x,viewcos); 
+    gyt = -FixedMul(tr_y,viewsin);
+    
+    tz = gxt-gyt; 
+
+    // thing is behind view plane?
+    if (tz < MINZ)
+	return;
+    
+    xscale = FixedDiv(projection, tz);
+	
+    gxt = -FixedMul(tr_x,viewsin); 
+    gyt = FixedMul(tr_y,viewcos); 
+    tx = -(gyt+gxt); 
+
+    // too far off the side?
+    if (abs(tx)>(tz<<2))
+	return;
+    
+    // decide which patch to use for sprite relative to player
+#ifdef RANGECHECK
+    if ((unsigned int) thing->sprite >= (unsigned int) numsprites)
+	I_Error ("R_ProjectSprite: invalid sprite number %i ",
+		 thing->sprite);
+#endif
+    sprdef = &sprites[thing->sprite];
+#ifdef RANGECHECK
+    if ( (thing->frame&FF_FRAMEMASK) >= sprdef->numframes )
+	I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
+		 thing->sprite, thing->frame);
+#endif
+    sprframe = &sprdef->spriteframes[ thing->frame & FF_FRAMEMASK];
+
+    if (sprframe->rotate)
+    {
+	// choose a different rotation based on player view
+	ang = R_PointToAngle (thing->x, thing->y);
+	rot = (ang-thing->angle+(unsigned)(ANG45/2)*9)>>29;
+	lump = sprframe->lump[rot];
+	flip = (boolean)sprframe->flip[rot];
+    }
+    else
+    {
+	// use single rotation for all views
+	lump = sprframe->lump[0];
+	flip = (boolean)sprframe->flip[0];
+    }
+    
+    // calculate edges of the shape
+    tx -= spriteoffset[lump];	
+    x1 = (centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS;
+
+    // off the right side?
+    if (x1 > viewwidth)
+	return;
+    
+    tx +=  spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS) - 1;
+
+    // off the left side
+    if (x2 < 0)
+	return;
+    
+    // store information in a vissprite
+    vis = R_NewVisSprite ();
+    vis->mobjflags = thing->flags;
+    vis->scale = xscale<<detailshift;
+    vis->gx = thing->x;
+    vis->gy = thing->y;
+    vis->gz = thing->z;
+    vis->gzt = thing->z + spritetopoffset[lump];
+    vis->texturemid = vis->gzt - viewz;
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
+    iscale = FixedDiv (FRACUNIT, xscale);
+
+    if (flip)
+    {
+	vis->startfrac = spritewidth[lump]-1;
+	vis->xiscale = -iscale;
+    }
+    else
+    {
+	vis->startfrac = 0;
+	vis->xiscale = iscale;
+    }
+
+    if (vis->x1 > x1)
+	vis->startfrac += vis->xiscale*(vis->x1-x1);
+    vis->patch = lump;
+    
+    // get light level
+    if (thing->flags & MF_SHADOW)
+    {
+	// shadow draw
+	vis->colormap = NULL;
+    }
+    else if (fixedcolormap)
+    {
+	// fixed map
+	vis->colormap = fixedcolormap;
+    }
+    else if (thing->frame & FF_FULLBRIGHT)
+    {
+	// full bright
+	vis->colormap = colormaps;
+    }
+    
+    else
+    {
+	// diminished light
+	index = xscale>>(LIGHTSCALESHIFT-detailshift);
+
+	if (index >= MAXLIGHTSCALE) 
+	    index = MAXLIGHTSCALE-1;
+
+	vis->colormap = spritelights[index];
+    }	
+}
+
+
+
+
+//
+// R_AddSprites
+// During BSP traversal, this adds sprites by sector.
+//
+void R_AddSprites (sector_t* sec)
+{
+    mobj_t*		thing;
+    int			lightnum;
+
+    // BSP is traversed by subsector.
+    // A sector might have been split into several
+    //  subsectors during BSP building.
+    // Thus we check whether its already added.
+    if (sec->validcount == validcount)
+	return;		
+
+    // Well, now it will be done.
+    sec->validcount = validcount;
+	
+    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+    if (lightnum < 0)		
+	spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+	spritelights = scalelight[LIGHTLEVELS-1];
+    else
+	spritelights = scalelight[lightnum];
+
+    // Handle all things in sector.
+    for (thing = sec->thinglist ; thing ; thing = thing->snext)
+	R_ProjectSprite (thing);
+}
+
+
+//
+// R_DrawPSprite
+//
+void R_DrawPSprite (pspdef_t* psp)
+{
+    fixed_t		tx;
+    int			x1;
+    int			x2;
+    spritedef_t*	sprdef;
+    spriteframe_t*	sprframe;
+    int			lump;
+    boolean		flip;
+    vissprite_t*	vis;
+    vissprite_t		avis;
+    
+    // decide which patch to use
+#ifdef RANGECHECK
+    if ( (unsigned)psp->state->sprite >= (unsigned int) numsprites)
+	I_Error ("R_ProjectSprite: invalid sprite number %i ",
+		 psp->state->sprite);
+#endif
+    sprdef = &sprites[psp->state->sprite];
+#ifdef RANGECHECK
+    if ( (psp->state->frame & FF_FRAMEMASK)  >= sprdef->numframes)
+	I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
+		 psp->state->sprite, psp->state->frame);
+#endif
+    sprframe = &sprdef->spriteframes[ psp->state->frame & FF_FRAMEMASK ];
+
+    lump = sprframe->lump[0];
+    flip = (boolean)sprframe->flip[0];
+    
+    // calculate edges of the shape
+    tx = psp->sx-(SCREENWIDTH/2)*FRACUNIT;
+	
+    tx -= spriteoffset[lump];	
+    x1 = (centerxfrac + FixedMul (tx,pspritescale) ) >>FRACBITS;
+
+    // off the right side
+    if (x1 > viewwidth)
+	return;		
+
+    tx +=  spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul (tx, pspritescale) ) >>FRACBITS) - 1;
+
+    // off the left side
+    if (x2 < 0)
+	return;
+    
+    // store information in a vissprite
+    vis = &avis;
+    vis->mobjflags = 0;
+    vis->texturemid = (BASEYCENTER<<FRACBITS)+FRACUNIT/2-(psp->sy-spritetopoffset[lump]);
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
+    vis->scale = pspritescale<<detailshift;
+    
+    if (flip)
+    {
+	vis->xiscale = -pspriteiscale;
+	vis->startfrac = spritewidth[lump]-1;
+    }
+    else
+    {
+	vis->xiscale = pspriteiscale;
+	vis->startfrac = 0;
+    }
+    
+    if (vis->x1 > x1)
+	vis->startfrac += vis->xiscale*(vis->x1-x1);
+
+    vis->patch = lump;
+
+    if (viewplayer->powers[pw_invisibility] > 4*32
+	|| viewplayer->powers[pw_invisibility] & 8)
+    {
+	// shadow draw
+	vis->colormap = NULL;
+    }
+    else if (fixedcolormap)
+    {
+	// fixed color
+	vis->colormap = fixedcolormap;
+    }
+    else if (psp->state->frame & FF_FULLBRIGHT)
+    {
+	// full bright
+	vis->colormap = colormaps;
+    }
+    else
+    {
+	// local light
+	vis->colormap = spritelights[MAXLIGHTSCALE-1];
+    }
+	
+    R_DrawVisSprite (vis, vis->x1, vis->x2);
+}
+
+
+
+//
+// R_DrawPlayerSprites
+//
+void R_DrawPlayerSprites (void)
+{
+    int		i;
+    int		lightnum;
+    pspdef_t*	psp;
+    
+    // get light level
+    lightnum =
+	(viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) 
+	+extralight;
+
+    if (lightnum < 0)		
+	spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+	spritelights = scalelight[LIGHTLEVELS-1];
+    else
+	spritelights = scalelight[lightnum];
+    
+    // clip to screen bounds
+    mfloorclip = screenheightarray;
+    mceilingclip = negonearray;
+    
+    // add all active psprites
+    for (i=0, psp=viewplayer->psprites;
+	 i<NUMPSPRITES;
+	 i++,psp++)
+    {
+	if (psp->state)
+	    R_DrawPSprite (psp);
+    }
+}
+
+
+
+
+//
+// R_SortVisSprites
+//
+vissprite_t	vsprsortedhead;
+
+
+void R_SortVisSprites (void)
+{
+    int			i;
+    int			count;
+    vissprite_t*	ds;
+    vissprite_t*	best;
+    static vissprite_t	unsorted;
+    fixed_t		bestscale;
+
+    count = vissprite_p - vissprites;
+	
+    unsorted.next = unsorted.prev = &unsorted;
+
+    if (!count)
+	return;
+		
+    for (ds=vissprites ; ds<vissprite_p ; ds++)
+    {
+	ds->next = ds+1;
+	ds->prev = ds-1;
+    }
+    
+    vissprites[0].prev = &unsorted;
+    unsorted.next = &vissprites[0];
+    (vissprite_p-1)->next = &unsorted;
+    unsorted.prev = vissprite_p-1;
+    
+    // pull the vissprites out by scale
+
+    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
+    for (i=0 ; i<count ; i++)
+    {
+	bestscale = INT_MAX;
+        best = unsorted.next;
+	for (ds=unsorted.next ; ds!= &unsorted ; ds=ds->next)
+	{
+	    if (ds->scale < bestscale)
+	    {
+		bestscale = ds->scale;
+		best = ds;
+	    }
+	}
+	best->next->prev = best->prev;
+	best->prev->next = best->next;
+	best->next = &vsprsortedhead;
+	best->prev = vsprsortedhead.prev;
+	vsprsortedhead.prev->next = best;
+	vsprsortedhead.prev = best;
+    }
+}
+
+
+
+//
+// R_DrawSprite
+//
+void R_DrawSprite (vissprite_t* spr)
+{
+    drawseg_t*		ds;
+    short		clipbot[SCREENWIDTH];
+    short		cliptop[SCREENWIDTH];
+    int			x;
+    int			r1;
+    int			r2;
+    fixed_t		scale;
+    fixed_t		lowscale;
+    int			silhouette;
+		
+    for (x = spr->x1 ; x<=spr->x2 ; x++)
+	clipbot[x] = cliptop[x] = -2;
+    
+    // Scan drawsegs from end to start for obscuring segs.
+    // The first drawseg that has a greater scale
+    //  is the clip seg.
+    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
+    {
+	// determine if the drawseg obscures the sprite
+	if (ds->x1 > spr->x2
+	    || ds->x2 < spr->x1
+	    || (!ds->silhouette
+		&& !ds->maskedtexturecol) )
+	{
+	    // does not cover sprite
+	    continue;
+	}
+			
+	r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
+	r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
+
+	if (ds->scale1 > ds->scale2)
+	{
+	    lowscale = ds->scale2;
+	    scale = ds->scale1;
+	}
+	else
+	{
+	    lowscale = ds->scale1;
+	    scale = ds->scale2;
+	}
+		
+	if (scale < spr->scale
+	    || ( lowscale < spr->scale
+		 && !R_PointOnSegSide (spr->gx, spr->gy, ds->curline) ) )
+	{
+	    // masked mid texture?
+	    if (ds->maskedtexturecol)	
+		R_RenderMaskedSegRange (ds, r1, r2);
+	    // seg is behind sprite
+	    continue;			
+	}
+
+	
+	// clip this piece of the sprite
+	silhouette = ds->silhouette;
+	
+	if (spr->gz >= ds->bsilheight)
+	    silhouette &= ~SIL_BOTTOM;
+
+	if (spr->gzt <= ds->tsilheight)
+	    silhouette &= ~SIL_TOP;
+			
+	if (silhouette == 1)
+	{
+	    // bottom sil
+	    for (x=r1 ; x<=r2 ; x++)
+		if (clipbot[x] == -2)
+		    clipbot[x] = ds->sprbottomclip[x];
+	}
+	else if (silhouette == 2)
+	{
+	    // top sil
+	    for (x=r1 ; x<=r2 ; x++)
+		if (cliptop[x] == -2)
+		    cliptop[x] = ds->sprtopclip[x];
+	}
+	else if (silhouette == 3)
+	{
+	    // both
+	    for (x=r1 ; x<=r2 ; x++)
+	    {
+		if (clipbot[x] == -2)
+		    clipbot[x] = ds->sprbottomclip[x];
+		if (cliptop[x] == -2)
+		    cliptop[x] = ds->sprtopclip[x];
+	    }
+	}
+		
+    }
+    
+    // all clipping has been performed, so draw the sprite
+
+    // check for unclipped columns
+    for (x = spr->x1 ; x<=spr->x2 ; x++)
+    {
+	if (clipbot[x] == -2)		
+	    clipbot[x] = viewheight;
+
+	if (cliptop[x] == -2)
+	    cliptop[x] = -1;
+    }
+		
+    mfloorclip = clipbot;
+    mceilingclip = cliptop;
+    R_DrawVisSprite (spr, spr->x1, spr->x2);
+}
+
+
+
+
+//
+// R_DrawMasked
+//
+void R_DrawMasked (void)
+{
+    vissprite_t*	spr;
+    drawseg_t*		ds;
+	
+    R_SortVisSprites ();
+
+    if (vissprite_p > vissprites)
+    {
+	// draw all vissprites back to front
+	for (spr = vsprsortedhead.next ;
+	     spr != &vsprsortedhead ;
+	     spr=spr->next)
+	{
+	    
+	    R_DrawSprite (spr);
+	}
+    }
+    
+    // render any remaining masked mid textures
+    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
+	if (ds->maskedtexturecol)
+	    R_RenderMaskedSegRange (ds, ds->x1, ds->x2);
+    
+    // draw the psprites on top of everything
+    //  but does not draw on side views
+    if (!viewangleoffset)		
+	R_DrawPlayerSprites ();
+}
+
+
+
diff --git a/games/NXDoom/src/doom/r_things.h b/games/NXDoom/src/doom/r_things.h
new file mode 100644
index 000000000..fc51c34a4
--- /dev/null
+++ b/games/NXDoom/src/doom/r_things.h
@@ -0,0 +1,65 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Rendering of moving objects, sprites.
+//
+
+
+#ifndef __R_THINGS__
+#define __R_THINGS__
+
+
+
+#define MAXVISSPRITES  	128
+
+extern vissprite_t	vissprites[MAXVISSPRITES];
+extern vissprite_t*	vissprite_p;
+extern vissprite_t	vsprsortedhead;
+
+// Constant arrays used for psprite clipping
+//  and initializing clipping.
+extern short		negonearray[SCREENWIDTH];
+extern short		screenheightarray[SCREENWIDTH];
+
+// vars for R_DrawMaskedColumn
+extern short*		mfloorclip;
+extern short*		mceilingclip;
+extern fixed_t		spryscale;
+extern fixed_t		sprtopscreen;
+
+extern fixed_t		pspritescale;
+extern fixed_t		pspriteiscale;
+
+
+void R_DrawMaskedColumn (column_t* column);
+
+
+void R_SortVisSprites (void);
+
+void R_AddSprites (sector_t* sec);
+void R_AddPSprites (void);
+void R_DrawSprites (void);
+void R_InitSprites(const char **namelist);
+void R_ClearSprites (void);
+void R_DrawMasked (void);
+
+void
+R_ClipVisSprite
+( vissprite_t*		vis,
+  int			xl,
+  int			xh );
+
+
+#endif
diff --git a/games/NXDoom/src/doom/s_sound.c b/games/NXDoom/src/doom/s_sound.c
new file mode 100644
index 000000000..76748892a
--- /dev/null
+++ b/games/NXDoom/src/doom/s_sound.c
@@ -0,0 +1,724 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "i_sound.h"
+#include "i_system.h"
+
+#include "deh_str.h"
+
+#include "doomstat.h"
+#include "doomtype.h"
+
+#include "sounds.h"
+#include "s_sound.h"
+
+#include "m_misc.h"
+#include "m_random.h"
+#include "m_argv.h"
+
+#include "p_local.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+// when to clip out sounds
+// Does not fit the large outdoor areas.
+
+#define S_CLIPPING_DIST (1200 * FRACUNIT)
+
+// Distance tp origin when sounds should be maxed out.
+// This should relate to movement clipping resolution
+// (see BLOCKMAP handling).
+// In the source code release: (160*FRACUNIT).  Changed back to the
+// Vanilla value of 200 (why was this changed?)
+
+#define S_CLOSE_DIST (200 * FRACUNIT)
+
+// The range over which sound attenuates
+
+#define S_ATTENUATOR ((S_CLIPPING_DIST - S_CLOSE_DIST) >> FRACBITS)
+
+// Stereo separation
+
+#define S_STEREO_SWING (96 * FRACUNIT)
+
+#define NORM_PRIORITY 64
+#define NORM_SEP 128
+
+typedef struct
+{
+    // sound information (if null, channel avail.)
+    sfxinfo_t *sfxinfo;
+
+    // origin of sound
+    mobj_t *origin;
+
+    // handle of the sound being played
+    int handle;
+
+    int pitch;
+
+} channel_t;
+
+// The set of channels available
+
+static channel_t *channels;
+
+// Maximum volume of a sound effect.
+// Internal default is max out of 0-15.
+
+int sfxVolume = 8;
+
+// Maximum volume of music.
+
+int musicVolume = 8;
+
+// Internal volume level, ranging from 0-127
+
+static int snd_SfxVolume;
+
+// Whether songs are mus_paused
+
+static boolean mus_paused;
+
+// Music currently being played
+
+static musicinfo_t *mus_playing = NULL;
+
+// Number of channels to use
+
+int snd_channels = 8;
+
+//
+// Initializes sound stuff, including volume
+// Sets channels, SFX and music volume,
+//  allocates channel buffer, sets S_sfx lookup.
+//
+
+void S_Init(int sfxVolume, int musicVolume)
+{
+    int i;
+
+    if (gameversion == exe_doom_1_666)
+    {
+        if (logical_gamemission == doom)
+        {
+            I_SetOPLDriverVer(opl_doom1_1_666);
+        }
+        else
+        {
+            I_SetOPLDriverVer(opl_doom2_1_666);
+        }
+    }
+    else
+    {
+        I_SetOPLDriverVer(opl_doom_1_9);
+    }
+
+    I_PrecacheSounds(S_sfx, NUMSFX);
+
+    S_SetSfxVolume(sfxVolume);
+    S_SetMusicVolume(musicVolume);
+
+    // Allocating the internal channels for mixing
+    // (the maximum numer of sounds rendered
+    // simultaneously) within zone memory.
+    channels = Z_Malloc(snd_channels*sizeof(channel_t), PU_STATIC, 0);
+
+    // Free all channels for use
+    for (i=0 ; i<snd_channels ; i++)
+    {
+        channels[i].sfxinfo = 0;
+    }
+
+    // no sounds are playing, and they are not mus_paused
+    mus_paused = 0;
+
+    // Note that sounds have not been cached (yet).
+    for (i=1 ; i<NUMSFX ; i++)
+    {
+        S_sfx[i].lumpnum = S_sfx[i].usefulness = -1;
+    }
+
+    // Doom defaults to pitch-shifting off.
+    if (snd_pitchshift == -1)
+    {
+        snd_pitchshift = 0;
+    }
+
+    I_AtExit(S_Shutdown, true);
+}
+
+void S_Shutdown(void)
+{
+    I_ShutdownSound();
+    I_ShutdownMusic();
+}
+
+static void S_StopChannel(int cnum)
+{
+    int i;
+    channel_t *c;
+
+    c = &channels[cnum];
+
+    if (c->sfxinfo)
+    {
+        // stop the sound playing
+
+        if (I_SoundIsPlaying(c->handle))
+        {
+            I_StopSound(c->handle);
+        }
+
+        // check to see if other channels are playing the sound
+
+        for (i=0; i<snd_channels; i++)
+        {
+            if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
+            {
+                break;
+            }
+        }
+
+        // degrade usefulness of sound data
+
+        c->sfxinfo->usefulness--;
+        c->sfxinfo = NULL;
+        c->origin = NULL;
+    }
+}
+
+//
+// Per level startup code.
+// Kills playing sounds at start of level,
+//  determines music if any, changes music.
+//
+
+void S_Start(void)
+{
+    int cnum;
+    int mnum;
+
+    // kill all playing sounds at start of level
+    //  (trust me - a good idea)
+    for (cnum=0 ; cnum<snd_channels ; cnum++)
+    {
+        if (channels[cnum].sfxinfo)
+        {
+            S_StopChannel(cnum);
+        }
+    }
+
+    // start new music for the level
+    mus_paused = 0;
+
+    if (gamemode == commercial)
+    {
+        mnum = mus_runnin + gamemap - 1;
+    }
+    else
+    {
+        int spmus[]=
+        {
+            // Song - Who? - Where?
+
+            mus_e3m4,        // American     e4m1
+            mus_e3m2,        // Romero       e4m2
+            mus_e3m3,        // Shawn        e4m3
+            mus_e1m5,        // American     e4m4
+            mus_e2m7,        // Tim          e4m5
+            mus_e2m4,        // Romero       e4m6
+            mus_e2m6,        // J.Anderson   e4m7 CHIRON.WAD
+            mus_e2m5,        // Shawn        e4m8
+            mus_e1m9,        // Tim          e4m9
+        };
+
+        if (gameepisode < 4)
+        {
+            mnum = mus_e1m1 + (gameepisode-1)*9 + gamemap-1;
+        }
+        else
+        {
+            mnum = spmus[gamemap-1];
+        }
+    }
+
+    S_ChangeMusic(mnum, true);
+}
+
+void S_StopSound(mobj_t *origin)
+{
+    int cnum;
+
+    for (cnum=0 ; cnum<snd_channels ; cnum++)
+    {
+        if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
+        {
+            S_StopChannel(cnum);
+            break;
+        }
+    }
+}
+
+//
+// S_GetChannel :
+//   If none available, return -1.  Otherwise channel #.
+//
+
+static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo)
+{
+    // channel number to use
+    int                cnum;
+
+    channel_t*        c;
+
+    // Find an open channel
+    for (cnum=0 ; cnum<snd_channels ; cnum++)
+    {
+        if (!channels[cnum].sfxinfo)
+        {
+            break;
+        }
+        else if (origin && channels[cnum].origin == origin)
+        {
+            S_StopChannel(cnum);
+            break;
+        }
+    }
+
+    // None available
+    if (cnum == snd_channels)
+    {
+        // Look for lower priority
+        for (cnum=0 ; cnum<snd_channels ; cnum++)
+        {
+            if (channels[cnum].sfxinfo->priority >= sfxinfo->priority)
+            {
+                break;
+            }
+        }
+
+        if (cnum == snd_channels)
+        {
+            // FUCK!  No lower priority.  Sorry, Charlie.
+            return -1;
+        }
+        else
+        {
+            // Otherwise, kick out lower priority.
+            S_StopChannel(cnum);
+        }
+    }
+
+    c = &channels[cnum];
+
+    // channel is decided to be cnum.
+    c->sfxinfo = sfxinfo;
+    c->origin = origin;
+
+    return cnum;
+}
+
+//
+// Changes volume and stereo-separation variables
+//  from the norm of a sound effect to be played.
+// If the sound is not audible, returns a 0.
+// Otherwise, modifies parameters and returns 1.
+//
+
+static int S_AdjustSoundParams(mobj_t *listener, mobj_t *source,
+                               int *vol, int *sep)
+{
+    fixed_t        approx_dist;
+    fixed_t        adx;
+    fixed_t        ady;
+    angle_t        angle;
+
+    // calculate the distance to sound origin
+    //  and clip it if necessary
+    adx = abs(listener->x - source->x);
+    ady = abs(listener->y - source->y);
+
+    // From _GG1_ p.428. Appox. eucledian distance fast.
+    approx_dist = adx + ady - ((adx < ady ? adx : ady)>>1);
+
+    if (gamemap != 8 && approx_dist > S_CLIPPING_DIST)
+    {
+        return 0;
+    }
+
+    // angle of source to listener
+    angle = R_PointToAngle2(listener->x,
+                            listener->y,
+                            source->x,
+                            source->y);
+
+    if (angle > listener->angle)
+    {
+        angle = angle - listener->angle;
+    }
+    else
+    {
+        angle = angle + (0xffffffff - listener->angle);
+    }
+
+    angle >>= ANGLETOFINESHIFT;
+
+    // stereo separation
+    *sep = 128 - (FixedMul(S_STEREO_SWING, finesine[angle]) >> FRACBITS);
+
+    // volume calculation
+    if (approx_dist < S_CLOSE_DIST)
+    {
+        *vol = snd_SfxVolume;
+    }
+    else if (gamemap == 8)
+    {
+        if (approx_dist > S_CLIPPING_DIST)
+        {
+            approx_dist = S_CLIPPING_DIST;
+        }
+
+        *vol = 15+ ((snd_SfxVolume-15)
+                    *((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
+            / S_ATTENUATOR;
+    }
+    else
+    {
+        // distance effect
+        *vol = (snd_SfxVolume
+                * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
+            / S_ATTENUATOR;
+    }
+
+    return (*vol > 0);
+}
+
+// clamp supplied integer to the range 0 <= x <= 255.
+
+static int Clamp(int x)
+{
+    if (x < 0)
+    {
+        return 0;
+    }
+    else if (x > 255)
+    {
+        return 255;
+    }
+    return x;
+}
+
+void S_StartSound(void *origin_p, int sfx_id)
+{
+    sfxinfo_t *sfx;
+    mobj_t *origin;
+    int rc;
+    int sep;
+    int pitch;
+    int cnum;
+    int volume;
+
+    origin = (mobj_t *) origin_p;
+    volume = snd_SfxVolume;
+
+    // check for bogus sound #
+    if (sfx_id < 1 || sfx_id > NUMSFX)
+    {
+        I_Error("Bad sfx #: %d", sfx_id);
+    }
+
+    sfx = &S_sfx[sfx_id];
+
+    // Initialize sound parameters
+    pitch = NORM_PITCH;
+    if (sfx->link)
+    {
+        volume += sfx->volume;
+        pitch = sfx->pitch;
+
+        if (volume < 1)
+        {
+            return;
+        }
+
+        if (volume > snd_SfxVolume)
+        {
+            volume = snd_SfxVolume;
+        }
+    }
+
+
+    // Check to see if it is audible,
+    //  and if not, modify the params
+    if (origin && origin != players[consoleplayer].mo)
+    {
+        rc = S_AdjustSoundParams(players[consoleplayer].mo,
+                                 origin,
+                                 &volume,
+                                 &sep);
+
+        if (origin->x == players[consoleplayer].mo->x
+         && origin->y == players[consoleplayer].mo->y)
+        {
+            sep = NORM_SEP;
+        }
+
+        if (!rc)
+        {
+            return;
+        }
+    }
+    else
+    {
+        sep = NORM_SEP;
+    }
+
+    // hacks to vary the sfx pitches
+    if (sfx_id >= sfx_sawup && sfx_id <= sfx_sawhit)
+    {
+        pitch += 8 - (M_Random()&15);
+    }
+    else if (sfx_id != sfx_itemup && sfx_id != sfx_tink)
+    {
+        pitch += 16 - (M_Random()&31);
+    }
+    pitch = Clamp(pitch);
+
+    // kill old sound
+    S_StopSound(origin);
+
+    // try to find a channel
+    cnum = S_GetChannel(origin, sfx);
+
+    if (cnum < 0)
+    {
+        return;
+    }
+
+    // increase the usefulness
+    if (sfx->usefulness++ < 0)
+    {
+        sfx->usefulness = 1;
+    }
+
+    if (sfx->lumpnum < 0)
+    {
+        sfx->lumpnum = I_GetSfxLumpNum(sfx);
+    }
+
+    channels[cnum].pitch = pitch;
+    channels[cnum].handle = I_StartSound(sfx, cnum, volume, sep, channels[cnum].pitch);
+}
+
+//
+// Stop and resume music, during game PAUSE.
+//
+
+void S_PauseSound(void)
+{
+    if (mus_playing && !mus_paused)
+    {
+        I_PauseSong();
+        mus_paused = true;
+    }
+}
+
+void S_ResumeSound(void)
+{
+    if (mus_playing && mus_paused)
+    {
+        I_ResumeSong();
+        mus_paused = false;
+    }
+}
+
+//
+// Updates music & sounds
+//
+
+void S_UpdateSounds(mobj_t *listener)
+{
+    int                audible;
+    int                cnum;
+    int                volume;
+    int                sep;
+    sfxinfo_t*        sfx;
+    channel_t*        c;
+
+    I_UpdateSound();
+
+    for (cnum=0; cnum<snd_channels; cnum++)
+    {
+        c = &channels[cnum];
+        sfx = c->sfxinfo;
+
+        if (c->sfxinfo)
+        {
+            if (I_SoundIsPlaying(c->handle))
+            {
+                // initialize parameters
+                volume = snd_SfxVolume;
+                sep = NORM_SEP;
+
+                if (sfx->link)
+                {
+                    volume += sfx->volume;
+                    if (volume < 1)
+                    {
+                        S_StopChannel(cnum);
+                        continue;
+                    }
+                    else if (volume > snd_SfxVolume)
+                    {
+                        volume = snd_SfxVolume;
+                    }
+                }
+
+                // check non-local sounds for distance clipping
+                //  or modify their params
+                if (c->origin && listener != c->origin)
+                {
+                    audible = S_AdjustSoundParams(listener,
+                                                  c->origin,
+                                                  &volume,
+                                                  &sep);
+
+                    if (!audible)
+                    {
+                        S_StopChannel(cnum);
+                    }
+                    else
+                    {
+                        I_UpdateSoundParams(c->handle, volume, sep);
+                    }
+                }
+            }
+            else
+            {
+                // if channel is allocated but sound has stopped,
+                //  free it
+                S_StopChannel(cnum);
+            }
+        }
+    }
+}
+
+void S_SetMusicVolume(int volume)
+{
+    if (volume < 0 || volume > 127)
+    {
+        I_Error("Attempt to set music volume at %d",
+                volume);
+    }
+
+    I_SetMusicVolume(volume);
+}
+
+void S_SetSfxVolume(int volume)
+{
+    if (volume < 0 || volume > 127)
+    {
+        I_Error("Attempt to set sfx volume at %d", volume);
+    }
+
+    snd_SfxVolume = volume;
+}
+
+//
+// Starts some music with the music id found in sounds.h.
+//
+
+void S_StartMusic(int m_id)
+{
+    S_ChangeMusic(m_id, false);
+}
+
+void S_ChangeMusic(int musicnum, int looping)
+{
+    musicinfo_t *music = NULL;
+    char namebuf[9];
+    void *handle;
+
+    // The Doom IWAD file has two versions of the intro music: d_intro
+    // and d_introa.  The latter is used for OPL playback.
+
+    if (musicnum == mus_intro && (snd_musicdevice == SNDDEVICE_ADLIB
+                               || snd_musicdevice == SNDDEVICE_SB)
+        && W_CheckNumForName("D_INTROA") >= 0)
+    {
+        musicnum = mus_introa;
+    }
+
+    if (musicnum <= mus_None || musicnum >= NUMMUSIC)
+    {
+        I_Error("Bad music number %d", musicnum);
+    }
+    else
+    {
+        music = &S_music[musicnum];
+    }
+
+    if (mus_playing == music)
+    {
+        return;
+    }
+
+    // shutdown old music
+    S_StopMusic();
+
+    // get lumpnum if neccessary
+    if (!music->lumpnum)
+    {
+        M_snprintf(namebuf, sizeof(namebuf), "d_%s", DEH_String(music->name));
+        music->lumpnum = W_GetNumForName(namebuf);
+    }
+
+    music->data = W_CacheLumpNum(music->lumpnum, PU_STATIC);
+
+    handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
+    music->handle = handle;
+    I_PlaySong(handle, looping);
+
+    mus_playing = music;
+}
+
+boolean S_MusicPlaying(void)
+{
+    return I_MusicIsPlaying();
+}
+
+void S_StopMusic(void)
+{
+    if (mus_playing)
+    {
+        if (mus_paused)
+        {
+            I_ResumeSong();
+        }
+
+        I_StopSong();
+        I_UnRegisterSong(mus_playing->handle);
+        W_ReleaseLumpNum(mus_playing->lumpnum);
+        mus_playing->data = NULL;
+        mus_playing = NULL;
+    }
+}
+
diff --git a/games/NXDoom/src/doom/s_sound.h b/games/NXDoom/src/doom/s_sound.h
new file mode 100644
index 000000000..bbd100a0c
--- /dev/null
+++ b/games/NXDoom/src/doom/s_sound.h
@@ -0,0 +1,89 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The not so system specific sound interface.
+//
+
+
+#ifndef __S_SOUND__
+#define __S_SOUND__
+
+#include "p_mobj.h"
+#include "sounds.h"
+
+//
+// Initializes sound stuff, including volume
+// Sets channels, SFX and music volume,
+//  allocates channel buffer, sets S_sfx lookup.
+//
+
+void S_Init(int sfxVolume, int musicVolume);
+
+
+// Shut down sound 
+
+void S_Shutdown(void);
+
+
+
+//
+// Per level startup code.
+// Kills playing sounds at start of level,
+//  determines music if any, changes music.
+//
+
+void S_Start(void);
+
+//
+// Start sound for thing at <origin>
+//  using <sound_id> from sounds.h
+//
+
+void S_StartSound(void *origin, int sound_id);
+
+// Stop sound for thing at <origin>
+void S_StopSound(mobj_t *origin);
+
+
+// Start music using <music_id> from sounds.h
+void S_StartMusic(int music_id);
+
+// Start music using <music_id> from sounds.h,
+//  and set whether looping
+void S_ChangeMusic(int music_id, int looping);
+
+// query if music is playing
+boolean S_MusicPlaying(void);
+
+// Stops the music fer sure.
+void S_StopMusic(void);
+
+// Stop and resume music, during game PAUSE.
+void S_PauseSound(void);
+void S_ResumeSound(void);
+
+
+//
+// Updates music & sounds
+//
+void S_UpdateSounds(mobj_t *listener);
+
+void S_SetMusicVolume(int volume);
+void S_SetSfxVolume(int volume);
+
+extern int snd_channels;
+
+#endif
+
diff --git a/games/NXDoom/src/doom/sounds.c b/games/NXDoom/src/doom/sounds.c
new file mode 100644
index 000000000..e976bc844
--- /dev/null
+++ b/games/NXDoom/src/doom/sounds.c
@@ -0,0 +1,229 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Created by a sound utility.
+//	Kept as a sample, DOOM2 sounds.
+//
+
+
+#include <stdlib.h>
+
+
+#include "doomtype.h"
+#include "sounds.h"
+
+//
+// Information about all the music
+//
+
+#define MUSIC(name) \
+    { name, 0, NULL, NULL }
+
+musicinfo_t S_music[] =
+{
+    MUSIC(NULL),
+    MUSIC("e1m1"),
+    MUSIC("e1m2"),
+    MUSIC("e1m3"),
+    MUSIC("e1m4"),
+    MUSIC("e1m5"),
+    MUSIC("e1m6"),
+    MUSIC("e1m7"),
+    MUSIC("e1m8"),
+    MUSIC("e1m9"),
+    MUSIC("e2m1"),
+    MUSIC("e2m2"),
+    MUSIC("e2m3"),
+    MUSIC("e2m4"),
+    MUSIC("e2m5"),
+    MUSIC("e2m6"),
+    MUSIC("e2m7"),
+    MUSIC("e2m8"),
+    MUSIC("e2m9"),
+    MUSIC("e3m1"),
+    MUSIC("e3m2"),
+    MUSIC("e3m3"),
+    MUSIC("e3m4"),
+    MUSIC("e3m5"),
+    MUSIC("e3m6"),
+    MUSIC("e3m7"),
+    MUSIC("e3m8"),
+    MUSIC("e3m9"),
+    MUSIC("inter"),
+    MUSIC("intro"),
+    MUSIC("bunny"),
+    MUSIC("victor"),
+    MUSIC("introa"),
+    MUSIC("runnin"),
+    MUSIC("stalks"),
+    MUSIC("countd"),
+    MUSIC("betwee"),
+    MUSIC("doom"),
+    MUSIC("the_da"),
+    MUSIC("shawn"),
+    MUSIC("ddtblu"),
+    MUSIC("in_cit"),
+    MUSIC("dead"),
+    MUSIC("stlks2"),
+    MUSIC("theda2"),
+    MUSIC("doom2"),
+    MUSIC("ddtbl2"),
+    MUSIC("runni2"),
+    MUSIC("dead2"),
+    MUSIC("stlks3"),
+    MUSIC("romero"),
+    MUSIC("shawn2"),
+    MUSIC("messag"),
+    MUSIC("count2"),
+    MUSIC("ddtbl3"),
+    MUSIC("ampie"),
+    MUSIC("theda3"),
+    MUSIC("adrian"),
+    MUSIC("messg2"),
+    MUSIC("romer2"),
+    MUSIC("tense"),
+    MUSIC("shawn3"),
+    MUSIC("openin"),
+    MUSIC("evil"),
+    MUSIC("ultima"),
+    MUSIC("read_m"),
+    MUSIC("dm2ttl"),
+    MUSIC("dm2int") 
+};
+
+
+//
+// Information about all the sfx
+//
+
+#define SOUND(name, priority) \
+  { NULL, name, priority, NULL, -1, -1, 0, 0, -1, NULL }
+#define SOUND_LINK(name, priority, link_id, pitch, volume) \
+  { NULL, name, priority, &S_sfx[link_id], pitch, volume, 0, 0, -1, NULL }
+
+sfxinfo_t S_sfx[] =
+{
+  // S_sfx[0] needs to be a dummy for odd reasons.
+  SOUND("none",   0),
+  SOUND("pistol", 64),
+  SOUND("shotgn", 64),
+  SOUND("sgcock", 64),
+  SOUND("dshtgn", 64),
+  SOUND("dbopn",  64),
+  SOUND("dbcls",  64),
+  SOUND("dbload", 64),
+  SOUND("plasma", 64),
+  SOUND("bfg",    64),
+  SOUND("sawup",  64),
+  SOUND("sawidl", 118),
+  SOUND("sawful", 64),
+  SOUND("sawhit", 64),
+  SOUND("rlaunc", 64),
+  SOUND("rxplod", 70),
+  SOUND("firsht", 70),
+  SOUND("firxpl", 70),
+  SOUND("pstart", 100),
+  SOUND("pstop",  100),
+  SOUND("doropn", 100),
+  SOUND("dorcls", 100),
+  SOUND("stnmov", 119),
+  SOUND("swtchn", 78),
+  SOUND("swtchx", 78),
+  SOUND("plpain", 96),
+  SOUND("dmpain", 96),
+  SOUND("popain", 96),
+  SOUND("vipain", 96),
+  SOUND("mnpain", 96),
+  SOUND("pepain", 96),
+  SOUND("slop",   78),
+  SOUND("itemup", 78),
+  SOUND("wpnup",  78),
+  SOUND("oof",    96),
+  SOUND("telept", 32),
+  SOUND("posit1", 98),
+  SOUND("posit2", 98),
+  SOUND("posit3", 98),
+  SOUND("bgsit1", 98),
+  SOUND("bgsit2", 98),
+  SOUND("sgtsit", 98),
+  SOUND("cacsit", 98),
+  SOUND("brssit", 94),
+  SOUND("cybsit", 92),
+  SOUND("spisit", 90),
+  SOUND("bspsit", 90),
+  SOUND("kntsit", 90),
+  SOUND("vilsit", 90),
+  SOUND("mansit", 90),
+  SOUND("pesit",  90),
+  SOUND("sklatk", 70),
+  SOUND("sgtatk", 70),
+  SOUND("skepch", 70),
+  SOUND("vilatk", 70),
+  SOUND("claw",   70),
+  SOUND("skeswg", 70),
+  SOUND("pldeth", 32),
+  SOUND("pdiehi", 32),
+  SOUND("podth1", 70),
+  SOUND("podth2", 70),
+  SOUND("podth3", 70),
+  SOUND("bgdth1", 70),
+  SOUND("bgdth2", 70),
+  SOUND("sgtdth", 70),
+  SOUND("cacdth", 70),
+  SOUND("skldth", 70),
+  SOUND("brsdth", 32),
+  SOUND("cybdth", 32),
+  SOUND("spidth", 32),
+  SOUND("bspdth", 32),
+  SOUND("vildth", 32),
+  SOUND("kntdth", 32),
+  SOUND("pedth",  32),
+  SOUND("skedth", 32),
+  SOUND("posact", 120),
+  SOUND("bgact",  120),
+  SOUND("dmact",  120),
+  SOUND("bspact", 100),
+  SOUND("bspwlk", 100),
+  SOUND("vilact", 100),
+  SOUND("noway",  78),
+  SOUND("barexp", 60),
+  SOUND("punch",  64),
+  SOUND("hoof",   70),
+  SOUND("metal",  70),
+  SOUND_LINK("chgun", 64, sfx_pistol, 150, 0),
+  SOUND("tink",   60),
+  SOUND("bdopn",  100),
+  SOUND("bdcls",  100),
+  SOUND("itmbk",  100),
+  SOUND("flame",  32),
+  SOUND("flamst", 32),
+  SOUND("getpow", 60),
+  SOUND("bospit", 70),
+  SOUND("boscub", 70),
+  SOUND("bossit", 70),
+  SOUND("bospn",  70),
+  SOUND("bosdth", 70),
+  SOUND("manatk", 70),
+  SOUND("mandth", 70),
+  SOUND("sssit",  70),
+  SOUND("ssdth",  70),
+  SOUND("keenpn", 70),
+  SOUND("keendt", 70),
+  SOUND("skeact", 70),
+  SOUND("skesit", 70),
+  SOUND("skeatk", 70),
+  SOUND("radio",  60),
+};
+
diff --git a/games/NXDoom/src/doom/sounds.h b/games/NXDoom/src/doom/sounds.h
new file mode 100644
index 000000000..1e8afc405
--- /dev/null
+++ b/games/NXDoom/src/doom/sounds.h
@@ -0,0 +1,227 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Created by the sound utility written by Dave Taylor.
+//	Kept as a sample, DOOM2  sounds. Frozen.
+//
+
+#ifndef __SOUNDS__
+#define __SOUNDS__
+
+#include "i_sound.h"
+
+// the complete set of sound effects
+extern sfxinfo_t	S_sfx[];
+
+// the complete set of music
+extern musicinfo_t	S_music[];
+
+//
+// Identifiers for all music in game.
+//
+
+typedef enum
+{
+    mus_None,
+    mus_e1m1,
+    mus_e1m2,
+    mus_e1m3,
+    mus_e1m4,
+    mus_e1m5,
+    mus_e1m6,
+    mus_e1m7,
+    mus_e1m8,
+    mus_e1m9,
+    mus_e2m1,
+    mus_e2m2,
+    mus_e2m3,
+    mus_e2m4,
+    mus_e2m5,
+    mus_e2m6,
+    mus_e2m7,
+    mus_e2m8,
+    mus_e2m9,
+    mus_e3m1,
+    mus_e3m2,
+    mus_e3m3,
+    mus_e3m4,
+    mus_e3m5,
+    mus_e3m6,
+    mus_e3m7,
+    mus_e3m8,
+    mus_e3m9,
+    mus_inter,
+    mus_intro,
+    mus_bunny,
+    mus_victor,
+    mus_introa,
+    mus_runnin,
+    mus_stalks,
+    mus_countd,
+    mus_betwee,
+    mus_doom,
+    mus_the_da,
+    mus_shawn,
+    mus_ddtblu,
+    mus_in_cit,
+    mus_dead,
+    mus_stlks2,
+    mus_theda2,
+    mus_doom2,
+    mus_ddtbl2,
+    mus_runni2,
+    mus_dead2,
+    mus_stlks3,
+    mus_romero,
+    mus_shawn2,
+    mus_messag,
+    mus_count2,
+    mus_ddtbl3,
+    mus_ampie,
+    mus_theda3,
+    mus_adrian,
+    mus_messg2,
+    mus_romer2,
+    mus_tense,
+    mus_shawn3,
+    mus_openin,
+    mus_evil,
+    mus_ultima,
+    mus_read_m,
+    mus_dm2ttl,
+    mus_dm2int,
+    NUMMUSIC
+} musicenum_t;
+
+
+//
+// Identifiers for all sfx in game.
+//
+
+typedef enum
+{
+    sfx_None,
+    sfx_pistol,
+    sfx_shotgn,
+    sfx_sgcock,
+    sfx_dshtgn,
+    sfx_dbopn,
+    sfx_dbcls,
+    sfx_dbload,
+    sfx_plasma,
+    sfx_bfg,
+    sfx_sawup,
+    sfx_sawidl,
+    sfx_sawful,
+    sfx_sawhit,
+    sfx_rlaunc,
+    sfx_rxplod,
+    sfx_firsht,
+    sfx_firxpl,
+    sfx_pstart,
+    sfx_pstop,
+    sfx_doropn,
+    sfx_dorcls,
+    sfx_stnmov,
+    sfx_swtchn,
+    sfx_swtchx,
+    sfx_plpain,
+    sfx_dmpain,
+    sfx_popain,
+    sfx_vipain,
+    sfx_mnpain,
+    sfx_pepain,
+    sfx_slop,
+    sfx_itemup,
+    sfx_wpnup,
+    sfx_oof,
+    sfx_telept,
+    sfx_posit1,
+    sfx_posit2,
+    sfx_posit3,
+    sfx_bgsit1,
+    sfx_bgsit2,
+    sfx_sgtsit,
+    sfx_cacsit,
+    sfx_brssit,
+    sfx_cybsit,
+    sfx_spisit,
+    sfx_bspsit,
+    sfx_kntsit,
+    sfx_vilsit,
+    sfx_mansit,
+    sfx_pesit,
+    sfx_sklatk,
+    sfx_sgtatk,
+    sfx_skepch,
+    sfx_vilatk,
+    sfx_claw,
+    sfx_skeswg,
+    sfx_pldeth,
+    sfx_pdiehi,
+    sfx_podth1,
+    sfx_podth2,
+    sfx_podth3,
+    sfx_bgdth1,
+    sfx_bgdth2,
+    sfx_sgtdth,
+    sfx_cacdth,
+    sfx_skldth,
+    sfx_brsdth,
+    sfx_cybdth,
+    sfx_spidth,
+    sfx_bspdth,
+    sfx_vildth,
+    sfx_kntdth,
+    sfx_pedth,
+    sfx_skedth,
+    sfx_posact,
+    sfx_bgact,
+    sfx_dmact,
+    sfx_bspact,
+    sfx_bspwlk,
+    sfx_vilact,
+    sfx_noway,
+    sfx_barexp,
+    sfx_punch,
+    sfx_hoof,
+    sfx_metal,
+    sfx_chgun,
+    sfx_tink,
+    sfx_bdopn,
+    sfx_bdcls,
+    sfx_itmbk,
+    sfx_flame,
+    sfx_flamst,
+    sfx_getpow,
+    sfx_bospit,
+    sfx_boscub,
+    sfx_bossit,
+    sfx_bospn,
+    sfx_bosdth,
+    sfx_manatk,
+    sfx_mandth,
+    sfx_sssit,
+    sfx_ssdth,
+    sfx_keenpn,
+    sfx_keendt,
+    sfx_skeact,
+    sfx_skesit,
+    sfx_skeatk,
+    sfx_radio,
+    NUMSFX
+} sfxenum_t;
+
+#endif
diff --git a/games/NXDoom/src/doom/st_lib.c b/games/NXDoom/src/doom/st_lib.c
new file mode 100644
index 000000000..832bb66d3
--- /dev/null
+++ b/games/NXDoom/src/doom/st_lib.c
@@ -0,0 +1,283 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The status bar widget code.
+//
+
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include "deh_main.h"
+#include "doomdef.h"
+
+#include "z_zone.h"
+#include "v_video.h"
+
+#include "i_swap.h"
+#include "i_system.h"
+
+#include "w_wad.h"
+
+#include "st_stuff.h"
+#include "st_lib.h"
+#include "r_local.h"
+
+
+//
+// Hack display negative frags.
+//  Loads and store the stminus lump.
+//
+patch_t*		sttminus;
+
+void STlib_init(void)
+{
+    if (W_CheckNumForName(DEH_String("STTMINUS")) >= 0)
+        sttminus = (patch_t *) W_CacheLumpName(DEH_String("STTMINUS"), PU_STATIC);
+    else
+        sttminus = NULL;
+}
+
+
+// ?
+void
+STlib_initNum
+( st_number_t*		n,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  boolean*		on,
+  int			width )
+{
+    n->x	= x;
+    n->y	= y;
+    n->oldnum	= 0;
+    n->width	= width;
+    n->num	= num;
+    n->on	= on;
+    n->p	= pl;
+}
+
+
+// 
+// A fairly efficient way to draw a number
+//  based on differences from the old number.
+// Note: worth the trouble?
+//
+void
+STlib_drawNum
+( st_number_t*	n,
+  boolean	refresh )
+{
+
+    int		numdigits = n->width;
+    int		num = *n->num;
+    
+    int		w = SHORT(n->p[0]->width);
+    int		h = SHORT(n->p[0]->height);
+    int		x = n->x;
+    
+    int		neg;
+
+    n->oldnum = *n->num;
+
+    neg = num < 0;
+
+    if (neg)
+    {
+	if (numdigits == 2 && num < -9)
+	    num = -9;
+	else if (numdigits == 3 && num < -99)
+	    num = -99;
+	
+	num = -num;
+    }
+
+    // clear the area
+    x = n->x - numdigits*w;
+
+    if (n->y - ST_Y < 0)
+	I_Error("drawNum: n->y - ST_Y < 0");
+
+    V_CopyRect(x, n->y - ST_Y, st_backing_screen, w*numdigits, h, x, n->y);
+
+    // if non-number, do not draw it
+    if (num == 1994)
+	return;
+
+    x = n->x;
+
+    // in the special case of 0, you draw 0
+    if (!num)
+	V_DrawPatch(x - w, n->y, n->p[ 0 ]);
+
+    // draw the new number
+    while (num && numdigits--)
+    {
+	x -= w;
+	V_DrawPatch(x, n->y, n->p[ num % 10 ]);
+	num /= 10;
+    }
+
+    // draw a minus sign if necessary
+    if (neg && sttminus)
+	V_DrawPatch(x - 8, n->y, sttminus);
+}
+
+
+//
+void
+STlib_updateNum
+( st_number_t*		n,
+  boolean		refresh )
+{
+    if (*n->on) STlib_drawNum(n, refresh);
+}
+
+
+//
+void
+STlib_initPercent
+( st_percent_t*		p,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  boolean*		on,
+  patch_t*		percent )
+{
+    STlib_initNum(&p->n, x, y, pl, num, on, 3);
+    p->p = percent;
+}
+
+
+
+
+void
+STlib_updatePercent
+( st_percent_t*		per,
+  int			refresh )
+{
+    if (refresh && *per->n.on)
+	V_DrawPatch(per->n.x, per->n.y, per->p);
+    
+    STlib_updateNum(&per->n, refresh);
+}
+
+
+
+void
+STlib_initMultIcon
+( st_multicon_t*	i,
+  int			x,
+  int			y,
+  patch_t**		il,
+  int*			inum,
+  boolean*		on )
+{
+    i->x	= x;
+    i->y	= y;
+    i->oldinum 	= -1;
+    i->inum	= inum;
+    i->on	= on;
+    i->p	= il;
+}
+
+
+
+void
+STlib_updateMultIcon
+( st_multicon_t*	mi,
+  boolean		refresh )
+{
+    int			w;
+    int			h;
+    int			x;
+    int			y;
+
+    if (*mi->on
+	&& (mi->oldinum != *mi->inum || refresh)
+	&& (*mi->inum!=-1))
+    {
+	if (mi->oldinum != -1)
+	{
+	    x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
+	    y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
+	    w = SHORT(mi->p[mi->oldinum]->width);
+	    h = SHORT(mi->p[mi->oldinum]->height);
+
+	    if (y - ST_Y < 0)
+		I_Error("updateMultIcon: y - ST_Y < 0");
+
+	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
+	}
+	V_DrawPatch(mi->x, mi->y, mi->p[*mi->inum]);
+	mi->oldinum = *mi->inum;
+    }
+}
+
+
+
+void
+STlib_initBinIcon
+( st_binicon_t*		b,
+  int			x,
+  int			y,
+  patch_t*		i,
+  boolean*		val,
+  boolean*		on )
+{
+    b->x	= x;
+    b->y	= y;
+    b->oldval	= false;
+    b->val	= val;
+    b->on	= on;
+    b->p	= i;
+}
+
+
+
+void
+STlib_updateBinIcon
+( st_binicon_t*		bi,
+  boolean		refresh )
+{
+    int			x;
+    int			y;
+    int			w;
+    int			h;
+
+    if (*bi->on
+     && (bi->oldval != *bi->val || refresh))
+    {
+	x = bi->x - SHORT(bi->p->leftoffset);
+	y = bi->y - SHORT(bi->p->topoffset);
+	w = SHORT(bi->p->width);
+	h = SHORT(bi->p->height);
+
+	if (y - ST_Y < 0)
+	    I_Error("updateBinIcon: y - ST_Y < 0");
+
+	if (*bi->val)
+	    V_DrawPatch(bi->x, bi->y, bi->p);
+	else
+	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
+
+	bi->oldval = *bi->val;
+    }
+
+}
+
diff --git a/games/NXDoom/src/doom/st_lib.h b/games/NXDoom/src/doom/st_lib.h
new file mode 100644
index 000000000..3a8f52125
--- /dev/null
+++ b/games/NXDoom/src/doom/st_lib.h
@@ -0,0 +1,209 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+// 	The status bar widget code.
+//
+
+#ifndef __STLIB__
+#define __STLIB__
+
+
+// We are referring to patches.
+#include "r_defs.h"
+
+//
+// Typedefs of widgets
+//
+
+// Number widget
+
+typedef struct
+{
+    // upper right-hand corner
+    //  of the number (right-justified)
+    int		x;
+    int		y;
+
+    // max # of digits in number
+    int width;    
+
+    // last number value
+    int		oldnum;
+    
+    // pointer to current value
+    int*	num;
+
+    // pointer to boolean stating
+    //  whether to update number
+    boolean*	on;
+
+    // list of patches for 0-9
+    patch_t**	p;
+
+    // user data
+    int data;
+    
+} st_number_t;
+
+
+
+// Percent widget ("child" of number widget,
+//  or, more precisely, contains a number widget.)
+typedef struct
+{
+    // number information
+    st_number_t		n;
+
+    // percent sign graphic
+    patch_t*		p;
+    
+} st_percent_t;
+
+
+
+// Multiple Icon widget
+typedef struct
+{
+     // center-justified location of icons
+    int			x;
+    int			y;
+
+    // last icon number
+    int			oldinum;
+
+    // pointer to current icon
+    int*		inum;
+
+    // pointer to boolean stating
+    //  whether to update icon
+    boolean*		on;
+
+    // list of icons
+    patch_t**		p;
+    
+    // user data
+    int			data;
+    
+} st_multicon_t;
+
+
+
+
+// Binary Icon widget
+
+typedef struct
+{
+    // center-justified location of icon
+    int			x;
+    int			y;
+
+    // last icon value
+    boolean		oldval;
+
+    // pointer to current icon status
+    boolean*		val;
+
+    // pointer to boolean
+    //  stating whether to update icon
+    boolean*		on;  
+
+
+    patch_t*		p;	// icon
+    int			data;   // user data
+    
+} st_binicon_t;
+
+
+
+//
+// Widget creation, access, and update routines
+//
+
+// Initializes widget library.
+// More precisely, initialize STMINUS,
+//  everything else is done somewhere else.
+//
+void STlib_init(void);
+
+
+
+// Number widget routines
+void
+STlib_initNum
+( st_number_t*		n,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  boolean*		on,
+  int			width );
+
+void
+STlib_updateNum
+( st_number_t*		n,
+  boolean		refresh );
+
+
+// Percent widget routines
+void
+STlib_initPercent
+( st_percent_t*		p,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  boolean*		on,
+  patch_t*		percent );
+
+
+void
+STlib_updatePercent
+( st_percent_t*		per,
+  int			refresh );
+
+
+// Multiple Icon widget routines
+void
+STlib_initMultIcon
+( st_multicon_t*	mi,
+  int			x,
+  int			y,
+  patch_t**		il,
+  int*			inum,
+  boolean*		on );
+
+
+void
+STlib_updateMultIcon
+( st_multicon_t*	mi,
+  boolean		refresh );
+
+// Binary Icon widget routines
+
+void
+STlib_initBinIcon
+( st_binicon_t*		b,
+  int			x,
+  int			y,
+  patch_t*		i,
+  boolean*		val,
+  boolean*		on );
+
+void
+STlib_updateBinIcon
+( st_binicon_t*		bi,
+  boolean		refresh );
+
+#endif
diff --git a/games/NXDoom/src/doom/st_stuff.c b/games/NXDoom/src/doom/st_stuff.c
new file mode 100644
index 000000000..da9b8bcf8
--- /dev/null
+++ b/games/NXDoom/src/doom/st_stuff.c
@@ -0,0 +1,1367 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Status bar code.
+//	Does the face/direction indicator animatin.
+//	Does palette indicators as well (red pain/berserk, bright pickup)
+//
+
+
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include "i_system.h"
+#include "i_video.h"
+#include "z_zone.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "w_wad.h"
+
+#include "deh_main.h"
+#include "deh_misc.h"
+#include "doomdef.h"
+#include "doomkeys.h"
+
+#include "g_game.h"
+
+#include "st_stuff.h"
+#include "st_lib.h"
+#include "r_local.h"
+
+#include "p_local.h"
+#include "p_inter.h"
+
+#include "am_map.h"
+#include "m_cheat.h"
+
+#include "s_sound.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+// State.
+#include "doomstat.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+//
+// STATUS BAR DATA
+//
+
+
+// Palette indices.
+// For damage/bonus red-/gold-shifts
+#define STARTREDPALS		1
+#define STARTBONUSPALS		9
+#define NUMREDPALS			8
+#define NUMBONUSPALS		4
+// Radiation suit, green shift.
+#define RADIATIONPAL		13
+
+// Location of status bar
+#define ST_X				0
+#define ST_X2				104
+
+#define ST_FX  			143
+#define ST_FY  			169
+
+// Number of status faces.
+#define ST_NUMPAINFACES		5
+#define ST_NUMSTRAIGHTFACES	3
+#define ST_NUMTURNFACES		2
+#define ST_NUMSPECIALFACES		3
+
+#define ST_FACESTRIDE \
+          (ST_NUMSTRAIGHTFACES+ST_NUMTURNFACES+ST_NUMSPECIALFACES)
+
+#define ST_NUMEXTRAFACES		2
+
+#define ST_NUMFACES \
+          (ST_FACESTRIDE*ST_NUMPAINFACES+ST_NUMEXTRAFACES)
+
+#define ST_TURNOFFSET		(ST_NUMSTRAIGHTFACES)
+#define ST_OUCHOFFSET		(ST_TURNOFFSET + ST_NUMTURNFACES)
+#define ST_EVILGRINOFFSET		(ST_OUCHOFFSET + 1)
+#define ST_RAMPAGEOFFSET		(ST_EVILGRINOFFSET + 1)
+#define ST_GODFACE			(ST_NUMPAINFACES*ST_FACESTRIDE)
+#define ST_DEADFACE			(ST_GODFACE+1)
+
+#define ST_FACESX			143
+#define ST_FACESY			168
+
+#define ST_EVILGRINCOUNT		(2*TICRATE)
+#define ST_STRAIGHTFACECOUNT	(TICRATE/2)
+#define ST_TURNCOUNT		(1*TICRATE)
+#define ST_OUCHCOUNT		(1*TICRATE)
+#define ST_RAMPAGEDELAY		(2*TICRATE)
+
+#define ST_MUCHPAIN			20
+
+
+// Location and size of statistics,
+//  justified according to widget type.
+// Problem is, within which space? STbar? Screen?
+// Note: this could be read in by a lump.
+//       Problem is, is the stuff rendered
+//       into a buffer,
+//       or into the frame buffer?
+
+// AMMO number pos.
+#define ST_AMMOWIDTH		3	
+#define ST_AMMOX			44
+#define ST_AMMOY			171
+
+// HEALTH number pos.
+#define ST_HEALTHWIDTH		3	
+#define ST_HEALTHX			90
+#define ST_HEALTHY			171
+
+// Weapon pos.
+#define ST_ARMSX			111
+#define ST_ARMSY			172
+#define ST_ARMSBGX			104
+#define ST_ARMSBGY			168
+#define ST_ARMSXSPACE		12
+#define ST_ARMSYSPACE		10
+
+// Frags pos.
+#define ST_FRAGSX			138
+#define ST_FRAGSY			171	
+#define ST_FRAGSWIDTH		2
+
+// ARMOR number pos.
+#define ST_ARMORWIDTH		3
+#define ST_ARMORX			221
+#define ST_ARMORY			171
+
+// Key icon positions.
+#define ST_KEY0WIDTH		8
+#define ST_KEY0HEIGHT		5
+#define ST_KEY0X			239
+#define ST_KEY0Y			171
+#define ST_KEY1WIDTH		ST_KEY0WIDTH
+#define ST_KEY1X			239
+#define ST_KEY1Y			181
+#define ST_KEY2WIDTH		ST_KEY0WIDTH
+#define ST_KEY2X			239
+#define ST_KEY2Y			191
+
+// Ammunition counter.
+#define ST_AMMO0WIDTH		3
+#define ST_AMMO0HEIGHT		6
+#define ST_AMMO0X			288
+#define ST_AMMO0Y			173
+#define ST_AMMO1WIDTH		ST_AMMO0WIDTH
+#define ST_AMMO1X			288
+#define ST_AMMO1Y			179
+#define ST_AMMO2WIDTH		ST_AMMO0WIDTH
+#define ST_AMMO2X			288
+#define ST_AMMO2Y			191
+#define ST_AMMO3WIDTH		ST_AMMO0WIDTH
+#define ST_AMMO3X			288
+#define ST_AMMO3Y			185
+
+// Indicate maximum ammunition.
+// Only needed because backpack exists.
+#define ST_MAXAMMO0WIDTH		3
+#define ST_MAXAMMO0HEIGHT		5
+#define ST_MAXAMMO0X		314
+#define ST_MAXAMMO0Y		173
+#define ST_MAXAMMO1WIDTH		ST_MAXAMMO0WIDTH
+#define ST_MAXAMMO1X		314
+#define ST_MAXAMMO1Y		179
+#define ST_MAXAMMO2WIDTH		ST_MAXAMMO0WIDTH
+#define ST_MAXAMMO2X		314
+#define ST_MAXAMMO2Y		191
+#define ST_MAXAMMO3WIDTH		ST_MAXAMMO0WIDTH
+#define ST_MAXAMMO3X		314
+#define ST_MAXAMMO3Y		185
+
+// Dimensions given in characters.
+#define ST_MSGWIDTH			52
+
+// graphics are drawn to a backing screen and blitted to the real screen
+pixel_t			*st_backing_screen;
+	    
+// main player in game
+static player_t*	plyr; 
+
+// ST_Start() has just been called
+static boolean		st_firsttime;
+
+// lump number for PLAYPAL
+static int		lu_palette;
+
+// used for making messages go away
+static int		st_msgcounter=0;
+
+// whether left-side main status bar is active
+static boolean		st_statusbaron;
+
+// whether status bar chat is active
+static boolean		st_chat;
+
+// value of st_chat before message popped up
+static boolean		st_oldchat;
+
+// !deathmatch
+static boolean		st_notdeathmatch; 
+
+// !deathmatch && st_statusbaron
+static boolean		st_armson;
+
+// !deathmatch
+static boolean		st_fragson; 
+
+// main bar left
+static patch_t*		sbar;
+
+// main bar right, for doom 1.0
+static patch_t*		sbarr;
+
+// 0-9, tall numbers
+static patch_t*		tallnum[10];
+
+// tall % sign
+static patch_t*		tallpercent;
+
+// 0-9, short, yellow (,different!) numbers
+static patch_t*		shortnum[10];
+
+// 3 key-cards, 3 skulls
+static patch_t*		keys[NUMCARDS]; 
+
+// face status patches
+static patch_t*		faces[ST_NUMFACES];
+
+// face background
+static patch_t*		faceback;
+
+ // main bar right
+static patch_t*		armsbg;
+
+// weapon ownership patches
+static patch_t*		arms[6][2]; 
+
+// ready-weapon widget
+static st_number_t	w_ready;
+
+ // in deathmatch only, summary of frags stats
+static st_number_t	w_frags;
+
+// health widget
+static st_percent_t	w_health;
+
+// arms background
+static st_binicon_t	w_armsbg; 
+
+
+// weapon ownership widgets
+static st_multicon_t	w_arms[6];
+
+// face status widget
+static st_multicon_t	w_faces; 
+
+// keycard widgets
+static st_multicon_t	w_keyboxes[3];
+
+// armor widget
+static st_percent_t	w_armor;
+
+// ammo widgets
+static st_number_t	w_ammo[4];
+
+// max ammo widgets
+static st_number_t	w_maxammo[4]; 
+
+
+
+ // number of frags so far in deathmatch
+static int	st_fragscount;
+
+// used to use appopriately pained face
+static int	st_oldhealth = -1;
+
+// used for evil grin
+static boolean	oldweaponsowned[NUMWEAPONS]; 
+
+ // count until face changes
+static int	st_facecount = 0;
+
+// current face index, used by w_faces
+static int	st_faceindex = 0;
+
+// holds key-type for each key box on bar
+static int	keyboxes[3]; 
+
+// a random number per tick
+static int	st_randomnumber;  
+
+cheatseq_t cheat_mus = CHEAT("idmus", 2);
+cheatseq_t cheat_god = CHEAT("iddqd", 0);
+cheatseq_t cheat_ammo = CHEAT("idkfa", 0);
+cheatseq_t cheat_ammonokey = CHEAT("idfa", 0);
+cheatseq_t cheat_noclip = CHEAT("idspispopd", 0);
+cheatseq_t cheat_commercial_noclip = CHEAT("idclip", 0);
+
+cheatseq_t	cheat_powerup[7] =
+{
+    CHEAT("idbeholdv", 0),
+    CHEAT("idbeholds", 0),
+    CHEAT("idbeholdi", 0),
+    CHEAT("idbeholdr", 0),
+    CHEAT("idbeholda", 0),
+    CHEAT("idbeholdl", 0),
+    CHEAT("idbehold", 0),
+};
+
+cheatseq_t cheat_choppers = CHEAT("idchoppers", 0);
+cheatseq_t cheat_clev = CHEAT("idclev", 2);
+cheatseq_t cheat_mypos = CHEAT("idmypos", 0);
+
+
+//
+// STATUS BAR CODE
+//
+void ST_Stop(void);
+
+void ST_refreshBackground(void)
+{
+
+    if (st_statusbaron)
+    {
+        V_UseBuffer(st_backing_screen);
+
+	V_DrawPatch(ST_X, 0, sbar);
+
+	// draw right side of bar if needed (Doom 1.0)
+	if (sbarr)
+	    V_DrawPatch(ST_ARMSBGX, 0, sbarr);
+
+	if (netgame)
+	    V_DrawPatch(ST_FX, 0, faceback);
+
+        V_RestoreBuffer();
+
+	V_CopyRect(ST_X, 0, st_backing_screen, ST_WIDTH, ST_HEIGHT, ST_X, ST_Y);
+    }
+
+}
+
+
+// Respond to keyboard input events,
+//  intercept cheats.
+boolean
+ST_Responder (event_t* ev)
+{
+  int		i;
+    
+  // Filter automap on/off.
+  if (ev->type == ev_keyup
+      && ((ev->data1 & 0xffff0000) == AM_MSGHEADER))
+  {
+    switch(ev->data1)
+    {
+      case AM_MSGENTERED:
+	st_firsttime = true;
+	break;
+	
+      case AM_MSGEXITED:
+	//	fprintf(stderr, "AM exited\n");
+	break;
+    }
+  }
+
+  // if a user keypress...
+  else if (ev->type == ev_keydown)
+  {
+    if (!netgame && gameskill != sk_nightmare)
+    {
+      // 'dqd' cheat for toggleable god mode
+      if (cht_CheckCheat(&cheat_god, ev->data2))
+      {
+	plyr->cheats ^= CF_GODMODE;
+	if (plyr->cheats & CF_GODMODE)
+	{
+	  if (plyr->mo)
+	    plyr->mo->health = deh_god_mode_health;
+	  
+	  plyr->health = deh_god_mode_health;
+	  plyr->message = DEH_String(STSTR_DQDON);
+	}
+	else 
+	  plyr->message = DEH_String(STSTR_DQDOFF);
+      }
+      // 'fa' cheat for killer fucking arsenal
+      else if (cht_CheckCheat(&cheat_ammonokey, ev->data2))
+      {
+	plyr->armorpoints = deh_idfa_armor;
+	plyr->armortype = deh_idfa_armor_class;
+	
+	for (i=0;i<NUMWEAPONS;i++)
+	  plyr->weaponowned[i] = true;
+	
+	for (i=0;i<NUMAMMO;i++)
+	  plyr->ammo[i] = plyr->maxammo[i];
+	
+	plyr->message = DEH_String(STSTR_FAADDED);
+      }
+      // 'kfa' cheat for key full ammo
+      else if (cht_CheckCheat(&cheat_ammo, ev->data2))
+      {
+	plyr->armorpoints = deh_idkfa_armor;
+	plyr->armortype = deh_idkfa_armor_class;
+	
+	for (i=0;i<NUMWEAPONS;i++)
+	  plyr->weaponowned[i] = true;
+	
+	for (i=0;i<NUMAMMO;i++)
+	  plyr->ammo[i] = plyr->maxammo[i];
+	
+	for (i=0;i<NUMCARDS;i++)
+	  plyr->cards[i] = true;
+	
+	plyr->message = DEH_String(STSTR_KFAADDED);
+      }
+      // 'mus' cheat for changing music
+      else if (cht_CheckCheat(&cheat_mus, ev->data2))
+      {
+	
+	char	buf[3];
+	int		musnum;
+	
+	plyr->message = DEH_String(STSTR_MUS);
+	cht_GetParam(&cheat_mus, buf);
+
+        // Note: The original v1.9 had a bug that tried to play back
+        // the Doom II music regardless of gamemode.  This was fixed
+        // in the Ultimate Doom executable so that it would work for
+        // the Doom 1 music as well.
+
+	if (gamemode == commercial || gameversion < exe_ultimate)
+	{
+	  musnum = mus_runnin + (buf[0]-'0')*10 + buf[1]-'0' - 1;
+	  
+	  if (((buf[0]-'0')*10 + buf[1]-'0') > 35
+       && gameversion >= exe_doom_1_8)
+	    plyr->message = DEH_String(STSTR_NOMUS);
+	  else
+	    S_ChangeMusic(musnum, 1);
+	}
+	else
+	{
+	  musnum = mus_e1m1 + (buf[0]-'1')*9 + (buf[1]-'1');
+	  
+	  if (((buf[0]-'1')*9 + buf[1]-'1') > 31)
+	    plyr->message = DEH_String(STSTR_NOMUS);
+	  else
+	    S_ChangeMusic(musnum, 1);
+	}
+      }
+      else if ( (logical_gamemission == doom 
+                 && cht_CheckCheat(&cheat_noclip, ev->data2))
+             || (logical_gamemission != doom 
+                 && cht_CheckCheat(&cheat_commercial_noclip,ev->data2)))
+      {	
+        // Noclip cheat.
+        // For Doom 1, use the idspipsopd cheat; for all others, use
+        // idclip
+
+	plyr->cheats ^= CF_NOCLIP;
+	
+	if (plyr->cheats & CF_NOCLIP)
+	  plyr->message = DEH_String(STSTR_NCON);
+	else
+	  plyr->message = DEH_String(STSTR_NCOFF);
+      }
+      // 'behold?' power-up cheats
+      for (i=0;i<6;i++)
+      {
+	if (cht_CheckCheat(&cheat_powerup[i], ev->data2))
+	{
+	  if (!plyr->powers[i])
+	    P_GivePower( plyr, i);
+	  else if (i!=pw_strength)
+	    plyr->powers[i] = 1;
+	  else
+	    plyr->powers[i] = 0;
+	  
+	  plyr->message = DEH_String(STSTR_BEHOLDX);
+	}
+      }
+      
+      // 'behold' power-up menu
+      if (cht_CheckCheat(&cheat_powerup[6], ev->data2))
+      {
+	plyr->message = DEH_String(STSTR_BEHOLD);
+      }
+      // 'choppers' invulnerability & chainsaw
+      else if (cht_CheckCheat(&cheat_choppers, ev->data2))
+      {
+	plyr->weaponowned[wp_chainsaw] = true;
+	plyr->powers[pw_invulnerability] = true;
+	plyr->message = DEH_String(STSTR_CHOPPERS);
+      }
+      // 'mypos' for player position
+      else if (cht_CheckCheat(&cheat_mypos, ev->data2))
+      {
+        static char buf[ST_MSGWIDTH];
+        M_snprintf(buf, sizeof(buf), "ang=0x%x;x,y=(0x%x,0x%x)",
+                   players[consoleplayer].mo->angle,
+                   players[consoleplayer].mo->x,
+                   players[consoleplayer].mo->y);
+        plyr->message = buf;
+      }
+    }
+    
+    // 'clev' change-level cheat
+    if (!netgame && cht_CheckCheat(&cheat_clev, ev->data2))
+    {
+      char		buf[3];
+      int		epsd;
+      int		map;
+      
+      cht_GetParam(&cheat_clev, buf);
+      
+      if (gamemode == commercial)
+      {
+	epsd = 0;
+	map = (buf[0] - '0')*10 + buf[1] - '0';
+      }
+      else
+      {
+	epsd = buf[0] - '0';
+	map = buf[1] - '0';
+
+        // Chex.exe always warps to episode 1.
+
+        if (gameversion == exe_chex)
+        {
+            if (epsd > 1)
+            {
+                epsd = 1;
+            }
+            if (map > 5)
+            {
+                map = 5;
+            }
+        }
+      }
+
+      // Catch invalid maps.
+      if (gamemode != commercial)
+      {
+          if (epsd < 1)
+          {
+              return false;
+          }
+          if (epsd > 4)
+          {
+              return false;
+          }
+          if (epsd == 4 && gameversion < exe_ultimate)
+          {
+              return false;
+          }
+          if (map < 1)
+          {
+              return false;
+          }
+          if (map > 9)
+          {
+              return false;
+          }
+      }
+      else
+      {
+          if (map < 1)
+          {
+              return false;
+          }
+          if (map > 40)
+          {
+              return false;
+          }
+      }
+
+      // So be it.
+      plyr->message = DEH_String(STSTR_CLEV);
+      G_DeferedInitNew(gameskill, epsd, map);
+    }
+  }
+  return false;
+}
+
+
+
+int ST_calcPainOffset(void)
+{
+    int		health;
+    static int	lastcalc;
+    static int	oldhealth = -1;
+    
+    health = plyr->health > 100 ? 100 : plyr->health;
+
+    if (health != oldhealth)
+    {
+	lastcalc = ST_FACESTRIDE * (((100 - health) * ST_NUMPAINFACES) / 101);
+	oldhealth = health;
+    }
+    return lastcalc;
+}
+
+
+//
+// This is a not-very-pretty routine which handles
+//  the face states and their timing.
+// the precedence of expressions is:
+//  dead > evil grin > turned head > straight ahead
+//
+void ST_updateFaceWidget(void)
+{
+    int		i;
+    angle_t	badguyangle;
+    angle_t	diffang;
+    static int	lastattackdown = -1;
+    static int	priority = 0;
+    boolean	doevilgrin;
+
+    if (priority < 10)
+    {
+	// dead
+	if (!plyr->health)
+	{
+	    priority = 9;
+	    st_faceindex = ST_DEADFACE;
+	    st_facecount = 1;
+	}
+    }
+
+    if (priority < 9)
+    {
+	if (plyr->bonuscount)
+	{
+	    // picking up bonus
+	    doevilgrin = false;
+
+	    for (i=0;i<NUMWEAPONS;i++)
+	    {
+		if (oldweaponsowned[i] != plyr->weaponowned[i])
+		{
+		    doevilgrin = true;
+		    oldweaponsowned[i] = plyr->weaponowned[i];
+		}
+	    }
+	    if (doevilgrin) 
+	    {
+		// evil grin if just picked up weapon
+		priority = 8;
+		st_facecount = ST_EVILGRINCOUNT;
+		st_faceindex = ST_calcPainOffset() + ST_EVILGRINOFFSET;
+	    }
+	}
+
+    }
+  
+    if (priority < 8)
+    {
+	if (plyr->damagecount
+	    && plyr->attacker
+	    && plyr->attacker != plyr->mo)
+	{
+	    // being attacked
+	    priority = 7;
+	    
+	    if (plyr->health - st_oldhealth > ST_MUCHPAIN)
+	    {
+		st_facecount = ST_TURNCOUNT;
+		st_faceindex = ST_calcPainOffset() + ST_OUCHOFFSET;
+	    }
+	    else
+	    {
+		badguyangle = R_PointToAngle2(plyr->mo->x,
+					      plyr->mo->y,
+					      plyr->attacker->x,
+					      plyr->attacker->y);
+		
+		if (badguyangle > plyr->mo->angle)
+		{
+		    // whether right or left
+		    diffang = badguyangle - plyr->mo->angle;
+		    i = diffang > ANG180; 
+		}
+		else
+		{
+		    // whether left or right
+		    diffang = plyr->mo->angle - badguyangle;
+		    i = diffang <= ANG180; 
+		} // confusing, aint it?
+
+		
+		st_facecount = ST_TURNCOUNT;
+		st_faceindex = ST_calcPainOffset();
+		
+		if (diffang < ANG45)
+		{
+		    // head-on    
+		    st_faceindex += ST_RAMPAGEOFFSET;
+		}
+		else if (i)
+		{
+		    // turn face right
+		    st_faceindex += ST_TURNOFFSET;
+		}
+		else
+		{
+		    // turn face left
+		    st_faceindex += ST_TURNOFFSET+1;
+		}
+	    }
+	}
+    }
+  
+    if (priority < 7)
+    {
+	// getting hurt because of your own damn stupidity
+	if (plyr->damagecount)
+	{
+	    if (plyr->health - st_oldhealth > ST_MUCHPAIN)
+	    {
+		priority = 7;
+		st_facecount = ST_TURNCOUNT;
+		st_faceindex = ST_calcPainOffset() + ST_OUCHOFFSET;
+	    }
+	    else
+	    {
+		priority = 6;
+		st_facecount = ST_TURNCOUNT;
+		st_faceindex = ST_calcPainOffset() + ST_RAMPAGEOFFSET;
+	    }
+
+	}
+
+    }
+  
+    if (priority < 6)
+    {
+	// rapid firing
+	if (plyr->attackdown)
+	{
+	    if (lastattackdown==-1)
+		lastattackdown = ST_RAMPAGEDELAY;
+	    else if (!--lastattackdown)
+	    {
+		priority = 5;
+		st_faceindex = ST_calcPainOffset() + ST_RAMPAGEOFFSET;
+		st_facecount = 1;
+		lastattackdown = 1;
+	    }
+	}
+	else
+	    lastattackdown = -1;
+
+    }
+  
+    if (priority < 5)
+    {
+	// invulnerability
+	if ((plyr->cheats & CF_GODMODE)
+	    || plyr->powers[pw_invulnerability])
+	{
+	    priority = 4;
+
+	    st_faceindex = ST_GODFACE;
+	    st_facecount = 1;
+
+	}
+
+    }
+
+    // look left or look right if the facecount has timed out
+    if (!st_facecount)
+    {
+	st_faceindex = ST_calcPainOffset() + (st_randomnumber % 3);
+	st_facecount = ST_STRAIGHTFACECOUNT;
+	priority = 0;
+    }
+
+    st_facecount--;
+
+}
+
+void ST_updateWidgets(void)
+{
+    static int	largeammo = 1994; // means "n/a"
+    int		i;
+
+    // must redirect the pointer if the ready weapon has changed.
+    //  if (w_ready.data != plyr->readyweapon)
+    //  {
+    if (weaponinfo[plyr->readyweapon].ammo == am_noammo)
+	w_ready.num = &largeammo;
+    else
+	w_ready.num = &plyr->ammo[weaponinfo[plyr->readyweapon].ammo];
+    //{
+    // static int tic=0;
+    // static int dir=-1;
+    // if (!(tic&15))
+    //   plyr->ammo[weaponinfo[plyr->readyweapon].ammo]+=dir;
+    // if (plyr->ammo[weaponinfo[plyr->readyweapon].ammo] == -100)
+    //   dir = 1;
+    // tic++;
+    // }
+    w_ready.data = plyr->readyweapon;
+
+    // if (*w_ready.on)
+    //  STlib_updateNum(&w_ready, true);
+    // refresh weapon change
+    //  }
+
+    // update keycard multiple widgets
+    for (i=0;i<3;i++)
+    {
+	keyboxes[i] = plyr->cards[i] ? i : -1;
+
+	if (plyr->cards[i+3])
+	    keyboxes[i] = i+3;
+    }
+
+    // refresh everything if this is him coming back to life
+    ST_updateFaceWidget();
+
+    // used by the w_armsbg widget
+    st_notdeathmatch = !deathmatch;
+    
+    // used by w_arms[] widgets
+    st_armson = st_statusbaron && !deathmatch; 
+
+    // used by w_frags widget
+    st_fragson = deathmatch && st_statusbaron; 
+    st_fragscount = 0;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (i != consoleplayer)
+	    st_fragscount += plyr->frags[i];
+	else
+	    st_fragscount -= plyr->frags[i];
+    }
+
+    // get rid of chat window if up because of message
+    if (!--st_msgcounter)
+	st_chat = st_oldchat;
+
+}
+
+void ST_Ticker (void)
+{
+
+    st_randomnumber = M_Random();
+    ST_updateWidgets();
+    st_oldhealth = plyr->health;
+
+}
+
+static int st_palette = 0;
+
+void ST_doPaletteStuff(void)
+{
+
+    int		palette;
+    byte*	pal;
+    int		cnt;
+    int		bzc;
+
+    cnt = plyr->damagecount;
+
+    if (plyr->powers[pw_strength])
+    {
+	// slowly fade the berzerk out
+  	bzc = 12 - (plyr->powers[pw_strength]>>6);
+
+	if (bzc > cnt)
+	    cnt = bzc;
+    }
+	
+    if (cnt)
+    {
+	palette = (cnt+7)>>3;
+	
+	if (palette >= NUMREDPALS)
+	    palette = NUMREDPALS-1;
+
+	palette += STARTREDPALS;
+    }
+
+    else if (plyr->bonuscount)
+    {
+	palette = (plyr->bonuscount+7)>>3;
+
+	if (palette >= NUMBONUSPALS)
+	    palette = NUMBONUSPALS-1;
+
+	palette += STARTBONUSPALS;
+    }
+
+    else if ( plyr->powers[pw_ironfeet] > 4*32
+	      || plyr->powers[pw_ironfeet]&8)
+	palette = RADIATIONPAL;
+    else
+	palette = 0;
+
+    // In Chex Quest, the player never sees red.  Instead, the
+    // radiation suit palette is used to tint the screen green,
+    // as though the player is being covered in goo by an
+    // attacking flemoid.
+
+    if (gameversion == exe_chex
+     && palette >= STARTREDPALS && palette < STARTREDPALS + NUMREDPALS)
+    {
+        palette = RADIATIONPAL;
+    }
+
+    if (palette != st_palette)
+    {
+	st_palette = palette;
+	pal = (byte *) W_CacheLumpNum (lu_palette, PU_CACHE)+palette*768;
+	I_SetPalette (pal);
+    }
+
+}
+
+void ST_drawWidgets(boolean refresh)
+{
+    int		i;
+
+    // used by w_arms[] widgets
+    st_armson = st_statusbaron && !deathmatch;
+
+    // used by w_frags widget
+    st_fragson = deathmatch && st_statusbaron; 
+
+    STlib_updateNum(&w_ready, refresh);
+
+    for (i=0;i<4;i++)
+    {
+	STlib_updateNum(&w_ammo[i], refresh);
+	STlib_updateNum(&w_maxammo[i], refresh);
+    }
+
+    STlib_updatePercent(&w_health, refresh);
+    STlib_updatePercent(&w_armor, refresh);
+
+    STlib_updateBinIcon(&w_armsbg, refresh);
+
+    for (i=0;i<6;i++)
+	STlib_updateMultIcon(&w_arms[i], refresh);
+
+    STlib_updateMultIcon(&w_faces, refresh);
+
+    for (i=0;i<3;i++)
+	STlib_updateMultIcon(&w_keyboxes[i], refresh);
+
+    STlib_updateNum(&w_frags, refresh);
+
+}
+
+void ST_doRefresh(void)
+{
+
+    st_firsttime = false;
+
+    // draw status bar background to off-screen buff
+    ST_refreshBackground();
+
+    // and refresh all widgets
+    ST_drawWidgets(true);
+
+}
+
+void ST_diffDraw(void)
+{
+    // update all widgets
+    ST_drawWidgets(false);
+}
+
+void ST_Drawer (boolean fullscreen, boolean refresh)
+{
+  
+    st_statusbaron = (!fullscreen) || automapactive;
+    st_firsttime = st_firsttime || refresh;
+
+    // Do red-/gold-shifts from damage/items
+    ST_doPaletteStuff();
+
+    // If just after ST_Start(), refresh all
+    if (st_firsttime) ST_doRefresh();
+    // Otherwise, update as little as possible
+    else ST_diffDraw();
+
+}
+
+typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
+
+// Iterates through all graphics to be loaded or unloaded, along with
+// the variable they use, invoking the specified callback function.
+
+static void ST_loadUnloadGraphics(load_callback_t callback)
+{
+
+    int		i;
+    int		j;
+    int		facenum;
+    
+    char	namebuf[9];
+
+    // Load the numbers, tall and short
+    for (i=0;i<10;i++)
+    {
+	DEH_snprintf(namebuf, 9, "STTNUM%d", i);
+        callback(namebuf, &tallnum[i]);
+
+	DEH_snprintf(namebuf, 9, "STYSNUM%d", i);
+        callback(namebuf, &shortnum[i]);
+    }
+
+    // Load percent key.
+    //Note: why not load STMINUS here, too?
+
+    callback(DEH_String("STTPRCNT"), &tallpercent);
+
+    // key cards
+    for (i=0;i<NUMCARDS;i++)
+    {
+	DEH_snprintf(namebuf, 9, "STKEYS%d", i);
+        callback(namebuf, &keys[i]);
+    }
+
+    // arms background
+    callback(DEH_String("STARMS"), &armsbg);
+
+    // arms ownership widgets
+    for (i=0; i<6; i++)
+    {
+	DEH_snprintf(namebuf, 9, "STGNUM%d", i+2);
+
+	// gray #
+        callback(namebuf, &arms[i][0]);
+
+	// yellow #
+	arms[i][1] = shortnum[i+2]; 
+    }
+
+    // face backgrounds for different color players
+    DEH_snprintf(namebuf, 9, "STFB%d", consoleplayer);
+    callback(namebuf, &faceback);
+
+    // status bar background bits
+    if (W_CheckNumForName("STBAR") >= 0)
+    {
+        callback(DEH_String("STBAR"), &sbar);
+        sbarr = NULL;
+    }
+    else
+    {
+        callback(DEH_String("STMBARL"), &sbar);
+        callback(DEH_String("STMBARR"), &sbarr);
+    }
+
+    // face states
+    facenum = 0;
+    for (i=0; i<ST_NUMPAINFACES; i++)
+    {
+	for (j=0; j<ST_NUMSTRAIGHTFACES; j++)
+	{
+	    DEH_snprintf(namebuf, 9, "STFST%d%d", i, j);
+            callback(namebuf, &faces[facenum]);
+            ++facenum;
+	}
+	DEH_snprintf(namebuf, 9, "STFTR%d0", i);	// turn right
+        callback(namebuf, &faces[facenum]);
+        ++facenum;
+	DEH_snprintf(namebuf, 9, "STFTL%d0", i);	// turn left
+        callback(namebuf, &faces[facenum]);
+        ++facenum;
+	DEH_snprintf(namebuf, 9, "STFOUCH%d", i);	// ouch!
+        callback(namebuf, &faces[facenum]);
+        ++facenum;
+	DEH_snprintf(namebuf, 9, "STFEVL%d", i);	// evil grin ;)
+        callback(namebuf, &faces[facenum]);
+        ++facenum;
+	DEH_snprintf(namebuf, 9, "STFKILL%d", i);	// pissed off
+        callback(namebuf, &faces[facenum]);
+        ++facenum;
+    }
+
+    callback(DEH_String("STFGOD0"), &faces[facenum]);
+    ++facenum;
+    callback(DEH_String("STFDEAD0"), &faces[facenum]);
+    ++facenum;
+}
+
+static void ST_loadCallback(const char *lumpname, patch_t **variable)
+{
+    *variable = W_CacheLumpName(lumpname, PU_STATIC);
+}
+
+void ST_loadGraphics(void)
+{
+    ST_loadUnloadGraphics(ST_loadCallback);
+}
+
+void ST_loadData(void)
+{
+    lu_palette = W_GetNumForName (DEH_String("PLAYPAL"));
+    ST_loadGraphics();
+}
+
+static void ST_unloadCallback(const char *lumpname, patch_t **variable)
+{
+    W_ReleaseLumpName(lumpname);
+    *variable = NULL;
+}
+
+void ST_unloadGraphics(void)
+{
+    ST_loadUnloadGraphics(ST_unloadCallback);
+}
+
+void ST_unloadData(void)
+{
+    ST_unloadGraphics();
+}
+
+void ST_initData(void)
+{
+
+    int		i;
+
+    st_firsttime = true;
+    plyr = &players[consoleplayer];
+
+    st_statusbaron = true;
+    st_oldchat = st_chat = false;
+
+    st_faceindex = 0;
+    st_palette = -1;
+
+    st_oldhealth = -1;
+
+    for (i=0;i<NUMWEAPONS;i++)
+	oldweaponsowned[i] = plyr->weaponowned[i];
+
+    for (i=0;i<3;i++)
+	keyboxes[i] = -1;
+
+    STlib_init();
+
+}
+
+
+
+void ST_createWidgets(void)
+{
+
+    int i;
+
+    // ready weapon ammo
+    STlib_initNum(&w_ready,
+		  ST_AMMOX,
+		  ST_AMMOY,
+		  tallnum,
+		  &plyr->ammo[weaponinfo[plyr->readyweapon].ammo],
+		  &st_statusbaron,
+		  ST_AMMOWIDTH );
+
+    // the last weapon type
+    w_ready.data = plyr->readyweapon; 
+
+    // health percentage
+    STlib_initPercent(&w_health,
+		      ST_HEALTHX,
+		      ST_HEALTHY,
+		      tallnum,
+		      &plyr->health,
+		      &st_statusbaron,
+		      tallpercent);
+
+    // arms background
+    STlib_initBinIcon(&w_armsbg,
+		      ST_ARMSBGX,
+		      ST_ARMSBGY,
+		      armsbg,
+		      &st_notdeathmatch,
+		      &st_statusbaron);
+
+    // weapons owned
+    for(i=0;i<6;i++)
+    {
+        STlib_initMultIcon(&w_arms[i],
+                           ST_ARMSX+(i%3)*ST_ARMSXSPACE,
+                           ST_ARMSY+(i/3)*ST_ARMSYSPACE,
+                           arms[i],
+                           &plyr->weaponowned[i+1],
+                           &st_armson);
+    }
+
+    // frags sum
+    STlib_initNum(&w_frags,
+		  ST_FRAGSX,
+		  ST_FRAGSY,
+		  tallnum,
+		  &st_fragscount,
+		  &st_fragson,
+		  ST_FRAGSWIDTH);
+
+    // faces
+    STlib_initMultIcon(&w_faces,
+		       ST_FACESX,
+		       ST_FACESY,
+		       faces,
+		       &st_faceindex,
+		       &st_statusbaron);
+
+    // armor percentage - should be colored later
+    STlib_initPercent(&w_armor,
+		      ST_ARMORX,
+		      ST_ARMORY,
+		      tallnum,
+		      &plyr->armorpoints,
+		      &st_statusbaron, tallpercent);
+
+    // keyboxes 0-2
+    STlib_initMultIcon(&w_keyboxes[0],
+		       ST_KEY0X,
+		       ST_KEY0Y,
+		       keys,
+		       &keyboxes[0],
+		       &st_statusbaron);
+    
+    STlib_initMultIcon(&w_keyboxes[1],
+		       ST_KEY1X,
+		       ST_KEY1Y,
+		       keys,
+		       &keyboxes[1],
+		       &st_statusbaron);
+
+    STlib_initMultIcon(&w_keyboxes[2],
+		       ST_KEY2X,
+		       ST_KEY2Y,
+		       keys,
+		       &keyboxes[2],
+		       &st_statusbaron);
+
+    // ammo count (all four kinds)
+    STlib_initNum(&w_ammo[0],
+		  ST_AMMO0X,
+		  ST_AMMO0Y,
+		  shortnum,
+		  &plyr->ammo[0],
+		  &st_statusbaron,
+		  ST_AMMO0WIDTH);
+
+    STlib_initNum(&w_ammo[1],
+		  ST_AMMO1X,
+		  ST_AMMO1Y,
+		  shortnum,
+		  &plyr->ammo[1],
+		  &st_statusbaron,
+		  ST_AMMO1WIDTH);
+
+    STlib_initNum(&w_ammo[2],
+		  ST_AMMO2X,
+		  ST_AMMO2Y,
+		  shortnum,
+		  &plyr->ammo[2],
+		  &st_statusbaron,
+		  ST_AMMO2WIDTH);
+    
+    STlib_initNum(&w_ammo[3],
+		  ST_AMMO3X,
+		  ST_AMMO3Y,
+		  shortnum,
+		  &plyr->ammo[3],
+		  &st_statusbaron,
+		  ST_AMMO3WIDTH);
+
+    // max ammo count (all four kinds)
+    STlib_initNum(&w_maxammo[0],
+		  ST_MAXAMMO0X,
+		  ST_MAXAMMO0Y,
+		  shortnum,
+		  &plyr->maxammo[0],
+		  &st_statusbaron,
+		  ST_MAXAMMO0WIDTH);
+
+    STlib_initNum(&w_maxammo[1],
+		  ST_MAXAMMO1X,
+		  ST_MAXAMMO1Y,
+		  shortnum,
+		  &plyr->maxammo[1],
+		  &st_statusbaron,
+		  ST_MAXAMMO1WIDTH);
+
+    STlib_initNum(&w_maxammo[2],
+		  ST_MAXAMMO2X,
+		  ST_MAXAMMO2Y,
+		  shortnum,
+		  &plyr->maxammo[2],
+		  &st_statusbaron,
+		  ST_MAXAMMO2WIDTH);
+    
+    STlib_initNum(&w_maxammo[3],
+		  ST_MAXAMMO3X,
+		  ST_MAXAMMO3Y,
+		  shortnum,
+		  &plyr->maxammo[3],
+		  &st_statusbaron,
+		  ST_MAXAMMO3WIDTH);
+
+}
+
+static boolean	st_stopped = true;
+
+
+void ST_Start (void)
+{
+
+    if (!st_stopped)
+	ST_Stop();
+
+    ST_initData();
+    ST_createWidgets();
+    st_stopped = false;
+
+}
+
+void ST_Stop (void)
+{
+    if (st_stopped)
+	return;
+
+    I_SetPalette (W_CacheLumpNum (lu_palette, PU_CACHE));
+
+    st_stopped = true;
+}
+
+void ST_Init (void)
+{
+    ST_loadData();
+    st_backing_screen = (pixel_t *) Z_Malloc(ST_WIDTH * ST_HEIGHT * sizeof(*st_backing_screen), PU_STATIC, 0);
+}
+
diff --git a/games/NXDoom/src/doom/st_stuff.h b/games/NXDoom/src/doom/st_stuff.h
new file mode 100644
index 000000000..0cf28bb63
--- /dev/null
+++ b/games/NXDoom/src/doom/st_stuff.h
@@ -0,0 +1,69 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Status bar code.
+//	Does the face/direction indicator animatin.
+//	Does palette indicators as well (red pain/berserk, bright pickup)
+//
+
+#ifndef __STSTUFF_H__
+#define __STSTUFF_H__
+
+#include "doomtype.h"
+#include "d_event.h"
+#include "m_cheat.h"
+
+// Size of statusbar.
+// Now sensitive for scaling.
+#define ST_HEIGHT	32
+#define ST_WIDTH	SCREENWIDTH
+#define ST_Y		(SCREENHEIGHT - ST_HEIGHT)
+
+
+//
+// STATUS BAR
+//
+
+// Called by main loop.
+boolean ST_Responder (event_t* ev);
+
+// Called by main loop.
+void ST_Ticker (void);
+
+// Called by main loop.
+void ST_Drawer (boolean fullscreen, boolean refresh);
+
+// Called when the console player is spawned on each level.
+void ST_Start (void);
+
+// Called by startup code.
+void ST_Init (void);
+
+
+
+extern pixel_t *st_backing_screen;
+extern cheatseq_t cheat_mus;
+extern cheatseq_t cheat_god;
+extern cheatseq_t cheat_ammo;
+extern cheatseq_t cheat_ammonokey;
+extern cheatseq_t cheat_noclip;
+extern cheatseq_t cheat_commercial_noclip;
+extern cheatseq_t cheat_powerup[7];
+extern cheatseq_t cheat_choppers;
+extern cheatseq_t cheat_clev;
+extern cheatseq_t cheat_mypos;
+
+
+#endif
diff --git a/games/NXDoom/src/doom/statdump.c b/games/NXDoom/src/doom/statdump.c
new file mode 100644
index 000000000..ae6814a31
--- /dev/null
+++ b/games/NXDoom/src/doom/statdump.c
@@ -0,0 +1,357 @@
+ /*
+
+ Copyright(C) 2005-2014 Simon Howard
+
+ 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.
+
+ --
+
+ Functions for presenting the information captured from the statistics
+ buffer to a file.
+
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "d_player.h"
+#include "d_mode.h"
+#include "m_argv.h"
+#include "m_misc.h"
+
+#include "statdump.h"
+
+/* Par times for E1M1-E1M9. */
+static const int doom1_par_times[] =
+{
+    30, 75, 120, 90, 165, 180, 180, 30, 165,
+};
+
+/* Par times for MAP01-MAP09. */
+static const int doom2_par_times[] =
+{
+    30, 90, 120, 120, 90, 150, 120, 120, 270,
+};
+
+/* Player colors. */
+static const char *player_colors[] =
+{
+    "Green", "Indigo", "Brown", "Red"
+};
+
+// Array of end-of-level statistics that have been captured.
+
+#define MAX_CAPTURES 32
+static wbstartstruct_t captured_stats[MAX_CAPTURES];
+static int num_captured_stats = 0;
+
+static GameMission_t discovered_gamemission = none;
+
+/* Try to work out whether this is a Doom 1 or Doom 2 game, by looking
+ * at the episode and map, and the par times.  This is used to decide
+ * how to format the level name.  Unfortunately, in some cases it is
+ * impossible to determine whether this is Doom 1 or Doom 2. */
+
+static void DiscoverGamemode(const wbstartstruct_t *stats, int num_stats)
+{
+    int partime;
+    int level;
+    int i;
+
+    if (discovered_gamemission != none)
+    {
+        return;
+    }
+
+    for (i=0; i<num_stats; ++i)
+    {
+        level = stats[i].last;
+
+        /* If episode 2, 3 or 4, this is Doom 1. */
+
+        if (stats[i].epsd > 0)
+        {
+            discovered_gamemission = doom;
+            return;
+        }
+
+        /* This is episode 1.  If this is level 10 or higher,
+           it must be Doom 2. */
+
+        if (level >= 9)
+        {
+            discovered_gamemission = doom2;
+            return;
+        }
+
+        /* Try to work out if this is Doom 1 or Doom 2 by looking
+           at the par time. */
+
+        partime = stats[i].partime;
+
+        if (partime == doom1_par_times[level] * TICRATE
+         && partime != doom2_par_times[level] * TICRATE)
+        {
+            discovered_gamemission = doom;
+            return;
+        }
+
+        if (partime != doom1_par_times[level] * TICRATE
+         && partime == doom2_par_times[level] * TICRATE)
+        {
+            discovered_gamemission = doom2;
+            return;
+        }
+    }
+}
+
+/* Returns the number of players active in the given stats buffer. */
+
+static int GetNumPlayers(const wbstartstruct_t *stats)
+{
+    int i;
+    int num_players = 0;
+
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        if (stats->plyr[i].in)
+        {
+            ++num_players;
+        }
+    }
+
+    return num_players;
+}
+
+static void PrintBanner(FILE *stream)
+{
+    fprintf(stream, "===========================================\n");
+}
+
+static void PrintPercentage(FILE *stream, int amount, int total)
+{
+    if (total == 0)
+    {
+        fprintf(stream, "0");
+    }
+    else
+    {
+        fprintf(stream, "%i / %i", amount, total);
+
+        // statdump.exe is a 16-bit program, so very occasionally an
+        // integer overflow can occur when doing this calculation with
+        // a large value. Therefore, cast to short to give the same
+        // output.
+
+        fprintf(stream, " (%i%%)", (short) (amount * 100) / total);
+    }
+}
+
+/* Display statistics for a single player. */
+
+static void PrintPlayerStats(FILE *stream, const wbstartstruct_t *stats,
+        int player_num)
+{
+    const wbplayerstruct_t *player = &stats->plyr[player_num];
+
+    fprintf(stream, "Player %i (%s):\n", player_num + 1,
+            player_colors[player_num]);
+
+    /* Kills percentage */
+
+    fprintf(stream, "\tKills: ");
+    PrintPercentage(stream, player->skills, stats->maxkills);
+    fprintf(stream, "\n");
+
+    /* Items percentage */
+
+    fprintf(stream, "\tItems: ");
+    PrintPercentage(stream, player->sitems, stats->maxitems);
+    fprintf(stream, "\n");
+
+    /* Secrets percentage */
+
+    fprintf(stream, "\tSecrets: ");
+    PrintPercentage(stream, player->ssecret, stats->maxsecret);
+    fprintf(stream, "\n");
+}
+
+/* Frags table for multiplayer games. */
+
+static void PrintFragsTable(FILE *stream, const wbstartstruct_t *stats)
+{
+    int x, y;
+
+    fprintf(stream, "Frags:\n");
+
+    /* Print header */
+
+    fprintf(stream, "\t\t");
+
+    for (x=0; x<MAXPLAYERS; ++x)
+    {
+
+        if (!stats->plyr[x].in)
+        {
+            continue;
+        }
+
+        fprintf(stream, "%s\t", player_colors[x]);
+    }
+
+    fprintf(stream, "\n");
+
+    fprintf(stream, "\t\t-------------------------------- VICTIMS\n");
+
+    /* Print table */
+
+    for (y=0; y<MAXPLAYERS; ++y)
+    {
+        if (!stats->plyr[y].in)
+        {
+            continue;
+        }
+
+        fprintf(stream, "\t%s\t|", player_colors[y]);
+
+        for (x=0; x<MAXPLAYERS; ++x)
+        {
+            if (!stats->plyr[x].in)
+            {
+                continue;
+            }
+
+            fprintf(stream, "%i\t", stats->plyr[y].frags[x]);
+        }
+
+        fprintf(stream, "\n");
+    }
+
+    fprintf(stream, "\t\t|\n");
+    fprintf(stream, "\t     KILLERS\n");
+}
+
+/* Displays the level name: MAPxy or ExMy, depending on game mode. */
+
+static void PrintLevelName(FILE *stream, int episode, int level)
+{
+    PrintBanner(stream);
+
+    switch (discovered_gamemission)
+    {
+
+        case doom:
+            fprintf(stream, "E%iM%i\n", episode + 1, level + 1);
+            break;
+        case doom2:
+            fprintf(stream, "MAP%02i\n", level + 1);
+            break;
+        default:
+        case none:
+            fprintf(stream, "E%iM%i / MAP%02i\n", 
+                    episode + 1, level + 1, level + 1);
+            break;
+    }
+
+    PrintBanner(stream);
+}
+
+/* Print details of a statistics buffer to the given file. */
+
+static void PrintStats(FILE *stream, const wbstartstruct_t *stats)
+{
+    short leveltime, partime;
+    int i;
+
+    PrintLevelName(stream, stats->epsd, stats->last);
+    fprintf(stream, "\n");
+
+    leveltime = stats->plyr[0].stime / TICRATE;
+    partime = stats->partime / TICRATE;
+    fprintf(stream, "Time: %i:%02i", leveltime / 60, leveltime % 60);
+    fprintf(stream, " (par: %i:%02i)\n", partime / 60, partime % 60);
+    fprintf(stream, "\n");
+
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        if (stats->plyr[i].in)
+        {
+            PrintPlayerStats(stream, stats, i);
+        }
+    }
+
+    if (GetNumPlayers(stats) >= 2)
+    {
+        PrintFragsTable(stream, stats);
+    }
+
+    fprintf(stream, "\n");
+}
+
+void StatCopy(const wbstartstruct_t *stats)
+{
+    if (M_ParmExists("-statdump") && num_captured_stats < MAX_CAPTURES)
+    {
+        memcpy(&captured_stats[num_captured_stats], stats,
+               sizeof(wbstartstruct_t));
+        ++num_captured_stats;
+    }
+}
+
+void StatDump(void)
+{
+    FILE *dumpfile;
+    int i;
+
+    //!
+    // @category compat
+    // @arg <filename>
+    //
+    // Dump statistics information to the specified file on the levels
+    // that were played. The output from this option matches the output
+    // from statdump.exe (see ctrlapi.zip in the /idgames archive).
+    //
+
+    i = M_CheckParmWithArgs("-statdump", 1);
+
+    if (i > 0)
+    {
+        printf("Statistics captured for %i level(s)\n", num_captured_stats);
+
+        // We actually know what the real gamemission is, but this has
+        // to match the output from statdump.exe.
+
+        DiscoverGamemode(captured_stats, num_captured_stats);
+
+        // Allow "-" as output file, for stdout.
+
+        if (strcmp(myargv[i + 1], "-") != 0)
+        {
+            dumpfile = M_fopen(myargv[i + 1], "w");
+        }
+        else
+        {
+            dumpfile = stdout;
+        }
+
+        for (i = 0; i < num_captured_stats; ++i)
+        {
+            PrintStats(dumpfile, &captured_stats[i]);
+        }
+
+        if (dumpfile != stdout)
+        {
+            fclose(dumpfile);
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/doom/statdump.h b/games/NXDoom/src/doom/statdump.h
new file mode 100644
index 000000000..f4f11efe6
--- /dev/null
+++ b/games/NXDoom/src/doom/statdump.h
@@ -0,0 +1,23 @@
+ /*
+
+ Copyright(C) 2005-2014 Simon Howard
+
+ 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.
+
+ */
+
+#ifndef DOOM_STATDUMP_H
+#define DOOM_STATDUMP_H
+
+void StatCopy(const wbstartstruct_t *stats);
+void StatDump(void);
+
+#endif /* #ifndef DOOM_STATDUMP_H */
diff --git a/games/NXDoom/src/doom/wi_stuff.c b/games/NXDoom/src/doom/wi_stuff.c
new file mode 100644
index 000000000..965cc5571
--- /dev/null
+++ b/games/NXDoom/src/doom/wi_stuff.c
@@ -0,0 +1,1833 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Intermission screens.
+//
+
+
+#include <stdio.h>
+
+#include "z_zone.h"
+
+#include "m_misc.h"
+#include "m_random.h"
+
+#include "deh_main.h"
+#include "i_swap.h"
+#include "i_system.h"
+
+#include "w_wad.h"
+
+#include "g_game.h"
+
+#include "r_local.h"
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+// Data.
+#include "sounds.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+#include "wi_stuff.h"
+
+//
+// Data needed to add patches to full screen intermission pics.
+// Patches are statistics messages, and animations.
+// Loads of by-pixel layout and placement, offsets etc.
+//
+
+
+//
+// Different vetween registered DOOM (1994) and
+//  Ultimate DOOM - Final edition (retail, 1995?).
+// This is supposedly ignored for commercial
+//  release (aka DOOM II), which had 34 maps
+//  in one episode. So there.
+#define NUMEPISODES	4
+#define NUMMAPS		9
+
+
+// in tics
+//U #define PAUSELEN		(TICRATE*2) 
+//U #define SCORESTEP		100
+//U #define ANIMPERIOD		32
+// pixel distance from "(YOU)" to "PLAYER N"
+//U #define STARDIST		10 
+//U #define WK 1
+
+
+// GLOBAL LOCATIONS
+#define WI_TITLEY		2
+#define WI_SPACINGY    		33
+
+// SINGPLE-PLAYER STUFF
+#define SP_STATSX		50
+#define SP_STATSY		50
+
+#define SP_TIMEX		16
+#define SP_TIMEY		(SCREENHEIGHT-32)
+
+
+// NET GAME STUFF
+#define NG_STATSY		50
+#define NG_STATSX		(32 + SHORT(star->width)/2 + 32*!dofrags)
+
+#define NG_SPACINGX    		64
+
+
+// DEATHMATCH STUFF
+#define DM_MATRIXX		42
+#define DM_MATRIXY		68
+
+#define DM_SPACINGX		40
+
+#define DM_TOTALSX		269
+
+#define DM_KILLERSX		10
+#define DM_KILLERSY		100
+#define DM_VICTIMSX    		5
+#define DM_VICTIMSY		50
+
+
+
+
+typedef enum
+{
+    ANIM_ALWAYS,
+    ANIM_RANDOM,
+    ANIM_LEVEL
+
+} animenum_t;
+
+typedef struct
+{
+    int		x;
+    int		y;
+    
+} point_t;
+
+
+//
+// Animation.
+// There is another anim_t used in p_spec.
+//
+typedef struct
+{
+    animenum_t	type;
+
+    // period in tics between animations
+    int		period;
+
+    // number of animation frames
+    int		nanims;
+
+    // location of animation
+    point_t	loc;
+
+    // ALWAYS: n/a,
+    // RANDOM: period deviation (<256),
+    // LEVEL: level
+    int		data1;
+
+    // ALWAYS: n/a,
+    // RANDOM: random base period,
+    // LEVEL: n/a
+    int		data2; 
+
+    // actual graphics for frames of animations
+    patch_t*	p[3]; 
+
+    // following must be initialized to zero before use!
+
+    // next value of bcnt (used in conjunction with period)
+    int		nexttic;
+
+    // last drawn animation frame
+    int		lastdrawn;
+
+    // next frame number to animate
+    int		ctr;
+    
+    // used by RANDOM and LEVEL when animating
+    int		state;  
+
+} anim_t;
+
+
+static point_t lnodes[NUMEPISODES][NUMMAPS] =
+{
+    // Episode 0 World Map
+    {
+	{ 185, 164 },	// location of level 0 (CJ)
+	{ 148, 143 },	// location of level 1 (CJ)
+	{ 69, 122 },	// location of level 2 (CJ)
+	{ 209, 102 },	// location of level 3 (CJ)
+	{ 116, 89 },	// location of level 4 (CJ)
+	{ 166, 55 },	// location of level 5 (CJ)
+	{ 71, 56 },	// location of level 6 (CJ)
+	{ 135, 29 },	// location of level 7 (CJ)
+	{ 71, 24 }	// location of level 8 (CJ)
+    },
+
+    // Episode 1 World Map should go here
+    {
+	{ 254, 25 },	// location of level 0 (CJ)
+	{ 97, 50 },	// location of level 1 (CJ)
+	{ 188, 64 },	// location of level 2 (CJ)
+	{ 128, 78 },	// location of level 3 (CJ)
+	{ 214, 92 },	// location of level 4 (CJ)
+	{ 133, 130 },	// location of level 5 (CJ)
+	{ 208, 136 },	// location of level 6 (CJ)
+	{ 148, 140 },	// location of level 7 (CJ)
+	{ 235, 158 }	// location of level 8 (CJ)
+    },
+
+    // Episode 2 World Map should go here
+    {
+	{ 156, 168 },	// location of level 0 (CJ)
+	{ 48, 154 },	// location of level 1 (CJ)
+	{ 174, 95 },	// location of level 2 (CJ)
+	{ 265, 75 },	// location of level 3 (CJ)
+	{ 130, 48 },	// location of level 4 (CJ)
+	{ 279, 23 },	// location of level 5 (CJ)
+	{ 198, 48 },	// location of level 6 (CJ)
+	{ 140, 25 },	// location of level 7 (CJ)
+	{ 281, 136 }	// location of level 8 (CJ)
+    }
+
+};
+
+
+//
+// Animation locations for episode 0 (1).
+// Using patches saves a lot of space,
+//  as they replace 320x200 full screen frames.
+//
+
+#define ANIM(type, period, nanims, x, y, nexttic)            \
+   { (type), (period), (nanims), { (x), (y) }, (nexttic),    \
+     0, { NULL, NULL, NULL }, 0, 0, 0, 0 }
+
+
+static anim_t epsd0animinfo[] =
+{
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 224, 104, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 184, 160, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 112, 136, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 72, 112, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 88, 96, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 48, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 192, 40, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 136, 16, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 80, 16, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 24, 0),
+};
+
+static anim_t epsd1animinfo[] =
+{
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 1),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 2),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 3),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 4),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 5),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 6),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 7),
+    ANIM(ANIM_LEVEL, TICRATE/3, 3, 192, 144, 8),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 8),
+};
+
+static anim_t epsd2animinfo[] =
+{
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 168, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 40, 136, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 160, 96, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 80, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 120, 32, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/4, 3, 40, 0, 0),
+};
+
+static int NUMANIMS[NUMEPISODES] =
+{
+    arrlen(epsd0animinfo),
+    arrlen(epsd1animinfo),
+    arrlen(epsd2animinfo),
+};
+
+static anim_t *anims[NUMEPISODES] =
+{
+    epsd0animinfo,
+    epsd1animinfo,
+    epsd2animinfo
+};
+
+
+//
+// GENERAL DATA
+//
+
+//
+// Locally used stuff.
+//
+
+// States for single-player
+#define SP_KILLS		0
+#define SP_ITEMS		2
+#define SP_SECRET		4
+#define SP_FRAGS		6 
+#define SP_TIME			8 
+#define SP_PAR			ST_TIME
+
+#define SP_PAUSE		1
+
+// in seconds
+#define SHOWNEXTLOCDELAY	4
+//#define SHOWLASTLOCDELAY	SHOWNEXTLOCDELAY
+
+
+// used to accelerate or skip a stage
+static int		acceleratestage;
+
+// wbs->pnum
+static int		me;
+
+ // specifies current state
+static stateenum_t	state;
+
+// contains information passed into intermission
+static wbstartstruct_t*	wbs;
+
+static wbplayerstruct_t* plrs;  // wbs->plyr[]
+
+// used for general timing
+static int 		cnt;  
+
+// used for timing of background animation
+static int 		bcnt;
+
+// signals to refresh everything for one frame
+static int 		firstrefresh; 
+
+static int		cnt_kills[MAXPLAYERS];
+static int		cnt_items[MAXPLAYERS];
+static int		cnt_secret[MAXPLAYERS];
+static int		cnt_time;
+static int		cnt_par;
+static int		cnt_pause;
+
+// # of commercial levels
+static int		NUMCMAPS; 
+
+
+//
+//	GRAPHICS
+//
+
+// You Are Here graphic
+static patch_t*		yah[3] = { NULL, NULL, NULL }; 
+
+// splat
+static patch_t*		splat[2] = { NULL, NULL };
+
+// %, : graphics
+static patch_t*		percent;
+static patch_t*		colon;
+
+// 0-9 graphic
+static patch_t*		num[10];
+
+// minus sign
+static patch_t*		wiminus;
+
+// "Finished!" graphics
+static patch_t*		finished;
+
+// "Entering" graphic
+static patch_t*		entering; 
+
+// "secret"
+static patch_t*		sp_secret;
+
+ // "Kills", "Scrt", "Items", "Frags"
+static patch_t*		kills;
+static patch_t*		secret;
+static patch_t*		items;
+static patch_t*		frags;
+
+// Time sucks.
+static patch_t*		timepatch;
+static patch_t*		par;
+static patch_t*		sucks;
+
+// "killers", "victims"
+static patch_t*		killers;
+static patch_t*		victims; 
+
+// "Total", your face, your dead face
+static patch_t*		total;
+static patch_t*		star;
+static patch_t*		bstar;
+
+// "red P[1..MAXPLAYERS]"
+static patch_t*		p[MAXPLAYERS];
+
+// "gray P[1..MAXPLAYERS]"
+static patch_t*		bp[MAXPLAYERS];
+
+ // Name graphics of each level (centered)
+static patch_t**	lnames;
+
+// Buffer storing the backdrop
+static patch_t *background;
+
+//
+// CODE
+//
+
+// slam background
+void WI_slamBackground(void)
+{
+    V_DrawPatch(0, 0, background);
+}
+
+// The ticker is used to detect keys
+//  because of timing issues in netgames.
+boolean WI_Responder(event_t* ev)
+{
+    return false;
+}
+
+
+// Draws "<Levelname> Finished!"
+void WI_drawLF(void)
+{
+    int y = WI_TITLEY;
+
+    if (gamemode != commercial || wbs->last < NUMCMAPS)
+    {
+        // draw <LevelName> 
+        V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2,
+                    y, lnames[wbs->last]);
+
+        // draw "Finished!"
+        y += (5*SHORT(lnames[wbs->last]->height))/4;
+
+        V_DrawPatch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
+    }
+    else if (wbs->last == NUMCMAPS)
+    {
+        // MAP33 - draw "Finished!" only
+        V_DrawPatch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
+    }
+    else if (wbs->last > NUMCMAPS)
+    {
+        // > MAP33.  Doom bombs out here with a Bad V_DrawPatch error.
+        // I'm pretty sure that doom2.exe is just reading into random
+        // bits of memory at this point, but let's try to be accurate
+        // anyway.  This deliberately triggers a V_DrawPatch error.
+
+        patch_t tmp = { SCREENWIDTH, SCREENHEIGHT, 1, 1, 
+                        { 0, 0, 0, 0, 0, 0, 0, 0 } };
+
+        V_DrawPatch(0, y, &tmp);
+    }
+}
+
+
+
+// Draws "Entering <LevelName>"
+void WI_drawEL(void)
+{
+    int y = WI_TITLEY;
+
+    // draw "Entering"
+    V_DrawPatch((SCREENWIDTH - SHORT(entering->width))/2,
+		y,
+                entering);
+
+    // draw level
+    y += (5*SHORT(lnames[wbs->next]->height))/4;
+
+    V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->next]->width))/2,
+		y, 
+                lnames[wbs->next]);
+
+}
+
+void
+WI_drawOnLnode
+( int		n,
+  patch_t*	c[] )
+{
+
+    int		i;
+    int		left;
+    int		top;
+    int		right;
+    int		bottom;
+    boolean	fits = false;
+
+    i = 0;
+    do
+    {
+	left = lnodes[wbs->epsd][n].x - SHORT(c[i]->leftoffset);
+	top = lnodes[wbs->epsd][n].y - SHORT(c[i]->topoffset);
+	right = left + SHORT(c[i]->width);
+	bottom = top + SHORT(c[i]->height);
+
+	if (left >= 0
+	    && right < SCREENWIDTH
+	    && top >= 0
+	    && bottom < SCREENHEIGHT)
+	{
+	    fits = true;
+	}
+	else
+	{
+	    i++;
+	}
+    } while (!fits && i!=2 && c[i] != NULL);
+
+    if (fits && i<2)
+    {
+	V_DrawPatch(lnodes[wbs->epsd][n].x,
+                    lnodes[wbs->epsd][n].y,
+		    c[i]);
+    }
+    else
+    {
+	// DEBUG
+	printf("Could not place patch on level %d", n+1); 
+    }
+}
+
+
+
+void WI_initAnimatedBack(void)
+{
+    int		i;
+    anim_t*	a;
+
+    if (gamemode == commercial)
+	return;
+
+    if (wbs->epsd > 2)
+	return;
+
+    for (i=0;i<NUMANIMS[wbs->epsd];i++)
+    {
+	a = &anims[wbs->epsd][i];
+
+	// init variables
+	a->ctr = -1;
+
+	// specify the next time to draw it
+	if (a->type == ANIM_ALWAYS)
+	    a->nexttic = bcnt + 1 + (M_Random()%a->period);
+	else if (a->type == ANIM_RANDOM)
+	    a->nexttic = bcnt + 1 + a->data2+(M_Random()%a->data1);
+	else if (a->type == ANIM_LEVEL)
+	    a->nexttic = bcnt + 1;
+    }
+
+}
+
+void WI_updateAnimatedBack(void)
+{
+    int		i;
+    anim_t*	a;
+
+    if (gamemode == commercial)
+	return;
+
+    if (wbs->epsd > 2)
+	return;
+
+    for (i=0;i<NUMANIMS[wbs->epsd];i++)
+    {
+	a = &anims[wbs->epsd][i];
+
+	if (bcnt == a->nexttic)
+	{
+	    switch (a->type)
+	    {
+	      case ANIM_ALWAYS:
+		if (++a->ctr >= a->nanims) a->ctr = 0;
+		a->nexttic = bcnt + a->period;
+		break;
+
+	      case ANIM_RANDOM:
+		a->ctr++;
+		if (a->ctr == a->nanims)
+		{
+		    a->ctr = -1;
+		    a->nexttic = bcnt+a->data2+(M_Random()%a->data1);
+		}
+		else a->nexttic = bcnt + a->period;
+		break;
+		
+	      case ANIM_LEVEL:
+		// gawd-awful hack for level anims
+		if (!(state == StatCount && i == 7)
+		    && wbs->next == a->data1)
+		{
+		    a->ctr++;
+		    if (a->ctr == a->nanims) a->ctr--;
+		    a->nexttic = bcnt + a->period;
+		}
+		break;
+	    }
+	}
+
+    }
+
+}
+
+void WI_drawAnimatedBack(void)
+{
+    int			i;
+    anim_t*		a;
+
+    if (gamemode == commercial)
+	return;
+
+    if (wbs->epsd > 2)
+	return;
+
+    for (i=0 ; i<NUMANIMS[wbs->epsd] ; i++)
+    {
+	a = &anims[wbs->epsd][i];
+
+	if (a->ctr >= 0)
+	    V_DrawPatch(a->loc.x, a->loc.y, a->p[a->ctr]);
+    }
+
+}
+
+//
+// Draws a number.
+// If digits > 0, then use that many digits minimum,
+//  otherwise only use as many as necessary.
+// Returns new x position.
+//
+
+int
+WI_drawNum
+( int		x,
+  int		y,
+  int		n,
+  int		digits )
+{
+
+    int		fontwidth = SHORT(num[0]->width);
+    int		neg;
+    int		temp;
+
+    if (digits < 0)
+    {
+	if (!n)
+	{
+	    // make variable-length zeros 1 digit long
+	    digits = 1;
+	}
+	else
+	{
+	    // figure out # of digits in #
+	    digits = 0;
+	    temp = n;
+
+	    while (temp)
+	    {
+		temp /= 10;
+		digits++;
+	    }
+	}
+    }
+
+    neg = n < 0;
+    if (neg)
+	n = -n;
+
+    // if non-number, do not draw it
+    if (n == 1994)
+	return 0;
+
+    // draw the new number
+    while (digits--)
+    {
+	x -= fontwidth;
+	V_DrawPatch(x, y, num[ n % 10 ]);
+	n /= 10;
+    }
+
+    // draw a minus sign if necessary
+    if (neg && wiminus)
+	V_DrawPatch(x-=8, y, wiminus);
+
+    return x;
+
+}
+
+void
+WI_drawPercent
+( int		x,
+  int		y,
+  int		p )
+{
+    if (p < 0)
+	return;
+
+    V_DrawPatch(x, y, percent);
+    WI_drawNum(x, y, p, -1);
+}
+
+
+
+//
+// Display level completion time and par,
+//  or "sucks" message if overflow.
+//
+void
+WI_drawTime
+( int		x,
+  int		y,
+  int		t )
+{
+
+    int		div;
+    int		n;
+
+    if (t<0)
+	return;
+
+    if (t <= 61*59)
+    {
+	div = 1;
+
+	do
+	{
+	    n = (t / div) % 60;
+	    x = WI_drawNum(x, y, n, 2) - SHORT(colon->width);
+	    div *= 60;
+
+	    // draw
+	    if (div==60 || t / div)
+		V_DrawPatch(x, y, colon);
+	    
+	} while (t / div);
+    }
+    else
+    {
+	// "sucks"
+	V_DrawPatch(x - SHORT(sucks->width), y, sucks); 
+    }
+}
+
+
+void WI_End(void)
+{
+    void WI_unloadData(void);
+    WI_unloadData();
+}
+
+void WI_initNoState(void)
+{
+    state = NoState;
+    acceleratestage = 0;
+    cnt = 10;
+}
+
+void WI_updateNoState(void) {
+
+    WI_updateAnimatedBack();
+
+    if (!--cnt)
+    {
+        // Don't call WI_End yet.  G_WorldDone doesnt immediately 
+        // change gamestate, so WI_Drawer is still going to get
+        // run until that happens.  If we do that after WI_End
+        // (which unloads all the graphics), we're in trouble.
+	//WI_End();
+	G_WorldDone();
+    }
+
+}
+
+static boolean		snl_pointeron = false;
+
+
+void WI_initShowNextLoc(void)
+{
+    state = ShowNextLoc;
+    acceleratestage = 0;
+    cnt = SHOWNEXTLOCDELAY * TICRATE;
+
+    WI_initAnimatedBack();
+}
+
+void WI_updateShowNextLoc(void)
+{
+    WI_updateAnimatedBack();
+
+    if (!--cnt || acceleratestage)
+	WI_initNoState();
+    else
+	snl_pointeron = (cnt & 31) < 20;
+}
+
+void WI_drawShowNextLoc(void)
+{
+
+    int		i;
+    int		last;
+
+    WI_slamBackground();
+
+    // draw animated background
+    WI_drawAnimatedBack(); 
+
+    if ( gamemode != commercial)
+    {
+  	if (wbs->epsd > 2)
+	{
+	    WI_drawEL();
+	    return;
+	}
+	
+	last = (wbs->last == 8) ? wbs->next - 1 : wbs->last;
+
+	// draw a splat on taken cities.
+	for (i=0 ; i<=last ; i++)
+	    WI_drawOnLnode(i, splat);
+
+	// splat the secret level?
+	if (wbs->didsecret)
+	    WI_drawOnLnode(8, splat);
+
+	// draw flashing ptr
+	if (snl_pointeron)
+	    WI_drawOnLnode(wbs->next, yah); 
+    }
+
+    // draws which level you are entering..
+    if ( (gamemode != commercial)
+	 || wbs->next != 30)
+	WI_drawEL();  
+
+}
+
+void WI_drawNoState(void)
+{
+    snl_pointeron = true;
+    WI_drawShowNextLoc();
+}
+
+int WI_fragSum(int playernum)
+{
+    int		i;
+    int		frags = 0;
+    
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i]
+	    && i!=playernum)
+	{
+	    frags += plrs[playernum].frags[i];
+	}
+    }
+
+	
+    // JDC hack - negative frags.
+    frags -= plrs[playernum].frags[playernum];
+    // UNUSED if (frags < 0)
+    // 	frags = 0;
+
+    return frags;
+}
+
+
+
+static int		dm_state;
+static int		dm_frags[MAXPLAYERS][MAXPLAYERS];
+static int		dm_totals[MAXPLAYERS];
+
+
+
+void WI_initDeathmatchStats(void)
+{
+
+    int		i;
+    int		j;
+
+    state = StatCount;
+    acceleratestage = 0;
+    dm_state = 1;
+
+    cnt_pause = TICRATE;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i])
+	{
+	    for (j=0 ; j<MAXPLAYERS ; j++)
+		if (playeringame[j])
+		    dm_frags[i][j] = 0;
+
+	    dm_totals[i] = 0;
+	}
+    }
+    
+    WI_initAnimatedBack();
+}
+
+
+
+void WI_updateDeathmatchStats(void)
+{
+
+    int		i;
+    int		j;
+    
+    boolean	stillticking;
+
+    WI_updateAnimatedBack();
+
+    if (acceleratestage && dm_state != 4)
+    {
+	acceleratestage = 0;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (playeringame[i])
+	    {
+		for (j=0 ; j<MAXPLAYERS ; j++)
+		    if (playeringame[j])
+			dm_frags[i][j] = plrs[i].frags[j];
+
+		dm_totals[i] = WI_fragSum(i);
+	    }
+	}
+	
+
+	S_StartSound(0, sfx_barexp);
+	dm_state = 4;
+    }
+
+    
+    if (dm_state == 2)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+	
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (playeringame[i])
+	    {
+		for (j=0 ; j<MAXPLAYERS ; j++)
+		{
+		    if (playeringame[j]
+			&& dm_frags[i][j] != plrs[i].frags[j])
+		    {
+			if (plrs[i].frags[j] < 0)
+			    dm_frags[i][j]--;
+			else
+			    dm_frags[i][j]++;
+
+			if (dm_frags[i][j] > 99)
+			    dm_frags[i][j] = 99;
+
+			if (dm_frags[i][j] < -99)
+			    dm_frags[i][j] = -99;
+			
+			stillticking = true;
+		    }
+		}
+		dm_totals[i] = WI_fragSum(i);
+
+		if (dm_totals[i] > 99)
+		    dm_totals[i] = 99;
+		
+		if (dm_totals[i] < -99)
+		    dm_totals[i] = -99;
+	    }
+	    
+	}
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    dm_state++;
+	}
+
+    }
+    else if (dm_state == 4)
+    {
+	if (acceleratestage)
+	{
+	    S_StartSound(0, sfx_slop);
+
+	    if ( gamemode == commercial)
+		WI_initNoState();
+	    else
+		WI_initShowNextLoc();
+	}
+    }
+    else if (dm_state & 1)
+    {
+	if (!--cnt_pause)
+	{
+	    dm_state++;
+	    cnt_pause = TICRATE;
+	}
+    }
+}
+
+
+
+void WI_drawDeathmatchStats(void)
+{
+
+    int		i;
+    int		j;
+    int		x;
+    int		y;
+    int		w;
+
+    WI_slamBackground();
+    
+    // draw animated background
+    WI_drawAnimatedBack(); 
+    WI_drawLF();
+
+    // draw stat titles (top line)
+    V_DrawPatch(DM_TOTALSX-SHORT(total->width)/2,
+		DM_MATRIXY-WI_SPACINGY+10,
+		total);
+    
+    V_DrawPatch(DM_KILLERSX, DM_KILLERSY, killers);
+    V_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, victims);
+
+    // draw P?
+    x = DM_MATRIXX + DM_SPACINGX;
+    y = DM_MATRIXY;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i])
+	{
+	    V_DrawPatch(x-SHORT(p[i]->width)/2,
+			DM_MATRIXY - WI_SPACINGY,
+			p[i]);
+	    
+	    V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
+			y,
+			p[i]);
+
+	    if (i == me)
+	    {
+		V_DrawPatch(x-SHORT(p[i]->width)/2,
+			    DM_MATRIXY - WI_SPACINGY,
+			    bstar);
+
+		V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
+			    y,
+			    star);
+	    }
+	}
+	else
+	{
+	    // V_DrawPatch(x-SHORT(bp[i]->width)/2,
+	    //   DM_MATRIXY - WI_SPACINGY, bp[i]);
+	    // V_DrawPatch(DM_MATRIXX-SHORT(bp[i]->width)/2,
+	    //   y, bp[i]);
+	}
+	x += DM_SPACINGX;
+	y += WI_SPACINGY;
+    }
+
+    // draw stats
+    y = DM_MATRIXY+10;
+    w = SHORT(num[0]->width);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	x = DM_MATRIXX + DM_SPACINGX;
+
+	if (playeringame[i])
+	{
+	    for (j=0 ; j<MAXPLAYERS ; j++)
+	    {
+		if (playeringame[j])
+		    WI_drawNum(x+w, y, dm_frags[i][j], 2);
+
+		x += DM_SPACINGX;
+	    }
+	    WI_drawNum(DM_TOTALSX+w, y, dm_totals[i], 2);
+	}
+	y += WI_SPACINGY;
+    }
+}
+
+static int	cnt_frags[MAXPLAYERS];
+static int	dofrags;
+static int	ng_state;
+
+void WI_initNetgameStats(void)
+{
+
+    int i;
+
+    state = StatCount;
+    acceleratestage = 0;
+    ng_state = 1;
+
+    cnt_pause = TICRATE;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (!playeringame[i])
+	    continue;
+
+	cnt_kills[i] = cnt_items[i] = cnt_secret[i] = cnt_frags[i] = 0;
+
+	dofrags += WI_fragSum(i);
+    }
+
+    dofrags = !!dofrags;
+
+    WI_initAnimatedBack();
+}
+
+
+
+void WI_updateNetgameStats(void)
+{
+
+    int		i;
+    int		fsum;
+    
+    boolean	stillticking;
+
+    WI_updateAnimatedBack();
+
+    if (acceleratestage && ng_state != 10)
+    {
+	acceleratestage = 0;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
+	    cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
+	    cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
+
+	    if (dofrags)
+		cnt_frags[i] = WI_fragSum(i);
+	}
+	S_StartSound(0, sfx_barexp);
+	ng_state = 10;
+    }
+
+    if (ng_state == 2)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_kills[i] += 2;
+
+	    if (cnt_kills[i] >= (plrs[i].skills * 100) / wbs->maxkills)
+		cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
+	    else
+		stillticking = true;
+	}
+	
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    ng_state++;
+	}
+    }
+    else if (ng_state == 4)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_items[i] += 2;
+	    if (cnt_items[i] >= (plrs[i].sitems * 100) / wbs->maxitems)
+		cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
+	    else
+		stillticking = true;
+	}
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    ng_state++;
+	}
+    }
+    else if (ng_state == 6)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_secret[i] += 2;
+
+	    if (cnt_secret[i] >= (plrs[i].ssecret * 100) / wbs->maxsecret)
+		cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
+	    else
+		stillticking = true;
+	}
+	
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    ng_state += 1 + 2*!dofrags;
+	}
+    }
+    else if (ng_state == 8)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_frags[i] += 1;
+
+	    if (cnt_frags[i] >= (fsum = WI_fragSum(i)))
+		cnt_frags[i] = fsum;
+	    else
+		stillticking = true;
+	}
+	
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_pldeth);
+	    ng_state++;
+	}
+    }
+    else if (ng_state == 10)
+    {
+	if (acceleratestage)
+	{
+	    S_StartSound(0, sfx_sgcock);
+	    if ( gamemode == commercial )
+		WI_initNoState();
+	    else
+		WI_initShowNextLoc();
+	}
+    }
+    else if (ng_state & 1)
+    {
+	if (!--cnt_pause)
+	{
+	    ng_state++;
+	    cnt_pause = TICRATE;
+	}
+    }
+}
+
+
+
+void WI_drawNetgameStats(void)
+{
+    int		i;
+    int		x;
+    int		y;
+    int		pwidth = SHORT(percent->width);
+
+    WI_slamBackground();
+    
+    // draw animated background
+    WI_drawAnimatedBack(); 
+
+    WI_drawLF();
+
+    // draw stat titles (top line)
+    V_DrawPatch(NG_STATSX+NG_SPACINGX-SHORT(kills->width),
+		NG_STATSY, kills);
+
+    V_DrawPatch(NG_STATSX+2*NG_SPACINGX-SHORT(items->width),
+		NG_STATSY, items);
+
+    V_DrawPatch(NG_STATSX+3*NG_SPACINGX-SHORT(secret->width),
+		NG_STATSY, secret);
+    
+    if (dofrags)
+	V_DrawPatch(NG_STATSX+4*NG_SPACINGX-SHORT(frags->width),
+		    NG_STATSY, frags);
+
+    // draw stats
+    y = NG_STATSY + SHORT(kills->height);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (!playeringame[i])
+	    continue;
+
+	x = NG_STATSX;
+	V_DrawPatch(x-SHORT(p[i]->width), y, p[i]);
+
+	if (i == me)
+	    V_DrawPatch(x-SHORT(p[i]->width), y, star);
+
+	x += NG_SPACINGX;
+	WI_drawPercent(x-pwidth, y+10, cnt_kills[i]);	x += NG_SPACINGX;
+	WI_drawPercent(x-pwidth, y+10, cnt_items[i]);	x += NG_SPACINGX;
+	WI_drawPercent(x-pwidth, y+10, cnt_secret[i]);	x += NG_SPACINGX;
+
+	if (dofrags)
+	    WI_drawNum(x, y+10, cnt_frags[i], -1);
+
+	y += WI_SPACINGY;
+    }
+
+}
+
+static int	sp_state;
+
+void WI_initStats(void)
+{
+    state = StatCount;
+    acceleratestage = 0;
+    sp_state = 1;
+    cnt_kills[0] = cnt_items[0] = cnt_secret[0] = -1;
+    cnt_time = cnt_par = -1;
+    cnt_pause = TICRATE;
+
+    WI_initAnimatedBack();
+}
+
+void WI_updateStats(void)
+{
+
+    WI_updateAnimatedBack();
+
+    if (acceleratestage && sp_state != 10)
+    {
+	acceleratestage = 0;
+	cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
+	cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
+	cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
+	cnt_time = plrs[me].stime / TICRATE;
+	cnt_par = wbs->partime / TICRATE;
+	S_StartSound(0, sfx_barexp);
+	sp_state = 10;
+    }
+
+    if (sp_state == 2)
+    {
+	cnt_kills[0] += 2;
+
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	if (cnt_kills[0] >= (plrs[me].skills * 100) / wbs->maxkills)
+	{
+	    cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
+	    S_StartSound(0, sfx_barexp);
+	    sp_state++;
+	}
+    }
+    else if (sp_state == 4)
+    {
+	cnt_items[0] += 2;
+
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	if (cnt_items[0] >= (plrs[me].sitems * 100) / wbs->maxitems)
+	{
+	    cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
+	    S_StartSound(0, sfx_barexp);
+	    sp_state++;
+	}
+    }
+    else if (sp_state == 6)
+    {
+	cnt_secret[0] += 2;
+
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	if (cnt_secret[0] >= (plrs[me].ssecret * 100) / wbs->maxsecret)
+	{
+	    cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
+	    S_StartSound(0, sfx_barexp);
+	    sp_state++;
+	}
+    }
+
+    else if (sp_state == 8)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	cnt_time += 3;
+
+	if (cnt_time >= plrs[me].stime / TICRATE)
+	    cnt_time = plrs[me].stime / TICRATE;
+
+	cnt_par += 3;
+
+	if (cnt_par >= wbs->partime / TICRATE)
+	{
+	    cnt_par = wbs->partime / TICRATE;
+
+	    if (cnt_time >= plrs[me].stime / TICRATE)
+	    {
+		S_StartSound(0, sfx_barexp);
+		sp_state++;
+	    }
+	}
+    }
+    else if (sp_state == 10)
+    {
+	if (acceleratestage)
+	{
+	    S_StartSound(0, sfx_sgcock);
+
+	    if (gamemode == commercial)
+		WI_initNoState();
+	    else
+		WI_initShowNextLoc();
+	}
+    }
+    else if (sp_state & 1)
+    {
+	if (!--cnt_pause)
+	{
+	    sp_state++;
+	    cnt_pause = TICRATE;
+	}
+    }
+
+}
+
+void WI_drawStats(void)
+{
+    // line height
+    int lh;	
+
+    lh = (3*SHORT(num[0]->height))/2;
+
+    WI_slamBackground();
+
+    // draw animated background
+    WI_drawAnimatedBack();
+    
+    WI_drawLF();
+
+    V_DrawPatch(SP_STATSX, SP_STATSY, kills);
+    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY, cnt_kills[0]);
+
+    V_DrawPatch(SP_STATSX, SP_STATSY+lh, items);
+    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+lh, cnt_items[0]);
+
+    V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, sp_secret);
+    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
+
+    V_DrawPatch(SP_TIMEX, SP_TIMEY, timepatch);
+    WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time);
+
+    if (wbs->epsd < 3)
+    {
+        V_DrawPatch(SCREENWIDTH/2 + SP_TIMEX, SP_TIMEY, par);
+        WI_drawTime(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cnt_par);
+    }
+
+}
+
+void WI_checkForAccelerate(void)
+{
+    int   i;
+    player_t  *player;
+
+    // check for button presses to skip delays
+    for (i=0, player = players ; i<MAXPLAYERS ; i++, player++)
+    {
+	if (playeringame[i])
+	{
+	    if (player->cmd.buttons & BT_ATTACK)
+	    {
+		if (!player->attackdown)
+		    acceleratestage = 1;
+		player->attackdown = true;
+	    }
+	    else
+		player->attackdown = false;
+	    if (player->cmd.buttons & BT_USE)
+	    {
+		if (!player->usedown)
+		    acceleratestage = 1;
+		player->usedown = true;
+	    }
+	    else
+		player->usedown = false;
+	}
+    }
+}
+
+
+
+// Updates stuff each tick
+void WI_Ticker(void)
+{
+    // counter for general background animation
+    bcnt++;  
+
+    if (bcnt == 1)
+    {
+	// intermission music
+  	if ( gamemode == commercial )
+	  S_ChangeMusic(mus_dm2int, true);
+	else
+	  S_ChangeMusic(mus_inter, true); 
+    }
+
+    WI_checkForAccelerate();
+
+    switch (state)
+    {
+      case StatCount:
+	if (deathmatch) WI_updateDeathmatchStats();
+	else if (netgame) WI_updateNetgameStats();
+	else WI_updateStats();
+	break;
+	
+      case ShowNextLoc:
+	WI_updateShowNextLoc();
+	break;
+	
+      case NoState:
+	WI_updateNoState();
+	break;
+    }
+
+}
+
+typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
+
+// Common load/unload function.  Iterates over all the graphics
+// lumps to be loaded/unloaded into memory.
+
+static void WI_loadUnloadData(load_callback_t callback)
+{
+    int i, j;
+    char name[9];
+    anim_t *a;
+
+    if (gamemode == commercial)
+    {
+	for (i=0 ; i<NUMCMAPS ; i++)
+	{
+	    DEH_snprintf(name, 9, "CWILV%2.2d", i);
+            callback(name, &lnames[i]);
+	}
+    }
+    else
+    {
+	for (i=0 ; i<NUMMAPS ; i++)
+	{
+	    DEH_snprintf(name, 9, "WILV%d%d", wbs->epsd, i);
+            callback(name, &lnames[i]);
+	}
+
+	// you are here
+        callback(DEH_String("WIURH0"), &yah[0]);
+
+	// you are here (alt.)
+        callback(DEH_String("WIURH1"), &yah[1]);
+
+	// splat
+        callback(DEH_String("WISPLAT"), &splat[0]);
+
+	if (wbs->epsd < 3)
+	{
+	    for (j=0;j<NUMANIMS[wbs->epsd];j++)
+	    {
+		a = &anims[wbs->epsd][j];
+		for (i=0;i<a->nanims;i++)
+		{
+		    // MONDO HACK!
+		    if (wbs->epsd != 1 || j != 8)
+		    {
+			// animations
+			DEH_snprintf(name, 9, "WIA%d%.2d%.2d", wbs->epsd, j, i);
+                        callback(name, &a->p[i]);
+		    }
+		    else
+		    {
+			// HACK ALERT!
+			a->p[i] = anims[1][4].p[i];
+		    }
+		}
+	    }
+	}
+    }
+
+    // More hacks on minus sign.
+    if (W_CheckNumForName(DEH_String("WIMINUS")) > 0)
+        callback(DEH_String("WIMINUS"), &wiminus);
+    else
+        wiminus = NULL;
+
+    for (i=0;i<10;i++)
+    {
+	 // numbers 0-9
+	DEH_snprintf(name, 9, "WINUM%d", i);
+        callback(name, &num[i]);
+    }
+
+    // percent sign
+    callback(DEH_String("WIPCNT"), &percent);
+
+    // "finished"
+    callback(DEH_String("WIF"), &finished);
+
+    // "entering"
+    callback(DEH_String("WIENTER"), &entering);
+
+    // "kills"
+    callback(DEH_String("WIOSTK"), &kills);
+
+    // "scrt"
+    callback(DEH_String("WIOSTS"), &secret);
+
+     // "secret"
+    callback(DEH_String("WISCRT2"), &sp_secret);
+
+    // french wad uses WIOBJ (?)
+    if (W_CheckNumForName(DEH_String("WIOBJ")) >= 0)
+    {
+    	// "items"
+    	if (netgame && !deathmatch)
+            callback(DEH_String("WIOBJ"), &items);
+    	else
+            callback(DEH_String("WIOSTI"), &items);
+    } else {
+        callback(DEH_String("WIOSTI"), &items);
+    }
+
+    // "frgs"
+    callback(DEH_String("WIFRGS"), &frags);
+
+    // ":"
+    callback(DEH_String("WICOLON"), &colon);
+
+    // "time"
+    callback(DEH_String("WITIME"), &timepatch);
+
+    // "sucks"
+    callback(DEH_String("WISUCKS"), &sucks);
+
+    // "par"
+    callback(DEH_String("WIPAR"), &par);
+
+    // "killers" (vertical)
+    callback(DEH_String("WIKILRS"), &killers);
+
+    // "victims" (horiz)
+    callback(DEH_String("WIVCTMS"), &victims);
+
+    // "total"
+    callback(DEH_String("WIMSTT"), &total);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	// "1,2,3,4"
+	DEH_snprintf(name, 9, "STPB%d", i);
+        callback(name, &p[i]);
+
+	// "1,2,3,4"
+	DEH_snprintf(name, 9, "WIBP%d", i+1);
+        callback(name, &bp[i]);
+    }
+
+    // Background image
+
+    if (gamemode == commercial)
+    {
+        M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
+    }
+    else if (gameversion >= exe_ultimate && wbs->epsd == 3)
+    {
+        M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
+    }
+    else
+    {
+	DEH_snprintf(name, sizeof(name), "WIMAP%d", wbs->epsd);
+    }
+
+    // Draw backdrop and save to a temporary buffer
+
+    callback(name, &background);
+}
+
+static void WI_loadCallback(const char *name, patch_t **variable)
+{
+    *variable = W_CacheLumpName(name, PU_STATIC);
+}
+
+void WI_loadData(void)
+{
+    if (gamemode == commercial)
+    {
+	NUMCMAPS = 32;
+	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMCMAPS,
+				       PU_STATIC, NULL);
+    }
+    else
+    {
+	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMMAPS,
+				       PU_STATIC, NULL);
+    }
+
+    WI_loadUnloadData(WI_loadCallback);
+
+    // These two graphics are special cased because we're sharing
+    // them with the status bar code
+
+    // your face
+    star = W_CacheLumpName(DEH_String("STFST01"), PU_STATIC);
+
+    // dead face
+    bstar = W_CacheLumpName(DEH_String("STFDEAD0"), PU_STATIC);
+}
+
+static void WI_unloadCallback(const char *name, patch_t **variable)
+{
+    W_ReleaseLumpName(name);
+    *variable = NULL;
+}
+
+void WI_unloadData(void)
+{
+    WI_loadUnloadData(WI_unloadCallback);
+
+    // We do not free these lumps as they are shared with the status
+    // bar code.
+   
+    // W_ReleaseLumpName("STFST01");
+    // W_ReleaseLumpName("STFDEAD0");
+}
+
+void WI_Drawer (void)
+{
+    switch (state)
+    {
+      case StatCount:
+	if (deathmatch)
+	    WI_drawDeathmatchStats();
+	else if (netgame)
+	    WI_drawNetgameStats();
+	else
+	    WI_drawStats();
+	break;
+	
+      case ShowNextLoc:
+	WI_drawShowNextLoc();
+	break;
+	
+      case NoState:
+	WI_drawNoState();
+	break;
+    }
+}
+
+
+void WI_initVariables(wbstartstruct_t* wbstartstruct)
+{
+
+    wbs = wbstartstruct;
+
+#ifdef RANGECHECKING
+    if (gamemode != commercial)
+    {
+      if (gameversion >= exe_ultimate)
+	RNGCHECK(wbs->epsd, 0, 3);
+      else
+	RNGCHECK(wbs->epsd, 0, 2);
+    }
+    else
+    {
+	RNGCHECK(wbs->last, 0, 8);
+	RNGCHECK(wbs->next, 0, 8);
+    }
+    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
+    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
+#endif
+
+    acceleratestage = 0;
+    cnt = bcnt = 0;
+    firstrefresh = 1;
+    me = wbs->pnum;
+    plrs = wbs->plyr;
+
+    if (!wbs->maxkills)
+	wbs->maxkills = 1;
+
+    if (!wbs->maxitems)
+	wbs->maxitems = 1;
+
+    if (!wbs->maxsecret)
+	wbs->maxsecret = 1;
+
+    if ( gameversion < exe_ultimate )
+      if (wbs->epsd > 2)
+	wbs->epsd -= 3;
+}
+
+void WI_Start(wbstartstruct_t* wbstartstruct)
+{
+    WI_initVariables(wbstartstruct);
+    WI_loadData();
+
+    if (deathmatch)
+	WI_initDeathmatchStats();
+    else if (netgame)
+	WI_initNetgameStats();
+    else
+	WI_initStats();
+}
diff --git a/games/NXDoom/src/doom/wi_stuff.h b/games/NXDoom/src/doom/wi_stuff.h
new file mode 100644
index 000000000..296571f73
--- /dev/null
+++ b/games/NXDoom/src/doom/wi_stuff.h
@@ -0,0 +1,48 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Intermission.
+//
+
+#ifndef __WI_STUFF__
+#define __WI_STUFF__
+
+//#include "v_video.h"
+
+#include "doomdef.h"
+
+// States for the intermission
+
+typedef enum
+{
+    NoState = -1,
+    StatCount,
+    ShowNextLoc,
+} stateenum_t;
+
+// Called by main loop, animate the intermission.
+void WI_Ticker (void);
+
+// Called by main loop,
+// draws the intermission directly into the screen buffer.
+void WI_Drawer (void);
+
+// Setup for an intermission screen.
+void WI_Start(wbstartstruct_t*	 wbstartstruct);
+
+// Shut down the intermission screen
+void WI_End(void);
+
+#endif
diff --git a/games/NXDoom/src/doomkeys.h b/games/NXDoom/src/doomkeys.h
new file mode 100644
index 000000000..1098c719d
--- /dev/null
+++ b/games/NXDoom/src/doomkeys.h
@@ -0,0 +1,156 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//       Key definitions
+//
+
+#ifndef __DOOMKEYS__
+#define __DOOMKEYS__
+
+//
+// DOOM keyboard definition.
+// This is the stuff configured by Setup.Exe.
+// Most key data are simple ascii (uppercased).
+//
+#define KEY_RIGHTARROW	0xae
+#define KEY_LEFTARROW	0xac
+#define KEY_UPARROW	0xad
+#define KEY_DOWNARROW	0xaf
+#define KEY_ESCAPE	27
+#define KEY_ENTER	13
+#define KEY_TAB		9
+#define KEY_F1		(0x80+0x3b)
+#define KEY_F2		(0x80+0x3c)
+#define KEY_F3		(0x80+0x3d)
+#define KEY_F4		(0x80+0x3e)
+#define KEY_F5		(0x80+0x3f)
+#define KEY_F6		(0x80+0x40)
+#define KEY_F7		(0x80+0x41)
+#define KEY_F8		(0x80+0x42)
+#define KEY_F9		(0x80+0x43)
+#define KEY_F10		(0x80+0x44)
+#define KEY_F11		(0x80+0x57)
+#define KEY_F12		(0x80+0x58)
+
+#define KEY_BACKSPACE	0x7f
+#define KEY_PAUSE	0xff
+
+#define KEY_EQUALS	0x3d
+#define KEY_MINUS	0x2d
+
+#define KEY_RSHIFT	(0x80+0x36)
+#define KEY_RCTRL	(0x80+0x1d)
+#define KEY_RALT	(0x80+0x38)
+
+#define KEY_LALT	KEY_RALT
+
+// new keys:
+
+#define KEY_CAPSLOCK    (0x80+0x3a)
+#define KEY_NUMLOCK     (0x80+0x45)
+#define KEY_SCRLCK      (0x80+0x46)
+#define KEY_PRTSCR      (0x80+0x59)
+
+#define KEY_HOME        (0x80+0x47)
+#define KEY_END         (0x80+0x4f)
+#define KEY_PGUP        (0x80+0x49)
+#define KEY_PGDN        (0x80+0x51)
+#define KEY_INS         (0x80+0x52)
+#define KEY_DEL         (0x80+0x53)
+
+#define KEYP_0          KEY_INS
+#define KEYP_1          KEY_END
+#define KEYP_2          KEY_DOWNARROW
+#define KEYP_3          KEY_PGDN
+#define KEYP_4          KEY_LEFTARROW
+#define KEYP_5          (0x80+0x4c)
+#define KEYP_6          KEY_RIGHTARROW
+#define KEYP_7          KEY_HOME
+#define KEYP_8          KEY_UPARROW
+#define KEYP_9          KEY_PGUP
+
+#define KEYP_DIVIDE     '/'
+#define KEYP_PLUS       '+'
+#define KEYP_MINUS      '-'
+#define KEYP_MULTIPLY   '*'
+#define KEYP_PERIOD     0
+#define KEYP_EQUALS     KEY_EQUALS
+#define KEYP_ENTER      KEY_ENTER
+
+#define KEY_NONUSBACKSLASH '\\'
+
+#define SCANCODE_TO_KEYS_ARRAY {                                            \
+    0,   0,   0,   0,   'a',                                  /* 0-9 */     \
+    'b', 'c', 'd', 'e', 'f',                                                \
+    'g', 'h', 'i', 'j', 'k',                                  /* 10-19 */   \
+    'l', 'm', 'n', 'o', 'p',                                                \
+    'q', 'r', 's', 't', 'u',                                  /* 20-29 */   \
+    'v', 'w', 'x', 'y', 'z',                                                \
+    '1', '2', '3', '4', '5',                                  /* 30-39 */   \
+    '6', '7', '8', '9', '0',                                                \
+    KEY_ENTER, KEY_ESCAPE, KEY_BACKSPACE, KEY_TAB, ' ',       /* 40-49 */   \
+    KEY_MINUS, KEY_EQUALS, '[', ']', '\\',                                  \
+    0,   ';', '\'', '`', ',',                                 /* 50-59 */   \
+    '.', '/', KEY_CAPSLOCK, KEY_F1, KEY_F2,                                 \
+    KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7,                   /* 60-69 */   \
+    KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12,                              \
+    KEY_PRTSCR, KEY_SCRLCK, KEY_PAUSE, KEY_INS, KEY_HOME,     /* 70-79 */   \
+    KEY_PGUP, KEY_DEL, KEY_END, KEY_PGDN, KEY_RIGHTARROW,                   \
+    KEY_LEFTARROW, KEY_DOWNARROW, KEY_UPARROW,                /* 80-89 */   \
+    KEY_NUMLOCK, KEYP_DIVIDE,                                               \
+    KEYP_MULTIPLY, KEYP_MINUS, KEYP_PLUS, KEYP_ENTER, KEYP_1,               \
+    KEYP_2, KEYP_3, KEYP_4, KEYP_5, KEYP_6,                   /* 90-99 */   \
+    KEYP_7, KEYP_8, KEYP_9, KEYP_0, KEYP_PERIOD,                            \
+    KEY_NONUSBACKSLASH, 0, 0, KEYP_EQUALS,                    /* 100-103 */ \
+}
+
+// Default names for keys, to use in English or as fallback.
+#define KEY_NAMES_ARRAY {                                            \
+    { KEY_BACKSPACE,  "BACKSP" },   { KEY_TAB,        "TAB" },       \
+    { KEY_INS,        "INS" },      { KEY_DEL,        "DEL" },       \
+    { KEY_PGUP,       "PGUP" },     { KEY_PGDN,       "PGDN" },      \
+    { KEY_ENTER,      "ENTER" },    { KEY_ESCAPE,     "ESC" },       \
+    { KEY_F1,         "F1" },       { KEY_F2,         "F2" },        \
+    { KEY_F3,         "F3" },       { KEY_F4,         "F4" },        \
+    { KEY_F5,         "F5" },       { KEY_F6,         "F6" },        \
+    { KEY_F7,         "F7" },       { KEY_F8,         "F8" },        \
+    { KEY_F9,         "F9" },       { KEY_F10,        "F10" },       \
+    { KEY_F11,        "F11" },      { KEY_F12,        "F12" },       \
+    { KEY_HOME,       "HOME" },     { KEY_END,        "END" },       \
+    { KEY_MINUS,      "-" },        { KEY_EQUALS,     "=" },         \
+    { KEY_NUMLOCK,    "NUMLCK" },   { KEY_SCRLCK,     "SCRLCK" },    \
+    { KEY_PAUSE,      "PAUSE" },    { KEY_PRTSCR,     "PRTSC" },     \
+    { KEY_UPARROW,    "UP" },       { KEY_DOWNARROW,  "DOWN" },      \
+    { KEY_LEFTARROW,  "LEFT" },     { KEY_RIGHTARROW, "RIGHT" },     \
+    { KEY_RALT,       "ALT" },      { KEY_LALT,       "ALT" },       \
+    { KEY_RSHIFT,     "SHIFT" },    { KEY_CAPSLOCK,   "CAPS" },      \
+    { KEY_RCTRL,      "CTRL" },     { KEYP_5,         "NUM5" },      \
+    { ' ',            "SPACE" },                                     \
+    { 'a', "A" },   { 'b', "B" },   { 'c', "C" },   { 'd', "D" },    \
+    { 'e', "E" },   { 'f', "F" },   { 'g', "G" },   { 'h', "H" },    \
+    { 'i', "I" },   { 'j', "J" },   { 'k', "K" },   { 'l', "L" },    \
+    { 'm', "M" },   { 'n', "N" },   { 'o', "O" },   { 'p', "P" },    \
+    { 'q', "Q" },   { 'r', "R" },   { 's', "S" },   { 't', "T" },    \
+    { 'u', "U" },   { 'v', "V" },   { 'w', "W" },   { 'x', "X" },    \
+    { 'y', "Y" },   { 'z', "Z" },   { '0', "0" },   { '1', "1" },    \
+    { '2', "2" },   { '3', "3" },   { '4', "4" },   { '5', "5" },    \
+    { '6', "6" },   { '7', "7" },   { '8', "8" },   { '9', "9" },    \
+    { '[', "[" },   { ']', "]" },   { ';', ";" },   { '`', "`" },    \
+    { ',', "," },   { '.', "." },   { '/', "/" },   { '\\', "\\" },  \
+    { '\'', "\'" },                                                  \
+}
+
+#endif          // __DOOMKEYS__
+
diff --git a/games/NXDoom/src/doomtype.h b/games/NXDoom/src/doomtype.h
new file mode 100644
index 000000000..d90cfec97
--- /dev/null
+++ b/games/NXDoom/src/doomtype.h
@@ -0,0 +1,145 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Simple basic typedefs, isolated here to make it easier
+//	 separating modules.
+//    
+
+
+#ifndef __DOOMTYPE__
+#define __DOOMTYPE__
+
+#include "config.h"
+
+#if defined(_MSC_VER) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+// #define macros to provide functions missing in Windows.
+// Outside Windows, we use strings.h for str[n]casecmp.
+
+
+#if !HAVE_DECL_STRCASECMP || !HAVE_DECL_STRNCASECMP
+
+#include <string.h>
+#if !HAVE_DECL_STRCASECMP
+#define strcasecmp stricmp
+#endif
+#if !HAVE_DECL_STRNCASECMP
+#define strncasecmp strnicmp
+#endif
+
+#else
+
+#include <strings.h>
+
+#endif
+
+
+//
+// The packed attribute forces structures to be packed into the minimum 
+// space necessary.  If this is not done, the compiler may align structure
+// fields differently to optimize memory access, inflating the overall
+// structure size.  It is important to use the packed attribute on certain
+// structures where alignment is important, particularly data read/written
+// to disk.
+//
+
+#ifdef __GNUC__
+
+#if defined(_WIN32) && !defined(__clang__)
+#define PACKEDATTR __attribute__((packed,gcc_struct))
+#else
+#define PACKEDATTR __attribute__((packed))
+#endif
+
+#define PRINTF_ATTR(fmt, first) __attribute__((format(printf, fmt, first)))
+#define PRINTF_ARG_ATTR(x) __attribute__((format_arg(x)))
+#define NORETURN __attribute__((noreturn))
+
+#else
+#if defined(_MSC_VER)
+#define PACKEDATTR __pragma(pack(pop))
+#else
+#define PACKEDATTR
+#endif
+#define PRINTF_ATTR(fmt, first)
+#define PRINTF_ARG_ATTR(x)
+#define NORETURN
+#endif
+
+#ifdef __WATCOMC__
+#define PACKEDPREFIX _Packed
+#elif defined(_MSC_VER)
+#define PACKEDPREFIX __pragma(pack(push,1))
+#else
+#define PACKEDPREFIX
+#endif
+
+#define PACKED_STRUCT(...) PACKEDPREFIX struct __VA_ARGS__ PACKEDATTR
+
+// C99 integer types; with gcc we just use this.  Other compilers
+// should add conditional statements that define the C99 types.
+
+// What is really wanted here is stdint.h; however, some old versions
+// of Solaris don't have stdint.h and only have inttypes.h (the 
+// pre-standardisation version).  inttypes.h is also in the C99 
+// standard and defined to include stdint.h, so include this. 
+
+#include <inttypes.h>
+#include <stdbool.h>
+
+#if defined(__cplusplus) || defined(__bool_true_false_are_defined)
+
+// The C++/C99 bool type (or _Bool that is) can only have two values:
+// 0 or 1. However, the Doom source code assumes any non-zero value
+// to evaluate to true, so we have to use an int type here.
+
+typedef int boolean;
+
+#else
+
+typedef enum 
+{
+    false, 
+    true
+} boolean;
+
+#endif
+
+typedef uint8_t byte;
+typedef uint8_t pixel_t;
+typedef int16_t dpixel_t;
+
+#include <limits.h>
+
+#ifdef _WIN32
+
+#define DIR_SEPARATOR '\\'
+#define DIR_SEPARATOR_S "\\"
+#define PATH_SEPARATOR ';'
+
+#else
+
+#define DIR_SEPARATOR '/'
+#define DIR_SEPARATOR_S "/"
+#define PATH_SEPARATOR ':'
+
+#endif
+
+#define arrlen(array) (sizeof(array) / sizeof(*array))
+
+#endif
+
diff --git a/games/NXDoom/src/gusconf.c b/games/NXDoom/src/gusconf.c
new file mode 100644
index 000000000..5cd1d62a9
--- /dev/null
+++ b/games/NXDoom/src/gusconf.c
@@ -0,0 +1,301 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     GUS emulation code.
+//
+//     Actually emulating a GUS is far too much work; fortunately
+//     GUS "emulation" already exists in the form of Timidity, which
+//     supports GUS patch files. This code therefore converts Doom's
+//     DMXGUS lump into an equivalent Timidity configuration file.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "m_misc.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#define MAX_INSTRUMENTS 256
+
+typedef struct
+{
+    char *patch_names[MAX_INSTRUMENTS];
+    int used[MAX_INSTRUMENTS];
+    int mapping[MAX_INSTRUMENTS];
+    unsigned int count;
+} gus_config_t;
+
+char *gus_patch_path = "";
+int gus_ram_kb = 1024;
+
+static unsigned int MappingIndex(void)
+{
+    unsigned int result = gus_ram_kb / 256;
+
+    if (result < 1)
+    {
+        return 1;
+    }
+    else if (result > 4)
+    {
+        return 4;
+    }
+    else
+    {
+        return result;
+    }
+}
+
+static int SplitLine(char *line, char **fields, unsigned int max_fields)
+{
+    unsigned int num_fields;
+    char *p;
+
+    fields[0] = line;
+    num_fields = 1;
+
+    for (p = line; *p != '\0'; ++p)
+    {
+        if (*p == ',')
+        {
+            *p = '\0';
+
+            // Skip spaces following the comma.
+            do
+            {
+                ++p;
+            } while (*p != '\0' && isspace(*p));
+
+            fields[num_fields] = p;
+            ++num_fields;
+            --p;
+
+            if (num_fields >= max_fields)
+            {
+                break;
+            }
+        }
+        else if (*p == '#')
+        {
+            *p = '\0';
+            break;
+        }
+    }
+
+    // Strip off trailing whitespace from the end of the line.
+    p = fields[num_fields - 1] + strlen(fields[num_fields - 1]);
+    while (p > fields[num_fields - 1] && isspace(*(p - 1)))
+    {
+        --p;
+        *p = '\0';
+    }
+
+    return num_fields;
+}
+
+static void ParseLine(gus_config_t *config, char *line)
+{
+    char *fields[6];
+    unsigned int i;
+    unsigned int num_fields;
+    unsigned int instr_id, mapped_id;
+
+    num_fields = SplitLine(line, fields, 6);
+
+    if (num_fields < 6)
+    {
+        return;
+    }
+
+    instr_id = atoi(fields[0]);
+
+    // Skip non GM percussions.
+    if ((instr_id >= 128 && instr_id < 128 + 35) || instr_id > 128 + 81)
+    {
+        return;
+    }
+
+    mapped_id = atoi(fields[MappingIndex()]);
+
+    for (i = 0; i < config->count; i++)
+    {
+        if (config->used[i] == mapped_id)
+        {
+            break;
+        }
+    }
+    
+    if (i == config->count)
+    {
+        // DMX uses wrong patch name (we should use name of 'mapped_id'
+        // instrument, but DMX uses name of 'instr_id' instead).
+        free(config->patch_names[i]);
+        config->patch_names[i] = M_StringDuplicate(fields[5]);
+        config->used[i] = mapped_id;
+        config->count++;
+    }
+    config->mapping[instr_id] = i;
+}
+
+static void ParseDMXConfig(char *dmxconf, gus_config_t *config)
+{
+    char *p, *newline;
+    unsigned int i;
+
+    memset(config, 0, sizeof(gus_config_t));
+
+    for (i = 0; i < MAX_INSTRUMENTS; ++i)
+    {
+        config->mapping[i] = -1;
+        config->used[i] = -1;
+    }
+
+    config->count = 0;
+
+    p = dmxconf;
+
+    for (;;)
+    {
+        newline = strchr(p, '\n');
+
+        if (newline != NULL)
+        {
+            *newline = '\0';
+        }
+
+        ParseLine(config, p);
+
+        if (newline == NULL)
+        {
+            break;
+        }
+        else
+        {
+            p = newline + 1;
+        }
+    }
+}
+
+static void FreeDMXConfig(gus_config_t *config)
+{
+    unsigned int i;
+
+    for (i = 0; i < MAX_INSTRUMENTS; ++i)
+    {
+        free(config->patch_names[i]);
+    }
+}
+
+static char *ReadDMXConfig(void)
+{
+    int lumpnum;
+    unsigned int len;
+    char *data;
+
+    // TODO: This should be chosen based on gamemode == commercial:
+
+    lumpnum = W_CheckNumForName("DMXGUS");
+
+    if (lumpnum < 0)
+    {
+        lumpnum = W_GetNumForName("DMXGUSC");
+    }
+
+    len = W_LumpLength(lumpnum);
+    data = Z_Malloc(len + 1, PU_STATIC, NULL);
+    W_ReadLump(lumpnum, data);
+
+    data[len] = '\0';
+    return data;
+}
+
+static boolean WriteTimidityConfig(char *path, gus_config_t *config)
+{
+    FILE *fstream;
+    unsigned int i;
+
+    fstream = M_fopen(path, "w");
+
+    if (fstream == NULL)
+    {
+        return false;
+    }
+
+    fprintf(fstream, "# Autogenerated Timidity config.\n\n");
+
+    fprintf(fstream, "dir \"%s\"\n", gus_patch_path);
+
+    fprintf(fstream, "\nbank 0\n\n");
+
+    for (i = 0; i < 128; ++i)
+    {
+        if (config->mapping[i] >= 0 && config->mapping[i] < MAX_INSTRUMENTS
+         && config->patch_names[config->mapping[i]] != NULL)
+        {
+            fprintf(fstream, "%u %s\n",
+                    i, config->patch_names[config->mapping[i]]);
+        }
+    }
+
+    fprintf(fstream, "\ndrumset 0\n\n");
+    
+    for (i = 128 + 35; i <= 128 + 81; ++i)
+    {
+        if (config->mapping[i] >= 0 && config->mapping[i] < MAX_INSTRUMENTS
+         && config->patch_names[config->mapping[i]] != NULL)
+        {
+            fprintf(fstream, "%u %s\n",
+                    i - 128, config->patch_names[config->mapping[i]]);
+        }
+    }
+
+    fprintf(fstream, "\n");
+
+    fclose(fstream);
+
+    return true;
+}
+
+boolean GUS_WriteConfig(char *path)
+{
+    boolean result;
+    char *dmxconf;
+    gus_config_t config;
+
+    if (!strcmp(gus_patch_path, ""))
+    {
+        printf("You haven't configured gus_patch_path.\n");
+        printf("gus_patch_path needs to point to the location of "
+               "your GUS patch set.\n"
+               "To get a copy of the \"standard\" GUS patches, "
+               "download a copy of dgguspat.zip.\n");
+
+        return false;
+    }
+
+    dmxconf = ReadDMXConfig();
+    ParseDMXConfig(dmxconf, &config);
+
+    result = WriteTimidityConfig(path, &config);
+
+    FreeDMXConfig(&config);
+    Z_Free(dmxconf);
+
+    return result;
+}
+
diff --git a/games/NXDoom/src/gusconf.h b/games/NXDoom/src/gusconf.h
new file mode 100644
index 000000000..4efbe9952
--- /dev/null
+++ b/games/NXDoom/src/gusconf.h
@@ -0,0 +1,29 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     GUS emulation code.
+//
+
+#ifndef __GUSCONF_H__
+#define __GUSCONF_H__
+
+#include "doomtype.h"
+
+extern char *gus_patch_path;
+extern int gus_ram_kb;
+
+boolean GUS_WriteConfig(char *path);
+
+#endif /* #ifndef __GUSCONF_H__ */
+
diff --git a/games/NXDoom/src/heretic-res.rc.in b/games/NXDoom/src/heretic-res.rc.in
new file mode 100644
index 000000000..0cf43446d
--- /dev/null
+++ b/games/NXDoom/src/heretic-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/heretic.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+  BLOCK "040904E4"
+  {
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+   VALUE "FileDescription", "@PACKAGE_STRING@"
+   VALUE "InternalName", "@PACKAGE_TARNAME@"
+   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+   VALUE "ProductName", "@PACKAGE_NAME@"
+   VALUE "ProductVersion", "@PACKAGE_VERSION@"
+  }
+ }
+ BLOCK "VarFileInfo"
+ {
+  VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/games/NXDoom/src/heretic/.gitignore b/games/NXDoom/src/heretic/.gitignore
new file mode 100644
index 000000000..76092240c
--- /dev/null
+++ b/games/NXDoom/src/heretic/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+tags
+TAGS
+
diff --git a/games/NXDoom/src/heretic/CMakeLists.txt b/games/NXDoom/src/heretic/CMakeLists.txt
new file mode 100644
index 000000000..ac6d2fbaf
--- /dev/null
+++ b/games/NXDoom/src/heretic/CMakeLists.txt
@@ -0,0 +1,77 @@
+add_library(heretic STATIC
+            am_data.h
+            am_map.c            am_map.h
+            ct_chat.c           ct_chat.h
+            deh_ammo.c
+            deh_frame.c
+            deh_htext.c
+            deh_htic.c          deh_htic.h
+            deh_sound.c
+            deh_thing.c
+            deh_weapon.c
+            d_main.c
+            d_net.c
+                                doomdata.h
+                                doomdef.h
+                                dstrings.h
+            f_finale.c
+            g_game.c
+            info.c              info.h
+            in_lude.c
+            m_random.c          m_random.h
+            mn_menu.c
+                                p_action.h
+            p_ceilng.c
+            p_doors.c
+            p_enemy.c
+            p_floor.c
+            p_inter.c
+            p_lights.c
+            p_local.h
+            p_map.c
+            p_maputl.c
+            p_mobj.c
+            p_plats.c
+            p_pspr.c
+            p_saveg.c
+            p_setup.c
+            p_sight.c
+            p_spec.c            p_spec.h
+            p_switch.c
+            p_telept.c
+            p_tick.c
+            p_user.c
+            r_bsp.c
+            r_data.c
+            r_draw.c
+                                r_local.h
+            r_main.c
+            r_plane.c
+            r_segs.c
+            r_things.c
+            sb_bar.c
+            sounds.c            sounds.h
+            s_sound.c           s_sound.h)
+
+target_include_directories(heretic PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
+
+if (DEFINED EMSCRIPTEN)
+    set(SDL_FLAGS "-s USE_SDL=2")
+    if(ENABLE_SDL2_MIXER)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
+    endif()
+    if(ENABLE_SDL2_NET)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
+    endif()
+else()
+    set(SDL_LINK_LIBS SDL2::SDL2)
+    if(ENABLE_SDL2_MIXER)
+        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
+    endif()
+    if(ENABLE_SDL2_NET)
+        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
+    endif()
+endif()
+target_link_libraries(heretic textscreen ${SDL_LINK_LIBS})
+set_target_properties(heretic PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+set_target_properties(heretic PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/heretic/Makefile.am b/games/NXDoom/src/heretic/Makefile.am
new file mode 100644
index 000000000..ac849d5e5
--- /dev/null
+++ b/games/NXDoom/src/heretic/Makefile.am
@@ -0,0 +1,72 @@
+
+AM_CFLAGS=-I$(top_srcdir)/src                           \
+          -I$(top_srcdir)/textscreen                    \
+          @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+
+EXTRA_DIST =                                         \
+        CMakeLists.txt                               \
+        heretic_icon.c
+
+noinst_LIBRARIES=libheretic.a
+
+libheretic_a_SOURCES =                               \
+                       am_data.h                     \
+am_map.c               am_map.h                      \
+ct_chat.c              ct_chat.h                     \
+deh_ammo.c                                           \
+deh_frame.c                                          \
+deh_htext.c                                          \
+deh_htic.c             deh_htic.h                    \
+deh_sound.c                                          \
+deh_thing.c                                          \
+deh_weapon.c                                         \
+d_main.c                                             \
+d_net.c                                              \
+                       doomdata.h                    \
+                       doomdef.h                     \
+                       dstrings.h                    \
+f_finale.c                                           \
+g_game.c                                             \
+info.c                 info.h                        \
+in_lude.c                                            \
+m_random.c             m_random.h                    \
+mn_menu.c                                            \
+                       p_action.h                    \
+p_ceilng.c                                           \
+p_doors.c                                            \
+p_enemy.c                                            \
+p_floor.c                                            \
+p_inter.c                                            \
+p_lights.c                                           \
+p_local.h                                            \
+p_map.c                                              \
+p_maputl.c                                           \
+p_mobj.c                                             \
+p_plats.c                                            \
+p_pspr.c                                             \
+p_saveg.c                                            \
+p_setup.c                                            \
+p_sight.c                                            \
+p_spec.c               p_spec.h                      \
+p_switch.c                                           \
+p_telept.c                                           \
+p_tick.c                                             \
+p_user.c                                             \
+r_bsp.c                                              \
+r_data.c                                             \
+r_draw.c                                             \
+                       r_local.h                     \
+r_main.c                                             \
+r_plane.c                                            \
+r_segs.c                                             \
+r_things.c                                           \
+sb_bar.c                                             \
+sounds.c               sounds.h                      \
+s_sound.c              s_sound.h
+
+if HAVE_ICONS
+
+heretic_icon.c : $(top_builddir)/data/heretic.png
+	$(top_builddir)/data/convert-icon $(top_builddir)/data/heretic.png $@
+
+endif
diff --git a/games/NXDoom/src/heretic/am_data.h b/games/NXDoom/src/heretic/am_data.h
new file mode 100644
index 000000000..c5efb0894
--- /dev/null
+++ b/games/NXDoom/src/heretic/am_data.h
@@ -0,0 +1,103 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// AM_data.h : The vector graphics for the automap
+
+#ifndef __AMDATA_H__
+#define __AMDATA_H__
+
+// a line drawing of the player pointing right, starting from the middle.
+
+#define R ((8*PLAYERRADIUS)/7)
+
+mline_t player_arrow[] = {
+  { { -R+R/4, 0 }, { 0, 0} }, // center line.
+  { { -R+R/4, R/8 }, { R, 0} }, // blade
+  { { -R+R/4, -R/8 }, { R, 0 } },
+  { { -R+R/4, -R/4 }, { -R+R/4, R/4 } }, // crosspiece
+  { { -R+R/8, -R/4 }, { -R+R/8, R/4 } },
+  { { -R+R/8, -R/4 }, { -R+R/4, -R/4} }, //crosspiece connectors
+  { { -R+R/8, R/4 }, { -R+R/4, R/4} },
+  { { -R-R/4, R/8 }, { -R-R/4, -R/8 } }, //pommel
+  { { -R-R/4, R/8 }, { -R+R/8, R/8 } },
+  { { -R-R/4, -R/8}, { -R+R/8, -R/8 } }
+  };
+
+mline_t keysquare[] = {
+	{ { 0, 0 }, { R/4, -R/2 } },
+	{ { R/4, -R/2 }, { R/2, -R/2 } },
+	{ { R/2, -R/2 }, { R/2, R/2 } },
+	{ { R/2, R/2 }, { R/4, R/2 } },
+	{ { R/4, R/2 }, { 0, 0 } }, // handle part type thing
+	{ { 0, 0 }, { -R, 0 } }, // stem
+	{ { -R, 0 }, { -R, -R/2 } }, // end lockpick part
+	{ { -3*R/4, 0 }, { -3*R/4, -R/4 } }
+	};
+
+/*mline_t player_arrow[] = {
+  { { -R+R/8, 0 }, { R, 0 } }, // -----
+  { { R, 0 }, { R-R/2, R/4 } },  // ----->
+  { { R, 0 }, { R-R/2, -R/4 } },
+  { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
+  { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
+  { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
+  { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
+  };
+*/
+#undef R
+#define NUMPLYRLINES (sizeof(player_arrow)/sizeof(mline_t))
+#define NUMKEYSQUARELINES (sizeof(keysquare)/sizeof(mline_t))
+
+#define R ((8*PLAYERRADIUS)/7)
+mline_t cheat_player_arrow[] = {
+  { { -R+R/8, 0 }, { R, 0 } }, // -----
+  { { R, 0 }, { R-R/2, R/6 } },  // ----->
+  { { R, 0 }, { R-R/2, -R/6 } },
+  { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
+  { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
+  { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
+  { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
+  { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
+  { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
+  { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
+  { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
+  { { -R/6, -R/6 }, { 0, -R/6 } },
+  { { 0, -R/6 }, { 0, R/4 } },
+  { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
+  { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
+  { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
+  };
+#undef R
+#define NUMCHEATPLYRLINES (sizeof(cheat_player_arrow)/sizeof(mline_t))
+
+#define R (FRACUNIT)
+mline_t triangle_guy[] = {
+  { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
+  { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0      ), (fixed_t)(R    ) } },
+  { { (fixed_t)(0      ), (fixed_t)(R    ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
+  };
+#undef R
+#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
+
+#define R (FRACUNIT)
+mline_t thintriangle_guy[] = {
+  { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
+  { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+  { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
+  };
+#undef R
+#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
+
+#endif
diff --git a/games/NXDoom/src/heretic/am_map.c b/games/NXDoom/src/heretic/am_map.c
new file mode 100644
index 000000000..afc0c4222
--- /dev/null
+++ b/games/NXDoom/src/heretic/am_map.c
@@ -0,0 +1,1535 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// AM_map.c
+
+#include <stdio.h>
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "m_controls.h"
+#include "p_local.h"
+#include "am_map.h"
+#include "am_data.h"
+
+#include "doomkeys.h"
+#include "v_video.h"
+
+vertex_t KeyPoints[NUM_KEY_TYPES];
+
+#define NUMALIAS 3              // Number of antialiased lines.
+
+const char *LevelNames[] = {
+    // EPISODE 1 - THE CITY OF THE DAMNED
+    "E1M1:  THE DOCKS",
+    "E1M2:  THE DUNGEONS",
+    "E1M3:  THE GATEHOUSE",
+    "E1M4:  THE GUARD TOWER",
+    "E1M5:  THE CITADEL",
+    "E1M6:  THE CATHEDRAL",
+    "E1M7:  THE CRYPTS",
+    "E1M8:  HELL'S MAW",
+    "E1M9:  THE GRAVEYARD",
+    // EPISODE 2 - HELL'S MAW
+    "E2M1:  THE CRATER",
+    "E2M2:  THE LAVA PITS",
+    "E2M3:  THE RIVER OF FIRE",
+    "E2M4:  THE ICE GROTTO",
+    "E2M5:  THE CATACOMBS",
+    "E2M6:  THE LABYRINTH",
+    "E2M7:  THE GREAT HALL",
+    "E2M8:  THE PORTALS OF CHAOS",
+    "E2M9:  THE GLACIER",
+    // EPISODE 3 - THE DOME OF D'SPARIL
+    "E3M1:  THE STOREHOUSE",
+    "E3M2:  THE CESSPOOL",
+    "E3M3:  THE CONFLUENCE",
+    "E3M4:  THE AZURE FORTRESS",
+    "E3M5:  THE OPHIDIAN LAIR",
+    "E3M6:  THE HALLS OF FEAR",
+    "E3M7:  THE CHASM",
+    "E3M8:  D'SPARIL'S KEEP",
+    "E3M9:  THE AQUIFER",
+    // EPISODE 4: THE OSSUARY
+    "E4M1:  CATAFALQUE",
+    "E4M2:  BLOCKHOUSE",
+    "E4M3:  AMBULATORY",
+    "E4M4:  SEPULCHER",
+    "E4M5:  GREAT STAIR",
+    "E4M6:  HALLS OF THE APOSTATE",
+    "E4M7:  RAMPARTS OF PERDITION",
+    "E4M8:  SHATTERED BRIDGE",
+    "E4M9:  MAUSOLEUM",
+    // EPISODE 5: THE STAGNANT DEMESNE
+    "E5M1:  OCHRE CLIFFS",
+    "E5M2:  RAPIDS",
+    "E5M3:  QUAY",
+    "E5M4:  COURTYARD",
+    "E5M5:  HYDRATYR",
+    "E5M6:  COLONNADE",
+    "E5M7:  FOETID MANSE",
+    "E5M8:  FIELD OF JUDGEMENT",
+    "E5M9:  SKEIN OF D'SPARIL",
+    // EPISODE 6: unnamed
+    "E6M1:  ",
+    "E6M2:  ",
+    "E6M3:  ",
+};
+
+static int cheating = 0;
+static int grid = 0;
+
+boolean automapactive = false;
+static int finit_width = SCREENWIDTH;
+static int finit_height = SCREENHEIGHT - 42;
+static int f_x, f_y;            // location of window on screen
+static int f_w, f_h;            // size of window on screen
+static int lightlev;            // used for funky strobing effect
+static byte *fb;                // pseudo-frame buffer
+static int amclock;
+
+static mpoint_t m_paninc;       // how far the window pans each tic (map coords)
+static fixed_t mtof_zoommul;    // how far the window zooms in each tic (map coords)
+static fixed_t ftom_zoommul;    // how far the window zooms in each tic (fb coords)
+
+static fixed_t m_x, m_y;        // LL x,y where the window is on the map (map coords)
+static fixed_t m_x2, m_y2;      // UR x,y where the window is on the map (map coords)
+
+// width/height of window on map (map coords)
+static fixed_t m_w, m_h;
+static fixed_t min_x, min_y;    // based on level size
+static fixed_t max_x, max_y;    // based on level size
+static fixed_t max_w, max_h;    // max_x-min_x, max_y-min_y
+static fixed_t min_w, min_h;    // based on player size
+static fixed_t min_scale_mtof;  // used to tell when to stop zooming out
+static fixed_t max_scale_mtof;  // used to tell when to stop zooming in
+
+// old stuff for recovery later
+static fixed_t old_m_w, old_m_h;
+static fixed_t old_m_x, old_m_y;
+
+// old location used by the Follower routine
+static mpoint_t f_oldloc;
+
+// used by MTOF to scale from map-to-frame-buffer coords
+static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
+// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
+static fixed_t scale_ftom;
+
+static player_t *plr;           // the player represented by an arrow
+static vertex_t oldplr;
+
+//static patch_t *marknums[10]; // numbers used for marking by the automap
+//static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
+//static int markpointnum = 0; // next point to be assigned
+
+static int followplayer = 1;    // specifies whether to follow the player around
+
+static char cheat_amap[] = { 'r', 'a', 'v', 'm', 'a', 'p' };
+
+static byte cheatcount = 0;
+
+static byte antialias[NUMALIAS][8] = {
+    {96, 97, 98, 99, 100, 101, 102, 103},
+    {110, 109, 108, 107, 106, 105, 104, 103},
+    {75, 76, 77, 78, 79, 80, 81, 103}
+};
+
+/*
+static byte *aliasmax[NUMALIAS] = {
+	&antialias[0][7], &antialias[1][7], &antialias[2][7]
+};*/
+
+static byte *maplump;           // pointer to the raw data for the automap background.
+static short mapystart = 0;     // y-value for the start of the map bitmap...used in the paralax stuff.
+static short mapxstart = 0;     //x-value for the bitmap.
+
+//byte screens[][SCREENWIDTH*SCREENHEIGHT];
+//void V_MarkRect (int x, int y, int width, int height);
+
+// Functions
+
+void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
+                int NumLevels, unsigned short IntensityBits);
+
+// Calculates the slope and slope according to the x-axis of a line
+// segment in map coordinates (with the upright y-axis n' all) so
+// that it can be used with the brain-dead drawing stuff.
+
+// Ripped out for Heretic
+/*
+void AM_getIslope(mline_t *ml, islope_t *is)
+{
+  int dx, dy;
+
+  dy = ml->a.y - ml->b.y;
+  dx = ml->b.x - ml->a.x;
+  if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
+  else is->islp = FixedDiv(dx, dy);
+  if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
+  else is->slp = FixedDiv(dy, dx);
+}
+*/
+
+void AM_activateNewScale(void)
+{
+    m_x += m_w / 2;
+    m_y += m_h / 2;
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+    m_x -= m_w / 2;
+    m_y -= m_h / 2;
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+void AM_saveScaleAndLoc(void)
+{
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+}
+
+void AM_restoreScaleAndLoc(void)
+{
+
+    m_w = old_m_w;
+    m_h = old_m_h;
+    if (!followplayer)
+    {
+        m_x = old_m_x;
+        m_y = old_m_y;
+    }
+    else
+    {
+        m_x = plr->mo->x - m_w / 2;
+        m_y = plr->mo->y - m_h / 2;
+    }
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+
+    // Change the scaling multipliers
+    scale_mtof = FixedDiv(f_w << FRACBITS, m_w);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+// adds a marker at the current location
+
+/*
+void AM_addMark(void)
+{
+  markpoints[markpointnum].x = m_x + m_w/2;
+  markpoints[markpointnum].y = m_y + m_h/2;
+  markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
+
+}
+*/
+void AM_findMinMaxBoundaries(void)
+{
+    int i;
+    fixed_t a, b;
+
+    min_x = min_y = INT_MAX;
+    max_x = max_y = -INT_MAX;
+    for (i = 0; i < numvertexes; i++)
+    {
+        if (vertexes[i].x < min_x)
+            min_x = vertexes[i].x;
+        else if (vertexes[i].x > max_x)
+            max_x = vertexes[i].x;
+        if (vertexes[i].y < min_y)
+            min_y = vertexes[i].y;
+        else if (vertexes[i].y > max_y)
+            max_y = vertexes[i].y;
+    }
+    max_w = max_x - min_x;
+    max_h = max_y - min_y;
+    min_w = 2 * PLAYERRADIUS;
+    min_h = 2 * PLAYERRADIUS;
+
+    a = FixedDiv(f_w << FRACBITS, max_w);
+    b = FixedDiv(f_h << FRACBITS, max_h);
+    min_scale_mtof = a < b ? a : b;
+
+    max_scale_mtof = FixedDiv(f_h << FRACBITS, 2 * PLAYERRADIUS);
+
+}
+
+void AM_changeWindowLoc(void)
+{
+    if (m_paninc.x || m_paninc.y)
+    {
+        followplayer = 0;
+        f_oldloc.x = INT_MAX;
+    }
+
+    m_x += m_paninc.x;
+    m_y += m_paninc.y;
+
+    if (m_x + m_w / 2 > max_x)
+    {
+        m_x = max_x - m_w / 2;
+        m_paninc.x = 0;
+    }
+    else if (m_x + m_w / 2 < min_x)
+    {
+        m_x = min_x - m_w / 2;
+        m_paninc.x = 0;
+    }
+    if (m_y + m_h / 2 > max_y)
+    {
+        m_y = max_y - m_h / 2;
+        m_paninc.y = 0;
+    }
+    else if (m_y + m_h / 2 < min_y)
+    {
+        m_y = min_y - m_h / 2;
+        m_paninc.y = 0;
+    }
+
+    // The following code was commented out in the released Heretic source,
+    // but I believe we need to do this here to stop the background moving
+    // when we reach the map boundaries. (In the released source it's done
+    // in AM_clearFB).
+    mapxstart += MTOF(m_paninc.x+FRACUNIT/2);
+    mapystart -= MTOF(m_paninc.y+FRACUNIT/2);
+    if(mapxstart >= finit_width)
+        mapxstart -= finit_width;
+    if(mapxstart < 0)
+        mapxstart += finit_width;
+    if(mapystart >= finit_height)
+        mapystart -= finit_height;
+    if(mapystart < 0)
+        mapystart += finit_height;
+    // - end of code that was commented-out
+
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+void AM_initVariables(void)
+{
+    int pnum;
+    thinker_t *think;
+    mobj_t *mo;
+
+    //static event_t st_notify = { ev_keyup, AM_MSGENTERED };
+
+    automapactive = true;
+    fb = I_VideoBuffer;
+
+    f_oldloc.x = INT_MAX;
+    amclock = 0;
+    lightlev = 0;
+
+    m_paninc.x = m_paninc.y = 0;
+    ftom_zoommul = FRACUNIT;
+    mtof_zoommul = FRACUNIT;
+
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+
+    // find player to center on initially
+    if (!playeringame[pnum = consoleplayer])
+        for (pnum = 0; pnum < MAXPLAYERS; pnum++)
+            if (playeringame[pnum])
+                break;
+    plr = &players[pnum];
+    oldplr.x = plr->mo->x;
+    oldplr.y = plr->mo->y;
+    m_x = plr->mo->x - m_w / 2;
+    m_y = plr->mo->y - m_h / 2;
+    AM_changeWindowLoc();
+
+    // for saving & restoring
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+
+    // load in the location of keys, if in baby mode
+
+    memset(KeyPoints, 0, sizeof(vertex_t) * 3);
+    if (gameskill == sk_baby)
+    {
+        for (think = thinkercap.next; think != &thinkercap;
+             think = think->next)
+        {
+            if (think->function != P_MobjThinker)
+            {                   //not a mobj
+                continue;
+            }
+            mo = (mobj_t *) think;
+            if (mo->type == MT_CKEY)
+            {
+                KeyPoints[0].x = mo->x;
+                KeyPoints[0].y = mo->y;
+            }
+            else if (mo->type == MT_AKYY)
+            {
+                KeyPoints[1].x = mo->x;
+                KeyPoints[1].y = mo->y;
+            }
+            else if (mo->type == MT_BKYY)
+            {
+                KeyPoints[2].x = mo->x;
+                KeyPoints[2].y = mo->y;
+            }
+        }
+    }
+
+    // inform the status bar of the change
+//c  ST_Responder(&st_notify);
+}
+
+void AM_loadPics(void)
+{
+    //int i;
+    //char namebuf[9];
+/*  for (i=0;i<10;i++)
+  {
+    M_snprintf(namebuf, sizeof(namebuf), "AMMNUM%d", i);
+    marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
+  }*/
+    maplump = W_CacheLumpName(DEH_String("AUTOPAGE"), PU_STATIC);
+}
+
+/*void AM_unloadPics(void)
+{
+  int i;
+  for (i=0;i<10;i++) Z_ChangeTag(marknums[i], PU_CACHE);
+
+}*/
+
+/*
+void AM_clearMarks(void)
+{
+  int i;
+  for (i=0;i<AM_NUMMARKPOINTS;i++) markpoints[i].x = -1; // means empty
+  markpointnum = 0;
+}
+*/
+
+// should be called at the start of every level
+// right now, i figure it out myself
+
+void AM_LevelInit(void)
+{
+    f_x = f_y = 0;
+    f_w = finit_width;
+    f_h = finit_height;
+    mapxstart = mapystart = 0;
+
+
+//  AM_clearMarks();
+
+    AM_findMinMaxBoundaries();
+    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7 * FRACUNIT));
+    if (scale_mtof > max_scale_mtof)
+        scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+static boolean stopped = true;
+
+void AM_Stop(void)
+{
+    //static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
+
+//  AM_unloadPics();
+    automapactive = false;
+//  ST_Responder(&st_notify);
+    stopped = true;
+    BorderNeedRefresh = true;
+}
+
+void AM_Start(void)
+{
+    static int lastlevel = -1, lastepisode = -1;
+
+    if (!stopped)
+        AM_Stop();
+    stopped = false;
+    if (gamestate != GS_LEVEL)
+    {
+        return;                 // don't show automap if we aren't in a game!
+    }
+    if (lastlevel != gamemap || lastepisode != gameepisode)
+    {
+        AM_LevelInit();
+        lastlevel = gamemap;
+        lastepisode = gameepisode;
+    }
+    AM_initVariables();
+    AM_loadPics();
+}
+
+// set the window scale to the maximum size
+
+void AM_minOutWindowScale(void)
+{
+    scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+// set the window scale to the minimum size
+
+void AM_maxOutWindowScale(void)
+{
+    scale_mtof = max_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+boolean AM_Responder(event_t * ev)
+{
+    int rc;
+    int key;
+    static int bigstate = 0;
+    static int joywait = 0;
+
+    key = ev->data1;
+    rc = false;
+
+    if (ev->type == ev_joystick && joybautomap >= 0
+        && (ev->data1 & (1 << joybautomap)) != 0 && joywait < I_GetTime())
+    {
+        joywait = I_GetTime() + 5;
+
+        if (!automapactive)
+        {
+            AM_Start ();
+            viewactive = false;
+        }
+        else
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+        }
+    }
+
+    if (!automapactive)
+    {
+
+        if (ev->type == ev_keydown && key == key_map_toggle
+         && gamestate == GS_LEVEL)
+        {
+            AM_Start();
+            viewactive = false;
+            // viewactive = true;
+            rc = true;
+        }
+    }
+    else if (ev->type == ev_keydown)
+    {
+        rc = true;
+
+        if (key == key_map_east)                 // pan right
+        {
+            if (!followplayer)
+                m_paninc.x = FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_west)            // pan left
+        {
+            if (!followplayer)
+                m_paninc.x = -FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_north)           // pan up
+        {
+            if (!followplayer)
+                m_paninc.y = FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_south)           // pan down
+        {
+            if (!followplayer)
+                m_paninc.y = -FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_zoomout)         // zoom out
+        {
+            mtof_zoommul = M_ZOOMOUT;
+            ftom_zoommul = M_ZOOMIN;
+        }
+        else if (key == key_map_zoomin)          // zoom in
+        {
+            mtof_zoommul = M_ZOOMIN;
+            ftom_zoommul = M_ZOOMOUT;
+        }
+        else if (key == key_map_toggle)          // toggle map (tab)
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop();
+        }
+        else if (key == key_map_maxzoom)
+        {
+            bigstate = !bigstate;
+            if (bigstate)
+            {
+                AM_saveScaleAndLoc();
+                AM_minOutWindowScale();
+            }
+            else
+                AM_restoreScaleAndLoc();
+        }
+        else if (key == key_map_follow)
+        {
+            followplayer = !followplayer;
+            f_oldloc.x = INT_MAX;
+            P_SetMessage(plr,
+                         followplayer ? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF,
+                         true);
+        }
+        /*
+        else if (key == key_map_grid)
+        {
+            grid = !grid;
+            plr->message = grid ? AMSTR_GRIDON : AMSTR_GRIDOFF;
+        }
+        else if (key == key_map_mark)
+        {
+            M_snprintf(buffer, sizeof(buffer), "%s %d",
+                       AMSTR_MARKEDSPOT, markpointnum);
+            plr->message = buffer;
+            AM_addMark();
+        }
+        else if (key == key_map_clearmark)
+        {
+            AM_clearMarks();
+            plr->message = AMSTR_MARKSCLEARED;
+        }
+        */
+        else
+        {
+            rc = false;
+        }
+
+        if (cheat_amap[cheatcount] == ev->data1 && !netgame)
+            cheatcount++;
+        else
+            cheatcount = 0;
+        if (cheatcount == 6)
+        {
+            cheatcount = 0;
+            rc = false;
+            cheating = (cheating + 1) % 3;
+        }
+    }
+
+    else if (ev->type == ev_keyup)
+    {
+        rc = false;
+
+        if (key == key_map_east)
+        {
+            if (!followplayer)
+                m_paninc.x = 0;
+        }
+        else if (key == key_map_west)
+        {
+            if (!followplayer)
+                m_paninc.x = 0;
+        }
+        else if (key == key_map_north)
+        {
+            if (!followplayer)
+                m_paninc.y = 0;
+        }
+        else if (key == key_map_south)
+        {
+            if (!followplayer)
+                m_paninc.y = 0;
+        }
+        else if (key == key_map_zoomout || key == key_map_zoomin)
+        {
+            mtof_zoommul = FRACUNIT;
+            ftom_zoommul = FRACUNIT;
+        }
+    }
+
+    return rc;
+
+}
+
+void AM_changeWindowScale(void)
+{
+
+    // Change the scaling multipliers
+    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+
+    if (scale_mtof < min_scale_mtof)
+        AM_minOutWindowScale();
+    else if (scale_mtof > max_scale_mtof)
+        AM_maxOutWindowScale();
+    else
+        AM_activateNewScale();
+}
+
+void AM_doFollowPlayer(void)
+{
+    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
+    {
+//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
+//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
+//  m_x = plr->mo->x - m_w/2;
+//  m_y = plr->mo->y - m_h/2;
+        m_x = FTOM(MTOF(plr->mo->x)) - m_w / 2;
+        m_y = FTOM(MTOF(plr->mo->y)) - m_h / 2;
+        m_x2 = m_x + m_w;
+        m_y2 = m_y + m_h;
+
+        // do the parallax parchment scrolling.
+/*
+	 dmapx = (MTOF(plr->mo->x)-MTOF(f_oldloc.x)); //fixed point
+	 dmapy = (MTOF(f_oldloc.y)-MTOF(plr->mo->y));
+
+	 if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
+		dmapx=0;  //goes into the automap.
+	 mapxstart += dmapx;
+	 mapystart += dmapy;
+
+  	 while(mapxstart >= finit_width)
+			mapxstart -= finit_width;
+    while(mapxstart < 0)
+			mapxstart += finit_width;
+    while(mapystart >= finit_height)
+			mapystart -= finit_height;
+    while(mapystart < 0)
+			mapystart += finit_height;
+*/
+        f_oldloc.x = plr->mo->x;
+        f_oldloc.y = plr->mo->y;
+    }
+}
+
+// Ripped out for Heretic
+/*
+void AM_updateLightLev(void)
+{
+  static nexttic = 0;
+//static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
+  static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
+  static int litelevelscnt = 0;
+
+  // Change light level
+  if (amclock>nexttic)
+  {
+    lightlev = litelevels[litelevelscnt++];
+    if (litelevelscnt == sizeof(litelevels)/sizeof(int)) litelevelscnt = 0;
+    nexttic = amclock + 6 - (amclock % 6);
+  }
+}
+*/
+
+void AM_Ticker(void)
+{
+
+    if (!automapactive)
+        return;
+
+    amclock++;
+
+    if (followplayer)
+        AM_doFollowPlayer();
+
+    // Change the zoom if necessary
+    if (ftom_zoommul != FRACUNIT)
+        AM_changeWindowScale();
+
+    // Change x,y location
+    if (m_paninc.x || m_paninc.y)
+        AM_changeWindowLoc();
+    // Update light level
+// AM_updateLightLev();
+
+}
+
+void AM_clearFB(int color)
+{
+    int i, j;
+    int dmapx;
+    int dmapy;
+
+    if (followplayer)
+    {
+        dmapx = (MTOF(plr->mo->x) - MTOF(oldplr.x));    //fixed point
+        dmapy = (MTOF(oldplr.y) - MTOF(plr->mo->y));
+
+        oldplr.x = plr->mo->x;
+        oldplr.y = plr->mo->y;
+//              if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
+//                      dmapx=0;  //goes into the automap.
+        mapxstart += dmapx >> 1;
+        mapystart += dmapy >> 1;
+
+        while (mapxstart >= finit_width)
+            mapxstart -= finit_width;
+        while (mapxstart < 0)
+            mapxstart += finit_width;
+        while (mapystart >= finit_height)
+            mapystart -= finit_height;
+        while (mapystart < 0)
+            mapystart += finit_height;
+    }
+    else
+    {
+        // The released Heretic source does this here, but this causes a bug
+        // where the map background keeps moving when we reach the map
+        // boundaries. This is instead done in AM_changeWindowLoc.
+        /*
+        mapxstart += (MTOF(m_paninc.x) >> 1);
+        mapystart -= (MTOF(m_paninc.y) >> 1);
+
+        if (mapxstart >= finit_width)
+            mapxstart -= finit_width;
+        if (mapxstart < 0)
+            mapxstart += finit_width;
+        if (mapystart >= finit_height)
+            mapystart -= finit_height;
+        if (mapystart < 0)
+            mapystart += finit_height;
+        */
+    }
+
+    //blit the automap background to the screen.
+    j = mapystart * finit_width;
+    for (i = 0; i < finit_height; i++)
+    {
+        memcpy(I_VideoBuffer + i * finit_width, maplump + j + mapxstart,
+               finit_width - mapxstart);
+        memcpy(I_VideoBuffer + i * finit_width + finit_width - mapxstart,
+               maplump + j, mapxstart);
+        j += finit_width;
+        if (j >= finit_height * finit_width)
+            j = 0;
+    }
+
+//       memcpy(I_VideoBuffer, maplump, finit_width*finit_height);
+//  memset(fb, color, f_w*f_h);
+}
+
+// Based on Cohen-Sutherland clipping algorithm but with a slightly
+// faster reject and precalculated slopes.  If I need the speed, will
+// hash algorithm to the common cases.
+
+boolean AM_clipMline(mline_t * ml, fline_t * fl)
+{
+    enum
+    { LEFT = 1, RIGHT = 2, BOTTOM = 4, TOP = 8 };
+    int outcode1 = 0, outcode2 = 0, outside;
+    fpoint_t tmp = { 0, 0 };
+    int dx, dy;
+
+#define DOOUTCODE(oc, mx, my) \
+  (oc) = 0; \
+  if ((my) < 0) (oc) |= TOP; \
+  else if ((my) >= f_h) (oc) |= BOTTOM; \
+  if ((mx) < 0) (oc) |= LEFT; \
+  else if ((mx) >= f_w) (oc) |= RIGHT
+
+    // do trivial rejects and outcodes
+    if (ml->a.y > m_y2)
+        outcode1 = TOP;
+    else if (ml->a.y < m_y)
+        outcode1 = BOTTOM;
+    if (ml->b.y > m_y2)
+        outcode2 = TOP;
+    else if (ml->b.y < m_y)
+        outcode2 = BOTTOM;
+    if (outcode1 & outcode2)
+        return false;           // trivially outside
+
+    if (ml->a.x < m_x)
+        outcode1 |= LEFT;
+    else if (ml->a.x > m_x2)
+        outcode1 |= RIGHT;
+    if (ml->b.x < m_x)
+        outcode2 |= LEFT;
+    else if (ml->b.x > m_x2)
+        outcode2 |= RIGHT;
+    if (outcode1 & outcode2)
+        return false;           // trivially outside
+
+    // transform to frame-buffer coordinates.
+    fl->a.x = CXMTOF(ml->a.x);
+    fl->a.y = CYMTOF(ml->a.y);
+    fl->b.x = CXMTOF(ml->b.x);
+    fl->b.y = CYMTOF(ml->b.y);
+    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+    if (outcode1 & outcode2)
+        return false;
+
+    while (outcode1 | outcode2)
+    {
+        // may be partially inside box
+        // find an outside point
+        if (outcode1)
+            outside = outcode1;
+        else
+            outside = outcode2;
+        // clip to each side
+        if (outside & TOP)
+        {
+            dy = fl->a.y - fl->b.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.x = fl->a.x + (dx * (fl->a.y)) / dy;
+            tmp.y = 0;
+        }
+        else if (outside & BOTTOM)
+        {
+            dy = fl->a.y - fl->b.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.x = fl->a.x + (dx * (fl->a.y - f_h)) / dy;
+            tmp.y = f_h - 1;
+        }
+        else if (outside & RIGHT)
+        {
+            dy = fl->b.y - fl->a.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.y = fl->a.y + (dy * (f_w - 1 - fl->a.x)) / dx;
+            tmp.x = f_w - 1;
+        }
+        else if (outside & LEFT)
+        {
+            dy = fl->b.y - fl->a.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.y = fl->a.y + (dy * (-fl->a.x)) / dx;
+            tmp.x = 0;
+        }
+        if (outside == outcode1)
+        {
+            fl->a = tmp;
+            DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+        }
+        else
+        {
+            fl->b = tmp;
+            DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+        }
+        if (outcode1 & outcode2)
+            return false;       // trivially outside
+    }
+
+    return true;
+}
+
+#undef DOOUTCODE
+
+// Classic Bresenham w/ whatever optimizations I need for speed
+
+void AM_drawFline(fline_t * fl, int color)
+{
+
+    register int x, y, dx, dy, sx, sy, ax, ay, d;
+    static int fuck = 0;
+
+    switch (color)
+    {
+        case WALLCOLORS:
+            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y, &antialias[0][0],
+                       8, 3);
+            break;
+        case FDWALLCOLORS:
+            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y, &antialias[1][0],
+                       8, 3);
+            break;
+        case CDWALLCOLORS:
+            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y, &antialias[2][0],
+                       8, 3);
+            break;
+        default:
+            {
+                // For debugging only
+                if (fl->a.x < 0 || fl->a.x >= f_w
+                    || fl->a.y < 0 || fl->a.y >= f_h
+                    || fl->b.x < 0 || fl->b.x >= f_w
+                    || fl->b.y < 0 || fl->b.y >= f_h)
+                {
+                    fprintf(stderr, "fuck %d \r", fuck++);
+                    return;
+                }
+
+#define DOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)    //the MACRO!
+
+                dx = fl->b.x - fl->a.x;
+                ax = 2 * (dx < 0 ? -dx : dx);
+                sx = dx < 0 ? -1 : 1;
+
+                dy = fl->b.y - fl->a.y;
+                ay = 2 * (dy < 0 ? -dy : dy);
+                sy = dy < 0 ? -1 : 1;
+
+                x = fl->a.x;
+                y = fl->a.y;
+
+                if (ax > ay)
+                {
+                    d = ay - ax / 2;
+                    while (1)
+                    {
+                        DOT(x, y, color);
+                        if (x == fl->b.x)
+                            return;
+                        if (d >= 0)
+                        {
+                            y += sy;
+                            d -= ax;
+                        }
+                        x += sx;
+                        d += ay;
+                    }
+                }
+                else
+                {
+                    d = ax - ay / 2;
+                    while (1)
+                    {
+                        DOT(x, y, color);
+                        if (y == fl->b.y)
+                            return;
+                        if (d >= 0)
+                        {
+                            x += sx;
+                            d -= ay;
+                        }
+                        y += sy;
+                        d += ax;
+                    }
+                }
+            }
+    }
+}
+
+/* Wu antialiased line drawer.
+ * (X0,Y0),(X1,Y1) = line to draw
+ * BaseColor = color # of first color in block used for antialiasing, the
+ *          100% intensity version of the drawing color
+ * NumLevels = size of color block, with BaseColor+NumLevels-1 being the
+ *          0% intensity version of the drawing color
+ * IntensityBits = log base 2 of NumLevels; the # of bits used to describe
+ *          the intensity of the drawing color. 2**IntensityBits==NumLevels
+ */
+void PUTDOT(short xx, short yy, byte * cc, byte * cm)
+{
+    static int oldyy;
+    static int oldyyshifted;
+    byte *oldcc = cc;
+
+    if (xx < 32)
+        cc += 7 - (xx >> 2);
+    else if (xx > (finit_width - 32))
+        cc += 7 - ((finit_width - xx) >> 2);
+//      if(cc==oldcc) //make sure that we don't double fade the corners.
+//      {
+    if (yy < 32)
+        cc += 7 - (yy >> 2);
+    else if (yy > (finit_height - 32))
+        cc += 7 - ((finit_height - yy) >> 2);
+//      }
+    if (cc > cm && cm != NULL)
+    {
+        cc = cm;
+    }
+    else if (cc > oldcc + 6)    // don't let the color escape from the fade table...
+    {
+        cc = oldcc + 6;
+    }
+    if (yy == oldyy + 1)
+    {
+        oldyy++;
+        oldyyshifted += 320;
+    }
+    else if (yy == oldyy - 1)
+    {
+        oldyy--;
+        oldyyshifted -= 320;
+    }
+    else if (yy != oldyy)
+    {
+        oldyy = yy;
+        oldyyshifted = yy * 320;
+    }
+    fb[oldyyshifted + xx] = *(cc);
+//      fb[(yy)*f_w+(xx)]=*(cc);
+}
+
+void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
+                int NumLevels, unsigned short IntensityBits)
+{
+    unsigned short IntensityShift, ErrorAdj, ErrorAcc;
+    unsigned short ErrorAccTemp, Weighting, WeightingComplementMask;
+    short DeltaX, DeltaY, Temp, XDir;
+
+    /* Make sure the line runs top to bottom */
+    if (Y0 > Y1)
+    {
+        Temp = Y0;
+        Y0 = Y1;
+        Y1 = Temp;
+        Temp = X0;
+        X0 = X1;
+        X1 = Temp;
+    }
+    /* Draw the initial pixel, which is always exactly intersected by
+       the line and so needs no weighting */
+    PUTDOT(X0, Y0, &BaseColor[0], NULL);
+
+    if ((DeltaX = X1 - X0) >= 0)
+    {
+        XDir = 1;
+    }
+    else
+    {
+        XDir = -1;
+        DeltaX = -DeltaX;       /* make DeltaX positive */
+    }
+    /* Special-case horizontal, vertical, and diagonal lines, which
+       require no weighting because they go right through the center of
+       every pixel */
+    if ((DeltaY = Y1 - Y0) == 0)
+    {
+        /* Horizontal line */
+        while (DeltaX-- != 0)
+        {
+            X0 += XDir;
+            PUTDOT(X0, Y0, &BaseColor[0], NULL);
+        }
+        return;
+    }
+    if (DeltaX == 0)
+    {
+        /* Vertical line */
+        do
+        {
+            Y0++;
+            PUTDOT(X0, Y0, &BaseColor[0], NULL);
+        }
+        while (--DeltaY != 0);
+        return;
+    }
+    //diagonal line.
+    if (DeltaX == DeltaY)
+    {
+        do
+        {
+            X0 += XDir;
+            Y0++;
+            PUTDOT(X0, Y0, &BaseColor[0], NULL);
+        }
+        while (--DeltaY != 0);
+        return;
+    }
+    /* Line is not horizontal, diagonal, or vertical */
+    ErrorAcc = 0;               /* initialize the line error accumulator to 0 */
+    /* # of bits by which to shift ErrorAcc to get intensity level */
+    IntensityShift = 16 - IntensityBits;
+    /* Mask used to flip all bits in an intensity weighting, producing the
+       result (1 - intensity weighting) */
+    WeightingComplementMask = NumLevels - 1;
+    /* Is this an X-major or Y-major line? */
+    if (DeltaY > DeltaX)
+    {
+        /* Y-major line; calculate 16-bit fixed-point fractional part of a
+           pixel that X advances each time Y advances 1 pixel, truncating the
+           result so that we won't overrun the endpoint along the X axis */
+        ErrorAdj = ((unsigned int) DeltaX << 16) / (unsigned int) DeltaY;
+        /* Draw all pixels other than the first and last */
+        while (--DeltaY)
+        {
+            ErrorAccTemp = ErrorAcc;    /* remember currrent accumulated error */
+            ErrorAcc += ErrorAdj;       /* calculate error for next pixel */
+            if (ErrorAcc <= ErrorAccTemp)
+            {
+                /* The error accumulator turned over, so advance the X coord */
+                X0 += XDir;
+            }
+            Y0++;               /* Y-major, so always advance Y */
+            /* The IntensityBits most significant bits of ErrorAcc give us the
+               intensity weighting for this pixel, and the complement of the
+               weighting for the paired pixel */
+            Weighting = ErrorAcc >> IntensityShift;
+            PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
+            PUTDOT(X0 + XDir, Y0,
+                   &BaseColor[(Weighting ^ WeightingComplementMask)],
+                   &BaseColor[7]);
+        }
+        /* Draw the final pixel, which is always exactly intersected by the line
+           and so needs no weighting */
+        PUTDOT(X1, Y1, &BaseColor[0], NULL);
+        return;
+    }
+    /* It's an X-major line; calculate 16-bit fixed-point fractional part of a
+       pixel that Y advances each time X advances 1 pixel, truncating the
+       result to avoid overrunning the endpoint along the X axis */
+    ErrorAdj = ((unsigned int) DeltaY << 16) / (unsigned int) DeltaX;
+    /* Draw all pixels other than the first and last */
+    while (--DeltaX)
+    {
+        ErrorAccTemp = ErrorAcc;        /* remember currrent accumulated error */
+        ErrorAcc += ErrorAdj;   /* calculate error for next pixel */
+        if (ErrorAcc <= ErrorAccTemp)
+        {
+            /* The error accumulator turned over, so advance the Y coord */
+            Y0++;
+        }
+        X0 += XDir;             /* X-major, so always advance X */
+        /* The IntensityBits most significant bits of ErrorAcc give us the
+           intensity weighting for this pixel, and the complement of the
+           weighting for the paired pixel */
+        Weighting = ErrorAcc >> IntensityShift;
+        PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
+        PUTDOT(X0, Y0 + 1,
+               &BaseColor[(Weighting ^ WeightingComplementMask)],
+               &BaseColor[7]);
+
+    }
+    /* Draw the final pixel, which is always exactly intersected by the line
+       and so needs no weighting */
+    PUTDOT(X1, Y1, &BaseColor[0], NULL);
+}
+
+void AM_drawMline(mline_t * ml, int color)
+{
+    static fline_t fl;
+
+    if (AM_clipMline(ml, &fl))
+        AM_drawFline(&fl, color);       // draws it on frame buffer using fb coords
+
+}
+
+void AM_drawGrid(int color)
+{
+    fixed_t x, y;
+    fixed_t start, end;
+    mline_t ml;
+
+    // Figure out start of vertical gridlines
+    start = m_x;
+    if ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS))
+        start += (MAPBLOCKUNITS << FRACBITS)
+            - ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS));
+    end = m_x + m_w;
+
+    // draw vertical gridlines
+    ml.a.y = m_y;
+    ml.b.y = m_y + m_h;
+    for (x = start; x < end; x += (MAPBLOCKUNITS << FRACBITS))
+    {
+        ml.a.x = x;
+        ml.b.x = x;
+        AM_drawMline(&ml, color);
+    }
+
+    // Figure out start of horizontal gridlines
+    start = m_y;
+    if ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS))
+        start += (MAPBLOCKUNITS << FRACBITS)
+            - ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS));
+    end = m_y + m_h;
+
+    // draw horizontal gridlines
+    ml.a.x = m_x;
+    ml.b.x = m_x + m_w;
+    for (y = start; y < end; y += (MAPBLOCKUNITS << FRACBITS))
+    {
+        ml.a.y = y;
+        ml.b.y = y;
+        AM_drawMline(&ml, color);
+    }
+}
+
+void AM_drawWalls(void)
+{
+    int i;
+    static mline_t l;
+
+    for (i = 0; i < numlines; i++)
+    {
+        l.a.x = lines[i].v1->x;
+        l.a.y = lines[i].v1->y;
+        l.b.x = lines[i].v2->x;
+        l.b.y = lines[i].v2->y;
+        if (cheating || (lines[i].flags & ML_MAPPED))
+        {
+            if ((lines[i].flags & LINE_NEVERSEE) && !cheating)
+                continue;
+            if (!lines[i].backsector)
+            {
+                AM_drawMline(&l, WALLCOLORS + lightlev);
+            }
+            else
+            {
+                if (lines[i].special == 39)
+                {               // teleporters
+                    AM_drawMline(&l, WALLCOLORS + WALLRANGE / 2);
+                }
+                else if (lines[i].flags & ML_SECRET)    // secret door
+                {
+                    if (cheating)
+                        AM_drawMline(&l, 0);
+                    else
+                        AM_drawMline(&l, WALLCOLORS + lightlev);
+                }
+                else if (lines[i].special > 25 && lines[i].special < 35)
+                {
+                    switch (lines[i].special)
+                    {
+                        case 26:
+                        case 32:
+                            AM_drawMline(&l, BLUEKEY);
+                            break;
+                        case 27:
+                        case 34:
+                            AM_drawMline(&l, YELLOWKEY);
+                            break;
+                        case 28:
+                        case 33:
+                            AM_drawMline(&l, GREENKEY);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else if (lines[i].backsector->floorheight
+                         != lines[i].frontsector->floorheight)
+                {
+                    AM_drawMline(&l, FDWALLCOLORS + lightlev);  // floor level change
+                }
+                else if (lines[i].backsector->ceilingheight
+                         != lines[i].frontsector->ceilingheight)
+                {
+                    AM_drawMline(&l, CDWALLCOLORS + lightlev);  // ceiling level change
+                }
+                else if (cheating)
+                {
+                    AM_drawMline(&l, TSWALLCOLORS + lightlev);
+                }
+            }
+        }
+        else if (plr->powers[pw_allmap])
+        {
+            if (!(lines[i].flags & LINE_NEVERSEE))
+                AM_drawMline(&l, GRAYS + 3);
+        }
+    }
+
+}
+
+void AM_rotate(fixed_t * x, fixed_t * y, angle_t a)
+{
+    fixed_t tmpx;
+
+    tmpx = FixedMul(*x, finecosine[a >> ANGLETOFINESHIFT])
+        - FixedMul(*y, finesine[a >> ANGLETOFINESHIFT]);
+    *y = FixedMul(*x, finesine[a >> ANGLETOFINESHIFT])
+        + FixedMul(*y, finecosine[a >> ANGLETOFINESHIFT]);
+    *x = tmpx;
+}
+
+void AM_drawLineCharacter(mline_t * lineguy, int lineguylines, fixed_t scale,
+                          angle_t angle, int color, fixed_t x, fixed_t y)
+{
+    int i;
+    mline_t l;
+
+    for (i = 0; i < lineguylines; i++)
+    {
+        l.a.x = lineguy[i].a.x;
+        l.a.y = lineguy[i].a.y;
+        if (scale)
+        {
+            l.a.x = FixedMul(scale, l.a.x);
+            l.a.y = FixedMul(scale, l.a.y);
+        }
+        if (angle)
+            AM_rotate(&l.a.x, &l.a.y, angle);
+        l.a.x += x;
+        l.a.y += y;
+
+        l.b.x = lineguy[i].b.x;
+        l.b.y = lineguy[i].b.y;
+        if (scale)
+        {
+            l.b.x = FixedMul(scale, l.b.x);
+            l.b.y = FixedMul(scale, l.b.y);
+        }
+        if (angle)
+            AM_rotate(&l.b.x, &l.b.y, angle);
+        l.b.x += x;
+        l.b.y += y;
+
+        AM_drawMline(&l, color);
+    }
+
+}
+
+void AM_drawPlayers(void)
+{
+
+    int i;
+    player_t *p;
+    static int their_colors[] = { GREENKEY, YELLOWKEY, BLOODRED, BLUEKEY };
+    int their_color = -1;
+    int color;
+
+    if (!netgame)
+    {
+        /*
+           if (cheating) AM_drawLineCharacter(cheat_player_arrow, NUMCHEATPLYRLINES, 0,
+           plr->mo->angle, WHITE, plr->mo->x, plr->mo->y);
+         *///cheat key player pointer is the same as non-cheat pointer..
+
+        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, plr->mo->angle,
+                             WHITE, plr->mo->x, plr->mo->y);
+        return;
+    }
+
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        their_color++;
+        p = &players[i];
+        if (deathmatch && !singledemo && p != plr)
+        {
+            continue;
+        }
+        if (!playeringame[i])
+            continue;
+        if (p->powers[pw_invisibility])
+            color = 102;        // *close* to the automap color
+        else
+            color = their_colors[their_color];
+        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, p->mo->angle,
+                             color, p->mo->x, p->mo->y);
+    }
+}
+
+void AM_drawThings(int colors, int colorrange)
+{
+    int i;
+    mobj_t *t;
+
+    for (i = 0; i < numsectors; i++)
+    {
+        t = sectors[i].thinglist;
+        while (t)
+        {
+            AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES,
+                                 16 << FRACBITS, t->angle, colors + lightlev,
+                                 t->x, t->y);
+            t = t->snext;
+        }
+    }
+}
+
+/*
+void AM_drawMarks(void)
+{
+  int i, fx, fy, w, h;
+
+  for (i=0;i<AM_NUMMARKPOINTS;i++)
+  {
+    if (markpoints[i].x != -1)
+    {
+      w = SHORT(marknums[i]->width);
+      h = SHORT(marknums[i]->height);
+      fx = CXMTOF(markpoints[i].x);
+      fy = CYMTOF(markpoints[i].y);
+      if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
+  			V_DrawPatch(fx, fy, marknums[i]);
+    }
+  }
+}
+*/
+
+void AM_drawkeys(void)
+{
+    if (KeyPoints[0].x != 0 || KeyPoints[0].y != 0)
+    {
+        AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, YELLOWKEY,
+                             KeyPoints[0].x, KeyPoints[0].y);
+    }
+    if (KeyPoints[1].x != 0 || KeyPoints[1].y != 0)
+    {
+        AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, GREENKEY,
+                             KeyPoints[1].x, KeyPoints[1].y);
+    }
+    if (KeyPoints[2].x != 0 || KeyPoints[2].y != 0)
+    {
+        AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, BLUEKEY,
+                             KeyPoints[2].x, KeyPoints[2].y);
+    }
+}
+
+void AM_drawCrosshair(int color)
+{
+    fb[(f_w * (f_h + 1)) / 2] = color;  // single point for now
+}
+
+void AM_Drawer(void)
+{
+    const char *level_name;
+    int numepisodes;
+
+    if (!automapactive)
+        return;
+
+    UpdateState |= I_FULLSCRN;
+    AM_clearFB(BACKGROUND);
+    if (grid)
+        AM_drawGrid(GRIDCOLORS);
+    AM_drawWalls();
+    AM_drawPlayers();
+    if (cheating == 2)
+        AM_drawThings(THINGCOLORS, THINGRANGE);
+//  AM_drawCrosshair(XHAIRCOLORS);
+
+//  AM_drawMarks();
+    if (gameskill == sk_baby)
+    {
+        AM_drawkeys();
+    }
+
+    if (gamemode == retail)
+    {
+        numepisodes = 5;
+    }
+    else
+    {
+        numepisodes = 3;
+    }
+
+    if (gameepisode <= numepisodes && gamemap < 10)
+    {
+        level_name = LevelNames[(gameepisode - 1) * 9 + gamemap - 1];
+        MN_DrTextA(DEH_String(level_name), 20, 145);
+    }
+//  I_Update();
+//  V_MarkRect(f_x, f_y, f_w, f_h);
+}
diff --git a/games/NXDoom/src/heretic/am_map.h b/games/NXDoom/src/heretic/am_map.h
new file mode 100644
index 000000000..aa535cc30
--- /dev/null
+++ b/games/NXDoom/src/heretic/am_map.h
@@ -0,0 +1,124 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+#ifndef __AMMAP_H__
+#define __AMMAP_H__
+
+
+#include "r_local.h"
+
+
+// For use if I do walls with outsides/insides
+#define REDS		12*8
+#define REDRANGE	1       //16
+#define BLUES		(256-4*16+8)
+#define BLUERANGE	1       //8
+#define GREENS		(33*8)
+#define GREENRANGE	1       //16
+#define GRAYS		(5*8)
+#define GRAYSRANGE	1       //16
+#define BROWNS		(14*8)
+#define BROWNRANGE	1       //16
+#define YELLOWS		10*8
+#define YELLOWRANGE	1
+#define BLACK		0
+#define WHITE		4*8
+#define PARCH		13*8-1
+#define BLOODRED  150
+#define BLUEKEY 	197
+#define YELLOWKEY 144
+#define GREENKEY  220
+
+// Automap colors
+#define BACKGROUND	PARCH
+#define YOURCOLORS	WHITE
+#define YOURRANGE	0
+#define WALLCOLORS	REDS
+#define WALLRANGE	REDRANGE
+#define TSWALLCOLORS	GRAYS
+#define TSWALLRANGE	GRAYSRANGE
+#define FDWALLCOLORS	BROWNS
+#define FDWALLRANGE	BROWNRANGE
+#define CDWALLCOLORS	YELLOWS
+#define CDWALLRANGE	YELLOWRANGE
+#define THINGCOLORS	GREENS
+#define THINGRANGE	GREENRANGE
+#define SECRETWALLCOLORS WALLCOLORS
+#define SECRETWALLRANGE WALLRANGE
+#define GRIDCOLORS	(GRAYS + GRAYSRANGE/2)
+#define GRIDRANGE	0
+#define XHAIRCOLORS	GRAYS
+
+// drawing stuff
+#define	FB		0
+
+#define AM_NUMMARKPOINTS 10
+
+#define AM_MSGHEADER (('a'<<24)+('m'<<16))
+#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
+#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
+
+#define INITSCALEMTOF (.2*FRACUNIT)     // scale on entry
+// how much the automap moves window per tic in frame-buffer coordinates
+#define F_PANINC	4       // moves 140 pixels in 1 second
+// how much zoom-in per tic
+#define M_ZOOMIN        ((int) (1.02*FRACUNIT)) // goes to 2x in 1 second
+// how much zoom-out per tic
+#define M_ZOOMOUT       ((int) (FRACUNIT/1.02)) // pulls out to 0.5x in 1 second
+
+// translates between frame-buffer and map distances
+#define FTOM(x) FixedMul(((x)<<16),scale_ftom)
+#define MTOF(x) (FixedMul((x),scale_mtof)>>16)
+// translates between frame-buffer and map coordinates
+#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
+#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
+
+// the following is crap
+#define LINE_NEVERSEE ML_DONTDRAW
+
+typedef struct
+{
+    int x, y;
+} fpoint_t;
+
+typedef struct
+{
+    fpoint_t a, b;
+} fline_t;
+
+typedef vertex_t mpoint_t;
+
+typedef struct
+{
+    mpoint_t a, b;
+} mline_t;
+
+typedef struct
+{
+    fixed_t slp, islp;
+} islope_t;
+
+// extern int f_x, f_y, f_w, f_h;
+
+
+extern boolean automapactive;
+extern vertex_t KeyPoints[];
+extern const char *LevelNames[];
+
+
+void AM_Stop(void);
+
+
+#endif
diff --git a/games/NXDoom/src/heretic/ct_chat.c b/games/NXDoom/src/heretic/ct_chat.c
new file mode 100644
index 000000000..f0f8e5ff6
--- /dev/null
+++ b/games/NXDoom/src/heretic/ct_chat.c
@@ -0,0 +1,477 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Chat mode
+//
+
+#include <string.h>
+#include <ctype.h>
+
+#include "doomdef.h"
+#include "doomkeys.h"
+
+#include "deh_str.h"
+#include "i_input.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+#define QUEUESIZE		128
+#define MESSAGESIZE	128
+#define MESSAGELEN 	265
+
+#define CT_PLR_GREEN		1
+#define CT_PLR_YELLOW	2
+#define CT_PLR_RED		3
+#define CT_PLR_BLUE		4
+#define CT_PLR_ALL		5
+
+#define CT_ESCAPE 6
+
+// Public data
+
+
+boolean chatmodeon;
+
+// Private data
+
+void CT_queueChatChar(char ch);
+void CT_ClearChatMessage(int player);
+void CT_AddChar(int player, char c);
+void CT_BackSpace(int player);
+
+int head;
+int tail;
+byte ChatQueue[QUEUESIZE];
+int chat_dest[MAXPLAYERS];
+char chat_msg[MAXPLAYERS][MESSAGESIZE];
+char plr_lastmsg[MAXPLAYERS][MESSAGESIZE + 9];  // add in the length of the pre-string
+int msgptr[MAXPLAYERS];
+int msglen[MAXPLAYERS];
+
+boolean cheated;
+
+static int FontABaseLump;
+
+const char *CT_FromPlrText[MAXPLAYERS] = {
+    "GREEN:  ",
+    "YELLOW:  ",
+    "RED:  ",
+    "BLUE:  "
+};
+
+char *chat_macros[10];
+
+boolean altdown;
+boolean shiftdown;
+
+
+//===========================================================================
+//
+// CT_Init
+//
+//      Initialize chat mode data
+//===========================================================================
+
+void CT_Init(void)
+{
+    int i;
+
+    head = 0;                   //initialize the queue index
+    tail = 0;
+    chatmodeon = false;
+    memset(ChatQueue, 0, QUEUESIZE);
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        chat_dest[i] = 0;
+        msgptr[i] = 0;
+        memset(plr_lastmsg[i], 0, MESSAGESIZE);
+        memset(chat_msg[i], 0, MESSAGESIZE);
+    }
+    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
+    return;
+}
+
+//===========================================================================
+//
+// CT_Stop
+//
+//===========================================================================
+
+void CT_Stop(void)
+{
+    chatmodeon = false;
+    I_StopTextInput();
+    return;
+}
+
+// These keys are allowed by Vanilla Heretic:
+
+static boolean ValidChatChar(char c)
+{
+    return (c >= 'a' && c <= 'z')
+        || (c >= 'A' && c <= 'Z')
+        || (c >= '0' && c <= '9')
+        || c == '!' || c == '?'
+        || c == ' ' || c == '\''
+        || c == ',' || c == '.'
+        || c == '-' || c == '=';
+}
+
+//===========================================================================
+//
+// CT_Responder
+//
+//===========================================================================
+
+boolean CT_Responder(event_t * ev)
+{
+    char *macro;
+
+    int sendto;
+
+    if (!netgame)
+    {
+        return false;
+    }
+    if (ev->data1 == KEY_LALT || ev->data2 == KEY_RALT)
+    {
+        altdown = (ev->type == ev_keydown);
+        return false;
+    }
+    if (ev->data1 == KEY_RSHIFT)
+    {
+        shiftdown = (ev->type == ev_keydown);
+        return false;
+    }
+    if (ev->type != ev_keydown)
+    {
+        return false;
+    }
+    if (!chatmodeon)
+    {
+        sendto = 0;
+        if (ev->data1 == key_multi_msg)
+        {
+            sendto = CT_PLR_ALL;
+        }
+        else if (ev->data1 == key_multi_msgplayer[0])
+        {
+            sendto = CT_PLR_GREEN;
+        }
+        else if (ev->data1 == key_multi_msgplayer[1])
+        {
+            sendto = CT_PLR_YELLOW;
+        }
+        else if (ev->data1 == key_multi_msgplayer[2])
+        {
+            sendto = CT_PLR_RED;
+        }
+        else if (ev->data1 == key_multi_msgplayer[3])
+        {
+            sendto = CT_PLR_BLUE;
+        }
+        if (sendto == 0 || (sendto != CT_PLR_ALL && !playeringame[sendto - 1])
+            || sendto == consoleplayer + 1)
+        {
+            return false;
+        }
+        CT_queueChatChar(sendto);
+        chatmodeon = true;
+        I_StartTextInput(25, 10, SCREENWIDTH, 18);
+        return true;
+    }
+    else
+    {
+        if (altdown)
+        {
+            if (ev->data1 >= '0' && ev->data1 <= '9')
+            {
+                if (ev->data1 == '0')
+                {               // macro 0 comes after macro 9
+                    ev->data1 = '9' + 1;
+                }
+                macro = chat_macros[ev->data1 - '1'];
+                CT_queueChatChar(KEY_ENTER);    //send old message
+                CT_queueChatChar(chat_dest[consoleplayer]);     // chose the dest.
+                while (*macro)
+                {
+                    CT_queueChatChar(toupper(*macro++));
+                }
+                CT_queueChatChar(KEY_ENTER);    //send it off...
+                CT_Stop();
+                return true;
+            }
+        }
+        if (ev->data1 == KEY_ENTER)
+        {
+            CT_queueChatChar(KEY_ENTER);
+            CT_Stop();
+            return true;
+        }
+        else if (ev->data1 == KEY_ESCAPE)
+        {
+            CT_queueChatChar(CT_ESCAPE);
+            CT_Stop();
+            return true;
+        }
+        else if (ev->data1 == KEY_BACKSPACE)
+        {
+            CT_queueChatChar(KEY_BACKSPACE);
+            return true;
+        }
+        else if (ValidChatChar(ev->data3))
+        {
+            CT_queueChatChar(toupper(ev->data3));
+            return true;
+        }
+    }
+    return false;
+}
+
+//===========================================================================
+//
+// CT_Ticker
+//
+//===========================================================================
+
+void CT_Ticker(void)
+{
+    int i;
+    int j;
+    char c;
+    int numplayers;
+
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        if ((c = players[i].cmd.chatchar) != 0)
+        {
+            if (c <= 5)
+            {
+                chat_dest[i] = c;
+                continue;
+            }
+            else if (c == CT_ESCAPE)
+            {
+                CT_ClearChatMessage(i);
+            }
+            else if (c == KEY_ENTER)
+            {
+                numplayers = 0;
+                for (j = 0; j < MAXPLAYERS; j++)
+                {
+                    numplayers += playeringame[j];
+                }
+                CT_AddChar(i, 0);       // set the end of message character
+                if (numplayers > 2)
+                {
+                    M_StringCopy(plr_lastmsg[i], DEH_String(CT_FromPlrText[i]),
+                                 sizeof(plr_lastmsg[i]));
+                    M_StringConcat(plr_lastmsg[i], chat_msg[i],
+                                   sizeof(plr_lastmsg[i]));
+                }
+                else
+                {
+                    M_StringCopy(plr_lastmsg[i], chat_msg[i],
+                                 sizeof(plr_lastmsg[i]));
+                }
+                if (i != consoleplayer && (chat_dest[i] == consoleplayer + 1
+                                           || chat_dest[i] == CT_PLR_ALL)
+                    && *chat_msg[i])
+                {
+                    P_SetMessage(&players[consoleplayer], plr_lastmsg[i],
+                                 true);
+                    S_StartSound(NULL, sfx_chat);
+                }
+                else if (i == consoleplayer && (*chat_msg[i]))
+                {
+                    if (numplayers > 1)
+                    {
+                        P_SetMessage(&players[consoleplayer],
+                                     DEH_String("-MESSAGE SENT-"), true);
+                        S_StartSound(NULL, sfx_chat);
+                    }
+                    else
+                    {
+                        P_SetMessage(&players[consoleplayer],
+                                     DEH_String("THERE ARE NO OTHER PLAYERS IN THE GAME!"),
+                                     true);
+                        S_StartSound(NULL, sfx_chat);
+                    }
+                }
+                CT_ClearChatMessage(i);
+            }
+            else if (c == KEY_BACKSPACE)
+            {
+                CT_BackSpace(i);
+            }
+            else
+            {
+                CT_AddChar(i, c);
+            }
+        }
+    }
+    return;
+}
+
+//===========================================================================
+//
+// CT_Drawer
+//
+//===========================================================================
+
+void CT_Drawer(void)
+{
+    int i;
+    int x;
+    patch_t *patch;
+
+    if (chatmodeon)
+    {
+        x = 25;
+        for (i = 0; i < msgptr[consoleplayer]; i++)
+        {
+            if (chat_msg[consoleplayer][i] < 33)
+            {
+                x += 6;
+            }
+            else
+            {
+                patch = W_CacheLumpNum(FontABaseLump +
+                                       chat_msg[consoleplayer][i] - 33,
+                                       PU_CACHE);
+                V_DrawPatch(x, 10, patch);
+                x += patch->width;
+            }
+        }
+        V_DrawPatch(x, 10, W_CacheLumpName(DEH_String("FONTA59"), PU_CACHE));
+        BorderTopRefresh = true;
+        UpdateState |= I_MESSAGES;
+    }
+}
+
+//===========================================================================
+//
+// CT_queueChatChar
+//
+//===========================================================================
+
+void CT_queueChatChar(char ch)
+{
+    if (((tail + 1) & (QUEUESIZE - 1)) == head)
+    {                           // the queue is full
+        return;
+    }
+    ChatQueue[tail] = ch;
+    tail = (tail + 1) & (QUEUESIZE - 1);
+}
+
+//===========================================================================
+//
+// CT_dequeueChatChar
+//
+//===========================================================================
+
+char CT_dequeueChatChar(void)
+{
+    byte temp;
+
+    if (head == tail)
+    {                           // queue is empty
+        return 0;
+    }
+    temp = ChatQueue[head];
+    head = (head + 1) & (QUEUESIZE - 1);
+    return temp;
+}
+
+//===========================================================================
+//
+// CT_AddChar
+//
+//===========================================================================
+
+void CT_AddChar(int player, char c)
+{
+    patch_t *patch;
+
+    if (msgptr[player] + 1 >= MESSAGESIZE || msglen[player] >= MESSAGELEN)
+    {                           // full.
+        return;
+    }
+    chat_msg[player][msgptr[player]] = c;
+    msgptr[player]++;
+    if (c < 33)
+    {
+        msglen[player] += 6;
+    }
+    else
+    {
+        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        msglen[player] += patch->width;
+    }
+}
+
+//===========================================================================
+//
+// CT_BackSpace
+//
+//      Backs up a space, when the user hits (obviously) backspace
+//===========================================================================
+
+void CT_BackSpace(int player)
+{
+    patch_t *patch;
+    char c;
+
+    if (msgptr[player] == 0)
+    {                           // message is already blank
+        return;
+    }
+    msgptr[player]--;
+    c = chat_msg[player][msgptr[player]];
+    if (c < 33)
+    {
+        msglen[player] -= 6;
+    }
+    else
+    {
+        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        msglen[player] -= patch->width;
+    }
+    chat_msg[player][msgptr[player]] = 0;
+}
+
+//===========================================================================
+//
+// CT_ClearChatMessage
+//
+//      Clears out the data for the chat message, but the player's message
+//              is still saved in plrmsg.
+//===========================================================================
+
+void CT_ClearChatMessage(int player)
+{
+    memset(chat_msg[player], 0, MESSAGESIZE);
+    msgptr[player] = 0;
+    msglen[player] = 0;
+}
diff --git a/games/NXDoom/src/heretic/ct_chat.h b/games/NXDoom/src/heretic/ct_chat.h
new file mode 100644
index 000000000..75aaab270
--- /dev/null
+++ b/games/NXDoom/src/heretic/ct_chat.h
@@ -0,0 +1,38 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Chat mode stuff
+//
+
+#ifndef HERETIC_CT_CHAT_H
+#define HERETIC_CT_CHAT_H
+
+#define CT_PLR_GREEN	1
+#define CT_PLR_YELLOW	2
+#define CT_PLR_RED		3
+#define CT_PLR_BLUE		4
+#define CT_PLR_ALL		5
+
+#define CT_KEY_GREEN	'g'
+#define CT_KEY_YELLOW	'y'
+#define CT_KEY_RED		'r'
+#define CT_KEY_BLUE		'b'
+#define CT_KEY_ALL		't'
+
+extern char *chat_macros[10];
+
+#endif /* #ifndef HERETIC_CT_CHAT_H */
+
diff --git a/games/NXDoom/src/heretic/d_main.c b/games/NXDoom/src/heretic/d_main.c
new file mode 100644
index 000000000..9090df83a
--- /dev/null
+++ b/games/NXDoom/src/heretic/d_main.c
@@ -0,0 +1,1171 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// D_main.c
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "txt_main.h"
+#include "txt_io.h"
+
+#include "net_client.h"
+
+#include "config.h"
+#include "ct_chat.h"
+#include "doomdef.h"
+#include "deh_main.h"
+#include "d_iwad.h"
+#include "i_endoom.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "w_main.h"
+#include "v_video.h"
+#include "am_map.h"
+
+#include "heretic_icon.c"
+
+#define CT_KEY_GREEN    'g'
+#define CT_KEY_YELLOW   'y'
+#define CT_KEY_RED      'r'
+#define CT_KEY_BLUE     'b'
+
+#define STARTUP_WINDOW_X 17
+#define STARTUP_WINDOW_Y 7
+
+GameMode_t gamemode = indetermined;
+const char *gamedescription = "unknown";
+
+boolean nomonsters;             // checkparm of -nomonsters
+boolean respawnparm;            // checkparm of -respawn
+boolean debugmode;              // checkparm of -debug
+boolean ravpic;                 // checkparm of -ravpic
+boolean cdrom;                  // true if cd-rom mode active
+boolean noartiskip;             // whether shift-enter skips an artifact
+
+skill_t startskill;
+int startepisode;
+int startmap;
+int UpdateState;
+static int graphical_startup = 1;
+static boolean using_graphical_startup;
+static boolean main_loop_started = false;
+boolean autostart;
+
+boolean advancedemo;
+
+FILE *debugfile;
+
+static int show_endoom = 1;
+
+void D_ConnectNetGame(void);
+void D_CheckNetGame(void);
+void D_PageDrawer(void);
+void D_AdvanceDemo(void);
+boolean F_Responder(event_t * ev);
+
+//---------------------------------------------------------------------------
+//
+// PROC D_ProcessEvents
+//
+// Send all the events of the given timestamp down the responder chain.
+//
+//---------------------------------------------------------------------------
+
+void D_ProcessEvents(void)
+{
+    event_t *ev;
+
+    while ((ev = D_PopEvent()) != NULL)
+    {
+        if (F_Responder(ev))
+        {
+            continue;
+        }
+        if (MN_Responder(ev))
+        {
+            continue;
+        }
+        G_Responder(ev);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawMessage
+//
+//---------------------------------------------------------------------------
+
+void DrawMessage(void)
+{
+    player_t *player;
+
+    player = &players[consoleplayer];
+    if (player->messageTics <= 0 || !player->message)
+    {                           // No message
+        return;
+    }
+    MN_DrTextA(player->message, 160 - MN_TextAWidth(player->message) / 2, 1);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC D_Display
+//
+// Draw current display, possibly wiping it from the previous.
+//
+//---------------------------------------------------------------------------
+
+
+void D_Display(void)
+{
+    // Change the view size if needed
+    if (setsizeneeded)
+    {
+        R_ExecuteSetViewSize();
+    }
+
+//
+// do buffered drawing
+//
+    switch (gamestate)
+    {
+        case GS_LEVEL:
+            if (!gametic)
+                break;
+            if (automapactive)
+                AM_Drawer();
+            else
+                R_RenderPlayerView(&players[displayplayer]);
+            CT_Drawer();
+            UpdateState |= I_FULLVIEW;
+            SB_Drawer();
+            break;
+        case GS_INTERMISSION:
+            IN_Drawer();
+            break;
+        case GS_FINALE:
+            F_Drawer();
+            break;
+        case GS_DEMOSCREEN:
+            D_PageDrawer();
+            break;
+    }
+
+    if (testcontrols)
+    {
+        V_DrawMouseSpeedBox(testcontrols_mousespeed);
+    }
+
+    if (paused && !MenuActive && !askforquit)
+    {
+        if (!netgame)
+        {
+            V_DrawPatch(160, viewwindowy + 5, W_CacheLumpName(DEH_String("PAUSED"),
+                                                              PU_CACHE));
+        }
+        else
+        {
+            V_DrawPatch(160, 70, W_CacheLumpName(DEH_String("PAUSED"), PU_CACHE));
+        }
+    }
+    // Handle player messages
+    DrawMessage();
+
+    // Menu drawing
+    MN_Drawer();
+
+    // Send out any new accumulation
+    NetUpdate();
+
+    // Flush buffered stuff to screen
+    I_FinishUpdate();
+}
+
+//
+// D_GrabMouseCallback
+//
+// Called to determine whether to grab the mouse pointer
+//
+
+boolean D_GrabMouseCallback(void)
+{
+    // when menu is active or game is paused, release the mouse
+
+    if (MenuActive || paused)
+        return false;
+
+    // only grab mouse when playing levels (but not demos)
+
+    return (gamestate == GS_LEVEL) && !demoplayback && !advancedemo;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC D_DoomLoop
+//
+//---------------------------------------------------------------------------
+
+void D_DoomLoop(void)
+{
+    if (M_CheckParm("-debugfile"))
+    {
+        char filename[20];
+        M_snprintf(filename, sizeof(filename), "debug%i.txt", consoleplayer);
+        debugfile = M_fopen(filename, "w");
+    }
+    I_GraphicsCheckCommandLine();
+    I_SetGrabMouseCallback(D_GrabMouseCallback);
+    I_RegisterWindowIcon(heretic_icon_data, heretic_icon_w, heretic_icon_h);
+    I_InitGraphics();
+
+    main_loop_started = true;
+
+    while (1)
+    {
+        // Frame syncronous IO operations
+        I_StartFrame();
+
+        // Process one or more tics
+        // Will run at least one tic
+        TryRunTics();
+
+        // Move positional sounds
+        S_UpdateSounds(players[consoleplayer].mo);
+        D_Display();
+    }
+}
+
+/*
+===============================================================================
+
+						DEMO LOOP
+
+===============================================================================
+*/
+
+static int demosequence;
+static int pagetic;
+static const char *pagename;
+
+
+/*
+================
+=
+= D_PageTicker
+=
+= Handles timing for warped projection
+=
+================
+*/
+
+void D_PageTicker(void)
+{
+    if (--pagetic < 0)
+        D_AdvanceDemo();
+}
+
+
+/*
+================
+=
+= D_PageDrawer
+=
+================
+*/
+
+void D_PageDrawer(void)
+{
+    V_DrawRawScreen(W_CacheLumpName(pagename, PU_CACHE));
+    if (demosequence == 1)
+    {
+        V_DrawPatch(4, 160, W_CacheLumpName(DEH_String("ADVISOR"), PU_CACHE));
+    }
+    UpdateState |= I_FULLSCRN;
+}
+
+/*
+=================
+=
+= D_AdvanceDemo
+=
+= Called after each demo or intro demosequence finishes
+=================
+*/
+
+void D_AdvanceDemo(void)
+{
+    advancedemo = true;
+}
+
+void D_DoAdvanceDemo(void)
+{
+    players[consoleplayer].playerstate = PST_LIVE;      // don't reborn
+    advancedemo = false;
+    usergame = false;           // can't save / end game here
+    paused = false;
+    gameaction = ga_nothing;
+    demosequence = (demosequence + 1) % 7;
+    switch (demosequence)
+    {
+        case 0:
+            pagetic = 210;
+            gamestate = GS_DEMOSCREEN;
+            pagename = DEH_String("TITLE");
+            S_StartSong(mus_titl, false);
+            break;
+        case 1:
+            pagetic = 140;
+            gamestate = GS_DEMOSCREEN;
+            pagename = DEH_String("TITLE");
+            break;
+        case 2:
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            G_DeferedPlayDemo(DEH_String("demo1"));
+            break;
+        case 3:
+            pagetic = 200;
+            gamestate = GS_DEMOSCREEN;
+            pagename = DEH_String("CREDIT");
+            break;
+        case 4:
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            G_DeferedPlayDemo(DEH_String("demo2"));
+            break;
+        case 5:
+            pagetic = 200;
+            gamestate = GS_DEMOSCREEN;
+            if (gamemode == shareware)
+            {
+                pagename = DEH_String("ORDER");
+            }
+            else
+            {
+                pagename = DEH_String("CREDIT");
+            }
+            break;
+        case 6:
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            G_DeferedPlayDemo(DEH_String("demo3"));
+            break;
+    }
+}
+
+
+/*
+=================
+=
+= D_StartTitle
+=
+=================
+*/
+
+void D_StartTitle(void)
+{
+    gameaction = ga_nothing;
+    demosequence = -1;
+    D_AdvanceDemo();
+}
+
+
+/*
+==============
+=
+= D_CheckRecordFrom
+=
+= -recordfrom <save-num> <demo-name>
+==============
+*/
+
+void D_CheckRecordFrom(void)
+{
+    int p;
+    char *filename;
+
+    //!
+    // @vanilla
+    // @category demo
+    // @arg <save-num> <demo-name>
+    //
+    // Load a game from the given savegame slot and record a demo from
+    // it.  Equivalent to -loadgame <save-num> -record <demo-name>.
+
+    p = M_CheckParmWithArgs("-recordfrom", 2);
+    if (!p)
+        return;
+
+    filename = SV_Filename(myargv[p + 1][0] - '0');
+    G_LoadGame(filename);
+    G_DoLoadGame();             // load the gameskill etc info from savegame
+
+    G_RecordDemo(gameskill, 1, gameepisode, gamemap, myargv[p + 2]);
+    D_DoomLoop();               // never returns
+    free(filename);
+}
+
+/*
+===============
+=
+= D_AddFile
+=
+===============
+*/
+
+// MAPDIR should be defined as the directory that holds development maps
+// for the -wart # # command
+
+#define MAPDIR "\\data\\"
+
+#define SHAREWAREWADNAME "heretic1.wad"
+
+char *iwadfile;
+
+
+void wadprintf(void)
+{
+    if (debugmode)
+    {
+        return;
+    }
+}
+
+boolean D_AddFile(char *file)
+{
+    wad_file_t *handle;
+
+    printf("  adding %s\n", file);
+
+    handle = W_AddFile(file);
+
+    return handle != NULL;
+}
+
+//==========================================================
+//
+//  Startup Thermo code
+//
+//==========================================================
+#define MSG_Y       9
+#define THERM_X     14
+#define THERM_Y     14
+
+int thermMax;
+int thermCurrent;
+char smsg[80];                  // status bar line
+
+//
+//  Heretic startup screen shit
+//
+
+static int startup_line = STARTUP_WINDOW_Y;
+
+void hprintf(const char *string)
+{
+    if (using_graphical_startup)
+    {
+        TXT_BGColor(TXT_COLOR_CYAN, 0);
+        TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+        TXT_GotoXY(STARTUP_WINDOW_X, startup_line);
+        ++startup_line;
+        TXT_Puts(string);
+
+        TXT_UpdateScreen();
+    }
+
+    // haleyjd: shouldn't be WATCOMC-only
+    if (debugmode)
+        puts(string);
+}
+
+void drawstatus(void)
+{
+    int i;
+
+    TXT_GotoXY(1, 24);
+    TXT_BGColor(TXT_COLOR_BLUE, 0);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    for (i=0; smsg[i] != '\0'; ++i) 
+    {
+        TXT_PutChar(smsg[i]);
+    }
+}
+
+static void status(const char *string)
+{
+    if (using_graphical_startup)
+    {
+        M_StringConcat(smsg, string, sizeof(smsg));
+        drawstatus();
+    }
+}
+
+void DrawThermo(void)
+{
+    static int last_progress = -1;
+    int progress;
+    int i;
+
+    if (!using_graphical_startup)
+    {
+        return;
+    }
+
+    // No progress? Don't update the screen.
+
+    progress = (50 * thermCurrent) / thermMax + 2;
+
+    if (last_progress == progress)
+    {
+        return;
+    }
+
+    last_progress = progress;
+
+    TXT_GotoXY(THERM_X, THERM_Y);
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_GREEN);
+    TXT_BGColor(TXT_COLOR_GREEN, 0);
+
+    for (i = 0; i < progress; i++)
+    {
+        TXT_PutChar(0xdb);
+    }
+
+    TXT_UpdateScreen();
+}
+
+void initStartup(void)
+{
+    byte *textScreen;
+    byte *loading;
+
+    if (!graphical_startup || debugmode || testcontrols)
+    {
+        using_graphical_startup = false;
+        return;
+    }
+
+    if (!TXT_Init()) 
+    {
+        using_graphical_startup = false;
+        return;
+    }
+
+    I_InitWindowTitle();
+    I_InitWindowIcon();
+
+    // Blit main screen
+    textScreen = TXT_GetScreenData();
+    loading = W_CacheLumpName(DEH_String("LOADING"), PU_CACHE);
+    memcpy(textScreen, loading, 4000);
+
+    // Print version string
+
+    TXT_BGColor(TXT_COLOR_RED, 0);
+    TXT_FGColor(TXT_COLOR_YELLOW);
+    TXT_GotoXY(46, 2);
+    TXT_Puts(HERETIC_VERSION_TEXT);
+
+    TXT_UpdateScreen();
+
+    using_graphical_startup = true;
+}
+
+static void finishStartup(void)
+{
+    if (using_graphical_startup)
+    {
+        TXT_Shutdown();
+    }
+}
+
+char tmsg[300];
+void tprintf(const char *msg, int initflag)
+{
+    printf("%s", msg);
+}
+
+// haleyjd: moved up, removed WATCOMC code
+void CleanExit(void)
+{
+    DEH_printf("Exited from HERETIC.\n");
+    exit(1);
+}
+
+void CheckAbortStartup(void)
+{
+    // haleyjd: removed WATCOMC
+    // haleyjd FIXME: this should actually work in text mode too, but how to
+    // get input before SDL video init?
+    if(using_graphical_startup)
+    {
+        if(TXT_GetChar() == 27)
+            CleanExit();
+    }
+}
+
+void IncThermo(void)
+{
+    thermCurrent++;
+    DrawThermo();
+    CheckAbortStartup();
+}
+
+void InitThermo(int max)
+{
+    thermMax = max;
+    thermCurrent = 0;
+}
+
+//
+// Add configuration file variable bindings.
+//
+
+void D_BindVariables(void)
+{
+    int i;
+
+    M_ApplyPlatformDefaults();
+
+    I_BindInputVariables();
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
+
+    M_BindBaseControls();
+    M_BindHereticControls();
+    M_BindWeaponControls();
+    M_BindChatControls(MAXPLAYERS);
+
+    key_multi_msgplayer[0] = CT_KEY_GREEN;
+    key_multi_msgplayer[1] = CT_KEY_YELLOW;
+    key_multi_msgplayer[2] = CT_KEY_RED;
+    key_multi_msgplayer[3] = CT_KEY_BLUE;
+
+    M_BindMenuControls();
+    M_BindMapControls();
+
+    NET_BindVariables();
+
+    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
+    M_BindIntVariable("sfx_volume",             &snd_MaxVolume);
+    M_BindIntVariable("music_volume",           &snd_MusicVolume);
+    M_BindIntVariable("screenblocks",           &screenblocks);
+    M_BindIntVariable("snd_channels",           &snd_Channels);
+    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
+    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
+    M_BindIntVariable("show_endoom",            &show_endoom);
+    M_BindIntVariable("graphical_startup",      &graphical_startup);
+
+    for (i=0; i<10; ++i)
+    {
+        char buf[12];
+
+        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
+        M_BindStringVariable(buf, &chat_macros[i]);
+    }
+}
+
+// 
+// Called at exit to display the ENDOOM screen (ENDTEXT in Heretic)
+//
+
+static void D_Endoom(void)
+{
+    byte *endoom_data;
+
+    // Disable ENDOOM?
+
+    if (!show_endoom || testcontrols || !main_loop_started)
+    {
+        return;
+    }
+
+    endoom_data = W_CacheLumpName(DEH_String("ENDTEXT"), PU_STATIC);
+
+    I_Endoom(endoom_data);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC D_DoomMain
+//
+//---------------------------------------------------------------------------
+
+void D_DoomMain(void)
+{
+    GameMission_t gamemission;
+    int p;
+    char file[256];
+    char demolumpname[9];
+
+    I_PrintBanner(PACKAGE_STRING);
+
+    I_AtExit(D_Endoom, false);
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Disable monsters.
+    //
+
+    nomonsters = M_ParmExists("-nomonsters");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Monsters respawn after being killed.
+    //
+
+    respawnparm = M_ParmExists("-respawn");
+
+    //!
+    // @vanilla
+    //
+    // Take screenshots when F1 is pressed.
+    //
+
+    ravpic = M_ParmExists("-ravpic");
+
+    //!
+    // @category obscure
+    // @vanilla
+    //
+    // Allow artifacts to be used when the run key is held down.
+    //
+
+    noartiskip = M_ParmExists("-noartiskip");
+
+    debugmode = M_ParmExists("-debug");
+    startskill = sk_medium;
+    startepisode = 1;
+    startmap = 1;
+    autostart = false;
+
+//
+// get skill / episode / map from parms
+//
+
+    //!
+    // @vanilla
+    // @category net
+    //
+    // Start a deathmatch game.
+    //
+
+    if (M_ParmExists("-deathmatch"))
+    {
+        deathmatch = true;
+    }
+
+    //!
+    // @category game
+    // @arg <skill>
+    // @vanilla
+    //
+    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
+    // 0 disables all monsters.
+    //
+
+    p = M_CheckParmWithArgs("-skill", 1);
+    if (p)
+    {
+        startskill = myargv[p + 1][0] - '1';
+        autostart = true;
+    }
+
+    //!
+    // @category game
+    // @arg <n>
+    // @vanilla
+    //
+    // Start playing episode n (1-4).
+    //
+
+    p = M_CheckParmWithArgs("-episode", 1);
+    if (p)
+    {
+        startepisode = myargv[p + 1][0] - '0';
+        startmap = 1;
+        autostart = true;
+    }
+
+    //!
+    // @category game
+    // @arg <x> <y>
+    // @vanilla
+    //
+    // Start a game immediately, warping to level ExMy.
+    //
+
+    p = M_CheckParmWithArgs("-warp", 2);
+    if (p && p < myargc - 2)
+    {
+        startepisode = myargv[p + 1][0] - '0';
+        startmap = myargv[p + 2][0] - '0';
+        autostart = true;
+    }
+
+//
+// init subsystems
+//
+    DEH_printf("V_Init: allocate screens.\n");
+    V_Init();
+
+    // Check for -CDROM
+
+    cdrom = false;
+
+#ifdef _WIN32
+
+    //!
+    // @category obscure
+    // @platform windows
+    // @vanilla
+    //
+    // Save configuration data and savegames in c:\heretic.cd,
+    // allowing play from CD.
+    //
+
+    if (M_CheckParm("-cdrom"))
+    {
+        cdrom = true;
+    }
+#endif
+
+    if (cdrom)
+    {
+        M_SetConfigDir(DEH_String("c:\\heretic.cd"));
+    }
+    else
+    {
+        M_SetConfigDir(NULL);
+    }
+
+    // Load defaults before initing other systems
+    DEH_printf("M_LoadDefaults: Load system defaults.\n");
+    D_BindVariables();
+    M_SetConfigFilenames("heretic.cfg", PROGRAM_PREFIX "heretic.cfg");
+    M_LoadDefaults();
+
+    I_AtExit(M_SaveDefaults, false);
+
+    DEH_printf("Z_Init: Init zone memory allocation daemon.\n");
+    Z_Init();
+
+    DEH_printf("W_Init: Init WADfiles.\n");
+
+    iwadfile = D_FindIWAD(IWAD_MASK_HERETIC, &gamemission);
+
+    if (iwadfile == NULL)
+    {
+        I_Error("Game mode indeterminate. No IWAD was found. Try specifying\n"
+                "one with the '-iwad' command line parameter.");
+    }
+
+    D_AddFile(iwadfile);
+    W_CheckCorrectIWAD(heretic);
+
+    //!
+    // @category mod
+    //
+    // Disable auto-loading of .wad files.
+    //
+    if (!M_ParmExists("-noautoload"))
+    {
+        char *autoload_dir;
+        autoload_dir = M_GetAutoloadDir("heretic.wad");
+        if (autoload_dir != NULL)
+        {
+            DEH_AutoLoadPatches(autoload_dir);
+            W_AutoLoadWADs(autoload_dir);
+            free(autoload_dir);
+        }
+    }
+
+    // Load dehacked patches specified on the command line.
+    DEH_ParseCommandLine();
+
+    // Load PWAD files.
+    W_ParseCommandLine();
+
+    //!
+    // @arg <demo>
+    // @category demo
+    // @vanilla
+    //
+    // Play back the demo named demo.lmp.
+    //
+
+    p = M_CheckParmWithArgs("-playdemo", 1);
+    if (!p)
+    {
+        //!
+        // @arg <demo>
+        // @category demo
+        // @vanilla
+        //
+        // Play back the demo named demo.lmp, determining the framerate
+        // of the screen.
+        //
+
+        p = M_CheckParmWithArgs("-timedemo", 1);
+    }
+
+    if (p)
+    {
+        char *uc_filename = strdup(myargv[p + 1]);
+        M_ForceUppercase(uc_filename);
+
+        // In Vanilla, the filename must be specified without .lmp,
+        // but make that optional.
+        if (M_StringEndsWith(uc_filename, ".LMP"))
+        {
+            M_StringCopy(file, myargv[p + 1], sizeof(file));
+        }
+        else
+        {
+            DEH_snprintf(file, sizeof(file), "%s.lmp", myargv[p + 1]);
+        }
+
+        free(uc_filename);
+
+        if (D_AddFile(file))
+        {
+            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
+                         sizeof(demolumpname));
+        }
+        else
+        {
+            // The file failed to load, but copy the original arg as a
+            // demo name to make tricks like -playdemo demo1 possible.
+            M_StringCopy(demolumpname, myargv[p + 1], sizeof(demolumpname));
+        }
+
+        printf("Playing demo %s.\n", file);
+    }
+
+    // Generate the WAD hash table.  Speed things up a bit.
+    W_GenerateHashTable();
+
+    //!
+    // @category demo
+    //
+    // Record or playback a demo without automatically quitting
+    // after either level exit or player respawn.
+    //
+
+    demoextend = M_ParmExists("-demoextend");
+
+    if (W_CheckNumForName(DEH_String("E2M1")) == -1)
+    {
+        gamemode = shareware;
+        gamedescription = "Heretic (shareware)";
+    }
+    else if (W_CheckNumForName("EXTENDED") != -1)
+    {
+        // Presence of the EXTENDED lump indicates the retail version
+
+        gamemode = retail;
+        gamedescription = "Heretic: Shadow of the Serpent Riders";
+    }
+    else
+    {
+        gamemode = registered;
+        gamedescription = "Heretic (registered)";
+    }
+
+    I_SetWindowTitle(gamedescription);
+
+    savegamedir = M_GetSaveGameDir("heretic.wad");
+
+    I_PrintStartupBanner(gamedescription);
+
+    if (M_ParmExists("-testcontrols"))
+    {
+        startepisode = 1;
+        startmap = 1;
+        autostart = true;
+        testcontrols = true;
+    }
+
+    I_InitTimer();
+    I_InitSound(heretic);
+    I_InitMusic();
+
+    tprintf("NET_Init: Init network subsystem.\n", 1);
+    NET_Init ();
+
+    D_ConnectNetGame();
+
+    // haleyjd: removed WATCOMC
+    initStartup();
+
+    //
+    //  Build status bar line!
+    //
+    smsg[0] = 0;
+    if (deathmatch)
+        status(DEH_String("DeathMatch..."));
+    if (nomonsters)
+        status(DEH_String("No Monsters..."));
+    if (respawnparm)
+        status(DEH_String("Respawning..."));
+    if (autostart)
+    {
+        char temp[64];
+        DEH_snprintf(temp, sizeof(temp),
+                     "Warp to Episode %d, Map %d, Skill %d ",
+                     startepisode, startmap, startskill + 1);
+        status(temp);
+    }
+    wadprintf();                // print the added wadfiles
+
+    tprintf(DEH_String("MN_Init: Init menu system.\n"), 1);
+    MN_Init();
+
+    CT_Init();
+
+    tprintf(DEH_String("R_Init: Init Heretic refresh daemon."), 1);
+    hprintf(DEH_String("Loading graphics"));
+    R_Init();
+    tprintf("\n", 0);
+
+    tprintf(DEH_String("P_Init: Init Playloop state.\n"), 1);
+    hprintf(DEH_String("Init game engine."));
+    P_Init();
+    IncThermo();
+
+    tprintf(DEH_String("I_Init: Setting up machine state.\n"), 1);
+    I_CheckIsScreensaver();
+    I_InitJoystick();
+    IncThermo();
+
+    tprintf(DEH_String("S_Init: Setting up sound.\n"), 1);
+    S_Init();
+    //IO_StartupTimer();
+    S_Start();
+
+    tprintf(DEH_String("D_CheckNetGame: Checking network game status.\n"), 1);
+    hprintf(DEH_String("Checking network game status."));
+    D_CheckNetGame();
+    IncThermo();
+
+    // haleyjd: removed WATCOMC
+
+    tprintf(DEH_String("SB_Init: Loading patches.\n"), 1);
+    SB_Init();
+    IncThermo();
+
+//
+// start the appropriate game based on params
+//
+
+    D_CheckRecordFrom();
+
+    //!
+    // @arg <x>
+    // @category demo
+    // @vanilla
+    //
+    // Record a demo named x.lmp.
+    //
+
+    p = M_CheckParmWithArgs("-record", 1);
+    if (p)
+    {
+        G_RecordDemo(startskill, 1, startepisode, startmap, myargv[p + 1]);
+        D_DoomLoop();           // Never returns
+    }
+
+    p = M_CheckParmWithArgs("-playdemo", 1);
+    if (p)
+    {
+        singledemo = true;      // Quit after one demo
+        G_DeferedPlayDemo(demolumpname);
+        D_DoomLoop();           // Never returns
+    }
+
+    p = M_CheckParmWithArgs("-timedemo", 1);
+    if (p)
+    {
+        G_TimeDemo(demolumpname);
+        D_DoomLoop();           // Never returns
+    }
+
+    //!
+    // @category game
+    // @arg <s>
+    // @vanilla
+    //
+    // Load the game in savegame slot s.
+    //
+
+    p = M_CheckParmWithArgs("-loadgame", 1);
+    if (p && p < myargc - 1)
+    {
+        char *filename;
+
+	filename = SV_Filename(myargv[p + 1][0] - '0');
+        G_LoadGame(filename);
+	free(filename);
+    }
+
+    // Check valid episode and map
+    if (autostart || netgame)
+    {
+        if (!D_ValidEpisodeMap(heretic, gamemode, startepisode, startmap))
+        {
+            startepisode = 1;
+            startmap = 1;
+        }
+    }
+
+    if (gameaction != ga_loadgame)
+    {
+        UpdateState |= I_FULLSCRN;
+        BorderNeedRefresh = true;
+        if (autostart || netgame)
+        {
+            G_InitNew(startskill, startepisode, startmap);
+        }
+        else
+        {
+            D_StartTitle();
+        }
+    }
+
+    finishStartup();
+
+    D_DoomLoop();               // Never returns
+}
diff --git a/games/NXDoom/src/heretic/d_net.c b/games/NXDoom/src/heretic/d_net.c
new file mode 100644
index 000000000..8aef319fe
--- /dev/null
+++ b/games/NXDoom/src/heretic/d_net.c
@@ -0,0 +1,218 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM Network game communication and protocol,
+//	all OS independend parts.
+//
+
+#include <stdlib.h>
+
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "doomdef.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "w_checksum.h"
+
+#include "deh_main.h"
+
+#include "d_loop.h"
+
+ticcmd_t *netcmds;
+
+
+// Called when a player leaves the game
+
+static void PlayerQuitGame(player_t *player)
+{
+    static char exitmsg[80];
+    unsigned int player_num;
+
+    player_num = player - players;
+
+    // Note:
+    // The Heretic source code does this, which doesn't actually work.
+    // As a result, the exit message is never seen.
+
+    M_StringCopy(exitmsg, "PLAYER 1 LEFT THE GAME", sizeof(exitmsg));
+    exitmsg[7] += player_num;
+    players[consoleplayer].message = exitmsg;
+
+    playeringame[player_num] = false;
+    players[consoleplayer].message = exitmsg;
+
+    // TODO: check if it is sensible to do this:
+
+    if (demorecording) 
+    {
+        G_CheckDemoStatus ();
+    }
+}
+
+static void RunTic(ticcmd_t *cmds, boolean *ingame)
+{
+    unsigned int i;
+
+    // Check for player quits.
+
+    for (i = 0; i < MAXPLAYERS; ++i)
+    {
+        if (!demoplayback && playeringame[i] && !ingame[i])
+        {
+            PlayerQuitGame(&players[i]);
+        }
+    }
+
+    netcmds = cmds;
+
+    // check that there are players in the game.  if not, we cannot
+    // run a tic.
+
+    if (advancedemo)
+        D_DoAdvanceDemo ();
+
+    G_Ticker ();
+}
+
+static loop_interface_t doom_loop_interface = {
+    D_ProcessEvents,
+    G_BuildTiccmd,
+    RunTic,
+    MN_Ticker
+};
+
+
+// Load game settings from the specified structure and 
+// set global variables.
+
+static void LoadGameSettings(net_gamesettings_t *settings)
+{
+    unsigned int i;
+
+    deathmatch = settings->deathmatch;
+    ticdup = settings->ticdup;
+    startepisode = settings->episode;
+    startmap = settings->map;
+    startskill = settings->skill;
+    // TODO startloadgame = settings->loadgame;
+    lowres_turn = settings->lowres_turn;
+    nomonsters = settings->nomonsters;
+    respawnparm = settings->respawn_monsters;
+    consoleplayer = settings->consoleplayer;
+
+    if (lowres_turn)
+    {
+        printf("NOTE: Turning resolution is reduced; this is probably "
+               "because there is a client recording a Vanilla demo.\n");
+    }
+
+    for (i = 0; i < MAXPLAYERS; ++i)
+    {
+        playeringame[i] = i < settings->num_players;
+    }
+}
+
+// Save the game settings from global variables to the specified
+// game settings structure.
+
+static void SaveGameSettings(net_gamesettings_t *settings)
+{
+    // Fill in game settings structure with appropriate parameters
+    // for the new game
+
+    settings->deathmatch = deathmatch;
+    settings->episode = startepisode;
+    settings->map = startmap;
+    settings->skill = startskill;
+    // TODO settings->loadgame = startloadgame;
+    settings->gameversion = exe_heretic_1_3;
+    settings->nomonsters = nomonsters;
+    settings->respawn_monsters = respawnparm;
+    settings->timelimit = 0;
+
+    settings->lowres_turn = M_ParmExists("-record")
+                         && !M_ParmExists("-longtics");
+}
+
+static void InitConnectData(net_connect_data_t *connect_data)
+{
+    connect_data->drone = false;
+    connect_data->max_players = MAXPLAYERS;
+
+    //
+    // Connect data
+    //
+
+    // Game type fields:
+
+    connect_data->gamemode = gamemode;
+    connect_data->gamemission = heretic;
+
+    // Are we recording a demo? Possibly set lowres turn mode
+
+    connect_data->lowres_turn = M_ParmExists("-record")
+                             && !M_ParmExists("-longtics");
+
+    // Read checksums of our WAD directory and dehacked information
+
+    W_Checksum(connect_data->wad_sha1sum);
+    DEH_Checksum(connect_data->deh_sha1sum);
+
+    connect_data->is_freedoom = 0;
+}
+
+void D_ConnectNetGame(void)
+{
+    net_connect_data_t connect_data;
+
+    InitConnectData(&connect_data);
+    netgame = D_InitNetGame(&connect_data);
+
+    //!
+    // @category net
+    //
+    // Start the game playing as though in a netgame with a single
+    // player.  This can also be used to play back single player netgame
+    // demos.
+    //
+
+    if (M_CheckParm("-solo-net") > 0)
+    {
+        netgame = true;
+    }
+}
+
+//
+// D_CheckNetGame
+// Works out player numbers among the net participants
+//
+
+void D_CheckNetGame (void)
+{
+    net_gamesettings_t settings;
+
+    D_RegisterLoopCallbacks(&doom_loop_interface);
+
+    if (netgame)
+    {
+        autostart = true;
+    }
+
+    SaveGameSettings(&settings);
+    D_StartNetGame(&settings, NULL);
+    LoadGameSettings(&settings);
+}
+
diff --git a/games/NXDoom/src/heretic/deh_ammo.c b/games/NXDoom/src/heretic/deh_ammo.c
new file mode 100644
index 000000000..39384d75d
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_ammo.c
@@ -0,0 +1,113 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Ammo" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomdef.h"
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "p_local.h"
+
+static void *DEH_AmmoStart(deh_context_t *context, char *line)
+{
+    int ammo_number = 0;
+
+    if (sscanf(line, "Ammo %i", &ammo_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (ammo_number < 0 || ammo_number >= NUMAMMO)
+    {
+        DEH_Warning(context, "Invalid ammo number: %i", ammo_number);
+        return NULL;
+    }
+
+    return &maxammo[ammo_number];
+}
+
+static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    int ivalue;
+    int ammo_number;
+
+    if (tag == NULL)
+        return;
+
+    ammo_number = ((int *) tag) - maxammo;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    if (!strcasecmp(variable_name, "Per ammo"))
+    {
+        // Heretic doesn't have a "per clip" ammo array, instead
+        // it is per weapon.  However, the weapon number lines
+        // up with the ammo number if we add one.
+
+        GetWeaponAmmo[ammo_number + 1] = ivalue;
+    }
+    else if (!strcasecmp(variable_name, "Max ammo"))
+    {
+        maxammo[ammo_number] = ivalue;
+    }
+    else
+    {
+        DEH_Warning(context, "Field named '%s' not found", variable_name);
+    }
+}
+
+static void DEH_AmmoSHA1Hash(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        SHA1_UpdateInt32(context, maxammo[i]);
+    }
+
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        SHA1_UpdateInt32(context, GetWeaponAmmo[i]);
+    }
+}
+
+deh_section_t deh_section_ammo =
+{
+    "Ammo",
+    NULL,
+    DEH_AmmoStart,
+    DEH_AmmoParseLine,
+    NULL,
+    DEH_AmmoSHA1Hash,
+};
+
diff --git a/games/NXDoom/src/heretic/deh_frame.c b/games/NXDoom/src/heretic/deh_frame.c
new file mode 100644
index 000000000..711060308
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_frame.c
@@ -0,0 +1,335 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Frame" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "info.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+#include "deh_htic.h"
+
+#include "p_action.h"
+
+typedef struct
+{
+    int offsets[deh_hhe_num_versions];
+    void (*func)(struct mobj_s *, struct player_s *, struct pspdef_s *);
+} hhe_action_pointer_t;
+
+// Offsets of action pointers within the Heretic executables.
+// Different versions have different offsets.
+// (Seriously Greg, was this really necessary?  What was wrong with the
+// "copying action pointer from another frame" technique used in dehacked?)
+
+//    Offset                      Action function
+//        v1.0    v1.2    v1.3
+
+static const hhe_action_pointer_t action_pointers[] =
+{
+    { {  77680,  80144,  80208 }, A_AccTeleGlitter },
+    { {  78608,  81104,  81168 }, A_AddPlayerCorpse },
+    { { 115808, 118000, 118240 }, A_AddPlayerRain },
+    { { 112272, 114480, 114720 }, A_BeakAttackPL1 },
+    { { 112448, 114656, 114896 }, A_BeakAttackPL2 },
+    { { 111856, 114176, 114416 }, A_BeakRaise },
+    { { 111568, 113888, 114128 }, A_BeakReady },
+    { {  74640,  77120,  77184 }, A_BeastAttack },
+    { {  70480,  72992,  73056 }, A_BeastPuff },
+    { {  73120,  75600,  75664 }, A_BlueSpark },
+    { { 115456, 117648, 117888 }, A_BoltSpark },
+    { {  77344,  79808,  79872 }, A_BossDeath },
+    { {  69328,  71856,  71920 }, A_Chase },
+    { {      0,  80976,  81040 }, A_CheckBurnGone },
+    { {  78480,  80944,  81008 }, A_CheckSkullDone },
+    { {  78448,  80912,  80976 }, A_CheckSkullFloor },
+    { {  71376,  73888,  73952 }, A_ChicAttack },
+    { {  71488,  74000,  74064 }, A_ChicChase },
+    { {  71456,  73968,  74032 }, A_ChicLook },
+    { {  71520,  74032,  74096 }, A_ChicPain },
+    { {  75792,  78208,  78272 }, A_ClinkAttack },
+    { { 108432, 110816, 111056 }, A_ContMobjSound },
+    { { 114752, 116944, 117184 }, A_DeathBallImpact },
+    { {  70016,  72528,  72592 }, A_DripBlood },
+    { {  77472,  79936,  80000 }, A_ESound },
+    { {  76784,  79248,  79312 }, A_Explode },
+    { {  69872,  72400,  72464 }, A_FaceTarget },
+    { {  71568,  74080,  74144 }, A_Feathers },
+    { { 112928, 115136, 115376 }, A_FireBlasterPL1 },
+    { { 113072, 115280, 115520 }, A_FireBlasterPL2 },
+    { { 115232, 117424, 117664 }, A_FireCrossbowPL1 },
+    { { 115312, 117504, 117744 }, A_FireCrossbowPL2 },
+    { { 113152, 115360, 115600 }, A_FireGoldWandPL1 },
+    { { 113296, 115504, 115744 }, A_FireGoldWandPL2 },
+    { { 113760, 115968, 116208 }, A_FireMacePL1 },
+    { { 114624, 116816, 117056 }, A_FireMacePL2 },
+    { { 116368, 118544, 118784 }, A_FirePhoenixPL1 },
+    { { 116736, 118896, 119136 }, A_FirePhoenixPL2 },
+    { { 115568, 117760, 118000 }, A_FireSkullRodPL1 },
+    { { 115648, 117840, 118080 }, A_FireSkullRodPL2 },
+    { { 117120, 119280, 119520 }, A_FlameEnd },
+    { {  78704,  81200,  81264 }, A_FlameSnd },
+    { { 117152, 119312, 119552 }, A_FloatPuff },
+    { {  78512,  81008,  81072 }, A_FreeTargMobj },
+    { { 117184, 119344, 119584 }, A_GauntletAttack },
+    { {  73232,  75712,  75776 }, A_GenWizard },
+    { {  75872,  78304,  78368 }, A_GhostOff },
+    { {  74752,  77232,  77296 }, A_HeadAttack },
+    { {  75488,  77984,  78048 }, A_HeadFireGrow },
+    { {  75328,  77824,  77888 }, A_HeadIceImpact },
+    { { 116336, 118512, 118752 }, A_HideInCeiling },
+    { {  78736,  81232,  81296 }, A_HideThing },
+    { {  70976,  73488,  73552 }, A_ImpDeath },
+    { {  70304,  72816,  72880 }, A_ImpExplode },
+    { {  70592,  73104,  73168 }, A_ImpMeAttack },
+    { {  70672,  73184,  73248 }, A_ImpMsAttack },
+    { {  70880,  73392,  73456 }, A_ImpMsAttack2 },
+    { {  71024,  73536,  73600 }, A_ImpXDeath1 },
+    { {  71072,  73584,  73648 }, A_ImpXDeath2 },
+    { {  77728,  80192,  80256 }, A_InitKeyGizmo },
+    { { 116720, 118880, 119120 }, A_InitPhoenixPL2 },
+    { {  70160,  72672,  72736 }, A_KnightAttack },
+    { { 117648, 119824, 120064 }, A_Light0 },
+    { {  69200,  71728,  71792 }, A_Look },
+    { { 111760, 114080, 114320 }, A_Lower },
+    { { 114032, 116224, 116464 }, A_MaceBallImpact },
+    { { 114192, 116384, 116624 }, A_MaceBallImpact2 },
+    { { 113904, 116112, 116352 }, A_MacePL1Check },
+    { {  77104,  79568,  79632 }, A_MakePod },
+    { {  73648,  76128,  76192 }, A_MinotaurAtk1 },
+    { {  74112,  76592,  76656 }, A_MinotaurAtk2 },
+    { {  74352,  76832,  76896 }, A_MinotaurAtk3 },
+    { {  74032,  76512,  76576 }, A_MinotaurCharge },
+    { {  73760,  76240,  76304 }, A_MinotaurDecide },
+    { {  74528,  77008,  77072 }, A_MntrFloorFire },
+    { {  71808,  74288,  74352 }, A_MummyAttack },
+    { {  71920,  74400,  74464 }, A_MummyAttack2 },
+    { {  72016,  74496,  74560 }, A_MummyFX1Seek },
+    { {  72048,  74528,  74592 }, A_MummySoul },
+    { {  76400,  78832,  78896 }, A_NoBlocking },
+    { {  69984,  72496,  72560 }, A_Pain },
+    { { 116496, 118656, 118896 }, A_PhoenixPuff },
+    { {  76896,  79360,  79424 }, A_PodPain },
+    { { 116272, 118448, 118688 }, A_RainImpact },
+    { { 111920, 114240, 114480 }, A_Raise },
+    { { 111696, 114016, 114256 }, A_ReFire },
+    { {  77056,  79520,  79584 }, A_RemovePod },
+    { { 116480,      0,      0 }, A_RemovedPhoenixFunc },
+    { {  81952,  84464,  84528 }, A_RestoreArtifact },
+    { {  82048,  84544,  84608 }, A_RestoreSpecialThing1 },
+    { {  82128,  84592,  84656 }, A_RestoreSpecialThing2 },
+    { {  76144,  78576,  78640 }, A_Scream },
+    { { 117104, 119264, 119504 }, A_ShutdownPhoenixPL2 },
+    { {  78288,  80752,  80816 }, A_SkullPop },
+    { { 115776, 117968, 118208 }, A_SkullRodPL2Seek },
+    { { 115984, 118176, 118416 }, A_SkullRodStorm },
+    { {  75632,  78048,  78112 }, A_SnakeAttack },
+    { {  75712,  78128,  78192 }, A_SnakeAttack2 },
+    { {  72144,  74624,  74688 }, A_Sor1Chase },
+    { {  72096,  74576,  74640 }, A_Sor1Pain },
+    { {  73392,  75872,  75936 }, A_Sor2DthInit },
+    { {  73424,  75904,  75968 }, A_Sor2DthLoop },
+    { {  73584,  76064,  76128 }, A_SorDBon },
+    { {  73552,  76032,  76096 }, A_SorDExp },
+    { {  73520,  76000,  76064 }, A_SorDSph },
+    { {  73488,  75968,  76032 }, A_SorRise },
+    { {  73616,  76096,  76160 }, A_SorSightSnd },
+    { {  73456,  75936,  76000 }, A_SorZap },
+    { {  72480,  74960,  75024 }, A_SorcererRise },
+    { { 115088, 117280, 117520 }, A_SpawnRippers },
+    { {  77520,  79984,  80048 }, A_SpawnTeleGlitter },
+    { {  77600,  80064,  80128 }, A_SpawnTeleGlitter2 },
+    { {  72192,  74672,  74736 }, A_Srcr1Attack },
+    { {  72896,  75376,  75440 }, A_Srcr2Attack },
+    { {  72816,  75296,  75360 }, A_Srcr2Decide },
+    { { 112640, 114848, 115088 }, A_StaffAttackPL1 },
+    { { 112784, 114992, 115232 }, A_StaffAttackPL2 },
+    { {  78752,  81248,  81312 }, A_UnHideThing },
+    { {  78080,  80544,  80608 }, A_VolcBallImpact },
+    { {  77856,  80320,  80384 }, A_VolcanoBlast },
+    { {  77824,  80288,  80352 }, A_VolcanoSet },
+    { { 111168, 113488, 113728 }, A_WeaponReady },
+    { {  75168,  77664,  77728 }, A_WhirlwindSeek },
+    { {  75888,  78320,  78384 }, A_WizAtk1 },
+    { {  75920,  78352,  78416 }, A_WizAtk2 },
+    { {  75952,  78384,  78448 }, A_WizAtk3 },
+};
+
+DEH_BEGIN_MAPPING(state_mapping, state_t)
+  DEH_MAPPING("Sprite number",    sprite)
+  DEH_MAPPING("Sprite subnumber", frame)
+  DEH_MAPPING("Duration",         tics)
+  DEH_MAPPING("Next frame",       nextstate)
+  DEH_MAPPING("Unknown 1",        misc1)
+  DEH_MAPPING("Unknown 2",        misc2)
+DEH_END_MAPPING
+
+static void DEH_FrameInit(void)
+{
+    // Bit of a hack here:
+    DEH_HereticInit();
+}
+
+static void *DEH_FrameStart(deh_context_t *context, char *line)
+{
+    int frame_number = 0;
+    int mapped_frame_number;
+    state_t *state;
+
+    if (sscanf(line, "Frame %i", &frame_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    // Map the HHE frame number (which assumes a Heretic 1.0 state table)
+    // to the internal frame number (which is is the Heretic 1.3 state table):
+
+    mapped_frame_number = DEH_MapHereticFrameNumber(frame_number);
+
+    if (mapped_frame_number < 0 || mapped_frame_number >= DEH_HERETIC_NUMSTATES)
+    {
+        DEH_Warning(context, "Invalid frame number: %i", frame_number);
+        return NULL;
+    }
+
+    state = &states[mapped_frame_number];
+
+    return state;
+}
+
+static boolean GetActionPointerForOffset(int offset, void (**result)(struct mobj_s *, struct player_s *, struct pspdef_s *))
+{
+    int i;
+
+    // Special case.
+
+    if (offset == 0)
+    {
+        *result = NULL;
+        return true;
+    }
+
+    for (i=0; i<arrlen(action_pointers); ++i)
+    {
+        if (action_pointers[i].offsets[deh_hhe_version] == offset)
+        {
+            *result = action_pointers[i].func;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// If an invalid action pointer is specified, the patch may be for a
+// different version from the version we are currently set to.  Try to
+// suggest a different version to use.
+
+static void SuggestOtherVersions(unsigned int offset)
+{
+    unsigned int i, v;
+
+    for (i=0; i<arrlen(action_pointers); ++i)
+    {
+        for (v=0; v<deh_hhe_num_versions; ++v)
+        {
+            if (action_pointers[i].offsets[v] == offset)
+            {
+                DEH_SuggestHereticVersion(v);
+            }
+        }
+    }
+}
+
+static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
+{
+    state_t *state;
+    char *variable_name, *value;
+    int ivalue;
+
+    if (tag == NULL)
+       return;
+
+    state = (state_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    // all values are integers
+
+    ivalue = atoi(value);
+
+    // Action pointer field is a special case:
+
+    if (!strcasecmp(variable_name, "Action pointer"))
+    {
+        void (*func)(struct mobj_s *, struct player_s *, struct pspdef_s *);
+
+        if (!GetActionPointerForOffset(ivalue, &func))
+        {
+            SuggestOtherVersions(ivalue);
+            DEH_Error(context, "Unknown action pointer: %i", ivalue);
+            return;
+        }
+
+        state->action = func;
+    }
+    else
+    {
+        // "Next frame" numbers need to undergo mapping.
+
+        if (!strcasecmp(variable_name, "Next frame"))
+        {
+            ivalue = DEH_MapHereticFrameNumber(ivalue);
+        }
+
+        DEH_SetMapping(context, &state_mapping, state, variable_name, ivalue);
+    }
+}
+
+static void DEH_FrameSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
+    }
+}
+
+deh_section_t deh_section_frame =
+{
+    "Frame",
+    DEH_FrameInit,
+    DEH_FrameStart,
+    DEH_FrameParseLine,
+    NULL,
+    DEH_FrameSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/heretic/deh_htext.c b/games/NXDoom/src/heretic/deh_htext.c
new file mode 100644
index 000000000..4f42697f3
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_htext.c
@@ -0,0 +1,845 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses Text substitution sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "dstrings.h"
+
+#include "z_zone.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_htic.h"
+#include "deh_main.h"
+
+//
+// Ok, Greg, the action pointers thing was bad enough, but this really
+// takes the biscuit.  Why does HHE's text replacement address strings
+// by offset??!!  The dehacked way was much nicer, why change it?
+//
+
+typedef struct
+{
+    unsigned int offsets[deh_hhe_num_versions];
+    const char *string;
+} hhe_string_t;
+
+//     Offsets                 String
+//       v1.0   v1.2   v1.3
+
+static const hhe_string_t strings[] =
+{
+    { {   228,   228,   228 }, "PLAYPAL" },
+    { {  1240,  1252,  1252 }, "E1M1:  THE DOCKS" },
+    { {  1260,  1272,  1272 }, "E1M2:  THE DUNGEONS" },
+    { {  1280,  1292,  1292 }, "E1M3:  THE GATEHOUSE" },
+    { {  1304,  1316,  1316 }, "E1M4:  THE GUARD TOWER" },
+    { {  1328,  1340,  1340 }, "E1M5:  THE CITADEL" },
+    { {  1348,  1360,  1360 }, "E1M6:  THE CATHEDRAL" },
+    { {  1372,  1384,  1384 }, "E1M7:  THE CRYPTS" },
+    { {  1392,  1404,  1404 }, "E1M8:  HELL'S MAW" },
+    { {  1412,  1424,  1424 }, "E1M9:  THE GRAVEYARD" },
+    { {  1436,  1448,  1448 }, "E2M1:  THE CRATER" },
+    { {  1456,  1468,  1468 }, "E2M2:  THE LAVA PITS" },
+    { {  1480,  1492,  1492 }, "E2M3:  THE RIVER OF FIRE" },
+    { {  1508,  1520,  1520 }, "E2M4:  THE ICE GROTTO" },
+    { {  1532,  1544,  1544 }, "E2M5:  THE CATACOMBS" },
+    { {  1556,  1568,  1568 }, "E2M6:  THE LABYRINTH" },
+    { {  1580,  1592,  1592 }, "E2M7:  THE GREAT HALL" },
+    { {  1604,  1616,  1616 }, "E2M8:  THE PORTALS OF CHAOS" },
+    { {  1632,  1644,  1644 }, "E2M9:  THE GLACIER" },
+    { {  1652,  1664,  1664 }, "E3M1:  THE STOREHOUSE" },
+    { {  1676,  1688,  1688 }, "E3M2:  THE CESSPOOL" },
+    { {  1696,  1708,  1708 }, "E3M3:  THE CONFLUENCE" },
+    { {  1720,  1732,  1732 }, "E3M4:  THE AZURE FORTRESS" },
+    { {  1748,  1760,  1760 }, "E3M5:  THE OPHIDIAN LAIR" },
+    { {  1776,  1788,  1788 }, "E3M6:  THE HALLS OF FEAR" },
+    { {  1804,  1816,  1816 }, "E3M7:  THE CHASM" },
+    { {  1824,  1836,  1836 }, "E3M8:  D'SPARIL'S KEEP" },
+    { {  1848,  1860,  1860 }, "E3M9:  THE AQUIFER" },
+    { {     0,  1880,  1880 }, "E4M1:  CATAFALQUE" },
+    { {     0,  1900,  1900 }, "E4M2:  BLOCKHOUSE" },
+    { {     0,  1920,  1920 }, "E4M3:  AMBULATORY" },
+    { {     0,  1940,  1940 }, "E4M4:  SEPULCHER" },
+    { {     0,  1960,  1960 }, "E4M5:  GREAT STAIR" },
+    { {     0,  1980,  1980 }, "E4M6:  HALLS OF THE APOSTATE" },
+    { {     0,  2012,  2012 }, "E4M7:  RAMPARTS OF PERDITION" },
+    { {     0,  2044,  2044 }, "E4M8:  SHATTERED BRIDGE" },
+    { {     0,  2068,  2068 }, "E4M9:  MAUSOLEUM" },
+    { {     0,  2088,  2088 }, "E5M1:  OCHRE CLIFFS" },
+    { {     0,  2108,  2108 }, "E5M2:  RAPIDS" },
+    { {     0,  2124,  2124 }, "E5M3:  QUAY" },
+    { {     0,  2136,  2136 }, "E5M4:  COURTYARD" },
+    { {     0,  2156,  2156 }, "E5M5:  HYDRATYR" },
+    { {     0,  2172,  2172 }, "E5M6:  COLONNADE" },
+    { {     0,  2192,  2192 }, "E5M7:  FOETID MANSE" },
+    { {     0,  2212,  2212 }, "E5M8:  FIELD OF JUDGEMENT" },
+    { {     0,  2240,  2240 }, "E5M9:  SKEIN OF D'SPARIL" },
+    { {  1868,  2268,  2268 }, "AUTOPAGE" },
+    { {  1880,  2280,  2280 }, "FOLLOW MODE ON" },
+    { {  1896,  2296,  2296 }, "FOLLOW MODE OFF" },
+    { {  1924,  2324,  2324 }, "GREEN:  " },
+    { {  1936,  2336,  2336 }, "YELLOW:  " },
+    { {  1948,  2348,  2348 }, "RED:  " },
+    { {  1956,  2356,  2356 }, "BLUE:  " },
+    { {  1964,  2364,  2364 }, "FONTA_S" },
+    { {  1972,  2372,  2372 }, "-MESSAGE SENT-" },
+    { {  1988,  2388,  2388 }, "THERE ARE NO OTHER PLAYERS IN THE GAME!" },
+    { {  2028,  2428,  2428 }, "FONTA59" },
+    { {  2036,  2504,  2504 }, "PAUSED" },
+    { {  2072,  2540,  2540 }, "ADVISOR" },
+    { {  2080,  2548,  2548 }, "TITLE" },
+    { {  2088,  2556,  2556 }, "demo1" },
+    { {  2096,  2564,  2564 }, "CREDIT" },
+    { {  2104,  2572,  2572 }, "demo2" },
+    { {  2112,  2580,  2580 }, "ORDER" },
+    { {  2120,  2588,  2588 }, "demo3" },
+    { {  2304,  2696,  2696 }, "Exited from HERETIC.\n" },
+    { {  2412,  2800,  2800 }, "c:\\heretic.cd" },
+    { {  2528,  2916,  2916 }, "Playing demo %s.lmp.\n" },
+    { {  2592,  2980,  2980 }, "V_Init: allocate screens.\n" },
+    { {  2620,  3008,  3008 }, "M_LoadDefaults: Load system defaults.\n" },
+    { {  2660,  3048,  3048 }, "Z_Init: Init zone memory allocation daemon.\n" },
+    { {  2708,  3096,  3096 }, "W_Init: Init WADfiles.\n" },
+    { {  2732,  3120,  3120 }, "E2M1" },
+    { {     0,  3128,  3128 }, "EXTENDED" },
+    { {  2740,  3140,  3140 }, "LOADING" },
+    { {  2748,  3148,  3148 }, "DeathMatch..." },
+    { {  2764,  3164,  3164 }, "No Monsters..." },
+    { {  2780,  3180,  3180 }, "Respawning..." },
+    { {  2796,  3196,  3196 }, "Warp to Episode %d, Map %d, Skill %d " },
+    { {  2836,  3236,  3236 }, "MN_Init: Init menu system.\n" },
+    { {  2864,  3264,  3264 }, "R_Init: Init Heretic refresh daemon." },
+    { {  2904,  3304,  3304 }, "Loading graphics" },
+    { {  2924,  3324,  3324 }, "P_Init: Init Playloop state." },
+    { {  2956,  3356,  3356 }, "Init game engine." },
+    { {  2976,  3376,  3376 }, "I_Init: Setting up machine state.\n" },
+    { {  3012,  3412,  3412 }, "D_CheckNetGame: Checking network game status.\n" },
+    { {  3060,  3460,  3460 }, "Checking network game status." },
+    { {  3092,  3492,  3492 }, "SB_Init: Loading patches.\n" },
+    { {     0,  3752,  3752 }, "PLAYER 1 LEFT THE GAME" },
+    { {  3508,  3932,  3932 }, "Network game synchronization aborted." },
+    { {     0,  3972,  3972 }, "Different DOOM versions cannot play a net game!" },
+    { {  3908,  4132,  4132 }, "SKY1" },
+    { {  3916,  4140,  4140 }, "SKY2" },
+    { {  3924,  4148,  4148 }, "SKY3" },
+    { {  3736,  4196,  4196 }, "NET GAME" },
+    { {  3748,  4208,  4208 }, "SAVE GAME" },
+    { {  3760,  4220,  4220 }, "Only %i deathmatch spots, 4 required" },
+    { {  3800,  4260,  4260 }, "version %i" },
+    { {  3828,  4372,  4372 }, "c:\\heretic.cd\\hticsav%d.hsg" },
+    { {  3856,  4400,  4400 }, "hticsav%d.hsg" },
+    { {  3896,  4416,  4416 }, "GAME SAVED" },
+    { {  4016,  4456,  4456 }, E1TEXT },
+    { {  4536,  4976,  4976 }, E2TEXT },
+    { {  5068,  5508,  5508 }, E3TEXT },
+    { {     0,  6072,  6072 }, E4TEXT },
+    { {     0,  6780,  6780 }, E5TEXT },
+    { {  5632,  7468,  7468 }, "FLOOR25" },
+    { {  5640,  7476,  7476 }, "FLATHUH1" },
+    { {  5652,  7488,  7488 }, "FLTWAWA2" },
+    { {     0,  7500,  7500 }, "FLOOR28" },
+    { {     0,  7508,  7508 }, "FLOOR08" },
+    { {  5664,  7516,  7516 }, "FONTA_S" },
+    { {  5704,  7524,  7524 }, "PLAYPAL" },
+    { {  5672,  7532,  7532 }, "FINAL1" },
+    { {  5680,  7540,  7540 }, "FINAL2" },
+    { {  5688,  7548,  7548 }, "E2PAL" },
+    { {  5696,  7556,  7556 }, "E2END" },
+    { {  7884,  7564,  7564 }, "TITLE" },
+    { {  5712,  7572,  7572 }, "ORDER" },
+    { {     0,  7580,  7580 }, "CREDIT" },
+    { {  5720,  7588,  7588 }, "IMPX" },
+    { {  5728,  7596,  7596 }, "ACLO" },
+    { {  5736,  7604,  7604 }, "PTN1" },
+    { {  5744,  7612,  7612 }, "SHLD" },
+    { {  5752,  7620,  7620 }, "SHD2" },
+    { {  5760,  7628,  7628 }, "BAGH" },
+    { {  5768,  7636,  7636 }, "SPMP" },
+    { {  5776,  7644,  7644 }, "INVS" },
+    { {  5784,  7652,  7652 }, "PTN2" },
+    { {  5792,  7660,  7660 }, "SOAR" },
+    { {  5800,  7668,  7668 }, "INVU" },
+    { {  5808,  7676,  7676 }, "PWBK" },
+    { {  5816,  7684,  7684 }, "EGGC" },
+    { {  5824,  7692,  7692 }, "EGGM" },
+    { {  5832,  7700,  7700 }, "FX01" },
+    { {  5840,  7708,  7708 }, "SPHL" },
+    { {  5848,  7716,  7716 }, "TRCH" },
+    { {  5856,  7724,  7724 }, "FBMB" },
+    { {  5864,  7732,  7732 }, "XPL1" },
+    { {  5872,  7740,  7740 }, "ATLP" },
+    { {  5880,  7748,  7748 }, "PPOD" },
+    { {  5888,  7756,  7756 }, "AMG1" },
+    { {  5896,  7764,  7764 }, "SPSH" },
+    { {  5904,  7772,  7772 }, "LVAS" },
+    { {  5912,  7780,  7780 }, "SLDG" },
+    { {  5920,  7788,  7788 }, "SKH1" },
+    { {  5928,  7796,  7796 }, "SKH2" },
+    { {  5936,  7804,  7804 }, "SKH3" },
+    { {  5944,  7812,  7812 }, "SKH4" },
+    { {  5952,  7820,  7820 }, "CHDL" },
+    { {  5960,  7828,  7828 }, "SRTC" },
+    { {  5968,  7836,  7836 }, "SMPL" },
+    { {  5976,  7844,  7844 }, "STGS" },
+    { {  5984,  7852,  7852 }, "STGL" },
+    { {  5992,  7860,  7860 }, "STCS" },
+    { {  6000,  7868,  7868 }, "STCL" },
+    { {  6008,  7876,  7876 }, "KFR1" },
+    { {  6016,  7884,  7884 }, "BARL" },
+    { {  6024,  7892,  7892 }, "BRPL" },
+    { {  6032,  7900,  7900 }, "MOS1" },
+    { {  6040,  7908,  7908 }, "MOS2" },
+    { {  6048,  7916,  7916 }, "WTRH" },
+    { {  6056,  7924,  7924 }, "HCOR" },
+    { {  6064,  7932,  7932 }, "KGZ1" },
+    { {  6072,  7940,  7940 }, "KGZB" },
+    { {  6080,  7948,  7948 }, "KGZG" },
+    { {  6088,  7956,  7956 }, "KGZY" },
+    { {  6096,  7964,  7964 }, "VLCO" },
+    { {  6104,  7972,  7972 }, "VFBL" },
+    { {  6112,  7980,  7980 }, "VTFB" },
+    { {  6120,  7988,  7988 }, "SFFI" },
+    { {  6128,  7996,  7996 }, "TGLT" },
+    { {  6136,  8004,  8004 }, "TELE" },
+    { {  6144,  8012,  8012 }, "STFF" },
+    { {  6152,  8020,  8020 }, "PUF3" },
+    { {  6160,  8028,  8028 }, "PUF4" },
+    { {  6168,  8036,  8036 }, "BEAK" },
+    { {  6176,  8044,  8044 }, "WGNT" },
+    { {  6184,  8052,  8052 }, "GAUN" },
+    { {  6192,  8060,  8060 }, "PUF1" },
+    { {  6200,  8068,  8068 }, "WBLS" },
+    { {  6208,  8076,  8076 }, "BLSR" },
+    { {  6216,  8084,  8084 }, "FX18" },
+    { {  6224,  8092,  8092 }, "FX17" },
+    { {  6232,  8100,  8100 }, "WMCE" },
+    { {  6240,  8108,  8108 }, "MACE" },
+    { {  6248,  8116,  8116 }, "FX02" },
+    { {  6256,  8124,  8124 }, "WSKL" },
+    { {  6264,  8132,  8132 }, "HROD" },
+    { {  6272,  8140,  8140 }, "FX00" },
+    { {  6280,  8148,  8148 }, "FX20" },
+    { {  6288,  8156,  8156 }, "FX21" },
+    { {  6296,  8164,  8164 }, "FX22" },
+    { {  6304,  8172,  8172 }, "FX23" },
+    { {  6312,  8180,  8180 }, "GWND" },
+    { {  6320,  8188,  8188 }, "PUF2" },
+    { {  6328,  8196,  8196 }, "WPHX" },
+    { {  6336,  8204,  8204 }, "PHNX" },
+    { {  6344,  8212,  8212 }, "FX04" },
+    { {  6352,  8220,  8220 }, "FX08" },
+    { {  6360,  8228,  8228 }, "FX09" },
+    { {  6368,  8236,  8236 }, "WBOW" },
+    { {  6376,  8244,  8244 }, "CRBW" },
+    { {  6384,  8252,  8252 }, "FX03" },
+    { {  6392,  8260,  8260 }, "BLOD" },
+    { {  6400,  8268,  8268 }, "PLAY" },
+    { {  6408,  8276,  8276 }, "FDTH" },
+    { {  6416,  8284,  8284 }, "BSKL" },
+    { {  6424,  8292,  8292 }, "CHKN" },
+    { {  6432,  8300,  8300 }, "MUMM" },
+    { {  6440,  8308,  8308 }, "FX15" },
+    { {  6448,  8316,  8316 }, "BEAS" },
+    { {  6456,  8324,  8324 }, "FRB1" },
+    { {  6464,  8332,  8332 }, "SNKE" },
+    { {  6472,  8340,  8340 }, "SNFX" },
+    { {  6480,  8348,  8348 }, "HEAD" },
+    { {  6488,  8356,  8356 }, "FX05" },
+    { {  6496,  8364,  8364 }, "FX06" },
+    { {  6504,  8372,  8372 }, "FX07" },
+    { {  6512,  8380,  8380 }, "CLNK" },
+    { {  6520,  8388,  8388 }, "WZRD" },
+    { {  6528,  8396,  8396 }, "FX11" },
+    { {  6536,  8404,  8404 }, "FX10" },
+    { {  6544,  8412,  8412 }, "KNIG" },
+    { {  6552,  8420,  8420 }, "SPAX" },
+    { {  6560,  8428,  8428 }, "RAXE" },
+    { {  6568,  8436,  8436 }, "SRCR" },
+    { {  6576,  8444,  8444 }, "FX14" },
+    { {  6584,  8452,  8452 }, "SOR2" },
+    { {  6592,  8460,  8460 }, "SDTH" },
+    { {  6600,  8468,  8468 }, "FX16" },
+    { {  6608,  8476,  8476 }, "MNTR" },
+    { {  6616,  8484,  8484 }, "FX12" },
+    { {  6624,  8492,  8492 }, "FX13" },
+    { {  6632,  8500,  8500 }, "AKYY" },
+    { {  6640,  8508,  8508 }, "BKYY" },
+    { {  6648,  8516,  8516 }, "CKYY" },
+    { {  6656,  8524,  8524 }, "AMG2" },
+    { {  6664,  8532,  8532 }, "AMM1" },
+    { {  6672,  8540,  8540 }, "AMM2" },
+    { {  6680,  8548,  8548 }, "AMC1" },
+    { {  6688,  8556,  8556 }, "AMC2" },
+    { {  6696,  8564,  8564 }, "AMS1" },
+    { {  6704,  8572,  8572 }, "AMS2" },
+    { {  6712,  8580,  8580 }, "AMP1" },
+    { {  6720,  8588,  8588 }, "AMP2" },
+    { {  6728,  8596,  8596 }, "AMB1" },
+    { {  6736,  8604,  8604 }, "AMB2" },
+    { {  6744,  8612,  8612 }, "K" },
+    { {  6748,  8616,  8616 }, "I" },
+    { {  6752,  8620,  8620 }, "L" },
+    { {  6756,  8624,  8624 }, "E" },
+    { {  6760,  8628,  8628 }, "R" },
+    { {  6764,  8632,  8632 }, "S" },
+    { {  6768,  8636,  8636 }, "PLAYPAL" },
+    { {  6776,  8644,  8644 }, "MAPE1" },
+    { {  6784,  8652,  8652 }, "MAPE2" },
+    { {  6792,  8660,  8660 }, "MAPE3" },
+    { {  6800,  8668,  8668 }, "IN_X" },
+    { {  6808,  8676,  8676 }, "IN_YAH" },
+    { {  6816,  8684,  8684 }, "FONTB16" },
+    { {  6824,  8692,  8692 }, "FONTB_S" },
+    { {  6832,  8700,  8700 }, "FONTB13" },
+    { {  6840,  8708,  8708 }, "FONTB15" },
+    { {  6848,  8716,  8716 }, "FONTB05" },
+    { {  6856,  8724,  8724 }, "FACEA0" },
+    { {  6864,  8732,  8732 }, "FACEB0" },
+    { {  6940,  8808,  8808 }, "FLOOR16" },
+    { {  6948,  8816,  8816 }, "FINISHED" },
+    { {  6960,  8828,  8828 }, "NOW ENTERING:" },
+    { {  6976,  8844,  8844 }, "KILLS" },
+    { {  6984,  8852,  8852 }, "ITEMS" },
+    { {  6992,  8860,  8860 }, "SECRETS" },
+    { {  7000,  8868,  8868 }, "TIME" },
+    { {  7008,  8876,  8876 }, "BONUS" },
+    { {  7016,  8884,  8884 }, "SECRET" },
+    { {  7024,  8892,  8892 }, "TOTAL" },
+    { {  7032,  8900,  8900 }, "VICTIMS" },
+    { {  7040,  8908,  8908 }, ":" },
+    { {  7044,  8912,  8912 }, "NEW GAME" },
+    { {  7056,  8924,  8924 }, "OPTIONS" },
+    { {  7064,  8932,  8932 }, "GAME FILES" },
+    { {  7076,  8944,  8944 }, "INFO" },
+    { {  7084,  8952,  8952 }, "QUIT GAME" },
+    { {  7096,  8964,  8964 }, "CITY OF THE DAMNED" },
+    { {  7116,  8984,  8984 }, "HELL'S MAW" },
+    { {  7128,  8996,  8996 }, "THE DOME OF D'SPARIL" },
+    { {     0,  9020,  9020 }, "THE OSSUARY" },
+    { {     0,  9032,  9032 }, "THE STAGNANT DEMESNE" },
+    { {  7152,  9056,  9056 }, "LOAD GAME" },
+    { {  7164,  9068,  9068 }, "SAVE GAME" },
+    { {  7176,  9080,  9080 }, "THOU NEEDETH A WET-NURSE" },
+    { {  7204,  9108,  9108 }, "YELLOWBELLIES-R-US" },
+    { {  7224,  9128,  9128 }, "BRINGEST THEM ONETH" },
+    { {  7244,  9148,  9148 }, "THOU ART A SMITE-MEISTER" },
+    { {  7272,  9176,  9176 }, "BLACK PLAGUE POSSESSES THEE" },
+    { {  7300,  9204,  9204 }, "END GAME" },
+    { {  7312,  9216,  9216 }, "MESSAGES : " },
+    { {  7324,  9228,  9228 }, "MOUSE SENSITIVITY" },
+    { {  7344,  9248,  9248 }, "MORE..." },
+    { {  7352,  9256,  9256 }, "SCREEN SIZE" },
+    { {  7364,  9268,  9268 }, "SFX VOLUME" },
+    { {  7376,  9280,  9280 }, "MUSIC VOLUME" },
+    { {  7416,  9296,  9296 }, "ARE YOU SURE YOU WANT TO QUIT?" },
+    { {  7448,  9328,  9328 }, "ARE YOU SURE YOU WANT TO END THE GAME?" },
+    { {  7488,  9368,  9368 }, "DO YOU WANT TO QUICKSAVE THE GAME NAMED" },
+    { {  7528,  9408,  9408 }, "DO YOU WANT TO QUICKLOAD THE GAME NAMED" },
+    { {  7392,  9448,  9448 }, "M_SKL00" },
+    { {  7400,  9456,  9456 }, "FONTA_S" },
+    { {  7408,  9464,  9464 }, "FONTB_S" },
+    { {  7568,  9472,  9472 }, "?" },
+    { {  7572,  9476,  9476 }, "M_SLCTR1" },
+    { {  7584,  9488,  9488 }, "M_SLCTR2" },
+    { {  7596,  9500,  9500 }, "M_HTIC" },
+    { {  7604,  9508,  9508 }, "c:\\heretic.cd\\hticsav%d.hsg" },
+    { {  7632,  9536,  9536 }, "hticsav%d.hsg" },
+    { {  7652,  9556,  9556 }, "M_FSLOT" },
+    { {  7660,  9564,  9564 }, "ON" },
+    { {  7664,  9568,  9568 }, "OFF" },
+    { {     0,  9572,  9572 }, "YOU CAN'T START A NEW GAME IN NETPLAY!" },
+    { {     0,  9612,  9612 }, "YOU CAN'T LOAD A GAME IN NETPLAY!" },
+    { {  7668,  9648,  9648 }, "MESSAGES ON" },
+    { {  7680,  9660,  9660 }, "MESSAGES OFF" },
+    { {  7748,  9676,  9676 }, "ONLY AVAILABLE IN THE REGISTERED VERSION" },
+    { {  7792,  9720,  9720 }, "PLAYPAL" },
+    { {  7800,  9728,  9728 }, "QUICKSAVING...." },
+    { {  7816,  9744,  9744 }, "QUICKLOADING...." },
+    { {  7836,  9764,  9764 }, "CHOOSE A QUICKSAVE SLOT" },
+    { {  7860,  9788,  9788 }, "CHOOSE A QUICKLOAD SLOT" },
+    { {     0,  9812,  9812 }, "TITLE" },
+    { {  7892,  9820,  9820 }, "M_SLDLT" },
+    { {  7900,  9828,  9828 }, "M_SLDMD1" },
+    { {  7912,  9840,  9840 }, "M_SLDMD2" },
+    { {  7924,  9852,  9852 }, "M_SLDRT" },
+    { {  7932,  9860,  9860 }, "M_SLDKB" },
+    { {  9016, 10944, 10944 }, "SCREEN SHOT" },
+    { {  9028, 10956, 10956 }, "YOU NEED A BLUE KEY TO OPEN THIS DOOR" },
+    { {  9068, 10996, 10996 }, "YOU NEED A YELLOW KEY TO OPEN THIS DOOR" },
+    { {  9108, 11036, 11036 }, "YOU NEED A GREEN KEY TO OPEN THIS DOOR" },
+    { {  9244, 11172, 11172 }, "CRYSTAL VIAL" },
+    { {  9260, 11188, 11188 }, "SILVER SHIELD" },
+    { {  9276, 11204, 11204 }, "ENCHANTED SHIELD" },
+    { {  9296, 11224, 11224 }, "BAG OF HOLDING" },
+    { {  9312, 11240, 11240 }, "MAP SCROLL" },
+    { {  9324, 11252, 11252 }, "BLUE KEY" },
+    { {  9336, 11264, 11264 }, "YELLOW KEY" },
+    { {  9348, 11276, 11276 }, "GREEN KEY" },
+    { {  9360, 11288, 11288 }, "QUARTZ FLASK" },
+    { {  9376, 11304, 11304 }, "WINGS OF WRATH" },
+    { {  9392, 11320, 11320 }, "RING OF INVINCIBILITY" },
+    { {  9416, 11344, 11344 }, "TOME OF POWER" },
+    { {  9432, 11360, 11360 }, "SHADOWSPHERE" },
+    { {  9448, 11376, 11376 }, "MORPH OVUM" },
+    { {  9460, 11388, 11388 }, "MYSTIC URN" },
+    { {  9472, 11400, 11400 }, "TORCH" },
+    { {  9480, 11408, 11408 }, "TIME BOMB OF THE ANCIENTS" },
+    { {  9508, 11436, 11436 }, "CHAOS DEVICE" },
+    { {  9524, 11452, 11452 }, "WAND CRYSTAL" },
+    { {  9540, 11468, 11468 }, "CRYSTAL GEODE" },
+    { {  9556, 11484, 11484 }, "MACE SPHERES" },
+    { {  9572, 11500, 11500 }, "PILE OF MACE SPHERES" },
+    { {  9596, 11524, 11524 }, "ETHEREAL ARROWS" },
+    { {  9612, 11540, 11540 }, "QUIVER OF ETHEREAL ARROWS" },
+    { {  9640, 11568, 11568 }, "CLAW ORB" },
+    { {  9652, 11580, 11580 }, "ENERGY ORB" },
+    { {  9664, 11592, 11592 }, "LESSER RUNES" },
+    { {  9680, 11608, 11608 }, "GREATER RUNES" },
+    { {  9696, 11624, 11624 }, "FLAME ORB" },
+    { {  9708, 11636, 11636 }, "INFERNO ORB" },
+    { {  9720, 11648, 11648 }, "FIREMACE" },
+    { {  9732, 11660, 11660 }, "ETHEREAL CROSSBOW" },
+    { {  9752, 11680, 11680 }, "DRAGON CLAW" },
+    { {  9764, 11692, 11692 }, "HELLSTAFF" },
+    { {  9776, 11704, 11704 }, "PHOENIX ROD" },
+    { {  9788, 11716, 11716 }, "GAUNTLETS OF THE NECROMANCER" },
+    { { 10088, 12016, 12016 }, "FLTWAWA1" },
+    { { 10100, 12028, 12028 }, "FLTFLWW1" },
+    { { 10112, 12040, 12040 }, "FLTLAVA1" },
+    { { 10124, 12052, 12052 }, "FLATHUH1" },
+    { { 10136, 12064, 12064 }, "FLTSLUD1" },
+    { { 10148, 12076, 12076 }, "END" },
+    { { 10236, 12164, 12164 }, "texture2" },
+    { { 10444, 12372, 12372 }, "PLAYPAL" },
+    { { 10596, 12488, 12488 }, "PNAMES" },
+    { { 10604, 12496, 12496 }, "TEXTURE1" },
+    { { 10616, 12508, 12508 }, "TEXTURE2" },
+    { { 10628, 12520, 12520 }, "S_END" },
+    { { 10636, 12528, 12528 }, "S_START" },
+    { { 10728, 12620, 12620 }, "F_START" },
+    { { 10736, 12628, 12628 }, "F_END" },
+    { { 10744, 12636, 12636 }, "COLORMAP" },
+    { { 10756, 12648, 12648 }, "\nR_InitTextures " },
+    { { 10776, 12668, 12668 }, "R_InitFlats\n" },
+    { { 10792, 12684, 12684 }, "R_InitSpriteLumps " },
+    { { 10948, 12772, 12772 }, "TINTTAB" },
+    { { 10984, 12780, 12780 }, "FLOOR04" },
+    { { 10992, 12788, 12788 }, "FLAT513" },
+    { { 11000, 12796, 12796 }, "bordt" },
+    { { 11008, 12804, 12804 }, "bordb" },
+    { { 11016, 12812, 12812 }, "bordl" },
+    { { 11024, 12820, 12820 }, "bordr" },
+    { { 11032, 12828, 12828 }, "bordtl" },
+    { { 11040, 12836, 12836 }, "bordtr" },
+    { { 11048, 12844, 12844 }, "bordbr" },
+    { { 11056, 12852, 12852 }, "bordbl" },
+    { { 11064, 12860, 12860 }, "R_InitData " },
+    { { 11076, 12872, 12872 }, "R_InitPointToAngle\n" },
+    { { 11096, 12892, 12892 }, "R_InitTables " },
+    { { 11112, 12908, 12908 }, "R_InitPlanes\n" },
+    { { 11128, 12924, 12924 }, "R_InitLightTables " },
+    { { 11148, 12944, 12944 }, "R_InitSkyMap\n" },
+    { { 11164, 12960, 12960 }, "F_SKY1" },
+    { { 12120, 13484, 13484 }, "LTFACE" },
+    { { 12128, 13492, 13492 }, "RTFACE" },
+    { { 12136, 13500, 13500 }, "BARBACK" },
+    { { 12144, 13508, 13508 }, "INVBAR" },
+    { { 12152, 13516, 13516 }, "CHAIN" },
+    { { 12160, 13524, 13524 }, "STATBAR" },
+    { { 12168, 13532, 13532 }, "LIFEBAR" },
+    { { 12176, 13540, 13540 }, "LIFEGEM2" },
+    { { 12188, 13552, 13552 }, "LIFEGEM0" },
+    { { 12200, 13564, 13564 }, "LTFCTOP" },
+    { { 12208, 13572, 13572 }, "RTFCTOP" },
+    { { 12224, 13580, 13580 }, "SELECTBOX" },
+    { { 12236, 13592, 13592 }, "INVGEML1" },
+    { { 12248, 13604, 13604 }, "INVGEML2" },
+    { { 12260, 13616, 13616 }, "INVGEMR1" },
+    { { 12272, 13628, 13628 }, "INVGEMR2" },
+    { { 12284, 13640, 13640 }, "BLACKSQ" },
+    { { 12292, 13648, 13648 }, "ARMCLEAR" },
+    { { 12304, 13660, 13660 }, "CHAINBACK" },
+    { { 12316, 13672, 13672 }, "IN0" },
+    { { 12320, 13676, 13676 }, "NEGNUM" },
+    { { 12328, 13684, 13684 }, "FONTB16" },
+    { { 12336, 13692, 13692 }, "SMALLIN0" },
+    { { 12348, 13704, 13704 }, "PLAYPAL" },
+    { { 12356, 13712, 13712 }, "SPINBK0" },
+    { { 12364, 13720, 13720 }, "SPFLY0" },
+    { { 12372, 13728, 13728 }, "LAME" },
+    { { 12380, 13736, 13736 }, "*** SOUND DEBUG INFO ***" },
+    { { 12408, 13764, 13764 }, "NAME" },
+    { { 12416, 13772, 13772 }, "MO.T" },
+    { { 12424, 13780, 13780 }, "MO.X" },
+    { { 12432, 13788, 13788 }, "MO.Y" },
+    { { 12440, 13796, 13796 }, "ID" },
+    { { 12444, 13800, 13800 }, "PRI" },
+    { { 12448, 13804, 13804 }, "DIST" },
+    { { 12456, 13812, 13812 }, "------" },
+    { { 12464, 13820, 13820 }, "%s" },
+    { { 12468, 13824, 13824 }, "%d" },
+    { { 12472, 13828, 13828 }, "GOD1" },
+    { { 12480, 13836, 13836 }, "GOD2" },
+    { { 12488, 13844, 13844 }, "useartia" },
+    { { 12500, 13856, 13856 }, "ykeyicon" },
+    { { 12512, 13868, 13868 }, "gkeyicon" },
+    { { 12524, 13880, 13880 }, "bkeyicon" },
+    { { 12216, 13892, 13892 }, "ARTIBOX" },
+    { { 12536, 13900, 13900 }, "GOD MODE ON" },
+    { { 12548, 13912, 13912 }, "GOD MODE OFF" },
+    { { 12564, 13928, 13928 }, "NO CLIPPING ON" },
+    { { 12580, 13944, 13944 }, "NO CLIPPING OFF" },
+    { { 12596, 13960, 13960 }, "ALL WEAPONS" },
+    { { 12608, 13972, 13972 }, "POWER OFF" },
+    { { 12620, 13984, 13984 }, "POWER ON" },
+    { { 12632, 13996, 13996 }, "FULL HEALTH" },
+    { { 12644, 14008, 14008 }, "ALL KEYS" },
+    { { 12656, 14020, 14020 }, "SOUND DEBUG ON" },
+    { { 12672, 14036, 14036 }, "SOUND DEBUG OFF" },
+    { { 12688, 14052, 14052 }, "TICKER ON" },
+    { { 12700, 14064, 14064 }, "TICKER OFF" },
+    { { 12712, 14076, 14076 }, "CHOOSE AN ARTIFACT ( A - J )" },
+    { { 12744, 14108, 14108 }, "HOW MANY ( 1 - 9 )" },
+    { { 12764, 14128, 14128 }, "YOU GOT IT" },
+    { { 12776, 14140, 14140 }, "BAD INPUT" },
+    { { 12788, 14152, 14152 }, "LEVEL WARP" },
+    { { 12800, 14164, 14164 }, "CHICKEN OFF" },
+    { { 12812, 14176, 14176 }, "CHICKEN ON" },
+    { { 12824, 14188, 14188 }, "MASSACRE" },
+    { { 12836, 14200, 14200 }, "CHEATER - YOU DON'T DESERVE WEAPONS" },
+    { { 12872, 14236, 14236 }, "TRYING TO CHEAT, EH?  NOW YOU DIE!" },
+};
+
+// String offsets that are valid but we don't support.
+
+static const int unsupported_strings_1_0[] =
+{
+        0,     4,    64,   104,   160,   200,   220,   236,
+      244,   252,   272,   288,   296,   316,   332,   372,
+      436,   500,   504,   536,   544,   560,   576,   584,
+      592,   612,   640,   664,   708,   712,   744,   764,
+      808,   820,   828,   840,   876,   884,   908,   952,
+      992,  1028,  1036,  1048,  1088,  1128,  1160,  1192,
+     1212,  1912,  2044,  2056,  2068,  2128,  2140,  2168,
+     2184,  2196,  2212,  2228,  2240,  2252,  2260,  2264,
+     2284,  2292,  2296,  2300,  2328,  2340,  2352,  2364,
+     2372,  2384,  2388,  2404,  2428,  2436,  2444,  2464,
+     2496,  2508,  2520,  2552,  2564,  2572,  2584,  3120,
+     3128,  3140,  3184,  3220,  3248,  3252,  3256,  3280,
+     3304,  3320,  3352,  3380,  3400,  3432,  3464,  3548,
+     3600,  3624,  3664,  3696,  3812,  3872,  3932,  3940,
+     3976,  3996,  6872,  6896,  7648,  7696,  7940,  7964,
+     7968,  7992,  8020,  8028,  8052,  8056,  8076,  8088,
+     8104,  8116,  8128,  8136,  8148,  8164,  8180,  8192,
+     8204,  8220,  8232,  8248,  8264,  8276,  8292,  8308,
+     8320,  8328,  8340,  8352,  8364,  8376,  8392,  8408,
+     8424,  8436,  8448,  8460,  8472,  8488,  8504,  8520,
+     8536,  8548,  8560,  8572,  8584,  8596,  8608,  8612,
+     8624,  8648,  8660,  8668,  8680,  8708,  8720,  8728,
+     8740,  8752,  8764,  8788,  8800,  8812,  8824,  8848,
+     8860,  8864,  8868,  8876,  8888,  8896,  8916,  8944,
+     8948,  8960,  8964,  8968,  8980,  9148,  9172,  9212,
+     9216,  9220,  9820,  9860,  9892,  9940,  9972, 10012,
+    10036, 10040, 10052, 10080, 10152, 10192, 10248, 10284,
+    10320, 10360, 10392, 10452, 10488, 10508, 10556, 10644,
+    10684, 10812, 10844, 10880, 10912, 10956, 11172, 11200,
+    11232, 11272, 11312, 11348, 11380, 11404, 11436, 11492,
+    11548, 11616, 11684, 11748, 11792, 11840, 11896, 11936,
+    11980, 12028, 12072, 12908, 12924, 12956, 12960, 12968,
+    12976, 13020, 13048, 13076, 13104, 13136, 13168, 13196,
+    13240, 13272, 13292, 13296, 13308, 13312, 13320, 13324,
+    13364, 13408, 13460, 13492, 13516, 13560, 13612, 13664,
+    13700, 13744, 13796, 13848, 13884, 13940, 13996, 14040,
+    14084, 14140, 14148, 14156, 14164, 14184, 14192, 14204,
+    14208, 14212, 14256, 14272, 14284, 14296, 14300, 14312,
+    14320, 14324, 14348, 14356, 14360, 14372, 14380, 14392,
+    14432, 14440, 14444, 14472, 14496, 14516, 14536, 14548,
+    14560, 14572, 14580, 14588, 14596, 14604, 14612, 14620,
+    14636, 14660, 14704, 14740, 14748, 14756, 14760, 14768,
+       -1,
+};
+
+static const int unsupported_strings_1_2[] =
+{
+        0,     4,    64,   104,   160,   200,   220,   236,
+      244,   252,   272,   288,   296,   316,   332,   372,
+      436,   500,   504,   536,   544,   560,   576,   584,
+      592,   612,   640,   664,   708,   712,   744,   756,
+      776,   820,   832,   840,   852,   888,   896,   920,
+      964,  1004,  1040,  1048,  1060,  1100,  1140,  1172,
+     1204,  1224,  2312,  2436,  2448,  2464,  2480,  2492,
+     2512,  2524,  2536,  2596,  2608,  2636,  2652,  2656,
+     2676,  2684,  2688,  2720,  2732,  2744,  2752,  2764,
+     2772,  2776,  2792,  2816,  2824,  2832,  2852,  2884,
+     2896,  2908,  2940,  2952,  2960,  2972,  3520,  3528,
+     3540,  3584,  3620,  3648,  3652,  3656,  3680,  3704,
+     3720,  3776,  3804,  3824,  3856,  3888,  4020,  4044,
+     4084,  4116,  4156,  4272,  4288,  4296,  4332,  4352,
+     4428,  4432,  8740,  8764,  9552,  9868,  9888,  9900,
+     9916,  9928,  9940,  9948,  9960,  9976,  9992, 10004,
+    10016, 10032, 10044, 10060, 10076, 10088, 10104, 10120,
+    10132, 10140, 10152, 10164, 10176, 10188, 10204, 10220,
+    10236, 10248, 10260, 10272, 10284, 10300, 10316, 10332,
+    10348, 10360, 10372, 10384, 10396, 10408, 10420, 10424,
+    10436, 10460, 10472, 10480, 10492, 10520, 10532, 10540,
+    10552, 10564, 10576, 10600, 10612, 10624, 10636, 10660,
+    10672, 10676, 10700, 10704, 10728, 10756, 10764, 10788,
+    10792, 10796, 10804, 10816, 10824, 10844, 10872, 10876,
+    10888, 10892, 10896, 10908, 11076, 11100, 11140, 11144,
+    11148, 11748, 11788, 11820, 11868, 11900, 11940, 11964,
+    11968, 11980, 12008, 12080, 12120, 12176, 12212, 12248,
+    12288, 12320, 12380, 12400, 12448, 12536, 12576, 12704,
+    12736, 12968, 13000, 13024, 13080, 13136, 13204, 13272,
+    13336, 13380, 13428, 14272, 14288, 14320, 14324, 14332,
+    14340, 14384, 14412, 14440, 14468, 14500, 14532, 14560,
+    14604, 14636, 14656, 14696, 14740, 14792, 14824, 14848,
+    14892, 14944, 14996, 15032, 15076, 15128, 15180, 15216,
+    15272, 15328, 15372, 15416, 15472, 15480, 15488, 15496,
+    15516, 15524, 15536, 15540, 15544, 15588, 15604, 15616,
+    15628, 15632, 15644, 15652, 15656, 15680, 15688, 15692,
+    15704, 15712, 15724, 15764, 15772, 15776, 15804, 15828,
+    15848, 15868, 15880, 15892, 15904, 15912, 15920, 15928,
+    15936,    -1,
+};
+
+static const int unsupported_strings_1_3[] =
+{
+        0,     4,    64,   104,   160,   200,   220,   236,
+      244,   252,   272,   288,   296,   316,   332,   372,
+      436,   500,   504,   536,   544,   560,   576,   584,
+      592,   612,   640,   664,   708,   712,   744,   756,
+      776,   820,   832,   840,   852,   888,   896,   920,
+      964,  1004,  1040,  1048,  1060,  1100,  1140,  1172,
+     1204,  1224,  2312,  2436,  2448,  2464,  2480,  2492,
+     2512,  2524,  2536,  2596,  2608,  2636,  2652,  2656,
+     2676,  2684,  2688,  2720,  2732,  2744,  2752,  2764,
+     2772,  2776,  2792,  2816,  2824,  2832,  2852,  2884,
+     2896,  2908,  2940,  2952,  2960,  2972,  3520,  3528,
+     3540,  3584,  3620,  3648,  3652,  3656,  3680,  3704,
+     3720,  3776,  3804,  3824,  3856,  3888,  4020,  4044,
+     4084,  4116,  4156,  4272,  4288,  4296,  4332,  4352,
+     4428,  4432,  8740,  8764,  9552,  9868,  9888,  9900,
+     9916,  9928,  9940,  9948,  9960,  9976,  9992, 10004,
+    10016, 10032, 10044, 10060, 10076, 10088, 10104, 10120,
+    10132, 10140, 10152, 10164, 10176, 10188, 10204, 10220,
+    10236, 10248, 10260, 10272, 10284, 10300, 10316, 10332,
+    10348, 10360, 10372, 10384, 10396, 10408, 10420, 10424,
+    10436, 10460, 10472, 10480, 10492, 10520, 10532, 10540,
+    10552, 10564, 10576, 10600, 10612, 10624, 10636, 10660,
+    10672, 10676, 10700, 10704, 10728, 10756, 10764, 10788,
+    10792, 10796, 10804, 10816, 10824, 10844, 10872, 10876,
+    10888, 10892, 10896, 10908, 11076, 11100, 11140, 11144,
+    11148, 11748, 11788, 11820, 11868, 11900, 11940, 11964,
+    11968, 11980, 12008, 12080, 12120, 12176, 12212, 12248,
+    12288, 12320, 12380, 12400, 12448, 12536, 12576, 12704,
+    12736, 12968, 13000, 13024, 13080, 13136, 13204, 13272,
+    13336, 13380, 13428, 14272, 14288, 14320, 14324, 14332,
+    14340, 14384, 14412, 14440, 14468, 14500, 14532, 14560,
+    14604, 14636, 14656, 14696, 14740, 14792, 14824, 14848,
+    14892, 14944, 14996, 15032, 15076, 15128, 15180, 15216,
+    15272, 15328, 15372, 15416, 15472, 15480, 15488, 15496,
+    15516, 15524, 15536, 15540, 15544, 15588, 15604, 15616,
+    15628, 15632, 15644, 15652, 15656, 15680, 15688, 15692,
+    15704, 15712, 15724, 15764, 15772, 15776, 15804, 15828,
+    15848, 15868, 15880, 15892, 15904, 15912, 15920, 15928,
+    15936,    -1,
+};
+
+static const int *unsupported_strings[] =
+{
+    unsupported_strings_1_0,
+    unsupported_strings_1_2,
+    unsupported_strings_1_3,
+};
+
+static boolean StringIsUnsupported(unsigned int offset)
+{
+    const int *string_list;
+    int i;
+
+    string_list = unsupported_strings[deh_hhe_version];
+
+    for (i=0; string_list[i] >= 0; ++i)
+    {
+        if ((unsigned int) string_list[i] == offset)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static boolean GetStringByOffset(unsigned int offset, const char **result)
+{
+    int i;
+
+    for (i=0; i<arrlen(strings); ++i)
+    {
+        if (strings[i].offsets[deh_hhe_version] == offset)
+        {
+            *result = strings[i].string;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Given a string length, find the maximum length of a 
+// string that can replace it.
+
+static int MaxStringLength(int len)
+{
+    // Enough bytes for the string and the NUL terminator
+
+    len += 1;
+
+    // All strings in doom.exe are on 4-byte boundaries, so we may be able
+    // to support a slightly longer string.
+    // Extend up to the next 4-byte boundary
+
+    len += (4 - (len % 4)) % 4;
+
+    // Less one for the NUL terminator.
+
+    return len - 1;
+}
+
+// If a string offset does not match any string, it may be because
+// we are running in the wrong version mode, and the patch was generated
+// for a different Heretic version.  Search the lookup tables to find
+// versiosn that match.
+
+static void SuggestOtherVersions(unsigned int offset)
+{
+    const int *string_list;
+    unsigned int i;
+    unsigned int v;
+
+    // Check main string table.
+
+    for (i=0; i<arrlen(strings); ++i)
+    {
+        for (v=0; v<deh_hhe_num_versions; ++v)
+        {
+            if (strings[i].offsets[v] == offset)
+            {
+                DEH_SuggestHereticVersion(v);
+            }
+        }
+    }
+
+    // Check unsupported string tables.
+
+    for (v=0; v<deh_hhe_num_versions; ++v)
+    {
+        string_list = unsupported_strings[v];
+
+        for (i=0; string_list[i] >= 0; ++i)
+        {
+            if (string_list[i] == offset)
+            {
+                DEH_SuggestHereticVersion(v);
+            }
+        }
+    }
+}
+
+static void *DEH_TextStart(deh_context_t *context, char *line)
+{
+    char *repl_text;
+    const char *orig_text;
+    int orig_offset, repl_len;
+    int i;
+
+    if (sscanf(line, "Text %i %i", &orig_offset, &repl_len) != 2)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    repl_text = malloc(repl_len + 1);
+
+    // read in the "to" text
+
+    for (i=0; i<repl_len; ++i)
+    {
+        int c;
+
+        c = DEH_GetChar(context);
+
+        repl_text[i] = c;
+    }
+    repl_text[repl_len] = '\0';
+
+    // We don't support all strings, but at least recognise them:
+
+    if (StringIsUnsupported(orig_offset))
+    {
+        DEH_Warning(context, "Unsupported string replacement: %i", orig_offset);
+    }
+
+    // Find the string to replace:
+
+    else if (!GetStringByOffset(orig_offset, &orig_text))
+    {
+        SuggestOtherVersions(orig_offset);
+        DEH_Error(context, "Unknown string offset: %i", orig_offset);
+    }
+
+    // Only allow string replacements that are possible in Vanilla Doom.  
+    // Chocolate Doom is unforgiving!
+
+    else if (!deh_allow_long_strings
+          && repl_len > MaxStringLength(strlen(orig_text)))
+    {
+        DEH_Error(context, "Replacement string is longer than the maximum "
+                           "possible in heretic.exe");
+    }
+    else
+    {
+        // Success.
+
+        DEH_AddStringReplacement(orig_text, repl_text);
+    }
+
+    // We must always free the replacement text.
+    free(repl_text);
+
+    return NULL;
+}
+
+static void DEH_TextParseLine(deh_context_t *context, char *line, void *tag)
+{
+    // not used
+}
+
+deh_section_t deh_section_heretic_text =
+{
+    "Text",
+    NULL,
+    DEH_TextStart,
+    DEH_TextParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/heretic/deh_htic.c b/games/NXDoom/src/heretic/deh_htic.c
new file mode 100644
index 000000000..94fb935ce
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_htic.c
@@ -0,0 +1,182 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Top-level dehacked definitions for Heretic dehacked (HHE).
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_htic.h"
+#include "info.h"
+#include "m_argv.h"
+
+const char *deh_signatures[] =
+{
+    "Patch File for HHE v1.0",
+    "Patch File for HHE v1.1",
+    NULL
+};
+
+static const char *hhe_versions[] =
+{
+    "1.0", "1.2", "1.3"
+};
+
+// Version number for patches.
+
+deh_hhe_version_t deh_hhe_version = deh_hhe_1_0;
+
+
+//
+// List of section types:
+//
+
+deh_section_t *deh_section_types[] =
+{
+    &deh_section_ammo,
+    &deh_section_frame,
+//    &deh_section_pointer, TODO
+    &deh_section_sound,
+    &deh_section_heretic_text,
+    &deh_section_thing,
+    &deh_section_weapon,
+    NULL
+};
+
+static void SetHHEVersionByName(const char *name)
+{
+    int i;
+
+    for (i=0; i<arrlen(hhe_versions); ++i)
+    {
+        if (!strcmp(hhe_versions[i], name))
+        {
+            deh_hhe_version = i;
+            return;
+        }
+    }
+
+    fprintf(stderr, "Unknown Heretic version: %s\n", name);
+    fprintf(stderr, "Valid versions:\n");
+
+    for (i=0; i<arrlen(hhe_versions); ++i)
+    {
+        fprintf(stderr, "\t%s\n", hhe_versions[i]);
+    }
+}
+
+// Initialize Heretic(HHE)-specific dehacked bits.
+
+void DEH_HereticInit(void)
+{
+    int i;
+
+    //!
+    // @arg <version>
+    // @category mod
+    //
+    // Select the Heretic version number that was used to generate the
+    // HHE patch to be loaded.  Patches for each of the Vanilla
+    // Heretic versions (1.0, 1.2, 1.3) can be loaded, but the correct
+    // version number must be specified.
+
+    i = M_CheckParm("-hhever");
+
+    if (i > 0)
+    {
+        SetHHEVersionByName(myargv[i + 1]);
+    }
+
+    // For v1.0 patches, we must apply a slight change to the states[]
+    // table.  The table was changed between 1.0 and 1.3 to add two extra
+    // frames to the player "burning death" animation.
+    //
+    // If we are using a v1.0 patch, we must change the table to cut
+    // these out again.
+
+    if (deh_hhe_version < deh_hhe_1_2)
+    {
+        states[S_PLAY_FDTH18].nextstate = S_NULL;
+    }
+}
+
+int DEH_MapHereticThingType(int type)
+{
+    // Heretic 1.0 had an extra entry in the mobjinfo table that was removed
+    // in later versions. This has been added back into the table for
+    // compatibility. However, it also means that if we're loading a patch
+    // for a later version, we need to translate to the index used internally.
+
+    if (deh_hhe_version > deh_hhe_1_0)
+    {
+        if (type >= MT_PHOENIXFX_REMOVED)
+        {
+            ++type;
+        }
+    }
+
+    return type;
+}
+
+int DEH_MapHereticFrameNumber(int frame)
+{
+    if (deh_hhe_version < deh_hhe_1_2)
+    {
+        // Between Heretic 1.0 and 1.2, two new frames
+        // were added to the "states" table, to extend the "flame death"
+        // animation displayed when the player is killed by fire.  Therefore,
+        // we must map Heretic 1.0 frame numbers to corresponding indexes
+        // for our state table.
+
+        if (frame >= S_PLAY_FDTH19)
+        {
+            frame = (frame - S_PLAY_FDTH19) + S_BLOODYSKULL1;
+        }
+    }
+    else
+    {
+        // After Heretic 1.2, three unused frames were removed from the
+        // states table, unused phoenix rod frames.  Our state table includes
+        // these missing states for backwards compatibility.  We must therefore
+        // adjust frame numbers for v1.2/v1.3 to corresponding indexes for
+        // our state table.
+
+        if (frame >= S_PHOENIXFXIX_1)
+        {
+            frame = (frame - S_PHOENIXFXIX_1) + S_PHOENIXPUFF1;
+        }
+    }
+
+    return frame;
+}
+
+void DEH_SuggestHereticVersion(deh_hhe_version_t version)
+{
+    fprintf(stderr,
+    "\n"
+    "This patch may be for version %s. You are currently running in\n"
+    "Heretic %s mode. For %s mode, add this to your command line:\n"
+    "\n"
+    "\t-hhever %s\n"
+    "\n",
+    hhe_versions[version],
+    hhe_versions[deh_hhe_version],
+    hhe_versions[version],
+    hhe_versions[version]);
+}
+
diff --git a/games/NXDoom/src/heretic/deh_htic.h b/games/NXDoom/src/heretic/deh_htic.h
new file mode 100644
index 000000000..978d93815
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_htic.h
@@ -0,0 +1,56 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Common header for Heretic dehacked (HHE) support.
+//
+
+#ifndef DEH_HTIC_H
+#define DEH_HTIC_H
+
+#include "info.h"
+
+// HHE executable version.  Loading HHE patches is (unfortunately)
+// dependent on the version of the Heretic executable used to make them.
+
+typedef enum
+{
+    deh_hhe_1_0,
+    deh_hhe_1_2,
+    deh_hhe_1_3,
+    deh_hhe_num_versions
+} deh_hhe_version_t;
+
+// HHE doesn't know about the last two states in the state table, so
+// these are considered invalid.
+
+#define DEH_HERETIC_NUMSTATES (NUMSTATES - 2)
+
+// It also doesn't know about the last two things in the mobjinfo table
+// (which correspond to the states above)
+
+#define DEH_HERETIC_NUMMOBJTYPES (NUMMOBJTYPES - 2)
+
+void DEH_HereticInit(void);
+int DEH_MapHereticThingType(int type);
+int DEH_MapHereticFrameNumber(int frame);
+void DEH_SuggestHereticVersion(deh_hhe_version_t version);
+
+extern deh_hhe_version_t deh_hhe_version;
+
+// deh_htext.c:
+extern deh_section_t deh_section_heretic_text;
+
+
+#endif /* #ifndef DEH_HTIC_H */
+
diff --git a/games/NXDoom/src/heretic/deh_sound.c b/games/NXDoom/src/heretic/deh_sound.c
new file mode 100644
index 000000000..c889cd663
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_sound.c
@@ -0,0 +1,108 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Sound" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+#include "doomdef.h"
+#include "i_sound.h"
+
+#include "sounds.h"
+
+DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t)
+    DEH_MAPPING_STRING("Name", name)
+    DEH_UNSUPPORTED_MAPPING("Special")
+    DEH_MAPPING("Value", priority)
+    DEH_MAPPING("Unknown 1", usefulness)
+    DEH_UNSUPPORTED_MAPPING("Unknown 2")
+    DEH_UNSUPPORTED_MAPPING("Unknown 3")
+    DEH_MAPPING("One/Two", numchannels)
+DEH_END_MAPPING
+
+static void *DEH_SoundStart(deh_context_t *context, char *line)
+{
+    int sound_number = 0;
+    
+    if (sscanf(line, "Sound %i", &sound_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (sound_number < 0 || sound_number >= NUMSFX)
+    {
+        DEH_Warning(context, "Invalid sound number: %i", sound_number);
+        return NULL;
+    }
+
+    if (sound_number >= DEH_VANILLA_NUMSFX)
+    {
+        DEH_Warning(context, "Attempt to modify SFX %i.  This will cause "
+                             "problems in Vanilla dehacked.", sound_number); 
+    }
+
+    return &S_sfx[sound_number];
+}
+
+static void DEH_SoundParseLine(deh_context_t *context, char *line, void *tag)
+{
+    sfxinfo_t *sfx;
+    char *variable_name, *value;
+
+    if (tag == NULL)
+       return;
+
+    sfx = (sfxinfo_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    // Set the field value:
+
+    if (!strcasecmp(variable_name, "Name"))
+    {
+        DEH_SetStringMapping(context, &sound_mapping, sfx,
+                             variable_name, value);
+    }
+    else
+    {
+        DEH_SetMapping(context, &sound_mapping, sfx,
+                       variable_name, atoi(value));
+    }
+}
+
+deh_section_t deh_section_sound =
+{
+    "Sound",
+    NULL,
+    DEH_SoundStart,
+    DEH_SoundParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/heretic/deh_thing.c b/games/NXDoom/src/heretic/deh_thing.c
new file mode 100644
index 000000000..e9984fbde
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_thing.c
@@ -0,0 +1,144 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Thing" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "m_misc.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+#include "deh_htic.h"
+
+#include "info.h"
+
+DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
+  DEH_MAPPING("ID #",                doomednum)
+  DEH_MAPPING("Initial frame",       spawnstate)
+  DEH_MAPPING("Hit points",          spawnhealth)
+  DEH_MAPPING("First moving frame",  seestate)
+  DEH_MAPPING("Alert sound",         seesound)
+  DEH_MAPPING("Reaction time",       reactiontime)
+  DEH_MAPPING("Attack sound",        attacksound)
+  DEH_MAPPING("Injury frame",        painstate)
+  DEH_MAPPING("Pain chance",         painchance)
+  DEH_MAPPING("Pain sound",          painsound)
+  DEH_MAPPING("Close attack frame",  meleestate)
+  DEH_MAPPING("Far attack frame",    missilestate)
+  DEH_MAPPING("Burning frame",       crashstate)
+  DEH_MAPPING("Death frame",         deathstate)
+  DEH_MAPPING("Exploding frame",     xdeathstate)
+  DEH_MAPPING("Death sound",         deathsound)
+  DEH_MAPPING("Speed",               speed)
+  DEH_MAPPING("Width",               radius)
+  DEH_MAPPING("Height",              height)
+  DEH_MAPPING("Mass",                mass)
+  DEH_MAPPING("Missile damage",      damage)
+  DEH_MAPPING("Action sound",        activesound)
+  DEH_MAPPING("Bits 1",              flags)
+  DEH_MAPPING("Bits 2",              flags2)
+DEH_END_MAPPING
+
+static void *DEH_ThingStart(deh_context_t *context, char *line)
+{
+    int orig_thing_number = 0, thing_number = 0;
+    mobjinfo_t *mobj;
+
+    if (sscanf(line, "Thing %i", &orig_thing_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    // Translate to the correct thing number based on the exe version this
+    // patch was made for. Subtract one because HHE thing numbers are
+    // indexed from 1.
+
+    thing_number = DEH_MapHereticThingType(orig_thing_number - 1);
+
+    if (thing_number < 0 || thing_number >= DEH_HERETIC_NUMMOBJTYPES)
+    {
+        DEH_Warning(context, "Invalid thing number: %i", orig_thing_number);
+        return NULL;
+    }
+
+    mobj = &mobjinfo[thing_number];
+
+    return mobj;
+}
+
+static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
+{
+    mobjinfo_t *mobj;
+    char *variable_name, *value;
+    int ivalue;
+
+    if (tag == NULL)
+       return;
+
+    mobj = (mobjinfo_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    // all values are integers
+
+    ivalue = atoi(value);
+
+    // If the value to be set is a frame, the frame number must
+    // undergo transformation from a Heretic 1.0 index to a
+    // Heretic 1.3 index.
+
+    if (M_StrCaseStr(variable_name, "frame") != NULL)
+    {
+        ivalue = DEH_MapHereticFrameNumber(ivalue);
+    }
+
+    // Set the field value
+
+    DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
+}
+
+static void DEH_ThingSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMMOBJTYPES; ++i)
+    {
+        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
+    }
+}
+
+deh_section_t deh_section_thing =
+{
+    "Thing",
+    NULL,
+    DEH_ThingStart,
+    DEH_ThingParseLine,
+    NULL,
+    DEH_ThingSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/heretic/deh_weapon.c b/games/NXDoom/src/heretic/deh_weapon.c
new file mode 100644
index 000000000..cdbbbaa9f
--- /dev/null
+++ b/games/NXDoom/src/heretic/deh_weapon.c
@@ -0,0 +1,122 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Weapon" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "m_misc.h"
+
+#include "doomdef.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+#include "deh_htic.h"
+
+DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
+  DEH_MAPPING("Ammo type",        ammo)
+  DEH_MAPPING("Deselect frame",   upstate)
+  DEH_MAPPING("Select frame",     downstate)
+  DEH_MAPPING("Bobbing frame",    readystate)
+  DEH_MAPPING("Shooting frame",   atkstate)
+  DEH_MAPPING("Firing frame",     holdatkstate)
+  DEH_MAPPING("Unknown frame",    flashstate)
+DEH_END_MAPPING
+
+static void *DEH_WeaponStart(deh_context_t *context, char *line)
+{
+    int weapon_number = 0;
+
+    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (weapon_number < 0 || weapon_number >= NUMWEAPONS * 2)
+    {
+        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
+        return NULL;
+    }
+
+    // Because of the tome of power, we have two levels of weapons:
+
+    if (weapon_number < NUMWEAPONS)
+    {
+        return &wpnlev1info[weapon_number];
+    }
+    else
+    {
+        return &wpnlev2info[weapon_number - NUMWEAPONS];
+    }
+}
+
+static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    weaponinfo_t *weapon;
+    int ivalue;
+
+    if (tag == NULL)
+        return;
+
+    weapon = (weaponinfo_t *) tag;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    // If this is a frame field, we need to map from Heretic 1.0 frame
+    // numbers to Heretic 1.3 frame numbers.
+
+    if (M_StrCaseStr(variable_name, "frame") != NULL)
+    {
+        ivalue = DEH_MapHereticFrameNumber(ivalue);
+    }
+
+    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
+}
+
+static void DEH_WeaponSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMWEAPONS ;++i)
+    {
+        DEH_StructSHA1Sum(context, &weapon_mapping, &wpnlev1info[i]);
+        DEH_StructSHA1Sum(context, &weapon_mapping, &wpnlev2info[i]);
+    }
+}
+
+deh_section_t deh_section_weapon =
+{
+    "Weapon",
+    NULL,
+    DEH_WeaponStart,
+    DEH_WeaponParseLine,
+    NULL,
+    DEH_WeaponSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/heretic/doomdata.h b/games/NXDoom/src/heretic/doomdata.h
new file mode 100644
index 000000000..32bc91e6a
--- /dev/null
+++ b/games/NXDoom/src/heretic/doomdata.h
@@ -0,0 +1,192 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DoomData.h
+
+// all external data is defined here
+// most of the data is loaded into different structures at run time
+
+#ifndef __DOOMDATA__
+#define __DOOMDATA__
+
+#include "doomtype.h"
+
+/*
+===============================================================================
+
+						map level types
+
+===============================================================================
+*/
+
+// lump order in a map wad
+enum
+{
+    ML_LABEL,
+    ML_THINGS,
+    ML_LINEDEFS,
+    ML_SIDEDEFS,
+    ML_VERTEXES,
+    ML_SEGS,
+    ML_SSECTORS,
+    ML_NODES,
+    ML_SECTORS,
+    ML_REJECT,
+    ML_BLOCKMAP
+};
+
+
+typedef PACKED_STRUCT (
+{
+    short x, y;
+}) mapvertex_t;
+
+typedef PACKED_STRUCT (
+{
+    short textureoffset;
+    short rowoffset;
+    char toptexture[8], bottomtexture[8], midtexture[8];
+    short sector;               // on viewer's side
+}) mapsidedef_t;
+
+typedef PACKED_STRUCT (
+{
+    short v1, v2;
+    short flags;
+    short special, tag;
+    short sidenum[2];           // sidenum[1] will be -1 if one sided
+}) maplinedef_t;
+
+#define	ML_BLOCKING			1
+#define	ML_BLOCKMONSTERS	2
+#define	ML_TWOSIDED			4       // backside will not be present at all
+                                                                        // if not two sided
+
+// if a texture is pegged, the texture will have the end exposed to air held
+// constant at the top or bottom of the texture (stairs or pulled down things)
+// and will move with a height change of one of the neighbor sectors
+// Unpegged textures allways have the first row of the texture at the top
+// pixel of the line for both top and bottom textures (windows)
+#define	ML_DONTPEGTOP		8
+#define	ML_DONTPEGBOTTOM	16
+
+#define ML_SECRET			32      // don't map as two sided: IT'S A SECRET!
+#define ML_SOUNDBLOCK		64      // don't let sound cross two of these
+#define	ML_DONTDRAW			128     // don't draw on the automap
+#define	ML_MAPPED			256     // set if allready drawn in automap
+
+
+typedef PACKED_STRUCT (
+{
+    short floorheight, ceilingheight;
+    char floorpic[8], ceilingpic[8];
+    short lightlevel;
+    short special, tag;
+}) mapsector_t;
+
+typedef PACKED_STRUCT (
+{
+    short numsegs;
+    short firstseg;             // segs are stored sequentially
+}) mapsubsector_t;
+
+typedef PACKED_STRUCT (
+{
+    short v1, v2;
+    short angle;
+    short linedef, side;
+    short offset;
+}) mapseg_t;
+
+#define	NF_SUBSECTOR	0x8000
+typedef PACKED_STRUCT (
+{
+    short x, y, dx, dy;         // partition line
+    short bbox[2][4];           // bounding box for each child
+    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
+}) mapnode_t;
+
+typedef PACKED_STRUCT (
+{
+    short x, y;
+    short angle;
+    short type;
+    short options;
+}) mapthing_t;
+
+#define	MTF_EASY		1
+#define	MTF_NORMAL		2
+#define	MTF_HARD		4
+#define	MTF_AMBUSH		8
+
+/*
+===============================================================================
+
+						texture definition
+
+===============================================================================
+*/
+
+typedef PACKED_STRUCT (
+{
+    short originx;
+    short originy;
+    short patch;
+    short stepdir;
+    short colormap;
+}) mappatch_t;
+
+typedef PACKED_STRUCT (
+{
+    char name[8];
+    boolean masked;
+    short width;
+    short height;
+    int obsolete;
+    short patchcount;
+    mappatch_t patches[1];
+}) maptexture_t;
+
+
+/*
+===============================================================================
+
+							graphics
+
+===============================================================================
+*/
+
+// a pic is an unmasked block of pixels
+typedef struct
+{
+    byte width, height;
+    byte data;
+} pic_t;
+
+
+
+
+/*
+===============================================================================
+
+							status
+
+===============================================================================
+*/
+
+
+
+
+#endif // __DOOMDATA__
diff --git a/games/NXDoom/src/heretic/doomdef.h b/games/NXDoom/src/heretic/doomdef.h
new file mode 100644
index 000000000..8d5e13e53
--- /dev/null
+++ b/games/NXDoom/src/heretic/doomdef.h
@@ -0,0 +1,858 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// DoomDef.h
+
+#ifndef __DOOMDEF__
+#define __DOOMDEF__
+#include <stdio.h>
+#include <string.h>
+//haleyjd: removed WATCOMC
+#include <limits.h>
+
+#define HERETIC_VERSION 130
+#define HERETIC_VERSION_TEXT "v1.3"
+
+// if rangecheck is undefined, most parameter validation debugging code
+// will not be compiled
+//#define RANGECHECK
+
+// all external data is defined here
+#include "doomdata.h"
+
+// all important printed strings
+#include "dstrings.h"
+
+// header generated by multigen utility
+#include "info.h"
+
+// WAD file access
+#include "w_wad.h"
+
+// fixed_t
+#include "m_fixed.h"
+
+// angle_t 
+#include "tables.h"
+
+// events
+#include "d_event.h"
+
+// gamemode/mission
+#include "d_mode.h"
+
+// ticcmd_t
+#include "d_ticcmd.h"
+
+#include "d_loop.h"
+
+#define	SAVEGAMENAME "hticsav"
+
+/*
+===============================================================================
+
+						GLOBAL TYPES
+
+===============================================================================
+*/
+
+#define NUMARTIFCTS	28
+#define MAXPLAYERS	4
+
+#define	BT_ATTACK		1
+#define	BT_USE			2
+#define	BT_CHANGE		4       // if true, the next 3 bits hold weapon num
+#define	BT_WEAPONMASK	(8+16+32)
+#define	BT_WEAPONSHIFT	3
+
+#define BT_SPECIAL		128     // game events, not really buttons
+#define	BTS_SAVEMASK	(4+8+16)
+#define	BTS_SAVESHIFT	2
+#define	BT_SPECIALMASK	3
+#define	BTS_PAUSE		1       // pause the game
+#define	BTS_SAVEGAME	2       // save the game at each console
+// savegame slot numbers occupy the second byte of buttons
+
+typedef enum
+{
+    GS_LEVEL,
+    GS_INTERMISSION,
+    GS_FINALE,
+    GS_DEMOSCREEN
+} gamestate_t;
+
+typedef enum
+{
+    ga_nothing,
+    ga_loadlevel,
+    ga_newgame,
+    ga_loadgame,
+    ga_savegame,
+    ga_playdemo,
+    ga_completed,
+    ga_victory,
+    ga_worlddone,
+    ga_screenshot
+} gameaction_t;
+
+typedef enum
+{
+    wipe_0,
+    wipe_1,
+    wipe_2,
+    wipe_3,
+    wipe_4,
+    NUMWIPES,
+    wipe_random
+} wipe_t;
+
+/*
+===============================================================================
+
+							MAPOBJ DATA
+
+===============================================================================
+*/
+
+
+struct thinker_s;
+
+// think_t is a function pointer to a routine to handle an actor
+typedef void (*think_t) (struct thinker_s *);
+
+typedef struct thinker_s
+{
+    struct thinker_s *prev, *next;
+    think_t function;
+} thinker_t;
+
+typedef union
+{
+    int i;
+    struct mobj_s *m;
+} specialval_t;
+
+struct player_s;
+
+typedef struct mobj_s
+{
+    thinker_t thinker;          // thinker links
+
+// info for drawing
+    fixed_t x, y, z;
+    struct mobj_s *snext, *sprev;       // links in sector (if needed)
+    angle_t angle;
+    spritenum_t sprite;         // used to find patch_t and flip value
+    int frame;                  // might be ord with FF_FULLBRIGHT
+
+// interaction info
+    struct mobj_s *bnext, *bprev;       // links in blocks (if needed)
+    struct subsector_s *subsector;
+    fixed_t floorz, ceilingz;   // closest together of contacted secs
+    fixed_t radius, height;     // for movement checking
+    fixed_t momx, momy, momz;   // momentums
+
+    int validcount;             // if == validcount, already checked
+
+    mobjtype_t type;
+    mobjinfo_t *info;           // &mobjinfo[mobj->type]
+    int tics;                   // state tic counter
+    state_t *state;
+    int damage;                 // For missiles
+    int flags;
+    int flags2;                 // Heretic flags
+    specialval_t special1;      // Special info
+    specialval_t special2;      // Special info
+    int health;
+    int movedir;                // 0-7
+    int movecount;              // when 0, select a new dir
+    struct mobj_s *target;      // thing being chased/attacked (or NULL)
+    // also the originator for missiles
+    int reactiontime;           // if non 0, don't attack yet
+    // used by player to freeze a bit after
+    // teleporting
+    int threshold;              // if >0, the target will be chased
+    // no matter what (even if shot)
+    struct player_s *player;    // only valid if type == MT_PLAYER
+    int lastlook;               // player number last looked for
+
+    mapthing_t spawnpoint;      // for nightmare respawn
+} mobj_t;
+
+// each sector has a degenmobj_t in it's center for sound origin purposes
+typedef struct
+{
+    thinker_t thinker;          // not used for anything
+    fixed_t x, y, z;
+} degenmobj_t;
+
+//
+// frame flags
+//
+#define	FF_FULLBRIGHT	0x8000  // flag in thing->frame
+#define FF_FRAMEMASK	0x7fff
+
+// --- mobj.flags ---
+
+#define	MF_SPECIAL	1         // call P_SpecialThing when touched
+#define	MF_SOLID	2
+#define	MF_SHOOTABLE	4
+#define	MF_NOSECTOR	8         // don't use the sector links
+                                  // (invisible but touchable)
+#define	MF_NOBLOCKMAP	16        // don't use the blocklinks
+                                  // (inert but displayable)
+#define	MF_AMBUSH	32
+#define	MF_JUSTHIT	64        // try to attack right back
+#define	MF_JUSTATTACKED	128       // take at least one step before attacking
+#define	MF_SPAWNCEILING	256       // hang from ceiling instead of floor
+#define	MF_NOGRAVITY	512       // don't apply gravity every tic
+
+// movement flags
+#define	MF_DROPOFF	0x400     // allow jumps from high places
+#define	MF_PICKUP	0x800     // for players to pick up items
+#define	MF_NOCLIP	0x1000    // player cheat
+#define	MF_SLIDE	0x2000    // keep info about sliding along walls
+#define	MF_FLOAT	0x4000    // allow moves to any height, no gravity
+#define	MF_TELEPORT	0x8000    // don't cross lines or look at heights
+#define MF_MISSILE	0x10000   // don't hit same species, explode on block
+
+#define	MF_DROPPED	0x20000   // dropped by a demon, not level spawned
+#define	MF_SHADOW	0x40000   // use translucent draw (shadow demons / invis)
+#define	MF_NOBLOOD	0x80000   // don't bleed when shot (use puff)
+#define	MF_CORPSE	0x100000  // don't stop moving halfway off a step
+#define	MF_INFLOAT	0x200000  // floating to a height for a move, don't
+                                  // auto float to target's height
+
+#define	MF_COUNTKILL	0x400000  // count towards intermission kill total
+#define	MF_COUNTITEM	0x800000  // count towards intermission item total
+
+#define	MF_SKULLFLY	0x1000000 // skull in flight
+#define	MF_NOTDMATCH	0x2000000 // don't spawn in death match (key cards)
+
+#define	MF_TRANSLATION	0xc000000 // if 0x4 0x8 or 0xc, use a translation
+#define	MF_TRANSSHIFT	26      // table for player colormaps
+
+// --- mobj.flags2 ---
+
+#define MF2_LOGRAV		0x00000001  // alternate gravity setting
+#define MF2_WINDTHRUST		0x00000002  // gets pushed around by the wind
+                                            // specials
+#define MF2_FLOORBOUNCE		0x00000004  // bounces off the floor
+#define MF2_THRUGHOST		0x00000008  // missile will pass through ghosts
+#define MF2_FLY			0x00000010  // fly mode is active
+#define MF2_FOOTCLIP		0x00000020  // if feet are allowed to be clipped
+#define MF2_SPAWNFLOAT		0x00000040  // spawn random float z
+#define MF2_NOTELEPORT		0x00000080  // does not teleport
+#define MF2_RIP			0x00000100  // missile rips through solid
+                                            // targets
+#define MF2_PUSHABLE		0x00000200  // can be pushed by other moving
+                                            // mobjs
+#define MF2_SLIDE		0x00000400  // slides against walls
+#define MF2_ONMOBJ		0x00000800  // mobj is resting on top of another
+                                            // mobj
+#define MF2_PASSMOBJ		0x00001000  // Enable z block checking.  If on,
+                                            // this flag will allow the mobj to
+                                            // pass over/under other mobjs.
+#define MF2_CANNOTPUSH		0x00002000  // cannot push other pushable mobjs
+#define MF2_FEETARECLIPPED	0x00004000  // a mobj's feet are now being cut
+#define MF2_BOSS		0x00008000  // mobj is a major boss
+#define MF2_FIREDAMAGE		0x00010000  // does fire damage
+#define MF2_NODMGTHRUST		0x00020000  // does not thrust target when
+                                            // damaging
+#define MF2_TELESTOMP		0x00040000  // mobj can stomp another
+#define MF2_FLOATBOB		0x00080000  // use float bobbing z movement
+#define MF2_DONTDRAW		0X00100000  // don't generate a vissprite
+
+//=============================================================================
+typedef enum
+{
+    PST_LIVE,                   // playing
+    PST_DEAD,                   // dead on the ground
+    PST_REBORN                  // ready to restart
+} playerstate_t;
+
+// psprites are scaled shapes directly on the view screen
+// coordinates are given for a 320*200 view screen
+typedef enum
+{
+    ps_weapon,
+    ps_flash,
+    NUMPSPRITES
+} psprnum_t;
+
+typedef struct pspdef_s
+{
+    state_t *state;             // a NULL state means not active
+    int tics;
+    fixed_t sx, sy;
+} pspdef_t;
+
+typedef enum
+{
+    key_yellow,
+    key_green,
+    key_blue,
+    NUM_KEY_TYPES
+} keytype_t;
+
+typedef enum
+{
+    wp_staff,
+    wp_goldwand,
+    wp_crossbow,
+    wp_blaster,
+    wp_skullrod,
+    wp_phoenixrod,
+    wp_mace,
+    wp_gauntlets,
+    wp_beak,
+    NUMWEAPONS,
+    wp_nochange
+} weapontype_t;
+
+#define AMMO_GWND_WIMPY 10
+#define AMMO_GWND_HEFTY 50
+#define AMMO_CBOW_WIMPY 5
+#define AMMO_CBOW_HEFTY 20
+#define AMMO_BLSR_WIMPY 10
+#define AMMO_BLSR_HEFTY 25
+#define AMMO_SKRD_WIMPY 20
+#define AMMO_SKRD_HEFTY 100
+#define AMMO_PHRD_WIMPY 1
+#define AMMO_PHRD_HEFTY 10
+#define AMMO_MACE_WIMPY 20
+#define AMMO_MACE_HEFTY 100
+
+typedef enum
+{
+    am_goldwand,
+    am_crossbow,
+    am_blaster,
+    am_skullrod,
+    am_phoenixrod,
+    am_mace,
+    NUMAMMO,
+    am_noammo                   // staff, gauntlets
+} ammotype_t;
+
+typedef struct
+{
+    ammotype_t ammo;
+    int upstate;
+    int downstate;
+    int readystate;
+    int atkstate;
+    int holdatkstate;
+    int flashstate;
+} weaponinfo_t;
+
+extern weaponinfo_t wpnlev1info[NUMWEAPONS];
+extern weaponinfo_t wpnlev2info[NUMWEAPONS];
+
+typedef enum
+{
+    arti_none,
+    arti_invulnerability,
+    arti_invisibility,
+    arti_health,
+    arti_superhealth,
+    arti_tomeofpower,
+    arti_torch,
+    arti_firebomb,
+    arti_egg,
+    arti_fly,
+    arti_teleport,
+    NUMARTIFACTS
+} artitype_t;
+
+typedef enum
+{
+    pw_None,
+    pw_invulnerability,
+    pw_invisibility,
+    pw_allmap,
+    pw_infrared,
+    pw_weaponlevel2,
+    pw_flight,
+    pw_shield,
+    pw_health2,
+    NUMPOWERS
+} powertype_t;
+
+#define	INVULNTICS (30*35)
+#define	INVISTICS (60*35)
+#define	INFRATICS (120*35)
+#define	IRONTICS (60*35)
+#define WPNLEV2TICS (40*35)
+#define FLIGHTTICS (60*35)
+
+#define CHICKENTICS (40*35)
+
+#define MESSAGETICS (4*35)
+#define BLINKTHRESHOLD (4*32)
+
+#define NUMINVENTORYSLOTS	14
+typedef struct
+{
+    int type;
+    int count;
+} inventory_t;
+
+/*
+================
+=
+= player_t
+=
+================
+*/
+
+typedef struct player_s
+{
+    mobj_t *mo;
+    playerstate_t playerstate;
+    ticcmd_t cmd;
+
+    fixed_t viewz;              // focal origin above r.z
+    fixed_t viewheight;         // base height above floor for viewz
+    fixed_t deltaviewheight;    // squat speed
+    fixed_t bob;                // bounded/scaled total momentum
+
+    int flyheight;
+    int lookdir;
+    boolean centering;
+    int health;                 // only used between levels, mo->health
+    // is used during levels
+    int armorpoints, armortype; // armor type is 0-2
+
+    inventory_t inventory[NUMINVENTORYSLOTS];
+    artitype_t readyArtifact;
+    int artifactCount;
+    int inventorySlotNum;
+    int powers[NUMPOWERS];
+    boolean keys[NUM_KEY_TYPES];
+    boolean backpack;
+    signed int frags[MAXPLAYERS];       // kills of other players
+    weapontype_t readyweapon;
+    weapontype_t pendingweapon; // wp_nochange if not changing
+    boolean weaponowned[NUMWEAPONS];
+    int ammo[NUMAMMO];
+    int maxammo[NUMAMMO];
+    int attackdown, usedown;    // true if button down last tic
+    int cheats;                 // bit flags
+
+    int refire;                 // refired shots are less accurate
+
+    int killcount, itemcount, secretcount;      // for intermission
+    const char *message;        // hint messages
+    int messageTics;            // counter for showing messages
+    int damagecount, bonuscount;        // for screen flashing
+    int flamecount;             // for flame thrower duration
+    mobj_t *attacker;           // who did damage (NULL for floors)
+    int extralight;             // so gun flashes light up areas
+    int fixedcolormap;          // can be set to REDCOLORMAP, etc
+    int colormap;               // 0-3 for which color to draw player
+    pspdef_t psprites[NUMPSPRITES];     // view sprites (gun, etc)
+    boolean didsecret;          // true if secret level has been done
+    int chickenTics;            // player is a chicken if > 0
+    int chickenPeck;            // chicken peck countdown
+    mobj_t *rain1;              // active rain maker 1
+    mobj_t *rain2;              // active rain maker 2
+} player_t;
+
+#define CF_NOCLIP		1
+#define	CF_GODMODE		2
+#define	CF_NOMOMENTUM	4       // not really a cheat, just a debug aid
+
+#define	SBARHEIGHT	42      // status bar height at bottom of screen
+
+
+/*
+===============================================================================
+
+					GLOBAL VARIABLES
+
+===============================================================================
+*/
+
+#define TELEFOGHEIGHT (32*FRACUNIT)
+
+extern gameaction_t gameaction;
+
+extern boolean paused;
+
+extern GameMode_t gamemode;
+
+extern boolean ExtendedWAD;     // true if main WAD is the extended version
+
+extern boolean nomonsters;      // checkparm of -nomonsters
+
+extern boolean respawnparm;     // checkparm of -respawn
+
+extern boolean debugmode;       // checkparm of -debug
+
+extern boolean usergame;        // ok to save / end game
+
+extern boolean ravpic;          // checkparm of -ravpic
+
+extern boolean altpal;          // checkparm to use an alternate palette routine
+
+extern boolean cdrom;           // true if cd-rom mode active ("-cdrom")
+
+extern boolean noartiskip;      // whether shift-enter skips an artifact
+
+extern boolean viewactive;
+
+extern boolean deathmatch;      // only if started as net death
+
+extern boolean netgame;         // only true if >1 player
+
+extern boolean playeringame[MAXPLAYERS];
+
+extern int consoleplayer;       // player taking events and displaying
+
+extern int displayplayer;
+
+extern int viewangleoffset;     // ANG90 = left side, ANG270 = right
+
+extern player_t players[MAXPLAYERS];
+
+extern boolean DebugSound;      // debug flag for displaying sound info
+
+extern int GetWeaponAmmo[NUMWEAPONS];
+
+extern boolean demorecording;
+extern boolean demoplayback;
+extern boolean demoextend;      // allow demos to persist through exit/respawn
+extern int skytexture;
+
+// Truncate angleturn in ticcmds to nearest 256.
+// Used when recording Vanilla demos in netgames.
+extern boolean lowres_turn;
+
+extern gamestate_t gamestate;
+extern skill_t gameskill;
+extern boolean respawnmonsters;
+extern int gameepisode;
+extern int gamemap;
+extern int prevmap;
+extern int totalkills, totalitems, totalsecret; // for intermission
+extern int levelstarttic;       // gametic at level start
+extern int leveltime;           // tics in game play for par
+
+extern ticcmd_t *netcmds;
+
+#define SAVEGAMESIZE 0x30000
+#define SAVESTRINGSIZE 24
+
+extern mapthing_t *deathmatch_p;
+extern mapthing_t deathmatchstarts[10];
+extern mapthing_t playerstarts[MAXPLAYERS];
+extern boolean playerstartsingame[MAXPLAYERS];
+
+extern int mouseSensitivity;
+
+extern boolean precache;        // if true, load all graphics at level load
+
+extern boolean singledemo;      // quit after playing a demo from cmdline
+
+extern int bodyqueslot;
+extern skill_t startskill;
+extern int startepisode;
+extern int startmap;
+extern boolean autostart;
+extern boolean advancedemo;
+
+extern boolean testcontrols;
+extern int testcontrols_mousespeed;
+
+extern int vanilla_savegame_limit;
+extern int vanilla_demo_limit;
+
+/*
+===============================================================================
+
+					GLOBAL FUNCTIONS
+
+===============================================================================
+*/
+
+#include "z_zone.h"
+
+//----------
+//BASE LEVEL
+//----------
+void D_DoomMain(void);
+void CheckAbortStartup(void);
+void IncThermo(void);
+void InitThermo(int max);
+void tprintf(const char *string, int initflag);
+// not a globally visible function, just included for source reference
+// calls all startup code
+// parses command line options
+// if not overrided, calls N_AdvanceDemo
+
+void D_DoomLoop(void);
+// not a globally visible function, just included for source reference
+// called by D_DoomMain, never exits
+// manages timing and IO
+// calls all ?_Responder, ?_Ticker, and ?_Drawer functions
+// calls I_GetTime, I_StartFrame, and I_StartTic
+
+void D_StartTitle(void);
+
+
+//---------
+//SYSTEM IO
+//---------
+byte *I_AllocLow(int length);
+// allocates from low memory under dos, just mallocs under unix
+
+// haleyjd: was WATCOMC, preserved for historical interest.
+// This is similar to the -control structure in DOOM v1.4 and Strife.
+#if 0
+extern boolean useexterndriver;
+
+#define EBT_FIRE			1
+#define EBT_OPENDOOR 		2
+#define EBT_SPEED			4
+#define EBT_STRAFE			8
+#define EBT_MAP				0x10
+#define EBT_INVENTORYLEFT 	0x20
+#define EBT_INVENTORYRIGHT 	0x40
+#define EBT_USEARTIFACT		0x80
+#define EBT_FLYDROP			0x100
+#define EBT_CENTERVIEW		0x200
+#define EBT_PAUSE			0x400
+#define EBT_WEAPONCYCLE 	0x800
+
+typedef struct
+{
+    short vector;               // Interrupt vector
+
+    signed char moveForward;    // forward/backward (maxes at 50)
+    signed char moveSideways;   // strafe (maxes at 24)
+    short angleTurn;            // turning speed (640 [slow] 1280 [fast])
+    short angleHead;            // head angle (+2080 [left] : 0 [center] : -2048 [right])
+    signed char pitch;          // look up/down (-110 : +90)
+    signed char flyDirection;   // flyheight (+1/-1)
+    unsigned short buttons;     // EBT_* flags
+} externdata_t;
+#endif
+
+//----
+//GAME
+//----
+
+void G_DeathMatchSpawnPlayer(int playernum);
+
+void G_InitNew(skill_t skill, int episode, int map);
+
+void G_DeferedInitNew(skill_t skill, int episode, int map);
+// can be called by the startup code or M_Responder
+// a normal game starts at map 1, but a warp test can start elsewhere
+
+void G_DeferedPlayDemo(const char *demo);
+
+void G_LoadGame(char *name);
+// can be called by the startup code or M_Responder
+// calls P_SetupLevel or W_EnterWorld
+void G_DoLoadGame(void);
+
+void G_SaveGame(int slot, char *description);
+// called by M_Responder
+
+#define SAVE_GAME_TERMINATOR 0x1d
+// Support routines for saving games
+char *SV_Filename(int slot);
+void SV_Open(char *fileName);
+void SV_OpenRead(char *fileName);
+void SV_WriteSaveGameEOF(void);
+void SV_Close(void);
+void SV_Write(void *buffer, int size);
+void SV_WriteByte(byte val);
+void SV_WriteWord(unsigned short val);
+void SV_WriteLong(unsigned int val);
+void SV_Read(void *buffer, int size);
+byte SV_ReadByte(void);
+uint16_t SV_ReadWord(void);
+uint32_t SV_ReadLong(void);
+
+extern char *savegamedir;
+
+void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
+                  const char *name);
+// only called by startup code
+
+void G_PlayDemo(char *name);
+void G_TimeDemo(char *name);
+boolean G_CheckDemoStatus(void);
+void D_DoAdvanceDemo(void);
+
+void G_ExitLevel(void);
+void G_SecretExitLevel(void);
+
+void D_ProcessEvents(void);
+
+void G_WorldDone(void);
+
+void G_BuildTiccmd(ticcmd_t *cmd, int maketic);
+
+void G_Ticker(void);
+boolean G_Responder(event_t * ev);
+
+void G_ScreenShot(void);
+
+//-----
+//PLAY
+//-----
+
+extern lumpinfo_t *maplumpinfo;
+
+void P_Ticker(void);
+// called by C_Ticker
+// can call G_PlayerExited
+// carries out all thinking of monsters and players
+
+void P_SetupLevel(int episode, int map, int playermask, skill_t skill);
+// called by W_Ticker
+
+void P_Init(void);
+// called by startup code
+
+void P_ArchivePlayers(void);
+void P_UnArchivePlayers(void);
+void P_ArchiveWorld(void);
+void P_UnArchiveWorld(void);
+void P_ArchiveThinkers(void);
+void P_UnArchiveThinkers(void);
+void P_ArchiveSpecials(void);
+void P_UnArchiveSpecials(void);
+// load / save game routines
+
+
+//-------
+//REFRESH
+//-------
+
+extern boolean setsizeneeded;
+
+extern boolean BorderNeedRefresh;
+extern boolean BorderTopRefresh;
+
+extern int UpdateState;
+// define the different areas for the dirty map
+#define I_NOUPDATE	0
+#define I_FULLVIEW	1
+#define I_STATBAR	2
+#define I_MESSAGES	4
+#define I_FULLSCRN	8
+
+void R_RenderPlayerView(player_t * player);
+// called by G_Drawer
+
+void R_Init(void);
+// called by startup code
+
+void R_DrawViewBorder(void);
+void R_DrawTopBorder(void);
+// if the view size is not full screen, draws a border around it
+
+void R_SetViewSize(int blocks, int detail);
+// called by M_Responder
+
+int R_FlatNumForName(const char *name);
+
+int R_TextureNumForName(const char *name);
+int R_CheckTextureNumForName(const char *name);
+// called by P_Ticker for switches and animations
+// returns the texture number for the texture name
+
+
+//----
+//MISC
+//----
+// returns the position of the given parameter in the arg list (0 if not found)
+
+int M_DrawText(int x, int y, boolean direct, char *string);
+
+//----------------------
+// Interlude (IN_lude.c)
+//----------------------
+
+extern boolean intermission;
+
+void IN_Start(void);
+void IN_Ticker(void);
+void IN_Drawer(void);
+
+//----------------------
+// Chat mode (CT_chat.c)
+//----------------------
+
+void CT_Init(void);
+void CT_Drawer(void);
+boolean CT_Responder(event_t * ev);
+void CT_Ticker(void);
+char CT_dequeueChatChar(void);
+
+extern boolean chatmodeon;
+extern boolean ultimatemsg;
+
+//--------------------
+// Finale (F_finale.c)
+//--------------------
+
+void F_Drawer(void);
+void F_Ticker(void);
+void F_StartFinale(void);
+
+//----------------------
+// STATUS BAR (SB_bar.c)
+//----------------------
+
+
+extern boolean inventory;
+extern int curpos;
+extern int inv_ptr;
+extern int playerkeys;
+
+
+void SB_Init(void);
+boolean SB_Responder(event_t * event);
+void SB_Ticker(void);
+void SB_Drawer(void);
+
+//-----------------
+// MENU (MN_menu.c)
+//-----------------
+
+extern boolean askforquit;
+extern boolean MenuActive;
+
+void MN_Init(void);
+void MN_ActivateMenu(void);
+void MN_DeactivateMenu(void);
+boolean MN_Responder(event_t * event);
+void MN_Ticker(void);
+void MN_Drawer(void);
+void MN_DrTextA(const char *text, int x, int y);
+int MN_TextAWidth(const char *text);
+void MN_DrTextB(const char *text, int x, int y);
+int MN_TextBWidth(const char *text);
+
+#include "sounds.h"
+
+#endif // __DOOMDEF__
diff --git a/games/NXDoom/src/heretic/dstrings.h b/games/NXDoom/src/heretic/dstrings.h
new file mode 100644
index 000000000..54bb97607
--- /dev/null
+++ b/games/NXDoom/src/heretic/dstrings.h
@@ -0,0 +1,244 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// DStrings.h
+
+//---------------------------------------------------------------------------
+//
+// P_inter.c
+//
+//---------------------------------------------------------------------------
+
+// Keys
+
+#define TXT_GOTBLUEKEY			"BLUE KEY"
+#define TXT_GOTYELLOWKEY		"YELLOW KEY"
+#define TXT_GOTGREENKEY			"GREEN KEY"
+
+// Artifacts
+
+#define TXT_ARTIHEALTH			"QUARTZ FLASK"
+#define TXT_ARTIFLY				"WINGS OF WRATH"
+#define TXT_ARTIINVULNERABILITY	"RING OF INVINCIBILITY"
+#define TXT_ARTITOMEOFPOWER		"TOME OF POWER"
+#define TXT_ARTIINVISIBILITY	"SHADOWSPHERE"
+#define TXT_ARTIEGG				"MORPH OVUM"
+#define TXT_ARTISUPERHEALTH		"MYSTIC URN"
+#define TXT_ARTITORCH			"TORCH"
+#define TXT_ARTIFIREBOMB		"TIME BOMB OF THE ANCIENTS"
+#define TXT_ARTITELEPORT		"CHAOS DEVICE"
+
+// Items
+
+#define TXT_ITEMHEALTH			"CRYSTAL VIAL"
+#define TXT_ITEMBAGOFHOLDING	"BAG OF HOLDING"
+#define TXT_ITEMSHIELD1			"SILVER SHIELD"
+#define TXT_ITEMSHIELD2			"ENCHANTED SHIELD"
+#define TXT_ITEMSUPERMAP		"MAP SCROLL"
+
+// Ammo
+
+#define TXT_AMMOGOLDWAND1		"WAND CRYSTAL"
+#define TXT_AMMOGOLDWAND2		"CRYSTAL GEODE"
+#define TXT_AMMOMACE1			"MACE SPHERES"
+#define TXT_AMMOMACE2			"PILE OF MACE SPHERES"
+#define TXT_AMMOCROSSBOW1		"ETHEREAL ARROWS"
+#define TXT_AMMOCROSSBOW2		"QUIVER OF ETHEREAL ARROWS"
+#define TXT_AMMOBLASTER1		"CLAW ORB"
+#define TXT_AMMOBLASTER2		"ENERGY ORB"
+#define TXT_AMMOSKULLROD1		"LESSER RUNES"
+#define TXT_AMMOSKULLROD2		"GREATER RUNES"
+#define TXT_AMMOPHOENIXROD1		"FLAME ORB"
+#define TXT_AMMOPHOENIXROD2		"INFERNO ORB"
+
+// Weapons
+
+#define TXT_WPNMACE				"FIREMACE"
+#define TXT_WPNCROSSBOW			"ETHEREAL CROSSBOW"
+#define TXT_WPNBLASTER			"DRAGON CLAW"
+#define TXT_WPNSKULLROD			"HELLSTAFF"
+#define TXT_WPNPHOENIXROD		"PHOENIX ROD"
+#define TXT_WPNGAUNTLETS		"GAUNTLETS OF THE NECROMANCER"
+
+//---------------------------------------------------------------------------
+//
+// SB_bar.c
+//
+//---------------------------------------------------------------------------
+
+#define TXT_CHEATGODON			"GOD MODE ON"
+#define TXT_CHEATGODOFF			"GOD MODE OFF"
+#define TXT_CHEATNOCLIPON		"NO CLIPPING ON"
+#define TXT_CHEATNOCLIPOFF		"NO CLIPPING OFF"
+#define TXT_CHEATWEAPONS		"ALL WEAPONS"
+#define TXT_CHEATFLIGHTON		"FLIGHT ON"
+#define TXT_CHEATFLIGHTOFF		"FLIGHT OFF"
+#define TXT_CHEATPOWERON		"POWER ON"
+#define TXT_CHEATPOWEROFF		"POWER OFF"
+#define TXT_CHEATHEALTH			"FULL HEALTH"
+#define TXT_CHEATKEYS			"ALL KEYS"
+#define TXT_CHEATSOUNDON		"SOUND DEBUG ON"
+#define TXT_CHEATSOUNDOFF		"SOUND DEBUG OFF"
+#define TXT_CHEATTICKERON		"TICKER ON"
+#define TXT_CHEATTICKEROFF		"TICKER OFF"
+#define TXT_CHEATARTIFACTS1		"CHOOSE AN ARTIFACT ( A - J )"
+#define TXT_CHEATARTIFACTS2		"HOW MANY ( 1 - 9 )"
+#define TXT_CHEATARTIFACTS3		"YOU GOT IT"
+#define TXT_CHEATARTIFACTSFAIL	"BAD INPUT"
+#define TXT_CHEATWARP			"LEVEL WARP"
+#define TXT_CHEATSCREENSHOT		"SCREENSHOT"
+#define TXT_CHEATCHICKENON		"CHICKEN ON"
+#define TXT_CHEATCHICKENOFF		"CHICKEN OFF"
+#define TXT_CHEATMASSACRE		"MASSACRE"
+#define TXT_CHEATIDDQD			"TRYING TO CHEAT, EH?  NOW YOU DIE!"
+#define TXT_CHEATIDKFA			"CHEATER - YOU DON'T DESERVE WEAPONS"
+
+//---------------------------------------------------------------------------
+//
+// P_doors.c
+//
+//---------------------------------------------------------------------------
+
+#define TXT_NEEDBLUEKEY			"YOU NEED A BLUE KEY TO OPEN THIS DOOR"
+#define TXT_NEEDGREENKEY		"YOU NEED A GREEN KEY TO OPEN THIS DOOR"
+#define TXT_NEEDYELLOWKEY		"YOU NEED A YELLOW KEY TO OPEN THIS DOOR"
+
+//---------------------------------------------------------------------------
+//
+// G_game.c
+//
+//---------------------------------------------------------------------------
+
+#define TXT_GAMESAVED			"GAME SAVED"
+
+//---------------------------------------------------------------------------
+//
+// AM_map.c
+//
+//---------------------------------------------------------------------------
+
+#define AMSTR_FOLLOWON		"FOLLOW MODE ON"
+#define AMSTR_FOLLOWOFF		"FOLLOW MODE OFF"
+
+#define AMSTR_GRIDON		"Grid ON"
+#define AMSTR_GRIDOFF		"Grid OFF"
+
+#define AMSTR_MARKEDSPOT	"Marked Spot"
+#define AMSTR_MARKSCLEARED	"All Marks Cleared"
+
+//---------------------------------------------------------------------------
+//
+// F_finale.c
+//
+//---------------------------------------------------------------------------
+
+#define E1TEXT	"with the destruction of the iron\n"\
+					"liches and their minions, the last\n"\
+					"of the undead are cleared from this\n"\
+					"plane of existence.\n\n"\
+					"those creatures had to come from\n"\
+					"somewhere, though, and you have the\n"\
+					"sneaky suspicion that the fiery\n"\
+					"portal of hell's maw opens onto\n"\
+					"their home dimension.\n\n"\
+					"to make sure that more undead\n"\
+					"(or even worse things) don't come\n"\
+					"through, you'll have to seal hell's\n"\
+					"maw from the other side. of course\n"\
+					"this means you may get stuck in a\n"\
+					"very unfriendly world, but no one\n"\
+					"ever said being a Heretic was easy!"
+
+#define E2TEXT "the mighty maulotaurs have proved\n"\
+					"to be no match for you, and as\n"\
+					"their steaming corpses slide to the\n"\
+					"ground you feel a sense of grim\n"\
+					"satisfaction that they have been\n"\
+					"destroyed.\n\n"\
+					"the gateways which they guarded\n"\
+					"have opened, revealing what you\n"\
+					"hope is the way home. but as you\n"\
+					"step through, mocking laughter\n"\
+					"rings in your ears.\n\n"\
+					"was some other force controlling\n"\
+					"the maulotaurs? could there be even\n"\
+					"more horrific beings through this\n"\
+					"gate? the sweep of a crystal dome\n"\
+					"overhead where the sky should be is\n"\
+					"certainly not a good sign...."
+
+#define E3TEXT	"the death of d'sparil has loosed\n"\
+					"the magical bonds holding his\n"\
+					"creatures on this plane, their\n"\
+					"dying screams overwhelming his own\n"\
+					"cries of agony.\n\n"\
+					"your oath of vengeance fulfilled,\n"\
+					"you enter the portal to your own\n"\
+					"world, mere moments before the dome\n"\
+					"shatters into a million pieces.\n\n"\
+					"but if d'sparil's power is broken\n"\
+					"forever, why don't you feel safe?\n"\
+					"was it that last shout just before\n"\
+					"his death, the one that sounded\n"\
+					"like a curse? or a summoning? you\n"\
+					"can't really be sure, but it might\n"\
+					"just have been a scream.\n\n"\
+					"then again, what about the other\n"\
+					"serpent riders?"
+
+#define E4TEXT		"you thought you would return to your\n"\
+					"own world after d'sparil died, but\n"\
+					"his final act banished you to his\n"\
+					"own plane. here you entered the\n"\
+					"shattered remnants of lands\n"\
+					"conquered by d'sparil. you defeated\n"\
+					"the last guardians of these lands,\n"\
+					"but now you stand before the gates\n"\
+					"to d'sparil's stronghold. until this\n"\
+					"moment you had no doubts about your\n"\
+					"ability to face anything you might\n"\
+					"encounter, but beyond this portal\n"\
+					"lies the very heart of the evil\n"\
+					"which invaded your world. d'sparil\n"\
+					"might be dead, but the pit where he\n"\
+					"was spawned remains. now you must\n"\
+					"enter that pit in the hopes of\n"\
+					"finding a way out. and somewhere,\n"\
+					"in the darkest corner of d'sparil's\n"\
+					"demesne, his personal bodyguards\n"\
+					"await your arrival ..."
+
+#define E5TEXT		"as the final maulotaur bellows his\n"\
+					"death-agony, you realize that you\n"\
+					"have never come so close to your own\n"\
+					"destruction. not even the fight with\n"\
+					"d'sparil and his disciples had been\n"\
+					"this desperate. grimly you stare at\n"\
+					"the gates which open before you,\n"\
+					"wondering if they lead home, or if\n"\
+					"they open onto some undreamed-of\n"\
+					"horror. you find yourself wondering\n"\
+					"if you have the strength to go on,\n"\
+					"if nothing but death and pain await\n"\
+					"you. but what else can you do, if\n"\
+					"the will to fight is gone? can you\n"\
+					"force yourself to continue in the\n"\
+					"face of such despair? do you have\n"\
+					"the courage? you find, in the end,\n"\
+					"that it is not within you to\n"\
+					"surrender without a fight. eyes\n"\
+					"wide, you go to meet your fate."
+
diff --git a/games/NXDoom/src/heretic/f_finale.c b/games/NXDoom/src/heretic/f_finale.c
new file mode 100644
index 000000000..4508bd3a3
--- /dev/null
+++ b/games/NXDoom/src/heretic/f_finale.c
@@ -0,0 +1,436 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// F_finale.c
+
+#include <ctype.h>
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_swap.h"
+#include "i_video.h"
+#include "s_sound.h"
+#include "v_video.h"
+#include "am_map.h"
+
+static int finalestage;                // 0 = text, 1 = art screen
+static int finalecount;
+
+#define TEXTSPEED       3
+#define TEXTWAIT        250
+
+static const char *finaletext;
+static const char *finaleflat;
+
+static int FontABaseLump;
+
+
+/*
+=======================
+=
+= F_StartFinale
+=
+=======================
+*/
+
+void F_StartFinale(void)
+{
+    gameaction = ga_nothing;
+    gamestate = GS_FINALE;
+    viewactive = false;
+    automapactive = false;
+    players[consoleplayer].messageTics = 1;
+    players[consoleplayer].message = NULL;
+
+    switch (gameepisode)
+    {
+        case 1:
+            finaleflat = DEH_String("FLOOR25");
+            finaletext = DEH_String(E1TEXT);
+            break;
+        case 2:
+            finaleflat = DEH_String("FLATHUH1");
+            finaletext = DEH_String(E2TEXT);
+            break;
+        case 3:
+            finaleflat = DEH_String("FLTWAWA2");
+            finaletext = DEH_String(E3TEXT);
+            break;
+        case 4:
+            finaleflat = DEH_String("FLOOR28");
+            finaletext = DEH_String(E4TEXT);
+            break;
+        case 5:
+            finaleflat = DEH_String("FLOOR08");
+            finaletext = DEH_String(E5TEXT);
+            break;
+    }
+
+    finalestage = 0;
+    finalecount = 0;
+    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
+
+//      S_ChangeMusic(mus_victor, true);
+    S_StartSong(mus_cptd, true);
+}
+
+
+
+boolean F_Responder(event_t * event)
+{
+    if (event->type != ev_keydown)
+    {
+        return false;
+    }
+    if (finalestage == 1 && gameepisode == 2)
+    {                           // we're showing the water pic, make any key kick to demo mode
+        finalestage++;
+        /*
+        memset((byte *) 0xa0000, 0, SCREENWIDTH * SCREENHEIGHT);
+        memset(I_VideoBuffer, 0, SCREENWIDTH * SCREENHEIGHT);
+        I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
+        */
+        return true;
+    }
+    return false;
+}
+
+
+/*
+=======================
+=
+= F_Ticker
+=
+=======================
+*/
+
+void F_Ticker(void)
+{
+    finalecount++;
+    if (!finalestage
+        && finalecount > strlen(finaletext) * TEXTSPEED + TEXTWAIT)
+    {
+        finalecount = 0;
+        if (!finalestage)
+        {
+            finalestage = 1;
+        }
+
+//              wipegamestate = -1;             // force a wipe
+/*
+		if (gameepisode == 3)
+			S_StartMusic (mus_bunny);
+*/
+    }
+}
+
+
+/*
+=======================
+=
+= F_TextWrite
+=
+=======================
+*/
+
+
+void F_TextWrite(void)
+{
+    byte *src, *dest;
+    int x, y;
+    int count;
+    const char *ch;
+    int c;
+    int cx, cy;
+    patch_t *w;
+
+//
+// erase the entire screen to a tiled background
+//
+    src = W_CacheLumpName(finaleflat, PU_CACHE);
+    dest = I_VideoBuffer;
+    for (y = 0; y < SCREENHEIGHT; y++)
+    {
+        for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+            memcpy(dest, src + ((y & 63) << 6), 64);
+            dest += 64;
+        }
+        if (SCREENWIDTH & 63)
+        {
+            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+            dest += (SCREENWIDTH & 63);
+        }
+    }
+
+//      V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+//
+// draw some of the text onto the screen
+//
+    cx = 20;
+    cy = 5;
+    ch = finaletext;
+
+    count = (finalecount - 10) / TEXTSPEED;
+    if (count < 0)
+        count = 0;
+    for (; count; count--)
+    {
+        c = *ch++;
+        if (!c)
+            break;
+        if (c == '\n')
+        {
+            cx = 20;
+            cy += 9;
+            continue;
+        }
+
+        c = toupper(c);
+        if (c < 33)
+        {
+            cx += 5;
+            continue;
+        }
+
+        w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        if (cx + SHORT(w->width) > SCREENWIDTH)
+            break;
+        V_DrawPatch(cx, cy, w);
+        cx += SHORT(w->width);
+    }
+
+}
+
+
+void F_DrawPatchCol(int x, patch_t * patch, int col)
+{
+    column_t *column;
+    byte *source, *dest, *desttop;
+    int count;
+
+    column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
+    desttop = I_VideoBuffer + x;
+
+// step through the posts in a column
+
+    while (column->topdelta != 0xff)
+    {
+        source = (byte *) column + 3;
+        dest = desttop + column->topdelta * SCREENWIDTH;
+        count = column->length;
+
+        while (count--)
+        {
+            *dest = *source++;
+            dest += SCREENWIDTH;
+        }
+        column = (column_t *) ((byte *) column + column->length + 4);
+    }
+}
+
+/*
+==================
+=
+= F_DemonScroll
+=
+==================
+*/
+
+void F_DemonScroll(void)
+{
+    byte *p1, *p2;
+    static int yval = 0;
+    static int nextscroll = 0;
+
+    if (finalecount < nextscroll)
+    {
+        return;
+    }
+    p1 = W_CacheLumpName(DEH_String("FINAL1"), PU_LEVEL);
+    p2 = W_CacheLumpName(DEH_String("FINAL2"), PU_LEVEL);
+    if (finalecount < 70)
+    {
+        memcpy(I_VideoBuffer, p1, SCREENHEIGHT * SCREENWIDTH);
+        nextscroll = finalecount;
+        return;
+    }
+    if (yval < 64000)
+    {
+        memcpy(I_VideoBuffer, p2 + SCREENHEIGHT * SCREENWIDTH - yval, yval);
+        memcpy(I_VideoBuffer + yval, p1, SCREENHEIGHT * SCREENWIDTH - yval);
+        yval += SCREENWIDTH;
+        nextscroll = finalecount + 3;
+    }
+    else
+    {                           //else, we'll just sit here and wait, for now
+        memcpy(I_VideoBuffer, p2, SCREENWIDTH * SCREENHEIGHT);
+    }
+}
+
+/*
+==================
+=
+= F_DrawUnderwater
+=
+==================
+*/
+
+void F_DrawUnderwater(void)
+{
+    static boolean underwawa = false;
+    const char *lumpname;
+    byte *palette;
+
+    // The underwater screen has its own palette, which is rather annoying.
+    // The palette doesn't correspond to the normal palette. Because of
+    // this, we must regenerate the lookup tables used in the video scaling
+    // code.
+
+    switch (finalestage)
+    {
+        case 1:
+            if (!underwawa)
+            {
+                underwawa = true;
+                V_DrawFilledBox(0, 0, SCREENWIDTH, SCREENHEIGHT, 0);
+                lumpname = DEH_String("E2PAL");
+                palette = W_CacheLumpName(lumpname, PU_STATIC);
+                I_SetPalette(palette);
+                W_ReleaseLumpName(lumpname);
+                V_DrawRawScreen(W_CacheLumpName(DEH_String("E2END"), PU_CACHE));
+            }
+            paused = false;
+            MenuActive = false;
+            askforquit = false;
+
+            break;
+        case 2:
+            if (underwawa)
+            {
+                lumpname = DEH_String("PLAYPAL");
+                palette = W_CacheLumpName(lumpname, PU_STATIC);
+                I_SetPalette(palette);
+                W_ReleaseLumpName(lumpname);
+                underwawa = false;
+            }
+            V_DrawRawScreen(W_CacheLumpName(DEH_String("TITLE"), PU_CACHE));
+            //D_StartTitle(); // go to intro/demo mode.
+    }
+}
+
+
+#if 0
+/*
+==================
+=
+= F_BunnyScroll
+=
+==================
+*/
+
+void F_BunnyScroll(void)
+{
+    int scrolled, x;
+    patch_t *p1, *p2;
+    char name[10];
+    int stage;
+    static int laststage;
+
+    p1 = W_CacheLumpName("PFUB2", PU_LEVEL);
+    p2 = W_CacheLumpName("PFUB1", PU_LEVEL);
+
+    V_MarkRect(0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+    scrolled = 320 - (finalecount - 230) / 2;
+    if (scrolled > 320)
+        scrolled = 320;
+    if (scrolled < 0)
+        scrolled = 0;
+
+    for (x = 0; x < SCREENWIDTH; x++)
+    {
+        if (x + scrolled < 320)
+            F_DrawPatchCol(x, p1, x + scrolled);
+        else
+            F_DrawPatchCol(x, p2, x + scrolled - 320);
+    }
+
+    if (finalecount < 1130)
+        return;
+    if (finalecount < 1180)
+    {
+        V_DrawPatch((SCREENWIDTH - 13 * 8) / 2, (SCREENHEIGHT - 8 * 8) / 2, 0,
+                    W_CacheLumpName("END0", PU_CACHE));
+        laststage = 0;
+        return;
+    }
+
+    stage = (finalecount - 1180) / 5;
+    if (stage > 6)
+        stage = 6;
+    if (stage > laststage)
+    {
+        S_StartSound(NULL, sfx_pistol);
+        laststage = stage;
+    }
+
+    M_snprintf(name, sizeof(name), "END%i", stage);
+    V_DrawPatch((SCREENWIDTH - 13 * 8) / 2, (SCREENHEIGHT - 8 * 8) / 2,
+                W_CacheLumpName(name, PU_CACHE));
+}
+#endif
+
+/*
+=======================
+=
+= F_Drawer
+=
+=======================
+*/
+
+void F_Drawer(void)
+{
+    UpdateState |= I_FULLSCRN;
+    if (!finalestage)
+        F_TextWrite();
+    else
+    {
+        switch (gameepisode)
+        {
+            case 1:
+                if (gamemode == shareware)
+                {
+                    V_DrawRawScreen(W_CacheLumpName("ORDER", PU_CACHE));
+                }
+                else
+                {
+                    V_DrawRawScreen(W_CacheLumpName("CREDIT", PU_CACHE));
+                }
+                break;
+            case 2:
+                F_DrawUnderwater();
+                break;
+            case 3:
+                F_DemonScroll();
+                break;
+            case 4:            // Just show credits screen for extended episodes
+            case 5:
+                V_DrawRawScreen(W_CacheLumpName("CREDIT", PU_CACHE));
+                break;
+        }
+    }
+}
diff --git a/games/NXDoom/src/heretic/g_game.c b/games/NXDoom/src/heretic/g_game.c
new file mode 100644
index 000000000..01bcc4aeb
--- /dev/null
+++ b/games/NXDoom/src/heretic/g_game.c
@@ -0,0 +1,2284 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// G_game.c
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "doomdef.h"
+#include "doomkeys.h"
+#include "deh_str.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_timer.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+// Macros
+
+#define AM_STARTKEY     9
+
+// Functions
+
+void G_ReadDemoTiccmd(ticcmd_t * cmd);
+void G_WriteDemoTiccmd(ticcmd_t * cmd);
+void G_PlayerReborn(int player);
+
+void G_DoReborn(int playernum);
+
+void G_DoLoadLevel(void);
+void G_DoNewGame(void);
+void G_DoPlayDemo(void);
+void G_DoCompleted(void);
+void G_DoVictory(void);
+void G_DoWorldDone(void);
+void G_DoSaveGame(void);
+
+void D_PageTicker(void);
+void D_AdvanceDemo(void);
+
+static boolean InventoryMoveLeft();
+static boolean InventoryMoveRight();
+
+struct
+{
+    int type;   // mobjtype_t
+    int speed[2];
+} MonsterMissileInfo[] = {
+    { MT_IMPBALL, { 10, 20 } },
+    { MT_MUMMYFX1, { 9, 18 } },
+    { MT_KNIGHTAXE, { 9, 18 } },
+    { MT_REDAXE, { 9, 18 } },
+    { MT_BEASTBALL, { 12, 20 } },
+    { MT_WIZFX1, { 18, 24 } },
+    { MT_SNAKEPRO_A, { 14, 20 } },
+    { MT_SNAKEPRO_B, { 14, 20 } },
+    { MT_HEADFX1, { 13, 20 } },
+    { MT_HEADFX3, { 10, 18 } },
+    { MT_MNTRFX1, { 20, 26 } },
+    { MT_MNTRFX2, { 14, 20 } },
+    { MT_SRCRFX1, { 20, 28 } },
+    { MT_SOR2FX1, { 20, 28 } },
+    { -1, { -1, -1 } }                 // Terminator
+};
+
+gameaction_t gameaction;
+gamestate_t gamestate;
+skill_t gameskill;
+boolean respawnmonsters;
+int gameepisode;
+int gamemap;
+int prevmap;
+
+boolean paused;
+boolean sendpause;              // send a pause event next tic
+boolean sendsave;               // send a save event next tic
+boolean usergame;               // ok to save / end game
+
+boolean timingdemo;             // if true, exit with report on completion
+int starttime;                  // for comparative timing purposes
+
+boolean viewactive;
+
+boolean deathmatch;             // only if started as net death
+boolean netgame;                // only true if packets are broadcast
+boolean playeringame[MAXPLAYERS];
+player_t players[MAXPLAYERS];
+
+int consoleplayer;              // player taking events and displaying
+int displayplayer;              // view being displayed
+int levelstarttic;              // gametic at level start
+int totalkills, totalitems, totalsecret;        // for intermission
+
+int mouseSensitivity;
+
+char *demoname;
+boolean demorecording;
+boolean longtics;               // specify high resolution turning in demos
+boolean lowres_turn;
+boolean shortticfix;            // calculate lowres turning like doom
+boolean demoplayback;
+boolean netdemo;
+boolean demoextend;
+byte *demobuffer, *demo_p, *demoend;
+boolean singledemo;             // quit after playing a demo from cmdline
+
+boolean precache = true;        // if true, load all graphics at start
+
+// TODO: Heretic uses 16-bit shorts for consistency?
+byte consistancy[MAXPLAYERS][BACKUPTICS];
+char *savegamedir;
+
+boolean testcontrols = false;
+int testcontrols_mousespeed;
+
+
+//
+// controls (have defaults)
+//
+
+
+
+#define MAXPLMOVE       0x32
+
+fixed_t forwardmove[2] = { 0x19, 0x32 };
+fixed_t sidemove[2] = { 0x18, 0x28 };
+fixed_t angleturn[3] = { 640, 1280, 320 };      // + slow turn
+
+static int *weapon_keys[] =
+{
+    &key_weapon1,
+    &key_weapon2,
+    &key_weapon3,
+    &key_weapon4,
+    &key_weapon5,
+    &key_weapon6,
+    &key_weapon7
+};
+
+// Set to -1 or +1 to switch to the previous or next weapon.
+
+static int next_weapon = 0;
+
+// Used for prev/next weapon keys.
+
+static const struct
+{
+    weapontype_t weapon;
+    weapontype_t weapon_num;
+} weapon_order_table[] = {
+    { wp_staff,       wp_staff },
+    { wp_gauntlets,   wp_staff },
+    { wp_goldwand,    wp_goldwand },
+    { wp_crossbow,    wp_crossbow },
+    { wp_blaster,     wp_blaster },
+    { wp_skullrod,    wp_skullrod },
+    { wp_phoenixrod,  wp_phoenixrod },
+    { wp_mace,        wp_mace },
+    { wp_beak,        wp_beak },
+};
+
+#define SLOWTURNTICS    6
+
+#define NUMKEYS 256
+boolean gamekeydown[NUMKEYS];
+int turnheld;                   // for accelerative turning
+int lookheld;
+
+
+boolean mousearray[MAX_MOUSE_BUTTONS + 1];
+boolean *mousebuttons = &mousearray[1];
+        // allow [-1]
+int mousex, mousey;             // mouse values are used once
+int dclicktime, dclickstate, dclicks;
+int dclicktime2, dclickstate2, dclicks2;
+
+#define MAX_JOY_BUTTONS 20
+
+int joyxmove, joyymove;         // joystick values are repeated
+int joystrafemove;
+int joylook;
+boolean joyarray[MAX_JOY_BUTTONS + 1];
+boolean *joybuttons = &joyarray[1];     // allow [-1]
+
+int savegameslot;
+char savedescription[32];
+
+int vanilla_demo_limit = 1;
+
+int inventoryTics;
+
+// haleyjd: removed WATCOMC
+
+//=============================================================================
+// Not used - ripped out for Heretic
+/*
+int G_CmdChecksum(ticcmd_t *cmd)
+{
+	int     i;
+	int sum;
+
+	sum = 0;
+	for(i = 0; i < sizeof(*cmd)/4-1; i++)
+	{
+		sum += ((int *)cmd)[i];
+	}
+	return(sum);
+}
+*/
+
+static boolean WeaponSelectable(weapontype_t weapon)
+{
+    if (weapon == wp_beak)
+    {
+        return false;
+    }
+
+    return players[consoleplayer].weaponowned[weapon];
+}
+
+static int G_NextWeapon(int direction)
+{
+    weapontype_t weapon;
+    int start_i, i;
+
+    // Find index in the table.
+
+    if (players[consoleplayer].pendingweapon == wp_nochange)
+    {
+        weapon = players[consoleplayer].readyweapon;
+    }
+    else
+    {
+        weapon = players[consoleplayer].pendingweapon;
+    }
+
+    for (i=0; i<arrlen(weapon_order_table); ++i)
+    {
+        if (weapon_order_table[i].weapon == weapon)
+        {
+            break;
+        }
+    }
+
+    // The current weapon must be present in weapon_order_table
+    // otherwise something has gone terribly wrong
+    if (i >= arrlen(weapon_order_table)) {
+        I_Error("Internal error: weapon %d not present in weapon_order_table", weapon);
+    }
+
+    // Switch weapon. Don't loop forever.
+    start_i = i;
+    do
+    {
+        i += direction;
+        i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
+    } while (i != start_i && !WeaponSelectable(weapon_order_table[i].weapon));
+
+    return weapon_order_table[i].weapon_num;
+}
+
+/*
+====================
+=
+= G_BuildTiccmd
+=
+= Builds a ticcmd from all of the available inputs or reads it from the
+= demo buffer.
+= If recording a demo, write it out
+====================
+*/
+
+
+boolean usearti = true;
+
+void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
+{
+    int i;
+    boolean strafe, bstrafe;
+    int speed, tspeed, lspeed;
+    int forward, side;
+    int look, arti;
+    int flyheight;
+
+    // haleyjd: removed externdriver crap
+
+    memset(cmd, 0, sizeof(*cmd));
+    //cmd->consistancy =
+    //      consistancy[consoleplayer][(maketic*ticdup)%BACKUPTICS];
+    cmd->consistancy = consistancy[consoleplayer][maketic % BACKUPTICS];
+
+//printf ("cons: %i\n",cmd->consistancy);
+
+    strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe]
+        || joybuttons[joybstrafe];
+    speed = joybspeed >= MAX_JOY_BUTTONS
+         || gamekeydown[key_speed]
+         || joybuttons[joybspeed]
+         || mousebuttons[mousebspeed];
+
+    // haleyjd: removed externdriver crap
+    
+    forward = side = look = arti = flyheight = 0;
+
+//
+// use two stage accelerative turning on the keyboard and joystick
+//
+    if (joyxmove < 0 || joyxmove > 0
+        || gamekeydown[key_right] || gamekeydown[key_left]
+        || mousebuttons[mousebturnright] || mousebuttons[mousebturnleft])
+        turnheld += ticdup;
+    else
+        turnheld = 0;
+    if (turnheld < SLOWTURNTICS)
+        tspeed = 2;             // slow turn
+    else
+        tspeed = speed;
+
+    if (gamekeydown[key_lookdown] || gamekeydown[key_lookup])
+    {
+        lookheld += ticdup;
+    }
+    else
+    {
+        lookheld = 0;
+    }
+    if (lookheld < SLOWTURNTICS)
+    {
+        lspeed = 1;
+    }
+    else
+    {
+        lspeed = 2;
+    }
+
+//
+// let movement keys cancel each other out
+//
+    if (strafe)
+    {
+        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+            side += sidemove[speed];
+        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+            side -= sidemove[speed];
+        if (use_analog && joyxmove)
+        {
+            joyxmove = joyxmove * joystick_move_sensitivity / 10;
+            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
+            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
+            side += FixedMul(sidemove[speed], joyxmove);
+        }
+        else if (joystick_move_sensitivity)
+        {
+            if (joyxmove > 0)
+                side += sidemove[speed];
+            if (joyxmove < 0)
+                side -= sidemove[speed];
+        }
+    }
+    else
+    {
+        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+            cmd->angleturn -= angleturn[tspeed];
+        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+            cmd->angleturn += angleturn[tspeed];
+        if (use_analog && joyxmove)
+        {
+            // Cubic response curve allows for finer control when stick
+            // deflection is small.
+            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
+            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
+            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
+        }
+        else if (joystick_turn_sensitivity)
+        {
+            if (joyxmove > 0)
+                cmd->angleturn -= angleturn[tspeed];
+            if (joyxmove < 0)
+                cmd->angleturn += angleturn[tspeed];
+        }
+    }
+
+    if (gamekeydown[key_up])
+        forward += forwardmove[speed];
+    if (gamekeydown[key_down])
+        forward -= forwardmove[speed];
+    if (use_analog && joyymove)
+    {
+        joyymove = joyymove * joystick_move_sensitivity / 10;
+        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
+        joyymove = (joyymove < -FRACUNIT) ? FRACUNIT : joyymove;
+        forward -= FixedMul(forwardmove[speed], joyymove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joyymove < 0)
+            forward += forwardmove[speed];
+        if (joyymove > 0)
+            forward -= forwardmove[speed];
+    }
+    if (gamekeydown[key_straferight] || mousebuttons[mousebstraferight]
+     || joybuttons[joybstraferight])
+        side += sidemove[speed];
+    if (gamekeydown[key_strafeleft] || mousebuttons[mousebstrafeleft]
+     || joybuttons[joybstrafeleft])
+        side -= sidemove[speed];
+
+    if (use_analog && joystrafemove)
+    {
+        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
+        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
+        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
+        side += FixedMul(sidemove[speed], joystrafemove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joystrafemove < 0)
+            side -= sidemove[speed];
+        if (joystrafemove > 0)
+            side += sidemove[speed];
+    }
+    // Look up/down/center keys
+    if (gamekeydown[key_lookup])
+    {
+        look = lspeed;
+    }
+    if (gamekeydown[key_lookdown])
+    {
+        look = -lspeed;
+    }
+    if (use_analog && joylook)
+    {
+        joylook = joylook * joystick_look_sensitivity / 10;
+        joylook = (joylook > FRACUNIT) ? FRACUNIT : joylook;
+        joylook = (joylook < -FRACUNIT) ? -FRACUNIT : joylook;
+        look = -FixedMul(2, joylook);
+    }
+    else if (joystick_look_sensitivity)
+    {
+        if (joylook < 0)
+        {
+            look = lspeed;
+        }
+
+        if (joylook > 0)
+        {
+            look = -lspeed;
+        }
+    }
+    // haleyjd: removed externdriver crap
+    if (gamekeydown[key_lookcenter])
+    {
+        look = TOCENTER;
+    }
+
+    // haleyjd: removed externdriver crap
+    
+    // Fly up/down/drop keys
+    if (gamekeydown[key_flyup] || joybuttons[joybflyup])
+    {
+        flyheight = 5;          // note that the actual flyheight will be twice this
+    }
+    if (gamekeydown[key_flydown] || joybuttons[joybflydown])
+    {
+        flyheight = -5;
+    }
+    if (gamekeydown[key_flycenter] || joybuttons[joybflycenter])
+    {
+        flyheight = TOCENTER;
+        // haleyjd: removed externdriver crap
+        look = TOCENTER;
+    }
+
+    // Use artifact key
+    if (gamekeydown[key_useartifact] || mousebuttons[mousebuseartifact]
+        || joybuttons[joybuseartifact])
+    {
+        if (gamekeydown[key_speed] && !noartiskip)
+        {
+            if (players[consoleplayer].inventory[inv_ptr].type != arti_none)
+            {
+                gamekeydown[key_useartifact] = false;
+                mousebuttons[mousebuseartifact] = false;
+                cmd->arti = 0xff;       // skip artifact code
+            }
+        }
+        else
+        {
+            if (inventory)
+            {
+                players[consoleplayer].readyArtifact =
+                    players[consoleplayer].inventory[inv_ptr].type;
+                inventory = false;
+                cmd->arti = 0;
+                usearti = false;
+            }
+            else if (usearti)
+            {
+                cmd->arti = players[consoleplayer].inventory[inv_ptr].type;
+                usearti = false;
+            }
+        }
+    }
+    if (gamekeydown[key_arti_tome] && !cmd->arti
+        && !players[consoleplayer].powers[pw_weaponlevel2])
+    {
+        gamekeydown[key_arti_tome] = false;
+        cmd->arti = arti_tomeofpower;
+    }
+    else if (gamekeydown[key_arti_quartz] && !cmd->arti
+        && (players[consoleplayer].mo->health < MAXHEALTH))
+    {
+        gamekeydown[key_arti_quartz] = false;
+        cmd->arti = arti_health;
+    }
+    else if (gamekeydown[key_arti_urn] && !cmd->arti)
+    {
+        gamekeydown[key_arti_urn] = false;
+        cmd->arti = arti_superhealth;
+    }
+    else if (gamekeydown[key_arti_bomb] && !cmd->arti)
+    {
+        gamekeydown[key_arti_bomb] = false;
+        cmd->arti = arti_firebomb;
+    }
+    else if (gamekeydown[key_arti_ring] && !cmd->arti)
+    {
+        gamekeydown[key_arti_ring] = false;
+        cmd->arti = arti_invulnerability;
+    }
+    else if (gamekeydown[key_arti_chaosdevice] && !cmd->arti)
+    {
+        gamekeydown[key_arti_chaosdevice] = false;
+        cmd->arti = arti_teleport;
+    }
+    else if (gamekeydown[key_arti_shadowsphere] && !cmd->arti)
+    {
+        gamekeydown[key_arti_shadowsphere] = false;
+        cmd->arti = arti_invisibility;
+    }
+    else if (gamekeydown[key_arti_wings] && !cmd->arti)
+    {
+        gamekeydown[key_arti_wings] = false;
+        cmd->arti = arti_fly;
+    }
+    else if (gamekeydown[key_arti_torch] && !cmd->arti)
+    {
+        gamekeydown[key_arti_torch] = false;
+        cmd->arti = arti_torch;
+    }
+    else if (gamekeydown[key_arti_morph] && !cmd->arti)
+    {
+        gamekeydown[key_arti_morph] = false;
+        cmd->arti = arti_egg;
+    }
+
+//
+// buttons
+//
+    cmd->chatchar = CT_dequeueChatChar();
+
+    if (gamekeydown[key_fire] || mousebuttons[mousebfire]
+        || joybuttons[joybfire])
+        cmd->buttons |= BT_ATTACK;
+
+    if (gamekeydown[key_use] || joybuttons[joybuse] || mousebuttons[mousebuse])
+    {
+        cmd->buttons |= BT_USE;
+        dclicks = 0;            // clear double clicks if hit use button
+    }
+
+    // If the previous or next weapon button is pressed, the
+    // next_weapon variable is set to change weapons when
+    // we generate a ticcmd.  Choose a new weapon.
+    // (Can't weapon cycle when the player is a chicken)
+
+    if (gamestate == GS_LEVEL
+     && players[consoleplayer].chickenTics == 0 && next_weapon != 0)
+    {
+        i = G_NextWeapon(next_weapon);
+        cmd->buttons |= BT_CHANGE;
+        cmd->buttons |= i << BT_WEAPONSHIFT;
+    }
+    else
+    {
+        for (i=0; i<arrlen(weapon_keys); ++i)
+        {
+            int key = *weapon_keys[i];
+
+            if (gamekeydown[key])
+            {
+                cmd->buttons |= BT_CHANGE; 
+                cmd->buttons |= i<<BT_WEAPONSHIFT; 
+                break; 
+            }
+        }
+    }
+
+    next_weapon = 0;
+
+//
+// mouse
+//
+    if (mousebuttons[mousebforward])
+    {
+        forward += forwardmove[speed];
+    }
+
+    if (mousebuttons[mousebbackward])
+    {
+	forward -= forwardmove[speed];
+    }
+
+    // Double click to use can be disabled 
+   
+    if (dclick_use)
+    {
+	//
+	// forward double click
+	//
+	if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1)
+	{
+	    dclickstate = mousebuttons[mousebforward];
+	    if (dclickstate)
+		dclicks++;
+	    if (dclicks == 2)
+	    {
+		cmd->buttons |= BT_USE;
+		dclicks = 0;
+	    }
+	    else
+		dclicktime = 0;
+	}
+	else
+	{
+	    dclicktime += ticdup;
+	    if (dclicktime > 20)
+	    {
+		dclicks = 0;
+		dclickstate = 0;
+	    }
+	}
+
+	//
+	// strafe double click
+	//
+
+	bstrafe = mousebuttons[mousebstrafe] || joybuttons[joybstrafe];
+	if (bstrafe != dclickstate2 && dclicktime2 > 1)
+	{
+	    dclickstate2 = bstrafe;
+	    if (dclickstate2)
+		dclicks2++;
+	    if (dclicks2 == 2)
+	    {
+		cmd->buttons |= BT_USE;
+		dclicks2 = 0;
+	    }
+	    else
+		dclicktime2 = 0;
+	}
+	else
+	{
+	    dclicktime2 += ticdup;
+	    if (dclicktime2 > 20)
+	    {
+		dclicks2 = 0;
+		dclickstate2 = 0;
+	    }
+	}
+    }
+
+    if (strafe)
+    {
+        side += mousex * 2;
+    }
+    else
+    {
+        cmd->angleturn -= mousex * 0x8;
+    }
+
+    // No mouse movement in previous frame?
+
+    if (mousex == 0)
+    {
+        testcontrols_mousespeed = 0;
+    }
+
+    forward += mousey;
+    mousex = mousey = 0;
+
+    if (forward > MAXPLMOVE)
+        forward = MAXPLMOVE;
+    else if (forward < -MAXPLMOVE)
+        forward = -MAXPLMOVE;
+    if (side > MAXPLMOVE)
+        side = MAXPLMOVE;
+    else if (side < -MAXPLMOVE)
+        side = -MAXPLMOVE;
+
+    cmd->forwardmove += forward;
+    cmd->sidemove += side;
+    if (players[consoleplayer].playerstate == PST_LIVE)
+    {
+        if (look < 0)
+        {
+            look += 16;
+        }
+        cmd->lookfly = look;
+    }
+    if (flyheight < 0)
+    {
+        flyheight += 16;
+    }
+    cmd->lookfly |= flyheight << 4;
+
+//
+// special buttons
+//
+    if (sendpause)
+    {
+        sendpause = false;
+        cmd->buttons = BT_SPECIAL | BTS_PAUSE;
+    }
+
+    if (sendsave)
+    {
+        sendsave = false;
+        cmd->buttons =
+            BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
+    }
+
+    if (lowres_turn)
+    {
+        if (shortticfix)
+        {
+            static signed short carry = 0;
+            signed short desired_angleturn;
+
+            desired_angleturn = cmd->angleturn + carry;
+
+            // round angleturn to the nearest 256 unit boundary
+            // for recording demos with single byte values for turn
+
+            cmd->angleturn = (desired_angleturn + 128) & 0xff00;
+
+            // Carry forward the error from the reduced resolution to the
+            // next tic, so that successive small movements can accumulate.
+
+            carry = desired_angleturn - cmd->angleturn;
+        }
+        else
+        {
+            // truncate angleturn to the nearest 256 boundary
+            // for recording demos with single byte values for turn
+            cmd->angleturn &= 0xff00;
+        }
+    }
+}
+
+
+/*
+==============
+=
+= G_DoLoadLevel
+=
+==============
+*/
+
+void G_DoLoadLevel(void)
+{
+    int i;
+
+    levelstarttic = gametic;    // for time calculation
+    gamestate = GS_LEVEL;
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (playeringame[i] && players[i].playerstate == PST_DEAD)
+            players[i].playerstate = PST_REBORN;
+        memset(players[i].frags, 0, sizeof(players[i].frags));
+    }
+
+    P_SetupLevel(gameepisode, gamemap, 0, gameskill);
+    displayplayer = consoleplayer;      // view the guy you are playing
+    gameaction = ga_nothing;
+    Z_CheckHeap();
+
+//
+// clear cmd building stuff
+//
+
+    memset(gamekeydown, 0, sizeof(gamekeydown));
+    joyxmove = joyymove = joystrafemove = joylook = 0;
+    mousex = mousey = 0;
+    sendpause = sendsave = paused = false;
+    memset(mousearray, 0, sizeof(mousearray));
+    memset(joyarray, 0, sizeof(joyarray));
+
+    if (testcontrols)
+    {
+        P_SetMessage(&players[consoleplayer], "PRESS ESCAPE TO QUIT.", false);
+    }
+}
+
+static void SetJoyButtons(unsigned int buttons_mask)
+{
+    int i;
+    player_t* plr;
+
+    plr = &players[consoleplayer];
+
+    for (i=0; i<MAX_JOY_BUTTONS; ++i)
+    {
+        int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!joybuttons[i] && button_on)
+        {
+            // Weapon cycling:
+
+            if (i == joybprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == joybnextweapon)
+            {
+                next_weapon = 1;
+            }
+            else if (i == joybinvleft)
+            {
+                InventoryMoveLeft();
+            }
+            else if (i == joybinvright)
+            {
+                InventoryMoveRight();
+            }
+            else if (i == joybuseartifact)
+            {
+                if (!inventory)
+                {
+                    plr->readyArtifact = plr->inventory[inv_ptr].type;
+                }
+                usearti = true;
+            }
+        }
+
+        joybuttons[i] = button_on;
+    }
+}
+
+// If an InventoryMove*() function is called when the inventory is not active,
+// it will instead activate the inventory without attempting to change the
+// selected item. This action is indicated by a return value of false.
+// Otherwise, it attempts to change items and will return a value of true.
+
+static boolean InventoryMoveLeft()
+{
+    inventoryTics = 5 * 35;
+    if (!inventory)
+    {
+        inventory = true;
+        return false;
+    }
+    inv_ptr--;
+    if (inv_ptr < 0)
+    {
+        inv_ptr = 0;
+    }
+    else
+    {
+        curpos--;
+        if (curpos < 0)
+        {
+            curpos = 0;
+        }
+    }
+    return true;
+}
+
+static boolean InventoryMoveRight()
+{
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+    inventoryTics = 5 * 35;
+    if (!inventory)
+    {
+        inventory = true;
+        return false;
+    }
+    inv_ptr++;
+    if (inv_ptr >= plr->inventorySlotNum)
+    {
+        inv_ptr--;
+        if (inv_ptr < 0)
+            inv_ptr = 0;
+    }
+    else
+    {
+        curpos++;
+        if (curpos > 6)
+        {
+            curpos = 6;
+        }
+    }
+    return true;
+}
+
+static void SetMouseButtons(unsigned int buttons_mask)
+{
+    int i;
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+
+    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
+    {
+        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!mousebuttons[i] && button_on)
+        {
+            if (i == mousebprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == mousebnextweapon)
+            {
+                next_weapon = 1;
+            }
+            else if (i == mousebinvleft)
+            {
+                InventoryMoveLeft();
+            }
+            else if (i == mousebinvright)
+            {
+                InventoryMoveRight();
+            }
+            else if (i == mousebuseartifact)
+            {
+                if (!inventory)
+                {
+                    plr->readyArtifact = plr->inventory[inv_ptr].type;
+                }
+                usearti = true;
+            }
+        }
+
+        mousebuttons[i] = button_on;
+    }
+}
+
+/*
+===============================================================================
+=
+= G_Responder
+=
+= get info needed to make ticcmd_ts for the players
+=
+===============================================================================
+*/
+
+boolean G_Responder(event_t * ev)
+{
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+    if (ev->type == ev_keyup && ev->data1 == key_useartifact)
+    {                           // flag to denote that it's okay to use an artifact
+        if (!inventory)
+        {
+            plr->readyArtifact = plr->inventory[inv_ptr].type;
+        }
+        usearti = true;
+    }
+
+    // Check for spy mode player cycle
+    if (gamestate == GS_LEVEL && ev->type == ev_keydown
+        && ev->data1 == KEY_F12 && !deathmatch)
+    {                           // Cycle the display player
+        do
+        {
+            displayplayer++;
+            if (displayplayer == MAXPLAYERS)
+            {
+                displayplayer = 0;
+            }
+        }
+        while (!playeringame[displayplayer]
+               && displayplayer != consoleplayer);
+        return (true);
+    }
+
+    if (gamestate == GS_LEVEL)
+    {
+        if (CT_Responder(ev))
+        {                       // Chat ate the event
+            return (true);
+        }
+        if (SB_Responder(ev))
+        {                       // Status bar ate the event
+            return (true);
+        }
+        if (AM_Responder(ev))
+        {                       // Automap ate the event
+            return (true);
+        }
+    }
+
+    if (ev->type == ev_mouse)
+    {
+        testcontrols_mousespeed = abs(ev->data2);
+    }
+
+    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
+    {
+        next_weapon = -1;
+    }
+    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
+    {
+        next_weapon = 1;
+    }
+
+    switch (ev->type)
+    {
+        case ev_keydown:
+            if (ev->data1 == key_invleft)
+            {
+                if (InventoryMoveLeft())
+                {
+                    return (true);
+                }
+                break;
+            }
+            if (ev->data1 == key_invright)
+            {
+                if (InventoryMoveRight())
+                {
+                    return (true);
+                }
+                break;
+            }
+            if (ev->data1 == key_pause && !MenuActive)
+            {
+                sendpause = true;
+                return (true);
+            }
+            if (ev->data1 < NUMKEYS)
+            {
+                gamekeydown[ev->data1] = true;
+            }
+            return (true);      // eat key down events
+
+        case ev_keyup:
+            if (ev->data1 < NUMKEYS)
+            {
+                gamekeydown[ev->data1] = false;
+            }
+            return (false);     // always let key up events filter down
+
+        case ev_mouse:
+            SetMouseButtons(ev->data1);
+            mousex = ev->data2 * (mouseSensitivity + 5) / 10;
+            mousey = ev->data3 * (mouseSensitivity + 5) / 10;
+            return (true);      // eat events
+
+        case ev_joystick:
+            SetJoyButtons(ev->data1);
+            joyxmove = ev->data2;
+            joyymove = ev->data3;
+            joystrafemove = ev->data4;
+            joylook = ev->data5;
+            return (true);      // eat events
+
+        default:
+            break;
+    }
+    return (false);
+}
+
+/*
+===============================================================================
+=
+= G_Ticker
+=
+===============================================================================
+*/
+
+void G_Ticker(void)
+{
+    int i, buf;
+    ticcmd_t *cmd = NULL;
+
+//
+// do player reborns if needed
+//
+    for (i = 0; i < MAXPLAYERS; i++)
+        if (playeringame[i] && players[i].playerstate == PST_REBORN)
+            G_DoReborn(i);
+
+//
+// do things to change the game state
+//
+    while (gameaction != ga_nothing)
+    {
+        switch (gameaction)
+        {
+            case ga_loadlevel:
+                G_DoLoadLevel();
+                break;
+            case ga_newgame:
+                G_DoNewGame();
+                break;
+            case ga_loadgame:
+                G_DoLoadGame();
+                break;
+            case ga_savegame:
+                G_DoSaveGame();
+                break;
+            case ga_playdemo:
+                G_DoPlayDemo();
+                break;
+            case ga_screenshot:
+                V_ScreenShot("HTIC%02i.%s");
+                gameaction = ga_nothing;
+                break;
+            case ga_completed:
+                G_DoCompleted();
+                break;
+            case ga_worlddone:
+                G_DoWorldDone();
+                break;
+            case ga_victory:
+                F_StartFinale();
+                break;
+            default:
+                break;
+        }
+    }
+
+
+//
+// get commands, check consistancy, and build new consistancy check
+//
+    //buf = gametic%BACKUPTICS;
+    buf = (gametic / ticdup) % BACKUPTICS;
+
+    for (i = 0; i < MAXPLAYERS; i++)
+        if (playeringame[i])
+        {
+            cmd = &players[i].cmd;
+
+            memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
+
+            if (demoplayback)
+                G_ReadDemoTiccmd(cmd);
+            if (demorecording)
+                G_WriteDemoTiccmd(cmd);
+
+            if (netgame && !netdemo && !(gametic % ticdup))
+            {
+                if (gametic > BACKUPTICS
+                    && consistancy[i][buf] != cmd->consistancy)
+                {
+                    I_Error("consistency failure (%i should be %i)",
+                            cmd->consistancy, consistancy[i][buf]);
+                }
+                if (players[i].mo)
+                    consistancy[i][buf] = players[i].mo->x;
+                else
+                    consistancy[i][buf] = rndindex;
+            }
+        }
+
+//
+// check for special buttons
+//
+    for (i = 0; i < MAXPLAYERS; i++)
+        if (playeringame[i])
+        {
+            if (players[i].cmd.buttons & BT_SPECIAL)
+            {
+                switch (players[i].cmd.buttons & BT_SPECIALMASK)
+                {
+                    case BTS_PAUSE:
+                        paused ^= 1;
+                        if (paused)
+                        {
+                            S_PauseSound();
+                        }
+                        else
+                        {
+                            S_ResumeSound();
+                        }
+                        break;
+
+                    case BTS_SAVEGAME:
+                        if (!savedescription[0])
+                        {
+                            if (netgame)
+                            {
+                                M_StringCopy(savedescription,
+                                             DEH_String("NET GAME"),
+                                             sizeof(savedescription));
+                            }
+                            else
+                            {
+                                M_StringCopy(savedescription,
+                                             DEH_String("SAVE GAME"),
+                                             sizeof(savedescription));
+                            }
+                        }
+                        savegameslot =
+                            (players[i].cmd.
+                             buttons & BTS_SAVEMASK) >> BTS_SAVESHIFT;
+                        gameaction = ga_savegame;
+                        break;
+                }
+            }
+        }
+    // turn inventory off after a certain amount of time
+    if (inventory && !(--inventoryTics))
+    {
+        players[consoleplayer].readyArtifact =
+            players[consoleplayer].inventory[inv_ptr].type;
+        inventory = false;
+        cmd->arti = 0;
+    }
+//
+// do main actions
+//
+//
+// do main actions
+//
+    switch (gamestate)
+    {
+        case GS_LEVEL:
+            P_Ticker();
+            SB_Ticker();
+            AM_Ticker();
+            CT_Ticker();
+            break;
+        case GS_INTERMISSION:
+            IN_Ticker();
+            break;
+        case GS_FINALE:
+            F_Ticker();
+            break;
+        case GS_DEMOSCREEN:
+            D_PageTicker();
+            break;
+    }
+}
+
+
+/*
+==============================================================================
+
+						PLAYER STRUCTURE FUNCTIONS
+
+also see P_SpawnPlayer in P_Things
+==============================================================================
+*/
+
+/*
+====================
+=
+= G_InitPlayer
+=
+= Called at the start
+= Called by the game initialization functions
+====================
+*/
+
+void G_InitPlayer(int player)
+{
+    // clear everything else to defaults
+    G_PlayerReborn(player);
+}
+
+
+/*
+====================
+=
+= G_PlayerFinishLevel
+=
+= Can when a player completes a level
+====================
+*/
+
+void G_PlayerFinishLevel(int player)
+{
+    player_t *p;
+    int i;
+
+/*      // BIG HACK
+	inv_ptr = 0;
+	curpos = 0;
+*/
+    // END HACK
+    p = &players[player];
+    for (i = 0; i < p->inventorySlotNum; i++)
+    {
+        p->inventory[i].count = 1;
+    }
+    p->artifactCount = p->inventorySlotNum;
+
+    if (!deathmatch)
+    {
+        for (i = 0; i < 16; i++)
+        {
+            P_PlayerUseArtifact(p, arti_fly);
+        }
+    }
+    memset(p->powers, 0, sizeof(p->powers));
+    memset(p->keys, 0, sizeof(p->keys));
+    playerkeys = 0;
+//      memset(p->inventory, 0, sizeof(p->inventory));
+    if (p->chickenTics)
+    {
+        p->readyweapon = p->mo->special1.i;       // Restore weapon
+        p->chickenTics = 0;
+    }
+    p->messageTics = 0;
+    p->lookdir = 0;
+    p->mo->flags &= ~MF_SHADOW; // Remove invisibility
+    p->extralight = 0;          // Remove weapon flashes
+    p->fixedcolormap = 0;       // Remove torch
+    p->damagecount = 0;         // No palette changes
+    p->bonuscount = 0;
+    p->rain1 = NULL;
+    p->rain2 = NULL;
+    if (p == &players[consoleplayer])
+    {
+        SB_state = -1;          // refresh the status bar
+    }
+}
+
+/*
+====================
+=
+= G_PlayerReborn
+=
+= Called after a player dies
+= almost everything is cleared and initialized
+====================
+*/
+
+void G_PlayerReborn(int player)
+{
+    player_t *p;
+    int i;
+    int frags[MAXPLAYERS];
+    int killcount, itemcount, secretcount;
+    boolean secret;
+
+    secret = false;
+    memcpy(frags, players[player].frags, sizeof(frags));
+    killcount = players[player].killcount;
+    itemcount = players[player].itemcount;
+    secretcount = players[player].secretcount;
+
+    p = &players[player];
+    if (p->didsecret)
+    {
+        secret = true;
+    }
+    memset(p, 0, sizeof(*p));
+
+    memcpy(players[player].frags, frags, sizeof(players[player].frags));
+    players[player].killcount = killcount;
+    players[player].itemcount = itemcount;
+    players[player].secretcount = secretcount;
+
+    p->usedown = p->attackdown = true;  // don't do anything immediately
+    p->playerstate = PST_LIVE;
+    p->health = MAXHEALTH;
+    p->readyweapon = p->pendingweapon = wp_goldwand;
+    p->weaponowned[wp_staff] = true;
+    p->weaponowned[wp_goldwand] = true;
+    p->messageTics = 0;
+    p->lookdir = 0;
+    p->ammo[am_goldwand] = 50;
+    for (i = 0; i < NUMAMMO; i++)
+    {
+        p->maxammo[i] = maxammo[i];
+    }
+    if (gamemap == 9 || secret)
+    {
+        p->didsecret = true;
+    }
+    if (p == &players[consoleplayer])
+    {
+        SB_state = -1;          // refresh the status bar
+        inv_ptr = 0;            // reset the inventory pointer
+        curpos = 0;
+    }
+}
+
+/*
+====================
+=
+= G_CheckSpot
+=
+= Returns false if the player cannot be respawned at the given mapthing_t spot
+= because something is occupying it
+====================
+*/
+
+void P_SpawnPlayer(mapthing_t * mthing);
+
+boolean G_CheckSpot(int playernum, mapthing_t * mthing)
+{
+    fixed_t x, y;
+    subsector_t *ss;
+    unsigned an;
+    mobj_t *mo;
+
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+
+    players[playernum].mo->flags2 &= ~MF2_PASSMOBJ;
+    if (!P_CheckPosition(players[playernum].mo, x, y))
+    {
+        players[playernum].mo->flags2 |= MF2_PASSMOBJ;
+        return false;
+    }
+    players[playernum].mo->flags2 |= MF2_PASSMOBJ;
+
+// spawn a teleport fog
+    ss = R_PointInSubsector(x, y);
+    an = ((unsigned) ANG45 * (mthing->angle / 45)) >> ANGLETOFINESHIFT;
+
+    mo = P_SpawnMobj(x + 20 * finecosine[an], y + 20 * finesine[an],
+                     ss->sector->floorheight + TELEFOGHEIGHT, MT_TFOG);
+
+    if (players[consoleplayer].viewz != 1)
+        S_StartSound(mo, sfx_telept);   // don't start sound on first frame
+
+    return true;
+}
+
+/*
+====================
+=
+= G_DeathMatchSpawnPlayer
+=
+= Spawns a player at one of the random death match spots
+= called at level load and each death
+====================
+*/
+
+void G_DeathMatchSpawnPlayer(int playernum)
+{
+    int i, j;
+    int selections;
+
+    selections = deathmatch_p - deathmatchstarts;
+    if (selections < 4)
+        I_Error("Only %i deathmatch spots, 4 required", selections);
+
+    for (j = 0; j < 20; j++)
+    {
+        i = P_Random() % selections;
+        if (G_CheckSpot(playernum, &deathmatchstarts[i]))
+        {
+            deathmatchstarts[i].type = playernum + 1;
+            P_SpawnPlayer(&deathmatchstarts[i]);
+            return;
+        }
+    }
+
+// no good spot, so the player will probably get stuck
+    P_SpawnPlayer(&playerstarts[playernum]);
+}
+
+/*
+====================
+=
+= G_DoReborn
+=
+====================
+*/
+
+void G_DoReborn(int playernum)
+{
+    int i;
+
+    // quit demo unless -demoextend
+    if (!demoextend && G_CheckDemoStatus())
+        return;
+    if (!netgame)
+        gameaction = ga_loadlevel;      // reload the level from scratch
+    else
+    {                           // respawn at the start
+        players[playernum].mo->player = NULL;   // dissasociate the corpse
+
+        // spawn at random spot if in death match
+        if (deathmatch)
+        {
+            G_DeathMatchSpawnPlayer(playernum);
+            return;
+        }
+
+        if (G_CheckSpot(playernum, &playerstarts[playernum]))
+        {
+            P_SpawnPlayer(&playerstarts[playernum]);
+            return;
+        }
+        // try to spawn at one of the other players spots
+        for (i = 0; i < MAXPLAYERS; i++)
+            if (G_CheckSpot(playernum, &playerstarts[i]))
+            {
+                playerstarts[i].type = playernum + 1;   // fake as other player
+                P_SpawnPlayer(&playerstarts[i]);
+                playerstarts[i].type = i + 1;   // restore
+                return;
+            }
+        // he's going to be inside something.  Too bad.
+        P_SpawnPlayer(&playerstarts[playernum]);
+    }
+}
+
+
+void G_ScreenShot(void)
+{
+    gameaction = ga_screenshot;
+}
+
+
+/*
+====================
+=
+= G_DoCompleted
+=
+====================
+*/
+
+boolean secretexit;
+
+void G_ExitLevel(void)
+{
+    secretexit = false;
+    gameaction = ga_completed;
+}
+
+void G_SecretExitLevel(void)
+{
+    secretexit = true;
+    gameaction = ga_completed;
+}
+
+void G_DoCompleted(void)
+{
+    int i;
+    static int afterSecret[5] = { 7, 5, 5, 5, 4 };
+
+    gameaction = ga_nothing;
+
+    // quit demo unless -demoextend
+    if (!demoextend && G_CheckDemoStatus())
+    {
+        return;
+    }
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (playeringame[i])
+        {
+            G_PlayerFinishLevel(i);
+        }
+    }
+    prevmap = gamemap;
+    if (secretexit == true)
+    {
+        gamemap = 9;
+    }
+    else if (gamemap == 9)
+    {                           // Finished secret level
+        gamemap = afterSecret[gameepisode - 1];
+    }
+    else if (gamemap == 8)
+    {
+        gameaction = ga_victory;
+        return;
+    }
+    else
+    {
+        gamemap++;
+    }
+    gamestate = GS_INTERMISSION;
+    IN_Start();
+}
+
+//============================================================================
+//
+// G_WorldDone
+//
+//============================================================================
+
+void G_WorldDone(void)
+{
+    gameaction = ga_worlddone;
+}
+
+//============================================================================
+//
+// G_DoWorldDone
+//
+//============================================================================
+
+void G_DoWorldDone(void)
+{
+    gamestate = GS_LEVEL;
+    G_DoLoadLevel();
+    gameaction = ga_nothing;
+    viewactive = true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC G_LoadGame
+//
+// Can be called by the startup code or the menu task.
+//
+//---------------------------------------------------------------------------
+
+static char *savename = NULL;
+
+void G_LoadGame(char *name)
+{
+    savename = M_StringDuplicate(name);
+    gameaction = ga_loadgame;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC G_DoLoadGame
+//
+// Called by G_Ticker based on gameaction.
+//
+//---------------------------------------------------------------------------
+
+#define VERSIONSIZE 16
+
+void G_DoLoadGame(void)
+{
+    int i;
+    int a, b, c;
+    char savestr[SAVESTRINGSIZE];
+    char vcheck[VERSIONSIZE], readversion[VERSIONSIZE];
+
+    gameaction = ga_nothing;
+
+    SV_OpenRead(savename);
+
+    free(savename);
+    savename = NULL;
+
+    // Skip the description field
+    SV_Read(savestr, SAVESTRINGSIZE);
+
+    memset(vcheck, 0, sizeof(vcheck));
+    DEH_snprintf(vcheck, VERSIONSIZE, "version %i", HERETIC_VERSION);
+    SV_Read(readversion, VERSIONSIZE);
+
+    if (strncmp(readversion, vcheck, VERSIONSIZE) != 0)
+    {                           // Bad version
+        return;
+    }
+    gameskill = SV_ReadByte();
+    gameepisode = SV_ReadByte();
+    gamemap = SV_ReadByte();
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        playeringame[i] = SV_ReadByte();
+    }
+    // Load a base level
+    G_InitNew(gameskill, gameepisode, gamemap);
+
+    // Create leveltime
+    a = SV_ReadByte();
+    b = SV_ReadByte();
+    c = SV_ReadByte();
+    leveltime = (a << 16) + (b << 8) + c;
+
+    // De-archive all the modifications
+    P_UnArchivePlayers();
+    P_UnArchiveWorld();
+    P_UnArchiveThinkers();
+    P_UnArchiveSpecials();
+
+    if (SV_ReadByte() != SAVE_GAME_TERMINATOR)
+    {                           // Missing savegame termination marker
+        I_Error("Bad savegame");
+    }
+
+    SV_Close();
+}
+
+
+/*
+====================
+=
+= G_InitNew
+=
+= Can be called by the startup code or the menu task
+= consoleplayer, displayplayer, playeringame[] should be set
+====================
+*/
+
+skill_t d_skill;
+int d_episode;
+int d_map;
+
+void G_DeferedInitNew(skill_t skill, int episode, int map)
+{
+    d_skill = skill;
+    d_episode = episode;
+    d_map = map;
+    gameaction = ga_newgame;
+}
+
+void G_DoNewGame(void)
+{
+    G_InitNew(d_skill, d_episode, d_map);
+    gameaction = ga_nothing;
+}
+
+void G_InitNew(skill_t skill, int episode, int map)
+{
+    int i;
+    int speed;
+    static const char *skyLumpNames[5] = {
+        "SKY1", "SKY2", "SKY3", "SKY1", "SKY3"
+    };
+
+    if (paused)
+    {
+        paused = false;
+        S_ResumeSound();
+    }
+    if (skill < sk_baby)
+        skill = sk_baby;
+    if (skill > sk_nightmare)
+        skill = sk_nightmare;
+    if (episode < 1)
+        episode = 1;
+    // Up to 9 episodes for testing
+    if (episode > 9)
+        episode = 9;
+    if (map < 1)
+        map = 1;
+    if (map > 9)
+        map = 9;
+    M_ClearRandom();
+    if (respawnparm)
+    {
+        respawnmonsters = true;
+    }
+    else
+    {
+        respawnmonsters = false;
+    }
+    // Set monster missile speeds
+    speed = skill == sk_nightmare;
+    for (i = 0; MonsterMissileInfo[i].type != -1; i++)
+    {
+        mobjinfo[MonsterMissileInfo[i].type].speed
+            = MonsterMissileInfo[i].speed[speed] << FRACBITS;
+    }
+    // Force players to be initialized upon first level load
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        players[i].playerstate = PST_REBORN;
+        players[i].didsecret = false;
+    }
+    // Set up a bunch of globals
+    usergame = true;            // will be set false if a demo
+    paused = false;
+    demorecording = false;
+    demoplayback = false;
+    netdemo = false;
+    viewactive = true;
+    gameepisode = episode;
+    gamemap = map;
+    gameskill = skill;
+    BorderNeedRefresh = true;
+
+    // Set the sky map
+    if (episode > 5)
+    {
+        skytexture = R_TextureNumForName(DEH_String("SKY1"));
+    }
+    else
+    {
+        skytexture = R_TextureNumForName(DEH_String(skyLumpNames[episode - 1]));
+    }
+
+//
+// give one null ticcmd_t
+//
+#if 0
+    gametic = 0;
+    maketic = 1;
+    for (i = 0; i < MAXPLAYERS; i++)
+        nettics[i] = 1;         // one null event for this gametic
+    memset(localcmds, 0, sizeof(localcmds));
+    memset(netcmds, 0, sizeof(netcmds));
+#endif
+    G_DoLoadLevel();
+}
+
+
+/*
+===============================================================================
+
+							DEMO RECORDING
+
+===============================================================================
+*/
+
+#define DEMOMARKER      0x80
+#define DEMOHEADER_RESPAWN    0x20
+#define DEMOHEADER_LONGTICS   0x10
+#define DEMOHEADER_NOMONSTERS 0x02
+
+void G_ReadDemoTiccmd(ticcmd_t * cmd)
+{
+    if (*demo_p == DEMOMARKER)
+    {                           // end of demo data stream
+        G_CheckDemoStatus();
+        return;
+    }
+    cmd->forwardmove = ((signed char) *demo_p++);
+    cmd->sidemove = ((signed char) *demo_p++);
+
+    // If this is a longtics demo, read back in higher resolution
+
+    if (longtics)
+    {
+        cmd->angleturn = *demo_p++;
+        cmd->angleturn |= (*demo_p++) << 8;
+    }
+    else
+    {
+        cmd->angleturn = ((unsigned char) *demo_p++) << 8;
+    }
+
+    cmd->buttons = (unsigned char) *demo_p++;
+    cmd->lookfly = (unsigned char) *demo_p++;
+    cmd->arti = (unsigned char) *demo_p++;
+}
+
+// Increase the size of the demo buffer to allow unlimited demos
+
+static void IncreaseDemoBuffer(void)
+{
+    int current_length;
+    byte *new_demobuffer;
+    byte *new_demop;
+    int new_length;
+
+    // Find the current size
+
+    current_length = demoend - demobuffer;
+
+    // Generate a new buffer twice the size
+    new_length = current_length * 2;
+
+    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
+    new_demop = new_demobuffer + (demo_p - demobuffer);
+
+    // Copy over the old data
+
+    memcpy(new_demobuffer, demobuffer, current_length);
+
+    // Free the old buffer and point the demo pointers at the new buffer.
+
+    Z_Free(demobuffer);
+
+    demobuffer = new_demobuffer;
+    demo_p = new_demop;
+    demoend = demobuffer + new_length;
+}
+
+void G_WriteDemoTiccmd(ticcmd_t * cmd)
+{
+    byte *demo_start;
+
+    if (gamekeydown[key_demo_quit]) // press to end demo recording
+        G_CheckDemoStatus();
+
+    demo_start = demo_p;
+
+    *demo_p++ = cmd->forwardmove;
+    *demo_p++ = cmd->sidemove;
+
+    // If this is a longtics demo, record in higher resolution
+
+    if (longtics)
+    {
+        *demo_p++ = (cmd->angleturn & 0xff);
+        *demo_p++ = (cmd->angleturn >> 8) & 0xff;
+    }
+    else
+    {
+        *demo_p++ = cmd->angleturn >> 8;
+    }
+
+    *demo_p++ = cmd->buttons;
+    *demo_p++ = cmd->lookfly;
+    *demo_p++ = cmd->arti;
+
+    // reset demo pointer back
+    demo_p = demo_start;
+
+    if (demo_p > demoend - 16)
+    {
+        if (vanilla_demo_limit)
+        {
+            // no more space
+            G_CheckDemoStatus();
+            return;
+        }
+        else
+        {
+            // Vanilla demo limit disabled: unlimited
+            // demo lengths!
+
+            IncreaseDemoBuffer();
+        }
+    }
+
+    G_ReadDemoTiccmd(cmd);      // make SURE it is exactly the same
+}
+
+
+
+/*
+===================
+=
+= G_RecordDemo
+=
+===================
+*/
+
+void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
+                  const char *name)
+{
+    size_t demoname_size;
+    int i;
+    int maxsize;
+
+    //!
+    // @category demo
+    //
+    // Record or playback a demo with high resolution turning.
+    //
+
+    longtics = D_NonVanillaRecord(M_ParmExists("-longtics"),
+                                  "vvHeretic longtics demo");
+
+    // If not recording a longtics demo, record in low res
+
+    lowres_turn = !longtics;
+
+    //!
+    // @category demo
+    //
+    // Smooth out low resolution turning when recording a demo.
+    //
+
+    shortticfix = M_ParmExists("-shortticfix");
+
+    G_InitNew(skill, episode, map);
+    usergame = false;
+    demoname_size = strlen(name) + 5;
+    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
+    M_snprintf(demoname, demoname_size, "%s.lmp", name);
+    maxsize = 0x20000;
+
+    //!
+    // @arg <size>
+    // @category demo
+    // @vanilla
+    //
+    // Specify the demo buffer size (KiB)
+    //
+
+    i = M_CheckParmWithArgs("-maxdemo", 1);
+    if (i)
+        maxsize = atoi(myargv[i + 1]) * 1024;
+    demobuffer = Z_Malloc(maxsize, PU_STATIC, NULL);
+    demoend = demobuffer + maxsize;
+
+    demo_p = demobuffer;
+    *demo_p++ = skill;
+    *demo_p++ = episode;
+    *demo_p++ = map;
+
+    // Write special parameter bits onto player one byte.
+    // This aligns with vvHeretic demo usage:
+    //   0x20 = -respawn
+    //   0x10 = -longtics
+    //   0x02 = -nomonsters
+
+    *demo_p = 1; // assume player one exists
+    if (D_NonVanillaRecord(respawnparm, "vvHeretic -respawn header flag"))
+    {
+        *demo_p |= DEMOHEADER_RESPAWN;
+    }
+    if (longtics)
+    {
+        *demo_p |= DEMOHEADER_LONGTICS;
+    }
+    if (D_NonVanillaRecord(nomonsters, "vvHeretic -nomonsters header flag"))
+    {
+        *demo_p |= DEMOHEADER_NOMONSTERS;
+    }
+    demo_p++;
+
+    for (i = 1; i < MAXPLAYERS; i++)
+        *demo_p++ = playeringame[i];
+
+    demorecording = true;
+}
+
+
+/*
+===================
+=
+= G_PlayDemo
+=
+===================
+*/
+
+static const char *defdemoname;
+
+void G_DeferedPlayDemo(const char *name)
+{
+    defdemoname = name;
+    gameaction = ga_playdemo;
+}
+
+void G_DoPlayDemo(void)
+{
+    skill_t skill;
+    int i, lumpnum, episode, map;
+
+    gameaction = ga_nothing;
+    lumpnum = W_GetNumForName(defdemoname);
+    demobuffer = W_CacheLumpNum(lumpnum, PU_STATIC);
+    demo_p = demobuffer;
+    skill = *demo_p++;
+    episode = *demo_p++;
+    map = *demo_p++;
+
+    // vvHeretic allows extra options to be stored in the upper bits of
+    // the player 1 present byte. However, this is a non-vanilla extension.
+    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_LONGTICS) != 0,
+                             lumpnum, "vvHeretic longtics demo"))
+    {
+        longtics = true;
+    }
+    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_RESPAWN) != 0,
+                             lumpnum, "vvHeretic -respawn header flag"))
+    {
+        respawnparm = true;
+    }
+    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_NOMONSTERS) != 0,
+                             lumpnum, "vvHeretic -nomonsters header flag"))
+    {
+        nomonsters = true;
+    }
+
+    for (i = 0; i < MAXPLAYERS; i++)
+        playeringame[i] = (*demo_p++) != 0;
+
+    if (playeringame[1] || M_CheckParm("-solo-net") > 0
+                        || M_CheckParm("-netdemo") > 0)
+    {
+    	netgame = true;
+    }
+
+    precache = false;           // don't spend a lot of time in loadlevel
+    G_InitNew(skill, episode, map);
+    precache = true;
+    usergame = false;
+    demoplayback = true;
+
+    if (netgame == true)
+    {
+      netdemo = true;
+    }
+}
+
+
+/*
+===================
+=
+= G_TimeDemo
+=
+===================
+*/
+
+void G_TimeDemo(char *name)
+{
+    skill_t skill;
+    int episode, map, i;
+
+    demobuffer = demo_p = W_CacheLumpName(name, PU_STATIC);
+    skill = *demo_p++;
+    episode = *demo_p++;
+    map = *demo_p++;
+
+    // Read special parameter bits: see G_RecordDemo() for details.
+    longtics = (*demo_p & DEMOHEADER_LONGTICS) != 0;
+
+    // don't overwrite arguments from the command line
+    respawnparm |= (*demo_p & DEMOHEADER_RESPAWN) != 0;
+    nomonsters  |= (*demo_p & DEMOHEADER_NOMONSTERS) != 0;
+
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        playeringame[i] = (*demo_p++) != 0;
+    }
+
+    if (playeringame[1] || M_CheckParm("-solo-net") > 0
+                        || M_CheckParm("-netdemo") > 0)
+    {
+      netgame = true;
+    }
+
+    G_InitNew(skill, episode, map);
+    starttime = I_GetTime();
+
+    usergame = false;
+    demoplayback = true;
+    timingdemo = true;
+    singletics = true;
+
+    if (netgame == true)
+    {
+      netdemo = true;
+    }
+}
+
+
+/*
+===================
+=
+= G_CheckDemoStatus
+=
+= Called after a death or level completion to allow demos to be cleaned up
+= Returns true if a new demo loop action will take place
+===================
+*/
+
+boolean G_CheckDemoStatus(void)
+{
+    int endtime, realtics;
+
+    if (timingdemo)
+    {
+        float fps;
+        endtime = I_GetTime();
+        realtics = endtime - starttime;
+        fps = ((float) gametic * TICRATE) / realtics;
+        I_Error("timed %i gametics in %i realtics (%f fps)",
+                gametic, realtics, fps);
+    }
+
+    if (demoplayback)
+    {
+        if (singledemo)
+            I_Quit();
+
+        W_ReleaseLumpName(defdemoname);
+        demoplayback = false;
+        netdemo = false;
+        netgame = false;
+        D_AdvanceDemo();
+        return true;
+    }
+
+    if (demorecording)
+    {
+        *demo_p++ = DEMOMARKER;
+        M_WriteFile(demoname, demobuffer, demo_p - demobuffer);
+        Z_Free(demobuffer);
+        demorecording = false;
+        I_Error("Demo %s recorded", demoname);
+    }
+
+    return false;
+}
+
+/**************************************************************************/
+/**************************************************************************/
+
+//==========================================================================
+//
+// G_SaveGame
+//
+// Called by the menu task.  <description> is a 24 byte text string.
+//
+//==========================================================================
+
+void G_SaveGame(int slot, char *description)
+{
+    savegameslot = slot;
+    M_StringCopy(savedescription, description, sizeof(savedescription));
+    sendsave = true;
+}
+
+//==========================================================================
+//
+// G_DoSaveGame
+//
+// Called by G_Ticker based on gameaction.
+//
+//==========================================================================
+
+void G_DoSaveGame(void)
+{
+    int i;
+    char *filename;
+    char verString[VERSIONSIZE];
+    char *description;
+
+    filename = SV_Filename(savegameslot);
+
+    description = savedescription;
+
+    SV_Open(filename);
+    SV_Write(description, SAVESTRINGSIZE);
+    memset(verString, 0, sizeof(verString));
+    DEH_snprintf(verString, VERSIONSIZE, "version %i", HERETIC_VERSION);
+    SV_Write(verString, VERSIONSIZE);
+    SV_WriteByte(gameskill);
+    SV_WriteByte(gameepisode);
+    SV_WriteByte(gamemap);
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        SV_WriteByte(playeringame[i]);
+    }
+    SV_WriteByte(leveltime >> 16);
+    SV_WriteByte(leveltime >> 8);
+    SV_WriteByte(leveltime);
+    P_ArchivePlayers();
+    P_ArchiveWorld();
+    P_ArchiveThinkers();
+    P_ArchiveSpecials();
+    SV_WriteSaveGameEOF();
+    SV_Close();
+
+    gameaction = ga_nothing;
+    savedescription[0] = 0;
+    P_SetMessage(&players[consoleplayer], DEH_String(TXT_GAMESAVED), true);
+
+    free(filename);
+}
+
diff --git a/games/NXDoom/src/heretic/heretic_icon.c b/games/NXDoom/src/heretic/heretic_icon.c
new file mode 100644
index 000000000..ab8b641c8
--- /dev/null
+++ b/games/NXDoom/src/heretic/heretic_icon.c
@@ -0,0 +1,2736 @@
+static int heretic_icon_w = 128;
+static int heretic_icon_h = 128;
+
+static const unsigned int heretic_icon_data[] = {
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
+    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
+    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
+    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
+    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
+    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
+    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
+    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
+    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
+    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
+    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
+    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
+    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
+    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
+    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
+    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
+    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
+    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
+    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
+    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
+    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
+    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
+    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
+    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
+    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
+    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
+    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
+    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
+    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
+    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
+    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
+    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
+    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
+    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
+    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
+    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
+    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
+    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
+    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
+    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
+    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
+    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
+    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
+    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
+    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
+    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x93756aff, 0x91756aff, 0x968078ff, 0x99867fff, 
+    0x99867fff, 0x99867fff, 0x99867fff, 0x99867fff, 0x99867fff, 0xa2918bff, 
+    0xb5aaa6ff, 0xb5a9a5ff, 0xb5a9a5ff, 0xb4a8a4ff, 0xb4a8a4ff, 0xb3a7a3ff, 
+    0xb2a6a2ff, 0xb2a6a2ff, 0xb0a5a1ff, 0xa2928cff, 0x98857eff, 0x98847eff, 
+    0x98847eff, 0x98847eff, 0x97837dff, 0x95817bff, 0x937f79ff, 0x907d76ff, 
+    0x907e77ff, 0x9e908cff, 0xa09491ff, 0x9f938fff, 0x9d928eff, 0x9b8f8bff, 
+    0x998d89ff, 0x978c88ff, 0x968a86ff, 0x948884ff, 0x8f827eff, 0x7a6660ff, 
+    0x78645eff, 0x76625dff, 0x74605bff, 0x725e59ff, 0x705c57ff, 0x6e5b55ff, 
+    0x6c5953ff, 0x6a5751ff, 0x73625eff, 0x7f7370ff, 0x7d716eff, 0x7b6f6cff, 
+    0x796d6aff, 0x786c69ff, 0x766a67ff, 0x746865ff, 0x716563ff, 0x716562ff, 
+    0x5d4b47ff, 0x54403bff, 0x523d3aff, 0x55413fff, 0x574445ff, 0x59464aff, 
+    0x5b494fff, 0x5d4950ff, 0x5f464cff, 0x674e55ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
+    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
+    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
+    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
+    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
+    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
+    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
+    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
+    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
+    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
+    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
+    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
+    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
+    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
+    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
+    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
+    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
+    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
+    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
+    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
+    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xb9b8b8ff, 0xbdbdbdff, 
+    0xbbbbbcff, 0xbbbbbbff, 0xbab9baff, 0xb9b9baff, 0xb8b8b9ff, 0xb8b8b8ff, 
+    0xb7b6b7ff, 0xb0afb0ff, 0x9f9ea0ff, 0x9e9ea0ff, 0x9e9da0ff, 0x9e9d9fff, 
+    0x9d9c9fff, 0x9d9c9eff, 0x9c9b9eff, 0x9c9a9eff, 0x9c9a9eff, 0xa6a5a7ff, 
+    0xadacafff, 0xacaaadff, 0xacaaadff, 0xaaa9acff, 0xa8a7aaff, 0xa6a5a8ff, 
+    0xa5a3a7ff, 0xa3a2a5ff, 0xa1a0a3ff, 0x8f8d93ff, 0x8c8a90ff, 0x8a888dff, 
+    0x88868cff, 0x868389ff, 0x848288ff, 0x828086ff, 0x817e85ff, 0x7e7b82ff, 
+    0x807e84ff, 0x8c8b8fff, 0x8b898eff, 0x89878cff, 0x87858bff, 0x858488ff, 
+    0x848287ff, 0x827f85ff, 0x807e83ff, 0x7e7c82ff, 0x737178ff, 0x67636cff, 
+    0x64616aff, 0x635f68ff, 0x605d66ff, 0x5f5b65ff, 0x5d5963ff, 0x5b5761ff, 
+    0x58555fff, 0x57535dff, 0x646168ff, 0x68656cff, 0x66636bff, 0x67656dff, 
+    0x676570ff, 0x676672ff, 0x696775ff, 0x696877ff, 0x6a6a7aff, 0x6b6b7bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x757473ff, 0x747475ff, 0x747374ff, 0x737274ff, 0x727273ff, 0x727173ff, 
+    0x717072ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 
+    0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 
+    0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
+    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
+    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
+    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
+    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
+    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
+    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
+    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
+    0x4a4655ff, 0x4b4653ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x747373ff, 0x747374ff, 0x737274ff, 0x727273ff, 
+    0x727173ff, 0x717072ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 
+    0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 
+    0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 
+    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
+    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
+    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
+    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
+    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
+    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
+    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
+    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x4a4652ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x747272ff, 0x737274ff, 
+    0x727273ff, 0x727173ff, 0x717072ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 
+    0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 
+    0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 
+    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
+    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
+    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
+    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
+    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
+    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
+    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
+    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x4a4652ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x737172ff, 0x727273ff, 0x727173ff, 0x717072ff, 0x706f72ff, 0x706f71ff, 
+    0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 
+    0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 
+    0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
+    0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
+    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
+    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
+    0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
+    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
+    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
+    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
+    0x494654ff, 0x494552ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x727171ff, 0x727173ff, 0x717072ff, 0x706f72ff, 
+    0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 
+    0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 
+    0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 
+    0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
+    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
+    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
+    0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 
+    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
+    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
+    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
+    0x494654ff, 0x494654ff, 0x484554ff, 0x494551ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x727071ff, 0x717072ff, 
+    0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 
+    0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 
+    0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 
+    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 
+    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
+    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
+    0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 
+    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
+    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
+    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
+    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x484551ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x716f70ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 
+    0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 
+    0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
+    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
+    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
+    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
+    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
+    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
+    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
+    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
+    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
+    0x474553ff, 0x484551ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x706e70ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 
+    0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 
+    0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 
+    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
+    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
+    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
+    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
+    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
+    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
+    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
+    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
+    0x484553ff, 0x474553ff, 0x474553ff, 0x474550ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x706e6fff, 0x6f6e71ff, 
+    0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 
+    0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 
+    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
+    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
+    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
+    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
+    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
+    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
+    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
+    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
+    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x474450ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6f6d6fff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 
+    0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 
+    0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
+    0x636068ff, 0x727361ff, 0xc3d93eff, 0xceea38ff, 0xcae938ff, 0xc6e838ff, 
+    0xc3e738ff, 0xbfe639ff, 0xbbe539ff, 0xb7e439ff, 0xb4e339ff, 0xb0e23aff, 
+    0xace13aff, 0x96bf43ff, 0x5d5b5fff, 0x595560ff, 0x585460ff, 0x5b595dff, 
+    0x88bb44ff, 0x93d93bff, 0x8fd83bff, 0x8bd73cff, 0x88d53cff, 0x84d43cff, 
+    0x80d33dff, 0x7cd23dff, 0x78d13dff, 0x74d03eff, 0x70d03eff, 0x69bd41ff, 
+    0x535c55ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
+    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
+    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
+    0x464452ff, 0x46444fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x6e6c6eff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 
+    0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 
+    0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 
+    0x646168ff, 0x636068ff, 0x625f67ff, 0xa0ac4dff, 0xd6f434ff, 0xd2f335ff, 
+    0xcef235ff, 0xcaf135ff, 0xc6f036ff, 0xc2ef36ff, 0xbeee36ff, 0xbaed36ff, 
+    0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0x728453ff, 0x585460ff, 
+    0x58535fff, 0x6d8153ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 
+    0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 
+    0x6fd83cff, 0x6bd73dff, 0x568d46ff, 0x4d4757ff, 0x4d4857ff, 0x4d4757ff, 
+    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
+    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
+    0x464552ff, 0x464452ff, 0x454451ff, 0x46444fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6e6b6eff, 0x6d6c6fff, 
+    0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 
+    0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 
+    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x828858ff, 
+    0xd1f135ff, 0xcef235ff, 0xcaf135ff, 0xc6f036ff, 0xc2ef36ff, 0xbeee36ff, 
+    0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa3df3aff, 
+    0x62675bff, 0x58535fff, 0x57525fff, 0x5f6459ff, 0x90da3bff, 0x8fe13aff, 
+    0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 
+    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d43dff, 0x4b684aff, 0x423f50ff, 
+    0x4c4656ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
+    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
+    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x45444fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6d6b6dff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 
+    0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
+    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
+    0x615e66ff, 0x605d66ff, 0x70725eff, 0xc5ea37ff, 0xc6f036ff, 0xc2ef36ff, 
+    0xbeee36ff, 0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 
+    0x98cc3fff, 0x5f615cff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
+    0x5a5d59ff, 0x81c441ff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 
+    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x66ce3eff, 0x46534dff, 
+    0x413e4eff, 0x413d4eff, 0x413e50ff, 0x4b4655ff, 0x4b4756ff, 0x4b4756ff, 
+    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
+    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
+    0x444451ff, 0x44444eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x6c6a6dff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 
+    0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 
+    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
+    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0xbadf3bff, 
+    0xc2ef36ff, 0xbeee36ff, 0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 
+    0xaae838ff, 0xa6e738ff, 0x8bb945ff, 0x58535fff, 0x57525fff, 0x56525eff, 
+    0x56515eff, 0x55505dff, 0x544f5dff, 0x78b244ff, 0x83dd3bff, 0x7fdc3bff, 
+    0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 
+    0x5fc23fff, 0x413e4eff, 0x413d4eff, 0x403d4eff, 0x403d4dff, 0x413e4fff, 
+    0x4a4655ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
+    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
+    0x454451ff, 0x444451ff, 0x434450ff, 0x44434eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6c696cff, 0x6b696eff, 
+    0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 
+    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
+    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
+    0x5e5b64ff, 0xb1d63eff, 0xbeee36ff, 0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 
+    0xaee937ff, 0xaae838ff, 0xa6e738ff, 0xa2e638ff, 0x84b047ff, 0x57525fff, 
+    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x72a947ff, 
+    0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 
+    0x67d63dff, 0x63d43dff, 0x59b940ff, 0x413d4eff, 0x403d4eff, 0x403d4dff, 
+    0x3f3d4dff, 0x3f3d4dff, 0x403e4eff, 0x494554ff, 0x494654ff, 0x494654ff, 
+    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
+    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x43434eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6b686cff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 
+    0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
+    0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
+    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0xa8cc41ff, 0xbaed36ff, 0xb6ec37ff, 
+    0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 
+    0x7ea649ff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
+    0x534e5cff, 0x6ca048ff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 
+    0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x55af41ff, 0x403d4eff, 
+    0x403d4dff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 0x3f3e4eff, 
+    0x484553ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
+    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
+    0x424350ff, 0x43434dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x6a676bff, 0x6a686dff, 0x69676cff, 0x68666cff, 
+    0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 
+    0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
+    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x9fc243ff, 
+    0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa6e738ff, 0xa2e638ff, 
+    0x9fe539ff, 0x9be439ff, 0x779e4bff, 0x56515eff, 0x55505dff, 0x544f5dff, 
+    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x68974aff, 0x77da3cff, 0x73d93cff, 
+    0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
+    0x51a643ff, 0x403d4dff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 
+    0x3e3c4cff, 0x3e3d4cff, 0x3f3c4dff, 0x474452ff, 0x474553ff, 0x474553ff, 
+    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
+    0x434350ff, 0x424350ff, 0x42434fff, 0x42434dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6a676bff, 0x69676cff, 
+    0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 
+    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 
+    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
+    0x6e755bff, 0xaddc3bff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa6e738ff, 
+    0xa2e638ff, 0x9fe539ff, 0x9be439ff, 0x97e339ff, 0x8fd83bff, 0x87ce3eff, 
+    0x83cc3eff, 0x80ca3eff, 0x7dca3fff, 0x79c93fff, 0x76c83fff, 0x75d03eff, 
+    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
+    0x5cd23eff, 0x58d13eff, 0x52bf40ff, 0x41564bff, 0x3f3d4dff, 0x3e3c4dff, 
+    0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3e3d4dff, 
+    0x464452ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
+    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x42424cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x69666aff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
+    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
+    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
+    0x5d5963ff, 0x5c5863ff, 0x9bc044ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 
+    0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 0x9be439ff, 0x97e339ff, 0x93e239ff, 
+    0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 
+    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 
+    0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x48a243ff, 
+    0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 
+    0x3d3c4bff, 0x3d3c4cff, 0x3e3d4cff, 0x454351ff, 0x454451ff, 0x454451ff, 
+    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
+    0x41424eff, 0x41424cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x68656aff, 0x68656bff, 0x67656bff, 0x66646aff, 
+    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
+    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
+    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x89a54bff, 0xaee937ff, 
+    0xaae838ff, 0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 0x9be439ff, 0x97e339ff, 
+    0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 
+    0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 
+    0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 
+    0x4cce3fff, 0x438846ff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 
+    0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3d3d4cff, 
+    0x444350ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
+    0x41434fff, 0x41424eff, 0x40424eff, 0x41424cff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x686469ff, 0x67656bff, 
+    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
+    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
+    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
+    0x5b5861ff, 0x8aad49ff, 0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 0x9be439ff, 
+    0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x83ce3cff, 0x638747ff, 0x5d8049ff, 
+    0x71b940ff, 0x7bdb3bff, 0x77da3cff, 0x68b641ff, 0x547c48ff, 0x548347ff, 
+    0x63c63fff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 
+    0x50cf3fff, 0x4cce3fff, 0x449345ff, 0x3f3e4dff, 0x3e3c4cff, 0x3e3d4cff, 
+    0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
+    0x3c3b4aff, 0x3c3b4bff, 0x3c3c4cff, 0x42434fff, 0x434350ff, 0x424350ff, 
+    0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x40424bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x676469ff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
+    0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
+    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
+    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x7a944fff, 0xa2e638ff, 0x9fe539ff, 
+    0x9be439ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 0x586c4cff, 
+    0x454252ff, 0x444251ff, 0x66a144ff, 0x77da3cff, 0x73d93cff, 0x5e9d44ff, 
+    0x423f50ff, 0x413e4fff, 0x4b684aff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 
+    0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x407947ff, 0x3e3c4cff, 
+    0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 
+    0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3c3c4bff, 
+    0x41424fff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 
+    0x3f424dff, 0x40424bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x666368ff, 0x66636aff, 0x656269ff, 0x646269ff, 
+    0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
+    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
+    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x738b51ff, 
+    0x9fe539ff, 0x9be439ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 
+    0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 
+    0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
+    0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 
+    0x3f7148ff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 
+    0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3c3c4aff, 0x40424eff, 0x41424eff, 0x40424eff, 
+    0x40424eff, 0x3f424dff, 0x3f424dff, 0x3f414bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666268ff, 0x656269ff, 
+    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 
+    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
+    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
+    0x585460ff, 0x6e8153ff, 0x9be439ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 
+    0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 
+    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
+    0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 
+    0x44cc40ff, 0x40cb40ff, 0x3e6848ff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 
+    0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
+    0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3b3b49ff, 
+    0x3f414dff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3f414bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x656167ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
+    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
+    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
+    0x595560ff, 0x585460ff, 0x58535fff, 0x697756ff, 0x97e339ff, 0x93e239ff, 
+    0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 
+    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 
+    0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 
+    0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x3c5e4aff, 0x3e3b4cff, 
+    0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 
+    0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 
+    0x3a3b48ff, 0x393b49ff, 0x3b3b49ff, 0x3f414cff, 0x3f424dff, 0x3e414dff, 
+    0x3e414cff, 0x3e414bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x646167ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
+    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
+    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
+    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x636f57ff, 
+    0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 
+    0x7bdb3bff, 0x5a8247ff, 0x50694bff, 0x4f684bff, 0x5fad42ff, 0x67d63dff, 
+    0x63d43dff, 0x56a942ff, 0x49654aff, 0x46654aff, 0x497d46ff, 0x50cf3fff, 
+    0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 
+    0x3c564aff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 
+    0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393c48ff, 
+    0x3e404cff, 0x3e414cff, 0x3d414cff, 0x3e414aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x646066ff, 0x636068ff, 
+    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
+    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
+    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
+    0x56525eff, 0x5f6659ff, 0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 
+    0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x68b341ff, 0x4c5e4cff, 0x47544dff, 
+    0x5aa443ff, 0x63d43dff, 0x5fd33dff, 0x53a043ff, 0x43514cff, 0x445b4aff, 
+    0x4cac42ff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 
+    0x38c841ff, 0x34c741ff, 0x3b5049ff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
+    0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
+    0x393b48ff, 0x393a48ff, 0x393c48ff, 0x3d414cff, 0x3d414bff, 0x3d414aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x635f66ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
+    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
+    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
+    0x57525fff, 0x56525eff, 0x56515eff, 0x5a5c5aff, 0x8bdf3aff, 0x87de3aff, 
+    0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 
+    0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 
+    0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 
+    0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x3b464bff, 0x3c3c4bff, 
+    0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 
+    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x393b48ff, 
+    0x3c414bff, 0x3d404aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x625e65ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
+    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
+    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
+    0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x56535cff, 
+    0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 
+    0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
+    0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 
+    0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x2cc541ff, 
+    0x3c404bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 
+    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
+    0x383b47ff, 0x383b47ff, 0x383a47ff, 0x3c4049ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x625e65ff, 0x615e66ff, 
+    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
+    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
+    0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 
+    0x544f5dff, 0x544e5cff, 0x81d93cff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 
+    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
+    0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 
+    0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 
+    0x2cc541ff, 0x29c042ff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
+    0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
+    0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
+    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x393b46ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x615d64ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
+    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
+    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
+    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x7bcf3eff, 0x7bdb3bff, 
+    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 
+    0x5fd33dff, 0x57ba41ff, 0x497448ff, 0x43524bff, 0x41514bff, 0x447348ff, 
+    0x47b641ff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x34c741ff, 
+    0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x26b643ff, 0x3c3b4aff, 0x3c3b4bff, 
+    0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 
+    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 
+    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
+    0x373a47ff, 0x373a45ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x605c64ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
+    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
+    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
+    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
+    0x75c63fff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 
+    0x63d43dff, 0x5fd33dff, 0x54aa42ff, 0x40434dff, 0x403d4dff, 0x3f3d4dff, 
+    0x3f3d4dff, 0x3e3c4dff, 0x3f424dff, 0x40a543ff, 0x3cc940ff, 0x38c841ff, 
+    0x34c741ff, 0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 0x24af43ff, 
+    0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 
+    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
+    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x373a44ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x605b63ff, 0x5f5b65ff, 
+    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
+    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
+    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
+    0x524d5bff, 0x524c5bff, 0x70bd42ff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 
+    0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5bcb3fff, 0x424a4cff, 0x403d4dff, 
+    0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 0x3d494bff, 
+    0x38c242ff, 0x34c741ff, 0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 
+    0x20c242ff, 0x22a644ff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
+    0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
+    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a45ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5f5a63ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
+    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
+    0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
+    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x6ab443ff, 0x6fd83cff, 
+    0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x509e44ff, 
+    0x403d4dff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 
+    0x3e3d4cff, 0x3d3b4dff, 0x379745ff, 0x30c641ff, 0x2cc541ff, 0x28c442ff, 
+    0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x239e45ff, 0x3b3c4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 
+    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 
+    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
+    0x363a46ff, 0x373a44ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x5e5a62ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
+    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
+    0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 
+    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
+    0x65ab45ff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
+    0x58d13eff, 0x4a8645ff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 
+    0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x378046ff, 0x2cc541ff, 
+    0x28c442ff, 0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 0x219546ff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 
+    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
+    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
+    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x363a44ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5e5962ff, 0x5d5963ff, 
+    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
+    0x585460ff, 0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 
+    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
+    0x504b5aff, 0x504a59ff, 0x60a247ff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
+    0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x477c46ff, 0x3f3d4dff, 0x3e3c4dff, 
+    0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 
+    0x357948ff, 0x28c442ff, 0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 
+    0x15be43ff, 0x218c46ff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
+    0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
+    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
+    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x363a44ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5d5861ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
+    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
+    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
+    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x5d9949ff, 0x63d43dff, 
+    0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x447448ff, 
+    0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 
+    0x3d3c4bff, 0x3d3c4cff, 0x347047ff, 0x24c342ff, 0x20c242ff, 0x1cc143ff, 
+    0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x218446ff, 0x3b3b4aff, 0x3a3b4aff, 
+    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 
+    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
+    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
+    0x353a45ff, 0x353943ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x5c5761ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
+    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
+    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
+    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
+    0x59904aff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 
+    0x4cce3fff, 0x416a49ff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 
+    0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x356749ff, 0x20c242ff, 
+    0x1cc143ff, 0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 0x237c47ff, 
+    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 
+    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
+    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
+    0x353a45ff, 0x353a45ff, 0x343944ff, 0x353943ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5c5760ff, 0x5b5762ff, 
+    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
+    0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
+    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
+    0x4e4858ff, 0x4e4858ff, 0x56884bff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 
+    0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x40624aff, 0x3e3c4cff, 0x3e3d4cff, 
+    0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
+    0x355f48ff, 0x1cc143ff, 0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 
+    0x0cbb44ff, 0x257547ff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
+    0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
+    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
+    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x343944ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5b5660ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
+    0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
+    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
+    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x537f4dff, 0x58d13eff, 
+    0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x3e594aff, 
+    0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 
+    0x3c3b4cff, 0x3c3b4aff, 0x365749ff, 0x19c043ff, 0x15be43ff, 0x11bd44ff, 
+    0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x286d46ff, 0x393b49ff, 0x393b49ff, 
+    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 
+    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
+    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
+    0x333944ff, 0x343a43ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x5a555fff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
+    0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 
+    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
+    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
+    0x50764eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 
+    0x40cb40ff, 0x3e514aff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 
+    0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x37504aff, 0x15be43ff, 
+    0x11bd44ff, 0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 0x2a6548ff, 
+    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
+    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
+    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
+    0x343944ff, 0x333944ff, 0x333a44ff, 0x343942ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5a545fff, 0x595560ff, 
+    0x585460ff, 0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 
+    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
+    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
+    0x4d4757ff, 0x4c4757ff, 0x4e6f4fff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 
+    0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x3c484cff, 0x3e3b4cff, 0x3d3c4bff, 
+    0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
+    0x374849ff, 0x11bd44ff, 0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 
+    0x0cb846ff, 0x2c5e48ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
+    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
+    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
+    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x343942ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x59545eff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 
+    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
+    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
+    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4c6650ff, 0x4cce3fff, 
+    0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x3e3f4cff, 
+    0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 
+    0x3c3c4bff, 0x3b3c4aff, 0x3a4049ff, 0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 
+    0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x2f5548ff, 0x393b48ff, 0x393a48ff, 
+    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
+    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
+    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
+    0x333943ff, 0x333942ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x58535eff, 0x58535fff, 0x57525fff, 0x56515eff, 
+    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
+    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
+    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
+    0x4b5e52ff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 
+    0x34c341ff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 
+    0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x0db844ff, 
+    0x0cba45ff, 0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x0cb547ff, 0x324f48ff, 
+    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
+    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
+    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
+    0x333943ff, 0x333943ff, 0x323943ff, 0x333a42ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x58525dff, 0x57525fff, 
+    0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
+    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
+    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
+    0x4b4756ff, 0x4b4756ff, 0x4a5552ff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 
+    0x38c841ff, 0x34c741ff, 0x31bb42ff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
+    0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x0fb046ff, 0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x0cb547ff, 
+    0x0cb447ff, 0x344848ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
+    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
+    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
+    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x333941ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x57515dff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
+    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
+    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
+    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4d54ff, 0x40cb40ff, 
+    0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x2eb242ff, 0x3c3c4bff, 
+    0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x12a846ff, 0x0cb846ff, 0x0cb746ff, 
+    0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x374047ff, 0x383b48ff, 0x383b47ff, 
+    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
+    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
+    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
+    0x323942ff, 0x333841ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x56505cff, 0x56515eff, 0x55505dff, 0x544f5dff, 
+    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
+    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
+    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
+    0x494754ff, 0x3dc840ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x2cc541ff, 
+    0x2caa44ff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x15a047ff, 
+    0x0cb746ff, 0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x0cb148ff, 0x383c48ff, 
+    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
+    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
+    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
+    0x333a43ff, 0x323942ff, 0x323841ff, 0x313941ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x56505cff, 0x55505dff, 
+    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
+    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
+    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
+    0x4a4655ff, 0x494654ff, 0x494654ff, 0x39c142ff, 0x34c741ff, 0x30c641ff, 
+    0x2cc541ff, 0x28c442ff, 0x2aa144ff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
+    0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
+    0x393b49ff, 0x179947ff, 0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x0cb248ff, 
+    0x0daa48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
+    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
+    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
+    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x313940ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x554f5bff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
+    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
+    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
+    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x36b843ff, 
+    0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 0x299845ff, 0x3c3b4bff, 
+    0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 
+    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x199047ff, 0x0cb447ff, 0x0cb348ff, 
+    0x0cb248ff, 0x0bb148ff, 0x11a248ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
+    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
+    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
+    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
+    0x303941ff, 0x313941ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x544e5bff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
+    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
+    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
+    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
+    0x484553ff, 0x34b044ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 0x20c242ff, 
+    0x289046ff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x1d8847ff, 
+    0x0cb348ff, 0x0cb248ff, 0x0bb148ff, 0x0bb049ff, 0x139a49ff, 0x373947ff, 
+    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
+    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
+    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
+    0x303842ff, 0x303941ff, 0x303941ff, 0x313941ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x544d5aff, 0x534e5cff, 
+    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
+    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
+    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
+    0x484554ff, 0x484553ff, 0x474553ff, 0x32a845ff, 0x28c442ff, 0x24c342ff, 
+    0x20c242ff, 0x1cc143ff, 0x278847ff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
+    0x393b48ff, 0x1f8048ff, 0x0cb248ff, 0x0bb148ff, 0x0bb049ff, 0x0baf49ff, 
+    0x159349ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
+    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
+    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
+    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x303940ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x534d5aff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
+    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
+    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
+    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x31a046ff, 
+    0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 0x277f47ff, 0x3b3b4aff, 
+    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 
+    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x217948ff, 0x0bb148ff, 0x0bb049ff, 
+    0x0baf49ff, 0x0bae4aff, 0x188c49ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
+    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
+    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
+    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
+    0x2f3841ff, 0x30393fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x524c59ff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
+    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
+    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
+    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
+    0x464552ff, 0x309747ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 0x15be43ff, 
+    0x287747ff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 
+    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x237248ff, 
+    0x0bb049ff, 0x0baf49ff, 0x0bae4aff, 0x0bad4aff, 0x1a834aff, 0x363a46ff, 
+    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
+    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
+    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
+    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x30393fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x524c59ff, 0x514b5aff, 
+    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
+    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
+    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
+    0x474553ff, 0x464552ff, 0x464452ff, 0x2f8f48ff, 0x1cc143ff, 0x19c043ff, 
+    0x15be43ff, 0x11bd44ff, 0x286f47ff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
+    0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
+    0x383b48ff, 0x256b48ff, 0x0baf49ff, 0x0bae4aff, 0x0bad4aff, 0x0bab4bff, 
+    0x1d7c49ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
+    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
+    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
+    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x30393fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x514b58ff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
+    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
+    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
+    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x2f8749ff, 
+    0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 0x2a6748ff, 0x3a3b4aff, 
+    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 
+    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x286448ff, 0x0bae4aff, 0x0bad4aff, 
+    0x0bab4bff, 0x0baa4bff, 0x1f7649ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
+    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
+    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
+    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
+    0x2f3940ff, 0x2e383fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x504b58ff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
+    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
+    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
+    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
+    0x454451ff, 0x2f804bff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 0x0cbb44ff, 
+    0x2c6049ff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 
+    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x2a5b48ff, 
+    0x0bad4aff, 0x0bab4bff, 0x0baa4bff, 0x0ba94cff, 0x216f49ff, 0x363a45ff, 
+    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
+    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
+    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
+    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2e393fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x504a57ff, 0x4f4959ff, 
+    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
+    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
+    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
+    0x454451ff, 0x454451ff, 0x444451ff, 0x2f784bff, 0x11bd44ff, 0x0dbc44ff, 
+    0x0cbb44ff, 0x0cba45ff, 0x305847ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
+    0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
+    0x373947ff, 0x2c5547ff, 0x0bab4bff, 0x0baa4bff, 0x0ba94cff, 0x0ba84cff, 
+    0x246848ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
+    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
+    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
+    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2d393fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f4957ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
+    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
+    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
+    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x30704bff, 
+    0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 0x315148ff, 0x393b49ff, 
+    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 
+    0x383b47ff, 0x373947ff, 0x363a46ff, 0x2f4f48ff, 0x0baa4bff, 0x0ba94cff, 
+    0x0ba84cff, 0x0ba74cff, 0x256248ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
+    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
+    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
+    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
+    0x2c393fff, 0x2d393eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4e4856ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
+    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
+    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
+    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
+    0x434350ff, 0x31694cff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 0x0cb846ff, 
+    0x334a48ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
+    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x304846ff, 
+    0x0ba94cff, 0x0ba84cff, 0x0ba74cff, 0x0ba64dff, 0x285b48ff, 0x343944ff, 
+    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
+    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
+    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
+    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2d383dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4e4856ff, 0x4d4857ff, 
+    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
+    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
+    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
+    0x434450ff, 0x434350ff, 0x424350ff, 0x34624cff, 0x0cba45ff, 0x0cb945ff, 
+    0x0cb846ff, 0x0cb746ff, 0x374248ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
+    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
+    0x363a46ff, 0x344146ff, 0x0ba84cff, 0x0ba74cff, 0x0ba64dff, 0x0ba54dff, 
+    0x2a5447ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
+    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
+    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
+    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2c383eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4d4855ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
+    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
+    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
+    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x365b4dff, 
+    0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x0cb447ff, 0x383c48ff, 0x393a48ff, 
+    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
+    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x353b46ff, 0x0ba64cff, 0x0ba64dff, 
+    0x0ba54dff, 0x0ba44eff, 0x2c4e46ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
+    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
+    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
+    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
+    0x2b373eff, 0x2c383dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4d4755ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
+    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
+    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
+    0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
+    0x41434fff, 0x3a534dff, 0x0cb846ff, 0x0cb746ff, 0x0cb547ff, 0x0eae47ff, 
+    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
+    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
+    0x0ca14cff, 0x0ba54dff, 0x0ba44eff, 0x0ba24eff, 0x2e4746ff, 0x333a44ff, 
+    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
+    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
+    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
+    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2b383dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4d4755ff, 0x4c4756ff, 
+    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
+    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
+    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 
+    0x42434fff, 0x41434fff, 0x41424eff, 0x3b4c4dff, 0x0cb746ff, 0x0cb547ff, 
+    0x0cb447ff, 0x11a548ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
+    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
+    0x363a45ff, 0x353a45ff, 0x109a4cff, 0x0ba44eff, 0x0ba24eff, 0x0ba14fff, 
+    0x304245ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
+    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
+    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 
+    0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2b383dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4d4754ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
+    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
+    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
+    0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x3e454eff, 
+    0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x139f48ff, 0x383b48ff, 0x383b47ff, 
+    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
+    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x11934cff, 0x0ba24eff, 
+    0x0ba14fff, 0x0ba04fff, 0x323b43ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
+    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
+    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
+    0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 
+    0x2a383eff, 0x2a383cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4c4754ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
+    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
+    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
+    0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 
+    0x40424eff, 0x3f424dff, 0x0eb147ff, 0x0cb348ff, 0x0cb248ff, 0x169648ff, 
+    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
+    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
+    0x148b4cff, 0x0ba14fff, 0x0ba04fff, 0x0d9c4fff, 0x333943ff, 0x323943ff, 
+    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
+    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
+    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 
+    0x2a383eff, 0x2a383eff, 0x29383dff, 0x2a383cff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4c4754ff, 0x4a4655ff, 
+    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
+    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
+    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 
+    0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x10aa49ff, 0x0cb248ff, 
+    0x0bb148ff, 0x188f48ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
+    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
+    0x343944ff, 0x343944ff, 0x16844cff, 0x0ba04fff, 0x0b9f50ff, 0x0f954fff, 
+    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
+    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
+    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 
+    0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x29383cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4b4653ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
+    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
+    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
+    0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 
+    0x13a249ff, 0x0bb148ff, 0x0bb049ff, 0x1a8848ff, 0x373947ff, 0x363a46ff, 
+    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
+    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x187e4cff, 0x0b9f50ff, 
+    0x0b9e50ff, 0x108e4eff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
+    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
+    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
+    0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 
+    0x28383dff, 0x29383bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4b4653ff, 0x494654ff, 0x494654ff, 0x484554ff, 
+    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
+    0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
+    0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 
+    0x3e414dff, 0x3e414cff, 0x159b49ff, 0x0bb049ff, 0x0baf49ff, 0x1d8049ff, 
+    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
+    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
+    0x1b774bff, 0x0b9e50ff, 0x0b9d50ff, 0x12884eff, 0x323942ff, 0x323841ff, 
+    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
+    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
+    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 
+    0x29383dff, 0x28383dff, 0x28383cff, 0x28383bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4a4652ff, 0x494654ff, 
+    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
+    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 
+    0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 
+    0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x189349ff, 0x0baf49ff, 
+    0x0bae4aff, 0x1e7949ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
+    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
+    0x333a44ff, 0x333943ff, 0x1d714aff, 0x0b9d50ff, 0x0a9c51ff, 0x14824dff, 
+    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
+    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 
+    0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 
+    0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x28373aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4a4652ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
+    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
+    0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 
+    0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 
+    0x207f49ff, 0x0bae4aff, 0x0bad4aff, 0x276449ff, 0x363a46ff, 0x363a45ff, 
+    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
+    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x235e48ff, 0x0a9c51ff, 
+    0x0a9b51ff, 0x1c6e4bff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
+    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
+    0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 
+    0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 
+    0x27373bff, 0x27373aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x494552ff, 0x484553ff, 0x474553ff, 0x474553ff, 
+    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
+    0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 
+    0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 
+    0x3d414bff, 0x3c414bff, 0x3a454aff, 0x237048ff, 0x256749ff, 0x363b46ff, 
+    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
+    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
+    0x333b43ff, 0x225f48ff, 0x206549ff, 0x2e3d43ff, 0x303941ff, 0x303941ff, 
+    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
+    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 
+    0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 
+    0x27383cff, 0x27373bff, 0x26373bff, 0x27373aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x494551ff, 0x474553ff, 
+    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
+    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 
+    0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 
+    0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b3f49ff, 
+    0x373b47ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
+    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
+    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
+    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
+    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 
+    0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 
+    0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 0x263739ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x484551ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
+    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
+    0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 
+    0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 
+    0x3b404aff, 0x3a404aff, 0x3a3f48ff, 0x363b47ff, 0x363a45ff, 0x353a45ff, 
+    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
+    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
+    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
+    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
+    0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 
+    0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 
+    0x25373aff, 0x263739ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x484551ff, 0x464552ff, 0x464452ff, 0x454451ff, 
+    0x444451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
+    0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 
+    0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 
+    0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f47ff, 
+    0x363b45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
+    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
+    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
+    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
+    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 
+    0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 
+    0x26373bff, 0x25373aff, 0x25373aff, 0x253639ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x474550ff, 0x464452ff, 
+    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 
+    0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 
+    0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 
+    0x3c404bff, 0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 
+    0x393f48ff, 0x383f48ff, 0x383f48ff, 0x353b45ff, 0x343944ff, 0x333944ff, 
+    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
+    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
+    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 
+    0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 
+    0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 
+    0x26373bff, 0x26373bff, 0x25373aff, 0x25373aff, 0x24363aff, 0x253638ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x474450ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
+    0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 
+    0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 
+    0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 
+    0x393f49ff, 0x393f48ff, 0x383f48ff, 0x383f48ff, 0x373e47ff, 0x373e47ff, 
+    0x353b45ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
+    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
+    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
+    0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 
+    0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 
+    0x27373bff, 0x26373bff, 0x26373bff, 0x25373aff, 0x25373aff, 0x24363aff, 
+    0x243639ff, 0x243638ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x46444fff, 0x454451ff, 0x444451ff, 0x434450ff, 
+    0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 
+    0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 
+    0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b404aff, 0x3a404aff, 
+    0x3a3f49ff, 0x393f49ff, 0x393f48ff, 0x383f48ff, 0x383f48ff, 0x373e47ff, 
+    0x373e47ff, 0x363e47ff, 0x363e46ff, 0x333944ff, 0x333943ff, 0x323943ff, 
+    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
+    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
+    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 
+    0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 
+    0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 0x25373aff, 0x25373aff, 
+    0x24363aff, 0x243639ff, 0x233639ff, 0x243637ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x46404aff, 0x444451ff, 
+    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 
+    0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 
+    0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b404aff, 
+    0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f48ff, 0x383f48ff, 0x383f48ff, 
+    0x373e47ff, 0x373e47ff, 0x363e47ff, 0x363e46ff, 0x353d46ff, 0x353d45ff, 
+    0x323a43ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
+    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
+    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 
+    0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 
+    0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 0x25373aff, 
+    0x25373aff, 0x24363aff, 0x243639ff, 0x233639ff, 0x233638ff, 0x293333ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x553c3aea, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
+    0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 
+    0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 
+    0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f48ff, 0x383f48ff, 
+    0x383f48ff, 0x373e47ff, 0x373e47ff, 0x363e47ff, 0x363e46ff, 0x353d46ff, 
+    0x353d45ff, 0x343d45ff, 0x343d45ff, 0x323a42ff, 0x323841ff, 0x303842ff, 
+    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
+    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
+    0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 
+    0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 
+    0x25373aff, 0x25373aff, 0x24363aff, 0x243639ff, 0x233639ff, 0x233638ff, 
+    0x223538ff, 0x41332be9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x713c3522, 0x4e3c3df7, 0x424350ff, 0x42434fff, 
+    0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 
+    0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 
+    0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f48ff, 
+    0x383f48ff, 0x383f48ff, 0x373e47ff, 0x373e47ff, 0x363e47ff, 0x363e46ff, 
+    0x353d46ff, 0x353d45ff, 0x343d45ff, 0x343d45ff, 0x333d44ff, 0x333c44ff, 
+    0x313943ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
+    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
+    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 
+    0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 
+    0x26373bff, 0x25373aff, 0x25373aff, 0x24363aff, 0x243639ff, 0x233639ff, 
+    0x233638ff, 0x223538ff, 0x38332ef6, 0x60382820, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6d3d2c4b, 0x673d2f97, 0x633d309b, 0x633d309b, 0x633d309b, 0x633d309b, 
+    0x633d309b, 0x633b309b, 0x633b2e9b, 0x613b2e9b, 0x613b2e9b, 0x613b2e9b, 
+    0x613b2e9b, 0x613b2e9b, 0x613b2e9b, 0x5f3b2e9b, 0x5f3b2c9b, 0x5f3b2c9b, 
+    0x5f3b2c9b, 0x5f3b2c9b, 0x5f3b2c9b, 0x5f3b2c9b, 0x5f3b2c9b, 0x5e3b2c9b, 
+    0x5e3b2c9b, 0x5e3a2c9b, 0x5e3a2b9b, 0x5e3a2b9b, 0x5e3a2b9b, 0x5e3a2b9b, 
+    0x5e3a2b9b, 0x5c3a2b9b, 0x5c3a2b9b, 0x5b372a9d, 0x5b372a9d, 0x5b372c9d, 
+    0x5b372c9d, 0x5b372a9d, 0x5c392b9c, 0x58382b9c, 0x58382b9c, 0x58382b9c, 
+    0x5a38299c, 0x5a38299c, 0x5838299c, 0x5838299c, 0x5938299b, 0x5938299b, 
+    0x5938279b, 0x5938279b, 0x5938279b, 0x5938279b, 0x5738279b, 0x5738279b, 
+    0x5738279b, 0x5738279b, 0x5738269b, 0x5738269b, 0x5736269b, 0x5736269b, 
+    0x5636269b, 0x5636269b, 0x5a382597, 0x633a224b, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+};
diff --git a/games/NXDoom/src/heretic/in_lude.c b/games/NXDoom/src/heretic/in_lude.c
new file mode 100644
index 000000000..a8ac4255d
--- /dev/null
+++ b/games/NXDoom/src/heretic/in_lude.c
@@ -0,0 +1,1075 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+/*
+========================
+=
+= IN_lude.c
+=
+========================
+*/
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "v_video.h"
+#include "am_map.h"
+
+
+typedef enum
+{
+    SINGLE,
+    COOPERATIVE,
+    DEATHMATCH
+} gametype_t;
+
+// Public functions
+
+
+boolean intermission;
+
+// Private functions
+
+static void IN_WaitStop(void);
+static void IN_Stop(void);
+static void IN_LoadPics(void);
+static void IN_UnloadPics(void);
+static void IN_CheckForSkip(void);
+static void IN_InitStats(void);
+static void IN_DrawOldLevel(void);
+static void IN_DrawYAH(void);
+static void IN_DrawStatBack(void);
+static void IN_DrawSingleStats(void);
+static void IN_DrawCoopStats(void);
+static void IN_DrawDMStats(void);
+static void IN_DrawNumber(int val, int x, int y, int digits);
+static void IN_DrawTime(int x, int y, int h, int m, int s);
+static void IN_DrTextB(const char *text, int x, int y);
+
+static boolean skipintermission;
+static int interstate = 0;
+static int intertime = -1;
+static int oldintertime = 0;
+static gametype_t gametype;
+
+static int cnt;
+
+static int hours;
+static int minutes;
+static int seconds;
+
+static int slaughterboy;        // in DM, the player with the most kills
+
+static int killPercent[MAXPLAYERS];
+static int bonusPercent[MAXPLAYERS];
+static int secretPercent[MAXPLAYERS];
+
+static patch_t *patchINTERPIC;
+static patch_t *patchBEENTHERE;
+static patch_t *patchGOINGTHERE;
+static patch_t *FontBNumbers[10];
+static patch_t *FontBNegative;
+static patch_t *FontBSlash;
+static patch_t *FontBPercent;
+
+static int FontBLump;
+static int FontBLumpBase;
+static int patchFaceOkayBase;
+static int patchFaceDeadBase;
+
+static signed int totalFrags[MAXPLAYERS];
+static fixed_t dSlideX[MAXPLAYERS];
+static fixed_t dSlideY[MAXPLAYERS];
+
+static const char *KillersText[] = { "K", "I", "L", "L", "E", "R", "S" };
+
+
+typedef struct
+{
+    int x;
+    int y;
+} yahpt_t;
+
+static yahpt_t YAHspot[3][9] = {
+    {
+     {172, 78},
+     {86, 90},
+     {73, 66},
+     {159, 95},
+     {148, 126},
+     {132, 54},
+     {131, 74},
+     {208, 138},
+     {52, 101}
+     },
+    {
+     {218, 57},
+     {137, 81},
+     {155, 124},
+     {171, 68},
+     {250, 86},
+     {136, 98},
+     {203, 90},
+     {220, 140},
+     {279, 106}
+     },
+    {
+     {86, 99},
+     {124, 103},
+     {154, 79},
+     {202, 83},
+     {178, 59},
+     {142, 58},
+     {219, 66},
+     {247, 57},
+     {107, 80}
+     }
+};
+
+static const char *NameForMap(int map)
+{
+    const char *name = LevelNames[(gameepisode - 1) * 9 + map - 1];
+    name = DEH_String(name);
+    if (strlen(name) < 7)
+    {
+        return "";
+    }
+    return name + 7;
+}
+
+//========================================================================
+//
+// IN_Start
+//
+//========================================================================
+
+
+void IN_Start(void)
+{
+    I_SetPalette(W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE));
+    IN_LoadPics();
+    IN_InitStats();
+    intermission = true;
+    interstate = -1;
+    skipintermission = false;
+    intertime = 0;
+    oldintertime = 0;
+    AM_Stop();
+    S_StartSong(mus_intr, true);
+}
+
+//========================================================================
+//
+// IN_WaitStop
+//
+//========================================================================
+
+void IN_WaitStop(void)
+{
+    if (!--cnt)
+    {
+        IN_Stop();
+        G_WorldDone();
+    }
+}
+
+//========================================================================
+//
+// IN_Stop
+//
+//========================================================================
+
+void IN_Stop(void)
+{
+    intermission = false;
+    IN_UnloadPics();
+    SB_state = -1;
+    BorderNeedRefresh = true;
+}
+
+//========================================================================
+//
+// IN_InitStats
+//
+//      Initializes the stats for single player mode
+//========================================================================
+
+void IN_InitStats(void)
+{
+    int i;
+    int j;
+    signed int slaughterfrags;
+    int posnum;
+    int slaughtercount;
+    int playercount;
+    int count;
+
+    if (!netgame)
+    {
+        gametype = SINGLE;
+        count = leveltime / 35;
+        hours = count / 3600;
+        count -= hours * 3600;
+        minutes = count / 60;
+        count -= minutes * 60;
+        seconds = count;
+    }
+    else if (netgame && !deathmatch)
+    {
+        gametype = COOPERATIVE;
+        memset(killPercent, 0, MAXPLAYERS * sizeof(int));
+        memset(bonusPercent, 0, MAXPLAYERS * sizeof(int));
+        memset(secretPercent, 0, MAXPLAYERS * sizeof(int));
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            if (playeringame[i])
+            {
+                if (totalkills)
+                {
+                    killPercent[i] = players[i].killcount * 100 / totalkills;
+                }
+                if (totalitems)
+                {
+                    bonusPercent[i] = players[i].itemcount * 100 / totalitems;
+                }
+                if (totalsecret)
+                {
+                    secretPercent[i] =
+                        players[i].secretcount * 100 / totalsecret;
+                }
+            }
+        }
+    }
+    else
+    {
+        gametype = DEATHMATCH;
+        slaughterboy = 0;
+        slaughterfrags = -9999;
+        posnum = 0;
+        playercount = 0;
+        slaughtercount = 0;
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            totalFrags[i] = 0;
+            if (playeringame[i])
+            {
+                playercount++;
+                for (j = 0; j < MAXPLAYERS; j++)
+                {
+                    if (playeringame[j])
+                    {
+                        totalFrags[i] += players[i].frags[j];
+                    }
+                }
+                dSlideX[i] = (43 * posnum * FRACUNIT) / 20;
+                dSlideY[i] = (36 * posnum * FRACUNIT) / 20;
+                posnum++;
+            }
+            if (totalFrags[i] > slaughterfrags)
+            {
+                slaughterboy = 1 << i;
+                slaughterfrags = totalFrags[i];
+                slaughtercount = 1;
+            }
+            else if (totalFrags[i] == slaughterfrags)
+            {
+                slaughterboy |= 1 << i;
+                slaughtercount++;
+            }
+        }
+        if (playercount == slaughtercount)
+        {                       // don't do the slaughter stuff if everyone is equal
+            slaughterboy = 0;
+        }
+    }
+}
+
+static void IN_LoadUnloadPics(void (*callback)(const char *lumpname,
+                                               int lumpnum,
+                                               patch_t **ptr))
+{
+    int i;
+
+    switch (gameepisode)
+    {
+        case 1:
+            callback(DEH_String("MAPE1"), 0, &patchINTERPIC);
+            break;
+        case 2:
+            callback(DEH_String("MAPE2"), 0, &patchINTERPIC);
+            break;
+        case 3:
+            callback(DEH_String("MAPE3"), 0, &patchINTERPIC);
+            break;
+        default:
+            break;
+    }
+
+    callback(DEH_String("IN_X"), 0, &patchBEENTHERE);
+    callback(DEH_String("IN_YAH"), 0, &patchGOINGTHERE);
+    callback(DEH_String("FONTB13"), 0, &FontBNegative);
+
+    callback(DEH_String("FONTB15"), 0, &FontBSlash);
+    callback(DEH_String("FONTB05"), 0, &FontBPercent);
+
+    FontBLumpBase = W_GetNumForName(DEH_String("FONTB16"));
+
+    for (i = 0; i < 10; i++)
+    {
+        callback(NULL, FontBLumpBase + i, &FontBNumbers[i]);
+    }
+}
+
+//========================================================================
+//
+// IN_LoadPics
+//
+//========================================================================
+
+static void LoadLumpCallback(const char *lumpname, int lumpnum, patch_t **ptr)
+{
+    if (lumpname != NULL)
+    {
+        lumpnum = W_GetNumForName(lumpname);
+    }
+
+    // Cache the lump
+
+    *ptr = W_CacheLumpNum(lumpnum, PU_STATIC);
+}
+
+void IN_LoadPics(void)
+{
+    FontBLump = W_GetNumForName(DEH_String("FONTB_S")) + 1;
+    patchFaceOkayBase = W_GetNumForName(DEH_String("FACEA0"));
+    patchFaceDeadBase = W_GetNumForName(DEH_String("FACEB0"));
+
+    IN_LoadUnloadPics(LoadLumpCallback);
+}
+
+//========================================================================
+//
+// IN_UnloadPics
+//
+//========================================================================
+
+static void UnloadLumpCallback(const char *lumpname, int lumpnum, patch_t **ptr)
+{
+    if (lumpname != NULL)
+    {
+        W_ReleaseLumpName(lumpname);
+    }
+    else
+    {
+        W_ReleaseLumpNum(lumpnum);
+    }
+}
+
+void IN_UnloadPics(void)
+{
+    IN_LoadUnloadPics(UnloadLumpCallback);
+}
+
+//========================================================================
+//
+// IN_Ticker
+//
+//========================================================================
+
+void IN_Ticker(void)
+{
+    if (!intermission)
+    {
+        return;
+    }
+    if (interstate == 3)
+    {
+        IN_WaitStop();
+        return;
+    }
+    IN_CheckForSkip();
+    intertime++;
+    if (oldintertime < intertime)
+    {
+        interstate++;
+        if (gameepisode > 3 && interstate >= 1)
+        {                       // Extended Wad levels:  skip directly to the next level
+            interstate = 3;
+        }
+        switch (interstate)
+        {
+            case 0:
+                oldintertime = intertime + 300;
+                if (gameepisode > 3)
+                {
+                    oldintertime = intertime + 1200;
+                }
+                break;
+            case 1:
+                oldintertime = intertime + 200;
+                break;
+            case 2:
+                oldintertime = INT_MAX;
+                break;
+            case 3:
+                cnt = 10;
+                break;
+            default:
+                break;
+        }
+    }
+    if (skipintermission)
+    {
+        if (interstate == 0 && intertime < 150)
+        {
+            intertime = 150;
+            skipintermission = false;
+            return;
+        }
+        else if (interstate < 2 && gameepisode < 4)
+        {
+            interstate = 2;
+            skipintermission = false;
+            S_StartSound(NULL, sfx_dorcls);
+            return;
+        }
+        interstate = 3;
+        cnt = 10;
+        skipintermission = false;
+        S_StartSound(NULL, sfx_dorcls);
+    }
+}
+
+//========================================================================
+//
+// IN_CheckForSkip
+//
+//      Check to see if any player hit a key
+//========================================================================
+
+void IN_CheckForSkip(void)
+{
+    int i;
+    player_t *player;
+
+    for (i = 0, player = players; i < MAXPLAYERS; i++, player++)
+    {
+        if (playeringame[i])
+        {
+            if (player->cmd.buttons & BT_ATTACK)
+            {
+                if (!player->attackdown)
+                {
+                    skipintermission = 1;
+                }
+                player->attackdown = true;
+            }
+            else
+            {
+                player->attackdown = false;
+            }
+            if (player->cmd.buttons & BT_USE)
+            {
+                if (!player->usedown)
+                {
+                    skipintermission = 1;
+                }
+                player->usedown = true;
+            }
+            else
+            {
+                player->usedown = false;
+            }
+        }
+    }
+}
+
+//========================================================================
+//
+// IN_Drawer
+//
+//========================================================================
+
+void IN_Drawer(void)
+{
+    static int oldinterstate;
+
+    if (!intermission)
+    {
+        return;
+    }
+    if (interstate == 3)
+    {
+        return;
+    }
+    UpdateState |= I_FULLSCRN;
+    if (oldinterstate != 2 && interstate == 2)
+    {
+        S_StartSound(NULL, sfx_pstop);
+    }
+    oldinterstate = interstate;
+    switch (interstate)
+    {
+        case 0:                // draw stats
+            IN_DrawStatBack();
+            switch (gametype)
+            {
+                case SINGLE:
+                    IN_DrawSingleStats();
+                    break;
+                case COOPERATIVE:
+                    IN_DrawCoopStats();
+                    break;
+                case DEATHMATCH:
+                    IN_DrawDMStats();
+                    break;
+            }
+            break;
+        case 1:                // leaving old level
+            if (gameepisode < 4)
+            {
+                V_DrawPatch(0, 0, patchINTERPIC);
+                IN_DrawOldLevel();
+            }
+            break;
+        case 2:                // going to the next level
+            if (gameepisode < 4)
+            {
+                V_DrawPatch(0, 0, patchINTERPIC);
+                IN_DrawYAH();
+            }
+            break;
+        case 3:                // waiting before going to the next level
+            if (gameepisode < 4)
+            {
+                V_DrawPatch(0, 0, patchINTERPIC);
+            }
+            break;
+        default:
+            I_Error("IN_lude:  Intermission state out of range.\n");
+            break;
+    }
+}
+
+//========================================================================
+//
+// IN_DrawStatBack
+//
+//========================================================================
+
+void IN_DrawStatBack(void)
+{
+    int x;
+    int y;
+
+    byte *src;
+    byte *dest;
+
+    src = W_CacheLumpName(DEH_String("FLOOR16"), PU_CACHE);
+    dest = I_VideoBuffer;
+
+    for (y = 0; y < SCREENHEIGHT; y++)
+    {
+        for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+            memcpy(dest, src + ((y & 63) << 6), 64);
+            dest += 64;
+        }
+        if (SCREENWIDTH & 63)
+        {
+            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+            dest += (SCREENWIDTH & 63);
+        }
+    }
+}
+
+//========================================================================
+//
+// IN_DrawOldLevel
+//
+//========================================================================
+
+void IN_DrawOldLevel(void)
+{
+    const char *level_name = NameForMap(prevmap);
+    int i;
+    int x;
+
+    x = 160 - MN_TextBWidth(level_name) / 2;
+    IN_DrTextB(level_name, x, 3);
+    x = 160 - MN_TextAWidth(DEH_String("FINISHED")) / 2;
+    MN_DrTextA(DEH_String("FINISHED"), x, 25);
+
+    if (prevmap == 9)
+    {
+        for (i = 0; i < gamemap - 1; i++)
+        {
+            V_DrawPatch(YAHspot[gameepisode - 1][i].x,
+                        YAHspot[gameepisode - 1][i].y, patchBEENTHERE);
+        }
+        if (!(intertime & 16))
+        {
+            V_DrawPatch(YAHspot[gameepisode - 1][8].x,
+                        YAHspot[gameepisode - 1][8].y, patchBEENTHERE);
+        }
+    }
+    else
+    {
+        for (i = 0; i < prevmap - 1; i++)
+        {
+            V_DrawPatch(YAHspot[gameepisode - 1][i].x,
+                        YAHspot[gameepisode - 1][i].y, patchBEENTHERE);
+        }
+        if (players[consoleplayer].didsecret)
+        {
+            V_DrawPatch(YAHspot[gameepisode - 1][8].x,
+                        YAHspot[gameepisode - 1][8].y, patchBEENTHERE);
+        }
+        if (!(intertime & 16))
+        {
+            V_DrawPatch(YAHspot[gameepisode - 1][prevmap - 1].x,
+                        YAHspot[gameepisode - 1][prevmap - 1].y,
+                        patchBEENTHERE);
+        }
+    }
+}
+
+//========================================================================
+//
+// IN_DrawYAH
+//
+//========================================================================
+
+void IN_DrawYAH(void)
+{
+    const char *level_name = NameForMap(gamemap);
+    int i;
+    int x;
+
+    x = 160 - MN_TextAWidth(DEH_String("NOW ENTERING:")) / 2;
+    MN_DrTextA(DEH_String("NOW ENTERING:"), x, 10);
+    x = 160 - MN_TextBWidth(level_name) / 2;
+    IN_DrTextB(level_name, x, 20);
+
+    if (prevmap == 9)
+    {
+        prevmap = gamemap - 1;
+    }
+    for (i = 0; i < prevmap; i++)
+    {
+        V_DrawPatch(YAHspot[gameepisode - 1][i].x,
+                    YAHspot[gameepisode - 1][i].y, patchBEENTHERE);
+    }
+    if (players[consoleplayer].didsecret)
+    {
+        V_DrawPatch(YAHspot[gameepisode - 1][8].x,
+                    YAHspot[gameepisode - 1][8].y, patchBEENTHERE);
+    }
+    if (!(intertime & 16) || interstate == 3)
+    {                           // draw the destination 'X'
+        V_DrawPatch(YAHspot[gameepisode - 1][gamemap - 1].x,
+                    YAHspot[gameepisode - 1][gamemap - 1].y, patchGOINGTHERE);
+    }
+}
+
+//========================================================================
+//
+// IN_DrawSingleStats
+//
+//========================================================================
+
+void IN_DrawSingleStats(void)
+{
+    const char *prev_level_name = NameForMap(prevmap);
+    const char *next_level_name = NameForMap(gamemap);
+    int x;
+    static int sounds;
+
+    IN_DrTextB(DEH_String("KILLS"), 50, 65);
+    IN_DrTextB(DEH_String("ITEMS"), 50, 90);
+    IN_DrTextB(DEH_String("SECRETS"), 50, 115);
+
+    x = 160 - MN_TextBWidth(prev_level_name) / 2;
+    IN_DrTextB(prev_level_name, x, 3);
+    x = 160 - MN_TextAWidth(DEH_String("FINISHED")) / 2;
+    MN_DrTextA(DEH_String("FINISHED"), x, 25);
+
+    if (intertime < 30)
+    {
+        sounds = 0;
+        return;
+    }
+    if (sounds < 1 && intertime >= 30)
+    {
+        S_StartSound(NULL, sfx_dorcls);
+        sounds++;
+    }
+    IN_DrawNumber(players[consoleplayer].killcount, 200, 65, 3);
+    V_DrawShadowedPatch(237, 65, FontBSlash);
+    IN_DrawNumber(totalkills, 248, 65, 3);
+    if (intertime < 60)
+    {
+        return;
+    }
+    if (sounds < 2 && intertime >= 60)
+    {
+        S_StartSound(NULL, sfx_dorcls);
+        sounds++;
+    }
+    IN_DrawNumber(players[consoleplayer].itemcount, 200, 90, 3);
+    V_DrawShadowedPatch(237, 90, FontBSlash);
+    IN_DrawNumber(totalitems, 248, 90, 3);
+    if (intertime < 90)
+    {
+        return;
+    }
+    if (sounds < 3 && intertime >= 90)
+    {
+        S_StartSound(NULL, sfx_dorcls);
+        sounds++;
+    }
+    IN_DrawNumber(players[consoleplayer].secretcount, 200, 115, 3);
+    V_DrawShadowedPatch(237, 115, FontBSlash);
+    IN_DrawNumber(totalsecret, 248, 115, 3);
+    if (intertime < 150)
+    {
+        return;
+    }
+    if (sounds < 4 && intertime >= 150)
+    {
+        S_StartSound(NULL, sfx_dorcls);
+        sounds++;
+    }
+
+    if (gamemode != retail || gameepisode <= 3)
+    {
+        IN_DrTextB(DEH_String("TIME"), 85, 160);
+        IN_DrawTime(155, 160, hours, minutes, seconds);
+    }
+    else
+    {
+        x = 160 - MN_TextAWidth(DEH_String("NOW ENTERING:")) / 2;
+        MN_DrTextA(DEH_String("NOW ENTERING:"), x, 160);
+        x = 160 - MN_TextBWidth(next_level_name) / 2;
+        IN_DrTextB(next_level_name, x, 170);
+        skipintermission = false;
+    }
+}
+
+//========================================================================
+//
+// IN_DrawCoopStats
+//
+//========================================================================
+
+void IN_DrawCoopStats(void)
+{
+    const char *level_name = NameForMap(prevmap);
+    int i;
+    int x;
+    int ypos;
+
+    static int sounds;
+
+    IN_DrTextB(DEH_String("KILLS"), 95, 35);
+    IN_DrTextB(DEH_String("BONUS"), 155, 35);
+    IN_DrTextB(DEH_String("SECRET"), 232, 35);
+    x = 160 - MN_TextBWidth(level_name) / 2;
+    IN_DrTextB(level_name, x, 3);
+    x = 160 - MN_TextAWidth(DEH_String("FINISHED")) / 2;
+    MN_DrTextA(DEH_String("FINISHED"), x, 25);
+
+    ypos = 50;
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (playeringame[i])
+        {
+            V_DrawShadowedPatch(25, ypos,
+                                W_CacheLumpNum(patchFaceOkayBase + i,
+                                               PU_CACHE));
+            if (intertime < 40)
+            {
+                sounds = 0;
+                ypos += 37;
+                continue;
+            }
+            else if (intertime >= 40 && sounds < 1)
+            {
+                S_StartSound(NULL, sfx_dorcls);
+                sounds++;
+            }
+            IN_DrawNumber(killPercent[i], 85, ypos + 10, 3);
+            V_DrawShadowedPatch(121, ypos + 10, FontBPercent);
+            IN_DrawNumber(bonusPercent[i], 160, ypos + 10, 3);
+            V_DrawShadowedPatch(196, ypos + 10, FontBPercent);
+            IN_DrawNumber(secretPercent[i], 237, ypos + 10, 3);
+            V_DrawShadowedPatch(273, ypos + 10, FontBPercent);
+            ypos += 37;
+        }
+    }
+}
+
+//========================================================================
+//
+// IN_DrawDMStats
+//
+//========================================================================
+
+void IN_DrawDMStats(void)
+{
+    int i;
+    int j;
+    int ypos;
+    int xpos;
+    int kpos;
+
+    static int sounds;
+
+    xpos = 90;
+    ypos = 55;
+
+    IN_DrTextB(DEH_String("TOTAL"), 265, 30);
+    MN_DrTextA(DEH_String("VICTIMS"), 140, 8);
+    for (i = 0; i < 7; i++)
+    {
+        MN_DrTextA(DEH_String(KillersText[i]), 10, 80 + 9 * i);
+    }
+    if (intertime < 20)
+    {
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            if (playeringame[i])
+            {
+                V_DrawShadowedPatch(40,
+                                    ((ypos << FRACBITS) +
+                                     dSlideY[i] * intertime) >> FRACBITS,
+                                    W_CacheLumpNum(patchFaceOkayBase + i,
+                                                   PU_CACHE));
+                V_DrawShadowedPatch(((xpos << FRACBITS) +
+                                     dSlideX[i] * intertime) >> FRACBITS, 18,
+                                    W_CacheLumpNum(patchFaceDeadBase + i,
+                                                   PU_CACHE));
+            }
+        }
+        sounds = 0;
+        return;
+    }
+    if (intertime >= 20 && sounds < 1)
+    {
+        S_StartSound(NULL, sfx_dorcls);
+        sounds++;
+    }
+    if (intertime >= 100 && slaughterboy && sounds < 2)
+    {
+        S_StartSound(NULL, sfx_wpnup);
+        sounds++;
+    }
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (playeringame[i])
+        {
+            if (intertime < 100 || i == consoleplayer)
+            {
+                V_DrawShadowedPatch(40, ypos,
+                                    W_CacheLumpNum(patchFaceOkayBase + i,
+                                                   PU_CACHE));
+                V_DrawShadowedPatch(xpos, 18,
+                                    W_CacheLumpNum(patchFaceDeadBase + i,
+                                                   PU_CACHE));
+            }
+            else
+            {
+                V_DrawAltTLPatch(40, ypos,
+                              W_CacheLumpNum(patchFaceOkayBase + i,
+                                             PU_CACHE));
+                V_DrawAltTLPatch(xpos, 18,
+                              W_CacheLumpNum(patchFaceDeadBase + i,
+                                             PU_CACHE));
+            }
+            kpos = 86;
+            for (j = 0; j < MAXPLAYERS; j++)
+            {
+                if (playeringame[j])
+                {
+                    IN_DrawNumber(players[i].frags[j], kpos, ypos + 10, 3);
+                    kpos += 43;
+                }
+            }
+            if (slaughterboy & (1 << i))
+            {
+                if (!(intertime & 16))
+                {
+                    IN_DrawNumber(totalFrags[i], 263, ypos + 10, 3);
+                }
+            }
+            else
+            {
+                IN_DrawNumber(totalFrags[i], 263, ypos + 10, 3);
+            }
+            ypos += 36;
+            xpos += 43;
+        }
+    }
+}
+
+//========================================================================
+//
+// IN_DrawTime
+//
+//========================================================================
+
+void IN_DrawTime(int x, int y, int h, int m, int s)
+{
+    if (h)
+    {
+        IN_DrawNumber(h, x, y, 2);
+        IN_DrTextB(DEH_String(":"), x + 26, y);
+    }
+    x += 34;
+    if (m || h)
+    {
+        IN_DrawNumber(m, x, y, 2);
+    }
+    x += 34;
+    if (s)
+    {
+        IN_DrTextB(DEH_String(":"), x - 8, y);
+        IN_DrawNumber(s, x, y, 2);
+    }
+}
+
+//========================================================================
+//
+// IN_DrawNumber
+//
+//========================================================================
+
+void IN_DrawNumber(int val, int x, int y, int digits)
+{
+    patch_t *patch;
+    int xpos;
+    int oldval;
+    int realdigits;
+    boolean neg;
+
+    oldval = val;
+    xpos = x;
+    neg = false;
+    realdigits = 1;
+
+    if (val < 0)
+    {                           //...this should reflect negative frags
+        val = -val;
+        neg = true;
+        if (val > 99)
+        {
+            val = 99;
+        }
+    }
+    if (val > 9)
+    {
+        realdigits++;
+        if (digits < realdigits)
+        {
+            realdigits = digits;
+            val = 9;
+        }
+    }
+    if (val > 99)
+    {
+        realdigits++;
+        if (digits < realdigits)
+        {
+            realdigits = digits;
+            val = 99;
+        }
+    }
+    if (val > 999)
+    {
+        realdigits++;
+        if (digits < realdigits)
+        {
+            realdigits = digits;
+            val = 999;
+        }
+    }
+    if (digits == 4)
+    {
+        patch = FontBNumbers[val / 1000];
+        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12, y, patch);
+    }
+    if (digits > 2)
+    {
+        if (realdigits > 2)
+        {
+            patch = FontBNumbers[val / 100];
+            V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+        }
+        xpos += 12;
+    }
+    val = val % 100;
+    if (digits > 1)
+    {
+        if (val > 9)
+        {
+            patch = FontBNumbers[val / 10];
+            V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+        }
+        else if (digits == 2 || oldval > 99)
+        {
+            V_DrawShadowedPatch(xpos, y, FontBNumbers[0]);
+        }
+        xpos += 12;
+    }
+    val = val % 10;
+    patch = FontBNumbers[val];
+    V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+    if (neg)
+    {
+        patch = FontBNegative;
+        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12 * (realdigits),
+                            y, patch);
+    }
+}
+
+//========================================================================
+//
+// IN_DrTextB
+//
+//========================================================================
+
+void IN_DrTextB(const char *text, int x, int y)
+{
+    char c;
+    patch_t *p;
+
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            x += 8;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontBLump + c - 33, PU_CACHE);
+            V_DrawShadowedPatch(x, y, p);
+            x += SHORT(p->width) - 1;
+        }
+    }
+}
diff --git a/games/NXDoom/src/heretic/info.c b/games/NXDoom/src/heretic/info.c
new file mode 100644
index 000000000..d736325b7
--- /dev/null
+++ b/games/NXDoom/src/heretic/info.c
@@ -0,0 +1,5600 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+#include "doomdef.h"
+#include "p_action.h"
+
+const char *sprnames[] = {
+    "IMPX","ACLO","PTN1","SHLD","SHD2","BAGH","SPMP","INVS","PTN2","SOAR",
+    "INVU","PWBK","EGGC","EGGM","FX01","SPHL","TRCH","FBMB","XPL1","ATLP",
+    "PPOD","AMG1","SPSH","LVAS","SLDG","SKH1","SKH2","SKH3","SKH4","CHDL",
+    "SRTC","SMPL","STGS","STGL","STCS","STCL","KFR1","BARL","BRPL","MOS1",
+    "MOS2","WTRH","HCOR","KGZ1","KGZB","KGZG","KGZY","VLCO","VFBL","VTFB",
+    "SFFI","TGLT","TELE","STFF","PUF3","PUF4","BEAK","WGNT","GAUN","PUF1",
+    "WBLS","BLSR","FX18","FX17","WMCE","MACE","FX02","WSKL","HROD","FX00",
+    "FX20","FX21","FX22","FX23","GWND","PUF2","WPHX","PHNX","FX04","FX08",
+    "FX09","WBOW","CRBW","FX03","BLOD","PLAY","FDTH","BSKL","CHKN","MUMM",
+    "FX15","BEAS","FRB1","SNKE","SNFX","HEAD","FX05","FX06","FX07","CLNK",
+    "WZRD","FX11","FX10","KNIG","SPAX","RAXE","SRCR","FX14","SOR2","SDTH",
+    "FX16","MNTR","FX12","FX13","AKYY","BKYY","CKYY","AMG2","AMM1","AMM2",
+    "AMC1","AMC2","AMS1","AMS2","AMP1","AMP2","AMB1","AMB2", 
+    NULL
+};
+
+state_t states[NUMSTATES] = {
+    {SPR_IMPX, 0, -1, NULL, S_NULL, 0, 0},      // S_NULL
+    {SPR_ACLO, 4, 1050, A_FreeTargMobj, S_NULL, 0, 0},  // S_FREETARGMOBJ
+    {SPR_PTN1, 0, 3, NULL, S_ITEM_PTN1_2, 0, 0},        // S_ITEM_PTN1_1
+    {SPR_PTN1, 1, 3, NULL, S_ITEM_PTN1_3, 0, 0},        // S_ITEM_PTN1_2
+    {SPR_PTN1, 2, 3, NULL, S_ITEM_PTN1_1, 0, 0},        // S_ITEM_PTN1_3
+    {SPR_SHLD, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_SHLD1
+    {SPR_SHD2, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_SHD2_1
+    {SPR_BAGH, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_BAGH1
+    {SPR_SPMP, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_SPMP1
+    {SPR_ACLO, 4, 1400, NULL, S_HIDESPECIAL2, 0, 0},    // S_HIDESPECIAL1
+    {SPR_ACLO, 0, 4, A_RestoreSpecialThing1, S_HIDESPECIAL3, 0, 0},     // S_HIDESPECIAL2
+    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL4, 0, 0},       // S_HIDESPECIAL3
+    {SPR_ACLO, 0, 4, NULL, S_HIDESPECIAL5, 0, 0},       // S_HIDESPECIAL4
+    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL6, 0, 0},       // S_HIDESPECIAL5
+    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL7, 0, 0},       // S_HIDESPECIAL6
+    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL8, 0, 0},       // S_HIDESPECIAL7
+    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL9, 0, 0},       // S_HIDESPECIAL8
+    {SPR_ACLO, 3, 4, NULL, S_HIDESPECIAL10, 0, 0},      // S_HIDESPECIAL9
+    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL11, 0, 0},      // S_HIDESPECIAL10
+    {SPR_ACLO, 3, 4, A_RestoreSpecialThing2, S_NULL, 0, 0},     // S_HIDESPECIAL11
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2, 0, 0},       // S_DORMANTARTI1
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3, 0, 0},       // S_DORMANTARTI2
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI4, 0, 0},       // S_DORMANTARTI3
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI5, 0, 0},       // S_DORMANTARTI4
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI6, 0, 0},       // S_DORMANTARTI5
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI7, 0, 0},       // S_DORMANTARTI6
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI8, 0, 0},       // S_DORMANTARTI7
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI9, 0, 0},       // S_DORMANTARTI8
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI10, 0, 0},      // S_DORMANTARTI9
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI11, 0, 0},      // S_DORMANTARTI10
+    {SPR_ACLO, 0, 1400, A_HideThing, S_DORMANTARTI12, 0, 0},    // S_DORMANTARTI11
+    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI13, 0, 0},     // S_DORMANTARTI12
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI14, 0, 0},      // S_DORMANTARTI13
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI15, 0, 0},      // S_DORMANTARTI14
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI16, 0, 0},      // S_DORMANTARTI15
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI17, 0, 0},      // S_DORMANTARTI16
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI18, 0, 0},      // S_DORMANTARTI17
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI19, 0, 0},      // S_DORMANTARTI18
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI20, 0, 0},      // S_DORMANTARTI19
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI21, 0, 0},      // S_DORMANTARTI20
+    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI21
+    {SPR_ACLO, 3, 3, NULL, S_DEADARTI2, 0, 0},  // S_DEADARTI1
+    {SPR_ACLO, 2, 3, NULL, S_DEADARTI3, 0, 0},  // S_DEADARTI2
+    {SPR_ACLO, 3, 3, NULL, S_DEADARTI4, 0, 0},  // S_DEADARTI3
+    {SPR_ACLO, 2, 3, NULL, S_DEADARTI5, 0, 0},  // S_DEADARTI4
+    {SPR_ACLO, 1, 3, NULL, S_DEADARTI6, 0, 0},  // S_DEADARTI5
+    {SPR_ACLO, 2, 3, NULL, S_DEADARTI7, 0, 0},  // S_DEADARTI6
+    {SPR_ACLO, 1, 3, NULL, S_DEADARTI8, 0, 0},  // S_DEADARTI7
+    {SPR_ACLO, 0, 3, NULL, S_DEADARTI9, 0, 0},  // S_DEADARTI8
+    {SPR_ACLO, 1, 3, NULL, S_DEADARTI10, 0, 0}, // S_DEADARTI9
+    {SPR_ACLO, 0, 3, NULL, S_NULL, 0, 0},       // S_DEADARTI10
+    {SPR_INVS, 32768, 350, NULL, S_ARTI_INVS1, 0, 0},   // S_ARTI_INVS1
+    {SPR_PTN2, 0, 4, NULL, S_ARTI_PTN2_2, 0, 0},        // S_ARTI_PTN2_1
+    {SPR_PTN2, 1, 4, NULL, S_ARTI_PTN2_3, 0, 0},        // S_ARTI_PTN2_2
+    {SPR_PTN2, 2, 4, NULL, S_ARTI_PTN2_1, 0, 0},        // S_ARTI_PTN2_3
+    {SPR_SOAR, 0, 5, NULL, S_ARTI_SOAR2, 0, 0}, // S_ARTI_SOAR1
+    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR3, 0, 0}, // S_ARTI_SOAR2
+    {SPR_SOAR, 2, 5, NULL, S_ARTI_SOAR4, 0, 0}, // S_ARTI_SOAR3
+    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR1, 0, 0}, // S_ARTI_SOAR4
+    {SPR_INVU, 0, 3, NULL, S_ARTI_INVU2, 0, 0}, // S_ARTI_INVU1
+    {SPR_INVU, 1, 3, NULL, S_ARTI_INVU3, 0, 0}, // S_ARTI_INVU2
+    {SPR_INVU, 2, 3, NULL, S_ARTI_INVU4, 0, 0}, // S_ARTI_INVU3
+    {SPR_INVU, 3, 3, NULL, S_ARTI_INVU1, 0, 0}, // S_ARTI_INVU4
+    {SPR_PWBK, 0, 350, NULL, S_ARTI_PWBK1, 0, 0},       // S_ARTI_PWBK1
+    {SPR_EGGC, 0, 6, NULL, S_ARTI_EGGC2, 0, 0}, // S_ARTI_EGGC1
+    {SPR_EGGC, 1, 6, NULL, S_ARTI_EGGC3, 0, 0}, // S_ARTI_EGGC2
+    {SPR_EGGC, 2, 6, NULL, S_ARTI_EGGC4, 0, 0}, // S_ARTI_EGGC3
+    {SPR_EGGC, 1, 6, NULL, S_ARTI_EGGC1, 0, 0}, // S_ARTI_EGGC4
+    {SPR_EGGM, 0, 4, NULL, S_EGGFX2, 0, 0},     // S_EGGFX1
+    {SPR_EGGM, 1, 4, NULL, S_EGGFX3, 0, 0},     // S_EGGFX2
+    {SPR_EGGM, 2, 4, NULL, S_EGGFX4, 0, 0},     // S_EGGFX3
+    {SPR_EGGM, 3, 4, NULL, S_EGGFX5, 0, 0},     // S_EGGFX4
+    {SPR_EGGM, 4, 4, NULL, S_EGGFX1, 0, 0},     // S_EGGFX5
+    {SPR_FX01, 32772, 3, NULL, S_EGGFXI1_2, 0, 0},      // S_EGGFXI1_1
+    {SPR_FX01, 32773, 3, NULL, S_EGGFXI1_3, 0, 0},      // S_EGGFXI1_2
+    {SPR_FX01, 32774, 3, NULL, S_EGGFXI1_4, 0, 0},      // S_EGGFXI1_3
+    {SPR_FX01, 32775, 3, NULL, S_NULL, 0, 0},   // S_EGGFXI1_4
+    {SPR_SPHL, 0, 350, NULL, S_ARTI_SPHL1, 0, 0},       // S_ARTI_SPHL1
+    {SPR_TRCH, 32768, 3, NULL, S_ARTI_TRCH2, 0, 0},     // S_ARTI_TRCH1
+    {SPR_TRCH, 32769, 3, NULL, S_ARTI_TRCH3, 0, 0},     // S_ARTI_TRCH2
+    {SPR_TRCH, 32770, 3, NULL, S_ARTI_TRCH1, 0, 0},     // S_ARTI_TRCH3
+    {SPR_FBMB, 4, 350, NULL, S_ARTI_FBMB1, 0, 0},       // S_ARTI_FBMB1
+    {SPR_FBMB, 0, 10, NULL, S_FIREBOMB2, 0, 0}, // S_FIREBOMB1
+    {SPR_FBMB, 1, 10, NULL, S_FIREBOMB3, 0, 0}, // S_FIREBOMB2
+    {SPR_FBMB, 2, 10, NULL, S_FIREBOMB4, 0, 0}, // S_FIREBOMB3
+    {SPR_FBMB, 3, 10, NULL, S_FIREBOMB5, 0, 0}, // S_FIREBOMB4
+    {SPR_FBMB, 4, 6, A_Scream, S_FIREBOMB6, 0, 0},      // S_FIREBOMB5
+    {SPR_XPL1, 32768, 4, A_Explode, S_FIREBOMB7, 0, 0}, // S_FIREBOMB6
+    {SPR_XPL1, 32769, 4, NULL, S_FIREBOMB8, 0, 0},      // S_FIREBOMB7
+    {SPR_XPL1, 32770, 4, NULL, S_FIREBOMB9, 0, 0},      // S_FIREBOMB8
+    {SPR_XPL1, 32771, 4, NULL, S_FIREBOMB10, 0, 0},     // S_FIREBOMB9
+    {SPR_XPL1, 32772, 4, NULL, S_FIREBOMB11, 0, 0},     // S_FIREBOMB10
+    {SPR_XPL1, 32773, 4, NULL, S_NULL, 0, 0},   // S_FIREBOMB11
+    {SPR_ATLP, 0, 4, NULL, S_ARTI_ATLP2, 0, 0}, // S_ARTI_ATLP1
+    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP3, 0, 0}, // S_ARTI_ATLP2
+    {SPR_ATLP, 2, 4, NULL, S_ARTI_ATLP4, 0, 0}, // S_ARTI_ATLP3
+    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP1, 0, 0}, // S_ARTI_ATLP4
+    {SPR_PPOD, 0, 10, NULL, S_POD_WAIT1, 0, 0}, // S_POD_WAIT1
+    {SPR_PPOD, 1, 14, A_PodPain, S_POD_WAIT1, 0, 0},    // S_POD_PAIN1
+    {SPR_PPOD, 32770, 5, A_RemovePod, S_POD_DIE2, 0, 0},        // S_POD_DIE1
+    {SPR_PPOD, 32771, 5, A_Scream, S_POD_DIE3, 0, 0},   // S_POD_DIE2
+    {SPR_PPOD, 32772, 5, A_Explode, S_POD_DIE4, 0, 0},  // S_POD_DIE3
+    {SPR_PPOD, 32773, 10, NULL, S_FREETARGMOBJ, 0, 0},  // S_POD_DIE4
+    {SPR_PPOD, 8, 3, NULL, S_POD_GROW2, 0, 0},  // S_POD_GROW1
+    {SPR_PPOD, 9, 3, NULL, S_POD_GROW3, 0, 0},  // S_POD_GROW2
+    {SPR_PPOD, 10, 3, NULL, S_POD_GROW4, 0, 0}, // S_POD_GROW3
+    {SPR_PPOD, 11, 3, NULL, S_POD_GROW5, 0, 0}, // S_POD_GROW4
+    {SPR_PPOD, 12, 3, NULL, S_POD_GROW6, 0, 0}, // S_POD_GROW5
+    {SPR_PPOD, 13, 3, NULL, S_POD_GROW7, 0, 0}, // S_POD_GROW6
+    {SPR_PPOD, 14, 3, NULL, S_POD_GROW8, 0, 0}, // S_POD_GROW7
+    {SPR_PPOD, 15, 3, NULL, S_POD_WAIT1, 0, 0}, // S_POD_GROW8
+    {SPR_PPOD, 6, 8, NULL, S_PODGOO2, 0, 0},    // S_PODGOO1
+    {SPR_PPOD, 7, 8, NULL, S_PODGOO1, 0, 0},    // S_PODGOO2
+    {SPR_PPOD, 6, 10, NULL, S_NULL, 0, 0},      // S_PODGOOX
+    {SPR_AMG1, 0, 35, A_MakePod, S_PODGENERATOR, 0, 0}, // S_PODGENERATOR
+    {SPR_SPSH, 0, 8, NULL, S_SPLASH2, 0, 0},    // S_SPLASH1
+    {SPR_SPSH, 1, 8, NULL, S_SPLASH3, 0, 0},    // S_SPLASH2
+    {SPR_SPSH, 2, 8, NULL, S_SPLASH4, 0, 0},    // S_SPLASH3
+    {SPR_SPSH, 3, 16, NULL, S_NULL, 0, 0},      // S_SPLASH4
+    {SPR_SPSH, 3, 10, NULL, S_NULL, 0, 0},      // S_SPLASHX
+    {SPR_SPSH, 4, 5, NULL, S_SPLASHBASE2, 0, 0},        // S_SPLASHBASE1
+    {SPR_SPSH, 5, 5, NULL, S_SPLASHBASE3, 0, 0},        // S_SPLASHBASE2
+    {SPR_SPSH, 6, 5, NULL, S_SPLASHBASE4, 0, 0},        // S_SPLASHBASE3
+    {SPR_SPSH, 7, 5, NULL, S_SPLASHBASE5, 0, 0},        // S_SPLASHBASE4
+    {SPR_SPSH, 8, 5, NULL, S_SPLASHBASE6, 0, 0},        // S_SPLASHBASE5
+    {SPR_SPSH, 9, 5, NULL, S_SPLASHBASE7, 0, 0},        // S_SPLASHBASE6
+    {SPR_SPSH, 10, 5, NULL, S_NULL, 0, 0},      // S_SPLASHBASE7
+    {SPR_LVAS, 32768, 5, NULL, S_LAVASPLASH2, 0, 0},    // S_LAVASPLASH1
+    {SPR_LVAS, 32769, 5, NULL, S_LAVASPLASH3, 0, 0},    // S_LAVASPLASH2
+    {SPR_LVAS, 32770, 5, NULL, S_LAVASPLASH4, 0, 0},    // S_LAVASPLASH3
+    {SPR_LVAS, 32771, 5, NULL, S_LAVASPLASH5, 0, 0},    // S_LAVASPLASH4
+    {SPR_LVAS, 32772, 5, NULL, S_LAVASPLASH6, 0, 0},    // S_LAVASPLASH5
+    {SPR_LVAS, 32773, 5, NULL, S_NULL, 0, 0},   // S_LAVASPLASH6
+    {SPR_LVAS, 32774, 5, NULL, S_LAVASMOKE2, 0, 0},     // S_LAVASMOKE1
+    {SPR_LVAS, 32775, 5, NULL, S_LAVASMOKE3, 0, 0},     // S_LAVASMOKE2
+    {SPR_LVAS, 32776, 5, NULL, S_LAVASMOKE4, 0, 0},     // S_LAVASMOKE3
+    {SPR_LVAS, 32777, 5, NULL, S_LAVASMOKE5, 0, 0},     // S_LAVASMOKE4
+    {SPR_LVAS, 32778, 5, NULL, S_NULL, 0, 0},   // S_LAVASMOKE5
+    {SPR_SLDG, 0, 8, NULL, S_SLUDGECHUNK2, 0, 0},       // S_SLUDGECHUNK1
+    {SPR_SLDG, 1, 8, NULL, S_SLUDGECHUNK3, 0, 0},       // S_SLUDGECHUNK2
+    {SPR_SLDG, 2, 8, NULL, S_SLUDGECHUNK4, 0, 0},       // S_SLUDGECHUNK3
+    {SPR_SLDG, 3, 8, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNK4
+    {SPR_SLDG, 3, 6, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNKX
+    {SPR_SLDG, 4, 5, NULL, S_SLUDGESPLASH2, 0, 0},      // S_SLUDGESPLASH1
+    {SPR_SLDG, 5, 5, NULL, S_SLUDGESPLASH3, 0, 0},      // S_SLUDGESPLASH2
+    {SPR_SLDG, 6, 5, NULL, S_SLUDGESPLASH4, 0, 0},      // S_SLUDGESPLASH3
+    {SPR_SLDG, 7, 5, NULL, S_NULL, 0, 0},       // S_SLUDGESPLASH4
+    {SPR_SKH1, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG70_1
+    {SPR_SKH2, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG60_1
+    {SPR_SKH3, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG45_1
+    {SPR_SKH4, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG35_1
+    {SPR_CHDL, 0, 4, NULL, S_CHANDELIER2, 0, 0},        // S_CHANDELIER1
+    {SPR_CHDL, 1, 4, NULL, S_CHANDELIER3, 0, 0},        // S_CHANDELIER2
+    {SPR_CHDL, 2, 4, NULL, S_CHANDELIER1, 0, 0},        // S_CHANDELIER3
+    {SPR_SRTC, 0, 4, NULL, S_SERPTORCH2, 0, 0}, // S_SERPTORCH1
+    {SPR_SRTC, 1, 4, NULL, S_SERPTORCH3, 0, 0}, // S_SERPTORCH2
+    {SPR_SRTC, 2, 4, NULL, S_SERPTORCH1, 0, 0}, // S_SERPTORCH3
+    {SPR_SMPL, 0, -1, NULL, S_NULL, 0, 0},      // S_SMALLPILLAR
+    {SPR_STGS, 0, -1, NULL, S_NULL, 0, 0},      // S_STALAGMITESMALL
+    {SPR_STGL, 0, -1, NULL, S_NULL, 0, 0},      // S_STALAGMITELARGE
+    {SPR_STCS, 0, -1, NULL, S_NULL, 0, 0},      // S_STALACTITESMALL
+    {SPR_STCL, 0, -1, NULL, S_NULL, 0, 0},      // S_STALACTITELARGE
+    {SPR_KFR1, 32768, 3, NULL, S_FIREBRAZIER2, 0, 0},   // S_FIREBRAZIER1
+    {SPR_KFR1, 32769, 3, NULL, S_FIREBRAZIER3, 0, 0},   // S_FIREBRAZIER2
+    {SPR_KFR1, 32770, 3, NULL, S_FIREBRAZIER4, 0, 0},   // S_FIREBRAZIER3
+    {SPR_KFR1, 32771, 3, NULL, S_FIREBRAZIER5, 0, 0},   // S_FIREBRAZIER4
+    {SPR_KFR1, 32772, 3, NULL, S_FIREBRAZIER6, 0, 0},   // S_FIREBRAZIER5
+    {SPR_KFR1, 32773, 3, NULL, S_FIREBRAZIER7, 0, 0},   // S_FIREBRAZIER6
+    {SPR_KFR1, 32774, 3, NULL, S_FIREBRAZIER8, 0, 0},   // S_FIREBRAZIER7
+    {SPR_KFR1, 32775, 3, NULL, S_FIREBRAZIER1, 0, 0},   // S_FIREBRAZIER8
+    {SPR_BARL, 0, -1, NULL, S_NULL, 0, 0},      // S_BARREL
+    {SPR_BRPL, 0, -1, NULL, S_NULL, 0, 0},      // S_BRPILLAR
+    {SPR_MOS1, 0, -1, NULL, S_NULL, 0, 0},      // S_MOSS1
+    {SPR_MOS2, 0, -1, NULL, S_NULL, 0, 0},      // S_MOSS2
+    {SPR_WTRH, 32768, 6, NULL, S_WALLTORCH2, 0, 0},     // S_WALLTORCH1
+    {SPR_WTRH, 32769, 6, NULL, S_WALLTORCH3, 0, 0},     // S_WALLTORCH2
+    {SPR_WTRH, 32770, 6, NULL, S_WALLTORCH1, 0, 0},     // S_WALLTORCH3
+    {SPR_HCOR, 0, -1, NULL, S_NULL, 0, 0},      // S_HANGINGCORPSE
+    {SPR_KGZ1, 0, 1, NULL, S_KEYGIZMO2, 0, 0},  // S_KEYGIZMO1
+    {SPR_KGZ1, 0, 1, A_InitKeyGizmo, S_KEYGIZMO3, 0, 0},        // S_KEYGIZMO2
+    {SPR_KGZ1, 0, -1, NULL, S_NULL, 0, 0},      // S_KEYGIZMO3
+    {SPR_KGZB, 0, 1, NULL, S_KGZ_START, 0, 0},  // S_KGZ_START
+    {SPR_KGZB, 32768, -1, NULL, S_NULL, 0, 0},  // S_KGZ_BLUEFLOAT1
+    {SPR_KGZG, 32768, -1, NULL, S_NULL, 0, 0},  // S_KGZ_GREENFLOAT1
+    {SPR_KGZY, 32768, -1, NULL, S_NULL, 0, 0},  // S_KGZ_YELLOWFLOAT1
+    {SPR_VLCO, 0, 350, NULL, S_VOLCANO2, 0, 0}, // S_VOLCANO1
+    {SPR_VLCO, 0, 35, A_VolcanoSet, S_VOLCANO3, 0, 0},  // S_VOLCANO2
+    {SPR_VLCO, 1, 3, NULL, S_VOLCANO4, 0, 0},   // S_VOLCANO3
+    {SPR_VLCO, 2, 3, NULL, S_VOLCANO5, 0, 0},   // S_VOLCANO4
+    {SPR_VLCO, 3, 3, NULL, S_VOLCANO6, 0, 0},   // S_VOLCANO5
+    {SPR_VLCO, 1, 3, NULL, S_VOLCANO7, 0, 0},   // S_VOLCANO6
+    {SPR_VLCO, 2, 3, NULL, S_VOLCANO8, 0, 0},   // S_VOLCANO7
+    {SPR_VLCO, 3, 3, NULL, S_VOLCANO9, 0, 0},   // S_VOLCANO8
+    {SPR_VLCO, 4, 10, A_VolcanoBlast, S_VOLCANO2, 0, 0},        // S_VOLCANO9
+    {SPR_VFBL, 0, 4, A_BeastPuff, S_VOLCANOBALL2, 0, 0},        // S_VOLCANOBALL1
+    {SPR_VFBL, 1, 4, A_BeastPuff, S_VOLCANOBALL1, 0, 0},        // S_VOLCANOBALL2
+    {SPR_XPL1, 0, 4, A_VolcBallImpact, S_VOLCANOBALLX2, 0, 0},  // S_VOLCANOBALLX1
+    {SPR_XPL1, 1, 4, NULL, S_VOLCANOBALLX3, 0, 0},      // S_VOLCANOBALLX2
+    {SPR_XPL1, 2, 4, NULL, S_VOLCANOBALLX4, 0, 0},      // S_VOLCANOBALLX3
+    {SPR_XPL1, 3, 4, NULL, S_VOLCANOBALLX5, 0, 0},      // S_VOLCANOBALLX4
+    {SPR_XPL1, 4, 4, NULL, S_VOLCANOBALLX6, 0, 0},      // S_VOLCANOBALLX5
+    {SPR_XPL1, 5, 4, NULL, S_NULL, 0, 0},       // S_VOLCANOBALLX6
+    {SPR_VTFB, 0, 4, NULL, S_VOLCANOTBALL2, 0, 0},      // S_VOLCANOTBALL1
+    {SPR_VTFB, 1, 4, NULL, S_VOLCANOTBALL1, 0, 0},      // S_VOLCANOTBALL2
+    {SPR_SFFI, 2, 4, NULL, S_VOLCANOTBALLX2, 0, 0},     // S_VOLCANOTBALLX1
+    {SPR_SFFI, 1, 4, NULL, S_VOLCANOTBALLX3, 0, 0},     // S_VOLCANOTBALLX2
+    {SPR_SFFI, 0, 4, NULL, S_VOLCANOTBALLX4, 0, 0},     // S_VOLCANOTBALLX3
+    {SPR_SFFI, 1, 4, NULL, S_VOLCANOTBALLX5, 0, 0},     // S_VOLCANOTBALLX4
+    {SPR_SFFI, 2, 4, NULL, S_VOLCANOTBALLX6, 0, 0},     // S_VOLCANOTBALLX5
+    {SPR_SFFI, 3, 4, NULL, S_VOLCANOTBALLX7, 0, 0},     // S_VOLCANOTBALLX6
+    {SPR_SFFI, 4, 4, NULL, S_NULL, 0, 0},       // S_VOLCANOTBALLX7
+    {SPR_TGLT, 0, 8, A_SpawnTeleGlitter, S_TELEGLITGEN1, 0, 0}, // S_TELEGLITGEN1
+    {SPR_TGLT, 5, 8, A_SpawnTeleGlitter2, S_TELEGLITGEN2, 0, 0},        // S_TELEGLITGEN2
+    {SPR_TGLT, 32768, 2, NULL, S_TELEGLITTER1_2, 0, 0}, // S_TELEGLITTER1_1
+    {SPR_TGLT, 32769, 2, A_AccTeleGlitter, S_TELEGLITTER1_3, 0, 0},     // S_TELEGLITTER1_2
+    {SPR_TGLT, 32770, 2, NULL, S_TELEGLITTER1_4, 0, 0}, // S_TELEGLITTER1_3
+    {SPR_TGLT, 32771, 2, A_AccTeleGlitter, S_TELEGLITTER1_5, 0, 0},     // S_TELEGLITTER1_4
+    {SPR_TGLT, 32772, 2, NULL, S_TELEGLITTER1_1, 0, 0}, // S_TELEGLITTER1_5
+    {SPR_TGLT, 32773, 2, NULL, S_TELEGLITTER2_2, 0, 0}, // S_TELEGLITTER2_1
+    {SPR_TGLT, 32774, 2, A_AccTeleGlitter, S_TELEGLITTER2_3, 0, 0},     // S_TELEGLITTER2_2
+    {SPR_TGLT, 32775, 2, NULL, S_TELEGLITTER2_4, 0, 0}, // S_TELEGLITTER2_3
+    {SPR_TGLT, 32776, 2, A_AccTeleGlitter, S_TELEGLITTER2_5, 0, 0},     // S_TELEGLITTER2_4
+    {SPR_TGLT, 32777, 2, NULL, S_TELEGLITTER2_1, 0, 0}, // S_TELEGLITTER2_5
+    {SPR_TELE, 32768, 6, NULL, S_TFOG2, 0, 0},  // S_TFOG1
+    {SPR_TELE, 32769, 6, NULL, S_TFOG3, 0, 0},  // S_TFOG2
+    {SPR_TELE, 32770, 6, NULL, S_TFOG4, 0, 0},  // S_TFOG3
+    {SPR_TELE, 32771, 6, NULL, S_TFOG5, 0, 0},  // S_TFOG4
+    {SPR_TELE, 32772, 6, NULL, S_TFOG6, 0, 0},  // S_TFOG5
+    {SPR_TELE, 32773, 6, NULL, S_TFOG7, 0, 0},  // S_TFOG6
+    {SPR_TELE, 32774, 6, NULL, S_TFOG8, 0, 0},  // S_TFOG7
+    {SPR_TELE, 32775, 6, NULL, S_TFOG9, 0, 0},  // S_TFOG8
+    {SPR_TELE, 32774, 6, NULL, S_TFOG10, 0, 0}, // S_TFOG9
+    {SPR_TELE, 32773, 6, NULL, S_TFOG11, 0, 0}, // S_TFOG10
+    {SPR_TELE, 32772, 6, NULL, S_TFOG12, 0, 0}, // S_TFOG11
+    {SPR_TELE, 32771, 6, NULL, S_TFOG13, 0, 0}, // S_TFOG12
+    {SPR_TELE, 32770, 6, NULL, S_NULL, 0, 0},   // S_TFOG13
+    {SPR_STFF, 0, 0, A_Light0, S_NULL, 0, 0},   // S_LIGHTDONE
+    {SPR_STFF, 0, 1, A_WeaponReady, S_STAFFREADY, 0, 0},        // S_STAFFREADY
+    {SPR_STFF, 0, 1, A_Lower, S_STAFFDOWN, 0, 0},       // S_STAFFDOWN
+    {SPR_STFF, 0, 1, A_Raise, S_STAFFUP, 0, 0}, // S_STAFFUP
+    {SPR_STFF, 3, 4, A_WeaponReady, S_STAFFREADY2_2, 0, 0},     // S_STAFFREADY2_1
+    {SPR_STFF, 4, 4, A_WeaponReady, S_STAFFREADY2_3, 0, 0},     // S_STAFFREADY2_2
+    {SPR_STFF, 5, 4, A_WeaponReady, S_STAFFREADY2_1, 0, 0},     // S_STAFFREADY2_3
+    {SPR_STFF, 3, 1, A_Lower, S_STAFFDOWN2, 0, 0},      // S_STAFFDOWN2
+    {SPR_STFF, 3, 1, A_Raise, S_STAFFUP2, 0, 0},        // S_STAFFUP2
+    {SPR_STFF, 1, 6, NULL, S_STAFFATK1_2, 0, 0},        // S_STAFFATK1_1
+    {SPR_STFF, 2, 8, A_StaffAttackPL1, S_STAFFATK1_3, 0, 0},    // S_STAFFATK1_2
+    {SPR_STFF, 1, 8, A_ReFire, S_STAFFREADY, 0, 0},     // S_STAFFATK1_3
+    {SPR_STFF, 6, 6, NULL, S_STAFFATK2_2, 0, 0},        // S_STAFFATK2_1
+    {SPR_STFF, 7, 8, A_StaffAttackPL2, S_STAFFATK2_3, 0, 0},    // S_STAFFATK2_2
+    {SPR_STFF, 6, 8, A_ReFire, S_STAFFREADY2_1, 0, 0},  // S_STAFFATK2_3
+    {SPR_PUF3, 32768, 4, NULL, S_STAFFPUFF2, 0, 0},     // S_STAFFPUFF1
+    {SPR_PUF3, 1, 4, NULL, S_STAFFPUFF3, 0, 0}, // S_STAFFPUFF2
+    {SPR_PUF3, 2, 4, NULL, S_STAFFPUFF4, 0, 0}, // S_STAFFPUFF3
+    {SPR_PUF3, 3, 4, NULL, S_NULL, 0, 0},       // S_STAFFPUFF4
+    {SPR_PUF4, 32768, 4, NULL, S_STAFFPUFF2_2, 0, 0},   // S_STAFFPUFF2_1
+    {SPR_PUF4, 32769, 4, NULL, S_STAFFPUFF2_3, 0, 0},   // S_STAFFPUFF2_2
+    {SPR_PUF4, 32770, 4, NULL, S_STAFFPUFF2_4, 0, 0},   // S_STAFFPUFF2_3
+    {SPR_PUF4, 32771, 4, NULL, S_STAFFPUFF2_5, 0, 0},   // S_STAFFPUFF2_4
+    {SPR_PUF4, 32772, 4, NULL, S_STAFFPUFF2_6, 0, 0},   // S_STAFFPUFF2_5
+    {SPR_PUF4, 32773, 4, NULL, S_NULL, 0, 0},   // S_STAFFPUFF2_6
+    {SPR_BEAK, 0, 1, A_BeakReady, S_BEAKREADY, 0, 0},   // S_BEAKREADY
+    {SPR_BEAK, 0, 1, A_Lower, S_BEAKDOWN, 0, 0},        // S_BEAKDOWN
+    {SPR_BEAK, 0, 1, A_BeakRaise, S_BEAKUP, 0, 0},      // S_BEAKUP
+    {SPR_BEAK, 0, 18, A_BeakAttackPL1, S_BEAKREADY, 0, 0},      // S_BEAKATK1_1
+    {SPR_BEAK, 0, 12, A_BeakAttackPL2, S_BEAKREADY, 0, 0},      // S_BEAKATK2_1
+    {SPR_WGNT, 0, -1, NULL, S_NULL, 0, 0},      // S_WGNT
+    {SPR_GAUN, 0, 1, A_WeaponReady, S_GAUNTLETREADY, 0, 0},     // S_GAUNTLETREADY
+    {SPR_GAUN, 0, 1, A_Lower, S_GAUNTLETDOWN, 0, 0},    // S_GAUNTLETDOWN
+    {SPR_GAUN, 0, 1, A_Raise, S_GAUNTLETUP, 0, 0},      // S_GAUNTLETUP
+    {SPR_GAUN, 6, 4, A_WeaponReady, S_GAUNTLETREADY2_2, 0, 0},  // S_GAUNTLETREADY2_1
+    {SPR_GAUN, 7, 4, A_WeaponReady, S_GAUNTLETREADY2_3, 0, 0},  // S_GAUNTLETREADY2_2
+    {SPR_GAUN, 8, 4, A_WeaponReady, S_GAUNTLETREADY2_1, 0, 0},  // S_GAUNTLETREADY2_3
+    {SPR_GAUN, 6, 1, A_Lower, S_GAUNTLETDOWN2, 0, 0},   // S_GAUNTLETDOWN2
+    {SPR_GAUN, 6, 1, A_Raise, S_GAUNTLETUP2, 0, 0},     // S_GAUNTLETUP2
+    {SPR_GAUN, 1, 4, NULL, S_GAUNTLETATK1_2, 0, 0},     // S_GAUNTLETATK1_1
+    {SPR_GAUN, 2, 4, NULL, S_GAUNTLETATK1_3, 0, 0},     // S_GAUNTLETATK1_2
+    {SPR_GAUN, 32771, 4, A_GauntletAttack, S_GAUNTLETATK1_4, 0, 0},     // S_GAUNTLETATK1_3
+    {SPR_GAUN, 32772, 4, A_GauntletAttack, S_GAUNTLETATK1_5, 0, 0},     // S_GAUNTLETATK1_4
+    {SPR_GAUN, 32773, 4, A_GauntletAttack, S_GAUNTLETATK1_6, 0, 0},     // S_GAUNTLETATK1_5
+    {SPR_GAUN, 2, 4, A_ReFire, S_GAUNTLETATK1_7, 0, 0}, // S_GAUNTLETATK1_6
+    {SPR_GAUN, 1, 4, A_Light0, S_GAUNTLETREADY, 0, 0},  // S_GAUNTLETATK1_7
+    {SPR_GAUN, 9, 4, NULL, S_GAUNTLETATK2_2, 0, 0},     // S_GAUNTLETATK2_1
+    {SPR_GAUN, 10, 4, NULL, S_GAUNTLETATK2_3, 0, 0},    // S_GAUNTLETATK2_2
+    {SPR_GAUN, 32779, 4, A_GauntletAttack, S_GAUNTLETATK2_4, 0, 0},     // S_GAUNTLETATK2_3
+    {SPR_GAUN, 32780, 4, A_GauntletAttack, S_GAUNTLETATK2_5, 0, 0},     // S_GAUNTLETATK2_4
+    {SPR_GAUN, 32781, 4, A_GauntletAttack, S_GAUNTLETATK2_6, 0, 0},     // S_GAUNTLETATK2_5
+    {SPR_GAUN, 10, 4, A_ReFire, S_GAUNTLETATK2_7, 0, 0},        // S_GAUNTLETATK2_6
+    {SPR_GAUN, 9, 4, A_Light0, S_GAUNTLETREADY2_1, 0, 0},       // S_GAUNTLETATK2_7
+    {SPR_PUF1, 32768, 4, NULL, S_GAUNTLETPUFF1_2, 0, 0},        // S_GAUNTLETPUFF1_1
+    {SPR_PUF1, 32769, 4, NULL, S_GAUNTLETPUFF1_3, 0, 0},        // S_GAUNTLETPUFF1_2
+    {SPR_PUF1, 32770, 4, NULL, S_GAUNTLETPUFF1_4, 0, 0},        // S_GAUNTLETPUFF1_3
+    {SPR_PUF1, 32771, 4, NULL, S_NULL, 0, 0},   // S_GAUNTLETPUFF1_4
+    {SPR_PUF1, 32772, 4, NULL, S_GAUNTLETPUFF2_2, 0, 0},        // S_GAUNTLETPUFF2_1
+    {SPR_PUF1, 32773, 4, NULL, S_GAUNTLETPUFF2_3, 0, 0},        // S_GAUNTLETPUFF2_2
+    {SPR_PUF1, 32774, 4, NULL, S_GAUNTLETPUFF2_4, 0, 0},        // S_GAUNTLETPUFF2_3
+    {SPR_PUF1, 32775, 4, NULL, S_NULL, 0, 0},   // S_GAUNTLETPUFF2_4
+    {SPR_WBLS, 0, -1, NULL, S_NULL, 0, 0},      // S_BLSR
+    {SPR_BLSR, 0, 1, A_WeaponReady, S_BLASTERREADY, 0, 0},      // S_BLASTERREADY
+    {SPR_BLSR, 0, 1, A_Lower, S_BLASTERDOWN, 0, 0},     // S_BLASTERDOWN
+    {SPR_BLSR, 0, 1, A_Raise, S_BLASTERUP, 0, 0},       // S_BLASTERUP
+    {SPR_BLSR, 1, 3, NULL, S_BLASTERATK1_2, 0, 0},      // S_BLASTERATK1_1
+    {SPR_BLSR, 2, 3, NULL, S_BLASTERATK1_3, 0, 0},      // S_BLASTERATK1_2
+    {SPR_BLSR, 3, 2, A_FireBlasterPL1, S_BLASTERATK1_4, 0, 0},  // S_BLASTERATK1_3
+    {SPR_BLSR, 2, 2, NULL, S_BLASTERATK1_5, 0, 0},      // S_BLASTERATK1_4
+    {SPR_BLSR, 1, 2, NULL, S_BLASTERATK1_6, 0, 0},      // S_BLASTERATK1_5
+    {SPR_BLSR, 0, 0, A_ReFire, S_BLASTERREADY, 0, 0},   // S_BLASTERATK1_6
+    {SPR_BLSR, 1, 0, NULL, S_BLASTERATK2_2, 0, 0},      // S_BLASTERATK2_1
+    {SPR_BLSR, 2, 0, NULL, S_BLASTERATK2_3, 0, 0},      // S_BLASTERATK2_2
+    {SPR_BLSR, 3, 3, A_FireBlasterPL2, S_BLASTERATK2_4, 0, 0},  // S_BLASTERATK2_3
+    {SPR_BLSR, 2, 4, NULL, S_BLASTERATK2_5, 0, 0},      // S_BLASTERATK2_4
+    {SPR_BLSR, 1, 4, NULL, S_BLASTERATK2_6, 0, 0},      // S_BLASTERATK2_5
+    {SPR_BLSR, 0, 0, A_ReFire, S_BLASTERREADY, 0, 0},   // S_BLASTERATK2_6
+    {SPR_ACLO, 4, 200, NULL, S_BLASTERFX1_1, 0, 0},     // S_BLASTERFX1_1
+    {SPR_FX18, 32768, 3, A_SpawnRippers, S_BLASTERFXI1_2, 0, 0},        // S_BLASTERFXI1_1
+    {SPR_FX18, 32769, 3, NULL, S_BLASTERFXI1_3, 0, 0},  // S_BLASTERFXI1_2
+    {SPR_FX18, 32770, 4, NULL, S_BLASTERFXI1_4, 0, 0},  // S_BLASTERFXI1_3
+    {SPR_FX18, 32771, 4, NULL, S_BLASTERFXI1_5, 0, 0},  // S_BLASTERFXI1_4
+    {SPR_FX18, 32772, 4, NULL, S_BLASTERFXI1_6, 0, 0},  // S_BLASTERFXI1_5
+    {SPR_FX18, 32773, 4, NULL, S_BLASTERFXI1_7, 0, 0},  // S_BLASTERFXI1_6
+    {SPR_FX18, 32774, 4, NULL, S_NULL, 0, 0},   // S_BLASTERFXI1_7
+    {SPR_FX18, 7, 4, NULL, S_BLASTERSMOKE2, 0, 0},      // S_BLASTERSMOKE1
+    {SPR_FX18, 8, 4, NULL, S_BLASTERSMOKE3, 0, 0},      // S_BLASTERSMOKE2
+    {SPR_FX18, 9, 4, NULL, S_BLASTERSMOKE4, 0, 0},      // S_BLASTERSMOKE3
+    {SPR_FX18, 10, 4, NULL, S_BLASTERSMOKE5, 0, 0},     // S_BLASTERSMOKE4
+    {SPR_FX18, 11, 4, NULL, S_NULL, 0, 0},      // S_BLASTERSMOKE5
+    {SPR_FX18, 12, 4, NULL, S_RIPPER2, 0, 0},   // S_RIPPER1
+    {SPR_FX18, 13, 5, NULL, S_RIPPER1, 0, 0},   // S_RIPPER2
+    {SPR_FX18, 32782, 4, NULL, S_RIPPERX2, 0, 0},       // S_RIPPERX1
+    {SPR_FX18, 32783, 4, NULL, S_RIPPERX3, 0, 0},       // S_RIPPERX2
+    {SPR_FX18, 32784, 4, NULL, S_RIPPERX4, 0, 0},       // S_RIPPERX3
+    {SPR_FX18, 32785, 4, NULL, S_RIPPERX5, 0, 0},       // S_RIPPERX4
+    {SPR_FX18, 32786, 4, NULL, S_NULL, 0, 0},   // S_RIPPERX5
+    {SPR_FX17, 32768, 4, NULL, S_BLASTERPUFF1_2, 0, 0}, // S_BLASTERPUFF1_1
+    {SPR_FX17, 32769, 4, NULL, S_BLASTERPUFF1_3, 0, 0}, // S_BLASTERPUFF1_2
+    {SPR_FX17, 32770, 4, NULL, S_BLASTERPUFF1_4, 0, 0}, // S_BLASTERPUFF1_3
+    {SPR_FX17, 32771, 4, NULL, S_BLASTERPUFF1_5, 0, 0}, // S_BLASTERPUFF1_4
+    {SPR_FX17, 32772, 4, NULL, S_NULL, 0, 0},   // S_BLASTERPUFF1_5
+    {SPR_FX17, 32773, 3, NULL, S_BLASTERPUFF2_2, 0, 0}, // S_BLASTERPUFF2_1
+    {SPR_FX17, 32774, 3, NULL, S_BLASTERPUFF2_3, 0, 0}, // S_BLASTERPUFF2_2
+    {SPR_FX17, 32775, 4, NULL, S_BLASTERPUFF2_4, 0, 0}, // S_BLASTERPUFF2_3
+    {SPR_FX17, 32776, 4, NULL, S_BLASTERPUFF2_5, 0, 0}, // S_BLASTERPUFF2_4
+    {SPR_FX17, 32777, 4, NULL, S_BLASTERPUFF2_6, 0, 0}, // S_BLASTERPUFF2_5
+    {SPR_FX17, 32778, 4, NULL, S_BLASTERPUFF2_7, 0, 0}, // S_BLASTERPUFF2_6
+    {SPR_FX17, 32779, 4, NULL, S_NULL, 0, 0},   // S_BLASTERPUFF2_7
+    {SPR_WMCE, 0, -1, NULL, S_NULL, 0, 0},      // S_WMCE
+    {SPR_MACE, 0, 1, A_WeaponReady, S_MACEREADY, 0, 0}, // S_MACEREADY
+    {SPR_MACE, 0, 1, A_Lower, S_MACEDOWN, 0, 0},        // S_MACEDOWN
+    {SPR_MACE, 0, 1, A_Raise, S_MACEUP, 0, 0},  // S_MACEUP
+    {SPR_MACE, 1, 4, NULL, S_MACEATK1_2, 0, 0}, // S_MACEATK1_1
+    {SPR_MACE, 2, 3, A_FireMacePL1, S_MACEATK1_3, 0, 0},        // S_MACEATK1_2
+    {SPR_MACE, 3, 3, A_FireMacePL1, S_MACEATK1_4, 0, 0},        // S_MACEATK1_3
+    {SPR_MACE, 4, 3, A_FireMacePL1, S_MACEATK1_5, 0, 0},        // S_MACEATK1_4
+    {SPR_MACE, 5, 3, A_FireMacePL1, S_MACEATK1_6, 0, 0},        // S_MACEATK1_5
+    {SPR_MACE, 2, 4, A_ReFire, S_MACEATK1_7, 0, 0},     // S_MACEATK1_6
+    {SPR_MACE, 3, 4, NULL, S_MACEATK1_8, 0, 0}, // S_MACEATK1_7
+    {SPR_MACE, 4, 4, NULL, S_MACEATK1_9, 0, 0}, // S_MACEATK1_8
+    {SPR_MACE, 5, 4, NULL, S_MACEATK1_10, 0, 0},        // S_MACEATK1_9
+    {SPR_MACE, 1, 4, NULL, S_MACEREADY, 0, 0},  // S_MACEATK1_10
+    {SPR_MACE, 1, 4, NULL, S_MACEATK2_2, 0, 0}, // S_MACEATK2_1
+    {SPR_MACE, 3, 4, A_FireMacePL2, S_MACEATK2_3, 0, 0},        // S_MACEATK2_2
+    {SPR_MACE, 1, 4, NULL, S_MACEATK2_4, 0, 0}, // S_MACEATK2_3
+    {SPR_MACE, 0, 8, A_ReFire, S_MACEREADY, 0, 0},      // S_MACEATK2_4
+    {SPR_FX02, 0, 4, A_MacePL1Check, S_MACEFX1_2, 0, 0},        // S_MACEFX1_1
+    {SPR_FX02, 1, 4, A_MacePL1Check, S_MACEFX1_1, 0, 0},        // S_MACEFX1_2
+    {SPR_FX02, 32773, 4, A_MaceBallImpact, S_MACEFXI1_2, 0, 0}, // S_MACEFXI1_1
+    {SPR_FX02, 32774, 4, NULL, S_MACEFXI1_3, 0, 0},     // S_MACEFXI1_2
+    {SPR_FX02, 32775, 4, NULL, S_MACEFXI1_4, 0, 0},     // S_MACEFXI1_3
+    {SPR_FX02, 32776, 4, NULL, S_MACEFXI1_5, 0, 0},     // S_MACEFXI1_4
+    {SPR_FX02, 32777, 4, NULL, S_NULL, 0, 0},   // S_MACEFXI1_5
+    {SPR_FX02, 2, 4, NULL, S_MACEFX2_2, 0, 0},  // S_MACEFX2_1
+    {SPR_FX02, 3, 4, NULL, S_MACEFX2_1, 0, 0},  // S_MACEFX2_2
+    {SPR_FX02, 32773, 4, A_MaceBallImpact2, S_MACEFXI1_2, 0, 0},        // S_MACEFXI2_1
+    {SPR_FX02, 0, 4, NULL, S_MACEFX3_2, 0, 0},  // S_MACEFX3_1
+    {SPR_FX02, 1, 4, NULL, S_MACEFX3_1, 0, 0},  // S_MACEFX3_2
+    {SPR_FX02, 4, 99, NULL, S_MACEFX4_1, 0, 0}, // S_MACEFX4_1
+    {SPR_FX02, 32770, 4, A_DeathBallImpact, S_MACEFXI1_2, 0, 0},        // S_MACEFXI4_1
+    {SPR_WSKL, 0, -1, NULL, S_NULL, 0, 0},      // S_WSKL
+    {SPR_HROD, 0, 1, A_WeaponReady, S_HORNRODREADY, 0, 0},      // S_HORNRODREADY
+    {SPR_HROD, 0, 1, A_Lower, S_HORNRODDOWN, 0, 0},     // S_HORNRODDOWN
+    {SPR_HROD, 0, 1, A_Raise, S_HORNRODUP, 0, 0},       // S_HORNRODUP
+    {SPR_HROD, 0, 4, A_FireSkullRodPL1, S_HORNRODATK1_2, 0, 0}, // S_HORNRODATK1_1
+    {SPR_HROD, 1, 4, A_FireSkullRodPL1, S_HORNRODATK1_3, 0, 0}, // S_HORNRODATK1_2
+    {SPR_HROD, 1, 0, A_ReFire, S_HORNRODREADY, 0, 0},   // S_HORNRODATK1_3
+    {SPR_HROD, 2, 2, NULL, S_HORNRODATK2_2, 0, 0},      // S_HORNRODATK2_1
+    {SPR_HROD, 3, 3, NULL, S_HORNRODATK2_3, 0, 0},      // S_HORNRODATK2_2
+    {SPR_HROD, 4, 2, NULL, S_HORNRODATK2_4, 0, 0},      // S_HORNRODATK2_3
+    {SPR_HROD, 5, 3, NULL, S_HORNRODATK2_5, 0, 0},      // S_HORNRODATK2_4
+    {SPR_HROD, 6, 4, A_FireSkullRodPL2, S_HORNRODATK2_6, 0, 0}, // S_HORNRODATK2_5
+    {SPR_HROD, 5, 2, NULL, S_HORNRODATK2_7, 0, 0},      // S_HORNRODATK2_6
+    {SPR_HROD, 4, 3, NULL, S_HORNRODATK2_8, 0, 0},      // S_HORNRODATK2_7
+    {SPR_HROD, 3, 2, NULL, S_HORNRODATK2_9, 0, 0},      // S_HORNRODATK2_8
+    {SPR_HROD, 2, 2, A_ReFire, S_HORNRODREADY, 0, 0},   // S_HORNRODATK2_9
+    {SPR_FX00, 32768, 6, NULL, S_HRODFX1_2, 0, 0},      // S_HRODFX1_1
+    {SPR_FX00, 32769, 6, NULL, S_HRODFX1_1, 0, 0},      // S_HRODFX1_2
+    {SPR_FX00, 32775, 5, NULL, S_HRODFXI1_2, 0, 0},     // S_HRODFXI1_1
+    {SPR_FX00, 32776, 5, NULL, S_HRODFXI1_3, 0, 0},     // S_HRODFXI1_2
+    {SPR_FX00, 32777, 4, NULL, S_HRODFXI1_4, 0, 0},     // S_HRODFXI1_3
+    {SPR_FX00, 32778, 4, NULL, S_HRODFXI1_5, 0, 0},     // S_HRODFXI1_4
+    {SPR_FX00, 32779, 3, NULL, S_HRODFXI1_6, 0, 0},     // S_HRODFXI1_5
+    {SPR_FX00, 32780, 3, NULL, S_NULL, 0, 0},   // S_HRODFXI1_6
+    {SPR_FX00, 32770, 3, NULL, S_HRODFX2_2, 0, 0},      // S_HRODFX2_1
+    {SPR_FX00, 32771, 3, A_SkullRodPL2Seek, S_HRODFX2_3, 0, 0}, // S_HRODFX2_2
+    {SPR_FX00, 32772, 3, NULL, S_HRODFX2_4, 0, 0},      // S_HRODFX2_3
+    {SPR_FX00, 32773, 3, A_SkullRodPL2Seek, S_HRODFX2_1, 0, 0}, // S_HRODFX2_4
+    {SPR_FX00, 32775, 5, A_AddPlayerRain, S_HRODFXI2_2, 0, 0},  // S_HRODFXI2_1
+    {SPR_FX00, 32776, 5, NULL, S_HRODFXI2_3, 0, 0},     // S_HRODFXI2_2
+    {SPR_FX00, 32777, 4, NULL, S_HRODFXI2_4, 0, 0},     // S_HRODFXI2_3
+    {SPR_FX00, 32778, 3, NULL, S_HRODFXI2_5, 0, 0},     // S_HRODFXI2_4
+    {SPR_FX00, 32779, 3, NULL, S_HRODFXI2_6, 0, 0},     // S_HRODFXI2_5
+    {SPR_FX00, 32780, 3, NULL, S_HRODFXI2_7, 0, 0},     // S_HRODFXI2_6
+    {SPR_FX00, 6, 1, A_HideInCeiling, S_HRODFXI2_8, 0, 0},      // S_HRODFXI2_7
+    {SPR_FX00, 6, 1, A_SkullRodStorm, S_HRODFXI2_8, 0, 0},      // S_HRODFXI2_8
+    {SPR_FX20, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR1_1
+    {SPR_FX21, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR2_1
+    {SPR_FX22, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR3_1
+    {SPR_FX23, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR4_1
+    {SPR_FX20, 32769, 4, A_RainImpact, S_RAINPLR1X_2, 0, 0},    // S_RAINPLR1X_1
+    {SPR_FX20, 32770, 4, NULL, S_RAINPLR1X_3, 0, 0},    // S_RAINPLR1X_2
+    {SPR_FX20, 32771, 4, NULL, S_RAINPLR1X_4, 0, 0},    // S_RAINPLR1X_3
+    {SPR_FX20, 32772, 4, NULL, S_RAINPLR1X_5, 0, 0},    // S_RAINPLR1X_4
+    {SPR_FX20, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR1X_5
+    {SPR_FX21, 32769, 4, A_RainImpact, S_RAINPLR2X_2, 0, 0},    // S_RAINPLR2X_1
+    {SPR_FX21, 32770, 4, NULL, S_RAINPLR2X_3, 0, 0},    // S_RAINPLR2X_2
+    {SPR_FX21, 32771, 4, NULL, S_RAINPLR2X_4, 0, 0},    // S_RAINPLR2X_3
+    {SPR_FX21, 32772, 4, NULL, S_RAINPLR2X_5, 0, 0},    // S_RAINPLR2X_4
+    {SPR_FX21, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR2X_5
+    {SPR_FX22, 32769, 4, A_RainImpact, S_RAINPLR3X_2, 0, 0},    // S_RAINPLR3X_1
+    {SPR_FX22, 32770, 4, NULL, S_RAINPLR3X_3, 0, 0},    // S_RAINPLR3X_2
+    {SPR_FX22, 32771, 4, NULL, S_RAINPLR3X_4, 0, 0},    // S_RAINPLR3X_3
+    {SPR_FX22, 32772, 4, NULL, S_RAINPLR3X_5, 0, 0},    // S_RAINPLR3X_4
+    {SPR_FX22, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR3X_5
+    {SPR_FX23, 32769, 4, A_RainImpact, S_RAINPLR4X_2, 0, 0},    // S_RAINPLR4X_1
+    {SPR_FX23, 32770, 4, NULL, S_RAINPLR4X_3, 0, 0},    // S_RAINPLR4X_2
+    {SPR_FX23, 32771, 4, NULL, S_RAINPLR4X_4, 0, 0},    // S_RAINPLR4X_3
+    {SPR_FX23, 32772, 4, NULL, S_RAINPLR4X_5, 0, 0},    // S_RAINPLR4X_4
+    {SPR_FX23, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR4X_5
+    {SPR_FX20, 32774, 4, NULL, S_RAINAIRXPLR1_2, 0, 0}, // S_RAINAIRXPLR1_1
+    {SPR_FX21, 32774, 4, NULL, S_RAINAIRXPLR2_2, 0, 0}, // S_RAINAIRXPLR2_1
+    {SPR_FX22, 32774, 4, NULL, S_RAINAIRXPLR3_2, 0, 0}, // S_RAINAIRXPLR3_1
+    {SPR_FX23, 32774, 4, NULL, S_RAINAIRXPLR4_2, 0, 0}, // S_RAINAIRXPLR4_1
+    {SPR_FX20, 32775, 4, NULL, S_RAINAIRXPLR1_3, 0, 0}, // S_RAINAIRXPLR1_2
+    {SPR_FX21, 32775, 4, NULL, S_RAINAIRXPLR2_3, 0, 0}, // S_RAINAIRXPLR2_2
+    {SPR_FX22, 32775, 4, NULL, S_RAINAIRXPLR3_3, 0, 0}, // S_RAINAIRXPLR3_2
+    {SPR_FX23, 32775, 4, NULL, S_RAINAIRXPLR4_3, 0, 0}, // S_RAINAIRXPLR4_2
+    {SPR_FX20, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR1_3
+    {SPR_FX21, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR2_3
+    {SPR_FX22, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR3_3
+    {SPR_FX23, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR4_3
+    {SPR_GWND, 0, 1, A_WeaponReady, S_GOLDWANDREADY, 0, 0},     // S_GOLDWANDREADY
+    {SPR_GWND, 0, 1, A_Lower, S_GOLDWANDDOWN, 0, 0},    // S_GOLDWANDDOWN
+    {SPR_GWND, 0, 1, A_Raise, S_GOLDWANDUP, 0, 0},      // S_GOLDWANDUP
+    {SPR_GWND, 1, 3, NULL, S_GOLDWANDATK1_2, 0, 0},     // S_GOLDWANDATK1_1
+    {SPR_GWND, 2, 5, A_FireGoldWandPL1, S_GOLDWANDATK1_3, 0, 0},        // S_GOLDWANDATK1_2
+    {SPR_GWND, 3, 3, NULL, S_GOLDWANDATK1_4, 0, 0},     // S_GOLDWANDATK1_3
+    {SPR_GWND, 3, 0, A_ReFire, S_GOLDWANDREADY, 0, 0},  // S_GOLDWANDATK1_4
+    {SPR_GWND, 1, 3, NULL, S_GOLDWANDATK2_2, 0, 0},     // S_GOLDWANDATK2_1
+    {SPR_GWND, 2, 4, A_FireGoldWandPL2, S_GOLDWANDATK2_3, 0, 0},        // S_GOLDWANDATK2_2
+    {SPR_GWND, 3, 3, NULL, S_GOLDWANDATK2_4, 0, 0},     // S_GOLDWANDATK2_3
+    {SPR_GWND, 3, 0, A_ReFire, S_GOLDWANDREADY, 0, 0},  // S_GOLDWANDATK2_4
+    {SPR_FX01, 32768, 6, NULL, S_GWANDFX1_2, 0, 0},     // S_GWANDFX1_1
+    {SPR_FX01, 32769, 6, NULL, S_GWANDFX1_1, 0, 0},     // S_GWANDFX1_2
+    {SPR_FX01, 32772, 3, NULL, S_GWANDFXI1_2, 0, 0},    // S_GWANDFXI1_1
+    {SPR_FX01, 32773, 3, NULL, S_GWANDFXI1_3, 0, 0},    // S_GWANDFXI1_2
+    {SPR_FX01, 32774, 3, NULL, S_GWANDFXI1_4, 0, 0},    // S_GWANDFXI1_3
+    {SPR_FX01, 32775, 3, NULL, S_NULL, 0, 0},   // S_GWANDFXI1_4
+    {SPR_FX01, 32770, 6, NULL, S_GWANDFX2_2, 0, 0},     // S_GWANDFX2_1
+    {SPR_FX01, 32771, 6, NULL, S_GWANDFX2_1, 0, 0},     // S_GWANDFX2_2
+    {SPR_PUF2, 32768, 3, NULL, S_GWANDPUFF1_2, 0, 0},   // S_GWANDPUFF1_1
+    {SPR_PUF2, 32769, 3, NULL, S_GWANDPUFF1_3, 0, 0},   // S_GWANDPUFF1_2
+    {SPR_PUF2, 32770, 3, NULL, S_GWANDPUFF1_4, 0, 0},   // S_GWANDPUFF1_3
+    {SPR_PUF2, 32771, 3, NULL, S_GWANDPUFF1_5, 0, 0},   // S_GWANDPUFF1_4
+    {SPR_PUF2, 32772, 3, NULL, S_NULL, 0, 0},   // S_GWANDPUFF1_5
+    {SPR_WPHX, 0, -1, NULL, S_NULL, 0, 0},      // S_WPHX
+    {SPR_PHNX, 0, 1, A_WeaponReady, S_PHOENIXREADY, 0, 0},      // S_PHOENIXREADY
+    {SPR_PHNX, 0, 1, A_Lower, S_PHOENIXDOWN, 0, 0},     // S_PHOENIXDOWN
+    {SPR_PHNX, 0, 1, A_Raise, S_PHOENIXUP, 0, 0},       // S_PHOENIXUP
+    {SPR_PHNX, 1, 5, NULL, S_PHOENIXATK1_2, 0, 0},      // S_PHOENIXATK1_1
+    {SPR_PHNX, 2, 7, A_FirePhoenixPL1, S_PHOENIXATK1_3, 0, 0},  // S_PHOENIXATK1_2
+    {SPR_PHNX, 3, 4, NULL, S_PHOENIXATK1_4, 0, 0},      // S_PHOENIXATK1_3
+    {SPR_PHNX, 1, 4, NULL, S_PHOENIXATK1_5, 0, 0},      // S_PHOENIXATK1_4
+    {SPR_PHNX, 1, 0, A_ReFire, S_PHOENIXREADY, 0, 0},   // S_PHOENIXATK1_5
+    {SPR_PHNX, 1, 3, A_InitPhoenixPL2, S_PHOENIXATK2_2, 0, 0},  // S_PHOENIXATK2_1
+    {SPR_PHNX, 32770, 1, A_FirePhoenixPL2, S_PHOENIXATK2_3, 0, 0},      // S_PHOENIXATK2_2
+    {SPR_PHNX, 1, 4, A_ReFire, S_PHOENIXATK2_4, 0, 0},  // S_PHOENIXATK2_3
+    {SPR_PHNX, 1, 4, A_ShutdownPhoenixPL2, S_PHOENIXREADY, 0, 0},       // S_PHOENIXATK2_4
+    {SPR_FX04, 32768, 4, A_PhoenixPuff, S_PHOENIXFX1_1, 0, 0},  // S_PHOENIXFX1_1
+    {SPR_FX08, 32768, 6, A_Explode, S_PHOENIXFXI1_2, 0, 0},     // S_PHOENIXFXI1_1
+    {SPR_FX08, 32769, 5, NULL, S_PHOENIXFXI1_3, 0, 0},  // S_PHOENIXFXI1_2
+    {SPR_FX08, 32770, 5, NULL, S_PHOENIXFXI1_4, 0, 0},  // S_PHOENIXFXI1_3
+    {SPR_FX08, 32771, 4, NULL, S_PHOENIXFXI1_5, 0, 0},  // S_PHOENIXFXI1_4
+    {SPR_FX08, 32772, 4, NULL, S_PHOENIXFXI1_6, 0, 0},  // S_PHOENIXFXI1_5
+    {SPR_FX08, 32773, 4, NULL, S_PHOENIXFXI1_7, 0, 0},  // S_PHOENIXFXI1_6
+    {SPR_FX08, 32774, 4, NULL, S_PHOENIXFXI1_8, 0, 0},  // S_PHOENIXFXI1_7
+    {SPR_FX08, 32775, 4, NULL, S_NULL, 0, 0},   // S_PHOENIXFXI1_8
+    {SPR_FX08, 32776, 8, NULL, S_PHOENIXFXIX_1, 0, 0 }, // S_PHOENIXFXIX_1
+    {SPR_FX08, 32777, 8, A_RemovedPhoenixFunc, S_PHOENIXFXIX_2, 0, 0 },  // S_PHOENIXFXIX_2
+    {SPR_FX08, 32778, 8, NULL, S_NULL, 0, 0 },          // S_PHOENIXFXIX_3
+    {SPR_FX04, 1, 4, NULL, S_PHOENIXPUFF2, 0, 0},       // S_PHOENIXPUFF1
+    {SPR_FX04, 2, 4, NULL, S_PHOENIXPUFF3, 0, 0},       // S_PHOENIXPUFF2
+    {SPR_FX04, 3, 4, NULL, S_PHOENIXPUFF4, 0, 0},       // S_PHOENIXPUFF3
+    {SPR_FX04, 4, 4, NULL, S_PHOENIXPUFF5, 0, 0},       // S_PHOENIXPUFF4
+    {SPR_FX04, 5, 4, NULL, S_NULL, 0, 0},       // S_PHOENIXPUFF5
+    {SPR_FX09, 32768, 2, NULL, S_PHOENIXFX2_2, 0, 0},   // S_PHOENIXFX2_1
+    {SPR_FX09, 32769, 2, NULL, S_PHOENIXFX2_3, 0, 0},   // S_PHOENIXFX2_2
+    {SPR_FX09, 32768, 2, NULL, S_PHOENIXFX2_4, 0, 0},   // S_PHOENIXFX2_3
+    {SPR_FX09, 32769, 2, NULL, S_PHOENIXFX2_5, 0, 0},   // S_PHOENIXFX2_4
+    {SPR_FX09, 32768, 2, NULL, S_PHOENIXFX2_6, 0, 0},   // S_PHOENIXFX2_5
+    {SPR_FX09, 32769, 2, A_FlameEnd, S_PHOENIXFX2_7, 0, 0},     // S_PHOENIXFX2_6
+    {SPR_FX09, 32770, 2, NULL, S_PHOENIXFX2_8, 0, 0},   // S_PHOENIXFX2_7
+    {SPR_FX09, 32771, 2, NULL, S_PHOENIXFX2_9, 0, 0},   // S_PHOENIXFX2_8
+    {SPR_FX09, 32772, 2, NULL, S_PHOENIXFX2_10, 0, 0},  // S_PHOENIXFX2_9
+    {SPR_FX09, 32773, 2, NULL, S_NULL, 0, 0},   // S_PHOENIXFX2_10
+    {SPR_FX09, 32774, 3, NULL, S_PHOENIXFXI2_2, 0, 0},  // S_PHOENIXFXI2_1
+    {SPR_FX09, 32775, 3, A_FloatPuff, S_PHOENIXFXI2_3, 0, 0},   // S_PHOENIXFXI2_2
+    {SPR_FX09, 32776, 4, NULL, S_PHOENIXFXI2_4, 0, 0},  // S_PHOENIXFXI2_3
+    {SPR_FX09, 32777, 5, NULL, S_PHOENIXFXI2_5, 0, 0},  // S_PHOENIXFXI2_4
+    {SPR_FX09, 32778, 5, NULL, S_NULL, 0, 0},   // S_PHOENIXFXI2_5
+    {SPR_WBOW, 0, -1, NULL, S_NULL, 0, 0},      // S_WBOW
+    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW2, 0, 0},    // S_CRBOW1
+    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW3, 0, 0},    // S_CRBOW2
+    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW4, 0, 0},    // S_CRBOW3
+    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW5, 0, 0},    // S_CRBOW4
+    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW6, 0, 0},    // S_CRBOW5
+    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW7, 0, 0},    // S_CRBOW6
+    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW8, 0, 0},    // S_CRBOW7
+    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW9, 0, 0},    // S_CRBOW8
+    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW10, 0, 0},   // S_CRBOW9
+    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW11, 0, 0},   // S_CRBOW10
+    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW12, 0, 0},   // S_CRBOW11
+    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW13, 0, 0},   // S_CRBOW12
+    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW14, 0, 0},   // S_CRBOW13
+    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW15, 0, 0},   // S_CRBOW14
+    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW16, 0, 0},   // S_CRBOW15
+    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW17, 0, 0},   // S_CRBOW16
+    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW18, 0, 0},   // S_CRBOW17
+    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW1, 0, 0},    // S_CRBOW18
+    {SPR_CRBW, 0, 1, A_Lower, S_CRBOWDOWN, 0, 0},       // S_CRBOWDOWN
+    {SPR_CRBW, 0, 1, A_Raise, S_CRBOWUP, 0, 0}, // S_CRBOWUP
+    {SPR_CRBW, 3, 6, A_FireCrossbowPL1, S_CRBOWATK1_2, 0, 0},   // S_CRBOWATK1_1
+    {SPR_CRBW, 4, 3, NULL, S_CRBOWATK1_3, 0, 0},        // S_CRBOWATK1_2
+    {SPR_CRBW, 5, 3, NULL, S_CRBOWATK1_4, 0, 0},        // S_CRBOWATK1_3
+    {SPR_CRBW, 6, 3, NULL, S_CRBOWATK1_5, 0, 0},        // S_CRBOWATK1_4
+    {SPR_CRBW, 7, 3, NULL, S_CRBOWATK1_6, 0, 0},        // S_CRBOWATK1_5
+    {SPR_CRBW, 0, 4, NULL, S_CRBOWATK1_7, 0, 0},        // S_CRBOWATK1_6
+    {SPR_CRBW, 1, 4, NULL, S_CRBOWATK1_8, 0, 0},        // S_CRBOWATK1_7
+    {SPR_CRBW, 2, 5, A_ReFire, S_CRBOW1, 0, 0}, // S_CRBOWATK1_8
+    {SPR_CRBW, 3, 5, A_FireCrossbowPL2, S_CRBOWATK2_2, 0, 0},   // S_CRBOWATK2_1
+    {SPR_CRBW, 4, 3, NULL, S_CRBOWATK2_3, 0, 0},        // S_CRBOWATK2_2
+    {SPR_CRBW, 5, 2, NULL, S_CRBOWATK2_4, 0, 0},        // S_CRBOWATK2_3
+    {SPR_CRBW, 6, 3, NULL, S_CRBOWATK2_5, 0, 0},        // S_CRBOWATK2_4
+    {SPR_CRBW, 7, 2, NULL, S_CRBOWATK2_6, 0, 0},        // S_CRBOWATK2_5
+    {SPR_CRBW, 0, 3, NULL, S_CRBOWATK2_7, 0, 0},        // S_CRBOWATK2_6
+    {SPR_CRBW, 1, 3, NULL, S_CRBOWATK2_8, 0, 0},        // S_CRBOWATK2_7
+    {SPR_CRBW, 2, 4, A_ReFire, S_CRBOW1, 0, 0}, // S_CRBOWATK2_8
+    {SPR_FX03, 32769, 1, NULL, S_CRBOWFX1, 0, 0},       // S_CRBOWFX1
+    {SPR_FX03, 32775, 8, NULL, S_CRBOWFXI1_2, 0, 0},    // S_CRBOWFXI1_1
+    {SPR_FX03, 32776, 8, NULL, S_CRBOWFXI1_3, 0, 0},    // S_CRBOWFXI1_2
+    {SPR_FX03, 32777, 8, NULL, S_NULL, 0, 0},   // S_CRBOWFXI1_3
+    {SPR_FX03, 32769, 1, A_BoltSpark, S_CRBOWFX2, 0, 0},        // S_CRBOWFX2
+    {SPR_FX03, 32768, 1, NULL, S_CRBOWFX3, 0, 0},       // S_CRBOWFX3
+    {SPR_FX03, 32770, 8, NULL, S_CRBOWFXI3_2, 0, 0},    // S_CRBOWFXI3_1
+    {SPR_FX03, 32771, 8, NULL, S_CRBOWFXI3_3, 0, 0},    // S_CRBOWFXI3_2
+    {SPR_FX03, 32772, 8, NULL, S_NULL, 0, 0},   // S_CRBOWFXI3_3
+    {SPR_FX03, 32773, 8, NULL, S_CRBOWFX4_2, 0, 0},     // S_CRBOWFX4_1
+    {SPR_FX03, 32774, 8, NULL, S_NULL, 0, 0},   // S_CRBOWFX4_2
+    {SPR_BLOD, 2, 8, NULL, S_BLOOD2, 0, 0},     // S_BLOOD1
+    {SPR_BLOD, 1, 8, NULL, S_BLOOD3, 0, 0},     // S_BLOOD2
+    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOOD3
+    {SPR_BLOD, 2, 8, NULL, S_BLOODSPLATTER2, 0, 0},     // S_BLOODSPLATTER1
+    {SPR_BLOD, 1, 8, NULL, S_BLOODSPLATTER3, 0, 0},     // S_BLOODSPLATTER2
+    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTER3
+    {SPR_BLOD, 0, 6, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTERX
+    {SPR_PLAY, 0, -1, NULL, S_NULL, 0, 0},      // S_PLAY
+    {SPR_PLAY, 0, 4, NULL, S_PLAY_RUN2, 0, 0},  // S_PLAY_RUN1
+    {SPR_PLAY, 1, 4, NULL, S_PLAY_RUN3, 0, 0},  // S_PLAY_RUN2
+    {SPR_PLAY, 2, 4, NULL, S_PLAY_RUN4, 0, 0},  // S_PLAY_RUN3
+    {SPR_PLAY, 3, 4, NULL, S_PLAY_RUN1, 0, 0},  // S_PLAY_RUN4
+    {SPR_PLAY, 4, 12, NULL, S_PLAY, 0, 0},      // S_PLAY_ATK1
+    {SPR_PLAY, 32773, 6, NULL, S_PLAY_ATK1, 0, 0},      // S_PLAY_ATK2
+    {SPR_PLAY, 6, 4, NULL, S_PLAY_PAIN2, 0, 0}, // S_PLAY_PAIN
+    {SPR_PLAY, 6, 4, A_Pain, S_PLAY, 0, 0},     // S_PLAY_PAIN2
+    {SPR_PLAY, 7, 6, NULL, S_PLAY_DIE2, 0, 0},  // S_PLAY_DIE1
+    {SPR_PLAY, 8, 6, A_Scream, S_PLAY_DIE3, 0, 0},      // S_PLAY_DIE2
+    {SPR_PLAY, 9, 6, NULL, S_PLAY_DIE4, 0, 0},  // S_PLAY_DIE3
+    {SPR_PLAY, 10, 6, NULL, S_PLAY_DIE5, 0, 0}, // S_PLAY_DIE4
+    {SPR_PLAY, 11, 6, A_NoBlocking, S_PLAY_DIE6, 0, 0}, // S_PLAY_DIE5
+    {SPR_PLAY, 12, 6, NULL, S_PLAY_DIE7, 0, 0}, // S_PLAY_DIE6
+    {SPR_PLAY, 13, 6, NULL, S_PLAY_DIE8, 0, 0}, // S_PLAY_DIE7
+    {SPR_PLAY, 14, 6, NULL, S_PLAY_DIE9, 0, 0}, // S_PLAY_DIE8
+    {SPR_PLAY, 15, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_PLAY_DIE9
+    {SPR_PLAY, 16, 5, A_Scream, S_PLAY_XDIE2, 0, 0},    // S_PLAY_XDIE1
+    {SPR_PLAY, 17, 5, A_SkullPop, S_PLAY_XDIE3, 0, 0},  // S_PLAY_XDIE2
+    {SPR_PLAY, 18, 5, A_NoBlocking, S_PLAY_XDIE4, 0, 0},        // S_PLAY_XDIE3
+    {SPR_PLAY, 19, 5, NULL, S_PLAY_XDIE5, 0, 0},        // S_PLAY_XDIE4
+    {SPR_PLAY, 20, 5, NULL, S_PLAY_XDIE6, 0, 0},        // S_PLAY_XDIE5
+    {SPR_PLAY, 21, 5, NULL, S_PLAY_XDIE7, 0, 0},        // S_PLAY_XDIE6
+    {SPR_PLAY, 22, 5, NULL, S_PLAY_XDIE8, 0, 0},        // S_PLAY_XDIE7
+    {SPR_PLAY, 23, 5, NULL, S_PLAY_XDIE9, 0, 0},        // S_PLAY_XDIE8
+    {SPR_PLAY, 24, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_PLAY_XDIE9
+    {SPR_FDTH, 32768, 5, A_FlameSnd, S_PLAY_FDTH2, 0, 0},       // S_PLAY_FDTH1
+    {SPR_FDTH, 32769, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_FDTH2
+    {SPR_FDTH, 32770, 5, NULL, S_PLAY_FDTH4, 0, 0},     // S_PLAY_FDTH3
+    {SPR_FDTH, 32771, 4, A_Scream, S_PLAY_FDTH5, 0, 0}, // S_PLAY_FDTH4
+    {SPR_FDTH, 32772, 5, NULL, S_PLAY_FDTH6, 0, 0},     // S_PLAY_FDTH5
+    {SPR_FDTH, 32773, 4, NULL, S_PLAY_FDTH7, 0, 0},     // S_PLAY_FDTH6
+    {SPR_FDTH, 32774, 5, A_FlameSnd, S_PLAY_FDTH8, 0, 0},       // S_PLAY_FDTH7
+    {SPR_FDTH, 32775, 4, NULL, S_PLAY_FDTH9, 0, 0},     // S_PLAY_FDTH8
+    {SPR_FDTH, 32776, 5, NULL, S_PLAY_FDTH10, 0, 0},    // S_PLAY_FDTH9
+    {SPR_FDTH, 32777, 4, NULL, S_PLAY_FDTH11, 0, 0},    // S_PLAY_FDTH10
+    {SPR_FDTH, 32778, 5, NULL, S_PLAY_FDTH12, 0, 0},    // S_PLAY_FDTH11
+    {SPR_FDTH, 32779, 4, NULL, S_PLAY_FDTH13, 0, 0},    // S_PLAY_FDTH12
+    {SPR_FDTH, 32780, 5, NULL, S_PLAY_FDTH14, 0, 0},    // S_PLAY_FDTH13
+    {SPR_FDTH, 32781, 4, NULL, S_PLAY_FDTH15, 0, 0},    // S_PLAY_FDTH14
+    {SPR_FDTH, 32782, 5, A_NoBlocking, S_PLAY_FDTH16, 0, 0},    // S_PLAY_FDTH15
+    {SPR_FDTH, 32783, 4, NULL, S_PLAY_FDTH17, 0, 0},    // S_PLAY_FDTH16
+    {SPR_FDTH, 32784, 5, NULL, S_PLAY_FDTH18, 0, 0},    // S_PLAY_FDTH17
+    {SPR_FDTH, 32785, 4, NULL, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH18
+    {SPR_ACLO, 4, 35, A_CheckBurnGone, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH19
+    {SPR_ACLO, 4, 8, NULL, S_NULL, 0, 0},       // S_PLAY_FDTH20
+    {SPR_BSKL, 0, 5, A_CheckSkullFloor, S_BLOODYSKULL2, 0, 0},  // S_BLOODYSKULL1
+    {SPR_BSKL, 1, 5, A_CheckSkullFloor, S_BLOODYSKULL3, 0, 0},  // S_BLOODYSKULL2
+    {SPR_BSKL, 2, 5, A_CheckSkullFloor, S_BLOODYSKULL4, 0, 0},  // S_BLOODYSKULL3
+    {SPR_BSKL, 3, 5, A_CheckSkullFloor, S_BLOODYSKULL5, 0, 0},  // S_BLOODYSKULL4
+    {SPR_BSKL, 4, 5, A_CheckSkullFloor, S_BLOODYSKULL1, 0, 0},  // S_BLOODYSKULL5
+    {SPR_BSKL, 5, 16, A_CheckSkullDone, S_BLOODYSKULLX1, 0, 0}, // S_BLOODYSKULLX1
+    {SPR_BSKL, 5, 1050, NULL, S_NULL, 0, 0},    // S_BLOODYSKULLX2
+    {SPR_CHKN, 0, -1, NULL, S_NULL, 0, 0},      // S_CHICPLAY
+    {SPR_CHKN, 0, 3, NULL, S_CHICPLAY_RUN2, 0, 0},      // S_CHICPLAY_RUN1
+    {SPR_CHKN, 1, 3, NULL, S_CHICPLAY_RUN3, 0, 0},      // S_CHICPLAY_RUN2
+    {SPR_CHKN, 0, 3, NULL, S_CHICPLAY_RUN4, 0, 0},      // S_CHICPLAY_RUN3
+    {SPR_CHKN, 1, 3, NULL, S_CHICPLAY_RUN1, 0, 0},      // S_CHICPLAY_RUN4
+    {SPR_CHKN, 2, 12, NULL, S_CHICPLAY, 0, 0},  // S_CHICPLAY_ATK1
+    {SPR_CHKN, 3, 4, A_Feathers, S_CHICPLAY_PAIN2, 0, 0},       // S_CHICPLAY_PAIN
+    {SPR_CHKN, 2, 4, A_Pain, S_CHICPLAY, 0, 0}, // S_CHICPLAY_PAIN2
+    {SPR_CHKN, 0, 10, A_ChicLook, S_CHICKEN_LOOK2, 0, 0},       // S_CHICKEN_LOOK1
+    {SPR_CHKN, 1, 10, A_ChicLook, S_CHICKEN_LOOK1, 0, 0},       // S_CHICKEN_LOOK2
+    {SPR_CHKN, 0, 3, A_ChicChase, S_CHICKEN_WALK2, 0, 0},       // S_CHICKEN_WALK1
+    {SPR_CHKN, 1, 3, A_ChicChase, S_CHICKEN_WALK1, 0, 0},       // S_CHICKEN_WALK2
+    {SPR_CHKN, 3, 5, A_Feathers, S_CHICKEN_PAIN2, 0, 0},        // S_CHICKEN_PAIN1
+    {SPR_CHKN, 2, 5, A_ChicPain, S_CHICKEN_WALK1, 0, 0},        // S_CHICKEN_PAIN2
+    {SPR_CHKN, 0, 8, A_FaceTarget, S_CHICKEN_ATK2, 0, 0},       // S_CHICKEN_ATK1
+    {SPR_CHKN, 2, 10, A_ChicAttack, S_CHICKEN_WALK1, 0, 0},     // S_CHICKEN_ATK2
+    {SPR_CHKN, 4, 6, A_Scream, S_CHICKEN_DIE2, 0, 0},   // S_CHICKEN_DIE1
+    {SPR_CHKN, 5, 6, A_Feathers, S_CHICKEN_DIE3, 0, 0}, // S_CHICKEN_DIE2
+    {SPR_CHKN, 6, 6, NULL, S_CHICKEN_DIE4, 0, 0},       // S_CHICKEN_DIE3
+    {SPR_CHKN, 7, 6, A_NoBlocking, S_CHICKEN_DIE5, 0, 0},       // S_CHICKEN_DIE4
+    {SPR_CHKN, 8, 6, NULL, S_CHICKEN_DIE6, 0, 0},       // S_CHICKEN_DIE5
+    {SPR_CHKN, 9, 6, NULL, S_CHICKEN_DIE7, 0, 0},       // S_CHICKEN_DIE6
+    {SPR_CHKN, 10, 6, NULL, S_CHICKEN_DIE8, 0, 0},      // S_CHICKEN_DIE7
+    {SPR_CHKN, 11, -1, NULL, S_NULL, 0, 0},     // S_CHICKEN_DIE8
+    {SPR_CHKN, 12, 3, NULL, S_FEATHER2, 0, 0},  // S_FEATHER1
+    {SPR_CHKN, 13, 3, NULL, S_FEATHER3, 0, 0},  // S_FEATHER2
+    {SPR_CHKN, 14, 3, NULL, S_FEATHER4, 0, 0},  // S_FEATHER3
+    {SPR_CHKN, 15, 3, NULL, S_FEATHER5, 0, 0},  // S_FEATHER4
+    {SPR_CHKN, 16, 3, NULL, S_FEATHER6, 0, 0},  // S_FEATHER5
+    {SPR_CHKN, 15, 3, NULL, S_FEATHER7, 0, 0},  // S_FEATHER6
+    {SPR_CHKN, 14, 3, NULL, S_FEATHER8, 0, 0},  // S_FEATHER7
+    {SPR_CHKN, 13, 3, NULL, S_FEATHER1, 0, 0},  // S_FEATHER8
+    {SPR_CHKN, 13, 6, NULL, S_NULL, 0, 0},      // S_FEATHERX
+    {SPR_MUMM, 0, 10, A_Look, S_MUMMY_LOOK2, 0, 0},     // S_MUMMY_LOOK1
+    {SPR_MUMM, 1, 10, A_Look, S_MUMMY_LOOK1, 0, 0},     // S_MUMMY_LOOK2
+    {SPR_MUMM, 0, 4, A_Chase, S_MUMMY_WALK2, 0, 0},     // S_MUMMY_WALK1
+    {SPR_MUMM, 1, 4, A_Chase, S_MUMMY_WALK3, 0, 0},     // S_MUMMY_WALK2
+    {SPR_MUMM, 2, 4, A_Chase, S_MUMMY_WALK4, 0, 0},     // S_MUMMY_WALK3
+    {SPR_MUMM, 3, 4, A_Chase, S_MUMMY_WALK1, 0, 0},     // S_MUMMY_WALK4
+    {SPR_MUMM, 4, 6, A_FaceTarget, S_MUMMY_ATK2, 0, 0}, // S_MUMMY_ATK1
+    {SPR_MUMM, 5, 6, A_MummyAttack, S_MUMMY_ATK3, 0, 0},        // S_MUMMY_ATK2
+    {SPR_MUMM, 6, 6, A_FaceTarget, S_MUMMY_WALK1, 0, 0},        // S_MUMMY_ATK3
+    {SPR_MUMM, 23, 5, A_FaceTarget, S_MUMMYL_ATK2, 0, 0},       // S_MUMMYL_ATK1
+    {SPR_MUMM, 32792, 5, A_FaceTarget, S_MUMMYL_ATK3, 0, 0},    // S_MUMMYL_ATK2
+    {SPR_MUMM, 23, 5, A_FaceTarget, S_MUMMYL_ATK4, 0, 0},       // S_MUMMYL_ATK3
+    {SPR_MUMM, 32792, 5, A_FaceTarget, S_MUMMYL_ATK5, 0, 0},    // S_MUMMYL_ATK4
+    {SPR_MUMM, 23, 5, A_FaceTarget, S_MUMMYL_ATK6, 0, 0},       // S_MUMMYL_ATK5
+    {SPR_MUMM, 32792, 15, A_MummyAttack2, S_MUMMY_WALK1, 0, 0}, // S_MUMMYL_ATK6
+    {SPR_MUMM, 7, 4, NULL, S_MUMMY_PAIN2, 0, 0},        // S_MUMMY_PAIN1
+    {SPR_MUMM, 7, 4, A_Pain, S_MUMMY_WALK1, 0, 0},      // S_MUMMY_PAIN2
+    {SPR_MUMM, 8, 5, NULL, S_MUMMY_DIE2, 0, 0}, // S_MUMMY_DIE1
+    {SPR_MUMM, 9, 5, A_Scream, S_MUMMY_DIE3, 0, 0},     // S_MUMMY_DIE2
+    {SPR_MUMM, 10, 5, A_MummySoul, S_MUMMY_DIE4, 0, 0}, // S_MUMMY_DIE3
+    {SPR_MUMM, 11, 5, NULL, S_MUMMY_DIE5, 0, 0},        // S_MUMMY_DIE4
+    {SPR_MUMM, 12, 5, A_NoBlocking, S_MUMMY_DIE6, 0, 0},        // S_MUMMY_DIE5
+    {SPR_MUMM, 13, 5, NULL, S_MUMMY_DIE7, 0, 0},        // S_MUMMY_DIE6
+    {SPR_MUMM, 14, 5, NULL, S_MUMMY_DIE8, 0, 0},        // S_MUMMY_DIE7
+    {SPR_MUMM, 15, -1, NULL, S_NULL, 0, 0},     // S_MUMMY_DIE8
+    {SPR_MUMM, 16, 5, NULL, S_MUMMY_SOUL2, 0, 0},       // S_MUMMY_SOUL1
+    {SPR_MUMM, 17, 5, NULL, S_MUMMY_SOUL3, 0, 0},       // S_MUMMY_SOUL2
+    {SPR_MUMM, 18, 5, NULL, S_MUMMY_SOUL4, 0, 0},       // S_MUMMY_SOUL3
+    {SPR_MUMM, 19, 9, NULL, S_MUMMY_SOUL5, 0, 0},       // S_MUMMY_SOUL4
+    {SPR_MUMM, 20, 5, NULL, S_MUMMY_SOUL6, 0, 0},       // S_MUMMY_SOUL5
+    {SPR_MUMM, 21, 5, NULL, S_MUMMY_SOUL7, 0, 0},       // S_MUMMY_SOUL6
+    {SPR_MUMM, 22, 5, NULL, S_NULL, 0, 0},      // S_MUMMY_SOUL7
+    {SPR_FX15, 32768, 5, A_ContMobjSound, S_MUMMYFX1_2, 0, 0},  // S_MUMMYFX1_1
+    {SPR_FX15, 32769, 5, A_MummyFX1Seek, S_MUMMYFX1_3, 0, 0},   // S_MUMMYFX1_2
+    {SPR_FX15, 32770, 5, NULL, S_MUMMYFX1_4, 0, 0},     // S_MUMMYFX1_3
+    {SPR_FX15, 32769, 5, A_MummyFX1Seek, S_MUMMYFX1_1, 0, 0},   // S_MUMMYFX1_4
+    {SPR_FX15, 32771, 5, NULL, S_MUMMYFXI1_2, 0, 0},    // S_MUMMYFXI1_1
+    {SPR_FX15, 32772, 5, NULL, S_MUMMYFXI1_3, 0, 0},    // S_MUMMYFXI1_2
+    {SPR_FX15, 32773, 5, NULL, S_MUMMYFXI1_4, 0, 0},    // S_MUMMYFXI1_3
+    {SPR_FX15, 32774, 5, NULL, S_NULL, 0, 0},   // S_MUMMYFXI1_4
+    {SPR_BEAS, 0, 10, A_Look, S_BEAST_LOOK2, 0, 0},     // S_BEAST_LOOK1
+    {SPR_BEAS, 1, 10, A_Look, S_BEAST_LOOK1, 0, 0},     // S_BEAST_LOOK2
+    {SPR_BEAS, 0, 3, A_Chase, S_BEAST_WALK2, 0, 0},     // S_BEAST_WALK1
+    {SPR_BEAS, 1, 3, A_Chase, S_BEAST_WALK3, 0, 0},     // S_BEAST_WALK2
+    {SPR_BEAS, 2, 3, A_Chase, S_BEAST_WALK4, 0, 0},     // S_BEAST_WALK3
+    {SPR_BEAS, 3, 3, A_Chase, S_BEAST_WALK5, 0, 0},     // S_BEAST_WALK4
+    {SPR_BEAS, 4, 3, A_Chase, S_BEAST_WALK6, 0, 0},     // S_BEAST_WALK5
+    {SPR_BEAS, 5, 3, A_Chase, S_BEAST_WALK1, 0, 0},     // S_BEAST_WALK6
+    {SPR_BEAS, 7, 10, A_FaceTarget, S_BEAST_ATK2, 0, 0},        // S_BEAST_ATK1
+    {SPR_BEAS, 8, 10, A_BeastAttack, S_BEAST_WALK1, 0, 0},      // S_BEAST_ATK2
+    {SPR_BEAS, 6, 3, NULL, S_BEAST_PAIN2, 0, 0},        // S_BEAST_PAIN1
+    {SPR_BEAS, 6, 3, A_Pain, S_BEAST_WALK1, 0, 0},      // S_BEAST_PAIN2
+    {SPR_BEAS, 17, 6, NULL, S_BEAST_DIE2, 0, 0},        // S_BEAST_DIE1
+    {SPR_BEAS, 18, 6, A_Scream, S_BEAST_DIE3, 0, 0},    // S_BEAST_DIE2
+    {SPR_BEAS, 19, 6, NULL, S_BEAST_DIE4, 0, 0},        // S_BEAST_DIE3
+    {SPR_BEAS, 20, 6, NULL, S_BEAST_DIE5, 0, 0},        // S_BEAST_DIE4
+    {SPR_BEAS, 21, 6, NULL, S_BEAST_DIE6, 0, 0},        // S_BEAST_DIE5
+    {SPR_BEAS, 22, 6, A_NoBlocking, S_BEAST_DIE7, 0, 0},        // S_BEAST_DIE6
+    {SPR_BEAS, 23, 6, NULL, S_BEAST_DIE8, 0, 0},        // S_BEAST_DIE7
+    {SPR_BEAS, 24, 6, NULL, S_BEAST_DIE9, 0, 0},        // S_BEAST_DIE8
+    {SPR_BEAS, 25, -1, NULL, S_NULL, 0, 0},     // S_BEAST_DIE9
+    {SPR_BEAS, 9, 5, NULL, S_BEAST_XDIE2, 0, 0},        // S_BEAST_XDIE1
+    {SPR_BEAS, 10, 6, A_Scream, S_BEAST_XDIE3, 0, 0},   // S_BEAST_XDIE2
+    {SPR_BEAS, 11, 5, NULL, S_BEAST_XDIE4, 0, 0},       // S_BEAST_XDIE3
+    {SPR_BEAS, 12, 6, NULL, S_BEAST_XDIE5, 0, 0},       // S_BEAST_XDIE4
+    {SPR_BEAS, 13, 5, NULL, S_BEAST_XDIE6, 0, 0},       // S_BEAST_XDIE5
+    {SPR_BEAS, 14, 6, A_NoBlocking, S_BEAST_XDIE7, 0, 0},       // S_BEAST_XDIE6
+    {SPR_BEAS, 15, 5, NULL, S_BEAST_XDIE8, 0, 0},       // S_BEAST_XDIE7
+    {SPR_BEAS, 16, -1, NULL, S_NULL, 0, 0},     // S_BEAST_XDIE8
+    {SPR_FRB1, 0, 2, A_BeastPuff, S_BEASTBALL2, 0, 0},  // S_BEASTBALL1
+    {SPR_FRB1, 0, 2, A_BeastPuff, S_BEASTBALL3, 0, 0},  // S_BEASTBALL2
+    {SPR_FRB1, 1, 2, A_BeastPuff, S_BEASTBALL4, 0, 0},  // S_BEASTBALL3
+    {SPR_FRB1, 1, 2, A_BeastPuff, S_BEASTBALL5, 0, 0},  // S_BEASTBALL4
+    {SPR_FRB1, 2, 2, A_BeastPuff, S_BEASTBALL6, 0, 0},  // S_BEASTBALL5
+    {SPR_FRB1, 2, 2, A_BeastPuff, S_BEASTBALL1, 0, 0},  // S_BEASTBALL6
+    {SPR_FRB1, 3, 4, NULL, S_BEASTBALLX2, 0, 0},        // S_BEASTBALLX1
+    {SPR_FRB1, 4, 4, NULL, S_BEASTBALLX3, 0, 0},        // S_BEASTBALLX2
+    {SPR_FRB1, 5, 4, NULL, S_BEASTBALLX4, 0, 0},        // S_BEASTBALLX3
+    {SPR_FRB1, 6, 4, NULL, S_BEASTBALLX5, 0, 0},        // S_BEASTBALLX4
+    {SPR_FRB1, 7, 4, NULL, S_NULL, 0, 0},       // S_BEASTBALLX5
+    {SPR_FRB1, 0, 4, NULL, S_BURNBALL2, 0, 0},  // S_BURNBALL1
+    {SPR_FRB1, 1, 4, NULL, S_BURNBALL3, 0, 0},  // S_BURNBALL2
+    {SPR_FRB1, 2, 4, NULL, S_BURNBALL4, 0, 0},  // S_BURNBALL3
+    {SPR_FRB1, 3, 4, NULL, S_BURNBALL5, 0, 0},  // S_BURNBALL4
+    {SPR_FRB1, 4, 4, NULL, S_BURNBALL6, 0, 0},  // S_BURNBALL5
+    {SPR_FRB1, 5, 4, NULL, S_BURNBALL7, 0, 0},  // S_BURNBALL6
+    {SPR_FRB1, 6, 4, NULL, S_BURNBALL8, 0, 0},  // S_BURNBALL7
+    {SPR_FRB1, 7, 4, NULL, S_NULL, 0, 0},       // S_BURNBALL8
+    {SPR_FRB1, 32768, 4, NULL, S_BURNBALLFB2, 0, 0},    // S_BURNBALLFB1
+    {SPR_FRB1, 32769, 4, NULL, S_BURNBALLFB3, 0, 0},    // S_BURNBALLFB2
+    {SPR_FRB1, 32770, 4, NULL, S_BURNBALLFB4, 0, 0},    // S_BURNBALLFB3
+    {SPR_FRB1, 32771, 4, NULL, S_BURNBALLFB5, 0, 0},    // S_BURNBALLFB4
+    {SPR_FRB1, 32772, 4, NULL, S_BURNBALLFB6, 0, 0},    // S_BURNBALLFB5
+    {SPR_FRB1, 32773, 4, NULL, S_BURNBALLFB7, 0, 0},    // S_BURNBALLFB6
+    {SPR_FRB1, 32774, 4, NULL, S_BURNBALLFB8, 0, 0},    // S_BURNBALLFB7
+    {SPR_FRB1, 32775, 4, NULL, S_NULL, 0, 0},   // S_BURNBALLFB8
+    {SPR_FRB1, 3, 4, NULL, S_PUFFY2, 0, 0},     // S_PUFFY1
+    {SPR_FRB1, 4, 4, NULL, S_PUFFY3, 0, 0},     // S_PUFFY2
+    {SPR_FRB1, 5, 4, NULL, S_PUFFY4, 0, 0},     // S_PUFFY3
+    {SPR_FRB1, 6, 4, NULL, S_PUFFY5, 0, 0},     // S_PUFFY4
+    {SPR_FRB1, 7, 4, NULL, S_NULL, 0, 0},       // S_PUFFY5
+    {SPR_SNKE, 0, 10, A_Look, S_SNAKE_LOOK2, 0, 0},     // S_SNAKE_LOOK1
+    {SPR_SNKE, 1, 10, A_Look, S_SNAKE_LOOK1, 0, 0},     // S_SNAKE_LOOK2
+    {SPR_SNKE, 0, 4, A_Chase, S_SNAKE_WALK2, 0, 0},     // S_SNAKE_WALK1
+    {SPR_SNKE, 1, 4, A_Chase, S_SNAKE_WALK3, 0, 0},     // S_SNAKE_WALK2
+    {SPR_SNKE, 2, 4, A_Chase, S_SNAKE_WALK4, 0, 0},     // S_SNAKE_WALK3
+    {SPR_SNKE, 3, 4, A_Chase, S_SNAKE_WALK1, 0, 0},     // S_SNAKE_WALK4
+    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK2, 0, 0}, // S_SNAKE_ATK1
+    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK3, 0, 0}, // S_SNAKE_ATK2
+    {SPR_SNKE, 5, 4, A_SnakeAttack, S_SNAKE_ATK4, 0, 0},        // S_SNAKE_ATK3
+    {SPR_SNKE, 5, 4, A_SnakeAttack, S_SNAKE_ATK5, 0, 0},        // S_SNAKE_ATK4
+    {SPR_SNKE, 5, 4, A_SnakeAttack, S_SNAKE_ATK6, 0, 0},        // S_SNAKE_ATK5
+    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK7, 0, 0}, // S_SNAKE_ATK6
+    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK8, 0, 0}, // S_SNAKE_ATK7
+    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK9, 0, 0}, // S_SNAKE_ATK8
+    {SPR_SNKE, 5, 4, A_SnakeAttack2, S_SNAKE_WALK1, 0, 0},      // S_SNAKE_ATK9
+    {SPR_SNKE, 4, 3, NULL, S_SNAKE_PAIN2, 0, 0},        // S_SNAKE_PAIN1
+    {SPR_SNKE, 4, 3, A_Pain, S_SNAKE_WALK1, 0, 0},      // S_SNAKE_PAIN2
+    {SPR_SNKE, 6, 5, NULL, S_SNAKE_DIE2, 0, 0}, // S_SNAKE_DIE1
+    {SPR_SNKE, 7, 5, A_Scream, S_SNAKE_DIE3, 0, 0},     // S_SNAKE_DIE2
+    {SPR_SNKE, 8, 5, NULL, S_SNAKE_DIE4, 0, 0}, // S_SNAKE_DIE3
+    {SPR_SNKE, 9, 5, NULL, S_SNAKE_DIE5, 0, 0}, // S_SNAKE_DIE4
+    {SPR_SNKE, 10, 5, NULL, S_SNAKE_DIE6, 0, 0},        // S_SNAKE_DIE5
+    {SPR_SNKE, 11, 5, NULL, S_SNAKE_DIE7, 0, 0},        // S_SNAKE_DIE6
+    {SPR_SNKE, 12, 5, A_NoBlocking, S_SNAKE_DIE8, 0, 0},        // S_SNAKE_DIE7
+    {SPR_SNKE, 13, 5, NULL, S_SNAKE_DIE9, 0, 0},        // S_SNAKE_DIE8
+    {SPR_SNKE, 14, 5, NULL, S_SNAKE_DIE10, 0, 0},       // S_SNAKE_DIE9
+    {SPR_SNKE, 15, -1, NULL, S_NULL, 0, 0},     // S_SNAKE_DIE10
+    {SPR_SNFX, 32768, 5, NULL, S_SNAKEPRO_A2, 0, 0},    // S_SNAKEPRO_A1
+    {SPR_SNFX, 32769, 5, NULL, S_SNAKEPRO_A3, 0, 0},    // S_SNAKEPRO_A2
+    {SPR_SNFX, 32770, 5, NULL, S_SNAKEPRO_A4, 0, 0},    // S_SNAKEPRO_A3
+    {SPR_SNFX, 32771, 5, NULL, S_SNAKEPRO_A1, 0, 0},    // S_SNAKEPRO_A4
+    {SPR_SNFX, 32772, 5, NULL, S_SNAKEPRO_AX2, 0, 0},   // S_SNAKEPRO_AX1
+    {SPR_SNFX, 32773, 5, NULL, S_SNAKEPRO_AX3, 0, 0},   // S_SNAKEPRO_AX2
+    {SPR_SNFX, 32774, 4, NULL, S_SNAKEPRO_AX4, 0, 0},   // S_SNAKEPRO_AX3
+    {SPR_SNFX, 32775, 3, NULL, S_SNAKEPRO_AX5, 0, 0},   // S_SNAKEPRO_AX4
+    {SPR_SNFX, 32776, 3, NULL, S_NULL, 0, 0},   // S_SNAKEPRO_AX5
+    {SPR_SNFX, 32777, 6, NULL, S_SNAKEPRO_B2, 0, 0},    // S_SNAKEPRO_B1
+    {SPR_SNFX, 32778, 6, NULL, S_SNAKEPRO_B1, 0, 0},    // S_SNAKEPRO_B2
+    {SPR_SNFX, 32779, 5, NULL, S_SNAKEPRO_BX2, 0, 0},   // S_SNAKEPRO_BX1
+    {SPR_SNFX, 32780, 5, NULL, S_SNAKEPRO_BX3, 0, 0},   // S_SNAKEPRO_BX2
+    {SPR_SNFX, 32781, 4, NULL, S_SNAKEPRO_BX4, 0, 0},   // S_SNAKEPRO_BX3
+    {SPR_SNFX, 32782, 3, NULL, S_NULL, 0, 0},   // S_SNAKEPRO_BX4
+    {SPR_HEAD, 0, 10, A_Look, S_HEAD_LOOK, 0, 0},       // S_HEAD_LOOK
+    {SPR_HEAD, 0, 4, A_Chase, S_HEAD_FLOAT, 0, 0},      // S_HEAD_FLOAT
+    {SPR_HEAD, 0, 5, A_FaceTarget, S_HEAD_ATK2, 0, 0},  // S_HEAD_ATK1
+    {SPR_HEAD, 1, 20, A_HeadAttack, S_HEAD_FLOAT, 0, 0},        // S_HEAD_ATK2
+    {SPR_HEAD, 0, 4, NULL, S_HEAD_PAIN2, 0, 0}, // S_HEAD_PAIN1
+    {SPR_HEAD, 0, 4, A_Pain, S_HEAD_FLOAT, 0, 0},       // S_HEAD_PAIN2
+    {SPR_HEAD, 2, 7, NULL, S_HEAD_DIE2, 0, 0},  // S_HEAD_DIE1
+    {SPR_HEAD, 3, 7, A_Scream, S_HEAD_DIE3, 0, 0},      // S_HEAD_DIE2
+    {SPR_HEAD, 4, 7, NULL, S_HEAD_DIE4, 0, 0},  // S_HEAD_DIE3
+    {SPR_HEAD, 5, 7, NULL, S_HEAD_DIE5, 0, 0},  // S_HEAD_DIE4
+    {SPR_HEAD, 6, 7, A_NoBlocking, S_HEAD_DIE6, 0, 0},  // S_HEAD_DIE5
+    {SPR_HEAD, 7, 7, NULL, S_HEAD_DIE7, 0, 0},  // S_HEAD_DIE6
+    {SPR_HEAD, 8, -1, A_BossDeath, S_NULL, 0, 0},       // S_HEAD_DIE7
+    {SPR_FX05, 0, 6, NULL, S_HEADFX1_2, 0, 0},  // S_HEADFX1_1
+    {SPR_FX05, 1, 6, NULL, S_HEADFX1_3, 0, 0},  // S_HEADFX1_2
+    {SPR_FX05, 2, 6, NULL, S_HEADFX1_1, 0, 0},  // S_HEADFX1_3
+    {SPR_FX05, 3, 5, A_HeadIceImpact, S_HEADFXI1_2, 0, 0},      // S_HEADFXI1_1
+    {SPR_FX05, 4, 5, NULL, S_HEADFXI1_3, 0, 0}, // S_HEADFXI1_2
+    {SPR_FX05, 5, 5, NULL, S_HEADFXI1_4, 0, 0}, // S_HEADFXI1_3
+    {SPR_FX05, 6, 5, NULL, S_NULL, 0, 0},       // S_HEADFXI1_4
+    {SPR_FX05, 7, 6, NULL, S_HEADFX2_2, 0, 0},  // S_HEADFX2_1
+    {SPR_FX05, 8, 6, NULL, S_HEADFX2_3, 0, 0},  // S_HEADFX2_2
+    {SPR_FX05, 9, 6, NULL, S_HEADFX2_1, 0, 0},  // S_HEADFX2_3
+    {SPR_FX05, 3, 5, NULL, S_HEADFXI2_2, 0, 0}, // S_HEADFXI2_1
+    {SPR_FX05, 4, 5, NULL, S_HEADFXI2_3, 0, 0}, // S_HEADFXI2_2
+    {SPR_FX05, 5, 5, NULL, S_HEADFXI2_4, 0, 0}, // S_HEADFXI2_3
+    {SPR_FX05, 6, 5, NULL, S_NULL, 0, 0},       // S_HEADFXI2_4
+    {SPR_FX06, 0, 4, A_HeadFireGrow, S_HEADFX3_2, 0, 0},        // S_HEADFX3_1
+    {SPR_FX06, 1, 4, A_HeadFireGrow, S_HEADFX3_3, 0, 0},        // S_HEADFX3_2
+    {SPR_FX06, 2, 4, A_HeadFireGrow, S_HEADFX3_1, 0, 0},        // S_HEADFX3_3
+    {SPR_FX06, 0, 5, NULL, S_HEADFX3_5, 0, 0},  // S_HEADFX3_4
+    {SPR_FX06, 1, 5, NULL, S_HEADFX3_6, 0, 0},  // S_HEADFX3_5
+    {SPR_FX06, 2, 5, NULL, S_HEADFX3_4, 0, 0},  // S_HEADFX3_6
+    {SPR_FX06, 3, 5, NULL, S_HEADFXI3_2, 0, 0}, // S_HEADFXI3_1
+    {SPR_FX06, 4, 5, NULL, S_HEADFXI3_3, 0, 0}, // S_HEADFXI3_2
+    {SPR_FX06, 5, 5, NULL, S_HEADFXI3_4, 0, 0}, // S_HEADFXI3_3
+    {SPR_FX06, 6, 5, NULL, S_NULL, 0, 0},       // S_HEADFXI3_4
+    {SPR_FX07, 3, 3, NULL, S_HEADFX4_2, 0, 0},  // S_HEADFX4_1
+    {SPR_FX07, 4, 3, NULL, S_HEADFX4_3, 0, 0},  // S_HEADFX4_2
+    {SPR_FX07, 5, 3, NULL, S_HEADFX4_4, 0, 0},  // S_HEADFX4_3
+    {SPR_FX07, 6, 3, NULL, S_HEADFX4_5, 0, 0},  // S_HEADFX4_4
+    {SPR_FX07, 0, 3, A_WhirlwindSeek, S_HEADFX4_6, 0, 0},       // S_HEADFX4_5
+    {SPR_FX07, 1, 3, A_WhirlwindSeek, S_HEADFX4_7, 0, 0},       // S_HEADFX4_6
+    {SPR_FX07, 2, 3, A_WhirlwindSeek, S_HEADFX4_5, 0, 0},       // S_HEADFX4_7
+    {SPR_FX07, 6, 4, NULL, S_HEADFXI4_2, 0, 0}, // S_HEADFXI4_1
+    {SPR_FX07, 5, 4, NULL, S_HEADFXI4_3, 0, 0}, // S_HEADFXI4_2
+    {SPR_FX07, 4, 4, NULL, S_HEADFXI4_4, 0, 0}, // S_HEADFXI4_3
+    {SPR_FX07, 3, 4, NULL, S_NULL, 0, 0},       // S_HEADFXI4_4
+    {SPR_CLNK, 0, 10, A_Look, S_CLINK_LOOK2, 0, 0},     // S_CLINK_LOOK1
+    {SPR_CLNK, 1, 10, A_Look, S_CLINK_LOOK1, 0, 0},     // S_CLINK_LOOK2
+    {SPR_CLNK, 0, 3, A_Chase, S_CLINK_WALK2, 0, 0},     // S_CLINK_WALK1
+    {SPR_CLNK, 1, 3, A_Chase, S_CLINK_WALK3, 0, 0},     // S_CLINK_WALK2
+    {SPR_CLNK, 2, 3, A_Chase, S_CLINK_WALK4, 0, 0},     // S_CLINK_WALK3
+    {SPR_CLNK, 3, 3, A_Chase, S_CLINK_WALK1, 0, 0},     // S_CLINK_WALK4
+    {SPR_CLNK, 4, 5, A_FaceTarget, S_CLINK_ATK2, 0, 0}, // S_CLINK_ATK1
+    {SPR_CLNK, 5, 4, A_FaceTarget, S_CLINK_ATK3, 0, 0}, // S_CLINK_ATK2
+    {SPR_CLNK, 6, 7, A_ClinkAttack, S_CLINK_WALK1, 0, 0},       // S_CLINK_ATK3
+    {SPR_CLNK, 7, 3, NULL, S_CLINK_PAIN2, 0, 0},        // S_CLINK_PAIN1
+    {SPR_CLNK, 7, 3, A_Pain, S_CLINK_WALK1, 0, 0},      // S_CLINK_PAIN2
+    {SPR_CLNK, 8, 6, NULL, S_CLINK_DIE2, 0, 0}, // S_CLINK_DIE1
+    {SPR_CLNK, 9, 6, NULL, S_CLINK_DIE3, 0, 0}, // S_CLINK_DIE2
+    {SPR_CLNK, 10, 5, A_Scream, S_CLINK_DIE4, 0, 0},    // S_CLINK_DIE3
+    {SPR_CLNK, 11, 5, A_NoBlocking, S_CLINK_DIE5, 0, 0},        // S_CLINK_DIE4
+    {SPR_CLNK, 12, 5, NULL, S_CLINK_DIE6, 0, 0},        // S_CLINK_DIE5
+    {SPR_CLNK, 13, 5, NULL, S_CLINK_DIE7, 0, 0},        // S_CLINK_DIE6
+    {SPR_CLNK, 14, -1, NULL, S_NULL, 0, 0},     // S_CLINK_DIE7
+    {SPR_WZRD, 0, 10, A_Look, S_WIZARD_LOOK2, 0, 0},    // S_WIZARD_LOOK1
+    {SPR_WZRD, 1, 10, A_Look, S_WIZARD_LOOK1, 0, 0},    // S_WIZARD_LOOK2
+    {SPR_WZRD, 0, 3, A_Chase, S_WIZARD_WALK2, 0, 0},    // S_WIZARD_WALK1
+    {SPR_WZRD, 0, 4, A_Chase, S_WIZARD_WALK3, 0, 0},    // S_WIZARD_WALK2
+    {SPR_WZRD, 0, 3, A_Chase, S_WIZARD_WALK4, 0, 0},    // S_WIZARD_WALK3
+    {SPR_WZRD, 0, 4, A_Chase, S_WIZARD_WALK5, 0, 0},    // S_WIZARD_WALK4
+    {SPR_WZRD, 1, 3, A_Chase, S_WIZARD_WALK6, 0, 0},    // S_WIZARD_WALK5
+    {SPR_WZRD, 1, 4, A_Chase, S_WIZARD_WALK7, 0, 0},    // S_WIZARD_WALK6
+    {SPR_WZRD, 1, 3, A_Chase, S_WIZARD_WALK8, 0, 0},    // S_WIZARD_WALK7
+    {SPR_WZRD, 1, 4, A_Chase, S_WIZARD_WALK1, 0, 0},    // S_WIZARD_WALK8
+    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK2, 0, 0},   // S_WIZARD_ATK1
+    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK3, 0, 0},   // S_WIZARD_ATK2
+    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK4, 0, 0},   // S_WIZARD_ATK3
+    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK5, 0, 0},   // S_WIZARD_ATK4
+    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK6, 0, 0},   // S_WIZARD_ATK5
+    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK7, 0, 0},   // S_WIZARD_ATK6
+    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK8, 0, 0},   // S_WIZARD_ATK7
+    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK9, 0, 0},   // S_WIZARD_ATK8
+    {SPR_WZRD, 3, 12, A_WizAtk3, S_WIZARD_WALK1, 0, 0}, // S_WIZARD_ATK9
+    {SPR_WZRD, 4, 3, A_GhostOff, S_WIZARD_PAIN2, 0, 0}, // S_WIZARD_PAIN1
+    {SPR_WZRD, 4, 3, A_Pain, S_WIZARD_WALK1, 0, 0},     // S_WIZARD_PAIN2
+    {SPR_WZRD, 5, 6, A_GhostOff, S_WIZARD_DIE2, 0, 0},  // S_WIZARD_DIE1
+    {SPR_WZRD, 6, 6, A_Scream, S_WIZARD_DIE3, 0, 0},    // S_WIZARD_DIE2
+    {SPR_WZRD, 7, 6, NULL, S_WIZARD_DIE4, 0, 0},        // S_WIZARD_DIE3
+    {SPR_WZRD, 8, 6, NULL, S_WIZARD_DIE5, 0, 0},        // S_WIZARD_DIE4
+    {SPR_WZRD, 9, 6, A_NoBlocking, S_WIZARD_DIE6, 0, 0},        // S_WIZARD_DIE5
+    {SPR_WZRD, 10, 6, NULL, S_WIZARD_DIE7, 0, 0},       // S_WIZARD_DIE6
+    {SPR_WZRD, 11, 6, NULL, S_WIZARD_DIE8, 0, 0},       // S_WIZARD_DIE7
+    {SPR_WZRD, 12, -1, NULL, S_NULL, 0, 0},     // S_WIZARD_DIE8
+    {SPR_FX11, 32768, 6, NULL, S_WIZFX1_2, 0, 0},       // S_WIZFX1_1
+    {SPR_FX11, 32769, 6, NULL, S_WIZFX1_1, 0, 0},       // S_WIZFX1_2
+    {SPR_FX11, 32770, 5, NULL, S_WIZFXI1_2, 0, 0},      // S_WIZFXI1_1
+    {SPR_FX11, 32771, 5, NULL, S_WIZFXI1_3, 0, 0},      // S_WIZFXI1_2
+    {SPR_FX11, 32772, 5, NULL, S_WIZFXI1_4, 0, 0},      // S_WIZFXI1_3
+    {SPR_FX11, 32773, 5, NULL, S_WIZFXI1_5, 0, 0},      // S_WIZFXI1_4
+    {SPR_FX11, 32774, 5, NULL, S_NULL, 0, 0},   // S_WIZFXI1_5
+    {SPR_IMPX, 0, 10, A_Look, S_IMP_LOOK2, 0, 0},       // S_IMP_LOOK1
+    {SPR_IMPX, 1, 10, A_Look, S_IMP_LOOK3, 0, 0},       // S_IMP_LOOK2
+    {SPR_IMPX, 2, 10, A_Look, S_IMP_LOOK4, 0, 0},       // S_IMP_LOOK3
+    {SPR_IMPX, 1, 10, A_Look, S_IMP_LOOK1, 0, 0},       // S_IMP_LOOK4
+    {SPR_IMPX, 0, 3, A_Chase, S_IMP_FLY2, 0, 0},        // S_IMP_FLY1
+    {SPR_IMPX, 0, 3, A_Chase, S_IMP_FLY3, 0, 0},        // S_IMP_FLY2
+    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY4, 0, 0},        // S_IMP_FLY3
+    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY5, 0, 0},        // S_IMP_FLY4
+    {SPR_IMPX, 2, 3, A_Chase, S_IMP_FLY6, 0, 0},        // S_IMP_FLY5
+    {SPR_IMPX, 2, 3, A_Chase, S_IMP_FLY7, 0, 0},        // S_IMP_FLY6
+    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY8, 0, 0},        // S_IMP_FLY7
+    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY1, 0, 0},        // S_IMP_FLY8
+    {SPR_IMPX, 3, 6, A_FaceTarget, S_IMP_MEATK2, 0, 0}, // S_IMP_MEATK1
+    {SPR_IMPX, 4, 6, A_FaceTarget, S_IMP_MEATK3, 0, 0}, // S_IMP_MEATK2
+    {SPR_IMPX, 5, 6, A_ImpMeAttack, S_IMP_FLY1, 0, 0},  // S_IMP_MEATK3
+    {SPR_IMPX, 0, 10, A_FaceTarget, S_IMP_MSATK1_2, 0, 0},      // S_IMP_MSATK1_1
+    {SPR_IMPX, 1, 6, A_ImpMsAttack, S_IMP_MSATK1_3, 0, 0},      // S_IMP_MSATK1_2
+    {SPR_IMPX, 2, 6, NULL, S_IMP_MSATK1_4, 0, 0},       // S_IMP_MSATK1_3
+    {SPR_IMPX, 1, 6, NULL, S_IMP_MSATK1_5, 0, 0},       // S_IMP_MSATK1_4
+    {SPR_IMPX, 0, 6, NULL, S_IMP_MSATK1_6, 0, 0},       // S_IMP_MSATK1_5
+    {SPR_IMPX, 1, 6, NULL, S_IMP_MSATK1_3, 0, 0},       // S_IMP_MSATK1_6
+    {SPR_IMPX, 3, 6, A_FaceTarget, S_IMP_MSATK2_2, 0, 0},       // S_IMP_MSATK2_1
+    {SPR_IMPX, 4, 6, A_FaceTarget, S_IMP_MSATK2_3, 0, 0},       // S_IMP_MSATK2_2
+    {SPR_IMPX, 5, 6, A_ImpMsAttack2, S_IMP_FLY1, 0, 0}, // S_IMP_MSATK2_3
+    {SPR_IMPX, 6, 3, NULL, S_IMP_PAIN2, 0, 0},  // S_IMP_PAIN1
+    {SPR_IMPX, 6, 3, A_Pain, S_IMP_FLY1, 0, 0}, // S_IMP_PAIN2
+    {SPR_IMPX, 6, 4, A_ImpDeath, S_IMP_DIE2, 0, 0},     // S_IMP_DIE1
+    {SPR_IMPX, 7, 5, NULL, S_IMP_DIE2, 0, 0},   // S_IMP_DIE2
+    {SPR_IMPX, 18, 5, A_ImpXDeath1, S_IMP_XDIE2, 0, 0}, // S_IMP_XDIE1
+    {SPR_IMPX, 19, 5, NULL, S_IMP_XDIE3, 0, 0}, // S_IMP_XDIE2
+    {SPR_IMPX, 20, 5, NULL, S_IMP_XDIE4, 0, 0}, // S_IMP_XDIE3
+    {SPR_IMPX, 21, 5, A_ImpXDeath2, S_IMP_XDIE5, 0, 0}, // S_IMP_XDIE4
+    {SPR_IMPX, 22, 5, NULL, S_IMP_XDIE5, 0, 0}, // S_IMP_XDIE5
+    {SPR_IMPX, 8, 7, A_ImpExplode, S_IMP_CRASH2, 0, 0}, // S_IMP_CRASH1
+    {SPR_IMPX, 9, 7, A_Scream, S_IMP_CRASH3, 0, 0},     // S_IMP_CRASH2
+    {SPR_IMPX, 10, 7, NULL, S_IMP_CRASH4, 0, 0},        // S_IMP_CRASH3
+    {SPR_IMPX, 11, -1, NULL, S_NULL, 0, 0},     // S_IMP_CRASH4
+    {SPR_IMPX, 23, 7, NULL, S_IMP_XCRASH2, 0, 0},       // S_IMP_XCRASH1
+    {SPR_IMPX, 24, 7, NULL, S_IMP_XCRASH3, 0, 0},       // S_IMP_XCRASH2
+    {SPR_IMPX, 25, -1, NULL, S_NULL, 0, 0},     // S_IMP_XCRASH3
+    {SPR_IMPX, 12, 5, NULL, S_IMP_CHUNKA2, 0, 0},       // S_IMP_CHUNKA1
+    {SPR_IMPX, 13, 700, NULL, S_IMP_CHUNKA3, 0, 0},     // S_IMP_CHUNKA2
+    {SPR_IMPX, 14, 700, NULL, S_NULL, 0, 0},    // S_IMP_CHUNKA3
+    {SPR_IMPX, 15, 5, NULL, S_IMP_CHUNKB2, 0, 0},       // S_IMP_CHUNKB1
+    {SPR_IMPX, 16, 700, NULL, S_IMP_CHUNKB3, 0, 0},     // S_IMP_CHUNKB2
+    {SPR_IMPX, 17, 700, NULL, S_NULL, 0, 0},    // S_IMP_CHUNKB3
+    {SPR_FX10, 32768, 6, NULL, S_IMPFX2, 0, 0}, // S_IMPFX1
+    {SPR_FX10, 32769, 6, NULL, S_IMPFX3, 0, 0}, // S_IMPFX2
+    {SPR_FX10, 32770, 6, NULL, S_IMPFX1, 0, 0}, // S_IMPFX3
+    {SPR_FX10, 32771, 5, NULL, S_IMPFXI2, 0, 0},        // S_IMPFXI1
+    {SPR_FX10, 32772, 5, NULL, S_IMPFXI3, 0, 0},        // S_IMPFXI2
+    {SPR_FX10, 32773, 5, NULL, S_IMPFXI4, 0, 0},        // S_IMPFXI3
+    {SPR_FX10, 32774, 5, NULL, S_NULL, 0, 0},   // S_IMPFXI4
+    {SPR_KNIG, 0, 10, A_Look, S_KNIGHT_STND2, 0, 0},    // S_KNIGHT_STND1
+    {SPR_KNIG, 1, 10, A_Look, S_KNIGHT_STND1, 0, 0},    // S_KNIGHT_STND2
+    {SPR_KNIG, 0, 4, A_Chase, S_KNIGHT_WALK2, 0, 0},    // S_KNIGHT_WALK1
+    {SPR_KNIG, 1, 4, A_Chase, S_KNIGHT_WALK3, 0, 0},    // S_KNIGHT_WALK2
+    {SPR_KNIG, 2, 4, A_Chase, S_KNIGHT_WALK4, 0, 0},    // S_KNIGHT_WALK3
+    {SPR_KNIG, 3, 4, A_Chase, S_KNIGHT_WALK1, 0, 0},    // S_KNIGHT_WALK4
+    {SPR_KNIG, 4, 10, A_FaceTarget, S_KNIGHT_ATK2, 0, 0},       // S_KNIGHT_ATK1
+    {SPR_KNIG, 5, 8, A_FaceTarget, S_KNIGHT_ATK3, 0, 0},        // S_KNIGHT_ATK2
+    {SPR_KNIG, 6, 8, A_KnightAttack, S_KNIGHT_ATK4, 0, 0},      // S_KNIGHT_ATK3
+    {SPR_KNIG, 4, 10, A_FaceTarget, S_KNIGHT_ATK5, 0, 0},       // S_KNIGHT_ATK4
+    {SPR_KNIG, 5, 8, A_FaceTarget, S_KNIGHT_ATK6, 0, 0},        // S_KNIGHT_ATK5
+    {SPR_KNIG, 6, 8, A_KnightAttack, S_KNIGHT_WALK1, 0, 0},     // S_KNIGHT_ATK6
+    {SPR_KNIG, 7, 3, NULL, S_KNIGHT_PAIN2, 0, 0},       // S_KNIGHT_PAIN1
+    {SPR_KNIG, 7, 3, A_Pain, S_KNIGHT_WALK1, 0, 0},     // S_KNIGHT_PAIN2
+    {SPR_KNIG, 8, 6, NULL, S_KNIGHT_DIE2, 0, 0},        // S_KNIGHT_DIE1
+    {SPR_KNIG, 9, 6, A_Scream, S_KNIGHT_DIE3, 0, 0},    // S_KNIGHT_DIE2
+    {SPR_KNIG, 10, 6, NULL, S_KNIGHT_DIE4, 0, 0},       // S_KNIGHT_DIE3
+    {SPR_KNIG, 11, 6, A_NoBlocking, S_KNIGHT_DIE5, 0, 0},       // S_KNIGHT_DIE4
+    {SPR_KNIG, 12, 6, NULL, S_KNIGHT_DIE6, 0, 0},       // S_KNIGHT_DIE5
+    {SPR_KNIG, 13, 6, NULL, S_KNIGHT_DIE7, 0, 0},       // S_KNIGHT_DIE6
+    {SPR_KNIG, 14, -1, NULL, S_NULL, 0, 0},     // S_KNIGHT_DIE7
+    {SPR_SPAX, 32768, 3, A_ContMobjSound, S_SPINAXE2, 0, 0},    // S_SPINAXE1
+    {SPR_SPAX, 32769, 3, NULL, S_SPINAXE3, 0, 0},       // S_SPINAXE2
+    {SPR_SPAX, 32770, 3, NULL, S_SPINAXE1, 0, 0},       // S_SPINAXE3
+    {SPR_SPAX, 32771, 6, NULL, S_SPINAXEX2, 0, 0},      // S_SPINAXEX1
+    {SPR_SPAX, 32772, 6, NULL, S_SPINAXEX3, 0, 0},      // S_SPINAXEX2
+    {SPR_SPAX, 32773, 6, NULL, S_NULL, 0, 0},   // S_SPINAXEX3
+    {SPR_RAXE, 32768, 5, A_DripBlood, S_REDAXE2, 0, 0}, // S_REDAXE1
+    {SPR_RAXE, 32769, 5, A_DripBlood, S_REDAXE1, 0, 0}, // S_REDAXE2
+    {SPR_RAXE, 32770, 6, NULL, S_REDAXEX2, 0, 0},       // S_REDAXEX1
+    {SPR_RAXE, 32771, 6, NULL, S_REDAXEX3, 0, 0},       // S_REDAXEX2
+    {SPR_RAXE, 32772, 6, NULL, S_NULL, 0, 0},   // S_REDAXEX3
+    {SPR_SRCR, 0, 10, A_Look, S_SRCR1_LOOK2, 0, 0},     // S_SRCR1_LOOK1
+    {SPR_SRCR, 1, 10, A_Look, S_SRCR1_LOOK1, 0, 0},     // S_SRCR1_LOOK2
+    {SPR_SRCR, 0, 5, A_Sor1Chase, S_SRCR1_WALK2, 0, 0}, // S_SRCR1_WALK1
+    {SPR_SRCR, 1, 5, A_Sor1Chase, S_SRCR1_WALK3, 0, 0}, // S_SRCR1_WALK2
+    {SPR_SRCR, 2, 5, A_Sor1Chase, S_SRCR1_WALK4, 0, 0}, // S_SRCR1_WALK3
+    {SPR_SRCR, 3, 5, A_Sor1Chase, S_SRCR1_WALK1, 0, 0}, // S_SRCR1_WALK4
+    {SPR_SRCR, 16, 6, A_Sor1Pain, S_SRCR1_WALK1, 0, 0}, // S_SRCR1_PAIN1
+    {SPR_SRCR, 16, 7, A_FaceTarget, S_SRCR1_ATK2, 0, 0},        // S_SRCR1_ATK1
+    {SPR_SRCR, 17, 6, A_FaceTarget, S_SRCR1_ATK3, 0, 0},        // S_SRCR1_ATK2
+    {SPR_SRCR, 18, 10, A_Srcr1Attack, S_SRCR1_WALK1, 0, 0},     // S_SRCR1_ATK3
+    {SPR_SRCR, 18, 10, A_FaceTarget, S_SRCR1_ATK5, 0, 0},       // S_SRCR1_ATK4
+    {SPR_SRCR, 16, 7, A_FaceTarget, S_SRCR1_ATK6, 0, 0},        // S_SRCR1_ATK5
+    {SPR_SRCR, 17, 6, A_FaceTarget, S_SRCR1_ATK7, 0, 0},        // S_SRCR1_ATK6
+    {SPR_SRCR, 18, 10, A_Srcr1Attack, S_SRCR1_WALK1, 0, 0},     // S_SRCR1_ATK7
+    {SPR_SRCR, 4, 7, NULL, S_SRCR1_DIE2, 0, 0}, // S_SRCR1_DIE1
+    {SPR_SRCR, 5, 7, A_Scream, S_SRCR1_DIE3, 0, 0},     // S_SRCR1_DIE2
+    {SPR_SRCR, 6, 7, NULL, S_SRCR1_DIE4, 0, 0}, // S_SRCR1_DIE3
+    {SPR_SRCR, 7, 6, NULL, S_SRCR1_DIE5, 0, 0}, // S_SRCR1_DIE4
+    {SPR_SRCR, 8, 6, NULL, S_SRCR1_DIE6, 0, 0}, // S_SRCR1_DIE5
+    {SPR_SRCR, 9, 6, NULL, S_SRCR1_DIE7, 0, 0}, // S_SRCR1_DIE6
+    {SPR_SRCR, 10, 6, NULL, S_SRCR1_DIE8, 0, 0},        // S_SRCR1_DIE7
+    {SPR_SRCR, 11, 25, A_SorZap, S_SRCR1_DIE9, 0, 0},   // S_SRCR1_DIE8
+    {SPR_SRCR, 12, 5, NULL, S_SRCR1_DIE10, 0, 0},       // S_SRCR1_DIE9
+    {SPR_SRCR, 13, 5, NULL, S_SRCR1_DIE11, 0, 0},       // S_SRCR1_DIE10
+    {SPR_SRCR, 14, 4, NULL, S_SRCR1_DIE12, 0, 0},       // S_SRCR1_DIE11
+    {SPR_SRCR, 11, 20, A_SorZap, S_SRCR1_DIE13, 0, 0},  // S_SRCR1_DIE12
+    {SPR_SRCR, 12, 5, NULL, S_SRCR1_DIE14, 0, 0},       // S_SRCR1_DIE13
+    {SPR_SRCR, 13, 5, NULL, S_SRCR1_DIE15, 0, 0},       // S_SRCR1_DIE14
+    {SPR_SRCR, 14, 4, NULL, S_SRCR1_DIE16, 0, 0},       // S_SRCR1_DIE15
+    {SPR_SRCR, 11, 12, NULL, S_SRCR1_DIE17, 0, 0},      // S_SRCR1_DIE16
+    {SPR_SRCR, 15, -1, A_SorcererRise, S_NULL, 0, 0},   // S_SRCR1_DIE17
+    {SPR_FX14, 32768, 6, NULL, S_SRCRFX1_2, 0, 0},      // S_SRCRFX1_1
+    {SPR_FX14, 32769, 6, NULL, S_SRCRFX1_3, 0, 0},      // S_SRCRFX1_2
+    {SPR_FX14, 32770, 6, NULL, S_SRCRFX1_1, 0, 0},      // S_SRCRFX1_3
+    {SPR_FX14, 32771, 5, NULL, S_SRCRFXI1_2, 0, 0},     // S_SRCRFXI1_1
+    {SPR_FX14, 32772, 5, NULL, S_SRCRFXI1_3, 0, 0},     // S_SRCRFXI1_2
+    {SPR_FX14, 32773, 5, NULL, S_SRCRFXI1_4, 0, 0},     // S_SRCRFXI1_3
+    {SPR_FX14, 32774, 5, NULL, S_SRCRFXI1_5, 0, 0},     // S_SRCRFXI1_4
+    {SPR_FX14, 32775, 5, NULL, S_NULL, 0, 0},   // S_SRCRFXI1_5
+    {SPR_SOR2, 0, 4, NULL, S_SOR2_RISE2, 0, 0}, // S_SOR2_RISE1
+    {SPR_SOR2, 1, 4, NULL, S_SOR2_RISE3, 0, 0}, // S_SOR2_RISE2
+    {SPR_SOR2, 2, 4, A_SorRise, S_SOR2_RISE4, 0, 0},    // S_SOR2_RISE3
+    {SPR_SOR2, 3, 4, NULL, S_SOR2_RISE5, 0, 0}, // S_SOR2_RISE4
+    {SPR_SOR2, 4, 4, NULL, S_SOR2_RISE6, 0, 0}, // S_SOR2_RISE5
+    {SPR_SOR2, 5, 4, NULL, S_SOR2_RISE7, 0, 0}, // S_SOR2_RISE6
+    {SPR_SOR2, 6, 12, A_SorSightSnd, S_SOR2_WALK1, 0, 0},       // S_SOR2_RISE7
+    {SPR_SOR2, 12, 10, A_Look, S_SOR2_LOOK2, 0, 0},     // S_SOR2_LOOK1
+    {SPR_SOR2, 13, 10, A_Look, S_SOR2_LOOK1, 0, 0},     // S_SOR2_LOOK2
+    {SPR_SOR2, 12, 4, A_Chase, S_SOR2_WALK2, 0, 0},     // S_SOR2_WALK1
+    {SPR_SOR2, 13, 4, A_Chase, S_SOR2_WALK3, 0, 0},     // S_SOR2_WALK2
+    {SPR_SOR2, 14, 4, A_Chase, S_SOR2_WALK4, 0, 0},     // S_SOR2_WALK3
+    {SPR_SOR2, 15, 4, A_Chase, S_SOR2_WALK1, 0, 0},     // S_SOR2_WALK4
+    {SPR_SOR2, 16, 3, NULL, S_SOR2_PAIN2, 0, 0},        // S_SOR2_PAIN1
+    {SPR_SOR2, 16, 6, A_Pain, S_SOR2_WALK1, 0, 0},      // S_SOR2_PAIN2
+    {SPR_SOR2, 17, 9, A_Srcr2Decide, S_SOR2_ATK2, 0, 0},        // S_SOR2_ATK1
+    {SPR_SOR2, 18, 9, A_FaceTarget, S_SOR2_ATK3, 0, 0}, // S_SOR2_ATK2
+    {SPR_SOR2, 19, 20, A_Srcr2Attack, S_SOR2_WALK1, 0, 0},      // S_SOR2_ATK3
+    {SPR_SOR2, 11, 6, NULL, S_SOR2_TELE2, 0, 0},        // S_SOR2_TELE1
+    {SPR_SOR2, 10, 6, NULL, S_SOR2_TELE3, 0, 0},        // S_SOR2_TELE2
+    {SPR_SOR2, 9, 6, NULL, S_SOR2_TELE4, 0, 0}, // S_SOR2_TELE3
+    {SPR_SOR2, 8, 6, NULL, S_SOR2_TELE5, 0, 0}, // S_SOR2_TELE4
+    {SPR_SOR2, 7, 6, NULL, S_SOR2_TELE6, 0, 0}, // S_SOR2_TELE5
+    {SPR_SOR2, 6, 6, NULL, S_SOR2_WALK1, 0, 0}, // S_SOR2_TELE6
+    {SPR_SDTH, 0, 8, A_Sor2DthInit, S_SOR2_DIE2, 0, 0}, // S_SOR2_DIE1
+    {SPR_SDTH, 1, 8, NULL, S_SOR2_DIE3, 0, 0},  // S_SOR2_DIE2
+    {SPR_SDTH, 2, 8, A_SorDSph, S_SOR2_DIE4, 0, 0},     // S_SOR2_DIE3
+    {SPR_SDTH, 3, 7, NULL, S_SOR2_DIE5, 0, 0},  // S_SOR2_DIE4
+    {SPR_SDTH, 4, 7, NULL, S_SOR2_DIE6, 0, 0},  // S_SOR2_DIE5
+    {SPR_SDTH, 5, 7, A_Sor2DthLoop, S_SOR2_DIE7, 0, 0}, // S_SOR2_DIE6
+    {SPR_SDTH, 6, 6, A_SorDExp, S_SOR2_DIE8, 0, 0},     // S_SOR2_DIE7
+    {SPR_SDTH, 7, 6, NULL, S_SOR2_DIE9, 0, 0},  // S_SOR2_DIE8
+    {SPR_SDTH, 8, 18, NULL, S_SOR2_DIE10, 0, 0},        // S_SOR2_DIE9
+    {SPR_SDTH, 9, 6, A_NoBlocking, S_SOR2_DIE11, 0, 0}, // S_SOR2_DIE10
+    {SPR_SDTH, 10, 6, A_SorDBon, S_SOR2_DIE12, 0, 0},   // S_SOR2_DIE11
+    {SPR_SDTH, 11, 6, NULL, S_SOR2_DIE13, 0, 0},        // S_SOR2_DIE12
+    {SPR_SDTH, 12, 6, NULL, S_SOR2_DIE14, 0, 0},        // S_SOR2_DIE13
+    {SPR_SDTH, 13, 6, NULL, S_SOR2_DIE15, 0, 0},        // S_SOR2_DIE14
+    {SPR_SDTH, 14, -1, A_BossDeath, S_NULL, 0, 0},      // S_SOR2_DIE15
+    {SPR_FX16, 32768, 3, A_BlueSpark, S_SOR2FX1_2, 0, 0},       // S_SOR2FX1_1
+    {SPR_FX16, 32769, 3, A_BlueSpark, S_SOR2FX1_3, 0, 0},       // S_SOR2FX1_2
+    {SPR_FX16, 32770, 3, A_BlueSpark, S_SOR2FX1_1, 0, 0},       // S_SOR2FX1_3
+    {SPR_FX16, 32774, 5, A_Explode, S_SOR2FXI1_2, 0, 0},        // S_SOR2FXI1_1
+    {SPR_FX16, 32775, 5, NULL, S_SOR2FXI1_3, 0, 0},     // S_SOR2FXI1_2
+    {SPR_FX16, 32776, 5, NULL, S_SOR2FXI1_4, 0, 0},     // S_SOR2FXI1_3
+    {SPR_FX16, 32777, 5, NULL, S_SOR2FXI1_5, 0, 0},     // S_SOR2FXI1_4
+    {SPR_FX16, 32778, 5, NULL, S_SOR2FXI1_6, 0, 0},     // S_SOR2FXI1_5
+    {SPR_FX16, 32779, 5, NULL, S_NULL, 0, 0},   // S_SOR2FXI1_6
+    {SPR_FX16, 32771, 12, NULL, S_SOR2FXSPARK2, 0, 0},  // S_SOR2FXSPARK1
+    {SPR_FX16, 32772, 12, NULL, S_SOR2FXSPARK3, 0, 0},  // S_SOR2FXSPARK2
+    {SPR_FX16, 32773, 12, NULL, S_NULL, 0, 0},  // S_SOR2FXSPARK3
+    {SPR_FX11, 32768, 35, NULL, S_SOR2FX2_2, 0, 0},     // S_SOR2FX2_1
+    {SPR_FX11, 32768, 5, A_GenWizard, S_SOR2FX2_3, 0, 0},       // S_SOR2FX2_2
+    {SPR_FX11, 32769, 5, NULL, S_SOR2FX2_2, 0, 0},      // S_SOR2FX2_3
+    {SPR_FX11, 32770, 5, NULL, S_SOR2FXI2_2, 0, 0},     // S_SOR2FXI2_1
+    {SPR_FX11, 32771, 5, NULL, S_SOR2FXI2_3, 0, 0},     // S_SOR2FXI2_2
+    {SPR_FX11, 32772, 5, NULL, S_SOR2FXI2_4, 0, 0},     // S_SOR2FXI2_3
+    {SPR_FX11, 32773, 5, NULL, S_SOR2FXI2_5, 0, 0},     // S_SOR2FXI2_4
+    {SPR_FX11, 32774, 5, NULL, S_NULL, 0, 0},   // S_SOR2FXI2_5
+    {SPR_SOR2, 6, 8, NULL, S_SOR2TELEFADE2, 0, 0},      // S_SOR2TELEFADE1
+    {SPR_SOR2, 7, 6, NULL, S_SOR2TELEFADE3, 0, 0},      // S_SOR2TELEFADE2
+    {SPR_SOR2, 8, 6, NULL, S_SOR2TELEFADE4, 0, 0},      // S_SOR2TELEFADE3
+    {SPR_SOR2, 9, 6, NULL, S_SOR2TELEFADE5, 0, 0},      // S_SOR2TELEFADE4
+    {SPR_SOR2, 10, 6, NULL, S_SOR2TELEFADE6, 0, 0},     // S_SOR2TELEFADE5
+    {SPR_SOR2, 11, 6, NULL, S_NULL, 0, 0},      // S_SOR2TELEFADE6
+    {SPR_MNTR, 0, 10, A_Look, S_MNTR_LOOK2, 0, 0},      // S_MNTR_LOOK1
+    {SPR_MNTR, 1, 10, A_Look, S_MNTR_LOOK1, 0, 0},      // S_MNTR_LOOK2
+    {SPR_MNTR, 0, 5, A_Chase, S_MNTR_WALK2, 0, 0},      // S_MNTR_WALK1
+    {SPR_MNTR, 1, 5, A_Chase, S_MNTR_WALK3, 0, 0},      // S_MNTR_WALK2
+    {SPR_MNTR, 2, 5, A_Chase, S_MNTR_WALK4, 0, 0},      // S_MNTR_WALK3
+    {SPR_MNTR, 3, 5, A_Chase, S_MNTR_WALK1, 0, 0},      // S_MNTR_WALK4
+    {SPR_MNTR, 21, 10, A_FaceTarget, S_MNTR_ATK1_2, 0, 0},      // S_MNTR_ATK1_1
+    {SPR_MNTR, 22, 7, A_FaceTarget, S_MNTR_ATK1_3, 0, 0},       // S_MNTR_ATK1_2
+    {SPR_MNTR, 23, 12, A_MinotaurAtk1, S_MNTR_WALK1, 0, 0},     // S_MNTR_ATK1_3
+    {SPR_MNTR, 21, 10, A_MinotaurDecide, S_MNTR_ATK2_2, 0, 0},  // S_MNTR_ATK2_1
+    {SPR_MNTR, 24, 4, A_FaceTarget, S_MNTR_ATK2_3, 0, 0},       // S_MNTR_ATK2_2
+    {SPR_MNTR, 25, 9, A_MinotaurAtk2, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK2_3
+    {SPR_MNTR, 21, 10, A_FaceTarget, S_MNTR_ATK3_2, 0, 0},      // S_MNTR_ATK3_1
+    {SPR_MNTR, 22, 7, A_FaceTarget, S_MNTR_ATK3_3, 0, 0},       // S_MNTR_ATK3_2
+    {SPR_MNTR, 23, 12, A_MinotaurAtk3, S_MNTR_WALK1, 0, 0},     // S_MNTR_ATK3_3
+    {SPR_MNTR, 23, 12, NULL, S_MNTR_ATK3_1, 0, 0},      // S_MNTR_ATK3_4
+    {SPR_MNTR, 20, 2, A_MinotaurCharge, S_MNTR_ATK4_1, 0, 0},   // S_MNTR_ATK4_1
+    {SPR_MNTR, 4, 3, NULL, S_MNTR_PAIN2, 0, 0}, // S_MNTR_PAIN1
+    {SPR_MNTR, 4, 6, A_Pain, S_MNTR_WALK1, 0, 0},       // S_MNTR_PAIN2
+    {SPR_MNTR, 5, 6, NULL, S_MNTR_DIE2, 0, 0},  // S_MNTR_DIE1
+    {SPR_MNTR, 6, 5, NULL, S_MNTR_DIE3, 0, 0},  // S_MNTR_DIE2
+    {SPR_MNTR, 7, 6, A_Scream, S_MNTR_DIE4, 0, 0},      // S_MNTR_DIE3
+    {SPR_MNTR, 8, 5, NULL, S_MNTR_DIE5, 0, 0},  // S_MNTR_DIE4
+    {SPR_MNTR, 9, 6, NULL, S_MNTR_DIE6, 0, 0},  // S_MNTR_DIE5
+    {SPR_MNTR, 10, 5, NULL, S_MNTR_DIE7, 0, 0}, // S_MNTR_DIE6
+    {SPR_MNTR, 11, 6, NULL, S_MNTR_DIE8, 0, 0}, // S_MNTR_DIE7
+    {SPR_MNTR, 12, 5, A_NoBlocking, S_MNTR_DIE9, 0, 0}, // S_MNTR_DIE8
+    {SPR_MNTR, 13, 6, NULL, S_MNTR_DIE10, 0, 0},        // S_MNTR_DIE9
+    {SPR_MNTR, 14, 5, NULL, S_MNTR_DIE11, 0, 0},        // S_MNTR_DIE10
+    {SPR_MNTR, 15, 6, NULL, S_MNTR_DIE12, 0, 0},        // S_MNTR_DIE11
+    {SPR_MNTR, 16, 5, NULL, S_MNTR_DIE13, 0, 0},        // S_MNTR_DIE12
+    {SPR_MNTR, 17, 6, NULL, S_MNTR_DIE14, 0, 0},        // S_MNTR_DIE13
+    {SPR_MNTR, 18, 5, NULL, S_MNTR_DIE15, 0, 0},        // S_MNTR_DIE14
+    {SPR_MNTR, 19, -1, A_BossDeath, S_NULL, 0, 0},      // S_MNTR_DIE15
+    {SPR_FX12, 32768, 6, NULL, S_MNTRFX1_2, 0, 0},      // S_MNTRFX1_1
+    {SPR_FX12, 32769, 6, NULL, S_MNTRFX1_1, 0, 0},      // S_MNTRFX1_2
+    {SPR_FX12, 32770, 5, NULL, S_MNTRFXI1_2, 0, 0},     // S_MNTRFXI1_1
+    {SPR_FX12, 32771, 5, NULL, S_MNTRFXI1_3, 0, 0},     // S_MNTRFXI1_2
+    {SPR_FX12, 32772, 5, NULL, S_MNTRFXI1_4, 0, 0},     // S_MNTRFXI1_3
+    {SPR_FX12, 32773, 5, NULL, S_MNTRFXI1_5, 0, 0},     // S_MNTRFXI1_4
+    {SPR_FX12, 32774, 5, NULL, S_MNTRFXI1_6, 0, 0},     // S_MNTRFXI1_5
+    {SPR_FX12, 32775, 5, NULL, S_NULL, 0, 0},   // S_MNTRFXI1_6
+    {SPR_FX13, 0, 2, A_MntrFloorFire, S_MNTRFX2_1, 0, 0},       // S_MNTRFX2_1
+    {SPR_FX13, 32776, 4, A_Explode, S_MNTRFXI2_2, 0, 0},        // S_MNTRFXI2_1
+    {SPR_FX13, 32777, 4, NULL, S_MNTRFXI2_3, 0, 0},     // S_MNTRFXI2_2
+    {SPR_FX13, 32778, 4, NULL, S_MNTRFXI2_4, 0, 0},     // S_MNTRFXI2_3
+    {SPR_FX13, 32779, 4, NULL, S_MNTRFXI2_5, 0, 0},     // S_MNTRFXI2_4
+    {SPR_FX13, 32780, 4, NULL, S_NULL, 0, 0},   // S_MNTRFXI2_5
+    {SPR_FX13, 32771, 4, NULL, S_MNTRFX3_2, 0, 0},      // S_MNTRFX3_1
+    {SPR_FX13, 32770, 4, NULL, S_MNTRFX3_3, 0, 0},      // S_MNTRFX3_2
+    {SPR_FX13, 32769, 5, NULL, S_MNTRFX3_4, 0, 0},      // S_MNTRFX3_3
+    {SPR_FX13, 32770, 5, NULL, S_MNTRFX3_5, 0, 0},      // S_MNTRFX3_4
+    {SPR_FX13, 32771, 5, NULL, S_MNTRFX3_6, 0, 0},      // S_MNTRFX3_5
+    {SPR_FX13, 32772, 5, NULL, S_MNTRFX3_7, 0, 0},      // S_MNTRFX3_6
+    {SPR_FX13, 32773, 4, NULL, S_MNTRFX3_8, 0, 0},      // S_MNTRFX3_7
+    {SPR_FX13, 32774, 4, NULL, S_MNTRFX3_9, 0, 0},      // S_MNTRFX3_8
+    {SPR_FX13, 32775, 4, NULL, S_NULL, 0, 0},   // S_MNTRFX3_9
+    {SPR_AKYY, 32768, 3, NULL, S_AKYY2, 0, 0},  // S_AKYY1
+    {SPR_AKYY, 32769, 3, NULL, S_AKYY3, 0, 0},  // S_AKYY2
+    {SPR_AKYY, 32770, 3, NULL, S_AKYY4, 0, 0},  // S_AKYY3
+    {SPR_AKYY, 32771, 3, NULL, S_AKYY5, 0, 0},  // S_AKYY4
+    {SPR_AKYY, 32772, 3, NULL, S_AKYY6, 0, 0},  // S_AKYY5
+    {SPR_AKYY, 32773, 3, NULL, S_AKYY7, 0, 0},  // S_AKYY6
+    {SPR_AKYY, 32774, 3, NULL, S_AKYY8, 0, 0},  // S_AKYY7
+    {SPR_AKYY, 32775, 3, NULL, S_AKYY9, 0, 0},  // S_AKYY8
+    {SPR_AKYY, 32776, 3, NULL, S_AKYY10, 0, 0}, // S_AKYY9
+    {SPR_AKYY, 32777, 3, NULL, S_AKYY1, 0, 0},  // S_AKYY10
+    {SPR_BKYY, 32768, 3, NULL, S_BKYY2, 0, 0},  // S_BKYY1
+    {SPR_BKYY, 32769, 3, NULL, S_BKYY3, 0, 0},  // S_BKYY2
+    {SPR_BKYY, 32770, 3, NULL, S_BKYY4, 0, 0},  // S_BKYY3
+    {SPR_BKYY, 32771, 3, NULL, S_BKYY5, 0, 0},  // S_BKYY4
+    {SPR_BKYY, 32772, 3, NULL, S_BKYY6, 0, 0},  // S_BKYY5
+    {SPR_BKYY, 32773, 3, NULL, S_BKYY7, 0, 0},  // S_BKYY6
+    {SPR_BKYY, 32774, 3, NULL, S_BKYY8, 0, 0},  // S_BKYY7
+    {SPR_BKYY, 32775, 3, NULL, S_BKYY9, 0, 0},  // S_BKYY8
+    {SPR_BKYY, 32776, 3, NULL, S_BKYY10, 0, 0}, // S_BKYY9
+    {SPR_BKYY, 32777, 3, NULL, S_BKYY1, 0, 0},  // S_BKYY10
+    {SPR_CKYY, 32768, 3, NULL, S_CKYY2, 0, 0},  // S_CKYY1
+    {SPR_CKYY, 32769, 3, NULL, S_CKYY3, 0, 0},  // S_CKYY2
+    {SPR_CKYY, 32770, 3, NULL, S_CKYY4, 0, 0},  // S_CKYY3
+    {SPR_CKYY, 32771, 3, NULL, S_CKYY5, 0, 0},  // S_CKYY4
+    {SPR_CKYY, 32772, 3, NULL, S_CKYY6, 0, 0},  // S_CKYY5
+    {SPR_CKYY, 32773, 3, NULL, S_CKYY7, 0, 0},  // S_CKYY6
+    {SPR_CKYY, 32774, 3, NULL, S_CKYY8, 0, 0},  // S_CKYY7
+    {SPR_CKYY, 32775, 3, NULL, S_CKYY9, 0, 0},  // S_CKYY8
+    {SPR_CKYY, 32776, 3, NULL, S_CKYY1, 0, 0},  // S_CKYY9
+    {SPR_AMG1, 0, -1, NULL, S_NULL, 0, 0},      // S_AMG1
+    {SPR_AMG2, 0, 4, NULL, S_AMG2_2, 0, 0},     // S_AMG2_1
+    {SPR_AMG2, 1, 4, NULL, S_AMG2_3, 0, 0},     // S_AMG2_2
+    {SPR_AMG2, 2, 4, NULL, S_AMG2_1, 0, 0},     // S_AMG2_3
+    {SPR_AMM1, 0, -1, NULL, S_NULL, 0, 0},      // S_AMM1
+    {SPR_AMM2, 0, -1, NULL, S_NULL, 0, 0},      // S_AMM2
+    {SPR_AMC1, 0, -1, NULL, S_NULL, 0, 0},      // S_AMC1
+    {SPR_AMC2, 0, 5, NULL, S_AMC2_2, 0, 0},     // S_AMC2_1
+    {SPR_AMC2, 1, 5, NULL, S_AMC2_3, 0, 0},     // S_AMC2_2
+    {SPR_AMC2, 2, 5, NULL, S_AMC2_1, 0, 0},     // S_AMC2_3
+    {SPR_AMS1, 0, 5, NULL, S_AMS1_2, 0, 0},     // S_AMS1_1
+    {SPR_AMS1, 1, 5, NULL, S_AMS1_1, 0, 0},     // S_AMS1_2
+    {SPR_AMS2, 0, 5, NULL, S_AMS2_2, 0, 0},     // S_AMS2_1
+    {SPR_AMS2, 1, 5, NULL, S_AMS2_1, 0, 0},     // S_AMS2_2
+    {SPR_AMP1, 0, 4, NULL, S_AMP1_2, 0, 0},     // S_AMP1_1
+    {SPR_AMP1, 1, 4, NULL, S_AMP1_3, 0, 0},     // S_AMP1_2
+    {SPR_AMP1, 2, 4, NULL, S_AMP1_1, 0, 0},     // S_AMP1_3
+    {SPR_AMP2, 0, 4, NULL, S_AMP2_2, 0, 0},     // S_AMP2_1
+    {SPR_AMP2, 1, 4, NULL, S_AMP2_3, 0, 0},     // S_AMP2_2
+    {SPR_AMP2, 2, 4, NULL, S_AMP2_1, 0, 0},     // S_AMP2_3
+    {SPR_AMB1, 0, 4, NULL, S_AMB1_2, 0, 0},     // S_AMB1_1
+    {SPR_AMB1, 1, 4, NULL, S_AMB1_3, 0, 0},     // S_AMB1_2
+    {SPR_AMB1, 2, 4, NULL, S_AMB1_1, 0, 0},     // S_AMB1_3
+    {SPR_AMB2, 0, 4, NULL, S_AMB2_2, 0, 0},     // S_AMB2_1
+    {SPR_AMB2, 1, 4, NULL, S_AMB2_3, 0, 0},     // S_AMB2_2
+    {SPR_AMB2, 2, 4, NULL, S_AMB2_1, 0, 0},     // S_AMB2_3
+    {SPR_AMG1, 0, 100, A_ESound, S_SND_WIND, 0, 0},     // S_SND_WIND
+    {SPR_AMG1, 0, 85, A_ESound, S_SND_WATERFALL, 0, 0}  // S_SND_WATERFALL
+};
+
+
+mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
+
+    {                           // MT_MISC0
+     81,                        // doomednum
+     S_ITEM_PTN1_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ITEMSHIELD1
+     85,                        // doomednum
+     S_ITEM_SHLD1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ITEMSHIELD2
+     31,                        // doomednum
+     S_ITEM_SHD2_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MISC1
+     8,                         // doomednum
+     S_ITEM_BAGH1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MISC2
+     35,                        // doomednum
+     S_ITEM_SPMP1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIINVISIBILITY
+     75,                        // doomednum
+     S_ARTI_INVS1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_SHADOW | MF_COUNTITEM,     // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MISC3
+     82,                        // doomednum
+     S_ARTI_PTN2_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIFLY
+     83,                        // doomednum
+     S_ARTI_SOAR1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIINVULNERABILITY
+     84,                        // doomednum
+     S_ARTI_INVU1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTITOMEOFPOWER
+     86,                        // doomednum
+     S_ARTI_PWBK1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIEGG
+     30,                        // doomednum
+     S_ARTI_EGGC1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_EGGFX
+     -1,                        // doomednum
+     S_EGGFX1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_EGGFXI1_1,               // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     18 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ARTISUPERHEAL
+     32,                        // doomednum
+     S_ARTI_SPHL1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MISC4
+     33,                        // doomednum
+     S_ARTI_TRCH1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MISC5
+     34,                        // doomednum
+     S_ARTI_FBMB1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_FIREBOMB
+     -1,                        // doomednum
+     S_FIREBOMB1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_phohit,                // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTITELEPORT
+     36,                        // doomednum
+     S_ARTI_ATLP1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_COUNTITEM, // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_POD
+     2035,                      // doomednum
+     S_POD_WAIT1,               // spawnstate
+     45,                        // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_POD_PAIN1,               // painstate
+     255,                       // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_POD_DIE1,                // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_podexp,                // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     54 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_NOBLOOD | MF_SHOOTABLE | MF_DROPOFF, // flags
+     MF2_WINDTHRUST | MF2_PUSHABLE | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP   // flags2
+     },
+
+    {                           // MT_PODGOO
+     -1,                        // doomednum
+     S_PODGOO1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_PODGOOX,                 // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
+     },
+
+    {                           // MT_PODGENERATOR
+     43,                        // doomednum
+     S_PODGENERATOR,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SPLASH
+     -1,                        // doomednum
+     S_SPLASH1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SPLASHX,                 // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
+     },
+
+    {                           // MT_SPLASHBASE
+     -1,                        // doomednum
+     S_SPLASHBASE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_LAVASPLASH
+     -1,                        // doomednum
+     S_LAVASPLASH1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_LAVASMOKE
+     -1,                        // doomednum
+     S_LAVASMOKE1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SLUDGECHUNK
+     -1,                        // doomednum
+     S_SLUDGECHUNK1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SLUDGECHUNKX,            // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
+     },
+
+    {                           // MT_SLUDGESPLASH
+     -1,                        // doomednum
+     S_SLUDGESPLASH1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SKULLHANG70
+     17,                        // doomednum
+     S_SKULLHANG70_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     70 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SKULLHANG60
+     24,                        // doomednum
+     S_SKULLHANG60_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     60 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SKULLHANG45
+     25,                        // doomednum
+     S_SKULLHANG45_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     45 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SKULLHANG35
+     26,                        // doomednum
+     S_SKULLHANG35_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     35 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CHANDELIER
+     28,                        // doomednum
+     S_CHANDELIER1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     60 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SERPTORCH
+     27,                        // doomednum
+     S_SERPTORCH1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     54 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SMALLPILLAR
+     29,                        // doomednum
+     S_SMALLPILLAR,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     34 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_STALAGMITESMALL
+     37,                        // doomednum
+     S_STALAGMITESMALL,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_STALAGMITELARGE
+     38,                        // doomednum
+     S_STALAGMITELARGE,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_STALACTITESMALL
+     39,                        // doomednum
+     S_STALACTITESMALL,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     36 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_STALACTITELARGE
+     40,                        // doomednum
+     S_STALACTITELARGE,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     68 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC6
+     76,                        // doomednum
+     S_FIREBRAZIER1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     44 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BARREL
+     44,                        // doomednum
+     S_BARREL,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC7
+     47,                        // doomednum
+     S_BRPILLAR,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     128 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC8
+     48,                        // doomednum
+     S_MOSS1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     23 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC9
+     49,                        // doomednum
+     S_MOSS2,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     27 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC10
+     50,                        // doomednum
+     S_WALLTORCH1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOGRAVITY,              // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC11
+     51,                        // doomednum
+     S_HANGINGCORPSE,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     104 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEYGIZMOBLUE
+     94,                        // doomednum
+     S_KEYGIZMO1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEYGIZMOGREEN
+     95,                        // doomednum
+     S_KEYGIZMO1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEYGIZMOYELLOW
+     96,                        // doomednum
+     S_KEYGIZMO1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEYGIZMOFLOAT
+     -1,                        // doomednum
+     S_KGZ_START,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_NOGRAVITY,   // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC12
+     87,                        // doomednum
+     S_VOLCANO1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_VOLCANOBLAST
+     -1,                        // doomednum
+     S_VOLCANOBALL1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_VOLCANOBALLX1,           // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_volhit,                // deathsound
+     2 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_LOGRAV | MF2_NOTELEPORT | MF2_FIREDAMAGE       // flags2
+     },
+
+    {                           // MT_VOLCANOTBLAST
+     -1,                        // doomednum
+     S_VOLCANOTBALL1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_VOLCANOTBALLX1,          // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     2 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_LOGRAV | MF2_NOTELEPORT | MF2_FIREDAMAGE       // flags2
+     },
+
+    {                           // MT_TELEGLITGEN
+     74,                        // doomednum
+     S_TELEGLITGEN1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_NOSECTOR,        // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TELEGLITGEN2
+     52,                        // doomednum
+     S_TELEGLITGEN2,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_NOSECTOR,        // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TELEGLITTER
+     -1,                        // doomednum
+     S_TELEGLITTER1_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TELEGLITTER2
+     -1,                        // doomednum
+     S_TELEGLITTER2_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TFOG
+     -1,                        // doomednum
+     S_TFOG1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TELEPORTMAN
+     14,                        // doomednum
+     S_NULL,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_STAFFPUFF
+     -1,                        // doomednum
+     S_STAFFPUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_stfhit,                // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_STAFFPUFF2
+     -1,                        // doomednum
+     S_STAFFPUFF2_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_stfpow,                // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BEAKPUFF
+     -1,                        // doomednum
+     S_STAFFPUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_chicatk,               // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC13
+     2005,                      // doomednum
+     S_WGNT,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_GAUNTLETPUFF1
+     -1,                        // doomednum
+     S_GAUNTLETPUFF1_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_GAUNTLETPUFF2
+     -1,                        // doomednum
+     S_GAUNTLETPUFF2_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC14
+     53,                        // doomednum
+     S_BLSR,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BLASTERFX1
+     -1,                        // doomednum
+     S_BLASTERFX1_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BLASTERFXI1_1,           // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_blshit,                // deathsound
+     184 * FRACUNIT,            // speed
+     12 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_BLASTERSMOKE
+     -1,                        // doomednum
+     S_BLASTERSMOKE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
+     },
+
+    {                           // MT_RIPPER
+     -1,                        // doomednum
+     S_RIPPER1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_RIPPERX1,                // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     14 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_RIP   // flags2
+     },
+
+    {                           // MT_BLASTERPUFF1
+     -1,                        // doomednum
+     S_BLASTERPUFF1_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BLASTERPUFF2
+     -1,                        // doomednum
+     S_BLASTERPUFF2_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_WMACE
+     2002,                      // doomednum
+     S_WMCE,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MACEFX1
+     -1,                        // doomednum
+     S_MACEFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_lobsht,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MACEFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     20 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_NOTELEPORT   // flags2
+     },
+
+    {                           // MT_MACEFX2
+     -1,                        // doomednum
+     S_MACEFX2_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MACEFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     6,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_LOGRAV | MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_NOTELEPORT      // flags2
+     },
+
+    {                           // MT_MACEFX3
+     -1,                        // doomednum
+     S_MACEFX3_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MACEFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     7 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     4,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_LOGRAV | MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_NOTELEPORT      // flags2
+     },
+
+    {                           // MT_MACEFX4
+     -1,                        // doomednum
+     S_MACEFX4_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MACEFXI4_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     7 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     18,                        // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_LOGRAV | MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_TELESTOMP       // flags2
+     },
+
+    {                           // MT_WSKULLROD
+     2004,                      // doomednum
+     S_WSKL,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_HORNRODFX1
+     -1,                        // doomednum
+     S_HRODFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_hrnsht,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HRODFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     22 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
+     },
+
+    {                           // MT_HORNRODFX2
+     -1,                        // doomednum
+     S_HRODFX2_1,               // spawnstate
+     4 * 35,                    // spawnhealth
+     S_NULL,                    // seestate
+     sfx_hrnsht,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HRODFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_ramphit,               // deathsound
+     22 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     10,                        // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_RAINPLR1
+     -1,                        // doomednum
+     S_RAINPLR1_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_RAINPLR1X_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     12 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     5,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_RAINPLR2
+     -1,                        // doomednum
+     S_RAINPLR2_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_RAINPLR2X_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     12 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     5,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_RAINPLR3
+     -1,                        // doomednum
+     S_RAINPLR3_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_RAINPLR3X_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     12 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     5,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_RAINPLR4
+     -1,                        // doomednum
+     S_RAINPLR4_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_RAINPLR4X_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     12 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     5,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_GOLDWANDFX1
+     -1,                        // doomednum
+     S_GWANDFX1_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_GWANDFXI1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_gldhit,                // deathsound
+     22 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_GOLDWANDFX2
+     -1,                        // doomednum
+     S_GWANDFX2_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_GWANDFXI1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     18 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_GOLDWANDPUFF1
+     -1,                        // doomednum
+     S_GWANDPUFF1_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_GOLDWANDPUFF2
+     -1,                        // doomednum
+     S_GWANDFXI1_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_WPHOENIXROD
+     2003,                      // doomednum
+     S_WPHX,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_PHOENIXFX1
+     -1,                        // doomednum
+     S_PHOENIXFX1_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_phosht,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_PHOENIXFXI1_1,           // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_phohit,                // deathsound
+     20 * FRACUNIT,             // speed
+     11 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     20,                        // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_THRUGHOST | MF2_NOTELEPORT     // flags2
+     },
+
+    // The following thing is present in the mobjinfo table from Heretic 1.0,
+    // but not in Heretic 1.3 (ie. it was removed).  It has been re-inserted
+    // here to support HHE patches.
+
+    {                           // MT_PHOENIXFX_REMOVED
+     -1,                        // doomednum
+     S_PHOENIXFXIX_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_PHOENIXFXIX_3,           // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT     // flags2
+     },
+
+    {                           // MT_PHOENIXPUFF
+     -1,                        // doomednum
+     S_PHOENIXPUFF1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
+     },
+
+    {                           // MT_PHOENIXFX2
+     -1,                        // doomednum
+     S_PHOENIXFX2_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_PHOENIXFXI2_1,           // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     6 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_MISC15
+     2001,                      // doomednum
+     S_WBOW,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CRBOWFX1
+     -1,                        // doomednum
+     S_CRBOWFX1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_bowsht,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CRBOWFXI1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     30 * FRACUNIT,             // speed
+     11 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     10,                        // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_CRBOWFX2
+     -1,                        // doomednum
+     S_CRBOWFX2,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_bowsht,                // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CRBOWFXI1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     32 * FRACUNIT,             // speed
+     11 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     6,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_CRBOWFX3
+     -1,                        // doomednum
+     S_CRBOWFX3,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CRBOWFXI3_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     20 * FRACUNIT,             // speed
+     11 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_THRUGHOST | MF2_NOTELEPORT    // flags2
+     },
+
+    {                           // MT_CRBOWFX4
+     -1,                        // doomednum
+     S_CRBOWFX4_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     MF2_LOGRAV                 // flags2
+     },
+
+    {                           // MT_BLOOD
+     -1,                        // doomednum
+     S_BLOOD1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BLOODSPLATTER
+     -1,                        // doomednum
+     S_BLOODSPLATTER1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BLOODSPLATTERX,          // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
+     },
+
+    {                           // MT_PLAYER
+     -1,                        // doomednum
+     S_PLAY,                    // spawnstate
+     100,                       // spawnhealth
+     S_PLAY_RUN1,               // seestate
+     sfx_None,                  // seesound
+     0,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_PLAY_PAIN,               // painstate
+     255,                       // painchance
+     sfx_plrpai,                // painsound
+     S_NULL,                    // meleestate
+     S_PLAY_ATK1,               // missilestate
+     S_NULL,                    // crashstate
+     S_PLAY_DIE1,               // deathstate
+     S_PLAY_XDIE1,              // xdeathstate
+     sfx_plrdth,                // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     56 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
+     MF2_WINDTHRUST | MF2_FOOTCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP   // flags2
+     },
+
+    {                           // MT_BLOODYSKULL
+     -1,                        // doomednum
+     S_BLOODYSKULL1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
+     MF2_LOGRAV | MF2_CANNOTPUSH        // flags2
+     },
+
+    {                           // MT_CHICPLAYER
+     -1,                        // doomednum
+     S_CHICPLAY,                // spawnstate
+     100,                       // spawnhealth
+     S_CHICPLAY_RUN1,           // seestate
+     sfx_None,                  // seesound
+     0,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_CHICPLAY_PAIN,           // painstate
+     255,                       // painchance
+     sfx_chicpai,               // painsound
+     S_NULL,                    // meleestate
+     S_CHICPLAY_ATK1,           // missilestate
+     S_NULL,                    // crashstate
+     S_CHICKEN_DIE1,            // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_chicdth,               // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     24 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_NOTDMATCH,       // flags
+     MF2_WINDTHRUST | MF2_SLIDE | MF2_PASSMOBJ | MF2_FOOTCLIP | MF2_LOGRAV | MF2_TELESTOMP      // flags2
+     },
+
+    {                           // MT_CHICKEN
+     -1,                        // doomednum
+     S_CHICKEN_LOOK1,           // spawnstate
+     10,                        // spawnhealth
+     S_CHICKEN_WALK1,           // seestate
+     sfx_chicpai,               // seesound
+     8,                         // reactiontime
+     sfx_chicatk,               // attacksound
+     S_CHICKEN_PAIN1,           // painstate
+     200,                       // painchance
+     sfx_chicpai,               // painsound
+     S_CHICKEN_ATK1,            // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_CHICKEN_DIE1,            // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_chicdth,               // deathsound
+     4,                         // speed
+     9 * FRACUNIT,              // radius
+     22 * FRACUNIT,             // height
+     40,                        // mass
+     0,                         // damage
+     sfx_chicact,               // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF,       // flags
+     MF2_WINDTHRUST | MF2_FOOTCLIP | MF2_PASSMOBJ       // flags2
+     },
+
+    {                           // MT_FEATHER
+     -1,                        // doomednum
+     S_FEATHER1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FEATHERX,                // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH | MF2_WINDTHRUST      // flags2
+     },
+
+    {                           // MT_MUMMY
+     68,                        // doomednum
+     S_MUMMY_LOOK1,             // spawnstate
+     80,                        // spawnhealth
+     S_MUMMY_WALK1,             // seestate
+     sfx_mumsit,                // seesound
+     8,                         // reactiontime
+     sfx_mumat1,                // attacksound
+     S_MUMMY_PAIN1,             // painstate
+     128,                       // painchance
+     sfx_mumpai,                // painsound
+     S_MUMMY_ATK1,              // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_MUMMY_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_mumdth,                // deathsound
+     12,                        // speed
+     22 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     75,                        // mass
+     0,                         // damage
+     sfx_mumact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_MUMMYLEADER
+     45,                        // doomednum
+     S_MUMMY_LOOK1,             // spawnstate
+     100,                       // spawnhealth
+     S_MUMMY_WALK1,             // seestate
+     sfx_mumsit,                // seesound
+     8,                         // reactiontime
+     sfx_mumat1,                // attacksound
+     S_MUMMY_PAIN1,             // painstate
+     64,                        // painchance
+     sfx_mumpai,                // painsound
+     S_MUMMY_ATK1,              // meleestate
+     S_MUMMYL_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_MUMMY_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_mumdth,                // deathsound
+     12,                        // speed
+     22 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     75,                        // mass
+     0,                         // damage
+     sfx_mumact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_MUMMYGHOST
+     69,                        // doomednum
+     S_MUMMY_LOOK1,             // spawnstate
+     80,                        // spawnhealth
+     S_MUMMY_WALK1,             // seestate
+     sfx_mumsit,                // seesound
+     8,                         // reactiontime
+     sfx_mumat1,                // attacksound
+     S_MUMMY_PAIN1,             // painstate
+     128,                       // painchance
+     sfx_mumpai,                // painsound
+     S_MUMMY_ATK1,              // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_MUMMY_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_mumdth,                // deathsound
+     12,                        // speed
+     22 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     75,                        // mass
+     0,                         // damage
+     sfx_mumact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_MUMMYLEADERGHOST
+     46,                        // doomednum
+     S_MUMMY_LOOK1,             // spawnstate
+     100,                       // spawnhealth
+     S_MUMMY_WALK1,             // seestate
+     sfx_mumsit,                // seesound
+     8,                         // reactiontime
+     sfx_mumat1,                // attacksound
+     S_MUMMY_PAIN1,             // painstate
+     64,                        // painchance
+     sfx_mumpai,                // painsound
+     S_MUMMY_ATK1,              // meleestate
+     S_MUMMYL_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_MUMMY_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_mumdth,                // deathsound
+     12,                        // speed
+     22 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     75,                        // mass
+     0,                         // damage
+     sfx_mumact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_MUMMYSOUL
+     -1,                        // doomednum
+     S_MUMMY_SOUL1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MUMMYFX1
+     -1,                        // doomednum
+     S_MUMMYFX1_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MUMMYFXI1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     9 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     14 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_BEAST
+     70,                        // doomednum
+     S_BEAST_LOOK1,             // spawnstate
+     220,                       // spawnhealth
+     S_BEAST_WALK1,             // seestate
+     sfx_bstsit,                // seesound
+     8,                         // reactiontime
+     sfx_bstatk,                // attacksound
+     S_BEAST_PAIN1,             // painstate
+     100,                       // painchance
+     sfx_bstpai,                // painsound
+     0,                         // meleestate
+     S_BEAST_ATK1,              // missilestate
+     S_NULL,                    // crashstate
+     S_BEAST_DIE1,              // deathstate
+     S_BEAST_XDIE1,             // xdeathstate
+     sfx_bstdth,                // deathsound
+     14,                        // speed
+     32 * FRACUNIT,             // radius
+     74 * FRACUNIT,             // height
+     200,                       // mass
+     0,                         // damage
+     sfx_bstact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_BEASTBALL
+     -1,                        // doomednum
+     S_BEASTBALL1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BEASTBALLX1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     12 * FRACUNIT,             // speed
+     9 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     4,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
+     },
+
+    {                           // MT_BURNBALL
+     -1,                        // doomednum
+     S_BURNBALL1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BEASTBALLX1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     6 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_BURNBALLFB
+     -1,                        // doomednum
+     S_BURNBALLFB1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BEASTBALLX1,             // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     6 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_PUFFY
+     -1,                        // doomednum
+     S_PUFFY1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_PUFFY1,                  // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     6 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SNAKE
+     92,                        // doomednum
+     S_SNAKE_LOOK1,             // spawnstate
+     280,                       // spawnhealth
+     S_SNAKE_WALK1,             // seestate
+     sfx_snksit,                // seesound
+     8,                         // reactiontime
+     sfx_snkatk,                // attacksound
+     S_SNAKE_PAIN1,             // painstate
+     48,                        // painchance
+     sfx_snkpai,                // painsound
+     0,                         // meleestate
+     S_SNAKE_ATK1,              // missilestate
+     S_NULL,                    // crashstate
+     S_SNAKE_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_snkdth,                // deathsound
+     10,                        // speed
+     22 * FRACUNIT,             // radius
+     70 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_snkact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_SNAKEPRO_A
+     -1,                        // doomednum
+     S_SNAKEPRO_A1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SNAKEPRO_AX1,            // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     14 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
+     },
+
+    {                           // MT_SNAKEPRO_B
+     -1,                        // doomednum
+     S_SNAKEPRO_B1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SNAKEPRO_BX1,            // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     14 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_HEAD
+     6,                         // doomednum
+     S_HEAD_LOOK,               // spawnstate
+     700,                       // spawnhealth
+     S_HEAD_FLOAT,              // seestate
+     sfx_hedsit,                // seesound
+     8,                         // reactiontime
+     sfx_hedat1,                // attacksound
+     S_HEAD_PAIN1,              // painstate
+     32,                        // painchance
+     sfx_hedpai,                // painsound
+     0,                         // meleestate
+     S_HEAD_ATK1,               // missilestate
+     S_NULL,                    // crashstate
+     S_HEAD_DIE1,               // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_heddth,                // deathsound
+     6,                         // speed
+     40 * FRACUNIT,             // radius
+     72 * FRACUNIT,             // height
+     325,                       // mass
+     0,                         // damage
+     sfx_hedact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
+     MF2_PASSMOBJ               // flags2
+     },
+
+    {                           // MT_HEADFX1
+     -1,                        // doomednum
+     S_HEADFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HEADFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     13 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_THRUGHOST     // flags2
+     },
+
+    {                           // MT_HEADFX2
+     -1,                        // doomednum
+     S_HEADFX2_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HEADFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     8 * FRACUNIT,              // speed
+     12 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_HEADFX3
+     -1,                        // doomednum
+     S_HEADFX3_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HEADFXI3_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     14 * FRACUNIT,             // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     5,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
+     },
+
+    {                           // MT_WHIRLWIND
+     -1,                        // doomednum
+     S_HEADFX4_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HEADFXI4_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     74 * FRACUNIT,             // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_SHADOW,        // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_CLINK
+     90,                        // doomednum
+     S_CLINK_LOOK1,             // spawnstate
+     150,                       // spawnhealth
+     S_CLINK_WALK1,             // seestate
+     sfx_clksit,                // seesound
+     8,                         // reactiontime
+     sfx_clkatk,                // attacksound
+     S_CLINK_PAIN1,             // painstate
+     32,                        // painchance
+     sfx_clkpai,                // painsound
+     S_CLINK_ATK1,              // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_CLINK_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_clkdth,                // deathsound
+     14,                        // speed
+     20 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     75,                        // mass
+     0,                         // damage
+     sfx_clkact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_WIZARD
+     15,                        // doomednum
+     S_WIZARD_LOOK1,            // spawnstate
+     180,                       // spawnhealth
+     S_WIZARD_WALK1,            // seestate
+     sfx_wizsit,                // seesound
+     8,                         // reactiontime
+     sfx_wizatk,                // attacksound
+     S_WIZARD_PAIN1,            // painstate
+     64,                        // painchance
+     sfx_wizpai,                // painsound
+     0,                         // meleestate
+     S_WIZARD_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_WIZARD_DIE1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_wizdth,                // deathsound
+     12,                        // speed
+     16 * FRACUNIT,             // radius
+     68 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_wizact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_FLOAT | MF_NOGRAVITY,  // flags
+     MF2_PASSMOBJ               // flags2
+     },
+
+    {                           // MT_WIZFX1
+     -1,                        // doomednum
+     S_WIZFX1_1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_WIZFXI1_1,               // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     18 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_IMP
+     66,                        // doomednum
+     S_IMP_LOOK1,               // spawnstate
+     40,                        // spawnhealth
+     S_IMP_FLY1,                // seestate
+     sfx_impsit,                // seesound
+     8,                         // reactiontime
+     sfx_impat1,                // attacksound
+     S_IMP_PAIN1,               // painstate
+     200,                       // painchance
+     sfx_imppai,                // painsound
+     S_IMP_MEATK1,              // meleestate
+     S_IMP_MSATK1_1,            // missilestate
+     S_IMP_CRASH1,              // crashstate
+     S_IMP_DIE1,                // deathstate
+     S_IMP_XDIE1,               // xdeathstate
+     sfx_impdth,                // deathsound
+     10,                        // speed
+     16 * FRACUNIT,             // radius
+     36 * FRACUNIT,             // height
+     50,                        // mass
+     0,                         // damage
+     sfx_impact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_FLOAT | MF_NOGRAVITY | MF_COUNTKILL,  // flags
+     MF2_SPAWNFLOAT | MF2_PASSMOBJ      // flags2
+     },
+
+    {                           // MT_IMPLEADER
+     5,                         // doomednum
+     S_IMP_LOOK1,               // spawnstate
+     80,                        // spawnhealth
+     S_IMP_FLY1,                // seestate
+     sfx_impsit,                // seesound
+     8,                         // reactiontime
+     sfx_impat2,                // attacksound
+     S_IMP_PAIN1,               // painstate
+     200,                       // painchance
+     sfx_imppai,                // painsound
+     0,                         // meleestate
+     S_IMP_MSATK2_1,            // missilestate
+     S_IMP_CRASH1,              // crashstate
+     S_IMP_DIE1,                // deathstate
+     S_IMP_XDIE1,               // xdeathstate
+     sfx_impdth,                // deathsound
+     10,                        // speed
+     16 * FRACUNIT,             // radius
+     36 * FRACUNIT,             // height
+     50,                        // mass
+     0,                         // damage
+     sfx_impact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_FLOAT | MF_NOGRAVITY | MF_COUNTKILL,  // flags
+     MF2_SPAWNFLOAT | MF2_PASSMOBJ      // flags2
+     },
+
+    {                           // MT_IMPCHUNK1
+     -1,                        // doomednum
+     S_IMP_CHUNKA1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_IMPCHUNK2
+     -1,                        // doomednum
+     S_IMP_CHUNKB1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_IMPBALL
+     -1,                        // doomednum
+     S_IMPFX1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_IMPFXI1,                 // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     10 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
+     },
+
+    {                           // MT_KNIGHT
+     64,                        // doomednum
+     S_KNIGHT_STND1,            // spawnstate
+     200,                       // spawnhealth
+     S_KNIGHT_WALK1,            // seestate
+     sfx_kgtsit,                // seesound
+     8,                         // reactiontime
+     sfx_kgtatk,                // attacksound
+     S_KNIGHT_PAIN1,            // painstate
+     100,                       // painchance
+     sfx_kgtpai,                // painsound
+     S_KNIGHT_ATK1,             // meleestate
+     S_KNIGHT_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_KNIGHT_DIE1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_kgtdth,                // deathsound
+     12,                        // speed
+     24 * FRACUNIT,             // radius
+     78 * FRACUNIT,             // height
+     150,                       // mass
+     0,                         // damage
+     sfx_kgtact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_KNIGHTGHOST
+     65,                        // doomednum
+     S_KNIGHT_STND1,            // spawnstate
+     200,                       // spawnhealth
+     S_KNIGHT_WALK1,            // seestate
+     sfx_kgtsit,                // seesound
+     8,                         // reactiontime
+     sfx_kgtatk,                // attacksound
+     S_KNIGHT_PAIN1,            // painstate
+     100,                       // painchance
+     sfx_kgtpai,                // painsound
+     S_KNIGHT_ATK1,             // meleestate
+     S_KNIGHT_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_KNIGHT_DIE1,             // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_kgtdth,                // deathsound
+     12,                        // speed
+     24 * FRACUNIT,             // radius
+     78 * FRACUNIT,             // height
+     150,                       // mass
+     0,                         // damage
+     sfx_kgtact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
+     },
+
+    {                           // MT_KNIGHTAXE
+     -1,                        // doomednum
+     S_SPINAXE1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SPINAXEX1,               // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     9 * FRACUNIT,              // speed
+     10 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_WINDTHRUST | MF2_NOTELEPORT | MF2_THRUGHOST    // flags2
+     },
+
+    {                           // MT_REDAXE
+     -1,                        // doomednum
+     S_REDAXE1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_REDAXEX1,                // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_hrnhit,                // deathsound
+     9 * FRACUNIT,              // speed
+     10 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     7,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_THRUGHOST     // flags2
+     },
+
+    {                           // MT_SORCERER1
+     7,                         // doomednum
+     S_SRCR1_LOOK1,             // spawnstate
+     2000,                      // spawnhealth
+     S_SRCR1_WALK1,             // seestate
+     sfx_sbtsit,                // seesound
+     8,                         // reactiontime
+     sfx_sbtatk,                // attacksound
+     S_SRCR1_PAIN1,             // painstate
+     56,                        // painchance
+     sfx_sbtpai,                // painsound
+     0,                         // meleestate
+     S_SRCR1_ATK1,              // missilestate
+     S_NULL,                    // crashstate
+     S_SRCR1_DIE1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_sbtdth,                // deathsound
+     16,                        // speed
+     28 * FRACUNIT,             // radius
+     100 * FRACUNIT,            // height
+     800,                       // mass
+     0,                         // damage
+     sfx_sbtact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ | MF2_BOSS     // flags2
+     },
+
+    {                           // MT_SRCRFX1
+     -1,                        // doomednum
+     S_SRCRFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SRCRFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     20 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     10,                        // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_SORCERER2
+     -1,                        // doomednum
+     S_SOR2_LOOK1,              // spawnstate
+     3500,                      // spawnhealth
+     S_SOR2_WALK1,              // seestate
+     sfx_sorsit,                // seesound
+     8,                         // reactiontime
+     sfx_soratk,                // attacksound
+     S_SOR2_PAIN1,              // painstate
+     32,                        // painchance
+     sfx_sorpai,                // painsound
+     0,                         // meleestate
+     S_SOR2_ATK1,               // missilestate
+     S_NULL,                    // crashstate
+     S_SOR2_DIE1,               // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     14,                        // speed
+     16 * FRACUNIT,             // radius
+     70 * FRACUNIT,             // height
+     300,                       // mass
+     0,                         // damage
+     sfx_soract,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF,       // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ | MF2_BOSS     // flags2
+     },
+
+    {                           // MT_SOR2FX1
+     -1,                        // doomednum
+     S_SOR2FX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SOR2FXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     20 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SOR2FXSPARK
+     -1,                        // doomednum
+     S_SOR2FXSPARK1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
+     },
+
+    {                           // MT_SOR2FX2
+     -1,                        // doomednum
+     S_SOR2FX2_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SOR2FXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     6 * FRACUNIT,              // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     10,                        // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SOR2TELEFADE
+     -1,                        // doomednum
+     S_SOR2TELEFADE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MINOTAUR
+     9,                         // doomednum
+     S_MNTR_LOOK1,              // spawnstate
+     3000,                      // spawnhealth
+     S_MNTR_WALK1,              // seestate
+     sfx_minsit,                // seesound
+     8,                         // reactiontime
+     sfx_minat1,                // attacksound
+     S_MNTR_PAIN1,              // painstate
+     25,                        // painchance
+     sfx_minpai,                // painsound
+     S_MNTR_ATK1_1,             // meleestate
+     S_MNTR_ATK2_1,             // missilestate
+     S_NULL,                    // crashstate
+     S_MNTR_DIE1,               // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_mindth,                // deathsound
+     16,                        // speed
+     28 * FRACUNIT,             // radius
+     100 * FRACUNIT,            // height
+     800,                       // mass
+     7,                         // damage
+     sfx_minact,                // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF,       // flags
+     MF2_FOOTCLIP | MF2_PASSMOBJ | MF2_BOSS     // flags2
+     },
+
+    {                           // MT_MNTRFX1
+     -1,                        // doomednum
+     S_MNTRFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MNTRFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     20 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_MNTRFX2
+     -1,                        // doomednum
+     S_MNTRFX2_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MNTRFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_phohit,                // deathsound
+     14 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_MNTRFX3
+     -1,                        // doomednum
+     S_MNTRFX3_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MNTRFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_phohit,                // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_AKYY
+     73,                        // doomednum
+     S_AKYY1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_NOTDMATCH, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BKYY
+     79,                        // doomednum
+     S_BKYY1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_NOTDMATCH, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CKEY
+     80,                        // doomednum
+     S_CKYY1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL | MF_NOTDMATCH, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMGWNDWIMPY
+     10,                        // doomednum
+     S_AMG1,                    // spawnstate
+     AMMO_GWND_WIMPY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMGWNDHEFTY
+     12,                        // doomednum
+     S_AMG2_1,                  // spawnstate
+     AMMO_GWND_HEFTY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMMACEWIMPY
+     13,                        // doomednum
+     S_AMM1,                    // spawnstate
+     AMMO_MACE_WIMPY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMMACEHEFTY
+     16,                        // doomednum
+     S_AMM2,                    // spawnstate
+     AMMO_MACE_HEFTY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMCBOWWIMPY
+     18,                        // doomednum
+     S_AMC1,                    // spawnstate
+     AMMO_CBOW_WIMPY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMCBOWHEFTY
+     19,                        // doomednum
+     S_AMC2_1,                  // spawnstate
+     AMMO_CBOW_HEFTY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMSKRDWIMPY
+     20,                        // doomednum
+     S_AMS1_1,                  // spawnstate
+     AMMO_SKRD_WIMPY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMSKRDHEFTY
+     21,                        // doomednum
+     S_AMS2_1,                  // spawnstate
+     AMMO_SKRD_HEFTY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMPHRDWIMPY
+     22,                        // doomednum
+     S_AMP1_1,                  // spawnstate
+     AMMO_PHRD_WIMPY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMPHRDHEFTY
+     23,                        // doomednum
+     S_AMP2_1,                  // spawnstate
+     AMMO_PHRD_HEFTY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMBLSRWIMPY
+     54,                        // doomednum
+     S_AMB1_1,                  // spawnstate
+     AMMO_BLSR_WIMPY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AMBLSRHEFTY
+     55,                        // doomednum
+     S_AMB2_1,                  // spawnstate
+     AMMO_BLSR_HEFTY,           // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SOUNDWIND
+     42,                        // doomednum
+     S_SND_WIND,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SOUNDWATERFALL
+     41,                        // doomednum
+     S_SND_WATERFALL,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     sfx_None,                  // seesound
+     8,                         // reactiontime
+     sfx_None,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     sfx_None,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     sfx_None,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     sfx_None,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     }
+};
diff --git a/games/NXDoom/src/heretic/info.h b/games/NXDoom/src/heretic/info.h
new file mode 100644
index 000000000..2247b658a
--- /dev/null
+++ b/games/NXDoom/src/heretic/info.h
@@ -0,0 +1,1584 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef HERETIC_INFO_H
+#define HERETIC_INFO_H
+
+typedef enum
+{
+    SPR_IMPX,
+    SPR_ACLO,
+    SPR_PTN1,
+    SPR_SHLD,
+    SPR_SHD2,
+    SPR_BAGH,
+    SPR_SPMP,
+    SPR_INVS,
+    SPR_PTN2,
+    SPR_SOAR,
+    SPR_INVU,
+    SPR_PWBK,
+    SPR_EGGC,
+    SPR_EGGM,
+    SPR_FX01,
+    SPR_SPHL,
+    SPR_TRCH,
+    SPR_FBMB,
+    SPR_XPL1,
+    SPR_ATLP,
+    SPR_PPOD,
+    SPR_AMG1,
+    SPR_SPSH,
+    SPR_LVAS,
+    SPR_SLDG,
+    SPR_SKH1,
+    SPR_SKH2,
+    SPR_SKH3,
+    SPR_SKH4,
+    SPR_CHDL,
+    SPR_SRTC,
+    SPR_SMPL,
+    SPR_STGS,
+    SPR_STGL,
+    SPR_STCS,
+    SPR_STCL,
+    SPR_KFR1,
+    SPR_BARL,
+    SPR_BRPL,
+    SPR_MOS1,
+    SPR_MOS2,
+    SPR_WTRH,
+    SPR_HCOR,
+    SPR_KGZ1,
+    SPR_KGZB,
+    SPR_KGZG,
+    SPR_KGZY,
+    SPR_VLCO,
+    SPR_VFBL,
+    SPR_VTFB,
+    SPR_SFFI,
+    SPR_TGLT,
+    SPR_TELE,
+    SPR_STFF,
+    SPR_PUF3,
+    SPR_PUF4,
+    SPR_BEAK,
+    SPR_WGNT,
+    SPR_GAUN,
+    SPR_PUF1,
+    SPR_WBLS,
+    SPR_BLSR,
+    SPR_FX18,
+    SPR_FX17,
+    SPR_WMCE,
+    SPR_MACE,
+    SPR_FX02,
+    SPR_WSKL,
+    SPR_HROD,
+    SPR_FX00,
+    SPR_FX20,
+    SPR_FX21,
+    SPR_FX22,
+    SPR_FX23,
+    SPR_GWND,
+    SPR_PUF2,
+    SPR_WPHX,
+    SPR_PHNX,
+    SPR_FX04,
+    SPR_FX08,
+    SPR_FX09,
+    SPR_WBOW,
+    SPR_CRBW,
+    SPR_FX03,
+    SPR_BLOD,
+    SPR_PLAY,
+    SPR_FDTH,
+    SPR_BSKL,
+    SPR_CHKN,
+    SPR_MUMM,
+    SPR_FX15,
+    SPR_BEAS,
+    SPR_FRB1,
+    SPR_SNKE,
+    SPR_SNFX,
+    SPR_HEAD,
+    SPR_FX05,
+    SPR_FX06,
+    SPR_FX07,
+    SPR_CLNK,
+    SPR_WZRD,
+    SPR_FX11,
+    SPR_FX10,
+    SPR_KNIG,
+    SPR_SPAX,
+    SPR_RAXE,
+    SPR_SRCR,
+    SPR_FX14,
+    SPR_SOR2,
+    SPR_SDTH,
+    SPR_FX16,
+    SPR_MNTR,
+    SPR_FX12,
+    SPR_FX13,
+    SPR_AKYY,
+    SPR_BKYY,
+    SPR_CKYY,
+    SPR_AMG2,
+    SPR_AMM1,
+    SPR_AMM2,
+    SPR_AMC1,
+    SPR_AMC2,
+    SPR_AMS1,
+    SPR_AMS2,
+    SPR_AMP1,
+    SPR_AMP2,
+    SPR_AMB1,
+    SPR_AMB2,
+    NUMSPRITES
+} spritenum_t;
+
+typedef enum
+{
+    S_NULL,
+    S_FREETARGMOBJ,
+    S_ITEM_PTN1_1,
+    S_ITEM_PTN1_2,
+    S_ITEM_PTN1_3,
+    S_ITEM_SHLD1,
+    S_ITEM_SHD2_1,
+    S_ITEM_BAGH1,
+    S_ITEM_SPMP1,
+    S_HIDESPECIAL1,
+    S_HIDESPECIAL2,
+    S_HIDESPECIAL3,
+    S_HIDESPECIAL4,
+    S_HIDESPECIAL5,
+    S_HIDESPECIAL6,
+    S_HIDESPECIAL7,
+    S_HIDESPECIAL8,
+    S_HIDESPECIAL9,
+    S_HIDESPECIAL10,
+    S_HIDESPECIAL11,
+    S_DORMANTARTI1,
+    S_DORMANTARTI2,
+    S_DORMANTARTI3,
+    S_DORMANTARTI4,
+    S_DORMANTARTI5,
+    S_DORMANTARTI6,
+    S_DORMANTARTI7,
+    S_DORMANTARTI8,
+    S_DORMANTARTI9,
+    S_DORMANTARTI10,
+    S_DORMANTARTI11,
+    S_DORMANTARTI12,
+    S_DORMANTARTI13,
+    S_DORMANTARTI14,
+    S_DORMANTARTI15,
+    S_DORMANTARTI16,
+    S_DORMANTARTI17,
+    S_DORMANTARTI18,
+    S_DORMANTARTI19,
+    S_DORMANTARTI20,
+    S_DORMANTARTI21,
+    S_DEADARTI1,
+    S_DEADARTI2,
+    S_DEADARTI3,
+    S_DEADARTI4,
+    S_DEADARTI5,
+    S_DEADARTI6,
+    S_DEADARTI7,
+    S_DEADARTI8,
+    S_DEADARTI9,
+    S_DEADARTI10,
+    S_ARTI_INVS1,
+    S_ARTI_PTN2_1,
+    S_ARTI_PTN2_2,
+    S_ARTI_PTN2_3,
+    S_ARTI_SOAR1,
+    S_ARTI_SOAR2,
+    S_ARTI_SOAR3,
+    S_ARTI_SOAR4,
+    S_ARTI_INVU1,
+    S_ARTI_INVU2,
+    S_ARTI_INVU3,
+    S_ARTI_INVU4,
+    S_ARTI_PWBK1,
+    S_ARTI_EGGC1,
+    S_ARTI_EGGC2,
+    S_ARTI_EGGC3,
+    S_ARTI_EGGC4,
+    S_EGGFX1,
+    S_EGGFX2,
+    S_EGGFX3,
+    S_EGGFX4,
+    S_EGGFX5,
+    S_EGGFXI1_1,
+    S_EGGFXI1_2,
+    S_EGGFXI1_3,
+    S_EGGFXI1_4,
+    S_ARTI_SPHL1,
+    S_ARTI_TRCH1,
+    S_ARTI_TRCH2,
+    S_ARTI_TRCH3,
+    S_ARTI_FBMB1,
+    S_FIREBOMB1,
+    S_FIREBOMB2,
+    S_FIREBOMB3,
+    S_FIREBOMB4,
+    S_FIREBOMB5,
+    S_FIREBOMB6,
+    S_FIREBOMB7,
+    S_FIREBOMB8,
+    S_FIREBOMB9,
+    S_FIREBOMB10,
+    S_FIREBOMB11,
+    S_ARTI_ATLP1,
+    S_ARTI_ATLP2,
+    S_ARTI_ATLP3,
+    S_ARTI_ATLP4,
+    S_POD_WAIT1,
+    S_POD_PAIN1,
+    S_POD_DIE1,
+    S_POD_DIE2,
+    S_POD_DIE3,
+    S_POD_DIE4,
+    S_POD_GROW1,
+    S_POD_GROW2,
+    S_POD_GROW3,
+    S_POD_GROW4,
+    S_POD_GROW5,
+    S_POD_GROW6,
+    S_POD_GROW7,
+    S_POD_GROW8,
+    S_PODGOO1,
+    S_PODGOO2,
+    S_PODGOOX,
+    S_PODGENERATOR,
+    S_SPLASH1,
+    S_SPLASH2,
+    S_SPLASH3,
+    S_SPLASH4,
+    S_SPLASHX,
+    S_SPLASHBASE1,
+    S_SPLASHBASE2,
+    S_SPLASHBASE3,
+    S_SPLASHBASE4,
+    S_SPLASHBASE5,
+    S_SPLASHBASE6,
+    S_SPLASHBASE7,
+    S_LAVASPLASH1,
+    S_LAVASPLASH2,
+    S_LAVASPLASH3,
+    S_LAVASPLASH4,
+    S_LAVASPLASH5,
+    S_LAVASPLASH6,
+    S_LAVASMOKE1,
+    S_LAVASMOKE2,
+    S_LAVASMOKE3,
+    S_LAVASMOKE4,
+    S_LAVASMOKE5,
+    S_SLUDGECHUNK1,
+    S_SLUDGECHUNK2,
+    S_SLUDGECHUNK3,
+    S_SLUDGECHUNK4,
+    S_SLUDGECHUNKX,
+    S_SLUDGESPLASH1,
+    S_SLUDGESPLASH2,
+    S_SLUDGESPLASH3,
+    S_SLUDGESPLASH4,
+    S_SKULLHANG70_1,
+    S_SKULLHANG60_1,
+    S_SKULLHANG45_1,
+    S_SKULLHANG35_1,
+    S_CHANDELIER1,
+    S_CHANDELIER2,
+    S_CHANDELIER3,
+    S_SERPTORCH1,
+    S_SERPTORCH2,
+    S_SERPTORCH3,
+    S_SMALLPILLAR,
+    S_STALAGMITESMALL,
+    S_STALAGMITELARGE,
+    S_STALACTITESMALL,
+    S_STALACTITELARGE,
+    S_FIREBRAZIER1,
+    S_FIREBRAZIER2,
+    S_FIREBRAZIER3,
+    S_FIREBRAZIER4,
+    S_FIREBRAZIER5,
+    S_FIREBRAZIER6,
+    S_FIREBRAZIER7,
+    S_FIREBRAZIER8,
+    S_BARREL,
+    S_BRPILLAR,
+    S_MOSS1,
+    S_MOSS2,
+    S_WALLTORCH1,
+    S_WALLTORCH2,
+    S_WALLTORCH3,
+    S_HANGINGCORPSE,
+    S_KEYGIZMO1,
+    S_KEYGIZMO2,
+    S_KEYGIZMO3,
+    S_KGZ_START,
+    S_KGZ_BLUEFLOAT1,
+    S_KGZ_GREENFLOAT1,
+    S_KGZ_YELLOWFLOAT1,
+    S_VOLCANO1,
+    S_VOLCANO2,
+    S_VOLCANO3,
+    S_VOLCANO4,
+    S_VOLCANO5,
+    S_VOLCANO6,
+    S_VOLCANO7,
+    S_VOLCANO8,
+    S_VOLCANO9,
+    S_VOLCANOBALL1,
+    S_VOLCANOBALL2,
+    S_VOLCANOBALLX1,
+    S_VOLCANOBALLX2,
+    S_VOLCANOBALLX3,
+    S_VOLCANOBALLX4,
+    S_VOLCANOBALLX5,
+    S_VOLCANOBALLX6,
+    S_VOLCANOTBALL1,
+    S_VOLCANOTBALL2,
+    S_VOLCANOTBALLX1,
+    S_VOLCANOTBALLX2,
+    S_VOLCANOTBALLX3,
+    S_VOLCANOTBALLX4,
+    S_VOLCANOTBALLX5,
+    S_VOLCANOTBALLX6,
+    S_VOLCANOTBALLX7,
+    S_TELEGLITGEN1,
+    S_TELEGLITGEN2,
+    S_TELEGLITTER1_1,
+    S_TELEGLITTER1_2,
+    S_TELEGLITTER1_3,
+    S_TELEGLITTER1_4,
+    S_TELEGLITTER1_5,
+    S_TELEGLITTER2_1,
+    S_TELEGLITTER2_2,
+    S_TELEGLITTER2_3,
+    S_TELEGLITTER2_4,
+    S_TELEGLITTER2_5,
+    S_TFOG1,
+    S_TFOG2,
+    S_TFOG3,
+    S_TFOG4,
+    S_TFOG5,
+    S_TFOG6,
+    S_TFOG7,
+    S_TFOG8,
+    S_TFOG9,
+    S_TFOG10,
+    S_TFOG11,
+    S_TFOG12,
+    S_TFOG13,
+    S_LIGHTDONE,
+    S_STAFFREADY,
+    S_STAFFDOWN,
+    S_STAFFUP,
+    S_STAFFREADY2_1,
+    S_STAFFREADY2_2,
+    S_STAFFREADY2_3,
+    S_STAFFDOWN2,
+    S_STAFFUP2,
+    S_STAFFATK1_1,
+    S_STAFFATK1_2,
+    S_STAFFATK1_3,
+    S_STAFFATK2_1,
+    S_STAFFATK2_2,
+    S_STAFFATK2_3,
+    S_STAFFPUFF1,
+    S_STAFFPUFF2,
+    S_STAFFPUFF3,
+    S_STAFFPUFF4,
+    S_STAFFPUFF2_1,
+    S_STAFFPUFF2_2,
+    S_STAFFPUFF2_3,
+    S_STAFFPUFF2_4,
+    S_STAFFPUFF2_5,
+    S_STAFFPUFF2_6,
+    S_BEAKREADY,
+    S_BEAKDOWN,
+    S_BEAKUP,
+    S_BEAKATK1_1,
+    S_BEAKATK2_1,
+    S_WGNT,
+    S_GAUNTLETREADY,
+    S_GAUNTLETDOWN,
+    S_GAUNTLETUP,
+    S_GAUNTLETREADY2_1,
+    S_GAUNTLETREADY2_2,
+    S_GAUNTLETREADY2_3,
+    S_GAUNTLETDOWN2,
+    S_GAUNTLETUP2,
+    S_GAUNTLETATK1_1,
+    S_GAUNTLETATK1_2,
+    S_GAUNTLETATK1_3,
+    S_GAUNTLETATK1_4,
+    S_GAUNTLETATK1_5,
+    S_GAUNTLETATK1_6,
+    S_GAUNTLETATK1_7,
+    S_GAUNTLETATK2_1,
+    S_GAUNTLETATK2_2,
+    S_GAUNTLETATK2_3,
+    S_GAUNTLETATK2_4,
+    S_GAUNTLETATK2_5,
+    S_GAUNTLETATK2_6,
+    S_GAUNTLETATK2_7,
+    S_GAUNTLETPUFF1_1,
+    S_GAUNTLETPUFF1_2,
+    S_GAUNTLETPUFF1_3,
+    S_GAUNTLETPUFF1_4,
+    S_GAUNTLETPUFF2_1,
+    S_GAUNTLETPUFF2_2,
+    S_GAUNTLETPUFF2_3,
+    S_GAUNTLETPUFF2_4,
+    S_BLSR,
+    S_BLASTERREADY,
+    S_BLASTERDOWN,
+    S_BLASTERUP,
+    S_BLASTERATK1_1,
+    S_BLASTERATK1_2,
+    S_BLASTERATK1_3,
+    S_BLASTERATK1_4,
+    S_BLASTERATK1_5,
+    S_BLASTERATK1_6,
+    S_BLASTERATK2_1,
+    S_BLASTERATK2_2,
+    S_BLASTERATK2_3,
+    S_BLASTERATK2_4,
+    S_BLASTERATK2_5,
+    S_BLASTERATK2_6,
+    S_BLASTERFX1_1,
+    S_BLASTERFXI1_1,
+    S_BLASTERFXI1_2,
+    S_BLASTERFXI1_3,
+    S_BLASTERFXI1_4,
+    S_BLASTERFXI1_5,
+    S_BLASTERFXI1_6,
+    S_BLASTERFXI1_7,
+    S_BLASTERSMOKE1,
+    S_BLASTERSMOKE2,
+    S_BLASTERSMOKE3,
+    S_BLASTERSMOKE4,
+    S_BLASTERSMOKE5,
+    S_RIPPER1,
+    S_RIPPER2,
+    S_RIPPERX1,
+    S_RIPPERX2,
+    S_RIPPERX3,
+    S_RIPPERX4,
+    S_RIPPERX5,
+    S_BLASTERPUFF1_1,
+    S_BLASTERPUFF1_2,
+    S_BLASTERPUFF1_3,
+    S_BLASTERPUFF1_4,
+    S_BLASTERPUFF1_5,
+    S_BLASTERPUFF2_1,
+    S_BLASTERPUFF2_2,
+    S_BLASTERPUFF2_3,
+    S_BLASTERPUFF2_4,
+    S_BLASTERPUFF2_5,
+    S_BLASTERPUFF2_6,
+    S_BLASTERPUFF2_7,
+    S_WMCE,
+    S_MACEREADY,
+    S_MACEDOWN,
+    S_MACEUP,
+    S_MACEATK1_1,
+    S_MACEATK1_2,
+    S_MACEATK1_3,
+    S_MACEATK1_4,
+    S_MACEATK1_5,
+    S_MACEATK1_6,
+    S_MACEATK1_7,
+    S_MACEATK1_8,
+    S_MACEATK1_9,
+    S_MACEATK1_10,
+    S_MACEATK2_1,
+    S_MACEATK2_2,
+    S_MACEATK2_3,
+    S_MACEATK2_4,
+    S_MACEFX1_1,
+    S_MACEFX1_2,
+    S_MACEFXI1_1,
+    S_MACEFXI1_2,
+    S_MACEFXI1_3,
+    S_MACEFXI1_4,
+    S_MACEFXI1_5,
+    S_MACEFX2_1,
+    S_MACEFX2_2,
+    S_MACEFXI2_1,
+    S_MACEFX3_1,
+    S_MACEFX3_2,
+    S_MACEFX4_1,
+    S_MACEFXI4_1,
+    S_WSKL,
+    S_HORNRODREADY,
+    S_HORNRODDOWN,
+    S_HORNRODUP,
+    S_HORNRODATK1_1,
+    S_HORNRODATK1_2,
+    S_HORNRODATK1_3,
+    S_HORNRODATK2_1,
+    S_HORNRODATK2_2,
+    S_HORNRODATK2_3,
+    S_HORNRODATK2_4,
+    S_HORNRODATK2_5,
+    S_HORNRODATK2_6,
+    S_HORNRODATK2_7,
+    S_HORNRODATK2_8,
+    S_HORNRODATK2_9,
+    S_HRODFX1_1,
+    S_HRODFX1_2,
+    S_HRODFXI1_1,
+    S_HRODFXI1_2,
+    S_HRODFXI1_3,
+    S_HRODFXI1_4,
+    S_HRODFXI1_5,
+    S_HRODFXI1_6,
+    S_HRODFX2_1,
+    S_HRODFX2_2,
+    S_HRODFX2_3,
+    S_HRODFX2_4,
+    S_HRODFXI2_1,
+    S_HRODFXI2_2,
+    S_HRODFXI2_3,
+    S_HRODFXI2_4,
+    S_HRODFXI2_5,
+    S_HRODFXI2_6,
+    S_HRODFXI2_7,
+    S_HRODFXI2_8,
+    S_RAINPLR1_1,
+    S_RAINPLR2_1,
+    S_RAINPLR3_1,
+    S_RAINPLR4_1,
+    S_RAINPLR1X_1,
+    S_RAINPLR1X_2,
+    S_RAINPLR1X_3,
+    S_RAINPLR1X_4,
+    S_RAINPLR1X_5,
+    S_RAINPLR2X_1,
+    S_RAINPLR2X_2,
+    S_RAINPLR2X_3,
+    S_RAINPLR2X_4,
+    S_RAINPLR2X_5,
+    S_RAINPLR3X_1,
+    S_RAINPLR3X_2,
+    S_RAINPLR3X_3,
+    S_RAINPLR3X_4,
+    S_RAINPLR3X_5,
+    S_RAINPLR4X_1,
+    S_RAINPLR4X_2,
+    S_RAINPLR4X_3,
+    S_RAINPLR4X_4,
+    S_RAINPLR4X_5,
+    S_RAINAIRXPLR1_1,
+    S_RAINAIRXPLR2_1,
+    S_RAINAIRXPLR3_1,
+    S_RAINAIRXPLR4_1,
+    S_RAINAIRXPLR1_2,
+    S_RAINAIRXPLR2_2,
+    S_RAINAIRXPLR3_2,
+    S_RAINAIRXPLR4_2,
+    S_RAINAIRXPLR1_3,
+    S_RAINAIRXPLR2_3,
+    S_RAINAIRXPLR3_3,
+    S_RAINAIRXPLR4_3,
+    S_GOLDWANDREADY,
+    S_GOLDWANDDOWN,
+    S_GOLDWANDUP,
+    S_GOLDWANDATK1_1,
+    S_GOLDWANDATK1_2,
+    S_GOLDWANDATK1_3,
+    S_GOLDWANDATK1_4,
+    S_GOLDWANDATK2_1,
+    S_GOLDWANDATK2_2,
+    S_GOLDWANDATK2_3,
+    S_GOLDWANDATK2_4,
+    S_GWANDFX1_1,
+    S_GWANDFX1_2,
+    S_GWANDFXI1_1,
+    S_GWANDFXI1_2,
+    S_GWANDFXI1_3,
+    S_GWANDFXI1_4,
+    S_GWANDFX2_1,
+    S_GWANDFX2_2,
+    S_GWANDPUFF1_1,
+    S_GWANDPUFF1_2,
+    S_GWANDPUFF1_3,
+    S_GWANDPUFF1_4,
+    S_GWANDPUFF1_5,
+    S_WPHX,
+    S_PHOENIXREADY,
+    S_PHOENIXDOWN,
+    S_PHOENIXUP,
+    S_PHOENIXATK1_1,
+    S_PHOENIXATK1_2,
+    S_PHOENIXATK1_3,
+    S_PHOENIXATK1_4,
+    S_PHOENIXATK1_5,
+    S_PHOENIXATK2_1,
+    S_PHOENIXATK2_2,
+    S_PHOENIXATK2_3,
+    S_PHOENIXATK2_4,
+    S_PHOENIXFX1_1,
+    S_PHOENIXFXI1_1,
+    S_PHOENIXFXI1_2,
+    S_PHOENIXFXI1_3,
+    S_PHOENIXFXI1_4,
+    S_PHOENIXFXI1_5,
+    S_PHOENIXFXI1_6,
+    S_PHOENIXFXI1_7,
+    S_PHOENIXFXI1_8,
+    S_PHOENIXFXIX_1,      // [ States in Heretic 1.0 that were removed
+    S_PHOENIXFXIX_2,
+    S_PHOENIXFXIX_3,      // ]
+    S_PHOENIXPUFF1,
+    S_PHOENIXPUFF2,
+    S_PHOENIXPUFF3,
+    S_PHOENIXPUFF4,
+    S_PHOENIXPUFF5,
+    S_PHOENIXFX2_1,
+    S_PHOENIXFX2_2,
+    S_PHOENIXFX2_3,
+    S_PHOENIXFX2_4,
+    S_PHOENIXFX2_5,
+    S_PHOENIXFX2_6,
+    S_PHOENIXFX2_7,
+    S_PHOENIXFX2_8,
+    S_PHOENIXFX2_9,
+    S_PHOENIXFX2_10,
+    S_PHOENIXFXI2_1,
+    S_PHOENIXFXI2_2,
+    S_PHOENIXFXI2_3,
+    S_PHOENIXFXI2_4,
+    S_PHOENIXFXI2_5,
+    S_WBOW,
+    S_CRBOW1,
+    S_CRBOW2,
+    S_CRBOW3,
+    S_CRBOW4,
+    S_CRBOW5,
+    S_CRBOW6,
+    S_CRBOW7,
+    S_CRBOW8,
+    S_CRBOW9,
+    S_CRBOW10,
+    S_CRBOW11,
+    S_CRBOW12,
+    S_CRBOW13,
+    S_CRBOW14,
+    S_CRBOW15,
+    S_CRBOW16,
+    S_CRBOW17,
+    S_CRBOW18,
+    S_CRBOWDOWN,
+    S_CRBOWUP,
+    S_CRBOWATK1_1,
+    S_CRBOWATK1_2,
+    S_CRBOWATK1_3,
+    S_CRBOWATK1_4,
+    S_CRBOWATK1_5,
+    S_CRBOWATK1_6,
+    S_CRBOWATK1_7,
+    S_CRBOWATK1_8,
+    S_CRBOWATK2_1,
+    S_CRBOWATK2_2,
+    S_CRBOWATK2_3,
+    S_CRBOWATK2_4,
+    S_CRBOWATK2_5,
+    S_CRBOWATK2_6,
+    S_CRBOWATK2_7,
+    S_CRBOWATK2_8,
+    S_CRBOWFX1,
+    S_CRBOWFXI1_1,
+    S_CRBOWFXI1_2,
+    S_CRBOWFXI1_3,
+    S_CRBOWFX2,
+    S_CRBOWFX3,
+    S_CRBOWFXI3_1,
+    S_CRBOWFXI3_2,
+    S_CRBOWFXI3_3,
+    S_CRBOWFX4_1,
+    S_CRBOWFX4_2,
+    S_BLOOD1,
+    S_BLOOD2,
+    S_BLOOD3,
+    S_BLOODSPLATTER1,
+    S_BLOODSPLATTER2,
+    S_BLOODSPLATTER3,
+    S_BLOODSPLATTERX,
+    S_PLAY,
+    S_PLAY_RUN1,
+    S_PLAY_RUN2,
+    S_PLAY_RUN3,
+    S_PLAY_RUN4,
+    S_PLAY_ATK1,
+    S_PLAY_ATK2,
+    S_PLAY_PAIN,
+    S_PLAY_PAIN2,
+    S_PLAY_DIE1,
+    S_PLAY_DIE2,
+    S_PLAY_DIE3,
+    S_PLAY_DIE4,
+    S_PLAY_DIE5,
+    S_PLAY_DIE6,
+    S_PLAY_DIE7,
+    S_PLAY_DIE8,
+    S_PLAY_DIE9,
+    S_PLAY_XDIE1,
+    S_PLAY_XDIE2,
+    S_PLAY_XDIE3,
+    S_PLAY_XDIE4,
+    S_PLAY_XDIE5,
+    S_PLAY_XDIE6,
+    S_PLAY_XDIE7,
+    S_PLAY_XDIE8,
+    S_PLAY_XDIE9,
+    S_PLAY_FDTH1,
+    S_PLAY_FDTH2,
+    S_PLAY_FDTH3,
+    S_PLAY_FDTH4,
+    S_PLAY_FDTH5,
+    S_PLAY_FDTH6,
+    S_PLAY_FDTH7,
+    S_PLAY_FDTH8,
+    S_PLAY_FDTH9,
+    S_PLAY_FDTH10,
+    S_PLAY_FDTH11,
+    S_PLAY_FDTH12,
+    S_PLAY_FDTH13,
+    S_PLAY_FDTH14,
+    S_PLAY_FDTH15,
+    S_PLAY_FDTH16,
+    S_PLAY_FDTH17,
+    S_PLAY_FDTH18,
+    S_PLAY_FDTH19,    // < These two frames were not present in the Heretic
+    S_PLAY_FDTH20,    // < 1.0 executable (fire death animation was extended)
+    S_BLOODYSKULL1,
+    S_BLOODYSKULL2,
+    S_BLOODYSKULL3,
+    S_BLOODYSKULL4,
+    S_BLOODYSKULL5,
+    S_BLOODYSKULLX1,
+    S_BLOODYSKULLX2,
+    S_CHICPLAY,
+    S_CHICPLAY_RUN1,
+    S_CHICPLAY_RUN2,
+    S_CHICPLAY_RUN3,
+    S_CHICPLAY_RUN4,
+    S_CHICPLAY_ATK1,
+    S_CHICPLAY_PAIN,
+    S_CHICPLAY_PAIN2,
+    S_CHICKEN_LOOK1,
+    S_CHICKEN_LOOK2,
+    S_CHICKEN_WALK1,
+    S_CHICKEN_WALK2,
+    S_CHICKEN_PAIN1,
+    S_CHICKEN_PAIN2,
+    S_CHICKEN_ATK1,
+    S_CHICKEN_ATK2,
+    S_CHICKEN_DIE1,
+    S_CHICKEN_DIE2,
+    S_CHICKEN_DIE3,
+    S_CHICKEN_DIE4,
+    S_CHICKEN_DIE5,
+    S_CHICKEN_DIE6,
+    S_CHICKEN_DIE7,
+    S_CHICKEN_DIE8,
+    S_FEATHER1,
+    S_FEATHER2,
+    S_FEATHER3,
+    S_FEATHER4,
+    S_FEATHER5,
+    S_FEATHER6,
+    S_FEATHER7,
+    S_FEATHER8,
+    S_FEATHERX,
+    S_MUMMY_LOOK1,
+    S_MUMMY_LOOK2,
+    S_MUMMY_WALK1,
+    S_MUMMY_WALK2,
+    S_MUMMY_WALK3,
+    S_MUMMY_WALK4,
+    S_MUMMY_ATK1,
+    S_MUMMY_ATK2,
+    S_MUMMY_ATK3,
+    S_MUMMYL_ATK1,
+    S_MUMMYL_ATK2,
+    S_MUMMYL_ATK3,
+    S_MUMMYL_ATK4,
+    S_MUMMYL_ATK5,
+    S_MUMMYL_ATK6,
+    S_MUMMY_PAIN1,
+    S_MUMMY_PAIN2,
+    S_MUMMY_DIE1,
+    S_MUMMY_DIE2,
+    S_MUMMY_DIE3,
+    S_MUMMY_DIE4,
+    S_MUMMY_DIE5,
+    S_MUMMY_DIE6,
+    S_MUMMY_DIE7,
+    S_MUMMY_DIE8,
+    S_MUMMY_SOUL1,
+    S_MUMMY_SOUL2,
+    S_MUMMY_SOUL3,
+    S_MUMMY_SOUL4,
+    S_MUMMY_SOUL5,
+    S_MUMMY_SOUL6,
+    S_MUMMY_SOUL7,
+    S_MUMMYFX1_1,
+    S_MUMMYFX1_2,
+    S_MUMMYFX1_3,
+    S_MUMMYFX1_4,
+    S_MUMMYFXI1_1,
+    S_MUMMYFXI1_2,
+    S_MUMMYFXI1_3,
+    S_MUMMYFXI1_4,
+    S_BEAST_LOOK1,
+    S_BEAST_LOOK2,
+    S_BEAST_WALK1,
+    S_BEAST_WALK2,
+    S_BEAST_WALK3,
+    S_BEAST_WALK4,
+    S_BEAST_WALK5,
+    S_BEAST_WALK6,
+    S_BEAST_ATK1,
+    S_BEAST_ATK2,
+    S_BEAST_PAIN1,
+    S_BEAST_PAIN2,
+    S_BEAST_DIE1,
+    S_BEAST_DIE2,
+    S_BEAST_DIE3,
+    S_BEAST_DIE4,
+    S_BEAST_DIE5,
+    S_BEAST_DIE6,
+    S_BEAST_DIE7,
+    S_BEAST_DIE8,
+    S_BEAST_DIE9,
+    S_BEAST_XDIE1,
+    S_BEAST_XDIE2,
+    S_BEAST_XDIE3,
+    S_BEAST_XDIE4,
+    S_BEAST_XDIE5,
+    S_BEAST_XDIE6,
+    S_BEAST_XDIE7,
+    S_BEAST_XDIE8,
+    S_BEASTBALL1,
+    S_BEASTBALL2,
+    S_BEASTBALL3,
+    S_BEASTBALL4,
+    S_BEASTBALL5,
+    S_BEASTBALL6,
+    S_BEASTBALLX1,
+    S_BEASTBALLX2,
+    S_BEASTBALLX3,
+    S_BEASTBALLX4,
+    S_BEASTBALLX5,
+    S_BURNBALL1,
+    S_BURNBALL2,
+    S_BURNBALL3,
+    S_BURNBALL4,
+    S_BURNBALL5,
+    S_BURNBALL6,
+    S_BURNBALL7,
+    S_BURNBALL8,
+    S_BURNBALLFB1,
+    S_BURNBALLFB2,
+    S_BURNBALLFB3,
+    S_BURNBALLFB4,
+    S_BURNBALLFB5,
+    S_BURNBALLFB6,
+    S_BURNBALLFB7,
+    S_BURNBALLFB8,
+    S_PUFFY1,
+    S_PUFFY2,
+    S_PUFFY3,
+    S_PUFFY4,
+    S_PUFFY5,
+    S_SNAKE_LOOK1,
+    S_SNAKE_LOOK2,
+    S_SNAKE_WALK1,
+    S_SNAKE_WALK2,
+    S_SNAKE_WALK3,
+    S_SNAKE_WALK4,
+    S_SNAKE_ATK1,
+    S_SNAKE_ATK2,
+    S_SNAKE_ATK3,
+    S_SNAKE_ATK4,
+    S_SNAKE_ATK5,
+    S_SNAKE_ATK6,
+    S_SNAKE_ATK7,
+    S_SNAKE_ATK8,
+    S_SNAKE_ATK9,
+    S_SNAKE_PAIN1,
+    S_SNAKE_PAIN2,
+    S_SNAKE_DIE1,
+    S_SNAKE_DIE2,
+    S_SNAKE_DIE3,
+    S_SNAKE_DIE4,
+    S_SNAKE_DIE5,
+    S_SNAKE_DIE6,
+    S_SNAKE_DIE7,
+    S_SNAKE_DIE8,
+    S_SNAKE_DIE9,
+    S_SNAKE_DIE10,
+    S_SNAKEPRO_A1,
+    S_SNAKEPRO_A2,
+    S_SNAKEPRO_A3,
+    S_SNAKEPRO_A4,
+    S_SNAKEPRO_AX1,
+    S_SNAKEPRO_AX2,
+    S_SNAKEPRO_AX3,
+    S_SNAKEPRO_AX4,
+    S_SNAKEPRO_AX5,
+    S_SNAKEPRO_B1,
+    S_SNAKEPRO_B2,
+    S_SNAKEPRO_BX1,
+    S_SNAKEPRO_BX2,
+    S_SNAKEPRO_BX3,
+    S_SNAKEPRO_BX4,
+    S_HEAD_LOOK,
+    S_HEAD_FLOAT,
+    S_HEAD_ATK1,
+    S_HEAD_ATK2,
+    S_HEAD_PAIN1,
+    S_HEAD_PAIN2,
+    S_HEAD_DIE1,
+    S_HEAD_DIE2,
+    S_HEAD_DIE3,
+    S_HEAD_DIE4,
+    S_HEAD_DIE5,
+    S_HEAD_DIE6,
+    S_HEAD_DIE7,
+    S_HEADFX1_1,
+    S_HEADFX1_2,
+    S_HEADFX1_3,
+    S_HEADFXI1_1,
+    S_HEADFXI1_2,
+    S_HEADFXI1_3,
+    S_HEADFXI1_4,
+    S_HEADFX2_1,
+    S_HEADFX2_2,
+    S_HEADFX2_3,
+    S_HEADFXI2_1,
+    S_HEADFXI2_2,
+    S_HEADFXI2_3,
+    S_HEADFXI2_4,
+    S_HEADFX3_1,
+    S_HEADFX3_2,
+    S_HEADFX3_3,
+    S_HEADFX3_4,
+    S_HEADFX3_5,
+    S_HEADFX3_6,
+    S_HEADFXI3_1,
+    S_HEADFXI3_2,
+    S_HEADFXI3_3,
+    S_HEADFXI3_4,
+    S_HEADFX4_1,
+    S_HEADFX4_2,
+    S_HEADFX4_3,
+    S_HEADFX4_4,
+    S_HEADFX4_5,
+    S_HEADFX4_6,
+    S_HEADFX4_7,
+    S_HEADFXI4_1,
+    S_HEADFXI4_2,
+    S_HEADFXI4_3,
+    S_HEADFXI4_4,
+    S_CLINK_LOOK1,
+    S_CLINK_LOOK2,
+    S_CLINK_WALK1,
+    S_CLINK_WALK2,
+    S_CLINK_WALK3,
+    S_CLINK_WALK4,
+    S_CLINK_ATK1,
+    S_CLINK_ATK2,
+    S_CLINK_ATK3,
+    S_CLINK_PAIN1,
+    S_CLINK_PAIN2,
+    S_CLINK_DIE1,
+    S_CLINK_DIE2,
+    S_CLINK_DIE3,
+    S_CLINK_DIE4,
+    S_CLINK_DIE5,
+    S_CLINK_DIE6,
+    S_CLINK_DIE7,
+    S_WIZARD_LOOK1,
+    S_WIZARD_LOOK2,
+    S_WIZARD_WALK1,
+    S_WIZARD_WALK2,
+    S_WIZARD_WALK3,
+    S_WIZARD_WALK4,
+    S_WIZARD_WALK5,
+    S_WIZARD_WALK6,
+    S_WIZARD_WALK7,
+    S_WIZARD_WALK8,
+    S_WIZARD_ATK1,
+    S_WIZARD_ATK2,
+    S_WIZARD_ATK3,
+    S_WIZARD_ATK4,
+    S_WIZARD_ATK5,
+    S_WIZARD_ATK6,
+    S_WIZARD_ATK7,
+    S_WIZARD_ATK8,
+    S_WIZARD_ATK9,
+    S_WIZARD_PAIN1,
+    S_WIZARD_PAIN2,
+    S_WIZARD_DIE1,
+    S_WIZARD_DIE2,
+    S_WIZARD_DIE3,
+    S_WIZARD_DIE4,
+    S_WIZARD_DIE5,
+    S_WIZARD_DIE6,
+    S_WIZARD_DIE7,
+    S_WIZARD_DIE8,
+    S_WIZFX1_1,
+    S_WIZFX1_2,
+    S_WIZFXI1_1,
+    S_WIZFXI1_2,
+    S_WIZFXI1_3,
+    S_WIZFXI1_4,
+    S_WIZFXI1_5,
+    S_IMP_LOOK1,
+    S_IMP_LOOK2,
+    S_IMP_LOOK3,
+    S_IMP_LOOK4,
+    S_IMP_FLY1,
+    S_IMP_FLY2,
+    S_IMP_FLY3,
+    S_IMP_FLY4,
+    S_IMP_FLY5,
+    S_IMP_FLY6,
+    S_IMP_FLY7,
+    S_IMP_FLY8,
+    S_IMP_MEATK1,
+    S_IMP_MEATK2,
+    S_IMP_MEATK3,
+    S_IMP_MSATK1_1,
+    S_IMP_MSATK1_2,
+    S_IMP_MSATK1_3,
+    S_IMP_MSATK1_4,
+    S_IMP_MSATK1_5,
+    S_IMP_MSATK1_6,
+    S_IMP_MSATK2_1,
+    S_IMP_MSATK2_2,
+    S_IMP_MSATK2_3,
+    S_IMP_PAIN1,
+    S_IMP_PAIN2,
+    S_IMP_DIE1,
+    S_IMP_DIE2,
+    S_IMP_XDIE1,
+    S_IMP_XDIE2,
+    S_IMP_XDIE3,
+    S_IMP_XDIE4,
+    S_IMP_XDIE5,
+    S_IMP_CRASH1,
+    S_IMP_CRASH2,
+    S_IMP_CRASH3,
+    S_IMP_CRASH4,
+    S_IMP_XCRASH1,
+    S_IMP_XCRASH2,
+    S_IMP_XCRASH3,
+    S_IMP_CHUNKA1,
+    S_IMP_CHUNKA2,
+    S_IMP_CHUNKA3,
+    S_IMP_CHUNKB1,
+    S_IMP_CHUNKB2,
+    S_IMP_CHUNKB3,
+    S_IMPFX1,
+    S_IMPFX2,
+    S_IMPFX3,
+    S_IMPFXI1,
+    S_IMPFXI2,
+    S_IMPFXI3,
+    S_IMPFXI4,
+    S_KNIGHT_STND1,
+    S_KNIGHT_STND2,
+    S_KNIGHT_WALK1,
+    S_KNIGHT_WALK2,
+    S_KNIGHT_WALK3,
+    S_KNIGHT_WALK4,
+    S_KNIGHT_ATK1,
+    S_KNIGHT_ATK2,
+    S_KNIGHT_ATK3,
+    S_KNIGHT_ATK4,
+    S_KNIGHT_ATK5,
+    S_KNIGHT_ATK6,
+    S_KNIGHT_PAIN1,
+    S_KNIGHT_PAIN2,
+    S_KNIGHT_DIE1,
+    S_KNIGHT_DIE2,
+    S_KNIGHT_DIE3,
+    S_KNIGHT_DIE4,
+    S_KNIGHT_DIE5,
+    S_KNIGHT_DIE6,
+    S_KNIGHT_DIE7,
+    S_SPINAXE1,
+    S_SPINAXE2,
+    S_SPINAXE3,
+    S_SPINAXEX1,
+    S_SPINAXEX2,
+    S_SPINAXEX3,
+    S_REDAXE1,
+    S_REDAXE2,
+    S_REDAXEX1,
+    S_REDAXEX2,
+    S_REDAXEX3,
+    S_SRCR1_LOOK1,
+    S_SRCR1_LOOK2,
+    S_SRCR1_WALK1,
+    S_SRCR1_WALK2,
+    S_SRCR1_WALK3,
+    S_SRCR1_WALK4,
+    S_SRCR1_PAIN1,
+    S_SRCR1_ATK1,
+    S_SRCR1_ATK2,
+    S_SRCR1_ATK3,
+    S_SRCR1_ATK4,
+    S_SRCR1_ATK5,
+    S_SRCR1_ATK6,
+    S_SRCR1_ATK7,
+    S_SRCR1_DIE1,
+    S_SRCR1_DIE2,
+    S_SRCR1_DIE3,
+    S_SRCR1_DIE4,
+    S_SRCR1_DIE5,
+    S_SRCR1_DIE6,
+    S_SRCR1_DIE7,
+    S_SRCR1_DIE8,
+    S_SRCR1_DIE9,
+    S_SRCR1_DIE10,
+    S_SRCR1_DIE11,
+    S_SRCR1_DIE12,
+    S_SRCR1_DIE13,
+    S_SRCR1_DIE14,
+    S_SRCR1_DIE15,
+    S_SRCR1_DIE16,
+    S_SRCR1_DIE17,
+    S_SRCRFX1_1,
+    S_SRCRFX1_2,
+    S_SRCRFX1_3,
+    S_SRCRFXI1_1,
+    S_SRCRFXI1_2,
+    S_SRCRFXI1_3,
+    S_SRCRFXI1_4,
+    S_SRCRFXI1_5,
+    S_SOR2_RISE1,
+    S_SOR2_RISE2,
+    S_SOR2_RISE3,
+    S_SOR2_RISE4,
+    S_SOR2_RISE5,
+    S_SOR2_RISE6,
+    S_SOR2_RISE7,
+    S_SOR2_LOOK1,
+    S_SOR2_LOOK2,
+    S_SOR2_WALK1,
+    S_SOR2_WALK2,
+    S_SOR2_WALK3,
+    S_SOR2_WALK4,
+    S_SOR2_PAIN1,
+    S_SOR2_PAIN2,
+    S_SOR2_ATK1,
+    S_SOR2_ATK2,
+    S_SOR2_ATK3,
+    S_SOR2_TELE1,
+    S_SOR2_TELE2,
+    S_SOR2_TELE3,
+    S_SOR2_TELE4,
+    S_SOR2_TELE5,
+    S_SOR2_TELE6,
+    S_SOR2_DIE1,
+    S_SOR2_DIE2,
+    S_SOR2_DIE3,
+    S_SOR2_DIE4,
+    S_SOR2_DIE5,
+    S_SOR2_DIE6,
+    S_SOR2_DIE7,
+    S_SOR2_DIE8,
+    S_SOR2_DIE9,
+    S_SOR2_DIE10,
+    S_SOR2_DIE11,
+    S_SOR2_DIE12,
+    S_SOR2_DIE13,
+    S_SOR2_DIE14,
+    S_SOR2_DIE15,
+    S_SOR2FX1_1,
+    S_SOR2FX1_2,
+    S_SOR2FX1_3,
+    S_SOR2FXI1_1,
+    S_SOR2FXI1_2,
+    S_SOR2FXI1_3,
+    S_SOR2FXI1_4,
+    S_SOR2FXI1_5,
+    S_SOR2FXI1_6,
+    S_SOR2FXSPARK1,
+    S_SOR2FXSPARK2,
+    S_SOR2FXSPARK3,
+    S_SOR2FX2_1,
+    S_SOR2FX2_2,
+    S_SOR2FX2_3,
+    S_SOR2FXI2_1,
+    S_SOR2FXI2_2,
+    S_SOR2FXI2_3,
+    S_SOR2FXI2_4,
+    S_SOR2FXI2_5,
+    S_SOR2TELEFADE1,
+    S_SOR2TELEFADE2,
+    S_SOR2TELEFADE3,
+    S_SOR2TELEFADE4,
+    S_SOR2TELEFADE5,
+    S_SOR2TELEFADE6,
+    S_MNTR_LOOK1,
+    S_MNTR_LOOK2,
+    S_MNTR_WALK1,
+    S_MNTR_WALK2,
+    S_MNTR_WALK3,
+    S_MNTR_WALK4,
+    S_MNTR_ATK1_1,
+    S_MNTR_ATK1_2,
+    S_MNTR_ATK1_3,
+    S_MNTR_ATK2_1,
+    S_MNTR_ATK2_2,
+    S_MNTR_ATK2_3,
+    S_MNTR_ATK3_1,
+    S_MNTR_ATK3_2,
+    S_MNTR_ATK3_3,
+    S_MNTR_ATK3_4,
+    S_MNTR_ATK4_1,
+    S_MNTR_PAIN1,
+    S_MNTR_PAIN2,
+    S_MNTR_DIE1,
+    S_MNTR_DIE2,
+    S_MNTR_DIE3,
+    S_MNTR_DIE4,
+    S_MNTR_DIE5,
+    S_MNTR_DIE6,
+    S_MNTR_DIE7,
+    S_MNTR_DIE8,
+    S_MNTR_DIE9,
+    S_MNTR_DIE10,
+    S_MNTR_DIE11,
+    S_MNTR_DIE12,
+    S_MNTR_DIE13,
+    S_MNTR_DIE14,
+    S_MNTR_DIE15,
+    S_MNTRFX1_1,
+    S_MNTRFX1_2,
+    S_MNTRFXI1_1,
+    S_MNTRFXI1_2,
+    S_MNTRFXI1_3,
+    S_MNTRFXI1_4,
+    S_MNTRFXI1_5,
+    S_MNTRFXI1_6,
+    S_MNTRFX2_1,
+    S_MNTRFXI2_1,
+    S_MNTRFXI2_2,
+    S_MNTRFXI2_3,
+    S_MNTRFXI2_4,
+    S_MNTRFXI2_5,
+    S_MNTRFX3_1,
+    S_MNTRFX3_2,
+    S_MNTRFX3_3,
+    S_MNTRFX3_4,
+    S_MNTRFX3_5,
+    S_MNTRFX3_6,
+    S_MNTRFX3_7,
+    S_MNTRFX3_8,
+    S_MNTRFX3_9,
+    S_AKYY1,
+    S_AKYY2,
+    S_AKYY3,
+    S_AKYY4,
+    S_AKYY5,
+    S_AKYY6,
+    S_AKYY7,
+    S_AKYY8,
+    S_AKYY9,
+    S_AKYY10,
+    S_BKYY1,
+    S_BKYY2,
+    S_BKYY3,
+    S_BKYY4,
+    S_BKYY5,
+    S_BKYY6,
+    S_BKYY7,
+    S_BKYY8,
+    S_BKYY9,
+    S_BKYY10,
+    S_CKYY1,
+    S_CKYY2,
+    S_CKYY3,
+    S_CKYY4,
+    S_CKYY5,
+    S_CKYY6,
+    S_CKYY7,
+    S_CKYY8,
+    S_CKYY9,
+    S_AMG1,
+    S_AMG2_1,
+    S_AMG2_2,
+    S_AMG2_3,
+    S_AMM1,
+    S_AMM2,
+    S_AMC1,
+    S_AMC2_1,
+    S_AMC2_2,
+    S_AMC2_3,
+    S_AMS1_1,
+    S_AMS1_2,
+    S_AMS2_1,
+    S_AMS2_2,
+    S_AMP1_1,
+    S_AMP1_2,
+    S_AMP1_3,
+    S_AMP2_1,
+    S_AMP2_2,
+    S_AMP2_3,
+    S_AMB1_1,
+    S_AMB1_2,
+    S_AMB1_3,
+    S_AMB2_1,
+    S_AMB2_2,
+    S_AMB2_3,
+    S_SND_WIND,
+    S_SND_WATERFALL,
+    NUMSTATES
+} statenum_t;
+
+
+struct mobj_s;
+struct player_s;
+struct pspdef_s;
+
+
+typedef struct
+{
+    spritenum_t sprite;
+    int frame;
+    int tics;
+    void (*action) (struct mobj_s *, struct player_s *, struct pspdef_s *);
+    statenum_t nextstate;
+    int misc1, misc2;
+} state_t;
+
+extern state_t states[NUMSTATES];
+extern const char *sprnames[];
+
+
+
+typedef enum
+{
+    MT_MISC0,
+    MT_ITEMSHIELD1,
+    MT_ITEMSHIELD2,
+    MT_MISC1,
+    MT_MISC2,
+    MT_ARTIINVISIBILITY,
+    MT_MISC3,
+    MT_ARTIFLY,
+    MT_ARTIINVULNERABILITY,
+    MT_ARTITOMEOFPOWER,
+    MT_ARTIEGG,
+    MT_EGGFX,
+    MT_ARTISUPERHEAL,
+    MT_MISC4,
+    MT_MISC5,
+    MT_FIREBOMB,
+    MT_ARTITELEPORT,
+    MT_POD,
+    MT_PODGOO,
+    MT_PODGENERATOR,
+    MT_SPLASH,
+    MT_SPLASHBASE,
+    MT_LAVASPLASH,
+    MT_LAVASMOKE,
+    MT_SLUDGECHUNK,
+    MT_SLUDGESPLASH,
+    MT_SKULLHANG70,
+    MT_SKULLHANG60,
+    MT_SKULLHANG45,
+    MT_SKULLHANG35,
+    MT_CHANDELIER,
+    MT_SERPTORCH,
+    MT_SMALLPILLAR,
+    MT_STALAGMITESMALL,
+    MT_STALAGMITELARGE,
+    MT_STALACTITESMALL,
+    MT_STALACTITELARGE,
+    MT_MISC6,
+    MT_BARREL,
+    MT_MISC7,
+    MT_MISC8,
+    MT_MISC9,
+    MT_MISC10,
+    MT_MISC11,
+    MT_KEYGIZMOBLUE,
+    MT_KEYGIZMOGREEN,
+    MT_KEYGIZMOYELLOW,
+    MT_KEYGIZMOFLOAT,
+    MT_MISC12,
+    MT_VOLCANOBLAST,
+    MT_VOLCANOTBLAST,
+    MT_TELEGLITGEN,
+    MT_TELEGLITGEN2,
+    MT_TELEGLITTER,
+    MT_TELEGLITTER2,
+    MT_TFOG,
+    MT_TELEPORTMAN,
+    MT_STAFFPUFF,
+    MT_STAFFPUFF2,
+    MT_BEAKPUFF,
+    MT_MISC13,
+    MT_GAUNTLETPUFF1,
+    MT_GAUNTLETPUFF2,
+    MT_MISC14,
+    MT_BLASTERFX1,
+    MT_BLASTERSMOKE,
+    MT_RIPPER,
+    MT_BLASTERPUFF1,
+    MT_BLASTERPUFF2,
+    MT_WMACE,
+    MT_MACEFX1,
+    MT_MACEFX2,
+    MT_MACEFX3,
+    MT_MACEFX4,
+    MT_WSKULLROD,
+    MT_HORNRODFX1,
+    MT_HORNRODFX2,
+    MT_RAINPLR1,
+    MT_RAINPLR2,
+    MT_RAINPLR3,
+    MT_RAINPLR4,
+    MT_GOLDWANDFX1,
+    MT_GOLDWANDFX2,
+    MT_GOLDWANDPUFF1,
+    MT_GOLDWANDPUFF2,
+    MT_WPHOENIXROD,
+    MT_PHOENIXFX1,
+    MT_PHOENIXFX_REMOVED,  // In Heretic 1.0, but removed.
+    MT_PHOENIXPUFF,
+    MT_PHOENIXFX2,
+    MT_MISC15,
+    MT_CRBOWFX1,
+    MT_CRBOWFX2,
+    MT_CRBOWFX3,
+    MT_CRBOWFX4,
+    MT_BLOOD,
+    MT_BLOODSPLATTER,
+    MT_PLAYER,
+    MT_BLOODYSKULL,
+    MT_CHICPLAYER,
+    MT_CHICKEN,
+    MT_FEATHER,
+    MT_MUMMY,
+    MT_MUMMYLEADER,
+    MT_MUMMYGHOST,
+    MT_MUMMYLEADERGHOST,
+    MT_MUMMYSOUL,
+    MT_MUMMYFX1,
+    MT_BEAST,
+    MT_BEASTBALL,
+    MT_BURNBALL,
+    MT_BURNBALLFB,
+    MT_PUFFY,
+    MT_SNAKE,
+    MT_SNAKEPRO_A,
+    MT_SNAKEPRO_B,
+    MT_HEAD,
+    MT_HEADFX1,
+    MT_HEADFX2,
+    MT_HEADFX3,
+    MT_WHIRLWIND,
+    MT_CLINK,
+    MT_WIZARD,
+    MT_WIZFX1,
+    MT_IMP,
+    MT_IMPLEADER,
+    MT_IMPCHUNK1,
+    MT_IMPCHUNK2,
+    MT_IMPBALL,
+    MT_KNIGHT,
+    MT_KNIGHTGHOST,
+    MT_KNIGHTAXE,
+    MT_REDAXE,
+    MT_SORCERER1,
+    MT_SRCRFX1,
+    MT_SORCERER2,
+    MT_SOR2FX1,
+    MT_SOR2FXSPARK,
+    MT_SOR2FX2,
+    MT_SOR2TELEFADE,
+    MT_MINOTAUR,
+    MT_MNTRFX1,
+    MT_MNTRFX2,
+    MT_MNTRFX3,
+    MT_AKYY,
+    MT_BKYY,
+    MT_CKEY,
+    MT_AMGWNDWIMPY,
+    MT_AMGWNDHEFTY,
+    MT_AMMACEWIMPY,
+    MT_AMMACEHEFTY,
+    MT_AMCBOWWIMPY,
+    MT_AMCBOWHEFTY,
+    MT_AMSKRDWIMPY,
+    MT_AMSKRDHEFTY,
+    MT_AMPHRDWIMPY,
+    MT_AMPHRDHEFTY,
+    MT_AMBLSRWIMPY,
+    MT_AMBLSRHEFTY,
+    MT_SOUNDWIND,
+    MT_SOUNDWATERFALL,
+    NUMMOBJTYPES
+} mobjtype_t;
+
+typedef struct
+{
+    int doomednum;
+    int spawnstate;
+    int spawnhealth;
+    int seestate;
+    int seesound;
+    int reactiontime;
+    int attacksound;
+    int painstate;
+    int painchance;
+    int painsound;
+    int meleestate;
+    int missilestate;
+    int crashstate;
+    int deathstate;
+    int xdeathstate;
+    int deathsound;
+    int speed;
+    int radius;
+    int height;
+    int mass;
+    int damage;
+    int activesound;
+    int flags;
+    int flags2;
+} mobjinfo_t;
+
+extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
+
+#endif /* #ifndef HERETIC_INFO_H */
+
diff --git a/games/NXDoom/src/heretic/m_random.c b/games/NXDoom/src/heretic/m_random.c
new file mode 100644
index 000000000..7d535b848
--- /dev/null
+++ b/games/NXDoom/src/heretic/m_random.c
@@ -0,0 +1,76 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include "m_random.h"
+
+/*
+===============
+=
+= M_Random
+=
+= Returns a 0-255 number
+=
+===============
+*/
+
+const unsigned int rndtable[256] = {
+    0, 8, 109, 220, 222, 241, 149, 107, 75, 248, 254, 140, 16, 66,
+    74, 21, 211, 47, 80, 242, 154, 27, 205, 128, 161, 89, 77, 36,
+    95, 110, 85, 48, 212, 140, 211, 249, 22, 79, 200, 50, 28, 188,
+    52, 140, 202, 120, 68, 145, 62, 70, 184, 190, 91, 197, 152, 224,
+    149, 104, 25, 178, 252, 182, 202, 182, 141, 197, 4, 81, 181, 242,
+    145, 42, 39, 227, 156, 198, 225, 193, 219, 93, 122, 175, 249, 0,
+    175, 143, 70, 239, 46, 246, 163, 53, 163, 109, 168, 135, 2, 235,
+    25, 92, 20, 145, 138, 77, 69, 166, 78, 176, 173, 212, 166, 113,
+    94, 161, 41, 50, 239, 49, 111, 164, 70, 60, 2, 37, 171, 75,
+    136, 156, 11, 56, 42, 146, 138, 229, 73, 146, 77, 61, 98, 196,
+    135, 106, 63, 197, 195, 86, 96, 203, 113, 101, 170, 247, 181, 113,
+    80, 250, 108, 7, 255, 237, 129, 226, 79, 107, 112, 166, 103, 241,
+    24, 223, 239, 120, 198, 58, 60, 82, 128, 3, 184, 66, 143, 224,
+    145, 224, 81, 206, 163, 45, 63, 90, 168, 114, 59, 33, 159, 95,
+    28, 139, 123, 98, 125, 196, 15, 70, 194, 253, 54, 14, 109, 226,
+    71, 17, 161, 93, 186, 87, 244, 138, 20, 52, 123, 251, 26, 36,
+    17, 46, 52, 231, 232, 76, 31, 221, 84, 37, 216, 165, 212, 106,
+    197, 242, 98, 43, 39, 175, 254, 145, 190, 84, 118, 222, 187, 136,
+    120, 163, 236, 249
+};
+
+int rndindex = 0;
+int prndindex = 0;
+
+int P_Random(void)
+{
+    prndindex = (prndindex + 1) & 0xff;
+    return rndtable[prndindex];
+}
+
+int M_Random(void)
+{
+    rndindex = (rndindex + 1) & 0xff;
+    return rndtable[rndindex];
+}
+
+void M_ClearRandom(void)
+{
+    rndindex = prndindex = 0;
+}
+
+// inspired by the same routine in Eternity, thanks haleyjd
+int P_SubRandom (void)
+{
+    int r = P_Random();
+    return r - P_Random();
+}
diff --git a/games/NXDoom/src/heretic/m_random.h b/games/NXDoom/src/heretic/m_random.h
new file mode 100644
index 000000000..d7ec2d187
--- /dev/null
+++ b/games/NXDoom/src/heretic/m_random.h
@@ -0,0 +1,37 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef HERETIC_M_RANDOM_H
+#define HERETIC_M_RANDOM_H
+
+// Most damage defined using HITDICE
+#define HITDICE(a) ((1+(P_Random()&7))*a)
+
+int M_Random(void);
+// returns a number from 0 to 255
+int P_Random(void);
+// as M_Random, but used only by the play simulation
+
+void M_ClearRandom(void);
+// fix randoms for demos
+
+extern int rndindex;
+
+// Defined version of P_Random() - P_Random()
+int P_SubRandom (void);
+
+#endif // HERETIC_M_RANDOM_H
+
diff --git a/games/NXDoom/src/heretic/mn_menu.c b/games/NXDoom/src/heretic/mn_menu.c
new file mode 100644
index 000000000..95cb62ce5
--- /dev/null
+++ b/games/NXDoom/src/heretic/mn_menu.c
@@ -0,0 +1,1824 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// MN_menu.c
+
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "deh_str.h"
+#include "doomdef.h"
+#include "doomkeys.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_swap.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "r_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+#include "am_map.h"
+
+// Macros
+
+#define LEFT_DIR 0
+#define RIGHT_DIR 1
+#define ITEM_HEIGHT 20
+#define SELECTOR_XOFFSET (-28)
+#define SELECTOR_YOFFSET (-1)
+#define SLOTTEXTLEN     16
+#define ASCII_CURSOR '['
+
+// Types
+
+typedef enum
+{
+    ITT_EMPTY,
+    ITT_EFUNC,
+    ITT_LRFUNC,
+    ITT_SETMENU,
+    ITT_INERT
+} ItemType_t;
+
+typedef enum
+{
+    MENU_MAIN,
+    MENU_EPISODE,
+    MENU_SKILL,
+    MENU_OPTIONS,
+    MENU_OPTIONS2,
+    MENU_FILES,
+    MENU_LOAD,
+    MENU_SAVE,
+    MENU_NONE
+} MenuType_t;
+
+typedef struct
+{
+    ItemType_t type;
+    const char *text;
+    boolean(*func) (int option);
+    int option;
+    MenuType_t menu;
+} MenuItem_t;
+
+typedef struct
+{
+    int x;
+    int y;
+    void (*drawFunc) (void);
+    int itemCount;
+    MenuItem_t *items;
+    int oldItPos;
+    MenuType_t prevMenu;
+} Menu_t;
+
+// Private Functions
+
+static void InitFonts(void);
+static void SetMenu(MenuType_t menu);
+static boolean SCNetCheck(int option);
+static boolean SCQuitGame(int option);
+static boolean SCEpisode(int option);
+static boolean SCSkill(int option);
+static boolean SCMouseSensi(int option);
+static boolean SCSfxVolume(int option);
+static boolean SCMusicVolume(int option);
+static boolean SCScreenSize(int option);
+static boolean SCLoadGame(int option);
+static boolean SCSaveGame(int option);
+static boolean SCMessages(int option);
+static boolean SCEndGame(int option);
+static boolean SCInfo(int option);
+static void DrawMainMenu(void);
+static void DrawEpisodeMenu(void);
+static void DrawSkillMenu(void);
+static void DrawOptionsMenu(void);
+static void DrawOptions2Menu(void);
+static void DrawFileSlots(Menu_t * menu);
+static void DrawFilesMenu(void);
+static void MN_DrawInfo(void);
+static void DrawLoadMenu(void);
+static void DrawSaveMenu(void);
+static void DrawSlider(Menu_t * menu, int item, int width, int slot);
+void MN_LoadSlotText(void);
+
+
+// Public Data
+
+boolean MenuActive;
+int InfoType;
+boolean messageson;
+
+// Private Data
+
+static int FontABaseLump;
+static int FontBBaseLump;
+static int SkullBaseLump;
+static Menu_t *CurrentMenu;
+static int CurrentItPos;
+static int MenuEpisode;
+static int MenuTime;
+static boolean soundchanged;
+
+boolean askforquit;
+static int typeofask;
+static boolean FileMenuKeySteal;
+static boolean slottextloaded;
+static boolean joypadsave;
+static char SlotText[6][SLOTTEXTLEN + 2];
+static char oldSlotText[SLOTTEXTLEN + 2];
+static int SlotStatus[6];
+static int slotptr;
+static int currentSlot;
+static int quicksave;
+static int quickload;
+
+static MenuItem_t MainItems[] = {
+    {ITT_EFUNC, "NEW GAME", SCNetCheck, 1, MENU_EPISODE},
+    {ITT_SETMENU, "OPTIONS", NULL, 0, MENU_OPTIONS},
+    {ITT_SETMENU, "GAME FILES", NULL, 0, MENU_FILES},
+    {ITT_EFUNC, "INFO", SCInfo, 0, MENU_NONE},
+    {ITT_EFUNC, "QUIT GAME", SCQuitGame, 0, MENU_NONE}
+};
+
+static Menu_t MainMenu = {
+    110, 56,
+    DrawMainMenu,
+    5, MainItems,
+    0,
+    MENU_NONE
+};
+
+static MenuItem_t EpisodeItems[] = {
+    {ITT_EFUNC, "CITY OF THE DAMNED", SCEpisode, 1, MENU_NONE},
+    {ITT_EFUNC, "HELL'S MAW", SCEpisode, 2, MENU_NONE},
+    {ITT_EFUNC, "THE DOME OF D'SPARIL", SCEpisode, 3, MENU_NONE},
+    {ITT_EFUNC, "THE OSSUARY", SCEpisode, 4, MENU_NONE},
+    {ITT_EFUNC, "THE STAGNANT DEMESNE", SCEpisode, 5, MENU_NONE}
+};
+
+static Menu_t EpisodeMenu = {
+    80, 50,
+    DrawEpisodeMenu,
+    3, EpisodeItems,
+    0,
+    MENU_MAIN
+};
+
+static MenuItem_t FilesItems[] = {
+    {ITT_EFUNC, "LOAD GAME", SCNetCheck, 2, MENU_LOAD},
+    {ITT_SETMENU, "SAVE GAME", NULL, 0, MENU_SAVE}
+};
+
+static Menu_t FilesMenu = {
+    110, 60,
+    DrawFilesMenu,
+    2, FilesItems,
+    0,
+    MENU_MAIN
+};
+
+static MenuItem_t LoadItems[] = {
+    {ITT_EFUNC, NULL, SCLoadGame, 0, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 1, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 2, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 3, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 4, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 5, MENU_NONE}
+};
+
+static Menu_t LoadMenu = {
+    70, 30,
+    DrawLoadMenu,
+    6, LoadItems,
+    0,
+    MENU_FILES
+};
+
+static MenuItem_t SaveItems[] = {
+    {ITT_EFUNC, NULL, SCSaveGame, 0, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 1, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 2, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 3, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 4, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 5, MENU_NONE}
+};
+
+static Menu_t SaveMenu = {
+    70, 30,
+    DrawSaveMenu,
+    6, SaveItems,
+    0,
+    MENU_FILES
+};
+
+static MenuItem_t SkillItems[] = {
+    {ITT_EFUNC, "THOU NEEDETH A WET-NURSE", SCSkill, sk_baby, MENU_NONE},
+    {ITT_EFUNC, "YELLOWBELLIES-R-US", SCSkill, sk_easy, MENU_NONE},
+    {ITT_EFUNC, "BRINGEST THEM ONETH", SCSkill, sk_medium, MENU_NONE},
+    {ITT_EFUNC, "THOU ART A SMITE-MEISTER", SCSkill, sk_hard, MENU_NONE},
+    {ITT_EFUNC, "BLACK PLAGUE POSSESSES THEE",
+     SCSkill, sk_nightmare, MENU_NONE}
+};
+
+static Menu_t SkillMenu = {
+    38, 30,
+    DrawSkillMenu,
+    5, SkillItems,
+    2,
+    MENU_EPISODE
+};
+
+static MenuItem_t OptionsItems[] = {
+    {ITT_EFUNC, "END GAME", SCEndGame, 0, MENU_NONE},
+    {ITT_EFUNC, "MESSAGES : ", SCMessages, 0, MENU_NONE},
+    {ITT_LRFUNC, "MOUSE SENSITIVITY", SCMouseSensi, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_SETMENU, "MORE...", NULL, 0, MENU_OPTIONS2}
+};
+
+static Menu_t OptionsMenu = {
+    88, 30,
+    DrawOptionsMenu,
+    5, OptionsItems,
+    0,
+    MENU_MAIN
+};
+
+static MenuItem_t Options2Items[] = {
+    {ITT_LRFUNC, "SCREEN SIZE", SCScreenSize, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_LRFUNC, "SFX VOLUME", SCSfxVolume, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_LRFUNC, "MUSIC VOLUME", SCMusicVolume, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE}
+};
+
+static Menu_t Options2Menu = {
+    90, 20,
+    DrawOptions2Menu,
+    6, Options2Items,
+    0,
+    MENU_OPTIONS
+};
+
+static Menu_t *Menus[] = {
+    &MainMenu,
+    &EpisodeMenu,
+    &SkillMenu,
+    &OptionsMenu,
+    &Options2Menu,
+    &FilesMenu,
+    &LoadMenu,
+    &SaveMenu
+};
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_Init
+//
+//---------------------------------------------------------------------------
+
+void MN_Init(void)
+{
+    InitFonts();
+    MenuActive = false;
+    messageson = true;
+    SkullBaseLump = W_GetNumForName(DEH_String("M_SKL00"));
+
+    if (gamemode == retail)
+    {                           // Add episodes 4 and 5 to the menu
+        EpisodeMenu.itemCount = 5;
+        EpisodeMenu.y -= ITEM_HEIGHT;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC InitFonts
+//
+//---------------------------------------------------------------------------
+
+static void InitFonts(void)
+{
+    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
+    FontBBaseLump = W_GetNumForName(DEH_String("FONTB_S")) + 1;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DrTextA
+//
+// Draw text using font A.
+//
+//---------------------------------------------------------------------------
+
+void MN_DrTextA(const char *text, int x, int y)
+{
+    char c;
+    patch_t *p;
+
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            x += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+            V_DrawPatch(x, y, p);
+            x += SHORT(p->width) - 1;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC MN_TextAWidth
+//
+// Returns the pixel width of a string using font A.
+//
+//---------------------------------------------------------------------------
+
+int MN_TextAWidth(const char *text)
+{
+    char c;
+    int width;
+    patch_t *p;
+
+    width = 0;
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            width += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+            width += SHORT(p->width) - 1;
+        }
+    }
+    return (width);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DrTextB
+//
+// Draw text using font B.
+//
+//---------------------------------------------------------------------------
+
+void MN_DrTextB(const char *text, int x, int y)
+{
+    char c;
+    patch_t *p;
+
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            x += 8;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
+            V_DrawPatch(x, y, p);
+            x += SHORT(p->width) - 1;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC MN_TextBWidth
+//
+// Returns the pixel width of a string using font B.
+//
+//---------------------------------------------------------------------------
+
+int MN_TextBWidth(const char *text)
+{
+    char c;
+    int width;
+    patch_t *p;
+
+    width = 0;
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            width += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
+            width += SHORT(p->width) - 1;
+        }
+    }
+    return (width);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_Ticker
+//
+//---------------------------------------------------------------------------
+
+void MN_Ticker(void)
+{
+    if (MenuActive == false)
+    {
+        return;
+    }
+    MenuTime++;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_Drawer
+//
+//---------------------------------------------------------------------------
+
+const char *QuitEndMsg[] = {
+    "ARE YOU SURE YOU WANT TO QUIT?",
+    "ARE YOU SURE YOU WANT TO END THE GAME?",
+    "DO YOU WANT TO QUICKSAVE THE GAME NAMED",
+    "DO YOU WANT TO QUICKLOAD THE GAME NAMED"
+};
+
+void MN_Drawer(void)
+{
+    int i;
+    int x;
+    int y;
+    MenuItem_t *item;
+    const char *message;
+    const char *selName;
+
+    if (MenuActive == false)
+    {
+        if (askforquit)
+        {
+            message = DEH_String(QuitEndMsg[typeofask - 1]);
+
+            MN_DrTextA(message, 160 - MN_TextAWidth(message) / 2, 80);
+            if (typeofask == 3)
+            {
+                MN_DrTextA(SlotText[quicksave - 1], 160 -
+                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
+                MN_DrTextA(DEH_String("?"), 160 +
+                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
+            }
+            if (typeofask == 4)
+            {
+                MN_DrTextA(SlotText[quickload - 1], 160 -
+                           MN_TextAWidth(SlotText[quickload - 1]) / 2, 90);
+                MN_DrTextA(DEH_String("?"), 160 +
+                           MN_TextAWidth(SlotText[quickload - 1]) / 2, 90);
+            }
+            UpdateState |= I_FULLSCRN;
+        }
+        return;
+    }
+    else
+    {
+        UpdateState |= I_FULLSCRN;
+        if (InfoType)
+        {
+            MN_DrawInfo();
+            return;
+        }
+        if (screenblocks < 10)
+        {
+            BorderNeedRefresh = true;
+        }
+        if (CurrentMenu->drawFunc != NULL)
+        {
+            CurrentMenu->drawFunc();
+        }
+        x = CurrentMenu->x;
+        y = CurrentMenu->y;
+        item = CurrentMenu->items;
+        for (i = 0; i < CurrentMenu->itemCount; i++)
+        {
+            if (item->type != ITT_EMPTY && item->text)
+            {
+                MN_DrTextB(DEH_String(item->text), x, y);
+            }
+            y += ITEM_HEIGHT;
+            item++;
+        }
+        y = CurrentMenu->y + (CurrentItPos * ITEM_HEIGHT) + SELECTOR_YOFFSET;
+        selName = DEH_String(MenuTime & 16 ? "M_SLCTR1" : "M_SLCTR2");
+        V_DrawPatch(x + SELECTOR_XOFFSET, y,
+                    W_CacheLumpName(selName, PU_CACHE));
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawMainMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawMainMenu(void)
+{
+    int frame;
+
+    frame = (MenuTime / 3) % 18;
+    V_DrawPatch(88, 0, W_CacheLumpName(DEH_String("M_HTIC"), PU_CACHE));
+    V_DrawPatch(40, 10, W_CacheLumpNum(SkullBaseLump + (17 - frame),
+                                       PU_CACHE));
+    V_DrawPatch(232, 10, W_CacheLumpNum(SkullBaseLump + frame, PU_CACHE));
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawEpisodeMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawEpisodeMenu(void)
+{
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSkillMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawSkillMenu(void)
+{
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawFilesMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawFilesMenu(void)
+{
+// clear out the quicksave/quickload stuff
+    quicksave = 0;
+    quickload = 0;
+    players[consoleplayer].message = NULL;
+    players[consoleplayer].messageTics = 1;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawLoadMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawLoadMenu(void)
+{
+    const char *title;
+
+    title = DEH_String("LOAD GAME");
+
+    MN_DrTextB(title, 160 - MN_TextBWidth(title) / 2, 10);
+    if (!slottextloaded)
+    {
+        MN_LoadSlotText();
+    }
+    DrawFileSlots(&LoadMenu);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSaveMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawSaveMenu(void)
+{
+    const char *title;
+
+    title = DEH_String("SAVE GAME");
+
+    MN_DrTextB(title, 160 - MN_TextBWidth(title) / 2, 10);
+    if (!slottextloaded)
+    {
+        MN_LoadSlotText();
+    }
+    DrawFileSlots(&SaveMenu);
+}
+
+//===========================================================================
+//
+// MN_LoadSlotText
+//
+//              Loads in the text message for each slot
+//===========================================================================
+
+void MN_LoadSlotText(void)
+{
+    FILE *fp;
+    int i;
+    char *filename;
+
+    for (i = 0; i < 6; i++)
+    {
+        int retval;
+        filename = SV_Filename(i);
+        fp = M_fopen(filename, "rb+");
+	free(filename);
+
+        if (!fp)
+        {
+            SlotText[i][0] = 0; // empty the string
+            SlotStatus[i] = 0;
+            continue;
+        }
+        retval = fread(&SlotText[i], 1, SLOTTEXTLEN, fp);
+        fclose(fp);
+        SlotStatus[i] = retval == SLOTTEXTLEN;
+    }
+    slottextloaded = true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawFileSlots
+//
+//---------------------------------------------------------------------------
+
+static void DrawFileSlots(Menu_t * menu)
+{
+    int i;
+    int x;
+    int y;
+
+    x = menu->x;
+    y = menu->y;
+    for (i = 0; i < 6; i++)
+    {
+        V_DrawPatch(x, y, W_CacheLumpName(DEH_String("M_FSLOT"), PU_CACHE));
+        if (SlotStatus[i])
+        {
+            MN_DrTextA(SlotText[i], x + 5, y + 5);
+        }
+        y += ITEM_HEIGHT;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawOptionsMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawOptionsMenu(void)
+{
+    if (messageson)
+    {
+        MN_DrTextB(DEH_String("ON"), 196, 50);
+    }
+    else
+    {
+        MN_DrTextB(DEH_String("OFF"), 196, 50);
+    }
+    DrawSlider(&OptionsMenu, 3, 10, mouseSensitivity);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawOptions2Menu
+//
+//---------------------------------------------------------------------------
+
+static void DrawOptions2Menu(void)
+{
+    DrawSlider(&Options2Menu, 1, 9, screenblocks - 3);
+    DrawSlider(&Options2Menu, 3, 16, snd_MaxVolume);
+    DrawSlider(&Options2Menu, 5, 16, snd_MusicVolume);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCNetCheck
+//
+//---------------------------------------------------------------------------
+
+static boolean SCNetCheck(int option)
+{
+    if (!netgame)
+    {                           // okay to go into the menu
+        return true;
+    }
+    switch (option)
+    {
+        case 1:
+            P_SetMessage(&players[consoleplayer],
+                         "YOU CAN'T START A NEW GAME IN NETPLAY!", true);
+            break;
+        case 2:
+            P_SetMessage(&players[consoleplayer],
+                         "YOU CAN'T LOAD A GAME IN NETPLAY!", true);
+            break;
+        default:
+            break;
+    }
+    MenuActive = false;
+    return false;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCQuitGame
+//
+//---------------------------------------------------------------------------
+
+static boolean SCQuitGame(int option)
+{
+    MenuActive = false;
+    askforquit = true;
+    typeofask = 1;              //quit game
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCEndGame
+//
+//---------------------------------------------------------------------------
+
+static boolean SCEndGame(int option)
+{
+    if (demoplayback || netgame)
+    {
+        return false;
+    }
+    MenuActive = false;
+    askforquit = true;
+    typeofask = 2;              //endgame
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCMessages
+//
+//---------------------------------------------------------------------------
+
+static boolean SCMessages(int option)
+{
+    messageson ^= 1;
+    if (messageson)
+    {
+        P_SetMessage(&players[consoleplayer], DEH_String("MESSAGES ON"), true);
+    }
+    else
+    {
+        P_SetMessage(&players[consoleplayer], DEH_String("MESSAGES OFF"), true);
+    }
+    S_StartSound(NULL, sfx_chat);
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCLoadGame
+//
+//---------------------------------------------------------------------------
+
+static boolean SCLoadGame(int option)
+{
+    char *filename;
+
+    if (!SlotStatus[option])
+    {                           // slot's empty...don't try and load
+        return false;
+    }
+
+    filename = SV_Filename(option);
+    G_LoadGame(filename);
+    free(filename);
+
+    MN_DeactivateMenu();
+    BorderNeedRefresh = true;
+    if (quickload == -1)
+    {
+        quickload = option + 1;
+        players[consoleplayer].message = NULL;
+        players[consoleplayer].messageTics = 1;
+    }
+    return true;
+}
+
+//
+// Generate a default save slot name when the user saves to
+// an empty slot via the joypad.
+//
+static void SetDefaultSaveName(int slot)
+{
+    // map from IWAD or PWAD?
+    if (W_IsIWADLump(maplumpinfo) && strcmp(savegamedir, ""))
+    {
+        M_snprintf(SlotText[slot], SLOTTEXTLEN,
+                   "%s", maplumpinfo->name);
+    }
+    else
+    {
+        char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpinfo));
+        char *ext = strrchr(wadname, '.');
+
+        if (ext != NULL)
+        {
+            *ext = '\0';
+        }
+
+        M_snprintf(SlotText[slot], SLOTTEXTLEN,
+                   "%s (%s)", maplumpinfo->name,
+                   wadname);
+        free(wadname);
+    }
+    M_ForceUppercase(SlotText[slot]);
+    joypadsave = false;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCSaveGame
+//
+//---------------------------------------------------------------------------
+
+static boolean SCSaveGame(int option)
+{
+    char *ptr;
+
+    if (!FileMenuKeySteal)
+    {
+        int x, y;
+
+        FileMenuKeySteal = true;
+        // We need to activate the text input interface to type the save
+        // game name:
+        x = SaveMenu.x + 1;
+        y = SaveMenu.y + 1 + option * ITEM_HEIGHT;
+        I_StartTextInput(x, y, x + 190, y + ITEM_HEIGHT - 2);
+
+        M_StringCopy(oldSlotText, SlotText[option], sizeof(oldSlotText));
+        ptr = SlotText[option];
+
+        if (!strcmp(ptr, "") && joypadsave)
+        {
+            SetDefaultSaveName(option);
+        }
+
+        while (*ptr)
+        {
+            ptr++;
+        }
+        *ptr = '[';
+        *(ptr + 1) = 0;
+        SlotStatus[option]++;
+        currentSlot = option;
+        slotptr = ptr - SlotText[option];
+        return false;
+    }
+    else
+    {
+        G_SaveGame(option, SlotText[option]);
+        FileMenuKeySteal = false;
+        I_StopTextInput();
+        MN_DeactivateMenu();
+    }
+    BorderNeedRefresh = true;
+    if (quicksave == -1)
+    {
+        quicksave = option + 1;
+        players[consoleplayer].message = NULL;
+        players[consoleplayer].messageTics = 1;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCEpisode
+//
+//---------------------------------------------------------------------------
+
+static boolean SCEpisode(int option)
+{
+    if (gamemode == shareware && option > 1)
+    {
+        P_SetMessage(&players[consoleplayer],
+                     "ONLY AVAILABLE IN THE REGISTERED VERSION", true);
+    }
+    else
+    {
+        MenuEpisode = option;
+        SetMenu(MENU_SKILL);
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCSkill
+//
+//---------------------------------------------------------------------------
+
+static boolean SCSkill(int option)
+{
+    G_DeferedInitNew(option, MenuEpisode, 1);
+    MN_DeactivateMenu();
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCMouseSensi
+//
+//---------------------------------------------------------------------------
+
+static boolean SCMouseSensi(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (mouseSensitivity < 9)
+        {
+            mouseSensitivity++;
+        }
+    }
+    else if (mouseSensitivity)
+    {
+        mouseSensitivity--;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCSfxVolume
+//
+//---------------------------------------------------------------------------
+
+static boolean SCSfxVolume(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (snd_MaxVolume < 15)
+        {
+            snd_MaxVolume++;
+        }
+    }
+    else if (snd_MaxVolume)
+    {
+        snd_MaxVolume--;
+    }
+    S_SetMaxVolume(false);      // don't recalc the sound curve, yet
+    soundchanged = true;        // we'll set it when we leave the menu
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCMusicVolume
+//
+//---------------------------------------------------------------------------
+
+static boolean SCMusicVolume(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (snd_MusicVolume < 15)
+        {
+            snd_MusicVolume++;
+        }
+    }
+    else if (snd_MusicVolume)
+    {
+        snd_MusicVolume--;
+    }
+    S_SetMusicVolume();
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCScreenSize
+//
+//---------------------------------------------------------------------------
+
+static boolean SCScreenSize(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (screenblocks < 11)
+        {
+            screenblocks++;
+        }
+    }
+    else if (screenblocks > 3)
+    {
+        screenblocks--;
+    }
+    R_SetViewSize(screenblocks, detailLevel);
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCInfo
+//
+//---------------------------------------------------------------------------
+
+static boolean SCInfo(int option)
+{
+    InfoType = 1;
+    S_StartSound(NULL, sfx_dorcls);
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC MN_Responder
+//
+//---------------------------------------------------------------------------
+
+boolean MN_Responder(event_t * event)
+{
+    int charTyped;
+    int key;
+    int i;
+    MenuItem_t *item;
+    char *textBuffer;
+    int dir;
+
+    // In testcontrols mode, none of the function keys should do anything
+    // - the only key is escape to quit.
+
+    if (testcontrols)
+    {
+        if (event->type == ev_quit
+         || (event->type == ev_keydown
+          && (event->data1 == key_menu_activate
+           || event->data1 == key_menu_quit)))
+        {
+            I_Quit();
+            return true;
+        }
+
+        return false;
+    }
+
+    // "close" button pressed on window?
+    if (event->type == ev_quit)
+    {
+        // First click on close = bring up quit confirm message.
+        // Second click = confirm quit.
+
+        if (!MenuActive && askforquit && typeofask == 1)
+        {
+            G_CheckDemoStatus();
+            I_Quit();
+        }
+        else
+        {
+            SCQuitGame(0);
+            S_StartSound(NULL, sfx_chat);
+        }
+        return true;
+    }
+
+    charTyped = 0;
+    key = -1;
+
+    if (event->type == ev_joystick)
+    {
+        // Simulate key presses from joystick events to interact with the menu.
+
+        if (MenuActive)
+        {
+            if (JOY_GET_DPAD(event->data6) != JOY_DIR_NONE)
+            {
+                dir = JOY_GET_DPAD(event->data6);
+            }
+            else if (JOY_GET_LSTICK(event->data6) != JOY_DIR_NONE)
+            {
+                dir = JOY_GET_LSTICK(event->data6);
+            }
+            else
+            {
+                dir = JOY_GET_RSTICK(event->data6);
+            }
+
+            if (dir & JOY_DIR_UP)
+            {
+                key = key_menu_up;
+                joywait = I_GetTime() + 5;
+            }
+            else if (dir & JOY_DIR_DOWN)
+            {
+                key = key_menu_down;
+                joywait = I_GetTime() + 5;
+            }
+            if (dir & JOY_DIR_LEFT)
+            {
+                key = key_menu_left;
+                joywait = I_GetTime() + 5;
+            }
+            else if (dir & JOY_DIR_RIGHT)
+            {
+                key = key_menu_right;
+                joywait = I_GetTime() + 5;
+            }
+
+#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
+#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (event->data1 & (1 << (x))) != 0)
+
+            if (JOY_BUTTON_PRESSED(joybfire))
+            {
+                // Simulate pressing "Enter" when we are supplying a save slot name
+                if (FileMenuKeySteal)
+                {
+                    key = KEY_ENTER;
+                }
+                else
+                {
+                    // if selecting a save slot via joypad, set a flag
+                    if (CurrentMenu == &SaveMenu)
+                    {
+                        joypadsave = true;
+                    }
+                    key = key_menu_forward;
+                }
+                joywait = I_GetTime() + 5;
+            }
+            if (JOY_BUTTON_PRESSED(joybuse))
+            {
+                // If user was entering a save name, back out
+                if (FileMenuKeySteal)
+                {
+                    key = KEY_ESCAPE;
+                }
+                else
+                {
+                    key = key_menu_back;
+                }
+                joywait = I_GetTime() + 5;
+            }
+        }
+        else if (askforquit)
+        {
+            if (JOY_BUTTON_PRESSED(joybfire))
+            {
+                // Simulate a 'Y' keypress
+                key = key_menu_confirm;
+                joywait = I_GetTime() + 5;
+            }
+            if (JOY_BUTTON_PRESSED(joybuse))
+            {
+                // Simulate a 'N' keypress
+                key = key_menu_abort;
+                joywait = I_GetTime() + 5;
+            }
+        }
+        if (JOY_BUTTON_PRESSED(joybmenu))
+        {
+            MN_ActivateMenu();
+            joywait = I_GetTime() + 5;
+            return true;
+        }
+    }
+
+    if (event->type != ev_keydown && key == -1)
+    {
+        return false;
+    }
+
+    if (event->type == ev_keydown)
+    {
+        key = event->data1;
+        charTyped = event->data2;
+    }
+
+    if (InfoType)
+    {
+        if (gamemode == shareware)
+        {
+            InfoType = (InfoType + 1) % 5;
+        }
+        else
+        {
+            InfoType = (InfoType + 1) % 4;
+        }
+        if (key == KEY_ESCAPE)
+        {
+            InfoType = 0;
+        }
+        if (!InfoType)
+        {
+            paused = false;
+            MN_DeactivateMenu();
+            SB_state = -1;      //refresh the statbar
+            BorderNeedRefresh = true;
+        }
+        S_StartSound(NULL, sfx_dorcls);
+        return (true);          //make the info screen eat the keypress
+    }
+
+    if ((ravpic && key == KEY_F1) ||
+        (key != 0 && key == key_menu_screenshot))
+    {
+        G_ScreenShot();
+        return (true);
+    }
+
+    if (askforquit)
+    {
+        if (key == key_menu_confirm)
+        {
+            switch (typeofask)
+            {
+                case 1:
+                    G_CheckDemoStatus();
+                    I_Quit();
+                    return false;
+
+                case 2:
+                    players[consoleplayer].messageTics = 0;
+                    //set the msg to be cleared
+                    players[consoleplayer].message = NULL;
+                    paused = false;
+                    I_SetPalette(W_CacheLumpName
+                                 ("PLAYPAL", PU_CACHE));
+                    D_StartTitle();     // go to intro/demo mode.
+                    break;
+
+                case 3:
+                    P_SetMessage(&players[consoleplayer],
+                                 "QUICKSAVING....", false);
+                    FileMenuKeySteal = true;
+                    SCSaveGame(quicksave - 1);
+                    BorderNeedRefresh = true;
+                    break;
+
+                case 4:
+                    P_SetMessage(&players[consoleplayer],
+                                 "QUICKLOADING....", false);
+                    SCLoadGame(quickload - 1);
+                    BorderNeedRefresh = true;
+                    break;
+
+                default:
+                    break;
+            }
+
+            askforquit = false;
+            typeofask = 0;
+
+            return true;
+        }
+        else if (key == key_menu_abort || key == KEY_ESCAPE)
+        {
+            players[consoleplayer].messageTics = 1;  //set the msg to be cleared
+            askforquit = false;
+            typeofask = 0;
+            paused = false;
+            UpdateState |= I_FULLSCRN;
+            BorderNeedRefresh = true;
+            return true;
+        }
+
+        return false;           // don't let the keys filter thru
+    }
+
+    if (!MenuActive && !chatmodeon)
+    {
+        if (key == key_menu_decscreen)
+        {
+            if (automapactive)
+            {               // Don't screen size in automap
+                return (false);
+            }
+            SCScreenSize(LEFT_DIR);
+            S_StartSound(NULL, sfx_keyup);
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            return (true);
+        }
+        else if (key == key_menu_incscreen)
+        {
+            if (automapactive)
+            {               // Don't screen size in automap
+                return (false);
+            }
+            SCScreenSize(RIGHT_DIR);
+            S_StartSound(NULL, sfx_keyup);
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            return (true);
+        }
+        else if (key == key_menu_help)           // F1
+        {
+            SCInfo(0);      // start up info screens
+            MenuActive = true;
+            return (true);
+        }
+        else if (key == key_menu_save)           // F2 (save game)
+        {
+            if (gamestate == GS_LEVEL && !demoplayback)
+            {
+                MenuActive = true;
+                FileMenuKeySteal = false;
+                MenuTime = 0;
+                CurrentMenu = &SaveMenu;
+                CurrentItPos = CurrentMenu->oldItPos;
+                if (!netgame && !demoplayback)
+                {
+                    paused = true;
+                }
+                S_StartSound(NULL, sfx_dorcls);
+                slottextloaded = false;     //reload the slot text, when needed
+            }
+            return true;
+        }
+        else if (key == key_menu_load)           // F3 (load game)
+        {
+            if (SCNetCheck(2))
+            {
+                MenuActive = true;
+                FileMenuKeySteal = false;
+                MenuTime = 0;
+                CurrentMenu = &LoadMenu;
+                CurrentItPos = CurrentMenu->oldItPos;
+                if (!netgame && !demoplayback)
+                {
+                    paused = true;
+                }
+                S_StartSound(NULL, sfx_dorcls);
+                slottextloaded = false;     //reload the slot text, when needed
+            }
+            return true;
+        }
+        else if (key == key_menu_volume)         // F4 (volume)
+        {
+            MenuActive = true;
+            FileMenuKeySteal = false;
+            MenuTime = 0;
+            CurrentMenu = &Options2Menu;
+            CurrentItPos = CurrentMenu->oldItPos;
+            if (!netgame && !demoplayback)
+            {
+                paused = true;
+            }
+            S_StartSound(NULL, sfx_dorcls);
+            slottextloaded = false; //reload the slot text, when needed
+            return true;
+        }
+        else if (key == key_menu_detail)          // F5 (detail)
+        {
+            // F5 isn't used in Heretic. (detail level)
+            return true;
+        }
+        else if (key == key_menu_qsave)           // F6 (quicksave)
+        {
+            if (gamestate == GS_LEVEL && !demoplayback)
+            {
+                if (!quicksave || quicksave == -1)
+                {
+                    MenuActive = true;
+                    FileMenuKeySteal = false;
+                    MenuTime = 0;
+                    CurrentMenu = &SaveMenu;
+                    CurrentItPos = CurrentMenu->oldItPos;
+                    if (!netgame && !demoplayback)
+                    {
+                        paused = true;
+                    }
+                    S_StartSound(NULL, sfx_dorcls);
+                    slottextloaded = false; //reload the slot text, when needed
+                    quicksave = -1;
+                    P_SetMessage(&players[consoleplayer],
+                                 "CHOOSE A QUICKSAVE SLOT", true);
+                }
+                else
+                {
+                    askforquit = true;
+                    typeofask = 3;
+                    if (!netgame && !demoplayback)
+                    {
+                        paused = true;
+                    }
+                    S_StartSound(NULL, sfx_chat);
+                }
+            }
+            return true;
+        }
+        else if (key == key_menu_endgame)         // F7 (end game)
+        {
+            if (gamestate == GS_LEVEL && !demoplayback)
+            {
+                S_StartSound(NULL, sfx_chat);
+                SCEndGame(0);
+            }
+            return true;
+        }
+        else if (key == key_menu_messages)        // F8 (toggle messages)
+        {
+            SCMessages(0);
+            return true;
+        }
+        else if (key == key_menu_qload)           // F9 (quickload)
+        {
+            if (!quickload || quickload == -1)
+            {
+                MenuActive = true;
+                FileMenuKeySteal = false;
+                MenuTime = 0;
+                CurrentMenu = &LoadMenu;
+                CurrentItPos = CurrentMenu->oldItPos;
+                if (!netgame && !demoplayback)
+                {
+                    paused = true;
+                }
+                S_StartSound(NULL, sfx_dorcls);
+                slottextloaded = false;     //reload the slot text, when needed
+                quickload = -1;
+                P_SetMessage(&players[consoleplayer],
+                             "CHOOSE A QUICKLOAD SLOT", true);
+            }
+            else
+            {
+                askforquit = true;
+                if (!netgame && !demoplayback)
+                {
+                    paused = true;
+                }
+                typeofask = 4;
+                S_StartSound(NULL, sfx_chat);
+            }
+            return true;
+        }
+        else if (key == key_menu_quit)            // F10 (quit)
+        {
+            if (gamestate == GS_LEVEL)
+            {
+                SCQuitGame(0);
+                S_StartSound(NULL, sfx_chat);
+            }
+            return true;
+        }
+        else if (key == key_menu_gamma)           // F11 (gamma correction)
+        {
+            usegamma++;
+            if (usegamma > 4)
+            {
+                usegamma = 0;
+            }
+            I_SetPalette((byte *) W_CacheLumpName("PLAYPAL", PU_CACHE));
+            return true;
+        }
+
+    }
+
+    if (!MenuActive)
+    {
+        if (key == key_menu_activate || gamestate == GS_DEMOSCREEN || demoplayback)
+        {
+            MN_ActivateMenu();
+            return (true);
+        }
+        return (false);
+    }
+    if (!FileMenuKeySteal)
+    {
+        item = &CurrentMenu->items[CurrentItPos];
+
+        if (key == key_menu_down)            // Next menu item
+        {
+            do
+            {
+                if (CurrentItPos + 1 > CurrentMenu->itemCount - 1)
+                {
+                    CurrentItPos = 0;
+                }
+                else
+                {
+                    CurrentItPos++;
+                }
+            }
+            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
+            S_StartSound(NULL, sfx_switch);
+            return (true);
+        }
+        else if (key == key_menu_up)         // Previous menu item
+        {
+            do
+            {
+                if (CurrentItPos == 0)
+                {
+                    CurrentItPos = CurrentMenu->itemCount - 1;
+                }
+                else
+                {
+                    CurrentItPos--;
+                }
+            }
+            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
+            S_StartSound(NULL, sfx_switch);
+            return (true);
+        }
+        else if (key == key_menu_left)       // Slider left
+        {
+            if (item->type == ITT_LRFUNC && item->func != NULL)
+            {
+                item->func(LEFT_DIR);
+                S_StartSound(NULL, sfx_keyup);
+            }
+            return (true);
+        }
+        else if (key == key_menu_right)      // Slider right
+        {
+            if (item->type == ITT_LRFUNC && item->func != NULL)
+            {
+                item->func(RIGHT_DIR);
+                S_StartSound(NULL, sfx_keyup);
+            }
+            return (true);
+        }
+        else if (key == key_menu_forward)    // Activate item (enter)
+        {
+            if (item->type == ITT_SETMENU)
+            {
+                SetMenu(item->menu);
+            }
+            else if (item->func != NULL)
+            {
+                CurrentMenu->oldItPos = CurrentItPos;
+                if (item->type == ITT_LRFUNC)
+                {
+                    item->func(RIGHT_DIR);
+                }
+                else if (item->type == ITT_EFUNC)
+                {
+                    if (item->func(item->option))
+                    {
+                        if (item->menu != MENU_NONE)
+                        {
+                            SetMenu(item->menu);
+                        }
+                    }
+                }
+            }
+            S_StartSound(NULL, sfx_dorcls);
+            return (true);
+        }
+        else if (key == key_menu_activate)     // Toggle menu
+        {
+            MN_DeactivateMenu();
+            return (true);
+        }
+        else if (key == key_menu_back)         // Go back to previous menu
+        {
+            S_StartSound(NULL, sfx_switch);
+            if (CurrentMenu->prevMenu == MENU_NONE)
+            {
+                MN_DeactivateMenu();
+            }
+            else
+            {
+                SetMenu(CurrentMenu->prevMenu);
+            }
+            return (true);
+        }
+        else if (charTyped != 0)
+        {
+            // Jump to menu item based on first letter:
+
+            for (i = 0; i < CurrentMenu->itemCount; i++)
+            {
+                if (CurrentMenu->items[i].text)
+                {
+                    if (toupper(charTyped)
+                        == toupper(DEH_String(CurrentMenu->items[i].text)[0]))
+                    {
+                        CurrentItPos = i;
+                        return (true);
+                    }
+                }
+            }
+        }
+
+        return (false);
+    }
+    else
+    {
+        // Editing file names
+        // When typing a savegame name, we use the fully shifted and
+        // translated input value from event->data3.
+        charTyped = event->data3;
+
+        textBuffer = &SlotText[currentSlot][slotptr];
+        if (key == KEY_BACKSPACE)
+        {
+            if (slotptr)
+            {
+                *textBuffer = 0;
+                slotptr--;
+                textBuffer = &SlotText[currentSlot][slotptr];
+                *textBuffer = ASCII_CURSOR;
+            }
+            return (true);
+        }
+        if (key == KEY_ESCAPE)
+        {
+            memset(SlotText[currentSlot], 0, SLOTTEXTLEN + 2);
+            M_StringCopy(SlotText[currentSlot], oldSlotText,
+                         sizeof(SlotText[currentSlot]));
+            SlotStatus[currentSlot]--;
+            MN_DeactivateMenu();
+            return (true);
+        }
+        if (key == KEY_ENTER)
+        {
+            SlotText[currentSlot][slotptr] = 0; // clear the cursor
+            item = &CurrentMenu->items[CurrentItPos];
+            CurrentMenu->oldItPos = CurrentItPos;
+            if (item->type == ITT_EFUNC)
+            {
+                item->func(item->option);
+                if (item->menu != MENU_NONE)
+                {
+                    SetMenu(item->menu);
+                }
+            }
+            return (true);
+        }
+        if (slotptr < SLOTTEXTLEN && key != KEY_BACKSPACE)
+        {
+            if (isalpha(charTyped))
+            {
+                *textBuffer++ = toupper(charTyped);
+                *textBuffer = ASCII_CURSOR;
+                slotptr++;
+                return (true);
+            }
+            if (isdigit(charTyped) || charTyped == ' '
+              || charTyped == ',' || charTyped == '.' || charTyped == '-'
+              || charTyped == '!')
+            {
+                *textBuffer++ = charTyped;
+                *textBuffer = ASCII_CURSOR;
+                slotptr++;
+                return (true);
+            }
+        }
+        return (true);
+    }
+    return (false);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_ActivateMenu
+//
+//---------------------------------------------------------------------------
+
+void MN_ActivateMenu(void)
+{
+    if (MenuActive)
+    {
+        return;
+    }
+    if (paused)
+    {
+        S_ResumeSound();
+    }
+    MenuActive = true;
+    FileMenuKeySteal = false;
+    MenuTime = 0;
+    CurrentMenu = &MainMenu;
+    CurrentItPos = CurrentMenu->oldItPos;
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+    S_StartSound(NULL, sfx_dorcls);
+    slottextloaded = false;     //reload the slot text, when needed
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DeactivateMenu
+//
+//---------------------------------------------------------------------------
+
+void MN_DeactivateMenu(void)
+{
+    if (CurrentMenu != NULL)
+    {
+        CurrentMenu->oldItPos = CurrentItPos;
+    }
+    MenuActive = false;
+    if (FileMenuKeySteal)
+    {
+        I_StopTextInput();
+    }
+    if (!netgame)
+    {
+        paused = false;
+    }
+    S_StartSound(NULL, sfx_dorcls);
+    if (soundchanged)
+    {
+        S_SetMaxVolume(true);   //recalc the sound curve
+        soundchanged = false;
+    }
+    players[consoleplayer].message = NULL;
+    players[consoleplayer].messageTics = 1;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DrawInfo
+//
+//---------------------------------------------------------------------------
+
+void MN_DrawInfo(void)
+{
+    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
+    V_DrawRawScreen(W_CacheLumpNum(W_GetNumForName("TITLE") + InfoType,
+                                   PU_CACHE));
+//      V_DrawPatch(0, 0, W_CacheLumpNum(W_GetNumForName("TITLE")+InfoType,
+//              PU_CACHE));
+}
+
+
+//---------------------------------------------------------------------------
+//
+// PROC SetMenu
+//
+//---------------------------------------------------------------------------
+
+static void SetMenu(MenuType_t menu)
+{
+    CurrentMenu->oldItPos = CurrentItPos;
+    CurrentMenu = Menus[menu];
+    CurrentItPos = CurrentMenu->oldItPos;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSlider
+//
+//---------------------------------------------------------------------------
+
+static void DrawSlider(Menu_t * menu, int item, int width, int slot)
+{
+    int x;
+    int y;
+    int x2;
+    int count;
+
+    x = menu->x + 24;
+    y = menu->y + 2 + (item * ITEM_HEIGHT);
+    V_DrawPatch(x - 32, y, W_CacheLumpName(DEH_String("M_SLDLT"), PU_CACHE));
+    for (x2 = x, count = width; count--; x2 += 8)
+    {
+        V_DrawPatch(x2, y, W_CacheLumpName(DEH_String(count & 1 ? "M_SLDMD1"
+                                           : "M_SLDMD2"), PU_CACHE));
+    }
+    V_DrawPatch(x2, y, W_CacheLumpName(DEH_String("M_SLDRT"), PU_CACHE));
+    V_DrawPatch(x + 4 + slot * 8, y + 7,
+                W_CacheLumpName(DEH_String("M_SLDKB"), PU_CACHE));
+}
diff --git a/games/NXDoom/src/heretic/p_action.h b/games/NXDoom/src/heretic/p_action.h
new file mode 100644
index 000000000..8bb87071c
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_action.h
@@ -0,0 +1,151 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// External definitions for action pointer functions.
+//
+
+#ifndef HERETIC_P_ACTION_H
+#define HERETIC_P_ACTION_H
+
+void A_FreeTargMobj(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_RestoreSpecialThing1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_RestoreSpecialThing2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_HideThing(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_UnHideThing(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_RestoreArtifact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Scream(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Explode(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_PodPain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_RemovePod(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MakePod(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_InitKeyGizmo(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_VolcanoSet(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_VolcanoBlast(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BeastPuff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_VolcBallImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SpawnTeleGlitter(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SpawnTeleGlitter2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_AccTeleGlitter(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Light0(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_WeaponReady(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Lower(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Raise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_StaffAttackPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ReFire(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_StaffAttackPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BeakReady(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BeakRaise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BeakAttackPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BeakAttackPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_GauntletAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireBlasterPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireBlasterPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SpawnRippers(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireMacePL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireMacePL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MacePL1Check(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MaceBallImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MaceBallImpact2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_DeathBallImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireSkullRodPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireSkullRodPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SkullRodPL2Seek(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_AddPlayerRain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_HideInCeiling(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SkullRodStorm(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_RainImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireGoldWandPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireGoldWandPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FirePhoenixPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_InitPhoenixPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FirePhoenixPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ShutdownPhoenixPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_PhoenixPuff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_RemovedPhoenixFunc(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FlameEnd(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FloatPuff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireCrossbowPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FireCrossbowPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BoltSpark(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Pain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_NoBlocking(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_AddPlayerCorpse(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SkullPop(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FlameSnd(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_CheckBurnGone(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_CheckSkullFloor(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_CheckSkullDone(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Feathers(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ChicLook(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ChicChase(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ChicPain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_FaceTarget(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ChicAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Look(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Chase(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MummyAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MummyAttack2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MummySoul(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ContMobjSound(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MummyFX1Seek(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BeastAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SnakeAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SnakeAttack2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_HeadAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BossDeath(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_HeadIceImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_HeadFireGrow(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_WhirlwindSeek(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ClinkAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_WizAtk1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_WizAtk2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_WizAtk3(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_GhostOff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpMeAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpMsAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpMsAttack2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpDeath(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpXDeath1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpXDeath2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ImpExplode(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_KnightAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_DripBlood(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Sor1Chase(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Sor1Pain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Srcr1Attack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorZap(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorcererRise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorRise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorSightSnd(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Srcr2Decide(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Srcr2Attack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Sor2DthInit(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorDSph(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_Sor2DthLoop(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorDExp(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_SorDBon(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_BlueSpark(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_GenWizard(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MinotaurAtk1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MinotaurDecide(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MinotaurAtk2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MinotaurAtk3(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MinotaurCharge(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_MntrFloorFire(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+void A_ESound(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
+
+#endif /* #ifndef HERETIC_P_ACTION_H */
+
diff --git a/games/NXDoom/src/heretic/p_ceilng.c b/games/NXDoom/src/heretic/p_ceilng.c
new file mode 100644
index 000000000..c37d39732
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_ceilng.c
@@ -0,0 +1,256 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include "doomdef.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+//==================================================================
+//==================================================================
+//
+//                                                      CEILINGS
+//
+//==================================================================
+//==================================================================
+
+ceiling_t *activeceilings[MAXCEILINGS];
+
+//==================================================================
+//
+//      T_MoveCeiling
+//
+//==================================================================
+void T_MoveCeiling(thinker_t *thinker)
+{
+    ceiling_t *ceiling = (ceiling_t *) thinker;
+    result_e res;
+
+    switch (ceiling->direction)
+    {
+        case 0:                // IN STASIS
+            break;
+        case 1:                // UP
+            res = T_MovePlane(ceiling->sector, ceiling->speed,
+                              ceiling->topheight, false, 1,
+                              ceiling->direction);
+            if (!(leveltime & 7))
+                S_StartSound(&ceiling->sector->soundorg,
+                             sfx_dormov);
+            if (res == pastdest)
+                switch (ceiling->type)
+                {
+                    case raiseToHighest:
+                        P_RemoveActiveCeiling(ceiling);
+                        break;
+                    case fastCrushAndRaise:
+                    case crushAndRaise:
+                        ceiling->direction = -1;
+                        break;
+                    default:
+                        break;
+                }
+            break;
+        case -1:               // DOWN
+            res = T_MovePlane(ceiling->sector, ceiling->speed,
+                              ceiling->bottomheight, ceiling->crush, 1,
+                              ceiling->direction);
+            if (!(leveltime & 7))
+                S_StartSound(&ceiling->sector->soundorg,
+                             sfx_dormov);
+            if (res == pastdest)
+                switch (ceiling->type)
+                {
+                    case crushAndRaise:
+                        ceiling->speed = CEILSPEED;
+                    case fastCrushAndRaise:
+                        ceiling->direction = 1;
+                        break;
+                    case lowerAndCrush:
+                    case lowerToFloor:
+                        P_RemoveActiveCeiling(ceiling);
+                        break;
+                    default:
+                        break;
+                }
+            else if (res == crushed)
+                switch (ceiling->type)
+                {
+                    case crushAndRaise:
+                    case lowerAndCrush:
+                        ceiling->speed = CEILSPEED / 8;
+                        break;
+                    default:
+                        break;
+                }
+            break;
+    }
+}
+
+//==================================================================
+//
+//              EV_DoCeiling
+//              Move a ceiling up/down and all around!
+//
+//==================================================================
+int EV_DoCeiling(line_t * line, ceiling_e type)
+{
+    int secnum, rtn;
+    sector_t *sec;
+    ceiling_t *ceiling;
+
+    secnum = -1;
+    rtn = 0;
+
+    //
+    //      Reactivate in-stasis ceilings...for certain types.
+    //
+    switch (type)
+    {
+        case fastCrushAndRaise:
+        case crushAndRaise:
+            P_ActivateInStasisCeiling(line);
+        default:
+            break;
+    }
+
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        //
+        // new door thinker
+        //
+        rtn = 1;
+        ceiling = Z_Malloc(sizeof(*ceiling), PU_LEVSPEC, 0);
+        P_AddThinker(&ceiling->thinker);
+        sec->specialdata = ceiling;
+        ceiling->thinker.function = T_MoveCeiling;
+        ceiling->sector = sec;
+        ceiling->crush = false;
+        switch (type)
+        {
+            case fastCrushAndRaise:
+                ceiling->crush = true;
+                ceiling->topheight = sec->ceilingheight;
+                ceiling->bottomheight = sec->floorheight + (8 * FRACUNIT);
+                ceiling->direction = -1;
+                ceiling->speed = CEILSPEED * 2;
+                break;
+            case crushAndRaise:
+                ceiling->crush = true;
+                ceiling->topheight = sec->ceilingheight;
+            case lowerAndCrush:
+            case lowerToFloor:
+                ceiling->bottomheight = sec->floorheight;
+                if (type != lowerToFloor)
+                    ceiling->bottomheight += 8 * FRACUNIT;
+                ceiling->direction = -1;
+                ceiling->speed = CEILSPEED;
+                break;
+            case raiseToHighest:
+                ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
+                ceiling->direction = 1;
+                ceiling->speed = CEILSPEED;
+                break;
+        }
+
+        ceiling->tag = sec->tag;
+        ceiling->type = type;
+        P_AddActiveCeiling(ceiling);
+    }
+    return rtn;
+}
+
+//==================================================================
+//
+//              Add an active ceiling
+//
+//==================================================================
+void P_AddActiveCeiling(ceiling_t * c)
+{
+    int i;
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] == NULL)
+        {
+            activeceilings[i] = c;
+            return;
+        }
+}
+
+//==================================================================
+//
+//              Remove a ceiling's thinker
+//
+//==================================================================
+void P_RemoveActiveCeiling(ceiling_t * c)
+{
+    int i;
+
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] == c)
+        {
+            activeceilings[i]->sector->specialdata = NULL;
+            P_RemoveThinker(&activeceilings[i]->thinker);
+            activeceilings[i] = NULL;
+            break;
+        }
+}
+
+//==================================================================
+//
+//              Restart a ceiling that's in-stasis
+//
+//==================================================================
+void P_ActivateInStasisCeiling(line_t * line)
+{
+    int i;
+
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] && (activeceilings[i]->tag == line->tag) &&
+            (activeceilings[i]->direction == 0))
+        {
+            activeceilings[i]->direction = activeceilings[i]->olddirection;
+            activeceilings[i]->thinker.function = T_MoveCeiling;
+        }
+}
+
+//==================================================================
+//
+//              EV_CeilingCrushStop
+//              Stop a ceiling from crushing!
+//
+//==================================================================
+int EV_CeilingCrushStop(line_t * line)
+{
+    int i;
+    int rtn;
+
+    rtn = 0;
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] && (activeceilings[i]->tag == line->tag) &&
+            (activeceilings[i]->direction != 0))
+        {
+            activeceilings[i]->olddirection = activeceilings[i]->direction;
+            activeceilings[i]->thinker.function = NULL;
+            activeceilings[i]->direction = 0;   // in-stasis
+            rtn = 1;
+        }
+
+    return rtn;
+}
diff --git a/games/NXDoom/src/heretic/p_doors.c b/games/NXDoom/src/heretic/p_doors.c
new file mode 100644
index 000000000..3cd403735
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_doors.c
@@ -0,0 +1,380 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_doors.c
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+//==================================================================
+//==================================================================
+//
+//                                                      VERTICAL DOORS
+//
+//==================================================================
+//==================================================================
+
+//==================================================================
+//
+//      T_VerticalDoor
+//
+//==================================================================
+void T_VerticalDoor(thinker_t *thinker)
+{
+    vldoor_t *door = (vldoor_t *) thinker;
+    result_e res;
+
+    switch (door->direction)
+    {
+        case 0:                // WAITING
+            if (!--door->topcountdown)
+                switch (door->type)
+                {
+                    case vld_normal:
+                        door->direction = -1;   // time to go back down
+                        S_StartSound(&door->sector->soundorg, sfx_doropn);
+                        break;
+                    case vld_close30ThenOpen:
+                        door->direction = 1;
+                        S_StartSound(&door->sector->soundorg, sfx_doropn);
+                        break;
+                    default:
+                        break;
+                }
+            break;
+        case 2:                // INITIAL WAIT
+            if (!--door->topcountdown)
+            {
+                switch (door->type)
+                {
+                    case vld_raiseIn5Mins:
+                        door->direction = 1;
+                        door->type = vld_normal;
+                        S_StartSound(&door->sector->soundorg, sfx_doropn);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+        case -1:               // DOWN
+            res = T_MovePlane(door->sector, door->speed,
+                              door->sector->floorheight, false, 1,
+                              door->direction);
+            if (res == pastdest)
+            {
+                switch (door->type)
+                {
+                    case vld_normal:
+                    case vld_close:
+                        door->sector->specialdata = NULL;
+                        P_RemoveThinker(&door->thinker);        // unlink and free
+                        S_StartSound(&door->sector->soundorg, sfx_dorcls);
+                        break;
+                    case vld_close30ThenOpen:
+                        door->direction = 0;
+                        door->topcountdown = 35 * 30;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else if (res == crushed)
+            {
+                switch (door->type)
+                {
+                    case vld_close:        // DON'T GO BACK UP!
+                        break;
+                    default:
+                        door->direction = 1;
+                        S_StartSound(&door->sector->soundorg, sfx_doropn);
+                        break;
+                }
+            }
+            break;
+        case 1:                // UP
+            res = T_MovePlane(door->sector, door->speed,
+                              door->topheight, false, 1, door->direction);
+            if (res == pastdest)
+            {
+                switch (door->type)
+                {
+                    case vld_normal:
+                        door->direction = 0;    // wait at top
+                        door->topcountdown = door->topwait;
+                        break;
+                    case vld_close30ThenOpen:
+                    case vld_open:
+                        door->sector->specialdata = NULL;
+                        P_RemoveThinker(&door->thinker);        // unlink and free
+                        S_StopSound(&door->sector->soundorg);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// EV_DoDoor
+//
+// Move a door up/down
+//
+//----------------------------------------------------------------------------
+
+int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed)
+{
+    int secnum;
+    int retcode;
+    sector_t *sec;
+    vldoor_t *door;
+
+    secnum = -1;
+    retcode = 0;
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+        {
+            continue;
+        }
+        // Add new door thinker
+        retcode = 1;
+        door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+        P_AddThinker(&door->thinker);
+        sec->specialdata = door;
+        door->thinker.function = T_VerticalDoor;
+        door->sector = sec;
+        switch (type)
+        {
+            case vld_close:
+                door->topheight = P_FindLowestCeilingSurrounding(sec);
+                door->topheight -= 4 * FRACUNIT;
+                door->direction = -1;
+                S_StartSound(&door->sector->soundorg, sfx_doropn);
+                break;
+            case vld_close30ThenOpen:
+                door->topheight = sec->ceilingheight;
+                door->direction = -1;
+                S_StartSound(&door->sector->soundorg, sfx_doropn);
+                break;
+            case vld_normal:
+            case vld_open:
+                door->direction = 1;
+                door->topheight = P_FindLowestCeilingSurrounding(sec);
+                door->topheight -= 4 * FRACUNIT;
+                if (door->topheight != sec->ceilingheight)
+                {
+                    S_StartSound(&door->sector->soundorg,
+                                 sfx_doropn);
+                }
+                break;
+            default:
+                break;
+        }
+        door->type = type;
+        door->speed = speed;
+        door->topwait = VDOORWAIT;
+    }
+    return (retcode);
+}
+
+//==================================================================
+//
+//      EV_VerticalDoor : open a door manually, no tag value
+//
+//==================================================================
+void EV_VerticalDoor(line_t * line, mobj_t * thing)
+{
+    player_t *player;
+    sector_t *sec;
+    vldoor_t *door;
+    int side;
+
+    side = 0;                   // only front sides can be used
+//
+//      Check for locks
+//
+    player = thing->player;
+    switch (line->special)
+    {
+        case 26:               // Blue Lock
+        case 32:
+            if (!player)
+            {
+                return;
+            }
+            if (!player->keys[key_blue])
+            {
+                P_SetMessage(player, DEH_String(TXT_NEEDBLUEKEY), false);
+                S_StartSound(NULL, sfx_plroof);
+                return;
+            }
+            break;
+        case 27:               // Yellow Lock
+        case 34:
+            if (!player)
+            {
+                return;
+            }
+            if (!player->keys[key_yellow])
+            {
+                P_SetMessage(player, DEH_String(TXT_NEEDYELLOWKEY), false);
+                S_StartSound(NULL, sfx_plroof);
+                return;
+            }
+            break;
+        case 28:               // Green Lock
+        case 33:
+            if (!player)
+            {
+                return;
+            }
+            if (!player->keys[key_green])
+            {
+                P_SetMessage(player, DEH_String(TXT_NEEDGREENKEY), false);
+                S_StartSound(NULL, sfx_plroof);
+                return;
+            }
+            break;
+    }
+
+    // if the sector has an active thinker, use it
+    sec = sides[line->sidenum[side ^ 1]].sector;
+    if (sec->specialdata)
+    {
+        door = sec->specialdata;
+        switch (line->special)
+        {
+            case 1:            // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
+            case 26:
+            case 27:
+            case 28:
+                if (door->direction == -1)
+                {
+                    door->direction = 1;        // go back up
+                }
+                else
+                {
+                    if (!thing->player)
+                    {           // Monsters don't close doors
+                        return;
+                    }
+                    door->direction = -1;       // start going down immediately
+                }
+                return;
+        }
+    }
+
+    // for proper sound
+    switch (line->special)
+    {
+        case 1:                // NORMAL DOOR SOUND
+        case 31:
+            S_StartSound(&sec->soundorg, sfx_doropn);
+            //S_StartSound(&sec->soundorg, sfx_dormov);
+            break;
+        default:               // LOCKED DOOR SOUND
+            S_StartSound(&sec->soundorg, sfx_doropn);
+            //S_StartSound(&sec->soundorg, sfx_dormov);
+            break;
+    }
+
+    //
+    // new door thinker
+    //
+    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+    P_AddThinker(&door->thinker);
+    sec->specialdata = door;
+    door->thinker.function = T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 1;
+    switch (line->special)
+    {
+        case 1:
+        case 26:
+        case 27:
+        case 28:
+            door->type = vld_normal;
+            break;
+        case 31:
+        case 32:
+        case 33:
+        case 34:
+            door->type = vld_open;
+            line->special = 0;
+            break;
+    }
+    door->speed = VDOORSPEED;
+    door->topwait = VDOORWAIT;
+
+    //
+    // find the top and bottom of the movement range
+    //
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4 * FRACUNIT;
+}
+
+//==================================================================
+//
+//      Spawn a door that closes after 30 seconds
+//
+//==================================================================
+void P_SpawnDoorCloseIn30(sector_t * sec)
+{
+    vldoor_t *door;
+
+    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+    P_AddThinker(&door->thinker);
+    sec->specialdata = door;
+    sec->special = 0;
+    door->thinker.function = T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 0;
+    door->type = vld_normal;
+    door->speed = VDOORSPEED;
+    door->topcountdown = 30 * 35;
+}
+
+//==================================================================
+//
+//      Spawn a door that opens after 5 minutes
+//
+//==================================================================
+void P_SpawnDoorRaiseIn5Mins(sector_t * sec, int secnum)
+{
+    vldoor_t *door;
+
+    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+    P_AddThinker(&door->thinker);
+    sec->specialdata = door;
+    sec->special = 0;
+    door->thinker.function = T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 2;
+    door->type = vld_raiseIn5Mins;
+    door->speed = VDOORSPEED;
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4 * FRACUNIT;
+    door->topwait = VDOORWAIT;
+    door->topcountdown = 5 * 60 * 35;
+}
diff --git a/games/NXDoom/src/heretic/p_enemy.c b/games/NXDoom/src/heretic/p_enemy.c
new file mode 100644
index 000000000..3ade41ae9
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_enemy.c
@@ -0,0 +1,2711 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_enemy.c
+
+#include <stdlib.h>
+#include "doomdef.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+// Macros
+
+#define MAX_BOSS_SPOTS 8
+
+// Types
+
+typedef struct
+{
+    fixed_t x;
+    fixed_t y;
+    angle_t angle;
+} BossSpot_t;
+
+// Private Data
+
+static int BossSpotCount;
+static BossSpot_t BossSpots[MAX_BOSS_SPOTS];
+
+//----------------------------------------------------------------------------
+//
+// PROC P_InitMonsters
+//
+// Called at level load.
+//
+//----------------------------------------------------------------------------
+
+void P_InitMonsters(void)
+{
+    BossSpotCount = 0;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_AddBossSpot
+//
+//----------------------------------------------------------------------------
+
+void P_AddBossSpot(fixed_t x, fixed_t y, angle_t angle)
+{
+    if (BossSpotCount == MAX_BOSS_SPOTS)
+    {
+        I_Error("Too many boss spots.");
+    }
+    BossSpots[BossSpotCount].x = x;
+    BossSpots[BossSpotCount].y = y;
+    BossSpots[BossSpotCount].angle = angle;
+    BossSpotCount++;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_RecursiveSound
+//
+//----------------------------------------------------------------------------
+
+mobj_t *soundtarget;
+
+void P_RecursiveSound(sector_t * sec, int soundblocks)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+
+    // Wake up all monsters in this sector
+    if (sec->validcount == validcount
+        && sec->soundtraversed <= soundblocks + 1)
+    {                           // Already flooded
+        return;
+    }
+    sec->validcount = validcount;
+    sec->soundtraversed = soundblocks + 1;
+    sec->soundtarget = soundtarget;
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        if (!(check->flags & ML_TWOSIDED))
+        {
+            continue;
+        }
+        P_LineOpening(check);
+        if (openrange <= 0)
+        {                       // Closed door
+            continue;
+        }
+        if (sides[check->sidenum[0]].sector == sec)
+        {
+            other = sides[check->sidenum[1]].sector;
+        }
+        else
+        {
+            other = sides[check->sidenum[0]].sector;
+        }
+        if (check->flags & ML_SOUNDBLOCK)
+        {
+            if (!soundblocks)
+            {
+                P_RecursiveSound(other, 1);
+            }
+        }
+        else
+        {
+            P_RecursiveSound(other, soundblocks);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_NoiseAlert
+//
+// If a monster yells at a player, it will alert other monsters to the
+// player.
+//
+//----------------------------------------------------------------------------
+
+void P_NoiseAlert(mobj_t * target, mobj_t * emmiter)
+{
+    soundtarget = target;
+    validcount++;
+    P_RecursiveSound(emmiter->subsector->sector, 0);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_CheckMeleeRange
+//
+//----------------------------------------------------------------------------
+
+boolean P_CheckMeleeRange(mobj_t * actor)
+{
+    mobj_t *mo;
+    fixed_t dist;
+
+    if (!actor->target)
+    {
+        return (false);
+    }
+    mo = actor->target;
+    dist = P_AproxDistance(mo->x - actor->x, mo->y - actor->y);
+    if (dist >= MELEERANGE)
+    {
+        return (false);
+    }
+    if (!P_CheckSight(actor, mo))
+    {
+        return (false);
+    }
+    if (mo->z > actor->z + actor->height)
+    {                           // Target is higher than the attacker
+        return (false);
+    }
+    else if (actor->z > mo->z + mo->height)
+    {                           // Attacker is higher
+        return (false);
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_CheckMissileRange
+//
+//----------------------------------------------------------------------------
+
+boolean P_CheckMissileRange(mobj_t * actor)
+{
+    fixed_t dist;
+
+    if (!P_CheckSight(actor, actor->target))
+    {
+        return (false);
+    }
+    if (actor->flags & MF_JUSTHIT)
+    {                           // The target just hit the enemy, so fight back!
+        actor->flags &= ~MF_JUSTHIT;
+        return (true);
+    }
+    if (actor->reactiontime)
+    {                           // Don't attack yet
+        return (false);
+    }
+    dist = (P_AproxDistance(actor->x - actor->target->x,
+                            actor->y - actor->target->y) >> FRACBITS) - 64;
+    if (!actor->info->meleestate)
+    {                           // No melee attack, so fire more frequently
+        dist -= 128;
+    }
+    if (actor->type == MT_IMP)
+    {                           // Imp's fly attack from far away
+        dist >>= 1;
+    }
+    if (dist > 200)
+    {
+        dist = 200;
+    }
+    if (P_Random() < dist)
+    {
+        return (false);
+    }
+    return (true);
+}
+
+/*
+================
+=
+= P_Move
+=
+= Move in the current direction
+= returns false if the move is blocked
+================
+*/
+
+fixed_t xspeed[8] =
+    { FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000, 0, 47000 };
+fixed_t yspeed[8] =
+    { 0, 47000, FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000 };
+
+
+boolean P_Move(mobj_t * actor)
+{
+    fixed_t tryx, tryy;
+    line_t *ld;
+    boolean good;
+
+    if (actor->movedir == DI_NODIR)
+    {
+        return (false);
+    }
+    tryx = actor->x + actor->info->speed * xspeed[actor->movedir];
+    tryy = actor->y + actor->info->speed * yspeed[actor->movedir];
+    if (!P_TryMove(actor, tryx, tryy))
+    {                           // open any specials
+        if (actor->flags & MF_FLOAT && floatok)
+        {                       // must adjust height
+            if (actor->z < tmfloorz)
+            {
+                actor->z += FLOATSPEED;
+            }
+            else
+            {
+                actor->z -= FLOATSPEED;
+            }
+            actor->flags |= MF_INFLOAT;
+            return (true);
+        }
+        if (!numspechit)
+        {
+            return false;
+        }
+        actor->movedir = DI_NODIR;
+        good = false;
+        while (numspechit--)
+        {
+            ld = spechit[numspechit];
+            // if the special isn't a door that can be opened, return false
+            if (P_UseSpecialLine(actor, ld))
+            {
+                good = true;
+            }
+        }
+        return (good);
+    }
+    else
+    {
+        actor->flags &= ~MF_INFLOAT;
+    }
+    if (!(actor->flags & MF_FLOAT))
+    {
+        if (actor->z > actor->floorz)
+        {
+            P_HitFloor(actor);
+        }
+        actor->z = actor->floorz;
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_TryWalk
+//
+// Attempts to move actor in its current (ob->moveangle) direction.
+// If blocked by either a wall or an actor returns FALSE.
+// If move is either clear of block only by a door, returns TRUE and sets.
+// If a door is in the way, an OpenDoor call is made to start it opening.
+//
+//----------------------------------------------------------------------------
+
+boolean P_TryWalk(mobj_t * actor)
+{
+    if (!P_Move(actor))
+    {
+        return (false);
+    }
+    actor->movecount = P_Random() & 15;
+    return (true);
+}
+
+/*
+================
+=
+= P_NewChaseDir
+=
+================
+*/
+
+dirtype_t opposite[] =
+    { DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST, DI_EAST, DI_NORTHEAST,
+    DI_NORTH, DI_NORTHWEST, DI_NODIR
+};
+
+dirtype_t diags[] =
+    { DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST };
+
+void P_NewChaseDir(mobj_t * actor)
+{
+    fixed_t deltax, deltay;
+    dirtype_t d[3];
+    dirtype_t tdir, olddir, turnaround;
+
+    if (!actor->target)
+        I_Error("P_NewChaseDir: called with no target");
+
+    olddir = actor->movedir;
+    turnaround = opposite[olddir];
+
+    deltax = actor->target->x - actor->x;
+    deltay = actor->target->y - actor->y;
+    if (deltax > 10 * FRACUNIT)
+        d[1] = DI_EAST;
+    else if (deltax < -10 * FRACUNIT)
+        d[1] = DI_WEST;
+    else
+        d[1] = DI_NODIR;
+    if (deltay < -10 * FRACUNIT)
+        d[2] = DI_SOUTH;
+    else if (deltay > 10 * FRACUNIT)
+        d[2] = DI_NORTH;
+    else
+        d[2] = DI_NODIR;
+
+// try direct route
+    if (d[1] != DI_NODIR && d[2] != DI_NODIR)
+    {
+        actor->movedir = diags[((deltay < 0) << 1) + (deltax > 0)];
+        if (actor->movedir != turnaround && P_TryWalk(actor))
+            return;
+    }
+
+// try other directions
+    if (P_Random() > 200 || abs(deltay) > abs(deltax))
+    {
+        tdir = d[1];
+        d[1] = d[2];
+        d[2] = tdir;
+    }
+
+    if (d[1] == turnaround)
+        d[1] = DI_NODIR;
+    if (d[2] == turnaround)
+        d[2] = DI_NODIR;
+
+    if (d[1] != DI_NODIR)
+    {
+        actor->movedir = d[1];
+        if (P_TryWalk(actor))
+            return;             /*either moved forward or attacked */
+    }
+
+    if (d[2] != DI_NODIR)
+    {
+        actor->movedir = d[2];
+        if (P_TryWalk(actor))
+            return;
+    }
+
+/* there is no direct path to the player, so pick another direction */
+
+    if (olddir != DI_NODIR)
+    {
+        actor->movedir = olddir;
+        if (P_TryWalk(actor))
+            return;
+    }
+
+    if (P_Random() & 1)         /*randomly determine direction of search */
+    {
+        for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
+        {
+            if (tdir != turnaround)
+            {
+                actor->movedir = tdir;
+                if (P_TryWalk(actor))
+                    return;
+            }
+        }
+    }
+    else
+    {
+        // Iterate over all movedirs.
+        tdir = DI_SOUTHEAST;
+
+        for (;;)
+        {
+            if (tdir != turnaround)
+            {
+                actor->movedir = tdir;
+                if (P_TryWalk(actor))
+                    return;
+            }
+
+            if (tdir == DI_EAST)
+            {
+                break;
+            }
+
+            --tdir;
+        }
+    }
+
+    if (turnaround != DI_NODIR)
+    {
+        actor->movedir = turnaround;
+        if (P_TryWalk(actor))
+            return;
+    }
+
+    actor->movedir = DI_NODIR;  // can't move
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_LookForMonsters
+//
+//---------------------------------------------------------------------------
+
+#define MONS_LOOK_RANGE (20*64*FRACUNIT)
+#define MONS_LOOK_LIMIT 64
+
+boolean P_LookForMonsters(mobj_t * actor)
+{
+    int count;
+    mobj_t *mo;
+    thinker_t *think;
+
+    if (!P_CheckSight(players[0].mo, actor))
+    {                           // Player can't see monster
+        return (false);
+    }
+    count = 0;
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+        if (!(mo->flags & MF_COUNTKILL) || (mo == actor) || (mo->health <= 0))
+        {                       // Not a valid monster
+            continue;
+        }
+        if (P_AproxDistance(actor->x - mo->x, actor->y - mo->y)
+            > MONS_LOOK_RANGE)
+        {                       // Out of range
+            continue;
+        }
+        if (P_Random() < 16)
+        {                       // Skip
+            continue;
+        }
+        if (count++ > MONS_LOOK_LIMIT)
+        {                       // Stop searching
+            return (false);
+        }
+        if (!P_CheckSight(actor, mo))
+        {                       // Out of sight
+            continue;
+        }
+        // Found a target monster
+        actor->target = mo;
+        return (true);
+    }
+    return (false);
+}
+
+/*
+================
+=
+= P_LookForPlayers
+=
+= If allaround is false, only look 180 degrees in front
+= returns true if a player is targeted
+================
+*/
+
+boolean P_LookForPlayers(mobj_t * actor, boolean allaround)
+{
+    int c;
+    int stop;
+    player_t *player;
+    angle_t an;
+    fixed_t dist;
+
+    if (!netgame && players[0].health <= 0)
+    {                           // Single player game and player is dead, look for monsters
+        return (P_LookForMonsters(actor));
+    }
+    c = 0;
+    stop = (actor->lastlook - 1) & 3;
+    for (;; actor->lastlook = (actor->lastlook + 1) & 3)
+    {
+        if (!playeringame[actor->lastlook])
+            continue;
+
+        if (c++ == 2 || actor->lastlook == stop)
+            return false;       // done looking
+
+        player = &players[actor->lastlook];
+        if (player->health <= 0)
+            continue;           // dead
+        if (!P_CheckSight(actor, player->mo))
+            continue;           // out of sight
+
+        if (!allaround)
+        {
+            an = R_PointToAngle2(actor->x, actor->y,
+                                 player->mo->x, player->mo->y) - actor->angle;
+            if (an > ANG90 && an < ANG270)
+            {
+                dist = P_AproxDistance(player->mo->x - actor->x,
+                                       player->mo->y - actor->y);
+                // if real close, react anyway
+                if (dist > MELEERANGE)
+                    continue;   // behind back
+            }
+        }
+        if (player->mo->flags & MF_SHADOW)
+        {                       // Player is invisible
+            if ((P_AproxDistance(player->mo->x - actor->x,
+                                 player->mo->y - actor->y) > 2 * MELEERANGE)
+                && P_AproxDistance(player->mo->momx, player->mo->momy)
+                < 5 * FRACUNIT)
+            {                   // Player is sneaking - can't detect
+                return (false);
+            }
+            if (P_Random() < 225)
+            {                   // Player isn't sneaking, but still didn't detect
+                return (false);
+            }
+        }
+        actor->target = player->mo;
+        return (true);
+    }
+    return (false);
+}
+
+/*
+===============================================================================
+
+						ACTION ROUTINES
+
+===============================================================================
+*/
+
+/*
+==============
+=
+= A_Look
+=
+= Stay in state until a player is sighted
+=
+==============
+*/
+
+void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *targ;
+
+    actor->threshold = 0;       // any shot will wake up
+    targ = actor->subsector->sector->soundtarget;
+    if (targ && (targ->flags & MF_SHOOTABLE))
+    {
+        actor->target = targ;
+        if (actor->flags & MF_AMBUSH)
+        {
+            if (P_CheckSight(actor, actor->target))
+                goto seeyou;
+        }
+        else
+            goto seeyou;
+    }
+
+
+    if (!P_LookForPlayers(actor, false))
+        return;
+
+// go into chase state
+  seeyou:
+    if (actor->info->seesound)
+    {
+        int sound;
+
+/*
+		switch (actor->info->seesound)
+		{
+		case sfx_posit1:
+		case sfx_posit2:
+		case sfx_posit3:
+			sound = sfx_posit1+P_Random()%3;
+			break;
+		case sfx_bgsit1:
+		case sfx_bgsit2:
+			sound = sfx_bgsit1+P_Random()%2;
+			break;
+		default:
+			sound = actor->info->seesound;
+			break;
+		}
+*/
+        sound = actor->info->seesound;
+        if (actor->flags2 & MF2_BOSS)
+        {                       // Full volume
+            S_StartSound(NULL, sound);
+        }
+        else
+        {
+            S_StartSound(actor, sound);
+        }
+    }
+    P_SetMobjState(actor, actor->info->seestate);
+}
+
+
+/*
+==============
+=
+= A_Chase
+=
+= Actor has a melee attack, so it tries to close as fast as possible
+=
+==============
+*/
+
+void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int delta;
+
+    if (actor->reactiontime)
+    {
+        actor->reactiontime--;
+    }
+
+    // Modify target threshold
+    if (actor->threshold)
+    {
+        actor->threshold--;
+    }
+
+    if (gameskill == sk_nightmare)
+    {                           // Monsters move faster in nightmare mode
+        actor->tics -= actor->tics / 2;
+        if (actor->tics < 3)
+        {
+            actor->tics = 3;
+        }
+    }
+
+//
+// turn towards movement direction if not there yet
+//
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+        delta = actor->angle - (actor->movedir << 29);
+        if (delta > 0)
+        {
+            actor->angle -= ANG90 / 2;
+        }
+        else if (delta < 0)
+        {
+            actor->angle += ANG90 / 2;
+        }
+    }
+
+    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {                           // look for a new target
+        if (P_LookForPlayers(actor, true))
+        {                       // got a new target
+            return;
+        }
+        P_SetMobjState(actor, actor->info->spawnstate);
+        return;
+    }
+
+//
+// don't attack twice in a row
+//
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+        if (gameskill != sk_nightmare)
+            P_NewChaseDir(actor);
+        return;
+    }
+
+//
+// check for melee attack
+//      
+    if (actor->info->meleestate && P_CheckMeleeRange(actor))
+    {
+        if (actor->info->attacksound)
+            S_StartSound(actor, actor->info->attacksound);
+        P_SetMobjState(actor, actor->info->meleestate);
+        return;
+    }
+
+//
+// check for missile attack
+//
+    if (actor->info->missilestate)
+    {
+        if (gameskill < sk_nightmare && actor->movecount)
+            goto nomissile;
+        if (!P_CheckMissileRange(actor))
+            goto nomissile;
+        P_SetMobjState(actor, actor->info->missilestate);
+        actor->flags |= MF_JUSTATTACKED;
+        return;
+    }
+  nomissile:
+
+//
+// possibly choose another target
+//
+    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
+    {
+        if (P_LookForPlayers(actor, true))
+            return;             // got a new target
+    }
+
+//
+// chase towards player
+//
+    if (--actor->movecount < 0 || !P_Move(actor))
+    {
+        P_NewChaseDir(actor);
+    }
+
+//
+// make active sound
+//
+    if (actor->info->activesound && P_Random() < 3)
+    {
+        if (actor->type == MT_WIZARD && P_Random() < 128)
+        {
+            S_StartSound(actor, actor->info->seesound);
+        }
+        else if (actor->type == MT_SORCERER2)
+        {
+            S_StartSound(NULL, actor->info->activesound);
+        }
+        else
+        {
+            S_StartSound(actor, actor->info->activesound);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FaceTarget
+//
+//----------------------------------------------------------------------------
+
+void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    actor->flags &= ~MF_AMBUSH;
+    actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x,
+                                   actor->target->y);
+    if (actor->target->flags & MF_SHADOW)
+    {                           // Target is a ghost
+        actor->angle += P_SubRandom() << 21;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Pain
+//
+//----------------------------------------------------------------------------
+
+void A_Pain(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->info->painsound)
+    {
+        S_StartSound(actor, actor->info->painsound);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_DripBlood
+//
+//----------------------------------------------------------------------------
+
+void A_DripBlood(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1,r2;
+
+    r1 = P_SubRandom();
+    r2 = P_SubRandom();
+
+    mo = P_SpawnMobj(actor->x + (r2 << 11),
+                     actor->y + (r1 << 11), actor->z,
+                     MT_BLOOD);
+    mo->momx = P_SubRandom() << 10;
+    mo->momy = P_SubRandom() << 10;
+    mo->flags2 |= MF2_LOGRAV;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_KnightAttack
+//
+//----------------------------------------------------------------------------
+
+void A_KnightAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
+        S_StartSound(actor, sfx_kgtat2);
+        return;
+    }
+    // Throw axe
+    S_StartSound(actor, actor->info->attacksound);
+    if (actor->type == MT_KNIGHTGHOST || P_Random() < 40)
+    {                           // Red axe
+        P_SpawnMissile(actor, actor->target, MT_REDAXE);
+        return;
+    }
+    // Green axe
+    P_SpawnMissile(actor, actor->target, MT_KNIGHTAXE);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpExplode
+//
+//----------------------------------------------------------------------------
+
+void A_ImpExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_IMPCHUNK1);
+    mo->momx = P_SubRandom() << 10;
+    mo->momy = P_SubRandom() << 10;
+    mo->momz = 9 * FRACUNIT;
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_IMPCHUNK2);
+    mo->momx = P_SubRandom() << 10;
+    mo->momy = P_SubRandom() << 10;
+    mo->momz = 9 * FRACUNIT;
+    if (actor->special1.i == 666)
+    {                           // Extreme death crash
+        P_SetMobjState(actor, S_IMP_XCRASH1);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BeastPuff
+//
+//----------------------------------------------------------------------------
+
+void A_BeastPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_Random() > 64)
+    {
+        int r1,r2,r3;
+        r1 = P_SubRandom();
+        r2 = P_SubRandom();
+        r3 = P_SubRandom();
+        P_SpawnMobj(actor->x + (r3 << 10),
+                    actor->y + (r2 << 10),
+                    actor->z + (r1 << 10), MT_PUFFY);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpMeAttack
+//
+//----------------------------------------------------------------------------
+
+void A_ImpMeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, 5 + (P_Random() & 7));
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpMsAttack
+//
+//----------------------------------------------------------------------------
+
+void A_ImpMsAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *dest;
+    angle_t an;
+    int dist;
+
+    if (!actor->target || P_Random() > 64)
+    {
+        P_SetMobjState(actor, actor->info->seestate);
+        return;
+    }
+    dest = actor->target;
+    actor->flags |= MF_SKULLFLY;
+    S_StartSound(actor, actor->info->attacksound);
+    A_FaceTarget(actor, player, psp);
+    an = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(12 * FRACUNIT, finecosine[an]);
+    actor->momy = FixedMul(12 * FRACUNIT, finesine[an]);
+    dist = P_AproxDistance(dest->x - actor->x, dest->y - actor->y);
+    dist = dist / (12 * FRACUNIT);
+    if (dist < 1)
+    {
+        dist = 1;
+    }
+    actor->momz = (dest->z + (dest->height >> 1) - actor->z) / dist;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpMsAttack2
+//
+// Fireball attack of the imp leader.
+//
+//----------------------------------------------------------------------------
+
+void A_ImpMsAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, 5 + (P_Random() & 7));
+        return;
+    }
+    P_SpawnMissile(actor, actor->target, MT_IMPBALL);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpDeath
+//
+//----------------------------------------------------------------------------
+
+void A_ImpDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SOLID;
+    actor->flags2 |= MF2_FOOTCLIP;
+    if (actor->z <= actor->floorz)
+    {
+        P_SetMobjState(actor, S_IMP_CRASH1);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpXDeath1
+//
+//----------------------------------------------------------------------------
+
+void A_ImpXDeath1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SOLID;
+    actor->flags |= MF_NOGRAVITY;
+    actor->flags2 |= MF2_FOOTCLIP;
+    actor->special1.i = 666;      // Flag the crash routine
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ImpXDeath2
+//
+//----------------------------------------------------------------------------
+
+void A_ImpXDeath2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_NOGRAVITY;
+    if (actor->z <= actor->floorz)
+    {
+        P_SetMobjState(actor, S_IMP_CRASH1);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_UpdateChicken
+//
+// Returns true if the chicken morphs.
+//
+//----------------------------------------------------------------------------
+
+boolean P_UpdateChicken(mobj_t * actor, int tics)
+{
+    mobj_t *fog;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    mobjtype_t moType;
+    mobj_t *mo;
+    mobj_t oldChicken;
+
+    actor->special1.i -= tics;
+    if (actor->special1.i > 0)
+    {
+        return (false);
+    }
+    moType = actor->special2.i;
+    x = actor->x;
+    y = actor->y;
+    z = actor->z;
+    oldChicken = *actor;
+    P_SetMobjState(actor, S_FREETARGMOBJ);
+    mo = P_SpawnMobj(x, y, z, moType);
+    if (P_TestMobjLocation(mo) == false)
+    {                           // Didn't fit
+        P_RemoveMobj(mo);
+        mo = P_SpawnMobj(x, y, z, MT_CHICKEN);
+        mo->angle = oldChicken.angle;
+        mo->flags = oldChicken.flags;
+        mo->health = oldChicken.health;
+        mo->target = oldChicken.target;
+        mo->special1.i = 5 * 35;  // Next try in 5 seconds
+        mo->special2.i = moType;
+        return (false);
+    }
+    mo->angle = oldChicken.angle;
+    mo->target = oldChicken.target;
+    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ChicAttack
+//
+//----------------------------------------------------------------------------
+
+void A_ChicAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateChicken(actor, 18))
+    {
+        return;
+    }
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, 1 + (P_Random() & 1));
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ChicLook
+//
+//----------------------------------------------------------------------------
+
+void A_ChicLook(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateChicken(actor, 10))
+    {
+        return;
+    }
+    A_Look(actor, player, psp);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ChicChase
+//
+//----------------------------------------------------------------------------
+
+void A_ChicChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateChicken(actor, 3))
+    {
+        return;
+    }
+    A_Chase(actor, player, psp);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ChicPain
+//
+//----------------------------------------------------------------------------
+
+void A_ChicPain(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateChicken(actor, 10))
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->painsound);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Feathers
+//
+//----------------------------------------------------------------------------
+
+void A_Feathers(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    int count;
+    mobj_t *mo;
+
+    if (actor->health > 0)
+    {                           // Pain
+        count = P_Random() < 32 ? 2 : 1;
+    }
+    else
+    {                           // Death
+        count = 5 + (P_Random() & 3);
+    }
+    for (i = 0; i < count; i++)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z + 20 * FRACUNIT,
+                         MT_FEATHER);
+        mo->target = actor;
+        mo->momx = P_SubRandom() << 8;
+        mo->momy = P_SubRandom() << 8;
+        mo->momz = FRACUNIT + (P_Random() << 9);
+        P_SetMobjState(mo, S_FEATHER1 + (P_Random() & 7));
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MummyAttack
+//
+//----------------------------------------------------------------------------
+
+void A_MummyAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
+        S_StartSound(actor, sfx_mumat2);
+        return;
+    }
+    S_StartSound(actor, sfx_mumat1);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MummyAttack2
+//
+// Mummy leader missile attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MummyAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    //S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
+        return;
+    }
+    mo = P_SpawnMissile(actor, actor->target, MT_MUMMYFX1);
+    //mo = P_SpawnMissile(actor, actor->target, MT_EGGFX);
+    if (mo != NULL)
+    {
+        mo->special1.m = actor->target;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MummyFX1Seek
+//
+//----------------------------------------------------------------------------
+
+void A_MummyFX1Seek(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 20);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MummySoul
+//
+//----------------------------------------------------------------------------
+
+void A_MummySoul(mobj_t * mummy, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(mummy->x, mummy->y, mummy->z + 10 * FRACUNIT,
+                     MT_MUMMYSOUL);
+    mo->momz = FRACUNIT;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Sor1Pain
+//
+//----------------------------------------------------------------------------
+
+void A_Sor1Pain(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->special1.i = 20;       // Number of steps to walk fast
+    A_Pain(actor, player, psp);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Sor1Chase
+//
+//----------------------------------------------------------------------------
+
+void A_Sor1Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special1.i)
+    {
+        actor->special1.i--;
+        actor->tics -= 3;
+    }
+    A_Chase(actor, player, psp);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Srcr1Attack
+//
+// Sorcerer demon attack.
+//
+//----------------------------------------------------------------------------
+
+void A_Srcr1Attack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    fixed_t momz;
+    angle_t angle;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(8));
+        return;
+    }
+    if (actor->health > (actor->info->spawnhealth / 3) * 2)
+    {                           // Spit one fireball
+        P_SpawnMissile(actor, actor->target, MT_SRCRFX1);
+    }
+    else
+    {                           // Spit three fireballs
+        mo = P_SpawnMissile(actor, actor->target, MT_SRCRFX1);
+        if (mo)
+        {
+            momz = mo->momz;
+            angle = mo->angle;
+            P_SpawnMissileAngle(actor, MT_SRCRFX1, angle - ANG1_X * 3, momz);
+            P_SpawnMissileAngle(actor, MT_SRCRFX1, angle + ANG1_X * 3, momz);
+        }
+        if (actor->health < actor->info->spawnhealth / 3)
+        {                       // Maybe attack again
+            if (actor->special1.i)
+            {                   // Just attacked, so don't attack again
+                actor->special1.i = 0;
+            }
+            else
+            {                   // Set state to attack again
+                actor->special1.i = 1;
+                P_SetMobjState(actor, S_SRCR1_ATK4);
+            }
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SorcererRise
+//
+//----------------------------------------------------------------------------
+
+void A_SorcererRise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    actor->flags &= ~MF_SOLID;
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCERER2);
+    P_SetMobjState(mo, S_SOR2_RISE1);
+    mo->angle = actor->angle;
+    mo->target = actor->target;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_DSparilTeleport
+//
+//----------------------------------------------------------------------------
+
+void P_DSparilTeleport(mobj_t *actor)
+{
+    int i;
+    fixed_t x;
+    fixed_t y;
+    fixed_t prevX;
+    fixed_t prevY;
+    fixed_t prevZ;
+    mobj_t *mo;
+
+    if (!BossSpotCount)
+    {                           // No spots
+        return;
+    }
+    i = P_Random();
+    do
+    {
+        i++;
+        x = BossSpots[i % BossSpotCount].x;
+        y = BossSpots[i % BossSpotCount].y;
+    }
+    while (P_AproxDistance(actor->x - x, actor->y - y) < 128 * FRACUNIT);
+    prevX = actor->x;
+    prevY = actor->y;
+    prevZ = actor->z;
+    if (P_TeleportMove(actor, x, y))
+    {
+        mo = P_SpawnMobj(prevX, prevY, prevZ, MT_SOR2TELEFADE);
+        S_StartSound(mo, sfx_telept);
+        P_SetMobjState(actor, S_SOR2_TELE1);
+        S_StartSound(actor, sfx_telept);
+        actor->z = actor->floorz;
+        actor->angle = BossSpots[i % BossSpotCount].angle;
+        actor->momx = actor->momy = actor->momz = 0;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Srcr2Decide
+//
+//----------------------------------------------------------------------------
+
+void A_Srcr2Decide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    static int chance[] = {
+        192, 120, 120, 120, 64, 64, 32, 16, 0
+    };
+
+    if (!BossSpotCount)
+    {                           // No spots
+        return;
+    }
+    if (P_Random() < chance[actor->health / (actor->info->spawnhealth / 8)])
+    {
+        P_DSparilTeleport(actor);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Srcr2Attack
+//
+//----------------------------------------------------------------------------
+
+void A_Srcr2Attack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int chance;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(NULL, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(20));
+        return;
+    }
+    chance = actor->health < actor->info->spawnhealth / 2 ? 96 : 48;
+    if (P_Random() < chance)
+    {                           // Wizard spawners
+        P_SpawnMissileAngle(actor, MT_SOR2FX2,
+                            actor->angle - ANG45, FRACUNIT / 2);
+        P_SpawnMissileAngle(actor, MT_SOR2FX2,
+                            actor->angle + ANG45, FRACUNIT / 2);
+    }
+    else
+    {                           // Blue bolt
+        P_SpawnMissile(actor, actor->target, MT_SOR2FX1);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BlueSpark
+//
+//----------------------------------------------------------------------------
+
+void A_BlueSpark(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    mobj_t *mo;
+
+    for (i = 0; i < 2; i++)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SOR2FXSPARK);
+        mo->momx = P_SubRandom() << 9;
+        mo->momy = P_SubRandom() << 9;
+        mo->momz = FRACUNIT + (P_Random() << 8);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_GenWizard
+//
+//----------------------------------------------------------------------------
+
+void A_GenWizard(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    mobj_t *fog;
+
+    mo = P_SpawnMobj(actor->x, actor->y,
+                     actor->z - mobjinfo[MT_WIZARD].height / 2, MT_WIZARD);
+    if (P_TestMobjLocation(mo) == false)
+    {                           // Didn't fit
+        P_RemoveMobj(mo);
+        return;
+    }
+    actor->momx = actor->momy = actor->momz = 0;
+    P_SetMobjState(actor, mobjinfo[actor->type].deathstate);
+    actor->flags &= ~MF_MISSILE;
+    fog = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Sor2DthInit
+//
+//----------------------------------------------------------------------------
+
+void A_Sor2DthInit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->special1.i = 7;        // Animation loop counter
+    P_Massacre();               // Kill monsters early
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Sor2DthLoop
+//
+//----------------------------------------------------------------------------
+
+void A_Sor2DthLoop(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (--actor->special1.i)
+    {                           // Need to loop
+        P_SetMobjState(actor, S_SOR2_DIE4);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// D'Sparil Sound Routines
+//
+//----------------------------------------------------------------------------
+
+void A_SorZap(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, sfx_sorzap);
+}
+
+void A_SorRise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, sfx_sorrise);
+}
+
+void A_SorDSph(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, sfx_sordsph);
+}
+
+void A_SorDExp(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, sfx_sordexp);
+}
+
+void A_SorDBon(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, sfx_sordbon);
+}
+
+void A_SorSightSnd(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, sfx_sorsit);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurAtk1
+//
+// Melee attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurAtk1(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    player_t *player;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, sfx_stfpow);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
+        if ((player = actor->target->player) != NULL)
+        {                       // Squish the player
+            player->deltaviewheight = -16 * FRACUNIT;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurDecide
+//
+// Choose a missile attack.
+//
+//----------------------------------------------------------------------------
+
+#define MNTR_CHARGE_SPEED (13*FRACUNIT)
+
+void A_MinotaurDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    mobj_t *target;
+    int dist;
+
+    target = actor->target;
+    if (!target)
+    {
+        return;
+    }
+    S_StartSound(actor, sfx_minsit);
+    dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
+    if (target->z + target->height > actor->z
+        && target->z + target->height < actor->z + actor->height
+        && dist < 8 * 64 * FRACUNIT
+        && dist > 1 * 64 * FRACUNIT && P_Random() < 150)
+    {                           // Charge attack
+        // Don't call the state function right away
+        P_SetMobjStateNF(actor, S_MNTR_ATK4_1);
+        actor->flags |= MF_SKULLFLY;
+        A_FaceTarget(actor, player, psp);
+        angle = actor->angle >> ANGLETOFINESHIFT;
+        actor->momx = FixedMul(MNTR_CHARGE_SPEED, finecosine[angle]);
+        actor->momy = FixedMul(MNTR_CHARGE_SPEED, finesine[angle]);
+        actor->special1.i = 35 / 2;       // Charge duration
+    }
+    else if (target->z == target->floorz
+             && dist < 9 * 64 * FRACUNIT && P_Random() < 220)
+    {                           // Floor fire attack
+        P_SetMobjState(actor, S_MNTR_ATK3_1);
+        actor->special2.i = 0;
+    }
+    else
+    {                           // Swing attack
+        A_FaceTarget(actor, player, psp);
+        // Don't need to call P_SetMobjState because the current state
+        // falls through to the swing attack
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurCharge
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurCharge(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *puff;
+
+    if (actor->special1.i)
+    {
+        puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
+        puff->momz = 2 * FRACUNIT;
+        actor->special1.i--;
+    }
+    else
+    {
+        actor->flags &= ~MF_SKULLFLY;
+        P_SetMobjState(actor, actor->info->seestate);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurAtk2
+//
+// Swing attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurAtk2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+    fixed_t momz;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, sfx_minat2);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(5));
+        return;
+    }
+    mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX1);
+    if (mo)
+    {
+        S_StartSound(mo, sfx_minat2);
+        momz = mo->momz;
+        angle = mo->angle;
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 8), momz);
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 8), momz);
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 16), momz);
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 16), momz);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurAtk3
+//
+// Floor fire attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurAtk3(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    mobj_t *mo;
+    player_t *player;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(5));
+        if ((player = actor->target->player) != NULL)
+        {                       // Squish the player
+            player->deltaviewheight = -16 * FRACUNIT;
+        }
+    }
+    else
+    {
+        mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX2);
+        if (mo != NULL)
+        {
+            S_StartSound(mo, sfx_minat1);
+        }
+    }
+    if (P_Random() < 192 && actor->special2.i == 0)
+    {
+        P_SetMobjState(actor, S_MNTR_ATK3_4);
+        actor->special2.i = 1;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MntrFloorFire
+//
+//----------------------------------------------------------------------------
+
+void A_MntrFloorFire(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1, r2;
+
+    r1 = P_SubRandom();
+    r2 = P_SubRandom();
+
+    actor->z = actor->floorz;
+    mo = P_SpawnMobj(actor->x + (r2 << 10),
+                     actor->y + (r1 << 10), ONFLOORZ,
+                     MT_MNTRFX3);
+    mo->target = actor->target;
+    mo->momx = 1;               // Force block checking
+    P_CheckMissileSpawn(mo);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BeastAttack
+//
+//----------------------------------------------------------------------------
+
+void A_BeastAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
+        return;
+    }
+    P_SpawnMissile(actor, actor->target, MT_BEASTBALL);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_HeadAttack
+//
+//----------------------------------------------------------------------------
+
+void A_HeadAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    mobj_t *fire;
+    mobj_t *baseFire;
+    mobj_t *mo;
+    mobj_t *target;
+    int randAttack;
+    static int atkResolve1[] = { 50, 150 };
+    static int atkResolve2[] = { 150, 200 };
+    int dist;
+
+    // Ice ball             (close 20% : far 60%)
+    // Fire column  (close 40% : far 20%)
+    // Whirlwind    (close 40% : far 20%)
+    // Distance threshold = 8 cells
+
+    target = actor->target;
+    if (target == NULL)
+    {
+        return;
+    }
+    A_FaceTarget(actor, player, psp);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(target, actor, actor, HITDICE(6));
+        return;
+    }
+    dist = P_AproxDistance(actor->x - target->x, actor->y - target->y)
+        > 8 * 64 * FRACUNIT;
+    randAttack = P_Random();
+    if (randAttack < atkResolve1[dist])
+    {                           // Ice ball
+        P_SpawnMissile(actor, target, MT_HEADFX1);
+        S_StartSound(actor, sfx_hedat2);
+    }
+    else if (randAttack < atkResolve2[dist])
+    {                           // Fire column
+        baseFire = P_SpawnMissile(actor, target, MT_HEADFX3);
+        if (baseFire != NULL)
+        {
+            P_SetMobjState(baseFire, S_HEADFX3_4);      // Don't grow
+            for (i = 0; i < 5; i++)
+            {
+                fire = P_SpawnMobj(baseFire->x, baseFire->y,
+                                   baseFire->z, MT_HEADFX3);
+                if (i == 0)
+                {
+                    S_StartSound(actor, sfx_hedat1);
+                }
+                fire->target = baseFire->target;
+                fire->angle = baseFire->angle;
+                fire->momx = baseFire->momx;
+                fire->momy = baseFire->momy;
+                fire->momz = baseFire->momz;
+                fire->damage = 0;
+                fire->health = (i + 1) * 2;
+                P_CheckMissileSpawn(fire);
+            }
+        }
+    }
+    else
+    {                           // Whirlwind
+        mo = P_SpawnMissile(actor, target, MT_WHIRLWIND);
+        if (mo != NULL)
+        {
+            mo->z -= 32 * FRACUNIT;
+            mo->special1.m = target;
+            mo->special2.i = 50;  // Timer for active sound
+            mo->health = 20 * TICRATE;       // Duration
+            S_StartSound(actor, sfx_hedat3);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_WhirlwindSeek
+//
+//----------------------------------------------------------------------------
+
+void A_WhirlwindSeek(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->health -= 3;
+    if (actor->health < 0)
+    {
+        actor->momx = actor->momy = actor->momz = 0;
+        P_SetMobjState(actor, mobjinfo[actor->type].deathstate);
+        actor->flags &= ~MF_MISSILE;
+        return;
+    }
+    if ((actor->special2.i -= 3) < 0)
+    {
+        actor->special2.i = 58 + (P_Random() & 31);
+        S_StartSound(actor, sfx_hedat3);
+    }
+    if (actor->special1.m
+        && (((mobj_t *) (actor->special1.m))->flags & MF_SHADOW))
+    {
+        return;
+    }
+    P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 30);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_HeadIceImpact
+//
+//----------------------------------------------------------------------------
+
+void A_HeadIceImpact(mobj_t * ice, player_t *player, pspdef_t *psp)
+{
+    unsigned int i;
+    angle_t angle;
+    mobj_t *shard;
+
+    for (i = 0; i < 8; i++)
+    {
+        shard = P_SpawnMobj(ice->x, ice->y, ice->z, MT_HEADFX2);
+        angle = i * ANG45;
+        shard->target = ice->target;
+        shard->angle = angle;
+        angle >>= ANGLETOFINESHIFT;
+        shard->momx = FixedMul(shard->info->speed, finecosine[angle]);
+        shard->momy = FixedMul(shard->info->speed, finesine[angle]);
+        shard->momz = (fixed_t)(-.6 * FRACUNIT);
+        P_CheckMissileSpawn(shard);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_HeadFireGrow
+//
+//----------------------------------------------------------------------------
+
+void A_HeadFireGrow(mobj_t * fire, player_t *player, pspdef_t *psp)
+{
+    fire->health--;
+    fire->z += 9 * FRACUNIT;
+    if (fire->health == 0)
+    {
+        fire->damage = fire->info->damage;
+        P_SetMobjState(fire, S_HEADFX3_4);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SnakeAttack
+//
+//----------------------------------------------------------------------------
+
+void A_SnakeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        P_SetMobjState(actor, S_SNAKE_WALK1);
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    A_FaceTarget(actor, player, psp);
+    P_SpawnMissile(actor, actor->target, MT_SNAKEPRO_A);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SnakeAttack2
+//
+//----------------------------------------------------------------------------
+
+void A_SnakeAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        P_SetMobjState(actor, S_SNAKE_WALK1);
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    A_FaceTarget(actor, player, psp);
+    P_SpawnMissile(actor, actor->target, MT_SNAKEPRO_B);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ClinkAttack
+//
+//----------------------------------------------------------------------------
+
+void A_ClinkAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int damage;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        damage = ((P_Random() % 7) + 3);
+        P_DamageMobj(actor->target, actor, actor, damage);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_GhostOff
+//
+//----------------------------------------------------------------------------
+
+void A_GhostOff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SHADOW;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_WizAtk1
+//
+//----------------------------------------------------------------------------
+
+void A_WizAtk1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_FaceTarget(actor, player, psp);
+    actor->flags &= ~MF_SHADOW;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_WizAtk2
+//
+//----------------------------------------------------------------------------
+
+void A_WizAtk2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_FaceTarget(actor, player, psp);
+    actor->flags |= MF_SHADOW;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_WizAtk3
+//
+//----------------------------------------------------------------------------
+
+void A_WizAtk3(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+    fixed_t momz;
+
+    actor->flags &= ~MF_SHADOW;
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
+        return;
+    }
+    mo = P_SpawnMissile(actor, actor->target, MT_WIZFX1);
+    if (mo)
+    {
+        momz = mo->momz;
+        angle = mo->angle;
+        P_SpawnMissileAngle(actor, MT_WIZFX1, angle - (ANG45 / 8), momz);
+        P_SpawnMissileAngle(actor, MT_WIZFX1, angle + (ANG45 / 8), momz);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Scream
+//
+//----------------------------------------------------------------------------
+
+void A_Scream(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    switch (actor->type)
+    {
+        case MT_CHICPLAYER:
+        case MT_SORCERER1:
+        case MT_MINOTAUR:
+            // Make boss death sounds full volume
+            S_StartSound(NULL, actor->info->deathsound);
+            break;
+        case MT_PLAYER:
+            // Handle the different player death screams
+            if (actor->special1.i < 10)
+            {                   // Wimpy death sound
+                S_StartSound(actor, sfx_plrwdth);
+            }
+            else if (actor->health > -50)
+            {                   // Normal death sound
+                S_StartSound(actor, actor->info->deathsound);
+            }
+            else if (actor->health > -100)
+            {                   // Crazy death sound
+                S_StartSound(actor, sfx_plrcdth);
+            }
+            else
+            {                   // Extreme death sound
+                S_StartSound(actor, sfx_gibdth);
+            }
+            break;
+        default:
+            S_StartSound(actor, actor->info->deathsound);
+            break;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_DropItem
+//
+//---------------------------------------------------------------------------
+
+void P_DropItem(mobj_t * source, mobjtype_t type, int special, int chance)
+{
+    mobj_t *mo;
+
+    if (P_Random() > chance)
+    {
+        return;
+    }
+    mo = P_SpawnMobj(source->x, source->y,
+                     source->z + (source->height >> 1), type);
+    mo->momx = P_SubRandom() << 8;
+    mo->momy = P_SubRandom() << 8;
+    mo->momz = FRACUNIT * 5 + (P_Random() << 10);
+    mo->flags |= MF_DROPPED;
+    mo->health = special;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_NoBlocking
+//
+//----------------------------------------------------------------------------
+
+void A_NoBlocking(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SOLID;
+    // Check for monsters dropping things
+    switch (actor->type)
+    {
+        case MT_MUMMY:
+        case MT_MUMMYLEADER:
+        case MT_MUMMYGHOST:
+        case MT_MUMMYLEADERGHOST:
+            P_DropItem(actor, MT_AMGWNDWIMPY, 3, 84);
+            break;
+        case MT_KNIGHT:
+        case MT_KNIGHTGHOST:
+            P_DropItem(actor, MT_AMCBOWWIMPY, 5, 84);
+            break;
+        case MT_WIZARD:
+            P_DropItem(actor, MT_AMBLSRWIMPY, 10, 84);
+            P_DropItem(actor, MT_ARTITOMEOFPOWER, 0, 4);
+            break;
+        case MT_HEAD:
+            P_DropItem(actor, MT_AMBLSRWIMPY, 10, 84);
+            P_DropItem(actor, MT_ARTIEGG, 0, 51);
+            break;
+        case MT_BEAST:
+            P_DropItem(actor, MT_AMCBOWWIMPY, 10, 84);
+            break;
+        case MT_CLINK:
+            P_DropItem(actor, MT_AMSKRDWIMPY, 20, 84);
+            break;
+        case MT_SNAKE:
+            P_DropItem(actor, MT_AMPHRDWIMPY, 5, 84);
+            break;
+        case MT_MINOTAUR:
+            P_DropItem(actor, MT_ARTISUPERHEAL, 0, 51);
+            P_DropItem(actor, MT_AMPHRDWIMPY, 10, 84);
+            break;
+        default:
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Explode
+//
+// Handles a bunch of exploding things.
+//
+//----------------------------------------------------------------------------
+
+void A_Explode(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    int damage;
+
+    damage = 128;
+    switch (actor->type)
+    {
+        case MT_FIREBOMB:      // Time Bombs
+            actor->z += 32 * FRACUNIT;
+            actor->flags &= ~MF_SHADOW;
+            break;
+        case MT_MNTRFX2:       // Minotaur floor fire
+            damage = 24;
+            break;
+        case MT_SOR2FX1:       // D'Sparil missile
+            damage = 80 + (P_Random() & 31);
+            break;
+        default:
+            break;
+    }
+    P_RadiusAttack(actor, actor->target, damage);
+    P_HitFloor(actor);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_PodPain
+//
+//----------------------------------------------------------------------------
+
+void A_PodPain(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    int count;
+    int chance;
+    mobj_t *goo;
+
+    chance = P_Random();
+    if (chance < 128)
+    {
+        return;
+    }
+    count = chance > 240 ? 2 : 1;
+    for (i = 0; i < count; i++)
+    {
+        goo = P_SpawnMobj(actor->x, actor->y,
+                          actor->z + 48 * FRACUNIT, MT_PODGOO);
+        goo->target = actor;
+        goo->momx = P_SubRandom() << 9;
+        goo->momy = P_SubRandom() << 9;
+        goo->momz = FRACUNIT / 2 + (P_Random() << 9);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_RemovePod
+//
+//----------------------------------------------------------------------------
+
+void A_RemovePod(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    if (actor->special2.m)
+    {
+        mo = (mobj_t *) actor->special2.m;
+        if (mo->special1.i > 0)
+        {
+            mo->special1.i--;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MakePod
+//
+//----------------------------------------------------------------------------
+
+#define MAX_GEN_PODS 16
+
+void A_MakePod(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    fixed_t x;
+    fixed_t y;
+
+    if (actor->special1.i == MAX_GEN_PODS)
+    {                           // Too many generated pods
+        return;
+    }
+    x = actor->x;
+    y = actor->y;
+    mo = P_SpawnMobj(x, y, ONFLOORZ, MT_POD);
+    if (P_CheckPosition(mo, x, y) == false)
+    {                           // Didn't fit
+        P_RemoveMobj(mo);
+        return;
+    }
+    P_SetMobjState(mo, S_POD_GROW1);
+    P_ThrustMobj(mo, P_Random() << 24, (fixed_t) (4.5 * FRACUNIT));
+    S_StartSound(mo, sfx_newpod);
+    actor->special1.i++;          // Increment generated pod count
+    mo->special2.m = actor;       // Link the generator to the pod
+    return;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_Massacre
+//
+// Kills all monsters.
+//
+//----------------------------------------------------------------------------
+
+void P_Massacre(void)
+{
+    mobj_t *mo;
+    thinker_t *think;
+
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+        if ((mo->flags & MF_COUNTKILL) && (mo->health > 0))
+        {
+            P_DamageMobj(mo, NULL, NULL, 10000);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BossDeath
+//
+// Trigger special effects if all bosses are dead.
+//
+//----------------------------------------------------------------------------
+
+void A_BossDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    thinker_t *think;
+    line_t dummyLine;
+    static mobjtype_t bossType[6] = {
+        MT_HEAD,
+        MT_MINOTAUR,
+        MT_SORCERER2,
+        MT_HEAD,
+        MT_MINOTAUR,
+        -1
+    };
+
+    if (gamemap != 8)
+    {                           // Not a boss level
+        return;
+    }
+    if (actor->type != bossType[gameepisode - 1])
+    {                           // Not considered a boss in this episode
+        return;
+    }
+    // Make sure all bosses are dead
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+        if ((mo != actor) && (mo->type == actor->type) && (mo->health > 0))
+        {                       // Found a living boss
+            return;
+        }
+    }
+    if (gameepisode > 1)
+    {                           // Kill any remaining monsters
+        P_Massacre();
+    }
+    dummyLine.tag = 666;
+    EV_DoFloor(&dummyLine, lowerFloor);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ESound
+//
+//----------------------------------------------------------------------------
+
+void A_ESound(mobj_t *mo, player_t *player, pspdef_t *psp)
+{
+    int sound = sfx_None;
+
+    switch (mo->type)
+    {
+        case MT_SOUNDWATERFALL:
+            sound = sfx_waterfl;
+            break;
+        case MT_SOUNDWIND:
+            sound = sfx_wind;
+            break;
+        default:
+            break;
+    }
+    S_StartSound(mo, sound);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SpawnTeleGlitter
+//
+//----------------------------------------------------------------------------
+
+void A_SpawnTeleGlitter(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1, r2;
+
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(actor->x + ((r2 & 31) - 16) * FRACUNIT,
+                     actor->y + ((r1 & 31) - 16) * FRACUNIT,
+                     actor->subsector->sector->floorheight, MT_TELEGLITTER);
+    mo->momz = FRACUNIT / 4;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SpawnTeleGlitter2
+//
+//----------------------------------------------------------------------------
+
+void A_SpawnTeleGlitter2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1, r2;
+
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(actor->x + ((r2 & 31) - 16) * FRACUNIT,
+                     actor->y + ((r1 & 31) - 16) * FRACUNIT,
+                     actor->subsector->sector->floorheight, MT_TELEGLITTER2);
+    mo->momz = FRACUNIT / 4;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_AccTeleGlitter
+//
+//----------------------------------------------------------------------------
+
+void A_AccTeleGlitter(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (++actor->health > 35)
+    {
+        actor->momz += actor->momz / 2;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_InitKeyGizmo
+//
+//----------------------------------------------------------------------------
+
+void A_InitKeyGizmo(mobj_t * gizmo, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    statenum_t state = S_NULL;
+
+    switch (gizmo->type)
+    {
+        case MT_KEYGIZMOBLUE:
+            state = S_KGZ_BLUEFLOAT1;
+            break;
+        case MT_KEYGIZMOGREEN:
+            state = S_KGZ_GREENFLOAT1;
+            break;
+        case MT_KEYGIZMOYELLOW:
+            state = S_KGZ_YELLOWFLOAT1;
+            break;
+        default:
+            break;
+    }
+    mo = P_SpawnMobj(gizmo->x, gizmo->y, gizmo->z + 60 * FRACUNIT,
+                     MT_KEYGIZMOFLOAT);
+    P_SetMobjState(mo, state);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_VolcanoSet
+//
+//----------------------------------------------------------------------------
+
+void A_VolcanoSet(mobj_t * volcano, player_t *player, pspdef_t *psp)
+{
+    volcano->tics = 105 + (P_Random() & 127);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_VolcanoBlast
+//
+//----------------------------------------------------------------------------
+
+void A_VolcanoBlast(mobj_t * volcano, player_t *player, pspdef_t *psp)
+{
+    int i;
+    int count;
+    mobj_t *blast;
+    angle_t angle;
+
+    count = 1 + (P_Random() % 3);
+    for (i = 0; i < count; i++)
+    {
+        blast = P_SpawnMobj(volcano->x, volcano->y, volcano->z + 44 * FRACUNIT, MT_VOLCANOBLAST);       // MT_VOLCANOBLAST
+        blast->target = volcano;
+        angle = P_Random() << 24;
+        blast->angle = angle;
+        angle >>= ANGLETOFINESHIFT;
+        blast->momx = FixedMul(1 * FRACUNIT, finecosine[angle]);
+        blast->momy = FixedMul(1 * FRACUNIT, finesine[angle]);
+        blast->momz = (fixed_t)(2.5 * FRACUNIT) + (P_Random() << 10);
+        S_StartSound(blast, sfx_volsht);
+        P_CheckMissileSpawn(blast);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_VolcBallImpact
+//
+//----------------------------------------------------------------------------
+
+void A_VolcBallImpact(mobj_t * ball, player_t *player, pspdef_t *psp)
+{
+    unsigned int i;
+    mobj_t *tiny;
+    angle_t angle;
+
+    if (ball->z <= ball->floorz)
+    {
+        ball->flags |= MF_NOGRAVITY;
+        ball->flags2 &= ~MF2_LOGRAV;
+        ball->z += 28 * FRACUNIT;
+        //ball->momz = 3*FRACUNIT;
+    }
+    P_RadiusAttack(ball, ball->target, 25);
+    for (i = 0; i < 4; i++)
+    {
+        tiny = P_SpawnMobj(ball->x, ball->y, ball->z, MT_VOLCANOTBLAST);
+        tiny->target = ball;
+        angle = i * ANG90;
+        tiny->angle = angle;
+        angle >>= ANGLETOFINESHIFT;
+        tiny->momx = FixedMul((fixed_t)(FRACUNIT * .7), finecosine[angle]);
+        tiny->momy = FixedMul((fixed_t)(FRACUNIT * .7), finesine[angle]);
+        tiny->momz = FRACUNIT + (P_Random() << 9);
+        P_CheckMissileSpawn(tiny);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SkullPop
+//
+//----------------------------------------------------------------------------
+
+void A_SkullPop(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    mobj_t *mo;
+    player_t *player;
+
+    actor->flags &= ~MF_SOLID;
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 48 * FRACUNIT,
+                     MT_BLOODYSKULL);
+    //mo->target = actor;
+    mo->momx = P_SubRandom() << 9;
+    mo->momy = P_SubRandom() << 9;
+    mo->momz = FRACUNIT * 2 + (P_Random() << 6);
+    // Attach player mobj to bloody skull
+    player = actor->player;
+    actor->player = NULL;
+    mo->player = player;
+    mo->health = actor->health;
+    mo->angle = actor->angle;
+
+    // fraggle: This check wasn't originally here in the Vanilla Heretic
+    // source, causing crashes if the player respawns before this
+    // function is called.
+
+    if (player != NULL)
+    {
+        player->mo = mo;
+        player->lookdir = 0;
+        player->damagecount = 32;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_CheckSkullFloor
+//
+//----------------------------------------------------------------------------
+
+void A_CheckSkullFloor(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->z <= actor->floorz)
+    {
+        P_SetMobjState(actor, S_BLOODYSKULLX1);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_CheckSkullDone
+//
+//----------------------------------------------------------------------------
+
+void A_CheckSkullDone(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special2.i == 666)
+    {
+        P_SetMobjState(actor, S_BLOODYSKULLX2);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_CheckBurnGone
+//
+//----------------------------------------------------------------------------
+
+void A_CheckBurnGone(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special2.i == 666)
+    {
+        P_SetMobjState(actor, S_PLAY_FDTH20);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FreeTargMobj
+//
+//----------------------------------------------------------------------------
+
+void A_FreeTargMobj(mobj_t * mo, player_t *player, pspdef_t *psp)
+{
+    mo->momx = mo->momy = mo->momz = 0;
+    mo->z = mo->ceilingz + 4 * FRACUNIT;
+    mo->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_SOLID);
+    mo->flags |= MF_CORPSE | MF_DROPOFF | MF_NOGRAVITY;
+    mo->flags2 &= ~(MF2_PASSMOBJ | MF2_LOGRAV);
+    mo->player = NULL;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_AddPlayerCorpse
+//
+//----------------------------------------------------------------------------
+
+#define BODYQUESIZE 32
+mobj_t *bodyque[BODYQUESIZE];
+int bodyqueslot;
+
+void A_AddPlayerCorpse(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (bodyqueslot >= BODYQUESIZE)
+    {                           // Too many player corpses - remove an old one
+        P_RemoveMobj(bodyque[bodyqueslot % BODYQUESIZE]);
+    }
+    bodyque[bodyqueslot % BODYQUESIZE] = actor;
+    bodyqueslot++;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FlameSnd
+//
+//----------------------------------------------------------------------------
+
+void A_FlameSnd(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(actor, sfx_hedat1);    // Burn sound
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_HideThing
+//
+//----------------------------------------------------------------------------
+
+void A_HideThing(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    //P_UnsetThingPosition(actor);
+    actor->flags2 |= MF2_DONTDRAW;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_UnHideThing
+//
+//----------------------------------------------------------------------------
+
+void A_UnHideThing(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    //P_SetThingPosition(actor);
+    actor->flags2 &= ~MF2_DONTDRAW;
+}
diff --git a/games/NXDoom/src/heretic/p_floor.c b/games/NXDoom/src/heretic/p_floor.c
new file mode 100644
index 000000000..d95a157aa
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_floor.c
@@ -0,0 +1,461 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+#include "doomdef.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+//==================================================================
+//==================================================================
+//
+//                                                              FLOORS
+//
+//==================================================================
+//==================================================================
+
+
+
+//==================================================================
+//
+//      Move a plane (floor or ceiling) and check for crushing
+//
+//==================================================================
+result_e T_MovePlane(sector_t * sector, fixed_t speed,
+                     fixed_t dest, boolean crush, int floorOrCeiling,
+                     int direction)
+{
+    boolean flag;
+    fixed_t lastpos;
+
+    switch (floorOrCeiling)
+    {
+        case 0:                // FLOOR
+            switch (direction)
+            {
+                case -1:       // DOWN
+                    if (sector->floorheight - speed < dest)
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return crushed;
+                        }
+                        return pastdest;
+                    }
+                    else
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight -= speed;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return crushed;
+                        }
+                    }
+                    break;
+
+                case 1:        // UP
+                    if (sector->floorheight + speed > dest)
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return crushed;
+                        }
+                        return pastdest;
+                    }
+                    else        // COULD GET CRUSHED
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight += speed;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            if (crush == true)
+                                return crushed;
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return crushed;
+                        }
+                    }
+                    break;
+            }
+            break;
+
+        case 1:                // CEILING
+            switch (direction)
+            {
+                case -1:       // DOWN
+                    if (sector->ceilingheight - speed < dest)
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return crushed;
+                        }
+                        return pastdest;
+                    }
+                    else        // COULD GET CRUSHED
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight -= speed;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            if (crush == true)
+                                return crushed;
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return crushed;
+                        }
+                    }
+                    break;
+
+                case 1:        // UP
+                    if (sector->ceilingheight + speed > dest)
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return crushed;
+                        }
+                        return pastdest;
+                    }
+                    else
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight += speed;
+                        flag = P_ChangeSector(sector, crush);
+#if 0
+                        if (flag == true)
+                        {
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return crushed;
+                        }
+#endif
+                    }
+                    break;
+            }
+            break;
+
+    }
+    return ok;
+}
+
+//==================================================================
+//
+//      MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
+//
+//==================================================================
+void T_MoveFloor(thinker_t *thinker)
+{
+    floormove_t *floor = (floormove_t *) thinker;
+    result_e res;
+
+    res = T_MovePlane(floor->sector, floor->speed,
+                      floor->floordestheight, floor->crush, 0,
+                      floor->direction);
+    if (!(leveltime & 7))
+    {
+        S_StartSound(&floor->sector->soundorg, sfx_dormov);
+    }
+
+    if (res == pastdest)
+    {
+        floor->sector->specialdata = NULL;
+        if (floor->type == raiseBuildStep)
+        {
+            S_StartSound(&floor->sector->soundorg, sfx_pstop);
+        }
+        if (floor->direction == 1)
+            switch (floor->type)
+            {
+                case donutRaise:
+                    floor->sector->special = floor->newspecial;
+                    floor->sector->floorpic = floor->texture;
+                default:
+                    break;
+            }
+        else if (floor->direction == -1)
+            switch (floor->type)
+            {
+                case lowerAndChange:
+                    floor->sector->special = floor->newspecial;
+                    floor->sector->floorpic = floor->texture;
+                default:
+                    break;
+            }
+        P_RemoveThinker(&floor->thinker);
+    }
+
+}
+
+//==================================================================
+//
+//      HANDLE FLOOR TYPES
+//
+//==================================================================
+int EV_DoFloor(line_t * line, floor_e floortype)
+{
+    int secnum;
+    int rtn;
+    int i;
+    sector_t *sec;
+    floormove_t *floor;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        //      ALREADY MOVING?  IF SO, KEEP GOING...
+        if (sec->specialdata)
+            continue;
+
+        //
+        //      new floor thinker
+        //
+        rtn = 1;
+        floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+        P_AddThinker(&floor->thinker);
+        sec->specialdata = floor;
+        floor->thinker.function = T_MoveFloor;
+        floor->type = floortype;
+        floor->crush = false;
+        switch (floortype)
+        {
+            case lowerFloor:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = P_FindHighestFloorSurrounding(sec);
+                break;
+            case lowerFloorToLowest:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = P_FindLowestFloorSurrounding(sec);
+                break;
+            case turboLower:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED * 4;
+                floor->floordestheight = (8 * FRACUNIT) +
+                    P_FindHighestFloorSurrounding(sec);
+                break;
+            case raiseFloorCrush:
+                floor->crush = true;
+            case raiseFloor:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = P_FindLowestCeilingSurrounding(sec);
+                if (floor->floordestheight > sec->ceilingheight)
+                    floor->floordestheight = sec->ceilingheight;
+                floor->floordestheight -= (8 * FRACUNIT) *
+                    (floortype == raiseFloorCrush);
+                break;
+            case raiseFloorToNearest:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight =
+                    P_FindNextHighestFloor(sec, sec->floorheight);
+                break;
+            case raiseFloor24:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = floor->sector->floorheight +
+                    24 * FRACUNIT;
+                break;
+            case raiseFloor24AndChange:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = floor->sector->floorheight +
+                    24 * FRACUNIT;
+                sec->floorpic = line->frontsector->floorpic;
+                sec->special = line->frontsector->special;
+                break;
+            case raiseToTexture:
+                {
+                    int minsize = INT_MAX;
+                    side_t *side;
+
+                    floor->direction = 1;
+                    floor->sector = sec;
+                    floor->speed = FLOORSPEED;
+                    for (i = 0; i < sec->linecount; i++)
+                        if (twoSided(secnum, i))
+                        {
+                            side = getSide(secnum, i, 0);
+                            if (side->bottomtexture >= 0)
+                                if (textureheight[side->bottomtexture] <
+                                    minsize)
+                                    minsize =
+                                        textureheight[side->bottomtexture];
+                            side = getSide(secnum, i, 1);
+                            if (side->bottomtexture >= 0)
+                                if (textureheight[side->bottomtexture] <
+                                    minsize)
+                                    minsize =
+                                        textureheight[side->bottomtexture];
+                        }
+                    floor->floordestheight = floor->sector->floorheight +
+                        minsize;
+                }
+                break;
+            case lowerAndChange:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = P_FindLowestFloorSurrounding(sec);
+                floor->texture = sec->floorpic;
+                for (i = 0; i < sec->linecount; i++)
+                    if (twoSided(secnum, i))
+                    {
+                        if (getSide(secnum, i, 0)->sector - sectors == secnum)
+                        {
+                            sec = getSector(secnum, i, 1);
+                            floor->texture = sec->floorpic;
+                            floor->newspecial = sec->special;
+                            break;
+                        }
+                        else
+                        {
+                            sec = getSector(secnum, i, 0);
+                            floor->texture = sec->floorpic;
+                            floor->newspecial = sec->special;
+                            break;
+                        }
+                    }
+            default:
+                break;
+        }
+    }
+    return rtn;
+}
+
+//==================================================================
+//
+//      BUILD A STAIRCASE!
+//
+//==================================================================
+int EV_BuildStairs(line_t * line, fixed_t stepDelta)
+{
+    int secnum;
+    int height;
+    int i;
+    int newsecnum;
+    int texture;
+    int ok;
+    int rtn;
+    sector_t *sec, *tsec;
+    floormove_t *floor;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        // ALREADY MOVING?  IF SO, KEEP GOING...
+        if (sec->specialdata)
+            continue;
+
+        //
+        // new floor thinker
+        //
+        rtn = 1;
+        height = sec->floorheight + stepDelta;
+        floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+        P_AddThinker(&floor->thinker);
+        sec->specialdata = floor;
+        floor->thinker.function = T_MoveFloor;
+        floor->type = raiseBuildStep;
+        floor->direction = 1;
+        floor->sector = sec;
+        floor->speed = FLOORSPEED;
+        floor->floordestheight = height;
+
+        texture = sec->floorpic;
+
+        //
+        // Find next sector to raise
+        // 1.   Find 2-sided line with same sector side[0]
+        // 2.   Other side is the next sector to raise
+        //
+        do
+        {
+            ok = 0;
+            for (i = 0; i < sec->linecount; i++)
+            {
+                if (!((sec->lines[i])->flags & ML_TWOSIDED))
+                    continue;
+
+                tsec = (sec->lines[i])->frontsector;
+                newsecnum = tsec - sectors;
+                if (secnum != newsecnum)
+                    continue;
+                tsec = (sec->lines[i])->backsector;
+                newsecnum = tsec - sectors;
+                if (tsec->floorpic != texture)
+                    continue;
+
+                height += stepDelta;
+                if (tsec->specialdata)
+                    continue;
+
+                sec = tsec;
+                secnum = newsecnum;
+                floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+                P_AddThinker(&floor->thinker);
+                sec->specialdata = floor;
+                floor->thinker.function = T_MoveFloor;
+                floor->type = raiseBuildStep;
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                floor->floordestheight = height;
+                ok = 1;
+                break;
+            }
+        }
+        while (ok);
+    }
+    return (rtn);
+}
diff --git a/games/NXDoom/src/heretic/p_inter.c b/games/NXDoom/src/heretic/p_inter.c
new file mode 100644
index 000000000..cf75a7dbf
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_inter.c
@@ -0,0 +1,1488 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_inter.c
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "am_map.h"
+
+
+#define BONUSADD 6
+
+int WeaponValue[] = {
+    1,                          // staff
+    3,                          // goldwand
+    4,                          // crossbow
+    5,                          // blaster
+    6,                          // skullrod
+    7,                          // phoenixrod
+    8,                          // mace
+    2,                          // gauntlets
+    0                           // beak
+};
+
+int maxammo[NUMAMMO] = {
+    100,                        // gold wand
+    50,                         // crossbow
+    200,                        // blaster
+    200,                        // skull rod
+    20,                         // phoenix rod
+    150                         // mace
+};
+
+int GetWeaponAmmo[NUMWEAPONS] = {
+    0,                          // staff
+    25,                         // gold wand
+    10,                         // crossbow
+    30,                         // blaster
+    50,                         // skull rod
+    2,                          // phoenix rod
+    50,                         // mace
+    0,                          // gauntlets
+    0                           // beak
+};
+
+static weapontype_t GetAmmoChange[] = {
+    wp_goldwand,
+    wp_crossbow,
+    wp_blaster,
+    wp_skullrod,
+    wp_phoenixrod,
+    wp_mace
+};
+
+/*
+static boolean GetAmmoChangePL1[NUMWEAPONS][NUMAMMO] =
+{
+	// staff
+	{wp_goldwand, wp_crossbow, wp_blaster, wp_skullrod, -1, wp_mace},
+	// gold wand
+	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, wp_mace},
+	// crossbow
+	{-1, -1, wp_blaster, wp_skullrod, -1, -1},
+	// blaster
+	{-1, -1, -1, -1, -1, -1},
+	// skull rod
+	{-1, -1, -1, -1, -1, -1},
+	// phoenix rod
+	{-1, -1, -1, -1, -1, -1},
+	// mace
+	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, -1},
+	// gauntlets
+	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, wp_mace}
+};
+*/
+
+/*
+static boolean GetAmmoChangePL2[NUMWEAPONS][NUMAMMO] =
+{
+	// staff
+	{wp_goldwand, wp_crossbow, wp_blaster, wp_skullrod, wp_phoenixrod,
+		wp_mace},
+	// gold wand
+	{-1, wp_crossbow, wp_blaster, wp_skullrod, wp_phoenixrod, wp_mace},
+	// crossbow
+	{-1, -1, wp_blaster, wp_skullrod, wp_phoenixrod, -1},
+	// blaster
+	{-1, -1, -1, wp_skullrod, wp_phoenixrod, -1},
+	// skull rod
+	{-1, -1, -1, -1, -1, -1},
+	// phoenix rod
+	{-1, -1, -1, -1, -1, -1},
+	// mace
+	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, -1},
+	// gauntlets
+	{-1, -1, -1, wp_skullrod, wp_phoenixrod, wp_mace}
+};
+*/
+
+//--------------------------------------------------------------------------
+//
+// PROC P_SetMessage
+//
+//--------------------------------------------------------------------------
+
+boolean ultimatemsg;
+
+void P_SetMessage(player_t * player, const char *message, boolean ultmsg)
+{
+    if ((ultimatemsg || !messageson) && !ultmsg)
+    {
+        return;
+    }
+    player->message = message;
+    player->messageTics = MESSAGETICS;
+    BorderTopRefresh = true;
+    if (ultmsg)
+    {
+        ultimatemsg = true;
+    }
+}
+
+//--------------------------------------------------------------------------
+//
+// FUNC P_GiveAmmo
+//
+// Returns true if the player accepted the ammo, false if it was
+// refused (player has maxammo[ammo]).
+//
+//--------------------------------------------------------------------------
+
+boolean P_GiveAmmo(player_t * player, ammotype_t ammo, int count)
+{
+    int prevAmmo;
+    //weapontype_t changeWeapon;
+
+    if (ammo == am_noammo)
+    {
+        return (false);
+    }
+    if ((unsigned int) ammo >= NUMAMMO)
+    {
+        I_Error("P_GiveAmmo: bad type %i", ammo);
+    }
+    if (player->ammo[ammo] == player->maxammo[ammo])
+    {
+        return (false);
+    }
+    if (gameskill == sk_baby || gameskill == sk_nightmare)
+    {                           // extra ammo in baby mode and nightmare mode
+        count += count >> 1;
+    }
+    prevAmmo = player->ammo[ammo];
+
+    player->ammo[ammo] += count;
+    if (player->ammo[ammo] > player->maxammo[ammo])
+    {
+        player->ammo[ammo] = player->maxammo[ammo];
+    }
+    if (prevAmmo)
+    {
+        // Don't attempt to change weapons if the player already had
+        // ammo of the type just given
+        return (true);
+    }
+    if (player->readyweapon == wp_staff
+        || player->readyweapon == wp_gauntlets)
+    {
+        if (player->weaponowned[GetAmmoChange[ammo]])
+        {
+            player->pendingweapon = GetAmmoChange[ammo];
+        }
+    }
+/*
+	if(player->powers[pw_weaponlevel2])
+	{
+		changeWeapon = GetAmmoChangePL2[player->readyweapon][ammo];
+	}
+	else
+	{
+		changeWeapon = GetAmmoChangePL1[player->readyweapon][ammo];
+	}
+	if(changeWeapon != -1)
+	{
+		if(player->weaponowned[changeWeapon])
+		{
+			player->pendingweapon = changeWeapon;
+		}
+	}
+*/
+    return (true);
+}
+
+//--------------------------------------------------------------------------
+//
+// FUNC P_GiveWeapon
+//
+// Returns true if the weapon or its ammo was accepted.
+//
+//--------------------------------------------------------------------------
+
+boolean P_GiveWeapon(player_t * player, weapontype_t weapon)
+{
+    boolean gaveAmmo;
+    boolean gaveWeapon;
+
+    if (netgame && !deathmatch)
+    {                           // Cooperative net-game
+        if (player->weaponowned[weapon])
+        {
+            return (false);
+        }
+        player->bonuscount += BONUSADD;
+        player->weaponowned[weapon] = true;
+        P_GiveAmmo(player, wpnlev1info[weapon].ammo, GetWeaponAmmo[weapon]);
+        player->pendingweapon = weapon;
+        if (player == &players[consoleplayer])
+        {
+            S_StartSound(NULL, sfx_wpnup);
+        }
+        return (false);
+    }
+    gaveAmmo = P_GiveAmmo(player, wpnlev1info[weapon].ammo,
+                          GetWeaponAmmo[weapon]);
+    if (player->weaponowned[weapon])
+    {
+        gaveWeapon = false;
+    }
+    else
+    {
+        gaveWeapon = true;
+        player->weaponowned[weapon] = true;
+        if (WeaponValue[weapon] > WeaponValue[player->readyweapon])
+        {                       // Only switch to more powerful weapons
+            player->pendingweapon = weapon;
+        }
+    }
+    return (gaveWeapon || gaveAmmo);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GiveBody
+//
+// Returns false if the body isn't needed at all.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GiveBody(player_t * player, int num)
+{
+    int max;
+
+    max = MAXHEALTH;
+    if (player->chickenTics)
+    {
+        max = MAXCHICKENHEALTH;
+    }
+    if (player->health >= max)
+    {
+        return (false);
+    }
+    player->health += num;
+    if (player->health > max)
+    {
+        player->health = max;
+    }
+    player->mo->health = player->health;
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GiveArmor
+//
+// Returns false if the armor is worse than the current armor.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GiveArmor(player_t * player, int armortype)
+{
+    int hits;
+
+    hits = armortype * 100;
+    if (player->armorpoints >= hits)
+    {
+        return (false);
+    }
+    player->armortype = armortype;
+    player->armorpoints = hits;
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_GiveKey
+//
+//---------------------------------------------------------------------------
+
+void P_GiveKey(player_t * player, keytype_t key)
+{
+
+    if (player->keys[key])
+    {
+        return;
+    }
+    if (player == &players[consoleplayer])
+    {
+        playerkeys |= 1 << key;
+        KeyPoints[key].x = 0;
+        KeyPoints[key].y = 0;
+    }
+    player->bonuscount = BONUSADD;
+    player->keys[key] = true;
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GivePower
+//
+// Returns true if power accepted.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GivePower(player_t * player, powertype_t power)
+{
+    if (power == pw_invulnerability)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = INVULNTICS;
+        return (true);
+    }
+    if (power == pw_weaponlevel2)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = WPNLEV2TICS;
+        return (true);
+    }
+    if (power == pw_invisibility)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = INVISTICS;
+        player->mo->flags |= MF_SHADOW;
+        return (true);
+    }
+    if (power == pw_flight)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = FLIGHTTICS;
+        player->mo->flags2 |= MF2_FLY;
+        player->mo->flags |= MF_NOGRAVITY;
+        if (player->mo->z <= player->mo->floorz)
+        {
+            player->flyheight = 10;     // thrust the player in the air a bit
+        }
+        return (true);
+    }
+    if (power == pw_infrared)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = INFRATICS;
+        return (true);
+    }
+/*
+	if(power == pw_ironfeet)
+	{
+		player->powers[power] = IRONTICS;
+		return(true);
+	}
+	if(power == pw_strength)
+	{
+		P_GiveBody(player, 100);
+		player->powers[power] = 1;
+		return(true);
+	}
+*/
+    if (player->powers[power])
+    {
+        return (false);         // already got it
+    }
+    player->powers[power] = 1;
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GiveArtifact
+//
+// Returns true if artifact accepted.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo)
+{
+    int i;
+
+    i = 0;
+    while (player->inventory[i].type != arti && i < player->inventorySlotNum)
+    {
+        i++;
+    }
+    if (i == player->inventorySlotNum)
+    {
+        player->inventory[i].count = 1;
+        player->inventory[i].type = arti;
+        player->inventorySlotNum++;
+    }
+    else
+    {
+        if (player->inventory[i].count >= 16)
+        {                       // Player already has 16 of this item
+            return (false);
+        }
+        player->inventory[i].count++;
+    }
+    if (player->artifactCount == 0)
+    {
+        player->readyArtifact = arti;
+    }
+    player->artifactCount++;
+    if (mo && (mo->flags & MF_COUNTITEM))
+    {
+        player->itemcount++;
+    }
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SetDormantArtifact
+//
+// Removes the MF_SPECIAL flag, and initiates the artifact pickup
+// animation.
+//
+//---------------------------------------------------------------------------
+
+void P_SetDormantArtifact(mobj_t * arti)
+{
+    arti->flags &= ~MF_SPECIAL;
+    if (deathmatch && (arti->type != MT_ARTIINVULNERABILITY)
+        && (arti->type != MT_ARTIINVISIBILITY))
+    {
+        P_SetMobjState(arti, S_DORMANTARTI1);
+    }
+    else
+    {                           // Don't respawn
+        P_SetMobjState(arti, S_DEADARTI1);
+    }
+    S_StartSound(arti, sfx_artiup);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_RestoreArtifact
+//
+//---------------------------------------------------------------------------
+
+void A_RestoreArtifact(mobj_t * arti, player_t *player, pspdef_t *psp)
+{
+    arti->flags |= MF_SPECIAL;
+    P_SetMobjState(arti, arti->info->spawnstate);
+    S_StartSound(arti, sfx_respawn);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_HideSpecialThing
+//
+//----------------------------------------------------------------------------
+
+void P_HideSpecialThing(mobj_t * thing)
+{
+    thing->flags &= ~MF_SPECIAL;
+    thing->flags2 |= MF2_DONTDRAW;
+    P_SetMobjState(thing, S_HIDESPECIAL1);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_RestoreSpecialThing1
+//
+// Make a special thing visible again.
+//
+//---------------------------------------------------------------------------
+
+void A_RestoreSpecialThing1(mobj_t * thing, player_t *player, pspdef_t *psp)
+{
+    if (thing->type == MT_WMACE)
+    {                           // Do random mace placement
+        P_RepositionMace(thing);
+    }
+    thing->flags2 &= ~MF2_DONTDRAW;
+    S_StartSound(thing, sfx_respawn);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_RestoreSpecialThing2
+//
+//---------------------------------------------------------------------------
+
+void A_RestoreSpecialThing2(mobj_t * thing, player_t *player, pspdef_t *psp)
+{
+    thing->flags |= MF_SPECIAL;
+    P_SetMobjState(thing, thing->info->spawnstate);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_TouchSpecialThing
+//
+//---------------------------------------------------------------------------
+
+void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher)
+{
+    int i;
+    player_t *player;
+    fixed_t delta;
+    int sound;
+    boolean respawn;
+
+    delta = special->z - toucher->z;
+    if (delta > toucher->height || delta < -32 * FRACUNIT)
+    {                           // Out of reach
+        return;
+    }
+    if (toucher->health <= 0)
+    {                           // Toucher is dead
+        return;
+    }
+    sound = sfx_itemup;
+    player = toucher->player;
+    respawn = true;
+    switch (special->sprite)
+    {
+            // Items
+        case SPR_PTN1:         // Item_HealingPotion
+            if (!P_GiveBody(player, 10))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_ITEMHEALTH), false);
+            break;
+        case SPR_SHLD:         // Item_Shield1
+            if (!P_GiveArmor(player, 1))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_ITEMSHIELD1), false);
+            break;
+        case SPR_SHD2:         // Item_Shield2
+            if (!P_GiveArmor(player, 2))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_ITEMSHIELD2), false);
+            break;
+        case SPR_BAGH:         // Item_BagOfHolding
+            if (!player->backpack)
+            {
+                for (i = 0; i < NUMAMMO; i++)
+                {
+                    player->maxammo[i] *= 2;
+                }
+                player->backpack = true;
+            }
+            P_GiveAmmo(player, am_goldwand, AMMO_GWND_WIMPY);
+            P_GiveAmmo(player, am_blaster, AMMO_BLSR_WIMPY);
+            P_GiveAmmo(player, am_crossbow, AMMO_CBOW_WIMPY);
+            P_GiveAmmo(player, am_skullrod, AMMO_SKRD_WIMPY);
+            P_GiveAmmo(player, am_phoenixrod, AMMO_PHRD_WIMPY);
+            P_SetMessage(player, DEH_String(TXT_ITEMBAGOFHOLDING), false);
+            break;
+        case SPR_SPMP:         // Item_SuperMap
+            if (!P_GivePower(player, pw_allmap))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_ITEMSUPERMAP), false);
+            break;
+
+            // Keys
+        case SPR_BKYY:         // Key_Blue
+            if (!player->keys[key_blue])
+            {
+                P_SetMessage(player, DEH_String(TXT_GOTBLUEKEY), false);
+            }
+            P_GiveKey(player, key_blue);
+            sound = sfx_keyup;
+            if (!netgame)
+            {
+                break;
+            }
+            return;
+        case SPR_CKYY:         // Key_Yellow
+            if (!player->keys[key_yellow])
+            {
+                P_SetMessage(player, DEH_String(TXT_GOTYELLOWKEY), false);
+            }
+            sound = sfx_keyup;
+            P_GiveKey(player, key_yellow);
+            if (!netgame)
+            {
+                break;
+            }
+            return;
+        case SPR_AKYY:         // Key_Green
+            if (!player->keys[key_green])
+            {
+                P_SetMessage(player, DEH_String(TXT_GOTGREENKEY), false);
+            }
+            sound = sfx_keyup;
+            P_GiveKey(player, key_green);
+            if (!netgame)
+            {
+                break;
+            }
+            return;
+
+            // Artifacts
+        case SPR_PTN2:         // Arti_HealingPotion
+            if (P_GiveArtifact(player, arti_health, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTIHEALTH), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_SOAR:         // Arti_Fly
+            if (P_GiveArtifact(player, arti_fly, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTIFLY), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_INVU:         // Arti_Invulnerability
+            if (P_GiveArtifact(player, arti_invulnerability, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTIINVULNERABILITY), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_PWBK:         // Arti_TomeOfPower
+            if (P_GiveArtifact(player, arti_tomeofpower, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTITOMEOFPOWER), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_INVS:         // Arti_Invisibility
+            if (P_GiveArtifact(player, arti_invisibility, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTIINVISIBILITY), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_EGGC:         // Arti_Egg
+            if (P_GiveArtifact(player, arti_egg, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTIEGG), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_SPHL:         // Arti_SuperHealth
+            if (P_GiveArtifact(player, arti_superhealth, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTISUPERHEALTH), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_TRCH:         // Arti_Torch
+            if (P_GiveArtifact(player, arti_torch, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTITORCH), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_FBMB:         // Arti_FireBomb
+            if (P_GiveArtifact(player, arti_firebomb, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTIFIREBOMB), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+        case SPR_ATLP:         // Arti_Teleport
+            if (P_GiveArtifact(player, arti_teleport, special))
+            {
+                P_SetMessage(player, DEH_String(TXT_ARTITELEPORT), false);
+                P_SetDormantArtifact(special);
+            }
+            return;
+
+            // Ammo
+        case SPR_AMG1:         // Ammo_GoldWandWimpy
+            if (!P_GiveAmmo(player, am_goldwand, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOGOLDWAND1), false);
+            break;
+        case SPR_AMG2:         // Ammo_GoldWandHefty
+            if (!P_GiveAmmo(player, am_goldwand, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOGOLDWAND2), false);
+            break;
+        case SPR_AMM1:         // Ammo_MaceWimpy
+            if (!P_GiveAmmo(player, am_mace, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOMACE1), false);
+            break;
+        case SPR_AMM2:         // Ammo_MaceHefty
+            if (!P_GiveAmmo(player, am_mace, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOMACE2), false);
+            break;
+        case SPR_AMC1:         // Ammo_CrossbowWimpy
+            if (!P_GiveAmmo(player, am_crossbow, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOCROSSBOW1), false);
+            break;
+        case SPR_AMC2:         // Ammo_CrossbowHefty
+            if (!P_GiveAmmo(player, am_crossbow, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOCROSSBOW2), false);
+            break;
+        case SPR_AMB1:         // Ammo_BlasterWimpy
+            if (!P_GiveAmmo(player, am_blaster, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOBLASTER1), false);
+            break;
+        case SPR_AMB2:         // Ammo_BlasterHefty
+            if (!P_GiveAmmo(player, am_blaster, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOBLASTER2), false);
+            break;
+        case SPR_AMS1:         // Ammo_SkullRodWimpy
+            if (!P_GiveAmmo(player, am_skullrod, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOSKULLROD1), false);
+            break;
+        case SPR_AMS2:         // Ammo_SkullRodHefty
+            if (!P_GiveAmmo(player, am_skullrod, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOSKULLROD2), false);
+            break;
+        case SPR_AMP1:         // Ammo_PhoenixRodWimpy
+            if (!P_GiveAmmo(player, am_phoenixrod, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOPHOENIXROD1), false);
+            break;
+        case SPR_AMP2:         // Ammo_PhoenixRodHefty
+            if (!P_GiveAmmo(player, am_phoenixrod, special->health))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_AMMOPHOENIXROD2), false);
+            break;
+
+            // Weapons
+        case SPR_WMCE:         // Weapon_Mace
+            if (!P_GiveWeapon(player, wp_mace))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_WPNMACE), false);
+            sound = sfx_wpnup;
+            break;
+        case SPR_WBOW:         // Weapon_Crossbow
+            if (!P_GiveWeapon(player, wp_crossbow))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_WPNCROSSBOW), false);
+            sound = sfx_wpnup;
+            break;
+        case SPR_WBLS:         // Weapon_Blaster
+            if (!P_GiveWeapon(player, wp_blaster))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_WPNBLASTER), false);
+            sound = sfx_wpnup;
+            break;
+        case SPR_WSKL:         // Weapon_SkullRod
+            if (!P_GiveWeapon(player, wp_skullrod))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_WPNSKULLROD), false);
+            sound = sfx_wpnup;
+            break;
+        case SPR_WPHX:         // Weapon_PhoenixRod
+            if (!P_GiveWeapon(player, wp_phoenixrod))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_WPNPHOENIXROD), false);
+            sound = sfx_wpnup;
+            break;
+        case SPR_WGNT:         // Weapon_Gauntlets
+            if (!P_GiveWeapon(player, wp_gauntlets))
+            {
+                return;
+            }
+            P_SetMessage(player, DEH_String(TXT_WPNGAUNTLETS), false);
+            sound = sfx_wpnup;
+            break;
+        default:
+            I_Error("P_SpecialThing: Unknown gettable thing");
+    }
+    if (special->flags & MF_COUNTITEM)
+    {
+        player->itemcount++;
+    }
+    if (deathmatch && respawn && !(special->flags & MF_DROPPED))
+    {
+        P_HideSpecialThing(special);
+    }
+    else
+    {
+        P_RemoveMobj(special);
+    }
+    player->bonuscount += BONUSADD;
+    if (player == &players[consoleplayer])
+    {
+        S_StartSound(NULL, sound);
+        SB_PaletteFlash();
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_KillMobj
+//
+//---------------------------------------------------------------------------
+
+void P_KillMobj(mobj_t * source, mobj_t * target)
+{
+    target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_NOGRAVITY);
+    target->flags |= MF_CORPSE | MF_DROPOFF;
+    target->flags2 &= ~MF2_PASSMOBJ;
+    target->height >>= 2;
+    if (source && source->player)
+    {
+        if (target->flags & MF_COUNTKILL)
+        {                       // Count for intermission
+            source->player->killcount++;
+        }
+        if (target->player)
+        {                       // Frag stuff
+            if (target == source)
+            {                   // Self-frag
+                target->player->frags[target->player - players]--;
+            }
+            else
+            {
+                source->player->frags[target->player - players]++;
+                if (source->player == &players[consoleplayer])
+                {
+                    S_StartSound(NULL, sfx_gfrag);
+                }
+                if (source->player->chickenTics)
+                {               // Make a super chicken
+                    P_GivePower(source->player, pw_weaponlevel2);
+                }
+            }
+        }
+    }
+    else if (!netgame && (target->flags & MF_COUNTKILL))
+    {                           // Count all monster deaths
+        players[0].killcount++;
+    }
+    if (target->player)
+    {
+        if (!source)
+        {                       // Self-frag
+            target->player->frags[target->player - players]--;
+        }
+        target->flags &= ~MF_SOLID;
+        target->flags2 &= ~MF2_FLY;
+        target->player->powers[pw_flight] = 0;
+        target->player->powers[pw_weaponlevel2] = 0;
+        target->player->playerstate = PST_DEAD;
+        P_DropWeapon(target->player);
+        if (target->flags2 & MF2_FIREDAMAGE)
+        {                       // Player flame death
+            P_SetMobjState(target, S_PLAY_FDTH1);
+            //S_StartSound(target, sfx_hedat1); // Burn sound
+            return;
+        }
+    }
+    if (target->health < -(target->info->spawnhealth >> 1)
+        && target->info->xdeathstate)
+    {                           // Extreme death
+        P_SetMobjState(target, target->info->xdeathstate);
+    }
+    else
+    {                           // Normal death
+        P_SetMobjState(target, target->info->deathstate);
+    }
+    target->tics -= P_Random() & 3;
+//      I_StartSound(&actor->r, actor->info->deathsound);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_MinotaurSlam
+//
+//---------------------------------------------------------------------------
+
+void P_MinotaurSlam(mobj_t * source, mobj_t * target)
+{
+    angle_t angle;
+    fixed_t thrust;
+
+    angle = R_PointToAngle2(source->x, source->y, target->x, target->y);
+    angle >>= ANGLETOFINESHIFT;
+    thrust = 16 * FRACUNIT + (P_Random() << 10);
+    target->momx += FixedMul(thrust, finecosine[angle]);
+    target->momy += FixedMul(thrust, finesine[angle]);
+    P_DamageMobj(target, NULL, NULL, HITDICE(6));
+    if (target->player)
+    {
+        target->reactiontime = 14 + (P_Random() & 7);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_TouchWhirlwind
+//
+//---------------------------------------------------------------------------
+
+void P_TouchWhirlwind(mobj_t * target)
+{
+    int randVal;
+
+    target->angle += P_SubRandom() << 20;
+    target->momx += P_SubRandom() << 10;
+    target->momy += P_SubRandom() << 10;
+    if (leveltime & 16 && !(target->flags2 & MF2_BOSS))
+    {
+        randVal = P_Random();
+        if (randVal > 160)
+        {
+            randVal = 160;
+        }
+        target->momz += randVal << 10;
+        if (target->momz > 12 * FRACUNIT)
+        {
+            target->momz = 12 * FRACUNIT;
+        }
+    }
+    if (!(leveltime & 7))
+    {
+        P_DamageMobj(target, NULL, NULL, 3);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_ChickenMorphPlayer
+//
+// Returns true if the player gets turned into a chicken.
+//
+//---------------------------------------------------------------------------
+
+boolean P_ChickenMorphPlayer(player_t * player)
+{
+    mobj_t *pmo;
+    mobj_t *fog;
+    mobj_t *chicken;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    angle_t angle;
+    int oldFlags2;
+
+    if (player->chickenTics)
+    {
+        if ((player->chickenTics < CHICKENTICS - TICRATE)
+            && !player->powers[pw_weaponlevel2])
+        {                       // Make a super chicken
+            P_GivePower(player, pw_weaponlevel2);
+        }
+        return (false);
+    }
+    if (player->powers[pw_invulnerability])
+    {                           // Immune when invulnerable
+        return (false);
+    }
+    pmo = player->mo;
+    x = pmo->x;
+    y = pmo->y;
+    z = pmo->z;
+    angle = pmo->angle;
+    oldFlags2 = pmo->flags2;
+    P_SetMobjState(pmo, S_FREETARGMOBJ);
+    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+    chicken = P_SpawnMobj(x, y, z, MT_CHICPLAYER);
+    chicken->special1.i = player->readyweapon;
+    chicken->angle = angle;
+    chicken->player = player;
+    player->health = chicken->health = MAXCHICKENHEALTH;
+    player->mo = chicken;
+    player->armorpoints = player->armortype = 0;
+    player->powers[pw_invisibility] = 0;
+    player->powers[pw_weaponlevel2] = 0;
+    if (oldFlags2 & MF2_FLY)
+    {
+        chicken->flags2 |= MF2_FLY;
+    }
+    player->chickenTics = CHICKENTICS;
+    P_ActivateBeak(player);
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_ChickenMorph
+//
+//---------------------------------------------------------------------------
+
+boolean P_ChickenMorph(mobj_t * actor)
+{
+    mobj_t *fog;
+    mobj_t *chicken;
+    mobj_t *target;
+    mobjtype_t moType;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    angle_t angle;
+    int ghost;
+
+    if (actor->player)
+    {
+        return (false);
+    }
+    moType = actor->type;
+    switch (moType)
+    {
+        case MT_POD:
+        case MT_CHICKEN:
+        case MT_HEAD:
+        case MT_MINOTAUR:
+        case MT_SORCERER1:
+        case MT_SORCERER2:
+            return (false);
+        default:
+            break;
+    }
+    x = actor->x;
+    y = actor->y;
+    z = actor->z;
+    angle = actor->angle;
+    ghost = actor->flags & MF_SHADOW;
+    target = actor->target;
+    P_SetMobjState(actor, S_FREETARGMOBJ);
+    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+    chicken = P_SpawnMobj(x, y, z, MT_CHICKEN);
+    chicken->special2.i = moType;
+    chicken->special1.i = CHICKENTICS + P_Random();
+    chicken->flags |= ghost;
+    chicken->target = target;
+    chicken->angle = angle;
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_AutoUseChaosDevice
+//
+//---------------------------------------------------------------------------
+
+boolean P_AutoUseChaosDevice(player_t * player)
+{
+    int i;
+
+    for (i = 0; i < player->inventorySlotNum; i++)
+    {
+        if (player->inventory[i].type == arti_teleport)
+        {
+            P_PlayerUseArtifact(player, arti_teleport);
+            player->health = player->mo->health = (player->health + 1) / 2;
+            return (true);
+        }
+    }
+    return (false);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_AutoUseHealth
+//
+//---------------------------------------------------------------------------
+
+void P_AutoUseHealth(player_t * player, int saveHealth)
+{
+    int i;
+    int count;
+    int normalCount;
+    int normalSlot;
+    int superCount;
+    int superSlot;
+
+    normalCount = 0;
+    superCount = 0;
+    normalSlot = 0;
+    superSlot = 0;
+
+    for (i = 0; i < player->inventorySlotNum; i++)
+    {
+        if (player->inventory[i].type == arti_health)
+        {
+            normalSlot = i;
+            normalCount = player->inventory[i].count;
+        }
+        else if (player->inventory[i].type == arti_superhealth)
+        {
+            superSlot = i;
+            superCount = player->inventory[i].count;
+        }
+    }
+    if ((gameskill == sk_baby) && (normalCount * 25 >= saveHealth))
+    {                           // Use quartz flasks
+        count = (saveHealth + 24) / 25;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 25;
+            P_PlayerRemoveArtifact(player, normalSlot);
+        }
+    }
+    else if (superCount * 100 >= saveHealth)
+    {                           // Use mystic urns
+        count = (saveHealth + 99) / 100;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 100;
+            P_PlayerRemoveArtifact(player, superSlot);
+        }
+    }
+    else if ((gameskill == sk_baby)
+             && (superCount * 100 + normalCount * 25 >= saveHealth))
+    {                           // Use mystic urns and quartz flasks
+        count = (saveHealth + 24) / 25;
+        saveHealth -= count * 25;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 25;
+            P_PlayerRemoveArtifact(player, normalSlot);
+        }
+        count = (saveHealth + 99) / 100;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 100;
+            P_PlayerRemoveArtifact(player, normalSlot);
+        }
+    }
+    player->mo->health = player->health;
+}
+
+/*
+=================
+=
+= P_DamageMobj
+=
+= Damages both enemies and players
+= inflictor is the thing that caused the damage
+= 		creature or missile, can be NULL (slime, etc)
+= source is the thing to target after taking damage
+=		creature or NULL
+= Source and inflictor are the same for melee attacks
+= source can be null for barrel explosions and other environmental stuff
+==================
+*/
+
+void P_DamageMobj
+    (mobj_t * target, mobj_t * inflictor, mobj_t * source, int damage)
+{
+    unsigned ang;
+    int saved;
+    player_t *player;
+    fixed_t thrust;
+    int temp;
+
+    if (!(target->flags & MF_SHOOTABLE))
+    {
+        // Shouldn't happen
+        return;
+    }
+    if (target->health <= 0)
+    {
+        return;
+    }
+    if (target->flags & MF_SKULLFLY)
+    {
+        if (target->type == MT_MINOTAUR)
+        {                       // Minotaur is invulnerable during charge attack
+            return;
+        }
+        target->momx = target->momy = target->momz = 0;
+    }
+    player = target->player;
+    if (player && gameskill == sk_baby)
+    {
+        // Take half damage in trainer mode
+        damage >>= 1;
+    }
+    // Special damage types
+    if (inflictor)
+    {
+        switch (inflictor->type)
+        {
+            case MT_EGGFX:
+                if (player)
+                {
+                    P_ChickenMorphPlayer(player);
+                }
+                else
+                {
+                    P_ChickenMorph(target);
+                }
+                return;         // Always return
+            case MT_WHIRLWIND:
+                P_TouchWhirlwind(target);
+                return;
+            case MT_MINOTAUR:
+                if (inflictor->flags & MF_SKULLFLY)
+                {               // Slam only when in charge mode
+                    P_MinotaurSlam(inflictor, target);
+                    return;
+                }
+                break;
+            case MT_MACEFX4:   // Death ball
+                if ((target->flags2 & MF2_BOSS) || target->type == MT_HEAD)
+                {               // Don't allow cheap boss kills
+                    break;
+                }
+                else if (target->player)
+                {               // Player specific checks
+                    if (target->player->powers[pw_invulnerability])
+                    {           // Can't hurt invulnerable players
+                        break;
+                    }
+                    if (P_AutoUseChaosDevice(target->player))
+                    {           // Player was saved using chaos device
+                        return;
+                    }
+                }
+                damage = 10000; // Something's gonna die
+                break;
+            case MT_PHOENIXFX2:        // Flame thrower
+                if (target->player && P_Random() < 128)
+                {               // Freeze player for a bit
+                    target->reactiontime += 4;
+                }
+                break;
+            case MT_RAINPLR1:  // Rain missiles
+            case MT_RAINPLR2:
+            case MT_RAINPLR3:
+            case MT_RAINPLR4:
+                if (target->flags2 & MF2_BOSS)
+                {               // Decrease damage for bosses
+                    damage = (P_Random() & 7) + 1;
+                }
+                break;
+            case MT_HORNRODFX2:
+            case MT_PHOENIXFX1:
+                if (target->type == MT_SORCERER2 && P_Random() < 96)
+                {               // D'Sparil teleports away
+                    P_DSparilTeleport(target);
+                    return;
+                }
+                break;
+            case MT_BLASTERFX1:
+            case MT_RIPPER:
+                if (target->type == MT_HEAD)
+                {               // Less damage to Ironlich bosses
+                    damage = P_Random() & 1;
+                    if (!damage)
+                    {
+                        return;
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    // Push the target unless source is using the gauntlets
+    if (inflictor && (!source || !source->player
+                      || source->player->readyweapon != wp_gauntlets)
+        && !(inflictor->flags2 & MF2_NODMGTHRUST))
+    {
+        ang = R_PointToAngle2(inflictor->x, inflictor->y,
+                              target->x, target->y);
+        //thrust = damage*(FRACUNIT>>3)*100/target->info->mass;
+        // We do this multiplication in unsigned because it might overflow
+        // and signed overflow is undefined behavior
+        // but then we must cast it back to signed for the division
+        // to match original behavior
+        // unsigned to signed cast is implementation defined behavior at worst
+        thrust = ((int) (damage * (FRACUNIT >> 3) * 150u)) / target->info->mass;
+        // make fall forwards sometimes
+        if ((damage < 40) && (damage > target->health)
+            && (target->z - inflictor->z > 64 * FRACUNIT) && (P_Random() & 1))
+        {
+            ang += ANG180;
+            thrust *= 4;
+        }
+        ang >>= ANGLETOFINESHIFT;
+        if (source && source->player && (source == inflictor)
+            && source->player->powers[pw_weaponlevel2]
+            && source->player->readyweapon == wp_staff)
+        {
+            // Staff power level 2
+            target->momx += FixedMul(10 * FRACUNIT, finecosine[ang]);
+            target->momy += FixedMul(10 * FRACUNIT, finesine[ang]);
+            if (!(target->flags & MF_NOGRAVITY))
+            {
+                target->momz += 5 * FRACUNIT;
+            }
+        }
+        else
+        {
+            target->momx += FixedMul(thrust, finecosine[ang]);
+            target->momy += FixedMul(thrust, finesine[ang]);
+        }
+    }
+
+    //
+    // player specific
+    //
+    if (player)
+    {
+        // end of game hell hack
+        //if(target->subsector->sector->special == 11
+        //      && damage >= target->health)
+        //{
+        //      damage = target->health - 1;
+        //}
+
+        if (damage < 1000 && ((player->cheats & CF_GODMODE)
+                              || player->powers[pw_invulnerability]))
+        {
+            return;
+        }
+        if (player->armortype)
+        {
+            if (player->armortype == 1)
+            {
+                saved = damage >> 1;
+            }
+            else
+            {
+                saved = (damage >> 1) + (damage >> 2);
+            }
+            if (player->armorpoints <= saved)
+            {
+                // armor is used up
+                saved = player->armorpoints;
+                player->armortype = 0;
+            }
+            player->armorpoints -= saved;
+            damage -= saved;
+        }
+        if (damage >= player->health
+            && ((gameskill == sk_baby) || deathmatch) && !player->chickenTics)
+        {                       // Try to use some inventory health
+            P_AutoUseHealth(player, damage - player->health + 1);
+        }
+        player->health -= damage;       // mirror mobj health here for Dave
+        if (player->health < 0)
+        {
+            player->health = 0;
+        }
+        player->attacker = source;
+        player->damagecount += damage;  // add damage after armor / invuln
+        if (player->damagecount > 100)
+        {
+            player->damagecount = 100;  // teleport stomp does 10k points...
+        }
+        temp = damage < 100 ? damage : 100;
+        if (player == &players[consoleplayer])
+        {
+            I_Tactile(40, 10, 40 + temp * 2);
+            SB_PaletteFlash();
+        }
+    }
+
+    //
+    // do the damage
+    //
+    target->health -= damage;
+    if (target->health <= 0)
+    {                           // Death
+        target->special1.i = damage;
+        if (target->type == MT_POD && source && source->type != MT_POD)
+        {                       // Make sure players get frags for chain-reaction kills
+            target->target = source;
+        }
+        if (player && inflictor && !player->chickenTics)
+        {                       // Check for flame death
+            if ((inflictor->flags2 & MF2_FIREDAMAGE)
+                || ((inflictor->type == MT_PHOENIXFX1)
+                    && (target->health > -50) && (damage > 25)))
+            {
+                target->flags2 |= MF2_FIREDAMAGE;
+            }
+        }
+        P_KillMobj(source, target);
+        return;
+    }
+    if ((P_Random() < target->info->painchance)
+        && !(target->flags & MF_SKULLFLY))
+    {
+        target->flags |= MF_JUSTHIT;    // fight back!
+        P_SetMobjState(target, target->info->painstate);
+    }
+    target->reactiontime = 0;   // we're awake now...
+    if (!target->threshold && source && !(source->flags2 & MF2_BOSS)
+        && !(target->type == MT_SORCERER2 && source->type == MT_WIZARD))
+    {
+        // Target actor is not intent on another actor,
+        // so make him chase after source
+        target->target = source;
+        target->threshold = BASETHRESHOLD;
+        if (target->state == &states[target->info->spawnstate]
+            && target->info->seestate != S_NULL)
+        {
+            P_SetMobjState(target, target->info->seestate);
+        }
+    }
+}
diff --git a/games/NXDoom/src/heretic/p_lights.c b/games/NXDoom/src/heretic/p_lights.c
new file mode 100644
index 000000000..407041b3c
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_lights.c
@@ -0,0 +1,280 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+#include "doomdef.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "v_video.h"
+
+//==================================================================
+//==================================================================
+//
+//                                                      BROKEN LIGHT FLASHING
+//
+//==================================================================
+//==================================================================
+
+//==================================================================
+//
+//      T_LightFlash
+//
+//      After the map has been loaded, scan each sector for specials
+//      that spawn thinkers
+//
+//==================================================================
+void T_LightFlash(thinker_t *thinker)
+{
+    lightflash_t *flash = (lightflash_t *) thinker;
+
+    if (--flash->count)
+        return;
+
+    if (flash->sector->lightlevel == flash->maxlight)
+    {
+        flash->sector->lightlevel = flash->minlight;
+        flash->count = (P_Random() & flash->mintime) + 1;
+    }
+    else
+    {
+        flash->sector->lightlevel = flash->maxlight;
+        flash->count = (P_Random() & flash->maxtime) + 1;
+    }
+
+}
+
+
+//==================================================================
+//
+//      P_SpawnLightFlash
+//
+//      After the map has been loaded, scan each sector for specials that spawn thinkers
+//
+//==================================================================
+void P_SpawnLightFlash(sector_t * sector)
+{
+    lightflash_t *flash;
+
+    sector->special = 0;        // nothing special about it during gameplay
+
+    flash = Z_Malloc(sizeof(*flash), PU_LEVSPEC, 0);
+    P_AddThinker(&flash->thinker);
+    flash->thinker.function = T_LightFlash;
+    flash->sector = sector;
+    flash->maxlight = sector->lightlevel;
+
+    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
+    flash->maxtime = 64;
+    flash->mintime = 7;
+    flash->count = (P_Random() & flash->maxtime) + 1;
+}
+
+//==================================================================
+//
+//                                                      STROBE LIGHT FLASHING
+//
+//==================================================================
+
+//==================================================================
+//
+//      T_StrobeFlash
+//
+//      After the map has been loaded, scan each sector for specials that spawn thinkers
+//
+//==================================================================
+void T_StrobeFlash(thinker_t *thinker)
+{
+    strobe_t *flash = (strobe_t *) thinker;
+
+    if (--flash->count)
+        return;
+
+    if (flash->sector->lightlevel == flash->minlight)
+    {
+        flash->sector->lightlevel = flash->maxlight;
+        flash->count = flash->brighttime;
+    }
+    else
+    {
+        flash->sector->lightlevel = flash->minlight;
+        flash->count = flash->darktime;
+    }
+
+}
+
+//==================================================================
+//
+//      P_SpawnLightFlash
+//
+//      After the map has been loaded, scan each sector for specials that spawn thinkers
+//
+//==================================================================
+void P_SpawnStrobeFlash(sector_t * sector, int fastOrSlow, int inSync)
+{
+    strobe_t *flash;
+
+    flash = Z_Malloc(sizeof(*flash), PU_LEVSPEC, 0);
+    P_AddThinker(&flash->thinker);
+    flash->sector = sector;
+    flash->darktime = fastOrSlow;
+    flash->brighttime = STROBEBRIGHT;
+    flash->thinker.function = T_StrobeFlash;
+    flash->maxlight = sector->lightlevel;
+    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
+
+    if (flash->minlight == flash->maxlight)
+        flash->minlight = 0;
+    sector->special = 0;        // nothing special about it during gameplay
+
+    if (!inSync)
+        flash->count = (P_Random() & 7) + 1;
+    else
+        flash->count = 1;
+}
+
+//==================================================================
+//
+//      Start strobing lights (usually from a trigger)
+//
+//==================================================================
+void EV_StartLightStrobing(line_t * line)
+{
+    int secnum;
+    sector_t *sec;
+
+    secnum = -1;
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        P_SpawnStrobeFlash(sec, SLOWDARK, 0);
+    }
+}
+
+//==================================================================
+//
+//      TURN LINE'S TAG LIGHTS OFF
+//
+//==================================================================
+void EV_TurnTagLightsOff(line_t * line)
+{
+    int i;
+    int j;
+    int min;
+    sector_t *sector;
+    sector_t *tsec;
+    line_t *templine;
+
+    sector = sectors;
+    for (j = 0; j < numsectors; j++, sector++)
+        if (sector->tag == line->tag)
+        {
+            min = sector->lightlevel;
+            for (i = 0; i < sector->linecount; i++)
+            {
+                templine = sector->lines[i];
+                tsec = getNextSector(templine, sector);
+                if (!tsec)
+                    continue;
+                if (tsec->lightlevel < min)
+                    min = tsec->lightlevel;
+            }
+            sector->lightlevel = min;
+        }
+}
+
+//==================================================================
+//
+//      TURN LINE'S TAG LIGHTS ON
+//
+//==================================================================
+void EV_LightTurnOn(line_t * line, int bright)
+{
+    int i;
+    int j;
+    sector_t *sector;
+    sector_t *temp;
+    line_t *templine;
+
+    sector = sectors;
+
+    for (i = 0; i < numsectors; i++, sector++)
+        if (sector->tag == line->tag)
+        {
+            //
+            // bright = 0 means to search for highest
+            // light level surrounding sector
+            //
+            if (!bright)
+            {
+                for (j = 0; j < sector->linecount; j++)
+                {
+                    templine = sector->lines[j];
+                    temp = getNextSector(templine, sector);
+                    if (!temp)
+                        continue;
+                    if (temp->lightlevel > bright)
+                        bright = temp->lightlevel;
+                }
+            }
+            sector->lightlevel = bright;
+        }
+}
+
+//==================================================================
+//
+//      Spawn glowing light
+//
+//==================================================================
+void T_Glow(thinker_t *thinker)
+{
+    glow_t *g = (glow_t *) thinker;
+
+    switch (g->direction)
+    {
+        case -1:               // DOWN
+            g->sector->lightlevel -= GLOWSPEED;
+            if (g->sector->lightlevel <= g->minlight)
+            {
+                g->sector->lightlevel += GLOWSPEED;
+                g->direction = 1;
+            }
+            break;
+        case 1:                // UP
+            g->sector->lightlevel += GLOWSPEED;
+            if (g->sector->lightlevel >= g->maxlight)
+            {
+                g->sector->lightlevel -= GLOWSPEED;
+                g->direction = -1;
+            }
+            break;
+    }
+}
+
+void P_SpawnGlowingLight(sector_t * sector)
+{
+    glow_t *g;
+
+    g = Z_Malloc(sizeof(*g), PU_LEVSPEC, 0);
+    P_AddThinker(&g->thinker);
+    g->sector = sector;
+    g->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
+    g->maxlight = sector->lightlevel;
+    g->thinker.function = T_Glow;
+    g->direction = -1;
+
+    sector->special = 0;
+}
diff --git a/games/NXDoom/src/heretic/p_local.h b/games/NXDoom/src/heretic/p_local.h
new file mode 100644
index 000000000..6137d3d0d
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_local.h
@@ -0,0 +1,292 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_local.h
+
+#ifndef __P_LOCAL__
+#define __P_LOCAL__
+
+#ifndef __R_LOCAL__
+#include "r_local.h"
+#endif
+
+#define STARTREDPALS	1
+#define STARTBONUSPALS	9
+#define NUMREDPALS		8
+#define NUMBONUSPALS	4
+
+#define FOOTCLIPSIZE	10*FRACUNIT
+
+#define TOCENTER -8
+#define	FLOATSPEED (FRACUNIT*4)
+
+#define	MAXHEALTH 100
+#define MAXCHICKENHEALTH 30
+#define	VIEWHEIGHT (41*FRACUNIT)
+
+// mapblocks are used to check movement against lines and things
+#define MAPBLOCKUNITS	128
+#define	MAPBLOCKSIZE	(MAPBLOCKUNITS*FRACUNIT)
+#define	MAPBLOCKSHIFT	(FRACBITS+7)
+#define	MAPBMASK		(MAPBLOCKSIZE-1)
+#define	MAPBTOFRAC		(MAPBLOCKSHIFT-FRACBITS)
+
+// player radius for movement checking
+#define PLAYERRADIUS 16*FRACUNIT
+
+// MAXRADIUS is for precalculated sector block boxes
+// the spider demon is larger, but we don't have any moving sectors
+// nearby
+#define MAXRADIUS 32*FRACUNIT
+
+#define	GRAVITY FRACUNIT
+#define	MAXMOVE (30*FRACUNIT)
+
+#define	USERANGE (64*FRACUNIT)
+#define	MELEERANGE (64*FRACUNIT)
+#define	MISSILERANGE (32*64*FRACUNIT)
+
+typedef enum
+{
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+} dirtype_t;
+
+#define BASETHRESHOLD 100       // follow a player exlusively for 3 seconds
+
+// ***** P_TICK *****
+
+extern thinker_t thinkercap;    // both the head and tail of the thinker list
+extern int TimerGame;           // tic countdown for deathmatch
+
+void P_InitThinkers(void);
+void P_AddThinker(thinker_t * thinker);
+void P_RemoveThinker(thinker_t * thinker);
+
+// ***** P_PSPR *****
+
+#define USE_GWND_AMMO_1 1
+#define USE_GWND_AMMO_2 1
+#define USE_CBOW_AMMO_1 1
+#define USE_CBOW_AMMO_2 1
+#define USE_BLSR_AMMO_1 1
+#define USE_BLSR_AMMO_2 5
+#define USE_SKRD_AMMO_1 1
+#define USE_SKRD_AMMO_2 5
+#define USE_PHRD_AMMO_1 1
+#define USE_PHRD_AMMO_2 1
+#define USE_MACE_AMMO_1 1
+#define USE_MACE_AMMO_2 5
+
+void P_OpenWeapons(void);
+void P_CloseWeapons(void);
+void P_AddMaceSpot(mapthing_t * mthing);
+void P_RepositionMace(mobj_t * mo);
+void P_SetPsprite(player_t * player, int position, statenum_t stnum);
+void P_SetupPsprites(player_t * curplayer);
+void P_MovePsprites(player_t * curplayer);
+void P_DropWeapon(player_t * player);
+void P_ActivateBeak(player_t * player);
+void P_PostChickenWeapon(player_t * player, weapontype_t weapon);
+void P_UpdateBeak(player_t * player, pspdef_t * psp);
+
+// ***** P_USER *****
+
+void P_PlayerThink(player_t * player);
+void P_Thrust(player_t * player, angle_t angle, fixed_t move);
+void P_PlayerRemoveArtifact(player_t * player, int slot);
+void P_PlayerUseArtifact(player_t * player, artitype_t arti);
+boolean P_UseArtifact(player_t * player, artitype_t arti);
+int P_GetPlayerNum(player_t * player);
+boolean P_UndoPlayerChicken(player_t *player);
+
+
+// ***** P_MOBJ *****
+
+#define FLOOR_SOLID 0
+#define FLOOR_WATER 1
+#define FLOOR_LAVA 2
+#define FLOOR_SLUDGE 3
+
+#define ONFLOORZ INT_MIN
+#define ONCEILINGZ INT_MAX
+#define FLOATRANDZ (INT_MAX-1)
+
+extern mobjtype_t PuffType;
+extern mobj_t *MissileMobj;
+
+mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
+void P_RemoveMobj(mobj_t * th);
+boolean P_SetMobjState(mobj_t * mobj, statenum_t state);
+boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state);
+void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move);
+int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta);
+boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax);
+void P_MobjThinker(thinker_t *thinker);
+void P_BlasterMobjThinker(thinker_t *thinker);
+void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z);
+void P_SpawnBlood(fixed_t x, fixed_t y, fixed_t z, int damage);
+void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator);
+void P_RipperBlood(mobj_t * mo);
+int P_GetThingFloorType(mobj_t * thing);
+int P_HitFloor(mobj_t * thing);
+boolean P_CheckMissileSpawn(mobj_t * missile);
+mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type);
+mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
+                            angle_t angle, fixed_t momz);
+mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type);
+mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle);
+
+// ***** P_ENEMY *****
+
+void P_NoiseAlert(mobj_t * target, mobj_t * emmiter);
+void P_InitMonsters(void);
+void P_AddBossSpot(fixed_t x, fixed_t y, angle_t angle);
+void P_Massacre(void);
+void P_DSparilTeleport(mobj_t * actor);
+
+// ***** P_MAPUTL *****
+
+typedef struct
+{
+    fixed_t x, y, dx, dy;
+} divline_t;
+
+typedef struct
+{
+    fixed_t frac;               // along trace line
+    boolean isaline;
+    union
+    {
+        mobj_t *thing;
+        line_t *line;
+    } d;
+} intercept_t;
+
+#define	MAXINTERCEPTS	128
+extern intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
+typedef boolean(*traverser_t) (intercept_t * in);
+
+
+fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
+int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line);
+int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line);
+void P_MakeDivline(line_t * li, divline_t * dl);
+fixed_t P_InterceptVector(divline_t * v2, divline_t * v1);
+int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld);
+
+extern fixed_t opentop, openbottom, openrange;
+extern fixed_t lowfloor;
+void P_LineOpening(line_t * linedef);
+
+boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *));
+boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *));
+
+#define PT_ADDLINES		1
+#define	PT_ADDTHINGS	2
+#define	PT_EARLYOUT		4
+
+extern divline_t trace;
+boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                       int flags, boolean(*trav) (intercept_t *));
+
+void P_UnsetThingPosition(mobj_t * thing);
+void P_SetThingPosition(mobj_t * thing);
+
+// ***** P_MAP *****
+
+extern boolean floatok;         // if true, move would be ok if
+extern fixed_t tmfloorz, tmceilingz;    // within tmfloorz - tmceilingz
+
+extern line_t *ceilingline;
+boolean P_TestMobjLocation(mobj_t * mobj);
+boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y);
+mobj_t *P_CheckOnmobj(mobj_t * thing);
+void P_FakeZMovement(mobj_t * mo);
+boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y);
+boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y);
+void P_SlideMove(mobj_t * mo);
+
+extern fixed_t topslope, bottomslope;   // slopes to top and bottom of target
+
+boolean P_CheckSight(mobj_t * t1, mobj_t * t2);
+void P_UseLines(player_t * player);
+
+boolean P_ChangeSector(sector_t * sector, boolean crunch);
+
+extern mobj_t *linetarget;      // who got hit (or NULL)
+fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance);
+
+void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
+                  int damage);
+
+void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage);
+
+#define	MAXSPECIALCROSS		8
+extern line_t *spechit[MAXSPECIALCROSS];
+extern int numspechit;
+
+
+// ***** P_SETUP *****
+
+extern byte *rejectmatrix;      // for fast sight rejection
+extern short *blockmaplump;     // offsets in blockmap are from here
+extern short *blockmap;
+extern int bmapwidth, bmapheight;       // in mapblocks
+extern fixed_t bmaporgx, bmaporgy;      // origin of block map
+extern mobj_t **blocklinks;     // for thing chains
+
+// ***** P_INTER *****
+
+extern int maxammo[NUMAMMO];
+extern int clipammo[NUMAMMO];
+
+extern boolean messageson;
+
+
+void P_SetMessage(player_t * player, const char *message, boolean ultmsg);
+void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher);
+void P_DamageMobj(mobj_t * target, mobj_t * inflictor, mobj_t * source,
+                  int damage);
+boolean P_GiveAmmo(player_t * player, ammotype_t ammo, int count);
+boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo);
+boolean P_GiveBody(player_t * player, int num);
+boolean P_GivePower(player_t * player, powertype_t power);
+boolean P_ChickenMorphPlayer(player_t * player);
+
+// ***** AM_MAP *****
+
+boolean AM_Responder(event_t * ev);
+void AM_Ticker(void);
+void AM_Drawer(void);
+
+// ***** SB_BAR *****
+
+extern int SB_state;
+extern int ArtifactFlash;
+void SB_PaletteFlash(void);
+
+#include "p_spec.h"
+
+#endif // __P_LOCAL__
diff --git a/games/NXDoom/src/heretic/p_map.c b/games/NXDoom/src/heretic/p_map.c
new file mode 100644
index 000000000..ba5669770
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_map.c
@@ -0,0 +1,1696 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// P_map.c
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "m_bbox.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+/*
+===============================================================================
+
+NOTES:
+
+
+===============================================================================
+*/
+
+/*
+===============================================================================
+
+mobj_t NOTES
+
+mobj_ts are used to tell the refresh where to draw an image, tell the world
+simulation when objects are contacted, and tell the sound driver how to
+position a sound.
+
+The refresh uses the next and prev links to follow lists of things in sectors
+as they are being drawn.  The sprite, frame, and angle elements determine which
+patch_t is used to draw the sprite if it is visible.  The sprite and frame
+values are allmost allways set from state_t structures.  The statescr.exe
+utility generates the states.h and states.c files that contain the sprite/frame
+numbers from the statescr.txt source file.  The xyz origin point represents a
+point at the bottom middle of the sprite (between the feet of a biped).  This
+is the default origin position for patch_ts grabbed with lumpy.exe.  A walking
+creature will have its z equal to the floor it is standing on.
+ 
+The sound code uses the x,y, and subsector fields to do stereo positioning of
+any sound effited by the mobj_t.
+
+The play simulation uses the blocklinks, x,y,z, radius, height to determine
+when mobj_ts are touching each other, touching lines in the map, or hit by
+trace lines (gunshots, lines of sight, etc). The mobj_t->flags element has
+various bit flags used by the simulation.
+
+
+Every mobj_t is linked into a single sector based on it's origin coordinates.
+The subsector_t is found with R_PointInSubsector(x,y), and the sector_t can be
+found with subsector->sector.  The sector links are only used by the rendering
+code,  the play simulation does not care about them at all.
+
+Any mobj_t that needs to be acted upon be something else in the play world
+(block movement, be shot, etc) will also need to be linked into the blockmap. 
+If the thing has the MF_NOBLOCK flag set, it will not use the block links. It
+can still interact with other things, but only as the instigator (missiles will
+run into other things, but nothing can run into a missile).   Each block in
+the grid is 128*128 units, and knows about every line_t that it contains a
+piece of, and every interactable mobj_t that has it's origin contained.  
+
+A valid mobj_t is a mobj_t that has the proper subsector_t filled in for it's
+xy coordinates and is linked into the subsector's sector or has the MF_NOSECTOR
+flag set (the subsector_t needs to be valid even if MF_NOSECTOR is set), and is
+linked into a blockmap block or has the MF_NOBLOCKMAP flag set.  Links should
+only be modified by the P_[Un]SetThingPosition () functions.  Do not change
+the MF_NO? flags while a thing is valid.
+
+
+===============================================================================
+*/
+
+fixed_t tmbbox[4];
+mobj_t *tmthing;
+int tmflags;
+fixed_t tmx, tmy;
+
+boolean floatok;                // if true, move would be ok if
+                                                                        // within tmfloorz - tmceilingz
+
+fixed_t tmfloorz, tmceilingz, tmdropoffz;
+
+// keep track of the line that lowers the ceiling, so missiles don't explode
+// against sky hack walls
+line_t *ceilingline;
+
+// keep track of special lines as they are hit, but don't process them
+// until the move is proven valid
+#define	MAXSPECIALCROSS		8
+line_t *spechit[MAXSPECIALCROSS];
+int numspechit;
+
+mobj_t *onmobj;                 //generic global onmobj...used for landing on pods/players
+
+/*
+===============================================================================
+
+					TELEPORT MOVE
+ 
+===============================================================================
+*/
+
+/*
+==================
+=
+= PIT_StompThing
+=
+==================
+*/
+
+boolean PIT_StompThing(mobj_t * thing)
+{
+    fixed_t blockdist;
+
+    if (!(thing->flags & MF_SHOOTABLE))
+        return true;
+
+    blockdist = thing->radius + tmthing->radius;
+    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
+        return true;            // didn't hit it
+
+    if (thing == tmthing)
+        return true;            // don't clip against self
+
+    if (!(tmthing->flags2 & MF2_TELESTOMP))
+    {                           // Not allowed to stomp things
+        return (false);
+    }
+
+    P_DamageMobj(thing, tmthing, tmthing, 10000);
+
+    return true;
+}
+
+
+/*
+===================
+=
+= P_TeleportMove
+=
+===================
+*/
+
+boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y)
+{
+    int xl, xh, yl, yh, bx, by;
+    subsector_t *newsubsec;
+
+//
+// kill anything occupying the position
+//
+
+    tmthing = thing;
+    tmflags = thing->flags;
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector(x, y);
+    ceilingline = NULL;
+
+//
+// the base floor / ceiling is from the subsector that contains the
+// point.  Any contacted lines the step closer together will adjust them
+//
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+
+    validcount++;
+    numspechit = 0;
+
+//
+// stomp on any things contacted
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockThingsIterator(bx, by, PIT_StompThing))
+                return false;
+
+//
+// the move is ok, so link the thing into its new position
+//      
+    P_UnsetThingPosition(thing);
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition(thing);
+
+    return true;
+}
+
+/*
+===============================================================================
+
+					MOVEMENT ITERATOR FUNCTIONS
+ 
+===============================================================================
+*/
+
+/*
+==================
+=
+= PIT_CheckLine
+=
+= Adjusts tmfloorz and tmceilingz as lines are contacted
+==================
+*/
+
+boolean PIT_CheckLine(line_t * ld)
+{
+    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
+        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
+        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
+        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+    {
+        return (true);
+    }
+    if (P_BoxOnLineSide(tmbbox, ld) != -1)
+    {
+        return (true);
+    }
+
+// a line has been hit
+/*
+=
+= The moving thing's destination position will cross the given line.
+= If this should not be allowed, return false.
+= If the line is special, keep track of it to process later if the move
+= 	is proven ok.  NOTE: specials are NOT sorted by order, so two special lines
+= 	that are only 8 pixels apart could be crossed in either order.
+*/
+
+    if (!ld->backsector)
+    {                           // One sided line
+        if (tmthing->flags & MF_MISSILE)
+        {                       // Missiles can trigger impact specials
+            if (ld->special)
+            {
+                spechit[numspechit] = ld;
+                numspechit++;
+            }
+        }
+        return false;
+    }
+    if (!(tmthing->flags & MF_MISSILE))
+    {
+        if (ld->flags & ML_BLOCKING)
+        {                       // Explicitly blocking everything
+            return (false);
+        }
+        if (!tmthing->player && ld->flags & ML_BLOCKMONSTERS
+            && tmthing->type != MT_POD)
+        {                       // Block monsters only
+            return (false);
+        }
+    }
+    P_LineOpening(ld);          // set openrange, opentop, openbottom
+    // adjust floor / ceiling heights
+    if (opentop < tmceilingz)
+    {
+        tmceilingz = opentop;
+        ceilingline = ld;
+    }
+    if (openbottom > tmfloorz)
+    {
+        tmfloorz = openbottom;
+    }
+    if (lowfloor < tmdropoffz)
+    {
+        tmdropoffz = lowfloor;
+    }
+    if (ld->special)
+    {                           // Contacted a special line, add it to the list
+        spechit[numspechit] = ld;
+        numspechit++;
+    }
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC PIT_CheckThing
+//
+//---------------------------------------------------------------------------
+
+boolean PIT_CheckThing(mobj_t * thing)
+{
+    fixed_t blockdist;
+    boolean solid;
+    int damage;
+
+    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
+    {                           // Can't hit thing
+        return (true);
+    }
+    blockdist = thing->radius + tmthing->radius;
+    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
+    {                           // Didn't hit thing
+        return (true);
+    }
+    if (thing == tmthing)
+    {                           // Don't clip against self
+        return (true);
+    }
+    if (tmthing->flags2 & MF2_PASSMOBJ)
+    {                           // check if a mobj passed over/under another object
+        if ((tmthing->type == MT_IMP || tmthing->type == MT_WIZARD)
+            && (thing->type == MT_IMP || thing->type == MT_WIZARD))
+        {                       // don't let imps/wizards fly over other imps/wizards
+            return false;
+        }
+        if (tmthing->z > thing->z + thing->height
+            && !(thing->flags & MF_SPECIAL))
+        {
+            return (true);
+        }
+        else if (tmthing->z + tmthing->height < thing->z
+                 && !(thing->flags & MF_SPECIAL))
+        {                       // under thing
+            return (true);
+        }
+    }
+    // Check for skulls slamming into things
+    if (tmthing->flags & MF_SKULLFLY)
+    {
+        damage = ((P_Random() % 8) + 1) * tmthing->damage;
+        P_DamageMobj(thing, tmthing, tmthing, damage);
+        tmthing->flags &= ~MF_SKULLFLY;
+        tmthing->momx = tmthing->momy = tmthing->momz = 0;
+        P_SetMobjState(tmthing, tmthing->info->seestate);
+        return (false);
+    }
+    // Check for missile
+    if (tmthing->flags & MF_MISSILE)
+    {
+        // Check for passing through a ghost
+        if ((thing->flags & MF_SHADOW) && (tmthing->flags2 & MF2_THRUGHOST))
+        {
+            return (true);
+        }
+        // Check if it went over / under
+        if (tmthing->z > thing->z + thing->height)
+        {                       // Over thing
+            return (true);
+        }
+        if (tmthing->z + tmthing->height < thing->z)
+        {                       // Under thing
+            return (true);
+        }
+        if (tmthing->target && tmthing->target->type == thing->type)
+        {                       // Don't hit same species as originator
+            if (thing == tmthing->target)
+            {                   // Don't missile self
+                return (true);
+            }
+            if (thing->type != MT_PLAYER)
+            {                   // Hit same species as originator, explode, no damage
+                return (false);
+            }
+        }
+        if (!(thing->flags & MF_SHOOTABLE))
+        {                       // Didn't do any damage
+            return !(thing->flags & MF_SOLID);
+        }
+        if (tmthing->flags2 & MF2_RIP)
+        {
+            if (!(thing->flags & MF_NOBLOOD))
+            {                   // Ok to spawn some blood
+                P_RipperBlood(tmthing);
+            }
+            S_StartSound(tmthing, sfx_ripslop);
+            damage = ((P_Random() & 3) + 2) * tmthing->damage;
+            P_DamageMobj(thing, tmthing, tmthing->target, damage);
+            if (thing->flags2 & MF2_PUSHABLE
+                && !(tmthing->flags2 & MF2_CANNOTPUSH))
+            {                   // Push thing
+                thing->momx += tmthing->momx >> 2;
+                thing->momy += tmthing->momy >> 2;
+            }
+            numspechit = 0;
+            return (true);
+        }
+        // Do damage
+        damage = ((P_Random() % 8) + 1) * tmthing->damage;
+        if (damage)
+        {
+            if (!(thing->flags & MF_NOBLOOD) && P_Random() < 192)
+            {
+                P_BloodSplatter(tmthing->x, tmthing->y, tmthing->z, thing);
+            }
+            P_DamageMobj(thing, tmthing, tmthing->target, damage);
+        }
+        return (false);
+    }
+    if (thing->flags2 & MF2_PUSHABLE && !(tmthing->flags2 & MF2_CANNOTPUSH))
+    {                           // Push thing
+        thing->momx += tmthing->momx >> 2;
+        thing->momy += tmthing->momy >> 2;
+    }
+    // Check for special thing
+    if (thing->flags & MF_SPECIAL)
+    {
+        solid = (thing->flags & MF_SOLID) != 0;
+        if (tmflags & MF_PICKUP)
+        {                       // Can be picked up by tmthing
+            P_TouchSpecialThing(thing, tmthing);        // Can remove thing
+        }
+        return (!solid);
+    }
+    return (!(thing->flags & MF_SOLID));
+}
+
+//---------------------------------------------------------------------------
+//
+// PIT_CheckOnmobjZ
+//
+//---------------------------------------------------------------------------
+
+boolean PIT_CheckOnmobjZ(mobj_t * thing)
+{
+    fixed_t blockdist;
+
+    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
+    {                           // Can't hit thing
+        return (true);
+    }
+    blockdist = thing->radius + tmthing->radius;
+    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
+    {                           // Didn't hit thing
+        return (true);
+    }
+    if (thing == tmthing)
+    {                           // Don't clip against self
+        return (true);
+    }
+    if (tmthing->z > thing->z + thing->height)
+    {
+        return (true);
+    }
+    else if (tmthing->z + tmthing->height < thing->z)
+    {                           // under thing
+        return (true);
+    }
+    if (thing->flags & MF_SOLID)
+    {
+        onmobj = thing;
+    }
+    return (!(thing->flags & MF_SOLID));
+}
+
+/*
+===============================================================================
+
+ 						MOVEMENT CLIPPING
+ 
+===============================================================================
+*/
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_TestMobjLocation
+//
+// Returns true if the mobj is not blocked by anything at its current
+// location, otherwise returns false.
+//
+//----------------------------------------------------------------------------
+
+boolean P_TestMobjLocation(mobj_t * mobj)
+{
+    int flags;
+
+    flags = mobj->flags;
+    mobj->flags &= ~MF_PICKUP;
+    if (P_CheckPosition(mobj, mobj->x, mobj->y))
+    {                           // XY is ok, now check Z
+        mobj->flags = flags;
+        if ((mobj->z < mobj->floorz)
+            || (mobj->z + mobj->height > mobj->ceilingz))
+        {                       // Bad Z
+            return (false);
+        }
+        return (true);
+    }
+    mobj->flags = flags;
+    return (false);
+}
+
+/*
+==================
+=
+= P_CheckPosition
+=
+= This is purely informative, nothing is modified (except things picked up)
+
+in:
+a mobj_t (can be valid or invalid)
+a position to be checked (doesn't need to be related to the mobj_t->x,y)
+
+during:
+special things are touched if MF_PICKUP
+early out on solid lines?
+
+out:
+newsubsec
+floorz
+ceilingz
+tmdropoffz		the lowest point contacted (monsters won't move to a dropoff)
+speciallines[]
+numspeciallines
+
+==================
+*/
+
+boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y)
+{
+    int xl, xh, yl, yh, bx, by;
+    subsector_t *newsubsec;
+
+    tmthing = thing;
+    tmflags = thing->flags;
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector(x, y);
+    ceilingline = NULL;
+
+//
+// the base floor / ceiling is from the subsector that contains the
+// point.  Any contacted lines the step closer together will adjust them
+//
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+
+    validcount++;
+    numspechit = 0;
+
+    if (tmflags & MF_NOCLIP)
+        return true;
+
+//
+// check things first, possibly picking things up
+// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
+// into mapblocks based on their origin point, and can overlap into adjacent
+// blocks by up to MAXRADIUS units
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
+                return false;
+//
+// check lines
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockLinesIterator(bx, by, PIT_CheckLine))
+                return false;
+
+    return true;
+}
+
+//=============================================================================
+//
+// P_CheckOnmobj(mobj_t *thing)
+//
+//              Checks if the new Z position is legal
+//=============================================================================
+
+mobj_t *P_CheckOnmobj(mobj_t * thing)
+{
+    int xl, xh, yl, yh, bx, by;
+    subsector_t *newsubsec;
+    fixed_t x;
+    fixed_t y;
+    mobj_t oldmo;
+
+    x = thing->x;
+    y = thing->y;
+    tmthing = thing;
+    tmflags = thing->flags;
+    oldmo = *thing;             // save the old mobj before the fake zmovement
+    P_FakeZMovement(tmthing);
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector(x, y);
+    ceilingline = NULL;
+
+//
+// the base floor / ceiling is from the subsector that contains the
+// point.  Any contacted lines the step closer together will adjust them
+//
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+
+    validcount++;
+    numspechit = 0;
+
+    if (tmflags & MF_NOCLIP)
+        return NULL;
+
+//
+// check things first, possibly picking things up
+// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
+// into mapblocks based on their origin point, and can overlap into adjacent
+// blocks by up to MAXRADIUS units
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockThingsIterator(bx, by, PIT_CheckOnmobjZ))
+            {
+                *tmthing = oldmo;
+                return onmobj;
+            }
+    *tmthing = oldmo;
+    return NULL;
+}
+
+//=============================================================================
+//
+// P_FakeZMovement
+//
+//              Fake the zmovement so that we can check if a move is legal
+//=============================================================================
+
+void P_FakeZMovement(mobj_t * mo)
+{
+    int dist;
+    int delta;
+//
+// adjust height
+//
+    mo->z += mo->momz;
+    if (mo->flags & MF_FLOAT && mo->target)
+    {                           // float down towards target if too close
+        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
+        {
+            dist =
+                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
+            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
+            if (delta < 0 && dist < -(delta * 3))
+                mo->z -= FLOATSPEED;
+            else if (delta > 0 && dist < (delta * 3))
+                mo->z += FLOATSPEED;
+        }
+    }
+    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
+        && leveltime & 2)
+    {
+        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
+    }
+
+//
+// clip movement
+//
+    if (mo->z <= mo->floorz)
+    {                           // Hit the floor
+        mo->z = mo->floorz;
+        if (mo->momz < 0)
+        {
+            mo->momz = 0;
+        }
+        if (mo->flags & MF_SKULLFLY)
+        {                       // The skull slammed into something
+            mo->momz = -mo->momz;
+        }
+        if (mo->info->crashstate && (mo->flags & MF_CORPSE))
+        {
+            return;
+        }
+    }
+    else if (mo->flags2 & MF2_LOGRAV)
+    {
+        if (mo->momz == 0)
+            mo->momz = -(GRAVITY >> 3) * 2;
+        else
+            mo->momz -= GRAVITY >> 3;
+    }
+    else if (!(mo->flags & MF_NOGRAVITY))
+    {
+        if (mo->momz == 0)
+            mo->momz = -GRAVITY * 2;
+        else
+            mo->momz -= GRAVITY;
+    }
+
+    if (mo->z + mo->height > mo->ceilingz)
+    {                           // hit the ceiling
+        if (mo->momz > 0)
+            mo->momz = 0;
+        mo->z = mo->ceilingz - mo->height;
+        if (mo->flags & MF_SKULLFLY)
+        {                       // the skull slammed into something
+            mo->momz = -mo->momz;
+        }
+    }
+}
+
+//==========================================================================
+//
+// CheckMissileImpact
+//
+//==========================================================================
+
+void CheckMissileImpact(mobj_t * mobj)
+{
+    int i;
+
+    if (!numspechit || !(mobj->flags & MF_MISSILE) || !mobj->target)
+    {
+        return;
+    }
+    if (!mobj->target->player)
+    {
+        return;
+    }
+    for (i = numspechit - 1; i >= 0; i--)
+    {
+        P_ShootSpecialLine(mobj->target, spechit[i]);
+    }
+}
+
+/*
+===================
+=
+= P_TryMove
+=
+= Attempt to move to a new position, crossing special lines unless MF_TELEPORT
+= is set
+=
+===================
+*/
+
+boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y)
+{
+    fixed_t oldx, oldy;
+    int side, oldside;
+    line_t *ld;
+
+    floatok = false;
+    if (!P_CheckPosition(thing, x, y))
+    {                           // Solid wall or thing
+        CheckMissileImpact(thing);
+        return false;
+    }
+    if (!(thing->flags & MF_NOCLIP))
+    {
+        if (tmceilingz - tmfloorz < thing->height)
+        {                       // Doesn't fit
+            CheckMissileImpact(thing);
+            return false;
+        }
+        floatok = true;
+        if (!(thing->flags & MF_TELEPORT)
+            && tmceilingz - thing->z < thing->height
+            && !(thing->flags2 & MF2_FLY))
+        {                       // mobj must lower itself to fit
+            CheckMissileImpact(thing);
+            return false;
+        }
+        if (thing->flags2 & MF2_FLY)
+        {
+            if (thing->z + thing->height > tmceilingz)
+            {
+                thing->momz = -8 * FRACUNIT;
+                return false;
+            }
+            else if (thing->z < tmfloorz
+                     && tmfloorz - tmdropoffz > 24 * FRACUNIT)
+            {
+                thing->momz = 8 * FRACUNIT;
+                return false;
+            }
+        }
+        if (!(thing->flags & MF_TELEPORT)
+            // The Minotaur floor fire (MT_MNTRFX2) can step up any amount
+            && thing->type != MT_MNTRFX2
+            && tmfloorz - thing->z > 24 * FRACUNIT)
+        {                       // Too big a step up
+            CheckMissileImpact(thing);
+            return false;
+        }
+        if ((thing->flags & MF_MISSILE) && tmfloorz > thing->z)
+        {
+            CheckMissileImpact(thing);
+        }
+        if (!(thing->flags & (MF_DROPOFF | MF_FLOAT))
+            && tmfloorz - tmdropoffz > 24 * FRACUNIT)
+        {                       // Can't move over a dropoff
+            return false;
+        }
+    }
+
+//
+// the move is ok, so link the thing into its new position
+//
+    P_UnsetThingPosition(thing);
+
+    oldx = thing->x;
+    oldy = thing->y;
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition(thing);
+
+    if (thing->flags2 & MF2_FOOTCLIP
+        && P_GetThingFloorType(thing) != FLOOR_SOLID)
+    {
+        thing->flags2 |= MF2_FEETARECLIPPED;
+    }
+    else if (thing->flags2 & MF2_FEETARECLIPPED)
+    {
+        thing->flags2 &= ~MF2_FEETARECLIPPED;
+    }
+
+//
+// if any special lines were hit, do the effect
+//
+    if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
+        while (numspechit--)
+        {
+            // see if the line was crossed
+            ld = spechit[numspechit];
+            side = P_PointOnLineSide(thing->x, thing->y, ld);
+            oldside = P_PointOnLineSide(oldx, oldy, ld);
+            if (side != oldside)
+            {
+                if (ld->special)
+                    P_CrossSpecialLine(ld - lines, oldside, thing);
+            }
+        }
+
+    return true;
+}
+
+/*
+==================
+=
+= P_ThingHeightClip
+=
+= Takes a valid thing and adjusts the thing->floorz, thing->ceilingz,
+= anf possibly thing->z
+=
+= This is called for all nearby monsters whenever a sector changes height
+=
+= If the thing doesn't fit, the z will be set to the lowest value and
+= false will be returned
+==================
+*/
+
+boolean P_ThingHeightClip(mobj_t * thing)
+{
+    boolean onfloor;
+
+    onfloor = (thing->z == thing->floorz);
+
+    P_CheckPosition(thing, thing->x, thing->y);
+    // what about stranding a monster partially off an edge?
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+
+    if (onfloor)
+        // walking monsters rise and fall with the floor
+        thing->z = thing->floorz;
+    else
+    {                           // don't adjust a floating monster unless forced to
+        if (thing->z + thing->height > thing->ceilingz)
+            thing->z = thing->ceilingz - thing->height;
+    }
+
+    if (thing->ceilingz - thing->floorz < thing->height)
+        return false;
+
+    return true;
+}
+
+
+/*
+==============================================================================
+
+							SLIDE MOVE
+
+Allows the player to slide along any angled walls
+
+==============================================================================
+*/
+
+fixed_t bestslidefrac, secondslidefrac;
+line_t *bestslideline, *secondslideline;
+mobj_t *slidemo;
+
+fixed_t tmxmove, tmymove;
+
+/*
+==================
+=
+= P_HitSlideLine
+=
+= Adjusts the xmove / ymove so that the next move will slide along the wall
+==================
+*/
+
+void P_HitSlideLine(line_t * ld)
+{
+    int side;
+    angle_t lineangle, moveangle, deltaangle;
+    fixed_t movelen, newlen;
+
+
+    if (ld->slopetype == ST_HORIZONTAL)
+    {
+        tmymove = 0;
+        return;
+    }
+    if (ld->slopetype == ST_VERTICAL)
+    {
+        tmxmove = 0;
+        return;
+    }
+
+    side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
+
+    lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
+    if (side == 1)
+        lineangle += ANG180;
+    moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
+    deltaangle = moveangle - lineangle;
+    if (deltaangle > ANG180)
+        deltaangle += ANG180;
+//              I_Error ("SlideLine: ang>ANG180");
+
+    lineangle >>= ANGLETOFINESHIFT;
+    deltaangle >>= ANGLETOFINESHIFT;
+
+    movelen = P_AproxDistance(tmxmove, tmymove);
+    newlen = FixedMul(movelen, finecosine[deltaangle]);
+    tmxmove = FixedMul(newlen, finecosine[lineangle]);
+    tmymove = FixedMul(newlen, finesine[lineangle]);
+}
+
+/*
+==============
+=
+= PTR_SlideTraverse
+=
+==============
+*/
+
+boolean PTR_SlideTraverse(intercept_t * in)
+{
+    line_t *li;
+
+    if (!in->isaline)
+        I_Error("PTR_SlideTraverse: not a line?");
+
+    li = in->d.line;
+    if (!(li->flags & ML_TWOSIDED))
+    {
+        if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
+            return true;        // don't hit the back side
+        goto isblocking;
+    }
+
+    P_LineOpening(li);          // set openrange, opentop, openbottom
+    if (openrange < slidemo->height)
+        goto isblocking;        // doesn't fit
+
+    if (opentop - slidemo->z < slidemo->height)
+        goto isblocking;        // mobj is too high
+
+    if (openbottom - slidemo->z > 24 * FRACUNIT)
+        goto isblocking;        // too big a step up
+
+    return true;                // this line doesn't block movement
+
+// the line does block movement, see if it is closer than best so far
+  isblocking:
+    if (in->frac < bestslidefrac)
+    {
+        secondslidefrac = bestslidefrac;
+        secondslideline = bestslideline;
+        bestslidefrac = in->frac;
+        bestslideline = li;
+    }
+
+    return false;               // stop
+}
+
+
+/*
+==================
+=
+= P_SlideMove
+=
+= The momx / momy move is bad, so try to slide along a wall
+=
+= Find the first line hit, move flush to it, and slide along it
+=
+= This is a kludgy mess.
+==================
+*/
+
+void P_SlideMove(mobj_t * mo)
+{
+    fixed_t leadx, leady;
+    fixed_t trailx, traily;
+    fixed_t newx, newy;
+    int hitcount;
+
+    slidemo = mo;
+    hitcount = 0;
+  retry:
+    if (++hitcount == 3)
+        goto stairstep;         // don't loop forever
+
+//
+// trace along the three leading corners
+//
+    if (mo->momx > 0)
+    {
+        leadx = mo->x + mo->radius;
+        trailx = mo->x - mo->radius;
+    }
+    else
+    {
+        leadx = mo->x - mo->radius;
+        trailx = mo->x + mo->radius;
+    }
+
+    if (mo->momy > 0)
+    {
+        leady = mo->y + mo->radius;
+        traily = mo->y - mo->radius;
+    }
+    else
+    {
+        leady = mo->y - mo->radius;
+        traily = mo->y + mo->radius;
+    }
+
+    bestslidefrac = FRACUNIT + 1;
+
+    P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
+                   PT_ADDLINES, PTR_SlideTraverse);
+    P_PathTraverse(trailx, leady, trailx + mo->momx, leady + mo->momy,
+                   PT_ADDLINES, PTR_SlideTraverse);
+    P_PathTraverse(leadx, traily, leadx + mo->momx, traily + mo->momy,
+                   PT_ADDLINES, PTR_SlideTraverse);
+
+//
+// move up to the wall
+//
+    if (bestslidefrac == FRACUNIT + 1)
+    {                           // the move most have hit the middle, so stairstep
+      stairstep:
+        if (!P_TryMove(mo, mo->x, mo->y + mo->momy))
+            P_TryMove(mo, mo->x + mo->momx, mo->y);
+        return;
+    }
+
+    bestslidefrac -= 0x800;     // fudge a bit to make sure it doesn't hit
+    if (bestslidefrac > 0)
+    {
+        newx = FixedMul(mo->momx, bestslidefrac);
+        newy = FixedMul(mo->momy, bestslidefrac);
+        if (!P_TryMove(mo, mo->x + newx, mo->y + newy))
+            goto stairstep;
+    }
+
+//
+// now continue along the wall
+//
+    bestslidefrac = FRACUNIT - (bestslidefrac + 0x800); // remainder
+    if (bestslidefrac > FRACUNIT)
+        bestslidefrac = FRACUNIT;
+    if (bestslidefrac <= 0)
+        return;
+
+    tmxmove = FixedMul(mo->momx, bestslidefrac);
+    tmymove = FixedMul(mo->momy, bestslidefrac);
+
+    P_HitSlideLine(bestslideline);      // clip the moves
+
+    mo->momx = tmxmove;
+    mo->momy = tmymove;
+
+    if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove))
+    {
+        goto retry;
+    }
+}
+
+
+
+/*
+==============================================================================
+
+							P_LineAttack
+
+==============================================================================
+*/
+
+
+mobj_t *linetarget;             // who got hit (or NULL)
+mobj_t *shootthing;
+fixed_t shootz;                 // height if not aiming up or down
+                                                                        // ???: use slope for monsters?
+int la_damage;
+fixed_t attackrange;
+
+fixed_t aimslope;
+
+
+/*
+===============================================================================
+=
+= PTR_AimTraverse
+=
+= Sets linetaget and aimslope when a target is aimed at
+===============================================================================
+*/
+
+boolean PTR_AimTraverse(intercept_t * in)
+{
+    line_t *li;
+    mobj_t *th;
+    fixed_t slope, thingtopslope, thingbottomslope;
+    fixed_t dist;
+
+    if (in->isaline)
+    {
+        li = in->d.line;
+        if (!(li->flags & ML_TWOSIDED))
+            return false;       // stop
+//
+// crosses a two sided line
+// a two sided line will restrict the possible target ranges
+        P_LineOpening(li);
+
+        if (openbottom >= opentop)
+            return false;       // stop
+
+        dist = FixedMul(attackrange, in->frac);
+
+        // Added checks if there is no backsector to prevent crashing.
+        // Crashes didn't happen in the DOS version of Heretic
+        // because reading NULL pointer produces unpredictable but
+        // deterministic values instead of crashing.
+        // See https://github.com/chocolate-doom/chocolate-doom/issues/1665
+        if (li->backsector == NULL
+            || li->frontsector->floorheight != li->backsector->floorheight)
+        {
+            slope = FixedDiv(openbottom - shootz, dist);
+            if (slope > bottomslope)
+                bottomslope = slope;
+        }
+
+        if (li->backsector == NULL
+            || li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+            slope = FixedDiv(opentop - shootz, dist);
+            if (slope < topslope)
+                topslope = slope;
+        }
+
+        if (topslope <= bottomslope)
+            return false;       // stop
+
+        return true;            // shot continues
+    }
+
+//
+// shoot a thing
+//
+    th = in->d.thing;
+    if (th == shootthing)
+        return true;            // can't shoot self
+    if (!(th->flags & MF_SHOOTABLE))
+        return true;            // corpse or something
+    if (th->type == MT_POD)
+    {                           // Can't auto-aim at pods
+        return (true);
+    }
+
+// check angles to see if the thing can be aimed at
+
+    dist = FixedMul(attackrange, in->frac);
+    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
+    if (thingtopslope < bottomslope)
+        return true;            // shot over the thing
+    thingbottomslope = FixedDiv(th->z - shootz, dist);
+    if (thingbottomslope > topslope)
+        return true;            // shot under the thing
+
+//
+// this thing can be hit!
+//
+    if (thingtopslope > topslope)
+        thingtopslope = topslope;
+    if (thingbottomslope < bottomslope)
+        thingbottomslope = bottomslope;
+
+    aimslope = (thingtopslope + thingbottomslope) / 2;
+    linetarget = th;
+
+    return false;               // don't go any farther
+}
+
+
+/*
+==============================================================================
+=
+= PTR_ShootTraverse
+=
+==============================================================================
+*/
+
+boolean PTR_ShootTraverse(intercept_t * in)
+{
+    fixed_t x, y, z;
+    fixed_t frac;
+    line_t *li;
+    mobj_t *th;
+    fixed_t slope;
+    fixed_t dist;
+    fixed_t thingtopslope, thingbottomslope;
+    mobj_t *mo;
+
+    if (in->isaline)
+    {
+        li = in->d.line;
+        if (li->special)
+            P_ShootSpecialLine(shootthing, li);
+        if (!(li->flags & ML_TWOSIDED))
+            goto hitline;
+
+//
+// crosses a two sided line
+//
+        P_LineOpening(li);
+
+        dist = FixedMul(attackrange, in->frac);
+
+        if (li->frontsector->floorheight != li->backsector->floorheight)
+        {
+            slope = FixedDiv(openbottom - shootz, dist);
+            if (slope > aimslope)
+                goto hitline;
+        }
+
+        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+            slope = FixedDiv(opentop - shootz, dist);
+            if (slope < aimslope)
+                goto hitline;
+        }
+
+        return true;            // shot continues
+//
+// hit line
+//
+      hitline:
+        // position a bit closer
+        frac = in->frac - FixedDiv(4 * FRACUNIT, attackrange);
+        x = trace.x + FixedMul(trace.dx, frac);
+        y = trace.y + FixedMul(trace.dy, frac);
+        z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
+
+        if (li->frontsector->ceilingpic == skyflatnum)
+        {
+            if (z > li->frontsector->ceilingheight)
+                return false;   // don't shoot the sky!
+            if (li->backsector && li->backsector->ceilingpic == skyflatnum)
+                return false;   // it's a sky hack wall
+        }
+
+        P_SpawnPuff(x, y, z);
+        return false;           // don't go any farther
+    }
+
+//
+// shoot a thing
+//
+    th = in->d.thing;
+    if (th == shootthing)
+        return true;            // can't shoot self
+    if (!(th->flags & MF_SHOOTABLE))
+        return true;            // corpse or something
+
+//
+// check for physical attacks on a ghost
+//
+    if (th->flags & MF_SHADOW && shootthing->player->readyweapon == wp_staff)
+    {
+        return (true);
+    }
+
+// check angles to see if the thing can be aimed at
+    dist = FixedMul(attackrange, in->frac);
+    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
+    if (thingtopslope < aimslope)
+        return true;            // shot over the thing
+    thingbottomslope = FixedDiv(th->z - shootz, dist);
+    if (thingbottomslope > aimslope)
+        return true;            // shot under the thing
+
+//
+// hit thing
+//
+    // position a bit closer
+    frac = in->frac - FixedDiv(10 * FRACUNIT, attackrange);
+    x = trace.x + FixedMul(trace.dx, frac);
+    y = trace.y + FixedMul(trace.dy, frac);
+    z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
+    if (PuffType == MT_BLASTERPUFF1)
+    {                           // Make blaster big puff
+        mo = P_SpawnMobj(x, y, z, MT_BLASTERPUFF2);
+        S_StartSound(mo, sfx_blshit);
+    }
+    else
+    {
+        P_SpawnPuff(x, y, z);
+    }
+    if (la_damage)
+    {
+        if (!(in->d.thing->flags & MF_NOBLOOD) && P_Random() < 192)
+        {
+            P_BloodSplatter(x, y, z, in->d.thing);
+        }
+        P_DamageMobj(th, shootthing, shootthing, la_damage);
+    }
+    return (false);             // don't go any farther
+}
+
+/*
+=================
+=
+= P_AimLineAttack
+=
+=================
+*/
+
+fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance)
+{
+    fixed_t x2, y2;
+
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
+    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
+    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
+    topslope = 100 * FRACUNIT / 160;    // can't shoot outside view angles
+    bottomslope = -100 * FRACUNIT / 160;
+    attackrange = distance;
+    linetarget = NULL;
+
+    P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                   PTR_AimTraverse);
+
+    if (linetarget)
+        return aimslope;
+    return 0;
+}
+
+
+
+/*
+=================
+=
+= P_LineAttack
+=
+= if damage == 0, it is just a test trace that will leave linetarget set
+=
+=================
+*/
+
+void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
+                  int damage)
+{
+    fixed_t x2, y2;
+
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    la_damage = damage;
+    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
+    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
+    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
+    if (t1->flags2 & MF2_FEETARECLIPPED)
+    {
+        shootz -= FOOTCLIPSIZE;
+    }
+    attackrange = distance;
+    aimslope = slope;
+
+    P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                   PTR_ShootTraverse);
+}
+
+
+
+/*
+==============================================================================
+
+							USE LINES
+
+==============================================================================
+*/
+
+mobj_t *usething;
+
+boolean PTR_UseTraverse(intercept_t * in)
+{
+    if (!in->d.line->special)
+    {
+        P_LineOpening(in->d.line);
+        if (openrange <= 0)
+        {
+            //S_StartSound (usething, sfx_noway);
+            return false;       // can't use through a wall
+        }
+        return true;            // not a special line, but keep checking
+    }
+
+    if (P_PointOnLineSide(usething->x, usething->y, in->d.line) == 1)
+        return false;           // don't use back sides
+
+    P_UseSpecialLine(usething, in->d.line);
+
+    return false;               // can't use for than one special line in a row
+}
+
+
+/*
+================
+=
+= P_UseLines
+=
+= Looks for special lines in front of the player to activate
+================ 
+*/
+
+void P_UseLines(player_t * player)
+{
+    int angle;
+    fixed_t x1, y1, x2, y2;
+
+    usething = player->mo;
+
+    angle = player->mo->angle >> ANGLETOFINESHIFT;
+    x1 = player->mo->x;
+    y1 = player->mo->y;
+    x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
+    y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
+
+    P_PathTraverse(x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse);
+}
+
+
+
+/*
+==============================================================================
+
+							RADIUS ATTACK
+
+==============================================================================
+*/
+
+mobj_t *bombsource;
+mobj_t *bombspot;
+int bombdamage;
+
+/*
+=================
+=
+= PIT_RadiusAttack
+=
+= Source is the creature that casued the explosion at spot
+=================
+*/
+
+boolean PIT_RadiusAttack(mobj_t * thing)
+{
+    fixed_t dx, dy, dist;
+
+    if (!(thing->flags & MF_SHOOTABLE))
+    {
+        return true;
+    }
+    if (thing->type == MT_MINOTAUR || thing->type == MT_SORCERER1
+        || thing->type == MT_SORCERER2)
+    {                           // Episode 2 and 3 bosses take no damage from PIT_RadiusAttack
+        return (true);
+    }
+    dx = abs(thing->x - bombspot->x);
+    dy = abs(thing->y - bombspot->y);
+    dist = dx > dy ? dx : dy;
+    dist = (dist - thing->radius) >> FRACBITS;
+    if (dist < 0)
+    {
+        dist = 0;
+    }
+    if (dist >= bombdamage)
+    {                           // Out of range
+        return true;
+    }
+    if (P_CheckSight(thing, bombspot))
+    {                           // OK to damage, target is in direct path
+        P_DamageMobj(thing, bombspot, bombsource, bombdamage - dist);
+    }
+    return (true);
+}
+
+/*
+=================
+=
+= P_RadiusAttack
+=
+= Source is the creature that casued the explosion at spot
+=================
+*/
+
+void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage)
+{
+    int x, y, xl, xh, yl, yh;
+    fixed_t dist;
+
+    dist = (damage + MAXRADIUS) << FRACBITS;
+    yh = (spot->y + dist - bmaporgy) >> MAPBLOCKSHIFT;
+    yl = (spot->y - dist - bmaporgy) >> MAPBLOCKSHIFT;
+    xh = (spot->x + dist - bmaporgx) >> MAPBLOCKSHIFT;
+    xl = (spot->x - dist - bmaporgx) >> MAPBLOCKSHIFT;
+    bombspot = spot;
+    if (spot->type == MT_POD && spot->target)
+    {
+        bombsource = spot->target;
+    }
+    else
+    {
+        bombsource = source;
+    }
+    bombdamage = damage;
+    for (y = yl; y <= yh; y++)
+        for (x = xl; x <= xh; x++)
+            P_BlockThingsIterator(x, y, PIT_RadiusAttack);
+}
+
+
+/*
+==============================================================================
+
+						SECTOR HEIGHT CHANGING
+
+= After modifying a sectors floor or ceiling height, call this
+= routine to adjust the positions of all things that touch the
+= sector.
+=
+= If anything doesn't fit anymore, true will be returned.
+= If crunch is true, they will take damage as they are being crushed
+= If Crunch is false, you should set the sector height back the way it
+= was and call P_ChangeSector again to undo the changes
+==============================================================================
+*/
+
+boolean crushchange;
+boolean nofit;
+
+/*
+===============
+=
+= PIT_ChangeSector
+=
+===============
+*/
+
+boolean PIT_ChangeSector(mobj_t * thing)
+{
+    mobj_t *mo;
+
+    if (P_ThingHeightClip(thing))
+        return true;            // keep checking
+
+    // crunch bodies to giblets
+    if (thing->health <= 0)
+    {
+        //P_SetMobjState (thing, S_GIBS);
+        thing->height = 0;
+        thing->radius = 0;
+        return true;            // keep checking
+    }
+
+    // crunch dropped items
+    if (thing->flags & MF_DROPPED)
+    {
+        P_RemoveMobj(thing);
+        return true;            // keep checking
+    }
+
+    if (!(thing->flags & MF_SHOOTABLE))
+        return true;            // assume it is bloody gibs or something
+
+    nofit = true;
+    if (crushchange && !(leveltime & 3))
+    {
+        P_DamageMobj(thing, NULL, NULL, 10);
+        // spray blood in a random direction
+        mo = P_SpawnMobj(thing->x, thing->y, thing->z + thing->height / 2,
+                         MT_BLOOD);
+        mo->momx = P_SubRandom() << 12;
+        mo->momy = P_SubRandom() << 12;
+    }
+
+    return true;                // keep checking (crush other things)   
+}
+
+/*
+===============
+=
+= P_ChangeSector
+=
+===============
+*/
+
+boolean P_ChangeSector(sector_t * sector, boolean crunch)
+{
+    int x, y;
+
+    nofit = false;
+    crushchange = crunch;
+
+// recheck heights for all things near the moving sector
+
+    for (x = sector->blockbox[BOXLEFT]; x <= sector->blockbox[BOXRIGHT]; x++)
+        for (y = sector->blockbox[BOXBOTTOM]; y <= sector->blockbox[BOXTOP];
+             y++)
+            P_BlockThingsIterator(x, y, PIT_ChangeSector);
+
+
+    return nofit;
+}
diff --git a/games/NXDoom/src/heretic/p_maputl.c b/games/NXDoom/src/heretic/p_maputl.c
new file mode 100644
index 000000000..5150aaeef
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_maputl.c
@@ -0,0 +1,779 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_maputl.c
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "m_bbox.h"
+#include "m_misc.h"
+#include "p_local.h"
+
+
+/*
+===================
+=
+= P_AproxDistance
+=
+= Gives an estimation of distance (not exact)
+=
+===================
+*/
+
+fixed_t P_AproxDistance(fixed_t dx, fixed_t dy)
+{
+    dx = abs(dx);
+    dy = abs(dy);
+    if (dx < dy)
+        return dx + dy - (dx >> 1);
+    return dx + dy - (dy >> 1);
+}
+
+
+/*
+==================
+=
+= P_PointOnLineSide
+=
+= Returns 0 or 1
+==================
+*/
+
+int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line)
+{
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    if (!line->dx)
+    {
+        if (x <= line->v1->x)
+            return line->dy > 0;
+        return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+        if (y <= line->v1->y)
+            return line->dx < 0;
+        return line->dx > 0;
+    }
+
+    dx = (x - line->v1->x);
+    dy = (y - line->v1->y);
+
+    left = FixedMul(line->dy >> FRACBITS, dx);
+    right = FixedMul(dy, line->dx >> FRACBITS);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+/*
+=================
+=
+= P_BoxOnLineSide
+=
+= Considers the line to be infinite
+= Returns side 0 or 1, -1 if box crosses the line
+=================
+*/
+
+int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld)
+{
+    int p1 = 0, p2 = 0;
+
+    switch (ld->slopetype)
+    {
+        case ST_HORIZONTAL:
+            p1 = tmbox[BOXTOP] > ld->v1->y;
+            p2 = tmbox[BOXBOTTOM] > ld->v1->y;
+            if (ld->dx < 0)
+            {
+                p1 ^= 1;
+                p2 ^= 1;
+            }
+            break;
+        case ST_VERTICAL:
+            p1 = tmbox[BOXRIGHT] < ld->v1->x;
+            p2 = tmbox[BOXLEFT] < ld->v1->x;
+            if (ld->dy < 0)
+            {
+                p1 ^= 1;
+                p2 ^= 1;
+            }
+            break;
+        case ST_POSITIVE:
+            p1 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXTOP], ld);
+            p2 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
+            break;
+        case ST_NEGATIVE:
+            p1 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
+            p2 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
+            break;
+    }
+
+    if (p1 == p2)
+        return p1;
+    return -1;
+}
+
+/*
+==================
+=
+= P_PointOnDivlineSide
+=
+= Returns 0 or 1
+==================
+*/
+
+int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line)
+{
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    if (!line->dx)
+    {
+        if (x <= line->x)
+            return line->dy > 0;
+        return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+        if (y <= line->y)
+            return line->dx < 0;
+        return line->dx > 0;
+    }
+
+    dx = (x - line->x);
+    dy = (y - line->y);
+
+// try to quickly decide by looking at sign bits
+    if ((line->dy ^ line->dx ^ dx ^ dy) & 0x80000000)
+    {
+        if ((line->dy ^ dx) & 0x80000000)
+            return 1;           // (left is negative)
+        return 0;
+    }
+
+    left = FixedMul(line->dy >> 8, dx >> 8);
+    right = FixedMul(dy >> 8, line->dx >> 8);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+
+/*
+==============
+=
+= P_MakeDivline
+=
+==============
+*/
+
+void P_MakeDivline(line_t * li, divline_t * dl)
+{
+    dl->x = li->v1->x;
+    dl->y = li->v1->y;
+    dl->dx = li->dx;
+    dl->dy = li->dy;
+}
+
+
+/*
+===============
+=
+= P_InterceptVector
+=
+= Returns the fractional intercept point along the first divline
+=
+= This is only called by the addthings and addlines traversers
+===============
+*/
+
+fixed_t P_InterceptVector(divline_t * v2, divline_t * v1)
+{
+#if 1
+    fixed_t frac, num, den;
+
+    den = FixedMul(v1->dy >> 8, v2->dx) - FixedMul(v1->dx >> 8, v2->dy);
+    if (den == 0)
+        return 0;
+//              I_Error ("P_InterceptVector: parallel");
+    num = FixedMul((v1->x - v2->x) >> 8, v1->dy) +
+        FixedMul((v2->y - v1->y) >> 8, v1->dx);
+    frac = FixedDiv(num, den);
+
+    return frac;
+#else
+    float frac, num, den, v1x, v1y, v1dx, v1dy, v2x, v2y, v2dx, v2dy;
+
+    v1x = (float) v1->x / FRACUNIT;
+    v1y = (float) v1->y / FRACUNIT;
+    v1dx = (float) v1->dx / FRACUNIT;
+    v1dy = (float) v1->dy / FRACUNIT;
+    v2x = (float) v2->x / FRACUNIT;
+    v2y = (float) v2->y / FRACUNIT;
+    v2dx = (float) v2->dx / FRACUNIT;
+    v2dy = (float) v2->dy / FRACUNIT;
+
+    den = v1dy * v2dx - v1dx * v2dy;
+    if (den == 0)
+        return 0;               // parallel
+    num = (v1x - v2x) * v1dy + (v2y - v1y) * v1dx;
+    frac = num / den;
+
+    return frac * FRACUNIT;
+#endif
+}
+
+/*
+==================
+=
+= P_LineOpening
+=
+= Sets opentop and openbottom to the window through a two sided line
+= OPTIMIZE: keep this precalculated
+==================
+*/
+
+fixed_t opentop, openbottom, openrange;
+fixed_t lowfloor;
+
+void P_LineOpening(line_t * linedef)
+{
+    sector_t *front, *back;
+
+    if (linedef->sidenum[1] == -1)
+    {                           // single sided line
+        openrange = 0;
+        return;
+    }
+
+    front = linedef->frontsector;
+    back = linedef->backsector;
+
+    if (front->ceilingheight < back->ceilingheight)
+        opentop = front->ceilingheight;
+    else
+        opentop = back->ceilingheight;
+    if (front->floorheight > back->floorheight)
+    {
+        openbottom = front->floorheight;
+        lowfloor = back->floorheight;
+    }
+    else
+    {
+        openbottom = back->floorheight;
+        lowfloor = front->floorheight;
+    }
+
+    openrange = opentop - openbottom;
+}
+
+/*
+===============================================================================
+
+						THING POSITION SETTING
+
+===============================================================================
+*/
+
+/*
+===================
+=
+= P_UnsetThingPosition 
+=
+= Unlinks a thing from block map and sectors
+=
+===================
+*/
+
+void P_UnsetThingPosition(mobj_t * thing)
+{
+    int blockx, blocky;
+
+    if (!(thing->flags & MF_NOSECTOR))
+    {                           // inert things don't need to be in blockmap
+// unlink from subsector
+        if (thing->snext)
+            thing->snext->sprev = thing->sprev;
+        if (thing->sprev)
+            thing->sprev->snext = thing->snext;
+        else
+            thing->subsector->sector->thinglist = thing->snext;
+    }
+
+    if (!(thing->flags & MF_NOBLOCKMAP))
+    {                           // inert things don't need to be in blockmap
+// unlink from block map
+        if (thing->bnext)
+            thing->bnext->bprev = thing->bprev;
+        if (thing->bprev)
+            thing->bprev->bnext = thing->bnext;
+        else
+        {
+            blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
+            blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
+            if (blockx >= 0 && blockx < bmapwidth
+                && blocky >= 0 && blocky < bmapheight)
+                blocklinks[blocky * bmapwidth + blockx] = thing->bnext;
+        }
+    }
+}
+
+
+/*
+===================
+=
+= P_SetThingPosition 
+=
+= Links a thing into both a block and a subsector based on it's x y
+= Sets thing->subsector properly
+=
+===================
+*/
+
+void P_SetThingPosition(mobj_t * thing)
+{
+    subsector_t *ss;
+    sector_t *sec;
+    int blockx, blocky;
+    mobj_t **link;
+
+//
+// link into subsector
+//
+    ss = R_PointInSubsector(thing->x, thing->y);
+    thing->subsector = ss;
+    if (!(thing->flags & MF_NOSECTOR))
+    {                           // invisible things don't go into the sector links
+        sec = ss->sector;
+
+        thing->sprev = NULL;
+        thing->snext = sec->thinglist;
+        if (sec->thinglist)
+            sec->thinglist->sprev = thing;
+        sec->thinglist = thing;
+    }
+
+//
+// link into blockmap
+//
+    if (!(thing->flags & MF_NOBLOCKMAP))
+    {                           // inert things don't need to be in blockmap            
+        blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
+        blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
+        if (blockx >= 0 && blockx < bmapwidth && blocky >= 0
+            && blocky < bmapheight)
+        {
+            link = &blocklinks[blocky * bmapwidth + blockx];
+            thing->bprev = NULL;
+            thing->bnext = *link;
+            if (*link)
+                (*link)->bprev = thing;
+            *link = thing;
+        }
+        else
+        {                       // thing is off the map
+            thing->bnext = thing->bprev = NULL;
+        }
+    }
+}
+
+
+
+/*
+===============================================================================
+
+						BLOCK MAP ITERATORS
+
+For each line/thing in the given mapblock, call the passed function.
+If the function returns false, exit with false without checking anything else.
+
+===============================================================================
+*/
+
+/*
+==================
+=
+= P_BlockLinesIterator
+=
+= The validcount flags are used to avoid checking lines
+= that are marked in multiple mapblocks, so increment validcount before
+= the first call to P_BlockLinesIterator, then make one or more calls to it
+===================
+*/
+
+boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *))
+{
+    int offset;
+    short *list;
+    line_t *ld;
+
+    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+        return true;
+    offset = y * bmapwidth + x;
+
+    offset = *(blockmap + offset);
+
+    for (list = blockmaplump + offset; *list != -1; list++)
+    {
+        ld = &lines[*list];
+        if (ld->validcount == validcount)
+            continue;           // line has already been checked
+        ld->validcount = validcount;
+
+        if (!func(ld))
+            return false;
+    }
+
+    return true;                // everything was checked
+}
+
+
+/*
+==================
+=
+= P_BlockThingsIterator
+=
+==================
+*/
+
+boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *))
+{
+    mobj_t *mobj;
+
+    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+        return true;
+
+    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
+
+    for (mobj = blocklinks[y * bmapwidth + x]; mobj; mobj = mobj->bnext)
+        if (!func(mobj))
+            return false;
+
+    return true;
+}
+
+/*
+===============================================================================
+
+					INTERCEPT ROUTINES
+
+===============================================================================
+*/
+
+intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
+
+divline_t trace;
+boolean earlyout;
+int ptflags;
+
+/*
+==================
+=
+= PIT_AddLineIntercepts
+=
+= Looks for lines in the given block that intercept the given trace
+= to add to the intercepts list
+= A line is crossed if its endpoints are on opposite sides of the trace
+= Returns true if earlyout and a solid line hit
+==================
+*/
+
+boolean PIT_AddLineIntercepts(line_t * ld)
+{
+    int s1, s2;
+    fixed_t frac;
+    divline_t dl;
+
+// avoid precision problems with two routines
+    if (trace.dx > FRACUNIT * 16 || trace.dy > FRACUNIT * 16
+        || trace.dx < -FRACUNIT * 16 || trace.dy < -FRACUNIT * 16)
+    {
+        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
+        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
+    }
+    else
+    {
+        s1 = P_PointOnLineSide(trace.x, trace.y, ld);
+        s2 = P_PointOnLineSide(trace.x + trace.dx, trace.y + trace.dy, ld);
+    }
+    if (s1 == s2)
+        return true;            // line isn't crossed
+
+//
+// hit the line
+//
+    P_MakeDivline(ld, &dl);
+    frac = P_InterceptVector(&trace, &dl);
+    if (frac < 0)
+        return true;            // behind source
+
+// try to early out the check
+    if (earlyout && frac < FRACUNIT && !ld->backsector)
+        return false;           // stop checking
+
+    intercept_p->frac = frac;
+    intercept_p->isaline = true;
+    intercept_p->d.line = ld;
+    intercept_p++;
+
+    return true;                // continue
+}
+
+
+
+/*
+==================
+=
+= PIT_AddThingIntercepts
+=
+==================
+*/
+
+boolean PIT_AddThingIntercepts(mobj_t * thing)
+{
+    fixed_t x1, y1, x2, y2;
+    int s1, s2;
+    boolean tracepositive;
+    divline_t dl;
+    fixed_t frac;
+
+    tracepositive = (trace.dx ^ trace.dy) > 0;
+
+    // check a corner to corner crossection for hit
+
+    if (tracepositive)
+    {
+        x1 = thing->x - thing->radius;
+        y1 = thing->y + thing->radius;
+
+        x2 = thing->x + thing->radius;
+        y2 = thing->y - thing->radius;
+    }
+    else
+    {
+        x1 = thing->x - thing->radius;
+        y1 = thing->y - thing->radius;
+
+        x2 = thing->x + thing->radius;
+        y2 = thing->y + thing->radius;
+    }
+    s1 = P_PointOnDivlineSide(x1, y1, &trace);
+    s2 = P_PointOnDivlineSide(x2, y2, &trace);
+    if (s1 == s2)
+        return true;            // line isn't crossed
+
+    dl.x = x1;
+    dl.y = y1;
+    dl.dx = x2 - x1;
+    dl.dy = y2 - y1;
+    frac = P_InterceptVector(&trace, &dl);
+    if (frac < 0)
+        return true;            // behind source
+    intercept_p->frac = frac;
+    intercept_p->isaline = false;
+    intercept_p->d.thing = thing;
+    intercept_p++;
+
+    return true;                // keep going
+}
+
+
+/*
+====================
+=
+= P_TraverseIntercepts
+=
+= Returns true if the traverser function returns true for all lines
+====================
+*/
+
+boolean P_TraverseIntercepts(traverser_t func, fixed_t maxfrac)
+{
+    int count;
+    fixed_t dist;
+    intercept_t *scan, *in;
+
+    count = intercept_p - intercepts;
+    in = 0;                     // shut up compiler warning
+
+    while (count--)
+    {
+        dist = INT_MAX;
+        for (scan = intercepts; scan < intercept_p; scan++)
+            if (scan->frac < dist)
+            {
+                dist = scan->frac;
+                in = scan;
+            }
+
+        if (dist > maxfrac)
+            return true;        // checked everything in range          
+#if 0
+        {                       // don't check these yet, ther may be others inserted
+            in = scan = intercepts;
+            for (scan = intercepts; scan < intercept_p; scan++)
+                if (scan->frac > maxfrac)
+                    *in++ = *scan;
+            intercept_p = in;
+            return false;
+        }
+#endif
+
+        if (!func(in))
+            return false;       // don't bother going farther
+        in->frac = INT_MAX;
+    }
+
+    return true;                // everything was traversed
+}
+
+
+
+/*
+==================
+=
+= P_PathTraverse
+=
+= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
+= Returns true if the traverser function returns true for all lines
+==================
+*/
+
+boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                       int flags, boolean(*trav) (intercept_t *))
+{
+    fixed_t xt1, yt1, xt2, yt2;
+    fixed_t xstep, ystep;
+    fixed_t partial;
+    fixed_t xintercept, yintercept;
+    int mapx, mapy, mapxstep, mapystep;
+    int count;
+
+    earlyout = (flags & PT_EARLYOUT) != 0;
+
+    validcount++;
+    intercept_p = intercepts;
+
+    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
+        x1 += FRACUNIT;         // don't side exactly on a line
+    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
+        y1 += FRACUNIT;         // don't side exactly on a line
+    trace.x = x1;
+    trace.y = y1;
+    trace.dx = x2 - x1;
+    trace.dy = y2 - y1;
+
+    x1 -= bmaporgx;
+    y1 -= bmaporgy;
+    xt1 = x1 >> MAPBLOCKSHIFT;
+    yt1 = y1 >> MAPBLOCKSHIFT;
+
+    x2 -= bmaporgx;
+    y2 -= bmaporgy;
+    xt2 = x2 >> MAPBLOCKSHIFT;
+    yt2 = y2 >> MAPBLOCKSHIFT;
+
+    if (xt2 > xt1)
+    {
+        mapxstep = 1;
+        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else if (xt2 < xt1)
+    {
+        mapxstep = -1;
+        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else
+    {
+        mapxstep = 0;
+        partial = FRACUNIT;
+        ystep = 256 * FRACUNIT;
+    }
+    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
+
+
+    if (yt2 > yt1)
+    {
+        mapystep = 1;
+        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else if (yt2 < yt1)
+    {
+        mapystep = -1;
+        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else
+    {
+        mapystep = 0;
+        partial = FRACUNIT;
+        xstep = 256 * FRACUNIT;
+    }
+    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
+
+
+//
+// step through map blocks
+// Count is present to prevent a round off error from skipping the break
+    mapx = xt1;
+    mapy = yt1;
+
+    for (count = 0; count < 64; count++)
+    {
+        if (flags & PT_ADDLINES)
+        {
+            if (!P_BlockLinesIterator(mapx, mapy, PIT_AddLineIntercepts))
+                return false;   // early out
+        }
+        if (flags & PT_ADDTHINGS)
+        {
+            if (!P_BlockThingsIterator(mapx, mapy, PIT_AddThingIntercepts))
+                return false;   // early out
+        }
+
+        if (mapx == xt2 && mapy == yt2)
+            break;
+
+        if ((yintercept >> FRACBITS) == mapy)
+        {
+            yintercept += ystep;
+            mapx += mapxstep;
+        }
+        else if ((xintercept >> FRACBITS) == mapx)
+        {
+            xintercept += xstep;
+            mapy += mapystep;
+        }
+
+    }
+
+
+//
+// go through the sorted list
+//
+    return P_TraverseIntercepts(trav, FRACUNIT);
+}
diff --git a/games/NXDoom/src/heretic/p_mobj.c b/games/NXDoom/src/heretic/p_mobj.c
new file mode 100644
index 000000000..363dabe4a
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_mobj.c
@@ -0,0 +1,1626 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_mobj.c
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "sounds.h"
+#include "s_sound.h"
+
+void G_PlayerReborn(int player);
+void P_SpawnMapThing(mapthing_t * mthing);
+
+mobjtype_t PuffType;
+mobj_t *MissileMobj;
+
+static fixed_t FloatBobOffsets[64] = {
+    0, 51389, 102283, 152192,
+    200636, 247147, 291278, 332604,
+    370727, 405280, 435929, 462380,
+    484378, 501712, 514213, 521763,
+    524287, 521763, 514213, 501712,
+    484378, 462380, 435929, 405280,
+    370727, 332604, 291278, 247147,
+    200636, 152192, 102283, 51389,
+    -1, -51390, -102284, -152193,
+    -200637, -247148, -291279, -332605,
+    -370728, -405281, -435930, -462381,
+    -484380, -501713, -514215, -521764,
+    -524288, -521764, -514214, -501713,
+    -484379, -462381, -435930, -405280,
+    -370728, -332605, -291279, -247148,
+    -200637, -152193, -102284, -51389
+};
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_SetMobjState
+//
+// Returns true if the mobj is still present.
+//
+//----------------------------------------------------------------------------
+
+boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
+{
+    state_t *st;
+
+    if (state == S_NULL)
+    {                           // Remove mobj
+        mobj->state = (state_t *) S_NULL;
+        P_RemoveMobj(mobj);
+        return (false);
+    }
+    st = &states[state];
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+    if (st->action)
+    {                           // Call action function
+        st->action(mobj, NULL, NULL);
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_SetMobjStateNF
+//
+// Same as P_SetMobjState, but does not call the state function.
+//
+//----------------------------------------------------------------------------
+
+boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
+{
+    state_t *st;
+
+    if (state == S_NULL)
+    {                           // Remove mobj
+        mobj->state = (state_t *) S_NULL;
+        P_RemoveMobj(mobj);
+        return (false);
+    }
+    st = &states[state];
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ExplodeMissile
+//
+//----------------------------------------------------------------------------
+
+void P_ExplodeMissile(mobj_t * mo)
+{
+    if (mo->type == MT_WHIRLWIND)
+    {
+        if (++mo->special2.i < 60)
+        {
+            return;
+        }
+    }
+    mo->momx = mo->momy = mo->momz = 0;
+    P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
+    //mo->tics -= P_Random()&3;
+    mo->flags &= ~MF_MISSILE;
+    if (mo->info->deathsound)
+    {
+        S_StartSound(mo, mo->info->deathsound);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_FloorBounceMissile
+//
+//----------------------------------------------------------------------------
+
+void P_FloorBounceMissile(mobj_t * mo)
+{
+    mo->momz = -mo->momz;
+    P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ThrustMobj
+//
+//----------------------------------------------------------------------------
+
+void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move)
+{
+    angle >>= ANGLETOFINESHIFT;
+    mo->momx += FixedMul(move, finecosine[angle]);
+    mo->momy += FixedMul(move, finesine[angle]);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_FaceMobj
+//
+// Returns 1 if 'source' needs to turn clockwise, or 0 if 'source' needs
+// to turn counter clockwise.  'delta' is set to the amount 'source'
+// needs to turn.
+//
+//----------------------------------------------------------------------------
+
+int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta)
+{
+    angle_t diff;
+    angle_t angle1;
+    angle_t angle2;
+
+    angle1 = source->angle;
+    angle2 = R_PointToAngle2(source->x, source->y, target->x, target->y);
+    if (angle2 > angle1)
+    {
+        diff = angle2 - angle1;
+        if (diff > ANG180)
+        {
+            *delta = ANG_MAX - diff;
+            return (0);
+        }
+        else
+        {
+            *delta = diff;
+            return (1);
+        }
+    }
+    else
+    {
+        diff = angle1 - angle2;
+        if (diff > ANG180)
+        {
+            *delta = ANG_MAX - diff;
+            return (1);
+        }
+        else
+        {
+            *delta = diff;
+            return (0);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_SeekerMissile
+//
+// The missile special1 field must be mobj_t *target.  Returns true if
+// target was tracked, false if not.
+//
+//----------------------------------------------------------------------------
+
+boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax)
+{
+    int dir;
+    int dist;
+    angle_t delta;
+    angle_t angle;
+    mobj_t *target;
+
+    target = (mobj_t *) actor->special1.m;
+    if (target == NULL)
+    {
+        return (false);
+    }
+    if (!(target->flags & MF_SHOOTABLE))
+    {                           // Target died
+        actor->special1.m = NULL;
+        return (false);
+    }
+    dir = P_FaceMobj(actor, target, &delta);
+    if (delta > thresh)
+    {
+        delta >>= 1;
+        if (delta > turnMax)
+        {
+            delta = turnMax;
+        }
+    }
+    if (dir)
+    {                           // Turn clockwise
+        actor->angle += delta;
+    }
+    else
+    {                           // Turn counter clockwise
+        actor->angle -= delta;
+    }
+    angle = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
+    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
+    if (actor->z + actor->height < target->z ||
+        target->z + target->height < actor->z)
+    {                           // Need to seek vertically
+        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
+        dist = dist / actor->info->speed;
+        if (dist < 1)
+        {
+            dist = 1;
+        }
+        actor->momz = (target->z - actor->z) / dist;
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_XYMovement
+//
+//----------------------------------------------------------------------------
+
+#define STOPSPEED                       0x1000
+#define FRICTION_NORMAL         0xe800
+#define FRICTION_LOW            0xf900
+#define FRICTION_FLY            0xeb00
+
+void P_XYMovement(mobj_t * mo)
+{
+    fixed_t ptryx, ptryy;
+    player_t *player;
+    fixed_t xmove, ymove;
+    int special;
+    static int windTab[3] = { 2048 * 5, 2048 * 10, 2048 * 25 };
+
+    if (!mo->momx && !mo->momy)
+    {
+        if (mo->flags & MF_SKULLFLY)
+        {                       // A flying mobj slammed into something
+            mo->flags &= ~MF_SKULLFLY;
+            mo->momx = mo->momy = mo->momz = 0;
+            P_SetMobjState(mo, mo->info->seestate);
+        }
+        return;
+    }
+    special = mo->subsector->sector->special;
+    if (mo->flags2 & MF2_WINDTHRUST)
+    {
+        switch (special)
+        {
+            case 40:
+            case 41:
+            case 42:           // Wind_East
+                P_ThrustMobj(mo, 0, windTab[special - 40]);
+                break;
+            case 43:
+            case 44:
+            case 45:           // Wind_North
+                P_ThrustMobj(mo, ANG90, windTab[special - 43]);
+                break;
+            case 46:
+            case 47:
+            case 48:           // Wind_South
+                P_ThrustMobj(mo, ANG270, windTab[special - 46]);
+                break;
+            case 49:
+            case 50:
+            case 51:           // Wind_West
+                P_ThrustMobj(mo, ANG180, windTab[special - 49]);
+                break;
+        }
+    }
+    player = mo->player;
+    if (mo->momx > MAXMOVE)
+    {
+        mo->momx = MAXMOVE;
+    }
+    else if (mo->momx < -MAXMOVE)
+    {
+        mo->momx = -MAXMOVE;
+    }
+    if (mo->momy > MAXMOVE)
+    {
+        mo->momy = MAXMOVE;
+    }
+    else if (mo->momy < -MAXMOVE)
+    {
+        mo->momy = -MAXMOVE;
+    }
+    xmove = mo->momx;
+    ymove = mo->momy;
+    do
+    {
+        if (xmove > MAXMOVE / 2 || ymove > MAXMOVE / 2)
+        {
+            ptryx = mo->x + xmove / 2;
+            ptryy = mo->y + ymove / 2;
+            xmove >>= 1;
+            ymove >>= 1;
+        }
+        else
+        {
+            ptryx = mo->x + xmove;
+            ptryy = mo->y + ymove;
+            xmove = ymove = 0;
+        }
+        if (!P_TryMove(mo, ptryx, ptryy))
+        {                       // Blocked move
+            if (mo->flags2 & MF2_SLIDE)
+            {                   // Try to slide along it
+                P_SlideMove(mo);
+            }
+            else if (mo->flags & MF_MISSILE)
+            {                   // Explode a missile
+                if (ceilingline && ceilingline->backsector
+                    && ceilingline->backsector->ceilingpic == skyflatnum)
+                {               // Hack to prevent missiles exploding against the sky
+                    if (mo->type == MT_BLOODYSKULL)
+                    {
+                        mo->momx = mo->momy = 0;
+                        mo->momz = -FRACUNIT;
+                    }
+                    else
+                    {
+                        P_RemoveMobj(mo);
+                    }
+                    return;
+                }
+                P_ExplodeMissile(mo);
+            }
+            //else if(mo->info->crashstate)
+            //{
+            //      mo->momx = mo->momy = 0;
+            //      P_SetMobjState(mo, mo->info->crashstate);
+            //      return;
+            //}
+            else
+            {
+                mo->momx = mo->momy = 0;
+            }
+        }
+    }
+    while (xmove || ymove);
+
+    // Friction
+
+    if (player && player->cheats & CF_NOMOMENTUM)
+    {                           // Debug option for no sliding at all
+        mo->momx = mo->momy = 0;
+        return;
+    }
+    if (mo->flags & (MF_MISSILE | MF_SKULLFLY))
+    {                           // No friction for missiles
+        return;
+    }
+    if (mo->z > mo->floorz && !(mo->flags2 & MF2_FLY)
+        && !(mo->flags2 & MF2_ONMOBJ))
+    {                           // No friction when falling
+        return;
+    }
+    if (mo->flags & MF_CORPSE)
+    {                           // Don't stop sliding if halfway off a step with some momentum
+        if (mo->momx > FRACUNIT / 4 || mo->momx < -FRACUNIT / 4
+            || mo->momy > FRACUNIT / 4 || mo->momy < -FRACUNIT / 4)
+        {
+            if (mo->floorz != mo->subsector->sector->floorheight)
+            {
+                return;
+            }
+        }
+    }
+    if (mo->momx > -STOPSPEED && mo->momx < STOPSPEED
+        && mo->momy > -STOPSPEED && mo->momy < STOPSPEED
+        && (!player || (player->cmd.forwardmove == 0
+                        && player->cmd.sidemove == 0)))
+    {                           // If in a walking frame, stop moving
+        if (player)
+        {
+            if (player->chickenTics)
+            {
+                if ((unsigned) ((player->mo->state - states)
+                                - S_CHICPLAY_RUN1) < 4)
+                {
+                    P_SetMobjState(player->mo, S_CHICPLAY);
+                }
+            }
+            else
+            {
+                if ((unsigned) ((player->mo->state - states)
+                                - S_PLAY_RUN1) < 4)
+                {
+                    P_SetMobjState(player->mo, S_PLAY);
+                }
+            }
+        }
+        mo->momx = 0;
+        mo->momy = 0;
+    }
+    else
+    {
+        if (mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
+            && !(mo->flags2 & MF2_ONMOBJ))
+        {
+            mo->momx = FixedMul(mo->momx, FRICTION_FLY);
+            mo->momy = FixedMul(mo->momy, FRICTION_FLY);
+        }
+        else if (special == 15) // Friction_Low
+        {
+            mo->momx = FixedMul(mo->momx, FRICTION_LOW);
+            mo->momy = FixedMul(mo->momy, FRICTION_LOW);
+        }
+        else
+        {
+            mo->momx = FixedMul(mo->momx, FRICTION_NORMAL);
+            mo->momy = FixedMul(mo->momy, FRICTION_NORMAL);
+        }
+    }
+}
+
+
+/*
+===============
+=
+= P_ZMovement
+=
+===============
+*/
+
+void P_ZMovement(mobj_t * mo)
+{
+    int dist;
+    int delta;
+//
+// check for smooth step up
+//
+    if (mo->player && mo->z < mo->floorz)
+    {
+        mo->player->viewheight -= mo->floorz - mo->z;
+        mo->player->deltaviewheight =
+            (VIEWHEIGHT - mo->player->viewheight) >> 3;
+    }
+//
+// adjust height
+//
+    mo->z += mo->momz;
+    if (mo->flags & MF_FLOAT && mo->target)
+    {                           // float down towards target if too close
+        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
+        {
+            dist =
+                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
+            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
+            if (delta < 0 && dist < -(delta * 3))
+                mo->z -= FLOATSPEED;
+            else if (delta > 0 && dist < (delta * 3))
+                mo->z += FLOATSPEED;
+        }
+    }
+    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
+        && leveltime & 2)
+    {
+        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
+    }
+
+//
+// clip movement
+//
+    if (mo->z <= mo->floorz)
+    {                           // Hit the floor
+        if (mo->flags & MF_MISSILE)
+        {
+            mo->z = mo->floorz;
+            if (mo->flags2 & MF2_FLOORBOUNCE)
+            {
+                P_FloorBounceMissile(mo);
+                return;
+            }
+            else if (mo->type == MT_MNTRFX2)
+            {                   // Minotaur floor fire can go up steps
+                return;
+            }
+            else
+            {
+                P_ExplodeMissile(mo);
+                return;
+            }
+        }
+        if (mo->z - mo->momz > mo->floorz)
+        {                       // Spawn splashes, etc.
+            P_HitFloor(mo);
+        }
+        mo->z = mo->floorz;
+        if (mo->momz < 0)
+        {
+            if (mo->player && mo->momz < -GRAVITY * 8 && !(mo->flags2 & MF2_FLY))       // squat down
+            {
+                mo->player->deltaviewheight = mo->momz >> 3;
+                S_StartSound(mo, sfx_plroof);
+                // haleyjd: removed externdriver crap
+                mo->player->centering = true;
+            }
+            mo->momz = 0;
+        }
+        if (mo->flags & MF_SKULLFLY)
+        {                       // The skull slammed into something
+            mo->momz = -mo->momz;
+        }
+        if (mo->info->crashstate && (mo->flags & MF_CORPSE))
+        {
+            P_SetMobjState(mo, mo->info->crashstate);
+            return;
+        }
+    }
+    else if (mo->flags2 & MF2_LOGRAV)
+    {
+        if (mo->momz == 0)
+            mo->momz = -(GRAVITY >> 3) * 2;
+        else
+            mo->momz -= GRAVITY >> 3;
+    }
+    else if (!(mo->flags & MF_NOGRAVITY))
+    {
+        if (mo->momz == 0)
+            mo->momz = -GRAVITY * 2;
+        else
+            mo->momz -= GRAVITY;
+    }
+
+    if (mo->z + mo->height > mo->ceilingz)
+    {                           // hit the ceiling
+        if (mo->momz > 0)
+            mo->momz = 0;
+        mo->z = mo->ceilingz - mo->height;
+        if (mo->flags & MF_SKULLFLY)
+        {                       // the skull slammed into something
+            mo->momz = -mo->momz;
+        }
+        if (mo->flags & MF_MISSILE)
+        {
+            if (mo->subsector->sector->ceilingpic == skyflatnum)
+            {
+                if (mo->type == MT_BLOODYSKULL)
+                {
+                    mo->momx = mo->momy = 0;
+                    mo->momz = -FRACUNIT;
+                }
+                else
+                {
+                    P_RemoveMobj(mo);
+                }
+                return;
+            }
+            P_ExplodeMissile(mo);
+            return;
+        }
+    }
+}
+
+
+/*
+================
+=
+= P_NightmareRespawn
+=
+================
+*/
+
+void P_NightmareRespawn(mobj_t * mobj)
+{
+    fixed_t x, y, z;
+    subsector_t *ss;
+    mobj_t *mo;
+    mapthing_t *mthing;
+
+    x = mobj->spawnpoint.x << FRACBITS;
+    y = mobj->spawnpoint.y << FRACBITS;
+
+    if (!P_CheckPosition(mobj, x, y))
+        return;                 // somthing is occupying it's position
+
+
+// spawn a teleport fog at old spot
+
+    mo = P_SpawnMobj(mobj->x, mobj->y,
+                     mobj->subsector->sector->floorheight + TELEFOGHEIGHT,
+                     MT_TFOG);
+    S_StartSound(mo, sfx_telept);
+
+// spawn a teleport fog at the new spot
+    ss = R_PointInSubsector(x, y);
+    mo = P_SpawnMobj(x, y, ss->sector->floorheight + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(mo, sfx_telept);
+
+// spawn the new monster
+    mthing = &mobj->spawnpoint;
+
+// spawn it
+    if (mobj->info->flags & MF_SPAWNCEILING)
+        z = ONCEILINGZ;
+    else
+        z = ONFLOORZ;
+    mo = P_SpawnMobj(x, y, z, mobj->type);
+    mo->spawnpoint = mobj->spawnpoint;
+    mo->angle = ANG45 * (mthing->angle / 45);
+    if (mthing->options & MTF_AMBUSH)
+        mo->flags |= MF_AMBUSH;
+
+    mo->reactiontime = 18;
+
+// remove the old monster
+    P_RemoveMobj(mobj);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_BlasterMobjThinker
+//
+// Thinker for the ultra-fast blaster PL2 ripper-spawning missile.
+//
+//----------------------------------------------------------------------------
+
+void P_BlasterMobjThinker(thinker_t *thinker)
+{
+    mobj_t *mobj = (mobj_t *) thinker;
+    int i;
+    fixed_t xfrac;
+    fixed_t yfrac;
+    fixed_t zfrac;
+    fixed_t z;
+    boolean changexy;
+
+    // Handle movement
+    if (mobj->momx || mobj->momy || (mobj->z != mobj->floorz) || mobj->momz)
+    {
+        xfrac = mobj->momx >> 3;
+        yfrac = mobj->momy >> 3;
+        zfrac = mobj->momz >> 3;
+        changexy = xfrac || yfrac;
+        for (i = 0; i < 8; i++)
+        {
+            if (changexy)
+            {
+                if (!P_TryMove(mobj, mobj->x + xfrac, mobj->y + yfrac))
+                {               // Blocked move
+                    P_ExplodeMissile(mobj);
+                    return;
+                }
+            }
+            mobj->z += zfrac;
+            if (mobj->z <= mobj->floorz)
+            {                   // Hit the floor
+                mobj->z = mobj->floorz;
+                P_HitFloor(mobj);
+                P_ExplodeMissile(mobj);
+                return;
+            }
+            if (mobj->z + mobj->height > mobj->ceilingz)
+            {                   // Hit the ceiling
+                mobj->z = mobj->ceilingz - mobj->height;
+                P_ExplodeMissile(mobj);
+                return;
+            }
+            if (changexy && (P_Random() < 64))
+            {
+                z = mobj->z - 8 * FRACUNIT;
+                if (z < mobj->floorz)
+                {
+                    z = mobj->floorz;
+                }
+                P_SpawnMobj(mobj->x, mobj->y, z, MT_BLASTERSMOKE);
+            }
+        }
+    }
+    // Advance the state
+    if (mobj->tics != -1)
+    {
+        mobj->tics--;
+        while (!mobj->tics)
+        {
+            if (!P_SetMobjState(mobj, mobj->state->nextstate))
+            {                   // mobj was removed
+                return;
+            }
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_MobjThinker
+//
+//----------------------------------------------------------------------------
+
+void P_MobjThinker(thinker_t *thinker)
+{
+    mobj_t *mobj = (mobj_t *) thinker;
+    mobj_t *onmo;
+
+    // Handle X and Y momentums
+    if (mobj->momx || mobj->momy || (mobj->flags & MF_SKULLFLY))
+    {
+        P_XYMovement(mobj);
+        if (mobj->thinker.function == (think_t) - 1)
+        {                       // mobj was removed
+            return;
+        }
+    }
+    if (mobj->flags2 & MF2_FLOATBOB)
+    {                           // Floating item bobbing motion
+        mobj->z = mobj->floorz + FloatBobOffsets[(mobj->health++) & 63];
+    }
+    else if ((mobj->z != mobj->floorz) || mobj->momz)
+    {                           // Handle Z momentum and gravity
+        if (mobj->flags2 & MF2_PASSMOBJ)
+        {
+            if (!(onmo = P_CheckOnmobj(mobj)))
+            {
+                P_ZMovement(mobj);
+            }
+            else
+            {
+                if (mobj->player && mobj->momz < 0)
+                {
+                    mobj->flags2 |= MF2_ONMOBJ;
+                    mobj->momz = 0;
+                }
+                if (mobj->player && (onmo->player || onmo->type == MT_POD))
+                {
+                    mobj->momx = onmo->momx;
+                    mobj->momy = onmo->momy;
+                    if (onmo->z < onmo->floorz)
+                    {
+                        mobj->z += onmo->floorz - onmo->z;
+                        if (onmo->player)
+                        {
+                            onmo->player->viewheight -=
+                                onmo->floorz - onmo->z;
+                            onmo->player->deltaviewheight =
+                                (VIEWHEIGHT - onmo->player->viewheight) >> 3;
+                        }
+                        onmo->z = onmo->floorz;
+                    }
+                }
+            }
+        }
+        else
+        {
+            P_ZMovement(mobj);
+        }
+        if (mobj->thinker.function == (think_t) - 1)
+        {                       // mobj was removed
+            return;
+        }
+    }
+
+//
+// cycle through states, calling action functions at transitions
+//
+    if (mobj->tics != -1)
+    {
+        mobj->tics--;
+        // you can cycle through multiple states in a tic
+        while (!mobj->tics)
+        {
+            if (!P_SetMobjState(mobj, mobj->state->nextstate))
+            {                   // mobj was removed
+                return;
+            }
+        }
+    }
+    else
+    {                           // Check for monster respawn
+        if (!(mobj->flags & MF_COUNTKILL))
+        {
+            return;
+        }
+        if (!respawnmonsters)
+        {
+            return;
+        }
+        mobj->movecount++;
+        if (mobj->movecount < 12 * 35)
+        {
+            return;
+        }
+        if (leveltime & 31)
+        {
+            return;
+        }
+        if (P_Random() > 4)
+        {
+            return;
+        }
+        P_NightmareRespawn(mobj);
+    }
+}
+
+/*
+===============
+=
+= P_SpawnMobj
+=
+===============
+*/
+
+mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
+{
+    mobj_t *mobj;
+    state_t *st;
+    mobjinfo_t *info;
+    fixed_t space;
+
+    mobj = Z_Malloc(sizeof(*mobj), PU_LEVEL, NULL);
+    memset(mobj, 0, sizeof(*mobj));
+    info = &mobjinfo[type];
+    mobj->type = type;
+    mobj->info = info;
+    mobj->x = x;
+    mobj->y = y;
+    mobj->radius = info->radius;
+    mobj->height = info->height;
+    mobj->flags = info->flags;
+    mobj->flags2 = info->flags2;
+    mobj->damage = info->damage;
+    mobj->health = info->spawnhealth;
+    if (gameskill != sk_nightmare)
+    {
+        mobj->reactiontime = info->reactiontime;
+    }
+    mobj->lastlook = P_Random() % MAXPLAYERS;
+
+    // Set the state, but do not use P_SetMobjState, because action
+    // routines can't be called yet.  If the spawnstate has an action
+    // routine, it will not be called.
+    st = &states[info->spawnstate];
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+
+    // Set subsector and/or block links.
+    P_SetThingPosition(mobj);
+    mobj->floorz = mobj->subsector->sector->floorheight;
+    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+    if (z == ONFLOORZ)
+    {
+        mobj->z = mobj->floorz;
+    }
+    else if (z == ONCEILINGZ)
+    {
+        mobj->z = mobj->ceilingz - mobj->info->height;
+    }
+    else if (z == FLOATRANDZ)
+    {
+        space = ((mobj->ceilingz) - (mobj->info->height)) - mobj->floorz;
+        if (space > 48 * FRACUNIT)
+        {
+            space -= 40 * FRACUNIT;
+            mobj->z =
+                ((space * P_Random()) >> 8) + mobj->floorz + 40 * FRACUNIT;
+        }
+        else
+        {
+            mobj->z = mobj->floorz;
+        }
+    }
+    else
+    {
+        mobj->z = z;
+    }
+    if (mobj->flags2 & MF2_FOOTCLIP
+        && P_GetThingFloorType(mobj) != FLOOR_SOLID
+        && mobj->floorz == mobj->subsector->sector->floorheight)
+    {
+        mobj->flags2 |= MF2_FEETARECLIPPED;
+    }
+    else
+    {
+        mobj->flags2 &= ~MF2_FEETARECLIPPED;
+    }
+
+    mobj->thinker.function = P_MobjThinker;
+    P_AddThinker(&mobj->thinker);
+    return (mobj);
+}
+
+/*
+===============
+=
+= P_RemoveMobj
+=
+===============
+*/
+
+void P_RemoveMobj(mobj_t * mobj)
+{
+// unlink from sector and block lists
+    P_UnsetThingPosition(mobj);
+// stop any playing sound
+    S_StopSound(mobj);
+// free block
+    P_RemoveThinker((thinker_t *) mobj);
+}
+
+//=============================================================================
+
+
+/*
+============
+=
+= P_SpawnPlayer
+=
+= Called when a player is spawned on the level 
+= Most of the player structure stays unchanged between levels
+============
+*/
+
+void P_SpawnPlayer(mapthing_t * mthing)
+{
+    player_t *p;
+    fixed_t x, y, z;
+    mobj_t *mobj;
+    int i;
+
+    if (!playeringame[mthing->type - 1])
+        return;                 // not playing
+
+    p = &players[mthing->type - 1];
+
+    if (p->playerstate == PST_REBORN)
+        G_PlayerReborn(mthing->type - 1);
+
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+
+    z = ONFLOORZ;
+    mobj = P_SpawnMobj(x, y, z, MT_PLAYER);
+    if (mthing->type > 1)       // set color translations for player sprites
+        mobj->flags |= (mthing->type - 1) << MF_TRANSSHIFT;
+
+    mobj->angle = ANG45 * (mthing->angle / 45);
+    mobj->player = p;
+    mobj->health = p->health;
+    p->mo = mobj;
+    p->playerstate = PST_LIVE;
+    p->refire = 0;
+    p->message = NULL;
+    p->damagecount = 0;
+    p->bonuscount = 0;
+    p->chickenTics = 0;
+    p->rain1 = NULL;
+    p->rain2 = NULL;
+    p->extralight = 0;
+    p->fixedcolormap = 0;
+    p->viewheight = VIEWHEIGHT;
+    P_SetupPsprites(p);         // setup gun psprite        
+    if (deathmatch)
+    {                           // Give all keys in death match mode
+        for (i = 0; i < NUM_KEY_TYPES; i++)
+        {
+            p->keys[i] = true;
+            if (p == &players[consoleplayer])
+            {
+                playerkeys = 7;
+                UpdateState |= I_STATBAR;
+            }
+        }
+    }
+    else if (p == &players[consoleplayer])
+    {
+        playerkeys = 0;
+        UpdateState |= I_STATBAR;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_SpawnMapThing
+//
+// The fields of the mapthing should already be in host byte order.
+//
+//----------------------------------------------------------------------------
+
+void P_SpawnMapThing(mapthing_t * mthing)
+{
+    int i;
+    int bit;
+    mobj_t *mobj;
+    fixed_t x, y, z;
+
+// count deathmatch start positions
+    if (mthing->type == 11)
+    {
+        if (deathmatch_p < &deathmatchstarts[10])
+        {
+            memcpy(deathmatch_p, mthing, sizeof(*mthing));
+            deathmatch_p++;
+        }
+        return;
+    }
+
+// check for players specially
+    if (mthing->type <= 4)
+    {
+        // save spots for respawning in network games
+        playerstarts[mthing->type - 1] = *mthing;
+        playerstartsingame[mthing->type - 1] = true;
+        if (!deathmatch)
+        {
+            P_SpawnPlayer(mthing);
+        }
+        return;
+    }
+
+    // Ambient sound sequences
+    if (mthing->type >= 1200 && mthing->type < 1300)
+    {
+        P_AddAmbientSfx(mthing->type - 1200);
+        return;
+    }
+
+    // Check for boss spots
+    if (mthing->type == 56)     // Monster_BossSpot
+    {
+        P_AddBossSpot(mthing->x << FRACBITS, mthing->y << FRACBITS,
+                      ANG45 * (mthing->angle / 45));
+        return;
+    }
+
+// check for appropriate skill level
+    if (!netgame && (mthing->options & 16))
+        return;
+
+    if (gameskill == sk_baby)
+        bit = 1;
+    else if (gameskill == sk_nightmare)
+        bit = 4;
+    else
+        bit = 1 << (gameskill - 1);
+    if (!(mthing->options & bit))
+        return;
+
+// find which type to spawn
+    for (i = 0; i < NUMMOBJTYPES; i++)
+        if (mthing->type == mobjinfo[i].doomednum)
+            break;
+
+    if (i == NUMMOBJTYPES)
+        I_Error("P_SpawnMapThing: Unknown type %i at (%i, %i)", mthing->type,
+                mthing->x, mthing->y);
+
+// don't spawn keys and players in deathmatch
+    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
+        return;
+
+// don't spawn any monsters if -nomonsters
+    if (nomonsters && (mobjinfo[i].flags & MF_COUNTKILL))
+        return;
+
+// spawn it
+    switch (i)
+    {                           // Special stuff
+        case MT_WSKULLROD:
+        case MT_WPHOENIXROD:
+        case MT_AMSKRDWIMPY:
+        case MT_AMSKRDHEFTY:
+        case MT_AMPHRDWIMPY:
+        case MT_AMPHRDHEFTY:
+        case MT_AMMACEWIMPY:
+        case MT_AMMACEHEFTY:
+        case MT_ARTISUPERHEAL:
+        case MT_ARTITELEPORT:
+        case MT_ITEMSHIELD2:
+            if (gamemode == shareware)
+            {                   // Don't place on map in shareware version
+                return;
+            }
+            break;
+        case MT_WMACE:
+            if (gamemode != shareware)
+            {                   // Put in the mace spot list
+                P_AddMaceSpot(mthing);
+                return;
+            }
+            return;
+        default:
+            break;
+    }
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+    if (mobjinfo[i].flags & MF_SPAWNCEILING)
+    {
+        z = ONCEILINGZ;
+    }
+    else if (mobjinfo[i].flags2 & MF2_SPAWNFLOAT)
+    {
+        z = FLOATRANDZ;
+    }
+    else
+    {
+        z = ONFLOORZ;
+    }
+    mobj = P_SpawnMobj(x, y, z, i);
+    if (mobj->flags2 & MF2_FLOATBOB)
+    {                           // Seed random starting index for bobbing motion
+        mobj->health = P_Random();
+    }
+    if (mobj->tics > 0)
+    {
+        mobj->tics = 1 + (P_Random() % mobj->tics);
+    }
+    if (mobj->flags & MF_COUNTKILL)
+    {
+        totalkills++;
+        mobj->spawnpoint = *mthing;
+    }
+    if (mobj->flags & MF_COUNTITEM)
+    {
+        totalitems++;
+    }
+    mobj->angle = ANG45 * (mthing->angle / 45);
+    if (mthing->options & MTF_AMBUSH)
+    {
+        mobj->flags |= MF_AMBUSH;
+    }
+}
+
+/*
+===============================================================================
+
+						GAME SPAWN FUNCTIONS
+
+===============================================================================
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SpawnPuff
+//
+//---------------------------------------------------------------------------
+
+
+void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z)
+{
+    mobj_t *puff;
+
+    z += (P_SubRandom() << 10);
+    puff = P_SpawnMobj(x, y, z, PuffType);
+    if (puff->info->attacksound)
+    {
+        S_StartSound(puff, puff->info->attacksound);
+    }
+    switch (PuffType)
+    {
+        case MT_BEAKPUFF:
+        case MT_STAFFPUFF:
+            puff->momz = FRACUNIT;
+            break;
+        case MT_GAUNTLETPUFF1:
+        case MT_GAUNTLETPUFF2:
+            puff->momz = (fixed_t)(.8 * FRACUNIT);
+        default:
+            break;
+    }
+}
+
+/*
+================
+=
+= P_SpawnBlood
+=
+================
+*/
+
+/*
+void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage)
+{
+	mobj_t  *th;
+	
+	z += (P_SubRandom()<<10);
+	th = P_SpawnMobj (x,y,z, MT_BLOOD);
+	th->momz = FRACUNIT*2;
+	th->tics -= P_Random()&3;
+
+	if (damage <= 12 && damage >= 9)
+		P_SetMobjState (th,S_BLOOD2);
+	else if (damage < 9)
+		P_SetMobjState (th,S_BLOOD3);
+}
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_BloodSplatter
+//
+//---------------------------------------------------------------------------
+
+void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(x, y, z, MT_BLOODSPLATTER);
+    mo->target = originator;
+    mo->momx = P_SubRandom() << 9;
+    mo->momy = P_SubRandom() << 9;
+    mo->momz = FRACUNIT * 2;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_RipperBlood
+//
+//---------------------------------------------------------------------------
+
+void P_RipperBlood(mobj_t * mo)
+{
+    mobj_t *th;
+    fixed_t x, y, z;
+
+    x = mo->x + (P_SubRandom() << 12);
+    y = mo->y + (P_SubRandom() << 12);
+    z = mo->z + (P_SubRandom() << 12);
+    th = P_SpawnMobj(x, y, z, MT_BLOOD);
+    th->flags |= MF_NOGRAVITY;
+    th->momx = mo->momx >> 1;
+    th->momy = mo->momy >> 1;
+    th->tics += P_Random() & 3;
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GetThingFloorType
+//
+//---------------------------------------------------------------------------
+
+int P_GetThingFloorType(mobj_t * thing)
+{
+    return (TerrainTypes[thing->subsector->sector->floorpic]);
+/*
+	if(thing->subsector->sector->floorpic
+		== W_GetNumForName("FLTWAWA1")-firstflat)
+	{
+		return(FLOOR_WATER);
+	}
+	else
+	{
+		return(FLOOR_SOLID);
+	}
+*/
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_HitFloor
+//
+//---------------------------------------------------------------------------
+
+int P_HitFloor(mobj_t * thing)
+{
+    mobj_t *mo;
+
+    if (thing->floorz != thing->subsector->sector->floorheight)
+    {                           // don't splash if landing on the edge above water/lava/etc....
+        return (FLOOR_SOLID);
+    }
+    switch (P_GetThingFloorType(thing))
+    {
+        case FLOOR_WATER:
+            P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASHBASE);
+            mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASH);
+            mo->target = thing;
+            mo->momx = P_SubRandom() << 8;
+            mo->momy = P_SubRandom() << 8;
+            mo->momz = 2 * FRACUNIT + (P_Random() << 8);
+            S_StartSound(mo, sfx_gloop);
+            return (FLOOR_WATER);
+        case FLOOR_LAVA:
+            P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASPLASH);
+            mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASMOKE);
+            mo->momz = FRACUNIT + (P_Random() << 7);
+            S_StartSound(mo, sfx_burn);
+            return (FLOOR_LAVA);
+        case FLOOR_SLUDGE:
+            P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SLUDGESPLASH);
+            mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SLUDGECHUNK);
+            mo->target = thing;
+            mo->momx = P_SubRandom() << 8;
+            mo->momy = P_SubRandom() << 8;
+            mo->momz = FRACUNIT + (P_Random() << 8);
+            return (FLOOR_SLUDGE);
+    }
+    return (FLOOR_SOLID);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_CheckMissileSpawn
+//
+// Returns true if the missile is at a valid spawn point, otherwise
+// explodes it and returns false.
+//
+//---------------------------------------------------------------------------
+
+boolean P_CheckMissileSpawn(mobj_t * missile)
+{
+    //missile->tics -= P_Random()&3;
+
+    // move a little forward so an angle can be computed if it
+    // immediately explodes
+    missile->x += (missile->momx >> 1);
+    missile->y += (missile->momy >> 1);
+    missile->z += (missile->momz >> 1);
+    if (!P_TryMove(missile, missile->x, missile->y))
+    {
+        P_ExplodeMissile(missile);
+        return (false);
+    }
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_SpawnMissile
+//
+// Returns NULL if the missile exploded immediately, otherwise returns
+// a mobj_t pointer to the missile.
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type)
+{
+    fixed_t z;
+    mobj_t *th;
+    angle_t an;
+    int dist;
+
+    switch (type)
+    {
+        case MT_MNTRFX1:       // Minotaur swing attack missile
+            z = source->z + 40 * FRACUNIT;
+            break;
+        case MT_MNTRFX2:       // Minotaur floor fire missile
+            z = ONFLOORZ;
+            break;
+        case MT_SRCRFX1:       // Sorcerer Demon fireball
+            z = source->z + 48 * FRACUNIT;
+            break;
+        case MT_KNIGHTAXE:     // Knight normal axe
+        case MT_REDAXE:        // Knight red power axe
+            z = source->z + 36 * FRACUNIT;
+            break;
+        default:
+            z = source->z + 32 * FRACUNIT;
+            break;
+    }
+    if (source->flags2 & MF2_FEETARECLIPPED)
+    {
+        z -= FOOTCLIPSIZE;
+    }
+    th = P_SpawnMobj(source->x, source->y, z, type);
+    if (th->info->seesound)
+    {
+        S_StartSound(th, th->info->seesound);
+    }
+    th->target = source;        // Originator
+    an = R_PointToAngle2(source->x, source->y, dest->x, dest->y);
+    if (dest->flags & MF_SHADOW)
+    {                           // Invisible target
+        an += P_SubRandom() << 21;
+    }
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul(th->info->speed, finecosine[an]);
+    th->momy = FixedMul(th->info->speed, finesine[an]);
+    dist = P_AproxDistance(dest->x - source->x, dest->y - source->y);
+    dist = dist / th->info->speed;
+    if (dist < 1)
+    {
+        dist = 1;
+    }
+    th->momz = (dest->z - source->z) / dist;
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_SpawnMissileAngle
+//
+// Returns NULL if the missile exploded immediately, otherwise returns
+// a mobj_t pointer to the missile.
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
+                            angle_t angle, fixed_t momz)
+{
+    fixed_t z;
+    mobj_t *mo;
+
+    switch (type)
+    {
+        case MT_MNTRFX1:       // Minotaur swing attack missile
+            z = source->z + 40 * FRACUNIT;
+            break;
+        case MT_MNTRFX2:       // Minotaur floor fire missile
+            z = ONFLOORZ;
+            break;
+        case MT_SRCRFX1:       // Sorcerer Demon fireball
+            z = source->z + 48 * FRACUNIT;
+            break;
+        default:
+            z = source->z + 32 * FRACUNIT;
+            break;
+    }
+    if (source->flags2 & MF2_FEETARECLIPPED)
+    {
+        z -= FOOTCLIPSIZE;
+    }
+    mo = P_SpawnMobj(source->x, source->y, z, type);
+    if (mo->info->seesound)
+    {
+        S_StartSound(mo, mo->info->seesound);
+    }
+    mo->target = source;        // Originator
+    mo->angle = angle;
+    angle >>= ANGLETOFINESHIFT;
+    mo->momx = FixedMul(mo->info->speed, finecosine[angle]);
+    mo->momy = FixedMul(mo->info->speed, finesine[angle]);
+    mo->momz = momz;
+    return (P_CheckMissileSpawn(mo) ? mo : NULL);
+}
+
+/*
+================
+=
+= P_SpawnPlayerMissile
+=
+= Tries to aim at a nearby monster
+================
+*/
+
+mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type)
+{
+    angle_t an;
+    fixed_t x, y, z, slope;
+
+    // Try to find a target
+    an = source->angle;
+    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+    if (!linetarget)
+    {
+        an += 1 << 26;
+        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2 << 26;
+            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        }
+        if (!linetarget)
+        {
+            an = source->angle;
+            slope = ((source->player->lookdir) << FRACBITS) / 173;
+        }
+    }
+    x = source->x;
+    y = source->y;
+    z = source->z + 4 * 8 * FRACUNIT +
+        ((source->player->lookdir) << FRACBITS) / 173;
+    if (source->flags2 & MF2_FEETARECLIPPED)
+    {
+        z -= FOOTCLIPSIZE;
+    }
+    MissileMobj = P_SpawnMobj(x, y, z, type);
+    if (MissileMobj->info->seesound)
+    {
+        S_StartSound(MissileMobj, MissileMobj->info->seesound);
+    }
+    MissileMobj->target = source;
+    MissileMobj->angle = an;
+    MissileMobj->momx = FixedMul(MissileMobj->info->speed,
+                                 finecosine[an >> ANGLETOFINESHIFT]);
+    MissileMobj->momy = FixedMul(MissileMobj->info->speed,
+                                 finesine[an >> ANGLETOFINESHIFT]);
+    MissileMobj->momz = FixedMul(MissileMobj->info->speed, slope);
+    if (MissileMobj->type == MT_BLASTERFX1)
+    {                           // Ultra-fast ripper spawning missile
+        MissileMobj->x += (MissileMobj->momx >> 3);
+        MissileMobj->y += (MissileMobj->momy >> 3);
+        MissileMobj->z += (MissileMobj->momz >> 3);
+    }
+    else
+    {                           // Normal missile
+        MissileMobj->x += (MissileMobj->momx >> 1);
+        MissileMobj->y += (MissileMobj->momy >> 1);
+        MissileMobj->z += (MissileMobj->momz >> 1);
+    }
+    if (!P_TryMove(MissileMobj, MissileMobj->x, MissileMobj->y))
+    {                           // Exploded immediately
+        P_ExplodeMissile(MissileMobj);
+        return (NULL);
+    }
+    return (MissileMobj);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SPMAngle
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle)
+{
+    mobj_t *th;
+    angle_t an;
+    fixed_t x, y, z, slope;
+
+//
+// see which target is to be aimed at
+//
+    an = angle;
+    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+    if (!linetarget)
+    {
+        an += 1 << 26;
+        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2 << 26;
+            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        }
+        if (!linetarget)
+        {
+            an = angle;
+            slope = ((source->player->lookdir) << FRACBITS) / 173;
+        }
+    }
+    x = source->x;
+    y = source->y;
+    z = source->z + 4 * 8 * FRACUNIT +
+        ((source->player->lookdir) << FRACBITS) / 173;
+    if (source->flags2 & MF2_FEETARECLIPPED)
+    {
+        z -= FOOTCLIPSIZE;
+    }
+    th = P_SpawnMobj(x, y, z, type);
+    if (th->info->seesound)
+    {
+        S_StartSound(th, th->info->seesound);
+    }
+    th->target = source;
+    th->angle = an;
+    th->momx = FixedMul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
+    th->momy = FixedMul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
+    th->momz = FixedMul(th->info->speed, slope);
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_ContMobjSound
+//
+//---------------------------------------------------------------------------
+
+void A_ContMobjSound(mobj_t * actor, player_t *player, pspdef_t *psp)
+{
+    switch (actor->type)
+    {
+        case MT_KNIGHTAXE:
+            S_StartSound(actor, sfx_kgtatk);
+            break;
+        case MT_MUMMYFX1:
+            S_StartSound(actor, sfx_mumhed);
+            break;
+        default:
+            break;
+    }
+}
diff --git a/games/NXDoom/src/heretic/p_plats.c b/games/NXDoom/src/heretic/p_plats.c
new file mode 100644
index 000000000..861a9a51a
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_plats.c
@@ -0,0 +1,259 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_plats.c
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+plat_t *activeplats[MAXPLATS];
+
+//==================================================================
+//
+//      Move a plat up and down
+//
+//==================================================================
+void T_PlatRaise(thinker_t *thinker)
+{
+    plat_t *plat = (plat_t *) thinker;
+    result_e res;
+
+    switch (plat->status)
+    {
+        case up:
+            res = T_MovePlane(plat->sector, plat->speed,
+                              plat->high, plat->crush, 0, 1);
+            if (!(leveltime & 31))
+            {
+                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
+            }
+            if (plat->type == raiseAndChange
+                || plat->type == raiseToNearestAndChange)
+            {
+                if (!(leveltime & 7))
+                {
+                    S_StartSound(&plat->sector->soundorg,
+                                 sfx_stnmov);
+                }
+            }
+            if (res == crushed && (!plat->crush))
+            {
+                plat->count = plat->wait;
+                plat->status = down;
+                S_StartSound(&plat->sector->soundorg, sfx_pstart);
+            }
+            else if (res == pastdest)
+            {
+                plat->count = plat->wait;
+                plat->status = waiting;
+                S_StartSound(&plat->sector->soundorg, sfx_pstop);
+                switch (plat->type)
+                {
+                    case downWaitUpStay:
+                        P_RemoveActivePlat(plat);
+                        break;
+                    case raiseAndChange:
+                        P_RemoveActivePlat(plat);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+        case down:
+            res =
+                T_MovePlane(plat->sector, plat->speed, plat->low, false, 0,
+                            -1);
+            if (res == pastdest)
+            {
+                plat->count = plat->wait;
+                plat->status = waiting;
+                S_StartSound(&plat->sector->soundorg, sfx_pstop);
+            }
+            else
+            {
+                if (!(leveltime & 31))
+                {
+                    S_StartSound(&plat->sector->soundorg,
+                                 sfx_stnmov);
+                }
+            }
+            break;
+        case waiting:
+            if (!--plat->count)
+            {
+                if (plat->sector->floorheight == plat->low)
+                    plat->status = up;
+                else
+                    plat->status = down;
+                S_StartSound(&plat->sector->soundorg, sfx_pstart);
+            }
+        case in_stasis:
+            break;
+    }
+}
+
+//==================================================================
+//
+//      Do Platforms
+//      "amount" is only used for SOME platforms.
+//
+//==================================================================
+int EV_DoPlat(line_t * line, plattype_e type, int amount)
+{
+    plat_t *plat;
+    int secnum;
+    int rtn;
+    sector_t *sec;
+
+    secnum = -1;
+    rtn = 0;
+
+    //
+    //      Activate all <type> plats that are in_stasis
+    //
+    switch (type)
+    {
+        case perpetualRaise:
+            P_ActivateInStasis(line->tag);
+            break;
+        default:
+            break;
+    }
+
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        //
+        // Find lowest & highest floors around sector
+        //
+        rtn = 1;
+        plat = Z_Malloc(sizeof(*plat), PU_LEVSPEC, 0);
+        P_AddThinker(&plat->thinker);
+
+        plat->type = type;
+        plat->sector = sec;
+        plat->sector->specialdata = plat;
+        plat->thinker.function = T_PlatRaise;
+        plat->crush = false;
+        plat->tag = line->tag;
+        switch (type)
+        {
+            case raiseToNearestAndChange:
+                plat->speed = PLATSPEED / 2;
+                sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+                plat->high = P_FindNextHighestFloor(sec, sec->floorheight);
+                plat->wait = 0;
+                plat->status = up;
+                sec->special = 0;       // NO MORE DAMAGE, IF APPLICABLE
+                S_StartSound(&sec->soundorg, sfx_stnmov);
+                break;
+            case raiseAndChange:
+                plat->speed = PLATSPEED / 2;
+                sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+                plat->high = sec->floorheight + amount * FRACUNIT;
+                plat->wait = 0;
+                plat->status = up;
+                S_StartSound(&sec->soundorg, sfx_stnmov);
+                break;
+            case downWaitUpStay:
+                plat->speed = PLATSPEED * 4;
+                plat->low = P_FindLowestFloorSurrounding(sec);
+                if (plat->low > sec->floorheight)
+                    plat->low = sec->floorheight;
+                plat->high = sec->floorheight;
+                plat->wait = 35 * PLATWAIT;
+                plat->status = down;
+                S_StartSound(&sec->soundorg, sfx_pstart);
+                break;
+            case perpetualRaise:
+                plat->speed = PLATSPEED;
+                plat->low = P_FindLowestFloorSurrounding(sec);
+                if (plat->low > sec->floorheight)
+                    plat->low = sec->floorheight;
+                plat->high = P_FindHighestFloorSurrounding(sec);
+                if (plat->high < sec->floorheight)
+                    plat->high = sec->floorheight;
+                plat->wait = 35 * PLATWAIT;
+                plat->status = P_Random() & 1;
+                S_StartSound(&sec->soundorg, sfx_pstart);
+                break;
+        }
+        P_AddActivePlat(plat);
+    }
+    return rtn;
+}
+
+void P_ActivateInStasis(int tag)
+{
+    int i;
+
+    for (i = 0; i < MAXPLATS; i++)
+        if (activeplats[i] &&
+            (activeplats[i])->tag == tag &&
+            (activeplats[i])->status == in_stasis)
+        {
+            (activeplats[i])->status = (activeplats[i])->oldstatus;
+            (activeplats[i])->thinker.function = T_PlatRaise;
+        }
+}
+
+void EV_StopPlat(line_t * line)
+{
+    int j;
+
+    for (j = 0; j < MAXPLATS; j++)
+        if (activeplats[j] && ((activeplats[j])->status != in_stasis) &&
+            ((activeplats[j])->tag == line->tag))
+        {
+            (activeplats[j])->oldstatus = (activeplats[j])->status;
+            (activeplats[j])->status = in_stasis;
+            (activeplats[j])->thinker.function = NULL;
+        }
+}
+
+void P_AddActivePlat(plat_t * plat)
+{
+    int i;
+    for (i = 0; i < MAXPLATS; i++)
+        if (activeplats[i] == NULL)
+        {
+            activeplats[i] = plat;
+            return;
+        }
+    I_Error("P_AddActivePlat: no more plats!");
+}
+
+void P_RemoveActivePlat(plat_t * plat)
+{
+    int i;
+    for (i = 0; i < MAXPLATS; i++)
+        if (plat == activeplats[i])
+        {
+            (activeplats[i])->sector->specialdata = NULL;
+            P_RemoveThinker(&(activeplats[i])->thinker);
+            activeplats[i] = NULL;
+            return;
+        }
+    I_Error("P_RemoveActivePlat: can't find plat!");
+}
diff --git a/games/NXDoom/src/heretic/p_pspr.c b/games/NXDoom/src/heretic/p_pspr.c
new file mode 100644
index 000000000..10e967dd6
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_pspr.c
@@ -0,0 +1,1907 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_pspr.c
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// Macros
+
+#define LOWERSPEED FRACUNIT*6
+#define RAISESPEED FRACUNIT*6
+#define WEAPONBOTTOM 128*FRACUNIT
+#define WEAPONTOP 32*FRACUNIT
+#define FLAME_THROWER_TICS 10*35
+#define MAGIC_JUNK 1234
+#define MAX_MACE_SPOTS 8
+
+static int MaceSpotCount;
+static struct
+{
+    fixed_t x;
+    fixed_t y;
+} MaceSpots[MAX_MACE_SPOTS];
+
+fixed_t bulletslope;
+
+static int WeaponAmmoUsePL1[NUMWEAPONS] = {
+    0,                          // staff
+    USE_GWND_AMMO_1,            // gold wand
+    USE_CBOW_AMMO_1,            // crossbow
+    USE_BLSR_AMMO_1,            // blaster
+    USE_SKRD_AMMO_1,            // skull rod
+    USE_PHRD_AMMO_1,            // phoenix rod
+    USE_MACE_AMMO_1,            // mace
+    0,                          // gauntlets
+    0                           // beak
+};
+
+static int WeaponAmmoUsePL2[NUMWEAPONS] = {
+    0,                          // staff
+    USE_GWND_AMMO_2,            // gold wand
+    USE_CBOW_AMMO_2,            // crossbow
+    USE_BLSR_AMMO_2,            // blaster
+    USE_SKRD_AMMO_2,            // skull rod
+    USE_PHRD_AMMO_2,            // phoenix rod
+    USE_MACE_AMMO_2,            // mace
+    0,                          // gauntlets
+    0                           // beak
+};
+
+weaponinfo_t wpnlev1info[NUMWEAPONS] = {
+    {                           // Staff
+     am_noammo,                 // ammo
+     S_STAFFUP,                 // upstate
+     S_STAFFDOWN,               // downstate
+     S_STAFFREADY,              // readystate
+     S_STAFFATK1_1,             // atkstate
+     S_STAFFATK1_1,             // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Gold wand
+     am_goldwand,               // ammo
+     S_GOLDWANDUP,              // upstate
+     S_GOLDWANDDOWN,            // downstate
+     S_GOLDWANDREADY,           // readystate
+     S_GOLDWANDATK1_1,          // atkstate
+     S_GOLDWANDATK1_1,          // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Crossbow
+     am_crossbow,               // ammo
+     S_CRBOWUP,                 // upstate
+     S_CRBOWDOWN,               // downstate
+     S_CRBOW1,                  // readystate
+     S_CRBOWATK1_1,             // atkstate
+     S_CRBOWATK1_1,             // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Blaster
+     am_blaster,                // ammo
+     S_BLASTERUP,               // upstate
+     S_BLASTERDOWN,             // downstate
+     S_BLASTERREADY,            // readystate
+     S_BLASTERATK1_1,           // atkstate
+     S_BLASTERATK1_3,           // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Skull rod
+     am_skullrod,               // ammo
+     S_HORNRODUP,               // upstate
+     S_HORNRODDOWN,             // downstate
+     S_HORNRODREADY,            // readystae
+     S_HORNRODATK1_1,           // atkstate
+     S_HORNRODATK1_1,           // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Phoenix rod
+     am_phoenixrod,             // ammo
+     S_PHOENIXUP,               // upstate
+     S_PHOENIXDOWN,             // downstate
+     S_PHOENIXREADY,            // readystate
+     S_PHOENIXATK1_1,           // atkstate
+     S_PHOENIXATK1_1,           // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Mace
+     am_mace,                   // ammo
+     S_MACEUP,                  // upstate
+     S_MACEDOWN,                // downstate
+     S_MACEREADY,               // readystate
+     S_MACEATK1_1,              // atkstate
+     S_MACEATK1_2,              // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Gauntlets
+     am_noammo,                 // ammo
+     S_GAUNTLETUP,              // upstate
+     S_GAUNTLETDOWN,            // downstate
+     S_GAUNTLETREADY,           // readystate
+     S_GAUNTLETATK1_1,          // atkstate
+     S_GAUNTLETATK1_3,          // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Beak
+     am_noammo,                 // ammo
+     S_BEAKUP,                  // upstate
+     S_BEAKDOWN,                // downstate
+     S_BEAKREADY,               // readystate
+     S_BEAKATK1_1,              // atkstate
+     S_BEAKATK1_1,              // holdatkstate
+     S_NULL                     // flashstate
+     }
+};
+
+weaponinfo_t wpnlev2info[NUMWEAPONS] = {
+    {                           // Staff
+     am_noammo,                 // ammo
+     S_STAFFUP2,                // upstate
+     S_STAFFDOWN2,              // downstate
+     S_STAFFREADY2_1,           // readystate
+     S_STAFFATK2_1,             // atkstate
+     S_STAFFATK2_1,             // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Gold wand
+     am_goldwand,               // ammo
+     S_GOLDWANDUP,              // upstate
+     S_GOLDWANDDOWN,            // downstate
+     S_GOLDWANDREADY,           // readystate
+     S_GOLDWANDATK2_1,          // atkstate
+     S_GOLDWANDATK2_1,          // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Crossbow
+     am_crossbow,               // ammo
+     S_CRBOWUP,                 // upstate
+     S_CRBOWDOWN,               // downstate
+     S_CRBOW1,                  // readystate
+     S_CRBOWATK2_1,             // atkstate
+     S_CRBOWATK2_1,             // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Blaster
+     am_blaster,                // ammo
+     S_BLASTERUP,               // upstate
+     S_BLASTERDOWN,             // downstate
+     S_BLASTERREADY,            // readystate
+     S_BLASTERATK2_1,           // atkstate
+     S_BLASTERATK2_3,           // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Skull rod
+     am_skullrod,               // ammo
+     S_HORNRODUP,               // upstate
+     S_HORNRODDOWN,             // downstate
+     S_HORNRODREADY,            // readystae
+     S_HORNRODATK2_1,           // atkstate
+     S_HORNRODATK2_1,           // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Phoenix rod
+     am_phoenixrod,             // ammo
+     S_PHOENIXUP,               // upstate
+     S_PHOENIXDOWN,             // downstate
+     S_PHOENIXREADY,            // readystate
+     S_PHOENIXATK2_1,           // atkstate
+     S_PHOENIXATK2_2,           // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Mace
+     am_mace,                   // ammo
+     S_MACEUP,                  // upstate
+     S_MACEDOWN,                // downstate
+     S_MACEREADY,               // readystate
+     S_MACEATK2_1,              // atkstate
+     S_MACEATK2_1,              // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Gauntlets
+     am_noammo,                 // ammo
+     S_GAUNTLETUP2,             // upstate
+     S_GAUNTLETDOWN2,           // downstate
+     S_GAUNTLETREADY2_1,        // readystate
+     S_GAUNTLETATK2_1,          // atkstate
+     S_GAUNTLETATK2_3,          // holdatkstate
+     S_NULL                     // flashstate
+     },
+    {                           // Beak
+     am_noammo,                 // ammo
+     S_BEAKUP,                  // upstate
+     S_BEAKDOWN,                // downstate
+     S_BEAKREADY,               // readystate
+     S_BEAKATK2_1,              // atkstate
+     S_BEAKATK2_1,              // holdatkstate
+     S_NULL                     // flashstate
+     }
+};
+
+//---------------------------------------------------------------------------
+//
+// PROC P_OpenWeapons
+//
+// Called at level load before things are loaded.
+//
+//---------------------------------------------------------------------------
+
+void P_OpenWeapons(void)
+{
+    MaceSpotCount = 0;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_AddMaceSpot
+//
+//---------------------------------------------------------------------------
+
+void P_AddMaceSpot(mapthing_t * mthing)
+{
+    if (MaceSpotCount == MAX_MACE_SPOTS)
+    {
+        I_Error("Too many mace spots.");
+    }
+    MaceSpots[MaceSpotCount].x = mthing->x << FRACBITS;
+    MaceSpots[MaceSpotCount].y = mthing->y << FRACBITS;
+    MaceSpotCount++;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_RepositionMace
+//
+// Chooses the next spot to place the mace.
+//
+//---------------------------------------------------------------------------
+
+void P_RepositionMace(mobj_t * mo)
+{
+    int spot;
+    subsector_t *ss;
+
+    P_UnsetThingPosition(mo);
+    spot = P_Random() % MaceSpotCount;
+    mo->x = MaceSpots[spot].x;
+    mo->y = MaceSpots[spot].y;
+    ss = R_PointInSubsector(mo->x, mo->y);
+    mo->z = mo->floorz = ss->sector->floorheight;
+    mo->ceilingz = ss->sector->ceilingheight;
+    P_SetThingPosition(mo);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_CloseWeapons
+//
+// Called at level load after things are loaded.
+//
+//---------------------------------------------------------------------------
+
+void P_CloseWeapons(void)
+{
+    int spot;
+
+    if (!MaceSpotCount)
+    {                           // No maces placed
+        return;
+    }
+    if (!deathmatch && P_Random() < 64)
+    {                           // Sometimes doesn't show up if not in deathmatch
+        return;
+    }
+    spot = P_Random() % MaceSpotCount;
+    P_SpawnMobj(MaceSpots[spot].x, MaceSpots[spot].y, ONFLOORZ, MT_WMACE);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SetPsprite
+//
+//---------------------------------------------------------------------------
+
+void P_SetPsprite(player_t * player, int position, statenum_t stnum)
+{
+    pspdef_t *psp;
+    state_t *state;
+
+    psp = &player->psprites[position];
+    do
+    {
+        if (!stnum)
+        {                       // Object removed itself.
+            psp->state = NULL;
+            break;
+        }
+        state = &states[stnum];
+        psp->state = state;
+        psp->tics = state->tics;        // could be 0
+        if (state->misc1)
+        {                       // Set coordinates.
+            psp->sx = state->misc1 << FRACBITS;
+            psp->sy = state->misc2 << FRACBITS;
+        }
+        if (state->action)
+        {                       // Call action routine.
+            state->action(NULL, player, psp);
+            if (!psp->state)
+            {
+                break;
+            }
+        }
+        stnum = psp->state->nextstate;
+    }
+    while (!psp->tics);         // An initial state of 0 could cycle through.
+}
+
+/*
+=================
+=
+= P_CalcSwing
+=
+=================
+*/
+
+/*
+fixed_t	swingx, swingy;
+void P_CalcSwing (player_t *player)
+{
+	fixed_t	swing;
+	int		angle;
+
+// OPTIMIZE: tablify this
+
+	swing = player->bob;
+
+	angle = (FINEANGLES/70*leveltime)&FINEMASK;
+	swingx = FixedMul ( swing, finesine[angle]);
+
+	angle = (FINEANGLES/70*leveltime+FINEANGLES/2)&FINEMASK;
+	swingy = -FixedMul ( swingx, finesine[angle]);
+}
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_ActivateBeak
+//
+//---------------------------------------------------------------------------
+
+void P_ActivateBeak(player_t * player)
+{
+    player->pendingweapon = wp_nochange;
+    player->readyweapon = wp_beak;
+    player->psprites[ps_weapon].sy = WEAPONTOP;
+    P_SetPsprite(player, ps_weapon, S_BEAKREADY);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_PostChickenWeapon
+//
+//---------------------------------------------------------------------------
+
+void P_PostChickenWeapon(player_t * player, weapontype_t weapon)
+{
+    if (weapon == wp_beak)
+    {                           // Should never happen
+        weapon = wp_staff;
+    }
+    player->pendingweapon = wp_nochange;
+    player->readyweapon = weapon;
+    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+    P_SetPsprite(player, ps_weapon, wpnlev1info[weapon].upstate);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_BringUpWeapon
+//
+// Starts bringing the pending weapon up from the bottom of the screen.
+//
+//---------------------------------------------------------------------------
+
+void P_BringUpWeapon(player_t * player)
+{
+    statenum_t new;
+
+    if (player->pendingweapon == wp_nochange)
+    {
+        player->pendingweapon = player->readyweapon;
+    }
+    if (player->pendingweapon == wp_gauntlets)
+    {
+        S_StartSound(player->mo, sfx_gntact);
+    }
+    if (player->powers[pw_weaponlevel2])
+    {
+        new = wpnlev2info[player->pendingweapon].upstate;
+    }
+    else
+    {
+        new = wpnlev1info[player->pendingweapon].upstate;
+    }
+    player->pendingweapon = wp_nochange;
+    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+    P_SetPsprite(player, ps_weapon, new);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_CheckAmmo
+//
+// Returns true if there is enough ammo to shoot.  If not, selects the
+// next weapon to use.
+//
+//---------------------------------------------------------------------------
+
+boolean P_CheckAmmo(player_t * player)
+{
+    ammotype_t ammo;
+    int *ammoUse;
+    int count;
+
+    ammo = wpnlev1info[player->readyweapon].ammo;
+    if (player->powers[pw_weaponlevel2] && !deathmatch)
+    {
+        ammoUse = WeaponAmmoUsePL2;
+    }
+    else
+    {
+        ammoUse = WeaponAmmoUsePL1;
+    }
+    count = ammoUse[player->readyweapon];
+    if (ammo == am_noammo || player->ammo[ammo] >= count)
+    {
+        return (true);
+    }
+    // out of ammo, pick a weapon to change to
+    do
+    {
+        if (player->weaponowned[wp_skullrod]
+            && player->ammo[am_skullrod] > ammoUse[wp_skullrod])
+        {
+            player->pendingweapon = wp_skullrod;
+        }
+        else if (player->weaponowned[wp_blaster]
+                 && player->ammo[am_blaster] > ammoUse[wp_blaster])
+        {
+            player->pendingweapon = wp_blaster;
+        }
+        else if (player->weaponowned[wp_crossbow]
+                 && player->ammo[am_crossbow] > ammoUse[wp_crossbow])
+        {
+            player->pendingweapon = wp_crossbow;
+        }
+        else if (player->weaponowned[wp_mace]
+                 && player->ammo[am_mace] > ammoUse[wp_mace])
+        {
+            player->pendingweapon = wp_mace;
+        }
+        else if (player->ammo[am_goldwand] > ammoUse[wp_goldwand])
+        {
+            player->pendingweapon = wp_goldwand;
+        }
+        else if (player->weaponowned[wp_gauntlets])
+        {
+            player->pendingweapon = wp_gauntlets;
+        }
+        else if (player->weaponowned[wp_phoenixrod]
+                 && player->ammo[am_phoenixrod] > ammoUse[wp_phoenixrod])
+        {
+            player->pendingweapon = wp_phoenixrod;
+        }
+        else
+        {
+            player->pendingweapon = wp_staff;
+        }
+    }
+    while (player->pendingweapon == wp_nochange);
+    if (player->powers[pw_weaponlevel2])
+    {
+        P_SetPsprite(player, ps_weapon,
+                     wpnlev2info[player->readyweapon].downstate);
+    }
+    else
+    {
+        P_SetPsprite(player, ps_weapon,
+                     wpnlev1info[player->readyweapon].downstate);
+    }
+    return (false);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_FireWeapon
+//
+//---------------------------------------------------------------------------
+
+void P_FireWeapon(player_t * player)
+{
+    weaponinfo_t *wpinfo;
+    statenum_t attackState;
+
+    if (!P_CheckAmmo(player))
+    {
+        return;
+    }
+    P_SetMobjState(player->mo, S_PLAY_ATK2);
+    wpinfo = player->powers[pw_weaponlevel2] ? &wpnlev2info[0]
+        : &wpnlev1info[0];
+    attackState = player->refire ? wpinfo[player->readyweapon].holdatkstate
+        : wpinfo[player->readyweapon].atkstate;
+    P_SetPsprite(player, ps_weapon, attackState);
+    P_NoiseAlert(player->mo, player->mo);
+    if (player->readyweapon == wp_gauntlets && !player->refire)
+    {                           // Play the sound for the initial gauntlet attack
+        S_StartSound(player->mo, sfx_gntuse);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_DropWeapon
+//
+// The player died, so put the weapon away.
+//
+//---------------------------------------------------------------------------
+
+void P_DropWeapon(player_t * player)
+{
+    if (player->powers[pw_weaponlevel2])
+    {
+        P_SetPsprite(player, ps_weapon,
+                     wpnlev2info[player->readyweapon].downstate);
+    }
+    else
+    {
+        P_SetPsprite(player, ps_weapon,
+                     wpnlev1info[player->readyweapon].downstate);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_WeaponReady
+//
+// The player can fire the weapon or change to another weapon at this time.
+//
+//---------------------------------------------------------------------------
+
+void A_WeaponReady(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int angle;
+
+    if (player->chickenTics)
+    {                           // Change to the chicken beak
+        P_ActivateBeak(player);
+        return;
+    }
+    // Change player from attack state
+    if (player->mo->state == &states[S_PLAY_ATK1]
+        || player->mo->state == &states[S_PLAY_ATK2])
+    {
+        P_SetMobjState(player->mo, S_PLAY);
+    }
+    // Check for staff PL2 active sound
+    if ((player->readyweapon == wp_staff)
+        && (psp->state == &states[S_STAFFREADY2_1]) && P_Random() < 128)
+    {
+        S_StartSound(player->mo, sfx_stfcrk);
+    }
+    // Put the weapon away if the player has a pending weapon or has
+    // died.
+    if (player->pendingweapon != wp_nochange || !player->health)
+    {
+        if (player->powers[pw_weaponlevel2])
+        {
+            P_SetPsprite(player, ps_weapon,
+                         wpnlev2info[player->readyweapon].downstate);
+        }
+        else
+        {
+            P_SetPsprite(player, ps_weapon,
+                         wpnlev1info[player->readyweapon].downstate);
+        }
+        return;
+    }
+
+    // Check for fire.  The phoenix rod does not auto fire.
+    if (player->cmd.buttons & BT_ATTACK)
+    {
+        if (!player->attackdown || (player->readyweapon != wp_phoenixrod))
+        {
+            player->attackdown = true;
+            P_FireWeapon(player);
+            return;
+        }
+    }
+    else
+    {
+        player->attackdown = false;
+    }
+
+    // Bob the weapon based on movement speed.
+    angle = (128 * leveltime) & FINEMASK;
+    psp->sx = FRACUNIT + FixedMul(player->bob, finecosine[angle]);
+    angle &= FINEANGLES / 2 - 1;
+    psp->sy = WEAPONTOP + FixedMul(player->bob, finesine[angle]);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_UpdateBeak
+//
+//---------------------------------------------------------------------------
+
+void P_UpdateBeak(player_t * player, pspdef_t * psp)
+{
+    psp->sy = WEAPONTOP + (player->chickenPeck << (FRACBITS - 1));
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_BeakReady
+//
+//---------------------------------------------------------------------------
+
+void A_BeakReady(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (player->cmd.buttons & BT_ATTACK)
+    {                           // Chicken beak attack
+        player->attackdown = true;
+        P_SetMobjState(player->mo, S_CHICPLAY_ATK1);
+        if (player->powers[pw_weaponlevel2])
+        {
+            P_SetPsprite(player, ps_weapon, S_BEAKATK2_1);
+        }
+        else
+        {
+            P_SetPsprite(player, ps_weapon, S_BEAKATK1_1);
+        }
+        P_NoiseAlert(player->mo, player->mo);
+    }
+    else
+    {
+        if (player->mo->state == &states[S_CHICPLAY_ATK1])
+        {                       // Take out of attack state
+            P_SetMobjState(player->mo, S_CHICPLAY);
+        }
+        player->attackdown = false;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_ReFire
+//
+// The player can re fire the weapon without lowering it entirely.
+//
+//---------------------------------------------------------------------------
+
+void A_ReFire(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if ((player->cmd.buttons & BT_ATTACK)
+        && player->pendingweapon == wp_nochange && player->health)
+    {
+        player->refire++;
+        P_FireWeapon(player);
+    }
+    else
+    {
+        player->refire = 0;
+        P_CheckAmmo(player);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_Lower
+//
+//---------------------------------------------------------------------------
+
+void A_Lower(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (player->chickenTics)
+    {
+        psp->sy = WEAPONBOTTOM;
+    }
+    else
+    {
+        psp->sy += LOWERSPEED;
+    }
+    if (psp->sy < WEAPONBOTTOM)
+    {                           // Not lowered all the way yet
+        return;
+    }
+    if (player->playerstate == PST_DEAD)
+    {                           // Player is dead, so don't bring up a pending weapon
+        psp->sy = WEAPONBOTTOM;
+        return;
+    }
+    if (!player->health)
+    {                           // Player is dead, so keep the weapon off screen
+        P_SetPsprite(player, ps_weapon, S_NULL);
+        return;
+    }
+    player->readyweapon = player->pendingweapon;
+    P_BringUpWeapon(player);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_BeakRaise
+//
+//---------------------------------------------------------------------------
+
+void A_BeakRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    psp->sy = WEAPONTOP;
+    P_SetPsprite(player, ps_weapon,
+                 wpnlev1info[player->readyweapon].readystate);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_Raise
+//
+//---------------------------------------------------------------------------
+
+void A_Raise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    psp->sy -= RAISESPEED;
+    if (psp->sy > WEAPONTOP)
+    {                           // Not raised all the way yet
+        return;
+    }
+    psp->sy = WEAPONTOP;
+    if (player->powers[pw_weaponlevel2])
+    {
+        P_SetPsprite(player, ps_weapon,
+                     wpnlev2info[player->readyweapon].readystate);
+    }
+    else
+    {
+        P_SetPsprite(player, ps_weapon,
+                     wpnlev1info[player->readyweapon].readystate);
+    }
+}
+
+/*
+===============
+=
+= P_BulletSlope
+=
+= Sets a slope so a near miss is at aproximately the height of the
+= intended target
+=
+===============
+*/
+
+void P_BulletSlope(mobj_t * mo)
+{
+    angle_t an;
+
+//
+// see which target is to be aimed at
+//
+    an = mo->angle;
+    bulletslope = P_AimLineAttack(mo, an, 16 * 64 * FRACUNIT);
+    if (!linetarget)
+    {
+        an += 1 << 26;
+        bulletslope = P_AimLineAttack(mo, an, 16 * 64 * FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2 << 26;
+            bulletslope = P_AimLineAttack(mo, an, 16 * 64 * FRACUNIT);
+        }
+        if (!linetarget)
+        {
+            an += 2 << 26;
+            bulletslope = (mo->player->lookdir << FRACBITS) / 173;
+        }
+    }
+}
+
+//****************************************************************************
+//
+// WEAPON ATTACKS
+//
+//****************************************************************************
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BeakAttackPL1
+//
+//----------------------------------------------------------------------------
+
+void A_BeakAttackPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+
+    damage = 1 + (P_Random() & 3);
+    angle = player->mo->angle;
+    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
+    PuffType = MT_BEAKPUFF;
+    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
+    if (linetarget)
+    {
+        player->mo->angle = R_PointToAngle2(player->mo->x,
+                                            player->mo->y, linetarget->x,
+                                            linetarget->y);
+    }
+    S_StartSound(player->mo, sfx_chicpk1 + (P_Random() % 3));
+    player->chickenPeck = 12;
+    psp->tics -= P_Random() & 7;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BeakAttackPL2
+//
+//----------------------------------------------------------------------------
+
+void A_BeakAttackPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+
+    damage = HITDICE(4);
+    angle = player->mo->angle;
+    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
+    PuffType = MT_BEAKPUFF;
+    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
+    if (linetarget)
+    {
+        player->mo->angle = R_PointToAngle2(player->mo->x,
+                                            player->mo->y, linetarget->x,
+                                            linetarget->y);
+    }
+    S_StartSound(player->mo, sfx_chicpk1 + (P_Random() % 3));
+    player->chickenPeck = 12;
+    psp->tics -= P_Random() & 3;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_StaffAttackPL1
+//
+//----------------------------------------------------------------------------
+
+void A_StaffAttackPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+
+    damage = 5 + (P_Random() & 15);
+    angle = player->mo->angle;
+    angle += P_SubRandom() << 18;
+    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
+    PuffType = MT_STAFFPUFF;
+    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
+    if (linetarget)
+    {
+        //S_StartSound(player->mo, sfx_stfhit);
+        // turn to face target
+        player->mo->angle = R_PointToAngle2(player->mo->x,
+                                            player->mo->y, linetarget->x,
+                                            linetarget->y);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_StaffAttackPL2
+//
+//----------------------------------------------------------------------------
+
+void A_StaffAttackPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+
+    // P_inter.c:P_DamageMobj() handles target momentums
+    damage = 18 + (P_Random() & 63);
+    angle = player->mo->angle;
+    angle += P_SubRandom() << 18;
+    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
+    PuffType = MT_STAFFPUFF2;
+    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
+    if (linetarget)
+    {
+        //S_StartSound(player->mo, sfx_stfpow);
+        // turn to face target
+        player->mo->angle = R_PointToAngle2(player->mo->x,
+                                            player->mo->y, linetarget->x,
+                                            linetarget->y);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireBlasterPL1
+//
+//----------------------------------------------------------------------------
+
+void A_FireBlasterPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+    int damage;
+
+    mo = player->mo;
+    S_StartSound(mo, sfx_gldhit);
+    player->ammo[am_blaster] -= USE_BLSR_AMMO_1;
+    P_BulletSlope(mo);
+    damage = HITDICE(4);
+    angle = mo->angle;
+    if (player->refire)
+    {
+        angle += P_SubRandom() << 18;
+    }
+    PuffType = MT_BLASTERPUFF1;
+    P_LineAttack(mo, angle, MISSILERANGE, bulletslope, damage);
+    S_StartSound(player->mo, sfx_blssht);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireBlasterPL2
+//
+//----------------------------------------------------------------------------
+
+void A_FireBlasterPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    player->ammo[am_blaster] -=
+        deathmatch ? USE_BLSR_AMMO_1 : USE_BLSR_AMMO_2;
+    mo = P_SpawnPlayerMissile(player->mo, MT_BLASTERFX1);
+    if (mo)
+    {
+        mo->thinker.function = P_BlasterMobjThinker;
+    }
+    S_StartSound(player->mo, sfx_blssht);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireGoldWandPL1
+//
+//----------------------------------------------------------------------------
+
+void A_FireGoldWandPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+    int damage;
+
+    mo = player->mo;
+    player->ammo[am_goldwand] -= USE_GWND_AMMO_1;
+    P_BulletSlope(mo);
+    damage = 7 + (P_Random() & 7);
+    angle = mo->angle;
+    if (player->refire)
+    {
+        angle += P_SubRandom() << 18;
+    }
+    PuffType = MT_GOLDWANDPUFF1;
+    P_LineAttack(mo, angle, MISSILERANGE, bulletslope, damage);
+    S_StartSound(player->mo, sfx_gldhit);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireGoldWandPL2
+//
+//----------------------------------------------------------------------------
+
+void A_FireGoldWandPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    mobj_t *mo;
+    angle_t angle;
+    int damage;
+    fixed_t momz;
+
+    mo = player->mo;
+    player->ammo[am_goldwand] -=
+        deathmatch ? USE_GWND_AMMO_1 : USE_GWND_AMMO_2;
+    PuffType = MT_GOLDWANDPUFF2;
+    P_BulletSlope(mo);
+    momz = FixedMul(mobjinfo[MT_GOLDWANDFX2].speed, bulletslope);
+    P_SpawnMissileAngle(mo, MT_GOLDWANDFX2, mo->angle - (ANG45 / 8), momz);
+    P_SpawnMissileAngle(mo, MT_GOLDWANDFX2, mo->angle + (ANG45 / 8), momz);
+    angle = mo->angle - (ANG45 / 8);
+    for (i = 0; i < 5; i++)
+    {
+        damage = 1 + (P_Random() & 7);
+        P_LineAttack(mo, angle, MISSILERANGE, bulletslope, damage);
+        angle += ((ANG45 / 8) * 2) / 4;
+    }
+    S_StartSound(player->mo, sfx_gldhit);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireMacePL1B
+//
+//----------------------------------------------------------------------------
+
+void A_FireMacePL1B(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *pmo;
+    mobj_t *ball;
+    angle_t angle;
+
+    if (player->ammo[am_mace] < USE_MACE_AMMO_1)
+    {
+        return;
+    }
+    player->ammo[am_mace] -= USE_MACE_AMMO_1;
+    pmo = player->mo;
+
+    // Vanilla bug here:
+    // Original code here looks like:
+    //   (pmo->flags2 & MF2_FEETARECLIPPED != 0)
+    // C's operator precedence interprets this as:
+    //   (pmo->flags2 & (MF2_FEETARECLIPPED != 0))
+    // Which simplifies to:
+    //   (pmo->flags2 & 1)
+    ball = P_SpawnMobj(pmo->x, pmo->y, pmo->z + 28 * FRACUNIT
+                       - FOOTCLIPSIZE * (pmo->flags2 & 1), MT_MACEFX2);
+
+    ball->momz = 2 * FRACUNIT + ((player->lookdir) << (FRACBITS - 5));
+    angle = pmo->angle;
+    ball->target = pmo;
+    ball->angle = angle;
+    ball->z += (player->lookdir) << (FRACBITS - 4);
+    angle >>= ANGLETOFINESHIFT;
+    ball->momx = (pmo->momx >> 1)
+        + FixedMul(ball->info->speed, finecosine[angle]);
+    ball->momy = (pmo->momy >> 1)
+        + FixedMul(ball->info->speed, finesine[angle]);
+    S_StartSound(ball, sfx_lobsht);
+    P_CheckMissileSpawn(ball);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireMacePL1
+//
+//----------------------------------------------------------------------------
+
+void A_FireMacePL1(mobj_t *mobj, player_t * player, pspdef_t * psp)
+{
+    mobj_t *ball;
+
+    if (P_Random() < 28)
+    {
+        A_FireMacePL1B(mobj, player, psp);
+        return;
+    }
+    if (player->ammo[am_mace] < USE_MACE_AMMO_1)
+    {
+        return;
+    }
+    player->ammo[am_mace] -= USE_MACE_AMMO_1;
+    psp->sx = ((P_Random() & 3) - 2) * FRACUNIT;
+    psp->sy = WEAPONTOP + (P_Random() & 3) * FRACUNIT;
+    ball = P_SPMAngle(player->mo, MT_MACEFX1, player->mo->angle
+                      + (((P_Random() & 7) - 4) << 24));
+    if (ball)
+    {
+        ball->special1.i = 16;    // tics till dropoff
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MacePL1Check
+//
+//----------------------------------------------------------------------------
+
+void A_MacePL1Check(mobj_t * ball, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+
+    if (ball->special1.i == 0)
+    {
+        return;
+    }
+    ball->special1.i -= 4;
+    if (ball->special1.i > 0)
+    {
+        return;
+    }
+    ball->special1.i = 0;
+    ball->flags2 |= MF2_LOGRAV;
+    angle = ball->angle >> ANGLETOFINESHIFT;
+    ball->momx = FixedMul(7 * FRACUNIT, finecosine[angle]);
+    ball->momy = FixedMul(7 * FRACUNIT, finesine[angle]);
+    ball->momz -= ball->momz >> 1;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MaceBallImpact
+//
+//----------------------------------------------------------------------------
+
+void A_MaceBallImpact(mobj_t * ball, player_t *player, pspdef_t *psp)
+{
+    if ((ball->z <= ball->floorz) && (P_HitFloor(ball) != FLOOR_SOLID))
+    {                           // Landed in some sort of liquid
+        P_RemoveMobj(ball);
+        return;
+    }
+    if ((ball->health != MAGIC_JUNK) && (ball->z <= ball->floorz)
+        && ball->momz)
+    {                           // Bounce
+        ball->health = MAGIC_JUNK;
+        ball->momz = (ball->momz * 192) >> 8;
+        ball->flags2 &= ~MF2_FLOORBOUNCE;
+        P_SetMobjState(ball, ball->info->spawnstate);
+        S_StartSound(ball, sfx_bounce);
+    }
+    else
+    {                           // Explode
+        ball->flags |= MF_NOGRAVITY;
+        ball->flags2 &= ~MF2_LOGRAV;
+        S_StartSound(ball, sfx_lobhit);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MaceBallImpact2
+//
+//----------------------------------------------------------------------------
+
+void A_MaceBallImpact2(mobj_t * ball, player_t *player, pspdef_t *psp)
+{
+    mobj_t *tiny;
+    angle_t angle;
+
+    if ((ball->z <= ball->floorz) && (P_HitFloor(ball) != FLOOR_SOLID))
+    {                           // Landed in some sort of liquid
+        P_RemoveMobj(ball);
+        return;
+    }
+    if ((ball->z != ball->floorz) || (ball->momz < 2 * FRACUNIT))
+    {                           // Explode
+        ball->momx = ball->momy = ball->momz = 0;
+        ball->flags |= MF_NOGRAVITY;
+        ball->flags2 &= ~(MF2_LOGRAV | MF2_FLOORBOUNCE);
+    }
+    else
+    {                           // Bounce
+        ball->momz = (ball->momz * 192) >> 8;
+        P_SetMobjState(ball, ball->info->spawnstate);
+
+        tiny = P_SpawnMobj(ball->x, ball->y, ball->z, MT_MACEFX3);
+        angle = ball->angle + ANG90;
+        tiny->target = ball->target;
+        tiny->angle = angle;
+        angle >>= ANGLETOFINESHIFT;
+        tiny->momx = (ball->momx >> 1) + FixedMul(ball->momz - FRACUNIT,
+                                                  finecosine[angle]);
+        tiny->momy = (ball->momy >> 1) + FixedMul(ball->momz - FRACUNIT,
+                                                  finesine[angle]);
+        tiny->momz = ball->momz;
+        P_CheckMissileSpawn(tiny);
+
+        tiny = P_SpawnMobj(ball->x, ball->y, ball->z, MT_MACEFX3);
+        angle = ball->angle - ANG90;
+        tiny->target = ball->target;
+        tiny->angle = angle;
+        angle >>= ANGLETOFINESHIFT;
+        tiny->momx = (ball->momx >> 1) + FixedMul(ball->momz - FRACUNIT,
+                                                  finecosine[angle]);
+        tiny->momy = (ball->momy >> 1) + FixedMul(ball->momz - FRACUNIT,
+                                                  finesine[angle]);
+        tiny->momz = ball->momz;
+        P_CheckMissileSpawn(tiny);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireMacePL2
+//
+//----------------------------------------------------------------------------
+
+void A_FireMacePL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    player->ammo[am_mace] -= deathmatch ? USE_MACE_AMMO_1 : USE_MACE_AMMO_2;
+    mo = P_SpawnPlayerMissile(player->mo, MT_MACEFX4);
+    if (mo)
+    {
+        mo->momx += player->mo->momx;
+        mo->momy += player->mo->momy;
+        mo->momz = 2 * FRACUNIT + ((player->lookdir) << (FRACBITS - 5));
+        if (linetarget)
+        {
+            mo->special1.m = linetarget;
+        }
+    }
+    S_StartSound(player->mo, sfx_lobsht);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_DeathBallImpact
+//
+//----------------------------------------------------------------------------
+
+void A_DeathBallImpact(mobj_t * ball, player_t *player, pspdef_t *psp)
+{
+    int i;
+    mobj_t *target;
+    angle_t angle;
+    boolean newAngle;
+
+    if ((ball->z <= ball->floorz) && (P_HitFloor(ball) != FLOOR_SOLID))
+    {                           // Landed in some sort of liquid
+        P_RemoveMobj(ball);
+        return;
+    }
+    if ((ball->z <= ball->floorz) && ball->momz)
+    {                           // Bounce
+        newAngle = false;
+        target = (mobj_t *) ball->special1.m;
+        if (target)
+        {
+            if (!(target->flags & MF_SHOOTABLE))
+            {                   // Target died
+                ball->special1.m = NULL;
+            }
+            else
+            {                   // Seek
+                angle = R_PointToAngle2(ball->x, ball->y,
+                                        target->x, target->y);
+                newAngle = true;
+            }
+        }
+        else
+        {                       // Find new target
+            angle = 0;
+            for (i = 0; i < 16; i++)
+            {
+                P_AimLineAttack(ball, angle, 10 * 64 * FRACUNIT);
+                if (linetarget && ball->target != linetarget)
+                {
+                    ball->special1.m = linetarget;
+                    angle = R_PointToAngle2(ball->x, ball->y,
+                                            linetarget->x, linetarget->y);
+                    newAngle = true;
+                    break;
+                }
+                angle += ANG45 / 2;
+            }
+        }
+        if (newAngle)
+        {
+            ball->angle = angle;
+            angle >>= ANGLETOFINESHIFT;
+            ball->momx = FixedMul(ball->info->speed, finecosine[angle]);
+            ball->momy = FixedMul(ball->info->speed, finesine[angle]);
+        }
+        P_SetMobjState(ball, ball->info->spawnstate);
+        S_StartSound(ball, sfx_pstop);
+    }
+    else
+    {                           // Explode
+        ball->flags |= MF_NOGRAVITY;
+        ball->flags2 &= ~MF2_LOGRAV;
+        S_StartSound(ball, sfx_phohit);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SpawnRippers
+//
+//----------------------------------------------------------------------------
+
+void A_SpawnRippers(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    unsigned int i;
+    angle_t angle;
+    mobj_t *ripper;
+
+    for (i = 0; i < 8; i++)
+    {
+        ripper = P_SpawnMobj(actor->x, actor->y, actor->z, MT_RIPPER);
+        angle = i * ANG45;
+        ripper->target = actor->target;
+        ripper->angle = angle;
+        angle >>= ANGLETOFINESHIFT;
+        ripper->momx = FixedMul(ripper->info->speed, finecosine[angle]);
+        ripper->momy = FixedMul(ripper->info->speed, finesine[angle]);
+        P_CheckMissileSpawn(ripper);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireCrossbowPL1
+//
+//----------------------------------------------------------------------------
+
+void A_FireCrossbowPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *pmo;
+
+    pmo = player->mo;
+    player->ammo[am_crossbow] -= USE_CBOW_AMMO_1;
+    P_SpawnPlayerMissile(pmo, MT_CRBOWFX1);
+    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle - (ANG45 / 10));
+    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle + (ANG45 / 10));
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireCrossbowPL2
+//
+//----------------------------------------------------------------------------
+
+void A_FireCrossbowPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *pmo;
+
+    pmo = player->mo;
+    player->ammo[am_crossbow] -=
+        deathmatch ? USE_CBOW_AMMO_1 : USE_CBOW_AMMO_2;
+    P_SpawnPlayerMissile(pmo, MT_CRBOWFX2);
+    P_SPMAngle(pmo, MT_CRBOWFX2, pmo->angle - (ANG45 / 10));
+    P_SPMAngle(pmo, MT_CRBOWFX2, pmo->angle + (ANG45 / 10));
+    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle - (ANG45 / 5));
+    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle + (ANG45 / 5));
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_BoltSpark
+//
+//----------------------------------------------------------------------------
+
+void A_BoltSpark(mobj_t * bolt, player_t *player, pspdef_t *psp)
+{
+    mobj_t *spark;
+
+    if (P_Random() > 50)
+    {
+        spark = P_SpawnMobj(bolt->x, bolt->y, bolt->z, MT_CRBOWFX4);
+        spark->x += P_SubRandom() << 10;
+        spark->y += P_SubRandom() << 10;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireSkullRodPL1
+//
+//----------------------------------------------------------------------------
+
+void A_FireSkullRodPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    if (player->ammo[am_skullrod] < USE_SKRD_AMMO_1)
+    {
+        return;
+    }
+    player->ammo[am_skullrod] -= USE_SKRD_AMMO_1;
+    mo = P_SpawnPlayerMissile(player->mo, MT_HORNRODFX1);
+    // Randomize the first frame
+    if (mo && P_Random() > 128)
+    {
+        P_SetMobjState(mo, S_HRODFX1_2);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireSkullRodPL2
+//
+// The special2 field holds the player number that shot the rain missile.
+// The special1 field is used for the seeking routines, then as a counter
+// for the sound looping.
+//
+//----------------------------------------------------------------------------
+
+void A_FireSkullRodPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->ammo[am_skullrod] -=
+        deathmatch ? USE_SKRD_AMMO_1 : USE_SKRD_AMMO_2;
+    P_SpawnPlayerMissile(player->mo, MT_HORNRODFX2);
+    // Use MissileMobj instead of the return value from
+    // P_SpawnPlayerMissile because we need to give info to the mobj
+    // even if it exploded immediately.
+    if (netgame)
+    {                           // Multi-player game
+        MissileMobj->special2.i = P_GetPlayerNum(player);
+    }
+    else
+    {                           // Always use red missiles in single player games
+        MissileMobj->special2.i = 2;
+    }
+    if (linetarget)
+    {
+        MissileMobj->special1.m = linetarget;
+    }
+    S_StartSound(MissileMobj, sfx_hrnpow);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SkullRodPL2Seek
+//
+//----------------------------------------------------------------------------
+
+void A_SkullRodPL2Seek(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 30);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_AddPlayerRain
+//
+//----------------------------------------------------------------------------
+
+void A_AddPlayerRain(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    int playerNum;
+    player_t *player;
+
+    playerNum = netgame ? actor->special2.i : 0;
+    if (!playeringame[playerNum])
+    {                           // Player left the game
+        return;
+    }
+    player = &players[playerNum];
+    if (player->health <= 0)
+    {                           // Player is dead
+        return;
+    }
+    if (player->rain1 && player->rain2)
+    {                           // Terminate an active rain
+        if (player->rain1->health < player->rain2->health)
+        {
+            if (player->rain1->health > 16)
+            {
+                player->rain1->health = 16;
+            }
+            player->rain1 = NULL;
+        }
+        else
+        {
+            if (player->rain2->health > 16)
+            {
+                player->rain2->health = 16;
+            }
+            player->rain2 = NULL;
+        }
+    }
+    // Add rain mobj to list
+    if (player->rain1)
+    {
+        player->rain2 = actor;
+    }
+    else
+    {
+        player->rain1 = actor;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SkullRodStorm
+//
+//----------------------------------------------------------------------------
+
+void A_SkullRodStorm(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    fixed_t x;
+    fixed_t y;
+    mobj_t *mo;
+    int playerNum;
+    player_t *player;
+
+    if (actor->health-- == 0)
+    {
+        P_SetMobjState(actor, S_NULL);
+        playerNum = netgame ? actor->special2.i : 0;
+        if (!playeringame[playerNum])
+        {                       // Player left the game
+            return;
+        }
+        player = &players[playerNum];
+        if (player->health <= 0)
+        {                       // Player is dead
+            return;
+        }
+        if (player->rain1 == actor)
+        {
+            player->rain1 = NULL;
+        }
+        else if (player->rain2 == actor)
+        {
+            player->rain2 = NULL;
+        }
+        return;
+    }
+    if (P_Random() < 25)
+    {                           // Fudge rain frequency
+        return;
+    }
+    x = actor->x + ((P_Random() & 127) - 64) * FRACUNIT;
+    y = actor->y + ((P_Random() & 127) - 64) * FRACUNIT;
+    mo = P_SpawnMobj(x, y, ONCEILINGZ, MT_RAINPLR1 + actor->special2.i);
+    mo->target = actor->target;
+    mo->momx = 1;               // Force collision detection
+    mo->momz = -mo->info->speed;
+    mo->special2.i = actor->special2.i;     // Transfer player number
+    P_CheckMissileSpawn(mo);
+    if (!(actor->special1.i & 31))
+    {
+        S_StartSound(actor, sfx_ramrain);
+    }
+    actor->special1.i++;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_RainImpact
+//
+//----------------------------------------------------------------------------
+
+void A_RainImpact(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->z > actor->floorz)
+    {
+        P_SetMobjState(actor, S_RAINAIRXPLR1_1 + actor->special2.i);
+    }
+    else if (P_Random() < 40)
+    {
+        P_HitFloor(actor);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_HideInCeiling
+//
+//----------------------------------------------------------------------------
+
+void A_HideInCeiling(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->z = actor->ceilingz + 4 * FRACUNIT;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FirePhoenixPL1
+//
+//----------------------------------------------------------------------------
+
+void A_FirePhoenixPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+
+    player->ammo[am_phoenixrod] -= USE_PHRD_AMMO_1;
+    P_SpawnPlayerMissile(player->mo, MT_PHOENIXFX1);
+    //P_SpawnPlayerMissile(player->mo, MT_MNTRFX2);
+    angle = player->mo->angle + ANG180;
+    angle >>= ANGLETOFINESHIFT;
+    player->mo->momx += FixedMul(4 * FRACUNIT, finecosine[angle]);
+    player->mo->momy += FixedMul(4 * FRACUNIT, finesine[angle]);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_PhoenixPuff
+//
+//----------------------------------------------------------------------------
+
+void A_PhoenixPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *puff;
+    angle_t angle;
+
+    P_SeekerMissile(actor, ANG1_X * 5, ANG1_X * 10);
+    puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
+    angle = actor->angle + ANG90;
+    angle >>= ANGLETOFINESHIFT;
+    puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]);
+    puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]);
+    puff->momz = 0;
+    puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
+    angle = actor->angle - ANG90;
+    angle >>= ANGLETOFINESHIFT;
+    puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]);
+    puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]);
+    puff->momz = 0;
+}
+
+//
+// This function was present in the Heretic 1.0 executable for the
+// removed "secondary phoenix flash" object (MT_PHOENIXFX_REMOVED).
+// The purpose of this object is unknown, as is this function.
+//
+
+void A_RemovedPhoenixFunc(mobj_t *actor, player_t * player, pspdef_t * psp)
+{
+    I_Error("Action function invoked for removed Phoenix action!");
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_InitPhoenixPL2
+//
+//----------------------------------------------------------------------------
+
+void A_InitPhoenixPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->flamecount = FLAME_THROWER_TICS;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FirePhoenixPL2
+//
+// Flame thrower effect.
+//
+//----------------------------------------------------------------------------
+
+void A_FirePhoenixPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    mobj_t *pmo;
+    angle_t angle;
+    fixed_t x, y, z;
+    fixed_t slope;
+
+    if (--player->flamecount == 0)
+    {                           // Out of flame
+        P_SetPsprite(player, ps_weapon, S_PHOENIXATK2_4);
+        player->refire = 0;
+        return;
+    }
+    pmo = player->mo;
+    angle = pmo->angle;
+    x = pmo->x + (P_SubRandom() << 9);
+    y = pmo->y + (P_SubRandom() << 9);
+    z = pmo->z + 26 * FRACUNIT + ((player->lookdir) << FRACBITS) / 173;
+    if (pmo->flags2 & MF2_FEETARECLIPPED)
+    {
+        z -= FOOTCLIPSIZE;
+    }
+    slope = ((player->lookdir) << FRACBITS) / 173 + (FRACUNIT / 10);
+    mo = P_SpawnMobj(x, y, z, MT_PHOENIXFX2);
+    mo->target = pmo;
+    mo->angle = angle;
+    mo->momx = pmo->momx + FixedMul(mo->info->speed,
+                                    finecosine[angle >> ANGLETOFINESHIFT]);
+    mo->momy = pmo->momy + FixedMul(mo->info->speed,
+                                    finesine[angle >> ANGLETOFINESHIFT]);
+    mo->momz = FixedMul(mo->info->speed, slope);
+    if (!player->refire || !(leveltime % 38))
+    {
+        S_StartSound(player->mo, sfx_phopow);
+    }
+    P_CheckMissileSpawn(mo);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_ShutdownPhoenixPL2
+//
+//----------------------------------------------------------------------------
+
+void A_ShutdownPhoenixPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->ammo[am_phoenixrod] -= USE_PHRD_AMMO_2;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FlameEnd
+//
+//----------------------------------------------------------------------------
+
+void A_FlameEnd(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->momz += (fixed_t)(1.5 * FRACUNIT);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FloatPuff
+//
+//----------------------------------------------------------------------------
+
+void A_FloatPuff(mobj_t * puff, player_t *player, pspdef_t *psp)
+{
+    puff->momz += (fixed_t)(1.8 * FRACUNIT);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_GauntletAttack
+//
+//---------------------------------------------------------------------------
+
+void A_GauntletAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+    int randVal;
+    fixed_t dist;
+
+    psp->sx = ((P_Random() & 3) - 2) * FRACUNIT;
+    psp->sy = WEAPONTOP + (P_Random() & 3) * FRACUNIT;
+    angle = player->mo->angle;
+    if (player->powers[pw_weaponlevel2])
+    {
+        damage = HITDICE(2);
+        dist = 4 * MELEERANGE;
+        angle += P_SubRandom() << 17;
+        PuffType = MT_GAUNTLETPUFF2;
+    }
+    else
+    {
+        damage = HITDICE(2);
+        dist = MELEERANGE + 1;
+        angle += P_SubRandom() << 18;
+        PuffType = MT_GAUNTLETPUFF1;
+    }
+    slope = P_AimLineAttack(player->mo, angle, dist);
+    P_LineAttack(player->mo, angle, dist, slope, damage);
+    if (!linetarget)
+    {
+        if (P_Random() > 64)
+        {
+            player->extralight = !player->extralight;
+        }
+        S_StartSound(player->mo, sfx_gntful);
+        return;
+    }
+    randVal = P_Random();
+    if (randVal < 64)
+    {
+        player->extralight = 0;
+    }
+    else if (randVal < 160)
+    {
+        player->extralight = 1;
+    }
+    else
+    {
+        player->extralight = 2;
+    }
+    if (player->powers[pw_weaponlevel2])
+    {
+        P_GiveBody(player, damage >> 1);
+        S_StartSound(player->mo, sfx_gntpow);
+    }
+    else
+    {
+        S_StartSound(player->mo, sfx_gnthit);
+    }
+    // turn to face target
+    angle = R_PointToAngle2(player->mo->x, player->mo->y,
+                            linetarget->x, linetarget->y);
+    if (angle - player->mo->angle > ANG180)
+    {
+        if ((signed int) (angle - player->mo->angle) < -ANG90 / 20)
+            player->mo->angle = angle + ANG90 / 21;
+        else
+            player->mo->angle -= ANG90 / 20;
+    }
+    else
+    {
+        if (angle - player->mo->angle > ANG90 / 20)
+            player->mo->angle = angle - ANG90 / 21;
+        else
+            player->mo->angle += ANG90 / 20;
+    }
+    player->mo->flags |= MF_JUSTATTACKED;
+}
+
+void A_Light0(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->extralight = 0;
+}
+
+void A_Light1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->extralight = 1;
+}
+
+void A_Light2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->extralight = 2;
+}
+
+//------------------------------------------------------------------------
+//
+// PROC P_SetupPsprites
+//
+// Called at start of level for each player
+//
+//------------------------------------------------------------------------
+
+void P_SetupPsprites(player_t * player)
+{
+    int i;
+
+    // Remove all psprites
+    for (i = 0; i < NUMPSPRITES; i++)
+    {
+        player->psprites[i].state = NULL;
+    }
+    // Spawn the ready weapon
+    player->pendingweapon = player->readyweapon;
+    P_BringUpWeapon(player);
+}
+
+//------------------------------------------------------------------------
+//
+// PROC P_MovePsprites
+//
+// Called every tic by player thinking routine
+//
+//------------------------------------------------------------------------
+
+void P_MovePsprites(player_t * player)
+{
+    int i;
+    pspdef_t *psp;
+
+    psp = &player->psprites[0];
+    for (i = 0; i < NUMPSPRITES; i++, psp++)
+    {
+        if (psp->state != 0)  // a null state means not active
+        {
+            // drop tic count and possibly change state
+            if (psp->tics != -1)        // a -1 tic count never changes
+            {
+                psp->tics--;
+                if (!psp->tics)
+                {
+                    P_SetPsprite(player, i, psp->state->nextstate);
+                }
+            }
+        }
+    }
+    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
+    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
+}
diff --git a/games/NXDoom/src/heretic/p_saveg.c b/games/NXDoom/src/heretic/p_saveg.c
new file mode 100644
index 000000000..c4a2f131d
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_saveg.c
@@ -0,0 +1,1925 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_tick.c
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "v_video.h"
+
+static FILE *SaveGameFP;
+
+int vanilla_savegame_limit = 1;
+
+
+//==========================================================================
+//
+// SV_Filename
+//
+// Generate the filename to use for a particular savegame slot.
+// Returns a malloc()'d buffer that must be freed by the caller.
+//
+//==========================================================================
+
+char *SV_Filename(int slot)
+{
+    char *filename;
+    size_t filename_len;
+
+    filename_len = strlen(savegamedir) + strlen(SAVEGAMENAME) + 8;
+    filename = malloc(filename_len);
+    M_snprintf(filename, filename_len,
+               "%s" SAVEGAMENAME "%d.hsg", savegamedir, slot);
+
+    return filename;
+}
+
+//==========================================================================
+//
+// SV_Open
+//
+//==========================================================================
+
+void SV_Open(char *fileName)
+{
+    SaveGameFP = M_fopen(fileName, "wb");
+}
+
+void SV_OpenRead(char *filename)
+{
+    SaveGameFP = M_fopen(filename, "rb");
+
+    if (SaveGameFP == NULL)
+    {
+        I_Error("Could not load savegame %s", filename);
+    }
+}
+
+//==========================================================================
+//
+// SV_WriteSaveGameEOF
+//
+//==========================================================================
+
+void SV_WriteSaveGameEOF(void)
+{
+    SV_WriteByte(SAVE_GAME_TERMINATOR);
+
+    // Enforce the same savegame size limit as in Vanilla Heretic
+
+    if (vanilla_savegame_limit && ftell(SaveGameFP) > SAVEGAMESIZE)
+    {
+        I_Error("Savegame buffer overrun");
+    }
+}
+
+//==========================================================================
+//
+// SV_Close
+//
+//==========================================================================
+
+void SV_Close(void)
+{
+    if (SaveGameFP)
+    {
+        fclose(SaveGameFP);
+        SaveGameFP = NULL;
+    }
+}
+
+//==========================================================================
+//
+// SV_Write
+//
+//==========================================================================
+
+void SV_Write(void *buffer, int size)
+{
+    fwrite(buffer, size, 1, SaveGameFP);
+}
+
+void SV_WriteByte(byte val)
+{
+    SV_Write(&val, sizeof(byte));
+}
+
+void SV_WriteWord(unsigned short val)
+{
+    val = SHORT(val);
+    SV_Write(&val, sizeof(unsigned short));
+}
+
+void SV_WriteLong(unsigned int val)
+{
+    val = LONG(val);
+    SV_Write(&val, sizeof(int));
+}
+
+void SV_WritePtr(const void *ptr)
+{
+    long val = (long)(intptr_t) ptr;
+
+    SV_WriteLong(val & 0xffffffff);
+}
+
+//==========================================================================
+//
+// SV_Read
+//
+//==========================================================================
+
+void SV_Read(void *buffer, int size)
+{
+    int retval = fread(buffer, 1, size, SaveGameFP);
+    if (retval != size)
+    {
+        I_Error("Incomplete read in SV_Read: Expected %d, got %d bytes",
+            size, retval);
+    }
+}
+
+byte SV_ReadByte(void)
+{
+    byte result;
+    SV_Read(&result, sizeof(byte));
+    return result;
+}
+
+uint16_t SV_ReadWord(void)
+{
+    uint16_t result;
+    SV_Read(&result, sizeof(unsigned short));
+    return SHORT(result);
+}
+
+uint32_t SV_ReadLong(void)
+{
+    uint32_t result;
+    SV_Read(&result, sizeof(int));
+    return LONG(result);
+}
+
+//
+// ticcmd_t
+//
+
+static void saveg_read_ticcmd_t(ticcmd_t *str)
+{
+    // char forwardmove;
+    str->forwardmove = SV_ReadByte();
+
+    // char sidemove;
+    str->sidemove = SV_ReadByte();
+
+    // short angleturn;
+    str->angleturn = SV_ReadWord();
+
+    // short consistancy;
+    str->consistancy = SV_ReadWord();
+
+    // byte chatchar;
+    str->chatchar = SV_ReadByte();
+
+    // byte buttons;
+    str->buttons = SV_ReadByte();
+
+    // byte lookfly;
+    str->lookfly = SV_ReadByte();
+
+    // byte arti;
+    str->arti = SV_ReadByte();
+}
+
+static void saveg_write_ticcmd_t(ticcmd_t *str)
+{
+    // char forwardmove;
+    SV_WriteByte(str->forwardmove);
+
+    // char sidemove;
+    SV_WriteByte(str->sidemove);
+
+    // short angleturn;
+    SV_WriteWord(str->angleturn);
+
+    // short consistancy;
+    SV_WriteWord(str->consistancy);
+
+    // byte chatchar;
+    SV_WriteByte(str->chatchar);
+
+    // byte buttons;
+    SV_WriteByte(str->buttons);
+
+    // byte lookfly;
+    SV_WriteByte(str->lookfly);
+
+    // byte arti;
+    SV_WriteByte(str->arti);
+}
+
+//
+// inventory_t
+//
+
+static void saveg_read_inventory_t(inventory_t *str)
+{
+    // int type;
+    str->type = SV_ReadLong();
+
+    // int count;
+    str->count = SV_ReadLong();
+}
+
+static void saveg_write_inventory_t(inventory_t *str)
+{
+    // int type;
+    SV_WriteLong(str->type);
+
+    // int count;
+    SV_WriteLong(str->count);
+}
+
+
+//
+// state_t *
+//
+
+static void saveg_read_state_ptr(state_t **state)
+{
+    int statenum;
+
+    statenum = SV_ReadLong();
+
+    // We have read a state number, but it is indexed according to the state
+    // table in Vanilla Heretic v1.3. To support v1.0 HHE patches we have
+    // three extra states, so map the state number to our internal state
+    // number.
+
+    if (statenum >= S_PHOENIXFXIX_1)
+    {
+        statenum = (statenum - S_PHOENIXFXIX_1) + S_PHOENIXPUFF1;
+    }
+
+    if (statenum == 0)
+    {
+        *state = NULL;
+    }
+    else
+    {
+        *state = &states[statenum];
+    }
+}
+
+static void saveg_write_state_ptr(state_t *state)
+{
+    int statenum;
+
+    // NULL states are just written as zero.
+
+    if (state == NULL)
+    {
+        SV_WriteLong(0);
+        return;
+    }
+
+    statenum = state - states;
+
+    // Our internal state table has three extra states than Vanilla, so map
+    // to the state numbers used by Vanilla Heretic v1.3 for savegame
+    // compatibility.
+
+    if (statenum >= S_PHOENIXPUFF1)
+    {
+        statenum = (statenum - S_PHOENIXPUFF1) + S_PHOENIXFXIX_1;
+    }
+    else if (statenum >= S_PHOENIXFXIX_1)
+    {
+        // Now we're really in trouble. This state doesn't exist in Vanilla
+        // Heretic v1.3 (but does in v1.0). Map to a frame that might be
+        // vaguely sensible.
+
+        statenum = S_PHOENIXFXI1_8;
+    }
+
+    SV_WriteLong(statenum);
+}
+
+
+//
+// pspdef_t
+//
+
+static void saveg_read_pspdef_t(pspdef_t *str)
+{
+    // state_t *state;
+    saveg_read_state_ptr(&str->state);
+
+    // int tics;
+    str->tics = SV_ReadLong();
+
+    // fixed_t sx, sy;
+    str->sx = SV_ReadLong();
+    str->sy = SV_ReadLong();
+}
+
+static void saveg_write_pspdef_t(pspdef_t *str)
+{
+    // state_t *state;
+    saveg_write_state_ptr(str->state);
+
+    // int tics;
+    SV_WriteLong(str->tics);
+
+    // fixed_t sx, sy;
+    SV_WriteLong(str->sx);
+    SV_WriteLong(str->sy);
+}
+
+
+//
+// player_t
+//
+
+static void saveg_read_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t *mo;
+    SV_ReadLong();
+    str->mo = NULL;
+
+    // playerstate_t playerstate;
+    str->playerstate = SV_ReadLong();
+
+    // ticcmd_t cmd;
+    saveg_read_ticcmd_t(&str->cmd);
+
+    // fixed_t viewz;
+    str->viewz = SV_ReadLong();
+
+    // fixed_t viewheight;
+    str->viewheight = SV_ReadLong();
+
+    // fixed_t deltaviewheight;
+    str->deltaviewheight = SV_ReadLong();
+
+    // fixed_t bob;
+    str->bob = SV_ReadLong();
+
+    // int flyheight;
+    str->flyheight = SV_ReadLong();
+
+    // int lookdir;
+    str->lookdir = SV_ReadLong();
+
+    // boolean centering;
+    str->centering = SV_ReadLong();
+
+    // int health;
+    str->health = SV_ReadLong();
+
+    // int armorpoints, armortype;
+    str->armorpoints = SV_ReadLong();
+    str->armortype = SV_ReadLong();
+
+    // inventory_t inventory[NUMINVENTORYSLOTS];
+    for (i=0; i<NUMINVENTORYSLOTS; ++i)
+    {
+        saveg_read_inventory_t(&str->inventory[i]);
+    }
+
+    // artitype_t readyArtifact;
+    str->readyArtifact = SV_ReadLong();
+
+    // int artifactCount;
+    str->artifactCount = SV_ReadLong();
+
+    // int inventorySlotNum;
+    str->inventorySlotNum = SV_ReadLong();
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        str->powers[i] = SV_ReadLong();
+    }
+
+    // boolean keys[NUM_KEY_TYPES];
+    for (i = 0; i < NUM_KEY_TYPES; ++i)
+    {
+        str->keys[i] = SV_ReadLong();
+    }
+
+    // boolean backpack;
+    str->backpack = SV_ReadLong();
+
+    // signed int frags[MAXPLAYERS];
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        str->frags[i] = SV_ReadLong();
+    }
+
+    // weapontype_t readyweapon;
+    str->readyweapon = SV_ReadLong();
+
+    // weapontype_t pendingweapon;
+    str->pendingweapon = SV_ReadLong();
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        str->weaponowned[i] = SV_ReadLong();
+    }
+
+    // int ammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        str->ammo[i] = SV_ReadLong();
+    }
+
+    // int maxammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        str->maxammo[i] = SV_ReadLong();
+    }
+
+    // int attackdown, usedown;
+    str->attackdown = SV_ReadLong();
+    str->usedown = SV_ReadLong();
+
+    // int cheats;
+    str->cheats = SV_ReadLong();
+
+    // int refire;
+    str->refire = SV_ReadLong();
+
+    // int killcount, itemcount, secretcount;
+    str->killcount = SV_ReadLong();
+    str->itemcount = SV_ReadLong();
+    str->secretcount = SV_ReadLong();
+
+    // char *message;
+    SV_ReadLong();
+    str->message = NULL;
+
+    // int messageTics;
+    str->messageTics = SV_ReadLong();
+
+    // int damagecount, bonuscount;
+    str->damagecount = SV_ReadLong();
+    str->bonuscount = SV_ReadLong();
+
+    // int flamecount;
+    str->flamecount = SV_ReadLong();
+
+    // mobj_t *attacker;
+    SV_ReadLong();
+    str->attacker = NULL;
+
+    // int extralight;
+    str->extralight = SV_ReadLong();
+
+    // int fixedcolormap;
+    str->fixedcolormap = SV_ReadLong();
+
+    // int colormap;
+    str->colormap = SV_ReadLong();
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        saveg_read_pspdef_t(&str->psprites[i]);
+    }
+
+    // boolean didsecret;
+    str->didsecret = SV_ReadLong();
+
+    // int chickenTics;
+    str->chickenTics = SV_ReadLong();
+
+    // int chickenPeck;
+    str->chickenPeck = SV_ReadLong();
+
+    // mobj_t *rain1;
+    SV_ReadLong();
+    str->rain1 = NULL;
+
+    // mobj_t *rain2;
+    SV_ReadLong();
+    str->rain2 = NULL;
+}
+
+static void saveg_write_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t *mo;
+    // pointer will be trashed, but it gets restored on load as
+    // the player number reference is stored in the mo.
+    SV_WritePtr(str->mo);
+
+    // playerstate_t playerstate;
+    SV_WriteLong(str->playerstate);
+
+    // ticcmd_t cmd;
+    saveg_write_ticcmd_t(&str->cmd);
+
+    // fixed_t viewz;
+    SV_WriteLong(str->viewz);
+
+    // fixed_t viewheight;
+    SV_WriteLong(str->viewheight);
+
+    // fixed_t deltaviewheight;
+    SV_WriteLong(str->deltaviewheight);
+
+    // fixed_t bob;
+    SV_WriteLong(str->bob);
+
+    // int flyheight;
+    SV_WriteLong(str->flyheight);
+
+    // int lookdir;
+    SV_WriteLong(str->lookdir);
+
+    // boolean centering;
+    SV_WriteLong(str->centering);
+
+    // int health;
+    SV_WriteLong(str->health);
+
+    // int armorpoints, armortype;
+    SV_WriteLong(str->armorpoints);
+    SV_WriteLong(str->armortype);
+
+    // inventory_t inventory[NUMINVENTORYSLOTS];
+    for (i=0; i<NUMINVENTORYSLOTS; ++i)
+    {
+        saveg_write_inventory_t(&str->inventory[i]);
+    }
+
+    // artitype_t readyArtifact;
+    SV_WriteLong(str->readyArtifact);
+
+    // int artifactCount;
+    SV_WriteLong(str->artifactCount);
+
+    // int inventorySlotNum;
+    SV_WriteLong(str->inventorySlotNum);
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        SV_WriteLong(str->powers[i]);
+    }
+
+    // boolean keys[NUMKEYS];
+    for (i = 0; i < NUM_KEY_TYPES; ++i)
+    {
+        SV_WriteLong(str->keys[i]);
+    }
+
+    // boolean backpack;
+    SV_WriteLong(str->backpack);
+
+    // signed int frags[MAXPLAYERS];
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        SV_WriteLong(str->frags[i]);
+    }
+
+    // weapontype_t readyweapon;
+    SV_WriteLong(str->readyweapon);
+
+    // weapontype_t pendingweapon;
+    SV_WriteLong(str->pendingweapon);
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        SV_WriteLong(str->weaponowned[i]);
+    }
+
+    // int ammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        SV_WriteLong(str->ammo[i]);
+    }
+
+    // int maxammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        SV_WriteLong(str->maxammo[i]);
+    }
+
+    // int attackdown, usedown;
+    SV_WriteLong(str->attackdown);
+    SV_WriteLong(str->usedown);
+
+    // int cheats;
+    SV_WriteLong(str->cheats);
+
+    // int refire;
+    SV_WriteLong(str->refire);
+
+    // int killcount, itemcount, secretcount;
+    SV_WriteLong(str->killcount);
+    SV_WriteLong(str->itemcount);
+    SV_WriteLong(str->secretcount);
+
+    // char *message;
+    SV_WritePtr(str->message);
+
+    // int messageTics;
+    SV_WriteLong(str->messageTics);
+
+    // int damagecount, bonuscount;
+    SV_WriteLong(str->damagecount);
+    SV_WriteLong(str->bonuscount);
+
+    // int flamecount;
+    SV_WriteLong(str->flamecount);
+
+    // mobj_t *attacker;
+    SV_WritePtr(str->attacker);
+
+    // int extralight;
+    SV_WriteLong(str->extralight);
+
+    // int fixedcolormap;
+    SV_WriteLong(str->fixedcolormap);
+
+    // int colormap;
+    SV_WriteLong(str->colormap);
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        saveg_write_pspdef_t(&str->psprites[i]);
+    }
+
+    // boolean didsecret;
+    SV_WriteLong(str->didsecret);
+
+    // int chickenTics;
+    SV_WriteLong(str->chickenTics);
+
+    // int chickenPeck;
+    SV_WriteLong(str->chickenPeck);
+
+    // mobj_t *rain1;
+    SV_WritePtr(str->rain1);
+
+    // mobj_t *rain2;
+    SV_WritePtr(str->rain2);
+}
+
+
+//
+// mapthing_t
+//
+
+static void saveg_read_mapthing_t(mapthing_t *str)
+{
+    // short x, y;
+    str->x = SV_ReadWord();
+    str->y = SV_ReadWord();
+
+    // short angle;
+    str->angle = SV_ReadWord();
+
+    // short type;
+    str->type = SV_ReadWord();
+
+    // short options;
+    str->options = SV_ReadWord();
+}
+
+static void saveg_write_mapthing_t(mapthing_t *str)
+{
+    // short x, y;
+    SV_WriteWord(str->x);
+    SV_WriteWord(str->y);
+
+    // short angle;
+    SV_WriteWord(str->angle);
+
+    // short type;
+    SV_WriteWord(str->type);
+
+    // short options;
+    SV_WriteWord(str->options);
+}
+
+
+//
+// thinker_t
+//
+
+static void saveg_read_thinker_t(thinker_t *str)
+{
+    // struct thinker_s *prev, *next;
+    SV_ReadLong();
+    str->prev = NULL;
+    SV_ReadLong();
+    str->next = NULL;
+
+    // think_t function;
+    SV_ReadLong();
+    str->function = NULL;
+}
+
+static void saveg_write_thinker_t(thinker_t *str)
+{
+    // struct thinker_s *prev, *next;
+    SV_WritePtr(str->prev);
+    SV_WritePtr(str->next);
+
+    // think_t function;
+    SV_WritePtr(str->function);
+}
+
+
+//
+// specialval_t
+//
+
+static void saveg_read_specialval_t(specialval_t *str)
+{
+    // This can also be a mobj_t ptr, but we just assume it's
+    // an int. This is probably a really bad assumption that's
+    // likely to end in tears.
+
+    // int i;
+    str->i = SV_ReadLong();
+}
+
+static void saveg_write_specialval_t(specialval_t *str)
+{
+    // int i;
+    SV_WriteLong(str->i);
+}
+
+
+//
+// mobj_t
+//
+
+static void saveg_read_mobj_t(mobj_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // fixed_t x, y, z;
+    str->x = SV_ReadLong();
+    str->y = SV_ReadLong();
+    str->z = SV_ReadLong();
+
+    // struct mobj_s *snext, *sprev;
+    SV_ReadLong();
+    str->snext = NULL;
+    SV_ReadLong();
+    str->sprev = NULL;
+
+    // angle_t angle;
+    str->angle = SV_ReadLong();
+
+    // spritenum_t sprite;
+    str->sprite = SV_ReadLong();
+
+    // int frame;
+    str->frame = SV_ReadLong();
+
+    // struct mobj_s *bnext, *bprev;
+    SV_ReadLong();
+    str->bnext = NULL;
+    SV_ReadLong();
+    str->bprev = NULL;
+
+    // struct subsector_s *subsector;
+    SV_ReadLong();
+    str->subsector = NULL;
+
+    // fixed_t floorz, ceilingz;
+    str->floorz = SV_ReadLong();
+    str->ceilingz = SV_ReadLong();
+
+    // fixed_t radius, height;
+    str->radius = SV_ReadLong();
+    str->height = SV_ReadLong();
+
+    // fixed_t momx, momy, momz;
+    str->momx = SV_ReadLong();
+    str->momy = SV_ReadLong();
+    str->momz = SV_ReadLong();
+
+    // int validcount;
+    str->validcount = SV_ReadLong();
+
+    // mobjtype_t type;
+    str->type = SV_ReadLong();
+
+    // An extra thing type was added for v1.0 HHE compatibility.
+    // Map from the v1.3 thing type index to the internal one.
+    if (str->type >= MT_PHOENIXFX_REMOVED)
+    {
+        ++str->type;
+    }
+
+    // mobjinfo_t *info;
+    SV_ReadLong();
+    str->info = NULL;
+
+    // int tics;
+    str->tics = SV_ReadLong();
+
+    // state_t *state;
+    saveg_read_state_ptr(&str->state);
+
+    // int damage;
+    str->damage = SV_ReadLong();
+
+    // int flags;
+    str->flags = SV_ReadLong();
+
+    // int flags2;
+    str->flags2 = SV_ReadLong();
+
+    // specialval_t special1;
+    saveg_read_specialval_t(&str->special1);
+
+    // specialval_t special2;
+    saveg_read_specialval_t(&str->special2);
+
+    // Now we have a bunch of hacks to try to NULL out special values
+    // where special[12] contained a mobj_t pointer that isn't valid
+    // any more. This isn't in Vanilla but at least it stops the game
+    // from crashing.
+
+    switch (str->type)
+    {
+        // Gas pods use special2.m to point to the pod generator
+        // that made it.
+        case MT_POD:
+            str->special2.m = NULL;
+            break;
+
+        // Several thing types use special1.m to mean 'target':
+        case MT_MACEFX4:     // A_DeathBallImpact
+        case MT_WHIRLWIND:   // A_WhirlwindSeek
+        case MT_MUMMYFX1:    // A_MummyFX1Seek
+        case MT_HORNRODFX2:  // A_SkullRodPL2Seek
+        case MT_PHOENIXFX1:  // A_PhoenixPuff
+            str->special1.m = NULL;
+            break;
+
+        default:
+            break;
+    }
+
+    // int health;
+    str->health = SV_ReadLong();
+
+    // int movedir;
+    str->movedir = SV_ReadLong();
+
+    // int movecount;
+    str->movecount = SV_ReadLong();
+
+    // struct mobj_s *target;
+    SV_ReadLong();
+    str->target = NULL;
+
+    // int reactiontime;
+    str->reactiontime = SV_ReadLong();
+
+    // int threshold;
+    str->threshold = SV_ReadLong();
+
+    // struct player_s *player;
+    i = SV_ReadLong();
+    if (i != 0)
+    {
+        str->player = &players[i - 1];
+        str->player->mo = str;
+    }
+    else
+    {
+        str->player = NULL;
+    }
+
+    // int lastlook;
+    str->lastlook = SV_ReadLong();
+
+    // mapthing_t spawnpoint;
+    saveg_read_mapthing_t(&str->spawnpoint);
+}
+
+static void saveg_write_mobj_t(mobj_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // fixed_t x, y, z;
+    SV_WriteLong(str->x);
+    SV_WriteLong(str->y);
+    SV_WriteLong(str->z);
+
+    // struct mobj_s *snext, *sprev;
+    SV_WritePtr(str->snext);
+    SV_WritePtr(str->sprev);
+
+    // angle_t angle;
+    SV_WriteLong(str->angle);
+
+    // spritenum_t sprite;
+    SV_WriteLong(str->sprite);
+
+    // int frame;
+    SV_WriteLong(str->frame);
+
+    // struct mobj_s *bnext, *bprev;
+    SV_WritePtr(str->bnext);
+    SV_WritePtr(str->bprev);
+
+    // struct subsector_s *subsector;
+    SV_WritePtr(str->subsector);
+
+    // fixed_t floorz, ceilingz;
+    SV_WriteLong(str->floorz);
+    SV_WriteLong(str->ceilingz);
+
+    // fixed_t radius, height;
+    SV_WriteLong(str->radius);
+    SV_WriteLong(str->height);
+
+    // fixed_t momx, momy, momz;
+    SV_WriteLong(str->momx);
+    SV_WriteLong(str->momy);
+    SV_WriteLong(str->momz);
+
+    // int validcount;
+    SV_WriteLong(str->validcount);
+
+    // mobjtype_t type;
+    // Our mobjinfo table has an extra entry, for compatibility with v1.0
+    // HHE patches. So translate the internal thing type index to the
+    // equivalent for Vanilla Heretic v1.3, for savegame compatibility.
+
+    if (str->type > MT_PHOENIXFX_REMOVED)
+    {
+        SV_WriteLong(str->type - 1);
+    }
+    else if (str->type == MT_PHOENIXFX_REMOVED)
+    {
+        // This should never happen, but just in case, do something
+        // vaguely sensible ... ?
+        SV_WriteLong(MT_PHOENIXFX1);
+    }
+    else
+    {
+        SV_WriteLong(str->type);
+    }
+
+    // mobjinfo_t *info;
+    SV_WritePtr(str->info);
+
+    // int tics;
+    SV_WriteLong(str->tics);
+
+    // state_t *state;
+    saveg_write_state_ptr(str->state);
+
+    // int damage;
+    SV_WriteLong(str->damage);
+
+    // int flags;
+    SV_WriteLong(str->flags);
+
+    // int flags2;
+    SV_WriteLong(str->flags2);
+
+    // specialval_t special1;
+    saveg_write_specialval_t(&str->special1);
+
+    // specialval_t special2;
+    saveg_write_specialval_t(&str->special2);
+
+    // int health;
+    SV_WriteLong(str->health);
+
+    // int movedir;
+    SV_WriteLong(str->movedir);
+
+    // int movecount;
+    SV_WriteLong(str->movecount);
+
+    // struct mobj_s *target;
+    SV_WritePtr(str->target);
+
+    // int reactiontime;
+    SV_WriteLong(str->reactiontime);
+
+    // int threshold;
+    SV_WriteLong(str->threshold);
+
+    // struct player_s *player;
+    if (str->player != NULL)
+    {
+        SV_WriteLong(str->player - players + 1);
+    }
+    else
+    {
+        SV_WriteLong(0);
+    }
+
+    // int lastlook;
+    SV_WriteLong(str->lastlook);
+
+    // mapthing_t spawnpoint;
+    saveg_write_mapthing_t(&str->spawnpoint);
+}
+
+
+//
+// ceiling_t
+//
+
+static void saveg_read_ceiling_t(ceiling_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // ceiling_e type;
+    str->type = SV_ReadLong();
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // fixed_t bottomheight, topheight;
+    str->bottomheight = SV_ReadLong();
+    str->topheight = SV_ReadLong();
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // boolean crush;
+    str->crush = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int tag;
+    str->tag = SV_ReadLong();
+
+    // int olddirection;
+    str->olddirection = SV_ReadLong();
+}
+
+static void saveg_write_ceiling_t(ceiling_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // ceiling_e type;
+    SV_WriteLong(str->type);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // fixed_t bottomheight, topheight;
+    SV_WriteLong(str->bottomheight);
+    SV_WriteLong(str->topheight);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // boolean crush;
+    SV_WriteLong(str->crush);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int tag;
+    SV_WriteLong(str->tag);
+
+    // int olddirection;
+    SV_WriteLong(str->olddirection);
+}
+
+
+//
+// vldoor_t
+//
+
+static void saveg_read_vldoor_t(vldoor_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // vldoor_e type;
+    str->type = SV_ReadLong();
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // fixed_t topheight;
+    str->topheight = SV_ReadLong();
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int topwait;
+    str->topwait = SV_ReadLong();
+
+    // int topcountdown;
+    str->topcountdown = SV_ReadLong();
+}
+
+static void saveg_write_vldoor_t(vldoor_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // vldoor_e type;
+    SV_WriteLong(str->type);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // fixed_t topheight;
+    SV_WriteLong(str->topheight);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int topwait;
+    SV_WriteLong(str->topwait);
+
+    // int topcountdown;
+    SV_WriteLong(str->topcountdown);
+}
+
+
+//
+// floormove_t
+//
+
+static void saveg_read_floormove_t(floormove_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // floor_e type;
+    str->type = SV_ReadLong();
+
+    // boolean crush;
+    str->crush = SV_ReadLong();
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int newspecial;
+    str->newspecial = SV_ReadLong();
+
+    // short texture;
+    str->texture = SV_ReadWord();
+
+    // fixed_t floordestheight;
+    str->floordestheight = SV_ReadLong();
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+}
+
+static void saveg_write_floormove_t(floormove_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // floor_e type;
+    SV_WriteLong(str->type);
+
+    // boolean crush;
+    SV_WriteLong(str->crush);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int newspecial;
+    SV_WriteLong(str->newspecial);
+
+    // short texture;
+    SV_WriteWord(str->texture);
+
+    // fixed_t floordestheight;
+    SV_WriteLong(str->floordestheight);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+}
+
+
+//
+// plat_t
+//
+
+static void saveg_read_plat_t(plat_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // fixed_t low;
+    str->low = SV_ReadLong();
+
+    // fixed_t high;
+    str->high = SV_ReadLong();
+
+    // int wait;
+    str->wait = SV_ReadLong();
+
+    // int count;
+    str->count = SV_ReadLong();
+
+    // plat_e status;
+    str->status = SV_ReadLong();
+
+    // plat_e oldstatus;
+    str->oldstatus = SV_ReadLong();
+
+    // boolean crush;
+    str->crush = SV_ReadLong();
+
+    // int tag;
+    str->tag = SV_ReadLong();
+
+    // plattype_e type;
+    str->type = SV_ReadLong();
+}
+
+static void saveg_write_plat_t(plat_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // fixed_t low;
+    SV_WriteLong(str->low);
+
+    // fixed_t high;
+    SV_WriteLong(str->high);
+
+    // int wait;
+    SV_WriteLong(str->wait);
+
+    // int count;
+    SV_WriteLong(str->count);
+
+    // plat_e status;
+    SV_WriteLong(str->status);
+
+    // plat_e oldstatus;
+    SV_WriteLong(str->oldstatus);
+
+    // boolean crush;
+    SV_WriteLong(str->crush);
+
+    // int tag;
+    SV_WriteLong(str->tag);
+
+    // plattype_e type;
+    SV_WriteLong(str->type);
+}
+
+
+//
+// lightflash_t
+//
+
+static void saveg_read_lightflash_t(lightflash_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // int count;
+    str->count = SV_ReadLong();
+
+    // int maxlight;
+    str->maxlight = SV_ReadLong();
+
+    // int minlight;
+    str->minlight = SV_ReadLong();
+
+    // int maxtime;
+    str->maxtime = SV_ReadLong();
+
+    // int mintime;
+    str->mintime = SV_ReadLong();
+}
+
+static void saveg_write_lightflash_t(lightflash_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // int count;
+    SV_WriteLong(str->count);
+
+    // int maxlight;
+    SV_WriteLong(str->maxlight);
+
+    // int minlight;
+    SV_WriteLong(str->minlight);
+
+    // int maxtime;
+    SV_WriteLong(str->maxtime);
+
+    // int mintime;
+    SV_WriteLong(str->mintime);
+}
+
+
+//
+// strobe_t
+//
+
+static void saveg_read_strobe_t(strobe_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // int count;
+    str->count = SV_ReadLong();
+
+    // int minlight;
+    str->minlight = SV_ReadLong();
+
+    // int maxlight;
+    str->maxlight = SV_ReadLong();
+
+    // int darktime;
+    str->darktime = SV_ReadLong();
+
+    // int brighttime;
+    str->brighttime = SV_ReadLong();
+}
+
+static void saveg_write_strobe_t(strobe_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // int count;
+    SV_WriteLong(str->count);
+
+    // int minlight;
+    SV_WriteLong(str->minlight);
+
+    // int maxlight;
+    SV_WriteLong(str->maxlight);
+
+    // int darktime;
+    SV_WriteLong(str->darktime);
+
+    // int brighttime;
+    SV_WriteLong(str->brighttime);
+}
+
+
+//
+// glow_t
+//
+
+static void saveg_read_glow_t(glow_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // int minlight;
+    str->minlight = SV_ReadLong();
+
+    // int maxlight;
+    str->maxlight = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+}
+
+static void saveg_write_glow_t(glow_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // int minlight;
+    SV_WriteLong(str->minlight);
+
+    // int maxlight;
+    SV_WriteLong(str->maxlight);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+}
+
+
+/*
+====================
+=
+= P_ArchivePlayers
+=
+====================
+*/
+
+void P_ArchivePlayers(void)
+{
+    int i;
+
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        saveg_write_player_t(&players[i]);
+    }
+}
+
+/*
+====================
+=
+= P_UnArchivePlayers
+=
+====================
+*/
+
+void P_UnArchivePlayers(void)
+{
+    int i;
+
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (!playeringame[i])
+            continue;
+        saveg_read_player_t(&players[i]);
+        players[i].mo = NULL;   // will be set when unarc thinker
+        players[i].message = NULL;
+        players[i].attacker = NULL;
+    }
+}
+
+//=============================================================================
+
+
+/*
+====================
+=
+= P_ArchiveWorld
+=
+====================
+*/
+
+void P_ArchiveWorld(void)
+{
+    int i, j;
+    sector_t *sec;
+    line_t *li;
+    side_t *si;
+
+    // Sectors
+    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
+    {
+        SV_WriteWord(sec->floorheight >> FRACBITS);
+        SV_WriteWord(sec->ceilingheight >> FRACBITS);
+        SV_WriteWord(sec->floorpic);
+        SV_WriteWord(sec->ceilingpic);
+        SV_WriteWord(sec->lightlevel);
+        SV_WriteWord(sec->special);     // needed?
+        SV_WriteWord(sec->tag); // needed?
+    }
+
+    // Lines
+    for (i = 0, li = lines; i < numlines; i++, li++)
+    {
+        SV_WriteWord(li->flags);
+        SV_WriteWord(li->special);
+        SV_WriteWord(li->tag);
+        for (j = 0; j < 2; j++)
+        {
+            if (li->sidenum[j] == -1)
+            {
+                continue;
+            }
+            si = &sides[li->sidenum[j]];
+            SV_WriteWord(si->textureoffset >> FRACBITS);
+            SV_WriteWord(si->rowoffset >> FRACBITS);
+            SV_WriteWord(si->toptexture);
+            SV_WriteWord(si->bottomtexture);
+            SV_WriteWord(si->midtexture);
+        }
+    }
+}
+
+/*
+====================
+=
+= P_UnArchiveWorld
+=
+====================
+*/
+
+void P_UnArchiveWorld(void)
+{
+    int i, j;
+    sector_t *sec;
+    line_t *li;
+    side_t *si;
+
+//
+// do sectors
+//
+    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
+    {
+        sec->floorheight = SV_ReadWord() << FRACBITS;
+        sec->ceilingheight = SV_ReadWord() << FRACBITS;
+        sec->floorpic = SV_ReadWord();
+        sec->ceilingpic = SV_ReadWord();
+        sec->lightlevel = SV_ReadWord();
+        sec->special = SV_ReadWord();  // needed?
+        sec->tag = SV_ReadWord();      // needed?
+        sec->specialdata = 0;
+        sec->soundtarget = 0;
+    }
+
+//
+// do lines
+//
+    for (i = 0, li = lines; i < numlines; i++, li++)
+    {
+        li->flags = SV_ReadWord();
+        li->special = SV_ReadWord();
+        li->tag = SV_ReadWord();
+        for (j = 0; j < 2; j++)
+        {
+            if (li->sidenum[j] == -1)
+                continue;
+            si = &sides[li->sidenum[j]];
+            si->textureoffset = SV_ReadWord() << FRACBITS;
+            si->rowoffset = SV_ReadWord() << FRACBITS;
+            si->toptexture = SV_ReadWord();
+            si->bottomtexture = SV_ReadWord();
+            si->midtexture = SV_ReadWord();
+        }
+    }
+}
+
+//=============================================================================
+
+typedef enum
+{
+    tc_end,
+    tc_mobj
+} thinkerclass_t;
+
+/*
+====================
+=
+= P_ArchiveThinkers
+=
+====================
+*/
+
+void P_ArchiveThinkers(void)
+{
+    thinker_t *th;
+
+    for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if (th->function == P_MobjThinker)
+        {
+            SV_WriteByte(tc_mobj);
+            saveg_write_mobj_t((mobj_t *) th);
+        }
+        //I_Error("P_ArchiveThinkers: Unknown thinker function");
+    }
+
+    // Add a terminating marker
+    SV_WriteByte(tc_end);
+}
+
+/*
+====================
+=
+= P_UnArchiveThinkers
+=
+====================
+*/
+
+void P_UnArchiveThinkers(void)
+{
+    byte tclass;
+    thinker_t *currentthinker, *next;
+    mobj_t *mobj;
+
+    //
+    // remove all the current thinkers
+    //
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+        next = currentthinker->next;
+        if (currentthinker->function == P_MobjThinker)
+            P_RemoveMobj((mobj_t *) currentthinker);
+        else
+            Z_Free(currentthinker);
+        currentthinker = next;
+    }
+    P_InitThinkers();
+
+    // read in saved thinkers
+    while (1)
+    {
+        tclass = SV_ReadByte();
+        switch (tclass)
+        {
+            case tc_end:
+                return;         // end of list
+
+            case tc_mobj:
+                mobj = Z_Malloc(sizeof(*mobj), PU_LEVEL, NULL);
+                saveg_read_mobj_t(mobj);
+                mobj->target = NULL;
+                P_SetThingPosition(mobj);
+                mobj->info = &mobjinfo[mobj->type];
+                mobj->floorz = mobj->subsector->sector->floorheight;
+                mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+                mobj->thinker.function = P_MobjThinker;
+                P_AddThinker(&mobj->thinker);
+                break;
+
+            default:
+                I_Error("Unknown tclass %i in savegame", tclass);
+        }
+
+    }
+
+}
+
+//=============================================================================
+
+
+/*
+====================
+=
+= P_ArchiveSpecials
+=
+====================
+*/
+enum
+{
+    tc_ceiling,
+    tc_door,
+    tc_floor,
+    tc_plat,
+    tc_flash,
+    tc_strobe,
+    tc_glow,
+    tc_endspecials
+} specials_e;
+
+void P_ArchiveSpecials(void)
+{
+    /*
+    T_MoveCeiling, (ceiling_t: sector_t * swizzle), - active list
+    T_VerticalDoor, (vldoor_t: sector_t * swizzle),
+    T_MoveFloor, (floormove_t: sector_t * swizzle),
+    T_LightFlash, (lightflash_t: sector_t * swizzle),
+    T_StrobeFlash, (strobe_t: sector_t *),
+    T_Glow, (glow_t: sector_t *),
+    T_PlatRaise, (plat_t: sector_t *), - active list
+    */
+
+    thinker_t *th;
+
+    for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if (th->function == T_MoveCeiling)
+        {
+            SV_WriteByte(tc_ceiling);
+            saveg_write_ceiling_t((ceiling_t *) th);
+        }
+        else if (th->function == T_VerticalDoor)
+        {
+            SV_WriteByte(tc_door);
+            saveg_write_vldoor_t((vldoor_t *) th);
+        }
+        else if (th->function == T_MoveFloor)
+        {
+            SV_WriteByte(tc_floor);
+            saveg_write_floormove_t((floormove_t *) th);
+        }
+        else if (th->function == T_PlatRaise)
+        {
+            SV_WriteByte(tc_plat);
+            saveg_write_plat_t((plat_t *) th);
+        }
+        else if (th->function == T_LightFlash)
+        {
+            SV_WriteByte(tc_flash);
+            saveg_write_lightflash_t((lightflash_t *) th);
+        }
+        else if (th->function == T_StrobeFlash)
+        {
+            SV_WriteByte(tc_strobe);
+            saveg_write_strobe_t((strobe_t *) th);
+        }
+        else if (th->function == T_Glow)
+        {
+            SV_WriteByte(tc_glow);
+            saveg_write_glow_t((glow_t *) th);
+        }
+    }
+    // Add a terminating marker
+    SV_WriteByte(tc_endspecials);
+}
+
+/*
+====================
+=
+= P_UnArchiveSpecials
+=
+====================
+*/
+
+void P_UnArchiveSpecials(void)
+{
+    byte tclass;
+    ceiling_t *ceiling;
+    vldoor_t *door;
+    floormove_t *floor;
+    plat_t *plat;
+    lightflash_t *flash;
+    strobe_t *strobe;
+    glow_t *glow;
+
+
+    // read in saved thinkers
+    while (1)
+    {
+        tclass = SV_ReadByte();
+        switch (tclass)
+        {
+            case tc_endspecials:
+                return;         // end of list
+
+            case tc_ceiling:
+                ceiling = Z_Malloc(sizeof(*ceiling), PU_LEVEL, NULL);
+                saveg_read_ceiling_t(ceiling);
+                ceiling->sector->specialdata = T_MoveCeiling;  // ???
+                ceiling->thinker.function = T_MoveCeiling;
+                P_AddThinker(&ceiling->thinker);
+                P_AddActiveCeiling(ceiling);
+                break;
+
+            case tc_door:
+                door = Z_Malloc(sizeof(*door), PU_LEVEL, NULL);
+                saveg_read_vldoor_t(door);
+                door->sector->specialdata = door;
+                door->thinker.function = T_VerticalDoor;
+                P_AddThinker(&door->thinker);
+                break;
+
+            case tc_floor:
+                floor = Z_Malloc(sizeof(*floor), PU_LEVEL, NULL);
+                saveg_read_floormove_t(floor);
+                floor->sector->specialdata = T_MoveFloor;
+                floor->thinker.function = T_MoveFloor;
+                P_AddThinker(&floor->thinker);
+                break;
+
+            case tc_plat:
+                plat = Z_Malloc(sizeof(*plat), PU_LEVEL, NULL);
+                saveg_read_plat_t(plat);
+                plat->sector->specialdata = T_PlatRaise;
+                // In the original Heretic code this was a conditional "fix"
+                // of the thinker function, but the save code (above) decides
+                // whether to save a T_PlatRaise based on thinker function
+                // anyway, so it can't be NULL. Having the conditional causes
+                // a bug, as our saveg_read_thinker_t sets these to NULL.
+                // if (plat->thinker.function)
+                plat->thinker.function = T_PlatRaise;
+                P_AddThinker(&plat->thinker);
+                P_AddActivePlat(plat);
+                break;
+
+            case tc_flash:
+                flash = Z_Malloc(sizeof(*flash), PU_LEVEL, NULL);
+                saveg_read_lightflash_t(flash);
+                flash->thinker.function = T_LightFlash;
+                P_AddThinker(&flash->thinker);
+                break;
+
+            case tc_strobe:
+                strobe = Z_Malloc(sizeof(*strobe), PU_LEVEL, NULL);
+                saveg_read_strobe_t(strobe);
+                strobe->thinker.function = T_StrobeFlash;
+                P_AddThinker(&strobe->thinker);
+                break;
+
+            case tc_glow:
+                glow = Z_Malloc(sizeof(*glow), PU_LEVEL, NULL);
+                saveg_read_glow_t(glow);
+                glow->thinker.function = T_Glow;
+                P_AddThinker(&glow->thinker);
+                break;
+
+            default:
+                I_Error("P_UnarchiveSpecials:Unknown tclass %i "
+                        "in savegame", tclass);
+        }
+
+    }
+
+}
+
+
diff --git a/games/NXDoom/src/heretic/p_setup.c b/games/NXDoom/src/heretic/p_setup.c
new file mode 100644
index 000000000..645175552
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_setup.c
@@ -0,0 +1,709 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_main.c
+
+#include <math.h>
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_bbox.h"
+#include "p_local.h"
+#include "p_rejectpad.h"
+#include "s_sound.h"
+
+void P_SpawnMapThing(mapthing_t * mthing);
+
+int numvertexes;
+vertex_t *vertexes;
+
+int numsegs;
+seg_t *segs;
+
+int numsectors;
+sector_t *sectors;
+
+int numsubsectors;
+subsector_t *subsectors;
+
+int numnodes;
+node_t *nodes;
+
+int numlines;
+line_t *lines;
+
+int numsides;
+side_t *sides;
+
+static int totallines;
+
+short *blockmaplump;            // offsets in blockmap are from here
+short *blockmap;
+int bmapwidth, bmapheight;      // in mapblocks
+fixed_t bmaporgx, bmaporgy;     // origin of block map
+mobj_t **blocklinks;            // for thing chains
+
+byte *rejectmatrix;             // for fast sight rejection
+
+mapthing_t deathmatchstarts[10], *deathmatch_p;
+mapthing_t playerstarts[MAXPLAYERS];
+boolean playerstartsingame[MAXPLAYERS];
+
+/*
+=================
+=
+= P_LoadVertexes
+=
+=================
+*/
+
+void P_LoadVertexes(int lump)
+{
+    byte *data;
+    int i;
+    mapvertex_t *ml;
+    vertex_t *li;
+
+    numvertexes = W_LumpLength(lump) / sizeof(mapvertex_t);
+    vertexes = Z_Malloc(numvertexes * sizeof(vertex_t), PU_LEVEL, 0);
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ml = (mapvertex_t *) data;
+    li = vertexes;
+    for (i = 0; i < numvertexes; i++, li++, ml++)
+    {
+        li->x = SHORT(ml->x) << FRACBITS;
+        li->y = SHORT(ml->y) << FRACBITS;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSegs
+=
+=================
+*/
+
+void P_LoadSegs(int lump)
+{
+    byte *data;
+    int i;
+    mapseg_t *ml;
+    seg_t *li;
+    line_t *ldef;
+    int linedef, side;
+
+    numsegs = W_LumpLength(lump) / sizeof(mapseg_t);
+    segs = Z_Malloc(numsegs * sizeof(seg_t), PU_LEVEL, 0);
+    memset(segs, 0, numsegs * sizeof(seg_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ml = (mapseg_t *) data;
+    li = segs;
+    for (i = 0; i < numsegs; i++, li++, ml++)
+    {
+        li->v1 = &vertexes[SHORT(ml->v1)];
+        li->v2 = &vertexes[SHORT(ml->v2)];
+
+        li->angle = (SHORT(ml->angle)) << 16;
+        li->offset = (SHORT(ml->offset)) << 16;
+        linedef = SHORT(ml->linedef);
+        ldef = &lines[linedef];
+        li->linedef = ldef;
+        side = SHORT(ml->side);
+        li->sidedef = &sides[ldef->sidenum[side]];
+        li->frontsector = sides[ldef->sidenum[side]].sector;
+        if (ldef->flags & ML_TWOSIDED)
+            li->backsector = sides[ldef->sidenum[side ^ 1]].sector;
+        else
+            li->backsector = 0;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSubsectors
+=
+=================
+*/
+
+void P_LoadSubsectors(int lump)
+{
+    byte *data;
+    int i;
+    mapsubsector_t *ms;
+    subsector_t *ss;
+
+    numsubsectors = W_LumpLength(lump) / sizeof(mapsubsector_t);
+    subsectors = Z_Malloc(numsubsectors * sizeof(subsector_t), PU_LEVEL, 0);
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ms = (mapsubsector_t *) data;
+    memset(subsectors, 0, numsubsectors * sizeof(subsector_t));
+    ss = subsectors;
+    for (i = 0; i < numsubsectors; i++, ss++, ms++)
+    {
+        ss->numlines = SHORT(ms->numsegs);
+        ss->firstline = SHORT(ms->firstseg);
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSectors
+=
+=================
+*/
+
+void P_LoadSectors(int lump)
+{
+    byte *data;
+    int i;
+    mapsector_t *ms;
+    sector_t *ss;
+
+    numsectors = W_LumpLength(lump) / sizeof(mapsector_t);
+    sectors = Z_Malloc(numsectors * sizeof(sector_t), PU_LEVEL, 0);
+    memset(sectors, 0, numsectors * sizeof(sector_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ms = (mapsector_t *) data;
+    ss = sectors;
+    for (i = 0; i < numsectors; i++, ss++, ms++)
+    {
+        ss->floorheight = SHORT(ms->floorheight) << FRACBITS;
+        ss->ceilingheight = SHORT(ms->ceilingheight) << FRACBITS;
+        ss->floorpic = R_FlatNumForName(ms->floorpic);
+        ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
+        ss->lightlevel = SHORT(ms->lightlevel);
+        ss->special = SHORT(ms->special);
+        ss->tag = SHORT(ms->tag);
+        ss->thinglist = NULL;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadNodes
+=
+=================
+*/
+
+void P_LoadNodes(int lump)
+{
+    byte *data;
+    int i, j, k;
+    mapnode_t *mn;
+    node_t *no;
+
+    numnodes = W_LumpLength(lump) / sizeof(mapnode_t);
+    nodes = Z_Malloc(numnodes * sizeof(node_t), PU_LEVEL, 0);
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    mn = (mapnode_t *) data;
+    no = nodes;
+    for (i = 0; i < numnodes; i++, no++, mn++)
+    {
+        no->x = SHORT(mn->x) << FRACBITS;
+        no->y = SHORT(mn->y) << FRACBITS;
+        no->dx = SHORT(mn->dx) << FRACBITS;
+        no->dy = SHORT(mn->dy) << FRACBITS;
+        for (j = 0; j < 2; j++)
+        {
+            no->children[j] = SHORT(mn->children[j]);
+            for (k = 0; k < 4; k++)
+                no->bbox[j][k] = SHORT(mn->bbox[j][k]) << FRACBITS;
+        }
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+
+/*
+=================
+=
+= P_LoadThings
+=
+=================
+*/
+
+void P_LoadThings(int lump)
+{
+    byte *data;
+    int i;
+    mapthing_t spawnthing;
+    mapthing_t *mt;
+    int numthings;
+
+    data = W_CacheLumpNum(lump, PU_STATIC);
+    numthings = W_LumpLength(lump) / sizeof(mapthing_t);
+
+    mt = (mapthing_t *) data;
+    for (i = 0; i < numthings; i++, mt++)
+    {
+        spawnthing.x = SHORT(mt->x);
+        spawnthing.y = SHORT(mt->y);
+        spawnthing.angle = SHORT(mt->angle);
+        spawnthing.type = SHORT(mt->type);
+        spawnthing.options = SHORT(mt->options);
+        P_SpawnMapThing(&spawnthing);
+    }
+
+    if (!deathmatch)
+    {
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            if (playeringame[i] && !playerstartsingame[i])
+            {
+                I_Error("P_LoadThings: Player %d start missing (vanilla crashes here)", i + 1);
+            }
+            playerstartsingame[i] = false;
+        }
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+
+/*
+=================
+=
+= P_LoadLineDefs
+=
+= Also counts secret lines for intermissions
+=================
+*/
+
+void P_LoadLineDefs(int lump)
+{
+    byte *data;
+    int i;
+    maplinedef_t *mld;
+    line_t *ld;
+    vertex_t *v1, *v2;
+
+    numlines = W_LumpLength(lump) / sizeof(maplinedef_t);
+    lines = Z_Malloc(numlines * sizeof(line_t), PU_LEVEL, 0);
+    memset(lines, 0, numlines * sizeof(line_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    mld = (maplinedef_t *) data;
+    ld = lines;
+    for (i = 0; i < numlines; i++, mld++, ld++)
+    {
+        ld->flags = SHORT(mld->flags);
+        ld->special = SHORT(mld->special);
+        ld->tag = SHORT(mld->tag);
+        v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
+        v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
+        ld->dx = v2->x - v1->x;
+        ld->dy = v2->y - v1->y;
+        if (!ld->dx)
+            ld->slopetype = ST_VERTICAL;
+        else if (!ld->dy)
+            ld->slopetype = ST_HORIZONTAL;
+        else
+        {
+            if (FixedDiv(ld->dy, ld->dx) > 0)
+                ld->slopetype = ST_POSITIVE;
+            else
+                ld->slopetype = ST_NEGATIVE;
+        }
+
+        if (v1->x < v2->x)
+        {
+            ld->bbox[BOXLEFT] = v1->x;
+            ld->bbox[BOXRIGHT] = v2->x;
+        }
+        else
+        {
+            ld->bbox[BOXLEFT] = v2->x;
+            ld->bbox[BOXRIGHT] = v1->x;
+        }
+        if (v1->y < v2->y)
+        {
+            ld->bbox[BOXBOTTOM] = v1->y;
+            ld->bbox[BOXTOP] = v2->y;
+        }
+        else
+        {
+            ld->bbox[BOXBOTTOM] = v2->y;
+            ld->bbox[BOXTOP] = v1->y;
+        }
+        ld->sidenum[0] = SHORT(mld->sidenum[0]);
+        ld->sidenum[1] = SHORT(mld->sidenum[1]);
+        if (ld->sidenum[0] != -1)
+            ld->frontsector = sides[ld->sidenum[0]].sector;
+        else
+            ld->frontsector = 0;
+        if (ld->sidenum[1] != -1)
+            ld->backsector = sides[ld->sidenum[1]].sector;
+        else
+            ld->backsector = 0;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSideDefs
+=
+=================
+*/
+
+void P_LoadSideDefs(int lump)
+{
+    byte *data;
+    int i;
+    mapsidedef_t *msd;
+    side_t *sd;
+
+    numsides = W_LumpLength(lump) / sizeof(mapsidedef_t);
+    sides = Z_Malloc(numsides * sizeof(side_t), PU_LEVEL, 0);
+    memset(sides, 0, numsides * sizeof(side_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    msd = (mapsidedef_t *) data;
+    sd = sides;
+    for (i = 0; i < numsides; i++, msd++, sd++)
+    {
+        sd->textureoffset = SHORT(msd->textureoffset) << FRACBITS;
+        sd->rowoffset = SHORT(msd->rowoffset) << FRACBITS;
+        sd->toptexture = R_TextureNumForName(msd->toptexture);
+        sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+        sd->midtexture = R_TextureNumForName(msd->midtexture);
+        sd->sector = &sectors[SHORT(msd->sector)];
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+
+/*
+=================
+=
+= P_LoadBlockMap
+=
+=================
+*/
+
+void P_LoadBlockMap(int lump)
+{
+    int i, count;
+    int lumplen;
+
+    lumplen = W_LumpLength(lump);
+
+    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
+    W_ReadLump(lump, blockmaplump);
+    blockmap = blockmaplump + 4;
+
+    // Swap all short integers to native byte ordering:
+
+    count = lumplen / 2;
+    for (i = 0; i < count; i++)
+        blockmaplump[i] = SHORT(blockmaplump[i]);
+
+    bmaporgx = blockmaplump[0] << FRACBITS;
+    bmaporgy = blockmaplump[1] << FRACBITS;
+    bmapwidth = blockmaplump[2];
+    bmapheight = blockmaplump[3];
+
+// clear out mobj chains
+    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
+    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
+    memset(blocklinks, 0, count);
+}
+
+
+
+
+/*
+=================
+=
+= P_GroupLines
+=
+= Builds sector line lists and subsector sector numbers
+= Finds block bounding boxes for sectors
+=================
+*/
+
+void P_GroupLines(void)
+{
+    line_t **linebuffer;
+    int i, j;
+    line_t *li;
+    sector_t *sector;
+    subsector_t *ss;
+    seg_t *seg;
+    fixed_t bbox[4];
+    int block;
+
+// look up sector number for each subsector
+    ss = subsectors;
+    for (i = 0; i < numsubsectors; i++, ss++)
+    {
+        seg = &segs[ss->firstline];
+        ss->sector = seg->sidedef->sector;
+    }
+
+// count number of lines in each sector
+    li = lines;
+    totallines = 0;
+    for (i = 0; i < numlines; i++, li++)
+    {
+        totallines++;
+        li->frontsector->linecount++;
+        if (li->backsector && li->backsector != li->frontsector)
+        {
+            li->backsector->linecount++;
+            totallines++;
+        }
+    }
+
+// build line tables for each sector    
+    linebuffer = Z_Malloc(totallines * sizeof(line_t *), PU_LEVEL, 0);
+    sector = sectors;
+    for (i = 0; i < numsectors; i++, sector++)
+    {
+        M_ClearBox(bbox);
+        sector->lines = linebuffer;
+        li = lines;
+        for (j = 0; j < numlines; j++, li++)
+        {
+            if (li->frontsector == sector || li->backsector == sector)
+            {
+                *linebuffer++ = li;
+                M_AddToBox(bbox, li->v1->x, li->v1->y);
+                M_AddToBox(bbox, li->v2->x, li->v2->y);
+            }
+        }
+        if (linebuffer - sector->lines != sector->linecount)
+            I_Error("P_GroupLines: miscounted");
+
+        // set the degenmobj_t to the middle of the bounding box
+        sector->soundorg.x = (bbox[BOXRIGHT] + bbox[BOXLEFT]) / 2;
+        sector->soundorg.y = (bbox[BOXTOP] + bbox[BOXBOTTOM]) / 2;
+
+        // adjust bounding box to map blocks
+        block = (bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block >= bmapheight ? bmapheight - 1 : block;
+        sector->blockbox[BOXTOP] = block;
+
+        block = (bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block < 0 ? 0 : block;
+        sector->blockbox[BOXBOTTOM] = block;
+
+        block = (bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block >= bmapwidth ? bmapwidth - 1 : block;
+        sector->blockbox[BOXRIGHT] = block;
+
+        block = (bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block < 0 ? 0 : block;
+        sector->blockbox[BOXLEFT] = block;
+    }
+
+}
+
+
+static void P_LoadReject(int lumpnum)
+{
+    int minlength;
+    int lumplen;
+
+    // Calculate the size that the REJECT lump *should* be.
+
+    minlength = (numsectors * numsectors + 7) / 8;
+
+    // If the lump meets the minimum length, it can be loaded directly.
+    // Otherwise, we need to allocate a buffer of the correct size
+    // and pad it with appropriate data.
+
+    lumplen = W_LumpLength(lumpnum);
+
+    if (lumplen >= minlength)
+    {
+        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
+    }
+    else
+    {
+        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
+        W_ReadLump(lumpnum, rejectmatrix);
+
+        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
+    }
+}
+
+//=============================================================================
+
+lumpinfo_t *maplumpinfo;
+
+/*
+=================
+=
+= P_SetupLevel
+=
+=================
+*/
+
+void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
+{
+    int i;
+    int parm;
+    char lumpname[9];
+    int lumpnum;
+    mobj_t *mobj;
+
+    totalkills = totalitems = totalsecret = 0;
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        players[i].killcount = players[i].secretcount
+            = players[i].itemcount = 0;
+    }
+    players[consoleplayer].viewz = 1;   // will be set by player think
+
+    S_Start();                  // make sure all sounds are stopped before Z_FreeTags
+
+    Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
+
+    P_InitThinkers();
+
+//
+// look for a regular (development) map first
+//
+    lumpname[0] = 'E';
+    lumpname[1] = '0' + episode;
+    lumpname[2] = 'M';
+    lumpname[3] = '0' + map;
+    lumpname[4] = 0;
+    leveltime = 0;
+
+    lumpnum = W_GetNumForName(lumpname);
+
+    maplumpinfo = lumpinfo[lumpnum];
+
+// note: most of this ordering is important     
+    P_LoadBlockMap(lumpnum + ML_BLOCKMAP);
+    P_LoadVertexes(lumpnum + ML_VERTEXES);
+    P_LoadSectors(lumpnum + ML_SECTORS);
+    P_LoadSideDefs(lumpnum + ML_SIDEDEFS);
+
+    P_LoadLineDefs(lumpnum + ML_LINEDEFS);
+    P_LoadSubsectors(lumpnum + ML_SSECTORS);
+    P_LoadNodes(lumpnum + ML_NODES);
+    P_LoadSegs(lumpnum + ML_SEGS);
+
+    P_GroupLines();
+    P_LoadReject(lumpnum + ML_REJECT);
+
+    bodyqueslot = 0;
+    deathmatch_p = deathmatchstarts;
+    P_InitAmbientSound();
+    P_InitMonsters();
+    P_OpenWeapons();
+    P_LoadThings(lumpnum + ML_THINGS);
+    P_CloseWeapons();
+
+//
+// if deathmatch, randomly spawn the active players
+//
+    TimerGame = 0;
+    if (deathmatch)
+    {
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            if (playeringame[i])
+            {                   // must give a player spot before deathmatchspawn
+                mobj = P_SpawnMobj(playerstarts[i].x << 16,
+                                   playerstarts[i].y << 16, 0, MT_PLAYER);
+                players[i].mo = mobj;
+                G_DeathMatchSpawnPlayer(i);
+                P_RemoveMobj(mobj);
+            }
+        }
+
+        //!
+        // @arg <n>
+        // @category net
+        // @vanilla
+        //
+        // For multiplayer games: exit each level after n minutes.
+        //
+
+        parm = M_CheckParmWithArgs("-timer", 1);
+        if (parm)
+        {
+            TimerGame = atoi(myargv[parm + 1]) * 35 * 60;
+        }
+    }
+
+// set up world state
+    P_SpawnSpecials();
+
+// build subsector connect matrix
+//      P_ConnectSubsectors ();
+
+// preload graphics
+    if (precache)
+        R_PrecacheLevel();
+
+//printf ("free memory: 0x%x\n", Z_FreeMemory());
+
+}
+
+
+/*
+=================
+=
+= P_Init
+=
+=================
+*/
+
+void P_Init(void)
+{
+    P_InitSwitchList();
+    P_InitPicAnims();
+    P_InitTerrainTypes();
+    P_InitLava();
+    R_InitSprites(sprnames);
+}
diff --git a/games/NXDoom/src/heretic/p_sight.c b/games/NXDoom/src/heretic/p_sight.c
new file mode 100644
index 000000000..3a442daef
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_sight.c
@@ -0,0 +1,355 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// P_sight.c
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "p_local.h"
+
+/*
+==============================================================================
+
+							P_CheckSight
+
+This uses specialized forms of the maputils routines for optimized performance
+
+==============================================================================
+*/
+
+fixed_t sightzstart;            // eye z of looker
+fixed_t topslope, bottomslope;  // slopes to top and bottom of target
+
+int sightcounts[3];
+
+/*
+==============
+=
+= PTR_SightTraverse
+=
+==============
+*/
+
+boolean PTR_SightTraverse(intercept_t * in)
+{
+    line_t *li;
+    fixed_t slope;
+
+    li = in->d.line;
+
+//
+// crosses a two sided line
+//
+    P_LineOpening(li);
+
+    if (openbottom >= opentop)  // quick test for totally closed doors
+        return false;           // stop
+
+    if (li->frontsector->floorheight != li->backsector->floorheight)
+    {
+        slope = FixedDiv(openbottom - sightzstart, in->frac);
+        if (slope > bottomslope)
+            bottomslope = slope;
+    }
+
+    if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+    {
+        slope = FixedDiv(opentop - sightzstart, in->frac);
+        if (slope < topslope)
+            topslope = slope;
+    }
+
+    if (topslope <= bottomslope)
+        return false;           // stop
+
+    return true;                // keep going
+}
+
+
+
+/*
+==================
+=
+= P_SightBlockLinesIterator
+=
+===================
+*/
+
+boolean P_SightBlockLinesIterator(int x, int y)
+{
+    int offset;
+    short *list;
+    line_t *ld;
+    int s1, s2;
+    divline_t dl;
+
+    offset = y * bmapwidth + x;
+
+    offset = *(blockmap + offset);
+
+    for (list = blockmaplump + offset; *list != -1; list++)
+    {
+        ld = &lines[*list];
+        if (ld->validcount == validcount)
+            continue;           // line has already been checked
+        ld->validcount = validcount;
+
+        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
+        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
+        if (s1 == s2)
+            continue;           // line isn't crossed
+        P_MakeDivline(ld, &dl);
+        s1 = P_PointOnDivlineSide(trace.x, trace.y, &dl);
+        s2 = P_PointOnDivlineSide(trace.x + trace.dx, trace.y + trace.dy,
+                                  &dl);
+        if (s1 == s2)
+            continue;           // line isn't crossed
+
+        // try to early out the check
+        if (!ld->backsector)
+            return false;       // stop checking
+
+        // store the line for later intersection testing
+        intercept_p->d.line = ld;
+        intercept_p++;
+
+    }
+
+    return true;                // everything was checked
+}
+
+/*
+====================
+=
+= P_SightTraverseIntercepts
+=
+= Returns true if the traverser function returns true for all lines
+====================
+*/
+
+boolean P_SightTraverseIntercepts(void)
+{
+    int count;
+    fixed_t dist;
+    intercept_t *scan, *in;
+    divline_t dl;
+
+    count = intercept_p - intercepts;
+//
+// calculate intercept distance
+//
+    for (scan = intercepts; scan < intercept_p; scan++)
+    {
+        P_MakeDivline(scan->d.line, &dl);
+        scan->frac = P_InterceptVector(&trace, &dl);
+    }
+
+//
+// go through in order
+//      
+    in = 0;                     // shut up compiler warning
+
+    while (count--)
+    {
+        dist = INT_MAX;
+        for (scan = intercepts; scan < intercept_p; scan++)
+            if (scan->frac < dist)
+            {
+                dist = scan->frac;
+                in = scan;
+            }
+
+        if (!PTR_SightTraverse(in))
+            return false;       // don't bother going farther
+        in->frac = INT_MAX;
+    }
+
+    return true;                // everything was traversed
+}
+
+
+
+/*
+==================
+=
+= P_SightPathTraverse
+=
+= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
+= Returns true if the traverser function returns true for all lines
+==================
+*/
+
+boolean P_SightPathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
+{
+    fixed_t xt1, yt1, xt2, yt2;
+    fixed_t xstep, ystep;
+    fixed_t partial;
+    fixed_t xintercept, yintercept;
+    int mapx, mapy, mapxstep, mapystep;
+    int count;
+
+    validcount++;
+    intercept_p = intercepts;
+
+    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
+        x1 += FRACUNIT;         // don't side exactly on a line
+    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
+        y1 += FRACUNIT;         // don't side exactly on a line
+    trace.x = x1;
+    trace.y = y1;
+    trace.dx = x2 - x1;
+    trace.dy = y2 - y1;
+
+    x1 -= bmaporgx;
+    y1 -= bmaporgy;
+    xt1 = x1 >> MAPBLOCKSHIFT;
+    yt1 = y1 >> MAPBLOCKSHIFT;
+
+    x2 -= bmaporgx;
+    y2 -= bmaporgy;
+    xt2 = x2 >> MAPBLOCKSHIFT;
+    yt2 = y2 >> MAPBLOCKSHIFT;
+
+// points should never be out of bounds, but check once instead of
+// each block
+    if (xt1 < 0 || yt1 < 0 || xt1 >= bmapwidth || yt1 >= bmapheight
+        || xt2 < 0 || yt2 < 0 || xt2 >= bmapwidth || yt2 >= bmapheight)
+        return false;
+
+    if (xt2 > xt1)
+    {
+        mapxstep = 1;
+        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else if (xt2 < xt1)
+    {
+        mapxstep = -1;
+        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else
+    {
+        mapxstep = 0;
+        partial = FRACUNIT;
+        ystep = 256 * FRACUNIT;
+    }
+    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
+
+
+    if (yt2 > yt1)
+    {
+        mapystep = 1;
+        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else if (yt2 < yt1)
+    {
+        mapystep = -1;
+        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else
+    {
+        mapystep = 0;
+        partial = FRACUNIT;
+        xstep = 256 * FRACUNIT;
+    }
+    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
+
+
+//
+// step through map blocks
+// Count is present to prevent a round off error from skipping the break
+    mapx = xt1;
+    mapy = yt1;
+
+
+    for (count = 0; count < 64; count++)
+    {
+        if (!P_SightBlockLinesIterator(mapx, mapy))
+        {
+            sightcounts[1]++;
+            return false;       // early out
+        }
+
+        if (mapx == xt2 && mapy == yt2)
+            break;
+
+        if ((yintercept >> FRACBITS) == mapy)
+        {
+            yintercept += ystep;
+            mapx += mapxstep;
+        }
+        else if ((xintercept >> FRACBITS) == mapx)
+        {
+            xintercept += xstep;
+            mapy += mapystep;
+        }
+
+    }
+
+
+//
+// couldn't early out, so go through the sorted list
+//
+    sightcounts[2]++;
+
+    return P_SightTraverseIntercepts();
+}
+
+
+
+/*
+=====================
+=
+= P_CheckSight
+=
+= Returns true if a straight line between t1 and t2 is unobstructed
+= look from eyes of t1 to any part of t2
+=
+=====================
+*/
+
+boolean P_CheckSight(mobj_t * t1, mobj_t * t2)
+{
+    int s1, s2;
+    int pnum, bytenum, bitnum;
+
+//
+// check for trivial rejection
+//
+    s1 = (t1->subsector->sector - sectors);
+    s2 = (t2->subsector->sector - sectors);
+    pnum = s1 * numsectors + s2;
+    bytenum = pnum >> 3;
+    bitnum = 1 << (pnum & 7);
+
+    if (rejectmatrix[bytenum] & bitnum)
+    {
+        sightcounts[0]++;
+        return false;           // can't possibly be connected
+    }
+
+//
+// check precisely
+//              
+    sightzstart = t1->z + t1->height - (t1->height >> 2);
+    topslope = (t2->z + t2->height) - sightzstart;
+    bottomslope = (t2->z) - sightzstart;
+
+    return P_SightPathTraverse(t1->x, t1->y, t2->x, t2->y);
+}
diff --git a/games/NXDoom/src/heretic/p_spec.c b/games/NXDoom/src/heretic/p_spec.c
new file mode 100644
index 000000000..cb89bac21
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_spec.c
@@ -0,0 +1,1306 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_Spec.c
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+// Macros
+
+#define MAX_AMBIENT_SFX 8       // Per level
+
+// Types
+
+typedef enum
+{
+    afxcmd_play,                // (sound)
+    afxcmd_playabsvol,          // (sound, volume)
+    afxcmd_playrelvol,          // (sound, volume)
+    afxcmd_delay,               // (ticks)
+    afxcmd_delayrand,           // (andbits)
+    afxcmd_end                  // ()
+} afxcmd_t;
+
+// Data
+
+int *LevelAmbientSfx[MAX_AMBIENT_SFX];
+int *AmbSfxPtr;
+int AmbSfxCount;
+int AmbSfxTics;
+int AmbSfxVolume;
+
+int AmbSndSeqInit[] = {         // Startup
+    afxcmd_end
+};
+int AmbSndSeq1[] = {            // Scream
+    afxcmd_play, sfx_amb1,
+    afxcmd_end
+};
+int AmbSndSeq2[] = {            // Squish
+    afxcmd_play, sfx_amb2,
+    afxcmd_end
+};
+int AmbSndSeq3[] = {            // Drops
+    afxcmd_play, sfx_amb3,
+    afxcmd_delay, 16,
+    afxcmd_delayrand, 31,
+    afxcmd_play, sfx_amb7,
+    afxcmd_delay, 16,
+    afxcmd_delayrand, 31,
+    afxcmd_play, sfx_amb3,
+    afxcmd_delay, 16,
+    afxcmd_delayrand, 31,
+    afxcmd_play, sfx_amb7,
+    afxcmd_delay, 16,
+    afxcmd_delayrand, 31,
+    afxcmd_play, sfx_amb3,
+    afxcmd_delay, 16,
+    afxcmd_delayrand, 31,
+    afxcmd_play, sfx_amb7,
+    afxcmd_delay, 16,
+    afxcmd_delayrand, 31,
+    afxcmd_end
+};
+int AmbSndSeq4[] = {            // SlowFootSteps
+    afxcmd_play, sfx_amb4,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_delay, 15,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_end
+};
+int AmbSndSeq5[] = {            // Heartbeat
+    afxcmd_play, sfx_amb5,
+    afxcmd_delay, 35,
+    afxcmd_play, sfx_amb5,
+    afxcmd_delay, 35,
+    afxcmd_play, sfx_amb5,
+    afxcmd_delay, 35,
+    afxcmd_play, sfx_amb5,
+    afxcmd_end
+};
+int AmbSndSeq6[] = {            // Bells
+    afxcmd_play, sfx_amb6,
+    afxcmd_delay, 17,
+    afxcmd_playrelvol, sfx_amb6, -8,
+    afxcmd_delay, 17,
+    afxcmd_playrelvol, sfx_amb6, -8,
+    afxcmd_delay, 17,
+    afxcmd_playrelvol, sfx_amb6, -8,
+    afxcmd_end
+};
+int AmbSndSeq7[] = {            // Growl
+    afxcmd_play, sfx_bstsit,
+    afxcmd_end
+};
+int AmbSndSeq8[] = {            // Magic
+    afxcmd_play, sfx_amb8,
+    afxcmd_end
+};
+int AmbSndSeq9[] = {            // Laughter
+    afxcmd_play, sfx_amb9,
+    afxcmd_delay, 16,
+    afxcmd_playrelvol, sfx_amb9, -4,
+    afxcmd_delay, 16,
+    afxcmd_playrelvol, sfx_amb9, -4,
+    afxcmd_delay, 16,
+    afxcmd_playrelvol, sfx_amb10, -4,
+    afxcmd_delay, 16,
+    afxcmd_playrelvol, sfx_amb10, -4,
+    afxcmd_delay, 16,
+    afxcmd_playrelvol, sfx_amb10, -4,
+    afxcmd_end
+};
+int AmbSndSeq10[] = {           // FastFootsteps
+    afxcmd_play, sfx_amb4,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb4, -3,
+    afxcmd_delay, 8,
+    afxcmd_playrelvol, sfx_amb11, -3,
+    afxcmd_end
+};
+
+int *AmbientSfx[] = {
+    AmbSndSeq1,                 // Scream
+    AmbSndSeq2,                 // Squish
+    AmbSndSeq3,                 // Drops
+    AmbSndSeq4,                 // SlowFootsteps
+    AmbSndSeq5,                 // Heartbeat
+    AmbSndSeq6,                 // Bells
+    AmbSndSeq7,                 // Growl
+    AmbSndSeq8,                 // Magic
+    AmbSndSeq9,                 // Laughter
+    AmbSndSeq10                 // FastFootsteps
+};
+
+animdef_t animdefs[] = {
+    // false = flat
+    // true = texture
+    {false, "FLTWAWA3", "FLTWAWA1", 8}, // Water
+    {false, "FLTSLUD3", "FLTSLUD1", 8}, // Sludge
+    {false, "FLTTELE4", "FLTTELE1", 6}, // Teleport
+    {false, "FLTFLWW3", "FLTFLWW1", 9}, // River - West
+    {false, "FLTLAVA4", "FLTLAVA1", 8}, // Lava
+    {false, "FLATHUH4", "FLATHUH1", 8}, // Super Lava
+    {true, "LAVAFL3", "LAVAFL1", 6},    // Texture: Lavaflow
+    {true, "WATRWAL3", "WATRWAL1", 4},  // Texture: Waterfall
+    {-1}
+};
+
+anim_t anims[MAXANIMS];
+anim_t *lastanim;
+
+int *TerrainTypes;
+struct
+{
+    const char *name;
+    int type;
+} TerrainTypeDefs[] =
+{
+    { "FLTWAWA1", FLOOR_WATER },
+    { "FLTFLWW1", FLOOR_WATER },
+    { "FLTLAVA1", FLOOR_LAVA },
+    { "FLATHUH1", FLOOR_LAVA },
+    { "FLTSLUD1", FLOOR_SLUDGE },
+    { "END", -1 }
+};
+
+mobj_t LavaInflictor;
+
+//----------------------------------------------------------------------------
+//
+// PROC P_InitLava
+//
+//----------------------------------------------------------------------------
+
+void P_InitLava(void)
+{
+    memset(&LavaInflictor, 0, sizeof(mobj_t));
+    LavaInflictor.type = MT_PHOENIXFX2;
+    LavaInflictor.flags2 = MF2_FIREDAMAGE | MF2_NODMGTHRUST;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_InitTerrainTypes
+//
+//----------------------------------------------------------------------------
+
+void P_InitTerrainTypes(void)
+{
+    int i;
+    int lump;
+    int size;
+
+    size = (numflats + 1) * sizeof(int);
+    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
+    memset(TerrainTypes, 0, size);
+    for (i = 0; TerrainTypeDefs[i].type != -1; i++)
+    {
+        lump = W_CheckNumForName(TerrainTypeDefs[i].name);
+        if (lump != -1)
+        {
+            TerrainTypes[lump - firstflat] = TerrainTypeDefs[i].type;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_InitPicAnims
+//
+//----------------------------------------------------------------------------
+
+void P_InitPicAnims(void)
+{
+    const char *startname;
+    const char *endname;
+    int i;
+
+    lastanim = anims;
+    for (i = 0; animdefs[i].istexture != -1; i++)
+    {
+        startname = DEH_String(animdefs[i].startname);
+        endname = DEH_String(animdefs[i].endname);
+
+        if (animdefs[i].istexture)
+        {                       // Texture animation
+            if (R_CheckTextureNumForName(startname) == -1)
+            {                   // Texture doesn't exist
+                continue;
+            }
+            lastanim->picnum = R_TextureNumForName(endname);
+            lastanim->basepic = R_TextureNumForName(startname);
+        }
+        else
+        {                       // Flat animation
+            if (W_CheckNumForName(startname) == -1)
+            {                   // Flat doesn't exist
+                continue;
+            }
+            lastanim->picnum = R_FlatNumForName(endname);
+            lastanim->basepic = R_FlatNumForName(startname);
+        }
+        lastanim->istexture = animdefs[i].istexture;
+        lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
+        if (lastanim->numpics < 2)
+        {
+            I_Error("P_InitPicAnims: bad cycle from %s to %s",
+                    startname, endname);
+        }
+        lastanim->speed = animdefs[i].speed;
+        lastanim++;
+    }
+}
+
+/*
+==============================================================================
+
+							UTILITIES
+
+==============================================================================
+*/
+
+//
+//      Will return a side_t* given the number of the current sector,
+//              the line number, and the side (0/1) that you want.
+//
+side_t *getSide(int currentSector, int line, int side)
+{
+    return &sides[(sectors[currentSector].lines[line])->sidenum[side]];
+}
+
+//
+//      Will return a sector_t* given the number of the current sector,
+//              the line number and the side (0/1) that you want.
+//
+sector_t *getSector(int currentSector, int line, int side)
+{
+    return sides[(sectors[currentSector].lines[line])->sidenum[side]].sector;
+}
+
+//
+//      Given the sector number and the line number, will tell you whether
+//              the line is two-sided or not.
+//
+int twoSided(int sector, int line)
+{
+    return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
+}
+
+//==================================================================
+//
+//      Return sector_t * of sector next to current. NULL if not two-sided line
+//
+//==================================================================
+sector_t *getNextSector(line_t * line, sector_t * sec)
+{
+    if (!(line->flags & ML_TWOSIDED))
+        return NULL;
+
+    if (line->frontsector == sec)
+        return line->backsector;
+
+    return line->frontsector;
+}
+
+//==================================================================
+//
+//      FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindLowestFloorSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t floor = sec->floorheight;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->floorheight < floor)
+            floor = other->floorheight;
+    }
+    return floor;
+}
+
+//==================================================================
+//
+//      FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindHighestFloorSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t floor = -500 * FRACUNIT;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->floorheight > floor)
+            floor = other->floorheight;
+    }
+    return floor;
+}
+
+//==================================================================
+//
+//      FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight)
+{
+    int i;
+    int h;
+    fixed_t min;
+    line_t *check;
+    sector_t *other;
+    fixed_t height = currentheight;
+
+    min = INT_MAX;
+
+    for (i = 0, h = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+
+        if (other != NULL && other->floorheight > height)
+        {
+            if (other->floorheight < min)
+            {
+                min = other->floorheight;
+            }
+
+            ++h;
+        }
+    }
+
+    // Don't return INT_MAX if no higher floor is found.
+
+    if (!h)
+    {
+        return height;
+    }
+
+    // Compatibility note, in case of demo desyncs.
+
+    if (h > 20)
+    {
+        fprintf(stderr, "P_FindNextHighestFloor: exceeded Vanilla limit\n");
+    }
+
+    return min;
+}
+
+//==================================================================
+//
+//      FIND LOWEST CEILING IN THE SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindLowestCeilingSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t height = INT_MAX;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->ceilingheight < height)
+            height = other->ceilingheight;
+    }
+    return height;
+}
+
+//==================================================================
+//
+//      FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindHighestCeilingSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t height = 0;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->ceilingheight > height)
+            height = other->ceilingheight;
+    }
+    return height;
+}
+
+//==================================================================
+//
+//      RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
+//
+//==================================================================
+int P_FindSectorFromLineTag(line_t * line, int start)
+{
+    int i;
+
+    for (i = start + 1; i < numsectors; i++)
+        if (sectors[i].tag == line->tag)
+            return i;
+    return -1;
+}
+
+//==================================================================
+//
+//      Find minimum light from an adjacent sector
+//
+//==================================================================
+int P_FindMinSurroundingLight(sector_t * sector, int max)
+{
+    int i;
+    int min;
+    line_t *line;
+    sector_t *check;
+
+    min = max;
+    for (i = 0; i < sector->linecount; i++)
+    {
+        line = sector->lines[i];
+        check = getNextSector(line, sector);
+        if (!check)
+            continue;
+        if (check->lightlevel < min)
+            min = check->lightlevel;
+    }
+    return min;
+}
+
+/*
+==============================================================================
+
+							EVENTS
+
+Events are operations triggered by using, crossing, or shooting special lines, or by timed thinkers
+
+==============================================================================
+*/
+
+
+
+/*
+===============================================================================
+=
+= P_CrossSpecialLine - TRIGGER
+=
+= Called every time a thing origin is about to cross
+= a line with a non 0 special
+=
+===============================================================================
+*/
+
+void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
+{
+    line_t *line;
+
+    line = &lines[linenum];
+    if (!thing->player)
+    {                           // Check if trigger allowed by non-player mobj
+        switch (line->special)
+        {
+            case 39:           // Trigger_TELEPORT
+            case 97:           // Retrigger_TELEPORT
+            case 4:            // Trigger_Raise_Door
+                //case 10:      // PLAT DOWN-WAIT-UP-STAY TRIGGER
+                //case 88:      // PLAT DOWN-WAIT-UP-STAY RETRIGGER
+                break;
+            default:
+                return;
+                break;
+        }
+    }
+    switch (line->special)
+    {
+            //====================================================
+            // TRIGGERS
+            //====================================================
+        case 2:                // Open Door
+            EV_DoDoor(line, vld_open, VDOORSPEED);
+            line->special = 0;
+            break;
+        case 3:                // Close Door
+            EV_DoDoor(line, vld_close, VDOORSPEED);
+            line->special = 0;
+            break;
+        case 4:                // Raise Door
+            EV_DoDoor(line, vld_normal, VDOORSPEED);
+            line->special = 0;
+            break;
+        case 5:                // Raise Floor
+            EV_DoFloor(line, raiseFloor);
+            line->special = 0;
+            break;
+        case 6:                // Fast Ceiling Crush & Raise
+            EV_DoCeiling(line, fastCrushAndRaise);
+            line->special = 0;
+            break;
+        case 8:                // Trigger_Build_Stairs (8 pixel steps)
+            EV_BuildStairs(line, 8 * FRACUNIT);
+            line->special = 0;
+            break;
+        case 106:              // Trigger_Build_Stairs_16 (16 pixel steps)
+            EV_BuildStairs(line, 16 * FRACUNIT);
+            line->special = 0;
+            break;
+        case 10:               // PlatDownWaitUp
+            EV_DoPlat(line, downWaitUpStay, 0);
+            line->special = 0;
+            break;
+        case 12:               // Light Turn On - brightest near
+            EV_LightTurnOn(line, 0);
+            line->special = 0;
+            break;
+        case 13:               // Light Turn On 255
+            EV_LightTurnOn(line, 255);
+            line->special = 0;
+            break;
+        case 16:               // Close Door 30
+            EV_DoDoor(line, vld_close30ThenOpen, VDOORSPEED);
+            line->special = 0;
+            break;
+        case 17:               // Start Light Strobing
+            EV_StartLightStrobing(line);
+            line->special = 0;
+            break;
+        case 19:               // Lower Floor
+            EV_DoFloor(line, lowerFloor);
+            line->special = 0;
+            break;
+        case 22:               // Raise floor to nearest height and change texture
+            EV_DoPlat(line, raiseToNearestAndChange, 0);
+            line->special = 0;
+            break;
+        case 25:               // Ceiling Crush and Raise
+            EV_DoCeiling(line, crushAndRaise);
+            line->special = 0;
+            break;
+        case 30:               // Raise floor to shortest texture height
+            // on either side of lines
+            EV_DoFloor(line, raiseToTexture);
+            line->special = 0;
+            break;
+        case 35:               // Lights Very Dark
+            EV_LightTurnOn(line, 35);
+            line->special = 0;
+            break;
+        case 36:               // Lower Floor (TURBO)
+            EV_DoFloor(line, turboLower);
+            line->special = 0;
+            break;
+        case 37:               // LowerAndChange
+            EV_DoFloor(line, lowerAndChange);
+            line->special = 0;
+            break;
+        case 38:               // Lower Floor To Lowest
+            EV_DoFloor(line, lowerFloorToLowest);
+            line->special = 0;
+            break;
+        case 39:               // TELEPORT!
+            EV_Teleport(line, side, thing);
+            line->special = 0;
+            break;
+        case 40:               // RaiseCeilingLowerFloor
+            EV_DoCeiling(line, raiseToHighest);
+            EV_DoFloor(line, lowerFloorToLowest);
+            line->special = 0;
+            break;
+        case 44:               // Ceiling Crush
+            EV_DoCeiling(line, lowerAndCrush);
+            line->special = 0;
+            break;
+        case 52:               // EXIT!
+            G_ExitLevel();
+            line->special = 0;
+            break;
+        case 53:               // Perpetual Platform Raise
+            EV_DoPlat(line, perpetualRaise, 0);
+            line->special = 0;
+            break;
+        case 54:               // Platform Stop
+            EV_StopPlat(line);
+            line->special = 0;
+            break;
+        case 56:               // Raise Floor Crush
+            EV_DoFloor(line, raiseFloorCrush);
+            line->special = 0;
+            break;
+        case 57:               // Ceiling Crush Stop
+            EV_CeilingCrushStop(line);
+            line->special = 0;
+            break;
+        case 58:               // Raise Floor 24
+            EV_DoFloor(line, raiseFloor24);
+            line->special = 0;
+            break;
+        case 59:               // Raise Floor 24 And Change
+            EV_DoFloor(line, raiseFloor24AndChange);
+            line->special = 0;
+            break;
+        case 104:              // Turn lights off in sector(tag)
+            EV_TurnTagLightsOff(line);
+            line->special = 0;
+            break;
+        case 105:              // Trigger_SecretExit
+            G_SecretExitLevel();
+            line->special = 0;
+            break;
+
+            //====================================================
+            // RE-DOABLE TRIGGERS
+            //====================================================
+
+        case 72:               // Ceiling Crush
+            EV_DoCeiling(line, lowerAndCrush);
+            break;
+        case 73:               // Ceiling Crush and Raise
+            EV_DoCeiling(line, crushAndRaise);
+            break;
+        case 74:               // Ceiling Crush Stop
+            EV_CeilingCrushStop(line);
+            break;
+        case 75:               // Close Door
+            EV_DoDoor(line, vld_close, VDOORSPEED);
+            break;
+        case 76:               // Close Door 30
+            EV_DoDoor(line, vld_close30ThenOpen, VDOORSPEED);
+            break;
+        case 77:               // Fast Ceiling Crush & Raise
+            EV_DoCeiling(line, fastCrushAndRaise);
+            break;
+        case 79:               // Lights Very Dark
+            EV_LightTurnOn(line, 35);
+            break;
+        case 80:               // Light Turn On - brightest near
+            EV_LightTurnOn(line, 0);
+            break;
+        case 81:               // Light Turn On 255
+            EV_LightTurnOn(line, 255);
+            break;
+        case 82:               // Lower Floor To Lowest
+            EV_DoFloor(line, lowerFloorToLowest);
+            break;
+        case 83:               // Lower Floor
+            EV_DoFloor(line, lowerFloor);
+            break;
+        case 84:               // LowerAndChange
+            EV_DoFloor(line, lowerAndChange);
+            break;
+        case 86:               // Open Door
+            EV_DoDoor(line, vld_open, VDOORSPEED);
+            break;
+        case 87:               // Perpetual Platform Raise
+            EV_DoPlat(line, perpetualRaise, 0);
+            break;
+        case 88:               // PlatDownWaitUp
+            EV_DoPlat(line, downWaitUpStay, 0);
+            break;
+        case 89:               // Platform Stop
+            EV_StopPlat(line);
+            break;
+        case 90:               // Raise Door
+            EV_DoDoor(line, vld_normal, VDOORSPEED);
+            break;
+        case 100:              // Retrigger_Raise_Door_Turbo
+            EV_DoDoor(line, vld_normal, VDOORSPEED * 3);
+            break;
+        case 91:               // Raise Floor
+            EV_DoFloor(line, raiseFloor);
+            break;
+        case 92:               // Raise Floor 24
+            EV_DoFloor(line, raiseFloor24);
+            break;
+        case 93:               // Raise Floor 24 And Change
+            EV_DoFloor(line, raiseFloor24AndChange);
+            break;
+        case 94:               // Raise Floor Crush
+            EV_DoFloor(line, raiseFloorCrush);
+            break;
+        case 95:               // Raise floor to nearest height and change texture
+            EV_DoPlat(line, raiseToNearestAndChange, 0);
+            break;
+        case 96:               // Raise floor to shortest texture height
+            // on either side of lines
+            EV_DoFloor(line, raiseToTexture);
+            break;
+        case 97:               // TELEPORT!
+            EV_Teleport(line, side, thing);
+            break;
+        case 98:               // Lower Floor (TURBO)
+            EV_DoFloor(line, turboLower);
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ShootSpecialLine
+//
+// Called when a thing shoots a special line.
+//
+//----------------------------------------------------------------------------
+
+void P_ShootSpecialLine(mobj_t * thing, line_t * line)
+{
+    if (!thing->player)
+    {                           // Check if trigger allowed by non-player mobj
+        switch (line->special)
+        {
+            case 46:           // Impact_OpenDoor
+                break;
+            default:
+                return;
+                break;
+        }
+    }
+    switch (line->special)
+    {
+        case 24:               // Impact_RaiseFloor
+            EV_DoFloor(line, raiseFloor);
+            P_ChangeSwitchTexture(line, 0);
+            break;
+        case 46:               // Impact_OpenDoor
+            EV_DoDoor(line, vld_open, VDOORSPEED);
+            P_ChangeSwitchTexture(line, 1);
+            break;
+        case 47:               // Impact_RaiseFloorNear&Change
+            EV_DoPlat(line, raiseToNearestAndChange, 0);
+            P_ChangeSwitchTexture(line, 0);
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerInSpecialSector
+//
+// Called every tic frame that the player origin is in a special sector.
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerInSpecialSector(player_t * player)
+{
+    sector_t *sector;
+    static int pushTab[5] = {
+        2048 * 5,
+        2048 * 10,
+        2048 * 25,
+        2048 * 30,
+        2048 * 35
+    };
+
+    sector = player->mo->subsector->sector;
+    if (player->mo->z != sector->floorheight)
+    {                           // Player is not touching the floor
+        return;
+    }
+    switch (sector->special)
+    {
+        case 7:                // Damage_Sludge
+            if (!(leveltime & 31))
+            {
+                P_DamageMobj(player->mo, NULL, NULL, 4);
+            }
+            break;
+        case 5:                // Damage_LavaWimpy
+            if (!(leveltime & 15))
+            {
+                P_DamageMobj(player->mo, &LavaInflictor, NULL, 5);
+                P_HitFloor(player->mo);
+            }
+            break;
+        case 16:               // Damage_LavaHefty
+            if (!(leveltime & 15))
+            {
+                P_DamageMobj(player->mo, &LavaInflictor, NULL, 8);
+                P_HitFloor(player->mo);
+            }
+            break;
+        case 4:                // Scroll_EastLavaDamage
+            P_Thrust(player, 0, 2048 * 28);
+            if (!(leveltime & 15))
+            {
+                P_DamageMobj(player->mo, &LavaInflictor, NULL, 5);
+                P_HitFloor(player->mo);
+            }
+            break;
+        case 9:                // SecretArea
+            player->secretcount++;
+            sector->special = 0;
+            break;
+        case 11:               // Exit_SuperDamage (DOOM E1M8 finale)
+            /*
+               player->cheats &= ~CF_GODMODE;
+               if(!(leveltime&0x1f))
+               {
+               P_DamageMobj(player->mo, NULL, NULL, 20);
+               }
+               if(player->health <= 10)
+               {
+               G_ExitLevel();
+               }
+             */
+            break;
+
+        case 25:
+        case 26:
+        case 27:
+        case 28:
+        case 29:               // Scroll_North
+            P_Thrust(player, ANG90, pushTab[sector->special - 25]);
+            break;
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+        case 24:               // Scroll_East
+            P_Thrust(player, 0, pushTab[sector->special - 20]);
+            break;
+        case 30:
+        case 31:
+        case 32:
+        case 33:
+        case 34:               // Scroll_South
+            P_Thrust(player, ANG270, pushTab[sector->special - 30]);
+            break;
+        case 35:
+        case 36:
+        case 37:
+        case 38:
+        case 39:               // Scroll_West
+            P_Thrust(player, ANG180, pushTab[sector->special - 35]);
+            break;
+
+        case 40:
+        case 41:
+        case 42:
+        case 43:
+        case 44:
+        case 45:
+        case 46:
+        case 47:
+        case 48:
+        case 49:
+        case 50:
+        case 51:
+            // Wind specials are handled in (P_mobj):P_XYMovement
+            break;
+
+        case 15:               // Friction_Low
+            // Only used in (P_mobj):P_XYMovement and (P_user):P_Thrust
+            break;
+
+        default:
+            I_Error("P_PlayerInSpecialSector: "
+                    "unknown special %i", sector->special);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_UpdateSpecials
+//
+// Animate planes, scroll walls, etc.
+//
+//----------------------------------------------------------------------------
+
+void P_UpdateSpecials(void)
+{
+    int i;
+    int pic;
+    anim_t *anim;
+    line_t *line;
+
+    // Animate flats and textures
+    for (anim = anims; anim < lastanim; anim++)
+    {
+        for (i = anim->basepic; i < anim->basepic + anim->numpics; i++)
+        {
+            pic =
+                anim->basepic +
+                ((leveltime / anim->speed + i) % anim->numpics);
+            if (anim->istexture)
+            {
+                texturetranslation[i] = pic;
+            }
+            else
+            {
+                flattranslation[i] = pic;
+            }
+        }
+    }
+    // Update scrolling texture offsets
+    for (i = 0; i < numlinespecials; i++)
+    {
+        line = linespeciallist[i];
+        switch (line->special)
+        {
+            case 48:           // Effect_Scroll_Left
+                sides[line->sidenum[0]].textureoffset += FRACUNIT;
+                break;
+            case 99:           // Effect_Scroll_Right
+                sides[line->sidenum[0]].textureoffset -= FRACUNIT;
+                break;
+        }
+    }
+    // Handle buttons
+    for (i = 0; i < MAXBUTTONS; i++)
+    {
+        if (buttonlist[i].btimer)
+        {
+            buttonlist[i].btimer--;
+            if (!buttonlist[i].btimer)
+            {
+                switch (buttonlist[i].where)
+                {
+                    case top:
+                        sides[buttonlist[i].line->sidenum[0]].toptexture =
+                            buttonlist[i].btexture;
+                        break;
+                    case middle:
+                        sides[buttonlist[i].line->sidenum[0]].midtexture =
+                            buttonlist[i].btexture;
+                        break;
+                    case bottom:
+                        sides[buttonlist[i].line->sidenum[0]].bottomtexture =
+                            buttonlist[i].btexture;
+                        break;
+                }
+                S_StartSound(buttonlist[i].soundorg, sfx_switch);
+                memset(&buttonlist[i], 0, sizeof(button_t));
+            }
+        }
+    }
+}
+
+//============================================================
+//
+//      Special Stuff that can't be categorized
+//
+//============================================================
+int EV_DoDonut(line_t * line)
+{
+    sector_t *s1;
+    sector_t *s2;
+    sector_t *s3;
+    int secnum;
+    int rtn;
+    int i;
+    floormove_t *floor;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+    {
+        s1 = &sectors[secnum];
+
+        //      ALREADY MOVING?  IF SO, KEEP GOING...
+        if (s1->specialdata)
+            continue;
+
+        rtn = 1;
+        s2 = getNextSector(s1->lines[0], s1);
+        for (i = 0; i < s2->linecount; i++)
+        {
+            // Note: This was originally part of the following test:
+            //   (!s2->lines[i]->flags & ML_TWOSIDED) ||
+            // Due to the apparent mistaken formatting, this can never be
+            // true.
+
+            if (s2->lines[i]->backsector == s1)
+                continue;
+            s3 = s2->lines[i]->backsector;
+
+            //
+            //      Spawn rising slime
+            //
+            floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+            P_AddThinker(&floor->thinker);
+            s2->specialdata = floor;
+            floor->thinker.function = T_MoveFloor;
+            floor->type = donutRaise;
+            floor->crush = false;
+            floor->direction = 1;
+            floor->sector = s2;
+            floor->speed = FLOORSPEED / 2;
+            floor->texture = s3->floorpic;
+            floor->newspecial = 0;
+            floor->floordestheight = s3->floorheight;
+
+            //
+            //      Spawn lowering donut-hole
+            //
+            floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+            P_AddThinker(&floor->thinker);
+            s1->specialdata = floor;
+            floor->thinker.function = T_MoveFloor;
+            floor->type = lowerFloor;
+            floor->crush = false;
+            floor->direction = -1;
+            floor->sector = s1;
+            floor->speed = FLOORSPEED / 2;
+            floor->floordestheight = s3->floorheight;
+            break;
+        }
+    }
+    return rtn;
+}
+
+/*
+==============================================================================
+
+							SPECIAL SPAWNING
+
+==============================================================================
+*/
+/*
+================================================================================
+= P_SpawnSpecials
+=
+= After the map has been loaded, scan for specials that
+= spawn thinkers
+=
+===============================================================================
+*/
+
+short numlinespecials;
+line_t *linespeciallist[MAXLINEANIMS];
+
+void P_SpawnSpecials(void)
+{
+    sector_t *sector;
+    int i;
+
+    //
+    //      Init special SECTORs
+    //
+    sector = sectors;
+    for (i = 0; i < numsectors; i++, sector++)
+    {
+        if (!sector->special)
+            continue;
+        switch (sector->special)
+        {
+            case 1:            // FLICKERING LIGHTS
+                P_SpawnLightFlash(sector);
+                break;
+            case 2:            // STROBE FAST
+                P_SpawnStrobeFlash(sector, FASTDARK, 0);
+                break;
+            case 3:            // STROBE SLOW
+                P_SpawnStrobeFlash(sector, SLOWDARK, 0);
+                break;
+            case 4:            // STROBE FAST/DEATH SLIME
+                P_SpawnStrobeFlash(sector, FASTDARK, 0);
+                sector->special = 4;
+                break;
+            case 8:            // GLOWING LIGHT
+                P_SpawnGlowingLight(sector);
+                break;
+            case 9:            // SECRET SECTOR
+                totalsecret++;
+                break;
+            case 10:           // DOOR CLOSE IN 30 SECONDS
+                P_SpawnDoorCloseIn30(sector);
+                break;
+            case 12:           // SYNC STROBE SLOW
+                P_SpawnStrobeFlash(sector, SLOWDARK, 1);
+                break;
+            case 13:           // SYNC STROBE FAST
+                P_SpawnStrobeFlash(sector, FASTDARK, 1);
+                break;
+            case 14:           // DOOR RAISE IN 5 MINUTES
+                P_SpawnDoorRaiseIn5Mins(sector, i);
+                break;
+        }
+    }
+
+
+    //
+    //      Init line EFFECTs
+    //
+    numlinespecials = 0;
+    for (i = 0; i < numlines; i++)
+        switch (lines[i].special)
+        {
+            case 48:           // Effect_Scroll_Left
+            case 99:           // Effect_Scroll_Right
+                linespeciallist[numlinespecials] = &lines[i];
+                numlinespecials++;
+                break;
+        }
+
+    //
+    //      Init other misc stuff
+    //
+    for (i = 0; i < MAXCEILINGS; i++)
+        activeceilings[i] = NULL;
+    for (i = 0; i < MAXPLATS; i++)
+        activeplats[i] = NULL;
+    for (i = 0; i < MAXBUTTONS; i++)
+        memset(&buttonlist[i], 0, sizeof(button_t));
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_InitAmbientSound
+//
+//----------------------------------------------------------------------------
+
+void P_InitAmbientSound(void)
+{
+    AmbSfxCount = 0;
+    AmbSfxVolume = 0;
+    AmbSfxTics = 10 * TICRATE;
+    AmbSfxPtr = AmbSndSeqInit;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_AddAmbientSfx
+//
+// Called by (P_mobj):P_SpawnMapThing during (P_setup):P_SetupLevel.
+//
+//----------------------------------------------------------------------------
+
+void P_AddAmbientSfx(int sequence)
+{
+    if (AmbSfxCount == MAX_AMBIENT_SFX)
+    {
+        I_Error("Too many ambient sound sequences");
+    }
+    LevelAmbientSfx[AmbSfxCount++] = AmbientSfx[sequence];
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_AmbientSound
+//
+// Called every tic by (P_tick):P_Ticker.
+//
+//----------------------------------------------------------------------------
+
+void P_AmbientSound(void)
+{
+    afxcmd_t cmd;
+    int sound;
+    boolean done;
+
+    if (!AmbSfxCount)
+    {                           // No ambient sound sequences on current level
+        return;
+    }
+    if (--AmbSfxTics)
+    {
+        return;
+    }
+    done = false;
+    do
+    {
+        cmd = *AmbSfxPtr++;
+        switch (cmd)
+        {
+            case afxcmd_play:
+                AmbSfxVolume = P_Random() >> 2;
+                S_StartSoundAtVolume(NULL, *AmbSfxPtr++, AmbSfxVolume);
+                break;
+            case afxcmd_playabsvol:
+                sound = *AmbSfxPtr++;
+                AmbSfxVolume = *AmbSfxPtr++;
+                S_StartSoundAtVolume(NULL, sound, AmbSfxVolume);
+                break;
+            case afxcmd_playrelvol:
+                sound = *AmbSfxPtr++;
+                AmbSfxVolume += *AmbSfxPtr++;
+                if (AmbSfxVolume < 0)
+                {
+                    AmbSfxVolume = 0;
+                }
+                else if (AmbSfxVolume > 127)
+                {
+                    AmbSfxVolume = 127;
+                }
+                S_StartSoundAtVolume(NULL, sound, AmbSfxVolume);
+                break;
+            case afxcmd_delay:
+                AmbSfxTics = *AmbSfxPtr++;
+                done = true;
+                break;
+            case afxcmd_delayrand:
+                AmbSfxTics = P_Random() & (*AmbSfxPtr++);
+                done = true;
+                break;
+            case afxcmd_end:
+                AmbSfxTics = 6 * TICRATE + P_Random();
+                AmbSfxPtr = LevelAmbientSfx[P_Random() % AmbSfxCount];
+                done = true;
+                break;
+            default:
+                I_Error("P_AmbientSound: Unknown afxcmd %d", cmd);
+                break;
+        }
+    }
+    while (done == false);
+}
diff --git a/games/NXDoom/src/heretic/p_spec.h b/games/NXDoom/src/heretic/p_spec.h
new file mode 100644
index 000000000..7d78e4d2c
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_spec.h
@@ -0,0 +1,390 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_spec.h
+
+/*
+===============================================================================
+
+							P_SPEC
+
+===============================================================================
+*/
+
+//
+//      Animating textures and planes
+//
+typedef struct
+{
+    boolean istexture;
+    int picnum;
+    int basepic;
+    int numpics;
+    int speed;
+} anim_t;
+
+//
+//      source animation definition
+//
+typedef struct
+{
+    int istexture;          // if false, it's a flat
+    char endname[9];
+    char startname[9];
+    int speed;
+} animdef_t;
+
+#define	MAXANIMS		32
+
+extern anim_t anims[MAXANIMS], *lastanim;
+extern int *TerrainTypes;
+
+//
+//      Animating line specials
+//
+#define	MAXLINEANIMS		64
+extern short numlinespecials;
+extern line_t *linespeciallist[MAXLINEANIMS];
+
+//      Define values for map objects
+#define	MO_TELEPORTMAN		14
+
+// at game start
+void P_InitPicAnims(void);
+void P_InitTerrainTypes(void);
+void P_InitLava(void);
+
+// at map load
+void P_SpawnSpecials(void);
+void P_InitAmbientSound(void);
+void P_AddAmbientSfx(int sequence);
+
+// every tic
+void P_UpdateSpecials(void);
+void P_AmbientSound(void);
+
+// when needed
+boolean P_UseSpecialLine(mobj_t * thing, line_t * line);
+void P_ShootSpecialLine(mobj_t * thing, line_t * line);
+void P_CrossSpecialLine(int linenum, int side, mobj_t * thing);
+
+void P_PlayerInSpecialSector(player_t * player);
+
+int twoSided(int sector, int line);
+sector_t *getSector(int currentSector, int line, int side);
+side_t *getSide(int currentSector, int line, int side);
+fixed_t P_FindLowestFloorSurrounding(sector_t * sec);
+fixed_t P_FindHighestFloorSurrounding(sector_t * sec);
+fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight);
+fixed_t P_FindLowestCeilingSurrounding(sector_t * sec);
+fixed_t P_FindHighestCeilingSurrounding(sector_t * sec);
+int P_FindSectorFromLineTag(line_t * line, int start);
+int P_FindMinSurroundingLight(sector_t * sector, int max);
+sector_t *getNextSector(line_t * line, sector_t * sec);
+
+//
+//      SPECIAL
+//
+int EV_DoDonut(line_t * line);
+
+/*
+===============================================================================
+
+							P_LIGHTS
+
+===============================================================================
+*/
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int count;
+    int maxlight;
+    int minlight;
+    int maxtime;
+    int mintime;
+} lightflash_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int count;
+    int minlight;
+    int maxlight;
+    int darktime;
+    int brighttime;
+} strobe_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int minlight;
+    int maxlight;
+    int direction;
+} glow_t;
+
+#define GLOWSPEED		8
+#define	STROBEBRIGHT	5
+#define	FASTDARK		15
+#define	SLOWDARK		35
+
+void T_LightFlash(thinker_t *thinker);
+void P_SpawnLightFlash(sector_t * sector);
+void T_StrobeFlash(thinker_t *thinker);
+void P_SpawnStrobeFlash(sector_t * sector, int fastOrSlow, int inSync);
+void EV_StartLightStrobing(line_t * line);
+void EV_TurnTagLightsOff(line_t * line);
+void EV_LightTurnOn(line_t * line, int bright);
+void T_Glow(thinker_t *thinker);
+void P_SpawnGlowingLight(sector_t * sector);
+
+/*
+===============================================================================
+
+							P_SWITCH
+
+===============================================================================
+*/
+typedef struct
+{
+    char name1[9];
+    char name2[9];
+    short episode;
+} switchlist_t;
+
+typedef enum
+{
+    top,
+    middle,
+    bottom
+} bwhere_e;
+
+typedef struct
+{
+    line_t *line;
+    bwhere_e where;
+    int btexture;
+    int btimer;
+    void *soundorg;
+} button_t;
+
+#define	MAXSWITCHES	50      // max # of wall switches in a level
+#define	MAXBUTTONS	16      // 4 players, 4 buttons each at once, max.
+#define BUTTONTIME	35      // 1 second
+
+extern button_t buttonlist[MAXBUTTONS];
+
+void P_ChangeSwitchTexture(line_t * line, int useAgain);
+void P_InitSwitchList(void);
+
+/*
+===============================================================================
+
+							P_PLATS
+
+===============================================================================
+*/
+typedef enum
+{
+    up,
+    down,
+    waiting,
+    in_stasis
+} plat_e;
+
+typedef enum
+{
+    perpetualRaise,
+    downWaitUpStay,
+    raiseAndChange,
+    raiseToNearestAndChange
+} plattype_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    fixed_t speed;
+    fixed_t low;
+    fixed_t high;
+    int wait;
+    int count;
+    plat_e status;
+    plat_e oldstatus;
+    boolean crush;
+    int tag;
+    plattype_e type;
+} plat_t;
+
+#define	PLATWAIT	3
+#define	PLATSPEED	FRACUNIT
+#define	MAXPLATS	30
+
+extern plat_t *activeplats[MAXPLATS];
+
+void T_PlatRaise(thinker_t *thinker);
+int EV_DoPlat(line_t * line, plattype_e type, int amount);
+void P_AddActivePlat(plat_t * plat);
+void P_RemoveActivePlat(plat_t * plat);
+void EV_StopPlat(line_t * line);
+void P_ActivateInStasis(int tag);
+
+/*
+===============================================================================
+
+							P_DOORS
+
+===============================================================================
+*/
+typedef enum
+{
+    vld_normal,
+    vld_close30ThenOpen,
+    vld_close,
+    vld_open,
+    vld_raiseIn5Mins
+} vldoor_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    vldoor_e type;
+    sector_t *sector;
+    fixed_t topheight;
+    fixed_t speed;
+    int direction;              // 1 = up, 0 = waiting at top, -1 = down
+    int topwait;                // tics to wait at the top
+    // (keep in case a door going down is reset)
+    int topcountdown;           // when it reaches 0, start going down
+} vldoor_t;
+
+#define	VDOORSPEED	FRACUNIT*2
+#define	VDOORWAIT		150
+
+void EV_VerticalDoor(line_t * line, mobj_t * thing);
+int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed);
+void T_VerticalDoor(thinker_t *thinker);
+void P_SpawnDoorCloseIn30(sector_t * sec);
+void P_SpawnDoorRaiseIn5Mins(sector_t * sec, int secnum);
+
+/*
+===============================================================================
+
+							P_CEILNG
+
+===============================================================================
+*/
+typedef enum
+{
+    lowerToFloor,
+    raiseToHighest,
+    lowerAndCrush,
+    crushAndRaise,
+    fastCrushAndRaise
+} ceiling_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    ceiling_e type;
+    sector_t *sector;
+    fixed_t bottomheight, topheight;
+    fixed_t speed;
+    boolean crush;
+    int direction;              // 1 = up, 0 = waiting, -1 = down
+    int tag;                    // ID
+    int olddirection;
+} ceiling_t;
+
+#define	CEILSPEED		FRACUNIT
+#define	CEILWAIT		150
+#define MAXCEILINGS		30
+
+extern ceiling_t *activeceilings[MAXCEILINGS];
+
+int EV_DoCeiling(line_t * line, ceiling_e type);
+void T_MoveCeiling(thinker_t *thinker);
+void P_AddActiveCeiling(ceiling_t * c);
+void P_RemoveActiveCeiling(ceiling_t * c);
+int EV_CeilingCrushStop(line_t * line);
+void P_ActivateInStasisCeiling(line_t * line);
+
+/*
+===============================================================================
+
+							P_FLOOR
+
+===============================================================================
+*/
+typedef enum
+{
+    lowerFloor,                 // lower floor to highest surrounding floor
+    lowerFloorToLowest,         // lower floor to lowest surrounding floor
+    turboLower,                 // lower floor to highest surrounding floor VERY FAST
+    raiseFloor,                 // raise floor to lowest surrounding CEILING
+    raiseFloorToNearest,        // raise floor to next highest surrounding floor
+    raiseToTexture,             // raise floor to shortest height texture around it
+    lowerAndChange,             // lower floor to lowest surrounding floor and change
+    // floorpic
+    raiseFloor24,
+    raiseFloor24AndChange,
+    raiseFloorCrush,
+    donutRaise,
+    raiseBuildStep              // One step of a staircase
+} floor_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    floor_e type;
+    boolean crush;
+    sector_t *sector;
+    int direction;
+    int newspecial;
+    short texture;
+    fixed_t floordestheight;
+    fixed_t speed;
+} floormove_t;
+
+#define	FLOORSPEED	FRACUNIT
+
+typedef enum
+{
+    ok,
+    crushed,
+    pastdest
+} result_e;
+
+result_e T_MovePlane(sector_t * sector, fixed_t speed,
+                     fixed_t dest, boolean crush, int floorOrCeiling,
+                     int direction);
+
+int EV_BuildStairs(line_t * line, fixed_t stepDelta);
+int EV_DoFloor(line_t * line, floor_e floortype);
+void T_MoveFloor(thinker_t *thinker);
+
+/*
+===============================================================================
+
+							P_TELEPT
+
+===============================================================================
+*/
+
+boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle);
+boolean EV_Teleport(line_t * line, int side, mobj_t * thing);
diff --git a/games/NXDoom/src/heretic/p_switch.c b/games/NXDoom/src/heretic/p_switch.c
new file mode 100644
index 000000000..885d67326
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_switch.c
@@ -0,0 +1,409 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+//==================================================================
+//
+//      CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
+//
+//==================================================================
+switchlist_t alphSwitchList[] = {
+    {"SW1OFF", "SW1ON", 1},
+    {"SW2OFF", "SW2ON", 1},
+
+/*
+	{"SW1CTY",		"SW2CTY",	1},
+	{"SW1ORGRY",	"SW2ORGRY",	1},
+	{"SW1GRSTN",	"SW2GRSTN",	1},
+	{"SW1SNDP",		"SW2SNDP",	1},
+	{"SW1SPINE",	"SW2SPINE",	1},
+	{"SW1SQPEB",	"SW2SQPEB",	1},
+	{"SW1TRST1",	"SW2TRST1",	1},
+	{"SW1CSTL",		"SW2CSTL",	1},
+	{"SW1MOSS",		"SW2MOSS",	1},
+	{"SW1SNDSQ",	"SW2SNDSQ",	1},
+	{"SW1RED",		"SW2RED",	1},
+	{"SW1WOOD",		"SW2WOOD",	1},
+	{"SW1BROWN",	"SW2BROWN",	1},
+
+	{"SW1TRST2",	"SW2TRST2",	2},
+	{"SW1MSC",		"SW2MSC",	2},
+	{"SW1MSC2",		"SW2MSC2",	2},
+	{"SW1GRDMD",	"SW2GRDMD",	2},
+*/
+
+#if 0
+    {"SW1BRCOM", "SW2BRCOM", 1},
+    {"SW1BRN1", "SW2BRN1", 1},
+    {"SW1BRN2", "SW2BRN2", 1},
+    {"SW1BRNGN", "SW2BRNGN", 1},
+    {"SW1BROWN", "SW2BROWN", 1},
+    {"SW1COMM", "SW2COMM", 1},
+    {"SW1COMP", "SW2COMP", 1},
+    {"SW1DIRT", "SW2DIRT", 1},
+    {"SW1EXIT", "SW2EXIT", 1},
+    {"SW1GRAY", "SW2GRAY", 1},
+    {"SW1GRAY1", "SW2GRAY1", 1},
+    {"SW1METAL", "SW2METAL", 1},
+    {"SW1PIPE", "SW2PIPE", 1},
+    {"SW1SLAD", "SW2SLAD", 1},
+    {"SW1STARG", "SW2STARG", 1},
+    {"SW1STON1", "SW2STON1", 1},
+    {"SW1STON2", "SW2STON2", 1},
+    {"SW1STONE", "SW2STONE", 1},
+    {"SW1STRTN", "SW2STRTN", 1},
+
+    {"SW1BLUE", "SW2BLUE", 2},
+    {"SW1CMT", "SW2CMT", 2},
+    {"SW1GARG", "SW2GARG", 2},
+    {"SW1GSTON", "SW2GSTON", 2},
+    {"SW1HOT", "SW2HOT", 2},
+    {"SW1LION", "SW2LION", 2},
+    {"SW1SATYR", "SW2SATYR", 2},
+    {"SW1SKIN", "SW2SKIN", 2},
+    {"SW1VINE", "SW2VINE", 2},
+    {"SW1WOOD", "SW2WOOD", 2},
+#endif
+};
+
+int switchlist[MAXSWITCHES * 2];
+int numswitches;
+button_t buttonlist[MAXBUTTONS];
+
+/*
+===============
+=
+= P_InitSwitchList
+=
+= Only called at game initialization
+=
+===============
+*/
+
+void P_InitSwitchList(void)
+{
+    int i, slindex, episode;
+
+    // Note that this is called "episode" here but it's actually something
+    // quite different. As we progress from Shareware->Registered->Doom II
+    // we support more switch textures.
+    if (gamemode == shareware)
+    {
+        episode = 1;
+    }
+    else
+    {
+        episode = 2;
+    }
+
+    slindex = 0;
+
+    for (i = 0; i < arrlen(alphSwitchList); i++)
+    {
+	if (alphSwitchList[i].episode <= episode)
+	{
+	    switchlist[slindex++] =
+                R_TextureNumForName(DEH_String(alphSwitchList[i].name1));
+	    switchlist[slindex++] =
+                R_TextureNumForName(DEH_String(alphSwitchList[i].name2));
+	}
+    }
+
+    numswitches = slindex / 2;
+    switchlist[slindex] = -1;
+}
+
+//==================================================================
+//
+//      Start a button counting down till it turns off.
+//
+//==================================================================
+void P_StartButton(line_t * line, bwhere_e w, int texture, int time)
+{
+    int i;
+
+    for (i = 0; i < MAXBUTTONS; i++)
+        if (!buttonlist[i].btimer)
+        {
+            buttonlist[i].line = line;
+            buttonlist[i].where = w;
+            buttonlist[i].btexture = texture;
+            buttonlist[i].btimer = time;
+            buttonlist[i].soundorg = &line->frontsector->soundorg;
+            return;
+        }
+
+    I_Error("P_StartButton: no button slots left!");
+}
+
+//==================================================================
+//
+//      Function that changes wall texture.
+//      Tell it if switch is ok to use again (1=yes, it's a button).
+//
+//==================================================================
+void P_ChangeSwitchTexture(line_t * line, int useAgain)
+{
+    int texTop;
+    int texMid;
+    int texBot;
+    int i;
+    int sound;
+
+    if (!useAgain)
+        line->special = 0;
+
+    texTop = sides[line->sidenum[0]].toptexture;
+    texMid = sides[line->sidenum[0]].midtexture;
+    texBot = sides[line->sidenum[0]].bottomtexture;
+
+    sound = sfx_switch;
+    //if (line->special == 11) // EXIT SWITCH?
+    //      sound = sfx_swtchx;
+
+    for (i = 0; i < numswitches * 2; i++)
+        if (switchlist[i] == texTop)
+        {
+            S_StartSound(buttonlist->soundorg, sound);
+            sides[line->sidenum[0]].toptexture = switchlist[i ^ 1];
+            if (useAgain)
+                P_StartButton(line, top, switchlist[i], BUTTONTIME);
+            return;
+        }
+        else if (switchlist[i] == texMid)
+        {
+            S_StartSound(buttonlist->soundorg, sound);
+            sides[line->sidenum[0]].midtexture = switchlist[i ^ 1];
+            if (useAgain)
+                P_StartButton(line, middle, switchlist[i], BUTTONTIME);
+            return;
+        }
+        else if (switchlist[i] == texBot)
+        {
+            S_StartSound(buttonlist->soundorg, sound);
+            sides[line->sidenum[0]].bottomtexture = switchlist[i ^ 1];
+            if (useAgain)
+                P_StartButton(line, bottom, switchlist[i], BUTTONTIME);
+            return;
+        }
+}
+
+/*
+==============================================================================
+=
+= P_UseSpecialLine
+=
+= Called when a thing uses a special line
+= Only the front sides of lines are usable
+===============================================================================
+*/
+
+boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
+{
+    //
+    //      Switches that other things can activate
+    //
+    if (!thing->player)
+    {
+        if (line->flags & ML_SECRET)
+            return false;       // never open secret doors
+        switch (line->special)
+        {
+            case 1:            // MANUAL DOOR RAISE
+            case 32:           // MANUAL BLUE
+            case 33:           // MANUAL RED
+            case 34:           // MANUAL YELLOW
+                break;
+            default:
+                return false;
+        }
+    }
+
+    //
+    // do something
+    //      
+    switch (line->special)
+    {
+            //===============================================
+            //      MANUALS
+            //===============================================
+        case 1:                // Vertical Door
+        case 26:               // Blue Door/Locked
+        case 27:               // Yellow Door /Locked
+        case 28:               // Red Door /Locked
+
+        case 31:               // Manual door open
+        case 32:               // Blue locked door open
+        case 33:               // Red locked door open
+        case 34:               // Yellow locked door open
+            EV_VerticalDoor(line, thing);
+            break;
+            //===============================================
+            //      SWITCHES
+            //===============================================
+        case 7:                // Switch_Build_Stairs (8 pixel steps)
+            if (EV_BuildStairs(line, 8 * FRACUNIT))
+            {
+                P_ChangeSwitchTexture(line, 0);
+            }
+            break;
+        case 107:              // Switch_Build_Stairs_16 (16 pixel steps)
+            if (EV_BuildStairs(line, 16 * FRACUNIT))
+            {
+                P_ChangeSwitchTexture(line, 0);
+            }
+            break;
+        case 9:                // Change Donut
+            if (EV_DoDonut(line))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 11:               // Exit level
+            G_ExitLevel();
+            P_ChangeSwitchTexture(line, 0);
+            break;
+        case 14:               // Raise Floor 32 and change texture
+            if (EV_DoPlat(line, raiseAndChange, 32))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 15:               // Raise Floor 24 and change texture
+            if (EV_DoPlat(line, raiseAndChange, 24))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 18:               // Raise Floor to next highest floor
+            if (EV_DoFloor(line, raiseFloorToNearest))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 20:               // Raise Plat next highest floor and change texture
+            if (EV_DoPlat(line, raiseToNearestAndChange, 0))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 21:               // PlatDownWaitUpStay
+            if (EV_DoPlat(line, downWaitUpStay, 0))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 23:               // Lower Floor to Lowest
+            if (EV_DoFloor(line, lowerFloorToLowest))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 29:               // Raise Door
+            if (EV_DoDoor(line, vld_normal, VDOORSPEED))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 41:               // Lower Ceiling to Floor
+            if (EV_DoCeiling(line, lowerToFloor))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 71:               // Turbo Lower Floor
+            if (EV_DoFloor(line, turboLower))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 49:               // Lower Ceiling And Crush
+            if (EV_DoCeiling(line, lowerAndCrush))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 50:               // Close Door
+            if (EV_DoDoor(line, vld_close, VDOORSPEED))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 51:               // Secret EXIT
+            G_SecretExitLevel();
+            P_ChangeSwitchTexture(line, 0);
+            break;
+        case 55:               // Raise Floor Crush
+            if (EV_DoFloor(line, raiseFloorCrush))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 101:              // Raise Floor
+            if (EV_DoFloor(line, raiseFloor))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 102:              // Lower Floor to Surrounding floor height
+            if (EV_DoFloor(line, lowerFloor))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+        case 103:              // Open Door
+            if (EV_DoDoor(line, vld_open, VDOORSPEED))
+                P_ChangeSwitchTexture(line, 0);
+            break;
+            //===============================================
+            //      BUTTONS
+            //===============================================
+        case 42:               // Close Door
+            if (EV_DoDoor(line, vld_close, VDOORSPEED))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 43:               // Lower Ceiling to Floor
+            if (EV_DoCeiling(line, lowerToFloor))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 45:               // Lower Floor to Surrounding floor height
+            if (EV_DoFloor(line, lowerFloor))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 60:               // Lower Floor to Lowest
+            if (EV_DoFloor(line, lowerFloorToLowest))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 61:               // Open Door
+            if (EV_DoDoor(line, vld_open, VDOORSPEED))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 62:               // PlatDownWaitUpStay
+            if (EV_DoPlat(line, downWaitUpStay, 1))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 63:               // Raise Door
+            if (EV_DoDoor(line, vld_normal, VDOORSPEED))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 64:               // Raise Floor to ceiling
+            if (EV_DoFloor(line, raiseFloor))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 66:               // Raise Floor 24 and change texture
+            if (EV_DoPlat(line, raiseAndChange, 24))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 67:               // Raise Floor 32 and change texture
+            if (EV_DoPlat(line, raiseAndChange, 32))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 65:               // Raise Floor Crush
+            if (EV_DoFloor(line, raiseFloorCrush))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 68:               // Raise Plat to next highest floor and change texture
+            if (EV_DoPlat(line, raiseToNearestAndChange, 0))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 69:               // Raise Floor to next highest floor
+            if (EV_DoFloor(line, raiseFloorToNearest))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+        case 70:               // Turbo Lower Floor
+            if (EV_DoFloor(line, turboLower))
+                P_ChangeSwitchTexture(line, 1);
+            break;
+    }
+
+    return true;
+}
diff --git a/games/NXDoom/src/heretic/p_telept.c b/games/NXDoom/src/heretic/p_telept.c
new file mode 100644
index 000000000..a922f7cf8
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_telept.c
@@ -0,0 +1,164 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_telept.c
+
+#include "doomdef.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_Teleport
+//
+//----------------------------------------------------------------------------
+
+boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle)
+{
+    fixed_t oldx;
+    fixed_t oldy;
+    fixed_t oldz;
+    fixed_t aboveFloor;
+    fixed_t fogDelta;
+    player_t *player;
+    unsigned an;
+    mobj_t *fog;
+
+    oldx = thing->x;
+    oldy = thing->y;
+    oldz = thing->z;
+    aboveFloor = thing->z - thing->floorz;
+    if (!P_TeleportMove(thing, x, y))
+    {
+        return (false);
+    }
+    if (thing->player)
+    {
+        player = thing->player;
+        if (player->powers[pw_flight] && aboveFloor)
+        {
+            thing->z = thing->floorz + aboveFloor;
+            if (thing->z + thing->height > thing->ceilingz)
+            {
+                thing->z = thing->ceilingz - thing->height;
+            }
+            player->viewz = thing->z + player->viewheight;
+        }
+        else
+        {
+            thing->z = thing->floorz;
+            player->viewz = thing->z + player->viewheight;
+            player->lookdir = 0;
+        }
+    }
+    else if (thing->flags & MF_MISSILE)
+    {
+        thing->z = thing->floorz + aboveFloor;
+        if (thing->z + thing->height > thing->ceilingz)
+        {
+            thing->z = thing->ceilingz - thing->height;
+        }
+    }
+    else
+    {
+        thing->z = thing->floorz;
+    }
+    // Spawn teleport fog at source and destination
+    fogDelta = thing->flags & MF_MISSILE ? 0 : TELEFOGHEIGHT;
+    fog = P_SpawnMobj(oldx, oldy, oldz + fogDelta, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+    an = angle >> ANGLETOFINESHIFT;
+    fog = P_SpawnMobj(x + 20 * finecosine[an],
+                      y + 20 * finesine[an], thing->z + fogDelta, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+    if (thing->player && !thing->player->powers[pw_weaponlevel2])
+    {                           // Freeze player for about .5 sec
+        thing->reactiontime = 18;
+    }
+    thing->angle = angle;
+    if (thing->flags2 & MF2_FOOTCLIP
+        && P_GetThingFloorType(thing) != FLOOR_SOLID)
+    {
+        thing->flags2 |= MF2_FEETARECLIPPED;
+    }
+    else if (thing->flags2 & MF2_FEETARECLIPPED)
+    {
+        thing->flags2 &= ~MF2_FEETARECLIPPED;
+    }
+    if (thing->flags & MF_MISSILE)
+    {
+        angle >>= ANGLETOFINESHIFT;
+        thing->momx = FixedMul(thing->info->speed, finecosine[angle]);
+        thing->momy = FixedMul(thing->info->speed, finesine[angle]);
+    }
+    else
+    {
+        thing->momx = thing->momy = thing->momz = 0;
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC EV_Teleport
+//
+//----------------------------------------------------------------------------
+
+boolean EV_Teleport(line_t * line, int side, mobj_t * thing)
+{
+    int i;
+    int tag;
+    mobj_t *m;
+    thinker_t *thinker;
+    sector_t *sector;
+
+    if (thing->flags2 & MF2_NOTELEPORT)
+    {
+        return (false);
+    }
+    if (side == 1)
+    {                           // Don't teleport when crossing back side
+        return (false);
+    }
+    tag = line->tag;
+    for (i = 0; i < numsectors; i++)
+    {
+        if (sectors[i].tag == tag)
+        {
+            for (thinker = thinkercap.next; thinker != &thinkercap;
+                 thinker = thinker->next)
+            {
+                if (thinker->function != P_MobjThinker)
+                {               // Not a mobj
+                    continue;
+                }
+                m = (mobj_t *) thinker;
+                if (m->type != MT_TELEPORTMAN)
+                {               // Not a teleportman
+                    continue;
+                }
+                sector = m->subsector->sector;
+                if (sector - sectors != i)
+                {               // Wrong sector
+                    continue;
+                }
+                return (P_Teleport(thing, m->x, m->y, m->angle));
+            }
+        }
+    }
+    return (false);
+}
diff --git a/games/NXDoom/src/heretic/p_tick.c b/games/NXDoom/src/heretic/p_tick.c
new file mode 100644
index 000000000..ac1c94299
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_tick.c
@@ -0,0 +1,167 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_tick.c
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "v_video.h"
+
+int leveltime;
+int TimerGame;
+
+/*
+===============================================================================
+
+								THINKERS
+
+All thinkers should be allocated by Z_Malloc so they can be operated on uniformly.  The actual
+structures will vary in size, but the first element must be thinker_t.
+
+===============================================================================
+*/
+
+thinker_t thinkercap;           // both the head and tail of the thinker list
+
+/*
+===============
+=
+= P_InitThinkers
+=
+===============
+*/
+
+void P_InitThinkers(void)
+{
+    thinkercap.prev = thinkercap.next = &thinkercap;
+}
+
+
+/*
+===============
+=
+= P_AddThinker
+=
+= Adds a new thinker at the end of the list
+=
+===============
+*/
+
+void P_AddThinker(thinker_t * thinker)
+{
+    thinkercap.prev->next = thinker;
+    thinker->next = &thinkercap;
+    thinker->prev = thinkercap.prev;
+    thinkercap.prev = thinker;
+}
+
+/*
+===============
+=
+= P_RemoveThinker
+=
+= Deallocation is lazy -- it will not actually be freed until its
+= thinking turn comes up
+=
+===============
+*/
+
+void P_RemoveThinker(thinker_t * thinker)
+{
+    thinker->function = (think_t) - 1;
+}
+
+/*
+===============
+=
+= P_AllocateThinker
+=
+= Allocates memory and adds a new thinker at the end of the list
+=
+===============
+*/
+
+void P_AllocateThinker(thinker_t * thinker)
+{
+}
+
+
+/*
+===============
+=
+= P_RunThinkers
+=
+===============
+*/
+
+void P_RunThinkers(void)
+{
+    thinker_t *currentthinker, *nextthinker;
+
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+        if (currentthinker->function == (think_t) - 1)
+        {                       // time to remove it
+            nextthinker = currentthinker->next;
+            currentthinker->next->prev = currentthinker->prev;
+            currentthinker->prev->next = currentthinker->next;
+            Z_Free(currentthinker);
+        }
+        else
+        {
+            if (currentthinker->function)
+                currentthinker->function(currentthinker);
+            nextthinker = currentthinker->next;
+        }
+        currentthinker = nextthinker;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_Ticker
+//
+//----------------------------------------------------------------------------
+
+void P_Ticker(void)
+{
+    int i;
+
+    if (paused)
+    {
+        return;
+    }
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (playeringame[i])
+        {
+            P_PlayerThink(&players[i]);
+        }
+    }
+    if (TimerGame)
+    {
+        if (!--TimerGame)
+        {
+            G_ExitLevel();
+        }
+    }
+    P_RunThinkers();
+    P_UpdateSpecials();
+    P_AmbientSound();
+    leveltime++;
+}
diff --git a/games/NXDoom/src/heretic/p_user.c b/games/NXDoom/src/heretic/p_user.c
new file mode 100644
index 000000000..b24029ca7
--- /dev/null
+++ b/games/NXDoom/src/heretic/p_user.c
@@ -0,0 +1,1017 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// P_user.c
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+void P_PlayerNextArtifact(player_t * player);
+
+// Macros
+
+#define MAXBOB 0x100000         // 16 pixels of bob
+
+// Data
+
+boolean onground;
+int newtorch;                   // used in the torch flicker effect.
+int newtorchdelta;
+
+boolean WeaponInShareware[] = {
+    true,                       // Staff
+    true,                       // Gold wand
+    true,                       // Crossbow
+    true,                       // Blaster
+    false,                      // Skull rod
+    false,                      // Phoenix rod
+    false,                      // Mace
+    true,                       // Gauntlets
+    true                        // Beak
+};
+
+/*
+==================
+=
+= P_Thrust
+=
+= moves the given origin along a given angle
+=
+==================
+*/
+
+void P_Thrust(player_t * player, angle_t angle, fixed_t move)
+{
+    angle >>= ANGLETOFINESHIFT;
+    if (player->powers[pw_flight] && !(player->mo->z <= player->mo->floorz))
+    {
+        player->mo->momx += FixedMul(move, finecosine[angle]);
+        player->mo->momy += FixedMul(move, finesine[angle]);
+    }
+    else if (player->mo->subsector->sector->special == 15)      // Friction_Low
+    {
+        player->mo->momx += FixedMul(move >> 2, finecosine[angle]);
+        player->mo->momy += FixedMul(move >> 2, finesine[angle]);
+    }
+    else
+    {
+        player->mo->momx += FixedMul(move, finecosine[angle]);
+        player->mo->momy += FixedMul(move, finesine[angle]);
+    }
+}
+
+
+/*
+==================
+=
+= P_CalcHeight
+=
+=Calculate the walking / running height adjustment
+=
+==================
+*/
+
+void P_CalcHeight(player_t * player)
+{
+    int angle;
+    fixed_t bob;
+
+//
+// regular movement bobbing (needs to be calculated for gun swing even
+// if not on ground)
+// OPTIMIZE: tablify angle
+
+    player->bob = FixedMul(player->mo->momx, player->mo->momx) +
+        FixedMul(player->mo->momy, player->mo->momy);
+    player->bob >>= 2;
+    if (player->bob > MAXBOB)
+        player->bob = MAXBOB;
+    if (player->mo->flags2 & MF2_FLY && !onground)
+    {
+        player->bob = FRACUNIT / 2;
+    }
+
+    if ((player->cheats & CF_NOMOMENTUM))
+    {
+        player->viewz = player->mo->z + VIEWHEIGHT;
+        if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
+            player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
+        player->viewz = player->mo->z + player->viewheight;
+        return;
+    }
+
+    angle = (FINEANGLES / 20 * leveltime) & FINEMASK;
+    bob = FixedMul(player->bob / 2, finesine[angle]);
+
+//
+// move viewheight
+//
+    if (player->playerstate == PST_LIVE)
+    {
+        player->viewheight += player->deltaviewheight;
+        if (player->viewheight > VIEWHEIGHT)
+        {
+            player->viewheight = VIEWHEIGHT;
+            player->deltaviewheight = 0;
+        }
+        if (player->viewheight < VIEWHEIGHT / 2)
+        {
+            player->viewheight = VIEWHEIGHT / 2;
+            if (player->deltaviewheight <= 0)
+                player->deltaviewheight = 1;
+        }
+
+        if (player->deltaviewheight)
+        {
+            player->deltaviewheight += FRACUNIT / 4;
+            if (!player->deltaviewheight)
+                player->deltaviewheight = 1;
+        }
+    }
+
+    if (player->chickenTics)
+    {
+        player->viewz = player->mo->z + player->viewheight - (20 * FRACUNIT);
+    }
+    else
+    {
+        player->viewz = player->mo->z + player->viewheight + bob;
+    }
+    if (player->mo->flags2 & MF2_FEETARECLIPPED
+        && player->playerstate != PST_DEAD
+        && player->mo->z <= player->mo->floorz)
+    {
+        player->viewz -= FOOTCLIPSIZE;
+    }
+    if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
+    {
+        player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
+    }
+    if (player->viewz < player->mo->floorz + 4 * FRACUNIT)
+    {
+        player->viewz = player->mo->floorz + 4 * FRACUNIT;
+    }
+}
+
+/*
+=================
+=
+= P_MovePlayer
+=
+=================
+*/
+
+void P_MovePlayer(player_t * player)
+{
+    int look;
+    int fly;
+    ticcmd_t *cmd;
+
+    cmd = &player->cmd;
+    player->mo->angle += (cmd->angleturn << 16);
+
+    onground = (player->mo->z <= player->mo->floorz
+                || (player->mo->flags2 & MF2_ONMOBJ));
+
+    if (player->chickenTics)
+    {                           // Chicken speed
+        if (cmd->forwardmove && (onground || player->mo->flags2 & MF2_FLY))
+            P_Thrust(player, player->mo->angle, cmd->forwardmove * 2500);
+        if (cmd->sidemove && (onground || player->mo->flags2 & MF2_FLY))
+            P_Thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2500);
+    }
+    else
+    {                           // Normal speed
+        if (cmd->forwardmove && (onground || player->mo->flags2 & MF2_FLY))
+            P_Thrust(player, player->mo->angle, cmd->forwardmove * 2048);
+        if (cmd->sidemove && (onground || player->mo->flags2 & MF2_FLY))
+            P_Thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2048);
+    }
+
+    if (cmd->forwardmove || cmd->sidemove)
+    {
+        if (player->chickenTics)
+        {
+            if (player->mo->state == &states[S_CHICPLAY])
+            {
+                P_SetMobjState(player->mo, S_CHICPLAY_RUN1);
+            }
+        }
+        else
+        {
+            if (player->mo->state == &states[S_PLAY])
+            {
+                P_SetMobjState(player->mo, S_PLAY_RUN1);
+            }
+        }
+    }
+
+    look = cmd->lookfly & 15;
+    if (look > 7)
+    {
+        look -= 16;
+    }
+    if (look)
+    {
+        if (look == TOCENTER)
+        {
+            player->centering = true;
+        }
+        else
+        {
+            player->lookdir += 5 * look;
+            if (player->lookdir > 90 || player->lookdir < -110)
+            {
+                player->lookdir -= 5 * look;
+            }
+        }
+    }
+    if (player->centering)
+    {
+        if (player->lookdir > 0)
+        {
+            player->lookdir -= 8;
+        }
+        else if (player->lookdir < 0)
+        {
+            player->lookdir += 8;
+        }
+        if (abs(player->lookdir) < 8)
+        {
+            player->lookdir = 0;
+            player->centering = false;
+        }
+    }
+    fly = cmd->lookfly >> 4;
+    if (fly > 7)
+    {
+        fly -= 16;
+    }
+    if (fly && player->powers[pw_flight])
+    {
+        if (fly != TOCENTER)
+        {
+            player->flyheight = fly * 2;
+            if (!(player->mo->flags2 & MF2_FLY))
+            {
+                player->mo->flags2 |= MF2_FLY;
+                player->mo->flags |= MF_NOGRAVITY;
+            }
+        }
+        else
+        {
+            player->mo->flags2 &= ~MF2_FLY;
+            player->mo->flags &= ~MF_NOGRAVITY;
+        }
+    }
+    else if (fly > 0)
+    {
+        P_PlayerUseArtifact(player, arti_fly);
+    }
+    if (player->mo->flags2 & MF2_FLY)
+    {
+        player->mo->momz = player->flyheight * FRACUNIT;
+        if (player->flyheight)
+        {
+            player->flyheight /= 2;
+        }
+    }
+}
+
+/*
+=================
+=
+= P_DeathThink
+=
+=================
+*/
+
+#define         ANG5    (ANG90/18)
+
+void P_DeathThink(player_t * player)
+{
+    angle_t angle, delta;
+    int lookDelta;
+
+    P_MovePsprites(player);
+
+    onground = (player->mo->z <= player->mo->floorz);
+    if (player->mo->type == MT_BLOODYSKULL)
+    {                           // Flying bloody skull
+        player->viewheight = 6 * FRACUNIT;
+        player->deltaviewheight = 0;
+        //player->damagecount = 20;
+        if (onground)
+        {
+            if (player->lookdir < 60)
+            {
+                lookDelta = (60 - player->lookdir) / 8;
+                if (lookDelta < 1 && (leveltime & 1))
+                {
+                    lookDelta = 1;
+                }
+                else if (lookDelta > 6)
+                {
+                    lookDelta = 6;
+                }
+                player->lookdir += lookDelta;
+            }
+        }
+    }
+    else
+    {                           // Fall to ground
+        player->deltaviewheight = 0;
+        if (player->viewheight > 6 * FRACUNIT)
+            player->viewheight -= FRACUNIT;
+        if (player->viewheight < 6 * FRACUNIT)
+            player->viewheight = 6 * FRACUNIT;
+        if (player->lookdir > 0)
+        {
+            player->lookdir -= 6;
+        }
+        else if (player->lookdir < 0)
+        {
+            player->lookdir += 6;
+        }
+        if (abs(player->lookdir) < 6)
+        {
+            player->lookdir = 0;
+        }
+    }
+    P_CalcHeight(player);
+
+    if (player->attacker && player->attacker != player->mo)
+    {
+        angle = R_PointToAngle2(player->mo->x, player->mo->y,
+                                player->attacker->x, player->attacker->y);
+        delta = angle - player->mo->angle;
+        if (delta < ANG5 || delta > (unsigned) -ANG5)
+        {                       // Looking at killer, so fade damage flash down
+            player->mo->angle = angle;
+            if (player->damagecount)
+            {
+                player->damagecount--;
+            }
+        }
+        else if (delta < ANG180)
+            player->mo->angle += ANG5;
+        else
+            player->mo->angle -= ANG5;
+    }
+    else if (player->damagecount)
+    {
+        player->damagecount--;
+    }
+
+    if (player->cmd.buttons & BT_USE)
+    {
+        if (player == &players[consoleplayer])
+        {
+            I_SetPalette(W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE));
+            inv_ptr = 0;
+            curpos = 0;
+            newtorch = 0;
+            newtorchdelta = 0;
+        }
+        player->playerstate = PST_REBORN;
+        // Let the mobj know the player has entered the reborn state.  Some
+        // mobjs need to know when it's ok to remove themselves.
+        player->mo->special2.i = 666;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ChickenPlayerThink
+//
+//----------------------------------------------------------------------------
+
+void P_ChickenPlayerThink(player_t * player)
+{
+    mobj_t *pmo;
+
+    if (player->health > 0)
+    {                           // Handle beak movement
+        P_UpdateBeak(player, &player->psprites[ps_weapon]);
+    }
+    if (player->chickenTics & 15)
+    {
+        return;
+    }
+    pmo = player->mo;
+    if (!(pmo->momx + pmo->momy) && P_Random() < 160)
+    {                           // Twitch view angle
+        pmo->angle += P_SubRandom() << 19;
+    }
+    if ((pmo->z <= pmo->floorz) && (P_Random() < 32))
+    {                           // Jump and noise
+        pmo->momz += FRACUNIT;
+        P_SetMobjState(pmo, S_CHICPLAY_PAIN);
+        return;
+    }
+    if (P_Random() < 48)
+    {                           // Just noise
+        S_StartSound(pmo, sfx_chicact);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_GetPlayerNum
+//
+//----------------------------------------------------------------------------
+
+int P_GetPlayerNum(player_t * player)
+{
+    int i;
+
+    for (i = 0; i < MAXPLAYERS; i++)
+    {
+        if (player == &players[i])
+        {
+            return (i);
+        }
+    }
+    return (0);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_UndoPlayerChicken
+//
+//----------------------------------------------------------------------------
+
+boolean P_UndoPlayerChicken(player_t * player)
+{
+    mobj_t *fog;
+    mobj_t *mo;
+    mobj_t *pmo;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    angle_t angle;
+    int playerNum;
+    weapontype_t weapon;
+    int oldFlags;
+    int oldFlags2;
+
+    pmo = player->mo;
+    x = pmo->x;
+    y = pmo->y;
+    z = pmo->z;
+    angle = pmo->angle;
+    weapon = pmo->special1.i;
+    oldFlags = pmo->flags;
+    oldFlags2 = pmo->flags2;
+    P_SetMobjState(pmo, S_FREETARGMOBJ);
+    mo = P_SpawnMobj(x, y, z, MT_PLAYER);
+    if (P_TestMobjLocation(mo) == false)
+    {                           // Didn't fit
+        P_RemoveMobj(mo);
+        mo = P_SpawnMobj(x, y, z, MT_CHICPLAYER);
+        mo->angle = angle;
+        mo->health = player->health;
+        mo->special1.i = weapon;
+        mo->player = player;
+        mo->flags = oldFlags;
+        mo->flags2 = oldFlags2;
+        player->mo = mo;
+        player->chickenTics = 2 * 35;
+        return (false);
+    }
+    playerNum = P_GetPlayerNum(player);
+    if (playerNum != 0)
+    {                           // Set color translation
+        mo->flags |= playerNum << MF_TRANSSHIFT;
+    }
+    mo->angle = angle;
+    mo->player = player;
+    mo->reactiontime = 18;
+    if (oldFlags2 & MF2_FLY)
+    {
+        mo->flags2 |= MF2_FLY;
+        mo->flags |= MF_NOGRAVITY;
+    }
+    player->chickenTics = 0;
+    player->powers[pw_weaponlevel2] = 0;
+    player->health = mo->health = MAXHEALTH;
+    player->mo = mo;
+    angle >>= ANGLETOFINESHIFT;
+    fog = P_SpawnMobj(x + 20 * finecosine[angle],
+                      y + 20 * finesine[angle], z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+    P_PostChickenWeapon(player, weapon);
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerThink
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerThink(player_t * player)
+{
+    ticcmd_t *cmd;
+    weapontype_t newweapon;
+
+    // No-clip cheat
+    if (player->cheats & CF_NOCLIP)
+    {
+        player->mo->flags |= MF_NOCLIP;
+    }
+    else
+    {
+        player->mo->flags &= ~MF_NOCLIP;
+    }
+    cmd = &player->cmd;
+    if (player->mo->flags & MF_JUSTATTACKED)
+    {                           // Gauntlets attack auto forward motion
+        cmd->angleturn = 0;
+        cmd->forwardmove = 0xc800 / 512;
+        cmd->sidemove = 0;
+        player->mo->flags &= ~MF_JUSTATTACKED;
+    }
+// messageTics is above the rest of the counters so that messages will
+//              go away, even in death.
+    player->messageTics--;      // Can go negative
+    if (!player->messageTics)
+    {                           // Refresh the screen when a message goes away
+        ultimatemsg = false;    // clear out any chat messages.
+        BorderTopRefresh = true;
+    }
+    if (player->playerstate == PST_DEAD)
+    {
+        P_DeathThink(player);
+        return;
+    }
+    if (player->chickenTics)
+    {
+        P_ChickenPlayerThink(player);
+    }
+    // Handle movement
+    if (player->mo->reactiontime)
+    {                           // Player is frozen
+        player->mo->reactiontime--;
+    }
+    else
+    {
+        P_MovePlayer(player);
+    }
+    P_CalcHeight(player);
+    if (player->mo->subsector->sector->special)
+    {
+        P_PlayerInSpecialSector(player);
+    }
+    if (cmd->arti)
+    {                           // Use an artifact
+        if (cmd->arti == 0xff)
+        {
+            P_PlayerNextArtifact(player);
+        }
+        else
+        {
+            P_PlayerUseArtifact(player, cmd->arti);
+        }
+    }
+    // Check for weapon change
+    if (cmd->buttons & BT_SPECIAL)
+    {                           // A special event has no other buttons
+        cmd->buttons = 0;
+    }
+    if (cmd->buttons & BT_CHANGE)
+    {
+        // The actual changing of the weapon is done when the weapon
+        // psprite can do it (A_WeaponReady), so it doesn't happen in
+        // the middle of an attack.
+        newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
+        if (newweapon == wp_staff && player->weaponowned[wp_gauntlets]
+            && !(player->readyweapon == wp_gauntlets))
+        {
+            newweapon = wp_gauntlets;
+        }
+        if (player->weaponowned[newweapon]
+            && newweapon != player->readyweapon)
+        {
+            if (WeaponInShareware[newweapon] || gamemode != shareware)
+            {
+                player->pendingweapon = newweapon;
+            }
+        }
+    }
+    // Check for use
+    if (cmd->buttons & BT_USE)
+    {
+        if (!player->usedown)
+        {
+            P_UseLines(player);
+            player->usedown = true;
+        }
+    }
+    else
+    {
+        player->usedown = false;
+    }
+    // Chicken counter
+    if (player->chickenTics)
+    {
+        if (player->chickenPeck)
+        {                       // Chicken attack counter
+            player->chickenPeck -= 3;
+        }
+        if (!--player->chickenTics)
+        {                       // Attempt to undo the chicken
+            P_UndoPlayerChicken(player);
+        }
+    }
+    // Cycle psprites
+    P_MovePsprites(player);
+    // Other Counters
+    if (player->powers[pw_invulnerability])
+    {
+        player->powers[pw_invulnerability]--;
+    }
+    if (player->powers[pw_invisibility])
+    {
+        if (!--player->powers[pw_invisibility])
+        {
+            player->mo->flags &= ~MF_SHADOW;
+        }
+    }
+    if (player->powers[pw_infrared])
+    {
+        player->powers[pw_infrared]--;
+    }
+    if (player->powers[pw_flight])
+    {
+        if (!--player->powers[pw_flight])
+        {
+            // haleyjd: removed externdriver crap
+            if (player->mo->z != player->mo->floorz)
+            {
+                player->centering = true;
+            }
+
+            player->mo->flags2 &= ~MF2_FLY;
+            player->mo->flags &= ~MF_NOGRAVITY;
+            BorderTopRefresh = true;    //make sure the sprite's cleared out
+        }
+    }
+    if (player->powers[pw_weaponlevel2])
+    {
+        if (!--player->powers[pw_weaponlevel2])
+        {
+            if ((player->readyweapon == wp_phoenixrod)
+                && (player->psprites[ps_weapon].state
+                    != &states[S_PHOENIXREADY])
+                && (player->psprites[ps_weapon].state
+                    != &states[S_PHOENIXUP]))
+            {
+                P_SetPsprite(player, ps_weapon, S_PHOENIXREADY);
+                player->ammo[am_phoenixrod] -= USE_PHRD_AMMO_2;
+                player->refire = 0;
+            }
+            else if ((player->readyweapon == wp_gauntlets)
+                     || (player->readyweapon == wp_staff))
+            {
+                player->pendingweapon = player->readyweapon;
+            }
+            BorderTopRefresh = true;
+        }
+    }
+    if (player->damagecount)
+    {
+        player->damagecount--;
+    }
+    if (player->bonuscount)
+    {
+        player->bonuscount--;
+    }
+    // Colormaps
+    if (player->powers[pw_invulnerability])
+    {
+        if (player->powers[pw_invulnerability] > BLINKTHRESHOLD
+            || (player->powers[pw_invulnerability] & 8))
+        {
+            player->fixedcolormap = INVERSECOLORMAP;
+        }
+        else
+        {
+            player->fixedcolormap = 0;
+        }
+    }
+    else if (player->powers[pw_infrared])
+    {
+        if (player->powers[pw_infrared] <= BLINKTHRESHOLD)
+        {
+            if (player->powers[pw_infrared] & 8)
+            {
+                player->fixedcolormap = 0;
+            }
+            else
+            {
+                player->fixedcolormap = 1;
+            }
+        }
+        else if (!(leveltime & 16) && player == &players[consoleplayer])
+        {
+            if (newtorch)
+            {
+                if (player->fixedcolormap + newtorchdelta > 7
+                    || player->fixedcolormap + newtorchdelta < 1
+                    || newtorch == player->fixedcolormap)
+                {
+                    newtorch = 0;
+                }
+                else
+                {
+                    player->fixedcolormap += newtorchdelta;
+                }
+            }
+            else
+            {
+                newtorch = (M_Random() & 7) + 1;
+                newtorchdelta = (newtorch == player->fixedcolormap) ?
+                    0 : ((newtorch > player->fixedcolormap) ? 1 : -1);
+            }
+        }
+    }
+    else
+    {
+        player->fixedcolormap = 0;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ArtiTele
+//
+//----------------------------------------------------------------------------
+
+void P_ArtiTele(player_t * player)
+{
+    int i;
+    int selections;
+    fixed_t destX;
+    fixed_t destY;
+    angle_t destAngle;
+
+    if (deathmatch)
+    {
+        selections = deathmatch_p - deathmatchstarts;
+        i = P_Random() % selections;
+        destX = deathmatchstarts[i].x << FRACBITS;
+        destY = deathmatchstarts[i].y << FRACBITS;
+        destAngle = ANG45 * (deathmatchstarts[i].angle / 45);
+    }
+    else
+    {
+        destX = playerstarts[0].x << FRACBITS;
+        destY = playerstarts[0].y << FRACBITS;
+        destAngle = ANG45 * (playerstarts[0].angle / 45);
+    }
+    P_Teleport(player->mo, destX, destY, destAngle);
+    S_StartSound(NULL, sfx_wpnup);      // Full volume laugh
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerNextArtifact
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerNextArtifact(player_t * player)
+{
+    if (player == &players[consoleplayer])
+    {
+        inv_ptr--;
+        if (inv_ptr < 6)
+        {
+            curpos--;
+            if (curpos < 0)
+            {
+                curpos = 0;
+            }
+        }
+        if (inv_ptr < 0)
+        {
+            inv_ptr = player->inventorySlotNum - 1;
+            if (inv_ptr < 6)
+            {
+                curpos = inv_ptr;
+            }
+            else
+            {
+                curpos = 6;
+            }
+        }
+        player->readyArtifact = player->inventory[inv_ptr].type;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerRemoveArtifact
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerRemoveArtifact(player_t * player, int slot)
+{
+    int i;
+    player->artifactCount--;
+    if (!(--player->inventory[slot].count))
+    {                           // Used last of a type - compact the artifact list
+        player->readyArtifact = arti_none;
+        player->inventory[slot].type = arti_none;
+        for (i = slot + 1; i < player->inventorySlotNum; i++)
+        {
+            player->inventory[i - 1] = player->inventory[i];
+        }
+        player->inventorySlotNum--;
+        if (player == &players[consoleplayer])
+        {                       // Set position markers and get next readyArtifact
+            inv_ptr--;
+            if (inv_ptr < 6)
+            {
+                curpos--;
+                if (curpos < 0)
+                {
+                    curpos = 0;
+                }
+            }
+            if (inv_ptr >= player->inventorySlotNum)
+            {
+                inv_ptr = player->inventorySlotNum - 1;
+            }
+            if (inv_ptr < 0)
+            {
+                inv_ptr = 0;
+            }
+            player->readyArtifact = player->inventory[inv_ptr].type;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerUseArtifact
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerUseArtifact(player_t * player, artitype_t arti)
+{
+    int i;
+
+    for (i = 0; i < player->inventorySlotNum; i++)
+    {
+        if (player->inventory[i].type == arti)
+        {                       // Found match - try to use
+            if (P_UseArtifact(player, arti))
+            {                   // Artifact was used - remove it from inventory
+                P_PlayerRemoveArtifact(player, i);
+                if (player == &players[consoleplayer])
+                {
+                    S_StartSound(NULL, sfx_artiuse);
+                    ArtifactFlash = 4;
+                }
+            }
+            else
+            {                   // Unable to use artifact, advance pointer
+                P_PlayerNextArtifact(player);
+            }
+            break;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_UseArtifact
+//
+// Returns true if artifact was used.
+//
+//----------------------------------------------------------------------------
+
+boolean P_UseArtifact(player_t * player, artitype_t arti)
+{
+    mobj_t *mo;
+    angle_t angle;
+
+    switch (arti)
+    {
+        case arti_invulnerability:
+            if (!P_GivePower(player, pw_invulnerability))
+            {
+                return (false);
+            }
+            break;
+        case arti_invisibility:
+            if (!P_GivePower(player, pw_invisibility))
+            {
+                return (false);
+            }
+            break;
+        case arti_health:
+            if (!P_GiveBody(player, 25))
+            {
+                return (false);
+            }
+            break;
+        case arti_superhealth:
+            if (!P_GiveBody(player, 100))
+            {
+                return (false);
+            }
+            break;
+        case arti_tomeofpower:
+            if (player->chickenTics)
+            {                   // Attempt to undo chicken
+                if (P_UndoPlayerChicken(player) == false)
+                {               // Failed
+                    P_DamageMobj(player->mo, NULL, NULL, 10000);
+                }
+                else
+                {               // Succeeded
+                    player->chickenTics = 0;
+                    S_StartSound(player->mo, sfx_wpnup);
+                }
+            }
+            else
+            {
+                if (!P_GivePower(player, pw_weaponlevel2))
+                {
+                    return (false);
+                }
+                if (player->readyweapon == wp_staff)
+                {
+                    P_SetPsprite(player, ps_weapon, S_STAFFREADY2_1);
+                }
+                else if (player->readyweapon == wp_gauntlets)
+                {
+                    P_SetPsprite(player, ps_weapon, S_GAUNTLETREADY2_1);
+                }
+            }
+            break;
+        case arti_torch:
+            if (!P_GivePower(player, pw_infrared))
+            {
+                return (false);
+            }
+            break;
+        case arti_firebomb:
+            angle = player->mo->angle >> ANGLETOFINESHIFT;
+
+            // Vanilla bug here:
+            // Original code here looks like:
+            //   (player->mo->flags2 & MF2_FEETARECLIPPED != 0),
+            // Which under C's operator precedence is:
+            //   (player->mo->flags2 & (MF2_FEETARECLIPPED != 0)),
+            // Which simplifies to:
+            //   (player->mo->flags2 & 1),
+            mo = P_SpawnMobj(player->mo->x + 24 * finecosine[angle],
+                             player->mo->y + 24 * finesine[angle],
+                             player->mo->z -
+                             15 * FRACUNIT * (player->mo->flags2 & 1),
+                             MT_FIREBOMB);
+            mo->target = player->mo;
+            break;
+        case arti_egg:
+            mo = player->mo;
+            P_SpawnPlayerMissile(mo, MT_EGGFX);
+            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 6));
+            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 6));
+            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 3));
+            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 3));
+            break;
+        case arti_fly:
+            if (!P_GivePower(player, pw_flight))
+            {
+                return (false);
+            }
+            break;
+        case arti_teleport:
+            P_ArtiTele(player);
+            break;
+        default:
+            return (false);
+    }
+    return (true);
+}
diff --git a/games/NXDoom/src/heretic/r_bsp.c b/games/NXDoom/src/heretic/r_bsp.c
new file mode 100644
index 000000000..1e9d3be7a
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_bsp.c
@@ -0,0 +1,489 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// R_bsp.c
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "m_bbox.h"
+#include "i_system.h"
+#include "r_local.h"
+
+seg_t *curline;
+side_t *sidedef;
+line_t *linedef;
+sector_t *frontsector, *backsector;
+
+drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
+
+void R_StoreWallRange(int start, int stop);
+
+/*
+====================
+=
+= R_ClearDrawSegs
+=
+====================
+*/
+
+void R_ClearDrawSegs(void)
+{
+    ds_p = drawsegs;
+}
+
+//=============================================================================
+
+
+/*
+===============================================================================
+=
+= ClipWallSegment
+=
+= Clips the given range of columns and includes it in the new clip list
+===============================================================================
+*/
+
+typedef struct
+{
+    int first, last;
+} cliprange_t;
+
+// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
+// that can be generated in a scene by the DOOM engine. This was determined by
+// Lee Killough during BOOM development to be a function of the screensize.
+// The simplest thing we can do, other than fix this bug, is to let the game
+// render overage and then bomb out by detecting the overflow after the 
+// fact. -haleyjd
+//#define MAXSEGS 32
+#define MAXSEGS (SCREENWIDTH / 2 + 1)
+
+cliprange_t solidsegs[MAXSEGS], *newend;        // newend is one past the last valid seg
+
+
+void R_ClipSolidWallSegment(int first, int last)
+{
+    cliprange_t *next, *start;
+
+// find the first range that touches the range (adjacent pixels are touching)
+    start = solidsegs;
+    while (start->last < first - 1)
+        start++;
+
+    if (first < start->first)
+    {
+        if (last < start->first - 1)
+        {                       // post is entirely visible (above start), so insert a new clippost
+            R_StoreWallRange(first, last);
+            next = newend;
+            newend++;
+            while (next != start)
+            {
+                *next = *(next - 1);
+                next--;
+            }
+            next->first = first;
+            next->last = last;
+            return;
+        }
+
+        // there is a fragment above *start
+        R_StoreWallRange(first, start->first - 1);
+        start->first = first;   // adjust the clip size
+    }
+
+    if (last <= start->last)
+        return;                 // bottom contained in start
+
+    next = start;
+    while (last >= (next + 1)->first - 1)
+    {
+        // there is a fragment between two posts
+        R_StoreWallRange(next->last + 1, (next + 1)->first - 1);
+        next++;
+        if (last <= next->last)
+        {                       // bottom is contained in next
+            start->last = next->last;   // adjust the clip size
+            goto crunch;
+        }
+    }
+
+    // there is a fragment after *next
+    R_StoreWallRange(next->last + 1, last);
+    start->last = last;         // adjust the clip size
+
+
+// remove start+1 to next from the clip list,
+// because start now covers their area
+  crunch:
+    if (next == start)
+        return;                 // post just extended past the bottom of one post
+
+    while (next++ != newend)    // remove a post
+        *++start = *next;
+    newend = start + 1;
+}
+
+/*
+===============================================================================
+=
+= R_ClipPassWallSegment
+=
+= Clips the given range of columns, but does not includes it in the clip list
+===============================================================================
+*/
+
+void R_ClipPassWallSegment(int first, int last)
+{
+    cliprange_t *start;
+
+// find the first range that touches the range (adjacent pixels are touching)
+    start = solidsegs;
+    while (start->last < first - 1)
+        start++;
+
+    if (first < start->first)
+    {
+        if (last < start->first - 1)
+        {                       // post is entirely visible (above start)
+            R_StoreWallRange(first, last);
+            return;
+        }
+
+        // there is a fragment above *start
+        R_StoreWallRange(first, start->first - 1);
+    }
+
+    if (last <= start->last)
+        return;                 // bottom contained in start
+
+    while (last >= (start + 1)->first - 1)
+    {
+        // there is a fragment between two posts
+        R_StoreWallRange(start->last + 1, (start + 1)->first - 1);
+        start++;
+        if (last <= start->last)
+            return;
+    }
+
+    // there is a fragment after *next
+    R_StoreWallRange(start->last + 1, last);
+}
+
+
+
+/*
+====================
+=
+= R_ClearClipSegs
+=
+====================
+*/
+
+void R_ClearClipSegs(void)
+{
+    solidsegs[0].first = -0x7fffffff;
+    solidsegs[0].last = -1;
+    solidsegs[1].first = viewwidth;
+    solidsegs[1].last = 0x7fffffff;
+    newend = solidsegs + 2;
+}
+
+
+//=============================================================================
+
+/*
+======================
+=
+= R_AddLine
+=
+= Clips the given segment and adds any visible pieces to the line list
+=
+======================
+*/
+
+void R_AddLine(seg_t * line)
+{
+    int x1, x2;
+    angle_t angle1, angle2, span, tspan;
+
+    curline = line;
+
+// OPTIMIZE: quickly reject orthogonal back sides
+
+    angle1 = R_PointToAngle(line->v1->x, line->v1->y);
+    angle2 = R_PointToAngle(line->v2->x, line->v2->y);
+
+//
+// clip to view edges
+// OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW)
+    span = angle1 - angle2;
+    if (span >= ANG180)
+        return;                 // back side
+
+    rw_angle1 = angle1;         // global angle needed by segcalc
+    angle1 -= viewangle;
+    angle2 -= viewangle;
+
+    tspan = angle1 + clipangle;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return;             // totally off the left edge
+        angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return;             // totally off the left edge
+        angle2 = -clipangle;
+    }
+
+//
+// the seg is in the view range, but not necessarily visible
+//
+    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
+    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
+    x1 = viewangletox[angle1];
+    x2 = viewangletox[angle2];
+    if (x1 == x2)
+        return;                 // does not cross a pixel
+
+    backsector = line->backsector;
+
+    if (!backsector)
+        goto clipsolid;         // single sided line
+
+    if (backsector->ceilingheight <= frontsector->floorheight
+        || backsector->floorheight >= frontsector->ceilingheight)
+        goto clipsolid;         // closed door
+
+    if (backsector->ceilingheight != frontsector->ceilingheight
+        || backsector->floorheight != frontsector->floorheight)
+        goto clippass;          // window
+
+// reject empty lines used for triggers and special events
+    if (backsector->ceilingpic == frontsector->ceilingpic
+        && backsector->floorpic == frontsector->floorpic
+        && backsector->lightlevel == frontsector->lightlevel
+        && curline->sidedef->midtexture == 0)
+        return;
+
+  clippass:
+    R_ClipPassWallSegment(x1, x2 - 1);
+    return;
+
+  clipsolid:
+    R_ClipSolidWallSegment(x1, x2 - 1);
+}
+
+//============================================================================
+
+
+/*
+===============================================================================
+=
+= R_CheckBBox
+=
+= Returns true if some part of the bbox might be visible
+=
+===============================================================================
+*/
+
+int checkcoord[12][4] = {
+    {3, 0, 2, 1},
+    {3, 0, 2, 0},
+    {3, 1, 2, 0},
+    {0},
+    {2, 0, 2, 1},
+    {0, 0, 0, 0},
+    {3, 1, 3, 0},
+    {0},
+    {2, 0, 3, 1},
+    {2, 1, 3, 1},
+    {2, 1, 3, 0}
+};
+
+
+boolean R_CheckBBox(fixed_t * bspcoord)
+{
+    int boxx, boxy, boxpos;
+    fixed_t x1, y1, x2, y2;
+    angle_t angle1, angle2, span, tspan;
+    cliprange_t *start;
+    int sx1, sx2;
+
+// find the corners of the box that define the edges from current viewpoint
+    if (viewx <= bspcoord[BOXLEFT])
+        boxx = 0;
+    else if (viewx < bspcoord[BOXRIGHT])
+        boxx = 1;
+    else
+        boxx = 2;
+
+    if (viewy >= bspcoord[BOXTOP])
+        boxy = 0;
+    else if (viewy > bspcoord[BOXBOTTOM])
+        boxy = 1;
+    else
+        boxy = 2;
+
+    boxpos = (boxy << 2) + boxx;
+    if (boxpos == 5)
+        return true;
+
+    x1 = bspcoord[checkcoord[boxpos][0]];
+    y1 = bspcoord[checkcoord[boxpos][1]];
+    x2 = bspcoord[checkcoord[boxpos][2]];
+    y2 = bspcoord[checkcoord[boxpos][3]];
+
+
+//
+// check clip list for an open space
+//      
+    angle1 = R_PointToAngle(x1, y1) - viewangle;
+    angle2 = R_PointToAngle(x2, y2) - viewangle;
+
+    span = angle1 - angle2;
+    if (span >= ANG180)
+        return true;            // sitting on a line
+    tspan = angle1 + clipangle;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return false;       // totally off the left edge
+        angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return false;       // totally off the left edge
+        angle2 = -clipangle;
+    }
+
+
+// find the first clippost that touches the source post (adjacent pixels are touching)
+    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
+    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
+    sx1 = viewangletox[angle1];
+    sx2 = viewangletox[angle2];
+    if (sx1 == sx2)
+        return false;           // does not cross a pixel
+    sx2--;
+
+    start = solidsegs;
+    while (start->last < sx2)
+        start++;
+    if (sx1 >= start->first && sx2 <= start->last)
+        return false;           // the clippost contains the new span
+
+    return true;
+}
+
+
+/*
+================
+=
+= R_Subsector
+=
+= Draw one or more segments
+================
+*/
+
+void R_Subsector(int num)
+{
+    int count;
+    seg_t *line;
+    subsector_t *sub;
+
+#ifdef RANGECHECK
+    if (num >= numsubsectors)
+        I_Error("R_Subsector: ss %i with numss = %i", num, numsubsectors);
+#endif
+
+    sscount++;
+    sub = &subsectors[num];
+    frontsector = sub->sector;
+    count = sub->numlines;
+    line = &segs[sub->firstline];
+
+    if (frontsector->floorheight < viewz)
+        floorplane = R_FindPlane(frontsector->floorheight,
+                                 frontsector->floorpic,
+                                 frontsector->lightlevel,
+                                 frontsector->special);
+    else
+        floorplane = NULL;
+    if (frontsector->ceilingheight > viewz
+        || frontsector->ceilingpic == skyflatnum)
+        ceilingplane = R_FindPlane(frontsector->ceilingheight,
+                                   frontsector->ceilingpic,
+                                   frontsector->lightlevel, 0);
+    else
+        ceilingplane = NULL;
+
+    R_AddSprites(frontsector);
+
+    while (count--)
+    {
+        R_AddLine(line);
+        line++;
+    }
+
+    // check for solidsegs overflow - extremely unsatisfactory!
+    if(newend > &solidsegs[32])
+        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
+}
+
+
+/*
+===============================================================================
+=
+= RenderBSPNode
+=
+===============================================================================
+*/
+
+void R_RenderBSPNode(int bspnum)
+{
+    node_t *bsp;
+    int side;
+
+    if (bspnum & NF_SUBSECTOR)
+    {
+        if (bspnum == -1)
+            R_Subsector(0);
+        else
+            R_Subsector(bspnum & (~NF_SUBSECTOR));
+        return;
+    }
+
+    bsp = &nodes[bspnum];
+
+//
+// decide which side the view point is on
+//
+    side = R_PointOnSide(viewx, viewy, bsp);
+
+    R_RenderBSPNode(bsp->children[side]);       // recursively divide front space
+
+    if (R_CheckBBox(bsp->bbox[side ^ 1]))       // possibly divide back space
+        R_RenderBSPNode(bsp->children[side ^ 1]);
+}
diff --git a/games/NXDoom/src/heretic/r_data.c b/games/NXDoom/src/heretic/r_data.c
new file mode 100644
index 000000000..04bdecc86
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_data.c
@@ -0,0 +1,732 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// R_data.c
+
+#include "doomdef.h"
+#include "deh_str.h"
+
+#include "i_swap.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "r_local.h"
+#include "p_local.h"
+
+
+typedef struct
+{
+    int originx;                // block origin (allways UL), which has allready
+    int originy;                // accounted  for the patch's internal origin
+    int patch;
+} texpatch_t;
+
+// a maptexturedef_t describes a rectangular texture, which is composed of one
+// or more mappatch_t structures that arrange graphic patches
+typedef struct
+{
+    char name[8];               // for switch changing, etc
+    short width;
+    short height;
+    short patchcount;
+    texpatch_t patches[1];      // [patchcount] drawn back to front
+    //  into the cached texture
+} texture_t;
+
+
+
+int firstflat, lastflat, numflats;
+int firstpatch, lastpatch, numpatches;
+int firstspritelump, lastspritelump, numspritelumps;
+
+int numtextures;
+texture_t **textures;
+int *texturewidthmask;
+fixed_t *textureheight;         // needed for texture pegging
+int *texturecompositesize;
+short **texturecolumnlump;
+unsigned short **texturecolumnofs;
+byte **texturecomposite;
+
+int *flattranslation;           // for global animation
+int *texturetranslation;        // for global animation
+
+fixed_t *spritewidth;           // needed for pre rendering
+fixed_t *spriteoffset;
+fixed_t *spritetopoffset;
+
+lighttable_t *colormaps;
+
+
+/*
+==============================================================================
+
+						MAPTEXTURE_T CACHING
+
+when a texture is first needed, it counts the number of composite columns
+required in the texture and allocates space for a column directory and any
+new columns.  The directory will simply point inside other patches if there
+is only one patch in a given column, but any columns with multiple patches
+will have new column_ts generated.
+
+==============================================================================
+*/
+
+/*
+===================
+=
+= R_DrawColumnInCache
+=
+= Clip and draw a column from a patch into a cached post
+=
+===================
+*/
+
+void R_DrawColumnInCache(column_t * patch, byte * cache, int originy,
+                         int cacheheight)
+{
+    int count, position;
+    byte *source;
+
+    while (patch->topdelta != 0xff)
+    {
+        source = (byte *) patch + 3;
+        count = patch->length;
+        position = originy + patch->topdelta;
+        if (position < 0)
+        {
+            count += position;
+            position = 0;
+        }
+        if (position + count > cacheheight)
+            count = cacheheight - position;
+        if (count > 0)
+            memcpy(cache + position, source, count);
+
+        patch = (column_t *) ((byte *) patch + patch->length + 4);
+    }
+}
+
+
+/*
+===================
+=
+= R_GenerateComposite
+=
+===================
+*/
+
+void R_GenerateComposite(int texnum)
+{
+    byte *block;
+    texture_t *texture;
+    texpatch_t *patch;
+    patch_t *realpatch;
+    int x, x1, x2;
+    int i;
+    column_t *patchcol;
+    short *collump;
+    unsigned short *colofs;
+
+    texture = textures[texnum];
+    block = Z_Malloc(texturecompositesize[texnum], PU_STATIC,
+                     &texturecomposite[texnum]);
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+
+//
+// composite the columns together
+//
+    for (i = 0, patch = texture->patches; i < texture->patchcount;
+         i++, patch++)
+    {
+        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
+        x1 = patch->originx;
+        x2 = x1 + SHORT(realpatch->width);
+
+        if (x1 < 0)
+            x = 0;
+        else
+            x = x1;
+        if (x2 > texture->width)
+            x2 = texture->width;
+
+        for (; x < x2; x++)
+        {
+            if (collump[x] >= 0)
+                continue;       // column does not have multiple patches
+            patchcol = (column_t *) ((byte *) realpatch +
+                                     LONG(realpatch->columnofs[x - x1]));
+            R_DrawColumnInCache(patchcol, block + colofs[x], patch->originy,
+                                texture->height);
+        }
+
+    }
+
+// now that the texture has been built, it is purgable
+    Z_ChangeTag(block, PU_CACHE);
+}
+
+
+/*
+===================
+=
+= R_GenerateLookup
+=
+===================
+*/
+
+void R_GenerateLookup(int texnum)
+{
+    texture_t *texture;
+    byte *patchcount;           // [texture->width]
+    texpatch_t *patch;
+    patch_t *realpatch;
+    int x, x1, x2;
+    int i;
+    short *collump;
+    unsigned short *colofs;
+
+    texture = textures[texnum];
+
+    texturecomposite[texnum] = 0;       // composited not created yet
+    texturecompositesize[texnum] = 0;
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+
+//
+// count the number of columns that are covered by more than one patch
+// fill in the lump / offset, so columns with only a single patch are
+// all done
+//
+    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
+    memset(patchcount, 0, texture->width);
+
+    for (i = 0, patch = texture->patches; i < texture->patchcount;
+         i++, patch++)
+    {
+        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
+        x1 = patch->originx;
+        x2 = x1 + SHORT(realpatch->width);
+        if (x1 < 0)
+            x = 0;
+        else
+            x = x1;
+        if (x2 > texture->width)
+            x2 = texture->width;
+        for (; x < x2; x++)
+        {
+            patchcount[x]++;
+            collump[x] = patch->patch;
+            colofs[x] = LONG(realpatch->columnofs[x - x1]) + 3;
+        }
+    }
+
+    for (x = 0; x < texture->width; x++)
+    {
+        if (!patchcount[x])
+        {
+            printf("R_GenerateLookup: column without a patch (%s)\n",
+                   texture->name);
+            return;
+        }
+//                      I_Error ("R_GenerateLookup: column without a patch");
+        if (patchcount[x] > 1)
+        {
+            collump[x] = -1;    // use the cached block
+            colofs[x] = texturecompositesize[texnum];
+            if (texturecompositesize[texnum] > 0x10000 - texture->height)
+                I_Error("R_GenerateLookup: texture %i is >64k", texnum);
+            texturecompositesize[texnum] += texture->height;
+        }
+    }
+
+    Z_Free(patchcount);
+}
+
+
+/*
+================
+=
+= R_GetColumn
+=
+================
+*/
+
+byte *R_GetColumn(int tex, int col)
+{
+    int lump, ofs;
+
+    col &= texturewidthmask[tex];
+    lump = texturecolumnlump[tex][col];
+    ofs = texturecolumnofs[tex][col];
+    if (lump > 0)
+        return (byte *) W_CacheLumpNum(lump, PU_CACHE) + ofs;
+    if (!texturecomposite[tex])
+        R_GenerateComposite(tex);
+    return texturecomposite[tex] + ofs;
+}
+
+
+/*
+==================
+=
+= R_InitTextures
+=
+= Initializes the texture list with the textures from the world map
+=
+==================
+*/
+
+void R_InitTextures(void)
+{
+    maptexture_t *mtexture;
+    texture_t *texture;
+    mappatch_t *mpatch;
+    texpatch_t *patch;
+    int i, j;
+    int *maptex, *maptex2, *maptex1;
+    char name[9], *names, *name_p;
+    int *patchlookup;
+    int nummappatches;
+    int offset, maxoff, maxoff2;
+    int numtextures1, numtextures2;
+    int *directory;
+    const char *texture1, *texture2, *pnames;
+
+    texture1 = DEH_String("TEXTURE1");
+    texture2 = DEH_String("TEXTURE2");
+    pnames = DEH_String("PNAMES");
+
+//
+// load the patch names from pnames.lmp
+//
+    names = W_CacheLumpName(pnames, PU_STATIC);
+    nummappatches = LONG(*((int *) names));
+    name_p = names + 4;
+    patchlookup = Z_Malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
+    for (i = 0; i < nummappatches; i++)
+    {
+        M_StringCopy(name, name_p + i * 8, sizeof(name));
+        patchlookup[i] = W_CheckNumForName(name);
+    }
+    W_ReleaseLumpName(pnames);
+
+//
+// load the map texture definitions from textures.lmp
+//
+    maptex = maptex1 = W_CacheLumpName(texture1, PU_STATIC);
+    numtextures1 = LONG(*maptex);
+    maxoff = W_LumpLength(W_GetNumForName(texture1));
+    directory = maptex + 1;
+
+    if (W_CheckNumForName(texture2) != -1)
+    {
+        maptex2 = W_CacheLumpName(texture2, PU_STATIC);
+        numtextures2 = LONG(*maptex2);
+        maxoff2 = W_LumpLength(W_GetNumForName(texture2));
+    }
+    else
+    {
+        maptex2 = NULL;
+        numtextures2 = 0;
+        maxoff2 = 0;
+    }
+    numtextures = numtextures1 + numtextures2;
+
+    //
+    //      Init the startup thermometer at this point...
+    //
+    {
+        int start, end;
+        int spramount;
+        start = W_GetNumForName(DEH_String("S_START"));
+        end = W_GetNumForName(DEH_String("S_END"));
+        spramount = end - start + 1;
+        InitThermo(spramount + numtextures + 6);
+    }
+
+    textures = Z_Malloc(numtextures * sizeof(texture_t *), PU_STATIC, 0);
+    texturecolumnlump = Z_Malloc(numtextures * sizeof(short *), PU_STATIC, 0);
+    texturecolumnofs = Z_Malloc(numtextures * sizeof(unsigned short *), PU_STATIC, 0);
+    texturecomposite = Z_Malloc(numtextures * sizeof(byte *), PU_STATIC, 0);
+    texturecompositesize = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
+    texturewidthmask = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
+    textureheight = Z_Malloc(numtextures * sizeof(fixed_t), PU_STATIC, 0);
+
+    for (i = 0; i < numtextures; i++, directory++)
+    {
+#ifdef __NEXT__
+        if (!(i & 63))
+            printf(".");
+#else
+        IncThermo();
+#endif
+        if (i == numtextures1)
+        {                       // start looking in second texture file
+            maptex = maptex2;
+            maxoff = maxoff2;
+            directory = maptex + 1;
+        }
+
+        offset = LONG(*directory);
+        if (offset > maxoff)
+            I_Error("R_InitTextures: bad texture directory");
+        mtexture = (maptexture_t *) ((byte *) maptex + offset);
+        texture = textures[i] = Z_Malloc(sizeof(texture_t)
+                                         +
+                                         sizeof(texpatch_t) *
+                                         (SHORT(mtexture->patchcount) - 1),
+                                         PU_STATIC, 0);
+        texture->width = SHORT(mtexture->width);
+        texture->height = SHORT(mtexture->height);
+        texture->patchcount = SHORT(mtexture->patchcount);
+        memcpy(texture->name, mtexture->name, sizeof(texture->name));
+        mpatch = &mtexture->patches[0];
+        patch = &texture->patches[0];
+        for (j = 0; j < texture->patchcount; j++, mpatch++, patch++)
+        {
+            patch->originx = SHORT(mpatch->originx);
+            patch->originy = SHORT(mpatch->originy);
+            patch->patch = patchlookup[SHORT(mpatch->patch)];
+            if (patch->patch == -1)
+                I_Error("R_InitTextures: Missing patch in texture %s",
+                        texture->name);
+        }
+        texturecolumnlump[i] = Z_Malloc(texture->width * sizeof(short),
+                                        PU_STATIC, 0);
+        texturecolumnofs[i] = Z_Malloc(texture->width * sizeof(short), 
+                                       PU_STATIC, 0);
+        j = 1;
+        while (j * 2 <= texture->width)
+            j <<= 1;
+        texturewidthmask[i] = j - 1;
+        textureheight[i] = texture->height << FRACBITS;
+    }
+
+    Z_Free(patchlookup);
+
+    W_ReleaseLumpName(texture1);
+    if (maptex2)
+    {
+        W_ReleaseLumpName(texture2);
+    }
+
+//
+// precalculate whatever possible
+//              
+    for (i = 0; i < numtextures; i++)
+    {
+        R_GenerateLookup(i);
+        CheckAbortStartup();
+    }
+
+//
+// translation table for global animation
+//
+    texturetranslation = Z_Malloc((numtextures + 1) * sizeof(int), PU_STATIC, 0);
+    for (i = 0; i < numtextures; i++)
+        texturetranslation[i] = i;
+}
+
+
+/*
+================
+=
+= R_InitFlats
+=
+=================
+*/
+
+void R_InitFlats(void)
+{
+    int i;
+
+    firstflat = W_GetNumForName(DEH_String("F_START")) + 1;
+    lastflat = W_GetNumForName(DEH_String("F_END")) - 1;
+    numflats = lastflat - firstflat + 1;
+
+// translation table for global animation
+    flattranslation = Z_Malloc((numflats + 1) * sizeof(int), PU_STATIC, 0);
+    for (i = 0; i < numflats; i++)
+        flattranslation[i] = i;
+}
+
+
+/*
+================
+=
+= R_InitSpriteLumps
+=
+= Finds the width and hoffset of all sprites in the wad, so the sprite doesn't
+= need to be cached just for the header during rendering
+=================
+*/
+
+void R_InitSpriteLumps(void)
+{
+    int i;
+    patch_t *patch;
+
+    firstspritelump = W_GetNumForName(DEH_String("S_START")) + 1;
+    lastspritelump = W_GetNumForName(DEH_String("S_END")) - 1;
+    numspritelumps = lastspritelump - firstspritelump + 1;
+    spritewidth = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
+    spriteoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
+    spritetopoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
+
+    for (i = 0; i < numspritelumps; i++)
+    {
+#ifdef __NEXT__
+        if (!(i & 63))
+            printf(".");
+#else
+        IncThermo();
+#endif
+        patch = W_CacheLumpNum(firstspritelump + i, PU_CACHE);
+        spritewidth[i] = SHORT(patch->width) << FRACBITS;
+        spriteoffset[i] = SHORT(patch->leftoffset) << FRACBITS;
+        spritetopoffset[i] = SHORT(patch->topoffset) << FRACBITS;
+    }
+}
+
+
+/*
+================
+=
+= R_InitColormaps
+=
+=================
+*/
+
+void R_InitColormaps(void)
+{
+    int lump, length;
+//
+// load in the light tables
+// 256 byte align tables
+//
+    lump = W_GetNumForName(DEH_String("COLORMAP"));
+    length = W_LumpLength(lump);
+    colormaps = Z_Malloc(length, PU_STATIC, 0);
+    W_ReadLump(lump, colormaps);
+}
+
+
+/*
+================
+=
+= R_InitData
+=
+= Locates all the lumps that will be used by all views
+= Must be called after W_Init
+=================
+*/
+
+void R_InitData(void)
+{
+    //tprintf("\nR_InitTextures ", 0);
+    R_InitTextures();
+    printf (".");
+    //tprintf("R_InitFlats\n", 0);
+    R_InitFlats();
+    IncThermo();
+    printf (".");
+    //tprintf("R_InitSpriteLumps ", 0);
+    R_InitSpriteLumps();
+    IncThermo();
+    printf (".");
+    R_InitColormaps();
+}
+
+
+//=============================================================================
+
+/*
+================
+=
+= R_FlatNumForName
+=
+================
+*/
+
+int R_FlatNumForName(const char *name)
+{
+    int i;
+    char namet[9];
+
+    i = W_CheckNumForName(name);
+    if (i == -1)
+    {
+        namet[8] = 0;
+        memcpy(namet, name, 8);
+        I_Error("R_FlatNumForName: %s not found", namet);
+    }
+    return i - firstflat;
+}
+
+
+/*
+================
+=
+= R_CheckTextureNumForName
+=
+================
+*/
+
+int R_CheckTextureNumForName(const char *name)
+{
+    int i;
+
+    if (name[0] == '-')         // no texture marker
+        return 0;
+
+    for (i = 0; i < numtextures; i++)
+        if (!strncasecmp(textures[i]->name, name, 8))
+            return i;
+
+    return -1;
+}
+
+
+/*
+================
+=
+= R_TextureNumForName
+=
+================
+*/
+
+int R_TextureNumForName(const char *name)
+{
+    int i;
+    //char  namet[9];
+
+    i = R_CheckTextureNumForName(name);
+    if (i == -1)
+        I_Error("R_TextureNumForName: %s not found", name);
+
+    return i;
+}
+
+
+/*
+=================
+=
+= R_PrecacheLevel
+=
+= Preloads all relevent graphics for the level
+=================
+*/
+
+int flatmemory, texturememory, spritememory;
+
+void R_PrecacheLevel(void)
+{
+    char *flatpresent;
+    char *texturepresent;
+    char *spritepresent;
+    int i, j, k, lump;
+    texture_t *texture;
+    thinker_t *th;
+    spriteframe_t *sf;
+
+    if (demoplayback)
+        return;
+
+//
+// precache flats
+//      
+    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
+    memset(flatpresent, 0, numflats);
+    for (i = 0; i < numsectors; i++)
+    {
+        flatpresent[sectors[i].floorpic] = 1;
+        flatpresent[sectors[i].ceilingpic] = 1;
+    }
+
+    flatmemory = 0;
+    for (i = 0; i < numflats; i++)
+        if (flatpresent[i])
+        {
+            lump = firstflat + i;
+            flatmemory += lumpinfo[lump]->size;
+            W_CacheLumpNum(lump, PU_CACHE);
+        }
+
+    Z_Free(flatpresent);
+
+//
+// precache textures
+//
+    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
+    memset(texturepresent, 0, numtextures);
+
+    for (i = 0; i < numsides; i++)
+    {
+        texturepresent[sides[i].toptexture] = 1;
+        texturepresent[sides[i].midtexture] = 1;
+        texturepresent[sides[i].bottomtexture] = 1;
+    }
+
+    texturepresent[skytexture] = 1;
+
+    texturememory = 0;
+    for (i = 0; i < numtextures; i++)
+    {
+        if (!texturepresent[i])
+            continue;
+        texture = textures[i];
+        for (j = 0; j < texture->patchcount; j++)
+        {
+            lump = texture->patches[j].patch;
+            texturememory += lumpinfo[lump]->size;
+            W_CacheLumpNum(lump, PU_CACHE);
+        }
+    }
+
+    Z_Free(texturepresent);
+
+//
+// precache sprites
+//
+    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
+    memset(spritepresent, 0, numsprites);
+
+    for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if (th->function == P_MobjThinker)
+            spritepresent[((mobj_t *) th)->sprite] = 1;
+    }
+
+    spritememory = 0;
+    for (i = 0; i < numsprites; i++)
+    {
+        if (!spritepresent[i])
+            continue;
+        for (j = 0; j < sprites[i].numframes; j++)
+        {
+            sf = &sprites[i].spriteframes[j];
+            for (k = 0; k < 8; k++)
+            {
+                lump = firstspritelump + sf->lump[k];
+                spritememory += lumpinfo[lump]->size;
+                W_CacheLumpNum(lump, PU_CACHE);
+            }
+        }
+    }
+
+    Z_Free(spritepresent);
+}
diff --git a/games/NXDoom/src/heretic/r_draw.c b/games/NXDoom/src/heretic/r_draw.c
new file mode 100644
index 000000000..4760cd59a
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_draw.c
@@ -0,0 +1,490 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// R_draw.c
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "r_local.h"
+#include "i_video.h"
+#include "v_video.h"
+
+/*
+
+All drawing to the view buffer is accomplished in this file.  The other refresh
+files only know about ccordinates, not the architecture of the frame buffer.
+
+*/
+
+byte *viewimage;
+int viewwidth, scaledviewwidth, viewheight, viewwindowx, viewwindowy;
+byte *ylookup[MAXHEIGHT];
+int columnofs[MAXWIDTH];
+byte translations[3][256];      // color tables for different players
+
+/*
+==================
+=
+= R_DrawColumn
+=
+= Source is the top of the column to scale
+=
+==================
+*/
+
+lighttable_t *dc_colormap;
+int dc_x;
+int dc_yl;
+int dc_yh;
+fixed_t dc_iscale;
+fixed_t dc_texturemid;
+byte *dc_source;                // first pixel in a column (possibly virtual)
+
+int dccount;                    // just for profiling
+
+void R_DrawColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+void R_DrawColumnLow(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+//      dccount++;
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+// Translucent column draw - blended with background using tinttable.
+
+void R_DrawTLColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    if (!dc_yl)
+        dc_yl = 1;
+    if (dc_yh == viewheight - 1)
+        dc_yh = viewheight - 2;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest =
+            tinttable[((*dest) << 8) +
+                      dc_colormap[dc_source[(frac >> FRACBITS) & 127]]];
+
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+/*
+========================
+=
+= R_DrawTranslatedColumn
+=
+========================
+*/
+
+byte *dc_translation;
+byte *translationtables;
+
+void R_DrawTranslatedColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+void R_DrawTranslatedTLColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = tinttable[((*dest) << 8)
+                          +
+                          dc_colormap[dc_translation
+                                      [dc_source[frac >> FRACBITS]]]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+//--------------------------------------------------------------------------
+//
+// PROC R_InitTranslationTables
+//
+//--------------------------------------------------------------------------
+
+void R_InitTranslationTables(void)
+{
+    int i;
+
+    V_LoadTintTable();
+
+    // Allocate translation tables
+    translationtables = Z_Malloc(256 * 3, PU_STATIC, 0);
+
+    // Fill out the translation tables
+    for (i = 0; i < 256; i++)
+    {
+        if (i >= 225 && i <= 240)
+        {
+            translationtables[i] = 114 + (i - 225);     // yellow
+            translationtables[i + 256] = 145 + (i - 225);       // red
+            translationtables[i + 512] = 190 + (i - 225);       // blue
+        }
+        else
+        {
+            translationtables[i] = translationtables[i + 256]
+                = translationtables[i + 512] = i;
+        }
+    }
+}
+
+/*
+================
+=
+= R_DrawSpan
+=
+================
+*/
+
+int ds_y;
+int ds_x1;
+int ds_x2;
+lighttable_t *ds_colormap;
+fixed_t ds_xfrac;
+fixed_t ds_yfrac;
+fixed_t ds_xstep;
+fixed_t ds_ystep;
+byte *ds_source;                // start of a 64*64 tile image
+
+int dscount;                    // just for profiling
+
+void R_DrawSpan(void)
+{
+    fixed_t xfrac, yfrac;
+    byte *dest;
+    int count, spot;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
+        || (unsigned) ds_y > SCREENHEIGHT)
+        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
+//      dscount++;
+#endif
+
+    xfrac = ds_xfrac;
+    yfrac = ds_yfrac;
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+    count = ds_x2 - ds_x1;
+    do
+    {
+        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
+        *dest++ = ds_colormap[ds_source[spot]];
+        xfrac += ds_xstep;
+        yfrac += ds_ystep;
+    }
+    while (count--);
+}
+
+void R_DrawSpanLow(void)
+{
+    fixed_t xfrac, yfrac;
+    byte *dest;
+    int count, spot;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
+        || (unsigned) ds_y > SCREENHEIGHT)
+        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
+//      dscount++;
+#endif
+
+    xfrac = ds_xfrac;
+    yfrac = ds_yfrac;
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+    count = ds_x2 - ds_x1;
+    do
+    {
+        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
+        *dest++ = ds_colormap[ds_source[spot]];
+        xfrac += ds_xstep;
+        yfrac += ds_ystep;
+    }
+    while (count--);
+}
+
+
+
+/*
+================
+=
+= R_InitBuffer
+=
+=================
+*/
+
+void R_InitBuffer(int width, int height)
+{
+    int i;
+
+    viewwindowx = (SCREENWIDTH - width) >> 1;
+    for (i = 0; i < width; i++)
+        columnofs[i] = viewwindowx + i;
+    if (width == SCREENWIDTH)
+        viewwindowy = 0;
+    else
+        viewwindowy = (SCREENHEIGHT - SBARHEIGHT - height) >> 1;
+    for (i = 0; i < height; i++)
+        ylookup[i] = I_VideoBuffer + (i + viewwindowy) * SCREENWIDTH;
+}
+
+
+/*
+==================
+=
+= R_DrawViewBorder
+=
+= Draws the border around the view for different size windows
+==================
+*/
+
+boolean BorderNeedRefresh;
+
+void R_DrawViewBorder(void)
+{
+    byte *src, *dest;
+    int x, y;
+
+    if (scaledviewwidth == SCREENWIDTH)
+        return;
+
+    if (gamemode == shareware)
+    {
+        src = W_CacheLumpName(DEH_String("FLOOR04"), PU_CACHE);
+    }
+    else
+    {
+        src = W_CacheLumpName(DEH_String("FLAT513"), PU_CACHE);
+    }
+    dest = I_VideoBuffer;
+
+    for (y = 0; y < SCREENHEIGHT - SBARHEIGHT; y++)
+    {
+        for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+            memcpy(dest, src + ((y & 63) << 6), 64);
+            dest += 64;
+        }
+        if (SCREENWIDTH & 63)
+        {
+            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+            dest += (SCREENWIDTH & 63);
+        }
+    }
+    for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
+    {
+        V_DrawPatch(x, viewwindowy - 4,
+                    W_CacheLumpName(DEH_String("bordt"), PU_CACHE));
+        V_DrawPatch(x, viewwindowy + viewheight,
+                    W_CacheLumpName(DEH_String("bordb"), PU_CACHE));
+    }
+    for (y = viewwindowy; y < viewwindowy + viewheight; y += 16)
+    {
+        V_DrawPatch(viewwindowx - 4, y,
+                    W_CacheLumpName(DEH_String("bordl"), PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, y,
+                    W_CacheLumpName(DEH_String("bordr"), PU_CACHE));
+    }
+    V_DrawPatch(viewwindowx - 4, viewwindowy - 4,
+                W_CacheLumpName(DEH_String("bordtl"), PU_CACHE));
+    V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
+                W_CacheLumpName(DEH_String("bordtr"), PU_CACHE));
+    V_DrawPatch(viewwindowx + viewwidth, viewwindowy + viewheight,
+                W_CacheLumpName(DEH_String("bordbr"), PU_CACHE));
+    V_DrawPatch(viewwindowx - 4, viewwindowy + viewheight,
+                W_CacheLumpName(DEH_String("bordbl"), PU_CACHE));
+}
+
+/*
+==================
+=
+= R_DrawTopBorder
+=
+= Draws the top border around the view for different size windows
+==================
+*/
+
+boolean BorderTopRefresh;
+
+void R_DrawTopBorder(void)
+{
+    byte *src, *dest;
+    int x, y;
+
+    if (scaledviewwidth == SCREENWIDTH)
+        return;
+
+    if (gamemode == shareware)
+    {
+        src = W_CacheLumpName(DEH_String("FLOOR04"), PU_CACHE);
+    }
+    else
+    {
+        src = W_CacheLumpName(DEH_String("FLAT513"), PU_CACHE);
+    }
+    dest = I_VideoBuffer;
+
+    for (y = 0; y < 30; y++)
+    {
+        for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+            memcpy(dest, src + ((y & 63) << 6), 64);
+            dest += 64;
+        }
+        if (SCREENWIDTH & 63)
+        {
+            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+            dest += (SCREENWIDTH & 63);
+        }
+    }
+    if (viewwindowy < 25)
+    {
+        for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
+        {
+            V_DrawPatch(x, viewwindowy - 4,
+                        W_CacheLumpName(DEH_String("bordt"), PU_CACHE));
+        }
+        V_DrawPatch(viewwindowx - 4, viewwindowy,
+                    W_CacheLumpName(DEH_String("bordl"), PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, viewwindowy,
+                    W_CacheLumpName(DEH_String("bordr"), PU_CACHE));
+        V_DrawPatch(viewwindowx - 4, viewwindowy + 16,
+                    W_CacheLumpName(DEH_String("bordl"), PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, viewwindowy + 16,
+                    W_CacheLumpName(DEH_String("bordr"), PU_CACHE));
+
+        V_DrawPatch(viewwindowx - 4, viewwindowy - 4,
+                    W_CacheLumpName(DEH_String("bordtl"), PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
+                    W_CacheLumpName(DEH_String("bordtr"), PU_CACHE));
+    }
+}
diff --git a/games/NXDoom/src/heretic/r_local.h b/games/NXDoom/src/heretic/r_local.h
new file mode 100644
index 000000000..cf58ed185
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_local.h
@@ -0,0 +1,487 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// R_local.h
+
+#ifndef __R_LOCAL__
+#define __R_LOCAL__
+
+#include "i_video.h"
+#include "v_patch.h"
+
+#define	ANGLETOSKYSHIFT		22      // sky map is 256*128*4 maps
+
+#define	BASEYCENTER			100
+
+#define MAXWIDTH			1120
+#define	MAXHEIGHT			832
+
+#define	PI					3.141592657
+
+#define	CENTERY				(SCREENHEIGHT/2)
+
+#define	MINZ			(FRACUNIT*4)
+
+#define	FIELDOFVIEW		2048    // fineangles in the SCREENWIDTH wide window
+
+//
+// lighting constants
+//
+#define	LIGHTLEVELS			16
+#define	LIGHTSEGSHIFT		4
+#define	MAXLIGHTSCALE		48
+#define	LIGHTSCALESHIFT		12
+#define	MAXLIGHTZ			128
+#define	LIGHTZSHIFT			20
+#define	NUMCOLORMAPS		32      // number of diminishing
+#define	INVERSECOLORMAP		32
+
+/*
+==============================================================================
+
+					INTERNAL MAP TYPES
+
+==============================================================================
+*/
+
+//================ used by play and refresh
+
+typedef struct
+{
+    fixed_t x, y;
+} vertex_t;
+
+struct line_s;
+
+typedef struct
+{
+    fixed_t floorheight, ceilingheight;
+    short floorpic, ceilingpic;
+    short lightlevel;
+    short special, tag;
+
+    int soundtraversed;         // 0 = untraversed, 1,2 = sndlines -1
+    mobj_t *soundtarget;        // thing that made a sound (or null)
+
+    int blockbox[4];            // mapblock bounding box for height changes
+    degenmobj_t soundorg;       // for any sounds played by the sector
+
+    int validcount;             // if == validcount, already checked
+    mobj_t *thinglist;          // list of mobjs in sector
+    void *specialdata;          // thinker_t for reversable actions
+    int linecount;
+    struct line_s **lines;      // [linecount] size
+} sector_t;
+
+typedef struct
+{
+    fixed_t textureoffset;      // add this to the calculated texture col
+    fixed_t rowoffset;          // add this to the calculated texture top
+    short toptexture, bottomtexture, midtexture;
+    sector_t *sector;
+} side_t;
+
+typedef enum
+{ ST_HORIZONTAL, ST_VERTICAL, ST_POSITIVE, ST_NEGATIVE } slopetype_t;
+
+typedef struct line_s
+{
+    vertex_t *v1, *v2;
+    fixed_t dx, dy;             // v2 - v1 for side checking
+    short flags;
+    short special, tag;
+    short sidenum[2];           // sidenum[1] will be -1 if one sided
+    fixed_t bbox[4];
+    slopetype_t slopetype;      // to aid move clipping
+    sector_t *frontsector, *backsector;
+    int validcount;             // if == validcount, already checked
+    void *specialdata;          // thinker_t for reversable actions
+} line_t;
+
+
+typedef struct subsector_s
+{
+    sector_t *sector;
+    short numlines;
+    short firstline;
+} subsector_t;
+
+typedef struct
+{
+    vertex_t *v1, *v2;
+    fixed_t offset;
+    angle_t angle;
+    side_t *sidedef;
+    line_t *linedef;
+    sector_t *frontsector;
+    sector_t *backsector;       // NULL for one sided lines
+} seg_t;
+
+typedef struct
+{
+    fixed_t x, y, dx, dy;       // partition line
+    fixed_t bbox[2][4];         // bounding box for each child
+    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
+} node_t;
+
+
+/*
+==============================================================================
+
+						OTHER TYPES
+
+==============================================================================
+*/
+
+typedef byte lighttable_t;      // this could be wider for >8 bit display
+
+#define	MAXVISPLANES	128
+#define	MAXOPENINGS		SCREENWIDTH*64
+
+typedef struct
+{
+    fixed_t height;
+    int picnum;
+    int lightlevel;
+    int special;
+    int minx, maxx;
+    byte pad1;                  // leave pads for [minx-1]/[maxx+1]
+    byte top[SCREENWIDTH];
+    byte pad2;
+    byte pad3;
+    byte bottom[SCREENWIDTH];
+    byte pad4;
+} visplane_t;
+
+typedef struct drawseg_s
+{
+    seg_t *curline;
+    int x1, x2;
+    fixed_t scale1, scale2, scalestep;
+    int silhouette;             // 0=none, 1=bottom, 2=top, 3=both
+    fixed_t bsilheight;         // don't clip sprites above this
+    fixed_t tsilheight;         // don't clip sprites below this
+// pointers to lists for sprite clipping
+    short *sprtopclip;          // adjusted so [x1] is first value
+    short *sprbottomclip;       // adjusted so [x1] is first value
+    short *maskedtexturecol;    // adjusted so [x1] is first value
+} drawseg_t;
+
+#define	SIL_NONE	0
+#define	SIL_BOTTOM	1
+#define SIL_TOP		2
+#define	SIL_BOTH	3
+
+#define	MAXDRAWSEGS		256
+
+// A vissprite_t is a thing that will be drawn during a refresh
+typedef struct vissprite_s
+{
+    struct vissprite_s *prev, *next;
+    int x1, x2;
+    fixed_t gx, gy;             // for line side calculation
+    fixed_t gz, gzt;            // global bottom / top for silhouette clipping
+    fixed_t startfrac;          // horizontal position of x1
+    fixed_t scale;
+    fixed_t xiscale;            // negative if flipped
+    fixed_t texturemid;
+    int patch;
+    lighttable_t *colormap;
+    int mobjflags;              // for color translation and shadow draw
+    boolean psprite;            // true if psprite
+    fixed_t footclip;           // foot clipping
+} vissprite_t;
+
+
+extern visplane_t *floorplane, *ceilingplane;
+
+// Sprites are patches with a special naming convention so they can be 
+// recognized by R_InitSprites.  The sprite and frame specified by a 
+// thing_t is range checked at run time.
+// a sprite is a patch_t that is assumed to represent a three dimensional
+// object and may have multiple rotations pre drawn.  Horizontal flipping 
+// is used to save space. Some sprites will only have one picture used
+// for all views.  
+
+typedef struct
+{
+    boolean rotate;             // if false use 0 for any position
+    short lump[8];              // lump to use for view angles 0-7
+    byte flip[8];               // flip (1 = flip) to use for view angles 0-7
+} spriteframe_t;
+
+typedef struct
+{
+    int numframes;
+    spriteframe_t *spriteframes;
+} spritedef_t;
+
+extern spritedef_t *sprites;
+extern int numsprites;
+
+//=============================================================================
+
+extern int numvertexes;
+extern vertex_t *vertexes;
+
+extern int numsegs;
+extern seg_t *segs;
+
+extern int numsectors;
+extern sector_t *sectors;
+
+extern int numsubsectors;
+extern subsector_t *subsectors;
+
+extern int numnodes;
+extern node_t *nodes;
+
+extern int numlines;
+extern line_t *lines;
+
+extern int numsides;
+extern side_t *sides;
+
+
+
+extern fixed_t viewx, viewy, viewz;
+extern angle_t viewangle;
+extern player_t *viewplayer;
+
+
+extern angle_t clipangle;
+
+extern int viewangletox[FINEANGLES / 2];
+extern angle_t xtoviewangle[SCREENWIDTH + 1];
+
+extern fixed_t rw_distance;
+extern angle_t rw_normalangle;
+
+//
+// R_main.c
+//
+extern int viewwidth, viewheight, viewwindowx, viewwindowy;
+extern int scaledviewwidth;
+extern int centerx, centery;
+extern int flyheight;
+extern fixed_t centerxfrac;
+extern fixed_t centeryfrac;
+extern fixed_t projection;
+
+extern int validcount;
+
+extern int sscount, linecount, loopcount;
+extern lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+extern lighttable_t *scalelightfixed[MAXLIGHTSCALE];
+extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+extern int extralight;
+extern lighttable_t *fixedcolormap;
+
+extern fixed_t viewcos, viewsin;
+
+extern int detailshift;         // 0 = high, 1 = low
+
+extern int detailLevel;
+extern int screenblocks;
+
+extern void (*colfunc) (void);
+extern void (*basecolfunc) (void);
+extern void (*tlcolfunc) (void);
+extern void (*spanfunc) (void);
+
+int R_PointOnSide(fixed_t x, fixed_t y, node_t * node);
+int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line);
+angle_t R_PointToAngle(fixed_t x, fixed_t y);
+angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
+fixed_t R_PointToDist(fixed_t x, fixed_t y);
+fixed_t R_ScaleFromGlobalAngle(angle_t visangle);
+subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
+void R_AddPointToBox(int x, int y, fixed_t * box);
+void R_ExecuteSetViewSize(void);
+
+
+//
+// R_bsp.c
+//
+extern seg_t *curline;
+extern side_t *sidedef;
+extern line_t *linedef;
+extern sector_t *frontsector, *backsector;
+
+extern int rw_x;
+extern int rw_stopx;
+
+extern boolean segtextured;
+extern boolean markfloor;       // false if the back side is the same plane
+extern boolean markceiling;
+extern boolean skymap;
+
+extern drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
+
+extern lighttable_t **hscalelight, **vscalelight, **dscalelight;
+
+typedef void (*drawfunc_t) (int start, int stop);
+void R_ClearClipSegs(void);
+
+void R_ClearDrawSegs(void);
+void R_InitSkyMap(void);
+void R_RenderBSPNode(int bspnum);
+
+//
+// R_segs.c
+//
+extern int rw_angle1;           // angle to line origin
+extern lighttable_t **walllights;
+
+
+void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2);
+
+
+//
+// R_plane.c
+//
+typedef void (*planefunction_t) (int top, int bottom);
+extern planefunction_t floorfunc, ceilingfunc;
+
+extern int skyflatnum;
+
+extern short openings[MAXOPENINGS], *lastopening;
+
+extern short floorclip[SCREENWIDTH];
+extern short ceilingclip[SCREENWIDTH];
+
+extern fixed_t yslope[SCREENHEIGHT];
+extern fixed_t distscale[SCREENWIDTH];
+
+void R_InitPlanes(void);
+void R_ClearPlanes(void);
+void R_MapPlane(int y, int x1, int x2);
+void R_MakeSpans(int x, int t1, int b1, int t2, int b2);
+void R_DrawPlanes(void);
+
+visplane_t *R_FindPlane(fixed_t height, int picnum, int lightlevel,
+                        int special);
+visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop);
+
+
+//
+// R_debug.m
+//
+extern int drawbsp;
+
+//
+// R_data.c
+//
+extern fixed_t *textureheight;  // needed for texture pegging
+extern fixed_t *spritewidth;    // needed for pre rendering (fracs)
+extern fixed_t *spriteoffset;
+extern fixed_t *spritetopoffset;
+extern lighttable_t *colormaps;
+extern int firstflat;
+extern int numflats;
+
+extern int *flattranslation;    // for global animation
+extern int *texturetranslation; // for global animation
+
+extern int firstspritelump, lastspritelump, numspritelumps;
+
+extern int columnofs[MAXWIDTH];
+
+
+byte *R_GetColumn(int tex, int col);
+void R_InitData(void);
+void R_PrecacheLevel(void);
+
+
+//
+// R_things.c
+//
+#define	MAXVISSPRITES	128
+
+extern vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
+extern vissprite_t vsprsortedhead;
+
+// constant arrays used for psprite clipping and initializing clipping
+extern short negonearray[SCREENWIDTH];
+extern short screenheightarray[SCREENWIDTH];
+
+// vars for R_DrawMaskedColumn
+extern short *mfloorclip;
+extern short *mceilingclip;
+extern fixed_t spryscale;
+extern fixed_t sprtopscreen;
+extern fixed_t sprbotscreen;
+
+extern fixed_t pspritescale, pspriteiscale;
+
+
+void R_DrawMaskedColumn(column_t * column, signed int baseclip);
+
+
+void R_SortVisSprites(void);
+
+void R_AddSprites(sector_t * sec);
+void R_AddPSprites(void);
+void R_DrawSprites(void);
+void R_InitSprites(const char **namelist);
+void R_ClearSprites(void);
+void R_DrawMasked(void);
+void R_ClipVisSprite(vissprite_t * vis, int xl, int xh);
+
+//=============================================================================
+//
+// R_draw.c
+//
+//=============================================================================
+
+extern lighttable_t *dc_colormap;
+extern int dc_x;
+extern int dc_yl;
+extern int dc_yh;
+extern fixed_t dc_iscale;
+extern fixed_t dc_texturemid;
+extern byte *dc_source;         // first pixel in a column
+extern byte *ylookup[MAXHEIGHT];
+
+
+void R_DrawColumn(void);
+void R_DrawColumnLow(void);
+void R_DrawTLColumn(void);
+void R_DrawTLColumnLow(void);
+void R_DrawTranslatedColumn(void);
+void R_DrawTranslatedTLColumn(void);
+void R_DrawTranslatedColumnLow(void);
+
+extern int ds_y;
+extern int ds_x1;
+extern int ds_x2;
+extern lighttable_t *ds_colormap;
+extern fixed_t ds_xfrac;
+extern fixed_t ds_yfrac;
+extern fixed_t ds_xstep;
+extern fixed_t ds_ystep;
+extern byte *ds_source;         // start of a 64*64 tile image
+
+extern byte *translationtables;
+extern byte *dc_translation;
+
+void R_DrawSpan(void);
+void R_DrawSpanLow(void);
+
+void R_InitBuffer(int width, int height);
+void R_InitTranslationTables(void);
+
+#endif // __R_LOCAL__
diff --git a/games/NXDoom/src/heretic/r_main.c b/games/NXDoom/src/heretic/r_main.c
new file mode 100644
index 000000000..1ff6a68d8
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_main.c
@@ -0,0 +1,818 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// R_main.c
+
+#include <stdlib.h>
+#include <math.h>
+#include "doomdef.h"
+#include "m_bbox.h"
+#include "r_local.h"
+#include "tables.h"
+
+int viewangleoffset;
+
+// haleyjd: removed WATCOMC
+
+int validcount = 1;             // increment every time a check is made
+
+lighttable_t *fixedcolormap;
+
+int centerx, centery;
+fixed_t centerxfrac, centeryfrac;
+fixed_t projection;
+
+int framecount;                 // just for profiling purposes
+
+int sscount, linecount, loopcount;
+
+fixed_t viewx, viewy, viewz;
+angle_t viewangle;
+fixed_t viewcos, viewsin;
+player_t *viewplayer;
+
+int detailshift;                // 0 = high, 1 = low
+
+//
+// precalculated math tables
+//
+angle_t clipangle;
+
+// The viewangletox[viewangle + FINEANGLES/4] lookup maps the visible view
+// angles  to screen X coordinates, flattening the arc to a flat projection
+// plane.  There will be many angles mapped to the same X.
+int viewangletox[FINEANGLES / 2];
+
+// The xtoviewangleangle[] table maps a screen pixel to the lowest viewangle
+// that maps back to x ranges from clipangle to -clipangle
+angle_t xtoviewangle[SCREENWIDTH + 1];
+
+lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+lighttable_t *scalelightfixed[MAXLIGHTSCALE];
+lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+int extralight;                 // bumped light from gun blasts
+
+void (*colfunc) (void);
+void (*basecolfunc) (void);
+void (*tlcolfunc) (void);
+void (*transcolfunc) (void);
+void (*spanfunc) (void);
+
+/*
+===================
+=
+= R_AddPointToBox
+=
+===================
+*/
+
+void R_AddPointToBox(int x, int y, fixed_t * box)
+{
+    if (x < box[BOXLEFT])
+        box[BOXLEFT] = x;
+    if (x > box[BOXRIGHT])
+        box[BOXRIGHT] = x;
+    if (y < box[BOXBOTTOM])
+        box[BOXBOTTOM] = y;
+    if (y > box[BOXTOP])
+        box[BOXTOP] = y;
+}
+
+
+
+/*
+===============================================================================
+=
+= R_PointOnSide
+=
+= Returns side 0 (front) or 1 (back)
+===============================================================================
+*/
+
+int R_PointOnSide(fixed_t x, fixed_t y, node_t * node)
+{
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    if (!node->dx)
+    {
+        if (x <= node->x)
+            return node->dy > 0;
+        return node->dy < 0;
+    }
+    if (!node->dy)
+    {
+        if (y <= node->y)
+            return node->dx < 0;
+        return node->dx > 0;
+    }
+
+    dx = (x - node->x);
+    dy = (y - node->y);
+
+// try to quickly decide by looking at sign bits
+    if ((node->dy ^ node->dx ^ dx ^ dy) & 0x80000000)
+    {
+        if ((node->dy ^ dx) & 0x80000000)
+            return 1;           // (left is negative)
+        return 0;
+    }
+
+    left = FixedMul(node->dy >> FRACBITS, dx);
+    right = FixedMul(dy, node->dx >> FRACBITS);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line)
+{
+    fixed_t lx, ly;
+    fixed_t ldx, ldy;
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    lx = line->v1->x;
+    ly = line->v1->y;
+
+    ldx = line->v2->x - lx;
+    ldy = line->v2->y - ly;
+
+    if (!ldx)
+    {
+        if (x <= lx)
+            return ldy > 0;
+        return ldy < 0;
+    }
+    if (!ldy)
+    {
+        if (y <= ly)
+            return ldx < 0;
+        return ldx > 0;
+    }
+
+    dx = (x - lx);
+    dy = (y - ly);
+
+// try to quickly decide by looking at sign bits
+    if ((ldy ^ ldx ^ dx ^ dy) & 0x80000000)
+    {
+        if ((ldy ^ dx) & 0x80000000)
+            return 1;           // (left is negative)
+        return 0;
+    }
+
+    left = FixedMul(ldy >> FRACBITS, dx);
+    right = FixedMul(dy, ldx >> FRACBITS);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+/*
+===============================================================================
+=
+= R_PointToAngle
+=
+===============================================================================
+*/
+
+angle_t R_PointToAngle(fixed_t x, fixed_t y)
+{
+    x -= viewx;
+    y -= viewy;
+    if ((!x) && (!y))
+        return 0;
+    if (x >= 0)
+    {                           // x >=0
+        if (y >= 0)
+        {                       // y>= 0
+            if (x > y)
+                return tantoangle[SlopeDiv(y, x)];      // octant 0
+            else
+                return ANG90 - 1 - tantoangle[SlopeDiv(x, y)];  // octant 1
+        }
+        else
+        {                       // y<0
+            y = -y;
+            if (x > y)
+                return -tantoangle[SlopeDiv(y, x)];     // octant 8
+            else
+                return ANG270 + tantoangle[SlopeDiv(x, y)];     // octant 7
+        }
+    }
+    else
+    {                           // x<0
+        x = -x;
+        if (y >= 0)
+        {                       // y>= 0
+            if (x > y)
+                return ANG180 - 1 - tantoangle[SlopeDiv(y, x)]; // octant 3
+            else
+                return ANG90 + tantoangle[SlopeDiv(x, y)];      // octant 2
+        }
+        else
+        {                       // y<0
+            y = -y;
+            if (x > y)
+                return ANG180 + tantoangle[SlopeDiv(y, x)];     // octant 4
+            else
+                return ANG270 - 1 - tantoangle[SlopeDiv(x, y)]; // octant 5
+        }
+    }
+
+    return 0;
+}
+
+
+angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
+{
+    viewx = x1;
+    viewy = y1;
+    return R_PointToAngle(x2, y2);
+}
+
+
+fixed_t R_PointToDist(fixed_t x, fixed_t y)
+{
+    int angle;
+    fixed_t dx, dy, temp;
+    fixed_t dist;
+
+    dx = abs(x - viewx);
+    dy = abs(y - viewy);
+
+    if (dy > dx)
+    {
+        temp = dx;
+        dx = dy;
+        dy = temp;
+    }
+
+    angle =
+        (tantoangle[FixedDiv(dy, dx) >> DBITS] + ANG90) >> ANGLETOFINESHIFT;
+
+    dist = FixedDiv(dx, finesine[angle]);       // use as cosine
+
+    return dist;
+}
+
+
+
+/*
+=================
+=
+= R_InitPointToAngle
+=
+=================
+*/
+
+void R_InitPointToAngle(void)
+{
+// now getting from tables.c
+#if 0
+    int i;
+    long t;
+    float f;
+//
+// slope (tangent) to angle lookup
+//
+    for (i = 0; i <= SLOPERANGE; i++)
+    {
+        f = atan((float) i / SLOPERANGE) / (3.141592657 * 2);
+        t = 0xffffffff * f;
+        tantoangle[i] = t;
+    }
+#endif
+}
+
+//=============================================================================
+
+/*
+================
+=
+= R_ScaleFromGlobalAngle
+=
+= Returns the texture mapping scale for the current line at the given angle
+= rw_distance must be calculated first
+================
+*/
+
+fixed_t R_ScaleFromGlobalAngle(angle_t visangle)
+{
+    fixed_t scale;
+    int anglea, angleb;
+    int sinea, sineb;
+    fixed_t num, den;
+
+#if 0
+    {
+        fixed_t dist, z;
+        fixed_t sinv, cosv;
+
+        sinv = finesine[(visangle - rw_normalangle) >> ANGLETOFINESHIFT];
+        dist = FixedDiv(rw_distance, sinv);
+        cosv = finecosine[(viewangle - visangle) >> ANGLETOFINESHIFT];
+        z = abs(FixedMul(dist, cosv));
+        scale = FixedDiv(projection, z);
+        return scale;
+    }
+#endif
+
+    anglea = ANG90 + (visangle - viewangle);
+    angleb = ANG90 + (visangle - rw_normalangle);
+// bothe sines are allways positive
+    sinea = finesine[anglea >> ANGLETOFINESHIFT];
+    sineb = finesine[angleb >> ANGLETOFINESHIFT];
+    num = FixedMul(projection, sineb) << detailshift;
+    den = FixedMul(rw_distance, sinea);
+    if (den > num >> 16)
+    {
+        scale = FixedDiv(num, den);
+        if (scale > 64 * FRACUNIT)
+            scale = 64 * FRACUNIT;
+        else if (scale < 256)
+            scale = 256;
+    }
+    else
+        scale = 64 * FRACUNIT;
+
+    return scale;
+}
+
+
+
+/*
+=================
+=
+= R_InitTables
+=
+=================
+*/
+
+void R_InitTables(void)
+{
+// now getting from tables.c
+#if 0
+    int i;
+    float a, fv;
+    int t;
+
+//
+// viewangle tangent table
+//
+    for (i = 0; i < FINEANGLES / 2; i++)
+    {
+        a = (i - FINEANGLES / 4 + 0.5) * PI * 2 / FINEANGLES;
+        fv = FRACUNIT * tan(a);
+        t = fv;
+        finetangent[i] = t;
+    }
+
+//
+// finesine table
+//
+    for (i = 0; i < 5 * FINEANGLES / 4; i++)
+    {
+// OPTIMIZE: mirror...
+        a = (i + 0.5) * PI * 2 / FINEANGLES;
+        t = FRACUNIT * sin(a);
+        finesine[i] = t;
+    }
+#endif
+
+}
+
+
+/*
+=================
+=
+= R_InitTextureMapping
+=
+=================
+*/
+
+void R_InitTextureMapping(void)
+{
+    int i;
+    int x;
+    int t;
+    fixed_t focallength;
+
+
+//
+// use tangent table to generate viewangletox
+// viewangletox will give the next greatest x after the view angle
+//
+    // calc focallength so FIELDOFVIEW angles covers SCREENWIDTH
+    focallength =
+        FixedDiv(centerxfrac, finetangent[FINEANGLES / 4 + FIELDOFVIEW / 2]);
+
+    for (i = 0; i < FINEANGLES / 2; i++)
+    {
+        if (finetangent[i] > FRACUNIT * 2)
+            t = -1;
+        else if (finetangent[i] < -FRACUNIT * 2)
+            t = viewwidth + 1;
+        else
+        {
+            t = FixedMul(finetangent[i], focallength);
+            t = (centerxfrac - t + FRACUNIT - 1) >> FRACBITS;
+            if (t < -1)
+                t = -1;
+            else if (t > viewwidth + 1)
+                t = viewwidth + 1;
+        }
+        viewangletox[i] = t;
+    }
+
+//
+// scan viewangletox[] to generate xtoviewangleangle[]
+//
+// xtoviewangle will give the smallest view angle that maps to x
+    for (x = 0; x <= viewwidth; x++)
+    {
+        i = 0;
+        while (viewangletox[i] > x)
+            i++;
+        xtoviewangle[x] = (i << ANGLETOFINESHIFT) - ANG90;
+    }
+
+//
+// take out the fencepost cases from viewangletox
+//
+    for (i = 0; i < FINEANGLES / 2; i++)
+    {
+        t = FixedMul(finetangent[i], focallength);
+        t = centerx - t;
+        if (viewangletox[i] == -1)
+            viewangletox[i] = 0;
+        else if (viewangletox[i] == viewwidth + 1)
+            viewangletox[i] = viewwidth;
+    }
+
+    clipangle = xtoviewangle[0];
+}
+
+//=============================================================================
+
+/*
+====================
+=
+= R_InitLightTables
+=
+= Only inits the zlight table, because the scalelight table changes
+= with view size
+=
+====================
+*/
+
+#define		DISTMAP	2
+
+void R_InitLightTables(void)
+{
+    int i, j, level, startmap;
+    int scale;
+
+//
+// Calculate the light levels to use for each level / distance combination
+//
+    for (i = 0; i < LIGHTLEVELS; i++)
+    {
+        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
+        for (j = 0; j < MAXLIGHTZ; j++)
+        {
+            scale =
+                FixedDiv((SCREENWIDTH / 2 * FRACUNIT),
+                         (j + 1) << LIGHTZSHIFT);
+            scale >>= LIGHTSCALESHIFT;
+            level = startmap - scale / DISTMAP;
+            if (level < 0)
+                level = 0;
+            if (level >= NUMCOLORMAPS)
+                level = NUMCOLORMAPS - 1;
+            zlight[i][j] = colormaps + level * 256;
+        }
+    }
+}
+
+
+/*
+==============
+=
+= R_SetViewSize
+=
+= Don't really change anything here, because i might be in the middle of
+= a refresh.  The change will take effect next refresh.
+=
+==============
+*/
+
+boolean setsizeneeded;
+int setblocks, setdetail;
+
+void R_SetViewSize(int blocks, int detail)
+{
+    setsizeneeded = true;
+    setblocks = blocks;
+    setdetail = detail;
+}
+
+/*
+==============
+=
+= R_ExecuteSetViewSize
+=
+==============
+*/
+
+void R_ExecuteSetViewSize(void)
+{
+    fixed_t cosadj, dy;
+    int i, j, level, startmap;
+
+    setsizeneeded = false;
+
+    if (setblocks == 11)
+    {
+        scaledviewwidth = SCREENWIDTH;
+        viewheight = SCREENHEIGHT;
+    }
+    else
+    {
+        scaledviewwidth = setblocks * 32;
+        viewheight = (setblocks * 158 / 10);
+    }
+
+    detailshift = setdetail;
+    viewwidth = scaledviewwidth >> detailshift;
+
+    centery = viewheight / 2;
+    centerx = viewwidth / 2;
+    centerxfrac = centerx << FRACBITS;
+    centeryfrac = centery << FRACBITS;
+    projection = centerxfrac;
+
+    if (!detailshift)
+    {
+        colfunc = basecolfunc = R_DrawColumn;
+        tlcolfunc = R_DrawTLColumn;
+        transcolfunc = R_DrawTranslatedColumn;
+        spanfunc = R_DrawSpan;
+    }
+    else
+    {
+        colfunc = basecolfunc = R_DrawColumnLow;
+        tlcolfunc = R_DrawTLColumn;
+        transcolfunc = R_DrawTranslatedColumn;
+        spanfunc = R_DrawSpanLow;
+    }
+
+    R_InitBuffer(scaledviewwidth, viewheight);
+
+    R_InitTextureMapping();
+
+//
+// psprite scales
+//
+    pspritescale = FRACUNIT * viewwidth / SCREENWIDTH;
+    pspriteiscale = FRACUNIT * SCREENWIDTH / viewwidth;
+
+//
+// thing clipping
+//
+    for (i = 0; i < viewwidth; i++)
+        screenheightarray[i] = viewheight;
+
+//
+// planes
+//
+    for (i = 0; i < viewheight; i++)
+    {
+        dy = ((i - viewheight / 2) << FRACBITS) + FRACUNIT / 2;
+        dy = abs(dy);
+        yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT, dy);
+    }
+
+    for (i = 0; i < viewwidth; i++)
+    {
+        cosadj = abs(finecosine[xtoviewangle[i] >> ANGLETOFINESHIFT]);
+        distscale[i] = FixedDiv(FRACUNIT, cosadj);
+    }
+
+//
+// Calculate the light levels to use for each level / scale combination
+//
+    for (i = 0; i < LIGHTLEVELS; i++)
+    {
+        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
+        for (j = 0; j < MAXLIGHTSCALE; j++)
+        {
+            level =
+                startmap -
+                j * SCREENWIDTH / (viewwidth << detailshift) / DISTMAP;
+            if (level < 0)
+                level = 0;
+            if (level >= NUMCOLORMAPS)
+                level = NUMCOLORMAPS - 1;
+            scalelight[i][j] = colormaps + level * 256;
+        }
+    }
+
+//
+// draw the border
+//
+    R_DrawViewBorder();         // erase old menu stuff
+}
+
+
+/*
+==============
+=
+= R_Init
+=
+==============
+*/
+
+int detailLevel;
+int screenblocks = 10;
+
+void R_Init(void)
+{
+    //tprintf("R_InitData ", 1);
+    R_InitData();
+    printf (".");
+    //tprintf("R_InitPointToAngle\n", 0);
+    R_InitPointToAngle();
+    printf (".");
+    //tprintf("R_InitTables ", 0);
+    R_InitTables();
+    // viewwidth / viewheight / detailLevel are set by the defaults
+    printf (".");
+    R_SetViewSize(screenblocks, detailLevel);
+    //tprintf("R_InitPlanes\n", 0);
+    R_InitPlanes();
+    printf (".");
+    //tprintf("R_InitLightTables ", 0);
+    R_InitLightTables();
+    printf (".");
+    //tprintf("R_InitSkyMap\n", 0);
+    R_InitSkyMap();
+    printf (".");
+    R_InitTranslationTables();
+    framecount = 0;
+}
+
+
+/*
+==============
+=
+= R_PointInSubsector
+=
+==============
+*/
+
+subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
+{
+    node_t *node;
+    int side, nodenum;
+
+    if (!numnodes)              // single subsector is a special case
+        return subsectors;
+
+    nodenum = numnodes - 1;
+
+    while (!(nodenum & NF_SUBSECTOR))
+    {
+        node = &nodes[nodenum];
+        side = R_PointOnSide(x, y, node);
+        nodenum = node->children[side];
+    }
+
+    return &subsectors[nodenum & ~NF_SUBSECTOR];
+
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC R_SetupFrame
+//
+//----------------------------------------------------------------------------
+
+void R_SetupFrame(player_t * player)
+{
+    int i;
+    int tableAngle;
+    int tempCentery;
+
+    //drawbsp = 1;
+    viewplayer = player;
+    // haleyjd: removed WATCOMC
+    // haleyjd FIXME: viewangleoffset handling?
+    viewangle = player->mo->angle + viewangleoffset;
+    tableAngle = viewangle >> ANGLETOFINESHIFT;
+    if (player->chickenTics && player->chickenPeck)
+    {                           // Set chicken attack view position
+        viewx = player->mo->x + player->chickenPeck * finecosine[tableAngle];
+        viewy = player->mo->y + player->chickenPeck * finesine[tableAngle];
+    }
+    else
+    {                           // Normal view position
+        viewx = player->mo->x;
+        viewy = player->mo->y;
+    }
+    extralight = player->extralight;
+    viewz = player->viewz;
+
+    tempCentery = viewheight / 2 + (player->lookdir) * screenblocks / 10;
+    if (centery != tempCentery)
+    {
+        centery = tempCentery;
+        centeryfrac = centery << FRACBITS;
+        for (i = 0; i < viewheight; i++)
+        {
+            yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT,
+                                 abs(((i - centery) << FRACBITS) +
+                                     FRACUNIT / 2));
+        }
+    }
+    viewsin = finesine[tableAngle];
+    viewcos = finecosine[tableAngle];
+    sscount = 0;
+    if (player->fixedcolormap)
+    {
+        fixedcolormap = colormaps + player->fixedcolormap
+            * 256 * sizeof(lighttable_t);
+        walllights = scalelightfixed;
+        for (i = 0; i < MAXLIGHTSCALE; i++)
+        {
+            scalelightfixed[i] = fixedcolormap;
+        }
+    }
+    else
+    {
+        fixedcolormap = 0;
+    }
+    framecount++;
+    validcount++;
+    if (BorderNeedRefresh)
+    {
+        if (setblocks < 10)
+        {
+            R_DrawViewBorder();
+        }
+        BorderNeedRefresh = false;
+        BorderTopRefresh = false;
+        UpdateState |= I_FULLSCRN;
+    }
+    if (BorderTopRefresh)
+    {
+        if (setblocks < 10)
+        {
+            R_DrawTopBorder();
+        }
+        BorderTopRefresh = false;
+        UpdateState |= I_MESSAGES;
+    }
+}
+
+/*
+==============
+=
+= R_RenderView
+=
+==============
+*/
+
+void R_RenderPlayerView(player_t * player)
+{
+    R_SetupFrame(player);
+    R_ClearClipSegs();
+    R_ClearDrawSegs();
+    R_ClearPlanes();
+    R_ClearSprites();
+    NetUpdate();                // check for new console commands
+    R_RenderBSPNode(numnodes - 1);      // the head node is the last node output
+    NetUpdate();                // check for new console commands
+    R_DrawPlanes();
+    NetUpdate();                // check for new console commands
+    R_DrawMasked();
+    NetUpdate();                // check for new console commands
+}
diff --git a/games/NXDoom/src/heretic/r_plane.c b/games/NXDoom/src/heretic/r_plane.c
new file mode 100644
index 000000000..e9ed70c76
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_plane.c
@@ -0,0 +1,511 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// R_planes.c
+
+#include <stdlib.h>
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_system.h"
+#include "r_local.h"
+
+planefunction_t floorfunc, ceilingfunc;
+
+//
+// sky mapping
+//
+int skyflatnum;
+int skytexture;
+int skytexturemid;
+fixed_t skyiscale;
+
+//
+// opening
+//
+
+visplane_t visplanes[MAXVISPLANES], *lastvisplane;
+visplane_t *floorplane, *ceilingplane;
+
+short openings[MAXOPENINGS], *lastopening;
+
+//
+// clip values are the solid pixel bounding the range
+// floorclip starts out SCREENHEIGHT
+// ceilingclip starts out -1
+//
+short floorclip[SCREENWIDTH];
+short ceilingclip[SCREENWIDTH];
+
+//
+// spanstart holds the start of a plane span
+// initialized to 0 at start
+//
+int spanstart[SCREENHEIGHT];
+int spanstop[SCREENHEIGHT];
+
+//
+// texture mapping
+//
+lighttable_t **planezlight;
+fixed_t planeheight;
+
+fixed_t yslope[SCREENHEIGHT];
+fixed_t distscale[SCREENWIDTH];
+fixed_t basexscale, baseyscale;
+
+fixed_t cachedheight[SCREENHEIGHT];
+fixed_t cacheddistance[SCREENHEIGHT];
+fixed_t cachedxstep[SCREENHEIGHT];
+fixed_t cachedystep[SCREENHEIGHT];
+
+
+/*
+================
+=
+= R_InitSkyMap
+=
+= Called whenever the view size changes
+=
+================
+*/
+
+void R_InitSkyMap(void)
+{
+    skyflatnum = R_FlatNumForName(DEH_String("F_SKY1"));
+    skytexturemid = 200 * FRACUNIT;
+    skyiscale = FRACUNIT;
+}
+
+
+/*
+====================
+=
+= R_InitPlanes
+=
+= Only at game startup
+====================
+*/
+
+void R_InitPlanes(void)
+{
+}
+
+
+/*
+================
+=
+= R_MapPlane
+=
+global vars:
+
+planeheight
+ds_source
+basexscale
+baseyscale
+viewx
+viewy
+
+BASIC PRIMITIVE
+================
+*/
+
+void R_MapPlane(int y, int x1, int x2)
+{
+    angle_t angle;
+    fixed_t distance, length;
+    unsigned index;
+
+#ifdef RANGECHECK
+    if (x2 < x1 || x1 < 0 || x2 >= viewwidth || (unsigned) y > viewheight)
+        I_Error("R_MapPlane: %i, %i at %i", x1, x2, y);
+#endif
+
+    if (planeheight != cachedheight[y])
+    {
+        cachedheight[y] = planeheight;
+        distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
+
+        ds_xstep = cachedxstep[y] = FixedMul(distance, basexscale);
+        ds_ystep = cachedystep[y] = FixedMul(distance, baseyscale);
+    }
+    else
+    {
+        distance = cacheddistance[y];
+        ds_xstep = cachedxstep[y];
+        ds_ystep = cachedystep[y];
+    }
+
+    length = FixedMul(distance, distscale[x1]);
+    angle = (viewangle + xtoviewangle[x1]) >> ANGLETOFINESHIFT;
+    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
+    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
+
+    if (fixedcolormap)
+        ds_colormap = fixedcolormap;
+    else
+    {
+        index = distance >> LIGHTZSHIFT;
+        if (index >= MAXLIGHTZ)
+            index = MAXLIGHTZ - 1;
+        ds_colormap = planezlight[index];
+    }
+
+    ds_y = y;
+    ds_x1 = x1;
+    ds_x2 = x2;
+
+    spanfunc();                 // high or low detail
+}
+
+//=============================================================================
+
+/*
+====================
+=
+= R_ClearPlanes
+=
+= At begining of frame
+====================
+*/
+
+void R_ClearPlanes(void)
+{
+    int i;
+    angle_t angle;
+
+//
+// opening / clipping determination
+//      
+    for (i = 0; i < viewwidth; i++)
+    {
+        floorclip[i] = viewheight;
+        ceilingclip[i] = -1;
+    }
+
+    lastvisplane = visplanes;
+    lastopening = openings;
+
+//
+// texture calculation
+//
+    memset(cachedheight, 0, sizeof(cachedheight));
+    angle = (viewangle - ANG90) >> ANGLETOFINESHIFT;    // left to right mapping
+
+    // scale will be unit scale at SCREENWIDTH/2 distance
+    basexscale = FixedDiv(finecosine[angle], centerxfrac);
+    baseyscale = -FixedDiv(finesine[angle], centerxfrac);
+}
+
+
+
+/*
+===============
+=
+= R_FindPlane
+=
+===============
+*/
+
+visplane_t *R_FindPlane(fixed_t height, int picnum,
+                        int lightlevel, int special)
+{
+    visplane_t *check;
+
+    if (picnum == skyflatnum)
+    {
+        // all skies map together
+        height = 0;
+        lightlevel = 0;
+    }
+
+    for (check = visplanes; check < lastvisplane; check++)
+    {
+        if (height == check->height
+            && picnum == check->picnum
+            && lightlevel == check->lightlevel && special == check->special)
+            break;
+    }
+
+    if (check < lastvisplane)
+    {
+        return (check);
+    }
+
+    if (lastvisplane - visplanes == MAXVISPLANES)
+    {
+        I_Error("R_FindPlane: no more visplanes");
+    }
+
+    lastvisplane++;
+    check->height = height;
+    check->picnum = picnum;
+    check->lightlevel = lightlevel;
+    check->special = special;
+    check->minx = SCREENWIDTH;
+    check->maxx = -1;
+    memset(check->top, 0xff, sizeof(check->top));
+    return (check);
+}
+
+/*
+===============
+=
+= R_CheckPlane
+=
+===============
+*/
+
+visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop)
+{
+    int intrl, intrh;
+    int unionl, unionh;
+    int x;
+
+    if (start < pl->minx)
+    {
+        intrl = pl->minx;
+        unionl = start;
+    }
+    else
+    {
+        unionl = pl->minx;
+        intrl = start;
+    }
+
+    if (stop > pl->maxx)
+    {
+        intrh = pl->maxx;
+        unionh = stop;
+    }
+    else
+    {
+        unionh = pl->maxx;
+        intrh = stop;
+    }
+
+    for (x = intrl; x <= intrh; x++)
+        if (pl->top[x] != 0xff)
+            break;
+
+    if (x > intrh)
+    {
+        pl->minx = unionl;
+        pl->maxx = unionh;
+        return pl;              // use the same one
+    }
+
+// make a new visplane
+
+    lastvisplane->height = pl->height;
+    lastvisplane->picnum = pl->picnum;
+    lastvisplane->lightlevel = pl->lightlevel;
+    lastvisplane->special = pl->special;
+    pl = lastvisplane++;
+    pl->minx = start;
+    pl->maxx = stop;
+    memset(pl->top, 0xff, sizeof(pl->top));
+
+    return pl;
+}
+
+
+
+//=============================================================================
+
+/*
+================
+=
+= R_MakeSpans
+=
+================
+*/
+
+void R_MakeSpans(int x, int t1, int b1, int t2, int b2)
+{
+    while (t1 < t2 && t1 <= b1)
+    {
+        R_MapPlane(t1, spanstart[t1], x - 1);
+        t1++;
+    }
+    while (b1 > b2 && b1 >= t1)
+    {
+        R_MapPlane(b1, spanstart[b1], x - 1);
+        b1--;
+    }
+
+    while (t2 < t1 && t2 <= b2)
+    {
+        spanstart[t2] = x;
+        t2++;
+    }
+    while (b2 > b1 && b2 >= t2)
+    {
+        spanstart[b2] = x;
+        b2--;
+    }
+}
+
+
+
+/*
+================
+=
+= R_DrawPlanes
+=
+= At the end of each frame
+================
+*/
+
+void R_DrawPlanes(void)
+{
+    visplane_t *pl;
+    int light;
+    int x, stop;
+    int lumpnum;
+    int angle;
+    byte *tempSource;
+
+    byte *dest;
+    int count;
+    fixed_t frac, fracstep;
+
+#ifdef RANGECHECK
+    if (ds_p - drawsegs > MAXDRAWSEGS)
+        I_Error("R_DrawPlanes: drawsegs overflow (%td)",
+                ds_p - drawsegs);
+    if (lastvisplane - visplanes > MAXVISPLANES)
+        I_Error("R_DrawPlanes: visplane overflow (%td)",
+                lastvisplane - visplanes);
+    if (lastopening - openings > MAXOPENINGS)
+        I_Error("R_DrawPlanes: opening overflow (%td)",
+                lastopening - openings);
+#endif
+
+    for (pl = visplanes; pl < lastvisplane; pl++)
+    {
+        if (pl->minx > pl->maxx)
+            continue;
+        //
+        // sky flat
+        //
+        if (pl->picnum == skyflatnum)
+        {
+            dc_iscale = skyiscale;
+            dc_colormap = colormaps;    // sky is allways drawn full bright
+            dc_texturemid = skytexturemid;
+            for (x = pl->minx; x <= pl->maxx; x++)
+            {
+                dc_yl = pl->top[x];
+                dc_yh = pl->bottom[x];
+                if (dc_yl <= dc_yh)
+                {
+                    angle = (viewangle + xtoviewangle[x]) >> ANGLETOSKYSHIFT;
+                    dc_x = x;
+                    dc_source = R_GetColumn(skytexture, angle);
+
+                    count = dc_yh - dc_yl;
+                    if (count < 0)
+                        return;
+
+#ifdef RANGECHECK
+                    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0
+                        || dc_yh >= SCREENHEIGHT)
+                        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh,
+                                dc_x);
+#endif
+
+                    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+                    fracstep = 1;
+                    frac = (dc_texturemid >> FRACBITS) + (dc_yl - centery);
+                    do
+                    {
+                        *dest = dc_source[frac];
+                        dest += SCREENWIDTH;
+                        frac += fracstep;
+                    }
+                    while (count--);
+
+//                                      colfunc ();
+                }
+            }
+            continue;
+        }
+
+        //
+        // regular flat
+        //
+        lumpnum = firstflat + flattranslation[pl->picnum];
+
+        tempSource = W_CacheLumpNum(lumpnum, PU_STATIC);
+
+        switch (pl->special)
+        {
+            case 25:
+            case 26:
+            case 27:
+            case 28:
+            case 29:           // Scroll_North
+                ds_source = tempSource;
+                break;
+            case 20:
+            case 21:
+            case 22:
+            case 23:
+            case 24:           // Scroll_East
+                ds_source = tempSource + ((63 - ((leveltime >> 1) & 63)) <<
+                                          (pl->special - 20) & 63);
+                //ds_source = tempSource+((leveltime>>1)&63);
+                break;
+            case 30:
+            case 31:
+            case 32:
+            case 33:
+            case 34:           // Scroll_South
+                ds_source = tempSource;
+                break;
+            case 35:
+            case 36:
+            case 37:
+            case 38:
+            case 39:           // Scroll_West
+                ds_source = tempSource;
+                break;
+            case 4:            // Scroll_EastLavaDamage
+                ds_source =
+                    tempSource + (((63 - ((leveltime >> 1) & 63)) << 3) & 63);
+                break;
+            default:
+                ds_source = tempSource;
+        }
+        planeheight = abs(pl->height - viewz);
+        light = (pl->lightlevel >> LIGHTSEGSHIFT) + extralight;
+        if (light >= LIGHTLEVELS)
+            light = LIGHTLEVELS - 1;
+        if (light < 0)
+            light = 0;
+        planezlight = zlight[light];
+
+        pl->top[pl->maxx + 1] = 0xff;
+        pl->top[pl->minx - 1] = 0xff;
+
+        stop = pl->maxx + 1;
+        for (x = pl->minx; x <= stop; x++)
+            R_MakeSpans(x, pl->top[x - 1], pl->bottom[x - 1], pl->top[x],
+                        pl->bottom[x]);
+
+        W_ReleaseLumpNum(lumpnum);
+    }
+}
diff --git a/games/NXDoom/src/heretic/r_segs.c b/games/NXDoom/src/heretic/r_segs.c
new file mode 100644
index 000000000..b37c94d6c
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_segs.c
@@ -0,0 +1,661 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+//**************************************************************************
+//**
+//** R_SEGS.C
+//**
+//** This version has the tall-sector-crossing-precision-bug fixed.
+//**
+//**************************************************************************
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "r_local.h"
+
+// OPTIMIZE: closed two sided lines as single sided
+
+boolean segtextured;            // true if any of the segs textures might be vis
+boolean markfloor;              // false if the back side is the same plane
+boolean markceiling;
+boolean maskedtexture;
+int toptexture, bottomtexture, midtexture;
+
+
+angle_t rw_normalangle;
+int rw_angle1;                  // angle to line origin
+
+//
+// wall
+//
+int rw_x;
+int rw_stopx;
+angle_t rw_centerangle;
+fixed_t rw_offset;
+fixed_t rw_distance;
+fixed_t rw_scale;
+fixed_t rw_scalestep;
+fixed_t rw_midtexturemid;
+fixed_t rw_toptexturemid;
+fixed_t rw_bottomtexturemid;
+
+int worldtop, worldbottom, worldhigh, worldlow;
+
+fixed_t pixhigh, pixlow;
+fixed_t pixhighstep, pixlowstep;
+fixed_t topfrac, topstep;
+fixed_t bottomfrac, bottomstep;
+
+
+lighttable_t **walllights;
+
+short *maskedtexturecol;
+
+/*
+================
+=
+= R_RenderMaskedSegRange
+=
+================
+*/
+
+void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2)
+{
+    unsigned index;
+    column_t *col;
+    int lightnum;
+    int texnum;
+
+//
+// calculate light table
+// use different light tables for horizontal / vertical / diagonal
+// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+    curline = ds->curline;
+    frontsector = curline->frontsector;
+    backsector = curline->backsector;
+    texnum = texturetranslation[curline->sidedef->midtexture];
+
+    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
+    if (curline->v1->y == curline->v2->y)
+        lightnum--;
+    else if (curline->v1->x == curline->v2->x)
+        lightnum++;
+    if (lightnum < 0)
+        walllights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+        walllights = scalelight[LIGHTLEVELS - 1];
+    else
+        walllights = scalelight[lightnum];
+
+    maskedtexturecol = ds->maskedtexturecol;
+
+    rw_scalestep = ds->scalestep;
+    spryscale = ds->scale1 + (x1 - ds->x1) * rw_scalestep;
+    mfloorclip = ds->sprbottomclip;
+    mceilingclip = ds->sprtopclip;
+
+//
+// find positioning
+//
+    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
+    {
+        dc_texturemid = frontsector->floorheight > backsector->floorheight
+            ? frontsector->floorheight : backsector->floorheight;
+        dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
+    }
+    else
+    {
+        dc_texturemid = frontsector->ceilingheight < backsector->ceilingheight
+            ? frontsector->ceilingheight : backsector->ceilingheight;
+        dc_texturemid = dc_texturemid - viewz;
+    }
+    dc_texturemid += curline->sidedef->rowoffset;
+
+    if (fixedcolormap)
+        dc_colormap = fixedcolormap;
+//
+// draw the columns
+//
+    for (dc_x = x1; dc_x <= x2; dc_x++)
+    {
+        // calculate lighting
+        if (maskedtexturecol[dc_x] != SHRT_MAX)
+        {
+            if (!fixedcolormap)
+            {
+                index = spryscale >> LIGHTSCALESHIFT;
+                if (index >= MAXLIGHTSCALE)
+                    index = MAXLIGHTSCALE - 1;
+                dc_colormap = walllights[index];
+            }
+
+            sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
+            dc_iscale = 0xffffffffu / (unsigned) spryscale;
+
+            //
+            // draw the texture
+            //
+            col = (column_t *) ((byte *)
+                                R_GetColumn(texnum,
+                                            maskedtexturecol[dc_x]) - 3);
+
+            R_DrawMaskedColumn(col, -1);
+            maskedtexturecol[dc_x] = SHRT_MAX;
+        }
+        spryscale += rw_scalestep;
+    }
+
+}
+
+/*
+================
+=
+= R_RenderSegLoop
+=
+= Draws zero, one, or two textures (and possibly a masked texture) for walls
+= Can draw or mark the starting pixel of floor and ceiling textures
+=
+= CALLED: CORE LOOPING ROUTINE
+================
+*/
+
+#define HEIGHTBITS      12
+#define HEIGHTUNIT      (1<<HEIGHTBITS)
+
+void R_RenderSegLoop(void)
+{
+    angle_t angle;
+    unsigned index;
+    int yl, yh, mid;
+    fixed_t texturecolumn;
+    int top, bottom;
+
+    texturecolumn = 0;               // shut up compiler warning
+
+    for (; rw_x < rw_stopx; rw_x++)
+    {
+//
+// mark floor / ceiling areas
+//
+        yl = (topfrac + HEIGHTUNIT - 1) >> HEIGHTBITS;
+        if (yl < ceilingclip[rw_x] + 1)
+            yl = ceilingclip[rw_x] + 1; // no space above wall
+        if (markceiling)
+        {
+            top = ceilingclip[rw_x] + 1;
+            bottom = yl - 1;
+            if (bottom >= floorclip[rw_x])
+                bottom = floorclip[rw_x] - 1;
+            if (top <= bottom)
+            {
+                ceilingplane->top[rw_x] = top;
+                ceilingplane->bottom[rw_x] = bottom;
+            }
+        }
+
+        yh = bottomfrac >> HEIGHTBITS;
+        if (yh >= floorclip[rw_x])
+            yh = floorclip[rw_x] - 1;
+        if (markfloor)
+        {
+            top = yh + 1;
+            bottom = floorclip[rw_x] - 1;
+            if (top <= ceilingclip[rw_x])
+                top = ceilingclip[rw_x] + 1;
+            if (top <= bottom)
+            {
+                floorplane->top[rw_x] = top;
+                floorplane->bottom[rw_x] = bottom;
+            }
+        }
+
+//
+// texturecolumn and lighting are independent of wall tiers
+//
+        if (segtextured)
+        {
+            // calculate texture offset
+            angle = (rw_centerangle + xtoviewangle[rw_x]) >> ANGLETOFINESHIFT;
+            texturecolumn =
+                rw_offset - FixedMul(finetangent[angle], rw_distance);
+            texturecolumn >>= FRACBITS;
+            // calculate lighting
+            index = rw_scale >> LIGHTSCALESHIFT;
+            if (index >= MAXLIGHTSCALE)
+                index = MAXLIGHTSCALE - 1;
+            dc_colormap = walllights[index];
+            dc_x = rw_x;
+            dc_iscale = 0xffffffffu / (unsigned) rw_scale;
+        }
+
+//
+// draw the wall tiers
+//
+        if (midtexture)
+        {                       // single sided line
+            dc_yl = yl;
+            dc_yh = yh;
+            dc_texturemid = rw_midtexturemid;
+            dc_source = R_GetColumn(midtexture, texturecolumn);
+            colfunc();
+            ceilingclip[rw_x] = viewheight;
+            floorclip[rw_x] = -1;
+        }
+        else
+        {                       // two sided line
+            if (toptexture)
+            {                   // top wall
+                mid = pixhigh >> HEIGHTBITS;
+                pixhigh += pixhighstep;
+                if (mid >= floorclip[rw_x])
+                    mid = floorclip[rw_x] - 1;
+                if (mid >= yl)
+                {
+                    dc_yl = yl;
+                    dc_yh = mid;
+                    dc_texturemid = rw_toptexturemid;
+                    dc_source = R_GetColumn(toptexture, texturecolumn);
+                    colfunc();
+                    ceilingclip[rw_x] = mid;
+                }
+                else
+                    ceilingclip[rw_x] = yl - 1;
+            }
+            else
+            {                   // no top wall
+                if (markceiling)
+                    ceilingclip[rw_x] = yl - 1;
+            }
+
+            if (bottomtexture)
+            {                   // bottom wall
+                mid = (pixlow + HEIGHTUNIT - 1) >> HEIGHTBITS;
+                pixlow += pixlowstep;
+                if (mid <= ceilingclip[rw_x])
+                    mid = ceilingclip[rw_x] + 1;        // no space above wall
+                if (mid <= yh)
+                {
+                    dc_yl = mid;
+                    dc_yh = yh;
+                    dc_texturemid = rw_bottomtexturemid;
+                    dc_source = R_GetColumn(bottomtexture, texturecolumn);
+                    colfunc();
+                    floorclip[rw_x] = mid;
+                }
+                else
+                    floorclip[rw_x] = yh + 1;
+            }
+            else
+            {                   // no bottom wall
+                if (markfloor)
+                    floorclip[rw_x] = yh + 1;
+            }
+
+            if (maskedtexture)
+            {                   // save texturecol for backdrawing of masked mid texture
+                maskedtexturecol[rw_x] = texturecolumn;
+            }
+        }
+
+        rw_scale += rw_scalestep;
+        topfrac += topstep;
+        bottomfrac += bottomstep;
+    }
+
+}
+
+
+
+/*
+=====================
+=
+= R_StoreWallRange
+=
+= A wall segment will be drawn between start and stop pixels (inclusive)
+=
+======================
+*/
+
+void R_StoreWallRange(int start, int stop)
+{
+    fixed_t hyp;
+    fixed_t sineval;
+    angle_t distangle, offsetangle;
+    fixed_t vtop;
+    int lightnum;
+
+    if (ds_p == &drawsegs[MAXDRAWSEGS])
+        return;                 // don't overflow and crash
+
+#ifdef RANGECHECK
+    if (start >= viewwidth || start > stop)
+        I_Error("Bad R_RenderWallRange: %i to %i", start, stop);
+#endif
+
+    sidedef = curline->sidedef;
+    linedef = curline->linedef;
+
+// mark the segment as visible for auto map
+    linedef->flags |= ML_MAPPED;
+
+//
+// calculate rw_distance for scale calculation
+//
+    rw_normalangle = curline->angle + ANG90;
+    offsetangle = abs((int) rw_normalangle - (int) rw_angle1);
+    if (offsetangle > ANG90)
+        offsetangle = ANG90;
+    distangle = ANG90 - offsetangle;
+    hyp = R_PointToDist(curline->v1->x, curline->v1->y);
+    sineval = finesine[distangle >> ANGLETOFINESHIFT];
+    rw_distance = FixedMul(hyp, sineval);
+
+
+    ds_p->x1 = rw_x = start;
+    ds_p->x2 = stop;
+    ds_p->curline = curline;
+    rw_stopx = stop + 1;
+
+//
+// calculate scale at both ends and step
+//
+    ds_p->scale1 = rw_scale =
+        R_ScaleFromGlobalAngle(viewangle + xtoviewangle[start]);
+    if (stop > start)
+    {
+        ds_p->scale2 = R_ScaleFromGlobalAngle(viewangle + xtoviewangle[stop]);
+        ds_p->scalestep = rw_scalestep =
+            (ds_p->scale2 - rw_scale) / (stop - start);
+    }
+    else
+    {
+        //
+        // try to fix the stretched line bug
+        //
+#if 0
+        if (rw_distance < FRACUNIT / 2)
+        {
+            fixed_t trx, try;
+            fixed_t gxt, gyt;
+
+            trx = curline->v1->x - viewx;
+            try = curline->v1->y - viewy;
+
+            gxt = FixedMul(trx, viewcos);
+            gyt = -FixedMul(try, viewsin);
+            ds_p->scale1 = FixedDiv(projection, gxt - gyt);
+        }
+#endif
+        ds_p->scale2 = ds_p->scale1;
+    }
+
+
+//
+// calculate texture boundaries and decide if floor / ceiling marks
+// are needed
+//
+    worldtop = frontsector->ceilingheight - viewz;
+    worldbottom = frontsector->floorheight - viewz;
+
+    midtexture = toptexture = bottomtexture = maskedtexture = 0;
+    ds_p->maskedtexturecol = NULL;
+
+    if (!backsector)
+    {
+//
+// single sided line
+//
+        midtexture = texturetranslation[sidedef->midtexture];
+        // a single sided line is terminal, so it must mark ends
+        markfloor = markceiling = true;
+        if (linedef->flags & ML_DONTPEGBOTTOM)
+        {
+            vtop = frontsector->floorheight +
+                textureheight[sidedef->midtexture];
+            rw_midtexturemid = vtop - viewz;    // bottom of texture at bottom
+        }
+        else
+            rw_midtexturemid = worldtop;        // top of texture at top
+        rw_midtexturemid += sidedef->rowoffset;
+        ds_p->silhouette = SIL_BOTH;
+        ds_p->sprtopclip = screenheightarray;
+        ds_p->sprbottomclip = negonearray;
+        ds_p->bsilheight = INT_MAX;
+        ds_p->tsilheight = INT_MIN;
+    }
+    else
+    {
+//
+// two sided line
+//
+        ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
+        ds_p->silhouette = 0;
+        if (frontsector->floorheight > backsector->floorheight)
+        {
+            ds_p->silhouette = SIL_BOTTOM;
+            ds_p->bsilheight = frontsector->floorheight;
+        }
+        else if (backsector->floorheight > viewz)
+        {
+            ds_p->silhouette = SIL_BOTTOM;
+            ds_p->bsilheight = INT_MAX;
+//                      ds_p->sprbottomclip = negonearray;
+        }
+        if (frontsector->ceilingheight < backsector->ceilingheight)
+        {
+            ds_p->silhouette |= SIL_TOP;
+            ds_p->tsilheight = frontsector->ceilingheight;
+        }
+        else if (backsector->ceilingheight < viewz)
+        {
+            ds_p->silhouette |= SIL_TOP;
+            ds_p->tsilheight = INT_MIN;
+//                      ds_p->sprtopclip = screenheightarray;
+        }
+
+        if (backsector->ceilingheight <= frontsector->floorheight)
+        {
+            ds_p->sprbottomclip = negonearray;
+            ds_p->bsilheight = INT_MAX;
+            ds_p->silhouette |= SIL_BOTTOM;
+        }
+        if (backsector->floorheight >= frontsector->ceilingheight)
+        {
+            ds_p->sprtopclip = screenheightarray;
+            ds_p->tsilheight = INT_MIN;
+            ds_p->silhouette |= SIL_TOP;
+        }
+        worldhigh = backsector->ceilingheight - viewz;
+        worldlow = backsector->floorheight - viewz;
+
+        // hack to allow height changes in outdoor areas
+        if (frontsector->ceilingpic == skyflatnum
+            && backsector->ceilingpic == skyflatnum)
+            worldtop = worldhigh;
+
+        if (worldlow != worldbottom
+            || backsector->floorpic != frontsector->floorpic
+            || backsector->lightlevel != frontsector->lightlevel)
+            markfloor = true;
+        else
+            markfloor = false;  // same plane on both sides
+
+        if (worldhigh != worldtop
+            || backsector->ceilingpic != frontsector->ceilingpic
+            || backsector->lightlevel != frontsector->lightlevel)
+            markceiling = true;
+        else
+            markceiling = false;        // same plane on both sides
+
+        if (backsector->ceilingheight <= frontsector->floorheight
+            || backsector->floorheight >= frontsector->ceilingheight)
+            markceiling = markfloor = true;     // closed door
+
+        if (worldhigh < worldtop)
+        {                       // top texture
+            toptexture = texturetranslation[sidedef->toptexture];
+            if (linedef->flags & ML_DONTPEGTOP)
+                rw_toptexturemid = worldtop;    // top of texture at top
+            else
+            {
+                vtop = backsector->ceilingheight +
+                    textureheight[sidedef->toptexture];
+                rw_toptexturemid = vtop - viewz;        // bottom of texture
+            }
+        }
+        if (worldlow > worldbottom)
+        {                       // bottom texture
+            bottomtexture = texturetranslation[sidedef->bottomtexture];
+            if (linedef->flags & ML_DONTPEGBOTTOM)
+            {                   // bottom of texture at bottom
+                rw_bottomtexturemid = worldtop; // top of texture at top
+            }
+            else                // top of texture at top
+                rw_bottomtexturemid = worldlow;
+        }
+        rw_toptexturemid += sidedef->rowoffset;
+        rw_bottomtexturemid += sidedef->rowoffset;
+
+        //
+        // allocate space for masked texture tables
+        //
+        if (sidedef->midtexture)
+        {                       // masked midtexture
+            maskedtexture = true;
+            ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
+            lastopening += rw_stopx - rw_x;
+        }
+    }
+
+//
+// calculate rw_offset (only needed for textured lines)
+//
+    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
+
+    if (segtextured)
+    {
+        offsetangle = rw_normalangle - rw_angle1;
+        if (offsetangle > ANG180)
+            offsetangle = -offsetangle;
+        if (offsetangle > ANG90)
+            offsetangle = ANG90;
+        sineval = finesine[offsetangle >> ANGLETOFINESHIFT];
+        rw_offset = FixedMul(hyp, sineval);
+        if (rw_normalangle - rw_angle1 < ANG180)
+            rw_offset = -rw_offset;
+        rw_offset += sidedef->textureoffset + curline->offset;
+        rw_centerangle = ANG90 + viewangle - rw_normalangle;
+
+        //
+        // calculate light table
+        // use different light tables for horizontal / vertical / diagonal
+        // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+        if (!fixedcolormap)
+        {
+            lightnum =
+                (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
+            if (curline->v1->y == curline->v2->y)
+                lightnum--;
+            else if (curline->v1->x == curline->v2->x)
+                lightnum++;
+            if (lightnum < 0)
+                walllights = scalelight[0];
+            else if (lightnum >= LIGHTLEVELS)
+                walllights = scalelight[LIGHTLEVELS - 1];
+            else
+                walllights = scalelight[lightnum];
+        }
+    }
+
+
+//
+// if a floor / ceiling plane is on the wrong side of the view plane
+// it is definately invisible and doesn't need to be marked
+//
+    if (frontsector->floorheight >= viewz)
+        markfloor = false;      // above view plane
+    if (frontsector->ceilingheight <= viewz
+        && frontsector->ceilingpic != skyflatnum)
+        markceiling = false;    // below view plane
+
+//
+// calculate incremental stepping values for texture edges
+//
+    worldtop >>= 4;
+    worldbottom >>= 4;
+
+    topstep = -FixedMul(rw_scalestep, worldtop);
+    topfrac = (centeryfrac >> 4) - FixedMul(worldtop, rw_scale);
+
+    bottomstep = -FixedMul(rw_scalestep, worldbottom);
+    bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
+
+    if (backsector)
+    {
+        worldhigh >>= 4;
+        worldlow >>= 4;
+
+        if (worldhigh < worldtop)
+        {
+            pixhigh = (centeryfrac >> 4) - FixedMul(worldhigh, rw_scale);
+            pixhighstep = -FixedMul(rw_scalestep, worldhigh);
+        }
+        if (worldlow > worldbottom)
+        {
+            pixlow = (centeryfrac >> 4) - FixedMul(worldlow, rw_scale);
+            pixlowstep = -FixedMul(rw_scalestep, worldlow);
+        }
+    }
+
+//
+// render it
+//
+    if (markceiling)
+        ceilingplane = R_CheckPlane(ceilingplane, rw_x, rw_stopx - 1);
+    if (markfloor)
+        floorplane = R_CheckPlane(floorplane, rw_x, rw_stopx - 1);
+
+    R_RenderSegLoop();
+
+//
+// save sprite clipping info
+//
+    if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
+    {
+        memcpy(lastopening, ceilingclip + start, 2 * (rw_stopx - start));
+        ds_p->sprtopclip = lastopening - start;
+        lastopening += rw_stopx - start;
+    }
+    if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
+        && !ds_p->sprbottomclip)
+    {
+        memcpy(lastopening, floorclip + start, 2 * (rw_stopx - start));
+        ds_p->sprbottomclip = lastopening - start;
+        lastopening += rw_stopx - start;
+    }
+    if (maskedtexture && !(ds_p->silhouette & SIL_TOP))
+    {
+        ds_p->silhouette |= SIL_TOP;
+        ds_p->tsilheight = INT_MIN;
+    }
+    if (maskedtexture && !(ds_p->silhouette & SIL_BOTTOM))
+    {
+        ds_p->silhouette |= SIL_BOTTOM;
+        ds_p->bsilheight = INT_MAX;
+    }
+    ds_p++;
+}
diff --git a/games/NXDoom/src/heretic/r_things.c b/games/NXDoom/src/heretic/r_things.c
new file mode 100644
index 000000000..88e35b9bc
--- /dev/null
+++ b/games/NXDoom/src/heretic/r_things.c
@@ -0,0 +1,1017 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// R_things.c
+#include <stdio.h>
+#include <stdlib.h>
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "r_local.h"
+
+typedef struct
+{
+    int x1, x2;
+
+    int column;
+    int topclip;
+    int bottomclip;
+} maskdraw_t;
+
+/*
+
+Sprite rotation 0 is facing the viewer, rotation 1 is one angle turn CLOCKWISE around the axis.
+This is not the same as the angle, which increases counter clockwise
+(protractor).  There was a lot of stuff grabbed wrong, so I changed it...
+
+*/
+
+
+fixed_t pspritescale, pspriteiscale;
+
+lighttable_t **spritelights;
+
+// constant arrays used for psprite clipping and initializing clipping
+short negonearray[SCREENWIDTH];
+short screenheightarray[SCREENWIDTH];
+
+/*
+===============================================================================
+
+						INITIALIZATION FUNCTIONS
+
+===============================================================================
+*/
+
+// variables used to look up and range check thing_t sprites patches
+spritedef_t *sprites;
+int numsprites;
+
+spriteframe_t sprtemp[26];
+int maxframe;
+const char *spritename;
+
+
+
+/*
+=================
+=
+= R_InstallSpriteLump
+=
+= Local function for R_InitSprites
+=================
+*/
+
+void R_InstallSpriteLump(int lump, unsigned frame, unsigned rotation,
+                         boolean flipped)
+{
+    int r;
+
+    if (frame >= 26 || rotation > 8)
+        I_Error("R_InstallSpriteLump: Bad frame characters in lump %i", lump);
+
+    if ((int) frame > maxframe)
+        maxframe = frame;
+
+    if (rotation == 0)
+    {
+// the lump should be used for all rotations
+        if (sprtemp[frame].rotate == false)
+            I_Error("R_InitSprites: Sprite %s frame %c has multip rot=0 lump",
+                    spritename, 'A' + frame);
+        if (sprtemp[frame].rotate == true)
+            I_Error
+                ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
+                 spritename, 'A' + frame);
+
+        sprtemp[frame].rotate = false;
+        for (r = 0; r < 8; r++)
+        {
+            sprtemp[frame].lump[r] = lump - firstspritelump;
+            sprtemp[frame].flip[r] = (byte) flipped;
+        }
+        return;
+    }
+
+// the lump is only used for one rotation
+    if (sprtemp[frame].rotate == false)
+        I_Error
+            ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
+             spritename, 'A' + frame);
+
+    sprtemp[frame].rotate = true;
+
+    rotation--;                 // make 0 based
+    if (sprtemp[frame].lump[rotation] != -1)
+        I_Error
+            ("R_InitSprites: Sprite %s : %c : %c has two lumps mapped to it",
+             spritename, 'A' + frame, '1' + rotation);
+
+    sprtemp[frame].lump[rotation] = lump - firstspritelump;
+    sprtemp[frame].flip[rotation] = (byte) flipped;
+}
+
+/*
+=================
+=
+= R_InitSpriteDefs
+=
+= Pass a null terminated list of sprite names (4 chars exactly) to be used
+= Builds the sprite rotation matrixes to account for horizontally flipped
+= sprites.  Will report an error if the lumps are inconsistant
+=Only called at startup
+=
+= Sprite lump names are 4 characters for the actor, a letter for the frame,
+= and a number for the rotation, A sprite that is flippable will have an
+= additional letter/number appended.  The rotation character can be 0 to
+= signify no rotations
+=================
+*/
+
+void R_InitSpriteDefs(const char **namelist)
+{
+    const char **check;
+    int i, l, frame, rotation;
+    int start, end;
+
+// count the number of sprite names
+    check = namelist;
+    while (*check != NULL)
+        check++;
+    numsprites = check - namelist;
+
+    if (!numsprites)
+        return;
+
+    sprites = Z_Malloc(numsprites * sizeof(*sprites), PU_STATIC, NULL);
+
+    start = firstspritelump - 1;
+    end = lastspritelump + 1;
+
+// scan all the lump names for each of the names, noting the highest
+// frame letter
+// Just compare 4 characters as ints
+    for (i = 0; i < numsprites; i++)
+    {
+        spritename = DEH_String(namelist[i]);
+        memset(sprtemp, -1, sizeof(sprtemp));
+
+        maxframe = -1;
+
+        //
+        // scan the lumps, filling in the frames for whatever is found
+        //
+        for (l = start + 1; l < end; l++)
+            if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
+            {
+                frame = lumpinfo[l]->name[4] - 'A';
+                rotation = lumpinfo[l]->name[5] - '0';
+                R_InstallSpriteLump(l, frame, rotation, false);
+                if (lumpinfo[l]->name[6])
+                {
+                    frame = lumpinfo[l]->name[6] - 'A';
+                    rotation = lumpinfo[l]->name[7] - '0';
+                    R_InstallSpriteLump(l, frame, rotation, true);
+                }
+            }
+
+        //
+        // check the frames that were found for completeness
+        //
+        if (maxframe == -1)
+        {
+            //continue;
+            sprites[i].numframes = 0;
+            if (gamemode == shareware)
+                continue;
+            I_Error("R_InitSprites: No lumps found for sprite %s",
+                    spritename);
+        }
+
+        maxframe++;
+        for (frame = 0; frame < maxframe; frame++)
+        {
+            switch ((int) sprtemp[frame].rotate)
+            {
+                case -1:       // no rotations were found for that frame at all
+                    I_Error("R_InitSprites: No patches found for %s frame %c",
+                            spritename, frame + 'A');
+                case 0:        // only the first rotation is needed
+                    break;
+
+                case 1:        // must have all 8 frames
+                    for (rotation = 0; rotation < 8; rotation++)
+                        if (sprtemp[frame].lump[rotation] == -1)
+                            I_Error
+                                ("R_InitSprites: Sprite %s frame %c is missing rotations",
+                                 spritename, frame + 'A');
+            }
+        }
+
+        //
+        // allocate space for the frames present and copy sprtemp to it
+        //
+        sprites[i].numframes = maxframe;
+        sprites[i].spriteframes =
+            Z_Malloc(maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
+        memcpy(sprites[i].spriteframes, sprtemp,
+               maxframe * sizeof(spriteframe_t));
+    }
+
+}
+
+
+/*
+===============================================================================
+
+							GAME FUNCTIONS
+
+===============================================================================
+*/
+
+vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
+int newvissprite;
+
+
+/*
+===================
+=
+= R_InitSprites
+=
+= Called at program start
+===================
+*/
+
+void R_InitSprites(const char **namelist)
+{
+    int i;
+
+    for (i = 0; i < SCREENWIDTH; i++)
+    {
+        negonearray[i] = -1;
+    }
+
+    R_InitSpriteDefs(namelist);
+}
+
+
+/*
+===================
+=
+= R_ClearSprites
+=
+= Called at frame start
+===================
+*/
+
+void R_ClearSprites(void)
+{
+    vissprite_p = vissprites;
+}
+
+
+/*
+===================
+=
+= R_NewVisSprite
+=
+===================
+*/
+
+vissprite_t overflowsprite;
+
+vissprite_t *R_NewVisSprite(void)
+{
+    if (vissprite_p == &vissprites[MAXVISSPRITES])
+        return &overflowsprite;
+    vissprite_p++;
+    return vissprite_p - 1;
+}
+
+
+/*
+================
+=
+= R_DrawMaskedColumn
+=
+= Used for sprites and masked mid textures
+================
+*/
+
+short *mfloorclip;
+short *mceilingclip;
+fixed_t spryscale;
+fixed_t sprtopscreen;
+fixed_t sprbotscreen;
+
+void R_DrawMaskedColumn(column_t * column, signed int baseclip)
+{
+    int topscreen, bottomscreen;
+    fixed_t basetexturemid;
+
+    basetexturemid = dc_texturemid;
+
+    for (; column->topdelta != 0xff;)
+    {
+// calculate unclipped screen coordinates for post
+        topscreen = sprtopscreen + spryscale * column->topdelta;
+        bottomscreen = topscreen + spryscale * column->length;
+        dc_yl = (topscreen + FRACUNIT - 1) >> FRACBITS;
+        dc_yh = (bottomscreen - 1) >> FRACBITS;
+
+        if (dc_yh >= mfloorclip[dc_x])
+            dc_yh = mfloorclip[dc_x] - 1;
+        if (dc_yl <= mceilingclip[dc_x])
+            dc_yl = mceilingclip[dc_x] + 1;
+
+        if (dc_yh >= baseclip && baseclip != -1)
+            dc_yh = baseclip;
+
+        if (dc_yl <= dc_yh)
+        {
+            dc_source = (byte *) column + 3;
+            dc_texturemid = basetexturemid - (column->topdelta << FRACBITS);
+//                      dc_source = (byte *)column + 3 - column->topdelta;
+            colfunc();          // either R_DrawColumn or R_DrawTLColumn
+        }
+        column = (column_t *) ((byte *) column + column->length + 4);
+    }
+
+    dc_texturemid = basetexturemid;
+}
+
+
+/*
+================
+=
+= R_DrawVisSprite
+=
+= mfloorclip and mceilingclip should also be set
+================
+*/
+
+void R_DrawVisSprite(vissprite_t * vis, int x1, int x2)
+{
+    column_t *column;
+    int texturecolumn;
+    fixed_t frac;
+    patch_t *patch;
+    fixed_t baseclip;
+
+
+    patch = W_CacheLumpNum(vis->patch + firstspritelump, PU_CACHE);
+
+    dc_colormap = vis->colormap;
+
+//      if(!dc_colormap)
+//              colfunc = tlcolfunc;  // NULL colormap = shadow draw
+
+    if (vis->mobjflags & MF_SHADOW)
+    {
+        if (vis->mobjflags & MF_TRANSLATION)
+        {
+            colfunc = R_DrawTranslatedTLColumn;
+            dc_translation = translationtables - 256 +
+                ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
+        }
+        else
+        {                       // Draw using shadow column function
+            colfunc = tlcolfunc;
+        }
+    }
+    else if (vis->mobjflags & MF_TRANSLATION)
+    {
+        // Draw using translated column function
+        colfunc = R_DrawTranslatedColumn;
+        dc_translation = translationtables - 256 +
+            ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
+    }
+
+    dc_iscale = abs(vis->xiscale) >> detailshift;
+    dc_texturemid = vis->texturemid;
+    frac = vis->startfrac;
+    spryscale = vis->scale;
+
+    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
+
+// check to see if weapon is a vissprite
+    if (vis->psprite)
+    {
+        dc_texturemid += FixedMul(((centery - viewheight / 2) << FRACBITS),
+                                  vis->xiscale);
+        sprtopscreen += (viewheight / 2 - centery) << FRACBITS;
+    }
+
+    if (vis->footclip && !vis->psprite)
+    {
+        sprbotscreen = sprtopscreen + FixedMul(SHORT(patch->height) << FRACBITS,
+                                               spryscale);
+        baseclip = (sprbotscreen - FixedMul(vis->footclip << FRACBITS,
+                                            spryscale)) >> FRACBITS;
+    }
+    else
+    {
+        baseclip = -1;
+    }
+
+    for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
+    {
+        texturecolumn = frac >> FRACBITS;
+#ifdef RANGECHECK
+        if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
+            I_Error("R_DrawSpriteRange: bad texturecolumn");
+#endif
+        column = (column_t *) ((byte *) patch +
+                               LONG(patch->columnofs[texturecolumn]));
+        R_DrawMaskedColumn(column, baseclip);
+    }
+
+    colfunc = basecolfunc;
+}
+
+
+
+/*
+===================
+=
+= R_ProjectSprite
+=
+= Generates a vissprite for a thing if it might be visible
+=
+===================
+*/
+
+void R_ProjectSprite(mobj_t * thing)
+{
+    fixed_t trx, try;
+    fixed_t gxt, gyt;
+    fixed_t tx, tz;
+    fixed_t xscale;
+    int x1, x2;
+    spritedef_t *sprdef;
+    spriteframe_t *sprframe;
+    int lump;
+    unsigned rot;
+    boolean flip;
+    int index;
+    vissprite_t *vis;
+    angle_t ang;
+    fixed_t iscale;
+
+    if (thing->flags2 & MF2_DONTDRAW)
+    {                           // Never make a vissprite when MF2_DONTDRAW is flagged.
+        return;
+    }
+
+//
+// transform the origin point
+//
+    trx = thing->x - viewx;
+    try = thing->y - viewy;
+
+    gxt = FixedMul(trx, viewcos);
+    gyt = -FixedMul(try, viewsin);
+    tz = gxt - gyt;
+
+    if (tz < MINZ)
+        return;                 // thing is behind view plane
+    xscale = FixedDiv(projection, tz);
+
+    gxt = -FixedMul(trx, viewsin);
+    gyt = FixedMul(try, viewcos);
+    tx = -(gyt + gxt);
+
+    if (abs(tx) > (tz << 2))
+        return;                 // too far off the side
+
+//
+// decide which patch to use for sprite reletive to player
+//
+#ifdef RANGECHECK
+    if ((unsigned) thing->sprite >= numsprites)
+        I_Error("R_ProjectSprite: invalid sprite number %i ", thing->sprite);
+#endif
+    sprdef = &sprites[thing->sprite];
+#ifdef RANGECHECK
+    if ((thing->frame & FF_FRAMEMASK) >= sprdef->numframes)
+        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
+                thing->sprite, thing->frame);
+#endif
+    sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
+
+    if (sprframe->rotate)
+    {                           // choose a different rotation based on player view
+        ang = R_PointToAngle(thing->x, thing->y);
+        rot = (ang - thing->angle + (unsigned) (ANG45 / 2) * 9) >> 29;
+        lump = sprframe->lump[rot];
+        flip = (boolean) sprframe->flip[rot];
+    }
+    else
+    {                           // use single rotation for all views
+        lump = sprframe->lump[0];
+        flip = (boolean) sprframe->flip[0];
+    }
+
+//
+// calculate edges of the shape
+//
+    tx -= spriteoffset[lump];
+    x1 = (centerxfrac + FixedMul(tx, xscale)) >> FRACBITS;
+    if (x1 > viewwidth)
+        return;                 // off the right side
+    tx += spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul(tx, xscale)) >> FRACBITS) - 1;
+    if (x2 < 0)
+        return;                 // off the left side
+
+
+//
+// store information in a vissprite
+//
+    vis = R_NewVisSprite();
+    vis->mobjflags = thing->flags;
+    vis->psprite = false;
+    vis->scale = xscale << detailshift;
+    vis->gx = thing->x;
+    vis->gy = thing->y;
+    vis->gz = thing->z;
+    vis->gzt = thing->z + spritetopoffset[lump];
+
+    // foot clipping
+    if (thing->flags2 & MF2_FEETARECLIPPED
+        && thing->z <= thing->subsector->sector->floorheight)
+    {
+        vis->footclip = 10;
+    }
+    else
+        vis->footclip = 0;
+    vis->texturemid = vis->gzt - viewz - (vis->footclip << FRACBITS);
+
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
+    iscale = FixedDiv(FRACUNIT, xscale);
+    if (flip)
+    {
+        vis->startfrac = spritewidth[lump] - 1;
+        vis->xiscale = -iscale;
+    }
+    else
+    {
+        vis->startfrac = 0;
+        vis->xiscale = iscale;
+    }
+    if (vis->x1 > x1)
+        vis->startfrac += vis->xiscale * (vis->x1 - x1);
+    vis->patch = lump;
+//
+// get light level
+//
+
+//      if (thing->flags & MF_SHADOW)
+//              vis->colormap = NULL;                   // shadow draw
+//      else ...
+
+    if (fixedcolormap)
+        vis->colormap = fixedcolormap;  // fixed map
+    else if (thing->frame & FF_FULLBRIGHT)
+        vis->colormap = colormaps;      // full bright
+    else
+    {                           // diminished light
+        index = xscale >> (LIGHTSCALESHIFT - detailshift);
+        if (index >= MAXLIGHTSCALE)
+            index = MAXLIGHTSCALE - 1;
+        vis->colormap = spritelights[index];
+    }
+}
+
+
+
+
+/*
+========================
+=
+= R_AddSprites
+=
+========================
+*/
+
+void R_AddSprites(sector_t * sec)
+{
+    mobj_t *thing;
+    int lightnum;
+
+    if (sec->validcount == validcount)
+        return;                 // already added
+
+    sec->validcount = validcount;
+
+    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT) + extralight;
+    if (lightnum < 0)
+        spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+        spritelights = scalelight[LIGHTLEVELS - 1];
+    else
+        spritelights = scalelight[lightnum];
+
+
+    for (thing = sec->thinglist; thing; thing = thing->snext)
+        R_ProjectSprite(thing);
+}
+
+
+/*
+========================
+=
+= R_DrawPSprite
+=
+========================
+*/
+
+int PSpriteSY[NUMWEAPONS] = {
+    0,                          // staff
+    5 * FRACUNIT,               // goldwand
+    15 * FRACUNIT,              // crossbow
+    15 * FRACUNIT,              // blaster
+    15 * FRACUNIT,              // skullrod
+    15 * FRACUNIT,              // phoenix rod
+    15 * FRACUNIT,              // mace
+    15 * FRACUNIT,              // gauntlets
+    15 * FRACUNIT               // beak
+};
+
+void R_DrawPSprite(pspdef_t * psp)
+{
+    fixed_t tx;
+    int x1, x2;
+    spritedef_t *sprdef;
+    spriteframe_t *sprframe;
+    int lump;
+    boolean flip;
+    vissprite_t *vis, avis;
+
+    int tempangle;
+
+//
+// decide which patch to use
+//
+#ifdef RANGECHECK
+    if ((unsigned) psp->state->sprite >= numsprites)
+        I_Error("R_ProjectSprite: invalid sprite number %i ",
+                psp->state->sprite);
+#endif
+    sprdef = &sprites[psp->state->sprite];
+#ifdef RANGECHECK
+    if ((psp->state->frame & FF_FRAMEMASK) >= sprdef->numframes)
+        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
+                psp->state->sprite, psp->state->frame);
+#endif
+    sprframe = &sprdef->spriteframes[psp->state->frame & FF_FRAMEMASK];
+
+    lump = sprframe->lump[0];
+    flip = (boolean) sprframe->flip[0];
+
+//
+// calculate edges of the shape
+//
+    tx = psp->sx - 160 * FRACUNIT;
+
+    tx -= spriteoffset[lump];
+    if (viewangleoffset)
+    {
+        tempangle =
+            ((centerxfrac / 1024) * (viewangleoffset >> ANGLETOFINESHIFT));
+    }
+    else
+    {
+        tempangle = 0;
+    }
+    x1 = (centerxfrac + FixedMul(tx, pspritescale) + tempangle) >> FRACBITS;
+    if (x1 > viewwidth)
+        return;                 // off the right side
+    tx += spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul(tx, pspritescale) +
+           tempangle) >> FRACBITS) - 1;
+    if (x2 < 0)
+        return;                 // off the left side
+
+//
+// store information in a vissprite
+//
+    vis = &avis;
+    vis->mobjflags = 0;
+    vis->psprite = true;
+    vis->footclip = 0;
+    vis->texturemid =
+        (BASEYCENTER << FRACBITS) + FRACUNIT / 2 - (psp->sy -
+                                                    spritetopoffset[lump]);
+    if (viewheight == SCREENHEIGHT)
+    {
+        vis->texturemid -= PSpriteSY[players[consoleplayer].readyweapon];
+    }
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
+    vis->scale = pspritescale << detailshift;
+    if (flip)
+    {
+        vis->xiscale = -pspriteiscale;
+        vis->startfrac = spritewidth[lump] - 1;
+    }
+    else
+    {
+        vis->xiscale = pspriteiscale;
+        vis->startfrac = 0;
+    }
+    if (vis->x1 > x1)
+        vis->startfrac += vis->xiscale * (vis->x1 - x1);
+    vis->patch = lump;
+
+    if (viewplayer->powers[pw_invisibility] > 4 * 32 ||
+        viewplayer->powers[pw_invisibility] & 8)
+    {
+        // Invisibility
+        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
+        vis->mobjflags |= MF_SHADOW;
+    }
+    else if (fixedcolormap)
+    {
+        // Fixed color
+        vis->colormap = fixedcolormap;
+    }
+    else if (psp->state->frame & FF_FULLBRIGHT)
+    {
+        // Full bright
+        vis->colormap = colormaps;
+    }
+    else
+    {
+        // local light
+        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
+    }
+    R_DrawVisSprite(vis, vis->x1, vis->x2);
+}
+
+/*
+========================
+=
+= R_DrawPlayerSprites
+=
+========================
+*/
+
+void R_DrawPlayerSprites(void)
+{
+    int i, lightnum;
+    pspdef_t *psp;
+
+//
+// get light level
+//
+    lightnum =
+        (viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) +
+        extralight;
+    if (lightnum < 0)
+        spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+        spritelights = scalelight[LIGHTLEVELS - 1];
+    else
+        spritelights = scalelight[lightnum];
+//
+// clip to screen bounds
+//
+    mfloorclip = screenheightarray;
+    mceilingclip = negonearray;
+
+//
+// add all active psprites
+//
+    for (i = 0, psp = viewplayer->psprites; i < NUMPSPRITES; i++, psp++)
+        if (psp->state)
+            R_DrawPSprite(psp);
+
+}
+
+
+/*
+========================
+=
+= R_SortVisSprites
+=
+========================
+*/
+
+vissprite_t vsprsortedhead;
+
+void R_SortVisSprites(void)
+{
+    int i, count;
+    vissprite_t *ds, *best;
+    static vissprite_t unsorted;
+    fixed_t bestscale;
+
+    count = vissprite_p - vissprites;
+
+    unsorted.next = unsorted.prev = &unsorted;
+    if (!count)
+        return;
+
+    for (ds = vissprites; ds < vissprite_p; ds++)
+    {
+        ds->next = ds + 1;
+        ds->prev = ds - 1;
+    }
+    vissprites[0].prev = &unsorted;
+    unsorted.next = &vissprites[0];
+    (vissprite_p - 1)->next = &unsorted;
+    unsorted.prev = vissprite_p - 1;
+
+//
+// pull the vissprites out by scale
+//
+    best = 0;                   // shut up the compiler warning
+    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
+    for (i = 0; i < count; i++)
+    {
+        bestscale = INT_MAX;
+        for (ds = unsorted.next; ds != &unsorted; ds = ds->next)
+        {
+            if (ds->scale < bestscale)
+            {
+                bestscale = ds->scale;
+                best = ds;
+            }
+        }
+        best->next->prev = best->prev;
+        best->prev->next = best->next;
+        best->next = &vsprsortedhead;
+        best->prev = vsprsortedhead.prev;
+        vsprsortedhead.prev->next = best;
+        vsprsortedhead.prev = best;
+    }
+}
+
+
+
+/*
+========================
+=
+= R_DrawSprite
+=
+========================
+*/
+
+void R_DrawSprite(vissprite_t * spr)
+{
+    drawseg_t *ds;
+    short clipbot[SCREENWIDTH], cliptop[SCREENWIDTH];
+    int x, r1, r2;
+    fixed_t scale, lowscale;
+    int silhouette;
+
+    for (x = spr->x1; x <= spr->x2; x++)
+        clipbot[x] = cliptop[x] = -2;
+
+//
+// scan drawsegs from end to start for obscuring segs
+// the first drawseg that has a greater scale is the clip seg
+//
+    for (ds = ds_p - 1; ds >= drawsegs; ds--)
+    {
+        //
+        // determine if the drawseg obscures the sprite
+        //
+        if (ds->x1 > spr->x2 || ds->x2 < spr->x1 ||
+            (!ds->silhouette && !ds->maskedtexturecol))
+            continue;           // doesn't cover sprite
+
+        r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
+        r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
+        if (ds->scale1 > ds->scale2)
+        {
+            lowscale = ds->scale2;
+            scale = ds->scale1;
+        }
+        else
+        {
+            lowscale = ds->scale1;
+            scale = ds->scale2;
+        }
+
+        if (scale < spr->scale || (lowscale < spr->scale
+                                   && !R_PointOnSegSide(spr->gx, spr->gy,
+                                                        ds->curline)))
+        {
+            if (ds->maskedtexturecol)   // masked mid texture
+                R_RenderMaskedSegRange(ds, r1, r2);
+            continue;           // seg is behind sprite
+        }
+
+//
+// clip this piece of the sprite
+//
+        silhouette = ds->silhouette;
+        if (spr->gz >= ds->bsilheight)
+            silhouette &= ~SIL_BOTTOM;
+        if (spr->gzt <= ds->tsilheight)
+            silhouette &= ~SIL_TOP;
+
+        if (silhouette == 1)
+        {                       // bottom sil
+            for (x = r1; x <= r2; x++)
+                if (clipbot[x] == -2)
+                    clipbot[x] = ds->sprbottomclip[x];
+        }
+        else if (silhouette == 2)
+        {                       // top sil
+            for (x = r1; x <= r2; x++)
+                if (cliptop[x] == -2)
+                    cliptop[x] = ds->sprtopclip[x];
+        }
+        else if (silhouette == 3)
+        {                       // both
+            for (x = r1; x <= r2; x++)
+            {
+                if (clipbot[x] == -2)
+                    clipbot[x] = ds->sprbottomclip[x];
+                if (cliptop[x] == -2)
+                    cliptop[x] = ds->sprtopclip[x];
+            }
+        }
+
+    }
+
+//
+// all clipping has been performed, so draw the sprite
+//
+
+// check for unclipped columns
+    for (x = spr->x1; x <= spr->x2; x++)
+    {
+        if (clipbot[x] == -2)
+            clipbot[x] = viewheight;
+        if (cliptop[x] == -2)
+            cliptop[x] = -1;
+    }
+
+    mfloorclip = clipbot;
+    mceilingclip = cliptop;
+    R_DrawVisSprite(spr, spr->x1, spr->x2);
+}
+
+
+/*
+========================
+=
+= R_DrawMasked
+=
+========================
+*/
+
+void R_DrawMasked(void)
+{
+    vissprite_t *spr;
+    drawseg_t *ds;
+
+    R_SortVisSprites();
+
+    if (vissprite_p > vissprites)
+    {
+        // draw all vissprites back to front
+
+        for (spr = vsprsortedhead.next; spr != &vsprsortedhead;
+             spr = spr->next)
+            R_DrawSprite(spr);
+    }
+
+//
+// render any remaining masked mid textures
+//
+    for (ds = ds_p - 1; ds >= drawsegs; ds--)
+        if (ds->maskedtexturecol)
+            R_RenderMaskedSegRange(ds, ds->x1, ds->x2);
+
+//
+// draw the psprites on top of everything
+//
+// Added for the sideviewing with an external device
+    if (viewangleoffset <= 1024 << ANGLETOFINESHIFT || viewangleoffset >=
+        -(1024 << ANGLETOFINESHIFT))
+    {                           // don't draw on side views
+        R_DrawPlayerSprites();
+    }
+
+//      if (!viewangleoffset)           // don't draw on side views
+//              R_DrawPlayerSprites ();
+}
diff --git a/games/NXDoom/src/heretic/s_sound.c b/games/NXDoom/src/heretic/s_sound.c
new file mode 100644
index 000000000..829278918
--- /dev/null
+++ b/games/NXDoom/src/heretic/s_sound.c
@@ -0,0 +1,607 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "i_system.h"
+#include "m_random.h"
+#include "sounds.h"
+#include "s_sound.h"
+#include "i_sound.h"
+#include "r_local.h"
+#include "p_local.h"
+
+#include "sounds.h"
+
+#include "w_wad.h"
+#include "z_zone.h"
+
+/*
+===============================================================================
+
+		MUSIC & SFX API
+
+===============================================================================
+*/
+
+void S_ShutDown(void);
+boolean S_StopSoundID(int sound_id, int priority);
+
+static channel_t channel[MAX_CHANNELS];
+
+static void *rs;          // Handle for the registered song
+int mus_song = -1;
+int mus_lumpnum;
+void *mus_sndptr;
+byte *soundCurve;
+
+int snd_MaxVolume = 10;
+int snd_MusicVolume = 10;
+int snd_Channels = 16;
+
+int AmbChan;
+
+void S_Start(void)
+{
+    int i;
+
+    S_StartSong((gameepisode - 1) * 9 + gamemap - 1, true);
+
+    //stop all sounds
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (channel[i].handle)
+        {
+            S_StopSound(channel[i].mo);
+        }
+    }
+    memset(channel, 0, 8 * sizeof(channel_t));
+}
+
+void S_StartSong(int song, boolean loop)
+{
+    int mus_len;
+
+    if (song == mus_song)
+    {                           // don't replay an old song
+        return;
+    }
+
+    if (rs != NULL)
+    {
+        I_StopSong();
+        I_UnRegisterSong(rs);
+    }
+
+    if (song < mus_e1m1 || song > NUMMUSIC)
+    {
+        return;
+    }
+    mus_lumpnum = W_GetNumForName(S_music[song].name);
+    mus_sndptr = W_CacheLumpNum(mus_lumpnum, PU_MUSIC);
+    mus_len = W_LumpLength(mus_lumpnum);
+    rs = I_RegisterSong(mus_sndptr, mus_len);
+    I_PlaySong(rs, loop);       //'true' denotes endless looping.
+    mus_song = song;
+}
+
+static mobj_t *GetSoundListener(void)
+{
+    static degenmobj_t dummy_listener;
+
+    // If we are at the title screen, the console player doesn't have an
+    // object yet, so return a pointer to a static dummy listener instead.
+
+    if (players[consoleplayer].mo != NULL)
+    {
+        return players[consoleplayer].mo;
+    }
+    else
+    {
+        dummy_listener.x = 0;
+        dummy_listener.y = 0;
+        dummy_listener.z = 0;
+
+        return (mobj_t *) &dummy_listener;
+    }
+}
+
+void S_StartSound(void *_origin, int sound_id)
+{
+    mobj_t *origin = _origin;
+    mobj_t *listener;
+    int dist, vol;
+    int i;
+    int priority;
+    int sep;
+    int angle;
+    int absx;
+    int absy;
+
+    static int sndcount = 0;
+    int chan;
+
+    listener = GetSoundListener();
+
+    if (sound_id == 0 || snd_MaxVolume == 0)
+        return;
+    if (origin == NULL)
+    {
+        origin = listener;
+    }
+
+// calculate the distance before other stuff so that we can throw out
+// sounds that are beyond the hearing range.
+    absx = abs(origin->x - listener->x);
+    absy = abs(origin->y - listener->y);
+    dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
+    dist >>= FRACBITS;
+//  dist = P_AproxDistance(origin->x-viewx, origin->y-viewy)>>FRACBITS;
+
+    if (dist >= MAX_SND_DIST)
+    {
+//      dist = MAX_SND_DIST - 1;
+        return;                 //sound is beyond the hearing range...
+    }
+    if (dist < 0)
+    {
+        dist = 0;
+    }
+    priority = S_sfx[sound_id].priority;
+    priority *= (10 - (dist / 160));
+    if (!S_StopSoundID(sound_id, priority))
+    {
+        return;                 // other sounds have greater priority
+    }
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (origin->player)
+        {
+            i = snd_Channels;
+            break;              // let the player have more than one sound.
+        }
+        if (origin == channel[i].mo)
+        {                       // only allow other mobjs one sound
+            S_StopSound(channel[i].mo);
+            break;
+        }
+    }
+    if (i >= snd_Channels)
+    {
+        if (sound_id >= sfx_wind)
+        {
+            if (AmbChan != -1 && S_sfx[sound_id].priority <=
+                S_sfx[channel[AmbChan].sound_id].priority)
+            {
+                return;         //ambient channel already in use
+            }
+            else
+            {
+                AmbChan = -1;
+            }
+        }
+        for (i = 0; i < snd_Channels; i++)
+        {
+            if (channel[i].mo == NULL)
+            {
+                break;
+            }
+        }
+        if (i >= snd_Channels)
+        {
+            //look for a lower priority sound to replace.
+            sndcount++;
+            if (sndcount >= snd_Channels)
+            {
+                sndcount = 0;
+            }
+            for (chan = 0; chan < snd_Channels; chan++)
+            {
+                i = (sndcount + chan) % snd_Channels;
+                if (priority >= channel[i].priority)
+                {
+                    chan = -1;  //denote that sound should be replaced.
+                    break;
+                }
+            }
+            if (chan != -1)
+            {
+                return;         //no free channels.
+            }
+            else                //replace the lower priority sound.
+            {
+                if (channel[i].handle)
+                {
+                    if (I_SoundIsPlaying(channel[i].handle))
+                    {
+                        I_StopSound(channel[i].handle);
+                    }
+                    if (S_sfx[channel[i].sound_id].usefulness > 0)
+                    {
+                        S_sfx[channel[i].sound_id].usefulness--;
+                    }
+
+                    if (AmbChan == i)
+                    {
+                        AmbChan = -1;
+                    }
+                }
+            }
+        }
+    }
+    if (S_sfx[sound_id].lumpnum == 0)
+    {
+        S_sfx[sound_id].lumpnum = I_GetSfxLumpNum(&S_sfx[sound_id]);
+    }
+
+    // calculate the volume based upon the distance from the sound origin.
+//      vol = (snd_MaxVolume*16 + dist*(-snd_MaxVolume*16)/MAX_SND_DIST)>>9;
+    vol = soundCurve[dist];
+
+    if (origin == listener)
+    {
+        sep = 128;
+    }
+    else
+    {
+        angle = R_PointToAngle2(listener->x, listener->y,
+                                origin->x, origin->y);
+        angle = (angle - viewangle) >> 24;
+        sep = angle * 2 - 128;
+        if (sep < 64)
+            sep = -sep;
+        if (sep > 192)
+            sep = 512 - sep;
+    }
+
+    channel[i].pitch = (byte) (NORM_PITCH + (M_Random() & 7) - (M_Random() & 7));
+    channel[i].handle = I_StartSound(&S_sfx[sound_id], i, vol, sep, channel[i].pitch);
+    channel[i].mo = origin;
+    channel[i].sound_id = sound_id;
+    channel[i].priority = priority;
+    if (sound_id >= sfx_wind)
+    {
+        AmbChan = i;
+    }
+    if (S_sfx[sound_id].usefulness == -1)
+    {
+        S_sfx[sound_id].usefulness = 1;
+    }
+    else
+    {
+        S_sfx[sound_id].usefulness++;
+    }
+}
+
+void S_StartSoundAtVolume(void *_origin, int sound_id, int volume)
+{
+    mobj_t *origin = _origin;
+    mobj_t *listener;
+    int i;
+
+    listener = GetSoundListener();
+
+    if (sound_id == 0 || snd_MaxVolume == 0)
+        return;
+    if (origin == NULL)
+    {
+        origin = listener;
+    }
+
+    if (volume == 0)
+    {
+        return;
+    }
+    volume = (volume * (snd_MaxVolume + 1) * 8) >> 7;
+
+// no priority checking, as ambient sounds would be the LOWEST.
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (channel[i].mo == NULL)
+        {
+            break;
+        }
+    }
+    if (i >= snd_Channels)
+    {
+        return;
+    }
+    if (S_sfx[sound_id].lumpnum == 0)
+    {
+        S_sfx[sound_id].lumpnum = I_GetSfxLumpNum(&S_sfx[sound_id]);
+    }
+
+    channel[i].pitch = (byte) (NORM_PITCH - (M_Random() & 3) + (M_Random() & 3));
+    channel[i].handle = I_StartSound(&S_sfx[sound_id], i, volume, 128, channel[i].pitch);
+    channel[i].mo = origin;
+    channel[i].sound_id = sound_id;
+    channel[i].priority = 1;    //super low priority.
+    if (S_sfx[sound_id].usefulness == -1)
+    {
+        S_sfx[sound_id].usefulness = 1;
+    }
+    else
+    {
+        S_sfx[sound_id].usefulness++;
+    }
+}
+
+boolean S_StopSoundID(int sound_id, int priority)
+{
+    int i;
+    int lp;                     //least priority
+    int found;
+
+    if (S_sfx[sound_id].numchannels == -1)
+    {
+        return (true);
+    }
+    lp = -1;                    //denote the argument sound_id
+    found = 0;
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (channel[i].sound_id == sound_id && channel[i].mo)
+        {
+            found++;            //found one.  Now, should we replace it??
+            if (priority >= channel[i].priority)
+            {                   // if we're gonna kill one, then this'll be it
+                lp = i;
+                priority = channel[i].priority;
+            }
+        }
+    }
+    if (found < S_sfx[sound_id].numchannels)
+    {
+        return (true);
+    }
+    else if (lp == -1)
+    {
+        return (false);         // don't replace any sounds
+    }
+    if (channel[lp].handle)
+    {
+        if (I_SoundIsPlaying(channel[lp].handle))
+        {
+            I_StopSound(channel[lp].handle);
+        }
+        if (S_sfx[channel[i].sound_id].usefulness > 0)
+        {
+            S_sfx[channel[i].sound_id].usefulness--;
+        }
+        channel[lp].mo = NULL;
+    }
+    return (true);
+}
+
+void S_StopSound(void *_origin)
+{
+    mobj_t *origin = _origin;
+    int i;
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (channel[i].mo == origin)
+        {
+            I_StopSound(channel[i].handle);
+            if (S_sfx[channel[i].sound_id].usefulness > 0)
+            {
+                S_sfx[channel[i].sound_id].usefulness--;
+            }
+            channel[i].handle = 0;
+            channel[i].mo = NULL;
+            if (AmbChan == i)
+            {
+                AmbChan = -1;
+            }
+        }
+    }
+}
+
+void S_SoundLink(mobj_t * oldactor, mobj_t * newactor)
+{
+    int i;
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (channel[i].mo == oldactor)
+            channel[i].mo = newactor;
+    }
+}
+
+void S_PauseSound(void)
+{
+    I_PauseSong();
+}
+
+void S_ResumeSound(void)
+{
+    I_ResumeSong();
+}
+
+void S_UpdateSounds(mobj_t * listener)
+{
+    int i, dist, vol;
+    int angle;
+    int sep;
+    int priority;
+    int absx;
+    int absy;
+
+    I_UpdateSound();
+
+    listener = GetSoundListener();
+    if (snd_MaxVolume == 0)
+    {
+        return;
+    }
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (!channel[i].handle || S_sfx[channel[i].sound_id].usefulness == -1)
+        {
+            continue;
+        }
+        if (!I_SoundIsPlaying(channel[i].handle))
+        {
+            if (S_sfx[channel[i].sound_id].usefulness > 0)
+            {
+                S_sfx[channel[i].sound_id].usefulness--;
+            }
+            channel[i].handle = 0;
+            channel[i].mo = NULL;
+            channel[i].sound_id = 0;
+            if (AmbChan == i)
+            {
+                AmbChan = -1;
+            }
+        }
+        if (channel[i].mo == NULL || channel[i].sound_id == 0
+         || channel[i].mo == listener || listener == NULL)
+        {
+            continue;
+        }
+        else
+        {
+            absx = abs(channel[i].mo->x - listener->x);
+            absy = abs(channel[i].mo->y - listener->y);
+            dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
+            dist >>= FRACBITS;
+//          dist = P_AproxDistance(channel[i].mo->x-listener->x, channel[i].mo->y-listener->y)>>FRACBITS;
+
+            if (dist >= MAX_SND_DIST)
+            {
+                S_StopSound(channel[i].mo);
+                continue;
+            }
+            if (dist < 0)
+                dist = 0;
+
+// calculate the volume based upon the distance from the sound origin.
+//          vol = (*((byte *)W_CacheLumpName("SNDCURVE", PU_CACHE)+dist)*(snd_MaxVolume*8))>>7;
+            vol = soundCurve[dist];
+
+            angle = R_PointToAngle2(listener->x, listener->y,
+                                    channel[i].mo->x, channel[i].mo->y);
+            angle = (angle - viewangle) >> 24;
+            sep = angle * 2 - 128;
+            if (sep < 64)
+                sep = -sep;
+            if (sep > 192)
+                sep = 512 - sep;
+            // TODO: Pitch shifting.
+            I_UpdateSoundParams(channel[i].handle, vol, sep);
+            priority = S_sfx[channel[i].sound_id].priority;
+            priority *= (10 - (dist >> 8));
+            channel[i].priority = priority;
+        }
+    }
+}
+
+void S_Init(void)
+{
+    I_SetOPLDriverVer(opl_doom2_1_666);
+    soundCurve = Z_Malloc(MAX_SND_DIST, PU_STATIC, NULL);
+    if (snd_Channels > 8)
+    {
+        snd_Channels = 8;
+    }
+    I_SetMusicVolume(snd_MusicVolume * 8);
+    S_SetMaxVolume(true);
+
+    I_AtExit(S_ShutDown, true);
+
+    // Heretic defaults to pitch-shifting on
+    if (snd_pitchshift == -1)
+    {
+        snd_pitchshift = 1;
+    }
+
+    I_PrecacheSounds(S_sfx, NUMSFX);
+}
+
+void S_GetChannelInfo(SoundInfo_t * s)
+{
+    int i;
+    ChanInfo_t *c;
+
+    s->channelCount = snd_Channels;
+    s->musicVolume = snd_MusicVolume;
+    s->soundVolume = snd_MaxVolume;
+    for (i = 0; i < snd_Channels; i++)
+    {
+        c = &s->chan[i];
+        c->id = channel[i].sound_id;
+        c->priority = channel[i].priority;
+        c->name = S_sfx[c->id].name;
+        c->mo = channel[i].mo;
+
+        if (c->mo != NULL)
+        {
+            c->distance = P_AproxDistance(c->mo->x - viewx, c->mo->y - viewy)
+                >> FRACBITS;
+        }
+        else
+        {
+            c->distance = 0;
+        }
+    }
+}
+
+void S_SetMaxVolume(boolean fullprocess)
+{
+    int i;
+
+    if (!fullprocess)
+    {
+        soundCurve[0] =
+            (*((byte *) W_CacheLumpName("SNDCURVE", PU_CACHE)) *
+             (snd_MaxVolume * 8)) >> 7;
+    }
+    else
+    {
+        for (i = 0; i < MAX_SND_DIST; i++)
+        {
+            soundCurve[i] =
+                (*((byte *) W_CacheLumpName("SNDCURVE", PU_CACHE) + i) *
+                 (snd_MaxVolume * 8)) >> 7;
+        }
+    }
+}
+
+static boolean musicPaused;
+void S_SetMusicVolume(void)
+{
+    I_SetMusicVolume(snd_MusicVolume * 8);
+    if (snd_MusicVolume == 0)
+    {
+        I_PauseSong();
+        musicPaused = true;
+    }
+    else if (musicPaused)
+    {
+        musicPaused = false;
+        I_ResumeSong();
+    }
+}
+
+void S_ShutDown(void)
+{
+    I_StopSong();
+    I_UnRegisterSong(rs);
+    I_ShutdownSound();
+}
+
diff --git a/games/NXDoom/src/heretic/s_sound.h b/games/NXDoom/src/heretic/s_sound.h
new file mode 100644
index 000000000..796be73ee
--- /dev/null
+++ b/games/NXDoom/src/heretic/s_sound.h
@@ -0,0 +1,40 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// soundst.h
+
+#ifndef __SOUNDSTH__
+#define __SOUNDSTH__
+
+extern int snd_MaxVolume;
+extern int snd_MusicVolume;
+extern int snd_Channels;
+
+
+void S_Start(void);
+void S_StartSound(void *origin, int sound_id);
+void S_StartSoundAtVolume(void *origin, int sound_id, int volume);
+void S_StopSound(void *origin);
+void S_PauseSound(void);
+void S_ResumeSound(void);
+void S_UpdateSounds(mobj_t * listener);
+void S_StartSong(int song, boolean loop);
+void S_Init(void);
+void S_GetChannelInfo(SoundInfo_t * s);
+void S_SetMaxVolume(boolean fullprocess);
+void S_SetMusicVolume(void);
+
+#endif
diff --git a/games/NXDoom/src/heretic/sb_bar.c b/games/NXDoom/src/heretic/sb_bar.c
new file mode 100644
index 000000000..bcc5d765a
--- /dev/null
+++ b/games/NXDoom/src/heretic/sb_bar.c
@@ -0,0 +1,1283 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// SB_bar.c
+
+#include "doomdef.h"
+#include "deh_str.h"
+#include "i_video.h"
+#include "i_swap.h"
+#include "m_cheat.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+#include "am_map.h"
+
+// Types
+
+typedef struct Cheat_s
+{
+    void (*func) (player_t * player, struct Cheat_s * cheat);
+    cheatseq_t *seq;
+} Cheat_t;
+
+// Private Functions
+
+static void DrawSoundInfo(void);
+static void ShadeLine(int x, int y, int height, int shade);
+static void ShadeChain(void);
+static void DrINumber(signed int val, int x, int y);
+static void DrBNumber(signed int val, int x, int y);
+static void DrawCommonBar(void);
+static void DrawMainBar(void);
+static void DrawInventoryBar(void);
+static void DrawFullScreenStuff(void);
+static boolean HandleCheats(byte key);
+static void CheatGodFunc(player_t * player, Cheat_t * cheat);
+static void CheatNoClipFunc(player_t * player, Cheat_t * cheat);
+static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat);
+static void CheatPowerFunc(player_t * player, Cheat_t * cheat);
+static void CheatHealthFunc(player_t * player, Cheat_t * cheat);
+static void CheatKeysFunc(player_t * player, Cheat_t * cheat);
+static void CheatSoundFunc(player_t * player, Cheat_t * cheat);
+static void CheatTickerFunc(player_t * player, Cheat_t * cheat);
+static void CheatArtifact1Func(player_t * player, Cheat_t * cheat);
+static void CheatArtifact2Func(player_t * player, Cheat_t * cheat);
+static void CheatArtifact3Func(player_t * player, Cheat_t * cheat);
+static void CheatWarpFunc(player_t * player, Cheat_t * cheat);
+static void CheatChickenFunc(player_t * player, Cheat_t * cheat);
+static void CheatMassacreFunc(player_t * player, Cheat_t * cheat);
+static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat);
+static void CheatIDDQDFunc(player_t * player, Cheat_t * cheat);
+
+// Public Data
+
+boolean DebugSound;             // debug flag for displaying sound info
+
+boolean inventory;
+int curpos;
+int inv_ptr;
+int ArtifactFlash;
+
+static int DisplayTicker = 0;
+
+// Private Data
+
+static int HealthMarker;
+static int ChainWiggle;
+static player_t *CPlayer;
+int playpalette;
+
+patch_t *PatchLTFACE;
+patch_t *PatchRTFACE;
+patch_t *PatchBARBACK;
+patch_t *PatchCHAIN;
+patch_t *PatchSTATBAR;
+patch_t *PatchLIFEGEM;
+//patch_t *PatchEMPWEAP;
+//patch_t *PatchLIL4BOX;
+patch_t *PatchLTFCTOP;
+patch_t *PatchRTFCTOP;
+//patch_t *PatchARMORBOX;
+//patch_t *PatchARTIBOX;
+patch_t *PatchSELECTBOX;
+//patch_t *PatchKILLSPIC;
+//patch_t *PatchMANAPIC;
+//patch_t *PatchPOWERICN;
+patch_t *PatchINVLFGEM1;
+patch_t *PatchINVLFGEM2;
+patch_t *PatchINVRTGEM1;
+patch_t *PatchINVRTGEM2;
+patch_t *PatchINumbers[10];
+patch_t *PatchNEGATIVE;
+patch_t *PatchSmNumbers[10];
+patch_t *PatchBLACKSQ;
+patch_t *PatchINVBAR;
+patch_t *PatchARMCLEAR;
+patch_t *PatchCHAINBACK;
+//byte *ShadeTables;
+int FontBNumBase;
+int spinbooklump;
+int spinflylump;
+
+// Toggle god mode
+cheatseq_t CheatGodSeq = CHEAT("quicken", 0);
+
+// Toggle no clipping mode
+cheatseq_t CheatNoClipSeq = CHEAT("kitty", 0);
+
+// Get all weapons and ammo
+cheatseq_t CheatWeaponsSeq = CHEAT("rambo", 0);
+
+// Toggle tome of power
+cheatseq_t CheatPowerSeq = CHEAT("shazam", 0);
+
+// Get full health
+cheatseq_t CheatHealthSeq = CHEAT("ponce", 0);
+
+// Get all keys
+cheatseq_t CheatKeysSeq = CHEAT("skel", 0);
+
+// Toggle sound debug info
+cheatseq_t CheatSoundSeq = CHEAT("noise", 0);
+
+// Toggle ticker
+cheatseq_t CheatTickerSeq = CHEAT("ticker", 0);
+
+// Get an artifact 1st stage (ask for type)
+cheatseq_t CheatArtifact1Seq = CHEAT("gimme", 0);
+
+// Get an artifact 2nd stage (ask for count)
+cheatseq_t CheatArtifact2Seq = CHEAT("gimme", 1);
+
+// Get an artifact final stage
+cheatseq_t CheatArtifact3Seq = CHEAT("gimme", 2);
+
+// Warp to new level
+cheatseq_t CheatWarpSeq = CHEAT("engage", 2);
+
+// Save a screenshot
+cheatseq_t CheatChickenSeq = CHEAT("cockadoodledoo", 0);
+
+// Kill all monsters
+cheatseq_t CheatMassacreSeq = CHEAT("massacre", 0);
+
+cheatseq_t CheatIDKFASeq = CHEAT("idkfa", 0);
+cheatseq_t CheatIDDQDSeq = CHEAT("iddqd", 0);
+
+static Cheat_t Cheats[] = {
+    {CheatGodFunc,       &CheatGodSeq},
+    {CheatNoClipFunc,    &CheatNoClipSeq},
+    {CheatWeaponsFunc,   &CheatWeaponsSeq},
+    {CheatPowerFunc,     &CheatPowerSeq},
+    {CheatHealthFunc,    &CheatHealthSeq},
+    {CheatKeysFunc,      &CheatKeysSeq},
+    {CheatSoundFunc,     &CheatSoundSeq},
+    {CheatTickerFunc,    &CheatTickerSeq},
+    {CheatArtifact1Func, &CheatArtifact1Seq},
+    {CheatArtifact2Func, &CheatArtifact2Seq},
+    {CheatArtifact3Func, &CheatArtifact3Seq},
+    {CheatWarpFunc,      &CheatWarpSeq},
+    {CheatChickenFunc,   &CheatChickenSeq},
+    {CheatMassacreFunc,  &CheatMassacreSeq},
+    {CheatIDKFAFunc,     &CheatIDKFASeq},
+    {CheatIDDQDFunc,     &CheatIDDQDSeq},
+    {NULL,               NULL} 
+};
+
+//---------------------------------------------------------------------------
+//
+// PROC SB_Init
+//
+//---------------------------------------------------------------------------
+
+void SB_Init(void)
+{
+    int i;
+    int startLump;
+
+    PatchLTFACE = W_CacheLumpName(DEH_String("LTFACE"), PU_STATIC);
+    PatchRTFACE = W_CacheLumpName(DEH_String("RTFACE"), PU_STATIC);
+    PatchBARBACK = W_CacheLumpName(DEH_String("BARBACK"), PU_STATIC);
+    PatchINVBAR = W_CacheLumpName(DEH_String("INVBAR"), PU_STATIC);
+    PatchCHAIN = W_CacheLumpName(DEH_String("CHAIN"), PU_STATIC);
+    if (deathmatch)
+    {
+        PatchSTATBAR = W_CacheLumpName(DEH_String("STATBAR"), PU_STATIC);
+    }
+    else
+    {
+        PatchSTATBAR = W_CacheLumpName(DEH_String("LIFEBAR"), PU_STATIC);
+    }
+    if (!netgame)
+    {                           // single player game uses red life gem
+        PatchLIFEGEM = W_CacheLumpName(DEH_String("LIFEGEM2"), PU_STATIC);
+    }
+    else
+    {
+        PatchLIFEGEM = W_CacheLumpNum(W_GetNumForName(DEH_String("LIFEGEM0"))
+                                      + consoleplayer, PU_STATIC);
+    }
+    PatchLTFCTOP = W_CacheLumpName(DEH_String("LTFCTOP"), PU_STATIC);
+    PatchRTFCTOP = W_CacheLumpName(DEH_String("RTFCTOP"), PU_STATIC);
+    PatchSELECTBOX = W_CacheLumpName(DEH_String("SELECTBOX"), PU_STATIC);
+    PatchINVLFGEM1 = W_CacheLumpName(DEH_String("INVGEML1"), PU_STATIC);
+    PatchINVLFGEM2 = W_CacheLumpName(DEH_String("INVGEML2"), PU_STATIC);
+    PatchINVRTGEM1 = W_CacheLumpName(DEH_String("INVGEMR1"), PU_STATIC);
+    PatchINVRTGEM2 = W_CacheLumpName(DEH_String("INVGEMR2"), PU_STATIC);
+    PatchBLACKSQ = W_CacheLumpName(DEH_String("BLACKSQ"), PU_STATIC);
+    PatchARMCLEAR = W_CacheLumpName(DEH_String("ARMCLEAR"), PU_STATIC);
+    PatchCHAINBACK = W_CacheLumpName(DEH_String("CHAINBACK"), PU_STATIC);
+    startLump = W_GetNumForName(DEH_String("IN0"));
+    for (i = 0; i < 10; i++)
+    {
+        PatchINumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
+    }
+    PatchNEGATIVE = W_CacheLumpName(DEH_String("NEGNUM"), PU_STATIC);
+    FontBNumBase = W_GetNumForName(DEH_String("FONTB16"));
+    startLump = W_GetNumForName(DEH_String("SMALLIN0"));
+    for (i = 0; i < 10; i++)
+    {
+        PatchSmNumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
+    }
+    playpalette = W_GetNumForName(DEH_String("PLAYPAL"));
+    spinbooklump = W_GetNumForName(DEH_String("SPINBK0"));
+    spinflylump = W_GetNumForName(DEH_String("SPFLY0"));
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SB_Ticker
+//
+//---------------------------------------------------------------------------
+
+void SB_Ticker(void)
+{
+    int delta;
+    int curHealth;
+
+    if (leveltime & 1)
+    {
+        ChainWiggle = P_Random() & 1;
+    }
+    curHealth = players[consoleplayer].mo->health;
+    if (curHealth < 0)
+    {
+        curHealth = 0;
+    }
+    if (curHealth < HealthMarker)
+    {
+        delta = (HealthMarker - curHealth) >> 2;
+        if (delta < 1)
+        {
+            delta = 1;
+        }
+        else if (delta > 8)
+        {
+            delta = 8;
+        }
+        HealthMarker -= delta;
+    }
+    else if (curHealth > HealthMarker)
+    {
+        delta = (curHealth - HealthMarker) >> 2;
+        if (delta < 1)
+        {
+            delta = 1;
+        }
+        else if (delta > 8)
+        {
+            delta = 8;
+        }
+        HealthMarker += delta;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrINumber
+//
+// Draws a three digit number.
+//
+//---------------------------------------------------------------------------
+
+static void DrINumber(signed int val, int x, int y)
+{
+    patch_t *patch;
+    int oldval;
+
+    oldval = val;
+    if (val < 0)
+    {
+        if (val < -9)
+        {
+            V_DrawPatch(x + 1, y + 1, W_CacheLumpName(DEH_String("LAME"), PU_CACHE));
+        }
+        else
+        {
+            val = -val;
+            V_DrawPatch(x + 18, y, PatchINumbers[val]);
+            V_DrawPatch(x + 9, y, PatchNEGATIVE);
+        }
+        return;
+    }
+    if (val > 99)
+    {
+        patch = PatchINumbers[val / 100];
+        V_DrawPatch(x, y, patch);
+    }
+    val = val % 100;
+    if (val > 9 || oldval > 99)
+    {
+        patch = PatchINumbers[val / 10];
+        V_DrawPatch(x + 9, y, patch);
+    }
+    val = val % 10;
+    patch = PatchINumbers[val];
+    V_DrawPatch(x + 18, y, patch);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrBNumber
+//
+// Draws a three digit number using FontB
+//
+//---------------------------------------------------------------------------
+
+static void DrBNumber(signed int val, int x, int y)
+{
+    patch_t *patch;
+    int xpos;
+    int oldval;
+
+    oldval = val;
+    xpos = x;
+    if (val < 0)
+    {
+        val = 0;
+    }
+    if (val > 99)
+    {
+        patch = W_CacheLumpNum(FontBNumBase + val / 100, PU_CACHE);
+        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+    }
+    val = val % 100;
+    xpos += 12;
+    if (val > 9 || oldval > 99)
+    {
+        patch = W_CacheLumpNum(FontBNumBase + val / 10, PU_CACHE);
+        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+    }
+    val = val % 10;
+    xpos += 12;
+    patch = W_CacheLumpNum(FontBNumBase + val, PU_CACHE);
+    V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrSmallNumber
+//
+// Draws a small two digit number.
+//
+//---------------------------------------------------------------------------
+
+static void DrSmallNumber(int val, int x, int y)
+{
+    patch_t *patch;
+
+    if (val == 1)
+    {
+        return;
+    }
+    if (val > 9)
+    {
+        patch = PatchSmNumbers[val / 10];
+        V_DrawPatch(x, y, patch);
+    }
+    val = val % 10;
+    patch = PatchSmNumbers[val];
+    V_DrawPatch(x + 4, y, patch);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC ShadeLine
+//
+//---------------------------------------------------------------------------
+
+static void ShadeLine(int x, int y, int height, int shade)
+{
+    byte *dest;
+    byte *shades;
+
+    shades = colormaps + 9 * 256 + shade * 2 * 256;
+    dest = I_VideoBuffer + y * SCREENWIDTH + x;
+    while (height--)
+    {
+        *(dest) = *(shades + *dest);
+        dest += SCREENWIDTH;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC ShadeChain
+//
+//---------------------------------------------------------------------------
+
+static void ShadeChain(void)
+{
+    int i;
+
+    for (i = 0; i < 16; i++)
+    {
+        ShadeLine(277 + i, 190, 10, i / 2);
+        ShadeLine(19 + i, 190, 10, 7 - (i / 2));
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSoundInfo
+//
+// Displays sound debugging information.
+//
+//---------------------------------------------------------------------------
+
+static void DrawSoundInfo(void)
+{
+    int i;
+    SoundInfo_t s;
+    ChanInfo_t *c;
+    char text[32];
+    int x;
+    int y;
+    int xPos[7] = { 1, 75, 112, 156, 200, 230, 260 };
+
+    if (leveltime & 16)
+    {
+        MN_DrTextA(DEH_String("*** SOUND DEBUG INFO ***"), xPos[0], 20);
+    }
+    S_GetChannelInfo(&s);
+    if (s.channelCount == 0)
+    {
+        return;
+    }
+    x = 0;
+    MN_DrTextA(DEH_String("NAME"), xPos[x++], 30);
+    MN_DrTextA(DEH_String("MO.T"), xPos[x++], 30);
+    MN_DrTextA(DEH_String("MO.X"), xPos[x++], 30);
+    MN_DrTextA(DEH_String("MO.Y"), xPos[x++], 30);
+    MN_DrTextA(DEH_String("ID"), xPos[x++], 30);
+    MN_DrTextA(DEH_String("PRI"), xPos[x++], 30);
+    MN_DrTextA(DEH_String("DIST"), xPos[x++], 30);
+    for (i = 0; i < s.channelCount; i++)
+    {
+        c = &s.chan[i];
+        x = 0;
+        y = 40 + i * 10;
+        if (c->mo == NULL)
+        {                       // Channel is unused
+            MN_DrTextA(DEH_String("------"), xPos[0], y);
+            continue;
+        }
+        M_snprintf(text, sizeof(text), "%s", c->name);
+        M_ForceUppercase(text);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->mo->type);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->mo->x >> FRACBITS);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->mo->y >> FRACBITS);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->id);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->priority);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->distance);
+        MN_DrTextA(text, xPos[x++], y);
+    }
+    UpdateState |= I_FULLSCRN;
+    BorderNeedRefresh = true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SB_Drawer
+//
+//---------------------------------------------------------------------------
+
+char patcharti[][10] = {
+    {"ARTIBOX"},                // none
+    {"ARTIINVU"},               // invulnerability
+    {"ARTIINVS"},               // invisibility
+    {"ARTIPTN2"},               // health
+    {"ARTISPHL"},               // superhealth
+    {"ARTIPWBK"},               // tomeofpower
+    {"ARTITRCH"},               // torch
+    {"ARTIFBMB"},               // firebomb
+    {"ARTIEGGC"},               // egg
+    {"ARTISOAR"},               // fly
+    {"ARTIATLP"}                // teleport
+};
+
+char ammopic[][10] = {
+    {"INAMGLD"},
+    {"INAMBOW"},
+    {"INAMBST"},
+    {"INAMRAM"},
+    {"INAMPNX"},
+    {"INAMLOB"}
+};
+
+int SB_state = -1;
+static int oldarti = 0;
+static int oldartiCount = 0;
+static int oldfrags = -9999;
+static int oldammo = -1;
+static int oldarmor = -1;
+static int oldweapon = -1;
+static int oldhealth = -1;
+static int oldlife = -1;
+static int oldkeys = -1;
+
+int playerkeys = 0;
+
+
+void SB_Drawer(void)
+{
+    int frame;
+    static boolean hitCenterFrame;
+
+    // Sound info debug stuff
+    if (DebugSound == true)
+    {
+        DrawSoundInfo();
+    }
+    CPlayer = &players[consoleplayer];
+    if (viewheight == SCREENHEIGHT && !automapactive)
+    {
+        DrawFullScreenStuff();
+        SB_state = -1;
+    }
+    else
+    {
+        if (SB_state == -1)
+        {
+            V_DrawPatch(0, 158, PatchBARBACK);
+            if (players[consoleplayer].cheats & CF_GODMODE)
+            {
+                V_DrawPatch(16, 167,
+                            W_CacheLumpName(DEH_String("GOD1"), PU_CACHE));
+                V_DrawPatch(287, 167,
+                            W_CacheLumpName(DEH_String("GOD2"), PU_CACHE));
+            }
+            oldhealth = -1;
+        }
+        DrawCommonBar();
+        if (!inventory)
+        {
+            if (SB_state != 0)
+            {
+                // Main interface
+                V_DrawPatch(34, 160, PatchSTATBAR);
+                oldarti = 0;
+                oldammo = -1;
+                oldarmor = -1;
+                oldweapon = -1;
+                oldfrags = -9999;       //can't use -1, 'cuz of negative frags
+                oldlife = -1;
+                oldkeys = -1;
+            }
+            DrawMainBar();
+            SB_state = 0;
+        }
+        else
+        {
+            if (SB_state != 1)
+            {
+                V_DrawPatch(34, 160, PatchINVBAR);
+            }
+            DrawInventoryBar();
+            SB_state = 1;
+        }
+    }
+    SB_PaletteFlash();
+
+    // Flight icons
+    if (CPlayer->powers[pw_flight])
+    {
+        if (CPlayer->powers[pw_flight] > BLINKTHRESHOLD
+            || !(CPlayer->powers[pw_flight] & 16))
+        {
+            frame = (leveltime / 3) & 15;
+            if (CPlayer->mo->flags2 & MF2_FLY)
+            {
+                if (hitCenterFrame && (frame != 15 && frame != 0))
+                {
+                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + 15,
+                                                       PU_CACHE));
+                }
+                else
+                {
+                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + frame,
+                                                       PU_CACHE));
+                    hitCenterFrame = false;
+                }
+            }
+            else
+            {
+                if (!hitCenterFrame && (frame != 15 && frame != 0))
+                {
+                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + frame,
+                                                       PU_CACHE));
+                    hitCenterFrame = false;
+                }
+                else
+                {
+                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + 15,
+                                                       PU_CACHE));
+                    hitCenterFrame = true;
+                }
+            }
+            BorderTopRefresh = true;
+            UpdateState |= I_MESSAGES;
+        }
+        else
+        {
+            BorderTopRefresh = true;
+            UpdateState |= I_MESSAGES;
+        }
+    }
+
+    if (CPlayer->powers[pw_weaponlevel2] && !CPlayer->chickenTics)
+    {
+        if (CPlayer->powers[pw_weaponlevel2] > BLINKTHRESHOLD
+            || !(CPlayer->powers[pw_weaponlevel2] & 16))
+        {
+            frame = (leveltime / 3) & 15;
+            V_DrawPatch(300, 17,
+                        W_CacheLumpNum(spinbooklump + frame, PU_CACHE));
+            BorderTopRefresh = true;
+            UpdateState |= I_MESSAGES;
+        }
+        else
+        {
+            BorderTopRefresh = true;
+            UpdateState |= I_MESSAGES;
+        }
+    }
+/*
+		if(CPlayer->powers[pw_weaponlevel2] > BLINKTHRESHOLD
+			|| (CPlayer->powers[pw_weaponlevel2]&8))
+		{
+			V_DrawPatch(291, 0, W_CacheLumpName("ARTIPWBK", PU_CACHE));
+		}
+		else
+		{
+			BorderTopRefresh = true;
+		}
+	}
+*/
+}
+
+// sets the new palette based upon current values of player->damagecount
+// and player->bonuscount
+void SB_PaletteFlash(void)
+{
+    static int sb_palette = 0;
+    int palette;
+    byte *pal;
+
+    CPlayer = &players[consoleplayer];
+
+    if (CPlayer->damagecount)
+    {
+        palette = (CPlayer->damagecount + 7) >> 3;
+        if (palette >= NUMREDPALS)
+        {
+            palette = NUMREDPALS - 1;
+        }
+        palette += STARTREDPALS;
+    }
+    else if (CPlayer->bonuscount)
+    {
+        palette = (CPlayer->bonuscount + 7) >> 3;
+        if (palette >= NUMBONUSPALS)
+        {
+            palette = NUMBONUSPALS - 1;
+        }
+        palette += STARTBONUSPALS;
+    }
+    else
+    {
+        palette = 0;
+    }
+    if (palette != sb_palette)
+    {
+        sb_palette = palette;
+        pal = (byte *) W_CacheLumpNum(playpalette, PU_CACHE) + palette * 768;
+        I_SetPalette(pal);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawCommonBar
+//
+//---------------------------------------------------------------------------
+
+void DrawCommonBar(void)
+{
+    int chainY;
+    int healthPos;
+
+    V_DrawPatch(0, 148, PatchLTFCTOP);
+    V_DrawPatch(290, 148, PatchRTFCTOP);
+
+    if (oldhealth != HealthMarker)
+    {
+        oldhealth = HealthMarker;
+        healthPos = HealthMarker;
+        if (healthPos < 0)
+        {
+            healthPos = 0;
+        }
+        if (healthPos > 100)
+        {
+            healthPos = 100;
+        }
+        healthPos = (healthPos * 256) / 100;
+        chainY =
+            (HealthMarker == CPlayer->mo->health) ? 191 : 191 + ChainWiggle;
+        V_DrawPatch(0, 190, PatchCHAINBACK);
+        V_DrawPatch(2 + (healthPos % 17), chainY, PatchCHAIN);
+        V_DrawPatch(17 + healthPos, chainY, PatchLIFEGEM);
+        V_DrawPatch(0, 190, PatchLTFACE);
+        V_DrawPatch(276, 190, PatchRTFACE);
+        ShadeChain();
+        UpdateState |= I_STATBAR;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawMainBar
+//
+//---------------------------------------------------------------------------
+
+void DrawMainBar(void)
+{
+    int i;
+    int temp;
+
+    // Ready artifact
+    if (ArtifactFlash)
+    {
+        V_DrawPatch(180, 161, PatchBLACKSQ);
+
+        temp = W_GetNumForName(DEH_String("useartia")) + ArtifactFlash - 1;
+
+        V_DrawPatch(182, 161, W_CacheLumpNum(temp, PU_CACHE));
+        ArtifactFlash--;
+        oldarti = -1;           // so that the correct artifact fills in after the flash
+        UpdateState |= I_STATBAR;
+    }
+    else if (oldarti != CPlayer->readyArtifact
+             || oldartiCount != CPlayer->inventory[inv_ptr].count)
+    {
+        V_DrawPatch(180, 161, PatchBLACKSQ);
+        if (CPlayer->readyArtifact > 0)
+        {
+            V_DrawPatch(179, 160,
+                        W_CacheLumpName(DEH_String(patcharti[CPlayer->readyArtifact]),
+                                        PU_CACHE));
+            DrSmallNumber(CPlayer->inventory[inv_ptr].count, 201, 182);
+        }
+        oldarti = CPlayer->readyArtifact;
+        oldartiCount = CPlayer->inventory[inv_ptr].count;
+        UpdateState |= I_STATBAR;
+    }
+
+    // Frags
+    if (deathmatch)
+    {
+        temp = 0;
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            temp += CPlayer->frags[i];
+        }
+        if (temp != oldfrags)
+        {
+            V_DrawPatch(57, 171, PatchARMCLEAR);
+            DrINumber(temp, 61, 170);
+            oldfrags = temp;
+            UpdateState |= I_STATBAR;
+        }
+    }
+    else
+    {
+        temp = HealthMarker;
+        if (temp < 0)
+        {
+            temp = 0;
+        }
+        else if (temp > 100)
+        {
+            temp = 100;
+        }
+        if (oldlife != temp)
+        {
+            oldlife = temp;
+            V_DrawPatch(57, 171, PatchARMCLEAR);
+            DrINumber(temp, 61, 170);
+            UpdateState |= I_STATBAR;
+        }
+    }
+
+    // Keys
+    if (oldkeys != playerkeys)
+    {
+        if (CPlayer->keys[key_yellow])
+        {
+            V_DrawPatch(153, 164, W_CacheLumpName(DEH_String("ykeyicon"), PU_CACHE));
+        }
+        if (CPlayer->keys[key_green])
+        {
+            V_DrawPatch(153, 172, W_CacheLumpName(DEH_String("gkeyicon"), PU_CACHE));
+        }
+        if (CPlayer->keys[key_blue])
+        {
+            V_DrawPatch(153, 180, W_CacheLumpName(DEH_String("bkeyicon"), PU_CACHE));
+        }
+        oldkeys = playerkeys;
+        UpdateState |= I_STATBAR;
+    }
+    // Ammo
+    temp = CPlayer->ammo[wpnlev1info[CPlayer->readyweapon].ammo];
+    if (oldammo != temp || oldweapon != CPlayer->readyweapon)
+    {
+        V_DrawPatch(108, 161, PatchBLACKSQ);
+        if (temp && CPlayer->readyweapon > 0 && CPlayer->readyweapon < 7)
+        {
+            DrINumber(temp, 109, 162);
+            V_DrawPatch(111, 172,
+                        W_CacheLumpName(DEH_String(ammopic[CPlayer->readyweapon - 1]),
+                                        PU_CACHE));
+        }
+        oldammo = temp;
+        oldweapon = CPlayer->readyweapon;
+        UpdateState |= I_STATBAR;
+    }
+
+    // Armor
+    if (oldarmor != CPlayer->armorpoints)
+    {
+        V_DrawPatch(224, 171, PatchARMCLEAR);
+        DrINumber(CPlayer->armorpoints, 228, 170);
+        oldarmor = CPlayer->armorpoints;
+        UpdateState |= I_STATBAR;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawInventoryBar
+//
+//---------------------------------------------------------------------------
+
+void DrawInventoryBar(void)
+{
+    const char *patch;
+    int i;
+    int x;
+
+    x = inv_ptr - curpos;
+    UpdateState |= I_STATBAR;
+    V_DrawPatch(34, 160, PatchINVBAR);
+    for (i = 0; i < 7; i++)
+    {
+        //V_DrawPatch(50+i*31, 160, W_CacheLumpName("ARTIBOX", PU_CACHE));
+        if (CPlayer->inventorySlotNum > x + i
+            && CPlayer->inventory[x + i].type != arti_none)
+        {
+            patch = DEH_String(patcharti[CPlayer->inventory[x + i].type]);
+
+            V_DrawPatch(50 + i * 31, 160, W_CacheLumpName(patch, PU_CACHE));
+            DrSmallNumber(CPlayer->inventory[x + i].count, 69 + i * 31, 182);
+        }
+    }
+    V_DrawPatch(50 + curpos * 31, 189, PatchSELECTBOX);
+    if (x != 0)
+    {
+        V_DrawPatch(38, 159, !(leveltime & 4) ? PatchINVLFGEM1 :
+                    PatchINVLFGEM2);
+    }
+    if (CPlayer->inventorySlotNum - x > 7)
+    {
+        V_DrawPatch(269, 159, !(leveltime & 4) ?
+                    PatchINVRTGEM1 : PatchINVRTGEM2);
+    }
+}
+
+void DrawFullScreenStuff(void)
+{
+    const char *patch;
+    int i;
+    int x;
+    int temp;
+
+    UpdateState |= I_FULLSCRN;
+    if (CPlayer->mo->health > 0)
+    {
+        DrBNumber(CPlayer->mo->health, 5, 180);
+    }
+    else
+    {
+        DrBNumber(0, 5, 180);
+    }
+    if (deathmatch)
+    {
+        temp = 0;
+        for (i = 0; i < MAXPLAYERS; i++)
+        {
+            if (playeringame[i])
+            {
+                temp += CPlayer->frags[i];
+            }
+        }
+        DrINumber(temp, 45, 185);
+    }
+    if (!inventory)
+    {
+        if (CPlayer->readyArtifact > 0)
+        {
+            patch = DEH_String(patcharti[CPlayer->readyArtifact]);
+            V_DrawAltTLPatch(286, 170, W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));
+            V_DrawPatch(286, 170, W_CacheLumpName(patch, PU_CACHE));
+            DrSmallNumber(CPlayer->inventory[inv_ptr].count, 307, 192);
+        }
+    }
+    else
+    {
+        x = inv_ptr - curpos;
+        for (i = 0; i < 7; i++)
+        {
+            V_DrawAltTLPatch(50 + i * 31, 168,
+                          W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));
+            if (CPlayer->inventorySlotNum > x + i
+                && CPlayer->inventory[x + i].type != arti_none)
+            {
+                patch = DEH_String(patcharti[CPlayer->inventory[x + i].type]);
+                V_DrawPatch(50 + i * 31, 168,
+                            W_CacheLumpName(patch, PU_CACHE));
+                DrSmallNumber(CPlayer->inventory[x + i].count, 69 + i * 31,
+                              190);
+            }
+        }
+        V_DrawPatch(50 + curpos * 31, 197, PatchSELECTBOX);
+        if (x != 0)
+        {
+            V_DrawPatch(38, 167, !(leveltime & 4) ? PatchINVLFGEM1 :
+                        PatchINVLFGEM2);
+        }
+        if (CPlayer->inventorySlotNum - x > 7)
+        {
+            V_DrawPatch(269, 167, !(leveltime & 4) ?
+                        PatchINVRTGEM1 : PatchINVRTGEM2);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------
+//
+// FUNC SB_Responder
+//
+//--------------------------------------------------------------------------
+
+boolean SB_Responder(event_t * event)
+{
+    if (event->type == ev_keydown)
+    {
+        if (HandleCheats(event->data1))
+        {                       // Need to eat the key
+            return (true);
+        }
+    }
+    return (false);
+}
+
+//--------------------------------------------------------------------------
+//
+// FUNC HandleCheats
+//
+// Returns true if the caller should eat the key.
+//
+//--------------------------------------------------------------------------
+
+static boolean HandleCheats(byte key)
+{
+    int i;
+    boolean eat;
+
+    if (netgame || gameskill == sk_nightmare)
+    {                           // Can't cheat in a net-game, or in nightmare mode
+        return (false);
+    }
+    if (players[consoleplayer].health <= 0)
+    {                           // Dead players can't cheat
+        return (false);
+    }
+    eat = false;
+    for (i = 0; Cheats[i].func != NULL; i++)
+    {
+        if (cht_CheckCheat(Cheats[i].seq, key))
+        {
+            Cheats[i].func(&players[consoleplayer], &Cheats[i]);
+            S_StartSound(NULL, sfx_dorcls);
+        }
+    }
+    return (eat);
+}
+
+//--------------------------------------------------------------------------
+//
+// CHEAT FUNCTIONS
+//
+//--------------------------------------------------------------------------
+
+static void CheatGodFunc(player_t * player, Cheat_t * cheat)
+{
+    player->cheats ^= CF_GODMODE;
+    if (player->cheats & CF_GODMODE)
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATGODON), false);
+    }
+    else
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATGODOFF), false);
+    }
+    SB_state = -1;
+}
+
+static void CheatNoClipFunc(player_t * player, Cheat_t * cheat)
+{
+    player->cheats ^= CF_NOCLIP;
+    if (player->cheats & CF_NOCLIP)
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATNOCLIPON), false);
+    }
+    else
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATNOCLIPOFF), false);
+    }
+}
+
+static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat)
+{
+    int i;
+
+    player->armorpoints = 200;
+    player->armortype = 2;
+    if (!player->backpack)
+    {
+        for (i = 0; i < NUMAMMO; i++)
+        {
+            player->maxammo[i] *= 2;
+        }
+        player->backpack = true;
+    }
+    for (i = 0; i < NUMWEAPONS - 1; i++)
+    {
+        player->weaponowned[i] = true;
+    }
+    if (gamemode == shareware)
+    {
+        player->weaponowned[wp_skullrod] = false;
+        player->weaponowned[wp_phoenixrod] = false;
+        player->weaponowned[wp_mace] = false;
+    }
+    for (i = 0; i < NUMAMMO; i++)
+    {
+        player->ammo[i] = player->maxammo[i];
+    }
+    P_SetMessage(player, DEH_String(TXT_CHEATWEAPONS), false);
+}
+
+static void CheatPowerFunc(player_t * player, Cheat_t * cheat)
+{
+    if (player->powers[pw_weaponlevel2])
+    {
+        player->powers[pw_weaponlevel2] = 0;
+        P_SetMessage(player, DEH_String(TXT_CHEATPOWEROFF), false);
+    }
+    else
+    {
+        P_UseArtifact(player, arti_tomeofpower);
+        P_SetMessage(player, DEH_String(TXT_CHEATPOWERON), false);
+    }
+}
+
+static void CheatHealthFunc(player_t * player, Cheat_t * cheat)
+{
+    if (player->chickenTics)
+    {
+        player->health = player->mo->health = MAXCHICKENHEALTH;
+    }
+    else
+    {
+        player->health = player->mo->health = MAXHEALTH;
+    }
+    P_SetMessage(player, DEH_String(TXT_CHEATHEALTH), false);
+}
+
+static void CheatKeysFunc(player_t * player, Cheat_t * cheat)
+{
+    player->keys[key_yellow] = true;
+    player->keys[key_green] = true;
+    player->keys[key_blue] = true;
+    playerkeys = 7;             // Key refresh flags
+    P_SetMessage(player, DEH_String(TXT_CHEATKEYS), false);
+}
+
+static void CheatSoundFunc(player_t * player, Cheat_t * cheat)
+{
+    DebugSound = !DebugSound;
+    if (DebugSound)
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATSOUNDON), false);
+    }
+    else
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATSOUNDOFF), false);
+    }
+}
+
+static void CheatTickerFunc(player_t * player, Cheat_t * cheat)
+{
+    DisplayTicker = !DisplayTicker;
+    if (DisplayTicker)
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATTICKERON), false);
+    }
+    else
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATTICKEROFF), false);
+    }
+
+    I_DisplayFPSDots(DisplayTicker);
+}
+
+static void CheatArtifact1Func(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS1), false);
+}
+
+static void CheatArtifact2Func(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS2), false);
+}
+
+static void CheatArtifact3Func(player_t * player, Cheat_t * cheat)
+{
+    char args[2];
+    int i;
+    int j;
+    int type;
+    int count;
+
+    cht_GetParam(cheat->seq, args);
+    type = args[0] - 'a' + 1;
+    count = args[1] - '0';
+    if (type == 26 && count == 0)
+    {                           // All artifacts
+        for (i = arti_none + 1; i < NUMARTIFACTS; i++)
+        {
+            if (gamemode == shareware 
+             && (i == arti_superhealth || i == arti_teleport))
+            {
+                continue;
+            }
+            for (j = 0; j < 16; j++)
+            {
+                P_GiveArtifact(player, i, NULL);
+            }
+        }
+        P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS3), false);
+    }
+    else if (type > arti_none && type < NUMARTIFACTS
+             && count > 0 && count < 10)
+    {
+        if (gamemode == shareware
+         && (type == arti_superhealth || type == arti_teleport))
+        {
+            P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTSFAIL), false);
+            return;
+        }
+        for (i = 0; i < count; i++)
+        {
+            P_GiveArtifact(player, type, NULL);
+        }
+        P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS3), false);
+    }
+    else
+    {                           // Bad input
+        P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTSFAIL), false);
+    }
+}
+
+static void CheatWarpFunc(player_t * player, Cheat_t * cheat)
+{
+    char args[2];
+    int episode;
+    int map;
+
+    cht_GetParam(cheat->seq, args);
+
+    episode = args[0] - '0';
+    map = args[1] - '0';
+    if (D_ValidEpisodeMap(heretic, gamemode, episode, map))
+    {
+        G_DeferedInitNew(gameskill, episode, map);
+        P_SetMessage(player, DEH_String(TXT_CHEATWARP), false);
+    }
+}
+
+static void CheatChickenFunc(player_t * player, Cheat_t * cheat)
+{
+    if (player->chickenTics)
+    {
+        if (P_UndoPlayerChicken(player))
+        {
+            P_SetMessage(player, DEH_String(TXT_CHEATCHICKENOFF), false);
+        }
+    }
+    else if (P_ChickenMorphPlayer(player))
+    {
+        P_SetMessage(player, DEH_String(TXT_CHEATCHICKENON), false);
+    }
+}
+
+static void CheatMassacreFunc(player_t * player, Cheat_t * cheat)
+{
+    P_Massacre();
+    P_SetMessage(player, DEH_String(TXT_CHEATMASSACRE), false);
+}
+
+static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat)
+{
+    int i;
+    if (player->chickenTics)
+    {
+        return;
+    }
+    for (i = 1; i < 8; i++)
+    {
+        player->weaponowned[i] = false;
+    }
+    player->pendingweapon = wp_staff;
+    P_SetMessage(player, DEH_String(TXT_CHEATIDKFA), true);
+}
+
+static void CheatIDDQDFunc(player_t * player, Cheat_t * cheat)
+{
+    P_DamageMobj(player->mo, NULL, player->mo, 10000);
+    P_SetMessage(player, DEH_String(TXT_CHEATIDDQD), true);
+}
diff --git a/games/NXDoom/src/heretic/sounds.c b/games/NXDoom/src/heretic/sounds.c
new file mode 100644
index 000000000..3e1dda157
--- /dev/null
+++ b/games/NXDoom/src/heretic/sounds.c
@@ -0,0 +1,249 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// sounds.c
+
+#include "doomdef.h"
+#include "i_sound.h"
+#include "sounds.h"
+
+// Music info
+
+#define MUSIC(name) \
+    { name, 0, NULL, NULL }
+
+musicinfo_t S_music[] = {
+    MUSIC("MUS_E1M1"),            // 1-1
+    MUSIC("MUS_E1M2"),
+    MUSIC("MUS_E1M3"),
+    MUSIC("MUS_E1M4"),
+    MUSIC("MUS_E1M5"),
+    MUSIC("MUS_E1M6"),
+    MUSIC("MUS_E1M7"),
+    MUSIC("MUS_E1M8"),
+    MUSIC("MUS_E1M9"),
+
+    MUSIC("MUS_E2M1"),            // 2-1
+    MUSIC("MUS_E2M2"),
+    MUSIC("MUS_E2M3"),
+    MUSIC("MUS_E2M4"),
+    MUSIC("MUS_E1M4"),
+    MUSIC("MUS_E2M6"),
+    MUSIC("MUS_E2M7"),
+    MUSIC("MUS_E2M8"),
+    MUSIC("MUS_E2M9"),
+
+    MUSIC("MUS_E1M1"),            // 3-1
+    MUSIC("MUS_E3M2"),
+    MUSIC("MUS_E3M3"),
+    MUSIC("MUS_E1M6"),
+    MUSIC("MUS_E1M3"),
+    MUSIC("MUS_E1M2"),
+    MUSIC("MUS_E1M5"),
+    MUSIC("MUS_E1M9"),
+    MUSIC("MUS_E2M6"),
+
+    MUSIC("MUS_E1M6"),            // 4-1
+    MUSIC("MUS_E1M2"),
+    MUSIC("MUS_E1M3"),
+    MUSIC("MUS_E1M4"),
+    MUSIC("MUS_E1M5"),
+    MUSIC("MUS_E1M1"),
+    MUSIC("MUS_E1M7"),
+    MUSIC("MUS_E1M8"),
+    MUSIC("MUS_E1M9"),
+
+    MUSIC("MUS_E2M1"),            // 5-1
+    MUSIC("MUS_E2M2"),
+    MUSIC("MUS_E2M3"),
+    MUSIC("MUS_E2M4"),
+    MUSIC("MUS_E1M4"),
+    MUSIC("MUS_E2M6"),
+    MUSIC("MUS_E2M7"),
+    MUSIC("MUS_E2M8"),
+    MUSIC("MUS_E2M9"),
+
+    MUSIC("MUS_E3M2"),            // 6-1
+    MUSIC("MUS_E3M3"),            // 6-2
+    MUSIC("MUS_E1M6"),            // 6-3
+
+    MUSIC("MUS_TITL"),
+    MUSIC("MUS_INTR"),
+    MUSIC("MUS_CPTD")
+};
+
+// Sound info
+
+    /* Macro for original heretic sfxinfo_t 
+#define SOUND(name, priority, numchannels) \
+    { name, NULL, priority, -1, NULL, 0, numchannels }
+#define SOUND_LINK(name, link_id, priority, numchannels) \
+    { name, &S_sfx[link_id], priority, -1, NULL, 0, numchannels }
+    */
+
+#define SOUND(name, priority, numchannels) \
+    { NULL, name, priority, NULL, -1, -1, -1, 0, numchannels, NULL }
+#define SOUND_LINK(name, link_id, priority, numchannels) \
+    { NULL, name, priority, &S_sfx[link_id], 0, 0, -1, 0, numchannels, NULL }
+
+sfxinfo_t S_sfx[] = {
+    SOUND("",        0,   0),
+    SOUND("gldhit",  32,  2),
+    SOUND("gntful",  32,  -1),
+    SOUND("gnthit",  32,  -1),
+    SOUND("gntpow",  32,  -1),
+    SOUND("gntact",  32,  -1),
+    SOUND("gntuse",  32,  -1),
+    SOUND("phosht",  32,  2),
+    SOUND("phohit",  32,  -1),
+    SOUND_LINK("-phopow", sfx_hedat1, 32, 1),
+    SOUND("lobsht",  20,  2),
+    SOUND("lobhit",  20,  2),
+    SOUND("lobpow",  20,  2),
+    SOUND("hrnsht",  32,  2),
+    SOUND("hrnhit",  32,  2),
+    SOUND("hrnpow",  32,  2),
+    SOUND("ramphit", 32,  2),
+    SOUND("ramrain", 10,  2),
+    SOUND("bowsht",  32,  2),
+    SOUND("stfhit",  32,  2),
+    SOUND("stfpow",  32,  2),
+    SOUND("stfcrk",  32,  2),
+    SOUND("impsit",  32,  2),
+    SOUND("impat1",  32,  2),
+    SOUND("impat2",  32,  2),
+    SOUND("impdth",  80,  2),
+    SOUND_LINK("-impact", sfx_impsit, 20, 2),
+    SOUND("imppai",  32,  2),
+    SOUND("mumsit",  32,  2),
+    SOUND("mumat1",  32,  2),
+    SOUND("mumat2",  32,  2),
+    SOUND("mumdth",  80,  2),
+    SOUND_LINK("-mumact", sfx_mumsit, 20, 2),
+    SOUND("mumpai",  32,  2),
+    SOUND("mumhed",  32,  2),
+    SOUND("bstsit",  32,  2),
+    SOUND("bstatk",  32,  2),
+    SOUND("bstdth",  80,  2),
+    SOUND("bstact",  20,  2),
+    SOUND("bstpai",  32,  2),
+    SOUND("clksit",  32,  2),
+    SOUND("clkatk",  32,  2),
+    SOUND("clkdth",  80,  2),
+    SOUND("clkact",  20,  2),
+    SOUND("clkpai",  32,  2),
+    SOUND("snksit",  32,  2),
+    SOUND("snkatk",  32,  2),
+    SOUND("snkdth",  80,  2),
+    SOUND("snkact",  20,  2),
+    SOUND("snkpai",  32,  2),
+    SOUND("kgtsit",  32,  2),
+    SOUND("kgtatk",  32,  2),
+    SOUND("kgtat2",  32,  2),
+    SOUND("kgtdth",  80,  2),
+    SOUND_LINK("-kgtact", sfx_kgtsit, 20, 2),
+    SOUND("kgtpai",  32,  2),
+    SOUND("wizsit",  32,  2),
+    SOUND("wizatk",  32,  2),
+    SOUND("wizdth",  80,  2),
+    SOUND("wizact",  20,  2),
+    SOUND("wizpai",  32,  2),
+    SOUND("minsit",  32,  2),
+    SOUND("minat1",  32,  2),
+    SOUND("minat2",  32,  2),
+    SOUND("minat3",  32,  2),
+    SOUND("mindth",  80,  2),
+    SOUND("minact",  20,  2),
+    SOUND("minpai",  32,  2),
+    SOUND("hedsit",  32,  2),
+    SOUND("hedat1",  32,  2),
+    SOUND("hedat2",  32,  2),
+    SOUND("hedat3",  32,  2),
+    SOUND("heddth",  80,  2),
+    SOUND("hedact",  20,  2),
+    SOUND("hedpai",  32,  2),
+    SOUND("sorzap",  32,  2),
+    SOUND("sorrise", 32,  2),
+    SOUND("sorsit",  200, 2),
+    SOUND("soratk",  32,  2),
+    SOUND("soract",  200, 2),
+    SOUND("sorpai",  200, 2),
+    SOUND("sordsph", 200, 2),
+    SOUND("sordexp", 200, 2),
+    SOUND("sordbon", 200, 2),
+    SOUND_LINK("-sbtsit", sfx_bstsit, 32, 2),
+    SOUND_LINK("-sbtatk", sfx_bstatk, 32, 2),
+    SOUND("sbtdth",  80,  2),
+    SOUND("sbtact",  20,  2),
+    SOUND("sbtpai",  32,  2),
+    SOUND("plroof",  32,  2),
+    SOUND("plrpai",  32,  2),
+    SOUND("plrdth",  80,  2),
+    SOUND("gibdth",  100, 2),
+    SOUND("plrwdth", 80,  2),
+    SOUND("plrcdth", 100, 2),
+    SOUND("itemup",  32,  2),
+    SOUND("wpnup",   32,  2),
+    SOUND("telept",  50,  2),
+    SOUND("doropn",  40,  2),
+    SOUND("dorcls",  40,  2),
+    SOUND("dormov",  40,  2),
+    SOUND("artiup",  32,  2),
+    SOUND("switch",  40,  2),
+    SOUND("pstart",  40,  2),
+    SOUND("pstop",   40,  2),
+    SOUND("stnmov",  40,  2),
+    SOUND("chicpai", 32,  2),
+    SOUND("chicatk", 32,  2),
+    SOUND("chicdth", 40,  2),
+    SOUND("chicact", 32,  2),
+    SOUND("chicpk1", 32,  2),
+    SOUND("chicpk2", 32,  2),
+    SOUND("chicpk3", 32,  2),
+    SOUND("keyup",   50,  2),
+    SOUND("ripslop", 16,  2),
+    SOUND("newpod",  16,  -1),
+    SOUND("podexp",  40,  -1),
+    SOUND("bounce",  16,  2),
+    SOUND_LINK("-volsht", sfx_bstatk, 16, 2),
+    SOUND_LINK("-volhit", sfx_lobhit, 16, 2),
+    SOUND("burn",    10,  2),
+    SOUND("splash",  10,  1),
+    SOUND("gloop",   10,  2),
+    SOUND("respawn", 10,  1),
+    SOUND("blssht",  32,  2),
+    SOUND("blshit",  32,  2),
+    SOUND("chat",    100, 1),
+    SOUND("artiuse", 32,  1),
+    SOUND("gfrag",   100, 1),
+    SOUND("waterfl", 16,  2),
+
+    // Monophonic sounds
+
+    SOUND("wind",    16,  1),
+    SOUND("amb1",    1,   1),
+    SOUND("amb2",    1,   1),
+    SOUND("amb3",    1,   1),
+    SOUND("amb4",    1,   1),
+    SOUND("amb5",    1,   1),
+    SOUND("amb6",    1,   1),
+    SOUND("amb7",    1,   1),
+    SOUND("amb8",    1,   1),
+    SOUND("amb9",    1,   1),
+    SOUND("amb10",   1,   1),
+    SOUND("amb11",   1,   0)
+};
diff --git a/games/NXDoom/src/heretic/sounds.h b/games/NXDoom/src/heretic/sounds.h
new file mode 100644
index 000000000..f49b02798
--- /dev/null
+++ b/games/NXDoom/src/heretic/sounds.h
@@ -0,0 +1,291 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// sounds.h
+
+#ifndef __SOUNDSH__
+#define __SOUNDSH__
+
+#include "i_sound.h"
+
+#define MAX_SND_DIST 	1600
+#define MAX_CHANNELS	16
+
+// Music identifiers
+
+typedef enum
+{
+    mus_e1m1,
+    mus_e1m2,
+    mus_e1m3,
+    mus_e1m4,
+    mus_e1m5,
+    mus_e1m6,
+    mus_e1m7,
+    mus_e1m8,
+    mus_e1m9,
+
+    mus_e2m1,
+    mus_e2m2,
+    mus_e2m3,
+    mus_e2m4,
+    mus_e2m5,
+    mus_e2m6,
+    mus_e2m7,
+    mus_e2m8,
+    mus_e2m9,
+
+    mus_e3m1,
+    mus_e3m2,
+    mus_e3m3,
+    mus_e3m4,
+    mus_e3m5,
+    mus_e3m6,
+    mus_e3m7,
+    mus_e3m8,
+    mus_e3m9,
+
+    mus_e4m1,
+    mus_e4m2,
+    mus_e4m3,
+    mus_e4m4,
+    mus_e4m5,
+    mus_e4m6,
+    mus_e4m7,
+    mus_e4m8,
+    mus_e4m9,
+
+    mus_e5m1,
+    mus_e5m2,
+    mus_e5m3,
+    mus_e5m4,
+    mus_e5m5,
+    mus_e5m6,
+    mus_e5m7,
+    mus_e5m8,
+    mus_e5m9,
+
+    mus_e6m1,
+    mus_e6m2,
+    mus_e6m3,
+
+    mus_titl,
+    mus_intr,
+    mus_cptd,
+    NUMMUSIC
+} musicenum_t;
+
+#if 0
+typedef struct
+{
+    char name[8];
+} musicinfo_t;
+
+typedef struct sfxinfo_s
+{
+    char name[8];
+    struct sfxinfo_s *link;     // Make alias for another sound
+    unsigned short priority;    // Higher priority takes precendence
+    int usefulness;             // Determines when a sound should be cached out
+    void *snd_ptr;
+    int lumpnum;
+    int numchannels;            // total number of channels a sound type may occupy
+} sfxinfo_t;
+
+#endif
+
+typedef struct
+{
+    mobj_t *mo;
+    int sound_id;
+    int handle;
+    int pitch;
+    int priority;
+} channel_t;
+
+typedef struct
+{
+    int id;
+    unsigned short priority;
+    char *name;
+    mobj_t *mo;
+    int distance;
+} ChanInfo_t;
+
+typedef struct
+{
+    int channelCount;
+    int musicVolume;
+    int soundVolume;
+    ChanInfo_t chan[8];
+} SoundInfo_t;
+
+// Sound identifiers
+
+typedef enum
+{
+    sfx_None,
+    sfx_gldhit,
+    sfx_gntful,
+    sfx_gnthit,
+    sfx_gntpow,
+    sfx_gntact,
+    sfx_gntuse,
+    sfx_phosht,
+    sfx_phohit,
+    sfx_phopow,
+    sfx_lobsht,
+    sfx_lobhit,
+    sfx_lobpow,
+    sfx_hrnsht,
+    sfx_hrnhit,
+    sfx_hrnpow,
+    sfx_ramphit,
+    sfx_ramrain,
+    sfx_bowsht,
+    sfx_stfhit,
+    sfx_stfpow,
+    sfx_stfcrk,
+    sfx_impsit,
+    sfx_impat1,
+    sfx_impat2,
+    sfx_impdth,
+    sfx_impact,
+    sfx_imppai,
+    sfx_mumsit,
+    sfx_mumat1,
+    sfx_mumat2,
+    sfx_mumdth,
+    sfx_mumact,
+    sfx_mumpai,
+    sfx_mumhed,
+    sfx_bstsit,
+    sfx_bstatk,
+    sfx_bstdth,
+    sfx_bstact,
+    sfx_bstpai,
+    sfx_clksit,
+    sfx_clkatk,
+    sfx_clkdth,
+    sfx_clkact,
+    sfx_clkpai,
+    sfx_snksit,
+    sfx_snkatk,
+    sfx_snkdth,
+    sfx_snkact,
+    sfx_snkpai,
+    sfx_kgtsit,
+    sfx_kgtatk,
+    sfx_kgtat2,
+    sfx_kgtdth,
+    sfx_kgtact,
+    sfx_kgtpai,
+    sfx_wizsit,
+    sfx_wizatk,
+    sfx_wizdth,
+    sfx_wizact,
+    sfx_wizpai,
+    sfx_minsit,
+    sfx_minat1,
+    sfx_minat2,
+    sfx_minat3,
+    sfx_mindth,
+    sfx_minact,
+    sfx_minpai,
+    sfx_hedsit,
+    sfx_hedat1,
+    sfx_hedat2,
+    sfx_hedat3,
+    sfx_heddth,
+    sfx_hedact,
+    sfx_hedpai,
+    sfx_sorzap,
+    sfx_sorrise,
+    sfx_sorsit,
+    sfx_soratk,
+    sfx_soract,
+    sfx_sorpai,
+    sfx_sordsph,
+    sfx_sordexp,
+    sfx_sordbon,
+    sfx_sbtsit,
+    sfx_sbtatk,
+    sfx_sbtdth,
+    sfx_sbtact,
+    sfx_sbtpai,
+    sfx_plroof,
+    sfx_plrpai,
+    sfx_plrdth,                 // Normal
+    sfx_gibdth,                 // Extreme
+    sfx_plrwdth,                // Wimpy
+    sfx_plrcdth,                // Crazy
+    sfx_itemup,
+    sfx_wpnup,
+    sfx_telept,
+    sfx_doropn,
+    sfx_dorcls,
+    sfx_dormov,
+    sfx_artiup,
+    sfx_switch,
+    sfx_pstart,
+    sfx_pstop,
+    sfx_stnmov,
+    sfx_chicpai,
+    sfx_chicatk,
+    sfx_chicdth,
+    sfx_chicact,
+    sfx_chicpk1,
+    sfx_chicpk2,
+    sfx_chicpk3,
+    sfx_keyup,
+    sfx_ripslop,
+    sfx_newpod,
+    sfx_podexp,
+    sfx_bounce,
+    sfx_volsht,
+    sfx_volhit,
+    sfx_burn,
+    sfx_splash,
+    sfx_gloop,
+    sfx_respawn,
+    sfx_blssht,
+    sfx_blshit,
+    sfx_chat,
+    sfx_artiuse,
+    sfx_gfrag,
+    sfx_waterfl,
+
+    // Monophonic sounds
+
+    sfx_wind,
+    sfx_amb1,
+    sfx_amb2,
+    sfx_amb3,
+    sfx_amb4,
+    sfx_amb5,
+    sfx_amb6,
+    sfx_amb7,
+    sfx_amb8,
+    sfx_amb9,
+    sfx_amb10,
+    sfx_amb11,
+    NUMSFX
+} sfxenum_t;
+
+extern sfxinfo_t S_sfx[];
+extern musicinfo_t S_music[];
+
+#endif
diff --git a/games/NXDoom/src/hexen-res.rc.in b/games/NXDoom/src/hexen-res.rc.in
new file mode 100644
index 000000000..b2b811b60
--- /dev/null
+++ b/games/NXDoom/src/hexen-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/hexen.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+  BLOCK "040904E4"
+  {
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+   VALUE "FileDescription", "@PACKAGE_STRING@"
+   VALUE "InternalName", "@PACKAGE_TARNAME@"
+   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+   VALUE "ProductName", "@PACKAGE_NAME@"
+   VALUE "ProductVersion", "@PACKAGE_VERSION@"
+  }
+ }
+ BLOCK "VarFileInfo"
+ {
+  VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/games/NXDoom/src/hexen/.gitignore b/games/NXDoom/src/hexen/.gitignore
new file mode 100644
index 000000000..d4e88e5a2
--- /dev/null
+++ b/games/NXDoom/src/hexen/.gitignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+tags
+TAGS
diff --git a/games/NXDoom/src/hexen/CMakeLists.txt b/games/NXDoom/src/hexen/CMakeLists.txt
new file mode 100644
index 000000000..3eba5d073
--- /dev/null
+++ b/games/NXDoom/src/hexen/CMakeLists.txt
@@ -0,0 +1,78 @@
+add_library(hexen STATIC
+            a_action.c
+                                am_data.h
+            am_map.c            am_map.h
+            ct_chat.c
+                                ct_chat.h
+            d_net.c
+            f_finale.c
+            g_game.c
+                                h2def.h
+            h2_main.c
+            info.c              info.h
+            in_lude.c
+            m_random.c          m_random.h
+            mn_menu.c
+            p_acs.c
+                                p_action.h
+            p_anim.c
+            p_ceilng.c
+            p_doors.c
+            p_enemy.c
+            p_floor.c
+            p_inter.c
+            p_lights.c
+                                p_local.h
+            p_map.c
+            p_maputl.c
+            p_mobj.c
+            po_man.c
+            p_plats.c
+            p_pspr.c
+            p_setup.c
+            p_sight.c
+            p_spec.c           p_spec.h
+            p_switch.c
+            p_telept.c
+            p_things.c
+            p_tick.c
+            p_user.c
+            r_bsp.c
+            r_data.c
+            r_draw.c
+                                r_local.h
+            r_main.c
+            r_plane.c
+            r_segs.c
+            r_things.c
+            s_sound.c           s_sound.h
+            sb_bar.c
+            sc_man.c
+            sn_sonix.c
+            sounds.c            sounds.h
+            st_start.c          st_start.h
+            sv_save.c
+                                textdefs.h
+                                xddefs.h)
+
+target_include_directories(hexen PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
+if (DEFINED EMSCRIPTEN)
+    set(SDL_FLAGS "-s USE_SDL=2")
+    if(ENABLE_SDL2_MIXER)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
+    endif()
+    if(ENABLE_SDL2_NET)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
+    endif()
+else()
+    set(SDL_LINK_LIBS SDL2::SDL2)
+    if(ENABLE_SDL2_MIXER)
+        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
+    endif()
+    if(ENABLE_SDL2_NET)
+        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
+    endif()
+endif()
+target_link_libraries(hexen ${SDL_LINK_LIBS})
+set_target_properties(hexen PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+set_target_properties(hexen PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/hexen/Makefile.am b/games/NXDoom/src/hexen/Makefile.am
new file mode 100644
index 000000000..c974ba3c8
--- /dev/null
+++ b/games/NXDoom/src/hexen/Makefile.am
@@ -0,0 +1,71 @@
+AM_CFLAGS=-I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+
+EXTRA_DIST =                          \
+        CMakeLists.txt                \
+        hexen_icon.c
+
+noinst_LIBRARIES=libhexen.a
+
+libhexen_a_SOURCES =                  \
+a_action.c                            \
+                    am_data.h         \
+am_map.c            am_map.h          \
+ct_chat.c                             \
+                    ct_chat.h         \
+d_net.c                               \
+f_finale.c                            \
+g_game.c                              \
+                    h2def.h           \
+h2_main.c                             \
+info.c              info.h            \
+in_lude.c                             \
+m_random.c          m_random.h        \
+mn_menu.c                             \
+p_acs.c                               \
+                    p_action.h        \
+p_anim.c                              \
+p_ceilng.c                            \
+p_doors.c                             \
+p_enemy.c                             \
+p_floor.c                             \
+p_inter.c                             \
+p_lights.c                            \
+                    p_local.h         \
+p_map.c                               \
+p_maputl.c                            \
+p_mobj.c                              \
+po_man.c                              \
+p_plats.c                             \
+p_pspr.c                              \
+p_setup.c                             \
+p_sight.c                             \
+p_spec.c           p_spec.h           \
+p_switch.c                            \
+p_telept.c                            \
+p_things.c                            \
+p_tick.c                              \
+p_user.c                              \
+r_bsp.c                               \
+r_data.c                              \
+r_draw.c                              \
+                    r_local.h         \
+r_main.c                              \
+r_plane.c                             \
+r_segs.c                              \
+r_things.c                            \
+s_sound.c           s_sound.h         \
+sb_bar.c                              \
+sc_man.c                              \
+sn_sonix.c                            \
+sounds.c            sounds.h          \
+st_start.c          st_start.h        \
+sv_save.c                             \
+                    textdefs.h        \
+                    xddefs.h
+
+if HAVE_ICONS
+
+hexen_icon.c : $(top_builddir)/data/hexen.png
+	$(top_builddir)/data/convert-icon $(top_builddir)/data/hexen.png $@
+
+endif
diff --git a/games/NXDoom/src/hexen/a_action.c b/games/NXDoom/src/hexen/a_action.c
new file mode 100644
index 000000000..7842f556a
--- /dev/null
+++ b/games/NXDoom/src/hexen/a_action.c
@@ -0,0 +1,1341 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+int orbitTableX[256] = {
+    983025, 982725, 981825, 980340, 978255, 975600, 972330, 968490,
+    964065, 959070, 953475, 947325, 940590, 933300, 925440, 917025,
+    908055, 898545, 888495, 877905, 866775, 855135, 842985, 830310,
+    817155, 803490, 789360, 774735, 759660, 744120, 728130, 711690,
+    694845, 677565, 659880, 641805, 623340, 604500, 585285, 565725,
+    545820, 525600, 505050, 484200, 463065, 441645, 419955, 398010,
+    375840, 353430, 330810, 307995, 285000, 261825, 238485, 215010,
+    191400, 167685, 143865, 119955, 95970, 71940, 47850, 23745,
+    -375, -24495, -48600, -72690, -96720, -120705, -144600, -168420,
+    -192150, -215745, -239220, -262545, -285720, -308715, -331530, -354135,
+    -376530, -398700, -420630, -442320, -463725, -484860, -505695, -526230,
+    -546450, -566340, -585885, -605085, -623925, -642375, -660435, -678105,
+    -695370, -712215, -728625, -744600, -760125, -775200, -789795, -803925,
+    -817575, -830715, -843375, -855510, -867135, -878235, -888810, -898845,
+    -908340, -917295, -925695, -933540, -940815, -947520, -953670, -959235,
+    -964215, -968625, -972450, -975690, -978330, -980400, -981870, -982740,
+    -983025, -982725, -981825, -980340, -978255, -975600, -972330, -968490,
+    -964065, -959070, -953475, -947325, -940590, -933300, -925440, -917025,
+    -908055, -898545, -888495, -877905, -866775, -855135, -842985, -830310,
+    -817155, -803490, -789360, -774735, -759660, -744120, -728130, -711690,
+    -694845, -677565, -659880, -641805, -623340, -604485, -585285, -565725,
+    -545820, -525600, -505050, -484200, -463065, -441645, -419955, -398010,
+    -375840, -353430, -330810, -307995, -285000, -261825, -238485, -215010,
+    -191400, -167685, -143865, -119955, -95970, -71940, -47850, -23745,
+    375, 24495, 48600, 72690, 96720, 120705, 144600, 168420,
+    192150, 215745, 239220, 262545, 285720, 308715, 331530, 354135,
+    376530, 398700, 420630, 442320, 463725, 484860, 505695, 526230,
+    546450, 566340, 585885, 605085, 623925, 642375, 660435, 678105,
+    695370, 712215, 728625, 744600, 760125, 775200, 789795, 803925,
+    817575, 830715, 843375, 855510, 867135, 878235, 888810, 898845,
+    908340, 917295, 925695, 933540, 940815, 947520, 953670, 959235,
+    964215, 968625, 972450, 975690, 978330, 980400, 981870, 982740
+};
+
+int orbitTableY[256] = {
+    375, 24495, 48600, 72690, 96720, 120705, 144600, 168420,
+    192150, 215745, 239220, 262545, 285720, 308715, 331530, 354135,
+    376530, 398700, 420630, 442320, 463725, 484860, 505695, 526230,
+    546450, 566340, 585885, 605085, 623925, 642375, 660435, 678105,
+    695370, 712215, 728625, 744600, 760125, 775200, 789795, 803925,
+    817575, 830715, 843375, 855510, 867135, 878235, 888810, 898845,
+    908340, 917295, 925695, 933540, 940815, 947520, 953670, 959235,
+    964215, 968625, 972450, 975690, 978330, 980400, 981870, 982740,
+    983025, 982725, 981825, 980340, 978255, 975600, 972330, 968490,
+    964065, 959070, 953475, 947325, 940590, 933300, 925440, 917025,
+    908055, 898545, 888495, 877905, 866775, 855135, 842985, 830310,
+    817155, 803490, 789360, 774735, 759660, 744120, 728130, 711690,
+    694845, 677565, 659880, 641805, 623340, 604500, 585285, 565725,
+    545820, 525600, 505050, 484200, 463065, 441645, 419955, 398010,
+    375840, 353430, 330810, 307995, 285000, 261825, 238485, 215010,
+    191400, 167685, 143865, 119955, 95970, 71940, 47850, 23745,
+    -375, -24495, -48600, -72690, -96720, -120705, -144600, -168420,
+    -192150, -215745, -239220, -262545, -285720, -308715, -331530, -354135,
+    -376530, -398700, -420630, -442320, -463725, -484860, -505695, -526230,
+    -546450, -566340, -585885, -605085, -623925, -642375, -660435, -678105,
+    -695370, -712215, -728625, -744600, -760125, -775200, -789795, -803925,
+    -817575, -830715, -843375, -855510, -867135, -878235, -888810, -898845,
+    -908340, -917295, -925695, -933540, -940815, -947520, -953670, -959235,
+    -964215, -968625, -972450, -975690, -978330, -980400, -981870, -982740,
+    -983025, -982725, -981825, -980340, -978255, -975600, -972330, -968490,
+    -964065, -959070, -953475, -947325, -940590, -933300, -925440, -917025,
+    -908055, -898545, -888495, -877905, -866775, -855135, -842985, -830310,
+    -817155, -803490, -789360, -774735, -759660, -744120, -728130, -711690,
+    -694845, -677565, -659880, -641805, -623340, -604485, -585285, -565725,
+    -545820, -525600, -505050, -484200, -463065, -441645, -419955, -398010,
+    -375840, -353430, -330810, -307995, -285000, -261825, -238485, -215010,
+    -191400, -167685, -143865, -119955, -95970, -71940, -47850, -23745
+};
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+// CODE --------------------------------------------------------------------
+
+//--------------------------------------------------------------------------
+//
+// Environmental Action routines
+//
+//--------------------------------------------------------------------------
+
+//==========================================================================
+//
+// A_DripBlood
+//
+//==========================================================================
+
+/*
+void A_DripBlood(mobj_t *actor)
+{
+	mobj_t *mo;
+    int r;
+
+    r = P_SubRandom();
+
+	mo = P_SpawnMobj(actor->x+(r<<11),
+		actor->y+(P_SubRandom()<<11), actor->z, MT_BLOOD);
+	mo->momx = P_SubRandom()<<10;
+	mo->momy = P_SubRandom()<<10;
+	mo->flags2 |= MF2_LOGRAV;
+}
+*/
+
+//============================================================================
+//
+// A_PotteryExplode
+//
+//============================================================================
+
+void A_PotteryExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo = NULL;
+    int i;
+
+    for (i = (P_Random() & 3) + 3; i; i--)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_POTTERYBIT1);
+        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 5));
+        mo->momz = ((P_Random() & 7) + 5) * (3 * FRACUNIT / 4);
+        mo->momx = P_SubRandom() << (FRACBITS - 6);
+        mo->momy = P_SubRandom() << (FRACBITS - 6);
+    }
+    S_StartSound(mo, SFX_POTTERY_EXPLODE);
+    if (actor->args[0])
+    {                           // Spawn an item
+        if (!nomonsters
+            || !(mobjinfo[TranslateThingType[actor->args[0]]].
+                 flags & MF_COUNTKILL))
+        {                       // Only spawn monsters if not -nomonsters
+            P_SpawnMobj(actor->x, actor->y, actor->z,
+                        TranslateThingType[actor->args[0]]);
+        }
+    }
+    P_RemoveMobj(actor);
+}
+
+//============================================================================
+//
+// A_PotteryChooseBit
+//
+//============================================================================
+
+void A_PotteryChooseBit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SetMobjState(actor, actor->info->deathstate + (P_Random() % 5) + 1);
+    actor->tics = 256 + (P_Random() << 1);
+}
+
+//============================================================================
+//
+// A_PotteryCheck
+//
+//============================================================================
+
+void A_PotteryCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    mobj_t *pmo;
+
+    if (!netgame)
+    {
+        pmo = players[consoleplayer].mo;
+        if (P_CheckSight(actor, pmo)
+	  && (abs((int)R_PointToAngle2(pmo->x, pmo->y, actor->x, actor->y)
+           - (int)pmo->angle) <= ANG45))
+        {                       // Previous state (pottery bit waiting state)
+            P_SetMobjState(actor, actor->state - &states[0] - 1);
+        }
+        else
+        {
+            return;
+        }
+    }
+    else
+    {
+        for (i = 0; i < maxplayers; i++)
+        {
+            if (!playeringame[i])
+            {
+                continue;
+            }
+            pmo = players[i].mo;
+            if (P_CheckSight(actor, pmo) 
+              && (abs((int)R_PointToAngle2(pmo->x, pmo->y, actor->x, actor->y)
+               - (int)pmo->angle) <= ANG45))
+            {                   // Previous state (pottery bit waiting state)
+                P_SetMobjState(actor, actor->state - &states[0] - 1);
+                return;
+            }
+        }
+    }
+}
+
+//============================================================================
+//
+// A_CorpseBloodDrip
+//
+//============================================================================
+
+void A_CorpseBloodDrip(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_Random() > 128)
+    {
+        return;
+    }
+    P_SpawnMobj(actor->x, actor->y, actor->z + actor->height / 2,
+                MT_CORPSEBLOODDRIP);
+}
+
+//============================================================================
+//
+// A_CorpseExplode
+//
+//============================================================================
+
+void A_CorpseExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int i;
+
+    for (i = (P_Random() & 3) + 3; i; i--)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_CORPSEBIT);
+        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 3));
+        mo->momz = ((P_Random() & 7) + 5) * (3 * FRACUNIT / 4);
+        mo->momx = P_SubRandom() << (FRACBITS - 6);
+        mo->momy = P_SubRandom() << (FRACBITS - 6);
+    }
+    // Spawn a skull
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_CORPSEBIT);
+    P_SetMobjState(mo, S_CORPSEBIT_4);
+    if (mo)
+    {
+        mo->momz = ((P_Random() & 7) + 5) * (3 * FRACUNIT / 4);
+        mo->momx = P_SubRandom() << (FRACBITS - 6);
+        mo->momy = P_SubRandom() << (FRACBITS - 6);
+        S_StartSound(mo, SFX_FIRED_DEATH);
+    }
+    P_RemoveMobj(actor);
+}
+
+//============================================================================
+//
+// A_LeafSpawn
+//
+//============================================================================
+
+void A_LeafSpawn(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int i;
+
+    for (i = (P_Random() & 3) + 1; i; i--)
+    {
+        // Official release of Hexen's source code relies on unspecified behavior
+        // the in order of function's argument evaluation,
+        // see ISO-IEC 9899-1999, [6.5.2.2.10]
+        mobjtype_t type = MT_LEAF1 + (P_Random() & 1);
+        fixed_t z = actor->z + (P_Random() << 14);
+        fixed_t y = actor->y + (P_SubRandom() << 14);
+        fixed_t x = actor->x + (P_SubRandom() << 14);
+
+        mo = P_SpawnMobj(x, y, z, type);
+        if (mo)
+        {
+            P_ThrustMobj(mo, actor->angle, (P_Random() << 9) + 3 * FRACUNIT);
+            mo->target = actor;
+            mo->special1.i = 0;
+        }
+    }
+}
+
+//============================================================================
+//
+// A_LeafThrust
+//
+//============================================================================
+
+void A_LeafThrust(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_Random() > 96)
+    {
+        return;
+    }
+    actor->momz += (P_Random() << 9) + FRACUNIT;
+}
+
+//============================================================================
+//
+// A_LeafCheck
+//
+//============================================================================
+
+void A_LeafCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->special1.i++;
+    if (actor->special1.i >= 20)
+    {
+        P_SetMobjState(actor, S_NULL);
+        return;
+    }
+    if (P_Random() > 64)
+    {
+        if (!actor->momx && !actor->momy)
+        {
+            P_ThrustMobj(actor, actor->target->angle,
+                         (P_Random() << 9) + FRACUNIT);
+        }
+        return;
+    }
+    P_SetMobjState(actor, S_LEAF1_8);
+    actor->momz = (P_Random() << 9) + FRACUNIT;
+    P_ThrustMobj(actor, actor->target->angle,
+                 (P_Random() << 9) + 2 * FRACUNIT);
+    actor->flags |= MF_MISSILE;
+}
+
+/*
+#define ORBIT_RADIUS	(15*FRACUNIT)
+void GenerateOrbitTable(void)
+{
+	int angle;
+
+	for (angle=0; angle<256; angle++)
+	{
+		orbitTableX[angle] = FixedMul(ORBIT_RADIUS, finecosine[angle<<5]);
+		orbitTableY[angle] = FixedMul(ORBIT_RADIUS, finesine[angle<<5]);
+	}
+
+	printf("int orbitTableX[256]=\n{\n");
+	for (angle=0; angle<256; angle+=8)
+	{
+		printf("%d, %d, %d, %d, %d, %d, %d, %d,\n",
+			orbitTableX[angle],
+			orbitTableX[angle+1],
+			orbitTableX[angle+2],
+			orbitTableX[angle+3],
+			orbitTableX[angle+4],
+			orbitTableX[angle+5],
+			orbitTableX[angle+6],
+			orbitTableX[angle+7]);
+	}
+	printf("};\n\n");
+
+	printf("int orbitTableY[256]=\n{\n");
+	for (angle=0; angle<256; angle+=8)
+	{
+		printf("%d, %d, %d, %d, %d, %d, %d, %d,\n",
+			orbitTableY[angle],
+			orbitTableY[angle+1],
+			orbitTableY[angle+2],
+			orbitTableY[angle+3],
+			orbitTableY[angle+4],
+			orbitTableY[angle+5],
+			orbitTableY[angle+6],
+			orbitTableY[angle+7]);
+	}
+	printf("};\n");
+}
+*/
+
+// New bridge stuff
+//      Parent
+//              special1        true == removing from world
+//
+//      Child
+//              target          pointer to center mobj
+//              args[0]         angle of ball
+
+void A_BridgeOrbit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->target->special1.i)
+    {
+        P_SetMobjState(actor, S_NULL);
+    }
+    actor->args[0] += 3;
+    actor->x = actor->target->x + orbitTableX[actor->args[0]];
+    actor->y = actor->target->y + orbitTableY[actor->args[0]];
+    actor->z = actor->target->z;
+}
+
+
+void A_BridgeInit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    byte startangle;
+    mobj_t *ball1, *ball2, *ball3;
+    fixed_t cx, cy, cz;
+
+//      GenerateOrbitTable();
+
+    cx = actor->x;
+    cy = actor->y;
+    cz = actor->z;
+    startangle = P_Random();
+    actor->special1.i = 0;
+
+    // Spawn triad into world
+    ball1 = P_SpawnMobj(cx, cy, cz, MT_BRIDGEBALL);
+    ball1->args[0] = startangle;
+    ball1->target = actor;
+
+    ball2 = P_SpawnMobj(cx, cy, cz, MT_BRIDGEBALL);
+    ball2->args[0] = (startangle + 85) & 255;
+    ball2->target = actor;
+
+    ball3 = P_SpawnMobj(cx, cy, cz, MT_BRIDGEBALL);
+    ball3->args[0] = (startangle + 170) & 255;
+    ball3->target = actor;
+
+    A_BridgeOrbit(ball1, NULL, NULL);
+    A_BridgeOrbit(ball2, NULL, NULL);
+    A_BridgeOrbit(ball3, NULL, NULL);
+}
+
+void A_BridgeRemove(mobj_t * actor)
+{
+    actor->special1.i = true;     // Removing the bridge
+    actor->flags &= ~MF_SOLID;
+    P_SetMobjState(actor, S_FREE_BRIDGE1);
+}
+
+
+//==========================================================================
+//
+// A_GhostOn
+//
+//==========================================================================
+
+/*
+void A_GhostOn(mobj_t *actor)
+{
+	actor->flags |= MF_SHADOW;
+}
+*/
+
+//==========================================================================
+//
+// A_GhostOff
+//
+//==========================================================================
+
+/*
+void A_GhostOff(mobj_t *actor)
+{
+	actor->flags &= ~MF_SHADOW;
+}
+*/
+
+//==========================================================================
+//
+// A_HideThing
+//
+//==========================================================================
+
+void A_HideThing(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 |= MF2_DONTDRAW;
+}
+
+//==========================================================================
+//
+// A_UnHideThing
+//
+//==========================================================================
+
+void A_UnHideThing(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 &= ~MF2_DONTDRAW;
+}
+
+//==========================================================================
+//
+// A_SetShootable
+//
+//==========================================================================
+
+void A_SetShootable(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 &= ~MF2_NONSHOOTABLE;
+    actor->flags |= MF_SHOOTABLE;
+}
+
+//==========================================================================
+//
+// A_UnSetShootable
+//
+//==========================================================================
+
+void A_UnSetShootable(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 |= MF2_NONSHOOTABLE;
+    actor->flags &= ~MF_SHOOTABLE;
+}
+
+//==========================================================================
+//
+// A_SetAltShadow
+//
+//==========================================================================
+
+void A_SetAltShadow(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SHADOW;
+    actor->flags |= MF_ALTSHADOW;
+}
+
+//==========================================================================
+//
+// A_UnSetAltShadow
+//
+//==========================================================================
+
+/*
+void A_UnSetAltShadow(mobj_t *actor)
+{
+	actor->flags &= ~MF_ALTSHADOW;
+}
+*/
+
+//--------------------------------------------------------------------------
+//
+// Sound Action Routines
+//
+//--------------------------------------------------------------------------
+
+//==========================================================================
+//
+// A_ContMobjSound
+//
+//==========================================================================
+
+void A_ContMobjSound(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    switch (actor->type)
+    {
+        case MT_SERPENTFX:
+            S_StartSound(actor, SFX_SERPENTFX_CONTINUOUS);
+            break;
+        case MT_HAMMER_MISSILE:
+            S_StartSound(actor, SFX_FIGHTER_HAMMER_CONTINUOUS);
+            break;
+        case MT_QUAKE_FOCUS:
+            S_StartSound(actor, SFX_EARTHQUAKE);
+            break;
+        default:
+            break;
+    }
+}
+
+//==========================================================================
+//
+// PROC A_ESound
+//
+//==========================================================================
+
+void A_ESound(mobj_t *mo, player_t *player, pspdef_t *psp)
+{
+    int sound;
+
+    switch (mo->type)
+    {
+        case MT_SOUNDWIND:
+            sound = SFX_WIND;
+            break;
+        default:
+            sound = SFX_NONE;
+            break;
+    }
+    S_StartSound(mo, sound);
+}
+
+
+
+//==========================================================================
+// Summon Minotaur -- see p_enemy for variable descriptions
+//==========================================================================
+
+
+void A_Summon(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    mobj_t *master;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_MINOTAUR);
+    if (mo)
+    {
+        if (P_TestMobjLocation(mo) == false || !actor->special1.m)
+        {                       // Didn't fit - change back to artifact
+            P_SetMobjState(mo, S_NULL);
+            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SUMMONMAULATOR);
+            if (mo)
+                mo->flags2 |= MF2_DROPPED;
+            return;
+        }
+
+        // Store leveltime into mo->args. This must be stored in little-
+        // endian format for Vanilla savegame compatibility.
+        mo->args[0] = leveltime & 0xff;
+        mo->args[1] = (leveltime >> 8) & 0xff;
+        mo->args[2] = (leveltime >> 16) & 0xff;
+        mo->args[3] = (leveltime >> 24) & 0xff;
+        master = actor->special1.m;
+        if (master->flags & MF_CORPSE)
+        {                       // Master dead
+            mo->special1.m = NULL;   // No master
+        }
+        else
+        {
+            mo->special1.m = actor->special1.m;     // Pointer to master (mobj_t *)
+            P_GivePower(master->player, pw_minotaur);
+        }
+
+        // Make smoke puff
+        P_SpawnMobj(actor->x, actor->y, actor->z, MT_MNTRSMOKE);
+        S_StartSound(actor, SFX_MAULATOR_ACTIVE);
+    }
+}
+
+
+
+//==========================================================================
+// Fog Variables:
+//
+//              args[0]         Speed (0..10) of fog
+//              args[1]         Angle of spread (0..128)
+//              args[2]         Frequency of spawn (1..10)
+//              args[3]         Lifetime countdown
+//              args[4]         Boolean: fog moving?
+//              special1                Internal:  Counter for spawn frequency
+//              special2                Internal:  Index into floatbob table
+//
+//==========================================================================
+
+void A_FogSpawn(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo = NULL;
+    angle_t delta;
+
+    if (actor->special1.i-- > 0)
+        return;
+
+    actor->special1.i = actor->args[2];   // Reset frequency count
+
+    switch (P_Random() % 3)
+    {
+        case 0:
+            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FOGPATCHS);
+            break;
+        case 1:
+            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FOGPATCHM);
+            break;
+        case 2:
+            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FOGPATCHL);
+            break;
+    }
+
+    if (mo)
+    {
+        delta = actor->args[1];
+        if (delta == 0)
+            delta = 1;
+        mo->angle =
+            actor->angle + (((P_Random() % delta) - (delta >> 1)) << 24);
+        mo->target = actor;
+        if (actor->args[0] < 1)
+            actor->args[0] = 1;
+        mo->args[0] = (P_Random() % (actor->args[0])) + 1;      // Random speed
+        mo->args[3] = actor->args[3];   // Set lifetime
+        mo->args[4] = 1;        // Set to moving
+        mo->special2.i = P_Random() & 63;
+    }
+}
+
+
+void A_FogMove(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int speed = actor->args[0] << FRACBITS;
+    angle_t angle;
+    int weaveindex;
+
+    if (!(actor->args[4]))
+        return;
+
+    if (actor->args[3]-- <= 0)
+    {
+        P_SetMobjStateNF(actor, actor->info->deathstate);
+        return;
+    }
+
+    if ((actor->args[3] % 4) == 0)
+    {
+        weaveindex = actor->special2.i;
+        actor->z += FloatBobOffsets[weaveindex] >> 1;
+        actor->special2.i = (weaveindex + 1) & 63;
+    }
+
+    angle = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(speed, finecosine[angle]);
+    actor->momy = FixedMul(speed, finesine[angle]);
+}
+
+//===========================================================================
+//
+// A_PoisonBagInit
+//
+//===========================================================================
+
+void A_PoisonBagInit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 28 * FRACUNIT,
+                     MT_POISONCLOUD);
+    if (!mo)
+    {
+        return;
+    }
+    mo->momx = 1;               // missile objects must move to impact other objects
+    mo->special1.i = 24 + (P_Random() & 7);
+    mo->special2.i = 0;
+    mo->target = actor->target;
+    mo->radius = 20 * FRACUNIT;
+    mo->height = 30 * FRACUNIT;
+    mo->flags &= ~MF_NOCLIP;
+}
+
+//===========================================================================
+//
+// A_PoisonBagCheck
+//
+//===========================================================================
+
+void A_PoisonBagCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!--actor->special1.i)
+    {
+        P_SetMobjState(actor, S_POISONCLOUD_X1);
+    }
+    else
+    {
+        return;
+    }
+}
+
+//===========================================================================
+//
+// A_PoisonBagDamage
+//
+//===========================================================================
+
+void A_PoisonBagDamage(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int bobIndex;
+
+    A_Explode(actor, player, psp);
+
+    bobIndex = actor->special2.i;
+    actor->z += FloatBobOffsets[bobIndex] >> 4;
+    actor->special2.i = (bobIndex + 1) & 63;
+}
+
+//===========================================================================
+//
+// A_PoisonShroom
+//
+//===========================================================================
+
+void A_PoisonShroom(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->tics = 128 + (P_Random() << 1);
+}
+
+//===========================================================================
+//
+// A_CheckThrowBomb
+//
+//===========================================================================
+
+void A_CheckThrowBomb(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (abs(actor->momx) < 1.5 * FRACUNIT && abs(actor->momy) < 1.5 * FRACUNIT
+        && actor->momz < 2 * FRACUNIT
+        && actor->state == &states[S_THROWINGBOMB6])
+    {
+        P_SetMobjState(actor, S_THROWINGBOMB7);
+        actor->z = actor->floorz;
+        actor->momz = 0;
+        actor->flags2 &= ~MF2_FLOORBOUNCE;
+        actor->flags &= ~MF_MISSILE;
+    }
+    if (!--actor->health)
+    {
+        P_SetMobjState(actor, actor->info->deathstate);
+    }
+}
+
+//===========================================================================
+// Quake variables
+//
+//              args[0]         Intensity on richter scale (2..9)
+//              args[1]         Duration in tics
+//              args[2]         Radius for damage
+//              args[3]         Radius for tremor
+//              args[4]         TID of map thing for focus of quake
+//
+//===========================================================================
+
+//===========================================================================
+//
+// A_LocalQuake
+//
+//===========================================================================
+
+boolean A_LocalQuake(byte * args, mobj_t * actor)
+{
+    mobj_t *focus, *target;
+    int lastfound = 0;
+    int success = false;
+
+    // Find all quake foci
+    do
+    {
+        target = P_FindMobjFromTID(args[4], &lastfound);
+        if (target)
+        {
+            focus = P_SpawnMobj(target->x,
+                                target->y, target->z, MT_QUAKE_FOCUS);
+            if (focus)
+            {
+                focus->args[0] = args[0];
+                focus->args[1] = args[1] >> 1;  // decremented every 2 tics
+                focus->args[2] = args[2];
+                focus->args[3] = args[3];
+                focus->args[4] = args[4];
+                success = true;
+            }
+        }
+    }
+    while (target != NULL);
+
+    return (success);
+}
+
+
+//===========================================================================
+//
+// A_Quake
+//
+//===========================================================================
+int localQuakeHappening[MAXPLAYERS];
+
+void A_Quake(mobj_t *actor, player_t *player_param, pspdef_t *psp)
+{
+    angle_t an;
+    player_t *player;
+    mobj_t *victim;
+    int richters = actor->args[0];
+    int playnum;
+    fixed_t dist;
+
+    if (actor->args[1]-- > 0)
+    {
+        for (playnum = 0; playnum < maxplayers; playnum++)
+        {
+            player = &players[playnum];
+            if (!playeringame[playnum])
+                continue;
+
+            victim = player->mo;
+            dist = P_AproxDistance(actor->x - victim->x,
+                                   actor->y - victim->y) >> (FRACBITS + 6);
+            // Tested in tile units (64 pixels)
+            if (dist < actor->args[3])  // In tremor radius
+            {
+                localQuakeHappening[playnum] = richters;
+            }
+            // Check if in damage radius
+            if ((dist < actor->args[2]) && (victim->z <= victim->floorz))
+            {
+                if (P_Random() < 50)
+                {
+                    P_DamageMobj(victim, NULL, NULL, HITDICE(1));
+                }
+                // Thrust player around
+                an = victim->angle + ANG1 * P_Random();
+                P_ThrustMobj(victim, an, richters << (FRACBITS - 1));
+            }
+        }
+    }
+    else
+    {
+        for (playnum = 0; playnum < maxplayers; playnum++)
+        {
+            localQuakeHappening[playnum] = false;
+        }
+        P_SetMobjState(actor, S_NULL);
+    }
+}
+
+
+
+
+//===========================================================================
+//
+// Teleport other stuff
+//
+//===========================================================================
+
+#define TELEPORT_LIFE 1
+
+void A_TeloSpawnA(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX2);
+    if (mo)
+    {
+        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
+        mo->angle = actor->angle;
+        mo->target = actor->target;
+        mo->momx = actor->momx >> 1;
+        mo->momy = actor->momy >> 1;
+        mo->momz = actor->momz >> 1;
+    }
+}
+
+void A_TeloSpawnB(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX3);
+    if (mo)
+    {
+        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
+        mo->angle = actor->angle;
+        mo->target = actor->target;
+        mo->momx = actor->momx >> 1;
+        mo->momy = actor->momy >> 1;
+        mo->momz = actor->momz >> 1;
+    }
+}
+
+void A_TeloSpawnC(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX4);
+    if (mo)
+    {
+        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
+        mo->angle = actor->angle;
+        mo->target = actor->target;
+        mo->momx = actor->momx >> 1;
+        mo->momy = actor->momy >> 1;
+        mo->momz = actor->momz >> 1;
+    }
+}
+
+void A_TeloSpawnD(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX5);
+    if (mo)
+    {
+        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
+        mo->angle = actor->angle;
+        mo->target = actor->target;
+        mo->momx = actor->momx >> 1;
+        mo->momy = actor->momy >> 1;
+        mo->momz = actor->momz >> 1;
+    }
+}
+
+void A_CheckTeleRing(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special1.i-- <= 0)
+    {
+        P_SetMobjState(actor, actor->info->deathstate);
+    }
+}
+
+
+
+
+// Dirt stuff
+
+void P_SpawnDirt(mobj_t * actor, fixed_t radius)
+{
+    fixed_t x, y, z;
+    int dtype = 0;
+    mobj_t *mo;
+    angle_t angle;
+
+    angle = P_Random() << 5;    // <<24 >>19
+    x = actor->x + FixedMul(radius, finecosine[angle]);
+    y = actor->y + FixedMul(radius, finesine[angle]);
+//      x = actor->x + (P_SubRandom()%radius)<<FRACBITS;
+//      y = actor->y + ((P_SubRandom()<<FRACBITS)%radius);
+    z = actor->z + (P_Random() << 9) + FRACUNIT;
+    switch (P_Random() % 6)
+    {
+        case 0:
+            dtype = MT_DIRT1;
+            break;
+        case 1:
+            dtype = MT_DIRT2;
+            break;
+        case 2:
+            dtype = MT_DIRT3;
+            break;
+        case 3:
+            dtype = MT_DIRT4;
+            break;
+        case 4:
+            dtype = MT_DIRT5;
+            break;
+        case 5:
+            dtype = MT_DIRT6;
+            break;
+    }
+    mo = P_SpawnMobj(x, y, z, dtype);
+    if (mo)
+    {
+        mo->momz = P_Random() << 10;
+    }
+}
+
+
+
+
+//===========================================================================
+//
+// Thrust floor stuff
+//
+// Thrust Spike Variables
+//              special1                pointer to dirt clump mobj
+//              special2                speed of raise
+//              args[0]         0 = lowered,  1 = raised
+//              args[1]         0 = normal,   1 = bloody
+//===========================================================================
+
+void A_ThrustInitUp(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->special2.i = 5;        // Raise speed
+    actor->args[0] = 1;         // Mark as up
+    actor->floorclip = 0;
+    actor->flags = MF_SOLID;
+    actor->flags2 = MF2_NOTELEPORT | MF2_FLOORCLIP;
+    actor->special1.m = NULL;
+}
+
+void A_ThrustInitDn(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    actor->special2.i = 5;        // Raise speed
+    actor->args[0] = 0;         // Mark as down
+    actor->floorclip = actor->info->height;
+    actor->flags = 0;
+    actor->flags2 = MF2_NOTELEPORT | MF2_FLOORCLIP | MF2_DONTDRAW;
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_DIRTCLUMP);
+    actor->special1.m = mo;
+}
+
+
+void A_ThrustRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (A_RaiseMobj(actor))
+    {                           // Reached it's target height
+        actor->args[0] = 1;
+        if (actor->args[1])
+            P_SetMobjStateNF(actor, S_BTHRUSTINIT2_1);
+        else
+            P_SetMobjStateNF(actor, S_THRUSTINIT2_1);
+    }
+
+    // Lose the dirt clump
+    if ((actor->floorclip < actor->height) && actor->special1.m)
+    {
+        P_RemoveMobj(actor->special1.m);
+        actor->special1.m = NULL;
+    }
+
+    // Spawn some dirt
+    if (P_Random() < 40)
+        P_SpawnDirt(actor, actor->radius);
+    actor->special2.i++;          // Increase raise speed
+}
+
+void A_ThrustLower(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (A_SinkMobj(actor))
+    {
+        actor->args[0] = 0;
+        if (actor->args[1])
+            P_SetMobjStateNF(actor, S_BTHRUSTINIT1_1);
+        else
+            P_SetMobjStateNF(actor, S_THRUSTINIT1_1);
+    }
+}
+
+void A_ThrustBlock(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags |= MF_SOLID;
+}
+
+void A_ThrustImpale(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    // Impale all shootables in radius
+    PIT_ThrustSpike(actor);
+}
+
+//===========================================================================
+//
+// A_SoAExplode - Suit of Armor Explode
+//
+//===========================================================================
+
+void A_SoAExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int i;
+    int r1,r2,r3;
+
+    for (i = 0; i < 10; i++)
+    {
+        r1 = P_Random();
+        r2 = P_Random();
+        r3 = P_Random();
+        mo = P_SpawnMobj(actor->x + ((r3 - 128) << 12),
+                         actor->y + ((r2 - 128) << 12),
+                         actor->z + (r1 * actor->height / 256),
+                         MT_ZARMORCHUNK);
+        P_SetMobjState(mo, mo->info->spawnstate + i);
+        mo->momz = ((P_Random() & 7) + 5) * FRACUNIT;
+        mo->momx = P_SubRandom() << (FRACBITS - 6);
+        mo->momy = P_SubRandom() << (FRACBITS - 6);
+    }
+    if (actor->args[0])
+    {                           // Spawn an item
+        if ((gameversion != exe_hexen_1_1r2) || !nomonsters
+            || !(mobjinfo[TranslateThingType[actor->args[0]]].
+                 flags & MF_COUNTKILL))
+        {                       // Only spawn monsters if not -nomonsters
+            P_SpawnMobj(actor->x, actor->y, actor->z,
+                        TranslateThingType[actor->args[0]]);
+        }
+    }
+    S_StartSound(mo, SFX_SUITOFARMOR_BREAK);
+    P_RemoveMobj(actor);
+}
+
+//===========================================================================
+//
+// A_BellReset1
+//
+//===========================================================================
+
+void A_BellReset1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags |= MF_NOGRAVITY;
+    actor->height <<= 2;
+}
+
+//===========================================================================
+//
+// A_BellReset2
+//
+//===========================================================================
+
+void A_BellReset2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags |= MF_SHOOTABLE;
+    actor->flags &= ~MF_CORPSE;
+    actor->health = 5;
+}
+
+
+//===========================================================================
+//
+// A_FlameCheck
+//
+//===========================================================================
+
+void A_FlameCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->args[0]--)      // Called every 8 tics
+    {
+        P_SetMobjState(actor, S_NULL);
+    }
+}
+
+
+//===========================================================================
+// Bat Spawner Variables
+//      special1        frequency counter
+//      special2        
+//      args[0]         frequency of spawn (1=fastest, 10=slowest)
+//      args[1]         spread angle (0..255)
+//      args[2]         
+//      args[3]         duration of bats (in octics)
+//      args[4]         turn amount per move (in degrees)
+//
+// Bat Variables
+//      special2        lifetime counter
+//      args[4]         turn amount per move (in degrees)
+//===========================================================================
+
+void A_BatSpawnInit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->special1.i = 0;        // Frequency count
+}
+
+void A_BatSpawn(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int delta;
+    angle_t angle;
+
+    // Countdown until next spawn
+    if (actor->special1.i-- > 0)
+        return;
+    actor->special1.i = actor->args[0];   // Reset frequency count
+
+    delta = actor->args[1];
+    if (delta == 0)
+        delta = 1;
+    angle = actor->angle + (((P_Random() % delta) - (delta >> 1)) << 24);
+    mo = P_SpawnMissileAngle(actor, MT_BAT, angle, 0);
+    if (mo)
+    {
+        mo->args[0] = P_Random() & 63;  // floatbob index
+        mo->args[4] = actor->args[4];   // turn degrees
+        mo->special2.i = actor->args[3] << 3;     // Set lifetime
+        mo->target = actor;
+    }
+}
+
+
+void A_BatMove(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t newangle;
+    fixed_t speed;
+
+    if (actor->special2.i < 0)
+    {
+        P_SetMobjState(actor, actor->info->deathstate);
+    }
+    actor->special2.i -= 2;       // Called every 2 tics
+
+    if (P_Random() < 128)
+    {
+        newangle = actor->angle + ANG1 * actor->args[4];
+    }
+    else
+    {
+        newangle = actor->angle - ANG1 * actor->args[4];
+    }
+
+    // Adjust momentum vector to new direction
+    newangle >>= ANGLETOFINESHIFT;
+    speed = FixedMul(actor->info->speed, P_Random() << 10);
+    actor->momx = FixedMul(speed, finecosine[newangle]);
+    actor->momy = FixedMul(speed, finesine[newangle]);
+
+    if (P_Random() < 15)
+        S_StartSound(actor, SFX_BAT_SCREAM);
+
+    // Handle Z movement
+    actor->z = actor->target->z + 2 * FloatBobOffsets[actor->args[0]];
+    actor->args[0] = (actor->args[0] + 3) & 63;
+}
+
+//===========================================================================
+//
+// A_TreeDeath
+//
+//===========================================================================
+
+void A_TreeDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!(actor->flags2 & MF2_FIREDAMAGE))
+    {
+        actor->height <<= 2;
+        actor->flags |= MF_SHOOTABLE;
+        actor->flags &= ~(MF_CORPSE + MF_DROPOFF);
+        actor->health = 35;
+        return;
+    }
+    else
+    {
+        P_SetMobjState(actor, actor->info->meleestate);
+    }
+}
+
+//===========================================================================
+//
+// A_NoGravity
+//
+//===========================================================================
+
+void A_NoGravity(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags |= MF_NOGRAVITY;
+}
diff --git a/games/NXDoom/src/hexen/am_data.h b/games/NXDoom/src/hexen/am_data.h
new file mode 100644
index 000000000..26589a25c
--- /dev/null
+++ b/games/NXDoom/src/hexen/am_data.h
@@ -0,0 +1,109 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef __AMDATA_H__
+#define __AMDATA_H__
+
+// a line drawing of the player pointing right, starting from the middle.
+
+#define R ((8*PLAYERRADIUS)/7)
+
+mline_t player_arrow[] = {
+  { { -R+R/4, 0 }, { 0, 0} }, // center line.
+  { { -R+R/4, R/8 }, { R, 0} }, // blade
+  { { -R+R/4, -R/8 }, { R, 0 } },
+  { { -R+R/4, -R/4 }, { -R+R/4, R/4 } }, // crosspiece
+  { { -R+R/8, -R/4 }, { -R+R/8, R/4 } },
+  { { -R+R/8, -R/4 }, { -R+R/4, -R/4} }, //crosspiece connectors
+  { { -R+R/8, R/4 }, { -R+R/4, R/4} },
+  { { -R-R/4, R/8 }, { -R-R/4, -R/8 } }, //pommel
+  { { -R-R/4, R/8 }, { -R+R/8, R/8 } },
+  { { -R-R/4, -R/8}, { -R+R/8, -R/8 } }
+  };
+
+/*
+mline_t keysquare[] = {
+	{ { 0, 0 }, { R/4, -R/2 } },
+	{ { R/4, -R/2 }, { R/2, -R/2 } },
+	{ { R/2, -R/2 }, { R/2, R/2 } },
+	{ { R/2, R/2 }, { R/4, R/2 } },
+	{ { R/4, R/2 }, { 0, 0 } }, // handle part type thing
+	{ { 0, 0 }, { -R, 0 } }, // stem
+	{ { -R, 0 }, { -R, -R/2 } }, // end lockpick part
+	{ { -3*R/4, 0 }, { -3*R/4, -R/4 } }
+	};
+*/
+
+/*mline_t player_arrow[] = {
+  { { -R+R/8, 0 }, { R, 0 } }, // -----
+  { { R, 0 }, { R-R/2, R/4 } },  // ----->
+  { { R, 0 }, { R-R/2, -R/4 } },
+  { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
+  { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
+  { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
+  { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
+  };
+*/
+#undef R
+#define NUMPLYRLINES (sizeof(player_arrow)/sizeof(mline_t))
+#define NUMKEYSQUARELINES (sizeof(keysquare)/sizeof(mline_t))
+
+/*
+#define R ((8*PLAYERRADIUS)/7)
+mline_t cheat_player_arrow[] = {
+  { { -R+R/8, 0 }, { R, 0 } }, // -----
+  { { R, 0 }, { R-R/2, R/6 } },  // ----->
+  { { R, 0 }, { R-R/2, -R/6 } },
+  { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
+  { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
+  { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
+  { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
+  { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
+  { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
+  { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
+  { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
+  { { -R/6, -R/6 }, { 0, -R/6 } },
+  { { 0, -R/6 }, { 0, R/4 } },
+  { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
+  { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
+  { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
+  };
+#undef R
+#define NUMCHEATPLYRLINES (sizeof(cheat_player_arrow)/sizeof(mline_t))
+*/
+
+
+/*
+#define R (FRACUNIT)
+mline_t triangle_guy[] = {
+  { { -.867*R, -.5*R }, { .867*R, -.5*R } },
+  { { .867*R, -.5*R } , { 0, R } },
+  { { 0, R }, { -.867*R, -.5*R } }
+  };
+#undef R
+#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
+*/
+
+#define R (FRACUNIT)
+mline_t thintriangle_guy[] = {
+  { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
+  { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+  { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
+  };
+#undef R
+#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
+
+#endif
diff --git a/games/NXDoom/src/hexen/am_map.c b/games/NXDoom/src/hexen/am_map.c
new file mode 100644
index 000000000..34985dc5d
--- /dev/null
+++ b/games/NXDoom/src/hexen/am_map.c
@@ -0,0 +1,1544 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+
+#include "h2def.h"
+#include "doomkeys.h"
+#include "i_video.h"
+#include "i_swap.h"
+#include "i_timer.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "am_map.h"
+#include "am_data.h"
+#include "v_video.h"
+
+#define NUMALIAS 3              // Number of antialiased lines.
+
+int cheating = 0;
+static int grid = 0;
+
+boolean automapactive = false;
+static int finit_width = SCREENWIDTH;
+static int finit_height = SCREENHEIGHT - SBARHEIGHT - 3;
+static int f_x, f_y;            // location of window on screen
+static int f_w, f_h;            // size of window on screen
+static int lightlev;            // used for funky strobing effect
+static byte *fb;                // pseudo-frame buffer
+static int amclock;
+
+static mpoint_t m_paninc;       // how far the window pans each tic (map coords)
+static fixed_t mtof_zoommul;    // how far the window zooms in each tic (map coords)
+static fixed_t ftom_zoommul;    // how far the window zooms in each tic (fb coords)
+
+static fixed_t m_x, m_y;        // LL x,y where the window is on the map (map coords)
+static fixed_t m_x2, m_y2;      // UR x,y where the window is on the map (map coords)
+
+// width/height of window on map (map coords)
+static fixed_t m_w, m_h;
+static fixed_t min_x, min_y;    // based on level size
+static fixed_t max_x, max_y;    // based on level size
+static fixed_t max_w, max_h;    // max_x-min_x, max_y-min_y
+static fixed_t min_w, min_h;    // based on player size
+static fixed_t min_scale_mtof;  // used to tell when to stop zooming out
+static fixed_t max_scale_mtof;  // used to tell when to stop zooming in
+
+// old stuff for recovery later
+static fixed_t old_m_w, old_m_h;
+static fixed_t old_m_x, old_m_y;
+
+// old location used by the Follower routine
+static mpoint_t f_oldloc;
+
+// used by MTOF to scale from map-to-frame-buffer coords
+static fixed_t scale_mtof = INITSCALEMTOF;
+// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
+static fixed_t scale_ftom;
+
+static player_t *plr;           // the player represented by an arrow
+static vertex_t oldplr;
+
+//static patch_t *marknums[10]; // numbers used for marking by the automap
+//static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
+//static int markpointnum = 0; // next point to be assigned
+
+static int followplayer = 1;    // specifies whether to follow the player around
+
+static char cheat_kills[] = { 'k', 'i', 'l', 'l', 's' };
+static boolean ShowKills = 0;
+static unsigned ShowKillsCount = 0;
+
+static byte antialias[NUMALIAS][8] = {
+    {83, 84, 85, 86, 87, 88, 89, 90},
+    {96, 96, 95, 94, 93, 92, 91, 90},
+    {107, 108, 109, 110, 111, 112, 89, 90}
+};
+
+/*
+static byte *aliasmax[NUMALIAS] = {
+	&antialias[0][7], &antialias[1][7], &antialias[2][7]
+};*/
+
+static byte *maplump;           // pointer to the raw data for the automap background.
+static short mapystart = 0;     // y-value for the start of the map bitmap...used in
+                                                                                //the parallax stuff.
+static short mapxstart = 0;     //x-value for the bitmap.
+
+//byte screens[][SCREENWIDTH*SCREENHEIGHT];
+//void V_MarkRect (int x, int y, int width, int height);
+
+// Functions
+
+void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
+                int NumLevels, unsigned short IntensityBits);
+
+void AM_DrawDeathmatchStats(void);
+static void DrawWorldTimer(void);
+
+// Calculates the slope and slope according to the x-axis of a line
+// segment in map coordinates (with the upright y-axis n' all) so
+// that it can be used with the brain-dead drawing stuff.
+
+// Ripped out for Heretic
+/*
+void AM_getIslope(mline_t *ml, islope_t *is)
+{
+  int dx, dy;
+
+  dy = ml->a.y - ml->b.y;
+  dx = ml->b.x - ml->a.x;
+  if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
+  else is->islp = FixedDiv(dx, dy);
+  if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
+  else is->slp = FixedDiv(dy, dx);
+}
+*/
+
+void AM_activateNewScale(void)
+{
+    m_x += m_w / 2;
+    m_y += m_h / 2;
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+    m_x -= m_w / 2;
+    m_y -= m_h / 2;
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+void AM_saveScaleAndLoc(void)
+{
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+}
+
+void AM_restoreScaleAndLoc(void)
+{
+
+    m_w = old_m_w;
+    m_h = old_m_h;
+    if (!followplayer)
+    {
+        m_x = old_m_x;
+        m_y = old_m_y;
+    }
+    else
+    {
+        m_x = plr->mo->x - m_w / 2;
+        m_y = plr->mo->y - m_h / 2;
+    }
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+
+    // Change the scaling multipliers
+    scale_mtof = FixedDiv(f_w << FRACBITS, m_w);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+// adds a marker at the current location
+
+/*
+void AM_addMark(void)
+{
+  markpoints[markpointnum].x = m_x + m_w/2;
+  markpoints[markpointnum].y = m_y + m_h/2;
+  markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
+
+}
+*/
+void AM_findMinMaxBoundaries(void)
+{
+    int i;
+    fixed_t a, b;
+
+    min_x = min_y = INT_MAX;
+    max_x = max_y = -INT_MAX;
+    for (i = 0; i < numvertexes; i++)
+    {
+        if (vertexes[i].x < min_x)
+            min_x = vertexes[i].x;
+        else if (vertexes[i].x > max_x)
+            max_x = vertexes[i].x;
+        if (vertexes[i].y < min_y)
+            min_y = vertexes[i].y;
+        else if (vertexes[i].y > max_y)
+            max_y = vertexes[i].y;
+    }
+    max_w = max_x - min_x;
+    max_h = max_y - min_y;
+    min_w = 2 * PLAYERRADIUS;
+    min_h = 2 * PLAYERRADIUS;
+
+    a = FixedDiv(f_w << FRACBITS, max_w);
+    b = FixedDiv(f_h << FRACBITS, max_h);
+    min_scale_mtof = a < b ? a : b;
+
+    max_scale_mtof = FixedDiv(f_h << FRACBITS, 2 * PLAYERRADIUS);
+
+}
+
+void AM_changeWindowLoc(void)
+{
+    if (m_paninc.x || m_paninc.y)
+    {
+        followplayer = 0;
+        f_oldloc.x = INT_MAX;
+    }
+
+    m_x += m_paninc.x;
+    m_y += m_paninc.y;
+
+    if (m_x + m_w / 2 > max_x)
+    {
+        m_x = max_x - m_w / 2;
+        m_paninc.x = 0;
+    }
+    else if (m_x + m_w / 2 < min_x)
+    {
+        m_x = min_x - m_w / 2;
+        m_paninc.x = 0;
+    }
+    if (m_y + m_h / 2 > max_y)
+    {
+        m_y = max_y - m_h / 2;
+        m_paninc.y = 0;
+    }
+    else if (m_y + m_h / 2 < min_y)
+    {
+        m_y = min_y - m_h / 2;
+        m_paninc.y = 0;
+    }
+
+    // The following code was commented out in the released Hexen source,
+    // but I believe we need to do this here to stop the background moving
+    // when we reach the map boundaries. (In the released source it's done
+    // in AM_clearFB).
+    mapxstart += MTOF(m_paninc.x+FRACUNIT/2);
+    mapystart -= MTOF(m_paninc.y+FRACUNIT/2);
+    if(mapxstart >= finit_width)
+        mapxstart -= finit_width;
+    if(mapxstart < 0)
+        mapxstart += finit_width;
+    if(mapystart >= finit_height)
+        mapystart -= finit_height;
+    if(mapystart < 0)
+        mapystart += finit_height;
+    // - end of code that was commented-out
+
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+void AM_initVariables(void)
+{
+    int pnum;
+    thinker_t *think;
+
+    //static event_t st_notify = { ev_keyup, AM_MSGENTERED };
+
+    automapactive = true;
+    fb = I_VideoBuffer;
+
+    f_oldloc.x = INT_MAX;
+    amclock = 0;
+    lightlev = 0;
+
+    m_paninc.x = m_paninc.y = 0;
+    ftom_zoommul = FRACUNIT;
+    mtof_zoommul = FRACUNIT;
+
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+
+    // find player to center on initially
+    if (!playeringame[pnum = consoleplayer])
+        for (pnum = 0; pnum < maxplayers; pnum++)
+            if (playeringame[pnum])
+                break;
+    plr = &players[pnum];
+    oldplr.x = plr->mo->x;
+    oldplr.y = plr->mo->y;
+    m_x = plr->mo->x - m_w / 2;
+    m_y = plr->mo->y - m_h / 2;
+    AM_changeWindowLoc();
+
+    // for saving & restoring
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+
+    // load in the location of keys, if in baby mode
+
+//      memset(KeyPoints, 0, sizeof(vertex_t)*3);
+    if (gameskill == sk_baby)
+    {
+        for (think = thinkercap.next; think != &thinkercap;
+             think = think->next)
+        {
+            if (think->function != P_MobjThinker)
+            {                   //not a mobj
+                continue;
+            }
+        }
+    }
+
+    // inform the status bar of the change
+//c  ST_Responder(&st_notify);
+}
+
+void AM_loadPics(void)
+{
+    maplump = W_CacheLumpName("AUTOPAGE", PU_STATIC);
+}
+
+
+/*
+void AM_clearMarks(void)
+{
+  int i;
+  for (i=0;i<AM_NUMMARKPOINTS;i++) markpoints[i].x = -1; // means empty
+  markpointnum = 0;
+}
+*/
+
+// should be called at the start of every level
+// right now, i figure it out myself
+
+void AM_LevelInit(void)
+{
+    f_x = f_y = 0;
+    f_w = finit_width;
+    f_h = finit_height;
+    mapxstart = mapystart = 0;
+
+
+//  AM_clearMarks();
+
+    AM_findMinMaxBoundaries();
+    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7 * FRACUNIT));
+    if (scale_mtof > max_scale_mtof)
+        scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+static boolean stopped = true;
+
+void AM_Stop(void)
+{
+    //static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
+
+//  AM_unloadPics();
+    automapactive = false;
+//  ST_Responder(&st_notify);
+    stopped = true;
+    BorderNeedRefresh = true;
+}
+
+void AM_Start(void)
+{
+    static int lastlevel = -1, lastepisode = -1;
+
+    if (!stopped)
+        AM_Stop();
+    stopped = false;
+    if (gamestate != GS_LEVEL)
+    {
+        return;                 // don't show automap if we aren't in a game!
+    }
+    if (lastlevel != gamemap || lastepisode != gameepisode)
+    {
+        AM_LevelInit();
+        lastlevel = gamemap;
+        lastepisode = gameepisode;
+    }
+    AM_initVariables();
+    AM_loadPics();
+}
+
+// set the window scale to the maximum size
+
+void AM_minOutWindowScale(void)
+{
+    scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+// set the window scale to the minimum size
+
+void AM_maxOutWindowScale(void)
+{
+    scale_mtof = max_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+boolean AM_Responder(event_t * ev)
+{
+    int rc;
+    int key;
+    static int bigstate = 0;
+    static int joywait = 0;
+
+    key = ev->data1;
+
+    if (ev->type == ev_joystick && joybautomap >= 0
+        && (ev->data1 & (1 << joybautomap)) != 0 && joywait < I_GetTime())
+    {
+        joywait = I_GetTime() + 5;
+
+        if (!automapactive)
+        {
+            AM_Start ();
+            SB_state = -1;
+            viewactive = false;
+        }
+        else
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+            SB_state = -1;
+        }
+
+        return true;
+    }
+
+
+    rc = false;
+    if (!automapactive)
+    {
+        if (ev->type == ev_keydown && key == key_map_toggle
+            && gamestate == GS_LEVEL)
+        {
+            AM_Start();
+            SB_state = -1;
+            viewactive = false;
+            rc = true;
+        }
+    }
+    else if (ev->type == ev_keydown)
+    {
+        rc = true;
+
+        if (key == key_map_east)                 // pan right
+        {
+            if (!followplayer)
+                m_paninc.x = FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_west)                   // pan left
+        {
+            if (!followplayer)
+                m_paninc.x = -FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_north)             // pan up
+        {
+            if (!followplayer)
+                m_paninc.y = FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_south)                   // pan down
+        {
+            if (!followplayer)
+                m_paninc.y = -FTOM(F_PANINC);
+            else
+                rc = false;
+        }
+        else if (key == key_map_zoomout)                   // zoom out
+        {
+            mtof_zoommul = M_ZOOMOUT;
+            ftom_zoommul = M_ZOOMIN;
+        }
+        else if (key == key_map_zoomin)            // zoom in
+        {
+            mtof_zoommul = M_ZOOMIN;
+            ftom_zoommul = M_ZOOMOUT;
+        }
+        else if (key == key_map_toggle)
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop();
+            SB_state = -1;
+        }
+        else if (key == key_map_maxzoom)
+        {
+            bigstate = !bigstate;
+            if (bigstate)
+            {
+                AM_saveScaleAndLoc();
+                AM_minOutWindowScale();
+            }
+            else
+                AM_restoreScaleAndLoc();
+        }
+        else if (key == key_map_follow)
+        {
+            followplayer = !followplayer;
+            f_oldloc.x = INT_MAX;
+            P_SetMessage(plr,
+                         followplayer ? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF,
+                         true);
+        }
+        else
+        {
+            rc = false;
+        }
+
+        if (cheat_kills[ShowKillsCount] == ev->data1 && netgame && deathmatch)
+        {
+            ShowKillsCount++;
+            if (ShowKillsCount == 5)
+            {
+                ShowKillsCount = 0;
+                rc = false;
+                ShowKills ^= 1;
+            }
+        }
+        else
+        {
+            ShowKillsCount = 0;
+        }
+    }
+    else if (ev->type == ev_keyup)
+    {
+        rc = false;
+
+        if (key == key_map_east)
+        {
+            if (!followplayer)
+                m_paninc.x = 0;
+        }
+        else if (key == key_map_west)
+        {
+            if (!followplayer)
+                m_paninc.x = 0;
+        }
+        else if (key == key_map_north)
+        {
+            if (!followplayer)
+                m_paninc.y = 0;
+        }
+        else if (key == key_map_south)
+        {
+            if (!followplayer)
+                m_paninc.y = 0;
+        }
+        else if (key == key_map_zoomin || key == key_map_zoomout)
+        {
+            mtof_zoommul = FRACUNIT;
+            ftom_zoommul = FRACUNIT;
+        }
+    }
+    return rc;
+}
+
+void AM_changeWindowScale(void)
+{
+
+    // Change the scaling multipliers
+    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+
+    if (scale_mtof < min_scale_mtof)
+        AM_minOutWindowScale();
+    else if (scale_mtof > max_scale_mtof)
+        AM_maxOutWindowScale();
+    else
+        AM_activateNewScale();
+}
+
+void AM_doFollowPlayer(void)
+{
+    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
+    {
+//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
+//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
+//  m_x = plr->mo->x - m_w/2;
+//  m_y = plr->mo->y - m_h/2;
+        m_x = FTOM(MTOF(plr->mo->x)) - m_w / 2;
+        m_y = FTOM(MTOF(plr->mo->y)) - m_h / 2;
+        m_x2 = m_x + m_w;
+        m_y2 = m_y + m_h;
+
+        // do the parallax parchment scrolling.
+/*
+	 dmapx = (MTOF(plr->mo->x)-MTOF(f_oldloc.x)); //fixed point
+	 dmapy = (MTOF(f_oldloc.y)-MTOF(plr->mo->y));
+
+	 if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
+		dmapx=0;  //goes into the automap.
+	 mapxstart += dmapx;
+	 mapystart += dmapy;
+
+  	 while(mapxstart >= finit_width)
+			mapxstart -= finit_width;
+    while(mapxstart < 0)
+			mapxstart += finit_width;
+    while(mapystart >= finit_height)
+			mapystart -= finit_height;
+    while(mapystart < 0)
+			mapystart += finit_height;
+*/
+        f_oldloc.x = plr->mo->x;
+        f_oldloc.y = plr->mo->y;
+    }
+}
+
+// Ripped out for Heretic
+/*
+void AM_updateLightLev(void)
+{
+  static nexttic = 0;
+//static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
+  static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
+  static int litelevelscnt = 0;
+
+  // Change light level
+  if (amclock>nexttic)
+  {
+    lightlev = litelevels[litelevelscnt++];
+    if (litelevelscnt == sizeof(litelevels)/sizeof(int)) litelevelscnt = 0;
+    nexttic = amclock + 6 - (amclock % 6);
+  }
+}
+*/
+
+void AM_Ticker(void)
+{
+
+    if (!automapactive)
+        return;
+
+    amclock++;
+
+    if (followplayer)
+        AM_doFollowPlayer();
+
+    // Change the zoom if necessary
+    if (ftom_zoommul != FRACUNIT)
+        AM_changeWindowScale();
+
+    // Change x,y location
+    if (m_paninc.x || m_paninc.y)
+        AM_changeWindowLoc();
+    // Update light level
+// AM_updateLightLev();
+
+}
+
+void AM_clearFB(int color)
+{
+    int i, j;
+    int dmapx;
+    int dmapy;
+
+    if (followplayer)
+    {
+        dmapx = (MTOF(plr->mo->x) - MTOF(oldplr.x));    //fixed point
+        dmapy = (MTOF(oldplr.y) - MTOF(plr->mo->y));
+
+        oldplr.x = plr->mo->x;
+        oldplr.y = plr->mo->y;
+//              if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
+//                      dmapx=0;  //goes into the automap.
+        mapxstart += dmapx >> 1;
+        mapystart += dmapy >> 1;
+
+        while (mapxstart >= finit_width)
+            mapxstart -= finit_width;
+        while (mapxstart < 0)
+            mapxstart += finit_width;
+        while (mapystart >= finit_height)
+            mapystart -= finit_height;
+        while (mapystart < 0)
+            mapystart += finit_height;
+    }
+    else
+    {
+        // The released Hexen source does this here, but this causes a bug
+        // where the map background keeps moving when we reach the map
+        // boundaries. This is instead done in AM_changeWindowLoc.
+        /*
+        mapxstart += (MTOF(m_paninc.x) >> 1);
+        mapystart -= (MTOF(m_paninc.y) >> 1);
+        if (mapxstart >= finit_width)
+            mapxstart -= finit_width;
+        if (mapxstart < 0)
+            mapxstart += finit_width;
+        if (mapystart >= finit_height)
+            mapystart -= finit_height;
+        if (mapystart < 0)
+            mapystart += finit_height;
+        */
+    }
+
+    //blit the automap background to the screen.
+    j = mapystart * finit_width;
+    for (i = 0; i < SCREENHEIGHT - SBARHEIGHT; i++)
+    {
+        memcpy(I_VideoBuffer + i * finit_width, maplump + j + mapxstart,
+               finit_width - mapxstart);
+        memcpy(I_VideoBuffer + i * finit_width + finit_width - mapxstart,
+               maplump + j, mapxstart);
+        j += finit_width;
+        if (j >= finit_height * finit_width)
+            j = 0;
+    }
+
+//       memcpy(I_VideoBuffer, maplump, finit_width*finit_height);
+//  memset(fb, color, f_w*f_h);
+}
+
+// Based on Cohen-Sutherland clipping algorithm but with a slightly
+// faster reject and precalculated slopes.  If I need the speed, will
+// hash algorithm to the common cases.
+
+boolean AM_clipMline(mline_t * ml, fline_t * fl)
+{
+    enum
+    { LEFT = 1, RIGHT = 2, BOTTOM = 4, TOP = 8 };
+    int outcode1 = 0, outcode2 = 0, outside;
+    fpoint_t tmp = { 0, 0 };
+    int dx, dy;
+
+#define DOOUTCODE(oc, mx, my) \
+  (oc) = 0; \
+  if ((my) < 0) (oc) |= TOP; \
+  else if ((my) >= f_h) (oc) |= BOTTOM; \
+  if ((mx) < 0) (oc) |= LEFT; \
+  else if ((mx) >= f_w) (oc) |= RIGHT
+
+    // do trivial rejects and outcodes
+    if (ml->a.y > m_y2)
+        outcode1 = TOP;
+    else if (ml->a.y < m_y)
+        outcode1 = BOTTOM;
+    if (ml->b.y > m_y2)
+        outcode2 = TOP;
+    else if (ml->b.y < m_y)
+        outcode2 = BOTTOM;
+    if (outcode1 & outcode2)
+        return false;           // trivially outside
+
+    if (ml->a.x < m_x)
+        outcode1 |= LEFT;
+    else if (ml->a.x > m_x2)
+        outcode1 |= RIGHT;
+    if (ml->b.x < m_x)
+        outcode2 |= LEFT;
+    else if (ml->b.x > m_x2)
+        outcode2 |= RIGHT;
+    if (outcode1 & outcode2)
+        return false;           // trivially outside
+
+    // transform to frame-buffer coordinates.
+    fl->a.x = CXMTOF(ml->a.x);
+    fl->a.y = CYMTOF(ml->a.y);
+    fl->b.x = CXMTOF(ml->b.x);
+    fl->b.y = CYMTOF(ml->b.y);
+    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+    if (outcode1 & outcode2)
+        return false;
+
+    while (outcode1 | outcode2)
+    {
+        // may be partially inside box
+        // find an outside point
+        if (outcode1)
+            outside = outcode1;
+        else
+            outside = outcode2;
+        // clip to each side
+        if (outside & TOP)
+        {
+            dy = fl->a.y - fl->b.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.x = fl->a.x + (dx * (fl->a.y)) / dy;
+            tmp.y = 0;
+        }
+        else if (outside & BOTTOM)
+        {
+            dy = fl->a.y - fl->b.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.x = fl->a.x + (dx * (fl->a.y - f_h)) / dy;
+            tmp.y = f_h - 1;
+        }
+        else if (outside & RIGHT)
+        {
+            dy = fl->b.y - fl->a.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.y = fl->a.y + (dy * (f_w - 1 - fl->a.x)) / dx;
+            tmp.x = f_w - 1;
+        }
+        else if (outside & LEFT)
+        {
+            dy = fl->b.y - fl->a.y;
+            dx = fl->b.x - fl->a.x;
+            tmp.y = fl->a.y + (dy * (-fl->a.x)) / dx;
+            tmp.x = 0;
+        }
+        if (outside == outcode1)
+        {
+            fl->a = tmp;
+            DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+        }
+        else
+        {
+            fl->b = tmp;
+            DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+        }
+        if (outcode1 & outcode2)
+            return false;       // trivially outside
+    }
+
+    return true;
+}
+
+#undef DOOUTCODE
+
+// Classic Bresenham w/ whatever optimizations I need for speed
+
+void AM_drawFline(fline_t * fl, int color)
+{
+    register int x, y, dx, dy, sx, sy, ax, ay, d;
+    //static fuck = 0;
+
+    switch (color)
+    {
+        case WALLCOLORS:
+            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y,
+                       &antialias[0][0], 8, 3);
+            break;
+        case FDWALLCOLORS:
+            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y,
+                       &antialias[1][0], 8, 3);
+            break;
+        case CDWALLCOLORS:
+            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y,
+                       &antialias[2][0], 8, 3);
+            break;
+        default:
+            {
+                // For debugging only
+                if (fl->a.x < 0 || fl->a.x >= f_w
+                    || fl->a.y < 0 || fl->a.y >= f_h
+                    || fl->b.x < 0 || fl->b.x >= f_w
+                    || fl->b.y < 0 || fl->b.y >= f_h)
+                {
+                    //fprintf(stderr, "fuck %d \r", fuck++);
+                    return;
+                }
+
+#define DOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)    //the MACRO!
+
+                dx = fl->b.x - fl->a.x;
+                ax = 2 * (dx < 0 ? -dx : dx);
+                sx = dx < 0 ? -1 : 1;
+
+                dy = fl->b.y - fl->a.y;
+                ay = 2 * (dy < 0 ? -dy : dy);
+                sy = dy < 0 ? -1 : 1;
+
+                x = fl->a.x;
+                y = fl->a.y;
+
+                if (ax > ay)
+                {
+                    d = ay - ax / 2;
+                    while (1)
+                    {
+                        DOT(x, y, color);
+                        if (x == fl->b.x)
+                            return;
+                        if (d >= 0)
+                        {
+                            y += sy;
+                            d -= ax;
+                        }
+                        x += sx;
+                        d += ay;
+                    }
+                }
+                else
+                {
+                    d = ax - ay / 2;
+                    while (1)
+                    {
+                        DOT(x, y, color);
+                        if (y == fl->b.y)
+                            return;
+                        if (d >= 0)
+                        {
+                            x += sx;
+                            d -= ay;
+                        }
+                        y += sy;
+                        d += ax;
+                    }
+                }
+            }
+    }
+}
+
+/* Wu antialiased line drawer.
+ * (X0,Y0),(X1,Y1) = line to draw
+ * BaseColor = color # of first color in block used for antialiasing, the
+ *          100% intensity version of the drawing color
+ * NumLevels = size of color block, with BaseColor+NumLevels-1 being the
+ *          0% intensity version of the drawing color
+ * IntensityBits = log base 2 of NumLevels; the # of bits used to describe
+ *          the intensity of the drawing color. 2**IntensityBits==NumLevels
+ */
+void PUTDOT(short xx, short yy, byte * cc, byte * cm)
+{
+    static int oldyy;
+    static int oldyyshifted;
+    byte *oldcc = cc;
+
+    if (xx < 32)
+        cc += 7 - (xx >> 2);
+    else if (xx > (finit_width - 32))
+        cc += 7 - ((finit_width - xx) >> 2);
+//      if(cc==oldcc) //make sure that we don't double fade the corners.
+//      {
+    if (yy < 32)
+        cc += 7 - (yy >> 2);
+    else if (yy > (finit_height - 32))
+        cc += 7 - ((finit_height - yy) >> 2);
+//      }
+    if (cc > cm && cm != NULL)
+    {
+        cc = cm;
+    }
+    else if (cc > oldcc + 6)    // don't let the color escape from the fade table...
+    {
+        cc = oldcc + 6;
+    }
+    if (yy == oldyy + 1)
+    {
+        oldyy++;
+        oldyyshifted += 320;
+    }
+    else if (yy == oldyy - 1)
+    {
+        oldyy--;
+        oldyyshifted -= 320;
+    }
+    else if (yy != oldyy)
+    {
+        oldyy = yy;
+        oldyyshifted = yy * 320;
+    }
+    fb[oldyyshifted + xx] = *(cc);
+//      fb[(yy)*f_w+(xx)]=*(cc);
+}
+
+void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
+                int NumLevels, unsigned short IntensityBits)
+{
+    unsigned short IntensityShift, ErrorAdj, ErrorAcc;
+    unsigned short ErrorAccTemp, Weighting, WeightingComplementMask;
+    short DeltaX, DeltaY, Temp, XDir;
+
+    /* Make sure the line runs top to bottom */
+    if (Y0 > Y1)
+    {
+        Temp = Y0;
+        Y0 = Y1;
+        Y1 = Temp;
+        Temp = X0;
+        X0 = X1;
+        X1 = Temp;
+    }
+    /* Draw the initial pixel, which is always exactly intersected by
+       the line and so needs no weighting */
+    PUTDOT(X0, Y0, &BaseColor[0], NULL);
+
+    if ((DeltaX = X1 - X0) >= 0)
+    {
+        XDir = 1;
+    }
+    else
+    {
+        XDir = -1;
+        DeltaX = -DeltaX;       /* make DeltaX positive */
+    }
+    /* Special-case horizontal, vertical, and diagonal lines, which
+       require no weighting because they go right through the center of
+       every pixel */
+    if ((DeltaY = Y1 - Y0) == 0)
+    {
+        /* Horizontal line */
+        while (DeltaX-- != 0)
+        {
+            X0 += XDir;
+            PUTDOT(X0, Y0, &BaseColor[0], NULL);
+        }
+        return;
+    }
+    if (DeltaX == 0)
+    {
+        /* Vertical line */
+        do
+        {
+            Y0++;
+            PUTDOT(X0, Y0, &BaseColor[0], NULL);
+        }
+        while (--DeltaY != 0);
+        return;
+    }
+    //diagonal line.
+    if (DeltaX == DeltaY)
+    {
+        do
+        {
+            X0 += XDir;
+            Y0++;
+            PUTDOT(X0, Y0, &BaseColor[0], NULL);
+        }
+        while (--DeltaY != 0);
+        return;
+    }
+    /* Line is not horizontal, diagonal, or vertical */
+    ErrorAcc = 0;               /* initialize the line error accumulator to 0 */
+    /* # of bits by which to shift ErrorAcc to get intensity level */
+    IntensityShift = 16 - IntensityBits;
+    /* Mask used to flip all bits in an intensity weighting, producing the
+       result (1 - intensity weighting) */
+    WeightingComplementMask = NumLevels - 1;
+    /* Is this an X-major or Y-major line? */
+    if (DeltaY > DeltaX)
+    {
+        /* Y-major line; calculate 16-bit fixed-point fractional part of a
+           pixel that X advances each time Y advances 1 pixel, truncating the
+           result so that we won't overrun the endpoint along the X axis */
+        ErrorAdj = ((unsigned long) DeltaX << 16) / (unsigned long) DeltaY;
+        /* Draw all pixels other than the first and last */
+        while (--DeltaY)
+        {
+            ErrorAccTemp = ErrorAcc;    /* remember currrent accumulated error */
+            ErrorAcc += ErrorAdj;       /* calculate error for next pixel */
+            if (ErrorAcc <= ErrorAccTemp)
+            {
+                /* The error accumulator turned over, so advance the X coord */
+                X0 += XDir;
+            }
+            Y0++;               /* Y-major, so always advance Y */
+            /* The IntensityBits most significant bits of ErrorAcc give us the
+               intensity weighting for this pixel, and the complement of the
+               weighting for the paired pixel */
+            Weighting = ErrorAcc >> IntensityShift;
+            PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
+            PUTDOT(X0 + XDir, Y0,
+                   &BaseColor[(Weighting ^ WeightingComplementMask)],
+                   &BaseColor[7]);
+        }
+        /* Draw the final pixel, which is always exactly intersected by the line
+           and so needs no weighting */
+        PUTDOT(X1, Y1, &BaseColor[0], NULL);
+        return;
+    }
+    /* It's an X-major line; calculate 16-bit fixed-point fractional part of a
+       pixel that Y advances each time X advances 1 pixel, truncating the
+       result to avoid overrunning the endpoint along the X axis */
+    ErrorAdj = ((unsigned long) DeltaY << 16) / (unsigned long) DeltaX;
+    /* Draw all pixels other than the first and last */
+    while (--DeltaX)
+    {
+        ErrorAccTemp = ErrorAcc;        /* remember currrent accumulated error */
+        ErrorAcc += ErrorAdj;   /* calculate error for next pixel */
+        if (ErrorAcc <= ErrorAccTemp)
+        {
+            /* The error accumulator turned over, so advance the Y coord */
+            Y0++;
+        }
+        X0 += XDir;             /* X-major, so always advance X */
+        /* The IntensityBits most significant bits of ErrorAcc give us the
+           intensity weighting for this pixel, and the complement of the
+           weighting for the paired pixel */
+        Weighting = ErrorAcc >> IntensityShift;
+        PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
+        PUTDOT(X0, Y0 + 1,
+               &BaseColor[(Weighting ^ WeightingComplementMask)],
+               &BaseColor[7]);
+
+    }
+    /* Draw the final pixel, which is always exactly intersected by the line
+       and so needs no weighting */
+    PUTDOT(X1, Y1, &BaseColor[0], NULL);
+}
+
+void AM_drawMline(mline_t * ml, int color)
+{
+    static fline_t fl;
+
+    if (AM_clipMline(ml, &fl))
+        AM_drawFline(&fl, color);       // draws it on frame buffer using fb coords
+
+}
+
+void AM_drawGrid(int color)
+{
+    fixed_t x, y;
+    fixed_t start, end;
+    mline_t ml;
+
+    // Figure out start of vertical gridlines
+    start = m_x;
+    if ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS))
+        start += (MAPBLOCKUNITS << FRACBITS)
+            - ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS));
+    end = m_x + m_w;
+
+    // draw vertical gridlines
+    ml.a.y = m_y;
+    ml.b.y = m_y + m_h;
+    for (x = start; x < end; x += (MAPBLOCKUNITS << FRACBITS))
+    {
+        ml.a.x = x;
+        ml.b.x = x;
+        AM_drawMline(&ml, color);
+    }
+
+    // Figure out start of horizontal gridlines
+    start = m_y;
+    if ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS))
+        start += (MAPBLOCKUNITS << FRACBITS)
+            - ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS));
+    end = m_y + m_h;
+
+    // draw horizontal gridlines
+    ml.a.x = m_x;
+    ml.b.x = m_x + m_w;
+    for (y = start; y < end; y += (MAPBLOCKUNITS << FRACBITS))
+    {
+        ml.a.y = y;
+        ml.b.y = y;
+        AM_drawMline(&ml, color);
+    }
+}
+
+void AM_drawWalls(void)
+{
+    int i;
+    static mline_t l;
+
+    for (i = 0; i < numlines; i++)
+    {
+        l.a.x = lines[i].v1->x;
+        l.a.y = lines[i].v1->y;
+        l.b.x = lines[i].v2->x;
+        l.b.y = lines[i].v2->y;
+        if (cheating || (lines[i].flags & ML_MAPPED))
+        {
+            if ((lines[i].flags & LINE_NEVERSEE) && !cheating)
+                continue;
+            if (!lines[i].backsector)
+            {
+                AM_drawMline(&l, WALLCOLORS + lightlev);
+            }
+            else
+            {
+                if (lines[i].flags & ML_SECRET) // secret door
+                {
+                    if (cheating)
+                        AM_drawMline(&l, 0);
+                    else
+                        AM_drawMline(&l, WALLCOLORS + lightlev);
+                }
+                else if (lines[i].special == 13 || lines[i].special == 83)
+                {               // Locked door line -- all locked doors are greed
+                    AM_drawMline(&l, GREENKEY);
+                }
+                else if (lines[i].special == 70 || lines[i].special == 71)
+                {               // intra-level teleports are blue
+                    AM_drawMline(&l, BLUEKEY);
+                }
+                else if (lines[i].special == 74 || lines[i].special == 75)
+                {               // inter-level teleport/game-winning exit -- both are red
+                    AM_drawMline(&l, BLOODRED);
+                }
+                else if (lines[i].backsector->floorheight
+                         != lines[i].frontsector->floorheight)
+                {
+                    AM_drawMline(&l, FDWALLCOLORS + lightlev);  // floor level change
+                }
+                else if (lines[i].backsector->ceilingheight
+                         != lines[i].frontsector->ceilingheight)
+                {
+                    AM_drawMline(&l, CDWALLCOLORS + lightlev);  // ceiling level change
+                }
+                else if (cheating)
+                {
+                    AM_drawMline(&l, TSWALLCOLORS + lightlev);
+                }
+            }
+        }
+        else if (plr->powers[pw_allmap])
+        {
+            if (!(lines[i].flags & LINE_NEVERSEE))
+                AM_drawMline(&l, GRAYS + 3);
+        }
+    }
+
+}
+
+void AM_rotate(fixed_t * x, fixed_t * y, angle_t a)
+{
+    fixed_t tmpx;
+
+    tmpx = FixedMul(*x, finecosine[a >> ANGLETOFINESHIFT])
+        - FixedMul(*y, finesine[a >> ANGLETOFINESHIFT]);
+    *y = FixedMul(*x, finesine[a >> ANGLETOFINESHIFT])
+        + FixedMul(*y, finecosine[a >> ANGLETOFINESHIFT]);
+    *x = tmpx;
+}
+
+void AM_drawLineCharacter(mline_t * lineguy, int lineguylines, fixed_t scale,
+                          angle_t angle, int color, fixed_t x, fixed_t y)
+{
+    int i;
+    mline_t l;
+
+    for (i = 0; i < lineguylines; i++)
+    {
+        l.a.x = lineguy[i].a.x;
+        l.a.y = lineguy[i].a.y;
+        if (scale)
+        {
+            l.a.x = FixedMul(scale, l.a.x);
+            l.a.y = FixedMul(scale, l.a.y);
+        }
+        if (angle)
+            AM_rotate(&l.a.x, &l.a.y, angle);
+        l.a.x += x;
+        l.a.y += y;
+
+        l.b.x = lineguy[i].b.x;
+        l.b.y = lineguy[i].b.y;
+        if (scale)
+        {
+            l.b.x = FixedMul(scale, l.b.x);
+            l.b.y = FixedMul(scale, l.b.y);
+        }
+        if (angle)
+            AM_rotate(&l.b.x, &l.b.y, angle);
+        l.b.x += x;
+        l.b.y += y;
+
+        AM_drawMline(&l, color);
+    }
+}
+
+void AM_drawPlayers(void)
+{
+    int i;
+    player_t *p;
+    static int their_colors[] = {
+        AM_PLR1_COLOR,
+        AM_PLR2_COLOR,
+        AM_PLR3_COLOR,
+        AM_PLR4_COLOR,
+        AM_PLR5_COLOR,
+        AM_PLR6_COLOR,
+        AM_PLR7_COLOR,
+        AM_PLR8_COLOR
+    };
+    int their_color = -1;
+    int color;
+
+    if (!netgame)
+    {
+        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, plr->mo->angle,
+                             WHITE, plr->mo->x, plr->mo->y);
+        return;
+    }
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        their_color++;
+        p = &players[i];
+        if (deathmatch && !singledemo && p != plr)
+        {
+            continue;
+        }
+        if (!playeringame[i])
+            continue;
+        color = their_colors[their_color];
+        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, p->mo->angle,
+                             color, p->mo->x, p->mo->y);
+    }
+}
+
+void AM_drawThings(int colors, int colorrange)
+{
+    int i;
+    mobj_t *t;
+
+    for (i = 0; i < numsectors; i++)
+    {
+        t = sectors[i].thinglist;
+        while (t)
+        {
+            AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES,
+                                 16 << FRACBITS, t->angle, colors + lightlev,
+                                 t->x, t->y);
+            t = t->snext;
+        }
+    }
+}
+
+/*
+void AM_drawMarks(void)
+{
+  int i, fx, fy, w, h;
+
+  for (i=0;i<AM_NUMMARKPOINTS;i++)
+  {
+    if (markpoints[i].x != -1)
+    {
+      w = SHORT(marknums[i]->width);
+      h = SHORT(marknums[i]->height);
+      fx = CXMTOF(markpoints[i].x);
+      fy = CYMTOF(markpoints[i].y);
+      if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
+  			V_DrawPatch(fx, fy, marknums[i]);
+    }
+  }
+}
+*/
+/*
+void AM_drawkeys(void)
+{
+	if(KeyPoints[0].x != 0 || KeyPoints[0].y != 0)
+	{
+		AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, YELLOWKEY,
+			KeyPoints[0].x, KeyPoints[0].y);
+	}
+	if(KeyPoints[1].x != 0 || KeyPoints[1].y != 0)
+	{
+		AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, GREENKEY,
+			KeyPoints[1].x, KeyPoints[1].y);
+	}
+	if(KeyPoints[2].x != 0 || KeyPoints[2].y != 0)
+	{
+		AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, BLUEKEY,
+			KeyPoints[2].x, KeyPoints[2].y);
+	}
+}
+*/
+
+/*
+void AM_drawCrosshair(int color)
+{
+  fb[(f_w*(f_h+1))/2] = color; // single point for now
+}
+*/
+
+void AM_Drawer(void)
+{
+    if (!automapactive)
+        return;
+
+    UpdateState |= I_FULLSCRN;
+    AM_clearFB(BACKGROUND);
+    if (grid)
+        AM_drawGrid(GRIDCOLORS);
+    AM_drawWalls();
+    AM_drawPlayers();
+    DrawWorldTimer();
+
+    if (cheating == 2)
+        AM_drawThings(THINGCOLORS, THINGRANGE);
+
+//  AM_drawCrosshair(XHAIRCOLORS);
+//  AM_drawMarks();
+//      if(gameskill == sk_baby) AM_drawkeys();
+
+    MN_DrTextA(P_GetMapName(gamemap), 38, 144);
+    if (ShowKills && netgame && deathmatch)
+    {
+        AM_DrawDeathmatchStats();
+    }
+//  I_Update();
+//  V_MarkRect(f_x, f_y, f_w, f_h);
+
+}
+
+//===========================================================================
+//
+// AM_DrawDeathmatchStats
+//
+//===========================================================================
+
+// 8-player note:  Proper player color names here, too
+
+const char *PlayerColorText[MAXPLAYERS] = {
+    "BLUE:",
+    "RED:",
+    "YELLOW:",
+    "GREEN:",
+    "JADE:",
+    "WHITE:",
+    "HAZEL:",
+    "PURPLE:"
+};
+
+void AM_DrawDeathmatchStats(void)
+{
+    int i, j, k, m;
+    int fragCount[MAXPLAYERS];
+    int order[MAXPLAYERS];
+    char textBuffer[80];
+    int yPosition;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        fragCount[i] = 0;
+        order[i] = -1;
+    }
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        else
+        {
+            for (j = 0; j < maxplayers; j++)
+            {
+                if (playeringame[j])
+                {
+                    fragCount[i] += players[i].frags[j];
+                }
+            }
+            for (k = 0; k < maxplayers; k++)
+            {
+                if (order[k] == -1)
+                {
+                    order[k] = i;
+                    break;
+                }
+                else if (fragCount[i] > fragCount[order[k]])
+                {
+                    for (m = maxplayers - 1; m > k; m--)
+                    {
+                        order[m] = order[m - 1];
+                    }
+                    order[k] = i;
+                    break;
+                }
+            }
+        }
+    }
+    yPosition = 15;
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[order[i]])
+        {
+            continue;
+        }
+        else
+        {
+            MN_DrTextA(PlayerColorText[order[i]], 8, yPosition);
+            M_snprintf(textBuffer, sizeof(textBuffer),
+                       "%d", fragCount[order[i]]);
+            MN_DrTextA(textBuffer, 80, yPosition);
+            yPosition += 10;
+        }
+    }
+}
+
+//===========================================================================
+//
+// DrawWorldTimer
+//
+//===========================================================================
+
+static void DrawWorldTimer(void)
+{
+    int days;
+    int hours;
+    int minutes;
+    int seconds;
+    int worldTimer;
+    char timeBuffer[15];
+    char dayBuffer[20];
+
+    worldTimer = players[consoleplayer].worldTimer;
+
+    worldTimer /= 35;
+    days = worldTimer / 86400;
+    worldTimer -= days * 86400;
+    hours = worldTimer / 3600;
+    worldTimer -= hours * 3600;
+    minutes = worldTimer / 60;
+    worldTimer -= minutes * 60;
+    seconds = worldTimer;
+
+    M_snprintf(timeBuffer, sizeof(timeBuffer),
+               "%.2d : %.2d : %.2d", hours, minutes, seconds);
+    MN_DrTextA(timeBuffer, 240, 8);
+
+    if (days)
+    {
+        if (days == 1)
+        {
+            M_snprintf(dayBuffer, sizeof(dayBuffer), "%.2d DAY", days);
+        }
+        else
+        {
+            M_snprintf(dayBuffer, sizeof(dayBuffer), "%.2d DAYS", days);
+        }
+        MN_DrTextA(dayBuffer, 240, 20);
+        if (days >= 5)
+        {
+            MN_DrTextA("YOU FREAK!!!", 230, 35);
+        }
+    }
+}
diff --git a/games/NXDoom/src/hexen/am_map.h b/games/NXDoom/src/hexen/am_map.h
new file mode 100644
index 000000000..f6081a448
--- /dev/null
+++ b/games/NXDoom/src/hexen/am_map.h
@@ -0,0 +1,128 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __AMMAP_H__
+#define __AMMAP_H__
+
+// For use if I do walls with outsides/insides
+#define REDS		12*8
+#define REDRANGE	1       //16
+#define BLUES		(256-4*16+8)
+#define BLUERANGE	1       //8
+#define GREENS		(33*8)
+#define GREENRANGE	1       //16
+#define GRAYS		(5*8)
+#define GRAYSRANGE	1       //16
+#define BROWNS		(14*8)
+#define BROWNRANGE	1       //16
+#define YELLOWS		10*8
+#define YELLOWRANGE	1
+#define BLACK		0
+#define WHITE		4*8
+#define PARCH		13*8-1
+#define BLOODRED  	177
+#define BLUEKEY 	157
+#define YELLOWKEY 	137
+#define GREENKEY  	198
+
+// Automap colors
+
+#define AM_PLR1_COLOR 157       // Blue
+#define AM_PLR2_COLOR 177       // Red
+#define AM_PLR3_COLOR 137       // Yellow
+#define AM_PLR4_COLOR 198       // Green
+#define AM_PLR5_COLOR 215       // Jade
+#define AM_PLR6_COLOR 32        // White
+#define AM_PLR7_COLOR 106       // Hazel
+#define AM_PLR8_COLOR 234       // Purple
+
+#define BACKGROUND	PARCH
+#define YOURCOLORS	WHITE
+#define YOURRANGE	0
+#define WALLCOLORS	REDS
+#define WALLRANGE	REDRANGE
+#define TSWALLCOLORS	GRAYS
+#define TSWALLRANGE	GRAYSRANGE
+#define FDWALLCOLORS	BROWNS
+#define FDWALLRANGE	BROWNRANGE
+#define CDWALLCOLORS	YELLOWS
+#define CDWALLRANGE	YELLOWRANGE
+#define THINGCOLORS	GREENS
+#define THINGRANGE	GREENRANGE
+#define SECRETWALLCOLORS WALLCOLORS
+#define SECRETWALLRANGE WALLRANGE
+#define GRIDCOLORS	(GRAYS + GRAYSRANGE/2)
+#define GRIDRANGE	0
+#define XHAIRCOLORS	GRAYS
+
+// drawing stuff
+
+#define AM_NUMMARKPOINTS 10
+
+#define AM_MSGHEADER (('a'<<24)+('m'<<16))
+#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
+#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
+
+#define INITSCALEMTOF (.2*FRACUNIT)     // scale on entry
+// how much the automap moves window per tic in frame-buffer coordinates
+#define F_PANINC	4       // moves 140 pixels in 1 second
+// how much zoom-in per tic
+#define M_ZOOMIN        ((int) (1.02*FRACUNIT)) // goes to 2x in 1 second
+// how much zoom-out per tic
+#define M_ZOOMOUT       ((int) (FRACUNIT/1.02)) // pulls out to 0.5x in 1 second
+
+// translates between frame-buffer and map distances
+#define FTOM(x) FixedMul(((x)<<16),scale_ftom)
+#define MTOF(x) (FixedMul((x),scale_mtof)>>16)
+// translates between frame-buffer and map coordinates
+#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
+#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
+
+// the following is crap
+#define LINE_NEVERSEE ML_DONTDRAW
+
+typedef struct
+{
+    int x, y;
+} fpoint_t;
+
+typedef struct
+{
+    fpoint_t a, b;
+} fline_t;
+
+typedef vertex_t mpoint_t;
+
+typedef struct
+{
+    mpoint_t a, b;
+} mline_t;
+
+typedef struct
+{
+    fixed_t slp, islp;
+} islope_t;
+
+
+extern int cheating;
+extern boolean automapactive;
+
+
+void AM_Stop(void);
+
+
+#endif
diff --git a/games/NXDoom/src/hexen/ct_chat.c b/games/NXDoom/src/hexen/ct_chat.c
new file mode 100644
index 000000000..cba051dc0
--- /dev/null
+++ b/games/NXDoom/src/hexen/ct_chat.c
@@ -0,0 +1,497 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include <string.h>
+#include <ctype.h>
+#include "h2def.h"
+#include "i_input.h"
+#include "s_sound.h"
+#include "doomkeys.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "v_video.h"
+
+#define NUMKEYS 256
+
+#define QUEUESIZE		128
+#define MESSAGESIZE		128
+#define MESSAGELEN 		265
+
+// 8-player note:  Change this stuff (CT_PLR_*, and the key mappings)
+enum
+{
+    CT_PLR_BLUE = 1,
+    CT_PLR_RED,
+    CT_PLR_YELLOW,
+    CT_PLR_GREEN,
+    CT_PLR_PLAYER5,
+    CT_PLR_PLAYER6,
+    CT_PLR_PLAYER7,
+    CT_PLR_PLAYER8,
+    CT_PLR_ALL
+};
+
+#define CT_ESCAPE 6
+
+// Public data
+
+
+boolean chatmodeon;
+
+// Private data
+
+void CT_queueChatChar(char ch);
+void CT_ClearChatMessage(int player);
+void CT_AddChar(int player, char c);
+void CT_BackSpace(int player);
+
+int head;
+int tail;
+byte ChatQueue[QUEUESIZE];
+int chat_dest[MAXPLAYERS];
+char chat_msg[MAXPLAYERS][MESSAGESIZE];
+char plr_lastmsg[MAXPLAYERS][MESSAGESIZE + 9];
+int msgptr[MAXPLAYERS];
+int msglen[MAXPLAYERS];
+
+boolean cheated;
+
+static int FontABaseLump;
+
+const char *CT_FromPlrText[MAXPLAYERS] = {
+    "BLUE:  ",
+    "RED:  ",
+    "YELLOW:  ",
+    "GREEN:  ",
+    "JADE:  ",
+    "WHITE:  ",
+    "HAZEL:  ",
+    "PURPLE:  "
+};
+
+char *chat_macros[10];
+
+boolean altdown;
+boolean shiftdown;
+
+
+//===========================================================================
+//
+// CT_Init
+//
+//      Initialize chat mode data
+//===========================================================================
+
+void CT_Init(void)
+{
+    int i;
+
+    head = 0;                   //initialize the queue index
+    tail = 0;
+    chatmodeon = false;
+    memset(ChatQueue, 0, QUEUESIZE);
+    for (i = 0; i < maxplayers; i++)
+    {
+        chat_dest[i] = 0;
+        msgptr[i] = 0;
+        memset(plr_lastmsg[i], 0, MESSAGESIZE);
+        memset(chat_msg[i], 0, MESSAGESIZE);
+    }
+    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
+    return;
+}
+
+//===========================================================================
+//
+// CT_Stop
+//
+//===========================================================================
+
+void CT_Stop(void)
+{
+    chatmodeon = false;
+    I_StopTextInput();
+    return;
+}
+
+// These keys are allowed by Vanilla Heretic:
+
+static boolean ValidChatChar(char c)
+{
+    return (c >= 'a' && c <= 'z')
+        || (c >= 'A' && c <= 'Z')
+        || (c >= '0' && c <= '9')
+        || c == '!' || c == '?'
+        || c == ' ' || c == '\''
+        || c == ',' || c == '.'
+        || c == '-' || c == '=';
+}
+
+//===========================================================================
+//
+// CT_Responder
+//
+//===========================================================================
+
+boolean CT_Responder(event_t * ev)
+{
+    char *macro;
+
+    int sendto;
+
+    if (!netgame)
+    {
+        return false;
+    }
+    if (ev->data1 == KEY_RALT)
+    {
+        altdown = (ev->type == ev_keydown);
+        return false;
+    }
+    if (ev->data1 == KEY_RSHIFT)
+    {
+        shiftdown = (ev->type == ev_keydown);
+        return false;
+    }
+    if (gamestate != GS_LEVEL || ev->type != ev_keydown)
+    {
+        return false;
+    }
+    if (!chatmodeon)
+    {
+        sendto = 0;
+        if (ev->data1 == key_multi_msg)
+        {
+            sendto = CT_PLR_ALL;
+        }
+        else if (ev->data1 == key_multi_msgplayer[0])
+        {
+            sendto = CT_PLR_BLUE;
+        }
+        else if (ev->data1 == key_multi_msgplayer[1])
+        {
+            sendto = CT_PLR_RED;
+        }
+        else if (ev->data1 == key_multi_msgplayer[2])
+        {
+            sendto = CT_PLR_YELLOW;
+        }
+        else if (ev->data1 == key_multi_msgplayer[3])
+        {
+            sendto = CT_PLR_GREEN;
+        }
+        else if (ev->data1 == key_multi_msgplayer[4])
+        {
+            sendto = CT_PLR_PLAYER5;
+        }
+        else if (ev->data1 == key_multi_msgplayer[5])
+        {
+            sendto = CT_PLR_PLAYER6;
+        }
+        else if (ev->data1 == key_multi_msgplayer[6])
+        {
+            sendto = CT_PLR_PLAYER7;
+        }
+        else if (ev->data1 == key_multi_msgplayer[7])
+        {
+            sendto = CT_PLR_PLAYER8;
+        }
+        if (sendto == 0 || (sendto != CT_PLR_ALL && !playeringame[sendto - 1])
+            || sendto == consoleplayer + 1)
+        {
+            return false;
+        }
+        CT_queueChatChar(sendto);
+        chatmodeon = true;
+        I_StartTextInput(25, 10, SCREENWIDTH, 18);
+        return true;
+    }
+    else
+    {
+        if (altdown)
+        {
+            if (ev->data1 >= '0' && ev->data1 <= '9')
+            {
+                if (ev->data1 == '0')
+                {               // macro 0 comes after macro 9
+                    ev->data1 = '9' + 1;
+                }
+                macro = chat_macros[ev->data1 - '1'];
+                CT_queueChatChar(KEY_ENTER);    //send old message
+                CT_queueChatChar(chat_dest[consoleplayer]);     // chose the dest.
+                while (*macro)
+                {
+                    CT_queueChatChar(toupper(*macro++));
+                }
+                CT_queueChatChar(KEY_ENTER);    //send it off...
+                CT_Stop();
+                return true;
+            }
+        }
+        if (ev->data1 == KEY_ENTER)
+        {
+            CT_queueChatChar(KEY_ENTER);
+            usearti = false;
+            CT_Stop();
+            return true;
+        }
+        else if (ev->data1 == KEY_ESCAPE)
+        {
+            CT_queueChatChar(CT_ESCAPE);
+            CT_Stop();
+            return true;
+        }
+        else if (ev->data1 == KEY_BACKSPACE)
+        {
+            CT_queueChatChar(KEY_BACKSPACE);
+            return true;
+        }
+        else if (ValidChatChar(ev->data3))
+        {
+            CT_queueChatChar(toupper(ev->data3));
+            return true;
+        }
+    }
+    return false;
+}
+
+//===========================================================================
+//
+// CT_Ticker
+//
+//===========================================================================
+
+void CT_Ticker(void)
+{
+    int i;
+    int j;
+    char c;
+    int numplayers;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        if ((c = players[i].cmd.chatchar) != 0)
+        {
+            if (c <= CT_PLR_ALL)
+            {
+                chat_dest[i] = c;
+                continue;
+            }
+            else if (c == CT_ESCAPE)
+            {
+                CT_ClearChatMessage(i);
+            }
+            else if (c == KEY_ENTER)
+            {
+                numplayers = 0;
+                for (j = 0; j < maxplayers; j++)
+                {
+                    numplayers += playeringame[j];
+                }
+                CT_AddChar(i, 0);       // set the end of message character
+                if (numplayers > 2)
+                {
+                    M_StringCopy(plr_lastmsg[i], CT_FromPlrText[i],
+                                 sizeof(plr_lastmsg[i]));
+                    M_StringConcat(plr_lastmsg[i], chat_msg[i],
+                                   sizeof(plr_lastmsg[i]));
+                }
+                else
+                {
+                    M_StringCopy(plr_lastmsg[i], chat_msg[i],
+                                 sizeof(plr_lastmsg[i]));
+                }
+                if (i != consoleplayer && (chat_dest[i] == consoleplayer + 1
+                                           || chat_dest[i] == CT_PLR_ALL)
+                    && *chat_msg[i])
+                {
+                    P_SetMessage(&players[consoleplayer], plr_lastmsg[i],
+                                 true);
+                    S_StartSound(NULL, SFX_CHAT);
+                }
+                else if (i == consoleplayer && (*chat_msg[i]))
+                {
+                    if (numplayers <= 1)
+                    {
+                        P_SetMessage(&players[consoleplayer],
+                                     "THERE ARE NO OTHER PLAYERS IN THE GAME!",
+                                     true);
+                        S_StartSound(NULL, SFX_CHAT);
+                    }
+                }
+                CT_ClearChatMessage(i);
+            }
+            else if (c == KEY_BACKSPACE)
+            {
+                CT_BackSpace(i);
+            }
+            else
+            {
+                CT_AddChar(i, c);
+            }
+        }
+    }
+    return;
+}
+
+//===========================================================================
+//
+// CT_Drawer
+//
+//===========================================================================
+
+void CT_Drawer(void)
+{
+    int i;
+    int x;
+    patch_t *patch;
+
+    if (chatmodeon)
+    {
+        x = 25;
+        for (i = 0; i < msgptr[consoleplayer]; i++)
+        {
+            if (chat_msg[consoleplayer][i] < 33)
+            {
+                x += 6;
+            }
+            else
+            {
+                patch = W_CacheLumpNum(FontABaseLump +
+                                       chat_msg[consoleplayer][i] - 33,
+                                       PU_CACHE);
+                V_DrawPatch(x, 10, patch);
+                x += patch->width;
+            }
+        }
+        V_DrawPatch(x, 10, W_CacheLumpName("FONTA59", PU_CACHE));
+        BorderTopRefresh = true;
+        UpdateState |= I_MESSAGES;
+    }
+}
+
+//===========================================================================
+//
+// CT_queueChatChar
+//
+//===========================================================================
+
+void CT_queueChatChar(char ch)
+{
+    if (((tail + 1) & (QUEUESIZE - 1)) == head)
+    {                           // the queue is full
+        return;
+    }
+    ChatQueue[tail] = ch;
+    tail = (tail + 1) & (QUEUESIZE - 1);
+}
+
+//===========================================================================
+//
+// CT_dequeueChatChar
+//
+//===========================================================================
+
+char CT_dequeueChatChar(void)
+{
+    byte temp;
+
+    if (head == tail)
+    {                           // queue is empty
+        return 0;
+    }
+    temp = ChatQueue[head];
+    head = (head + 1) & (QUEUESIZE - 1);
+    return temp;
+}
+
+//===========================================================================
+//
+// CT_AddChar
+//
+//===========================================================================
+
+void CT_AddChar(int player, char c)
+{
+    patch_t *patch;
+
+    if (msgptr[player] + 1 >= MESSAGESIZE || msglen[player] >= MESSAGELEN)
+    {                           // full.
+        return;
+    }
+    chat_msg[player][msgptr[player]] = c;
+    msgptr[player]++;
+    if (c < 33)
+    {
+        msglen[player] += 6;
+    }
+    else
+    {
+        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        msglen[player] += patch->width;
+    }
+}
+
+//===========================================================================
+//
+// CT_BackSpace
+//
+//      Backs up a space, when the user hits (obviously) backspace
+//===========================================================================
+
+void CT_BackSpace(int player)
+{
+    patch_t *patch;
+    char c;
+
+    if (msgptr[player] == 0)
+    {                           // message is already blank
+        return;
+    }
+    msgptr[player]--;
+    c = chat_msg[player][msgptr[player]];
+    if (c < 33)
+    {
+        msglen[player] -= 6;
+    }
+    else
+    {
+        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        msglen[player] -= patch->width;
+    }
+    chat_msg[player][msgptr[player]] = 0;
+}
+
+//===========================================================================
+//
+// CT_ClearChatMessage
+//
+//      Clears out the data for the chat message, but the player's message
+//              is still saved in plrmsg.
+//===========================================================================
+
+void CT_ClearChatMessage(int player)
+{
+    memset(chat_msg[player], 0, MESSAGESIZE);
+    msgptr[player] = 0;
+    msglen[player] = 0;
+}
diff --git a/games/NXDoom/src/hexen/ct_chat.h b/games/NXDoom/src/hexen/ct_chat.h
new file mode 100644
index 000000000..c46fdfce8
--- /dev/null
+++ b/games/NXDoom/src/hexen/ct_chat.h
@@ -0,0 +1,38 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Chat mode stuff
+//
+
+#ifndef HEXEN_CT_CHAT_H
+#define HEXEN_CT_CHAT_H
+
+#define CT_PLR_GREEN	1
+#define CT_PLR_YELLOW	2
+#define CT_PLR_RED		3
+#define CT_PLR_BLUE		4
+#define CT_PLR_ALL		5
+
+#define CT_KEY_GREEN	'g'
+#define CT_KEY_YELLOW	'y'
+#define CT_KEY_RED		'r'
+#define CT_KEY_BLUE		'b'
+#define CT_KEY_ALL		't'
+
+extern char *chat_macros[10];
+
+#endif
+
diff --git a/games/NXDoom/src/hexen/d_net.c b/games/NXDoom/src/hexen/d_net.c
new file mode 100644
index 000000000..252914722
--- /dev/null
+++ b/games/NXDoom/src/hexen/d_net.c
@@ -0,0 +1,283 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM Network game communication and protocol,
+//	all OS independend parts.
+//
+
+#include <stdlib.h>
+
+#include "m_argv.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "i_videohr.h"
+#include "h2def.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "w_checksum.h"
+
+#include "deh_main.h"
+
+#include "d_loop.h"
+
+ticcmd_t *netcmds;
+
+
+// Called when a player leaves the game
+
+static void PlayerQuitGame(player_t *player)
+{
+    static char exitmsg[80];
+    unsigned int player_num;
+
+    player_num = player - players;
+
+    M_StringCopy(exitmsg, "PLAYER 1 LEFT THE GAME", sizeof(exitmsg));
+    exitmsg[7] += player_num;
+    P_SetMessage(&players[consoleplayer], exitmsg, true);
+    S_StartSound(NULL, SFX_CHAT);
+
+    playeringame[player_num] = false;
+
+    // TODO: check if it is sensible to do this:
+
+    if (demorecording) 
+    {
+        G_CheckDemoStatus ();
+    }
+}
+
+static void RunTic(ticcmd_t *cmds, boolean *ingame)
+{
+    unsigned int i;
+
+    // Check for player quits.
+
+    for (i = 0; i < maxplayers; ++i)
+    {
+        if (!demoplayback && playeringame[i] && !ingame[i])
+        {
+            PlayerQuitGame(&players[i]);
+        }
+    }
+
+    netcmds = cmds;
+
+    // check that there are players in the game.  if not, we cannot
+    // run a tic.
+
+    if (advancedemo)
+        H2_DoAdvanceDemo ();
+
+    G_Ticker ();
+}
+
+static loop_interface_t hexen_loop_interface = {
+    H2_ProcessEvents,
+    G_BuildTiccmd,
+    RunTic,
+    MN_Ticker
+};
+
+
+// Load game settings from the specified structure and 
+// set global variables.
+
+static void LoadGameSettings(net_gamesettings_t *settings)
+{
+    unsigned int i;
+
+    deathmatch = settings->deathmatch;
+    ticdup = settings->ticdup;
+    startepisode = settings->episode;
+    startmap = settings->map;
+    startskill = settings->skill;
+    // TODO startloadgame = settings->loadgame;
+    lowres_turn = settings->lowres_turn;
+    nomonsters = settings->nomonsters;
+    respawnparm = settings->respawn_monsters;
+    consoleplayer = settings->consoleplayer;
+
+    if (lowres_turn)
+    {
+        printf("NOTE: Turning resolution is reduced; this is probably "
+               "because there is a client recording a Vanilla demo.\n");
+    }
+
+    for (i=0; i<maxplayers; ++i)
+    {
+        playeringame[i] = i < settings->num_players;
+        PlayerClass[i] = settings->player_classes[i];
+
+        if (PlayerClass[i] >= NUMCLASSES)
+        {
+            PlayerClass[i] = PCLASS_FIGHTER;
+        }
+    }
+}
+
+// Save the game settings from global variables to the specified
+// game settings structure.
+
+static void SaveGameSettings(net_gamesettings_t *settings)
+{
+    // jhaley 20120715: Some parts of the structure are being left
+    // uninitialized. If -class is not used on the command line, this
+    // can lead to a crash in SB_Init due to player class == 0xCCCCCCCC.
+    memset(settings, 0, sizeof(*settings));
+
+    // Fill in game settings structure with appropriate parameters
+    // for the new game
+
+    settings->deathmatch = deathmatch;
+    settings->episode = startepisode;
+    settings->map = startmap;
+    settings->skill = startskill;
+    // TODO settings->loadgame = startloadgame;
+    settings->gameversion = exe_hexen_1_1;
+    settings->nomonsters = nomonsters;
+    settings->respawn_monsters = respawnparm;
+    settings->timelimit = 0;
+
+    settings->lowres_turn = M_ParmExists("-record")
+                         && !M_ParmExists("-longtics");
+}
+
+static void InitConnectData(net_connect_data_t *connect_data)
+{
+    int i;
+
+    //
+    // Connect data
+    //
+
+    // Game type fields:
+
+    connect_data->gamemode = gamemode;
+    connect_data->gamemission = hexen;
+
+    // Are we recording a demo? Possibly set lowres turn mode
+
+    connect_data->lowres_turn = M_ParmExists("-record")
+                             && !M_ParmExists("-longtics");
+
+    connect_data->drone = false;
+    connect_data->max_players = maxplayers;
+
+    //!
+    // @category net
+    // @arg <n>
+    //
+    // Specify player class: 0=fighter, 1=cleric, 2=mage, 3=pig.
+    //
+
+    i = M_CheckParmWithArgs("-class", 1);
+
+    if (i > 0)
+    {
+        connect_data->player_class = atoi(myargv[i + 1]);
+    }
+    else
+    {
+        connect_data->player_class = PCLASS_FIGHTER;
+    }
+
+    // Read checksums of our WAD directory and dehacked information
+
+    W_Checksum(connect_data->wad_sha1sum);
+    memset(connect_data->deh_sha1sum, 0, sizeof(sha1_digest_t));
+
+    connect_data->is_freedoom = 0;
+}
+
+void D_ConnectNetGame(void)
+{
+    net_connect_data_t connect_data;
+
+    InitConnectData(&connect_data);
+    netgame = D_InitNetGame(&connect_data);
+
+    //!
+    // @category net
+    //
+    // Start the game playing as though in a netgame with a single
+    // player.  This can also be used to play back single player netgame
+    // demos.
+    //
+
+    if (M_CheckParm("-solo-net") > 0)
+    {
+        netgame = true;
+    }
+}
+
+static boolean StartupProgress(int now_ready, int total)
+{
+    static int ready = 0;
+
+    while (ready < now_ready)
+    {
+        ST_NetProgress();
+        ++ready;
+    }
+
+    ready = now_ready;
+
+    // Allow the user to hit escape during netgame startup to abort.
+    return !I_CheckAbortHR();
+}
+
+//
+// D_CheckNetGame
+// Works out player numbers among the net participants
+//
+
+void D_CheckNetGame(void)
+{
+    net_gamesettings_t settings;
+
+    D_RegisterLoopCallbacks(&hexen_loop_interface);
+
+    if (netgame)
+    {
+        autostart = true;
+    }
+
+    SaveGameSettings(&settings);
+    D_StartNetGame(&settings, StartupProgress);
+    LoadGameSettings(&settings);
+
+    // Finish netgame progress on startup screen.
+
+    if (netgame)
+    {
+        StartupProgress(settings.num_players, settings.num_players);
+        ST_NetDone();
+    }
+}
+
+//==========================================================================
+//
+// NET_SendFrags
+//
+//==========================================================================
+
+void NET_SendFrags(player_t * player)
+{
+    // Not sure what this is intended for. Unused?
+}
+
diff --git a/games/NXDoom/src/hexen/f_finale.c b/games/NXDoom/src/hexen/f_finale.c
new file mode 100644
index 000000000..93af19e7a
--- /dev/null
+++ b/games/NXDoom/src/hexen/f_finale.c
@@ -0,0 +1,387 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include <ctype.h>
+#include "v_video.h"
+#include "i_swap.h"
+#include "am_map.h"
+
+
+// MACROS ------------------------------------------------------------------
+
+#define	TEXTSPEED	3
+#define	TEXTWAIT	250
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void TextWrite(void);
+static void DrawPic(void);
+static void InitializeFade(boolean fadeIn);
+static void DeInitializeFade(void);
+static void FadePic(void);
+static char *GetFinaleText(int sequence);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DECLARATIONS ------------------------------------------------
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int FinaleStage;
+static int FinaleCount;
+static int FinaleEndCount;
+static int FinaleLumpNum;
+static int FontABaseLump;
+static char *FinaleText;
+
+static fixed_t *Palette;
+static fixed_t *PaletteDelta;
+static byte *RealPalette;
+
+// CODE --------------------------------------------------------------------
+
+//===========================================================================
+//
+// F_StartFinale
+//
+//===========================================================================
+
+void F_StartFinale(void)
+{
+    gameaction = ga_nothing;
+    gamestate = GS_FINALE;
+    viewactive = false;
+    automapactive = false;
+    P_ClearMessage(&players[consoleplayer]);
+
+    FinaleStage = 0;
+    FinaleCount = 0;
+    FinaleText = GetFinaleText(0);
+    FinaleEndCount = 70;
+    FinaleLumpNum = W_GetNumForName("FINALE1");
+    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
+    InitializeFade(1);
+
+//      S_ChangeMusic(mus_victor, true);
+    S_StartSongName("hall", false);     // don't loop the song
+}
+
+//===========================================================================
+//
+// F_Responder
+//
+//===========================================================================
+
+boolean F_Responder(event_t * event)
+{
+    return false;
+}
+
+//===========================================================================
+//
+// F_Ticker
+//
+//===========================================================================
+
+void F_Ticker(void)
+{
+    FinaleCount++;
+    if (FinaleStage < 5 && FinaleCount >= FinaleEndCount)
+    {
+        FinaleCount = 0;
+        FinaleStage++;
+        switch (FinaleStage)
+        {
+            case 1:            // Text 1
+                FinaleEndCount = strlen(FinaleText) * TEXTSPEED + TEXTWAIT;
+                break;
+            case 2:            // Pic 2, Text 2
+                FinaleText = GetFinaleText(1);
+                FinaleEndCount = strlen(FinaleText) * TEXTSPEED + TEXTWAIT;
+                FinaleLumpNum = W_GetNumForName("FINALE2");
+                S_StartSongName("orb", false);
+                break;
+            case 3:            // Pic 2 -- Fade out
+                FinaleEndCount = 70;
+                DeInitializeFade();
+                InitializeFade(0);
+                break;
+            case 4:            // Pic 3 -- Fade in
+                FinaleLumpNum = W_GetNumForName("FINALE3");
+                FinaleEndCount = 71;
+                DeInitializeFade();
+                InitializeFade(1);
+                S_StartSongName("chess", true);
+                break;
+            case 5:            // Pic 3 , Text 3
+                FinaleText = GetFinaleText(2);
+                DeInitializeFade();
+                break;
+            default:
+                break;
+        }
+        return;
+    }
+    if (FinaleStage == 0 || FinaleStage == 3 || FinaleStage == 4)
+    {
+        FadePic();
+    }
+}
+
+//===========================================================================
+//
+// TextWrite
+//
+//===========================================================================
+
+static void TextWrite(void)
+{
+    int count;
+    char *ch;
+    int c;
+    int cx, cy;
+    patch_t *w;
+
+    memcpy(I_VideoBuffer, W_CacheLumpNum(FinaleLumpNum, PU_CACHE),
+           SCREENWIDTH * SCREENHEIGHT);
+    if (FinaleStage == 5)
+    {                           // Chess pic, draw the correct character graphic
+        if (netgame)
+        {
+            V_DrawPatch(20, 0, W_CacheLumpName("chessall", PU_CACHE));
+        }
+        else if (PlayerClass[consoleplayer])
+        {
+            V_DrawPatch(60, 0, W_CacheLumpNum(W_GetNumForName("chessc")
+                                              + PlayerClass[consoleplayer] -
+                                              1, PU_CACHE));
+        }
+    }
+    // Draw the actual text
+    if (FinaleStage == 5)
+    {
+        cy = 135;
+    }
+    else
+    {
+        cy = 5;
+    }
+    cx = 20;
+    ch = FinaleText;
+    count = (FinaleCount - 10) / TEXTSPEED;
+    if (count < 0)
+    {
+        count = 0;
+    }
+    for (; count; count--)
+    {
+        c = *ch++;
+        if (!c)
+        {
+            break;
+        }
+        if (c == '\n')
+        {
+            cx = 20;
+            cy += 9;
+            continue;
+        }
+        if (c < 32)
+        {
+            continue;
+        }
+        c = toupper(c);
+        if (c == 32)
+        {
+            cx += 5;
+            continue;
+        }
+        w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        if (cx + SHORT(w->width) > SCREENWIDTH)
+        {
+            break;
+        }
+        V_DrawPatch(cx, cy, w);
+        cx += SHORT(w->width);
+    }
+}
+
+//===========================================================================
+//
+// InitializeFade
+//
+//===========================================================================
+
+static void InitializeFade(boolean fadeIn)
+{
+    unsigned i;
+
+    Palette = Z_Malloc(768 * sizeof(fixed_t), PU_STATIC, 0);
+    PaletteDelta = Z_Malloc(768 * sizeof(fixed_t), PU_STATIC, 0);
+    RealPalette = Z_Malloc(768 * sizeof(byte), PU_STATIC, 0);
+
+    if (fadeIn)
+    {
+        memset(RealPalette, 0, 768 * sizeof(byte));
+        for (i = 0; i < 768; i++)
+        {
+            Palette[i] = 0;
+            PaletteDelta[i] = FixedDiv((*((byte *) W_CacheLumpName("playpal",
+                                                                   PU_CACHE) +
+                                          i)) << FRACBITS, 70 * FRACUNIT);
+        }
+    }
+    else
+    {
+        for (i = 0; i < 768; i++)
+        {
+            RealPalette[i] =
+                *((byte *) W_CacheLumpName("playpal", PU_CACHE) + i);
+            Palette[i] = RealPalette[i] << FRACBITS;
+            PaletteDelta[i] = FixedDiv(Palette[i], -70 * FRACUNIT);
+        }
+    }
+    I_SetPalette(RealPalette);
+}
+
+//===========================================================================
+//
+// DeInitializeFade
+//
+//===========================================================================
+
+static void DeInitializeFade(void)
+{
+    Z_Free(Palette);
+    Z_Free(PaletteDelta);
+    Z_Free(RealPalette);
+}
+
+//===========================================================================
+//
+// FadePic
+//
+//===========================================================================
+
+static void FadePic(void)
+{
+    unsigned i;
+
+    for (i = 0; i < 768; i++)
+    {
+        Palette[i] += PaletteDelta[i];
+        RealPalette[i] = Palette[i] >> FRACBITS;
+    }
+    I_SetPalette(RealPalette);
+}
+
+//===========================================================================
+//
+// DrawPic
+//
+//===========================================================================
+
+static void DrawPic(void)
+{
+    memcpy(I_VideoBuffer, W_CacheLumpNum(FinaleLumpNum, PU_CACHE),
+           SCREENWIDTH * SCREENHEIGHT);
+    if (FinaleStage == 4 || FinaleStage == 5)
+    {                           // Chess pic, draw the correct character graphic
+        if (netgame)
+        {
+            V_DrawPatch(20, 0, W_CacheLumpName("chessall", PU_CACHE));
+        }
+        else if (PlayerClass[consoleplayer])
+        {
+            V_DrawPatch(60, 0, W_CacheLumpNum(W_GetNumForName("chessc")
+                                              + PlayerClass[consoleplayer] -
+                                              1, PU_CACHE));
+        }
+    }
+}
+
+//===========================================================================
+//
+// F_Drawer
+//
+//===========================================================================
+
+void F_Drawer(void)
+{
+    switch (FinaleStage)
+    {
+        case 0:                // Fade in initial finale screen
+            DrawPic();
+            break;
+        case 1:
+        case 2:
+            TextWrite();
+            break;
+        case 3:                // Fade screen out
+            DrawPic();
+            break;
+        case 4:                // Fade in chess screen
+            DrawPic();
+            break;
+        case 5:
+            TextWrite();
+            break;
+    }
+    UpdateState |= I_FULLSCRN;
+}
+
+//==========================================================================
+//
+// GetFinaleText
+//
+//==========================================================================
+
+static char *GetFinaleText(int sequence)
+{
+    const char *msgLumpName;
+    int msgSize;
+    int msgLump;
+    static const char *winMsgLumpNames[] = {
+        "win1msg",
+        "win2msg",
+        "win3msg"
+    };
+
+    msgLumpName = winMsgLumpNames[sequence];
+    msgLump = W_GetNumForName(msgLumpName);
+    msgSize = W_LumpLength(msgLump);
+    if (msgSize >= MAX_INTRMSN_MESSAGE_SIZE)
+    {
+        I_Error("Finale message too long (%s)", msgLumpName);
+    }
+    W_ReadLump(msgLump, ClusterMessage);
+    ClusterMessage[msgSize] = 0;        // Append terminator
+    return ClusterMessage;
+}
diff --git a/games/NXDoom/src/hexen/g_game.c b/games/NXDoom/src/hexen/g_game.c
new file mode 100644
index 000000000..ecfb38327
--- /dev/null
+++ b/games/NXDoom/src/hexen/g_game.c
@@ -0,0 +1,2347 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include <string.h>
+#include "m_random.h"
+#include "h2def.h"
+#include "s_sound.h"
+#include "doomkeys.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_video.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_argv.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "v_video.h"
+
+#define AM_STARTKEY	9
+
+// External functions
+
+
+// Functions
+
+void G_ReadDemoTiccmd(ticcmd_t * cmd);
+void G_WriteDemoTiccmd(ticcmd_t * cmd);
+
+void G_DoReborn(int playernum);
+
+void G_DoLoadLevel(void);
+void G_DoInitNew(void);
+void G_DoNewGame(void);
+void G_DoPlayDemo(void);
+void G_DoTeleportNewMap(void);
+void G_DoCompleted(void);
+void G_DoVictory(void);
+void G_DoWorldDone(void);
+void G_DoSaveGame(void);
+void G_DoSingleReborn(void);
+
+void H2_PageTicker(void);
+void H2_AdvanceDemo(void);
+
+static boolean InventoryMoveLeft();
+static boolean InventoryMoveRight();
+
+
+gameaction_t gameaction;
+gamestate_t gamestate;
+skill_t gameskill;
+//boolean         respawnmonsters;
+int gameepisode;
+int gamemap;
+int prevmap;
+
+boolean paused;
+boolean sendpause;              // send a pause event next tic
+boolean sendsave;               // send a save event next tic
+boolean usergame;               // ok to save / end game
+
+boolean timingdemo;             // if true, exit with report on completion
+int starttime;                  // for comparative timing purposes      
+
+boolean viewactive;
+
+boolean deathmatch;             // only if started as net death
+boolean netgame;                // only true if packets are broadcast
+boolean playeringame[MAXPLAYERS];
+player_t players[MAXPLAYERS];
+pclass_t PlayerClass[MAXPLAYERS];
+
+// Position indicator for cooperative net-play reborn
+int RebornPosition;
+
+int consoleplayer;              // player taking events and displaying
+int displayplayer;              // view being displayed
+int levelstarttic;              // gametic at level start
+
+char *demoname;
+boolean demorecording;
+boolean longtics;               // specify high resolution turning in demos
+boolean lowres_turn;
+boolean shortticfix;            // calculate lowres turning like doom
+boolean demoplayback;
+boolean demoextend;
+boolean netdemo;
+byte *demobuffer, *demo_p, *demoend;
+boolean singledemo;             // quit after playing a demo from cmdline
+
+boolean precache = true;        // if true, load all graphics at start
+
+// TODO: Hexen uses 16-bit shorts for consistancy?
+byte consistancy[MAXPLAYERS][BACKUPTICS];
+
+int mouseSensitivity = 5;
+
+int LeaveMap;
+static int LeavePosition;
+
+//#define MAXPLMOVE       0x32 // Old Heretic Max move
+
+fixed_t MaxPlayerMove[NUMCLASSES] = { 0x3C, 0x32, 0x2D, 0x31 };
+fixed_t forwardmove[NUMCLASSES][2] = {
+    {0x1D, 0x3C},
+    {0x19, 0x32},
+    {0x16, 0x2E},
+    {0x18, 0x31}
+};
+
+fixed_t sidemove[NUMCLASSES][2] = {
+    {0x1B, 0x3B},
+    {0x18, 0x28},
+    {0x15, 0x25},
+    {0x17, 0x27}
+};
+
+fixed_t angleturn[3] = { 640, 1280, 320 };      // + slow turn
+
+static int *weapon_keys[] =
+{
+    &key_weapon1,
+    &key_weapon2,
+    &key_weapon3,
+    &key_weapon4,
+};
+
+static int next_weapon = 0;
+
+#define SLOWTURNTICS    6
+
+boolean gamekeydown[NUMKEYS];
+int turnheld;                   // for accelerative turning
+int lookheld;
+
+
+boolean mousearray[MAX_MOUSE_BUTTONS + 1];
+boolean *mousebuttons = &mousearray[1];
+        // allow [-1]
+int mousex, mousey;             // mouse values are used once
+int dclicktime, dclickstate, dclicks;
+int dclicktime2, dclickstate2, dclicks2;
+
+#define MAX_JOY_BUTTONS 20
+
+int joyxmove, joyymove;         // joystick values are repeated
+int joystrafemove;
+int joylook;
+boolean joyarray[MAX_JOY_BUTTONS + 1];
+boolean *joybuttons = &joyarray[1];     // allow [-1]
+
+int savegameslot;
+char savedescription[32];
+
+int vanilla_demo_limit = 1;
+
+int inventoryTics;
+
+// haleyjd: removed externdriver crap
+
+static skill_t TempSkill;
+static int TempEpisode;
+static int TempMap;
+
+boolean testcontrols = false;
+int testcontrols_mousespeed;
+
+//=============================================================================
+/*
+====================
+=
+= G_BuildTiccmd
+=
+= Builds a ticcmd from all of the available inputs or reads it from the
+= demo buffer.
+= If recording a demo, write it out
+====================
+*/
+
+boolean usearti = true;
+
+void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
+{
+    int i;
+    boolean strafe, bstrafe;
+    int speed, tspeed, lspeed;
+    int forward, side;
+    int look, arti;
+    int flyheight;
+    int pClass;
+
+    // haleyjd: removed externdriver crap
+
+    pClass = players[consoleplayer].class;
+    memset(cmd, 0, sizeof(*cmd));
+
+//      cmd->consistancy =
+//              consistancy[consoleplayer][(maketic*ticdup)%BACKUPTICS];
+
+    cmd->consistancy = consistancy[consoleplayer][maketic % BACKUPTICS];
+
+//printf ("cons: %i\n",cmd->consistancy);
+
+    strafe = gamekeydown[key_strafe]
+          || mousebuttons[mousebstrafe]
+          || joybuttons[joybstrafe];
+
+    // Allow joybspeed hack.
+
+    speed = key_speed >= NUMKEYS
+        || joybspeed >= MAX_JOY_BUTTONS
+        || gamekeydown[key_speed]
+        || joybuttons[joybspeed]
+        || mousebuttons[mousebspeed];
+
+    // haleyjd: removed externdriver crap
+    
+    forward = side = look = arti = flyheight = 0;
+
+//
+// use two stage accelerative turning on the keyboard and joystick
+//
+    if (joyxmove < 0 || joyxmove > 0
+        || gamekeydown[key_right] || gamekeydown[key_left]
+        || mousebuttons[mousebturnright] || mousebuttons[mousebturnleft])
+        turnheld += ticdup;
+    else
+        turnheld = 0;
+    if (turnheld < SLOWTURNTICS)
+        tspeed = 2;             // slow turn
+    else
+        tspeed = speed;
+
+    if (gamekeydown[key_lookdown] || gamekeydown[key_lookup])
+    {
+        lookheld += ticdup;
+    }
+    else
+    {
+        lookheld = 0;
+    }
+    if (lookheld < SLOWTURNTICS)
+    {
+        lspeed = 1;             // 3;
+    }
+    else
+    {
+        lspeed = 2;             // 5;
+    }
+
+//
+// let movement keys cancel each other out
+//
+    if (strafe)
+    {
+        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+        {
+            side += sidemove[pClass][speed];
+        }
+        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+        {
+            side -= sidemove[pClass][speed];
+        }
+        if (use_analog && joyxmove)
+        {
+            joyxmove = joyxmove * joystick_move_sensitivity / 10;
+            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
+            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
+            side += FixedMul(sidemove[pClass][speed], joyxmove);
+        }
+        else if (joystick_move_sensitivity)
+        {
+            if (joyxmove > 0)
+            {
+                side += sidemove[pClass][speed];
+            }
+            if (joyxmove < 0)
+            {
+                side -= sidemove[pClass][speed];
+            }
+        }
+    }
+    else
+    {
+        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+            cmd->angleturn -= angleturn[tspeed];
+        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+            cmd->angleturn += angleturn[tspeed];
+        if (use_analog && joyxmove)
+        {
+            // Cubic response curve allows for finer control when stick
+            // deflection is small.
+            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
+            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
+            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
+        }
+        else if (joystick_turn_sensitivity)
+        {
+            if (joyxmove > 0)
+                cmd->angleturn -= angleturn[tspeed];
+            if (joyxmove < 0)
+                cmd->angleturn += angleturn[tspeed];
+        }
+    }
+
+    if (gamekeydown[key_up])
+    {
+        forward += forwardmove[pClass][speed];
+    }
+    if (gamekeydown[key_down])
+    {
+        forward -= forwardmove[pClass][speed];
+    }
+    if (use_analog && joyymove)
+    {
+        joyymove = joyymove * joystick_move_sensitivity / 10;
+        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
+        joyymove = (joyymove < -FRACUNIT) ? FRACUNIT : joyymove;
+        forward -= FixedMul(forwardmove[pClass][speed], joyymove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joyymove < 0)
+        {
+            forward += forwardmove[pClass][speed];
+        }
+        if (joyymove > 0)
+        {
+            forward -= forwardmove[pClass][speed];
+        }
+    }
+    if (gamekeydown[key_straferight] || mousebuttons[mousebstraferight]
+     || joybuttons[joybstraferight])
+    {
+        side += sidemove[pClass][speed];
+    }
+    if (gamekeydown[key_strafeleft] || mousebuttons[mousebstrafeleft]
+     || joybuttons[joybstrafeleft])
+    {
+        side -= sidemove[pClass][speed];
+    }
+
+    if (use_analog && joystrafemove)
+    {
+        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
+        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
+        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
+        side += FixedMul(sidemove[pClass][speed], joystrafemove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joystrafemove < 0)
+            side -= sidemove[pClass][speed];
+        if (joystrafemove > 0)
+            side += sidemove[pClass][speed];
+    }
+
+    // Look up/down/center keys
+    if (gamekeydown[key_lookup])
+    {
+        look = lspeed;
+    }
+    if (gamekeydown[key_lookdown])
+    {
+        look = -lspeed;
+    }
+    if (use_analog && joylook)
+    {
+        joylook = joylook * joystick_look_sensitivity / 10;
+        joylook = (joylook > FRACUNIT) ? FRACUNIT : joylook;
+        joylook = (joylook < -FRACUNIT) ? -FRACUNIT : joylook;
+        look = -FixedMul(2, joylook);
+    }
+    else if (joystick_look_sensitivity)
+    {
+        if (joylook < 0)
+        {
+            look = lspeed;
+        }
+
+        if (joylook > 0)
+        {
+            look = -lspeed;
+        }
+    }
+    // haleyjd: removed externdriver crap
+    if (gamekeydown[key_lookcenter])
+    {
+        look = TOCENTER;
+    }
+
+    // haleyjd: removed externdriver crap
+
+    // Fly up/down/drop keys
+    if (gamekeydown[key_flyup] || joybuttons[joybflyup])
+    {
+        flyheight = 5;          // note that the actual flyheight will be twice this
+    }
+    if (gamekeydown[key_flydown] || joybuttons[joybflydown])
+    {
+        flyheight = -5;
+    }
+    if (gamekeydown[key_flycenter] || joybuttons[joybflycenter])
+    {
+        flyheight = TOCENTER;
+        // haleyjd: removed externdriver crap
+        look = TOCENTER;
+    }
+    // Use artifact key
+    if (gamekeydown[key_useartifact] || mousebuttons[mousebuseartifact]
+        || joybuttons[joybuseartifact])
+    {
+        if (gamekeydown[key_speed] && artiskip)
+        {
+            if (players[consoleplayer].inventory[inv_ptr].type != arti_none)
+            {                   // Skip an artifact
+                gamekeydown[key_useartifact] = false;
+                mousebuttons[mousebuseartifact] = false;
+                joybuttons[joybuseartifact] = false;
+                P_PlayerNextArtifact(&players[consoleplayer]);
+            }
+        }
+        else
+        {
+            if (inventory)
+            {
+                players[consoleplayer].readyArtifact =
+                    players[consoleplayer].inventory[inv_ptr].type;
+                inventory = false;
+                cmd->arti = 0;
+                usearti = false;
+            }
+            else if (usearti)
+            {
+                cmd->arti |=
+                    players[consoleplayer].inventory[inv_ptr].
+                    type & AFLAG_MASK;
+                usearti = false;
+            }
+        }
+    }
+    if (gamekeydown[key_jump] || mousebuttons[mousebjump]
+        || joybuttons[joybjump])
+    {
+        cmd->arti |= AFLAG_JUMP;
+    }
+    if (mn_SuicideConsole)
+    {
+        cmd->arti |= AFLAG_SUICIDE;
+        mn_SuicideConsole = false;
+    }
+
+    // Artifact hot keys
+    if (gamekeydown[key_arti_all] && !cmd->arti)
+    {
+        gamekeydown[key_arti_all] = false;     // Use one of each artifact
+        cmd->arti = NUMARTIFACTS;
+    }
+    else if (gamekeydown[key_arti_health] && !cmd->arti
+             && (players[consoleplayer].mo->health < MAXHEALTH))
+    {
+        gamekeydown[key_arti_health] = false;
+        cmd->arti = arti_health;
+    }
+    else if (gamekeydown[key_arti_poisonbag] && !cmd->arti)
+    {
+        gamekeydown[key_arti_poisonbag] = false;
+        cmd->arti = arti_poisonbag;
+    }
+    else if (gamekeydown[key_arti_blastradius] && !cmd->arti)
+    {
+        gamekeydown[key_arti_blastradius] = false;
+        cmd->arti = arti_blastradius;
+    }
+    else if (gamekeydown[key_arti_teleport] && !cmd->arti)
+    {
+        gamekeydown[key_arti_teleport] = false;
+        cmd->arti = arti_teleport;
+    }
+    else if (gamekeydown[key_arti_teleportother] && !cmd->arti)
+    {
+        gamekeydown[key_arti_teleportother] = false;
+        cmd->arti = arti_teleportother;
+    }
+    else if (gamekeydown[key_arti_egg] && !cmd->arti)
+    {
+        gamekeydown[key_arti_egg] = false;
+        cmd->arti = arti_egg;
+    }
+    else if (gamekeydown[key_arti_invulnerability] && !cmd->arti
+             && !players[consoleplayer].powers[pw_invulnerability])
+    {
+        gamekeydown[key_arti_invulnerability] = false;
+        cmd->arti = arti_invulnerability;
+    }
+
+//
+// buttons
+//
+    cmd->chatchar = CT_dequeueChatChar();
+
+    if (gamekeydown[key_fire] || mousebuttons[mousebfire]
+        || joybuttons[joybfire])
+        cmd->buttons |= BT_ATTACK;
+
+    if (gamekeydown[key_use] || joybuttons[joybuse] || mousebuttons[mousebuse])
+    {
+        cmd->buttons |= BT_USE;
+        dclicks = 0;            // clear double clicks if hit use button
+    }
+
+    // Weapon cycling. Switch to previous or next weapon.
+    // (Disabled when player is a pig).
+    if (gamestate == GS_LEVEL
+     && players[consoleplayer].morphTics == 0 && next_weapon != 0)
+    {
+        int start_i;
+
+        if (players[consoleplayer].pendingweapon == WP_NOCHANGE)
+        {
+            i = players[consoleplayer].readyweapon;
+        }
+        else
+        {
+            i = players[consoleplayer].pendingweapon;
+        }
+
+        // Don't loop forever.
+        start_i = i;
+        do {
+            i = (i + next_weapon + NUMWEAPONS) % NUMWEAPONS;
+        } while (i != start_i && !players[consoleplayer].weaponowned[i]);
+
+        cmd->buttons |= BT_CHANGE;
+        cmd->buttons |= i << BT_WEAPONSHIFT;
+    }
+    else
+    {
+        for (i=0; i<arrlen(weapon_keys); ++i)
+        {
+            int key = *weapon_keys[i];
+
+            if (gamekeydown[key])
+            {
+                cmd->buttons |= BT_CHANGE; 
+                cmd->buttons |= i<<BT_WEAPONSHIFT; 
+                break; 
+            }
+        }
+    }
+
+    next_weapon = 0;
+
+//
+// mouse
+//
+    if (mousebuttons[mousebforward])
+    {
+        forward += forwardmove[pClass][speed];
+    }
+    if (mousebuttons[mousebbackward])
+    {
+        forward -= forwardmove[pClass][speed];
+    }
+
+    // Double click to use can be disabled
+
+    if (dclick_use)
+    {
+        //
+        // forward double click
+        //
+        if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1)
+        {
+            dclickstate = mousebuttons[mousebforward];
+            if (dclickstate)
+                dclicks++;
+            if (dclicks == 2)
+            {
+                cmd->buttons |= BT_USE;
+                dclicks = 0;
+            }
+            else
+                dclicktime = 0;
+        }
+        else
+        {
+            dclicktime += ticdup;
+            if (dclicktime > 20)
+            {
+                dclicks = 0;
+                dclickstate = 0;
+            }
+        }
+
+        //
+        // strafe double click
+        //
+        bstrafe = mousebuttons[mousebstrafe] || joybuttons[joybstrafe];
+        if (bstrafe != dclickstate2 && dclicktime2 > 1)
+        {
+            dclickstate2 = bstrafe;
+            if (dclickstate2)
+                dclicks2++;
+            if (dclicks2 == 2)
+            {
+                cmd->buttons |= BT_USE;
+                dclicks2 = 0;
+            }
+            else
+                dclicktime2 = 0;
+        }
+        else
+        {
+            dclicktime2 += ticdup;
+            if (dclicktime2 > 20)
+            {
+                dclicks2 = 0;
+                dclickstate2 = 0;
+            }
+        }
+    }
+
+    if (strafe)
+    {
+        side += mousex * 2;
+    }
+    else
+    {
+        cmd->angleturn -= mousex * 0x8;
+    }
+
+    if (mousex == 0)
+    {
+        testcontrols_mousespeed = 0;
+    }
+
+    forward += mousey;
+    mousex = mousey = 0;
+
+    if (forward > MaxPlayerMove[pClass])
+    {
+        forward = MaxPlayerMove[pClass];
+    }
+    else if (forward < -MaxPlayerMove[pClass])
+    {
+        forward = -MaxPlayerMove[pClass];
+    }
+    if (side > MaxPlayerMove[pClass])
+    {
+        side = MaxPlayerMove[pClass];
+    }
+    else if (side < -MaxPlayerMove[pClass])
+    {
+        side = -MaxPlayerMove[pClass];
+    }
+    if (players[consoleplayer].powers[pw_speed]
+        && !players[consoleplayer].morphTics)
+    {                           // Adjust for a player with a speed artifact
+        forward = (3 * forward) >> 1;
+        side = (3 * side) >> 1;
+    }
+    cmd->forwardmove += forward;
+    cmd->sidemove += side;
+    if (players[consoleplayer].playerstate == PST_LIVE)
+    {
+        if (look < 0)
+        {
+            look += 16;
+        }
+        cmd->lookfly = look;
+    }
+    if (flyheight < 0)
+    {
+        flyheight += 16;
+    }
+    cmd->lookfly |= flyheight << 4;
+
+//
+// special buttons
+//
+    if (sendpause)
+    {
+        sendpause = false;
+        cmd->buttons = BT_SPECIAL | BTS_PAUSE;
+    }
+
+    if (sendsave)
+    {
+        sendsave = false;
+        cmd->buttons =
+            BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
+    }
+
+    if (lowres_turn)
+    {
+        if (shortticfix)
+        {
+            static signed short carry = 0;
+            signed short desired_angleturn;
+
+            desired_angleturn = cmd->angleturn + carry;
+
+            // round angleturn to the nearest 256 unit boundary
+            // for recording demos with single byte values for turn
+
+            cmd->angleturn = (desired_angleturn + 128) & 0xff00;
+
+            // Carry forward the error from the reduced resolution to the
+            // next tic, so that successive small movements can accumulate.
+
+            carry = desired_angleturn - cmd->angleturn;
+        }
+        else
+        {
+            // truncate angleturn to the nearest 256 boundary
+            // for recording demos with single byte values for turn
+            cmd->angleturn &= 0xff00;
+        }
+    }
+}
+
+
+/*
+==============
+=
+= G_DoLoadLevel
+=
+==============
+*/
+
+void G_DoLoadLevel(void)
+{
+    int i;
+
+    levelstarttic = gametic;    // for time calculation 
+    gamestate = GS_LEVEL;
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (playeringame[i] && players[i].playerstate == PST_DEAD)
+            players[i].playerstate = PST_REBORN;
+        memset(players[i].frags, 0, sizeof(players[i].frags));
+    }
+
+    SN_StopAllSequences();
+    P_SetupLevel(gameepisode, gamemap, 0, gameskill);
+    displayplayer = consoleplayer;      // view the guy you are playing   
+    gameaction = ga_nothing;
+    Z_CheckHeap();
+
+//
+// clear cmd building stuff
+// 
+
+    memset(gamekeydown, 0, sizeof(gamekeydown));
+    joyxmove = joyymove = joystrafemove = joylook = 0;
+    mousex = mousey = 0;
+    sendpause = sendsave = paused = false;
+    memset(mousearray, 0, sizeof(mousearray));
+    memset(joyarray, 0, sizeof(joyarray));
+
+    if (testcontrols)
+    {
+        P_SetMessage(&players[consoleplayer], "PRESS ESCAPE TO QUIT.", false);
+    }
+}
+
+static void SetJoyButtons(unsigned int buttons_mask)
+{
+    int i;
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+
+    for (i=0; i<MAX_JOY_BUTTONS; ++i)
+    {
+        int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!joybuttons[i] && button_on)
+        {
+            // Weapon cycling:
+
+            if (i == joybprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == joybnextweapon)
+            {
+                next_weapon = 1;
+            }
+            else if (i == joybinvleft)
+            {
+                InventoryMoveLeft();
+            }
+            else if (i == joybinvright)
+            {
+                InventoryMoveRight();
+            }
+            else if (i == joybuseartifact)
+            {
+                if (!inventory)
+                {
+                    plr->readyArtifact = plr->inventory[inv_ptr].type;
+                }
+                usearti = true;
+            }
+        }
+
+        joybuttons[i] = button_on;
+    }
+}
+
+// If an InventoryMove*() function is called when the inventory is not active,
+// it will instead activate the inventory without attempting to change the
+// selected item. This action is indicated by a return value of false.
+// Otherwise, it attempts to change items and will return a value of true.
+
+static boolean InventoryMoveLeft()
+{
+    inventoryTics = 5 * 35;
+    if (!inventory)
+    {
+        inventory = true;
+        return false;
+    }
+    inv_ptr--;
+    if (inv_ptr < 0)
+    {
+        inv_ptr = 0;
+    }
+    else
+    {
+        curpos--;
+        if (curpos < 0)
+        {
+            curpos = 0;
+        }
+    }
+    return true;
+}
+
+static boolean InventoryMoveRight()
+{
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+    inventoryTics = 5 * 35;
+    if (!inventory)
+    {
+        inventory = true;
+        return false;
+    }
+    inv_ptr++;
+    if (inv_ptr >= plr->inventorySlotNum)
+    {
+        inv_ptr--;
+        if (inv_ptr < 0)
+            inv_ptr = 0;
+    }
+    else
+    {
+        curpos++;
+        if (curpos > 6)
+        {
+            curpos = 6;
+        }
+    }
+    return true;
+}
+
+static void SetMouseButtons(unsigned int buttons_mask)
+{
+    int i;
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+
+    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
+    {
+        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!mousebuttons[i] && button_on)
+        {
+            if (i == mousebprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == mousebnextweapon)
+            {
+                next_weapon = 1;
+            }
+            else if (i == mousebinvleft)
+            {
+                InventoryMoveLeft();
+            }
+            else if (i == mousebinvright)
+            {
+                InventoryMoveRight();
+            }
+            else if (i == mousebuseartifact)
+            {
+                if (!inventory)
+                {
+                    plr->readyArtifact = plr->inventory[inv_ptr].type;
+                }
+                usearti = true;
+            }
+        }
+
+        mousebuttons[i] = button_on;
+    }
+}
+
+/*
+===============================================================================
+=
+= G_Responder 
+=
+= get info needed to make ticcmd_ts for the players
+=
+===============================================================================
+*/
+
+boolean G_Responder(event_t * ev)
+{
+    player_t *plr;
+
+    plr = &players[consoleplayer];
+    if (ev->type == ev_keyup && ev->data1 == key_useartifact)
+    {                           // flag to denote that it's okay to use an artifact
+        if (!inventory)
+        {
+            plr->readyArtifact = plr->inventory[inv_ptr].type;
+        }
+        usearti = true;
+    }
+
+    // Check for spy mode player cycle
+    if (gamestate == GS_LEVEL && ev->type == ev_keydown
+        && ev->data1 == key_spy && !deathmatch)
+    {                           // Cycle the display player
+        do
+        {
+            displayplayer++;
+            if (displayplayer == maxplayers)
+            {
+                displayplayer = 0;
+            }
+        }
+        while (!playeringame[displayplayer]
+               && displayplayer != consoleplayer);
+        return (true);
+    }
+
+    if (CT_Responder(ev))
+    {                           // Chat ate the event
+        return (true);
+    }
+    if (gamestate == GS_LEVEL)
+    {
+        if (SB_Responder(ev))
+        {                       // Status bar ate the event
+            return (true);
+        }
+        if (AM_Responder(ev))
+        {                       // Automap ate the event
+            return (true);
+        }
+    }
+
+    if (ev->type == ev_mouse)
+    {
+        testcontrols_mousespeed = abs(ev->data2);
+    }
+
+    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
+    {
+        next_weapon = -1;
+    }
+    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
+    {
+        next_weapon = 1;
+    }
+
+    switch (ev->type)
+    {
+        case ev_keydown:
+            if (ev->data1 == key_invleft)
+            {
+                if (InventoryMoveLeft())
+                {
+                    return (true);
+                }
+                break;
+            }
+            if (ev->data1 == key_invright)
+            {
+                if (InventoryMoveRight())
+                {
+                    return (true);
+                }
+                break;
+            }
+            if (ev->data1 == key_pause && !MenuActive)
+            {
+                sendpause = true;
+                return (true);
+            }
+            if (ev->data1 < NUMKEYS)
+            {
+                gamekeydown[ev->data1] = true;
+            }
+            return (true);      // eat key down events
+
+        case ev_keyup:
+            if (ev->data1 < NUMKEYS)
+            {
+                gamekeydown[ev->data1] = false;
+            }
+            return (false);     // always let key up events filter down
+
+        case ev_mouse:
+            SetMouseButtons(ev->data1);
+            mousex = ev->data2 * (mouseSensitivity + 5) / 10;
+            mousey = ev->data3 * (mouseSensitivity + 5) / 10;
+            return (true);      // eat events
+
+        case ev_joystick:
+            SetJoyButtons(ev->data1);
+            joyxmove = ev->data2;
+            joyymove = ev->data3;
+            joystrafemove = ev->data4;
+            joylook = ev->data5;
+            return (true);      // eat events
+
+        default:
+            break;
+    }
+    return (false);
+}
+
+
+//==========================================================================
+//
+// G_Ticker
+//
+//==========================================================================
+
+void G_Ticker(void)
+{
+    int i, buf;
+    ticcmd_t *cmd = NULL;
+
+//
+// do player reborns if needed
+//
+    for (i = 0; i < maxplayers; i++)
+        if (playeringame[i] && players[i].playerstate == PST_REBORN)
+            G_DoReborn(i);
+
+//
+// do things to change the game state
+//
+    while (gameaction != ga_nothing)
+    {
+        switch (gameaction)
+        {
+            case ga_loadlevel:
+                G_DoLoadLevel();
+                break;
+            case ga_initnew:
+                G_DoInitNew();
+                break;
+            case ga_newgame:
+                G_DoNewGame();
+                break;
+            case ga_loadgame:
+                Draw_LoadIcon();
+                G_DoLoadGame();
+                break;
+            case ga_savegame:
+                Draw_SaveIcon();
+                G_DoSaveGame();
+                break;
+            case ga_singlereborn:
+                G_DoSingleReborn();
+                break;
+            case ga_playdemo:
+                G_DoPlayDemo();
+                break;
+            case ga_screenshot:
+                V_ScreenShot("HEXEN%02i.%s");
+                P_SetMessage(&players[consoleplayer], "SCREEN SHOT", false);
+                gameaction = ga_nothing;
+                break;
+            case ga_leavemap:
+                Draw_TeleportIcon();
+                G_DoTeleportNewMap();
+                break;
+            case ga_completed:
+                G_DoCompleted();
+                break;
+            case ga_worlddone:
+                G_DoWorldDone();
+                break;
+            case ga_victory:
+                F_StartFinale();
+                break;
+            default:
+                break;
+        }
+    }
+
+
+//
+// get commands, check consistancy, and build new consistancy check
+//
+    //buf = gametic%BACKUPTICS;
+    buf = (gametic / ticdup) % BACKUPTICS;
+
+    for (i = 0; i < maxplayers; i++)
+        if (playeringame[i])
+        {
+            cmd = &players[i].cmd;
+
+            memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
+
+            if (demoplayback)
+                G_ReadDemoTiccmd(cmd);
+            if (demorecording)
+                G_WriteDemoTiccmd(cmd);
+
+            if (netgame && !netdemo && !(gametic % ticdup))
+            {
+                if (gametic > BACKUPTICS
+                    && consistancy[i][buf] != cmd->consistancy)
+                {
+                    I_Error("consistency failure (%i should be %i)",
+                            cmd->consistancy, consistancy[i][buf]);
+                }
+                if (players[i].mo)
+                    consistancy[i][buf] = players[i].mo->x;
+                else
+                    consistancy[i][buf] = rndindex;
+            }
+        }
+
+//
+// check for special buttons
+//
+    for (i = 0; i < maxplayers; i++)
+        if (playeringame[i])
+        {
+            if (players[i].cmd.buttons & BT_SPECIAL)
+            {
+                switch (players[i].cmd.buttons & BT_SPECIALMASK)
+                {
+                    case BTS_PAUSE:
+                        paused ^= 1;
+                        if (paused)
+                        {
+                            S_PauseSound();
+                        }
+                        else
+                        {
+                            S_ResumeSound();
+                        }
+                        break;
+
+                    case BTS_SAVEGAME:
+                        if (!savedescription[0])
+                        {
+                            if (netgame)
+                            {
+                                M_StringCopy(savedescription, "NET GAME",
+                                             sizeof(savedescription));
+                            }
+                            else
+                            {
+                                M_StringCopy(savedescription, "SAVE GAME",
+                                             sizeof(savedescription));
+                            }
+                        }
+                        savegameslot =
+                            (players[i].cmd.
+                             buttons & BTS_SAVEMASK) >> BTS_SAVESHIFT;
+                        gameaction = ga_savegame;
+                        break;
+                }
+            }
+        }
+    // turn inventory off after a certain amount of time
+    if (inventory && !(--inventoryTics))
+    {
+        players[consoleplayer].readyArtifact =
+            players[consoleplayer].inventory[inv_ptr].type;
+        inventory = false;
+        cmd->arti = 0;
+    }
+//
+// do main actions
+//
+//
+// do main actions
+//
+    switch (gamestate)
+    {
+        case GS_LEVEL:
+            P_Ticker();
+            SB_Ticker();
+            AM_Ticker();
+            CT_Ticker();
+            break;
+        case GS_INTERMISSION:
+            IN_Ticker();
+            break;
+        case GS_FINALE:
+            F_Ticker();
+            break;
+        case GS_DEMOSCREEN:
+            H2_PageTicker();
+            break;
+    }
+}
+
+
+/*
+==============================================================================
+
+						PLAYER STRUCTURE FUNCTIONS
+
+also see P_SpawnPlayer in P_Things
+==============================================================================
+*/
+
+//==========================================================================
+//
+// G_PlayerExitMap
+//
+// Called when the player leaves a map.
+//
+//==========================================================================
+
+void G_PlayerExitMap(int playerNumber)
+{
+    int i;
+    player_t *player;
+    int flightPower;
+
+    player = &players[playerNumber];
+
+//      if(deathmatch)
+//      {
+//              // Strip all but one of each type of artifact
+//              for(i = 0; i < player->inventorySlotNum; i++)
+//              {
+//                      player->inventory[i].count = 1;
+//              }
+//              player->artifactCount = player->inventorySlotNum;
+//      }
+//      else
+
+    // Strip all current powers (retain flight)
+    flightPower = player->powers[pw_flight];
+    memset(player->powers, 0, sizeof(player->powers));
+    player->powers[pw_flight] = flightPower;
+
+    if (deathmatch)
+    {
+        player->powers[pw_flight] = 0;
+    }
+    else
+    {
+        if (P_GetMapCluster(gamemap) != P_GetMapCluster(LeaveMap))
+        {                       // Entering new cluster
+            // Strip all keys
+            player->keys = 0;
+
+            // Strip flight artifact
+            for (i = 0; i < 25; i++)
+            {
+                player->powers[pw_flight] = 0;
+                P_PlayerUseArtifact(player, arti_fly);
+            }
+            player->powers[pw_flight] = 0;
+        }
+    }
+
+    if (player->morphTics)
+    {
+        player->readyweapon = player->mo->special1.i;     // Restore weapon
+        player->morphTics = 0;
+    }
+    player->messageTics = 0;
+    player->lookdir = 0;
+    player->mo->flags &= ~MF_SHADOW;    // Remove invisibility
+    player->extralight = 0;     // Remove weapon flashes
+    player->fixedcolormap = 0;  // Remove torch
+    player->damagecount = 0;    // No palette changes
+    player->bonuscount = 0;
+    player->poisoncount = 0;
+    if (player == &players[consoleplayer])
+    {
+        SB_state = -1;          // refresh the status bar
+        viewangleoffset = 0;
+    }
+}
+
+//==========================================================================
+//
+// G_PlayerReborn
+//
+// Called after a player dies.  Almost everything is cleared and
+// initialized.
+//
+//==========================================================================
+
+void G_PlayerReborn(int player)
+{
+    player_t *p;
+    int frags[MAXPLAYERS];
+    int killcount, itemcount, secretcount;
+    unsigned int worldTimer;
+
+    memcpy(frags, players[player].frags, sizeof(frags));
+    killcount = players[player].killcount;
+    itemcount = players[player].itemcount;
+    secretcount = players[player].secretcount;
+    worldTimer = players[player].worldTimer;
+
+    p = &players[player];
+    memset(p, 0, sizeof(*p));
+
+    memcpy(players[player].frags, frags, sizeof(players[player].frags));
+    players[player].killcount = killcount;
+    players[player].itemcount = itemcount;
+    players[player].secretcount = secretcount;
+    players[player].worldTimer = worldTimer;
+    players[player].class = PlayerClass[player];
+
+    p->usedown = p->attackdown = true;  // don't do anything immediately
+    p->playerstate = PST_LIVE;
+    p->health = MAXHEALTH;
+    p->readyweapon = p->pendingweapon = WP_FIRST;
+    p->weaponowned[WP_FIRST] = true;
+    p->messageTics = 0;
+    p->lookdir = 0;
+    localQuakeHappening[player] = false;
+    if (p == &players[consoleplayer])
+    {
+        SB_state = -1;          // refresh the status bar
+        inv_ptr = 0;            // reset the inventory pointer
+        curpos = 0;
+        viewangleoffset = 0;
+    }
+}
+
+/*
+====================
+=
+= G_CheckSpot 
+=
+= Returns false if the player cannot be respawned at the given mapthing_t spot 
+= because something is occupying it
+====================
+*/
+
+void P_SpawnPlayer(mapthing_t * mthing);
+
+boolean G_CheckSpot(int playernum, mapthing_t * mthing)
+{
+    fixed_t x, y;
+    subsector_t *ss;
+    unsigned an;
+    mobj_t *mo;
+
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+
+    players[playernum].mo->flags2 &= ~MF2_PASSMOBJ;
+    if (!P_CheckPosition(players[playernum].mo, x, y))
+    {
+        players[playernum].mo->flags2 |= MF2_PASSMOBJ;
+        return false;
+    }
+    players[playernum].mo->flags2 |= MF2_PASSMOBJ;
+
+// spawn a teleport fog
+    ss = R_PointInSubsector(x, y);
+    an = ((unsigned) ANG45 * (mthing->angle / 45)) >> ANGLETOFINESHIFT;
+
+    mo = P_SpawnMobj(x + 20 * finecosine[an], y + 20 * finesine[an],
+                     ss->sector->floorheight + TELEFOGHEIGHT, MT_TFOG);
+    if (players[consoleplayer].viewz != 1)
+        S_StartSound(mo, SFX_TELEPORT); // don't start sound on first frame
+
+    return true;
+}
+
+/*
+====================
+=
+= G_DeathMatchSpawnPlayer
+=
+= Spawns a player at one of the random death match spots
+= called at level load and each death
+====================
+*/
+
+void G_DeathMatchSpawnPlayer(int playernum)
+{
+    int i, j;
+    int selections;
+
+    selections = deathmatch_p - deathmatchstarts;
+
+    // This check has been moved to p_setup.c:P_LoadThings()
+    //if (selections < 8)
+    //      I_Error ("Only %i deathmatch spots, 8 required", selections);
+
+    for (j = 0; j < 20; j++)
+    {
+        i = P_Random() % selections;
+        if (G_CheckSpot(playernum, &deathmatchstarts[i]))
+        {
+            deathmatchstarts[i].type = playernum + 1;
+            P_SpawnPlayer(&deathmatchstarts[i]);
+            return;
+        }
+    }
+
+// no good spot, so the player will probably get stuck
+    P_SpawnPlayer(&playerstarts[0][playernum]);
+}
+
+//==========================================================================
+//
+// G_DoReborn
+//
+//==========================================================================
+
+void G_DoReborn(int playernum)
+{
+    int i;
+    boolean oldWeaponowned[NUMWEAPONS];
+    int oldKeys;
+    int oldPieces;
+    boolean foundSpot;
+    int bestWeapon;
+
+    // quit demo unless -demoextend
+    if (!demoextend && G_CheckDemoStatus())
+    {
+        return;
+    }
+    if (!netgame)
+    {
+        if (SV_RebornSlotAvailable())
+        {                       // Use the reborn code if the slot is available
+            gameaction = ga_singlereborn;
+        }
+        else
+        {                       // Start a new game if there's no reborn info
+            gameaction = ga_newgame;
+        }
+    }
+    else
+    {                           // Net-game
+        players[playernum].mo->player = NULL;   // Dissassociate the corpse
+
+        if (deathmatch)
+        {                       // Spawn at random spot if in death match
+            G_DeathMatchSpawnPlayer(playernum);
+            return;
+        }
+
+        // Cooperative net-play, retain keys and weapons
+        oldKeys = players[playernum].keys;
+        oldPieces = players[playernum].pieces;
+        for (i = 0; i < NUMWEAPONS; i++)
+        {
+            oldWeaponowned[i] = players[playernum].weaponowned[i];
+        }
+
+        foundSpot = false;
+        if (G_CheckSpot(playernum, &playerstarts[RebornPosition][playernum]))
+        {                       // Appropriate player start spot is open
+            P_SpawnPlayer(&playerstarts[RebornPosition][playernum]);
+            foundSpot = true;
+        }
+        else
+        {
+            // Try to spawn at one of the other player start spots
+            for (i = 0; i < maxplayers; i++)
+            {
+                if (G_CheckSpot(playernum, &playerstarts[RebornPosition][i]))
+                {               // Found an open start spot
+
+                    // Fake as other player
+                    playerstarts[RebornPosition][i].type = playernum + 1;
+                    P_SpawnPlayer(&playerstarts[RebornPosition][i]);
+
+                    // Restore proper player type
+                    playerstarts[RebornPosition][i].type = i + 1;
+
+                    foundSpot = true;
+                    break;
+                }
+            }
+        }
+
+        if (foundSpot == false)
+        {                       // Player's going to be inside something
+            P_SpawnPlayer(&playerstarts[RebornPosition][playernum]);
+        }
+
+        // Restore keys and weapons
+        players[playernum].keys = oldKeys;
+        players[playernum].pieces = oldPieces;
+        for (bestWeapon = 0, i = 0; i < NUMWEAPONS; i++)
+        {
+            if (oldWeaponowned[i])
+            {
+                bestWeapon = i;
+                players[playernum].weaponowned[i] = true;
+            }
+        }
+        players[playernum].mana[MANA_1] = 25;
+        players[playernum].mana[MANA_2] = 25;
+        if (bestWeapon)
+        {                       // Bring up the best weapon
+            players[playernum].pendingweapon = bestWeapon;
+        }
+    }
+}
+
+void G_ScreenShot(void)
+{
+    gameaction = ga_screenshot;
+}
+
+//==========================================================================
+//
+// G_StartNewInit
+//
+//==========================================================================
+
+void G_StartNewInit(void)
+{
+    SV_InitBaseSlot();
+    SV_ClearRebornSlot();
+    P_ACSInitNewGame();
+    // Default the player start spot group to 0
+    RebornPosition = 0;
+}
+
+//==========================================================================
+//
+// G_StartNewGame
+//
+//==========================================================================
+
+void G_StartNewGame(skill_t skill)
+{
+    int realMap;
+
+    G_StartNewInit();
+    realMap = P_TranslateMap(1);
+    if (realMap == -1)
+    {
+        realMap = 1;
+    }
+    G_InitNew(TempSkill, 1, realMap);
+}
+
+//==========================================================================
+//
+// G_TeleportNewMap
+//
+// Only called by the warp cheat code.  Works just like normal map to map
+// teleporting, but doesn't do any interlude stuff.
+//
+//==========================================================================
+
+void G_TeleportNewMap(int map, int position)
+{
+    gameaction = ga_leavemap;
+    LeaveMap = map;
+    LeavePosition = position;
+}
+
+//==========================================================================
+//
+// G_DoTeleportNewMap
+//
+//==========================================================================
+
+void G_DoTeleportNewMap(void)
+{
+    SV_MapTeleport(LeaveMap, LeavePosition);
+    gamestate = GS_LEVEL;
+    gameaction = ga_nothing;
+    RebornPosition = LeavePosition;
+}
+
+/*
+boolean secretexit;
+void G_ExitLevel (void)
+{
+	secretexit = false;
+	gameaction = ga_completed;
+}
+void G_SecretExitLevel (void)
+{
+	secretexit = true;
+	gameaction = ga_completed;
+}
+*/
+
+//==========================================================================
+//
+// G_Completed
+//
+// Starts intermission routine, which is used only during hub exits,
+// and DeathMatch games.
+//==========================================================================
+
+void G_Completed(int map, int position)
+{
+    if (gamemode == shareware && map > 4)
+    {
+        P_SetMessage(&players[consoleplayer], "ACCESS DENIED -- DEMO", true);
+        S_StartSound(NULL, SFX_CHAT);
+        return;
+    }
+
+    gameaction = ga_completed;
+    LeaveMap = map;
+    LeavePosition = position;
+}
+
+void G_DoCompleted(void)
+{
+    int i;
+
+    gameaction = ga_nothing;
+
+    // quit demo unless -demoextend
+    if (!demoextend && G_CheckDemoStatus())
+    {
+        return;
+    }
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (playeringame[i])
+        {
+            G_PlayerExitMap(i);
+        }
+    }
+    if (LeaveMap == -1 && LeavePosition == -1)
+    {
+        gameaction = ga_victory;
+        return;
+    }
+    else
+    {
+        gamestate = GS_INTERMISSION;
+        IN_Start();
+    }
+
+/*
+	int i;
+	static int afterSecret[3] = { 7, 5, 5 };
+
+	gameaction = ga_nothing;
+	if(G_CheckDemoStatus())
+	{
+		return;
+	}
+	for(i = 0; i < maxplayers; i++)
+	{
+		if(playeringame[i])
+		{
+			G_PlayerFinishLevel(i);
+		}
+	}
+	prevmap = gamemap;
+	if(secretexit == true)
+	{
+		gamemap = 9;
+	}
+	else if(gamemap == 9)
+	{ // Finished secret level
+		gamemap = afterSecret[gameepisode-1];
+	}
+	else if(gamemap == 8)
+	{
+		gameaction = ga_victory;
+		return;
+	}
+	else
+	{
+		gamemap++;
+	}
+	gamestate = GS_INTERMISSION;
+	IN_Start();
+*/
+}
+
+//============================================================================
+//
+// G_WorldDone
+//
+//============================================================================
+
+void G_WorldDone(void)
+{
+    gameaction = ga_worlddone;
+}
+
+//============================================================================
+//
+// G_DoWorldDone
+//
+//============================================================================
+
+void G_DoWorldDone(void)
+{
+    gamestate = GS_LEVEL;
+    G_DoLoadLevel();
+    gameaction = ga_nothing;
+    viewactive = true;
+}
+
+//==========================================================================
+//
+// G_DoSingleReborn
+//
+// Called by G_Ticker based on gameaction.  Loads a game from the reborn
+// save slot.
+//
+//==========================================================================
+
+void G_DoSingleReborn(void)
+{
+    gameaction = ga_nothing;
+    SV_LoadGame(SV_GetRebornSlot());
+    SB_SetClassData();
+}
+
+//==========================================================================
+//
+// G_LoadGame
+//
+// Can be called by the startup code or the menu task.
+//
+//==========================================================================
+
+static int GameLoadSlot;
+
+void G_LoadGame(int slot)
+{
+    GameLoadSlot = slot;
+    gameaction = ga_loadgame;
+}
+
+//==========================================================================
+//
+// G_DoLoadGame
+//
+// Called by G_Ticker based on gameaction.
+//
+//==========================================================================
+
+void G_DoLoadGame(void)
+{
+    gameaction = ga_nothing;
+    SV_LoadGame(GameLoadSlot);
+    if (!netgame)
+    {                           // Copy the base slot to the reborn slot
+        SV_UpdateRebornSlot();
+    }
+    SB_SetClassData();
+}
+
+//==========================================================================
+//
+// G_SaveGame
+//
+// Called by the menu task.  <description> is a 24 byte text string.
+//
+//==========================================================================
+
+void G_SaveGame(int slot, char *description)
+{
+    savegameslot = slot;
+    M_StringCopy(savedescription, description, sizeof(savedescription));
+    sendsave = true;
+}
+
+//==========================================================================
+//
+// G_DoSaveGame
+//
+// Called by G_Ticker based on gameaction.
+//
+//==========================================================================
+
+void G_DoSaveGame(void)
+{
+    SV_SaveGame(savegameslot, savedescription);
+    gameaction = ga_nothing;
+    savedescription[0] = 0;
+    P_SetMessage(&players[consoleplayer], TXT_GAMESAVED, true);
+}
+
+//==========================================================================
+//
+// G_DeferredNewGame
+//
+//==========================================================================
+
+void G_DeferredNewGame(skill_t skill)
+{
+    TempSkill = skill;
+    gameaction = ga_newgame;
+}
+
+//==========================================================================
+//
+// G_DoNewGame
+//
+//==========================================================================
+
+void G_DoNewGame(void)
+{
+    G_StartNewGame(TempSkill);
+    gameaction = ga_nothing;
+}
+
+/*
+====================
+=
+= G_InitNew
+=
+= Can be called by the startup code or the menu task
+= consoleplayer, displayplayer, playeringame[] should be set
+====================
+*/
+
+void G_DeferedInitNew(skill_t skill, int episode, int map)
+{
+    TempSkill = skill;
+    TempEpisode = episode;
+    TempMap = map;
+    gameaction = ga_initnew;
+}
+
+void G_DoInitNew(void)
+{
+    SV_InitBaseSlot();
+    G_InitNew(TempSkill, TempEpisode, TempMap);
+    gameaction = ga_nothing;
+}
+
+void G_InitNew(skill_t skill, int episode, int map)
+{
+    int i;
+
+    if (paused)
+    {
+        paused = false;
+        S_ResumeSound();
+    }
+    if (skill < sk_baby)
+    {
+        skill = sk_baby;
+    }
+    if (skill > sk_nightmare)
+    {
+        skill = sk_nightmare;
+    }
+    if (map < 1)
+    {
+        map = 1;
+    }
+    if (map > 99)
+    {
+        map = 99;
+    }
+    M_ClearRandom();
+    // Force players to be initialized upon first level load
+    for (i = 0; i < maxplayers; i++)
+    {
+        players[i].playerstate = PST_REBORN;
+        players[i].worldTimer = 0;
+    }
+
+    // Set up a bunch of globals
+    if (!demoextend)
+    {
+        // This prevents map-loading from interrupting a demo.
+        // demoextend is set back to false only if starting a new game or
+        // loading a saved one from the menu, and only during playback.
+        demorecording = false;
+        demoplayback = false;
+        netdemo = false;
+        usergame = true;            // will be set false if a demo
+    }
+    paused = false;
+    viewactive = true;
+    gameepisode = episode;
+    gamemap = map;
+    gameskill = skill;
+    BorderNeedRefresh = true;
+
+    // Initialize the sky
+    R_InitSky(map);
+
+    // Give one null ticcmd_t
+    //gametic = 0;
+    //maketic = 1;
+    //for (i=0 ; i<maxplayers ; i++)
+    //      nettics[i] = 1; // one null event for this gametic
+    //memset (localcmds,0,sizeof(localcmds));
+    //memset (netcmds,0,sizeof(netcmds));
+
+    G_DoLoadLevel();
+}
+
+/*
+===============================================================================
+
+							DEMO RECORDING
+
+===============================================================================
+*/
+
+#define DEMOMARKER      0x80
+#define DEMOHEADER_RESPAWN    0x20
+#define DEMOHEADER_LONGTICS   0x10
+#define DEMOHEADER_NOMONSTERS 0x02
+
+void G_ReadDemoTiccmd(ticcmd_t * cmd)
+{
+    if (*demo_p == DEMOMARKER)
+    {                           // end of demo data stream
+        G_CheckDemoStatus();
+        return;
+    }
+    cmd->forwardmove = ((signed char) *demo_p++);
+    cmd->sidemove = ((signed char) *demo_p++);
+
+    // If this is a longtics demo, read back in higher resolution
+
+    if (longtics)
+    {
+        cmd->angleturn = *demo_p++;
+        cmd->angleturn |= (*demo_p++) << 8;
+    }
+    else
+    {
+        cmd->angleturn = ((unsigned char) *demo_p++) << 8;
+    }
+
+    cmd->buttons = (unsigned char) *demo_p++;
+    cmd->lookfly = (unsigned char) *demo_p++;
+    cmd->arti = (unsigned char) *demo_p++;
+}
+
+// Increase the size of the demo buffer to allow unlimited demos
+
+static void IncreaseDemoBuffer(void)
+{
+    int current_length;
+    byte *new_demobuffer;
+    byte *new_demop;
+    int new_length;
+
+    // Find the current size
+
+    current_length = demoend - demobuffer;
+
+    // Generate a new buffer twice the size
+    new_length = current_length * 2;
+
+    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
+    new_demop = new_demobuffer + (demo_p - demobuffer);
+
+    // Copy over the old data
+
+    memcpy(new_demobuffer, demobuffer, current_length);
+
+    // Free the old buffer and point the demo pointers at the new buffer.
+
+    Z_Free(demobuffer);
+
+    demobuffer = new_demobuffer;
+    demo_p = new_demop;
+    demoend = demobuffer + new_length;
+}
+
+void G_WriteDemoTiccmd(ticcmd_t * cmd)
+{
+    byte *demo_start;
+
+    if (gamekeydown[key_demo_quit]) // press to end demo recording
+        G_CheckDemoStatus();
+
+    demo_start = demo_p;
+
+    *demo_p++ = cmd->forwardmove;
+    *demo_p++ = cmd->sidemove;
+
+    // If this is a longtics demo, record in higher resolution
+
+    if (longtics)
+    {
+        *demo_p++ = (cmd->angleturn & 0xff);
+        *demo_p++ = (cmd->angleturn >> 8) & 0xff;
+    }
+    else
+    {
+        *demo_p++ = cmd->angleturn >> 8;
+    }
+
+    *demo_p++ = cmd->buttons;
+    *demo_p++ = cmd->lookfly;
+    *demo_p++ = cmd->arti;
+
+    // reset demo pointer back
+    demo_p = demo_start;
+
+    if (demo_p > demoend - 16)
+    {
+        if (vanilla_demo_limit)
+        {
+            // no more space
+            G_CheckDemoStatus();
+            return;
+        }
+        else
+        {
+            // Vanilla demo limit disabled: unlimited
+            // demo lengths!
+
+            IncreaseDemoBuffer();
+        }
+    }
+
+    G_ReadDemoTiccmd(cmd);      // make SURE it is exactly the same
+}
+
+
+
+/*
+===================
+=
+= G_RecordDemo
+=
+===================
+*/
+
+void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
+                  const char *name)
+{
+    size_t demoname_size;
+    int i;
+    int maxsize;
+
+    //!
+    // @category demo
+    //
+    // Record or playback a demo with high resolution turning.
+    //
+
+    longtics = D_NonVanillaRecord(M_ParmExists("-longtics"),
+                                  "vvHeretic longtics demo");
+
+    // If not recording a longtics demo, record in low res
+
+    lowres_turn = !longtics;
+
+    //!
+    // @category demo
+    //
+    // Smooth out low resolution turning when recording a demo.
+    //
+
+    shortticfix = M_ParmExists("-shortticfix");
+
+    G_InitNew(skill, episode, map);
+    usergame = false;
+    demoname_size = strlen(name) + 5;
+    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
+    M_snprintf(demoname, demoname_size, "%s.lmp", name);
+    maxsize = 0x20000;
+
+    //!
+    // @arg <size>
+    // @category demo
+    // @vanilla
+    //
+    // Specify the demo buffer size (KiB)
+    //
+
+    i = M_CheckParmWithArgs("-maxdemo", 1);
+    if (i)
+        maxsize = atoi(myargv[i + 1]) * 1024;
+    demobuffer = Z_Malloc(maxsize, PU_STATIC, NULL);
+    demoend = demobuffer + maxsize;
+
+    demo_p = demobuffer;
+    *demo_p++ = skill;
+    *demo_p++ = episode;
+    *demo_p++ = map;
+
+    // Write special parameter bits onto player one byte.
+    // This aligns with vvHeretic demo usage. Hexen demo support has no
+    // precedent here so consistency with another game is chosen:
+    //   0x20 = -respawn
+    //   0x10 = -longtics
+    //   0x02 = -nomonsters
+
+    *demo_p = 1; // assume player one exists
+    if (D_NonVanillaRecord(respawnparm, "vvHeretic -respawn header flag"))
+    {
+        *demo_p |= DEMOHEADER_RESPAWN;
+    }
+    if (longtics)
+    {
+        *demo_p |= DEMOHEADER_LONGTICS;
+    }
+    if (D_NonVanillaRecord(nomonsters, "vvHeretic -nomonsters header flag"))
+    {
+        *demo_p |= DEMOHEADER_NOMONSTERS;
+    }
+    demo_p++;
+    *demo_p++ = PlayerClass[0];
+
+    for (i = 1; i < maxplayers; i++)
+    {
+        *demo_p++ = playeringame[i];
+        *demo_p++ = PlayerClass[i];
+    }
+
+    demorecording = true;
+}
+
+
+/*
+===================
+=
+= G_PlayDemo
+=
+===================
+*/
+
+static const char *defdemoname;
+
+void G_DeferedPlayDemo(const char *name)
+{
+    defdemoname = name;
+    gameaction = ga_playdemo;
+}
+
+void G_DoPlayDemo(void)
+{
+    skill_t skill;
+    int i, lumpnum, episode, map;
+
+    gameaction = ga_nothing;
+    lumpnum = W_GetNumForName(defdemoname);
+    demobuffer = W_CacheLumpNum(lumpnum, PU_STATIC);
+    demo_p = demobuffer;
+    skill = *demo_p++;
+    episode = *demo_p++;
+    map = *demo_p++;
+
+    // When recording we store some extra options inside the upper bits
+    // of the player 1 present byte. However, this is a non-vanilla extension.
+    // Note references to vvHeretic here; these are the extensions used by
+    // vvHeretic, which we're just reusing for Hexen demos too. There is no
+    // vvHexen.
+    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_LONGTICS) != 0,
+                             lumpnum, "vvHeretic longtics demo"))
+    {
+        longtics = true;
+    }
+    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_RESPAWN) != 0,
+                             lumpnum, "vvHeretic -respawn header flag"))
+    {
+        respawnparm = true;
+    }
+    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_NOMONSTERS) != 0,
+                             lumpnum, "vvHeretic -nomonsters header flag"))
+    {
+        nomonsters = true;
+    }
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        playeringame[i] = (*demo_p++) != 0;
+        PlayerClass[i] = *demo_p++;
+    }
+
+    if (playeringame[1] || M_ParmExists("-solo-net")
+                        || M_ParmExists("-netdemo"))
+    {
+        netgame = true;
+    }
+
+    // Initialize world info, etc.
+    G_StartNewInit();
+
+    precache = false;           // don't spend a lot of time in loadlevel
+    G_InitNew(skill, episode, map);
+    precache = true;
+    usergame = false;
+    demoplayback = true;
+
+    if (netgame)
+    {
+        netdemo = true;
+    }
+}
+
+
+/*
+===================
+=
+= G_TimeDemo
+=
+===================
+*/
+
+void G_TimeDemo(char *name)
+{
+    skill_t skill;
+    int episode, map, i;
+
+    demobuffer = demo_p = W_CacheLumpName(name, PU_STATIC);
+    skill = *demo_p++;
+    episode = *demo_p++;
+    map = *demo_p++;
+
+    // Read special parameter bits: see G_RecordDemo() for details.
+    longtics = (*demo_p & DEMOHEADER_LONGTICS) != 0;
+
+    // don't overwrite arguments from the command line
+    respawnparm |= (*demo_p & DEMOHEADER_RESPAWN) != 0;
+    nomonsters  |= (*demo_p & DEMOHEADER_NOMONSTERS) != 0;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        playeringame[i] = (*demo_p++) != 0;
+        PlayerClass[i] = *demo_p++;
+    }
+
+    if (playeringame[1] || M_ParmExists("-solo-net")
+                        || M_ParmExists("-netdemo"))
+    {
+        netgame = true;
+    }
+
+    G_InitNew(skill, episode, map);
+    starttime = I_GetTime();
+
+    usergame = false;
+    demoplayback = true;
+    timingdemo = true;
+    singletics = true;
+
+    if (netgame)
+    {
+        netdemo = true;
+    }
+}
+
+
+/*
+===================
+=
+= G_CheckDemoStatus
+=
+= Called after a death or level completion to allow demos to be cleaned up
+= Returns true if a new demo loop action will take place
+===================
+*/
+
+boolean G_CheckDemoStatus(void)
+{
+    int endtime, realtics;
+
+    if (timingdemo)
+    {
+        float fps;
+        endtime = I_GetTime();
+        realtics = endtime - starttime;
+        fps = ((float) gametic * TICRATE) / realtics;
+        I_Error("timed %i gametics in %i realtics (%f fps)",
+                gametic, realtics, fps);
+    }
+
+    if (demoplayback)
+    {
+        if (singledemo)
+            I_Quit();
+
+        W_ReleaseLumpName(defdemoname);
+        demoplayback = false;
+        netdemo = false;
+        netgame = false;
+        H2_AdvanceDemo();
+        return true;
+    }
+
+    if (demorecording)
+    {
+        *demo_p++ = DEMOMARKER;
+        M_WriteFile(demoname, demobuffer, demo_p - demobuffer);
+        Z_Free(demobuffer);
+        demorecording = false;
+        I_Error("Demo %s recorded", demoname);
+    }
+
+    return false;
+}
diff --git a/games/NXDoom/src/hexen/h2_main.c b/games/NXDoom/src/hexen/h2_main.c
new file mode 100644
index 000000000..0a7bff85f
--- /dev/null
+++ b/games/NXDoom/src/hexen/h2_main.c
@@ -0,0 +1,1227 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+// haleyjd: removed WATCOMC
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "config.h"
+
+#include "h2def.h"
+#include "ct_chat.h"
+#include "d_iwad.h"
+#include "d_mode.h"
+#include "m_misc.h"
+#include "s_sound.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "net_client.h"
+#include "p_local.h"
+#include "v_video.h"
+#include "w_main.h"
+#include "am_map.h"
+
+#include "hexen_icon.c"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAXWADFILES 20
+#define CT_KEY_BLUE         'b'
+#define CT_KEY_RED          'r'
+#define CT_KEY_YELLOW       'y'
+#define CT_KEY_GREEN        'g'
+#define CT_KEY_PLAYER5      'j'     // Jade
+#define CT_KEY_PLAYER6      'w'     // White
+#define CT_KEY_PLAYER7      'h'     // Hazel
+#define CT_KEY_PLAYER8      'p'     // Purple
+#define CT_KEY_ALL          't'
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+void R_ExecuteSetViewSize(void);
+void D_ConnectNetGame(void);
+void D_CheckNetGame(void);
+boolean F_Responder(event_t * ev);
+void I_StartupKeyboard(void);
+void I_StartupJoystick(void);
+void I_ShutdownKeyboard(void);
+void S_InitScript(void);
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+void H2_AdvanceDemo(void);
+void H2_PageTicker(void);
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void DrawMessage(void);
+static void PageDrawer(void);
+static void HandleArgs(void);
+static void CheckRecordFrom(void);
+static void DrawAndBlit(void);
+static void CreateSavePath(void);
+static void WarpCheck(void);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+GameMode_t gamemode;
+GameVersion_t gameversion = exe_hexen_1_1;
+static const char *gamedescription;
+char *iwadfile;
+static char demolumpname[9];    // Demo lump to start playing.
+boolean nomonsters;             // checkparm of -nomonsters
+boolean respawnparm;            // checkparm of -respawn
+boolean randomclass;            // checkparm of -randclass
+boolean debugmode;              // checkparm of -debug
+boolean ravpic;                 // checkparm of -ravpic
+boolean cdrom = false;          // true if cd-rom mode active
+boolean cmdfrag;                // true if a CMD_FRAG packet should be sent out
+boolean artiskip;               // whether shift-enter skips an artifact
+int maxzone = 0x800000;         // Maximum allocated for zone heap (8meg default)
+skill_t startskill;
+int startepisode;
+int startmap;
+boolean autostart;
+boolean advancedemo;
+FILE *debugfile;
+int UpdateState;
+int maxplayers = MAXPLAYERS;
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int WarpMap;
+static int demosequence;
+static int pagetic;
+static const char *pagename;
+static char *SavePathConfig;
+
+// CODE --------------------------------------------------------------------
+
+
+static const char * const chat_macro_defaults[10] =
+{
+    HUSTR_CHATMACRO0,
+    HUSTR_CHATMACRO1,
+    HUSTR_CHATMACRO2,
+    HUSTR_CHATMACRO3,
+    HUSTR_CHATMACRO4,
+    HUSTR_CHATMACRO5,
+    HUSTR_CHATMACRO6,
+    HUSTR_CHATMACRO7,
+    HUSTR_CHATMACRO8,
+    HUSTR_CHATMACRO9,
+};
+
+
+void D_BindVariables(void)
+{
+    int i;
+
+    M_ApplyPlatformDefaults();
+
+    I_BindInputVariables();
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
+
+    M_BindBaseControls();
+    M_BindMapControls();
+    M_BindMenuControls();
+    M_BindWeaponControls();
+    M_BindChatControls(MAXPLAYERS);
+    M_BindHereticControls();
+    M_BindHexenControls();
+
+    key_multi_msgplayer[0] = CT_KEY_BLUE;
+    key_multi_msgplayer[1] = CT_KEY_RED;
+    key_multi_msgplayer[2] = CT_KEY_YELLOW;
+    key_multi_msgplayer[3] = CT_KEY_GREEN;
+    key_multi_msgplayer[4] = CT_KEY_PLAYER5;
+    key_multi_msgplayer[5] = CT_KEY_PLAYER6;
+    key_multi_msgplayer[6] = CT_KEY_PLAYER7;
+    key_multi_msgplayer[7] = CT_KEY_PLAYER8;
+
+    NET_BindVariables();
+
+    M_BindIntVariable("graphical_startup",      &graphical_startup);
+    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
+    M_BindIntVariable("sfx_volume",             &snd_MaxVolume);
+    M_BindIntVariable("music_volume",           &snd_MusicVolume);
+    M_BindIntVariable("messageson",             &messageson);
+    M_BindIntVariable("screenblocks",           &screenblocks);
+    M_BindIntVariable("snd_channels",           &snd_Channels);
+    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
+    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
+
+    M_BindStringVariable("savedir", &SavePathConfig);
+
+    // Multiplayer chat macros
+
+    for (i=0; i<10; ++i)
+    {
+        char buf[12];
+
+        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
+        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
+        M_BindStringVariable(buf, &chat_macros[i]);
+    }
+}
+
+// Set the default directory where hub savegames are saved.
+
+static void D_SetDefaultSavePath(void)
+{
+    SavePath = M_GetSaveGameDir("hexen.wad");
+
+    if (!strcmp(SavePath, ""))
+    {
+        // only get hexen.cfg path if one is not already found
+
+        if (SavePathConfig == NULL || !strcmp(SavePathConfig, ""))
+        {
+            // If we are not using a savegame path (probably because we are on
+            // Windows and not using a config dir), behave like Vanilla Hexen
+            // and use hexndata/:
+
+            SavePath = malloc(10);
+            M_snprintf(SavePath, 10, "hexndata%c", DIR_SEPARATOR);
+        }
+        else
+        {
+            SavePath = M_StringDuplicate(SavePathConfig);
+        }
+    }
+
+    // only set hexen.cfg path if using default handling
+
+    if (!M_ParmExists("-savedir") && !M_ParmExists("-cdrom"))
+    {
+        SavePathConfig = SavePath;
+    }
+}
+
+// The Mac version of the Hexen IWAD is different to the "normal" DOS
+// version - it doesn't include lumps used by the DOS DMX library.
+// This means that we can't do GUS or OPL emulation and need to apply
+// a workaround.
+static void AdjustForMacIWAD(void)
+{
+    boolean adjust_music = false;
+
+    switch (snd_musicdevice)
+    {
+        case SNDDEVICE_ADLIB:
+        case SNDDEVICE_SB:
+            adjust_music = W_CheckNumForName("GENMIDI") < 0;
+            break;
+
+        case SNDDEVICE_GUS:
+            adjust_music = W_CheckNumForName("DMXGUS") < 0;
+            break;
+
+        default:
+            break;
+    }
+
+    if (adjust_music)
+    {
+        printf("** Note: You appear to be using the Mac version of the Hexen\n"
+               "** IWAD file. This is missing the lumps required for OPL or\n"
+               "** GUS emulation. Your music configuration is being adjusted\n"
+               "** to a different setting that won't cause the game to "
+               "crash.\n");
+        snd_musicdevice = SNDDEVICE_GENMIDI;
+    }
+}
+
+//
+// D_GrabMouseCallback
+//
+// Called to determine whether to grab the mouse pointer
+//
+
+static boolean D_GrabMouseCallback(void)
+{
+    // when menu is active or game is paused, release the mouse
+
+    if (MenuActive || paused)
+        return false;
+
+    // only grab mouse when playing levels (but not demos)
+
+    return (gamestate == GS_LEVEL) && !advancedemo && !demoplayback;
+}
+
+// Message displayed when quitting Hexen
+
+static void D_HexenQuitMessage(void)
+{
+    printf("\nHexen: Beyond Heretic\n");
+}
+
+static void D_AddFile(char *filename)
+{
+    printf("  adding %s\n", filename);
+
+    W_AddFile(filename);
+}
+
+// Find out what version of Hexen is playing.
+
+void D_IdentifyVersion(void)
+{
+    // The Hexen Shareware, ne 4 Level Demo Version, is missing the SKY1 lump
+    // and uses the SKY2 lump instead. Let's use this fact and the missing
+    // levels from MAP05 onward to identify it and set gamemode accordingly.
+
+    if (W_CheckNumForName("SKY1") == -1 &&
+        W_CheckNumForName("MAP05") == -1 )
+    {
+	gamemode = shareware;
+	maxplayers = 4;
+    }
+
+    // The v1.0 IWAD file is missing a bunch of lumps that can cause the game
+    // to crash, so we exit with an error if the user tries to play with it.
+    // But we provide an override command line flag if they really want to
+    // do it.
+
+    //!
+    // If provided, the check for the v1.0 IWAD file is disabled, even though
+    // it will almost certainly cause the game to crash.
+    //
+    // @category compat
+    //
+
+    if (!M_ParmExists("-v10override")
+     && gamemode != shareware && W_CheckNumForName("CLUS1MSG") < 0)
+    {
+        I_Error(
+            "You are trying to use the Hexen v1.0 IWAD. This isn't\n"
+            "supported by " PACKAGE_NAME ". Please upgrade to the v1.1\n"
+            "IWAD file. See here for more information:\n"
+            "  https://www.doomworld.com/classicdoom/info/patches.php");
+    }
+}
+
+// Set the gamedescription string.
+
+void D_SetGameDescription(void)
+{
+/*
+    NB: The 4 Level Demo Version actually prints a four-lined banner
+    (and indeed waits for a keypress):
+
+    Hexen:  Beyond Heretic
+
+    4 Level Demo Version
+    Press any key to continue.
+*/
+
+    if (gamemode == shareware)
+    {
+	gamedescription = "Hexen: 4 Level Demo Version";
+    }
+    else
+    {
+	gamedescription = "Hexen";
+    }
+}
+
+static const struct
+{
+    const char *description;
+    const char *cmdline;
+    GameVersion_t version;
+} gameversions[] = {
+    {"Hexen 1.1",            "1.1",        exe_hexen_1_1},
+    {"Hexen 1.1 (alt)",      "1.1r2",      exe_hexen_1_1r2},
+    { NULL,                  NULL,         0},
+};
+
+// Initialize the game version
+
+static void InitGameVersion(void)
+{
+    int p;
+
+    //!
+    // @arg <version>
+    // @category compat
+    //
+    // Emulate a specific version of Hexen.
+    // Valid values are "1.1" and "1.1r2".
+    //
+
+    p = M_CheckParmWithArgs("-gameversion", 1);
+
+    if (p)
+    {
+        int i;
+        for (i=0; gameversions[i].description != NULL; ++i)
+        {
+            if (!strcmp(myargv[p+1], gameversions[i].cmdline))
+            {
+                gameversion = gameversions[i].version;
+                break;
+            }
+        }
+
+        if (gameversions[i].description == NULL)
+        {
+            printf("Supported game versions:\n");
+
+            for (i=0; gameversions[i].description != NULL; ++i)
+            {
+                printf("\t%s (%s)\n", gameversions[i].cmdline,
+                        gameversions[i].description);
+            }
+
+            I_Error("Unknown game version '%s'", myargv[p+1]);
+        }
+    }
+    else
+    {
+        // Determine automatically
+
+        gameversion = exe_hexen_1_1;
+    }
+}
+
+void PrintGameVersion(void)
+{
+    int i;
+
+    for (i=0; gameversions[i].description != NULL; ++i)
+    {
+        if (gameversions[i].version == gameversion)
+        {
+            printf("Emulating the behavior of the "
+                   "'%s' executable.\n", gameversions[i].description);
+            break;
+        }
+    }
+}
+
+//==========================================================================
+//
+// H2_Main
+//
+//==========================================================================
+void InitMapMusicInfo(void);
+
+void D_DoomMain(void)
+{
+    GameMission_t gamemission;
+    int p;
+
+    I_AtExit(D_HexenQuitMessage, false);
+    startepisode = 1;
+    autostart = false;
+    startskill = sk_medium;
+    startmap = 1;
+    gamemode = commercial;
+
+    I_PrintBanner(PACKAGE_STRING);
+
+    // Initialize subsystems
+
+    ST_Message("V_Init: allocate screens.\n");
+    V_Init();
+
+    // Load defaults before initing other systems
+    ST_Message("M_LoadDefaults: Load system defaults.\n");
+    D_BindVariables();
+
+#ifdef _WIN32
+
+    //!
+    // @category obscure
+    // @platform windows
+    // @vanilla
+    //
+    // Save configuration data and savegames in c:\hexndata,
+    // allowing play from CD.
+    //
+
+    cdrom = M_ParmExists("-cdrom");
+#endif
+
+    if (cdrom)
+    {
+        M_SetConfigDir("c:\\hexndata\\");
+    }
+    else
+    {
+        M_SetConfigDir(NULL);
+    }
+
+    M_SetConfigFilenames("hexen.cfg", PROGRAM_PREFIX "hexen.cfg");
+    M_LoadDefaults();
+
+    D_SetDefaultSavePath();
+
+    I_AtExit(M_SaveDefaults, false);
+
+    // Now that the savedir is loaded, make sure it exists
+    CreateSavePath();
+
+    ST_Message("Z_Init: Init zone memory allocation daemon.\n");
+    Z_Init();
+
+    // haleyjd: removed WATCOMC
+
+    ST_Message("W_Init: Init WADfiles.\n");
+
+    iwadfile = D_FindIWAD(IWAD_MASK_HEXEN, &gamemission);
+
+    if (iwadfile == NULL)
+    {
+        I_Error("Game mode indeterminate. No IWAD was found. Try specifying\n"
+                "one with the '-iwad' command line parameter.");
+    }
+
+    D_AddFile(iwadfile);
+    W_CheckCorrectIWAD(hexen);
+    D_IdentifyVersion();
+    InitGameVersion();
+    D_SetGameDescription();
+    AdjustForMacIWAD();
+
+    //!
+    // @category mod
+    //
+    // Disable auto-loading of .wad files.
+    //
+    if (!M_ParmExists("-noautoload"))
+    {
+        char *autoload_dir;
+        autoload_dir = M_GetAutoloadDir("hexen.wad");
+        if (autoload_dir != NULL)
+        {
+            // TODO? DEH_AutoLoadPatches(autoload_dir);
+            W_AutoLoadWADs(autoload_dir);
+            free(autoload_dir);
+        }
+    }
+
+    HandleArgs();
+
+    // Generate the WAD hash table.  Speed things up a bit.
+    W_GenerateHashTable();
+
+    I_PrintStartupBanner(gamedescription);
+
+    ST_Message("MN_Init: Init menu system.\n");
+    MN_Init();
+
+    ST_Message("CT_Init: Init chat mode data.\n");
+    CT_Init();
+
+    InitMapMusicInfo();         // Init music fields in mapinfo
+
+    ST_Message("S_InitScript\n");
+    S_InitScript();
+
+    ST_Message("SN_InitSequenceScript: Registering sound sequences.\n");
+    SN_InitSequenceScript();
+    ST_Message("I_Init: Setting up machine state.\n");
+    I_CheckIsScreensaver();
+    I_InitTimer();
+    I_InitJoystick();
+    I_InitSound(hexen);
+    I_InitMusic();
+
+    ST_Message("NET_Init: Init networking subsystem.\n");
+    NET_Init();
+    D_ConnectNetGame();
+
+    S_Init();
+    S_Start();
+
+    ST_Message("ST_Init: Init startup screen.\n");
+    ST_Init();
+
+    // Show version message now, so it's visible during R_Init()
+    ST_Message("R_Init: Init Hexen refresh daemon");
+    R_Init();
+    ST_Message("\n");
+
+    //if (M_CheckParm("-net"))
+    //    ST_NetProgress();       // Console player found
+
+    ST_Message("P_Init: Init Playloop state.\n");
+    P_Init();
+
+    // Check for command line warping. Follows P_Init() because the
+    // MAPINFO.TXT script must be already processed.
+    WarpCheck();
+
+    ST_Message("D_CheckNetGame: Checking network game status.\n");
+    D_CheckNetGame();
+
+    PrintGameVersion();
+
+    ST_Message("SB_Init: Loading patches.\n");
+    SB_Init();
+
+    ST_Done();
+
+    if (autostart)
+    {
+        ST_Message("Warp to Map %d (\"%s\":%d), Skill %d\n",
+                   WarpMap, P_GetMapName(startmap), startmap, startskill + 1);
+    }
+
+    CheckRecordFrom();
+
+    //!
+    // @arg <x>
+    // @category demo
+    // @vanilla
+    //
+    // Record a demo named x.lmp.
+    //
+
+    p = M_CheckParm("-record");
+    if (p && p < myargc - 1)
+    {
+        G_RecordDemo(startskill, 1, startepisode, startmap, myargv[p + 1]);
+        H2_GameLoop();          // Never returns
+    }
+
+    p = M_CheckParmWithArgs("-playdemo", 1);
+    if (p)
+    {
+        singledemo = true;      // Quit after one demo
+        G_DeferedPlayDemo(demolumpname);
+        H2_GameLoop();          // Never returns
+    }
+
+    p = M_CheckParmWithArgs("-timedemo", 1);
+    if (p)
+    {
+        G_TimeDemo(demolumpname);
+        H2_GameLoop();          // Never returns
+    }
+
+    //!
+    // @category game
+    // @arg <s>
+    // @vanilla
+    //
+    // Load the game in savegame slot s.
+    //
+
+    p = M_CheckParmWithArgs("-loadgame", 1);
+    if (p)
+    {
+        G_LoadGame(atoi(myargv[p + 1]));
+    }
+
+    if (gameaction != ga_loadgame)
+    {
+        UpdateState |= I_FULLSCRN;
+        BorderNeedRefresh = true;
+        if (autostart || netgame)
+        {
+            G_StartNewInit();
+            G_InitNew(startskill, startepisode, startmap);
+        }
+        else
+        {
+            H2_StartTitle();
+        }
+    }
+    H2_GameLoop();              // Never returns
+}
+
+//==========================================================================
+//
+// HandleArgs
+//
+//==========================================================================
+
+static void HandleArgs(void)
+{
+    int p;
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Disable monsters.
+    //
+
+    nomonsters = M_ParmExists("-nomonsters");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Monsters respawn after being killed.
+    //
+
+    respawnparm = M_ParmExists("-respawn");
+
+    //!
+    // @vanilla
+    // @category net
+    //
+    // In deathmatch mode, change a player's class each time the
+    // player respawns.
+    //
+
+    randomclass = M_ParmExists("-randclass");
+
+    //!
+    // @vanilla
+    //
+    // Take screenshots when F1 is pressed.
+    //
+
+    ravpic = M_ParmExists("-ravpic");
+
+    //!
+    // @category obscure
+    // @vanilla
+    //
+    // Don't allow artifacts to be used when the run key is held down.
+    //
+
+    artiskip = M_ParmExists("-artiskip");
+
+    debugmode = M_ParmExists("-debug");
+
+    //!
+    // @vanilla
+    // @category net
+    //
+    // Start a deathmatch game.
+    //
+
+    deathmatch = M_ParmExists("-deathmatch");
+
+    // currently broken or unused:
+    cmdfrag = M_ParmExists("-cmdfrag");
+
+    // Check WAD file command line options
+    W_ParseCommandLine();
+
+    //!
+    // @category obscure
+    // @vanilla
+    // @arg <path>
+    //
+    // Development option to specify path to level scripts.
+    //
+
+    p = M_CheckParmWithArgs("-scripts", 1);
+
+    if (p)
+    {
+        sc_FileScripts = true;
+        sc_ScriptsDir = myargv[p+1];
+    }
+
+    //!
+    // @category game
+    // @arg <skill>
+    // @vanilla
+    //
+    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
+    // 0 disables all monsters.
+    //
+
+    p = M_CheckParmWithArgs("-skill", 1);
+
+    if (p)
+    {
+        startskill = myargv[p+1][0] - '1';
+        autostart = true;
+    }
+
+    //!
+    // @arg <demo>
+    // @category demo
+    // @vanilla
+    //
+    // Play back the demo named demo.lmp.
+    //
+
+    p = M_CheckParmWithArgs("-playdemo", 1);
+
+    if (!p)
+    {
+        //!
+        // @arg <demo>
+        // @category demo
+        // @vanilla
+        //
+        // Play back the demo named demo.lmp, determining the framerate
+        // of the screen.
+        //
+
+        p = M_CheckParmWithArgs("-timedemo", 1);
+    }
+
+    if (p)
+    {
+        char *uc_filename;
+        char file[256];
+
+        M_StringCopy(file, myargv[p+1], sizeof(file));
+
+        // With Vanilla Hexen you have to specify the file without
+        // extension, but make that optional.
+        uc_filename = strdup(myargv[p + 1]);
+        M_ForceUppercase(uc_filename);
+
+        if (!M_StringEndsWith(uc_filename, ".LMP"))
+        {
+            M_StringConcat(file, ".lmp", sizeof(file));
+        }
+
+        free(uc_filename);
+
+        if (W_AddFile(file) != NULL)
+        {
+            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
+                         sizeof(demolumpname));
+        }
+        else
+        {
+            // The file failed to load, but copy the original arg as a
+            // demo name to make tricks like -playdemo demo1 possible.
+            M_StringCopy(demolumpname, myargv[p+1], sizeof(demolumpname));
+        }
+
+        ST_Message("Playing demo %s.\n", myargv[p+1]);
+    }
+
+    //!
+    // @category demo
+    //
+    // Record or playback a demo without automatically quitting
+    // after either level exit or player respawn.
+    //
+
+    demoextend = M_ParmExists("-demoextend");
+
+    if (M_ParmExists("-testcontrols"))
+    {
+        autostart = true;
+        testcontrols = true;
+    }
+}
+
+//==========================================================================
+//
+// WarpCheck
+//
+//==========================================================================
+
+static void WarpCheck(void)
+{
+    int p;
+    int map;
+
+    //!
+    // @category game
+    // @arg x
+    // @vanilla
+    //
+    // Start a game immediately, warping to MAPx.
+    //
+
+    p = M_CheckParm("-warp");
+    if (p && p < myargc - 1)
+    {
+        WarpMap = atoi(myargv[p + 1]);
+        map = P_TranslateMap(WarpMap);
+        if (map == -1)
+        {                       // Couldn't find real map number
+            startmap = 1;
+            ST_Message("-WARP: Invalid map number.\n");
+        }
+        else
+        {                       // Found a valid startmap
+            startmap = map;
+            autostart = true;
+        }
+    }
+    else
+    {
+        WarpMap = 1;
+        startmap = P_TranslateMap(1);
+        if (startmap == -1)
+        {
+            startmap = 1;
+        }
+    }
+}
+
+//==========================================================================
+//
+// H2_GameLoop
+//
+//==========================================================================
+
+void H2_GameLoop(void)
+{
+    if (M_CheckParm("-debugfile"))
+    {
+        char filename[20];
+        M_snprintf(filename, sizeof(filename), "debug%i.txt", consoleplayer);
+        debugfile = M_fopen(filename, "w");
+    }
+    I_SetWindowTitle(gamedescription);
+    I_GraphicsCheckCommandLine();
+    I_SetGrabMouseCallback(D_GrabMouseCallback);
+    I_RegisterWindowIcon(hexen_icon_data, hexen_icon_w, hexen_icon_h);
+    I_InitGraphics();
+
+    while (1)
+    {
+        // Frame syncronous IO operations
+        I_StartFrame();
+
+        // Process one or more tics
+        // Will run at least one tic
+        TryRunTics();
+
+        // Move positional sounds
+        S_UpdateSounds(players[displayplayer].mo);
+
+        DrawAndBlit();
+    }
+}
+
+//==========================================================================
+//
+// H2_ProcessEvents
+//
+// Send all the events of the given timestamp down the responder chain.
+//
+//==========================================================================
+
+void H2_ProcessEvents(void)
+{
+    event_t *ev;
+
+    for (;;)
+    {
+        ev = D_PopEvent();
+
+        if (ev == NULL)
+        {
+            break;
+        }
+
+        if (F_Responder(ev))
+        {
+            continue;
+        }
+        if (MN_Responder(ev))
+        {
+            continue;
+        }
+        G_Responder(ev);
+    }
+}
+
+//==========================================================================
+//
+// DrawAndBlit
+//
+//==========================================================================
+
+static void DrawAndBlit(void)
+{
+    // Change the view size if needed
+    if (setsizeneeded)
+    {
+        R_ExecuteSetViewSize();
+    }
+
+    // Do buffered drawing
+    switch (gamestate)
+    {
+        case GS_LEVEL:
+            if (!gametic)
+            {
+                break;
+            }
+            if (automapactive)
+            {
+                AM_Drawer();
+            }
+            else
+            {
+                R_RenderPlayerView(&players[displayplayer]);
+            }
+            CT_Drawer();
+            UpdateState |= I_FULLVIEW;
+            SB_Drawer();
+            break;
+        case GS_INTERMISSION:
+            IN_Drawer();
+            break;
+        case GS_FINALE:
+            F_Drawer();
+            break;
+        case GS_DEMOSCREEN:
+            PageDrawer();
+            break;
+    }
+
+    if (testcontrols)
+    {
+        V_DrawMouseSpeedBox(testcontrols_mousespeed);
+    }
+
+    if (paused && !MenuActive && !askforquit)
+    {
+        if (!netgame)
+        {
+            V_DrawPatch(160, viewwindowy + 5, W_CacheLumpName("PAUSED",
+                                                              PU_CACHE));
+        }
+        else
+        {
+            V_DrawPatch(160, 70, W_CacheLumpName("PAUSED", PU_CACHE));
+        }
+    }
+
+    // Draw current message
+    DrawMessage();
+
+    // Draw Menu
+    MN_Drawer();
+
+    // Send out any new accumulation
+    NetUpdate();
+
+    // Flush buffered stuff to screen
+    I_FinishUpdate();
+}
+
+//==========================================================================
+//
+// DrawMessage
+//
+//==========================================================================
+
+static void DrawMessage(void)
+{
+    player_t *player;
+
+    player = &players[consoleplayer];
+    if (player->messageTics <= 0)
+    {                           // No message
+        return;
+    }
+    if (player->yellowMessage)
+    {
+        MN_DrTextAYellow(player->message,
+                         160 - MN_TextAWidth(player->message) / 2, 1);
+    }
+    else
+    {
+        MN_DrTextA(player->message, 160 - MN_TextAWidth(player->message) / 2,
+                   1);
+    }
+}
+
+//==========================================================================
+//
+// H2_PageTicker
+//
+//==========================================================================
+
+void H2_PageTicker(void)
+{
+    if (--pagetic < 0)
+    {
+        H2_AdvanceDemo();
+    }
+}
+
+//==========================================================================
+//
+// PageDrawer
+//
+//==========================================================================
+
+static void PageDrawer(void)
+{
+    V_DrawRawScreen(W_CacheLumpName(pagename, PU_CACHE));
+    if (demosequence == 1)
+    {
+        V_DrawPatch(4, 160, W_CacheLumpName("ADVISOR", PU_CACHE));
+    }
+    UpdateState |= I_FULLSCRN;
+}
+
+//==========================================================================
+//
+// H2_AdvanceDemo
+//
+// Called after each demo or intro demosequence finishes.
+//
+//==========================================================================
+
+void H2_AdvanceDemo(void)
+{
+    advancedemo = true;
+}
+
+//==========================================================================
+//
+// H2_DoAdvanceDemo
+//
+//==========================================================================
+
+void H2_DoAdvanceDemo(void)
+{
+    players[consoleplayer].playerstate = PST_LIVE;      // don't reborn
+    advancedemo = false;
+    usergame = false;           // can't save/end game here
+    paused = false;
+    gameaction = ga_nothing;
+    demosequence = (demosequence + 1) % 7;
+    switch (demosequence)
+    {
+        case 0:
+            pagetic = 280;
+            gamestate = GS_DEMOSCREEN;
+            pagename = "TITLE";
+            S_StartSongName("hexen", true);
+            break;
+        case 1:
+            pagetic = 210;
+            gamestate = GS_DEMOSCREEN;
+            pagename = "TITLE";
+            break;
+        case 2:
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            G_DeferedPlayDemo("demo1");
+            break;
+        case 3:
+            pagetic = 200;
+            gamestate = GS_DEMOSCREEN;
+            pagename = "CREDIT";
+            break;
+        case 4:
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            G_DeferedPlayDemo("demo2");
+            break;
+        case 5:
+            pagetic = 200;
+            gamestate = GS_DEMOSCREEN;
+            pagename = "CREDIT";
+            break;
+        case 6:
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            G_DeferedPlayDemo("demo3");
+            break;
+    }
+}
+
+//==========================================================================
+//
+// H2_StartTitle
+//
+//==========================================================================
+
+void H2_StartTitle(void)
+{
+    gameaction = ga_nothing;
+    demosequence = -1;
+    H2_AdvanceDemo();
+}
+
+//==========================================================================
+//
+// CheckRecordFrom
+//
+// -recordfrom <save-num> <demo-name>
+//
+//==========================================================================
+
+static void CheckRecordFrom(void)
+{
+    int p;
+
+    //!
+    // @vanilla
+    // @category demo
+    // @arg <save-num> <demo-name>
+    //
+    // Load a game from the given savegame slot and record a demo from
+    // it.  Equivalent to -loadgame <save-num> -record <demo-name>.
+    //
+    p = M_CheckParm("-recordfrom");
+    if (!p || p > myargc - 2)
+    {                           // Bad args
+        return;
+    }
+    G_LoadGame(atoi(myargv[p + 1]));
+    G_DoLoadGame();             // Load the gameskill etc info from savegame
+    G_RecordDemo(gameskill, 1, gameepisode, gamemap, myargv[p + 2]);
+
+    H2_GameLoop();              // Never returns
+}
+
+// haleyjd: removed WATCOMC
+/*
+void CleanExit(void)
+{
+	union REGS regs;
+
+	I_ShutdownKeyboard();
+	regs.x.eax = 0x3;
+	int386(0x10, &regs, &regs);
+	printf("Exited from HEXEN: Beyond Heretic.\n");
+	exit(1);
+}
+*/
+
+//==========================================================================
+//
+// CreateSavePath
+//
+//==========================================================================
+
+static void CreateSavePath(void)
+{
+    M_MakeDirectory(SavePath);
+}
diff --git a/games/NXDoom/src/hexen/h2def.h b/games/NXDoom/src/hexen/h2def.h
new file mode 100644
index 000000000..2bfdfb513
--- /dev/null
+++ b/games/NXDoom/src/hexen/h2def.h
@@ -0,0 +1,1121 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __H2DEF__
+#define __H2DEF__
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+//#include <values.h>
+
+#include "st_start.h"
+// haleyjd: removed WATCOMC
+
+// ticcmd:
+
+#include "d_ticcmd.h"
+
+// events
+
+#include "d_event.h"
+
+// gamemode/mission
+
+#include "d_mode.h"
+
+// for fixed_t:
+
+#include "m_fixed.h"
+
+// angle definitions:
+
+#include "tables.h"
+
+#include "d_loop.h"
+#include "net_defs.h"
+
+#define HEXEN_VERSION 110
+#define HEXEN_VERSION_TEXT "v1.1"
+
+// if rangecheck is undefined, most parameter validation debugging code
+// will not be compiled
+#ifndef NORANGECHECKING
+#define RANGECHECK
+#endif
+
+// Past distributions
+//#ifndef VER_ID
+//#define VER_ID "DVL"
+//#endif
+//#define HEXEN_VERSIONTEXT "ID V1.2"
+//#define HEXEN_VERSIONTEXT "RETAIL STORE BETA"               // 9/26/95
+//#define HEXEN_VERSIONTEXT "DVL BETA 10 05 95" // Used for GT for testing
+//#define HEXEN_VERSIONTEXT "DVL BETA 10 07 95" // Just an update for Romero
+//#define HEXEN_VERSIONTEXT "FINAL 1.0 (10 13 95)" // Just an update for Romero
+//#ifdef RANGECHECK
+//#define HEXEN_VERSIONTEXT "Version 1.1 +R "__DATE__" ("VER_ID")"
+//#else
+//#define HEXEN_VERSIONTEXT "Version 1.1 "__DATE__" ("VER_ID")"
+//#endif
+#define HEXEN_VERSIONTEXT ((gamemode == shareware) ? \
+                           "DEMO 10 16 95" : \
+                           (gameversion != exe_hexen_1_1r2) ? \
+                           "VERSION 1.1 MAR 12 1996 (CBI)" : \
+                           "VERSION 1.1 MAR 22 1996 (BCP)")
+
+// all exterior data is defined here
+#include "xddefs.h"
+
+// all important printed strings
+#include "textdefs.h"
+
+// header generated by multigen utility
+#include "info.h"
+
+/*
+===============================================================================
+
+						GLOBAL TYPES
+
+===============================================================================
+*/
+
+//#define NUMARTIFCTS   28
+#define MAXPLAYERS	8
+
+#define	BT_ATTACK		1
+#define	BT_USE			2
+#define	BT_CHANGE		4       // if true, the next 3 bits hold weapon num
+#define	BT_WEAPONMASK	(8+16+32)
+#define	BT_WEAPONSHIFT	3
+
+#define BT_SPECIAL		128     // game events, not really buttons
+#define	BTS_SAVEMASK	(4+8+16)
+#define	BTS_SAVESHIFT	2
+#define	BT_SPECIALMASK	3
+#define	BTS_PAUSE		1       // pause the game
+#define	BTS_SAVEGAME	2       // save the game at each console
+// savegame slot numbers occupy the second byte of buttons
+
+// The top 3 bits of the artifact field in the ticcmd_t struct are used
+//              as additional flags 
+#define AFLAG_MASK			0x3F
+#define AFLAG_SUICIDE		0x40
+#define AFLAG_JUMP			0x80
+
+typedef enum
+{
+    GS_LEVEL,
+    GS_INTERMISSION,
+    GS_FINALE,
+    GS_DEMOSCREEN
+} gamestate_t;
+
+typedef enum
+{
+    ga_nothing,
+    ga_loadlevel,
+    ga_initnew,
+    ga_newgame,
+    ga_loadgame,
+    ga_savegame,
+    ga_playdemo,
+    ga_completed,
+    ga_leavemap,
+    ga_singlereborn,
+    ga_victory,
+    ga_worlddone,
+    ga_screenshot
+} gameaction_t;
+
+typedef enum
+{
+    wipe_0,
+    wipe_1,
+    wipe_2,
+    wipe_3,
+    wipe_4,
+    NUMWIPES,
+    wipe_random
+} wipe_t;
+
+/*
+===============================================================================
+
+							MAPOBJ DATA
+
+===============================================================================
+*/
+
+
+struct thinker_s;
+
+
+// think_t is a function pointer to a routine to handle an actor
+typedef void (*think_t)(struct thinker_s *);
+
+typedef struct thinker_s
+{
+    struct thinker_s *prev, *next;
+    think_t function;
+} thinker_t;
+
+struct player_s;
+
+typedef union
+{
+    intptr_t i;
+    struct mobj_s *m;
+    struct player_s *p;
+} specialval_t;
+
+typedef struct mobj_s
+{
+    thinker_t thinker;          // thinker node
+
+// info for drawing
+    fixed_t x, y, z;
+    struct mobj_s *snext, *sprev;       // links in sector (if needed)
+    angle_t angle;
+    spritenum_t sprite;         // used to find patch_t and flip value
+    int frame;                  // might be ord with FF_FULLBRIGHT
+
+// interaction info
+    struct mobj_s *bnext, *bprev;       // links in blocks (if needed)
+    struct subsector_s *subsector;
+    fixed_t floorz, ceilingz;   // closest together of contacted secs
+    fixed_t floorpic;           // contacted sec floorpic
+    fixed_t radius, height;     // for movement checking
+    fixed_t momx, momy, momz;   // momentums
+    int validcount;             // if == validcount, already checked
+    mobjtype_t type;
+    mobjinfo_t *info;           // &mobjinfo[mobj->type]
+    int tics;                   // state tic counter
+    state_t *state;
+    int damage;                 // For missiles
+    int flags;
+    int flags2;                 // Heretic flags
+    specialval_t special1;      // Special info
+    specialval_t special2;      // Special info
+    int health;
+    int movedir;                // 0-7
+    int movecount;              // when 0, select a new dir
+    struct mobj_s *target;      // thing being chased/attacked (or NULL)
+    // also the originator for missiles
+    int reactiontime;           // if non 0, don't attack yet
+    // used by player to freeze a bit after
+    // teleporting
+    int threshold;              // if > 0, the target will be chased
+    // no matter what (even if shot)
+    struct player_s *player;    // only valid if type == MT_PLAYER
+    int lastlook;               // player number last looked for
+    fixed_t floorclip;          // value to use for floor clipping
+    int archiveNum;             // Identity during archive
+    short tid;                  // thing identifier
+    byte special;               // special
+    byte args[5];               // special arguments
+} mobj_t;
+
+// each sector has a degenmobj_t in it's center for sound origin purposes
+typedef struct
+{
+    thinker_t thinker;          // not used for anything
+    fixed_t x, y, z;
+} degenmobj_t;
+
+//
+// frame flags
+//
+#define	FF_FULLBRIGHT	0x8000  // flag in thing->frame
+#define FF_FRAMEMASK	0x7fff
+
+// --- mobj.flags ---
+
+#define	MF_SPECIAL		1       // call P_SpecialThing when touched
+#define	MF_SOLID		2
+#define	MF_SHOOTABLE	4
+#define	MF_NOSECTOR		8       // don't use the sector links
+                                                                        // (invisible but touchable)
+#define	MF_NOBLOCKMAP	16      // don't use the blocklinks
+                                                                        // (inert but displayable)
+#define	MF_AMBUSH		32
+#define	MF_JUSTHIT		64      // try to attack right back
+#define	MF_JUSTATTACKED	128     // take at least one step before attacking
+#define	MF_SPAWNCEILING	256     // hang from ceiling instead of floor
+#define	MF_NOGRAVITY	512     // don't apply gravity every tic
+
+// movement flags
+#define	MF_DROPOFF		0x400   // allow jumps from high places
+#define	MF_PICKUP		0x800   // for players to pick up items
+#define	MF_NOCLIP		0x1000  // player cheat
+#define	MF_SLIDE		0x2000  // keep info about sliding along walls
+#define	MF_FLOAT		0x4000  // allow moves to any height, no gravity
+#define	MF_TELEPORT		0x8000  // don't cross lines or look at heights
+#define MF_MISSILE		0x10000 // don't hit same species, explode on block
+
+#define	MF_ALTSHADOW	0x20000 // alternate translucent draw
+#define	MF_SHADOW		0x40000 // use translucent draw (shadow demons / invis)
+#define	MF_NOBLOOD		0x80000 // don't bleed when shot (use puff)
+#define	MF_CORPSE		0x100000        // don't stop moving halfway off a step
+#define	MF_INFLOAT		0x200000        // floating to a height for a move, don't
+                                                                        // auto float to target's height
+
+#define	MF_COUNTKILL	0x400000        // count towards intermission kill total
+#define	MF_ICECORPSE	0x800000        // a frozen corpse (for blasting)
+
+#define	MF_SKULLFLY		0x1000000       // skull in flight
+#define	MF_NOTDMATCH	0x2000000       // don't spawn in death match (key cards)
+
+//#define       MF_TRANSLATION  0xc000000       // if 0x4 0x8 or 0xc, use a translation
+#define	MF_TRANSLATION	0x1c000000      // use a translation table (>>MF_TRANSHIFT)
+#define	MF_TRANSSHIFT	26      // table for player colormaps
+
+
+// --- mobj.flags2 ---
+
+#define MF2_LOGRAV			0x00000001      // alternate gravity setting
+#define MF2_WINDTHRUST		0x00000002      // gets pushed around by the wind
+                                                                                // specials
+#define MF2_FLOORBOUNCE		0x00000004      // bounces off the floor
+#define MF2_BLASTED			0x00000008      // missile will pass through ghosts
+#define MF2_FLY				0x00000010      // fly mode is active
+#define MF2_FLOORCLIP		0x00000020      // if feet are allowed to be clipped
+#define MF2_SPAWNFLOAT		0x00000040      // spawn random float z
+#define MF2_NOTELEPORT		0x00000080      // does not teleport
+#define MF2_RIP				0x00000100      // missile rips through solid
+                                                                                // targets
+#define MF2_PUSHABLE		0x00000200      // can be pushed by other moving
+                                                                                // mobjs
+#define MF2_SLIDE			0x00000400      // slides against walls
+#define MF2_ONMOBJ			0x00000800      // mobj is resting on top of another
+                                                                                // mobj
+#define MF2_PASSMOBJ		0x00001000      // Enable z block checking.  If on,
+                                                                                // this flag will allow the mobj to
+                                                                                // pass over/under other mobjs.
+#define MF2_CANNOTPUSH		0x00002000      // cannot push other pushable mobjs
+#define MF2_DROPPED			0x00004000      // dropped by a demon
+#define MF2_BOSS			0x00008000      // mobj is a major boss
+#define MF2_FIREDAMAGE		0x00010000      // does fire damage
+#define MF2_NODMGTHRUST		0x00020000      // does not thrust target when
+                                                                                // damaging
+#define MF2_TELESTOMP		0x00040000      // mobj can stomp another
+#define MF2_FLOATBOB		0x00080000      // use float bobbing z movement
+#define MF2_DONTDRAW		0x00100000      // don't generate a vissprite
+#define MF2_IMPACT			0x00200000      // an MF_MISSILE mobj can activate
+                                                                                // SPAC_IMPACT
+#define MF2_PUSHWALL		0x00400000      // mobj can push walls
+#define MF2_MCROSS			0x00800000      // can activate monster cross lines
+#define MF2_PCROSS			0x01000000      // can activate projectile cross lines
+#define MF2_CANTLEAVEFLOORPIC 0x02000000        // stay within a certain floor type
+#define MF2_NONSHOOTABLE	0x04000000      // mobj is totally non-shootable,
+                                                                                // but still considered solid
+#define MF2_INVULNERABLE	0x08000000      // mobj is invulnerable
+#define MF2_DORMANT			0x10000000      // thing is dormant
+#define MF2_ICEDAMAGE		0x20000000      // does ice damage
+#define MF2_SEEKERMISSILE	0x40000000      // is a seeker (for reflection)
+#define MF2_REFLECTIVE		0x80000000      // reflects missiles
+
+//=============================================================================
+
+// ===== Player Class Types =====
+typedef enum
+{
+    PCLASS_FIGHTER,
+    PCLASS_CLERIC,
+    PCLASS_MAGE,
+    PCLASS_PIG,
+    NUMCLASSES
+} pclass_t;
+
+typedef enum
+{
+    PST_LIVE,                   // playing
+    PST_DEAD,                   // dead on the ground
+    PST_REBORN                  // ready to restart
+} playerstate_t;
+
+// psprites are scaled shapes directly on the view screen
+// coordinates are given for a 320*200 view screen
+typedef enum
+{
+    ps_weapon,
+    ps_flash,
+    NUMPSPRITES
+} psprnum_t;
+
+typedef struct pspdef_s
+{
+    state_t *state;             // a NULL state means not active
+    int tics;
+    fixed_t sx, sy;
+} pspdef_t;
+
+/* Old Heretic key type
+typedef enum
+{
+	key_yellow,
+	key_green,
+	key_blue,
+	NUM_KEY_TYPES
+} keytype_t;
+*/
+
+typedef enum
+{
+    KEY_1,
+    KEY_2,
+    KEY_3,
+    KEY_4,
+    KEY_5,
+    KEY_6,
+    KEY_7,
+    KEY_8,
+    KEY_9,
+    KEY_A,
+    KEY_B,
+    NUM_KEY_TYPES
+} keytype_t;
+
+typedef enum
+{
+    ARMOR_ARMOR,
+    ARMOR_SHIELD,
+    ARMOR_HELMET,
+    ARMOR_AMULET,
+    NUMARMOR
+} armortype_t;
+
+typedef enum
+{
+    WP_FIRST,
+    WP_SECOND,
+    WP_THIRD,
+    WP_FOURTH,
+    NUMWEAPONS,
+    WP_NOCHANGE
+} weapontype_t;
+
+typedef enum
+{
+    MANA_1,
+    MANA_2,
+    NUMMANA,
+    MANA_BOTH,
+    MANA_NONE
+} manatype_t;
+
+#define MAX_MANA	200
+
+#define WPIECE1		1
+#define WPIECE2		2
+#define WPIECE3		4
+
+typedef struct
+{
+    manatype_t mana;
+    int upstate;
+    int downstate;
+    int readystate;
+    int atkstate;
+    int holdatkstate;
+    int flashstate;
+} weaponinfo_t;
+
+extern weaponinfo_t WeaponInfo[NUMWEAPONS][NUMCLASSES];
+
+typedef enum
+{
+    arti_none,
+    arti_invulnerability,
+    arti_health,
+    arti_superhealth,
+    arti_healingradius,
+    arti_summon,
+    arti_torch,
+    arti_egg,
+    arti_fly,
+    arti_blastradius,
+    arti_poisonbag,
+    arti_teleportother,
+    arti_speed,
+    arti_boostmana,
+    arti_boostarmor,
+    arti_teleport,
+    // Puzzle artifacts
+    arti_firstpuzzitem,
+    arti_puzzskull = arti_firstpuzzitem,
+    arti_puzzgembig,
+    arti_puzzgemred,
+    arti_puzzgemgreen1,
+    arti_puzzgemgreen2,
+    arti_puzzgemblue1,
+    arti_puzzgemblue2,
+    arti_puzzbook1,
+    arti_puzzbook2,
+    arti_puzzskull2,
+    arti_puzzfweapon,
+    arti_puzzcweapon,
+    arti_puzzmweapon,
+    arti_puzzgear1,
+    arti_puzzgear2,
+    arti_puzzgear3,
+    arti_puzzgear4,
+    NUMARTIFACTS
+} artitype_t;
+
+typedef enum
+{
+    pw_None,
+    pw_invulnerability,
+    pw_allmap,
+    pw_infrared,
+    pw_flight,
+    pw_shield,
+    pw_health2,
+    pw_speed,
+    pw_minotaur,
+    NUMPOWERS
+} powertype_t;
+
+#define	INVULNTICS (30*35)
+#define	INVISTICS (60*35)
+#define	INFRATICS (120*35)
+#define	IRONTICS (60*35)
+#define WPNLEV2TICS (40*35)
+#define FLIGHTTICS (60*35)
+#define SPEEDTICS (45*35)
+#define MORPHTICS (40*35)
+#define MAULATORTICS (25*35)
+
+#define MESSAGETICS (4*35)
+#define BLINKTHRESHOLD (4*35)
+
+#define NUMINVENTORYSLOTS	NUMARTIFACTS
+
+typedef struct
+{
+    int type;
+    int count;
+} inventory_t;
+
+/*
+================
+=
+= player_t
+=
+================
+*/
+
+typedef struct player_s
+{
+    mobj_t *mo;
+    playerstate_t playerstate;
+    ticcmd_t cmd;
+
+    pclass_t class;             // player class type
+
+    fixed_t viewz;              // focal origin above r.z
+    fixed_t viewheight;         // base height above floor for viewz
+    fixed_t deltaviewheight;    // squat speed
+    fixed_t bob;                // bounded/scaled total momentum
+
+    int flyheight;
+    int lookdir;
+    boolean centering;
+    int health;                 // only used between levels, mo->health
+    // is used during levels
+    int armorpoints[NUMARMOR];
+
+    inventory_t inventory[NUMINVENTORYSLOTS];
+    artitype_t readyArtifact;
+    int artifactCount;
+    int inventorySlotNum;
+    int powers[NUMPOWERS];
+    int keys;
+    int pieces;                 // Fourth Weapon pieces
+    signed int frags[MAXPLAYERS];       // kills of other players
+    weapontype_t readyweapon;
+    weapontype_t pendingweapon; // wp_nochange if not changing
+    boolean weaponowned[NUMWEAPONS];
+    int mana[NUMMANA];
+    int attackdown, usedown;    // true if button down last tic
+    int cheats;                 // bit flags
+
+    int refire;                 // refired shots are less accurate
+
+    int killcount, itemcount, secretcount;      // for intermission
+    char message[80];           // hint messages
+    int messageTics;            // counter for showing messages
+    short ultimateMessage;
+    short yellowMessage;
+    int damagecount, bonuscount;        // for screen flashing
+    int poisoncount;            // screen flash for poison damage
+    mobj_t *poisoner;           // NULL for non-player mobjs
+    mobj_t *attacker;           // who did damage (NULL for floors)
+    int extralight;             // so gun flashes light up areas
+    int fixedcolormap;          // can be set to REDCOLORMAP, etc
+    int colormap;               // 0-3 for which color to draw player
+    pspdef_t psprites[NUMPSPRITES];     // view sprites (gun, etc)
+    int morphTics;              // player is a pig if > 0
+    unsigned int jumpTics;      // delay the next jump for a moment
+    unsigned int worldTimer;    // total time the player's been playing
+} player_t;
+
+#define CF_NOCLIP		1
+#define	CF_GODMODE		2
+#define	CF_NOMOMENTUM	4       // not really a cheat, just a debug aid
+
+#define	SBARHEIGHT	39      // status bar height at bottom of screen
+
+void NET_SendFrags(player_t * player);
+
+/*
+===============================================================================
+
+					GLOBAL VARIABLES
+
+===============================================================================
+*/
+
+#define TELEFOGHEIGHT (32*FRACUNIT)
+
+extern GameMode_t gamemode;
+extern GameVersion_t gameversion;
+
+extern gameaction_t gameaction;
+
+extern boolean paused;
+
+extern boolean DevMaps;         // true = map development mode
+extern char *DevMapsDir;        // development maps directory
+
+extern boolean nomonsters;      // checkparm of -nomonsters
+
+extern boolean respawnparm;     // checkparm of -respawn
+
+extern boolean randomclass;     // checkparm of -randclass
+
+extern boolean debugmode;       // checkparm of -debug
+
+extern boolean usergame;        // ok to save / end game
+
+extern boolean ravpic;          // checkparm of -ravpic
+
+extern boolean altpal;          // checkparm to use an alternate palette routine
+
+extern boolean cdrom;           // true if cd-rom mode active ("-cdrom")
+
+extern boolean viewactive;
+
+extern boolean deathmatch;      // only if started as net death
+
+extern boolean netgame;         // only true if >1 player
+
+extern boolean cmdfrag;         // true if a CMD_FRAG packet should be sent out every
+                                                // kill
+
+extern boolean playeringame[MAXPLAYERS];
+extern pclass_t PlayerClass[MAXPLAYERS];
+
+extern int consoleplayer;       // player taking events and displaying
+
+extern int displayplayer;
+
+extern int viewangleoffset;     // ANG90 = left side, ANG270 = right
+
+extern player_t players[MAXPLAYERS];
+
+extern boolean DebugSound;      // debug flag for displaying sound info
+
+extern boolean demorecording;
+extern boolean demoplayback;
+extern boolean demoextend;      // allow demos to persist through exit/respawn
+extern int maxzone;             // Maximum chunk allocated for zone heap
+
+// Truncate angleturn in ticcmds to nearest 256.
+// Used when recording Vanilla demos in netgames.
+extern boolean lowres_turn;
+
+extern int Sky1Texture;
+extern int Sky2Texture;
+
+extern gamestate_t gamestate;
+extern skill_t gameskill;
+//extern        boolean         respawnmonsters;
+extern int gameepisode;
+extern int gamemap;
+extern int prevmap;
+extern int levelstarttic;       // gametic at level start
+extern int leveltime;           // tics in game play for par
+
+extern ticcmd_t *netcmds;
+
+#define MAXDEATHMATCHSTARTS 16
+extern mapthing_t *deathmatch_p;
+extern mapthing_t deathmatchstarts[MAXDEATHMATCHSTARTS];
+
+// Position indicator for cooperative net-play reborn
+extern int RebornPosition;
+
+#define MAX_PLAYER_STARTS 8
+extern mapthing_t playerstarts[MAX_PLAYER_STARTS][MAXPLAYERS];
+extern int maxplayers;
+
+extern int mouseSensitivity;
+
+extern boolean precache;        // if true, load all graphics at level load
+
+extern byte *screen;            // off screen work buffer, from V_video.c
+
+extern boolean singledemo;      // quit after playing a demo from cmdline
+
+extern int bodyqueslot;
+extern skill_t startskill;
+extern int startepisode;
+extern int startmap;
+extern boolean autostart;
+extern boolean advancedemo;
+
+extern boolean testcontrols;
+extern int testcontrols_mousespeed;
+
+extern int vanilla_savegame_limit;
+extern int vanilla_demo_limit;
+
+extern boolean usearti;
+
+
+/*
+===============================================================================
+
+					GLOBAL FUNCTIONS
+
+===============================================================================
+*/
+
+#include "w_wad.h"
+#include "z_zone.h"
+
+//----------
+//BASE LEVEL
+//----------
+void H2_Main(void);
+// not a globally visible function, just included for source reference
+// calls all startup code
+// parses command line options
+// if not overrided, calls N_AdvanceDemo
+
+void H2_GameLoop(void);
+// not a globally visible function, just included for source reference
+// called by H2_Main, never exits
+// manages timing and IO
+// calls all ?_Responder, ?_Ticker, and ?_Drawer functions
+// calls I_GetTime, I_StartFrame, and I_StartTic
+
+void H2_StartTitle(void);
+
+
+extern boolean artiskip;
+
+
+//---------
+//SYSTEM IO
+//---------
+byte *I_AllocLow(int length);
+// allocates from low memory under dos, just mallocs under unix
+
+// haleyjd: was WATCOMC, again preserved for historical interest as in Heretic
+#if 0
+extern boolean useexterndriver;
+
+#define EBT_FIRE			1
+#define EBT_OPENDOOR 		2
+#define EBT_SPEED			4
+#define EBT_STRAFE			8
+#define EBT_MAP				0x10
+#define EBT_INVENTORYLEFT 	0x20
+#define EBT_INVENTORYRIGHT 	0x40
+#define EBT_USEARTIFACT		0x80
+#define EBT_FLYDROP			0x100
+#define EBT_CENTERVIEW		0x200
+#define EBT_PAUSE			0x400
+#define EBT_WEAPONCYCLE		0x800
+#define EBT_JUMP			0x1000
+
+typedef struct
+{
+    short vector;               // Interrupt vector
+
+    signed char moveForward;    // forward/backward (maxes at 50)
+    signed char moveSideways;   // strafe (maxes at 24)
+    short angleTurn;            // turning speed (640 [slow] 1280 [fast])
+    short angleHead;            // head angle (+2080 [left] : 0 [center] : -2048 [right])
+    signed char pitch;          // look up/down (-110 : +90)
+    signed char flyDirection;   // flyheight (+1/-1)
+    unsigned short buttons;     // EBT_* flags
+} externdata_t;
+#endif
+
+//----
+//GAME
+//----
+
+
+#define NUMKEYS 256
+
+
+void G_DeathMatchSpawnPlayer(int playernum);
+
+void G_InitNew(skill_t skill, int episode, int map);
+
+void G_DeferedInitNew(skill_t skill, int episode, int map);
+// can be called by the startup code or M_Responder
+// a normal game starts at map 1, but a warp test can start elsewhere
+
+void G_DeferredNewGame(skill_t skill);
+
+void G_DeferedPlayDemo(const char *demo);
+
+void G_LoadGame(int slot);
+// can be called by the startup code or M_Responder
+// calls P_SetupLevel or W_EnterWorld
+void G_DoLoadGame(void);
+
+void G_SaveGame(int slot, char *description);
+// called by M_Responder
+
+void H2_ProcessEvents(void);
+
+void H2_DoAdvanceDemo(void);
+
+boolean G_CheckDemoStatus(void);
+
+void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
+                  const char *name);
+// only called by startup code
+
+void G_PlayDemo(char *name);
+void G_TimeDemo(char *name);
+
+void G_TeleportNewMap(int map, int position);
+
+void G_Completed(int map, int position);
+//void G_ExitLevel (void);
+//void G_SecretExitLevel (void);
+
+void G_StartNewGame(skill_t skill);
+void G_StartNewInit(void);
+
+void G_WorldDone(void);
+
+void G_BuildTiccmd(ticcmd_t *cmd, int maketic);
+void G_Ticker(void);
+boolean G_Responder(event_t * ev);
+
+void G_ScreenShot(void);
+
+
+extern int LeaveMap;
+extern boolean gamekeydown[NUMKEYS];
+
+
+//-------
+//SV_SAVE
+//-------
+
+#define HXS_VERSION_TEXT "HXS Ver 2.37"
+#define HXS_VERSION_TEXT_LENGTH 16
+#define HXS_DESCRIPTION_LENGTH 24
+
+extern char *SavePath;
+
+void SV_SaveGame(int slot, const char *description);
+void SV_SaveMap(boolean savePlayers);
+void SV_LoadGame(int slot);
+void SV_MapTeleport(int map, int position);
+void SV_LoadMap(void);
+void SV_InitBaseSlot(void);
+void SV_UpdateRebornSlot(void);
+void SV_ClearRebornSlot(void);
+boolean SV_RebornSlotAvailable(void);
+int SV_GetRebornSlot(void);
+
+//-----
+//PLAY
+//-----
+
+extern lumpinfo_t *maplumpinfo;
+
+void P_Ticker(void);
+// called by C_Ticker
+// can call G_PlayerExited
+// carries out all thinking of monsters and players
+
+void P_SetupLevel(int episode, int map, int playermask, skill_t skill);
+// called by W_Ticker
+
+void P_Init(void);
+// called by startup code
+
+int P_GetMapCluster(int map);
+int P_TranslateMap(int map);
+int P_GetMapCDTrack(int map);
+int P_GetMapWarpTrans(int map);
+int P_GetMapNextMap(int map);
+int P_GetMapSky1Texture(int map);
+int P_GetMapSky2Texture(int map);
+char *P_GetMapName(int map);
+fixed_t P_GetMapSky1ScrollDelta(int map);
+fixed_t P_GetMapSky2ScrollDelta(int map);
+boolean P_GetMapDoubleSky(int map);
+boolean P_GetMapLightning(int map);
+boolean P_GetMapFadeTable(int map);
+char *P_GetMapSongLump(int map);
+void P_PutMapSongLump(int map, char *lumpName);
+int P_GetCDStartTrack(void);
+int P_GetCDEnd1Track(void);
+int P_GetCDEnd2Track(void);
+int P_GetCDEnd3Track(void);
+int P_GetCDIntermissionTrack(void);
+int P_GetCDTitleTrack(void);
+
+//-------
+//REFRESH
+//-------
+
+extern boolean setsizeneeded;
+
+extern boolean BorderNeedRefresh;
+extern boolean BorderTopRefresh;
+
+extern int UpdateState;
+// define the different areas for the dirty map
+#define I_NOUPDATE	0
+#define I_FULLVIEW	1
+#define I_STATBAR	2
+#define I_MESSAGES	4
+#define I_FULLSCRN	8
+
+void R_RenderPlayerView(player_t * player);
+// called by G_Drawer
+
+void R_Init(void);
+// called by startup code
+
+void R_DrawViewBorder(void);
+void R_DrawTopBorder(void);
+// if the view size is not full screen, draws a border around it
+
+void R_SetViewSize(int blocks, int detail);
+// called by M_Responder
+
+int R_FlatNumForName(const char *name);
+
+int R_TextureNumForName(const char *name);
+int R_CheckTextureNumForName(const char *name);
+// called by P_Ticker for switches and animations
+// returns the texture number for the texture name
+
+
+//----
+//MISC
+//----
+extern int localQuakeHappening[MAXPLAYERS];
+
+int M_DrawText(int x, int y, boolean direct, char *string);
+
+//------------------------------
+// SC_man.c
+//------------------------------
+
+void SC_Open(const char *name);
+void SC_OpenLump(const char *name);
+void SC_OpenFile(const char *name);
+void SC_Close(void);
+boolean SC_GetString(void);
+void SC_MustGetString(void);
+void SC_MustGetStringName(char *name);
+boolean SC_GetNumber(void);
+void SC_MustGetNumber(void);
+void SC_UnGet(void);
+//boolean SC_Check(void);
+boolean SC_Compare(const char *text);
+int SC_MatchString(const char **strings);
+int SC_MustMatchString(const char **strings);
+void SC_ScriptError(const char *message);
+
+extern char *sc_String;
+extern int sc_Number;
+extern int sc_Line;
+extern boolean sc_End;
+extern boolean sc_Crossed;
+extern boolean sc_FileScripts;
+extern const char *sc_ScriptsDir;
+
+//------------------------------
+// SN_sonix.c
+//------------------------------
+
+enum
+{
+    SEQ_PLATFORM,
+    SEQ_PLATFORM_HEAVY,         // same script as a normal platform
+    SEQ_PLATFORM_METAL,
+    SEQ_PLATFORM_CREAK,         // same script as a normal platform
+    SEQ_PLATFORM_SILENCE,
+    SEQ_PLATFORM_LAVA,
+    SEQ_PLATFORM_WATER,
+    SEQ_PLATFORM_ICE,
+    SEQ_PLATFORM_EARTH,
+    SEQ_PLATFORM_METAL2,
+    SEQ_DOOR_STONE,
+    SEQ_DOOR_HEAVY,
+    SEQ_DOOR_METAL,
+    SEQ_DOOR_CREAK,
+    SEQ_DOOR_SILENCE,
+    SEQ_DOOR_LAVA,
+    SEQ_DOOR_WATER,
+    SEQ_DOOR_ICE,
+    SEQ_DOOR_EARTH,
+    SEQ_DOOR_METAL2,
+    SEQ_ESOUND_WIND,
+    SEQ_NUMSEQ
+};
+
+typedef enum
+{
+    SEQTYPE_STONE,
+    SEQTYPE_HEAVY,
+    SEQTYPE_METAL,
+    SEQTYPE_CREAK,
+    SEQTYPE_SILENCE,
+    SEQTYPE_LAVA,
+    SEQTYPE_WATER,
+    SEQTYPE_ICE,
+    SEQTYPE_EARTH,
+    SEQTYPE_METAL2,
+    SEQTYPE_NUMSEQ
+} seqtype_t;
+
+void SN_InitSequenceScript(void);
+void SN_StartSequence(mobj_t * mobj, int sequence);
+void SN_StartSequenceName(mobj_t * mobj, char *name);
+void SN_StopSequence(mobj_t * mobj);
+void SN_UpdateActiveSequences(void);
+void SN_StopAllSequences(void);
+int SN_GetSequenceOffset(int sequence, int *sequencePtr);
+void SN_ChangeNodeData(int nodeNum, int seqOffset, int delayTics, int volume,
+                       int currentSoundID);
+
+
+typedef struct seqnode_s seqnode_t;
+struct seqnode_s
+{
+    int *sequencePtr;
+    int sequence;
+    mobj_t *mobj;
+    int currentSoundID;
+    int delayTics;
+    int volume;
+    int stopSound;
+    seqnode_t *prev;
+    seqnode_t *next;
+};
+
+extern int ActiveSequences;
+extern seqnode_t *SequenceListHead;
+
+//----------------------
+// Interlude (IN_lude.c)
+//----------------------
+
+#define MAX_INTRMSN_MESSAGE_SIZE 1024
+
+extern boolean intermission;
+extern char ClusterMessage[MAX_INTRMSN_MESSAGE_SIZE];
+
+void IN_Start(void);
+void IN_Ticker(void);
+void IN_Drawer(void);
+
+//----------------------
+// Chat mode (CT_chat.c)
+//----------------------
+
+void CT_Init(void);
+void CT_Drawer(void);
+boolean CT_Responder(event_t * ev);
+void CT_Ticker(void);
+char CT_dequeueChatChar(void);
+
+extern boolean chatmodeon;
+
+//--------------------
+// Finale (F_finale.c)
+//--------------------
+
+void F_Drawer(void);
+void F_Ticker(void);
+void F_StartFinale(void);
+
+//----------------------
+// STATUS BAR (SB_bar.c)
+//----------------------
+
+extern int inv_ptr;
+extern int curpos;
+extern boolean inventory;
+
+
+void SB_Init(void);
+void SB_SetClassData(void);
+boolean SB_Responder(event_t * event);
+void SB_Ticker(void);
+void SB_Drawer(void);
+void Draw_TeleportIcon(void);
+void Draw_SaveIcon(void);
+void Draw_LoadIcon(void);
+
+//-----------------
+// MENU (MN_menu.c)
+//-----------------
+
+void MN_Init(void);
+void MN_ActivateMenu(void);
+void MN_DeactivateMenu(void);
+boolean MN_Responder(event_t * event);
+void MN_Ticker(void);
+void MN_Drawer(void);
+void MN_DrTextA(const char *text, int x, int y);
+void MN_DrTextAYellow(const char *text, int x, int y);
+int MN_TextAWidth(const char *text);
+void MN_DrTextB(const char *text, int x, int y);
+int MN_TextBWidth(const char *text);
+
+extern int messageson;
+extern boolean MenuActive;
+extern boolean askforquit;
+extern boolean mn_SuicideConsole;
+extern int detailLevel;
+
+
+#include "sounds.h"
+
+#include "p_action.h"
+
+
+#endif // __H2DEF__
diff --git a/games/NXDoom/src/hexen/hexen_icon.c b/games/NXDoom/src/hexen/hexen_icon.c
new file mode 100644
index 000000000..ae1082596
--- /dev/null
+++ b/games/NXDoom/src/hexen/hexen_icon.c
@@ -0,0 +1,2736 @@
+static int hexen_icon_w = 128;
+static int hexen_icon_h = 128;
+
+static const unsigned int hexen_icon_data[] = {
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
+    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
+    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
+    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
+    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
+    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
+    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
+    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
+    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
+    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
+    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
+    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
+    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
+    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
+    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
+    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
+    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
+    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
+    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
+    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
+    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
+    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
+    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
+    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
+    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
+    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
+    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
+    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
+    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
+    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
+    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
+    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
+    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
+    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
+    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
+    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
+    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
+    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
+    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
+    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
+    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
+    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
+    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
+    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
+    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
+    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x93756aff, 0x917469ff, 0x99796eff, 0xa07b70ff, 
+    0xa07b70ff, 0xa07b70ff, 0xa07b70ff, 0xa07b70ff, 0xa07b70ff, 0xa8887eff, 
+    0xb9a39dff, 0xb8a39cff, 0xb8a39cff, 0xb7a29bff, 0xb7a29bff, 0xb6a19aff, 
+    0xb5a099ff, 0xb5a099ff, 0xb49f98ff, 0xa78980ff, 0x9e7a6eff, 0x9d7a6eff, 
+    0x9d7a6eff, 0x9d7a6eff, 0x9b796dff, 0x99776bff, 0x977469ff, 0x957267ff, 
+    0x957368ff, 0xa18982ff, 0xa38e88ff, 0xa18d86ff, 0xa08c85ff, 0x9e8983ff, 
+    0x9c8781ff, 0x9a867fff, 0x99847dff, 0x97827bff, 0x917c74ff, 0x7e5d51ff, 
+    0x7c5b4fff, 0x7b594eff, 0x78574cff, 0x76554aff, 0x745348ff, 0x735246ff, 
+    0x715044ff, 0x6f4e42ff, 0x775c52ff, 0x816e67ff, 0x7f6c65ff, 0x7e6b63ff, 
+    0x7c6861ff, 0x7a6760ff, 0x79665eff, 0x76635cff, 0x74615aff, 0x736059ff, 
+    0x61443bff, 0x57382dff, 0x55362cff, 0x583a30ff, 0x5a3d36ff, 0x5d3f3cff, 
+    0x5f4141ff, 0x5f4447ff, 0x5f454bff, 0x674e55ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
+    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
+    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
+    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
+    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
+    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
+    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
+    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
+    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
+    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
+    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
+    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
+    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
+    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
+    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
+    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
+    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
+    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
+    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
+    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
+    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xc69e94ff, 0xc9a49bff, 
+    0xc8a39aff, 0xc7a39aff, 0xc6a198ff, 0xc5a198ff, 0xc4a097ff, 0xc4a096ff, 
+    0xc29f95ff, 0xbd948aff, 0xb07c6eff, 0xb07b6eff, 0xaf7b6dff, 0xae7b6dff, 
+    0xae7a6dff, 0xad7a6cff, 0xad7a6cff, 0xac7a6cff, 0xac7a6cff, 0xb38a80ff, 
+    0xb7978eff, 0xb6958cff, 0xb6958cff, 0xb5948bff, 0xb29289ff, 0xb19188ff, 
+    0xaf8f86ff, 0xad8d85ff, 0xab8c83ff, 0x9e7164ff, 0x9a6c5fff, 0x986a5dff, 
+    0x97695bff, 0x946759ff, 0x926558ff, 0x906356ff, 0x8e6155ff, 0x8b5f52ff, 
+    0x8d6458ff, 0x96786fff, 0x94776eff, 0x91756cff, 0x90736bff, 0x8e7269ff, 
+    0x8c7068ff, 0x8a6e66ff, 0x896d64ff, 0x866b62ff, 0x7d5d52ff, 0x734a3dff, 
+    0x70483bff, 0x6e473aff, 0x6c4438ff, 0x6b4337ff, 0x684134ff, 0x664033ff, 
+    0x643e31ff, 0x623c2fff, 0x6b4f45ff, 0x6f564eff, 0x6d544cff, 0x6e564fff, 
+    0x6e5652ff, 0x6e5753ff, 0x6f5857ff, 0x6f5958ff, 0x705a5cff, 0x705b5eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x903d27ff, 0x903d28ff, 0x8f3d28ff, 0x8e3c27ff, 0x8d3c27ff, 0x8c3b27ff, 
+    0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 
+    0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 
+    0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 
+    0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 
+    0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
+    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
+    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
+    0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 
+    0x572311ff, 0x572310ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x8f3d27ff, 0x8f3d28ff, 0x8e3c27ff, 0x8d3c27ff, 
+    0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 
+    0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 
+    0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 
+    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 
+    0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 
+    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
+    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
+    0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 
+    0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8e3d27ff, 0x8e3c27ff, 
+    0x8d3c27ff, 0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 
+    0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 
+    0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 
+    0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
+    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 
+    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
+    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
+    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
+    0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 
+    0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x8d3c26ff, 0x8d3c27ff, 0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 
+    0x893a25ff, 0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 
+    0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 
+    0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 
+    0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
+    0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
+    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
+    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
+    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 
+    0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 
+    0x552210ff, 0x54220fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x8c3c26ff, 0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 
+    0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 
+    0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 
+    0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 
+    0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 
+    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
+    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
+    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
+    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 
+    0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 
+    0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8b3b26ff, 0x8b3b26ff, 
+    0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 0x863924ff, 
+    0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 
+    0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 
+    0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 
+    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
+    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
+    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 
+    0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 
+    0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x8a3b25ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 
+    0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 
+    0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 
+    0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 
+    0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
+    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
+    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
+    0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 
+    0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 
+    0x52210fff, 0x51200eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x893b25ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 
+    0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 
+    0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 
+    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 
+    0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 
+    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
+    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
+    0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 
+    0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 
+    0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x893a25ff, 0x893a25ff, 
+    0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 
+    0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 
+    0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
+    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 
+    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
+    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
+    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
+    0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 
+    0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 
+    0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x883a24ff, 0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 
+    0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x97361fff, 
+    0xe93819ff, 0xe53619ff, 0x92341fff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 
+    0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
+    0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
+    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
+    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
+    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x852112ff, 0xd31710ff, 0xea1310ff, 
+    0xcc150fff, 0x752110ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 
+    0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 
+    0x50200eff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x873924ff, 0x873924ff, 0x863924ff, 0x853824ff, 
+    0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 
+    0x7f3521ff, 0xcc371cff, 0xfe3718ff, 0xfe3617ff, 0xf23518ff, 0x91341eff, 
+    0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 
+    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
+    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
+    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
+    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xee0f0eff, 0x641e10ff, 0x572310ff, 
+    0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 
+    0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x863923ff, 0x863924ff, 
+    0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 
+    0x803622ff, 0x7f3521ff, 0x7e3521ff, 0xae361eff, 0xfe3617ff, 0xfe3517ff, 
+    0xfe3417ff, 0xf23318ff, 0x8f331eff, 0x78321eff, 0x77321eff, 0x77311eff, 
+    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
+    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
+    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 
+    0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0x9d1310ff, 0x501f10ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 
+    0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x853923ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 
+    0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 
+    0xbd351cff, 0xfe3417ff, 0xfe3317ff, 0xfe3217ff, 0xf23217ff, 0x8d321dff, 
+    0xa8311bff, 0xd02f19ff, 0x9a311bff, 0x74301dff, 0x73301cff, 0x722f1cff, 
+    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
+    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
+    0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0xf70e11ff, 0xaf1211ff, 0x40190fff, 0x4e1f0fff, 0x53210fff, 
+    0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 
+    0x4d1e0cff, 0x4d1e0cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x843823ff, 0x843823ff, 0x843723ff, 0x833723ff, 
+    0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 
+    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0xbc331bff, 0xfe3217ff, 0xfe3216ff, 
+    0xfd3116ff, 0xf23016ff, 0xfc2f16ff, 0xfd2e15ff, 0xfb2d15ff, 0xa02e1aff, 
+    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
+    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
+    0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0x811411ff, 0x3f180eff, 
+    0x40180fff, 0x4d1e0fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 
+    0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4d1e0cff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x833822ff, 0x843723ff, 
+    0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 
+    0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
+    0xbb321aff, 0xfd3116ff, 0xfd3016ff, 0xfd2f16ff, 0xfd2e15ff, 0xfd2d15ff, 
+    0xfd2c15ff, 0xfb2b15ff, 0x9f2d19ff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
+    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
+    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
+    0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc41013ff, 
+    0x41180eff, 0x3f180eff, 0x3e180eff, 0x3f180eff, 0x4c1e0eff, 0x50200eff, 
+    0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1d0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x833722ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 
+    0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7c331fff, 
+    0xaa321cff, 0xa4321bff, 0x78321eff, 0xba301aff, 0xfd2f16ff, 0xfd2e15ff, 
+    0xfd2d15ff, 0xfd2c15ff, 0xfd2b15ff, 0xfd2a15ff, 0xfa2914ff, 0x9e2c19ff, 
+    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
+    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
+    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
+    0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
+    0x3f180eff, 0x4a1d0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4b1d0dff, 0x4c1d0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x823722ff, 0x823722ff, 0x813622ff, 0x803622ff, 
+    0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 
+    0x7a331fff, 0xb9331bff, 0xfe3216ff, 0xfd3116ff, 0x9c2b18ff, 0x76311dff, 
+    0xb92f19ff, 0xfd2d15ff, 0xfd2c15ff, 0xfd2b15ff, 0xfd2a15ff, 0xfc2914ff, 
+    0xfc2814ff, 0xf72713ff, 0x742717ff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
+    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
+    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
+    0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 
+    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3f180eff, 0x491c0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4b1d0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x813721ff, 0x813622ff, 
+    0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 
+    0x7b331fff, 0x7a331fff, 0x79331fff, 0xc5321aff, 0xfd3116ff, 0xfd3016ff, 
+    0xa02615ff, 0x5c2617ff, 0x74301dff, 0xb82e19ff, 0xfd2b15ff, 0xfd2a15ff, 
+    0xfc2914ff, 0xfc2814ff, 0xfc2714ff, 0xfc2614ff, 0x691d12ff, 0x602717ff, 
+    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 
+    0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 
+    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3e180dff, 0x481c0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4b1c0eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x803621ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 
+    0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x84321dff, 
+    0xc12b16ff, 0xb72914ff, 0x531f13ff, 0x491d13ff, 0x5b2517ff, 0x722f1cff, 
+    0xb72c18ff, 0xfc2914ff, 0xfc2814ff, 0xfc2714ff, 0xfc2614ff, 0xb32112ff, 
+    0x441c11ff, 0x441b11ff, 0x5e2617ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
+    0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 
+    0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x481b0dff, 0x4a1d0dff, 
+    0x4a1c0eff, 0x4a1c0eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x7f3621ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 
+    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 
+    0x77321eff, 0x77311eff, 0x712f1cff, 0x512115ff, 0x491d13ff, 0x481d13ff, 
+    0x481d13ff, 0x592416ff, 0x712f1bff, 0xb62b17ff, 0xfc2714ff, 0xfc2614ff, 
+    0xfc2513ff, 0xec2312ff, 0x621c11ff, 0x431b11ff, 0x431b10ff, 0x5c2516ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
+    0x5e2613ff, 0x932011ff, 0xf7120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xca1113ff, 0x47180eff, 
+    0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d180eff, 0x471a0eff, 0x491c0eff, 0x4a1c0eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7f3520ff, 0x7e3521ff, 
+    0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
+    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x6f2e1cff, 
+    0x502114ff, 0x481d13ff, 0x591e12ff, 0xa92313ff, 0x9c2515ff, 0x702e1aff, 
+    0xb52a17ff, 0xfc2513ff, 0xfc2413ff, 0xfc2313ff, 0xeb2113ff, 0x611c10ff, 
+    0x421a10ff, 0x421b10ff, 0x5a2415ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
+    0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 
+    0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
+    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3e170fff, 0x461a0eff, 0x491b0fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x7e3520ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 
+    0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
+    0x74301dff, 0x73301cff, 0x6e2d1bff, 0x4e2014ff, 0xc22514ff, 0xfc2814ff, 
+    0xfc2714ff, 0xb82615ff, 0x6e2d1aff, 0xb42816ff, 0xfc2313ff, 0xfc2213ff, 
+    0xfb2112ff, 0xea1f11ff, 0x601b10ff, 0x411a10ff, 0x411a10ff, 0x582414ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
+    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
+    0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
+    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3e1710ff, 0x461a0fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x7d3520ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 
+    0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 
+    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x6c2d1aff, 
+    0xc32514ff, 0xfc2714ff, 0xfc2614ff, 0xfc2513ff, 0xb82313ff, 0x6c2c19ff, 
+    0xb32716ff, 0xfb2112ff, 0xfb2012ff, 0xfb1f12ff, 0xea1d11ff, 0x5e1b10ff, 
+    0x401a0fff, 0x401a0fff, 0x592414ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x612714ff, 0xa02013ff, 0xe41711ff, 0xf9140fff, 0xfa130fff, 0xf9120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
+    0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 
+    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x401710ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7d341fff, 0x7c3420ff, 
+    0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 
+    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
+    0x712f1bff, 0x702e1bff, 0x7b2b18ff, 0xe42514ff, 0xfc2513ff, 0xfc2413ff, 
+    0xfc2313ff, 0xb72213ff, 0x6b2c18ff, 0xb22515ff, 0xfb1f12ff, 0xfb1e12ff, 
+    0xfb1d12ff, 0xea1b10ff, 0x5e1910ff, 0x3f190fff, 0x3f190fff, 0x562213ff, 
+    0x612815ff, 0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
+    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 
+    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3f1611ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x7c341fff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 
+    0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
+    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x7a2a18ff, 
+    0xe42312ff, 0xfc2313ff, 0xfc2213ff, 0xfb2112ff, 0x9b2113ff, 0x682b18ff, 
+    0xb12414ff, 0xfb1d12ff, 0xfb1c11ff, 0xfb1b11ff, 0xea1a10ff, 0x5e190fff, 
+    0x3e190eff, 0x3e190fff, 0x552112ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 
+    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 
+    0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3e170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3f1611ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x7b331eff, 0x7a331fff, 0x79331fff, 0x78321eff, 
+    0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 
+    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
+    0x6d2d1aff, 0x6c2d19ff, 0x782917ff, 0xe42112ff, 0xfb2112ff, 0xfb2012ff, 
+    0xb11d11ff, 0x522013ff, 0x662a17ff, 0xb02314ff, 0xfb1b11ff, 0xfb1a11ff, 
+    0xfa1911ff, 0xeb1810ff, 0xc71810ff, 0xc81610ff, 0xd41610ff, 0xfa1410ff, 
+    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 
+    0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3f1711ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7a331eff, 0x79331fff, 
+    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 
+    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
+    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x772916ff, 
+    0xc61f12ff, 0xcb1e11ff, 0x591b10ff, 0x441a10ff, 0x5f1f11ff, 0x642916ff, 
+    0xb02114ff, 0xfa1911ff, 0xfa1810ff, 0xfa1710ff, 0xfa1610ff, 0xfa1510ff, 
+    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 
+    0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
+    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3f1712ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x79331eff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
+    0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
+    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
+    0x6a2c18ff, 0x692b18ff, 0x642917ff, 0x471c11ff, 0x4d1a10ff, 0xe21c11ff, 
+    0xfb1b11ff, 0xb11d12ff, 0x642815ff, 0xba1f12ff, 0xfa1710ff, 0xfa1610ff, 
+    0xfa1510ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
+    0xda0f13ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
+    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3f1712ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x78321dff, 0x77321eff, 0x77311eff, 0x76311dff, 
+    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
+    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
+    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x622816ff, 
+    0x791c10ff, 0xfb1b11ff, 0xfb1a11ff, 0xfa1911ff, 0xbf1b10ff, 0xd41b11ff, 
+    0xfa1610ff, 0xfa1510ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
+    0xf60e12ff, 0xf50e14ff, 0xf20e15ff, 0x681510ff, 0x3e180eff, 0x3e180eff, 
+    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3f1712ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x77321dff, 0x77311eff, 
+    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
+    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
+    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x692615ff, 0xe21a11ff, 0xfa1911ff, 0xfa1810ff, 
+    0xfa1710ff, 0xfa1610ff, 0xfa1510ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
+    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xa91214ff, 
+    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3f1613ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x77311dff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
+    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
+    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x702514ff, 
+    0xe21910ff, 0xfa1710ff, 0xfa1610ff, 0xfa1510ff, 0xfa1410ff, 0xfa140fff, 
+    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 
+    0xf20e18ff, 0xaf1215ff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1513ff, 0x3e1613ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x76311cff, 0x75311dff, 0x74301dff, 0x73301cff, 
+    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
+    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x6e2514ff, 0xe21710ff, 0xfa1510ff, 0xfa1410ff, 
+    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 
+    0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 0x781511ff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3e1714ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x75311cff, 0x74301dff, 
+    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
+    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
+    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xc11b11ff, 
+    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 
+    0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 0xae1215ff, 0x3e180eff, 
+    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3e1615ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x74301cff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
+    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
+    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 
+    0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
+    0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 0xb31116ff, 
+    0x41180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3f1614ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x73301bff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
+    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
+    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
+    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
+    0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 
+    0xb31116ff, 0x41180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3e1615ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x722f1bff, 0x712f1bff, 
+    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
+    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x612714ff, 0xbc1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
+    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 
+    0xf10e19ff, 0xec0e19ff, 0x5d1611ff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
+    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3f1515ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x712f1aff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
+    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 
+    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 
+    0xf20e18ff, 0xf10e19ff, 0xf00e1aff, 0xef0e1cff, 0xde0f1bff, 0x5c1610ff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
+    0x3d1415ff, 0x3e1615ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x712f1aff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
+    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xbc1d12ff, 0xfa1410ff, 
+    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0xc01110ff, 0xec0e12ff, 0xf50e14ff, 0xf40e15ff, 
+    0xf30e16ff, 0xf20e18ff, 0xd90f18ff, 0xa31315ff, 0xef0e1cff, 0xee0e1dff, 
+    0xed0d1eff, 0xdd0e1eff, 0x5a1510ff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
+    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3e1616ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x702e1aff, 0x6f2e1aff, 
+    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
+    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xbc1d12ff, 
+    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x40180fff, 0xcb1012ff, 
+    0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xd90f18ff, 0x54170fff, 0x3e180eff, 
+    0x961215ff, 0xed0d1eff, 0xec0d20ff, 0xeb0d21ff, 0xdb0e20ff, 0x591512ff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
+    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3d1516ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6f2e19ff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
+    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 
+    0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 
+    0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 
+    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x8f1216ff, 0xeb0d21ff, 0xea0d22ff, 
+    0xe90d24ff, 0xd90e23ff, 0x5a1513ff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
+    0x3c1416ff, 0x3d1515ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x6e2e19ff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
+    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
+    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 
+    0x40180fff, 0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 
+    0x56170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
+    0x8e1217ff, 0xe90d24ff, 0xe80d25ff, 0xe70d26ff, 0xd70e26ff, 0x5a1513ff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
+    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3d1516ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6d2d19ff, 0x6c2d19ff, 
+    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
+    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0xa11210ff, 0x40180fff, 0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 
+    0xdc0f18ff, 0x56170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x8d1218ff, 0xe70d26ff, 0xe60d28ff, 
+    0xe50d29ff, 0xd50e27ff, 0x591415ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
+    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
+    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3d1416ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 
+    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0xa11210ff, 0x40180fff, 0xa91212ff, 0xf40e15ff, 0xf30e16ff, 
+    0xf20e18ff, 0xdc0f18ff, 0x56170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x8c121bff, 0xe50d29ff, 0xe40d2aff, 0xe30d2cff, 0xd40e2aff, 0x5a1515ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
+    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
+    0x3c1316ff, 0x3d1417ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
+    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 
+    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 0xa91212ff, 0xf40e15ff, 
+    0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x8b121cff, 0xe30d2cff, 0xe20d2dff, 
+    0xe10d2eff, 0xd20e2dff, 0x591416ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
+    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
+    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3d1418ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6a2c19ff, 0x6a2c18ff, 
+    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 
+    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 0xa91212ff, 
+    0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 0x3e180eff, 
+    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x8a121eff, 0xe10d2eff, 0xe00d30ff, 0xdf0d31ff, 0xd00e30ff, 0x591418ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
+    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
+    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3d1318ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 
+    0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 
+    0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 
+    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x8a121fff, 0xdf0d31ff, 0xde0d33ff, 
+    0xdd0d34ff, 0xce0e32ff, 0x591418ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
+    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
+    0x3c1218ff, 0x3c1318ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
+    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 
+    0x3f180fff, 0xab1212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xd90f18ff, 
+    0x54170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x8e1222ff, 0xdd0d34ff, 0xdc0d35ff, 0xdb0d37ff, 0xcc0e35ff, 0x571419ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
+    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
+    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3c1319ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x682b18ff, 0x672a17ff, 
+    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
+    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0x9b1310ff, 0x3f180fff, 0x691511ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 
+    0xd90f18ff, 0x54170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x8d1224ff, 0xdb0d37ff, 0xda0d38ff, 
+    0xd90d39ff, 0xcb0e38ff, 0x56141cff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
+    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
+    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3c1218ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
+    0x622815ff, 0x612815ff, 0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 
+    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 0x5d1610ff, 0xf10e16ff, 
+    0xf20e18ff, 0xd90f18ff, 0x54170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x8c1125ff, 0xd90d39ff, 0xd80d3bff, 0xd70d3cff, 0xc90e39ff, 0x56141cff, 
+    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
+    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
+    0x3b1118ff, 0x3c1218ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
+    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x9b2012ff, 0xfa1410ff, 
+    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x40180fff, 0x7b1511ff, 0x801411ff, 
+    0x41180eff, 0x6e1610ff, 0x911313ff, 0x4e170fff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x8a1228ff, 0xd70d3cff, 0xd60d3dff, 
+    0xd50d3fff, 0xc70d3cff, 0x56141dff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
+    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
+    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3c1319ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x652a16ff, 0x642916ff, 
+    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
+    0xd81810ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
+    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x851411ff, 
+    0xf40e15ff, 0xf30e16ff, 0x941412ff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
+    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
+    0x8a1129ff, 0xd50d3fff, 0xd40c40ff, 0xd30c41ff, 0xc50d3fff, 0x54131dff, 
+    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
+    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3b121aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
+    0x5f2714ff, 0x5e2614ff, 0xe41610ff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
+    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 
+    0x3f180fff, 0x971311ff, 0xf30e16ff, 0xf20e18ff, 0xa51214ff, 0x3f180eff, 
+    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x88102aff, 0xd30c41ff, 0xd20c43ff, 
+    0xd10c44ff, 0xc20d41ff, 0x51131dff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
+    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
+    0x3a111aff, 0x3a1219ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
+    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 0xb61b11ff, 0xf9120fff, 
+    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 
+    0x3f180fff, 0x5c1610ff, 0x4d170fff, 0x49180eff, 0xac1214ff, 0xb01215ff, 
+    0x50170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
+    0x87102dff, 0xd10c44ff, 0xd00c45ff, 0xcf0c47ff, 0x940f34ff, 0x3c1317ff, 
+    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
+    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3b1219ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x632815ff, 0x622815ff, 
+    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 
+    0x652413ff, 0xd81510ff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
+    0x9b1310ff, 0x3f180fff, 0x961412ff, 0xf40e15ff, 0xea0e16ff, 0x591610ff, 
+    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
+    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
+    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x86102dff, 0xcf0c47ff, 0xce0c48ff, 
+    0x7a102cff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
+    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x3a1119ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 
+    0x5d2613ff, 0x5c2513ff, 0x742211ff, 0xeb120fff, 0xf90f0eff, 0xf90e0eff, 
+    0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 0xc81113ff, 0xf30e16ff, 
+    0xf20e18ff, 0x811412ff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
+    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
+    0x5d1221ff, 0x621124ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
+    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
+    0x39101aff, 0x3a1119ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
+    0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0xd4140fff, 0xf90f0eff, 
+    0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 0x3f180eff, 
+    0x761511ff, 0xe40f17ff, 0xc91016ff, 0x4b170fff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
+    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
+    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
+    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
+    0x3a111aff, 0x39101aff, 0x39101aff, 0x39111aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x602714ff, 0x5f2714ff, 
+    0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 
+    0xd4140fff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 
+    0x3f180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
+    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
+    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
+    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
+    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
+    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x39101aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 
+    0x5a2412ff, 0x592411ff, 0x6b1f10ff, 0xa71310ff, 0x801510ff, 0x3f180fff, 
+    0x3f180fff, 0x3f180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
+    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
+    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
+    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
+    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
+    0x380f1bff, 0x39101aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 
+    0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x54210fff, 
+    0x41190eff, 0x3f180fff, 0x3f180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 
+    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
+    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
+    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
+    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
+    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
+    0x38101bff, 0x380f1bff, 0x380f1bff, 0x38101bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5d2613ff, 0x5d2613ff, 
+    0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 
+    0x572310ff, 0x562210ff, 0x52200fff, 0x40190fff, 0x3f180eff, 0x3e180eff, 
+    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
+    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
+    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
+    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
+    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
+    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
+    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x380f1bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 
+    0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x501f0fff, 
+    0x40190fff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
+    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
+    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
+    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
+    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
+    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
+    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
+    0x370e1cff, 0x370f1cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 
+    0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 
+    0x53210fff, 0x52210fff, 0x4f1f0eff, 0x40190eff, 0x3e180eff, 0x3e170dff, 
+    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
+    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
+    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
+    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
+    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
+    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
+    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x370f1cff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5b2512ff, 0x5a2412ff, 
+    0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 
+    0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x4e1f0eff, 
+    0x3f180eff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
+    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
+    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
+    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
+    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
+    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
+    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 
+    0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x360e1cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 
+    0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 
+    0x50200eff, 0x4f1f0dff, 0x4c1e0dff, 0x3f180dff, 0x3d170dff, 0x3d170dff, 
+    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
+    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
+    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
+    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
+    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
+    0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 
+    0x350d1dff, 0x360e1dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 
+    0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 
+    0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4a1d0dff, 
+    0x3f180dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
+    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
+    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
+    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
+    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
+    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
+    0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 
+    0x360e1dff, 0x350d1dff, 0x350d1eff, 0x350e1dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x582411ff, 0x572311ff, 
+    0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 
+    0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x491c0eff, 0x3f180eff, 0x3d170eff, 0x3d170fff, 
+    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
+    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
+    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
+    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
+    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
+    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
+    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 
+    0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x350d1dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 
+    0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 
+    0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x481c0eff, 
+    0x3f170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
+    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
+    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
+    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
+    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
+    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
+    0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 
+    0x340c1eff, 0x340d1eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 
+    0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 
+    0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 
+    0x4a1d0dff, 0x4a1c0eff, 0x471b0fff, 0x3f180fff, 0x3d1610ff, 0x3e1710ff, 
+    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
+    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
+    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
+    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
+    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
+    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 
+    0x340d1eff, 0x340c1eff, 0x330c1fff, 0x340d1eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x562210ff, 0x552210ff, 
+    0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 
+    0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 
+    0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x471a10ff, 
+    0x3f1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
+    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
+    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
+    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
+    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 
+    0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 
+    0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x340c1eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 
+    0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 
+    0x481b0fff, 0x481b0fff, 0x471a10ff, 0x3f1711ff, 0x3e1611ff, 0x3e1711ff, 
+    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
+    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
+    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
+    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
+    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
+    0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 
+    0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 
+    0x330b1fff, 0x330c1fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 
+    0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 
+    0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 0x461911ff, 
+    0x3f1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
+    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
+    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
+    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
+    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
+    0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 
+    0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 
+    0x330c1fff, 0x330b1fff, 0x320b20ff, 0x330c1fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x53210fff, 0x52210fff, 
+    0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 
+    0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 
+    0x471a10ff, 0x461a10ff, 0x441812ff, 0x3e1613ff, 0x3e1612ff, 0x3e1513ff, 
+    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
+    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
+    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
+    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
+    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 
+    0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 
+    0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 0x320b1fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 
+    0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 
+    0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 
+    0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 0x431811ff, 
+    0x3e1613ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
+    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
+    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
+    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
+    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
+    0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 
+    0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 
+    0x310a20ff, 0x320b20ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 
+    0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 
+    0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 
+    0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 
+    0x451911ff, 0x441812ff, 0x421712ff, 0x3e1613ff, 0x3d1515ff, 0x3e1514ff, 
+    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
+    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
+    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
+    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
+    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 
+    0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 
+    0x320b20ff, 0x310a20ff, 0x310a21ff, 0x310b20ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x51200eff, 0x50200eff, 
+    0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 
+    0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 
+    0x481b0fff, 0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 
+    0x451911ff, 0x451911ff, 0x441812ff, 0x441812ff, 0x431812ff, 0x421713ff, 
+    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
+    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
+    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
+    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 
+    0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 
+    0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 
+    0x320b20ff, 0x320b20ff, 0x310a20ff, 0x310a21ff, 0x300a21ff, 0x310a20ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 
+    0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 
+    0x461911ff, 0x451911ff, 0x451911ff, 0x441812ff, 0x441812ff, 0x431812ff, 
+    0x431713ff, 0x431713ff, 0x411714ff, 0x3d1515ff, 0x3d1515ff, 0x3d1516ff, 
+    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
+    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
+    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
+    0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 
+    0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 
+    0x330b1fff, 0x320b20ff, 0x320b20ff, 0x310a20ff, 0x310a21ff, 0x300a21ff, 
+    0x300921ff, 0x300a21ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 
+    0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 0x471a10ff, 
+    0x461a10ff, 0x461911ff, 0x451911ff, 0x451911ff, 0x441812ff, 0x441812ff, 
+    0x431812ff, 0x431713ff, 0x431713ff, 0x421714ff, 0x421614ff, 0x401614ff, 
+    0x3d1515ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
+    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
+    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
+    0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 
+    0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 
+    0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 0x310a20ff, 0x310a21ff, 
+    0x300a21ff, 0x300921ff, 0x2f0922ff, 0x300a21ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0eff, 0x4d1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 
+    0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 
+    0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 0x451911ff, 0x441812ff, 
+    0x441812ff, 0x431812ff, 0x431713ff, 0x431713ff, 0x421714ff, 0x421614ff, 
+    0x411614ff, 0x411615ff, 0x3f1515ff, 0x3d1415ff, 0x3c1416ff, 0x3c1316ff, 
+    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
+    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
+    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 
+    0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 
+    0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 0x310a20ff, 
+    0x310a21ff, 0x300a21ff, 0x300921ff, 0x2f0922ff, 0x2f0922ff, 0x330b20ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x5a250fea, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 
+    0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 
+    0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 0x451911ff, 
+    0x441812ff, 0x441812ff, 0x431812ff, 0x431713ff, 0x431713ff, 0x421714ff, 
+    0x421614ff, 0x411614ff, 0x411615ff, 0x401515ff, 0x401515ff, 0x3e1516ff, 
+    0x3d1317ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
+    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
+    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
+    0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 
+    0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 
+    0x310a20ff, 0x310a21ff, 0x300a21ff, 0x300921ff, 0x2f0922ff, 0x2f0922ff, 
+    0x2e0822ff, 0x48171fe9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x782d1e22, 0x56220df7, 0x4b1d0dff, 0x4b1d0dff, 
+    0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 
+    0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 
+    0x451911ff, 0x441812ff, 0x441812ff, 0x431812ff, 0x431713ff, 0x431713ff, 
+    0x421714ff, 0x421614ff, 0x411614ff, 0x411615ff, 0x401515ff, 0x401515ff, 
+    0x3f1516ff, 0x3f1416ff, 0x3d1416ff, 0x3d1318ff, 0x3c1218ff, 0x3b1218ff, 
+    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
+    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
+    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 
+    0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 
+    0x320b20ff, 0x310a20ff, 0x310a21ff, 0x300a21ff, 0x300921ff, 0x2f0922ff, 
+    0x2f0922ff, 0x2e0822ff, 0x40131ff6, 0x68282820, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x7030114b, 0x6a2e1397, 0x682b149b, 0x662b149b, 0x662b149b, 0x662b149b, 
+    0x662b149b, 0x662b149b, 0x662b149b, 0x662b149b, 0x662b149b, 0x662b159b, 
+    0x642b159b, 0x642b159b, 0x6429159b, 0x6429159b, 0x6429159b, 0x6429159b, 
+    0x6429159b, 0x6429159b, 0x6429159b, 0x6329159b, 0x6329179b, 0x6329179b, 
+    0x6329179b, 0x6329179b, 0x6327179b, 0x6327179b, 0x6327179b, 0x6027179c, 
+    0x5f27179c, 0x5f27179c, 0x6027179c, 0x6027179c, 0x6027199c, 0x6127199b, 
+    0x5f27199b, 0x5f27199b, 0x5f26199b, 0x5f26199b, 0x5f26199b, 0x5f26199b, 
+    0x5f26199b, 0x5f26199b, 0x5f26199b, 0x5e261a9b, 0x5e261a9b, 0x5e241a9b, 
+    0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 
+    0x5c241c9b, 0x5c241c9b, 0x5c241c9b, 0x5c241c9b, 0x5c241c9b, 0x5c231c9b, 
+    0x5c231c9b, 0x5c231c9b, 0x5f231d97, 0x66291b4b, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+};
diff --git a/games/NXDoom/src/hexen/in_lude.c b/games/NXDoom/src/hexen/in_lude.c
new file mode 100644
index 000000000..573dce5c8
--- /dev/null
+++ b/games/NXDoom/src/hexen/in_lude.c
@@ -0,0 +1,607 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <ctype.h>
+
+#include "h2def.h"
+#include "s_sound.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "v_video.h"
+#include "i_swap.h"
+#include "am_map.h"
+
+
+// MACROS ------------------------------------------------------------------
+
+#define	TEXTSPEED 3
+#define	TEXTWAIT 140
+
+// TYPES -------------------------------------------------------------------
+
+typedef enum
+{
+    SINGLE,
+    COOPERATIVE,
+    DEATHMATCH
+} gametype_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void WaitStop(void);
+static void Stop(void);
+static void LoadPics(void);
+static void UnloadPics(void);
+static void CheckForSkip(void);
+static void InitStats(void);
+static void DrDeathTally(void);
+static void DrNumber(int val, int x, int y, int wrapThresh);
+static void DrNumberBold(int val, int x, int y, int wrapThresh);
+static void DrawHubText(void);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DECLARATIONS ------------------------------------------------
+
+boolean intermission;
+char ClusterMessage[MAX_INTRMSN_MESSAGE_SIZE];
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static boolean skipintermission;
+static int interstate = 0;
+static int intertime = -1;
+static gametype_t gametype;
+static int cnt;
+static int slaughterboy;        // in DM, the player with the most kills
+static patch_t *patchINTERPIC;
+static patch_t *FontBNumbers[10];
+static patch_t *FontBNegative;
+static patch_t *FontBSlash;
+static patch_t *FontBPercent;
+static int FontABaseLump;
+static int FontBLump;
+static int FontBLumpBase;
+
+static signed int totalFrags[MAXPLAYERS];
+
+static int HubCount;
+static char *HubText;
+
+// CODE --------------------------------------------------------------------
+
+//========================================================================
+//
+// IN_Start
+//
+//========================================================================
+
+
+void IN_Start(void)
+{
+    int i;
+    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
+    InitStats();
+    LoadPics();
+    intermission = true;
+    interstate = 0;
+    skipintermission = false;
+    intertime = 0;
+    AM_Stop();
+    for (i = 0; i < maxplayers; i++)
+    {
+        players[i].messageTics = 0;
+        players[i].message[0] = 0;
+    }
+    SN_StopAllSequences();
+}
+
+//========================================================================
+//
+// WaitStop
+//
+//========================================================================
+
+void WaitStop(void)
+{
+    if (!--cnt)
+    {
+        Stop();
+//              gamestate = GS_LEVEL;
+//              G_DoLoadLevel();
+        gameaction = ga_leavemap;
+//              G_WorldDone();
+    }
+}
+
+//========================================================================
+//
+// Stop
+//
+//========================================================================
+
+static void Stop(void)
+{
+    intermission = false;
+    UnloadPics();
+    SB_state = -1;
+    BorderNeedRefresh = true;
+}
+
+//========================================================================
+//
+// InitStats
+//
+//      Initializes the stats for single player mode
+//========================================================================
+
+static const char *ClusMsgLumpNames[] = {
+    "clus1msg",
+    "clus2msg",
+    "clus3msg",
+    "clus4msg",
+    "clus5msg"
+};
+
+static void InitStats(void)
+{
+    int i;
+    int j;
+    int oldCluster;
+    signed int slaughterfrags;
+    int slaughtercount;
+    int playercount;
+    const char *msgLumpName;
+    int msgSize;
+    int msgLump;
+
+    if (!deathmatch)
+    {
+        gametype = SINGLE;
+        HubCount = 0;
+        oldCluster = P_GetMapCluster(gamemap);
+        if (oldCluster != P_GetMapCluster(LeaveMap))
+        {
+            if (oldCluster >= 1 && oldCluster <= 5)
+            {
+                msgLumpName = ClusMsgLumpNames[oldCluster - 1];
+                msgLump = W_GetNumForName(msgLumpName);
+                msgSize = W_LumpLength(msgLump);
+                if (msgSize >= MAX_INTRMSN_MESSAGE_SIZE)
+                {
+                    I_Error("Cluster message too long (%s)", msgLumpName);
+                }
+                W_ReadLump(msgLump, ClusterMessage);
+                ClusterMessage[msgSize] = 0;    // Append terminator
+                HubText = ClusterMessage;
+                HubCount = strlen(HubText) * TEXTSPEED + TEXTWAIT;
+                S_StartSongName("hub", true);
+            }
+        }
+    }
+    else
+    {
+        gametype = DEATHMATCH;
+        slaughterboy = 0;
+        slaughterfrags = -9999;
+        playercount = 0;
+        slaughtercount = 0;
+        for (i = 0; i < maxplayers; i++)
+        {
+            totalFrags[i] = 0;
+            if (playeringame[i])
+            {
+                playercount++;
+                for (j = 0; j < maxplayers; j++)
+                {
+                    if (playeringame[j])
+                    {
+                        totalFrags[i] += players[i].frags[j];
+                    }
+                }
+            }
+            if (totalFrags[i] > slaughterfrags)
+            {
+                slaughterboy = 1 << i;
+                slaughterfrags = totalFrags[i];
+                slaughtercount = 1;
+            }
+            else if (totalFrags[i] == slaughterfrags)
+            {
+                slaughterboy |= 1 << i;
+                slaughtercount++;
+            }
+        }
+        if (playercount == slaughtercount)
+        {                       // don't do the slaughter stuff if everyone is equal
+            slaughterboy = 0;
+        }
+        S_StartSongName("hub", true);
+    }
+}
+
+//========================================================================
+//
+// LoadPics
+//
+//========================================================================
+
+static void LoadPics(void)
+{
+    int i;
+
+    if (HubCount || gametype == DEATHMATCH)
+    {
+        patchINTERPIC = W_CacheLumpName("INTERPIC", PU_STATIC);
+        FontBLumpBase = W_GetNumForName("FONTB16");
+        for (i = 0; i < 10; i++)
+        {
+            FontBNumbers[i] = W_CacheLumpNum(FontBLumpBase + i, PU_STATIC);
+        }
+        FontBLump = W_GetNumForName("FONTB_S") + 1;
+        FontBNegative = W_CacheLumpName("FONTB13", PU_STATIC);
+        FontABaseLump = W_GetNumForName("FONTA_S") + 1;
+
+        FontBSlash = W_CacheLumpName("FONTB15", PU_STATIC);
+        FontBPercent = W_CacheLumpName("FONTB05", PU_STATIC);
+    }
+}
+
+//========================================================================
+//
+// UnloadPics
+//
+//========================================================================
+
+static void UnloadPics(void)
+{
+    int i;
+
+    if (HubCount || gametype == DEATHMATCH)
+    {
+        W_ReleaseLumpName("INTERPIC");
+
+        patchINTERPIC = W_CacheLumpName("INTERPIC", PU_STATIC);
+        FontBLumpBase = W_GetNumForName("FONTB16");
+        for (i = 0; i < 10; i++)
+        {
+            W_ReleaseLumpNum(FontBLumpBase + i);
+        }
+        W_ReleaseLumpName("FONTB13");
+        W_ReleaseLumpName("FONTB15");
+        W_ReleaseLumpName("FONTB05");
+    }
+}
+
+//========================================================================
+//
+// IN_Ticker
+//
+//========================================================================
+
+void IN_Ticker(void)
+{
+    if (!intermission)
+    {
+        return;
+    }
+    if (interstate)
+    {
+        WaitStop();
+        return;
+    }
+    skipintermission = false;
+    CheckForSkip();
+    intertime++;
+    if (skipintermission || (gametype == SINGLE && !HubCount))
+    {
+        interstate = 1;
+        cnt = 10;
+        skipintermission = false;
+        //S_StartSound(NULL, sfx_dorcls);
+    }
+}
+
+//========================================================================
+//
+// CheckForSkip
+//
+//      Check to see if any player hit a key
+//========================================================================
+
+static void CheckForSkip(void)
+{
+    int i;
+    player_t *player;
+    static boolean triedToSkip;
+
+    for (i = 0, player = players; i < maxplayers; i++, player++)
+    {
+        if (playeringame[i])
+        {
+            if (player->cmd.buttons & BT_ATTACK)
+            {
+                if (!player->attackdown)
+                {
+                    skipintermission = 1;
+                }
+                player->attackdown = true;
+            }
+            else
+            {
+                player->attackdown = false;
+            }
+            if (player->cmd.buttons & BT_USE)
+            {
+                if (!player->usedown)
+                {
+                    skipintermission = 1;
+                }
+                player->usedown = true;
+            }
+            else
+            {
+                player->usedown = false;
+            }
+        }
+    }
+    if (deathmatch && intertime < 140)
+    {                           // wait for 4 seconds before allowing a skip
+        if (skipintermission == 1)
+        {
+            triedToSkip = true;
+            skipintermission = 0;
+        }
+    }
+    else
+    {
+        if (triedToSkip)
+        {
+            skipintermission = 1;
+            triedToSkip = false;
+        }
+    }
+}
+
+//========================================================================
+//
+// IN_Drawer
+//
+//========================================================================
+
+void IN_Drawer(void)
+{
+    if (!intermission)
+    {
+        return;
+    }
+    if (interstate)
+    {
+        return;
+    }
+    UpdateState |= I_FULLSCRN;
+    memcpy(I_VideoBuffer, (byte *) patchINTERPIC, SCREENWIDTH * SCREENHEIGHT);
+
+    if (gametype == SINGLE)
+    {
+        if (HubCount)
+        {
+            DrawHubText();
+        }
+    }
+    else
+    {
+        DrDeathTally();
+    }
+}
+
+//========================================================================
+//
+// DrDeathTally
+//
+//========================================================================
+
+#define TALLY_EFFECT_TICKS 20
+#define TALLY_FINAL_X_DELTA (23*FRACUNIT)
+#define TALLY_FINAL_Y_DELTA (13*FRACUNIT)
+#define TALLY_START_XPOS (178*FRACUNIT)
+#define TALLY_STOP_XPOS (90*FRACUNIT)
+#define TALLY_START_YPOS (132*FRACUNIT)
+#define TALLY_STOP_YPOS (83*FRACUNIT)
+#define TALLY_TOP_X 85
+#define TALLY_TOP_Y 9
+#define TALLY_LEFT_X 7
+#define TALLY_LEFT_Y 71
+#define TALLY_TOTALS_X 291
+
+static void DrDeathTally(void)
+{
+    int i, j;
+    fixed_t xPos, yPos;
+    fixed_t xDelta, yDelta;
+    fixed_t xStart, scale;
+    int x, y;
+    boolean bold;
+    static boolean showTotals;
+    int temp;
+
+    V_DrawPatch(TALLY_TOP_X, TALLY_TOP_Y,
+                W_CacheLumpName("tallytop", PU_CACHE));
+    V_DrawPatch(TALLY_LEFT_X, TALLY_LEFT_Y,
+                W_CacheLumpName("tallylft", PU_CACHE));
+    if (intertime < TALLY_EFFECT_TICKS)
+    {
+        showTotals = false;
+        scale = (intertime * FRACUNIT) / TALLY_EFFECT_TICKS;
+        xDelta = FixedMul(scale, TALLY_FINAL_X_DELTA);
+        yDelta = FixedMul(scale, TALLY_FINAL_Y_DELTA);
+        xStart = TALLY_START_XPOS - FixedMul(scale,
+                                             TALLY_START_XPOS -
+                                             TALLY_STOP_XPOS);
+        yPos =
+            TALLY_START_YPOS - FixedMul(scale,
+                                        TALLY_START_YPOS - TALLY_STOP_YPOS);
+    }
+    else
+    {
+        xDelta = TALLY_FINAL_X_DELTA;
+        yDelta = TALLY_FINAL_Y_DELTA;
+        xStart = TALLY_STOP_XPOS;
+        yPos = TALLY_STOP_YPOS;
+    }
+    if (intertime >= TALLY_EFFECT_TICKS && showTotals == false)
+    {
+        showTotals = true;
+        S_StartSound(NULL, SFX_PLATFORM_STOP);
+    }
+    y = yPos >> FRACBITS;
+    for (i = 0; i < maxplayers; i++)
+    {
+        xPos = xStart;
+        for (j = 0; j < maxplayers; j++, xPos += xDelta)
+        {
+            x = xPos >> FRACBITS;
+            bold = (i == consoleplayer || j == consoleplayer);
+            if (playeringame[i] && playeringame[j])
+            {
+                if (bold)
+                {
+                    DrNumberBold(players[i].frags[j], x, y, 100);
+                }
+                else
+                {
+                    DrNumber(players[i].frags[j], x, y, 100);
+                }
+            }
+            else
+            {
+                temp = MN_TextAWidth("--") / 2;
+                if (bold)
+                {
+                    MN_DrTextAYellow("--", x - temp, y);
+                }
+                else
+                {
+                    MN_DrTextA("--", x - temp, y);
+                }
+            }
+        }
+        if (showTotals && playeringame[i]
+            && !((slaughterboy & (1 << i)) && !(intertime & 16)))
+        {
+            DrNumber(totalFrags[i], TALLY_TOTALS_X, y, 1000);
+        }
+        yPos += yDelta;
+        y = yPos >> FRACBITS;
+    }
+}
+
+//==========================================================================
+//
+// DrNumber
+//
+//==========================================================================
+
+static void DrNumber(int val, int x, int y, int wrapThresh)
+{
+    char buff[8] = "XX";
+
+    if (!(val < -9 && wrapThresh < 1000))
+    {
+        M_snprintf(buff, sizeof(buff), "%d",
+                   val >= wrapThresh ? val % wrapThresh : val);
+    }
+    MN_DrTextA(buff, x - MN_TextAWidth(buff) / 2, y);
+}
+
+//==========================================================================
+//
+// DrNumberBold
+//
+//==========================================================================
+
+static void DrNumberBold(int val, int x, int y, int wrapThresh)
+{
+    char buff[8] = "XX";
+
+    if (!(val < -9 && wrapThresh < 1000))
+    {
+        M_snprintf(buff, sizeof(buff), "%d",
+                   val >= wrapThresh ? val % wrapThresh : val);
+    }
+    MN_DrTextAYellow(buff, x - MN_TextAWidth(buff) / 2, y);
+}
+
+//===========================================================================
+//
+// DrawHubText
+//
+//===========================================================================
+
+static void DrawHubText(void)
+{
+    int count;
+    char *ch;
+    int c;
+    int cx, cy;
+    patch_t *w;
+
+    cy = 5;
+    cx = 10;
+    ch = HubText;
+    count = (intertime - 10) / TEXTSPEED;
+    if (count < 0)
+    {
+        count = 0;
+    }
+    for (; count; count--)
+    {
+        c = *ch++;
+        if (!c)
+        {
+            break;
+        }
+        if (c == '\n')
+        {
+            cx = 10;
+            cy += 9;
+            continue;
+        }
+        if (c < 32)
+        {
+            continue;
+        }
+        c = toupper(c);
+        if (c == 32)
+        {
+            cx += 5;
+            continue;
+        }
+        w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+        if (cx + SHORT(w->width) > SCREENWIDTH)
+        {
+            break;
+        }
+        V_DrawPatch(cx, cy, w);
+        cx += SHORT(w->width);
+    }
+}
diff --git a/games/NXDoom/src/hexen/info.c b/games/NXDoom/src/hexen/info.c
new file mode 100644
index 000000000..ad579b629
--- /dev/null
+++ b/games/NXDoom/src/hexen/info.c
@@ -0,0 +1,13654 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+#include "h2def.h"
+#include "i_swap.h"
+#include "p_local.h"
+
+// generated by stateco
+
+const char *sprnames[] = {
+    "MAN1","ACLO","TLGL","FBL1","XPL1","ARRW","DART","RIPP","CFCF","BLAD",
+    "SHRD","FFSM","FFLG","PTN1","PTN2","SOAR","INVU","SUMN","TSPK","TELO",
+    "TRNG","ROCK","FOGS","FOGM","FOGL","SGSA","SGSB","PORK","EGGM","FHFX",
+    "SPHL","STWN","GMPD","ASKU","ABGM","AGMR","AGMG","AGG2","AGMB","AGB2",
+    "ABK1","ABK2","ASK2","AFWP","ACWP","AMWP","AGER","AGR2","AGR3","AGR4",
+    "TRCH","PSBG","ATLP","THRW","SPED","BMAN","BRAC","BLST","HRAD","SPSH",
+    "LVAS","SLDG","STTW","RCK1","RCK2","RCK3","RCK4","CDLR","TRE1","TRDT",
+    "TRE2","TRE3","STM1","STM2","STM3","STM4","MSH1","MSH2","MSH3","MSH4",
+    "MSH5","MSH6","MSH7","MSH8","SGMP","SGM1","SGM2","SGM3","SLC1","SLC2",
+    "SLC3","MSS1","MSS2","SWMV","CPS1","CPS2","TMS1","TMS2","TMS3","TMS4",
+    "TMS5","TMS6","TMS7","CPS3","STT2","STT3","STT4","STT5","GAR1","GAR2",
+    "GAR3","GAR4","GAR5","GAR6","GAR7","GAR8","GAR9","BNR1","TRE4","TRE5",
+    "TRE6","TRE7","LOGG","ICT1","ICT2","ICT3","ICT4","ICM1","ICM2","ICM3",
+    "ICM4","RKBL","RKBS","RKBK","RBL1","RBL2","RBL3","VASE","POT1","POT2",
+    "POT3","PBIT","CPS4","CPS5","CPS6","CPB1","CPB2","CPB3","CPB4","BDRP",
+    "BDSH","BDPL","CNDL","LEF1","LEF3","LEF2","TWTR","WLTR","BARL","SHB1",
+    "SHB2","BCKT","SHRM","FBUL","FSKL","BRTR","SUIT","BBLL","CAND","IRON",
+    "XMAS","CDRN","CHNS","TST1","TST2","TST3","TST4","TST5","TST6","TST7",
+    "TST8","TST9","TST0","TELE","TSMK","FPCH","WFAX","FAXE","WFHM","FHMR",
+    "FSRD","FSFX","CMCE","WCSS","CSSF","WCFM","CFLM","CFFX","CHLY","SPIR",
+    "MWND","WMLG","MLNG","MLFX","MLF2","MSTF","MSP1","MSP2","WFR1","WFR2",
+    "WFR3","WCH1","WCH2","WCH3","WMS1","WMS2","WMS3","WPIG","WMCS","CONE",
+    "SHEX","BLOD","GIBS","PLAY","FDTH","BSKL","ICEC","CLER","MAGE","PIGY",
+    "CENT","CTXD","CTFX","CTDP","DEMN","DEMA","DEMB","DEMC","DEMD","DEME",
+    "DMFX","DEM2","DMBA","DMBB","DMBC","DMBD","DMBE","D2FX","WRTH","WRT2",
+    "WRBL","MNTR","FX12","FX13","MNSM","SSPT","SSDV","SSXD","SSFX","BISH",
+    "BPFX","DRAG","DRFX","ARM1","ARM2","ARM3","ARM4","MAN2","MAN3","KEY1",
+    "KEY2","KEY3","KEY4","KEY5","KEY6","KEY7","KEY8","KEY9","KEYA","KEYB",
+    "ETTN","ETTB","FDMN","FDMB","ICEY","ICPR","ICWS","SORC","SBMP","SBS4",
+    "SBMB","SBS3","SBMG","SBS1","SBS2","SBFX","RADE","WATR","KORX","ABAT",
+    NULL
+};
+
+
+state_t states[NUMSTATES] = {
+    {SPR_MAN1, 0, -1, NULL, S_NULL, 0, 0},      // S_NULL
+    {SPR_ACLO, 4, 1050, A_FreeTargMobj, S_NULL, 0, 0},  // S_FREETARGMOBJ
+    {SPR_TLGL, 0, -1, NULL, S_NULL, 0, 0},      // S_MAPSPOT
+    {SPR_FBL1, 32768, 4, NULL, S_FIREBALL1_2, 0, 0},    // S_FIREBALL1_1
+    {SPR_FBL1, 32769, 4, NULL, S_FIREBALL1_1, 0, 0},    // S_FIREBALL1_2
+    {SPR_XPL1, 32768, 4, NULL, S_FIREBALL1_X2, 0, 0},   // S_FIREBALL1_X1
+    {SPR_XPL1, 32769, 4, NULL, S_FIREBALL1_X3, 0, 0},   // S_FIREBALL1_X2
+    {SPR_XPL1, 32770, 4, NULL, S_FIREBALL1_X4, 0, 0},   // S_FIREBALL1_X3
+    {SPR_XPL1, 32771, 4, NULL, S_FIREBALL1_X5, 0, 0},   // S_FIREBALL1_X4
+    {SPR_XPL1, 32772, 4, NULL, S_FIREBALL1_X6, 0, 0},   // S_FIREBALL1_X5
+    {SPR_XPL1, 32773, 4, NULL, S_NULL, 0, 0},   // S_FIREBALL1_X6
+    {SPR_ARRW, 0, -1, NULL, S_NULL, 0, 0},      // S_ARROW_1
+    {SPR_ARRW, 0, 1, NULL, S_NULL, 0, 0},       // S_ARROW_X1
+    {SPR_DART, 0, -1, NULL, S_NULL, 0, 0},      // S_DART_1
+    {SPR_DART, 0, 1, NULL, S_NULL, 0, 0},       // S_DART_X1
+    {SPR_DART, 0, -1, NULL, S_NULL, 0, 0},      // S_POISONDART_1
+    {SPR_DART, 0, 1, NULL, S_NULL, 0, 0},       // S_POISONDART_X1
+    {SPR_RIPP, 0, 3, NULL, S_RIPPERBALL_2, 0, 0},       // S_RIPPERBALL_1
+    {SPR_RIPP, 1, 3, NULL, S_RIPPERBALL_3, 0, 0},       // S_RIPPERBALL_2
+    {SPR_RIPP, 2, 3, NULL, S_RIPPERBALL_1, 0, 0},       // S_RIPPERBALL_3
+    {SPR_CFCF, 32784, 4, NULL, S_RIPPERBALL_X2, 0, 0},  // S_RIPPERBALL_X1
+    {SPR_CFCF, 32785, 3, NULL, S_RIPPERBALL_X3, 0, 0},  // S_RIPPERBALL_X2
+    {SPR_CFCF, 32786, 4, NULL, S_RIPPERBALL_X4, 0, 0},  // S_RIPPERBALL_X3
+    {SPR_CFCF, 32787, 3, NULL, S_RIPPERBALL_X5, 0, 0},  // S_RIPPERBALL_X4
+    {SPR_CFCF, 32788, 4, NULL, S_RIPPERBALL_X6, 0, 0},  // S_RIPPERBALL_X5
+    {SPR_CFCF, 32789, 3, NULL, S_RIPPERBALL_X7, 0, 0},  // S_RIPPERBALL_X6
+    {SPR_CFCF, 32790, 4, NULL, S_RIPPERBALL_X8, 0, 0},  // S_RIPPERBALL_X7
+    {SPR_CFCF, 32791, 3, NULL, S_RIPPERBALL_X9, 0, 0},  // S_RIPPERBALL_X8
+    {SPR_CFCF, 32792, 4, NULL, S_RIPPERBALL_X10, 0, 0}, // S_RIPPERBALL_X9
+    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_RIPPERBALL_X10
+    {SPR_BLAD, 0, -1, NULL, S_NULL, 0, 0},      // S_PRJ_BLADE1
+    {SPR_BLAD, 0, 1, NULL, S_NULL, 0, 0},       // S_PRJ_BLADE_X1
+    {SPR_SHRD, 32768, 3, NULL, S_ICESHARD2, 0, 0},      // S_ICESHARD1
+    {SPR_SHRD, 32769, 3, NULL, S_ICESHARD3, 0, 0},      // S_ICESHARD2
+    {SPR_SHRD, 32770, 3, NULL, S_ICESHARD1, 0, 0},      // S_ICESHARD3
+    {SPR_FFSM, 32768, 3, NULL, S_FLAME_TSMALL2, 0, 0},  // S_FLAME_TSMALL1
+    {SPR_FFSM, 32769, 3, NULL, S_FLAME_TSMALL3, 0, 0},  // S_FLAME_TSMALL2
+    {SPR_FFSM, 32770, 2, A_FlameCheck, S_FLAME_TSMALL4, 0, 0},  // S_FLAME_TSMALL3
+    {SPR_FFSM, 32770, 2, NULL, S_FLAME_TSMALL5, 0, 0},  // S_FLAME_TSMALL4
+    {SPR_FFSM, 32771, 3, NULL, S_FLAME_TSMALL6, 0, 0},  // S_FLAME_TSMALL5
+    {SPR_FFSM, 32772, 3, A_FlameCheck, S_FLAME_TSMALL1, 0, 0},  // S_FLAME_TSMALL6
+    {SPR_FFLG, 32768, 4, NULL, S_FLAME_TLARGE2, 0, 0},  // S_FLAME_TLARGE1
+    {SPR_FFLG, 32769, 4, A_FlameCheck, S_FLAME_TLARGE3, 0, 0},  // S_FLAME_TLARGE2
+    {SPR_FFLG, 32770, 4, NULL, S_FLAME_TLARGE4, 0, 0},  // S_FLAME_TLARGE3
+    {SPR_FFLG, 32771, 4, A_FlameCheck, S_FLAME_TLARGE5, 0, 0},  // S_FLAME_TLARGE4
+    {SPR_FFLG, 32772, 4, NULL, S_FLAME_TLARGE6, 0, 0},  // S_FLAME_TLARGE5
+    {SPR_FFLG, 32773, 4, A_FlameCheck, S_FLAME_TLARGE7, 0, 0},  // S_FLAME_TLARGE6
+    {SPR_FFLG, 32774, 4, NULL, S_FLAME_TLARGE8, 0, 0},  // S_FLAME_TLARGE7
+    {SPR_FFLG, 32775, 4, A_FlameCheck, S_FLAME_TLARGE9, 0, 0},  // S_FLAME_TLARGE8
+    {SPR_FFLG, 32776, 4, NULL, S_FLAME_TLARGE10, 0, 0}, // S_FLAME_TLARGE9
+    {SPR_FFLG, 32777, 4, A_FlameCheck, S_FLAME_TLARGE11, 0, 0}, // S_FLAME_TLARGE10
+    {SPR_FFLG, 32778, 4, NULL, S_FLAME_TLARGE12, 0, 0}, // S_FLAME_TLARGE11
+    {SPR_FFLG, 32779, 4, A_FlameCheck, S_FLAME_TLARGE13, 0, 0}, // S_FLAME_TLARGE12
+    {SPR_FFLG, 32780, 4, NULL, S_FLAME_TLARGE14, 0, 0}, // S_FLAME_TLARGE13
+    {SPR_FFLG, 32781, 4, A_FlameCheck, S_FLAME_TLARGE15, 0, 0}, // S_FLAME_TLARGE14
+    {SPR_FFLG, 32782, 4, NULL, S_FLAME_TLARGE16, 0, 0}, // S_FLAME_TLARGE15
+    {SPR_FFLG, 32783, 4, A_FlameCheck, S_FLAME_TLARGE5, 0, 0},  // S_FLAME_TLARGE16
+    {SPR_FFSM, 0, 2, NULL, S_FLAME_SDORM2, 0, 0},       // S_FLAME_SDORM1
+    {SPR_FFSM, 1, 2, A_HideThing, S_FLAME_SDORM3, 0, 0},        // S_FLAME_SDORM2
+    {SPR_FFSM, 2, 200, NULL, S_FLAME_SDORM3, 0, 0},     // S_FLAME_SDORM3
+    {SPR_FFSM, 32768, 3, NULL, S_FLAME_SMALL2, 0, 0},   // S_FLAME_SMALL1
+    {SPR_FFSM, 32768, 3, A_UnHideThing, S_FLAME_SMALL3, 0, 0},  // S_FLAME_SMALL2
+    {SPR_FFSM, 32768, 3, NULL, S_FLAME_SMALL4, 0, 0},   // S_FLAME_SMALL3
+    {SPR_FFSM, 32769, 3, NULL, S_FLAME_SMALL5, 0, 0},   // S_FLAME_SMALL4
+    {SPR_FFSM, 32770, 3, NULL, S_FLAME_SMALL6, 0, 0},   // S_FLAME_SMALL5
+    {SPR_FFSM, 32771, 3, NULL, S_FLAME_SMALL7, 0, 0},   // S_FLAME_SMALL6
+    {SPR_FFSM, 32772, 3, NULL, S_FLAME_SMALL3, 0, 0},   // S_FLAME_SMALL7
+    {SPR_FFLG, 3, 2, NULL, S_FLAME_LDORM2, 0, 0},       // S_FLAME_LDORM1
+    {SPR_FFLG, 2, 2, NULL, S_FLAME_LDORM3, 0, 0},       // S_FLAME_LDORM2
+    {SPR_FFLG, 1, 2, NULL, S_FLAME_LDORM4, 0, 0},       // S_FLAME_LDORM3
+    {SPR_FFLG, 0, 2, A_HideThing, S_FLAME_LDORM5, 0, 0},        // S_FLAME_LDORM4
+    {SPR_FFLG, 0, 200, NULL, S_FLAME_LDORM5, 0, 0},     // S_FLAME_LDORM5
+    {SPR_FFLG, 32768, 2, NULL, S_FLAME_LARGE2, 0, 0},   // S_FLAME_LARGE1
+    {SPR_FFLG, 32768, 2, A_UnHideThing, S_FLAME_LARGE3, 0, 0},  // S_FLAME_LARGE2
+    {SPR_FFLG, 32768, 4, NULL, S_FLAME_LARGE4, 0, 0},   // S_FLAME_LARGE3
+    {SPR_FFLG, 32769, 4, NULL, S_FLAME_LARGE5, 0, 0},   // S_FLAME_LARGE4
+    {SPR_FFLG, 32770, 4, NULL, S_FLAME_LARGE6, 0, 0},   // S_FLAME_LARGE5
+    {SPR_FFLG, 32771, 4, NULL, S_FLAME_LARGE7, 0, 0},   // S_FLAME_LARGE6
+    {SPR_FFLG, 32772, 4, NULL, S_FLAME_LARGE8, 0, 0},   // S_FLAME_LARGE7
+    {SPR_FFLG, 32773, 4, NULL, S_FLAME_LARGE9, 0, 0},   // S_FLAME_LARGE8
+    {SPR_FFLG, 32774, 4, NULL, S_FLAME_LARGE10, 0, 0},  // S_FLAME_LARGE9
+    {SPR_FFLG, 32775, 4, NULL, S_FLAME_LARGE11, 0, 0},  // S_FLAME_LARGE10
+    {SPR_FFLG, 32776, 4, NULL, S_FLAME_LARGE12, 0, 0},  // S_FLAME_LARGE11
+    {SPR_FFLG, 32777, 4, NULL, S_FLAME_LARGE13, 0, 0},  // S_FLAME_LARGE12
+    {SPR_FFLG, 32778, 4, NULL, S_FLAME_LARGE14, 0, 0},  // S_FLAME_LARGE13
+    {SPR_FFLG, 32779, 4, NULL, S_FLAME_LARGE15, 0, 0},  // S_FLAME_LARGE14
+    {SPR_FFLG, 32780, 4, NULL, S_FLAME_LARGE16, 0, 0},  // S_FLAME_LARGE15
+    {SPR_FFLG, 32781, 4, NULL, S_FLAME_LARGE17, 0, 0},  // S_FLAME_LARGE16
+    {SPR_FFLG, 32782, 4, NULL, S_FLAME_LARGE18, 0, 0},  // S_FLAME_LARGE17
+    {SPR_FFLG, 32783, 4, NULL, S_FLAME_LARGE7, 0, 0},   // S_FLAME_LARGE18
+    {SPR_PTN1, 0, 3, NULL, S_ITEM_PTN1_2, 0, 0},        // S_ITEM_PTN1_1
+    {SPR_PTN1, 1, 3, NULL, S_ITEM_PTN1_3, 0, 0},        // S_ITEM_PTN1_2
+    {SPR_PTN1, 2, 3, NULL, S_ITEM_PTN1_1, 0, 0},        // S_ITEM_PTN1_3
+    {SPR_ACLO, 4, 1400, NULL, S_HIDESPECIAL2, 0, 0},    // S_HIDESPECIAL1
+    {SPR_ACLO, 0, 4, A_RestoreSpecialThing1, S_HIDESPECIAL3, 0, 0},     // S_HIDESPECIAL2
+    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL4, 0, 0},       // S_HIDESPECIAL3
+    {SPR_ACLO, 0, 4, NULL, S_HIDESPECIAL5, 0, 0},       // S_HIDESPECIAL4
+    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL6, 0, 0},       // S_HIDESPECIAL5
+    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL7, 0, 0},       // S_HIDESPECIAL6
+    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL8, 0, 0},       // S_HIDESPECIAL7
+    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL9, 0, 0},       // S_HIDESPECIAL8
+    {SPR_ACLO, 3, 4, NULL, S_HIDESPECIAL10, 0, 0},      // S_HIDESPECIAL9
+    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL11, 0, 0},      // S_HIDESPECIAL10
+    {SPR_ACLO, 3, 4, A_RestoreSpecialThing2, S_NULL, 0, 0},     // S_HIDESPECIAL11
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI1_2, 0, 0},     // S_DORMANTARTI1_1
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_3, 0, 0},     // S_DORMANTARTI1_2
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI1_4, 0, 0},     // S_DORMANTARTI1_3
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_5, 0, 0},     // S_DORMANTARTI1_4
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_6, 0, 0},     // S_DORMANTARTI1_5
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_7, 0, 0},     // S_DORMANTARTI1_6
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_8, 0, 0},     // S_DORMANTARTI1_7
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI1_9, 0, 0},     // S_DORMANTARTI1_8
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_10, 0, 0},    // S_DORMANTARTI1_9
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI1_11, 0, 0},    // S_DORMANTARTI1_10
+    {SPR_ACLO, 0, 1400, A_HideThing, S_DORMANTARTI1_12, 0, 0},  // S_DORMANTARTI1_11
+    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI1_13, 0, 0},   // S_DORMANTARTI1_12
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_14, 0, 0},    // S_DORMANTARTI1_13
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI1_15, 0, 0},    // S_DORMANTARTI1_14
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_16, 0, 0},    // S_DORMANTARTI1_15
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_17, 0, 0},    // S_DORMANTARTI1_16
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_18, 0, 0},    // S_DORMANTARTI1_17
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_19, 0, 0},    // S_DORMANTARTI1_18
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI1_20, 0, 0},    // S_DORMANTARTI1_19
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_21, 0, 0},    // S_DORMANTARTI1_20
+    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI1_21
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2_2, 0, 0},     // S_DORMANTARTI2_1
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_3, 0, 0},     // S_DORMANTARTI2_2
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2_4, 0, 0},     // S_DORMANTARTI2_3
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_5, 0, 0},     // S_DORMANTARTI2_4
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_6, 0, 0},     // S_DORMANTARTI2_5
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_7, 0, 0},     // S_DORMANTARTI2_6
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_8, 0, 0},     // S_DORMANTARTI2_7
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI2_9, 0, 0},     // S_DORMANTARTI2_8
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_10, 0, 0},    // S_DORMANTARTI2_9
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI2_11, 0, 0},    // S_DORMANTARTI2_10
+    {SPR_ACLO, 0, 4200, A_HideThing, S_DORMANTARTI2_12, 0, 0},  // S_DORMANTARTI2_11
+    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI2_13, 0, 0},   // S_DORMANTARTI2_12
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_14, 0, 0},    // S_DORMANTARTI2_13
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI2_15, 0, 0},    // S_DORMANTARTI2_14
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_16, 0, 0},    // S_DORMANTARTI2_15
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_17, 0, 0},    // S_DORMANTARTI2_16
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_18, 0, 0},    // S_DORMANTARTI2_17
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_19, 0, 0},    // S_DORMANTARTI2_18
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2_20, 0, 0},    // S_DORMANTARTI2_19
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_21, 0, 0},    // S_DORMANTARTI2_20
+    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI2_21
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI3_2, 0, 0},     // S_DORMANTARTI3_1
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_3, 0, 0},     // S_DORMANTARTI3_2
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI3_4, 0, 0},     // S_DORMANTARTI3_3
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_5, 0, 0},     // S_DORMANTARTI3_4
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_6, 0, 0},     // S_DORMANTARTI3_5
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_7, 0, 0},     // S_DORMANTARTI3_6
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_8, 0, 0},     // S_DORMANTARTI3_7
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI3_9, 0, 0},     // S_DORMANTARTI3_8
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_10, 0, 0},    // S_DORMANTARTI3_9
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI3_11, 0, 0},    // S_DORMANTARTI3_10
+    {SPR_ACLO, 0, 21000, A_HideThing, S_DORMANTARTI3_12, 0, 0}, // S_DORMANTARTI3_11
+    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI3_13, 0, 0},   // S_DORMANTARTI3_12
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_14, 0, 0},    // S_DORMANTARTI3_13
+    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI3_15, 0, 0},    // S_DORMANTARTI3_14
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_16, 0, 0},    // S_DORMANTARTI3_15
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_17, 0, 0},    // S_DORMANTARTI3_16
+    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_18, 0, 0},    // S_DORMANTARTI3_17
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_19, 0, 0},    // S_DORMANTARTI3_18
+    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI3_20, 0, 0},    // S_DORMANTARTI3_19
+    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_21, 0, 0},    // S_DORMANTARTI3_20
+    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI3_21
+    {SPR_ACLO, 3, 3, NULL, S_DEADARTI2, 0, 0},  // S_DEADARTI1
+    {SPR_ACLO, 2, 3, NULL, S_DEADARTI3, 0, 0},  // S_DEADARTI2
+    {SPR_ACLO, 3, 3, NULL, S_DEADARTI4, 0, 0},  // S_DEADARTI3
+    {SPR_ACLO, 2, 3, NULL, S_DEADARTI5, 0, 0},  // S_DEADARTI4
+    {SPR_ACLO, 1, 3, NULL, S_DEADARTI6, 0, 0},  // S_DEADARTI5
+    {SPR_ACLO, 2, 3, NULL, S_DEADARTI7, 0, 0},  // S_DEADARTI6
+    {SPR_ACLO, 1, 3, NULL, S_DEADARTI8, 0, 0},  // S_DEADARTI7
+    {SPR_ACLO, 0, 3, NULL, S_DEADARTI9, 0, 0},  // S_DEADARTI8
+    {SPR_ACLO, 1, 3, NULL, S_DEADARTI10, 0, 0}, // S_DEADARTI9
+    {SPR_ACLO, 0, 3, NULL, S_NULL, 0, 0},       // S_DEADARTI10
+    {SPR_PTN2, 0, 4, NULL, S_ARTI_PTN2_2, 0, 0},        // S_ARTI_PTN2_1
+    {SPR_PTN2, 1, 4, NULL, S_ARTI_PTN2_3, 0, 0},        // S_ARTI_PTN2_2
+    {SPR_PTN2, 2, 4, NULL, S_ARTI_PTN2_1, 0, 0},        // S_ARTI_PTN2_3
+    {SPR_SOAR, 0, 5, NULL, S_ARTI_SOAR2, 0, 0}, // S_ARTI_SOAR1
+    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR3, 0, 0}, // S_ARTI_SOAR2
+    {SPR_SOAR, 2, 5, NULL, S_ARTI_SOAR4, 0, 0}, // S_ARTI_SOAR3
+    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR1, 0, 0}, // S_ARTI_SOAR4
+    {SPR_INVU, 0, 3, NULL, S_ARTI_INVU2, 0, 0}, // S_ARTI_INVU1
+    {SPR_INVU, 1, 3, NULL, S_ARTI_INVU3, 0, 0}, // S_ARTI_INVU2
+    {SPR_INVU, 2, 3, NULL, S_ARTI_INVU4, 0, 0}, // S_ARTI_INVU3
+    {SPR_INVU, 3, 3, NULL, S_ARTI_INVU1, 0, 0}, // S_ARTI_INVU4
+    {SPR_SUMN, 0, 350, NULL, S_ARTI_SUMMON, 0, 0},      // S_ARTI_SUMMON
+    {SPR_SUMN, 0, 4, NULL, S_SUMMON_FX1_1, 0, 0},       // S_SUMMON_FX1_1
+    {SPR_SUMN, 0, 4, NULL, S_SUMMON_FX2_2, 0, 0},       // S_SUMMON_FX2_1
+    {SPR_SUMN, 0, 4, NULL, S_SUMMON_FX2_3, 0, 0},       // S_SUMMON_FX2_2
+    {SPR_SUMN, 0, 4, A_Summon, S_NULL, 0, 0},   // S_SUMMON_FX2_3
+    {SPR_TSPK, 0, 3, NULL, S_THRUSTINIT2_2, 0, 0},      // S_THRUSTINIT2_1
+    {SPR_TSPK, 0, 4, A_ThrustInitUp, S_THRUSTBLOCK, 0, 0},      // S_THRUSTINIT2_2
+    {SPR_TSPK, 1, 3, NULL, S_BTHRUSTINIT2_2, 0, 0},     // S_BTHRUSTINIT2_1
+    {SPR_TSPK, 1, 4, A_ThrustInitUp, S_BTHRUSTBLOCK, 0, 0},     // S_BTHRUSTINIT2_2
+    {SPR_TSPK, 0, 3, NULL, S_THRUSTINIT1_2, 0, 0},      // S_THRUSTINIT1_1
+    {SPR_TSPK, 0, 4, A_ThrustInitDn, S_THRUSTSTAY, 0, 0},       // S_THRUSTINIT1_2
+    {SPR_TSPK, 1, 3, NULL, S_BTHRUSTINIT1_2, 0, 0},     // S_BTHRUSTINIT1_1
+    {SPR_TSPK, 1, 4, A_ThrustInitDn, S_BTHRUSTSTAY, 0, 0},      // S_BTHRUSTINIT1_2
+    {SPR_TSPK, 0, 8, A_ThrustRaise, S_THRUSTRAISE2, 0, 0},      // S_THRUSTRAISE1
+    {SPR_TSPK, 0, 6, A_ThrustRaise, S_THRUSTRAISE3, 0, 0},      // S_THRUSTRAISE2
+    {SPR_TSPK, 0, 4, A_ThrustRaise, S_THRUSTRAISE4, 0, 0},      // S_THRUSTRAISE3
+    {SPR_TSPK, 0, 3, A_ThrustBlock, S_THRUSTIMPALE, 0, 0},      // S_THRUSTRAISE4
+    {SPR_TSPK, 1, 8, A_ThrustRaise, S_BTHRUSTRAISE2, 0, 0},     // S_BTHRUSTRAISE1
+    {SPR_TSPK, 1, 6, A_ThrustRaise, S_BTHRUSTRAISE3, 0, 0},     // S_BTHRUSTRAISE2
+    {SPR_TSPK, 1, 4, A_ThrustRaise, S_BTHRUSTRAISE4, 0, 0},     // S_BTHRUSTRAISE3
+    {SPR_TSPK, 1, 3, A_ThrustBlock, S_BTHRUSTIMPALE, 0, 0},     // S_BTHRUSTRAISE4
+    {SPR_TSPK, 0, 2, A_ThrustImpale, S_THRUSTRAISE, 0, 0},      // S_THRUSTIMPALE
+    {SPR_TSPK, 1, 2, A_ThrustImpale, S_BTHRUSTRAISE, 0, 0},     // S_BTHRUSTIMPALE
+    {SPR_TSPK, 0, 2, A_ThrustRaise, S_THRUSTRAISE, 0, 0},       // S_THRUSTRAISE
+    {SPR_TSPK, 1, 2, A_ThrustRaise, S_BTHRUSTRAISE, 0, 0},      // S_BTHRUSTRAISE
+    {SPR_TSPK, 0, 10, NULL, S_THRUSTBLOCK, 0, 0},       // S_THRUSTBLOCK
+    {SPR_TSPK, 1, 10, NULL, S_BTHRUSTBLOCK, 0, 0},      // S_BTHRUSTBLOCK
+    {SPR_TSPK, 0, 2, A_ThrustLower, S_THRUSTLOWER, 0, 0},       // S_THRUSTLOWER
+    {SPR_TSPK, 1, 2, A_ThrustLower, S_BTHRUSTLOWER, 0, 0},      // S_BTHRUSTLOWER
+    {SPR_TSPK, 0, -1, NULL, S_THRUSTSTAY, 0, 0},        // S_THRUSTSTAY
+    {SPR_TSPK, 1, -1, NULL, S_BTHRUSTSTAY, 0, 0},       // S_BTHRUSTSTAY
+    {SPR_TELO, 0, 5, NULL, S_ARTI_TELOTHER2, 0, 0},     // S_ARTI_TELOTHER1
+    {SPR_TELO, 1, 5, NULL, S_ARTI_TELOTHER3, 0, 0},     // S_ARTI_TELOTHER2
+    {SPR_TELO, 2, 5, NULL, S_ARTI_TELOTHER4, 0, 0},     // S_ARTI_TELOTHER3
+    {SPR_TELO, 3, 5, NULL, S_ARTI_TELOTHER1, 0, 0},     // S_ARTI_TELOTHER4
+    {SPR_TRNG, 32772, 5, NULL, S_TELO_FX2, 0, 0},       // S_TELO_FX1
+    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX3, 0, 0},       // S_TELO_FX2
+    {SPR_TRNG, 32770, 3, A_TeloSpawnC, S_TELO_FX4, 0, 0},       // S_TELO_FX3
+    {SPR_TRNG, 32769, 3, A_TeloSpawnB, S_TELO_FX5, 0, 0},       // S_TELO_FX4
+    {SPR_TRNG, 32768, 3, A_TeloSpawnA, S_TELO_FX6, 0, 0},       // S_TELO_FX5
+    {SPR_TRNG, 32769, 3, A_TeloSpawnB, S_TELO_FX7, 0, 0},       // S_TELO_FX6
+    {SPR_TRNG, 32770, 3, A_TeloSpawnC, S_TELO_FX8, 0, 0},       // S_TELO_FX7
+    {SPR_TRNG, 32771, 3, A_TeloSpawnD, S_TELO_FX3, 0, 0},       // S_TELO_FX8
+    {SPR_TRNG, 32772, 3, NULL, S_NULL, 0, 0},   // S_TELO_FX9
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX2_2, 0, 0},     // S_TELO_FX2_1
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX2_3, 0, 0},     // S_TELO_FX2_2
+    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX2_4, 0, 0},     // S_TELO_FX2_3
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX2_5, 0, 0},     // S_TELO_FX2_4
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX2_6, 0, 0},     // S_TELO_FX2_5
+    {SPR_TRNG, 32768, 4, A_CheckTeleRing, S_TELO_FX2_1, 0, 0},  // S_TELO_FX2_6
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX3_2, 0, 0},     // S_TELO_FX3_1
+    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX3_3, 0, 0},     // S_TELO_FX3_2
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX3_4, 0, 0},     // S_TELO_FX3_3
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX3_5, 0, 0},     // S_TELO_FX3_4
+    {SPR_TRNG, 32768, 4, NULL, S_TELO_FX3_6, 0, 0},     // S_TELO_FX3_5
+    {SPR_TRNG, 32769, 4, A_CheckTeleRing, S_TELO_FX3_1, 0, 0},  // S_TELO_FX3_6
+    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX4_2, 0, 0},     // S_TELO_FX4_1
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX4_3, 0, 0},     // S_TELO_FX4_2
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX4_4, 0, 0},     // S_TELO_FX4_3
+    {SPR_TRNG, 32768, 4, NULL, S_TELO_FX4_5, 0, 0},     // S_TELO_FX4_4
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX4_6, 0, 0},     // S_TELO_FX4_5
+    {SPR_TRNG, 32770, 4, A_CheckTeleRing, S_TELO_FX4_1, 0, 0},  // S_TELO_FX4_6
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX5_2, 0, 0},     // S_TELO_FX5_1
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX5_3, 0, 0},     // S_TELO_FX5_2
+    {SPR_TRNG, 32768, 4, NULL, S_TELO_FX5_4, 0, 0},     // S_TELO_FX5_3
+    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX5_5, 0, 0},     // S_TELO_FX5_4
+    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX5_6, 0, 0},     // S_TELO_FX5_5
+    {SPR_TRNG, 32771, 4, A_CheckTeleRing, S_TELO_FX5_1, 0, 0},  // S_TELO_FX5_6
+    {SPR_ROCK, 3, 20, NULL, S_DIRT1_1, 0, 0},   // S_DIRT1_1
+    {SPR_ROCK, 3, 10, NULL, S_NULL, 0, 0},      // S_DIRT1_D
+    {SPR_ROCK, 4, 20, NULL, S_DIRT2_1, 0, 0},   // S_DIRT2_1
+    {SPR_ROCK, 4, 10, NULL, S_NULL, 0, 0},      // S_DIRT2_D
+    {SPR_ROCK, 5, 20, NULL, S_DIRT3_1, 0, 0},   // S_DIRT3_1
+    {SPR_ROCK, 5, 10, NULL, S_NULL, 0, 0},      // S_DIRT3_D
+    {SPR_ROCK, 6, 20, NULL, S_DIRT4_1, 0, 0},   // S_DIRT4_1
+    {SPR_ROCK, 6, 10, NULL, S_NULL, 0, 0},      // S_DIRT4_D
+    {SPR_ROCK, 7, 20, NULL, S_DIRT5_1, 0, 0},   // S_DIRT5_1
+    {SPR_ROCK, 7, 10, NULL, S_NULL, 0, 0},      // S_DIRT5_D
+    {SPR_ROCK, 8, 20, NULL, S_DIRT6_1, 0, 0},   // S_DIRT6_1
+    {SPR_ROCK, 8, 10, NULL, S_NULL, 0, 0},      // S_DIRT6_D
+    {SPR_TSPK, 2, 20, NULL, S_DIRTCLUMP1, 0, 0},        // S_DIRTCLUMP1
+    {SPR_ROCK, 0, 20, NULL, S_ROCK1_1, 0, 0},   // S_ROCK1_1
+    {SPR_ROCK, 0, 10, NULL, S_NULL, 0, 0},      // S_ROCK1_D
+    {SPR_ROCK, 1, 20, NULL, S_ROCK2_1, 0, 0},   // S_ROCK2_1
+    {SPR_ROCK, 1, 10, NULL, S_NULL, 0, 0},      // S_ROCK2_D
+    {SPR_ROCK, 2, 20, NULL, S_ROCK3_1, 0, 0},   // S_ROCK3_1
+    {SPR_ROCK, 2, 10, NULL, S_NULL, 0, 0},      // S_ROCK3_D
+    {SPR_MAN1, 0, 20, A_FogSpawn, S_SPAWNFOG1, 0, 0},   // S_SPAWNFOG1
+    {SPR_FOGS, 0, 7, A_FogMove, S_FOGPATCHS2, 0, 0},    // S_FOGPATCHS1
+    {SPR_FOGS, 1, 7, A_FogMove, S_FOGPATCHS3, 0, 0},    // S_FOGPATCHS2
+    {SPR_FOGS, 2, 7, A_FogMove, S_FOGPATCHS4, 0, 0},    // S_FOGPATCHS3
+    {SPR_FOGS, 3, 7, A_FogMove, S_FOGPATCHS5, 0, 0},    // S_FOGPATCHS4
+    {SPR_FOGS, 4, 7, A_FogMove, S_FOGPATCHS1, 0, 0},    // S_FOGPATCHS5
+    {SPR_FOGS, 4, 5, NULL, S_NULL, 0, 0},       // S_FOGPATCHS0
+    {SPR_FOGM, 0, 7, A_FogMove, S_FOGPATCHM2, 0, 0},    // S_FOGPATCHM1
+    {SPR_FOGM, 1, 7, A_FogMove, S_FOGPATCHM3, 0, 0},    // S_FOGPATCHM2
+    {SPR_FOGM, 2, 7, A_FogMove, S_FOGPATCHM4, 0, 0},    // S_FOGPATCHM3
+    {SPR_FOGM, 3, 7, A_FogMove, S_FOGPATCHM5, 0, 0},    // S_FOGPATCHM4
+    {SPR_FOGM, 4, 7, A_FogMove, S_FOGPATCHM1, 0, 0},    // S_FOGPATCHM5
+    {SPR_FOGS, 0, 5, NULL, S_FOGPATCHMA, 0, 0}, // S_FOGPATCHM0
+    {SPR_FOGS, 1, 5, NULL, S_FOGPATCHMB, 0, 0}, // S_FOGPATCHMA
+    {SPR_FOGS, 2, 5, NULL, S_FOGPATCHMC, 0, 0}, // S_FOGPATCHMB
+    {SPR_FOGS, 3, 5, NULL, S_FOGPATCHMD, 0, 0}, // S_FOGPATCHMC
+    {SPR_FOGS, 4, 5, NULL, S_FOGPATCHS0, 0, 0}, // S_FOGPATCHMD
+    {SPR_FOGL, 0, 7, A_FogMove, S_FOGPATCHL2, 0, 0},    // S_FOGPATCHL1
+    {SPR_FOGL, 1, 7, A_FogMove, S_FOGPATCHL3, 0, 0},    // S_FOGPATCHL2
+    {SPR_FOGL, 2, 7, A_FogMove, S_FOGPATCHL4, 0, 0},    // S_FOGPATCHL3
+    {SPR_FOGL, 3, 7, A_FogMove, S_FOGPATCHL5, 0, 0},    // S_FOGPATCHL4
+    {SPR_FOGL, 4, 7, A_FogMove, S_FOGPATCHL1, 0, 0},    // S_FOGPATCHL5
+    {SPR_FOGM, 0, 4, NULL, S_FOGPATCHLA, 0, 0}, // S_FOGPATCHL0
+    {SPR_FOGM, 1, 4, NULL, S_FOGPATCHLB, 0, 0}, // S_FOGPATCHLA
+    {SPR_FOGM, 2, 4, NULL, S_FOGPATCHLC, 0, 0}, // S_FOGPATCHLB
+    {SPR_FOGM, 3, 4, NULL, S_FOGPATCHLD, 0, 0}, // S_FOGPATCHLC
+    {SPR_FOGM, 4, 4, NULL, S_FOGPATCHM0, 0, 0}, // S_FOGPATCHLD
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE2, 0, 0},   // S_QUAKE_ACTIVE1
+    {SPR_MAN1, 0, 1, A_ContMobjSound, S_QUAKE_ACTIVE3, 0, 0},   // S_QUAKE_ACTIVE2
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE4, 0, 0},   // S_QUAKE_ACTIVE3
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE5, 0, 0},   // S_QUAKE_ACTIVE4
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE6, 0, 0},   // S_QUAKE_ACTIVE5
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE7, 0, 0},   // S_QUAKE_ACTIVE6
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE8, 0, 0},   // S_QUAKE_ACTIVE7
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE9, 0, 0},   // S_QUAKE_ACTIVE8
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE0, 0, 0},   // S_QUAKE_ACTIVE9
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEA, 0, 0},   // S_QUAKE_ACTIVE0
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEB, 0, 0},   // S_QUAKE_ACTIVEA
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEC, 0, 0},   // S_QUAKE_ACTIVEB
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVED, 0, 0},   // S_QUAKE_ACTIVEC
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEE, 0, 0},   // S_QUAKE_ACTIVED
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEF, 0, 0},   // S_QUAKE_ACTIVEE
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEG, 0, 0},   // S_QUAKE_ACTIVEF
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEH, 0, 0},   // S_QUAKE_ACTIVEG
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEI, 0, 0},   // S_QUAKE_ACTIVEH
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEJ, 0, 0},   // S_QUAKE_ACTIVEI
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEK, 0, 0},   // S_QUAKE_ACTIVEJ
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEL, 0, 0},   // S_QUAKE_ACTIVEK
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEM, 0, 0},   // S_QUAKE_ACTIVEL
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEN, 0, 0},   // S_QUAKE_ACTIVEM
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEO, 0, 0},   // S_QUAKE_ACTIVEN
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEP, 0, 0},   // S_QUAKE_ACTIVEO
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEQ, 0, 0},   // S_QUAKE_ACTIVEP
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVER, 0, 0},   // S_QUAKE_ACTIVEQ
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVES, 0, 0},   // S_QUAKE_ACTIVER
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVET, 0, 0},   // S_QUAKE_ACTIVES
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEU, 0, 0},   // S_QUAKE_ACTIVET
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEV, 0, 0},   // S_QUAKE_ACTIVEU
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEW, 0, 0},   // S_QUAKE_ACTIVEV
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEX, 0, 0},   // S_QUAKE_ACTIVEW
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEY, 0, 0},   // S_QUAKE_ACTIVEX
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEZ, 0, 0},   // S_QUAKE_ACTIVEY
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT1, 0, 0},      // S_QUAKE_ACTIVEZ
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT2, 0, 0},      // S_QUAKE_ACT1
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT3, 0, 0},      // S_QUAKE_ACT2
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT4, 0, 0},      // S_QUAKE_ACT3
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT5, 0, 0},      // S_QUAKE_ACT4
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT6, 0, 0},      // S_QUAKE_ACT5
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT7, 0, 0},      // S_QUAKE_ACT6
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT8, 0, 0},      // S_QUAKE_ACT7
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT9, 0, 0},      // S_QUAKE_ACT8
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT0, 0, 0},      // S_QUAKE_ACT9
+    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE1, 0, 0},   // S_QUAKE_ACT0
+    {SPR_SGSA, 0, 4, NULL, S_SGSHARD1_2, 0, 0}, // S_SGSHARD1_1
+    {SPR_SGSA, 1, 4, NULL, S_SGSHARD1_3, 0, 0}, // S_SGSHARD1_2
+    {SPR_SGSA, 2, 4, NULL, S_SGSHARD1_4, 0, 0}, // S_SGSHARD1_3
+    {SPR_SGSA, 3, 4, NULL, S_SGSHARD1_5, 0, 0}, // S_SGSHARD1_4
+    {SPR_SGSA, 4, 4, NULL, S_SGSHARD1_1, 0, 0}, // S_SGSHARD1_5
+    {SPR_SGSA, 4, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD1_D
+    {SPR_SGSA, 5, 4, NULL, S_SGSHARD2_2, 0, 0}, // S_SGSHARD2_1
+    {SPR_SGSA, 6, 4, NULL, S_SGSHARD2_3, 0, 0}, // S_SGSHARD2_2
+    {SPR_SGSA, 7, 4, NULL, S_SGSHARD2_4, 0, 0}, // S_SGSHARD2_3
+    {SPR_SGSA, 8, 4, NULL, S_SGSHARD2_5, 0, 0}, // S_SGSHARD2_4
+    {SPR_SGSA, 9, 4, NULL, S_SGSHARD2_1, 0, 0}, // S_SGSHARD2_5
+    {SPR_SGSA, 9, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD2_D
+    {SPR_SGSA, 10, 4, NULL, S_SGSHARD3_2, 0, 0},        // S_SGSHARD3_1
+    {SPR_SGSA, 11, 4, NULL, S_SGSHARD3_3, 0, 0},        // S_SGSHARD3_2
+    {SPR_SGSA, 12, 4, NULL, S_SGSHARD3_4, 0, 0},        // S_SGSHARD3_3
+    {SPR_SGSA, 13, 4, NULL, S_SGSHARD3_5, 0, 0},        // S_SGSHARD3_4
+    {SPR_SGSA, 14, 4, NULL, S_SGSHARD3_1, 0, 0},        // S_SGSHARD3_5
+    {SPR_SGSA, 14, 30, NULL, S_NULL, 0, 0},     // S_SGSHARD3_D
+    {SPR_SGSA, 15, 4, NULL, S_SGSHARD4_2, 0, 0},        // S_SGSHARD4_1
+    {SPR_SGSA, 16, 4, NULL, S_SGSHARD4_3, 0, 0},        // S_SGSHARD4_2
+    {SPR_SGSA, 17, 4, NULL, S_SGSHARD4_4, 0, 0},        // S_SGSHARD4_3
+    {SPR_SGSA, 18, 4, NULL, S_SGSHARD4_5, 0, 0},        // S_SGSHARD4_4
+    {SPR_SGSA, 19, 4, NULL, S_SGSHARD4_1, 0, 0},        // S_SGSHARD4_5
+    {SPR_SGSA, 19, 30, NULL, S_NULL, 0, 0},     // S_SGSHARD4_D
+    {SPR_SGSA, 20, 4, NULL, S_SGSHARD5_2, 0, 0},        // S_SGSHARD5_1
+    {SPR_SGSA, 21, 4, NULL, S_SGSHARD5_3, 0, 0},        // S_SGSHARD5_2
+    {SPR_SGSA, 22, 4, NULL, S_SGSHARD5_4, 0, 0},        // S_SGSHARD5_3
+    {SPR_SGSA, 23, 4, NULL, S_SGSHARD5_5, 0, 0},        // S_SGSHARD5_4
+    {SPR_SGSA, 24, 4, NULL, S_SGSHARD5_1, 0, 0},        // S_SGSHARD5_5
+    {SPR_SGSA, 24, 30, NULL, S_NULL, 0, 0},     // S_SGSHARD5_D
+    {SPR_SGSB, 0, 4, NULL, S_SGSHARD6_1, 0, 0}, // S_SGSHARD6_1
+    {SPR_SGSB, 0, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD6_D
+    {SPR_SGSB, 1, 4, NULL, S_SGSHARD7_1, 0, 0}, // S_SGSHARD7_1
+    {SPR_SGSB, 1, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD7_D
+    {SPR_SGSB, 2, 4, NULL, S_SGSHARD8_1, 0, 0}, // S_SGSHARD8_1
+    {SPR_SGSB, 2, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD8_D
+    {SPR_SGSB, 3, 4, NULL, S_SGSHARD9_1, 0, 0}, // S_SGSHARD9_1
+    {SPR_SGSB, 3, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD9_D
+    {SPR_SGSB, 4, 4, NULL, S_SGSHARD0_1, 0, 0}, // S_SGSHARD0_1
+    {SPR_SGSB, 4, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD0_D
+    {SPR_PORK, 0, 5, NULL, S_ARTI_EGGC2, 0, 0}, // S_ARTI_EGGC1
+    {SPR_PORK, 1, 5, NULL, S_ARTI_EGGC3, 0, 0}, // S_ARTI_EGGC2
+    {SPR_PORK, 2, 5, NULL, S_ARTI_EGGC4, 0, 0}, // S_ARTI_EGGC3
+    {SPR_PORK, 3, 5, NULL, S_ARTI_EGGC5, 0, 0}, // S_ARTI_EGGC4
+    {SPR_PORK, 4, 5, NULL, S_ARTI_EGGC6, 0, 0}, // S_ARTI_EGGC5
+    {SPR_PORK, 5, 5, NULL, S_ARTI_EGGC7, 0, 0}, // S_ARTI_EGGC6
+    {SPR_PORK, 6, 5, NULL, S_ARTI_EGGC8, 0, 0}, // S_ARTI_EGGC7
+    {SPR_PORK, 7, 5, NULL, S_ARTI_EGGC1, 0, 0}, // S_ARTI_EGGC8
+    {SPR_EGGM, 0, 4, NULL, S_EGGFX2, 0, 0},     // S_EGGFX1
+    {SPR_EGGM, 1, 4, NULL, S_EGGFX3, 0, 0},     // S_EGGFX2
+    {SPR_EGGM, 2, 4, NULL, S_EGGFX4, 0, 0},     // S_EGGFX3
+    {SPR_EGGM, 3, 4, NULL, S_EGGFX5, 0, 0},     // S_EGGFX4
+    {SPR_EGGM, 4, 4, NULL, S_EGGFX1, 0, 0},     // S_EGGFX5
+    {SPR_FHFX, 32776, 3, NULL, S_EGGFXI1_2, 0, 0},      // S_EGGFXI1_1
+    {SPR_FHFX, 32777, 3, NULL, S_EGGFXI1_3, 0, 0},      // S_EGGFXI1_2
+    {SPR_FHFX, 32778, 3, NULL, S_EGGFXI1_4, 0, 0},      // S_EGGFXI1_3
+    {SPR_FHFX, 32779, 3, NULL, S_NULL, 0, 0},   // S_EGGFXI1_4
+    {SPR_SPHL, 0, 350, NULL, S_ARTI_SPHL1, 0, 0},       // S_ARTI_SPHL1
+    {SPR_STWN, 0, -1, NULL, S_NULL, 0, 0},      // S_ZWINGEDSTATUENOSKULL
+    {SPR_STWN, 1, -1, NULL, S_NULL, 0, 0},      // S_ZWINGEDSTATUENOSKULL2
+    {SPR_GMPD, 0, -1, NULL, S_NULL, 0, 0},      // S_ZGEMPEDESTAL1
+    {SPR_GMPD, 1, -1, NULL, S_NULL, 0, 0},      // S_ZGEMPEDESTAL2
+    {SPR_ASKU, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZSKULL
+    {SPR_ABGM, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMBIG
+    {SPR_AGMR, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMRED
+    {SPR_AGMG, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMGREEN1
+    {SPR_AGG2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMGREEN2
+    {SPR_AGMB, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMBLUE1
+    {SPR_AGB2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMBLUE2
+    {SPR_ABK1, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZBOOK1
+    {SPR_ABK2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZBOOK2
+    {SPR_ASK2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZSKULL2
+    {SPR_AFWP, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZFWEAPON
+    {SPR_ACWP, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZCWEAPON
+    {SPR_AMWP, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZMWEAPON
+    {SPR_AGER, 32768, 4, NULL, S_ARTIPUZZGEAR_2, 0, 0}, // S_ARTIPUZZGEAR_1
+    {SPR_AGER, 32769, 4, NULL, S_ARTIPUZZGEAR_3, 0, 0}, // S_ARTIPUZZGEAR_2
+    {SPR_AGER, 32770, 4, NULL, S_ARTIPUZZGEAR_4, 0, 0}, // S_ARTIPUZZGEAR_3
+    {SPR_AGER, 32771, 4, NULL, S_ARTIPUZZGEAR_5, 0, 0}, // S_ARTIPUZZGEAR_4
+    {SPR_AGER, 32772, 4, NULL, S_ARTIPUZZGEAR_6, 0, 0}, // S_ARTIPUZZGEAR_5
+    {SPR_AGER, 32773, 4, NULL, S_ARTIPUZZGEAR_7, 0, 0}, // S_ARTIPUZZGEAR_6
+    {SPR_AGER, 32774, 4, NULL, S_ARTIPUZZGEAR_8, 0, 0}, // S_ARTIPUZZGEAR_7
+    {SPR_AGER, 32775, 4, NULL, S_ARTIPUZZGEAR_1, 0, 0}, // S_ARTIPUZZGEAR_8
+    {SPR_AGR2, 32768, 4, NULL, S_ARTIPUZZGEAR2_2, 0, 0},        // S_ARTIPUZZGEAR2_1
+    {SPR_AGR2, 32769, 4, NULL, S_ARTIPUZZGEAR2_3, 0, 0},        // S_ARTIPUZZGEAR2_2
+    {SPR_AGR2, 32770, 4, NULL, S_ARTIPUZZGEAR2_4, 0, 0},        // S_ARTIPUZZGEAR2_3
+    {SPR_AGR2, 32771, 4, NULL, S_ARTIPUZZGEAR2_5, 0, 0},        // S_ARTIPUZZGEAR2_4
+    {SPR_AGR2, 32772, 4, NULL, S_ARTIPUZZGEAR2_6, 0, 0},        // S_ARTIPUZZGEAR2_5
+    {SPR_AGR2, 32773, 4, NULL, S_ARTIPUZZGEAR2_7, 0, 0},        // S_ARTIPUZZGEAR2_6
+    {SPR_AGR2, 32774, 4, NULL, S_ARTIPUZZGEAR2_8, 0, 0},        // S_ARTIPUZZGEAR2_7
+    {SPR_AGR2, 32775, 4, NULL, S_ARTIPUZZGEAR2_1, 0, 0},        // S_ARTIPUZZGEAR2_8
+    {SPR_AGR3, 32768, 4, NULL, S_ARTIPUZZGEAR3_2, 0, 0},        // S_ARTIPUZZGEAR3_1
+    {SPR_AGR3, 32769, 4, NULL, S_ARTIPUZZGEAR3_3, 0, 0},        // S_ARTIPUZZGEAR3_2
+    {SPR_AGR3, 32770, 4, NULL, S_ARTIPUZZGEAR3_4, 0, 0},        // S_ARTIPUZZGEAR3_3
+    {SPR_AGR3, 32771, 4, NULL, S_ARTIPUZZGEAR3_5, 0, 0},        // S_ARTIPUZZGEAR3_4
+    {SPR_AGR3, 32772, 4, NULL, S_ARTIPUZZGEAR3_6, 0, 0},        // S_ARTIPUZZGEAR3_5
+    {SPR_AGR3, 32773, 4, NULL, S_ARTIPUZZGEAR3_7, 0, 0},        // S_ARTIPUZZGEAR3_6
+    {SPR_AGR3, 32774, 4, NULL, S_ARTIPUZZGEAR3_8, 0, 0},        // S_ARTIPUZZGEAR3_7
+    {SPR_AGR3, 32775, 4, NULL, S_ARTIPUZZGEAR3_1, 0, 0},        // S_ARTIPUZZGEAR3_8
+    {SPR_AGR4, 32768, 4, NULL, S_ARTIPUZZGEAR4_2, 0, 0},        // S_ARTIPUZZGEAR4_1
+    {SPR_AGR4, 32769, 4, NULL, S_ARTIPUZZGEAR4_3, 0, 0},        // S_ARTIPUZZGEAR4_2
+    {SPR_AGR4, 32770, 4, NULL, S_ARTIPUZZGEAR4_4, 0, 0},        // S_ARTIPUZZGEAR4_3
+    {SPR_AGR4, 32771, 4, NULL, S_ARTIPUZZGEAR4_5, 0, 0},        // S_ARTIPUZZGEAR4_4
+    {SPR_AGR4, 32772, 4, NULL, S_ARTIPUZZGEAR4_6, 0, 0},        // S_ARTIPUZZGEAR4_5
+    {SPR_AGR4, 32773, 4, NULL, S_ARTIPUZZGEAR4_7, 0, 0},        // S_ARTIPUZZGEAR4_6
+    {SPR_AGR4, 32774, 4, NULL, S_ARTIPUZZGEAR4_8, 0, 0},        // S_ARTIPUZZGEAR4_7
+    {SPR_AGR4, 32775, 4, NULL, S_ARTIPUZZGEAR4_1, 0, 0},        // S_ARTIPUZZGEAR4_8
+    {SPR_TRCH, 32768, 3, NULL, S_ARTI_TRCH2, 0, 0},     // S_ARTI_TRCH1
+    {SPR_TRCH, 32769, 3, NULL, S_ARTI_TRCH3, 0, 0},     // S_ARTI_TRCH2
+    {SPR_TRCH, 32770, 3, NULL, S_ARTI_TRCH1, 0, 0},     // S_ARTI_TRCH3
+    {SPR_PSBG, 0, 20, NULL, S_FIREBOMB2, 0, 0}, // S_FIREBOMB1
+    {SPR_PSBG, 0, 10, NULL, S_FIREBOMB3, 0, 0}, // S_FIREBOMB2
+    {SPR_PSBG, 0, 10, NULL, S_FIREBOMB4, 0, 0}, // S_FIREBOMB3
+    {SPR_PSBG, 1, 4, NULL, S_FIREBOMB5, 0, 0},  // S_FIREBOMB4
+    {SPR_PSBG, 2, 4, A_Scream, S_FIREBOMB6, 0, 0},      // S_FIREBOMB5
+    {SPR_XPL1, 32768, 4, A_Explode, S_FIREBOMB7, 0, 0}, // S_FIREBOMB6
+    {SPR_XPL1, 32769, 4, NULL, S_FIREBOMB8, 0, 0},      // S_FIREBOMB7
+    {SPR_XPL1, 32770, 4, NULL, S_FIREBOMB9, 0, 0},      // S_FIREBOMB8
+    {SPR_XPL1, 32771, 4, NULL, S_FIREBOMB10, 0, 0},     // S_FIREBOMB9
+    {SPR_XPL1, 32772, 4, NULL, S_FIREBOMB11, 0, 0},     // S_FIREBOMB10
+    {SPR_XPL1, 32773, 4, NULL, S_NULL, 0, 0},   // S_FIREBOMB11
+    {SPR_ATLP, 0, 4, NULL, S_ARTI_ATLP2, 0, 0}, // S_ARTI_ATLP1
+    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP3, 0, 0}, // S_ARTI_ATLP2
+    {SPR_ATLP, 2, 4, NULL, S_ARTI_ATLP4, 0, 0}, // S_ARTI_ATLP3
+    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP1, 0, 0}, // S_ARTI_ATLP4
+    {SPR_PSBG, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTI_PSBG1
+    {SPR_PSBG, 32768, 18, NULL, S_POISONBAG2, 0, 0},    // S_POISONBAG1
+    {SPR_PSBG, 32769, 4, NULL, S_POISONBAG3, 0, 0},     // S_POISONBAG2
+    {SPR_PSBG, 2, 3, NULL, S_POISONBAG4, 0, 0}, // S_POISONBAG3
+    {SPR_PSBG, 2, 1, A_PoisonBagInit, S_NULL, 0, 0},    // S_POISONBAG4
+    {SPR_PSBG, 3, 1, NULL, S_POISONCLOUD2, 0, 0},       // S_POISONCLOUD1
+    {SPR_PSBG, 3, 1, A_Scream, S_POISONCLOUD3, 0, 0},   // S_POISONCLOUD2
+    {SPR_PSBG, 3, 2, A_PoisonBagDamage, S_POISONCLOUD4, 0, 0},  // S_POISONCLOUD3
+    {SPR_PSBG, 4, 2, A_PoisonBagDamage, S_POISONCLOUD5, 0, 0},  // S_POISONCLOUD4
+    {SPR_PSBG, 4, 2, A_PoisonBagDamage, S_POISONCLOUD6, 0, 0},  // S_POISONCLOUD5
+    {SPR_PSBG, 4, 2, A_PoisonBagDamage, S_POISONCLOUD7, 0, 0},  // S_POISONCLOUD6
+    {SPR_PSBG, 5, 2, A_PoisonBagDamage, S_POISONCLOUD8, 0, 0},  // S_POISONCLOUD7
+    {SPR_PSBG, 5, 2, A_PoisonBagDamage, S_POISONCLOUD9, 0, 0},  // S_POISONCLOUD8
+    {SPR_PSBG, 5, 2, A_PoisonBagDamage, S_POISONCLOUD10, 0, 0}, // S_POISONCLOUD9
+    {SPR_PSBG, 6, 2, A_PoisonBagDamage, S_POISONCLOUD11, 0, 0}, // S_POISONCLOUD10
+    {SPR_PSBG, 6, 2, A_PoisonBagDamage, S_POISONCLOUD12, 0, 0}, // S_POISONCLOUD11
+    {SPR_PSBG, 6, 2, A_PoisonBagDamage, S_POISONCLOUD13, 0, 0}, // S_POISONCLOUD12
+    {SPR_PSBG, 7, 2, A_PoisonBagDamage, S_POISONCLOUD14, 0, 0}, // S_POISONCLOUD13
+    {SPR_PSBG, 7, 2, A_PoisonBagDamage, S_POISONCLOUD15, 0, 0}, // S_POISONCLOUD14
+    {SPR_PSBG, 7, 2, A_PoisonBagDamage, S_POISONCLOUD16, 0, 0}, // S_POISONCLOUD15
+    {SPR_PSBG, 8, 2, A_PoisonBagDamage, S_POISONCLOUD17, 0, 0}, // S_POISONCLOUD16
+    {SPR_PSBG, 8, 1, A_PoisonBagDamage, S_POISONCLOUD18, 0, 0}, // S_POISONCLOUD17
+    {SPR_PSBG, 8, 1, A_PoisonBagCheck, S_POISONCLOUD4, 0, 0},   // S_POISONCLOUD18
+    {SPR_PSBG, 7, 7, NULL, S_POISONCLOUD_X2, 0, 0},     // S_POISONCLOUD_X1
+    {SPR_PSBG, 6, 7, NULL, S_POISONCLOUD_X3, 0, 0},     // S_POISONCLOUD_X2
+    {SPR_PSBG, 5, 6, NULL, S_POISONCLOUD_X4, 0, 0},     // S_POISONCLOUD_X3
+    {SPR_PSBG, 3, 6, NULL, S_NULL, 0, 0},       // S_POISONCLOUD_X4
+    {SPR_THRW, 0, 4, A_CheckThrowBomb, S_THROWINGBOMB2, 0, 0},  // S_THROWINGBOMB1
+    {SPR_THRW, 1, 3, A_CheckThrowBomb, S_THROWINGBOMB3, 0, 0},  // S_THROWINGBOMB2
+    {SPR_THRW, 2, 3, A_CheckThrowBomb, S_THROWINGBOMB4, 0, 0},  // S_THROWINGBOMB3
+    {SPR_THRW, 3, 3, A_CheckThrowBomb, S_THROWINGBOMB5, 0, 0},  // S_THROWINGBOMB4
+    {SPR_THRW, 4, 3, A_CheckThrowBomb, S_THROWINGBOMB6, 0, 0},  // S_THROWINGBOMB5
+    {SPR_THRW, 5, 3, A_CheckThrowBomb, S_THROWINGBOMB1, 0, 0},  // S_THROWINGBOMB6
+    {SPR_THRW, 6, 6, A_CheckThrowBomb, S_THROWINGBOMB8, 0, 0},  // S_THROWINGBOMB7
+    {SPR_THRW, 5, 4, A_CheckThrowBomb, S_THROWINGBOMB9, 0, 0},  // S_THROWINGBOMB8
+    {SPR_THRW, 7, 6, A_CheckThrowBomb, S_THROWINGBOMB10, 0, 0}, // S_THROWINGBOMB9
+    {SPR_THRW, 5, 4, A_CheckThrowBomb, S_THROWINGBOMB11, 0, 0}, // S_THROWINGBOMB10
+    {SPR_THRW, 6, 6, A_CheckThrowBomb, S_THROWINGBOMB12, 0, 0}, // S_THROWINGBOMB11
+    {SPR_THRW, 5, 3, A_CheckThrowBomb, S_THROWINGBOMB12, 0, 0}, // S_THROWINGBOMB12
+    {SPR_CFCF, 32784, 4, A_NoGravity, S_THROWINGBOMB_X2, 0, 0}, // S_THROWINGBOMB_X1
+    {SPR_CFCF, 32785, 3, A_Scream, S_THROWINGBOMB_X3, 0, 0},    // S_THROWINGBOMB_X2
+    {SPR_CFCF, 32786, 4, A_Explode, S_THROWINGBOMB_X4, 0, 0},   // S_THROWINGBOMB_X3
+    {SPR_CFCF, 32787, 3, NULL, S_THROWINGBOMB_X5, 0, 0},        // S_THROWINGBOMB_X4
+    {SPR_CFCF, 32788, 4, NULL, S_THROWINGBOMB_X6, 0, 0},        // S_THROWINGBOMB_X5
+    {SPR_CFCF, 32790, 3, NULL, S_THROWINGBOMB_X7, 0, 0},        // S_THROWINGBOMB_X6
+    {SPR_CFCF, 32791, 4, NULL, S_THROWINGBOMB_X8, 0, 0},        // S_THROWINGBOMB_X7
+    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_THROWINGBOMB_X8
+    {SPR_SPED, 32768, 3, NULL, S_ARTI_BOOTS2, 0, 0},    // S_ARTI_BOOTS1
+    {SPR_SPED, 32769, 3, NULL, S_ARTI_BOOTS3, 0, 0},    // S_ARTI_BOOTS2
+    {SPR_SPED, 32770, 3, NULL, S_ARTI_BOOTS4, 0, 0},    // S_ARTI_BOOTS3
+    {SPR_SPED, 32771, 3, NULL, S_ARTI_BOOTS5, 0, 0},    // S_ARTI_BOOTS4
+    {SPR_SPED, 32772, 3, NULL, S_ARTI_BOOTS6, 0, 0},    // S_ARTI_BOOTS5
+    {SPR_SPED, 32773, 3, NULL, S_ARTI_BOOTS7, 0, 0},    // S_ARTI_BOOTS6
+    {SPR_SPED, 32774, 3, NULL, S_ARTI_BOOTS8, 0, 0},    // S_ARTI_BOOTS7
+    {SPR_SPED, 32775, 3, NULL, S_ARTI_BOOTS1, 0, 0},    // S_ARTI_BOOTS8
+    {SPR_BMAN, 32768, -1, NULL, S_NULL, 0, 0},  // S_ARTI_MANA
+    {SPR_BRAC, 32768, 4, NULL, S_ARTI_ARMOR2, 0, 0},    // S_ARTI_ARMOR1
+    {SPR_BRAC, 32769, 4, NULL, S_ARTI_ARMOR3, 0, 0},    // S_ARTI_ARMOR2
+    {SPR_BRAC, 32770, 4, NULL, S_ARTI_ARMOR4, 0, 0},    // S_ARTI_ARMOR3
+    {SPR_BRAC, 32771, 4, NULL, S_ARTI_ARMOR5, 0, 0},    // S_ARTI_ARMOR4
+    {SPR_BRAC, 32772, 4, NULL, S_ARTI_ARMOR6, 0, 0},    // S_ARTI_ARMOR5
+    {SPR_BRAC, 32773, 4, NULL, S_ARTI_ARMOR7, 0, 0},    // S_ARTI_ARMOR6
+    {SPR_BRAC, 32774, 4, NULL, S_ARTI_ARMOR8, 0, 0},    // S_ARTI_ARMOR7
+    {SPR_BRAC, 32775, 4, NULL, S_ARTI_ARMOR1, 0, 0},    // S_ARTI_ARMOR8
+    {SPR_BLST, 32768, 4, NULL, S_ARTI_BLAST2, 0, 0},    // S_ARTI_BLAST1
+    {SPR_BLST, 32769, 4, NULL, S_ARTI_BLAST3, 0, 0},    // S_ARTI_BLAST2
+    {SPR_BLST, 32770, 4, NULL, S_ARTI_BLAST4, 0, 0},    // S_ARTI_BLAST3
+    {SPR_BLST, 32771, 4, NULL, S_ARTI_BLAST5, 0, 0},    // S_ARTI_BLAST4
+    {SPR_BLST, 32772, 4, NULL, S_ARTI_BLAST6, 0, 0},    // S_ARTI_BLAST5
+    {SPR_BLST, 32773, 4, NULL, S_ARTI_BLAST7, 0, 0},    // S_ARTI_BLAST6
+    {SPR_BLST, 32774, 4, NULL, S_ARTI_BLAST8, 0, 0},    // S_ARTI_BLAST7
+    {SPR_BLST, 32775, 4, NULL, S_ARTI_BLAST1, 0, 0},    // S_ARTI_BLAST8
+    {SPR_HRAD, 32768, 4, NULL, S_ARTI_HEALRAD2, 0, 0},  // S_ARTI_HEALRAD1
+    {SPR_HRAD, 32769, 4, NULL, S_ARTI_HEALRAD3, 0, 0},  // S_ARTI_HEALRAD2
+    {SPR_HRAD, 32770, 4, NULL, S_ARTI_HEALRAD4, 0, 0},  // S_ARTI_HEALRAD3
+    {SPR_HRAD, 32771, 4, NULL, S_ARTI_HEALRAD5, 0, 0},  // S_ARTI_HEALRAD4
+    {SPR_HRAD, 32772, 4, NULL, S_ARTI_HEALRAD6, 0, 0},  // S_ARTI_HEALRAD5
+    {SPR_HRAD, 32773, 4, NULL, S_ARTI_HEALRAD7, 0, 0},  // S_ARTI_HEALRAD6
+    {SPR_HRAD, 32774, 4, NULL, S_ARTI_HEALRAD8, 0, 0},  // S_ARTI_HEALRAD7
+    {SPR_HRAD, 32775, 4, NULL, S_ARTI_HEALRAD9, 0, 0},  // S_ARTI_HEALRAD8
+    {SPR_HRAD, 32776, 4, NULL, S_ARTI_HEALRAD0, 0, 0},  // S_ARTI_HEALRAD9
+    {SPR_HRAD, 32777, 4, NULL, S_ARTI_HEALRADA, 0, 0},  // S_ARTI_HEALRAD0
+    {SPR_HRAD, 32778, 4, NULL, S_ARTI_HEALRADB, 0, 0},  // S_ARTI_HEALRADA
+    {SPR_HRAD, 32779, 4, NULL, S_ARTI_HEALRADC, 0, 0},  // S_ARTI_HEALRADB
+    {SPR_HRAD, 32780, 4, NULL, S_ARTI_HEALRADD, 0, 0},  // S_ARTI_HEALRADC
+    {SPR_HRAD, 32781, 4, NULL, S_ARTI_HEALRADE, 0, 0},  // S_ARTI_HEALRADD
+    {SPR_HRAD, 32782, 4, NULL, S_ARTI_HEALRADF, 0, 0},  // S_ARTI_HEALRADE
+    {SPR_HRAD, 32783, 4, NULL, S_ARTI_HEALRAD1, 0, 0},  // S_ARTI_HEALRADF
+    {SPR_SPSH, 0, 8, NULL, S_SPLASH2, 0, 0},    // S_SPLASH1
+    {SPR_SPSH, 1, 8, NULL, S_SPLASH3, 0, 0},    // S_SPLASH2
+    {SPR_SPSH, 2, 8, NULL, S_SPLASH4, 0, 0},    // S_SPLASH3
+    {SPR_SPSH, 3, 16, NULL, S_NULL, 0, 0},      // S_SPLASH4
+    {SPR_SPSH, 3, 10, NULL, S_NULL, 0, 0},      // S_SPLASHX
+    {SPR_SPSH, 4, 5, NULL, S_SPLASHBASE2, 0, 0},        // S_SPLASHBASE1
+    {SPR_SPSH, 5, 5, NULL, S_SPLASHBASE3, 0, 0},        // S_SPLASHBASE2
+    {SPR_SPSH, 6, 5, NULL, S_SPLASHBASE4, 0, 0},        // S_SPLASHBASE3
+    {SPR_SPSH, 7, 5, NULL, S_SPLASHBASE5, 0, 0},        // S_SPLASHBASE4
+    {SPR_SPSH, 8, 5, NULL, S_SPLASHBASE6, 0, 0},        // S_SPLASHBASE5
+    {SPR_SPSH, 9, 5, NULL, S_SPLASHBASE7, 0, 0},        // S_SPLASHBASE6
+    {SPR_SPSH, 10, 5, NULL, S_NULL, 0, 0},      // S_SPLASHBASE7
+    {SPR_LVAS, 32768, 5, NULL, S_LAVASPLASH2, 0, 0},    // S_LAVASPLASH1
+    {SPR_LVAS, 32769, 5, NULL, S_LAVASPLASH3, 0, 0},    // S_LAVASPLASH2
+    {SPR_LVAS, 32770, 5, NULL, S_LAVASPLASH4, 0, 0},    // S_LAVASPLASH3
+    {SPR_LVAS, 32771, 5, NULL, S_LAVASPLASH5, 0, 0},    // S_LAVASPLASH4
+    {SPR_LVAS, 32772, 5, NULL, S_LAVASPLASH6, 0, 0},    // S_LAVASPLASH5
+    {SPR_LVAS, 32773, 5, NULL, S_NULL, 0, 0},   // S_LAVASPLASH6
+    {SPR_LVAS, 32774, 5, NULL, S_LAVASMOKE2, 0, 0},     // S_LAVASMOKE1
+    {SPR_LVAS, 32775, 5, NULL, S_LAVASMOKE3, 0, 0},     // S_LAVASMOKE2
+    {SPR_LVAS, 32776, 5, NULL, S_LAVASMOKE4, 0, 0},     // S_LAVASMOKE3
+    {SPR_LVAS, 32777, 5, NULL, S_LAVASMOKE5, 0, 0},     // S_LAVASMOKE4
+    {SPR_LVAS, 32778, 5, NULL, S_NULL, 0, 0},   // S_LAVASMOKE5
+    {SPR_SLDG, 0, 8, NULL, S_SLUDGECHUNK2, 0, 0},       // S_SLUDGECHUNK1
+    {SPR_SLDG, 1, 8, NULL, S_SLUDGECHUNK3, 0, 0},       // S_SLUDGECHUNK2
+    {SPR_SLDG, 2, 8, NULL, S_SLUDGECHUNK4, 0, 0},       // S_SLUDGECHUNK3
+    {SPR_SLDG, 3, 8, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNK4
+    {SPR_SLDG, 3, 6, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNKX
+    {SPR_SLDG, 4, 6, NULL, S_SLUDGESPLASH2, 0, 0},      // S_SLUDGESPLASH1
+    {SPR_SLDG, 5, 6, NULL, S_SLUDGESPLASH3, 0, 0},      // S_SLUDGESPLASH2
+    {SPR_SLDG, 6, 6, NULL, S_SLUDGESPLASH4, 0, 0},      // S_SLUDGESPLASH3
+    {SPR_SLDG, 7, 6, NULL, S_NULL, 0, 0},       // S_SLUDGESPLASH4
+    {SPR_STTW, 0, -1, NULL, S_NULL, 0, 0},      // S_ZWINGEDSTATUE1
+    {SPR_RCK1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK1_1
+    {SPR_RCK2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK2_1
+    {SPR_RCK3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK3_1
+    {SPR_RCK4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK4_1
+    {SPR_CDLR, 0, 4, NULL, S_ZCHANDELIER2, 0, 0},       // S_ZCHANDELIER1
+    {SPR_CDLR, 1, 4, NULL, S_ZCHANDELIER3, 0, 0},       // S_ZCHANDELIER2
+    {SPR_CDLR, 2, 4, NULL, S_ZCHANDELIER1, 0, 0},       // S_ZCHANDELIER3
+    {SPR_CDLR, 3, -1, NULL, S_NULL, 0, 0},      // S_ZCHANDELIER_U
+    {SPR_TRE1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEDEAD1
+    {SPR_TRE1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREE
+    {SPR_TRDT, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEDESTRUCTIBLE1
+    {SPR_TRDT, 1, 5, NULL, S_ZTREEDES_D2, 0, 0},        // S_ZTREEDES_D1
+    {SPR_TRDT, 2, 5, A_Scream, S_ZTREEDES_D3, 0, 0},    // S_ZTREEDES_D2
+    {SPR_TRDT, 3, 5, NULL, S_ZTREEDES_D4, 0, 0},        // S_ZTREEDES_D3
+    {SPR_TRDT, 4, 5, NULL, S_ZTREEDES_D5, 0, 0},        // S_ZTREEDES_D4
+    {SPR_TRDT, 5, 5, NULL, S_ZTREEDES_D6, 0, 0},        // S_ZTREEDES_D5
+    {SPR_TRDT, 6, -1, NULL, S_NULL, 0, 0},      // S_ZTREEDES_D6
+    {SPR_TRDT, 32775, 5, NULL, S_ZTREEDES_X2, 0, 0},    // S_ZTREEDES_X1
+    {SPR_TRDT, 32776, 5, NULL, S_ZTREEDES_X3, 0, 0},    // S_ZTREEDES_X2
+    {SPR_TRDT, 32777, 5, NULL, S_ZTREEDES_X4, 0, 0},    // S_ZTREEDES_X3
+    {SPR_TRDT, 32778, 5, NULL, S_ZTREEDES_X5, 0, 0},    // S_ZTREEDES_X4
+    {SPR_TRDT, 32779, 5, NULL, S_ZTREEDES_X6, 0, 0},    // S_ZTREEDES_X5
+    {SPR_TRDT, 32780, 5, A_Explode, S_ZTREEDES_X7, 0, 0},       // S_ZTREEDES_X6
+    {SPR_TRDT, 32781, 5, NULL, S_ZTREEDES_X8, 0, 0},    // S_ZTREEDES_X7
+    {SPR_TRDT, 14, 5, NULL, S_ZTREEDES_X9, 0, 0},       // S_ZTREEDES_X8
+    {SPR_TRDT, 15, 5, NULL, S_ZTREEDES_X10, 0, 0},      // S_ZTREEDES_X9
+    {SPR_TRDT, 16, -1, NULL, S_NULL, 0, 0},     // S_ZTREEDES_X10
+    {SPR_TRE2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREESWAMP182_1
+    {SPR_TRE3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREESWAMP172_1
+    {SPR_STM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPBURNED1
+    {SPR_STM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPBARE1
+    {SPR_STM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPSWAMP1_1
+    {SPR_STM4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPSWAMP2_1
+    {SPR_MSH1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMLARGE1_1
+    {SPR_MSH2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMLARGE2_1
+    {SPR_MSH3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMLARGE3_1
+    {SPR_MSH4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL1_1
+    {SPR_MSH5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL2_1
+    {SPR_MSH6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL3_1
+    {SPR_MSH7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL4_1
+    {SPR_MSH8, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL5_1
+    {SPR_SGMP, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEPILLAR1
+    {SPR_SGM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITELARGE1
+    {SPR_SGM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEMEDIUM1
+    {SPR_SGM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITESMALL1
+    {SPR_SLC1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITELARGE1
+    {SPR_SLC2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEMEDIUM1
+    {SPR_SLC3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITESMALL1
+    {SPR_MSS1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZMOSSCEILING1_1
+    {SPR_MSS2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZMOSSCEILING2_1
+    {SPR_SWMV, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSWAMPVINE1
+    {SPR_CPS1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSEKABOB1
+    {SPR_CPS2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSESLEEPING1
+    {SPR_TMS1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONERIP1
+    {SPR_TMS2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONESHANE1
+    {SPR_TMS3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONEBIGCROSS1
+    {SPR_TMS4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONEBRIANR1
+    {SPR_TMS5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONECROSSCIRCLE1
+    {SPR_TMS6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONESMALLCROSS1
+    {SPR_TMS7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONEBRIANP1
+    {SPR_CPS3, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEHANGING_1
+    {SPR_STT2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEGREENTALL_1
+    {SPR_STT3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEBLUETALL_1
+    {SPR_STT4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEGREENSHORT_1
+    {SPR_STT5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEBLUESHORT_1
+    {SPR_GAR1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLESTRIPETALL_1
+    {SPR_GAR2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEDARKREDTALL_1
+    {SPR_GAR3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEREDTALL_1
+    {SPR_GAR4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLETANTALL_1
+    {SPR_GAR5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLERUSTTALL_1
+    {SPR_GAR6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEDARKREDSHORT_1
+    {SPR_GAR7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEREDSHORT_1
+    {SPR_GAR8, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLETANSHORT_1
+    {SPR_GAR9, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLERUSTSHORT_1
+    {SPR_BNR1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZBANNERTATTERED_1
+    {SPR_TRE4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREELARGE1
+    {SPR_TRE5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREELARGE2
+    {SPR_TRE6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEGNARLED1
+    {SPR_TRE7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEGNARLED2
+    {SPR_LOGG, 0, -1, NULL, S_NULL, 0, 0},      // S_ZLOG
+    {SPR_ICT1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICELARGE
+    {SPR_ICT2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICEMEDIUM
+    {SPR_ICT3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICESMALL
+    {SPR_ICT4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICETINY
+    {SPR_ICM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICELARGE
+    {SPR_ICM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICEMEDIUM
+    {SPR_ICM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICESMALL
+    {SPR_ICM4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICETINY
+    {SPR_RKBL, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCKBROWN1
+    {SPR_RKBS, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCKBROWN2
+    {SPR_RKBK, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCKBLACK
+    {SPR_RBL1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZRUBBLE1
+    {SPR_RBL2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZRUBBLE2
+    {SPR_RBL3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZRUBBLE3
+    {SPR_VASE, 0, -1, NULL, S_NULL, 0, 0},      // S_ZVASEPILLAR
+    {SPR_POT1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZPOTTERY1
+    {SPR_POT2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZPOTTERY2
+    {SPR_POT3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZPOTTERY3
+    {SPR_POT1, 0, 0, A_PotteryExplode, S_NULL, 0, 0},   // S_ZPOTTERY_EXPLODE
+    {SPR_PBIT, 0, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_1
+    {SPR_PBIT, 1, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_2
+    {SPR_PBIT, 2, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_3
+    {SPR_PBIT, 3, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_4
+    {SPR_PBIT, 4, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_5
+    {SPR_PBIT, 5, 0, A_PotteryChooseBit, S_NULL, 0, 0}, // S_POTTERYBIT_EX0
+    {SPR_PBIT, 5, 140, NULL, S_POTTERYBIT_EX1_2, 0, 0}, // S_POTTERYBIT_EX1
+    {SPR_PBIT, 5, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX1_2
+    {SPR_PBIT, 6, 140, NULL, S_POTTERYBIT_EX2_2, 0, 0}, // S_POTTERYBIT_EX2
+    {SPR_PBIT, 6, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX2_2
+    {SPR_PBIT, 7, 140, NULL, S_POTTERYBIT_EX3_2, 0, 0}, // S_POTTERYBIT_EX3
+    {SPR_PBIT, 7, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX3_2
+    {SPR_PBIT, 8, 140, NULL, S_POTTERYBIT_EX4_2, 0, 0}, // S_POTTERYBIT_EX4
+    {SPR_PBIT, 8, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX4_2
+    {SPR_PBIT, 9, 140, NULL, S_POTTERYBIT_EX5_2, 0, 0}, // S_POTTERYBIT_EX5
+    {SPR_PBIT, 9, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX5_2
+    {SPR_CPS4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSELYNCHED1
+    {SPR_CPS5, 0, 140, A_CorpseBloodDrip, S_ZCORPSELYNCHED2, 0, 0},     // S_ZCORPSELYNCHED2
+    {SPR_CPS6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSESITTING
+    {SPR_CPS6, 0, 1, A_CorpseExplode, S_NULL, 0, 0},    // S_ZCORPSESITTING_X
+    {SPR_CPB1, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_1
+    {SPR_CPB2, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_2
+    {SPR_CPB3, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_3
+    {SPR_CPB4, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_4
+    {SPR_BDRP, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBLOODDRIP
+    {SPR_BDSH, 0, 3, NULL, S_CORPSEBLOODDRIP_X2, 0, 0}, // S_CORPSEBLOODDRIP_X1
+    {SPR_BDSH, 1, 3, NULL, S_CORPSEBLOODDRIP_X3, 0, 0}, // S_CORPSEBLOODDRIP_X2
+    {SPR_BDSH, 2, 2, NULL, S_CORPSEBLOODDRIP_X4, 0, 0}, // S_CORPSEBLOODDRIP_X3
+    {SPR_BDSH, 3, 2, NULL, S_NULL, 0, 0},       // S_CORPSEBLOODDRIP_X4
+    {SPR_BDPL, 0, -1, NULL, S_NULL, 0, 0},      // S_BLOODPOOL
+    {SPR_CNDL, 32768, 4, NULL, S_ZCANDLE2, 0, 0},       // S_ZCANDLE1
+    {SPR_CNDL, 32769, 4, NULL, S_ZCANDLE3, 0, 0},       // S_ZCANDLE2
+    {SPR_CNDL, 32770, 4, NULL, S_ZCANDLE1, 0, 0},       // S_ZCANDLE3
+    {SPR_MAN1, 0, 20, A_LeafSpawn, S_ZLEAFSPAWNER, 0, 0},       // S_ZLEAFSPAWNER
+    {SPR_LEF1, 0, 4, NULL, S_LEAF1_2, 0, 0},    // S_LEAF1_1
+    {SPR_LEF1, 1, 4, NULL, S_LEAF1_3, 0, 0},    // S_LEAF1_2
+    {SPR_LEF1, 2, 4, NULL, S_LEAF1_4, 0, 0},    // S_LEAF1_3
+    {SPR_LEF1, 3, 4, A_LeafThrust, S_LEAF1_5, 0, 0},    // S_LEAF1_4
+    {SPR_LEF1, 4, 4, NULL, S_LEAF1_6, 0, 0},    // S_LEAF1_5
+    {SPR_LEF1, 5, 4, NULL, S_LEAF1_7, 0, 0},    // S_LEAF1_6
+    {SPR_LEF1, 6, 4, NULL, S_LEAF1_8, 0, 0},    // S_LEAF1_7
+    {SPR_LEF1, 7, 4, A_LeafThrust, S_LEAF1_9, 0, 0},    // S_LEAF1_8
+    {SPR_LEF1, 8, 4, NULL, S_LEAF1_10, 0, 0},   // S_LEAF1_9
+    {SPR_LEF1, 0, 4, NULL, S_LEAF1_11, 0, 0},   // S_LEAF1_10
+    {SPR_LEF1, 1, 4, NULL, S_LEAF1_12, 0, 0},   // S_LEAF1_11
+    {SPR_LEF1, 2, 4, A_LeafThrust, S_LEAF1_13, 0, 0},   // S_LEAF1_12
+    {SPR_LEF1, 3, 4, NULL, S_LEAF1_14, 0, 0},   // S_LEAF1_13
+    {SPR_LEF1, 4, 4, NULL, S_LEAF1_15, 0, 0},   // S_LEAF1_14
+    {SPR_LEF1, 5, 4, NULL, S_LEAF1_16, 0, 0},   // S_LEAF1_15
+    {SPR_LEF1, 6, 4, A_LeafThrust, S_LEAF1_17, 0, 0},   // S_LEAF1_16
+    {SPR_LEF1, 7, 4, NULL, S_LEAF1_18, 0, 0},   // S_LEAF1_17
+    {SPR_LEF1, 8, 4, NULL, S_NULL, 0, 0},       // S_LEAF1_18
+    {SPR_LEF3, 3, 10, A_LeafCheck, S_LEAF_X1, 0, 0},    // S_LEAF_X1
+    {SPR_LEF2, 0, 4, NULL, S_LEAF2_2, 0, 0},    // S_LEAF2_1
+    {SPR_LEF2, 1, 4, NULL, S_LEAF2_3, 0, 0},    // S_LEAF2_2
+    {SPR_LEF2, 2, 4, NULL, S_LEAF2_4, 0, 0},    // S_LEAF2_3
+    {SPR_LEF2, 3, 4, A_LeafThrust, S_LEAF2_5, 0, 0},    // S_LEAF2_4
+    {SPR_LEF2, 4, 4, NULL, S_LEAF2_6, 0, 0},    // S_LEAF2_5
+    {SPR_LEF2, 5, 4, NULL, S_LEAF2_7, 0, 0},    // S_LEAF2_6
+    {SPR_LEF2, 6, 4, NULL, S_LEAF2_8, 0, 0},    // S_LEAF2_7
+    {SPR_LEF2, 7, 4, A_LeafThrust, S_LEAF2_9, 0, 0},    // S_LEAF2_8
+    {SPR_LEF2, 8, 4, NULL, S_LEAF2_10, 0, 0},   // S_LEAF2_9
+    {SPR_LEF2, 0, 4, NULL, S_LEAF2_11, 0, 0},   // S_LEAF2_10
+    {SPR_LEF2, 1, 4, NULL, S_LEAF2_12, 0, 0},   // S_LEAF2_11
+    {SPR_LEF2, 2, 4, A_LeafThrust, S_LEAF2_13, 0, 0},   // S_LEAF2_12
+    {SPR_LEF2, 3, 4, NULL, S_LEAF2_14, 0, 0},   // S_LEAF2_13
+    {SPR_LEF2, 4, 4, NULL, S_LEAF2_15, 0, 0},   // S_LEAF2_14
+    {SPR_LEF2, 5, 4, NULL, S_LEAF2_16, 0, 0},   // S_LEAF2_15
+    {SPR_LEF2, 6, 4, A_LeafThrust, S_LEAF2_17, 0, 0},   // S_LEAF2_16
+    {SPR_LEF2, 7, 4, NULL, S_LEAF2_18, 0, 0},   // S_LEAF2_17
+    {SPR_LEF2, 8, 4, NULL, S_NULL, 0, 0},       // S_LEAF2_18
+    {SPR_TWTR, 32768, 4, NULL, S_ZTWINEDTORCH_2, 0, 0}, // S_ZTWINEDTORCH_1
+    {SPR_TWTR, 32769, 4, NULL, S_ZTWINEDTORCH_3, 0, 0}, // S_ZTWINEDTORCH_2
+    {SPR_TWTR, 32770, 4, NULL, S_ZTWINEDTORCH_4, 0, 0}, // S_ZTWINEDTORCH_3
+    {SPR_TWTR, 32771, 4, NULL, S_ZTWINEDTORCH_5, 0, 0}, // S_ZTWINEDTORCH_4
+    {SPR_TWTR, 32772, 4, NULL, S_ZTWINEDTORCH_6, 0, 0}, // S_ZTWINEDTORCH_5
+    {SPR_TWTR, 32773, 4, NULL, S_ZTWINEDTORCH_7, 0, 0}, // S_ZTWINEDTORCH_6
+    {SPR_TWTR, 32774, 4, NULL, S_ZTWINEDTORCH_8, 0, 0}, // S_ZTWINEDTORCH_7
+    {SPR_TWTR, 32775, 4, NULL, S_ZTWINEDTORCH_1, 0, 0}, // S_ZTWINEDTORCH_8
+    {SPR_TWTR, 8, -1, NULL, S_NULL, 0, 0},      // S_ZTWINEDTORCH_UNLIT
+    {SPR_TLGL, 0, 2, NULL, S_BRIDGE2, 0, 0},    // S_BRIDGE1
+    {SPR_TLGL, 0, 2, A_BridgeInit, S_BRIDGE3, 0, 0},    // S_BRIDGE2
+    {SPR_TLGL, 0, -1, NULL, S_NULL, 0, 0},      // S_BRIDGE3
+    {SPR_TLGL, 0, 2, NULL, S_FREE_BRIDGE2, 0, 0},       // S_FREE_BRIDGE1
+    {SPR_TLGL, 0, 300, NULL, S_NULL, 0, 0},     // S_FREE_BRIDGE2
+    {SPR_TLGL, 0, 2, NULL, S_BBALL2, 0, 0},     // S_BBALL1
+    {SPR_TLGL, 0, 5, A_BridgeOrbit, S_BBALL2, 0, 0},    // S_BBALL2
+    {SPR_WLTR, 32768, 5, NULL, S_ZWALLTORCH2, 0, 0},    // S_ZWALLTORCH1
+    {SPR_WLTR, 32769, 5, NULL, S_ZWALLTORCH3, 0, 0},    // S_ZWALLTORCH2
+    {SPR_WLTR, 32770, 5, NULL, S_ZWALLTORCH4, 0, 0},    // S_ZWALLTORCH3
+    {SPR_WLTR, 32771, 5, NULL, S_ZWALLTORCH5, 0, 0},    // S_ZWALLTORCH4
+    {SPR_WLTR, 32772, 5, NULL, S_ZWALLTORCH6, 0, 0},    // S_ZWALLTORCH5
+    {SPR_WLTR, 32773, 5, NULL, S_ZWALLTORCH7, 0, 0},    // S_ZWALLTORCH6
+    {SPR_WLTR, 32774, 5, NULL, S_ZWALLTORCH8, 0, 0},    // S_ZWALLTORCH7
+    {SPR_WLTR, 32775, 5, NULL, S_ZWALLTORCH1, 0, 0},    // S_ZWALLTORCH8
+    {SPR_WLTR, 8, -1, NULL, S_NULL, 0, 0},      // S_ZWALLTORCH_U
+    {SPR_BARL, 0, -1, NULL, S_NULL, 0, 0},      // S_ZBARREL1
+    {SPR_SHB1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHRUB1
+    {SPR_SHB1, 0, 1, A_TreeDeath, S_ZSHRUB1, 0, 0},     // S_ZSHRUB1_DIE
+    {SPR_SHB1, 32769, 7, NULL, S_ZSHRUB1_X2, 0, 0},     // S_ZSHRUB1_X1
+    {SPR_SHB1, 32770, 6, A_Scream, S_ZSHRUB1_X3, 0, 0}, // S_ZSHRUB1_X2
+    {SPR_SHB1, 32771, 5, NULL, S_NULL, 0, 0},   // S_ZSHRUB1_X3
+    {SPR_SHB2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHRUB2
+    {SPR_SHB2, 0, 1, A_TreeDeath, S_ZSHRUB2, 0, 0},     // S_ZSHRUB2_DIE
+    {SPR_SHB2, 32769, 7, NULL, S_ZSHRUB2_X2, 0, 0},     // S_ZSHRUB2_X1
+    {SPR_SHB2, 32770, 6, A_Scream, S_ZSHRUB2_X3, 0, 0}, // S_ZSHRUB2_X2
+    {SPR_SHB2, 32771, 5, A_Explode, S_ZSHRUB2_X4, 0, 0},        // S_ZSHRUB2_X3
+    {SPR_SHB2, 32772, 5, NULL, S_NULL, 0, 0},   // S_ZSHRUB2_X4
+    {SPR_BCKT, 0, -1, NULL, S_NULL, 0, 0},      // S_ZBUCKET1
+    {SPR_SHRM, 0, 5, A_PoisonShroom, S_ZPOISONSHROOM_P2, 0, 0}, // S_ZPOISONSHROOM1
+    {SPR_SHRM, 0, 6, NULL, S_ZPOISONSHROOM_P2, 0, 0},   // S_ZPOISONSHROOM_P1
+    {SPR_SHRM, 1, 8, A_Pain, S_ZPOISONSHROOM1, 0, 0},   // S_ZPOISONSHROOM_P2
+    {SPR_SHRM, 2, 5, NULL, S_ZPOISONSHROOM_X2, 0, 0},   // S_ZPOISONSHROOM_X1
+    {SPR_SHRM, 3, 5, NULL, S_ZPOISONSHROOM_X3, 0, 0},   // S_ZPOISONSHROOM_X2
+    {SPR_SHRM, 4, 5, A_PoisonBagInit, S_ZPOISONSHROOM_X4, 0, 0},        // S_ZPOISONSHROOM_X3
+    {SPR_SHRM, 5, -1, NULL, S_NULL, 0, 0},      // S_ZPOISONSHROOM_X4
+    {SPR_FBUL, 32768, 4, NULL, S_ZFIREBULL2, 0, 0},     // S_ZFIREBULL1
+    {SPR_FBUL, 32769, 4, NULL, S_ZFIREBULL3, 0, 0},     // S_ZFIREBULL2
+    {SPR_FBUL, 32770, 4, NULL, S_ZFIREBULL4, 0, 0},     // S_ZFIREBULL3
+    {SPR_FBUL, 32771, 4, NULL, S_ZFIREBULL5, 0, 0},     // S_ZFIREBULL4
+    {SPR_FBUL, 32772, 4, NULL, S_ZFIREBULL6, 0, 0},     // S_ZFIREBULL5
+    {SPR_FBUL, 32773, 4, NULL, S_ZFIREBULL7, 0, 0},     // S_ZFIREBULL6
+    {SPR_FBUL, 32774, 4, NULL, S_ZFIREBULL1, 0, 0},     // S_ZFIREBULL7
+    {SPR_FBUL, 32777, 4, NULL, S_ZFIREBULL_DEATH2, 0, 0},       // S_ZFIREBULL_DEATH
+    {SPR_FBUL, 32776, 4, NULL, S_ZFIREBULL_U, 0, 0},    // S_ZFIREBULL_DEATH2
+    {SPR_FBUL, 7, -1, NULL, S_NULL, 0, 0},      // S_ZFIREBULL_U
+    {SPR_FBUL, 32776, 4, NULL, S_ZFIREBULL_BIRTH2, 0, 0},       // S_ZFIREBULL_BIRTH
+    {SPR_FBUL, 32777, 4, NULL, S_ZFIREBULL1, 0, 0},     // S_ZFIREBULL_BIRTH2
+    {SPR_FSKL, 32768, 4, NULL, S_ZFIRETHING2, 0, 0},    // S_ZFIRETHING1
+    {SPR_FSKL, 32769, 3, NULL, S_ZFIRETHING3, 0, 0},    // S_ZFIRETHING2
+    {SPR_FSKL, 32770, 4, NULL, S_ZFIRETHING4, 0, 0},    // S_ZFIRETHING3
+    {SPR_FSKL, 32771, 3, NULL, S_ZFIRETHING5, 0, 0},    // S_ZFIRETHING4
+    {SPR_FSKL, 32772, 4, NULL, S_ZFIRETHING6, 0, 0},    // S_ZFIRETHING5
+    {SPR_FSKL, 32773, 3, NULL, S_ZFIRETHING7, 0, 0},    // S_ZFIRETHING6
+    {SPR_FSKL, 32774, 4, NULL, S_ZFIRETHING8, 0, 0},    // S_ZFIRETHING7
+    {SPR_FSKL, 32775, 3, NULL, S_ZFIRETHING9, 0, 0},    // S_ZFIRETHING8
+    {SPR_FSKL, 32776, 4, NULL, S_ZFIRETHING1, 0, 0},    // S_ZFIRETHING9
+    {SPR_BRTR, 32768, 4, NULL, S_ZBRASSTORCH2, 0, 0},   // S_ZBRASSTORCH1
+    {SPR_BRTR, 32769, 4, NULL, S_ZBRASSTORCH3, 0, 0},   // S_ZBRASSTORCH2
+    {SPR_BRTR, 32770, 4, NULL, S_ZBRASSTORCH4, 0, 0},   // S_ZBRASSTORCH3
+    {SPR_BRTR, 32771, 4, NULL, S_ZBRASSTORCH5, 0, 0},   // S_ZBRASSTORCH4
+    {SPR_BRTR, 32772, 4, NULL, S_ZBRASSTORCH6, 0, 0},   // S_ZBRASSTORCH5
+    {SPR_BRTR, 32773, 4, NULL, S_ZBRASSTORCH7, 0, 0},   // S_ZBRASSTORCH6
+    {SPR_BRTR, 32774, 4, NULL, S_ZBRASSTORCH8, 0, 0},   // S_ZBRASSTORCH7
+    {SPR_BRTR, 32775, 4, NULL, S_ZBRASSTORCH9, 0, 0},   // S_ZBRASSTORCH8
+    {SPR_BRTR, 32776, 4, NULL, S_ZBRASSTORCH10, 0, 0},  // S_ZBRASSTORCH9
+    {SPR_BRTR, 32777, 4, NULL, S_ZBRASSTORCH11, 0, 0},  // S_ZBRASSTORCH10
+    {SPR_BRTR, 32778, 4, NULL, S_ZBRASSTORCH12, 0, 0},  // S_ZBRASSTORCH11
+    {SPR_BRTR, 32779, 4, NULL, S_ZBRASSTORCH13, 0, 0},  // S_ZBRASSTORCH12
+    {SPR_BRTR, 32780, 4, NULL, S_ZBRASSTORCH1, 0, 0},   // S_ZBRASSTORCH13
+    {SPR_SUIT, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSUITOFARMOR
+    {SPR_SUIT, 0, 1, A_SoAExplode, S_NULL, 0, 0},       // S_ZSUITOFARMOR_X1
+    {SPR_SUIT, 1, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK1
+    {SPR_SUIT, 2, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK2
+    {SPR_SUIT, 3, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK3
+    {SPR_SUIT, 4, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK4
+    {SPR_SUIT, 5, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK5
+    {SPR_SUIT, 6, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK6
+    {SPR_SUIT, 7, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK7
+    {SPR_SUIT, 8, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK8
+    {SPR_SUIT, 9, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK9
+    {SPR_SUIT, 10, -1, NULL, S_NULL, 0, 0},     // S_ZARMORCHUNK10
+    {SPR_BBLL, 5, -1, NULL, S_NULL, 0, 0},      // S_ZBELL
+    {SPR_BBLL, 0, 4, A_BellReset1, S_ZBELL_X2, 0, 0},   // S_ZBELL_X1
+    {SPR_BBLL, 1, 4, NULL, S_ZBELL_X3, 0, 0},   // S_ZBELL_X2
+    {SPR_BBLL, 2, 4, NULL, S_ZBELL_X4, 0, 0},   // S_ZBELL_X3
+    {SPR_BBLL, 3, 5, A_Scream, S_ZBELL_X5, 0, 0},       // S_ZBELL_X4
+    {SPR_BBLL, 2, 4, NULL, S_ZBELL_X6, 0, 0},   // S_ZBELL_X5
+    {SPR_BBLL, 1, 4, NULL, S_ZBELL_X7, 0, 0},   // S_ZBELL_X6
+    {SPR_BBLL, 0, 3, NULL, S_ZBELL_X8, 0, 0},   // S_ZBELL_X7
+    {SPR_BBLL, 4, 4, NULL, S_ZBELL_X9, 0, 0},   // S_ZBELL_X8
+    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X10, 0, 0},  // S_ZBELL_X9
+    {SPR_BBLL, 6, 6, A_Scream, S_ZBELL_X11, 0, 0},      // S_ZBELL_X10
+    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X12, 0, 0},  // S_ZBELL_X11
+    {SPR_BBLL, 4, 4, NULL, S_ZBELL_X13, 0, 0},  // S_ZBELL_X12
+    {SPR_BBLL, 0, 4, NULL, S_ZBELL_X14, 0, 0},  // S_ZBELL_X13
+    {SPR_BBLL, 1, 5, NULL, S_ZBELL_X15, 0, 0},  // S_ZBELL_X14
+    {SPR_BBLL, 2, 5, NULL, S_ZBELL_X16, 0, 0},  // S_ZBELL_X15
+    {SPR_BBLL, 3, 6, A_Scream, S_ZBELL_X17, 0, 0},      // S_ZBELL_X16
+    {SPR_BBLL, 2, 5, NULL, S_ZBELL_X18, 0, 0},  // S_ZBELL_X17
+    {SPR_BBLL, 1, 5, NULL, S_ZBELL_X19, 0, 0},  // S_ZBELL_X18
+    {SPR_BBLL, 0, 4, NULL, S_ZBELL_X20, 0, 0},  // S_ZBELL_X19
+    {SPR_BBLL, 4, 5, NULL, S_ZBELL_X21, 0, 0},  // S_ZBELL_X20
+    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X22, 0, 0},  // S_ZBELL_X21
+    {SPR_BBLL, 6, 7, A_Scream, S_ZBELL_X23, 0, 0},      // S_ZBELL_X22
+    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X24, 0, 0},  // S_ZBELL_X23
+    {SPR_BBLL, 4, 5, NULL, S_ZBELL_X25, 0, 0},  // S_ZBELL_X24
+    {SPR_BBLL, 0, 5, NULL, S_ZBELL_X26, 0, 0},  // S_ZBELL_X25
+    {SPR_BBLL, 1, 6, NULL, S_ZBELL_X27, 0, 0},  // S_ZBELL_X26
+    {SPR_BBLL, 2, 6, NULL, S_ZBELL_X28, 0, 0},  // S_ZBELL_X27
+    {SPR_BBLL, 3, 7, A_Scream, S_ZBELL_X29, 0, 0},      // S_ZBELL_X28
+    {SPR_BBLL, 2, 6, NULL, S_ZBELL_X30, 0, 0},  // S_ZBELL_X29
+    {SPR_BBLL, 1, 6, NULL, S_ZBELL_X31, 0, 0},  // S_ZBELL_X30
+    {SPR_BBLL, 0, 5, NULL, S_ZBELL_X32, 0, 0},  // S_ZBELL_X31
+    {SPR_BBLL, 4, 6, NULL, S_ZBELL_X33, 0, 0},  // S_ZBELL_X32
+    {SPR_BBLL, 5, 6, NULL, S_ZBELL_X34, 0, 0},  // S_ZBELL_X33
+    {SPR_BBLL, 6, 7, A_Scream, S_ZBELL_X35, 0, 0},      // S_ZBELL_X34
+    {SPR_BBLL, 5, 6, NULL, S_ZBELL_X36, 0, 0},  // S_ZBELL_X35
+    {SPR_BBLL, 4, 6, NULL, S_ZBELL_X37, 0, 0},  // S_ZBELL_X36
+    {SPR_BBLL, 0, 6, NULL, S_ZBELL_X38, 0, 0},  // S_ZBELL_X37
+    {SPR_BBLL, 1, 6, NULL, S_ZBELL_X39, 0, 0},  // S_ZBELL_X38
+    {SPR_BBLL, 2, 6, NULL, S_ZBELL_X40, 0, 0},  // S_ZBELL_X39
+    {SPR_BBLL, 1, 7, NULL, S_ZBELL_X41, 0, 0},  // S_ZBELL_X40
+    {SPR_BBLL, 0, 8, NULL, S_ZBELL_X42, 0, 0},  // S_ZBELL_X41
+    {SPR_BBLL, 4, 12, NULL, S_ZBELL_X43, 0, 0}, // S_ZBELL_X42
+    {SPR_BBLL, 0, 10, NULL, S_ZBELL_X44, 0, 0}, // S_ZBELL_X43
+    {SPR_BBLL, 1, 12, NULL, S_ZBELL_X45, 0, 0}, // S_ZBELL_X44
+    {SPR_BBLL, 0, 12, NULL, S_ZBELL_X46, 0, 0}, // S_ZBELL_X45
+    {SPR_BBLL, 4, 14, NULL, S_ZBELL_X47, 0, 0}, // S_ZBELL_X46
+    {SPR_BBLL, 0, 1, A_BellReset2, S_ZBELL, 0, 0},      // S_ZBELL_X47
+    {SPR_CAND, 32768, 5, NULL, S_ZBLUE_CANDLE2, 0, 0},  // S_ZBLUE_CANDLE1
+    {SPR_CAND, 32769, 5, NULL, S_ZBLUE_CANDLE3, 0, 0},  // S_ZBLUE_CANDLE2
+    {SPR_CAND, 32770, 5, NULL, S_ZBLUE_CANDLE4, 0, 0},  // S_ZBLUE_CANDLE3
+    {SPR_CAND, 32771, 5, NULL, S_ZBLUE_CANDLE5, 0, 0},  // S_ZBLUE_CANDLE4
+    {SPR_CAND, 32772, 5, NULL, S_ZBLUE_CANDLE1, 0, 0},  // S_ZBLUE_CANDLE5
+    {SPR_IRON, 0, -1, NULL, S_NULL, 0, 0},      // S_ZIRON_MAIDEN
+    {SPR_XMAS, 0, -1, NULL, S_NULL, 0, 0},      // S_ZXMAS_TREE
+    {SPR_XMAS, 0, 4, A_TreeDeath, S_ZXMAS_TREE, 0, 0},  // S_ZXMAS_TREE_DIE
+    {SPR_XMAS, 32769, 6, NULL, S_ZXMAS_TREE_X2, 0, 0},  // S_ZXMAS_TREE_X1
+    {SPR_XMAS, 32770, 6, A_Scream, S_ZXMAS_TREE_X3, 0, 0},      // S_ZXMAS_TREE_X2
+    {SPR_XMAS, 32771, 5, NULL, S_ZXMAS_TREE_X4, 0, 0},  // S_ZXMAS_TREE_X3
+    {SPR_XMAS, 32772, 5, A_Explode, S_ZXMAS_TREE_X5, 0, 0},     // S_ZXMAS_TREE_X4
+    {SPR_XMAS, 32773, 5, NULL, S_ZXMAS_TREE_X6, 0, 0},  // S_ZXMAS_TREE_X5
+    {SPR_XMAS, 32774, 4, NULL, S_ZXMAS_TREE_X7, 0, 0},  // S_ZXMAS_TREE_X6
+    {SPR_XMAS, 7, 5, NULL, S_ZXMAS_TREE_X8, 0, 0},      // S_ZXMAS_TREE_X7
+    {SPR_XMAS, 8, 4, A_NoBlocking, S_ZXMAS_TREE_X9, 0, 0},      // S_ZXMAS_TREE_X8
+    {SPR_XMAS, 9, 4, NULL, S_ZXMAS_TREE_X10, 0, 0},     // S_ZXMAS_TREE_X9
+    {SPR_XMAS, 10, -1, NULL, S_NULL, 0, 0},     // S_ZXMAS_TREE_X10
+    {SPR_CDRN, 32769, 4, NULL, S_ZCAULDRON2, 0, 0},     // S_ZCAULDRON1
+    {SPR_CDRN, 32770, 4, NULL, S_ZCAULDRON3, 0, 0},     // S_ZCAULDRON2
+    {SPR_CDRN, 32771, 4, NULL, S_ZCAULDRON4, 0, 0},     // S_ZCAULDRON3
+    {SPR_CDRN, 32772, 4, NULL, S_ZCAULDRON5, 0, 0},     // S_ZCAULDRON4
+    {SPR_CDRN, 32773, 4, NULL, S_ZCAULDRON6, 0, 0},     // S_ZCAULDRON5
+    {SPR_CDRN, 32774, 4, NULL, S_ZCAULDRON7, 0, 0},     // S_ZCAULDRON6
+    {SPR_CDRN, 32775, 4, NULL, S_ZCAULDRON1, 0, 0},     // S_ZCAULDRON7
+    {SPR_CDRN, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCAULDRON_U
+    {SPR_CHNS, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINBIT32
+    {SPR_CHNS, 1, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINBIT64
+    {SPR_CHNS, 2, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_HEART
+    {SPR_CHNS, 3, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_HOOK1
+    {SPR_CHNS, 4, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_HOOK2
+    {SPR_CHNS, 5, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_SPIKE
+    {SPR_CHNS, 6, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_SKULL
+    {SPR_TST1, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT1
+    {SPR_TST2, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT2
+    {SPR_TST3, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT3
+    {SPR_TST4, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT4
+    {SPR_TST5, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT5
+    {SPR_TST6, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT6
+    {SPR_TST7, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT7
+    {SPR_TST8, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT8
+    {SPR_TST9, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT9
+    {SPR_TST0, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT10
+    {SPR_TELE, 32768, 6, NULL, S_TFOG2, 0, 0},  // S_TFOG1
+    {SPR_TELE, 32769, 6, NULL, S_TFOG3, 0, 0},  // S_TFOG2
+    {SPR_TELE, 32770, 6, NULL, S_TFOG4, 0, 0},  // S_TFOG3
+    {SPR_TELE, 32771, 6, NULL, S_TFOG5, 0, 0},  // S_TFOG4
+    {SPR_TELE, 32772, 6, NULL, S_TFOG6, 0, 0},  // S_TFOG5
+    {SPR_TELE, 32773, 6, NULL, S_TFOG7, 0, 0},  // S_TFOG6
+    {SPR_TELE, 32774, 6, NULL, S_TFOG8, 0, 0},  // S_TFOG7
+    {SPR_TELE, 32775, 6, NULL, S_TFOG9, 0, 0},  // S_TFOG8
+    {SPR_TELE, 32774, 6, NULL, S_TFOG10, 0, 0}, // S_TFOG9
+    {SPR_TELE, 32773, 6, NULL, S_TFOG11, 0, 0}, // S_TFOG10
+    {SPR_TELE, 32772, 6, NULL, S_TFOG12, 0, 0}, // S_TFOG11
+    {SPR_TELE, 32771, 6, NULL, S_TFOG13, 0, 0}, // S_TFOG12
+    {SPR_TELE, 32770, 6, NULL, S_NULL, 0, 0},   // S_TFOG13
+    {SPR_TSMK, 0, 4, NULL, S_TELESMOKE2, 0, 0}, // S_TELESMOKE1
+    {SPR_TSMK, 1, 3, NULL, S_TELESMOKE3, 0, 0}, // S_TELESMOKE2
+    {SPR_TSMK, 2, 4, NULL, S_TELESMOKE4, 0, 0}, // S_TELESMOKE3
+    {SPR_TSMK, 3, 3, NULL, S_TELESMOKE5, 0, 0}, // S_TELESMOKE4
+    {SPR_TSMK, 4, 4, NULL, S_TELESMOKE6, 0, 0}, // S_TELESMOKE5
+    {SPR_TSMK, 5, 3, NULL, S_TELESMOKE7, 0, 0}, // S_TELESMOKE6
+    {SPR_TSMK, 6, 4, NULL, S_TELESMOKE8, 0, 0}, // S_TELESMOKE7
+    {SPR_TSMK, 7, 3, NULL, S_TELESMOKE9, 0, 0}, // S_TELESMOKE8
+    {SPR_TSMK, 8, 4, NULL, S_TELESMOKE10, 0, 0},        // S_TELESMOKE9
+    {SPR_TSMK, 9, 3, NULL, S_TELESMOKE11, 0, 0},        // S_TELESMOKE10
+    {SPR_TSMK, 10, 4, NULL, S_TELESMOKE12, 0, 0},       // S_TELESMOKE11
+    {SPR_TSMK, 11, 3, NULL, S_TELESMOKE13, 0, 0},       // S_TELESMOKE12
+    {SPR_TSMK, 12, 4, NULL, S_TELESMOKE14, 0, 0},       // S_TELESMOKE13
+    {SPR_TSMK, 13, 3, NULL, S_TELESMOKE15, 0, 0},       // S_TELESMOKE14
+    {SPR_TSMK, 14, 4, NULL, S_TELESMOKE16, 0, 0},       // S_TELESMOKE15
+    {SPR_TSMK, 15, 3, NULL, S_TELESMOKE17, 0, 0},       // S_TELESMOKE16
+    {SPR_TSMK, 16, 4, NULL, S_TELESMOKE18, 0, 0},       // S_TELESMOKE17
+    {SPR_TSMK, 17, 3, NULL, S_TELESMOKE19, 0, 0},       // S_TELESMOKE18
+    {SPR_TSMK, 18, 4, NULL, S_TELESMOKE20, 0, 0},       // S_TELESMOKE19
+    {SPR_TSMK, 19, 3, NULL, S_TELESMOKE21, 0, 0},       // S_TELESMOKE20
+    {SPR_TSMK, 20, 4, NULL, S_TELESMOKE22, 0, 0},       // S_TELESMOKE21
+    {SPR_TSMK, 21, 3, NULL, S_TELESMOKE23, 0, 0},       // S_TELESMOKE22
+    {SPR_TSMK, 22, 4, NULL, S_TELESMOKE24, 0, 0},       // S_TELESMOKE23
+    {SPR_TSMK, 23, 3, NULL, S_TELESMOKE25, 0, 0},       // S_TELESMOKE24
+    {SPR_TSMK, 24, 4, NULL, S_TELESMOKE26, 0, 0},       // S_TELESMOKE25
+    {SPR_TSMK, 25, 3, NULL, S_TELESMOKE1, 0, 0},        // S_TELESMOKE26
+    {SPR_FPCH, 0, 0, A_Light0, S_NULL, 0, 0},   // S_LIGHTDONE
+    {SPR_FPCH, 0, 1, A_WeaponReady, S_PUNCHREADY, 0, 0},        // S_PUNCHREADY
+    {SPR_FPCH, 0, 1, A_Lower, S_PUNCHDOWN, 0, 0},       // S_PUNCHDOWN
+    {SPR_FPCH, 0, 1, A_Raise, S_PUNCHUP, 0, 0}, // S_PUNCHUP
+    {SPR_FPCH, 1, 5, NULL, S_PUNCHATK1_2, 5, 40},       // S_PUNCHATK1_1
+    {SPR_FPCH, 2, 4, NULL, S_PUNCHATK1_3, 5, 40},       // S_PUNCHATK1_2
+    {SPR_FPCH, 3, 4, A_FPunchAttack, S_PUNCHATK1_4, 5, 40},     // S_PUNCHATK1_3
+    {SPR_FPCH, 2, 4, NULL, S_PUNCHATK1_5, 5, 40},       // S_PUNCHATK1_4
+    {SPR_FPCH, 1, 5, A_ReFire, S_PUNCHREADY, 5, 40},    // S_PUNCHATK1_5
+    {SPR_FPCH, 3, 4, NULL, S_PUNCHATK2_2, 5, 40},       // S_PUNCHATK2_1
+    {SPR_FPCH, 4, 4, NULL, S_PUNCHATK2_3, 5, 40},       // S_PUNCHATK2_2
+    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_4, 15, 50},      // S_PUNCHATK2_3
+    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_5, 25, 60},      // S_PUNCHATK2_4
+    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_6, 35, 70},      // S_PUNCHATK2_5
+    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_7, 45, 80},      // S_PUNCHATK2_6
+    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_8, 55, 90},      // S_PUNCHATK2_7
+    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_9, 65, 100},     // S_PUNCHATK2_8
+    {SPR_FPCH, 4, 10, NULL, S_PUNCHREADY, 0, 150},      // S_PUNCHATK2_9
+    {SPR_FHFX, 18, 4, NULL, S_PUNCHPUFF2, 0, 0},        // S_PUNCHPUFF1
+    {SPR_FHFX, 19, 4, NULL, S_PUNCHPUFF3, 0, 0},        // S_PUNCHPUFF2
+    {SPR_FHFX, 20, 4, NULL, S_PUNCHPUFF4, 0, 0},        // S_PUNCHPUFF3
+    {SPR_FHFX, 21, 4, NULL, S_PUNCHPUFF5, 0, 0},        // S_PUNCHPUFF4
+    {SPR_FHFX, 22, 4, NULL, S_NULL, 0, 0},      // S_PUNCHPUFF5
+    {SPR_WFAX, 0, -1, NULL, S_NULL, 0, 0},      // S_AXE
+    {SPR_FAXE, 0, 1, A_WeaponReady, S_FAXEREADY, 0, 0}, // S_FAXEREADY
+    {SPR_FAXE, 0, 1, A_Lower, S_FAXEDOWN, 0, 0},        // S_FAXEDOWN
+    {SPR_FAXE, 0, 1, A_Raise, S_FAXEUP, 0, 0},  // S_FAXEUP
+    {SPR_FAXE, 1, 4, NULL, S_FAXEATK_2, 15, 32},        // S_FAXEATK_1
+    {SPR_FAXE, 2, 3, NULL, S_FAXEATK_3, 15, 32},        // S_FAXEATK_2
+    {SPR_FAXE, 3, 2, NULL, S_FAXEATK_4, 15, 32},        // S_FAXEATK_3
+    {SPR_FAXE, 3, 1, A_FAxeAttack, S_FAXEATK_5, -5, 70},        // S_FAXEATK_4
+    {SPR_FAXE, 3, 2, NULL, S_FAXEATK_6, -25, 90},       // S_FAXEATK_5
+    {SPR_FAXE, 4, 1, NULL, S_FAXEATK_7, 15, 32},        // S_FAXEATK_6
+    {SPR_FAXE, 4, 2, NULL, S_FAXEATK_8, 10, 54},        // S_FAXEATK_7
+    {SPR_FAXE, 4, 7, NULL, S_FAXEATK_9, 10, 150},       // S_FAXEATK_8
+    {SPR_FAXE, 0, 1, A_ReFire, S_FAXEATK_10, 0, 60},    // S_FAXEATK_9
+    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_11, 0, 52},        // S_FAXEATK_10
+    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_12, 0, 44},        // S_FAXEATK_11
+    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_13, 0, 36},        // S_FAXEATK_12
+    {SPR_FAXE, 0, 1, NULL, S_FAXEREADY, 0, 0},  // S_FAXEATK_13
+    {SPR_FAXE, 11, 1, A_WeaponReady, S_FAXEREADY_G1, 0, 0},     // S_FAXEREADY_G
+    {SPR_FAXE, 11, 1, A_WeaponReady, S_FAXEREADY_G2, 0, 0},     // S_FAXEREADY_G1
+    {SPR_FAXE, 11, 1, A_WeaponReady, S_FAXEREADY_G3, 0, 0},     // S_FAXEREADY_G2
+    {SPR_FAXE, 12, 1, A_WeaponReady, S_FAXEREADY_G4, 0, 0},     // S_FAXEREADY_G3
+    {SPR_FAXE, 12, 1, A_WeaponReady, S_FAXEREADY_G5, 0, 0},     // S_FAXEREADY_G4
+    {SPR_FAXE, 12, 1, A_WeaponReady, S_FAXEREADY_G, 0, 0},      // S_FAXEREADY_G5
+    {SPR_FAXE, 11, 1, A_Lower, S_FAXEDOWN_G, 0, 0},     // S_FAXEDOWN_G
+    {SPR_FAXE, 11, 1, A_Raise, S_FAXEUP_G, 0, 0},       // S_FAXEUP_G
+    {SPR_FAXE, 13, 4, NULL, S_FAXEATK_G2, 15, 32},      // S_FAXEATK_G1
+    {SPR_FAXE, 14, 3, NULL, S_FAXEATK_G3, 15, 32},      // S_FAXEATK_G2
+    {SPR_FAXE, 15, 2, NULL, S_FAXEATK_G4, 15, 32},      // S_FAXEATK_G3
+    {SPR_FAXE, 15, 1, A_FAxeAttack, S_FAXEATK_G5, -5, 70},      // S_FAXEATK_G4
+    {SPR_FAXE, 15, 2, NULL, S_FAXEATK_G6, -25, 90},     // S_FAXEATK_G5
+    {SPR_FAXE, 16, 1, NULL, S_FAXEATK_G7, 15, 32},      // S_FAXEATK_G6
+    {SPR_FAXE, 16, 2, NULL, S_FAXEATK_G8, 10, 54},      // S_FAXEATK_G7
+    {SPR_FAXE, 16, 7, NULL, S_FAXEATK_G9, 10, 150},     // S_FAXEATK_G8
+    {SPR_FAXE, 0, 1, A_ReFire, S_FAXEATK_G10, 0, 60},   // S_FAXEATK_G9
+    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_G11, 0, 52},       // S_FAXEATK_G10
+    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_G12, 0, 44},       // S_FAXEATK_G11
+    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_G13, 0, 36},       // S_FAXEATK_G12
+    {SPR_FAXE, 0, 1, NULL, S_FAXEREADY_G, 0, 0},        // S_FAXEATK_G13
+    {SPR_FAXE, 32785, 4, NULL, S_AXEPUFF_GLOW2, 0, 0},  // S_AXEPUFF_GLOW1
+    {SPR_FAXE, 32786, 4, NULL, S_AXEPUFF_GLOW3, 0, 0},  // S_AXEPUFF_GLOW2
+    {SPR_FAXE, 32787, 4, NULL, S_AXEPUFF_GLOW4, 0, 0},  // S_AXEPUFF_GLOW3
+    {SPR_FAXE, 32788, 4, NULL, S_AXEPUFF_GLOW5, 0, 0},  // S_AXEPUFF_GLOW4
+    {SPR_FAXE, 32789, 4, NULL, S_AXEPUFF_GLOW6, 0, 0},  // S_AXEPUFF_GLOW5
+    {SPR_FAXE, 32790, 4, NULL, S_AXEPUFF_GLOW7, 0, 0},  // S_AXEPUFF_GLOW6
+    {SPR_FAXE, 32791, 4, NULL, S_NULL, 0, 0},   // S_AXEPUFF_GLOW7
+    {SPR_FAXE, 5, 3, NULL, S_AXEBLOOD2, 0, 0},  // S_AXEBLOOD1
+    {SPR_FAXE, 6, 3, NULL, S_AXEBLOOD3, 0, 0},  // S_AXEBLOOD2
+    {SPR_FAXE, 7, 3, NULL, S_AXEBLOOD4, 0, 0},  // S_AXEBLOOD3
+    {SPR_FAXE, 8, 3, NULL, S_AXEBLOOD5, 0, 0},  // S_AXEBLOOD4
+    {SPR_FAXE, 9, 3, NULL, S_AXEBLOOD6, 0, 0},  // S_AXEBLOOD5
+    {SPR_FAXE, 10, 3, NULL, S_NULL, 0, 0},      // S_AXEBLOOD6
+    {SPR_WFHM, 0, -1, NULL, S_NULL, 0, 0},      // S_HAMM
+    {SPR_FHMR, 0, 1, A_WeaponReady, S_FHAMMERREADY, 0, 0},      // S_FHAMMERREADY
+    {SPR_FHMR, 0, 1, A_Lower, S_FHAMMERDOWN, 0, 0},     // S_FHAMMERDOWN
+    {SPR_FHMR, 0, 1, A_Raise, S_FHAMMERUP, 0, 0},       // S_FHAMMERUP
+    {SPR_FHMR, 1, 6, NULL, S_FHAMMERATK_2, 5, 0},       // S_FHAMMERATK_1
+    {SPR_FHMR, 2, 3, A_FHammerAttack, S_FHAMMERATK_3, 5, 0},    // S_FHAMMERATK_2
+    {SPR_FHMR, 3, 3, NULL, S_FHAMMERATK_4, 5, 0},       // S_FHAMMERATK_3
+    {SPR_FHMR, 4, 2, NULL, S_FHAMMERATK_5, 5, 0},       // S_FHAMMERATK_4
+    {SPR_FHMR, 4, 10, A_FHammerThrow, S_FHAMMERATK_6, 5, 150},  // S_FHAMMERATK_5
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_7, 0, 60},      // S_FHAMMERATK_6
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_8, 0, 55},      // S_FHAMMERATK_7
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_9, 0, 50},      // S_FHAMMERATK_8
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_10, 0, 45},     // S_FHAMMERATK_9
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_11, 0, 40},     // S_FHAMMERATK_10
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_12, 0, 35},     // S_FHAMMERATK_11
+    {SPR_FHMR, 0, 1, NULL, S_FHAMMERREADY, 0, 0},       // S_FHAMMERATK_12
+    {SPR_FHFX, 32768, 2, NULL, S_HAMMER_MISSILE_2, 0, 0},       // S_HAMMER_MISSILE_1
+    {SPR_FHFX, 32769, 2, A_ContMobjSound, S_HAMMER_MISSILE_3, 0, 0},    // S_HAMMER_MISSILE_2
+    {SPR_FHFX, 32770, 2, NULL, S_HAMMER_MISSILE_4, 0, 0},       // S_HAMMER_MISSILE_3
+    {SPR_FHFX, 32771, 2, NULL, S_HAMMER_MISSILE_5, 0, 0},       // S_HAMMER_MISSILE_4
+    {SPR_FHFX, 32772, 2, NULL, S_HAMMER_MISSILE_6, 0, 0},       // S_HAMMER_MISSILE_5
+    {SPR_FHFX, 32773, 2, NULL, S_HAMMER_MISSILE_7, 0, 0},       // S_HAMMER_MISSILE_6
+    {SPR_FHFX, 32774, 2, NULL, S_HAMMER_MISSILE_8, 0, 0},       // S_HAMMER_MISSILE_7
+    {SPR_FHFX, 32775, 2, NULL, S_HAMMER_MISSILE_1, 0, 0},       // S_HAMMER_MISSILE_8
+    {SPR_FHFX, 32776, 3, NULL, S_HAMMER_MISSILE_X2, 0, 0},      // S_HAMMER_MISSILE_X1
+    {SPR_FHFX, 32777, 3, NULL, S_HAMMER_MISSILE_X3, 0, 0},      // S_HAMMER_MISSILE_X2
+    {SPR_FHFX, 32778, 3, A_Explode, S_HAMMER_MISSILE_X4, 0, 0}, // S_HAMMER_MISSILE_X3
+    {SPR_FHFX, 32779, 3, NULL, S_HAMMER_MISSILE_X5, 0, 0},      // S_HAMMER_MISSILE_X4
+    {SPR_FHFX, 32780, 3, NULL, S_HAMMER_MISSILE_X6, 0, 0},      // S_HAMMER_MISSILE_X5
+    {SPR_FHFX, 13, 3, NULL, S_HAMMER_MISSILE_X7, 0, 0}, // S_HAMMER_MISSILE_X6
+    {SPR_FHFX, 32782, 3, NULL, S_HAMMER_MISSILE_X8, 0, 0},      // S_HAMMER_MISSILE_X7
+    {SPR_FHFX, 32783, 3, NULL, S_HAMMER_MISSILE_X9, 0, 0},      // S_HAMMER_MISSILE_X8
+    {SPR_FHFX, 32784, 3, NULL, S_HAMMER_MISSILE_X10, 0, 0},     // S_HAMMER_MISSILE_X9
+    {SPR_FHFX, 32785, 3, NULL, S_NULL, 0, 0},   // S_HAMMER_MISSILE_X10
+    {SPR_FHFX, 18, 4, NULL, S_HAMMERPUFF2, 0, 0},       // S_HAMMERPUFF1
+    {SPR_FHFX, 19, 4, NULL, S_HAMMERPUFF3, 0, 0},       // S_HAMMERPUFF2
+    {SPR_FHFX, 20, 4, NULL, S_HAMMERPUFF4, 0, 0},       // S_HAMMERPUFF3
+    {SPR_FHFX, 21, 4, NULL, S_HAMMERPUFF5, 0, 0},       // S_HAMMERPUFF4
+    {SPR_FHFX, 22, 4, NULL, S_NULL, 0, 0},      // S_HAMMERPUFF5
+    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY1, 0, 0},  // S_FSWORDREADY
+    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY2, 0, 0},  // S_FSWORDREADY1
+    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY3, 0, 0},  // S_FSWORDREADY2
+    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY4, 0, 0},  // S_FSWORDREADY3
+    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY5, 0, 0},  // S_FSWORDREADY4
+    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY6, 0, 0},  // S_FSWORDREADY5
+    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY7, 0, 0},  // S_FSWORDREADY6
+    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY8, 0, 0},  // S_FSWORDREADY7
+    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY9, 0, 0},  // S_FSWORDREADY8
+    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY10, 0, 0}, // S_FSWORDREADY9
+    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY11, 0, 0}, // S_FSWORDREADY10
+    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY, 0, 0},   // S_FSWORDREADY11
+    {SPR_FSRD, 32768, 1, A_Lower, S_FSWORDDOWN, 0, 0},  // S_FSWORDDOWN
+    {SPR_FSRD, 32768, 1, A_Raise, S_FSWORDUP, 0, 0},    // S_FSWORDUP
+    {SPR_FSRD, 32771, 3, NULL, S_FSWORDATK_2, 5, 36},   // S_FSWORDATK_1
+    {SPR_FSRD, 32772, 3, NULL, S_FSWORDATK_3, 5, 36},   // S_FSWORDATK_2
+    {SPR_FSRD, 32773, 2, NULL, S_FSWORDATK_4, 5, 36},   // S_FSWORDATK_3
+    {SPR_FSRD, 32774, 3, A_FSwordAttack, S_FSWORDATK_5, 5, 36}, // S_FSWORDATK_4
+    {SPR_FSRD, 32775, 2, NULL, S_FSWORDATK_6, 5, 36},   // S_FSWORDATK_5
+    {SPR_FSRD, 32776, 2, NULL, S_FSWORDATK_7, 5, 36},   // S_FSWORDATK_6
+    {SPR_FSRD, 32776, 10, NULL, S_FSWORDATK_8, 5, 150}, // S_FSWORDATK_7
+    {SPR_FSRD, 32768, 1, NULL, S_FSWORDATK_9, 5, 60},   // S_FSWORDATK_8
+    {SPR_FSRD, 32769, 1, NULL, S_FSWORDATK_10, 5, 55},  // S_FSWORDATK_9
+    {SPR_FSRD, 32770, 1, NULL, S_FSWORDATK_11, 5, 50},  // S_FSWORDATK_10
+    {SPR_FSRD, 32768, 1, NULL, S_FSWORDATK_12, 5, 45},  // S_FSWORDATK_11
+    {SPR_FSRD, 32769, 1, NULL, S_FSWORDREADY, 5, 40},   // S_FSWORDATK_12
+    {SPR_FSFX, 32768, 3, NULL, S_FSWORD_MISSILE2, 0, 0},        // S_FSWORD_MISSILE1
+    {SPR_FSFX, 32769, 3, NULL, S_FSWORD_MISSILE3, 0, 0},        // S_FSWORD_MISSILE2
+    {SPR_FSFX, 32770, 3, NULL, S_FSWORD_MISSILE1, 0, 0},        // S_FSWORD_MISSILE3
+    {SPR_FSFX, 32771, 4, NULL, S_FSWORD_MISSILE_X2, 0, 0},      // S_FSWORD_MISSILE_X1
+    {SPR_FSFX, 32772, 3, A_FSwordFlames, S_FSWORD_MISSILE_X3, 0, 0},    // S_FSWORD_MISSILE_X2
+    {SPR_FSFX, 32773, 4, A_Explode, S_FSWORD_MISSILE_X4, 0, 0}, // S_FSWORD_MISSILE_X3
+    {SPR_FSFX, 32774, 3, NULL, S_FSWORD_MISSILE_X5, 0, 0},      // S_FSWORD_MISSILE_X4
+    {SPR_FSFX, 32775, 4, NULL, S_FSWORD_MISSILE_X6, 0, 0},      // S_FSWORD_MISSILE_X5
+    {SPR_FSFX, 32776, 3, NULL, S_FSWORD_MISSILE_X7, 0, 0},      // S_FSWORD_MISSILE_X6
+    {SPR_FSFX, 32777, 4, NULL, S_FSWORD_MISSILE_X8, 0, 0},      // S_FSWORD_MISSILE_X7
+    {SPR_FSFX, 32778, 3, NULL, S_FSWORD_MISSILE_X9, 0, 0},      // S_FSWORD_MISSILE_X8
+    {SPR_FSFX, 32779, 3, NULL, S_FSWORD_MISSILE_X10, 0, 0},     // S_FSWORD_MISSILE_X9
+    {SPR_FSFX, 32780, 3, NULL, S_NULL, 0, 0},   // S_FSWORD_MISSILE_X10
+    {SPR_FSFX, 32781, 3, NULL, S_FSWORD_FLAME2, 0, 0},  // S_FSWORD_FLAME1
+    {SPR_FSFX, 32782, 3, NULL, S_FSWORD_FLAME3, 0, 0},  // S_FSWORD_FLAME2
+    {SPR_FSFX, 32783, 3, NULL, S_FSWORD_FLAME4, 0, 0},  // S_FSWORD_FLAME3
+    {SPR_FSFX, 32784, 3, NULL, S_FSWORD_FLAME5, 0, 0},  // S_FSWORD_FLAME4
+    {SPR_FSFX, 32785, 3, NULL, S_FSWORD_FLAME6, 0, 0},  // S_FSWORD_FLAME5
+    {SPR_FSFX, 32786, 3, NULL, S_FSWORD_FLAME7, 0, 0},  // S_FSWORD_FLAME6
+    {SPR_FSFX, 32787, 3, NULL, S_FSWORD_FLAME8, 0, 0},  // S_FSWORD_FLAME7
+    {SPR_FSFX, 32788, 3, NULL, S_FSWORD_FLAME9, 0, 0},  // S_FSWORD_FLAME8
+    {SPR_FSFX, 32789, 3, NULL, S_FSWORD_FLAME10, 0, 0}, // S_FSWORD_FLAME9
+    {SPR_FSFX, 32790, 3, NULL, S_NULL, 0, 0},   // S_FSWORD_FLAME10
+    {SPR_CMCE, 0, 1, A_WeaponReady, S_CMACEREADY, 0, 0},        // S_CMACEREADY
+    {SPR_CMCE, 0, 1, A_Lower, S_CMACEDOWN, 0, 0},       // S_CMACEDOWN
+    {SPR_CMCE, 0, 1, A_Raise, S_CMACEUP, 0, 0}, // S_CMACEUP
+    {SPR_CMCE, 1, 2, NULL, S_CMACEATK_2, 60, 20},       // S_CMACEATK_1
+    {SPR_CMCE, 1, 1, NULL, S_CMACEATK_3, 30, 33},       // S_CMACEATK_2
+    {SPR_CMCE, 1, 2, NULL, S_CMACEATK_4, 8, 45},        // S_CMACEATK_3
+    {SPR_CMCE, 2, 1, NULL, S_CMACEATK_5, 8, 45},        // S_CMACEATK_4
+    {SPR_CMCE, 3, 1, NULL, S_CMACEATK_6, 8, 45},        // S_CMACEATK_5
+    {SPR_CMCE, 4, 1, NULL, S_CMACEATK_7, 8, 45},        // S_CMACEATK_6
+    {SPR_CMCE, 4, 1, A_CMaceAttack, S_CMACEATK_8, -11, 58},     // S_CMACEATK_7
+    {SPR_CMCE, 5, 1, NULL, S_CMACEATK_9, 8, 45},        // S_CMACEATK_8
+    {SPR_CMCE, 5, 2, NULL, S_CMACEATK_10, -8, 74},      // S_CMACEATK_9
+    {SPR_CMCE, 5, 1, NULL, S_CMACEATK_11, -20, 96},     // S_CMACEATK_10
+    {SPR_CMCE, 5, 8, NULL, S_CMACEATK_12, -33, 160},    // S_CMACEATK_11
+    {SPR_CMCE, 0, 2, A_ReFire, S_CMACEATK_13, 8, 75},   // S_CMACEATK_12
+    {SPR_CMCE, 0, 1, NULL, S_CMACEATK_14, 8, 65},       // S_CMACEATK_13
+    {SPR_CMCE, 0, 2, NULL, S_CMACEATK_15, 8, 60},       // S_CMACEATK_14
+    {SPR_CMCE, 0, 1, NULL, S_CMACEATK_16, 8, 55},       // S_CMACEATK_15
+    {SPR_CMCE, 0, 2, NULL, S_CMACEATK_17, 8, 50},       // S_CMACEATK_16
+    {SPR_CMCE, 0, 1, NULL, S_CMACEREADY, 8, 45},        // S_CMACEATK_17
+    {SPR_WCSS, 0, -1, NULL, S_NULL, 0, 0},      // S_CSTAFF
+    {SPR_CSSF, 2, 4, NULL, S_CSTAFFREADY1, 0, 0},       // S_CSTAFFREADY
+    {SPR_CSSF, 1, 3, A_CStaffInitBlink, S_CSTAFFREADY2, 0, 0},  // S_CSTAFFREADY1
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY3, 0, 0},      // S_CSTAFFREADY2
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY4, 0, 0},      // S_CSTAFFREADY3
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY5, 0, 0},      // S_CSTAFFREADY4
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY6, 0, 0},      // S_CSTAFFREADY5
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY7, 0, 0},      // S_CSTAFFREADY6
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY8, 0, 0},      // S_CSTAFFREADY7
+    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY9, 0, 0},      // S_CSTAFFREADY8
+    {SPR_CSSF, 0, 1, A_CStaffCheckBlink, S_CSTAFFREADY2, 0, 0}, // S_CSTAFFREADY9
+    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK2, 0, 0},      // S_CSTAFFBLINK1
+    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK3, 0, 0},      // S_CSTAFFBLINK2
+    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK4, 0, 0},      // S_CSTAFFBLINK3
+    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK5, 0, 0},      // S_CSTAFFBLINK4
+    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK6, 0, 0},      // S_CSTAFFBLINK5
+    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK7, 0, 0},      // S_CSTAFFBLINK6
+    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK8, 0, 0},      // S_CSTAFFBLINK7
+    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK9, 0, 0},      // S_CSTAFFBLINK8
+    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK10, 0, 0},     // S_CSTAFFBLINK9
+    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK11, 0, 0},     // S_CSTAFFBLINK10
+    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFREADY2, 0, 0},      // S_CSTAFFBLINK11
+    {SPR_CSSF, 1, 3, NULL, S_CSTAFFDOWN2, 0, 0},        // S_CSTAFFDOWN
+    {SPR_CSSF, 2, 4, NULL, S_CSTAFFDOWN3, 0, 0},        // S_CSTAFFDOWN2
+    {SPR_CSSF, 2, 1, A_Lower, S_CSTAFFDOWN3, 0, 0},     // S_CSTAFFDOWN3
+    {SPR_CSSF, 2, 1, A_Raise, S_CSTAFFUP, 0, 0},        // S_CSTAFFUP
+    {SPR_CSSF, 0, 1, A_CStaffCheck, S_CSTAFFATK_2, 0, 45},      // S_CSTAFFATK_1
+    {SPR_CSSF, 9, 1, A_CStaffAttack, S_CSTAFFATK_3, 0, 50},     // S_CSTAFFATK_2
+    {SPR_CSSF, 9, 2, NULL, S_CSTAFFATK_4, 0, 50},       // S_CSTAFFATK_3
+    {SPR_CSSF, 9, 2, NULL, S_CSTAFFATK_5, 0, 45},       // S_CSTAFFATK_4
+    {SPR_CSSF, 0, 2, NULL, S_CSTAFFATK_6, 0, 40},       // S_CSTAFFATK_5
+    {SPR_CSSF, 0, 2, NULL, S_CSTAFFREADY2, 0, 36},      // S_CSTAFFATK_6
+    {SPR_CSSF, 10, 10, NULL, S_CSTAFFREADY2, 0, 36},    // S_CSTAFFATK2_1
+    {SPR_CSSF, 32771, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE2, 0, 0},      // S_CSTAFF_MISSILE1
+    {SPR_CSSF, 32771, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE3, 0, 0},      // S_CSTAFF_MISSILE2
+    {SPR_CSSF, 32772, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE4, 0, 0},      // S_CSTAFF_MISSILE3
+    {SPR_CSSF, 32772, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE1, 0, 0},      // S_CSTAFF_MISSILE4
+    {SPR_CSSF, 32773, 4, NULL, S_CSTAFF_MISSILE_X2, 0, 0},      // S_CSTAFF_MISSILE_X1
+    {SPR_CSSF, 32774, 4, NULL, S_CSTAFF_MISSILE_X3, 0, 0},      // S_CSTAFF_MISSILE_X2
+    {SPR_CSSF, 32775, 3, NULL, S_CSTAFF_MISSILE_X4, 0, 0},      // S_CSTAFF_MISSILE_X3
+    {SPR_CSSF, 32776, 3, NULL, S_NULL, 0, 0},   // S_CSTAFF_MISSILE_X4
+    {SPR_FHFX, 18, 4, NULL, S_CSTAFFPUFF2, 0, 0},       // S_CSTAFFPUFF1
+    {SPR_FHFX, 19, 4, NULL, S_CSTAFFPUFF3, 0, 0},       // S_CSTAFFPUFF2
+    {SPR_FHFX, 20, 4, NULL, S_CSTAFFPUFF4, 0, 0},       // S_CSTAFFPUFF3
+    {SPR_FHFX, 21, 4, NULL, S_CSTAFFPUFF5, 0, 0},       // S_CSTAFFPUFF4
+    {SPR_FHFX, 22, 4, NULL, S_NULL, 0, 0},      // S_CSTAFFPUFF5
+    {SPR_WCFM, 32768, 4, NULL, S_CFLAME2, 0, 0},        // S_CFLAME1
+    {SPR_WCFM, 32769, 4, NULL, S_CFLAME3, 0, 0},        // S_CFLAME2
+    {SPR_WCFM, 32770, 4, NULL, S_CFLAME4, 0, 0},        // S_CFLAME3
+    {SPR_WCFM, 32771, 4, NULL, S_CFLAME5, 0, 0},        // S_CFLAME4
+    {SPR_WCFM, 32772, 4, NULL, S_CFLAME6, 0, 0},        // S_CFLAME5
+    {SPR_WCFM, 32773, 4, NULL, S_CFLAME7, 0, 0},        // S_CFLAME6
+    {SPR_WCFM, 32774, 4, NULL, S_CFLAME8, 0, 0},        // S_CFLAME7
+    {SPR_WCFM, 32775, 4, NULL, S_CFLAME1, 0, 0},        // S_CFLAME8
+    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY2, 0, 0},      // S_CFLAMEREADY1
+    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY3, 0, 0},      // S_CFLAMEREADY2
+    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY4, 0, 0},      // S_CFLAMEREADY3
+    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY5, 0, 0},      // S_CFLAMEREADY4
+    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY6, 0, 0},      // S_CFLAMEREADY5
+    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY7, 0, 0},      // S_CFLAMEREADY6
+    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY8, 0, 0},      // S_CFLAMEREADY7
+    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY9, 0, 0},      // S_CFLAMEREADY8
+    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY10, 0, 0},     // S_CFLAMEREADY9
+    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY11, 0, 0},     // S_CFLAMEREADY10
+    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY12, 0, 0},     // S_CFLAMEREADY11
+    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY1, 0, 0},      // S_CFLAMEREADY12
+    {SPR_CFLM, 0, 1, A_Lower, S_CFLAMEDOWN, 0, 0},      // S_CFLAMEDOWN
+    {SPR_CFLM, 0, 1, A_Raise, S_CFLAMEUP, 0, 0},        // S_CFLAMEUP
+    {SPR_CFLM, 0, 2, NULL, S_CFLAMEATK_2, 0, 40},       // S_CFLAMEATK_1
+    {SPR_CFLM, 3, 2, NULL, S_CFLAMEATK_3, 0, 50},       // S_CFLAMEATK_2
+    {SPR_CFLM, 3, 2, NULL, S_CFLAMEATK_4, 0, 36},       // S_CFLAMEATK_3
+    {SPR_CFLM, 32772, 4, NULL, S_CFLAMEATK_5, 0, 0},    // S_CFLAMEATK_4
+    {SPR_CFLM, 32773, 4, A_CFlameAttack, S_CFLAMEATK_6, 0, 0},  // S_CFLAMEATK_5
+    {SPR_CFLM, 32772, 4, NULL, S_CFLAMEATK_7, 0, 0},    // S_CFLAMEATK_6
+    {SPR_CFLM, 6, 2, NULL, S_CFLAMEATK_8, 0, 40},       // S_CFLAMEATK_7
+    {SPR_CFLM, 6, 2, NULL, S_CFLAMEREADY1, 0, 0},       // S_CFLAMEATK_8
+    {SPR_CFFX, 32781, 5, NULL, S_CFLAMEFLOOR2, 0, 0},   // S_CFLAMEFLOOR1
+    {SPR_CFFX, 32782, 4, NULL, S_CFLAMEFLOOR3, 0, 0},   // S_CFLAMEFLOOR2
+    {SPR_CFFX, 32783, 3, NULL, S_NULL, 0, 0},   // S_CFLAMEFLOOR3
+    {SPR_CFFX, 32768, 3, NULL, S_FLAMEPUFF2, 0, 0},     // S_FLAMEPUFF1
+    {SPR_CFFX, 32769, 3, NULL, S_FLAMEPUFF3, 0, 0},     // S_FLAMEPUFF2
+    {SPR_CFFX, 32770, 3, NULL, S_FLAMEPUFF4, 0, 0},     // S_FLAMEPUFF3
+    {SPR_CFFX, 32771, 4, NULL, S_FLAMEPUFF5, 0, 0},     // S_FLAMEPUFF4
+    {SPR_CFFX, 32772, 3, NULL, S_FLAMEPUFF6, 0, 0},     // S_FLAMEPUFF5
+    {SPR_CFFX, 32773, 4, NULL, S_FLAMEPUFF7, 0, 0},     // S_FLAMEPUFF6
+    {SPR_CFFX, 32774, 3, NULL, S_FLAMEPUFF8, 0, 0},     // S_FLAMEPUFF7
+    {SPR_CFFX, 32775, 4, NULL, S_FLAMEPUFF9, 0, 0},     // S_FLAMEPUFF8
+    {SPR_CFFX, 32776, 3, NULL, S_FLAMEPUFF10, 0, 0},    // S_FLAMEPUFF9
+    {SPR_CFFX, 32777, 4, NULL, S_FLAMEPUFF11, 0, 0},    // S_FLAMEPUFF10
+    {SPR_CFFX, 32778, 3, NULL, S_FLAMEPUFF12, 0, 0},    // S_FLAMEPUFF11
+    {SPR_CFFX, 32779, 4, NULL, S_FLAMEPUFF13, 0, 0},    // S_FLAMEPUFF12
+    {SPR_CFFX, 32780, 3, NULL, S_NULL, 0, 0},   // S_FLAMEPUFF13
+    {SPR_CFFX, 32768, 3, NULL, S_FLAMEPUFF2_2, 0, 0},   // S_FLAMEPUFF2_1
+    {SPR_CFFX, 32769, 3, NULL, S_FLAMEPUFF2_3, 0, 0},   // S_FLAMEPUFF2_2
+    {SPR_CFFX, 32770, 3, NULL, S_FLAMEPUFF2_4, 0, 0},   // S_FLAMEPUFF2_3
+    {SPR_CFFX, 32771, 4, NULL, S_FLAMEPUFF2_5, 0, 0},   // S_FLAMEPUFF2_4
+    {SPR_CFFX, 32772, 3, NULL, S_FLAMEPUFF2_6, 0, 0},   // S_FLAMEPUFF2_5
+    {SPR_CFFX, 32773, 4, NULL, S_FLAMEPUFF2_7, 0, 0},   // S_FLAMEPUFF2_6
+    {SPR_CFFX, 32774, 3, NULL, S_FLAMEPUFF2_8, 0, 0},   // S_FLAMEPUFF2_7
+    {SPR_CFFX, 32775, 4, NULL, S_FLAMEPUFF2_9, 0, 0},   // S_FLAMEPUFF2_8
+    {SPR_CFFX, 32776, 3, NULL, S_FLAMEPUFF2_10, 0, 0},  // S_FLAMEPUFF2_9
+    {SPR_CFFX, 32770, 3, NULL, S_FLAMEPUFF2_11, 0, 0},  // S_FLAMEPUFF2_10
+    {SPR_CFFX, 32771, 4, NULL, S_FLAMEPUFF2_12, 0, 0},  // S_FLAMEPUFF2_11
+    {SPR_CFFX, 32772, 3, NULL, S_FLAMEPUFF2_13, 0, 0},  // S_FLAMEPUFF2_12
+    {SPR_CFFX, 32773, 4, NULL, S_FLAMEPUFF2_14, 0, 0},  // S_FLAMEPUFF2_13
+    {SPR_CFFX, 32774, 3, NULL, S_FLAMEPUFF2_15, 0, 0},  // S_FLAMEPUFF2_14
+    {SPR_CFFX, 32775, 4, NULL, S_FLAMEPUFF2_16, 0, 0},  // S_FLAMEPUFF2_15
+    {SPR_CFFX, 32776, 3, NULL, S_FLAMEPUFF2_17, 0, 0},  // S_FLAMEPUFF2_16
+    {SPR_CFFX, 32777, 4, NULL, S_FLAMEPUFF2_18, 0, 0},  // S_FLAMEPUFF2_17
+    {SPR_CFFX, 32778, 3, NULL, S_FLAMEPUFF2_19, 0, 0},  // S_FLAMEPUFF2_18
+    {SPR_CFFX, 32779, 4, NULL, S_FLAMEPUFF2_20, 0, 0},  // S_FLAMEPUFF2_19
+    {SPR_CFFX, 32780, 3, NULL, S_NULL, 0, 0},   // S_FLAMEPUFF2_20
+    {SPR_CFCF, 32768, 4, NULL, S_CIRCLE_FLAME2, 0, 0},  // S_CIRCLE_FLAME1
+    {SPR_CFCF, 32769, 2, A_CFlameRotate, S_CIRCLE_FLAME3, 0, 0},        // S_CIRCLE_FLAME2
+    {SPR_CFCF, 32770, 2, NULL, S_CIRCLE_FLAME4, 0, 0},  // S_CIRCLE_FLAME3
+    {SPR_CFCF, 32771, 1, NULL, S_CIRCLE_FLAME5, 0, 0},  // S_CIRCLE_FLAME4
+    {SPR_CFCF, 32772, 2, NULL, S_CIRCLE_FLAME6, 0, 0},  // S_CIRCLE_FLAME5
+    {SPR_CFCF, 32773, 2, A_CFlameRotate, S_CIRCLE_FLAME7, 0, 0},        // S_CIRCLE_FLAME6
+    {SPR_CFCF, 32774, 1, NULL, S_CIRCLE_FLAME8, 0, 0},  // S_CIRCLE_FLAME7
+    {SPR_CFCF, 32775, 2, NULL, S_CIRCLE_FLAME9, 0, 0},  // S_CIRCLE_FLAME8
+    {SPR_CFCF, 32776, 2, NULL, S_CIRCLE_FLAME10, 0, 0}, // S_CIRCLE_FLAME9
+    {SPR_CFCF, 32777, 1, A_CFlameRotate, S_CIRCLE_FLAME11, 0, 0},       // S_CIRCLE_FLAME10
+    {SPR_CFCF, 32778, 2, NULL, S_CIRCLE_FLAME12, 0, 0}, // S_CIRCLE_FLAME11
+    {SPR_CFCF, 32779, 3, NULL, S_CIRCLE_FLAME13, 0, 0}, // S_CIRCLE_FLAME12
+    {SPR_CFCF, 32780, 3, NULL, S_CIRCLE_FLAME14, 0, 0}, // S_CIRCLE_FLAME13
+    {SPR_CFCF, 32781, 2, A_CFlameRotate, S_CIRCLE_FLAME15, 0, 0},       // S_CIRCLE_FLAME14
+    {SPR_CFCF, 32782, 3, NULL, S_CIRCLE_FLAME16, 0, 0}, // S_CIRCLE_FLAME15
+    {SPR_CFCF, 32783, 2, NULL, S_NULL, 0, 0},   // S_CIRCLE_FLAME16
+    {SPR_CFCF, 32784, 3, NULL, S_CIRCLE_FLAME_X2, 0, 0},        // S_CIRCLE_FLAME_X1
+    {SPR_CFCF, 32785, 3, NULL, S_CIRCLE_FLAME_X3, 0, 0},        // S_CIRCLE_FLAME_X2
+    {SPR_CFCF, 32786, 3, A_Explode, S_CIRCLE_FLAME_X4, 0, 0},   // S_CIRCLE_FLAME_X3
+    {SPR_CFCF, 32787, 3, NULL, S_CIRCLE_FLAME_X5, 0, 0},        // S_CIRCLE_FLAME_X4
+    {SPR_CFCF, 32788, 3, NULL, S_CIRCLE_FLAME_X6, 0, 0},        // S_CIRCLE_FLAME_X5
+    {SPR_CFCF, 32789, 3, NULL, S_CIRCLE_FLAME_X7, 0, 0},        // S_CIRCLE_FLAME_X6
+    {SPR_CFCF, 32790, 3, NULL, S_CIRCLE_FLAME_X8, 0, 0},        // S_CIRCLE_FLAME_X7
+    {SPR_CFCF, 32791, 3, NULL, S_CIRCLE_FLAME_X9, 0, 0},        // S_CIRCLE_FLAME_X8
+    {SPR_CFCF, 32792, 3, NULL, S_CIRCLE_FLAME_X10, 0, 0},       // S_CIRCLE_FLAME_X9
+    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_CIRCLE_FLAME_X10
+    {SPR_CFFX, 32768, 4, NULL, S_CFLAME_MISSILE2, 0, 0},        // S_CFLAME_MISSILE1
+    {SPR_CFFX, 0, 1, A_CFlamePuff, S_FLAMEPUFF1, 0, 0}, // S_CFLAME_MISSILE2
+    {SPR_CFFX, 32768, 1, A_CFlameMissile, S_FLAMEPUFF1, 0, 0},  // S_CFLAME_MISSILE_X
+    {SPR_CHLY, 0, 1, A_WeaponReady, S_CHOLYREADY, 0, 0},        // S_CHOLYREADY
+    {SPR_CHLY, 0, 1, A_Lower, S_CHOLYDOWN, 0, 0},       // S_CHOLYDOWN
+    {SPR_CHLY, 0, 1, A_Raise, S_CHOLYUP, 0, 0}, // S_CHOLYUP
+    {SPR_CHLY, 32768, 1, NULL, S_CHOLYATK_2, 0, 40},    // S_CHOLYATK_1
+    {SPR_CHLY, 32769, 1, NULL, S_CHOLYATK_3, 0, 40},    // S_CHOLYATK_2
+    {SPR_CHLY, 32770, 2, NULL, S_CHOLYATK_4, 0, 43},    // S_CHOLYATK_3
+    {SPR_CHLY, 32771, 2, NULL, S_CHOLYATK_5, 0, 43},    // S_CHOLYATK_4
+    {SPR_CHLY, 32772, 2, NULL, S_CHOLYATK_6, 0, 45},    // S_CHOLYATK_5
+    {SPR_CHLY, 32773, 6, A_CHolyAttack, S_CHOLYATK_7, 0, 48},   // S_CHOLYATK_6
+    {SPR_CHLY, 32774, 2, A_CHolyPalette, S_CHOLYATK_8, 0, 40},  // S_CHOLYATK_7
+    {SPR_CHLY, 32774, 2, A_CHolyPalette, S_CHOLYATK_9, 0, 40},  // S_CHOLYATK_8
+    {SPR_CHLY, 32774, 2, A_CHolyPalette, S_CHOLYREADY, 0, 36},  // S_CHOLYATK_9
+    {SPR_SPIR, 0, 2, A_CHolySeek, S_HOLY_FX2, 0, 0},    // S_HOLY_FX1
+    {SPR_SPIR, 0, 2, A_CHolySeek, S_HOLY_FX3, 0, 0},    // S_HOLY_FX2
+    {SPR_SPIR, 1, 2, A_CHolySeek, S_HOLY_FX4, 0, 0},    // S_HOLY_FX3
+    {SPR_SPIR, 1, 2, A_CHolyCheckScream, S_HOLY_FX1, 0, 0},     // S_HOLY_FX4
+    {SPR_SPIR, 3, 4, NULL, S_HOLY_FX_X2, 0, 0}, // S_HOLY_FX_X1
+    {SPR_SPIR, 4, 4, A_Scream, S_HOLY_FX_X3, 0, 0},     // S_HOLY_FX_X2
+    {SPR_SPIR, 5, 4, NULL, S_HOLY_FX_X4, 0, 0}, // S_HOLY_FX_X3
+    {SPR_SPIR, 6, 4, NULL, S_HOLY_FX_X5, 0, 0}, // S_HOLY_FX_X4
+    {SPR_SPIR, 7, 4, NULL, S_HOLY_FX_X6, 0, 0}, // S_HOLY_FX_X5
+    {SPR_SPIR, 8, 4, NULL, S_NULL, 0, 0},       // S_HOLY_FX_X6
+    {SPR_SPIR, 2, 1, A_CHolyTail, S_HOLY_TAIL1, 0, 0},  // S_HOLY_TAIL1
+    {SPR_SPIR, 3, -1, NULL, S_NULL, 0, 0},      // S_HOLY_TAIL2
+    {SPR_SPIR, 10, 3, NULL, S_HOLY_PUFF2, 0, 0},        // S_HOLY_PUFF1
+    {SPR_SPIR, 11, 3, NULL, S_HOLY_PUFF3, 0, 0},        // S_HOLY_PUFF2
+    {SPR_SPIR, 12, 3, NULL, S_HOLY_PUFF4, 0, 0},        // S_HOLY_PUFF3
+    {SPR_SPIR, 13, 3, NULL, S_HOLY_PUFF5, 0, 0},        // S_HOLY_PUFF4
+    {SPR_SPIR, 14, 3, NULL, S_NULL, 0, 0},      // S_HOLY_PUFF5
+    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE2, 0, 0},      // S_HOLY_MISSILE1
+    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE3, 0, 0},      // S_HOLY_MISSILE2
+    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE4, 0, 0},      // S_HOLY_MISSILE3
+    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE_X, 0, 0},     // S_HOLY_MISSILE4
+    {SPR_SPIR, 32783, 1, A_CHolyAttack2, S_NULL, 0, 0}, // S_HOLY_MISSILE_X
+    {SPR_SPIR, 16, 3, NULL, S_HOLY_MISSILE_P2, 0, 0},   // S_HOLY_MISSILE_P1
+    {SPR_SPIR, 17, 3, NULL, S_HOLY_MISSILE_P3, 0, 0},   // S_HOLY_MISSILE_P2
+    {SPR_SPIR, 18, 3, NULL, S_HOLY_MISSILE_P4, 0, 0},   // S_HOLY_MISSILE_P3
+    {SPR_SPIR, 19, 3, NULL, S_HOLY_MISSILE_P5, 0, 0},   // S_HOLY_MISSILE_P4
+    {SPR_SPIR, 20, 3, NULL, S_NULL, 0, 0},      // S_HOLY_MISSILE_P5
+    {SPR_MWND, 0, 1, A_WeaponReady, S_MWANDREADY, 0, 0},        // S_MWANDREADY
+    {SPR_MWND, 0, 1, A_Lower, S_MWANDDOWN, 0, 0},       // S_MWANDDOWN
+    {SPR_MWND, 0, 1, A_Raise, S_MWANDUP, 0, 0}, // S_MWANDUP
+    {SPR_MWND, 0, 6, NULL, S_MWANDATK_2, 0, 0}, // S_MWANDATK_1
+    {SPR_MWND, 32769, 6, A_MWandAttack, S_MWANDATK_3, 0, 48},   // S_MWANDATK_2
+    {SPR_MWND, 0, 3, NULL, S_MWANDATK_4, 0, 40},        // S_MWANDATK_3
+    {SPR_MWND, 0, 3, A_ReFire, S_MWANDREADY, 0, 36},    // S_MWANDATK_4
+    {SPR_MWND, 32772, 4, NULL, S_MWANDPUFF2, 0, 0},     // S_MWANDPUFF1
+    {SPR_MWND, 32773, 3, NULL, S_MWANDPUFF3, 0, 0},     // S_MWANDPUFF2
+    {SPR_MWND, 32774, 4, NULL, S_MWANDPUFF4, 0, 0},     // S_MWANDPUFF3
+    {SPR_MWND, 32775, 3, NULL, S_MWANDPUFF5, 0, 0},     // S_MWANDPUFF4
+    {SPR_MWND, 32776, 4, NULL, S_NULL, 0, 0},   // S_MWANDPUFF5
+    {SPR_MWND, 2, 4, NULL, S_MWANDSMOKE2, 0, 0},        // S_MWANDSMOKE1
+    {SPR_MWND, 3, 4, NULL, S_MWANDSMOKE3, 0, 0},        // S_MWANDSMOKE2
+    {SPR_MWND, 2, 4, NULL, S_MWANDSMOKE4, 0, 0},        // S_MWANDSMOKE3
+    {SPR_MWND, 3, 4, NULL, S_NULL, 0, 0},       // S_MWANDSMOKE4
+    {SPR_MWND, 32770, 4, NULL, S_MWAND_MISSILE2, 0, 0}, // S_MWAND_MISSILE1
+    {SPR_MWND, 32771, 4, NULL, S_MWAND_MISSILE1, 0, 0}, // S_MWAND_MISSILE2
+    {SPR_WMLG, 32768, 4, NULL, S_MW_LIGHTNING2, 0, 0},  // S_MW_LIGHTNING1
+    {SPR_WMLG, 32769, 4, NULL, S_MW_LIGHTNING3, 0, 0},  // S_MW_LIGHTNING2
+    {SPR_WMLG, 32770, 4, NULL, S_MW_LIGHTNING4, 0, 0},  // S_MW_LIGHTNING3
+    {SPR_WMLG, 32771, 4, NULL, S_MW_LIGHTNING5, 0, 0},  // S_MW_LIGHTNING4
+    {SPR_WMLG, 32772, 4, NULL, S_MW_LIGHTNING6, 0, 0},  // S_MW_LIGHTNING5
+    {SPR_WMLG, 32773, 4, NULL, S_MW_LIGHTNING7, 0, 0},  // S_MW_LIGHTNING6
+    {SPR_WMLG, 32774, 4, NULL, S_MW_LIGHTNING8, 0, 0},  // S_MW_LIGHTNING7
+    {SPR_WMLG, 32775, 4, NULL, S_MW_LIGHTNING1, 0, 0},  // S_MW_LIGHTNING8
+    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY2, 0, 0},      // S_MLIGHTNINGREADY
+    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY3, 0, 0},      // S_MLIGHTNINGREADY2
+    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY4, 0, 0},      // S_MLIGHTNINGREADY3
+    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY5, 0, 0},      // S_MLIGHTNINGREADY4
+    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY6, 0, 0},      // S_MLIGHTNINGREADY5
+    {SPR_MLNG, 32768, 1, A_LightningReady, S_MLIGHTNINGREADY7, 0, 0},   // S_MLIGHTNINGREADY6
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY8, 0, 0},      // S_MLIGHTNINGREADY7
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY9, 0, 0},      // S_MLIGHTNINGREADY8
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY10, 0, 0},     // S_MLIGHTNINGREADY9
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY11, 0, 0},     // S_MLIGHTNINGREADY10
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY12, 0, 0},     // S_MLIGHTNINGREADY11
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY13, 0, 0},     // S_MLIGHTNINGREADY12
+    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY14, 0, 0},     // S_MLIGHTNINGREADY13
+    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY15, 0, 0},     // S_MLIGHTNINGREADY14
+    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY16, 0, 0},     // S_MLIGHTNINGREADY15
+    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY17, 0, 0},     // S_MLIGHTNINGREADY16
+    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY18, 0, 0},     // S_MLIGHTNINGREADY17
+    {SPR_MLNG, 32770, 1, A_LightningReady, S_MLIGHTNINGREADY19, 0, 0},  // S_MLIGHTNINGREADY18
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY20, 0, 0},     // S_MLIGHTNINGREADY19
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY21, 0, 0},     // S_MLIGHTNINGREADY20
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY22, 0, 0},     // S_MLIGHTNINGREADY21
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY23, 0, 0},     // S_MLIGHTNINGREADY22
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY24, 0, 0},     // S_MLIGHTNINGREADY23
+    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY, 0, 0},       // S_MLIGHTNINGREADY24
+    {SPR_MLNG, 32768, 1, A_Lower, S_MLIGHTNINGDOWN, 0, 0},      // S_MLIGHTNINGDOWN
+    {SPR_MLNG, 32768, 1, A_Raise, S_MLIGHTNINGUP, 0, 0},        // S_MLIGHTNINGUP
+    {SPR_MLNG, 32771, 3, NULL, S_MLIGHTNINGATK_2, 0, 0},        // S_MLIGHTNINGATK_1
+    {SPR_MLNG, 32772, 3, NULL, S_MLIGHTNINGATK_3, 0, 0},        // S_MLIGHTNINGATK_2
+    {SPR_MLNG, 32773, 4, A_MLightningAttack, S_MLIGHTNINGATK_4, 0, 0},  // S_MLIGHTNINGATK_3
+    {SPR_MLNG, 32774, 4, NULL, S_MLIGHTNINGATK_5, 0, 0},        // S_MLIGHTNINGATK_4
+    {SPR_MLNG, 32775, 3, NULL, S_MLIGHTNINGATK_6, 0, 0},        // S_MLIGHTNINGATK_5
+    {SPR_MLNG, 32776, 3, NULL, S_MLIGHTNINGATK_7, 0, 0},        // S_MLIGHTNINGATK_6
+    {SPR_MLNG, 32776, 6, NULL, S_MLIGHTNINGATK_8, 0, 199},      // S_MLIGHTNINGATK_7
+    {SPR_MLNG, 32770, 2, NULL, S_MLIGHTNINGATK_9, 0, 55},       // S_MLIGHTNINGATK_8
+    {SPR_MLNG, 32769, 2, NULL, S_MLIGHTNINGATK_10, 0, 50},      // S_MLIGHTNINGATK_9
+    {SPR_MLNG, 32769, 2, NULL, S_MLIGHTNINGATK_11, 0, 45},      // S_MLIGHTNINGATK_10
+    {SPR_MLNG, 32769, 2, NULL, S_MLIGHTNINGREADY, 0, 40},       // S_MLIGHTNINGATK_11
+    {SPR_MLFX, 32768, 2, A_LightningZap, S_LIGHTNING_CEILING2, 0, 0},   // S_LIGHTNING_CEILING1
+    {SPR_MLFX, 32769, 2, A_LightningClip, S_LIGHTNING_CEILING3, 0, 0},  // S_LIGHTNING_CEILING2
+    {SPR_MLFX, 32770, 2, A_LightningClip, S_LIGHTNING_CEILING4, 0, 0},  // S_LIGHTNING_CEILING3
+    {SPR_MLFX, 32771, 2, A_LightningClip, S_LIGHTNING_CEILING1, 0, 0},  // S_LIGHTNING_CEILING4
+    {SPR_MLF2, 32768, 2, A_LightningRemove, S_LIGHTNING_C_X2, 0, 0},    // S_LIGHTNING_C_X1
+    {SPR_MLF2, 32769, 3, NULL, S_LIGHTNING_C_X3, 0, 0}, // S_LIGHTNING_C_X2
+    {SPR_MLF2, 32770, 3, NULL, S_LIGHTNING_C_X4, 0, 0}, // S_LIGHTNING_C_X3
+    {SPR_MLF2, 32771, 3, NULL, S_LIGHTNING_C_X5, 0, 0}, // S_LIGHTNING_C_X4
+    {SPR_MLF2, 32772, 3, NULL, S_LIGHTNING_C_X6, 0, 0}, // S_LIGHTNING_C_X5
+    {SPR_MLF2, 32778, 3, NULL, S_LIGHTNING_C_X7, 0, 0}, // S_LIGHTNING_C_X6
+    {SPR_MLF2, 32779, 3, NULL, S_LIGHTNING_C_X8, 0, 0}, // S_LIGHTNING_C_X7
+    {SPR_MLF2, 32780, 3, NULL, S_LIGHTNING_C_X9, 0, 0}, // S_LIGHTNING_C_X8
+    {SPR_ACLO, 4, 35, NULL, S_LIGHTNING_C_X10, 0, 0},   // S_LIGHTNING_C_X9
+    {SPR_MLF2, 32781, 3, NULL, S_LIGHTNING_C_X11, 0, 0},        // S_LIGHTNING_C_X10
+    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_C_X12, 0, 0},        // S_LIGHTNING_C_X11
+    {SPR_MLF2, 32783, 4, NULL, S_LIGHTNING_C_X13, 0, 0},        // S_LIGHTNING_C_X12
+    {SPR_MLF2, 32784, 3, NULL, S_LIGHTNING_C_X14, 0, 0},        // S_LIGHTNING_C_X13
+    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_C_X15, 0, 0},        // S_LIGHTNING_C_X14
+    {SPR_MLF2, 32784, 4, NULL, S_LIGHTNING_C_X16, 0, 0},        // S_LIGHTNING_C_X15
+    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_C_X17, 0, 0},        // S_LIGHTNING_C_X16
+    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_C_X18, 0, 0},        // S_LIGHTNING_C_X17
+    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_C_X19, 0, 0},        // S_LIGHTNING_C_X18
+    {SPR_MLF2, 32783, 1, A_HideThing, S_FREETARGMOBJ, 0, 0},    // S_LIGHTNING_C_X19
+    {SPR_MLFX, 32772, 2, A_LightningZap, S_LIGHTNING_FLOOR2, 0, 0},     // S_LIGHTNING_FLOOR1
+    {SPR_MLFX, 32773, 2, A_LightningClip, S_LIGHTNING_FLOOR3, 0, 0},    // S_LIGHTNING_FLOOR2
+    {SPR_MLFX, 32774, 2, A_LightningClip, S_LIGHTNING_FLOOR4, 0, 0},    // S_LIGHTNING_FLOOR3
+    {SPR_MLFX, 32775, 2, A_LightningClip, S_LIGHTNING_FLOOR1, 0, 0},    // S_LIGHTNING_FLOOR4
+    {SPR_MLF2, 32773, 2, A_LightningRemove, S_LIGHTNING_F_X2, 0, 0},    // S_LIGHTNING_F_X1
+    {SPR_MLF2, 32774, 3, NULL, S_LIGHTNING_F_X3, 0, 0}, // S_LIGHTNING_F_X2
+    {SPR_MLF2, 32775, 3, NULL, S_LIGHTNING_F_X4, 0, 0}, // S_LIGHTNING_F_X3
+    {SPR_MLF2, 32776, 3, NULL, S_LIGHTNING_F_X5, 0, 0}, // S_LIGHTNING_F_X4
+    {SPR_MLF2, 32777, 3, NULL, S_LIGHTNING_F_X6, 0, 0}, // S_LIGHTNING_F_X5
+    {SPR_MLF2, 32778, 3, NULL, S_LIGHTNING_F_X7, 0, 0}, // S_LIGHTNING_F_X6
+    {SPR_MLF2, 32779, 3, NULL, S_LIGHTNING_F_X8, 0, 0}, // S_LIGHTNING_F_X7
+    {SPR_MLF2, 32780, 3, NULL, S_LIGHTNING_F_X9, 0, 0}, // S_LIGHTNING_F_X8
+    {SPR_ACLO, 4, 20, NULL, S_LIGHTNING_F_X10, 0, 0},   // S_LIGHTNING_F_X9
+    {SPR_MLF2, 32781, 3, NULL, S_LIGHTNING_F_X11, 0, 0},        // S_LIGHTNING_F_X10
+    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_F_X12, 0, 0},        // S_LIGHTNING_F_X11
+    {SPR_MLF2, 32783, 4, NULL, S_LIGHTNING_F_X13, 0, 0},        // S_LIGHTNING_F_X12
+    {SPR_MLF2, 32784, 3, NULL, S_LIGHTNING_F_X14, 0, 0},        // S_LIGHTNING_F_X13
+    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_F_X15, 0, 0},        // S_LIGHTNING_F_X14
+    {SPR_MLF2, 32784, 4, A_LastZap, S_LIGHTNING_F_X16, 0, 0},   // S_LIGHTNING_F_X15
+    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_F_X17, 0, 0},        // S_LIGHTNING_F_X16
+    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_F_X18, 0, 0},        // S_LIGHTNING_F_X17
+    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_F_X19, 0, 0},        // S_LIGHTNING_F_X18
+    {SPR_MLF2, 32783, 1, A_HideThing, S_FREETARGMOBJ, 0, 0},    // S_LIGHTNING_F_X19
+    {SPR_MLFX, 32776, 2, A_ZapMimic, S_LIGHTNING_ZAP2, 0, 0},   // S_LIGHTNING_ZAP1
+    {SPR_MLFX, 32777, 2, A_ZapMimic, S_LIGHTNING_ZAP3, 0, 0},   // S_LIGHTNING_ZAP2
+    {SPR_MLFX, 32778, 2, A_ZapMimic, S_LIGHTNING_ZAP4, 0, 0},   // S_LIGHTNING_ZAP3
+    {SPR_MLFX, 32779, 2, A_ZapMimic, S_LIGHTNING_ZAP5, 0, 0},   // S_LIGHTNING_ZAP4
+    {SPR_MLFX, 32780, 2, A_ZapMimic, S_LIGHTNING_ZAP1, 0, 0},   // S_LIGHTNING_ZAP5
+    {SPR_MLFX, 32781, 2, NULL, S_LIGHTNING_ZAP_X2, 0, 0},       // S_LIGHTNING_ZAP_X1
+    {SPR_MLFX, 32782, 2, NULL, S_LIGHTNING_ZAP_X3, 0, 0},       // S_LIGHTNING_ZAP_X2
+    {SPR_MLFX, 32783, 2, NULL, S_LIGHTNING_ZAP_X4, 0, 0},       // S_LIGHTNING_ZAP_X3
+    {SPR_MLFX, 32784, 2, NULL, S_LIGHTNING_ZAP_X5, 0, 0},       // S_LIGHTNING_ZAP_X4
+    {SPR_MLFX, 32785, 2, NULL, S_LIGHTNING_ZAP_X6, 0, 0},       // S_LIGHTNING_ZAP_X5
+    {SPR_MLFX, 32786, 2, NULL, S_LIGHTNING_ZAP_X7, 0, 0},       // S_LIGHTNING_ZAP_X6
+    {SPR_MLFX, 32787, 2, NULL, S_LIGHTNING_ZAP_X8, 0, 0},       // S_LIGHTNING_ZAP_X7
+    {SPR_MLFX, 32788, 2, NULL, S_NULL, 0, 0},   // S_LIGHTNING_ZAP_X8
+    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY2, 0, 0},      // S_MSTAFFREADY
+    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY3, 0, 0},      // S_MSTAFFREADY2
+    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY4, 0, 0},      // S_MSTAFFREADY3
+    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY5, 0, 0},      // S_MSTAFFREADY4
+    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY6, 0, 0},      // S_MSTAFFREADY5
+    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY7, 0, 0},      // S_MSTAFFREADY6
+    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY8, 0, 0},      // S_MSTAFFREADY7
+    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY9, 0, 0},      // S_MSTAFFREADY8
+    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY10, 0, 0},     // S_MSTAFFREADY9
+    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY11, 0, 0},     // S_MSTAFFREADY10
+    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY12, 0, 0},     // S_MSTAFFREADY11
+    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY13, 0, 0},     // S_MSTAFFREADY12
+    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY14, 0, 0},     // S_MSTAFFREADY13
+    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY15, 0, 0},     // S_MSTAFFREADY14
+    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY16, 0, 0},     // S_MSTAFFREADY15
+    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY17, 0, 0},     // S_MSTAFFREADY16
+    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY18, 0, 0},     // S_MSTAFFREADY17
+    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY19, 0, 0},     // S_MSTAFFREADY18
+    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY20, 0, 0},     // S_MSTAFFREADY19
+    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY21, 0, 0},     // S_MSTAFFREADY20
+    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY22, 0, 0},     // S_MSTAFFREADY21
+    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY23, 0, 0},     // S_MSTAFFREADY22
+    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY24, 0, 0},     // S_MSTAFFREADY23
+    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY25, 0, 0},     // S_MSTAFFREADY24
+    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY26, 0, 0},     // S_MSTAFFREADY25
+    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY27, 0, 0},     // S_MSTAFFREADY26
+    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY28, 0, 0},     // S_MSTAFFREADY27
+    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY29, 0, 0},     // S_MSTAFFREADY28
+    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY30, 0, 0},     // S_MSTAFFREADY29
+    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY31, 0, 0},     // S_MSTAFFREADY30
+    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY32, 0, 0},     // S_MSTAFFREADY31
+    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY33, 0, 0},     // S_MSTAFFREADY32
+    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY34, 0, 0},     // S_MSTAFFREADY33
+    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY35, 0, 0},     // S_MSTAFFREADY34
+    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY, 0, 0},       // S_MSTAFFREADY35
+    {SPR_MSTF, 0, 1, A_Lower, S_MSTAFFDOWN, 0, 0},      // S_MSTAFFDOWN
+    {SPR_MSTF, 0, 1, A_Raise, S_MSTAFFUP, 0, 0},        // S_MSTAFFUP
+    {SPR_MSTF, 6, 4, NULL, S_MSTAFFATK_2, 0, 40},       // S_MSTAFFATK_1
+    {SPR_MSTF, 32775, 4, A_MStaffAttack, S_MSTAFFATK_3, 0, 48}, // S_MSTAFFATK_2
+    {SPR_MSTF, 32775, 2, A_MStaffPalette, S_MSTAFFATK_4, 0, 48},        // S_MSTAFFATK_3
+    {SPR_MSTF, 8, 2, A_MStaffPalette, S_MSTAFFATK_5, 0, 48},    // S_MSTAFFATK_4
+    {SPR_MSTF, 8, 2, A_MStaffPalette, S_MSTAFFATK_6, 0, 48},    // S_MSTAFFATK_5
+    {SPR_MSTF, 8, 1, NULL, S_MSTAFFATK_7, 0, 40},       // S_MSTAFFATK_6
+    {SPR_MSTF, 9, 5, NULL, S_MSTAFFREADY, 0, 36},       // S_MSTAFFATK_7
+    {SPR_MSP1, 32768, 3, A_MStaffWeave, S_MSTAFF_FX1_2, 0, 0},  // S_MSTAFF_FX1_1
+    {SPR_MSP1, 32769, 3, A_MStaffWeave, S_MSTAFF_FX1_3, 0, 0},  // S_MSTAFF_FX1_2
+    {SPR_MSP1, 32770, 3, A_MStaffWeave, S_MSTAFF_FX1_4, 0, 0},  // S_MSTAFF_FX1_3
+    {SPR_MSP1, 32771, 3, A_MStaffWeave, S_MSTAFF_FX1_5, 0, 0},  // S_MSTAFF_FX1_4
+    {SPR_MSP1, 32772, 3, A_MStaffWeave, S_MSTAFF_FX1_6, 0, 0},  // S_MSTAFF_FX1_5
+    {SPR_MSP1, 32773, 3, A_MStaffWeave, S_MSTAFF_FX1_1, 0, 0},  // S_MSTAFF_FX1_6
+    {SPR_MSP1, 32774, 4, NULL, S_MSTAFF_FX_X2, 0, 0},   // S_MSTAFF_FX_X1
+    {SPR_MSP1, 32775, 5, A_Explode, S_MSTAFF_FX_X3, 0, 0},      // S_MSTAFF_FX_X2
+    {SPR_MSP1, 32776, 4, NULL, S_MSTAFF_FX_X4, 0, 0},   // S_MSTAFF_FX_X3
+    {SPR_MSP1, 32777, 5, NULL, S_MSTAFF_FX_X5, 0, 0},   // S_MSTAFF_FX_X4
+    {SPR_MSP1, 32778, 4, NULL, S_MSTAFF_FX_X6, 0, 0},   // S_MSTAFF_FX_X5
+    {SPR_MSP1, 32779, 5, NULL, S_MSTAFF_FX_X7, 0, 0},   // S_MSTAFF_FX_X6
+    {SPR_MSP1, 32780, 4, NULL, S_MSTAFF_FX_X8, 0, 0},   // S_MSTAFF_FX_X7
+    {SPR_MSP1, 32781, 5, NULL, S_MSTAFF_FX_X9, 0, 0},   // S_MSTAFF_FX_X8
+    {SPR_MSP1, 32782, 4, NULL, S_MSTAFF_FX_X10, 0, 0},  // S_MSTAFF_FX_X9
+    {SPR_MSP1, 32783, 4, NULL, S_NULL, 0, 0},   // S_MSTAFF_FX_X10
+    {SPR_MSP2, 32768, 2, A_MStaffTrack, S_MSTAFF_FX2_2, 0, 0},  // S_MSTAFF_FX2_1
+    {SPR_MSP2, 32769, 2, A_MStaffTrack, S_MSTAFF_FX2_3, 0, 0},  // S_MSTAFF_FX2_2
+    {SPR_MSP2, 32770, 2, A_MStaffTrack, S_MSTAFF_FX2_4, 0, 0},  // S_MSTAFF_FX2_3
+    {SPR_MSP2, 32771, 2, A_MStaffTrack, S_MSTAFF_FX2_1, 0, 0},  // S_MSTAFF_FX2_4
+    {SPR_MSP2, 32772, 4, NULL, S_MSTAFF_FX2_X2, 0, 0},  // S_MSTAFF_FX2_X1
+    {SPR_MSP2, 32773, 5, A_Explode, S_MSTAFF_FX2_X3, 0, 0},     // S_MSTAFF_FX2_X2
+    {SPR_MSP2, 32774, 5, NULL, S_MSTAFF_FX2_X4, 0, 0},  // S_MSTAFF_FX2_X3
+    {SPR_MSP2, 32775, 5, NULL, S_MSTAFF_FX2_X5, 0, 0},  // S_MSTAFF_FX2_X4
+    {SPR_MSP2, 32776, 4, NULL, S_NULL, 0, 0},   // S_MSTAFF_FX2_X5
+    {SPR_WFR1, 32768, -1, NULL, S_NULL, 0, 0},  // S_FSWORD1
+    {SPR_WFR2, 32768, -1, NULL, S_NULL, 0, 0},  // S_FSWORD2
+    {SPR_WFR3, 32768, -1, NULL, S_NULL, 0, 0},  // S_FSWORD3
+    {SPR_WCH1, 32768, -1, NULL, S_NULL, 0, 0},  // S_CHOLY1
+    {SPR_WCH2, 32768, -1, NULL, S_NULL, 0, 0},  // S_CHOLY2
+    {SPR_WCH3, 32768, -1, NULL, S_NULL, 0, 0},  // S_CHOLY3
+    {SPR_WMS1, 32768, -1, NULL, S_NULL, 0, 0},  // S_MSTAFF1
+    {SPR_WMS2, 32768, -1, NULL, S_NULL, 0, 0},  // S_MSTAFF2
+    {SPR_WMS3, 32768, -1, NULL, S_NULL, 0, 0},  // S_MSTAFF3
+    {SPR_WPIG, 0, 1, A_WeaponReady, S_SNOUTREADY, 0, 0},        // S_SNOUTREADY
+    {SPR_WPIG, 0, 1, A_Lower, S_SNOUTDOWN, 0, 0},       // S_SNOUTDOWN
+    {SPR_WPIG, 0, 1, A_Raise, S_SNOUTUP, 0, 0}, // S_SNOUTUP
+    {SPR_WPIG, 0, 4, A_SnoutAttack, S_SNOUTATK2, 0, 0}, // S_SNOUTATK1
+    {SPR_WPIG, 1, 8, A_SnoutAttack, S_SNOUTREADY, 0, 0},        // S_SNOUTATK2
+    {SPR_WMCS, 32768, 8, NULL, S_COS2, 0, 0},   // S_COS1
+    {SPR_WMCS, 32769, 8, NULL, S_COS3, 0, 0},   // S_COS2
+    {SPR_WMCS, 32770, 8, NULL, S_COS1, 0, 0},   // S_COS3
+    {SPR_CONE, 0, 1, A_WeaponReady, S_CONEREADY, 0, 0}, // S_CONEREADY
+    {SPR_CONE, 0, 1, A_Lower, S_CONEDOWN, 0, 0},        // S_CONEDOWN
+    {SPR_CONE, 0, 1, A_Raise, S_CONEUP, 0, 0},  // S_CONEUP
+    {SPR_CONE, 1, 3, NULL, S_CONEATK1_2, 0, 0}, // S_CONEATK1_1
+    {SPR_CONE, 2, 4, NULL, S_CONEATK1_3, 0, 0}, // S_CONEATK1_2
+    {SPR_CONE, 3, 3, NULL, S_CONEATK1_4, 0, 0}, // S_CONEATK1_3
+    {SPR_CONE, 4, 5, NULL, S_CONEATK1_5, 0, 0}, // S_CONEATK1_4
+    {SPR_CONE, 5, 3, A_FireConePL1, S_CONEATK1_6, 0, 0},        // S_CONEATK1_5
+    {SPR_CONE, 6, 3, NULL, S_CONEATK1_7, 0, 0}, // S_CONEATK1_6
+    {SPR_CONE, 0, 9, NULL, S_CONEATK1_8, 0, 0}, // S_CONEATK1_7
+    {SPR_CONE, 0, 10, A_ReFire, S_CONEREADY, 0, 0},     // S_CONEATK1_8
+    {SPR_SHRD, 32768, 2, NULL, S_SHARDFX1_2, 0, 0},     // S_SHARDFX1_1
+    {SPR_SHRD, 32768, 3, A_ShedShard, S_SHARDFX1_3, 0, 0},      // S_SHARDFX1_2
+    {SPR_SHRD, 32769, 3, NULL, S_SHARDFX1_4, 0, 0},     // S_SHARDFX1_3
+    {SPR_SHRD, 32770, 3, NULL, S_SHARDFX1_1, 0, 0},     // S_SHARDFX1_4
+    {SPR_SHEX, 32768, 5, NULL, S_SHARDFXE1_2, 0, 0},    // S_SHARDFXE1_1
+    {SPR_SHEX, 32769, 5, NULL, S_SHARDFXE1_3, 0, 0},    // S_SHARDFXE1_2
+    {SPR_SHEX, 32770, 5, NULL, S_SHARDFXE1_4, 0, 0},    // S_SHARDFXE1_3
+    {SPR_SHEX, 32771, 5, NULL, S_SHARDFXE1_5, 0, 0},    // S_SHARDFXE1_4
+    {SPR_SHEX, 32772, 5, NULL, S_NULL, 0, 0},   // S_SHARDFXE1_5
+    {SPR_BLOD, 2, 8, NULL, S_BLOOD2, 0, 0},     // S_BLOOD1
+    {SPR_BLOD, 1, 8, NULL, S_BLOOD3, 0, 0},     // S_BLOOD2
+    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOOD3
+    {SPR_BLOD, 2, 8, NULL, S_BLOODSPLATTER2, 0, 0},     // S_BLOODSPLATTER1
+    {SPR_BLOD, 1, 8, NULL, S_BLOODSPLATTER3, 0, 0},     // S_BLOODSPLATTER2
+    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTER3
+    {SPR_BLOD, 0, 6, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTERX
+    {SPR_GIBS, 0, -1, NULL, S_NULL, 0, 0},      // S_GIBS1
+    {SPR_PLAY, 0, -1, NULL, S_NULL, 0, 0},      // S_FPLAY
+    {SPR_PLAY, 0, 4, NULL, S_FPLAY_RUN2, 0, 0}, // S_FPLAY_RUN1
+    {SPR_PLAY, 1, 4, NULL, S_FPLAY_RUN3, 0, 0}, // S_FPLAY_RUN2
+    {SPR_PLAY, 2, 4, NULL, S_FPLAY_RUN4, 0, 0}, // S_FPLAY_RUN3
+    {SPR_PLAY, 3, 4, NULL, S_FPLAY_RUN1, 0, 0}, // S_FPLAY_RUN4
+    {SPR_PLAY, 4, 8, NULL, S_FPLAY_ATK2, 0, 0}, // S_FPLAY_ATK1
+    {SPR_PLAY, 5, 8, NULL, S_FPLAY, 0, 0},      // S_FPLAY_ATK2
+    {SPR_PLAY, 6, 4, NULL, S_FPLAY_PAIN2, 0, 0},        // S_FPLAY_PAIN
+    {SPR_PLAY, 6, 4, A_Pain, S_FPLAY, 0, 0},    // S_FPLAY_PAIN2
+    {SPR_PLAY, 7, 6, NULL, S_FPLAY_DIE2, 0, 0}, // S_FPLAY_DIE1
+    {SPR_PLAY, 8, 6, A_Scream, S_FPLAY_DIE3, 0, 0},     // S_FPLAY_DIE2
+    {SPR_PLAY, 9, 6, NULL, S_FPLAY_DIE4, 0, 0}, // S_FPLAY_DIE3
+    {SPR_PLAY, 10, 6, NULL, S_FPLAY_DIE5, 0, 0},        // S_FPLAY_DIE4
+    {SPR_PLAY, 11, 6, A_NoBlocking, S_FPLAY_DIE6, 0, 0},        // S_FPLAY_DIE5
+    {SPR_PLAY, 12, 6, NULL, S_FPLAY_DIE7, 0, 0},        // S_FPLAY_DIE6
+    {SPR_PLAY, 13, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_FPLAY_DIE7
+    {SPR_PLAY, 14, 5, A_Scream, S_FPLAY_XDIE2, 0, 0},   // S_FPLAY_XDIE1
+    {SPR_PLAY, 15, 5, A_SkullPop, S_FPLAY_XDIE3, 0, 0}, // S_FPLAY_XDIE2
+    {SPR_PLAY, 17, 5, A_NoBlocking, S_FPLAY_XDIE4, 0, 0},       // S_FPLAY_XDIE3
+    {SPR_PLAY, 18, 5, NULL, S_FPLAY_XDIE5, 0, 0},       // S_FPLAY_XDIE4
+    {SPR_PLAY, 19, 5, NULL, S_FPLAY_XDIE6, 0, 0},       // S_FPLAY_XDIE5
+    {SPR_PLAY, 20, 5, NULL, S_FPLAY_XDIE7, 0, 0},       // S_FPLAY_XDIE6
+    {SPR_PLAY, 21, 5, NULL, S_FPLAY_XDIE8, 0, 0},       // S_FPLAY_XDIE7
+    {SPR_PLAY, 22, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_FPLAY_XDIE8
+    {SPR_PLAY, 23, 5, A_FreezeDeath, S_FPLAY_ICE2, 0, 0},       // S_FPLAY_ICE
+    {SPR_PLAY, 23, 1, A_FreezeDeathChunks, S_FPLAY_ICE2, 0, 0}, // S_FPLAY_ICE2
+    {SPR_FDTH, 32768, 5, NULL, S_PLAY_F_FDTH2, 0, 0},   // S_PLAY_F_FDTH1
+    {SPR_FDTH, 32769, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_F_FDTH2
+    {SPR_FDTH, 32770, 5, NULL, S_PLAY_C_FDTH2, 0, 0},   // S_PLAY_C_FDTH1
+    {SPR_FDTH, 32771, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_C_FDTH2
+    {SPR_FDTH, 32772, 5, NULL, S_PLAY_M_FDTH2, 0, 0},   // S_PLAY_M_FDTH1
+    {SPR_FDTH, 32773, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_M_FDTH2
+    {SPR_FDTH, 32774, 5, NULL, S_PLAY_FDTH4, 0, 0},     // S_PLAY_FDTH3
+    {SPR_FDTH, 32775, 4, A_Scream, S_PLAY_FDTH5, 0, 0}, // S_PLAY_FDTH4
+    {SPR_FDTH, 32776, 5, NULL, S_PLAY_FDTH6, 0, 0},     // S_PLAY_FDTH5
+    {SPR_FDTH, 32777, 4, NULL, S_PLAY_FDTH7, 0, 0},     // S_PLAY_FDTH6
+    {SPR_FDTH, 32778, 5, NULL, S_PLAY_FDTH8, 0, 0},     // S_PLAY_FDTH7
+    {SPR_FDTH, 32779, 4, NULL, S_PLAY_FDTH9, 0, 0},     // S_PLAY_FDTH8
+    {SPR_FDTH, 32780, 5, NULL, S_PLAY_FDTH10, 0, 0},    // S_PLAY_FDTH9
+    {SPR_FDTH, 32781, 4, NULL, S_PLAY_FDTH11, 0, 0},    // S_PLAY_FDTH10
+    {SPR_FDTH, 32782, 5, NULL, S_PLAY_FDTH12, 0, 0},    // S_PLAY_FDTH11
+    {SPR_FDTH, 32783, 4, NULL, S_PLAY_FDTH13, 0, 0},    // S_PLAY_FDTH12
+    {SPR_FDTH, 32784, 5, NULL, S_PLAY_FDTH14, 0, 0},    // S_PLAY_FDTH13
+    {SPR_FDTH, 32785, 4, NULL, S_PLAY_FDTH15, 0, 0},    // S_PLAY_FDTH14
+    {SPR_FDTH, 32786, 5, A_NoBlocking, S_PLAY_FDTH16, 0, 0},    // S_PLAY_FDTH15
+    {SPR_FDTH, 32787, 4, NULL, S_PLAY_FDTH17, 0, 0},    // S_PLAY_FDTH16
+    {SPR_FDTH, 32788, 5, NULL, S_PLAY_FDTH18, 0, 0},    // S_PLAY_FDTH17
+    {SPR_FDTH, 32789, 4, NULL, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH18
+    {SPR_ACLO, 4, 35, A_CheckBurnGone, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH19
+    {SPR_ACLO, 4, 8, NULL, S_NULL, 0, 0},       // S_PLAY_FDTH20
+    {SPR_BSKL, 0, 5, A_CheckSkullFloor, S_BLOODYSKULL2, 0, 0},  // S_BLOODYSKULL1
+    {SPR_BSKL, 1, 5, A_CheckSkullFloor, S_BLOODYSKULL3, 0, 0},  // S_BLOODYSKULL2
+    {SPR_BSKL, 2, 5, A_CheckSkullFloor, S_BLOODYSKULL4, 0, 0},  // S_BLOODYSKULL3
+    {SPR_BSKL, 3, 5, A_CheckSkullFloor, S_BLOODYSKULL5, 0, 0},  // S_BLOODYSKULL4
+    {SPR_BSKL, 5, 5, A_CheckSkullFloor, S_BLOODYSKULL6, 0, 0},  // S_BLOODYSKULL5
+    {SPR_BSKL, 6, 5, A_CheckSkullFloor, S_BLOODYSKULL7, 0, 0},  // S_BLOODYSKULL6
+    {SPR_BSKL, 7, 5, A_CheckSkullFloor, S_BLOODYSKULL1, 0, 0},  // S_BLOODYSKULL7
+    {SPR_BSKL, 8, 16, A_CheckSkullDone, S_BLOODYSKULLX1, 0, 0}, // S_BLOODYSKULLX1
+    {SPR_BSKL, 8, 1050, NULL, S_NULL, 0, 0},    // S_BLOODYSKULLX2
+    {SPR_PLAY, 0, 5, NULL, S_PLAYER_SPEED2, 0, 0},      // S_PLAYER_SPEED1
+    {SPR_PLAY, 0, 3, A_SpeedFade, S_NULL, 0, 0},        // S_PLAYER_SPEED2
+    {SPR_ICEC, 0, 10, NULL, S_ICECHUNK2, 0, 0}, // S_ICECHUNK1
+    {SPR_ICEC, 1, 10, A_IceSetTics, S_ICECHUNK3, 0, 0}, // S_ICECHUNK2
+    {SPR_ICEC, 2, 10, A_IceSetTics, S_ICECHUNK4, 0, 0}, // S_ICECHUNK3
+    {SPR_ICEC, 3, 10, A_IceSetTics, S_NULL, 0, 0},      // S_ICECHUNK4
+    {SPR_ICEC, 0, 10, A_IceCheckHeadDone, S_ICECHUNK_HEAD, 0, 0},       // S_ICECHUNK_HEAD
+    {SPR_ICEC, 0, 1050, NULL, S_NULL, 0, 0},    // S_ICECHUNK_HEAD2
+    {SPR_CLER, 0, -1, NULL, S_NULL, 0, 0},      // S_CPLAY
+    {SPR_CLER, 0, 4, NULL, S_CPLAY_RUN2, 0, 0}, // S_CPLAY_RUN1
+    {SPR_CLER, 1, 4, NULL, S_CPLAY_RUN3, 0, 0}, // S_CPLAY_RUN2
+    {SPR_CLER, 2, 4, NULL, S_CPLAY_RUN4, 0, 0}, // S_CPLAY_RUN3
+    {SPR_CLER, 3, 4, NULL, S_CPLAY_RUN1, 0, 0}, // S_CPLAY_RUN4
+    {SPR_CLER, 4, 6, NULL, S_CPLAY_ATK2, 0, 0}, // S_CPLAY_ATK1
+    {SPR_CLER, 5, 6, NULL, S_CPLAY_ATK3, 0, 0}, // S_CPLAY_ATK2
+    {SPR_CLER, 6, 6, NULL, S_CPLAY, 0, 0},      // S_CPLAY_ATK3
+    {SPR_CLER, 7, 4, NULL, S_CPLAY_PAIN2, 0, 0},        // S_CPLAY_PAIN
+    {SPR_CLER, 7, 4, A_Pain, S_CPLAY, 0, 0},    // S_CPLAY_PAIN2
+    {SPR_CLER, 8, 6, NULL, S_CPLAY_DIE2, 0, 0}, // S_CPLAY_DIE1
+    {SPR_CLER, 10, 6, A_Scream, S_CPLAY_DIE3, 0, 0},    // S_CPLAY_DIE2
+    {SPR_CLER, 11, 6, NULL, S_CPLAY_DIE4, 0, 0},        // S_CPLAY_DIE3
+    {SPR_CLER, 11, 6, NULL, S_CPLAY_DIE5, 0, 0},        // S_CPLAY_DIE4
+    {SPR_CLER, 12, 6, A_NoBlocking, S_CPLAY_DIE6, 0, 0},        // S_CPLAY_DIE5
+    {SPR_CLER, 13, 6, NULL, S_CPLAY_DIE7, 0, 0},        // S_CPLAY_DIE6
+    {SPR_CLER, 14, 6, NULL, S_CPLAY_DIE8, 0, 0},        // S_CPLAY_DIE7
+    {SPR_CLER, 15, 6, NULL, S_CPLAY_DIE9, 0, 0},        // S_CPLAY_DIE8
+    {SPR_CLER, 16, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_CPLAY_DIE9
+    {SPR_CLER, 17, 5, A_Scream, S_CPLAY_XDIE2, 0, 0},   // S_CPLAY_XDIE1
+    {SPR_CLER, 18, 5, NULL, S_CPLAY_XDIE3, 0, 0},       // S_CPLAY_XDIE2
+    {SPR_CLER, 19, 5, A_NoBlocking, S_CPLAY_XDIE4, 0, 0},       // S_CPLAY_XDIE3
+    {SPR_CLER, 20, 5, NULL, S_CPLAY_XDIE5, 0, 0},       // S_CPLAY_XDIE4
+    {SPR_CLER, 21, 5, NULL, S_CPLAY_XDIE6, 0, 0},       // S_CPLAY_XDIE5
+    {SPR_CLER, 22, 5, NULL, S_CPLAY_XDIE7, 0, 0},       // S_CPLAY_XDIE6
+    {SPR_CLER, 23, 5, NULL, S_CPLAY_XDIE8, 0, 0},       // S_CPLAY_XDIE7
+    {SPR_CLER, 24, 5, NULL, S_CPLAY_XDIE9, 0, 0},       // S_CPLAY_XDIE8
+    {SPR_CLER, 25, 5, NULL, S_CPLAY_XDIE10, 0, 0},      // S_CPLAY_XDIE9
+    {SPR_CLER, 26, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_CPLAY_XDIE10
+    {SPR_CLER, 27, 5, A_FreezeDeath, S_CPLAY_ICE2, 0, 0},       // S_CPLAY_ICE
+    {SPR_CLER, 27, 1, A_FreezeDeathChunks, S_CPLAY_ICE2, 0, 0}, // S_CPLAY_ICE2
+    {SPR_MAGE, 0, -1, NULL, S_NULL, 0, 0},      // S_MPLAY
+    {SPR_MAGE, 0, 4, NULL, S_MPLAY_RUN2, 0, 0}, // S_MPLAY_RUN1
+    {SPR_MAGE, 1, 4, NULL, S_MPLAY_RUN3, 0, 0}, // S_MPLAY_RUN2
+    {SPR_MAGE, 2, 4, NULL, S_MPLAY_RUN4, 0, 0}, // S_MPLAY_RUN3
+    {SPR_MAGE, 3, 4, NULL, S_MPLAY_RUN1, 0, 0}, // S_MPLAY_RUN4
+    {SPR_MAGE, 4, 8, NULL, S_MPLAY_ATK2, 0, 0}, // S_MPLAY_ATK1
+    {SPR_MAGE, 32773, 8, NULL, S_MPLAY, 0, 0},  // S_MPLAY_ATK2
+    {SPR_MAGE, 6, 4, NULL, S_MPLAY_PAIN2, 0, 0},        // S_MPLAY_PAIN
+    {SPR_MAGE, 6, 4, A_Pain, S_MPLAY, 0, 0},    // S_MPLAY_PAIN2
+    {SPR_MAGE, 7, 6, NULL, S_MPLAY_DIE2, 0, 0}, // S_MPLAY_DIE1
+    {SPR_MAGE, 8, 6, A_Scream, S_MPLAY_DIE3, 0, 0},     // S_MPLAY_DIE2
+    {SPR_MAGE, 9, 6, NULL, S_MPLAY_DIE4, 0, 0}, // S_MPLAY_DIE3
+    {SPR_MAGE, 10, 6, NULL, S_MPLAY_DIE5, 0, 0},        // S_MPLAY_DIE4
+    {SPR_MAGE, 11, 6, A_NoBlocking, S_MPLAY_DIE6, 0, 0},        // S_MPLAY_DIE5
+    {SPR_MAGE, 12, 6, NULL, S_MPLAY_DIE7, 0, 0},        // S_MPLAY_DIE6
+    {SPR_MAGE, 13, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_MPLAY_DIE7
+    {SPR_MAGE, 14, 5, A_Scream, S_MPLAY_XDIE2, 0, 0},   // S_MPLAY_XDIE1
+    {SPR_MAGE, 15, 5, NULL, S_MPLAY_XDIE3, 0, 0},       // S_MPLAY_XDIE2
+    {SPR_MAGE, 17, 5, A_NoBlocking, S_MPLAY_XDIE4, 0, 0},       // S_MPLAY_XDIE3
+    {SPR_MAGE, 18, 5, NULL, S_MPLAY_XDIE5, 0, 0},       // S_MPLAY_XDIE4
+    {SPR_MAGE, 19, 5, NULL, S_MPLAY_XDIE6, 0, 0},       // S_MPLAY_XDIE5
+    {SPR_MAGE, 20, 5, NULL, S_MPLAY_XDIE7, 0, 0},       // S_MPLAY_XDIE6
+    {SPR_MAGE, 21, 5, NULL, S_MPLAY_XDIE8, 0, 0},       // S_MPLAY_XDIE7
+    {SPR_MAGE, 22, 5, NULL, S_MPLAY_XDIE9, 0, 0},       // S_MPLAY_XDIE8
+    {SPR_MAGE, 23, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_MPLAY_XDIE9
+    {SPR_MAGE, 24, 5, A_FreezeDeath, S_MPLAY_ICE2, 0, 0},       // S_MPLAY_ICE
+    {SPR_MAGE, 24, 1, A_FreezeDeathChunks, S_MPLAY_ICE2, 0, 0}, // S_MPLAY_ICE2
+    {SPR_PIGY, 0, -1, NULL, S_NULL, 0, 0},      // S_PIGPLAY
+    {SPR_PIGY, 0, 3, NULL, S_PIGPLAY_RUN2, 0, 0},       // S_PIGPLAY_RUN1
+    {SPR_PIGY, 1, 3, NULL, S_PIGPLAY_RUN3, 0, 0},       // S_PIGPLAY_RUN2
+    {SPR_PIGY, 2, 3, NULL, S_PIGPLAY_RUN4, 0, 0},       // S_PIGPLAY_RUN3
+    {SPR_PIGY, 3, 3, NULL, S_PIGPLAY_RUN1, 0, 0},       // S_PIGPLAY_RUN4
+    {SPR_PIGY, 0, 12, NULL, S_PIGPLAY, 0, 0},   // S_PIGPLAY_ATK1
+    {SPR_PIGY, 3, 4, A_PigPain, S_PIGPLAY, 0, 0},       // S_PIGPLAY_PAIN
+    {SPR_PIGY, 1, 10, A_PigLook, S_PIG_LOOK1, 0, 0},    // S_PIG_LOOK1
+    {SPR_PIGY, 0, 3, A_PigChase, S_PIG_WALK2, 0, 0},    // S_PIG_WALK1
+    {SPR_PIGY, 1, 3, A_PigChase, S_PIG_WALK3, 0, 0},    // S_PIG_WALK2
+    {SPR_PIGY, 2, 3, A_PigChase, S_PIG_WALK4, 0, 0},    // S_PIG_WALK3
+    {SPR_PIGY, 3, 3, A_PigChase, S_PIG_WALK1, 0, 0},    // S_PIG_WALK4
+    {SPR_PIGY, 3, 4, A_PigPain, S_PIG_WALK1, 0, 0},     // S_PIG_PAIN
+    {SPR_PIGY, 0, 5, A_FaceTarget, S_PIG_ATK2, 0, 0},   // S_PIG_ATK1
+    {SPR_PIGY, 0, 10, A_PigAttack, S_PIG_WALK1, 0, 0},  // S_PIG_ATK2
+    {SPR_PIGY, 4, 4, A_Scream, S_PIG_DIE2, 0, 0},       // S_PIG_DIE1
+    {SPR_PIGY, 5, 3, A_NoBlocking, S_PIG_DIE3, 0, 0},   // S_PIG_DIE2
+    {SPR_PIGY, 6, 4, A_QueueCorpse, S_PIG_DIE4, 0, 0},  // S_PIG_DIE3
+    {SPR_PIGY, 7, 3, NULL, S_PIG_DIE5, 0, 0},   // S_PIG_DIE4
+    {SPR_PIGY, 8, 4, NULL, S_PIG_DIE6, 0, 0},   // S_PIG_DIE5
+    {SPR_PIGY, 9, 4, NULL, S_PIG_DIE7, 0, 0},   // S_PIG_DIE6
+    {SPR_PIGY, 10, 4, NULL, S_PIG_DIE8, 0, 0},  // S_PIG_DIE7
+    {SPR_PIGY, 11, -1, NULL, S_NULL, 0, 0},     // S_PIG_DIE8
+    {SPR_PIGY, 12, 5, A_FreezeDeath, S_PIG_ICE2, 0, 0}, // S_PIG_ICE
+    {SPR_PIGY, 12, 1, A_FreezeDeathChunks, S_PIG_ICE2, 0, 0},   // S_PIG_ICE2
+    {SPR_CENT, 0, 10, A_Look, S_CENTAUR_LOOK2, 0, 0},   // S_CENTAUR_LOOK1
+    {SPR_CENT, 1, 10, A_Look, S_CENTAUR_LOOK1, 0, 0},   // S_CENTAUR_LOOK2
+    {SPR_CENT, 0, 4, A_Chase, S_CENTAUR_WALK2, 0, 0},   // S_CENTAUR_WALK1
+    {SPR_CENT, 1, 4, A_Chase, S_CENTAUR_WALK3, 0, 0},   // S_CENTAUR_WALK2
+    {SPR_CENT, 2, 4, A_Chase, S_CENTAUR_WALK4, 0, 0},   // S_CENTAUR_WALK3
+    {SPR_CENT, 3, 4, A_Chase, S_CENTAUR_WALK1, 0, 0},   // S_CENTAUR_WALK4
+    {SPR_CENT, 7, 5, A_FaceTarget, S_CENTAUR_ATK2, 0, 0},       // S_CENTAUR_ATK1
+    {SPR_CENT, 8, 4, A_FaceTarget, S_CENTAUR_ATK3, 0, 0},       // S_CENTAUR_ATK2
+    {SPR_CENT, 9, 7, A_CentaurAttack, S_CENTAUR_WALK1, 0, 0},   // S_CENTAUR_ATK3
+    {SPR_CENT, 4, 10, A_FaceTarget, S_CENTAUR_MISSILE2, 0, 0},  // S_CENTAUR_MISSILE1
+    {SPR_CENT, 32773, 8, A_CentaurAttack2, S_CENTAUR_MISSILE3, 0, 0},   // S_CENTAUR_MISSILE2
+    {SPR_CENT, 4, 10, A_FaceTarget, S_CENTAUR_MISSILE4, 0, 0},  // S_CENTAUR_MISSILE3
+    {SPR_CENT, 32773, 8, A_CentaurAttack2, S_CENTAUR_WALK1, 0, 0},      // S_CENTAUR_MISSILE4
+    {SPR_CENT, 6, 6, A_Pain, S_CENTAUR_PAIN2, 0, 0},    // S_CENTAUR_PAIN1
+    {SPR_CENT, 6, 6, A_SetReflective, S_CENTAUR_PAIN3, 0, 0},   // S_CENTAUR_PAIN2
+    {SPR_CENT, 4, 15, A_CentaurDefend, S_CENTAUR_PAIN4, 0, 0},  // S_CENTAUR_PAIN3
+    {SPR_CENT, 4, 15, A_CentaurDefend, S_CENTAUR_PAIN5, 0, 0},  // S_CENTAUR_PAIN4
+    {SPR_CENT, 4, 15, A_CentaurDefend, S_CENTAUR_PAIN6, 0, 0},  // S_CENTAUR_PAIN5
+    {SPR_CENT, 4, 1, A_UnSetReflective, S_CENTAUR_WALK1, 0, 0}, // S_CENTAUR_PAIN6
+    {SPR_CENT, 10, 4, NULL, S_CENTAUR_DEATH2, 0, 0},    // S_CENTAUR_DEATH1
+    {SPR_CENT, 11, 4, A_Scream, S_CENTAUR_DEATH3, 0, 0},        // S_CENTAUR_DEATH2
+    {SPR_CENT, 12, 4, NULL, S_CENTAUR_DEATH4, 0, 0},    // S_CENTAUR_DEATH3
+    {SPR_CENT, 13, 4, NULL, S_CENTAUR_DEATH5, 0, 0},    // S_CENTAUR_DEATH4
+    {SPR_CENT, 14, 4, A_NoBlocking, S_CENTAUR_DEATH6, 0, 0},    // S_CENTAUR_DEATH5
+    {SPR_CENT, 15, 4, NULL, S_CENTAUR_DEATH7, 0, 0},    // S_CENTAUR_DEATH6
+    {SPR_CENT, 16, 4, NULL, S_CENTAUR_DEATH8, 0, 0},    // S_CENTAUR_DEATH7
+    {SPR_CENT, 17, 4, A_QueueCorpse, S_CENTAUR_DEATH9, 0, 0},   // S_CENTAUR_DEATH8
+    {SPR_CENT, 18, 4, NULL, S_CENTAUR_DEATH0, 0, 0},    // S_CENTAUR_DEATH9
+    {SPR_CENT, 19, -1, NULL, S_NULL, 0, 0},     // S_CENTAUR_DEATH0
+    {SPR_CTXD, 0, 4, NULL, S_CENTAUR_DEATH_X2, 0, 0},   // S_CENTAUR_DEATH_X1
+    {SPR_CTXD, 1, 4, A_NoBlocking, S_CENTAUR_DEATH_X3, 0, 0},   // S_CENTAUR_DEATH_X2
+    {SPR_CTXD, 2, 4, A_CentaurDropStuff, S_CENTAUR_DEATH_X4, 0, 0},     // S_CENTAUR_DEATH_X3
+    {SPR_CTXD, 3, 3, A_Scream, S_CENTAUR_DEATH_X5, 0, 0},       // S_CENTAUR_DEATH_X4
+    {SPR_CTXD, 4, 4, A_QueueCorpse, S_CENTAUR_DEATH_X6, 0, 0},  // S_CENTAUR_DEATH_X5
+    {SPR_CTXD, 5, 3, NULL, S_CENTAUR_DEATH_X7, 0, 0},   // S_CENTAUR_DEATH_X6
+    {SPR_CTXD, 6, 4, NULL, S_CENTAUR_DEATH_X8, 0, 0},   // S_CENTAUR_DEATH_X7
+    {SPR_CTXD, 7, 3, NULL, S_CENTAUR_DEATH_X9, 0, 0},   // S_CENTAUR_DEATH_X8
+    {SPR_CTXD, 8, 4, NULL, S_CENTAUR_DEATH_X10, 0, 0},  // S_CENTAUR_DEATH_X9
+    {SPR_CTXD, 9, 3, NULL, S_CENTAUR_DEATH_X11, 0, 0},  // S_CENTAUR_DEATH_X10
+    {SPR_CTXD, 10, -1, NULL, S_NULL, 0, 0},     // S_CENTAUR_DEATH_X11
+    {SPR_CENT, 20, 5, A_FreezeDeath, S_CENTAUR_ICE2, 0, 0},     // S_CENTAUR_ICE
+    {SPR_CENT, 20, 1, A_FreezeDeathChunks, S_CENTAUR_ICE2, 0, 0},       // S_CENTAUR_ICE2
+    {SPR_CTFX, 32768, -1, NULL, S_NULL, 0, 0},  // S_CENTAUR_FX1
+    {SPR_CTFX, 32769, 4, NULL, S_CENTAUR_FX_X2, 0, 0},  // S_CENTAUR_FX_X1
+    {SPR_CTFX, 32770, 3, NULL, S_CENTAUR_FX_X3, 0, 0},  // S_CENTAUR_FX_X2
+    {SPR_CTFX, 32771, 4, NULL, S_CENTAUR_FX_X4, 0, 0},  // S_CENTAUR_FX_X3
+    {SPR_CTFX, 32772, 3, NULL, S_CENTAUR_FX_X5, 0, 0},  // S_CENTAUR_FX_X4
+    {SPR_CTFX, 32773, 2, NULL, S_NULL, 0, 0},   // S_CENTAUR_FX_X5
+    {SPR_CTDP, 0, 3, A_CheckFloor, S_CENTAUR_SHIELD2, 0, 0},    // S_CENTAUR_SHIELD1
+    {SPR_CTDP, 1, 3, A_CheckFloor, S_CENTAUR_SHIELD3, 0, 0},    // S_CENTAUR_SHIELD2
+    {SPR_CTDP, 2, 3, A_CheckFloor, S_CENTAUR_SHIELD4, 0, 0},    // S_CENTAUR_SHIELD3
+    {SPR_CTDP, 3, 3, A_CheckFloor, S_CENTAUR_SHIELD5, 0, 0},    // S_CENTAUR_SHIELD4
+    {SPR_CTDP, 4, 3, A_CheckFloor, S_CENTAUR_SHIELD6, 0, 0},    // S_CENTAUR_SHIELD5
+    {SPR_CTDP, 5, 3, A_CheckFloor, S_CENTAUR_SHIELD3, 0, 0},    // S_CENTAUR_SHIELD6
+    {SPR_CTDP, 6, 4, NULL, S_CENTAUR_SHIELD_X2, 0, 0},  // S_CENTAUR_SHIELD_X1
+    {SPR_CTDP, 7, 4, A_QueueCorpse, S_CENTAUR_SHIELD_X3, 0, 0}, // S_CENTAUR_SHIELD_X2
+    {SPR_CTDP, 8, 4, NULL, S_CENTAUR_SHIELD_X4, 0, 0},  // S_CENTAUR_SHIELD_X3
+    {SPR_CTDP, 9, -1, NULL, S_NULL, 0, 0},      // S_CENTAUR_SHIELD_X4
+    {SPR_CTDP, 10, 3, A_CheckFloor, S_CENTAUR_SWORD2, 0, 0},    // S_CENTAUR_SWORD1
+    {SPR_CTDP, 11, 3, A_CheckFloor, S_CENTAUR_SWORD3, 0, 0},    // S_CENTAUR_SWORD2
+    {SPR_CTDP, 12, 3, A_CheckFloor, S_CENTAUR_SWORD4, 0, 0},    // S_CENTAUR_SWORD3
+    {SPR_CTDP, 13, 3, A_CheckFloor, S_CENTAUR_SWORD5, 0, 0},    // S_CENTAUR_SWORD4
+    {SPR_CTDP, 14, 3, A_CheckFloor, S_CENTAUR_SWORD6, 0, 0},    // S_CENTAUR_SWORD5
+    {SPR_CTDP, 15, 3, A_CheckFloor, S_CENTAUR_SWORD7, 0, 0},    // S_CENTAUR_SWORD6
+    {SPR_CTDP, 16, 3, A_CheckFloor, S_CENTAUR_SWORD3, 0, 0},    // S_CENTAUR_SWORD7
+    {SPR_CTDP, 17, 4, NULL, S_CENTAUR_SWORD_X2, 0, 0},  // S_CENTAUR_SWORD_X1
+    {SPR_CTDP, 18, 4, A_QueueCorpse, S_CENTAUR_SWORD_X3, 0, 0}, // S_CENTAUR_SWORD_X2
+    {SPR_CTDP, 19, -1, NULL, S_NULL, 0, 0},     // S_CENTAUR_SWORD_X3
+    {SPR_DEMN, 0, 10, A_Look, S_DEMN_LOOK2, 0, 0},      // S_DEMN_LOOK1
+    {SPR_DEMN, 0, 10, A_Look, S_DEMN_LOOK1, 0, 0},      // S_DEMN_LOOK2
+    {SPR_DEMN, 0, 4, A_Chase, S_DEMN_CHASE2, 0, 0},     // S_DEMN_CHASE1
+    {SPR_DEMN, 1, 4, A_Chase, S_DEMN_CHASE3, 0, 0},     // S_DEMN_CHASE2
+    {SPR_DEMN, 2, 4, A_Chase, S_DEMN_CHASE4, 0, 0},     // S_DEMN_CHASE3
+    {SPR_DEMN, 3, 4, A_Chase, S_DEMN_CHASE1, 0, 0},     // S_DEMN_CHASE4
+    {SPR_DEMN, 4, 6, A_FaceTarget, S_DEMN_ATK1_2, 0, 0},        // S_DEMN_ATK1_1
+    {SPR_DEMN, 5, 8, A_FaceTarget, S_DEMN_ATK1_3, 0, 0},        // S_DEMN_ATK1_2
+    {SPR_DEMN, 6, 6, A_DemonAttack1, S_DEMN_CHASE1, 0, 0},      // S_DEMN_ATK1_3
+    {SPR_DEMN, 4, 5, A_FaceTarget, S_DEMN_ATK2_2, 0, 0},        // S_DEMN_ATK2_1
+    {SPR_DEMN, 5, 6, A_FaceTarget, S_DEMN_ATK2_3, 0, 0},        // S_DEMN_ATK2_2
+    {SPR_DEMN, 6, 5, A_DemonAttack2, S_DEMN_CHASE1, 0, 0},      // S_DEMN_ATK2_3
+    {SPR_DEMN, 4, 4, NULL, S_DEMN_PAIN2, 0, 0}, // S_DEMN_PAIN1
+    {SPR_DEMN, 4, 4, A_Pain, S_DEMN_CHASE1, 0, 0},      // S_DEMN_PAIN2
+    {SPR_DEMN, 7, 6, NULL, S_DEMN_DEATH2, 0, 0},        // S_DEMN_DEATH1
+    {SPR_DEMN, 8, 6, NULL, S_DEMN_DEATH3, 0, 0},        // S_DEMN_DEATH2
+    {SPR_DEMN, 9, 6, A_Scream, S_DEMN_DEATH4, 0, 0},    // S_DEMN_DEATH3
+    {SPR_DEMN, 10, 6, A_NoBlocking, S_DEMN_DEATH5, 0, 0},       // S_DEMN_DEATH4
+    {SPR_DEMN, 11, 6, A_QueueCorpse, S_DEMN_DEATH6, 0, 0},      // S_DEMN_DEATH5
+    {SPR_DEMN, 12, 6, NULL, S_DEMN_DEATH7, 0, 0},       // S_DEMN_DEATH6
+    {SPR_DEMN, 13, 6, NULL, S_DEMN_DEATH8, 0, 0},       // S_DEMN_DEATH7
+    {SPR_DEMN, 14, 6, NULL, S_DEMN_DEATH9, 0, 0},       // S_DEMN_DEATH8
+    {SPR_DEMN, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN_DEATH9
+    {SPR_DEMN, 7, 6, NULL, S_DEMN_XDEATH2, 0, 0},       // S_DEMN_XDEATH1
+    {SPR_DEMN, 8, 6, A_DemonDeath, S_DEMN_XDEATH3, 0, 0},       // S_DEMN_XDEATH2
+    {SPR_DEMN, 9, 6, A_Scream, S_DEMN_XDEATH4, 0, 0},   // S_DEMN_XDEATH3
+    {SPR_DEMN, 10, 6, A_NoBlocking, S_DEMN_XDEATH5, 0, 0},      // S_DEMN_XDEATH4
+    {SPR_DEMN, 11, 6, A_QueueCorpse, S_DEMN_XDEATH6, 0, 0},     // S_DEMN_XDEATH5
+    {SPR_DEMN, 12, 6, NULL, S_DEMN_XDEATH7, 0, 0},      // S_DEMN_XDEATH6
+    {SPR_DEMN, 13, 6, NULL, S_DEMN_XDEATH8, 0, 0},      // S_DEMN_XDEATH7
+    {SPR_DEMN, 14, 6, NULL, S_DEMN_XDEATH9, 0, 0},      // S_DEMN_XDEATH8
+    {SPR_DEMN, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN_XDEATH9
+    {SPR_DEMN, 16, 5, A_FreezeDeath, S_DEMON_ICE2, 0, 0},       // S_DEMON_ICE
+    {SPR_DEMN, 16, 1, A_FreezeDeathChunks, S_DEMON_ICE2, 0, 0}, // S_DEMON_ICE2
+    {SPR_DEMA, 0, 4, NULL, S_DEMONCHUNK1_2, 0, 0},      // S_DEMONCHUNK1_1
+    {SPR_DEMA, 0, 10, A_QueueCorpse, S_DEMONCHUNK1_3, 0, 0},    // S_DEMONCHUNK1_2
+    {SPR_DEMA, 0, 20, NULL, S_DEMONCHUNK1_3, 0, 0},     // S_DEMONCHUNK1_3
+    {SPR_DEMA, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK1_4
+    {SPR_DEMB, 0, 4, NULL, S_DEMONCHUNK2_2, 0, 0},      // S_DEMONCHUNK2_1
+    {SPR_DEMB, 0, 10, A_QueueCorpse, S_DEMONCHUNK2_3, 0, 0},    // S_DEMONCHUNK2_2
+    {SPR_DEMB, 0, 20, NULL, S_DEMONCHUNK2_3, 0, 0},     // S_DEMONCHUNK2_3
+    {SPR_DEMB, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK2_4
+    {SPR_DEMC, 0, 4, NULL, S_DEMONCHUNK3_2, 0, 0},      // S_DEMONCHUNK3_1
+    {SPR_DEMC, 0, 10, A_QueueCorpse, S_DEMONCHUNK3_3, 0, 0},    // S_DEMONCHUNK3_2
+    {SPR_DEMC, 0, 20, NULL, S_DEMONCHUNK3_3, 0, 0},     // S_DEMONCHUNK3_3
+    {SPR_DEMC, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK3_4
+    {SPR_DEMD, 0, 4, NULL, S_DEMONCHUNK4_2, 0, 0},      // S_DEMONCHUNK4_1
+    {SPR_DEMD, 0, 10, A_QueueCorpse, S_DEMONCHUNK4_3, 0, 0},    // S_DEMONCHUNK4_2
+    {SPR_DEMD, 0, 20, NULL, S_DEMONCHUNK4_3, 0, 0},     // S_DEMONCHUNK4_3
+    {SPR_DEMD, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK4_4
+    {SPR_DEME, 0, 4, NULL, S_DEMONCHUNK5_2, 0, 0},      // S_DEMONCHUNK5_1
+    {SPR_DEME, 0, 10, A_QueueCorpse, S_DEMONCHUNK5_3, 0, 0},    // S_DEMONCHUNK5_2
+    {SPR_DEME, 0, 20, NULL, S_DEMONCHUNK5_3, 0, 0},     // S_DEMONCHUNK5_3
+    {SPR_DEME, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK5_4
+    {SPR_DMFX, 32768, 4, NULL, S_DEMONFX_MOVE2, 0, 0},  // S_DEMONFX_MOVE1
+    {SPR_DMFX, 32769, 4, NULL, S_DEMONFX_MOVE3, 0, 0},  // S_DEMONFX_MOVE2
+    {SPR_DMFX, 32770, 4, NULL, S_DEMONFX_MOVE1, 0, 0},  // S_DEMONFX_MOVE3
+    {SPR_DMFX, 32771, 4, NULL, S_DEMONFX_BOOM2, 0, 0},  // S_DEMONFX_BOOM1
+    {SPR_DMFX, 32772, 4, NULL, S_DEMONFX_BOOM3, 0, 0},  // S_DEMONFX_BOOM2
+    {SPR_DMFX, 32773, 3, NULL, S_DEMONFX_BOOM4, 0, 0},  // S_DEMONFX_BOOM3
+    {SPR_DMFX, 32774, 3, NULL, S_DEMONFX_BOOM5, 0, 0},  // S_DEMONFX_BOOM4
+    {SPR_DMFX, 32775, 3, NULL, S_NULL, 0, 0},   // S_DEMONFX_BOOM5
+    {SPR_DEM2, 0, 10, A_Look, S_DEMN2_LOOK2, 0, 0},     // S_DEMN2_LOOK1
+    {SPR_DEM2, 0, 10, A_Look, S_DEMN2_LOOK1, 0, 0},     // S_DEMN2_LOOK2
+    {SPR_DEM2, 0, 4, A_Chase, S_DEMN2_CHASE2, 0, 0},    // S_DEMN2_CHASE1
+    {SPR_DEM2, 1, 4, A_Chase, S_DEMN2_CHASE3, 0, 0},    // S_DEMN2_CHASE2
+    {SPR_DEM2, 2, 4, A_Chase, S_DEMN2_CHASE4, 0, 0},    // S_DEMN2_CHASE3
+    {SPR_DEM2, 3, 4, A_Chase, S_DEMN2_CHASE1, 0, 0},    // S_DEMN2_CHASE4
+    {SPR_DEM2, 4, 6, A_FaceTarget, S_DEMN2_ATK1_2, 0, 0},       // S_DEMN2_ATK1_1
+    {SPR_DEM2, 5, 8, A_FaceTarget, S_DEMN2_ATK1_3, 0, 0},       // S_DEMN2_ATK1_2
+    {SPR_DEM2, 6, 6, A_DemonAttack1, S_DEMN2_CHASE1, 0, 0},     // S_DEMN2_ATK1_3
+    {SPR_DEM2, 4, 5, A_FaceTarget, S_DEMN2_ATK2_2, 0, 0},       // S_DEMN2_ATK2_1
+    {SPR_DEM2, 5, 6, A_FaceTarget, S_DEMN2_ATK2_3, 0, 0},       // S_DEMN2_ATK2_2
+    {SPR_DEM2, 6, 5, A_DemonAttack2, S_DEMN2_CHASE1, 0, 0},     // S_DEMN2_ATK2_3
+    {SPR_DEM2, 4, 4, NULL, S_DEMN2_PAIN2, 0, 0},        // S_DEMN2_PAIN1
+    {SPR_DEM2, 4, 4, A_Pain, S_DEMN2_CHASE1, 0, 0},     // S_DEMN2_PAIN2
+    {SPR_DEM2, 7, 6, NULL, S_DEMN2_DEATH2, 0, 0},       // S_DEMN2_DEATH1
+    {SPR_DEM2, 8, 6, NULL, S_DEMN2_DEATH3, 0, 0},       // S_DEMN2_DEATH2
+    {SPR_DEM2, 9, 6, A_Scream, S_DEMN2_DEATH4, 0, 0},   // S_DEMN2_DEATH3
+    {SPR_DEM2, 10, 6, A_NoBlocking, S_DEMN2_DEATH5, 0, 0},      // S_DEMN2_DEATH4
+    {SPR_DEM2, 11, 6, A_QueueCorpse, S_DEMN2_DEATH6, 0, 0},     // S_DEMN2_DEATH5
+    {SPR_DEM2, 12, 6, NULL, S_DEMN2_DEATH7, 0, 0},      // S_DEMN2_DEATH6
+    {SPR_DEM2, 13, 6, NULL, S_DEMN2_DEATH8, 0, 0},      // S_DEMN2_DEATH7
+    {SPR_DEM2, 14, 6, NULL, S_DEMN2_DEATH9, 0, 0},      // S_DEMN2_DEATH8
+    {SPR_DEM2, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN2_DEATH9
+    {SPR_DEM2, 7, 6, NULL, S_DEMN2_XDEATH2, 0, 0},      // S_DEMN2_XDEATH1
+    {SPR_DEM2, 8, 6, A_Demon2Death, S_DEMN2_XDEATH3, 0, 0},     // S_DEMN2_XDEATH2
+    {SPR_DEM2, 9, 6, A_Scream, S_DEMN2_XDEATH4, 0, 0},  // S_DEMN2_XDEATH3
+    {SPR_DEM2, 10, 6, A_NoBlocking, S_DEMN2_XDEATH5, 0, 0},     // S_DEMN2_XDEATH4
+    {SPR_DEM2, 11, 6, A_QueueCorpse, S_DEMN2_XDEATH6, 0, 0},    // S_DEMN2_XDEATH5
+    {SPR_DEM2, 12, 6, NULL, S_DEMN2_XDEATH7, 0, 0},     // S_DEMN2_XDEATH6
+    {SPR_DEM2, 13, 6, NULL, S_DEMN2_XDEATH8, 0, 0},     // S_DEMN2_XDEATH7
+    {SPR_DEM2, 14, 6, NULL, S_DEMN2_XDEATH9, 0, 0},     // S_DEMN2_XDEATH8
+    {SPR_DEM2, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN2_XDEATH9
+    {SPR_DMBA, 0, 4, NULL, S_DEMON2CHUNK1_2, 0, 0},     // S_DEMON2CHUNK1_1
+    {SPR_DMBA, 0, 10, A_QueueCorpse, S_DEMON2CHUNK1_3, 0, 0},   // S_DEMON2CHUNK1_2
+    {SPR_DMBA, 0, 20, NULL, S_DEMON2CHUNK1_3, 0, 0},    // S_DEMON2CHUNK1_3
+    {SPR_DMBA, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK1_4
+    {SPR_DMBB, 0, 4, NULL, S_DEMON2CHUNK2_2, 0, 0},     // S_DEMON2CHUNK2_1
+    {SPR_DMBB, 0, 10, A_QueueCorpse, S_DEMON2CHUNK2_3, 0, 0},   // S_DEMON2CHUNK2_2
+    {SPR_DMBB, 0, 20, NULL, S_DEMON2CHUNK2_3, 0, 0},    // S_DEMON2CHUNK2_3
+    {SPR_DMBB, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK2_4
+    {SPR_DMBC, 0, 4, NULL, S_DEMON2CHUNK3_2, 0, 0},     // S_DEMON2CHUNK3_1
+    {SPR_DMBC, 0, 10, A_QueueCorpse, S_DEMON2CHUNK3_3, 0, 0},   // S_DEMON2CHUNK3_2
+    {SPR_DMBC, 0, 20, NULL, S_DEMON2CHUNK3_3, 0, 0},    // S_DEMON2CHUNK3_3
+    {SPR_DMBC, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK3_4
+    {SPR_DMBD, 0, 4, NULL, S_DEMON2CHUNK4_2, 0, 0},     // S_DEMON2CHUNK4_1
+    {SPR_DMBD, 0, 10, A_QueueCorpse, S_DEMON2CHUNK4_3, 0, 0},   // S_DEMON2CHUNK4_2
+    {SPR_DMBD, 0, 20, NULL, S_DEMON2CHUNK4_3, 0, 0},    // S_DEMON2CHUNK4_3
+    {SPR_DMBD, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK4_4
+    {SPR_DMBE, 0, 4, NULL, S_DEMON2CHUNK5_2, 0, 0},     // S_DEMON2CHUNK5_1
+    {SPR_DMBE, 0, 10, NULL, S_DEMON2CHUNK5_3, 0, 0},    // S_DEMON2CHUNK5_2
+    {SPR_DMBE, 0, 20, NULL, S_DEMON2CHUNK5_3, 0, 0},    // S_DEMON2CHUNK5_3
+    {SPR_DMBE, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK5_4
+    {SPR_D2FX, 32768, 4, NULL, S_DEMON2FX_MOVE2, 0, 0}, // S_DEMON2FX_MOVE1
+    {SPR_D2FX, 32769, 4, NULL, S_DEMON2FX_MOVE3, 0, 0}, // S_DEMON2FX_MOVE2
+    {SPR_D2FX, 32770, 4, NULL, S_DEMON2FX_MOVE4, 0, 0}, // S_DEMON2FX_MOVE3
+    {SPR_D2FX, 32771, 4, NULL, S_DEMON2FX_MOVE5, 0, 0}, // S_DEMON2FX_MOVE4
+    {SPR_D2FX, 32772, 4, NULL, S_DEMON2FX_MOVE6, 0, 0}, // S_DEMON2FX_MOVE5
+    {SPR_D2FX, 32773, 4, NULL, S_DEMON2FX_MOVE1, 0, 0}, // S_DEMON2FX_MOVE6
+    {SPR_D2FX, 32774, 4, NULL, S_DEMON2FX_BOOM2, 0, 0}, // S_DEMON2FX_BOOM1
+    {SPR_D2FX, 32775, 4, NULL, S_DEMON2FX_BOOM3, 0, 0}, // S_DEMON2FX_BOOM2
+    {SPR_D2FX, 32776, 4, NULL, S_DEMON2FX_BOOM4, 0, 0}, // S_DEMON2FX_BOOM3
+    {SPR_D2FX, 32777, 4, NULL, S_DEMON2FX_BOOM5, 0, 0}, // S_DEMON2FX_BOOM4
+    {SPR_D2FX, 32778, 3, NULL, S_DEMON2FX_BOOM6, 0, 0}, // S_DEMON2FX_BOOM5
+    {SPR_D2FX, 32779, 3, NULL, S_NULL, 0, 0},   // S_DEMON2FX_BOOM6
+    {SPR_WRTH, 0, 2, A_WraithRaiseInit, S_WRAITH_RAISE2, 0, 0}, // S_WRAITH_RAISE1
+    {SPR_WRTH, 0, 2, A_WraithRaise, S_WRAITH_RAISE3, 0, 0},     // S_WRAITH_RAISE2
+    {SPR_WRTH, 0, 2, A_FaceTarget, S_WRAITH_RAISE4, 0, 0},      // S_WRAITH_RAISE3
+    {SPR_WRTH, 1, 2, A_WraithRaise, S_WRAITH_RAISE5, 0, 0},     // S_WRAITH_RAISE4
+    {SPR_WRTH, 1, 2, A_WraithRaise, S_WRAITH_RAISE2, 0, 0},     // S_WRAITH_RAISE5
+    {SPR_WRTH, 0, 10, NULL, S_WRAITH_INIT2, 0, 0},      // S_WRAITH_INIT1
+    {SPR_WRTH, 1, 5, A_WraithInit, S_WRAITH_LOOK1, 0, 0},       // S_WRAITH_INIT2
+    {SPR_WRTH, 0, 15, A_WraithLook, S_WRAITH_LOOK2, 0, 0},      // S_WRAITH_LOOK1
+    {SPR_WRTH, 1, 15, A_WraithLook, S_WRAITH_LOOK1, 0, 0},      // S_WRAITH_LOOK2
+    {SPR_WRTH, 0, 4, A_WraithChase, S_WRAITH_CHASE2, 0, 0},     // S_WRAITH_CHASE1
+    {SPR_WRTH, 1, 4, A_WraithChase, S_WRAITH_CHASE3, 0, 0},     // S_WRAITH_CHASE2
+    {SPR_WRTH, 2, 4, A_WraithChase, S_WRAITH_CHASE4, 0, 0},     // S_WRAITH_CHASE3
+    {SPR_WRTH, 3, 4, A_WraithChase, S_WRAITH_CHASE1, 0, 0},     // S_WRAITH_CHASE4
+    {SPR_WRTH, 4, 6, A_FaceTarget, S_WRAITH_ATK1_2, 0, 0},      // S_WRAITH_ATK1_1
+    {SPR_WRTH, 5, 6, A_WraithFX3, S_WRAITH_ATK1_3, 0, 0},       // S_WRAITH_ATK1_2
+    {SPR_WRTH, 6, 6, A_WraithMelee, S_WRAITH_CHASE1, 0, 0},     // S_WRAITH_ATK1_3
+    {SPR_WRTH, 4, 6, A_FaceTarget, S_WRAITH_ATK2_2, 0, 0},      // S_WRAITH_ATK2_1
+    {SPR_WRTH, 5, 6, NULL, S_WRAITH_ATK2_3, 0, 0},      // S_WRAITH_ATK2_2
+    {SPR_WRTH, 6, 6, A_WraithMissile, S_WRAITH_CHASE1, 0, 0},   // S_WRAITH_ATK2_3
+    {SPR_WRTH, 0, 2, NULL, S_WRAITH_PAIN2, 0, 0},       // S_WRAITH_PAIN1
+    {SPR_WRTH, 7, 6, A_Pain, S_WRAITH_CHASE1, 0, 0},    // S_WRAITH_PAIN2
+    {SPR_WRTH, 8, 4, NULL, S_WRAITH_DEATH1_2, 0, 0},    // S_WRAITH_DEATH1_1
+    {SPR_WRTH, 9, 4, A_Scream, S_WRAITH_DEATH1_3, 0, 0},        // S_WRAITH_DEATH1_2
+    {SPR_WRTH, 10, 4, NULL, S_WRAITH_DEATH1_4, 0, 0},   // S_WRAITH_DEATH1_3
+    {SPR_WRTH, 11, 4, NULL, S_WRAITH_DEATH1_5, 0, 0},   // S_WRAITH_DEATH1_4
+    {SPR_WRTH, 12, 4, A_NoBlocking, S_WRAITH_DEATH1_6, 0, 0},   // S_WRAITH_DEATH1_5
+    {SPR_WRTH, 13, 4, A_QueueCorpse, S_WRAITH_DEATH1_7, 0, 0},  // S_WRAITH_DEATH1_6
+    {SPR_WRTH, 14, 4, NULL, S_WRAITH_DEATH1_8, 0, 0},   // S_WRAITH_DEATH1_7
+    {SPR_WRTH, 15, 5, NULL, S_WRAITH_DEATH1_9, 0, 0},   // S_WRAITH_DEATH1_8
+    {SPR_WRTH, 16, 5, NULL, S_WRAITH_DEATH1_0, 0, 0},   // S_WRAITH_DEATH1_9
+    {SPR_WRTH, 17, -1, NULL, S_NULL, 0, 0},     // S_WRAITH_DEATH1_0
+    {SPR_WRT2, 0, 5, NULL, S_WRAITH_DEATH2_2, 0, 0},    // S_WRAITH_DEATH2_1
+    {SPR_WRT2, 1, 5, A_Scream, S_WRAITH_DEATH2_3, 0, 0},        // S_WRAITH_DEATH2_2
+    {SPR_WRT2, 2, 5, NULL, S_WRAITH_DEATH2_4, 0, 0},    // S_WRAITH_DEATH2_3
+    {SPR_WRT2, 3, 5, NULL, S_WRAITH_DEATH2_5, 0, 0},    // S_WRAITH_DEATH2_4
+    {SPR_WRT2, 4, 5, A_NoBlocking, S_WRAITH_DEATH2_6, 0, 0},    // S_WRAITH_DEATH2_5
+    {SPR_WRT2, 5, 5, A_QueueCorpse, S_WRAITH_DEATH2_7, 0, 0},   // S_WRAITH_DEATH2_6
+    {SPR_WRT2, 6, 5, NULL, S_WRAITH_DEATH2_8, 0, 0},    // S_WRAITH_DEATH2_7
+    {SPR_WRT2, 7, -1, NULL, S_NULL, 0, 0},      // S_WRAITH_DEATH2_8
+    {SPR_WRT2, 8, 5, A_FreezeDeath, S_WRAITH_ICE2, 0, 0},       // S_WRAITH_ICE
+    {SPR_WRT2, 8, 1, A_FreezeDeathChunks, S_WRAITH_ICE2, 0, 0}, // S_WRAITH_ICE2
+    {SPR_WRBL, 32768, 3, NULL, S_WRTHFX_MOVE2, 0, 0},   // S_WRTHFX_MOVE1
+    {SPR_WRBL, 32769, 3, A_WraithFX2, S_WRTHFX_MOVE3, 0, 0},    // S_WRTHFX_MOVE2
+    {SPR_WRBL, 32770, 3, NULL, S_WRTHFX_MOVE1, 0, 0},   // S_WRTHFX_MOVE3
+    {SPR_WRBL, 32771, 4, NULL, S_WRTHFX_BOOM2, 0, 0},   // S_WRTHFX_BOOM1
+    {SPR_WRBL, 32772, 4, A_WraithFX2, S_WRTHFX_BOOM3, 0, 0},    // S_WRTHFX_BOOM2
+    {SPR_WRBL, 32773, 4, NULL, S_WRTHFX_BOOM4, 0, 0},   // S_WRTHFX_BOOM3
+    {SPR_WRBL, 32774, 3, A_WraithFX2, S_WRTHFX_BOOM5, 0, 0},    // S_WRTHFX_BOOM4
+    {SPR_WRBL, 32775, 3, A_WraithFX2, S_WRTHFX_BOOM6, 0, 0},    // S_WRTHFX_BOOM5
+    {SPR_WRBL, 32776, 3, NULL, S_NULL, 0, 0},   // S_WRTHFX_BOOM6
+    {SPR_WRBL, 32777, 4, NULL, S_WRTHFX_SIZZLE2, 0, 0}, // S_WRTHFX_SIZZLE1
+    {SPR_WRBL, 32778, 4, NULL, S_WRTHFX_SIZZLE3, 0, 0}, // S_WRTHFX_SIZZLE2
+    {SPR_WRBL, 32779, 4, NULL, S_WRTHFX_SIZZLE4, 0, 0}, // S_WRTHFX_SIZZLE3
+    {SPR_WRBL, 32780, 4, NULL, S_WRTHFX_SIZZLE5, 0, 0}, // S_WRTHFX_SIZZLE4
+    {SPR_WRBL, 32781, 4, NULL, S_WRTHFX_SIZZLE6, 0, 0}, // S_WRTHFX_SIZZLE5
+    {SPR_WRBL, 32782, 4, NULL, S_WRTHFX_SIZZLE7, 0, 0}, // S_WRTHFX_SIZZLE6
+    {SPR_WRBL, 32783, 4, NULL, S_NULL, 0, 0},   // S_WRTHFX_SIZZLE7
+    {SPR_WRBL, 32784, 4, NULL, S_WRTHFX_DROP2, 0, 0},   // S_WRTHFX_DROP1
+    {SPR_WRBL, 32785, 4, NULL, S_WRTHFX_DROP3, 0, 0},   // S_WRTHFX_DROP2
+    {SPR_WRBL, 32786, 4, NULL, S_WRTHFX_DROP1, 0, 0},   // S_WRTHFX_DROP3
+    {SPR_WRBL, 32786, 4, NULL, S_NULL, 0, 0},   // S_WRTHFX_DEAD1
+    {SPR_WRBL, 19, 4, NULL, S_WRTHFX_ADROP2, 0, 0},     // S_WRTHFX_ADROP1
+    {SPR_WRBL, 20, 4, NULL, S_WRTHFX_ADROP3, 0, 0},     // S_WRTHFX_ADROP2
+    {SPR_WRBL, 21, 4, NULL, S_WRTHFX_ADROP4, 0, 0},     // S_WRTHFX_ADROP3
+    {SPR_WRBL, 22, 4, NULL, S_WRTHFX_ADROP1, 0, 0},     // S_WRTHFX_ADROP4
+    {SPR_WRBL, 22, 10, NULL, S_NULL, 0, 0},     // S_WRTHFX_ADEAD1
+    {SPR_WRBL, 23, 7, NULL, S_WRTHFX_BDROP2, 0, 0},     // S_WRTHFX_BDROP1
+    {SPR_WRBL, 24, 7, NULL, S_WRTHFX_BDROP3, 0, 0},     // S_WRTHFX_BDROP2
+    {SPR_WRBL, 25, 7, NULL, S_WRTHFX_BDROP1, 0, 0},     // S_WRTHFX_BDROP3
+    {SPR_WRBL, 25, 35, NULL, S_NULL, 0, 0},     // S_WRTHFX_BDEAD1
+    {SPR_MNTR, 0, 15, NULL, S_MNTR_SPAWN2, 0, 0},       // S_MNTR_SPAWN1
+    {SPR_MNTR, 0, 15, A_MinotaurFade1, S_MNTR_SPAWN3, 0, 0},    // S_MNTR_SPAWN2
+    {SPR_MNTR, 0, 3, A_MinotaurFade2, S_MNTR_LOOK1, 0, 0},      // S_MNTR_SPAWN3
+    {SPR_MNTR, 0, 10, A_MinotaurLook, S_MNTR_LOOK2, 0, 0},      // S_MNTR_LOOK1
+    {SPR_MNTR, 1, 10, A_MinotaurLook, S_MNTR_LOOK1, 0, 0},      // S_MNTR_LOOK2
+    {SPR_MNTR, 0, 5, A_MinotaurChase, S_MNTR_WALK2, 0, 0},      // S_MNTR_WALK1
+    {SPR_MNTR, 1, 5, A_MinotaurChase, S_MNTR_WALK3, 0, 0},      // S_MNTR_WALK2
+    {SPR_MNTR, 2, 5, A_MinotaurChase, S_MNTR_WALK4, 0, 0},      // S_MNTR_WALK3
+    {SPR_MNTR, 3, 5, A_MinotaurChase, S_MNTR_WALK1, 0, 0},      // S_MNTR_WALK4
+    {SPR_MNTR, 0, 5, A_MinotaurRoam, S_MNTR_ROAM2, 0, 0},       // S_MNTR_ROAM1
+    {SPR_MNTR, 1, 5, A_MinotaurRoam, S_MNTR_ROAM3, 0, 0},       // S_MNTR_ROAM2
+    {SPR_MNTR, 2, 5, A_MinotaurRoam, S_MNTR_ROAM4, 0, 0},       // S_MNTR_ROAM3
+    {SPR_MNTR, 3, 5, A_MinotaurRoam, S_MNTR_ROAM1, 0, 0},       // S_MNTR_ROAM4
+    {SPR_MNTR, 6, 10, A_FaceTarget, S_MNTR_ATK1_2, 0, 0},       // S_MNTR_ATK1_1
+    {SPR_MNTR, 7, 7, A_FaceTarget, S_MNTR_ATK1_3, 0, 0},        // S_MNTR_ATK1_2
+    {SPR_MNTR, 8, 12, A_MinotaurAtk1, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK1_3
+    {SPR_MNTR, 6, 10, A_MinotaurDecide, S_MNTR_ATK2_2, 0, 0},   // S_MNTR_ATK2_1
+    {SPR_MNTR, 9, 4, A_FaceTarget, S_MNTR_ATK2_3, 0, 0},        // S_MNTR_ATK2_2
+    {SPR_MNTR, 10, 9, A_MinotaurAtk2, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK2_3
+    {SPR_MNTR, 6, 10, A_FaceTarget, S_MNTR_ATK3_2, 0, 0},       // S_MNTR_ATK3_1
+    {SPR_MNTR, 7, 7, A_FaceTarget, S_MNTR_ATK3_3, 0, 0},        // S_MNTR_ATK3_2
+    {SPR_MNTR, 8, 12, A_MinotaurAtk3, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK3_3
+    {SPR_MNTR, 8, 12, NULL, S_MNTR_ATK3_1, 0, 0},       // S_MNTR_ATK3_4
+    {SPR_MNTR, 5, 2, A_MinotaurCharge, S_MNTR_ATK4_1, 0, 0},    // S_MNTR_ATK4_1
+    {SPR_MNTR, 4, 3, NULL, S_MNTR_PAIN2, 0, 0}, // S_MNTR_PAIN1
+    {SPR_MNTR, 4, 6, A_Pain, S_MNTR_WALK1, 0, 0},       // S_MNTR_PAIN2
+    {SPR_MNTR, 4, 6, NULL, S_MNTR_DIE2, 0, 0},  // S_MNTR_DIE1
+    {SPR_MNTR, 4, 2, A_Scream, S_MNTR_DIE3, 0, 0},      // S_MNTR_DIE2
+    {SPR_MNTR, 4, 5, A_SmokePuffExit, S_MNTR_DIE4, 0, 0},       // S_MNTR_DIE3
+    {SPR_MNTR, 4, 5, NULL, S_MNTR_DIE5, 0, 0},  // S_MNTR_DIE4
+    {SPR_MNTR, 4, 5, A_NoBlocking, S_MNTR_DIE6, 0, 0},  // S_MNTR_DIE5
+    {SPR_MNTR, 4, 5, NULL, S_MNTR_DIE7, 0, 0},  // S_MNTR_DIE6
+    {SPR_MNTR, 4, 5, A_MinotaurFade1, S_MNTR_DIE8, 0, 0},       // S_MNTR_DIE7
+    {SPR_MNTR, 4, 5, A_MinotaurFade0, S_MNTR_DIE9, 0, 0},       // S_MNTR_DIE8
+    {SPR_MNTR, 4, 10, NULL, S_NULL, 0, 0},      // S_MNTR_DIE9
+    {SPR_FX12, 32768, 6, NULL, S_MNTRFX1_2, 0, 0},      // S_MNTRFX1_1
+    {SPR_FX12, 32769, 6, NULL, S_MNTRFX1_1, 0, 0},      // S_MNTRFX1_2
+    {SPR_FX12, 32770, 5, NULL, S_MNTRFXI1_2, 0, 0},     // S_MNTRFXI1_1
+    {SPR_FX12, 32771, 5, NULL, S_MNTRFXI1_3, 0, 0},     // S_MNTRFXI1_2
+    {SPR_FX12, 32772, 5, NULL, S_MNTRFXI1_4, 0, 0},     // S_MNTRFXI1_3
+    {SPR_FX12, 32773, 5, NULL, S_MNTRFXI1_5, 0, 0},     // S_MNTRFXI1_4
+    {SPR_FX12, 32774, 5, NULL, S_MNTRFXI1_6, 0, 0},     // S_MNTRFXI1_5
+    {SPR_FX12, 32775, 5, NULL, S_NULL, 0, 0},   // S_MNTRFXI1_6
+    {SPR_FX13, 0, 2, A_MntrFloorFire, S_MNTRFX2_1, 0, 0},       // S_MNTRFX2_1
+    {SPR_FX13, 32776, 4, A_Explode, S_MNTRFXI2_2, 0, 0},        // S_MNTRFXI2_1
+    {SPR_FX13, 32777, 4, NULL, S_MNTRFXI2_3, 0, 0},     // S_MNTRFXI2_2
+    {SPR_FX13, 32778, 4, NULL, S_MNTRFXI2_4, 0, 0},     // S_MNTRFXI2_3
+    {SPR_FX13, 32779, 4, NULL, S_MNTRFXI2_5, 0, 0},     // S_MNTRFXI2_4
+    {SPR_FX13, 32780, 4, NULL, S_NULL, 0, 0},   // S_MNTRFXI2_5
+    {SPR_FX13, 32771, 4, NULL, S_MNTRFX3_2, 0, 0},      // S_MNTRFX3_1
+    {SPR_FX13, 32770, 4, NULL, S_MNTRFX3_3, 0, 0},      // S_MNTRFX3_2
+    {SPR_FX13, 32769, 5, NULL, S_MNTRFX3_4, 0, 0},      // S_MNTRFX3_3
+    {SPR_FX13, 32770, 5, NULL, S_MNTRFX3_5, 0, 0},      // S_MNTRFX3_4
+    {SPR_FX13, 32771, 5, NULL, S_MNTRFX3_6, 0, 0},      // S_MNTRFX3_5
+    {SPR_FX13, 32772, 5, NULL, S_MNTRFX3_7, 0, 0},      // S_MNTRFX3_6
+    {SPR_FX13, 32773, 4, NULL, S_MNTRFX3_8, 0, 0},      // S_MNTRFX3_7
+    {SPR_FX13, 32774, 4, NULL, S_MNTRFX3_9, 0, 0},      // S_MNTRFX3_8
+    {SPR_FX13, 32775, 4, NULL, S_NULL, 0, 0},   // S_MNTRFX3_9
+    {SPR_MNSM, 0, 3, NULL, S_MINOSMOKE2, 0, 0}, // S_MINOSMOKE1
+    {SPR_MNSM, 1, 3, NULL, S_MINOSMOKE3, 0, 0}, // S_MINOSMOKE2
+    {SPR_MNSM, 2, 3, NULL, S_MINOSMOKE4, 0, 0}, // S_MINOSMOKE3
+    {SPR_MNSM, 3, 3, NULL, S_MINOSMOKE5, 0, 0}, // S_MINOSMOKE4
+    {SPR_MNSM, 4, 3, NULL, S_MINOSMOKE6, 0, 0}, // S_MINOSMOKE5
+    {SPR_MNSM, 5, 3, NULL, S_MINOSMOKE7, 0, 0}, // S_MINOSMOKE6
+    {SPR_MNSM, 6, 3, NULL, S_MINOSMOKE8, 0, 0}, // S_MINOSMOKE7
+    {SPR_MNSM, 7, 3, NULL, S_MINOSMOKE9, 0, 0}, // S_MINOSMOKE8
+    {SPR_MNSM, 8, 3, NULL, S_MINOSMOKE0, 0, 0}, // S_MINOSMOKE9
+    {SPR_MNSM, 9, 3, NULL, S_MINOSMOKEA, 0, 0}, // S_MINOSMOKE0
+    {SPR_MNSM, 10, 3, NULL, S_MINOSMOKEB, 0, 0},        // S_MINOSMOKEA
+    {SPR_MNSM, 11, 3, NULL, S_MINOSMOKEC, 0, 0},        // S_MINOSMOKEB
+    {SPR_MNSM, 12, 3, NULL, S_MINOSMOKED, 0, 0},        // S_MINOSMOKEC
+    {SPR_MNSM, 13, 3, NULL, S_MINOSMOKEE, 0, 0},        // S_MINOSMOKED
+    {SPR_MNSM, 14, 3, NULL, S_MINOSMOKEF, 0, 0},        // S_MINOSMOKEE
+    {SPR_MNSM, 15, 3, NULL, S_MINOSMOKEG, 0, 0},        // S_MINOSMOKEF
+    {SPR_MNSM, 16, 3, NULL, S_NULL, 0, 0},      // S_MINOSMOKEG
+    {SPR_MNSM, 0, 3, NULL, S_MINOSMOKEX2, 0, 0},        // S_MINOSMOKEX1
+    {SPR_MNSM, 1, 3, NULL, S_MINOSMOKEX3, 0, 0},        // S_MINOSMOKEX2
+    {SPR_MNSM, 2, 3, NULL, S_MINOSMOKEX4, 0, 0},        // S_MINOSMOKEX3
+    {SPR_MNSM, 3, 3, NULL, S_MINOSMOKEX5, 0, 0},        // S_MINOSMOKEX4
+    {SPR_MNSM, 4, 3, NULL, S_MINOSMOKEX6, 0, 0},        // S_MINOSMOKEX5
+    {SPR_MNSM, 5, 3, NULL, S_MINOSMOKEX7, 0, 0},        // S_MINOSMOKEX6
+    {SPR_MNSM, 6, 3, NULL, S_MINOSMOKEX8, 0, 0},        // S_MINOSMOKEX7
+    {SPR_MNSM, 7, 3, NULL, S_MINOSMOKEX9, 0, 0},        // S_MINOSMOKEX8
+    {SPR_MNSM, 8, 3, NULL, S_MINOSMOKEX0, 0, 0},        // S_MINOSMOKEX9
+    {SPR_MNSM, 9, 3, NULL, S_MINOSMOKEXA, 0, 0},        // S_MINOSMOKEX0
+    {SPR_MNSM, 8, 3, NULL, S_MINOSMOKEXB, 0, 0},        // S_MINOSMOKEXA
+    {SPR_MNSM, 7, 3, NULL, S_MINOSMOKEXC, 0, 0},        // S_MINOSMOKEXB
+    {SPR_MNSM, 6, 3, NULL, S_MINOSMOKEXD, 0, 0},        // S_MINOSMOKEXC
+    {SPR_MNSM, 5, 3, NULL, S_MINOSMOKEXE, 0, 0},        // S_MINOSMOKEXD
+    {SPR_MNSM, 4, 3, NULL, S_MINOSMOKEXF, 0, 0},        // S_MINOSMOKEXE
+    {SPR_MNSM, 3, 3, NULL, S_MINOSMOKEXG, 0, 0},        // S_MINOSMOKEXF
+    {SPR_MNSM, 2, 3, NULL, S_MINOSMOKEXH, 0, 0},        // S_MINOSMOKEXG
+    {SPR_MNSM, 1, 3, NULL, S_MINOSMOKEXI, 0, 0},        // S_MINOSMOKEXH
+    {SPR_MNSM, 0, 3, NULL, S_NULL, 0, 0},       // S_MINOSMOKEXI
+    {SPR_SSPT, 7, 10, A_Look, S_SERPENT_LOOK1, 0, 0},   // S_SERPENT_LOOK1
+    {SPR_SSPT, 7, 1, A_SerpentChase, S_SERPENT_SWIM2, 0, 0},    // S_SERPENT_SWIM1
+    {SPR_SSPT, 7, 1, A_SerpentChase, S_SERPENT_SWIM3, 0, 0},    // S_SERPENT_SWIM2
+    {SPR_SSPT, 7, 2, A_SerpentHumpDecide, S_SERPENT_SWIM1, 0, 0},       // S_SERPENT_SWIM3
+    {SPR_SSPT, 7, 3, A_SerpentUnHide, S_SERPENT_HUMP2, 0, 0},   // S_SERPENT_HUMP1
+    {SPR_SSPT, 4, 3, A_SerpentRaiseHump, S_SERPENT_HUMP3, 0, 0},        // S_SERPENT_HUMP2
+    {SPR_SSPT, 5, 3, A_SerpentRaiseHump, S_SERPENT_HUMP4, 0, 0},        // S_SERPENT_HUMP3
+    {SPR_SSPT, 6, 3, A_SerpentRaiseHump, S_SERPENT_HUMP5, 0, 0},        // S_SERPENT_HUMP4
+    {SPR_SSPT, 4, 3, A_SerpentRaiseHump, S_SERPENT_HUMP6, 0, 0},        // S_SERPENT_HUMP5
+    {SPR_SSPT, 5, 3, A_SerpentRaiseHump, S_SERPENT_HUMP7, 0, 0},        // S_SERPENT_HUMP6
+    {SPR_SSPT, 6, 3, NULL, S_SERPENT_HUMP8, 0, 0},      // S_SERPENT_HUMP7
+    {SPR_SSPT, 4, 3, NULL, S_SERPENT_HUMP9, 0, 0},      // S_SERPENT_HUMP8
+    {SPR_SSPT, 5, 3, NULL, S_SERPENT_HUMP10, 0, 0},     // S_SERPENT_HUMP9
+    {SPR_SSPT, 6, 3, A_SerpentLowerHump, S_SERPENT_HUMP11, 0, 0},       // S_SERPENT_HUMP10
+    {SPR_SSPT, 4, 3, A_SerpentLowerHump, S_SERPENT_HUMP12, 0, 0},       // S_SERPENT_HUMP11
+    {SPR_SSPT, 5, 3, A_SerpentLowerHump, S_SERPENT_HUMP13, 0, 0},       // S_SERPENT_HUMP12
+    {SPR_SSPT, 6, 3, A_SerpentLowerHump, S_SERPENT_HUMP14, 0, 0},       // S_SERPENT_HUMP13
+    {SPR_SSPT, 4, 3, A_SerpentLowerHump, S_SERPENT_HUMP15, 0, 0},       // S_SERPENT_HUMP14
+    {SPR_SSPT, 5, 3, A_SerpentHide, S_SERPENT_SWIM1, 0, 0},     // S_SERPENT_HUMP15
+    {SPR_SSPT, 0, 1, A_UnHideThing, S_SERPENT_SURFACE2, 0, 0},  // S_SERPENT_SURFACE1
+    {SPR_SSPT, 0, 1, A_SerpentBirthScream, S_SERPENT_SURFACE3, 0, 0},   // S_SERPENT_SURFACE2
+    {SPR_SSPT, 1, 3, A_SetShootable, S_SERPENT_SURFACE4, 0, 0}, // S_SERPENT_SURFACE3
+    {SPR_SSPT, 2, 3, NULL, S_SERPENT_SURFACE5, 0, 0},   // S_SERPENT_SURFACE4
+    {SPR_SSPT, 3, 4, A_SerpentCheckForAttack, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_SURFACE5
+    {SPR_SSDV, 0, 4, NULL, S_SERPENT_DIVE2, 0, 0},      // S_SERPENT_DIVE1
+    {SPR_SSDV, 1, 4, NULL, S_SERPENT_DIVE3, 0, 0},      // S_SERPENT_DIVE2
+    {SPR_SSDV, 2, 4, NULL, S_SERPENT_DIVE4, 0, 0},      // S_SERPENT_DIVE3
+    {SPR_SSDV, 3, 4, A_UnSetShootable, S_SERPENT_DIVE5, 0, 0},  // S_SERPENT_DIVE4
+    {SPR_SSDV, 4, 3, A_SerpentDiveSound, S_SERPENT_DIVE6, 0, 0},        // S_SERPENT_DIVE5
+    {SPR_SSDV, 5, 3, NULL, S_SERPENT_DIVE7, 0, 0},      // S_SERPENT_DIVE6
+    {SPR_SSDV, 6, 4, NULL, S_SERPENT_DIVE8, 0, 0},      // S_SERPENT_DIVE7
+    {SPR_SSDV, 7, 4, NULL, S_SERPENT_DIVE9, 0, 0},      // S_SERPENT_DIVE8
+    {SPR_SSDV, 8, 3, NULL, S_SERPENT_DIVE10, 0, 0},     // S_SERPENT_DIVE9
+    {SPR_SSDV, 9, 3, A_SerpentHide, S_SERPENT_SWIM1, 0, 0},     // S_SERPENT_DIVE10
+    {SPR_SSPT, 8, 5, A_SerpentWalk, S_SERPENT_WALK2, 0, 0},     // S_SERPENT_WALK1
+    {SPR_SSPT, 9, 5, A_SerpentWalk, S_SERPENT_WALK3, 0, 0},     // S_SERPENT_WALK2
+    {SPR_SSPT, 8, 5, A_SerpentWalk, S_SERPENT_WALK4, 0, 0},     // S_SERPENT_WALK3
+    {SPR_SSPT, 9, 5, A_SerpentCheckForAttack, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_WALK4
+    {SPR_SSPT, 11, 5, NULL, S_SERPENT_PAIN2, 0, 0},     // S_SERPENT_PAIN1
+    {SPR_SSPT, 11, 5, A_Pain, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_PAIN2
+    {SPR_SSPT, 10, 6, A_FaceTarget, S_SERPENT_ATK2, 0, 0},      // S_SERPENT_ATK1
+    {SPR_SSPT, 11, 5, A_SerpentChooseAttack, S_SERPENT_MELEE1, 0, 0},   // S_SERPENT_ATK2
+    {SPR_SSPT, 13, 5, A_SerpentMeleeAttack, S_SERPENT_DIVE1, 0, 0},     // S_SERPENT_MELEE1
+    {SPR_SSPT, 13, 5, A_SerpentMissileAttack, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_MISSILE1
+    {SPR_SSPT, 14, 4, NULL, S_SERPENT_DIE2, 0, 0},      // S_SERPENT_DIE1
+    {SPR_SSPT, 15, 4, A_Scream, S_SERPENT_DIE3, 0, 0},  // S_SERPENT_DIE2
+    {SPR_SSPT, 16, 4, A_NoBlocking, S_SERPENT_DIE4, 0, 0},      // S_SERPENT_DIE3
+    {SPR_SSPT, 17, 4, NULL, S_SERPENT_DIE5, 0, 0},      // S_SERPENT_DIE4
+    {SPR_SSPT, 18, 4, NULL, S_SERPENT_DIE6, 0, 0},      // S_SERPENT_DIE5
+    {SPR_SSPT, 19, 4, NULL, S_SERPENT_DIE7, 0, 0},      // S_SERPENT_DIE6
+    {SPR_SSPT, 20, 4, NULL, S_SERPENT_DIE8, 0, 0},      // S_SERPENT_DIE7
+    {SPR_SSPT, 21, 4, NULL, S_SERPENT_DIE9, 0, 0},      // S_SERPENT_DIE8
+    {SPR_SSPT, 22, 4, NULL, S_SERPENT_DIE10, 0, 0},     // S_SERPENT_DIE9
+    {SPR_SSPT, 23, 4, NULL, S_SERPENT_DIE11, 0, 0},     // S_SERPENT_DIE10
+    {SPR_SSPT, 24, 4, NULL, S_SERPENT_DIE12, 0, 0},     // S_SERPENT_DIE11
+    {SPR_SSPT, 25, 4, NULL, S_NULL, 0, 0},      // S_SERPENT_DIE12
+    {SPR_SSXD, 0, 4, NULL, S_SERPENT_XDIE2, 0, 0},      // S_SERPENT_XDIE1
+    {SPR_SSXD, 1, 4, A_SerpentHeadPop, S_SERPENT_XDIE3, 0, 0},  // S_SERPENT_XDIE2
+    {SPR_SSXD, 2, 4, A_NoBlocking, S_SERPENT_XDIE4, 0, 0},      // S_SERPENT_XDIE3
+    {SPR_SSXD, 3, 4, NULL, S_SERPENT_XDIE5, 0, 0},      // S_SERPENT_XDIE4
+    {SPR_SSXD, 4, 4, NULL, S_SERPENT_XDIE6, 0, 0},      // S_SERPENT_XDIE5
+    {SPR_SSXD, 5, 3, NULL, S_SERPENT_XDIE7, 0, 0},      // S_SERPENT_XDIE6
+    {SPR_SSXD, 6, 3, NULL, S_SERPENT_XDIE8, 0, 0},      // S_SERPENT_XDIE7
+    {SPR_SSXD, 7, 3, A_SerpentSpawnGibs, S_NULL, 0, 0}, // S_SERPENT_XDIE8
+    {SPR_SSPT, 26, 5, A_FreezeDeath, S_SERPENT_ICE2, 0, 0},     // S_SERPENT_ICE
+    {SPR_SSPT, 26, 1, A_FreezeDeathChunks, S_SERPENT_ICE2, 0, 0},       // S_SERPENT_ICE2
+    {SPR_SSFX, 32768, 3, A_ContMobjSound, S_SERPENT_FX2, 0, 0}, // S_SERPENT_FX1
+    {SPR_SSFX, 32769, 3, NULL, S_SERPENT_FX3, 0, 0},    // S_SERPENT_FX2
+    {SPR_SSFX, 32768, 3, NULL, S_SERPENT_FX4, 0, 0},    // S_SERPENT_FX3
+    {SPR_SSFX, 32769, 3, NULL, S_SERPENT_FX1, 0, 0},    // S_SERPENT_FX4
+    {SPR_SSFX, 32770, 4, NULL, S_SERPENT_FX_X2, 0, 0},  // S_SERPENT_FX_X1
+    {SPR_SSFX, 32771, 4, NULL, S_SERPENT_FX_X3, 0, 0},  // S_SERPENT_FX_X2
+    {SPR_SSFX, 32772, 4, NULL, S_SERPENT_FX_X4, 0, 0},  // S_SERPENT_FX_X3
+    {SPR_SSFX, 32773, 4, NULL, S_SERPENT_FX_X5, 0, 0},  // S_SERPENT_FX_X4
+    {SPR_SSFX, 32774, 4, NULL, S_SERPENT_FX_X6, 0, 0},  // S_SERPENT_FX_X5
+    {SPR_SSFX, 32775, 4, NULL, S_NULL, 0, 0},   // S_SERPENT_FX_X6
+    {SPR_SSXD, 8, 4, A_SerpentHeadCheck, S_SERPENT_HEAD2, 0, 0},        // S_SERPENT_HEAD1
+    {SPR_SSXD, 9, 4, A_SerpentHeadCheck, S_SERPENT_HEAD3, 0, 0},        // S_SERPENT_HEAD2
+    {SPR_SSXD, 10, 4, A_SerpentHeadCheck, S_SERPENT_HEAD4, 0, 0},       // S_SERPENT_HEAD3
+    {SPR_SSXD, 11, 4, A_SerpentHeadCheck, S_SERPENT_HEAD5, 0, 0},       // S_SERPENT_HEAD4
+    {SPR_SSXD, 12, 4, A_SerpentHeadCheck, S_SERPENT_HEAD6, 0, 0},       // S_SERPENT_HEAD5
+    {SPR_SSXD, 13, 4, A_SerpentHeadCheck, S_SERPENT_HEAD7, 0, 0},       // S_SERPENT_HEAD6
+    {SPR_SSXD, 14, 4, A_SerpentHeadCheck, S_SERPENT_HEAD8, 0, 0},       // S_SERPENT_HEAD7
+    {SPR_SSXD, 15, 4, A_SerpentHeadCheck, S_SERPENT_HEAD1, 0, 0},       // S_SERPENT_HEAD8
+    {SPR_SSXD, 18, -1, NULL, S_SERPENT_HEAD_X1, 0, 0},  // S_SERPENT_HEAD_X1
+    {SPR_SSXD, 16, 6, NULL, S_SERPENT_GIB1_2, 0, 0},    // S_SERPENT_GIB1_1
+    {SPR_SSXD, 16, 6, A_FloatGib, S_SERPENT_GIB1_3, 0, 0},      // S_SERPENT_GIB1_2
+    {SPR_SSXD, 16, 8, A_FloatGib, S_SERPENT_GIB1_4, 0, 0},      // S_SERPENT_GIB1_3
+    {SPR_SSXD, 16, 8, A_FloatGib, S_SERPENT_GIB1_5, 0, 0},      // S_SERPENT_GIB1_4
+    {SPR_SSXD, 16, 12, A_FloatGib, S_SERPENT_GIB1_6, 0, 0},     // S_SERPENT_GIB1_5
+    {SPR_SSXD, 16, 12, A_FloatGib, S_SERPENT_GIB1_7, 0, 0},     // S_SERPENT_GIB1_6
+    {SPR_SSXD, 16, 232, A_DelayGib, S_SERPENT_GIB1_8, 0, 0},    // S_SERPENT_GIB1_7
+    {SPR_SSXD, 16, 12, A_SinkGib, S_SERPENT_GIB1_9, 0, 0},      // S_SERPENT_GIB1_8
+    {SPR_SSXD, 16, 12, A_SinkGib, S_SERPENT_GIB1_10, 0, 0},     // S_SERPENT_GIB1_9
+    {SPR_SSXD, 16, 8, A_SinkGib, S_SERPENT_GIB1_11, 0, 0},      // S_SERPENT_GIB1_10
+    {SPR_SSXD, 16, 8, A_SinkGib, S_SERPENT_GIB1_12, 0, 0},      // S_SERPENT_GIB1_11
+    {SPR_SSXD, 16, 8, A_SinkGib, S_NULL, 0, 0}, // S_SERPENT_GIB1_12
+    {SPR_SSXD, 17, 6, NULL, S_SERPENT_GIB2_2, 0, 0},    // S_SERPENT_GIB2_1
+    {SPR_SSXD, 17, 6, A_FloatGib, S_SERPENT_GIB2_3, 0, 0},      // S_SERPENT_GIB2_2
+    {SPR_SSXD, 17, 8, A_FloatGib, S_SERPENT_GIB2_4, 0, 0},      // S_SERPENT_GIB2_3
+    {SPR_SSXD, 17, 8, A_FloatGib, S_SERPENT_GIB2_5, 0, 0},      // S_SERPENT_GIB2_4
+    {SPR_SSXD, 17, 12, A_FloatGib, S_SERPENT_GIB2_6, 0, 0},     // S_SERPENT_GIB2_5
+    {SPR_SSXD, 17, 12, A_FloatGib, S_SERPENT_GIB2_7, 0, 0},     // S_SERPENT_GIB2_6
+    {SPR_SSXD, 17, 232, A_DelayGib, S_SERPENT_GIB2_8, 0, 0},    // S_SERPENT_GIB2_7
+    {SPR_SSXD, 17, 12, A_SinkGib, S_SERPENT_GIB2_9, 0, 0},      // S_SERPENT_GIB2_8
+    {SPR_SSXD, 17, 12, A_SinkGib, S_SERPENT_GIB2_10, 0, 0},     // S_SERPENT_GIB2_9
+    {SPR_SSXD, 17, 8, A_SinkGib, S_SERPENT_GIB2_11, 0, 0},      // S_SERPENT_GIB2_10
+    {SPR_SSXD, 17, 8, A_SinkGib, S_SERPENT_GIB2_12, 0, 0},      // S_SERPENT_GIB2_11
+    {SPR_SSXD, 17, 8, A_SinkGib, S_NULL, 0, 0}, // S_SERPENT_GIB2_12
+    {SPR_SSXD, 19, 6, NULL, S_SERPENT_GIB3_2, 0, 0},    // S_SERPENT_GIB3_1
+    {SPR_SSXD, 19, 6, A_FloatGib, S_SERPENT_GIB3_3, 0, 0},      // S_SERPENT_GIB3_2
+    {SPR_SSXD, 19, 8, A_FloatGib, S_SERPENT_GIB3_4, 0, 0},      // S_SERPENT_GIB3_3
+    {SPR_SSXD, 19, 8, A_FloatGib, S_SERPENT_GIB3_5, 0, 0},      // S_SERPENT_GIB3_4
+    {SPR_SSXD, 19, 12, A_FloatGib, S_SERPENT_GIB3_6, 0, 0},     // S_SERPENT_GIB3_5
+    {SPR_SSXD, 19, 12, A_FloatGib, S_SERPENT_GIB3_7, 0, 0},     // S_SERPENT_GIB3_6
+    {SPR_SSXD, 19, 232, A_DelayGib, S_SERPENT_GIB3_8, 0, 0},    // S_SERPENT_GIB3_7
+    {SPR_SSXD, 19, 12, A_SinkGib, S_SERPENT_GIB3_9, 0, 0},      // S_SERPENT_GIB3_8
+    {SPR_SSXD, 19, 12, A_SinkGib, S_SERPENT_GIB3_10, 0, 0},     // S_SERPENT_GIB3_9
+    {SPR_SSXD, 19, 8, A_SinkGib, S_SERPENT_GIB3_11, 0, 0},      // S_SERPENT_GIB3_10
+    {SPR_SSXD, 19, 8, A_SinkGib, S_SERPENT_GIB3_12, 0, 0},      // S_SERPENT_GIB3_11
+    {SPR_SSXD, 19, 8, A_SinkGib, S_NULL, 0, 0}, // S_SERPENT_GIB3_12
+    {SPR_BISH, 0, 10, A_Look, S_BISHOP_LOOK1, 0, 0},    // S_BISHOP_LOOK1
+    {SPR_BISH, 0, 1, A_BishopDecide, S_BISHOP_WALK1, 0, 0},     // S_BISHOP_DECIDE
+    {SPR_BISH, 0, 2, A_BishopDoBlur, S_BISHOP_BLUR2, 0, 0},     // S_BISHOP_BLUR1
+    {SPR_BISH, 0, 4, A_BishopSpawnBlur, S_BISHOP_BLUR2, 0, 0},  // S_BISHOP_BLUR2
+    {SPR_BISH, 0, 2, A_Chase, S_BISHOP_WALK2, 0, 0},    // S_BISHOP_WALK1
+    {SPR_BISH, 0, 2, A_BishopChase, S_BISHOP_WALK3, 0, 0},      // S_BISHOP_WALK2
+    {SPR_BISH, 0, 2, NULL, S_BISHOP_WALK4, 0, 0},       // S_BISHOP_WALK3
+    {SPR_BISH, 1, 2, A_BishopChase, S_BISHOP_WALK5, 0, 0},      // S_BISHOP_WALK4
+    {SPR_BISH, 1, 2, A_Chase, S_BISHOP_WALK6, 0, 0},    // S_BISHOP_WALK5
+    {SPR_BISH, 1, 2, A_BishopChase, S_BISHOP_DECIDE, 0, 0},     // S_BISHOP_WALK6
+    {SPR_BISH, 0, 3, A_FaceTarget, S_BISHOP_ATK2, 0, 0},        // S_BISHOP_ATK1
+    {SPR_BISH, 32771, 3, A_FaceTarget, S_BISHOP_ATK3, 0, 0},    // S_BISHOP_ATK2
+    {SPR_BISH, 32772, 3, A_FaceTarget, S_BISHOP_ATK4, 0, 0},    // S_BISHOP_ATK3
+    {SPR_BISH, 32773, 3, A_BishopAttack, S_BISHOP_ATK5, 0, 0},  // S_BISHOP_ATK4
+    {SPR_BISH, 32773, 5, A_BishopAttack2, S_BISHOP_ATK5, 0, 0}, // S_BISHOP_ATK5
+    {SPR_BISH, 2, 6, A_Pain, S_BISHOP_PAIN2, 0, 0},     // S_BISHOP_PAIN1
+    {SPR_BISH, 2, 6, A_BishopPainBlur, S_BISHOP_PAIN3, 0, 0},   // S_BISHOP_PAIN2
+    {SPR_BISH, 2, 6, A_BishopPainBlur, S_BISHOP_PAIN4, 0, 0},   // S_BISHOP_PAIN3
+    {SPR_BISH, 2, 6, A_BishopPainBlur, S_BISHOP_PAIN5, 0, 0},   // S_BISHOP_PAIN4
+    {SPR_BISH, 2, 0, NULL, S_BISHOP_WALK1, 0, 0},       // S_BISHOP_PAIN5
+    {SPR_BISH, 6, 6, NULL, S_BISHOP_DEATH2, 0, 0},      // S_BISHOP_DEATH1
+    {SPR_BISH, 32775, 6, A_Scream, S_BISHOP_DEATH3, 0, 0},      // S_BISHOP_DEATH2
+    {SPR_BISH, 32776, 5, A_NoBlocking, S_BISHOP_DEATH4, 0, 0},  // S_BISHOP_DEATH3
+    {SPR_BISH, 32777, 5, A_Explode, S_BISHOP_DEATH5, 0, 0},     // S_BISHOP_DEATH4
+    {SPR_BISH, 32778, 5, NULL, S_BISHOP_DEATH6, 0, 0},  // S_BISHOP_DEATH5
+    {SPR_BISH, 32779, 4, NULL, S_BISHOP_DEATH7, 0, 0},  // S_BISHOP_DEATH6
+    {SPR_BISH, 32780, 4, NULL, S_BISHOP_DEATH8, 0, 0},  // S_BISHOP_DEATH7
+    {SPR_BISH, 13, 4, A_BishopPuff, S_BISHOP_DEATH9, 0, 0},     // S_BISHOP_DEATH8
+    {SPR_BISH, 14, 4, A_QueueCorpse, S_BISHOP_DEATH10, 0, 0},   // S_BISHOP_DEATH9
+    {SPR_BISH, 15, -1, NULL, S_NULL, 0, 0},     // S_BISHOP_DEATH10
+    {SPR_BISH, 23, 5, A_FreezeDeath, S_BISHOP_ICE2, 0, 0},      // S_BISHOP_ICE
+    {SPR_BISH, 23, 1, A_FreezeDeathChunks, S_BISHOP_ICE2, 0, 0},        // S_BISHOP_ICE2
+    {SPR_BISH, 16, 5, NULL, S_BISHOP_PUFF2, 0, 0},      // S_BISHOP_PUFF1
+    {SPR_BISH, 17, 5, NULL, S_BISHOP_PUFF3, 0, 0},      // S_BISHOP_PUFF2
+    {SPR_BISH, 18, 5, NULL, S_BISHOP_PUFF4, 0, 0},      // S_BISHOP_PUFF3
+    {SPR_BISH, 19, 5, NULL, S_BISHOP_PUFF5, 0, 0},      // S_BISHOP_PUFF4
+    {SPR_BISH, 20, 6, NULL, S_BISHOP_PUFF6, 0, 0},      // S_BISHOP_PUFF5
+    {SPR_BISH, 21, 6, NULL, S_BISHOP_PUFF7, 0, 0},      // S_BISHOP_PUFF6
+    {SPR_BISH, 22, 5, NULL, S_NULL, 0, 0},      // S_BISHOP_PUFF7
+    {SPR_BISH, 0, 16, NULL, S_BISHOPBLUR2, 0, 0},       // S_BISHOPBLUR1
+    {SPR_BISH, 0, 8, A_SetAltShadow, S_NULL, 0, 0},     // S_BISHOPBLUR2
+    {SPR_BISH, 2, 8, NULL, S_NULL, 0, 0},       // S_BISHOPPAINBLUR1
+    {SPR_BPFX, 32768, 1, A_BishopMissileWeave, S_BISHFX1_2, 0, 0},      // S_BISHFX1_1
+    {SPR_BPFX, 32769, 1, A_BishopMissileWeave, S_BISHFX1_3, 0, 0},      // S_BISHFX1_2
+    {SPR_BPFX, 32768, 1, A_BishopMissileWeave, S_BISHFX1_4, 0, 0},      // S_BISHFX1_3
+    {SPR_BPFX, 32769, 1, A_BishopMissileWeave, S_BISHFX1_5, 0, 0},      // S_BISHFX1_4
+    {SPR_BPFX, 32769, 0, A_BishopMissileSeek, S_BISHFX1_1, 0, 0},       // S_BISHFX1_5
+    {SPR_BPFX, 32770, 4, NULL, S_BISHFXI1_2, 0, 0},     // S_BISHFXI1_1
+    {SPR_BPFX, 32771, 4, NULL, S_BISHFXI1_3, 0, 0},     // S_BISHFXI1_2
+    {SPR_BPFX, 32772, 4, NULL, S_BISHFXI1_4, 0, 0},     // S_BISHFXI1_3
+    {SPR_BPFX, 32773, 4, NULL, S_BISHFXI1_5, 0, 0},     // S_BISHFXI1_4
+    {SPR_BPFX, 32774, 3, NULL, S_BISHFXI1_6, 0, 0},     // S_BISHFXI1_5
+    {SPR_BPFX, 32775, 3, NULL, S_NULL, 0, 0},   // S_BISHFXI1_6
+    {SPR_DRAG, 3, 10, A_Look, S_DRAGON_LOOK1, 0, 0},    // S_DRAGON_LOOK1
+    {SPR_DRAG, 2, 5, NULL, S_DRAGON_INIT2, 0, 0},       // S_DRAGON_INIT
+    {SPR_DRAG, 1, 5, NULL, S_DRAGON_INIT3, 0, 0},       // S_DRAGON_INIT2
+    {SPR_DRAG, 0, 5, A_DragonInitFlight, S_DRAGON_WALK1, 0, 0}, // S_DRAGON_INIT3
+    {SPR_DRAG, 1, 3, A_DragonFlap, S_DRAGON_WALK2, 0, 0},       // S_DRAGON_WALK1
+    {SPR_DRAG, 1, 3, A_DragonFlight, S_DRAGON_WALK3, 0, 0},     // S_DRAGON_WALK2
+    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK4, 0, 0},     // S_DRAGON_WALK3
+    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK5, 0, 0},     // S_DRAGON_WALK4
+    {SPR_DRAG, 3, 3, A_DragonFlight, S_DRAGON_WALK6, 0, 0},     // S_DRAGON_WALK5
+    {SPR_DRAG, 3, 3, A_DragonFlight, S_DRAGON_WALK7, 0, 0},     // S_DRAGON_WALK6
+    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK8, 0, 0},     // S_DRAGON_WALK7
+    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK9, 0, 0},     // S_DRAGON_WALK8
+    {SPR_DRAG, 1, 3, A_DragonFlight, S_DRAGON_WALK10, 0, 0},    // S_DRAGON_WALK9
+    {SPR_DRAG, 1, 3, A_DragonFlight, S_DRAGON_WALK11, 0, 0},    // S_DRAGON_WALK10
+    {SPR_DRAG, 0, 3, A_DragonFlight, S_DRAGON_WALK12, 0, 0},    // S_DRAGON_WALK11
+    {SPR_DRAG, 0, 3, A_DragonFlight, S_DRAGON_WALK1, 0, 0},     // S_DRAGON_WALK12
+    {SPR_DRAG, 4, 8, A_DragonAttack, S_DRAGON_WALK1, 0, 0},     // S_DRAGON_ATK1
+    {SPR_DRAG, 5, 10, A_DragonPain, S_DRAGON_WALK1, 0, 0},      // S_DRAGON_PAIN1
+    {SPR_DRAG, 6, 5, A_Scream, S_DRAGON_DEATH2, 0, 0},  // S_DRAGON_DEATH1
+    {SPR_DRAG, 7, 4, A_NoBlocking, S_DRAGON_DEATH3, 0, 0},      // S_DRAGON_DEATH2
+    {SPR_DRAG, 8, 4, NULL, S_DRAGON_DEATH4, 0, 0},      // S_DRAGON_DEATH3
+    {SPR_DRAG, 9, 4, A_DragonCheckCrash, S_DRAGON_DEATH4, 0, 0},        // S_DRAGON_DEATH4
+    {SPR_DRAG, 10, 5, NULL, S_DRAGON_CRASH2, 0, 0},     // S_DRAGON_CRASH1
+    {SPR_DRAG, 11, 5, NULL, S_DRAGON_CRASH3, 0, 0},     // S_DRAGON_CRASH2
+    {SPR_DRAG, 12, -1, NULL, S_NULL, 0, 0},     // S_DRAGON_CRASH3
+    {SPR_DRFX, 32768, 4, NULL, S_DRAGON_FX1_2, 0, 0},   // S_DRAGON_FX1_1
+    {SPR_DRFX, 32769, 4, NULL, S_DRAGON_FX1_3, 0, 0},   // S_DRAGON_FX1_2
+    {SPR_DRFX, 32770, 4, NULL, S_DRAGON_FX1_4, 0, 0},   // S_DRAGON_FX1_3
+    {SPR_DRFX, 32771, 4, NULL, S_DRAGON_FX1_5, 0, 0},   // S_DRAGON_FX1_4
+    {SPR_DRFX, 32772, 4, NULL, S_DRAGON_FX1_6, 0, 0},   // S_DRAGON_FX1_5
+    {SPR_DRFX, 32773, 4, NULL, S_DRAGON_FX1_1, 0, 0},   // S_DRAGON_FX1_6
+    {SPR_DRFX, 32774, 4, NULL, S_DRAGON_FX1_X2, 0, 0},  // S_DRAGON_FX1_X1
+    {SPR_DRFX, 32775, 4, NULL, S_DRAGON_FX1_X3, 0, 0},  // S_DRAGON_FX1_X2
+    {SPR_DRFX, 32776, 4, NULL, S_DRAGON_FX1_X4, 0, 0},  // S_DRAGON_FX1_X3
+    {SPR_DRFX, 32777, 4, A_DragonFX2, S_DRAGON_FX1_X5, 0, 0},   // S_DRAGON_FX1_X4
+    {SPR_DRFX, 32778, 3, NULL, S_DRAGON_FX1_X6, 0, 0},  // S_DRAGON_FX1_X5
+    {SPR_DRFX, 32779, 3, NULL, S_NULL, 0, 0},   // S_DRAGON_FX1_X6
+    {SPR_CFCF, 32784, 1, NULL, S_DRAGON_FX2_2, 0, 0},   // S_DRAGON_FX2_1
+    {SPR_CFCF, 32784, 4, A_UnHideThing, S_DRAGON_FX2_3, 0, 0},  // S_DRAGON_FX2_2
+    {SPR_CFCF, 32785, 3, A_Scream, S_DRAGON_FX2_4, 0, 0},       // S_DRAGON_FX2_3
+    {SPR_CFCF, 32786, 4, NULL, S_DRAGON_FX2_5, 0, 0},   // S_DRAGON_FX2_4
+    {SPR_CFCF, 32787, 3, A_Explode, S_DRAGON_FX2_6, 0, 0},      // S_DRAGON_FX2_5
+    {SPR_CFCF, 32788, 4, NULL, S_DRAGON_FX2_7, 0, 0},   // S_DRAGON_FX2_6
+    {SPR_CFCF, 32789, 3, NULL, S_DRAGON_FX2_8, 0, 0},   // S_DRAGON_FX2_7
+    {SPR_CFCF, 32790, 4, NULL, S_DRAGON_FX2_9, 0, 0},   // S_DRAGON_FX2_8
+    {SPR_CFCF, 32791, 3, NULL, S_DRAGON_FX2_10, 0, 0},  // S_DRAGON_FX2_9
+    {SPR_CFCF, 32792, 4, NULL, S_DRAGON_FX2_11, 0, 0},  // S_DRAGON_FX2_10
+    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_DRAGON_FX2_11
+    {SPR_ARM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_1
+    {SPR_ARM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_2
+    {SPR_ARM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_3
+    {SPR_ARM4, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_4
+    {SPR_MAN1, 32768, 4, NULL, S_MANA1_2, 0, 0},        // S_MANA1_1
+    {SPR_MAN1, 32769, 4, NULL, S_MANA1_3, 0, 0},        // S_MANA1_2
+    {SPR_MAN1, 32770, 4, NULL, S_MANA1_4, 0, 0},        // S_MANA1_3
+    {SPR_MAN1, 32771, 4, NULL, S_MANA1_5, 0, 0},        // S_MANA1_4
+    {SPR_MAN1, 32772, 4, NULL, S_MANA1_6, 0, 0},        // S_MANA1_5
+    {SPR_MAN1, 32773, 4, NULL, S_MANA1_7, 0, 0},        // S_MANA1_6
+    {SPR_MAN1, 32774, 4, NULL, S_MANA1_8, 0, 0},        // S_MANA1_7
+    {SPR_MAN1, 32775, 4, NULL, S_MANA1_9, 0, 0},        // S_MANA1_8
+    {SPR_MAN1, 32776, 4, NULL, S_MANA1_1, 0, 0},        // S_MANA1_9
+    {SPR_MAN2, 32768, 4, NULL, S_MANA2_2, 0, 0},        // S_MANA2_1
+    {SPR_MAN2, 32769, 4, NULL, S_MANA2_3, 0, 0},        // S_MANA2_2
+    {SPR_MAN2, 32770, 4, NULL, S_MANA2_4, 0, 0},        // S_MANA2_3
+    {SPR_MAN2, 32771, 4, NULL, S_MANA2_5, 0, 0},        // S_MANA2_4
+    {SPR_MAN2, 32772, 4, NULL, S_MANA2_6, 0, 0},        // S_MANA2_5
+    {SPR_MAN2, 32773, 4, NULL, S_MANA2_7, 0, 0},        // S_MANA2_6
+    {SPR_MAN2, 32774, 4, NULL, S_MANA2_8, 0, 0},        // S_MANA2_7
+    {SPR_MAN2, 32775, 4, NULL, S_MANA2_9, 0, 0},        // S_MANA2_8
+    {SPR_MAN2, 32776, 4, NULL, S_MANA2_10, 0, 0},       // S_MANA2_9
+    {SPR_MAN2, 32777, 4, NULL, S_MANA2_11, 0, 0},       // S_MANA2_10
+    {SPR_MAN2, 32778, 4, NULL, S_MANA2_12, 0, 0},       // S_MANA2_11
+    {SPR_MAN2, 32779, 4, NULL, S_MANA2_13, 0, 0},       // S_MANA2_12
+    {SPR_MAN2, 32780, 4, NULL, S_MANA2_14, 0, 0},       // S_MANA2_13
+    {SPR_MAN2, 32781, 4, NULL, S_MANA2_15, 0, 0},       // S_MANA2_14
+    {SPR_MAN2, 32782, 4, NULL, S_MANA2_16, 0, 0},       // S_MANA2_15
+    {SPR_MAN2, 32783, 4, NULL, S_MANA2_1, 0, 0},        // S_MANA2_16
+    {SPR_MAN3, 32768, 4, NULL, S_MANA3_2, 0, 0},        // S_MANA3_1
+    {SPR_MAN3, 32769, 4, NULL, S_MANA3_3, 0, 0},        // S_MANA3_2
+    {SPR_MAN3, 32770, 4, NULL, S_MANA3_4, 0, 0},        // S_MANA3_3
+    {SPR_MAN3, 32771, 4, NULL, S_MANA3_5, 0, 0},        // S_MANA3_4
+    {SPR_MAN3, 32772, 4, NULL, S_MANA3_6, 0, 0},        // S_MANA3_5
+    {SPR_MAN3, 32773, 4, NULL, S_MANA3_7, 0, 0},        // S_MANA3_6
+    {SPR_MAN3, 32774, 4, NULL, S_MANA3_8, 0, 0},        // S_MANA3_7
+    {SPR_MAN3, 32775, 4, NULL, S_MANA3_9, 0, 0},        // S_MANA3_8
+    {SPR_MAN3, 32776, 4, NULL, S_MANA3_10, 0, 0},       // S_MANA3_9
+    {SPR_MAN3, 32777, 4, NULL, S_MANA3_11, 0, 0},       // S_MANA3_10
+    {SPR_MAN3, 32778, 4, NULL, S_MANA3_12, 0, 0},       // S_MANA3_11
+    {SPR_MAN3, 32779, 4, NULL, S_MANA3_13, 0, 0},       // S_MANA3_12
+    {SPR_MAN3, 32780, 4, NULL, S_MANA3_14, 0, 0},       // S_MANA3_13
+    {SPR_MAN3, 32781, 4, NULL, S_MANA3_15, 0, 0},       // S_MANA3_14
+    {SPR_MAN3, 32782, 4, NULL, S_MANA3_16, 0, 0},       // S_MANA3_15
+    {SPR_MAN3, 32783, 4, NULL, S_MANA3_1, 0, 0},        // S_MANA3_16
+    {SPR_KEY1, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY1
+    {SPR_KEY2, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY2
+    {SPR_KEY3, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY3
+    {SPR_KEY4, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY4
+    {SPR_KEY5, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY5
+    {SPR_KEY6, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY6
+    {SPR_KEY7, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY7
+    {SPR_KEY8, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY8
+    {SPR_KEY9, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY9
+    {SPR_KEYA, 0, -1, NULL, S_NULL, 0, 0},      // S_KEYA
+    {SPR_KEYB, 0, -1, NULL, S_NULL, 0, 0},      // S_KEYB
+    {SPR_TLGL, 0, 1, NULL, S_SND_WIND2, 0, 0},  // S_SND_WIND1
+    {SPR_TLGL, 0, 200, A_ESound, S_SND_WIND2, 0, 0},    // S_SND_WIND2
+    {SPR_TLGL, 0, 85, A_ESound, S_SND_WATERFALL, 0, 0}, // S_SND_WATERFALL
+    {SPR_ETTN, 0, 10, A_Look, S_ETTIN_LOOK2, 0, 0},     // S_ETTIN_LOOK1
+    {SPR_ETTN, 0, 10, A_Look, S_ETTIN_LOOK1, 0, 0},     // S_ETTIN_LOOK2
+    {SPR_ETTN, 0, 5, A_Chase, S_ETTIN_CHASE2, 0, 0},    // S_ETTIN_CHASE1
+    {SPR_ETTN, 1, 5, A_Chase, S_ETTIN_CHASE3, 0, 0},    // S_ETTIN_CHASE2
+    {SPR_ETTN, 2, 5, A_Chase, S_ETTIN_CHASE4, 0, 0},    // S_ETTIN_CHASE3
+    {SPR_ETTN, 3, 5, A_Chase, S_ETTIN_CHASE1, 0, 0},    // S_ETTIN_CHASE4
+    {SPR_ETTN, 7, 7, A_Pain, S_ETTIN_CHASE1, 0, 0},     // S_ETTIN_PAIN1
+    {SPR_ETTN, 4, 6, A_FaceTarget, S_ETTIN_ATK1_2, 0, 0},       // S_ETTIN_ATK1_1
+    {SPR_ETTN, 5, 6, A_FaceTarget, S_ETTIN_ATK1_3, 0, 0},       // S_ETTIN_ATK1_2
+    {SPR_ETTN, 6, 8, A_EttinAttack, S_ETTIN_CHASE1, 0, 0},      // S_ETTIN_ATK1_3
+    {SPR_ETTN, 8, 4, NULL, S_ETTIN_DEATH1_2, 0, 0},     // S_ETTIN_DEATH1_1
+    {SPR_ETTN, 9, 4, NULL, S_ETTIN_DEATH1_3, 0, 0},     // S_ETTIN_DEATH1_2
+    {SPR_ETTN, 10, 4, A_Scream, S_ETTIN_DEATH1_4, 0, 0},        // S_ETTIN_DEATH1_3
+    {SPR_ETTN, 11, 4, A_NoBlocking, S_ETTIN_DEATH1_5, 0, 0},    // S_ETTIN_DEATH1_4
+    {SPR_ETTN, 12, 4, A_QueueCorpse, S_ETTIN_DEATH1_6, 0, 0},   // S_ETTIN_DEATH1_5
+    {SPR_ETTN, 13, 4, NULL, S_ETTIN_DEATH1_7, 0, 0},    // S_ETTIN_DEATH1_6
+    {SPR_ETTN, 14, 4, NULL, S_ETTIN_DEATH1_8, 0, 0},    // S_ETTIN_DEATH1_7
+    {SPR_ETTN, 15, 4, NULL, S_ETTIN_DEATH1_9, 0, 0},    // S_ETTIN_DEATH1_8
+    {SPR_ETTN, 16, -1, NULL, S_NULL, 0, 0},     // S_ETTIN_DEATH1_9
+    {SPR_ETTB, 0, 4, NULL, S_ETTIN_DEATH2_2, 0, 0},     // S_ETTIN_DEATH2_1
+    {SPR_ETTB, 1, 4, A_NoBlocking, S_ETTIN_DEATH2_3, 0, 0},     // S_ETTIN_DEATH2_2
+    {SPR_ETTB, 2, 4, A_DropMace, S_ETTIN_DEATH2_4, 0, 0},       // S_ETTIN_DEATH2_3
+    {SPR_ETTB, 3, 4, A_Scream, S_ETTIN_DEATH2_5, 0, 0}, // S_ETTIN_DEATH2_4
+    {SPR_ETTB, 4, 4, A_QueueCorpse, S_ETTIN_DEATH2_6, 0, 0},    // S_ETTIN_DEATH2_5
+    {SPR_ETTB, 5, 4, NULL, S_ETTIN_DEATH2_7, 0, 0},     // S_ETTIN_DEATH2_6
+    {SPR_ETTB, 6, 4, NULL, S_ETTIN_DEATH2_8, 0, 0},     // S_ETTIN_DEATH2_7
+    {SPR_ETTB, 7, 4, NULL, S_ETTIN_DEATH2_9, 0, 0},     // S_ETTIN_DEATH2_8
+    {SPR_ETTB, 8, 4, NULL, S_ETTIN_DEATH2_0, 0, 0},     // S_ETTIN_DEATH2_9
+    {SPR_ETTB, 9, 4, NULL, S_ETTIN_DEATH2_A, 0, 0},     // S_ETTIN_DEATH2_0
+    {SPR_ETTB, 10, 4, NULL, S_ETTIN_DEATH2_B, 0, 0},    // S_ETTIN_DEATH2_A
+    {SPR_ETTB, 11, -1, NULL, S_NULL, 0, 0},     // S_ETTIN_DEATH2_B
+    {SPR_ETTN, 17, 5, A_FreezeDeath, S_ETTIN_ICE2, 0, 0},       // S_ETTIN_ICE1
+    {SPR_ETTN, 17, 1, A_FreezeDeathChunks, S_ETTIN_ICE2, 0, 0}, // S_ETTIN_ICE2
+    {SPR_ETTB, 12, 5, A_CheckFloor, S_ETTIN_MACE2, 0, 0},       // S_ETTIN_MACE1
+    {SPR_ETTB, 13, 5, A_CheckFloor, S_ETTIN_MACE3, 0, 0},       // S_ETTIN_MACE2
+    {SPR_ETTB, 14, 5, A_CheckFloor, S_ETTIN_MACE4, 0, 0},       // S_ETTIN_MACE3
+    {SPR_ETTB, 15, 5, A_CheckFloor, S_ETTIN_MACE1, 0, 0},       // S_ETTIN_MACE4
+    {SPR_ETTB, 16, 5, NULL, S_ETTIN_MACE6, 0, 0},       // S_ETTIN_MACE5
+    {SPR_ETTB, 17, 5, A_QueueCorpse, S_ETTIN_MACE7, 0, 0},      // S_ETTIN_MACE6
+    {SPR_ETTB, 18, -1, NULL, S_NULL, 0, 0},     // S_ETTIN_MACE7
+    {SPR_FDMN, 32791, 5, NULL, S_FIRED_LOOK1, 0, 0},    // S_FIRED_SPAWN1
+    {SPR_FDMN, 32772, 10, A_Look, S_FIRED_LOOK2, 0, 0}, // S_FIRED_LOOK1
+    {SPR_FDMN, 32773, 10, A_Look, S_FIRED_LOOK3, 0, 0}, // S_FIRED_LOOK2
+    {SPR_FDMN, 32774, 10, A_Look, S_FIRED_LOOK1, 0, 0}, // S_FIRED_LOOK3
+    {SPR_FDMN, 32772, 8, NULL, S_FIRED_LOOK5, 0, 0},    // S_FIRED_LOOK4
+    {SPR_FDMN, 32773, 6, NULL, S_FIRED_LOOK6, 0, 0},    // S_FIRED_LOOK5
+    {SPR_FDMN, 32774, 5, NULL, S_FIRED_LOOK7, 0, 0},    // S_FIRED_LOOK6
+    {SPR_FDMN, 32773, 8, NULL, S_FIRED_LOOK8, 0, 0},    // S_FIRED_LOOK7
+    {SPR_FDMN, 32772, 6, NULL, S_FIRED_LOOK9, 0, 0},    // S_FIRED_LOOK8
+    {SPR_FDMN, 32773, 7, A_FiredRocks, S_FIRED_LOOK0, 0, 0},    // S_FIRED_LOOK9
+    {SPR_FDMN, 32775, 5, NULL, S_FIRED_LOOKA, 0, 0},    // S_FIRED_LOOK0
+    {SPR_FDMN, 32776, 5, NULL, S_FIRED_LOOKB, 0, 0},    // S_FIRED_LOOKA
+    {SPR_FDMN, 32777, 5, A_UnSetInvulnerable, S_FIRED_WALK1, 0, 0},     // S_FIRED_LOOKB
+    {SPR_FDMN, 32768, 5, A_FiredChase, S_FIRED_WALK2, 0, 0},    // S_FIRED_WALK1
+    {SPR_FDMN, 32769, 5, A_FiredChase, S_FIRED_WALK3, 0, 0},    // S_FIRED_WALK2
+    {SPR_FDMN, 32770, 5, A_FiredChase, S_FIRED_WALK1, 0, 0},    // S_FIRED_WALK3
+    {SPR_FDMN, 32771, 6, A_Pain, S_FIRED_WALK1, 0, 0},  // S_FIRED_PAIN1
+    {SPR_FDMN, 32778, 3, A_FaceTarget, S_FIRED_ATTACK2, 0, 0},  // S_FIRED_ATTACK1
+    {SPR_FDMN, 32778, 5, A_FiredAttack, S_FIRED_ATTACK3, 0, 0}, // S_FIRED_ATTACK2
+    {SPR_FDMN, 32778, 5, A_FiredAttack, S_FIRED_ATTACK4, 0, 0}, // S_FIRED_ATTACK3
+    {SPR_FDMN, 32778, 5, A_FiredAttack, S_FIRED_WALK1, 0, 0},   // S_FIRED_ATTACK4
+    {SPR_FDMN, 32771, 4, A_FaceTarget, S_FIRED_DEATH2, 0, 0},   // S_FIRED_DEATH1
+    {SPR_FDMN, 32779, 4, A_Scream, S_FIRED_DEATH3, 0, 0},       // S_FIRED_DEATH2
+    {SPR_FDMN, 32779, 4, A_NoBlocking, S_FIRED_DEATH4, 0, 0},   // S_FIRED_DEATH3
+    {SPR_FDMN, 32779, 200, NULL, S_NULL, 0, 0}, // S_FIRED_DEATH4
+    {SPR_FDMN, 12, 5, A_FaceTarget, S_FIRED_XDEATH2, 0, 0},     // S_FIRED_XDEATH1
+    {SPR_FDMN, 13, 5, A_NoBlocking, S_FIRED_XDEATH3, 0, 0},     // S_FIRED_XDEATH2
+    {SPR_FDMN, 14, 5, A_FiredSplotch, S_NULL, 0, 0},    // S_FIRED_XDEATH3
+    {SPR_FDMN, 17, 5, A_FreezeDeath, S_FIRED_ICE2, 0, 0},       // S_FIRED_ICE1
+    {SPR_FDMN, 17, 1, A_FreezeDeathChunks, S_FIRED_ICE2, 0, 0}, // S_FIRED_ICE2
+    {SPR_FDMN, 15, 3, NULL, S_FIRED_CORPSE2, 0, 0},     // S_FIRED_CORPSE1
+    {SPR_FDMN, 15, 6, A_QueueCorpse, S_FIRED_CORPSE3, 0, 0},    // S_FIRED_CORPSE2
+    {SPR_FDMN, 24, -1, NULL, S_NULL, 0, 0},     // S_FIRED_CORPSE3
+    {SPR_FDMN, 16, 3, NULL, S_FIRED_CORPSE5, 0, 0},     // S_FIRED_CORPSE4
+    {SPR_FDMN, 16, 6, A_QueueCorpse, S_FIRED_CORPSE6, 0, 0},    // S_FIRED_CORPSE5
+    {SPR_FDMN, 25, -1, NULL, S_NULL, 0, 0},     // S_FIRED_CORPSE6
+    {SPR_FDMN, 18, 4, NULL, S_FIRED_RDROP1, 0, 0},      // S_FIRED_RDROP1
+    {SPR_FDMN, 18, 5, A_SmBounce, S_FIRED_RDEAD1_2, 0, 0},      // S_FIRED_RDEAD1_1
+    {SPR_FDMN, 18, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD1_2
+    {SPR_FDMN, 19, 4, NULL, S_FIRED_RDROP2, 0, 0},      // S_FIRED_RDROP2
+    {SPR_FDMN, 19, 5, A_SmBounce, S_FIRED_RDEAD2_2, 0, 0},      // S_FIRED_RDEAD2_1
+    {SPR_FDMN, 19, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD2_2
+    {SPR_FDMN, 20, 4, NULL, S_FIRED_RDROP3, 0, 0},      // S_FIRED_RDROP3
+    {SPR_FDMN, 20, 5, A_SmBounce, S_FIRED_RDEAD3_2, 0, 0},      // S_FIRED_RDEAD3_1
+    {SPR_FDMN, 20, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD3_2
+    {SPR_FDMN, 21, 4, NULL, S_FIRED_RDROP4, 0, 0},      // S_FIRED_RDROP4
+    {SPR_FDMN, 21, 5, A_SmBounce, S_FIRED_RDEAD4_2, 0, 0},      // S_FIRED_RDEAD4_1
+    {SPR_FDMN, 21, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD4_2
+    {SPR_FDMN, 22, 4, NULL, S_FIRED_RDROP5, 0, 0},      // S_FIRED_RDROP5
+    {SPR_FDMN, 22, 5, A_SmBounce, S_FIRED_RDEAD5_2, 0, 0},      // S_FIRED_RDEAD5_1
+    {SPR_FDMN, 22, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD5_2
+    {SPR_FDMB, 32768, 5, NULL, S_FIRED_FX6_1, 0, 0},    // S_FIRED_FX6_1
+    {SPR_FDMB, 32769, 5, NULL, S_FIRED_FX6_3, 0, 0},    // S_FIRED_FX6_2
+    {SPR_FDMB, 32770, 5, NULL, S_FIRED_FX6_4, 0, 0},    // S_FIRED_FX6_3
+    {SPR_FDMB, 32771, 5, NULL, S_FIRED_FX6_5, 0, 0},    // S_FIRED_FX6_4
+    {SPR_FDMB, 32772, 5, NULL, S_NULL, 0, 0},   // S_FIRED_FX6_5
+    {SPR_ICEY, 0, 10, A_IceGuyLook, S_ICEGUY_LOOK, 0, 0},       // S_ICEGUY_LOOK
+    {SPR_ICEY, 0, -1, NULL, S_ICEGUY_LOOK, 0, 0},       // S_ICEGUY_DORMANT
+    {SPR_ICEY, 0, 4, A_Chase, S_ICEGUY_WALK2, 0, 0},    // S_ICEGUY_WALK1
+    {SPR_ICEY, 1, 4, A_IceGuyChase, S_ICEGUY_WALK3, 0, 0},      // S_ICEGUY_WALK2
+    {SPR_ICEY, 2, 4, A_Chase, S_ICEGUY_WALK4, 0, 0},    // S_ICEGUY_WALK3
+    {SPR_ICEY, 3, 4, A_Chase, S_ICEGUY_WALK1, 0, 0},    // S_ICEGUY_WALK4
+    {SPR_ICEY, 4, 3, A_FaceTarget, S_ICEGUY_ATK2, 0, 0},        // S_ICEGUY_ATK1
+    {SPR_ICEY, 5, 3, A_FaceTarget, S_ICEGUY_ATK3, 0, 0},        // S_ICEGUY_ATK2
+    {SPR_ICEY, 32774, 8, A_IceGuyAttack, S_ICEGUY_ATK4, 0, 0},  // S_ICEGUY_ATK3
+    {SPR_ICEY, 5, 4, A_FaceTarget, S_ICEGUY_WALK1, 0, 0},       // S_ICEGUY_ATK4
+    {SPR_ICEY, 0, 1, A_Pain, S_ICEGUY_WALK1, 0, 0},     // S_ICEGUY_PAIN1
+    {SPR_ICEY, 0, 1, A_IceGuyDie, S_NULL, 0, 0},        // S_ICEGUY_DEATH
+    {SPR_ICPR, 32768, 3, A_IceGuyMissilePuff, S_ICEGUY_FX2, 0, 0},      // S_ICEGUY_FX1
+    {SPR_ICPR, 32769, 3, A_IceGuyMissilePuff, S_ICEGUY_FX3, 0, 0},      // S_ICEGUY_FX2
+    {SPR_ICPR, 32770, 3, A_IceGuyMissilePuff, S_ICEGUY_FX1, 0, 0},      // S_ICEGUY_FX3
+    {SPR_ICPR, 32771, 4, NULL, S_ICEGUY_FX_X2, 0, 0},   // S_ICEGUY_FX_X1
+    {SPR_ICPR, 32772, 4, A_IceGuyMissileExplode, S_ICEGUY_FX_X3, 0, 0}, // S_ICEGUY_FX_X2
+    {SPR_ICPR, 32773, 4, NULL, S_ICEGUY_FX_X4, 0, 0},   // S_ICEGUY_FX_X3
+    {SPR_ICPR, 32774, 4, NULL, S_ICEGUY_FX_X5, 0, 0},   // S_ICEGUY_FX_X4
+    {SPR_ICPR, 32775, 3, NULL, S_NULL, 0, 0},   // S_ICEGUY_FX_X5
+    {SPR_ICPR, 8, 3, NULL, S_ICEFX_PUFF2, 0, 0},        // S_ICEFX_PUFF1
+    {SPR_ICPR, 9, 3, NULL, S_ICEFX_PUFF3, 0, 0},        // S_ICEFX_PUFF2
+    {SPR_ICPR, 10, 3, NULL, S_ICEFX_PUFF4, 0, 0},       // S_ICEFX_PUFF3
+    {SPR_ICPR, 11, 2, NULL, S_ICEFX_PUFF5, 0, 0},       // S_ICEFX_PUFF4
+    {SPR_ICPR, 12, 2, NULL, S_NULL, 0, 0},      // S_ICEFX_PUFF5
+    {SPR_ICPR, 32781, 3, NULL, S_ICEGUY_FX2_2, 0, 0},   // S_ICEGUY_FX2_1
+    {SPR_ICPR, 32782, 3, NULL, S_ICEGUY_FX2_3, 0, 0},   // S_ICEGUY_FX2_2
+    {SPR_ICPR, 32783, 3, NULL, S_ICEGUY_FX2_1, 0, 0},   // S_ICEGUY_FX2_3
+    {SPR_ICPR, 32784, 50, NULL, S_NULL, 0, 0},  // S_ICEGUY_BIT1
+    {SPR_ICPR, 32785, 50, NULL, S_NULL, 0, 0},  // S_ICEGUY_BIT2
+    {SPR_ICWS, 0, 2, NULL, S_ICEGUY_WISP1_2, 0, 0},     // S_ICEGUY_WISP1_1
+    {SPR_ICWS, 1, 2, NULL, S_ICEGUY_WISP1_3, 0, 0},     // S_ICEGUY_WISP1_2
+    {SPR_ICWS, 2, 2, NULL, S_ICEGUY_WISP1_4, 0, 0},     // S_ICEGUY_WISP1_3
+    {SPR_ICWS, 3, 2, NULL, S_ICEGUY_WISP1_5, 0, 0},     // S_ICEGUY_WISP1_4
+    {SPR_ICWS, 4, 2, NULL, S_ICEGUY_WISP1_6, 0, 0},     // S_ICEGUY_WISP1_5
+    {SPR_ICWS, 5, 2, NULL, S_ICEGUY_WISP1_7, 0, 0},     // S_ICEGUY_WISP1_6
+    {SPR_ICWS, 6, 2, NULL, S_ICEGUY_WISP1_8, 0, 0},     // S_ICEGUY_WISP1_7
+    {SPR_ICWS, 7, 2, NULL, S_ICEGUY_WISP1_9, 0, 0},     // S_ICEGUY_WISP1_8
+    {SPR_ICWS, 8, 2, NULL, S_NULL, 0, 0},       // S_ICEGUY_WISP1_9
+    {SPR_ICWS, 9, 2, NULL, S_ICEGUY_WISP2_2, 0, 0},     // S_ICEGUY_WISP2_1
+    {SPR_ICWS, 10, 2, NULL, S_ICEGUY_WISP2_3, 0, 0},    // S_ICEGUY_WISP2_2
+    {SPR_ICWS, 11, 2, NULL, S_ICEGUY_WISP2_4, 0, 0},    // S_ICEGUY_WISP2_3
+    {SPR_ICWS, 12, 2, NULL, S_ICEGUY_WISP2_5, 0, 0},    // S_ICEGUY_WISP2_4
+    {SPR_ICWS, 13, 2, NULL, S_ICEGUY_WISP2_6, 0, 0},    // S_ICEGUY_WISP2_5
+    {SPR_ICWS, 14, 2, NULL, S_ICEGUY_WISP2_7, 0, 0},    // S_ICEGUY_WISP2_6
+    {SPR_ICWS, 15, 2, NULL, S_ICEGUY_WISP2_8, 0, 0},    // S_ICEGUY_WISP2_7
+    {SPR_ICWS, 16, 2, NULL, S_ICEGUY_WISP2_9, 0, 0},    // S_ICEGUY_WISP2_8
+    {SPR_ICWS, 17, 2, NULL, S_NULL, 0, 0},      // S_ICEGUY_WISP2_9
+    {SPR_PLAY, 0, 2, NULL, S_FIGHTER2, 0, 0},   // S_FIGHTER
+    {SPR_PLAY, 0, 3, A_ClassBossHealth, S_FIGHTERLOOK, 0, 0},   // S_FIGHTER2
+    {SPR_PLAY, 0, 5, A_Look, S_FIGHTERLOOK, 0, 0},      // S_FIGHTERLOOK
+    {SPR_PLAY, 0, 4, A_FastChase, S_FIGHTER_RUN2, 0, 0},        // S_FIGHTER_RUN1
+    {SPR_PLAY, 1, 4, A_FastChase, S_FIGHTER_RUN3, 0, 0},        // S_FIGHTER_RUN2
+    {SPR_PLAY, 2, 4, A_FastChase, S_FIGHTER_RUN4, 0, 0},        // S_FIGHTER_RUN3
+    {SPR_PLAY, 3, 4, A_FastChase, S_FIGHTER_RUN1, 0, 0},        // S_FIGHTER_RUN4
+    {SPR_PLAY, 4, 8, A_FaceTarget, S_FIGHTER_ATK2, 0, 0},       // S_FIGHTER_ATK1
+    {SPR_PLAY, 5, 8, A_FighterAttack, S_FIGHTER_RUN1, 0, 0},    // S_FIGHTER_ATK2
+    {SPR_PLAY, 6, 4, NULL, S_FIGHTER_PAIN2, 0, 0},      // S_FIGHTER_PAIN
+    {SPR_PLAY, 6, 4, A_Pain, S_FIGHTER_RUN1, 0, 0},     // S_FIGHTER_PAIN2
+    {SPR_PLAY, 7, 6, NULL, S_FIGHTER_DIE2, 0, 0},       // S_FIGHTER_DIE1
+    {SPR_PLAY, 8, 6, A_Scream, S_FIGHTER_DIE3, 0, 0},   // S_FIGHTER_DIE2
+    {SPR_PLAY, 9, 6, NULL, S_FIGHTER_DIE4, 0, 0},       // S_FIGHTER_DIE3
+    {SPR_PLAY, 10, 6, NULL, S_FIGHTER_DIE5, 0, 0},      // S_FIGHTER_DIE4
+    {SPR_PLAY, 11, 6, A_NoBlocking, S_FIGHTER_DIE6, 0, 0},      // S_FIGHTER_DIE5
+    {SPR_PLAY, 12, 6, NULL, S_FIGHTER_DIE7, 0, 0},      // S_FIGHTER_DIE6
+    {SPR_PLAY, 13, -1, NULL, S_NULL, 0, 0},     // S_FIGHTER_DIE7
+    {SPR_PLAY, 14, 5, A_Scream, S_FIGHTER_XDIE2, 0, 0}, // S_FIGHTER_XDIE1
+    {SPR_PLAY, 15, 5, A_SkullPop, S_FIGHTER_XDIE3, 0, 0},       // S_FIGHTER_XDIE2
+    {SPR_PLAY, 17, 5, A_NoBlocking, S_FIGHTER_XDIE4, 0, 0},     // S_FIGHTER_XDIE3
+    {SPR_PLAY, 18, 5, NULL, S_FIGHTER_XDIE5, 0, 0},     // S_FIGHTER_XDIE4
+    {SPR_PLAY, 19, 5, NULL, S_FIGHTER_XDIE6, 0, 0},     // S_FIGHTER_XDIE5
+    {SPR_PLAY, 20, 5, NULL, S_FIGHTER_XDIE7, 0, 0},     // S_FIGHTER_XDIE6
+    {SPR_PLAY, 21, 5, NULL, S_FIGHTER_XDIE8, 0, 0},     // S_FIGHTER_XDIE7
+    {SPR_PLAY, 22, -1, NULL, S_NULL, 0, 0},     // S_FIGHTER_XDIE8
+    {SPR_PLAY, 23, 5, A_FreezeDeath, S_FIGHTER_ICE2, 0, 0},     // S_FIGHTER_ICE
+    {SPR_PLAY, 23, 1, A_FreezeDeathChunks, S_FIGHTER_ICE2, 0, 0},       // S_FIGHTER_ICE2
+    {SPR_CLER, 0, 2, NULL, S_CLERIC2, 0, 0},    // S_CLERIC
+    {SPR_CLER, 0, 3, A_ClassBossHealth, S_CLERICLOOK, 0, 0},    // S_CLERIC2
+    {SPR_CLER, 0, 5, A_Look, S_CLERICLOOK, 0, 0},       // S_CLERICLOOK
+    {SPR_CLER, 0, 4, A_FastChase, S_CLERIC_RUN2, 0, 0}, // S_CLERIC_RUN1
+    {SPR_CLER, 1, 4, A_FastChase, S_CLERIC_RUN3, 0, 0}, // S_CLERIC_RUN2
+    {SPR_CLER, 2, 4, A_FastChase, S_CLERIC_RUN4, 0, 0}, // S_CLERIC_RUN3
+    {SPR_CLER, 3, 4, A_FastChase, S_CLERIC_RUN1, 0, 0}, // S_CLERIC_RUN4
+    {SPR_CLER, 4, 8, A_FaceTarget, S_CLERIC_ATK2, 0, 0},        // S_CLERIC_ATK1
+    {SPR_CLER, 5, 8, A_FaceTarget, S_CLERIC_ATK3, 0, 0},        // S_CLERIC_ATK2
+    {SPR_CLER, 6, 10, A_ClericAttack, S_CLERIC_RUN1, 0, 0},     // S_CLERIC_ATK3
+    {SPR_CLER, 7, 4, NULL, S_CLERIC_PAIN2, 0, 0},       // S_CLERIC_PAIN
+    {SPR_CLER, 7, 4, A_Pain, S_CLERIC_RUN1, 0, 0},      // S_CLERIC_PAIN2
+    {SPR_CLER, 8, 6, NULL, S_CLERIC_DIE2, 0, 0},        // S_CLERIC_DIE1
+    {SPR_CLER, 10, 6, A_Scream, S_CLERIC_DIE3, 0, 0},   // S_CLERIC_DIE2
+    {SPR_CLER, 11, 6, NULL, S_CLERIC_DIE4, 0, 0},       // S_CLERIC_DIE3
+    {SPR_CLER, 11, 6, NULL, S_CLERIC_DIE5, 0, 0},       // S_CLERIC_DIE4
+    {SPR_CLER, 12, 6, A_NoBlocking, S_CLERIC_DIE6, 0, 0},       // S_CLERIC_DIE5
+    {SPR_CLER, 13, 6, NULL, S_CLERIC_DIE7, 0, 0},       // S_CLERIC_DIE6
+    {SPR_CLER, 14, 6, NULL, S_CLERIC_DIE8, 0, 0},       // S_CLERIC_DIE7
+    {SPR_CLER, 15, 6, NULL, S_CLERIC_DIE9, 0, 0},       // S_CLERIC_DIE8
+    {SPR_CLER, 16, -1, NULL, S_NULL, 0, 0},     // S_CLERIC_DIE9
+    {SPR_CLER, 17, 5, A_Scream, S_CLERIC_XDIE2, 0, 0},  // S_CLERIC_XDIE1
+    {SPR_CLER, 18, 5, NULL, S_CLERIC_XDIE3, 0, 0},      // S_CLERIC_XDIE2
+    {SPR_CLER, 19, 5, A_NoBlocking, S_CLERIC_XDIE4, 0, 0},      // S_CLERIC_XDIE3
+    {SPR_CLER, 20, 5, NULL, S_CLERIC_XDIE5, 0, 0},      // S_CLERIC_XDIE4
+    {SPR_CLER, 21, 5, NULL, S_CLERIC_XDIE6, 0, 0},      // S_CLERIC_XDIE5
+    {SPR_CLER, 22, 5, NULL, S_CLERIC_XDIE7, 0, 0},      // S_CLERIC_XDIE6
+    {SPR_CLER, 23, 5, NULL, S_CLERIC_XDIE8, 0, 0},      // S_CLERIC_XDIE7
+    {SPR_CLER, 24, 5, NULL, S_CLERIC_XDIE9, 0, 0},      // S_CLERIC_XDIE8
+    {SPR_CLER, 25, 5, NULL, S_CLERIC_XDIE10, 0, 0},     // S_CLERIC_XDIE9
+    {SPR_CLER, 26, -1, NULL, S_NULL, 0, 0},     // S_CLERIC_XDIE10
+    {SPR_CLER, 27, 5, A_FreezeDeath, S_CLERIC_ICE2, 0, 0},      // S_CLERIC_ICE
+    {SPR_CLER, 27, 1, A_FreezeDeathChunks, S_CLERIC_ICE2, 0, 0},        // S_CLERIC_ICE2
+    {SPR_MAGE, 0, 2, NULL, S_MAGE2, 0, 0},      // S_MAGE
+    {SPR_MAGE, 0, 3, A_ClassBossHealth, S_MAGELOOK, 0, 0},      // S_MAGE2
+    {SPR_MAGE, 0, 5, A_Look, S_MAGELOOK, 0, 0}, // S_MAGELOOK
+    {SPR_MAGE, 0, 4, A_FastChase, S_MAGE_RUN2, 0, 0},   // S_MAGE_RUN1
+    {SPR_MAGE, 1, 4, A_FastChase, S_MAGE_RUN3, 0, 0},   // S_MAGE_RUN2
+    {SPR_MAGE, 2, 4, A_FastChase, S_MAGE_RUN4, 0, 0},   // S_MAGE_RUN3
+    {SPR_MAGE, 3, 4, A_FastChase, S_MAGE_RUN1, 0, 0},   // S_MAGE_RUN4
+    {SPR_MAGE, 4, 8, A_FaceTarget, S_MAGE_ATK2, 0, 0},  // S_MAGE_ATK1
+    {SPR_MAGE, 32773, 8, A_MageAttack, S_MAGE_RUN1, 0, 0},      // S_MAGE_ATK2
+    {SPR_MAGE, 6, 4, NULL, S_MAGE_PAIN2, 0, 0}, // S_MAGE_PAIN
+    {SPR_MAGE, 6, 4, A_Pain, S_MAGE_RUN1, 0, 0},        // S_MAGE_PAIN2
+    {SPR_MAGE, 7, 6, NULL, S_MAGE_DIE2, 0, 0},  // S_MAGE_DIE1
+    {SPR_MAGE, 8, 6, A_Scream, S_MAGE_DIE3, 0, 0},      // S_MAGE_DIE2
+    {SPR_MAGE, 9, 6, NULL, S_MAGE_DIE4, 0, 0},  // S_MAGE_DIE3
+    {SPR_MAGE, 10, 6, NULL, S_MAGE_DIE5, 0, 0}, // S_MAGE_DIE4
+    {SPR_MAGE, 11, 6, A_NoBlocking, S_MAGE_DIE6, 0, 0}, // S_MAGE_DIE5
+    {SPR_MAGE, 12, 6, NULL, S_MAGE_DIE7, 0, 0}, // S_MAGE_DIE6
+    {SPR_MAGE, 13, -1, NULL, S_NULL, 0, 0},     // S_MAGE_DIE7
+    {SPR_MAGE, 14, 5, A_Scream, S_MAGE_XDIE2, 0, 0},    // S_MAGE_XDIE1
+    {SPR_MAGE, 15, 5, NULL, S_MAGE_XDIE3, 0, 0},        // S_MAGE_XDIE2
+    {SPR_MAGE, 17, 5, A_NoBlocking, S_MAGE_XDIE4, 0, 0},        // S_MAGE_XDIE3
+    {SPR_MAGE, 18, 5, NULL, S_MAGE_XDIE5, 0, 0},        // S_MAGE_XDIE4
+    {SPR_MAGE, 19, 5, NULL, S_MAGE_XDIE6, 0, 0},        // S_MAGE_XDIE5
+    {SPR_MAGE, 20, 5, NULL, S_MAGE_XDIE7, 0, 0},        // S_MAGE_XDIE6
+    {SPR_MAGE, 21, 5, NULL, S_MAGE_XDIE8, 0, 0},        // S_MAGE_XDIE7
+    {SPR_MAGE, 22, 5, NULL, S_MAGE_XDIE9, 0, 0},        // S_MAGE_XDIE8
+    {SPR_MAGE, 23, -1, NULL, S_NULL, 0, 0},     // S_MAGE_XDIE9
+    {SPR_MAGE, 24, 5, A_FreezeDeath, S_MAGE_ICE2, 0, 0},        // S_MAGE_ICE
+    {SPR_MAGE, 24, 1, A_FreezeDeathChunks, S_MAGE_ICE2, 0, 0},  // S_MAGE_ICE2
+    {SPR_SORC, 0, 3, NULL, S_SORC_SPAWN2, 0, 0},        // S_SORC_SPAWN1
+    {SPR_SORC, 0, 2, A_SorcSpinBalls, S_SORC_LOOK1, 0, 0},      // S_SORC_SPAWN2
+    {SPR_SORC, 0, 10, A_Look, S_SORC_LOOK1, 0, 0},      // S_SORC_LOOK1
+    {SPR_SORC, 0, 5, A_Chase, S_SORC_WALK2, 0, 0},      // S_SORC_WALK1
+    {SPR_SORC, 1, 5, A_Chase, S_SORC_WALK3, 0, 0},      // S_SORC_WALK2
+    {SPR_SORC, 2, 5, A_Chase, S_SORC_WALK4, 0, 0},      // S_SORC_WALK3
+    {SPR_SORC, 3, 5, A_Chase, S_SORC_WALK1, 0, 0},      // S_SORC_WALK4
+    {SPR_SORC, 6, 8, NULL, S_SORC_PAIN2, 0, 0}, // S_SORC_PAIN1
+    {SPR_SORC, 6, 8, A_Pain, S_SORC_WALK1, 0, 0},       // S_SORC_PAIN2
+    {SPR_SORC, 32773, 6, A_FaceTarget, S_SORC_ATK2_2, 0, 0},    // S_SORC_ATK2_1
+    {SPR_SORC, 32773, 6, A_SpeedBalls, S_SORC_ATK2_3, 0, 0},    // S_SORC_ATK2_2
+    {SPR_SORC, 32773, 6, A_FaceTarget, S_SORC_ATK2_3, 0, 0},    // S_SORC_ATK2_3
+    {SPR_SORC, 32772, 6, NULL, S_SORC_ATTACK2, 0, 0},   // S_SORC_ATTACK1
+    {SPR_SORC, 32772, 6, A_SpawnFizzle, S_SORC_ATTACK3, 0, 0},  // S_SORC_ATTACK2
+    {SPR_SORC, 32772, 5, A_FaceTarget, S_SORC_ATTACK2, 0, 0},   // S_SORC_ATTACK3
+    {SPR_SORC, 32772, 2, NULL, S_SORC_ATTACK5, 0, 0},   // S_SORC_ATTACK4
+    {SPR_SORC, 32772, 2, A_SorcBossAttack, S_SORC_WALK1, 0, 0}, // S_SORC_ATTACK5
+    {SPR_SORC, 32775, 5, NULL, S_SORC_DIE2, 0, 0},      // S_SORC_DIE1
+    {SPR_SORC, 32776, 5, A_FaceTarget, S_SORC_DIE3, 0, 0},      // S_SORC_DIE2
+    {SPR_SORC, 32777, 5, A_Scream, S_SORC_DIE4, 0, 0},  // S_SORC_DIE3
+    {SPR_SORC, 32778, 5, NULL, S_SORC_DIE5, 0, 0},      // S_SORC_DIE4
+    {SPR_SORC, 32779, 5, NULL, S_SORC_DIE6, 0, 0},      // S_SORC_DIE5
+    {SPR_SORC, 32780, 5, NULL, S_SORC_DIE7, 0, 0},      // S_SORC_DIE6
+    {SPR_SORC, 32781, 5, NULL, S_SORC_DIE8, 0, 0},      // S_SORC_DIE7
+    {SPR_SORC, 32782, 5, NULL, S_SORC_DIE9, 0, 0},      // S_SORC_DIE8
+    {SPR_SORC, 32783, 5, NULL, S_SORC_DIE0, 0, 0},      // S_SORC_DIE9
+    {SPR_SORC, 32784, 5, NULL, S_SORC_DIEA, 0, 0},      // S_SORC_DIE0
+    {SPR_SORC, 32785, 5, NULL, S_SORC_DIEB, 0, 0},      // S_SORC_DIEA
+    {SPR_SORC, 32786, 5, NULL, S_SORC_DIEC, 0, 0},      // S_SORC_DIEB
+    {SPR_SORC, 32787, 5, NULL, S_SORC_DIED, 0, 0},      // S_SORC_DIEC
+    {SPR_SORC, 32788, 5, A_NoBlocking, S_SORC_DIEE, 0, 0},      // S_SORC_DIED
+    {SPR_SORC, 32789, 5, NULL, S_SORC_DIEF, 0, 0},      // S_SORC_DIEE
+    {SPR_SORC, 32790, 5, NULL, S_SORC_DIEG, 0, 0},      // S_SORC_DIEF
+    {SPR_SORC, 32791, 5, NULL, S_SORC_DIEH, 0, 0},      // S_SORC_DIEG
+    {SPR_SORC, 32792, 5, NULL, S_SORC_DIEI, 0, 0},      // S_SORC_DIEH
+    {SPR_SORC, 32793, -1, NULL, S_NULL, 0, 0},  // S_SORC_DIEI
+    {SPR_SBMP, 0, 2, A_SorcBallOrbit, S_SORCBALL1_2, 0, 0},     // S_SORCBALL1_1
+    {SPR_SBMP, 1, 2, A_SorcBallOrbit, S_SORCBALL1_3, 0, 0},     // S_SORCBALL1_2
+    {SPR_SBMP, 2, 2, A_SorcBallOrbit, S_SORCBALL1_4, 0, 0},     // S_SORCBALL1_3
+    {SPR_SBMP, 3, 2, A_SorcBallOrbit, S_SORCBALL1_5, 0, 0},     // S_SORCBALL1_4
+    {SPR_SBMP, 4, 2, A_SorcBallOrbit, S_SORCBALL1_6, 0, 0},     // S_SORCBALL1_5
+    {SPR_SBMP, 5, 2, A_SorcBallOrbit, S_SORCBALL1_7, 0, 0},     // S_SORCBALL1_6
+    {SPR_SBMP, 6, 2, A_SorcBallOrbit, S_SORCBALL1_8, 0, 0},     // S_SORCBALL1_7
+    {SPR_SBMP, 7, 2, A_SorcBallOrbit, S_SORCBALL1_9, 0, 0},     // S_SORCBALL1_8
+    {SPR_SBMP, 8, 2, A_SorcBallOrbit, S_SORCBALL1_0, 0, 0},     // S_SORCBALL1_9
+    {SPR_SBMP, 9, 2, A_SorcBallOrbit, S_SORCBALL1_A, 0, 0},     // S_SORCBALL1_0
+    {SPR_SBMP, 10, 2, A_SorcBallOrbit, S_SORCBALL1_B, 0, 0},    // S_SORCBALL1_A
+    {SPR_SBMP, 11, 2, A_SorcBallOrbit, S_SORCBALL1_C, 0, 0},    // S_SORCBALL1_B
+    {SPR_SBMP, 12, 2, A_SorcBallOrbit, S_SORCBALL1_D, 0, 0},    // S_SORCBALL1_C
+    {SPR_SBMP, 13, 2, A_SorcBallOrbit, S_SORCBALL1_E, 0, 0},    // S_SORCBALL1_D
+    {SPR_SBMP, 14, 2, A_SorcBallOrbit, S_SORCBALL1_F, 0, 0},    // S_SORCBALL1_E
+    {SPR_SBMP, 15, 2, A_SorcBallOrbit, S_SORCBALL1_1, 0, 0},    // S_SORCBALL1_F
+    {SPR_SBMP, 0, 5, A_SorcBallPop, S_SORCBALL1_D2, 0, 0},      // S_SORCBALL1_D1
+    {SPR_SBMP, 1, 2, A_BounceCheck, S_SORCBALL1_D2, 0, 0},      // S_SORCBALL1_D2
+    {SPR_SBS4, 3, 5, A_Explode, S_SORCBALL1_D6, 0, 0},  // S_SORCBALL1_D5
+    {SPR_SBS4, 4, 5, NULL, S_SORCBALL1_D7, 0, 0},       // S_SORCBALL1_D6
+    {SPR_SBS4, 5, 6, NULL, S_SORCBALL1_D8, 0, 0},       // S_SORCBALL1_D7
+    {SPR_SBS4, 6, 6, NULL, S_SORCBALL1_D9, 0, 0},       // S_SORCBALL1_D8
+    {SPR_SBS4, 7, 6, NULL, S_NULL, 0, 0},       // S_SORCBALL1_D9
+    {SPR_SBMB, 0, 2, A_SorcBallOrbit, S_SORCBALL2_2, 0, 0},     // S_SORCBALL2_1
+    {SPR_SBMB, 1, 2, A_SorcBallOrbit, S_SORCBALL2_3, 0, 0},     // S_SORCBALL2_2
+    {SPR_SBMB, 2, 2, A_SorcBallOrbit, S_SORCBALL2_4, 0, 0},     // S_SORCBALL2_3
+    {SPR_SBMB, 3, 2, A_SorcBallOrbit, S_SORCBALL2_5, 0, 0},     // S_SORCBALL2_4
+    {SPR_SBMB, 4, 2, A_SorcBallOrbit, S_SORCBALL2_6, 0, 0},     // S_SORCBALL2_5
+    {SPR_SBMB, 5, 2, A_SorcBallOrbit, S_SORCBALL2_7, 0, 0},     // S_SORCBALL2_6
+    {SPR_SBMB, 6, 2, A_SorcBallOrbit, S_SORCBALL2_8, 0, 0},     // S_SORCBALL2_7
+    {SPR_SBMB, 7, 2, A_SorcBallOrbit, S_SORCBALL2_9, 0, 0},     // S_SORCBALL2_8
+    {SPR_SBMB, 8, 2, A_SorcBallOrbit, S_SORCBALL2_0, 0, 0},     // S_SORCBALL2_9
+    {SPR_SBMB, 9, 2, A_SorcBallOrbit, S_SORCBALL2_A, 0, 0},     // S_SORCBALL2_0
+    {SPR_SBMB, 10, 2, A_SorcBallOrbit, S_SORCBALL2_B, 0, 0},    // S_SORCBALL2_A
+    {SPR_SBMB, 11, 2, A_SorcBallOrbit, S_SORCBALL2_C, 0, 0},    // S_SORCBALL2_B
+    {SPR_SBMB, 12, 2, A_SorcBallOrbit, S_SORCBALL2_D, 0, 0},    // S_SORCBALL2_C
+    {SPR_SBMB, 13, 2, A_SorcBallOrbit, S_SORCBALL2_E, 0, 0},    // S_SORCBALL2_D
+    {SPR_SBMB, 14, 2, A_SorcBallOrbit, S_SORCBALL2_F, 0, 0},    // S_SORCBALL2_E
+    {SPR_SBMB, 15, 2, A_SorcBallOrbit, S_SORCBALL2_1, 0, 0},    // S_SORCBALL2_F
+    {SPR_SBMB, 0, 5, A_SorcBallPop, S_SORCBALL2_D2, 0, 0},      // S_SORCBALL2_D1
+    {SPR_SBMB, 1, 2, A_BounceCheck, S_SORCBALL2_D2, 0, 0},      // S_SORCBALL2_D2
+    {SPR_SBS3, 3, 5, A_Explode, S_SORCBALL2_D6, 0, 0},  // S_SORCBALL2_D5
+    {SPR_SBS3, 4, 5, NULL, S_SORCBALL2_D7, 0, 0},       // S_SORCBALL2_D6
+    {SPR_SBS3, 5, 6, NULL, S_SORCBALL2_D8, 0, 0},       // S_SORCBALL2_D7
+    {SPR_SBS3, 6, 6, NULL, S_SORCBALL2_D9, 0, 0},       // S_SORCBALL2_D8
+    {SPR_SBS3, 7, 6, NULL, S_NULL, 0, 0},       // S_SORCBALL2_D9
+    {SPR_SBMG, 0, 2, A_SorcBallOrbit, S_SORCBALL3_2, 0, 0},     // S_SORCBALL3_1
+    {SPR_SBMG, 1, 2, A_SorcBallOrbit, S_SORCBALL3_3, 0, 0},     // S_SORCBALL3_2
+    {SPR_SBMG, 2, 2, A_SorcBallOrbit, S_SORCBALL3_4, 0, 0},     // S_SORCBALL3_3
+    {SPR_SBMG, 3, 2, A_SorcBallOrbit, S_SORCBALL3_5, 0, 0},     // S_SORCBALL3_4
+    {SPR_SBMG, 4, 2, A_SorcBallOrbit, S_SORCBALL3_6, 0, 0},     // S_SORCBALL3_5
+    {SPR_SBMG, 5, 2, A_SorcBallOrbit, S_SORCBALL3_7, 0, 0},     // S_SORCBALL3_6
+    {SPR_SBMG, 6, 2, A_SorcBallOrbit, S_SORCBALL3_8, 0, 0},     // S_SORCBALL3_7
+    {SPR_SBMG, 7, 2, A_SorcBallOrbit, S_SORCBALL3_9, 0, 0},     // S_SORCBALL3_8
+    {SPR_SBMG, 8, 2, A_SorcBallOrbit, S_SORCBALL3_0, 0, 0},     // S_SORCBALL3_9
+    {SPR_SBMG, 9, 2, A_SorcBallOrbit, S_SORCBALL3_A, 0, 0},     // S_SORCBALL3_0
+    {SPR_SBMG, 10, 2, A_SorcBallOrbit, S_SORCBALL3_B, 0, 0},    // S_SORCBALL3_A
+    {SPR_SBMG, 11, 2, A_SorcBallOrbit, S_SORCBALL3_C, 0, 0},    // S_SORCBALL3_B
+    {SPR_SBMG, 12, 2, A_SorcBallOrbit, S_SORCBALL3_D, 0, 0},    // S_SORCBALL3_C
+    {SPR_SBMG, 13, 2, A_SorcBallOrbit, S_SORCBALL3_E, 0, 0},    // S_SORCBALL3_D
+    {SPR_SBMG, 14, 2, A_SorcBallOrbit, S_SORCBALL3_F, 0, 0},    // S_SORCBALL3_E
+    {SPR_SBMG, 15, 2, A_SorcBallOrbit, S_SORCBALL3_1, 0, 0},    // S_SORCBALL3_F
+    {SPR_SBMG, 0, 5, A_SorcBallPop, S_SORCBALL3_D2, 0, 0},      // S_SORCBALL3_D1
+    {SPR_SBMG, 1, 2, A_BounceCheck, S_SORCBALL3_D2, 0, 0},      // S_SORCBALL3_D2
+    {SPR_SBS3, 3, 5, A_Explode, S_SORCBALL3_D6, 0, 0},  // S_SORCBALL3_D5
+    {SPR_SBS3, 4, 5, NULL, S_SORCBALL3_D7, 0, 0},       // S_SORCBALL3_D6
+    {SPR_SBS3, 5, 6, NULL, S_SORCBALL3_D8, 0, 0},       // S_SORCBALL3_D7
+    {SPR_SBS3, 6, 6, NULL, S_SORCBALL3_D9, 0, 0},       // S_SORCBALL3_D8
+    {SPR_SBS3, 7, 6, NULL, S_NULL, 0, 0},       // S_SORCBALL3_D9
+    {SPR_SBS1, 32768, 2, NULL, S_SORCFX1_2, 0, 0},      // S_SORCFX1_1
+    {SPR_SBS1, 32769, 3, A_SorcFX1Seek, S_SORCFX1_3, 0, 0},     // S_SORCFX1_2
+    {SPR_SBS1, 32770, 3, A_SorcFX1Seek, S_SORCFX1_4, 0, 0},     // S_SORCFX1_3
+    {SPR_SBS1, 32771, 3, A_SorcFX1Seek, S_SORCFX1_1, 0, 0},     // S_SORCFX1_4
+    {SPR_FHFX, 32786, 2, A_Explode, S_SORCFX1_D2, 0, 0},        // S_SORCFX1_D1
+    {SPR_FHFX, 32786, 6, NULL, S_SORCFX1_D3, 0, 0},     // S_SORCFX1_D2
+    {SPR_FHFX, 32786, 6, NULL, S_NULL, 0, 0},   // S_SORCFX1_D3
+    {SPR_SBS2, 32768, 3, A_SorcFX2Split, S_SORCFX2_SPLIT1, 0, 0},       // S_SORCFX2_SPLIT1
+    {SPR_SBS2, 32768, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT2, 0, 0},       // S_SORCFX2_ORBIT1
+    {SPR_SBS2, 32769, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT3, 0, 0},       // S_SORCFX2_ORBIT2
+    {SPR_SBS2, 32770, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT4, 0, 0},       // S_SORCFX2_ORBIT3
+    {SPR_SBS2, 32771, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT5, 0, 0},       // S_SORCFX2_ORBIT4
+    {SPR_SBS2, 32772, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT6, 0, 0},       // S_SORCFX2_ORBIT5
+    {SPR_SBS2, 32773, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT7, 0, 0},       // S_SORCFX2_ORBIT6
+    {SPR_SBS2, 32774, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT8, 0, 0},       // S_SORCFX2_ORBIT7
+    {SPR_SBS2, 32775, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT9, 0, 0},       // S_SORCFX2_ORBIT8
+    {SPR_SBS2, 32776, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT0, 0, 0},       // S_SORCFX2_ORBIT9
+    {SPR_SBS2, 32777, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITA, 0, 0},       // S_SORCFX2_ORBIT0
+    {SPR_SBS2, 32778, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITB, 0, 0},       // S_SORCFX2_ORBITA
+    {SPR_SBS2, 32779, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITC, 0, 0},       // S_SORCFX2_ORBITB
+    {SPR_SBS2, 32780, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITD, 0, 0},       // S_SORCFX2_ORBITC
+    {SPR_SBS2, 32781, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITE, 0, 0},       // S_SORCFX2_ORBITD
+    {SPR_SBS2, 32782, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITF, 0, 0},       // S_SORCFX2_ORBITE
+    {SPR_SBS2, 32783, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT1, 0, 0},       // S_SORCFX2_ORBITF
+    {SPR_SBS2, 0, 10, NULL, S_NULL, 0, 0},      // S_SORCFX2T1
+    {SPR_SBS3, 32768, 2, NULL, S_SORCFX3_2, 0, 0},      // S_SORCFX3_1
+    {SPR_SBS3, 32769, 2, NULL, S_SORCFX3_3, 0, 0},      // S_SORCFX3_2
+    {SPR_SBS3, 32770, 2, NULL, S_SORCFX3_1, 0, 0},      // S_SORCFX3_3
+    {SPR_SBS3, 32768, 4, NULL, S_BISHMORPHA, 0, 0},     // S_BISHMORPH1
+    {SPR_BISH, 15, 4, A_SorcererBishopEntry, S_BISHMORPHB, 0, 0},       // S_BISHMORPHA
+    {SPR_BISH, 14, 4, NULL, S_BISHMORPHC, 0, 0},        // S_BISHMORPHB
+    {SPR_BISH, 13, 4, NULL, S_BISHMORPHD, 0, 0},        // S_BISHMORPHC
+    {SPR_BISH, 12, 3, NULL, S_BISHMORPHE, 0, 0},        // S_BISHMORPHD
+    {SPR_BISH, 11, 3, NULL, S_BISHMORPHF, 0, 0},        // S_BISHMORPHE
+    {SPR_BISH, 10, 3, NULL, S_BISHMORPHG, 0, 0},        // S_BISHMORPHF
+    {SPR_BISH, 9, 3, NULL, S_BISHMORPHH, 0, 0}, // S_BISHMORPHG
+    {SPR_BISH, 8, 3, NULL, S_BISHMORPHI, 0, 0}, // S_BISHMORPHH
+    {SPR_BISH, 7, 3, NULL, S_BISHMORPHJ, 0, 0}, // S_BISHMORPHI
+    {SPR_BISH, 6, 3, A_SpawnBishop, S_NULL, 0, 0},      // S_BISHMORPHJ
+    {SPR_SBS3, 3, 3, NULL, S_SORCFX3_EXP2, 0, 0},       // S_SORCFX3_EXP1
+    {SPR_SBS3, 4, 3, NULL, S_SORCFX3_EXP3, 0, 0},       // S_SORCFX3_EXP2
+    {SPR_SBS3, 5, 3, NULL, S_SORCFX3_EXP4, 0, 0},       // S_SORCFX3_EXP3
+    {SPR_SBS3, 6, 3, NULL, S_SORCFX3_EXP5, 0, 0},       // S_SORCFX3_EXP4
+    {SPR_SBS3, 7, 3, NULL, S_NULL, 0, 0},       // S_SORCFX3_EXP5
+    {SPR_SBS4, 32768, 2, A_SorcFX4Check, S_SORCFX4_2, 0, 0},    // S_SORCFX4_1
+    {SPR_SBS4, 32769, 2, A_SorcFX4Check, S_SORCFX4_3, 0, 0},    // S_SORCFX4_2
+    {SPR_SBS4, 32770, 2, A_SorcFX4Check, S_SORCFX4_1, 0, 0},    // S_SORCFX4_3
+    {SPR_SBS4, 32771, 2, NULL, S_SORCFX4_D2, 0, 0},     // S_SORCFX4_D1
+    {SPR_SBS4, 32772, 2, A_Explode, S_SORCFX4_D3, 0, 0},        // S_SORCFX4_D2
+    {SPR_SBS4, 32773, 2, NULL, S_SORCFX4_D4, 0, 0},     // S_SORCFX4_D3
+    {SPR_SBS4, 32774, 2, NULL, S_SORCFX4_D5, 0, 0},     // S_SORCFX4_D4
+    {SPR_SBS4, 32775, 2, NULL, S_NULL, 0, 0},   // S_SORCFX4_D5
+    {SPR_SBFX, 32768, 4, NULL, S_SORCSPARK2, 0, 0},     // S_SORCSPARK1
+    {SPR_SBFX, 32769, 4, NULL, S_SORCSPARK3, 0, 0},     // S_SORCSPARK2
+    {SPR_SBFX, 32770, 4, NULL, S_SORCSPARK4, 0, 0},     // S_SORCSPARK3
+    {SPR_SBFX, 32771, 4, NULL, S_SORCSPARK5, 0, 0},     // S_SORCSPARK4
+    {SPR_SBFX, 32772, 4, NULL, S_SORCSPARK6, 0, 0},     // S_SORCSPARK5
+    {SPR_SBFX, 32773, 4, NULL, S_SORCSPARK7, 0, 0},     // S_SORCSPARK6
+    {SPR_SBFX, 32774, 4, NULL, S_NULL, 0, 0},   // S_SORCSPARK7
+    {SPR_RADE, 0, 4, NULL, S_BLASTEFFECT2, 0, 0},       // S_BLASTEFFECT1
+    {SPR_RADE, 1, 4, NULL, S_BLASTEFFECT3, 0, 0},       // S_BLASTEFFECT2
+    {SPR_RADE, 2, 4, NULL, S_BLASTEFFECT4, 0, 0},       // S_BLASTEFFECT3
+    {SPR_RADE, 3, 4, NULL, S_BLASTEFFECT5, 0, 0},       // S_BLASTEFFECT4
+    {SPR_RADE, 4, 4, NULL, S_BLASTEFFECT6, 0, 0},       // S_BLASTEFFECT5
+    {SPR_RADE, 5, 4, NULL, S_BLASTEFFECT7, 0, 0},       // S_BLASTEFFECT6
+    {SPR_RADE, 6, 4, NULL, S_BLASTEFFECT8, 0, 0},       // S_BLASTEFFECT7
+    {SPR_RADE, 7, 4, NULL, S_BLASTEFFECT9, 0, 0},       // S_BLASTEFFECT8
+    {SPR_RADE, 8, 4, NULL, S_NULL, 0, 0},       // S_BLASTEFFECT9
+    {SPR_WATR, 0, 5, NULL, S_WATERDRIP1, 0, 0}, // S_WATERDRIP1
+    {SPR_KORX, 0, 5, A_Look, S_KORAX_LOOK1, 0, 0},      // S_KORAX_LOOK1
+    {SPR_KORX, 0, 3, A_KoraxStep2, S_KORAX_CHASE2, 0, 0},       // S_KORAX_CHASE1
+    {SPR_KORX, 0, 3, A_KoraxChase, S_KORAX_CHASE3, 0, 0},       // S_KORAX_CHASE2
+    {SPR_KORX, 0, 3, A_KoraxChase, S_KORAX_CHASE4, 0, 0},       // S_KORAX_CHASE3
+    {SPR_KORX, 0, 3, A_KoraxChase, S_KORAX_CHASE5, 0, 0},       // S_KORAX_CHASE4
+    {SPR_KORX, 1, 3, A_KoraxStep, S_KORAX_CHASE6, 0, 0},        // S_KORAX_CHASE5
+    {SPR_KORX, 1, 3, A_KoraxChase, S_KORAX_CHASE7, 0, 0},       // S_KORAX_CHASE6
+    {SPR_KORX, 1, 3, A_KoraxChase, S_KORAX_CHASE8, 0, 0},       // S_KORAX_CHASE7
+    {SPR_KORX, 1, 3, A_KoraxChase, S_KORAX_CHASE9, 0, 0},       // S_KORAX_CHASE8
+    {SPR_KORX, 2, 3, A_KoraxStep2, S_KORAX_CHASE0, 0, 0},       // S_KORAX_CHASE9
+    {SPR_KORX, 2, 3, A_KoraxChase, S_KORAX_CHASEA, 0, 0},       // S_KORAX_CHASE0
+    {SPR_KORX, 2, 3, A_KoraxChase, S_KORAX_CHASEB, 0, 0},       // S_KORAX_CHASEA
+    {SPR_KORX, 2, 3, A_KoraxChase, S_KORAX_CHASEC, 0, 0},       // S_KORAX_CHASEB
+    {SPR_KORX, 3, 3, A_KoraxStep, S_KORAX_CHASED, 0, 0},        // S_KORAX_CHASEC
+    {SPR_KORX, 3, 3, A_KoraxChase, S_KORAX_CHASEE, 0, 0},       // S_KORAX_CHASED
+    {SPR_KORX, 3, 3, A_KoraxChase, S_KORAX_CHASEF, 0, 0},       // S_KORAX_CHASEE
+    {SPR_KORX, 3, 3, A_KoraxChase, S_KORAX_CHASE1, 0, 0},       // S_KORAX_CHASEF
+    {SPR_KORX, 7, 5, A_Pain, S_KORAX_PAIN2, 0, 0},      // S_KORAX_PAIN1
+    {SPR_KORX, 7, 5, NULL, S_KORAX_CHASE2, 0, 0},       // S_KORAX_PAIN2
+    {SPR_KORX, 32772, 2, A_FaceTarget, S_KORAX_ATTACK2, 0, 0},  // S_KORAX_ATTACK1
+    {SPR_KORX, 32772, 5, A_KoraxDecide, S_KORAX_ATTACK2, 0, 0}, // S_KORAX_ATTACK2
+    {SPR_KORX, 32772, 4, A_FaceTarget, S_KORAX_MISSILE2, 0, 0}, // S_KORAX_MISSILE1
+    {SPR_KORX, 32773, 8, A_KoraxMissile, S_KORAX_MISSILE3, 0, 0},       // S_KORAX_MISSILE2
+    {SPR_KORX, 32772, 8, NULL, S_KORAX_CHASE2, 0, 0},   // S_KORAX_MISSILE3
+    {SPR_KORX, 32772, 5, A_FaceTarget, S_KORAX_COMMAND2, 0, 0}, // S_KORAX_COMMAND1
+    {SPR_KORX, 32790, 10, A_FaceTarget, S_KORAX_COMMAND3, 0, 0},        // S_KORAX_COMMAND2
+    {SPR_KORX, 32774, 15, A_KoraxCommand, S_KORAX_COMMAND4, 0, 0},      // S_KORAX_COMMAND3
+    {SPR_KORX, 32790, 10, NULL, S_KORAX_COMMAND5, 0, 0},        // S_KORAX_COMMAND4
+    {SPR_KORX, 32772, 5, NULL, S_KORAX_CHASE2, 0, 0},   // S_KORAX_COMMAND5
+    {SPR_KORX, 8, 5, NULL, S_KORAX_DEATH2, 0, 0},       // S_KORAX_DEATH1
+    {SPR_KORX, 9, 5, A_FaceTarget, S_KORAX_DEATH3, 0, 0},       // S_KORAX_DEATH2
+    {SPR_KORX, 10, 5, A_Scream, S_KORAX_DEATH4, 0, 0},  // S_KORAX_DEATH3
+    {SPR_KORX, 11, 5, NULL, S_KORAX_DEATH5, 0, 0},      // S_KORAX_DEATH4
+    {SPR_KORX, 12, 5, NULL, S_KORAX_DEATH6, 0, 0},      // S_KORAX_DEATH5
+    {SPR_KORX, 13, 5, NULL, S_KORAX_DEATH7, 0, 0},      // S_KORAX_DEATH6
+    {SPR_KORX, 14, 5, NULL, S_KORAX_DEATH8, 0, 0},      // S_KORAX_DEATH7
+    {SPR_KORX, 15, 5, NULL, S_KORAX_DEATH9, 0, 0},      // S_KORAX_DEATH8
+    {SPR_KORX, 16, 10, NULL, S_KORAX_DEATH0, 0, 0},     // S_KORAX_DEATH9
+    {SPR_KORX, 17, 5, A_KoraxBonePop, S_KORAX_DEATHA, 0, 0},    // S_KORAX_DEATH0
+    {SPR_KORX, 18, 5, A_NoBlocking, S_KORAX_DEATHB, 0, 0},      // S_KORAX_DEATHA
+    {SPR_KORX, 19, 5, NULL, S_KORAX_DEATHC, 0, 0},      // S_KORAX_DEATHB
+    {SPR_KORX, 20, 5, NULL, S_KORAX_DEATHD, 0, 0},      // S_KORAX_DEATHC
+    {SPR_KORX, 21, -1, NULL, S_NULL, 0, 0},     // S_KORAX_DEATHD
+    {SPR_SPIR, 0, 5, A_KSpiritRoam, S_KSPIRIT_ROAM2, 0, 0},     // S_KSPIRIT_ROAM1
+    {SPR_SPIR, 1, 5, A_KSpiritRoam, S_KSPIRIT_ROAM1, 0, 0},     // S_KSPIRIT_ROAM2
+    {SPR_SPIR, 3, 5, NULL, S_KSPIRIT_DEATH2, 0, 0},     // S_KSPIRIT_DEATH1
+    {SPR_SPIR, 4, 5, NULL, S_KSPIRIT_DEATH3, 0, 0},     // S_KSPIRIT_DEATH2
+    {SPR_SPIR, 5, 5, NULL, S_KSPIRIT_DEATH4, 0, 0},     // S_KSPIRIT_DEATH3
+    {SPR_SPIR, 6, 5, NULL, S_KSPIRIT_DEATH5, 0, 0},     // S_KSPIRIT_DEATH4
+    {SPR_SPIR, 7, 5, NULL, S_KSPIRIT_DEATH6, 0, 0},     // S_KSPIRIT_DEATH5
+    {SPR_SPIR, 8, 5, NULL, S_NULL, 0, 0},       // S_KSPIRIT_DEATH6
+    {SPR_MLFX, 32776, 2, NULL, S_KBOLT2, 0, 0}, // S_KBOLT1
+    {SPR_MLFX, 32777, 2, A_KBoltRaise, S_KBOLT3, 0, 0}, // S_KBOLT2
+    {SPR_MLFX, 32776, 2, A_KBolt, S_KBOLT4, 0, 0},      // S_KBOLT3
+    {SPR_MLFX, 32777, 2, A_KBolt, S_KBOLT5, 0, 0},      // S_KBOLT4
+    {SPR_MLFX, 32778, 2, A_KBolt, S_KBOLT6, 0, 0},      // S_KBOLT5
+    {SPR_MLFX, 32779, 2, A_KBolt, S_KBOLT7, 0, 0},      // S_KBOLT6
+    {SPR_MLFX, 32780, 2, A_KBolt, S_KBOLT3, 0, 0},      // S_KBOLT7
+    {SPR_MAN1, 0, 2, NULL, S_SPAWNBATS2, 0, 0}, // S_SPAWNBATS1
+    {SPR_MAN1, 0, 2, A_BatSpawnInit, S_SPAWNBATS3, 0, 0},       // S_SPAWNBATS2
+    {SPR_MAN1, 0, 2, A_BatSpawn, S_SPAWNBATS3, 0, 0},   // S_SPAWNBATS3
+    {SPR_MAN1, 0, -1, NULL, S_NULL, 0, 0},      // S_SPAWNBATS_OFF
+    {SPR_ABAT, 0, 2, A_BatMove, S_BAT2, 0, 0},  // S_BAT1
+    {SPR_ABAT, 1, 2, A_BatMove, S_BAT3, 0, 0},  // S_BAT2
+    {SPR_ABAT, 2, 2, A_BatMove, S_BAT1, 0, 0},  // S_BAT3
+    {SPR_ABAT, 0, 2, NULL, S_NULL, 0, 0}        // S_BAT_DEATH
+};
+
+
+mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
+
+    {                           // MT_MAPSPOT
+     9001,                      // doomednum
+     S_MAPSPOT,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR | MF_NOGRAVITY,        // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MAPSPOTGRAVITY
+     9013,                      // doomednum
+     S_MAPSPOT,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     MF2_DONTDRAW               // flags2
+     },
+
+    {                           // MT_FIREBALL1
+     -1,                        // doomednum
+     S_FIREBALL1_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIREBALL1_X1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_FIREBALL,              // deathsound
+     2 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_ARROW
+     -1,                        // doomednum
+     S_ARROW_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ARROW_X1,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     6 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DART
+     -1,                        // doomednum
+     S_DART_1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DART_X1,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     6 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_POISONDART
+     -1,                        // doomednum
+     S_POISONDART_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_POISONDART_X1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     6 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_RIPPERBALL
+     -1,                        // doomednum
+     S_RIPPERBALL_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_RIPPERBALL_X1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     6 * FRACUNIT,              // speed
+     8 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     2,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_RIP   // flags2
+     },
+
+    {                           // MT_PROJECTILE_BLADE
+     -1,                        // doomednum
+     S_PRJ_BLADE1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_PRJ_BLADE_X1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     6 * FRACUNIT,              // speed
+     6 * FRACUNIT,              // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ICESHARD
+     -1,                        // doomednum
+     S_ICESHARD1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SHARDFXE1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_MAGE_SHARDS_EXPLODE,   // deathsound
+     25 * FRACUNIT,             // speed
+     13 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_ICEDAMAGE     // flags2
+     },
+
+    {                           // MT_FLAME_SMALL_TEMP
+     10500,                     // doomednum
+     S_FLAME_TSMALL1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FLAME_LARGE_TEMP
+     10502,                     // doomednum
+     S_FLAME_TLARGE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FLAME_SMALL
+     10501,                     // doomednum
+     S_FLAME_SMALL1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     MF2_NOTELEPORT | MF2_DONTDRAW      // flags2
+     },
+
+    {                           // MT_FLAME_LARGE
+     10503,                     // doomednum
+     S_FLAME_LARGE1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     MF2_NOTELEPORT | MF2_DONTDRAW      // flags2
+     },
+
+    {                           // MT_HEALINGBOTTLE
+     81,                        // doomednum
+     S_ITEM_PTN1_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_HEALTHFLASK
+     82,                        // doomednum
+     S_ARTI_PTN2_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIFLY
+     83,                        // doomednum
+     S_ARTI_SOAR1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIINVULNERABILITY
+     84,                        // doomednum
+     S_ARTI_INVU1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_SUMMONMAULATOR
+     86,                        // doomednum
+     S_ARTI_SUMMON,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_SUMMON_FX
+     -1,                        // doomednum
+     S_SUMMON_FX1_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SUMMON_FX2_1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     20 * FRACUNIT,             // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_DROPOFF | MF_NOBLOCKMAP,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_THRUSTFLOOR_UP
+     10091,                     // doomednum
+     S_THRUSTINIT2_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     128 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_THRUSTFLOOR_DOWN
+     10090,                     // doomednum
+     S_THRUSTINIT1_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     128 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP | MF2_DONTDRAW      // flags2
+     },
+
+    {                           // MT_TELEPORTOTHER
+     10040,                     // doomednum
+     S_ARTI_TELOTHER1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_TELOTHER_FX1
+     -1,                        // doomednum
+     S_TELO_FX1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_TELO_FX9,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     20 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     10001,                     // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_TELOTHER_FX2
+     -1,                        // doomednum
+     S_TELO_FX2_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_TELO_FX9,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     16 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     10001,                     // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_TELOTHER_FX3
+     -1,                        // doomednum
+     S_TELO_FX3_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_TELO_FX9,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     16 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     10001,                     // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_TELOTHER_FX4
+     -1,                        // doomednum
+     S_TELO_FX4_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_TELO_FX9,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     16 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     10001,                     // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_TELOTHER_FX5
+     -1,                        // doomednum
+     S_TELO_FX5_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_TELO_FX9,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     16 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     10001,                     // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DIRT1
+     -1,                        // doomednum
+     S_DIRT1_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DIRT1_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DIRT2
+     -1,                        // doomednum
+     S_DIRT2_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DIRT2_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DIRT3
+     -1,                        // doomednum
+     S_DIRT3_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DIRT3_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DIRT4
+     -1,                        // doomednum
+     S_DIRT4_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DIRT4_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_DIRT5
+     -1,                        // doomednum
+     S_DIRT5_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DIRT5_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_DIRT6
+     -1,                        // doomednum
+     S_DIRT6_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DIRT6_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_DIRTCLUMP
+     -1,                        // doomednum
+     S_DIRTCLUMP1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ROCK1
+     -1,                        // doomednum
+     S_ROCK1_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ROCK1_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ROCK2
+     -1,                        // doomednum
+     S_ROCK2_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ROCK2_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ROCK3
+     -1,                        // doomednum
+     S_ROCK3_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ROCK3_D,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FOGSPAWNER
+     10000,                     // doomednum
+     S_SPAWNFOG1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     MF2_DONTDRAW | MF2_FLOATBOB        // flags2
+     },
+
+    {                           // MT_FOGPATCHS
+     10001,                     // doomednum
+     S_FOGPATCHS1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FOGPATCHS0,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     FRACUNIT,                  // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_FLOAT | MF_NOGRAVITY | MF_SHADOW | MF_NOCLIP,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FOGPATCHM
+     10002,                     // doomednum
+     S_FOGPATCHM1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FOGPATCHM0,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     FRACUNIT,                  // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_FLOAT | MF_NOGRAVITY | MF_SHADOW | MF_NOCLIP,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FOGPATCHL
+     10003,                     // doomednum
+     S_FOGPATCHL1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FOGPATCHL0,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     FRACUNIT,                  // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_FLOAT | MF_NOGRAVITY | MF_SHADOW | MF_NOCLIP,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_QUAKE_FOCUS
+     -1,                        // doomednum
+     S_QUAKE_ACTIVE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     MF2_DONTDRAW               // flags2
+     },
+
+    {                           // MT_SGSHARD1
+     -1,                        // doomednum
+     S_SGSHARD1_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD1_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD2
+     -1,                        // doomednum
+     S_SGSHARD2_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD2_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD3
+     -1,                        // doomednum
+     S_SGSHARD3_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD3_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD4
+     -1,                        // doomednum
+     S_SGSHARD4_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD4_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD5
+     -1,                        // doomednum
+     S_SGSHARD5_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD5_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD6
+     -1,                        // doomednum
+     S_SGSHARD6_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD6_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD7
+     -1,                        // doomednum
+     S_SGSHARD7_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD7_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD8
+     -1,                        // doomednum
+     S_SGSHARD8_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD8_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD9
+     -1,                        // doomednum
+     S_SGSHARD9_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD9_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SGSHARD0
+     -1,                        // doomednum
+     S_SGSHARD0_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SGSHARD0_D,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_ARTIEGG
+     30,                        // doomednum
+     S_ARTI_EGGC1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_EGGFX
+     -1,                        // doomednum
+     S_EGGFX1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_EGGFXI1_1,               // deathstate
+     S_NULL,                    // xdeathstate
+     0,                         // deathsound
+     18 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ARTISUPERHEAL
+     32,                        // doomednum
+     S_ARTI_SPHL1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ZWINGEDSTATUENOSKULL
+     9011,                      // doomednum
+     S_ZWINGEDSTATUENOSKULL,    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZGEMPEDESTAL
+     9012,                      // doomednum
+     S_ZGEMPEDESTAL1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     40 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZSKULL
+     9002,                      // doomednum
+     S_ARTIPUZZSKULL,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEMBIG
+     9003,                      // doomednum
+     S_ARTIPUZZGEMBIG,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEMRED
+     9004,                      // doomednum
+     S_ARTIPUZZGEMRED,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEMGREEN1
+     9005,                      // doomednum
+     S_ARTIPUZZGEMGREEN1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEMGREEN2
+     9009,                      // doomednum
+     S_ARTIPUZZGEMGREEN2,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEMBLUE1
+     9006,                      // doomednum
+     S_ARTIPUZZGEMBLUE1,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEMBLUE2
+     9010,                      // doomednum
+     S_ARTIPUZZGEMBLUE2,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZBOOK1
+     9007,                      // doomednum
+     S_ARTIPUZZBOOK1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZBOOK2
+     9008,                      // doomednum
+     S_ARTIPUZZBOOK2,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZSKULL2
+     9014,                      // doomednum
+     S_ARTIPUZZSKULL2,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZFWEAPON
+     9015,                      // doomednum
+     S_ARTIPUZZFWEAPON,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZCWEAPON
+     9016,                      // doomednum
+     S_ARTIPUZZCWEAPON,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZMWEAPON
+     9017,                      // doomednum
+     S_ARTIPUZZMWEAPON,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEAR
+     9018,                      // doomednum
+     S_ARTIPUZZGEAR_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEAR2
+     9019,                      // doomednum
+     S_ARTIPUZZGEAR2_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEAR3
+     9020,                      // doomednum
+     S_ARTIPUZZGEAR3_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTIPUZZGEAR4
+     9021,                      // doomednum
+     S_ARTIPUZZGEAR4_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARTITORCH
+     33,                        // doomednum
+     S_ARTI_TRCH1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_FIREBOMB
+     -1,                        // doomednum
+     S_FIREBOMB1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_FLECHETTE_EXPLODE,     // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOGRAVITY | MF_ALTSHADOW,       // flags
+     MF2_FIREDAMAGE             // flags2
+     },
+
+    {                           // MT_ARTITELEPORT
+     36,                        // doomednum
+     S_ARTI_ATLP1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_ARTIPOISONBAG
+     8000,                      // doomednum
+     S_ARTI_PSBG1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_POISONBAG
+     -1,                        // doomednum
+     S_POISONBAG1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOGRAVITY | MF_NOBLOCKMAP,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_POISONCLOUD
+     -1,                        // doomednum
+     S_POISONCLOUD1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_POISONSHROOM_DEATH,    // deathsound
+     0,                         // speed
+     1,                         // radius
+     1,                         // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOGRAVITY | MF_NOBLOCKMAP | MF_SHADOW | MF_NOCLIP | MF_DROPOFF, // flags
+     MF2_NODMGTHRUST            // flags2
+     },
+
+    {                           // MT_THROWINGBOMB
+     -1,                        // doomednum
+     S_THROWINGBOMB1,           // spawnstate
+     48,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_FLECHETTE_BOUNCE,      // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_THROWINGBOMB_X1,         // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_FLECHETTE_EXPLODE,     // deathsound
+     12 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_FLOORBOUNCE | MF2_FIREDAMAGE   // flags2
+     },
+
+    {                           // MT_SPEEDBOOTS
+     8002,                      // doomednum
+     S_ARTI_BOOTS1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_BOOSTMANA
+     8003,                      // doomednum
+     S_ARTI_MANA,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_BOOSTARMOR
+     8041,                      // doomednum
+     S_ARTI_ARMOR1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_BLASTRADIUS
+     10110,                     // doomednum
+     S_ARTI_BLAST1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_HEALRADIUS
+     10120,                     // doomednum
+     S_ARTI_HEALRAD1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_SPLASH
+     -1,                        // doomednum
+     S_SPLASH1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SPLASHX,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
+     },
+
+    {                           // MT_SPLASHBASE
+     -1,                        // doomednum
+     S_SPLASHBASE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_LAVASPLASH
+     -1,                        // doomednum
+     S_LAVASPLASH1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_LAVASMOKE
+     -1,                        // doomednum
+     S_LAVASMOKE1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SLUDGECHUNK
+     -1,                        // doomednum
+     S_SLUDGECHUNK1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SLUDGECHUNKX,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
+     },
+
+    {                           // MT_SLUDGESPLASH
+     -1,                        // doomednum
+     S_SLUDGESPLASH1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC0
+     5,                         // doomednum
+     S_ZWINGEDSTATUE1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC1
+     6,                         // doomednum
+     S_ZROCK1_1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC2
+     7,                         // doomednum
+     S_ZROCK2_1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC3
+     9,                         // doomednum
+     S_ZROCK3_1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC4
+     15,                        // doomednum
+     S_ZROCK4_1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC5
+     17,                        // doomednum
+     S_ZCHANDELIER1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     60 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC6
+     8063,                      // doomednum
+     S_ZCHANDELIER_U,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     60 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC7
+     24,                        // doomednum
+     S_ZTREEDEAD1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     96 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC8
+     25,                        // doomednum
+     S_ZTREE,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     128 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TREEDESTRUCTIBLE
+     8062,                      // doomednum
+     S_ZTREEDESTRUCTIBLE1,      // spawnstate
+     70,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZTREEDES_D1,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_TREE_BREAK,            // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     180 * FRACUNIT,            // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC9
+     26,                        // doomednum
+     S_ZTREESWAMP182_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     150 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC10
+     27,                        // doomednum
+     S_ZTREESWAMP172_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     120 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC11
+     28,                        // doomednum
+     S_ZSTUMPBURNED1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC12
+     29,                        // doomednum
+     S_ZSTUMPBARE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC13
+     37,                        // doomednum
+     S_ZSTUMPSWAMP1_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC14
+     38,                        // doomednum
+     S_ZSTUMPSWAMP2_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC15
+     39,                        // doomednum
+     S_ZSHROOMLARGE1_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC16
+     40,                        // doomednum
+     S_ZSHROOMLARGE2_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC17
+     41,                        // doomednum
+     S_ZSHROOMLARGE3_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC18
+     42,                        // doomednum
+     S_ZSHROOMSMALL1_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC19
+     44,                        // doomednum
+     S_ZSHROOMSMALL2_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC20
+     45,                        // doomednum
+     S_ZSHROOMSMALL3_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC21
+     46,                        // doomednum
+     S_ZSHROOMSMALL4_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC22
+     47,                        // doomednum
+     S_ZSHROOMSMALL5_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC23
+     48,                        // doomednum
+     S_ZSTALAGMITEPILLAR1,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     138 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC24
+     49,                        // doomednum
+     S_ZSTALAGMITELARGE1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     48 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC25
+     50,                        // doomednum
+     S_ZSTALAGMITEMEDIUM1,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     6 * FRACUNIT,              // radius
+     40 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC26
+     51,                        // doomednum
+     S_ZSTALAGMITESMALL1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     36 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC27
+     52,                        // doomednum
+     S_ZSTALACTITELARGE1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     66 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC28
+     56,                        // doomednum
+     S_ZSTALACTITEMEDIUM1,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     6 * FRACUNIT,              // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC29
+     57,                        // doomednum
+     S_ZSTALACTITESMALL1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     40 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC30
+     58,                        // doomednum
+     S_ZMOSSCEILING1_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC31
+     59,                        // doomednum
+     S_ZMOSSCEILING2_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     24 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC32
+     60,                        // doomednum
+     S_ZSWAMPVINE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     52 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC33
+     61,                        // doomednum
+     S_ZCORPSEKABOB1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     92 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC34
+     62,                        // doomednum
+     S_ZCORPSESLEEPING1,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC35
+     63,                        // doomednum
+     S_ZTOMBSTONERIP1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     46 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC36
+     64,                        // doomednum
+     S_ZTOMBSTONESHANE1,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     46 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC37
+     65,                        // doomednum
+     S_ZTOMBSTONEBIGCROSS1,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     46 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC38
+     66,                        // doomednum
+     S_ZTOMBSTONEBRIANR1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     52 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC39
+     67,                        // doomednum
+     S_ZTOMBSTONECROSSCIRCLE1,  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     52 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC40
+     68,                        // doomednum
+     S_ZTOMBSTONESMALLCROSS1,   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     46 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC41
+     69,                        // doomednum
+     S_ZTOMBSTONEBRIANP1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     46 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC42
+     71,                        // doomednum
+     S_CORPSEHANGING_1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     6 * FRACUNIT,              // radius
+     75 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC43
+     72,                        // doomednum
+     S_ZSTATUEGARGOYLEGREENTALL_1,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC44
+     73,                        // doomednum
+     S_ZSTATUEGARGOYLEBLUETALL_1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC45
+     74,                        // doomednum
+     S_ZSTATUEGARGOYLEGREENSHORT_1,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC46
+     76,                        // doomednum
+     S_ZSTATUEGARGOYLEBLUESHORT_1,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC47
+     8044,                      // doomednum
+     S_ZSTATUEGARGOYLESTRIPETALL_1,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC48
+     8045,                      // doomednum
+     S_ZSTATUEGARGOYLEDARKREDTALL_1,    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC49
+     8046,                      // doomednum
+     S_ZSTATUEGARGOYLEREDTALL_1,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC50
+     8047,                      // doomednum
+     S_ZSTATUEGARGOYLETANTALL_1,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC51
+     8048,                      // doomednum
+     S_ZSTATUEGARGOYLERUSTTALL_1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     108 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC52
+     8049,                      // doomednum
+     S_ZSTATUEGARGOYLEDARKREDSHORT_1,   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC53
+     8050,                      // doomednum
+     S_ZSTATUEGARGOYLEREDSHORT_1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC54
+     8051,                      // doomednum
+     S_ZSTATUEGARGOYLETANSHORT_1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC55
+     8052,                      // doomednum
+     S_ZSTATUEGARGOYLERUSTSHORT_1,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     14 * FRACUNIT,             // radius
+     62 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC56
+     77,                        // doomednum
+     S_ZBANNERTATTERED_1,       // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     120 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC57
+     78,                        // doomednum
+     S_ZTREELARGE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZTREELARGE1,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     180 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC58
+     79,                        // doomednum
+     S_ZTREELARGE2,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZTREELARGE2,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     180 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC59
+     80,                        // doomednum
+     S_ZTREEGNARLED1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     22 * FRACUNIT,             // radius
+     100 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC60
+     87,                        // doomednum
+     S_ZTREEGNARLED2,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     22 * FRACUNIT,             // radius
+     100 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC61
+     88,                        // doomednum
+     S_ZLOG,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     25 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC62
+     89,                        // doomednum
+     S_ZSTALACTITEICELARGE,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     66 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC63
+     90,                        // doomednum
+     S_ZSTALACTITEICEMEDIUM,    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC64
+     91,                        // doomednum
+     S_ZSTALACTITEICESMALL,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC65
+     92,                        // doomednum
+     S_ZSTALACTITEICETINY,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC66
+     93,                        // doomednum
+     S_ZSTALAGMITEICELARGE,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     66 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC67
+     94,                        // doomednum
+     S_ZSTALAGMITEICEMEDIUM,    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC68
+     95,                        // doomednum
+     S_ZSTALAGMITEICESMALL,     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC69
+     96,                        // doomednum
+     S_ZSTALAGMITEICETINY,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC70
+     97,                        // doomednum
+     S_ZROCKBROWN1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     17 * FRACUNIT,             // radius
+     72 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC71
+     98,                        // doomednum
+     S_ZROCKBROWN2,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     50 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC72
+     99,                        // doomednum
+     S_ZROCKBLACK,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     40 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC73
+     100,                       // doomednum
+     S_ZRUBBLE1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC74
+     101,                       // doomednum
+     S_ZRUBBLE2,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC75
+     102,                       // doomednum
+     S_ZRUBBLE3,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC76
+     103,                       // doomednum
+     S_ZVASEPILLAR,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     54 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_POTTERY1
+     104,                       // doomednum
+     S_ZPOTTERY1,               // spawnstate
+     15,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZPOTTERY_EXPLODE,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_DROPOFF, // flags
+     MF2_SLIDE | MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ    // flags2
+     },
+
+    {                           // MT_POTTERY2
+     105,                       // doomednum
+     S_ZPOTTERY2,               // spawnstate
+     15,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZPOTTERY_EXPLODE,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     25 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_DROPOFF, // flags
+     MF2_SLIDE | MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ    // flags2
+     },
+
+    {                           // MT_POTTERY3
+     106,                       // doomednum
+     S_ZPOTTERY3,               // spawnstate
+     15,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZPOTTERY_EXPLODE,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     25 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_DROPOFF, // flags
+     MF2_SLIDE | MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ    // flags2
+     },
+
+    {                           // MT_POTTERYBIT1
+     -1,                        // doomednum
+     S_POTTERYBIT_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_POTTERYBIT_EX0,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE,                // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_MISC77
+     108,                       // doomednum
+     S_ZCORPSELYNCHED1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     11 * FRACUNIT,             // radius
+     95 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZLYNCHED_NOHEART
+     109,                       // doomednum
+     S_ZCORPSELYNCHED2,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     100 * FRACUNIT,            // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC78
+     110,                       // doomednum
+     S_ZCORPSESITTING,          // spawnstate
+     30,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZCORPSESITTING_X,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     35 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CORPSEBIT
+     -1,                        // doomednum
+     S_CORPSEBIT_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     MF2_TELESTOMP              // flags2
+     },
+
+    {                           // MT_CORPSEBLOODDRIP
+     -1,                        // doomednum
+     S_CORPSEBLOODDRIP,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CORPSEBLOODDRIP_X1,      // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRIP,                  // deathsound
+     0,                         // speed
+     FRACUNIT,                  // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE,                // flags
+     MF2_LOGRAV                 // flags2
+     },
+
+    {                           // MT_BLOODPOOL
+     111,                       // doomednum
+     S_BLOODPOOL,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC79
+     119,                       // doomednum
+     S_ZCANDLE1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC80
+     113,                       // doomednum
+     S_ZLEAFSPAWNER,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     MF2_DONTDRAW               // flags2
+     },
+
+    {                           // MT_LEAF1
+     -1,                        // doomednum
+     S_LEAF1_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_LEAF_X1,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE,        // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_LEAF2
+     -1,                        // doomednum
+     S_LEAF2_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_LEAF_X1,                 // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE,        // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_ZTWINEDTORCH
+     116,                       // doomednum
+     S_ZTWINEDTORCH_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZTWINEDTORCH_UNLIT
+     117,                       // doomednum
+     S_ZTWINEDTORCH_UNLIT,      // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     10 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BRIDGE
+     118,                       // doomednum
+     S_BRIDGE1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     32 * FRACUNIT,             // radius
+     2 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_NOGRAVITY,   // flags
+     MF2_DONTDRAW               // flags2
+     },
+
+    {                           // MT_BRIDGEBALL
+     -1,                        // doomednum
+     S_BBALL1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ZWALLTORCH
+     54,                        // doomednum
+     S_ZWALLTORCH1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZWALLTORCH_UNLIT
+     55,                        // doomednum
+     S_ZWALLTORCH_U,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZBARREL
+     8100,                      // doomednum
+     S_ZBARREL1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZSHRUB1
+     8101,                      // doomednum
+     S_ZSHRUB1,                 // spawnstate
+     20,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_ZSHRUB1_X1,              // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZSHRUB1_DIE,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_TREE_EXPLODE,          // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     24 * FRACUNIT,             // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZSHRUB2
+     8102,                      // doomednum
+     S_ZSHRUB2,                 // spawnstate
+     10,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_ZSHRUB2_X1,              // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZSHRUB2_DIE,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_TREE_EXPLODE,          // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     40 * FRACUNIT,             // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZBUCKET
+     8103,                      // doomednum
+     S_ZBUCKET1,                // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     72 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZPOISONSHROOM
+     8104,                      // doomednum
+     S_ZPOISONSHROOM1,          // spawnstate
+     30,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_ZPOISONSHROOM_P1,        // painstate
+     255,                       // painchance
+     SFX_POISONSHROOM_PAIN,     // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZPOISONSHROOM_X1,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_POISONSHROOM_DEATH,    // deathsound
+     0,                         // speed
+     6 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SHOOTABLE | MF_SOLID | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZFIREBULL
+     8042,                      // doomednum
+     S_ZFIREBULL1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     80 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZFIREBULL_UNLIT
+     8043,                      // doomednum
+     S_ZFIREBULL_U,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     80 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_FIRETHING
+     8060,                      // doomednum
+     S_ZFIRETHING1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BRASSTORCH
+     8061,                      // doomednum
+     S_ZBRASSTORCH1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     6 * FRACUNIT,              // radius
+     35 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZSUITOFARMOR
+     8064,                      // doomednum
+     S_ZSUITOFARMOR,            // spawnstate
+     60,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZSUITOFARMOR_X1,         // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_SUITOFARMOR_BREAK,     // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     72 * FRACUNIT,             // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZARMORCHUNK
+     -1,                        // doomednum
+     S_ZARMORCHUNK1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     0,                         // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZBELL
+     8065,                      // doomednum
+     S_ZBELL,                   // spawnstate
+     5,                         // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZBELL_X1,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_BELLRING,              // deathsound
+     0,                         // speed
+     56 * FRACUNIT,             // radius
+     120 * FRACUNIT,            // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_NOGRAVITY | MF_SPAWNCEILING,     // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZBLUE_CANDLE
+     8066,                      // doomednum
+     S_ZBLUE_CANDLE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZIRON_MAIDEN
+     8067,                      // doomednum
+     S_ZIRON_MAIDEN,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     60 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZXMAS_TREE
+     8068,                      // doomednum
+     S_ZXMAS_TREE,              // spawnstate
+     20,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_ZXMAS_TREE_X1,           // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ZXMAS_TREE_DIE,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_TREE_EXPLODE,          // deathsound
+     0,                         // speed
+     11 * FRACUNIT,             // radius
+     130 * FRACUNIT,            // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCAULDRON
+     8069,                      // doomednum
+     S_ZCAULDRON1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     26 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCAULDRON_UNLIT
+     8070,                      // doomednum
+     S_ZCAULDRON_U,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     12 * FRACUNIT,             // radius
+     26 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID,                  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINBIT32
+     8071,                      // doomednum
+     S_ZCHAINBIT32,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINBIT64
+     8072,                      // doomednum
+     S_ZCHAINBIT64,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINEND_HEART
+     8073,                      // doomednum
+     S_ZCHAINEND_HEART,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINEND_HOOK1
+     8074,                      // doomednum
+     S_ZCHAINEND_HOOK1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINEND_HOOK2
+     8075,                      // doomednum
+     S_ZCHAINEND_HOOK2,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINEND_SPIKE
+     8076,                      // doomednum
+     S_ZCHAINEND_SPIKE,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ZCHAINEND_SKULL
+     8077,                      // doomednum
+     S_ZCHAINEND_SKULL,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     32 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT1
+     8500,                      // doomednum
+     S_TABLE_SHIT1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT2
+     8501,                      // doomednum
+     S_TABLE_SHIT2,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT3
+     8502,                      // doomednum
+     S_TABLE_SHIT3,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT4
+     8503,                      // doomednum
+     S_TABLE_SHIT4,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT5
+     8504,                      // doomednum
+     S_TABLE_SHIT5,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT6
+     8505,                      // doomednum
+     S_TABLE_SHIT6,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT7
+     8506,                      // doomednum
+     S_TABLE_SHIT7,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT8
+     8507,                      // doomednum
+     S_TABLE_SHIT8,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT9
+     8508,                      // doomednum
+     S_TABLE_SHIT9,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TABLE_SHIT10
+     8509,                      // doomednum
+     S_TABLE_SHIT10,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TFOG
+     -1,                        // doomednum
+     S_TFOG1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MISC81
+     140,                       // doomednum
+     S_TELESMOKE1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_TELEPORTMAN
+     14,                        // doomednum
+     S_NULL,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_PUNCHPUFF
+     -1,                        // doomednum
+     S_PUNCHPUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_FIGHTER_PUNCH_HITTHING,        // seesound
+     8,                         // reactiontime
+     SFX_FIGHTER_PUNCH_HITWALL, // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_FW_AXE
+     8010,                      // doomednum
+     S_AXE,                     // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AXEPUFF
+     -1,                        // doomednum
+     S_HAMMERPUFF1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_FIGHTER_AXE_HITTHING,  // seesound
+     8,                         // reactiontime
+     SFX_FIGHTER_HAMMER_HITWALL,        // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AXEPUFF_GLOW
+     -1,                        // doomednum
+     S_AXEPUFF_GLOW1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_FIGHTER_AXE_HITTHING,  // seesound
+     8,                         // reactiontime
+     SFX_FIGHTER_HAMMER_HITWALL,        // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_AXEBLOOD
+     -1,                        // doomednum
+     S_AXEBLOOD1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_AXEBLOOD6,               // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF, // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
+     },
+
+    {                           // MT_FW_HAMMER
+     123,                       // doomednum
+     S_HAMM,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_HAMMER_MISSILE
+     -1,                        // doomednum
+     S_HAMMER_MISSILE_1,        // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HAMMER_MISSILE_X1,       // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_FIGHTER_HAMMER_EXPLODE,        // deathsound
+     25 * FRACUNIT,             // speed
+     14 * FRACUNIT,             // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     10,                        // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FIREDAMAGE  // flags2
+     },
+
+    {                           // MT_HAMMERPUFF
+     -1,                        // doomednum
+     S_HAMMERPUFF1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_FIGHTER_HAMMER_HITTHING,       // seesound
+     8,                         // reactiontime
+     SFX_FIGHTER_HAMMER_HITWALL,        // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_FSWORD_MISSILE
+     -1,                        // doomednum
+     S_FSWORD_MISSILE1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FSWORD_MISSILE_X1,       // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_FIGHTER_SWORD_EXPLODE, // deathsound
+     30 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     8,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
+     },
+
+    {                           // MT_FSWORD_FLAME
+     -1,                        // doomednum
+     S_FSWORD_FLAME1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CW_SERPSTAFF
+     10,                        // doomednum
+     S_CSTAFF,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CSTAFF_MISSILE
+     -1,                        // doomednum
+     S_CSTAFF_MISSILE1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CSTAFF_MISSILE_X1,       // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_CLERIC_CSTAFF_EXPLODE, // deathsound
+     22 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     5,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
+     },
+
+    {                           // MT_CSTAFFPUFF
+     -1,                        // doomednum
+     S_CSTAFFPUFF1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_CLERIC_CSTAFF_HITTHING,        // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CW_FLAME
+     8009,                      // doomednum
+     S_CFLAME1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CFLAMEFLOOR
+     -1,                        // doomednum
+     S_CFLAMEFLOOR1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_FLAMEPUFF
+     -1,                        // doomednum
+     S_FLAMEPUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_CLERIC_FLAME_EXPLODE,  // seesound
+     8,                         // reactiontime
+     SFX_CLERIC_FLAME_EXPLODE,  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     FRACUNIT,                  // radius
+     FRACUNIT,                  // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_FLAMEPUFF2
+     -1,                        // doomednum
+     S_FLAMEPUFF2_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_CLERIC_FLAME_EXPLODE,  // seesound
+     8,                         // reactiontime
+     SFX_CLERIC_FLAME_EXPLODE,  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     FRACUNIT,                  // radius
+     FRACUNIT,                  // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_CIRCLEFLAME
+     -1,                        // doomednum
+     S_CIRCLE_FLAME1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CIRCLE_FLAME_X1,         // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_CLERIC_FLAME_CIRCLE,   // deathsound
+     0,                         // speed
+     6 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     2,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_CFLAME_MISSILE
+     -1,                        // doomednum
+     S_CFLAME_MISSILE1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CFLAME_MISSILE_X,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     200 * FRACUNIT,            // speed
+     14 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     8,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_DONTDRAW | MF2_FIREDAMAGE   // flags2
+     },
+
+    {                           // MT_HOLY_FX
+     -1,                        // doomednum
+     S_HOLY_FX1,                // spawnstate
+     105,                       // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HOLY_FX_X1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_SPIRIT_DIE,            // deathsound
+     12 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE,     // flags
+     MF2_NOTELEPORT | MF2_SEEKERMISSILE | MF2_RIP | MF2_IMPACT | MF2_PCROSS     // flags2
+     },
+
+    {                           // MT_HOLY_TAIL
+     -1,                        // doomednum
+     S_HOLY_TAIL1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     FRACUNIT,                  // radius
+     FRACUNIT,                  // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_NOCLIP | MF_ALTSHADOW,      // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_HOLY_PUFF
+     -1,                        // doomednum
+     S_HOLY_PUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_HOLY_MISSILE
+     -1,                        // doomednum
+     S_HOLY_MISSILE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_HOLY_MISSILE_X,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     30 * FRACUNIT,             // speed
+     15 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_MISSILE,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_HOLY_MISSILE_PUFF
+     -1,                        // doomednum
+     S_HOLY_MISSILE_P1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW,  // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_MWANDPUFF
+     -1,                        // doomednum
+     S_MWANDPUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH | MF2_NODMGTHRUST  // flags2
+     },
+
+    {                           // MT_MWANDSMOKE
+     -1,                        // doomednum
+     S_MWANDSMOKE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH | MF2_NODMGTHRUST  // flags2
+     },
+
+    {                           // MT_MWAND_MISSILE
+     -1,                        // doomednum
+     S_MWAND_MISSILE1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MWANDPUFF1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     184 * FRACUNIT,            // speed
+     12 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     2,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_RIP | MF2_IMPACT | MF2_PCROSS | MF2_NODMGTHRUST | MF2_CANNOTPUSH      // flags2
+     },
+
+    {                           // MT_MW_LIGHTNING
+     8040,                      // doomednum
+     S_MW_LIGHTNING1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_LIGHTNING_CEILING
+     -1,                        // doomednum
+     S_LIGHTNING_CEILING1,      // spawnstate
+     144,                       // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_LIGHTNING_C_X1,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     25 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     40 * FRACUNIT,             // height
+     100,                       // mass
+     8,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
+     },
+
+    {                           // MT_LIGHTNING_FLOOR
+     -1,                        // doomednum
+     S_LIGHTNING_FLOOR1,        // spawnstate
+     144,                       // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_LIGHTNING_F_X1,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     25 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     40 * FRACUNIT,             // height
+     100,                       // mass
+     8,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
+     },
+
+    {                           // MT_LIGHTNING_ZAP
+     -1,                        // doomednum
+     S_LIGHTNING_ZAP1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_LIGHTNING_ZAP_X8,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     35 * FRACUNIT,             // height
+     100,                       // mass
+     2,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MSTAFF_FX
+     -1,                        // doomednum
+     S_MSTAFF_FX1_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MSTAFF_FX_X1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_MAGE_STAFF_EXPLODE,    // deathsound
+     20 * FRACUNIT,             // speed
+     16 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     6,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE | MF2_RIP | MF2_IMPACT | MF2_PCROSS        // flags2
+     },
+
+    {                           // MT_MSTAFF_FX2
+     -1,                        // doomednum
+     S_MSTAFF_FX2_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MSTAFF_FX2_X1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_MAGE_STAFF_EXPLODE,    // deathsound
+     17 * FRACUNIT,             // speed
+     20 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE | MF2_IMPACT | MF2_PCROSS | MF2_SEEKERMISSILE      // flags2
+     },
+
+    {                           // MT_FW_SWORD1
+     12,                        // doomednum
+     S_FSWORD1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_FW_SWORD2
+     13,                        // doomednum
+     S_FSWORD2,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_FW_SWORD3
+     16,                        // doomednum
+     S_FSWORD3,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_CW_HOLY1
+     18,                        // doomednum
+     S_CHOLY1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_CW_HOLY2
+     19,                        // doomednum
+     S_CHOLY2,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_CW_HOLY3
+     20,                        // doomednum
+     S_CHOLY3,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MW_STAFF1
+     21,                        // doomednum
+     S_MSTAFF1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MW_STAFF2
+     22,                        // doomednum
+     S_MSTAFF2,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MW_STAFF3
+     23,                        // doomednum
+     S_MSTAFF3,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_SNOUTPUFF
+     -1,                        // doomednum
+     S_PUNCHPUFF1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MW_CONE
+     53,                        // doomednum
+     S_COS1,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SHARDFX1
+     -1,                        // doomednum
+     S_SHARDFX1_1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SHARDFXE1_1,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_MAGE_SHARDS_EXPLODE,   // deathsound
+     25 * FRACUNIT,             // speed
+     13 * FRACUNIT,             // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_ICEDAMAGE   // flags2
+     },
+
+    {                           // MT_BLOOD
+     -1,                        // doomednum
+     S_BLOOD1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BLOODSPLATTER
+     -1,                        // doomednum
+     S_BLOODSPLATTER1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BLOODSPLATTERX,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
+     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
+     },
+
+    {                           // MT_GIBS
+     -1,                        // doomednum
+     S_GIBS1,                   // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_CORPSE,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_PLAYER_FIGHTER
+     -1,                        // doomednum
+     S_FPLAY,                   // spawnstate
+     100,                       // spawnhealth
+     S_FPLAY_RUN1,              // seestate
+     SFX_NONE,                  // seesound
+     0,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_FPLAY_PAIN,              // painstate
+     255,                       // painchance
+     SFX_PLAYER_FIGHTER_PAIN,   // painsound
+     S_NULL,                    // meleestate
+     S_FPLAY_ATK1,              // missilestate
+     S_NULL,                    // crashstate
+     S_FPLAY_DIE1,              // deathstate
+     S_FPLAY_XDIE1,             // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
+     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
+     },
+
+    {                           // MT_BLOODYSKULL
+     -1,                        // doomednum
+     S_BLOODYSKULL1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     4 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
+     MF2_LOGRAV | MF2_CANNOTPUSH        // flags2
+     },
+
+    {                           // MT_PLAYER_SPEED
+     -1,                        // doomednum
+     S_PLAYER_SPEED1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_ALTSHADOW,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ICECHUNK
+     -1,                        // doomednum
+     S_ICECHUNK1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
+     MF2_LOGRAV | MF2_CANNOTPUSH | MF2_FLOORCLIP        // flags2
+     },
+
+    {                           // MT_PLAYER_CLERIC
+     -1,                        // doomednum
+     S_CPLAY,                   // spawnstate
+     100,                       // spawnhealth
+     S_CPLAY_RUN1,              // seestate
+     SFX_NONE,                  // seesound
+     0,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_CPLAY_PAIN,              // painstate
+     255,                       // painchance
+     SFX_PLAYER_CLERIC_PAIN,    // painsound
+     S_NULL,                    // meleestate
+     S_CPLAY_ATK1,              // missilestate
+     S_NULL,                    // crashstate
+     S_CPLAY_DIE1,              // deathstate
+     S_CPLAY_XDIE1,             // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
+     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
+     },
+
+    {                           // MT_PLAYER_MAGE
+     -1,                        // doomednum
+     S_MPLAY,                   // spawnstate
+     100,                       // spawnhealth
+     S_MPLAY_RUN1,              // seestate
+     SFX_NONE,                  // seesound
+     0,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_MPLAY_PAIN,              // painstate
+     255,                       // painchance
+     SFX_PLAYER_MAGE_PAIN,      // painsound
+     S_NULL,                    // meleestate
+     S_MPLAY_ATK1,              // missilestate
+     S_NULL,                    // crashstate
+     S_MPLAY_DIE1,              // deathstate
+     S_MPLAY_XDIE1,             // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
+     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
+     },
+
+    {                           // MT_PIGPLAYER
+     -1,                        // doomednum
+     S_PIGPLAY,                 // spawnstate
+     100,                       // spawnhealth
+     S_PIGPLAY_RUN1,            // seestate
+     SFX_NONE,                  // seesound
+     0,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_PIGPLAY_PAIN,            // painstate
+     255,                       // painchance
+     SFX_PIG_PAIN,              // painsound
+     S_NULL,                    // meleestate
+     S_PIGPLAY_ATK1,            // missilestate
+     S_NULL,                    // crashstate
+     S_PIG_DIE1,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_PIG_DEATH,             // deathsound
+     0,                         // speed
+     16 * FRACUNIT,             // radius
+     24 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_NOTDMATCH,       // flags
+     MF2_WINDTHRUST | MF2_SLIDE | MF2_PASSMOBJ | MF2_FLOORCLIP | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
+     },
+
+    {                           // MT_PIG
+     -1,                        // doomednum
+     S_PIG_LOOK1,               // spawnstate
+     25,                        // spawnhealth
+     S_PIG_WALK1,               // seestate
+     SFX_PIG_ACTIVE1,           // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_PIG_PAIN,                // painstate
+     128,                       // painchance
+     SFX_PIG_PAIN,              // painsound
+     S_PIG_ATK1,                // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_PIG_DIE1,                // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_PIG_DEATH,             // deathsound
+     10,                        // speed
+     12 * FRACUNIT,             // radius
+     22 * FRACUNIT,             // height
+     60,                        // mass
+     0,                         // damage
+     SFX_PIG_ACTIVE1,           // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP       // flags2
+     },
+
+    {                           // MT_CENTAUR
+     107,                       // doomednum
+     S_CENTAUR_LOOK1,           // spawnstate
+     200,                       // spawnhealth
+     S_CENTAUR_WALK1,           // seestate
+     SFX_CENTAUR_SIGHT,         // seesound
+     8,                         // reactiontime
+     SFX_CENTAUR_ATTACK,        // attacksound
+     S_CENTAUR_PAIN1,           // painstate
+     135,                       // painchance
+     SFX_CENTAUR_PAIN,          // painsound
+     S_CENTAUR_ATK1,            // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_CENTAUR_DEATH1,          // deathstate
+     S_CENTAUR_DEATH_X1,        // xdeathstate
+     SFX_CENTAUR_DEATH,         // deathsound
+     13,                        // speed
+     20 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     120,                       // mass
+     0,                         // damage
+     SFX_CENTAUR_ACTIVE,        // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP   // flags2
+     },
+
+    {                           // MT_CENTAURLEADER
+     115,                       // doomednum
+     S_CENTAUR_LOOK1,           // spawnstate
+     250,                       // spawnhealth
+     S_CENTAUR_WALK1,           // seestate
+     SFX_CENTAUR_SIGHT,         // seesound
+     8,                         // reactiontime
+     SFX_CENTAUR_ATTACK,        // attacksound
+     S_CENTAUR_PAIN1,           // painstate
+     96,                        // painchance
+     SFX_CENTAUR_PAIN,          // painsound
+     S_CENTAUR_ATK1,            // meleestate
+     S_CENTAUR_MISSILE1,        // missilestate
+     S_NULL,                    // crashstate
+     S_CENTAUR_DEATH1,          // deathstate
+     S_CENTAUR_DEATH_X1,        // xdeathstate
+     SFX_CENTAUR_DEATH,         // deathsound
+     10,                        // speed
+     20 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     120,                       // mass
+     0,                         // damage
+     SFX_CENTAUR_ACTIVE,        // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP   // flags2
+     },
+
+    {                           // MT_CENTAUR_FX
+     -1,                        // doomednum
+     S_CENTAUR_FX1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CENTAUR_FX_X1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_CENTAUR_MISSILE_EXPLODE,       // deathsound
+     20 * FRACUNIT,             // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
+     },
+
+    {                           // MT_CENTAUR_SHIELD
+     -1,                        // doomednum
+     S_CENTAUR_SHIELD1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CENTAUR_SHIELD_X1,       // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_DROPOFF | MF_CORPSE,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_CENTAUR_SWORD
+     -1,                        // doomednum
+     S_CENTAUR_SWORD1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_CENTAUR_SWORD_X1,        // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_DROPOFF | MF_CORPSE,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DEMON
+     31,                        // doomednum
+     S_DEMN_LOOK1,              // spawnstate
+     250,                       // spawnhealth
+     S_DEMN_CHASE1,             // seestate
+     SFX_DEMON_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_DEMON_ATTACK,          // attacksound
+     S_DEMN_PAIN1,              // painstate
+     50,                        // painchance
+     SFX_DEMON_PAIN,            // painsound
+     S_DEMN_ATK1_1,             // meleestate
+     S_DEMN_ATK2_1,             // missilestate
+     S_NULL,                    // crashstate
+     S_DEMN_DEATH1,             // deathstate
+     S_DEMN_XDEATH1,            // xdeathstate
+     SFX_DEMON_DEATH,           // deathsound
+     13,                        // speed
+     32 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     220,                       // mass
+     0,                         // damage
+     SFX_DEMON_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_TELESTOMP  // flags2
+     },
+
+    {                           // MT_DEMONCHUNK1
+     -1,                        // doomednum
+     S_DEMONCHUNK1_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMONCHUNK1_4,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMONCHUNK2
+     -1,                        // doomednum
+     S_DEMONCHUNK2_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMONCHUNK2_4,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMONCHUNK3
+     -1,                        // doomednum
+     S_DEMONCHUNK3_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMONCHUNK3_4,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMONCHUNK4
+     -1,                        // doomednum
+     S_DEMONCHUNK4_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMONCHUNK4_4,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMONCHUNK5
+     -1,                        // doomednum
+     S_DEMONCHUNK5_1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMONCHUNK5_4,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMONFX1
+     -1,                        // doomednum
+     S_DEMONFX_MOVE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMONFX_BOOM1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DEMON_MISSILE_EXPLODE, // deathsound
+     15 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     5,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FIREDAMAGE  // flags2
+     },
+
+    {                           // MT_DEMON2
+     8080,                      // doomednum
+     S_DEMN2_LOOK1,             // spawnstate
+     250,                       // spawnhealth
+     S_DEMN2_CHASE1,            // seestate
+     SFX_DEMON_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_DEMON_ATTACK,          // attacksound
+     S_DEMN2_PAIN1,             // painstate
+     50,                        // painchance
+     SFX_DEMON_PAIN,            // painsound
+     S_DEMN2_ATK1_1,            // meleestate
+     S_DEMN2_ATK2_1,            // missilestate
+     S_NULL,                    // crashstate
+     S_DEMN2_DEATH1,            // deathstate
+     S_DEMN2_XDEATH1,           // xdeathstate
+     SFX_DEMON_DEATH,           // deathsound
+     13,                        // speed
+     32 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     220,                       // mass
+     0,                         // damage
+     SFX_DEMON_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_TELESTOMP  // flags2
+     },
+
+    {                           // MT_DEMON2CHUNK1
+     -1,                        // doomednum
+     S_DEMON2CHUNK1_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMON2CHUNK1_4,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMON2CHUNK2
+     -1,                        // doomednum
+     S_DEMON2CHUNK2_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMON2CHUNK2_4,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMON2CHUNK3
+     -1,                        // doomednum
+     S_DEMON2CHUNK3_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMON2CHUNK3_4,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMON2CHUNK4
+     -1,                        // doomednum
+     S_DEMON2CHUNK4_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMON2CHUNK4_4,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMON2CHUNK5
+     -1,                        // doomednum
+     S_DEMON2CHUNK5_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMON2CHUNK5_4,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_DEMON2FX1
+     -1,                        // doomednum
+     S_DEMON2FX_MOVE1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DEMON2FX_BOOM1,          // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DEMON_MISSILE_EXPLODE, // deathsound
+     15 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     5,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FIREDAMAGE  // flags2
+     },
+
+    {                           // MT_WRAITHB
+     10011,                     // doomednum
+     S_WRAITH_LOOK1,            // spawnstate
+     150,                       // spawnhealth
+     S_WRAITH_RAISE1,           // seestate
+     SFX_WRAITH_SIGHT,          // seesound
+     8,                         // reactiontime
+     SFX_WRAITH_ATTACK,         // attacksound
+     S_WRAITH_PAIN1,            // painstate
+     25,                        // painchance
+     SFX_WRAITH_PAIN,           // painsound
+     S_WRAITH_ATK1_1,           // meleestate
+     S_WRAITH_ATK2_1,           // missilestate
+     S_NULL,                    // crashstate
+     S_WRAITH_DEATH1_1,         // deathstate
+     S_WRAITH_DEATH2_1,         // xdeathstate
+     SFX_WRAITH_DEATH,          // deathsound
+     11,                        // speed
+     20 * FRACUNIT,             // radius
+     68 * FRACUNIT,             // height
+     75,                        // mass
+     10,                        // damage
+     SFX_WRAITH_ACTIVE,         // activesound
+     MF_DROPOFF | MF_NOGRAVITY | MF_FLOAT | MF_COUNTKILL,       // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP | MF2_DONTDRAW // flags2
+     },
+
+    {                           // MT_WRAITH
+     34,                        // doomednum
+     S_WRAITH_INIT1,            // spawnstate
+     150,                       // spawnhealth
+     S_WRAITH_CHASE1,           // seestate
+     SFX_WRAITH_SIGHT,          // seesound
+     8,                         // reactiontime
+     SFX_WRAITH_ATTACK,         // attacksound
+     S_WRAITH_PAIN1,            // painstate
+     25,                        // painchance
+     SFX_WRAITH_PAIN,           // painsound
+     S_WRAITH_ATK1_1,           // meleestate
+     S_WRAITH_ATK2_1,           // missilestate
+     S_NULL,                    // crashstate
+     S_WRAITH_DEATH1_1,         // deathstate
+     S_WRAITH_DEATH2_1,         // xdeathstate
+     SFX_WRAITH_DEATH,          // deathsound
+     11,                        // speed
+     20 * FRACUNIT,             // radius
+     55 * FRACUNIT,             // height
+     75,                        // mass
+     10,                        // damage
+     SFX_WRAITH_ACTIVE,         // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF | MF_NOGRAVITY | MF_FLOAT,     // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP        // flags2
+     },
+
+    {                           // MT_WRAITHFX1
+     -1,                        // doomednum
+     S_WRTHFX_MOVE1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_WRTHFX_BOOM1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_WRAITH_MISSILE_EXPLODE,        // deathsound
+     14 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     5,                         // mass
+     5,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF | MF_MISSILE,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FLOORCLIP | MF2_FIREDAMAGE  // flags2
+     },
+
+    {                           // MT_WRAITHFX2
+     -1,                        // doomednum
+     S_WRTHFX_SIZZLE1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_WRAITHFX3
+     -1,                        // doomednum
+     S_WRTHFX_DROP1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_WRTHFX_DEAD1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRIP,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_WRAITHFX4
+     -1,                        // doomednum
+     S_WRTHFX_ADROP1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_WRTHFX_ADEAD1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRIP,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_WRAITHFX5
+     -1,                        // doomednum
+     S_WRTHFX_BDROP1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_WRTHFX_BDEAD1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRIP,                  // deathsound
+     0,                         // speed
+     2 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     5,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_MINOTAUR
+     9,                         // doomednum
+     S_MNTR_SPAWN1,             // spawnstate
+     2500,                      // spawnhealth
+     S_MNTR_WALK1,              // seestate
+     SFX_MAULATOR_SIGHT,        // seesound
+     8,                         // reactiontime
+     SFX_MAULATOR_HAMMER_SWING, // attacksound
+     S_MNTR_PAIN1,              // painstate
+     25,                        // painchance
+     SFX_MAULATOR_PAIN,         // painsound
+     S_MNTR_ATK1_1,             // meleestate
+     S_MNTR_ATK2_1,             // missilestate
+     S_NULL,                    // crashstate
+     S_MNTR_DIE1,               // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_MAULATOR_DEATH,        // deathsound
+     16,                        // speed
+     28 * FRACUNIT,             // radius
+     100 * FRACUNIT,            // height
+     800,                       // mass
+     7,                         // damage
+     SFX_MAULATOR_ACTIVE,       // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP        // flags2
+     },
+
+    {                           // MT_MNTRFX1
+     -1,                        // doomednum
+     S_MNTRFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MNTRFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     20 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     3,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_MNTRFX2
+     -1,                        // doomednum
+     S_MNTRFX2_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MNTRFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     14 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     12 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_MNTRFX3
+     -1,                        // doomednum
+     S_MNTRFX3_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_MNTRFXI2_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_MNTRSMOKE
+     -1,                        // doomednum
+     S_MINOSMOKE1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_MNTRSMOKEEXIT
+     -1,                        // doomednum
+     S_MINOSMOKEX1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SERPENT
+     121,                       // doomednum
+     S_SERPENT_LOOK1,           // spawnstate
+     90,                        // spawnhealth
+     S_SERPENT_SWIM1,           // seestate
+     SFX_SERPENT_SIGHT,         // seesound
+     8,                         // reactiontime
+     SFX_SERPENT_ATTACK,        // attacksound
+     S_SERPENT_PAIN1,           // painstate
+     96,                        // painchance
+     SFX_SERPENT_PAIN,          // painsound
+     S_SERPENT_SURFACE1,        // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SERPENT_DIE1,            // deathstate
+     S_SERPENT_XDIE1,           // xdeathstate
+     SFX_SERPENT_DEATH,         // deathsound
+     12,                        // speed
+     32 * FRACUNIT,             // radius
+     70 * FRACUNIT,             // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_COUNTKILL | MF_NOBLOOD,      // flags
+     MF2_PASSMOBJ | MF2_DONTDRAW | MF2_CANTLEAVEFLOORPIC | MF2_NONSHOOTABLE | MF2_MCROSS        // flags2
+     },
+
+    {                           // MT_SERPENTLEADER
+     120,                       // doomednum
+     S_SERPENT_LOOK1,           // spawnstate
+     90,                        // spawnhealth
+     S_SERPENT_SWIM1,           // seestate
+     SFX_SERPENT_SIGHT,         // seesound
+     8,                         // reactiontime
+     SFX_SERPENT_ATTACK,        // attacksound
+     S_SERPENT_PAIN1,           // painstate
+     96,                        // painchance
+     SFX_SERPENT_PAIN,          // painsound
+     S_SERPENT_SURFACE1,        // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SERPENT_DIE1,            // deathstate
+     S_SERPENT_XDIE1,           // xdeathstate
+     SFX_SERPENT_DEATH,         // deathsound
+     12,                        // speed
+     32 * FRACUNIT,             // radius
+     70 * FRACUNIT,             // height
+     200,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_COUNTKILL | MF_NOBLOOD,      // flags
+     MF2_PASSMOBJ | MF2_DONTDRAW | MF2_CANTLEAVEFLOORPIC | MF2_NONSHOOTABLE | MF2_MCROSS        // flags2
+     },
+
+    {                           // MT_SERPENTFX
+     -1,                        // doomednum
+     S_SERPENT_FX1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     0,                         // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SERPENT_FX_X1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_SERPENTFX_HIT,         // deathsound
+     15 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     4,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SERPENT_HEAD
+     -1,                        // doomednum
+     S_SERPENT_HEAD1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     MF2_LOGRAV                 // flags2
+     },
+
+    {                           // MT_SERPENT_GIB1
+     -1,                        // doomednum
+     S_SERPENT_GIB1_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     3 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SERPENT_GIB2
+     -1,                        // doomednum
+     S_SERPENT_GIB2_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     3 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SERPENT_GIB3
+     -1,                        // doomednum
+     S_SERPENT_GIB3_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     3 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BISHOP
+     114,                       // doomednum
+     S_BISHOP_LOOK1,            // spawnstate
+     130,                       // spawnhealth
+     S_BISHOP_WALK1,            // seestate
+     SFX_BISHOP_SIGHT,          // seesound
+     8,                         // reactiontime
+     SFX_BISHOP_ATTACK,         // attacksound
+     S_BISHOP_PAIN1,            // painstate
+     110,                       // painchance
+     SFX_BISHOP_PAIN,           // painsound
+     0,                         // meleestate
+     S_BISHOP_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_BISHOP_DEATH1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_BISHOP_DEATH,          // deathsound
+     10,                        // speed
+     22 * FRACUNIT,             // radius
+     65 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_BISHOP_ACTIVE,         // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_FLOAT | MF_NOGRAVITY | MF_NOBLOOD,     // flags
+     MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP        // flags2
+     },
+
+    {                           // MT_BISHOP_PUFF
+     -1,                        // doomednum
+     S_BISHOP_PUFF1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SHADOW | MF_NOBLOCKMAP | MF_NOGRAVITY,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BISHOPBLUR
+     -1,                        // doomednum
+     S_BISHOPBLUR1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BISHOPPAINBLUR
+     -1,                        // doomednum
+     S_BISHOPPAINBLUR1,         // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
+     0                          // flags2
+     },
+
+    {                           // MT_BISH_FX
+     -1,                        // doomednum
+     S_BISHFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BISHFXI1_1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_BISHOP_MISSILE_EXPLODE,        // deathsound
+     10 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_SEEKERMISSILE // flags2
+     },
+
+    {                           // MT_DRAGON
+     254,                       // doomednum
+     S_DRAGON_LOOK1,            // spawnstate
+     640,                       // spawnhealth
+     S_DRAGON_INIT,             // seestate
+     SFX_DRAGON_SIGHT,          // seesound
+     8,                         // reactiontime
+     SFX_DRAGON_ATTACK,         // attacksound
+     S_DRAGON_PAIN1,            // painstate
+     128,                       // painchance
+     SFX_DRAGON_PAIN,           // painsound
+     S_NULL,                    // meleestate
+     S_DRAGON_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_DRAGON_DEATH1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRAGON_DEATH,          // deathsound
+     10 * FRACUNIT,             // speed
+     20 * FRACUNIT,             // radius
+     65 * FRACUNIT,             // height
+     INT_MAX,                    // mass
+     0,                         // damage
+     SFX_DRAGON_ACTIVE,         // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_FLOAT | MF_NOGRAVITY | MF_NOBLOOD,     // flags
+     MF2_PASSMOBJ | MF2_BOSS    // flags2
+     },
+
+    {                           // MT_DRAGON_FX
+     -1,                        // doomednum
+     S_DRAGON_FX1_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_DRAGON_FX1_X1,           // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRAGON_FIREBALL_EXPLODE,       // deathsound
+     24 * FRACUNIT,             // speed
+     12 * FRACUNIT,             // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     6,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
+     },
+
+    {                           // MT_DRAGON_FX2
+     -1,                        // doomednum
+     S_DRAGON_FX2_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRAGON_FIREBALL_EXPLODE,       // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP,             // flags
+     MF2_NOTELEPORT | MF2_FIREDAMAGE | MF2_DONTDRAW     // flags2
+     },
+
+    {                           // MT_ARMOR_1
+     8005,                      // doomednum
+     S_ARMOR_1,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARMOR_2
+     8006,                      // doomednum
+     S_ARMOR_2,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARMOR_3
+     8007,                      // doomednum
+     S_ARMOR_3,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ARMOR_4
+     8008,                      // doomednum
+     S_ARMOR_4,                 // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL | MF_NOGRAVITY, // flags
+     0                          // flags2
+     },
+
+    {                           // MT_MANA1
+     122,                       // doomednum
+     S_MANA1_1,                 // spawnstate
+     10,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MANA2
+     124,                       // doomednum
+     S_MANA2_1,                 // spawnstate
+     10,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_MANA3
+     8004,                      // doomednum
+     S_MANA3_1,                 // spawnstate
+     20,                        // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     8 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     MF2_FLOATBOB               // flags2
+     },
+
+    {                           // MT_KEY1
+     8030,                      // doomednum
+     S_KEY1,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY2
+     8031,                      // doomednum
+     S_KEY2,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY3
+     8032,                      // doomednum
+     S_KEY3,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY4
+     8033,                      // doomednum
+     S_KEY4,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY5
+     8034,                      // doomednum
+     S_KEY5,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY6
+     8035,                      // doomednum
+     S_KEY6,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY7
+     8036,                      // doomednum
+     S_KEY7,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY8
+     8037,                      // doomednum
+     S_KEY8,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEY9
+     8038,                      // doomednum
+     S_KEY9,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEYA
+     8039,                      // doomednum
+     S_KEYA,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_KEYB
+     8200,                      // doomednum
+     S_KEYB,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     8 * FRACUNIT,              // radius
+     20 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SPECIAL,                // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SOUNDWIND
+     1410,                      // doomednum
+     S_SND_WIND1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_SOUNDWATERFALL
+     41,                        // doomednum
+     S_SND_WATERFALL,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
+     0                          // flags2
+     },
+
+    {                           // MT_ETTIN
+     10030,                     // doomednum
+     S_ETTIN_LOOK1,             // spawnstate
+     175,                       // spawnhealth
+     S_ETTIN_CHASE1,            // seestate
+     SFX_ETTIN_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_ETTIN_ATTACK,          // attacksound
+     S_ETTIN_PAIN1,             // painstate
+     60,                        // painchance
+     SFX_ETTIN_PAIN,            // painsound
+     S_ETTIN_ATK1_1,            // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ETTIN_DEATH1_1,          // deathstate
+     S_ETTIN_DEATH2_1,          // xdeathstate
+     SFX_ETTIN_DEATH,           // deathsound
+     13,                        // speed
+     25 * FRACUNIT,             // radius
+     68 * FRACUNIT,             // height
+     175,                       // mass
+     3,                         // damage
+     SFX_ETTIN_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP  // flags2
+     },
+
+    {                           // MT_ETTIN_MACE
+     -1,                        // doomednum
+     S_ETTIN_MACE1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ETTIN_MACE5,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_DROPOFF | MF_CORPSE,    // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_FIREDEMON
+     10060,                     // doomednum
+     S_FIRED_SPAWN1,            // spawnstate
+     80,                        // spawnhealth
+     S_FIRED_LOOK4,             // seestate
+     SFX_FIRED_SPAWN,           // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_FIRED_PAIN1,             // painstate
+     1,                         // painchance
+     SFX_FIRED_PAIN,            // painsound
+     S_NULL,                    // meleestate
+     S_FIRED_ATTACK1,           // missilestate
+     S_FIRED_XDEATH1,           // crashstate
+     S_FIRED_DEATH1,            // deathstate
+     S_FIRED_XDEATH1,           // xdeathstate
+     SFX_FIRED_DEATH,           // deathsound
+     13,                        // speed
+     20 * FRACUNIT,             // radius
+     68 * FRACUNIT,             // height
+     75,                        // mass
+     1,                         // damage
+     SFX_FIRED_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF | MF_NOGRAVITY | MF_FLOAT,     // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_INVULNERABLE | MF2_MCROSS | MF2_TELESTOMP        // flags2
+     },
+
+    {                           // MT_FIREDEMON_SPLOTCH1
+     -1,                        // doomednum
+     S_FIRED_CORPSE1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_DROPOFF | MF_CORPSE,    // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_FIREDEMON_SPLOTCH2
+     -1,                        // doomednum
+     S_FIRED_CORPSE4,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_DROPOFF | MF_CORPSE,    // flags
+     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
+     },
+
+    {                           // MT_FIREDEMON_FX1
+     -1,                        // doomednum
+     S_FIRED_RDROP1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIRED_RDEAD1_1,          // deathstate
+     S_FIRED_RDEAD1_2,          // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     16,                        // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FIREDEMON_FX2
+     -1,                        // doomednum
+     S_FIRED_RDROP2,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIRED_RDEAD2_1,          // deathstate
+     S_FIRED_RDEAD2_2,          // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     16,                        // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FIREDEMON_FX3
+     -1,                        // doomednum
+     S_FIRED_RDROP3,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIRED_RDEAD3_1,          // deathstate
+     S_FIRED_RDEAD3_2,          // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     16,                        // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FIREDEMON_FX4
+     -1,                        // doomednum
+     S_FIRED_RDROP4,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIRED_RDEAD4_1,          // deathstate
+     S_FIRED_RDEAD4_2,          // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     16,                        // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FIREDEMON_FX5
+     -1,                        // doomednum
+     S_FIRED_RDROP5,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIRED_RDEAD5_1,          // deathstate
+     S_FIRED_RDEAD5_2,          // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     3 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     16,                        // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FIREDEMON_FX6
+     -1,                        // doomednum
+     S_FIRED_FX6_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_FIRED_FX6_2,             // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_FIRED_MISSILE_HIT,     // deathsound
+     10 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     6 * FRACUNIT,              // height
+     15,                        // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF | MF_MISSILE,    // flags
+     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FLOORCLIP | MF2_FIREDAMAGE  // flags2
+     },
+
+    {                           // MT_ICEGUY
+     8020,                      // doomednum
+     S_ICEGUY_LOOK,             // spawnstate
+     120,                       // spawnhealth
+     S_ICEGUY_WALK1,            // seestate
+     SFX_ICEGUY_SIGHT,          // seesound
+     8,                         // reactiontime
+     SFX_ICEGUY_ATTACK,         // attacksound
+     S_ICEGUY_PAIN1,            // painstate
+     144,                       // painchance
+     SFX_NONE,                  // painsound
+     0,                         // meleestate
+     S_ICEGUY_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_ICEGUY_DEATH,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     14,                        // speed
+     22 * FRACUNIT,             // radius
+     75 * FRACUNIT,             // height
+     150,                       // mass
+     0,                         // damage
+     SFX_ICEGUY_ACTIVE,         // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
+     MF2_PASSMOBJ | MF2_PUSHWALL | MF2_ICEDAMAGE | MF2_MCROSS | MF2_TELESTOMP   // flags2
+     },
+
+    {                           // MT_ICEGUY_FX
+     -1,                        // doomednum
+     S_ICEGUY_FX1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_ICEGUY_FX_X1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_ICEGUY_FX_EXPLODE,     // deathsound
+     14 * FRACUNIT,             // speed
+     8 * FRACUNIT,              // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
+     MF2_NOTELEPORT | MF2_ICEDAMAGE     // flags2
+     },
+
+    {                           // MT_ICEFX_PUFF
+     -1,                        // doomednum
+     S_ICEFX_PUFF1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     FRACUNIT,                  // radius
+     FRACUNIT,                  // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW | MF_DROPOFF,     // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ICEGUY_FX2
+     -1,                        // doomednum
+     S_ICEGUY_FX2_1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     10 * FRACUNIT,             // speed
+     4 * FRACUNIT,              // radius
+     4 * FRACUNIT,              // height
+     100,                       // mass
+     1,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
+     MF2_NOTELEPORT | MF2_LOGRAV | MF2_ICEDAMAGE        // flags2
+     },
+
+    {                           // MT_ICEGUY_BIT
+     -1,                        // doomednum
+     S_ICEGUY_BIT1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     FRACUNIT,                  // radius
+     FRACUNIT,                  // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_ICEGUY_WISP1
+     -1,                        // doomednum
+     S_ICEGUY_WISP1_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE,     // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_ICEGUY_WISP2
+     -1,                        // doomednum
+     S_ICEGUY_WISP2_1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE,     // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_FIGHTER_BOSS
+     10100,                     // doomednum
+     S_FIGHTER,                 // spawnstate
+     800,                       // spawnhealth
+     S_FIGHTER_RUN1,            // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_FIGHTER_PAIN,            // painstate
+     50,                        // painchance
+     SFX_PLAYER_FIGHTER_PAIN,   // painsound
+     S_FIGHTER_ATK1,            // meleestate
+     S_FIGHTER_ATK1,            // missilestate
+     S_NULL,                    // crashstate
+     S_FIGHTER_DIE1,            // deathstate
+     S_FIGHTER_XDIE1,           // xdeathstate
+     SFX_PLAYER_FIGHTER_CRAZY_DEATH,    // deathsound
+     25,                        // speed
+     16 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL | MF2_MCROSS   // flags2
+     },
+
+    {                           // MT_CLERIC_BOSS
+     10101,                     // doomednum
+     S_CLERIC,                  // spawnstate
+     800,                       // spawnhealth
+     S_CLERIC_RUN1,             // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_CLERIC_PAIN,             // painstate
+     50,                        // painchance
+     SFX_PLAYER_CLERIC_PAIN,    // painsound
+     S_CLERIC_ATK1,             // meleestate
+     S_CLERIC_ATK1,             // missilestate
+     S_NULL,                    // crashstate
+     S_CLERIC_DIE1,             // deathstate
+     S_CLERIC_XDIE1,            // xdeathstate
+     SFX_PLAYER_CLERIC_CRAZY_DEATH,     // deathsound
+     25,                        // speed
+     16 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL | MF2_MCROSS   // flags2
+     },
+
+    {                           // MT_MAGE_BOSS
+     10102,                     // doomednum
+     S_MAGE,                    // spawnstate
+     800,                       // spawnhealth
+     S_MAGE_RUN1,               // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_MAGE_PAIN,               // painstate
+     50,                        // painchance
+     SFX_PLAYER_MAGE_PAIN,      // painsound
+     S_MAGE_ATK1,               // meleestate
+     S_MAGE_ATK1,               // missilestate
+     S_NULL,                    // crashstate
+     S_MAGE_DIE1,               // deathstate
+     S_MAGE_XDIE1,              // xdeathstate
+     SFX_PLAYER_MAGE_CRAZY_DEATH,       // deathsound
+     25,                        // speed
+     16 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL | MF2_MCROSS   // flags2
+     },
+
+    {                           // MT_SORCBOSS
+     10080,                     // doomednum
+     S_SORC_SPAWN1,             // spawnstate
+     5000,                      // spawnhealth
+     S_SORC_WALK1,              // seestate
+     SFX_SORCERER_SIGHT,        // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_SORC_PAIN1,              // painstate
+     10,                        // painchance
+     SFX_SORCERER_PAIN,         // painsound
+     S_NULL,                    // meleestate
+     S_SORC_ATK2_1,             // missilestate
+     S_NULL,                    // crashstate
+     S_SORC_DIE1,               // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_SORCERER_DEATHSCREAM,  // deathsound
+     16,                        // speed
+     40 * FRACUNIT,             // radius
+     110 * FRACUNIT,            // height
+     500,                       // mass
+     9,                         // damage
+     SFX_SORCERER_ACTIVE,       // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_BOSS | MF2_MCROSS        // flags2
+     },
+
+    {                           // MT_SORCBALL1
+     -1,                        // doomednum
+     S_SORCBALL1_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_SORCERER_BALLBOUNCE,   // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_SORCBALL1_D1,            // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SORCBALL1_D5,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     10 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SORCBALL2
+     -1,                        // doomednum
+     S_SORCBALL2_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_SORCERER_BALLBOUNCE,   // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_SORCBALL2_D1,            // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SORCBALL2_D5,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     10 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SORCBALL3
+     -1,                        // doomednum
+     S_SORCBALL3_1,             // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_SORCERER_BALLBOUNCE,   // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_SORCBALL3_D1,            // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SORCBALL3_D5,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     10 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SORCFX1
+     -1,                        // doomednum
+     S_SORCFX1_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_SORCERER_BALLBOUNCE,   // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SORCFX1_D1,              // deathstate
+     S_SORCFX1_D1,              // xdeathstate
+     SFX_NONE,                  // deathsound
+     7 * FRACUNIT,              // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE,        // flags
+     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
+     },
+
+    {                           // MT_SORCFX2
+     -1,                        // doomednum
+     S_SORCFX2_SPLIT1,          // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SORCFX2T1,               // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     15 * FRACUNIT,             // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SORCFX2_T1
+     -1,                        // doomednum
+     S_SORCFX2T1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_ALTSHADOW,       // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SORCFX3
+     -1,                        // doomednum
+     S_SORCFX3_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_SORCERER_BISHOPSPAWN,  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BISHMORPH1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     15 * FRACUNIT,             // speed
+     22 * FRACUNIT,             // radius
+     65 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE,        // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SORCFX3_EXPLOSION
+     -1,                        // doomednum
+     S_SORCFX3_EXP1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_ALTSHADOW,       // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SORCFX4
+     -1,                        // doomednum
+     S_SORCFX4_1,               // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_SORCFX4_D1,              // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_SORCERER_BALLEXPLODE,  // deathsound
+     12 * FRACUNIT,             // speed
+     10 * FRACUNIT,             // radius
+     10 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_MISSILE | MF_NOGRAVITY, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_SORCSPARK1
+     -1,                        // doomednum
+     S_SORCSPARK1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     5 * FRACUNIT,              // radius
+     5 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
+     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
+     },
+
+    {                           // MT_BLASTEFFECT
+     -1,                        // doomednum
+     S_BLASTEFFECT1,            // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_NOCLIP | MF_ALTSHADOW,   // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_WATER_DRIP
+     -1,                        // doomednum
+     S_WATERDRIP1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DRIP,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     1,                         // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_MISSILE,                // flags
+     MF2_LOGRAV | MF2_NOTELEPORT        // flags2
+     },
+
+    {                           // MT_KORAX
+     10200,                     // doomednum
+     S_KORAX_LOOK1,             // spawnstate
+     5000,                      // spawnhealth
+     S_KORAX_CHASE2,            // seestate
+     SFX_KORAX_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_KORAX_ATTACK,          // attacksound
+     S_KORAX_PAIN1,             // painstate
+     20,                        // painchance
+     SFX_KORAX_PAIN,            // painsound
+     S_NULL,                    // meleestate
+     S_KORAX_ATTACK1,           // missilestate
+     S_NULL,                    // crashstate
+     S_KORAX_DEATH1,            // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_KORAX_DEATH,           // deathsound
+     10,                        // speed
+     65 * FRACUNIT,             // radius
+     115 * FRACUNIT,            // height
+     2000,                      // mass
+     15,                        // damage
+     SFX_KORAX_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
+     MF2_FLOORCLIP | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP | MF2_BOSS       // flags2
+     },
+
+    {                           // MT_KORAX_SPIRIT1
+     -1,                        // doomednum
+     S_KSPIRIT_ROAM1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     8 * FRACUNIT,              // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_KORAX_SPIRIT2
+     -1,                        // doomednum
+     S_KSPIRIT_ROAM1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     8 * FRACUNIT,              // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_KORAX_SPIRIT3
+     -1,                        // doomednum
+     S_KSPIRIT_ROAM1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     8 * FRACUNIT,              // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_KORAX_SPIRIT4
+     -1,                        // doomednum
+     S_KSPIRIT_ROAM1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     8 * FRACUNIT,              // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_KORAX_SPIRIT5
+     -1,                        // doomednum
+     S_KSPIRIT_ROAM1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     8 * FRACUNIT,              // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_KORAX_SPIRIT6
+     -1,                        // doomednum
+     S_KSPIRIT_ROAM1,           // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     8 * FRACUNIT,              // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_DEMON_MASH
+     -1,                        // doomednum
+     S_DEMN_LOOK1,              // spawnstate
+     250,                       // spawnhealth
+     S_DEMN_CHASE1,             // seestate
+     SFX_DEMON_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_DEMON_ATTACK,          // attacksound
+     S_DEMN_PAIN1,              // painstate
+     50,                        // painchance
+     SFX_DEMON_PAIN,            // painsound
+     S_DEMN_ATK1_1,             // meleestate
+     S_DEMN_ATK2_1,             // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DEMON_DEATH,           // deathsound
+     13,                        // speed
+     32 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     220,                       // mass
+     0,                         // damage
+     SFX_DEMON_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
+     },
+
+    {                           // MT_DEMON2_MASH
+     -1,                        // doomednum
+     S_DEMN2_LOOK1,             // spawnstate
+     250,                       // spawnhealth
+     S_DEMN2_CHASE1,            // seestate
+     SFX_DEMON_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_DEMON_ATTACK,          // attacksound
+     S_DEMN2_PAIN1,             // painstate
+     50,                        // painchance
+     SFX_DEMON_PAIN,            // painsound
+     S_DEMN2_ATK1_1,            // meleestate
+     S_DEMN2_ATK2_1,            // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_DEMON_DEATH,           // deathsound
+     13,                        // speed
+     32 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     220,                       // mass
+     0,                         // damage
+     SFX_DEMON_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
+     },
+
+    {                           // MT_ETTIN_MASH
+     -1,                        // doomednum
+     S_ETTIN_LOOK1,             // spawnstate
+     175,                       // spawnhealth
+     S_ETTIN_CHASE1,            // seestate
+     SFX_ETTIN_SIGHT,           // seesound
+     8,                         // reactiontime
+     SFX_ETTIN_ATTACK,          // attacksound
+     S_ETTIN_PAIN1,             // painstate
+     60,                        // painchance
+     SFX_ETTIN_PAIN,            // painsound
+     S_ETTIN_ATK1_1,            // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_ETTIN_DEATH,           // deathsound
+     13,                        // speed
+     25 * FRACUNIT,             // radius
+     68 * FRACUNIT,             // height
+     175,                       // mass
+     3,                         // damage
+     SFX_ETTIN_ACTIVE,          // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
+     },
+
+    {                           // MT_CENTAUR_MASH
+     -1,                        // doomednum
+     S_CENTAUR_LOOK1,           // spawnstate
+     200,                       // spawnhealth
+     S_CENTAUR_WALK1,           // seestate
+     SFX_CENTAUR_SIGHT,         // seesound
+     8,                         // reactiontime
+     SFX_CENTAUR_ATTACK,        // attacksound
+     S_CENTAUR_PAIN1,           // painstate
+     135,                       // painchance
+     SFX_CENTAUR_PAIN,          // painsound
+     S_CENTAUR_ATK1,            // meleestate
+     0,                         // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_CENTAUR_DEATH,         // deathsound
+     13,                        // speed
+     20 * FRACUNIT,             // radius
+     64 * FRACUNIT,             // height
+     120,                       // mass
+     0,                         // damage
+     SFX_CENTAUR_ACTIVE,        // activesound
+     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
+     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
+     },
+
+    {                           // MT_KORAX_BOLT
+     -1,                        // doomednum
+     S_KBOLT1,                  // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     15 * FRACUNIT,             // radius
+     35 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
+     MF2_NOTELEPORT             // flags2
+     },
+
+    {                           // MT_BAT_SPAWNER
+     10225,                     // doomednum
+     S_SPAWNBATS1,              // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_NULL,                    // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     0,                         // speed
+     20 * FRACUNIT,             // radius
+     16 * FRACUNIT,             // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOSECTOR | MF_NOGRAVITY,        // flags
+     MF2_DONTDRAW               // flags2
+     },
+
+    {                           // MT_BAT
+     -1,                        // doomednum
+     S_BAT1,                    // spawnstate
+     1000,                      // spawnhealth
+     S_NULL,                    // seestate
+     SFX_NONE,                  // seesound
+     8,                         // reactiontime
+     SFX_NONE,                  // attacksound
+     S_NULL,                    // painstate
+     0,                         // painchance
+     SFX_NONE,                  // painsound
+     S_NULL,                    // meleestate
+     S_NULL,                    // missilestate
+     S_NULL,                    // crashstate
+     S_BAT_DEATH,               // deathstate
+     S_NULL,                    // xdeathstate
+     SFX_NONE,                  // deathsound
+     5 * FRACUNIT,              // speed
+     3 * FRACUNIT,              // radius
+     3 * FRACUNIT,              // height
+     100,                       // mass
+     0,                         // damage
+     SFX_NONE,                  // activesound
+     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
+     MF2_PASSMOBJ | MF2_NOTELEPORT      // flags2
+     }
+};
diff --git a/games/NXDoom/src/hexen/info.h b/games/NXDoom/src/hexen/info.h
new file mode 100644
index 000000000..18872fae9
--- /dev/null
+++ b/games/NXDoom/src/hexen/info.h
@@ -0,0 +1,3626 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// generated by stateco
+
+typedef enum
+{
+    SPR_MAN1,
+    SPR_ACLO,
+    SPR_TLGL,
+    SPR_FBL1,
+    SPR_XPL1,
+    SPR_ARRW,
+    SPR_DART,
+    SPR_RIPP,
+    SPR_CFCF,
+    SPR_BLAD,
+    SPR_SHRD,
+    SPR_FFSM,
+    SPR_FFLG,
+    SPR_PTN1,
+    SPR_PTN2,
+    SPR_SOAR,
+    SPR_INVU,
+    SPR_SUMN,
+    SPR_TSPK,
+    SPR_TELO,
+    SPR_TRNG,
+    SPR_ROCK,
+    SPR_FOGS,
+    SPR_FOGM,
+    SPR_FOGL,
+    SPR_SGSA,
+    SPR_SGSB,
+    SPR_PORK,
+    SPR_EGGM,
+    SPR_FHFX,
+    SPR_SPHL,
+    SPR_STWN,
+    SPR_GMPD,
+    SPR_ASKU,
+    SPR_ABGM,
+    SPR_AGMR,
+    SPR_AGMG,
+    SPR_AGG2,
+    SPR_AGMB,
+    SPR_AGB2,
+    SPR_ABK1,
+    SPR_ABK2,
+    SPR_ASK2,
+    SPR_AFWP,
+    SPR_ACWP,
+    SPR_AMWP,
+    SPR_AGER,
+    SPR_AGR2,
+    SPR_AGR3,
+    SPR_AGR4,
+    SPR_TRCH,
+    SPR_PSBG,
+    SPR_ATLP,
+    SPR_THRW,
+    SPR_SPED,
+    SPR_BMAN,
+    SPR_BRAC,
+    SPR_BLST,
+    SPR_HRAD,
+    SPR_SPSH,
+    SPR_LVAS,
+    SPR_SLDG,
+    SPR_STTW,
+    SPR_RCK1,
+    SPR_RCK2,
+    SPR_RCK3,
+    SPR_RCK4,
+    SPR_CDLR,
+    SPR_TRE1,
+    SPR_TRDT,
+    SPR_TRE2,
+    SPR_TRE3,
+    SPR_STM1,
+    SPR_STM2,
+    SPR_STM3,
+    SPR_STM4,
+    SPR_MSH1,
+    SPR_MSH2,
+    SPR_MSH3,
+    SPR_MSH4,
+    SPR_MSH5,
+    SPR_MSH6,
+    SPR_MSH7,
+    SPR_MSH8,
+    SPR_SGMP,
+    SPR_SGM1,
+    SPR_SGM2,
+    SPR_SGM3,
+    SPR_SLC1,
+    SPR_SLC2,
+    SPR_SLC3,
+    SPR_MSS1,
+    SPR_MSS2,
+    SPR_SWMV,
+    SPR_CPS1,
+    SPR_CPS2,
+    SPR_TMS1,
+    SPR_TMS2,
+    SPR_TMS3,
+    SPR_TMS4,
+    SPR_TMS5,
+    SPR_TMS6,
+    SPR_TMS7,
+    SPR_CPS3,
+    SPR_STT2,
+    SPR_STT3,
+    SPR_STT4,
+    SPR_STT5,
+    SPR_GAR1,
+    SPR_GAR2,
+    SPR_GAR3,
+    SPR_GAR4,
+    SPR_GAR5,
+    SPR_GAR6,
+    SPR_GAR7,
+    SPR_GAR8,
+    SPR_GAR9,
+    SPR_BNR1,
+    SPR_TRE4,
+    SPR_TRE5,
+    SPR_TRE6,
+    SPR_TRE7,
+    SPR_LOGG,
+    SPR_ICT1,
+    SPR_ICT2,
+    SPR_ICT3,
+    SPR_ICT4,
+    SPR_ICM1,
+    SPR_ICM2,
+    SPR_ICM3,
+    SPR_ICM4,
+    SPR_RKBL,
+    SPR_RKBS,
+    SPR_RKBK,
+    SPR_RBL1,
+    SPR_RBL2,
+    SPR_RBL3,
+    SPR_VASE,
+    SPR_POT1,
+    SPR_POT2,
+    SPR_POT3,
+    SPR_PBIT,
+    SPR_CPS4,
+    SPR_CPS5,
+    SPR_CPS6,
+    SPR_CPB1,
+    SPR_CPB2,
+    SPR_CPB3,
+    SPR_CPB4,
+    SPR_BDRP,
+    SPR_BDSH,
+    SPR_BDPL,
+    SPR_CNDL,
+    SPR_LEF1,
+    SPR_LEF3,
+    SPR_LEF2,
+    SPR_TWTR,
+    SPR_WLTR,
+    SPR_BARL,
+    SPR_SHB1,
+    SPR_SHB2,
+    SPR_BCKT,
+    SPR_SHRM,
+    SPR_FBUL,
+    SPR_FSKL,
+    SPR_BRTR,
+    SPR_SUIT,
+    SPR_BBLL,
+    SPR_CAND,
+    SPR_IRON,
+    SPR_XMAS,
+    SPR_CDRN,
+    SPR_CHNS,
+    SPR_TST1,
+    SPR_TST2,
+    SPR_TST3,
+    SPR_TST4,
+    SPR_TST5,
+    SPR_TST6,
+    SPR_TST7,
+    SPR_TST8,
+    SPR_TST9,
+    SPR_TST0,
+    SPR_TELE,
+    SPR_TSMK,
+    SPR_FPCH,
+    SPR_WFAX,
+    SPR_FAXE,
+    SPR_WFHM,
+    SPR_FHMR,
+    SPR_FSRD,
+    SPR_FSFX,
+    SPR_CMCE,
+    SPR_WCSS,
+    SPR_CSSF,
+    SPR_WCFM,
+    SPR_CFLM,
+    SPR_CFFX,
+    SPR_CHLY,
+    SPR_SPIR,
+    SPR_MWND,
+    SPR_WMLG,
+    SPR_MLNG,
+    SPR_MLFX,
+    SPR_MLF2,
+    SPR_MSTF,
+    SPR_MSP1,
+    SPR_MSP2,
+    SPR_WFR1,
+    SPR_WFR2,
+    SPR_WFR3,
+    SPR_WCH1,
+    SPR_WCH2,
+    SPR_WCH3,
+    SPR_WMS1,
+    SPR_WMS2,
+    SPR_WMS3,
+    SPR_WPIG,
+    SPR_WMCS,
+    SPR_CONE,
+    SPR_SHEX,
+    SPR_BLOD,
+    SPR_GIBS,
+    SPR_PLAY,
+    SPR_FDTH,
+    SPR_BSKL,
+    SPR_ICEC,
+    SPR_CLER,
+    SPR_MAGE,
+    SPR_PIGY,
+    SPR_CENT,
+    SPR_CTXD,
+    SPR_CTFX,
+    SPR_CTDP,
+    SPR_DEMN,
+    SPR_DEMA,
+    SPR_DEMB,
+    SPR_DEMC,
+    SPR_DEMD,
+    SPR_DEME,
+    SPR_DMFX,
+    SPR_DEM2,
+    SPR_DMBA,
+    SPR_DMBB,
+    SPR_DMBC,
+    SPR_DMBD,
+    SPR_DMBE,
+    SPR_D2FX,
+    SPR_WRTH,
+    SPR_WRT2,
+    SPR_WRBL,
+    SPR_MNTR,
+    SPR_FX12,
+    SPR_FX13,
+    SPR_MNSM,
+    SPR_SSPT,
+    SPR_SSDV,
+    SPR_SSXD,
+    SPR_SSFX,
+    SPR_BISH,
+    SPR_BPFX,
+    SPR_DRAG,
+    SPR_DRFX,
+    SPR_ARM1,
+    SPR_ARM2,
+    SPR_ARM3,
+    SPR_ARM4,
+    SPR_MAN2,
+    SPR_MAN3,
+    SPR_KEY1,
+    SPR_KEY2,
+    SPR_KEY3,
+    SPR_KEY4,
+    SPR_KEY5,
+    SPR_KEY6,
+    SPR_KEY7,
+    SPR_KEY8,
+    SPR_KEY9,
+    SPR_KEYA,
+    SPR_KEYB,
+    SPR_ETTN,
+    SPR_ETTB,
+    SPR_FDMN,
+    SPR_FDMB,
+    SPR_ICEY,
+    SPR_ICPR,
+    SPR_ICWS,
+    SPR_SORC,
+    SPR_SBMP,
+    SPR_SBS4,
+    SPR_SBMB,
+    SPR_SBS3,
+    SPR_SBMG,
+    SPR_SBS1,
+    SPR_SBS2,
+    SPR_SBFX,
+    SPR_RADE,
+    SPR_WATR,
+    SPR_KORX,
+    SPR_ABAT,
+    NUMSPRITES
+} spritenum_t;
+
+typedef enum
+{
+    S_NULL,
+    S_FREETARGMOBJ,
+    S_MAPSPOT,
+    S_FIREBALL1_1,
+    S_FIREBALL1_2,
+    S_FIREBALL1_X1,
+    S_FIREBALL1_X2,
+    S_FIREBALL1_X3,
+    S_FIREBALL1_X4,
+    S_FIREBALL1_X5,
+    S_FIREBALL1_X6,
+    S_ARROW_1,
+    S_ARROW_X1,
+    S_DART_1,
+    S_DART_X1,
+    S_POISONDART_1,
+    S_POISONDART_X1,
+    S_RIPPERBALL_1,
+    S_RIPPERBALL_2,
+    S_RIPPERBALL_3,
+    S_RIPPERBALL_X1,
+    S_RIPPERBALL_X2,
+    S_RIPPERBALL_X3,
+    S_RIPPERBALL_X4,
+    S_RIPPERBALL_X5,
+    S_RIPPERBALL_X6,
+    S_RIPPERBALL_X7,
+    S_RIPPERBALL_X8,
+    S_RIPPERBALL_X9,
+    S_RIPPERBALL_X10,
+    S_PRJ_BLADE1,
+    S_PRJ_BLADE_X1,
+    S_ICESHARD1,
+    S_ICESHARD2,
+    S_ICESHARD3,
+    S_FLAME_TSMALL1,
+    S_FLAME_TSMALL2,
+    S_FLAME_TSMALL3,
+    S_FLAME_TSMALL4,
+    S_FLAME_TSMALL5,
+    S_FLAME_TSMALL6,
+    S_FLAME_TLARGE1,
+    S_FLAME_TLARGE2,
+    S_FLAME_TLARGE3,
+    S_FLAME_TLARGE4,
+    S_FLAME_TLARGE5,
+    S_FLAME_TLARGE6,
+    S_FLAME_TLARGE7,
+    S_FLAME_TLARGE8,
+    S_FLAME_TLARGE9,
+    S_FLAME_TLARGE10,
+    S_FLAME_TLARGE11,
+    S_FLAME_TLARGE12,
+    S_FLAME_TLARGE13,
+    S_FLAME_TLARGE14,
+    S_FLAME_TLARGE15,
+    S_FLAME_TLARGE16,
+    S_FLAME_SDORM1,
+    S_FLAME_SDORM2,
+    S_FLAME_SDORM3,
+    S_FLAME_SMALL1,
+    S_FLAME_SMALL2,
+    S_FLAME_SMALL3,
+    S_FLAME_SMALL4,
+    S_FLAME_SMALL5,
+    S_FLAME_SMALL6,
+    S_FLAME_SMALL7,
+    S_FLAME_LDORM1,
+    S_FLAME_LDORM2,
+    S_FLAME_LDORM3,
+    S_FLAME_LDORM4,
+    S_FLAME_LDORM5,
+    S_FLAME_LARGE1,
+    S_FLAME_LARGE2,
+    S_FLAME_LARGE3,
+    S_FLAME_LARGE4,
+    S_FLAME_LARGE5,
+    S_FLAME_LARGE6,
+    S_FLAME_LARGE7,
+    S_FLAME_LARGE8,
+    S_FLAME_LARGE9,
+    S_FLAME_LARGE10,
+    S_FLAME_LARGE11,
+    S_FLAME_LARGE12,
+    S_FLAME_LARGE13,
+    S_FLAME_LARGE14,
+    S_FLAME_LARGE15,
+    S_FLAME_LARGE16,
+    S_FLAME_LARGE17,
+    S_FLAME_LARGE18,
+    S_ITEM_PTN1_1,
+    S_ITEM_PTN1_2,
+    S_ITEM_PTN1_3,
+    S_HIDESPECIAL1,
+    S_HIDESPECIAL2,
+    S_HIDESPECIAL3,
+    S_HIDESPECIAL4,
+    S_HIDESPECIAL5,
+    S_HIDESPECIAL6,
+    S_HIDESPECIAL7,
+    S_HIDESPECIAL8,
+    S_HIDESPECIAL9,
+    S_HIDESPECIAL10,
+    S_HIDESPECIAL11,
+    S_DORMANTARTI1_1,
+    S_DORMANTARTI1_2,
+    S_DORMANTARTI1_3,
+    S_DORMANTARTI1_4,
+    S_DORMANTARTI1_5,
+    S_DORMANTARTI1_6,
+    S_DORMANTARTI1_7,
+    S_DORMANTARTI1_8,
+    S_DORMANTARTI1_9,
+    S_DORMANTARTI1_10,
+    S_DORMANTARTI1_11,
+    S_DORMANTARTI1_12,
+    S_DORMANTARTI1_13,
+    S_DORMANTARTI1_14,
+    S_DORMANTARTI1_15,
+    S_DORMANTARTI1_16,
+    S_DORMANTARTI1_17,
+    S_DORMANTARTI1_18,
+    S_DORMANTARTI1_19,
+    S_DORMANTARTI1_20,
+    S_DORMANTARTI1_21,
+    S_DORMANTARTI2_1,
+    S_DORMANTARTI2_2,
+    S_DORMANTARTI2_3,
+    S_DORMANTARTI2_4,
+    S_DORMANTARTI2_5,
+    S_DORMANTARTI2_6,
+    S_DORMANTARTI2_7,
+    S_DORMANTARTI2_8,
+    S_DORMANTARTI2_9,
+    S_DORMANTARTI2_10,
+    S_DORMANTARTI2_11,
+    S_DORMANTARTI2_12,
+    S_DORMANTARTI2_13,
+    S_DORMANTARTI2_14,
+    S_DORMANTARTI2_15,
+    S_DORMANTARTI2_16,
+    S_DORMANTARTI2_17,
+    S_DORMANTARTI2_18,
+    S_DORMANTARTI2_19,
+    S_DORMANTARTI2_20,
+    S_DORMANTARTI2_21,
+    S_DORMANTARTI3_1,
+    S_DORMANTARTI3_2,
+    S_DORMANTARTI3_3,
+    S_DORMANTARTI3_4,
+    S_DORMANTARTI3_5,
+    S_DORMANTARTI3_6,
+    S_DORMANTARTI3_7,
+    S_DORMANTARTI3_8,
+    S_DORMANTARTI3_9,
+    S_DORMANTARTI3_10,
+    S_DORMANTARTI3_11,
+    S_DORMANTARTI3_12,
+    S_DORMANTARTI3_13,
+    S_DORMANTARTI3_14,
+    S_DORMANTARTI3_15,
+    S_DORMANTARTI3_16,
+    S_DORMANTARTI3_17,
+    S_DORMANTARTI3_18,
+    S_DORMANTARTI3_19,
+    S_DORMANTARTI3_20,
+    S_DORMANTARTI3_21,
+    S_DEADARTI1,
+    S_DEADARTI2,
+    S_DEADARTI3,
+    S_DEADARTI4,
+    S_DEADARTI5,
+    S_DEADARTI6,
+    S_DEADARTI7,
+    S_DEADARTI8,
+    S_DEADARTI9,
+    S_DEADARTI10,
+    S_ARTI_PTN2_1,
+    S_ARTI_PTN2_2,
+    S_ARTI_PTN2_3,
+    S_ARTI_SOAR1,
+    S_ARTI_SOAR2,
+    S_ARTI_SOAR3,
+    S_ARTI_SOAR4,
+    S_ARTI_INVU1,
+    S_ARTI_INVU2,
+    S_ARTI_INVU3,
+    S_ARTI_INVU4,
+    S_ARTI_SUMMON,
+    S_SUMMON_FX1_1,
+    S_SUMMON_FX2_1,
+    S_SUMMON_FX2_2,
+    S_SUMMON_FX2_3,
+    S_THRUSTINIT2_1,
+    S_THRUSTINIT2_2,
+    S_BTHRUSTINIT2_1,
+    S_BTHRUSTINIT2_2,
+    S_THRUSTINIT1_1,
+    S_THRUSTINIT1_2,
+    S_BTHRUSTINIT1_1,
+    S_BTHRUSTINIT1_2,
+    S_THRUSTRAISE1,
+    S_THRUSTRAISE2,
+    S_THRUSTRAISE3,
+    S_THRUSTRAISE4,
+    S_BTHRUSTRAISE1,
+    S_BTHRUSTRAISE2,
+    S_BTHRUSTRAISE3,
+    S_BTHRUSTRAISE4,
+    S_THRUSTIMPALE,
+    S_BTHRUSTIMPALE,
+    S_THRUSTRAISE,
+    S_BTHRUSTRAISE,
+    S_THRUSTBLOCK,
+    S_BTHRUSTBLOCK,
+    S_THRUSTLOWER,
+    S_BTHRUSTLOWER,
+    S_THRUSTSTAY,
+    S_BTHRUSTSTAY,
+    S_ARTI_TELOTHER1,
+    S_ARTI_TELOTHER2,
+    S_ARTI_TELOTHER3,
+    S_ARTI_TELOTHER4,
+    S_TELO_FX1,
+    S_TELO_FX2,
+    S_TELO_FX3,
+    S_TELO_FX4,
+    S_TELO_FX5,
+    S_TELO_FX6,
+    S_TELO_FX7,
+    S_TELO_FX8,
+    S_TELO_FX9,
+    S_TELO_FX2_1,
+    S_TELO_FX2_2,
+    S_TELO_FX2_3,
+    S_TELO_FX2_4,
+    S_TELO_FX2_5,
+    S_TELO_FX2_6,
+    S_TELO_FX3_1,
+    S_TELO_FX3_2,
+    S_TELO_FX3_3,
+    S_TELO_FX3_4,
+    S_TELO_FX3_5,
+    S_TELO_FX3_6,
+    S_TELO_FX4_1,
+    S_TELO_FX4_2,
+    S_TELO_FX4_3,
+    S_TELO_FX4_4,
+    S_TELO_FX4_5,
+    S_TELO_FX4_6,
+    S_TELO_FX5_1,
+    S_TELO_FX5_2,
+    S_TELO_FX5_3,
+    S_TELO_FX5_4,
+    S_TELO_FX5_5,
+    S_TELO_FX5_6,
+    S_DIRT1_1,
+    S_DIRT1_D,
+    S_DIRT2_1,
+    S_DIRT2_D,
+    S_DIRT3_1,
+    S_DIRT3_D,
+    S_DIRT4_1,
+    S_DIRT4_D,
+    S_DIRT5_1,
+    S_DIRT5_D,
+    S_DIRT6_1,
+    S_DIRT6_D,
+    S_DIRTCLUMP1,
+    S_ROCK1_1,
+    S_ROCK1_D,
+    S_ROCK2_1,
+    S_ROCK2_D,
+    S_ROCK3_1,
+    S_ROCK3_D,
+    S_SPAWNFOG1,
+    S_FOGPATCHS1,
+    S_FOGPATCHS2,
+    S_FOGPATCHS3,
+    S_FOGPATCHS4,
+    S_FOGPATCHS5,
+    S_FOGPATCHS0,
+    S_FOGPATCHM1,
+    S_FOGPATCHM2,
+    S_FOGPATCHM3,
+    S_FOGPATCHM4,
+    S_FOGPATCHM5,
+    S_FOGPATCHM0,
+    S_FOGPATCHMA,
+    S_FOGPATCHMB,
+    S_FOGPATCHMC,
+    S_FOGPATCHMD,
+    S_FOGPATCHL1,
+    S_FOGPATCHL2,
+    S_FOGPATCHL3,
+    S_FOGPATCHL4,
+    S_FOGPATCHL5,
+    S_FOGPATCHL0,
+    S_FOGPATCHLA,
+    S_FOGPATCHLB,
+    S_FOGPATCHLC,
+    S_FOGPATCHLD,
+    S_QUAKE_ACTIVE1,
+    S_QUAKE_ACTIVE2,
+    S_QUAKE_ACTIVE3,
+    S_QUAKE_ACTIVE4,
+    S_QUAKE_ACTIVE5,
+    S_QUAKE_ACTIVE6,
+    S_QUAKE_ACTIVE7,
+    S_QUAKE_ACTIVE8,
+    S_QUAKE_ACTIVE9,
+    S_QUAKE_ACTIVE0,
+    S_QUAKE_ACTIVEA,
+    S_QUAKE_ACTIVEB,
+    S_QUAKE_ACTIVEC,
+    S_QUAKE_ACTIVED,
+    S_QUAKE_ACTIVEE,
+    S_QUAKE_ACTIVEF,
+    S_QUAKE_ACTIVEG,
+    S_QUAKE_ACTIVEH,
+    S_QUAKE_ACTIVEI,
+    S_QUAKE_ACTIVEJ,
+    S_QUAKE_ACTIVEK,
+    S_QUAKE_ACTIVEL,
+    S_QUAKE_ACTIVEM,
+    S_QUAKE_ACTIVEN,
+    S_QUAKE_ACTIVEO,
+    S_QUAKE_ACTIVEP,
+    S_QUAKE_ACTIVEQ,
+    S_QUAKE_ACTIVER,
+    S_QUAKE_ACTIVES,
+    S_QUAKE_ACTIVET,
+    S_QUAKE_ACTIVEU,
+    S_QUAKE_ACTIVEV,
+    S_QUAKE_ACTIVEW,
+    S_QUAKE_ACTIVEX,
+    S_QUAKE_ACTIVEY,
+    S_QUAKE_ACTIVEZ,
+    S_QUAKE_ACT1,
+    S_QUAKE_ACT2,
+    S_QUAKE_ACT3,
+    S_QUAKE_ACT4,
+    S_QUAKE_ACT5,
+    S_QUAKE_ACT6,
+    S_QUAKE_ACT7,
+    S_QUAKE_ACT8,
+    S_QUAKE_ACT9,
+    S_QUAKE_ACT0,
+    S_SGSHARD1_1,
+    S_SGSHARD1_2,
+    S_SGSHARD1_3,
+    S_SGSHARD1_4,
+    S_SGSHARD1_5,
+    S_SGSHARD1_D,
+    S_SGSHARD2_1,
+    S_SGSHARD2_2,
+    S_SGSHARD2_3,
+    S_SGSHARD2_4,
+    S_SGSHARD2_5,
+    S_SGSHARD2_D,
+    S_SGSHARD3_1,
+    S_SGSHARD3_2,
+    S_SGSHARD3_3,
+    S_SGSHARD3_4,
+    S_SGSHARD3_5,
+    S_SGSHARD3_D,
+    S_SGSHARD4_1,
+    S_SGSHARD4_2,
+    S_SGSHARD4_3,
+    S_SGSHARD4_4,
+    S_SGSHARD4_5,
+    S_SGSHARD4_D,
+    S_SGSHARD5_1,
+    S_SGSHARD5_2,
+    S_SGSHARD5_3,
+    S_SGSHARD5_4,
+    S_SGSHARD5_5,
+    S_SGSHARD5_D,
+    S_SGSHARD6_1,
+    S_SGSHARD6_D,
+    S_SGSHARD7_1,
+    S_SGSHARD7_D,
+    S_SGSHARD8_1,
+    S_SGSHARD8_D,
+    S_SGSHARD9_1,
+    S_SGSHARD9_D,
+    S_SGSHARD0_1,
+    S_SGSHARD0_D,
+    S_ARTI_EGGC1,
+    S_ARTI_EGGC2,
+    S_ARTI_EGGC3,
+    S_ARTI_EGGC4,
+    S_ARTI_EGGC5,
+    S_ARTI_EGGC6,
+    S_ARTI_EGGC7,
+    S_ARTI_EGGC8,
+    S_EGGFX1,
+    S_EGGFX2,
+    S_EGGFX3,
+    S_EGGFX4,
+    S_EGGFX5,
+    S_EGGFXI1_1,
+    S_EGGFXI1_2,
+    S_EGGFXI1_3,
+    S_EGGFXI1_4,
+    S_ARTI_SPHL1,
+    S_ZWINGEDSTATUENOSKULL,
+    S_ZWINGEDSTATUENOSKULL2,
+    S_ZGEMPEDESTAL1,
+    S_ZGEMPEDESTAL2,
+    S_ARTIPUZZSKULL,
+    S_ARTIPUZZGEMBIG,
+    S_ARTIPUZZGEMRED,
+    S_ARTIPUZZGEMGREEN1,
+    S_ARTIPUZZGEMGREEN2,
+    S_ARTIPUZZGEMBLUE1,
+    S_ARTIPUZZGEMBLUE2,
+    S_ARTIPUZZBOOK1,
+    S_ARTIPUZZBOOK2,
+    S_ARTIPUZZSKULL2,
+    S_ARTIPUZZFWEAPON,
+    S_ARTIPUZZCWEAPON,
+    S_ARTIPUZZMWEAPON,
+    S_ARTIPUZZGEAR_1,
+    S_ARTIPUZZGEAR_2,
+    S_ARTIPUZZGEAR_3,
+    S_ARTIPUZZGEAR_4,
+    S_ARTIPUZZGEAR_5,
+    S_ARTIPUZZGEAR_6,
+    S_ARTIPUZZGEAR_7,
+    S_ARTIPUZZGEAR_8,
+    S_ARTIPUZZGEAR2_1,
+    S_ARTIPUZZGEAR2_2,
+    S_ARTIPUZZGEAR2_3,
+    S_ARTIPUZZGEAR2_4,
+    S_ARTIPUZZGEAR2_5,
+    S_ARTIPUZZGEAR2_6,
+    S_ARTIPUZZGEAR2_7,
+    S_ARTIPUZZGEAR2_8,
+    S_ARTIPUZZGEAR3_1,
+    S_ARTIPUZZGEAR3_2,
+    S_ARTIPUZZGEAR3_3,
+    S_ARTIPUZZGEAR3_4,
+    S_ARTIPUZZGEAR3_5,
+    S_ARTIPUZZGEAR3_6,
+    S_ARTIPUZZGEAR3_7,
+    S_ARTIPUZZGEAR3_8,
+    S_ARTIPUZZGEAR4_1,
+    S_ARTIPUZZGEAR4_2,
+    S_ARTIPUZZGEAR4_3,
+    S_ARTIPUZZGEAR4_4,
+    S_ARTIPUZZGEAR4_5,
+    S_ARTIPUZZGEAR4_6,
+    S_ARTIPUZZGEAR4_7,
+    S_ARTIPUZZGEAR4_8,
+    S_ARTI_TRCH1,
+    S_ARTI_TRCH2,
+    S_ARTI_TRCH3,
+    S_FIREBOMB1,
+    S_FIREBOMB2,
+    S_FIREBOMB3,
+    S_FIREBOMB4,
+    S_FIREBOMB5,
+    S_FIREBOMB6,
+    S_FIREBOMB7,
+    S_FIREBOMB8,
+    S_FIREBOMB9,
+    S_FIREBOMB10,
+    S_FIREBOMB11,
+    S_ARTI_ATLP1,
+    S_ARTI_ATLP2,
+    S_ARTI_ATLP3,
+    S_ARTI_ATLP4,
+    S_ARTI_PSBG1,
+    S_POISONBAG1,
+    S_POISONBAG2,
+    S_POISONBAG3,
+    S_POISONBAG4,
+    S_POISONCLOUD1,
+    S_POISONCLOUD2,
+    S_POISONCLOUD3,
+    S_POISONCLOUD4,
+    S_POISONCLOUD5,
+    S_POISONCLOUD6,
+    S_POISONCLOUD7,
+    S_POISONCLOUD8,
+    S_POISONCLOUD9,
+    S_POISONCLOUD10,
+    S_POISONCLOUD11,
+    S_POISONCLOUD12,
+    S_POISONCLOUD13,
+    S_POISONCLOUD14,
+    S_POISONCLOUD15,
+    S_POISONCLOUD16,
+    S_POISONCLOUD17,
+    S_POISONCLOUD18,
+    S_POISONCLOUD_X1,
+    S_POISONCLOUD_X2,
+    S_POISONCLOUD_X3,
+    S_POISONCLOUD_X4,
+    S_THROWINGBOMB1,
+    S_THROWINGBOMB2,
+    S_THROWINGBOMB3,
+    S_THROWINGBOMB4,
+    S_THROWINGBOMB5,
+    S_THROWINGBOMB6,
+    S_THROWINGBOMB7,
+    S_THROWINGBOMB8,
+    S_THROWINGBOMB9,
+    S_THROWINGBOMB10,
+    S_THROWINGBOMB11,
+    S_THROWINGBOMB12,
+    S_THROWINGBOMB_X1,
+    S_THROWINGBOMB_X2,
+    S_THROWINGBOMB_X3,
+    S_THROWINGBOMB_X4,
+    S_THROWINGBOMB_X5,
+    S_THROWINGBOMB_X6,
+    S_THROWINGBOMB_X7,
+    S_THROWINGBOMB_X8,
+    S_ARTI_BOOTS1,
+    S_ARTI_BOOTS2,
+    S_ARTI_BOOTS3,
+    S_ARTI_BOOTS4,
+    S_ARTI_BOOTS5,
+    S_ARTI_BOOTS6,
+    S_ARTI_BOOTS7,
+    S_ARTI_BOOTS8,
+    S_ARTI_MANA,
+    S_ARTI_ARMOR1,
+    S_ARTI_ARMOR2,
+    S_ARTI_ARMOR3,
+    S_ARTI_ARMOR4,
+    S_ARTI_ARMOR5,
+    S_ARTI_ARMOR6,
+    S_ARTI_ARMOR7,
+    S_ARTI_ARMOR8,
+    S_ARTI_BLAST1,
+    S_ARTI_BLAST2,
+    S_ARTI_BLAST3,
+    S_ARTI_BLAST4,
+    S_ARTI_BLAST5,
+    S_ARTI_BLAST6,
+    S_ARTI_BLAST7,
+    S_ARTI_BLAST8,
+    S_ARTI_HEALRAD1,
+    S_ARTI_HEALRAD2,
+    S_ARTI_HEALRAD3,
+    S_ARTI_HEALRAD4,
+    S_ARTI_HEALRAD5,
+    S_ARTI_HEALRAD6,
+    S_ARTI_HEALRAD7,
+    S_ARTI_HEALRAD8,
+    S_ARTI_HEALRAD9,
+    S_ARTI_HEALRAD0,
+    S_ARTI_HEALRADA,
+    S_ARTI_HEALRADB,
+    S_ARTI_HEALRADC,
+    S_ARTI_HEALRADD,
+    S_ARTI_HEALRADE,
+    S_ARTI_HEALRADF,
+    S_SPLASH1,
+    S_SPLASH2,
+    S_SPLASH3,
+    S_SPLASH4,
+    S_SPLASHX,
+    S_SPLASHBASE1,
+    S_SPLASHBASE2,
+    S_SPLASHBASE3,
+    S_SPLASHBASE4,
+    S_SPLASHBASE5,
+    S_SPLASHBASE6,
+    S_SPLASHBASE7,
+    S_LAVASPLASH1,
+    S_LAVASPLASH2,
+    S_LAVASPLASH3,
+    S_LAVASPLASH4,
+    S_LAVASPLASH5,
+    S_LAVASPLASH6,
+    S_LAVASMOKE1,
+    S_LAVASMOKE2,
+    S_LAVASMOKE3,
+    S_LAVASMOKE4,
+    S_LAVASMOKE5,
+    S_SLUDGECHUNK1,
+    S_SLUDGECHUNK2,
+    S_SLUDGECHUNK3,
+    S_SLUDGECHUNK4,
+    S_SLUDGECHUNKX,
+    S_SLUDGESPLASH1,
+    S_SLUDGESPLASH2,
+    S_SLUDGESPLASH3,
+    S_SLUDGESPLASH4,
+    S_ZWINGEDSTATUE1,
+    S_ZROCK1_1,
+    S_ZROCK2_1,
+    S_ZROCK3_1,
+    S_ZROCK4_1,
+    S_ZCHANDELIER1,
+    S_ZCHANDELIER2,
+    S_ZCHANDELIER3,
+    S_ZCHANDELIER_U,
+    S_ZTREEDEAD1,
+    S_ZTREE,
+    S_ZTREEDESTRUCTIBLE1,
+    S_ZTREEDES_D1,
+    S_ZTREEDES_D2,
+    S_ZTREEDES_D3,
+    S_ZTREEDES_D4,
+    S_ZTREEDES_D5,
+    S_ZTREEDES_D6,
+    S_ZTREEDES_X1,
+    S_ZTREEDES_X2,
+    S_ZTREEDES_X3,
+    S_ZTREEDES_X4,
+    S_ZTREEDES_X5,
+    S_ZTREEDES_X6,
+    S_ZTREEDES_X7,
+    S_ZTREEDES_X8,
+    S_ZTREEDES_X9,
+    S_ZTREEDES_X10,
+    S_ZTREESWAMP182_1,
+    S_ZTREESWAMP172_1,
+    S_ZSTUMPBURNED1,
+    S_ZSTUMPBARE1,
+    S_ZSTUMPSWAMP1_1,
+    S_ZSTUMPSWAMP2_1,
+    S_ZSHROOMLARGE1_1,
+    S_ZSHROOMLARGE2_1,
+    S_ZSHROOMLARGE3_1,
+    S_ZSHROOMSMALL1_1,
+    S_ZSHROOMSMALL2_1,
+    S_ZSHROOMSMALL3_1,
+    S_ZSHROOMSMALL4_1,
+    S_ZSHROOMSMALL5_1,
+    S_ZSTALAGMITEPILLAR1,
+    S_ZSTALAGMITELARGE1,
+    S_ZSTALAGMITEMEDIUM1,
+    S_ZSTALAGMITESMALL1,
+    S_ZSTALACTITELARGE1,
+    S_ZSTALACTITEMEDIUM1,
+    S_ZSTALACTITESMALL1,
+    S_ZMOSSCEILING1_1,
+    S_ZMOSSCEILING2_1,
+    S_ZSWAMPVINE1,
+    S_ZCORPSEKABOB1,
+    S_ZCORPSESLEEPING1,
+    S_ZTOMBSTONERIP1,
+    S_ZTOMBSTONESHANE1,
+    S_ZTOMBSTONEBIGCROSS1,
+    S_ZTOMBSTONEBRIANR1,
+    S_ZTOMBSTONECROSSCIRCLE1,
+    S_ZTOMBSTONESMALLCROSS1,
+    S_ZTOMBSTONEBRIANP1,
+    S_CORPSEHANGING_1,
+    S_ZSTATUEGARGOYLEGREENTALL_1,
+    S_ZSTATUEGARGOYLEBLUETALL_1,
+    S_ZSTATUEGARGOYLEGREENSHORT_1,
+    S_ZSTATUEGARGOYLEBLUESHORT_1,
+    S_ZSTATUEGARGOYLESTRIPETALL_1,
+    S_ZSTATUEGARGOYLEDARKREDTALL_1,
+    S_ZSTATUEGARGOYLEREDTALL_1,
+    S_ZSTATUEGARGOYLETANTALL_1,
+    S_ZSTATUEGARGOYLERUSTTALL_1,
+    S_ZSTATUEGARGOYLEDARKREDSHORT_1,
+    S_ZSTATUEGARGOYLEREDSHORT_1,
+    S_ZSTATUEGARGOYLETANSHORT_1,
+    S_ZSTATUEGARGOYLERUSTSHORT_1,
+    S_ZBANNERTATTERED_1,
+    S_ZTREELARGE1,
+    S_ZTREELARGE2,
+    S_ZTREEGNARLED1,
+    S_ZTREEGNARLED2,
+    S_ZLOG,
+    S_ZSTALACTITEICELARGE,
+    S_ZSTALACTITEICEMEDIUM,
+    S_ZSTALACTITEICESMALL,
+    S_ZSTALACTITEICETINY,
+    S_ZSTALAGMITEICELARGE,
+    S_ZSTALAGMITEICEMEDIUM,
+    S_ZSTALAGMITEICESMALL,
+    S_ZSTALAGMITEICETINY,
+    S_ZROCKBROWN1,
+    S_ZROCKBROWN2,
+    S_ZROCKBLACK,
+    S_ZRUBBLE1,
+    S_ZRUBBLE2,
+    S_ZRUBBLE3,
+    S_ZVASEPILLAR,
+    S_ZPOTTERY1,
+    S_ZPOTTERY2,
+    S_ZPOTTERY3,
+    S_ZPOTTERY_EXPLODE,
+    S_POTTERYBIT_1,
+    S_POTTERYBIT_2,
+    S_POTTERYBIT_3,
+    S_POTTERYBIT_4,
+    S_POTTERYBIT_5,
+    S_POTTERYBIT_EX0,
+    S_POTTERYBIT_EX1,
+    S_POTTERYBIT_EX1_2,
+    S_POTTERYBIT_EX2,
+    S_POTTERYBIT_EX2_2,
+    S_POTTERYBIT_EX3,
+    S_POTTERYBIT_EX3_2,
+    S_POTTERYBIT_EX4,
+    S_POTTERYBIT_EX4_2,
+    S_POTTERYBIT_EX5,
+    S_POTTERYBIT_EX5_2,
+    S_ZCORPSELYNCHED1,
+    S_ZCORPSELYNCHED2,
+    S_ZCORPSESITTING,
+    S_ZCORPSESITTING_X,
+    S_CORPSEBIT_1,
+    S_CORPSEBIT_2,
+    S_CORPSEBIT_3,
+    S_CORPSEBIT_4,
+    S_CORPSEBLOODDRIP,
+    S_CORPSEBLOODDRIP_X1,
+    S_CORPSEBLOODDRIP_X2,
+    S_CORPSEBLOODDRIP_X3,
+    S_CORPSEBLOODDRIP_X4,
+    S_BLOODPOOL,
+    S_ZCANDLE1,
+    S_ZCANDLE2,
+    S_ZCANDLE3,
+    S_ZLEAFSPAWNER,
+    S_LEAF1_1,
+    S_LEAF1_2,
+    S_LEAF1_3,
+    S_LEAF1_4,
+    S_LEAF1_5,
+    S_LEAF1_6,
+    S_LEAF1_7,
+    S_LEAF1_8,
+    S_LEAF1_9,
+    S_LEAF1_10,
+    S_LEAF1_11,
+    S_LEAF1_12,
+    S_LEAF1_13,
+    S_LEAF1_14,
+    S_LEAF1_15,
+    S_LEAF1_16,
+    S_LEAF1_17,
+    S_LEAF1_18,
+    S_LEAF_X1,
+    S_LEAF2_1,
+    S_LEAF2_2,
+    S_LEAF2_3,
+    S_LEAF2_4,
+    S_LEAF2_5,
+    S_LEAF2_6,
+    S_LEAF2_7,
+    S_LEAF2_8,
+    S_LEAF2_9,
+    S_LEAF2_10,
+    S_LEAF2_11,
+    S_LEAF2_12,
+    S_LEAF2_13,
+    S_LEAF2_14,
+    S_LEAF2_15,
+    S_LEAF2_16,
+    S_LEAF2_17,
+    S_LEAF2_18,
+    S_ZTWINEDTORCH_1,
+    S_ZTWINEDTORCH_2,
+    S_ZTWINEDTORCH_3,
+    S_ZTWINEDTORCH_4,
+    S_ZTWINEDTORCH_5,
+    S_ZTWINEDTORCH_6,
+    S_ZTWINEDTORCH_7,
+    S_ZTWINEDTORCH_8,
+    S_ZTWINEDTORCH_UNLIT,
+    S_BRIDGE1,
+    S_BRIDGE2,
+    S_BRIDGE3,
+    S_FREE_BRIDGE1,
+    S_FREE_BRIDGE2,
+    S_BBALL1,
+    S_BBALL2,
+    S_ZWALLTORCH1,
+    S_ZWALLTORCH2,
+    S_ZWALLTORCH3,
+    S_ZWALLTORCH4,
+    S_ZWALLTORCH5,
+    S_ZWALLTORCH6,
+    S_ZWALLTORCH7,
+    S_ZWALLTORCH8,
+    S_ZWALLTORCH_U,
+    S_ZBARREL1,
+    S_ZSHRUB1,
+    S_ZSHRUB1_DIE,
+    S_ZSHRUB1_X1,
+    S_ZSHRUB1_X2,
+    S_ZSHRUB1_X3,
+    S_ZSHRUB2,
+    S_ZSHRUB2_DIE,
+    S_ZSHRUB2_X1,
+    S_ZSHRUB2_X2,
+    S_ZSHRUB2_X3,
+    S_ZSHRUB2_X4,
+    S_ZBUCKET1,
+    S_ZPOISONSHROOM1,
+    S_ZPOISONSHROOM_P1,
+    S_ZPOISONSHROOM_P2,
+    S_ZPOISONSHROOM_X1,
+    S_ZPOISONSHROOM_X2,
+    S_ZPOISONSHROOM_X3,
+    S_ZPOISONSHROOM_X4,
+    S_ZFIREBULL1,
+    S_ZFIREBULL2,
+    S_ZFIREBULL3,
+    S_ZFIREBULL4,
+    S_ZFIREBULL5,
+    S_ZFIREBULL6,
+    S_ZFIREBULL7,
+    S_ZFIREBULL_DEATH,
+    S_ZFIREBULL_DEATH2,
+    S_ZFIREBULL_U,
+    S_ZFIREBULL_BIRTH,
+    S_ZFIREBULL_BIRTH2,
+    S_ZFIRETHING1,
+    S_ZFIRETHING2,
+    S_ZFIRETHING3,
+    S_ZFIRETHING4,
+    S_ZFIRETHING5,
+    S_ZFIRETHING6,
+    S_ZFIRETHING7,
+    S_ZFIRETHING8,
+    S_ZFIRETHING9,
+    S_ZBRASSTORCH1,
+    S_ZBRASSTORCH2,
+    S_ZBRASSTORCH3,
+    S_ZBRASSTORCH4,
+    S_ZBRASSTORCH5,
+    S_ZBRASSTORCH6,
+    S_ZBRASSTORCH7,
+    S_ZBRASSTORCH8,
+    S_ZBRASSTORCH9,
+    S_ZBRASSTORCH10,
+    S_ZBRASSTORCH11,
+    S_ZBRASSTORCH12,
+    S_ZBRASSTORCH13,
+    S_ZSUITOFARMOR,
+    S_ZSUITOFARMOR_X1,
+    S_ZARMORCHUNK1,
+    S_ZARMORCHUNK2,
+    S_ZARMORCHUNK3,
+    S_ZARMORCHUNK4,
+    S_ZARMORCHUNK5,
+    S_ZARMORCHUNK6,
+    S_ZARMORCHUNK7,
+    S_ZARMORCHUNK8,
+    S_ZARMORCHUNK9,
+    S_ZARMORCHUNK10,
+    S_ZBELL,
+    S_ZBELL_X1,
+    S_ZBELL_X2,
+    S_ZBELL_X3,
+    S_ZBELL_X4,
+    S_ZBELL_X5,
+    S_ZBELL_X6,
+    S_ZBELL_X7,
+    S_ZBELL_X8,
+    S_ZBELL_X9,
+    S_ZBELL_X10,
+    S_ZBELL_X11,
+    S_ZBELL_X12,
+    S_ZBELL_X13,
+    S_ZBELL_X14,
+    S_ZBELL_X15,
+    S_ZBELL_X16,
+    S_ZBELL_X17,
+    S_ZBELL_X18,
+    S_ZBELL_X19,
+    S_ZBELL_X20,
+    S_ZBELL_X21,
+    S_ZBELL_X22,
+    S_ZBELL_X23,
+    S_ZBELL_X24,
+    S_ZBELL_X25,
+    S_ZBELL_X26,
+    S_ZBELL_X27,
+    S_ZBELL_X28,
+    S_ZBELL_X29,
+    S_ZBELL_X30,
+    S_ZBELL_X31,
+    S_ZBELL_X32,
+    S_ZBELL_X33,
+    S_ZBELL_X34,
+    S_ZBELL_X35,
+    S_ZBELL_X36,
+    S_ZBELL_X37,
+    S_ZBELL_X38,
+    S_ZBELL_X39,
+    S_ZBELL_X40,
+    S_ZBELL_X41,
+    S_ZBELL_X42,
+    S_ZBELL_X43,
+    S_ZBELL_X44,
+    S_ZBELL_X45,
+    S_ZBELL_X46,
+    S_ZBELL_X47,
+    S_ZBLUE_CANDLE1,
+    S_ZBLUE_CANDLE2,
+    S_ZBLUE_CANDLE3,
+    S_ZBLUE_CANDLE4,
+    S_ZBLUE_CANDLE5,
+    S_ZIRON_MAIDEN,
+    S_ZXMAS_TREE,
+    S_ZXMAS_TREE_DIE,
+    S_ZXMAS_TREE_X1,
+    S_ZXMAS_TREE_X2,
+    S_ZXMAS_TREE_X3,
+    S_ZXMAS_TREE_X4,
+    S_ZXMAS_TREE_X5,
+    S_ZXMAS_TREE_X6,
+    S_ZXMAS_TREE_X7,
+    S_ZXMAS_TREE_X8,
+    S_ZXMAS_TREE_X9,
+    S_ZXMAS_TREE_X10,
+    S_ZCAULDRON1,
+    S_ZCAULDRON2,
+    S_ZCAULDRON3,
+    S_ZCAULDRON4,
+    S_ZCAULDRON5,
+    S_ZCAULDRON6,
+    S_ZCAULDRON7,
+    S_ZCAULDRON_U,
+    S_ZCHAINBIT32,
+    S_ZCHAINBIT64,
+    S_ZCHAINEND_HEART,
+    S_ZCHAINEND_HOOK1,
+    S_ZCHAINEND_HOOK2,
+    S_ZCHAINEND_SPIKE,
+    S_ZCHAINEND_SKULL,
+    S_TABLE_SHIT1,
+    S_TABLE_SHIT2,
+    S_TABLE_SHIT3,
+    S_TABLE_SHIT4,
+    S_TABLE_SHIT5,
+    S_TABLE_SHIT6,
+    S_TABLE_SHIT7,
+    S_TABLE_SHIT8,
+    S_TABLE_SHIT9,
+    S_TABLE_SHIT10,
+    S_TFOG1,
+    S_TFOG2,
+    S_TFOG3,
+    S_TFOG4,
+    S_TFOG5,
+    S_TFOG6,
+    S_TFOG7,
+    S_TFOG8,
+    S_TFOG9,
+    S_TFOG10,
+    S_TFOG11,
+    S_TFOG12,
+    S_TFOG13,
+    S_TELESMOKE1,
+    S_TELESMOKE2,
+    S_TELESMOKE3,
+    S_TELESMOKE4,
+    S_TELESMOKE5,
+    S_TELESMOKE6,
+    S_TELESMOKE7,
+    S_TELESMOKE8,
+    S_TELESMOKE9,
+    S_TELESMOKE10,
+    S_TELESMOKE11,
+    S_TELESMOKE12,
+    S_TELESMOKE13,
+    S_TELESMOKE14,
+    S_TELESMOKE15,
+    S_TELESMOKE16,
+    S_TELESMOKE17,
+    S_TELESMOKE18,
+    S_TELESMOKE19,
+    S_TELESMOKE20,
+    S_TELESMOKE21,
+    S_TELESMOKE22,
+    S_TELESMOKE23,
+    S_TELESMOKE24,
+    S_TELESMOKE25,
+    S_TELESMOKE26,
+    S_LIGHTDONE,
+    S_PUNCHREADY,
+    S_PUNCHDOWN,
+    S_PUNCHUP,
+    S_PUNCHATK1_1,
+    S_PUNCHATK1_2,
+    S_PUNCHATK1_3,
+    S_PUNCHATK1_4,
+    S_PUNCHATK1_5,
+    S_PUNCHATK2_1,
+    S_PUNCHATK2_2,
+    S_PUNCHATK2_3,
+    S_PUNCHATK2_4,
+    S_PUNCHATK2_5,
+    S_PUNCHATK2_6,
+    S_PUNCHATK2_7,
+    S_PUNCHATK2_8,
+    S_PUNCHATK2_9,
+    S_PUNCHPUFF1,
+    S_PUNCHPUFF2,
+    S_PUNCHPUFF3,
+    S_PUNCHPUFF4,
+    S_PUNCHPUFF5,
+    S_AXE,
+    S_FAXEREADY,
+    S_FAXEDOWN,
+    S_FAXEUP,
+    S_FAXEATK_1,
+    S_FAXEATK_2,
+    S_FAXEATK_3,
+    S_FAXEATK_4,
+    S_FAXEATK_5,
+    S_FAXEATK_6,
+    S_FAXEATK_7,
+    S_FAXEATK_8,
+    S_FAXEATK_9,
+    S_FAXEATK_10,
+    S_FAXEATK_11,
+    S_FAXEATK_12,
+    S_FAXEATK_13,
+    S_FAXEREADY_G,
+    S_FAXEREADY_G1,
+    S_FAXEREADY_G2,
+    S_FAXEREADY_G3,
+    S_FAXEREADY_G4,
+    S_FAXEREADY_G5,
+    S_FAXEDOWN_G,
+    S_FAXEUP_G,
+    S_FAXEATK_G1,
+    S_FAXEATK_G2,
+    S_FAXEATK_G3,
+    S_FAXEATK_G4,
+    S_FAXEATK_G5,
+    S_FAXEATK_G6,
+    S_FAXEATK_G7,
+    S_FAXEATK_G8,
+    S_FAXEATK_G9,
+    S_FAXEATK_G10,
+    S_FAXEATK_G11,
+    S_FAXEATK_G12,
+    S_FAXEATK_G13,
+    S_AXEPUFF_GLOW1,
+    S_AXEPUFF_GLOW2,
+    S_AXEPUFF_GLOW3,
+    S_AXEPUFF_GLOW4,
+    S_AXEPUFF_GLOW5,
+    S_AXEPUFF_GLOW6,
+    S_AXEPUFF_GLOW7,
+    S_AXEBLOOD1,
+    S_AXEBLOOD2,
+    S_AXEBLOOD3,
+    S_AXEBLOOD4,
+    S_AXEBLOOD5,
+    S_AXEBLOOD6,
+    S_HAMM,
+    S_FHAMMERREADY,
+    S_FHAMMERDOWN,
+    S_FHAMMERUP,
+    S_FHAMMERATK_1,
+    S_FHAMMERATK_2,
+    S_FHAMMERATK_3,
+    S_FHAMMERATK_4,
+    S_FHAMMERATK_5,
+    S_FHAMMERATK_6,
+    S_FHAMMERATK_7,
+    S_FHAMMERATK_8,
+    S_FHAMMERATK_9,
+    S_FHAMMERATK_10,
+    S_FHAMMERATK_11,
+    S_FHAMMERATK_12,
+    S_HAMMER_MISSILE_1,
+    S_HAMMER_MISSILE_2,
+    S_HAMMER_MISSILE_3,
+    S_HAMMER_MISSILE_4,
+    S_HAMMER_MISSILE_5,
+    S_HAMMER_MISSILE_6,
+    S_HAMMER_MISSILE_7,
+    S_HAMMER_MISSILE_8,
+    S_HAMMER_MISSILE_X1,
+    S_HAMMER_MISSILE_X2,
+    S_HAMMER_MISSILE_X3,
+    S_HAMMER_MISSILE_X4,
+    S_HAMMER_MISSILE_X5,
+    S_HAMMER_MISSILE_X6,
+    S_HAMMER_MISSILE_X7,
+    S_HAMMER_MISSILE_X8,
+    S_HAMMER_MISSILE_X9,
+    S_HAMMER_MISSILE_X10,
+    S_HAMMERPUFF1,
+    S_HAMMERPUFF2,
+    S_HAMMERPUFF3,
+    S_HAMMERPUFF4,
+    S_HAMMERPUFF5,
+    S_FSWORDREADY,
+    S_FSWORDREADY1,
+    S_FSWORDREADY2,
+    S_FSWORDREADY3,
+    S_FSWORDREADY4,
+    S_FSWORDREADY5,
+    S_FSWORDREADY6,
+    S_FSWORDREADY7,
+    S_FSWORDREADY8,
+    S_FSWORDREADY9,
+    S_FSWORDREADY10,
+    S_FSWORDREADY11,
+    S_FSWORDDOWN,
+    S_FSWORDUP,
+    S_FSWORDATK_1,
+    S_FSWORDATK_2,
+    S_FSWORDATK_3,
+    S_FSWORDATK_4,
+    S_FSWORDATK_5,
+    S_FSWORDATK_6,
+    S_FSWORDATK_7,
+    S_FSWORDATK_8,
+    S_FSWORDATK_9,
+    S_FSWORDATK_10,
+    S_FSWORDATK_11,
+    S_FSWORDATK_12,
+    S_FSWORD_MISSILE1,
+    S_FSWORD_MISSILE2,
+    S_FSWORD_MISSILE3,
+    S_FSWORD_MISSILE_X1,
+    S_FSWORD_MISSILE_X2,
+    S_FSWORD_MISSILE_X3,
+    S_FSWORD_MISSILE_X4,
+    S_FSWORD_MISSILE_X5,
+    S_FSWORD_MISSILE_X6,
+    S_FSWORD_MISSILE_X7,
+    S_FSWORD_MISSILE_X8,
+    S_FSWORD_MISSILE_X9,
+    S_FSWORD_MISSILE_X10,
+    S_FSWORD_FLAME1,
+    S_FSWORD_FLAME2,
+    S_FSWORD_FLAME3,
+    S_FSWORD_FLAME4,
+    S_FSWORD_FLAME5,
+    S_FSWORD_FLAME6,
+    S_FSWORD_FLAME7,
+    S_FSWORD_FLAME8,
+    S_FSWORD_FLAME9,
+    S_FSWORD_FLAME10,
+    S_CMACEREADY,
+    S_CMACEDOWN,
+    S_CMACEUP,
+    S_CMACEATK_1,
+    S_CMACEATK_2,
+    S_CMACEATK_3,
+    S_CMACEATK_4,
+    S_CMACEATK_5,
+    S_CMACEATK_6,
+    S_CMACEATK_7,
+    S_CMACEATK_8,
+    S_CMACEATK_9,
+    S_CMACEATK_10,
+    S_CMACEATK_11,
+    S_CMACEATK_12,
+    S_CMACEATK_13,
+    S_CMACEATK_14,
+    S_CMACEATK_15,
+    S_CMACEATK_16,
+    S_CMACEATK_17,
+    S_CSTAFF,
+    S_CSTAFFREADY,
+    S_CSTAFFREADY1,
+    S_CSTAFFREADY2,
+    S_CSTAFFREADY3,
+    S_CSTAFFREADY4,
+    S_CSTAFFREADY5,
+    S_CSTAFFREADY6,
+    S_CSTAFFREADY7,
+    S_CSTAFFREADY8,
+    S_CSTAFFREADY9,
+    S_CSTAFFBLINK1,
+    S_CSTAFFBLINK2,
+    S_CSTAFFBLINK3,
+    S_CSTAFFBLINK4,
+    S_CSTAFFBLINK5,
+    S_CSTAFFBLINK6,
+    S_CSTAFFBLINK7,
+    S_CSTAFFBLINK8,
+    S_CSTAFFBLINK9,
+    S_CSTAFFBLINK10,
+    S_CSTAFFBLINK11,
+    S_CSTAFFDOWN,
+    S_CSTAFFDOWN2,
+    S_CSTAFFDOWN3,
+    S_CSTAFFUP,
+    S_CSTAFFATK_1,
+    S_CSTAFFATK_2,
+    S_CSTAFFATK_3,
+    S_CSTAFFATK_4,
+    S_CSTAFFATK_5,
+    S_CSTAFFATK_6,
+    S_CSTAFFATK2_1,
+    S_CSTAFF_MISSILE1,
+    S_CSTAFF_MISSILE2,
+    S_CSTAFF_MISSILE3,
+    S_CSTAFF_MISSILE4,
+    S_CSTAFF_MISSILE_X1,
+    S_CSTAFF_MISSILE_X2,
+    S_CSTAFF_MISSILE_X3,
+    S_CSTAFF_MISSILE_X4,
+    S_CSTAFFPUFF1,
+    S_CSTAFFPUFF2,
+    S_CSTAFFPUFF3,
+    S_CSTAFFPUFF4,
+    S_CSTAFFPUFF5,
+    S_CFLAME1,
+    S_CFLAME2,
+    S_CFLAME3,
+    S_CFLAME4,
+    S_CFLAME5,
+    S_CFLAME6,
+    S_CFLAME7,
+    S_CFLAME8,
+    S_CFLAMEREADY1,
+    S_CFLAMEREADY2,
+    S_CFLAMEREADY3,
+    S_CFLAMEREADY4,
+    S_CFLAMEREADY5,
+    S_CFLAMEREADY6,
+    S_CFLAMEREADY7,
+    S_CFLAMEREADY8,
+    S_CFLAMEREADY9,
+    S_CFLAMEREADY10,
+    S_CFLAMEREADY11,
+    S_CFLAMEREADY12,
+    S_CFLAMEDOWN,
+    S_CFLAMEUP,
+    S_CFLAMEATK_1,
+    S_CFLAMEATK_2,
+    S_CFLAMEATK_3,
+    S_CFLAMEATK_4,
+    S_CFLAMEATK_5,
+    S_CFLAMEATK_6,
+    S_CFLAMEATK_7,
+    S_CFLAMEATK_8,
+    S_CFLAMEFLOOR1,
+    S_CFLAMEFLOOR2,
+    S_CFLAMEFLOOR3,
+    S_FLAMEPUFF1,
+    S_FLAMEPUFF2,
+    S_FLAMEPUFF3,
+    S_FLAMEPUFF4,
+    S_FLAMEPUFF5,
+    S_FLAMEPUFF6,
+    S_FLAMEPUFF7,
+    S_FLAMEPUFF8,
+    S_FLAMEPUFF9,
+    S_FLAMEPUFF10,
+    S_FLAMEPUFF11,
+    S_FLAMEPUFF12,
+    S_FLAMEPUFF13,
+    S_FLAMEPUFF2_1,
+    S_FLAMEPUFF2_2,
+    S_FLAMEPUFF2_3,
+    S_FLAMEPUFF2_4,
+    S_FLAMEPUFF2_5,
+    S_FLAMEPUFF2_6,
+    S_FLAMEPUFF2_7,
+    S_FLAMEPUFF2_8,
+    S_FLAMEPUFF2_9,
+    S_FLAMEPUFF2_10,
+    S_FLAMEPUFF2_11,
+    S_FLAMEPUFF2_12,
+    S_FLAMEPUFF2_13,
+    S_FLAMEPUFF2_14,
+    S_FLAMEPUFF2_15,
+    S_FLAMEPUFF2_16,
+    S_FLAMEPUFF2_17,
+    S_FLAMEPUFF2_18,
+    S_FLAMEPUFF2_19,
+    S_FLAMEPUFF2_20,
+    S_CIRCLE_FLAME1,
+    S_CIRCLE_FLAME2,
+    S_CIRCLE_FLAME3,
+    S_CIRCLE_FLAME4,
+    S_CIRCLE_FLAME5,
+    S_CIRCLE_FLAME6,
+    S_CIRCLE_FLAME7,
+    S_CIRCLE_FLAME8,
+    S_CIRCLE_FLAME9,
+    S_CIRCLE_FLAME10,
+    S_CIRCLE_FLAME11,
+    S_CIRCLE_FLAME12,
+    S_CIRCLE_FLAME13,
+    S_CIRCLE_FLAME14,
+    S_CIRCLE_FLAME15,
+    S_CIRCLE_FLAME16,
+    S_CIRCLE_FLAME_X1,
+    S_CIRCLE_FLAME_X2,
+    S_CIRCLE_FLAME_X3,
+    S_CIRCLE_FLAME_X4,
+    S_CIRCLE_FLAME_X5,
+    S_CIRCLE_FLAME_X6,
+    S_CIRCLE_FLAME_X7,
+    S_CIRCLE_FLAME_X8,
+    S_CIRCLE_FLAME_X9,
+    S_CIRCLE_FLAME_X10,
+    S_CFLAME_MISSILE1,
+    S_CFLAME_MISSILE2,
+    S_CFLAME_MISSILE_X,
+    S_CHOLYREADY,
+    S_CHOLYDOWN,
+    S_CHOLYUP,
+    S_CHOLYATK_1,
+    S_CHOLYATK_2,
+    S_CHOLYATK_3,
+    S_CHOLYATK_4,
+    S_CHOLYATK_5,
+    S_CHOLYATK_6,
+    S_CHOLYATK_7,
+    S_CHOLYATK_8,
+    S_CHOLYATK_9,
+    S_HOLY_FX1,
+    S_HOLY_FX2,
+    S_HOLY_FX3,
+    S_HOLY_FX4,
+    S_HOLY_FX_X1,
+    S_HOLY_FX_X2,
+    S_HOLY_FX_X3,
+    S_HOLY_FX_X4,
+    S_HOLY_FX_X5,
+    S_HOLY_FX_X6,
+    S_HOLY_TAIL1,
+    S_HOLY_TAIL2,
+    S_HOLY_PUFF1,
+    S_HOLY_PUFF2,
+    S_HOLY_PUFF3,
+    S_HOLY_PUFF4,
+    S_HOLY_PUFF5,
+    S_HOLY_MISSILE1,
+    S_HOLY_MISSILE2,
+    S_HOLY_MISSILE3,
+    S_HOLY_MISSILE4,
+    S_HOLY_MISSILE_X,
+    S_HOLY_MISSILE_P1,
+    S_HOLY_MISSILE_P2,
+    S_HOLY_MISSILE_P3,
+    S_HOLY_MISSILE_P4,
+    S_HOLY_MISSILE_P5,
+    S_MWANDREADY,
+    S_MWANDDOWN,
+    S_MWANDUP,
+    S_MWANDATK_1,
+    S_MWANDATK_2,
+    S_MWANDATK_3,
+    S_MWANDATK_4,
+    S_MWANDPUFF1,
+    S_MWANDPUFF2,
+    S_MWANDPUFF3,
+    S_MWANDPUFF4,
+    S_MWANDPUFF5,
+    S_MWANDSMOKE1,
+    S_MWANDSMOKE2,
+    S_MWANDSMOKE3,
+    S_MWANDSMOKE4,
+    S_MWAND_MISSILE1,
+    S_MWAND_MISSILE2,
+    S_MW_LIGHTNING1,
+    S_MW_LIGHTNING2,
+    S_MW_LIGHTNING3,
+    S_MW_LIGHTNING4,
+    S_MW_LIGHTNING5,
+    S_MW_LIGHTNING6,
+    S_MW_LIGHTNING7,
+    S_MW_LIGHTNING8,
+    S_MLIGHTNINGREADY,
+    S_MLIGHTNINGREADY2,
+    S_MLIGHTNINGREADY3,
+    S_MLIGHTNINGREADY4,
+    S_MLIGHTNINGREADY5,
+    S_MLIGHTNINGREADY6,
+    S_MLIGHTNINGREADY7,
+    S_MLIGHTNINGREADY8,
+    S_MLIGHTNINGREADY9,
+    S_MLIGHTNINGREADY10,
+    S_MLIGHTNINGREADY11,
+    S_MLIGHTNINGREADY12,
+    S_MLIGHTNINGREADY13,
+    S_MLIGHTNINGREADY14,
+    S_MLIGHTNINGREADY15,
+    S_MLIGHTNINGREADY16,
+    S_MLIGHTNINGREADY17,
+    S_MLIGHTNINGREADY18,
+    S_MLIGHTNINGREADY19,
+    S_MLIGHTNINGREADY20,
+    S_MLIGHTNINGREADY21,
+    S_MLIGHTNINGREADY22,
+    S_MLIGHTNINGREADY23,
+    S_MLIGHTNINGREADY24,
+    S_MLIGHTNINGDOWN,
+    S_MLIGHTNINGUP,
+    S_MLIGHTNINGATK_1,
+    S_MLIGHTNINGATK_2,
+    S_MLIGHTNINGATK_3,
+    S_MLIGHTNINGATK_4,
+    S_MLIGHTNINGATK_5,
+    S_MLIGHTNINGATK_6,
+    S_MLIGHTNINGATK_7,
+    S_MLIGHTNINGATK_8,
+    S_MLIGHTNINGATK_9,
+    S_MLIGHTNINGATK_10,
+    S_MLIGHTNINGATK_11,
+    S_LIGHTNING_CEILING1,
+    S_LIGHTNING_CEILING2,
+    S_LIGHTNING_CEILING3,
+    S_LIGHTNING_CEILING4,
+    S_LIGHTNING_C_X1,
+    S_LIGHTNING_C_X2,
+    S_LIGHTNING_C_X3,
+    S_LIGHTNING_C_X4,
+    S_LIGHTNING_C_X5,
+    S_LIGHTNING_C_X6,
+    S_LIGHTNING_C_X7,
+    S_LIGHTNING_C_X8,
+    S_LIGHTNING_C_X9,
+    S_LIGHTNING_C_X10,
+    S_LIGHTNING_C_X11,
+    S_LIGHTNING_C_X12,
+    S_LIGHTNING_C_X13,
+    S_LIGHTNING_C_X14,
+    S_LIGHTNING_C_X15,
+    S_LIGHTNING_C_X16,
+    S_LIGHTNING_C_X17,
+    S_LIGHTNING_C_X18,
+    S_LIGHTNING_C_X19,
+    S_LIGHTNING_FLOOR1,
+    S_LIGHTNING_FLOOR2,
+    S_LIGHTNING_FLOOR3,
+    S_LIGHTNING_FLOOR4,
+    S_LIGHTNING_F_X1,
+    S_LIGHTNING_F_X2,
+    S_LIGHTNING_F_X3,
+    S_LIGHTNING_F_X4,
+    S_LIGHTNING_F_X5,
+    S_LIGHTNING_F_X6,
+    S_LIGHTNING_F_X7,
+    S_LIGHTNING_F_X8,
+    S_LIGHTNING_F_X9,
+    S_LIGHTNING_F_X10,
+    S_LIGHTNING_F_X11,
+    S_LIGHTNING_F_X12,
+    S_LIGHTNING_F_X13,
+    S_LIGHTNING_F_X14,
+    S_LIGHTNING_F_X15,
+    S_LIGHTNING_F_X16,
+    S_LIGHTNING_F_X17,
+    S_LIGHTNING_F_X18,
+    S_LIGHTNING_F_X19,
+    S_LIGHTNING_ZAP1,
+    S_LIGHTNING_ZAP2,
+    S_LIGHTNING_ZAP3,
+    S_LIGHTNING_ZAP4,
+    S_LIGHTNING_ZAP5,
+    S_LIGHTNING_ZAP_X1,
+    S_LIGHTNING_ZAP_X2,
+    S_LIGHTNING_ZAP_X3,
+    S_LIGHTNING_ZAP_X4,
+    S_LIGHTNING_ZAP_X5,
+    S_LIGHTNING_ZAP_X6,
+    S_LIGHTNING_ZAP_X7,
+    S_LIGHTNING_ZAP_X8,
+    S_MSTAFFREADY,
+    S_MSTAFFREADY2,
+    S_MSTAFFREADY3,
+    S_MSTAFFREADY4,
+    S_MSTAFFREADY5,
+    S_MSTAFFREADY6,
+    S_MSTAFFREADY7,
+    S_MSTAFFREADY8,
+    S_MSTAFFREADY9,
+    S_MSTAFFREADY10,
+    S_MSTAFFREADY11,
+    S_MSTAFFREADY12,
+    S_MSTAFFREADY13,
+    S_MSTAFFREADY14,
+    S_MSTAFFREADY15,
+    S_MSTAFFREADY16,
+    S_MSTAFFREADY17,
+    S_MSTAFFREADY18,
+    S_MSTAFFREADY19,
+    S_MSTAFFREADY20,
+    S_MSTAFFREADY21,
+    S_MSTAFFREADY22,
+    S_MSTAFFREADY23,
+    S_MSTAFFREADY24,
+    S_MSTAFFREADY25,
+    S_MSTAFFREADY26,
+    S_MSTAFFREADY27,
+    S_MSTAFFREADY28,
+    S_MSTAFFREADY29,
+    S_MSTAFFREADY30,
+    S_MSTAFFREADY31,
+    S_MSTAFFREADY32,
+    S_MSTAFFREADY33,
+    S_MSTAFFREADY34,
+    S_MSTAFFREADY35,
+    S_MSTAFFDOWN,
+    S_MSTAFFUP,
+    S_MSTAFFATK_1,
+    S_MSTAFFATK_2,
+    S_MSTAFFATK_3,
+    S_MSTAFFATK_4,
+    S_MSTAFFATK_5,
+    S_MSTAFFATK_6,
+    S_MSTAFFATK_7,
+    S_MSTAFF_FX1_1,
+    S_MSTAFF_FX1_2,
+    S_MSTAFF_FX1_3,
+    S_MSTAFF_FX1_4,
+    S_MSTAFF_FX1_5,
+    S_MSTAFF_FX1_6,
+    S_MSTAFF_FX_X1,
+    S_MSTAFF_FX_X2,
+    S_MSTAFF_FX_X3,
+    S_MSTAFF_FX_X4,
+    S_MSTAFF_FX_X5,
+    S_MSTAFF_FX_X6,
+    S_MSTAFF_FX_X7,
+    S_MSTAFF_FX_X8,
+    S_MSTAFF_FX_X9,
+    S_MSTAFF_FX_X10,
+    S_MSTAFF_FX2_1,
+    S_MSTAFF_FX2_2,
+    S_MSTAFF_FX2_3,
+    S_MSTAFF_FX2_4,
+    S_MSTAFF_FX2_X1,
+    S_MSTAFF_FX2_X2,
+    S_MSTAFF_FX2_X3,
+    S_MSTAFF_FX2_X4,
+    S_MSTAFF_FX2_X5,
+    S_FSWORD1,
+    S_FSWORD2,
+    S_FSWORD3,
+    S_CHOLY1,
+    S_CHOLY2,
+    S_CHOLY3,
+    S_MSTAFF1,
+    S_MSTAFF2,
+    S_MSTAFF3,
+    S_SNOUTREADY,
+    S_SNOUTDOWN,
+    S_SNOUTUP,
+    S_SNOUTATK1,
+    S_SNOUTATK2,
+    S_COS1,
+    S_COS2,
+    S_COS3,
+    S_CONEREADY,
+    S_CONEDOWN,
+    S_CONEUP,
+    S_CONEATK1_1,
+    S_CONEATK1_2,
+    S_CONEATK1_3,
+    S_CONEATK1_4,
+    S_CONEATK1_5,
+    S_CONEATK1_6,
+    S_CONEATK1_7,
+    S_CONEATK1_8,
+    S_SHARDFX1_1,
+    S_SHARDFX1_2,
+    S_SHARDFX1_3,
+    S_SHARDFX1_4,
+    S_SHARDFXE1_1,
+    S_SHARDFXE1_2,
+    S_SHARDFXE1_3,
+    S_SHARDFXE1_4,
+    S_SHARDFXE1_5,
+    S_BLOOD1,
+    S_BLOOD2,
+    S_BLOOD3,
+    S_BLOODSPLATTER1,
+    S_BLOODSPLATTER2,
+    S_BLOODSPLATTER3,
+    S_BLOODSPLATTERX,
+    S_GIBS1,
+    S_FPLAY,
+    S_FPLAY_RUN1,
+    S_FPLAY_RUN2,
+    S_FPLAY_RUN3,
+    S_FPLAY_RUN4,
+    S_FPLAY_ATK1,
+    S_FPLAY_ATK2,
+    S_FPLAY_PAIN,
+    S_FPLAY_PAIN2,
+    S_FPLAY_DIE1,
+    S_FPLAY_DIE2,
+    S_FPLAY_DIE3,
+    S_FPLAY_DIE4,
+    S_FPLAY_DIE5,
+    S_FPLAY_DIE6,
+    S_FPLAY_DIE7,
+    S_FPLAY_XDIE1,
+    S_FPLAY_XDIE2,
+    S_FPLAY_XDIE3,
+    S_FPLAY_XDIE4,
+    S_FPLAY_XDIE5,
+    S_FPLAY_XDIE6,
+    S_FPLAY_XDIE7,
+    S_FPLAY_XDIE8,
+    S_FPLAY_ICE,
+    S_FPLAY_ICE2,
+    S_PLAY_F_FDTH1,
+    S_PLAY_F_FDTH2,
+    S_PLAY_C_FDTH1,
+    S_PLAY_C_FDTH2,
+    S_PLAY_M_FDTH1,
+    S_PLAY_M_FDTH2,
+    S_PLAY_FDTH3,
+    S_PLAY_FDTH4,
+    S_PLAY_FDTH5,
+    S_PLAY_FDTH6,
+    S_PLAY_FDTH7,
+    S_PLAY_FDTH8,
+    S_PLAY_FDTH9,
+    S_PLAY_FDTH10,
+    S_PLAY_FDTH11,
+    S_PLAY_FDTH12,
+    S_PLAY_FDTH13,
+    S_PLAY_FDTH14,
+    S_PLAY_FDTH15,
+    S_PLAY_FDTH16,
+    S_PLAY_FDTH17,
+    S_PLAY_FDTH18,
+    S_PLAY_FDTH19,
+    S_PLAY_FDTH20,
+    S_BLOODYSKULL1,
+    S_BLOODYSKULL2,
+    S_BLOODYSKULL3,
+    S_BLOODYSKULL4,
+    S_BLOODYSKULL5,
+    S_BLOODYSKULL6,
+    S_BLOODYSKULL7,
+    S_BLOODYSKULLX1,
+    S_BLOODYSKULLX2,
+    S_PLAYER_SPEED1,
+    S_PLAYER_SPEED2,
+    S_ICECHUNK1,
+    S_ICECHUNK2,
+    S_ICECHUNK3,
+    S_ICECHUNK4,
+    S_ICECHUNK_HEAD,
+    S_ICECHUNK_HEAD2,
+    S_CPLAY,
+    S_CPLAY_RUN1,
+    S_CPLAY_RUN2,
+    S_CPLAY_RUN3,
+    S_CPLAY_RUN4,
+    S_CPLAY_ATK1,
+    S_CPLAY_ATK2,
+    S_CPLAY_ATK3,
+    S_CPLAY_PAIN,
+    S_CPLAY_PAIN2,
+    S_CPLAY_DIE1,
+    S_CPLAY_DIE2,
+    S_CPLAY_DIE3,
+    S_CPLAY_DIE4,
+    S_CPLAY_DIE5,
+    S_CPLAY_DIE6,
+    S_CPLAY_DIE7,
+    S_CPLAY_DIE8,
+    S_CPLAY_DIE9,
+    S_CPLAY_XDIE1,
+    S_CPLAY_XDIE2,
+    S_CPLAY_XDIE3,
+    S_CPLAY_XDIE4,
+    S_CPLAY_XDIE5,
+    S_CPLAY_XDIE6,
+    S_CPLAY_XDIE7,
+    S_CPLAY_XDIE8,
+    S_CPLAY_XDIE9,
+    S_CPLAY_XDIE10,
+    S_CPLAY_ICE,
+    S_CPLAY_ICE2,
+    S_MPLAY,
+    S_MPLAY_RUN1,
+    S_MPLAY_RUN2,
+    S_MPLAY_RUN3,
+    S_MPLAY_RUN4,
+    S_MPLAY_ATK1,
+    S_MPLAY_ATK2,
+    S_MPLAY_PAIN,
+    S_MPLAY_PAIN2,
+    S_MPLAY_DIE1,
+    S_MPLAY_DIE2,
+    S_MPLAY_DIE3,
+    S_MPLAY_DIE4,
+    S_MPLAY_DIE5,
+    S_MPLAY_DIE6,
+    S_MPLAY_DIE7,
+    S_MPLAY_XDIE1,
+    S_MPLAY_XDIE2,
+    S_MPLAY_XDIE3,
+    S_MPLAY_XDIE4,
+    S_MPLAY_XDIE5,
+    S_MPLAY_XDIE6,
+    S_MPLAY_XDIE7,
+    S_MPLAY_XDIE8,
+    S_MPLAY_XDIE9,
+    S_MPLAY_ICE,
+    S_MPLAY_ICE2,
+    S_PIGPLAY,
+    S_PIGPLAY_RUN1,
+    S_PIGPLAY_RUN2,
+    S_PIGPLAY_RUN3,
+    S_PIGPLAY_RUN4,
+    S_PIGPLAY_ATK1,
+    S_PIGPLAY_PAIN,
+    S_PIG_LOOK1,
+    S_PIG_WALK1,
+    S_PIG_WALK2,
+    S_PIG_WALK3,
+    S_PIG_WALK4,
+    S_PIG_PAIN,
+    S_PIG_ATK1,
+    S_PIG_ATK2,
+    S_PIG_DIE1,
+    S_PIG_DIE2,
+    S_PIG_DIE3,
+    S_PIG_DIE4,
+    S_PIG_DIE5,
+    S_PIG_DIE6,
+    S_PIG_DIE7,
+    S_PIG_DIE8,
+    S_PIG_ICE,
+    S_PIG_ICE2,
+    S_CENTAUR_LOOK1,
+    S_CENTAUR_LOOK2,
+    S_CENTAUR_WALK1,
+    S_CENTAUR_WALK2,
+    S_CENTAUR_WALK3,
+    S_CENTAUR_WALK4,
+    S_CENTAUR_ATK1,
+    S_CENTAUR_ATK2,
+    S_CENTAUR_ATK3,
+    S_CENTAUR_MISSILE1,
+    S_CENTAUR_MISSILE2,
+    S_CENTAUR_MISSILE3,
+    S_CENTAUR_MISSILE4,
+    S_CENTAUR_PAIN1,
+    S_CENTAUR_PAIN2,
+    S_CENTAUR_PAIN3,
+    S_CENTAUR_PAIN4,
+    S_CENTAUR_PAIN5,
+    S_CENTAUR_PAIN6,
+    S_CENTAUR_DEATH1,
+    S_CENTAUR_DEATH2,
+    S_CENTAUR_DEATH3,
+    S_CENTAUR_DEATH4,
+    S_CENTAUR_DEATH5,
+    S_CENTAUR_DEATH6,
+    S_CENTAUR_DEATH7,
+    S_CENTAUR_DEATH8,
+    S_CENTAUR_DEATH9,
+    S_CENTAUR_DEATH0,
+    S_CENTAUR_DEATH_X1,
+    S_CENTAUR_DEATH_X2,
+    S_CENTAUR_DEATH_X3,
+    S_CENTAUR_DEATH_X4,
+    S_CENTAUR_DEATH_X5,
+    S_CENTAUR_DEATH_X6,
+    S_CENTAUR_DEATH_X7,
+    S_CENTAUR_DEATH_X8,
+    S_CENTAUR_DEATH_X9,
+    S_CENTAUR_DEATH_X10,
+    S_CENTAUR_DEATH_X11,
+    S_CENTAUR_ICE,
+    S_CENTAUR_ICE2,
+    S_CENTAUR_FX1,
+    S_CENTAUR_FX_X1,
+    S_CENTAUR_FX_X2,
+    S_CENTAUR_FX_X3,
+    S_CENTAUR_FX_X4,
+    S_CENTAUR_FX_X5,
+    S_CENTAUR_SHIELD1,
+    S_CENTAUR_SHIELD2,
+    S_CENTAUR_SHIELD3,
+    S_CENTAUR_SHIELD4,
+    S_CENTAUR_SHIELD5,
+    S_CENTAUR_SHIELD6,
+    S_CENTAUR_SHIELD_X1,
+    S_CENTAUR_SHIELD_X2,
+    S_CENTAUR_SHIELD_X3,
+    S_CENTAUR_SHIELD_X4,
+    S_CENTAUR_SWORD1,
+    S_CENTAUR_SWORD2,
+    S_CENTAUR_SWORD3,
+    S_CENTAUR_SWORD4,
+    S_CENTAUR_SWORD5,
+    S_CENTAUR_SWORD6,
+    S_CENTAUR_SWORD7,
+    S_CENTAUR_SWORD_X1,
+    S_CENTAUR_SWORD_X2,
+    S_CENTAUR_SWORD_X3,
+    S_DEMN_LOOK1,
+    S_DEMN_LOOK2,
+    S_DEMN_CHASE1,
+    S_DEMN_CHASE2,
+    S_DEMN_CHASE3,
+    S_DEMN_CHASE4,
+    S_DEMN_ATK1_1,
+    S_DEMN_ATK1_2,
+    S_DEMN_ATK1_3,
+    S_DEMN_ATK2_1,
+    S_DEMN_ATK2_2,
+    S_DEMN_ATK2_3,
+    S_DEMN_PAIN1,
+    S_DEMN_PAIN2,
+    S_DEMN_DEATH1,
+    S_DEMN_DEATH2,
+    S_DEMN_DEATH3,
+    S_DEMN_DEATH4,
+    S_DEMN_DEATH5,
+    S_DEMN_DEATH6,
+    S_DEMN_DEATH7,
+    S_DEMN_DEATH8,
+    S_DEMN_DEATH9,
+    S_DEMN_XDEATH1,
+    S_DEMN_XDEATH2,
+    S_DEMN_XDEATH3,
+    S_DEMN_XDEATH4,
+    S_DEMN_XDEATH5,
+    S_DEMN_XDEATH6,
+    S_DEMN_XDEATH7,
+    S_DEMN_XDEATH8,
+    S_DEMN_XDEATH9,
+    S_DEMON_ICE,
+    S_DEMON_ICE2,
+    S_DEMONCHUNK1_1,
+    S_DEMONCHUNK1_2,
+    S_DEMONCHUNK1_3,
+    S_DEMONCHUNK1_4,
+    S_DEMONCHUNK2_1,
+    S_DEMONCHUNK2_2,
+    S_DEMONCHUNK2_3,
+    S_DEMONCHUNK2_4,
+    S_DEMONCHUNK3_1,
+    S_DEMONCHUNK3_2,
+    S_DEMONCHUNK3_3,
+    S_DEMONCHUNK3_4,
+    S_DEMONCHUNK4_1,
+    S_DEMONCHUNK4_2,
+    S_DEMONCHUNK4_3,
+    S_DEMONCHUNK4_4,
+    S_DEMONCHUNK5_1,
+    S_DEMONCHUNK5_2,
+    S_DEMONCHUNK5_3,
+    S_DEMONCHUNK5_4,
+    S_DEMONFX_MOVE1,
+    S_DEMONFX_MOVE2,
+    S_DEMONFX_MOVE3,
+    S_DEMONFX_BOOM1,
+    S_DEMONFX_BOOM2,
+    S_DEMONFX_BOOM3,
+    S_DEMONFX_BOOM4,
+    S_DEMONFX_BOOM5,
+    S_DEMN2_LOOK1,
+    S_DEMN2_LOOK2,
+    S_DEMN2_CHASE1,
+    S_DEMN2_CHASE2,
+    S_DEMN2_CHASE3,
+    S_DEMN2_CHASE4,
+    S_DEMN2_ATK1_1,
+    S_DEMN2_ATK1_2,
+    S_DEMN2_ATK1_3,
+    S_DEMN2_ATK2_1,
+    S_DEMN2_ATK2_2,
+    S_DEMN2_ATK2_3,
+    S_DEMN2_PAIN1,
+    S_DEMN2_PAIN2,
+    S_DEMN2_DEATH1,
+    S_DEMN2_DEATH2,
+    S_DEMN2_DEATH3,
+    S_DEMN2_DEATH4,
+    S_DEMN2_DEATH5,
+    S_DEMN2_DEATH6,
+    S_DEMN2_DEATH7,
+    S_DEMN2_DEATH8,
+    S_DEMN2_DEATH9,
+    S_DEMN2_XDEATH1,
+    S_DEMN2_XDEATH2,
+    S_DEMN2_XDEATH3,
+    S_DEMN2_XDEATH4,
+    S_DEMN2_XDEATH5,
+    S_DEMN2_XDEATH6,
+    S_DEMN2_XDEATH7,
+    S_DEMN2_XDEATH8,
+    S_DEMN2_XDEATH9,
+    S_DEMON2CHUNK1_1,
+    S_DEMON2CHUNK1_2,
+    S_DEMON2CHUNK1_3,
+    S_DEMON2CHUNK1_4,
+    S_DEMON2CHUNK2_1,
+    S_DEMON2CHUNK2_2,
+    S_DEMON2CHUNK2_3,
+    S_DEMON2CHUNK2_4,
+    S_DEMON2CHUNK3_1,
+    S_DEMON2CHUNK3_2,
+    S_DEMON2CHUNK3_3,
+    S_DEMON2CHUNK3_4,
+    S_DEMON2CHUNK4_1,
+    S_DEMON2CHUNK4_2,
+    S_DEMON2CHUNK4_3,
+    S_DEMON2CHUNK4_4,
+    S_DEMON2CHUNK5_1,
+    S_DEMON2CHUNK5_2,
+    S_DEMON2CHUNK5_3,
+    S_DEMON2CHUNK5_4,
+    S_DEMON2FX_MOVE1,
+    S_DEMON2FX_MOVE2,
+    S_DEMON2FX_MOVE3,
+    S_DEMON2FX_MOVE4,
+    S_DEMON2FX_MOVE5,
+    S_DEMON2FX_MOVE6,
+    S_DEMON2FX_BOOM1,
+    S_DEMON2FX_BOOM2,
+    S_DEMON2FX_BOOM3,
+    S_DEMON2FX_BOOM4,
+    S_DEMON2FX_BOOM5,
+    S_DEMON2FX_BOOM6,
+    S_WRAITH_RAISE1,
+    S_WRAITH_RAISE2,
+    S_WRAITH_RAISE3,
+    S_WRAITH_RAISE4,
+    S_WRAITH_RAISE5,
+    S_WRAITH_INIT1,
+    S_WRAITH_INIT2,
+    S_WRAITH_LOOK1,
+    S_WRAITH_LOOK2,
+    S_WRAITH_CHASE1,
+    S_WRAITH_CHASE2,
+    S_WRAITH_CHASE3,
+    S_WRAITH_CHASE4,
+    S_WRAITH_ATK1_1,
+    S_WRAITH_ATK1_2,
+    S_WRAITH_ATK1_3,
+    S_WRAITH_ATK2_1,
+    S_WRAITH_ATK2_2,
+    S_WRAITH_ATK2_3,
+    S_WRAITH_PAIN1,
+    S_WRAITH_PAIN2,
+    S_WRAITH_DEATH1_1,
+    S_WRAITH_DEATH1_2,
+    S_WRAITH_DEATH1_3,
+    S_WRAITH_DEATH1_4,
+    S_WRAITH_DEATH1_5,
+    S_WRAITH_DEATH1_6,
+    S_WRAITH_DEATH1_7,
+    S_WRAITH_DEATH1_8,
+    S_WRAITH_DEATH1_9,
+    S_WRAITH_DEATH1_0,
+    S_WRAITH_DEATH2_1,
+    S_WRAITH_DEATH2_2,
+    S_WRAITH_DEATH2_3,
+    S_WRAITH_DEATH2_4,
+    S_WRAITH_DEATH2_5,
+    S_WRAITH_DEATH2_6,
+    S_WRAITH_DEATH2_7,
+    S_WRAITH_DEATH2_8,
+    S_WRAITH_ICE,
+    S_WRAITH_ICE2,
+    S_WRTHFX_MOVE1,
+    S_WRTHFX_MOVE2,
+    S_WRTHFX_MOVE3,
+    S_WRTHFX_BOOM1,
+    S_WRTHFX_BOOM2,
+    S_WRTHFX_BOOM3,
+    S_WRTHFX_BOOM4,
+    S_WRTHFX_BOOM5,
+    S_WRTHFX_BOOM6,
+    S_WRTHFX_SIZZLE1,
+    S_WRTHFX_SIZZLE2,
+    S_WRTHFX_SIZZLE3,
+    S_WRTHFX_SIZZLE4,
+    S_WRTHFX_SIZZLE5,
+    S_WRTHFX_SIZZLE6,
+    S_WRTHFX_SIZZLE7,
+    S_WRTHFX_DROP1,
+    S_WRTHFX_DROP2,
+    S_WRTHFX_DROP3,
+    S_WRTHFX_DEAD1,
+    S_WRTHFX_ADROP1,
+    S_WRTHFX_ADROP2,
+    S_WRTHFX_ADROP3,
+    S_WRTHFX_ADROP4,
+    S_WRTHFX_ADEAD1,
+    S_WRTHFX_BDROP1,
+    S_WRTHFX_BDROP2,
+    S_WRTHFX_BDROP3,
+    S_WRTHFX_BDEAD1,
+    S_MNTR_SPAWN1,
+    S_MNTR_SPAWN2,
+    S_MNTR_SPAWN3,
+    S_MNTR_LOOK1,
+    S_MNTR_LOOK2,
+    S_MNTR_WALK1,
+    S_MNTR_WALK2,
+    S_MNTR_WALK3,
+    S_MNTR_WALK4,
+    S_MNTR_ROAM1,
+    S_MNTR_ROAM2,
+    S_MNTR_ROAM3,
+    S_MNTR_ROAM4,
+    S_MNTR_ATK1_1,
+    S_MNTR_ATK1_2,
+    S_MNTR_ATK1_3,
+    S_MNTR_ATK2_1,
+    S_MNTR_ATK2_2,
+    S_MNTR_ATK2_3,
+    S_MNTR_ATK3_1,
+    S_MNTR_ATK3_2,
+    S_MNTR_ATK3_3,
+    S_MNTR_ATK3_4,
+    S_MNTR_ATK4_1,
+    S_MNTR_PAIN1,
+    S_MNTR_PAIN2,
+    S_MNTR_DIE1,
+    S_MNTR_DIE2,
+    S_MNTR_DIE3,
+    S_MNTR_DIE4,
+    S_MNTR_DIE5,
+    S_MNTR_DIE6,
+    S_MNTR_DIE7,
+    S_MNTR_DIE8,
+    S_MNTR_DIE9,
+    S_MNTRFX1_1,
+    S_MNTRFX1_2,
+    S_MNTRFXI1_1,
+    S_MNTRFXI1_2,
+    S_MNTRFXI1_3,
+    S_MNTRFXI1_4,
+    S_MNTRFXI1_5,
+    S_MNTRFXI1_6,
+    S_MNTRFX2_1,
+    S_MNTRFXI2_1,
+    S_MNTRFXI2_2,
+    S_MNTRFXI2_3,
+    S_MNTRFXI2_4,
+    S_MNTRFXI2_5,
+    S_MNTRFX3_1,
+    S_MNTRFX3_2,
+    S_MNTRFX3_3,
+    S_MNTRFX3_4,
+    S_MNTRFX3_5,
+    S_MNTRFX3_6,
+    S_MNTRFX3_7,
+    S_MNTRFX3_8,
+    S_MNTRFX3_9,
+    S_MINOSMOKE1,
+    S_MINOSMOKE2,
+    S_MINOSMOKE3,
+    S_MINOSMOKE4,
+    S_MINOSMOKE5,
+    S_MINOSMOKE6,
+    S_MINOSMOKE7,
+    S_MINOSMOKE8,
+    S_MINOSMOKE9,
+    S_MINOSMOKE0,
+    S_MINOSMOKEA,
+    S_MINOSMOKEB,
+    S_MINOSMOKEC,
+    S_MINOSMOKED,
+    S_MINOSMOKEE,
+    S_MINOSMOKEF,
+    S_MINOSMOKEG,
+    S_MINOSMOKEX1,
+    S_MINOSMOKEX2,
+    S_MINOSMOKEX3,
+    S_MINOSMOKEX4,
+    S_MINOSMOKEX5,
+    S_MINOSMOKEX6,
+    S_MINOSMOKEX7,
+    S_MINOSMOKEX8,
+    S_MINOSMOKEX9,
+    S_MINOSMOKEX0,
+    S_MINOSMOKEXA,
+    S_MINOSMOKEXB,
+    S_MINOSMOKEXC,
+    S_MINOSMOKEXD,
+    S_MINOSMOKEXE,
+    S_MINOSMOKEXF,
+    S_MINOSMOKEXG,
+    S_MINOSMOKEXH,
+    S_MINOSMOKEXI,
+    S_SERPENT_LOOK1,
+    S_SERPENT_SWIM1,
+    S_SERPENT_SWIM2,
+    S_SERPENT_SWIM3,
+    S_SERPENT_HUMP1,
+    S_SERPENT_HUMP2,
+    S_SERPENT_HUMP3,
+    S_SERPENT_HUMP4,
+    S_SERPENT_HUMP5,
+    S_SERPENT_HUMP6,
+    S_SERPENT_HUMP7,
+    S_SERPENT_HUMP8,
+    S_SERPENT_HUMP9,
+    S_SERPENT_HUMP10,
+    S_SERPENT_HUMP11,
+    S_SERPENT_HUMP12,
+    S_SERPENT_HUMP13,
+    S_SERPENT_HUMP14,
+    S_SERPENT_HUMP15,
+    S_SERPENT_SURFACE1,
+    S_SERPENT_SURFACE2,
+    S_SERPENT_SURFACE3,
+    S_SERPENT_SURFACE4,
+    S_SERPENT_SURFACE5,
+    S_SERPENT_DIVE1,
+    S_SERPENT_DIVE2,
+    S_SERPENT_DIVE3,
+    S_SERPENT_DIVE4,
+    S_SERPENT_DIVE5,
+    S_SERPENT_DIVE6,
+    S_SERPENT_DIVE7,
+    S_SERPENT_DIVE8,
+    S_SERPENT_DIVE9,
+    S_SERPENT_DIVE10,
+    S_SERPENT_WALK1,
+    S_SERPENT_WALK2,
+    S_SERPENT_WALK3,
+    S_SERPENT_WALK4,
+    S_SERPENT_PAIN1,
+    S_SERPENT_PAIN2,
+    S_SERPENT_ATK1,
+    S_SERPENT_ATK2,
+    S_SERPENT_MELEE1,
+    S_SERPENT_MISSILE1,
+    S_SERPENT_DIE1,
+    S_SERPENT_DIE2,
+    S_SERPENT_DIE3,
+    S_SERPENT_DIE4,
+    S_SERPENT_DIE5,
+    S_SERPENT_DIE6,
+    S_SERPENT_DIE7,
+    S_SERPENT_DIE8,
+    S_SERPENT_DIE9,
+    S_SERPENT_DIE10,
+    S_SERPENT_DIE11,
+    S_SERPENT_DIE12,
+    S_SERPENT_XDIE1,
+    S_SERPENT_XDIE2,
+    S_SERPENT_XDIE3,
+    S_SERPENT_XDIE4,
+    S_SERPENT_XDIE5,
+    S_SERPENT_XDIE6,
+    S_SERPENT_XDIE7,
+    S_SERPENT_XDIE8,
+    S_SERPENT_ICE,
+    S_SERPENT_ICE2,
+    S_SERPENT_FX1,
+    S_SERPENT_FX2,
+    S_SERPENT_FX3,
+    S_SERPENT_FX4,
+    S_SERPENT_FX_X1,
+    S_SERPENT_FX_X2,
+    S_SERPENT_FX_X3,
+    S_SERPENT_FX_X4,
+    S_SERPENT_FX_X5,
+    S_SERPENT_FX_X6,
+    S_SERPENT_HEAD1,
+    S_SERPENT_HEAD2,
+    S_SERPENT_HEAD3,
+    S_SERPENT_HEAD4,
+    S_SERPENT_HEAD5,
+    S_SERPENT_HEAD6,
+    S_SERPENT_HEAD7,
+    S_SERPENT_HEAD8,
+    S_SERPENT_HEAD_X1,
+    S_SERPENT_GIB1_1,
+    S_SERPENT_GIB1_2,
+    S_SERPENT_GIB1_3,
+    S_SERPENT_GIB1_4,
+    S_SERPENT_GIB1_5,
+    S_SERPENT_GIB1_6,
+    S_SERPENT_GIB1_7,
+    S_SERPENT_GIB1_8,
+    S_SERPENT_GIB1_9,
+    S_SERPENT_GIB1_10,
+    S_SERPENT_GIB1_11,
+    S_SERPENT_GIB1_12,
+    S_SERPENT_GIB2_1,
+    S_SERPENT_GIB2_2,
+    S_SERPENT_GIB2_3,
+    S_SERPENT_GIB2_4,
+    S_SERPENT_GIB2_5,
+    S_SERPENT_GIB2_6,
+    S_SERPENT_GIB2_7,
+    S_SERPENT_GIB2_8,
+    S_SERPENT_GIB2_9,
+    S_SERPENT_GIB2_10,
+    S_SERPENT_GIB2_11,
+    S_SERPENT_GIB2_12,
+    S_SERPENT_GIB3_1,
+    S_SERPENT_GIB3_2,
+    S_SERPENT_GIB3_3,
+    S_SERPENT_GIB3_4,
+    S_SERPENT_GIB3_5,
+    S_SERPENT_GIB3_6,
+    S_SERPENT_GIB3_7,
+    S_SERPENT_GIB3_8,
+    S_SERPENT_GIB3_9,
+    S_SERPENT_GIB3_10,
+    S_SERPENT_GIB3_11,
+    S_SERPENT_GIB3_12,
+    S_BISHOP_LOOK1,
+    S_BISHOP_DECIDE,
+    S_BISHOP_BLUR1,
+    S_BISHOP_BLUR2,
+    S_BISHOP_WALK1,
+    S_BISHOP_WALK2,
+    S_BISHOP_WALK3,
+    S_BISHOP_WALK4,
+    S_BISHOP_WALK5,
+    S_BISHOP_WALK6,
+    S_BISHOP_ATK1,
+    S_BISHOP_ATK2,
+    S_BISHOP_ATK3,
+    S_BISHOP_ATK4,
+    S_BISHOP_ATK5,
+    S_BISHOP_PAIN1,
+    S_BISHOP_PAIN2,
+    S_BISHOP_PAIN3,
+    S_BISHOP_PAIN4,
+    S_BISHOP_PAIN5,
+    S_BISHOP_DEATH1,
+    S_BISHOP_DEATH2,
+    S_BISHOP_DEATH3,
+    S_BISHOP_DEATH4,
+    S_BISHOP_DEATH5,
+    S_BISHOP_DEATH6,
+    S_BISHOP_DEATH7,
+    S_BISHOP_DEATH8,
+    S_BISHOP_DEATH9,
+    S_BISHOP_DEATH10,
+    S_BISHOP_ICE,
+    S_BISHOP_ICE2,
+    S_BISHOP_PUFF1,
+    S_BISHOP_PUFF2,
+    S_BISHOP_PUFF3,
+    S_BISHOP_PUFF4,
+    S_BISHOP_PUFF5,
+    S_BISHOP_PUFF6,
+    S_BISHOP_PUFF7,
+    S_BISHOPBLUR1,
+    S_BISHOPBLUR2,
+    S_BISHOPPAINBLUR1,
+    S_BISHFX1_1,
+    S_BISHFX1_2,
+    S_BISHFX1_3,
+    S_BISHFX1_4,
+    S_BISHFX1_5,
+    S_BISHFXI1_1,
+    S_BISHFXI1_2,
+    S_BISHFXI1_3,
+    S_BISHFXI1_4,
+    S_BISHFXI1_5,
+    S_BISHFXI1_6,
+    S_DRAGON_LOOK1,
+    S_DRAGON_INIT,
+    S_DRAGON_INIT2,
+    S_DRAGON_INIT3,
+    S_DRAGON_WALK1,
+    S_DRAGON_WALK2,
+    S_DRAGON_WALK3,
+    S_DRAGON_WALK4,
+    S_DRAGON_WALK5,
+    S_DRAGON_WALK6,
+    S_DRAGON_WALK7,
+    S_DRAGON_WALK8,
+    S_DRAGON_WALK9,
+    S_DRAGON_WALK10,
+    S_DRAGON_WALK11,
+    S_DRAGON_WALK12,
+    S_DRAGON_ATK1,
+    S_DRAGON_PAIN1,
+    S_DRAGON_DEATH1,
+    S_DRAGON_DEATH2,
+    S_DRAGON_DEATH3,
+    S_DRAGON_DEATH4,
+    S_DRAGON_CRASH1,
+    S_DRAGON_CRASH2,
+    S_DRAGON_CRASH3,
+    S_DRAGON_FX1_1,
+    S_DRAGON_FX1_2,
+    S_DRAGON_FX1_3,
+    S_DRAGON_FX1_4,
+    S_DRAGON_FX1_5,
+    S_DRAGON_FX1_6,
+    S_DRAGON_FX1_X1,
+    S_DRAGON_FX1_X2,
+    S_DRAGON_FX1_X3,
+    S_DRAGON_FX1_X4,
+    S_DRAGON_FX1_X5,
+    S_DRAGON_FX1_X6,
+    S_DRAGON_FX2_1,
+    S_DRAGON_FX2_2,
+    S_DRAGON_FX2_3,
+    S_DRAGON_FX2_4,
+    S_DRAGON_FX2_5,
+    S_DRAGON_FX2_6,
+    S_DRAGON_FX2_7,
+    S_DRAGON_FX2_8,
+    S_DRAGON_FX2_9,
+    S_DRAGON_FX2_10,
+    S_DRAGON_FX2_11,
+    S_ARMOR_1,
+    S_ARMOR_2,
+    S_ARMOR_3,
+    S_ARMOR_4,
+    S_MANA1_1,
+    S_MANA1_2,
+    S_MANA1_3,
+    S_MANA1_4,
+    S_MANA1_5,
+    S_MANA1_6,
+    S_MANA1_7,
+    S_MANA1_8,
+    S_MANA1_9,
+    S_MANA2_1,
+    S_MANA2_2,
+    S_MANA2_3,
+    S_MANA2_4,
+    S_MANA2_5,
+    S_MANA2_6,
+    S_MANA2_7,
+    S_MANA2_8,
+    S_MANA2_9,
+    S_MANA2_10,
+    S_MANA2_11,
+    S_MANA2_12,
+    S_MANA2_13,
+    S_MANA2_14,
+    S_MANA2_15,
+    S_MANA2_16,
+    S_MANA3_1,
+    S_MANA3_2,
+    S_MANA3_3,
+    S_MANA3_4,
+    S_MANA3_5,
+    S_MANA3_6,
+    S_MANA3_7,
+    S_MANA3_8,
+    S_MANA3_9,
+    S_MANA3_10,
+    S_MANA3_11,
+    S_MANA3_12,
+    S_MANA3_13,
+    S_MANA3_14,
+    S_MANA3_15,
+    S_MANA3_16,
+    S_KEY1,
+    S_KEY2,
+    S_KEY3,
+    S_KEY4,
+    S_KEY5,
+    S_KEY6,
+    S_KEY7,
+    S_KEY8,
+    S_KEY9,
+    S_KEYA,
+    S_KEYB,
+    S_SND_WIND1,
+    S_SND_WIND2,
+    S_SND_WATERFALL,
+    S_ETTIN_LOOK1,
+    S_ETTIN_LOOK2,
+    S_ETTIN_CHASE1,
+    S_ETTIN_CHASE2,
+    S_ETTIN_CHASE3,
+    S_ETTIN_CHASE4,
+    S_ETTIN_PAIN1,
+    S_ETTIN_ATK1_1,
+    S_ETTIN_ATK1_2,
+    S_ETTIN_ATK1_3,
+    S_ETTIN_DEATH1_1,
+    S_ETTIN_DEATH1_2,
+    S_ETTIN_DEATH1_3,
+    S_ETTIN_DEATH1_4,
+    S_ETTIN_DEATH1_5,
+    S_ETTIN_DEATH1_6,
+    S_ETTIN_DEATH1_7,
+    S_ETTIN_DEATH1_8,
+    S_ETTIN_DEATH1_9,
+    S_ETTIN_DEATH2_1,
+    S_ETTIN_DEATH2_2,
+    S_ETTIN_DEATH2_3,
+    S_ETTIN_DEATH2_4,
+    S_ETTIN_DEATH2_5,
+    S_ETTIN_DEATH2_6,
+    S_ETTIN_DEATH2_7,
+    S_ETTIN_DEATH2_8,
+    S_ETTIN_DEATH2_9,
+    S_ETTIN_DEATH2_0,
+    S_ETTIN_DEATH2_A,
+    S_ETTIN_DEATH2_B,
+    S_ETTIN_ICE1,
+    S_ETTIN_ICE2,
+    S_ETTIN_MACE1,
+    S_ETTIN_MACE2,
+    S_ETTIN_MACE3,
+    S_ETTIN_MACE4,
+    S_ETTIN_MACE5,
+    S_ETTIN_MACE6,
+    S_ETTIN_MACE7,
+    S_FIRED_SPAWN1,
+    S_FIRED_LOOK1,
+    S_FIRED_LOOK2,
+    S_FIRED_LOOK3,
+    S_FIRED_LOOK4,
+    S_FIRED_LOOK5,
+    S_FIRED_LOOK6,
+    S_FIRED_LOOK7,
+    S_FIRED_LOOK8,
+    S_FIRED_LOOK9,
+    S_FIRED_LOOK0,
+    S_FIRED_LOOKA,
+    S_FIRED_LOOKB,
+    S_FIRED_WALK1,
+    S_FIRED_WALK2,
+    S_FIRED_WALK3,
+    S_FIRED_PAIN1,
+    S_FIRED_ATTACK1,
+    S_FIRED_ATTACK2,
+    S_FIRED_ATTACK3,
+    S_FIRED_ATTACK4,
+    S_FIRED_DEATH1,
+    S_FIRED_DEATH2,
+    S_FIRED_DEATH3,
+    S_FIRED_DEATH4,
+    S_FIRED_XDEATH1,
+    S_FIRED_XDEATH2,
+    S_FIRED_XDEATH3,
+    S_FIRED_ICE1,
+    S_FIRED_ICE2,
+    S_FIRED_CORPSE1,
+    S_FIRED_CORPSE2,
+    S_FIRED_CORPSE3,
+    S_FIRED_CORPSE4,
+    S_FIRED_CORPSE5,
+    S_FIRED_CORPSE6,
+    S_FIRED_RDROP1,
+    S_FIRED_RDEAD1_1,
+    S_FIRED_RDEAD1_2,
+    S_FIRED_RDROP2,
+    S_FIRED_RDEAD2_1,
+    S_FIRED_RDEAD2_2,
+    S_FIRED_RDROP3,
+    S_FIRED_RDEAD3_1,
+    S_FIRED_RDEAD3_2,
+    S_FIRED_RDROP4,
+    S_FIRED_RDEAD4_1,
+    S_FIRED_RDEAD4_2,
+    S_FIRED_RDROP5,
+    S_FIRED_RDEAD5_1,
+    S_FIRED_RDEAD5_2,
+    S_FIRED_FX6_1,
+    S_FIRED_FX6_2,
+    S_FIRED_FX6_3,
+    S_FIRED_FX6_4,
+    S_FIRED_FX6_5,
+    S_ICEGUY_LOOK,
+    S_ICEGUY_DORMANT,
+    S_ICEGUY_WALK1,
+    S_ICEGUY_WALK2,
+    S_ICEGUY_WALK3,
+    S_ICEGUY_WALK4,
+    S_ICEGUY_ATK1,
+    S_ICEGUY_ATK2,
+    S_ICEGUY_ATK3,
+    S_ICEGUY_ATK4,
+    S_ICEGUY_PAIN1,
+    S_ICEGUY_DEATH,
+    S_ICEGUY_FX1,
+    S_ICEGUY_FX2,
+    S_ICEGUY_FX3,
+    S_ICEGUY_FX_X1,
+    S_ICEGUY_FX_X2,
+    S_ICEGUY_FX_X3,
+    S_ICEGUY_FX_X4,
+    S_ICEGUY_FX_X5,
+    S_ICEFX_PUFF1,
+    S_ICEFX_PUFF2,
+    S_ICEFX_PUFF3,
+    S_ICEFX_PUFF4,
+    S_ICEFX_PUFF5,
+    S_ICEGUY_FX2_1,
+    S_ICEGUY_FX2_2,
+    S_ICEGUY_FX2_3,
+    S_ICEGUY_BIT1,
+    S_ICEGUY_BIT2,
+    S_ICEGUY_WISP1_1,
+    S_ICEGUY_WISP1_2,
+    S_ICEGUY_WISP1_3,
+    S_ICEGUY_WISP1_4,
+    S_ICEGUY_WISP1_5,
+    S_ICEGUY_WISP1_6,
+    S_ICEGUY_WISP1_7,
+    S_ICEGUY_WISP1_8,
+    S_ICEGUY_WISP1_9,
+    S_ICEGUY_WISP2_1,
+    S_ICEGUY_WISP2_2,
+    S_ICEGUY_WISP2_3,
+    S_ICEGUY_WISP2_4,
+    S_ICEGUY_WISP2_5,
+    S_ICEGUY_WISP2_6,
+    S_ICEGUY_WISP2_7,
+    S_ICEGUY_WISP2_8,
+    S_ICEGUY_WISP2_9,
+    S_FIGHTER,
+    S_FIGHTER2,
+    S_FIGHTERLOOK,
+    S_FIGHTER_RUN1,
+    S_FIGHTER_RUN2,
+    S_FIGHTER_RUN3,
+    S_FIGHTER_RUN4,
+    S_FIGHTER_ATK1,
+    S_FIGHTER_ATK2,
+    S_FIGHTER_PAIN,
+    S_FIGHTER_PAIN2,
+    S_FIGHTER_DIE1,
+    S_FIGHTER_DIE2,
+    S_FIGHTER_DIE3,
+    S_FIGHTER_DIE4,
+    S_FIGHTER_DIE5,
+    S_FIGHTER_DIE6,
+    S_FIGHTER_DIE7,
+    S_FIGHTER_XDIE1,
+    S_FIGHTER_XDIE2,
+    S_FIGHTER_XDIE3,
+    S_FIGHTER_XDIE4,
+    S_FIGHTER_XDIE5,
+    S_FIGHTER_XDIE6,
+    S_FIGHTER_XDIE7,
+    S_FIGHTER_XDIE8,
+    S_FIGHTER_ICE,
+    S_FIGHTER_ICE2,
+    S_CLERIC,
+    S_CLERIC2,
+    S_CLERICLOOK,
+    S_CLERIC_RUN1,
+    S_CLERIC_RUN2,
+    S_CLERIC_RUN3,
+    S_CLERIC_RUN4,
+    S_CLERIC_ATK1,
+    S_CLERIC_ATK2,
+    S_CLERIC_ATK3,
+    S_CLERIC_PAIN,
+    S_CLERIC_PAIN2,
+    S_CLERIC_DIE1,
+    S_CLERIC_DIE2,
+    S_CLERIC_DIE3,
+    S_CLERIC_DIE4,
+    S_CLERIC_DIE5,
+    S_CLERIC_DIE6,
+    S_CLERIC_DIE7,
+    S_CLERIC_DIE8,
+    S_CLERIC_DIE9,
+    S_CLERIC_XDIE1,
+    S_CLERIC_XDIE2,
+    S_CLERIC_XDIE3,
+    S_CLERIC_XDIE4,
+    S_CLERIC_XDIE5,
+    S_CLERIC_XDIE6,
+    S_CLERIC_XDIE7,
+    S_CLERIC_XDIE8,
+    S_CLERIC_XDIE9,
+    S_CLERIC_XDIE10,
+    S_CLERIC_ICE,
+    S_CLERIC_ICE2,
+    S_MAGE,
+    S_MAGE2,
+    S_MAGELOOK,
+    S_MAGE_RUN1,
+    S_MAGE_RUN2,
+    S_MAGE_RUN3,
+    S_MAGE_RUN4,
+    S_MAGE_ATK1,
+    S_MAGE_ATK2,
+    S_MAGE_PAIN,
+    S_MAGE_PAIN2,
+    S_MAGE_DIE1,
+    S_MAGE_DIE2,
+    S_MAGE_DIE3,
+    S_MAGE_DIE4,
+    S_MAGE_DIE5,
+    S_MAGE_DIE6,
+    S_MAGE_DIE7,
+    S_MAGE_XDIE1,
+    S_MAGE_XDIE2,
+    S_MAGE_XDIE3,
+    S_MAGE_XDIE4,
+    S_MAGE_XDIE5,
+    S_MAGE_XDIE6,
+    S_MAGE_XDIE7,
+    S_MAGE_XDIE8,
+    S_MAGE_XDIE9,
+    S_MAGE_ICE,
+    S_MAGE_ICE2,
+    S_SORC_SPAWN1,
+    S_SORC_SPAWN2,
+    S_SORC_LOOK1,
+    S_SORC_WALK1,
+    S_SORC_WALK2,
+    S_SORC_WALK3,
+    S_SORC_WALK4,
+    S_SORC_PAIN1,
+    S_SORC_PAIN2,
+    S_SORC_ATK2_1,
+    S_SORC_ATK2_2,
+    S_SORC_ATK2_3,
+    S_SORC_ATTACK1,
+    S_SORC_ATTACK2,
+    S_SORC_ATTACK3,
+    S_SORC_ATTACK4,
+    S_SORC_ATTACK5,
+    S_SORC_DIE1,
+    S_SORC_DIE2,
+    S_SORC_DIE3,
+    S_SORC_DIE4,
+    S_SORC_DIE5,
+    S_SORC_DIE6,
+    S_SORC_DIE7,
+    S_SORC_DIE8,
+    S_SORC_DIE9,
+    S_SORC_DIE0,
+    S_SORC_DIEA,
+    S_SORC_DIEB,
+    S_SORC_DIEC,
+    S_SORC_DIED,
+    S_SORC_DIEE,
+    S_SORC_DIEF,
+    S_SORC_DIEG,
+    S_SORC_DIEH,
+    S_SORC_DIEI,
+    S_SORCBALL1_1,
+    S_SORCBALL1_2,
+    S_SORCBALL1_3,
+    S_SORCBALL1_4,
+    S_SORCBALL1_5,
+    S_SORCBALL1_6,
+    S_SORCBALL1_7,
+    S_SORCBALL1_8,
+    S_SORCBALL1_9,
+    S_SORCBALL1_0,
+    S_SORCBALL1_A,
+    S_SORCBALL1_B,
+    S_SORCBALL1_C,
+    S_SORCBALL1_D,
+    S_SORCBALL1_E,
+    S_SORCBALL1_F,
+    S_SORCBALL1_D1,
+    S_SORCBALL1_D2,
+    S_SORCBALL1_D5,
+    S_SORCBALL1_D6,
+    S_SORCBALL1_D7,
+    S_SORCBALL1_D8,
+    S_SORCBALL1_D9,
+    S_SORCBALL2_1,
+    S_SORCBALL2_2,
+    S_SORCBALL2_3,
+    S_SORCBALL2_4,
+    S_SORCBALL2_5,
+    S_SORCBALL2_6,
+    S_SORCBALL2_7,
+    S_SORCBALL2_8,
+    S_SORCBALL2_9,
+    S_SORCBALL2_0,
+    S_SORCBALL2_A,
+    S_SORCBALL2_B,
+    S_SORCBALL2_C,
+    S_SORCBALL2_D,
+    S_SORCBALL2_E,
+    S_SORCBALL2_F,
+    S_SORCBALL2_D1,
+    S_SORCBALL2_D2,
+    S_SORCBALL2_D5,
+    S_SORCBALL2_D6,
+    S_SORCBALL2_D7,
+    S_SORCBALL2_D8,
+    S_SORCBALL2_D9,
+    S_SORCBALL3_1,
+    S_SORCBALL3_2,
+    S_SORCBALL3_3,
+    S_SORCBALL3_4,
+    S_SORCBALL3_5,
+    S_SORCBALL3_6,
+    S_SORCBALL3_7,
+    S_SORCBALL3_8,
+    S_SORCBALL3_9,
+    S_SORCBALL3_0,
+    S_SORCBALL3_A,
+    S_SORCBALL3_B,
+    S_SORCBALL3_C,
+    S_SORCBALL3_D,
+    S_SORCBALL3_E,
+    S_SORCBALL3_F,
+    S_SORCBALL3_D1,
+    S_SORCBALL3_D2,
+    S_SORCBALL3_D5,
+    S_SORCBALL3_D6,
+    S_SORCBALL3_D7,
+    S_SORCBALL3_D8,
+    S_SORCBALL3_D9,
+    S_SORCFX1_1,
+    S_SORCFX1_2,
+    S_SORCFX1_3,
+    S_SORCFX1_4,
+    S_SORCFX1_D1,
+    S_SORCFX1_D2,
+    S_SORCFX1_D3,
+    S_SORCFX2_SPLIT1,
+    S_SORCFX2_ORBIT1,
+    S_SORCFX2_ORBIT2,
+    S_SORCFX2_ORBIT3,
+    S_SORCFX2_ORBIT4,
+    S_SORCFX2_ORBIT5,
+    S_SORCFX2_ORBIT6,
+    S_SORCFX2_ORBIT7,
+    S_SORCFX2_ORBIT8,
+    S_SORCFX2_ORBIT9,
+    S_SORCFX2_ORBIT0,
+    S_SORCFX2_ORBITA,
+    S_SORCFX2_ORBITB,
+    S_SORCFX2_ORBITC,
+    S_SORCFX2_ORBITD,
+    S_SORCFX2_ORBITE,
+    S_SORCFX2_ORBITF,
+    S_SORCFX2T1,
+    S_SORCFX3_1,
+    S_SORCFX3_2,
+    S_SORCFX3_3,
+    S_BISHMORPH1,
+    S_BISHMORPHA,
+    S_BISHMORPHB,
+    S_BISHMORPHC,
+    S_BISHMORPHD,
+    S_BISHMORPHE,
+    S_BISHMORPHF,
+    S_BISHMORPHG,
+    S_BISHMORPHH,
+    S_BISHMORPHI,
+    S_BISHMORPHJ,
+    S_SORCFX3_EXP1,
+    S_SORCFX3_EXP2,
+    S_SORCFX3_EXP3,
+    S_SORCFX3_EXP4,
+    S_SORCFX3_EXP5,
+    S_SORCFX4_1,
+    S_SORCFX4_2,
+    S_SORCFX4_3,
+    S_SORCFX4_D1,
+    S_SORCFX4_D2,
+    S_SORCFX4_D3,
+    S_SORCFX4_D4,
+    S_SORCFX4_D5,
+    S_SORCSPARK1,
+    S_SORCSPARK2,
+    S_SORCSPARK3,
+    S_SORCSPARK4,
+    S_SORCSPARK5,
+    S_SORCSPARK6,
+    S_SORCSPARK7,
+    S_BLASTEFFECT1,
+    S_BLASTEFFECT2,
+    S_BLASTEFFECT3,
+    S_BLASTEFFECT4,
+    S_BLASTEFFECT5,
+    S_BLASTEFFECT6,
+    S_BLASTEFFECT7,
+    S_BLASTEFFECT8,
+    S_BLASTEFFECT9,
+    S_WATERDRIP1,
+    S_KORAX_LOOK1,
+    S_KORAX_CHASE1,
+    S_KORAX_CHASE2,
+    S_KORAX_CHASE3,
+    S_KORAX_CHASE4,
+    S_KORAX_CHASE5,
+    S_KORAX_CHASE6,
+    S_KORAX_CHASE7,
+    S_KORAX_CHASE8,
+    S_KORAX_CHASE9,
+    S_KORAX_CHASE0,
+    S_KORAX_CHASEA,
+    S_KORAX_CHASEB,
+    S_KORAX_CHASEC,
+    S_KORAX_CHASED,
+    S_KORAX_CHASEE,
+    S_KORAX_CHASEF,
+    S_KORAX_PAIN1,
+    S_KORAX_PAIN2,
+    S_KORAX_ATTACK1,
+    S_KORAX_ATTACK2,
+    S_KORAX_MISSILE1,
+    S_KORAX_MISSILE2,
+    S_KORAX_MISSILE3,
+    S_KORAX_COMMAND1,
+    S_KORAX_COMMAND2,
+    S_KORAX_COMMAND3,
+    S_KORAX_COMMAND4,
+    S_KORAX_COMMAND5,
+    S_KORAX_DEATH1,
+    S_KORAX_DEATH2,
+    S_KORAX_DEATH3,
+    S_KORAX_DEATH4,
+    S_KORAX_DEATH5,
+    S_KORAX_DEATH6,
+    S_KORAX_DEATH7,
+    S_KORAX_DEATH8,
+    S_KORAX_DEATH9,
+    S_KORAX_DEATH0,
+    S_KORAX_DEATHA,
+    S_KORAX_DEATHB,
+    S_KORAX_DEATHC,
+    S_KORAX_DEATHD,
+    S_KSPIRIT_ROAM1,
+    S_KSPIRIT_ROAM2,
+    S_KSPIRIT_DEATH1,
+    S_KSPIRIT_DEATH2,
+    S_KSPIRIT_DEATH3,
+    S_KSPIRIT_DEATH4,
+    S_KSPIRIT_DEATH5,
+    S_KSPIRIT_DEATH6,
+    S_KBOLT1,
+    S_KBOLT2,
+    S_KBOLT3,
+    S_KBOLT4,
+    S_KBOLT5,
+    S_KBOLT6,
+    S_KBOLT7,
+    S_SPAWNBATS1,
+    S_SPAWNBATS2,
+    S_SPAWNBATS3,
+    S_SPAWNBATS_OFF,
+    S_BAT1,
+    S_BAT2,
+    S_BAT3,
+    S_BAT_DEATH,
+    NUMSTATES
+} statenum_t;
+
+
+struct mobj_s;
+struct player_s;
+struct pspdef_s;
+
+
+typedef struct
+{
+    spritenum_t sprite;
+    int frame;
+    int tics;
+    void (*action) (struct mobj_s *, struct player_s *, struct pspdef_s *);
+    statenum_t nextstate;
+    int misc1, misc2;
+} state_t;
+
+extern state_t states[NUMSTATES];
+extern const char *sprnames[];
+
+
+
+typedef enum
+{
+    MT_MAPSPOT,
+    MT_MAPSPOTGRAVITY,
+    MT_FIREBALL1,
+    MT_ARROW,
+    MT_DART,
+    MT_POISONDART,
+    MT_RIPPERBALL,
+    MT_PROJECTILE_BLADE,
+    MT_ICESHARD,
+    MT_FLAME_SMALL_TEMP,
+    MT_FLAME_LARGE_TEMP,
+    MT_FLAME_SMALL,
+    MT_FLAME_LARGE,
+    MT_HEALINGBOTTLE,
+    MT_HEALTHFLASK,
+    MT_ARTIFLY,
+    MT_ARTIINVULNERABILITY,
+    MT_SUMMONMAULATOR,
+    MT_SUMMON_FX,
+    MT_THRUSTFLOOR_UP,
+    MT_THRUSTFLOOR_DOWN,
+    MT_TELEPORTOTHER,
+    MT_TELOTHER_FX1,
+    MT_TELOTHER_FX2,
+    MT_TELOTHER_FX3,
+    MT_TELOTHER_FX4,
+    MT_TELOTHER_FX5,
+    MT_DIRT1,
+    MT_DIRT2,
+    MT_DIRT3,
+    MT_DIRT4,
+    MT_DIRT5,
+    MT_DIRT6,
+    MT_DIRTCLUMP,
+    MT_ROCK1,
+    MT_ROCK2,
+    MT_ROCK3,
+    MT_FOGSPAWNER,
+    MT_FOGPATCHS,
+    MT_FOGPATCHM,
+    MT_FOGPATCHL,
+    MT_QUAKE_FOCUS,
+    MT_SGSHARD1,
+    MT_SGSHARD2,
+    MT_SGSHARD3,
+    MT_SGSHARD4,
+    MT_SGSHARD5,
+    MT_SGSHARD6,
+    MT_SGSHARD7,
+    MT_SGSHARD8,
+    MT_SGSHARD9,
+    MT_SGSHARD0,
+    MT_ARTIEGG,
+    MT_EGGFX,
+    MT_ARTISUPERHEAL,
+    MT_ZWINGEDSTATUENOSKULL,
+    MT_ZGEMPEDESTAL,
+    MT_ARTIPUZZSKULL,
+    MT_ARTIPUZZGEMBIG,
+    MT_ARTIPUZZGEMRED,
+    MT_ARTIPUZZGEMGREEN1,
+    MT_ARTIPUZZGEMGREEN2,
+    MT_ARTIPUZZGEMBLUE1,
+    MT_ARTIPUZZGEMBLUE2,
+    MT_ARTIPUZZBOOK1,
+    MT_ARTIPUZZBOOK2,
+    MT_ARTIPUZZSKULL2,
+    MT_ARTIPUZZFWEAPON,
+    MT_ARTIPUZZCWEAPON,
+    MT_ARTIPUZZMWEAPON,
+    MT_ARTIPUZZGEAR,
+    MT_ARTIPUZZGEAR2,
+    MT_ARTIPUZZGEAR3,
+    MT_ARTIPUZZGEAR4,
+    MT_ARTITORCH,
+    MT_FIREBOMB,
+    MT_ARTITELEPORT,
+    MT_ARTIPOISONBAG,
+    MT_POISONBAG,
+    MT_POISONCLOUD,
+    MT_THROWINGBOMB,
+    MT_SPEEDBOOTS,
+    MT_BOOSTMANA,
+    MT_BOOSTARMOR,
+    MT_BLASTRADIUS,
+    MT_HEALRADIUS,
+    MT_SPLASH,
+    MT_SPLASHBASE,
+    MT_LAVASPLASH,
+    MT_LAVASMOKE,
+    MT_SLUDGECHUNK,
+    MT_SLUDGESPLASH,
+    MT_MISC0,
+    MT_MISC1,
+    MT_MISC2,
+    MT_MISC3,
+    MT_MISC4,
+    MT_MISC5,
+    MT_MISC6,
+    MT_MISC7,
+    MT_MISC8,
+    MT_TREEDESTRUCTIBLE,
+    MT_MISC9,
+    MT_MISC10,
+    MT_MISC11,
+    MT_MISC12,
+    MT_MISC13,
+    MT_MISC14,
+    MT_MISC15,
+    MT_MISC16,
+    MT_MISC17,
+    MT_MISC18,
+    MT_MISC19,
+    MT_MISC20,
+    MT_MISC21,
+    MT_MISC22,
+    MT_MISC23,
+    MT_MISC24,
+    MT_MISC25,
+    MT_MISC26,
+    MT_MISC27,
+    MT_MISC28,
+    MT_MISC29,
+    MT_MISC30,
+    MT_MISC31,
+    MT_MISC32,
+    MT_MISC33,
+    MT_MISC34,
+    MT_MISC35,
+    MT_MISC36,
+    MT_MISC37,
+    MT_MISC38,
+    MT_MISC39,
+    MT_MISC40,
+    MT_MISC41,
+    MT_MISC42,
+    MT_MISC43,
+    MT_MISC44,
+    MT_MISC45,
+    MT_MISC46,
+    MT_MISC47,
+    MT_MISC48,
+    MT_MISC49,
+    MT_MISC50,
+    MT_MISC51,
+    MT_MISC52,
+    MT_MISC53,
+    MT_MISC54,
+    MT_MISC55,
+    MT_MISC56,
+    MT_MISC57,
+    MT_MISC58,
+    MT_MISC59,
+    MT_MISC60,
+    MT_MISC61,
+    MT_MISC62,
+    MT_MISC63,
+    MT_MISC64,
+    MT_MISC65,
+    MT_MISC66,
+    MT_MISC67,
+    MT_MISC68,
+    MT_MISC69,
+    MT_MISC70,
+    MT_MISC71,
+    MT_MISC72,
+    MT_MISC73,
+    MT_MISC74,
+    MT_MISC75,
+    MT_MISC76,
+    MT_POTTERY1,
+    MT_POTTERY2,
+    MT_POTTERY3,
+    MT_POTTERYBIT1,
+    MT_MISC77,
+    MT_ZLYNCHED_NOHEART,
+    MT_MISC78,
+    MT_CORPSEBIT,
+    MT_CORPSEBLOODDRIP,
+    MT_BLOODPOOL,
+    MT_MISC79,
+    MT_MISC80,
+    MT_LEAF1,
+    MT_LEAF2,
+    MT_ZTWINEDTORCH,
+    MT_ZTWINEDTORCH_UNLIT,
+    MT_BRIDGE,
+    MT_BRIDGEBALL,
+    MT_ZWALLTORCH,
+    MT_ZWALLTORCH_UNLIT,
+    MT_ZBARREL,
+    MT_ZSHRUB1,
+    MT_ZSHRUB2,
+    MT_ZBUCKET,
+    MT_ZPOISONSHROOM,
+    MT_ZFIREBULL,
+    MT_ZFIREBULL_UNLIT,
+    MT_FIRETHING,
+    MT_BRASSTORCH,
+    MT_ZSUITOFARMOR,
+    MT_ZARMORCHUNK,
+    MT_ZBELL,
+    MT_ZBLUE_CANDLE,
+    MT_ZIRON_MAIDEN,
+    MT_ZXMAS_TREE,
+    MT_ZCAULDRON,
+    MT_ZCAULDRON_UNLIT,
+    MT_ZCHAINBIT32,
+    MT_ZCHAINBIT64,
+    MT_ZCHAINEND_HEART,
+    MT_ZCHAINEND_HOOK1,
+    MT_ZCHAINEND_HOOK2,
+    MT_ZCHAINEND_SPIKE,
+    MT_ZCHAINEND_SKULL,
+    MT_TABLE_SHIT1,
+    MT_TABLE_SHIT2,
+    MT_TABLE_SHIT3,
+    MT_TABLE_SHIT4,
+    MT_TABLE_SHIT5,
+    MT_TABLE_SHIT6,
+    MT_TABLE_SHIT7,
+    MT_TABLE_SHIT8,
+    MT_TABLE_SHIT9,
+    MT_TABLE_SHIT10,
+    MT_TFOG,
+    MT_MISC81,
+    MT_TELEPORTMAN,
+    MT_PUNCHPUFF,
+    MT_FW_AXE,
+    MT_AXEPUFF,
+    MT_AXEPUFF_GLOW,
+    MT_AXEBLOOD,
+    MT_FW_HAMMER,
+    MT_HAMMER_MISSILE,
+    MT_HAMMERPUFF,
+    MT_FSWORD_MISSILE,
+    MT_FSWORD_FLAME,
+    MT_CW_SERPSTAFF,
+    MT_CSTAFF_MISSILE,
+    MT_CSTAFFPUFF,
+    MT_CW_FLAME,
+    MT_CFLAMEFLOOR,
+    MT_FLAMEPUFF,
+    MT_FLAMEPUFF2,
+    MT_CIRCLEFLAME,
+    MT_CFLAME_MISSILE,
+    MT_HOLY_FX,
+    MT_HOLY_TAIL,
+    MT_HOLY_PUFF,
+    MT_HOLY_MISSILE,
+    MT_HOLY_MISSILE_PUFF,
+    MT_MWANDPUFF,
+    MT_MWANDSMOKE,
+    MT_MWAND_MISSILE,
+    MT_MW_LIGHTNING,
+    MT_LIGHTNING_CEILING,
+    MT_LIGHTNING_FLOOR,
+    MT_LIGHTNING_ZAP,
+    MT_MSTAFF_FX,
+    MT_MSTAFF_FX2,
+    MT_FW_SWORD1,
+    MT_FW_SWORD2,
+    MT_FW_SWORD3,
+    MT_CW_HOLY1,
+    MT_CW_HOLY2,
+    MT_CW_HOLY3,
+    MT_MW_STAFF1,
+    MT_MW_STAFF2,
+    MT_MW_STAFF3,
+    MT_SNOUTPUFF,
+    MT_MW_CONE,
+    MT_SHARDFX1,
+    MT_BLOOD,
+    MT_BLOODSPLATTER,
+    MT_GIBS,
+    MT_PLAYER_FIGHTER,
+    MT_BLOODYSKULL,
+    MT_PLAYER_SPEED,
+    MT_ICECHUNK,
+    MT_PLAYER_CLERIC,
+    MT_PLAYER_MAGE,
+    MT_PIGPLAYER,
+    MT_PIG,
+    MT_CENTAUR,
+    MT_CENTAURLEADER,
+    MT_CENTAUR_FX,
+    MT_CENTAUR_SHIELD,
+    MT_CENTAUR_SWORD,
+    MT_DEMON,
+    MT_DEMONCHUNK1,
+    MT_DEMONCHUNK2,
+    MT_DEMONCHUNK3,
+    MT_DEMONCHUNK4,
+    MT_DEMONCHUNK5,
+    MT_DEMONFX1,
+    MT_DEMON2,
+    MT_DEMON2CHUNK1,
+    MT_DEMON2CHUNK2,
+    MT_DEMON2CHUNK3,
+    MT_DEMON2CHUNK4,
+    MT_DEMON2CHUNK5,
+    MT_DEMON2FX1,
+    MT_WRAITHB,
+    MT_WRAITH,
+    MT_WRAITHFX1,
+    MT_WRAITHFX2,
+    MT_WRAITHFX3,
+    MT_WRAITHFX4,
+    MT_WRAITHFX5,
+    MT_MINOTAUR,
+    MT_MNTRFX1,
+    MT_MNTRFX2,
+    MT_MNTRFX3,
+    MT_MNTRSMOKE,
+    MT_MNTRSMOKEEXIT,
+    MT_SERPENT,
+    MT_SERPENTLEADER,
+    MT_SERPENTFX,
+    MT_SERPENT_HEAD,
+    MT_SERPENT_GIB1,
+    MT_SERPENT_GIB2,
+    MT_SERPENT_GIB3,
+    MT_BISHOP,
+    MT_BISHOP_PUFF,
+    MT_BISHOPBLUR,
+    MT_BISHOPPAINBLUR,
+    MT_BISH_FX,
+    MT_DRAGON,
+    MT_DRAGON_FX,
+    MT_DRAGON_FX2,
+    MT_ARMOR_1,
+    MT_ARMOR_2,
+    MT_ARMOR_3,
+    MT_ARMOR_4,
+    MT_MANA1,
+    MT_MANA2,
+    MT_MANA3,
+    MT_KEY1,
+    MT_KEY2,
+    MT_KEY3,
+    MT_KEY4,
+    MT_KEY5,
+    MT_KEY6,
+    MT_KEY7,
+    MT_KEY8,
+    MT_KEY9,
+    MT_KEYA,
+    MT_KEYB,
+    MT_SOUNDWIND,
+    MT_SOUNDWATERFALL,
+    MT_ETTIN,
+    MT_ETTIN_MACE,
+    MT_FIREDEMON,
+    MT_FIREDEMON_SPLOTCH1,
+    MT_FIREDEMON_SPLOTCH2,
+    MT_FIREDEMON_FX1,
+    MT_FIREDEMON_FX2,
+    MT_FIREDEMON_FX3,
+    MT_FIREDEMON_FX4,
+    MT_FIREDEMON_FX5,
+    MT_FIREDEMON_FX6,
+    MT_ICEGUY,
+    MT_ICEGUY_FX,
+    MT_ICEFX_PUFF,
+    MT_ICEGUY_FX2,
+    MT_ICEGUY_BIT,
+    MT_ICEGUY_WISP1,
+    MT_ICEGUY_WISP2,
+    MT_FIGHTER_BOSS,
+    MT_CLERIC_BOSS,
+    MT_MAGE_BOSS,
+    MT_SORCBOSS,
+    MT_SORCBALL1,
+    MT_SORCBALL2,
+    MT_SORCBALL3,
+    MT_SORCFX1,
+    MT_SORCFX2,
+    MT_SORCFX2_T1,
+    MT_SORCFX3,
+    MT_SORCFX3_EXPLOSION,
+    MT_SORCFX4,
+    MT_SORCSPARK1,
+    MT_BLASTEFFECT,
+    MT_WATER_DRIP,
+    MT_KORAX,
+    MT_KORAX_SPIRIT1,
+    MT_KORAX_SPIRIT2,
+    MT_KORAX_SPIRIT3,
+    MT_KORAX_SPIRIT4,
+    MT_KORAX_SPIRIT5,
+    MT_KORAX_SPIRIT6,
+    MT_DEMON_MASH,
+    MT_DEMON2_MASH,
+    MT_ETTIN_MASH,
+    MT_CENTAUR_MASH,
+    MT_KORAX_BOLT,
+    MT_BAT_SPAWNER,
+    MT_BAT,
+    NUMMOBJTYPES
+} mobjtype_t;
+
+typedef struct
+{
+    int doomednum;
+    int spawnstate;
+    int spawnhealth;
+    int seestate;
+    int seesound;
+    int reactiontime;
+    int attacksound;
+    int painstate;
+    int painchance;
+    int painsound;
+    int meleestate;
+    int missilestate;
+    int crashstate;
+    int deathstate;
+    int xdeathstate;
+    int deathsound;
+    int speed;
+    int radius;
+    int height;
+    int mass;
+    int damage;
+    int activesound;
+    int flags;
+    int flags2;
+} mobjinfo_t;
+
+extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
diff --git a/games/NXDoom/src/hexen/m_random.c b/games/NXDoom/src/hexen/m_random.c
new file mode 100644
index 000000000..422b1a5d4
--- /dev/null
+++ b/games/NXDoom/src/hexen/m_random.c
@@ -0,0 +1,80 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "m_random.h"
+
+// This is the new flat distribution table
+
+static const unsigned char rndtable[256] = {
+    201, 1, 243, 19, 18, 42, 183, 203, 101, 123, 154, 137, 34, 118, 10, 216,
+    135, 246, 0, 107, 133, 229, 35, 113, 177, 211, 110, 17, 139, 84, 251, 235,
+    182, 166, 161, 230, 143, 91, 24, 81, 22, 94, 7, 51, 232, 104, 122, 248,
+    175, 138, 127, 171, 222, 213, 44, 16, 9, 33, 88, 102, 170, 150, 136, 114,
+    62, 3, 142, 237, 6, 252, 249, 56, 74, 30, 13, 21, 180, 199, 32, 132,
+    187, 234, 78, 210, 46, 131, 197, 8, 206, 244, 73, 4, 236, 178, 195, 70,
+    121, 97, 167, 217, 103, 40, 247, 186, 105, 39, 95, 163, 99, 149, 253, 29,
+    119, 83, 254, 26, 202, 65, 130, 155, 60, 64, 184, 106, 221, 93, 164, 196,
+    112, 108, 179, 141, 54, 109, 11, 126, 75, 165, 191, 227, 87, 225, 156, 15,
+    98, 162, 116, 79, 169, 140, 190, 205, 168, 194, 41, 250, 27, 20, 14, 241,
+    50, 214, 72, 192, 220, 233, 67, 148, 96, 185, 176, 181, 215, 207, 172, 85,
+    89, 90, 209, 128, 124, 2, 55, 173, 66, 152, 47, 129, 59, 43, 159, 240,
+    239, 12, 189, 212, 144, 28, 200, 77, 219, 198, 134, 228, 45, 92, 125, 151,
+    5, 53, 255, 52, 68, 245, 160, 158, 61, 86, 58, 82, 117, 37, 242, 145,
+    69, 188, 115, 76, 63, 100, 49, 111, 153, 80, 38, 57, 174, 224, 71, 231,
+    23, 25, 48, 218, 120, 147, 208, 36, 226, 223, 193, 238, 157, 204, 146, 31
+};
+
+
+int rndindex = 0;
+int prndindex = 0;
+
+/*
+===============
+=
+= M_Random
+=
+= Returns a 0-255 number
+=
+===============
+*/
+
+
+int P_Random(void)
+{
+    prndindex = (prndindex + 1) & 0xff;
+    return rndtable[prndindex];
+}
+
+int M_Random(void)
+{
+    rndindex = (rndindex + 1) & 0xff;
+    return rndtable[rndindex];
+}
+
+void M_ClearRandom(void)
+{
+    rndindex = prndindex = 0;
+}
+
+// inspired by the same routine in Eternity, thanks haleyjd
+int P_SubRandom (void)
+{
+    int r = P_Random();
+    return r - P_Random();
+}
diff --git a/games/NXDoom/src/hexen/m_random.h b/games/NXDoom/src/hexen/m_random.h
new file mode 100644
index 000000000..2de763001
--- /dev/null
+++ b/games/NXDoom/src/hexen/m_random.h
@@ -0,0 +1,37 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef HEXEN_M_RANDOM_H
+#define HEXEN_M_RANDOM_H
+
+// Most damage defined using HITDICE
+#define HITDICE(a) ((1+(P_Random()&7))*a)
+
+int M_Random(void);
+// returns a number from 0 to 255
+int P_Random(void);
+// as M_Random, but used only by the play simulation
+
+void M_ClearRandom(void);
+// fix randoms for demos
+
+extern int rndindex;
+
+// Defined version of P_Random() - P_Random()
+int P_SubRandom (void);
+
+#endif // HEXEN_M_RANDOM_H
+
diff --git a/games/NXDoom/src/hexen/mn_menu.c b/games/NXDoom/src/hexen/mn_menu.c
new file mode 100644
index 000000000..57be51c9c
--- /dev/null
+++ b/games/NXDoom/src/hexen/mn_menu.c
@@ -0,0 +1,1952 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include <ctype.h>
+#include "h2def.h"
+#include "doomkeys.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_swap.h"
+#include "i_video.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "r_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+#include "am_map.h"
+
+
+// MACROS ------------------------------------------------------------------
+
+#define LEFT_DIR 0
+#define RIGHT_DIR 1
+#define ITEM_HEIGHT 20
+#define SELECTOR_XOFFSET (-28)
+#define SELECTOR_YOFFSET (-1)
+#define SLOTTEXTLEN	16
+#define ASCII_CURSOR '['
+
+// TYPES -------------------------------------------------------------------
+
+typedef enum
+{
+    ITT_EMPTY,
+    ITT_EFUNC,
+    ITT_LRFUNC,
+    ITT_SETMENU,
+    ITT_INERT
+} ItemType_t;
+
+typedef enum
+{
+    MENU_MAIN,
+    MENU_CLASS,
+    MENU_SKILL,
+    MENU_OPTIONS,
+    MENU_OPTIONS2,
+    MENU_FILES,
+    MENU_LOAD,
+    MENU_SAVE,
+    MENU_NONE
+} MenuType_t;
+
+typedef struct
+{
+    ItemType_t type;
+    const char *text;
+    void (*func) (int option);
+    int option;
+    MenuType_t menu;
+} MenuItem_t;
+
+typedef struct
+{
+    int x;
+    int y;
+    void (*drawFunc) (void);
+    int itemCount;
+    MenuItem_t *items;
+    int oldItPos;
+    MenuType_t prevMenu;
+} Menu_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void InitFonts(void);
+static void SetMenu(MenuType_t menu);
+static void SCQuitGame(int option);
+static void SCClass(int option);
+static void SCSkill(int option);
+static void SCMouseSensi(int option);
+static void SCSfxVolume(int option);
+static void SCMusicVolume(int option);
+static void SCScreenSize(int option);
+static boolean SCNetCheck(int option);
+static void SCNetCheck2(int option);
+static void SCLoadGame(int option);
+static void SCSaveGame(int option);
+static void SCMessages(int option);
+static void SCEndGame(int option);
+static void SCInfo(int option);
+static void DrawMainMenu(void);
+static void DrawClassMenu(void);
+static void DrawSkillMenu(void);
+static void DrawOptionsMenu(void);
+static void DrawOptions2Menu(void);
+static void DrawFileSlots(Menu_t * menu);
+static void DrawFilesMenu(void);
+static void MN_DrawInfo(void);
+static void DrawLoadMenu(void);
+static void DrawSaveMenu(void);
+static void DrawSlider(Menu_t * menu, int item, int width, int slot);
+void MN_LoadSlotText(void);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+boolean MenuActive;
+int InfoType;
+int messageson = true;
+boolean mn_SuicideConsole;
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int FontABaseLump;
+static int FontAYellowBaseLump;
+static int FontBBaseLump;
+static int MauloBaseLump;
+static Menu_t *CurrentMenu;
+static int CurrentItPos;
+static int MenuPClass;
+static int MenuTime;
+static boolean soundchanged;
+
+boolean askforquit;
+static int typeofask;
+static boolean FileMenuKeySteal;
+static boolean slottextloaded;
+static boolean joypadsave;
+static char SlotText[6][SLOTTEXTLEN + 2];
+static char oldSlotText[SLOTTEXTLEN + 2];
+static int SlotStatus[6];
+static int slotptr;
+static int currentSlot;
+static int quicksave;
+static int quickload;
+
+static MenuItem_t MainItems[] = {
+    {ITT_SETMENU, "NEW GAME", SCNetCheck2, 1, MENU_CLASS},
+    {ITT_SETMENU, "OPTIONS", NULL, 0, MENU_OPTIONS},
+    {ITT_SETMENU, "GAME FILES", NULL, 0, MENU_FILES},
+    {ITT_EFUNC, "INFO", SCInfo, 0, MENU_NONE},
+    {ITT_EFUNC, "QUIT GAME", SCQuitGame, 0, MENU_NONE}
+};
+
+static Menu_t MainMenu = {
+    110, 56,
+    DrawMainMenu,
+    5, MainItems,
+    0,
+    MENU_NONE
+};
+
+static MenuItem_t ClassItems[] = {
+    {ITT_EFUNC, "FIGHTER", SCClass, 0, MENU_NONE},
+    {ITT_EFUNC, "CLERIC", SCClass, 1, MENU_NONE},
+    {ITT_EFUNC, "MAGE", SCClass, 2, MENU_NONE}
+};
+
+static Menu_t ClassMenu = {
+    66, 66,
+    DrawClassMenu,
+    3, ClassItems,
+    0,
+    MENU_MAIN
+};
+
+static MenuItem_t FilesItems[] = {
+    {ITT_SETMENU, "LOAD GAME", SCNetCheck2, 2, MENU_LOAD},
+    {ITT_SETMENU, "SAVE GAME", NULL, 0, MENU_SAVE}
+};
+
+static Menu_t FilesMenu = {
+    110, 60,
+    DrawFilesMenu,
+    2, FilesItems,
+    0,
+    MENU_MAIN
+};
+
+static MenuItem_t LoadItems[] = {
+    {ITT_EFUNC, NULL, SCLoadGame, 0, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 1, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 2, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 3, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 4, MENU_NONE},
+    {ITT_EFUNC, NULL, SCLoadGame, 5, MENU_NONE}
+};
+
+static Menu_t LoadMenu = {
+    70, 30,
+    DrawLoadMenu,
+    6, LoadItems,
+    0,
+    MENU_FILES
+};
+
+static MenuItem_t SaveItems[] = {
+    {ITT_EFUNC, NULL, SCSaveGame, 0, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 1, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 2, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 3, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 4, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSaveGame, 5, MENU_NONE}
+};
+
+static Menu_t SaveMenu = {
+    70, 30,
+    DrawSaveMenu,
+    6, SaveItems,
+    0,
+    MENU_FILES
+};
+
+static MenuItem_t SkillItems[] = {
+    {ITT_EFUNC, NULL, SCSkill, sk_baby, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSkill, sk_easy, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSkill, sk_medium, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSkill, sk_hard, MENU_NONE},
+    {ITT_EFUNC, NULL, SCSkill, sk_nightmare, MENU_NONE}
+};
+
+static Menu_t SkillMenu = {
+    120, 44,
+    DrawSkillMenu,
+    5, SkillItems,
+    2,
+    MENU_CLASS
+};
+
+static MenuItem_t OptionsItems[] = {
+    {ITT_EFUNC, "END GAME", SCEndGame, 0, MENU_NONE},
+    {ITT_EFUNC, "MESSAGES : ", SCMessages, 0, MENU_NONE},
+    {ITT_LRFUNC, "MOUSE SENSITIVITY", SCMouseSensi, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_SETMENU, "MORE...", NULL, 0, MENU_OPTIONS2}
+};
+
+static Menu_t OptionsMenu = {
+    88, 30,
+    DrawOptionsMenu,
+    5, OptionsItems,
+    0,
+    MENU_MAIN
+};
+
+static MenuItem_t Options2Items[] = {
+    {ITT_LRFUNC, "SCREEN SIZE", SCScreenSize, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_LRFUNC, "SFX VOLUME", SCSfxVolume, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_LRFUNC, "MUSIC VOLUME", SCMusicVolume, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE}
+};
+
+static Menu_t Options2Menu = {
+    90, 20,
+    DrawOptions2Menu,
+    6, Options2Items,
+    0,
+    MENU_OPTIONS
+};
+
+static Menu_t *Menus[] = {
+    &MainMenu,
+    &ClassMenu,
+    &SkillMenu,
+    &OptionsMenu,
+    &Options2Menu,
+    &FilesMenu,
+    &LoadMenu,
+    &SaveMenu
+};
+
+static const char *GammaText[] = {
+    TXT_GAMMA_LEVEL_OFF,
+    TXT_GAMMA_LEVEL_1,
+    TXT_GAMMA_LEVEL_2,
+    TXT_GAMMA_LEVEL_3,
+    TXT_GAMMA_LEVEL_4
+};
+
+// CODE --------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_Init
+//
+//---------------------------------------------------------------------------
+
+void MN_Init(void)
+{
+    InitFonts();
+    MenuActive = false;
+//      messageson = true;              // Set by defaults in .CFG
+    MauloBaseLump = W_GetNumForName("FBULA0");  // ("M_SKL00");
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC InitFonts
+//
+//---------------------------------------------------------------------------
+
+static void InitFonts(void)
+{
+    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
+    FontAYellowBaseLump = W_GetNumForName("FONTAY_S") + 1;
+    FontBBaseLump = W_GetNumForName("FONTB_S") + 1;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DrTextA
+//
+// Draw text using font A.
+//
+//---------------------------------------------------------------------------
+
+void MN_DrTextA(const char *text, int x, int y)
+{
+    char c;
+    patch_t *p;
+
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            x += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+            V_DrawPatch(x, y, p);
+            x += SHORT(p->width) - 1;
+        }
+    }
+}
+
+//==========================================================================
+//
+// MN_DrTextAYellow
+//
+//==========================================================================
+
+void MN_DrTextAYellow(const char *text, int x, int y)
+{
+    char c;
+    patch_t *p;
+
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            x += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontAYellowBaseLump + c - 33, PU_CACHE);
+            V_DrawPatch(x, y, p);
+            x += SHORT(p->width) - 1;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC MN_TextAWidth
+//
+// Returns the pixel width of a string using font A.
+//
+//---------------------------------------------------------------------------
+
+int MN_TextAWidth(const char *text)
+{
+    char c;
+    int width;
+    patch_t *p;
+
+    width = 0;
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            width += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
+            width += SHORT(p->width) - 1;
+        }
+    }
+    return (width);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DrTextB
+//
+// Draw text using font B.
+//
+//---------------------------------------------------------------------------
+
+void MN_DrTextB(const char *text, int x, int y)
+{
+    char c;
+    patch_t *p;
+
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            x += 8;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
+            V_DrawPatch(x, y, p);
+            x += SHORT(p->width) - 1;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC MN_TextBWidth
+//
+// Returns the pixel width of a string using font B.
+//
+//---------------------------------------------------------------------------
+
+int MN_TextBWidth(const char *text)
+{
+    char c;
+    int width;
+    patch_t *p;
+
+    width = 0;
+    while ((c = *text++) != 0)
+    {
+        if (c < 33)
+        {
+            width += 5;
+        }
+        else
+        {
+            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
+            width += SHORT(p->width) - 1;
+        }
+    }
+    return (width);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_Ticker
+//
+//---------------------------------------------------------------------------
+
+void MN_Ticker(void)
+{
+    if (MenuActive == false)
+    {
+        return;
+    }
+    MenuTime++;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_Drawer
+//
+//---------------------------------------------------------------------------
+
+const char *QuitEndMsg[] = {
+    "ARE YOU SURE YOU WANT TO QUIT?",
+    "ARE YOU SURE YOU WANT TO END THE GAME?",
+    "DO YOU WANT TO QUICKSAVE THE GAME NAMED",
+    "DO YOU WANT TO QUICKLOAD THE GAME NAMED",
+    "ARE YOU SURE YOU WANT TO SUICIDE?"
+};
+
+void MN_Drawer(void)
+{
+    int i;
+    int x;
+    int y;
+    MenuItem_t *item;
+    const char *selName;
+
+    if (MenuActive == false)
+    {
+        if (askforquit)
+        {
+            MN_DrTextA(QuitEndMsg[typeofask - 1], 160 -
+                       MN_TextAWidth(QuitEndMsg[typeofask - 1]) / 2, 80);
+            if (typeofask == 3)
+            {
+                MN_DrTextA(SlotText[quicksave - 1], 160 -
+                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
+                MN_DrTextA("?", 160 +
+                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
+            }
+            if (typeofask == 4)
+            {
+                MN_DrTextA(SlotText[quickload - 1], 160 -
+                           MN_TextAWidth(SlotText[quickload - 1]) / 2, 90);
+                MN_DrTextA("?", 160 +
+                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
+            }
+            UpdateState |= I_FULLSCRN;
+        }
+        return;
+    }
+    else
+    {
+        UpdateState |= I_FULLSCRN;
+        if (InfoType)
+        {
+            MN_DrawInfo();
+            return;
+        }
+        if (screenblocks < 10)
+        {
+            BorderNeedRefresh = true;
+        }
+        if (CurrentMenu->drawFunc != NULL)
+        {
+            CurrentMenu->drawFunc();
+        }
+        x = CurrentMenu->x;
+        y = CurrentMenu->y;
+        item = CurrentMenu->items;
+        for (i = 0; i < CurrentMenu->itemCount; i++)
+        {
+            if (item->type != ITT_EMPTY && item->text)
+            {
+                MN_DrTextB(item->text, x, y);
+            }
+            y += ITEM_HEIGHT;
+            item++;
+        }
+        y = CurrentMenu->y + (CurrentItPos * ITEM_HEIGHT) + SELECTOR_YOFFSET;
+        selName = MenuTime & 16 ? "M_SLCTR1" : "M_SLCTR2";
+        V_DrawPatch(x + SELECTOR_XOFFSET, y,
+                    W_CacheLumpName(selName, PU_CACHE));
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawMainMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawMainMenu(void)
+{
+    int frame;
+
+    frame = (MenuTime / 5) % 7;
+    V_DrawPatch(88, 0, W_CacheLumpName("M_HTIC", PU_CACHE));
+// Old Gold skull positions: (40, 10) and (232, 10)
+    V_DrawPatch(37, 80, W_CacheLumpNum(MauloBaseLump + (frame + 2) % 7,
+                                       PU_CACHE));
+    V_DrawPatch(278, 80, W_CacheLumpNum(MauloBaseLump + frame, PU_CACHE));
+}
+
+//==========================================================================
+//
+// DrawClassMenu
+//
+//==========================================================================
+
+static void DrawClassMenu(void)
+{
+    pclass_t class;
+    static const char *boxLumpName[3] = {
+        "m_fbox",
+        "m_cbox",
+        "m_mbox"
+    };
+    static const char *walkLumpName[3] = {
+        "m_fwalk1",
+        "m_cwalk1",
+        "m_mwalk1"
+    };
+
+    MN_DrTextB("CHOOSE CLASS:", 34, 24);
+    class = (pclass_t) CurrentMenu->items[CurrentItPos].option;
+    V_DrawPatch(174, 8, W_CacheLumpName(boxLumpName[class], PU_CACHE));
+    V_DrawPatch(174 + 24, 8 + 12,
+                W_CacheLumpNum(W_GetNumForName(walkLumpName[class])
+                               + ((MenuTime >> 3) & 3), PU_CACHE));
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSkillMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawSkillMenu(void)
+{
+    MN_DrTextB("CHOOSE SKILL LEVEL:", 74, 16);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawFilesMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawFilesMenu(void)
+{
+// clear out the quicksave/quickload stuff
+    quicksave = 0;
+    quickload = 0;
+    P_ClearMessage(&players[consoleplayer]);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawLoadMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawLoadMenu(void)
+{
+    MN_DrTextB("LOAD GAME", 160 - MN_TextBWidth("LOAD GAME") / 2, 10);
+    if (!slottextloaded)
+    {
+        MN_LoadSlotText();
+    }
+    DrawFileSlots(&LoadMenu);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSaveMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawSaveMenu(void)
+{
+    MN_DrTextB("SAVE GAME", 160 - MN_TextBWidth("SAVE GAME") / 2, 10);
+    if (!slottextloaded)
+    {
+        MN_LoadSlotText();
+    }
+    DrawFileSlots(&SaveMenu);
+}
+
+static boolean ReadDescriptionForSlot(int slot, char *description)
+{
+    FILE *fp;
+    boolean found;
+    char name[100];
+    char versionText[HXS_VERSION_TEXT_LENGTH];
+
+    M_snprintf(name, sizeof(name), "%shex%d.hxs", SavePath, slot);
+
+    fp = M_fopen(name, "rb");
+
+    if (fp == NULL)
+    {
+        return false;
+    }
+
+    found = fread(description, HXS_DESCRIPTION_LENGTH, 1, fp) == 1
+         && fread(versionText, HXS_VERSION_TEXT_LENGTH, 1, fp) == 1;
+
+    found = found && strcmp(versionText, HXS_VERSION_TEXT) == 0;
+
+    fclose(fp);
+
+    return found;
+}
+
+//===========================================================================
+//
+// MN_LoadSlotText
+//
+// For each slot, looks for save games and reads the description field.
+//
+//===========================================================================
+
+void MN_LoadSlotText(void)
+{
+    char description[HXS_DESCRIPTION_LENGTH];
+    int slot;
+
+    for (slot = 0; slot < 6; slot++)
+    {
+        if (ReadDescriptionForSlot(slot, description))
+        {
+            memcpy(SlotText[slot], description, SLOTTEXTLEN);
+            SlotStatus[slot] = 1;
+        }
+        else
+        {
+            memset(SlotText[slot], 0, SLOTTEXTLEN);
+            SlotStatus[slot] = 0;
+        }
+    }
+    slottextloaded = true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawFileSlots
+//
+//---------------------------------------------------------------------------
+
+static void DrawFileSlots(Menu_t * menu)
+{
+    int i;
+    int x;
+    int y;
+
+    x = menu->x;
+    y = menu->y;
+    for (i = 0; i < 6; i++)
+    {
+        V_DrawPatch(x, y, W_CacheLumpName("M_FSLOT", PU_CACHE));
+        if (SlotStatus[i])
+        {
+            MN_DrTextA(SlotText[i], x + 5, y + 5);
+        }
+        y += ITEM_HEIGHT;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawOptionsMenu
+//
+//---------------------------------------------------------------------------
+
+static void DrawOptionsMenu(void)
+{
+    if (messageson)
+    {
+        MN_DrTextB("ON", 196, 50);
+    }
+    else
+    {
+        MN_DrTextB("OFF", 196, 50);
+    }
+    DrawSlider(&OptionsMenu, 3, 10, mouseSensitivity);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawOptions2Menu
+//
+//---------------------------------------------------------------------------
+
+static void DrawOptions2Menu(void)
+{
+    DrawSlider(&Options2Menu, 1, 9, screenblocks - 3);
+    DrawSlider(&Options2Menu, 3, 16, snd_MaxVolume);
+    DrawSlider(&Options2Menu, 5, 16, snd_MusicVolume);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCQuitGame
+//
+//---------------------------------------------------------------------------
+
+static void SCQuitGame(int option)
+{
+    MenuActive = false;
+    askforquit = true;
+    typeofask = 1;              //quit game
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCEndGame
+//
+//---------------------------------------------------------------------------
+
+static void SCEndGame(int option)
+{
+    if (demoplayback)
+    {
+        return;
+    }
+    if (SCNetCheck(3))
+    {
+        MenuActive = false;
+        askforquit = true;
+        typeofask = 2;          //endgame
+        if (!netgame && !demoplayback)
+        {
+            paused = true;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCMessages
+//
+//---------------------------------------------------------------------------
+
+static void SCMessages(int option)
+{
+    messageson ^= 1;
+    if (messageson)
+    {
+        P_SetMessage(&players[consoleplayer], "MESSAGES ON", true);
+    }
+    else
+    {
+        P_SetMessage(&players[consoleplayer], "MESSAGES OFF", true);
+    }
+    S_StartSound(NULL, SFX_CHAT);
+}
+
+//===========================================================================
+//
+// SCNetCheck
+//
+//===========================================================================
+
+static boolean SCNetCheck(int option)
+{
+    if (!netgame)
+    {
+        return true;
+    }
+    switch (option)
+    {
+        case 1:                // new game
+            P_SetMessage(&players[consoleplayer],
+                         "YOU CAN'T START A NEW GAME IN NETPLAY!", true);
+            break;
+        case 2:                // load game
+            P_SetMessage(&players[consoleplayer],
+                         "YOU CAN'T LOAD A GAME IN NETPLAY!", true);
+            break;
+        case 3:                // end game
+            P_SetMessage(&players[consoleplayer],
+                         "YOU CAN'T END A GAME IN NETPLAY!", true);
+            break;
+    }
+    MenuActive = false;
+    S_StartSound(NULL, SFX_CHAT);
+    return false;
+}
+
+//===========================================================================
+//
+// SCNetCheck2
+//
+//===========================================================================
+
+static void SCNetCheck2(int option)
+{
+    SCNetCheck(option);
+    return;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCLoadGame
+//
+//---------------------------------------------------------------------------
+
+static void SCLoadGame(int option)
+{
+    if (demoplayback)
+    {
+        // deactivate playback, return control to player
+        demoextend = false;
+    }
+    if (!SlotStatus[option])
+    {                           // Don't try to load from an empty slot
+        return;
+    }
+    G_LoadGame(option);
+    MN_DeactivateMenu();
+    BorderNeedRefresh = true;
+    if (quickload == -1)
+    {
+        quickload = option + 1;
+        P_ClearMessage(&players[consoleplayer]);
+    }
+}
+
+//
+// Generate a default save slot name when the user saves to
+// an empty slot via the joypad.
+//
+static void SetDefaultSaveName(int slot)
+{
+    // map from IWAD or PWAD?
+    if (W_IsIWADLump(maplumpinfo) && strcmp(SavePath, ""))
+    {
+        M_snprintf(SlotText[slot], SLOTTEXTLEN,
+                   "%s", maplumpinfo->name);
+    }
+    else
+    {
+        char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpinfo));
+        char *ext = strrchr(wadname, '.');
+
+        if (ext != NULL)
+        {
+            *ext = '\0';
+        }
+
+        M_snprintf(SlotText[slot], SLOTTEXTLEN,
+                   "%s (%s)", maplumpinfo->name,
+                   wadname);
+        free(wadname);
+    }
+    M_ForceUppercase(SlotText[slot]);
+    joypadsave = false;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCSaveGame
+//
+//---------------------------------------------------------------------------
+
+static void SCSaveGame(int option)
+{
+    char *ptr;
+
+    if (!FileMenuKeySteal)
+    {
+        int x, y;
+
+        FileMenuKeySteal = true;
+        // We need to activate the text input interface to type the save
+        // game name:
+        x = SaveMenu.x + 1;
+        y = SaveMenu.y + 1 + option * ITEM_HEIGHT;
+        I_StartTextInput(x, y, x + 190, y + ITEM_HEIGHT - 2);
+
+        M_StringCopy(oldSlotText, SlotText[option], sizeof(oldSlotText));
+        ptr = SlotText[option];
+
+        if (!strcmp(ptr, "") && joypadsave)
+        {
+            SetDefaultSaveName(option);
+        }
+
+        while (*ptr)
+        {
+            ptr++;
+        }
+        *ptr = '[';
+        *(ptr + 1) = 0;
+        SlotStatus[option]++;
+        currentSlot = option;
+        slotptr = ptr - SlotText[option];
+        return;
+    }
+    else
+    {
+        G_SaveGame(option, SlotText[option]);
+        FileMenuKeySteal = false;
+        I_StopTextInput();
+        MN_DeactivateMenu();
+    }
+    BorderNeedRefresh = true;
+    if (quicksave == -1)
+    {
+        quicksave = option + 1;
+        P_ClearMessage(&players[consoleplayer]);
+    }
+}
+
+//==========================================================================
+//
+// SCClass
+//
+//==========================================================================
+
+static void SCClass(int option)
+{
+    if (netgame)
+    {
+        P_SetMessage(&players[consoleplayer],
+                     "YOU CAN'T START A NEW GAME FROM WITHIN A NETGAME!",
+                     true);
+        return;
+    }
+    MenuPClass = option;
+    switch (MenuPClass)
+    {
+        case PCLASS_FIGHTER:
+            SkillMenu.x = 120;
+            SkillItems[0].text = "SQUIRE";
+            SkillItems[1].text = "KNIGHT";
+            SkillItems[2].text = "WARRIOR";
+            SkillItems[3].text = "BERSERKER";
+            SkillItems[4].text = "TITAN";
+            break;
+        case PCLASS_CLERIC:
+            SkillMenu.x = 116;
+            SkillItems[0].text = "ALTAR BOY";
+            SkillItems[1].text = "ACOLYTE";
+            SkillItems[2].text = "PRIEST";
+            SkillItems[3].text = "CARDINAL";
+            SkillItems[4].text = "POPE";
+            break;
+        case PCLASS_MAGE:
+            SkillMenu.x = 112;
+            SkillItems[0].text = "APPRENTICE";
+            SkillItems[1].text = "ENCHANTER";
+            SkillItems[2].text = "SORCERER";
+            SkillItems[3].text = "WARLOCK";
+            SkillItems[4].text = "ARCHIMAGE";
+            break;
+    }
+    SetMenu(MENU_SKILL);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCSkill
+//
+//---------------------------------------------------------------------------
+
+static void SCSkill(int option)
+{
+    if (demoplayback)
+    {
+        // deactivate playback, return control to player
+        demoextend = false;
+    }
+
+    PlayerClass[consoleplayer] = MenuPClass;
+    G_DeferredNewGame(option);
+    SB_SetClassData();
+    SB_state = -1;
+    MN_DeactivateMenu();
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCMouseSensi
+//
+//---------------------------------------------------------------------------
+
+static void SCMouseSensi(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (mouseSensitivity < 9)
+        {
+            mouseSensitivity++;
+        }
+    }
+    else if (mouseSensitivity)
+    {
+        mouseSensitivity--;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCSfxVolume
+//
+//---------------------------------------------------------------------------
+
+static void SCSfxVolume(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (snd_MaxVolume < 15)
+        {
+            snd_MaxVolume++;
+        }
+    }
+    else if (snd_MaxVolume)
+    {
+        snd_MaxVolume--;
+    }
+    soundchanged = true;        // we'll set it when we leave the menu
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCMusicVolume
+//
+//---------------------------------------------------------------------------
+
+static void SCMusicVolume(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (snd_MusicVolume < 15)
+        {
+            snd_MusicVolume++;
+        }
+    }
+    else if (snd_MusicVolume)
+    {
+        snd_MusicVolume--;
+    }
+    S_SetMusicVolume();
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCScreenSize
+//
+//---------------------------------------------------------------------------
+
+static void SCScreenSize(int option)
+{
+    if (option == RIGHT_DIR)
+    {
+        if (screenblocks < 11)
+        {
+            screenblocks++;
+        }
+    }
+    else if (screenblocks > 3)
+    {
+        screenblocks--;
+    }
+    R_SetViewSize(screenblocks, detailLevel);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC SCInfo
+//
+//---------------------------------------------------------------------------
+
+static void SCInfo(int option)
+{
+    InfoType = 1;
+    S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC MN_Responder
+//
+//---------------------------------------------------------------------------
+
+boolean MN_Responder(event_t * event)
+{
+    int key;
+    int charTyped;
+    int i;
+    MenuItem_t *item;
+    char *textBuffer;
+    int dir;
+
+    // In testcontrols mode, none of the function keys should do anything
+    // - the only key is escape to quit.
+
+    if (testcontrols)
+    {
+        if (event->type == ev_quit
+         || (event->type == ev_keydown
+          && (event->data1 == key_menu_activate
+           || event->data1 == key_menu_quit)))
+        {
+            I_Quit();
+            return true;
+        }
+
+        return false;
+    }
+
+    // "close" button pressed on window?
+    if (event->type == ev_quit)
+    {
+        // First click on close = bring up quit confirm message.
+        // Second click = confirm quit.
+
+        if (!MenuActive && askforquit && typeofask == 1)
+        {
+            G_CheckDemoStatus();
+            I_Quit();
+        }
+        else
+        {
+            SCQuitGame(0);
+            S_StartSound(NULL, SFX_CHAT);
+        }
+
+        return true;
+    }
+
+    charTyped = 0;
+    key = -1;
+
+    if (event->type == ev_joystick)
+    {
+        // Simulate key presses from joystick events to interact with the menu.
+
+        if (MenuActive)
+        {
+            if (JOY_GET_DPAD(event->data6) != JOY_DIR_NONE)
+            {
+                dir = JOY_GET_DPAD(event->data6);
+            }
+            else if (JOY_GET_LSTICK(event->data6) != JOY_DIR_NONE)
+            {
+                dir = JOY_GET_LSTICK(event->data6);
+            }
+            else
+            {
+                dir = JOY_GET_RSTICK(event->data6);
+            }
+
+            if (dir & JOY_DIR_UP)
+            {
+                key = key_menu_up;
+                joywait = I_GetTime() + 5;
+            }
+            else if (dir & JOY_DIR_DOWN)
+            {
+                key = key_menu_down;
+                joywait = I_GetTime() + 5;
+            }
+            if (dir & JOY_DIR_LEFT)
+            {
+                key = key_menu_left;
+                joywait = I_GetTime() + 5;
+            }
+            else if (dir & JOY_DIR_RIGHT)
+            {
+                key = key_menu_right;
+                joywait = I_GetTime() + 5;
+            }
+
+#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
+#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (event->data1 & (1 << (x))) != 0)
+
+            if (JOY_BUTTON_PRESSED(joybfire))
+            {
+                // Simulate pressing "Enter" when we are supplying a save slot name
+                if (FileMenuKeySteal)
+                {
+                    key = KEY_ENTER;
+                }
+                else
+                {
+                    // if selecting a save slot via joypad, set a flag
+                    if (CurrentMenu == &SaveMenu)
+                    {
+                        joypadsave = true;
+                    }
+                    key = key_menu_forward;
+                }
+                joywait = I_GetTime() + 5;
+            }
+            if (JOY_BUTTON_PRESSED(joybuse))
+            {
+                // If user was entering a save name, back out
+                if (FileMenuKeySteal)
+                {
+                    key = KEY_ESCAPE;
+                }
+                else
+                {
+                    key = key_menu_back;
+                }
+                joywait = I_GetTime() + 5;
+            }
+        }
+        else if (askforquit)
+        {
+            if (JOY_BUTTON_PRESSED(joybfire))
+            {
+                // Simulate a 'Y' keypress
+                key = key_menu_confirm;
+                joywait = I_GetTime() + 5;
+            }
+            if (JOY_BUTTON_PRESSED(joybuse))
+            {
+                // Simulate a 'N' keypress
+                key = key_menu_abort;
+                joywait = I_GetTime() + 5;
+            }
+        }
+        if (JOY_BUTTON_PRESSED(joybmenu))
+        {
+            MN_ActivateMenu();
+            joywait = I_GetTime() + 5;
+            return true;
+        }
+    }
+
+    if (event->type != ev_keydown && key == -1)
+    {
+        return false;
+    }
+
+    if (event->type == ev_keydown)
+    {
+        key = event->data1;
+        charTyped = event->data2;
+    }
+
+    if (InfoType)
+    {
+        /* The 4-Level Demo Version also has 3 Info pages
+        if (gamemode == shareware)
+        {
+            InfoType = (InfoType + 1) % 5;
+        }
+        else
+        */
+        {
+            InfoType = (InfoType + 1) % 4;
+        }
+        if (key == KEY_ESCAPE)
+        {
+            InfoType = 0;
+        }
+        if (!InfoType)
+        {
+            if (!netgame && !demoplayback)
+            {
+                paused = false;
+            }
+            MN_DeactivateMenu();
+            SB_state = -1;      //refresh the statbar
+            BorderNeedRefresh = true;
+        }
+        S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+        return (true);          //make the info screen eat the keypress
+    }
+
+    if ((ravpic && key == KEY_F1) ||
+        (key != 0 && key == key_menu_screenshot))
+    {
+        G_ScreenShot();
+        return (true);
+    }
+
+    if (askforquit)
+    {
+        if (key == key_menu_confirm)
+        {
+            switch (typeofask)
+            {
+                case 1:
+                    G_CheckDemoStatus();
+                    I_Quit();
+                    return false;
+                case 2:
+                    P_ClearMessage(&players[consoleplayer]);
+                    askforquit = false;
+                    typeofask = 0;
+                    paused = false;
+                    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
+                    H2_StartTitle();    // go to intro/demo mode.
+                    return false;
+                case 3:
+                    P_SetMessage(&players[consoleplayer],
+                                 "QUICKSAVING....", false);
+                    FileMenuKeySteal = true;
+                    SCSaveGame(quicksave - 1);
+                    BorderNeedRefresh = true;
+                    break;
+                case 4:
+                    P_SetMessage(&players[consoleplayer],
+                                 "QUICKLOADING....", false);
+                    SCLoadGame(quickload - 1);
+                    BorderNeedRefresh = true;
+                    break;
+                case 5:
+                    BorderNeedRefresh = true;
+                    mn_SuicideConsole = true;
+                    break;
+                default:
+                    break;
+            }
+
+            askforquit = false;
+            typeofask = 0;
+
+            return true;
+        }
+        else if (key == key_menu_abort || key == KEY_ESCAPE)
+        {
+            players[consoleplayer].messageTics = 0;
+            askforquit = false;
+            typeofask = 0;
+            paused = false;
+            UpdateState |= I_FULLSCRN;
+            BorderNeedRefresh = true;
+            return true;
+        }
+
+        return false;           // don't let the keys filter thru
+    }
+    if (!MenuActive && !chatmodeon)
+    {
+        if (key == key_menu_decscreen)
+        {
+            if (automapactive)
+            {               // Don't screen size in automap
+                return (false);
+            }
+            SCScreenSize(LEFT_DIR);
+            S_StartSound(NULL, SFX_PICKUP_KEY);
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            return (true);
+        }
+        else if (key == key_menu_incscreen)
+        {
+            if (automapactive)
+            {               // Don't screen size in automap
+                return (false);
+            }
+            SCScreenSize(RIGHT_DIR);
+            S_StartSound(NULL, SFX_PICKUP_KEY);
+            BorderNeedRefresh = true;
+            UpdateState |= I_FULLSCRN;
+            return (true);
+        }
+        else if (key == key_menu_help)           // F1 (help screen)
+        {
+            SCInfo(0);      // start up info screens
+            MenuActive = true;
+            return (true);
+        }
+        else if (key == key_menu_save)           // F2 (save game)
+        {
+            if (gamestate == GS_LEVEL && !demoplayback)
+            {
+                MenuActive = true;
+                FileMenuKeySteal = false;
+                MenuTime = 0;
+                CurrentMenu = &SaveMenu;
+                CurrentItPos = CurrentMenu->oldItPos;
+                if (!netgame && !demoplayback)
+                {
+                    paused = true;
+                }
+                S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+                slottextloaded = false;     //reload the slot text, when needed
+            }
+            return true;
+        }
+        else if (key == key_menu_load)           // F3 (load game)
+        {
+            if (SCNetCheck(2))
+            {
+                MenuActive = true;
+                FileMenuKeySteal = false;
+                MenuTime = 0;
+                CurrentMenu = &LoadMenu;
+                CurrentItPos = CurrentMenu->oldItPos;
+                if (!netgame && !demoplayback)
+                {
+                    paused = true;
+                }
+                S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+                slottextloaded = false;     //reload the slot text, when needed
+            }
+            return true;
+        }
+        else if (key == key_menu_volume)         // F4 (volume)
+        {
+            MenuActive = true;
+            FileMenuKeySteal = false;
+            MenuTime = 0;
+            CurrentMenu = &Options2Menu;
+            CurrentItPos = CurrentMenu->oldItPos;
+            if (!netgame && !demoplayback)
+            {
+                paused = true;
+            }
+            S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+            slottextloaded = false; //reload the slot text, when needed
+            return true;
+        }
+        else if (key == key_menu_detail)         // F5 (suicide)
+        {
+            MenuActive = false;
+            askforquit = true;
+            typeofask = 5;  // suicide
+            return true;
+        }
+        else if (key == key_menu_qsave)          // F6 (quicksave)
+        {
+            if (gamestate == GS_LEVEL && !demoplayback)
+            {
+                if (!quicksave || quicksave == -1)
+                {
+                    MenuActive = true;
+                    FileMenuKeySteal = false;
+                    MenuTime = 0;
+                    CurrentMenu = &SaveMenu;
+                    CurrentItPos = CurrentMenu->oldItPos;
+                    if (!netgame && !demoplayback)
+                    {
+                        paused = true;
+                    }
+                    S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+                    slottextloaded = false; //reload the slot text
+                    quicksave = -1;
+                    P_SetMessage(&players[consoleplayer],
+                                 "CHOOSE A QUICKSAVE SLOT", true);
+                }
+                else
+                {
+                    askforquit = true;
+                    typeofask = 3;
+                    if (!netgame && !demoplayback)
+                    {
+                        paused = true;
+                    }
+                    S_StartSound(NULL, SFX_CHAT);
+                }
+            }
+            return true;
+        }
+        else if (key == key_menu_endgame)        // F7 (end game)
+        {
+            if (SCNetCheck(3))
+            {
+                if (gamestate == GS_LEVEL && !demoplayback)
+                {
+                    S_StartSound(NULL, SFX_CHAT);
+                    SCEndGame(0);
+                }
+            }
+            return true;
+        }
+        else if (key == key_menu_messages)       // F8 (toggle messages)
+        {
+            SCMessages(0);
+            return true;
+        }
+        else if (key == key_menu_qload)          // F9 (quickload)
+        {
+            if (SCNetCheck(2))
+            {
+                if (!quickload || quickload == -1)
+                {
+                    MenuActive = true;
+                    FileMenuKeySteal = false;
+                    MenuTime = 0;
+                    CurrentMenu = &LoadMenu;
+                    CurrentItPos = CurrentMenu->oldItPos;
+                    if (!netgame && !demoplayback)
+                    {
+                        paused = true;
+                    }
+                    S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+                    slottextloaded = false; // reload the slot text
+                    quickload = -1;
+                    P_SetMessage(&players[consoleplayer],
+                                 "CHOOSE A QUICKLOAD SLOT", true);
+                }
+                else
+                {
+                    askforquit = true;
+                    if (!netgame && !demoplayback)
+                    {
+                        paused = true;
+                    }
+                    typeofask = 4;
+                    S_StartSound(NULL, SFX_CHAT);
+                }
+            }
+            return true;
+        }
+        else if (key == key_menu_quit)           // F10 (quit)
+        {
+            if (gamestate == GS_LEVEL || gamestate == GS_FINALE)
+            {
+                SCQuitGame(0);
+                S_StartSound(NULL, SFX_CHAT);
+            }
+            return true;
+        }
+        else if (key == key_menu_gamma)          // F11 (gamma correction)
+        {
+            usegamma++;
+            if (usegamma > 4)
+            {
+                usegamma = 0;
+            }
+            SB_PaletteFlash(true);  // force change
+            P_SetMessage(&players[consoleplayer], GammaText[usegamma],
+                         false);
+            return true;
+        }
+        else if (key == KEY_F12)                 // F12 (???)
+        {
+            // F12 - reload current map (devmaps mode)
+
+            if (netgame)
+            {
+                return false;
+            }
+            if (gamekeydown[key_speed])
+            {               // Monsters ON
+                nomonsters = false;
+            }
+            if (gamekeydown[key_strafe])
+            {               // Monsters OFF
+                nomonsters = true;
+            }
+            G_DeferedInitNew(gameskill, gameepisode, gamemap);
+            P_SetMessage(&players[consoleplayer], TXT_CHEATWARP, false);
+            return true;
+        }
+    }
+
+    if (!MenuActive)
+    {
+        if (key == key_menu_activate || gamestate == GS_DEMOSCREEN || demoplayback)
+        {
+            MN_ActivateMenu();
+            return (true);
+        }
+        return (false);
+    }
+    if (!FileMenuKeySteal)
+    {
+        item = &CurrentMenu->items[CurrentItPos];
+
+        if (key == key_menu_down)                // Next menu item
+        {
+            do
+            {
+                if (CurrentItPos + 1 > CurrentMenu->itemCount - 1)
+                {
+                    CurrentItPos = 0;
+                }
+                else
+                {
+                    CurrentItPos++;
+                }
+            }
+            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
+            S_StartSound(NULL, SFX_FIGHTER_HAMMER_HITWALL);
+            return (true);
+        }
+        else if (key == key_menu_up)             // Previous menu item
+        {
+            do
+            {
+                if (CurrentItPos == 0)
+                {
+                    CurrentItPos = CurrentMenu->itemCount - 1;
+                }
+                else
+                {
+                    CurrentItPos--;
+                }
+            }
+            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
+            S_StartSound(NULL, SFX_FIGHTER_HAMMER_HITWALL);
+            return (true);
+        }
+        else if (key == key_menu_left)           // Slider left
+        {
+            if (item->type == ITT_LRFUNC && item->func != NULL)
+            {
+                item->func(LEFT_DIR);
+                S_StartSound(NULL, SFX_PICKUP_KEY);
+            }
+            return (true);
+        }
+        else if (key == key_menu_right)          // Slider right
+        {
+            if (item->type == ITT_LRFUNC && item->func != NULL)
+            {
+                item->func(RIGHT_DIR);
+                S_StartSound(NULL, SFX_PICKUP_KEY);
+            }
+            return (true);
+        }
+        else if (key == key_menu_forward)        // Activate item (enter)
+        {
+            if (item->type == ITT_SETMENU)
+            {
+                if (item->func != NULL)
+                {
+                    item->func(item->option);
+                }
+                SetMenu(item->menu);
+            }
+            else if (item->func != NULL)
+            {
+                CurrentMenu->oldItPos = CurrentItPos;
+                if (item->type == ITT_LRFUNC)
+                {
+                    item->func(RIGHT_DIR);
+                }
+                else if (item->type == ITT_EFUNC)
+                {
+                    item->func(item->option);
+                }
+            }
+            S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
+            return (true);
+        }
+        else if (key == key_menu_activate)
+        {
+            MN_DeactivateMenu();
+            return (true);
+        }
+        else if (key == key_menu_back)
+        {
+            S_StartSound(NULL, SFX_PICKUP_KEY);
+
+            if (CurrentMenu->prevMenu == MENU_NONE)
+            {
+                MN_DeactivateMenu();
+            }
+            else
+            {
+                SetMenu(CurrentMenu->prevMenu);
+            }
+            return (true);
+        }
+        else if (charTyped != 0)
+        {
+            for (i = 0; i < CurrentMenu->itemCount; i++)
+            {
+                if (CurrentMenu->items[i].text)
+                {
+                    if (toupper(charTyped)
+                        == toupper(CurrentMenu->items[i].text[0]))
+                    {
+                        CurrentItPos = i;
+                        return (true);
+                    }
+                }
+            }
+        }
+        return (false);
+    }
+    else
+    {
+        // Editing file names
+        // When typing a savegame name, we use the fully shifted and
+        // translated input value from event->data3.
+        charTyped = event->data3;
+        textBuffer = &SlotText[currentSlot][slotptr];
+        if (key == KEY_BACKSPACE)
+        {
+            if (slotptr)
+            {
+                *textBuffer = 0;
+                slotptr--;
+                textBuffer = &SlotText[currentSlot][slotptr];
+                *textBuffer = ASCII_CURSOR;
+            }
+            return (true);
+        }
+        if (key == KEY_ESCAPE)
+        {
+            M_StringCopy(SlotText[currentSlot], oldSlotText,
+                         sizeof(SlotText[currentSlot]));
+            SlotStatus[currentSlot]--;
+            MN_DeactivateMenu();
+            return (true);
+        }
+        if (key == KEY_ENTER)
+        {
+            SlotText[currentSlot][slotptr] = 0; // clear the cursor
+            item = &CurrentMenu->items[CurrentItPos];
+            CurrentMenu->oldItPos = CurrentItPos;
+            if (item->type == ITT_EFUNC)
+            {
+                item->func(item->option);
+                if (item->menu != MENU_NONE)
+                {
+                    SetMenu(item->menu);
+                }
+            }
+            return (true);
+        }
+        if (slotptr < SLOTTEXTLEN && key != KEY_BACKSPACE)
+        {
+            if (isalpha(charTyped))
+            {
+                *textBuffer++ = toupper(charTyped);
+                *textBuffer = ASCII_CURSOR;
+                slotptr++;
+                return (true);
+            }
+            if (isdigit(charTyped) || charTyped == ' '
+             || charTyped == ',' || charTyped == '.' || charTyped == '-'
+             || charTyped == '!')
+            {
+                *textBuffer++ = charTyped;
+                *textBuffer = ASCII_CURSOR;
+                slotptr++;
+                return (true);
+            }
+        }
+        return (true);
+    }
+    return (false);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_ActivateMenu
+//
+//---------------------------------------------------------------------------
+
+void MN_ActivateMenu(void)
+{
+    if (MenuActive)
+    {
+        return;
+    }
+    if (paused)
+    {
+        S_ResumeSound();
+    }
+    MenuActive = true;
+    FileMenuKeySteal = false;
+    MenuTime = 0;
+    CurrentMenu = &MainMenu;
+    CurrentItPos = CurrentMenu->oldItPos;
+    if (!netgame && !demoplayback)
+    {
+        paused = true;
+    }
+    S_StartSound(NULL, SFX_PLATFORM_STOP);
+    slottextloaded = false;     //reload the slot text, when needed
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DeactivateMenu
+//
+//---------------------------------------------------------------------------
+
+void MN_DeactivateMenu(void)
+{
+    if (CurrentMenu != NULL)
+    {
+        CurrentMenu->oldItPos = CurrentItPos;
+    }
+    MenuActive = false;
+    if (FileMenuKeySteal)
+    {
+        I_StopTextInput();
+    }
+    if (!netgame)
+    {
+        paused = false;
+    }
+    S_StartSound(NULL, SFX_PLATFORM_STOP);
+    P_ClearMessage(&players[consoleplayer]);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC MN_DrawInfo
+//
+//---------------------------------------------------------------------------
+
+void MN_DrawInfo(void)
+{
+    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
+    memcpy(I_VideoBuffer,
+           (byte *) W_CacheLumpNum(W_GetNumForName("TITLE") + InfoType,
+                                   PU_CACHE), SCREENWIDTH * SCREENHEIGHT);
+//      V_DrawPatch(0, 0, W_CacheLumpNum(W_GetNumForName("TITLE")+InfoType,
+//              PU_CACHE));
+}
+
+
+//---------------------------------------------------------------------------
+//
+// PROC SetMenu
+//
+//---------------------------------------------------------------------------
+
+static void SetMenu(MenuType_t menu)
+{
+    CurrentMenu->oldItPos = CurrentItPos;
+    CurrentMenu = Menus[menu];
+    CurrentItPos = CurrentMenu->oldItPos;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC DrawSlider
+//
+//---------------------------------------------------------------------------
+
+static void DrawSlider(Menu_t * menu, int item, int width, int slot)
+{
+    int x;
+    int y;
+    int x2;
+    int count;
+
+    x = menu->x + 24;
+    y = menu->y + 2 + (item * ITEM_HEIGHT);
+    V_DrawPatch(x - 32, y, W_CacheLumpName("M_SLDLT", PU_CACHE));
+    for (x2 = x, count = width; count--; x2 += 8)
+    {
+        V_DrawPatch(x2, y, W_CacheLumpName(count & 1 ? "M_SLDMD1"
+                                           : "M_SLDMD2", PU_CACHE));
+    }
+    V_DrawPatch(x2, y, W_CacheLumpName("M_SLDRT", PU_CACHE));
+    V_DrawPatch(x + 4 + slot * 8, y + 7,
+                W_CacheLumpName("M_SLDKB", PU_CACHE));
+}
diff --git a/games/NXDoom/src/hexen/p_acs.c b/games/NXDoom/src/hexen/p_acs.c
new file mode 100644
index 000000000..33d0480b6
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_acs.c
@@ -0,0 +1,1996 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "s_sound.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "p_local.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAX_SCRIPT_ARGS 3
+#define SCRIPT_CONTINUE 0
+#define SCRIPT_STOP 1
+#define SCRIPT_TERMINATE 2
+#define OPEN_SCRIPTS_BASE 1000
+#define PRINT_BUFFER_SIZE 256
+#define GAME_SINGLE_PLAYER 0
+#define GAME_NET_COOPERATIVE 1
+#define GAME_NET_DEATHMATCH 2
+#define TEXTURE_TOP 0
+#define TEXTURE_MIDDLE 1
+#define TEXTURE_BOTTOM 2
+
+// TYPES -------------------------------------------------------------------
+
+typedef PACKED_STRUCT (
+{
+    int marker;
+    int infoOffset;
+    int code;
+}) acsHeader_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void StartOpenACS(int number, int infoIndex, int offset);
+static void ScriptFinished(int number);
+static boolean TagBusy(int tag);
+static boolean AddToACSStore(int map, int number, byte * args);
+static int GetACSIndex(int number);
+static void Push(int value);
+static int Pop(void);
+static int Top(void);
+static void Drop(void);
+
+static int CmdNOP(void);
+static int CmdTerminate(void);
+static int CmdSuspend(void);
+static int CmdPushNumber(void);
+static int CmdLSpec1(void);
+static int CmdLSpec2(void);
+static int CmdLSpec3(void);
+static int CmdLSpec4(void);
+static int CmdLSpec5(void);
+static int CmdLSpec1Direct(void);
+static int CmdLSpec2Direct(void);
+static int CmdLSpec3Direct(void);
+static int CmdLSpec4Direct(void);
+static int CmdLSpec5Direct(void);
+static int CmdAdd(void);
+static int CmdSubtract(void);
+static int CmdMultiply(void);
+static int CmdDivide(void);
+static int CmdModulus(void);
+static int CmdEQ(void);
+static int CmdNE(void);
+static int CmdLT(void);
+static int CmdGT(void);
+static int CmdLE(void);
+static int CmdGE(void);
+static int CmdAssignScriptVar(void);
+static int CmdAssignMapVar(void);
+static int CmdAssignWorldVar(void);
+static int CmdPushScriptVar(void);
+static int CmdPushMapVar(void);
+static int CmdPushWorldVar(void);
+static int CmdAddScriptVar(void);
+static int CmdAddMapVar(void);
+static int CmdAddWorldVar(void);
+static int CmdSubScriptVar(void);
+static int CmdSubMapVar(void);
+static int CmdSubWorldVar(void);
+static int CmdMulScriptVar(void);
+static int CmdMulMapVar(void);
+static int CmdMulWorldVar(void);
+static int CmdDivScriptVar(void);
+static int CmdDivMapVar(void);
+static int CmdDivWorldVar(void);
+static int CmdModScriptVar(void);
+static int CmdModMapVar(void);
+static int CmdModWorldVar(void);
+static int CmdIncScriptVar(void);
+static int CmdIncMapVar(void);
+static int CmdIncWorldVar(void);
+static int CmdDecScriptVar(void);
+static int CmdDecMapVar(void);
+static int CmdDecWorldVar(void);
+static int CmdGoto(void);
+static int CmdIfGoto(void);
+static int CmdDrop(void);
+static int CmdDelay(void);
+static int CmdDelayDirect(void);
+static int CmdRandom(void);
+static int CmdRandomDirect(void);
+static int CmdThingCount(void);
+static int CmdThingCountDirect(void);
+static int CmdTagWait(void);
+static int CmdTagWaitDirect(void);
+static int CmdPolyWait(void);
+static int CmdPolyWaitDirect(void);
+static int CmdChangeFloor(void);
+static int CmdChangeFloorDirect(void);
+static int CmdChangeCeiling(void);
+static int CmdChangeCeilingDirect(void);
+static int CmdRestart(void);
+static int CmdAndLogical(void);
+static int CmdOrLogical(void);
+static int CmdAndBitwise(void);
+static int CmdOrBitwise(void);
+static int CmdEorBitwise(void);
+static int CmdNegateLogical(void);
+static int CmdLShift(void);
+static int CmdRShift(void);
+static int CmdUnaryMinus(void);
+static int CmdIfNotGoto(void);
+static int CmdLineSide(void);
+static int CmdScriptWait(void);
+static int CmdScriptWaitDirect(void);
+static int CmdClearLineSpecial(void);
+static int CmdCaseGoto(void);
+static int CmdBeginPrint(void);
+static int CmdEndPrint(void);
+static int CmdPrintString(void);
+static int CmdPrintNumber(void);
+static int CmdPrintCharacter(void);
+static int CmdPlayerCount(void);
+static int CmdGameType(void);
+static int CmdGameSkill(void);
+static int CmdTimer(void);
+static int CmdSectorSound(void);
+static int CmdAmbientSound(void);
+static int CmdSoundSequence(void);
+static int CmdSetLineTexture(void);
+static int CmdSetLineBlocking(void);
+static int CmdSetLineSpecial(void);
+static int CmdThingSound(void);
+static int CmdEndPrintBold(void);
+
+static void ThingCount(int type, int tid);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+int ACScriptCount;
+byte *ActionCodeBase;
+static int ActionCodeSize;
+acsInfo_t *ACSInfo;
+int MapVars[MAX_ACS_MAP_VARS];
+int WorldVars[MAX_ACS_WORLD_VARS];
+acsstore_t ACSStore[MAX_ACS_STORE + 1]; // +1 for termination marker
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static char EvalContext[64];
+static acs_t *ACScript;
+static unsigned int PCodeOffset;
+static byte SpecArgs[8];
+static int ACStringCount;
+static char **ACStrings;
+static char PrintBuffer[PRINT_BUFFER_SIZE];
+static acs_t *NewScript;
+
+static int (*PCodeCmds[]) (void) =
+{
+        CmdNOP,
+        CmdTerminate,
+        CmdSuspend,
+        CmdPushNumber,
+        CmdLSpec1,
+        CmdLSpec2,
+        CmdLSpec3,
+        CmdLSpec4,
+        CmdLSpec5,
+        CmdLSpec1Direct,
+        CmdLSpec2Direct,
+        CmdLSpec3Direct,
+        CmdLSpec4Direct,
+        CmdLSpec5Direct,
+        CmdAdd,
+        CmdSubtract,
+        CmdMultiply,
+        CmdDivide,
+        CmdModulus,
+        CmdEQ,
+        CmdNE,
+        CmdLT,
+        CmdGT,
+        CmdLE,
+        CmdGE,
+        CmdAssignScriptVar,
+        CmdAssignMapVar,
+        CmdAssignWorldVar,
+        CmdPushScriptVar,
+        CmdPushMapVar,
+        CmdPushWorldVar,
+        CmdAddScriptVar,
+        CmdAddMapVar,
+        CmdAddWorldVar,
+        CmdSubScriptVar,
+        CmdSubMapVar,
+        CmdSubWorldVar,
+        CmdMulScriptVar,
+        CmdMulMapVar,
+        CmdMulWorldVar,
+        CmdDivScriptVar,
+        CmdDivMapVar,
+        CmdDivWorldVar,
+        CmdModScriptVar,
+        CmdModMapVar,
+        CmdModWorldVar,
+        CmdIncScriptVar,
+        CmdIncMapVar,
+        CmdIncWorldVar,
+        CmdDecScriptVar,
+        CmdDecMapVar,
+        CmdDecWorldVar,
+        CmdGoto,
+        CmdIfGoto,
+        CmdDrop,
+        CmdDelay,
+        CmdDelayDirect,
+        CmdRandom,
+        CmdRandomDirect,
+        CmdThingCount,
+        CmdThingCountDirect,
+        CmdTagWait,
+        CmdTagWaitDirect,
+        CmdPolyWait,
+        CmdPolyWaitDirect,
+        CmdChangeFloor,
+        CmdChangeFloorDirect,
+        CmdChangeCeiling,
+        CmdChangeCeilingDirect,
+        CmdRestart,
+        CmdAndLogical,
+        CmdOrLogical,
+        CmdAndBitwise,
+        CmdOrBitwise,
+        CmdEorBitwise,
+        CmdNegateLogical,
+        CmdLShift,
+        CmdRShift,
+        CmdUnaryMinus,
+        CmdIfNotGoto,
+        CmdLineSide,
+        CmdScriptWait,
+        CmdScriptWaitDirect,
+        CmdClearLineSpecial,
+        CmdCaseGoto,
+        CmdBeginPrint,
+        CmdEndPrint,
+        CmdPrintString,
+        CmdPrintNumber,
+        CmdPrintCharacter,
+        CmdPlayerCount,
+        CmdGameType,
+        CmdGameSkill,
+        CmdTimer,
+        CmdSectorSound,
+        CmdAmbientSound,
+        CmdSoundSequence,
+        CmdSetLineTexture,
+        CmdSetLineBlocking,
+        CmdSetLineSpecial,
+        CmdThingSound,
+        CmdEndPrintBold,
+};
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// ACSAssert
+//
+// Check that the given condition evaluates to true. If it does not, exit
+// with an I_Error() printing the given message.
+//
+//==========================================================================
+
+static void ACSAssert(int condition, const char *fmt, ...)
+{
+    char buf[128];
+    va_list args;
+
+    if (condition)
+    {
+        return;
+    }
+
+    va_start(args, fmt);
+    M_vsnprintf(buf, sizeof(buf), fmt, args);
+    va_end(args);
+    I_Error("ACS assertion failure: in %s: %s", EvalContext, buf);
+}
+
+//==========================================================================
+//
+// ReadCodeInt
+//
+// Read a 32-bit value from the loaded ACS lump at the location pointed to
+// by PCodeOffset, advancing PCodeOffset to the next value in the process.
+//
+//==========================================================================
+
+static int ReadCodeInt(void)
+{
+    int result;
+    int *ptr;
+
+    ACSAssert(PCodeOffset + 3 < ActionCodeSize,
+              "unexpectedly reached end of ACS lump");
+
+    ptr = (int *) (ActionCodeBase + PCodeOffset);
+    result = LONG(*ptr);
+    PCodeOffset += 4;
+
+    return result;
+}
+
+//==========================================================================
+//
+// ReadScriptVar
+//
+// Read a script variable index as an immediate value, validating the
+// result is a valid script variable number.
+//
+//==========================================================================
+
+static int ReadScriptVar(void)
+{
+    int var = ReadCodeInt();
+    ACSAssert(var >= 0, "negative script variable: %d < 0", var);
+    ACSAssert(var < MAX_ACS_SCRIPT_VARS,
+              "invalid script variable: %d >= %d", var, MAX_ACS_SCRIPT_VARS);
+    return var;
+}
+
+//==========================================================================
+//
+// ReadMapVar
+//
+// Read a map variable index as an immediate value, validating the
+// result is a valid map variable number.
+//
+//==========================================================================
+
+static int ReadMapVar(void)
+{
+    int var = ReadCodeInt();
+    ACSAssert(var >= 0, "negative map variable: %d < 0", var);
+    ACSAssert(var < MAX_ACS_MAP_VARS,
+              "invalid map variable: %d >= %d", var, MAX_ACS_MAP_VARS);
+    return var;
+}
+
+//==========================================================================
+//
+// ReadWorldVar
+//
+// Read a world variable index as an immediate value, validating the
+// result is a valid world variable number.
+//
+//==========================================================================
+
+static int ReadWorldVar(void)
+{
+    int var = ReadCodeInt();
+    ACSAssert(var >= 0, "negative world variable: %d < 0", var);
+    ACSAssert(var < MAX_ACS_WORLD_VARS,
+              "invalid world variable: %d >= %d", var, MAX_ACS_WORLD_VARS);
+    return var;
+}
+
+//==========================================================================
+//
+// StringLookup
+//
+// Look up the given string in the strings table by index, validating that
+// it is a valid string index.
+//
+//==========================================================================
+
+static char *StringLookup(int string_index)
+{
+    ACSAssert(string_index >= 0,
+              "negative string index: %d < 0", string_index);
+    ACSAssert(string_index < ACStringCount,
+              "invalid string index: %d >= %d", string_index, ACStringCount);
+    return ACStrings[string_index];
+}
+
+//==========================================================================
+//
+// ReadOffset
+//
+// Read a lump offset value, validating that it is an offset within the
+// range of the lump.
+//
+//==========================================================================
+
+static int ReadOffset(void)
+{
+    int offset = ReadCodeInt();
+    ACSAssert(offset >= 0, "negative lump offset %d", offset);
+    ACSAssert(offset < ActionCodeSize, "invalid lump offset: %d >= %d",
+              offset, ActionCodeSize);
+    return offset;
+}
+
+//==========================================================================
+//
+// P_LoadACScripts
+//
+//==========================================================================
+
+void P_LoadACScripts(int lump)
+{
+    int i, offset;
+    acsHeader_t *header;
+    acsInfo_t *info;
+
+    ActionCodeBase = W_CacheLumpNum(lump, PU_LEVEL);
+    ActionCodeSize = W_LumpLength(lump);
+
+    M_snprintf(EvalContext, sizeof(EvalContext),
+               "header parsing of lump #%d", lump);
+
+    header = (acsHeader_t *) ActionCodeBase;
+    PCodeOffset = LONG(header->infoOffset);
+
+    ACScriptCount = ReadCodeInt();
+
+    if (ACScriptCount == 0)
+    {                           // Empty behavior lump
+        return;
+    }
+
+    ACSInfo = Z_Malloc(ACScriptCount * sizeof(acsInfo_t), PU_LEVEL, 0);
+    memset(ACSInfo, 0, ACScriptCount * sizeof(acsInfo_t));
+    for (i = 0, info = ACSInfo; i < ACScriptCount; i++, info++)
+    {
+        info->number = ReadCodeInt();
+        info->offset = ReadOffset();
+        info->argCount = ReadCodeInt();
+
+        if (info->argCount > MAX_SCRIPT_ARGS)
+        {
+            fprintf(stderr, "Warning: ACS script #%i has %i arguments, more "
+                            "than the maximum of %i. Enforcing limit.\n"
+                            "If you are seeing this message, please report "
+                            "the name of the WAD where you saw it.\n",
+                            i, info->argCount, MAX_SCRIPT_ARGS);
+            info->argCount = MAX_SCRIPT_ARGS;
+        }
+
+        if (info->number >= OPEN_SCRIPTS_BASE)
+        {                       // Auto-activate
+            info->number -= OPEN_SCRIPTS_BASE;
+            StartOpenACS(info->number, i, info->offset);
+            info->state = ASTE_RUNNING;
+        }
+        else
+        {
+            info->state = ASTE_INACTIVE;
+        }
+    }
+
+    ACStringCount = ReadCodeInt();
+    ACSAssert(ACStringCount >= 0, "negative string count %d", ACStringCount);
+    ACStrings = Z_Malloc(ACStringCount * sizeof(char *), PU_LEVEL, NULL);
+
+    for (i=0; i<ACStringCount; ++i)
+    {
+        offset = ReadOffset();
+        ACStrings[i] = (char *) ActionCodeBase + offset;
+        ACSAssert(memchr(ACStrings[i], '\0', ActionCodeSize - offset) != NULL,
+                  "string %d missing terminating NUL", i);
+    }
+
+    memset(MapVars, 0, sizeof(MapVars));
+}
+
+//==========================================================================
+//
+// StartOpenACS
+//
+//==========================================================================
+
+static void StartOpenACS(int number, int infoIndex, int offset)
+{
+    acs_t *script;
+
+    script = Z_Malloc(sizeof(acs_t), PU_LEVSPEC, 0);
+    memset(script, 0, sizeof(acs_t));
+    script->number = number;
+
+    // World objects are allotted 1 second for initialization
+    script->delayCount = 35;
+
+    script->infoIndex = infoIndex;
+    script->ip = offset;
+    script->thinker.function = T_InterpretACS;
+    P_AddThinker(&script->thinker);
+}
+
+//==========================================================================
+//
+// P_CheckACSStore
+//
+// Scans the ACS store and executes all scripts belonging to the current
+// map.
+//
+//==========================================================================
+
+void P_CheckACSStore(void)
+{
+    acsstore_t *store;
+
+    for (store = ACSStore; store->map != 0; store++)
+    {
+        if (store->map == gamemap)
+        {
+            P_StartACS(store->script, 0, store->args, NULL, NULL, 0);
+            if (NewScript)
+            {
+                NewScript->delayCount = 35;
+            }
+            store->map = -1;
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_StartACS
+//
+// Start an ACS script. The 'args' array should be at least MAX_SCRIPT_ARGS
+// elements in length.
+//
+//==========================================================================
+
+static char ErrorMsg[128];
+
+boolean P_StartACS(int number, int map, byte * args, mobj_t * activator,
+                   line_t * line, int side)
+{
+    int i;
+    acs_t *script;
+    int infoIndex;
+    aste_t *statePtr;
+
+    NewScript = NULL;
+    if (map && map != gamemap)
+    {                           // Add to the script store
+        return AddToACSStore(map, number, args);
+    }
+    infoIndex = GetACSIndex(number);
+    if (infoIndex == -1)
+    {                           // Script not found
+        //I_Error("P_StartACS: Unknown script number %d", number);
+        M_snprintf(ErrorMsg, sizeof(ErrorMsg),
+                   "P_STARTACS ERROR: UNKNOWN SCRIPT %d", number);
+        P_SetMessage(&players[consoleplayer], ErrorMsg, true);
+    }
+    statePtr = &ACSInfo[infoIndex].state;
+    if (*statePtr == ASTE_SUSPENDED)
+    {                           // Resume a suspended script
+        *statePtr = ASTE_RUNNING;
+        return true;
+    }
+    if (*statePtr != ASTE_INACTIVE)
+    {                           // Script is already executing
+        return false;
+    }
+    script = Z_Malloc(sizeof(acs_t), PU_LEVSPEC, 0);
+    memset(script, 0, sizeof(acs_t));
+    script->number = number;
+    script->infoIndex = infoIndex;
+    script->activator = activator;
+    script->line = line;
+    script->side = side;
+    script->ip = ACSInfo[infoIndex].offset;
+    script->thinker.function = T_InterpretACS;
+    for (i = 0; i < MAX_SCRIPT_ARGS && i < ACSInfo[infoIndex].argCount; i++)
+    {
+        script->vars[i] = args[i];
+    }
+    *statePtr = ASTE_RUNNING;
+    P_AddThinker(&script->thinker);
+    NewScript = script;
+    return true;
+}
+
+//==========================================================================
+//
+// AddToACSStore
+//
+//==========================================================================
+
+static boolean AddToACSStore(int map, int number, byte * args)
+{
+    int i;
+    int index;
+
+    index = -1;
+    for (i = 0; ACSStore[i].map != 0; i++)
+    {
+        if (ACSStore[i].script == number && ACSStore[i].map == map)
+        {                       // Don't allow duplicates
+            return false;
+        }
+        if (index == -1 && ACSStore[i].map == -1)
+        {                       // Remember first empty slot
+            index = i;
+        }
+    }
+    if (index == -1)
+    {                           // Append required
+        if (i == MAX_ACS_STORE)
+        {
+            I_Error("AddToACSStore: MAX_ACS_STORE (%d) exceeded.",
+                    MAX_ACS_STORE);
+        }
+        index = i;
+        ACSStore[index + 1].map = 0;
+    }
+    ACSStore[index].map = map;
+    ACSStore[index].script = number;
+    memcpy(ACSStore[index].args, args, MAX_SCRIPT_ARGS);
+    return true;
+}
+
+//==========================================================================
+//
+// P_StartLockedACS
+//
+//==========================================================================
+
+
+boolean P_StartLockedACS(line_t * line, byte * args, mobj_t * mo, int side)
+{
+    int i;
+    int lock;
+    byte newArgs[5];
+    char LockedBuffer[80];
+
+    lock = args[4];
+    if (!mo->player)
+    {
+        return false;
+    }
+    if (lock)
+    {
+        if (!(mo->player->keys & (1 << (lock - 1))))
+        {
+            M_snprintf(LockedBuffer, sizeof(LockedBuffer),
+                       "YOU NEED THE %s\n", TextKeyMessages[lock - 1]);
+            P_SetMessage(mo->player, LockedBuffer, true);
+            S_StartSound(mo, SFX_DOOR_LOCKED);
+            return false;
+        }
+    }
+    for (i = 0; i < 4; i++)
+    {
+        newArgs[i] = args[i];
+    }
+    newArgs[4] = 0;
+    return P_StartACS(newArgs[0], newArgs[1], &newArgs[2], mo, line, side);
+}
+
+//==========================================================================
+//
+// P_TerminateACS
+//
+//==========================================================================
+
+boolean P_TerminateACS(int number, int map)
+{
+    int infoIndex;
+
+    infoIndex = GetACSIndex(number);
+    if (infoIndex == -1)
+    {                           // Script not found
+        return false;
+    }
+    if (ACSInfo[infoIndex].state == ASTE_INACTIVE
+        || ACSInfo[infoIndex].state == ASTE_TERMINATING)
+    {                           // States that disallow termination
+        return false;
+    }
+    ACSInfo[infoIndex].state = ASTE_TERMINATING;
+    return true;
+}
+
+//==========================================================================
+//
+// P_SuspendACS
+//
+//==========================================================================
+
+boolean P_SuspendACS(int number, int map)
+{
+    int infoIndex;
+
+    infoIndex = GetACSIndex(number);
+    if (infoIndex == -1)
+    {                           // Script not found
+        return false;
+    }
+    if (ACSInfo[infoIndex].state == ASTE_INACTIVE
+        || ACSInfo[infoIndex].state == ASTE_SUSPENDED
+        || ACSInfo[infoIndex].state == ASTE_TERMINATING)
+    {                           // States that disallow suspension
+        return false;
+    }
+    ACSInfo[infoIndex].state = ASTE_SUSPENDED;
+    return true;
+}
+
+//==========================================================================
+//
+// P_Init
+//
+//==========================================================================
+
+void P_ACSInitNewGame(void)
+{
+    memset(WorldVars, 0, sizeof(WorldVars));
+    memset(ACSStore, 0, sizeof(ACSStore));
+}
+
+//==========================================================================
+//
+// T_InterpretACS
+//
+//==========================================================================
+
+void T_InterpretACS(thinker_t *thinker)
+{
+    acs_t *script = (acs_t *) thinker;
+    int cmd;
+    int action;
+
+    if (ACSInfo[script->infoIndex].state == ASTE_TERMINATING)
+    {
+        ACSInfo[script->infoIndex].state = ASTE_INACTIVE;
+        ScriptFinished(ACScript->number);
+        P_RemoveThinker(&ACScript->thinker);
+        return;
+    }
+    if (ACSInfo[script->infoIndex].state != ASTE_RUNNING)
+    {
+        return;
+    }
+    if (script->delayCount)
+    {
+        script->delayCount--;
+        return;
+    }
+    ACScript = script;
+    PCodeOffset = ACScript->ip;
+
+    do
+    {
+        M_snprintf(EvalContext, sizeof(EvalContext), "script %d @0x%x",
+                   ACSInfo[script->infoIndex].number, PCodeOffset);
+        cmd = ReadCodeInt();
+        M_snprintf(EvalContext, sizeof(EvalContext), "script %d @0x%x, cmd=%d",
+                   ACSInfo[script->infoIndex].number, PCodeOffset, cmd);
+        ACSAssert(cmd >= 0, "negative ACS instruction %d", cmd);
+        ACSAssert(cmd < arrlen(PCodeCmds),
+                  "invalid ACS instruction %d (maybe this WAD is designed "
+                  "for an advanced source port and is not vanilla "
+                  "compatible)", cmd);
+        action = PCodeCmds[cmd]();
+    } while (action == SCRIPT_CONTINUE);
+
+    ACScript->ip = PCodeOffset;
+
+    if (action == SCRIPT_TERMINATE)
+    {
+        ACSInfo[script->infoIndex].state = ASTE_INACTIVE;
+        ScriptFinished(ACScript->number);
+        P_RemoveThinker(&ACScript->thinker);
+    }
+}
+
+//==========================================================================
+//
+// P_TagFinished
+//
+//==========================================================================
+
+void P_TagFinished(int tag)
+{
+    int i;
+
+    if (TagBusy(tag) == true)
+    {
+        return;
+    }
+    for (i = 0; i < ACScriptCount; i++)
+    {
+        if (ACSInfo[i].state == ASTE_WAITINGFORTAG
+            && ACSInfo[i].waitValue == tag)
+        {
+            ACSInfo[i].state = ASTE_RUNNING;
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_PolyobjFinished
+//
+//==========================================================================
+
+void P_PolyobjFinished(int po)
+{
+    int i;
+
+    if (PO_Busy(po) == true)
+    {
+        return;
+    }
+    for (i = 0; i < ACScriptCount; i++)
+    {
+        if (ACSInfo[i].state == ASTE_WAITINGFORPOLY
+            && ACSInfo[i].waitValue == po)
+        {
+            ACSInfo[i].state = ASTE_RUNNING;
+        }
+    }
+}
+
+//==========================================================================
+//
+// ScriptFinished
+//
+//==========================================================================
+
+static void ScriptFinished(int number)
+{
+    int i;
+
+    for (i = 0; i < ACScriptCount; i++)
+    {
+        if (ACSInfo[i].state == ASTE_WAITINGFORSCRIPT
+            && ACSInfo[i].waitValue == number)
+        {
+            ACSInfo[i].state = ASTE_RUNNING;
+        }
+    }
+}
+
+//==========================================================================
+//
+// TagBusy
+//
+//==========================================================================
+
+static boolean TagBusy(int tag)
+{
+    int sectorIndex;
+
+    sectorIndex = -1;
+    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
+    {
+        if (sectors[sectorIndex].specialdata)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+//==========================================================================
+//
+// GetACSIndex
+//
+// Returns the index of a script number.  Returns -1 if the script number
+// is not found.
+//
+//==========================================================================
+
+static int GetACSIndex(int number)
+{
+    int i;
+
+    for (i = 0; i < ACScriptCount; i++)
+    {
+        if (ACSInfo[i].number == number)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+//==========================================================================
+//
+// CheckACSPresent
+//
+// Placing Korax in a PWAD without extra steps will result in a crash in
+// Vanilla because the relevant ACS scripts are not initialized
+//
+//==========================================================================
+
+void CheckACSPresent(int number)
+{
+    if (GetACSIndex(number) == -1)
+    {
+        I_Error("Required ACS script %d not initialized", number);
+    }
+}
+
+//==========================================================================
+//
+// Push
+//
+//==========================================================================
+
+static void Push(int value)
+{
+    ACSAssert(ACScript->stackPtr < ACS_STACK_DEPTH,
+              "maximum stack depth exceeded: %d >= %d",
+              ACScript->stackPtr, ACS_STACK_DEPTH);
+    ACScript->stack[ACScript->stackPtr++] = value;
+}
+
+//==========================================================================
+//
+// Pop
+//
+//==========================================================================
+
+static int Pop(void)
+{
+    ACSAssert(ACScript->stackPtr > 0, "pop of empty stack");
+    return ACScript->stack[--ACScript->stackPtr];
+}
+
+//==========================================================================
+//
+// Top
+//
+//==========================================================================
+
+static int Top(void)
+{
+    ACSAssert(ACScript->stackPtr > 0, "read from top of empty stack");
+    return ACScript->stack[ACScript->stackPtr - 1];
+}
+
+//==========================================================================
+//
+// Drop
+//
+//==========================================================================
+
+static void Drop(void)
+{
+    ACSAssert(ACScript->stackPtr > 0, "drop on empty stack");
+    ACScript->stackPtr--;
+}
+
+//==========================================================================
+//
+// P-Code Commands
+//
+//==========================================================================
+
+static int CmdNOP(void)
+{
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdTerminate(void)
+{
+    return SCRIPT_TERMINATE;
+}
+
+static int CmdSuspend(void)
+{
+    ACSInfo[ACScript->infoIndex].state = ASTE_SUSPENDED;
+    return SCRIPT_STOP;
+}
+
+static int CmdPushNumber(void)
+{
+    Push(ReadCodeInt());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec1(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[0] = Pop();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec2(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[1] = Pop();
+    SpecArgs[0] = Pop();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec3(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[2] = Pop();
+    SpecArgs[1] = Pop();
+    SpecArgs[0] = Pop();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec4(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[3] = Pop();
+    SpecArgs[2] = Pop();
+    SpecArgs[1] = Pop();
+    SpecArgs[0] = Pop();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec5(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[4] = Pop();
+    SpecArgs[3] = Pop();
+    SpecArgs[2] = Pop();
+    SpecArgs[1] = Pop();
+    SpecArgs[0] = Pop();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec1Direct(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[0] = ReadCodeInt();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec2Direct(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[0] = ReadCodeInt();
+    SpecArgs[1] = ReadCodeInt();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec3Direct(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[0] = ReadCodeInt();
+    SpecArgs[1] = ReadCodeInt();
+    SpecArgs[2] = ReadCodeInt();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec4Direct(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[0] = ReadCodeInt();
+    SpecArgs[1] = ReadCodeInt();
+    SpecArgs[2] = ReadCodeInt();
+    SpecArgs[3] = ReadCodeInt();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLSpec5Direct(void)
+{
+    int special;
+
+    special = ReadCodeInt();
+    SpecArgs[0] = ReadCodeInt();
+    SpecArgs[1] = ReadCodeInt();
+    SpecArgs[2] = ReadCodeInt();
+    SpecArgs[3] = ReadCodeInt();
+    SpecArgs[4] = ReadCodeInt();
+    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
+                         ACScript->side, ACScript->activator);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAdd(void)
+{
+    Push(Pop() + Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSubtract(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() - operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdMultiply(void)
+{
+    Push(Pop() * Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDivide(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() / operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdModulus(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() % operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdEQ(void)
+{
+    Push(Pop() == Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdNE(void)
+{
+    Push(Pop() != Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLT(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() < operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdGT(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() > operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLE(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() <= operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdGE(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() >= operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAssignScriptVar(void)
+{
+    ACScript->vars[ReadScriptVar()] = Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAssignMapVar(void)
+{
+    MapVars[ReadMapVar()] = Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAssignWorldVar(void)
+{
+    WorldVars[ReadWorldVar()] = Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPushScriptVar(void)
+{
+    Push(ACScript->vars[ReadScriptVar()]);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPushMapVar(void)
+{
+    Push(MapVars[ReadMapVar()]);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPushWorldVar(void)
+{
+    Push(WorldVars[ReadWorldVar()]);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAddScriptVar(void)
+{
+    ACScript->vars[ReadScriptVar()] += Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAddMapVar(void)
+{
+    MapVars[ReadMapVar()] += Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAddWorldVar(void)
+{
+    WorldVars[ReadWorldVar()] += Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSubScriptVar(void)
+{
+    ACScript->vars[ReadScriptVar()] -= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSubMapVar(void)
+{
+    MapVars[ReadMapVar()] -= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSubWorldVar(void)
+{
+    WorldVars[ReadWorldVar()] -= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdMulScriptVar(void)
+{
+    ACScript->vars[ReadScriptVar()] *= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdMulMapVar(void)
+{
+    MapVars[ReadMapVar()] *= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdMulWorldVar(void)
+{
+    WorldVars[ReadWorldVar()] *= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDivScriptVar(void)
+{
+    ACScript->vars[ReadScriptVar()] /= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDivMapVar(void)
+{
+    MapVars[ReadMapVar()] /= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDivWorldVar(void)
+{
+    WorldVars[ReadWorldVar()] /= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdModScriptVar(void)
+{
+    ACScript->vars[ReadScriptVar()] %= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdModMapVar(void)
+{
+    MapVars[ReadMapVar()] %= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdModWorldVar(void)
+{
+    WorldVars[ReadWorldVar()] %= Pop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdIncScriptVar(void)
+{
+    ++ACScript->vars[ReadScriptVar()];
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdIncMapVar(void)
+{
+    ++MapVars[ReadMapVar()];
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdIncWorldVar(void)
+{
+    ++WorldVars[ReadWorldVar()];
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDecScriptVar(void)
+{
+    --ACScript->vars[ReadScriptVar()];
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDecMapVar(void)
+{
+    --MapVars[ReadMapVar()];
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDecWorldVar(void)
+{
+    --WorldVars[ReadWorldVar()];
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdGoto(void)
+{
+    PCodeOffset = ReadOffset();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdIfGoto(void)
+{
+    int offset;
+
+    offset = ReadOffset();
+
+    if (Pop() != 0)
+    {
+        PCodeOffset = offset;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDrop(void)
+{
+    Drop();
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdDelay(void)
+{
+    ACScript->delayCount = Pop();
+    return SCRIPT_STOP;
+}
+
+static int CmdDelayDirect(void)
+{
+    ACScript->delayCount = ReadCodeInt();
+    return SCRIPT_STOP;
+}
+
+static int CmdRandom(void)
+{
+    int low;
+    int high;
+
+    high = Pop();
+    low = Pop();
+    Push(low + (P_Random() % (high - low + 1)));
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdRandomDirect(void)
+{
+    int low;
+    int high;
+
+    low = ReadCodeInt();
+    high = ReadCodeInt();
+    Push(low + (P_Random() % (high - low + 1)));
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdThingCount(void)
+{
+    int tid;
+
+    tid = Pop();
+    ThingCount(Pop(), tid);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdThingCountDirect(void)
+{
+    int type;
+
+    type = ReadCodeInt();
+    ThingCount(type, ReadCodeInt());
+    return SCRIPT_CONTINUE;
+}
+
+static void ThingCount(int type, int tid)
+{
+    int count;
+    int searcher;
+    mobj_t *mobj;
+    mobjtype_t moType;
+    thinker_t *think;
+
+    if (!(type + tid))
+    {                           // Nothing to count
+        return;
+    }
+    moType = TranslateThingType[type];
+    count = 0;
+    searcher = -1;
+    if (tid)
+    {                           // Count TID things
+        while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+        {
+            if (type == 0)
+            {                   // Just count TIDs
+                count++;
+            }
+            else if (moType == mobj->type)
+            {
+                if (mobj->flags & MF_COUNTKILL && mobj->health <= 0)
+                {               // Don't count dead monsters
+                    continue;
+                }
+                count++;
+            }
+        }
+    }
+    else
+    {                           // Count only types
+        for (think = thinkercap.next; think != &thinkercap;
+             think = think->next)
+        {
+            if (think->function != P_MobjThinker)
+            {                   // Not a mobj thinker
+                continue;
+            }
+            mobj = (mobj_t *) think;
+            if (mobj->type != moType)
+            {                   // Doesn't match
+                continue;
+            }
+            if (mobj->flags & MF_COUNTKILL && mobj->health <= 0)
+            {                   // Don't count dead monsters
+                continue;
+            }
+            count++;
+        }
+    }
+    Push(count);
+}
+
+static int CmdTagWait(void)
+{
+    ACSInfo[ACScript->infoIndex].waitValue = Pop();
+    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORTAG;
+    return SCRIPT_STOP;
+}
+
+static int CmdTagWaitDirect(void)
+{
+    ACSInfo[ACScript->infoIndex].waitValue = ReadCodeInt();
+    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORTAG;
+    return SCRIPT_STOP;
+}
+
+static int CmdPolyWait(void)
+{
+    ACSInfo[ACScript->infoIndex].waitValue = Pop();
+    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORPOLY;
+    return SCRIPT_STOP;
+}
+
+static int CmdPolyWaitDirect(void)
+{
+    ACSInfo[ACScript->infoIndex].waitValue = ReadCodeInt();
+    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORPOLY;
+    return SCRIPT_STOP;
+}
+
+static int CmdChangeFloor(void)
+{
+    int tag;
+    int flat;
+    int sectorIndex;
+
+    flat = R_FlatNumForName(StringLookup(Pop()));
+    tag = Pop();
+    sectorIndex = -1;
+    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
+    {
+        sectors[sectorIndex].floorpic = flat;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdChangeFloorDirect(void)
+{
+    int tag;
+    int flat;
+    int sectorIndex;
+
+    tag = ReadCodeInt();
+    flat = R_FlatNumForName(StringLookup(ReadCodeInt()));
+    sectorIndex = -1;
+    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
+    {
+        sectors[sectorIndex].floorpic = flat;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdChangeCeiling(void)
+{
+    int tag;
+    int flat;
+    int sectorIndex;
+
+    flat = R_FlatNumForName(StringLookup(Pop()));
+    tag = Pop();
+    sectorIndex = -1;
+    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
+    {
+        sectors[sectorIndex].ceilingpic = flat;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdChangeCeilingDirect(void)
+{
+    int tag;
+    int flat;
+    int sectorIndex;
+
+    tag = ReadCodeInt();
+    flat = R_FlatNumForName(StringLookup(ReadCodeInt()));
+    sectorIndex = -1;
+    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
+    {
+        sectors[sectorIndex].ceilingpic = flat;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdRestart(void)
+{
+    PCodeOffset = ACSInfo[ACScript->infoIndex].offset;
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAndLogical(void)
+{
+    Push(Pop() && Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdOrLogical(void)
+{
+    Push(Pop() || Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAndBitwise(void)
+{
+    Push(Pop() & Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdOrBitwise(void)
+{
+    Push(Pop() | Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdEorBitwise(void)
+{
+    Push(Pop() ^ Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdNegateLogical(void)
+{
+    Push(!Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLShift(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() << operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdRShift(void)
+{
+    int operand2;
+
+    operand2 = Pop();
+    Push(Pop() >> operand2);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdUnaryMinus(void)
+{
+    Push(-Pop());
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdIfNotGoto(void)
+{
+    int offset;
+
+    offset = ReadOffset();
+
+    if (Pop() == 0)
+    {
+        PCodeOffset = offset;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdLineSide(void)
+{
+    Push(ACScript->side);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdScriptWait(void)
+{
+    ACSInfo[ACScript->infoIndex].waitValue = Pop();
+    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORSCRIPT;
+    return SCRIPT_STOP;
+}
+
+static int CmdScriptWaitDirect(void)
+{
+    ACSInfo[ACScript->infoIndex].waitValue = ReadCodeInt();
+    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORSCRIPT;
+    return SCRIPT_STOP;
+}
+
+static int CmdClearLineSpecial(void)
+{
+    if (ACScript->line)
+    {
+        ACScript->line->special = 0;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdCaseGoto(void)
+{
+    int value;
+    int offset;
+
+    value = ReadCodeInt();
+    offset = ReadOffset();
+
+    if (Top() == value)
+    {
+        PCodeOffset = offset;
+        Drop();
+    }
+
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdBeginPrint(void)
+{
+    *PrintBuffer = 0;
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdEndPrint(void)
+{
+    player_t *player;
+
+    if (ACScript->activator && ACScript->activator->player)
+    {
+        player = ACScript->activator->player;
+    }
+    else
+    {
+        player = &players[consoleplayer];
+    }
+    P_SetMessage(player, PrintBuffer, true);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdEndPrintBold(void)
+{
+    int i;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (playeringame[i])
+        {
+            P_SetYellowMessage(&players[i], PrintBuffer, true);
+        }
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPrintString(void)
+{
+    M_StringConcat(PrintBuffer, StringLookup(Pop()), sizeof(PrintBuffer));
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPrintNumber(void)
+{
+    char tempStr[16];
+
+    M_snprintf(tempStr, sizeof(tempStr), "%d", Pop());
+    M_StringConcat(PrintBuffer, tempStr, sizeof(PrintBuffer));
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPrintCharacter(void)
+{
+    char tempStr[2];
+
+    tempStr[0] = Pop();
+    tempStr[1] = '\0';
+    M_StringConcat(PrintBuffer, tempStr, sizeof(PrintBuffer));
+
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdPlayerCount(void)
+{
+    int i;
+    int count;
+
+    count = 0;
+    for (i = 0; i < maxplayers; i++)
+    {
+        count += playeringame[i];
+    }
+    Push(count);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdGameType(void)
+{
+    int gametype;
+
+    if (netgame == false)
+    {
+        gametype = GAME_SINGLE_PLAYER;
+    }
+    else if (deathmatch)
+    {
+        gametype = GAME_NET_DEATHMATCH;
+    }
+    else
+    {
+        gametype = GAME_NET_COOPERATIVE;
+    }
+    Push(gametype);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdGameSkill(void)
+{
+    Push(gameskill);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdTimer(void)
+{
+    Push(leveltime);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSectorSound(void)
+{
+    int volume;
+    mobj_t *mobj;
+
+    mobj = NULL;
+    if (ACScript->line)
+    {
+        mobj = (mobj_t *) & ACScript->line->frontsector->soundorg;
+    }
+    volume = Pop();
+    S_StartSoundAtVolume(mobj, S_GetSoundID(StringLookup(Pop())), volume);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdThingSound(void)
+{
+    int tid;
+    int sound;
+    int volume;
+    mobj_t *mobj;
+    int searcher;
+
+    volume = Pop();
+    sound = S_GetSoundID(StringLookup(Pop()));
+    tid = Pop();
+    searcher = -1;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        S_StartSoundAtVolume(mobj, sound, volume);
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdAmbientSound(void)
+{
+    int volume;
+
+    volume = Pop();
+    S_StartSoundAtVolume(NULL, S_GetSoundID(StringLookup(Pop())), volume);
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSoundSequence(void)
+{
+    mobj_t *mobj;
+
+    mobj = NULL;
+    if (ACScript->line)
+    {
+        mobj = (mobj_t *) & ACScript->line->frontsector->soundorg;
+    }
+    SN_StartSequenceName(mobj, StringLookup(Pop()));
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSetLineTexture(void)
+{
+    line_t *line;
+    int lineTag;
+    int side;
+    int position;
+    int texture;
+    int searcher;
+
+    texture = R_TextureNumForName(StringLookup(Pop()));
+    position = Pop();
+    side = Pop();
+    lineTag = Pop();
+    searcher = -1;
+    while ((line = P_FindLine(lineTag, &searcher)) != NULL)
+    {
+        if (position == TEXTURE_MIDDLE)
+        {
+            sides[line->sidenum[side]].midtexture = texture;
+        }
+        else if (position == TEXTURE_BOTTOM)
+        {
+            sides[line->sidenum[side]].bottomtexture = texture;
+        }
+        else
+        {                       // TEXTURE_TOP
+            sides[line->sidenum[side]].toptexture = texture;
+        }
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSetLineBlocking(void)
+{
+    line_t *line;
+    int lineTag;
+    boolean blocking;
+    int searcher;
+
+    blocking = Pop()? ML_BLOCKING : 0;
+    lineTag = Pop();
+    searcher = -1;
+    while ((line = P_FindLine(lineTag, &searcher)) != NULL)
+    {
+        line->flags = (line->flags & ~ML_BLOCKING) | blocking;
+    }
+    return SCRIPT_CONTINUE;
+}
+
+static int CmdSetLineSpecial(void)
+{
+    line_t *line;
+    int lineTag;
+    int special, arg1, arg2, arg3, arg4, arg5;
+    int searcher;
+
+    arg5 = Pop();
+    arg4 = Pop();
+    arg3 = Pop();
+    arg2 = Pop();
+    arg1 = Pop();
+    special = Pop();
+    lineTag = Pop();
+    searcher = -1;
+    while ((line = P_FindLine(lineTag, &searcher)) != NULL)
+    {
+        line->special = special;
+        line->arg1 = arg1;
+        line->arg2 = arg2;
+        line->arg3 = arg3;
+        line->arg4 = arg4;
+        line->arg5 = arg5;
+    }
+    return SCRIPT_CONTINUE;
+}
diff --git a/games/NXDoom/src/hexen/p_action.h b/games/NXDoom/src/hexen/p_action.h
new file mode 100644
index 000000000..8336fbe58
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_action.h
@@ -0,0 +1,240 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// External definitions for action pointer functions.
+//
+
+#ifndef HEXEN_P_ACTION_H
+#define HEXEN_P_ACTION_H
+
+
+void A_FreeTargMobj(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FlameCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_HideThing(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_RestoreSpecialThing1(mobj_t *thing, player_t *player, pspdef_t *psp);
+void A_RestoreSpecialThing2(mobj_t *thing, player_t *player, pspdef_t *psp);
+void A_RestoreArtifact(mobj_t *arti, player_t *player, pspdef_t *psp);
+void A_Summon(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ThrustInitUp(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ThrustInitDn(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ThrustRaise(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ThrustBlock(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ThrustImpale(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ThrustLower(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_TeloSpawnC(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_TeloSpawnB(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_TeloSpawnA(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_TeloSpawnD(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CheckTeleRing(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FogSpawn(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FogMove(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Quake(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ContMobjSound(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Scream(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PoisonBagInit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PoisonBagDamage(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PoisonBagCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CheckThrowBomb(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_NoGravity(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PotteryExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PotteryChooseBit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PotteryCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CorpseBloodDrip(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CorpseExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LeafSpawn(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LeafThrust(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LeafCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BridgeInit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BridgeOrbit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_TreeDeath(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PoisonShroom(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Pain(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SoAExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BellReset1(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BellReset2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Light0(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WeaponReady(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Lower(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Raise(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FPunchAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ReFire(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FAxeAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FHammerAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FHammerThrow(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FSwordAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FSwordFlames(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CMaceAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CStaffInitBlink(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CStaffCheckBlink(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CStaffCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CStaffMissileSlither(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CFlameAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CFlameRotate(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CFlamePuff(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CFlameMissile(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolyAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolyPalette(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolySeek(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolyCheckScream(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolyTail(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolySpawnPuff(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolyAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MWandAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LightningReady(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MLightningAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LightningZap(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LightningClip(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LightningRemove(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_LastZap(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ZapMimic(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MStaffPalette(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MStaffWeave(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MStaffTrack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SnoutAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FireConePL1(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ShedShard(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_AddPlayerCorpse(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SkullPop(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FreezeDeath(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CheckBurnGone(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CheckSkullFloor(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CheckSkullDone(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SpeedFade(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceSetTics(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceCheckHeadDone(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PigPain(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PigLook(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PigChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_PigAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_QueueCorpse(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CentaurAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CentaurAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SetReflective(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CentaurDefend(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_UnSetReflective(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CentaurDropStuff(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CheckFloor(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DemonAttack1(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DemonAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DemonDeath(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_Demon2Death(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithRaiseInit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithRaise(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithInit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithLook(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithFX3(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithMelee(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithMissile(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_WraithFX2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurFade1(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurFade2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurRoam(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurAtk1(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurAtk2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurAtk3(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurCharge(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SmokePuffExit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurFade0(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MntrFloorFire(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentHumpDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentUnHide(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentRaiseHump(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentLowerHump(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentHide(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentBirthScream(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SetShootable(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentCheckForAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_UnSetShootable(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentDiveSound(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentWalk(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentChooseAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentMeleeAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentMissileAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentHeadPop(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentSpawnGibs(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SerpentHeadCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FloatGib(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DelayGib(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SinkGib(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopDoBlur(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopSpawnBlur(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopPainBlur(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopPuff(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SetAltShadow(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopMissileWeave(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BishopMissileSeek(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonInitFlight(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonFlap(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonFlight(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonPain(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonCheckCrash(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DragonFX2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ESound(mobj_t *mo, player_t *player, pspdef_t *psp);
+void A_EttinAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DropMace(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FiredRocks(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_UnSetInvulnerable(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FiredChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FiredAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FiredSplotch(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SmBounce(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceGuyLook(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceGuyChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceGuyAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceGuyDie(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceGuyMissilePuff(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_IceGuyMissileExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ClassBossHealth(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FastChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FighterAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_ClericAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MageAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcBallPop(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcFX2Split(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcFX2Orbit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcererBishopEntry(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SpawnBishop(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcFX4Check(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxStep2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxChase(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxStep(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxMissile(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxCommand(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KoraxBonePop(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KSpiritRoam(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KBoltRaise(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_KBolt(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BatSpawnInit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BatSpawn(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BatMove(mobj_t *actor, player_t *player, pspdef_t *psp);
+
+
+#endif // HEXEN_P_ACTION_H
diff --git a/games/NXDoom/src/hexen/p_anim.c b/games/NXDoom/src/hexen/p_anim.c
new file mode 100644
index 000000000..12f90a5ed
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_anim.c
@@ -0,0 +1,477 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define ANIM_SCRIPT_NAME "ANIMDEFS"
+#define MAX_ANIM_DEFS 20
+#define MAX_FRAME_DEFS 96
+#define ANIM_FLAT 0
+#define ANIM_TEXTURE 1
+#define SCI_FLAT "flat"
+#define SCI_TEXTURE "texture"
+#define SCI_PIC "pic"
+#define SCI_TICS "tics"
+#define SCI_RAND "rand"
+
+#define LIGHTNING_SPECIAL 	198
+#define LIGHTNING_SPECIAL2 	199
+#define SKYCHANGE_SPECIAL 	200
+
+// TYPES -------------------------------------------------------------------
+
+typedef struct
+{
+    int index;
+    int tics;
+} frameDef_t;
+
+typedef struct
+{
+    int type;
+    int index;
+    int tics;
+    int currentFrameDef;
+    int startFrameDef;
+    int endFrameDef;
+} animDef_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void P_LightningFlash(void);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+fixed_t Sky1ScrollDelta;
+fixed_t Sky2ScrollDelta;
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static animDef_t AnimDefs[MAX_ANIM_DEFS];
+static frameDef_t FrameDefs[MAX_FRAME_DEFS];
+static int AnimDefCount;
+static boolean LevelHasLightning;
+static int NextLightningFlash;
+static int LightningFlash;
+static int *LightningLightLevels;
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// P_AnimateSurfaces
+//
+//==========================================================================
+
+void P_AnimateSurfaces(void)
+{
+    int i;
+    animDef_t *ad;
+    line_t *line;
+
+    // Animate flats and textures
+    for (i = 0; i < AnimDefCount; i++)
+    {
+        ad = &AnimDefs[i];
+        ad->tics--;
+        if (ad->tics == 0)
+        {
+            if (ad->currentFrameDef == ad->endFrameDef)
+            {
+                ad->currentFrameDef = ad->startFrameDef;
+            }
+            else
+            {
+                ad->currentFrameDef++;
+            }
+            ad->tics = FrameDefs[ad->currentFrameDef].tics;
+            if (ad->tics > 255)
+            {                   // Random tics
+                ad->tics = (ad->tics >> 16)
+                    + P_Random() % ((ad->tics & 0xff00) >> 8);
+            }
+            if (ad->type == ANIM_FLAT)
+            {
+                flattranslation[ad->index] =
+                    FrameDefs[ad->currentFrameDef].index;
+            }
+            else
+            {                   // Texture
+                texturetranslation[ad->index] =
+                    FrameDefs[ad->currentFrameDef].index;
+            }
+        }
+    }
+
+    // Update scrolling textures
+    for (i = 0; i < numlinespecials; i++)
+    {
+        line = linespeciallist[i];
+        switch (line->special)
+        {
+            case 100:          // Scroll_Texture_Left
+                sides[line->sidenum[0]].textureoffset += line->arg1 << 10;
+                break;
+            case 101:          // Scroll_Texture_Right
+                sides[line->sidenum[0]].textureoffset -= line->arg1 << 10;
+                break;
+            case 102:          // Scroll_Texture_Up
+                sides[line->sidenum[0]].rowoffset += line->arg1 << 10;
+                break;
+            case 103:          // Scroll_Texture_Down
+                sides[line->sidenum[0]].rowoffset -= line->arg1 << 10;
+                break;
+        }
+    }
+
+    // Update sky column offsets
+    Sky1ColumnOffset += Sky1ScrollDelta;
+    Sky2ColumnOffset += Sky2ScrollDelta;
+
+    if (LevelHasLightning)
+    {
+        if (!NextLightningFlash || LightningFlash)
+        {
+            P_LightningFlash();
+        }
+        else
+        {
+            NextLightningFlash--;
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_LightningFlash
+//
+//==========================================================================
+
+static void P_LightningFlash(void)
+{
+    int i;
+    sector_t *tempSec;
+    int *tempLight;
+    boolean foundSec;
+    int flashLight;
+
+    if (LightningFlash)
+    {
+        LightningFlash--;
+        if (LightningFlash)
+        {
+            tempLight = LightningLightLevels;
+            tempSec = sectors;
+            for (i = 0; i < numsectors; i++, tempSec++)
+            {
+                if (tempSec->ceilingpic == skyflatnum
+                    || tempSec->special == LIGHTNING_SPECIAL
+                    || tempSec->special == LIGHTNING_SPECIAL2)
+                {
+                    if (*tempLight < tempSec->lightlevel - 4)
+                    {
+                        tempSec->lightlevel -= 4;
+                    }
+                    tempLight++;
+                }
+            }
+        }
+        else
+        {                       // remove the alternate lightning flash special
+            tempLight = LightningLightLevels;
+            tempSec = sectors;
+            for (i = 0; i < numsectors; i++, tempSec++)
+            {
+                if (tempSec->ceilingpic == skyflatnum
+                    || tempSec->special == LIGHTNING_SPECIAL
+                    || tempSec->special == LIGHTNING_SPECIAL2)
+                {
+                    tempSec->lightlevel = *tempLight;
+                    tempLight++;
+                }
+            }
+            Sky1Texture = P_GetMapSky1Texture(gamemap);
+        }
+        return;
+    }
+    LightningFlash = (P_Random() & 7) + 8;
+    flashLight = 200 + (P_Random() & 31);
+    tempSec = sectors;
+    tempLight = LightningLightLevels;
+    foundSec = false;
+    for (i = 0; i < numsectors; i++, tempSec++)
+    {
+        if (tempSec->ceilingpic == skyflatnum
+            || tempSec->special == LIGHTNING_SPECIAL
+            || tempSec->special == LIGHTNING_SPECIAL2)
+        {
+            *tempLight = tempSec->lightlevel;
+            if (tempSec->special == LIGHTNING_SPECIAL)
+            {
+                tempSec->lightlevel += 64;
+                if (tempSec->lightlevel > flashLight)
+                {
+                    tempSec->lightlevel = flashLight;
+                }
+            }
+            else if (tempSec->special == LIGHTNING_SPECIAL2)
+            {
+                tempSec->lightlevel += 32;
+                if (tempSec->lightlevel > flashLight)
+                {
+                    tempSec->lightlevel = flashLight;
+                }
+            }
+            else
+            {
+                tempSec->lightlevel = flashLight;
+            }
+            if (tempSec->lightlevel < *tempLight)
+            {
+                tempSec->lightlevel = *tempLight;
+            }
+            tempLight++;
+            foundSec = true;
+        }
+    }
+    if (foundSec)
+    {
+        Sky1Texture = P_GetMapSky2Texture(gamemap);     // set alternate sky                
+        S_StartSound(NULL, SFX_THUNDER_CRASH);
+    }
+    // Calculate the next lighting flash
+    if (!NextLightningFlash)
+    {
+        if (P_Random() < 50)
+        {                       // Immediate Quick flash
+            NextLightningFlash = (P_Random() & 15) + 16;
+        }
+        else
+        {
+            if (P_Random() < 128 && !(leveltime & 32))
+            {
+                NextLightningFlash = ((P_Random() & 7) + 2) * 35;
+            }
+            else
+            {
+                NextLightningFlash = ((P_Random() & 15) + 5) * 35;
+            }
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_ForceLightning
+//
+//==========================================================================
+
+void P_ForceLightning(void)
+{
+    NextLightningFlash = 0;
+}
+
+//==========================================================================
+//
+// P_InitLightning
+//
+//==========================================================================
+
+void P_InitLightning(void)
+{
+    int i;
+    int secCount;
+
+    if (!P_GetMapLightning(gamemap))
+    {
+        LevelHasLightning = false;
+        LightningFlash = 0;
+        return;
+    }
+    LightningFlash = 0;
+    secCount = 0;
+    for (i = 0; i < numsectors; i++)
+    {
+        if (sectors[i].ceilingpic == skyflatnum
+            || sectors[i].special == LIGHTNING_SPECIAL
+            || sectors[i].special == LIGHTNING_SPECIAL2)
+        {
+            secCount++;
+        }
+    }
+    if (secCount)
+    {
+        LevelHasLightning = true;
+    }
+    else
+    {
+        LevelHasLightning = false;
+        return;
+    }
+    LightningLightLevels = (int *) Z_Malloc(secCount * sizeof(int), PU_LEVEL,
+                                            NULL);
+    NextLightningFlash = ((P_Random() & 15) + 5) * 35;  // don't flash at level start
+}
+
+//==========================================================================
+//
+// P_InitFTAnims
+//
+// Initialize flat and texture animation lists.
+//
+//==========================================================================
+
+void P_InitFTAnims(void)
+{
+    int base;
+    int mod;
+    int fd;
+    animDef_t *ad;
+    boolean ignore;
+    boolean done;
+
+    fd = 0;
+    ad = AnimDefs;
+    AnimDefCount = 0;
+    SC_Open(ANIM_SCRIPT_NAME);
+    while (SC_GetString())
+    {
+        if (AnimDefCount == MAX_ANIM_DEFS)
+        {
+            I_Error("P_InitFTAnims: too many AnimDefs.");
+        }
+        if (SC_Compare(SCI_FLAT))
+        {
+            ad->type = ANIM_FLAT;
+        }
+        else if (SC_Compare(SCI_TEXTURE))
+        {
+            ad->type = ANIM_TEXTURE;
+        }
+        else
+        {
+            SC_ScriptError(NULL);
+        }
+        SC_MustGetString();     // Name
+        ignore = false;
+        if (ad->type == ANIM_FLAT)
+        {
+            if (W_CheckNumForName(sc_String) == -1)
+            {
+                ignore = true;
+            }
+            else
+            {
+                ad->index = R_FlatNumForName(sc_String);
+            }
+        }
+        else
+        {                       // Texture
+            if (R_CheckTextureNumForName(sc_String) == -1)
+            {
+                ignore = true;
+            }
+            else
+            {
+                ad->index = R_TextureNumForName(sc_String);
+            }
+        }
+        ad->startFrameDef = fd;
+        done = false;
+        while (done == false)
+        {
+            if (SC_GetString())
+            {
+                if (SC_Compare(SCI_PIC))
+                {
+                    if (fd == MAX_FRAME_DEFS)
+                    {
+                        I_Error("P_InitFTAnims: too many FrameDefs.");
+                    }
+                    SC_MustGetNumber();
+                    if (ignore == false)
+                    {
+                        FrameDefs[fd].index = ad->index + sc_Number - 1;
+                    }
+                    SC_MustGetString();
+                    if (SC_Compare(SCI_TICS))
+                    {
+                        SC_MustGetNumber();
+                        if (ignore == false)
+                        {
+                            FrameDefs[fd].tics = sc_Number;
+                            fd++;
+                        }
+                    }
+                    else if (SC_Compare(SCI_RAND))
+                    {
+                        SC_MustGetNumber();
+                        base = sc_Number;
+                        SC_MustGetNumber();
+                        if (ignore == false)
+                        {
+                            mod = sc_Number - base + 1;
+                            FrameDefs[fd].tics = (base << 16) + (mod << 8);
+                            fd++;
+                        }
+                    }
+                    else
+                    {
+                        SC_ScriptError(NULL);
+                    }
+                }
+                else
+                {
+                    SC_UnGet();
+                    done = true;
+                }
+            }
+            else
+            {
+                done = true;
+            }
+        }
+        if ((ignore == false) && (fd - ad->startFrameDef < 2))
+        {
+            I_Error("P_InitFTAnims: AnimDef has framecount < 2.");
+        }
+        if (ignore == false)
+        {
+            ad->endFrameDef = fd - 1;
+            ad->currentFrameDef = ad->endFrameDef;
+            ad->tics = 1;       // Force 1st game tic to animate
+            AnimDefCount++;
+            ad++;
+        }
+    }
+    SC_Close();
+}
diff --git a/games/NXDoom/src/hexen/p_ceilng.c b/games/NXDoom/src/hexen/p_ceilng.c
new file mode 100644
index 000000000..dfe0ba66f
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_ceilng.c
@@ -0,0 +1,303 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "p_local.h"
+
+//==================================================================
+//==================================================================
+//
+//                                                      CEILINGS
+//
+//==================================================================
+//==================================================================
+
+ceiling_t *activeceilings[MAXCEILINGS];
+
+//==================================================================
+//
+//      T_MoveCeiling
+//
+//==================================================================
+void T_MoveCeiling(thinker_t *thinker)
+{
+    ceiling_t *ceiling = (ceiling_t *) thinker;
+    result_e res;
+
+    switch (ceiling->direction)
+    {
+//              case 0:         // IN STASIS
+//                      break;
+        case 1:                // UP
+            res = T_MovePlane(ceiling->sector, ceiling->speed,
+                              ceiling->topheight, false, 1,
+                              ceiling->direction);
+            if (res == RES_PASTDEST)
+            {
+                SN_StopSequence((mobj_t *) & ceiling->sector->soundorg);
+                switch (ceiling->type)
+                {
+                    case CLEV_CRUSHANDRAISE:
+                        ceiling->direction = -1;
+                        ceiling->speed = ceiling->speed * 2;
+                        break;
+                    default:
+                        P_RemoveActiveCeiling(ceiling);
+                        break;
+                }
+            }
+            break;
+        case -1:               // DOWN
+            res = T_MovePlane(ceiling->sector, ceiling->speed,
+                              ceiling->bottomheight, ceiling->crush, 1,
+                              ceiling->direction);
+            if (res == RES_PASTDEST)
+            {
+                SN_StopSequence((mobj_t *) & ceiling->sector->soundorg);
+                switch (ceiling->type)
+                {
+                    case CLEV_CRUSHANDRAISE:
+                    case CLEV_CRUSHRAISEANDSTAY:
+                        ceiling->direction = 1;
+                        ceiling->speed = ceiling->speed / 2;
+                        break;
+                    default:
+                        P_RemoveActiveCeiling(ceiling);
+                        break;
+                }
+            }
+            else if (res == RES_CRUSHED)
+            {
+                switch (ceiling->type)
+                {
+                    case CLEV_CRUSHANDRAISE:
+                    case CLEV_LOWERANDCRUSH:
+                    case CLEV_CRUSHRAISEANDSTAY:
+                        //ceiling->speed = ceiling->speed/4;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+    }
+}
+
+//==================================================================
+//
+//              EV_DoCeiling
+//              Move a ceiling up/down and all around!
+//
+//==================================================================
+int EV_DoCeiling(line_t * line, byte * arg, ceiling_e type)
+{
+    int secnum, rtn;
+    sector_t *sec;
+    ceiling_t *ceiling;
+
+    secnum = -1;
+    rtn = 0;
+
+/* Old Ceiling stasis code
+	//
+	//      Reactivate in-stasis ceilings...for certain types.
+	//
+	switch(type)
+	{
+		case CLEV_CRUSHANDRAISE:
+			P_ActivateInStasisCeiling(line);
+		default:
+			break;
+	}
+*/
+    while ((secnum = P_FindSectorFromTag(arg[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        //
+        // new door thinker
+        //
+        rtn = 1;
+        ceiling = Z_Malloc(sizeof(*ceiling), PU_LEVSPEC, 0);
+        P_AddThinker(&ceiling->thinker);
+        sec->specialdata = ceiling;
+        ceiling->thinker.function = T_MoveCeiling;
+        ceiling->sector = sec;
+        ceiling->crush = 0;
+        ceiling->speed = arg[1] * (FRACUNIT / 8);
+        switch (type)
+        {
+            case CLEV_CRUSHRAISEANDSTAY:
+                ceiling->crush = arg[2];        // arg[2] = crushing value
+                ceiling->topheight = sec->ceilingheight;
+                ceiling->bottomheight = sec->floorheight + (8 * FRACUNIT);
+                ceiling->direction = -1;
+                break;
+            case CLEV_CRUSHANDRAISE:
+                ceiling->topheight = sec->ceilingheight;
+            case CLEV_LOWERANDCRUSH:
+                ceiling->crush = arg[2];        // arg[2] = crushing value
+            case CLEV_LOWERTOFLOOR:
+                ceiling->bottomheight = sec->floorheight;
+                if (type != CLEV_LOWERTOFLOOR)
+                {
+                    ceiling->bottomheight += 8 * FRACUNIT;
+                }
+                ceiling->direction = -1;
+                break;
+            case CLEV_RAISETOHIGHEST:
+                ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
+                ceiling->direction = 1;
+                break;
+            case CLEV_LOWERBYVALUE:
+                ceiling->bottomheight =
+                    sec->ceilingheight - arg[2] * FRACUNIT;
+                ceiling->direction = -1;
+                break;
+            case CLEV_RAISEBYVALUE:
+                ceiling->topheight = sec->ceilingheight + arg[2] * FRACUNIT;
+                ceiling->direction = 1;
+                break;
+            case CLEV_MOVETOVALUETIMES8:
+                {
+                    int destHeight = arg[2] * FRACUNIT * 8;
+
+                    if (arg[3])
+                    {
+                        destHeight = -destHeight;
+                    }
+                    if (sec->ceilingheight <= destHeight)
+                    {
+                        ceiling->direction = 1;
+                        ceiling->topheight = destHeight;
+                        if (sec->ceilingheight == destHeight)
+                        {
+                            rtn = 0;
+                        }
+                    }
+                    else if (sec->ceilingheight > destHeight)
+                    {
+                        ceiling->direction = -1;
+                        ceiling->bottomheight = destHeight;
+                    }
+                    break;
+                }
+            default:
+                rtn = 0;
+                break;
+        }
+        ceiling->tag = sec->tag;
+        ceiling->type = type;
+        P_AddActiveCeiling(ceiling);
+        if (rtn)
+        {
+            SN_StartSequence((mobj_t *) & ceiling->sector->soundorg,
+                             SEQ_PLATFORM + ceiling->sector->seqType);
+        }
+    }
+    return rtn;
+}
+
+//==================================================================
+//
+//              Add an active ceiling
+//
+//==================================================================
+void P_AddActiveCeiling(ceiling_t * c)
+{
+    int i;
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] == NULL)
+        {
+            activeceilings[i] = c;
+            return;
+        }
+}
+
+//==================================================================
+//
+//              Remove a ceiling's thinker
+//
+//==================================================================
+void P_RemoveActiveCeiling(ceiling_t * c)
+{
+    int i;
+
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] == c)
+        {
+            activeceilings[i]->sector->specialdata = NULL;
+            P_RemoveThinker(&activeceilings[i]->thinker);
+            P_TagFinished(activeceilings[i]->sector->tag);
+            activeceilings[i] = NULL;
+            break;
+        }
+}
+
+#if 0
+//==================================================================
+//
+//              Restart a ceiling that's in-stasis
+//
+//==================================================================
+void P_ActivateInStasisCeiling(line_t * line)
+{
+    int i;
+
+    for (i = 0; i < MAXCEILINGS; i++)
+        if (activeceilings[i] && (activeceilings[i]->tag == line->arg1) &&
+            (activeceilings[i]->direction == 0))
+        {
+            activeceilings[i]->direction = activeceilings[i]->olddirection;
+            activeceilings[i]->thinker.function = T_MoveCeiling;
+            SN_StartSequence((mobj_t *) & activeceilings[i]->sector->soundorg,
+                             SEQ_PLATFORM +
+                             activeceilings[i]->sector->seqType);
+        }
+}
+#endif
+
+//==================================================================
+//
+//              EV_CeilingCrushStop
+//              Stop a ceiling from crushing!
+//
+//==================================================================
+
+int EV_CeilingCrushStop(line_t * line, byte * args)
+{
+    int i;
+    int rtn;
+
+    rtn = 0;
+    for (i = 0; i < MAXCEILINGS; i++)
+    {
+        if (activeceilings[i] && activeceilings[i]->tag == args[0])
+        {
+            rtn = 1;
+            SN_StopSequence((mobj_t *) & activeceilings[i]->sector->soundorg);
+            activeceilings[i]->sector->specialdata = NULL;
+            P_RemoveThinker(&activeceilings[i]->thinker);
+            P_TagFinished(activeceilings[i]->sector->tag);
+            activeceilings[i] = NULL;
+            break;
+        }
+    }
+    return rtn;
+}
diff --git a/games/NXDoom/src/hexen/p_doors.c b/games/NXDoom/src/hexen/p_doors.c
new file mode 100644
index 000000000..eb526f2d5
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_doors.c
@@ -0,0 +1,319 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "p_local.h"
+
+//==================================================================
+//==================================================================
+//
+//                                                      VERTICAL DOORS
+//
+//==================================================================
+//==================================================================
+
+//==================================================================
+//
+//      T_VerticalDoor
+//
+//==================================================================
+void T_VerticalDoor(thinker_t *thinker)
+{
+    vldoor_t *door = (vldoor_t *) thinker;
+    result_e res;
+
+    switch (door->direction)
+    {
+        case 0:                // WAITING
+            if (!--door->topcountdown)
+                switch (door->type)
+                {
+                    case DREV_NORMAL:
+                        door->direction = -1;   // time to go back down
+                        SN_StartSequence((mobj_t *) & door->sector->soundorg,
+                                         SEQ_DOOR_STONE +
+                                         door->sector->seqType);
+                        break;
+                    case DREV_CLOSE30THENOPEN:
+                        door->direction = 1;
+                        break;
+                    default:
+                        break;
+                }
+            break;
+        case 2:                // INITIAL WAIT
+            if (!--door->topcountdown)
+            {
+                switch (door->type)
+                {
+                    case DREV_RAISEIN5MINS:
+                        door->direction = 1;
+                        door->type = DREV_NORMAL;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+        case -1:               // DOWN
+            res = T_MovePlane(door->sector, door->speed,
+                              door->sector->floorheight, false, 1,
+                              door->direction);
+            if (res == RES_PASTDEST)
+            {
+                SN_StopSequence((mobj_t *) & door->sector->soundorg);
+                switch (door->type)
+                {
+                    case DREV_NORMAL:
+                    case DREV_CLOSE:
+                        door->sector->specialdata = NULL;
+                        P_TagFinished(door->sector->tag);
+                        P_RemoveThinker(&door->thinker);        // unlink and free
+                        break;
+                    case DREV_CLOSE30THENOPEN:
+                        door->direction = 0;
+                        door->topcountdown = 35 * 30;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else if (res == RES_CRUSHED)
+            {
+                switch (door->type)
+                {
+                    case DREV_CLOSE:   // DON'T GO BACK UP!
+                        break;
+                    default:
+                        door->direction = 1;
+                        break;
+                }
+            }
+            break;
+        case 1:                // UP
+            res = T_MovePlane(door->sector, door->speed,
+                              door->topheight, false, 1, door->direction);
+            if (res == RES_PASTDEST)
+            {
+                SN_StopSequence((mobj_t *) & door->sector->soundorg);
+                switch (door->type)
+                {
+                    case DREV_NORMAL:
+                        door->direction = 0;    // wait at top
+                        door->topcountdown = door->topwait;
+                        break;
+                    case DREV_CLOSE30THENOPEN:
+                    case DREV_OPEN:
+                        door->sector->specialdata = NULL;
+                        P_TagFinished(door->sector->tag);
+                        P_RemoveThinker(&door->thinker);        // unlink and free
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// EV_DoDoor
+//
+// Move a door up/down
+//
+//----------------------------------------------------------------------------
+
+int EV_DoDoor(line_t * line, byte * args, vldoor_e type)
+{
+    int secnum;
+    int retcode;
+    sector_t *sec;
+    vldoor_t *door;
+    fixed_t speed;
+
+    speed = args[1] * FRACUNIT / 8;
+    secnum = -1;
+    retcode = 0;
+    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+        {
+            continue;
+        }
+        // Add new door thinker
+        retcode = 1;
+        door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+        P_AddThinker(&door->thinker);
+        sec->specialdata = door;
+        door->thinker.function = T_VerticalDoor;
+        door->sector = sec;
+        switch (type)
+        {
+            case DREV_CLOSE:
+                door->topheight = P_FindLowestCeilingSurrounding(sec);
+                door->topheight -= 4 * FRACUNIT;
+                door->direction = -1;
+                break;
+            case DREV_CLOSE30THENOPEN:
+                door->topheight = sec->ceilingheight;
+                door->direction = -1;
+                break;
+            case DREV_NORMAL:
+            case DREV_OPEN:
+                door->direction = 1;
+                door->topheight = P_FindLowestCeilingSurrounding(sec);
+                door->topheight -= 4 * FRACUNIT;
+                break;
+            default:
+                break;
+        }
+        door->type = type;
+        door->speed = speed;
+        door->topwait = args[2];        // line->arg3
+        SN_StartSequence((mobj_t *) & door->sector->soundorg,
+                         SEQ_DOOR_STONE + door->sector->seqType);
+    }
+    return (retcode);
+}
+
+//==================================================================
+//
+//      EV_VerticalDoor : open a door manually, no tag value
+//
+//==================================================================
+boolean EV_VerticalDoor(line_t * line, mobj_t * thing)
+{
+    sector_t *sec;
+    vldoor_t *door;
+    int side;
+
+    side = 0;                   // only front sides can be used
+
+    // if the sector has an active thinker, use it
+    sec = sides[line->sidenum[side ^ 1]].sector;
+    if (sec->specialdata)
+    {
+        return false;
+/*
+		door = sec->specialdata;
+		switch(line->special)
+		{	// only for raise doors
+			case 12:
+			 	if(door->direction == -1)
+			 	{
+			 		door->direction = 1; // go back up
+			 	}
+			 	else
+			 	{
+			 		if(!thing->player)
+			 		{ // Monsters don't close doors
+			 			return;
+			 		}
+			 		door->direction = -1; // start going down immediately
+			 	}
+			 	return;
+		}
+*/
+    }
+    //
+    // new door thinker
+    //
+    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+    P_AddThinker(&door->thinker);
+    sec->specialdata = door;
+    door->thinker.function = T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 1;
+    switch (line->special)
+    {
+        case 11:
+            door->type = DREV_OPEN;
+            line->special = 0;
+            break;
+        case 12:
+        case 13:
+            door->type = DREV_NORMAL;
+            break;
+        default:
+            door->type = DREV_NORMAL;
+            break;
+    }
+    door->speed = line->arg2 * (FRACUNIT / 8);
+    door->topwait = line->arg3;
+
+    //
+    // find the top and bottom of the movement range
+    //
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4 * FRACUNIT;
+    SN_StartSequence((mobj_t *) & door->sector->soundorg,
+                     SEQ_DOOR_STONE + door->sector->seqType);
+    return true;
+}
+
+//==================================================================
+//
+//      Spawn a door that closes after 30 seconds
+//
+//==================================================================
+
+/*
+void P_SpawnDoorCloseIn30(sector_t *sec)
+{
+	vldoor_t *door;
+
+	door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+	P_AddThinker(&door->thinker);
+	sec->specialdata = door;
+	sec->special = 0;
+	door->thinker.function = T_VerticalDoor;
+	door->sector = sec;
+	door->direction = 0;
+	door->type = DREV_NORMAL;
+	door->speed = VDOORSPEED;
+	door->topcountdown = 30*35;
+}
+*/
+
+//==================================================================
+//
+//      Spawn a door that opens after 5 minutes
+//
+//==================================================================
+
+/*
+void P_SpawnDoorRaiseIn5Mins(sector_t *sec, int secnum)
+{
+	vldoor_t *door;
+
+	door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
+	P_AddThinker(&door->thinker);
+	sec->specialdata = door;
+	sec->special = 0;
+	door->thinker.function = T_VerticalDoor;
+	door->sector = sec;
+	door->direction = 2;
+	door->type = DREV_RAISEIN5MINS;
+	door->speed = VDOORSPEED;
+	door->topheight = P_FindLowestCeilingSurrounding(sec);
+	door->topheight -= 4*FRACUNIT;
+	door->topwait = VDOORWAIT;
+	door->topcountdown = 5*60*35;
+}
+*/
diff --git a/games/NXDoom/src/hexen/p_enemy.c b/games/NXDoom/src/hexen/p_enemy.c
new file mode 100644
index 000000000..fa8d09423
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_enemy.c
@@ -0,0 +1,5428 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// Macros
+// Types
+// Private Data
+// External Data
+
+
+//----------------------------------------------------------------------------
+//
+// PROC P_RecursiveSound
+//
+//----------------------------------------------------------------------------
+
+mobj_t *soundtarget;
+
+void P_RecursiveSound(sector_t * sec, int soundblocks)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+
+    // Wake up all monsters in this sector
+    if (sec->validcount == validcount
+        && sec->soundtraversed <= soundblocks + 1)
+    {                           // Already flooded
+        return;
+    }
+    sec->validcount = validcount;
+    sec->soundtraversed = soundblocks + 1;
+    sec->soundtarget = soundtarget;
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        if (!(check->flags & ML_TWOSIDED))
+        {
+            continue;
+        }
+        P_LineOpening(check);
+        if (openrange <= 0)
+        {                       // Closed door
+            continue;
+        }
+        if (sides[check->sidenum[0]].sector == sec)
+        {
+            other = sides[check->sidenum[1]].sector;
+        }
+        else
+        {
+            other = sides[check->sidenum[0]].sector;
+        }
+        if (check->flags & ML_SOUNDBLOCK)
+        {
+            if (!soundblocks)
+            {
+                P_RecursiveSound(other, 1);
+            }
+        }
+        else
+        {
+            P_RecursiveSound(other, soundblocks);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_NoiseAlert
+//
+// If a monster yells at a player, it will alert other monsters to the
+// player.
+//
+//----------------------------------------------------------------------------
+
+void P_NoiseAlert(mobj_t * target, mobj_t * emmiter)
+{
+    soundtarget = target;
+    validcount++;
+    P_RecursiveSound(emmiter->subsector->sector, 0);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_CheckMeleeRange
+//
+//----------------------------------------------------------------------------
+
+boolean P_CheckMeleeRange(mobj_t * actor)
+{
+    mobj_t *mo;
+    fixed_t dist;
+
+    if (!actor->target)
+    {
+        return (false);
+    }
+    mo = actor->target;
+    dist = P_AproxDistance(mo->x - actor->x, mo->y - actor->y);
+    if (dist >= MELEERANGE)
+    {
+        return (false);
+    }
+    if (!P_CheckSight(actor, mo))
+    {
+        return (false);
+    }
+    if (mo->z > actor->z + actor->height)
+    {                           // Target is higher than the attacker
+        return (false);
+    }
+    else if (actor->z > mo->z + mo->height)
+    {                           // Attacker is higher
+        return (false);
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_CheckMeleeRange2
+//
+//----------------------------------------------------------------------------
+
+boolean P_CheckMeleeRange2(mobj_t * actor)
+{
+    mobj_t *mo;
+    fixed_t dist;
+
+    if (!actor->target)
+    {
+        return (false);
+    }
+    mo = actor->target;
+    dist = P_AproxDistance(mo->x - actor->x, mo->y - actor->y);
+    if (dist >= MELEERANGE * 2 || dist < MELEERANGE)
+    {
+        return (false);
+    }
+    if (!P_CheckSight(actor, mo))
+    {
+        return (false);
+    }
+    if (mo->z > actor->z + actor->height)
+    {                           // Target is higher than the attacker
+        return (false);
+    }
+    else if (actor->z > mo->z + mo->height)
+    {                           // Attacker is higher
+        return (false);
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_CheckMissileRange
+//
+//----------------------------------------------------------------------------
+
+boolean P_CheckMissileRange(mobj_t * actor)
+{
+    fixed_t dist;
+
+    if (!P_CheckSight(actor, actor->target))
+    {
+        return (false);
+    }
+    if (actor->flags & MF_JUSTHIT)
+    {                           // The target just hit the enemy, so fight back!
+        actor->flags &= ~MF_JUSTHIT;
+        return (true);
+    }
+    if (actor->reactiontime)
+    {                           // Don't attack yet
+        return (false);
+    }
+    dist = (P_AproxDistance(actor->x - actor->target->x,
+                            actor->y - actor->target->y) >> FRACBITS) - 64;
+    if (!actor->info->meleestate)
+    {                           // No melee attack, so fire more frequently
+        dist -= 128;
+    }
+    if (dist > 200)
+    {
+        dist = 200;
+    }
+    if (P_Random() < dist)
+    {
+        return (false);
+    }
+    return (true);
+}
+
+/*
+================
+=
+= P_Move
+=
+= Move in the current direction
+= returns false if the move is blocked
+================
+*/
+
+fixed_t xspeed[8] =
+    { FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000, 0, 47000 };
+fixed_t yspeed[8] =
+    { 0, 47000, FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000 };
+
+
+boolean P_Move(mobj_t * actor)
+{
+    fixed_t tryx, tryy;
+    line_t *ld;
+    boolean good;
+
+    if (actor->flags2 & MF2_BLASTED)
+        return (true);
+    if (actor->movedir == DI_NODIR)
+    {
+        return (false);
+    }
+    tryx = actor->x + actor->info->speed * xspeed[actor->movedir];
+    tryy = actor->y + actor->info->speed * yspeed[actor->movedir];
+    if (!P_TryMove(actor, tryx, tryy))
+    {                           // open any specials
+        if (actor->flags & MF_FLOAT && floatok)
+        {                       // must adjust height
+            if (actor->z < tmfloorz)
+            {
+                actor->z += FLOATSPEED;
+            }
+            else
+            {
+                actor->z -= FLOATSPEED;
+            }
+            actor->flags |= MF_INFLOAT;
+            return (true);
+        }
+        if (!numspechit)
+        {
+            return false;
+        }
+        actor->movedir = DI_NODIR;
+        good = false;
+        while (numspechit--)
+        {
+            ld = spechit[numspechit];
+            // if the special isn't a door that can be opened, return false
+            if (P_ActivateLine(ld, actor, 0, SPAC_USE))
+            {
+                good = true;
+            }
+/* Old version before use/cross/impact specials were combined
+			if(P_UseSpecialLine(actor, ld))
+			{
+				good = true;
+			}
+*/
+        }
+        return (good);
+    }
+    else
+    {
+        actor->flags &= ~MF_INFLOAT;
+    }
+    if (!(actor->flags & MF_FLOAT))
+    {
+        if (actor->z > actor->floorz)
+        {
+            P_HitFloor(actor);
+        }
+        actor->z = actor->floorz;
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_TryWalk
+//
+// Attempts to move actor in its current (ob->moveangle) direction.
+// If blocked by either a wall or an actor returns FALSE.
+// If move is either clear of block only by a door, returns TRUE and sets.
+// If a door is in the way, an OpenDoor call is made to start it opening.
+//
+//----------------------------------------------------------------------------
+
+boolean P_TryWalk(mobj_t * actor)
+{
+    if (!P_Move(actor))
+    {
+        return (false);
+    }
+    actor->movecount = P_Random() & 15;
+    return (true);
+}
+
+/*
+================
+=
+= P_NewChaseDir
+=
+================
+*/
+
+dirtype_t opposite[] =
+    { DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST, DI_EAST, DI_NORTHEAST,
+    DI_NORTH, DI_NORTHWEST, DI_NODIR
+};
+
+dirtype_t diags[] =
+    { DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST };
+
+void P_NewChaseDir(mobj_t * actor)
+{
+    fixed_t deltax, deltay;
+    dirtype_t d[3];
+    dirtype_t tdir, olddir, turnaround;
+
+    if (!actor->target)
+        I_Error("P_NewChaseDir: called with no target");
+
+    olddir = actor->movedir;
+    turnaround = opposite[olddir];
+
+    deltax = actor->target->x - actor->x;
+    deltay = actor->target->y - actor->y;
+    if (deltax > 10 * FRACUNIT)
+        d[1] = DI_EAST;
+    else if (deltax < -10 * FRACUNIT)
+        d[1] = DI_WEST;
+    else
+        d[1] = DI_NODIR;
+    if (deltay < -10 * FRACUNIT)
+        d[2] = DI_SOUTH;
+    else if (deltay > 10 * FRACUNIT)
+        d[2] = DI_NORTH;
+    else
+        d[2] = DI_NODIR;
+
+// try direct route
+    if (d[1] != DI_NODIR && d[2] != DI_NODIR)
+    {
+        actor->movedir = diags[((deltay < 0) << 1) + (deltax > 0)];
+        if (actor->movedir != turnaround && P_TryWalk(actor))
+            return;
+    }
+
+// try other directions
+    if (P_Random() > 200 || abs(deltay) > abs(deltax))
+    {
+        tdir = d[1];
+        d[1] = d[2];
+        d[2] = tdir;
+    }
+
+    if (d[1] == turnaround)
+        d[1] = DI_NODIR;
+    if (d[2] == turnaround)
+        d[2] = DI_NODIR;
+
+    if (d[1] != DI_NODIR)
+    {
+        actor->movedir = d[1];
+        if (P_TryWalk(actor))
+            return;             /*either moved forward or attacked */
+    }
+
+    if (d[2] != DI_NODIR)
+    {
+        actor->movedir = d[2];
+        if (P_TryWalk(actor))
+            return;
+    }
+
+/* there is no direct path to the player, so pick another direction */
+
+    if (olddir != DI_NODIR)
+    {
+        actor->movedir = olddir;
+        if (P_TryWalk(actor))
+            return;
+    }
+
+    if (P_Random() & 1)         /*randomly determine direction of search */
+    {
+        for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
+        {
+            if (tdir != turnaround)
+            {
+                actor->movedir = tdir;
+                if (P_TryWalk(actor))
+                    return;
+            }
+        }
+    }
+    else
+    {
+        tdir = DI_SOUTHEAST;
+
+        for (;;)
+        {
+            if (tdir != turnaround)
+            {
+                actor->movedir = tdir;
+                if (P_TryWalk(actor))
+                    return;
+            }
+
+            if (tdir == DI_EAST)
+            {
+                break;
+            }
+
+            --tdir;
+        }
+    }
+
+    if (turnaround != DI_NODIR)
+    {
+        actor->movedir = turnaround;
+        if (P_TryWalk(actor))
+            return;
+    }
+
+    actor->movedir = DI_NODIR;  // can't move
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_LookForMonsters
+//
+//---------------------------------------------------------------------------
+
+#define MONS_LOOK_RANGE (16*64*FRACUNIT)
+#define MONS_LOOK_LIMIT 64
+
+boolean P_LookForMonsters(mobj_t * actor)
+{
+    int count;
+    mobj_t *mo;
+    thinker_t *think;
+
+    if (!P_CheckSight(players[0].mo, actor))
+    {                           // Player can't see monster
+        return (false);
+    }
+    count = 0;
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+        if (!(mo->flags & MF_COUNTKILL) || (mo == actor) || (mo->health <= 0))
+        {                       // Not a valid monster
+            continue;
+        }
+        if (P_AproxDistance(actor->x - mo->x, actor->y - mo->y)
+            > MONS_LOOK_RANGE)
+        {                       // Out of range
+            continue;
+        }
+        if (P_Random() < 16)
+        {                       // Skip
+            continue;
+        }
+        if (count++ > MONS_LOOK_LIMIT)
+        {                       // Stop searching
+            return (false);
+        }
+        if (!P_CheckSight(actor, mo))
+        {                       // Out of sight
+            continue;
+        }
+        if (actor->type == MT_MINOTAUR)
+        {
+            if ((mo->type == MT_MINOTAUR) &&
+                (mo->target != actor->special1.p->mo))
+            {
+                continue;
+            }
+        }
+        // Found a target monster
+        actor->target = mo;
+        return (true);
+    }
+    return (false);
+}
+
+/*
+================
+=
+= P_LookForPlayers
+=
+= If allaround is false, only look 180 degrees in front
+= returns true if a player is targeted
+================
+*/
+
+boolean P_LookForPlayers(mobj_t * actor, boolean allaround)
+{
+    int c;
+    int stop;
+    player_t *player;
+    angle_t an;
+    fixed_t dist;
+    int consecutive_missing = 0; // for breaking infinite loop
+
+    if (!netgame && players[0].health <= 0)
+    {                           // Single player game and player is dead, look for monsters
+        return (P_LookForMonsters(actor));
+    }
+    c = 0;
+
+    // The 3 below is probably a mistake (it should be MAXPLAYERS - 1, or 7)
+    // and in vanilla this can potentially cause an infinite loop in
+    // multiplayer. Unfortunately we can't correct the mistake - doing so will
+    // cause desyncs. Upon spawning, each enemy's lastlook is initialized to a
+    // random value between 0 and 7 (i.e MAXPLAYERS - 1). There's a chance
+    // that the first call of this function for that enemy will return early
+    // courtesy of the actor->lastlook == stop condition. In a single-player
+    // game this occurs when (actor->lastlook - 1) & 3 equals 0, or when
+    // lastlook equals 1 or 5.
+
+    // If you use MAXPLAYERS - 1, it has the side effect of altering which
+    // enemies are affected by an early actor->lastlook == stop return. Now it
+    // happens when (actor->lastlook - 1) & 7 equals 0, or when lastlook equals
+    // 1, *not* 1 and 5 as above.
+
+    stop = (actor->lastlook - 1) & 3;
+    for (;; actor->lastlook = (actor->lastlook + 1) & 3)
+    {
+        if (!playeringame[actor->lastlook])
+        {
+            // Break the vanilla infinite loop here. It can occur if there are
+            // > 4 players and players 0 - 3 all quit the game. Error out
+            // instead.
+            if (consecutive_missing == 4)
+            {
+                I_Error("P_LookForPlayers: No player 1 - 4.\n");
+            }
+            consecutive_missing++;
+            continue;
+        }
+
+        consecutive_missing = 0;
+
+        if (c++ == 2 || actor->lastlook == stop)
+            return false;       // done looking
+
+        player = &players[actor->lastlook];
+        if (player->health <= 0)
+            continue;           // dead
+        if (!P_CheckSight(actor, player->mo))
+            continue;           // out of sight
+
+        if (!allaround)
+        {
+            an = R_PointToAngle2(actor->x, actor->y,
+                                 player->mo->x, player->mo->y) - actor->angle;
+            if (an > ANG90 && an < ANG270)
+            {
+                dist = P_AproxDistance(player->mo->x - actor->x,
+                                       player->mo->y - actor->y);
+                // if real close, react anyway
+                if (dist > MELEERANGE)
+                    continue;   // behind back
+            }
+        }
+        if (player->mo->flags & MF_SHADOW)
+        {                       // Player is invisible
+            if ((P_AproxDistance(player->mo->x - actor->x,
+                                 player->mo->y - actor->y) > 2 * MELEERANGE)
+                && P_AproxDistance(player->mo->momx, player->mo->momy)
+                < 5 * FRACUNIT)
+            {                   // Player is sneaking - can't detect
+                return (false);
+            }
+            if (P_Random() < 225)
+            {                   // Player isn't sneaking, but still didn't detect
+                return (false);
+            }
+        }
+        if (actor->type == MT_MINOTAUR)
+        {
+            if (actor->special1.p == player)
+            {
+                continue;       // Don't target master
+            }
+        }
+
+        actor->target = player->mo;
+        return (true);
+    }
+    return (false);
+}
+
+/*
+===============================================================================
+
+						ACTION ROUTINES
+
+===============================================================================
+*/
+
+/*
+==============
+=
+= A_Look
+=
+= Stay in state until a player is sighted
+=
+==============
+*/
+
+void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *targ;
+
+    actor->threshold = 0;       // any shot will wake up
+    targ = actor->subsector->sector->soundtarget;
+    if (targ && (targ->flags & MF_SHOOTABLE))
+    {
+        actor->target = targ;
+        if (actor->flags & MF_AMBUSH)
+        {
+            if (P_CheckSight(actor, actor->target))
+                goto seeyou;
+        }
+        else
+            goto seeyou;
+    }
+
+
+    if (!P_LookForPlayers(actor, false))
+        return;
+
+// go into chase state
+  seeyou:
+    if (actor->info->seesound)
+    {
+        int sound;
+
+        sound = actor->info->seesound;
+        if (actor->flags2 & MF2_BOSS)
+        {                       // Full volume
+            S_StartSound(NULL, sound);
+        }
+        else
+        {
+            S_StartSound(actor, sound);
+        }
+    }
+    P_SetMobjState(actor, actor->info->seestate);
+}
+
+
+/*
+==============
+=
+= A_Chase
+=
+= Actor has a melee attack, so it tries to close as fast as possible
+=
+==============
+*/
+
+void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int delta;
+
+    if (actor->reactiontime)
+    {
+        actor->reactiontime--;
+    }
+
+    // Modify target threshold
+    if (actor->threshold)
+    {
+        actor->threshold--;
+    }
+
+    if (gameskill == sk_nightmare)
+    {                           // Monsters move faster in nightmare mode
+        actor->tics -= actor->tics / 2;
+        if (actor->tics < 3)
+        {
+            actor->tics = 3;
+        }
+    }
+
+//
+// turn towards movement direction if not there yet
+//
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+        delta = actor->angle - (actor->movedir << 29);
+        if (delta > 0)
+        {
+            actor->angle -= ANG90 / 2;
+        }
+        else if (delta < 0)
+        {
+            actor->angle += ANG90 / 2;
+        }
+    }
+
+    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {                           // look for a new target
+        if (P_LookForPlayers(actor, true))
+        {                       // got a new target
+            return;
+        }
+        P_SetMobjState(actor, actor->info->spawnstate);
+        return;
+    }
+
+//
+// don't attack twice in a row
+//
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+        if (gameskill != sk_nightmare)
+            P_NewChaseDir(actor);
+        return;
+    }
+
+//
+// check for melee attack
+//
+    if (actor->info->meleestate && P_CheckMeleeRange(actor))
+    {
+        if (actor->info->attacksound)
+        {
+            S_StartSound(actor, actor->info->attacksound);
+        }
+        P_SetMobjState(actor, actor->info->meleestate);
+        return;
+    }
+
+//
+// check for missile attack
+//
+    if (actor->info->missilestate)
+    {
+        if (gameskill < sk_nightmare && actor->movecount)
+            goto nomissile;
+        if (!P_CheckMissileRange(actor))
+            goto nomissile;
+        P_SetMobjState(actor, actor->info->missilestate);
+        actor->flags |= MF_JUSTATTACKED;
+        return;
+    }
+  nomissile:
+
+//
+// possibly choose another target
+//
+    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
+    {
+        if (P_LookForPlayers(actor, true))
+            return;             // got a new target
+    }
+
+//
+// chase towards player
+//
+    if (--actor->movecount < 0 || !P_Move(actor))
+    {
+        P_NewChaseDir(actor);
+    }
+
+//
+// make active sound
+//
+    if (actor->info->activesound && P_Random() < 3)
+    {
+        if (actor->type == MT_BISHOP && P_Random() < 128)
+        {
+            S_StartSound(actor, actor->info->seesound);
+        }
+        else if (actor->type == MT_PIG)
+        {
+            S_StartSound(actor, SFX_PIG_ACTIVE1 + (P_Random() & 1));
+        }
+        else if (actor->flags2 & MF2_BOSS)
+        {
+            S_StartSound(NULL, actor->info->activesound);
+        }
+        else
+        {
+            S_StartSound(actor, actor->info->activesound);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FaceTarget
+//
+//----------------------------------------------------------------------------
+
+void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    actor->flags &= ~MF_AMBUSH;
+    actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x,
+                                   actor->target->y);
+    if (actor->target->flags & MF_SHADOW)
+    {                           // Target is a ghost
+        actor->angle += P_SubRandom() << 21;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Pain
+//
+//----------------------------------------------------------------------------
+
+void A_Pain(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->info->painsound)
+    {
+        S_StartSound(actor, actor->info->painsound);
+    }
+}
+
+//============================================================================
+//
+// A_SetInvulnerable
+//
+//============================================================================
+
+void A_SetInvulnerable(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 |= MF2_INVULNERABLE;
+}
+
+//============================================================================
+//
+// A_UnSetInvulnerable
+//
+//============================================================================
+
+void A_UnSetInvulnerable(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 &= ~MF2_INVULNERABLE;
+}
+
+//============================================================================
+//
+// A_SetReflective
+//
+//============================================================================
+
+void A_SetReflective(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 |= MF2_REFLECTIVE;
+
+    if ((actor->type == MT_CENTAUR) || (actor->type == MT_CENTAURLEADER))
+    {
+        A_SetInvulnerable(actor, player, psp);
+    }
+}
+
+//============================================================================
+//
+// A_UnSetReflective
+//
+//============================================================================
+
+void A_UnSetReflective(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 &= ~MF2_REFLECTIVE;
+
+    if ((actor->type == MT_CENTAUR) || (actor->type == MT_CENTAURLEADER))
+    {
+        A_UnSetInvulnerable(actor, player, psp);
+    }
+}
+
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_UpdateMorphedMonster
+//
+// Returns true if the pig morphs.
+//
+//----------------------------------------------------------------------------
+
+boolean P_UpdateMorphedMonster(mobj_t * actor, int tics)
+{
+    mobj_t *fog;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    mobjtype_t moType;
+    mobj_t *mo;
+    mobj_t oldMonster;
+
+    actor->special1.i -= tics;
+    if (actor->special1.i > 0)
+    {
+        return (false);
+    }
+    moType = actor->special2.i;
+    switch (moType)
+    {
+        case MT_WRAITHB:       // These must remain morphed
+        case MT_SERPENT:
+        case MT_SERPENTLEADER:
+        case MT_MINOTAUR:
+            return (false);
+        default:
+            break;
+    }
+    x = actor->x;
+    y = actor->y;
+    z = actor->z;
+    oldMonster = *actor;        // Save pig vars
+
+    P_RemoveMobjFromTIDList(actor);
+    P_SetMobjState(actor, S_FREETARGMOBJ);
+    mo = P_SpawnMobj(x, y, z, moType);
+
+    if (P_TestMobjLocation(mo) == false)
+    {                           // Didn't fit
+        P_RemoveMobj(mo);
+        mo = P_SpawnMobj(x, y, z, oldMonster.type);
+        mo->angle = oldMonster.angle;
+        mo->flags = oldMonster.flags;
+        mo->health = oldMonster.health;
+        mo->target = oldMonster.target;
+        mo->special = oldMonster.special;
+        mo->special1.i = 5 * 35;  // Next try in 5 seconds
+        mo->special2.i = moType;
+        mo->tid = oldMonster.tid;
+        memcpy(mo->args, oldMonster.args, 5);
+        P_InsertMobjIntoTIDList(mo, oldMonster.tid);
+        return (false);
+    }
+    mo->angle = oldMonster.angle;
+    mo->target = oldMonster.target;
+    mo->tid = oldMonster.tid;
+    mo->special = oldMonster.special;
+    memcpy(mo->args, oldMonster.args, 5);
+    P_InsertMobjIntoTIDList(mo, oldMonster.tid);
+    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, SFX_TELEPORT);
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_PigLook
+//
+//----------------------------------------------------------------------------
+
+void A_PigLook(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateMorphedMonster(actor, 10))
+    {
+        return;
+    }
+    A_Look(actor, player, psp);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_PigChase
+//
+//----------------------------------------------------------------------------
+
+void A_PigChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateMorphedMonster(actor, 3))
+    {
+        return;
+    }
+    A_Chase(actor, player, psp);
+}
+
+//============================================================================
+//
+// A_PigAttack
+//
+//============================================================================
+
+void A_PigAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_UpdateMorphedMonster(actor, 18))
+    {
+        return;
+    }
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, 2 + (P_Random() & 1));
+        S_StartSound(actor, SFX_PIG_ATTACK);
+    }
+}
+
+//============================================================================
+//
+// A_PigPain
+//
+//============================================================================
+
+void A_PigPain(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_Pain(actor, player, psp);
+    if (actor->z <= actor->floorz)
+    {
+        actor->momz = 3.5 * FRACUNIT;
+    }
+}
+
+
+
+void FaceMovementDirection(mobj_t * actor)
+{
+    switch (actor->movedir)
+    {
+        case DI_EAST:
+            actor->angle = 0u << 24;
+            break;
+        case DI_NORTHEAST:
+            actor->angle = 32u << 24;
+            break;
+        case DI_NORTH:
+            actor->angle = 64u << 24;
+            break;
+        case DI_NORTHWEST:
+            actor->angle = 96u << 24;
+            break;
+        case DI_WEST:
+            actor->angle = 128u << 24;
+            break;
+        case DI_SOUTHWEST:
+            actor->angle = 160u << 24;
+            break;
+        case DI_SOUTH:
+            actor->angle = 192u << 24;
+            break;
+        case DI_SOUTHEAST:
+            actor->angle = 224u << 24;
+            break;
+    }
+}
+
+
+//----------------------------------------------------------------------------
+//
+// Minotaur variables
+//
+//      special1                pointer to player that spawned it (mobj_t)
+//      special2                internal to minotaur AI
+//      args[0]                 args[0]-args[3] together make up minotaur start time
+//      args[1]                 |
+//      args[2]                 |
+//      args[3]                 V
+//      args[4]                 charge duration countdown
+//----------------------------------------------------------------------------
+
+void A_MinotaurFade0(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_ALTSHADOW;
+    actor->flags |= MF_SHADOW;
+}
+
+void A_MinotaurFade1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    // Second level of transparency
+    actor->flags &= ~MF_SHADOW;
+    actor->flags |= MF_ALTSHADOW;
+}
+
+void A_MinotaurFade2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    // Make fully visible
+    actor->flags &= ~MF_SHADOW;
+    actor->flags &= ~MF_ALTSHADOW;
+}
+
+
+//----------------------------------------------------------------------------
+//
+// A_MinotaurRoam - 
+//
+// 
+//----------------------------------------------------------------------------
+
+
+// Check the age of the minotaur and stomp it after MAULATORTICS of time
+// have passed. Returns false if killed.
+static boolean CheckMinotaurAge(mobj_t *mo)
+{
+    unsigned int starttime;
+
+    // The start time is stored in the mobj_t structure, but it is stored
+    // in little endian format. For Vanilla savegame compatibility we must
+    // swap it to the native endianness.
+    memcpy(&starttime, mo->args, sizeof(unsigned int));
+
+    if (leveltime - LONG(starttime) >= MAULATORTICS)
+    {
+        P_DamageMobj(mo, NULL, NULL, 10000);
+        return false;
+    }
+
+    return true;
+}
+
+void A_MinotaurRoam(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SHADOW; // In case pain caused him to 
+    actor->flags &= ~MF_ALTSHADOW;      // skip his fade in.
+
+    if (!CheckMinotaurAge(actor))
+    {
+        return;
+    }
+
+    if (P_Random() < 30)
+        A_MinotaurLook(actor, player, psp);  // adjust to closest target
+
+    if (P_Random() < 6)
+    {
+        //Choose new direction
+        actor->movedir = P_Random() % 8;
+        FaceMovementDirection(actor);
+    }
+    if (!P_Move(actor))
+    {
+        // Turn
+        if (P_Random() & 1)
+            actor->movedir = (actor->movedir + 1) % 8;
+        else
+            actor->movedir = (actor->movedir + 7) % 8;
+        FaceMovementDirection(actor);
+    }
+}
+
+
+//----------------------------------------------------------------------------
+//
+//      PROC A_MinotaurLook
+//
+// Look for enemy of player
+//----------------------------------------------------------------------------
+#define MINOTAUR_LOOK_DIST		(16*54*FRACUNIT)
+
+void A_MinotaurLook(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    mobj_t *mo = NULL;
+    player_t *player;
+    thinker_t *think;
+    fixed_t dist;
+    int i;
+    mobj_t *master = actor->special1.m;
+
+    actor->target = NULL;
+    if (deathmatch)             // Quick search for players
+    {
+        for (i = 0; i < maxplayers; i++)
+        {
+            if (!playeringame[i])
+                continue;
+            player = &players[i];
+            mo = player->mo;
+            if (mo == master)
+                continue;
+            if (mo->health <= 0)
+                continue;
+            dist = P_AproxDistance(actor->x - mo->x, actor->y - mo->y);
+            if (dist > MINOTAUR_LOOK_DIST)
+                continue;
+            actor->target = mo;
+            break;
+        }
+    }
+
+    if (!actor->target)         // Near player monster search
+    {
+        if (master && (master->health > 0) && (master->player))
+            mo = P_RoughMonsterSearch(master, 20);
+        else
+            mo = P_RoughMonsterSearch(actor, 20);
+        actor->target = mo;
+    }
+
+    if (!actor->target)         // Normal monster search
+    {
+        for (think = thinkercap.next; think != &thinkercap;
+             think = think->next)
+        {
+            if (think->function != P_MobjThinker)
+                continue;
+            mo = (mobj_t *) think;
+            if (!(mo->flags & MF_COUNTKILL))
+                continue;
+            if (mo->health <= 0)
+                continue;
+            if (!(mo->flags & MF_SHOOTABLE))
+                continue;
+            dist = P_AproxDistance(actor->x - mo->x, actor->y - mo->y);
+            if (dist > MINOTAUR_LOOK_DIST)
+                continue;
+            if ((mo == master) || (mo == actor))
+                continue;
+            if ((mo->type == MT_MINOTAUR) &&
+                (mo->special1.m == actor->special1.m))
+                continue;
+            actor->target = mo;
+            break;              // Found mobj to attack
+        }
+    }
+
+    if (actor->target)
+    {
+        P_SetMobjStateNF(actor, S_MNTR_WALK1);
+    }
+    else
+    {
+        P_SetMobjStateNF(actor, S_MNTR_ROAM1);
+    }
+}
+
+
+
+
+void A_MinotaurChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SHADOW; // In case pain caused him to 
+    actor->flags &= ~MF_ALTSHADOW;      // skip his fade in.
+
+    if (!CheckMinotaurAge(actor))
+    {
+        return;
+    }
+
+    if (P_Random() < 30)
+        A_MinotaurLook(actor, player, psp);  // adjust to closest target
+
+    if (!actor->target || (actor->target->health <= 0) ||
+        !(actor->target->flags & MF_SHOOTABLE))
+    {                           // look for a new target
+        P_SetMobjState(actor, S_MNTR_LOOK1);
+        return;
+    }
+
+    FaceMovementDirection(actor);
+    actor->reactiontime = 0;
+
+    // Melee attack
+    if (actor->info->meleestate && P_CheckMeleeRange(actor))
+    {
+        if (actor->info->attacksound)
+        {
+            S_StartSound(actor, actor->info->attacksound);
+        }
+        P_SetMobjState(actor, actor->info->meleestate);
+        return;
+    }
+
+    // Missile attack
+    if (actor->info->missilestate && P_CheckMissileRange(actor))
+    {
+        P_SetMobjState(actor, actor->info->missilestate);
+        return;
+    }
+
+    // chase towards target
+    if (!P_Move(actor))
+    {
+        P_NewChaseDir(actor);
+    }
+
+    // Active sound
+    if (actor->info->activesound && P_Random() < 6)
+    {
+        S_StartSound(actor, actor->info->activesound);
+    }
+
+}
+
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurAtk1
+//
+// Melee attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurAtk1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+        return;
+
+    S_StartSound(actor, SFX_MAULATOR_HAMMER_SWING);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurDecide
+//
+// Choose a missile attack.
+//
+//----------------------------------------------------------------------------
+
+#define MNTR_CHARGE_SPEED (23*FRACUNIT)
+
+void A_MinotaurDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    mobj_t *target = actor->target;
+    int dist;
+
+    if (!target)
+        return;
+    dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
+
+    if (target->z + target->height > actor->z
+        && target->z + target->height < actor->z + actor->height
+        && dist < 16 * 64 * FRACUNIT
+        && dist > 1 * 64 * FRACUNIT && P_Random() < 230)
+    {                           // Charge attack
+        // Don't call the state function right away
+        P_SetMobjStateNF(actor, S_MNTR_ATK4_1);
+        actor->flags |= MF_SKULLFLY;
+        A_FaceTarget(actor, player, psp);
+        angle = actor->angle >> ANGLETOFINESHIFT;
+        actor->momx = FixedMul(MNTR_CHARGE_SPEED, finecosine[angle]);
+        actor->momy = FixedMul(MNTR_CHARGE_SPEED, finesine[angle]);
+        actor->args[4] = 35 / 2;        // Charge duration
+    }
+    else if (target->z == target->floorz
+             && dist < 9 * 64 * FRACUNIT && P_Random() < 100)
+    {                           // Floor fire attack
+        P_SetMobjState(actor, S_MNTR_ATK3_1);
+        actor->special2.i = 0;
+    }
+    else
+    {                           // Swing attack
+        A_FaceTarget(actor, player, psp);
+        // Don't need to call P_SetMobjState because the current state
+        // falls through to the swing attack
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurCharge
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurCharge(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *puff;
+
+    if (!actor->target)
+        return;
+
+    if (actor->args[4] > 0)
+    {
+        puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PUNCHPUFF);
+        puff->momz = 2 * FRACUNIT;
+        actor->args[4]--;
+    }
+    else
+    {
+        actor->flags &= ~MF_SKULLFLY;
+        P_SetMobjState(actor, actor->info->seestate);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurAtk2
+//
+// Swing attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurAtk2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+    fixed_t momz;
+
+    if (!actor->target)
+        return;
+
+    S_StartSound(actor, SFX_MAULATOR_HAMMER_SWING);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
+        return;
+    }
+    mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX1);
+    if (mo)
+    {
+        //S_StartSound(mo, sfx_minat2);
+        momz = mo->momz;
+        angle = mo->angle;
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 8), momz);
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 8), momz);
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 16), momz);
+        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 16), momz);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MinotaurAtk3
+//
+// Floor fire attack.
+//
+//----------------------------------------------------------------------------
+
+void A_MinotaurAtk3(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    mobj_t *mo;
+    player_t *player;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
+        if ((player = actor->target->player) != NULL)
+        {                       // Squish the player
+            player->deltaviewheight = -16 * FRACUNIT;
+        }
+    }
+    else
+    {
+        mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX2);
+        if (mo != NULL)
+        {
+            S_StartSound(mo, SFX_MAULATOR_HAMMER_HIT);
+        }
+    }
+    if (P_Random() < 192 && actor->special2.i == 0)
+    {
+        P_SetMobjState(actor, S_MNTR_ATK3_4);
+        actor->special2.i = 1;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_MntrFloorFire
+//
+//----------------------------------------------------------------------------
+
+void A_MntrFloorFire(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1, r2;
+
+    r1 = P_SubRandom();
+    r2 = P_SubRandom();
+
+    actor->z = actor->floorz;
+    mo = P_SpawnMobj(actor->x + (r2 << 10),
+                     actor->y + (r1 << 10), ONFLOORZ,
+                     MT_MNTRFX3);
+    mo->target = actor->target;
+    mo->momx = 1;               // Force block checking
+    P_CheckMissileSpawn(mo);
+}
+
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Scream
+//
+//----------------------------------------------------------------------------
+
+void A_Scream(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int sound;
+
+    S_StopSound(actor);
+    if (actor->player)
+    {
+        if (actor->player->morphTics)
+        {
+            S_StartSound(actor, actor->info->deathsound);
+        }
+        else
+        {
+            // Handle the different player death screams
+            if (actor->momz <= -39 * FRACUNIT)
+            {                   // Falling splat
+                sound = SFX_PLAYER_FALLING_SPLAT;
+            }
+            else if (actor->health > -50)
+            {                   // Normal death sound
+                switch (actor->player->class)
+                {
+                    case PCLASS_FIGHTER:
+                        sound = SFX_PLAYER_FIGHTER_NORMAL_DEATH;
+                        break;
+                    case PCLASS_CLERIC:
+                        sound = SFX_PLAYER_CLERIC_NORMAL_DEATH;
+                        break;
+                    case PCLASS_MAGE:
+                        sound = SFX_PLAYER_MAGE_NORMAL_DEATH;
+                        break;
+                    default:
+                        sound = SFX_NONE;
+                        break;
+                }
+            }
+            else if (actor->health > -100)
+            {                   // Crazy death sound
+                switch (actor->player->class)
+                {
+                    case PCLASS_FIGHTER:
+                        sound = SFX_PLAYER_FIGHTER_CRAZY_DEATH;
+                        break;
+                    case PCLASS_CLERIC:
+                        sound = SFX_PLAYER_CLERIC_CRAZY_DEATH;
+                        break;
+                    case PCLASS_MAGE:
+                        sound = SFX_PLAYER_MAGE_CRAZY_DEATH;
+                        break;
+                    default:
+                        sound = SFX_NONE;
+                        break;
+                }
+            }
+            else
+            {                   // Extreme death sound
+                switch (actor->player->class)
+                {
+                    case PCLASS_FIGHTER:
+                        sound = SFX_PLAYER_FIGHTER_EXTREME1_DEATH;
+                        break;
+                    case PCLASS_CLERIC:
+                        sound = SFX_PLAYER_CLERIC_EXTREME1_DEATH;
+                        break;
+                    case PCLASS_MAGE:
+                        sound = SFX_PLAYER_MAGE_EXTREME1_DEATH;
+                        break;
+                    default:
+                        sound = SFX_NONE;
+                        break;
+                }
+                sound += P_Random() % 3;        // Three different extreme deaths
+            }
+            S_StartSound(actor, sound);
+        }
+    }
+    else
+    {
+        S_StartSound(actor, actor->info->deathsound);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_DropItem
+//
+//---------------------------------------------------------------------------
+
+/*
+void P_DropItem(mobj_t *source, mobjtype_t type, int special, int chance)
+{
+	mobj_t *mo;
+
+	if(P_Random() > chance)
+	{
+		return;
+	}
+	mo = P_SpawnMobj(source->x, source->y,
+		source->z+(source->height>>1), type);
+	mo->momx = P_SubRandom()<<8;
+	mo->momy = P_SubRandom()<<8;
+	mo->momz = FRACUNIT*5+(P_Random()<<10);
+	mo->flags2 |= MF2_DROPPED;
+	mo->health = special;
+}
+*/
+
+//----------------------------------------------------------------------------
+//
+// PROC A_NoBlocking
+//
+//----------------------------------------------------------------------------
+
+void A_NoBlocking(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags &= ~MF_SOLID;
+
+    // Check for monsters dropping things
+/*	switch(actor->type)
+	{
+		// Add the monster dropped items here
+		case MT_MUMMYLEADERGHOST:
+			P_DropItem(actor, MT_AMGWNDWIMPY, 3, 84);
+			break;
+		default:
+			break;
+	}
+*/
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_Explode
+//
+// Handles a bunch of exploding things.
+//
+//----------------------------------------------------------------------------
+
+void A_Explode(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int damage;
+    int distance;
+    boolean damageSelf;
+
+    damage = 128;
+    distance = 128;
+    damageSelf = true;
+    switch (actor->type)
+    {
+        case MT_FIREBOMB:      // Time Bombs
+            actor->z += 32 * FRACUNIT;
+            actor->flags &= ~MF_SHADOW;
+            break;
+        case MT_MNTRFX2:       // Minotaur floor fire
+            damage = 24;
+            break;
+        case MT_BISHOP:        // Bishop radius death
+            damage = 25 + (P_Random() & 15);
+            break;
+        case MT_HAMMER_MISSILE:        // Fighter Hammer
+            damage = 128;
+            damageSelf = false;
+            break;
+        case MT_FSWORD_MISSILE:        // Fighter Runesword
+            damage = 64;
+            damageSelf = false;
+            break;
+        case MT_CIRCLEFLAME:   // Cleric Flame secondary flames
+            damage = 20;
+            damageSelf = false;
+            break;
+        case MT_SORCBALL1:     // Sorcerer balls
+        case MT_SORCBALL2:
+        case MT_SORCBALL3:
+            distance = 255;
+            damage = 255;
+            actor->args[0] = 1; // don't play bounce
+            break;
+        case MT_SORCFX1:       // Sorcerer spell 1
+            damage = 30;
+            break;
+        case MT_SORCFX4:       // Sorcerer spell 4
+            damage = 20;
+            break;
+        case MT_TREEDESTRUCTIBLE:
+            damage = 10;
+            break;
+        case MT_DRAGON_FX2:
+            damage = 80;
+            damageSelf = false;
+            break;
+        case MT_MSTAFF_FX:
+            damage = 64;
+            distance = 192;
+            damageSelf = false;
+            break;
+        case MT_MSTAFF_FX2:
+            damage = 80;
+            distance = 192;
+            damageSelf = false;
+            break;
+        case MT_POISONCLOUD:
+            damage = 4;
+            distance = 40;
+            break;
+        case MT_ZXMAS_TREE:
+        case MT_ZSHRUB2:
+            damage = 30;
+            distance = 64;
+            break;
+        default:
+            break;
+    }
+    P_RadiusAttack(actor, actor->target, damage, distance, damageSelf);
+    if (actor->z <= actor->floorz + (distance << FRACBITS)
+        && actor->type != MT_POISONCLOUD)
+    {
+        P_HitFloor(actor);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_Massacre
+//
+// Kills all monsters.
+//
+//----------------------------------------------------------------------------
+
+int P_Massacre(void)
+{
+    int count;
+    mobj_t *mo;
+    thinker_t *think;
+
+    count = 0;
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+        if ((mo->flags & MF_COUNTKILL) && (mo->health > 0))
+        {
+            mo->flags2 &= ~(MF2_NONSHOOTABLE + MF2_INVULNERABLE);
+            mo->flags |= MF_SHOOTABLE;
+            P_DamageMobj(mo, NULL, NULL, 10000);
+            count++;
+        }
+    }
+    return count;
+}
+
+
+
+//----------------------------------------------------------------------------
+//
+// PROC A_SkullPop
+//
+//----------------------------------------------------------------------------
+
+void A_SkullPop(mobj_t *actor, player_t *player_, pspdef_t *psp)
+{
+    mobj_t *mo;
+    player_t *player;
+
+    if (!actor->player)
+    {
+        return;
+    }
+    actor->flags &= ~MF_SOLID;
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 48 * FRACUNIT,
+                     MT_BLOODYSKULL);
+    //mo->target = actor;
+    mo->momx = P_SubRandom() << 9;
+    mo->momy = P_SubRandom() << 9;
+    mo->momz = FRACUNIT * 2 + (P_Random() << 6);
+    // Attach player mobj to bloody skull
+    player = actor->player;
+    actor->player = NULL;
+    actor->special1.i = player->class;
+    mo->player = player;
+    mo->health = actor->health;
+    mo->angle = actor->angle;
+    player->mo = mo;
+    player->lookdir = 0;
+    player->damagecount = 32;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_CheckSkullFloor
+//
+//----------------------------------------------------------------------------
+
+void A_CheckSkullFloor(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->z <= actor->floorz)
+    {
+        P_SetMobjState(actor, S_BLOODYSKULLX1);
+        S_StartSound(actor, SFX_DRIP);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_CheckSkullDone
+//
+//----------------------------------------------------------------------------
+
+void A_CheckSkullDone(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special2.i == 666)
+    {
+        P_SetMobjState(actor, S_BLOODYSKULLX2);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_CheckBurnGone
+//
+//----------------------------------------------------------------------------
+
+void A_CheckBurnGone(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special2.i == 666)
+    {
+        P_SetMobjState(actor, S_PLAY_FDTH20);
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FreeTargMobj
+//
+//----------------------------------------------------------------------------
+
+void A_FreeTargMobj(mobj_t *mo, player_t *player, pspdef_t *psp)
+{
+    mo->momx = mo->momy = mo->momz = 0;
+    mo->z = mo->ceilingz + 4 * FRACUNIT;
+    mo->flags &=
+        ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_SOLID | MF_COUNTKILL);
+    mo->flags |= MF_CORPSE | MF_DROPOFF | MF_NOGRAVITY;
+    mo->flags2 &= ~(MF2_PASSMOBJ | MF2_LOGRAV);
+    mo->flags2 |= MF2_DONTDRAW;
+    mo->player = NULL;
+    mo->health = -1000;         // Don't resurrect
+}
+
+
+//----------------------------------------------------------------------------
+//
+// CorpseQueue Routines
+//
+//----------------------------------------------------------------------------
+
+// Corpse queue for monsters - this should be saved out
+#define CORPSEQUEUESIZE	64
+mobj_t *corpseQueue[CORPSEQUEUESIZE];
+int corpseQueueSlot;
+
+// throw another corpse on the queue
+void A_QueueCorpse(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *corpse;
+
+    if (corpseQueueSlot >= CORPSEQUEUESIZE)
+    {                           // Too many corpses - remove an old one
+        corpse = corpseQueue[corpseQueueSlot % CORPSEQUEUESIZE];
+        if (corpse)
+            P_RemoveMobj(corpse);
+    }
+    corpseQueue[corpseQueueSlot % CORPSEQUEUESIZE] = actor;
+    corpseQueueSlot++;
+}
+
+// Remove a mobj from the queue (for resurrection)
+void A_DeQueueCorpse(mobj_t *actor)
+{
+    int slot;
+
+    for (slot = 0; slot < CORPSEQUEUESIZE; slot++)
+    {
+        if (corpseQueue[slot] == actor)
+        {
+            corpseQueue[slot] = NULL;
+            break;
+        }
+    }
+}
+
+void P_InitCreatureCorpseQueue(boolean corpseScan)
+{
+    thinker_t *think;
+    mobj_t *mo;
+
+    // Initialize queue
+    corpseQueueSlot = 0;
+    memset(corpseQueue, 0, sizeof(mobj_t *) * CORPSEQUEUESIZE);
+
+    if (!corpseScan)
+        return;
+
+    // Search mobj list for corpses and place them in this queue
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+            continue;
+        mo = (mobj_t *) think;
+        if (!(mo->flags & MF_CORPSE))
+            continue;           // Must be a corpse
+        if (mo->flags & MF_ICECORPSE)
+            continue;           // Not ice corpses
+        // Only corpses that call A_QueueCorpse from death routine
+        switch (mo->type)
+        {
+            case MT_CENTAUR:
+            case MT_CENTAURLEADER:
+            case MT_DEMON:
+            case MT_DEMON2:
+            case MT_WRAITH:
+            case MT_WRAITHB:
+            case MT_BISHOP:
+            case MT_ETTIN:
+            case MT_PIG:
+            case MT_CENTAUR_SHIELD:
+            case MT_CENTAUR_SWORD:
+            case MT_DEMONCHUNK1:
+            case MT_DEMONCHUNK2:
+            case MT_DEMONCHUNK3:
+            case MT_DEMONCHUNK4:
+            case MT_DEMONCHUNK5:
+            case MT_DEMON2CHUNK1:
+            case MT_DEMON2CHUNK2:
+            case MT_DEMON2CHUNK3:
+            case MT_DEMON2CHUNK4:
+            case MT_DEMON2CHUNK5:
+            case MT_FIREDEMON_SPLOTCH1:
+            case MT_FIREDEMON_SPLOTCH2:
+                A_QueueCorpse(mo, NULL, NULL);      // Add corpse to queue
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+
+//----------------------------------------------------------------------------
+//
+// PROC A_AddPlayerCorpse
+//
+//----------------------------------------------------------------------------
+
+#define BODYQUESIZE 32
+mobj_t *bodyque[BODYQUESIZE];
+int bodyqueslot;
+
+void A_AddPlayerCorpse(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (bodyqueslot >= BODYQUESIZE)
+    {                           // Too many player corpses - remove an old one
+        P_RemoveMobj(bodyque[bodyqueslot % BODYQUESIZE]);
+    }
+    bodyque[bodyqueslot % BODYQUESIZE] = actor;
+    bodyqueslot++;
+}
+
+//============================================================================
+//
+// A_SerpentUnHide
+//
+//============================================================================
+
+void A_SerpentUnHide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 &= ~MF2_DONTDRAW;
+    actor->floorclip = 24 * FRACUNIT;
+}
+
+//============================================================================
+//
+// A_SerpentHide
+//
+//============================================================================
+
+void A_SerpentHide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 |= MF2_DONTDRAW;
+    actor->floorclip = 0;
+}
+
+//============================================================================
+//
+// A_SerpentChase
+//
+//============================================================================
+
+void A_SerpentChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int delta;
+    int oldX, oldY, oldFloor;
+
+    if (actor->reactiontime)
+    {
+        actor->reactiontime--;
+    }
+
+    // Modify target threshold
+    if (actor->threshold)
+    {
+        actor->threshold--;
+    }
+
+    if (gameskill == sk_nightmare)
+    {                           // Monsters move faster in nightmare mode
+        actor->tics -= actor->tics / 2;
+        if (actor->tics < 3)
+        {
+            actor->tics = 3;
+        }
+    }
+
+//
+// turn towards movement direction if not there yet
+//
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+        delta = actor->angle - (actor->movedir << 29);
+        if (delta > 0)
+        {
+            actor->angle -= ANG90 / 2;
+        }
+        else if (delta < 0)
+        {
+            actor->angle += ANG90 / 2;
+        }
+    }
+
+    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {                           // look for a new target
+        if (P_LookForPlayers(actor, true))
+        {                       // got a new target
+            return;
+        }
+        P_SetMobjState(actor, actor->info->spawnstate);
+        return;
+    }
+
+//
+// don't attack twice in a row
+//
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+        if (gameskill != sk_nightmare)
+            P_NewChaseDir(actor);
+        return;
+    }
+
+//
+// check for melee attack
+//
+    if (actor->info->meleestate && P_CheckMeleeRange(actor))
+    {
+        if (actor->info->attacksound)
+        {
+            S_StartSound(actor, actor->info->attacksound);
+        }
+        P_SetMobjState(actor, actor->info->meleestate);
+        return;
+    }
+
+//
+// possibly choose another target
+//
+    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
+    {
+        if (P_LookForPlayers(actor, true))
+            return;             // got a new target
+    }
+
+//
+// chase towards player
+//
+    oldX = actor->x;
+    oldY = actor->y;
+    oldFloor = actor->subsector->sector->floorpic;
+    if (--actor->movecount < 0 || !P_Move(actor))
+    {
+        P_NewChaseDir(actor);
+    }
+    if (actor->subsector->sector->floorpic != oldFloor)
+    {
+        P_TryMove(actor, oldX, oldY);
+        P_NewChaseDir(actor);
+    }
+
+//
+// make active sound
+//
+    if (actor->info->activesound && P_Random() < 3)
+    {
+        S_StartSound(actor, actor->info->activesound);
+    }
+}
+
+//============================================================================
+//
+// A_SerpentRaiseHump
+// 
+// Raises the hump above the surface by raising the floorclip level
+//============================================================================
+
+void A_SerpentRaiseHump(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->floorclip -= 4 * FRACUNIT;
+}
+
+//============================================================================
+//
+// A_SerpentLowerHump
+// 
+//============================================================================
+
+void A_SerpentLowerHump(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->floorclip += 4 * FRACUNIT;
+}
+
+//============================================================================
+//
+// A_SerpentHumpDecide
+//
+//              Decided whether to hump up, or if the mobj is a serpent leader, 
+//                      to missile attack
+//============================================================================
+
+void A_SerpentHumpDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->type == MT_SERPENTLEADER)
+    {
+        if (P_Random() > 30)
+        {
+            return;
+        }
+        else if (P_Random() < 40)
+        {                       // Missile attack
+            P_SetMobjState(actor, S_SERPENT_SURFACE1);
+            return;
+        }
+    }
+    else if (P_Random() > 3)
+    {
+        return;
+    }
+    if (!P_CheckMeleeRange(actor))
+    {                           // The hump shouldn't occur when within melee range
+        if (actor->type == MT_SERPENTLEADER && P_Random() < 128)
+        {
+            P_SetMobjState(actor, S_SERPENT_SURFACE1);
+        }
+        else
+        {
+            P_SetMobjState(actor, S_SERPENT_HUMP1);
+            S_StartSound(actor, SFX_SERPENT_ACTIVE);
+        }
+    }
+}
+
+//============================================================================
+//
+// A_SerpentBirthScream
+//
+//============================================================================
+
+void A_SerpentBirthScream(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(actor, SFX_SERPENT_BIRTH);
+}
+
+//============================================================================
+//
+// A_SerpentDiveSound
+//
+//============================================================================
+
+void A_SerpentDiveSound(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(actor, SFX_SERPENT_ACTIVE);
+}
+
+//============================================================================
+//
+// A_SerpentWalk
+//
+// Similar to A_Chase, only has a hardcoded entering of meleestate
+//============================================================================
+
+void A_SerpentWalk(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int delta;
+
+    if (actor->reactiontime)
+    {
+        actor->reactiontime--;
+    }
+
+    // Modify target threshold
+    if (actor->threshold)
+    {
+        actor->threshold--;
+    }
+
+    if (gameskill == sk_nightmare)
+    {                           // Monsters move faster in nightmare mode
+        actor->tics -= actor->tics / 2;
+        if (actor->tics < 3)
+        {
+            actor->tics = 3;
+        }
+    }
+
+//
+// turn towards movement direction if not there yet
+//
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+        delta = actor->angle - (actor->movedir << 29);
+        if (delta > 0)
+        {
+            actor->angle -= ANG90 / 2;
+        }
+        else if (delta < 0)
+        {
+            actor->angle += ANG90 / 2;
+        }
+    }
+
+    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {                           // look for a new target
+        if (P_LookForPlayers(actor, true))
+        {                       // got a new target
+            return;
+        }
+        P_SetMobjState(actor, actor->info->spawnstate);
+        return;
+    }
+
+//
+// don't attack twice in a row
+//
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+        if (gameskill != sk_nightmare)
+            P_NewChaseDir(actor);
+        return;
+    }
+
+//
+// check for melee attack
+//
+    if (actor->info->meleestate && P_CheckMeleeRange(actor))
+    {
+        if (actor->info->attacksound)
+        {
+            S_StartSound(actor, actor->info->attacksound);
+        }
+        P_SetMobjState(actor, S_SERPENT_ATK1);
+        return;
+    }
+//
+// possibly choose another target
+//
+    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
+    {
+        if (P_LookForPlayers(actor, true))
+            return;             // got a new target
+    }
+
+//
+// chase towards player
+//
+    if (--actor->movecount < 0 || !P_Move(actor))
+    {
+        P_NewChaseDir(actor);
+    }
+}
+
+//============================================================================
+//
+// A_SerpentCheckForAttack
+//
+//============================================================================
+
+void A_SerpentCheckForAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    if (actor->type == MT_SERPENTLEADER)
+    {
+        if (!P_CheckMeleeRange(actor))
+        {
+            P_SetMobjState(actor, S_SERPENT_ATK1);
+            return;
+        }
+    }
+    if (P_CheckMeleeRange2(actor))
+    {
+        P_SetMobjState(actor, S_SERPENT_WALK1);
+    }
+    else if (P_CheckMeleeRange(actor))
+    {
+        if (P_Random() < 32)
+        {
+            P_SetMobjState(actor, S_SERPENT_WALK1);
+        }
+        else
+        {
+            P_SetMobjState(actor, S_SERPENT_ATK1);
+        }
+    }
+}
+
+//============================================================================
+//
+// A_SerpentChooseAttack
+//
+//============================================================================
+
+void A_SerpentChooseAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target || P_CheckMeleeRange(actor))
+    {
+        return;
+    }
+    if (actor->type == MT_SERPENTLEADER)
+    {
+        P_SetMobjState(actor, S_SERPENT_MISSILE1);
+    }
+}
+
+//============================================================================
+//
+// A_SerpentMeleeAttack
+//
+//============================================================================
+
+void A_SerpentMeleeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(5));
+        S_StartSound(actor, SFX_SERPENT_MELEEHIT);
+    }
+    if (P_Random() < 96)
+    {
+        A_SerpentCheckForAttack(actor, player, psp);
+    }
+}
+
+//============================================================================
+//
+// A_SerpentMissileAttack
+//
+//============================================================================
+
+void A_SerpentMissileAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+
+    P_SpawnMissile(actor, actor->target, MT_SERPENTFX);
+}
+
+//============================================================================
+//
+// A_SerpentHeadPop
+//
+//============================================================================
+
+void A_SerpentHeadPop(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                MT_SERPENT_HEAD);
+}
+
+//============================================================================
+//
+// A_SerpentSpawnGibs
+//
+//============================================================================
+
+void A_SerpentSpawnGibs(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1, r2;
+
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(actor->x + ((r2 - 128) << 12),
+                     actor->y + ((r1 - 128) << 12),
+                     actor->floorz + FRACUNIT, MT_SERPENT_GIB1);
+    if (mo)
+    {
+        mo->momx = (P_Random() - 128) << 6;
+        mo->momy = (P_Random() - 128) << 6;
+        mo->floorclip = 6 * FRACUNIT;
+    }
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(actor->x + ((r2 - 128) << 12),
+                     actor->y + ((r1 - 128) << 12),
+                     actor->floorz + FRACUNIT, MT_SERPENT_GIB2);
+    if (mo)
+    {
+        mo->momx = (P_Random() - 128) << 6;
+        mo->momy = (P_Random() - 128) << 6;
+        mo->floorclip = 6 * FRACUNIT;
+    }
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(actor->x + ((r2 - 128) << 12),
+                     actor->y + ((r1 - 128) << 12),
+                     actor->floorz + FRACUNIT, MT_SERPENT_GIB3);
+    if (mo)
+    {
+        mo->momx = (P_Random() - 128) << 6;
+        mo->momy = (P_Random() - 128) << 6;
+        mo->floorclip = 6 * FRACUNIT;
+    }
+}
+
+//============================================================================
+//
+// A_FloatGib
+//
+//============================================================================
+
+void A_FloatGib(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->floorclip -= FRACUNIT;
+}
+
+//============================================================================
+//
+// A_SinkGib
+//
+//============================================================================
+
+void A_SinkGib(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->floorclip += FRACUNIT;
+}
+
+//============================================================================
+//
+// A_DelayGib
+//
+//============================================================================
+
+void A_DelayGib(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->tics -= P_Random() >> 2;
+}
+
+//============================================================================
+//
+// A_SerpentHeadCheck
+//
+//============================================================================
+
+void A_SerpentHeadCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->z <= actor->floorz)
+    {
+        if (P_GetThingFloorType(actor) >= FLOOR_LIQUID)
+        {
+            P_HitFloor(actor);
+            P_SetMobjState(actor, S_NULL);
+        }
+        else
+        {
+            P_SetMobjState(actor, S_SERPENT_HEAD_X1);
+        }
+    }
+}
+
+//============================================================================
+//
+// A_CentaurAttack
+//
+//============================================================================
+
+void A_CentaurAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, P_Random() % 7 + 3);
+    }
+}
+
+//============================================================================
+//
+// A_CentaurAttack2
+//
+//============================================================================
+
+void A_CentaurAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    P_SpawnMissile(actor, actor->target, MT_CENTAUR_FX);
+    S_StartSound(actor, SFX_CENTAURLEADER_ATTACK);
+}
+
+//============================================================================
+//
+// A_CentaurDropStuff
+//
+//      Spawn shield/sword sprites when the centaur pulps //============================================================================
+
+void A_CentaurDropStuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_CENTAUR_SHIELD);
+    if (mo)
+    {
+        angle = actor->angle + ANG90;
+        mo->momz = FRACUNIT * 8 + (P_Random() << 10);
+        mo->momx = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_CENTAUR_SWORD);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = FRACUNIT * 8 + (P_Random() << 10);
+        mo->momx = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+}
+
+//============================================================================
+//
+// A_CentaurDefend
+//
+//============================================================================
+
+void A_CentaurDefend(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_FaceTarget(actor, player, psp);
+    if (P_CheckMeleeRange(actor) && P_Random() < 32)
+    {
+        A_UnSetInvulnerable(actor, player, psp);
+        P_SetMobjState(actor, actor->info->meleestate);
+    }
+}
+
+//============================================================================
+//
+// A_BishopAttack
+//
+//============================================================================
+
+void A_BishopAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+    {
+        return;
+    }
+    S_StartSound(actor, actor->info->attacksound);
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
+        return;
+    }
+    actor->special1.i = (P_Random() & 3) + 5;
+}
+
+//============================================================================
+//
+// A_BishopAttack2
+//
+//              Spawns one of a string of bishop missiles
+//============================================================================
+
+void A_BishopAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    if (!actor->target || !actor->special1.i)
+    {
+        actor->special1.i = 0;
+        P_SetMobjState(actor, S_BISHOP_WALK1);
+        return;
+    }
+    mo = P_SpawnMissile(actor, actor->target, MT_BISH_FX);
+    if (mo)
+    {
+        mo->special1.m = actor->target;
+        mo->special2.i = 16;      // High word == x/y, Low word == z
+    }
+    actor->special1.i--;
+}
+
+//============================================================================
+//
+// A_BishopMissileWeave
+//
+//============================================================================
+
+void A_BishopMissileWeave(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t newX, newY;
+    int weaveXY, weaveZ;
+    int angle;
+
+    weaveXY = actor->special2.i >> 16;
+    weaveZ = actor->special2.i & 0xFFFF;
+    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    newX = actor->x - FixedMul(finecosine[angle],
+                               FloatBobOffsets[weaveXY] << 1);
+    newY = actor->y - FixedMul(finesine[angle],
+                               FloatBobOffsets[weaveXY] << 1);
+    weaveXY = (weaveXY + 2) & 63;
+    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 1);
+    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 1);
+    P_TryMove(actor, newX, newY);
+    actor->z -= FloatBobOffsets[weaveZ];
+    weaveZ = (weaveZ + 2) & 63;
+    actor->z += FloatBobOffsets[weaveZ];
+    actor->special2.i = weaveZ + (weaveXY << 16);
+}
+
+//============================================================================
+//
+// A_BishopMissileSeek
+//
+//============================================================================
+
+void A_BishopMissileSeek(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SeekerMissile(actor, ANG1 * 2, ANG1 * 3);
+}
+
+//============================================================================
+//
+// A_BishopDecide
+//
+//============================================================================
+
+void A_BishopDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_Random() < 220)
+    {
+        return;
+    }
+    else
+    {
+        P_SetMobjState(actor, S_BISHOP_BLUR1);
+    }
+}
+
+//============================================================================
+//
+// A_BishopDoBlur
+//
+//============================================================================
+
+void A_BishopDoBlur(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->special1.i = (P_Random() & 3) + 3;     // Random number of blurs
+    if (P_Random() < 120)
+    {
+        P_ThrustMobj(actor, actor->angle + ANG90, 11 * FRACUNIT);
+    }
+    else if (P_Random() > 125)
+    {
+        P_ThrustMobj(actor, actor->angle - ANG90, 11 * FRACUNIT);
+    }
+    else
+    {                           // Thrust forward
+        P_ThrustMobj(actor, actor->angle, 11 * FRACUNIT);
+    }
+    S_StartSound(actor, SFX_BISHOP_BLUR);
+}
+
+//============================================================================
+//
+// A_BishopSpawnBlur
+//
+//============================================================================
+
+void A_BishopSpawnBlur(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    if (!--actor->special1.i)
+    {
+        actor->momx = 0;
+        actor->momy = 0;
+        if (P_Random() > 96)
+        {
+            P_SetMobjState(actor, S_BISHOP_WALK1);
+        }
+        else
+        {
+            P_SetMobjState(actor, S_BISHOP_ATK1);
+        }
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_BISHOPBLUR);
+    if (mo)
+    {
+        mo->angle = actor->angle;
+    }
+}
+
+//============================================================================
+//
+// A_BishopChase
+//
+//============================================================================
+
+void A_BishopChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->z -= FloatBobOffsets[actor->special2.i] >> 1;
+    actor->special2.i = (actor->special2.i + 4) & 63;
+    actor->z += FloatBobOffsets[actor->special2.i] >> 1;
+}
+
+//============================================================================
+//
+// A_BishopPuff
+//
+//============================================================================
+
+void A_BishopPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 40 * FRACUNIT,
+                     MT_BISHOP_PUFF);
+    if (mo)
+    {
+        mo->momz = FRACUNIT / 2;
+    }
+}
+
+//============================================================================
+//
+// A_BishopPainBlur
+//
+//============================================================================
+
+void A_BishopPainBlur(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int r1,r2,r3;
+
+    if (P_Random() < 64)
+    {
+        P_SetMobjState(actor, S_BISHOP_BLUR1);
+        return;
+    }
+
+    r1 = P_SubRandom();
+    r2 = P_SubRandom();
+    r3 = P_SubRandom();
+
+    mo = P_SpawnMobj(actor->x + (r3 << 12), actor->y
+                     + (r2 << 12),
+                     actor->z + (r1 << 11),
+                     MT_BISHOPPAINBLUR);
+    if (mo)
+    {
+        mo->angle = actor->angle;
+    }
+}
+
+//============================================================================
+//
+// DragonSeek
+//
+//============================================================================
+
+static void DragonSeek(mobj_t * actor, angle_t thresh, angle_t turnMax)
+{
+    int dir;
+    int dist;
+    angle_t delta;
+    angle_t angle;
+    mobj_t *target;
+    int search;
+    int i;
+    int bestArg;
+    angle_t bestAngle;
+    angle_t angleToSpot, angleToTarget;
+    mobj_t *mo;
+
+    target = actor->special1.m;
+    if (target == NULL)
+    {
+        return;
+    }
+    dir = P_FaceMobj(actor, target, &delta);
+    if (delta > thresh)
+    {
+        delta >>= 1;
+        if (delta > turnMax)
+        {
+            delta = turnMax;
+        }
+    }
+    if (dir)
+    {                           // Turn clockwise
+        actor->angle += delta;
+    }
+    else
+    {                           // Turn counter clockwise
+        actor->angle -= delta;
+    }
+    angle = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
+    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
+    if (actor->z + actor->height < target->z
+        || target->z + target->height < actor->z)
+    {
+        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
+        dist = dist / actor->info->speed;
+        if (dist < 1)
+        {
+            dist = 1;
+        }
+        actor->momz = (target->z - actor->z) / dist;
+    }
+    else
+    {
+        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
+        dist = dist / actor->info->speed;
+    }
+    if (target->flags & MF_SHOOTABLE && P_Random() < 64)
+    {                           // attack the destination mobj if it's attackable
+        mobj_t *oldTarget;
+
+        if (abs((int) actor->angle - (int) R_PointToAngle2(actor->x, actor->y,
+                                               target->x,
+                                               target->y)) < ANG45 / 2)
+        {
+            oldTarget = actor->target;
+            actor->target = target;
+            if (P_CheckMeleeRange(actor))
+            {
+                P_DamageMobj(actor->target, actor, actor, HITDICE(10));
+                S_StartSound(actor, SFX_DRAGON_ATTACK);
+            }
+            else if (P_Random() < 128 && P_CheckMissileRange(actor))
+            {
+                P_SpawnMissile(actor, target, MT_DRAGON_FX);
+                S_StartSound(actor, SFX_DRAGON_ATTACK);
+            }
+            actor->target = oldTarget;
+        }
+    }
+    if (dist < 4)
+    {                           // Hit the target thing
+        if (actor->target && P_Random() < 200)
+        {
+            bestArg = -1;
+            bestAngle = ANG_MAX;
+            angleToTarget = R_PointToAngle2(actor->x, actor->y,
+                                            actor->target->x,
+                                            actor->target->y);
+            for (i = 0; i < 5; i++)
+            {
+                if (!target->args[i])
+                {
+                    continue;
+                }
+                search = -1;
+                mo = P_FindMobjFromTID(target->args[i], &search);
+                angleToSpot = R_PointToAngle2(actor->x, actor->y,
+                                              mo->x, mo->y);
+                if (abs((int) angleToSpot - (int) angleToTarget) < bestAngle)
+                {
+                    bestAngle = abs((int) angleToSpot - (int) angleToTarget);
+                    bestArg = i;
+                }
+            }
+            if (bestArg != -1)
+            {
+                search = -1;
+                actor->special1.m =
+                    P_FindMobjFromTID(target->args[bestArg], &search);
+            }
+        }
+        else
+        {
+            do
+            {
+                i = (P_Random() >> 2) % 5;
+            }
+            while (!target->args[i]);
+            search = -1;
+            actor->special1.m =
+                P_FindMobjFromTID(target->args[i], &search);
+        }
+    }
+}
+
+//============================================================================
+//
+// A_DragonInitFlight
+//
+//============================================================================
+
+void A_DragonInitFlight(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int search;
+
+    search = -1;
+    do
+    {                           // find the first tid identical to the dragon's tid
+        actor->special1.m = P_FindMobjFromTID(actor->tid, &search);
+        if (search == -1)
+        {
+            P_SetMobjState(actor, actor->info->spawnstate);
+            return;
+        }
+    }
+    while (actor->special1.m == actor);
+    P_RemoveMobjFromTIDList(actor);
+}
+
+//============================================================================
+//
+// A_DragonFlight
+//
+//============================================================================
+
+void A_DragonFlight(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+
+    DragonSeek(actor, 4 * ANG1, 8 * ANG1);
+    if (actor->target)
+    {
+        if (!(actor->target->flags & MF_SHOOTABLE))
+        {                       // target died
+            actor->target = NULL;
+            return;
+        }
+        angle = R_PointToAngle2(actor->x, actor->y, actor->target->x,
+                                actor->target->y);
+        if (abs((int) actor->angle - (int) angle) < ANG45 / 2
+            && P_CheckMeleeRange(actor))
+        {
+            P_DamageMobj(actor->target, actor, actor, HITDICE(8));
+            S_StartSound(actor, SFX_DRAGON_ATTACK);
+        }
+        else if (abs((int) actor->angle - (int) angle) <= ANG1 * 20)
+        {
+            P_SetMobjState(actor, actor->info->missilestate);
+            S_StartSound(actor, SFX_DRAGON_ATTACK);
+        }
+    }
+    else
+    {
+        P_LookForPlayers(actor, true);
+    }
+}
+
+//============================================================================
+//
+// A_DragonFlap
+//
+//============================================================================
+
+void A_DragonFlap(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_DragonFlight(actor, player, psp);
+    if (P_Random() < 240)
+    {
+        S_StartSound(actor, SFX_DRAGON_WINGFLAP);
+    }
+    else
+    {
+        S_StartSound(actor, actor->info->activesound);
+    }
+}
+
+//============================================================================
+//
+// A_DragonAttack
+//
+//============================================================================
+
+void A_DragonAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMissile(actor, actor->target, MT_DRAGON_FX);
+}
+
+//============================================================================
+//
+// A_DragonFX2
+//
+//============================================================================
+
+void A_DragonFX2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int i;
+    int r1,r2,r3;
+    int delay;
+
+    delay = 16 + (P_Random() >> 3);
+    for (i = 1 + (P_Random() & 3); i; i--)
+    {
+        r1 = P_Random();
+        r2 = P_Random();
+        r3 = P_Random();
+        mo = P_SpawnMobj(actor->x + ((r3 - 128) << 14),
+                         actor->y + ((r2 - 128) << 14),
+                         actor->z + ((r1 - 128) << 12),
+                         MT_DRAGON_FX2);
+        if (mo)
+        {
+            mo->tics = delay + (P_Random() & 3) * i * 2;
+            mo->target = actor->target;
+        }
+    }
+}
+
+//============================================================================
+//
+// A_DragonPain
+//
+//============================================================================
+
+void A_DragonPain(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_Pain(actor, player, psp);
+    if (!actor->special1.i)
+    {                           // no destination spot yet
+        P_SetMobjState(actor, S_DRAGON_INIT);
+    }
+}
+
+//============================================================================
+//
+// A_DragonCheckCrash
+//
+//============================================================================
+
+void A_DragonCheckCrash(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->z <= actor->floorz)
+    {
+        P_SetMobjState(actor, S_DRAGON_CRASH1);
+    }
+}
+
+//============================================================================
+// Demon AI
+//============================================================================
+
+//
+// A_DemonAttack1 (melee)
+//
+void A_DemonAttack1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
+    }
+}
+
+
+//
+// A_DemonAttack2 (missile)
+//
+void A_DemonAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int fireBall;
+
+    if (actor->type == MT_DEMON)
+    {
+        fireBall = MT_DEMONFX1;
+    }
+    else
+    {
+        fireBall = MT_DEMON2FX1;
+    }
+    mo = P_SpawnMissile(actor, actor->target, fireBall);
+    if (mo)
+    {
+        mo->z += 30 * FRACUNIT;
+        S_StartSound(actor, SFX_DEMON_MISSILE_FIRE);
+    }
+}
+
+//
+// A_DemonDeath
+//
+
+void A_DemonDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMONCHUNK1);
+    if (mo)
+    {
+        angle = actor->angle + ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMONCHUNK2);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMONCHUNK3);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMONCHUNK4);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMONCHUNK5);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+}
+
+//===========================================================================
+//
+// A_Demon2Death
+//
+//===========================================================================
+
+void A_Demon2Death(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMON2CHUNK1);
+    if (mo)
+    {
+        angle = actor->angle + ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMON2CHUNK2);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMON2CHUNK3);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMON2CHUNK4);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
+                     MT_DEMON2CHUNK5);
+    if (mo)
+    {
+        angle = actor->angle - ANG90;
+        mo->momz = 8 * FRACUNIT;
+        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finecosine[angle >> ANGLETOFINESHIFT]);
+        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
+                            finesine[angle >> ANGLETOFINESHIFT]);
+        mo->target = actor;
+    }
+}
+
+
+
+//
+// A_SinkMobj
+// Sink a mobj incrementally into the floor
+//
+
+boolean A_SinkMobj(mobj_t * actor)
+{
+    if (actor->floorclip < actor->info->height)
+    {
+        switch (actor->type)
+        {
+            case MT_THRUSTFLOOR_DOWN:
+            case MT_THRUSTFLOOR_UP:
+                actor->floorclip += 6 * FRACUNIT;
+                break;
+            default:
+                actor->floorclip += FRACUNIT;
+                break;
+        }
+        return false;
+    }
+    return true;
+}
+
+//
+// A_RaiseMobj
+// Raise a mobj incrementally from the floor to 
+// 
+
+boolean A_RaiseMobj(mobj_t * actor)
+{
+    int done = true;
+
+    // Raise a mobj from the ground
+    if (actor->floorclip > 0)
+    {
+        switch (actor->type)
+        {
+            case MT_WRAITHB:
+                actor->floorclip -= 2 * FRACUNIT;
+                break;
+            case MT_THRUSTFLOOR_DOWN:
+            case MT_THRUSTFLOOR_UP:
+                actor->floorclip -= actor->special2.i * FRACUNIT;
+                break;
+            default:
+                actor->floorclip -= 2 * FRACUNIT;
+                break;
+        }
+        if (actor->floorclip <= 0)
+        {
+            actor->floorclip = 0;
+            done = true;
+        }
+        else
+        {
+            done = false;
+        }
+    }
+    return done;                // Reached target height
+}
+
+
+//============================================================================
+// Wraith Variables
+//
+//      special1                                Internal index into floatbob
+//      special2
+//============================================================================
+
+//
+// A_WraithInit
+//
+
+void A_WraithInit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->z += 48 << FRACBITS;
+    actor->special1.i = 0;        // index into floatbob
+}
+
+void A_WraithRaiseInit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags2 &= ~MF2_DONTDRAW;
+    actor->flags2 &= ~MF2_NONSHOOTABLE;
+    actor->flags |= MF_SHOOTABLE | MF_SOLID;
+    actor->floorclip = actor->info->height;
+}
+
+void A_WraithRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (A_RaiseMobj(actor))
+    {
+        // Reached it's target height
+        P_SetMobjState(actor, S_WRAITH_CHASE1);
+    }
+
+    P_SpawnDirt(actor, actor->radius);
+}
+
+
+void A_WraithMelee(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int amount;
+
+    // Steal health from target and give to player
+    if (P_CheckMeleeRange(actor) && (P_Random() < 220))
+    {
+        amount = HITDICE(2);
+        P_DamageMobj(actor->target, actor, actor, amount);
+        actor->health += amount;
+    }
+}
+
+void A_WraithMissile(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMissile(actor, actor->target, MT_WRAITHFX1);
+    if (mo)
+    {
+        S_StartSound(actor, SFX_WRAITH_MISSILE_FIRE);
+    }
+}
+
+
+//
+// A_WraithFX2 - spawns sparkle tail of missile
+//
+
+void A_WraithFX2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t angle;
+    int i;
+
+    for (i = 0; i < 2; i++)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX2);
+        if (mo)
+        {
+            if (P_Random() < 128)
+            {
+                angle = actor->angle + (P_Random() << 22);
+            }
+            else
+            {
+                angle = actor->angle - (P_Random() << 22);
+            }
+            mo->momz = 0;
+            mo->momx = FixedMul((P_Random() << 7) + FRACUNIT,
+                                finecosine[angle >> ANGLETOFINESHIFT]);
+            mo->momy = FixedMul((P_Random() << 7) + FRACUNIT,
+                                finesine[angle >> ANGLETOFINESHIFT]);
+            mo->target = actor;
+            mo->floorclip = 10 * FRACUNIT;
+        }
+    }
+}
+
+
+// Spawn an FX3 around the actor during attacks
+void A_WraithFX3(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int numdropped = P_Random() % 15;
+    int i;
+
+    for (i = 0; i < numdropped; i++)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX3);
+        if (mo)
+        {
+            mo->x += (P_Random() - 128) << 11;
+            mo->y += (P_Random() - 128) << 11;
+            mo->z += (P_Random() << 10);
+            mo->target = actor;
+        }
+    }
+}
+
+// Spawn an FX4 during movement
+void A_WraithFX4(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int chance = P_Random();
+    int spawn4, spawn5;
+
+    if (chance < 10)
+    {
+        spawn4 = true;
+        spawn5 = false;
+    }
+    else if (chance < 20)
+    {
+        spawn4 = false;
+        spawn5 = true;
+    }
+    else if (chance < 25)
+    {
+        spawn4 = true;
+        spawn5 = true;
+    }
+    else
+    {
+        spawn4 = false;
+        spawn5 = false;
+    }
+
+    if (spawn4)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX4);
+        if (mo)
+        {
+            mo->x += (P_Random() - 128) << 12;
+            mo->y += (P_Random() - 128) << 12;
+            mo->z += (P_Random() << 10);
+            mo->target = actor;
+        }
+    }
+    if (spawn5)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX5);
+        if (mo)
+        {
+            mo->x += (P_Random() - 128) << 11;
+            mo->y += (P_Random() - 128) << 11;
+            mo->z += (P_Random() << 10);
+            mo->target = actor;
+        }
+    }
+}
+
+
+void A_WraithLook(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+//      A_WraithFX4(actor);             // too expensive
+    A_Look(actor, player, psp);
+}
+
+
+void A_WraithChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int weaveindex = actor->special1.i;
+    actor->z += FloatBobOffsets[weaveindex];
+    actor->special1.i = (weaveindex + 2) & 63;
+//      if (actor->floorclip > 0)
+//      {
+//              P_SetMobjState(actor, S_WRAITH_RAISE2);
+//              return;
+//      }
+    A_Chase(actor, player, psp);
+    A_WraithFX4(actor, player, psp);
+}
+
+
+
+//============================================================================
+// Ettin AI
+//============================================================================
+
+void A_EttinAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_CheckMeleeRange(actor))
+    {
+        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
+    }
+}
+
+
+void A_DropMace(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y,
+                     actor->z + (actor->height >> 1), MT_ETTIN_MACE);
+    if (mo)
+    {
+        mo->momx = (P_Random() - 128) << 11;
+        mo->momy = (P_Random() - 128) << 11;
+        mo->momz = FRACUNIT * 10 + (P_Random() << 10);
+        mo->target = actor;
+    }
+}
+
+
+//============================================================================
+// Fire Demon AI
+//
+// special1                     index into floatbob
+// special2                     whether strafing or not
+//============================================================================
+
+void A_FiredSpawnRock(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int x, y, z;
+    int rtype = 0;
+
+    switch (P_Random() % 5)
+    {
+        case 0:
+            rtype = MT_FIREDEMON_FX1;
+            break;
+        case 1:
+            rtype = MT_FIREDEMON_FX2;
+            break;
+        case 2:
+            rtype = MT_FIREDEMON_FX3;
+            break;
+        case 3:
+            rtype = MT_FIREDEMON_FX4;
+            break;
+        case 4:
+            rtype = MT_FIREDEMON_FX5;
+            break;
+    }
+
+    x = actor->x + ((P_Random() - 128) << 12);
+    y = actor->y + ((P_Random() - 128) << 12);
+    z = actor->z + ((P_Random()) << 11);
+    mo = P_SpawnMobj(x, y, z, rtype);
+    if (mo)
+    {
+        mo->target = actor;
+        mo->momx = (P_Random() - 128) << 10;
+        mo->momy = (P_Random() - 128) << 10;
+        mo->momz = (P_Random() << 10);
+        mo->special1.i = 2;       // Number bounces
+    }
+
+    // Initialize fire demon
+    actor->special2.i = 0;
+    actor->flags &= ~MF_JUSTATTACKED;
+}
+
+void A_FiredRocks(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_FiredSpawnRock(actor, player, psp);
+    A_FiredSpawnRock(actor, player, psp);
+    A_FiredSpawnRock(actor, player, psp);
+    A_FiredSpawnRock(actor, player, psp);
+    A_FiredSpawnRock(actor, player, psp);
+}
+
+void A_FiredAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    mo = P_SpawnMissile(actor, actor->target, MT_FIREDEMON_FX6);
+    if (mo)
+        S_StartSound(actor, SFX_FIRED_ATTACK);
+}
+
+void A_SmBounce(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    // give some more momentum (x,y,&z)
+    actor->z = actor->floorz + FRACUNIT;
+    actor->momz = (2 * FRACUNIT) + (P_Random() << 10);
+    actor->momx = P_Random() % 3 << FRACBITS;
+    actor->momy = P_Random() % 3 << FRACBITS;
+}
+
+
+#define FIREDEMON_ATTACK_RANGE	64*8*FRACUNIT
+
+void A_FiredChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int weaveindex = actor->special1.i;
+    mobj_t *target = actor->target;
+    angle_t ang;
+    fixed_t dist;
+
+    if (actor->reactiontime)
+        actor->reactiontime--;
+    if (actor->threshold)
+        actor->threshold--;
+
+    // Float up and down
+    actor->z += FloatBobOffsets[weaveindex];
+    actor->special1.i = (weaveindex + 2) & 63;
+
+    // Insure it stays above certain height
+    if (actor->z < actor->floorz + (64 * FRACUNIT))
+    {
+        actor->z += 2 * FRACUNIT;
+    }
+
+    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {                           // Invalid target
+        P_LookForPlayers(actor, true);
+        return;
+    }
+
+    // Strafe
+    if (actor->special2.i > 0)
+    {
+        actor->special2.i--;
+    }
+    else
+    {
+        actor->special2.i = 0;
+        actor->momx = actor->momy = 0;
+        dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
+        if (dist < FIREDEMON_ATTACK_RANGE)
+        {
+            if (P_Random() < 30)
+            {
+                ang =
+                    R_PointToAngle2(actor->x, actor->y, target->x, target->y);
+                if (P_Random() < 128)
+                    ang += ANG90;
+                else
+                    ang -= ANG90;
+                ang >>= ANGLETOFINESHIFT;
+                actor->momx = FixedMul(8 * FRACUNIT, finecosine[ang]);
+                actor->momy = FixedMul(8 * FRACUNIT, finesine[ang]);
+                actor->special2.i = 3;    // strafe time
+            }
+        }
+    }
+
+    FaceMovementDirection(actor);
+
+    // Normal movement
+    if (!actor->special2.i)
+    {
+        if (--actor->movecount < 0 || !P_Move(actor))
+        {
+            P_NewChaseDir(actor);
+        }
+    }
+
+    // Do missile attack
+    if (!(actor->flags & MF_JUSTATTACKED))
+    {
+        if (P_CheckMissileRange(actor) && (P_Random() < 20))
+        {
+            P_SetMobjState(actor, actor->info->missilestate);
+            actor->flags |= MF_JUSTATTACKED;
+            return;
+        }
+    }
+    else
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+    }
+
+    // make active sound
+    if (actor->info->activesound && P_Random() < 3)
+    {
+        S_StartSound(actor, actor->info->activesound);
+    }
+}
+
+void A_FiredSplotch(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FIREDEMON_SPLOTCH1);
+    if (mo)
+    {
+        mo->momx = (P_Random() - 128) << 11;
+        mo->momy = (P_Random() - 128) << 11;
+        mo->momz = FRACUNIT * 3 + (P_Random() << 10);
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FIREDEMON_SPLOTCH2);
+    if (mo)
+    {
+        mo->momx = (P_Random() - 128) << 11;
+        mo->momy = (P_Random() - 128) << 11;
+        mo->momz = FRACUNIT * 3 + (P_Random() << 10);
+    }
+}
+
+
+//============================================================================
+//
+// A_IceGuyLook
+//
+//============================================================================
+
+void A_IceGuyLook(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t dist;
+    fixed_t an;
+
+    A_Look(actor, player, psp);
+    if (P_Random() < 64)
+    {
+        dist = ((P_Random() - 128) * actor->radius) >> 7;
+        an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+
+        P_SpawnMobj(actor->x + FixedMul(dist, finecosine[an]),
+                    actor->y + FixedMul(dist, finesine[an]),
+                    actor->z + 60 * FRACUNIT,
+                    MT_ICEGUY_WISP1 + (P_Random() & 1));
+    }
+}
+
+//============================================================================
+//
+// A_IceGuyChase
+//
+//============================================================================
+
+void A_IceGuyChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t dist;
+    fixed_t an;
+    mobj_t *mo;
+
+    A_Chase(actor, player, psp);
+    if (P_Random() < 128)
+    {
+        dist = ((P_Random() - 128) * actor->radius) >> 7;
+        an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+
+        mo = P_SpawnMobj(actor->x + FixedMul(dist, finecosine[an]),
+                         actor->y + FixedMul(dist, finesine[an]),
+                         actor->z + 60 * FRACUNIT,
+                         MT_ICEGUY_WISP1 + (P_Random() & 1));
+        if (mo)
+        {
+            mo->momx = actor->momx;
+            mo->momy = actor->momy;
+            mo->momz = actor->momz;
+            mo->target = actor;
+        }
+    }
+}
+
+//============================================================================
+//
+// A_IceGuyAttack
+//
+//============================================================================
+
+void A_IceGuyAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t an;
+
+    if (!actor->target)
+    {
+        return;
+    }
+    an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    P_SpawnMissileXYZ(actor->x + FixedMul(actor->radius >> 1,
+                                          finecosine[an]),
+                      actor->y + FixedMul(actor->radius >> 1, finesine[an]),
+                      actor->z + 40 * FRACUNIT, actor, actor->target,
+                      MT_ICEGUY_FX);
+    an = (actor->angle - ANG90) >> ANGLETOFINESHIFT;
+    P_SpawnMissileXYZ(actor->x + FixedMul(actor->radius >> 1,
+                                          finecosine[an]),
+                      actor->y + FixedMul(actor->radius >> 1, finesine[an]),
+                      actor->z + 40 * FRACUNIT, actor, actor->target,
+                      MT_ICEGUY_FX);
+    S_StartSound(actor, actor->info->attacksound);
+}
+
+//============================================================================
+//
+// A_IceGuyMissilePuff
+//
+//============================================================================
+
+void A_IceGuyMissilePuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z + 2 * FRACUNIT, MT_ICEFX_PUFF);
+}
+
+//============================================================================
+//
+// A_IceGuyDie
+//
+//============================================================================
+
+void A_IceGuyDie(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->momx = 0;
+    actor->momy = 0;
+    actor->momz = 0;
+    actor->height <<= 2;
+    A_FreezeDeathChunks(actor, player, psp);
+}
+
+//============================================================================
+//
+// A_IceGuyMissileExplode
+//
+//============================================================================
+
+void A_IceGuyMissileExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    unsigned int i;
+
+    for (i = 0; i < 8; i++)
+    {
+        mo = P_SpawnMissileAngle(actor, MT_ICEGUY_FX2, i * ANG45,
+                                 -0.3 * FRACUNIT);
+        if (mo)
+        {
+            mo->target = actor->target;
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+//============================================================================
+//
+//      Sorcerer stuff
+//
+// Sorcerer Variables
+//              special1                Angle of ball 1 (all others relative to that)
+//              special2                which ball to stop at in stop mode (MT_???)
+//              args[0]                 Denfense time
+//              args[1]                 Number of full rotations since stopping mode
+//              args[2]                 Target orbit speed for acceleration/deceleration
+//              args[3]                 Movement mode (see SORC_ macros)
+//              args[4]                 Current ball orbit speed
+//      Sorcerer Ball Variables
+//              special1                Previous angle of ball (for woosh)
+//              special2                Countdown of rapid fire (FX4)
+//              args[0]                 If set, don't play the bounce sound when bouncing
+//============================================================================
+
+#define SORCBALL_INITIAL_SPEED 		7
+#define SORCBALL_TERMINAL_SPEED		25
+#define SORCBALL_SPEED_ROTATIONS 	5
+#define SORC_DEFENSE_TIME			255
+#define SORC_DEFENSE_HEIGHT			45
+#define BOUNCE_TIME_UNIT			(35/2)
+#define SORCFX4_RAPIDFIRE_TIME		(6*3)   // 3 seconds
+#define SORCFX4_SPREAD_ANGLE		20
+
+#define SORC_DECELERATE		0
+#define SORC_ACCELERATE 	1
+#define SORC_STOPPING		2
+#define SORC_FIRESPELL		3
+#define SORC_STOPPED		4
+#define SORC_NORMAL			5
+#define SORC_FIRING_SPELL	6
+
+#define BALL1_ANGLEOFFSET	0
+#define BALL2_ANGLEOFFSET	(ANG_MAX/3)
+#define BALL3_ANGLEOFFSET	((ANG_MAX/3)*2)
+
+
+// Spawn spinning balls above head - actor is sorcerer
+void A_SorcSpinBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    fixed_t z;
+
+    A_SlowBalls(actor, player, psp);
+    actor->args[0] = 0;         // Currently no defense
+    actor->args[3] = SORC_NORMAL;
+    actor->args[4] = SORCBALL_INITIAL_SPEED;    // Initial orbit speed
+    actor->special1.i = ANG1;
+    z = actor->z - actor->floorclip + actor->info->height;
+
+    mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCBALL1);
+    if (mo)
+    {
+        mo->target = actor;
+        mo->special2.i = SORCFX4_RAPIDFIRE_TIME;
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCBALL2);
+    if (mo)
+        mo->target = actor;
+    mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCBALL3);
+    if (mo)
+        mo->target = actor;
+}
+
+
+//
+// A_SorcBallOrbit() ==========================================
+//
+
+void A_SorcBallOrbit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int x, y;
+    angle_t angle, baseangle;
+    int mode = actor->target->args[3];
+    mobj_t *parent = (mobj_t *) actor->target;
+    int dist = parent->radius - (actor->radius << 1);
+    angle_t prevangle = actor->special1.i;
+
+    if (actor->target->health <= 0)
+        P_SetMobjState(actor, actor->info->painstate);
+
+    baseangle = (angle_t) parent->special1.i;
+    switch (actor->type)
+    {
+        case MT_SORCBALL1:
+            angle = baseangle + BALL1_ANGLEOFFSET;
+            break;
+        case MT_SORCBALL2:
+            angle = baseangle + BALL2_ANGLEOFFSET;
+            break;
+        case MT_SORCBALL3:
+            angle = baseangle + BALL3_ANGLEOFFSET;
+            break;
+        default:
+            I_Error("corrupted sorcerer");
+            return;
+    }
+    actor->angle = angle;
+    angle >>= ANGLETOFINESHIFT;
+
+    switch (mode)
+    {
+        case SORC_NORMAL:      // Balls rotating normally
+            A_SorcUpdateBallAngle(actor, player, psp);
+            break;
+        case SORC_DECELERATE:  // Balls decelerating
+            A_DecelBalls(actor, player, psp);
+            A_SorcUpdateBallAngle(actor, player, psp);
+            break;
+        case SORC_ACCELERATE:  // Balls accelerating
+            A_AccelBalls(actor, player, psp);
+            A_SorcUpdateBallAngle(actor, player, psp);
+            break;
+        case SORC_STOPPING:    // Balls stopping
+            if ((parent->special2.i == actor->type) &&
+                (parent->args[1] > SORCBALL_SPEED_ROTATIONS) &&
+                (abs((int) angle - (int) (parent->angle >> ANGLETOFINESHIFT)) <
+                 (30 << 5)))
+            {
+                // Can stop now
+                actor->target->args[3] = SORC_FIRESPELL;
+                actor->target->args[4] = 0;
+                // Set angle so ball angle == sorcerer angle
+                switch (actor->type)
+                {
+                    case MT_SORCBALL1:
+                        parent->special1.i = (int) (parent->angle -
+                                                    BALL1_ANGLEOFFSET);
+                        break;
+                    case MT_SORCBALL2:
+                        parent->special1.i = (int) (parent->angle -
+                                                    BALL2_ANGLEOFFSET);
+                        break;
+                    case MT_SORCBALL3:
+                        parent->special1.i = (int) (parent->angle -
+                                                    BALL3_ANGLEOFFSET);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                A_SorcUpdateBallAngle(actor, player, psp);
+            }
+            break;
+        case SORC_FIRESPELL:   // Casting spell
+            if (parent->special2.i == actor->type)
+            {
+                // Put sorcerer into special throw spell anim
+                if (parent->health > 0)
+                    P_SetMobjStateNF(parent, S_SORC_ATTACK1);
+
+                if (actor->type == MT_SORCBALL1 && P_Random() < 200)
+                {
+                    S_StartSound(NULL, SFX_SORCERER_SPELLCAST);
+                    actor->special2.i = SORCFX4_RAPIDFIRE_TIME;
+                    actor->args[4] = 128;
+                    parent->args[3] = SORC_FIRING_SPELL;
+                }
+                else
+                {
+                    A_CastSorcererSpell(actor, player, psp);
+                    parent->args[3] = SORC_STOPPED;
+                }
+            }
+            break;
+        case SORC_FIRING_SPELL:
+            if (parent->special2.i == actor->type)
+            {
+                if (actor->special2.i-- <= 0)
+                {
+                    // Done rapid firing 
+                    parent->args[3] = SORC_STOPPED;
+                    // Back to orbit balls
+                    if (parent->health > 0)
+                        P_SetMobjStateNF(parent, S_SORC_ATTACK4);
+                }
+                else
+                {
+                    // Do rapid fire spell
+                    A_SorcOffense2(actor, player, psp);
+                }
+            }
+            break;
+        case SORC_STOPPED:     // Balls stopped
+        default:
+            break;
+    }
+
+    if ((angle < prevangle) && (parent->args[4] == SORCBALL_TERMINAL_SPEED))
+    {
+        parent->args[1]++;      // Bump rotation counter
+        // Completed full rotation - make woosh sound
+        S_StartSound(actor, SFX_SORCERER_BALLWOOSH);
+    }
+    actor->special1.i = angle;    // Set previous angle
+    x = parent->x + FixedMul(dist, finecosine[angle]);
+    y = parent->y + FixedMul(dist, finesine[angle]);
+    actor->x = x;
+    actor->y = y;
+    actor->z = parent->z - parent->floorclip + parent->info->height;
+}
+
+
+//
+// Set balls to speed mode - actor is sorcerer
+//
+void A_SpeedBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->args[3] = SORC_ACCELERATE;   // speed mode
+    actor->args[2] = SORCBALL_TERMINAL_SPEED;   // target speed
+}
+
+
+//
+// Set balls to slow mode - actor is sorcerer
+//
+void A_SlowBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->args[3] = SORC_DECELERATE;   // slow mode
+    actor->args[2] = SORCBALL_INITIAL_SPEED;    // target speed
+}
+
+
+//
+// Instant stop when rotation gets to ball in special2
+//              actor is sorcerer
+//
+void A_StopBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int chance = P_Random();
+    actor->args[3] = SORC_STOPPING;     // stopping mode
+    actor->args[1] = 0;         // Reset rotation counter
+
+    if ((actor->args[0] <= 0) && (chance < 200))
+    {
+        actor->special2.i = MT_SORCBALL2; // Blue
+    }
+    else if ((actor->health < (actor->info->spawnhealth >> 1)) &&
+             (chance < 200))
+    {
+        actor->special2.i = MT_SORCBALL3; // Green
+    }
+    else
+    {
+        actor->special2.i = MT_SORCBALL1; // Yellow
+    }
+
+
+}
+
+
+//
+// Increase ball orbit speed - actor is ball
+//
+void A_AccelBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *sorc = actor->target;
+
+    if (sorc->args[4] < sorc->args[2])
+    {
+        sorc->args[4]++;
+    }
+    else
+    {
+        sorc->args[3] = SORC_NORMAL;
+        if (sorc->args[4] >= SORCBALL_TERMINAL_SPEED)
+        {
+            // Reached terminal velocity - stop balls
+            A_StopBalls(sorc, player, psp);
+        }
+    }
+}
+
+
+// Decrease ball orbit speed - actor is ball
+void A_DecelBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *sorc = actor->target;
+
+    if (sorc->args[4] > sorc->args[2])
+    {
+        sorc->args[4]--;
+    }
+    else
+    {
+        sorc->args[3] = SORC_NORMAL;
+    }
+}
+
+
+// Update angle if first ball - actor is ball
+void A_SorcUpdateBallAngle(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->type == MT_SORCBALL1)
+    {
+        actor->target->special1.i += ANG1 * actor->target->args[4];
+    }
+}
+
+
+// actor is ball
+void A_CastSorcererSpell(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int spell = actor->type;
+    angle_t ang1, ang2;
+    fixed_t z;
+    mobj_t *parent = actor->target;
+
+    S_StartSound(NULL, SFX_SORCERER_SPELLCAST);
+
+    // Put sorcerer into throw spell animation
+    if (parent->health > 0)
+        P_SetMobjStateNF(parent, S_SORC_ATTACK4);
+
+    switch (spell)
+    {
+        case MT_SORCBALL1:     // Offensive
+            A_SorcOffense1(actor, player, psp);
+            break;
+        case MT_SORCBALL2:     // Defensive
+            z = parent->z - parent->floorclip +
+                SORC_DEFENSE_HEIGHT * FRACUNIT;
+            mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCFX2);
+            parent->flags2 |= MF2_REFLECTIVE | MF2_INVULNERABLE;
+            parent->args[0] = SORC_DEFENSE_TIME;
+            if (mo)
+                mo->target = parent;
+            break;
+        case MT_SORCBALL3:     // Reinforcements
+            ang1 = actor->angle - ANG45;
+            ang2 = actor->angle + ANG45;
+            if (actor->health < (actor->info->spawnhealth / 3))
+            {                   // Spawn 2 at a time
+                mo = P_SpawnMissileAngle(parent, MT_SORCFX3, ang1,
+                                         4 * FRACUNIT);
+                if (mo)
+                    mo->target = parent;
+                mo = P_SpawnMissileAngle(parent, MT_SORCFX3, ang2,
+                                         4 * FRACUNIT);
+                if (mo)
+                    mo->target = parent;
+            }
+            else
+            {
+                if (P_Random() < 128)
+                    ang1 = ang2;
+                mo = P_SpawnMissileAngle(parent, MT_SORCFX3, ang1,
+                                         4 * FRACUNIT);
+                if (mo)
+                    mo->target = parent;
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+/*
+void A_SpawnReinforcements(mobj_t *actor)
+{
+	mobj_t *parent = actor->target;
+	mobj_t *mo;
+	angle_t ang;
+
+	ang = ANG1 * P_Random();
+	mo = P_SpawnMissileAngle(actor, MT_SORCFX3, ang, 5*FRACUNIT);
+	if (mo) mo->target = parent;
+}
+*/
+
+// actor is ball
+void A_SorcOffense1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    angle_t ang1, ang2;
+    mobj_t *parent = (mobj_t *) actor->target;
+
+    ang1 = actor->angle + ANG1 * 70;
+    ang2 = actor->angle - ANG1 * 70;
+    mo = P_SpawnMissileAngle(parent, MT_SORCFX1, ang1, 0);
+    if (mo)
+    {
+        mo->target = parent;
+        mo->special1.m = parent->target;
+        mo->args[4] = BOUNCE_TIME_UNIT;
+        mo->args[3] = 15;       // Bounce time in seconds
+    }
+    mo = P_SpawnMissileAngle(parent, MT_SORCFX1, ang2, 0);
+    if (mo)
+    {
+        mo->target = parent;
+        mo->special1.m = parent->target;
+        mo->args[4] = BOUNCE_TIME_UNIT;
+        mo->args[3] = 15;       // Bounce time in seconds
+    }
+}
+
+
+// Actor is ball
+void A_SorcOffense2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t ang1;
+    mobj_t *mo;
+    int delta, index;
+    mobj_t *parent = actor->target;
+    mobj_t *dest = parent->target;
+    int dist;
+
+    index = actor->args[4] << 5;
+    actor->args[4] += 15;
+    delta = (finesine[index]) * SORCFX4_SPREAD_ANGLE;
+    delta = (delta >> FRACBITS) * ANG1;
+    ang1 = actor->angle + delta;
+    mo = P_SpawnMissileAngle(parent, MT_SORCFX4, ang1, 0);
+    if (mo)
+    {
+        mo->special2.i = 35 * 5 / 2;      // 5 seconds
+        dist = P_AproxDistance(dest->x - mo->x, dest->y - mo->y);
+        dist = dist / mo->info->speed;
+        if (dist < 1)
+            dist = 1;
+        mo->momz = (dest->z - mo->z) / dist;
+    }
+}
+
+
+// Resume ball spinning
+void A_SorcBossAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->args[3] = SORC_ACCELERATE;
+    actor->args[2] = SORCBALL_INITIAL_SPEED;
+}
+
+
+// spell cast magic fizzle
+void A_SpawnFizzle(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t x, y, z;
+    fixed_t dist = 5 * FRACUNIT;
+    angle_t angle = actor->angle >> ANGLETOFINESHIFT;
+    fixed_t speed = actor->info->speed;
+    angle_t rangle;
+    mobj_t *mo;
+    int ix;
+
+    x = actor->x + FixedMul(dist, finecosine[angle]);
+    y = actor->y + FixedMul(dist, finesine[angle]);
+    z = actor->z - actor->floorclip + (actor->height >> 1);
+    for (ix = 0; ix < 5; ix++)
+    {
+        mo = P_SpawnMobj(x, y, z, MT_SORCSPARK1);
+        if (mo)
+        {
+            rangle = angle + ((P_Random() % 5) << 1);
+            mo->momx = FixedMul(P_Random() % speed, finecosine[rangle]);
+            mo->momy = FixedMul(P_Random() % speed, finesine[rangle]);
+            mo->momz = FRACUNIT * 2;
+        }
+    }
+}
+
+
+//============================================================================
+// Yellow spell - offense
+//============================================================================
+
+void A_SorcFX1Seek(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_BounceCheck(actor, player, psp);
+    P_SeekerMissile(actor, ANG1 * 2, ANG1 * 6);
+}
+
+
+//============================================================================
+// Blue spell - defense
+//============================================================================
+//
+// FX2 Variables
+//              special1                current angle
+//              special2
+//              args[0]         0 = CW,  1 = CCW
+//              args[1]         
+//============================================================================
+
+// Split ball in two
+void A_SorcFX2Split(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCFX2);
+    if (mo)
+    {
+        mo->target = actor->target;
+        mo->args[0] = 0;        // CW
+        mo->special1.i = actor->angle;    // Set angle
+        P_SetMobjStateNF(mo, S_SORCFX2_ORBIT1);
+    }
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCFX2);
+    if (mo)
+    {
+        mo->target = actor->target;
+        mo->args[0] = 1;        // CCW
+        mo->special1.i = actor->angle;    // Set angle
+        P_SetMobjStateNF(mo, S_SORCFX2_ORBIT1);
+    }
+    P_SetMobjStateNF(actor, S_NULL);
+}
+
+
+// Orbit FX2 about sorcerer
+void A_SorcFX2Orbit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    fixed_t x, y, z;
+    mobj_t *parent = actor->target;
+    fixed_t dist = parent->info->radius;
+
+    if ((parent->health <= 0) ||        // Sorcerer is dead
+        (!parent->args[0]))     // Time expired
+    {
+        P_SetMobjStateNF(actor, actor->info->deathstate);
+        parent->args[0] = 0;
+        parent->flags2 &= ~MF2_REFLECTIVE;
+        parent->flags2 &= ~MF2_INVULNERABLE;
+    }
+
+    if (actor->args[0] && (parent->args[0]-- <= 0))     // Time expired
+    {
+        P_SetMobjStateNF(actor, actor->info->deathstate);
+        parent->args[0] = 0;
+        parent->flags2 &= ~MF2_REFLECTIVE;
+    }
+
+    // Move to new position based on angle
+    if (actor->args[0])         // Counter clock-wise
+    {
+        actor->special1.i += ANG1 * 10;
+        angle = ((angle_t) actor->special1.i) >> ANGLETOFINESHIFT;
+        x = parent->x + FixedMul(dist, finecosine[angle]);
+        y = parent->y + FixedMul(dist, finesine[angle]);
+        z = parent->z - parent->floorclip + SORC_DEFENSE_HEIGHT * FRACUNIT;
+        z += FixedMul(15 * FRACUNIT, finecosine[angle]);
+        // Spawn trailer
+        P_SpawnMobj(x, y, z, MT_SORCFX2_T1);
+    }
+    else                        // Clock wise
+    {
+        actor->special1.i -= ANG1 * 10;
+        angle = ((angle_t) actor->special1.i) >> ANGLETOFINESHIFT;
+        x = parent->x + FixedMul(dist, finecosine[angle]);
+        y = parent->y + FixedMul(dist, finesine[angle]);
+        z = parent->z - parent->floorclip + SORC_DEFENSE_HEIGHT * FRACUNIT;
+        z += FixedMul(20 * FRACUNIT, finesine[angle]);
+        // Spawn trailer
+        P_SpawnMobj(x, y, z, MT_SORCFX2_T1);
+    }
+
+    actor->x = x;
+    actor->y = y;
+    actor->z = z;
+}
+
+
+
+//============================================================================
+// Green spell - spawn bishops
+//============================================================================
+
+void A_SpawnBishop(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_BISHOP);
+    if (mo)
+    {
+        if (!P_TestMobjLocation(mo))
+        {
+            P_SetMobjState(mo, S_NULL);
+        }
+    }
+    P_SetMobjState(actor, S_NULL);
+}
+
+/*
+void A_SmokePuffEntry(mobj_t *actor)
+{
+	P_SpawnMobj(actor->x, actor->y, actor->z, MT_MNTRSMOKE);
+}
+*/
+
+void A_SmokePuffExit(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z, MT_MNTRSMOKEEXIT);
+}
+
+void A_SorcererBishopEntry(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCFX3_EXPLOSION);
+    S_StartSound(actor, actor->info->seesound);
+}
+
+
+//============================================================================
+// FX4 - rapid fire balls
+//============================================================================
+
+void A_SorcFX4Check(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special2.i-- <= 0)
+    {
+        P_SetMobjStateNF(actor, actor->info->deathstate);
+    }
+}
+
+//============================================================================
+// Ball death - spawn stuff
+//============================================================================
+
+void A_SorcBallPop(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, SFX_SORCERER_BALLPOP);
+    actor->flags &= ~MF_NOGRAVITY;
+    actor->flags2 |= MF2_LOGRAV;
+    actor->momx = ((P_Random() % 10) - 5) << FRACBITS;
+    actor->momy = ((P_Random() % 10) - 5) << FRACBITS;
+    actor->momz = (2 + (P_Random() % 3)) << FRACBITS;
+    actor->special2.i = 4 * FRACUNIT;     // Initial bounce factor
+    actor->args[4] = BOUNCE_TIME_UNIT;  // Bounce time unit
+    actor->args[3] = 5;         // Bounce time in seconds
+}
+
+
+
+void A_BounceCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->args[4]-- <= 0)
+    {
+        if (actor->args[3]-- <= 0)
+        {
+            P_SetMobjState(actor, actor->info->deathstate);
+            switch (actor->type)
+            {
+                case MT_SORCBALL1:
+                case MT_SORCBALL2:
+                case MT_SORCBALL3:
+                    S_StartSound(NULL, SFX_SORCERER_BIGBALLEXPLODE);
+                    break;
+                case MT_SORCFX1:
+                    S_StartSound(NULL, SFX_SORCERER_HEADSCREAM);
+                    break;
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            actor->args[4] = BOUNCE_TIME_UNIT;
+        }
+    }
+}
+
+
+
+
+//============================================================================
+// Class Bosses
+//============================================================================
+#define CLASS_BOSS_STRAFE_RANGE	64*10*FRACUNIT
+
+void A_FastChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int delta;
+    fixed_t dist;
+    angle_t ang;
+    mobj_t *target;
+
+    if (actor->reactiontime)
+    {
+        actor->reactiontime--;
+    }
+
+    // Modify target threshold
+    if (actor->threshold)
+    {
+        actor->threshold--;
+    }
+
+    if (gameskill == sk_nightmare)
+    {                           // Monsters move faster in nightmare mode
+        actor->tics -= actor->tics / 2;
+        if (actor->tics < 3)
+        {
+            actor->tics = 3;
+        }
+    }
+
+//
+// turn towards movement direction if not there yet
+//
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+        delta = actor->angle - (actor->movedir << 29);
+        if (delta > 0)
+        {
+            actor->angle -= ANG90 / 2;
+        }
+        else if (delta < 0)
+        {
+            actor->angle += ANG90 / 2;
+        }
+    }
+
+    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {                           // look for a new target
+        if (P_LookForPlayers(actor, true))
+        {                       // got a new target
+            return;
+        }
+        P_SetMobjState(actor, actor->info->spawnstate);
+        return;
+    }
+
+//
+// don't attack twice in a row
+//
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+        if (gameskill != sk_nightmare)
+            P_NewChaseDir(actor);
+        return;
+    }
+
+    // Strafe
+    if (actor->special2.i > 0)
+    {
+        actor->special2.i--;
+    }
+    else
+    {
+        target = actor->target;
+        actor->special2.i = 0;
+        actor->momx = actor->momy = 0;
+        dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
+        if (dist < CLASS_BOSS_STRAFE_RANGE)
+        {
+            if (P_Random() < 100)
+            {
+                ang = R_PointToAngle2(actor->x, actor->y,
+                                      target->x, target->y);
+                if (P_Random() < 128)
+                    ang += ANG90;
+                else
+                    ang -= ANG90;
+                ang >>= ANGLETOFINESHIFT;
+                actor->momx = FixedMul(13 * FRACUNIT, finecosine[ang]);
+                actor->momy = FixedMul(13 * FRACUNIT, finesine[ang]);
+                actor->special2.i = 3;    // strafe time
+            }
+        }
+    }
+
+//
+// check for missile attack
+//
+    if (actor->info->missilestate)
+    {
+        if (gameskill < sk_nightmare && actor->movecount)
+            goto nomissile;
+        if (!P_CheckMissileRange(actor))
+            goto nomissile;
+        P_SetMobjState(actor, actor->info->missilestate);
+        actor->flags |= MF_JUSTATTACKED;
+        return;
+    }
+  nomissile:
+
+//
+// possibly choose another target
+//
+    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
+    {
+        if (P_LookForPlayers(actor, true))
+            return;             // got a new target
+    }
+
+//
+// chase towards player
+//
+    if (!actor->special2.i)
+    {
+        if (--actor->movecount < 0 || !P_Move(actor))
+        {
+            P_NewChaseDir(actor);
+        }
+    }
+}
+
+
+void A_FighterAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+        return;
+    A_FSwordAttack2(actor, player, psp);
+}
+
+
+void A_ClericAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+        return;
+    A_CHolyAttack3(actor, player, psp);
+}
+
+
+
+void A_MageAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!actor->target)
+        return;
+    A_MStaffAttack2(actor, player, psp);
+}
+
+void A_ClassBossHealth(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (netgame && !deathmatch) // co-op only
+    {
+        if (!actor->special1.i)
+        {
+            actor->health *= 5;
+            actor->special1.i = true;     // has been initialized
+        }
+    }
+}
+
+
+//===========================================================================
+//
+// A_CheckFloor - Checks if an object hit the floor
+//
+//===========================================================================
+
+void A_CheckFloor(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->z <= actor->floorz)
+    {
+        actor->z = actor->floorz;
+        actor->flags2 &= ~MF2_LOGRAV;
+        P_SetMobjState(actor, actor->info->deathstate);
+    }
+}
+
+//============================================================================
+//
+// A_FreezeDeath
+//
+//============================================================================
+
+void A_FreezeDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int r = P_Random();
+    actor->tics = 75 + r + P_Random();
+    actor->flags |= MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD;
+    actor->flags2 |= MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ | MF2_SLIDE;
+    actor->height <<= 2;
+    S_StartSound(actor, SFX_FREEZE_DEATH);
+
+    if (actor->player)
+    {
+        actor->player->damagecount = 0;
+        actor->player->poisoncount = 0;
+        actor->player->bonuscount = 0;
+        if (actor->player == &players[consoleplayer])
+        {
+            SB_PaletteFlash(false);
+        }
+    }
+    else if (actor->flags & MF_COUNTKILL && actor->special)
+    {
+        // Initiate monster death actions.
+        P_ExecuteLineSpecial(actor->special, actor->args, NULL, 0, actor);
+    }
+}
+
+//============================================================================
+//
+// A_IceSetTics
+//
+//============================================================================
+
+void A_IceSetTics(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int floor;
+
+    actor->tics = 70 + (P_Random() & 63);
+    floor = P_GetThingFloorType(actor);
+    if (floor == FLOOR_LAVA)
+    {
+        actor->tics >>= 2;
+    }
+    else if (floor == FLOOR_ICE)
+    {
+        actor->tics <<= 1;
+    }
+}
+
+//============================================================================
+//
+// A_IceCheckHeadDone
+//
+//============================================================================
+
+void A_IceCheckHeadDone(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->special2.i == 666)
+    {
+        P_SetMobjState(actor, S_ICECHUNK_HEAD2);
+    }
+}
+
+//============================================================================
+//
+// A_FreezeDeathChunks
+//
+//============================================================================
+
+void A_FreezeDeathChunks(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    int r1,r2,r3;
+    mobj_t *mo;
+
+    if (actor->momx || actor->momy || actor->momz)
+    {
+        actor->tics = 105;
+        return;
+    }
+    S_StartSound(actor, SFX_FREEZE_SHATTER);
+
+    for (i = 12 + (P_Random() & 15); i >= 0; i--)
+    {
+        r1 = P_Random();
+        r2 = P_Random();
+        r3 = P_Random();
+        mo = P_SpawnMobj(actor->x +
+                         (((r3 - 128) * actor->radius) >> 7),
+                         actor->y +
+                         (((r2 - 128) * actor->radius) >> 7),
+                         actor->z + (r1 * actor->height / 255),
+                         MT_ICECHUNK);
+        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 3));
+        mo->momz = FixedDiv(mo->z - actor->z, actor->height) << 2;
+        mo->momx = P_SubRandom() << (FRACBITS - 7);
+        mo->momy = P_SubRandom() << (FRACBITS - 7);
+        A_IceSetTics(mo, NULL, NULL);   // set a random tic wait
+    }
+    for (i = 12 + (P_Random() & 15); i >= 0; i--)
+    {
+        r1 = P_Random();
+        r2 = P_Random();
+        r3 = P_Random();
+        mo = P_SpawnMobj(actor->x +
+                         (((r3 - 128) * actor->radius) >> 7),
+                         actor->y +
+                         (((r2 - 128) * actor->radius) >> 7),
+                         actor->z + (r1 * actor->height / 255),
+                         MT_ICECHUNK);
+        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 3));
+        mo->momz = FixedDiv(mo->z - actor->z, actor->height) << 2;
+        mo->momx = P_SubRandom() << (FRACBITS - 7);
+        mo->momy = P_SubRandom() << (FRACBITS - 7);
+        A_IceSetTics(mo, NULL, NULL);   // set a random tic wait
+    }
+    if (actor->player)
+    {                           // attach the player's view to a chunk of ice
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z + VIEWHEIGHT,
+                         MT_ICECHUNK);
+        P_SetMobjState(mo, S_ICECHUNK_HEAD);
+        mo->momz = FixedDiv(mo->z - actor->z, actor->height) << 2;
+        mo->momx = P_SubRandom() << (FRACBITS - 7);
+        mo->momy = P_SubRandom() << (FRACBITS - 7);
+        mo->flags2 |= MF2_ICEDAMAGE;    // used to force blue palette
+        mo->flags2 &= ~MF2_FLOORCLIP;
+        mo->player = actor->player;
+        actor->player = NULL;
+        mo->health = actor->health;
+        mo->angle = actor->angle;
+        mo->player->mo = mo;
+        mo->player->lookdir = 0;
+    }
+    P_RemoveMobjFromTIDList(actor);
+    P_SetMobjState(actor, S_FREETARGMOBJ);
+    actor->flags2 |= MF2_DONTDRAW;
+}
+
+//===========================================================================
+// Korax Variables
+//      special1        last teleport destination
+//      special2        set if "below half" script not yet run
+//
+// Korax Scripts (reserved)
+//      249             Tell scripts that we are below half health
+//      250-254 Control scripts
+//      255             Death script
+//
+// Korax TIDs (reserved)
+//      245             Reserved for Korax himself
+//  248         Initial teleport destination
+//      249             Teleport destination
+//      250-254 For use in respective control scripts
+//      255             For use in death script (spawn spots)
+//===========================================================================
+#define KORAX_SPIRIT_LIFETIME	(5*(35/5))      // 5 seconds
+#define KORAX_COMMAND_HEIGHT	(120*FRACUNIT)
+#define KORAX_COMMAND_OFFSET	(27*FRACUNIT)
+
+void KoraxFire1(mobj_t * actor, int type);
+void KoraxFire2(mobj_t * actor, int type);
+void KoraxFire3(mobj_t * actor, int type);
+void KoraxFire4(mobj_t * actor, int type);
+void KoraxFire5(mobj_t * actor, int type);
+void KoraxFire6(mobj_t * actor, int type);
+void KSpiritInit(mobj_t * spirit, mobj_t * korax);
+
+#define KORAX_TID					(245)
+#define KORAX_FIRST_TELEPORT_TID	(248)
+#define KORAX_TELEPORT_TID			(249)
+
+void A_KoraxChase(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *spot;
+    int lastfound;
+    byte args[3] = {0, 0, 0};
+
+    if ((!actor->special2.i) &&
+        (actor->health <= (actor->info->spawnhealth / 2)))
+    {
+        lastfound = 0;
+        spot = P_FindMobjFromTID(KORAX_FIRST_TELEPORT_TID, &lastfound);
+        if (spot)
+        {
+            P_Teleport(actor, spot->x, spot->y, spot->angle, true);
+        }
+
+        CheckACSPresent(249);
+        P_StartACS(249, 0, args, actor, NULL, 0);
+        actor->special2.i = 1;    // Don't run again
+
+        return;
+    }
+
+    if (!actor->target)
+        return;
+    if (P_Random() < 30)
+    {
+        P_SetMobjState(actor, actor->info->missilestate);
+    }
+    else if (P_Random() < 30)
+    {
+        S_StartSound(NULL, SFX_KORAX_ACTIVE);
+    }
+
+    // Teleport away
+    if (actor->health < (actor->info->spawnhealth >> 1))
+    {
+        if (P_Random() < 10)
+        {
+            lastfound = actor->special1.i;
+            spot = P_FindMobjFromTID(KORAX_TELEPORT_TID, &lastfound);
+            actor->special1.i = lastfound;
+            if (spot)
+            {
+                P_Teleport(actor, spot->x, spot->y, spot->angle, true);
+            }
+        }
+    }
+}
+
+void A_KoraxStep(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_Chase(actor, player, psp);
+}
+
+void A_KoraxStep2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    S_StartSound(NULL, SFX_KORAX_STEP);
+    A_Chase(actor, player, psp);
+}
+
+void A_KoraxBonePop(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    byte args[5];
+
+    args[0] = args[1] = args[2] = args[3] = args[4] = 0;
+
+    // Spawn 6 spirits equalangularly
+    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT1, ANG60 * 0,
+                             5 * FRACUNIT);
+    if (mo)
+        KSpiritInit(mo, actor);
+    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT2, ANG60 * 1,
+                             5 * FRACUNIT);
+    if (mo)
+        KSpiritInit(mo, actor);
+    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT3, ANG60 * 2,
+                             5 * FRACUNIT);
+    if (mo)
+        KSpiritInit(mo, actor);
+    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT4, ANG60 * 3,
+                             5 * FRACUNIT);
+    if (mo)
+        KSpiritInit(mo, actor);
+    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT5, ANG60 * 4,
+                             5 * FRACUNIT);
+    if (mo)
+        KSpiritInit(mo, actor);
+    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT6, ANG60 * 5,
+                             5 * FRACUNIT);
+    if (mo)
+        KSpiritInit(mo, actor);
+
+    CheckACSPresent(255);
+    P_StartACS(255, 0, args, actor, NULL, 0);   // Death script
+}
+
+void KSpiritInit(mobj_t * spirit, mobj_t * korax)
+{
+    int i;
+    mobj_t *tail, *next;
+
+    spirit->health = KORAX_SPIRIT_LIFETIME;
+
+    spirit->special1.m = korax;     // Swarm around korax
+    spirit->special2.i = 32 + (P_Random() & 7);   // Float bob index
+    spirit->args[0] = 10;       // initial turn value
+    spirit->args[1] = 0;        // initial look angle
+
+    // Spawn a tail for spirit
+    tail = P_SpawnMobj(spirit->x, spirit->y, spirit->z, MT_HOLY_TAIL);
+    tail->special2.m = spirit;      // parent
+    for (i = 1; i < 3; i++)
+    {
+        next = P_SpawnMobj(spirit->x, spirit->y, spirit->z, MT_HOLY_TAIL);
+        P_SetMobjState(next, next->info->spawnstate + 1);
+        tail->special1.m = next;
+        tail = next;
+    }
+    tail->special1.m = NULL;         // last tail bit
+}
+
+void A_KoraxDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (P_Random() < 220)
+    {
+        P_SetMobjState(actor, S_KORAX_MISSILE1);
+    }
+    else
+    {
+        P_SetMobjState(actor, S_KORAX_COMMAND1);
+    }
+}
+
+void A_KoraxMissile(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int type = P_Random() % 6;
+    int sound = 0;
+
+    S_StartSound(actor, SFX_KORAX_ATTACK);
+
+    switch (type)
+    {
+        case 0:
+            type = MT_WRAITHFX1;
+            sound = SFX_WRAITH_MISSILE_FIRE;
+            break;
+        case 1:
+            type = MT_DEMONFX1;
+            sound = SFX_DEMON_MISSILE_FIRE;
+            break;
+        case 2:
+            type = MT_DEMON2FX1;
+            sound = SFX_DEMON_MISSILE_FIRE;
+            break;
+        case 3:
+            type = MT_FIREDEMON_FX6;
+            sound = SFX_FIRED_ATTACK;
+            break;
+        case 4:
+            type = MT_CENTAUR_FX;
+            sound = SFX_CENTAURLEADER_ATTACK;
+            break;
+        case 5:
+            type = MT_SERPENTFX;
+            sound = SFX_CENTAURLEADER_ATTACK;
+            break;
+    }
+
+    // Fire all 6 missiles at once
+    S_StartSound(NULL, sound);
+    KoraxFire1(actor, type);
+    KoraxFire2(actor, type);
+    KoraxFire3(actor, type);
+    KoraxFire4(actor, type);
+    KoraxFire5(actor, type);
+    KoraxFire6(actor, type);
+}
+
+
+// Call action code scripts (250-254)
+void A_KoraxCommand(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    byte args[5];
+    fixed_t x, y, z;
+    angle_t ang;
+    int numcommands;
+
+    S_StartSound(actor, SFX_KORAX_COMMAND);
+
+    // Shoot stream of lightning to ceiling
+    ang = (actor->angle - ANG90) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_COMMAND_OFFSET, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_COMMAND_OFFSET, finesine[ang]);
+    z = actor->z + KORAX_COMMAND_HEIGHT;
+    P_SpawnMobj(x, y, z, MT_KORAX_BOLT);
+
+    args[0] = args[1] = args[2] = args[3] = args[4] = 0;
+
+    if (actor->health <= (actor->info->spawnhealth >> 1))
+    {
+        numcommands = 5;
+    }
+    else
+    {
+        numcommands = 4;
+    }
+
+    switch (P_Random() % numcommands)
+    {
+        case 0:
+            CheckACSPresent(250);
+            P_StartACS(250, 0, args, actor, NULL, 0);
+            break;
+        case 1:
+            CheckACSPresent(251);
+            P_StartACS(251, 0, args, actor, NULL, 0);
+            break;
+        case 2:
+            CheckACSPresent(252);
+            P_StartACS(252, 0, args, actor, NULL, 0);
+            break;
+        case 3:
+            CheckACSPresent(253);
+            P_StartACS(253, 0, args, actor, NULL, 0);
+            break;
+        case 4:
+            CheckACSPresent(254);
+            P_StartACS(254, 0, args, actor, NULL, 0);
+            break;
+    }
+}
+
+
+#define KORAX_DELTAANGLE			(85*ANG1)
+#define KORAX_ARM_EXTENSION_SHORT	(40*FRACUNIT)
+#define KORAX_ARM_EXTENSION_LONG	(55*FRACUNIT)
+
+#define KORAX_ARM1_HEIGHT			(108*FRACUNIT)
+#define KORAX_ARM2_HEIGHT			(82*FRACUNIT)
+#define KORAX_ARM3_HEIGHT			(54*FRACUNIT)
+#define KORAX_ARM4_HEIGHT			(104*FRACUNIT)
+#define KORAX_ARM5_HEIGHT			(86*FRACUNIT)
+#define KORAX_ARM6_HEIGHT			(53*FRACUNIT)
+
+
+// Arm projectiles
+//              arm positions numbered:
+//                      1       top left
+//                      2       middle left
+//                      3       lower left
+//                      4       top right
+//                      5       middle right
+//                      6       lower right
+
+
+// Arm 1 projectile
+void KoraxFire1(mobj_t * actor, int type)
+{
+    angle_t ang;
+    fixed_t x, y, z;
+
+    ang = (actor->angle - KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_SHORT, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_SHORT, finesine[ang]);
+    z = actor->z - actor->floorclip + KORAX_ARM1_HEIGHT;
+    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
+}
+
+
+// Arm 2 projectile
+void KoraxFire2(mobj_t * actor, int type)
+{
+    angle_t ang;
+    fixed_t x, y, z;
+
+    ang = (actor->angle - KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
+    z = actor->z - actor->floorclip + KORAX_ARM2_HEIGHT;
+    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
+}
+
+// Arm 3 projectile
+void KoraxFire3(mobj_t * actor, int type)
+{
+    angle_t ang;
+    fixed_t x, y, z;
+
+    ang = (actor->angle - KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
+    z = actor->z - actor->floorclip + KORAX_ARM3_HEIGHT;
+    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
+}
+
+// Arm 4 projectile
+void KoraxFire4(mobj_t * actor, int type)
+{
+    angle_t ang;
+    fixed_t x, y, z;
+
+    ang = (actor->angle + KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_SHORT, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_SHORT, finesine[ang]);
+    z = actor->z - actor->floorclip + KORAX_ARM4_HEIGHT;
+    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
+}
+
+// Arm 5 projectile
+void KoraxFire5(mobj_t * actor, int type)
+{
+    angle_t ang;
+    fixed_t x, y, z;
+
+    ang = (actor->angle + KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
+    z = actor->z - actor->floorclip + KORAX_ARM5_HEIGHT;
+    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
+}
+
+// Arm 6 projectile
+void KoraxFire6(mobj_t * actor, int type)
+{
+    angle_t ang;
+    fixed_t x, y, z;
+
+    ang = (actor->angle + KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
+    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
+    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
+    z = actor->z - actor->floorclip + KORAX_ARM6_HEIGHT;
+    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
+}
+
+
+void A_KSpiritWeave(mobj_t *actor)
+{
+    fixed_t newX, newY;
+    int weaveXY, weaveZ;
+    int angle;
+
+    weaveXY = actor->special2.i >> 16;
+    weaveZ = actor->special2.i & 0xFFFF;
+    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    newX = actor->x - FixedMul(finecosine[angle],
+                               FloatBobOffsets[weaveXY] << 2);
+    newY = actor->y - FixedMul(finesine[angle],
+                               FloatBobOffsets[weaveXY] << 2);
+    weaveXY = (weaveXY + (P_Random() % 5)) & 63;
+    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 2);
+    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 2);
+    P_TryMove(actor, newX, newY);
+    actor->z -= FloatBobOffsets[weaveZ] << 1;
+    weaveZ = (weaveZ + (P_Random() % 5)) & 63;
+    actor->z += FloatBobOffsets[weaveZ] << 1;
+    actor->special2.i = weaveZ + (weaveXY << 16);
+}
+
+void A_KSpiritSeeker(mobj_t * actor, angle_t thresh, angle_t turnMax)
+{
+    int dir;
+    int dist;
+    angle_t delta;
+    angle_t angle;
+    mobj_t *target;
+    fixed_t newZ;
+    fixed_t deltaZ;
+
+    target = actor->special1.m;
+    if (target == NULL)
+    {
+        return;
+    }
+    dir = P_FaceMobj(actor, target, &delta);
+    if (delta > thresh)
+    {
+        delta >>= 1;
+        if (delta > turnMax)
+        {
+            delta = turnMax;
+        }
+    }
+    if (dir)
+    {                           // Turn clockwise
+        actor->angle += delta;
+    }
+    else
+    {                           // Turn counter clockwise
+        actor->angle -= delta;
+    }
+    angle = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
+    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
+
+    if (!(leveltime & 15)
+        || actor->z > target->z + (target->info->height)
+        || actor->z + actor->height < target->z)
+    {
+        newZ = target->z + ((P_Random() * target->info->height) >> 8);
+        deltaZ = newZ - actor->z;
+        if (abs(deltaZ) > 15 * FRACUNIT)
+        {
+            if (deltaZ > 0)
+            {
+                deltaZ = 15 * FRACUNIT;
+            }
+            else
+            {
+                deltaZ = -15 * FRACUNIT;
+            }
+        }
+        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
+        dist = dist / actor->info->speed;
+        if (dist < 1)
+        {
+            dist = 1;
+        }
+        actor->momz = deltaZ / dist;
+    }
+    return;
+}
+
+
+void A_KSpiritRoam(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (actor->health-- <= 0)
+    {
+        S_StartSound(actor, SFX_SPIRIT_DIE);
+        P_SetMobjState(actor, S_KSPIRIT_DEATH1);
+    }
+    else
+    {
+        if (actor->special1.m)
+        {
+            A_KSpiritSeeker(actor, actor->args[0] * ANG1,
+                            actor->args[0] * ANG1 * 2);
+        }
+        A_KSpiritWeave(actor);
+        if (P_Random() < 50)
+        {
+            S_StartSound(NULL, SFX_SPIRIT_ACTIVE);
+        }
+    }
+}
+
+void A_KBolt(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    // Countdown lifetime
+    if (actor->special1.i-- <= 0)
+    {
+        P_SetMobjState(actor, S_NULL);
+    }
+}
+
+
+#define KORAX_BOLT_HEIGHT		48*FRACUNIT
+#define KORAX_BOLT_LIFETIME		3
+
+void A_KBoltRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    fixed_t z;
+
+    // Spawn a child upward
+    z = actor->z + KORAX_BOLT_HEIGHT;
+
+    if ((z + KORAX_BOLT_HEIGHT) < actor->ceilingz)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, z, MT_KORAX_BOLT);
+        if (mo)
+        {
+            mo->special1.i = KORAX_BOLT_LIFETIME;
+        }
+    }
+    else
+    {
+        // Maybe cap it off here
+    }
+}
diff --git a/games/NXDoom/src/hexen/p_floor.c b/games/NXDoom/src/hexen/p_floor.c
new file mode 100644
index 000000000..370cb173f
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_floor.c
@@ -0,0 +1,946 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "p_local.h"
+
+
+//==================================================================
+//==================================================================
+//
+//                                                              FLOORS
+//
+//==================================================================
+//==================================================================
+
+//==================================================================
+//
+//      Move a plane (floor or ceiling) and check for crushing
+//
+//==================================================================
+result_e T_MovePlane(sector_t * sector, fixed_t speed,
+                     fixed_t dest, int crush, int floorOrCeiling,
+                     int direction)
+{
+    boolean flag;
+    fixed_t lastpos;
+
+    switch (floorOrCeiling)
+    {
+        case 0:                // FLOOR
+            switch (direction)
+            {
+                case -1:       // DOWN
+                    if (sector->floorheight - speed < dest)
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return RES_CRUSHED;
+                        }
+                        return RES_PASTDEST;
+                    }
+                    else
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight -= speed;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return RES_CRUSHED;
+                        }
+                    }
+                    break;
+
+                case 1:        // UP
+                    if (sector->floorheight + speed > dest)
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return RES_CRUSHED;
+                        }
+                        return RES_PASTDEST;
+                    }
+                    else        // COULD GET CRUSHED
+                    {
+                        lastpos = sector->floorheight;
+                        sector->floorheight += speed;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            //if (crush == true)
+                            //{
+                            //      return RES_CRUSHED;
+                            //}
+                            sector->floorheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return RES_CRUSHED;
+                        }
+                    }
+                    break;
+            }
+            break;
+
+        case 1:                // CEILING
+            switch (direction)
+            {
+                case -1:       // DOWN
+                    if (sector->ceilingheight - speed < dest)
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return RES_CRUSHED;
+                        }
+                        return RES_PASTDEST;
+                    }
+                    else        // COULD GET CRUSHED
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight -= speed;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            //if (crush == true)
+                            //{
+                            //      return RES_CRUSHED;
+                            //}
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return RES_CRUSHED;
+                        }
+                    }
+                    break;
+
+                case 1:        // UP
+                    if (sector->ceilingheight + speed > dest)
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight = dest;
+                        flag = P_ChangeSector(sector, crush);
+                        if (flag == true)
+                        {
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            //return RES_CRUSHED;
+                        }
+                        return RES_PASTDEST;
+                    }
+                    else
+                    {
+                        lastpos = sector->ceilingheight;
+                        sector->ceilingheight += speed;
+                        flag = P_ChangeSector(sector, crush);
+#if 0
+                        if (flag == true)
+                        {
+                            sector->ceilingheight = lastpos;
+                            P_ChangeSector(sector, crush);
+                            return RES_CRUSHED;
+                        }
+#endif
+                    }
+                    break;
+            }
+            break;
+
+    }
+    return RES_OK;
+}
+
+//==================================================================
+//
+//      MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
+//
+//==================================================================
+void T_MoveFloor(thinker_t *thinker)
+{
+    floormove_t *floor = (floormove_t *) thinker;
+    result_e res;
+
+    if (floor->resetDelayCount)
+    {
+        floor->resetDelayCount--;
+        if (!floor->resetDelayCount)
+        {
+            floor->floordestheight = floor->resetHeight;
+            floor->direction = -floor->direction;
+            floor->resetDelay = 0;
+            floor->delayCount = 0;
+            floor->delayTotal = 0;
+        }
+    }
+    if (floor->delayCount)
+    {
+        floor->delayCount--;
+        if (!floor->delayCount && floor->textureChange)
+        {
+            floor->sector->floorpic += floor->textureChange;
+        }
+        return;
+    }
+
+    res = T_MovePlane(floor->sector, floor->speed,
+                      floor->floordestheight, floor->crush, 0,
+                      floor->direction);
+
+    if (floor->type == FLEV_RAISEBUILDSTEP)
+    {
+        if ((floor->direction == 1 && floor->sector->floorheight >=
+             floor->stairsDelayHeight) || (floor->direction == -1 &&
+                                           floor->sector->floorheight <=
+                                           floor->stairsDelayHeight))
+        {
+            floor->delayCount = floor->delayTotal;
+            floor->stairsDelayHeight += floor->stairsDelayHeightDelta;
+        }
+    }
+    if (res == RES_PASTDEST)
+    {
+        SN_StopSequence((mobj_t *) & floor->sector->soundorg);
+        if (floor->delayTotal)
+        {
+            floor->delayTotal = 0;
+        }
+        if (floor->resetDelay)
+        {
+//                      floor->resetDelayCount = floor->resetDelay;
+//                      floor->resetDelay = 0;
+            return;
+        }
+        floor->sector->specialdata = NULL;
+        /*
+           if (floor->direction == 1)
+           switch(floor->type)
+           {
+           case donutRaise:
+           floor->sector->special = floor->newspecial;
+           floor->sector->floorpic = floor->texture;
+           default:
+           break;
+           }
+           else if (floor->direction == -1)
+           switch(floor->type)
+           {
+           case lowerAndChange:
+           floor->sector->special = floor->newspecial;
+           floor->sector->floorpic = floor->texture;
+           default:
+           break;
+           }
+         */
+        if (floor->textureChange)
+        {
+            floor->sector->floorpic -= floor->textureChange;
+        }
+        P_TagFinished(floor->sector->tag);
+        P_RemoveThinker(&floor->thinker);
+    }
+}
+
+//==================================================================
+//
+//      HANDLE FLOOR TYPES
+//
+//==================================================================
+int EV_DoFloor(line_t * line, byte * args, floor_e floortype)
+{
+    int secnum;
+    int rtn;
+    sector_t *sec;
+    floormove_t *floor = NULL;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        //      ALREADY MOVING?  IF SO, KEEP GOING...
+        if (sec->specialdata)
+            continue;
+
+        //
+        //      new floor thinker
+        //
+        rtn = 1;
+        floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+        memset(floor, 0, sizeof(*floor));
+        P_AddThinker(&floor->thinker);
+        sec->specialdata = floor;
+        floor->thinker.function = T_MoveFloor;
+        floor->type = floortype;
+        floor->crush = 0;
+        floor->speed = args[1] * (FRACUNIT / 8);
+        if (floortype == FLEV_LOWERTIMES8INSTANT ||
+            floortype == FLEV_RAISETIMES8INSTANT)
+        {
+            floor->speed = 2000 << FRACBITS;
+        }
+        switch (floortype)
+        {
+            case FLEV_LOWERFLOOR:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->floordestheight = P_FindHighestFloorSurrounding(sec);
+                break;
+            case FLEV_LOWERFLOORTOLOWEST:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->floordestheight = P_FindLowestFloorSurrounding(sec);
+                break;
+            case FLEV_LOWERFLOORBYVALUE:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->floordestheight = floor->sector->floorheight -
+                    args[2] * FRACUNIT;
+                break;
+            case FLEV_LOWERTIMES8INSTANT:
+            case FLEV_LOWERBYVALUETIMES8:
+                floor->direction = -1;
+                floor->sector = sec;
+                floor->floordestheight = floor->sector->floorheight -
+                    args[2] * FRACUNIT * 8;
+                break;
+            case FLEV_RAISEFLOORCRUSH:
+                floor->crush = args[2]; // arg[2] = crushing value
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->floordestheight = sec->ceilingheight - 8 * FRACUNIT;
+                break;
+            case FLEV_RAISEFLOOR:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->floordestheight = P_FindLowestCeilingSurrounding(sec);
+                if (floor->floordestheight > sec->ceilingheight)
+                    floor->floordestheight = sec->ceilingheight;
+                break;
+            case FLEV_RAISEFLOORTONEAREST:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->floordestheight =
+                    P_FindNextHighestFloor(sec, sec->floorheight);
+                break;
+            case FLEV_RAISEFLOORBYVALUE:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->floordestheight = floor->sector->floorheight +
+                    args[2] * FRACUNIT;
+                break;
+            case FLEV_RAISETIMES8INSTANT:
+            case FLEV_RAISEBYVALUETIMES8:
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->floordestheight = floor->sector->floorheight +
+                    args[2] * FRACUNIT * 8;
+                break;
+            case FLEV_MOVETOVALUETIMES8:
+                floor->sector = sec;
+                floor->floordestheight = args[2] * FRACUNIT * 8;
+                if (args[3])
+                {
+                    floor->floordestheight = -floor->floordestheight;
+                }
+                if (floor->floordestheight > floor->sector->floorheight)
+                {
+                    floor->direction = 1;
+                }
+                else if (floor->floordestheight < floor->sector->floorheight)
+                {
+                    floor->direction = -1;
+                }
+                else
+                {               // already at lowest position
+                    rtn = 0;
+                }
+                break;
+            default:
+                rtn = 0;
+                break;
+        }
+    }
+    if (rtn)
+    {
+        SN_StartSequence((mobj_t *) & floor->sector->soundorg,
+                         SEQ_PLATFORM + floor->sector->seqType);
+    }
+    return rtn;
+}
+
+//============================================================================
+//
+// EV_DoFloorAndCeiling
+//
+//============================================================================
+
+int EV_DoFloorAndCeiling(line_t * line, byte * args, boolean raise)
+{
+    boolean floor, ceiling;
+    int secnum;
+    sector_t *sec;
+
+    if (raise)
+    {
+        floor = EV_DoFloor(line, args, FLEV_RAISEFLOORBYVALUE);
+        secnum = -1;
+        while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+        {
+            sec = &sectors[secnum];
+            sec->specialdata = NULL;
+        }
+        ceiling = EV_DoCeiling(line, args, CLEV_RAISEBYVALUE);
+    }
+    else
+    {
+        floor = EV_DoFloor(line, args, FLEV_LOWERFLOORBYVALUE);
+        secnum = -1;
+        while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+        {
+            sec = &sectors[secnum];
+            sec->specialdata = NULL;
+        }
+        ceiling = EV_DoCeiling(line, args, CLEV_LOWERBYVALUE);
+    }
+    return (floor | ceiling);
+}
+
+// ===== Build Stairs Private Data =====
+
+#define STAIR_SECTOR_TYPE       26
+#define STAIR_QUEUE_SIZE        32
+
+struct
+{
+    sector_t *sector;
+    int type;
+    int height;
+} StairQueue[STAIR_QUEUE_SIZE];
+
+static int QueueHead;
+static int QueueTail;
+
+static int StepDelta;
+static int Direction;
+static int Speed;
+static int Texture;
+static int StartDelay;
+static int StartDelayDelta;
+static int TextureChange;
+static int StartHeight;
+
+//==========================================================================
+//
+// QueueStairSector
+//
+//==========================================================================
+
+static void QueueStairSector(sector_t * sec, int type, int height)
+{
+    if ((QueueTail + 1) % STAIR_QUEUE_SIZE == QueueHead)
+    {
+        I_Error("BuildStairs:  Too many branches located.\n");
+    }
+    StairQueue[QueueTail].sector = sec;
+    StairQueue[QueueTail].type = type;
+    StairQueue[QueueTail].height = height;
+
+    QueueTail = (QueueTail + 1) % STAIR_QUEUE_SIZE;
+}
+
+//==========================================================================
+//
+// DequeueStairSector
+//
+//==========================================================================
+
+static sector_t *DequeueStairSector(int *type, int *height)
+{
+    sector_t *sec;
+
+    if (QueueHead == QueueTail)
+    {                           // queue is empty
+        return NULL;
+    }
+    *type = StairQueue[QueueHead].type;
+    *height = StairQueue[QueueHead].height;
+    sec = StairQueue[QueueHead].sector;
+    QueueHead = (QueueHead + 1) % STAIR_QUEUE_SIZE;
+
+    return sec;
+}
+
+//==========================================================================
+//
+// ProcessStairSector
+//
+//==========================================================================
+
+static void ProcessStairSector(sector_t * sec, int type, int height,
+                               stairs_e stairsType, int delay, int resetDelay)
+{
+    int i;
+    sector_t *tsec;
+    floormove_t *floor;
+
+    //
+    // new floor thinker
+    //
+    height += StepDelta;
+    floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
+    memset(floor, 0, sizeof(*floor));
+    P_AddThinker(&floor->thinker);
+    sec->specialdata = floor;
+    floor->thinker.function = T_MoveFloor;
+    floor->type = FLEV_RAISEBUILDSTEP;
+    floor->direction = Direction;
+    floor->sector = sec;
+    floor->floordestheight = height;
+    switch (stairsType)
+    {
+        case STAIRS_NORMAL:
+            floor->speed = Speed;
+            if (delay)
+            {
+                floor->delayTotal = delay;
+                floor->stairsDelayHeight = sec->floorheight + StepDelta;
+                floor->stairsDelayHeightDelta = StepDelta;
+            }
+            floor->resetDelay = resetDelay;
+            floor->resetDelayCount = resetDelay;
+            floor->resetHeight = sec->floorheight;
+            break;
+        case STAIRS_SYNC:
+            floor->speed = FixedMul(Speed, FixedDiv(height - StartHeight,
+                                                    StepDelta));
+            floor->resetDelay = delay;  //arg4
+            floor->resetDelayCount = delay;
+            floor->resetHeight = sec->floorheight;
+            break;
+/*
+		case STAIRS_PHASED:
+			floor->floordestheight = sec->floorheight+StepDelta;
+			floor->speed = Speed;
+			floor->delayCount = StartDelay;
+			StartDelay += StartDelayDelta;
+			floor->textureChange = TextureChange;
+			floor->resetDelayCount = StartDelay;
+			break;
+*/
+        default:
+            break;
+    }
+    SN_StartSequence((mobj_t *) & sec->soundorg, SEQ_PLATFORM + sec->seqType);
+    //
+    // Find next sector to raise
+    // Find nearby sector with sector special equal to type
+    //
+    for (i = 0; i < sec->linecount; i++)
+    {
+        if (!((sec->lines[i])->flags & ML_TWOSIDED))
+        {
+            continue;
+        }
+        tsec = (sec->lines[i])->frontsector;
+        if (tsec->special == type + STAIR_SECTOR_TYPE && !tsec->specialdata
+            && tsec->floorpic == Texture && tsec->validcount != validcount)
+        {
+            QueueStairSector(tsec, type ^ 1, height);
+            tsec->validcount = validcount;
+            //tsec->special = 0;
+        }
+        tsec = (sec->lines[i])->backsector;
+        if (tsec->special == type + STAIR_SECTOR_TYPE && !tsec->specialdata
+            && tsec->floorpic == Texture && tsec->validcount != validcount)
+        {
+            QueueStairSector(tsec, type ^ 1, height);
+            tsec->validcount = validcount;
+            //tsec->special = 0;
+        }
+    }
+}
+
+//==================================================================
+//
+//      BUILD A STAIRCASE!
+//
+// Direction is either positive or negative, denoting build stairs
+//      up or down.
+//==================================================================
+
+int EV_BuildStairs(line_t * line, byte * args, int direction,
+                   stairs_e stairsType)
+{
+    int secnum;
+    int height;
+    int delay;
+    int resetDelay;
+    sector_t *sec;
+    sector_t *qSec;
+    int type;
+
+    // Set global stairs variables
+    TextureChange = 0;
+    Direction = direction;
+    StepDelta = Direction * (args[2] * FRACUNIT);
+    Speed = args[1] * (FRACUNIT / 8);
+    resetDelay = args[4];
+    delay = args[3];
+    if (stairsType == STAIRS_PHASED)
+    {
+        StartDelayDelta = args[3];
+        StartDelay = StartDelayDelta;
+        resetDelay = StartDelayDelta;
+        delay = 0;
+        TextureChange = args[4];
+    }
+
+    secnum = -1;
+
+    validcount++;
+    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        Texture = sec->floorpic;
+        StartHeight = sec->floorheight;
+
+        // ALREADY MOVING?  IF SO, KEEP GOING...
+        if (sec->specialdata)
+            continue;
+
+        QueueStairSector(sec, 0, sec->floorheight);
+        sec->special = 0;
+    }
+    while ((qSec = DequeueStairSector(&type, &height)) != NULL)
+    {
+        ProcessStairSector(qSec, type, height, stairsType, delay, resetDelay);
+    }
+    return (1);
+}
+
+//=========================================================================
+//
+// T_BuildPillar
+//
+//=========================================================================
+
+void T_BuildPillar(thinker_t *thinker)
+{
+	pillar_t *pillar = (pillar_t *) thinker;
+    result_e res1;
+    result_e res2;
+
+    // First, raise the floor
+    res1 = T_MovePlane(pillar->sector, pillar->floorSpeed, pillar->floordest, pillar->crush, 0, pillar->direction);     // floorOrCeiling, direction
+    // Then, lower the ceiling
+    res2 = T_MovePlane(pillar->sector, pillar->ceilingSpeed,
+                       pillar->ceilingdest, pillar->crush, 1,
+                       -pillar->direction);
+    if (res1 == RES_PASTDEST && res2 == RES_PASTDEST)
+    {
+        pillar->sector->specialdata = NULL;
+        SN_StopSequence((mobj_t *) & pillar->sector->soundorg);
+        P_TagFinished(pillar->sector->tag);
+        P_RemoveThinker(&pillar->thinker);
+    }
+}
+
+//=========================================================================
+//
+// EV_BuildPillar
+//
+//=========================================================================
+
+int EV_BuildPillar(line_t * line, byte * args, boolean crush)
+{
+    int secnum;
+    sector_t *sec;
+    pillar_t *pillar;
+    int newHeight;
+    int rtn;
+
+    rtn = 0;
+    secnum = -1;
+    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;           // already moving
+        if (sec->floorheight == sec->ceilingheight)
+        {                       // pillar is already closed
+            continue;
+        }
+        rtn = 1;
+        if (!args[2])
+        {
+            newHeight = sec->floorheight +
+                ((sec->ceilingheight - sec->floorheight) / 2);
+        }
+        else
+        {
+            newHeight = sec->floorheight + (args[2] << FRACBITS);
+        }
+
+        pillar = Z_Malloc(sizeof(*pillar), PU_LEVSPEC, 0);
+        sec->specialdata = pillar;
+        P_AddThinker(&pillar->thinker);
+        pillar->thinker.function = T_BuildPillar;
+        pillar->sector = sec;
+        if (!args[2])
+        {
+            pillar->ceilingSpeed = pillar->floorSpeed =
+                args[1] * (FRACUNIT / 8);
+        }
+        else if (newHeight - sec->floorheight >
+                 sec->ceilingheight - newHeight)
+        {
+            pillar->floorSpeed = args[1] * (FRACUNIT / 8);
+            pillar->ceilingSpeed = FixedMul(sec->ceilingheight - newHeight,
+                                            FixedDiv(pillar->floorSpeed,
+                                                     newHeight -
+                                                     sec->floorheight));
+        }
+        else
+        {
+            pillar->ceilingSpeed = args[1] * (FRACUNIT / 8);
+            pillar->floorSpeed = FixedMul(newHeight - sec->floorheight,
+                                          FixedDiv(pillar->ceilingSpeed,
+                                                   sec->ceilingheight -
+                                                   newHeight));
+        }
+        pillar->floordest = newHeight;
+        pillar->ceilingdest = newHeight;
+        pillar->direction = 1;
+        pillar->crush = crush * args[3];
+        SN_StartSequence((mobj_t *) & pillar->sector->soundorg,
+                         SEQ_PLATFORM + pillar->sector->seqType);
+    }
+    return rtn;
+}
+
+//=========================================================================
+//
+// EV_OpenPillar
+//
+//=========================================================================
+
+int EV_OpenPillar(line_t * line, byte * args)
+{
+    int secnum;
+    sector_t *sec;
+    pillar_t *pillar;
+    int rtn;
+
+    rtn = 0;
+    secnum = -1;
+    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;           // already moving
+        if (sec->floorheight != sec->ceilingheight)
+        {                       // pillar isn't closed
+            continue;
+        }
+        rtn = 1;
+        pillar = Z_Malloc(sizeof(*pillar), PU_LEVSPEC, 0);
+        sec->specialdata = pillar;
+        P_AddThinker(&pillar->thinker);
+        pillar->thinker.function = T_BuildPillar;
+        pillar->sector = sec;
+        if (!args[2])
+        {
+            pillar->floordest = P_FindLowestFloorSurrounding(sec);
+        }
+        else
+        {
+            pillar->floordest = sec->floorheight - (args[2] << FRACBITS);
+        }
+        if (!args[3])
+        {
+            pillar->ceilingdest = P_FindHighestCeilingSurrounding(sec);
+        }
+        else
+        {
+            pillar->ceilingdest = sec->ceilingheight + (args[3] << FRACBITS);
+        }
+        if (sec->floorheight - pillar->floordest >= pillar->ceilingdest -
+            sec->ceilingheight)
+        {
+            pillar->floorSpeed = args[1] * (FRACUNIT / 8);
+            pillar->ceilingSpeed = FixedMul(sec->ceilingheight -
+                                            pillar->ceilingdest,
+                                            FixedDiv(pillar->floorSpeed,
+                                                     pillar->floordest -
+                                                     sec->floorheight));
+        }
+        else
+        {
+            pillar->ceilingSpeed = args[1] * (FRACUNIT / 8);
+            pillar->floorSpeed =
+                FixedMul(pillar->floordest - sec->floorheight,
+                         FixedDiv(pillar->ceilingSpeed,
+                                  sec->ceilingheight - pillar->ceilingdest));
+        }
+        pillar->direction = -1; // open the pillar
+        SN_StartSequence((mobj_t *) & pillar->sector->soundorg,
+                         SEQ_PLATFORM + pillar->sector->seqType);
+    }
+    return rtn;
+}
+
+//=========================================================================
+//
+// EV_FloorCrushStop
+//
+//=========================================================================
+
+int EV_FloorCrushStop(line_t * line, byte * args)
+{
+    thinker_t *think;
+    floormove_t *floor;
+    boolean rtn;
+
+    rtn = 0;
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != T_MoveFloor)
+        {
+            continue;
+        }
+        floor = (floormove_t *) think;
+        if (floor->type != FLEV_RAISEFLOORCRUSH)
+        {
+            continue;
+        }
+        // Completely remove the crushing floor
+        SN_StopSequence((mobj_t *) & floor->sector->soundorg);
+        floor->sector->specialdata = NULL;
+        P_TagFinished(floor->sector->tag);
+        P_RemoveThinker(&floor->thinker);
+        rtn = 1;
+    }
+    return rtn;
+}
+
+//==========================================================================
+//
+// T_FloorWaggle
+//
+//==========================================================================
+
+#define WGLSTATE_EXPAND 1
+#define WGLSTATE_STABLE 2
+#define WGLSTATE_REDUCE 3
+
+void T_FloorWaggle(thinker_t *thinker)
+{
+	floorWaggle_t *waggle = (floorWaggle_t *) thinker;
+    switch (waggle->state)
+    {
+        case WGLSTATE_EXPAND:
+            if ((waggle->scale += waggle->scaleDelta) >= waggle->targetScale)
+            {
+                waggle->scale = waggle->targetScale;
+                waggle->state = WGLSTATE_STABLE;
+            }
+            break;
+        case WGLSTATE_REDUCE:
+            if ((waggle->scale -= waggle->scaleDelta) <= 0)
+            {                   // Remove
+                waggle->sector->floorheight = waggle->originalHeight;
+                P_ChangeSector(waggle->sector, true);
+                waggle->sector->specialdata = NULL;
+                P_TagFinished(waggle->sector->tag);
+                P_RemoveThinker(&waggle->thinker);
+                return;
+            }
+            break;
+        case WGLSTATE_STABLE:
+            if (waggle->ticker != -1)
+            {
+                if (!--waggle->ticker)
+                {
+                    waggle->state = WGLSTATE_REDUCE;
+                }
+            }
+            break;
+    }
+    waggle->accumulator += waggle->accDelta;
+    waggle->sector->floorheight = waggle->originalHeight
+        + FixedMul(FloatBobOffsets[(waggle->accumulator >> FRACBITS) & 63],
+                   waggle->scale);
+    P_ChangeSector(waggle->sector, true);
+}
+
+//==========================================================================
+//
+// EV_StartFloorWaggle
+//
+//==========================================================================
+
+boolean EV_StartFloorWaggle(int tag, int height, int speed, int offset,
+                            int timer)
+{
+    int sectorIndex;
+    sector_t *sector;
+    floorWaggle_t *waggle;
+    boolean retCode;
+
+    retCode = false;
+    sectorIndex = -1;
+    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
+    {
+        sector = &sectors[sectorIndex];
+        if (sector->specialdata)
+        {                       // Already busy with another thinker
+            continue;
+        }
+        retCode = true;
+        waggle = Z_Malloc(sizeof(*waggle), PU_LEVSPEC, 0);
+        sector->specialdata = waggle;
+        waggle->thinker.function = T_FloorWaggle;
+        waggle->sector = sector;
+        waggle->originalHeight = sector->floorheight;
+        waggle->accumulator = offset * FRACUNIT;
+        waggle->accDelta = speed << 10;
+        waggle->scale = 0;
+        waggle->targetScale = height << 10;
+        waggle->scaleDelta = waggle->targetScale
+            / (35 + ((3 * 35) * height) / 255);
+        waggle->ticker = timer ? timer * 35 : -1;
+        waggle->state = WGLSTATE_EXPAND;
+        P_AddThinker(&waggle->thinker);
+    }
+    return retCode;
+}
diff --git a/games/NXDoom/src/hexen/p_inter.c b/games/NXDoom/src/hexen/p_inter.c
new file mode 100644
index 000000000..fab06674c
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_inter.c
@@ -0,0 +1,2231 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+#define BONUSADD 6
+
+int ArmorIncrement[NUMCLASSES][NUMARMOR] = {
+    {25 * FRACUNIT, 20 * FRACUNIT, 15 * FRACUNIT, 5 * FRACUNIT},
+    {10 * FRACUNIT, 25 * FRACUNIT, 5 * FRACUNIT, 20 * FRACUNIT},
+    {5 * FRACUNIT, 15 * FRACUNIT, 10 * FRACUNIT, 25 * FRACUNIT},
+    {0, 0, 0, 0}
+};
+
+int AutoArmorSave[NUMCLASSES] =
+    { 15 * FRACUNIT, 10 * FRACUNIT, 5 * FRACUNIT, 0 };
+
+const char *TextKeyMessages[] = {
+    TXT_KEY_STEEL,
+    TXT_KEY_CAVE,
+    TXT_KEY_AXE,
+    TXT_KEY_FIRE,
+    TXT_KEY_EMERALD,
+    TXT_KEY_DUNGEON,
+    TXT_KEY_SILVER,
+    TXT_KEY_RUSTED,
+    TXT_KEY_HORN,
+    TXT_KEY_SWAMP,
+    TXT_KEY_CASTLE
+};
+
+static void SetDormantArtifact(mobj_t * arti);
+static void TryPickupArtifact(player_t * player, artitype_t artifactType,
+                              mobj_t * artifact);
+static void TryPickupWeapon(player_t * player, pclass_t weaponClass,
+                            weapontype_t weaponType, mobj_t * weapon,
+                            const char *message);
+static void TryPickupWeaponPiece(player_t * player, pclass_t matchClass,
+                                 int pieceValue, mobj_t * pieceMobj);
+
+//--------------------------------------------------------------------------
+//
+// PROC P_SetMessage
+//
+//--------------------------------------------------------------------------
+
+void P_SetMessage(player_t * player, const char *message, boolean ultmsg)
+{
+    if ((player->ultimateMessage || !messageson) && !ultmsg)
+    {
+        return;
+    }
+
+    M_StringCopy(player->message, message, sizeof(player->message));
+//    strupr(player->message);
+    player->messageTics = MESSAGETICS;
+    player->yellowMessage = false;
+    if (ultmsg)
+    {
+        player->ultimateMessage = true;
+    }
+    if (player == &players[consoleplayer])
+    {
+        BorderTopRefresh = true;
+    }
+}
+
+//==========================================================================
+//
+// P_SetYellowMessage
+//
+//==========================================================================
+
+void P_SetYellowMessage(player_t * player, const char *message, boolean ultmsg)
+{
+    if ((player->ultimateMessage || !messageson) && !ultmsg)
+    {
+        return;
+    }
+    M_StringCopy(player->message, message, sizeof(player->message));
+    player->messageTics = 5 * MESSAGETICS;      // Bold messages last longer
+    player->yellowMessage = true;
+    if (ultmsg)
+    {
+        player->ultimateMessage = true;
+    }
+    if (player == &players[consoleplayer])
+    {
+        BorderTopRefresh = true;
+    }
+}
+
+//==========================================================================
+//
+// P_ClearMessage
+//
+//==========================================================================
+
+void P_ClearMessage(player_t * player)
+{
+    player->messageTics = 0;
+    if (player == &players[consoleplayer])
+    {
+        BorderTopRefresh = true;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_HideSpecialThing
+//
+//----------------------------------------------------------------------------
+
+void P_HideSpecialThing(mobj_t * thing)
+{
+    thing->flags &= ~MF_SPECIAL;
+    thing->flags2 |= MF2_DONTDRAW;
+    P_SetMobjState(thing, S_HIDESPECIAL1);
+}
+
+//--------------------------------------------------------------------------
+//
+// FUNC P_GiveMana
+//
+// Returns true if the player accepted the mana, false if it was
+// refused (player has MAX_MANA).
+//
+//--------------------------------------------------------------------------
+
+boolean P_GiveMana(player_t * player, manatype_t mana, int count)
+{
+    int prevMana;
+    //weapontype_t changeWeapon;
+
+    if (mana == MANA_NONE || mana == MANA_BOTH)
+    {
+        return (false);
+    }
+    if ((unsigned int) mana > NUMMANA)
+    {
+        I_Error("P_GiveMana: bad type %i", mana);
+    }
+    if (player->mana[mana] == MAX_MANA)
+    {
+        return (false);
+    }
+    if (gameskill == sk_baby || gameskill == sk_nightmare)
+    {                           // extra mana in baby mode and nightmare mode
+        count += count >> 1;
+    }
+    prevMana = player->mana[mana];
+
+    player->mana[mana] += count;
+    if (player->mana[mana] > MAX_MANA)
+    {
+        player->mana[mana] = MAX_MANA;
+    }
+    if (player->class == PCLASS_FIGHTER && player->readyweapon == WP_SECOND
+        && mana == MANA_1 && prevMana <= 0)
+    {
+        P_SetPsprite(player, ps_weapon, S_FAXEREADY_G);
+    }
+    return (true);
+}
+
+//==========================================================================
+//
+// TryPickupWeapon
+//
+//==========================================================================
+
+static void TryPickupWeapon(player_t * player, pclass_t weaponClass,
+                            weapontype_t weaponType, mobj_t * weapon,
+                            const char *message)
+{
+    boolean remove;
+    boolean gaveMana;
+    boolean gaveWeapon;
+
+    remove = true;
+    if (player->class != weaponClass)
+    {                           // Wrong class, but try to pick up for mana
+        if (netgame && !deathmatch)
+        {                       // Can't pick up weapons for other classes in coop netplay
+            return;
+        }
+        if (weaponType == WP_SECOND)
+        {
+            if (!P_GiveMana(player, MANA_1, 25))
+            {
+                return;
+            }
+        }
+        else
+        {
+            if (!P_GiveMana(player, MANA_2, 25))
+            {
+                return;
+            }
+        }
+    }
+    else if (netgame && !deathmatch)
+    {                           // Cooperative net-game
+        if (player->weaponowned[weaponType])
+        {
+            return;
+        }
+        player->weaponowned[weaponType] = true;
+        if (weaponType == WP_SECOND)
+        {
+            P_GiveMana(player, MANA_1, 25);
+        }
+        else
+        {
+            P_GiveMana(player, MANA_2, 25);
+        }
+        player->pendingweapon = weaponType;
+        remove = false;
+    }
+    else
+    {                           // Deathmatch or single player game
+        if (weaponType == WP_SECOND)
+        {
+            gaveMana = P_GiveMana(player, MANA_1, 25);
+        }
+        else
+        {
+            gaveMana = P_GiveMana(player, MANA_2, 25);
+        }
+        if (player->weaponowned[weaponType])
+        {
+            gaveWeapon = false;
+        }
+        else
+        {
+            gaveWeapon = true;
+            player->weaponowned[weaponType] = true;
+            if (weaponType > player->readyweapon)
+            {                   // Only switch to more powerful weapons
+                player->pendingweapon = weaponType;
+            }
+        }
+        if (!(gaveWeapon || gaveMana))
+        {                       // Player didn't need the weapon or any mana
+            return;
+        }
+    }
+
+    P_SetMessage(player, message, false);
+    if (weapon->special)
+    {
+        P_ExecuteLineSpecial(weapon->special, weapon->args,
+                             NULL, 0, player->mo);
+        weapon->special = 0;
+    }
+
+    if (remove)
+    {
+        if (deathmatch && !(weapon->flags2 & MF2_DROPPED))
+        {
+            P_HideSpecialThing(weapon);
+        }
+        else
+        {
+            P_RemoveMobj(weapon);
+        }
+    }
+
+    player->bonuscount += BONUSADD;
+    if (player == &players[consoleplayer])
+    {
+        S_StartSound(NULL, SFX_PICKUP_WEAPON);
+        SB_PaletteFlash(false);
+    }
+}
+
+//--------------------------------------------------------------------------
+//
+// FUNC P_GiveWeapon
+//
+// Returns true if the weapon or its mana was accepted.
+//
+//--------------------------------------------------------------------------
+
+/*
+boolean P_GiveWeapon(player_t *player, pclass_t class, weapontype_t weapon)
+{
+	boolean gaveMana;
+	boolean gaveWeapon;
+
+	if(player->class != class)
+	{ // player cannot use this weapon, take it anyway, and get mana
+		if(netgame && !deathmatch)
+		{ // Can't pick up weapons for other classes in coop netplay
+			return false;
+		}
+		if(weapon == WP_SECOND)
+		{
+			return P_GiveMana(player, MANA_1, 25);
+		}
+		else
+		{
+			return P_GiveMana(player, MANA_2, 25);
+		}		
+	}
+	if(netgame && !deathmatch)
+	{ // Cooperative net-game
+		if(player->weaponowned[weapon])
+		{
+			return(false);
+		}
+		player->bonuscount += BONUSADD;
+		player->weaponowned[weapon] = true;
+		if(weapon == WP_SECOND)
+		{
+			P_GiveMana(player, MANA_1, 25);
+		}
+		else 
+		{
+			P_GiveMana(player, MANA_2, 25);
+		}
+		player->pendingweapon = weapon;
+		if(player == &players[consoleplayer])
+		{
+			S_StartSound(NULL, SFX_PICKUP_WEAPON);
+		}
+		return(false);
+	}
+	if(weapon == WP_SECOND)
+	{
+		gaveMana = P_GiveMana(player, MANA_1, 25);
+	}
+	else 
+	{
+		gaveMana = P_GiveMana(player, MANA_2, 25);
+	}
+	if(player->weaponowned[weapon])
+	{
+		gaveWeapon = false;
+	}
+	else
+	{
+		gaveWeapon = true;
+		player->weaponowned[weapon] = true;
+		if(weapon > player->readyweapon)
+		{ // Only switch to more powerful weapons
+			player->pendingweapon = weapon;
+		}
+	}
+	return(gaveWeapon || gaveMana);
+}
+*/
+
+//===========================================================================
+//
+// P_GiveWeaponPiece
+//
+//===========================================================================
+
+/*
+boolean P_GiveWeaponPiece(player_t *player, pclass_t class, int piece)
+{
+	P_GiveMana(player, MANA_1, 20);
+	P_GiveMana(player, MANA_2, 20);
+	if(player->class != class)
+	{
+		return true;
+	}
+	else if(player->pieces&piece)
+	{ // player already has that weapon piece
+		return true;
+	}
+	player->pieces |= piece;
+	if(player->pieces == 7)
+	{ // player has built the fourth weapon!
+		P_GiveWeapon(player, class, WP_FOURTH);
+		S_StartSound(player->mo, SFX_WEAPON_BUILD);
+	}
+	return true;
+}
+*/
+
+//==========================================================================
+//
+// TryPickupWeaponPiece
+//
+//==========================================================================
+
+static void TryPickupWeaponPiece(player_t * player, pclass_t matchClass,
+                                 int pieceValue, mobj_t * pieceMobj)
+{
+    boolean remove;
+    boolean checkAssembled;
+    boolean gaveWeapon;
+    int gaveMana;
+    static const char *fourthWeaponText[] = {
+        TXT_WEAPON_F4,
+        TXT_WEAPON_C4,
+        TXT_WEAPON_M4
+    };
+    static const char *weaponPieceText[] = {
+        TXT_QUIETUS_PIECE,
+        TXT_WRAITHVERGE_PIECE,
+        TXT_BLOODSCOURGE_PIECE
+    };
+    static int pieceValueTrans[] = {
+        0,                      // 0: never
+        WPIECE1 | WPIECE2 | WPIECE3,    // WPIECE1 (1)
+        WPIECE2 | WPIECE3,      // WPIECE2 (2)
+        0,                      // 3: never
+        WPIECE3                 // WPIECE3 (4)
+    };
+
+    remove = true;
+    checkAssembled = true;
+    gaveWeapon = false;
+    if (player->class != matchClass)
+    {                           // Wrong class, but try to pick up for mana
+        if (netgame && !deathmatch)
+        {                       // Can't pick up wrong-class weapons in coop netplay
+            return;
+        }
+        checkAssembled = false;
+        gaveMana = P_GiveMana(player, MANA_1, 20) +
+            P_GiveMana(player, MANA_2, 20);
+        if (!gaveMana)
+        {                       // Didn't need the mana, so don't pick it up
+            return;
+        }
+    }
+    else if (netgame && !deathmatch)
+    {                           // Cooperative net-game
+        if (player->pieces & pieceValue)
+        {                       // Already has the piece
+            return;
+        }
+        pieceValue = pieceValueTrans[pieceValue];
+        P_GiveMana(player, MANA_1, 20);
+        P_GiveMana(player, MANA_2, 20);
+        remove = false;
+    }
+    else
+    {                           // Deathmatch or single player game
+        gaveMana = P_GiveMana(player, MANA_1, 20) +
+            P_GiveMana(player, MANA_2, 20);
+        if (player->pieces & pieceValue)
+        {                       // Already has the piece, check if mana needed
+            if (!gaveMana)
+            {                   // Didn't need the mana, so don't pick it up
+                return;
+            }
+            checkAssembled = false;
+        }
+    }
+
+    // Pick up the weapon piece
+    if (pieceMobj->special)
+    {
+        P_ExecuteLineSpecial(pieceMobj->special, pieceMobj->args,
+                             NULL, 0, player->mo);
+        pieceMobj->special = 0;
+    }
+    if (remove)
+    {
+        if (deathmatch && !(pieceMobj->flags2 & MF2_DROPPED))
+        {
+            P_HideSpecialThing(pieceMobj);
+        }
+        else
+        {
+            P_RemoveMobj(pieceMobj);
+        }
+    }
+    player->bonuscount += BONUSADD;
+    if (player == &players[consoleplayer])
+    {
+        SB_PaletteFlash(false);
+    }
+
+    // Check if fourth weapon assembled
+    if (checkAssembled)
+    {
+        player->pieces |= pieceValue;
+        if (player->pieces == (WPIECE1 | WPIECE2 | WPIECE3))
+        {
+            gaveWeapon = true;
+            player->weaponowned[WP_FOURTH] = true;
+            player->pendingweapon = WP_FOURTH;
+        }
+    }
+
+    if (gaveWeapon)
+    {
+        P_SetMessage(player, fourthWeaponText[matchClass], false);
+        // Play the build-sound full volume for all players
+        S_StartSound(NULL, SFX_WEAPON_BUILD);
+    }
+    else
+    {
+        P_SetMessage(player, weaponPieceText[matchClass], false);
+        if (player == &players[consoleplayer])
+        {
+            S_StartSound(NULL, SFX_PICKUP_WEAPON);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GiveBody
+//
+// Returns false if the body isn't needed at all.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GiveBody(player_t * player, int num)
+{
+    int max;
+
+    max = MAXHEALTH;
+    if (player->morphTics)
+    {
+        max = MAXMORPHHEALTH;
+    }
+    if (player->health >= max)
+    {
+        return (false);
+    }
+    player->health += num;
+    if (player->health > max)
+    {
+        player->health = max;
+    }
+    player->mo->health = player->health;
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GiveArmor
+//
+// Returns false if the armor is worse than the current armor.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GiveArmor(player_t * player, armortype_t armortype, int amount)
+{
+    int hits;
+    int totalArmor;
+
+    if (amount == -1)
+    {
+        hits = ArmorIncrement[player->class][armortype];
+        if (player->armorpoints[armortype] >= hits)
+        {
+            return false;
+        }
+        else
+        {
+            player->armorpoints[armortype] = hits;
+        }
+    }
+    else
+    {
+        hits = amount * 5 * FRACUNIT;
+        totalArmor = player->armorpoints[ARMOR_ARMOR]
+            + player->armorpoints[ARMOR_SHIELD]
+            + player->armorpoints[ARMOR_HELMET]
+            + player->armorpoints[ARMOR_AMULET]
+            + AutoArmorSave[player->class];
+        if (totalArmor < ArmorMax[player->class] * 5 * FRACUNIT)
+        {
+            player->armorpoints[armortype] += hits;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_GiveKey
+//
+//---------------------------------------------------------------------------
+
+int P_GiveKey(player_t * player, keytype_t key)
+{
+    if (player->keys & (1 << key))
+    {
+        return false;
+    }
+    player->bonuscount += BONUSADD;
+    player->keys |= 1 << key;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GivePower
+//
+// Returns true if power accepted.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GivePower(player_t * player, powertype_t power)
+{
+    if (power == pw_invulnerability)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = INVULNTICS;
+        player->mo->flags2 |= MF2_INVULNERABLE;
+        if (player->class == PCLASS_MAGE)
+        {
+            player->mo->flags2 |= MF2_REFLECTIVE;
+        }
+        return (true);
+    }
+    if (power == pw_flight)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = FLIGHTTICS;
+        player->mo->flags2 |= MF2_FLY;
+        player->mo->flags |= MF_NOGRAVITY;
+        if (player->mo->z <= player->mo->floorz)
+        {
+            player->flyheight = 10;     // thrust the player in the air a bit
+        }
+        return (true);
+    }
+    if (power == pw_infrared)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = INFRATICS;
+        return (true);
+    }
+    if (power == pw_speed)
+    {
+        if (player->powers[power] > BLINKTHRESHOLD)
+        {                       // Already have it
+            return (false);
+        }
+        player->powers[power] = SPEEDTICS;
+        return (true);
+    }
+    if (power == pw_minotaur)
+    {
+        // Doesn't matter if already have power, renew ticker
+        player->powers[power] = MAULATORTICS;
+        return (true);
+    }
+/*
+	if(power == pw_ironfeet)
+	{
+		player->powers[power] = IRONTICS;
+		return(true);
+	}
+	if(power == pw_strength)
+	{
+		P_GiveBody(player, 100);
+		player->powers[power] = 1;
+		return(true);
+	}
+*/
+    if (player->powers[power])
+    {
+        return (false);         // already got it
+    }
+    player->powers[power] = 1;
+    return (true);
+}
+
+//==========================================================================
+//
+// TryPickupArtifact
+//
+//==========================================================================
+
+static void TryPickupArtifact(player_t * player, artitype_t artifactType,
+                              mobj_t * artifact)
+{
+    static const char *artifactMessages[NUMARTIFACTS] = {
+        NULL,
+        TXT_ARTIINVULNERABILITY,
+        TXT_ARTIHEALTH,
+        TXT_ARTISUPERHEALTH,
+        TXT_ARTIHEALINGRADIUS,
+        TXT_ARTISUMMON,
+        TXT_ARTITORCH,
+        TXT_ARTIEGG,
+        TXT_ARTIFLY,
+        TXT_ARTIBLASTRADIUS,
+        TXT_ARTIPOISONBAG,
+        TXT_ARTITELEPORTOTHER,
+        TXT_ARTISPEED,
+        TXT_ARTIBOOSTMANA,
+        TXT_ARTIBOOSTARMOR,
+        TXT_ARTITELEPORT,
+        TXT_ARTIPUZZSKULL,
+        TXT_ARTIPUZZGEMBIG,
+        TXT_ARTIPUZZGEMRED,
+        TXT_ARTIPUZZGEMGREEN1,
+        TXT_ARTIPUZZGEMGREEN2,
+        TXT_ARTIPUZZGEMBLUE1,
+        TXT_ARTIPUZZGEMBLUE2,
+        TXT_ARTIPUZZBOOK1,
+        TXT_ARTIPUZZBOOK2,
+        TXT_ARTIPUZZSKULL2,
+        TXT_ARTIPUZZFWEAPON,
+        TXT_ARTIPUZZCWEAPON,
+        TXT_ARTIPUZZMWEAPON,
+        TXT_ARTIPUZZGEAR,       // All gear pickups use the same text
+        TXT_ARTIPUZZGEAR,
+        TXT_ARTIPUZZGEAR,
+        TXT_ARTIPUZZGEAR
+    };
+
+    if (gamemode == shareware)
+    {
+        artifactMessages[arti_blastradius] = TXT_ARTITELEPORT;
+        artifactMessages[arti_teleport] = TXT_ARTIBLASTRADIUS;
+    }
+
+    if (P_GiveArtifact(player, artifactType, artifact))
+    {
+        if (artifact->special)
+        {
+            P_ExecuteLineSpecial(artifact->special, artifact->args,
+                                 NULL, 0, NULL);
+            artifact->special = 0;
+        }
+        player->bonuscount += BONUSADD;
+        if (artifactType < arti_firstpuzzitem)
+        {
+            SetDormantArtifact(artifact);
+            S_StartSound(artifact, SFX_PICKUP_ARTIFACT);
+            P_SetMessage(player, artifactMessages[artifactType], false);
+        }
+        else
+        {                       // Puzzle item
+            S_StartSound(NULL, SFX_PICKUP_ITEM);
+            P_SetMessage(player, artifactMessages[artifactType], true);
+            if (!netgame || deathmatch)
+            {                   // Remove puzzle items if not cooperative netplay
+                P_RemoveMobj(artifact);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GiveArtifact
+//
+// Returns true if artifact accepted.
+//
+//---------------------------------------------------------------------------
+
+boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo)
+{
+    int i;
+    int j;
+    boolean slidePointer;
+
+    slidePointer = false;
+    i = 0;
+    while (player->inventory[i].type != arti && i < player->inventorySlotNum)
+    {
+        i++;
+    }
+    if (i == player->inventorySlotNum)
+    {
+        if (arti < arti_firstpuzzitem)
+        {
+            i = 0;
+            while (player->inventory[i].type < arti_firstpuzzitem
+                   && i < player->inventorySlotNum)
+            {
+                i++;
+            }
+            if (i != player->inventorySlotNum)
+            {
+                for (j = player->inventorySlotNum; j > i; j--)
+                {
+                    player->inventory[j].count =
+                        player->inventory[j - 1].count;
+                    player->inventory[j].type = player->inventory[j - 1].type;
+                    slidePointer = true;
+                }
+            }
+        }
+        player->inventory[i].count = 1;
+        player->inventory[i].type = arti;
+        player->inventorySlotNum++;
+    }
+    else
+    {
+        if (arti >= arti_firstpuzzitem && netgame && !deathmatch)
+        {                       // Can't carry more than 1 puzzle item in coop netplay
+            return false;
+        }
+        if (player->inventory[i].count >= 25)
+        {                       // Player already has 25 of this item
+            return false;
+        }
+        player->inventory[i].count++;
+    }
+    if (!player->artifactCount)
+    {
+        player->readyArtifact = arti;
+    }
+    else if (player == &players[consoleplayer] && slidePointer
+             && i <= inv_ptr)
+    {
+        inv_ptr++;
+        curpos++;
+        if (curpos > 6)
+        {
+            curpos = 6;
+        }
+    }
+    player->artifactCount++;
+    return (true);
+}
+
+//==========================================================================
+//
+// SetDormantArtifact
+//
+// Removes the MF_SPECIAL flag and initiates the artifact pickup
+// animation.
+//
+//==========================================================================
+
+static void SetDormantArtifact(mobj_t * arti)
+{
+    arti->flags &= ~MF_SPECIAL;
+    if (deathmatch && !(arti->flags2 & MF2_DROPPED))
+    {
+        if (arti->type == MT_ARTIINVULNERABILITY)
+        {
+            P_SetMobjState(arti, S_DORMANTARTI3_1);
+        }
+        else if (arti->type == MT_SUMMONMAULATOR || arti->type == MT_ARTIFLY)
+        {
+            P_SetMobjState(arti, S_DORMANTARTI2_1);
+        }
+        else
+        {
+            P_SetMobjState(arti, S_DORMANTARTI1_1);
+        }
+    }
+    else
+    {                           // Don't respawn
+        P_SetMobjState(arti, S_DEADARTI1);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_RestoreArtifact
+//
+//---------------------------------------------------------------------------
+
+void A_RestoreArtifact(mobj_t *arti, player_t *player, pspdef_t *psp)
+{
+    arti->flags |= MF_SPECIAL;
+    P_SetMobjState(arti, arti->info->spawnstate);
+    S_StartSound(arti, SFX_RESPAWN);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_RestoreSpecialThing1
+//
+// Make a special thing visible again.
+//
+//---------------------------------------------------------------------------
+
+void A_RestoreSpecialThing1(mobj_t * thing, player_t *player, pspdef_t *psp)
+{
+    thing->flags2 &= ~MF2_DONTDRAW;
+    S_StartSound(thing, SFX_RESPAWN);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_RestoreSpecialThing2
+//
+//---------------------------------------------------------------------------
+
+void A_RestoreSpecialThing2(mobj_t * thing, player_t *player, pspdef_t *psp)
+{
+    thing->flags |= MF_SPECIAL;
+    P_SetMobjState(thing, thing->info->spawnstate);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_TouchSpecialThing
+//
+//---------------------------------------------------------------------------
+
+void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher)
+{
+    player_t *player;
+    fixed_t delta;
+    int sound;
+    boolean respawn;
+
+    delta = special->z - toucher->z;
+    if (delta > toucher->height || delta < -32 * FRACUNIT)
+    {                           // Out of reach
+        return;
+    }
+    if (toucher->health <= 0)
+    {                           // Toucher is dead
+        return;
+    }
+    sound = SFX_PICKUP_ITEM;
+    player = toucher->player;
+    respawn = true;
+    switch (special->sprite)
+    {
+            // Items
+        case SPR_PTN1:         // Item_HealingPotion
+            if (!P_GiveBody(player, 10))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_ITEMHEALTH, false);
+            break;
+        case SPR_ARM1:
+            if (!P_GiveArmor(player, ARMOR_ARMOR, -1))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_ARMOR1, false);
+            break;
+        case SPR_ARM2:
+            if (!P_GiveArmor(player, ARMOR_SHIELD, -1))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_ARMOR2, false);
+            break;
+        case SPR_ARM3:
+            if (!P_GiveArmor(player, ARMOR_HELMET, -1))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_ARMOR3, false);
+            break;
+        case SPR_ARM4:
+            if (!P_GiveArmor(player, ARMOR_AMULET, -1))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_ARMOR4, false);
+            break;
+
+            // Keys
+        case SPR_KEY1:
+        case SPR_KEY2:
+        case SPR_KEY3:
+        case SPR_KEY4:
+        case SPR_KEY5:
+        case SPR_KEY6:
+        case SPR_KEY7:
+        case SPR_KEY8:
+        case SPR_KEY9:
+        case SPR_KEYA:
+        case SPR_KEYB:
+            if (!P_GiveKey(player, special->sprite - SPR_KEY1))
+            {
+                return;
+            }
+            P_SetMessage(player, TextKeyMessages[special->sprite - SPR_KEY1],
+                         true);
+            sound = SFX_PICKUP_KEY;
+
+            // Check and process the special now in case the key doesn't
+            // get removed for coop netplay
+            if (special->special)
+            {
+                P_ExecuteLineSpecial(special->special, special->args,
+                                     NULL, 0, toucher);
+                special->special = 0;
+            }
+
+            if (!netgame)
+            {                   // Only remove keys in single player game
+                break;
+            }
+            player->bonuscount += BONUSADD;
+            if (player == &players[consoleplayer])
+            {
+                S_StartSound(NULL, sound);
+                SB_PaletteFlash(false);
+            }
+            return;
+
+            // Artifacts
+        case SPR_PTN2:
+            TryPickupArtifact(player, arti_health, special);
+            return;
+        case SPR_SOAR:
+            TryPickupArtifact(player, arti_fly, special);
+            return;
+        case SPR_INVU:
+            TryPickupArtifact(player, arti_invulnerability, special);
+            return;
+        case SPR_SUMN:
+            TryPickupArtifact(player, arti_summon, special);
+            return;
+        case SPR_PORK:
+            TryPickupArtifact(player, arti_egg, special);
+            return;
+        case SPR_SPHL:
+            TryPickupArtifact(player, arti_superhealth, special);
+            return;
+        case SPR_HRAD:
+            TryPickupArtifact(player, arti_healingradius, special);
+            return;
+        case SPR_TRCH:
+            TryPickupArtifact(player, arti_torch, special);
+            return;
+        case SPR_ATLP:
+            TryPickupArtifact(player, arti_teleport, special);
+            return;
+        case SPR_TELO:
+            TryPickupArtifact(player, arti_teleportother, special);
+            return;
+        case SPR_PSBG:
+            TryPickupArtifact(player, arti_poisonbag, special);
+            return;
+        case SPR_SPED:
+            TryPickupArtifact(player, arti_speed, special);
+            return;
+        case SPR_BMAN:
+            TryPickupArtifact(player, arti_boostmana, special);
+            return;
+        case SPR_BRAC:
+            TryPickupArtifact(player, arti_boostarmor, special);
+            return;
+        case SPR_BLST:
+            TryPickupArtifact(player, arti_blastradius, special);
+            return;
+
+            // Puzzle artifacts
+        case SPR_ASKU:
+            TryPickupArtifact(player, arti_puzzskull, special);
+            return;
+        case SPR_ABGM:
+            TryPickupArtifact(player, arti_puzzgembig, special);
+            return;
+        case SPR_AGMR:
+            TryPickupArtifact(player, arti_puzzgemred, special);
+            return;
+        case SPR_AGMG:
+            TryPickupArtifact(player, arti_puzzgemgreen1, special);
+            return;
+        case SPR_AGG2:
+            TryPickupArtifact(player, arti_puzzgemgreen2, special);
+            return;
+        case SPR_AGMB:
+            TryPickupArtifact(player, arti_puzzgemblue1, special);
+            return;
+        case SPR_AGB2:
+            TryPickupArtifact(player, arti_puzzgemblue2, special);
+            return;
+        case SPR_ABK1:
+            TryPickupArtifact(player, arti_puzzbook1, special);
+            return;
+        case SPR_ABK2:
+            TryPickupArtifact(player, arti_puzzbook2, special);
+            return;
+        case SPR_ASK2:
+            TryPickupArtifact(player, arti_puzzskull2, special);
+            return;
+        case SPR_AFWP:
+            TryPickupArtifact(player, arti_puzzfweapon, special);
+            return;
+        case SPR_ACWP:
+            TryPickupArtifact(player, arti_puzzcweapon, special);
+            return;
+        case SPR_AMWP:
+            TryPickupArtifact(player, arti_puzzmweapon, special);
+            return;
+        case SPR_AGER:
+            TryPickupArtifact(player, arti_puzzgear1, special);
+            return;
+        case SPR_AGR2:
+            TryPickupArtifact(player, arti_puzzgear2, special);
+            return;
+        case SPR_AGR3:
+            TryPickupArtifact(player, arti_puzzgear3, special);
+            return;
+        case SPR_AGR4:
+            TryPickupArtifact(player, arti_puzzgear4, special);
+            return;
+
+            // Mana
+        case SPR_MAN1:
+            if (!P_GiveMana(player, MANA_1, 15))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_MANA_1, false);
+            break;
+        case SPR_MAN2:
+            if (!P_GiveMana(player, MANA_2, 15))
+            {
+                return;
+            }
+            P_SetMessage(player, TXT_MANA_2, false);
+            break;
+        case SPR_MAN3:         // Double Mana Dodecahedron
+            if (!P_GiveMana(player, MANA_1, 20))
+            {
+                if (!P_GiveMana(player, MANA_2, 20))
+                {
+                    return;
+                }
+            }
+            else
+            {
+                P_GiveMana(player, MANA_2, 20);
+            }
+            P_SetMessage(player, TXT_MANA_BOTH, false);
+            break;
+
+            // 2nd and 3rd Mage Weapons
+        case SPR_WMCS:         // Frost Shards
+            TryPickupWeapon(player, PCLASS_MAGE, WP_SECOND,
+                            special, TXT_WEAPON_M2);
+            return;
+        case SPR_WMLG:         // Arc of Death
+            TryPickupWeapon(player, PCLASS_MAGE, WP_THIRD,
+                            special, TXT_WEAPON_M3);
+            return;
+
+            // 2nd and 3rd Fighter Weapons
+        case SPR_WFAX:         // Timon's Axe
+            TryPickupWeapon(player, PCLASS_FIGHTER, WP_SECOND,
+                            special, TXT_WEAPON_F2);
+            return;
+        case SPR_WFHM:         // Hammer of Retribution
+            TryPickupWeapon(player, PCLASS_FIGHTER, WP_THIRD,
+                            special, TXT_WEAPON_F3);
+            return;
+
+            // 2nd and 3rd Cleric Weapons
+        case SPR_WCSS:         // Serpent Staff
+            TryPickupWeapon(player, PCLASS_CLERIC, WP_SECOND,
+                            special, TXT_WEAPON_C2);
+            return;
+        case SPR_WCFM:         // Firestorm
+            TryPickupWeapon(player, PCLASS_CLERIC, WP_THIRD,
+                            special, TXT_WEAPON_C3);
+            return;
+
+            // Fourth Weapon Pieces
+        case SPR_WFR1:
+            TryPickupWeaponPiece(player, PCLASS_FIGHTER, WPIECE1, special);
+            return;
+        case SPR_WFR2:
+            TryPickupWeaponPiece(player, PCLASS_FIGHTER, WPIECE2, special);
+            return;
+        case SPR_WFR3:
+            TryPickupWeaponPiece(player, PCLASS_FIGHTER, WPIECE3, special);
+            return;
+        case SPR_WCH1:
+            TryPickupWeaponPiece(player, PCLASS_CLERIC, WPIECE1, special);
+            return;
+        case SPR_WCH2:
+            TryPickupWeaponPiece(player, PCLASS_CLERIC, WPIECE2, special);
+            return;
+        case SPR_WCH3:
+            TryPickupWeaponPiece(player, PCLASS_CLERIC, WPIECE3, special);
+            return;
+        case SPR_WMS1:
+            TryPickupWeaponPiece(player, PCLASS_MAGE, WPIECE1, special);
+            return;
+        case SPR_WMS2:
+            TryPickupWeaponPiece(player, PCLASS_MAGE, WPIECE2, special);
+            return;
+        case SPR_WMS3:
+            TryPickupWeaponPiece(player, PCLASS_MAGE, WPIECE3, special);
+            return;
+
+        default:
+            I_Error("P_SpecialThing: Unknown gettable thing");
+    }
+    if (special->special)
+    {
+        P_ExecuteLineSpecial(special->special, special->args, NULL,
+                             0, toucher);
+        special->special = 0;
+    }
+    if (deathmatch && respawn && !(special->flags2 & MF2_DROPPED))
+    {
+        P_HideSpecialThing(special);
+    }
+    else
+    {
+        P_RemoveMobj(special);
+    }
+    player->bonuscount += BONUSADD;
+    if (player == &players[consoleplayer])
+    {
+        S_StartSound(NULL, sound);
+        SB_PaletteFlash(false);
+    }
+}
+
+// Search thinker list for minotaur
+mobj_t *ActiveMinotaur(player_t * master)
+{
+    mobj_t *mo;
+    player_t *plr;
+    thinker_t *think;
+    unsigned int *starttime;
+
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+            continue;
+        mo = (mobj_t *) think;
+        if (mo->type != MT_MINOTAUR)
+            continue;
+        if (mo->health <= 0)
+            continue;
+        if (!(mo->flags & MF_COUNTKILL))
+            continue;           // for morphed minotaurs
+        if (mo->flags & MF_CORPSE)
+            continue;
+        starttime = (unsigned int *) mo->args;
+        if ((leveltime - *starttime) >= MAULATORTICS)
+            continue;
+        plr = mo->special1.m->player;
+        if (plr == master)
+            return (mo);
+    }
+    return (NULL);
+}
+
+
+//---------------------------------------------------------------------------
+//
+// PROC P_KillMobj
+//
+//---------------------------------------------------------------------------
+
+void P_KillMobj(mobj_t * source, mobj_t * target)
+{
+    byte dummyArgs[3] = {0, 0, 0};
+    mobj_t *master;
+
+    target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_NOGRAVITY);
+    target->flags |= MF_CORPSE | MF_DROPOFF;
+    target->flags2 &= ~MF2_PASSMOBJ;
+    target->height >>= 2;
+    if ((target->flags & MF_COUNTKILL || target->type == MT_ZBELL)
+        && target->special)
+    {                           // Initiate monster death actions
+        if (target->type == MT_SORCBOSS)
+        {
+            P_StartACS(target->special, 0, dummyArgs, target, NULL, 0);
+        }
+        else
+        {
+            P_ExecuteLineSpecial(target->special, target->args,
+                                 NULL, 0, target);
+        }
+    }
+    if (source && source->player)
+    {                           // Check for frag changes
+        if (target->player)
+        {
+            if (target == source)
+            {                   // Self-frag
+                target->player->frags[target->player - players]--;
+                if (cmdfrag && netgame
+                    && source->player == &players[consoleplayer])
+                {               // Send out a frag count packet
+                    NET_SendFrags(source->player);
+                }
+            }
+            else
+            {
+                source->player->frags[target->player - players]++;
+                if (cmdfrag && netgame
+                    && source->player == &players[consoleplayer])
+                {               // Send out a frag count packet
+                    NET_SendFrags(source->player);
+                }
+            }
+        }
+    }
+    if (target->player)
+    {                           // Player death
+        if (!source)
+        {                       // Self-frag
+            target->player->frags[target->player - players]--;
+            if (cmdfrag && netgame
+                && target->player == &players[consoleplayer])
+            {                   // Send out a frag count packet
+                NET_SendFrags(target->player);
+            }
+        }
+        target->flags &= ~MF_SOLID;
+        target->flags2 &= ~MF2_FLY;
+        target->player->powers[pw_flight] = 0;
+        target->player->playerstate = PST_DEAD;
+        P_DropWeapon(target->player);
+        if (target->flags2 & MF2_FIREDAMAGE)
+        {                       // Player flame death
+            switch (target->player->class)
+            {
+                case PCLASS_FIGHTER:
+                    S_StartSound(target, SFX_PLAYER_FIGHTER_BURN_DEATH);
+                    P_SetMobjState(target, S_PLAY_F_FDTH1);
+                    return;
+                case PCLASS_CLERIC:
+                    S_StartSound(target, SFX_PLAYER_CLERIC_BURN_DEATH);
+                    P_SetMobjState(target, S_PLAY_C_FDTH1);
+                    return;
+                case PCLASS_MAGE:
+                    S_StartSound(target, SFX_PLAYER_MAGE_BURN_DEATH);
+                    P_SetMobjState(target, S_PLAY_M_FDTH1);
+                    return;
+                default:
+                    break;
+            }
+        }
+        if (target->flags2 & MF2_ICEDAMAGE)
+        {                       // Player ice death
+            target->flags &= ~(7 << MF_TRANSSHIFT);     //no translation
+            target->flags |= MF_ICECORPSE;
+            switch (target->player->class)
+            {
+                case PCLASS_FIGHTER:
+                    P_SetMobjState(target, S_FPLAY_ICE);
+                    return;
+                case PCLASS_CLERIC:
+                    P_SetMobjState(target, S_CPLAY_ICE);
+                    return;
+                case PCLASS_MAGE:
+                    P_SetMobjState(target, S_MPLAY_ICE);
+                    return;
+                case PCLASS_PIG:
+                    P_SetMobjState(target, S_PIG_ICE);
+                    return;
+                default:
+                    break;
+            }
+        }
+    }
+    if (target->flags2 & MF2_FIREDAMAGE)
+    {
+        if (target->type == MT_FIGHTER_BOSS
+            || target->type == MT_CLERIC_BOSS || target->type == MT_MAGE_BOSS)
+        {
+            switch (target->type)
+            {
+                case MT_FIGHTER_BOSS:
+                    S_StartSound(target, SFX_PLAYER_FIGHTER_BURN_DEATH);
+                    P_SetMobjState(target, S_PLAY_F_FDTH1);
+                    return;
+                case MT_CLERIC_BOSS:
+                    S_StartSound(target, SFX_PLAYER_CLERIC_BURN_DEATH);
+                    P_SetMobjState(target, S_PLAY_C_FDTH1);
+                    return;
+                case MT_MAGE_BOSS:
+                    S_StartSound(target, SFX_PLAYER_MAGE_BURN_DEATH);
+                    P_SetMobjState(target, S_PLAY_M_FDTH1);
+                    return;
+                default:
+                    break;
+            }
+        }
+        else if (target->type == MT_TREEDESTRUCTIBLE)
+        {
+            P_SetMobjState(target, S_ZTREEDES_X1);
+            target->height = 24 * FRACUNIT;
+            S_StartSound(target, SFX_TREE_EXPLODE);
+            return;
+        }
+    }
+    if (target->flags2 & MF2_ICEDAMAGE)
+    {
+        target->flags |= MF_ICECORPSE;
+        switch (target->type)
+        {
+            case MT_BISHOP:
+                P_SetMobjState(target, S_BISHOP_ICE);
+                return;
+            case MT_CENTAUR:
+            case MT_CENTAURLEADER:
+                P_SetMobjState(target, S_CENTAUR_ICE);
+                return;
+            case MT_DEMON:
+            case MT_DEMON2:
+                P_SetMobjState(target, S_DEMON_ICE);
+                return;
+            case MT_SERPENT:
+            case MT_SERPENTLEADER:
+                P_SetMobjState(target, S_SERPENT_ICE);
+                return;
+            case MT_WRAITH:
+            case MT_WRAITHB:
+                P_SetMobjState(target, S_WRAITH_ICE);
+                return;
+            case MT_ETTIN:
+                P_SetMobjState(target, S_ETTIN_ICE1);
+                return;
+            case MT_FIREDEMON:
+                P_SetMobjState(target, S_FIRED_ICE1);
+                return;
+            case MT_FIGHTER_BOSS:
+                P_SetMobjState(target, S_FIGHTER_ICE);
+                return;
+            case MT_CLERIC_BOSS:
+                P_SetMobjState(target, S_CLERIC_ICE);
+                return;
+            case MT_MAGE_BOSS:
+                P_SetMobjState(target, S_MAGE_ICE);
+                return;
+            case MT_PIG:
+                P_SetMobjState(target, S_PIG_ICE);
+                return;
+            default:
+                target->flags &= ~MF_ICECORPSE;
+                break;
+        }
+    }
+
+    if (target->type == MT_MINOTAUR)
+    {
+        master = target->special1.m;
+        if (master->health > 0)
+        {
+            if (!ActiveMinotaur(master->player))
+            {
+                master->player->powers[pw_minotaur] = 0;
+            }
+        }
+    }
+    else if (target->type == MT_TREEDESTRUCTIBLE)
+    {
+        target->height = 24 * FRACUNIT;
+    }
+    if (target->health < -(target->info->spawnhealth >> 1)
+        && target->info->xdeathstate)
+    {                           // Extreme death
+        P_SetMobjState(target, target->info->xdeathstate);
+    }
+    else
+    {                           // Normal death
+        if ((target->type == MT_FIREDEMON) &&
+            (target->z <= target->floorz + 2 * FRACUNIT) &&
+            (target->info->xdeathstate))
+        {
+            // This is to fix the imps' staying in fall state
+            P_SetMobjState(target, target->info->xdeathstate);
+        }
+        else
+        {
+            P_SetMobjState(target, target->info->deathstate);
+        }
+    }
+    target->tics -= P_Random() & 3;
+//      I_StartSound(&actor->r, actor->info->deathsound);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_MinotaurSlam
+//
+//---------------------------------------------------------------------------
+
+void P_MinotaurSlam(mobj_t * source, mobj_t * target)
+{
+    angle_t angle;
+    fixed_t thrust;
+
+    angle = R_PointToAngle2(source->x, source->y, target->x, target->y);
+    angle >>= ANGLETOFINESHIFT;
+    thrust = 16 * FRACUNIT + (P_Random() << 10);
+    target->momx += FixedMul(thrust, finecosine[angle]);
+    target->momy += FixedMul(thrust, finesine[angle]);
+    P_DamageMobj(target, NULL, source, HITDICE(4));
+    if (target->player)
+    {
+        target->reactiontime = 14 + (P_Random() & 7);
+    }
+    source->args[0] = 0;        // Stop charging
+}
+
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_MorphPlayer
+//
+// Returns true if the player gets turned into a pig
+//
+//---------------------------------------------------------------------------
+
+boolean P_MorphPlayer(player_t * player)
+{
+    mobj_t *pmo;
+    mobj_t *fog;
+    mobj_t *beastMo;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    angle_t angle;
+    int oldFlags2;
+
+    if (player->powers[pw_invulnerability])
+    {                           // Immune when invulnerable
+        return (false);
+    }
+    if (player->morphTics)
+    {                           // Player is already a beast
+        return false;
+    }
+    pmo = player->mo;
+    x = pmo->x;
+    y = pmo->y;
+    z = pmo->z;
+    angle = pmo->angle;
+    oldFlags2 = pmo->flags2;
+    P_SetMobjState(pmo, S_FREETARGMOBJ);
+    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, SFX_TELEPORT);
+    beastMo = P_SpawnMobj(x, y, z, MT_PIGPLAYER);
+    beastMo->special1.i = player->readyweapon;
+    beastMo->angle = angle;
+    beastMo->player = player;
+    player->health = beastMo->health = MAXMORPHHEALTH;
+    player->mo = beastMo;
+    memset(&player->armorpoints[0], 0, NUMARMOR * sizeof(int));
+    player->class = PCLASS_PIG;
+    if (oldFlags2 & MF2_FLY)
+    {
+        beastMo->flags2 |= MF2_FLY;
+    }
+    player->morphTics = MORPHTICS;
+    P_ActivateMorphWeapon(player);
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_MorphMonster
+//
+//---------------------------------------------------------------------------
+
+boolean P_MorphMonster(mobj_t * actor)
+{
+    mobj_t *master, *monster, *fog;
+    mobjtype_t moType;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    mobj_t oldMonster;
+
+    if (actor->player)
+        return (false);
+    if (!(actor->flags & MF_COUNTKILL))
+        return false;
+    if (actor->flags2 & MF2_BOSS)
+        return false;
+    moType = actor->type;
+    switch (moType)
+    {
+        case MT_PIG:
+            return (false);
+        case MT_FIGHTER_BOSS:
+        case MT_CLERIC_BOSS:
+        case MT_MAGE_BOSS:
+            return (false);
+        default:
+            break;
+    }
+
+    oldMonster = *actor;
+    x = oldMonster.x;
+    y = oldMonster.y;
+    z = oldMonster.z;
+    P_RemoveMobjFromTIDList(actor);
+    P_SetMobjState(actor, S_FREETARGMOBJ);
+    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, SFX_TELEPORT);
+    monster = P_SpawnMobj(x, y, z, MT_PIG);
+    monster->special2.i = moType;
+    monster->special1.i = MORPHTICS + P_Random();
+    monster->flags |= (oldMonster.flags & MF_SHADOW);
+    monster->target = oldMonster.target;
+    monster->angle = oldMonster.angle;
+    monster->tid = oldMonster.tid;
+    monster->special = oldMonster.special;
+    P_InsertMobjIntoTIDList(monster, oldMonster.tid);
+    memcpy(monster->args, oldMonster.args, 5);
+
+    // check for turning off minotaur power for active icon
+    if (moType == MT_MINOTAUR)
+    {
+        master = oldMonster.special1.m;
+        if (master->health > 0)
+        {
+            if (!ActiveMinotaur(master->player))
+            {
+                master->player->powers[pw_minotaur] = 0;
+            }
+        }
+    }
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_AutoUseHealth
+//
+//---------------------------------------------------------------------------
+
+void P_AutoUseHealth(player_t * player, int saveHealth)
+{
+    int i;
+    int count;
+    int normalCount;
+    int normalSlot = 0;
+    int superCount;
+    int superSlot = 0;
+
+    normalCount = superCount = 0;
+    for (i = 0; i < player->inventorySlotNum; i++)
+    {
+        if (player->inventory[i].type == arti_health)
+        {
+            normalSlot = i;
+            normalCount = player->inventory[i].count;
+        }
+        else if (player->inventory[i].type == arti_superhealth)
+        {
+            superSlot = i;
+            superCount = player->inventory[i].count;
+        }
+    }
+    if ((gameskill == sk_baby) && (normalCount * 25 >= saveHealth))
+    {                           // Use quartz flasks
+        count = (saveHealth + 24) / 25;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 25;
+            P_PlayerRemoveArtifact(player, normalSlot);
+        }
+    }
+    else if (superCount * 100 >= saveHealth)
+    {                           // Use mystic urns
+        count = (saveHealth + 99) / 100;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 100;
+            P_PlayerRemoveArtifact(player, superSlot);
+        }
+    }
+    else if ((gameskill == sk_baby)
+             && (superCount * 100 + normalCount * 25 >= saveHealth))
+    {                           // Use mystic urns and quartz flasks
+        count = (saveHealth + 24) / 25;
+        saveHealth -= count * 25;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 25;
+            P_PlayerRemoveArtifact(player, normalSlot);
+        }
+        count = (saveHealth + 99) / 100;
+        for (i = 0; i < count; i++)
+        {
+            player->health += 100;
+            P_PlayerRemoveArtifact(player, normalSlot);
+        }
+    }
+    player->mo->health = player->health;
+}
+
+/*
+=================
+=
+= P_DamageMobj
+=
+= Damages both enemies and players
+= inflictor is the thing that caused the damage
+= 		creature or missile, can be NULL (slime, etc)
+= source is the thing to target after taking damage
+=		creature or NULL
+= Source and inflictor are the same for melee attacks
+= source can be null for barrel explosions and other environmental stuff
+==================
+*/
+
+void P_DamageMobj
+    (mobj_t * target, mobj_t * inflictor, mobj_t * source, int damage)
+{
+    unsigned ang;
+    int saved;
+    fixed_t savedPercent;
+    player_t *player;
+    mobj_t *master;
+    fixed_t thrust;
+    int temp;
+    int i;
+
+    if (!(target->flags & MF_SHOOTABLE))
+    {
+        // Shouldn't happen
+        return;
+    }
+    if (target->health <= 0)
+    {
+        if (inflictor && inflictor->flags2 & MF2_ICEDAMAGE)
+        {
+            return;
+        }
+        else if (target->flags & MF_ICECORPSE)  // frozen
+        {
+            target->tics = 1;
+            target->momx = target->momy = 0;
+        }
+        return;
+    }
+    if ((target->flags2 & MF2_INVULNERABLE) && damage < 10000)
+    {                           // mobj is invulnerable
+        if (target->player)
+            return;             // for player, no exceptions
+        if (inflictor)
+        {
+            switch (inflictor->type)
+            {
+                    // These inflictors aren't foiled by invulnerability
+                case MT_HOLY_FX:
+                case MT_POISONCLOUD:
+                case MT_FIREBOMB:
+                    break;
+                default:
+                    return;
+            }
+        }
+        else
+        {
+            return;
+        }
+    }
+    if (target->player)
+    {
+        if (damage < 1000 && ((target->player->cheats & CF_GODMODE)
+                              || target->player->powers[pw_invulnerability]))
+        {
+            return;
+        }
+    }
+    if (target->flags & MF_SKULLFLY)
+    {
+        target->momx = target->momy = target->momz = 0;
+    }
+    if (target->flags2 & MF2_DORMANT)
+    {
+        // Invulnerable, and won't wake up
+        return;
+    }
+    player = target->player;
+    if (player && gameskill == sk_baby)
+    {
+        // Take half damage in trainer mode
+        damage >>= 1;
+    }
+    // Special damage types
+    if (inflictor)
+    {
+        switch (inflictor->type)
+        {
+            case MT_EGGFX:
+                if (player)
+                {
+                    P_MorphPlayer(player);
+                }
+                else
+                {
+                    P_MorphMonster(target);
+                }
+                return;         // Always return
+            case MT_TELOTHER_FX1:
+            case MT_TELOTHER_FX2:
+            case MT_TELOTHER_FX3:
+            case MT_TELOTHER_FX4:
+            case MT_TELOTHER_FX5:
+                if ((target->flags & MF_COUNTKILL) &&
+                    (target->type != MT_SERPENT) &&
+                    (target->type != MT_SERPENTLEADER) &&
+                    (!(target->flags2 & MF2_BOSS)))
+                {
+                    P_TeleportOther(target);
+                }
+                return;
+            case MT_MINOTAUR:
+                if (inflictor->flags & MF_SKULLFLY)
+                {               // Slam only when in charge mode
+                    P_MinotaurSlam(inflictor, target);
+                    return;
+                }
+                break;
+            case MT_BISH_FX:
+                // Bishops are just too nasty
+                damage >>= 1;
+                break;
+            case MT_SHARDFX1:
+                switch (inflictor->special2.i)
+                {
+                    case 3:
+                        damage <<= 3;
+                        break;
+                    case 2:
+                        damage <<= 2;
+                        break;
+                    case 1:
+                        damage <<= 1;
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            case MT_CSTAFF_MISSILE:
+                // Cleric Serpent Staff does poison damage
+                if (target->player)
+                {
+                    P_PoisonPlayer(target->player, source, 20);
+                    damage >>= 1;
+                }
+                break;
+            case MT_ICEGUY_FX2:
+                damage >>= 1;
+                break;
+            case MT_POISONDART:
+                if (target->player)
+                {
+                    P_PoisonPlayer(target->player, source, 20);
+                    damage >>= 1;
+                }
+                break;
+            case MT_POISONCLOUD:
+                if (target->player)
+                {
+                    if (target->player->poisoncount < 4)
+                    {
+                        P_PoisonDamage(target->player, source, 15 + (P_Random() & 15), false);  // Don't play painsound
+                        P_PoisonPlayer(target->player, source, 50);
+                        S_StartSound(target, SFX_PLAYER_POISONCOUGH);
+                    }
+                    return;
+                }
+                else if (!(target->flags & MF_COUNTKILL))
+                {               // only damage monsters/players with the poison cloud
+                    return;
+                }
+                break;
+            case MT_FSWORD_MISSILE:
+                if (target->player)
+                {
+                    damage -= damage >> 2;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    // Push the target unless source is using the gauntlets
+    if (inflictor && (!source || !source->player)
+        && !(inflictor->flags2 & MF2_NODMGTHRUST))
+    {
+        ang = R_PointToAngle2(inflictor->x, inflictor->y,
+                              target->x, target->y);
+        //thrust = damage*(FRACUNIT>>3)*100/target->info->mass;
+        thrust = damage * (FRACUNIT >> 3) * 150 / target->info->mass;
+        // make fall forwards sometimes
+        if ((damage < 40) && (damage > target->health)
+            && (target->z - inflictor->z > 64 * FRACUNIT) && (P_Random() & 1))
+        {
+            ang += ANG180;
+            thrust *= 4;
+        }
+        ang >>= ANGLETOFINESHIFT;
+        target->momx += FixedMul(thrust, finecosine[ang]);
+        target->momy += FixedMul(thrust, finesine[ang]);
+    }
+
+    //
+    // player specific
+    //
+    if (player)
+    {
+        savedPercent = AutoArmorSave[player->class]
+            + player->armorpoints[ARMOR_ARMOR] +
+            player->armorpoints[ARMOR_SHIELD] +
+            player->armorpoints[ARMOR_HELMET] +
+            player->armorpoints[ARMOR_AMULET];
+        if (savedPercent)
+        {                       // armor absorbed some damage
+            if (savedPercent > 100 * FRACUNIT)
+            {
+                savedPercent = 100 * FRACUNIT;
+            }
+            for (i = 0; i < NUMARMOR; i++)
+            {
+                if (player->armorpoints[i])
+                {
+                    player->armorpoints[i] -=
+                        FixedDiv(FixedMul(damage << FRACBITS,
+                                          ArmorIncrement[player->class][i]),
+                                 300 * FRACUNIT);
+                    if (player->armorpoints[i] < 2 * FRACUNIT)
+                    {
+                        player->armorpoints[i] = 0;
+                    }
+                }
+            }
+            saved = FixedDiv(FixedMul(damage << FRACBITS, savedPercent),
+                             100 * FRACUNIT);
+            if (saved > savedPercent * 2)
+            {
+                saved = savedPercent * 2;
+            }
+            damage -= saved >> FRACBITS;
+        }
+        if (damage >= player->health
+            && ((gameskill == sk_baby) || deathmatch) && !player->morphTics)
+        {                       // Try to use some inventory health
+            P_AutoUseHealth(player, damage - player->health + 1);
+        }
+        player->health -= damage;       // mirror mobj health here for Dave
+        if (player->health < 0)
+        {
+            player->health = 0;
+        }
+        player->attacker = source;
+        player->damagecount += damage;  // add damage after armor / invuln
+        if (player->damagecount > 100)
+        {
+            player->damagecount = 100;  // teleport stomp does 10k points...
+        }
+        temp = damage < 100 ? damage : 100;
+        if (player == &players[consoleplayer])
+        {
+            I_Tactile(40, 10, 40 + temp * 2);
+            SB_PaletteFlash(false);
+        }
+    }
+
+    //
+    // do the damage
+    //
+    target->health -= damage;
+    if (target->health <= 0)
+    {                           // Death
+        if (inflictor)
+        {                       // check for special fire damage or ice damage deaths
+            if (inflictor->flags2 & MF2_FIREDAMAGE)
+            {
+                if (player && !player->morphTics)
+                {               // Check for flame death
+                    if (target->health > -50 && damage > 25)
+                    {
+                        target->flags2 |= MF2_FIREDAMAGE;
+                    }
+                }
+                else
+                {
+                    target->flags2 |= MF2_FIREDAMAGE;
+                }
+            }
+            else if (inflictor->flags2 & MF2_ICEDAMAGE)
+            {
+                target->flags2 |= MF2_ICEDAMAGE;
+            }
+        }
+        if (source && (source->type == MT_MINOTAUR))
+        {                       // Minotaur's kills go to his master
+            master = source->special1.m;
+            // Make sure still alive and not a pointer to fighter head
+            if (master->player && (master->player->mo == master))
+            {
+                source = master;
+            }
+        }
+        if (source && (source->player) &&
+            (source->player->readyweapon == WP_FOURTH))
+        {
+            // Always extreme death from fourth weapon
+            target->health = -5000;
+        }
+        P_KillMobj(source, target);
+        return;
+    }
+    if ((P_Random() < target->info->painchance)
+        && !(target->flags & MF_SKULLFLY))
+    {
+        if (inflictor && (inflictor->type >= MT_LIGHTNING_FLOOR
+                          && inflictor->type <= MT_LIGHTNING_ZAP))
+        {
+            if (P_Random() < 96)
+            {
+                target->flags |= MF_JUSTHIT;    // fight back!
+                P_SetMobjState(target, target->info->painstate);
+            }
+            else
+            {                   // "electrocute" the target
+                target->frame |= FF_FULLBRIGHT;
+                if (target->flags & MF_COUNTKILL && P_Random() < 128
+                    && !S_GetSoundPlayingInfo(target, SFX_PUPPYBEAT))
+                {
+                    if ((target->type == MT_CENTAUR) ||
+                        (target->type == MT_CENTAURLEADER) ||
+                        (target->type == MT_ETTIN))
+                    {
+                        S_StartSound(target, SFX_PUPPYBEAT);
+                    }
+                }
+            }
+        }
+        else
+        {
+            target->flags |= MF_JUSTHIT;        // fight back!
+            P_SetMobjState(target, target->info->painstate);
+            if (inflictor && inflictor->type == MT_POISONCLOUD)
+            {
+                if (target->flags & MF_COUNTKILL && P_Random() < 128
+                    && !S_GetSoundPlayingInfo(target, SFX_PUPPYBEAT))
+                {
+                    if ((target->type == MT_CENTAUR) ||
+                        (target->type == MT_CENTAURLEADER) ||
+                        (target->type == MT_ETTIN))
+                    {
+                        S_StartSound(target, SFX_PUPPYBEAT);
+                    }
+                }
+            }
+        }
+    }
+    target->reactiontime = 0;   // we're awake now...
+    if (!target->threshold && source && !(source->flags2 & MF2_BOSS)
+        && !(target->type == MT_BISHOP) && !(target->type == MT_MINOTAUR))
+    {
+        // Target actor is not intent on another actor,
+        // so make him chase after source
+        if ((target->type == MT_CENTAUR && source->type == MT_CENTAURLEADER)
+            || (target->type == MT_CENTAURLEADER
+                && source->type == MT_CENTAUR))
+        {
+            return;
+        }
+        target->target = source;
+        target->threshold = BASETHRESHOLD;
+        if (target->state == &states[target->info->spawnstate]
+            && target->info->seestate != S_NULL)
+        {
+            P_SetMobjState(target, target->info->seestate);
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_FallingDamage
+//
+//==========================================================================
+
+void P_FallingDamage(player_t * player)
+{
+    int damage;
+    int mom;
+    int dist;
+
+    mom = abs(player->mo->momz);
+    dist = FixedMul(mom, 16 * FRACUNIT / 23);
+
+    if (mom >= 63 * FRACUNIT)
+    {                           // automatic death
+        P_DamageMobj(player->mo, NULL, NULL, 10000);
+        return;
+    }
+    damage = ((FixedMul(dist, dist) / 10) >> FRACBITS) - 24;
+    if (player->mo->momz > -39 * FRACUNIT && damage > player->mo->health
+        && player->mo->health != 1)
+    {                           // No-death threshold
+        damage = player->mo->health - 1;
+    }
+    S_StartSound(player->mo, SFX_PLAYER_LAND);
+    P_DamageMobj(player->mo, NULL, NULL, damage);
+}
+
+//==========================================================================
+//
+// P_PoisonPlayer - Sets up all data concerning poisoning
+//
+//==========================================================================
+
+void P_PoisonPlayer(player_t * player, mobj_t * poisoner, int poison)
+{
+    if ((player->cheats & CF_GODMODE) || player->powers[pw_invulnerability])
+    {
+        return;
+    }
+    player->poisoncount += poison;
+    player->poisoner = poisoner;
+    if (player->poisoncount > 100)
+    {
+        player->poisoncount = 100;
+    }
+}
+
+//==========================================================================
+//
+// P_PoisonDamage - Similar to P_DamageMobj
+//
+//==========================================================================
+
+void P_PoisonDamage(player_t * player, mobj_t * source, int damage,
+                    boolean playPainSound)
+{
+    mobj_t *target;
+    mobj_t *inflictor;
+
+    target = player->mo;
+    inflictor = source;
+    if (target->health <= 0)
+    {
+        return;
+    }
+    if (target->flags2 & MF2_INVULNERABLE && damage < 10000)
+    {                           // mobj is invulnerable
+        return;
+    }
+    if (gameskill == sk_baby)
+    {
+        // Take half damage in trainer mode
+        damage >>= 1;
+    }
+    if (damage < 1000 && ((player->cheats & CF_GODMODE)
+                          || player->powers[pw_invulnerability]))
+    {
+        return;
+    }
+    if (damage >= player->health
+        && ((gameskill == sk_baby) || deathmatch) && !player->morphTics)
+    {                           // Try to use some inventory health
+        P_AutoUseHealth(player, damage - player->health + 1);
+    }
+    player->health -= damage;   // mirror mobj health here for Dave
+    if (player->health < 0)
+    {
+        player->health = 0;
+    }
+    player->attacker = source;
+
+    //
+    // do the damage
+    //
+    target->health -= damage;
+    if (target->health <= 0)
+    {                           // Death
+        target->special1.i = damage;
+        if (inflictor && !player->morphTics)
+        {                       // Check for flame death
+            if ((inflictor->flags2 & MF2_FIREDAMAGE)
+                && (target->health > -50) && (damage > 25))
+            {
+                target->flags2 |= MF2_FIREDAMAGE;
+            }
+            if (inflictor->flags2 & MF2_ICEDAMAGE)
+            {
+                target->flags2 |= MF2_ICEDAMAGE;
+            }
+        }
+        P_KillMobj(source, target);
+        return;
+    }
+    if (!(leveltime & 63) && playPainSound)
+    {
+        P_SetMobjState(target, target->info->painstate);
+    }
+/*
+	if((P_Random() < target->info->painchance)
+		&& !(target->flags&MF_SKULLFLY))
+	{
+		target->flags |= MF_JUSTHIT; // fight back!
+		P_SetMobjState(target, target->info->painstate);
+	}
+*/
+}
diff --git a/games/NXDoom/src/hexen/p_lights.c b/games/NXDoom/src/hexen/p_lights.c
new file mode 100644
index 000000000..aae27212f
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_lights.c
@@ -0,0 +1,369 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "m_random.h"
+#include "p_local.h"
+
+//============================================================================
+//
+//      T_Light
+//
+//============================================================================
+
+void T_Light(thinker_t *thinker)
+{
+    light_t *light = (light_t *) thinker;
+    if (light->count)
+    {
+        light->count--;
+        return;
+    }
+    switch (light->type)
+    {
+        case LITE_FADE:
+            light->sector->lightlevel =
+                ((light->sector->lightlevel << FRACBITS) +
+                 light->value2) >> FRACBITS;
+            if (light->tics2 == 1)
+            {
+                if (light->sector->lightlevel >= light->value1)
+                {
+                    light->sector->lightlevel = light->value1;
+                    P_RemoveThinker(&light->thinker);
+                }
+            }
+            else if (light->sector->lightlevel <= light->value1)
+            {
+                light->sector->lightlevel = light->value1;
+                P_RemoveThinker(&light->thinker);
+            }
+            break;
+        case LITE_GLOW:
+            light->sector->lightlevel =
+                ((light->sector->lightlevel << FRACBITS) +
+                 light->tics1) >> FRACBITS;
+            if (light->tics2 == 1)
+            {
+                if (light->sector->lightlevel >= light->value1)
+                {
+                    light->sector->lightlevel = light->value1;
+                    light->tics1 = -light->tics1;
+                    light->tics2 = -1;  // reverse direction
+                }
+            }
+            else if (light->sector->lightlevel <= light->value2)
+            {
+                light->sector->lightlevel = light->value2;
+                light->tics1 = -light->tics1;
+                light->tics2 = 1;       // reverse direction
+            }
+            break;
+        case LITE_FLICKER:
+            if (light->sector->lightlevel == light->value1)
+            {
+                light->sector->lightlevel = light->value2;
+                light->count = (P_Random() & 7) + 1;
+            }
+            else
+            {
+                light->sector->lightlevel = light->value1;
+                light->count = (P_Random() & 31) + 1;
+            }
+            break;
+        case LITE_STROBE:
+            if (light->sector->lightlevel == light->value1)
+            {
+                light->sector->lightlevel = light->value2;
+                light->count = light->tics2;
+            }
+            else
+            {
+                light->sector->lightlevel = light->value1;
+                light->count = light->tics1;
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+//============================================================================
+//
+//      EV_SpawnLight
+//
+//============================================================================
+
+boolean EV_SpawnLight(line_t * line, byte * arg, lighttype_t type)
+{
+    light_t *light;
+    sector_t *sec;
+    int secNum;
+    int arg1, arg2, arg3, arg4;
+    boolean think;
+    boolean rtn;
+
+    /*
+    Original code; redundant considering that a byte value is always
+    in the range 0-255:
+
+    arg1 = arg[1] > 255 ? 255 : arg[1];
+    arg1 = arg1 < 0 ? 0 : arg1;
+    arg2 = arg[2] > 255 ? 255 : arg[2];
+    arg2 = arg2 < 0 ? 0 : arg2;
+    arg3 = arg[3] > 255 ? 255 : arg[3];
+    arg3 = arg3 < 0 ? 0 : arg3;
+    arg4 = arg[4] > 255 ? 255 : arg[4];
+    arg4 = arg4 < 0 ? 0 : arg4;
+    */
+
+    arg1 = arg[1];
+    arg2 = arg[2];
+    arg3 = arg[3];
+    arg4 = arg[4];
+
+    secNum = -1;
+    rtn = false;
+    while ((secNum = P_FindSectorFromTag(arg[0], secNum)) >= 0)
+    {
+        think = false;
+        sec = &sectors[secNum];
+
+        light = (light_t *) Z_Malloc(sizeof(light_t), PU_LEVSPEC, 0);
+        light->type = type;
+        light->sector = sec;
+        light->count = 0;
+        rtn = true;
+        switch (type)
+        {
+            case LITE_RAISEBYVALUE:
+                sec->lightlevel += arg1;
+                if (sec->lightlevel > 255)
+                {
+                    sec->lightlevel = 255;
+                }
+                break;
+            case LITE_LOWERBYVALUE:
+                sec->lightlevel -= arg1;
+                if (sec->lightlevel < 0)
+                {
+                    sec->lightlevel = 0;
+                }
+                break;
+            case LITE_CHANGETOVALUE:
+                sec->lightlevel = arg1;
+                if (sec->lightlevel < 0)
+                {
+                    sec->lightlevel = 0;
+                }
+                else if (sec->lightlevel > 255)
+                {
+                    sec->lightlevel = 255;
+                }
+                break;
+            case LITE_FADE:
+                think = true;
+                light->value1 = arg1;   // destination lightlevel
+                light->value2 = FixedDiv((arg1 - sec->lightlevel) << FRACBITS, arg2 << FRACBITS);       // delta lightlevel
+                if (sec->lightlevel <= arg1)
+                {
+                    light->tics2 = 1;   // get brighter
+                }
+                else
+                {
+                    light->tics2 = -1;
+                }
+                break;
+            case LITE_GLOW:
+                think = true;
+                light->value1 = arg1;   // upper lightlevel
+                light->value2 = arg2;   // lower lightlevel
+                light->tics1 = FixedDiv((arg1 - sec->lightlevel) << FRACBITS, arg3 << FRACBITS);        // lightlevel delta
+                if (sec->lightlevel <= arg1)
+                {
+                    light->tics2 = 1;   // get brighter
+                }
+                else
+                {
+                    light->tics2 = -1;
+                }
+                break;
+            case LITE_FLICKER:
+                think = true;
+                light->value1 = arg1;   // upper lightlevel
+                light->value2 = arg2;   // lower lightlevel
+                sec->lightlevel = light->value1;
+                light->count = (P_Random() & 64) + 1;
+                break;
+            case LITE_STROBE:
+                think = true;
+                light->value1 = arg1;   // upper lightlevel
+                light->value2 = arg2;   // lower lightlevel
+                light->tics1 = arg3;    // upper tics
+                light->tics2 = arg4;    // lower tics
+                light->count = arg3;
+                sec->lightlevel = light->value1;
+                break;
+            default:
+                rtn = false;
+                break;
+        }
+        if (think)
+        {
+            P_AddThinker(&light->thinker);
+            light->thinker.function = T_Light;
+        }
+        else
+        {
+            Z_Free(light);
+        }
+    }
+    return rtn;
+}
+
+//============================================================================
+//
+//      T_Phase
+//
+//============================================================================
+
+int PhaseTable[64] = {
+    128, 112, 96, 80, 64, 48, 32, 32,
+    16, 16, 16, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 16, 16, 16,
+    32, 32, 48, 64, 80, 96, 112, 128
+};
+
+void T_Phase(thinker_t *thinker)
+{
+    phase_t *phase = (phase_t *) thinker;
+    phase->index = (phase->index + 1) & 63;
+    phase->sector->lightlevel = phase->base + PhaseTable[phase->index];
+}
+
+//==========================================================================
+//
+// P_SpawnPhasedLight
+//
+//==========================================================================
+
+void P_SpawnPhasedLight(sector_t * sector, int base, int index)
+{
+    phase_t *phase;
+
+    phase = Z_Malloc(sizeof(*phase), PU_LEVSPEC, 0);
+    P_AddThinker(&phase->thinker);
+    phase->sector = sector;
+    if (index == -1)
+    {                           // sector->lightlevel as the index
+        phase->index = sector->lightlevel & 63;
+    }
+    else
+    {
+        phase->index = index & 63;
+    }
+    phase->base = base & 255;
+    sector->lightlevel = phase->base + PhaseTable[phase->index];
+    phase->thinker.function = T_Phase;
+
+    sector->special = 0;
+}
+
+//==========================================================================
+//
+// P_SpawnLightSequence
+//
+//==========================================================================
+
+void P_SpawnLightSequence(sector_t * sector, int indexStep)
+{
+    sector_t *sec;
+    sector_t *nextSec;
+    sector_t *tempSec;
+    int seqSpecial;
+    int i;
+    int count;
+    fixed_t index;
+    fixed_t indexDelta;
+    int base;
+
+    seqSpecial = LIGHT_SEQUENCE;        // look for Light_Sequence, first
+    sec = sector;
+    count = 1;
+    do
+    {
+        nextSec = NULL;
+        sec->special = LIGHT_SEQUENCE_START;    // make sure that the search doesn't back up.
+        for (i = 0; i < sec->linecount; i++)
+        {
+            tempSec = getNextSector(sec->lines[i], sec);
+            if (!tempSec)
+            {
+                continue;
+            }
+            if (tempSec->special == seqSpecial)
+            {
+                if (seqSpecial == LIGHT_SEQUENCE)
+                {
+                    seqSpecial = LIGHT_SEQUENCE_ALT;
+                }
+                else
+                {
+                    seqSpecial = LIGHT_SEQUENCE;
+                }
+                nextSec = tempSec;
+                count++;
+            }
+        }
+        sec = nextSec;
+    }
+    while (sec);
+
+    sec = sector;
+    count *= indexStep;
+    index = 0;
+    indexDelta = FixedDiv(64 * FRACUNIT, count * FRACUNIT);
+    base = sector->lightlevel;
+    do
+    {
+        nextSec = NULL;
+        if (sec->lightlevel)
+        {
+            base = sec->lightlevel;
+        }
+        P_SpawnPhasedLight(sec, base, index >> FRACBITS);
+        index += indexDelta;
+        for (i = 0; i < sec->linecount; i++)
+        {
+            tempSec = getNextSector(sec->lines[i], sec);
+            if (!tempSec)
+            {
+                continue;
+            }
+            if (tempSec->special == LIGHT_SEQUENCE_START)
+            {
+                nextSec = tempSec;
+            }
+        }
+        sec = nextSec;
+    }
+    while (sec);
+}
diff --git a/games/NXDoom/src/hexen/p_local.h b/games/NXDoom/src/hexen/p_local.h
new file mode 100644
index 000000000..9bd92dd96
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_local.h
@@ -0,0 +1,429 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __P_LOCAL__
+#define __P_LOCAL__
+
+#ifndef __R_LOCAL__
+#include "r_local.h"
+#endif
+
+#define STARTREDPALS    1
+#define STARTBONUSPALS  9
+#define STARTPOISONPALS 13
+#define STARTICEPAL		21
+#define STARTHOLYPAL	22
+#define STARTSCOURGEPAL 25
+#define NUMREDPALS      8
+#define NUMBONUSPALS    4
+#define NUMPOISONPALS	8
+
+#define TOCENTER -8
+#define FLOATSPEED (FRACUNIT*4)
+
+#define MAXHEALTH 100
+#define MAXMORPHHEALTH 30
+#define VIEWHEIGHT (48*FRACUNIT)
+
+// mapblocks are used to check movement against lines and things
+#define MAPBLOCKUNITS   128
+#define MAPBLOCKSIZE    (MAPBLOCKUNITS*FRACUNIT)
+#define MAPBLOCKSHIFT   (FRACBITS+7)
+#define MAPBMASK                (MAPBLOCKSIZE-1)
+#define MAPBTOFRAC              (MAPBLOCKSHIFT-FRACBITS)
+
+// player radius for movement checking
+#define PLAYERRADIUS 16*FRACUNIT
+
+// MAXRADIUS is for precalculated sector block boxes
+// the spider demon is larger, but we don't have any moving sectors
+// nearby
+#define MAXRADIUS 32*FRACUNIT
+
+#define GRAVITY FRACUNIT
+#define MAXMOVE (30*FRACUNIT)
+
+#define USERANGE (64*FRACUNIT)
+#define MELEERANGE (64*FRACUNIT)
+#define MISSILERANGE (32*64*FRACUNIT)
+
+typedef enum
+{
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+} dirtype_t;
+
+#define BASETHRESHOLD 100       // follow a player exlusively for 3 seconds
+
+// ***** P_TICK *****
+
+extern thinker_t thinkercap;    // both the head and tail of the thinker list
+extern int TimerGame;           // tic countdown for deathmatch
+
+void P_InitThinkers(void);
+void P_AddThinker(thinker_t * thinker);
+void P_RemoveThinker(thinker_t * thinker);
+
+// ***** P_PSPR *****
+
+#define USE_MANA1	1
+#define USE_MANA2	1
+
+void P_SetPsprite(player_t * player, int position, statenum_t stnum);
+void P_SetPspriteNF(player_t * player, int position, statenum_t stnum);
+void P_SetupPsprites(player_t * curplayer);
+void P_MovePsprites(player_t * curplayer);
+void P_DropWeapon(player_t * player);
+void P_ActivateMorphWeapon(player_t * player);
+void P_PostMorphWeapon(player_t * player, weapontype_t weapon);
+
+// ***** P_USER *****
+
+
+extern int ArmorMax[NUMCLASSES];
+extern int PStateNormal[NUMCLASSES];
+extern int PStateRun[NUMCLASSES];
+extern int PStateAttack[NUMCLASSES];
+extern int PStateAttackEnd[NUMCLASSES];
+
+void P_PlayerThink(player_t * player);
+void P_Thrust(player_t * player, angle_t angle, fixed_t move);
+void P_PlayerNextArtifact(player_t *player);
+void P_PlayerRemoveArtifact(player_t * player, int slot);
+void P_PlayerUseArtifact(player_t * player, artitype_t arti);
+boolean P_UseArtifact(player_t * player, artitype_t arti);
+int P_GetPlayerNum(player_t * player);
+void P_TeleportOther(mobj_t * victim);
+void ResetBlasted(mobj_t * mo);
+boolean P_UndoPlayerMorph(player_t *player);
+
+
+// ***** P_MOBJ *****
+
+// Any floor type >= FLOOR_LIQUID will floorclip sprites
+enum
+{
+    FLOOR_SOLID,
+    FLOOR_ICE,
+    FLOOR_LIQUID,
+    FLOOR_WATER,
+    FLOOR_LAVA,
+    FLOOR_SLUDGE
+};
+
+#define ONFLOORZ INT_MIN
+#define ONCEILINGZ INT_MAX
+#define FLOATRANDZ (INT_MAX-1)
+#define FROMCEILINGZ128 (INT_MAX-2)
+
+extern mobjtype_t PuffType;
+extern mobj_t *MissileMobj;
+
+extern fixed_t FloatBobOffsets[64];
+
+
+mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
+void P_RemoveMobj(mobj_t * th);
+boolean P_SetMobjState(mobj_t * mobj, statenum_t state);
+boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state);
+void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move);
+int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta);
+boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax);
+void P_MobjThinker(thinker_t *thinker);
+void P_DegenMobjThinker(thinker_t *thinker);
+void P_BlasterMobjThinker(thinker_t *thinker);
+void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z);
+void P_SpawnBlood(fixed_t x, fixed_t y, fixed_t z, int damage);
+void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator);
+void P_BloodSplatter2(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator);
+void P_RipperBlood(mobj_t * mo);
+int P_GetThingFloorType(mobj_t * thing);
+int P_HitFloor(mobj_t * thing);
+boolean P_CheckMissileSpawn(mobj_t * missile);
+mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type);
+mobj_t *P_SpawnMissileXYZ(fixed_t x, fixed_t y, fixed_t z,
+                          mobj_t * source, mobj_t * dest, mobjtype_t type);
+mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
+                            angle_t angle, fixed_t momz);
+mobj_t *P_SpawnMissileAngleSpeed(mobj_t * source, mobjtype_t type,
+                                 angle_t angle, fixed_t momz, fixed_t speed);
+mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type);
+mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle);
+mobj_t *P_SPMAngleXYZ(mobj_t * source, fixed_t x, fixed_t y,
+                      fixed_t z, mobjtype_t type, angle_t angle);
+void P_CreateTIDList(void);
+void P_RemoveMobjFromTIDList(mobj_t * mobj);
+void P_InsertMobjIntoTIDList(mobj_t * mobj, int tid);
+mobj_t *P_FindMobjFromTID(int tid, int *searchPosition);
+void P_ExplodeMissile(mobj_t *mo);
+mobj_t *P_SpawnKoraxMissile(fixed_t x, fixed_t y, fixed_t z,
+                            mobj_t * source, mobj_t * dest, mobjtype_t type);
+
+// ***** P_ENEMY *****
+
+void P_NoiseAlert(mobj_t * target, mobj_t * emmiter);
+int P_Massacre(void);
+boolean A_RaiseMobj(mobj_t * actor);
+boolean A_SinkMobj(mobj_t * actor);
+void A_NoBlocking(mobj_t *actor, player_t *player, pspdef_t *psp);
+boolean P_LookForMonsters(mobj_t * actor);
+void P_InitCreatureCorpseQueue(boolean corpseScan);
+void A_DeQueueCorpse(mobj_t * actor);
+void A_Explode(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CHolyAttack3(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FSwordAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MStaffAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_FreezeDeathChunks(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcBallOrbit(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcSpinBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SpeedBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SlowBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_StopBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_AccelBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_DecelBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcBossAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SpawnFizzle(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_CastSorcererSpell(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcUpdateBallAngle(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_BounceCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcFX1Seek(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcOffense1(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_SorcOffense2(mobj_t *actor, player_t *player, pspdef_t *psp);
+void A_MinotaurLook(mobj_t *actor, player_t *player, pspdef_t *psp);
+
+
+// ***** P_MAPUTL *****
+
+typedef struct
+{
+    fixed_t x, y, dx, dy;
+} divline_t;
+
+typedef struct
+{
+    fixed_t frac;               // along trace line
+    boolean isaline;
+    union
+    {
+        mobj_t *thing;
+        line_t *line;
+    } d;
+} intercept_t;
+
+#define MAXINTERCEPTS   128
+extern intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
+typedef boolean(*traverser_t) (intercept_t * in);
+
+
+fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
+int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line);
+int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line);
+void P_MakeDivline(line_t * li, divline_t * dl);
+fixed_t P_InterceptVector(divline_t * v2, divline_t * v1);
+int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld);
+
+extern fixed_t opentop, openbottom, openrange;
+extern fixed_t lowfloor;
+void P_LineOpening(line_t * linedef);
+
+boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *));
+boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *));
+
+#define PT_ADDLINES             1
+#define PT_ADDTHINGS    2
+#define PT_EARLYOUT             4
+
+extern divline_t trace;
+boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                       int flags, boolean(*trav) (intercept_t *));
+
+void P_UnsetThingPosition(mobj_t * thing);
+void P_SetThingPosition(mobj_t * thing);
+mobj_t *P_RoughMonsterSearch(mobj_t * mo, int distance);
+
+// ***** P_MAP *****
+
+
+#define MAXSPECIALCROSS         8
+
+
+extern boolean floatok;         // if true, move would be ok if
+extern fixed_t tmfloorz, tmceilingz;    // within tmfloorz - tmceilingz
+extern int tmfloorpic;
+extern mobj_t *BlockingMobj;
+
+extern line_t *ceilingline;
+extern line_t *spechit[MAXSPECIALCROSS];
+extern int numspechit;
+
+extern fixed_t topslope, bottomslope;   // slopes to top and bottom of target
+
+
+boolean P_TestMobjLocation(mobj_t * mobj);
+boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y);
+mobj_t *P_CheckOnmobj(mobj_t * thing);
+void P_FakeZMovement(mobj_t * mo);
+boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y);
+boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y);
+void P_SlideMove(mobj_t * mo);
+void P_BounceWall(mobj_t * mo);
+boolean P_CheckSight(mobj_t * t1, mobj_t * t2);
+void P_UseLines(player_t * player);
+boolean P_UsePuzzleItem(player_t * player, int itemType);
+void PIT_ThrustSpike(mobj_t * actor);
+void P_InitSlideLine(void);
+
+boolean P_ChangeSector(sector_t * sector, int crunch);
+
+extern mobj_t *PuffSpawned;     // true if a puff was spawned
+extern mobj_t *linetarget;      // who got hit (or NULL)
+fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance);
+
+void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
+                  int damage);
+
+void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage, int distance,
+                    boolean damageSource);
+
+// ***** P_SETUP *****
+
+extern byte *rejectmatrix;      // for fast sight rejection
+extern short *blockmaplump;     // offsets in blockmap are from here
+extern short *blockmap;
+extern int bmapwidth, bmapheight;       // in mapblocks
+extern fixed_t bmaporgx, bmaporgy;      // origin of block map
+extern mobj_t **blocklinks;     // for thing chains
+
+// ***** P_INTER *****
+
+extern int clipmana[NUMMANA];
+extern int ArmorIncrement[NUMCLASSES][NUMARMOR];
+extern int AutoArmorSave[NUMCLASSES];
+extern const char *TextKeyMessages[];
+
+
+void P_SetMessage(player_t * player, const char *message, boolean ultmsg);
+void P_SetYellowMessage(player_t * player, const char *message, boolean ultmsg);
+void P_ClearMessage(player_t * player);
+void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher);
+void P_DamageMobj(mobj_t * target, mobj_t * inflictor, mobj_t * source,
+                  int damage);
+void P_FallingDamage(player_t * player);
+void P_PoisonPlayer(player_t * player, mobj_t * poisoner, int poison);
+void P_PoisonDamage(player_t * player, mobj_t * source, int damage,
+                    boolean playPainSound);
+boolean P_GiveMana(player_t * player, manatype_t mana, int count);
+boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo);
+boolean P_GiveArmor(player_t * player, armortype_t armortype, int amount);
+boolean P_GiveBody(player_t * player, int num);
+boolean P_GivePower(player_t * player, powertype_t power);
+boolean P_MorphPlayer(player_t * player);
+
+// ***** AM_MAP *****
+
+boolean AM_Responder(event_t * ev);
+void AM_Ticker(void);
+void AM_Drawer(void);
+
+// ***** A_ACTION *****
+boolean A_LocalQuake(byte * args, mobj_t * victim);
+void P_SpawnDirt(mobj_t * actor, fixed_t radius);
+void A_BridgeRemove(mobj_t * actor);
+void A_UnHideThing(mobj_t *actor, player_t *player, pspdef_t *psp);
+
+
+// ***** SB_BAR *****
+
+extern int SB_state;
+extern int ArtifactFlash;
+void SB_PaletteFlash(boolean forceChange);
+
+// ===== PO_MAN =====
+
+typedef enum
+{
+    PODOOR_NONE,
+    PODOOR_SLIDE,
+    PODOOR_SWING,
+} podoortype_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    int polyobj;
+    int speed;
+    unsigned int dist;
+    int angle;
+    fixed_t xSpeed;             // for sliding walls
+    fixed_t ySpeed;
+} polyevent_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    int polyobj;
+    int speed;
+    int dist;
+    int totalDist;
+    int direction;
+    fixed_t xSpeed, ySpeed;
+    int tics;
+    int waitTics;
+    podoortype_t type;
+    boolean close;
+} polydoor_t;
+
+enum
+{
+    PO_ANCHOR_TYPE = 3000,
+    PO_SPAWN_TYPE,
+    PO_SPAWNCRUSH_TYPE
+};
+
+#define PO_LINE_START 1         // polyobj line start special
+#define PO_LINE_EXPLICIT 5
+
+extern polyobj_t *polyobjs;     // list of all poly-objects on the level
+extern int po_NumPolyobjs;
+extern polyblock_t **PolyBlockMap;
+
+
+void T_PolyDoor(thinker_t *thinker);
+void T_RotatePoly(thinker_t *thinker);
+boolean EV_RotatePoly(line_t * line, byte * args, int direction, boolean
+                      overRide);
+void T_MovePoly(thinker_t *thinker);
+boolean EV_MovePoly(line_t * line, byte * args, boolean timesEight, boolean
+                    overRide);
+boolean EV_OpenPolyDoor(line_t * line, byte * args, podoortype_t type);
+
+boolean PO_MovePolyobj(int num, int x, int y);
+boolean PO_RotatePolyobj(int num, angle_t angle);
+void PO_Init(int lump);
+boolean PO_Busy(int polyobj);
+
+#include "p_spec.h"
+
+#endif // __P_LOCAL__
diff --git a/games/NXDoom/src/hexen/p_map.c b/games/NXDoom/src/hexen/p_map.c
new file mode 100644
index 000000000..6a3886015
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_map.c
@@ -0,0 +1,2338 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "m_bbox.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+static void CheckForPushSpecial(line_t * line, int side, mobj_t * mobj);
+
+/*
+===============================================================================
+
+NOTES:
+
+
+===============================================================================
+*/
+
+/*
+===============================================================================
+
+mobj_t NOTES
+
+mobj_ts are used to tell the refresh where to draw an image, tell the world simulation when objects are contacted, and tell the sound driver how to position a sound.
+
+The refresh uses the next and prev links to follow lists of things in sectors as they are being drawn.  The sprite, frame, and angle elements determine which patch_t is used to draw the sprite if it is visible.  The sprite and frame values are allmost allways set from state_t structures.  The statescr.exe utility generates the states.h and states.c files that contain the sprite/frame numbers from the statescr.txt source file.  The xyz origin point represents a point at the bottom middle of the sprite (between the feet of a biped).  This is the default origin position for patch_ts grabbed with lumpy.exe.  A walking creature will have its z equal to the floor it is standing on.
+
+The sound code uses the x,y, and subsector fields to do stereo positioning of any sound effited by the mobj_t.
+
+The play simulation uses the blocklinks, x,y,z, radius, height to determine when mobj_ts are touching each other, touching lines in the map, or hit by trace lines (gunshots, lines of sight, etc). The mobj_t->flags element has various bit flags used by the simulation.
+
+
+Every mobj_t is linked into a single sector based on it's origin coordinates.
+The subsector_t is found with R_PointInSubsector(x,y), and the sector_t can be found with subsector->sector.  The sector links are only used by the rendering code,  the play simulation does not care about them at all.
+
+Any mobj_t that needs to be acted upon be something else in the play world (block movement, be shot, etc) will also need to be linked into the blockmap.  If the thing has the MF_NOBLOCK flag set, it will not use the block links. It can still interact with other things, but only as the instigator (missiles will run into other things, but nothing can run into a missile).   Each block in the grid is 128*128 units, and knows about every line_t that it contains a piece of, and every interactable mobj_t that has it's origin contained.
+
+A valid mobj_t is a mobj_t that has the proper subsector_t filled in for it's xy coordinates and is linked into the subsector's sector or has the MF_NOSECTOR flag set (the subsector_t needs to be valid even if MF_NOSECTOR is set), and is linked into a blockmap block or has the MF_NOBLOCKMAP flag set.  Links should only be modified by the P_[Un]SetThingPosition () functions.  Do not change the MF_NO? flags while a thing is valid.
+
+
+===============================================================================
+*/
+
+fixed_t tmbbox[4];
+mobj_t *tmthing;
+mobj_t *tsthing;
+int tmflags;
+fixed_t tmx, tmy;
+
+boolean floatok;                // if true, move would be ok if
+                                                        // within tmfloorz - tmceilingz
+
+fixed_t tmfloorz, tmceilingz, tmdropoffz;
+int tmfloorpic;
+
+// keep track of the line that lowers the ceiling, so missiles don't explode
+// against sky hack walls
+line_t *ceilingline;
+
+// keep track of special lines as they are hit, but don't process them
+// until the move is proven valid
+
+line_t *spechit[MAXSPECIALCROSS];
+int numspechit;
+
+mobj_t *onmobj;                 // generic global onmobj...used for landing on pods/players
+mobj_t *BlockingMobj;
+
+/*
+===============================================================================
+
+					TELEPORT MOVE
+
+===============================================================================
+*/
+
+/*
+==================
+=
+= PIT_StompThing
+=
+==================
+*/
+
+boolean PIT_StompThing(mobj_t * thing)
+{
+    fixed_t blockdist;
+
+    if (!(thing->flags & MF_SHOOTABLE))
+        return true;
+
+    blockdist = thing->radius + tmthing->radius;
+    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
+        return true;            // didn't hit it
+
+    if (thing == tmthing)
+        return true;            // don't clip against self
+
+    if (!(tmthing->flags2 & MF2_TELESTOMP))
+    {                           // Not allowed to stomp things
+        return (false);
+    }
+
+    P_DamageMobj(thing, tmthing, tmthing, 10000);
+
+    return true;
+}
+
+
+/*
+===================
+=
+= P_TeleportMove
+=
+===================
+*/
+
+boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y)
+{
+    int xl, xh, yl, yh, bx, by;
+    subsector_t *newsubsec;
+
+//
+// kill anything occupying the position
+//
+
+    tmthing = thing;
+    tmflags = thing->flags;
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector(x, y);
+    ceilingline = NULL;
+
+//
+// the base floor / ceiling is from the subsector that contains the
+// point.  Any contacted lines the step closer together will adjust them
+//
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+    tmfloorpic = newsubsec->sector->floorpic;
+
+    validcount++;
+    numspechit = 0;
+
+//
+// stomp on any things contacted
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockThingsIterator(bx, by, PIT_StompThing))
+                return false;
+
+//
+// the move is ok, so link the thing into its new position
+//
+    P_UnsetThingPosition(thing);
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition(thing);
+
+    return true;
+}
+
+
+boolean PIT_ThrustStompThing(mobj_t * thing)
+{
+    fixed_t blockdist;
+
+    if (!(thing->flags & MF_SHOOTABLE))
+        return true;
+
+    blockdist = thing->radius + tsthing->radius;
+    if (abs(thing->x - tsthing->x) >= blockdist ||
+        abs(thing->y - tsthing->y) >= blockdist ||
+        (thing->z > tsthing->z + tsthing->height))
+        return true;            // didn't hit it
+
+    if (thing == tsthing)
+        return true;            // don't clip against self
+
+    P_DamageMobj(thing, tsthing, tsthing, 10001);
+    tsthing->args[1] = 1;       // Mark thrust thing as bloody
+
+    return true;
+}
+
+
+
+void PIT_ThrustSpike(mobj_t * actor)
+{
+    int xl, xh, yl, yh, bx, by;
+    int x0, x2, y0, y2;
+
+    tsthing = actor;
+
+    x0 = actor->x - actor->info->radius;
+    x2 = actor->x + actor->info->radius;
+    y0 = actor->y - actor->info->radius;
+    y2 = actor->y + actor->info->radius;
+
+    xl = (x0 - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (x2 - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (y0 - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (y2 - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    // stomp on any things contacted
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            P_BlockThingsIterator(bx, by, PIT_ThrustStompThing);
+}
+
+
+
+/*
+===============================================================================
+
+					MOVEMENT ITERATOR FUNCTIONS
+
+===============================================================================
+*/
+
+/*
+==================
+=
+= PIT_CheckLine
+=
+= Adjusts tmfloorz and tmceilingz as lines are contacted
+==================
+*/
+
+boolean PIT_CheckLine(line_t * ld)
+{
+    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
+        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
+        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
+        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+    {
+        return (true);
+    }
+    if (P_BoxOnLineSide(tmbbox, ld) != -1)
+    {
+        return (true);
+    }
+
+// a line has been hit
+/*
+=
+= The moving thing's destination position will cross the given line.
+= If this should not be allowed, return false.
+= If the line is special, keep track of it to process later if the move
+=       is proven ok.  NOTE: specials are NOT sorted by order, so two special lines
+=       that are only 8 pixels apart could be crossed in either order.
+*/
+
+    if (!ld->backsector)
+    {                           // One sided line
+        if (tmthing->flags2 & MF2_BLASTED)
+        {
+            P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
+        }
+        CheckForPushSpecial(ld, 0, tmthing);
+        return (false);
+    }
+    if (!(tmthing->flags & MF_MISSILE))
+    {
+        if (ld->flags & ML_BLOCKING)
+        {                       // Explicitly blocking everything
+            if (tmthing->flags2 & MF2_BLASTED)
+            {
+                P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
+            }
+            CheckForPushSpecial(ld, 0, tmthing);
+            return (false);
+        }
+        if (!tmthing->player && ld->flags & ML_BLOCKMONSTERS)
+        {                       // Block monsters only
+            if (tmthing->flags2 & MF2_BLASTED)
+            {
+                P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
+            }
+            return (false);
+        }
+    }
+    P_LineOpening(ld);          // set openrange, opentop, openbottom
+    // adjust floor / ceiling heights
+    if (opentop < tmceilingz)
+    {
+        tmceilingz = opentop;
+        ceilingline = ld;
+    }
+    if (openbottom > tmfloorz)
+    {
+        tmfloorz = openbottom;
+    }
+    if (lowfloor < tmdropoffz)
+    {
+        tmdropoffz = lowfloor;
+    }
+    if (ld->special)
+    {                           // Contacted a special line, add it to the list
+        spechit[numspechit] = ld;
+        numspechit++;
+    }
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC PIT_CheckThing
+//
+//---------------------------------------------------------------------------
+
+boolean PIT_CheckThing(mobj_t * thing)
+{
+    fixed_t blockdist;
+    boolean solid;
+    int damage;
+
+    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
+    {                           // Can't hit thing
+        return (true);
+    }
+    blockdist = thing->radius + tmthing->radius;
+    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
+    {                           // Didn't hit thing
+        return (true);
+    }
+    if (thing == tmthing)
+    {                           // Don't clip against self
+        return (true);
+    }
+    BlockingMobj = thing;
+    if (tmthing->flags2 & MF2_PASSMOBJ)
+    {                           // check if a mobj passed over/under another object
+        if (tmthing->type == MT_BISHOP && thing->type == MT_BISHOP)
+        {                       // don't let bishops fly over other bishops
+            return false;
+        }
+        if (tmthing->z >= thing->z + thing->height
+            && !(thing->flags & MF_SPECIAL))
+        {
+            return (true);
+        }
+        else if (tmthing->z + tmthing->height < thing->z
+                 && !(thing->flags & MF_SPECIAL))
+        {                       // under thing
+            return (true);
+        }
+    }
+    // Check for skulls slamming into things
+    if (tmthing->flags & MF_SKULLFLY)
+    {
+        if (tmthing->type == MT_MINOTAUR)
+        {
+            // Slamming minotaurs shouldn't move non-creatures
+            if (!(thing->flags & MF_COUNTKILL))
+            {
+                return (false);
+            }
+        }
+        else if (tmthing->type == MT_HOLY_FX)
+        {
+            if (thing->flags & MF_SHOOTABLE && thing != tmthing->target)
+            {
+                if (netgame && !deathmatch && thing->player)
+                {               // don't attack other co-op players
+                    return true;
+                }
+                if (thing->flags2 & MF2_REFLECTIVE
+                    && (thing->player || thing->flags2 & MF2_BOSS))
+                {
+                    tmthing->special1.m = tmthing->target;
+                    tmthing->target = thing;
+                    return true;
+                }
+                if (thing->flags & MF_COUNTKILL || thing->player)
+                {
+                    tmthing->special1.m = thing;
+                }
+                if (P_Random() < 96)
+                {
+                    damage = 12;
+                    if (thing->player || thing->flags2 & MF2_BOSS)
+                    {
+                        damage = 3;
+                        // ghost burns out faster when attacking players/bosses
+                        tmthing->health -= 6;
+                    }
+                    P_DamageMobj(thing, tmthing, tmthing->target, damage);
+                    if (P_Random() < 128)
+                    {
+                        P_SpawnMobj(tmthing->x, tmthing->y, tmthing->z,
+                                    MT_HOLY_PUFF);
+                        S_StartSound(tmthing, SFX_SPIRIT_ATTACK);
+                        if (thing->flags & MF_COUNTKILL && P_Random() < 128
+                            && !S_GetSoundPlayingInfo(thing, SFX_PUPPYBEAT))
+                        {
+                            if ((thing->type == MT_CENTAUR) ||
+                                (thing->type == MT_CENTAURLEADER) ||
+                                (thing->type == MT_ETTIN))
+                            {
+                                S_StartSound(thing, SFX_PUPPYBEAT);
+                            }
+                        }
+                    }
+                }
+                if (thing->health <= 0)
+                {
+                    tmthing->special1.i = 0;
+                }
+            }
+            return true;
+        }
+        damage = ((P_Random() % 8) + 1) * tmthing->damage;
+        P_DamageMobj(thing, tmthing, tmthing, damage);
+        tmthing->flags &= ~MF_SKULLFLY;
+        tmthing->momx = tmthing->momy = tmthing->momz = 0;
+        P_SetMobjState(tmthing, tmthing->info->seestate);
+        return (false);
+    }
+    // Check for blasted thing running into another
+    if (tmthing->flags2 & MF2_BLASTED && thing->flags & MF_SHOOTABLE)
+    {
+        if (!(thing->flags2 & MF2_BOSS) && (thing->flags & MF_COUNTKILL))
+        {
+            thing->momx += tmthing->momx;
+            thing->momy += tmthing->momy;
+            if ((thing->momx + thing->momy) > 3 * FRACUNIT)
+            {
+                damage = (tmthing->info->mass / 100) + 1;
+                P_DamageMobj(thing, tmthing, tmthing, damage);
+                damage = (thing->info->mass / 100) + 1;
+                P_DamageMobj(tmthing, thing, thing, damage >> 2);
+            }
+            return (false);
+        }
+    }
+    // Check for missile
+    if (tmthing->flags & MF_MISSILE)
+    {
+        // Check for a non-shootable mobj
+        if (thing->flags2 & MF2_NONSHOOTABLE)
+        {
+            return true;
+        }
+        // Check if it went over / under
+        if (tmthing->z > thing->z + thing->height)
+        {                       // Over thing
+            return (true);
+        }
+        if (tmthing->z + tmthing->height < thing->z)
+        {                       // Under thing
+            return (true);
+        }
+        if (tmthing->flags2 & MF2_FLOORBOUNCE)
+        {
+            if (tmthing->target == thing || !(thing->flags & MF_SOLID))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        if (tmthing->type == MT_LIGHTNING_FLOOR
+            || tmthing->type == MT_LIGHTNING_CEILING)
+        {
+            if (thing->flags & MF_SHOOTABLE && thing != tmthing->target)
+            {
+                if (thing->info->mass != INT_MAX)
+                {
+                    thing->momx += tmthing->momx >> 4;
+                    thing->momy += tmthing->momy >> 4;
+                }
+                if ((!thing->player && !(thing->flags2 & MF2_BOSS))
+                    || !(leveltime & 1))
+                {
+                    if (thing->type == MT_CENTAUR
+                        || thing->type == MT_CENTAURLEADER)
+                    {           // Lightning does more damage to centaurs
+                        P_DamageMobj(thing, tmthing, tmthing->target, 9);
+                    }
+                    else
+                    {
+                        P_DamageMobj(thing, tmthing, tmthing->target, 3);
+                    }
+                    if (!(S_GetSoundPlayingInfo(tmthing,
+                                                SFX_MAGE_LIGHTNING_ZAP)))
+                    {
+                        S_StartSound(tmthing, SFX_MAGE_LIGHTNING_ZAP);
+                    }
+                    if (thing->flags & MF_COUNTKILL && P_Random() < 64
+                        && !S_GetSoundPlayingInfo(thing, SFX_PUPPYBEAT))
+                    {
+                        if ((thing->type == MT_CENTAUR) ||
+                            (thing->type == MT_CENTAURLEADER) ||
+                            (thing->type == MT_ETTIN))
+                        {
+                            S_StartSound(thing, SFX_PUPPYBEAT);
+                        }
+                    }
+                }
+                tmthing->health--;
+                if (tmthing->health <= 0 || thing->health <= 0)
+                {
+                    return false;
+                }
+                if (tmthing->type == MT_LIGHTNING_FLOOR)
+                {
+                    if (tmthing->special2.m
+                        && !tmthing->special2.m->special1.m)
+                    {
+                        tmthing->special2.m->special1.m = thing;
+                    }
+                }
+                else if (!tmthing->special1.m)
+                {
+                    tmthing->special1.m = thing;
+                }
+            }
+            return true;        // lightning zaps through all sprites
+        }
+        else if (tmthing->type == MT_LIGHTNING_ZAP)
+        {
+            mobj_t *lmo;
+
+            if (thing->flags & MF_SHOOTABLE && thing != tmthing->target)
+            {
+                lmo = tmthing->special2.m;
+                if (lmo)
+                {
+                    if (lmo->type == MT_LIGHTNING_FLOOR)
+                    {
+                        if (lmo->special2.m
+                            && !lmo->special2.m->special1.m)
+                        {
+                            lmo->special2.m->special1.m = thing;
+                        }
+                    }
+                    else if (!lmo->special1.m)
+                    {
+                        lmo->special1.m = thing;
+                    }
+                    if (!(leveltime & 3))
+                    {
+                        lmo->health--;
+                    }
+                }
+            }
+        }
+        else if (tmthing->type == MT_MSTAFF_FX2 && thing != tmthing->target)
+        {
+            if (!thing->player && !(thing->flags2 & MF2_BOSS))
+            {
+                switch (thing->type)
+                {
+                    case MT_FIGHTER_BOSS:      // these not flagged boss
+                    case MT_CLERIC_BOSS:       // so they can be blasted
+                    case MT_MAGE_BOSS:
+                        break;
+                    default:
+                        P_DamageMobj(thing, tmthing, tmthing->target, 10);
+                        return true;
+                        break;
+                }
+            }
+        }
+        if (tmthing->target && tmthing->target->type == thing->type)
+        {                       // Don't hit same species as originator
+            if (thing == tmthing->target)
+            {                   // Don't missile self
+                return (true);
+            }
+            if (!thing->player)
+            {                   // Hit same species as originator, explode, no damage
+                return (false);
+            }
+        }
+        if (!(thing->flags & MF_SHOOTABLE))
+        {                       // Didn't do any damage
+            return !(thing->flags & MF_SOLID);
+        }
+        if (tmthing->flags2 & MF2_RIP)
+        {
+            if (!(thing->flags & MF_NOBLOOD) &&
+                !(thing->flags2 & MF2_REFLECTIVE) &&
+                !(thing->flags2 & MF2_INVULNERABLE))
+            {                   // Ok to spawn some blood
+                P_RipperBlood(tmthing);
+            }
+            //S_StartSound(tmthing, sfx_ripslop);
+            damage = ((P_Random() & 3) + 2) * tmthing->damage;
+            P_DamageMobj(thing, tmthing, tmthing->target, damage);
+            if (thing->flags2 & MF2_PUSHABLE
+                && !(tmthing->flags2 & MF2_CANNOTPUSH))
+            {                   // Push thing
+                thing->momx += tmthing->momx >> 2;
+                thing->momy += tmthing->momy >> 2;
+            }
+            numspechit = 0;
+            return (true);
+        }
+        // Do damage
+        damage = ((P_Random() % 8) + 1) * tmthing->damage;
+        if (damage)
+        {
+            if (!(thing->flags & MF_NOBLOOD) &&
+                !(thing->flags2 & MF2_REFLECTIVE) &&
+                !(thing->flags2 & MF2_INVULNERABLE) &&
+                !(tmthing->type == MT_TELOTHER_FX1) &&
+                !(tmthing->type == MT_TELOTHER_FX2) &&
+                !(tmthing->type == MT_TELOTHER_FX3) &&
+                !(tmthing->type == MT_TELOTHER_FX4) &&
+                !(tmthing->type == MT_TELOTHER_FX5) && (P_Random() < 192))
+            {
+                P_BloodSplatter(tmthing->x, tmthing->y, tmthing->z, thing);
+            }
+            P_DamageMobj(thing, tmthing, tmthing->target, damage);
+        }
+        return (false);
+    }
+    if (thing->flags2 & MF2_PUSHABLE && !(tmthing->flags2 & MF2_CANNOTPUSH))
+    {                           // Push thing
+        thing->momx += tmthing->momx >> 2;
+        thing->momy += tmthing->momy >> 2;
+    }
+    // Check for special thing
+    if (thing->flags & MF_SPECIAL)
+    {
+        solid = (thing->flags & MF_SOLID) != 0;
+        if (tmflags & MF_PICKUP)
+        {                       // Can be picked up by tmthing
+            P_TouchSpecialThing(thing, tmthing);        // Can remove thing
+        }
+        return (!solid);
+    }
+    return (!(thing->flags & MF_SOLID));
+}
+
+//---------------------------------------------------------------------------
+//
+// PIT_CheckOnmobjZ
+//
+//---------------------------------------------------------------------------
+
+boolean PIT_CheckOnmobjZ(mobj_t * thing)
+{
+    fixed_t blockdist;
+
+    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
+    {                           // Can't hit thing
+        return (true);
+    }
+    blockdist = thing->radius + tmthing->radius;
+    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
+    {                           // Didn't hit thing
+        return (true);
+    }
+    if (thing == tmthing)
+    {                           // Don't clip against self
+        return (true);
+    }
+    if (tmthing->z > thing->z + thing->height)
+    {
+        return (true);
+    }
+    else if (tmthing->z + tmthing->height < thing->z)
+    {                           // under thing
+        return (true);
+    }
+    if (thing->flags & MF_SOLID)
+    {
+        onmobj = thing;
+    }
+    return (!(thing->flags & MF_SOLID));
+}
+
+/*
+===============================================================================
+
+						MOVEMENT CLIPPING
+
+===============================================================================
+*/
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_TestMobjLocation
+//
+// Returns true if the mobj is not blocked by anything at its current
+// location, otherwise returns false.
+//
+//----------------------------------------------------------------------------
+
+boolean P_TestMobjLocation(mobj_t * mobj)
+{
+    int flags;
+
+    flags = mobj->flags;
+    mobj->flags &= ~MF_PICKUP;
+    if (P_CheckPosition(mobj, mobj->x, mobj->y))
+    {                           // XY is ok, now check Z
+        mobj->flags = flags;
+        if ((mobj->z < mobj->floorz)
+            || (mobj->z + mobj->height > mobj->ceilingz))
+        {                       // Bad Z
+            return (false);
+        }
+        return (true);
+    }
+    mobj->flags = flags;
+    return (false);
+}
+
+/*
+==================
+=
+= P_CheckPosition
+=
+= This is purely informative, nothing is modified (except things picked up)
+
+in:
+a mobj_t (can be valid or invalid)
+a position to be checked (doesn't need to be related to the mobj_t->x,y)
+
+during:
+special things are touched if MF_PICKUP
+early out on solid lines?
+
+out:
+newsubsec
+floorz
+ceilingz
+tmdropoffz = the lowest point contacted (monsters won't move to a dropoff)
+speciallines[]
+numspeciallines
+mobj_t *BlockingMobj = pointer to thing that blocked position (NULL if not
+blocked, or blocked by a line).
+
+==================
+*/
+
+boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y)
+{
+    int xl, xh, yl, yh, bx, by;
+    subsector_t *newsubsec;
+
+    tmthing = thing;
+    tmflags = thing->flags;
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector(x, y);
+    ceilingline = NULL;
+
+//
+// the base floor / ceiling is from the subsector that contains the
+// point.  Any contacted lines the step closer together will adjust them
+//
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+    tmfloorpic = newsubsec->sector->floorpic;
+
+    validcount++;
+    numspechit = 0;
+
+    if (tmflags & MF_NOCLIP && !(tmflags & MF_SKULLFLY))
+    {
+        return true;
+    }
+
+//
+// check things first, possibly picking things up
+// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
+// into mapblocks based on their origin point, and can overlap into adjacent
+// blocks by up to MAXRADIUS units
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    BlockingMobj = NULL;
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
+                return false;
+//
+// check lines
+//
+    if (tmflags & MF_NOCLIP)
+    {
+        return true;
+    }
+
+    BlockingMobj = NULL;
+    xl = (tmbbox[BOXLEFT] - bmaporgx) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockLinesIterator(bx, by, PIT_CheckLine))
+                return false;
+    return true;
+}
+
+//=============================================================================
+//
+// P_CheckOnmobj(mobj_t *thing)
+//
+//              Checks if the new Z position is legal
+//=============================================================================
+
+mobj_t *P_CheckOnmobj(mobj_t * thing)
+{
+    int xl, xh, yl, yh, bx, by;
+    subsector_t *newsubsec;
+    fixed_t x;
+    fixed_t y;
+    mobj_t oldmo;
+
+    x = thing->x;
+    y = thing->y;
+    tmthing = thing;
+    tmflags = thing->flags;
+    oldmo = *thing;             // save the old mobj before the fake zmovement
+    P_FakeZMovement(tmthing);
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector(x, y);
+    ceilingline = NULL;
+
+//
+// the base floor / ceiling is from the subsector that contains the
+// point.  Any contacted lines the step closer together will adjust them
+//
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+    tmfloorpic = newsubsec->sector->floorpic;
+
+    validcount++;
+    numspechit = 0;
+
+    if (tmflags & MF_NOCLIP)
+        return NULL;
+
+//
+// check things first, possibly picking things up
+// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
+// into mapblocks based on their origin point, and can overlap into adjacent
+// blocks by up to MAXRADIUS units
+//
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    for (bx = xl; bx <= xh; bx++)
+        for (by = yl; by <= yh; by++)
+            if (!P_BlockThingsIterator(bx, by, PIT_CheckOnmobjZ))
+            {
+                *tmthing = oldmo;
+                return onmobj;
+            }
+    *tmthing = oldmo;
+    return NULL;
+}
+
+//=============================================================================
+//
+// P_FakeZMovement
+//
+//              Fake the zmovement so that we can check if a move is legal
+//=============================================================================
+
+void P_FakeZMovement(mobj_t * mo)
+{
+    int dist;
+    int delta;
+//
+// adjust height
+//
+    mo->z += mo->momz;
+    if (mo->flags & MF_FLOAT && mo->target)
+    {                           // float down towards target if too close
+        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
+        {
+            dist =
+                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
+            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
+            if (delta < 0 && dist < -(delta * 3))
+                mo->z -= FLOATSPEED;
+            else if (delta > 0 && dist < (delta * 3))
+                mo->z += FLOATSPEED;
+        }
+    }
+    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
+        && leveltime & 2)
+    {
+        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
+    }
+
+//
+// clip movement
+//
+    if (mo->z <= mo->floorz)
+    {                           // Hit the floor
+        mo->z = mo->floorz;
+        if (mo->momz < 0)
+        {
+            mo->momz = 0;
+        }
+        if (mo->flags & MF_SKULLFLY)
+        {                       // The skull slammed into something
+            mo->momz = -mo->momz;
+        }
+        if (mo->info->crashstate && (mo->flags & MF_CORPSE))
+        {
+            return;
+        }
+    }
+    else if (mo->flags2 & MF2_LOGRAV)
+    {
+        if (mo->momz == 0)
+            mo->momz = -(GRAVITY >> 3) * 2;
+        else
+            mo->momz -= GRAVITY >> 3;
+    }
+    else if (!(mo->flags & MF_NOGRAVITY))
+    {
+        if (mo->momz == 0)
+            mo->momz = -GRAVITY * 2;
+        else
+            mo->momz -= GRAVITY;
+    }
+
+    if (mo->z + mo->height > mo->ceilingz)
+    {                           // hit the ceiling
+        if (mo->momz > 0)
+            mo->momz = 0;
+        mo->z = mo->ceilingz - mo->height;
+        if (mo->flags & MF_SKULLFLY)
+        {                       // the skull slammed into something
+            mo->momz = -mo->momz;
+        }
+    }
+}
+
+//===========================================================================
+//
+// CheckForPushSpecial
+//
+//===========================================================================
+
+static void CheckForPushSpecial(line_t * line, int side, mobj_t * mobj)
+{
+    if (line->special)
+    {
+        if (mobj->flags2 & MF2_PUSHWALL)
+        {
+            P_ActivateLine(line, mobj, side, SPAC_PUSH);
+        }
+        else if (mobj->flags2 & MF2_IMPACT)
+        {
+            P_ActivateLine(line, mobj, side, SPAC_IMPACT);
+        }
+    }
+}
+
+/*
+===================
+=
+= P_TryMove
+=
+= Attempt to move to a new position, crossing special lines unless MF_TELEPORT
+= is set
+=
+===================
+*/
+
+boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y)
+{
+    fixed_t oldx, oldy;
+    int side, oldside;
+    line_t *ld;
+
+    floatok = false;
+    if (!P_CheckPosition(thing, x, y))
+    {                           // Solid wall or thing
+        if (!BlockingMobj || BlockingMobj->player || !thing->player)
+        {
+            goto pushline;
+        }
+        else if (BlockingMobj->z + BlockingMobj->height - thing->z
+                 > 24 * FRACUNIT
+                 || (BlockingMobj->subsector->sector->ceilingheight
+                     - (BlockingMobj->z + BlockingMobj->height) <
+                     thing->height)
+                 || (tmceilingz - (BlockingMobj->z + BlockingMobj->height) <
+                     thing->height))
+        {
+            goto pushline;
+        }
+    }
+    if (!(thing->flags & MF_NOCLIP))
+    {
+        if (tmceilingz - tmfloorz < thing->height)
+        {                       // Doesn't fit
+            goto pushline;
+        }
+        floatok = true;
+        if (!(thing->flags & MF_TELEPORT)
+            && tmceilingz - thing->z < thing->height
+            && thing->type != MT_LIGHTNING_CEILING
+            && !(thing->flags2 & MF2_FLY))
+        {                       // mobj must lower itself to fit
+            goto pushline;
+        }
+        if (thing->flags2 & MF2_FLY)
+        {
+            if (thing->z + thing->height > tmceilingz)
+            {
+                thing->momz = -8 * FRACUNIT;
+                goto pushline;
+            }
+            else if (thing->z < tmfloorz
+                     && tmfloorz - tmdropoffz > 24 * FRACUNIT)
+            {
+                thing->momz = 8 * FRACUNIT;
+                goto pushline;
+            }
+        }
+        if (!(thing->flags & MF_TELEPORT)
+            // The Minotaur floor fire (MT_MNTRFX2) can step up any amount
+            && thing->type != MT_MNTRFX2 && thing->type != MT_LIGHTNING_FLOOR
+            && tmfloorz - thing->z > 24 * FRACUNIT)
+        {
+            goto pushline;
+        }
+        if (!(thing->flags & (MF_DROPOFF | MF_FLOAT)) &&
+            (tmfloorz - tmdropoffz > 24 * FRACUNIT) &&
+            !(thing->flags2 & MF2_BLASTED))
+        {                       // Can't move over a dropoff unless it's been blasted
+            return (false);
+        }
+        if (thing->flags2 & MF2_CANTLEAVEFLOORPIC
+            && (tmfloorpic != thing->subsector->sector->floorpic
+                || tmfloorz - thing->z != 0))
+        {                       // must stay within a sector of a certain floor type
+            return false;
+        }
+    }
+
+//
+// the move is ok, so link the thing into its new position
+//
+    P_UnsetThingPosition(thing);
+
+    oldx = thing->x;
+    oldy = thing->y;
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->floorpic = tmfloorpic;
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition(thing);
+
+    if (thing->flags2 & MF2_FLOORCLIP)
+    {
+        if (thing->z == thing->subsector->sector->floorheight
+            && P_GetThingFloorType(thing) >= FLOOR_LIQUID)
+        {
+            thing->floorclip = 10 * FRACUNIT;
+        }
+        else
+        {
+            thing->floorclip = 0;
+        }
+    }
+
+//
+// if any special lines were hit, do the effect
+//
+    if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
+    {
+        while (numspechit > 0)
+        {
+            numspechit--;
+            // see if the line was crossed
+            ld = spechit[numspechit];
+            side = P_PointOnLineSide(thing->x, thing->y, ld);
+            oldside = P_PointOnLineSide(oldx, oldy, ld);
+            if (side != oldside)
+            {
+                if (ld->special)
+                {
+                    if (thing->player)
+                    {
+                        P_ActivateLine(ld, thing, oldside, SPAC_CROSS);
+                    }
+                    else if (thing->flags2 & MF2_MCROSS)
+                    {
+                        P_ActivateLine(ld, thing, oldside, SPAC_MCROSS);
+                    }
+                    else if (thing->flags2 & MF2_PCROSS)
+                    {
+                        P_ActivateLine(ld, thing, oldside, SPAC_PCROSS);
+                    }
+                }
+            }
+        }
+    }
+    return true;
+
+  pushline:
+    if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
+    {
+        int numSpecHitTemp;
+
+        if (tmthing->flags2 & MF2_BLASTED)
+        {
+            P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
+        }
+        numSpecHitTemp = numspechit;
+        while (numSpecHitTemp > 0)
+        {
+            numSpecHitTemp--;
+            // see if the line was crossed
+            ld = spechit[numSpecHitTemp];
+            side = P_PointOnLineSide(thing->x, thing->y, ld);
+            CheckForPushSpecial(ld, side, thing);
+        }
+    }
+    return false;
+}
+
+/*
+==================
+=
+= P_ThingHeightClip
+=
+= Takes a valid thing and adjusts the thing->floorz, thing->ceilingz,
+= anf possibly thing->z
+=
+= This is called for all nearby monsters whenever a sector changes height
+=
+= If the thing doesn't fit, the z will be set to the lowest value and
+= false will be returned
+==================
+*/
+
+boolean P_ThingHeightClip(mobj_t * thing)
+{
+    boolean onfloor;
+
+    onfloor = (thing->z == thing->floorz);
+
+    P_CheckPosition(thing, thing->x, thing->y);
+    // what about stranding a monster partially off an edge?
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->floorpic = tmfloorpic;
+
+    if (onfloor)
+    {                           // walking monsters rise and fall with the floor
+        if ((thing->z - thing->floorz < 9 * FRACUNIT)
+            || (thing->flags & MF_NOGRAVITY))
+        {
+            thing->z = thing->floorz;
+        }
+    }
+    else
+    {                           // don't adjust a floating monster unless forced to
+        if (thing->z + thing->height > thing->ceilingz)
+            thing->z = thing->ceilingz - thing->height;
+    }
+
+    if (thing->ceilingz - thing->floorz < thing->height)
+        return false;
+
+    return true;
+}
+
+
+/*
+==============================================================================
+
+							SLIDE MOVE
+
+Allows the player to slide along any angled walls
+
+==============================================================================
+*/
+
+fixed_t bestslidefrac, secondslidefrac;
+line_t *bestslideline, *secondslideline;
+mobj_t *slidemo;
+
+fixed_t tmxmove, tmymove;
+
+/*
+==================
+=
+= P_HitSlideLine
+=
+= Adjusts the xmove / ymove so that the next move will slide along the wall
+==================
+*/
+
+void P_HitSlideLine(line_t * ld)
+{
+    int side;
+    angle_t lineangle, moveangle, deltaangle;
+    fixed_t movelen, newlen;
+
+
+    if (ld->slopetype == ST_HORIZONTAL)
+    {
+        tmymove = 0;
+        return;
+    }
+    if (ld->slopetype == ST_VERTICAL)
+    {
+        tmxmove = 0;
+        return;
+    }
+
+    side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
+
+    lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
+    if (side == 1)
+        lineangle += ANG180;
+    moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
+    deltaangle = moveangle - lineangle;
+    if (deltaangle > ANG180)
+        deltaangle += ANG180;
+//              I_Error ("SlideLine: ang>ANG180");
+
+    lineangle >>= ANGLETOFINESHIFT;
+    deltaangle >>= ANGLETOFINESHIFT;
+
+    movelen = P_AproxDistance(tmxmove, tmymove);
+    newlen = FixedMul(movelen, finecosine[deltaangle]);
+    tmxmove = FixedMul(newlen, finecosine[lineangle]);
+    tmymove = FixedMul(newlen, finesine[lineangle]);
+}
+
+/*
+==============
+=
+= PTR_SlideTraverse
+=
+==============
+*/
+
+boolean PTR_SlideTraverse(intercept_t * in)
+{
+    line_t *li;
+
+    if (!in->isaline)
+        I_Error("PTR_SlideTraverse: not a line?");
+
+    li = in->d.line;
+    if (!(li->flags & ML_TWOSIDED))
+    {
+        if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
+            return true;        // don't hit the back side
+        goto isblocking;
+    }
+
+    P_LineOpening(li);          // set openrange, opentop, openbottom
+    if (openrange < slidemo->height)
+        goto isblocking;        // doesn't fit
+
+    if (opentop - slidemo->z < slidemo->height)
+        goto isblocking;        // mobj is too high
+
+    if (openbottom - slidemo->z > 24 * FRACUNIT)
+        goto isblocking;        // too big a step up
+
+    return true;                // this line doesn't block movement
+
+// the line does block movement, see if it is closer than best so far
+  isblocking:
+    if (in->frac < bestslidefrac)
+    {
+        secondslidefrac = bestslidefrac;
+        secondslideline = bestslideline;
+        bestslidefrac = in->frac;
+        bestslideline = li;
+    }
+
+    return false;               // stop
+}
+
+
+/*
+==================
+=
+= P_SlideMove
+=
+= The momx / momy move is bad, so try to slide along a wall
+=
+= Find the first line hit, move flush to it, and slide along it
+=
+= This is a kludgy mess.
+==================
+*/
+
+void P_SlideMove(mobj_t * mo)
+{
+    fixed_t leadx, leady;
+    fixed_t trailx, traily;
+    fixed_t newx, newy;
+    int hitcount;
+
+    slidemo = mo;
+    hitcount = 0;
+  retry:
+    if (++hitcount == 3)
+        goto stairstep;         // don't loop forever
+
+//
+// trace along the three leading corners
+//
+    if (mo->momx > 0)
+    {
+        leadx = mo->x + mo->radius;
+        trailx = mo->x - mo->radius;
+    }
+    else
+    {
+        leadx = mo->x - mo->radius;
+        trailx = mo->x + mo->radius;
+    }
+
+    if (mo->momy > 0)
+    {
+        leady = mo->y + mo->radius;
+        traily = mo->y - mo->radius;
+    }
+    else
+    {
+        leady = mo->y - mo->radius;
+        traily = mo->y + mo->radius;
+    }
+
+    bestslidefrac = FRACUNIT + 1;
+
+    P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
+                   PT_ADDLINES, PTR_SlideTraverse);
+    P_PathTraverse(trailx, leady, trailx + mo->momx, leady + mo->momy,
+                   PT_ADDLINES, PTR_SlideTraverse);
+    P_PathTraverse(leadx, traily, leadx + mo->momx, traily + mo->momy,
+                   PT_ADDLINES, PTR_SlideTraverse);
+
+//
+// move up to the wall
+//
+    if (bestslidefrac == FRACUNIT + 1)
+    {                           // the move must have hit the middle, so stairstep
+      stairstep:
+        if (!P_TryMove(mo, mo->x, mo->y + mo->momy))
+        {
+            P_TryMove(mo, mo->x + mo->momx, mo->y);
+        }
+        return;
+    }
+
+    bestslidefrac -= 0x800;     // fudge a bit to make sure it doesn't hit
+    if (bestslidefrac > 0)
+    {
+        newx = FixedMul(mo->momx, bestslidefrac);
+        newy = FixedMul(mo->momy, bestslidefrac);
+        if (!P_TryMove(mo, mo->x + newx, mo->y + newy))
+            goto stairstep;
+    }
+
+//
+// now continue along the wall
+//
+    bestslidefrac = FRACUNIT - (bestslidefrac + 0x800); // remainder
+    if (bestslidefrac > FRACUNIT)
+        bestslidefrac = FRACUNIT;
+    if (bestslidefrac <= 0)
+        return;
+
+    tmxmove = FixedMul(mo->momx, bestslidefrac);
+    tmymove = FixedMul(mo->momy, bestslidefrac);
+
+    P_HitSlideLine(bestslideline);      // clip the moves
+
+    mo->momx = tmxmove;
+    mo->momy = tmymove;
+
+    if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove))
+    {
+        goto retry;
+    }
+}
+
+//============================================================================
+//
+// P_InitSlideLine
+//
+//============================================================================
+
+void P_InitSlideLine(void)
+{
+    // use relevant parts from first bestslideline in demo1 (hexen.wad)
+    static vertex_t initvertex1 = {-77594624, 37748736};
+    static line_t initslideline = {&initvertex1, NULL, 0, 6291456, 0, 0, 0, 0,
+                    0, 0, 0, { 0, 0 }, { 0, 0, 0, 0 }, 0, NULL, NULL, 0, NULL};
+    
+    if (bestslideline == NULL)
+    {
+        bestslideline = &initslideline;
+    }
+}
+
+//============================================================================
+//
+// PTR_BounceTraverse
+//
+//============================================================================
+
+boolean PTR_BounceTraverse(intercept_t * in)
+{
+    line_t *li;
+
+    if (!in->isaline)
+        I_Error("PTR_BounceTraverse: not a line?");
+
+    li = in->d.line;
+    if (!(li->flags & ML_TWOSIDED))
+    {
+        if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
+            return true;        // don't hit the back side
+        goto bounceblocking;
+    }
+
+    P_LineOpening(li);          // set openrange, opentop, openbottom
+    if (openrange < slidemo->height)
+        goto bounceblocking;    // doesn't fit
+
+    if (opentop - slidemo->z < slidemo->height)
+        goto bounceblocking;    // mobj is too high
+    return true;                // this line doesn't block movement
+
+// the line does block movement, see if it is closer than best so far
+  bounceblocking:
+    if (in->frac < bestslidefrac)
+    {
+        secondslidefrac = bestslidefrac;
+        secondslideline = bestslideline;
+        bestslidefrac = in->frac;
+        bestslideline = li;
+    }
+    return false;               // stop
+}
+
+//============================================================================
+//
+// P_BounceWall
+//
+//============================================================================
+
+void P_BounceWall(mobj_t * mo)
+{
+    fixed_t leadx, leady;
+    int side;
+    angle_t lineangle, moveangle, deltaangle;
+    fixed_t movelen;
+
+    slidemo = mo;
+
+//
+// trace along the three leading corners
+//
+    if (mo->momx > 0)
+    {
+        leadx = mo->x + mo->radius;
+    }
+    else
+    {
+        leadx = mo->x - mo->radius;
+    }
+    if (mo->momy > 0)
+    {
+        leady = mo->y + mo->radius;
+    }
+    else
+    {
+        leady = mo->y - mo->radius;
+    }
+    bestslidefrac = FRACUNIT + 1;
+    P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
+                   PT_ADDLINES, PTR_BounceTraverse);
+
+    // P_BounceWall call on a tall sector after fresh game start
+    // without the player sliding along any walls before.
+    // For more details check:
+    // https://github.com/chocolate-doom/chocolate-doom/issues/1732
+    // https://github.com/chocolate-doom/chocolate-doom/issues/1160
+    if (bestslideline == NULL)
+    {
+        I_Error("P_BounceWall: No bestslideline was set. Try bumping walls.");
+    }
+    
+    side = P_PointOnLineSide(mo->x, mo->y, bestslideline);
+    lineangle = R_PointToAngle2(0, 0, bestslideline->dx, bestslideline->dy);
+    if (side == 1)
+        lineangle += ANG180;
+    moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
+    deltaangle = (2 * lineangle) - moveangle;
+//      if (deltaangle > ANG180)
+//              deltaangle += ANG180;
+//              I_Error ("SlideLine: ang>ANG180");
+
+    lineangle >>= ANGLETOFINESHIFT;
+    deltaangle >>= ANGLETOFINESHIFT;
+
+    movelen = P_AproxDistance(mo->momx, mo->momy);
+    movelen = FixedMul(movelen, 0.75 * FRACUNIT);       // friction
+    if (movelen < FRACUNIT)
+        movelen = 2 * FRACUNIT;
+    mo->momx = FixedMul(movelen, finecosine[deltaangle]);
+    mo->momy = FixedMul(movelen, finesine[deltaangle]);
+}
+
+
+/*
+==============================================================================
+
+							P_LineAttack
+
+==============================================================================
+*/
+
+
+mobj_t *PuffSpawned;
+mobj_t *linetarget;             // who got hit (or NULL)
+mobj_t *shootthing;
+fixed_t shootz;                 // height if not aiming up or down
+                                                                        // ???: use slope for monsters?
+int la_damage;
+fixed_t attackrange;
+
+fixed_t aimslope;
+
+
+/*
+===============================================================================
+=
+= PTR_AimTraverse
+=
+= Sets linetaget and aimslope when a target is aimed at
+===============================================================================
+*/
+
+boolean PTR_AimTraverse(intercept_t * in)
+{
+    line_t *li;
+    mobj_t *th;
+    fixed_t slope, thingtopslope, thingbottomslope;
+    fixed_t dist;
+
+    if (in->isaline)
+    {
+        li = in->d.line;
+        if (!(li->flags & ML_TWOSIDED))
+            return false;       // stop
+//
+// crosses a two sided line
+// a two sided line will restrict the possible target ranges
+        P_LineOpening(li);
+
+        if (openbottom >= opentop)
+            return false;       // stop
+
+        dist = FixedMul(attackrange, in->frac);
+
+        if (li->frontsector->floorheight != li->backsector->floorheight)
+        {
+            slope = FixedDiv(openbottom - shootz, dist);
+            if (slope > bottomslope)
+                bottomslope = slope;
+        }
+
+        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+            slope = FixedDiv(opentop - shootz, dist);
+            if (slope < topslope)
+                topslope = slope;
+        }
+
+        if (topslope <= bottomslope)
+            return false;       // stop
+
+        return true;            // shot continues
+    }
+
+//
+// shoot a thing
+//
+    th = in->d.thing;
+    if (th == shootthing)
+        return true;            // can't shoot self
+    if (!(th->flags & MF_SHOOTABLE))
+    {                           // corpse or something
+        return true;
+    }
+    if (th->player && netgame && !deathmatch)
+    {                           // don't aim at fellow co-op players
+        return true;
+    }
+
+// check angles to see if the thing can be aimed at
+
+    dist = FixedMul(attackrange, in->frac);
+    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
+    if (thingtopslope < bottomslope)
+        return true;            // shot over the thing
+    thingbottomslope = FixedDiv(th->z - shootz, dist);
+    if (thingbottomslope > topslope)
+        return true;            // shot under the thing
+
+//
+// this thing can be hit!
+//
+    if (thingtopslope > topslope)
+        thingtopslope = topslope;
+    if (thingbottomslope < bottomslope)
+        thingbottomslope = bottomslope;
+
+    aimslope = (thingtopslope + thingbottomslope) / 2;
+    linetarget = th;
+
+    return false;               // don't go any farther
+}
+
+
+/*
+==============================================================================
+=
+= PTR_ShootTraverse
+=
+==============================================================================
+*/
+
+boolean PTR_ShootTraverse(intercept_t * in)
+{
+    fixed_t x, y, z;
+    fixed_t frac;
+    line_t *li;
+    mobj_t *th;
+    fixed_t slope;
+    fixed_t dist;
+    fixed_t thingtopslope, thingbottomslope;
+
+    if (in->isaline)
+    {
+        li = in->d.line;
+        if (li->special)
+        {
+            P_ActivateLine(li, shootthing, 0, SPAC_IMPACT);
+//                      P_ShootSpecialLine (shootthing, li);
+        }
+        if (!(li->flags & ML_TWOSIDED))
+            goto hitline;
+
+//
+// crosses a two sided line
+//
+        P_LineOpening(li);
+
+        dist = FixedMul(attackrange, in->frac);
+
+        if (li->frontsector->floorheight != li->backsector->floorheight)
+        {
+            slope = FixedDiv(openbottom - shootz, dist);
+            if (slope > aimslope)
+                goto hitline;
+        }
+
+        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+            slope = FixedDiv(opentop - shootz, dist);
+            if (slope < aimslope)
+                goto hitline;
+        }
+
+        return true;            // shot continues
+//
+// hit line
+//
+      hitline:
+        // position a bit closer
+        frac = in->frac - FixedDiv(4 * FRACUNIT, attackrange);
+        x = trace.x + FixedMul(trace.dx, frac);
+        y = trace.y + FixedMul(trace.dy, frac);
+        z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
+
+        if (li->frontsector->ceilingpic == skyflatnum)
+        {
+            if (z > li->frontsector->ceilingheight)
+                return false;   // don't shoot the sky!
+            if (li->backsector && li->backsector->ceilingpic == skyflatnum)
+                return false;   // it's a sky hack wall
+        }
+
+        P_SpawnPuff(x, y, z);
+        return false;           // don't go any farther
+    }
+
+//
+// shoot a thing
+//
+    th = in->d.thing;
+    if (th == shootthing)
+        return true;            // can't shoot self
+    if (!(th->flags & MF_SHOOTABLE))
+        return true;            // corpse or something
+
+//
+// check for physical attacks on a ghost
+//
+/*  FIX:  Impliment Heretic 2 weapons here
+	if(th->flags&MF_SHADOW && shootthing->player->readyweapon == wp_staff)
+	{
+		return(true);
+	}
+*/
+
+// check angles to see if the thing can be aimed at
+    dist = FixedMul(attackrange, in->frac);
+    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
+    if (thingtopslope < aimslope)
+        return true;            // shot over the thing
+    thingbottomslope = FixedDiv(th->z - shootz, dist);
+    if (thingbottomslope > aimslope)
+        return true;            // shot under the thing
+
+//
+// hit thing
+//
+    // position a bit closer
+    frac = in->frac - FixedDiv(10 * FRACUNIT, attackrange);
+    x = trace.x + FixedMul(trace.dx, frac);
+    y = trace.y + FixedMul(trace.dy, frac);
+    z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
+    P_SpawnPuff(x, y, z);
+    if (la_damage)
+    {
+        if (!(in->d.thing->flags & MF_NOBLOOD) &&
+            !(in->d.thing->flags2 & MF2_INVULNERABLE))
+        {
+            if (PuffType == MT_AXEPUFF || PuffType == MT_AXEPUFF_GLOW)
+            {
+                P_BloodSplatter2(x, y, z, in->d.thing);
+            }
+            if (P_Random() < 192)
+            {
+                P_BloodSplatter(x, y, z, in->d.thing);
+            }
+        }
+        if (PuffType == MT_FLAMEPUFF2)
+        {                       // Cleric FlameStrike does fire damage
+            P_DamageMobj(th, &LavaInflictor, shootthing, la_damage);
+        }
+        else
+        {
+            P_DamageMobj(th, shootthing, shootthing, la_damage);
+        }
+    }
+    return (false);             // don't go any farther
+}
+
+/*
+=================
+=
+= P_AimLineAttack
+=
+=================
+*/
+
+fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance)
+{
+    fixed_t x2, y2;
+
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
+    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
+    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
+    topslope = 100 * FRACUNIT / 160;    // can't shoot outside view angles
+    bottomslope = -100 * FRACUNIT / 160;
+    attackrange = distance;
+    linetarget = NULL;
+
+    P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                   PTR_AimTraverse);
+
+    if (linetarget)
+        return aimslope;
+    return 0;
+}
+
+
+
+/*
+=================
+=
+= P_LineAttack
+=
+= if damage == 0, it is just a test trace that will leave linetarget set
+=
+=================
+*/
+
+void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
+                  int damage)
+{
+    fixed_t x2, y2;
+
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    la_damage = damage;
+    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
+    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
+    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
+    shootz -= t1->floorclip;
+    attackrange = distance;
+    aimslope = slope;
+
+    if (P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                       PTR_ShootTraverse))
+    {
+        switch (PuffType)
+        {
+            case MT_PUNCHPUFF:
+                S_StartSound(t1, SFX_FIGHTER_PUNCH_MISS);
+                break;
+            case MT_HAMMERPUFF:
+            case MT_AXEPUFF:
+            case MT_AXEPUFF_GLOW:
+                S_StartSound(t1, SFX_FIGHTER_HAMMER_MISS);
+                break;
+            case MT_FLAMEPUFF:
+                P_SpawnPuff(x2, y2, shootz + FixedMul(slope, distance));
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+/*
+==============================================================================
+
+							USE LINES
+
+==============================================================================
+*/
+
+mobj_t *usething;
+
+boolean PTR_UseTraverse(intercept_t * in)
+{
+    int sound;
+    fixed_t pheight;
+
+    if (!in->d.line->special)
+    {
+        P_LineOpening(in->d.line);
+        if (openrange <= 0)
+        {
+            if (usething->player)
+            {
+                switch (usething->player->class)
+                {
+                    case PCLASS_FIGHTER:
+                        sound = SFX_PLAYER_FIGHTER_FAILED_USE;
+                        break;
+                    case PCLASS_CLERIC:
+                        sound = SFX_PLAYER_CLERIC_FAILED_USE;
+                        break;
+                    case PCLASS_MAGE:
+                        sound = SFX_PLAYER_MAGE_FAILED_USE;
+                        break;
+                    case PCLASS_PIG:
+                        sound = SFX_PIG_ACTIVE1;
+                        break;
+                    default:
+                        sound = SFX_NONE;
+                        break;
+                }
+                S_StartSound(usething, sound);
+            }
+            return false;       // can't use through a wall
+        }
+        if (usething->player)
+        {
+            pheight = usething->z + (usething->height / 2);
+            if ((opentop < pheight) || (openbottom > pheight))
+            {
+                switch (usething->player->class)
+                {
+                    case PCLASS_FIGHTER:
+                        sound = SFX_PLAYER_FIGHTER_FAILED_USE;
+                        break;
+                    case PCLASS_CLERIC:
+                        sound = SFX_PLAYER_CLERIC_FAILED_USE;
+                        break;
+                    case PCLASS_MAGE:
+                        sound = SFX_PLAYER_MAGE_FAILED_USE;
+                        break;
+                    case PCLASS_PIG:
+                        sound = SFX_PIG_ACTIVE1;
+                        break;
+                    default:
+                        sound = SFX_NONE;
+                        break;
+                }
+                S_StartSound(usething, sound);
+            }
+        }
+        return true;            // not a special line, but keep checking
+    }
+
+    if (P_PointOnLineSide(usething->x, usething->y, in->d.line) == 1)
+        return false;           // don't use back sides
+
+//      P_UseSpecialLine (usething, in->d.line);
+    P_ActivateLine(in->d.line, usething, 0, SPAC_USE);
+
+    return false;               // can't use for than one special line in a row
+}
+
+
+/*
+================
+=
+= P_UseLines
+=
+= Looks for special lines in front of the player to activate
+================
+*/
+
+void P_UseLines(player_t * player)
+{
+    int angle;
+    fixed_t x1, y1, x2, y2;
+
+    usething = player->mo;
+
+    angle = player->mo->angle >> ANGLETOFINESHIFT;
+    x1 = player->mo->x;
+    y1 = player->mo->y;
+    x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
+    y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
+
+    P_PathTraverse(x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse);
+}
+
+//==========================================================================
+//
+// PTR_PuzzleItemTraverse
+//
+//==========================================================================
+
+#define USE_PUZZLE_ITEM_SPECIAL 129
+
+static mobj_t *PuzzleItemUser;
+static int PuzzleItemType;
+static boolean PuzzleActivated;
+
+boolean PTR_PuzzleItemTraverse(intercept_t * in)
+{
+    mobj_t *mobj;
+    byte args[3];
+    int sound;
+
+    if (in->isaline)
+    {                           // Check line
+        if (in->d.line->special != USE_PUZZLE_ITEM_SPECIAL)
+        {
+            P_LineOpening(in->d.line);
+            if (openrange <= 0)
+            {
+                sound = SFX_NONE;
+                if (PuzzleItemUser->player)
+                {
+                    switch (PuzzleItemUser->player->class)
+                    {
+                        case PCLASS_FIGHTER:
+                            sound = SFX_PUZZLE_FAIL_FIGHTER;
+                            break;
+                        case PCLASS_CLERIC:
+                            sound = SFX_PUZZLE_FAIL_CLERIC;
+                            break;
+                        case PCLASS_MAGE:
+                            sound = SFX_PUZZLE_FAIL_MAGE;
+                            break;
+                        default:
+                            sound = SFX_NONE;
+                            break;
+                    }
+                }
+                S_StartSound(PuzzleItemUser, sound);
+                return false;   // can't use through a wall
+            }
+            return true;        // Continue searching
+        }
+        if (P_PointOnLineSide(PuzzleItemUser->x, PuzzleItemUser->y,
+                              in->d.line) == 1)
+        {                       // Don't use back sides
+            return false;
+        }
+        if (PuzzleItemType != in->d.line->arg1)
+        {                       // Item type doesn't match
+            return false;
+        }
+
+        // Construct an args[] array that would contain the values from
+        // the line that would be passed by Vanilla Hexen.
+        args[0] = in->d.line->arg3;
+        args[1] = in->d.line->arg4;
+        args[2] = in->d.line->arg5;
+
+        P_StartACS(in->d.line->arg2, 0, args, PuzzleItemUser, in->d.line, 0);
+        in->d.line->special = 0;
+        PuzzleActivated = true;
+        return false;           // Stop searching
+    }
+    // Check thing
+    mobj = in->d.thing;
+    if (mobj->special != USE_PUZZLE_ITEM_SPECIAL)
+    {                           // Wrong special
+        return true;
+    }
+    if (PuzzleItemType != mobj->args[0])
+    {                           // Item type doesn't match
+        return true;
+    }
+
+    P_StartACS(mobj->args[1], 0, &mobj->args[2], PuzzleItemUser, NULL, 0);
+    mobj->special = 0;
+    PuzzleActivated = true;
+    return false;               // Stop searching
+}
+
+//==========================================================================
+//
+// P_UsePuzzleItem
+//
+// Returns true if the puzzle item was used on a line or a thing.
+//
+//==========================================================================
+
+boolean P_UsePuzzleItem(player_t * player, int itemType)
+{
+    int angle;
+    fixed_t x1, y1, x2, y2;
+
+    PuzzleItemType = itemType;
+    PuzzleItemUser = player->mo;
+    PuzzleActivated = false;
+    angle = player->mo->angle >> ANGLETOFINESHIFT;
+    x1 = player->mo->x;
+    y1 = player->mo->y;
+    x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
+    y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
+    P_PathTraverse(x1, y1, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                   PTR_PuzzleItemTraverse);
+    return PuzzleActivated;
+}
+
+/*
+==============================================================================
+
+							RADIUS ATTACK
+
+==============================================================================
+*/
+
+mobj_t *bombsource;
+mobj_t *bombspot;
+int bombdamage;
+int bombdistance;
+boolean DamageSource;
+
+/*
+=================
+=
+= PIT_RadiusAttack
+=
+= Source is the creature that casued the explosion at spot
+=================
+*/
+
+boolean PIT_RadiusAttack(mobj_t * thing)
+{
+    fixed_t dx, dy, dist;
+    int damage;
+
+    if (!(thing->flags & MF_SHOOTABLE))
+    {
+        return true;
+    }
+//      if(thing->flags2&MF2_BOSS)
+//      {       // Bosses take no damage from PIT_RadiusAttack
+//              return(true);
+//      }
+    if (!DamageSource && thing == bombsource)
+    {                           // don't damage the source of the explosion
+        return true;
+    }
+    if (abs((thing->z - bombspot->z) >> FRACBITS) > 2 * bombdistance)
+    {                           // too high/low
+        return true;
+    }
+    dx = abs(thing->x - bombspot->x);
+    dy = abs(thing->y - bombspot->y);
+    dist = dx > dy ? dx : dy;
+    dist = (dist - thing->radius) >> FRACBITS;
+    if (dist < 0)
+    {
+        dist = 0;
+    }
+    if (dist >= bombdistance)
+    {                           // Out of range
+        return true;
+    }
+    if (P_CheckSight(thing, bombspot))
+    {                           // OK to damage, target is in direct path
+        damage = (bombdamage * (bombdistance - dist) / bombdistance) + 1;
+        if (thing->player)
+        {
+            damage >>= 2;
+        }
+        P_DamageMobj(thing, bombspot, bombsource, damage);
+    }
+    return (true);
+}
+
+/*
+=================
+=
+= P_RadiusAttack
+=
+= Source is the creature that caused the explosion at spot
+=================
+*/
+
+void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage, int distance,
+                    boolean damageSource)
+{
+    int x, y, xl, xh, yl, yh;
+    fixed_t dist;
+
+    dist = (distance + MAXRADIUS) << FRACBITS;
+    yh = (spot->y + dist - bmaporgy) >> MAPBLOCKSHIFT;
+    yl = (spot->y - dist - bmaporgy) >> MAPBLOCKSHIFT;
+    xh = (spot->x + dist - bmaporgx) >> MAPBLOCKSHIFT;
+    xl = (spot->x - dist - bmaporgx) >> MAPBLOCKSHIFT;
+    bombspot = spot;
+    bombsource = source;
+    bombdamage = damage;
+    bombdistance = distance;
+    DamageSource = damageSource;
+    for (y = yl; y <= yh; y++)
+    {
+        for (x = xl; x <= xh; x++)
+        {
+            P_BlockThingsIterator(x, y, PIT_RadiusAttack);
+        }
+    }
+}
+
+/*
+==============================================================================
+
+						SECTOR HEIGHT CHANGING
+
+= After modifying a sectors floor or ceiling height, call this
+= routine to adjust the positions of all things that touch the
+= sector.
+=
+= If anything doesn't fit anymore, true will be returned.
+= If crunch is true, they will take damage as they are being crushed
+= If Crunch is false, you should set the sector height back the way it
+= was and call P_ChangeSector again to undo the changes
+==============================================================================
+*/
+
+int crushchange;
+boolean nofit;
+
+/*
+===============
+=
+= PIT_ChangeSector
+=
+===============
+*/
+
+boolean PIT_ChangeSector(mobj_t * thing)
+{
+    mobj_t *mo;
+
+    if (P_ThingHeightClip(thing))
+        return true;            // keep checking
+
+    // crunch bodies to giblets
+    if ((thing->flags & MF_CORPSE) && (thing->health <= 0))
+    {
+        if (thing->flags & MF_NOBLOOD)
+        {
+            P_RemoveMobj(thing);
+        }
+        else
+        {
+            if (thing->state != &states[S_GIBS1])
+            {
+                P_SetMobjState(thing, S_GIBS1);
+                thing->height = 0;
+                thing->radius = 0;
+                S_StartSound(thing, SFX_PLAYER_FALLING_SPLAT);
+            }
+        }
+        return true;            // keep checking
+    }
+
+    // crunch dropped items
+    if (thing->flags2 & MF2_DROPPED)
+    {
+        P_RemoveMobj(thing);
+        return true;            // keep checking
+    }
+
+    if (!(thing->flags & MF_SHOOTABLE))
+        return true;            // assume it is bloody gibs or something
+
+    nofit = true;
+    if (crushchange && !(leveltime & 3))
+    {
+        P_DamageMobj(thing, NULL, NULL, crushchange);
+        // spray blood in a random direction
+        if ((!(thing->flags & MF_NOBLOOD)) &&
+            (!(thing->flags2 & MF2_INVULNERABLE)))
+        {
+            mo = P_SpawnMobj(thing->x, thing->y, thing->z + thing->height / 2,
+                             MT_BLOOD);
+            mo->momx = P_SubRandom() << 12;
+            mo->momy = P_SubRandom() << 12;
+        }
+    }
+
+    return true;                // keep checking (crush other things)
+}
+
+/*
+===============
+=
+= P_ChangeSector
+=
+===============
+*/
+
+boolean P_ChangeSector(sector_t * sector, int crunch)
+{
+    int x, y;
+
+    nofit = false;
+    crushchange = crunch;
+
+// recheck heights for all things near the moving sector
+
+    for (x = sector->blockbox[BOXLEFT]; x <= sector->blockbox[BOXRIGHT]; x++)
+        for (y = sector->blockbox[BOXBOTTOM]; y <= sector->blockbox[BOXTOP];
+             y++)
+            P_BlockThingsIterator(x, y, PIT_ChangeSector);
+
+
+    return nofit;
+}
diff --git a/games/NXDoom/src/hexen/p_maputl.c b/games/NXDoom/src/hexen/p_maputl.c
new file mode 100644
index 000000000..1ed0aa968
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_maputl.c
@@ -0,0 +1,1072 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "m_bbox.h"
+#include "m_misc.h"
+#include "p_local.h"
+
+static mobj_t *RoughBlockCheck(mobj_t * mo, int index);
+
+/*
+===================
+=
+= P_AproxDistance
+=
+= Gives an estimation of distance (not exact)
+=
+===================
+*/
+
+fixed_t P_AproxDistance(fixed_t dx, fixed_t dy)
+{
+    dx = abs(dx);
+    dy = abs(dy);
+    if (dx < dy)
+        return dx + dy - (dx >> 1);
+    return dx + dy - (dy >> 1);
+}
+
+
+/*
+==================
+=
+= P_PointOnLineSide
+=
+= Returns 0 or 1
+==================
+*/
+
+int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line)
+{
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    if (!line->dx)
+    {
+        if (x <= line->v1->x)
+            return line->dy > 0;
+        return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+        if (y <= line->v1->y)
+            return line->dx < 0;
+        return line->dx > 0;
+    }
+
+    dx = (x - line->v1->x);
+    dy = (y - line->v1->y);
+
+    left = FixedMul(line->dy >> FRACBITS, dx);
+    right = FixedMul(dy, line->dx >> FRACBITS);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+/*
+=================
+=
+= P_BoxOnLineSide
+=
+= Considers the line to be infinite
+= Returns side 0 or 1, -1 if box crosses the line
+=================
+*/
+
+int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld)
+{
+    int p1 = 0, p2 = 0;
+
+    switch (ld->slopetype)
+    {
+        case ST_HORIZONTAL:
+            p1 = tmbox[BOXTOP] > ld->v1->y;
+            p2 = tmbox[BOXBOTTOM] > ld->v1->y;
+            if (ld->dx < 0)
+            {
+                p1 ^= 1;
+                p2 ^= 1;
+            }
+            break;
+        case ST_VERTICAL:
+            p1 = tmbox[BOXRIGHT] < ld->v1->x;
+            p2 = tmbox[BOXLEFT] < ld->v1->x;
+            if (ld->dy < 0)
+            {
+                p1 ^= 1;
+                p2 ^= 1;
+            }
+            break;
+        case ST_POSITIVE:
+            p1 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXTOP], ld);
+            p2 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
+            break;
+        case ST_NEGATIVE:
+            p1 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
+            p2 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
+            break;
+    }
+
+    if (p1 == p2)
+        return p1;
+    return -1;
+}
+
+/*
+==================
+=
+= P_PointOnDivlineSide
+=
+= Returns 0 or 1
+==================
+*/
+
+int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line)
+{
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    if (!line->dx)
+    {
+        if (x <= line->x)
+            return line->dy > 0;
+        return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+        if (y <= line->y)
+            return line->dx < 0;
+        return line->dx > 0;
+    }
+
+    dx = (x - line->x);
+    dy = (y - line->y);
+
+// try to quickly decide by looking at sign bits
+    if ((line->dy ^ line->dx ^ dx ^ dy) & 0x80000000)
+    {
+        if ((line->dy ^ dx) & 0x80000000)
+            return 1;           // (left is negative)
+        return 0;
+    }
+
+    left = FixedMul(line->dy >> 8, dx >> 8);
+    right = FixedMul(dy >> 8, line->dx >> 8);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+
+/*
+==============
+=
+= P_MakeDivline
+=
+==============
+*/
+
+void P_MakeDivline(line_t * li, divline_t * dl)
+{
+    dl->x = li->v1->x;
+    dl->y = li->v1->y;
+    dl->dx = li->dx;
+    dl->dy = li->dy;
+}
+
+
+/*
+===============
+=
+= P_InterceptVector
+=
+= Returns the fractional intercept point along the first divline
+=
+= This is only called by the addthings and addlines traversers
+===============
+*/
+
+fixed_t P_InterceptVector(divline_t * v2, divline_t * v1)
+{
+#if 1
+    fixed_t frac, num, den;
+
+    den = FixedMul(v1->dy >> 8, v2->dx) - FixedMul(v1->dx >> 8, v2->dy);
+    if (den == 0)
+        return 0;
+//              I_Error ("P_InterceptVector: parallel");
+    num = FixedMul((v1->x - v2->x) >> 8, v1->dy) +
+        FixedMul((v2->y - v1->y) >> 8, v1->dx);
+    frac = FixedDiv(num, den);
+
+    return frac;
+#else
+    float frac, num, den, v1x, v1y, v1dx, v1dy, v2x, v2y, v2dx, v2dy;
+
+    v1x = (float) v1->x / FRACUNIT;
+    v1y = (float) v1->y / FRACUNIT;
+    v1dx = (float) v1->dx / FRACUNIT;
+    v1dy = (float) v1->dy / FRACUNIT;
+    v2x = (float) v2->x / FRACUNIT;
+    v2y = (float) v2->y / FRACUNIT;
+    v2dx = (float) v2->dx / FRACUNIT;
+    v2dy = (float) v2->dy / FRACUNIT;
+
+    den = v1dy * v2dx - v1dx * v2dy;
+    if (den == 0)
+        return 0;               // parallel
+    num = (v1x - v2x) * v1dy + (v2y - v1y) * v1dx;
+    frac = num / den;
+
+    return frac * FRACUNIT;
+#endif
+}
+
+/*
+==================
+=
+= P_LineOpening
+=
+= Sets opentop and openbottom to the window through a two sided line
+= OPTIMIZE: keep this precalculated
+==================
+*/
+
+fixed_t opentop, openbottom, openrange;
+fixed_t lowfloor;
+
+void P_LineOpening(line_t * linedef)
+{
+    sector_t *front, *back;
+
+    if (linedef->sidenum[1] == -1)
+    {                           // single sided line
+        openrange = 0;
+        return;
+    }
+
+    front = linedef->frontsector;
+    back = linedef->backsector;
+
+    if (front->ceilingheight < back->ceilingheight)
+        opentop = front->ceilingheight;
+    else
+        opentop = back->ceilingheight;
+    if (front->floorheight > back->floorheight)
+    {
+        openbottom = front->floorheight;
+        lowfloor = back->floorheight;
+        tmfloorpic = front->floorpic;
+    }
+    else
+    {
+        openbottom = back->floorheight;
+        lowfloor = front->floorheight;
+        tmfloorpic = back->floorpic;
+    }
+
+    openrange = opentop - openbottom;
+}
+
+/*
+===============================================================================
+
+						THING POSITION SETTING
+
+===============================================================================
+*/
+
+/*
+===================
+=
+= P_UnsetThingPosition
+=
+= Unlinks a thing from block map and sectors
+=
+===================
+*/
+
+void P_UnsetThingPosition(mobj_t * thing)
+{
+    int blockx, blocky;
+
+    if (!(thing->flags & MF_NOSECTOR))
+    {                           // inert things don't need to be in blockmap
+// unlink from subsector
+        if (thing->snext)
+            thing->snext->sprev = thing->sprev;
+        if (thing->sprev)
+            thing->sprev->snext = thing->snext;
+        else
+            thing->subsector->sector->thinglist = thing->snext;
+    }
+
+    if (!(thing->flags & MF_NOBLOCKMAP))
+    {                           // inert things don't need to be in blockmap
+// unlink from block map
+        if (thing->bnext)
+            thing->bnext->bprev = thing->bprev;
+        if (thing->bprev)
+            thing->bprev->bnext = thing->bnext;
+        else
+        {
+            blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
+            blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
+            if (blockx >= 0 && blockx < bmapwidth
+                && blocky >= 0 && blocky < bmapheight)
+                blocklinks[blocky * bmapwidth + blockx] = thing->bnext;
+        }
+    }
+}
+
+
+/*
+===================
+=
+= P_SetThingPosition
+=
+= Links a thing into both a block and a subsector based on it's x y
+= Sets thing->subsector properly
+=
+===================
+*/
+
+void P_SetThingPosition(mobj_t * thing)
+{
+    subsector_t *ss;
+    sector_t *sec;
+    int blockx, blocky;
+    mobj_t **link;
+
+//
+// link into subsector
+//
+    ss = R_PointInSubsector(thing->x, thing->y);
+    thing->subsector = ss;
+    if (!(thing->flags & MF_NOSECTOR))
+    {                           // invisible things don't go into the sector links
+        sec = ss->sector;
+
+        thing->sprev = NULL;
+        thing->snext = sec->thinglist;
+        if (sec->thinglist)
+            sec->thinglist->sprev = thing;
+        sec->thinglist = thing;
+    }
+
+//
+// link into blockmap
+//
+    if (!(thing->flags & MF_NOBLOCKMAP))
+    {                           // inert things don't need to be in blockmap
+        blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
+        blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
+        if (blockx >= 0 && blockx < bmapwidth && blocky >= 0
+            && blocky < bmapheight)
+        {
+            link = &blocklinks[blocky * bmapwidth + blockx];
+            thing->bprev = NULL;
+            thing->bnext = *link;
+            if (*link)
+                (*link)->bprev = thing;
+            *link = thing;
+        }
+        else
+        {                       // thing is off the map
+            thing->bnext = thing->bprev = NULL;
+        }
+    }
+}
+
+
+
+/*
+===============================================================================
+
+						BLOCK MAP ITERATORS
+
+For each line/thing in the given mapblock, call the passed function.
+If the function returns false, exit with false without checking anything else.
+
+===============================================================================
+*/
+
+/*
+==================
+=
+= P_BlockLinesIterator
+=
+= The validcount flags are used to avoid checking lines
+= that are marked in multiple mapblocks, so increment validcount before
+= the first call to P_BlockLinesIterator, then make one or more calls to it
+===================
+*/
+
+boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *))
+{
+    int offset;
+    short *list;
+    line_t *ld;
+
+    int i;
+    polyblock_t *polyLink;
+    seg_t **tempSeg;
+
+    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+        return true;
+    offset = y * bmapwidth + x;
+
+    polyLink = PolyBlockMap[offset];
+    while (polyLink)
+    {
+        if (polyLink->polyobj)
+        {
+            if (polyLink->polyobj->validcount != validcount)
+            {
+                polyLink->polyobj->validcount = validcount;
+                tempSeg = polyLink->polyobj->segs;
+                for (i = 0; i < polyLink->polyobj->numsegs; i++, tempSeg++)
+                {
+                    if ((*tempSeg)->linedef->validcount == validcount)
+                    {
+                        continue;
+                    }
+                    (*tempSeg)->linedef->validcount = validcount;
+                    if (!func((*tempSeg)->linedef))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        polyLink = polyLink->next;
+    }
+
+    offset = *(blockmap + offset);
+
+    for (list = blockmaplump + offset; *list != -1; list++)
+    {
+        ld = &lines[*list];
+        if (ld->validcount == validcount)
+            continue;           // line has already been checked
+        ld->validcount = validcount;
+
+        if (!func(ld))
+            return false;
+    }
+
+    return true;                // everything was checked
+}
+
+
+/*
+==================
+=
+= P_BlockThingsIterator
+=
+==================
+*/
+
+boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *))
+{
+    mobj_t *mobj;
+
+    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+        return true;
+
+    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
+
+    for (mobj = blocklinks[y * bmapwidth + x]; mobj; mobj = mobj->bnext)
+        if (!func(mobj))
+            return false;
+
+    return true;
+}
+
+/*
+===============================================================================
+
+					INTERCEPT ROUTINES
+
+===============================================================================
+*/
+
+intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
+
+divline_t trace;
+boolean earlyout;
+int ptflags;
+
+/*
+==================
+=
+= PIT_AddLineIntercepts
+=
+= Looks for lines in the given block that intercept the given trace
+= to add to the intercepts list
+= A line is crossed if its endpoints are on opposite sides of the trace
+= Returns true if earlyout and a solid line hit
+==================
+*/
+
+boolean PIT_AddLineIntercepts(line_t * ld)
+{
+    int s1, s2;
+    fixed_t frac;
+    divline_t dl;
+
+// avoid precision problems with two routines
+    if (trace.dx > FRACUNIT * 16 || trace.dy > FRACUNIT * 16
+        || trace.dx < -FRACUNIT * 16 || trace.dy < -FRACUNIT * 16)
+    {
+        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
+        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
+    }
+    else
+    {
+        s1 = P_PointOnLineSide(trace.x, trace.y, ld);
+        s2 = P_PointOnLineSide(trace.x + trace.dx, trace.y + trace.dy, ld);
+    }
+    if (s1 == s2)
+        return true;            // line isn't crossed
+
+//
+// hit the line
+//
+    P_MakeDivline(ld, &dl);
+    frac = P_InterceptVector(&trace, &dl);
+    if (frac < 0)
+        return true;            // behind source
+
+// try to early out the check
+    if (earlyout && frac < FRACUNIT && !ld->backsector)
+        return false;           // stop checking
+
+    intercept_p->frac = frac;
+    intercept_p->isaline = true;
+    intercept_p->d.line = ld;
+    intercept_p++;
+
+    return true;                // continue
+}
+
+
+
+/*
+==================
+=
+= PIT_AddThingIntercepts
+=
+==================
+*/
+
+boolean PIT_AddThingIntercepts(mobj_t * thing)
+{
+    fixed_t x1, y1, x2, y2;
+    int s1, s2;
+    boolean tracepositive;
+    divline_t dl;
+    fixed_t frac;
+
+    tracepositive = (trace.dx ^ trace.dy) > 0;
+
+    // check a corner to corner crossection for hit
+
+    if (tracepositive)
+    {
+        x1 = thing->x - thing->radius;
+        y1 = thing->y + thing->radius;
+
+        x2 = thing->x + thing->radius;
+        y2 = thing->y - thing->radius;
+    }
+    else
+    {
+        x1 = thing->x - thing->radius;
+        y1 = thing->y - thing->radius;
+
+        x2 = thing->x + thing->radius;
+        y2 = thing->y + thing->radius;
+    }
+    s1 = P_PointOnDivlineSide(x1, y1, &trace);
+    s2 = P_PointOnDivlineSide(x2, y2, &trace);
+    if (s1 == s2)
+        return true;            // line isn't crossed
+
+    dl.x = x1;
+    dl.y = y1;
+    dl.dx = x2 - x1;
+    dl.dy = y2 - y1;
+    frac = P_InterceptVector(&trace, &dl);
+    if (frac < 0)
+        return true;            // behind source
+    intercept_p->frac = frac;
+    intercept_p->isaline = false;
+    intercept_p->d.thing = thing;
+    intercept_p++;
+
+    return true;                // keep going
+}
+
+
+/*
+====================
+=
+= P_TraverseIntercepts
+=
+= Returns true if the traverser function returns true for all lines
+====================
+*/
+
+boolean P_TraverseIntercepts(traverser_t func, fixed_t maxfrac)
+{
+    int count;
+    fixed_t dist;
+    intercept_t *scan, *in;
+
+    count = intercept_p - intercepts;
+    in = 0;                     // shut up compiler warning
+
+    while (count--)
+    {
+        dist = INT_MAX;
+        for (scan = intercepts; scan < intercept_p; scan++)
+            if (scan->frac < dist)
+            {
+                dist = scan->frac;
+                in = scan;
+            }
+
+        if (dist > maxfrac)
+            return true;        // checked everything in range
+#if 0
+        {                       // don't check these yet, ther may be others inserted
+            in = scan = intercepts;
+            for (scan = intercepts; scan < intercept_p; scan++)
+                if (scan->frac > maxfrac)
+                    *in++ = *scan;
+            intercept_p = in;
+            return false;
+        }
+#endif
+
+        if (!func(in))
+            return false;       // don't bother going farther
+        in->frac = INT_MAX;
+    }
+
+    return true;                // everything was traversed
+}
+
+
+
+/*
+==================
+=
+= P_PathTraverse
+=
+= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
+= Returns true if the traverser function returns true for all lines
+==================
+*/
+
+boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                       int flags, boolean(*trav) (intercept_t *))
+{
+    fixed_t xt1, yt1, xt2, yt2;
+    fixed_t xstep, ystep;
+    fixed_t partial;
+    fixed_t xintercept, yintercept;
+    int mapx, mapy, mapxstep, mapystep;
+    int count;
+
+    earlyout = (flags & PT_EARLYOUT) != 0;
+
+    validcount++;
+    intercept_p = intercepts;
+
+    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
+        x1 += FRACUNIT;         // don't side exactly on a line
+    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
+        y1 += FRACUNIT;         // don't side exactly on a line
+    trace.x = x1;
+    trace.y = y1;
+    trace.dx = x2 - x1;
+    trace.dy = y2 - y1;
+
+    x1 -= bmaporgx;
+    y1 -= bmaporgy;
+    xt1 = x1 >> MAPBLOCKSHIFT;
+    yt1 = y1 >> MAPBLOCKSHIFT;
+
+    x2 -= bmaporgx;
+    y2 -= bmaporgy;
+    xt2 = x2 >> MAPBLOCKSHIFT;
+    yt2 = y2 >> MAPBLOCKSHIFT;
+
+    if (xt2 > xt1)
+    {
+        mapxstep = 1;
+        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else if (xt2 < xt1)
+    {
+        mapxstep = -1;
+        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else
+    {
+        mapxstep = 0;
+        partial = FRACUNIT;
+        ystep = 256 * FRACUNIT;
+    }
+    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
+
+
+    if (yt2 > yt1)
+    {
+        mapystep = 1;
+        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else if (yt2 < yt1)
+    {
+        mapystep = -1;
+        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else
+    {
+        mapystep = 0;
+        partial = FRACUNIT;
+        xstep = 256 * FRACUNIT;
+    }
+    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
+
+
+//
+// step through map blocks
+// Count is present to prevent a round off error from skipping the break
+    mapx = xt1;
+    mapy = yt1;
+
+    for (count = 0; count < 64; count++)
+    {
+        if (flags & PT_ADDLINES)
+        {
+            if (!P_BlockLinesIterator(mapx, mapy, PIT_AddLineIntercepts))
+                return false;   // early out
+        }
+        if (flags & PT_ADDTHINGS)
+        {
+            if (!P_BlockThingsIterator(mapx, mapy, PIT_AddThingIntercepts))
+                return false;   // early out
+        }
+
+        if (mapx == xt2 && mapy == yt2)
+            break;
+
+        if ((yintercept >> FRACBITS) == mapy)
+        {
+            yintercept += ystep;
+            mapx += mapxstep;
+        }
+        else if ((xintercept >> FRACBITS) == mapx)
+        {
+            xintercept += xstep;
+            mapy += mapystep;
+        }
+
+    }
+
+
+//
+// go through the sorted list
+//
+    return P_TraverseIntercepts(trav, FRACUNIT);
+}
+
+//===========================================================================
+//
+// P_RoughMonsterSearch
+//
+// Searches though the surrounding mapblocks for monsters/players
+//              distance is in MAPBLOCKUNITS
+//===========================================================================
+
+mobj_t *P_RoughMonsterSearch(mobj_t * mo, int distance)
+{
+    int blockX;
+    int blockY;
+    int startX, startY;
+    int blockIndex;
+    int firstStop;
+    int secondStop;
+    int thirdStop;
+    int finalStop;
+    int count;
+    mobj_t *target;
+
+    startX = (mo->x - bmaporgx) >> MAPBLOCKSHIFT;
+    startY = (mo->y - bmaporgy) >> MAPBLOCKSHIFT;
+
+    if (startX >= 0 && startX < bmapwidth && startY >= 0
+        && startY < bmapheight)
+    {
+        target = RoughBlockCheck(mo, startY * bmapwidth + startX);
+        if (target != NULL)
+        {                       // found a target right away
+            return target;
+        }
+    }
+    for (count = 1; count <= distance; count++)
+    {
+        blockX = startX - count;
+        blockY = startY - count;
+
+        if (blockY < 0)
+        {
+            blockY = 0;
+        }
+        else if (blockY >= bmapheight)
+        {
+            blockY = bmapheight - 1;
+        }
+        if (blockX < 0)
+        {
+            blockX = 0;
+        }
+        else if (blockX >= bmapwidth)
+        {
+            blockX = bmapwidth - 1;
+        }
+        blockIndex = blockY * bmapwidth + blockX;
+        firstStop = startX + count;
+        if (firstStop < 0)
+        {
+            continue;
+        }
+        if (firstStop >= bmapwidth)
+        {
+            firstStop = bmapwidth - 1;
+        }
+        secondStop = startY + count;
+        if (secondStop < 0)
+        {
+            continue;
+        }
+        if (secondStop >= bmapheight)
+        {
+            secondStop = bmapheight - 1;
+        }
+        thirdStop = secondStop * bmapwidth + blockX;
+        secondStop = secondStop * bmapwidth + firstStop;
+        firstStop += blockY * bmapwidth;
+        finalStop = blockIndex;
+
+        // Trace the first block section (along the top)
+        for (; blockIndex <= firstStop; blockIndex++)
+        {
+            target = RoughBlockCheck(mo, blockIndex);
+            if (target != NULL)
+            {
+                return target;
+            }
+        }
+        // Trace the second block section (right edge)
+        for (blockIndex--; blockIndex <= secondStop; blockIndex += bmapwidth)
+        {
+            target = RoughBlockCheck(mo, blockIndex);
+            if (target != NULL)
+            {
+                return target;
+            }
+        }
+        // Trace the third block section (bottom edge)
+        for (blockIndex -= bmapwidth; blockIndex >= thirdStop; blockIndex--)
+        {
+            target = RoughBlockCheck(mo, blockIndex);
+            if (target != NULL)
+            {
+                return target;
+            }
+        }
+        // Trace the final block section (left edge)
+        for (blockIndex++; blockIndex > finalStop; blockIndex -= bmapwidth)
+        {
+            target = RoughBlockCheck(mo, blockIndex);
+            if (target != NULL)
+            {
+                return target;
+            }
+        }
+    }
+    return NULL;
+}
+
+//===========================================================================
+//
+// RoughBlockCheck
+//
+//===========================================================================
+
+static mobj_t *RoughBlockCheck(mobj_t * mo, int index)
+{
+    mobj_t *link;
+    mobj_t *master;
+    angle_t angle;
+
+    link = blocklinks[index];
+    while (link)
+    {
+        if (mo->player)         // Minotaur looking around player
+        {
+            if ((link->flags & MF_COUNTKILL) ||
+                (link->player && (link != mo)))
+            {
+                if (!(link->flags & MF_SHOOTABLE))
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (link->flags2 & MF2_DORMANT)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if ((link->type == MT_MINOTAUR) &&
+                    (link->special1.m == mo))
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (netgame && !deathmatch && link->player)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (P_CheckSight(mo, link))
+                {
+                    return link;
+                }
+            }
+            link = link->bnext;
+        }
+        else if (mo->type == MT_MINOTAUR)       // looking around minotaur
+        {
+            master = mo->special1.m;
+            if ((link->flags & MF_COUNTKILL) ||
+                (link->player && (link != master)))
+            {
+                if (!(link->flags & MF_SHOOTABLE))
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (link->flags2 & MF2_DORMANT)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if ((link->type == MT_MINOTAUR) &&
+                    (link->special1.m == mo->special1.m))
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (netgame && !deathmatch && link->player)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (P_CheckSight(mo, link))
+                {
+                    return link;
+                }
+            }
+            link = link->bnext;
+        }
+        else if (mo->type == MT_MSTAFF_FX2)     // bloodscourge
+        {
+            if ((link->flags & MF_COUNTKILL ||
+                 (link->player && link != mo->target))
+                && !(link->flags2 & MF2_DORMANT))
+            {
+                if (!(link->flags & MF_SHOOTABLE))
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (netgame && !deathmatch && link->player)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                else if (P_CheckSight(mo, link))
+                {
+                    master = mo->target;
+                    angle = R_PointToAngle2(master->x, master->y,
+                                            link->x, link->y) - master->angle;
+                    angle >>= 24;
+                    if (angle > 226 || angle < 30)
+                    {
+                        return link;
+                    }
+                }
+            }
+            link = link->bnext;
+        }
+        else                    // spirits
+        {
+            if ((link->flags & MF_COUNTKILL ||
+                 (link->player && link != mo->target))
+                && !(link->flags2 & MF2_DORMANT))
+            {
+                if (!(link->flags & MF_SHOOTABLE))
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (netgame && !deathmatch && link->player)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                if (link == mo->target)
+                {
+                    link = link->bnext;
+                    continue;
+                }
+                else if (P_CheckSight(mo, link))
+                {
+                    return link;
+                }
+            }
+            link = link->bnext;
+        }
+    }
+    return NULL;
+}
diff --git a/games/NXDoom/src/hexen/p_mobj.c b/games/NXDoom/src/hexen/p_mobj.c
new file mode 100644
index 000000000..0c302ed14
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_mobj.c
@@ -0,0 +1,2469 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "sounds.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAX_TID_COUNT 200
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+void G_PlayerReborn(int player);
+void P_MarkAsLeaving(mobj_t * corpse);
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+void P_SpawnMapThing(mapthing_t * mthing);
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void PlayerLandedOnThing(mobj_t * mo, mobj_t * onmobj);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+mobjtype_t PuffType;
+mobj_t *MissileMobj;
+
+fixed_t FloatBobOffsets[64] = {
+    0, 51389, 102283, 152192,
+    200636, 247147, 291278, 332604,
+    370727, 405280, 435929, 462380,
+    484378, 501712, 514213, 521763,
+    524287, 521763, 514213, 501712,
+    484378, 462380, 435929, 405280,
+    370727, 332604, 291278, 247147,
+    200636, 152192, 102283, 51389,
+    -1, -51390, -102284, -152193,
+    -200637, -247148, -291279, -332605,
+    -370728, -405281, -435930, -462381,
+    -484380, -501713, -514215, -521764,
+    -524288, -521764, -514214, -501713,
+    -484379, -462381, -435930, -405280,
+    -370728, -332605, -291279, -247148,
+    -200637, -152193, -102284, -51389
+};
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int TIDList[MAX_TID_COUNT + 1];  // +1 for termination marker
+static mobj_t *TIDMobj[MAX_TID_COUNT];
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// P_SetMobjState
+//
+// Returns true if the mobj is still present.
+//
+//==========================================================================
+
+boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
+{
+    state_t *st;
+
+    if (state == S_NULL)
+    {                           // Remove mobj
+        mobj->state = (state_t *) S_NULL;
+        P_RemoveMobj(mobj);
+        return (false);
+    }
+    st = &states[state];
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+    if (st->action)
+    {                           // Call action function
+        st->action(mobj, NULL, NULL);
+    }
+    return (true);
+}
+
+//==========================================================================
+//
+// P_SetMobjStateNF
+//
+// Same as P_SetMobjState, but does not call the state function.
+//
+//==========================================================================
+
+boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
+{
+    state_t *st;
+
+    if (state == S_NULL)
+    {                           // Remove mobj
+        mobj->state = (state_t *) S_NULL;
+        P_RemoveMobj(mobj);
+        return (false);
+    }
+    st = &states[state];
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ExplodeMissile
+//
+//----------------------------------------------------------------------------
+
+void P_ExplodeMissile(mobj_t * mo)
+{
+    mo->momx = mo->momy = mo->momz = 0;
+    P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
+    //mo->tics -= P_Random()&3;
+    mo->flags &= ~MF_MISSILE;
+
+    switch (mo->type)
+    {
+        case MT_SORCBALL1:
+        case MT_SORCBALL2:
+        case MT_SORCBALL3:
+            S_StartSound(NULL, SFX_SORCERER_BIGBALLEXPLODE);
+            break;
+        case MT_SORCFX1:
+            S_StartSound(NULL, SFX_SORCERER_HEADSCREAM);
+            break;
+        default:
+            if (mo->info->deathsound)
+            {
+                S_StartSound(mo, mo->info->deathsound);
+            }
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_FloorBounceMissile
+//
+//----------------------------------------------------------------------------
+
+void P_FloorBounceMissile(mobj_t * mo)
+{
+    if (P_HitFloor(mo) >= FLOOR_LIQUID)
+    {
+        switch (mo->type)
+        {
+            case MT_SORCFX1:
+            case MT_SORCBALL1:
+            case MT_SORCBALL2:
+            case MT_SORCBALL3:
+                break;
+            default:
+                P_RemoveMobj(mo);
+                return;
+        }
+    }
+    switch (mo->type)
+    {
+        case MT_SORCFX1:
+            mo->momz = -mo->momz;       // no energy absorbed
+            break;
+        case MT_SGSHARD1:
+        case MT_SGSHARD2:
+        case MT_SGSHARD3:
+        case MT_SGSHARD4:
+        case MT_SGSHARD5:
+        case MT_SGSHARD6:
+        case MT_SGSHARD7:
+        case MT_SGSHARD8:
+        case MT_SGSHARD9:
+        case MT_SGSHARD0:
+            mo->momz = FixedMul(mo->momz, -0.3 * FRACUNIT);
+            if (abs(mo->momz) < (FRACUNIT / 2))
+            {
+                P_SetMobjState(mo, S_NULL);
+                return;
+            }
+            break;
+        default:
+            mo->momz = FixedMul(mo->momz, -0.7 * FRACUNIT);
+            break;
+    }
+    mo->momx = 2 * mo->momx / 3;
+    mo->momy = 2 * mo->momy / 3;
+    if (mo->info->seesound)
+    {
+        switch (mo->type)
+        {
+            case MT_SORCBALL1:
+            case MT_SORCBALL2:
+            case MT_SORCBALL3:
+                if (!mo->args[0])
+                    S_StartSound(mo, mo->info->seesound);
+                break;
+            default:
+                S_StartSound(mo, mo->info->seesound);
+                break;
+        }
+        S_StartSound(mo, mo->info->seesound);
+    }
+//      P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ThrustMobj
+//
+//----------------------------------------------------------------------------
+
+void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move)
+{
+    angle >>= ANGLETOFINESHIFT;
+    mo->momx += FixedMul(move, finecosine[angle]);
+    mo->momy += FixedMul(move, finesine[angle]);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_FaceMobj
+//
+// Returns 1 if 'source' needs to turn clockwise, or 0 if 'source' needs
+// to turn counter clockwise.  'delta' is set to the amount 'source'
+// needs to turn.
+//
+//----------------------------------------------------------------------------
+
+int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta)
+{
+    angle_t diff;
+    angle_t angle1;
+    angle_t angle2;
+
+    angle1 = source->angle;
+    angle2 = R_PointToAngle2(source->x, source->y, target->x, target->y);
+    if (angle2 > angle1)
+    {
+        diff = angle2 - angle1;
+        if (diff > ANG180)
+        {
+            *delta = ANG_MAX - diff;
+            return (0);
+        }
+        else
+        {
+            *delta = diff;
+            return (1);
+        }
+    }
+    else
+    {
+        diff = angle1 - angle2;
+        if (diff > ANG180)
+        {
+            *delta = ANG_MAX - diff;
+            return (1);
+        }
+        else
+        {
+            *delta = diff;
+            return (0);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+//
+// The missile special1 field must be mobj_t *target.  Returns true if
+// target was tracked, false if not.
+//
+//----------------------------------------------------------------------------
+
+boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax)
+{
+    int dir;
+    int dist;
+    angle_t delta;
+    angle_t angle;
+    mobj_t *target;
+
+    target = actor->special1.m;
+    if (target == NULL)
+    {
+        return (false);
+    }
+    if (!(target->flags & MF_SHOOTABLE))
+    {                           // Target died
+        actor->special1.m = NULL;
+        return (false);
+    }
+    dir = P_FaceMobj(actor, target, &delta);
+    if (delta > thresh)
+    {
+        delta >>= 1;
+        if (delta > turnMax)
+        {
+            delta = turnMax;
+        }
+    }
+    if (dir)
+    {                           // Turn clockwise
+        actor->angle += delta;
+    }
+    else
+    {                           // Turn counter clockwise
+        actor->angle -= delta;
+    }
+    angle = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
+    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
+    if (actor->z + actor->height < target->z
+        || target->z + target->height < actor->z)
+    {                           // Need to seek vertically
+        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
+        dist = dist / actor->info->speed;
+        if (dist < 1)
+        {
+            dist = 1;
+        }
+        actor->momz = (target->z + (target->height >> 1)
+                       - (actor->z + (actor->height >> 1))) / dist;
+    }
+    return (true);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_XYMovement
+//
+//----------------------------------------------------------------------------
+
+#define STOPSPEED			0x1000
+#define FRICTION_NORMAL		0xe800
+#define FRICTION_LOW		0xf900
+#define FRICTION_FLY		0xeb00
+
+void P_XYMovement(mobj_t * mo)
+{
+    fixed_t ptryx, ptryy;
+    player_t *player;
+    fixed_t xmove, ymove;
+    int special;
+    angle_t angle;
+    static int windTab[3] = { 2048 * 5, 2048 * 10, 2048 * 25 };
+
+    if (!mo->momx && !mo->momy)
+    {
+        if (mo->flags & MF_SKULLFLY)
+        {                       // A flying mobj slammed into something
+            mo->flags &= ~MF_SKULLFLY;
+            mo->momx = mo->momy = mo->momz = 0;
+            P_SetMobjState(mo, mo->info->seestate);
+        }
+        return;
+    }
+    special = mo->subsector->sector->special;
+    if (mo->flags2 & MF2_WINDTHRUST)
+    {
+        switch (special)
+        {
+            case 40:
+            case 41:
+            case 42:           // Wind_East
+                P_ThrustMobj(mo, 0, windTab[special - 40]);
+                break;
+            case 43:
+            case 44:
+            case 45:           // Wind_North
+                P_ThrustMobj(mo, ANG90, windTab[special - 43]);
+                break;
+            case 46:
+            case 47:
+            case 48:           // Wind_South
+                P_ThrustMobj(mo, ANG270, windTab[special - 46]);
+                break;
+            case 49:
+            case 50:
+            case 51:           // Wind_West
+                P_ThrustMobj(mo, ANG180, windTab[special - 49]);
+                break;
+        }
+    }
+    player = mo->player;
+    if (mo->momx > MAXMOVE)
+    {
+        mo->momx = MAXMOVE;
+    }
+    else if (mo->momx < -MAXMOVE)
+    {
+        mo->momx = -MAXMOVE;
+    }
+    if (mo->momy > MAXMOVE)
+    {
+        mo->momy = MAXMOVE;
+    }
+    else if (mo->momy < -MAXMOVE)
+    {
+        mo->momy = -MAXMOVE;
+    }
+    xmove = mo->momx;
+    ymove = mo->momy;
+    do
+    {
+        if (xmove > MAXMOVE / 2 || ymove > MAXMOVE / 2)
+        {
+            ptryx = mo->x + xmove / 2;
+            ptryy = mo->y + ymove / 2;
+            xmove >>= 1;
+            ymove >>= 1;
+        }
+        else
+        {
+            ptryx = mo->x + xmove;
+            ptryy = mo->y + ymove;
+            xmove = ymove = 0;
+        }
+        if (!P_TryMove(mo, ptryx, ptryy))
+        {                       // Blocked move
+            if (mo->flags2 & MF2_SLIDE)
+            {                   // Try to slide along it
+                if (BlockingMobj == NULL)
+                {               // Slide against wall
+                    P_SlideMove(mo);
+                }
+                else
+                {               // Slide against mobj
+                    //if(P_TryMove(mo, mo->x, mo->y+mo->momy))
+                    if (P_TryMove(mo, mo->x, ptryy))
+                    {
+                        mo->momx = 0;
+                    }
+                    //else if(P_TryMove(mo, mo->x+mo->momx, mo->y))
+                    else if (P_TryMove(mo, ptryx, mo->y))
+                    {
+                        mo->momy = 0;
+                    }
+                    else
+                    {
+                        mo->momx = mo->momy = 0;
+                    }
+                }
+            }
+            else if (mo->flags & MF_MISSILE)
+            {
+                if (mo->flags2 & MF2_FLOORBOUNCE)
+                {
+                    if (BlockingMobj)
+                    {
+                        if ((BlockingMobj->flags2 & MF2_REFLECTIVE) ||
+                            ((!BlockingMobj->player) &&
+                             (!(BlockingMobj->flags & MF_COUNTKILL))))
+                        {
+                            fixed_t speed;
+
+                            angle = R_PointToAngle2(BlockingMobj->x,
+                                                    BlockingMobj->y, mo->x,
+                                                    mo->y) +
+                                ANG1 * ((P_Random() % 16) - 8);
+                            speed = P_AproxDistance(mo->momx, mo->momy);
+                            speed = FixedMul(speed, 0.75 * FRACUNIT);
+                            mo->angle = angle;
+                            angle >>= ANGLETOFINESHIFT;
+                            mo->momx = FixedMul(speed, finecosine[angle]);
+                            mo->momy = FixedMul(speed, finesine[angle]);
+                            if (mo->info->seesound)
+                            {
+                                S_StartSound(mo, mo->info->seesound);
+                            }
+                            return;
+                        }
+                        else
+                        {       // Struck a player/creature
+                            P_ExplodeMissile(mo);
+                        }
+                    }
+                    else
+                    {           // Struck a wall
+                        P_BounceWall(mo);
+                        switch (mo->type)
+                        {
+                            case MT_SORCBALL1:
+                            case MT_SORCBALL2:
+                            case MT_SORCBALL3:
+                            case MT_SORCFX1:
+                                break;
+                            default:
+                                if (mo->info->seesound)
+                                {
+                                    S_StartSound(mo, mo->info->seesound);
+                                }
+                                break;
+                        }
+                        return;
+                    }
+                }
+                if (BlockingMobj && (BlockingMobj->flags2 & MF2_REFLECTIVE))
+                {
+                    angle = R_PointToAngle2(BlockingMobj->x,
+                                            BlockingMobj->y, mo->x, mo->y);
+
+                    // Change angle for delflection/reflection
+                    switch (BlockingMobj->type)
+                    {
+                        case MT_CENTAUR:
+                        case MT_CENTAURLEADER:
+                            if (abs((int) angle - (int) BlockingMobj->angle) >> 24 > 45)
+                                goto explode;
+                            if (mo->type == MT_HOLY_FX)
+                                goto explode;
+                            // Drop through to sorcerer full reflection
+                        case MT_SORCBOSS:
+                            // Deflection
+                            if (P_Random() < 128)
+                                angle += ANG45;
+                            else
+                                angle -= ANG45;
+                            break;
+                        default:
+                            // Reflection
+                            angle += ANG1 * ((P_Random() % 16) - 8);
+                            break;
+                    }
+
+                    // Reflect the missile along angle
+                    mo->angle = angle;
+                    angle >>= ANGLETOFINESHIFT;
+                    mo->momx =
+                        FixedMul(mo->info->speed >> 1, finecosine[angle]);
+                    mo->momy =
+                        FixedMul(mo->info->speed >> 1, finesine[angle]);
+//                                      mo->momz = -mo->momz;
+                    if (mo->flags2 & MF2_SEEKERMISSILE)
+                    {
+                        mo->special1.m = mo->target;
+                    }
+                    mo->target = BlockingMobj;
+                    return;
+                }
+              explode:
+                // Explode a missile
+                if (ceilingline && ceilingline->backsector
+                    && ceilingline->backsector->ceilingpic == skyflatnum)
+                {               // Hack to prevent missiles exploding against the sky
+                    if (mo->type == MT_BLOODYSKULL)
+                    {
+                        mo->momx = mo->momy = 0;
+                        mo->momz = -FRACUNIT;
+                    }
+                    else if (mo->type == MT_HOLY_FX)
+                    {
+                        P_ExplodeMissile(mo);
+                    }
+                    else
+                    {
+                        P_RemoveMobj(mo);
+                    }
+                    return;
+                }
+                P_ExplodeMissile(mo);
+            }
+            //else if(mo->info->crashstate)
+            //{
+            //      mo->momx = mo->momy = 0;
+            //      P_SetMobjState(mo, mo->info->crashstate);
+            //      return;
+            //}
+            else
+            {
+                mo->momx = mo->momy = 0;
+            }
+        }
+    }
+    while (xmove || ymove);
+
+    // Friction
+
+    if (player && player->cheats & CF_NOMOMENTUM)
+    {                           // Debug option for no sliding at all
+        mo->momx = mo->momy = 0;
+        return;
+    }
+    if (mo->flags & (MF_MISSILE | MF_SKULLFLY))
+    {                           // No friction for missiles
+        return;
+    }
+    if (mo->z > mo->floorz && !(mo->flags2 & MF2_FLY)
+        && !(mo->flags2 & MF2_ONMOBJ))
+    {                           // No friction when falling
+        if (mo->type != MT_BLASTEFFECT)
+            return;
+    }
+    if (mo->flags & MF_CORPSE)
+    {                           // Don't stop sliding if halfway off a step with some momentum
+        if (mo->momx > FRACUNIT / 4 || mo->momx < -FRACUNIT / 4
+            || mo->momy > FRACUNIT / 4 || mo->momy < -FRACUNIT / 4)
+        {
+            if (mo->floorz != mo->subsector->sector->floorheight)
+            {
+                return;
+            }
+        }
+    }
+    if (mo->momx > -STOPSPEED && mo->momx < STOPSPEED
+        && mo->momy > -STOPSPEED && mo->momy < STOPSPEED
+        && (!player || (player->cmd.forwardmove == 0
+                        && player->cmd.sidemove == 0)))
+    {                           // If in a walking frame, stop moving
+        if (player)
+        {
+            if ((unsigned) ((player->mo->state - states)
+                            - PStateRun[player->class]) < 4)
+            {
+                P_SetMobjState(player->mo, PStateNormal[player->class]);
+            }
+        }
+        mo->momx = 0;
+        mo->momy = 0;
+    }
+    else
+    {
+        if (mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
+            && !(mo->flags2 & MF2_ONMOBJ))
+        {
+            mo->momx = FixedMul(mo->momx, FRICTION_FLY);
+            mo->momy = FixedMul(mo->momy, FRICTION_FLY);
+        }
+        else if (P_GetThingFloorType(mo) == FLOOR_ICE)
+        {
+            mo->momx = FixedMul(mo->momx, FRICTION_LOW);
+            mo->momy = FixedMul(mo->momy, FRICTION_LOW);
+        }
+        else
+        {
+            mo->momx = FixedMul(mo->momx, FRICTION_NORMAL);
+            mo->momy = FixedMul(mo->momy, FRICTION_NORMAL);
+        }
+    }
+}
+
+
+// Move this to p_inter ***
+void P_MonsterFallingDamage(mobj_t * mo)
+{
+    int damage;
+    int mom;
+
+    mom = abs(mo->momz);
+    if (mom > 35 * FRACUNIT)
+    {                           // automatic death
+        damage = 10000;
+    }
+    else
+    {
+        damage = ((mom - (23 * FRACUNIT)) * 6) >> FRACBITS;
+    }
+    damage = 10000;             // always kill 'em
+    P_DamageMobj(mo, NULL, NULL, damage);
+}
+
+
+
+/*
+===============
+=
+= P_ZMovement
+=
+===============
+*/
+
+void P_ZMovement(mobj_t * mo)
+{
+    int dist;
+    int delta;
+//
+// check for smooth step up
+//
+    if (mo->player && mo->z < mo->floorz)
+    {
+        mo->player->viewheight -= mo->floorz - mo->z;
+        mo->player->deltaviewheight =
+            (VIEWHEIGHT - mo->player->viewheight) >> 3;
+    }
+//
+// adjust height
+//
+    mo->z += mo->momz;
+    if (mo->flags & MF_FLOAT && mo->target)
+    {                           // float down towards target if too close
+        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
+        {
+            dist =
+                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
+            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
+            if (delta < 0 && dist < -(delta * 3))
+                mo->z -= FLOATSPEED;
+            else if (delta > 0 && dist < (delta * 3))
+                mo->z += FLOATSPEED;
+        }
+    }
+    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
+        && leveltime & 2)
+    {
+        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
+    }
+
+//
+// clip movement
+//
+    if (mo->z <= mo->floorz)
+    {                           // Hit the floor
+        if (mo->flags & MF_MISSILE)
+        {
+            mo->z = mo->floorz;
+            if (mo->flags2 & MF2_FLOORBOUNCE)
+            {
+                P_FloorBounceMissile(mo);
+                return;
+            }
+            else if (mo->type == MT_HOLY_FX)
+            {                   // The spirit struck the ground
+                mo->momz = 0;
+                P_HitFloor(mo);
+                return;
+            }
+            else if (mo->type == MT_MNTRFX2 || mo->type == MT_LIGHTNING_FLOOR)
+            {                   // Minotaur floor fire can go up steps
+                return;
+            }
+            else
+            {
+                P_HitFloor(mo);
+                P_ExplodeMissile(mo);
+                return;
+            }
+        }
+        if (mo->flags & MF_COUNTKILL)   // Blasted mobj falling
+        {
+            if (mo->momz < -(23 * FRACUNIT))
+            {
+                P_MonsterFallingDamage(mo);
+            }
+        }
+        if (mo->z - mo->momz > mo->floorz)
+        {                       // Spawn splashes, etc.
+            P_HitFloor(mo);
+        }
+        mo->z = mo->floorz;
+        if (mo->momz < 0)
+        {
+            if (mo->flags2 & MF2_ICEDAMAGE && mo->momz < -GRAVITY * 8)
+            {
+                mo->tics = 1;
+                mo->momx = 0;
+                mo->momy = 0;
+                mo->momz = 0;
+                return;
+            }
+            if (mo->player)
+            {
+                mo->player->jumpTics = 7;       // delay any jumping for a short time
+                if (mo->momz < -GRAVITY * 8 && !(mo->flags2 & MF2_FLY))
+                {               // squat down
+                    mo->player->deltaviewheight = mo->momz >> 3;
+                    if (mo->momz < -23 * FRACUNIT)
+                    {
+                        P_FallingDamage(mo->player);
+                        P_NoiseAlert(mo, mo);
+                    }
+                    else if (mo->momz < -GRAVITY * 12
+                             && !mo->player->morphTics)
+                    {
+                        S_StartSound(mo, SFX_PLAYER_LAND);
+                        switch (mo->player->class)
+                        {
+                            case PCLASS_FIGHTER:
+                                S_StartSound(mo, SFX_PLAYER_FIGHTER_GRUNT);
+                                break;
+                            case PCLASS_CLERIC:
+                                S_StartSound(mo, SFX_PLAYER_CLERIC_GRUNT);
+                                break;
+                            case PCLASS_MAGE:
+                                S_StartSound(mo, SFX_PLAYER_MAGE_GRUNT);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    else if ((P_GetThingFloorType(mo) < FLOOR_LIQUID) &&
+                             (!mo->player->morphTics))
+                    {
+                        S_StartSound(mo, SFX_PLAYER_LAND);
+                    }
+                    // haleyjd: removed externdriver crap
+                    mo->player->centering = true;
+                }
+            }
+            else if (mo->type >= MT_POTTERY1 && mo->type <= MT_POTTERY3)
+            {
+                P_DamageMobj(mo, NULL, NULL, 25);
+            }
+            else if (mo->flags & MF_COUNTKILL)
+            {
+                if (mo->momz < -23 * FRACUNIT)
+                {
+                    // Doesn't get here
+                }
+            }
+            mo->momz = 0;
+        }
+        if (mo->flags & MF_SKULLFLY)
+        {                       // The skull slammed into something
+            mo->momz = -mo->momz;
+        }
+        if (mo->info->crashstate &&
+            (mo->flags & MF_CORPSE) && !(mo->flags2 & MF2_ICEDAMAGE))
+        {
+            P_SetMobjState(mo, mo->info->crashstate);
+            return;
+        }
+    }
+    else if (mo->flags2 & MF2_LOGRAV)
+    {
+        if (mo->momz == 0)
+            mo->momz = -(GRAVITY >> 3) * 2;
+        else
+            mo->momz -= GRAVITY >> 3;
+    }
+    else if (!(mo->flags & MF_NOGRAVITY))
+    {
+        if (mo->momz == 0)
+            mo->momz = -GRAVITY * 2;
+        else
+            mo->momz -= GRAVITY;
+    }
+
+    if (mo->z + mo->height > mo->ceilingz)
+    {                           // hit the ceiling
+        if (mo->momz > 0)
+            mo->momz = 0;
+        mo->z = mo->ceilingz - mo->height;
+        if (mo->flags2 & MF2_FLOORBOUNCE)
+        {
+            // Maybe reverse momentum here for ceiling bounce
+            // Currently won't happen
+
+            if (mo->info->seesound)
+            {
+                S_StartSound(mo, mo->info->seesound);
+            }
+            return;
+        }
+        if (mo->flags & MF_SKULLFLY)
+        {                       // the skull slammed into something
+            mo->momz = -mo->momz;
+        }
+        if (mo->flags & MF_MISSILE)
+        {
+            if (mo->type == MT_LIGHTNING_CEILING)
+            {
+                return;
+            }
+            if (mo->subsector->sector->ceilingpic == skyflatnum)
+            {
+                if (mo->type == MT_BLOODYSKULL)
+                {
+                    mo->momx = mo->momy = 0;
+                    mo->momz = -FRACUNIT;
+                }
+                else if (mo->type == MT_HOLY_FX)
+                {
+                    P_ExplodeMissile(mo);
+                }
+                else
+                {
+                    P_RemoveMobj(mo);
+                }
+                return;
+            }
+            P_ExplodeMissile(mo);
+            return;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_BlasterMobjThinker
+//
+//
+//----------------------------------------------------------------------------
+
+void P_BlasterMobjThinker(thinker_t *thinker)
+{
+    mobj_t *mobj = (mobj_t *) thinker;
+    int i;
+    fixed_t xfrac;
+    fixed_t yfrac;
+    fixed_t zfrac;
+    fixed_t z;
+    boolean changexy;
+    mobj_t *mo;
+
+    // Handle movement
+    if (mobj->momx || mobj->momy || (mobj->z != mobj->floorz) || mobj->momz)
+    {
+        xfrac = mobj->momx >> 3;
+        yfrac = mobj->momy >> 3;
+        zfrac = mobj->momz >> 3;
+        changexy = xfrac || yfrac;
+        for (i = 0; i < 8; i++)
+        {
+            if (changexy)
+            {
+                if (!P_TryMove(mobj, mobj->x + xfrac, mobj->y + yfrac))
+                {               // Blocked move
+                    P_ExplodeMissile(mobj);
+                    return;
+                }
+            }
+            mobj->z += zfrac;
+            if (mobj->z <= mobj->floorz)
+            {                   // Hit the floor
+                mobj->z = mobj->floorz;
+                P_HitFloor(mobj);
+                P_ExplodeMissile(mobj);
+                return;
+            }
+            if (mobj->z + mobj->height > mobj->ceilingz)
+            {                   // Hit the ceiling
+                mobj->z = mobj->ceilingz - mobj->height;
+                P_ExplodeMissile(mobj);
+                return;
+            }
+            if (changexy)
+            {
+                if (mobj->type == MT_MWAND_MISSILE && (P_Random() < 128))
+                {
+                    z = mobj->z - 8 * FRACUNIT;
+                    if (z < mobj->floorz)
+                    {
+                        z = mobj->floorz;
+                    }
+                    P_SpawnMobj(mobj->x, mobj->y, z, MT_MWANDSMOKE);
+                }
+                else if (!--mobj->special1.i)
+                {
+                    mobj->special1.i = 4;
+                    z = mobj->z - 12 * FRACUNIT;
+                    if (z < mobj->floorz)
+                    {
+                        z = mobj->floorz;
+                    }
+                    mo = P_SpawnMobj(mobj->x, mobj->y, z, MT_CFLAMEFLOOR);
+                    if (mo)
+                    {
+                        mo->angle = mobj->angle;
+                    }
+                }
+            }
+        }
+    }
+    // Advance the state
+    if (mobj->tics != -1)
+    {
+        mobj->tics--;
+        while (!mobj->tics)
+        {
+            if (!P_SetMobjState(mobj, mobj->state->nextstate))
+            {                   // mobj was removed
+                return;
+            }
+        }
+    }
+}
+
+//===========================================================================
+//
+// PlayerLandedOnThing
+//
+//===========================================================================
+
+static void PlayerLandedOnThing(mobj_t * mo, mobj_t * onmobj)
+{
+    mo->player->deltaviewheight = mo->momz >> 3;
+    if (mo->momz < -23 * FRACUNIT)
+    {
+        P_FallingDamage(mo->player);
+        P_NoiseAlert(mo, mo);
+    }
+    else if (mo->momz < -GRAVITY * 12 && !mo->player->morphTics)
+    {
+        S_StartSound(mo, SFX_PLAYER_LAND);
+        switch (mo->player->class)
+        {
+            case PCLASS_FIGHTER:
+                S_StartSound(mo, SFX_PLAYER_FIGHTER_GRUNT);
+                break;
+            case PCLASS_CLERIC:
+                S_StartSound(mo, SFX_PLAYER_CLERIC_GRUNT);
+                break;
+            case PCLASS_MAGE:
+                S_StartSound(mo, SFX_PLAYER_MAGE_GRUNT);
+                break;
+            default:
+                break;
+        }
+    }
+    else if (!mo->player->morphTics)
+    {
+        S_StartSound(mo, SFX_PLAYER_LAND);
+    }
+    // haleyjd: removed externdriver crap
+    mo->player->centering = true;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_MobjThinker
+//
+//----------------------------------------------------------------------------
+
+void P_MobjThinker(thinker_t *thinker)
+{
+    mobj_t *mobj = (mobj_t *) thinker;
+    mobj_t *onmo;
+/*
+	// Reset to not blasted when momentums are gone
+	if((mobj->flags2&MF2_BLASTED) && (!(mobj->momx)) && (!(mobj->momy)))
+		ResetBlasted(mobj);
+*/
+    // Handle X and Y momentums
+    BlockingMobj = NULL;
+    if (mobj->momx || mobj->momy || (mobj->flags & MF_SKULLFLY))
+    {
+        P_XYMovement(mobj);
+        if (mobj->thinker.function == (think_t) - 1)
+        {                       // mobj was removed
+            return;
+        }
+    }
+    else if (mobj->flags2 & MF2_BLASTED)
+    {                           // Reset to not blasted when momentums are gone
+        ResetBlasted(mobj);
+    }
+    if (mobj->flags2 & MF2_FLOATBOB)
+    {                           // Floating item bobbing motion (special1 is height)
+        mobj->z = mobj->floorz +
+            mobj->special1.i + FloatBobOffsets[(mobj->health++) & 63];
+    }
+    else if ((mobj->z != mobj->floorz) || mobj->momz || BlockingMobj)
+    {                           // Handle Z momentum and gravity
+        if (mobj->flags2 & MF2_PASSMOBJ)
+        {
+            if (!(onmo = P_CheckOnmobj(mobj)))
+            {
+                P_ZMovement(mobj);
+                if (mobj->player && mobj->flags & MF2_ONMOBJ)
+                {
+                    mobj->flags2 &= ~MF2_ONMOBJ;
+                }
+            }
+            else
+            {
+                if (mobj->player)
+                {
+                    if (mobj->momz < -GRAVITY * 8
+                        && !(mobj->flags2 & MF2_FLY))
+                    {
+                        PlayerLandedOnThing(mobj, onmo);
+                    }
+                    if (onmo->z + onmo->height - mobj->z <= 24 * FRACUNIT)
+                    {
+                        mobj->player->viewheight -= onmo->z + onmo->height
+                            - mobj->z;
+                        mobj->player->deltaviewheight =
+                            (VIEWHEIGHT - mobj->player->viewheight) >> 3;
+                        mobj->z = onmo->z + onmo->height;
+                        mobj->flags2 |= MF2_ONMOBJ;
+                        mobj->momz = 0;
+                    }
+                    else
+                    {           // hit the bottom of the blocking mobj
+                        mobj->momz = 0;
+                    }
+                }
+/* Landing on another player, and mimicking his movements
+				if(mobj->player && onmo->player)
+				{
+					mobj->momx = onmo->momx;
+					mobj->momy = onmo->momy;
+					if(onmo->z < onmo->floorz)
+					{
+						mobj->z += onmo->floorz-onmo->z;
+						if(onmo->player)
+						{
+							onmo->player->viewheight -= onmo->floorz-onmo->z;
+							onmo->player->deltaviewheight = (VIEWHEIGHT-
+								onmo->player->viewheight)>>3;
+						}
+						onmo->z = onmo->floorz;
+					}
+				}
+*/
+            }
+        }
+        else
+        {
+            P_ZMovement(mobj);
+        }
+        if (mobj->thinker.function == (think_t) - 1)
+        {                       // mobj was removed
+            return;
+        }
+    }
+
+    // Cycle through states, calling action functions at transitions
+    if (mobj->tics != -1)
+    {
+        mobj->tics--;
+        // you can cycle through multiple states in a tic
+        while (!mobj->tics)
+        {
+            if (!P_SetMobjState(mobj, mobj->state->nextstate))
+            {                   // mobj was removed
+                return;
+            }
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_SpawnMobj
+//
+//==========================================================================
+
+mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
+{
+    mobj_t *mobj;
+    state_t *st;
+    mobjinfo_t *info;
+    fixed_t space;
+
+    mobj = Z_Malloc(sizeof(*mobj), PU_LEVEL, NULL);
+    memset(mobj, 0, sizeof(*mobj));
+    info = &mobjinfo[type];
+    mobj->type = type;
+    mobj->info = info;
+    mobj->x = x;
+    mobj->y = y;
+    mobj->radius = info->radius;
+    mobj->height = info->height;
+    mobj->flags = info->flags;
+    mobj->flags2 = info->flags2;
+    mobj->damage = info->damage;
+    mobj->health = info->spawnhealth;
+    if (gameskill != sk_nightmare)
+    {
+        mobj->reactiontime = info->reactiontime;
+    }
+    mobj->lastlook = P_Random() % maxplayers;
+
+    // Set the state, but do not use P_SetMobjState, because action
+    // routines can't be called yet.  If the spawnstate has an action
+    // routine, it will not be called.
+    st = &states[info->spawnstate];
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+
+    // Set subsector and/or block links.
+    P_SetThingPosition(mobj);
+    mobj->floorz = mobj->subsector->sector->floorheight;
+    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+    if (z == ONFLOORZ)
+    {
+        mobj->z = mobj->floorz;
+    }
+    else if (z == ONCEILINGZ)
+    {
+        mobj->z = mobj->ceilingz - mobj->info->height;
+    }
+    else if (z == FLOATRANDZ)
+    {
+        space = ((mobj->ceilingz) - (mobj->info->height)) - mobj->floorz;
+        if (space > 48 * FRACUNIT)
+        {
+            space -= 40 * FRACUNIT;
+            mobj->z =
+                ((space * P_Random()) >> 8) + mobj->floorz + 40 * FRACUNIT;
+        }
+        else
+        {
+            mobj->z = mobj->floorz;
+        }
+    }
+    else if (mobj->flags2 & MF2_FLOATBOB)
+    {
+        mobj->z = mobj->floorz + z;     // artifact z passed in as height
+    }
+    else
+    {
+        mobj->z = z;
+    }
+    if (mobj->flags2 & MF2_FLOORCLIP
+        && P_GetThingFloorType(mobj) >= FLOOR_LIQUID
+        && mobj->z == mobj->subsector->sector->floorheight)
+    {
+        mobj->floorclip = 10 * FRACUNIT;
+    }
+    else
+    {
+        mobj->floorclip = 0;
+    }
+
+    mobj->thinker.function = P_MobjThinker;
+    P_AddThinker(&mobj->thinker);
+    return (mobj);
+}
+
+//==========================================================================
+//
+// P_RemoveMobj
+//
+//==========================================================================
+
+void P_RemoveMobj(mobj_t * mobj)
+{
+    // Remove from creature queue
+    if (mobj->flags & MF_COUNTKILL && mobj->flags & MF_CORPSE)
+    {
+        A_DeQueueCorpse(mobj);
+    }
+
+    if (mobj->tid)
+    {                           // Remove from TID list
+        P_RemoveMobjFromTIDList(mobj);
+    }
+
+    // Unlink from sector and block lists
+    P_UnsetThingPosition(mobj);
+
+    // Stop any playing sound
+    S_StopSound(mobj);
+
+    // Free block
+    P_RemoveThinker((thinker_t *) mobj);
+}
+
+//==========================================================================
+//
+// P_SpawnPlayer
+//
+// Called when a player is spawned on the level.  Most of the player
+// structure stays unchanged between levels.
+//
+//==========================================================================
+
+void P_SpawnPlayer(mapthing_t * mthing)
+{
+    player_t *p;
+    fixed_t x, y, z;
+    mobj_t *mobj;
+
+    if (mthing->type - 1 >= maxplayers || !playeringame[mthing->type - 1])
+    {                           // Not playing
+        return;
+    }
+
+    p = &players[mthing->type - 1];
+    if (p->playerstate == PST_REBORN)
+    {
+        G_PlayerReborn(mthing->type - 1);
+    }
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+    z = ONFLOORZ;
+    if (randomclass && deathmatch)
+    {
+        p->class = P_Random() % 3;
+        if (p->class == PlayerClass[mthing->type - 1])
+        {
+            p->class = (p->class + 1) % 3;
+        }
+        PlayerClass[mthing->type - 1] = p->class;
+        SB_SetClassData();
+    }
+    else
+    {
+        p->class = PlayerClass[mthing->type - 1];
+    }
+    switch (p->class)
+    {
+        case PCLASS_FIGHTER:
+            mobj = P_SpawnMobj(x, y, z, MT_PLAYER_FIGHTER);
+            break;
+        case PCLASS_CLERIC:
+            mobj = P_SpawnMobj(x, y, z, MT_PLAYER_CLERIC);
+            break;
+        case PCLASS_MAGE:
+            mobj = P_SpawnMobj(x, y, z, MT_PLAYER_MAGE);
+            break;
+        default:
+            I_Error("P_SpawnPlayer: Unknown class type");
+            return;
+    }
+
+    // Set translation table data
+    if (p->class == PCLASS_FIGHTER
+        && (mthing->type == 1 || mthing->type == 3))
+    {
+        // The first type should be blue, and the third should be the
+        // Fighter's original gold color
+        if (mthing->type == 1)
+        {
+            mobj->flags |= 2 << MF_TRANSSHIFT;
+        }
+    }
+    else if (mthing->type > 1)
+    {                           // Set color translation bits for player sprites
+        mobj->flags |= (mthing->type - 1) << MF_TRANSSHIFT;
+    }
+
+    mobj->angle = ANG45 * (mthing->angle / 45);
+    mobj->player = p;
+    mobj->health = p->health;
+    p->mo = mobj;
+    p->playerstate = PST_LIVE;
+    p->refire = 0;
+    P_ClearMessage(p);
+    p->damagecount = 0;
+    p->bonuscount = 0;
+    p->poisoncount = 0;
+    p->morphTics = 0;
+    p->extralight = 0;
+    p->fixedcolormap = 0;
+    p->viewheight = VIEWHEIGHT;
+    P_SetupPsprites(p);
+    if (deathmatch)
+    {                           // Give all keys in death match mode
+        p->keys = 2047;
+    }
+}
+
+//==========================================================================
+//
+// P_SpawnMapThing
+//
+// The fields of the mapthing should already be in host byte order.
+//
+//==========================================================================
+
+void P_SpawnMapThing(mapthing_t * mthing)
+{
+    int i;
+    unsigned int spawnMask;
+    mobj_t *mobj;
+    fixed_t x, y, z;
+    static unsigned int classFlags[] = {
+        MTF_FIGHTER,
+        MTF_CLERIC,
+        MTF_MAGE
+    };
+
+    // Count deathmatch start positions
+    if (mthing->type == 11)
+    {
+        if (deathmatch_p < &deathmatchstarts[MAXDEATHMATCHSTARTS])
+        {
+            memcpy(deathmatch_p, mthing, sizeof(*mthing));
+            deathmatch_p++;
+        }
+        return;
+    }
+    if (mthing->type == PO_ANCHOR_TYPE)
+    {                           // Polyobj Anchor Pt.
+        return;
+    }
+    else if (mthing->type == PO_SPAWN_TYPE
+             || mthing->type == PO_SPAWNCRUSH_TYPE)
+    {                           // Polyobj Anchor Pt.
+        po_NumPolyobjs++;
+        return;
+    }
+
+    // Check for player starts 1 to 4
+    if (mthing->type <= 4)
+    {
+        playerstarts[mthing->arg1][mthing->type - 1] = *mthing;
+        if (!deathmatch && !mthing->arg1)
+        {
+            P_SpawnPlayer(mthing);
+        }
+        return;
+    }
+    // Check for player starts 5 to 8
+    if (mthing->type >= 9100 && mthing->type <= 9103)
+    {
+        mapthing_t *player_start;
+        int player;
+
+        player = 4 + mthing->type - 9100;
+
+        player_start = &playerstarts[mthing->arg1][player];
+        memcpy(player_start, mthing, sizeof(mapthing_t));
+        player_start->type = player + 1;
+
+        if (!deathmatch && !player_start->arg1)
+        {
+            P_SpawnPlayer(player_start);
+        }
+        return;
+    }
+
+    if (mthing->type >= 1400 && mthing->type < 1410)
+    {
+        R_PointInSubsector(mthing->x << FRACBITS,
+                           mthing->y << FRACBITS)->sector->seqType =
+            mthing->type - 1400;
+        return;
+    }
+
+    // Check current game type with spawn flags
+    if (netgame == false)
+    {
+        spawnMask = MTF_GSINGLE;
+    }
+    else if (deathmatch)
+    {
+        spawnMask = MTF_GDEATHMATCH;
+    }
+    else
+    {
+        spawnMask = MTF_GCOOP;
+    }
+    if (!(mthing->options & spawnMask))
+    {
+        return;
+    }
+
+    // Check current skill with spawn flags
+    if (gameskill == sk_baby || gameskill == sk_easy)
+    {
+        spawnMask = MTF_EASY;
+    }
+    else if (gameskill == sk_hard || gameskill == sk_nightmare)
+    {
+        spawnMask = MTF_HARD;
+    }
+    else
+    {
+        spawnMask = MTF_NORMAL;
+    }
+    if (!(mthing->options & spawnMask))
+    {
+        return;
+    }
+
+    // Check current character classes with spawn flags
+    if (netgame == false)
+    {                           // Single player
+        if ((mthing->options & classFlags[PlayerClass[0]]) == 0)
+        {                       // Not for current class
+            return;
+        }
+    }
+    else if (deathmatch == false)
+    {                           // Cooperative
+        spawnMask = 0;
+        for (i = 0; i < maxplayers; i++)
+        {
+            if (playeringame[i])
+            {
+                spawnMask |= classFlags[PlayerClass[i]];
+            }
+        }
+        if ((mthing->options & spawnMask) == 0)
+        {
+            return;
+        }
+    }
+
+    // Find which type to spawn
+    for (i = 0; i < NUMMOBJTYPES; i++)
+    {
+        if (mthing->type == mobjinfo[i].doomednum)
+        {
+            break;
+        }
+    }
+
+    if (i == NUMMOBJTYPES)
+    {                           // Can't find thing type
+        I_Error("P_SpawnMapThing: Unknown type %i at (%i, %i)",
+                mthing->type, mthing->x, mthing->y);
+    }
+
+    // Don't spawn keys and players in deathmatch
+    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
+    {
+        return;
+    }
+
+    // Don't spawn monsters if -nomonsters
+    if (nomonsters && (mobjinfo[i].flags & MF_COUNTKILL))
+    {
+        return;
+    }
+
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+    if (mobjinfo[i].flags & MF_SPAWNCEILING)
+    {
+        z = ONCEILINGZ;
+    }
+    else if (mobjinfo[i].flags2 & MF2_SPAWNFLOAT)
+    {
+        z = FLOATRANDZ;
+    }
+    else if (mobjinfo[i].flags2 & MF2_FLOATBOB)
+    {
+        z = mthing->height << FRACBITS;
+    }
+    else
+    {
+        z = ONFLOORZ;
+    }
+    switch (i)
+    {                           // Special stuff
+        case MT_ZLYNCHED_NOHEART:
+            P_SpawnMobj(x, y, ONFLOORZ, MT_BLOODPOOL);
+            break;
+        default:
+            break;
+    }
+    mobj = P_SpawnMobj(x, y, z, i);
+    if (z == ONFLOORZ)
+    {
+        mobj->z += mthing->height << FRACBITS;
+    }
+    else if (z == ONCEILINGZ)
+    {
+        mobj->z -= mthing->height << FRACBITS;
+    }
+    mobj->tid = mthing->tid;
+    mobj->special = mthing->special;
+    mobj->args[0] = mthing->arg1;
+    mobj->args[1] = mthing->arg2;
+    mobj->args[2] = mthing->arg3;
+    mobj->args[3] = mthing->arg4;
+    mobj->args[4] = mthing->arg5;
+    if (mobj->flags2 & MF2_FLOATBOB)
+    {                           // Seed random starting index for bobbing motion
+        mobj->health = P_Random();
+        mobj->special1.i = mthing->height << FRACBITS;
+    }
+    if (mobj->tics > 0)
+    {
+        mobj->tics = 1 + (P_Random() % mobj->tics);
+    }
+//      if(mobj->flags&MF_COUNTITEM)
+//      {
+//              totalitems++;
+//      }
+    if (mobj->flags & MF_COUNTKILL)
+    {
+        // Quantize angle to 45 degree increments
+        mobj->angle = ANG45 * (mthing->angle / 45);
+    }
+    else
+    {
+        // Scale angle correctly (source is 0..359)
+        mobj->angle = ((mthing->angle << 8) / 360) << 24;
+    }
+    if (mthing->options & MTF_AMBUSH)
+    {
+        mobj->flags |= MF_AMBUSH;
+    }
+    if (mthing->options & MTF_DORMANT)
+    {
+        mobj->flags2 |= MF2_DORMANT;
+        if (mobj->type == MT_ICEGUY)
+        {
+            P_SetMobjState(mobj, S_ICEGUY_DORMANT);
+        }
+        mobj->tics = -1;
+    }
+}
+
+//==========================================================================
+//
+// P_CreateTIDList
+//
+//==========================================================================
+
+void P_CreateTIDList(void)
+{
+    int i;
+    mobj_t *mobj;
+    thinker_t *t;
+
+    i = 0;
+    for (t = thinkercap.next; t != &thinkercap; t = t->next)
+    {                           // Search all current thinkers
+        if (t->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mobj = (mobj_t *) t;
+        if (mobj->tid != 0)
+        {                       // Add to list
+            if (i == MAX_TID_COUNT)
+            {
+                I_Error("P_CreateTIDList: MAX_TID_COUNT (%d) exceeded.",
+                        MAX_TID_COUNT);
+            }
+            TIDList[i] = mobj->tid;
+            TIDMobj[i++] = mobj;
+        }
+    }
+    // Add termination marker
+    TIDList[i] = 0;
+}
+
+//==========================================================================
+//
+// P_InsertMobjIntoTIDList
+//
+//==========================================================================
+
+void P_InsertMobjIntoTIDList(mobj_t * mobj, int tid)
+{
+    int i;
+    int index;
+
+    index = -1;
+    for (i = 0; TIDList[i] != 0; i++)
+    {
+        if (TIDList[i] == -1)
+        {                       // Found empty slot
+            index = i;
+            break;
+        }
+    }
+    if (index == -1)
+    {                           // Append required
+        if (i == MAX_TID_COUNT)
+        {
+            I_Error("P_InsertMobjIntoTIDList: MAX_TID_COUNT (%d)"
+                    "exceeded.", MAX_TID_COUNT);
+        }
+        index = i;
+        TIDList[index + 1] = 0;
+    }
+    mobj->tid = tid;
+    TIDList[index] = tid;
+    TIDMobj[index] = mobj;
+}
+
+//==========================================================================
+//
+// P_RemoveMobjFromTIDList
+//
+//==========================================================================
+
+void P_RemoveMobjFromTIDList(mobj_t * mobj)
+{
+    int i;
+
+    for (i = 0; TIDList[i] != 0; i++)
+    {
+        if (TIDMobj[i] == mobj)
+        {
+            TIDList[i] = -1;
+            TIDMobj[i] = NULL;
+            mobj->tid = 0;
+            return;
+        }
+    }
+    mobj->tid = 0;
+}
+
+//==========================================================================
+//
+// P_FindMobjFromTID
+//
+//==========================================================================
+
+mobj_t *P_FindMobjFromTID(int tid, int *searchPosition)
+{
+    int i;
+
+    for (i = *searchPosition + 1; TIDList[i] != 0; i++)
+    {
+        if (TIDList[i] == tid)
+        {
+            *searchPosition = i;
+            return TIDMobj[i];
+        }
+    }
+    *searchPosition = -1;
+    return NULL;
+}
+
+/*
+===============================================================================
+
+						GAME SPAWN FUNCTIONS
+
+===============================================================================
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SpawnPuff
+//
+//---------------------------------------------------------------------------
+
+
+void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z)
+{
+    mobj_t *puff;
+
+    z += (P_SubRandom() << 10);
+    puff = P_SpawnMobj(x, y, z, PuffType);
+    if (linetarget && puff->info->seesound)
+    {                           // Hit thing sound
+        S_StartSound(puff, puff->info->seesound);
+    }
+    else if (puff->info->attacksound)
+    {
+        S_StartSound(puff, puff->info->attacksound);
+    }
+    switch (PuffType)
+    {
+        case MT_PUNCHPUFF:
+            puff->momz = FRACUNIT;
+            break;
+        case MT_HAMMERPUFF:
+            puff->momz = .8 * FRACUNIT;
+            break;
+        default:
+            break;
+    }
+    PuffSpawned = puff;
+}
+
+/*
+================
+=
+= P_SpawnBlood
+=
+================
+*/
+
+/*
+void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage)
+{
+	mobj_t	*th;
+	
+	z += (P_SubRandom()<<10);
+	th = P_SpawnMobj (x,y,z, MT_BLOOD);
+	th->momz = FRACUNIT*2;
+	th->tics -= P_Random()&3;
+
+	if (damage <= 12 && damage >= 9)
+		P_SetMobjState (th,S_BLOOD2);
+	else if (damage < 9)
+		P_SetMobjState (th,S_BLOOD3);
+}
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_BloodSplatter
+//
+//---------------------------------------------------------------------------
+
+void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(x, y, z, MT_BLOODSPLATTER);
+    mo->target = originator;
+    mo->momx = P_SubRandom() << 10;
+    mo->momy = P_SubRandom() << 10;
+    mo->momz = 3 * FRACUNIT;
+}
+
+//===========================================================================
+//
+//  P_BloodSplatter2
+//
+//===========================================================================
+
+void P_BloodSplatter2(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator)
+{
+    mobj_t *mo;
+    int r1, r2;
+
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(x + ((r2 - 128) << 11),
+                     y + ((r1 - 128) << 11), z, MT_AXEBLOOD);
+    mo->target = originator;
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_RipperBlood
+//
+//---------------------------------------------------------------------------
+
+void P_RipperBlood(mobj_t * mo)
+{
+    mobj_t *th;
+    fixed_t x, y, z;
+
+    x = mo->x + (P_SubRandom() << 12);
+    y = mo->y + (P_SubRandom() << 12);
+    z = mo->z + (P_SubRandom() << 12);
+    th = P_SpawnMobj(x, y, z, MT_BLOOD);
+//      th->flags |= MF_NOGRAVITY;
+    th->momx = mo->momx >> 1;
+    th->momy = mo->momy >> 1;
+    th->tics += P_Random() & 3;
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_GetThingFloorType
+//
+//---------------------------------------------------------------------------
+
+int P_GetThingFloorType(mobj_t * thing)
+{
+    if (thing->floorpic)
+    {
+        return (TerrainTypes[thing->floorpic]);
+    }
+    else
+    {
+        return (TerrainTypes[thing->subsector->sector->floorpic]);
+    }
+/*
+	if(thing->subsector->sector->floorpic
+		== W_GetNumForName("FLTWAWA1")-firstflat)
+	{
+		return(FLOOR_WATER);
+	}
+	else
+	{
+		return(FLOOR_SOLID);
+	}
+*/
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_HitFloor
+//
+//---------------------------------------------------------------------------
+#define SMALLSPLASHCLIP 12<<FRACBITS;
+
+int P_HitFloor(mobj_t * thing)
+{
+    mobj_t *mo;
+    int smallsplash = false;
+
+    if (thing->floorz != thing->subsector->sector->floorheight)
+    {                           // don't splash if landing on the edge above water/lava/etc....
+        return (FLOOR_SOLID);
+    }
+
+    // Things that don't splash go here
+    switch (thing->type)
+    {
+        case MT_LEAF1:
+        case MT_LEAF2:
+//              case MT_BLOOD:                  // I set these to low mass -- pm
+//              case MT_BLOODSPLATTER:
+        case MT_SPLASH:
+        case MT_SLUDGECHUNK:
+            return (FLOOR_SOLID);
+        default:
+            break;
+    }
+
+    // Small splash for small masses
+    if (thing->info->mass < 10)
+        smallsplash = true;
+
+    switch (P_GetThingFloorType(thing))
+    {
+        case FLOOR_WATER:
+            if (smallsplash)
+            {
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASHBASE);
+                if (mo)
+                    mo->floorclip += SMALLSPLASHCLIP;
+                S_StartSound(mo, SFX_AMBIENT10);        // small drip
+            }
+            else
+            {
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASH);
+                mo->target = thing;
+                mo->momx = P_SubRandom() << 8;
+                mo->momy = P_SubRandom() << 8;
+                mo->momz = 2 * FRACUNIT + (P_Random() << 8);
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASHBASE);
+                if (thing->player)
+                    P_NoiseAlert(thing, thing);
+                S_StartSound(mo, SFX_WATER_SPLASH);
+            }
+            return (FLOOR_WATER);
+        case FLOOR_LAVA:
+            if (smallsplash)
+            {
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASPLASH);
+                if (mo)
+                    mo->floorclip += SMALLSPLASHCLIP;
+            }
+            else
+            {
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASMOKE);
+                mo->momz = FRACUNIT + (P_Random() << 7);
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASPLASH);
+                if (thing->player)
+                    P_NoiseAlert(thing, thing);
+            }
+            S_StartSound(mo, SFX_LAVA_SIZZLE);
+            if (thing->player && leveltime & 31)
+            {
+                P_DamageMobj(thing, &LavaInflictor, NULL, 5);
+            }
+            return (FLOOR_LAVA);
+        case FLOOR_SLUDGE:
+            if (smallsplash)
+            {
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ,
+                                 MT_SLUDGESPLASH);
+                if (mo)
+                    mo->floorclip += SMALLSPLASHCLIP;
+            }
+            else
+            {
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ,
+                                 MT_SLUDGECHUNK);
+                mo->target = thing;
+                mo->momx = P_SubRandom() << 8;
+                mo->momy = P_SubRandom() << 8;
+                mo->momz = FRACUNIT + (P_Random() << 8);
+                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ,
+                                 MT_SLUDGESPLASH);
+                if (thing->player)
+                    P_NoiseAlert(thing, thing);
+            }
+            S_StartSound(mo, SFX_SLUDGE_GLOOP);
+            return (FLOOR_SLUDGE);
+    }
+    return (FLOOR_SOLID);
+}
+
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_CheckMissileSpawn
+//
+// Returns true if the missile is at a valid spawn point, otherwise
+// explodes it and returns false.
+//
+//---------------------------------------------------------------------------
+
+boolean P_CheckMissileSpawn(mobj_t * missile)
+{
+    //missile->tics -= P_Random()&3;
+
+    // move a little forward so an angle can be computed if it
+    // immediately explodes
+    missile->x += (missile->momx >> 1);
+    missile->y += (missile->momy >> 1);
+    missile->z += (missile->momz >> 1);
+    if (!P_TryMove(missile, missile->x, missile->y))
+    {
+        P_ExplodeMissile(missile);
+        return (false);
+    }
+    return (true);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_SpawnMissile
+//
+// Returns NULL if the missile exploded immediately, otherwise returns
+// a mobj_t pointer to the missile.
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type)
+{
+    fixed_t z;
+    mobj_t *th;
+    angle_t an;
+    int dist;
+
+    switch (type)
+    {
+        case MT_MNTRFX1:       // Minotaur swing attack missile
+            z = source->z + 40 * FRACUNIT;
+            break;
+        case MT_MNTRFX2:       // Minotaur floor fire missile
+            z = ONFLOORZ + source->floorclip;
+            break;
+        case MT_CENTAUR_FX:
+            z = source->z + 45 * FRACUNIT;
+            break;
+        case MT_ICEGUY_FX:
+            z = source->z + 40 * FRACUNIT;
+            break;
+        case MT_HOLY_MISSILE:
+            z = source->z + 40 * FRACUNIT;
+            break;
+        default:
+            z = source->z + 32 * FRACUNIT;
+            break;
+    }
+    z -= source->floorclip;
+    th = P_SpawnMobj(source->x, source->y, z, type);
+    if (th->info->seesound)
+    {
+        S_StartSound(th, th->info->seesound);
+    }
+    th->target = source;        // Originator
+    an = R_PointToAngle2(source->x, source->y, dest->x, dest->y);
+    if (dest->flags & MF_SHADOW)
+    {                           // Invisible target
+        an += P_SubRandom() << 21;
+    }
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul(th->info->speed, finecosine[an]);
+    th->momy = FixedMul(th->info->speed, finesine[an]);
+    dist = P_AproxDistance(dest->x - source->x, dest->y - source->y);
+    dist = dist / th->info->speed;
+    if (dist < 1)
+    {
+        dist = 1;
+    }
+    th->momz = (dest->z - source->z) / dist;
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_SpawnMissileXYZ
+//
+// Returns NULL if the missile exploded immediately, otherwise returns
+// a mobj_t pointer to the missile.
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SpawnMissileXYZ(fixed_t x, fixed_t y, fixed_t z,
+                          mobj_t * source, mobj_t * dest, mobjtype_t type)
+{
+    mobj_t *th;
+    angle_t an;
+    int dist;
+
+    z -= source->floorclip;
+    th = P_SpawnMobj(x, y, z, type);
+    if (th->info->seesound)
+    {
+        S_StartSound(th, th->info->seesound);
+    }
+    th->target = source;        // Originator
+    an = R_PointToAngle2(source->x, source->y, dest->x, dest->y);
+    if (dest->flags & MF_SHADOW)
+    {                           // Invisible target
+        an += P_SubRandom() << 21;
+    }
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul(th->info->speed, finecosine[an]);
+    th->momy = FixedMul(th->info->speed, finesine[an]);
+    dist = P_AproxDistance(dest->x - source->x, dest->y - source->y);
+    dist = dist / th->info->speed;
+    if (dist < 1)
+    {
+        dist = 1;
+    }
+    th->momz = (dest->z - source->z) / dist;
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_SpawnMissileAngle
+//
+// Returns NULL if the missile exploded immediately, otherwise returns
+// a mobj_t pointer to the missile.
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
+                            angle_t angle, fixed_t momz)
+{
+    fixed_t z;
+    mobj_t *mo;
+
+    switch (type)
+    {
+        case MT_MNTRFX1:       // Minotaur swing attack missile
+            z = source->z + 40 * FRACUNIT;
+            break;
+        case MT_MNTRFX2:       // Minotaur floor fire missile
+            z = ONFLOORZ + source->floorclip;
+            break;
+        case MT_ICEGUY_FX2:    // Secondary Projectiles of the Ice Guy
+            z = source->z + 3 * FRACUNIT;
+            break;
+        case MT_MSTAFF_FX2:
+            z = source->z + 40 * FRACUNIT;
+            break;
+        default:
+            z = source->z + 32 * FRACUNIT;
+            break;
+    }
+    z -= source->floorclip;
+    mo = P_SpawnMobj(source->x, source->y, z, type);
+    if (mo->info->seesound)
+    {
+        S_StartSound(mo, mo->info->seesound);
+    }
+    mo->target = source;        // Originator
+    mo->angle = angle;
+    angle >>= ANGLETOFINESHIFT;
+    mo->momx = FixedMul(mo->info->speed, finecosine[angle]);
+    mo->momy = FixedMul(mo->info->speed, finesine[angle]);
+    mo->momz = momz;
+    return (P_CheckMissileSpawn(mo) ? mo : NULL);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_SpawnMissileAngleSpeed
+//
+// Returns NULL if the missile exploded immediately, otherwise returns
+// a mobj_t pointer to the missile.
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SpawnMissileAngleSpeed(mobj_t * source, mobjtype_t type,
+                                 angle_t angle, fixed_t momz, fixed_t speed)
+{
+    fixed_t z;
+    mobj_t *mo;
+
+    z = source->z;
+    z -= source->floorclip;
+    mo = P_SpawnMobj(source->x, source->y, z, type);
+    if (mo->info->seesound)
+    {
+        //S_StartSound(mo, mo->info->seesound);
+    }
+    mo->target = source;        // Originator
+    mo->angle = angle;
+    angle >>= ANGLETOFINESHIFT;
+    mo->momx = FixedMul(speed, finecosine[angle]);
+    mo->momy = FixedMul(speed, finesine[angle]);
+    mo->momz = momz;
+    return (P_CheckMissileSpawn(mo) ? mo : NULL);
+}
+
+
+
+/*
+================
+=
+= P_SpawnPlayerMissile
+=
+= Tries to aim at a nearby monster
+================
+*/
+
+mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type)
+{
+    angle_t an;
+    fixed_t x, y, z, slope;
+
+    // Try to find a target
+    an = source->angle;
+    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+    if (!linetarget)
+    {
+        an += 1 << 26;
+        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2 << 26;
+            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        }
+        if (!linetarget)
+        {
+            an = source->angle;
+            slope = ((source->player->lookdir) << FRACBITS) / 173;
+        }
+    }
+    x = source->x;
+    y = source->y;
+    if (type == MT_LIGHTNING_FLOOR)
+    {
+        z = ONFLOORZ;
+        slope = 0;
+    }
+    else if (type == MT_LIGHTNING_CEILING)
+    {
+        z = ONCEILINGZ;
+        slope = 0;
+    }
+    else
+    {
+        z = source->z + 4 * 8 * FRACUNIT +
+            ((source->player->lookdir) << FRACBITS) / 173;
+        z -= source->floorclip;
+    }
+    MissileMobj = P_SpawnMobj(x, y, z, type);
+    if (MissileMobj->info->seesound)
+    {
+        //S_StartSound(MissileMobj, MissileMobj->info->seesound);
+    }
+    MissileMobj->target = source;
+    MissileMobj->angle = an;
+    MissileMobj->momx = FixedMul(MissileMobj->info->speed,
+                                 finecosine[an >> ANGLETOFINESHIFT]);
+    MissileMobj->momy = FixedMul(MissileMobj->info->speed,
+                                 finesine[an >> ANGLETOFINESHIFT]);
+    MissileMobj->momz = FixedMul(MissileMobj->info->speed, slope);
+    if (MissileMobj->type == MT_MWAND_MISSILE
+        || MissileMobj->type == MT_CFLAME_MISSILE)
+    {                           // Ultra-fast ripper spawning missile
+        MissileMobj->x += (MissileMobj->momx >> 3);
+        MissileMobj->y += (MissileMobj->momy >> 3);
+        MissileMobj->z += (MissileMobj->momz >> 3);
+    }
+    else
+    {                           // Normal missile
+        MissileMobj->x += (MissileMobj->momx >> 1);
+        MissileMobj->y += (MissileMobj->momy >> 1);
+        MissileMobj->z += (MissileMobj->momz >> 1);
+    }
+    if (!P_TryMove(MissileMobj, MissileMobj->x, MissileMobj->y))
+    {                           // Exploded immediately
+        P_ExplodeMissile(MissileMobj);
+        return (NULL);
+    }
+    return (MissileMobj);
+}
+
+
+//----------------------------------------------------------------------------
+//
+// P_SpawnPlayerMinotaur - 
+//
+//      Special missile that has larger blocking than player
+//----------------------------------------------------------------------------
+
+/*
+mobj_t *P_SpawnPlayerMinotaur(mobj_t *source, mobjtype_t type)
+{
+	angle_t an;
+	fixed_t x, y, z;
+	fixed_t dist=0 *FRACUNIT;
+
+	an = source->angle;
+	x = source->x + FixedMul(dist, finecosine[an>>ANGLETOFINESHIFT]);
+	y = source->y + FixedMul(dist, finesine[an>>ANGLETOFINESHIFT]);
+	z = source->z + 4*8*FRACUNIT+((source->player->lookdir)<<FRACBITS)/173;
+	z -= source->floorclip;
+	MissileMobj = P_SpawnMobj(x, y, z, type);
+	if(MissileMobj->info->seesound)
+	{
+		//S_StartSound(MissileMobj, MissileMobj->info->seesound);
+	}
+	MissileMobj->target = source;
+	MissileMobj->angle = an;
+	MissileMobj->momx = FixedMul(MissileMobj->info->speed,
+		finecosine[an>>ANGLETOFINESHIFT]);
+	MissileMobj->momy = FixedMul(MissileMobj->info->speed,
+		finesine[an>>ANGLETOFINESHIFT]);
+	MissileMobj->momz = 0;
+
+//	MissileMobj->x += (MissileMobj->momx>>3);
+//	MissileMobj->y += (MissileMobj->momy>>3);
+//	MissileMobj->z += (MissileMobj->momz>>3);
+
+	if(!P_TryMove(MissileMobj, MissileMobj->x, MissileMobj->y))
+	{ // Wouln't fit
+
+		return(NULL);
+	}
+	return(MissileMobj);
+}
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SPMAngle
+//
+//---------------------------------------------------------------------------
+
+mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle)
+{
+    mobj_t *th;
+    angle_t an;
+    fixed_t x, y, z, slope;
+
+//
+// see which target is to be aimed at
+//
+    an = angle;
+    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+    if (!linetarget)
+    {
+        an += 1 << 26;
+        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2 << 26;
+            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        }
+        if (!linetarget)
+        {
+            an = angle;
+            slope = ((source->player->lookdir) << FRACBITS) / 173;
+        }
+    }
+    x = source->x;
+    y = source->y;
+    z = source->z + 4 * 8 * FRACUNIT +
+        ((source->player->lookdir) << FRACBITS) / 173;
+    z -= source->floorclip;
+    th = P_SpawnMobj(x, y, z, type);
+//      if(th->info->seesound)
+//      {
+//              S_StartSound(th, th->info->seesound);
+//      }
+    th->target = source;
+    th->angle = an;
+    th->momx = FixedMul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
+    th->momy = FixedMul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
+    th->momz = FixedMul(th->info->speed, slope);
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
+
+//===========================================================================
+//
+// P_SPMAngleXYZ
+//
+//===========================================================================
+
+mobj_t *P_SPMAngleXYZ(mobj_t * source, fixed_t x, fixed_t y,
+                      fixed_t z, mobjtype_t type, angle_t angle)
+{
+    mobj_t *th;
+    angle_t an;
+    fixed_t slope;
+
+//
+// see which target is to be aimed at
+//
+    an = angle;
+    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+    if (!linetarget)
+    {
+        an += 1 << 26;
+        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2 << 26;
+            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
+        }
+        if (!linetarget)
+        {
+            an = angle;
+            slope = ((source->player->lookdir) << FRACBITS) / 173;
+        }
+    }
+    z += 4 * 8 * FRACUNIT + ((source->player->lookdir) << FRACBITS) / 173;
+    z -= source->floorclip;
+    th = P_SpawnMobj(x, y, z, type);
+//      if(th->info->seesound)
+//      {
+//              S_StartSound(th, th->info->seesound);
+//      }
+    th->target = source;
+    th->angle = an;
+    th->momx = FixedMul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
+    th->momy = FixedMul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
+    th->momz = FixedMul(th->info->speed, slope);
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
+
+mobj_t *P_SpawnKoraxMissile(fixed_t x, fixed_t y, fixed_t z,
+                            mobj_t * source, mobj_t * dest, mobjtype_t type)
+{
+    mobj_t *th;
+    angle_t an;
+    int dist;
+
+    z -= source->floorclip;
+    th = P_SpawnMobj(x, y, z, type);
+    if (th->info->seesound)
+    {
+        S_StartSound(th, th->info->seesound);
+    }
+    th->target = source;        // Originator
+    an = R_PointToAngle2(x, y, dest->x, dest->y);
+    if (dest->flags & MF_SHADOW)
+    {                           // Invisible target
+        an += P_SubRandom() << 21;
+    }
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul(th->info->speed, finecosine[an]);
+    th->momy = FixedMul(th->info->speed, finesine[an]);
+    dist = P_AproxDistance(dest->x - x, dest->y - y);
+    dist = dist / th->info->speed;
+    if (dist < 1)
+    {
+        dist = 1;
+    }
+    th->momz = (dest->z - z + (30 * FRACUNIT)) / dist;
+    return (P_CheckMissileSpawn(th) ? th : NULL);
+}
diff --git a/games/NXDoom/src/hexen/p_plats.c b/games/NXDoom/src/hexen/p_plats.c
new file mode 100644
index 000000000..8c91b3575
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_plats.c
@@ -0,0 +1,277 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "p_local.h"
+
+plat_t *activeplats[MAXPLATS];
+
+//==================================================================
+//
+//      Move a plat up and down
+//
+//==================================================================
+void T_PlatRaise(thinker_t *thinker)
+{
+    plat_t *plat = (plat_t *) thinker;
+    result_e res;
+
+    switch (plat->status)
+    {
+        case PLAT_UP:
+            res = T_MovePlane(plat->sector, plat->speed,
+                              plat->high, plat->crush, 0, 1);
+            if (res == RES_CRUSHED && (!plat->crush))
+            {
+                plat->count = plat->wait;
+                plat->status = PLAT_DOWN;
+                SN_StartSequence((mobj_t *) & plat->sector->soundorg,
+                                 SEQ_PLATFORM + plat->sector->seqType);
+            }
+            else if (res == RES_PASTDEST)
+            {
+                plat->count = plat->wait;
+                plat->status = PLAT_WAITING;
+                SN_StopSequence((mobj_t *) & plat->sector->soundorg);
+                switch (plat->type)
+                {
+                    case PLAT_DOWNWAITUPSTAY:
+                    case PLAT_DOWNBYVALUEWAITUPSTAY:
+                        P_RemoveActivePlat(plat);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            break;
+        case PLAT_DOWN:
+            res =
+                T_MovePlane(plat->sector, plat->speed, plat->low, false, 0,
+                            -1);
+            if (res == RES_PASTDEST)
+            {
+                plat->count = plat->wait;
+                plat->status = PLAT_WAITING;
+                switch (plat->type)
+                {
+                    case PLAT_UPWAITDOWNSTAY:
+                    case PLAT_UPBYVALUEWAITDOWNSTAY:
+                        P_RemoveActivePlat(plat);
+                        break;
+                    default:
+                        break;
+                }
+                SN_StopSequence((mobj_t *) & plat->sector->soundorg);
+            }
+            break;
+        case PLAT_WAITING:
+            if (!--plat->count)
+            {
+                if (plat->sector->floorheight == plat->low)
+                    plat->status = PLAT_UP;
+                else
+                    plat->status = PLAT_DOWN;
+                SN_StartSequence((mobj_t *) & plat->sector->soundorg,
+                                 SEQ_PLATFORM + plat->sector->seqType);
+            }
+//              case PLAT_IN_STASIS:
+//                      break;
+    }
+}
+
+//==================================================================
+//
+//      Do Platforms
+//      "amount" is only used for SOME platforms.
+//
+//==================================================================
+int EV_DoPlat(line_t * line, byte * args, plattype_e type, int amount)
+{
+    plat_t *plat;
+    int secnum;
+    int rtn;
+    sector_t *sec;
+
+    secnum = -1;
+    rtn = 0;
+
+/*
+	//
+	//      Activate all <type> plats that are in_stasis
+	//
+	switch(type)
+	{
+		case PLAT_PERPETUALRAISE:
+			P_ActivateInStasis(args[0]);
+			break;
+		default:
+			break;
+	}
+*/
+
+    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        //
+        // Find lowest & highest floors around sector
+        //
+        rtn = 1;
+        plat = Z_Malloc(sizeof(*plat), PU_LEVSPEC, 0);
+        P_AddThinker(&plat->thinker);
+
+        plat->type = type;
+        plat->sector = sec;
+        plat->sector->specialdata = plat;
+        plat->thinker.function = T_PlatRaise;
+        plat->crush = false;
+        plat->tag = args[0];
+        plat->speed = args[1] * (FRACUNIT / 8);
+        switch (type)
+        {
+            case PLAT_DOWNWAITUPSTAY:
+                plat->low = P_FindLowestFloorSurrounding(sec) + 8 * FRACUNIT;
+                if (plat->low > sec->floorheight)
+                    plat->low = sec->floorheight;
+                plat->high = sec->floorheight;
+                plat->wait = args[2];
+                plat->status = PLAT_DOWN;
+                break;
+            case PLAT_DOWNBYVALUEWAITUPSTAY:
+                plat->low = sec->floorheight - args[3] * 8 * FRACUNIT;
+                if (plat->low > sec->floorheight)
+                    plat->low = sec->floorheight;
+                plat->high = sec->floorheight;
+                plat->wait = args[2];
+                plat->status = PLAT_DOWN;
+                break;
+            case PLAT_UPWAITDOWNSTAY:
+                plat->high = P_FindHighestFloorSurrounding(sec);
+                if (plat->high < sec->floorheight)
+                    plat->high = sec->floorheight;
+                plat->low = sec->floorheight;
+                plat->wait = args[2];
+                plat->status = PLAT_UP;
+                break;
+            case PLAT_UPBYVALUEWAITDOWNSTAY:
+                plat->high = sec->floorheight + args[3] * 8 * FRACUNIT;
+                if (plat->high < sec->floorheight)
+                    plat->high = sec->floorheight;
+                plat->low = sec->floorheight;
+                plat->wait = args[2];
+                plat->status = PLAT_UP;
+                break;
+            case PLAT_PERPETUALRAISE:
+                plat->low = P_FindLowestFloorSurrounding(sec) + 8 * FRACUNIT;
+                if (plat->low > sec->floorheight)
+                    plat->low = sec->floorheight;
+                plat->high = P_FindHighestFloorSurrounding(sec);
+                if (plat->high < sec->floorheight)
+                    plat->high = sec->floorheight;
+                plat->wait = args[2];
+                plat->status = P_Random() & 1;
+                break;
+        }
+        P_AddActivePlat(plat);
+        SN_StartSequence((mobj_t *) & sec->soundorg,
+                         SEQ_PLATFORM + sec->seqType);
+    }
+    return rtn;
+}
+
+#if 0
+void P_ActivateInStasis(int tag)
+{
+    int i;
+
+    for (i = 0; i < MAXPLATS; i++)
+        if (activeplats[i] &&
+            (activeplats[i])->tag == tag &&
+            (activeplats[i])->status == PLAT_IN_STASIS)
+        {
+            (activeplats[i])->status = (activeplats[i])->oldstatus;
+            (activeplats[i])->thinker.function = T_PlatRaise;
+        }
+}
+#endif
+
+void EV_StopPlat(line_t * line, byte * args)
+{
+    int i;
+
+    for (i = 0; i < MAXPLATS; i++)
+    {
+        activeplats[i]->tag = args[0];
+
+        if (activeplats[i]->tag != 0)
+        {
+            activeplats[i]->sector->specialdata = NULL;
+            P_TagFinished(activeplats[i]->sector->tag);
+            P_RemoveThinker(&activeplats[i]->thinker);
+            activeplats[i] = NULL;
+
+            return;
+        }
+    }
+
+/*
+	int             j;
+
+	for (j = 0;j < MAXPLATS;j++)
+	{
+		if (activeplats[j] && ((activeplats[j])->status != PLAT_IN_STASIS) &&
+			((activeplats[j])->tag == args[0]))
+		{
+			(activeplats[j])->oldstatus = (activeplats[j])->status;
+			(activeplats[j])->status = PLAT_IN_STASIS;
+			(activeplats[j])->thinker.function = NULL;
+			SN_StopSequence((mobj_t *)&(activeplats[j])->sector->soundorg);
+		}
+	}
+*/
+}
+
+void P_AddActivePlat(plat_t * plat)
+{
+    int i;
+    for (i = 0; i < MAXPLATS; i++)
+        if (activeplats[i] == NULL)
+        {
+            activeplats[i] = plat;
+            return;
+        }
+    I_Error("P_AddActivePlat: no more plats!");
+}
+
+void P_RemoveActivePlat(plat_t * plat)
+{
+    int i;
+    for (i = 0; i < MAXPLATS; i++)
+        if (plat == activeplats[i])
+        {
+            (activeplats[i])->sector->specialdata = NULL;
+            P_TagFinished(plat->sector->tag);
+            P_RemoveThinker(&(activeplats[i])->thinker);
+            activeplats[i] = NULL;
+            return;
+        }
+    I_Error("P_RemoveActivePlat: can't find plat!");
+}
diff --git a/games/NXDoom/src/hexen/p_pspr.c b/games/NXDoom/src/hexen/p_pspr.c
new file mode 100644
index 000000000..230841344
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_pspr.c
@@ -0,0 +1,2476 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define LOWERSPEED FRACUNIT*6
+#define RAISESPEED FRACUNIT*6
+#define WEAPONBOTTOM 128*FRACUNIT
+#define WEAPONTOP 32*FRACUNIT
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+fixed_t bulletslope;
+
+weaponinfo_t WeaponInfo[NUMWEAPONS][NUMCLASSES] = {
+    {                           // First Weapons
+     {                          // Fighter First Weapon - Punch
+      MANA_NONE,                // mana
+      S_PUNCHUP,                // upstate
+      S_PUNCHDOWN,              // downstate
+      S_PUNCHREADY,             // readystate
+      S_PUNCHATK1_1,            // atkstate
+      S_PUNCHATK1_1,            // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Cleric First Weapon - Mace
+      MANA_NONE,                // mana
+      S_CMACEUP,                // upstate
+      S_CMACEDOWN,              // downstate
+      S_CMACEREADY,             // readystate
+      S_CMACEATK_1,             // atkstate
+      S_CMACEATK_1,             // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Mage First Weapon - Wand
+      MANA_NONE,
+      S_MWANDUP,
+      S_MWANDDOWN,
+      S_MWANDREADY,
+      S_MWANDATK_1,
+      S_MWANDATK_1,
+      S_NULL},
+     {                          // Pig - Snout
+      MANA_NONE,                // mana
+      S_SNOUTUP,                // upstate
+      S_SNOUTDOWN,              // downstate
+      S_SNOUTREADY,             // readystate
+      S_SNOUTATK1,              // atkstate
+      S_SNOUTATK1,              // holdatkstate
+      S_NULL                    // flashstate
+      }
+     },
+    {                           // Second Weapons
+     {                          // Fighter - Axe
+      MANA_NONE,                // mana
+      S_FAXEUP,                 // upstate
+      S_FAXEDOWN,               // downstate
+      S_FAXEREADY,              // readystate
+      S_FAXEATK_1,              // atkstate
+      S_FAXEATK_1,              // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Cleric - Serpent Staff
+      MANA_1,                   // mana
+      S_CSTAFFUP,               // upstate
+      S_CSTAFFDOWN,             // downstate
+      S_CSTAFFREADY,            // readystate
+      S_CSTAFFATK_1,            // atkstate
+      S_CSTAFFATK_1,            // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Mage - Cone of shards
+      MANA_1,                   // mana
+      S_CONEUP,                 // upstate
+      S_CONEDOWN,               // downstate
+      S_CONEREADY,              // readystate
+      S_CONEATK1_1,             // atkstate
+      S_CONEATK1_3,             // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Pig - Snout
+      MANA_NONE,                // mana
+      S_SNOUTUP,                // upstate
+      S_SNOUTDOWN,              // downstate
+      S_SNOUTREADY,             // readystate
+      S_SNOUTATK1,              // atkstate
+      S_SNOUTATK1,              // holdatkstate
+      S_NULL                    // flashstate
+      }
+     },
+    {                           // Third Weapons
+     {                          // Fighter - Hammer
+      MANA_NONE,                // mana
+      S_FHAMMERUP,              // upstate
+      S_FHAMMERDOWN,            // downstate
+      S_FHAMMERREADY,           // readystate
+      S_FHAMMERATK_1,           // atkstate
+      S_FHAMMERATK_1,           // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Cleric - Flame Strike
+      MANA_2,                   // mana
+      S_CFLAMEUP,               // upstate
+      S_CFLAMEDOWN,             // downstate
+      S_CFLAMEREADY1,           // readystate
+      S_CFLAMEATK_1,            // atkstate
+      S_CFLAMEATK_1,            // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Mage - Lightning
+      MANA_2,                   // mana
+      S_MLIGHTNINGUP,           // upstate
+      S_MLIGHTNINGDOWN,         // downstate
+      S_MLIGHTNINGREADY,        // readystate
+      S_MLIGHTNINGATK_1,        // atkstate
+      S_MLIGHTNINGATK_1,        // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Pig - Snout
+      MANA_NONE,                // mana
+      S_SNOUTUP,                // upstate
+      S_SNOUTDOWN,              // downstate
+      S_SNOUTREADY,             // readystate
+      S_SNOUTATK1,              // atkstate
+      S_SNOUTATK1,              // holdatkstate
+      S_NULL                    // flashstate
+      }
+     },
+    {                           // Fourth Weapons
+     {                          // Fighter - Rune Sword
+      MANA_BOTH,                // mana
+      S_FSWORDUP,               // upstate
+      S_FSWORDDOWN,             // downstate
+      S_FSWORDREADY,            // readystate
+      S_FSWORDATK_1,            // atkstate
+      S_FSWORDATK_1,            // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Cleric - Holy Symbol
+      MANA_BOTH,                // mana
+      S_CHOLYUP,                // upstate
+      S_CHOLYDOWN,              // downstate
+      S_CHOLYREADY,             // readystate
+      S_CHOLYATK_1,             // atkstate
+      S_CHOLYATK_1,             // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Mage - Staff
+      MANA_BOTH,                // mana
+      S_MSTAFFUP,               // upstate
+      S_MSTAFFDOWN,             // downstate
+      S_MSTAFFREADY,            // readystate
+      S_MSTAFFATK_1,            // atkstate
+      S_MSTAFFATK_1,            // holdatkstate
+      S_NULL                    // flashstate
+      },
+     {                          // Pig - Snout
+      MANA_NONE,                // mana
+      S_SNOUTUP,                // upstate
+      S_SNOUTDOWN,              // downstate
+      S_SNOUTREADY,             // readystate
+      S_SNOUTATK1,              // atkstate
+      S_SNOUTATK1,              // holdatkstate
+      S_NULL                    // flashstate
+      }
+     }
+};
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int WeaponManaUse[NUMCLASSES][NUMWEAPONS] = {
+    {0, 2, 3, 14},
+    {0, 1, 4, 18},
+    {0, 3, 5, 15},
+    {0, 0, 0, 0}
+};
+
+// CODE --------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SetPsprite
+//
+//---------------------------------------------------------------------------
+
+void P_SetPsprite(player_t * player, int position, statenum_t stnum)
+{
+    pspdef_t *psp;
+    state_t *state;
+
+    psp = &player->psprites[position];
+    do
+    {
+        if (!stnum)
+        {                       // Object removed itself.
+            psp->state = NULL;
+            break;
+        }
+        state = &states[stnum];
+        psp->state = state;
+        psp->tics = state->tics;        // could be 0
+        if (state->misc1)
+        {                       // Set coordinates.
+            psp->sx = state->misc1 << FRACBITS;
+        }
+        if (state->misc2)
+        {
+            psp->sy = state->misc2 << FRACBITS;
+        }
+        if (state->action)
+        {                       // Call action routine.
+            state->action(NULL, player, psp);
+            if (!psp->state)
+            {
+                break;
+            }
+        }
+        stnum = psp->state->nextstate;
+    }
+    while (!psp->tics);         // An initial state of 0 could cycle through.
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_SetPspriteNF
+//
+// Identical to P_SetPsprite, without calling the action function
+//---------------------------------------------------------------------------
+
+void P_SetPspriteNF(player_t * player, int position, statenum_t stnum)
+{
+    pspdef_t *psp;
+    state_t *state;
+
+    psp = &player->psprites[position];
+    do
+    {
+        if (!stnum)
+        {                       // Object removed itself.
+            psp->state = NULL;
+            break;
+        }
+        state = &states[stnum];
+        psp->state = state;
+        psp->tics = state->tics;        // could be 0
+        if (state->misc1)
+        {                       // Set coordinates.
+            psp->sx = state->misc1 << FRACBITS;
+        }
+        if (state->misc2)
+        {
+            psp->sy = state->misc2 << FRACBITS;
+        }
+        stnum = psp->state->nextstate;
+    }
+    while (!psp->tics);         // An initial state of 0 could cycle through.
+}
+
+/*
+=================
+=
+= P_CalcSwing
+=
+=================
+*/
+
+/*
+fixed_t	swingx, swingy;
+void P_CalcSwing (player_t *player)
+{
+	fixed_t	swing;
+	int		angle;
+
+// OPTIMIZE: tablify this
+
+	swing = player->bob;
+
+	angle = (FINEANGLES/70*leveltime)&FINEMASK;
+	swingx = FixedMul ( swing, finesine[angle]);
+
+	angle = (FINEANGLES/70*leveltime+FINEANGLES/2)&FINEMASK;
+	swingy = -FixedMul ( swingx, finesine[angle]);
+}
+*/
+
+//---------------------------------------------------------------------------
+//
+// PROC P_ActivateMorphWeapon
+//
+//---------------------------------------------------------------------------
+
+void P_ActivateMorphWeapon(player_t * player)
+{
+    player->pendingweapon = WP_NOCHANGE;
+    player->psprites[ps_weapon].sy = WEAPONTOP;
+    player->readyweapon = WP_FIRST;     // Snout is the first weapon
+    P_SetPsprite(player, ps_weapon, S_SNOUTREADY);
+}
+
+
+//---------------------------------------------------------------------------
+//
+// PROC P_PostMorphWeapon
+//
+//---------------------------------------------------------------------------
+
+void P_PostMorphWeapon(player_t * player, weapontype_t weapon)
+{
+    player->pendingweapon = WP_NOCHANGE;
+    player->readyweapon = weapon;
+    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+    P_SetPsprite(player, ps_weapon,
+                 WeaponInfo[weapon][player->class].upstate);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_BringUpWeapon
+//
+// Starts bringing the pending weapon up from the bottom of the screen.
+//
+//---------------------------------------------------------------------------
+
+void P_BringUpWeapon(player_t * player)
+{
+    statenum_t new;
+
+    if (player->pendingweapon == WP_NOCHANGE)
+    {
+        player->pendingweapon = player->readyweapon;
+    }
+    if (player->class == PCLASS_FIGHTER && player->pendingweapon == WP_SECOND
+        && player->mana[MANA_1])
+    {
+        new = S_FAXEUP_G;
+    }
+    else
+    {
+        new = WeaponInfo[player->pendingweapon][player->class].upstate;
+    }
+    player->pendingweapon = WP_NOCHANGE;
+    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+    P_SetPsprite(player, ps_weapon, new);
+}
+
+//---------------------------------------------------------------------------
+//
+// FUNC P_CheckMana
+//
+// Returns true if there is enough mana to shoot.  If not, selects the
+// next weapon to use.
+//
+//---------------------------------------------------------------------------
+
+boolean P_CheckMana(player_t * player)
+{
+    manatype_t mana;
+    int count;
+
+    mana = WeaponInfo[player->readyweapon][player->class].mana;
+    count = WeaponManaUse[player->class][player->readyweapon];
+    if (mana == MANA_BOTH)
+    {
+        if (player->mana[MANA_1] >= count && player->mana[MANA_2] >= count)
+        {
+            return true;
+        }
+    }
+    else if (mana == MANA_NONE || player->mana[mana] >= count)
+    {
+        return (true);
+    }
+    // out of mana, pick a weapon to change to
+    do
+    {
+        if (player->weaponowned[WP_THIRD]
+            && player->mana[MANA_2] >= WeaponManaUse[player->class][WP_THIRD])
+        {
+            player->pendingweapon = WP_THIRD;
+        }
+        else if (player->weaponowned[WP_SECOND]
+                 && player->mana[MANA_1] >=
+                 WeaponManaUse[player->class][WP_SECOND])
+        {
+            player->pendingweapon = WP_SECOND;
+        }
+        else if (player->weaponowned[WP_FOURTH]
+                 && player->mana[MANA_1] >=
+                 WeaponManaUse[player->class][WP_FOURTH]
+                 && player->mana[MANA_2] >=
+                 WeaponManaUse[player->class][WP_FOURTH])
+        {
+            player->pendingweapon = WP_FOURTH;
+        }
+        else
+        {
+            player->pendingweapon = WP_FIRST;
+        }
+    }
+    while (player->pendingweapon == WP_NOCHANGE);
+    P_SetPsprite(player, ps_weapon,
+                 WeaponInfo[player->readyweapon][player->class].downstate);
+    return (false);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_FireWeapon
+//
+//---------------------------------------------------------------------------
+
+void P_FireWeapon(player_t * player)
+{
+    statenum_t attackState;
+
+    if (!P_CheckMana(player))
+    {
+        return;
+    }
+    P_SetMobjState(player->mo, PStateAttack[player->class]);    // S_PLAY_ATK1);
+    if (player->class == PCLASS_FIGHTER && player->readyweapon == WP_SECOND
+        && player->mana[MANA_1] > 0)
+    {                           // Glowing axe
+        attackState = S_FAXEATK_G1;
+    }
+    else
+    {
+        attackState = player->refire ?
+            WeaponInfo[player->readyweapon][player->class].holdatkstate
+            : WeaponInfo[player->readyweapon][player->class].atkstate;
+    }
+    P_SetPsprite(player, ps_weapon, attackState);
+    P_NoiseAlert(player->mo, player->mo);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC P_DropWeapon
+//
+// The player died, so put the weapon away.
+//
+//---------------------------------------------------------------------------
+
+void P_DropWeapon(player_t * player)
+{
+    P_SetPsprite(player, ps_weapon,
+                 WeaponInfo[player->readyweapon][player->class].downstate);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_WeaponReady
+//
+// The player can fire the weapon or change to another weapon at this time.
+//
+//---------------------------------------------------------------------------
+
+void A_WeaponReady(mobj_t *obj, player_t *player, pspdef_t *psp)
+{
+    int angle;
+
+    // Change player from attack state
+    if (player->mo->state >= &states[PStateAttack[player->class]]
+        && player->mo->state <= &states[PStateAttackEnd[player->class]])
+    {
+        P_SetMobjState(player->mo, PStateNormal[player->class]);
+    }
+    // Put the weapon away if the player has a pending weapon or has
+    // died.
+    if (player->pendingweapon != WP_NOCHANGE || !player->health)
+    {
+        P_SetPsprite(player, ps_weapon,
+                     WeaponInfo[player->readyweapon][player->class].
+                     downstate);
+        return;
+    }
+
+    // Check for fire. 
+    if (player->cmd.buttons & BT_ATTACK)
+    {
+        player->attackdown = true;
+        P_FireWeapon(player);
+        return;
+    }
+    else
+    {
+        player->attackdown = false;
+    }
+
+    if (!player->morphTics)
+    {
+        // Bob the weapon based on movement speed.
+        angle = (128 * leveltime) & FINEMASK;
+        psp->sx = FRACUNIT + FixedMul(player->bob, finecosine[angle]);
+        angle &= FINEANGLES / 2 - 1;
+        psp->sy = WEAPONTOP + FixedMul(player->bob, finesine[angle]);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_ReFire
+//
+// The player can re fire the weapon without lowering it entirely.
+//
+//---------------------------------------------------------------------------
+
+void A_ReFire(mobj_t *mobj, player_t *player, pspdef_t *psp)
+{
+    if ((player->cmd.buttons & BT_ATTACK)
+        && player->pendingweapon == WP_NOCHANGE && player->health)
+    {
+        player->refire++;
+        P_FireWeapon(player);
+    }
+    else
+    {
+        player->refire = 0;
+        P_CheckMana(player);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_Lower
+//
+//---------------------------------------------------------------------------
+
+void A_Lower(mobj_t *mobj, player_t *player, pspdef_t *psp)
+{
+    if (player->morphTics)
+    {
+        psp->sy = WEAPONBOTTOM;
+    }
+    else
+    {
+        psp->sy += LOWERSPEED;
+    }
+    if (psp->sy < WEAPONBOTTOM)
+    {                           // Not lowered all the way yet
+        return;
+    }
+    if (player->playerstate == PST_DEAD)
+    {                           // Player is dead, so don't bring up a pending weapon
+        psp->sy = WEAPONBOTTOM;
+        return;
+    }
+    if (!player->health)
+    {                           // Player is dead, so keep the weapon off screen
+        P_SetPsprite(player, ps_weapon, S_NULL);
+        return;
+    }
+    player->readyweapon = player->pendingweapon;
+    P_BringUpWeapon(player);
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC A_Raise
+//
+//---------------------------------------------------------------------------
+
+void A_Raise(mobj_t *mobj, player_t *player, pspdef_t *psp)
+{
+    psp->sy -= RAISESPEED;
+    if (psp->sy > WEAPONTOP)
+    {                           // Not raised all the way yet
+        return;
+    }
+    psp->sy = WEAPONTOP;
+    if (player->class == PCLASS_FIGHTER && player->readyweapon == WP_SECOND
+        && player->mana[MANA_1])
+    {
+        P_SetPsprite(player, ps_weapon, S_FAXEREADY_G);
+    }
+    else
+    {
+        P_SetPsprite(player, ps_weapon,
+                     WeaponInfo[player->readyweapon][player->class].
+                     readystate);
+    }
+}
+
+/*
+===============
+=
+= P_BulletSlope
+=
+= Sets a slope so a near miss is at aproximately the height of the
+= intended target
+=
+===============
+*/
+
+/*
+void P_BulletSlope (mobj_t *mo)
+{
+	angle_t		an;
+
+//
+// see which target is to be aimed at
+//
+	an = mo->angle;
+	bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+	if (!linetarget)
+	{
+		an += 1<<26;
+		bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+		if (!linetarget)
+		{
+			an -= 2<<26;
+			bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+		}
+		if (!linetarget)
+		{
+			an += 1<<26;
+			bulletslope = (mo->player->lookdir<<FRACBITS)/173;
+		}
+	}
+}
+*/
+
+//
+// WEAPON ATTACKS
+//
+
+//============================================================================
+//
+//      AdjustPlayerAngle
+//
+//============================================================================
+
+#define MAX_ANGADJUST (5*ANG1)
+
+void AdjustPlayerAngle(mobj_t * pmo)
+{
+    angle_t angle;
+    int difference;
+
+    angle = R_PointToAngle2(pmo->x, pmo->y, linetarget->x, linetarget->y);
+    difference = (int) angle - (int) pmo->angle;
+    if (abs(difference) > MAX_ANGADJUST)
+    {
+        pmo->angle += difference > 0 ? MAX_ANGADJUST : -MAX_ANGADJUST;
+    }
+    else
+    {
+        pmo->angle = angle;
+    }
+}
+
+//============================================================================
+//
+// A_SnoutAttack
+//
+//============================================================================
+
+void A_SnoutAttack(mobj_t *mobj, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+
+    damage = 3 + (P_Random() & 3);
+    angle = player->mo->angle;
+    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
+    PuffType = MT_SNOUTPUFF;
+    PuffSpawned = NULL;
+    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
+    S_StartSound(player->mo, SFX_PIG_ACTIVE1 + (P_Random() & 1));
+    if (linetarget)
+    {
+        AdjustPlayerAngle(player->mo);
+//              player->mo->angle = R_PointToAngle2(player->mo->x,
+//                      player->mo->y, linetarget->x, linetarget->y);
+        if (PuffSpawned)
+        {                       // Bit something
+            S_StartSound(player->mo, SFX_PIG_ATTACK);
+        }
+    }
+}
+
+//============================================================================
+//
+// A_FHammerAttack
+//
+//============================================================================
+
+#define HAMMER_RANGE	(MELEERANGE+MELEERANGE/2)
+
+void A_FHammerAttack(mobj_t *mobj, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    mobj_t *pmo = player->mo;
+    int damage;
+    fixed_t power;
+    int slope;
+    int i;
+
+    damage = 60 + (P_Random() & 63);
+    power = 10 * FRACUNIT;
+    PuffType = MT_HAMMERPUFF;
+    for (i = 0; i < 16; i++)
+    {
+        angle = pmo->angle + i * (ANG45 / 32);
+        slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE);
+        if (linetarget)
+        {
+            P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage);
+            AdjustPlayerAngle(pmo);
+            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
+            {
+                P_ThrustMobj(linetarget, angle, power);
+            }
+            pmo->special1.i = false;      // Don't throw a hammer
+            goto hammerdone;
+        }
+        angle = pmo->angle - i * (ANG45 / 32);
+        slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE);
+        if (linetarget)
+        {
+            P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage);
+            AdjustPlayerAngle(pmo);
+            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
+            {
+                P_ThrustMobj(linetarget, angle, power);
+            }
+            pmo->special1.i = false;      // Don't throw a hammer
+            goto hammerdone;
+        }
+    }
+    // didn't find any targets in meleerange, so set to throw out a hammer
+    PuffSpawned = NULL;
+    angle = pmo->angle;
+    slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE);
+    P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage);
+    if (PuffSpawned)
+    {
+        pmo->special1.i = false;
+    }
+    else
+    {
+        pmo->special1.i = true;
+    }
+  hammerdone:
+    if (player->mana[MANA_2] <
+        WeaponManaUse[player->class][player->readyweapon])
+    {                           // Don't spawn a hammer if the player doesn't have enough mana
+        pmo->special1.i = false;
+    }
+    return;
+}
+
+//============================================================================
+//
+// A_FHammerThrow
+//
+//============================================================================
+
+void A_FHammerThrow(mobj_t *mobj, player_t * player, pspdef_t * psp)
+{
+    mobj_t *mo;
+
+    if (!player->mo->special1.i)
+    {
+        return;
+    }
+    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+    mo = P_SpawnPlayerMissile(player->mo, MT_HAMMER_MISSILE);
+    if (mo)
+    {
+        mo->special1.i = 0;
+    }
+}
+
+//============================================================================
+//
+// A_FSwordAttack
+//
+//============================================================================
+
+void A_FSwordAttack(mobj_t *mobj, player_t *player, pspdef_t *psp)
+{
+    mobj_t *pmo;
+
+    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
+    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+    pmo = player->mo;
+    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z - 10 * FRACUNIT,
+                  MT_FSWORD_MISSILE, pmo->angle + ANG45 / 4);
+    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z - 5 * FRACUNIT,
+                  MT_FSWORD_MISSILE, pmo->angle + ANG45 / 8);
+    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z, MT_FSWORD_MISSILE, pmo->angle);
+    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z + 5 * FRACUNIT,
+                  MT_FSWORD_MISSILE, pmo->angle - ANG45 / 8);
+    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z + 10 * FRACUNIT,
+                  MT_FSWORD_MISSILE, pmo->angle - ANG45 / 4);
+    S_StartSound(pmo, SFX_FIGHTER_SWORD_FIRE);
+}
+
+//============================================================================
+//
+// A_FSwordAttack2
+//
+//============================================================================
+
+void A_FSwordAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle = actor->angle;
+
+    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle + ANG45 / 4, 0);
+    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle + ANG45 / 8, 0);
+    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle, 0);
+    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle - ANG45 / 8, 0);
+    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle - ANG45 / 4, 0);
+    S_StartSound(actor, SFX_FIGHTER_SWORD_FIRE);
+}
+
+//============================================================================
+//
+// A_FSwordFlames
+//
+//============================================================================
+
+void A_FSwordFlames(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    int r1,r2,r3;
+
+    for (i = 1 + (P_Random() & 3); i; i--)
+    {
+        r1 = P_Random();
+        r2 = P_Random();
+        r3 = P_Random();
+        P_SpawnMobj(actor->x + ((r3 - 128) << 12), actor->y
+                    + ((r2 - 128) << 12),
+                    actor->z + ((r1 - 128) << 11), MT_FSWORD_FLAME);
+    }
+}
+
+//============================================================================
+//
+// A_MWandAttack
+//
+//============================================================================
+
+void A_MWandAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnPlayerMissile(player->mo, MT_MWAND_MISSILE);
+    if (mo)
+    {
+        mo->thinker.function = P_BlasterMobjThinker;
+    }
+    S_StartSound(player->mo, SFX_MAGE_WAND_FIRE);
+}
+
+// ===== Mage Lightning Weapon =====
+
+//============================================================================
+//
+// A_LightningReady
+//
+//============================================================================
+
+void A_LightningReady(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_WeaponReady(actor, player, psp);
+    if (P_Random() < 160)
+    {
+        S_StartSound(player->mo, SFX_MAGE_LIGHTNING_READY);
+    }
+}
+
+//============================================================================
+//
+// A_LightningClip
+//
+//============================================================================
+
+#define ZAGSPEED	FRACUNIT
+
+void A_LightningClip(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *cMo;
+    mobj_t *target = NULL;
+    int zigZag;
+
+    if (actor->type == MT_LIGHTNING_FLOOR)
+    {
+        actor->z = actor->floorz;
+        target = actor->special2.m->special1.m;
+    }
+    else if (actor->type == MT_LIGHTNING_CEILING)
+    {
+        actor->z = actor->ceilingz - actor->height;
+        target = actor->special1.m;
+    }
+    if (actor->type == MT_LIGHTNING_FLOOR)
+    {                           // floor lightning zig-zags, and forces the ceiling lightning to mimic
+        cMo = actor->special2.m;
+        zigZag = P_Random();
+        if ((zigZag > 128 && actor->special1.i < 2) || actor->special1.i < -2)
+        {
+            P_ThrustMobj(actor, actor->angle + ANG90, ZAGSPEED);
+            if (cMo)
+            {
+                P_ThrustMobj(cMo, actor->angle + ANG90, ZAGSPEED);
+            }
+            actor->special1.i++;
+        }
+        else
+        {
+            P_ThrustMobj(actor, actor->angle - ANG90, ZAGSPEED);
+            if (cMo)
+            {
+                P_ThrustMobj(cMo, cMo->angle - ANG90, ZAGSPEED);
+            }
+            actor->special1.i--;
+        }
+    }
+    if (target)
+    {
+        if (target->health <= 0)
+        {
+            P_ExplodeMissile(actor);
+        }
+        else
+        {
+            actor->angle = R_PointToAngle2(actor->x, actor->y, target->x,
+                                           target->y);
+            actor->momx = 0;
+            actor->momy = 0;
+            P_ThrustMobj(actor, actor->angle, actor->info->speed >> 1);
+        }
+    }
+}
+
+//============================================================================
+//
+// A_LightningZap
+//
+//============================================================================
+
+void A_LightningZap(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    fixed_t deltaZ;
+    int r1,r2;
+
+    A_LightningClip(actor, player, psp);
+
+    actor->health -= 8;
+    if (actor->health <= 0)
+    {
+        P_SetMobjState(actor, actor->info->deathstate);
+        return;
+    }
+    if (actor->type == MT_LIGHTNING_FLOOR)
+    {
+        deltaZ = 10 * FRACUNIT;
+    }
+    else
+    {
+        deltaZ = -10 * FRACUNIT;
+    }
+    r1 = P_Random();
+    r2 = P_Random();
+    mo = P_SpawnMobj(actor->x + ((r2 - 128) * actor->radius / 256),
+                     actor->y + ((r1 - 128) * actor->radius / 256),
+                     actor->z + deltaZ, MT_LIGHTNING_ZAP);
+    if (mo)
+    {
+        mo->special2.m = actor;
+        mo->momx = actor->momx;
+        mo->momy = actor->momy;
+        mo->target = actor->target;
+        if (actor->type == MT_LIGHTNING_FLOOR)
+        {
+            mo->momz = 20 * FRACUNIT;
+        }
+        else
+        {
+            mo->momz = -20 * FRACUNIT;
+        }
+    }
+/*
+	mo = P_SpawnMobj(actor->x+((P_Random()-128)*actor->radius/256), 
+		actor->y+((P_Random()-128)*actor->radius/256), 
+		actor->z+deltaZ, MT_LIGHTNING_ZAP);
+	if(mo)
+	{
+		mo->special2.m = actor;
+		mo->momx = actor->momx;
+		mo->momy = actor->momy;
+		mo->target = actor->target;
+		if(actor->type == MT_LIGHTNING_FLOOR)
+		{
+			mo->momz = 16*FRACUNIT;
+		}
+		else 
+		{
+			mo->momz = -16*FRACUNIT;
+		}
+	}
+*/
+    if (actor->type == MT_LIGHTNING_FLOOR && P_Random() < 160)
+    {
+        S_StartSound(actor, SFX_MAGE_LIGHTNING_CONTINUOUS);
+    }
+}
+
+//============================================================================
+//
+// A_MLightningAttack2
+//
+//============================================================================
+
+void A_MLightningAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *fmo, *cmo;
+
+    fmo = P_SpawnPlayerMissile(actor, MT_LIGHTNING_FLOOR);
+    cmo = P_SpawnPlayerMissile(actor, MT_LIGHTNING_CEILING);
+    if (fmo)
+    {
+        fmo->special1.m = NULL;
+        fmo->special2.m = cmo;
+        A_LightningZap(fmo, player, psp);
+    }
+    if (cmo)
+    {
+        cmo->special1.m = NULL;      // mobj that it will track
+        cmo->special2.m = fmo;
+        A_LightningZap(cmo, player, psp);
+    }
+    S_StartSound(actor, SFX_MAGE_LIGHTNING_FIRE);
+}
+
+//============================================================================
+//
+// A_MLightningAttack
+//
+//============================================================================
+
+void A_MLightningAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_MLightningAttack2(player->mo, player, psp);
+    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+}
+
+//============================================================================
+//
+// A_ZapMimic
+//
+//============================================================================
+
+void A_ZapMimic(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = actor->special2.m;
+    if (mo)
+    {
+        if (mo->state >= &states[mo->info->deathstate]
+            || mo->state == &states[S_FREETARGMOBJ])
+        {
+            P_ExplodeMissile(actor);
+        }
+        else
+        {
+            actor->momx = mo->momx;
+            actor->momy = mo->momy;
+        }
+    }
+}
+
+//============================================================================
+//
+// A_LastZap
+//
+//============================================================================
+
+void A_LastZap(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_LIGHTNING_ZAP);
+    if (mo)
+    {
+        P_SetMobjState(mo, S_LIGHTNING_ZAP_X1);
+        mo->momz = 40 * FRACUNIT;
+    }
+}
+
+//============================================================================
+//
+// A_LightningRemove
+//
+//============================================================================
+
+void A_LightningRemove(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = actor->special2.m;
+    if (mo)
+    {
+        mo->special2.m = NULL;
+        P_ExplodeMissile(mo);
+    }
+}
+
+
+//============================================================================
+//
+// MStaffSpawn
+//
+//============================================================================
+void MStaffSpawn(mobj_t * pmo, angle_t angle)
+{
+    mobj_t *mo;
+
+    mo = P_SPMAngle(pmo, MT_MSTAFF_FX2, angle);
+    if (mo)
+    {
+        mo->target = pmo;
+        mo->special1.m = P_RoughMonsterSearch(mo, 10);
+    }
+}
+
+//============================================================================
+//
+// A_MStaffAttack
+//
+//============================================================================
+
+void A_MStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    mobj_t *pmo;
+
+    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
+    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+    pmo = player->mo;
+    angle = pmo->angle;
+
+    MStaffSpawn(pmo, angle);
+    MStaffSpawn(pmo, angle - ANG1 * 5);
+    MStaffSpawn(pmo, angle + ANG1 * 5);
+    S_StartSound(player->mo, SFX_MAGE_STAFF_FIRE);
+    if (player == &players[consoleplayer])
+    {
+        player->damagecount = 0;
+        player->bonuscount = 0;
+        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
+                                             PU_CACHE) +
+                     STARTSCOURGEPAL * 768);
+    }
+}
+
+//============================================================================
+//
+// A_MStaffPalette
+//
+//============================================================================
+
+void A_MStaffPalette(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int pal;
+
+    if (player == &players[consoleplayer])
+    {
+        pal = STARTSCOURGEPAL + psp->state - (&states[S_MSTAFFATK_2]);
+        if (pal == STARTSCOURGEPAL + 3)
+        {                       // reset back to original playpal
+            pal = 0;
+        }
+        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
+                                             PU_CACHE) + pal * 768);
+    }
+}
+
+//============================================================================
+//
+// A_MStaffWeave
+//
+//============================================================================
+
+void A_MStaffWeave(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t newX, newY;
+    int weaveXY, weaveZ;
+    int angle;
+
+    weaveXY = actor->special2.i >> 16;
+    weaveZ = actor->special2.i & 0xFFFF;
+    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    newX = actor->x - FixedMul(finecosine[angle],
+                               FloatBobOffsets[weaveXY] << 2);
+    newY = actor->y - FixedMul(finesine[angle],
+                               FloatBobOffsets[weaveXY] << 2);
+    weaveXY = (weaveXY + 6) & 63;
+    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 2);
+    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 2);
+    P_TryMove(actor, newX, newY);
+    actor->z -= FloatBobOffsets[weaveZ] << 1;
+    weaveZ = (weaveZ + 3) & 63;
+    actor->z += FloatBobOffsets[weaveZ] << 1;
+    if (actor->z <= actor->floorz)
+    {
+        actor->z = actor->floorz + FRACUNIT;
+    }
+    actor->special2.i = weaveZ + (weaveXY << 16);
+}
+
+
+//============================================================================
+//
+// A_MStaffTrack
+//
+//============================================================================
+
+void A_MStaffTrack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if ((actor->special1.m == NULL) && (P_Random() < 50))
+    {
+        actor->special1.m = P_RoughMonsterSearch(actor, 10);
+    }
+    P_SeekerMissile(actor, ANG1 * 2, ANG1 * 10);
+}
+
+
+//============================================================================
+//
+// MStaffSpawn2 - for use by mage class boss
+//
+//============================================================================
+
+void MStaffSpawn2(mobj_t * actor, angle_t angle)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnMissileAngle(actor, MT_MSTAFF_FX2, angle, 0);
+    if (mo)
+    {
+        mo->target = actor;
+        mo->special1.m = P_RoughMonsterSearch(mo, 10);
+    }
+}
+
+//============================================================================
+//
+// A_MStaffAttack2 - for use by mage class boss
+//
+//============================================================================
+
+void A_MStaffAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    angle = actor->angle;
+    MStaffSpawn2(actor, angle);
+    MStaffSpawn2(actor, angle - ANG1 * 5);
+    MStaffSpawn2(actor, angle + ANG1 * 5);
+    S_StartSound(actor, SFX_MAGE_STAFF_FIRE);
+}
+
+//============================================================================
+//
+// A_FPunchAttack
+//
+//============================================================================
+
+void A_FPunchAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+    mobj_t *pmo = player->mo;
+    fixed_t power;
+    int i;
+
+    damage = 40 + (P_Random() & 15);
+    power = 2 * FRACUNIT;
+    PuffType = MT_PUNCHPUFF;
+    for (i = 0; i < 16; i++)
+    {
+        angle = pmo->angle + i * (ANG45 / 16);
+        slope = P_AimLineAttack(pmo, angle, 2 * MELEERANGE);
+        if (linetarget)
+        {
+            player->mo->special1.i++;
+            if (pmo->special1.i == 3)
+            {
+                damage <<= 1;
+                power = 6 * FRACUNIT;
+                PuffType = MT_HAMMERPUFF;
+            }
+            P_LineAttack(pmo, angle, 2 * MELEERANGE, slope, damage);
+            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
+            {
+                P_ThrustMobj(linetarget, angle, power);
+            }
+            AdjustPlayerAngle(pmo);
+            goto punchdone;
+        }
+        angle = pmo->angle - i * (ANG45 / 16);
+        slope = P_AimLineAttack(pmo, angle, 2 * MELEERANGE);
+        if (linetarget)
+        {
+            pmo->special1.i++;
+            if (pmo->special1.i == 3)
+            {
+                damage <<= 1;
+                power = 6 * FRACUNIT;
+                PuffType = MT_HAMMERPUFF;
+            }
+            P_LineAttack(pmo, angle, 2 * MELEERANGE, slope, damage);
+            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
+            {
+                P_ThrustMobj(linetarget, angle, power);
+            }
+            AdjustPlayerAngle(pmo);
+            goto punchdone;
+        }
+    }
+    // didn't find any creatures, so try to strike any walls
+    pmo->special1.i = 0;
+
+    angle = pmo->angle;
+    slope = P_AimLineAttack(pmo, angle, MELEERANGE);
+    P_LineAttack(pmo, angle, MELEERANGE, slope, damage);
+
+  punchdone:
+    if (pmo->special1.i == 3)
+    {
+        pmo->special1.i = 0;
+        P_SetPsprite(player, ps_weapon, S_PUNCHATK2_1);
+        S_StartSound(pmo, SFX_FIGHTER_GRUNT);
+    }
+    return;
+}
+
+//============================================================================
+//
+// A_FAxeAttack
+//
+//============================================================================
+
+#define AXERANGE	2.25*MELEERANGE
+
+void A_FAxeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    mobj_t *pmo = player->mo;
+    fixed_t power;
+    int damage;
+    int slope;
+    int i;
+    int useMana;
+    int r;
+
+    r = P_Random();
+    damage = 40 + (r & 15) + (P_Random() & 7);
+    power = 0;
+    if (player->mana[MANA_1] > 0)
+    {
+        damage <<= 1;
+        power = 6 * FRACUNIT;
+        PuffType = MT_AXEPUFF_GLOW;
+        useMana = 1;
+    }
+    else
+    {
+        PuffType = MT_AXEPUFF;
+        useMana = 0;
+    }
+    for (i = 0; i < 16; i++)
+    {
+        angle = pmo->angle + i * (ANG45 / 16);
+        slope = P_AimLineAttack(pmo, angle, AXERANGE);
+        if (linetarget)
+        {
+            P_LineAttack(pmo, angle, AXERANGE, slope, damage);
+            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
+            {
+                P_ThrustMobj(linetarget, angle, power);
+            }
+            AdjustPlayerAngle(pmo);
+            useMana++;
+            goto axedone;
+        }
+        angle = pmo->angle - i * (ANG45 / 16);
+        slope = P_AimLineAttack(pmo, angle, AXERANGE);
+        if (linetarget)
+        {
+            P_LineAttack(pmo, angle, AXERANGE, slope, damage);
+            if (linetarget->flags & MF_COUNTKILL)
+            {
+                P_ThrustMobj(linetarget, angle, power);
+            }
+            AdjustPlayerAngle(pmo);
+            useMana++;
+            goto axedone;
+        }
+    }
+    // didn't find any creatures, so try to strike any walls
+    pmo->special1.m = NULL;
+
+    angle = pmo->angle;
+    slope = P_AimLineAttack(pmo, angle, MELEERANGE);
+    P_LineAttack(pmo, angle, MELEERANGE, slope, damage);
+
+  axedone:
+    if (useMana == 2)
+    {
+        player->mana[MANA_1] -=
+            WeaponManaUse[player->class][player->readyweapon];
+        if (player->mana[MANA_1] <= 0)
+        {
+            P_SetPsprite(player, ps_weapon, S_FAXEATK_5);
+        }
+    }
+    return;
+}
+
+//===========================================================================
+//
+// A_CMaceAttack
+//
+//===========================================================================
+
+void A_CMaceAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int slope;
+    int i;
+
+    damage = 25 + (P_Random() & 15);
+    PuffType = MT_HAMMERPUFF;
+    for (i = 0; i < 16; i++)
+    {
+        angle = player->mo->angle + i * (ANG45 / 16);
+        slope = P_AimLineAttack(player->mo, angle, 2 * MELEERANGE);
+        if (linetarget)
+        {
+            P_LineAttack(player->mo, angle, 2 * MELEERANGE, slope, damage);
+            AdjustPlayerAngle(player->mo);
+//                      player->mo->angle = R_PointToAngle2(player->mo->x,
+//                              player->mo->y, linetarget->x, linetarget->y);
+            goto macedone;
+        }
+        angle = player->mo->angle - i * (ANG45 / 16);
+        slope = P_AimLineAttack(player->mo, angle, 2 * MELEERANGE);
+        if (linetarget)
+        {
+            P_LineAttack(player->mo, angle, 2 * MELEERANGE, slope, damage);
+            AdjustPlayerAngle(player->mo);
+//                      player->mo->angle = R_PointToAngle2(player->mo->x,
+//                              player->mo->y, linetarget->x, linetarget->y);
+            goto macedone;
+        }
+    }
+    // didn't find any creatures, so try to strike any walls
+    player->mo->special1.m = NULL;
+
+    angle = player->mo->angle;
+    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
+    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
+  macedone:
+    return;
+}
+
+//============================================================================
+//
+// A_CStaffCheck
+//
+//============================================================================
+
+void A_CStaffCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *pmo;
+    int damage;
+    int newLife;
+    angle_t angle;
+    int slope;
+    int i;
+
+    pmo = player->mo;
+    damage = 20 + (P_Random() & 15);
+    PuffType = MT_CSTAFFPUFF;
+    for (i = 0; i < 3; i++)
+    {
+        angle = pmo->angle + i * (ANG45 / 16);
+        slope = P_AimLineAttack(pmo, angle, 1.5 * MELEERANGE);
+        if (linetarget)
+        {
+            P_LineAttack(pmo, angle, 1.5 * MELEERANGE, slope, damage);
+            pmo->angle = R_PointToAngle2(pmo->x, pmo->y,
+                                         linetarget->x, linetarget->y);
+            if ((linetarget->player || linetarget->flags & MF_COUNTKILL)
+                && (!(linetarget->flags2 & (MF2_DORMANT + MF2_INVULNERABLE))))
+            {
+                newLife = player->health + (damage >> 3);
+                newLife = newLife > 100 ? 100 : newLife;
+                pmo->health = player->health = newLife;
+                P_SetPsprite(player, ps_weapon, S_CSTAFFATK2_1);
+            }
+            player->mana[MANA_1] -=
+                WeaponManaUse[player->class][player->readyweapon];
+            break;
+        }
+        angle = pmo->angle - i * (ANG45 / 16);
+        slope = P_AimLineAttack(player->mo, angle, 1.5 * MELEERANGE);
+        if (linetarget)
+        {
+            P_LineAttack(pmo, angle, 1.5 * MELEERANGE, slope, damage);
+            pmo->angle = R_PointToAngle2(pmo->x, pmo->y,
+                                         linetarget->x, linetarget->y);
+            if (linetarget->player || linetarget->flags & MF_COUNTKILL)
+            {
+                newLife = player->health + (damage >> 4);
+                newLife = newLife > 100 ? 100 : newLife;
+                pmo->health = player->health = newLife;
+                P_SetPsprite(player, ps_weapon, S_CSTAFFATK2_1);
+            }
+            player->mana[MANA_1] -=
+                WeaponManaUse[player->class][player->readyweapon];
+            break;
+        }
+    }
+}
+
+//============================================================================
+//
+// A_CStaffAttack
+//
+//============================================================================
+
+void A_CStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    mobj_t *pmo;
+
+    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
+    pmo = player->mo;
+    mo = P_SPMAngle(pmo, MT_CSTAFF_MISSILE, pmo->angle - (ANG45 / 15));
+    if (mo)
+    {
+        mo->special2.i = 32;
+    }
+    mo = P_SPMAngle(pmo, MT_CSTAFF_MISSILE, pmo->angle + (ANG45 / 15));
+    if (mo)
+    {
+        mo->special2.i = 0;
+    }
+    S_StartSound(player->mo, SFX_CLERIC_CSTAFF_FIRE);
+}
+
+//============================================================================
+//
+// A_CStaffMissileSlither
+//
+//============================================================================
+
+void A_CStaffMissileSlither(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    fixed_t newX, newY;
+    int weaveXY;
+    int angle;
+
+    weaveXY = actor->special2.i;
+    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    newX = actor->x - FixedMul(finecosine[angle], FloatBobOffsets[weaveXY]);
+    newY = actor->y - FixedMul(finesine[angle], FloatBobOffsets[weaveXY]);
+    weaveXY = (weaveXY + 3) & 63;
+    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY]);
+    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY]);
+    P_TryMove(actor, newX, newY);
+    actor->special2.i = weaveXY;
+}
+
+//============================================================================
+//
+// A_CStaffInitBlink
+//
+//============================================================================
+
+void A_CStaffInitBlink(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->mo->special1.i = (P_Random() >> 1) + 20;
+}
+
+//============================================================================
+//
+// A_CStaffCheckBlink
+//
+//============================================================================
+
+void A_CStaffCheckBlink(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    if (!--player->mo->special1.i)
+    {
+        P_SetPsprite(player, ps_weapon, S_CSTAFFBLINK1);
+        player->mo->special1.i = (P_Random() + 50) >> 2;
+    }
+}
+
+//============================================================================
+//
+// A_CFlameAttack
+//
+//============================================================================
+
+#define FLAMESPEED	(0.45*FRACUNIT)
+#define CFLAMERANGE	(12*64*FRACUNIT)
+
+void A_CFlameAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnPlayerMissile(player->mo, MT_CFLAME_MISSILE);
+    if (mo)
+    {
+        mo->thinker.function = P_BlasterMobjThinker;
+        mo->special1.i = 2;
+    }
+
+    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+    S_StartSound(player->mo, SFX_CLERIC_FLAME_FIRE);
+}
+
+//============================================================================
+//
+// A_CFlamePuff
+//
+//============================================================================
+
+void A_CFlamePuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_UnHideThing(actor, player, psp);
+    actor->momx = 0;
+    actor->momy = 0;
+    actor->momz = 0;
+    S_StartSound(actor, SFX_CLERIC_FLAME_EXPLODE);
+}
+
+//============================================================================
+//
+// A_CFlameMissile
+//
+//============================================================================
+
+void A_CFlameMissile(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int i;
+    int an;
+    fixed_t dist;
+    mobj_t *mo;
+
+    A_UnHideThing(actor, player, psp);
+    S_StartSound(actor, SFX_CLERIC_FLAME_EXPLODE);
+    if (BlockingMobj && BlockingMobj->flags & MF_SHOOTABLE)
+    {                           // Hit something, so spawn the flame circle around the thing
+        dist = BlockingMobj->radius + 18 * FRACUNIT;
+        for (i = 0; i < 4; i++)
+        {
+            an = (i * ANG45) >> ANGLETOFINESHIFT;
+            mo = P_SpawnMobj(BlockingMobj->x + FixedMul(dist, finecosine[an]),
+                             BlockingMobj->y + FixedMul(dist, finesine[an]),
+                             BlockingMobj->z + 5 * FRACUNIT, MT_CIRCLEFLAME);
+            if (mo)
+            {
+                mo->angle = an << ANGLETOFINESHIFT;
+                mo->target = actor->target;
+                mo->momx = mo->special1.i =
+                    FixedMul(FLAMESPEED, finecosine[an]);
+                mo->momy = mo->special2.i = FixedMul(FLAMESPEED, finesine[an]);
+                mo->tics -= P_Random() & 3;
+            }
+            mo = P_SpawnMobj(BlockingMobj->x - FixedMul(dist, finecosine[an]),
+                             BlockingMobj->y - FixedMul(dist, finesine[an]),
+                             BlockingMobj->z + 5 * FRACUNIT, MT_CIRCLEFLAME);
+            if (mo)
+            {
+                mo->angle = ANG180 + (an << ANGLETOFINESHIFT);
+                mo->target = actor->target;
+                mo->momx = mo->special1.i = FixedMul(-FLAMESPEED,
+                                                     finecosine[an]);
+                mo->momy = mo->special2.i = FixedMul(-FLAMESPEED, finesine[an]);
+                mo->tics -= P_Random() & 3;
+            }
+        }
+        P_SetMobjState(actor, S_FLAMEPUFF2_1);
+    }
+}
+
+/*
+void A_CFlameAttack(player_t *player, pspdef_t *psp)
+{
+	mobj_t *pmo;
+	angle_t angle;
+	int damage;
+	int i;
+	int an, an90;
+	fixed_t dist;
+	mobj_t *mo;
+
+	pmo = player->mo;
+	P_BulletSlope(pmo);
+	damage = 25+HITDICE(3);
+	angle = pmo->angle;
+	if(player->refire)
+	{
+		angle += P_SubRandom()<<17;
+	}
+	P_AimLineAttack(pmo, angle, CFLAMERANGE); // Correctly set linetarget
+	if(!linetarget)
+	{
+		angle += ANG1*2;
+		P_AimLineAttack(pmo, angle, CFLAMERANGE);
+		if(!linetarget)
+		{
+			angle -= ANG1*4;
+			P_AimLineAttack(pmo, angle, CFLAMERANGE);
+			if(!linetarget)
+			{
+				angle += ANG1*2;
+			}
+		}		
+	}
+	if(linetarget)
+	{
+		PuffType = MT_FLAMEPUFF2;
+	}
+	else
+	{
+		PuffType = MT_FLAMEPUFF;
+	}
+	P_LineAttack(pmo, angle, CFLAMERANGE, bulletslope, damage);
+	if(linetarget)
+	{ // Hit something, so spawn the flame circle around the thing
+		dist = linetarget->radius+18*FRACUNIT;
+		for(i = 0; i < 4; i++)
+		{
+			an = (i*ANG45)>>ANGLETOFINESHIFT;
+			an90 = (i*ANG45+ANG90)>>ANGLETOFINESHIFT;
+			mo = P_SpawnMobj(linetarget->x+FixedMul(dist, finecosine[an]),
+				linetarget->y+FixedMul(dist, finesine[an]), 
+				linetarget->z+5*FRACUNIT, MT_CIRCLEFLAME);
+			if(mo)
+			{
+				mo->angle = an<<ANGLETOFINESHIFT;
+				mo->target = pmo;
+				mo->momx = mo->special1.i = FixedMul(FLAMESPEED, finecosine[an]);
+				mo->momy = mo->special2.i = FixedMul(FLAMESPEED, finesine[an]);
+				mo->tics -= P_Random()&3;
+			}
+			mo = P_SpawnMobj(linetarget->x-FixedMul(dist, finecosine[an]),
+				linetarget->y-FixedMul(dist, finesine[an]), 
+				linetarget->z+5*FRACUNIT, MT_CIRCLEFLAME);
+			if(mo)
+			{
+				mo->angle = ANG180+(an<<ANGLETOFINESHIFT);
+				mo->target = pmo;
+				mo->momx = mo->special1.i = FixedMul(-FLAMESPEED, 
+					finecosine[an]);
+				mo->momy = mo->special2.i = FixedMul(-FLAMESPEED, finesine[an]);
+				mo->tics -= P_Random()&3;
+			}
+		}
+	}
+// Create a line of flames from the player to the flame puff
+	CFlameCreateFlames(player->mo);
+
+	player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+	S_StartSound(player->mo, SFX_CLERIC_FLAME_FIRE);
+}
+*/
+
+//============================================================================
+//
+// A_CFlameRotate
+//
+//============================================================================
+
+#define FLAMEROTSPEED	2*FRACUNIT
+
+void A_CFlameRotate(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int an;
+
+    an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    actor->momx = actor->special1.i + FixedMul(FLAMEROTSPEED, finecosine[an]);
+    actor->momy = actor->special2.i + FixedMul(FLAMEROTSPEED, finesine[an]);
+    actor->angle += ANG90 / 15;
+}
+
+
+//============================================================================
+//
+// A_CHolyAttack3
+//
+//      Spawns the spirits
+//============================================================================
+
+void A_CHolyAttack3(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMissile(actor, actor->target, MT_HOLY_MISSILE);
+    S_StartSound(actor, SFX_CHOLY_FIRE);
+}
+
+
+//============================================================================
+//
+// A_CHolyAttack2 
+//
+//      Spawns the spirits
+//============================================================================
+
+void A_CHolyAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int j;
+    int i;
+    int r;
+    mobj_t *mo;
+    mobj_t *tail, *next;
+
+    for (j = 0; j < 4; j++)
+    {
+        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_HOLY_FX);
+        if (!mo)
+        {
+            continue;
+        }
+        switch (j)
+        {                       // float bob index
+            case 0:
+                mo->special2.i = P_Random() & 7;  // upper-left
+                break;
+            case 1:
+                mo->special2.i = 32 + (P_Random() & 7);   // upper-right
+                break;
+            case 2:
+                mo->special2.i = (32 + (P_Random() & 7)) << 16;   // lower-left
+                break;
+            case 3:
+                r = P_Random();
+                mo->special2.i =
+                    ((32 + (r & 7)) << 16) + 32 + (P_Random() & 7);
+                break;
+        }
+        mo->z = actor->z;
+        mo->angle = actor->angle + (ANG45 + ANG45 / 2) - ANG45 * j;
+        P_ThrustMobj(mo, mo->angle, mo->info->speed);
+        mo->target = actor->target;
+        mo->args[0] = 10;       // initial turn value
+        mo->args[1] = 0;        // initial look angle
+        if (deathmatch)
+        {                       // Ghosts last slightly less longer in DeathMatch
+            mo->health = 85;
+        }
+        if (linetarget)
+        {
+            mo->special1.m = linetarget;
+            mo->flags |= MF_NOCLIP | MF_SKULLFLY;
+            mo->flags &= ~MF_MISSILE;
+        }
+        tail = P_SpawnMobj(mo->x, mo->y, mo->z, MT_HOLY_TAIL);
+        tail->special2.m = mo;      // parent
+        for (i = 1; i < 3; i++)
+        {
+            next = P_SpawnMobj(mo->x, mo->y, mo->z, MT_HOLY_TAIL);
+            P_SetMobjState(next, next->info->spawnstate + 1);
+            tail->special1.m = next;
+            tail = next;
+        }
+        tail->special1.m = NULL;     // last tail bit
+    }
+}
+
+//============================================================================
+//
+// A_CHolyAttack
+//
+//============================================================================
+
+void A_CHolyAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
+    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
+    P_SpawnPlayerMissile(player->mo, MT_HOLY_MISSILE);
+    if (player == &players[consoleplayer])
+    {
+        player->damagecount = 0;
+        player->bonuscount = 0;
+        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
+                                             PU_CACHE) + STARTHOLYPAL * 768);
+    }
+    S_StartSound(player->mo, SFX_CHOLY_FIRE);
+}
+
+//============================================================================
+//
+// A_CHolyPalette
+//
+//============================================================================
+
+void A_CHolyPalette(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    int pal;
+
+    if (player == &players[consoleplayer])
+    {
+        pal = STARTHOLYPAL + psp->state - (&states[S_CHOLYATK_6]);
+        if (pal == STARTHOLYPAL + 3)
+        {                       // reset back to original playpal
+            pal = 0;
+        }
+        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
+                                             PU_CACHE) + pal * 768);
+    }
+}
+
+//============================================================================
+//
+// CHolyFindTarget
+//
+//============================================================================
+
+static void CHolyFindTarget(mobj_t * actor)
+{
+    mobj_t *target;
+
+    target = P_RoughMonsterSearch(actor, 6);
+    if (target != NULL)
+    {
+        actor->special1.m = target;
+        actor->flags |= MF_NOCLIP | MF_SKULLFLY;
+        actor->flags &= ~MF_MISSILE;
+    }
+}
+
+//============================================================================
+//
+// CHolySeekerMissile
+//
+//       Similar to P_SeekerMissile, but seeks to a random Z on the target
+//============================================================================
+
+static void CHolySeekerMissile(mobj_t * actor, angle_t thresh,
+                               angle_t turnMax)
+{
+    int dir;
+    int dist;
+    angle_t delta;
+    angle_t angle;
+    mobj_t *target;
+    fixed_t newZ;
+    fixed_t deltaZ;
+
+    target = actor->special1.m;
+    if (target == NULL)
+    {
+        return;
+    }
+    if (!(target->flags & MF_SHOOTABLE)
+        || (!(target->flags & MF_COUNTKILL) && !target->player))
+    {                           // Target died/target isn't a player or creature
+        actor->special1.m = NULL;
+        actor->flags &= ~(MF_NOCLIP | MF_SKULLFLY);
+        actor->flags |= MF_MISSILE;
+        CHolyFindTarget(actor);
+        return;
+    }
+    dir = P_FaceMobj(actor, target, &delta);
+    if (delta > thresh)
+    {
+        delta >>= 1;
+        if (delta > turnMax)
+        {
+            delta = turnMax;
+        }
+    }
+    if (dir)
+    {                           // Turn clockwise
+        actor->angle += delta;
+    }
+    else
+    {                           // Turn counter clockwise
+        actor->angle -= delta;
+    }
+    angle = actor->angle >> ANGLETOFINESHIFT;
+    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
+    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
+    if (!(leveltime & 15)
+        || actor->z > target->z + (target->height)
+        || actor->z + actor->height < target->z)
+    {
+        newZ = target->z + ((P_Random() * target->height) >> 8);
+        deltaZ = newZ - actor->z;
+        if (abs(deltaZ) > 15 * FRACUNIT)
+        {
+            if (deltaZ > 0)
+            {
+                deltaZ = 15 * FRACUNIT;
+            }
+            else
+            {
+                deltaZ = -15 * FRACUNIT;
+            }
+        }
+        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
+        dist = dist / actor->info->speed;
+        if (dist < 1)
+        {
+            dist = 1;
+        }
+        actor->momz = deltaZ / dist;
+    }
+    return;
+}
+
+//============================================================================
+//
+// A_CHolyWeave
+//
+//============================================================================
+
+static void CHolyWeave(mobj_t * actor)
+{
+    fixed_t newX, newY;
+    int weaveXY, weaveZ;
+    int angle;
+
+    weaveXY = actor->special2.i >> 16;
+    weaveZ = actor->special2.i & 0xFFFF;
+    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    newX = actor->x - FixedMul(finecosine[angle],
+                               FloatBobOffsets[weaveXY] << 2);
+    newY = actor->y - FixedMul(finesine[angle],
+                               FloatBobOffsets[weaveXY] << 2);
+    weaveXY = (weaveXY + (P_Random() % 5)) & 63;
+    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 2);
+    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 2);
+    P_TryMove(actor, newX, newY);
+    actor->z -= FloatBobOffsets[weaveZ] << 1;
+    weaveZ = (weaveZ + (P_Random() % 5)) & 63;
+    actor->z += FloatBobOffsets[weaveZ] << 1;
+    actor->special2.i = weaveZ + (weaveXY << 16);
+}
+
+//============================================================================
+//
+// A_CHolySeek
+//
+//============================================================================
+
+void A_CHolySeek(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->health--;
+    if (actor->health <= 0)
+    {
+        actor->momx >>= 2;
+        actor->momy >>= 2;
+        actor->momz = 0;
+        P_SetMobjState(actor, actor->info->deathstate);
+        actor->tics -= P_Random() & 3;
+        return;
+    }
+    if (actor->special1.m)
+    {
+        CHolySeekerMissile(actor, actor->args[0] * ANG1,
+                           actor->args[0] * ANG1 * 2);
+        if (!((leveltime + 7) & 15))
+        {
+            actor->args[0] = 5 + (P_Random() / 20);
+        }
+    }
+    CHolyWeave(actor);
+}
+
+//============================================================================
+//
+// CHolyTailFollow
+//
+//============================================================================
+
+static void CHolyTailFollow(mobj_t * actor, fixed_t dist)
+{
+    mobj_t *child;
+    int an;
+    fixed_t oldDistance, newDistance;
+
+    child = actor->special1.m;
+    if (child)
+    {
+        an = R_PointToAngle2(actor->x, actor->y, child->x,
+                             child->y) >> ANGLETOFINESHIFT;
+        oldDistance =
+            P_AproxDistance(child->x - actor->x, child->y - actor->y);
+        if (P_TryMove
+            (child, actor->x + FixedMul(dist, finecosine[an]),
+             actor->y + FixedMul(dist, finesine[an])))
+        {
+            newDistance = P_AproxDistance(child->x - actor->x,
+                                          child->y - actor->y) - FRACUNIT;
+            if (oldDistance < FRACUNIT)
+            {
+                if (child->z < actor->z)
+                {
+                    child->z = actor->z - dist;
+                }
+                else
+                {
+                    child->z = actor->z + dist;
+                }
+            }
+            else
+            {
+                child->z = actor->z + FixedMul(FixedDiv(newDistance,
+                                                        oldDistance),
+                                               child->z - actor->z);
+            }
+        }
+        CHolyTailFollow(child, dist - FRACUNIT);
+    }
+}
+
+//============================================================================
+//
+// CHolyTailRemove
+//
+//============================================================================
+
+static void CHolyTailRemove(mobj_t * actor)
+{
+    mobj_t *child;
+
+    child = actor->special1.m;
+    if (child)
+    {
+        CHolyTailRemove(child);
+    }
+    P_RemoveMobj(actor);
+}
+
+//============================================================================
+//
+// A_CHolyTail
+//
+//============================================================================
+
+void A_CHolyTail(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *parent;
+
+    parent = actor->special2.m;
+
+    if (parent)
+    {
+        if (parent->state >= &states[parent->info->deathstate])
+        {                       // Ghost removed, so remove all tail parts
+            CHolyTailRemove(actor);
+            return;
+        }
+        else if (P_TryMove(actor, parent->x - FixedMul(14 * FRACUNIT,
+                                                       finecosine[parent->
+                                                                  angle >>
+                                                                  ANGLETOFINESHIFT]),
+                           parent->y - FixedMul(14 * FRACUNIT,
+                                                finesine[parent->
+                                                         angle >>
+                                                         ANGLETOFINESHIFT])))
+        {
+            actor->z = parent->z - 5 * FRACUNIT;
+        }
+        CHolyTailFollow(actor, 10 * FRACUNIT);
+    }
+}
+
+//============================================================================
+//
+// A_CHolyCheckScream
+//
+//============================================================================
+
+void A_CHolyCheckScream(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    A_CHolySeek(actor, player, psp);
+    if (P_Random() < 20)
+    {
+        S_StartSound(actor, SFX_SPIRIT_ACTIVE);
+    }
+    if (!actor->special1.m)
+    {
+        CHolyFindTarget(actor);
+    }
+}
+
+//============================================================================
+//
+// A_CHolySpawnPuff
+//
+//============================================================================
+
+void A_CHolySpawnPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z, MT_HOLY_MISSILE_PUFF);
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FireConePL1
+//
+//----------------------------------------------------------------------------
+
+#define SHARDSPAWN_LEFT		1
+#define SHARDSPAWN_RIGHT	2
+#define SHARDSPAWN_UP		4
+#define SHARDSPAWN_DOWN		8
+
+void A_FireConePL1(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    angle_t angle;
+    int damage;
+    int i;
+    mobj_t *pmo, *mo;
+    int conedone = false;
+
+    pmo = player->mo;
+    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
+    S_StartSound(pmo, SFX_MAGE_SHARDS_FIRE);
+
+    damage = 90 + (P_Random() & 15);
+    for (i = 0; i < 16; i++)
+    {
+        angle = pmo->angle + i * (ANG45 / 16);
+        P_AimLineAttack(pmo, angle, MELEERANGE);
+        if (linetarget)
+        {
+            pmo->flags2 |= MF2_ICEDAMAGE;
+            P_DamageMobj(linetarget, pmo, pmo, damage);
+            pmo->flags2 &= ~MF2_ICEDAMAGE;
+            conedone = true;
+            break;
+        }
+    }
+
+    // didn't find any creatures, so fire projectiles
+    if (!conedone)
+    {
+        mo = P_SpawnPlayerMissile(pmo, MT_SHARDFX1);
+        if (mo)
+        {
+            mo->special1.i = SHARDSPAWN_LEFT | SHARDSPAWN_DOWN | SHARDSPAWN_UP
+                | SHARDSPAWN_RIGHT;
+            mo->special2.i = 3;   // Set sperm count (levels of reproductivity)
+            mo->target = pmo;
+            mo->args[0] = 3;    // Mark Initial shard as super damage
+        }
+    }
+}
+
+void A_ShedShard(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    mobj_t *mo;
+    int spawndir = actor->special1.i;
+    int spermcount = actor->special2.i;
+
+    if (spermcount <= 0)
+        return;                 // No sperm left
+    actor->special2.i = 0;
+    spermcount--;
+
+    // every so many calls, spawn a new missile in it's set directions
+    if (spawndir & SHARDSPAWN_LEFT)
+    {
+        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1,
+                                      actor->angle + (ANG45 / 9), 0,
+                                      (20 + 2 * spermcount) << FRACBITS);
+        if (mo)
+        {
+            mo->special1.i = SHARDSPAWN_LEFT;
+            mo->special2.i = spermcount;
+            mo->momz = actor->momz;
+            mo->target = actor->target;
+            mo->args[0] = (spermcount == 3) ? 2 : 0;
+        }
+    }
+    if (spawndir & SHARDSPAWN_RIGHT)
+    {
+        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1,
+                                      actor->angle - (ANG45 / 9), 0,
+                                      (20 + 2 * spermcount) << FRACBITS);
+        if (mo)
+        {
+            mo->special1.i = SHARDSPAWN_RIGHT;
+            mo->special2.i = spermcount;
+            mo->momz = actor->momz;
+            mo->target = actor->target;
+            mo->args[0] = (spermcount == 3) ? 2 : 0;
+        }
+    }
+    if (spawndir & SHARDSPAWN_UP)
+    {
+        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1, actor->angle,
+                                      0, (15 + 2 * spermcount) << FRACBITS);
+        if (mo)
+        {
+            mo->momz = actor->momz;
+            mo->z += 8 * FRACUNIT;
+            if (spermcount & 1) // Every other reproduction
+                mo->special1.i =
+                    SHARDSPAWN_UP | SHARDSPAWN_LEFT | SHARDSPAWN_RIGHT;
+            else
+                mo->special1.i = SHARDSPAWN_UP;
+            mo->special2.i = spermcount;
+            mo->target = actor->target;
+            mo->args[0] = (spermcount == 3) ? 2 : 0;
+        }
+    }
+    if (spawndir & SHARDSPAWN_DOWN)
+    {
+        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1, actor->angle,
+                                      0, (15 + 2 * spermcount) << FRACBITS);
+        if (mo)
+        {
+            mo->momz = actor->momz;
+            mo->z -= 4 * FRACUNIT;
+            if (spermcount & 1) // Every other reproduction
+                mo->special1.i =
+                    SHARDSPAWN_DOWN | SHARDSPAWN_LEFT | SHARDSPAWN_RIGHT;
+            else
+                mo->special1.i = SHARDSPAWN_DOWN;
+            mo->special2.i = spermcount;
+            mo->target = actor->target;
+            mo->args[0] = (spermcount == 3) ? 2 : 0;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC A_HideInCeiling
+//
+//----------------------------------------------------------------------------
+
+/*
+void A_HideInCeiling(mobj_t *actor)
+{
+	actor->z = actor->ceilingz+4*FRACUNIT;
+}
+*/
+
+//----------------------------------------------------------------------------
+//
+// PROC A_FloatPuff
+//
+//----------------------------------------------------------------------------
+
+/*
+void A_FloatPuff(mobj_t *puff)
+{
+	puff->momz += 1.8*FRACUNIT;
+}
+*/
+
+void A_Light0(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    player->extralight = 0;
+}
+
+/*
+void A_Light1(player_t *player, pspdef_t *psp)
+{
+	player->extralight = 1;
+}
+*/
+
+/*
+void A_Light2(player_t *player, pspdef_t *psp)
+{
+	player->extralight = 2;
+}
+*/
+
+//------------------------------------------------------------------------
+//
+// PROC P_SetupPsprites
+//
+// Called at start of level for each player
+//
+//------------------------------------------------------------------------
+
+void P_SetupPsprites(player_t * player)
+{
+    int i;
+
+    // Remove all psprites
+    for (i = 0; i < NUMPSPRITES; i++)
+    {
+        player->psprites[i].state = NULL;
+    }
+    // Spawn the ready weapon
+    player->pendingweapon = player->readyweapon;
+    P_BringUpWeapon(player);
+}
+
+//------------------------------------------------------------------------
+//
+// PROC P_MovePsprites
+//
+// Called every tic by player thinking routine
+//
+//------------------------------------------------------------------------
+
+void P_MovePsprites(player_t * player)
+{
+    int i;
+    pspdef_t *psp;
+
+    psp = &player->psprites[0];
+    for (i = 0; i < NUMPSPRITES; i++, psp++)
+    {
+        if (psp->state != 0)  // a null state means not active
+        {
+            // drop tic count and possibly change state
+            if (psp->tics != -1)        // a -1 tic count never changes
+            {
+                psp->tics--;
+                if (!psp->tics)
+                {
+                    P_SetPsprite(player, i, psp->state->nextstate);
+                }
+            }
+        }
+    }
+    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
+    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
+}
diff --git a/games/NXDoom/src/hexen/p_setup.c b/games/NXDoom/src/hexen/p_setup.c
new file mode 100644
index 000000000..d71907727
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_setup.c
@@ -0,0 +1,1273 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include <math.h>
+#include <stdlib.h>
+#include "h2def.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_bbox.h"
+#include "m_misc.h"
+#include "i_swap.h"
+#include "s_sound.h"
+#include "p_local.h"
+#include "p_rejectpad.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAPINFO_SCRIPT_NAME "MAPINFO"
+#define MCMD_SKY1 1
+#define MCMD_SKY2 2
+#define MCMD_LIGHTNING 3
+#define MCMD_FADETABLE 4
+#define MCMD_DOUBLESKY 5
+#define MCMD_CLUSTER 6
+#define MCMD_WARPTRANS 7
+#define MCMD_NEXT 8
+#define MCMD_CDTRACK 9
+#define MCMD_CD_STARTTRACK 10
+#define MCMD_CD_END1TRACK 11
+#define MCMD_CD_END2TRACK 12
+#define MCMD_CD_END3TRACK 13
+#define MCMD_CD_INTERTRACK 14
+#define MCMD_CD_TITLETRACK 15
+
+#define UNKNOWN_MAP_NAME "DEVELOPMENT MAP"
+#define DEFAULT_SKY_NAME "SKY1"
+#define DEFAULT_SONG_LUMP "DEFSONG"
+#define DEFAULT_FADE_TABLE "COLORMAP"
+
+// TYPES -------------------------------------------------------------------
+
+typedef struct mapInfo_s mapInfo_t;
+struct mapInfo_s
+{
+    short cluster;
+    short warpTrans;
+    short nextMap;
+    short cdTrack;
+    char name[32];
+    short sky1Texture;
+    short sky2Texture;
+    fixed_t sky1ScrollDelta;
+    fixed_t sky2ScrollDelta;
+    boolean doubleSky;
+    boolean lightning;
+    int fadetable;
+    char songLump[10];
+};
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+void P_SpawnMapThing(mapthing_t * mthing);
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static int QualifyMap(int map);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+int MapCount;
+mapthing_t deathmatchstarts[MAXDEATHMATCHSTARTS], *deathmatch_p;
+mapthing_t playerstarts[MAX_PLAYER_STARTS][MAXPLAYERS];
+int numvertexes;
+vertex_t *vertexes;
+int numsegs;
+seg_t *segs;
+int numsectors;
+sector_t *sectors;
+int numsubsectors;
+subsector_t *subsectors;
+int numnodes;
+node_t *nodes;
+int numlines;
+line_t *lines;
+int numsides;
+side_t *sides;
+static int totallines;
+short *blockmaplump;            // offsets in blockmap are from here
+short *blockmap;
+int bmapwidth, bmapheight;      // in mapblocks
+fixed_t bmaporgx, bmaporgy;     // origin of block map
+mobj_t **blocklinks;            // for thing chains
+byte *rejectmatrix;             // for fast sight rejection
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static mapInfo_t MapInfo[99];
+static const char *MapCmdNames[] = {
+    "SKY1",
+    "SKY2",
+    "DOUBLESKY",
+    "LIGHTNING",
+    "FADETABLE",
+    "CLUSTER",
+    "WARPTRANS",
+    "NEXT",
+    "CDTRACK",
+    "CD_START_TRACK",
+    "CD_END1_TRACK",
+    "CD_END2_TRACK",
+    "CD_END3_TRACK",
+    "CD_INTERMISSION_TRACK",
+    "CD_TITLE_TRACK",
+    NULL
+};
+static int MapCmdIDs[] = {
+    MCMD_SKY1,
+    MCMD_SKY2,
+    MCMD_DOUBLESKY,
+    MCMD_LIGHTNING,
+    MCMD_FADETABLE,
+    MCMD_CLUSTER,
+    MCMD_WARPTRANS,
+    MCMD_NEXT,
+    MCMD_CDTRACK,
+    MCMD_CD_STARTTRACK,
+    MCMD_CD_END1TRACK,
+    MCMD_CD_END2TRACK,
+    MCMD_CD_END3TRACK,
+    MCMD_CD_INTERTRACK,
+    MCMD_CD_TITLETRACK
+};
+
+static int cd_NonLevelTracks[6];        // Non-level specific song cd track numbers 
+
+// CODE --------------------------------------------------------------------
+
+/*
+=================
+=
+= P_LoadVertexes
+=
+=================
+*/
+
+void P_LoadVertexes(int lump)
+{
+    byte *data;
+    int i;
+    mapvertex_t *ml;
+    vertex_t *li;
+
+    numvertexes = W_LumpLength(lump) / sizeof(mapvertex_t);
+    vertexes = Z_Malloc(numvertexes * sizeof(vertex_t), PU_LEVEL, 0);
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ml = (mapvertex_t *) data;
+    li = vertexes;
+    for (i = 0; i < numvertexes; i++, li++, ml++)
+    {
+        li->x = SHORT(ml->x) << FRACBITS;
+        li->y = SHORT(ml->y) << FRACBITS;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSegs
+=
+=================
+*/
+
+void P_LoadSegs(int lump)
+{
+    byte *data;
+    int i;
+    mapseg_t *ml;
+    seg_t *li;
+    line_t *ldef;
+    int linedef, side;
+
+    numsegs = W_LumpLength(lump) / sizeof(mapseg_t);
+    segs = Z_Malloc(numsegs * sizeof(seg_t), PU_LEVEL, 0);
+    memset(segs, 0, numsegs * sizeof(seg_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ml = (mapseg_t *) data;
+    li = segs;
+    for (i = 0; i < numsegs; i++, li++, ml++)
+    {
+        li->v1 = &vertexes[SHORT(ml->v1)];
+        li->v2 = &vertexes[SHORT(ml->v2)];
+
+        li->angle = (SHORT(ml->angle)) << 16;
+        li->offset = (SHORT(ml->offset)) << 16;
+        linedef = SHORT(ml->linedef);
+        ldef = &lines[linedef];
+        li->linedef = ldef;
+        side = SHORT(ml->side);
+        li->sidedef = &sides[ldef->sidenum[side]];
+        li->frontsector = sides[ldef->sidenum[side]].sector;
+        if (ldef->flags & ML_TWOSIDED)
+            li->backsector = sides[ldef->sidenum[side ^ 1]].sector;
+        else
+            li->backsector = 0;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSubsectors
+=
+=================
+*/
+
+void P_LoadSubsectors(int lump)
+{
+    byte *data;
+    int i;
+    mapsubsector_t *ms;
+    subsector_t *ss;
+
+    numsubsectors = W_LumpLength(lump) / sizeof(mapsubsector_t);
+    subsectors = Z_Malloc(numsubsectors * sizeof(subsector_t), PU_LEVEL, 0);
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ms = (mapsubsector_t *) data;
+    memset(subsectors, 0, numsubsectors * sizeof(subsector_t));
+    ss = subsectors;
+    for (i = 0; i < numsubsectors; i++, ss++, ms++)
+    {
+        ss->numlines = SHORT(ms->numsegs);
+        ss->firstline = SHORT(ms->firstseg);
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSectors
+=
+=================
+*/
+
+void P_LoadSectors(int lump)
+{
+    byte *data;
+    int i;
+    mapsector_t *ms;
+    sector_t *ss;
+
+    numsectors = W_LumpLength(lump) / sizeof(mapsector_t);
+    sectors = Z_Malloc(numsectors * sizeof(sector_t), PU_LEVEL, 0);
+    memset(sectors, 0, numsectors * sizeof(sector_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    ms = (mapsector_t *) data;
+    ss = sectors;
+
+    for (i = 0; i < numsectors; i++, ss++, ms++)
+    {
+        ss->floorheight = SHORT(ms->floorheight) << FRACBITS;
+        ss->ceilingheight = SHORT(ms->ceilingheight) << FRACBITS;
+        ss->floorpic = R_FlatNumForName(ms->floorpic);
+        ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
+        ss->lightlevel = SHORT(ms->lightlevel);
+        ss->special = SHORT(ms->special);
+        ss->tag = SHORT(ms->tag);
+        ss->thinglist = NULL;
+        ss->seqType = SEQTYPE_STONE;    // default seqType
+    }
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadNodes
+=
+=================
+*/
+
+void P_LoadNodes(int lump)
+{
+    byte *data;
+    int i, j, k;
+    mapnode_t *mn;
+    node_t *no;
+
+    numnodes = W_LumpLength(lump) / sizeof(mapnode_t);
+    nodes = Z_Malloc(numnodes * sizeof(node_t), PU_LEVEL, 0);
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    mn = (mapnode_t *) data;
+    no = nodes;
+    for (i = 0; i < numnodes; i++, no++, mn++)
+    {
+        no->x = SHORT(mn->x) << FRACBITS;
+        no->y = SHORT(mn->y) << FRACBITS;
+        no->dx = SHORT(mn->dx) << FRACBITS;
+        no->dy = SHORT(mn->dy) << FRACBITS;
+        for (j = 0; j < 2; j++)
+        {
+            no->children[j] = SHORT(mn->children[j]);
+            for (k = 0; k < 4; k++)
+                no->bbox[j][k] = SHORT(mn->bbox[j][k]) << FRACBITS;
+        }
+    }
+    W_ReleaseLumpNum(lump);
+}
+
+//==========================================================================
+//
+// P_LoadThings
+//
+//==========================================================================
+
+void P_LoadThings(int lump)
+{
+    byte *data;
+    int i;
+    mapthing_t spawnthing;
+    mapthing_t *mt;
+    int numthings;
+    int playerCount;
+    int deathSpotsCount;
+
+    data = W_CacheLumpNum(lump, PU_STATIC);
+    numthings = W_LumpLength(lump) / sizeof(mapthing_t);
+
+    mt = (mapthing_t *) data;
+    for (i = 0; i < numthings; i++, mt++)
+    {
+        spawnthing.tid = SHORT(mt->tid);
+        spawnthing.x = SHORT(mt->x);
+        spawnthing.y = SHORT(mt->y);
+        spawnthing.height = SHORT(mt->height);
+        spawnthing.angle = SHORT(mt->angle);
+        spawnthing.type = SHORT(mt->type);
+        spawnthing.options = SHORT(mt->options);
+
+        spawnthing.special = mt->special;
+        spawnthing.arg1 = mt->arg1;
+        spawnthing.arg2 = mt->arg2;
+        spawnthing.arg3 = mt->arg3;
+        spawnthing.arg4 = mt->arg4;
+        spawnthing.arg5 = mt->arg5;
+
+        P_SpawnMapThing(&spawnthing);
+    }
+    P_CreateTIDList();
+    P_InitCreatureCorpseQueue(false);   // false = do NOT scan for corpses
+    W_ReleaseLumpNum(lump);
+
+    if (!deathmatch)
+    {                           // Don't need to check deathmatch spots
+        return;
+    }
+    playerCount = 0;
+    for (i = 0; i < maxplayers; i++)
+    {
+        playerCount += playeringame[i];
+    }
+    deathSpotsCount = deathmatch_p - deathmatchstarts;
+    if (deathSpotsCount < playerCount)
+    {
+        I_Error("P_LoadThings: Player count (%d) exceeds deathmatch "
+                "spots (%d)", playerCount, deathSpotsCount);
+    }
+}
+
+/*
+=================
+=
+= P_LoadLineDefs
+=
+=================
+*/
+
+void P_LoadLineDefs(int lump)
+{
+    byte *data;
+    int i;
+    maplinedef_t *mld;
+    line_t *ld;
+    vertex_t *v1, *v2;
+
+    numlines = W_LumpLength(lump) / sizeof(maplinedef_t);
+    lines = Z_Malloc(numlines * sizeof(line_t), PU_LEVEL, 0);
+    memset(lines, 0, numlines * sizeof(line_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    mld = (maplinedef_t *) data;
+    ld = lines;
+    for (i = 0; i < numlines; i++, mld++, ld++)
+    {
+        ld->flags = SHORT(mld->flags);
+
+        // Old line special info ...
+        //ld->special = SHORT(mld->special);
+        //ld->tag = SHORT(mld->tag);
+
+        // New line special info ...
+        ld->special = mld->special;
+        ld->arg1 = mld->arg1;
+        ld->arg2 = mld->arg2;
+        ld->arg3 = mld->arg3;
+        ld->arg4 = mld->arg4;
+        ld->arg5 = mld->arg5;
+
+        v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
+        v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
+        ld->dx = v2->x - v1->x;
+        ld->dy = v2->y - v1->y;
+        if (!ld->dx)
+            ld->slopetype = ST_VERTICAL;
+        else if (!ld->dy)
+            ld->slopetype = ST_HORIZONTAL;
+        else
+        {
+            if (FixedDiv(ld->dy, ld->dx) > 0)
+                ld->slopetype = ST_POSITIVE;
+            else
+                ld->slopetype = ST_NEGATIVE;
+        }
+
+        if (v1->x < v2->x)
+        {
+            ld->bbox[BOXLEFT] = v1->x;
+            ld->bbox[BOXRIGHT] = v2->x;
+        }
+        else
+        {
+            ld->bbox[BOXLEFT] = v2->x;
+            ld->bbox[BOXRIGHT] = v1->x;
+        }
+        if (v1->y < v2->y)
+        {
+            ld->bbox[BOXBOTTOM] = v1->y;
+            ld->bbox[BOXTOP] = v2->y;
+        }
+        else
+        {
+            ld->bbox[BOXBOTTOM] = v2->y;
+            ld->bbox[BOXTOP] = v1->y;
+        }
+        ld->sidenum[0] = SHORT(mld->sidenum[0]);
+        ld->sidenum[1] = SHORT(mld->sidenum[1]);
+        if (ld->sidenum[0] != -1)
+            ld->frontsector = sides[ld->sidenum[0]].sector;
+        else
+            ld->frontsector = 0;
+        if (ld->sidenum[1] != -1)
+            ld->backsector = sides[ld->sidenum[1]].sector;
+        else
+            ld->backsector = 0;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+/*
+=================
+=
+= P_LoadSideDefs
+=
+=================
+*/
+
+void P_LoadSideDefs(int lump)
+{
+    byte *data;
+    int i;
+    mapsidedef_t *msd;
+    side_t *sd;
+
+    numsides = W_LumpLength(lump) / sizeof(mapsidedef_t);
+    sides = Z_Malloc(numsides * sizeof(side_t), PU_LEVEL, 0);
+    memset(sides, 0, numsides * sizeof(side_t));
+    data = W_CacheLumpNum(lump, PU_STATIC);
+
+    msd = (mapsidedef_t *) data;
+    sd = sides;
+
+    for (i = 0; i < numsides; i++, msd++, sd++)
+    {
+        sd->textureoffset = SHORT(msd->textureoffset) << FRACBITS;
+        sd->rowoffset = SHORT(msd->rowoffset) << FRACBITS;
+        sd->toptexture = R_TextureNumForName(msd->toptexture);
+        sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+        sd->midtexture = R_TextureNumForName(msd->midtexture);
+        sd->sector = &sectors[SHORT(msd->sector)];
+    }
+    W_ReleaseLumpNum(lump);
+}
+
+/*
+=================
+=
+= P_LoadBlockMap
+=
+=================
+*/
+
+void P_LoadBlockMap(int lump)
+{
+    int i, count;
+    int lumplen;
+
+    lumplen = W_LumpLength(lump);
+
+    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
+    W_ReadLump(lump, blockmaplump);
+    blockmap = blockmaplump + 4;
+
+    // Swap all short integers to native byte ordering:
+
+    count = lumplen / 2;
+
+    for (i = 0; i < count; i++)
+        blockmaplump[i] = SHORT(blockmaplump[i]);
+
+    bmaporgx = blockmaplump[0] << FRACBITS;
+    bmaporgy = blockmaplump[1] << FRACBITS;
+    bmapwidth = blockmaplump[2];
+    bmapheight = blockmaplump[3];
+
+    // clear out mobj chains
+
+    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
+    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
+    memset(blocklinks, 0, count);
+}
+
+
+
+
+/*
+=================
+=
+= P_GroupLines
+=
+= Builds sector line lists and subsector sector numbers
+= Finds block bounding boxes for sectors
+=================
+*/
+
+void P_DegenMobjThinker(thinker_t *thinker)
+{
+  (void) thinker;
+  I_Error("This function should never get called.");
+}
+
+void P_GroupLines(void)
+{
+    line_t **linebuffer;
+    int i, j;
+    line_t *li;
+    sector_t *sector;
+    subsector_t *ss;
+    seg_t *seg;
+    fixed_t bbox[4];
+    int block;
+
+// look up sector number for each subsector
+    ss = subsectors;
+    for (i = 0; i < numsubsectors; i++, ss++)
+    {
+        seg = &segs[ss->firstline];
+        ss->sector = seg->sidedef->sector;
+    }
+
+// count number of lines in each sector
+    li = lines;
+    totallines = 0;
+    for (i = 0; i < numlines; i++, li++)
+    {
+        totallines++;
+        li->frontsector->linecount++;
+        if (li->backsector && li->backsector != li->frontsector)
+        {
+            li->backsector->linecount++;
+            totallines++;
+        }
+    }
+
+// build line tables for each sector
+    linebuffer = Z_Malloc(totallines * sizeof(line_t *), PU_LEVEL, 0);
+    sector = sectors;
+    for (i = 0; i < numsectors; i++, sector++)
+    {
+        M_ClearBox(bbox);
+        sector->lines = linebuffer;
+        li = lines;
+        for (j = 0; j < numlines; j++, li++)
+        {
+            if (li->frontsector == sector || li->backsector == sector)
+            {
+                *linebuffer++ = li;
+                M_AddToBox(bbox, li->v1->x, li->v1->y);
+                M_AddToBox(bbox, li->v2->x, li->v2->y);
+            }
+        }
+        if (linebuffer - sector->lines != sector->linecount)
+            I_Error("P_GroupLines: miscounted");
+
+        // set the degenmobj_t to the middle of the bounding box
+        sector->soundorg.x = (bbox[BOXRIGHT] + bbox[BOXLEFT]) / 2;
+        sector->soundorg.y = (bbox[BOXTOP] + bbox[BOXBOTTOM]) / 2;
+        sector->soundorg.thinker.function = (think_t) P_DegenMobjThinker;
+
+        // adjust bounding box to map blocks
+        block = (bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block >= bmapheight ? bmapheight - 1 : block;
+        sector->blockbox[BOXTOP] = block;
+
+        block = (bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block < 0 ? 0 : block;
+        sector->blockbox[BOXBOTTOM] = block;
+
+        block = (bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block >= bmapwidth ? bmapwidth - 1 : block;
+        sector->blockbox[BOXRIGHT] = block;
+
+        block = (bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+        block = block < 0 ? 0 : block;
+        sector->blockbox[BOXLEFT] = block;
+    }
+
+}
+
+
+static void P_LoadReject(int lumpnum)
+{
+    int minlength;
+    int lumplen;
+
+    // Calculate the size that the REJECT lump *should* be.
+
+    minlength = (numsectors * numsectors + 7) / 8;
+
+    // If the lump meets the minimum length, it can be loaded directly.
+    // Otherwise, we need to allocate a buffer of the correct size
+    // and pad it with appropriate data.
+
+    lumplen = W_LumpLength(lumpnum);
+
+    if (lumplen >= minlength)
+    {
+        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
+    }
+    else
+    {
+        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
+        W_ReadLump(lumpnum, rejectmatrix);
+
+        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
+    }
+}
+
+//=============================================================================
+
+lumpinfo_t *maplumpinfo;
+
+/*
+=================
+=
+= P_SetupLevel
+=
+=================
+*/
+
+void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
+{
+    int i;
+    int parm;
+    char lumpname[9];
+    int lumpnum;
+    mobj_t *mobj;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        players[i].killcount = players[i].secretcount
+            = players[i].itemcount = 0;
+    }
+    players[consoleplayer].viewz = 1;   // will be set by player think
+
+    // Waiting-for-level-load song; not played if playing music from CD
+    // (the seek time will be so long it will just make loading take
+    // longer)
+    if (!cdmusic)
+    {
+        S_StartSongName("chess", true);
+    }
+
+    Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
+
+    P_InitThinkers();
+    leveltime = 0;
+
+    M_snprintf(lumpname, sizeof(lumpname), "MAP%02d", map);
+    lumpnum = W_GetNumForName(lumpname);
+
+    maplumpinfo = lumpinfo[lumpnum];
+
+    //
+    // Begin processing map lumps
+    // Note: most of this ordering is important
+    //
+    P_LoadBlockMap(lumpnum + ML_BLOCKMAP);
+    P_LoadVertexes(lumpnum + ML_VERTEXES);
+    P_LoadSectors(lumpnum + ML_SECTORS);
+    P_LoadSideDefs(lumpnum + ML_SIDEDEFS);
+    P_LoadLineDefs(lumpnum + ML_LINEDEFS);
+    P_LoadSubsectors(lumpnum + ML_SSECTORS);
+    P_LoadNodes(lumpnum + ML_NODES);
+    P_LoadSegs(lumpnum + ML_SEGS);
+    P_GroupLines();
+    P_LoadReject(lumpnum + ML_REJECT);
+    bodyqueslot = 0;
+    po_NumPolyobjs = 0;
+    deathmatch_p = deathmatchstarts;
+    P_LoadThings(lumpnum + ML_THINGS);
+    PO_Init(lumpnum + ML_THINGS);       // Initialize the polyobjs
+    P_LoadACScripts(lumpnum + ML_BEHAVIOR);     // ACS object code
+    //
+    // End of map lump processing
+    //
+
+    // If deathmatch, randomly spawn the active players
+    TimerGame = 0;
+    if (deathmatch)
+    {
+        for (i = 0; i < maxplayers; i++)
+        {
+            if (playeringame[i])
+            {                   // must give a player spot before deathmatchspawn
+                mobj = P_SpawnMobj(playerstarts[0][i].x << 16,
+                                   playerstarts[0][i].y << 16, 0,
+                                   MT_PLAYER_FIGHTER);
+                players[i].mo = mobj;
+                G_DeathMatchSpawnPlayer(i);
+                P_RemoveMobj(mobj);
+            }
+        }
+
+        //!
+        // @arg <n>
+        // @category net
+        // @vanilla
+        //
+        // For multiplayer games: exit each level after n minutes.
+        //
+
+        parm = M_CheckParmWithArgs("-timer", 1);
+        if (parm)
+        {
+            TimerGame = atoi(myargv[parm + 1]) * 35 * 60;
+        }
+    }
+
+// set up world state
+    P_SpawnSpecials();
+
+// build subsector connect matrix
+//      P_ConnectSubsectors ();
+
+// Load colormap and set the fullbright flag
+    i = P_GetMapFadeTable(gamemap);
+    W_ReadLump(i, colormaps);
+    if (i == W_GetNumForName("COLORMAP"))
+    {
+        LevelUseFullBright = true;
+    }
+    else
+    {                           // Probably fog ... don't use fullbright sprites
+        LevelUseFullBright = false;
+    }
+
+// preload graphics
+    if (precache)
+        R_PrecacheLevel();
+
+    // Check if the level is a lightning level
+    P_InitLightning();
+
+    S_StopAllSound();
+    SN_StopAllSequences();
+    S_StartSong(gamemap, true);
+
+//printf ("free memory: 0x%x\n", Z_FreeMemory());
+
+}
+
+//==========================================================================
+//
+// InitMapInfo
+//
+//==========================================================================
+
+static void InitMapInfo(void)
+{
+    int map;
+    int mapMax;
+    int mcmdValue;
+    mapInfo_t *info;
+    char songMulch[10];
+    const char *default_sky_name = DEFAULT_SKY_NAME;
+
+    mapMax = 1;
+
+    if (gamemode == shareware)
+    {
+	default_sky_name = "SKY2";
+    }
+
+    // Put defaults into MapInfo[0]
+    info = MapInfo;
+    info->cluster = 0;
+    info->warpTrans = 0;
+    info->nextMap = 1;          // Always go to map 1 if not specified
+    info->cdTrack = 1;
+    info->sky1Texture = R_TextureNumForName(default_sky_name);
+    info->sky2Texture = info->sky1Texture;
+    info->sky1ScrollDelta = 0;
+    info->sky2ScrollDelta = 0;
+    info->doubleSky = false;
+    info->lightning = false;
+    info->fadetable = W_GetNumForName(DEFAULT_FADE_TABLE);
+    M_StringCopy(info->name, UNKNOWN_MAP_NAME, sizeof(info->name));
+
+//    M_StringCopy(info->songLump, DEFAULT_SONG_LUMP, sizeof(info->songLump));
+    SC_Open(MAPINFO_SCRIPT_NAME);
+    while (SC_GetString())
+    {
+        if (SC_Compare("MAP") == false)
+        {
+            SC_ScriptError(NULL);
+        }
+        SC_MustGetNumber();
+        if (sc_Number < 1 || sc_Number > 99)
+        {                       // 
+            SC_ScriptError(NULL);
+        }
+        map = sc_Number;
+
+        info = &MapInfo[map];
+
+        // Save song lump name
+        M_StringCopy(songMulch, info->songLump, sizeof(songMulch));
+
+        // Copy defaults to current map definition
+        memcpy(info, &MapInfo[0], sizeof(*info));
+
+        // Restore song lump name
+        M_StringCopy(info->songLump, songMulch, sizeof(info->songLump));
+
+        // The warp translation defaults to the map number
+        info->warpTrans = map;
+
+        // Map name must follow the number
+        SC_MustGetString();
+        M_StringCopy(info->name, sc_String, sizeof(info->name));
+
+        // Process optional tokens
+        while (SC_GetString())
+        {
+            if (SC_Compare("MAP"))
+            {                   // Start next map definition
+                SC_UnGet();
+                break;
+            }
+            mcmdValue = MapCmdIDs[SC_MustMatchString(MapCmdNames)];
+            switch (mcmdValue)
+            {
+                case MCMD_CLUSTER:
+                    SC_MustGetNumber();
+                    info->cluster = sc_Number;
+                    break;
+                case MCMD_WARPTRANS:
+                    SC_MustGetNumber();
+                    info->warpTrans = sc_Number;
+                    break;
+                case MCMD_NEXT:
+                    SC_MustGetNumber();
+                    info->nextMap = sc_Number;
+                    break;
+                case MCMD_CDTRACK:
+                    SC_MustGetNumber();
+                    info->cdTrack = sc_Number;
+                    break;
+                case MCMD_SKY1:
+                    SC_MustGetString();
+                    info->sky1Texture = R_TextureNumForName(sc_String);
+                    SC_MustGetNumber();
+                    info->sky1ScrollDelta = sc_Number << 8;
+                    break;
+                case MCMD_SKY2:
+                    SC_MustGetString();
+                    info->sky2Texture = R_TextureNumForName(sc_String);
+                    SC_MustGetNumber();
+                    info->sky2ScrollDelta = sc_Number << 8;
+                    break;
+                case MCMD_DOUBLESKY:
+                    info->doubleSky = true;
+                    break;
+                case MCMD_LIGHTNING:
+                    info->lightning = true;
+                    break;
+                case MCMD_FADETABLE:
+                    SC_MustGetString();
+                    info->fadetable = W_GetNumForName(sc_String);
+                    break;
+                case MCMD_CD_STARTTRACK:
+                case MCMD_CD_END1TRACK:
+                case MCMD_CD_END2TRACK:
+                case MCMD_CD_END3TRACK:
+                case MCMD_CD_INTERTRACK:
+                case MCMD_CD_TITLETRACK:
+                    SC_MustGetNumber();
+                    cd_NonLevelTracks[mcmdValue - MCMD_CD_STARTTRACK] =
+                        sc_Number;
+                    break;
+            }
+        }
+        mapMax = map > mapMax ? map : mapMax;
+    }
+    SC_Close();
+    MapCount = mapMax;
+}
+
+//==========================================================================
+//
+// P_GetMapCluster
+//
+//==========================================================================
+
+int P_GetMapCluster(int map)
+{
+    return MapInfo[QualifyMap(map)].cluster;
+}
+
+//==========================================================================
+//
+// P_GetMapCDTrack
+//
+//==========================================================================
+
+int P_GetMapCDTrack(int map)
+{
+    return MapInfo[QualifyMap(map)].cdTrack;
+}
+
+//==========================================================================
+//
+// P_GetMapWarpTrans
+//
+//==========================================================================
+
+int P_GetMapWarpTrans(int map)
+{
+    return MapInfo[QualifyMap(map)].warpTrans;
+}
+
+//==========================================================================
+//
+// P_GetMapNextMap
+//
+//==========================================================================
+
+int P_GetMapNextMap(int map)
+{
+    return MapInfo[QualifyMap(map)].nextMap;
+}
+
+//==========================================================================
+//
+// P_TranslateMap
+//
+// Returns the actual map number given a warp map number.
+//
+//==========================================================================
+
+int P_TranslateMap(int map)
+{
+    int i;
+
+    for (i = 1; i < 99; i++)    // Make this a macro
+    {
+        if (MapInfo[i].warpTrans == map)
+        {
+            return i;
+        }
+    }
+    // Not found
+    return -1;
+}
+
+//==========================================================================
+//
+// P_GetMapSky1Texture
+//
+//==========================================================================
+
+int P_GetMapSky1Texture(int map)
+{
+    return MapInfo[QualifyMap(map)].sky1Texture;
+}
+
+//==========================================================================
+//
+// P_GetMapSky2Texture
+//
+//==========================================================================
+
+int P_GetMapSky2Texture(int map)
+{
+    return MapInfo[QualifyMap(map)].sky2Texture;
+}
+
+//==========================================================================
+//
+// P_GetMapName
+//
+//==========================================================================
+
+char *P_GetMapName(int map)
+{
+    return MapInfo[QualifyMap(map)].name;
+}
+
+//==========================================================================
+//
+// P_GetMapSky1ScrollDelta
+//
+//==========================================================================
+
+fixed_t P_GetMapSky1ScrollDelta(int map)
+{
+    return MapInfo[QualifyMap(map)].sky1ScrollDelta;
+}
+
+//==========================================================================
+//
+// P_GetMapSky2ScrollDelta
+//
+//==========================================================================
+
+fixed_t P_GetMapSky2ScrollDelta(int map)
+{
+    return MapInfo[QualifyMap(map)].sky2ScrollDelta;
+}
+
+//==========================================================================
+//
+// P_GetMapDoubleSky
+//
+//==========================================================================
+
+boolean P_GetMapDoubleSky(int map)
+{
+    return MapInfo[QualifyMap(map)].doubleSky;
+}
+
+//==========================================================================
+//
+// P_GetMapLightning
+//
+//==========================================================================
+
+boolean P_GetMapLightning(int map)
+{
+    return MapInfo[QualifyMap(map)].lightning;
+}
+
+//==========================================================================
+//
+// P_GetMapFadeTable
+//
+//==========================================================================
+
+boolean P_GetMapFadeTable(int map)
+{
+    return MapInfo[QualifyMap(map)].fadetable;
+}
+
+//==========================================================================
+//
+// P_GetMapSongLump
+//
+//==========================================================================
+
+char *P_GetMapSongLump(int map)
+{
+    if (!strcasecmp(MapInfo[QualifyMap(map)].songLump, DEFAULT_SONG_LUMP))
+    {
+        return NULL;
+    }
+    else
+    {
+        return MapInfo[QualifyMap(map)].songLump;
+    }
+}
+
+//==========================================================================
+//
+// P_PutMapSongLump
+//
+//==========================================================================
+
+void P_PutMapSongLump(int map, char *lumpName)
+{
+    if (map < 1 || map > MapCount)
+    {
+        return;
+    }
+    M_StringCopy(MapInfo[map].songLump, lumpName,
+                 sizeof(MapInfo[map].songLump));
+}
+
+//==========================================================================
+//
+// P_GetCDStartTrack
+//
+//==========================================================================
+
+int P_GetCDStartTrack(void)
+{
+    return cd_NonLevelTracks[MCMD_CD_STARTTRACK - MCMD_CD_STARTTRACK];
+}
+
+//==========================================================================
+//
+// P_GetCDEnd1Track
+//
+//==========================================================================
+
+int P_GetCDEnd1Track(void)
+{
+    return cd_NonLevelTracks[MCMD_CD_END1TRACK - MCMD_CD_STARTTRACK];
+}
+
+//==========================================================================
+//
+// P_GetCDEnd2Track
+//
+//==========================================================================
+
+int P_GetCDEnd2Track(void)
+{
+    return cd_NonLevelTracks[MCMD_CD_END2TRACK - MCMD_CD_STARTTRACK];
+}
+
+//==========================================================================
+//
+// P_GetCDEnd3Track
+//
+//==========================================================================
+
+int P_GetCDEnd3Track(void)
+{
+    return cd_NonLevelTracks[MCMD_CD_END3TRACK - MCMD_CD_STARTTRACK];
+}
+
+//==========================================================================
+//
+// P_GetCDIntermissionTrack
+//
+//==========================================================================
+
+int P_GetCDIntermissionTrack(void)
+{
+    return cd_NonLevelTracks[MCMD_CD_INTERTRACK - MCMD_CD_STARTTRACK];
+}
+
+//==========================================================================
+//
+// P_GetCDTitleTrack
+//
+//==========================================================================
+
+int P_GetCDTitleTrack(void)
+{
+    return cd_NonLevelTracks[MCMD_CD_TITLETRACK - MCMD_CD_STARTTRACK];
+}
+
+//==========================================================================
+//
+// QualifyMap
+//
+//==========================================================================
+
+static int QualifyMap(int map)
+{
+    return (map < 1 || map > MapCount) ? 0 : map;
+}
+
+//==========================================================================
+//
+// P_Init
+//
+//==========================================================================
+
+void P_Init(void)
+{
+    InitMapInfo();
+    P_InitSwitchList();
+    P_InitFTAnims();            // Init flat and texture animations
+    P_InitTerrainTypes();
+    P_InitLava();
+    R_InitSprites(sprnames);
+}
+
+
+// Special early initializer needed to start sound before R_Init()
+void InitMapMusicInfo(void)
+{
+    int i;
+
+    for (i = 0; i < 99; i++)
+    {
+        M_StringCopy(MapInfo[i].songLump, DEFAULT_SONG_LUMP,
+                     sizeof(MapInfo[i].songLump));
+    }
+    MapCount = 98;
+}
+
+/*
+void My_Debug(void)
+{
+	int i;
+
+	printf("My debug stuff ----------------------\n");
+	printf("gamemap=%d\n",gamemap);
+	for (i=0; i<10; i++)
+	{
+		printf("i=%d  songlump=%s\n",i,MapInfo[i].songLump);
+	}
+}
+*/
diff --git a/games/NXDoom/src/hexen/p_sight.c b/games/NXDoom/src/hexen/p_sight.c
new file mode 100644
index 000000000..b5efd07f6
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_sight.c
@@ -0,0 +1,398 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "p_local.h"
+
+/*
+==============================================================================
+
+							P_CheckSight
+
+This uses specialized forms of the maputils routines for optimized performance
+
+==============================================================================
+*/
+
+fixed_t sightzstart;            // eye z of looker
+fixed_t topslope, bottomslope;  // slopes to top and bottom of target
+
+int sightcounts[3];
+
+/*
+==============
+=
+= PTR_SightTraverse
+=
+==============
+*/
+
+boolean PTR_SightTraverse(intercept_t * in)
+{
+    line_t *li;
+    fixed_t slope;
+
+    li = in->d.line;
+
+//
+// crosses a two sided line
+//
+    P_LineOpening(li);
+
+    if (openbottom >= opentop)  // quick test for totally closed doors
+        return false;           // stop
+
+    if (li->frontsector->floorheight != li->backsector->floorheight)
+    {
+        slope = FixedDiv(openbottom - sightzstart, in->frac);
+        if (slope > bottomslope)
+            bottomslope = slope;
+    }
+
+    if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+    {
+        slope = FixedDiv(opentop - sightzstart, in->frac);
+        if (slope < topslope)
+            topslope = slope;
+    }
+
+    if (topslope <= bottomslope)
+        return false;           // stop
+
+    return true;                // keep going
+}
+
+
+
+/*
+==================
+=
+= P_SightBlockLinesIterator
+=
+===================
+*/
+
+boolean P_SightBlockLinesIterator(int x, int y)
+{
+    int offset;
+    short *list;
+    line_t *ld;
+    int s1, s2;
+    divline_t dl;
+
+    polyblock_t *polyLink;
+    seg_t **segList;
+    int i;
+
+    offset = y * bmapwidth + x;
+
+    polyLink = PolyBlockMap[offset];
+    while (polyLink)
+    {
+        if (polyLink->polyobj)
+        {                       // only check non-empty links
+            if (polyLink->polyobj->validcount != validcount)
+            {
+                segList = polyLink->polyobj->segs;
+                for (i = 0; i < polyLink->polyobj->numsegs; i++, segList++)
+                {
+                    ld = (*segList)->linedef;
+                    if (ld->validcount == validcount)
+                    {
+                        continue;
+                    }
+                    ld->validcount = validcount;
+                    s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
+                    s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
+                    if (s1 == s2)
+                        continue;       // line isn't crossed
+                    P_MakeDivline(ld, &dl);
+                    s1 = P_PointOnDivlineSide(trace.x, trace.y, &dl);
+                    s2 = P_PointOnDivlineSide(trace.x + trace.dx,
+                                              trace.y + trace.dy, &dl);
+                    if (s1 == s2)
+                        continue;       // line isn't crossed
+
+                    // try to early out the check
+                    if (!ld->backsector)
+                        return false;   // stop checking
+
+                    // store the line for later intersection testing
+                    intercept_p->d.line = ld;
+                    intercept_p++;
+                }
+                polyLink->polyobj->validcount = validcount;
+            }
+        }
+        polyLink = polyLink->next;
+    }
+
+    offset = *(blockmap + offset);
+
+    for (list = blockmaplump + offset; *list != -1; list++)
+    {
+        ld = &lines[*list];
+        if (ld->validcount == validcount)
+            continue;           // line has already been checked
+        ld->validcount = validcount;
+
+        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
+        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
+        if (s1 == s2)
+            continue;           // line isn't crossed
+        P_MakeDivline(ld, &dl);
+        s1 = P_PointOnDivlineSide(trace.x, trace.y, &dl);
+        s2 = P_PointOnDivlineSide(trace.x + trace.dx, trace.y + trace.dy,
+                                  &dl);
+        if (s1 == s2)
+            continue;           // line isn't crossed
+
+        // try to early out the check
+        if (!ld->backsector)
+            return false;       // stop checking
+
+        // store the line for later intersection testing
+        intercept_p->d.line = ld;
+        intercept_p++;
+
+    }
+
+    return true;                // everything was checked
+}
+
+/*
+====================
+=
+= P_SightTraverseIntercepts
+=
+= Returns true if the traverser function returns true for all lines
+====================
+*/
+
+boolean P_SightTraverseIntercepts(void)
+{
+    int count;
+    fixed_t dist;
+    intercept_t *scan, *in;
+    divline_t dl;
+
+    count = intercept_p - intercepts;
+//
+// calculate intercept distance
+//
+    for (scan = intercepts; scan < intercept_p; scan++)
+    {
+        P_MakeDivline(scan->d.line, &dl);
+        scan->frac = P_InterceptVector(&trace, &dl);
+    }
+
+//
+// go through in order
+//
+    in = 0;                     // shut up compiler warning
+
+    while (count--)
+    {
+        dist = INT_MAX;
+        for (scan = intercepts; scan < intercept_p; scan++)
+            if (scan->frac < dist)
+            {
+                dist = scan->frac;
+                in = scan;
+            }
+
+        if (!PTR_SightTraverse(in))
+            return false;       // don't bother going farther
+        in->frac = INT_MAX;
+    }
+
+    return true;                // everything was traversed
+}
+
+
+
+/*
+==================
+=
+= P_SightPathTraverse
+=
+= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
+= Returns true if the traverser function returns true for all lines
+==================
+*/
+
+boolean P_SightPathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
+{
+    fixed_t xt1, yt1, xt2, yt2;
+    fixed_t xstep, ystep;
+    fixed_t partial;
+    fixed_t xintercept, yintercept;
+    int mapx, mapy, mapxstep, mapystep;
+    int count;
+
+    validcount++;
+    intercept_p = intercepts;
+
+    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
+        x1 += FRACUNIT;         // don't side exactly on a line
+    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
+        y1 += FRACUNIT;         // don't side exactly on a line
+    trace.x = x1;
+    trace.y = y1;
+    trace.dx = x2 - x1;
+    trace.dy = y2 - y1;
+
+    x1 -= bmaporgx;
+    y1 -= bmaporgy;
+    xt1 = x1 >> MAPBLOCKSHIFT;
+    yt1 = y1 >> MAPBLOCKSHIFT;
+
+    x2 -= bmaporgx;
+    y2 -= bmaporgy;
+    xt2 = x2 >> MAPBLOCKSHIFT;
+    yt2 = y2 >> MAPBLOCKSHIFT;
+
+// points should never be out of bounds, but check once instead of
+// each block
+    if (xt1 < 0 || yt1 < 0 || xt1 >= bmapwidth || yt1 >= bmapheight
+        || xt2 < 0 || yt2 < 0 || xt2 >= bmapwidth || yt2 >= bmapheight)
+        return false;
+
+    if (xt2 > xt1)
+    {
+        mapxstep = 1;
+        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else if (xt2 < xt1)
+    {
+        mapxstep = -1;
+        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
+    }
+    else
+    {
+        mapxstep = 0;
+        partial = FRACUNIT;
+        ystep = 256 * FRACUNIT;
+    }
+    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
+
+
+    if (yt2 > yt1)
+    {
+        mapystep = 1;
+        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else if (yt2 < yt1)
+    {
+        mapystep = -1;
+        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
+    }
+    else
+    {
+        mapystep = 0;
+        partial = FRACUNIT;
+        xstep = 256 * FRACUNIT;
+    }
+    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
+
+
+//
+// step through map blocks
+// Count is present to prevent a round off error from skipping the break
+    mapx = xt1;
+    mapy = yt1;
+
+
+    for (count = 0; count < 64; count++)
+    {
+        if (!P_SightBlockLinesIterator(mapx, mapy))
+        {
+            sightcounts[1]++;
+            return false;       // early out
+        }
+
+        if (mapx == xt2 && mapy == yt2)
+            break;
+
+        if ((yintercept >> FRACBITS) == mapy)
+        {
+            yintercept += ystep;
+            mapx += mapxstep;
+        }
+        else if ((xintercept >> FRACBITS) == mapx)
+        {
+            xintercept += xstep;
+            mapy += mapystep;
+        }
+
+    }
+
+
+//
+// couldn't early out, so go through the sorted list
+//
+    sightcounts[2]++;
+
+    return P_SightTraverseIntercepts();
+}
+
+
+
+/*
+=====================
+=
+= P_CheckSight
+=
+= Returns true if a straight line between t1 and t2 is unobstructed
+= look from eyes of t1 to any part of t2
+=
+=====================
+*/
+
+boolean P_CheckSight(mobj_t * t1, mobj_t * t2)
+{
+    int s1, s2;
+    int pnum, bytenum, bitnum;
+
+//
+// check for trivial rejection
+//
+    s1 = (t1->subsector->sector - sectors);
+    s2 = (t2->subsector->sector - sectors);
+    pnum = s1 * numsectors + s2;
+    bytenum = pnum >> 3;
+    bitnum = 1 << (pnum & 7);
+
+    if (rejectmatrix[bytenum] & bitnum)
+    {
+        sightcounts[0]++;
+        return false;           // can't possibly be connected
+    }
+
+//
+// check precisely
+//
+    sightzstart = t1->z + t1->height - (t1->height >> 2);
+    topslope = (t2->z + t2->height) - sightzstart;
+    bottomslope = (t2->z) - sightzstart;
+
+    return P_SightPathTraverse(t1->x, t1->y, t2->x, t2->y);
+}
diff --git a/games/NXDoom/src/hexen/p_spec.c b/games/NXDoom/src/hexen/p_spec.c
new file mode 100644
index 000000000..400bf70df
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_spec.c
@@ -0,0 +1,1202 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAX_TAGGED_LINES 64
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static boolean CheckedLockedDoor(mobj_t * mo, byte lock);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+int *TerrainTypes;
+struct
+{
+    const char *name;
+    int type;
+} TerrainTypeDefs[] =
+{
+    {
+    "X_005", FLOOR_WATER},
+    {
+    "X_001", FLOOR_LAVA},
+    {
+    "X_009", FLOOR_SLUDGE},
+    {
+    "F_033", FLOOR_ICE},
+    {
+    "END", -1}
+};
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static struct
+{
+    line_t *line;
+    int lineTag;
+} TaggedLines[MAX_TAGGED_LINES];
+static int TaggedLineCount;
+
+mobj_t LavaInflictor;
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// P_InitLava
+//
+//==========================================================================
+
+void P_InitLava(void)
+{
+    memset(&LavaInflictor, 0, sizeof(mobj_t));
+    LavaInflictor.type = MT_CIRCLEFLAME;
+    LavaInflictor.flags2 = MF2_FIREDAMAGE | MF2_NODMGTHRUST;
+}
+
+//==========================================================================
+//
+// P_InitTerrainTypes
+//
+//==========================================================================
+
+void P_InitTerrainTypes(void)
+{
+    int i;
+    int lump;
+    int size;
+
+    size = (numflats + 1) * sizeof(int);
+    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
+    memset(TerrainTypes, 0, size);
+    for (i = 0; TerrainTypeDefs[i].type != -1; i++)
+    {
+        lump = W_CheckNumForName(TerrainTypeDefs[i].name);
+        if (lump != -1)
+        {
+            TerrainTypes[lump - firstflat] = TerrainTypeDefs[i].type;
+        }
+    }
+}
+
+//==========================================================================
+//
+// getSide
+//
+// Will return a side_t* given the number of the current sector, the
+// line number, and the side (0/1) that you want.
+//
+//==========================================================================
+
+/*
+side_t *getSide(int currentSector, int line, int side)
+{
+	return &sides[ (sectors[currentSector].lines[line])->sidenum[side] ];
+}
+*/
+
+//==========================================================================
+//
+// getSector
+//
+// Will return a sector_t* given the number of the current sector, the
+// line number, and the side (0/1) that you want.
+//
+//==========================================================================
+
+/*
+sector_t *getSector(int currentSector, int line, int side)
+{
+	return sides[ (sectors[currentSector].lines[line])->sidenum[side] ].sector;
+}
+*/
+
+//==========================================================================
+//
+// twoSided
+//
+// Given the sector number and the line number, will tell you whether
+// the line is two-sided or not.
+//
+//==========================================================================
+
+/*
+int     twoSided(int sector, int line)
+{
+	return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
+}
+*/
+
+//==================================================================
+//
+//      Return sector_t * of sector next to current. NULL if not two-sided line
+//
+//==================================================================
+sector_t *getNextSector(line_t * line, sector_t * sec)
+{
+    if (!(line->flags & ML_TWOSIDED))
+        return NULL;
+
+    if (line->frontsector == sec)
+        return line->backsector;
+
+    return line->frontsector;
+}
+
+//==================================================================
+//
+//      FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindLowestFloorSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t floor = sec->floorheight;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->floorheight < floor)
+            floor = other->floorheight;
+    }
+    return floor;
+}
+
+//==================================================================
+//
+//      FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindHighestFloorSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t floor = -500 * FRACUNIT;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->floorheight > floor)
+            floor = other->floorheight;
+    }
+    return floor;
+}
+
+//==================================================================
+//
+//      FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight)
+{
+    int i;
+    int h;
+    int min;
+    line_t *check;
+    sector_t *other;
+    fixed_t height = currentheight;
+    fixed_t heightlist[20];     // 20 adjoining sectors max!
+
+    heightlist[0] = 0;
+
+    for (i = 0, h = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->floorheight > height)
+            heightlist[h++] = other->floorheight;
+    }
+
+    //
+    // Find lowest height in list
+    //
+    min = heightlist[0];
+    for (i = 1; i < h; i++)
+        if (heightlist[i] < min)
+            min = heightlist[i];
+
+    return min;
+}
+
+//==================================================================
+//
+//      FIND LOWEST CEILING IN THE SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindLowestCeilingSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t height = INT_MAX;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->ceilingheight < height)
+            height = other->ceilingheight;
+    }
+    return height;
+}
+
+//==================================================================
+//
+//      FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
+//
+//==================================================================
+fixed_t P_FindHighestCeilingSurrounding(sector_t * sec)
+{
+    int i;
+    line_t *check;
+    sector_t *other;
+    fixed_t height = 0;
+
+    for (i = 0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check, sec);
+        if (!other)
+            continue;
+        if (other->ceilingheight > height)
+            height = other->ceilingheight;
+    }
+    return height;
+}
+
+//==================================================================
+//
+//      RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
+//
+//==================================================================
+
+/*
+int     P_FindSectorFromLineTag(line_t  *line,int start)
+{
+	int     i;
+
+	for (i=start+1;i<numsectors;i++)
+		if (sectors[i].tag == line->arg1)
+			return i;
+	return -1;
+}
+*/
+
+//=========================================================================
+//
+// P_FindSectorFromTag
+//
+//=========================================================================
+
+int P_FindSectorFromTag(int tag, int start)
+{
+    int i;
+
+    for (i = start + 1; i < numsectors; i++)
+    {
+        if (sectors[i].tag == tag)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+//==================================================================
+//
+//      Find minimum light from an adjacent sector
+//
+//==================================================================
+
+/*
+int     P_FindMinSurroundingLight(sector_t *sector,int max)
+{
+	int                     i;
+	int                     min;
+	line_t          *line;
+	sector_t        *check;
+
+	min = max;
+	for (i=0 ; i < sector->linecount ; i++)
+	{
+		line = sector->lines[i];
+		check = getNextSector(line,sector);
+		if (!check)
+			continue;
+		if (check->lightlevel < min)
+			min = check->lightlevel;
+	}
+	return min;
+}
+*/
+
+//=========================================================================
+//
+// EV_SectorSoundChange
+//
+//=========================================================================
+
+boolean EV_SectorSoundChange(byte * args)
+{
+    int secNum;
+    boolean rtn;
+
+    if (!args[0])
+    {
+        return false;
+    }
+    secNum = -1;
+    rtn = false;
+    while ((secNum = P_FindSectorFromTag(args[0], secNum)) >= 0)
+    {
+        sectors[secNum].seqType = args[1];
+        rtn = true;
+    }
+    return rtn;
+}
+
+//============================================================================
+//
+// CheckedLockedDoor
+//
+//============================================================================
+
+static boolean CheckedLockedDoor(mobj_t * mo, byte lock)
+{
+    char LockedBuffer[80];
+
+    if (!mo->player)
+    {
+        return false;
+    }
+    if (!lock)
+    {
+        return true;
+    }
+    if (!(mo->player->keys & (1 << (lock - 1))))
+    {
+        M_snprintf(LockedBuffer, sizeof(LockedBuffer),
+                   "YOU NEED THE %s\n", TextKeyMessages[lock - 1]);
+        P_SetMessage(mo->player, LockedBuffer, true);
+        S_StartSound(mo, SFX_DOOR_LOCKED);
+        return false;
+    }
+    return true;
+}
+
+
+//==========================================================================
+//
+// EV_LineSearchForPuzzleItem
+//
+//==========================================================================
+
+boolean EV_LineSearchForPuzzleItem(line_t * line, byte * args, mobj_t * mo)
+{
+    player_t *player;
+    int i;
+    int type;
+    artitype_t arti;
+
+    if (!mo)
+        return false;
+    player = mo->player;
+    if (!player)
+        return false;
+
+    // Search player's inventory for puzzle items
+    for (i = 0; i < player->artifactCount; i++)
+    {
+        arti = player->inventory[i].type;
+        type = arti - arti_firstpuzzitem;
+        if (type < 0)
+            continue;
+        if (type == line->arg1)
+        {
+            // A puzzle item was found for the line
+            if (P_UseArtifact(player, arti))
+            {
+                // A puzzle item was found for the line
+                P_PlayerRemoveArtifact(player, i);
+                if (player == &players[consoleplayer])
+                {
+                    if (arti < arti_firstpuzzitem)
+                    {
+                        S_StartSound(NULL, SFX_ARTIFACT_USE);
+                    }
+                    else
+                    {
+                        S_StartSound(NULL, SFX_PUZZLE_SUCCESS);
+                    }
+                    ArtifactFlash = 4;
+                }
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
+
+/*
+==============================================================================
+
+							EVENTS
+
+Events are operations triggered by using, crossing, or shooting special lines, or by timed thinkers
+
+==============================================================================
+*/
+//============================================================================
+//
+// P_ExecuteLineSpecial
+//
+// Invoked when crossing a linedef. The args[] array should be at least
+// 5 elements in length.
+//
+//============================================================================
+
+boolean P_ExecuteLineSpecial(int special, byte * args, line_t * line,
+                             int side, mobj_t * mo)
+{
+    boolean buttonSuccess;
+
+    buttonSuccess = false;
+    switch (special)
+    {
+        case 1:                // Poly Start Line
+            break;
+        case 2:                // Poly Rotate Left
+            buttonSuccess = EV_RotatePoly(line, args, 1, false);
+            break;
+        case 3:                // Poly Rotate Right
+            buttonSuccess = EV_RotatePoly(line, args, -1, false);
+            break;
+        case 4:                // Poly Move
+            buttonSuccess = EV_MovePoly(line, args, false, false);
+            break;
+        case 5:                // Poly Explicit Line:  Only used in initialization
+            break;
+        case 6:                // Poly Move Times 8
+            buttonSuccess = EV_MovePoly(line, args, true, false);
+            break;
+        case 7:                // Poly Door Swing
+            buttonSuccess = EV_OpenPolyDoor(line, args, PODOOR_SWING);
+            break;
+        case 8:                // Poly Door Slide
+            buttonSuccess = EV_OpenPolyDoor(line, args, PODOOR_SLIDE);
+            break;
+        case 10:               // Door Close
+            buttonSuccess = EV_DoDoor(line, args, DREV_CLOSE);
+            break;
+        case 11:               // Door Open
+            if (!args[0])
+            {
+                buttonSuccess = EV_VerticalDoor(line, mo);
+            }
+            else
+            {
+                buttonSuccess = EV_DoDoor(line, args, DREV_OPEN);
+            }
+            break;
+        case 12:               // Door Raise
+            if (!args[0])
+            {
+                buttonSuccess = EV_VerticalDoor(line, mo);
+            }
+            else
+            {
+                buttonSuccess = EV_DoDoor(line, args, DREV_NORMAL);
+            }
+            break;
+        case 13:               // Door Locked_Raise
+            if (CheckedLockedDoor(mo, args[3]))
+            {
+                if (!args[0])
+                {
+                    buttonSuccess = EV_VerticalDoor(line, mo);
+                }
+                else
+                {
+                    buttonSuccess = EV_DoDoor(line, args, DREV_NORMAL);
+                }
+            }
+            break;
+        case 20:               // Floor Lower by Value
+            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERFLOORBYVALUE);
+            break;
+        case 21:               // Floor Lower to Lowest
+            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERFLOORTOLOWEST);
+            break;
+        case 22:               // Floor Lower to Nearest
+            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERFLOOR);
+            break;
+        case 23:               // Floor Raise by Value
+            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOORBYVALUE);
+            break;
+        case 24:               // Floor Raise to Highest
+            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOOR);
+            break;
+        case 25:               // Floor Raise to Nearest
+            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOORTONEAREST);
+            break;
+        case 26:               // Stairs Build Down Normal
+            buttonSuccess = EV_BuildStairs(line, args, -1, STAIRS_NORMAL);
+            break;
+        case 27:               // Build Stairs Up Normal
+            buttonSuccess = EV_BuildStairs(line, args, 1, STAIRS_NORMAL);
+            break;
+        case 28:               // Floor Raise and Crush
+            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOORCRUSH);
+            break;
+        case 29:               // Build Pillar (no crushing)
+            buttonSuccess = EV_BuildPillar(line, args, false);
+            break;
+        case 30:               // Open Pillar
+            buttonSuccess = EV_OpenPillar(line, args);
+            break;
+        case 31:               // Stairs Build Down Sync
+            buttonSuccess = EV_BuildStairs(line, args, -1, STAIRS_SYNC);
+            break;
+        case 32:               // Build Stairs Up Sync
+            buttonSuccess = EV_BuildStairs(line, args, 1, STAIRS_SYNC);
+            break;
+        case 35:               // Raise Floor by Value Times 8
+            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEBYVALUETIMES8);
+            break;
+        case 36:               // Lower Floor by Value Times 8
+            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERBYVALUETIMES8);
+            break;
+        case 40:               // Ceiling Lower by Value
+            buttonSuccess = EV_DoCeiling(line, args, CLEV_LOWERBYVALUE);
+            break;
+        case 41:               // Ceiling Raise by Value
+            buttonSuccess = EV_DoCeiling(line, args, CLEV_RAISEBYVALUE);
+            break;
+        case 42:               // Ceiling Crush and Raise
+            buttonSuccess = EV_DoCeiling(line, args, CLEV_CRUSHANDRAISE);
+            break;
+        case 43:               // Ceiling Lower and Crush
+            buttonSuccess = EV_DoCeiling(line, args, CLEV_LOWERANDCRUSH);
+            break;
+        case 44:               // Ceiling Crush Stop
+            buttonSuccess = EV_CeilingCrushStop(line, args);
+            break;
+        case 45:               // Ceiling Crush Raise and Stay
+            buttonSuccess = EV_DoCeiling(line, args, CLEV_CRUSHRAISEANDSTAY);
+            break;
+        case 46:               // Floor Crush Stop
+            buttonSuccess = EV_FloorCrushStop(line, args);
+            break;
+        case 60:               // Plat Perpetual Raise
+            buttonSuccess = EV_DoPlat(line, args, PLAT_PERPETUALRAISE, 0);
+            break;
+        case 61:               // Plat Stop
+            EV_StopPlat(line, args);
+            break;
+        case 62:               // Plat Down-Wait-Up-Stay
+            buttonSuccess = EV_DoPlat(line, args, PLAT_DOWNWAITUPSTAY, 0);
+            break;
+        case 63:               // Plat Down-by-Value*8-Wait-Up-Stay
+            buttonSuccess = EV_DoPlat(line, args, PLAT_DOWNBYVALUEWAITUPSTAY,
+                                      0);
+            break;
+        case 64:               // Plat Up-Wait-Down-Stay
+            buttonSuccess = EV_DoPlat(line, args, PLAT_UPWAITDOWNSTAY, 0);
+            break;
+        case 65:               // Plat Up-by-Value*8-Wait-Down-Stay
+            buttonSuccess = EV_DoPlat(line, args, PLAT_UPBYVALUEWAITDOWNSTAY,
+                                      0);
+            break;
+        case 66:               // Floor Lower Instant * 8
+            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERTIMES8INSTANT);
+            break;
+        case 67:               // Floor Raise Instant * 8
+            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISETIMES8INSTANT);
+            break;
+        case 68:               // Floor Move to Value * 8
+            buttonSuccess = EV_DoFloor(line, args, FLEV_MOVETOVALUETIMES8);
+            break;
+        case 69:               // Ceiling Move to Value * 8
+            buttonSuccess = EV_DoCeiling(line, args, CLEV_MOVETOVALUETIMES8);
+            break;
+        case 70:               // Teleport
+            if (side == 0)
+            {                   // Only teleport when crossing the front side of a line
+                buttonSuccess = EV_Teleport(args[0], mo, true);
+            }
+            break;
+        case 71:               // Teleport, no fog
+            if (side == 0)
+            {                   // Only teleport when crossing the front side of a line
+                buttonSuccess = EV_Teleport(args[0], mo, false);
+            }
+            break;
+        case 72:               // Thrust Mobj
+            if (!side)          // Only thrust on side 0
+            {
+                P_ThrustMobj(mo, args[0] * (ANG90 / 64),
+                             args[1] << FRACBITS);
+                buttonSuccess = 1;
+            }
+            break;
+        case 73:               // Damage Mobj
+            if (args[0])
+            {
+                P_DamageMobj(mo, NULL, NULL, args[0]);
+            }
+            else
+            {                   // If arg1 is zero, then guarantee a kill
+                P_DamageMobj(mo, NULL, NULL, 10000);
+            }
+            buttonSuccess = 1;
+            break;
+        case 74:               // Teleport_NewMap
+            if (side == 0)
+            {                   // Only teleport when crossing the front side of a line
+                if (!(mo && mo->player && mo->player->playerstate == PST_DEAD)) // Players must be alive to teleport
+                {
+                    G_Completed(args[0], args[1]);
+                    buttonSuccess = true;
+                }
+            }
+            break;
+        case 75:               // Teleport_EndGame
+            if (side == 0)
+            {                   // Only teleport when crossing the front side of a line
+                if (!(mo && mo->player && mo->player->playerstate == PST_DEAD)) // Players must be alive to teleport
+                {
+                    buttonSuccess = true;
+                    if (deathmatch)
+                    {           // Winning in deathmatch just goes back to map 1
+                        G_Completed(1, 0);
+                    }
+                    else
+                    {           // Passing -1, -1 to G_Completed() starts the Finale
+                        G_Completed(-1, -1);
+                    }
+                }
+            }
+            break;
+        case 80:               // ACS_Execute
+            buttonSuccess =
+                P_StartACS(args[0], args[1], &args[2], mo, line, side);
+            break;
+        case 81:               // ACS_Suspend
+            buttonSuccess = P_SuspendACS(args[0], args[1]);
+            break;
+        case 82:               // ACS_Terminate
+            buttonSuccess = P_TerminateACS(args[0], args[1]);
+            break;
+        case 83:               // ACS_LockedExecute
+            buttonSuccess = P_StartLockedACS(line, args, mo, side);
+            break;
+        case 90:               // Poly Rotate Left Override
+            buttonSuccess = EV_RotatePoly(line, args, 1, true);
+            break;
+        case 91:               // Poly Rotate Right Override
+            buttonSuccess = EV_RotatePoly(line, args, -1, true);
+            break;
+        case 92:               // Poly Move Override
+            buttonSuccess = EV_MovePoly(line, args, false, true);
+            break;
+        case 93:               // Poly Move Times 8 Override
+            buttonSuccess = EV_MovePoly(line, args, true, true);
+            break;
+        case 94:               // Build Pillar Crush 
+            buttonSuccess = EV_BuildPillar(line, args, true);
+            break;
+        case 95:               // Lower Floor and Ceiling
+            buttonSuccess = EV_DoFloorAndCeiling(line, args, false);
+            break;
+        case 96:               // Raise Floor and Ceiling
+            buttonSuccess = EV_DoFloorAndCeiling(line, args, true);
+            break;
+        case 109:              // Force Lightning
+            buttonSuccess = true;
+            P_ForceLightning();
+            break;
+        case 110:              // Light Raise by Value
+            buttonSuccess = EV_SpawnLight(line, args, LITE_RAISEBYVALUE);
+            break;
+        case 111:              // Light Lower by Value
+            buttonSuccess = EV_SpawnLight(line, args, LITE_LOWERBYVALUE);
+            break;
+        case 112:              // Light Change to Value
+            buttonSuccess = EV_SpawnLight(line, args, LITE_CHANGETOVALUE);
+            break;
+        case 113:              // Light Fade
+            buttonSuccess = EV_SpawnLight(line, args, LITE_FADE);
+            break;
+        case 114:              // Light Glow
+            buttonSuccess = EV_SpawnLight(line, args, LITE_GLOW);
+            break;
+        case 115:              // Light Flicker
+            buttonSuccess = EV_SpawnLight(line, args, LITE_FLICKER);
+            break;
+        case 116:              // Light Strobe
+            buttonSuccess = EV_SpawnLight(line, args, LITE_STROBE);
+            break;
+        case 120:              // Quake Tremor
+            buttonSuccess = A_LocalQuake(args, mo);
+            break;
+        case 129:              // UsePuzzleItem
+            buttonSuccess = EV_LineSearchForPuzzleItem(line, args, mo);
+            break;
+        case 130:              // Thing_Activate
+            buttonSuccess = EV_ThingActivate(args[0]);
+            break;
+        case 131:              // Thing_Deactivate
+            buttonSuccess = EV_ThingDeactivate(args[0]);
+            break;
+        case 132:              // Thing_Remove
+            buttonSuccess = EV_ThingRemove(args[0]);
+            break;
+        case 133:              // Thing_Destroy
+            buttonSuccess = EV_ThingDestroy(args[0]);
+            break;
+        case 134:              // Thing_Projectile
+            buttonSuccess = EV_ThingProjectile(args, 0);
+            break;
+        case 135:              // Thing_Spawn
+            buttonSuccess = EV_ThingSpawn(args, 1);
+            break;
+        case 136:              // Thing_ProjectileGravity
+            buttonSuccess = EV_ThingProjectile(args, 1);
+            break;
+        case 137:              // Thing_SpawnNoFog
+            buttonSuccess = EV_ThingSpawn(args, 0);
+            break;
+        case 138:              // Floor_Waggle
+            buttonSuccess = EV_StartFloorWaggle(args[0], args[1],
+                                                args[2], args[3], args[4]);
+            break;
+        case 140:              // Sector_SoundChange
+            buttonSuccess = EV_SectorSoundChange(args);
+            break;
+
+            // Line specials only processed during level initialization
+            // 100: Scroll_Texture_Left
+            // 101: Scroll_Texture_Right
+            // 102: Scroll_Texture_Up
+            // 103: Scroll_Texture_Down
+            // 121: Line_SetIdentification
+
+            // Inert Line specials
+        default:
+            break;
+    }
+    return buttonSuccess;
+}
+
+//============================================================================
+//
+// P_ActivateLine
+//
+//============================================================================
+
+boolean P_ActivateLine(line_t * line, mobj_t * mo, int side,
+                       int activationType)
+{
+    byte args[5];
+    int lineActivation;
+    boolean repeat;
+    boolean buttonSuccess;
+
+    lineActivation = GET_SPAC(line->flags);
+    if (lineActivation != activationType)
+    {
+        return false;
+    }
+    if (!mo->player && !(mo->flags & MF_MISSILE))
+    {
+        if (lineActivation != SPAC_MCROSS)
+        {                       // currently, monsters can only activate the MCROSS activation type
+            return false;
+        }
+        if (line->flags & ML_SECRET)
+            return false;       // never open secret doors
+    }
+    repeat = (line->flags & ML_REPEAT_SPECIAL) != 0;
+
+    // Construct args[] array to contain the arguments from the line, as we
+    // cannot rely on struct field ordering and layout.
+    args[0] = line->arg1;
+    args[1] = line->arg2;
+    args[2] = line->arg3;
+    args[3] = line->arg4;
+    args[4] = line->arg5;
+    buttonSuccess = P_ExecuteLineSpecial(line->special, args, line, side, mo);
+    if (!repeat && buttonSuccess)
+    {                           // clear the special on non-retriggerable lines
+        line->special = 0;
+    }
+    if ((lineActivation == SPAC_USE || lineActivation == SPAC_IMPACT)
+        && buttonSuccess)
+    {
+        P_ChangeSwitchTexture(line, repeat);
+    }
+    return true;
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerInSpecialSector
+//
+// Called every tic frame that the player origin is in a special sector.
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerInSpecialSector(player_t * player)
+{
+    sector_t *sector;
+    static int pushTab[3] = {
+        2048 * 5,
+        2048 * 10,
+        2048 * 25
+    };
+
+    sector = player->mo->subsector->sector;
+    if (player->mo->z != sector->floorheight)
+    {                           // Player is not touching the floor
+        return;
+    }
+    switch (sector->special)
+    {
+        case 9:                // SecretArea
+            player->secretcount++;
+            sector->special = 0;
+            break;
+
+        case 201:
+        case 202:
+        case 203:              // Scroll_North_xxx
+            P_Thrust(player, ANG90, pushTab[sector->special - 201]);
+            break;
+        case 204:
+        case 205:
+        case 206:              // Scroll_East_xxx
+            P_Thrust(player, 0, pushTab[sector->special - 204]);
+            break;
+        case 207:
+        case 208:
+        case 209:              // Scroll_South_xxx
+            P_Thrust(player, ANG270, pushTab[sector->special - 207]);
+            break;
+        case 210:
+        case 211:
+        case 212:              // Scroll_West_xxx
+            P_Thrust(player, ANG180, pushTab[sector->special - 210]);
+            break;
+        case 213:
+        case 214:
+        case 215:              // Scroll_NorthWest_xxx
+            P_Thrust(player, ANG90 + ANG45, pushTab[sector->special - 213]);
+            break;
+        case 216:
+        case 217:
+        case 218:              // Scroll_NorthEast_xxx
+            P_Thrust(player, ANG45, pushTab[sector->special - 216]);
+            break;
+        case 219:
+        case 220:
+        case 221:              // Scroll_SouthEast_xxx
+            P_Thrust(player, ANG270 + ANG45, pushTab[sector->special - 219]);
+            break;
+        case 222:
+        case 223:
+        case 224:              // Scroll_SouthWest_xxx
+            P_Thrust(player, ANG180 + ANG45, pushTab[sector->special - 222]);
+            break;
+
+        case 40:
+        case 41:
+        case 42:
+        case 43:
+        case 44:
+        case 45:
+        case 46:
+        case 47:
+        case 48:
+        case 49:
+        case 50:
+        case 51:
+            // Wind specials are handled in (P_mobj):P_XYMovement
+            break;
+
+        case 26:               // Stairs_Special1
+        case 27:               // Stairs_Special2
+            // Used in (P_floor):ProcessStairSector
+            break;
+
+        case 198:              // Lightning Special
+        case 199:              // Lightning Flash special
+        case 200:              // Sky2
+            // Used in (R_plane):R_Drawplanes
+            break;
+        default:
+            I_Error("P_PlayerInSpecialSector: "
+                    "unknown special %i", sector->special);
+    }
+}
+
+//============================================================================
+//
+// P_PlayerOnSpecialFlat
+//
+//============================================================================
+
+void P_PlayerOnSpecialFlat(player_t * player, int floorType)
+{
+    if (player->mo->z != player->mo->floorz)
+    {                           // Player is not touching the floor
+        return;
+    }
+    switch (floorType)
+    {
+        case FLOOR_LAVA:
+            if (!(leveltime & 31))
+            {
+                P_DamageMobj(player->mo, &LavaInflictor, NULL, 10);
+                S_StartSound(player->mo, SFX_LAVA_SIZZLE);
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_UpdateSpecials
+//
+//----------------------------------------------------------------------------
+
+void P_UpdateSpecials(void)
+{
+    int i;
+
+    // Handle buttons
+    for (i = 0; i < MAXBUTTONS; i++)
+    {
+        if (buttonlist[i].btimer)
+        {
+            buttonlist[i].btimer--;
+            if (!buttonlist[i].btimer)
+            {
+                switch (buttonlist[i].where)
+                {
+                    case SWTCH_TOP:
+                        sides[buttonlist[i].line->sidenum[0]].toptexture =
+                            buttonlist[i].btexture;
+                        break;
+                    case SWTCH_MIDDLE:
+                        sides[buttonlist[i].line->sidenum[0]].midtexture =
+                            buttonlist[i].btexture;
+                        break;
+                    case SWTCH_BOTTOM:
+                        sides[buttonlist[i].line->sidenum[0]].bottomtexture =
+                            buttonlist[i].btexture;
+                        break;
+                }
+                //S_StartSound((mobj_t *)&buttonlist[i].soundorg, sfx_switch);
+                memset(&buttonlist[i], 0, sizeof(button_t));
+            }
+        }
+    }
+}
+
+/*
+==============================================================================
+
+							SPECIAL SPAWNING
+
+==============================================================================
+*/
+/*
+================================================================================
+= P_SpawnSpecials
+=
+= After the map has been loaded, scan for specials that
+= spawn thinkers
+=
+===============================================================================
+*/
+
+short numlinespecials;
+line_t *linespeciallist[MAXLINEANIMS];
+
+void P_SpawnSpecials(void)
+{
+    sector_t *sector;
+    int i;
+
+    //
+    //      Init special SECTORs
+    //
+    sector = sectors;
+    for (i = 0; i < numsectors; i++, sector++)
+    {
+        if (!sector->special)
+            continue;
+        switch (sector->special)
+        {
+            case 1:            // Phased light
+                // Hardcoded base, use sector->lightlevel as the index
+                P_SpawnPhasedLight(sector, 80, -1);
+                break;
+            case 2:            // Phased light sequence start
+                P_SpawnLightSequence(sector, 1);
+                break;
+                // Specials 3 & 4 are used by the phased light sequences
+
+                /*
+                   case 1:         // FLICKERING LIGHTS
+                   P_SpawnLightFlash (sector);
+                   break;
+                   case 2:         // STROBE FAST
+                   P_SpawnStrobeFlash(sector,FASTDARK,0);
+                   break;
+                   case 3:         // STROBE SLOW
+                   P_SpawnStrobeFlash(sector,SLOWDARK,0);
+                   break;
+                   case 4:         // STROBE FAST/DEATH SLIME
+                   P_SpawnStrobeFlash(sector,FASTDARK,0);
+                   sector->special = 4;
+                   break;
+                   case 8:         // GLOWING LIGHT
+                   P_SpawnGlowingLight(sector);
+                   break;
+                   case 9:         // SECRET SECTOR
+                   totalsecret++;
+                   break;
+                   case 10:        // DOOR CLOSE IN 30 SECONDS
+                   P_SpawnDoorCloseIn30 (sector);
+                   break;
+                   case 12:        // SYNC STROBE SLOW
+                   P_SpawnStrobeFlash (sector, SLOWDARK, 1);
+                   break;
+                   case 13:        // SYNC STROBE FAST
+                   P_SpawnStrobeFlash (sector, FASTDARK, 1);
+                   break;
+                   case 14:        // DOOR RAISE IN 5 MINUTES
+                   P_SpawnDoorRaiseIn5Mins (sector, i);
+                   break;
+                 */
+        }
+    }
+
+
+    //
+    //      Init line EFFECTs
+    //
+    numlinespecials = 0;
+    TaggedLineCount = 0;
+    for (i = 0; i < numlines; i++)
+    {
+        switch (lines[i].special)
+        {
+            case 100:          // Scroll_Texture_Left
+            case 101:          // Scroll_Texture_Right
+            case 102:          // Scroll_Texture_Up
+            case 103:          // Scroll_Texture_Down
+                linespeciallist[numlinespecials] = &lines[i];
+                numlinespecials++;
+                break;
+            case 121:          // Line_SetIdentification
+                if (lines[i].arg1)
+                {
+                    if (TaggedLineCount == MAX_TAGGED_LINES)
+                    {
+                        I_Error("P_SpawnSpecials: MAX_TAGGED_LINES "
+                                "(%d) exceeded.", MAX_TAGGED_LINES);
+                    }
+                    TaggedLines[TaggedLineCount].line = &lines[i];
+                    TaggedLines[TaggedLineCount++].lineTag = lines[i].arg1;
+                }
+                lines[i].special = 0;
+                break;
+        }
+    }
+
+    //
+    //      Init other misc stuff
+    //
+    for (i = 0; i < MAXCEILINGS; i++)
+        activeceilings[i] = NULL;
+    for (i = 0; i < MAXPLATS; i++)
+        activeplats[i] = NULL;
+    for (i = 0; i < MAXBUTTONS; i++)
+        memset(&buttonlist[i], 0, sizeof(button_t));
+
+    // Initialize flat and texture animations
+    P_InitFTAnims();
+}
+
+//==========================================================================
+//
+// P_FindLine
+//
+//==========================================================================
+
+line_t *P_FindLine(int lineTag, int *searchPosition)
+{
+    int i;
+
+    for (i = *searchPosition + 1; i < TaggedLineCount; i++)
+    {
+        if (TaggedLines[i].lineTag == lineTag)
+        {
+            *searchPosition = i;
+            return TaggedLines[i].line;
+        }
+    }
+    *searchPosition = -1;
+    return NULL;
+}
diff --git a/games/NXDoom/src/hexen/p_spec.h b/games/NXDoom/src/hexen/p_spec.h
new file mode 100644
index 000000000..3814484ba
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_spec.h
@@ -0,0 +1,586 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef P_SPEC_H
+#define P_SPEC_H
+
+
+extern int *TerrainTypes;
+
+//
+//      scrolling line specials
+//
+
+#define MAXLINEANIMS 64
+extern short numlinespecials;
+extern line_t *linespeciallist[MAXLINEANIMS];
+
+extern mobj_t LavaInflictor;
+
+
+//      Define values for map objects
+#define MO_TELEPORTMAN 14
+
+// at game start
+void P_InitTerrainTypes(void);
+void P_InitLava(void);
+
+// at map load
+void P_SpawnSpecials(void);
+
+// every tic
+void P_UpdateSpecials(void);
+
+// when needed
+boolean P_ExecuteLineSpecial(int special, byte * args, line_t * line,
+                             int side, mobj_t * mo);
+boolean P_ActivateLine(line_t * ld, mobj_t * mo, int side,
+                       int activationType);
+//boolean P_UseSpecialLine ( mobj_t *thing, line_t *line);
+//void    P_ShootSpecialLine ( mobj_t *thing, line_t *line);
+//void    P_CrossSpecialLine (int linenum, int side, mobj_t *thing);
+
+void P_PlayerInSpecialSector(player_t * player);
+void P_PlayerOnSpecialFlat(player_t * player, int floorType);
+
+//int twoSided(int sector,int line);
+//sector_t *getSector(int currentSector,int line,int side);
+//side_t  *getSide(int currentSector,int line, int side);
+fixed_t P_FindLowestFloorSurrounding(sector_t * sec);
+fixed_t P_FindHighestFloorSurrounding(sector_t * sec);
+fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight);
+fixed_t P_FindLowestCeilingSurrounding(sector_t * sec);
+fixed_t P_FindHighestCeilingSurrounding(sector_t * sec);
+//int P_FindSectorFromLineTag(line_t  *line,int start);
+int P_FindSectorFromTag(int tag, int start);
+//int P_FindMinSurroundingLight(sector_t *sector,int max);
+sector_t *getNextSector(line_t * line, sector_t * sec);
+line_t *P_FindLine(int lineTag, int *searchPosition);
+
+//
+//      SPECIAL
+//
+//int EV_DoDonut(line_t *line);
+
+//-------------------------------
+// P_anim.c
+//-------------------------------
+
+
+extern fixed_t Sky1ScrollDelta;
+extern fixed_t Sky2ScrollDelta;
+
+
+void P_AnimateSurfaces(void);
+void P_InitFTAnims(void);
+void P_InitLightning(void);
+void P_ForceLightning(void);
+
+/*
+===============================================================================
+
+							P_LIGHTS
+
+===============================================================================
+*/
+
+typedef enum
+{
+    LITE_RAISEBYVALUE,
+    LITE_LOWERBYVALUE,
+    LITE_CHANGETOVALUE,
+    LITE_FADE,
+    LITE_GLOW,
+    LITE_FLICKER,
+    LITE_STROBE
+} lighttype_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    lighttype_t type;
+    int value1;
+    int value2;
+    int tics1;
+    int tics2;
+    int count;
+} light_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int index;
+    int base;
+} phase_t;
+
+#define LIGHT_SEQUENCE_START    2
+#define LIGHT_SEQUENCE          3
+#define LIGHT_SEQUENCE_ALT      4
+
+void T_Phase(thinker_t *thinker);
+void T_Light(thinker_t *thinker);
+void P_SpawnPhasedLight(sector_t * sector, int base, int index);
+void P_SpawnLightSequence(sector_t * sector, int indexStep);
+boolean EV_SpawnLight(line_t * line, byte * arg, lighttype_t type);
+
+#if 0
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int count;
+    int maxlight;
+    int minlight;
+    int maxtime;
+    int mintime;
+} lightflash_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int count;
+    int minlight;
+    int maxlight;
+    int darktime;
+    int brighttime;
+} strobe_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int minlight;
+    int maxlight;
+    int direction;
+} glow_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int index;
+    int base;
+} phase_t;
+
+#define GLOWSPEED 8
+#define STROBEBRIGHT 5
+#define FASTDARK 15
+#define SLOWDARK 35
+
+#define LIGHT_SEQUENCE_START    2
+#define LIGHT_SEQUENCE                  3
+#define LIGHT_SEQUENCE_ALT      4
+
+void T_LightFlash(lightflash_t * flash);
+void P_SpawnLightFlash(sector_t * sector);
+void T_StrobeFlash(strobe_t * flash);
+void P_SpawnStrobeFlash(sector_t * sector, int fastOrSlow, int inSync);
+void EV_StartLightStrobing(line_t * line);
+void EV_TurnTagLightsOff(line_t * line);
+void EV_LightTurnOn(line_t * line, int bright);
+void T_Glow(glow_t * g);
+void P_SpawnGlowingLight(sector_t * sector);
+void T_Phase(phase_t * phase);
+void P_SpawnPhasedLight(sector_t * sector, int base, int index);
+void P_SpawnLightSequence(sector_t * sector, int indexStep);
+#endif
+
+/*
+===============================================================================
+
+							P_SWITCH
+
+===============================================================================
+*/
+typedef struct
+{
+    char name1[9];
+    char name2[9];
+    int soundID;
+} switchlist_t;
+
+typedef enum
+{
+    SWTCH_TOP,
+    SWTCH_MIDDLE,
+    SWTCH_BOTTOM
+} bwhere_e;
+
+typedef struct
+{
+    line_t *line;
+    bwhere_e where;
+    int btexture;
+    int btimer;
+    mobj_t *soundorg;
+} button_t;
+
+#define MAXSWITCHES 50          // max # of wall switches in a level
+#define MAXBUTTONS 16           // 4 players, 4 buttons each at once, max.
+#define BUTTONTIME 35           // 1 second
+
+extern button_t buttonlist[MAXBUTTONS];
+
+void P_ChangeSwitchTexture(line_t * line, int useAgain);
+void P_InitSwitchList(void);
+
+/*
+===============================================================================
+
+							P_PLATS
+
+===============================================================================
+*/
+
+typedef enum
+{
+    PLAT_UP,
+    PLAT_DOWN,
+    PLAT_WAITING,
+//      PLAT_IN_STASIS
+} plat_e;
+
+typedef enum
+{
+    PLAT_PERPETUALRAISE,
+    PLAT_DOWNWAITUPSTAY,
+    PLAT_DOWNBYVALUEWAITUPSTAY,
+    PLAT_UPWAITDOWNSTAY,
+    PLAT_UPBYVALUEWAITDOWNSTAY,
+    //PLAT_RAISEANDCHANGE,
+    //PLAT_RAISETONEARESTANDCHANGE
+} plattype_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    fixed_t speed;
+    fixed_t low;
+    fixed_t high;
+    int wait;
+    int count;
+    plat_e status;
+    plat_e oldstatus;
+    int crush;
+    int tag;
+    plattype_e type;
+} plat_t;
+
+#define PLATWAIT 3
+#define PLATSPEED FRACUNIT
+#define MAXPLATS 30
+
+extern plat_t *activeplats[MAXPLATS];
+
+void T_PlatRaise(thinker_t *thinker);
+int EV_DoPlat(line_t * line, byte * args, plattype_e type, int amount);
+void P_AddActivePlat(plat_t * plat);
+void P_RemoveActivePlat(plat_t * plat);
+void EV_StopPlat(line_t * line, byte * args);
+
+/*
+===============================================================================
+
+							P_DOORS
+
+===============================================================================
+*/
+typedef enum
+{
+    DREV_NORMAL,
+    DREV_CLOSE30THENOPEN,
+    DREV_CLOSE,
+    DREV_OPEN,
+    DREV_RAISEIN5MINS,
+} vldoor_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    vldoor_e type;
+    fixed_t topheight;
+    fixed_t speed;
+    int direction;              // 1 = up, 0 = waiting at top, -1 = down
+    int topwait;                // tics to wait at the top (keep in case a door going down is reset)
+    int topcountdown;           // when it reaches 0, start going down
+} vldoor_t;
+
+#define VDOORSPEED FRACUNIT*2
+#define VDOORWAIT 150
+
+boolean EV_VerticalDoor(line_t * line, mobj_t * thing);
+int EV_DoDoor(line_t * line, byte * args, vldoor_e type);
+void T_VerticalDoor(thinker_t *thinker);
+//void P_SpawnDoorCloseIn30(sector_t *sec);
+//void P_SpawnDoorRaiseIn5Mins(sector_t *sec, int secnum);
+
+/*
+===============================================================================
+
+							P_CEILNG
+
+===============================================================================
+*/
+typedef enum
+{
+    CLEV_LOWERTOFLOOR,
+    CLEV_RAISETOHIGHEST,
+    CLEV_LOWERANDCRUSH,
+    CLEV_CRUSHANDRAISE,
+    CLEV_LOWERBYVALUE,
+    CLEV_RAISEBYVALUE,
+    CLEV_CRUSHRAISEANDSTAY,
+    CLEV_MOVETOVALUETIMES8
+} ceiling_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    ceiling_e type;
+    fixed_t bottomheight, topheight;
+    fixed_t speed;
+    int crush;
+    int direction;              // 1 = up, 0 = waiting, -1 = down
+    int tag;                    // ID
+    int olddirection;
+} ceiling_t;
+
+#define CEILSPEED FRACUNIT
+#define CEILWAIT 150
+#define MAXCEILINGS 30
+
+extern ceiling_t *activeceilings[MAXCEILINGS];
+
+int EV_DoCeiling(line_t * line, byte * args, ceiling_e type);
+void T_MoveCeiling(thinker_t *thinker);
+void P_AddActiveCeiling(ceiling_t * c);
+void P_RemoveActiveCeiling(ceiling_t * c);
+int EV_CeilingCrushStop(line_t * line, byte * args);
+
+/*
+===============================================================================
+
+							P_FLOOR
+
+===============================================================================
+*/
+typedef enum
+{
+    FLEV_LOWERFLOOR,            // lower floor to highest surrounding floor
+    FLEV_LOWERFLOORTOLOWEST,    // lower floor to lowest surrounding floor
+    FLEV_LOWERFLOORBYVALUE,
+    FLEV_RAISEFLOOR,            // raise floor to lowest surrounding CEILING
+    FLEV_RAISEFLOORTONEAREST,   // raise floor to next highest surrounding floor
+    FLEV_RAISEFLOORBYVALUE,
+    FLEV_RAISEFLOORCRUSH,
+    FLEV_RAISEBUILDSTEP,        // One step of a staircase
+    FLEV_RAISEBYVALUETIMES8,
+    FLEV_LOWERBYVALUETIMES8,
+    FLEV_LOWERTIMES8INSTANT,
+    FLEV_RAISETIMES8INSTANT,
+    FLEV_MOVETOVALUETIMES8
+} floor_e;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    floor_e type;
+    int crush;
+    int direction;
+    int newspecial;
+    short texture;
+    fixed_t floordestheight;
+    fixed_t speed;
+    int delayCount;
+    int delayTotal;
+    fixed_t stairsDelayHeight;
+    fixed_t stairsDelayHeightDelta;
+    fixed_t resetHeight;
+    short resetDelay;
+    short resetDelayCount;
+    byte textureChange;
+} floormove_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    int ceilingSpeed;
+    int floorSpeed;
+    int floordest;
+    int ceilingdest;
+    int direction;
+    int crush;
+} pillar_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+    fixed_t originalHeight;
+    fixed_t accumulator;
+    fixed_t accDelta;
+    fixed_t targetScale;
+    fixed_t scale;
+    fixed_t scaleDelta;
+    int ticker;
+    int state;
+} floorWaggle_t;
+
+#define FLOORSPEED FRACUNIT
+
+typedef enum
+{
+    RES_OK,
+    RES_CRUSHED,
+    RES_PASTDEST
+} result_e;
+
+typedef enum
+{
+    STAIRS_NORMAL,
+    STAIRS_SYNC,
+    STAIRS_PHASED
+} stairs_e;
+
+result_e T_MovePlane(sector_t * sector, fixed_t speed,
+                     fixed_t dest, int crush, int floorOrCeiling,
+                     int direction);
+
+int EV_BuildStairs(line_t * line, byte * args, int direction, stairs_e type);
+int EV_DoFloor(line_t * line, byte * args, floor_e floortype);
+void T_MoveFloor(thinker_t *thinker);
+void T_BuildPillar(thinker_t *thinker);
+void T_FloorWaggle(thinker_t *thinker);
+int EV_BuildPillar(line_t * line, byte * args, boolean crush);
+int EV_OpenPillar(line_t * line, byte * args);
+int EV_DoFloorAndCeiling(line_t * line, byte * args, boolean raise);
+int EV_FloorCrushStop(line_t * line, byte * args);
+boolean EV_StartFloorWaggle(int tag, int height, int speed, int offset,
+                            int timer);
+
+//--------------------------------------------------------------------------
+//
+// p_telept
+//
+//--------------------------------------------------------------------------
+
+boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle,
+                   boolean useFog);
+boolean EV_Teleport(int tid, mobj_t * thing, boolean fog);
+
+//--------------------------------------------------------------------------
+//
+// p_acs
+//
+//--------------------------------------------------------------------------
+
+#define MAX_ACS_SCRIPT_VARS 10
+#define MAX_ACS_MAP_VARS 32
+#define MAX_ACS_WORLD_VARS 64
+#define ACS_STACK_DEPTH 32
+#define MAX_ACS_STORE 20
+
+typedef enum
+{
+    ASTE_INACTIVE,
+    ASTE_RUNNING,
+    ASTE_SUSPENDED,
+    ASTE_WAITINGFORTAG,
+    ASTE_WAITINGFORPOLY,
+    ASTE_WAITINGFORSCRIPT,
+    ASTE_TERMINATING
+} aste_t;
+
+typedef struct acs_s acs_t;
+typedef struct acsInfo_s acsInfo_t;
+
+struct acsInfo_s
+{
+    int number;
+    int offset;
+    int argCount;
+    aste_t state;
+    int waitValue;
+};
+
+struct acs_s
+{
+    thinker_t thinker;
+    mobj_t *activator;
+    line_t *line;
+    int side;
+    int number;
+    int infoIndex;
+    int delayCount;
+    int stack[ACS_STACK_DEPTH];
+    int stackPtr;
+    int vars[MAX_ACS_SCRIPT_VARS];
+    int ip;
+};
+
+typedef struct
+{
+    int map;                    // Target map
+    int script;                 // Script number on target map
+    byte args[4];               // Padded to 4 for alignment
+} acsstore_t;
+
+void P_LoadACScripts(int lump);
+boolean P_StartACS(int number, int map, byte * args, mobj_t * activator,
+                   line_t * line, int side);
+boolean P_StartLockedACS(line_t * line, byte * args, mobj_t * mo, int side);
+boolean P_TerminateACS(int number, int map);
+boolean P_SuspendACS(int number, int map);
+void T_InterpretACS(thinker_t *thinker);
+void P_TagFinished(int tag);
+void P_PolyobjFinished(int po);
+void P_ACSInitNewGame(void);
+void P_CheckACSStore(void);
+void CheckACSPresent(int number);
+
+extern int ACScriptCount;
+extern byte *ActionCodeBase;
+extern acsInfo_t *ACSInfo;
+extern int MapVars[MAX_ACS_MAP_VARS];
+extern int WorldVars[MAX_ACS_WORLD_VARS];
+extern acsstore_t ACSStore[MAX_ACS_STORE + 1];  // +1 for termination marker
+
+//--------------------------------------------------------------------------
+//
+// p_things
+//
+//--------------------------------------------------------------------------
+
+extern mobjtype_t TranslateThingType[];
+
+boolean EV_ThingProjectile(byte * args, boolean gravity);
+boolean EV_ThingSpawn(byte * args, boolean fog);
+boolean EV_ThingActivate(int tid);
+boolean EV_ThingDeactivate(int tid);
+boolean EV_ThingRemove(int tid);
+boolean EV_ThingDestroy(int tid);
+
+
+#endif // P_SPEC_H
diff --git a/games/NXDoom/src/hexen/p_switch.c b/games/NXDoom/src/hexen/p_switch.c
new file mode 100644
index 000000000..a90269a79
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_switch.c
@@ -0,0 +1,172 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+//==================================================================
+//
+//      CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
+//
+//==================================================================
+switchlist_t alphSwitchListDemo[] = {
+    {"SW_1_UP", "SW_1_DN", SFX_SWITCH1},
+    {"SW_2_UP", "SW_2_DN", SFX_SWITCH1},
+    {"SW52_OFF", "SW52_ON", SFX_SWITCH2},
+    {"\0", "\0", 0}
+};
+
+switchlist_t alphSwitchListFull[] = {
+    {"SW_1_UP", "SW_1_DN", SFX_SWITCH1},
+    {"SW_2_UP", "SW_2_DN", SFX_SWITCH1},
+    {"VALVE1", "VALVE2", SFX_VALVE_TURN},
+    {"SW51_OFF", "SW51_ON", SFX_SWITCH2},
+    {"SW52_OFF", "SW52_ON", SFX_SWITCH2},
+    {"SW53_UP", "SW53_DN", SFX_ROPE_PULL},
+    {"PUZZLE5", "PUZZLE9", SFX_SWITCH1},
+    {"PUZZLE6", "PUZZLE10", SFX_SWITCH1},
+    {"PUZZLE7", "PUZZLE11", SFX_SWITCH1},
+    {"PUZZLE8", "PUZZLE12", SFX_SWITCH1},
+    {"\0", "\0", 0}
+};
+
+switchlist_t *alphSwitchList = NULL;
+
+int switchlist[MAXSWITCHES * 2];
+int numswitches;
+button_t buttonlist[MAXBUTTONS];
+
+/*
+===============
+=
+= P_InitSwitchList
+=
+= Only called at game initialization
+=
+===============
+*/
+
+void P_InitSwitchList(void)
+{
+    int i;
+    int index;
+
+    if (!alphSwitchList)
+    {
+        if (gamemode == shareware)
+        {
+            alphSwitchList = alphSwitchListDemo;
+        }
+        else
+        {
+            alphSwitchList = alphSwitchListFull;
+        }
+    }
+
+    for (index = 0, i = 0; i < MAXSWITCHES; i++)
+    {
+        if (!alphSwitchList[i].soundID)
+        {
+            numswitches = index / 2;
+            switchlist[index] = -1;
+            break;
+        }
+        switchlist[index++] = R_TextureNumForName(alphSwitchList[i].name1);
+        switchlist[index++] = R_TextureNumForName(alphSwitchList[i].name2);
+    }
+}
+
+//==================================================================
+//
+//      Start a button counting down till it turns off.
+//
+//==================================================================
+void P_StartButton(line_t * line, bwhere_e w, int texture, int time)
+{
+    int i;
+
+    for (i = 0; i < MAXBUTTONS; i++)
+    {
+        if (!buttonlist[i].btimer)
+        {
+            buttonlist[i].line = line;
+            buttonlist[i].where = w;
+            buttonlist[i].btexture = texture;
+            buttonlist[i].btimer = time;
+            buttonlist[i].soundorg = (mobj_t *) & line->frontsector->soundorg;
+            return;
+        }
+    }
+    I_Error("P_StartButton: no button slots left!");
+}
+
+//==================================================================
+//
+//      Function that changes wall texture.
+//      Tell it if switch is ok to use again (1=yes, it's a button).
+//
+//==================================================================
+void P_ChangeSwitchTexture(line_t * line, int useAgain)
+{
+    int texTop;
+    int texMid;
+    int texBot;
+    int i;
+
+    texTop = sides[line->sidenum[0]].toptexture;
+    texMid = sides[line->sidenum[0]].midtexture;
+    texBot = sides[line->sidenum[0]].bottomtexture;
+
+    for (i = 0; i < numswitches * 2; i++)
+    {
+        if (switchlist[i] == texTop)
+        {
+            S_StartSound((mobj_t *) & line->frontsector->soundorg,
+                         alphSwitchList[i / 2].soundID);
+            sides[line->sidenum[0]].toptexture = switchlist[i ^ 1];
+            if (useAgain)
+            {
+                P_StartButton(line, SWTCH_TOP, switchlist[i], BUTTONTIME);
+            }
+            return;
+        }
+        else if (switchlist[i] == texMid)
+        {
+            S_StartSound((mobj_t *) & line->frontsector->soundorg,
+                         alphSwitchList[i / 2].soundID);
+            sides[line->sidenum[0]].midtexture = switchlist[i ^ 1];
+            if (useAgain)
+            {
+                P_StartButton(line, SWTCH_MIDDLE, switchlist[i], BUTTONTIME);
+            }
+            return;
+        }
+        else if (switchlist[i] == texBot)
+        {
+            S_StartSound((mobj_t *) & line->frontsector->soundorg,
+                         alphSwitchList[i / 2].soundID);
+            sides[line->sidenum[0]].bottomtexture = switchlist[i ^ 1];
+            if (useAgain)
+            {
+                P_StartButton(line, SWTCH_BOTTOM, switchlist[i], BUTTONTIME);
+            }
+            return;
+        }
+    }
+}
diff --git a/games/NXDoom/src/hexen/p_telept.c b/games/NXDoom/src/hexen/p_telept.c
new file mode 100644
index 000000000..ba5416b27
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_telept.c
@@ -0,0 +1,190 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// P_Teleport
+//
+//==========================================================================
+
+boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle,
+                   boolean useFog)
+{
+    fixed_t oldx;
+    fixed_t oldy;
+    fixed_t oldz;
+    fixed_t aboveFloor;
+    fixed_t fogDelta;
+    player_t *player;
+    unsigned an;
+    mobj_t *fog;
+
+    oldx = thing->x;
+    oldy = thing->y;
+    oldz = thing->z;
+    aboveFloor = thing->z - thing->floorz;
+    if (!P_TeleportMove(thing, x, y))
+    {
+        return false;
+    }
+    if (thing->player)
+    {
+        player = thing->player;
+        if (player->powers[pw_flight] && aboveFloor)
+        {
+            thing->z = thing->floorz + aboveFloor;
+            if (thing->z + thing->height > thing->ceilingz)
+            {
+                thing->z = thing->ceilingz - thing->height;
+            }
+            player->viewz = thing->z + player->viewheight;
+        }
+        else
+        {
+            thing->z = thing->floorz;
+            player->viewz = thing->z + player->viewheight;
+            if (useFog)
+            {
+                player->lookdir = 0;
+            }
+        }
+    }
+    else if (thing->flags & MF_MISSILE)
+    {
+        thing->z = thing->floorz + aboveFloor;
+        if (thing->z + thing->height > thing->ceilingz)
+        {
+            thing->z = thing->ceilingz - thing->height;
+        }
+    }
+    else
+    {
+        thing->z = thing->floorz;
+    }
+    // Spawn teleport fog at source and destination
+    if (useFog)
+    {
+        fogDelta = thing->flags & MF_MISSILE ? 0 : TELEFOGHEIGHT;
+        fog = P_SpawnMobj(oldx, oldy, oldz + fogDelta, MT_TFOG);
+        S_StartSound(fog, SFX_TELEPORT);
+        an = angle >> ANGLETOFINESHIFT;
+        fog = P_SpawnMobj(x + 20 * finecosine[an],
+                          y + 20 * finesine[an], thing->z + fogDelta,
+                          MT_TFOG);
+        S_StartSound(fog, SFX_TELEPORT);
+        if (thing->player && !thing->player->powers[pw_speed])
+        {                       // Freeze player for about .5 sec
+            thing->reactiontime = 18;
+        }
+        thing->angle = angle;
+    }
+    if (thing->flags2 & MF2_FLOORCLIP)
+    {
+        if (thing->z == thing->subsector->sector->floorheight
+            && P_GetThingFloorType(thing) > FLOOR_SOLID)
+        {
+            thing->floorclip = 10 * FRACUNIT;
+        }
+        else
+        {
+            thing->floorclip = 0;
+        }
+    }
+    if (thing->flags & MF_MISSILE)
+    {
+        angle >>= ANGLETOFINESHIFT;
+        thing->momx = FixedMul(thing->info->speed, finecosine[angle]);
+        thing->momy = FixedMul(thing->info->speed, finesine[angle]);
+    }
+    else if (useFog)            // no fog doesn't alter the player's momentums
+    {
+        thing->momx = thing->momy = thing->momz = 0;
+    }
+    return true;
+}
+
+//==========================================================================
+//
+// EV_Teleport
+//
+//==========================================================================
+
+boolean EV_Teleport(int tid, mobj_t * thing, boolean fog)
+{
+    int i;
+    int count;
+    mobj_t *mo;
+    int searcher;
+
+    if (!thing)
+    {                           // Teleport function called with an invalid mobj
+        return false;
+    }
+    if (thing->flags2 & MF2_NOTELEPORT)
+    {
+        return false;
+    }
+    count = 0;
+    searcher = -1;
+    while (P_FindMobjFromTID(tid, &searcher) != NULL)
+    {
+        count++;
+    }
+    if (count == 0)
+    {
+        return false;
+    }
+    count = 1 + (P_Random() % count);
+    searcher = -1;
+    mo = NULL;
+
+    for (i = 0; i < count; i++)
+    {
+        mo = P_FindMobjFromTID(tid, &searcher);
+    }
+    if (mo == NULL)
+    {
+        I_Error("Can't find teleport mapspot\n");
+    }
+    return P_Teleport(thing, mo->x, mo->y, mo->angle, fog);
+}
diff --git a/games/NXDoom/src/hexen/p_things.c b/games/NXDoom/src/hexen/p_things.c
new file mode 100644
index 000000000..12ec8547e
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_things.c
@@ -0,0 +1,537 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static boolean ActivateThing(mobj_t * mobj);
+static boolean DeactivateThing(mobj_t * mobj);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+mobjtype_t TranslateThingType[] = {
+    MT_MAPSPOT,                 // T_NONE
+    MT_CENTAUR,                 // T_CENTAUR
+    MT_CENTAURLEADER,           // T_CENTAURLEADER
+    MT_DEMON,                   // T_DEMON
+    MT_ETTIN,                   // T_ETTIN
+    MT_FIREDEMON,               // T_FIREGARGOYLE
+    MT_SERPENT,                 // T_WATERLURKER
+    MT_SERPENTLEADER,           // T_WATERLURKERLEADER
+    MT_WRAITH,                  // T_WRAITH
+    MT_WRAITHB,                 // T_WRAITHBURIED
+    MT_FIREBALL1,               // T_FIREBALL1
+    MT_MANA1,                   // T_MANA1
+    MT_MANA2,                   // T_MANA2
+    MT_SPEEDBOOTS,              // T_ITEMBOOTS
+    MT_ARTIEGG,                 // T_ITEMEGG
+    MT_ARTIFLY,                 // T_ITEMFLIGHT
+    MT_SUMMONMAULATOR,          // T_ITEMSUMMON
+    MT_TELEPORTOTHER,           // T_ITEMTPORTOTHER
+    MT_ARTITELEPORT,            // T_ITEMTELEPORT
+    MT_BISHOP,                  // T_BISHOP
+    MT_ICEGUY,                  // T_ICEGOLEM
+    MT_BRIDGE,                  // T_BRIDGE
+    MT_BOOSTARMOR,              // T_DRAGONSKINBRACERS
+    MT_HEALINGBOTTLE,           // T_ITEMHEALTHPOTION
+    MT_HEALTHFLASK,             // T_ITEMHEALTHFLASK
+    MT_ARTISUPERHEAL,           // T_ITEMHEALTHFULL
+    MT_BOOSTMANA,               // T_ITEMBOOSTMANA
+    MT_FW_AXE,                  // T_FIGHTERAXE
+    MT_FW_HAMMER,               // T_FIGHTERHAMMER
+    MT_FW_SWORD1,               // T_FIGHTERSWORD1
+    MT_FW_SWORD2,               // T_FIGHTERSWORD2
+    MT_FW_SWORD3,               // T_FIGHTERSWORD3
+    MT_CW_SERPSTAFF,            // T_CLERICSTAFF
+    MT_CW_HOLY1,                // T_CLERICHOLY1
+    MT_CW_HOLY2,                // T_CLERICHOLY2
+    MT_CW_HOLY3,                // T_CLERICHOLY3
+    MT_MW_CONE,                 // T_MAGESHARDS
+    MT_MW_STAFF1,               // T_MAGESTAFF1
+    MT_MW_STAFF2,               // T_MAGESTAFF2
+    MT_MW_STAFF3,               // T_MAGESTAFF3
+    MT_EGGFX,                   // T_MORPHBLAST
+    MT_ROCK1,                   // T_ROCK1
+    MT_ROCK2,                   // T_ROCK2
+    MT_ROCK3,                   // T_ROCK3
+    MT_DIRT1,                   // T_DIRT1
+    MT_DIRT2,                   // T_DIRT2
+    MT_DIRT3,                   // T_DIRT3
+    MT_DIRT4,                   // T_DIRT4
+    MT_DIRT5,                   // T_DIRT5
+    MT_DIRT6,                   // T_DIRT6
+    MT_ARROW,                   // T_ARROW
+    MT_DART,                    // T_DART
+    MT_POISONDART,              // T_POISONDART
+    MT_RIPPERBALL,              // T_RIPPERBALL
+    MT_SGSHARD1,                // T_STAINEDGLASS1
+    MT_SGSHARD2,                // T_STAINEDGLASS2
+    MT_SGSHARD3,                // T_STAINEDGLASS3
+    MT_SGSHARD4,                // T_STAINEDGLASS4
+    MT_SGSHARD5,                // T_STAINEDGLASS5
+    MT_SGSHARD6,                // T_STAINEDGLASS6
+    MT_SGSHARD7,                // T_STAINEDGLASS7
+    MT_SGSHARD8,                // T_STAINEDGLASS8
+    MT_SGSHARD9,                // T_STAINEDGLASS9
+    MT_SGSHARD0,                // T_STAINEDGLASS0
+    MT_PROJECTILE_BLADE,        // T_BLADE
+    MT_ICESHARD,                // T_ICESHARD
+    MT_FLAME_SMALL,             // T_FLAME_SMALL
+    MT_FLAME_LARGE,             // T_FLAME_LARGE
+    MT_ARMOR_1,                 // T_MESHARMOR
+    MT_ARMOR_2,                 // T_FALCONSHIELD
+    MT_ARMOR_3,                 // T_PLATINUMHELM
+    MT_ARMOR_4,                 // T_AMULETOFWARDING
+    MT_ARTIPOISONBAG,           // T_ITEMFLECHETTE
+    MT_ARTITORCH,               // T_ITEMTORCH
+    MT_BLASTRADIUS,             // T_ITEMREPULSION
+    MT_MANA3,                   // T_MANA3
+    MT_ARTIPUZZSKULL,           // T_PUZZSKULL
+    MT_ARTIPUZZGEMBIG,          // T_PUZZGEMBIG
+    MT_ARTIPUZZGEMRED,          // T_PUZZGEMRED
+    MT_ARTIPUZZGEMGREEN1,       // T_PUZZGEMGREEN1
+    MT_ARTIPUZZGEMGREEN2,       // T_PUZZGEMGREEN2
+    MT_ARTIPUZZGEMBLUE1,        // T_PUZZGEMBLUE1
+    MT_ARTIPUZZGEMBLUE2,        // T_PUZZGEMBLUE2
+    MT_ARTIPUZZBOOK1,           // T_PUZZBOOK1
+    MT_ARTIPUZZBOOK2,           // T_PUZZBOOK2
+    MT_KEY1,                    // T_METALKEY
+    MT_KEY2,                    // T_SMALLMETALKEY
+    MT_KEY3,                    // T_AXEKEY
+    MT_KEY4,                    // T_FIREKEY
+    MT_KEY5,                    // T_GREENKEY
+    MT_KEY6,                    // T_MACEKEY
+    MT_KEY7,                    // T_SILVERKEY
+    MT_KEY8,                    // T_RUSTYKEY
+    MT_KEY9,                    // T_HORNKEY
+    MT_KEYA,                    // T_SERPENTKEY
+    MT_WATER_DRIP,              // T_WATERDRIP
+    MT_FLAME_SMALL_TEMP,        // T_TEMPSMALLFLAME
+    MT_FLAME_SMALL,             // T_PERMSMALLFLAME
+    MT_FLAME_LARGE_TEMP,        // T_TEMPLARGEFLAME
+    MT_FLAME_LARGE,             // T_PERMLARGEFLAME
+    MT_DEMON_MASH,              // T_DEMON_MASH
+    MT_DEMON2_MASH,             // T_DEMON2_MASH
+    MT_ETTIN_MASH,              // T_ETTIN_MASH
+    MT_CENTAUR_MASH,            // T_CENTAUR_MASH
+    MT_THRUSTFLOOR_UP,          // T_THRUSTSPIKEUP
+    MT_THRUSTFLOOR_DOWN,        // T_THRUSTSPIKEDOWN
+    MT_WRAITHFX4,               // T_FLESH_DRIP1
+    MT_WRAITHFX5,               // T_FLESH_DRIP2
+    MT_WRAITHFX2                // T_SPARK_DRIP
+};
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// EV_ThingProjectile
+//
+//==========================================================================
+
+boolean EV_ThingProjectile(byte * args, boolean gravity)
+{
+    int tid;
+    angle_t angle;
+    int fineAngle;
+    fixed_t speed;
+    fixed_t vspeed;
+    mobjtype_t moType;
+    mobj_t *mobj;
+    mobj_t *newMobj;
+    int searcher;
+    boolean success;
+
+    success = false;
+    searcher = -1;
+    tid = args[0];
+    moType = TranslateThingType[args[1]];
+    if (nomonsters && (mobjinfo[moType].flags & MF_COUNTKILL))
+    {                           // Don't spawn monsters if -nomonsters
+        return false;
+    }
+    angle = (int) args[2] << 24;
+    fineAngle = angle >> ANGLETOFINESHIFT;
+    speed = (int) args[3] << 13;
+    vspeed = (int) args[4] << 13;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        newMobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, moType);
+        if (newMobj->info->seesound)
+        {
+            S_StartSound(newMobj, newMobj->info->seesound);
+        }
+        newMobj->target = mobj; // Originator
+        newMobj->angle = angle;
+        newMobj->momx = FixedMul(speed, finecosine[fineAngle]);
+        newMobj->momy = FixedMul(speed, finesine[fineAngle]);
+        newMobj->momz = vspeed;
+        newMobj->flags2 |= MF2_DROPPED; // Don't respawn
+        if (gravity == true)
+        {
+            newMobj->flags &= ~MF_NOGRAVITY;
+            newMobj->flags2 |= MF2_LOGRAV;
+        }
+        if (P_CheckMissileSpawn(newMobj) == true)
+        {
+            success = true;
+        }
+    }
+    return success;
+}
+
+//==========================================================================
+//
+// EV_ThingSpawn
+//
+//==========================================================================
+
+boolean EV_ThingSpawn(byte * args, boolean fog)
+{
+    int tid;
+    angle_t angle;
+    mobj_t *mobj;
+    mobj_t *newMobj;
+    mobj_t *fogMobj;
+    mobjtype_t moType;
+    int searcher;
+    boolean success;
+    fixed_t z;
+
+    success = false;
+    searcher = -1;
+    tid = args[0];
+    moType = TranslateThingType[args[1]];
+    if (nomonsters && (mobjinfo[moType].flags & MF_COUNTKILL))
+    {                           // Don't spawn monsters if -nomonsters
+        return false;
+    }
+    angle = (int) args[2] << 24;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        if (mobjinfo[moType].flags2 & MF2_FLOATBOB)
+        {
+            z = mobj->z - mobj->floorz;
+        }
+        else
+        {
+            z = mobj->z;
+        }
+        newMobj = P_SpawnMobj(mobj->x, mobj->y, z, moType);
+        if (P_TestMobjLocation(newMobj) == false)
+        {                       // Didn't fit
+            P_RemoveMobj(newMobj);
+        }
+        else
+        {
+            newMobj->angle = angle;
+            if (fog == true)
+            {
+                fogMobj = P_SpawnMobj(mobj->x, mobj->y,
+                                      mobj->z + TELEFOGHEIGHT, MT_TFOG);
+                S_StartSound(fogMobj, SFX_TELEPORT);
+            }
+            newMobj->flags2 |= MF2_DROPPED;     // Don't respawn
+            if (newMobj->flags2 & MF2_FLOATBOB)
+            {
+                newMobj->special1.i = newMobj->z - newMobj->floorz;
+            }
+            success = true;
+        }
+    }
+    return success;
+}
+
+//==========================================================================
+//
+// EV_ThingActivate
+//
+//==========================================================================
+
+boolean EV_ThingActivate(int tid)
+{
+    mobj_t *mobj;
+    int searcher;
+    boolean success;
+
+    success = false;
+    searcher = -1;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        if (ActivateThing(mobj) == true)
+        {
+            success = true;
+        }
+    }
+    return success;
+}
+
+//==========================================================================
+//
+// EV_ThingDeactivate
+//
+//==========================================================================
+
+boolean EV_ThingDeactivate(int tid)
+{
+    mobj_t *mobj;
+    int searcher;
+    boolean success;
+
+    success = false;
+    searcher = -1;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        if (DeactivateThing(mobj) == true)
+        {
+            success = true;
+        }
+    }
+    return success;
+}
+
+//==========================================================================
+//
+// EV_ThingRemove
+//
+//==========================================================================
+
+boolean EV_ThingRemove(int tid)
+{
+    mobj_t *mobj;
+    int searcher;
+    boolean success;
+
+    success = false;
+    searcher = -1;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        if (mobj->type == MT_BRIDGE)
+        {
+            A_BridgeRemove(mobj);
+            return true;
+        }
+        P_RemoveMobj(mobj);
+        success = true;
+    }
+    return success;
+}
+
+//==========================================================================
+//
+// EV_ThingDestroy
+//
+//==========================================================================
+
+boolean EV_ThingDestroy(int tid)
+{
+    mobj_t *mobj;
+    int searcher;
+    boolean success;
+
+    success = false;
+    searcher = -1;
+    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
+    {
+        if (mobj->flags & MF_SHOOTABLE)
+        {
+            P_DamageMobj(mobj, NULL, NULL, 10000);
+            success = true;
+        }
+    }
+    return success;
+}
+
+//==========================================================================
+//
+// EV_ThingMove
+//
+// arg[0] = tid
+// arg[1] = speed
+// arg[2] = angle (255 = use mobj angle)
+// arg[3] = distance (pixels>>2)
+//
+//==========================================================================
+
+/*
+boolean EV_ThingMove(byte *args)
+{
+	return false;
+}
+*/
+
+//==========================================================================
+//
+// ActivateThing
+//
+//==========================================================================
+
+static boolean ActivateThing(mobj_t * mobj)
+{
+    if (mobj->flags & MF_COUNTKILL)
+    {                           // Monster
+        if (mobj->flags2 & MF2_DORMANT)
+        {
+            mobj->flags2 &= ~MF2_DORMANT;
+            mobj->tics = 1;
+            return true;
+        }
+        return false;
+    }
+    switch (mobj->type)
+    {
+        case MT_ZTWINEDTORCH:
+        case MT_ZTWINEDTORCH_UNLIT:
+            P_SetMobjState(mobj, S_ZTWINEDTORCH_1);
+            S_StartSound(mobj, SFX_IGNITE);
+            break;
+        case MT_ZWALLTORCH:
+        case MT_ZWALLTORCH_UNLIT:
+            P_SetMobjState(mobj, S_ZWALLTORCH1);
+            S_StartSound(mobj, SFX_IGNITE);
+            break;
+        case MT_ZGEMPEDESTAL:
+            P_SetMobjState(mobj, S_ZGEMPEDESTAL2);
+            break;
+        case MT_ZWINGEDSTATUENOSKULL:
+            P_SetMobjState(mobj, S_ZWINGEDSTATUENOSKULL2);
+            break;
+        case MT_THRUSTFLOOR_UP:
+        case MT_THRUSTFLOOR_DOWN:
+            if (mobj->args[0] == 0)
+            {
+                S_StartSound(mobj, SFX_THRUSTSPIKE_LOWER);
+                mobj->flags2 &= ~MF2_DONTDRAW;
+                if (mobj->args[1])
+                    P_SetMobjState(mobj, S_BTHRUSTRAISE1);
+                else
+                    P_SetMobjState(mobj, S_THRUSTRAISE1);
+            }
+            break;
+        case MT_ZFIREBULL:
+        case MT_ZFIREBULL_UNLIT:
+            P_SetMobjState(mobj, S_ZFIREBULL_BIRTH);
+            S_StartSound(mobj, SFX_IGNITE);
+            break;
+        case MT_ZBELL:
+            if (mobj->health > 0)
+            {
+                P_DamageMobj(mobj, NULL, NULL, 10);     // 'ring' the bell
+            }
+            break;
+        case MT_ZCAULDRON:
+        case MT_ZCAULDRON_UNLIT:
+            P_SetMobjState(mobj, S_ZCAULDRON1);
+            S_StartSound(mobj, SFX_IGNITE);
+            break;
+        case MT_FLAME_SMALL:
+            S_StartSound(mobj, SFX_IGNITE);
+            P_SetMobjState(mobj, S_FLAME_SMALL1);
+            break;
+        case MT_FLAME_LARGE:
+            S_StartSound(mobj, SFX_IGNITE);
+            P_SetMobjState(mobj, S_FLAME_LARGE1);
+            break;
+        case MT_BAT_SPAWNER:
+            P_SetMobjState(mobj, S_SPAWNBATS1);
+            break;
+        default:
+            return false;
+            break;
+    }
+    return true;
+}
+
+//==========================================================================
+//
+// DeactivateThing
+//
+//==========================================================================
+
+static boolean DeactivateThing(mobj_t * mobj)
+{
+    if (mobj->flags & MF_COUNTKILL)
+    {                           // Monster
+        if (!(mobj->flags2 & MF2_DORMANT))
+        {
+            mobj->flags2 |= MF2_DORMANT;
+            mobj->tics = -1;
+            return true;
+        }
+        return false;
+    }
+    switch (mobj->type)
+    {
+        case MT_ZTWINEDTORCH:
+        case MT_ZTWINEDTORCH_UNLIT:
+            P_SetMobjState(mobj, S_ZTWINEDTORCH_UNLIT);
+            break;
+        case MT_ZWALLTORCH:
+        case MT_ZWALLTORCH_UNLIT:
+            P_SetMobjState(mobj, S_ZWALLTORCH_U);
+            break;
+        case MT_THRUSTFLOOR_UP:
+        case MT_THRUSTFLOOR_DOWN:
+            if (mobj->args[0] == 1)
+            {
+                S_StartSound(mobj, SFX_THRUSTSPIKE_RAISE);
+                if (mobj->args[1])
+                    P_SetMobjState(mobj, S_BTHRUSTLOWER);
+                else
+                    P_SetMobjState(mobj, S_THRUSTLOWER);
+            }
+            break;
+        case MT_ZFIREBULL:
+        case MT_ZFIREBULL_UNLIT:
+            P_SetMobjState(mobj, S_ZFIREBULL_DEATH);
+            break;
+        case MT_ZCAULDRON:
+        case MT_ZCAULDRON_UNLIT:
+            P_SetMobjState(mobj, S_ZCAULDRON_U);
+            break;
+        case MT_FLAME_SMALL:
+            P_SetMobjState(mobj, S_FLAME_SDORM1);
+            break;
+        case MT_FLAME_LARGE:
+            P_SetMobjState(mobj, S_FLAME_LDORM1);
+            break;
+        case MT_BAT_SPAWNER:
+            P_SetMobjState(mobj, S_SPAWNBATS_OFF);
+            break;
+        default:
+            return false;
+            break;
+    }
+    return true;
+}
diff --git a/games/NXDoom/src/hexen/p_tick.c b/games/NXDoom/src/hexen/p_tick.c
new file mode 100644
index 000000000..3d3dd389c
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_tick.c
@@ -0,0 +1,151 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "p_local.h"
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void RunThinkers(void);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+int leveltime;
+int TimerGame;
+thinker_t thinkercap;           // The head and tail of the thinker list
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// P_Ticker
+//
+//==========================================================================
+
+void P_Ticker(void)
+{
+    int i;
+
+    if (paused)
+    {
+        return;
+    }
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (playeringame[i])
+        {
+            P_PlayerThink(&players[i]);
+        }
+    }
+    if (TimerGame)
+    {
+        if (!--TimerGame)
+        {
+            G_Completed(P_TranslateMap(P_GetMapNextMap(gamemap)), 0);
+        }
+    }
+    RunThinkers();
+    P_UpdateSpecials();
+    P_AnimateSurfaces();
+    leveltime++;
+}
+
+//==========================================================================
+//
+// RunThinkers
+//
+//==========================================================================
+
+static void RunThinkers(void)
+{
+    thinker_t *currentthinker, *nextthinker;
+
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+        if (currentthinker->function == (think_t) - 1)
+        {                       // Time to remove it
+            nextthinker = currentthinker->next;
+            currentthinker->next->prev = currentthinker->prev;
+            currentthinker->prev->next = currentthinker->next;
+            Z_Free(currentthinker);
+        }
+        else
+        {
+            if (currentthinker->function)
+                currentthinker->function(currentthinker);
+            nextthinker = currentthinker->next;
+        }
+
+        currentthinker = nextthinker;
+    }
+}
+
+//==========================================================================
+//
+// P_InitThinkers
+//
+//==========================================================================
+
+void P_InitThinkers(void)
+{
+    thinkercap.prev = thinkercap.next = &thinkercap;
+}
+
+//==========================================================================
+//
+// P_AddThinker
+//
+// Adds a new thinker at the end of the list.
+//
+//==========================================================================
+
+void P_AddThinker(thinker_t * thinker)
+{
+    thinkercap.prev->next = thinker;
+    thinker->next = &thinkercap;
+    thinker->prev = thinkercap.prev;
+    thinkercap.prev = thinker;
+}
+
+//==========================================================================
+//
+// P_RemoveThinker
+//
+// Deallocation is lazy -- it will not actually be freed until its
+// thinking turn comes up.
+//
+//==========================================================================
+
+void P_RemoveThinker(thinker_t * thinker)
+{
+    thinker->function = (think_t) - 1;
+}
diff --git a/games/NXDoom/src/hexen/p_user.c b/games/NXDoom/src/hexen/p_user.c
new file mode 100644
index 000000000..52986bd23
--- /dev/null
+++ b/games/NXDoom/src/hexen/p_user.c
@@ -0,0 +1,1643 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+
+// Macros
+
+#define MAXBOB 0x100000         // 16 pixels of bob
+
+// Data
+
+boolean onground;
+int newtorch;                   // used in the torch flicker effect.
+int newtorchdelta;
+
+int PStateNormal[NUMCLASSES] = {
+    S_FPLAY,
+    S_CPLAY,
+    S_MPLAY,
+    S_PIGPLAY
+};
+
+int PStateRun[NUMCLASSES] = {
+    S_FPLAY_RUN1,
+    S_CPLAY_RUN1,
+    S_MPLAY_RUN1,
+    S_PIGPLAY_RUN1
+};
+
+int PStateAttack[NUMCLASSES] = {
+    S_FPLAY_ATK1,
+    S_CPLAY_ATK1,
+    S_MPLAY_ATK1,
+    S_PIGPLAY_ATK1
+};
+
+int PStateAttackEnd[NUMCLASSES] = {
+    S_FPLAY_ATK2,
+    S_CPLAY_ATK3,
+    S_MPLAY_ATK2,
+    S_PIGPLAY_ATK1
+};
+
+int ArmorMax[NUMCLASSES] = { 20, 18, 16, 1 };
+
+/*
+==================
+=
+= P_Thrust
+=
+= moves the given origin along a given angle
+=
+==================
+*/
+
+void P_Thrust(player_t * player, angle_t angle, fixed_t move)
+{
+    angle >>= ANGLETOFINESHIFT;
+    if (player->powers[pw_flight] && !(player->mo->z <= player->mo->floorz))
+    {
+        player->mo->momx += FixedMul(move, finecosine[angle]);
+        player->mo->momy += FixedMul(move, finesine[angle]);
+    }
+    else if (P_GetThingFloorType(player->mo) == FLOOR_ICE)      // Friction_Low
+    {
+        player->mo->momx += FixedMul(move >> 1, finecosine[angle]);
+        player->mo->momy += FixedMul(move >> 1, finesine[angle]);
+    }
+    else
+    {
+        player->mo->momx += FixedMul(move, finecosine[angle]);
+        player->mo->momy += FixedMul(move, finesine[angle]);
+    }
+}
+
+
+/*
+==================
+=
+= P_CalcHeight
+=
+=Calculate the walking / running height adjustment
+=
+==================
+*/
+
+void P_CalcHeight(player_t * player)
+{
+    int angle;
+    fixed_t bob;
+
+//
+// regular movement bobbing (needs to be calculated for gun swing even
+// if not on ground)
+// OPTIMIZE: tablify angle
+
+    player->bob = FixedMul(player->mo->momx, player->mo->momx) +
+        FixedMul(player->mo->momy, player->mo->momy);
+    player->bob >>= 2;
+    if (player->bob > MAXBOB)
+        player->bob = MAXBOB;
+    if (player->mo->flags2 & MF2_FLY && !onground)
+    {
+        player->bob = FRACUNIT / 2;
+    }
+
+    if ((player->cheats & CF_NOMOMENTUM))
+    {
+        player->viewz = player->mo->z + VIEWHEIGHT;
+        if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
+            player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
+        player->viewz = player->mo->z + player->viewheight;
+        return;
+    }
+
+    angle = (FINEANGLES / 20 * leveltime) & FINEMASK;
+    bob = FixedMul(player->bob / 2, finesine[angle]);
+
+//
+// move viewheight
+//
+    if (player->playerstate == PST_LIVE)
+    {
+        player->viewheight += player->deltaviewheight;
+        if (player->viewheight > VIEWHEIGHT)
+        {
+            player->viewheight = VIEWHEIGHT;
+            player->deltaviewheight = 0;
+        }
+        if (player->viewheight < VIEWHEIGHT / 2)
+        {
+            player->viewheight = VIEWHEIGHT / 2;
+            if (player->deltaviewheight <= 0)
+                player->deltaviewheight = 1;
+        }
+
+        if (player->deltaviewheight)
+        {
+            player->deltaviewheight += FRACUNIT / 4;
+            if (!player->deltaviewheight)
+                player->deltaviewheight = 1;
+        }
+    }
+
+    if (player->morphTics)
+    {
+        player->viewz = player->mo->z + player->viewheight - (20 * FRACUNIT);
+    }
+    else
+    {
+        player->viewz = player->mo->z + player->viewheight + bob;
+    }
+    if (player->mo->floorclip && player->playerstate != PST_DEAD
+        && player->mo->z <= player->mo->floorz)
+    {
+        player->viewz -= player->mo->floorclip;
+    }
+    if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
+    {
+        player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
+    }
+    if (player->viewz < player->mo->floorz + 4 * FRACUNIT)
+    {
+        player->viewz = player->mo->floorz + 4 * FRACUNIT;
+    }
+}
+
+/*
+=================
+=
+= P_MovePlayer
+=
+=================
+*/
+
+void P_MovePlayer(player_t * player)
+{
+    int look;
+    int fly;
+    ticcmd_t *cmd;
+
+    cmd = &player->cmd;
+    player->mo->angle += (cmd->angleturn << 16);
+
+    onground = (player->mo->z <= player->mo->floorz
+                || (player->mo->flags2 & MF2_ONMOBJ));
+
+    if (cmd->forwardmove)
+    {
+        if (onground || player->mo->flags2 & MF2_FLY)
+        {
+            P_Thrust(player, player->mo->angle, cmd->forwardmove * 2048);
+        }
+        else
+        {
+            P_Thrust(player, player->mo->angle, FRACUNIT >> 8);
+        }
+    }
+    if (cmd->sidemove)
+    {
+        if (onground || player->mo->flags2 & MF2_FLY)
+        {
+            P_Thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2048);
+        }
+        else
+        {
+            P_Thrust(player, player->mo->angle, FRACUNIT >> 8);
+        }
+    }
+    if (cmd->forwardmove || cmd->sidemove)
+    {
+        if (player->mo->state == &states[PStateNormal[player->class]])
+        {
+            P_SetMobjState(player->mo, PStateRun[player->class]);
+        }
+    }
+
+    look = cmd->lookfly & 15;
+    if (look > 7)
+    {
+        look -= 16;
+    }
+    if (look)
+    {
+        if (look == TOCENTER)
+        {
+            player->centering = true;
+        }
+        else
+        {
+            player->lookdir += 5 * look;
+            if (player->lookdir > 90 || player->lookdir < -110)
+            {
+                player->lookdir -= 5 * look;
+            }
+        }
+    }
+    if (player->centering)
+    {
+        if (player->lookdir > 0)
+        {
+            player->lookdir -= 8;
+        }
+        else if (player->lookdir < 0)
+        {
+            player->lookdir += 8;
+        }
+        if (abs(player->lookdir) < 8)
+        {
+            player->lookdir = 0;
+            player->centering = false;
+        }
+    }
+    fly = cmd->lookfly >> 4;
+    if (fly > 7)
+    {
+        fly -= 16;
+    }
+    if (fly && player->powers[pw_flight])
+    {
+        if (fly != TOCENTER)
+        {
+            player->flyheight = fly * 2;
+            if (!(player->mo->flags2 & MF2_FLY))
+            {
+                player->mo->flags2 |= MF2_FLY;
+                player->mo->flags |= MF_NOGRAVITY;
+                if (player->mo->momz <= -39 * FRACUNIT)
+                {               // stop falling scream
+                    S_StopSound(player->mo);
+                }
+            }
+        }
+        else
+        {
+            player->mo->flags2 &= ~MF2_FLY;
+            player->mo->flags &= ~MF_NOGRAVITY;
+        }
+    }
+    else if (fly > 0)
+    {
+        P_PlayerUseArtifact(player, arti_fly);
+    }
+    if (player->mo->flags2 & MF2_FLY)
+    {
+        player->mo->momz = player->flyheight * FRACUNIT;
+        if (player->flyheight)
+        {
+            player->flyheight /= 2;
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_DeathThink
+//
+//==========================================================================
+
+void P_DeathThink(player_t * player)
+{
+    int dir;
+    angle_t delta;
+    int lookDelta;
+
+    P_MovePsprites(player);
+
+    onground = (player->mo->z <= player->mo->floorz);
+    if (player->mo->type == MT_BLOODYSKULL || player->mo->type == MT_ICECHUNK)
+    {                           // Flying bloody skull or flying ice chunk
+        player->viewheight = 6 * FRACUNIT;
+        player->deltaviewheight = 0;
+        //player->damagecount = 20;
+        if (onground)
+        {
+            if (player->lookdir < 60)
+            {
+                lookDelta = (60 - player->lookdir) / 8;
+                if (lookDelta < 1 && (leveltime & 1))
+                {
+                    lookDelta = 1;
+                }
+                else if (lookDelta > 6)
+                {
+                    lookDelta = 6;
+                }
+                player->lookdir += lookDelta;
+            }
+        }
+    }
+    else if (!(player->mo->flags2 & MF2_ICEDAMAGE))
+    {                           // Fall to ground (if not frozen)
+        player->deltaviewheight = 0;
+        if (player->viewheight > 6 * FRACUNIT)
+        {
+            player->viewheight -= FRACUNIT;
+        }
+        if (player->viewheight < 6 * FRACUNIT)
+        {
+            player->viewheight = 6 * FRACUNIT;
+        }
+        if (player->lookdir > 0)
+        {
+            player->lookdir -= 6;
+        }
+        else if (player->lookdir < 0)
+        {
+            player->lookdir += 6;
+        }
+        if (abs(player->lookdir) < 6)
+        {
+            player->lookdir = 0;
+        }
+    }
+    P_CalcHeight(player);
+
+    if (player->attacker && player->attacker != player->mo)
+    {                           // Watch killer
+        dir = P_FaceMobj(player->mo, player->attacker, &delta);
+        if (delta < ANG1 * 10)
+        {                       // Looking at killer, so fade damage and poison counters
+            if (player->damagecount)
+            {
+                player->damagecount--;
+            }
+            if (player->poisoncount)
+            {
+                player->poisoncount--;
+            }
+        }
+        delta = delta / 8;
+        if (delta > ANG1 * 5)
+        {
+            delta = ANG1 * 5;
+        }
+        if (dir)
+        {                       // Turn clockwise
+            player->mo->angle += delta;
+        }
+        else
+        {                       // Turn counter clockwise
+            player->mo->angle -= delta;
+        }
+    }
+    else if (player->damagecount || player->poisoncount)
+    {
+        if (player->damagecount)
+        {
+            player->damagecount--;
+        }
+        else
+        {
+            player->poisoncount--;
+        }
+    }
+
+    if (player->cmd.buttons & BT_USE)
+    {
+        if (player == &players[consoleplayer])
+        {
+            I_SetPalette((byte *) W_CacheLumpName("PLAYPAL", PU_CACHE));
+            inv_ptr = 0;
+            curpos = 0;
+            newtorch = 0;
+            newtorchdelta = 0;
+        }
+        player->playerstate = PST_REBORN;
+        player->mo->special1.i = player->class;
+        if (player->mo->special1.i > 2)
+        {
+            player->mo->special1.i = 0;
+        }
+        // Let the mobj know the player has entered the reborn state.  Some
+        // mobjs need to know when it's ok to remove themselves.
+        player->mo->special2.i = 666;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_MorphPlayerThink
+//
+//----------------------------------------------------------------------------
+
+void P_MorphPlayerThink(player_t * player)
+{
+    mobj_t *pmo;
+
+    if (player->morphTics & 15)
+    {
+        return;
+    }
+    pmo = player->mo;
+    if (!(pmo->momx + pmo->momy) && P_Random() < 64)
+    {                           // Snout sniff
+        P_SetPspriteNF(player, ps_weapon, S_SNOUTATK2);
+        S_StartSound(pmo, SFX_PIG_ACTIVE1);     // snort
+        return;
+    }
+    if (P_Random() < 48)
+    {
+        if (P_Random() < 128)
+        {
+            S_StartSound(pmo, SFX_PIG_ACTIVE1);
+        }
+        else
+        {
+            S_StartSound(pmo, SFX_PIG_ACTIVE2);
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_GetPlayerNum
+//
+//----------------------------------------------------------------------------
+
+int P_GetPlayerNum(player_t * player)
+{
+    int i;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (player == &players[i])
+        {
+            return (i);
+        }
+    }
+    return (0);
+}
+
+//----------------------------------------------------------------------------
+//
+// FUNC P_UndoPlayerMorph
+//
+//----------------------------------------------------------------------------
+
+boolean P_UndoPlayerMorph(player_t * player)
+{
+    mobj_t *fog;
+    mobj_t *mo;
+    mobj_t *pmo;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    angle_t angle;
+    int playerNum;
+    weapontype_t weapon;
+    int oldFlags;
+    int oldFlags2;
+    int oldBeast;
+
+    pmo = player->mo;
+    x = pmo->x;
+    y = pmo->y;
+    z = pmo->z;
+    angle = pmo->angle;
+    weapon = pmo->special1.i;
+    oldFlags = pmo->flags;
+    oldFlags2 = pmo->flags2;
+    oldBeast = pmo->type;
+    P_SetMobjState(pmo, S_FREETARGMOBJ);
+    playerNum = P_GetPlayerNum(player);
+    switch (PlayerClass[playerNum])
+    {
+        case PCLASS_FIGHTER:
+            mo = P_SpawnMobj(x, y, z, MT_PLAYER_FIGHTER);
+            break;
+        case PCLASS_CLERIC:
+            mo = P_SpawnMobj(x, y, z, MT_PLAYER_CLERIC);
+            break;
+        case PCLASS_MAGE:
+            mo = P_SpawnMobj(x, y, z, MT_PLAYER_MAGE);
+            break;
+        default:
+            I_Error("P_UndoPlayerMorph:  Unknown player class %d\n",
+                    player->class);
+            return false;
+    }
+    if (P_TestMobjLocation(mo) == false)
+    {                           // Didn't fit
+        P_RemoveMobj(mo);
+        mo = P_SpawnMobj(x, y, z, oldBeast);
+        mo->angle = angle;
+        mo->health = player->health;
+        mo->special1.i = weapon;
+        mo->player = player;
+        mo->flags = oldFlags;
+        mo->flags2 = oldFlags2;
+        player->mo = mo;
+        player->morphTics = 2 * 35;
+        return (false);
+    }
+    if (player->class == PCLASS_FIGHTER)
+    {
+        // The first type should be blue, and the third should be the
+        // Fighter's original gold color
+        if (playerNum == 0)
+        {
+            mo->flags |= 2 << MF_TRANSSHIFT;
+        }
+        else if (playerNum != 2)
+        {
+            mo->flags |= playerNum << MF_TRANSSHIFT;
+        }
+    }
+    else if (playerNum)
+    {                           // Set color translation bits for player sprites
+        mo->flags |= playerNum << MF_TRANSSHIFT;
+    }
+    mo->angle = angle;
+    mo->player = player;
+    mo->reactiontime = 18;
+    if (oldFlags2 & MF2_FLY)
+    {
+        mo->flags2 |= MF2_FLY;
+        mo->flags |= MF_NOGRAVITY;
+    }
+    player->morphTics = 0;
+    player->health = mo->health = MAXHEALTH;
+    player->mo = mo;
+    player->class = PlayerClass[playerNum];
+    angle >>= ANGLETOFINESHIFT;
+    fog = P_SpawnMobj(x + 20 * finecosine[angle],
+                      y + 20 * finesine[angle], z + TELEFOGHEIGHT, MT_TFOG);
+    S_StartSound(fog, SFX_TELEPORT);
+    P_PostMorphWeapon(player, weapon);
+    return (true);
+}
+
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerThink
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerThink(player_t * player)
+{
+    ticcmd_t *cmd;
+    weapontype_t newweapon;
+    int floorType;
+    mobj_t *pmo;
+
+    // No-clip cheat
+    if (player->cheats & CF_NOCLIP)
+    {
+        player->mo->flags |= MF_NOCLIP;
+    }
+    else
+    {
+        player->mo->flags &= ~MF_NOCLIP;
+    }
+    cmd = &player->cmd;
+    if (player->mo->flags & MF_JUSTATTACKED)
+    {                           // Gauntlets attack auto forward motion
+        cmd->angleturn = 0;
+        cmd->forwardmove = 0xc800 / 512;
+        cmd->sidemove = 0;
+        player->mo->flags &= ~MF_JUSTATTACKED;
+    }
+// messageTics is above the rest of the counters so that messages will 
+//              go away, even in death.
+    player->messageTics--;      // Can go negative
+    if (!player->messageTics || player->messageTics == -1)
+    {                           // Refresh the screen when a message goes away
+        player->ultimateMessage = false;        // clear out any chat messages.
+        player->yellowMessage = false;
+        if (player == &players[consoleplayer])
+        {
+            BorderTopRefresh = true;
+        }
+    }
+    player->worldTimer++;
+    if (player->playerstate == PST_DEAD)
+    {
+        P_DeathThink(player);
+        return;
+    }
+    if (player->jumpTics)
+    {
+        player->jumpTics--;
+    }
+    if (player->morphTics)
+    {
+        P_MorphPlayerThink(player);
+    }
+    // Handle movement
+    if (player->mo->reactiontime)
+    {                           // Player is frozen
+        player->mo->reactiontime--;
+    }
+    else
+    {
+        P_MovePlayer(player);
+        pmo = player->mo;
+        if (player->powers[pw_speed] && !(leveltime & 1)
+            && P_AproxDistance(pmo->momx, pmo->momy) > 12 * FRACUNIT)
+        {
+            mobj_t *speedMo;
+            int playerNum;
+
+            speedMo = P_SpawnMobj(pmo->x, pmo->y, pmo->z, MT_PLAYER_SPEED);
+            if (speedMo)
+            {
+                speedMo->angle = pmo->angle;
+                playerNum = P_GetPlayerNum(player);
+                if (player->class == PCLASS_FIGHTER)
+                {
+                    // The first type should be blue, and the 
+                    // third should be the Fighter's original gold color
+                    if (playerNum == 0)
+                    {
+                        speedMo->flags |= 2 << MF_TRANSSHIFT;
+                    }
+                    else if (playerNum != 2)
+                    {
+                        speedMo->flags |= playerNum << MF_TRANSSHIFT;
+                    }
+                }
+                else if (playerNum)
+                {               // Set color translation bits for player sprites
+                    speedMo->flags |= playerNum << MF_TRANSSHIFT;
+                }
+                speedMo->target = pmo;
+                speedMo->special1.i = player->class;
+                if (speedMo->special1.i > 2)
+                {
+                    speedMo->special1.i = 0;
+                }
+                speedMo->sprite = pmo->sprite;
+                speedMo->floorclip = pmo->floorclip;
+                if (player == &players[consoleplayer])
+                {
+                    speedMo->flags2 |= MF2_DONTDRAW;
+                }
+            }
+        }
+    }
+    P_CalcHeight(player);
+    if (player->mo->subsector->sector->special)
+    {
+        P_PlayerInSpecialSector(player);
+    }
+    if ((floorType = P_GetThingFloorType(player->mo)) != FLOOR_SOLID)
+    {
+        P_PlayerOnSpecialFlat(player, floorType);
+    }
+    switch (player->class)
+    {
+        case PCLASS_FIGHTER:
+            if (player->mo->momz <= -35 * FRACUNIT
+                && player->mo->momz >= -40 * FRACUNIT && !player->morphTics
+                && !S_GetSoundPlayingInfo(player->mo,
+                                          SFX_PLAYER_FIGHTER_FALLING_SCREAM))
+            {
+                S_StartSound(player->mo, SFX_PLAYER_FIGHTER_FALLING_SCREAM);
+            }
+            break;
+        case PCLASS_CLERIC:
+            if (player->mo->momz <= -35 * FRACUNIT
+                && player->mo->momz >= -40 * FRACUNIT && !player->morphTics
+                && !S_GetSoundPlayingInfo(player->mo,
+                                          SFX_PLAYER_CLERIC_FALLING_SCREAM))
+            {
+                S_StartSound(player->mo, SFX_PLAYER_CLERIC_FALLING_SCREAM);
+            }
+            break;
+        case PCLASS_MAGE:
+            if (player->mo->momz <= -35 * FRACUNIT
+                && player->mo->momz >= -40 * FRACUNIT && !player->morphTics
+                && !S_GetSoundPlayingInfo(player->mo,
+                                          SFX_PLAYER_MAGE_FALLING_SCREAM))
+            {
+                S_StartSound(player->mo, SFX_PLAYER_MAGE_FALLING_SCREAM);
+            }
+            break;
+        default:
+            break;
+    }
+    if (cmd->arti)
+    {                           // Use an artifact
+        if ((cmd->arti & AFLAG_JUMP) && onground && !player->jumpTics)
+        {
+            if (player->morphTics)
+            {
+                player->mo->momz = 6 * FRACUNIT;
+            }
+            else
+            {
+                player->mo->momz = 9 * FRACUNIT;
+            }
+            player->mo->flags2 &= ~MF2_ONMOBJ;
+            player->jumpTics = 18;
+        }
+        else if (cmd->arti & AFLAG_SUICIDE)
+        {
+            P_DamageMobj(player->mo, NULL, NULL, 10000);
+        }
+        if (cmd->arti == NUMARTIFACTS)
+        {                       // use one of each artifact (except puzzle artifacts)
+            int i;
+
+            for (i = 1; i < arti_firstpuzzitem; i++)
+            {
+                P_PlayerUseArtifact(player, i);
+            }
+        }
+        else
+        {
+            P_PlayerUseArtifact(player, cmd->arti & AFLAG_MASK);
+        }
+    }
+    // Check for weapon change
+    if (cmd->buttons & BT_SPECIAL)
+    {                           // A special event has no other buttons
+        cmd->buttons = 0;
+    }
+    if (cmd->buttons & BT_CHANGE && !player->morphTics)
+    {
+        // The actual changing of the weapon is done when the weapon
+        // psprite can do it (A_WeaponReady), so it doesn't happen in
+        // the middle of an attack.
+        newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
+        if (player->weaponowned[newweapon]
+            && newweapon != player->readyweapon)
+        {
+            player->pendingweapon = newweapon;
+        }
+    }
+    // Check for use
+    if (cmd->buttons & BT_USE)
+    {
+        if (!player->usedown)
+        {
+            P_UseLines(player);
+            player->usedown = true;
+        }
+    }
+    else
+    {
+        player->usedown = false;
+    }
+    // Morph counter
+    if (player->morphTics)
+    {
+        if (!--player->morphTics)
+        {                       // Attempt to undo the pig
+            P_UndoPlayerMorph(player);
+        }
+    }
+    // Cycle psprites
+    P_MovePsprites(player);
+    // Other Counters
+    if (player->powers[pw_invulnerability])
+    {
+        if (player->class == PCLASS_CLERIC)
+        {
+            if (!(leveltime & 7) && player->mo->flags & MF_SHADOW
+                && !(player->mo->flags2 & MF2_DONTDRAW))
+            {
+                player->mo->flags &= ~MF_SHADOW;
+                if (!(player->mo->flags & MF_ALTSHADOW))
+                {
+                    player->mo->flags2 |= MF2_DONTDRAW | MF2_NONSHOOTABLE;
+                }
+            }
+            if (!(leveltime & 31))
+            {
+                if (player->mo->flags2 & MF2_DONTDRAW)
+                {
+                    if (!(player->mo->flags & MF_SHADOW))
+                    {
+                        player->mo->flags |= MF_SHADOW | MF_ALTSHADOW;
+                    }
+                    else
+                    {
+                        player->mo->flags2 &=
+                            ~(MF2_DONTDRAW | MF2_NONSHOOTABLE);
+                    }
+                }
+                else
+                {
+                    player->mo->flags |= MF_SHADOW;
+                    player->mo->flags &= ~MF_ALTSHADOW;
+                }
+            }
+        }
+        if (!(--player->powers[pw_invulnerability]))
+        {
+            player->mo->flags2 &= ~(MF2_INVULNERABLE | MF2_REFLECTIVE);
+            if (player->class == PCLASS_CLERIC)
+            {
+                player->mo->flags2 &= ~(MF2_DONTDRAW | MF2_NONSHOOTABLE);
+                player->mo->flags &= ~(MF_SHADOW | MF_ALTSHADOW);
+            }
+        }
+    }
+    if (player->powers[pw_minotaur])
+    {
+        player->powers[pw_minotaur]--;
+    }
+    if (player->powers[pw_infrared])
+    {
+        player->powers[pw_infrared]--;
+    }
+    if (player->powers[pw_flight] && netgame)
+    {
+        if (!--player->powers[pw_flight])
+        {
+            if (player->mo->z != player->mo->floorz)
+            {
+                // haleyjd: removed externdriver crap
+                player->centering = true;
+            }
+            player->mo->flags2 &= ~MF2_FLY;
+            player->mo->flags &= ~MF_NOGRAVITY;
+            BorderTopRefresh = true;    //make sure the sprite's cleared out
+        }
+    }
+    if (player->powers[pw_speed])
+    {
+        player->powers[pw_speed]--;
+    }
+    if (player->damagecount)
+    {
+        player->damagecount--;
+    }
+    if (player->bonuscount)
+    {
+        player->bonuscount--;
+    }
+    if (player->poisoncount && !(leveltime & 15))
+    {
+        player->poisoncount -= 5;
+        if (player->poisoncount < 0)
+        {
+            player->poisoncount = 0;
+        }
+        P_PoisonDamage(player, player->poisoner, 1, true);
+    }
+    // Colormaps
+//      if(player->powers[pw_invulnerability])
+//      {
+//              if(player->powers[pw_invulnerability] > BLINKTHRESHOLD
+//                      || (player->powers[pw_invulnerability]&8))
+//              {
+//                      player->fixedcolormap = INVERSECOLORMAP;
+//              }
+//              else
+//              {
+//                      player->fixedcolormap = 0;
+//              }
+//      }
+//      else 
+    if (player->powers[pw_infrared])
+    {
+        if (player->powers[pw_infrared] <= BLINKTHRESHOLD)
+        {
+            if (player->powers[pw_infrared] & 8)
+            {
+                player->fixedcolormap = 0;
+            }
+            else
+            {
+                player->fixedcolormap = 1;
+            }
+        }
+        else if (!(leveltime & 16) && player == &players[consoleplayer])
+        {
+            if (newtorch)
+            {
+                if (player->fixedcolormap + newtorchdelta > 7
+                    || player->fixedcolormap + newtorchdelta < 1
+                    || newtorch == player->fixedcolormap)
+                {
+                    newtorch = 0;
+                }
+                else
+                {
+                    player->fixedcolormap += newtorchdelta;
+                }
+            }
+            else
+            {
+                newtorch = (M_Random() & 7) + 1;
+                newtorchdelta = (newtorch == player->fixedcolormap) ?
+                    0 : ((newtorch > player->fixedcolormap) ? 1 : -1);
+            }
+        }
+    }
+    else
+    {
+        player->fixedcolormap = 0;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ArtiTele
+//
+//----------------------------------------------------------------------------
+
+void P_ArtiTele(player_t * player)
+{
+    int i;
+    int selections;
+    fixed_t destX;
+    fixed_t destY;
+    angle_t destAngle;
+
+    if (deathmatch)
+    {
+        selections = deathmatch_p - deathmatchstarts;
+        i = P_Random() % selections;
+        destX = deathmatchstarts[i].x << FRACBITS;
+        destY = deathmatchstarts[i].y << FRACBITS;
+        destAngle = ANG45 * (deathmatchstarts[i].angle / 45);
+    }
+    else
+    {
+        destX = playerstarts[0][0].x << FRACBITS;
+        destY = playerstarts[0][0].y << FRACBITS;
+        destAngle = ANG45 * (playerstarts[0][0].angle / 45);
+    }
+    P_Teleport(player->mo, destX, destY, destAngle, true);
+    if (player->morphTics)
+    {                           // Teleporting away will undo any morph effects (pig)
+        P_UndoPlayerMorph(player);
+    }
+    //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
+}
+
+
+//----------------------------------------------------------------------------
+//
+// PROC P_ArtiTeleportOther
+//
+//----------------------------------------------------------------------------
+
+void P_ArtiTeleportOther(player_t * player)
+{
+    mobj_t *mo;
+
+    mo = P_SpawnPlayerMissile(player->mo, MT_TELOTHER_FX1);
+    if (mo)
+    {
+        mo->target = player->mo;
+    }
+}
+
+
+void P_TeleportToPlayerStarts(mobj_t * victim)
+{
+    int i, selections = 0;
+    fixed_t destX, destY;
+    angle_t destAngle;
+
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[i])
+            continue;
+        selections++;
+    }
+    i = P_Random() % selections;
+    destX = playerstarts[0][i].x << FRACBITS;
+    destY = playerstarts[0][i].y << FRACBITS;
+    destAngle = ANG45 * (playerstarts[0][i].angle / 45);
+    P_Teleport(victim, destX, destY, destAngle, true);
+    //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
+}
+
+void P_TeleportToDeathmatchStarts(mobj_t * victim)
+{
+    int i, selections;
+    fixed_t destX, destY;
+    angle_t destAngle;
+
+    selections = deathmatch_p - deathmatchstarts;
+    if (selections)
+    {
+        i = P_Random() % selections;
+        destX = deathmatchstarts[i].x << FRACBITS;
+        destY = deathmatchstarts[i].y << FRACBITS;
+        destAngle = ANG45 * (deathmatchstarts[i].angle / 45);
+        P_Teleport(victim, destX, destY, destAngle, true);
+        //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
+    }
+    else
+    {
+        P_TeleportToPlayerStarts(victim);
+    }
+}
+
+
+
+//----------------------------------------------------------------------------
+//
+// PROC P_TeleportOther
+//
+//----------------------------------------------------------------------------
+void P_TeleportOther(mobj_t * victim)
+{
+    if (victim->player)
+    {
+        if (deathmatch)
+            P_TeleportToDeathmatchStarts(victim);
+        else
+            P_TeleportToPlayerStarts(victim);
+    }
+    else
+    {
+        // If death action, run it upon teleport
+        if (victim->flags & MF_COUNTKILL && victim->special)
+        {
+            P_RemoveMobjFromTIDList(victim);
+            P_ExecuteLineSpecial(victim->special, victim->args,
+                                 NULL, 0, victim);
+            victim->special = 0;
+        }
+
+        // Send all monsters to deathmatch spots
+        P_TeleportToDeathmatchStarts(victim);
+    }
+}
+
+
+
+#define BLAST_RADIUS_DIST	255*FRACUNIT
+#define BLAST_SPEED			20*FRACUNIT
+#define BLAST_FULLSTRENGTH	255
+
+void ResetBlasted(mobj_t * mo)
+{
+    mo->flags2 &= ~MF2_BLASTED;
+    if (!(mo->flags & MF_ICECORPSE))
+    {
+        mo->flags2 &= ~MF2_SLIDE;
+    }
+}
+
+void P_BlastMobj(mobj_t * source, mobj_t * victim, fixed_t strength)
+{
+    angle_t angle, ang;
+    mobj_t *mo;
+    fixed_t x, y, z;
+
+    angle = R_PointToAngle2(source->x, source->y, victim->x, victim->y);
+    angle >>= ANGLETOFINESHIFT;
+    if (strength < BLAST_FULLSTRENGTH)
+    {
+        victim->momx = FixedMul(strength, finecosine[angle]);
+        victim->momy = FixedMul(strength, finesine[angle]);
+        if (victim->player)
+        {
+            // Players handled automatically
+        }
+        else
+        {
+            victim->flags2 |= MF2_SLIDE;
+            victim->flags2 |= MF2_BLASTED;
+        }
+    }
+    else                        // full strength blast from artifact
+    {
+        if (victim->flags & MF_MISSILE)
+        {
+            switch (victim->type)
+            {
+                case MT_SORCBALL1:     // don't blast sorcerer balls
+                case MT_SORCBALL2:
+                case MT_SORCBALL3:
+                    return;
+                    break;
+                case MT_MSTAFF_FX2:    // Reflect to originator
+                    victim->special1.m = victim->target;
+                    victim->target = source;
+                    break;
+                default:
+                    break;
+            }
+        }
+        if (victim->type == MT_HOLY_FX)
+        {
+            if (victim->special1.m == source)
+            {
+                victim->special1.m = victim->target;
+                victim->target = source;
+            }
+        }
+        victim->momx = FixedMul(BLAST_SPEED, finecosine[angle]);
+        victim->momy = FixedMul(BLAST_SPEED, finesine[angle]);
+
+        // Spawn blast puff
+        ang = R_PointToAngle2(victim->x, victim->y, source->x, source->y);
+        ang >>= ANGLETOFINESHIFT;
+        x = victim->x + FixedMul(victim->radius + FRACUNIT, finecosine[ang]);
+        y = victim->y + FixedMul(victim->radius + FRACUNIT, finesine[ang]);
+        z = victim->z - victim->floorclip + (victim->height >> 1);
+        mo = P_SpawnMobj(x, y, z, MT_BLASTEFFECT);
+        if (mo)
+        {
+            mo->momx = victim->momx;
+            mo->momy = victim->momy;
+        }
+
+        if (victim->flags & MF_MISSILE)
+        {
+            victim->momz = 8 * FRACUNIT;
+            mo->momz = victim->momz;
+        }
+        else
+        {
+            victim->momz = (1000 / victim->info->mass) << FRACBITS;
+        }
+        if (victim->player)
+        {
+            // Players handled automatically
+        }
+        else
+        {
+            victim->flags2 |= MF2_SLIDE;
+            victim->flags2 |= MF2_BLASTED;
+        }
+    }
+}
+
+
+// Blast all mobj things away
+void P_BlastRadius(player_t * player)
+{
+    mobj_t *mo;
+    mobj_t *pmo = player->mo;
+    thinker_t *think;
+    fixed_t dist;
+
+    S_StartSound(pmo, SFX_ARTIFACT_BLAST);
+    P_NoiseAlert(player->mo, player->mo);
+
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+        if ((mo == pmo) || (mo->flags2 & MF2_BOSS))
+        {                       // Not a valid monster
+            continue;
+        }
+        if ((mo->type == MT_POISONCLOUD) ||     // poison cloud
+            (mo->type == MT_HOLY_FX) || // holy fx
+            (mo->flags & MF_ICECORPSE)) // frozen corpse
+        {
+            // Let these special cases go
+        }
+        else if ((mo->flags & MF_COUNTKILL) && (mo->health <= 0))
+        {
+            continue;
+        }
+        else if (!(mo->flags & MF_COUNTKILL) &&
+                 !(mo->player) && !(mo->flags & MF_MISSILE))
+        {                       // Must be monster, player, or missile
+            continue;
+        }
+        if (mo->flags2 & MF2_DORMANT)
+        {
+            continue;           // no dormant creatures
+        }
+        if ((mo->type == MT_WRAITHB) && (mo->flags2 & MF2_DONTDRAW))
+        {
+            continue;           // no underground wraiths
+        }
+        if ((mo->type == MT_SPLASHBASE) || (mo->type == MT_SPLASH))
+        {
+            continue;
+        }
+        if (mo->type == MT_SERPENT || mo->type == MT_SERPENTLEADER)
+        {
+            continue;
+        }
+        dist = P_AproxDistance(pmo->x - mo->x, pmo->y - mo->y);
+        if (dist > BLAST_RADIUS_DIST)
+        {                       // Out of range
+            continue;
+        }
+        P_BlastMobj(pmo, mo, BLAST_FULLSTRENGTH);
+    }
+}
+
+
+#define HEAL_RADIUS_DIST	255*FRACUNIT
+
+// Do class specific effect for everyone in radius
+boolean P_HealRadius(player_t * player)
+{
+    mobj_t *mo;
+    mobj_t *pmo = player->mo;
+    thinker_t *think;
+    fixed_t dist;
+    int effective = false;
+    int amount;
+
+    for (think = thinkercap.next; think != &thinkercap; think = think->next)
+    {
+        if (think->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        mo = (mobj_t *) think;
+
+        if (!mo->player)
+            continue;
+        if (mo->health <= 0)
+            continue;
+        dist = P_AproxDistance(pmo->x - mo->x, pmo->y - mo->y);
+        if (dist > HEAL_RADIUS_DIST)
+        {                       // Out of range
+            continue;
+        }
+
+        switch (player->class)
+        {
+            case PCLASS_FIGHTER:       // Radius armor boost
+                if ((P_GiveArmor(mo->player, ARMOR_ARMOR, 1)) ||
+                    (P_GiveArmor(mo->player, ARMOR_SHIELD, 1)) ||
+                    (P_GiveArmor(mo->player, ARMOR_HELMET, 1)) ||
+                    (P_GiveArmor(mo->player, ARMOR_AMULET, 1)))
+                {
+                    effective = true;
+                    S_StartSound(mo, SFX_MYSTICINCANT);
+                }
+                break;
+            case PCLASS_CLERIC:        // Radius heal
+                amount = 50 + (P_Random() % 50);
+                if (P_GiveBody(mo->player, amount))
+                {
+                    effective = true;
+                    S_StartSound(mo, SFX_MYSTICINCANT);
+                }
+                break;
+            case PCLASS_MAGE:  // Radius mana boost
+                amount = 50 + (P_Random() % 50);
+                if ((P_GiveMana(mo->player, MANA_1, amount)) ||
+                    (P_GiveMana(mo->player, MANA_2, amount)))
+                {
+                    effective = true;
+                    S_StartSound(mo, SFX_MYSTICINCANT);
+                }
+                break;
+            case PCLASS_PIG:
+            default:
+                break;
+        }
+    }
+    return (effective);
+}
+
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerNextArtifact
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerNextArtifact(player_t * player)
+{
+    if (player == &players[consoleplayer])
+    {
+        inv_ptr--;
+        if (inv_ptr < 6)
+        {
+            curpos--;
+            if (curpos < 0)
+            {
+                curpos = 0;
+            }
+        }
+        if (inv_ptr < 0)
+        {
+            inv_ptr = player->inventorySlotNum - 1;
+            if (inv_ptr < 6)
+            {
+                curpos = inv_ptr;
+            }
+            else
+            {
+                curpos = 6;
+            }
+        }
+        player->readyArtifact = player->inventory[inv_ptr].type;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerRemoveArtifact
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerRemoveArtifact(player_t * player, int slot)
+{
+    int i;
+
+    player->artifactCount--;
+    if (!(--player->inventory[slot].count))
+    {                           // Used last of a type - compact the artifact list
+        player->readyArtifact = arti_none;
+        player->inventory[slot].type = arti_none;
+        for (i = slot + 1; i < player->inventorySlotNum; i++)
+        {
+            player->inventory[i - 1] = player->inventory[i];
+        }
+        player->inventorySlotNum--;
+        if (player == &players[consoleplayer])
+        {                       // Set position markers and get next readyArtifact
+            inv_ptr--;
+            if (inv_ptr < 6)
+            {
+                curpos--;
+                if (curpos < 0)
+                {
+                    curpos = 0;
+                }
+            }
+            if (inv_ptr >= player->inventorySlotNum)
+            {
+                inv_ptr = player->inventorySlotNum - 1;
+            }
+            if (inv_ptr < 0)
+            {
+                inv_ptr = 0;
+            }
+            player->readyArtifact = player->inventory[inv_ptr].type;
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC P_PlayerUseArtifact
+//
+//----------------------------------------------------------------------------
+
+void P_PlayerUseArtifact(player_t * player, artitype_t arti)
+{
+    int i;
+
+    for (i = 0; i < player->inventorySlotNum; i++)
+    {
+        if (player->inventory[i].type == arti)
+        {                       // Found match - try to use
+            if (P_UseArtifact(player, arti))
+            {                   // Artifact was used - remove it from inventory
+                P_PlayerRemoveArtifact(player, i);
+                if (player == &players[consoleplayer])
+                {
+                    if (arti < arti_firstpuzzitem)
+                    {
+                        S_StartSound(NULL, SFX_ARTIFACT_USE);
+                    }
+                    else
+                    {
+                        S_StartSound(NULL, SFX_PUZZLE_SUCCESS);
+                    }
+                    ArtifactFlash = 4;
+                }
+            }
+            else if (arti < arti_firstpuzzitem)
+            {                   // Unable to use artifact, advance pointer
+                P_PlayerNextArtifact(player);
+            }
+            break;
+        }
+    }
+}
+
+//==========================================================================
+//
+// P_UseArtifact
+//
+// Returns true if the artifact was used.
+//
+//==========================================================================
+
+boolean P_UseArtifact(player_t * player, artitype_t arti)
+{
+    mobj_t *mo;
+    angle_t angle;
+    int i;
+    int count;
+
+    switch (arti)
+    {
+        case arti_invulnerability:
+            if (!P_GivePower(player, pw_invulnerability))
+            {
+                return (false);
+            }
+            break;
+        case arti_health:
+            if (!P_GiveBody(player, 25))
+            {
+                return (false);
+            }
+            break;
+        case arti_superhealth:
+            if (!P_GiveBody(player, 100))
+            {
+                return (false);
+            }
+            break;
+        case arti_healingradius:
+            if (!P_HealRadius(player))
+            {
+                return (false);
+            }
+            break;
+        case arti_torch:
+            if (!P_GivePower(player, pw_infrared))
+            {
+                return (false);
+            }
+            break;
+        case arti_egg:
+            mo = player->mo;
+            P_SpawnPlayerMissile(mo, MT_EGGFX);
+            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 6));
+            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 6));
+            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 3));
+            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 3));
+            break;
+        case arti_fly:
+            if (!P_GivePower(player, pw_flight))
+            {
+                return (false);
+            }
+            if (player->mo->momz <= -35 * FRACUNIT)
+            {                   // stop falling scream
+                S_StopSound(player->mo);
+            }
+            break;
+        case arti_summon:
+            mo = P_SpawnPlayerMissile(player->mo, MT_SUMMON_FX);
+            if (mo)
+            {
+                mo->target = player->mo;
+                mo->special1.m = (player->mo);
+                mo->momz = 5 * FRACUNIT;
+            }
+            break;
+        case arti_teleport:
+            P_ArtiTele(player);
+            break;
+        case arti_teleportother:
+            P_ArtiTeleportOther(player);
+            break;
+        case arti_poisonbag:
+            angle = player->mo->angle >> ANGLETOFINESHIFT;
+            if (player->class == PCLASS_CLERIC)
+            {
+                mo = P_SpawnMobj(player->mo->x + 16 * finecosine[angle],
+                                 player->mo->y + 24 * finesine[angle],
+                                 player->mo->z - player->mo->floorclip +
+                                 8 * FRACUNIT, MT_POISONBAG);
+                if (mo)
+                {
+                    mo->target = player->mo;
+                }
+            }
+            else if (player->class == PCLASS_MAGE)
+            {
+                mo = P_SpawnMobj(player->mo->x + 16 * finecosine[angle],
+                                 player->mo->y + 24 * finesine[angle],
+                                 player->mo->z - player->mo->floorclip +
+                                 8 * FRACUNIT, MT_FIREBOMB);
+                if (mo)
+                {
+                    mo->target = player->mo;
+                }
+            }
+            else                // PCLASS_FIGHTER, obviously (also pig, not so obviously)
+            {
+                mo = P_SpawnMobj(player->mo->x, player->mo->y,
+                                 player->mo->z - player->mo->floorclip +
+                                 35 * FRACUNIT, MT_THROWINGBOMB);
+                if (mo)
+                {
+                    mo->angle =
+                        player->mo->angle + (((P_Random() & 7) - 4) << 24);
+                    mo->momz =
+                        4 * FRACUNIT + ((player->lookdir) << (FRACBITS - 4));
+                    mo->z += player->lookdir << (FRACBITS - 4);
+                    P_ThrustMobj(mo, mo->angle, mo->info->speed);
+                    mo->momx += player->mo->momx >> 1;
+                    mo->momy += player->mo->momy >> 1;
+                    mo->target = player->mo;
+                    mo->tics -= P_Random() & 3;
+                    P_CheckMissileSpawn(mo);
+                }
+            }
+            break;
+        case arti_speed:
+            if (!P_GivePower(player, pw_speed))
+            {
+                return (false);
+            }
+            break;
+        case arti_boostmana:
+            if (!P_GiveMana(player, MANA_1, MAX_MANA))
+            {
+                if (!P_GiveMana(player, MANA_2, MAX_MANA))
+                {
+                    return false;
+                }
+
+            }
+            else
+            {
+                P_GiveMana(player, MANA_2, MAX_MANA);
+            }
+            break;
+        case arti_boostarmor:
+            count = 0;
+
+            for (i = 0; i < NUMARMOR; i++)
+            {
+                count += P_GiveArmor(player, i, 1);     // 1 point per armor type
+            }
+            if (!count)
+            {
+                return false;
+            }
+            break;
+        case arti_blastradius:
+            P_BlastRadius(player);
+            break;
+
+        case arti_puzzskull:
+        case arti_puzzgembig:
+        case arti_puzzgemred:
+        case arti_puzzgemgreen1:
+        case arti_puzzgemgreen2:
+        case arti_puzzgemblue1:
+        case arti_puzzgemblue2:
+        case arti_puzzbook1:
+        case arti_puzzbook2:
+        case arti_puzzskull2:
+        case arti_puzzfweapon:
+        case arti_puzzcweapon:
+        case arti_puzzmweapon:
+        case arti_puzzgear1:
+        case arti_puzzgear2:
+        case arti_puzzgear3:
+        case arti_puzzgear4:
+            if (P_UsePuzzleItem(player, arti - arti_firstpuzzitem))
+            {
+                return true;
+            }
+            else
+            {
+                P_SetYellowMessage(player, TXT_USEPUZZLEFAILED, false);
+                return false;
+            }
+            break;
+        default:
+            return false;
+    }
+    return true;
+}
+
+//============================================================================
+//
+// A_SpeedFade
+//
+//============================================================================
+
+void A_SpeedFade(mobj_t *actor, player_t *player, pspdef_t *psp)
+{
+    actor->flags |= MF_SHADOW;
+    actor->flags &= ~MF_ALTSHADOW;
+    actor->sprite = actor->target->sprite;
+}
diff --git a/games/NXDoom/src/hexen/po_man.c b/games/NXDoom/src/hexen/po_man.c
new file mode 100644
index 000000000..89364ad53
--- /dev/null
+++ b/games/NXDoom/src/hexen/po_man.c
@@ -0,0 +1,1505 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "i_system.h"
+#include "m_bbox.h"
+#include "i_swap.h"
+#include "p_local.h"
+#include "r_local.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define PO_MAXPOLYSEGS 64
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static polyobj_t *GetPolyobj(int polyNum);
+static int GetPolyobjMirror(int poly);
+static void ThrustMobj(mobj_t * mobj, seg_t * seg, polyobj_t * po);
+static void UpdateSegBBox(seg_t * seg);
+static void RotatePt(int an, fixed_t * x, fixed_t * y, fixed_t startSpotX,
+                     fixed_t startSpotY);
+static void UnLinkPolyobj(polyobj_t * po);
+static void LinkPolyobj(polyobj_t * po);
+static boolean CheckMobjBlocking(seg_t * seg, polyobj_t * po);
+static void InitBlockMap(void);
+static void IterFindPolySegs(int x, int y, seg_t ** segList);
+static void SpawnPolyobj(int index, int tag, boolean crush);
+static void TranslateToStartSpot(int tag, int originX, int originY);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+polyblock_t **PolyBlockMap;
+polyobj_t *polyobjs;            // list of all poly-objects on the level
+int po_NumPolyobjs;
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int PolySegCount;
+static fixed_t PolyStartX;
+static fixed_t PolyStartY;
+
+// CODE --------------------------------------------------------------------
+
+// ===== Polyobj Event Code =====
+
+//==========================================================================
+//
+// T_RotatePoly
+//
+//==========================================================================
+
+void T_RotatePoly(thinker_t *thinker)
+{
+    polyevent_t *pe = (polyevent_t *) thinker;
+    int absSpeed;
+    polyobj_t *poly;
+
+    if (PO_RotatePolyobj(pe->polyobj, pe->speed))
+    {
+        absSpeed = abs(pe->speed);
+
+        if (pe->dist == -1)
+        {                       // perpetual polyobj
+            return;
+        }
+        pe->dist -= absSpeed;
+        if (pe->dist <= 0)
+        {
+            poly = GetPolyobj(pe->polyobj);
+            if (poly->specialdata == pe)
+            {
+                poly->specialdata = NULL;
+            }
+            SN_StopSequence((mobj_t *) & poly->startSpot);
+            P_PolyobjFinished(poly->tag);
+            P_RemoveThinker(&pe->thinker);
+        }
+        if (pe->dist < absSpeed)
+        {
+            pe->speed = pe->dist * (pe->speed < 0 ? -1 : 1);
+        }
+    }
+}
+
+//==========================================================================
+//
+// EV_RotatePoly
+//
+//==========================================================================
+
+boolean EV_RotatePoly(line_t * line, byte * args, int direction, boolean
+                      overRide)
+{
+    int mirror;
+    int polyNum;
+    polyevent_t *pe;
+    polyobj_t *poly;
+
+    polyNum = args[0];
+    poly = GetPolyobj(polyNum);
+    if (poly != NULL)
+    {
+        if (poly->specialdata && !overRide)
+        {                       // poly is already moving
+            return false;
+        }
+    }
+    else
+    {
+        I_Error("EV_RotatePoly:  Invalid polyobj num: %d\n", polyNum);
+    }
+    pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
+    P_AddThinker(&pe->thinker);
+    pe->thinker.function = T_RotatePoly;
+    pe->polyobj = polyNum;
+    if (args[2])
+    {
+        if (args[2] == 255)
+        {
+            pe->dist = -1;
+        }
+        else
+        {
+            pe->dist = args[2] * (ANG90 / 64);       // Angle
+        }
+    }
+    else
+    {
+        pe->dist = ANG_MAX - 1;
+    }
+    pe->speed = (args[1] * direction * (ANG90 / 64)) >> 3;
+    poly->specialdata = pe;
+    SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                     poly->seqType);
+
+    while ((mirror = GetPolyobjMirror(polyNum)) != 0)
+    {
+        poly = GetPolyobj(mirror);
+        if (poly && poly->specialdata && !overRide)
+        {                       // mirroring poly is already in motion
+            break;
+        }
+        pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
+        P_AddThinker(&pe->thinker);
+        pe->thinker.function = T_RotatePoly;
+        poly->specialdata = pe;
+        pe->polyobj = mirror;
+        if (args[2])
+        {
+            if (args[2] == 255)
+            {
+                pe->dist = -1;
+            }
+            else
+            {
+                pe->dist = args[2] * (ANG90 / 64);   // Angle
+            }
+        }
+        else
+        {
+            pe->dist = ANG_MAX - 1;
+        }
+        poly = GetPolyobj(polyNum);
+        if (poly != NULL)
+        {
+            poly->specialdata = pe;
+        }
+        else
+        {
+            I_Error("EV_RotatePoly:  Invalid polyobj num: %d\n", polyNum);
+        }
+        direction = -direction;
+        pe->speed = (args[1] * direction * (ANG90 / 64)) >> 3;
+        polyNum = mirror;
+        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                         poly->seqType);
+    }
+    return true;
+}
+
+//==========================================================================
+//
+// T_MovePoly
+//
+//==========================================================================
+
+void T_MovePoly(thinker_t *thinker)
+{
+    polyevent_t *pe = (polyevent_t *) thinker;
+    int absSpeed;
+    polyobj_t *poly;
+
+    if (PO_MovePolyobj(pe->polyobj, pe->xSpeed, pe->ySpeed))
+    {
+        absSpeed = abs(pe->speed);
+        pe->dist -= absSpeed;
+        if (pe->dist <= 0)
+        {
+            poly = GetPolyobj(pe->polyobj);
+            if (poly->specialdata == pe)
+            {
+                poly->specialdata = NULL;
+            }
+            SN_StopSequence((mobj_t *) & poly->startSpot);
+            P_PolyobjFinished(poly->tag);
+            P_RemoveThinker(&pe->thinker);
+        }
+        if (pe->dist < absSpeed)
+        {
+            pe->speed = pe->dist * (pe->speed < 0 ? -1 : 1);
+            pe->xSpeed = FixedMul(pe->speed, finecosine[pe->angle]);
+            pe->ySpeed = FixedMul(pe->speed, finesine[pe->angle]);
+        }
+    }
+}
+
+//==========================================================================
+//
+// EV_MovePoly
+//
+//==========================================================================
+
+boolean EV_MovePoly(line_t * line, byte * args, boolean timesEight, boolean
+                    overRide)
+{
+    int mirror;
+    int polyNum;
+    polyevent_t *pe;
+    polyobj_t *poly;
+    angle_t an;
+
+    polyNum = args[0];
+    poly = GetPolyobj(polyNum);
+    if (poly != NULL)
+    {
+        if (poly->specialdata && !overRide)
+        {                       // poly is already moving
+            return false;
+        }
+    }
+    else
+    {
+        I_Error("EV_MovePoly:  Invalid polyobj num: %d\n", polyNum);
+    }
+    pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
+    P_AddThinker(&pe->thinker);
+    pe->thinker.function = T_MovePoly;
+    pe->polyobj = polyNum;
+    if (timesEight)
+    {
+        pe->dist = args[3] * 8 * FRACUNIT;
+    }
+    else
+    {
+        pe->dist = args[3] * FRACUNIT;  // Distance
+    }
+    pe->speed = args[1] * (FRACUNIT / 8);
+    poly->specialdata = pe;
+
+    an = args[2] * (ANG90 / 64);
+
+    pe->angle = an >> ANGLETOFINESHIFT;
+    pe->xSpeed = FixedMul(pe->speed, finecosine[pe->angle]);
+    pe->ySpeed = FixedMul(pe->speed, finesine[pe->angle]);
+    SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                     poly->seqType);
+
+    while ((mirror = GetPolyobjMirror(polyNum)) != 0)
+    {
+        poly = GetPolyobj(mirror);
+        if (poly && poly->specialdata && !overRide)
+        {                       // mirroring poly is already in motion
+            break;
+        }
+        pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
+        P_AddThinker(&pe->thinker);
+        pe->thinker.function = T_MovePoly;
+        pe->polyobj = mirror;
+        poly->specialdata = pe;
+        if (timesEight)
+        {
+            pe->dist = args[3] * 8 * FRACUNIT;
+        }
+        else
+        {
+            pe->dist = args[3] * FRACUNIT;      // Distance
+        }
+        pe->speed = args[1] * (FRACUNIT / 8);
+        an = an + ANG180;    // reverse the angle
+        pe->angle = an >> ANGLETOFINESHIFT;
+        pe->xSpeed = FixedMul(pe->speed, finecosine[pe->angle]);
+        pe->ySpeed = FixedMul(pe->speed, finesine[pe->angle]);
+        polyNum = mirror;
+        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                         poly->seqType);
+    }
+    return true;
+}
+
+//==========================================================================
+//
+// T_PolyDoor
+//
+//==========================================================================
+
+void T_PolyDoor(thinker_t *thinker)
+{
+    polydoor_t *pd = (polydoor_t *) thinker;
+    int absSpeed;
+    polyobj_t *poly;
+
+    if (pd->tics)
+    {
+        if (!--pd->tics)
+        {
+            poly = GetPolyobj(pd->polyobj);
+            SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                             poly->seqType);
+        }
+        return;
+    }
+    switch (pd->type)
+    {
+        case PODOOR_SLIDE:
+            if (PO_MovePolyobj(pd->polyobj, pd->xSpeed, pd->ySpeed))
+            {
+                absSpeed = abs(pd->speed);
+                pd->dist -= absSpeed;
+                if (pd->dist <= 0)
+                {
+                    poly = GetPolyobj(pd->polyobj);
+                    SN_StopSequence((mobj_t *) & poly->startSpot);
+                    if (!pd->close)
+                    {
+                        pd->dist = pd->totalDist;
+                        pd->close = true;
+                        pd->tics = pd->waitTics;
+                        pd->direction = (ANG_MAX >> ANGLETOFINESHIFT) -
+                            pd->direction;
+                        pd->xSpeed = -pd->xSpeed;
+                        pd->ySpeed = -pd->ySpeed;
+                    }
+                    else
+                    {
+                        if (poly->specialdata == pd)
+                        {
+                            poly->specialdata = NULL;
+                        }
+                        P_PolyobjFinished(poly->tag);
+                        P_RemoveThinker(&pd->thinker);
+                    }
+                }
+            }
+            else
+            {
+                poly = GetPolyobj(pd->polyobj);
+                if (poly->crush || !pd->close)
+                {               // continue moving if the poly is a crusher, or is opening
+                    return;
+                }
+                else
+                {               // open back up
+                    pd->dist = pd->totalDist - pd->dist;
+                    pd->direction = (ANG_MAX >> ANGLETOFINESHIFT) -
+                        pd->direction;
+                    pd->xSpeed = -pd->xSpeed;
+                    pd->ySpeed = -pd->ySpeed;
+                    pd->close = false;
+                    SN_StartSequence((mobj_t *) & poly->startSpot,
+                                     SEQ_DOOR_STONE + poly->seqType);
+                }
+            }
+            break;
+        case PODOOR_SWING:
+            if (PO_RotatePolyobj(pd->polyobj, pd->speed))
+            {
+                absSpeed = abs(pd->speed);
+                if (pd->dist == -1)
+                {               // perpetual polyobj
+                    return;
+                }
+                pd->dist -= absSpeed;
+                if (pd->dist <= 0)
+                {
+                    poly = GetPolyobj(pd->polyobj);
+                    SN_StopSequence((mobj_t *) & poly->startSpot);
+                    if (!pd->close)
+                    {
+                        pd->dist = pd->totalDist;
+                        pd->close = true;
+                        pd->tics = pd->waitTics;
+                        pd->speed = -pd->speed;
+                    }
+                    else
+                    {
+                        if (poly->specialdata == pd)
+                        {
+                            poly->specialdata = NULL;
+                        }
+                        P_PolyobjFinished(poly->tag);
+                        P_RemoveThinker(&pd->thinker);
+                    }
+                }
+            }
+            else
+            {
+                poly = GetPolyobj(pd->polyobj);
+                if (poly->crush || !pd->close)
+                {               // continue moving if the poly is a crusher, or is opening
+                    return;
+                }
+                else
+                {               // open back up and rewait
+                    pd->dist = pd->totalDist - pd->dist;
+                    pd->speed = -pd->speed;
+                    pd->close = false;
+                    SN_StartSequence((mobj_t *) & poly->startSpot,
+                                     SEQ_DOOR_STONE + poly->seqType);
+                }
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+//==========================================================================
+//
+// EV_OpenPolyDoor
+//
+//==========================================================================
+
+boolean EV_OpenPolyDoor(line_t * line, byte * args, podoortype_t type)
+{
+    int mirror;
+    int polyNum;
+    polydoor_t *pd;
+    polyobj_t *poly;
+    angle_t an = 0;
+
+    polyNum = args[0];
+    poly = GetPolyobj(polyNum);
+    if (poly != NULL)
+    {
+        if (poly->specialdata)
+        {                       // poly is already moving
+            return false;
+        }
+    }
+    else
+    {
+        I_Error("EV_OpenPolyDoor:  Invalid polyobj num: %d\n", polyNum);
+    }
+    pd = Z_Malloc(sizeof(polydoor_t), PU_LEVSPEC, 0);
+    memset(pd, 0, sizeof(polydoor_t));
+    P_AddThinker(&pd->thinker);
+    pd->thinker.function = T_PolyDoor;
+    pd->type = type;
+    pd->polyobj = polyNum;
+    if (type == PODOOR_SLIDE)
+    {
+        pd->waitTics = args[4];
+        pd->speed = args[1] * (FRACUNIT / 8);
+        pd->totalDist = args[3] * FRACUNIT;     // Distance
+        pd->dist = pd->totalDist;
+        an = args[2] * (ANG90 / 64);
+        pd->direction = an >> ANGLETOFINESHIFT;
+        pd->xSpeed = FixedMul(pd->speed, finecosine[pd->direction]);
+        pd->ySpeed = FixedMul(pd->speed, finesine[pd->direction]);
+        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                         poly->seqType);
+    }
+    else if (type == PODOOR_SWING)
+    {
+        pd->waitTics = args[3];
+        pd->direction = 1;      // ADD:  PODOOR_SWINGL, PODOOR_SWINGR
+        pd->speed = (args[1] * pd->direction * (ANG90 / 64)) >> 3;
+        pd->totalDist = args[2] * (ANG90 / 64);
+        pd->dist = pd->totalDist;
+        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                         poly->seqType);
+    }
+
+    poly->specialdata = pd;
+
+    while ((mirror = GetPolyobjMirror(polyNum)) != 0)
+    {
+        poly = GetPolyobj(mirror);
+        if (poly && poly->specialdata)
+        {                       // mirroring poly is already in motion
+            break;
+        }
+        pd = Z_Malloc(sizeof(polydoor_t), PU_LEVSPEC, 0);
+        memset(pd, 0, sizeof(polydoor_t));
+        P_AddThinker(&pd->thinker);
+        pd->thinker.function = T_PolyDoor;
+        pd->polyobj = mirror;
+        pd->type = type;
+        poly->specialdata = pd;
+        if (type == PODOOR_SLIDE)
+        {
+            pd->waitTics = args[4];
+            pd->speed = args[1] * (FRACUNIT / 8);
+            pd->totalDist = args[3] * FRACUNIT; // Distance
+            pd->dist = pd->totalDist;
+            an = an + ANG180;        // reverse the angle
+            pd->direction = an >> ANGLETOFINESHIFT;
+            pd->xSpeed = FixedMul(pd->speed, finecosine[pd->direction]);
+            pd->ySpeed = FixedMul(pd->speed, finesine[pd->direction]);
+            SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                             poly->seqType);
+        }
+        else if (type == PODOOR_SWING)
+        {
+            pd->waitTics = args[3];
+            pd->direction = -1; // ADD:  same as above
+            pd->speed = (args[1] * pd->direction * (ANG90 / 64)) >> 3;
+            pd->totalDist = args[2] * (ANG90 / 64);
+            pd->dist = pd->totalDist;
+            SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
+                             poly->seqType);
+        }
+        polyNum = mirror;
+    }
+    return true;
+}
+
+// ===== Higher Level Poly Interface code =====
+
+//==========================================================================
+//
+// GetPolyobj
+//
+//==========================================================================
+
+static polyobj_t *GetPolyobj(int polyNum)
+{
+    int i;
+
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        if (polyobjs[i].tag == polyNum)
+        {
+            return &polyobjs[i];
+        }
+    }
+    return NULL;
+}
+
+//==========================================================================
+//
+// GetPolyobjMirror
+//
+//==========================================================================
+
+static int GetPolyobjMirror(int poly)
+{
+    int i;
+
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        if (polyobjs[i].tag == poly)
+        {
+            return ((*polyobjs[i].segs)->linedef->arg2);
+        }
+    }
+    return 0;
+}
+
+//==========================================================================
+//
+// ThrustMobj
+//
+//==========================================================================
+
+static void ThrustMobj(mobj_t * mobj, seg_t * seg, polyobj_t * po)
+{
+    int thrustAngle;
+    int thrustX;
+    int thrustY;
+    polyevent_t *pe;
+
+    int force;
+
+    if (!(mobj->flags & MF_SHOOTABLE) && !mobj->player)
+    {
+        return;
+    }
+    thrustAngle = (seg->angle - ANG90) >> ANGLETOFINESHIFT;
+
+    pe = po->specialdata;
+    if (pe)
+    {
+        if (pe->thinker.function == T_RotatePoly)
+        {
+            force = pe->speed >> 8;
+        }
+        else
+        {
+            force = pe->speed >> 3;
+        }
+        if (force < FRACUNIT)
+        {
+            force = FRACUNIT;
+        }
+        else if (force > 4 * FRACUNIT)
+        {
+            force = 4 * FRACUNIT;
+        }
+    }
+    else
+    {
+        force = FRACUNIT;
+    }
+
+    thrustX = FixedMul(force, finecosine[thrustAngle]);
+    thrustY = FixedMul(force, finesine[thrustAngle]);
+    mobj->momx += thrustX;
+    mobj->momy += thrustY;
+    if (po->crush)
+    {
+        if (!P_CheckPosition(mobj, mobj->x + thrustX, mobj->y + thrustY))
+        {
+            P_DamageMobj(mobj, NULL, NULL, 3);
+        }
+    }
+}
+
+//==========================================================================
+//
+// UpdateSegBBox
+//
+//==========================================================================
+
+static void UpdateSegBBox(seg_t * seg)
+{
+    line_t *line;
+
+    line = seg->linedef;
+
+    if (seg->v1->x < seg->v2->x)
+    {
+        line->bbox[BOXLEFT] = seg->v1->x;
+        line->bbox[BOXRIGHT] = seg->v2->x;
+    }
+    else
+    {
+        line->bbox[BOXLEFT] = seg->v2->x;
+        line->bbox[BOXRIGHT] = seg->v1->x;
+    }
+    if (seg->v1->y < seg->v2->y)
+    {
+        line->bbox[BOXBOTTOM] = seg->v1->y;
+        line->bbox[BOXTOP] = seg->v2->y;
+    }
+    else
+    {
+        line->bbox[BOXBOTTOM] = seg->v2->y;
+        line->bbox[BOXTOP] = seg->v1->y;
+    }
+
+    // Update the line's slopetype
+    line->dx = line->v2->x - line->v1->x;
+    line->dy = line->v2->y - line->v1->y;
+    if (!line->dx)
+    {
+        line->slopetype = ST_VERTICAL;
+    }
+    else if (!line->dy)
+    {
+        line->slopetype = ST_HORIZONTAL;
+    }
+    else
+    {
+        if (FixedDiv(line->dy, line->dx) > 0)
+        {
+            line->slopetype = ST_POSITIVE;
+        }
+        else
+        {
+            line->slopetype = ST_NEGATIVE;
+        }
+    }
+}
+
+//==========================================================================
+//
+// PO_MovePolyobj
+//
+//==========================================================================
+
+boolean PO_MovePolyobj(int num, int x, int y)
+{
+    int count;
+    seg_t **segList;
+    seg_t **veryTempSeg;
+    polyobj_t *po;
+    vertex_t *prevPts;
+    boolean blocked;
+
+    if (!(po = GetPolyobj(num)))
+    {
+        I_Error("PO_MovePolyobj:  Invalid polyobj number: %d\n", num);
+    }
+
+    UnLinkPolyobj(po);
+
+    segList = po->segs;
+    prevPts = po->prevPts;
+    blocked = false;
+
+    validcount++;
+    for (count = po->numsegs; count; count--, segList++, prevPts++)
+    {
+        if ((*segList)->linedef->validcount != validcount)
+        {
+            (*segList)->linedef->bbox[BOXTOP] += y;
+            (*segList)->linedef->bbox[BOXBOTTOM] += y;
+            (*segList)->linedef->bbox[BOXLEFT] += x;
+            (*segList)->linedef->bbox[BOXRIGHT] += x;
+            (*segList)->linedef->validcount = validcount;
+        }
+        for (veryTempSeg = po->segs; veryTempSeg != segList; veryTempSeg++)
+        {
+            if ((*veryTempSeg)->v1 == (*segList)->v1)
+            {
+                break;
+            }
+        }
+        if (veryTempSeg == segList)
+        {
+            (*segList)->v1->x += x;
+            (*segList)->v1->y += y;
+        }
+        (*prevPts).x += x;      // previous points are unique for each seg
+        (*prevPts).y += y;
+    }
+    segList = po->segs;
+    for (count = po->numsegs; count; count--, segList++)
+    {
+        if (CheckMobjBlocking(*segList, po))
+        {
+            blocked = true;
+        }
+    }
+    if (blocked)
+    {
+        count = po->numsegs;
+        segList = po->segs;
+        prevPts = po->prevPts;
+        validcount++;
+        while (count--)
+        {
+            if ((*segList)->linedef->validcount != validcount)
+            {
+                (*segList)->linedef->bbox[BOXTOP] -= y;
+                (*segList)->linedef->bbox[BOXBOTTOM] -= y;
+                (*segList)->linedef->bbox[BOXLEFT] -= x;
+                (*segList)->linedef->bbox[BOXRIGHT] -= x;
+                (*segList)->linedef->validcount = validcount;
+            }
+            for (veryTempSeg = po->segs; veryTempSeg != segList;
+                 veryTempSeg++)
+            {
+                if ((*veryTempSeg)->v1 == (*segList)->v1)
+                {
+                    break;
+                }
+            }
+            if (veryTempSeg == segList)
+            {
+                (*segList)->v1->x -= x;
+                (*segList)->v1->y -= y;
+            }
+            (*prevPts).x -= x;
+            (*prevPts).y -= y;
+            segList++;
+            prevPts++;
+        }
+        LinkPolyobj(po);
+        return false;
+    }
+    po->startSpot.x += x;
+    po->startSpot.y += y;
+    LinkPolyobj(po);
+    return true;
+}
+
+//==========================================================================
+//
+// RotatePt
+//
+//==========================================================================
+
+static void RotatePt(int an, fixed_t * x, fixed_t * y, fixed_t startSpotX,
+                     fixed_t startSpotY)
+{
+    fixed_t trx, try;
+    fixed_t gxt, gyt;
+
+    trx = *x;
+    try = *y;
+
+    gxt = FixedMul(trx, finecosine[an]);
+    gyt = FixedMul(try, finesine[an]);
+    *x = (gxt - gyt) + startSpotX;
+
+    gxt = FixedMul(trx, finesine[an]);
+    gyt = FixedMul(try, finecosine[an]);
+    *y = (gyt + gxt) + startSpotY;
+}
+
+//==========================================================================
+//
+// PO_RotatePolyobj
+//
+//==========================================================================
+
+boolean PO_RotatePolyobj(int num, angle_t angle)
+{
+    int count;
+    seg_t **segList;
+    vertex_t *originalPts;
+    vertex_t *prevPts;
+    int an;
+    polyobj_t *po;
+    boolean blocked;
+
+    if (!(po = GetPolyobj(num)))
+    {
+        I_Error("PO_RotatePolyobj:  Invalid polyobj number: %d\n", num);
+    }
+    an = (po->angle + angle) >> ANGLETOFINESHIFT;
+
+    UnLinkPolyobj(po);
+
+    segList = po->segs;
+    originalPts = po->originalPts;
+    prevPts = po->prevPts;
+
+    for (count = po->numsegs; count; count--, segList++, originalPts++,
+         prevPts++)
+    {
+        prevPts->x = (*segList)->v1->x;
+        prevPts->y = (*segList)->v1->y;
+        (*segList)->v1->x = originalPts->x;
+        (*segList)->v1->y = originalPts->y;
+        RotatePt(an, &(*segList)->v1->x, &(*segList)->v1->y, po->startSpot.x,
+                 po->startSpot.y);
+    }
+    segList = po->segs;
+    blocked = false;
+    validcount++;
+    for (count = po->numsegs; count; count--, segList++)
+    {
+        if (CheckMobjBlocking(*segList, po))
+        {
+            blocked = true;
+        }
+        if ((*segList)->linedef->validcount != validcount)
+        {
+            UpdateSegBBox(*segList);
+            (*segList)->linedef->validcount = validcount;
+        }
+        (*segList)->angle += angle;
+    }
+    if (blocked)
+    {
+        segList = po->segs;
+        prevPts = po->prevPts;
+        for (count = po->numsegs; count; count--, segList++, prevPts++)
+        {
+            (*segList)->v1->x = prevPts->x;
+            (*segList)->v1->y = prevPts->y;
+        }
+        segList = po->segs;
+        validcount++;
+        for (count = po->numsegs; count; count--, segList++, prevPts++)
+        {
+            if ((*segList)->linedef->validcount != validcount)
+            {
+                UpdateSegBBox(*segList);
+                (*segList)->linedef->validcount = validcount;
+            }
+            (*segList)->angle -= angle;
+        }
+        LinkPolyobj(po);
+        return false;
+    }
+    po->angle += angle;
+    LinkPolyobj(po);
+    return true;
+}
+
+//==========================================================================
+//
+// UnLinkPolyobj
+//
+//==========================================================================
+
+static void UnLinkPolyobj(polyobj_t * po)
+{
+    polyblock_t *link;
+    int i, j;
+    int index;
+
+    // remove the polyobj from each blockmap section
+    for (j = po->bbox[BOXBOTTOM]; j <= po->bbox[BOXTOP]; j++)
+    {
+        index = j * bmapwidth;
+        for (i = po->bbox[BOXLEFT]; i <= po->bbox[BOXRIGHT]; i++)
+        {
+            if (i >= 0 && i < bmapwidth && j >= 0 && j < bmapheight)
+            {
+                link = PolyBlockMap[index + i];
+                while (link != NULL && link->polyobj != po)
+                {
+                    link = link->next;
+                }
+                if (link == NULL)
+                {               // polyobj not located in the link cell
+                    continue;
+                }
+                link->polyobj = NULL;
+            }
+        }
+    }
+}
+
+//==========================================================================
+//
+// LinkPolyobj
+//
+//==========================================================================
+
+static void LinkPolyobj(polyobj_t * po)
+{
+    int leftX, rightX;
+    int topY, bottomY;
+    seg_t **tempSeg;
+    polyblock_t **link;
+    polyblock_t *tempLink;
+    int i, j;
+
+    // calculate the polyobj bbox
+    tempSeg = po->segs;
+    rightX = leftX = (*tempSeg)->v1->x;
+    topY = bottomY = (*tempSeg)->v1->y;
+
+    for (i = 0; i < po->numsegs; i++, tempSeg++)
+    {
+        if ((*tempSeg)->v1->x > rightX)
+        {
+            rightX = (*tempSeg)->v1->x;
+        }
+        if ((*tempSeg)->v1->x < leftX)
+        {
+            leftX = (*tempSeg)->v1->x;
+        }
+        if ((*tempSeg)->v1->y > topY)
+        {
+            topY = (*tempSeg)->v1->y;
+        }
+        if ((*tempSeg)->v1->y < bottomY)
+        {
+            bottomY = (*tempSeg)->v1->y;
+        }
+    }
+    po->bbox[BOXRIGHT] = (rightX - bmaporgx) >> MAPBLOCKSHIFT;
+    po->bbox[BOXLEFT] = (leftX - bmaporgx) >> MAPBLOCKSHIFT;
+    po->bbox[BOXTOP] = (topY - bmaporgy) >> MAPBLOCKSHIFT;
+    po->bbox[BOXBOTTOM] = (bottomY - bmaporgy) >> MAPBLOCKSHIFT;
+    // add the polyobj to each blockmap section
+    for (j = po->bbox[BOXBOTTOM] * bmapwidth;
+         j <= po->bbox[BOXTOP] * bmapwidth; j += bmapwidth)
+    {
+        for (i = po->bbox[BOXLEFT]; i <= po->bbox[BOXRIGHT]; i++)
+        {
+            if (i >= 0 && i < bmapwidth && j >= 0
+                && j < bmapheight * bmapwidth)
+            {
+                link = &PolyBlockMap[j + i];
+                if (!(*link))
+                {               // Create a new link at the current block cell
+                    *link = Z_Malloc(sizeof(polyblock_t), PU_LEVEL, 0);
+                    (*link)->next = NULL;
+                    (*link)->prev = NULL;
+                    (*link)->polyobj = po;
+                    continue;
+                }
+                else
+                {
+                    tempLink = *link;
+                    while (tempLink->next != NULL
+                           && tempLink->polyobj != NULL)
+                    {
+                        tempLink = tempLink->next;
+                    }
+                }
+                if (tempLink->polyobj == NULL)
+                {
+                    tempLink->polyobj = po;
+                    continue;
+                }
+                else
+                {
+                    tempLink->next = Z_Malloc(sizeof(polyblock_t),
+                                              PU_LEVEL, 0);
+                    tempLink->next->next = NULL;
+                    tempLink->next->prev = tempLink;
+                    tempLink->next->polyobj = po;
+                }
+            }
+            // else, don't link the polyobj, since it's off the map
+        }
+    }
+}
+
+//==========================================================================
+//
+// CheckMobjBlocking
+//
+//==========================================================================
+
+static boolean CheckMobjBlocking(seg_t * seg, polyobj_t * po)
+{
+    mobj_t *mobj;
+    int i, j;
+    int left, right, top, bottom;
+    int tmbbox[4];
+    line_t *ld;
+    boolean blocked;
+
+    ld = seg->linedef;
+
+    top = (ld->bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+    bottom = (ld->bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+    left = (ld->bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+    right = (ld->bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+    blocked = false;
+
+    bottom = bottom < 0 ? 0 : bottom;
+    bottom = bottom >= bmapheight ? bmapheight - 1 : bottom;
+    top = top < 0 ? 0 : top;
+    top = top >= bmapheight ? bmapheight - 1 : top;
+    left = left < 0 ? 0 : left;
+    left = left >= bmapwidth ? bmapwidth - 1 : left;
+    right = right < 0 ? 0 : right;
+    right = right >= bmapwidth ? bmapwidth - 1 : right;
+
+    for (j = bottom * bmapwidth; j <= top * bmapwidth; j += bmapwidth)
+    {
+        for (i = left; i <= right; i++)
+        {
+            for (mobj = blocklinks[j + i]; mobj; mobj = mobj->bnext)
+            {
+                if (mobj->flags & MF_SOLID || mobj->player)
+                {
+                    tmbbox[BOXTOP] = mobj->y + mobj->radius;
+                    tmbbox[BOXBOTTOM] = mobj->y - mobj->radius;
+                    tmbbox[BOXLEFT] = mobj->x - mobj->radius;
+                    tmbbox[BOXRIGHT] = mobj->x + mobj->radius;
+
+                    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
+                        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
+                        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
+                        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+                    {
+                        continue;
+                    }
+                    if (P_BoxOnLineSide(tmbbox, ld) != -1)
+                    {
+                        continue;
+                    }
+                    ThrustMobj(mobj, seg, po);
+                    blocked = true;
+                }
+            }
+        }
+    }
+    return blocked;
+}
+
+//==========================================================================
+//
+// InitBlockMap
+//
+//==========================================================================
+
+static void InitBlockMap(void)
+{
+    int i;
+    int j;
+    seg_t **segList;
+    int leftX, rightX;
+    int topY, bottomY;
+
+    PolyBlockMap = Z_Malloc(bmapwidth * bmapheight * sizeof(polyblock_t *),
+                            PU_LEVEL, 0);
+    memset(PolyBlockMap, 0, bmapwidth * bmapheight * sizeof(polyblock_t *));
+
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        LinkPolyobj(&polyobjs[i]);
+
+        // calculate a rough area
+        // right now, working like shit...gotta fix this...
+        segList = polyobjs[i].segs;
+        leftX = rightX = (*segList)->v1->x;
+        topY = bottomY = (*segList)->v1->y;
+        for (j = 0; j < polyobjs[i].numsegs; j++, segList++)
+        {
+            if ((*segList)->v1->x < leftX)
+            {
+                leftX = (*segList)->v1->x;
+            }
+            if ((*segList)->v1->x > rightX)
+            {
+                rightX = (*segList)->v1->x;
+            }
+            if ((*segList)->v1->y < bottomY)
+            {
+                bottomY = (*segList)->v1->y;
+            }
+            if ((*segList)->v1->y > topY)
+            {
+                topY = (*segList)->v1->y;
+            }
+        }
+//    area = ((rightX >> FRACBITS) - (leftX >> FRACBITS)) *
+//        ((topY >> FRACBITS) - (bottomY >> FRACBITS));
+
+//    fprintf(stdaux, "Area of Polyobj[%d]: %d\n", polyobjs[i].tag, area);
+//    fprintf(stdaux, "\t[%d]\n[%d]\t\t[%d]\n\t[%d]\n", topY>>FRACBITS, 
+//              leftX>>FRACBITS,
+//      rightX>>FRACBITS, bottomY>>FRACBITS);
+    }
+}
+
+//==========================================================================
+//
+// IterFindPolySegs
+//
+//              Passing NULL for segList will cause IterFindPolySegs to
+//      count the number of segs in the polyobj
+//==========================================================================
+
+static void IterFindPolySegs(int x, int y, seg_t ** segList)
+{
+    int i;
+
+    if (x == PolyStartX && y == PolyStartY)
+    {
+        return;
+    }
+    for (i = 0; i < numsegs; i++)
+    {
+        if (segs[i].v1->x == x && segs[i].v1->y == y)
+        {
+            if (!segList)
+            {
+                PolySegCount++;
+            }
+            else
+            {
+                *segList++ = &segs[i];
+            }
+            IterFindPolySegs(segs[i].v2->x, segs[i].v2->y, segList);
+            return;
+        }
+    }
+    I_Error("IterFindPolySegs:  Non-closed Polyobj located.\n");
+}
+
+
+//==========================================================================
+//
+// SpawnPolyobj
+//
+//==========================================================================
+
+static void SpawnPolyobj(int index, int tag, boolean crush)
+{
+    int i;
+    int j;
+    int psIndex;
+    int psIndexOld;
+    seg_t *polySegList[PO_MAXPOLYSEGS];
+
+    for (i = 0; i < numsegs; i++)
+    {
+        if (segs[i].linedef->special == PO_LINE_START &&
+            segs[i].linedef->arg1 == tag)
+        {
+            if (polyobjs[index].segs)
+            {
+                I_Error("SpawnPolyobj:  Polyobj %d already spawned.\n", tag);
+            }
+            segs[i].linedef->special = 0;
+            segs[i].linedef->arg1 = 0;
+            PolySegCount = 1;
+            PolyStartX = segs[i].v1->x;
+            PolyStartY = segs[i].v1->y;
+            IterFindPolySegs(segs[i].v2->x, segs[i].v2->y, NULL);
+
+            polyobjs[index].numsegs = PolySegCount;
+            polyobjs[index].segs = Z_Malloc(PolySegCount * sizeof(seg_t *),
+                                            PU_LEVEL, 0);
+            *(polyobjs[index].segs) = &segs[i]; // insert the first seg
+            IterFindPolySegs(segs[i].v2->x, segs[i].v2->y,
+                             polyobjs[index].segs + 1);
+            polyobjs[index].crush = crush;
+            polyobjs[index].tag = tag;
+            polyobjs[index].seqType = segs[i].linedef->arg3;
+            if (polyobjs[index].seqType < 0
+                || polyobjs[index].seqType >= SEQTYPE_NUMSEQ)
+            {
+                polyobjs[index].seqType = 0;
+            }
+            break;
+        }
+    }
+    if (!polyobjs[index].segs)
+    {                           // didn't find a polyobj through PO_LINE_START
+        psIndex = 0;
+        polyobjs[index].numsegs = 0;
+        for (j = 1; j < PO_MAXPOLYSEGS; j++)
+        {
+            psIndexOld = psIndex;
+            for (i = 0; i < numsegs; i++)
+            {
+                if (segs[i].linedef->special == PO_LINE_EXPLICIT &&
+                    segs[i].linedef->arg1 == tag)
+                {
+                    if (!segs[i].linedef->arg2)
+                    {
+                        I_Error
+                            ("SpawnPolyobj:  Explicit line missing order number (probably %d) in poly %d.\n",
+                             j + 1, tag);
+                    }
+                    if (segs[i].linedef->arg2 == j)
+                    {
+                        polySegList[psIndex] = &segs[i];
+                        polyobjs[index].numsegs++;
+                        psIndex++;
+                        if (psIndex > PO_MAXPOLYSEGS)
+                        {
+                            I_Error
+                                ("SpawnPolyobj:  psIndex > PO_MAXPOLYSEGS\n");
+                        }
+                    }
+                }
+            }
+            // Clear out any specials for these segs...we cannot clear them out
+            //      in the above loop, since we aren't guaranteed one seg per
+            //              linedef.
+            for (i = 0; i < numsegs; i++)
+            {
+                if (segs[i].linedef->special == PO_LINE_EXPLICIT &&
+                    segs[i].linedef->arg1 == tag
+                    && segs[i].linedef->arg2 == j)
+                {
+                    segs[i].linedef->special = 0;
+                    segs[i].linedef->arg1 = 0;
+                }
+            }
+            if (psIndex == psIndexOld)
+            {                   // Check if an explicit line order has been skipped
+                // A line has been skipped if there are any more explicit
+                // lines with the current tag value
+                for (i = 0; i < numsegs; i++)
+                {
+                    if (segs[i].linedef->special == PO_LINE_EXPLICIT &&
+                        segs[i].linedef->arg1 == tag)
+                    {
+                        I_Error
+                            ("SpawnPolyobj:  Missing explicit line %d for poly %d\n",
+                             j, tag);
+                    }
+                }
+            }
+        }
+        if (polyobjs[index].numsegs)
+        {
+            PolySegCount = polyobjs[index].numsegs;     // PolySegCount used globally
+            polyobjs[index].crush = crush;
+            polyobjs[index].tag = tag;
+            polyobjs[index].segs = Z_Malloc(polyobjs[index].numsegs
+                                            * sizeof(seg_t *), PU_LEVEL, 0);
+            for (i = 0; i < polyobjs[index].numsegs; i++)
+            {
+                polyobjs[index].segs[i] = polySegList[i];
+            }
+            polyobjs[index].seqType = (*polyobjs[index].segs)->linedef->arg4;
+        }
+        // Next, change the polyobjs first line to point to a mirror
+        //              if it exists
+        (*polyobjs[index].segs)->linedef->arg2 =
+            (*polyobjs[index].segs)->linedef->arg3;
+    }
+}
+
+//==========================================================================
+//
+// TranslateToStartSpot
+//
+//==========================================================================
+
+static void TranslateToStartSpot(int tag, int originX, int originY)
+{
+    seg_t **tempSeg;
+    seg_t **veryTempSeg;
+    vertex_t *tempPt;
+    subsector_t *sub;
+    polyobj_t *po;
+    int deltaX;
+    int deltaY;
+    vertex_t avg;               // used to find a polyobj's center, and hence subsector
+    int i;
+
+    po = NULL;
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        if (polyobjs[i].tag == tag)
+        {
+            po = &polyobjs[i];
+            break;
+        }
+    }
+    if (!po)
+    {                           // didn't match the tag with a polyobj tag
+        I_Error("TranslateToStartSpot:  Unable to match polyobj tag: %d\n",
+                tag);
+    }
+    if (po->segs == NULL)
+    {
+        I_Error
+            ("TranslateToStartSpot:  Anchor point located without a StartSpot point: %d\n",
+             tag);
+    }
+    po->originalPts = Z_Malloc(po->numsegs * sizeof(vertex_t), PU_LEVEL, 0);
+    po->prevPts = Z_Malloc(po->numsegs * sizeof(vertex_t), PU_LEVEL, 0);
+    deltaX = originX - po->startSpot.x;
+    deltaY = originY - po->startSpot.y;
+
+    tempSeg = po->segs;
+    tempPt = po->originalPts;
+    avg.x = 0;
+    avg.y = 0;
+
+    validcount++;
+    for (i = 0; i < po->numsegs; i++, tempSeg++, tempPt++)
+    {
+        if ((*tempSeg)->linedef->validcount != validcount)
+        {
+            (*tempSeg)->linedef->bbox[BOXTOP] -= deltaY;
+            (*tempSeg)->linedef->bbox[BOXBOTTOM] -= deltaY;
+            (*tempSeg)->linedef->bbox[BOXLEFT] -= deltaX;
+            (*tempSeg)->linedef->bbox[BOXRIGHT] -= deltaX;
+            (*tempSeg)->linedef->validcount = validcount;
+        }
+        for (veryTempSeg = po->segs; veryTempSeg != tempSeg; veryTempSeg++)
+        {
+            if ((*veryTempSeg)->v1 == (*tempSeg)->v1)
+            {
+                break;
+            }
+        }
+        if (veryTempSeg == tempSeg)
+        {                       // the point hasn't been translated, yet
+            (*tempSeg)->v1->x -= deltaX;
+            (*tempSeg)->v1->y -= deltaY;
+        }
+        avg.x += (*tempSeg)->v1->x >> FRACBITS;
+        avg.y += (*tempSeg)->v1->y >> FRACBITS;
+        // the original Pts are based off the startSpot Pt, and are
+        // unique to each seg, not each linedef
+        tempPt->x = (*tempSeg)->v1->x - po->startSpot.x;
+        tempPt->y = (*tempSeg)->v1->y - po->startSpot.y;
+    }
+    avg.x /= po->numsegs;
+    avg.y /= po->numsegs;
+    sub = R_PointInSubsector(avg.x << FRACBITS, avg.y << FRACBITS);
+    if (sub->poly != NULL)
+    {
+        I_Error
+            ("PO_TranslateToStartSpot:  Multiple polyobjs in a single subsector.\n");
+    }
+    sub->poly = po;
+}
+
+//==========================================================================
+//
+// PO_Init
+//
+//==========================================================================
+
+void PO_Init(int lump)
+{
+    byte *data;
+    int i;
+    mapthing_t spawnthing;
+    mapthing_t *mt;
+    int numthings;
+    int polyIndex;
+
+    polyobjs = Z_Malloc(po_NumPolyobjs * sizeof(polyobj_t), PU_LEVEL, 0);
+    memset(polyobjs, 0, po_NumPolyobjs * sizeof(polyobj_t));
+
+    data = W_CacheLumpNum(lump, PU_STATIC);
+    numthings = W_LumpLength(lump) / sizeof(mapthing_t);
+    mt = (mapthing_t *) data;
+    polyIndex = 0;              // index polyobj number
+    // Find the startSpot points, and spawn each polyobj
+    for (i = 0; i < numthings; i++, mt++)
+    {
+        spawnthing.x = SHORT(mt->x);
+        spawnthing.y = SHORT(mt->y);
+        spawnthing.angle = SHORT(mt->angle);
+        spawnthing.type = SHORT(mt->type);
+
+        // 3001 = no crush, 3002 = crushing
+        if (spawnthing.type == PO_SPAWN_TYPE
+         || spawnthing.type == PO_SPAWNCRUSH_TYPE)
+        {                       // Polyobj StartSpot Pt.
+            polyobjs[polyIndex].startSpot.x = spawnthing.x << FRACBITS;
+            polyobjs[polyIndex].startSpot.y = spawnthing.y << FRACBITS;
+            polyobjs[polyIndex].startSpot.thinker.function = (think_t) P_DegenMobjThinker;
+            SpawnPolyobj(polyIndex, spawnthing.angle,
+                         (spawnthing.type == PO_SPAWNCRUSH_TYPE));
+            polyIndex++;
+        }
+    }
+    mt = (mapthing_t *) data;
+    for (i = 0; i < numthings; i++, mt++)
+    {
+        spawnthing.x = SHORT(mt->x);
+        spawnthing.y = SHORT(mt->y);
+        spawnthing.angle = SHORT(mt->angle);
+        spawnthing.type = SHORT(mt->type);
+        if (spawnthing.type == PO_ANCHOR_TYPE)
+        {                       // Polyobj Anchor Pt.
+            TranslateToStartSpot(spawnthing.angle,
+                                 spawnthing.x << FRACBITS,
+                                 spawnthing.y << FRACBITS);
+        }
+    }
+    W_ReleaseLumpNum(lump);
+    // check for a startspot without an anchor point
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        if (!polyobjs[i].originalPts)
+        {
+            I_Error
+                ("PO_Init:  StartSpot located without an Anchor point: %d\n",
+                 polyobjs[i].tag);
+        }
+    }
+    InitBlockMap();
+}
+
+//==========================================================================
+//
+// PO_Busy
+//
+//==========================================================================
+
+boolean PO_Busy(int polyobj)
+{
+    polyobj_t *poly;
+
+    poly = GetPolyobj(polyobj);
+    if (!poly->specialdata)
+    {
+        return false;
+    }
+    else
+    {
+        return true;
+    }
+}
diff --git a/games/NXDoom/src/hexen/r_bsp.c b/games/NXDoom/src/hexen/r_bsp.c
new file mode 100644
index 000000000..cae9cbfd4
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_bsp.c
@@ -0,0 +1,508 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "m_bbox.h"
+#include "r_local.h"
+
+seg_t *curline;
+side_t *sidedef;
+line_t *linedef;
+sector_t *frontsector, *backsector;
+
+drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
+
+void R_StoreWallRange(int start, int stop);
+
+/*
+====================
+=
+= R_ClearDrawSegs
+=
+====================
+*/
+
+void R_ClearDrawSegs(void)
+{
+    ds_p = drawsegs;
+}
+
+//=============================================================================
+
+
+/*
+===============================================================================
+=
+= ClipWallSegment
+=
+= Clips the given range of columns and includes it in the new clip list
+===============================================================================
+*/
+
+typedef struct
+{
+    int first, last;
+} cliprange_t;
+
+// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
+// that can be generated in a scene by the DOOM engine. This was determined by
+// Lee Killough during BOOM development to be a function of the screensize.
+// The simplest thing we can do, other than fix this bug, is to let the game
+// render overage and then bomb out by detecting the overflow after the 
+// fact. -haleyjd
+//#define MAXSEGS 32
+#define MAXSEGS (SCREENWIDTH / 2 + 1)
+
+cliprange_t solidsegs[MAXSEGS], *newend;        // newend is one past the last valid seg
+
+
+void R_ClipSolidWallSegment(int first, int last)
+{
+    cliprange_t *next, *start;
+
+// find the first range that touches the range (adjacent pixels are touching)
+    start = solidsegs;
+    while (start->last < first - 1)
+        start++;
+
+    if (first < start->first)
+    {
+        if (last < start->first - 1)
+        {                       // post is entirely visible (above start), so insert a new clippost
+            R_StoreWallRange(first, last);
+            next = newend;
+            newend++;
+            while (next != start)
+            {
+                *next = *(next - 1);
+                next--;
+            }
+            next->first = first;
+            next->last = last;
+            return;
+        }
+
+        // there is a fragment above *start
+        R_StoreWallRange(first, start->first - 1);
+        start->first = first;   // adjust the clip size
+    }
+
+    if (last <= start->last)
+        return;                 // bottom contained in start
+
+    next = start;
+    while (last >= (next + 1)->first - 1)
+    {
+        // there is a fragment between two posts
+        R_StoreWallRange(next->last + 1, (next + 1)->first - 1);
+        next++;
+        if (last <= next->last)
+        {                       // bottom is contained in next
+            start->last = next->last;   // adjust the clip size
+            goto crunch;
+        }
+    }
+
+    // there is a fragment after *next
+    R_StoreWallRange(next->last + 1, last);
+    start->last = last;         // adjust the clip size
+
+
+// remove start+1 to next from the clip list,
+// because start now covers their area
+  crunch:
+    if (next == start)
+        return;                 // post just extended past the bottom of one post
+
+    while (next++ != newend)    // remove a post
+        *++start = *next;
+    newend = start + 1;
+}
+
+/*
+===============================================================================
+=
+= R_ClipPassWallSegment
+=
+= Clips the given range of columns, but does not includes it in the clip list
+===============================================================================
+*/
+
+void R_ClipPassWallSegment(int first, int last)
+{
+    cliprange_t *start;
+
+// find the first range that touches the range (adjacent pixels are touching)
+    start = solidsegs;
+    while (start->last < first - 1)
+        start++;
+
+    if (first < start->first)
+    {
+        if (last < start->first - 1)
+        {                       // post is entirely visible (above start)
+            R_StoreWallRange(first, last);
+            return;
+        }
+
+        // there is a fragment above *start
+        R_StoreWallRange(first, start->first - 1);
+    }
+
+    if (last <= start->last)
+        return;                 // bottom contained in start
+
+    while (last >= (start + 1)->first - 1)
+    {
+        // there is a fragment between two posts
+        R_StoreWallRange(start->last + 1, (start + 1)->first - 1);
+        start++;
+        if (last <= start->last)
+            return;
+    }
+
+    // there is a fragment after *next
+    R_StoreWallRange(start->last + 1, last);
+}
+
+
+
+/*
+====================
+=
+= R_ClearClipSegs
+=
+====================
+*/
+
+void R_ClearClipSegs(void)
+{
+    solidsegs[0].first = -0x7fffffff;
+    solidsegs[0].last = -1;
+    solidsegs[1].first = viewwidth;
+    solidsegs[1].last = 0x7fffffff;
+    newend = solidsegs + 2;
+}
+
+
+//=============================================================================
+
+/*
+======================
+=
+= R_AddLine
+=
+= Clips the given segment and adds any visible pieces to the line list
+=
+======================
+*/
+
+void R_AddLine(seg_t * line)
+{
+    int x1, x2;
+    angle_t angle1, angle2, span, tspan;
+
+    curline = line;
+
+// OPTIMIZE: quickly reject orthogonal back sides
+
+    angle1 = R_PointToAngle(line->v1->x, line->v1->y);
+    angle2 = R_PointToAngle(line->v2->x, line->v2->y);
+
+//
+// clip to view edges
+// OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW)
+    span = angle1 - angle2;
+    if (span >= ANG180)
+        return;                 // back side
+
+    rw_angle1 = angle1;         // global angle needed by segcalc
+    angle1 -= viewangle;
+    angle2 -= viewangle;
+
+    tspan = angle1 + clipangle;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return;             // totally off the left edge
+        angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return;             // totally off the left edge
+        angle2 = -clipangle;
+    }
+
+//
+// the seg is in the view range, but not necessarily visible
+//
+    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
+    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
+    x1 = viewangletox[angle1];
+    x2 = viewangletox[angle2];
+    if (x1 == x2)
+        return;                 // does not cross a pixel
+
+    backsector = line->backsector;
+
+    if (!backsector)
+        goto clipsolid;         // single sided line
+
+    if (backsector->ceilingheight <= frontsector->floorheight
+        || backsector->floorheight >= frontsector->ceilingheight)
+        goto clipsolid;         // closed door
+
+    if (backsector->ceilingheight != frontsector->ceilingheight
+        || backsector->floorheight != frontsector->floorheight)
+        goto clippass;          // window
+
+// reject empty lines used for triggers and special events
+    if (backsector->ceilingpic == frontsector->ceilingpic
+        && backsector->floorpic == frontsector->floorpic
+        && backsector->lightlevel == frontsector->lightlevel
+        && backsector->special == frontsector->special
+        && curline->sidedef->midtexture == 0)
+        return;
+
+  clippass:
+    R_ClipPassWallSegment(x1, x2 - 1);
+    return;
+
+  clipsolid:
+    R_ClipSolidWallSegment(x1, x2 - 1);
+}
+
+//============================================================================
+
+
+/*
+===============================================================================
+=
+= R_CheckBBox
+=
+= Returns true if some part of the bbox might be visible
+=
+===============================================================================
+*/
+
+int checkcoord[12][4] = {
+    {3, 0, 2, 1},
+    {3, 0, 2, 0},
+    {3, 1, 2, 0},
+    {0},
+    {2, 0, 2, 1},
+    {0, 0, 0, 0},
+    {3, 1, 3, 0},
+    {0},
+    {2, 0, 3, 1},
+    {2, 1, 3, 1},
+    {2, 1, 3, 0}
+};
+
+
+boolean R_CheckBBox(fixed_t * bspcoord)
+{
+    int boxx, boxy, boxpos;
+    fixed_t x1, y1, x2, y2;
+    angle_t angle1, angle2, span, tspan;
+    cliprange_t *start;
+    int sx1, sx2;
+
+// find the corners of the box that define the edges from current viewpoint
+    if (viewx <= bspcoord[BOXLEFT])
+        boxx = 0;
+    else if (viewx < bspcoord[BOXRIGHT])
+        boxx = 1;
+    else
+        boxx = 2;
+
+    if (viewy >= bspcoord[BOXTOP])
+        boxy = 0;
+    else if (viewy > bspcoord[BOXBOTTOM])
+        boxy = 1;
+    else
+        boxy = 2;
+
+    boxpos = (boxy << 2) + boxx;
+    if (boxpos == 5)
+        return true;
+
+    x1 = bspcoord[checkcoord[boxpos][0]];
+    y1 = bspcoord[checkcoord[boxpos][1]];
+    x2 = bspcoord[checkcoord[boxpos][2]];
+    y2 = bspcoord[checkcoord[boxpos][3]];
+
+
+//
+// check clip list for an open space
+//
+    angle1 = R_PointToAngle(x1, y1) - viewangle;
+    angle2 = R_PointToAngle(x2, y2) - viewangle;
+
+    span = angle1 - angle2;
+    if (span >= ANG180)
+        return true;            // sitting on a line
+    tspan = angle1 + clipangle;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return false;       // totally off the left edge
+        angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2 * clipangle)
+    {
+        tspan -= 2 * clipangle;
+        if (tspan >= span)
+            return false;       // totally off the left edge
+        angle2 = -clipangle;
+    }
+
+
+// find the first clippost that touches the source post (adjacent pixels are touching)
+    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
+    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
+    sx1 = viewangletox[angle1];
+    sx2 = viewangletox[angle2];
+    if (sx1 == sx2)
+        return false;           // does not cross a pixel
+    sx2--;
+
+    start = solidsegs;
+    while (start->last < sx2)
+        start++;
+    if (sx1 >= start->first && sx2 <= start->last)
+        return false;           // the clippost contains the new span
+
+    return true;
+}
+
+
+/*
+================
+=
+= R_Subsector
+=
+= Draw one or more segments
+================
+*/
+
+void R_Subsector(int num)
+{
+    int count;
+    seg_t *line;
+    subsector_t *sub;
+    int polyCount;
+    seg_t **polySeg;
+
+#ifdef RANGECHECK
+    if (num >= numsubsectors)
+        I_Error("R_Subsector: ss %i with numss = %i", num, numsubsectors);
+#endif
+
+    sscount++;
+    sub = &subsectors[num];
+    frontsector = sub->sector;
+    count = sub->numlines;
+    line = &segs[sub->firstline];
+
+    if (frontsector->floorheight < viewz)
+    {
+        floorplane = R_FindPlane(frontsector->floorheight,
+                                 frontsector->floorpic,
+                                 frontsector->lightlevel,
+                                 frontsector->special);
+    }
+    else
+    {
+        floorplane = NULL;
+    }
+
+    if (frontsector->ceilingheight > viewz
+        || frontsector->ceilingpic == skyflatnum)
+    {
+        ceilingplane = R_FindPlane(frontsector->ceilingheight,
+                                   frontsector->ceilingpic,
+                                   frontsector->lightlevel, 0);
+    }
+    else
+    {
+        ceilingplane = NULL;
+    }
+
+    R_AddSprites(frontsector);
+    if (sub->poly)
+    {                           // Render the polyobj in the subsector first
+        polyCount = sub->poly->numsegs;
+        polySeg = sub->poly->segs;
+        while (polyCount--)
+        {
+            R_AddLine(*polySeg++);
+        }
+    }
+    while (count--)
+    {
+        R_AddLine(line);
+        line++;
+    }
+
+    // check for solidsegs overflow - extremely unsatisfactory!
+    if(newend > &solidsegs[32])
+        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
+}
+
+
+/*
+===============================================================================
+=
+= RenderBSPNode
+=
+===============================================================================
+*/
+
+void R_RenderBSPNode(int bspnum)
+{
+    node_t *bsp;
+    int side;
+
+    if (bspnum & NF_SUBSECTOR)
+    {
+        if (bspnum == -1)
+            R_Subsector(0);
+        else
+            R_Subsector(bspnum & (~NF_SUBSECTOR));
+        return;
+    }
+
+    bsp = &nodes[bspnum];
+
+//
+// decide which side the view point is on
+//
+    side = R_PointOnSide(viewx, viewy, bsp);
+
+    R_RenderBSPNode(bsp->children[side]);       // recursively divide front space
+
+    if (R_CheckBBox(bsp->bbox[side ^ 1]))       // possibly divide back space
+        R_RenderBSPNode(bsp->children[side ^ 1]);
+}
diff --git a/games/NXDoom/src/hexen/r_data.c b/games/NXDoom/src/hexen/r_data.c
new file mode 100644
index 000000000..1c4ef7c36
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_data.c
@@ -0,0 +1,689 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "m_misc.h"
+#include "r_local.h"
+#include "p_local.h"
+
+typedef struct
+{
+    int originx;                // block origin (allways UL), which has allready
+    int originy;                // accounted  for the patch's internal origin
+    int patch;
+} texpatch_t;
+
+// a maptexturedef_t describes a rectangular texture, which is composed of one
+// or more mappatch_t structures that arrange graphic patches
+typedef struct
+{
+    char name[8];               // for switch changing, etc
+    short width;
+    short height;
+    short patchcount;
+    texpatch_t patches[1];      // [patchcount] drawn back to front
+    //  into the cached texture
+} texture_t;
+
+
+
+int firstflat, lastflat, numflats;
+int firstpatch, lastpatch, numpatches;
+int firstspritelump, lastspritelump, numspritelumps;
+
+int numtextures;
+texture_t **textures;
+int *texturewidthmask;
+fixed_t *textureheight;         // needed for texture pegging
+int *texturecompositesize;
+short **texturecolumnlump;
+unsigned short **texturecolumnofs;
+byte **texturecomposite;
+
+int *flattranslation;           // for global animation
+int *texturetranslation;        // for global animation
+
+fixed_t *spritewidth;           // needed for pre rendering
+fixed_t *spriteoffset;
+fixed_t *spritetopoffset;
+
+lighttable_t *colormaps;
+
+
+/*
+==============================================================================
+
+						MAPTEXTURE_T CACHING
+
+when a texture is first needed, it counts the number of composite columns
+required in the texture and allocates space for a column directory and any
+new columns.  The directory will simply point inside other patches if there
+is only one patch in a given column, but any columns with multiple patches
+will have new column_ts generated.
+
+==============================================================================
+*/
+
+/*
+===================
+=
+= R_DrawColumnInCache
+=
+= Clip and draw a column from a patch into a cached post
+=
+===================
+*/
+
+void R_DrawColumnInCache(column_t * patch, byte * cache, int originy,
+                         int cacheheight)
+{
+    int count, position;
+    byte *source;
+
+    while (patch->topdelta != 0xff)
+    {
+        source = (byte *) patch + 3;
+        count = patch->length;
+        position = originy + patch->topdelta;
+        if (position < 0)
+        {
+            count += position;
+            position = 0;
+        }
+        if (position + count > cacheheight)
+            count = cacheheight - position;
+        if (count > 0)
+            memcpy(cache + position, source, count);
+
+        patch = (column_t *) ((byte *) patch + patch->length + 4);
+    }
+}
+
+
+/*
+===================
+=
+= R_GenerateComposite
+=
+===================
+*/
+
+void R_GenerateComposite(int texnum)
+{
+    byte *block;
+    texture_t *texture;
+    texpatch_t *patch;
+    patch_t *realpatch;
+    int x, x1, x2;
+    int i;
+    column_t *patchcol;
+    short *collump;
+    unsigned short *colofs;
+
+    texture = textures[texnum];
+    block = Z_Malloc(texturecompositesize[texnum], PU_STATIC,
+                     &texturecomposite[texnum]);
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+
+//
+// composite the columns together
+//
+    for (i = 0, patch = texture->patches; i < texture->patchcount;
+         i++, patch++)
+    {
+        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
+        x1 = patch->originx;
+        x2 = x1 + SHORT(realpatch->width);
+
+        if (x1 < 0)
+            x = 0;
+        else
+            x = x1;
+        if (x2 > texture->width)
+            x2 = texture->width;
+
+        for (; x < x2; x++)
+        {
+            if (collump[x] >= 0)
+                continue;       // column does not have multiple patches
+            patchcol = (column_t *) ((byte *) realpatch +
+                                     LONG(realpatch->columnofs[x - x1]));
+            R_DrawColumnInCache(patchcol, block + colofs[x], patch->originy,
+                                texture->height);
+        }
+
+    }
+
+// now that the texture has been built, it is purgable
+    Z_ChangeTag(block, PU_CACHE);
+}
+
+
+/*
+===================
+=
+= R_GenerateLookup
+=
+===================
+*/
+
+void R_GenerateLookup(int texnum)
+{
+    texture_t *texture;
+    byte *patchcount;           // [texture->width]
+    texpatch_t *patch;
+    patch_t *realpatch;
+    int x, x1, x2;
+    int i;
+    short *collump;
+    unsigned short *colofs;
+
+    texture = textures[texnum];
+
+    texturecomposite[texnum] = 0;       // composited not created yet
+    texturecompositesize[texnum] = 0;
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+
+//
+// count the number of columns that are covered by more than one patch
+// fill in the lump / offset, so columns with only a single patch are
+// all done
+//
+    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
+    memset(patchcount, 0, texture->width);
+    for (i = 0, patch = texture->patches; i < texture->patchcount;
+         i++, patch++)
+    {
+        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
+        x1 = patch->originx;
+        x2 = x1 + SHORT(realpatch->width);
+        if (x1 < 0)
+            x = 0;
+        else
+            x = x1;
+        if (x2 > texture->width)
+            x2 = texture->width;
+        for (; x < x2; x++)
+        {
+            patchcount[x]++;
+            collump[x] = patch->patch;
+            colofs[x] = LONG(realpatch->columnofs[x - x1]) + 3;
+        }
+    }
+
+    for (x = 0; x < texture->width; x++)
+    {
+        if (!patchcount[x])
+        {
+            ST_Message("R_GenerateLookup: column without a patch (%s)\n",
+                       texture->name);
+            return;
+        }
+//                      I_Error ("R_GenerateLookup: column without a patch");
+        if (patchcount[x] > 1)
+        {
+            collump[x] = -1;    // use the cached block
+            colofs[x] = texturecompositesize[texnum];
+            if (texturecompositesize[texnum] > 0x10000 - texture->height)
+                I_Error("R_GenerateLookup: texture %i is >64k", texnum);
+            texturecompositesize[texnum] += texture->height;
+        }
+    }
+
+    Z_Free(patchcount);
+}
+
+
+/*
+================
+=
+= R_GetColumn
+=
+================
+*/
+
+byte *R_GetColumn(int tex, int col)
+{
+    int lump, ofs;
+
+    col &= texturewidthmask[tex];
+    lump = texturecolumnlump[tex][col];
+    ofs = texturecolumnofs[tex][col];
+    if (lump > 0)
+        return (byte *) W_CacheLumpNum(lump, PU_CACHE) + ofs;
+    if (!texturecomposite[tex])
+        R_GenerateComposite(tex);
+    return texturecomposite[tex] + ofs;
+}
+
+
+/*
+==================
+=
+= R_InitTextures
+=
+= Initializes the texture list with the textures from the world map
+=
+==================
+*/
+
+void R_InitTextures(void)
+{
+    maptexture_t *mtexture;
+    texture_t *texture;
+    mappatch_t *mpatch;
+    texpatch_t *patch;
+    int i, j;
+    int *maptex, *maptex2, *maptex1;
+    char name[9], *names, *name_p;
+    int *patchlookup;
+    int nummappatches;
+    int offset, maxoff, maxoff2;
+    int numtextures1, numtextures2;
+    int *directory;
+
+//
+// load the patch names from pnames.lmp
+//
+    names = W_CacheLumpName("PNAMES", PU_STATIC);
+    nummappatches = LONG(*((int *) names));
+    name_p = names + 4;
+    patchlookup = Z_Malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
+    for (i = 0; i < nummappatches; i++)
+    {
+        M_StringCopy(name, name_p + i * 8, sizeof(name));
+        patchlookup[i] = W_CheckNumForName(name);
+    }
+    W_ReleaseLumpName("PNAMES");
+
+//
+// load the map texture definitions from textures.lmp
+//
+    maptex = maptex1 = W_CacheLumpName("TEXTURE1", PU_STATIC);
+    numtextures1 = LONG(*maptex);
+    maxoff = W_LumpLength(W_GetNumForName("TEXTURE1"));
+    directory = maptex + 1;
+
+    if (W_CheckNumForName("TEXTURE2") != -1)
+    {
+        maptex2 = W_CacheLumpName("TEXTURE2", PU_STATIC);
+        numtextures2 = LONG(*maptex2);
+        maxoff2 = W_LumpLength(W_GetNumForName("TEXTURE2"));
+    }
+    else
+    {
+        maptex2 = NULL;
+        numtextures2 = 0;
+        maxoff2 = 0;
+    }
+    numtextures = numtextures1 + numtextures2;
+
+    textures = Z_Malloc(numtextures * sizeof(texture_t *), PU_STATIC, 0);
+    texturecolumnlump = Z_Malloc(numtextures * sizeof(short *), PU_STATIC, 0);
+    texturecolumnofs = Z_Malloc(numtextures * sizeof(short *), PU_STATIC, 0);
+    texturecomposite = Z_Malloc(numtextures * sizeof(byte *), PU_STATIC, 0);
+    texturecompositesize = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
+    texturewidthmask = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
+    textureheight = Z_Malloc(numtextures * sizeof(fixed_t), PU_STATIC, 0);
+
+    for (i = 0; i < numtextures; i++, directory++)
+    {
+        if (i == numtextures1)
+        {                       // start looking in second texture file
+            maptex = maptex2;
+            maxoff = maxoff2;
+            directory = maptex + 1;
+        }
+
+        offset = LONG(*directory);
+        if (offset > maxoff)
+            I_Error("R_InitTextures: bad texture directory");
+        mtexture = (maptexture_t *) ((byte *) maptex + offset);
+        texture = textures[i] = Z_Malloc(sizeof(texture_t)
+                                         +
+                                         sizeof(texpatch_t) *
+                                         (SHORT(mtexture->patchcount) - 1),
+                                         PU_STATIC, 0);
+        texture->width = SHORT(mtexture->width);
+        texture->height = SHORT(mtexture->height);
+        texture->patchcount = SHORT(mtexture->patchcount);
+        memcpy(texture->name, mtexture->name, sizeof(texture->name));
+        mpatch = &mtexture->patches[0];
+        patch = &texture->patches[0];
+        for (j = 0; j < texture->patchcount; j++, mpatch++, patch++)
+        {
+            patch->originx = SHORT(mpatch->originx);
+            patch->originy = SHORT(mpatch->originy);
+            patch->patch = patchlookup[SHORT(mpatch->patch)];
+            if (patch->patch == -1)
+                I_Error("R_InitTextures: Missing patch in texture %s",
+                        texture->name);
+        }
+        texturecolumnlump[i] = Z_Malloc(texture->width * sizeof(short), PU_STATIC, 0);
+        texturecolumnofs[i] = Z_Malloc(texture->width * sizeof(short), PU_STATIC, 0);
+        j = 1;
+        while (j * 2 <= texture->width)
+            j <<= 1;
+        texturewidthmask[i] = j - 1;
+        textureheight[i] = texture->height << FRACBITS;
+    }
+
+    Z_Free(patchlookup);
+
+    W_ReleaseLumpName("TEXTURE1");
+    if (maptex2)
+        W_ReleaseLumpName("TEXTURE2");
+
+//
+// precalculate whatever possible
+//              
+    for (i = 0; i < numtextures; i++)
+    {
+        R_GenerateLookup(i);
+        if (!(i & 31))
+            ST_Progress();
+    }
+
+//
+// translation table for global animation
+//
+    texturetranslation = Z_Malloc((numtextures + 1) * sizeof(int), PU_STATIC, 0);
+    for (i = 0; i < numtextures; i++)
+        texturetranslation[i] = i;
+}
+
+
+/*
+================
+=
+= R_InitFlats
+=
+=================
+*/
+
+void R_InitFlats(void)
+{
+    int i;
+
+    firstflat = W_GetNumForName("F_START") + 1;
+    lastflat = W_GetNumForName("F_END") - 1;
+    numflats = lastflat - firstflat + 1;
+
+// translation table for global animation
+    flattranslation = Z_Malloc((numflats + 1) * sizeof(int), PU_STATIC, 0);
+    for (i = 0; i < numflats; i++)
+        flattranslation[i] = i;
+}
+
+
+/*
+================
+=
+= R_InitSpriteLumps
+=
+= Finds the width and hoffset of all sprites in the wad, so the sprite doesn't
+= need to be cached just for the header during rendering
+=================
+*/
+
+void R_InitSpriteLumps(void)
+{
+    int i;
+    patch_t *patch;
+
+    firstspritelump = W_GetNumForName("S_START") + 1;
+    lastspritelump = W_GetNumForName("S_END") - 1;
+    numspritelumps = lastspritelump - firstspritelump + 1;
+    spritewidth = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
+    spriteoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
+    spritetopoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
+
+    for (i = 0; i < numspritelumps; i++)
+    {
+        if (!(i & 127))
+            ST_Progress();
+        patch = W_CacheLumpNum(firstspritelump + i, PU_CACHE);
+        spritewidth[i] = SHORT(patch->width) << FRACBITS;
+        spriteoffset[i] = SHORT(patch->leftoffset) << FRACBITS;
+        spritetopoffset[i] = SHORT(patch->topoffset) << FRACBITS;
+    }
+}
+
+
+/*
+================
+=
+= R_InitColormaps
+=
+=================
+*/
+
+void R_InitColormaps(void)
+{
+    int lump, length;
+//
+// load in the light tables
+// 256 byte align tables
+//
+    lump = W_GetNumForName("COLORMAP");
+    length = W_LumpLength(lump);
+    colormaps = Z_Malloc(length, PU_STATIC, 0);
+    W_ReadLump(lump, colormaps);
+}
+
+
+/*
+================
+=
+= R_InitData
+=
+= Locates all the lumps that will be used by all views
+= Must be called after W_Init
+=================
+*/
+
+void R_InitData(void)
+{
+    R_InitTextures();
+    R_InitFlats();
+    R_InitSpriteLumps();
+    R_InitColormaps();
+}
+
+//=============================================================================
+
+/*
+================
+=
+= R_FlatNumForName
+=
+================
+*/
+
+int R_FlatNumForName(const char *name)
+{
+    int i;
+    char namet[9];
+
+    i = W_CheckNumForName(name);
+    if (i == -1)
+    {
+        namet[8] = 0;
+        memcpy(namet, name, 8);
+        I_Error("R_FlatNumForName: %s not found", namet);
+    }
+    return i - firstflat;
+}
+
+
+/*
+================
+=
+= R_CheckTextureNumForName
+=
+================
+*/
+
+int R_CheckTextureNumForName(const char *name)
+{
+    int i;
+
+    if (name[0] == '-')         // no texture marker
+        return 0;
+
+    for (i = 0; i < numtextures; i++)
+        if (!strncasecmp(textures[i]->name, name, 8))
+            return i;
+
+    return -1;
+}
+
+
+/*
+================
+=
+= R_TextureNumForName
+=
+================
+*/
+
+int R_TextureNumForName(const char *name)
+{
+    int i;
+    //char  namet[9];
+
+    i = R_CheckTextureNumForName(name);
+    if (i == -1)
+        I_Error("R_TextureNumForName: %s not found", name);
+
+    return i;
+}
+
+
+/*
+=================
+=
+= R_PrecacheLevel
+=
+= Preloads all relevent graphics for the level
+=================
+*/
+
+int flatmemory, texturememory, spritememory;
+
+void R_PrecacheLevel(void)
+{
+    char *flatpresent;
+    char *texturepresent;
+    char *spritepresent;
+    int i, j, k, lump;
+    texture_t *texture;
+    thinker_t *th;
+    spriteframe_t *sf;
+
+    if (demoplayback)
+        return;
+
+//
+// precache flats
+//      
+    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
+    memset(flatpresent, 0, numflats);
+    for (i = 0; i < numsectors; i++)
+    {
+        flatpresent[sectors[i].floorpic] = 1;
+        flatpresent[sectors[i].ceilingpic] = 1;
+    }
+
+    flatmemory = 0;
+    for (i = 0; i < numflats; i++)
+        if (flatpresent[i])
+        {
+            lump = firstflat + i;
+            flatmemory += lumpinfo[lump]->size;
+            W_CacheLumpNum(lump, PU_CACHE);
+        }
+
+    Z_Free(flatpresent);
+
+//
+// precache textures
+//
+    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
+    memset(texturepresent, 0, numtextures);
+
+    for (i = 0; i < numsides; i++)
+    {
+        texturepresent[sides[i].toptexture] = 1;
+        texturepresent[sides[i].midtexture] = 1;
+        texturepresent[sides[i].bottomtexture] = 1;
+    }
+
+    texturepresent[Sky1Texture] = 1;
+    texturepresent[Sky2Texture] = 1;
+
+    texturememory = 0;
+    for (i = 0; i < numtextures; i++)
+    {
+        if (!texturepresent[i])
+            continue;
+        texture = textures[i];
+        for (j = 0; j < texture->patchcount; j++)
+        {
+            lump = texture->patches[j].patch;
+            texturememory += lumpinfo[lump]->size;
+            W_CacheLumpNum(lump, PU_CACHE);
+        }
+    }
+
+    Z_Free(texturepresent);
+
+//
+// precache sprites
+//
+    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
+    memset(spritepresent, 0, numsprites);
+
+    for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if (th->function == P_MobjThinker)
+            spritepresent[((mobj_t *) th)->sprite] = 1;
+    }
+
+    spritememory = 0;
+    for (i = 0; i < numsprites; i++)
+    {
+        if (!spritepresent[i])
+            continue;
+        for (j = 0; j < sprites[i].numframes; j++)
+        {
+            sf = &sprites[i].spriteframes[j];
+            for (k = 0; k < 8; k++)
+            {
+                lump = firstspritelump + sf->lump[k];
+                spritememory += lumpinfo[lump]->size;
+                W_CacheLumpNum(lump, PU_CACHE);
+            }
+        }
+    }
+
+    Z_Free(spritepresent);
+}
diff --git a/games/NXDoom/src/hexen/r_draw.c b/games/NXDoom/src/hexen/r_draw.c
new file mode 100644
index 000000000..13a0421b4
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_draw.c
@@ -0,0 +1,558 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "r_local.h"
+#include "v_video.h"
+
+/*
+
+All drawing to the view buffer is accomplished in this file.  The other refresh
+files only know about ccordinates, not the architecture of the frame buffer.
+
+*/
+
+byte *viewimage;
+int viewwidth, scaledviewwidth, viewheight, viewwindowx, viewwindowy;
+byte *ylookup[MAXHEIGHT];
+int columnofs[MAXWIDTH];
+//byte translations[3][256]; // color tables for different players
+
+/*
+==================
+=
+= R_DrawColumn
+=
+= Source is the top of the column to scale
+=
+==================
+*/
+
+lighttable_t *dc_colormap;
+int dc_x;
+int dc_yl;
+int dc_yh;
+fixed_t dc_iscale;
+fixed_t dc_texturemid;
+byte *dc_source;                // first pixel in a column (possibly virtual)
+
+int dccount;                    // just for profiling
+
+void R_DrawColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+void R_DrawColumnLow(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+//      dccount++;
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+void R_DrawTLColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    if (!dc_yl)
+        dc_yl = 1;
+    if (dc_yh == viewheight - 1)
+        dc_yh = viewheight - 2;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = tinttable[*dest +
+                          (dc_colormap[dc_source[(frac >> FRACBITS) & 127]] <<
+                           8)];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+//============================================================================
+//
+// R_DrawAltTLColumn
+//
+//============================================================================
+
+void R_DrawAltTLColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    if (!dc_yl)
+        dc_yl = 1;
+    if (dc_yh == viewheight - 1)
+        dc_yh = viewheight - 2;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawAltTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = tinttable[((*dest) << 8)
+                          + dc_colormap[dc_source[(frac >> FRACBITS) & 127]]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+/*
+========================
+=
+= R_DrawTranslatedColumn
+=
+========================
+*/
+
+byte *dc_translation;
+byte *translationtables;
+
+void R_DrawTranslatedColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+//============================================================================
+//
+// R_DrawTranslatedTLColumn
+//
+//============================================================================
+
+void R_DrawTranslatedTLColumn(void)
+{
+    int count;
+    byte *dest;
+    fixed_t frac, fracstep;
+
+    count = dc_yh - dc_yl;
+    if (count < 0)
+        return;
+
+#ifdef RANGECHECK
+    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    fracstep = dc_iscale;
+    frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+    do
+    {
+        *dest = tinttable[((*dest) << 8)
+                          +
+                          dc_colormap[dc_translation
+                                      [dc_source[frac >> FRACBITS]]]];
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    }
+    while (count--);
+}
+
+//============================================================================
+//
+// R_DrawTranslatedAltTLColumn
+//
+//============================================================================
+
+/*
+void R_DrawTranslatedAltTLColumn (void)
+{
+	int			count;
+	byte		*dest;
+	fixed_t		frac, fracstep;	
+
+	count = dc_yh - dc_yl;
+	if (count < 0)
+		return;
+				
+#ifdef RANGECHECK
+	if ((unsigned)dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+		I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
+
+	dest = ylookup[dc_yl] + columnofs[dc_x];
+	
+	fracstep = dc_iscale;
+	frac = dc_texturemid + (dc_yl-centery)*fracstep;
+
+	do
+	{
+		*dest = tinttable[*dest
+			+(dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]]<<8)];
+		dest += SCREENWIDTH;
+		frac += fracstep;
+	} while (count--);
+}
+*/
+
+//--------------------------------------------------------------------------
+//
+// PROC R_InitTranslationTables
+//
+//--------------------------------------------------------------------------
+
+void R_InitTranslationTables(void)
+{
+    int i;
+    byte *transLump;
+    int lumpnum;
+
+    V_LoadTintTable();
+
+    // Allocate translation tables
+    translationtables = Z_Malloc(256 * 3 * (maxplayers - 1), PU_STATIC, 0);
+
+    for (i = 0; i < 3 * (maxplayers - 1); i++)
+    {
+        lumpnum = W_GetNumForName("trantbl0") + i;
+        transLump = W_CacheLumpNum(lumpnum, PU_STATIC);
+        memcpy(translationtables + i * 256, transLump, 256);
+        W_ReleaseLumpNum(lumpnum);
+    }
+}
+
+/*
+================
+=
+= R_DrawSpan
+=
+================
+*/
+
+int ds_y;
+int ds_x1;
+int ds_x2;
+lighttable_t *ds_colormap;
+fixed_t ds_xfrac;
+fixed_t ds_yfrac;
+fixed_t ds_xstep;
+fixed_t ds_ystep;
+byte *ds_source;                // start of a 64*64 tile image
+
+int dscount;                    // just for profiling
+
+void R_DrawSpan(void)
+{
+    fixed_t xfrac, yfrac;
+    byte *dest;
+    int count, spot;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
+        || (unsigned) ds_y > SCREENHEIGHT)
+        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
+//      dscount++;
+#endif
+
+    xfrac = ds_xfrac;
+    yfrac = ds_yfrac;
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+    count = ds_x2 - ds_x1;
+    do
+    {
+        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
+        *dest++ = ds_colormap[ds_source[spot]];
+        xfrac += ds_xstep;
+        yfrac += ds_ystep;
+    }
+    while (count--);
+}
+
+void R_DrawSpanLow(void)
+{
+    fixed_t xfrac, yfrac;
+    byte *dest;
+    int count, spot;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
+        || (unsigned) ds_y > SCREENHEIGHT)
+        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
+//      dscount++;
+#endif
+
+    xfrac = ds_xfrac;
+    yfrac = ds_yfrac;
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+    count = ds_x2 - ds_x1;
+    do
+    {
+        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
+        *dest++ = ds_colormap[ds_source[spot]];
+        xfrac += ds_xstep;
+        yfrac += ds_ystep;
+    }
+    while (count--);
+}
+
+
+
+/*
+================
+=
+= R_InitBuffer
+=
+=================
+*/
+
+void R_InitBuffer(int width, int height)
+{
+    int i;
+
+    viewwindowx = (SCREENWIDTH - width) >> 1;
+    for (i = 0; i < width; i++)
+        columnofs[i] = viewwindowx + i;
+    if (width == SCREENWIDTH)
+        viewwindowy = 0;
+    else
+        viewwindowy = (SCREENHEIGHT - SBARHEIGHT - height) >> 1;
+    for (i = 0; i < height; i++)
+        ylookup[i] = I_VideoBuffer + (i + viewwindowy) * SCREENWIDTH;
+}
+
+
+/*
+==================
+=
+= R_DrawViewBorder
+=
+= Draws the border around the view for different size windows
+==================
+*/
+
+boolean BorderNeedRefresh;
+
+void R_DrawViewBorder(void)
+{
+    byte *src, *dest;
+    int x, y;
+
+    if (scaledviewwidth == SCREENWIDTH)
+        return;
+
+    src = W_CacheLumpName("F_022", PU_CACHE);
+    dest = I_VideoBuffer;
+
+    for (y = 0; y < SCREENHEIGHT - SBARHEIGHT; y++)
+    {
+        for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+            memcpy(dest, src + ((y & 63) << 6), 64);
+            dest += 64;
+        }
+        if (SCREENWIDTH & 63)
+        {
+            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+            dest += (SCREENWIDTH & 63);
+        }
+    }
+    for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
+    {
+        V_DrawPatch(x, viewwindowy - 4, W_CacheLumpName("bordt", PU_CACHE));
+        V_DrawPatch(x, viewwindowy + viewheight, W_CacheLumpName("bordb",
+                                                                 PU_CACHE));
+    }
+    for (y = viewwindowy; y < viewwindowy + viewheight; y += 16)
+    {
+        V_DrawPatch(viewwindowx - 4, y, W_CacheLumpName("bordl", PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, y, W_CacheLumpName("bordr",
+                                                                PU_CACHE));
+    }
+    V_DrawPatch(viewwindowx - 4, viewwindowy - 4, W_CacheLumpName("bordtl",
+                                                                  PU_CACHE));
+    V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
+                W_CacheLumpName("bordtr", PU_CACHE));
+    V_DrawPatch(viewwindowx + viewwidth, viewwindowy + viewheight,
+                W_CacheLumpName("bordbr", PU_CACHE));
+    V_DrawPatch(viewwindowx - 4, viewwindowy + viewheight,
+                W_CacheLumpName("bordbl", PU_CACHE));
+}
+
+/*
+==================
+=
+= R_DrawTopBorder
+=
+= Draws the top border around the view for different size windows
+==================
+*/
+
+boolean BorderTopRefresh;
+
+void R_DrawTopBorder(void)
+{
+    byte *src, *dest;
+    int x, y;
+
+    if (scaledviewwidth == SCREENWIDTH)
+        return;
+
+/*	if(gamemode == shareware)
+	{
+		src = W_CacheLumpName ("FLOOR04", PU_CACHE);
+	}
+	else
+	{
+		src = W_CacheLumpName ("FLAT513", PU_CACHE);
+	}
+*/
+    src = W_CacheLumpName("F_022", PU_CACHE);
+    dest = I_VideoBuffer;
+
+    for (y = 0; y < 34; y++)
+    {
+        for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+            memcpy(dest, src + ((y & 63) << 6), 64);
+            dest += 64;
+        }
+        if (SCREENWIDTH & 63)
+        {
+            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+            dest += (SCREENWIDTH & 63);
+        }
+    }
+    if (viewwindowy < 35)
+    {
+        for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
+        {
+            V_DrawPatch(x, viewwindowy - 4,
+                        W_CacheLumpName("bordt", PU_CACHE));
+        }
+        V_DrawPatch(viewwindowx - 4, viewwindowy, W_CacheLumpName("bordl",
+                                                                  PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, viewwindowy,
+                    W_CacheLumpName("bordr", PU_CACHE));
+        V_DrawPatch(viewwindowx - 4, viewwindowy + 16,
+                    W_CacheLumpName("bordl", PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, viewwindowy + 16,
+                    W_CacheLumpName("bordr", PU_CACHE));
+
+        V_DrawPatch(viewwindowx - 4, viewwindowy - 4,
+                    W_CacheLumpName("bordtl", PU_CACHE));
+        V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
+                    W_CacheLumpName("bordtr", PU_CACHE));
+    }
+}
diff --git a/games/NXDoom/src/hexen/r_local.h b/games/NXDoom/src/hexen/r_local.h
new file mode 100644
index 000000000..e9cb26ce0
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_local.h
@@ -0,0 +1,554 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __R_LOCAL__
+#define __R_LOCAL__
+
+#include "i_video.h"
+
+#define ANGLETOSKYSHIFT         22      // sky map is 256*128*4 maps
+
+#define BASEYCENTER                     100
+
+#define MAXWIDTH                        1120
+#define MAXHEIGHT                       832
+
+#define PI                                      3.141592657
+
+#define CENTERY                         (SCREENHEIGHT/2)
+
+#define MINZ                    (FRACUNIT*4)
+
+#define FIELDOFVIEW             2048    // fineangles in the SCREENWIDTH wide window
+
+//
+// lighting constants
+//
+#define LIGHTLEVELS                     16
+#define LIGHTSEGSHIFT           4
+#define MAXLIGHTSCALE           48
+#define LIGHTSCALESHIFT         12
+#define MAXLIGHTZ                       128
+#define LIGHTZSHIFT                     20
+#define NUMCOLORMAPS            32      // number of diminishing
+#define INVERSECOLORMAP         32
+
+/*
+==============================================================================
+
+					INTERNAL MAP TYPES
+
+==============================================================================
+*/
+
+//================ used by play and refresh
+
+typedef struct
+{
+    fixed_t x, y;
+} vertex_t;
+
+struct line_s;
+
+typedef struct
+{
+    fixed_t floorheight, ceilingheight;
+    short floorpic, ceilingpic;
+    short lightlevel;
+    short special, tag;
+
+    int soundtraversed;         // 0 = untraversed, 1,2 = sndlines -1
+    mobj_t *soundtarget;        // thing that made a sound (or null)
+    seqtype_t seqType;          // stone, metal, heavy, etc...
+
+    int blockbox[4];            // mapblock bounding box for height changes
+    degenmobj_t soundorg;       // for any sounds played by the sector
+    int validcount;             // if == validcount, already checked
+    mobj_t *thinglist;          // list of mobjs in sector
+    void *specialdata;          // thinker_t for reversable actions
+    int linecount;
+    struct line_s **lines;      // [linecount] size
+} sector_t;
+
+typedef struct
+{
+    fixed_t textureoffset;      // add this to the calculated texture col
+    fixed_t rowoffset;          // add this to the calculated texture top
+    short toptexture, bottomtexture, midtexture;
+    sector_t *sector;
+} side_t;
+
+typedef enum
+{
+    ST_HORIZONTAL,
+    ST_VERTICAL,
+    ST_POSITIVE,
+    ST_NEGATIVE
+} slopetype_t;
+
+/*
+typedef struct line_s
+{
+	vertex_t        *v1, *v2;
+	fixed_t         dx,dy;                          // v2 - v1 for side checking
+	short           flags;
+	short           special, tag;
+	short           sidenum[2];                     // sidenum[1] will be -1 if one sided
+	fixed_t         bbox[4];
+	slopetype_t     slopetype;                      // to aid move clipping
+	sector_t        *frontsector, *backsector;
+	int                     validcount;                     // if == validcount, already checked
+	void            *specialdata;           // thinker_t for reversable actions
+} line_t;
+*/
+
+typedef struct line_s
+{
+    vertex_t *v1;
+    vertex_t *v2;
+    fixed_t dx;
+    fixed_t dy;
+    short flags;
+    byte special;
+    byte arg1;
+    byte arg2;
+    byte arg3;
+    byte arg4;
+    byte arg5;
+    short sidenum[2];
+    fixed_t bbox[4];
+    slopetype_t slopetype;
+    sector_t *frontsector;
+    sector_t *backsector;
+    int validcount;
+    void *specialdata;
+} line_t;
+
+typedef struct
+{
+    vertex_t *v1, *v2;
+    fixed_t offset;
+    angle_t angle;
+    side_t *sidedef;
+    line_t *linedef;
+    sector_t *frontsector;
+    sector_t *backsector;       // NULL for one sided lines
+} seg_t;
+
+// ===== Polyobj data =====
+typedef struct
+{
+    int numsegs;
+    seg_t **segs;
+    degenmobj_t startSpot;
+    vertex_t *originalPts;      // used as the base for the rotations
+    vertex_t *prevPts;          // use to restore the old point values
+    angle_t angle;
+    int tag;                    // reference tag assigned in HereticEd
+    int bbox[4];
+    int validcount;
+    boolean crush;              // should the polyobj attempt to crush mobjs?
+    int seqType;
+    fixed_t size;               // polyobj size (area of POLY_AREAUNIT == size of FRACUNIT)
+    void *specialdata;          // pointer a thinker, if the poly is moving
+} polyobj_t;
+
+typedef struct polyblock_s
+{
+    polyobj_t *polyobj;
+    struct polyblock_s *prev;
+    struct polyblock_s *next;
+} polyblock_t;
+
+typedef struct subsector_s
+{
+    sector_t *sector;
+    short numlines;
+    short firstline;
+    polyobj_t *poly;
+} subsector_t;
+
+typedef struct
+{
+    fixed_t x, y, dx, dy;       // partition line
+    fixed_t bbox[2][4];         // bounding box for each child
+    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
+} node_t;
+
+
+/*
+==============================================================================
+
+						OTHER TYPES
+
+==============================================================================
+*/
+
+typedef byte lighttable_t;      // this could be wider for >8 bit display
+
+#define MAXVISPLANES    160
+#define MAXOPENINGS             SCREENWIDTH*64
+
+typedef struct
+{
+    fixed_t height;
+    int picnum;
+    int lightlevel;
+    int special;
+    int minx, maxx;
+    byte pad1;                  // leave pads for [minx-1]/[maxx+1]
+    byte top[SCREENWIDTH];
+    byte pad2;
+    byte pad3;
+    byte bottom[SCREENWIDTH];
+    byte pad4;
+} visplane_t;
+
+typedef struct drawseg_s
+{
+    seg_t *curline;
+    int x1, x2;
+    fixed_t scale1, scale2, scalestep;
+    int silhouette;             // 0=none, 1=bottom, 2=top, 3=both
+    fixed_t bsilheight;         // don't clip sprites above this
+    fixed_t tsilheight;         // don't clip sprites below this
+// pointers to lists for sprite clipping
+    short *sprtopclip;          // adjusted so [x1] is first value
+    short *sprbottomclip;       // adjusted so [x1] is first value
+    short *maskedtexturecol;    // adjusted so [x1] is first value
+} drawseg_t;
+
+#define SIL_NONE        0
+#define SIL_BOTTOM      1
+#define SIL_TOP         2
+#define SIL_BOTH        3
+
+#define MAXDRAWSEGS             256
+
+// A vissprite_t is a thing that will be drawn during a refresh
+typedef struct vissprite_s
+{
+    struct vissprite_s *prev, *next;
+    int x1, x2;
+    fixed_t gx, gy;             // for line side calculation
+    fixed_t gz, gzt;            // global bottom / top for silhouette clipping
+    fixed_t startfrac;          // horizontal position of x1
+    fixed_t scale;
+    fixed_t xiscale;            // negative if flipped
+    fixed_t texturemid;
+    int patch;
+    lighttable_t *colormap;
+    int mobjflags;              // for color translation and shadow draw
+    boolean psprite;            // true if psprite
+    int class;                  // player class (used in translation)
+    fixed_t floorclip;
+} vissprite_t;
+
+
+extern visplane_t *floorplane, *ceilingplane;
+
+// Sprites are patches with a special naming convention so they can be
+// recognized by R_InitSprites.  The sprite and frame specified by a
+// thing_t is range checked at run time.
+// a sprite is a patch_t that is assumed to represent a three dimensional
+// object and may have multiple rotations pre drawn.  Horizontal flipping
+// is used to save space. Some sprites will only have one picture used
+// for all views.
+
+typedef struct
+{
+    boolean rotate;             // if false use 0 for any position
+    short lump[8];              // lump to use for view angles 0-7
+    byte flip[8];               // flip (1 = flip) to use for view angles 0-7
+} spriteframe_t;
+
+typedef struct
+{
+    int numframes;
+    spriteframe_t *spriteframes;
+} spritedef_t;
+
+extern spritedef_t *sprites;
+extern int numsprites;
+
+//=============================================================================
+
+extern int numvertexes;
+extern vertex_t *vertexes;
+
+extern int numsegs;
+extern seg_t *segs;
+
+extern int numsectors;
+extern sector_t *sectors;
+
+extern int numsubsectors;
+extern subsector_t *subsectors;
+
+extern int numnodes;
+extern node_t *nodes;
+
+extern int numlines;
+extern line_t *lines;
+
+extern int numsides;
+extern side_t *sides;
+
+
+
+extern fixed_t viewx, viewy, viewz;
+extern angle_t viewangle;
+extern player_t *viewplayer;
+
+
+extern angle_t clipangle;
+
+extern int viewangletox[FINEANGLES / 2];
+extern angle_t xtoviewangle[SCREENWIDTH + 1];
+
+extern fixed_t rw_distance;
+extern angle_t rw_normalangle;
+
+//
+// R_main.c
+//
+extern int screenblocks;
+extern int viewwidth, viewheight, viewwindowx, viewwindowy;
+extern int scaledviewwidth;
+extern int centerx, centery;
+extern int flyheight;
+extern fixed_t centerxfrac;
+extern fixed_t centeryfrac;
+extern fixed_t projection;
+
+extern int validcount;
+
+extern int sscount, linecount, loopcount;
+extern lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+extern lighttable_t *scalelightfixed[MAXLIGHTSCALE];
+extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+extern int extralight;
+extern lighttable_t *fixedcolormap;
+
+extern fixed_t viewcos, viewsin;
+
+extern int detailshift;         // 0 = high, 1 = low
+
+extern void (*colfunc) (void);
+extern void (*basecolfunc) (void);
+extern void (*tlcolfunc) (void);
+extern void (*spanfunc) (void);
+
+int R_PointOnSide(fixed_t x, fixed_t y, node_t * node);
+int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line);
+angle_t R_PointToAngle(fixed_t x, fixed_t y);
+angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
+fixed_t R_PointToDist(fixed_t x, fixed_t y);
+fixed_t R_ScaleFromGlobalAngle(angle_t visangle);
+subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
+//void R_AddPointToBox (int x, int y, fixed_t *box);
+
+
+//
+// R_bsp.c
+//
+extern seg_t *curline;
+extern side_t *sidedef;
+extern line_t *linedef;
+extern sector_t *frontsector, *backsector;
+
+extern int rw_x;
+extern int rw_stopx;
+
+extern boolean segtextured;
+extern boolean markfloor;       // false if the back side is the same plane
+extern boolean markceiling;
+extern boolean skymap;
+
+extern drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
+
+extern lighttable_t **hscalelight, **vscalelight, **dscalelight;
+
+typedef void (*drawfunc_t) (int start, int stop);
+void R_ClearClipSegs(void);
+
+void R_ClearDrawSegs(void);
+void R_InitSkyMap(void);
+void R_RenderBSPNode(int bspnum);
+
+//
+// R_segs.c
+//
+extern int rw_angle1;           // angle to line origin
+extern int TransTextureStart;
+extern int TransTextureEnd;
+extern lighttable_t **walllights;
+
+
+void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2);
+
+//
+// R_plane.c
+//
+typedef void (*planefunction_t) (int top, int bottom);
+extern planefunction_t floorfunc, ceilingfunc;
+
+extern fixed_t Sky1ColumnOffset;
+extern fixed_t Sky2ColumnOffset;
+extern int skyflatnum;
+extern boolean DoubleSky;
+
+extern short openings[MAXOPENINGS], *lastopening;
+
+extern short floorclip[SCREENWIDTH];
+extern short ceilingclip[SCREENWIDTH];
+
+extern fixed_t yslope[SCREENHEIGHT];
+extern fixed_t distscale[SCREENWIDTH];
+
+void R_InitPlanes(void);
+void R_ClearPlanes(void);
+void R_MapPlane(int y, int x1, int x2);
+void R_MakeSpans(int x, int t1, int b1, int t2, int b2);
+void R_DrawPlanes(void);
+
+visplane_t *R_FindPlane(fixed_t height, int picnum, int lightlevel,
+                        int special);
+visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop);
+
+void R_InitSky(int map);
+
+
+//
+// R_debug.m
+//
+extern int drawbsp;
+
+void RD_OpenMapWindow(void);
+void RD_ClearMapWindow(void);
+void RD_DisplayLine(int x1, int y1, int x2, int y2, float gray);
+void RD_DrawNodeLine(node_t * node);
+void RD_DrawLineCheck(seg_t * line);
+void RD_DrawLine(seg_t * line);
+void RD_DrawBBox(fixed_t * bbox);
+
+
+//
+// R_data.c
+//
+extern fixed_t *textureheight;  // needed for texture pegging
+extern fixed_t *spritewidth;    // needed for pre rendering (fracs)
+extern fixed_t *spriteoffset;
+extern fixed_t *spritetopoffset;
+extern lighttable_t *colormaps;
+extern int firstflat;
+extern int numflats;
+
+extern int *flattranslation;    // for global animation
+extern int *texturetranslation; // for global animation
+
+extern int firstspritelump, lastspritelump, numspritelumps;
+extern boolean LevelUseFullBright;
+
+byte *R_GetColumn(int tex, int col);
+void R_InitData(void);
+void R_PrecacheLevel(void);
+
+
+//
+// R_things.c
+//
+#define MAXVISSPRITES   192
+
+extern vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
+extern vissprite_t vsprsortedhead;
+
+// constant arrays used for psprite clipping and initializing clipping
+extern short negonearray[SCREENWIDTH];
+extern short screenheightarray[SCREENWIDTH];
+
+// vars for R_DrawMaskedColumn
+extern short *mfloorclip;
+extern short *mceilingclip;
+extern fixed_t spryscale;
+extern fixed_t sprtopscreen;
+extern fixed_t sprbotscreen;
+
+extern fixed_t pspritescale, pspriteiscale;
+
+
+void R_DrawMaskedColumn(column_t * column, signed int baseclip);
+
+
+void R_SortVisSprites(void);
+
+void R_AddSprites(sector_t * sec);
+void R_AddPSprites(void);
+void R_DrawSprites(void);
+void R_InitSprites(const char **namelist);
+void R_ClearSprites(void);
+void R_DrawMasked(void);
+void R_ClipVisSprite(vissprite_t * vis, int xl, int xh);
+
+//=============================================================================
+//
+// R_draw.c
+//
+//=============================================================================
+
+extern lighttable_t *dc_colormap;
+extern int dc_x;
+extern int dc_yl;
+extern int dc_yh;
+extern fixed_t dc_iscale;
+extern fixed_t dc_texturemid;
+extern byte *dc_source;         // first pixel in a column
+extern byte *ylookup[MAXHEIGHT];
+extern int columnofs[MAXWIDTH];
+
+
+void R_DrawColumn(void);
+void R_DrawColumnLow(void);
+void R_DrawTLColumn(void);
+void R_DrawTLColumnLow(void);
+void R_DrawTranslatedColumn(void);
+void R_DrawTranslatedTLColumn(void);
+void R_DrawTranslatedColumnLow(void);
+void R_DrawAltTLColumn(void);
+//void  R_DrawTranslatedAltTLColumn(void);
+
+extern int ds_y;
+extern int ds_x1;
+extern int ds_x2;
+extern lighttable_t *ds_colormap;
+extern fixed_t ds_xfrac;
+extern fixed_t ds_yfrac;
+extern fixed_t ds_xstep;
+extern fixed_t ds_ystep;
+extern byte *ds_source;         // start of a 64*64 tile image
+
+extern byte *translationtables;
+extern byte *dc_translation;
+
+void R_DrawSpan(void);
+void R_DrawSpanLow(void);
+
+void R_InitBuffer(int width, int height);
+void R_InitTranslationTables(void);
+
+#endif // __R_LOCAL__
diff --git a/games/NXDoom/src/hexen/r_main.c b/games/NXDoom/src/hexen/r_main.c
new file mode 100644
index 000000000..3bbb4fce2
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_main.c
@@ -0,0 +1,830 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include <math.h>
+#include "m_random.h"
+#include "h2def.h"
+#include "m_bbox.h"
+#include "r_local.h"
+
+int viewangleoffset;
+
+// haleyjd: removed WATCOMC
+
+int validcount = 1;             // increment every time a check is made
+
+lighttable_t *fixedcolormap;
+
+int centerx, centery;
+fixed_t centerxfrac, centeryfrac;
+fixed_t projection;
+
+int framecount;                 // just for profiling purposes
+
+int sscount, linecount, loopcount;
+
+fixed_t viewx, viewy, viewz;
+angle_t viewangle;
+fixed_t viewcos, viewsin;
+player_t *viewplayer;
+
+int detailshift;                // 0 = high, 1 = low
+
+//
+// precalculated math tables
+//
+angle_t clipangle;
+
+// The viewangletox[viewangle + FINEANGLES/4] lookup maps the visible view
+// angles  to screen X coordinates, flattening the arc to a flat projection
+// plane.  There will be many angles mapped to the same X.
+int viewangletox[FINEANGLES / 2];
+
+// The xtoviewangleangle[] table maps a screen pixel to the lowest viewangle
+// that maps back to x ranges from clipangle to -clipangle
+angle_t xtoviewangle[SCREENWIDTH + 1];
+
+lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+lighttable_t *scalelightfixed[MAXLIGHTSCALE];
+lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+int extralight;                 // bumped light from gun blasts
+
+void (*colfunc) (void);
+void (*basecolfunc) (void);
+void (*tlcolfunc) (void);
+void (*transcolfunc) (void);
+void (*spanfunc) (void);
+
+/*
+===================
+=
+= R_AddPointToBox
+=
+===================
+*/
+
+/*
+void R_AddPointToBox (int x, int y, fixed_t *box)
+{
+	if (x< box[BOXLEFT])
+		box[BOXLEFT] = x;
+	if (x> box[BOXRIGHT])
+		box[BOXRIGHT] = x;
+	if (y< box[BOXBOTTOM])
+		box[BOXBOTTOM] = y;
+	if (y> box[BOXTOP])
+		box[BOXTOP] = y;
+}
+*/
+
+
+/*
+===============================================================================
+=
+= R_PointOnSide
+=
+= Returns side 0 (front) or 1 (back)
+===============================================================================
+*/
+
+int R_PointOnSide(fixed_t x, fixed_t y, node_t * node)
+{
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    if (!node->dx)
+    {
+        if (x <= node->x)
+            return node->dy > 0;
+        return node->dy < 0;
+    }
+    if (!node->dy)
+    {
+        if (y <= node->y)
+            return node->dx < 0;
+        return node->dx > 0;
+    }
+
+    dx = (x - node->x);
+    dy = (y - node->y);
+
+// try to quickly decide by looking at sign bits
+    if ((node->dy ^ node->dx ^ dx ^ dy) & 0x80000000)
+    {
+        if ((node->dy ^ dx) & 0x80000000)
+            return 1;           // (left is negative)
+        return 0;
+    }
+
+    left = FixedMul(node->dy >> FRACBITS, dx);
+    right = FixedMul(dy, node->dx >> FRACBITS);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line)
+{
+    fixed_t lx, ly;
+    fixed_t ldx, ldy;
+    fixed_t dx, dy;
+    fixed_t left, right;
+
+    lx = line->v1->x;
+    ly = line->v1->y;
+
+    ldx = line->v2->x - lx;
+    ldy = line->v2->y - ly;
+
+    if (!ldx)
+    {
+        if (x <= lx)
+            return ldy > 0;
+        return ldy < 0;
+    }
+    if (!ldy)
+    {
+        if (y <= ly)
+            return ldx < 0;
+        return ldx > 0;
+    }
+
+    dx = (x - lx);
+    dy = (y - ly);
+
+// try to quickly decide by looking at sign bits
+    if ((ldy ^ ldx ^ dx ^ dy) & 0x80000000)
+    {
+        if ((ldy ^ dx) & 0x80000000)
+            return 1;           // (left is negative)
+        return 0;
+    }
+
+    left = FixedMul(ldy >> FRACBITS, dx);
+    right = FixedMul(dy, ldx >> FRACBITS);
+
+    if (right < left)
+        return 0;               // front side
+    return 1;                   // back side
+}
+
+
+/*
+===============================================================================
+=
+= R_PointToAngle
+=
+===============================================================================
+*/
+
+#define	DBITS		(FRACBITS-SLOPEBITS)
+
+angle_t R_PointToAngle(fixed_t x, fixed_t y)
+{
+    x -= viewx;
+    y -= viewy;
+    if ((!x) && (!y))
+        return 0;
+    if (x >= 0)
+    {                           // x >=0
+        if (y >= 0)
+        {                       // y>= 0
+            if (x > y)
+                return tantoangle[SlopeDiv(y, x)];      // octant 0
+            else
+                return ANG90 - 1 - tantoangle[SlopeDiv(x, y)];  // octant 1
+        }
+        else
+        {                       // y<0
+            y = -y;
+            if (x > y)
+                return -tantoangle[SlopeDiv(y, x)];     // octant 8
+            else
+                return ANG270 + tantoangle[SlopeDiv(x, y)];     // octant 7
+        }
+    }
+    else
+    {                           // x<0
+        x = -x;
+        if (y >= 0)
+        {                       // y>= 0
+            if (x > y)
+                return ANG180 - 1 - tantoangle[SlopeDiv(y, x)]; // octant 3
+            else
+                return ANG90 + tantoangle[SlopeDiv(x, y)];      // octant 2
+        }
+        else
+        {                       // y<0
+            y = -y;
+            if (x > y)
+                return ANG180 + tantoangle[SlopeDiv(y, x)];     // octant 4
+            else
+                return ANG270 - 1 - tantoangle[SlopeDiv(x, y)]; // octant 5
+        }
+    }
+
+    return 0;
+}
+
+
+angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
+{
+    viewx = x1;
+    viewy = y1;
+    return R_PointToAngle(x2, y2);
+}
+
+
+fixed_t R_PointToDist(fixed_t x, fixed_t y)
+{
+    int angle;
+    fixed_t dx, dy, temp;
+    fixed_t dist;
+
+    dx = abs(x - viewx);
+    dy = abs(y - viewy);
+
+    if (dy > dx)
+    {
+        temp = dx;
+        dx = dy;
+        dy = temp;
+    }
+
+    angle =
+        (tantoangle[FixedDiv(dy, dx) >> DBITS] + ANG90) >> ANGLETOFINESHIFT;
+
+    dist = FixedDiv(dx, finesine[angle]);       // use as cosine
+
+    return dist;
+}
+
+
+
+/*
+=================
+=
+= R_InitPointToAngle
+=
+=================
+*/
+
+void R_InitPointToAngle(void)
+{
+// now getting from tables.c
+#if 0
+    int i;
+    long t;
+    float f;
+//
+// slope (tangent) to angle lookup
+//
+    for (i = 0; i <= SLOPERANGE; i++)
+    {
+        f = atan((float) i / SLOPERANGE) / (3.141592657 * 2);
+        t = 0xffffffff * f;
+        tantoangle[i] = t;
+    }
+#endif
+}
+
+//=============================================================================
+
+/*
+================
+=
+= R_ScaleFromGlobalAngle
+=
+= Returns the texture mapping scale for the current line at the given angle
+= rw_distance must be calculated first
+================
+*/
+
+fixed_t R_ScaleFromGlobalAngle(angle_t visangle)
+{
+    fixed_t scale;
+    int anglea, angleb;
+    int sinea, sineb;
+    fixed_t num, den;
+
+#if 0
+    {
+        fixed_t dist, z;
+        fixed_t sinv, cosv;
+
+        sinv = finesine[(visangle - rw_normalangle) >> ANGLETOFINESHIFT];
+        dist = FixedDiv(rw_distance, sinv);
+        cosv = finecosine[(viewangle - visangle) >> ANGLETOFINESHIFT];
+        z = abs(FixedMul(dist, cosv));
+        scale = FixedDiv(projection, z);
+        return scale;
+    }
+#endif
+
+    anglea = ANG90 + (visangle - viewangle);
+    angleb = ANG90 + (visangle - rw_normalangle);
+// bothe sines are allways positive
+    sinea = finesine[anglea >> ANGLETOFINESHIFT];
+    sineb = finesine[angleb >> ANGLETOFINESHIFT];
+    num = FixedMul(projection, sineb) << detailshift;
+    den = FixedMul(rw_distance, sinea);
+    if (den > num >> 16)
+    {
+        scale = FixedDiv(num, den);
+        if (scale > 64 * FRACUNIT)
+            scale = 64 * FRACUNIT;
+        else if (scale < 256)
+            scale = 256;
+    }
+    else
+        scale = 64 * FRACUNIT;
+
+    return scale;
+}
+
+
+
+/*
+=================
+=
+= R_InitTables
+=
+=================
+*/
+
+void R_InitTables(void)
+{
+// now getting from tables.c
+#if 0
+    int i;
+    float a, fv;
+    int t;
+
+//
+// viewangle tangent table
+//
+    for (i = 0; i < FINEANGLES / 2; i++)
+    {
+        a = (i - FINEANGLES / 4 + 0.5) * PI * 2 / FINEANGLES;
+        fv = FRACUNIT * tan(a);
+        t = fv;
+        finetangent[i] = t;
+    }
+
+//
+// finesine table
+//
+    for (i = 0; i < 5 * FINEANGLES / 4; i++)
+    {
+// OPTIMIZE: mirror...
+        a = (i + 0.5) * PI * 2 / FINEANGLES;
+        t = FRACUNIT * sin(a);
+        finesine[i] = t;
+    }
+#endif
+
+}
+
+
+/*
+=================
+=
+= R_InitTextureMapping
+=
+=================
+*/
+
+void R_InitTextureMapping(void)
+{
+    int i;
+    int x;
+    int t;
+    fixed_t focallength;
+
+
+//
+// use tangent table to generate viewangletox
+// viewangletox will give the next greatest x after the view angle
+//
+    // calc focallength so FIELDOFVIEW angles covers SCREENWIDTH
+    focallength =
+        FixedDiv(centerxfrac, finetangent[FINEANGLES / 4 + FIELDOFVIEW / 2]);
+
+    for (i = 0; i < FINEANGLES / 2; i++)
+    {
+        if (finetangent[i] > FRACUNIT * 2)
+            t = -1;
+        else if (finetangent[i] < -FRACUNIT * 2)
+            t = viewwidth + 1;
+        else
+        {
+            t = FixedMul(finetangent[i], focallength);
+            t = (centerxfrac - t + FRACUNIT - 1) >> FRACBITS;
+            if (t < -1)
+                t = -1;
+            else if (t > viewwidth + 1)
+                t = viewwidth + 1;
+        }
+        viewangletox[i] = t;
+    }
+
+//
+// scan viewangletox[] to generate xtoviewangleangle[]
+//
+// xtoviewangle will give the smallest view angle that maps to x
+    for (x = 0; x <= viewwidth; x++)
+    {
+        i = 0;
+        while (viewangletox[i] > x)
+            i++;
+        xtoviewangle[x] = (i << ANGLETOFINESHIFT) - ANG90;
+    }
+
+//
+// take out the fencepost cases from viewangletox
+//
+    for (i = 0; i < FINEANGLES / 2; i++)
+    {
+        t = FixedMul(finetangent[i], focallength);
+        t = centerx - t;
+        if (viewangletox[i] == -1)
+            viewangletox[i] = 0;
+        else if (viewangletox[i] == viewwidth + 1)
+            viewangletox[i] = viewwidth;
+    }
+
+    clipangle = xtoviewangle[0];
+}
+
+//=============================================================================
+
+/*
+====================
+=
+= R_InitLightTables
+=
+= Only inits the zlight table, because the scalelight table changes
+= with view size
+=
+====================
+*/
+
+#define		DISTMAP	2
+
+void R_InitLightTables(void)
+{
+    int i, j, level, startmap;
+    int scale;
+
+//
+// Calculate the light levels to use for each level / distance combination
+//
+    for (i = 0; i < LIGHTLEVELS; i++)
+    {
+        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
+        for (j = 0; j < MAXLIGHTZ; j++)
+        {
+            scale =
+                FixedDiv((SCREENWIDTH / 2 * FRACUNIT),
+                         (j + 1) << LIGHTZSHIFT);
+            scale >>= LIGHTSCALESHIFT;
+            level = startmap - scale / DISTMAP;
+            if (level < 0)
+                level = 0;
+            if (level >= NUMCOLORMAPS)
+                level = NUMCOLORMAPS - 1;
+            zlight[i][j] = colormaps + level * 256;
+        }
+    }
+}
+
+
+/*
+==============
+=
+= R_SetViewSize
+=
+= Don't really change anything here, because i might be in the middle of
+= a refresh.  The change will take effect next refresh.
+=
+==============
+*/
+
+boolean setsizeneeded;
+int setblocks, setdetail;
+
+void R_SetViewSize(int blocks, int detail)
+{
+    setsizeneeded = true;
+    setblocks = blocks;
+    setdetail = detail;
+}
+
+/*
+==============
+=
+= R_ExecuteSetViewSize
+=
+==============
+*/
+
+void R_ExecuteSetViewSize(void)
+{
+    fixed_t cosadj, dy;
+    int i, j, level, startmap;
+
+    setsizeneeded = false;
+
+    if (setblocks == 11)
+    {
+        scaledviewwidth = SCREENWIDTH;
+        viewheight = SCREENHEIGHT;
+    }
+    else
+    {
+        scaledviewwidth = setblocks * 32;
+        viewheight = (setblocks * 161 / 10);
+    }
+
+    detailshift = setdetail;
+    viewwidth = scaledviewwidth >> detailshift;
+
+    centery = viewheight / 2;
+    centerx = viewwidth / 2;
+    centerxfrac = centerx << FRACBITS;
+    centeryfrac = centery << FRACBITS;
+    projection = centerxfrac;
+
+    if (!detailshift)
+    {
+        colfunc = basecolfunc = R_DrawColumn;
+        tlcolfunc = R_DrawTLColumn;
+        transcolfunc = R_DrawTranslatedColumn;
+        spanfunc = R_DrawSpan;
+    }
+    else
+    {
+        colfunc = basecolfunc = R_DrawColumnLow;
+        tlcolfunc = R_DrawTLColumn;
+        transcolfunc = R_DrawTranslatedColumn;
+        spanfunc = R_DrawSpanLow;
+    }
+
+    R_InitBuffer(scaledviewwidth, viewheight);
+
+    R_InitTextureMapping();
+
+//
+// psprite scales
+//
+    pspritescale = FRACUNIT * viewwidth / SCREENWIDTH;
+    pspriteiscale = FRACUNIT * SCREENWIDTH / viewwidth;
+
+//
+// thing clipping
+//
+    for (i = 0; i < viewwidth; i++)
+        screenheightarray[i] = viewheight;
+
+//
+// planes
+//
+    for (i = 0; i < viewheight; i++)
+    {
+        dy = ((i - viewheight / 2) << FRACBITS) + FRACUNIT / 2;
+        dy = abs(dy);
+        yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT, dy);
+    }
+
+    for (i = 0; i < viewwidth; i++)
+    {
+        cosadj = abs(finecosine[xtoviewangle[i] >> ANGLETOFINESHIFT]);
+        distscale[i] = FixedDiv(FRACUNIT, cosadj);
+    }
+
+//
+// Calculate the light levels to use for each level / scale combination
+//
+    for (i = 0; i < LIGHTLEVELS; i++)
+    {
+        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
+        for (j = 0; j < MAXLIGHTSCALE; j++)
+        {
+            level =
+                startmap -
+                j * SCREENWIDTH / (viewwidth << detailshift) / DISTMAP;
+            if (level < 0)
+                level = 0;
+            if (level >= NUMCOLORMAPS)
+                level = NUMCOLORMAPS - 1;
+            scalelight[i][j] = colormaps + level * 256;
+        }
+    }
+
+//
+// draw the border
+//
+    R_DrawViewBorder();         // erase old menu stuff
+}
+
+
+/*
+==============
+=
+= R_Init
+=
+==============
+*/
+
+int detailLevel;
+int screenblocks = 10;
+
+void R_Init(void)
+{
+    R_InitData();
+    R_InitPointToAngle();
+    R_InitTables();
+    // viewwidth / viewheight / detailLevel are set by the defaults
+    R_SetViewSize(screenblocks, detailLevel);
+    R_InitPlanes();
+    R_InitLightTables();
+    R_InitSkyMap();
+    R_InitTranslationTables();
+    framecount = 0;
+}
+
+/*
+==============
+=
+= R_PointInSubsector
+=
+==============
+*/
+
+subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
+{
+    node_t *node;
+    int side, nodenum;
+
+    if (!numnodes)              // single subsector is a special case
+        return subsectors;
+
+    nodenum = numnodes - 1;
+
+    while (!(nodenum & NF_SUBSECTOR))
+    {
+        node = &nodes[nodenum];
+        side = R_PointOnSide(x, y, node);
+        nodenum = node->children[side];
+    }
+
+    return &subsectors[nodenum & ~NF_SUBSECTOR];
+
+}
+
+//----------------------------------------------------------------------------
+//
+// PROC R_SetupFrame
+//
+//----------------------------------------------------------------------------
+
+void R_SetupFrame(player_t * player)
+{
+    int i;
+    int tableAngle;
+    int tempCentery;
+    int intensity;
+
+    //drawbsp = 1;
+    viewplayer = player;
+    // haleyjd: removed WATCOMC
+    // haleyjd FIXME: viewangleoffset handling?
+    viewangle = player->mo->angle + viewangleoffset;
+    tableAngle = viewangle >> ANGLETOFINESHIFT;
+    viewx = player->mo->x;
+    viewy = player->mo->y;
+
+    if (localQuakeHappening[displayplayer] && !paused)
+    {
+        intensity = localQuakeHappening[displayplayer];
+        viewx += ((M_Random() % (intensity << 2))
+                  - (intensity << 1)) << FRACBITS;
+        viewy += ((M_Random() % (intensity << 2))
+                  - (intensity << 1)) << FRACBITS;
+    }
+
+    extralight = player->extralight;
+    viewz = player->viewz;
+
+    tempCentery = viewheight / 2 + (player->lookdir) * screenblocks / 10;
+    if (centery != tempCentery)
+    {
+        centery = tempCentery;
+        centeryfrac = centery << FRACBITS;
+        for (i = 0; i < viewheight; i++)
+        {
+            yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT,
+                                 abs(((i - centery) << FRACBITS) +
+                                     FRACUNIT / 2));
+        }
+    }
+    viewsin = finesine[tableAngle];
+    viewcos = finecosine[tableAngle];
+    sscount = 0;
+    if (player->fixedcolormap)
+    {
+        fixedcolormap = colormaps + player->fixedcolormap
+            * 256 * sizeof(lighttable_t);
+        walllights = scalelightfixed;
+        for (i = 0; i < MAXLIGHTSCALE; i++)
+        {
+            scalelightfixed[i] = fixedcolormap;
+        }
+    }
+    else
+    {
+        fixedcolormap = 0;
+    }
+    framecount++;
+    validcount++;
+    if (BorderNeedRefresh)
+    {
+        if (setblocks < 10)
+        {
+            R_DrawViewBorder();
+        }
+        BorderNeedRefresh = false;
+        BorderTopRefresh = false;
+        UpdateState |= I_FULLSCRN;
+    }
+    if (BorderTopRefresh)
+    {
+        if (setblocks < 10)
+        {
+            R_DrawTopBorder();
+        }
+        BorderTopRefresh = false;
+        UpdateState |= I_MESSAGES;
+    }
+
+#if 0
+    {
+        static int frame;
+        memset(screen, frame, SCREENWIDTH * SCREENHEIGHT);
+        frame++;
+    }
+#endif
+}
+
+/*
+==============
+=
+= R_RenderView
+=
+==============
+*/
+
+void R_RenderPlayerView(player_t * player)
+{
+    R_SetupFrame(player);
+    R_ClearClipSegs();
+    R_ClearDrawSegs();
+    R_ClearPlanes();
+    R_ClearSprites();
+    NetUpdate();                // check for new console commands
+
+    // Make displayed player invisible locally
+    if (localQuakeHappening[displayplayer] && gamestate == GS_LEVEL)
+    {
+        players[displayplayer].mo->flags2 |= MF2_DONTDRAW;
+        R_RenderBSPNode(numnodes - 1);  // head node is the last node output
+        players[displayplayer].mo->flags2 &= ~MF2_DONTDRAW;
+    }
+    else
+    {
+        R_RenderBSPNode(numnodes - 1);  // head node is the last node output
+    }
+
+    NetUpdate();                // check for new console commands
+    R_DrawPlanes();
+    NetUpdate();                // check for new console commands
+    R_DrawMasked();
+    NetUpdate();                // check for new console commands
+}
diff --git a/games/NXDoom/src/hexen/r_plane.c b/games/NXDoom/src/hexen/r_plane.c
new file mode 100644
index 000000000..8acbcc43c
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_plane.c
@@ -0,0 +1,579 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "i_system.h"
+#include "r_local.h"
+#include "p_spec.h"
+
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+int Sky1Texture;
+int Sky2Texture;
+fixed_t Sky1ColumnOffset;
+fixed_t Sky2ColumnOffset;
+int skyflatnum;
+int skytexturemid;
+fixed_t skyiscale;
+boolean DoubleSky;
+planefunction_t floorfunc, ceilingfunc;
+
+// Opening
+visplane_t visplanes[MAXVISPLANES], *lastvisplane;
+visplane_t *floorplane, *ceilingplane;
+short openings[MAXOPENINGS], *lastopening;
+
+// Clip values are the solid pixel bounding the range.
+// floorclip start out SCREENHEIGHT
+// ceilingclip starts out -1
+short floorclip[SCREENWIDTH];
+short ceilingclip[SCREENWIDTH];
+
+// spanstart holds the start of a plane span, initialized to 0
+int spanstart[SCREENHEIGHT];
+int spanstop[SCREENHEIGHT];
+
+// Texture mapping
+lighttable_t **planezlight;
+fixed_t planeheight;
+fixed_t yslope[SCREENHEIGHT];
+fixed_t distscale[SCREENWIDTH];
+fixed_t basexscale, baseyscale;
+fixed_t cachedheight[SCREENHEIGHT];
+fixed_t cacheddistance[SCREENHEIGHT];
+fixed_t cachedxstep[SCREENHEIGHT];
+fixed_t cachedystep[SCREENHEIGHT];
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// R_InitSky
+//
+// Called at level load.
+//
+//==========================================================================
+
+void R_InitSky(int map)
+{
+    Sky1Texture = P_GetMapSky1Texture(map);
+    Sky2Texture = P_GetMapSky2Texture(map);
+    Sky1ScrollDelta = P_GetMapSky1ScrollDelta(map);
+    Sky2ScrollDelta = P_GetMapSky2ScrollDelta(map);
+    Sky1ColumnOffset = 0;
+    Sky2ColumnOffset = 0;
+    DoubleSky = P_GetMapDoubleSky(map);
+}
+
+//==========================================================================
+//
+// R_InitSkyMap
+//
+// Called whenever the view size changes.
+//
+//==========================================================================
+
+void R_InitSkyMap(void)
+{
+    skyflatnum = R_FlatNumForName("F_SKY");
+    skytexturemid = 200 * FRACUNIT;
+    skyiscale = FRACUNIT;
+}
+
+//==========================================================================
+//
+// R_InitPlanes
+//
+// Called at game startup.
+//
+//==========================================================================
+
+void R_InitPlanes(void)
+{
+}
+
+//==========================================================================
+//
+// R_MapPlane
+//
+// Globals used: planeheight, ds_source, basexscale, baseyscale,
+// viewx, viewy.
+//
+//==========================================================================
+
+void R_MapPlane(int y, int x1, int x2)
+{
+    angle_t angle;
+    fixed_t distance, length;
+    unsigned index;
+
+#ifdef RANGECHECK
+    if (x2 < x1 || x1 < 0 || x2 >= viewwidth || (unsigned) y > viewheight)
+    {
+        I_Error("R_MapPlane: %i, %i at %i", x1, x2, y);
+    }
+#endif
+
+    if (planeheight != cachedheight[y])
+    {
+        cachedheight[y] = planeheight;
+        distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
+        ds_xstep = cachedxstep[y] = FixedMul(distance, basexscale);
+        ds_ystep = cachedystep[y] = FixedMul(distance, baseyscale);
+    }
+    else
+    {
+        distance = cacheddistance[y];
+        ds_xstep = cachedxstep[y];
+        ds_ystep = cachedystep[y];
+    }
+
+    length = FixedMul(distance, distscale[x1]);
+    angle = (viewangle + xtoviewangle[x1]) >> ANGLETOFINESHIFT;
+    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
+    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
+
+    if (fixedcolormap)
+    {
+        ds_colormap = fixedcolormap;
+    }
+    else
+    {
+        index = distance >> LIGHTZSHIFT;
+        if (index >= MAXLIGHTZ)
+        {
+            index = MAXLIGHTZ - 1;
+        }
+        ds_colormap = planezlight[index];
+    }
+
+    ds_y = y;
+    ds_x1 = x1;
+    ds_x2 = x2;
+
+    spanfunc();                 // High or low detail
+}
+
+//==========================================================================
+//
+// R_ClearPlanes
+//
+// Called at the beginning of each frame.
+//
+//==========================================================================
+
+void R_ClearPlanes(void)
+{
+    int i;
+    angle_t angle;
+
+    // Opening / clipping determination
+    for (i = 0; i < viewwidth; i++)
+    {
+        floorclip[i] = viewheight;
+        ceilingclip[i] = -1;
+    }
+
+    lastvisplane = visplanes;
+    lastopening = openings;
+
+    // Texture calculation
+    memset(cachedheight, 0, sizeof(cachedheight));
+    angle = (viewangle - ANG90) >> ANGLETOFINESHIFT;    // left to right mapping
+    // Scale will be unit scale at SCREENWIDTH/2 distance
+    basexscale = FixedDiv(finecosine[angle], centerxfrac);
+    baseyscale = -FixedDiv(finesine[angle], centerxfrac);
+}
+
+//==========================================================================
+//
+// R_FindPlane
+//
+//==========================================================================
+
+visplane_t *R_FindPlane(fixed_t height, int picnum,
+                        int lightlevel, int special)
+{
+    visplane_t *check;
+
+    if (special < 150)
+    {                           // Don't let low specials affect search
+        special = 0;
+    }
+
+    if (picnum == skyflatnum)
+    {                           // All skies map together
+        height = 0;
+        lightlevel = 0;
+    }
+
+    for (check = visplanes; check < lastvisplane; check++)
+    {
+        if (height == check->height
+            && picnum == check->picnum
+            && lightlevel == check->lightlevel && special == check->special)
+            break;
+    }
+
+    if (check < lastvisplane)
+    {
+        return (check);
+    }
+
+    if (lastvisplane - visplanes == MAXVISPLANES)
+    {
+        I_Error("R_FindPlane: no more visplanes");
+    }
+
+    lastvisplane++;
+    check->height = height;
+    check->picnum = picnum;
+    check->lightlevel = lightlevel;
+    check->special = special;
+    check->minx = SCREENWIDTH;
+    check->maxx = -1;
+    memset(check->top, 0xff, sizeof(check->top));
+    return (check);
+}
+
+//==========================================================================
+//
+// R_CheckPlane
+//
+//==========================================================================
+
+visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop)
+{
+    int intrl, intrh;
+    int unionl, unionh;
+    int x;
+
+    if (start < pl->minx)
+    {
+        intrl = pl->minx;
+        unionl = start;
+    }
+    else
+    {
+        unionl = pl->minx;
+        intrl = start;
+    }
+    if (stop > pl->maxx)
+    {
+        intrh = pl->maxx;
+        unionh = stop;
+    }
+    else
+    {
+        unionh = pl->maxx;
+        intrh = stop;
+    }
+
+    for (x = intrl; x <= intrh; x++)
+    {
+        if (pl->top[x] != 0xff)
+        {
+            break;
+        }
+    }
+
+    if (x > intrh)
+    {
+        pl->minx = unionl;
+        pl->maxx = unionh;
+        return pl;              // use the same visplane
+    }
+
+    // Make a new visplane
+    lastvisplane->height = pl->height;
+    lastvisplane->picnum = pl->picnum;
+    lastvisplane->lightlevel = pl->lightlevel;
+    lastvisplane->special = pl->special;
+    pl = lastvisplane++;
+    pl->minx = start;
+    pl->maxx = stop;
+    memset(pl->top, 0xff, sizeof(pl->top));
+
+    return pl;
+}
+
+//==========================================================================
+//
+// R_MakeSpans
+//
+//==========================================================================
+
+void R_MakeSpans(int x, int t1, int b1, int t2, int b2)
+{
+    while (t1 < t2 && t1 <= b1)
+    {
+        R_MapPlane(t1, spanstart[t1], x - 1);
+        t1++;
+    }
+    while (b1 > b2 && b1 >= t1)
+    {
+        R_MapPlane(b1, spanstart[b1], x - 1);
+        b1--;
+    }
+    while (t2 < t1 && t2 <= b2)
+    {
+        spanstart[t2] = x;
+        t2++;
+    }
+    while (b2 > b1 && b2 >= t2)
+    {
+        spanstart[b2] = x;
+        b2--;
+    }
+}
+
+//==========================================================================
+//
+// R_DrawPlanes
+//
+//==========================================================================
+
+#define SKYTEXTUREMIDSHIFTED 200
+
+void R_DrawPlanes(void)
+{
+    visplane_t *pl;
+    int light;
+    int x, stop;
+    int angle;
+    byte *tempSource;
+    byte *source;
+    byte *source2;
+    byte *dest;
+    int count;
+    int offset;
+    int skyTexture;
+    int offset2;
+    int skyTexture2;
+    int scrollOffset;
+
+#ifdef RANGECHECK
+    if (ds_p - drawsegs > MAXDRAWSEGS)
+    {
+        I_Error("R_DrawPlanes: drawsegs overflow (%td)",
+                ds_p - drawsegs);
+    }
+    if (lastvisplane - visplanes > MAXVISPLANES)
+    {
+        I_Error("R_DrawPlanes: visplane overflow (%td)",
+                lastvisplane - visplanes);
+    }
+    if (lastopening - openings > MAXOPENINGS)
+    {
+        I_Error("R_DrawPlanes: opening overflow (%td)",
+                lastopening - openings);
+    }
+#endif
+
+    for (pl = visplanes; pl < lastvisplane; pl++)
+    {
+        if (pl->minx > pl->maxx)
+        {
+            continue;
+        }
+        if (pl->picnum == skyflatnum)
+        {                       // Sky flat
+            if (DoubleSky)
+            {                   // Render 2 layers, sky 1 in front
+                offset = Sky1ColumnOffset >> 16;
+                skyTexture = texturetranslation[Sky1Texture];
+                offset2 = Sky2ColumnOffset >> 16;
+                skyTexture2 = texturetranslation[Sky2Texture];
+                for (x = pl->minx; x <= pl->maxx; x++)
+                {
+                    dc_yl = pl->top[x];
+                    dc_yh = pl->bottom[x];
+                    if (dc_yl <= dc_yh)
+                    {
+                        count = dc_yh - dc_yl;
+                        if (count < 0)
+                        {
+                            return;
+                        }
+                        angle = (viewangle + xtoviewangle[x])
+                            >> ANGLETOSKYSHIFT;
+                        source = R_GetColumn(skyTexture, angle + offset)
+                            + SKYTEXTUREMIDSHIFTED + (dc_yl - centery);
+                        source2 = R_GetColumn(skyTexture2, angle + offset2)
+                            + SKYTEXTUREMIDSHIFTED + (dc_yl - centery);
+                        dest = ylookup[dc_yl] + columnofs[x];
+                        do
+                        {
+                            if (*source)
+                            {
+                                *dest = *source++;
+                                source2++;
+                            }
+                            else
+                            {
+                                *dest = *source2++;
+                                source++;
+                            }
+                            dest += SCREENWIDTH;
+                        }
+                        while (count--);
+                    }
+                }
+                continue;       // Next visplane
+            }
+            else
+            {                   // Render single layer
+                if (pl->special == 200)
+                {               // Use sky 2
+                    offset = Sky2ColumnOffset >> 16;
+                    skyTexture = texturetranslation[Sky2Texture];
+                }
+                else
+                {               // Use sky 1
+                    offset = Sky1ColumnOffset >> 16;
+                    skyTexture = texturetranslation[Sky1Texture];
+                }
+                for (x = pl->minx; x <= pl->maxx; x++)
+                {
+                    dc_yl = pl->top[x];
+                    dc_yh = pl->bottom[x];
+                    if (dc_yl <= dc_yh)
+                    {
+                        count = dc_yh - dc_yl;
+                        if (count < 0)
+                        {
+                            return;
+                        }
+                        angle = (viewangle + xtoviewangle[x])
+                            >> ANGLETOSKYSHIFT;
+                        source = R_GetColumn(skyTexture, angle + offset)
+                            + SKYTEXTUREMIDSHIFTED + (dc_yl - centery);
+                        dest = ylookup[dc_yl] + columnofs[x];
+                        do
+                        {
+                            *dest = *source++;
+                            dest += SCREENWIDTH;
+                        }
+                        while (count--);
+                    }
+                }
+                continue;       // Next visplane
+            }
+        }
+        // Regular flat
+        tempSource = W_CacheLumpNum(firstflat +
+                                    flattranslation[pl->picnum], PU_STATIC);
+        scrollOffset = leveltime >> 1 & 63;
+        switch (pl->special)
+        {                       // Handle scrolling flats
+            case 201:
+            case 202:
+            case 203:          // Scroll_North_xxx
+                ds_source = tempSource + ((scrollOffset
+                                           << (pl->special - 201) & 63) << 6);
+                break;
+            case 204:
+            case 205:
+            case 206:          // Scroll_East_xxx
+                ds_source = tempSource + ((63 - scrollOffset)
+                                          << (pl->special - 204) & 63);
+                break;
+            case 207:
+            case 208:
+            case 209:          // Scroll_South_xxx
+                ds_source = tempSource + (((63 - scrollOffset)
+                                           << (pl->special - 207) & 63) << 6);
+                break;
+            case 210:
+            case 211:
+            case 212:          // Scroll_West_xxx
+                ds_source = tempSource + (scrollOffset
+                                          << (pl->special - 210) & 63);
+                break;
+            case 213:
+            case 214:
+            case 215:          // Scroll_NorthWest_xxx
+                ds_source = tempSource + (scrollOffset
+                                          << (pl->special - 213) & 63) +
+                    ((scrollOffset << (pl->special - 213) & 63) << 6);
+                break;
+            case 216:
+            case 217:
+            case 218:          // Scroll_NorthEast_xxx
+                ds_source = tempSource + ((63 - scrollOffset)
+                                          << (pl->special - 216) & 63) +
+                    ((scrollOffset << (pl->special - 216) & 63) << 6);
+                break;
+            case 219:
+            case 220:
+            case 221:          // Scroll_SouthEast_xxx
+                ds_source = tempSource + ((63 - scrollOffset)
+                                          << (pl->special - 219) & 63) +
+                    (((63 - scrollOffset) << (pl->special - 219) & 63) << 6);
+                break;
+            case 222:
+            case 223:
+            case 224:          // Scroll_SouthWest_xxx
+                ds_source = tempSource + (scrollOffset
+                                          << (pl->special - 222) & 63) +
+                    (((63 - scrollOffset) << (pl->special - 222) & 63) << 6);
+                break;
+            default:
+                ds_source = tempSource;
+                break;
+        }
+        planeheight = abs(pl->height - viewz);
+        light = (pl->lightlevel >> LIGHTSEGSHIFT) + extralight;
+        if (light >= LIGHTLEVELS)
+        {
+            light = LIGHTLEVELS - 1;
+        }
+        if (light < 0)
+        {
+            light = 0;
+        }
+        planezlight = zlight[light];
+
+        pl->top[pl->maxx + 1] = 0xff;
+        pl->top[pl->minx - 1] = 0xff;
+
+        stop = pl->maxx + 1;
+        for (x = pl->minx; x <= stop; x++)
+        {
+            R_MakeSpans(x, pl->top[x - 1], pl->bottom[x - 1],
+                        pl->top[x], pl->bottom[x]);
+        }
+        W_ReleaseLumpNum(firstflat + flattranslation[pl->picnum]);
+    }
+}
diff --git a/games/NXDoom/src/hexen/r_segs.c b/games/NXDoom/src/hexen/r_segs.c
new file mode 100644
index 000000000..003cf2eb0
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_segs.c
@@ -0,0 +1,654 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "i_system.h"
+#include "r_local.h"
+
+// OPTIMIZE: closed two sided lines as single sided
+
+boolean segtextured;            // true if any of the segs textures might be vis
+boolean markfloor;              // false if the back side is the same plane
+boolean markceiling;
+boolean maskedtexture;
+int toptexture, bottomtexture, midtexture;
+
+
+angle_t rw_normalangle;
+int rw_angle1;                  // angle to line origin
+
+//
+// wall
+//
+int rw_x;
+int rw_stopx;
+angle_t rw_centerangle;
+fixed_t rw_offset;
+fixed_t rw_distance;
+fixed_t rw_scale;
+fixed_t rw_scalestep;
+fixed_t rw_midtexturemid;
+fixed_t rw_toptexturemid;
+fixed_t rw_bottomtexturemid;
+
+int worldtop, worldbottom, worldhigh, worldlow;
+
+fixed_t pixhigh, pixlow;
+fixed_t pixhighstep, pixlowstep;
+fixed_t topfrac, topstep;
+fixed_t bottomfrac, bottomstep;
+
+
+lighttable_t **walllights;
+
+short *maskedtexturecol;
+
+/*
+================
+=
+= R_RenderMaskedSegRange
+=
+================
+*/
+
+void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2)
+{
+    unsigned index;
+    column_t *col;
+    int lightnum;
+    int texnum;
+
+//
+// calculate light table
+// use different light tables for horizontal / vertical / diagonal
+// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+    curline = ds->curline;
+    frontsector = curline->frontsector;
+    backsector = curline->backsector;
+    texnum = texturetranslation[curline->sidedef->midtexture];
+
+    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
+    //if (curline->v1->y == curline->v2->y)
+    //      lightnum--;
+    //else if (curline->v1->x == curline->v2->x)
+    //      lightnum++;
+    //if (lightnum < 0)
+    //      walllights = scalelight[0];
+    if (lightnum >= LIGHTLEVELS)
+        walllights = scalelight[LIGHTLEVELS - 1];
+    else
+        walllights = scalelight[lightnum];
+
+    maskedtexturecol = ds->maskedtexturecol;
+
+    rw_scalestep = ds->scalestep;
+    spryscale = ds->scale1 + (x1 - ds->x1) * rw_scalestep;
+    mfloorclip = ds->sprbottomclip;
+    mceilingclip = ds->sprtopclip;
+
+//
+// find positioning
+//
+    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
+    {
+        dc_texturemid = frontsector->floorheight > backsector->floorheight
+            ? frontsector->floorheight : backsector->floorheight;
+        dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
+    }
+    else
+    {
+        dc_texturemid = frontsector->ceilingheight < backsector->ceilingheight
+            ? frontsector->ceilingheight : backsector->ceilingheight;
+        dc_texturemid = dc_texturemid - viewz;
+    }
+    dc_texturemid += curline->sidedef->rowoffset;
+
+    if (fixedcolormap)
+        dc_colormap = fixedcolormap;
+//
+// draw the columns
+//
+    for (dc_x = x1; dc_x <= x2; dc_x++)
+    {
+        // calculate lighting
+        if (maskedtexturecol[dc_x] != SHRT_MAX)
+        {
+            if (!fixedcolormap)
+            {
+                index = spryscale >> LIGHTSCALESHIFT;
+                if (index >= MAXLIGHTSCALE)
+                    index = MAXLIGHTSCALE - 1;
+                dc_colormap = walllights[index];
+            }
+
+            sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
+            dc_iscale = 0xffffffffu / (unsigned) spryscale;
+
+            //
+            // draw the texture
+            //
+            col = (column_t *) ((byte *)
+                                R_GetColumn(texnum,
+                                            maskedtexturecol[dc_x]) - 3);
+
+            R_DrawMaskedColumn(col, -1);
+            maskedtexturecol[dc_x] = SHRT_MAX;
+        }
+        spryscale += rw_scalestep;
+    }
+
+}
+
+/*
+================
+=
+= R_RenderSegLoop
+=
+= Draws zero, one, or two textures (and possibly a masked texture) for walls
+= Can draw or mark the starting pixel of floor and ceiling textures
+=
+= CALLED: CORE LOOPING ROUTINE
+================
+*/
+
+#define HEIGHTBITS      12
+#define HEIGHTUNIT      (1<<HEIGHTBITS)
+
+void R_RenderSegLoop(void)
+{
+    angle_t angle;
+    unsigned index;
+    int yl, yh, mid;
+    fixed_t texturecolumn;
+    int top, bottom;
+
+    texturecolumn = 0;           // shut up compiler warning
+
+    for (; rw_x < rw_stopx; rw_x++)
+    {
+//
+// mark floor / ceiling areas
+//
+        yl = (topfrac + HEIGHTUNIT - 1) >> HEIGHTBITS;
+        if (yl < ceilingclip[rw_x] + 1)
+            yl = ceilingclip[rw_x] + 1; // no space above wall
+        if (markceiling)
+        {
+            top = ceilingclip[rw_x] + 1;
+            bottom = yl - 1;
+            if (bottom >= floorclip[rw_x])
+                bottom = floorclip[rw_x] - 1;
+            if (top <= bottom)
+            {
+                ceilingplane->top[rw_x] = top;
+                ceilingplane->bottom[rw_x] = bottom;
+            }
+        }
+
+        yh = bottomfrac >> HEIGHTBITS;
+        if (yh >= floorclip[rw_x])
+            yh = floorclip[rw_x] - 1;
+        if (markfloor)
+        {
+            top = yh + 1;
+            bottom = floorclip[rw_x] - 1;
+            if (top <= ceilingclip[rw_x])
+                top = ceilingclip[rw_x] + 1;
+            if (top <= bottom)
+            {
+                floorplane->top[rw_x] = top;
+                floorplane->bottom[rw_x] = bottom;
+            }
+        }
+
+//
+// texturecolumn and lighting are independent of wall tiers
+//
+        if (segtextured)
+        {
+            // calculate texture offset
+            angle = (rw_centerangle + xtoviewangle[rw_x]) >> ANGLETOFINESHIFT;
+            texturecolumn =
+                rw_offset - FixedMul(finetangent[angle], rw_distance);
+            texturecolumn >>= FRACBITS;
+            // calculate lighting
+            index = rw_scale >> LIGHTSCALESHIFT;
+            if (index >= MAXLIGHTSCALE)
+                index = MAXLIGHTSCALE - 1;
+            dc_colormap = walllights[index];
+            dc_x = rw_x;
+            dc_iscale = 0xffffffffu / (unsigned) rw_scale;
+        }
+
+//
+// draw the wall tiers
+//
+        if (midtexture)
+        {                       // single sided line
+            dc_yl = yl;
+            dc_yh = yh;
+            dc_texturemid = rw_midtexturemid;
+            dc_source = R_GetColumn(midtexture, texturecolumn);
+            colfunc();
+            ceilingclip[rw_x] = viewheight;
+            floorclip[rw_x] = -1;
+        }
+        else
+        {                       // two sided line
+            if (toptexture)
+            {                   // top wall
+                mid = pixhigh >> HEIGHTBITS;
+                pixhigh += pixhighstep;
+                if (mid >= floorclip[rw_x])
+                    mid = floorclip[rw_x] - 1;
+                if (mid >= yl)
+                {
+                    dc_yl = yl;
+                    dc_yh = mid;
+                    dc_texturemid = rw_toptexturemid;
+                    dc_source = R_GetColumn(toptexture, texturecolumn);
+                    colfunc();
+                    ceilingclip[rw_x] = mid;
+                }
+                else
+                    ceilingclip[rw_x] = yl - 1;
+            }
+            else
+            {                   // no top wall
+                if (markceiling)
+                    ceilingclip[rw_x] = yl - 1;
+            }
+
+            if (bottomtexture)
+            {                   // bottom wall
+                mid = (pixlow + HEIGHTUNIT - 1) >> HEIGHTBITS;
+                pixlow += pixlowstep;
+                if (mid <= ceilingclip[rw_x])
+                    mid = ceilingclip[rw_x] + 1;        // no space above wall
+                if (mid <= yh)
+                {
+                    dc_yl = mid;
+                    dc_yh = yh;
+                    dc_texturemid = rw_bottomtexturemid;
+                    dc_source = R_GetColumn(bottomtexture, texturecolumn);
+                    colfunc();
+                    floorclip[rw_x] = mid;
+                }
+                else
+                    floorclip[rw_x] = yh + 1;
+            }
+            else
+            {                   // no bottom wall
+                if (markfloor)
+                    floorclip[rw_x] = yh + 1;
+            }
+
+            if (maskedtexture)
+            {                   // save texturecol for backdrawing of masked mid texture
+                maskedtexturecol[rw_x] = texturecolumn;
+            }
+        }
+
+        rw_scale += rw_scalestep;
+        topfrac += topstep;
+        bottomfrac += bottomstep;
+    }
+
+}
+
+
+
+/*
+=====================
+=
+= R_StoreWallRange
+=
+= A wall segment will be drawn between start and stop pixels (inclusive)
+=
+======================
+*/
+
+void R_StoreWallRange(int start, int stop)
+{
+    fixed_t hyp;
+    fixed_t sineval;
+    angle_t distangle, offsetangle;
+    fixed_t vtop;
+    int lightnum;
+
+    if (ds_p == &drawsegs[MAXDRAWSEGS])
+        return;                 // don't overflow and crash
+
+#ifdef RANGECHECK
+    if (start >= viewwidth || start > stop)
+        I_Error("Bad R_RenderWallRange: %i to %i", start, stop);
+#endif
+
+    sidedef = curline->sidedef;
+    linedef = curline->linedef;
+
+// mark the segment as visible for auto map
+    linedef->flags |= ML_MAPPED;
+
+//
+// calculate rw_distance for scale calculation
+//
+    rw_normalangle = curline->angle + ANG90;
+    offsetangle = abs((int) rw_normalangle - (int) rw_angle1);
+    if (offsetangle > ANG90)
+        offsetangle = ANG90;
+    distangle = ANG90 - offsetangle;
+    hyp = R_PointToDist(curline->v1->x, curline->v1->y);
+    sineval = finesine[distangle >> ANGLETOFINESHIFT];
+    rw_distance = FixedMul(hyp, sineval);
+
+
+    ds_p->x1 = rw_x = start;
+    ds_p->x2 = stop;
+    ds_p->curline = curline;
+    rw_stopx = stop + 1;
+
+//
+// calculate scale at both ends and step
+//
+    ds_p->scale1 = rw_scale =
+        R_ScaleFromGlobalAngle(viewangle + xtoviewangle[start]);
+    if (stop > start)
+    {
+        ds_p->scale2 = R_ScaleFromGlobalAngle(viewangle + xtoviewangle[stop]);
+        ds_p->scalestep = rw_scalestep =
+            (ds_p->scale2 - rw_scale) / (stop - start);
+    }
+    else
+    {
+        //
+        // try to fix the stretched line bug
+        //
+#if 0
+        if (rw_distance < FRACUNIT / 2)
+        {
+            fixed_t trx, try;
+            fixed_t gxt, gyt;
+
+            trx = curline->v1->x - viewx;
+            try = curline->v1->y - viewy;
+
+            gxt = FixedMul(trx, viewcos);
+            gyt = -FixedMul(try, viewsin);
+            ds_p->scale1 = FixedDiv(projection, gxt - gyt);
+        }
+#endif
+        ds_p->scale2 = ds_p->scale1;
+    }
+
+
+//
+// calculate texture boundaries and decide if floor / ceiling marks
+// are needed
+//
+    worldtop = frontsector->ceilingheight - viewz;
+    worldbottom = frontsector->floorheight - viewz;
+
+    midtexture = toptexture = bottomtexture = maskedtexture = 0;
+    ds_p->maskedtexturecol = NULL;
+
+    if (!backsector)
+    {
+//
+// single sided line
+//
+        midtexture = texturetranslation[sidedef->midtexture];
+        // a single sided line is terminal, so it must mark ends
+        markfloor = markceiling = true;
+        if (linedef->flags & ML_DONTPEGBOTTOM)
+        {
+            vtop = frontsector->floorheight +
+                textureheight[sidedef->midtexture];
+            rw_midtexturemid = vtop - viewz;    // bottom of texture at bottom
+        }
+        else
+            rw_midtexturemid = worldtop;        // top of texture at top
+        rw_midtexturemid += sidedef->rowoffset;
+        ds_p->silhouette = SIL_BOTH;
+        ds_p->sprtopclip = screenheightarray;
+        ds_p->sprbottomclip = negonearray;
+        ds_p->bsilheight = INT_MAX;
+        ds_p->tsilheight = INT_MIN;
+    }
+    else
+    {
+//
+// two sided line
+//
+        ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
+        ds_p->silhouette = 0;
+        if (frontsector->floorheight > backsector->floorheight)
+        {
+            ds_p->silhouette = SIL_BOTTOM;
+            ds_p->bsilheight = frontsector->floorheight;
+        }
+        else if (backsector->floorheight > viewz)
+        {
+            ds_p->silhouette = SIL_BOTTOM;
+            ds_p->bsilheight = INT_MAX;
+//                      ds_p->sprbottomclip = negonearray;
+        }
+        if (frontsector->ceilingheight < backsector->ceilingheight)
+        {
+            ds_p->silhouette |= SIL_TOP;
+            ds_p->tsilheight = frontsector->ceilingheight;
+        }
+        else if (backsector->ceilingheight < viewz)
+        {
+            ds_p->silhouette |= SIL_TOP;
+            ds_p->tsilheight = INT_MIN;
+//                      ds_p->sprtopclip = screenheightarray;
+        }
+
+        if (backsector->ceilingheight <= frontsector->floorheight)
+        {
+            ds_p->sprbottomclip = negonearray;
+            ds_p->bsilheight = INT_MAX;
+            ds_p->silhouette |= SIL_BOTTOM;
+        }
+        if (backsector->floorheight >= frontsector->ceilingheight)
+        {
+            ds_p->sprtopclip = screenheightarray;
+            ds_p->tsilheight = INT_MIN;
+            ds_p->silhouette |= SIL_TOP;
+        }
+        worldhigh = backsector->ceilingheight - viewz;
+        worldlow = backsector->floorheight - viewz;
+
+        // hack to allow height changes in outdoor areas
+        if (frontsector->ceilingpic == skyflatnum
+            && backsector->ceilingpic == skyflatnum)
+            worldtop = worldhigh;
+
+        if (worldlow != worldbottom
+            || backsector->floorpic != frontsector->floorpic
+            || backsector->lightlevel != frontsector->lightlevel
+            || backsector->special != frontsector->special)
+            markfloor = true;
+        else
+            markfloor = false;  // same plane on both sides
+
+        if (worldhigh != worldtop
+            || backsector->ceilingpic != frontsector->ceilingpic
+            || backsector->lightlevel != frontsector->lightlevel)
+            markceiling = true;
+        else
+            markceiling = false;        // same plane on both sides
+
+        if (backsector->ceilingheight <= frontsector->floorheight
+            || backsector->floorheight >= frontsector->ceilingheight)
+            markceiling = markfloor = true;     // closed door
+
+        if (worldhigh < worldtop)
+        {                       // top texture
+            toptexture = texturetranslation[sidedef->toptexture];
+            if (linedef->flags & ML_DONTPEGTOP)
+                rw_toptexturemid = worldtop;    // top of texture at top
+            else
+            {
+                vtop = backsector->ceilingheight +
+                    textureheight[sidedef->toptexture];
+                rw_toptexturemid = vtop - viewz;        // bottom of texture
+            }
+        }
+        if (worldlow > worldbottom)
+        {                       // bottom texture
+            bottomtexture = texturetranslation[sidedef->bottomtexture];
+            if (linedef->flags & ML_DONTPEGBOTTOM)
+            {                   // bottom of texture at bottom
+                rw_bottomtexturemid = worldtop; // top of texture at top
+            }
+            else                // top of texture at top
+                rw_bottomtexturemid = worldlow;
+        }
+        rw_toptexturemid += sidedef->rowoffset;
+        rw_bottomtexturemid += sidedef->rowoffset;
+
+        //
+        // allocate space for masked texture tables
+        //
+        if (sidedef->midtexture)
+        {                       // masked midtexture
+            maskedtexture = true;
+            ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
+            lastopening += rw_stopx - rw_x;
+        }
+    }
+
+//
+// calculate rw_offset (only needed for textured lines)
+//
+    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
+
+    if (segtextured)
+    {
+        offsetangle = rw_normalangle - rw_angle1;
+        if (offsetangle > ANG180)
+            offsetangle = -offsetangle;
+        if (offsetangle > ANG90)
+            offsetangle = ANG90;
+        sineval = finesine[offsetangle >> ANGLETOFINESHIFT];
+        rw_offset = FixedMul(hyp, sineval);
+        if (rw_normalangle - rw_angle1 < ANG180)
+            rw_offset = -rw_offset;
+        rw_offset += sidedef->textureoffset + curline->offset;
+        rw_centerangle = ANG90 + viewangle - rw_normalangle;
+
+        //
+        // calculate light table
+        // use different light tables for horizontal / vertical / diagonal
+        // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+        if (!fixedcolormap)
+        {
+            lightnum =
+                (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
+            //if (curline->v1->y == curline->v2->y)
+            //      lightnum--;
+            //else if (curline->v1->x == curline->v2->x)
+            //      lightnum++;
+            //if (lightnum < 0)
+            //      walllights = scalelight[0];
+            if (lightnum >= LIGHTLEVELS)
+                walllights = scalelight[LIGHTLEVELS - 1];
+            else
+                walllights = scalelight[lightnum];
+        }
+    }
+
+
+//
+// if a floor / ceiling plane is on the wrong side of the view plane
+// it is definately invisible and doesn't need to be marked
+//
+    if (frontsector->floorheight >= viewz)
+        markfloor = false;      // above view plane
+    if (frontsector->ceilingheight <= viewz
+        && frontsector->ceilingpic != skyflatnum)
+        markceiling = false;    // below view plane
+
+//
+// calculate incremental stepping values for texture edges
+//
+    worldtop >>= 4;
+    worldbottom >>= 4;
+
+    topstep = -FixedMul(rw_scalestep, worldtop);
+    topfrac = (centeryfrac >> 4) - FixedMul(worldtop, rw_scale);
+
+    bottomstep = -FixedMul(rw_scalestep, worldbottom);
+    bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
+
+    if (backsector)
+    {
+        worldhigh >>= 4;
+        worldlow >>= 4;
+
+        if (worldhigh < worldtop)
+        {
+            pixhigh = (centeryfrac >> 4) - FixedMul(worldhigh, rw_scale);
+            pixhighstep = -FixedMul(rw_scalestep, worldhigh);
+        }
+        if (worldlow > worldbottom)
+        {
+            pixlow = (centeryfrac >> 4) - FixedMul(worldlow, rw_scale);
+            pixlowstep = -FixedMul(rw_scalestep, worldlow);
+        }
+    }
+
+//
+// render it
+//
+    if (markceiling)
+        ceilingplane = R_CheckPlane(ceilingplane, rw_x, rw_stopx - 1);
+    if (markfloor)
+        floorplane = R_CheckPlane(floorplane, rw_x, rw_stopx - 1);
+
+    R_RenderSegLoop();
+
+//
+// save sprite clipping info
+//
+    if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
+    {
+        memcpy(lastopening, ceilingclip + start, 2 * (rw_stopx - start));
+        ds_p->sprtopclip = lastopening - start;
+        lastopening += rw_stopx - start;
+    }
+    if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
+        && !ds_p->sprbottomclip)
+    {
+        memcpy(lastopening, floorclip + start, 2 * (rw_stopx - start));
+        ds_p->sprbottomclip = lastopening - start;
+        lastopening += rw_stopx - start;
+    }
+    if (maskedtexture && !(ds_p->silhouette & SIL_TOP))
+    {
+        ds_p->silhouette |= SIL_TOP;
+        ds_p->tsilheight = INT_MIN;
+    }
+    if (maskedtexture && !(ds_p->silhouette & SIL_BOTTOM))
+    {
+        ds_p->silhouette |= SIL_BOTTOM;
+        ds_p->bsilheight = INT_MAX;
+    }
+    ds_p++;
+}
diff --git a/games/NXDoom/src/hexen/r_things.c b/games/NXDoom/src/hexen/r_things.c
new file mode 100644
index 000000000..e9cfeccdb
--- /dev/null
+++ b/games/NXDoom/src/hexen/r_things.c
@@ -0,0 +1,1044 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "h2def.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "r_local.h"
+
+//void R_DrawTranslatedAltTLColumn(void);
+
+typedef struct
+{
+    int x1, x2;
+
+    int column;
+    int topclip;
+    int bottomclip;
+} maskdraw_t;
+
+/*
+
+Sprite rotation 0 is facing the viewer, rotation 1 is one angle turn CLOCKWISE around the axis.
+This is not the same as the angle, which increases counter clockwise
+(protractor).  There was a lot of stuff grabbed wrong, so I changed it...
+
+*/
+
+
+fixed_t pspritescale, pspriteiscale;
+
+lighttable_t **spritelights;
+
+// constant arrays used for psprite clipping and initializing clipping
+short negonearray[SCREENWIDTH];
+short screenheightarray[SCREENWIDTH];
+
+boolean LevelUseFullBright;
+/*
+===============================================================================
+
+						INITIALIZATION FUNCTIONS
+
+===============================================================================
+*/
+
+// variables used to look up and range check thing_t sprites patches
+spritedef_t *sprites;
+int numsprites;
+
+spriteframe_t sprtemp[30];
+int maxframe;
+static const char *spritename;
+
+
+
+/*
+=================
+=
+= R_InstallSpriteLump
+=
+= Local function for R_InitSprites
+=================
+*/
+
+void R_InstallSpriteLump(int lump, unsigned frame, unsigned rotation,
+                         boolean flipped)
+{
+    int r;
+
+    if (frame >= 30 || rotation > 8)
+        I_Error("R_InstallSpriteLump: Bad frame characters in lump %i", lump);
+
+    if ((int) frame > maxframe)
+        maxframe = frame;
+
+    if (rotation == 0)
+    {
+// the lump should be used for all rotations
+        if (sprtemp[frame].rotate == false)
+            I_Error("R_InitSprites: Sprite %s frame %c has multip rot=0 lump",
+                    spritename, 'A' + frame);
+        if (sprtemp[frame].rotate == true)
+            I_Error
+                ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
+                 spritename, 'A' + frame);
+
+        sprtemp[frame].rotate = false;
+        for (r = 0; r < 8; r++)
+        {
+            sprtemp[frame].lump[r] = lump - firstspritelump;
+            sprtemp[frame].flip[r] = (byte) flipped;
+        }
+        return;
+    }
+
+// the lump is only used for one rotation
+    if (sprtemp[frame].rotate == false)
+        I_Error
+            ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
+             spritename, 'A' + frame);
+
+    sprtemp[frame].rotate = true;
+
+    rotation--;                 // make 0 based
+    if (sprtemp[frame].lump[rotation] != -1)
+        I_Error
+            ("R_InitSprites: Sprite %s : %c : %c has two lumps mapped to it",
+             spritename, 'A' + frame, '1' + rotation);
+
+    sprtemp[frame].lump[rotation] = lump - firstspritelump;
+    sprtemp[frame].flip[rotation] = (byte) flipped;
+}
+
+/*
+=================
+=
+= R_InitSpriteDefs
+=
+= Pass a null terminated list of sprite names (4 chars exactly) to be used
+= Builds the sprite rotation matrixes to account for horizontally flipped
+= sprites.  Will report an error if the lumps are inconsistant
+=Only called at startup
+=
+= Sprite lump names are 4 characters for the actor, a letter for the frame,
+= and a number for the rotation, A sprite that is flippable will have an
+= additional letter/number appended.  The rotation character can be 0 to
+= signify no rotations
+=================
+*/
+
+void R_InitSpriteDefs(const char **namelist)
+{
+    const char **check;
+    int i, l, frame, rotation;
+    int start, end;
+
+// count the number of sprite names
+    check = namelist;
+    while (*check != NULL)
+        check++;
+    numsprites = check - namelist;
+
+    if (!numsprites)
+        return;
+
+    sprites = Z_Malloc(numsprites * sizeof(*sprites), PU_STATIC, NULL);
+
+    start = firstspritelump - 1;
+    end = lastspritelump + 1;
+
+// scan all the lump names for each of the names, noting the highest
+// frame letter
+// Just compare 4 characters as ints
+    for (i = 0; i < numsprites; i++)
+    {
+        spritename = namelist[i];
+        memset(sprtemp, -1, sizeof(sprtemp));
+
+        maxframe = -1;
+
+        //
+        // scan the lumps, filling in the frames for whatever is found
+        //
+        for (l = start + 1; l < end; l++)
+            if (!strncmp(lumpinfo[l]->name, namelist[i], 4))
+            {
+                frame = lumpinfo[l]->name[4] - 'A';
+                rotation = lumpinfo[l]->name[5] - '0';
+                R_InstallSpriteLump(l, frame, rotation, false);
+                if (lumpinfo[l]->name[6])
+                {
+                    frame = lumpinfo[l]->name[6] - 'A';
+                    rotation = lumpinfo[l]->name[7] - '0';
+                    R_InstallSpriteLump(l, frame, rotation, true);
+                }
+            }
+
+        //
+        // check the frames that were found for completeness
+        //
+        if (maxframe == -1)
+        {
+            //continue;
+            sprites[i].numframes = 0;
+            if (gamemode == shareware)
+                continue;
+            I_Error("R_InitSprites: No lumps found for sprite %s",
+                    namelist[i]);
+        }
+
+        maxframe++;
+        for (frame = 0; frame < maxframe; frame++)
+        {
+            switch ((int) sprtemp[frame].rotate)
+            {
+                case -1:       // no rotations were found for that frame at all
+                    I_Error("R_InitSprites: No patches found for %s frame %c",
+                            namelist[i], frame + 'A');
+                case 0:        // only the first rotation is needed
+                    break;
+
+                case 1:        // must have all 8 frames
+                    for (rotation = 0; rotation < 8; rotation++)
+                        if (sprtemp[frame].lump[rotation] == -1)
+                            I_Error
+                                ("R_InitSprites: Sprite %s frame %c is missing rotations",
+                                 namelist[i], frame + 'A');
+            }
+        }
+
+        //
+        // allocate space for the frames present and copy sprtemp to it
+        //
+        sprites[i].numframes = maxframe;
+        sprites[i].spriteframes =
+            Z_Malloc(maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
+        memcpy(sprites[i].spriteframes, sprtemp,
+               maxframe * sizeof(spriteframe_t));
+    }
+
+}
+
+
+/*
+===============================================================================
+
+							GAME FUNCTIONS
+
+===============================================================================
+*/
+
+vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
+int newvissprite;
+
+
+/*
+===================
+=
+= R_InitSprites
+=
+= Called at program start
+===================
+*/
+
+void R_InitSprites(const char **namelist)
+{
+    int i;
+
+    for (i = 0; i < SCREENWIDTH; i++)
+    {
+        negonearray[i] = -1;
+    }
+
+    R_InitSpriteDefs(namelist);
+}
+
+
+/*
+===================
+=
+= R_ClearSprites
+=
+= Called at frame start
+===================
+*/
+
+void R_ClearSprites(void)
+{
+    vissprite_p = vissprites;
+}
+
+
+/*
+===================
+=
+= R_NewVisSprite
+=
+===================
+*/
+
+vissprite_t overflowsprite;
+
+vissprite_t *R_NewVisSprite(void)
+{
+    if (vissprite_p == &vissprites[MAXVISSPRITES])
+        return &overflowsprite;
+    vissprite_p++;
+    return vissprite_p - 1;
+}
+
+
+/*
+================
+=
+= R_DrawMaskedColumn
+=
+= Used for sprites and masked mid textures
+================
+*/
+
+short *mfloorclip;
+short *mceilingclip;
+fixed_t spryscale;
+fixed_t sprtopscreen;
+fixed_t sprbotscreen;
+
+void R_DrawMaskedColumn(column_t * column, signed int baseclip)
+{
+    int topscreen, bottomscreen;
+    fixed_t basetexturemid;
+
+    basetexturemid = dc_texturemid;
+
+    for (; column->topdelta != 0xff;)
+    {
+// calculate unclipped screen coordinates for post
+        topscreen = sprtopscreen + spryscale * column->topdelta;
+        bottomscreen = topscreen + spryscale * column->length;
+        dc_yl = (topscreen + FRACUNIT - 1) >> FRACBITS;
+        dc_yh = (bottomscreen - 1) >> FRACBITS;
+
+        if (dc_yh >= mfloorclip[dc_x])
+            dc_yh = mfloorclip[dc_x] - 1;
+        if (dc_yl <= mceilingclip[dc_x])
+            dc_yl = mceilingclip[dc_x] + 1;
+
+        if (dc_yh >= baseclip && baseclip != -1)
+            dc_yh = baseclip;
+
+        if (dc_yl <= dc_yh)
+        {
+            dc_source = (byte *) column + 3;
+            dc_texturemid = basetexturemid - (column->topdelta << FRACBITS);
+//                      dc_source = (byte *)column + 3 - column->topdelta;
+            colfunc();          // either R_DrawColumn or R_DrawTLColumn
+        }
+        column = (column_t *) ((byte *) column + column->length + 4);
+    }
+
+    dc_texturemid = basetexturemid;
+}
+
+
+/*
+================
+=
+= R_DrawVisSprite
+=
+= mfloorclip and mceilingclip should also be set
+================
+*/
+
+void R_DrawVisSprite(vissprite_t * vis, int x1, int x2)
+{
+    column_t *column;
+    int texturecolumn;
+    fixed_t frac;
+    patch_t *patch;
+    fixed_t baseclip;
+
+
+    patch = W_CacheLumpNum(vis->patch + firstspritelump, PU_CACHE);
+
+    dc_colormap = vis->colormap;
+
+//      if(!dc_colormap)
+//              colfunc = tlcolfunc;  // NULL colormap = shadow draw
+
+    if (vis->mobjflags & (MF_SHADOW | MF_ALTSHADOW))
+    {
+        if (vis->mobjflags & MF_TRANSLATION)
+        {
+            colfunc = R_DrawTranslatedTLColumn;
+            dc_translation = translationtables - 256
+                + vis->class * ((maxplayers - 1) * 256) +
+                ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
+        }
+        else if (vis->mobjflags & MF_SHADOW)
+        {                       // Draw using shadow column function
+            colfunc = tlcolfunc;
+        }
+        else
+        {
+            colfunc = R_DrawAltTLColumn;
+        }
+    }
+    else if (vis->mobjflags & MF_TRANSLATION)
+    {
+        // Draw using translated column function
+        colfunc = R_DrawTranslatedColumn;
+        dc_translation = translationtables - 256
+            + vis->class * ((maxplayers - 1) * 256) +
+            ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
+    }
+
+    dc_iscale = abs(vis->xiscale) >> detailshift;
+    dc_texturemid = vis->texturemid;
+    frac = vis->startfrac;
+    spryscale = vis->scale;
+
+    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
+
+    // check to see if vissprite is a weapon
+    if (vis->psprite)
+    {
+        dc_texturemid += FixedMul(((centery - viewheight / 2) << FRACBITS),
+                                  vis->xiscale);
+        sprtopscreen += (viewheight / 2 - centery) << FRACBITS;
+    }
+
+    if (vis->floorclip && !vis->psprite)
+    {
+        sprbotscreen = sprtopscreen + FixedMul(SHORT(patch->height) << FRACBITS,
+                                               spryscale);
+        baseclip = (sprbotscreen - FixedMul(vis->floorclip,
+                                            spryscale)) >> FRACBITS;
+    }
+    else
+    {
+        baseclip = -1;
+    }
+
+    for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
+    {
+        texturecolumn = frac >> FRACBITS;
+#ifdef RANGECHECK
+        if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
+            I_Error("R_DrawSpriteRange: bad texturecolumn");
+#endif
+        column = (column_t *) ((byte *) patch +
+                               LONG(patch->columnofs[texturecolumn]));
+        R_DrawMaskedColumn(column, baseclip);
+    }
+
+    colfunc = basecolfunc;
+}
+
+
+
+/*
+===================
+=
+= R_ProjectSprite
+=
+= Generates a vissprite for a thing if it might be visible
+=
+===================
+*/
+
+void R_ProjectSprite(mobj_t * thing)
+{
+    fixed_t trx, try;
+    fixed_t gxt, gyt;
+    fixed_t tx, tz;
+    fixed_t xscale;
+    int x1, x2;
+    spritedef_t *sprdef;
+    spriteframe_t *sprframe;
+    int lump;
+    unsigned rot;
+    boolean flip;
+    int index;
+    vissprite_t *vis;
+    angle_t ang;
+    fixed_t iscale;
+
+    if (thing->flags2 & MF2_DONTDRAW)
+    {                           // Never make a vissprite when MF2_DONTDRAW is flagged.
+        return;
+    }
+
+//
+// transform the origin point
+//
+    trx = thing->x - viewx;
+    try = thing->y - viewy;
+
+    gxt = FixedMul(trx, viewcos);
+    gyt = -FixedMul(try, viewsin);
+    tz = gxt - gyt;
+
+    if (tz < MINZ)
+        return;                 // thing is behind view plane
+    xscale = FixedDiv(projection, tz);
+
+    gxt = -FixedMul(trx, viewsin);
+    gyt = FixedMul(try, viewcos);
+    tx = -(gyt + gxt);
+
+    if (abs(tx) > (tz << 2))
+        return;                 // too far off the side
+
+//
+// decide which patch to use for sprite reletive to player
+//
+#ifdef RANGECHECK
+    if ((unsigned) thing->sprite >= numsprites)
+        I_Error("R_ProjectSprite: invalid sprite number %i ", thing->sprite);
+#endif
+    sprdef = &sprites[thing->sprite];
+#ifdef RANGECHECK
+    if ((thing->frame & FF_FRAMEMASK) >= sprdef->numframes)
+        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
+                thing->sprite, thing->frame);
+#endif
+    sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
+
+    if (sprframe->rotate)
+    {                           // choose a different rotation based on player view
+        ang = R_PointToAngle(thing->x, thing->y);
+        rot = (ang - thing->angle + (unsigned) (ANG45 / 2) * 9) >> 29;
+        lump = sprframe->lump[rot];
+        flip = (boolean) sprframe->flip[rot];
+    }
+    else
+    {                           // use single rotation for all views
+        lump = sprframe->lump[0];
+        flip = (boolean) sprframe->flip[0];
+    }
+
+//
+// calculate edges of the shape
+//
+    tx -= spriteoffset[lump];
+    x1 = (centerxfrac + FixedMul(tx, xscale)) >> FRACBITS;
+    if (x1 > viewwidth)
+        return;                 // off the right side
+    tx += spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul(tx, xscale)) >> FRACBITS) - 1;
+    if (x2 < 0)
+        return;                 // off the left side
+
+
+//
+// store information in a vissprite
+//
+    vis = R_NewVisSprite();
+    vis->mobjflags = thing->flags;
+    vis->psprite = false;
+    vis->scale = xscale << detailshift;
+    vis->gx = thing->x;
+    vis->gy = thing->y;
+    vis->gz = thing->z;
+    vis->gzt = thing->z + spritetopoffset[lump];
+    if (thing->flags & MF_TRANSLATION)
+    {
+        if (thing->player)
+        {
+            vis->class = thing->player->class;
+        }
+        else
+        {
+            vis->class = thing->special1.i;
+        }
+        if (vis->class > 2)
+        {
+            vis->class = 0;
+        }
+    }
+    // foot clipping
+    vis->floorclip = thing->floorclip;
+    vis->texturemid = vis->gzt - viewz - vis->floorclip;
+
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
+    iscale = FixedDiv(FRACUNIT, xscale);
+    if (flip)
+    {
+        vis->startfrac = spritewidth[lump] - 1;
+        vis->xiscale = -iscale;
+    }
+    else
+    {
+        vis->startfrac = 0;
+        vis->xiscale = iscale;
+    }
+    if (vis->x1 > x1)
+        vis->startfrac += vis->xiscale * (vis->x1 - x1);
+    vis->patch = lump;
+//
+// get light level
+//
+
+//      if (thing->flags & MF_SHADOW)
+//              vis->colormap = NULL;                   // shadow draw
+//      else ...
+
+    if (fixedcolormap)
+        vis->colormap = fixedcolormap;  // fixed map
+    else if (LevelUseFullBright && thing->frame & FF_FULLBRIGHT)
+        vis->colormap = colormaps;      // full bright
+    else
+    {                           // diminished light
+        index = xscale >> (LIGHTSCALESHIFT - detailshift);
+        if (index >= MAXLIGHTSCALE)
+            index = MAXLIGHTSCALE - 1;
+        vis->colormap = spritelights[index];
+    }
+}
+
+
+
+
+/*
+========================
+=
+= R_AddSprites
+=
+========================
+*/
+
+void R_AddSprites(sector_t * sec)
+{
+    mobj_t *thing;
+    int lightnum;
+
+    if (sec->validcount == validcount)
+        return;                 // already added
+
+    sec->validcount = validcount;
+
+    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT) + extralight;
+    if (lightnum < 0)
+        spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+        spritelights = scalelight[LIGHTLEVELS - 1];
+    else
+        spritelights = scalelight[lightnum];
+
+
+    for (thing = sec->thinglist; thing; thing = thing->snext)
+        R_ProjectSprite(thing);
+}
+
+
+/*
+========================
+=
+= R_DrawPSprite
+=
+========================
+*/
+
+// Y-adjustment values for full screen (4 weapons)
+int PSpriteSY[NUMCLASSES][NUMWEAPONS] = {
+    {0, -12 * FRACUNIT, -10 * FRACUNIT, 10 * FRACUNIT}, // Fighter
+    {-8 * FRACUNIT, 10 * FRACUNIT, 10 * FRACUNIT, 0},   // Cleric
+    {9 * FRACUNIT, 20 * FRACUNIT, 20 * FRACUNIT, 20 * FRACUNIT},        // Mage 
+    {10 * FRACUNIT, 10 * FRACUNIT, 10 * FRACUNIT, 10 * FRACUNIT}        // Pig
+};
+
+void R_DrawPSprite(pspdef_t * psp)
+{
+    fixed_t tx;
+    int x1, x2;
+    spritedef_t *sprdef;
+    spriteframe_t *sprframe;
+    int lump;
+    boolean flip;
+    vissprite_t *vis, avis;
+
+    int tempangle;
+
+//
+// decide which patch to use
+//
+#ifdef RANGECHECK
+    if ((unsigned) psp->state->sprite >= numsprites)
+        I_Error("R_ProjectSprite: invalid sprite number %i ",
+                psp->state->sprite);
+#endif
+    sprdef = &sprites[psp->state->sprite];
+#ifdef RANGECHECK
+    if ((psp->state->frame & FF_FRAMEMASK) >= sprdef->numframes)
+        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
+                psp->state->sprite, psp->state->frame);
+#endif
+    sprframe = &sprdef->spriteframes[psp->state->frame & FF_FRAMEMASK];
+
+    lump = sprframe->lump[0];
+    flip = (boolean) sprframe->flip[0];
+
+//
+// calculate edges of the shape
+//
+    tx = psp->sx - 160 * FRACUNIT;
+
+    tx -= spriteoffset[lump];
+    if (viewangleoffset)
+    {
+        tempangle =
+            ((centerxfrac / 1024) * (viewangleoffset >> ANGLETOFINESHIFT));
+    }
+    else
+    {
+        tempangle = 0;
+    }
+    x1 = (centerxfrac + FixedMul(tx, pspritescale) + tempangle) >> FRACBITS;
+    if (x1 > viewwidth)
+        return;                 // off the right side
+    tx += spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul(tx, pspritescale) +
+           tempangle) >> FRACBITS) - 1;
+    if (x2 < 0)
+        return;                 // off the left side
+
+//
+// store information in a vissprite
+//
+    vis = &avis;
+    vis->mobjflags = 0;
+    vis->class = 0;
+    vis->psprite = true;
+    vis->floorclip = 0;
+    vis->texturemid = (BASEYCENTER << FRACBITS) + FRACUNIT / 2
+        - (psp->sy - spritetopoffset[lump]);
+    if (viewheight == SCREENHEIGHT)
+    {
+        vis->texturemid -= PSpriteSY[viewplayer->class]
+            [players[consoleplayer].readyweapon];
+    }
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
+    vis->scale = pspritescale << detailshift;
+    if (flip)
+    {
+        vis->xiscale = -pspriteiscale;
+        vis->startfrac = spritewidth[lump] - 1;
+    }
+    else
+    {
+        vis->xiscale = pspriteiscale;
+        vis->startfrac = 0;
+    }
+    if (vis->x1 > x1)
+        vis->startfrac += vis->xiscale * (vis->x1 - x1);
+    vis->patch = lump;
+
+    if (viewplayer->powers[pw_invulnerability] && viewplayer->class
+        == PCLASS_CLERIC)
+    {
+        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
+        if (viewplayer->powers[pw_invulnerability] > 4 * 32)
+        {
+            if (viewplayer->mo->flags2 & MF2_DONTDRAW)
+            {                   // don't draw the psprite
+                vis->mobjflags |= MF_SHADOW;
+            }
+            else if (viewplayer->mo->flags & MF_SHADOW)
+            {
+                vis->mobjflags |= MF_ALTSHADOW;
+            }
+        }
+        else if (viewplayer->powers[pw_invulnerability] & 8)
+        {
+            vis->mobjflags |= MF_SHADOW;
+        }
+    }
+    else if (fixedcolormap)
+    {
+        // Fixed color
+        vis->colormap = fixedcolormap;
+    }
+    else if (psp->state->frame & FF_FULLBRIGHT)
+    {
+        // Full bright
+        vis->colormap = colormaps;
+    }
+    else
+    {
+        // local light
+        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
+    }
+    R_DrawVisSprite(vis, vis->x1, vis->x2);
+}
+
+/*
+========================
+=
+= R_DrawPlayerSprites
+=
+========================
+*/
+
+void R_DrawPlayerSprites(void)
+{
+    int i, lightnum;
+    pspdef_t *psp;
+
+//
+// get light level
+//
+    lightnum =
+        (viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) +
+        extralight;
+    if (lightnum < 0)
+        spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+        spritelights = scalelight[LIGHTLEVELS - 1];
+    else
+        spritelights = scalelight[lightnum];
+//
+// clip to screen bounds
+//
+    mfloorclip = screenheightarray;
+    mceilingclip = negonearray;
+
+//
+// add all active psprites
+//
+    for (i = 0, psp = viewplayer->psprites; i < NUMPSPRITES; i++, psp++)
+        if (psp->state)
+            R_DrawPSprite(psp);
+
+}
+
+
+/*
+========================
+=
+= R_SortVisSprites
+=
+========================
+*/
+
+vissprite_t vsprsortedhead;
+
+void R_SortVisSprites(void)
+{
+    int i, count;
+    vissprite_t *ds, *best;
+    static vissprite_t unsorted;
+    fixed_t bestscale;
+
+    count = vissprite_p - vissprites;
+
+    unsorted.next = unsorted.prev = &unsorted;
+    if (!count)
+        return;
+
+    for (ds = vissprites; ds < vissprite_p; ds++)
+    {
+        ds->next = ds + 1;
+        ds->prev = ds - 1;
+    }
+    vissprites[0].prev = &unsorted;
+    unsorted.next = &vissprites[0];
+    (vissprite_p - 1)->next = &unsorted;
+    unsorted.prev = vissprite_p - 1;
+
+//
+// pull the vissprites out by scale
+//
+    best = 0;                   // shut up the compiler warning
+    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
+    for (i = 0; i < count; i++)
+    {
+        bestscale = INT_MAX;
+        for (ds = unsorted.next; ds != &unsorted; ds = ds->next)
+        {
+            if (ds->scale < bestscale)
+            {
+                bestscale = ds->scale;
+                best = ds;
+            }
+        }
+        best->next->prev = best->prev;
+        best->prev->next = best->next;
+        best->next = &vsprsortedhead;
+        best->prev = vsprsortedhead.prev;
+        vsprsortedhead.prev->next = best;
+        vsprsortedhead.prev = best;
+    }
+}
+
+
+
+/*
+========================
+=
+= R_DrawSprite
+=
+========================
+*/
+
+void R_DrawSprite(vissprite_t * spr)
+{
+    drawseg_t *ds;
+    short clipbot[SCREENWIDTH], cliptop[SCREENWIDTH];
+    int x, r1, r2;
+    fixed_t scale, lowscale;
+    int silhouette;
+
+    for (x = spr->x1; x <= spr->x2; x++)
+        clipbot[x] = cliptop[x] = -2;
+
+//
+// scan drawsegs from end to start for obscuring segs
+// the first drawseg that has a greater scale is the clip seg
+//
+    for (ds = ds_p - 1; ds >= drawsegs; ds--)
+    {
+        //
+        // determine if the drawseg obscures the sprite
+        //
+        if (ds->x1 > spr->x2 || ds->x2 < spr->x1 ||
+            (!ds->silhouette && !ds->maskedtexturecol))
+            continue;           // doesn't cover sprite
+
+        r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
+        r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
+        if (ds->scale1 > ds->scale2)
+        {
+            lowscale = ds->scale2;
+            scale = ds->scale1;
+        }
+        else
+        {
+            lowscale = ds->scale1;
+            scale = ds->scale2;
+        }
+
+        if (scale < spr->scale || (lowscale < spr->scale
+                                   && !R_PointOnSegSide(spr->gx, spr->gy,
+                                                        ds->curline)))
+        {
+            if (ds->maskedtexturecol)   // masked mid texture
+                R_RenderMaskedSegRange(ds, r1, r2);
+            continue;           // seg is behind sprite
+        }
+
+//
+// clip this piece of the sprite
+//
+        silhouette = ds->silhouette;
+        if (spr->gz >= ds->bsilheight)
+            silhouette &= ~SIL_BOTTOM;
+        if (spr->gzt <= ds->tsilheight)
+            silhouette &= ~SIL_TOP;
+
+        if (silhouette == 1)
+        {                       // bottom sil
+            for (x = r1; x <= r2; x++)
+                if (clipbot[x] == -2)
+                    clipbot[x] = ds->sprbottomclip[x];
+        }
+        else if (silhouette == 2)
+        {                       // top sil
+            for (x = r1; x <= r2; x++)
+                if (cliptop[x] == -2)
+                    cliptop[x] = ds->sprtopclip[x];
+        }
+        else if (silhouette == 3)
+        {                       // both
+            for (x = r1; x <= r2; x++)
+            {
+                if (clipbot[x] == -2)
+                    clipbot[x] = ds->sprbottomclip[x];
+                if (cliptop[x] == -2)
+                    cliptop[x] = ds->sprtopclip[x];
+            }
+        }
+
+    }
+
+//
+// all clipping has been performed, so draw the sprite
+//
+
+// check for unclipped columns
+    for (x = spr->x1; x <= spr->x2; x++)
+    {
+        if (clipbot[x] == -2)
+            clipbot[x] = viewheight;
+        if (cliptop[x] == -2)
+            cliptop[x] = -1;
+    }
+
+    mfloorclip = clipbot;
+    mceilingclip = cliptop;
+    R_DrawVisSprite(spr, spr->x1, spr->x2);
+}
+
+
+/*
+========================
+=
+= R_DrawMasked
+=
+========================
+*/
+
+void R_DrawMasked(void)
+{
+    vissprite_t *spr;
+    drawseg_t *ds;
+
+    R_SortVisSprites();
+
+    if (vissprite_p > vissprites)
+    {
+        // draw all vissprites back to front
+
+        for (spr = vsprsortedhead.next; spr != &vsprsortedhead;
+             spr = spr->next)
+            R_DrawSprite(spr);
+    }
+
+//
+// render any remaining masked mid textures
+//
+    for (ds = ds_p - 1; ds >= drawsegs; ds--)
+        if (ds->maskedtexturecol)
+            R_RenderMaskedSegRange(ds, ds->x1, ds->x2);
+
+//
+// draw the psprites on top of everything
+//
+// Added for the sideviewing with an external device
+    if (viewangleoffset <= 1024 << ANGLETOFINESHIFT || viewangleoffset >=
+        -(1024 << ANGLETOFINESHIFT))
+    {                           // don't draw on side views
+        R_DrawPlayerSprites();
+    }
+
+//      if (!viewangleoffset)           // don't draw on side views
+//              R_DrawPlayerSprites ();
+}
diff --git a/games/NXDoom/src/hexen/s_sound.c b/games/NXDoom/src/hexen/s_sound.c
new file mode 100644
index 000000000..33e621671
--- /dev/null
+++ b/games/NXDoom/src/hexen/s_sound.c
@@ -0,0 +1,1014 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include "h2def.h"
+#include "m_random.h"
+#include "i_cdmus.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "r_local.h"
+#include "p_local.h"            // for P_AproxDistance
+#include "sounds.h"
+#include "s_sound.h"
+
+#define PRIORITY_MAX_ADJUST 10
+#define DIST_ADJUST (MAX_SND_DIST/PRIORITY_MAX_ADJUST)
+
+#define DEFAULT_ARCHIVEPATH     "o:\\sound\\archive\\"
+
+void S_ShutDown(void);
+
+// If true, CD music playback is enabled (snd_musicdevice == SNDDEVICE_CD
+// and CD initialization succeeded).
+boolean cdmusic;
+
+// Track number of a track to play explicitly chosen by the
+// player using cheats. A value of zero means no track chosen:
+static int cd_custom_track = 0;
+
+// Currently playing track:
+static int cd_current_track = 0;
+
+// Time (MS) at which the currently-playing CD track will finish playing
+// and should be looped. Zero if we are not currently playing a track:
+static int cd_track_end_time = 0;
+
+/*
+===============================================================================
+
+		MUSIC & SFX API
+
+===============================================================================
+*/
+
+//static channel_t channel[MAX_CHANNELS];
+
+//static int rs; //the current registered song.
+//int mus_song = -1;
+//int mus_lumpnum;
+//void *mus_sndptr;
+//byte *soundCurve;
+
+
+static channel_t Channel[MAX_CHANNELS];
+static void *RegisteredSong;      //the current registered song.
+static boolean MusicPaused;
+static int Mus_Song = -1;
+static byte *Mus_SndPtr;
+static byte *SoundCurve;
+
+int snd_MaxVolume = 10;                // maximum volume for sound
+int snd_MusicVolume = 10;              // maximum volume for music
+int snd_Channels = 16;
+
+// int AmbChan;
+
+//==========================================================================
+//
+// S_Start
+//
+//==========================================================================
+
+void S_Start(void)
+{
+    S_StopAllSound();
+    S_StartSong(gamemap, true);
+}
+
+//==========================================================================
+//
+// Returns true if we are playing a looping CD track and it is time to
+// restart it.
+//
+//==========================================================================
+
+static boolean ShouldRestartCDTrack(void)
+{
+    return cd_track_end_time != 0 && I_GetTimeMS() > cd_track_end_time;
+}
+
+//==========================================================================
+//
+// Start playing a CD track. Returns true for success.
+//
+//==========================================================================
+
+static boolean StartCDTrack(int track, boolean loop)
+{
+    // Already playing? If so, don't bother.
+
+    if (track == cd_current_track && !ShouldRestartCDTrack())
+    {
+        return true;
+    }
+
+    if (I_CDMusPlay(track))
+    {
+        return false;
+    }
+
+    cd_current_track = track;
+
+    if (loop)
+    {
+        cd_track_end_time = I_GetTimeMS() + 1000 * I_CDMusTrackLength(track);
+    }
+    else
+    {
+        cd_track_end_time = 0;
+    }
+
+    return true;
+}
+
+//==========================================================================
+//
+// S_StartSong
+//
+//==========================================================================
+
+void S_StartSong(int song, boolean loop)
+{
+    char *songLump;
+    int lumpnum;
+    int length;
+    int track;
+
+    // If we're in CD music mode, play a CD track, instead:
+    if (cdmusic)
+    {
+        // Default to the player-chosen track
+        if (cd_custom_track != 0)
+        {
+            track = cd_custom_track;
+        }
+        else
+        {
+            track = P_GetMapCDTrack(gamemap);
+        }
+
+        StartCDTrack(track, loop);
+    }
+    else
+    {
+        if (song == Mus_Song)
+        {                       // don't replay an old song
+            return;
+        }
+        if (RegisteredSong)
+        {
+            I_StopSong();
+            I_UnRegisterSong(RegisteredSong);
+            RegisteredSong = 0;
+        }
+        songLump = P_GetMapSongLump(song);
+        if (!songLump)
+        {
+            return;
+        }
+
+        lumpnum = W_GetNumForName(songLump);
+        Mus_SndPtr = W_CacheLumpNum(lumpnum, PU_STATIC);
+        length = W_LumpLength(lumpnum);
+
+        RegisteredSong = I_RegisterSong(Mus_SndPtr, length);
+        I_PlaySong(RegisteredSong, loop);
+        Mus_Song = song;
+
+        W_ReleaseLumpNum(lumpnum);
+    }
+}
+
+//==========================================================================
+//
+// Play a custom-chosen music track selected by the player.
+//
+// Returns true for success.
+//
+//==========================================================================
+
+boolean S_StartCustomCDTrack(int tracknum)
+{
+    boolean result;
+
+    result = StartCDTrack(tracknum, true);
+
+    if (result)
+    {
+        cd_custom_track = tracknum;
+    }
+
+    return result;
+}
+
+//==========================================================================
+//
+// Get the currently-playing CD track; returns -1 if not playing.
+//
+//==========================================================================
+
+int S_GetCurrentCDTrack(void)
+{
+    if (!cdmusic || cd_current_track == 0)
+    {
+        return -1;
+    }
+
+    return cd_current_track;
+}
+
+//==========================================================================
+//
+// S_StartSongName
+//
+//==========================================================================
+
+void S_StartSongName(const char *songLump, boolean loop)
+{
+    int lumpnum;
+    int cdTrack;
+    int length;
+
+    if (!songLump)
+    {
+        return;
+    }
+    if (cdmusic)
+    {
+        cdTrack = 0;
+
+        if (!strcmp(songLump, "hexen"))
+        {
+            cdTrack = P_GetCDTitleTrack();
+        }
+        else if (!strcmp(songLump, "hub"))
+        {
+            cdTrack = P_GetCDIntermissionTrack();
+        }
+        else if (!strcmp(songLump, "hall"))
+        {
+            cdTrack = P_GetCDEnd1Track();
+        }
+        else if (!strcmp(songLump, "orb"))
+        {
+            cdTrack = P_GetCDEnd2Track();
+        }
+        else if (!strcmp(songLump, "chess") && cd_custom_track == 0)
+        {
+            cdTrack = P_GetCDEnd3Track();
+        }
+/*	Uncomment this, if Kevin writes a specific song for startup
+		else if(!strcmp(songLump, "start"))
+		{
+			cdTrack = P_GetCDStartTrack();
+		}
+*/
+        if (cdTrack != 0)
+        {
+            cd_custom_track = 0;
+            StartCDTrack(cdTrack, loop);
+        }
+    }
+    else
+    {
+        if (RegisteredSong)
+        {
+            I_StopSong();
+            I_UnRegisterSong(RegisteredSong);
+            RegisteredSong = NULL;
+        }
+
+        lumpnum = W_GetNumForName(songLump);
+        Mus_SndPtr = W_CacheLumpNum(lumpnum, PU_MUSIC);
+        length = W_LumpLength(lumpnum);
+
+        RegisteredSong = I_RegisterSong(Mus_SndPtr, length);
+        I_PlaySong(RegisteredSong, loop);
+        W_ReleaseLumpNum(lumpnum);
+        Mus_Song = -1;
+    }
+}
+
+//==========================================================================
+//
+// S_GetSoundID
+//
+//==========================================================================
+
+int S_GetSoundID(char *name)
+{
+    int i;
+
+    for (i = 0; i < NUMSFX; i++)
+    {
+        if (!strcmp(S_sfx[i].tagname, name))
+        {
+            return i;
+        }
+    }
+    return 0;
+}
+
+//==========================================================================
+//
+// S_StartSound
+//
+//==========================================================================
+
+void S_StartSound(mobj_t * origin, int sound_id)
+{
+    S_StartSoundAtVolume(origin, sound_id, 127);
+}
+
+static mobj_t *GetSoundListener(void)
+{
+    static degenmobj_t dummy_listener;
+
+    // If we are at the title screen, the console player doesn't have an
+    // object yet, so return a pointer to a static dummy listener instead.
+
+    if (players[displayplayer].mo != NULL)
+    {
+        return players[displayplayer].mo;
+    }
+    else
+    {
+        dummy_listener.x = 0;
+        dummy_listener.y = 0;
+        dummy_listener.z = 0;
+
+        return (mobj_t *) &dummy_listener;
+    }
+}
+
+//==========================================================================
+//
+// S_StartSoundAtVolume
+//
+//==========================================================================
+
+void S_StartSoundAtVolume(mobj_t * origin, int sound_id, int volume)
+{
+    mobj_t *listener;
+    int dist, vol;
+    int i;
+    int priority;
+    int sep;
+    int angle;
+    int absx;
+    int absy;
+
+    static int sndcount = 0;
+    int chan;
+
+    if (sound_id == 0 || snd_MaxVolume == 0)
+        return;
+
+    listener = GetSoundListener();
+
+    if (origin == NULL)
+    {
+        origin = listener;
+    }
+    if (volume == 0)
+    {
+        return;
+    }
+
+    // calculate the distance before other stuff so that we can throw out
+    // sounds that are beyond the hearing range.
+    absx = abs(origin->x - listener->x);
+    absy = abs(origin->y - listener->y);
+    dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
+    dist >>= FRACBITS;
+    if (dist >= MAX_SND_DIST)
+    {
+        return;                 // sound is beyond the hearing range...
+    }
+    if (dist < 0)
+    {
+        dist = 0;
+    }
+    priority = S_sfx[sound_id].priority;
+    priority *= (PRIORITY_MAX_ADJUST - (dist / DIST_ADJUST));
+    #if 0
+    // TODO
+    if (!S_StopSoundID(sound_id, priority))
+    {
+        return;                 // other sounds have greater priority
+    }
+    #endif
+    for (i = 0; i < snd_Channels; i++)
+    {
+        // The origin pointer may point to an object of type degenmobj_t
+        // (i.e. sector_t.soundorg and polyobj_t.startSpot) which does not have
+        // a player element. Thus the origin->player pointer may point to
+        // random memory which most likely evaluates to true.
+        if (origin->thinker.function == P_DegenMobjThinker || origin->player)
+        {
+            i = snd_Channels;
+            break;              // let the player have more than one sound.
+        }
+        if (origin == Channel[i].mo)
+        {                       // only allow other mobjs one sound
+            S_StopSound(Channel[i].mo);
+            break;
+        }
+    }
+    if (i >= snd_Channels)
+    {
+        for (i = 0; i < snd_Channels; i++)
+        {
+            if (Channel[i].mo == NULL)
+            {
+                break;
+            }
+        }
+        if (i >= snd_Channels)
+        {
+            // look for a lower priority sound to replace.
+            sndcount++;
+            if (sndcount >= snd_Channels)
+            {
+                sndcount = 0;
+            }
+            for (chan = 0; chan < snd_Channels; chan++)
+            {
+                i = (sndcount + chan) % snd_Channels;
+                if (priority >= Channel[i].priority)
+                {
+                    chan = -1;  //denote that sound should be replaced.
+                    break;
+                }
+            }
+            if (chan != -1)
+            {
+                return;         //no free channels.
+            }
+            else                //replace the lower priority sound.
+            {
+                if (Channel[i].handle)
+                {
+                    if (I_SoundIsPlaying(Channel[i].handle))
+                    {
+                        I_StopSound(Channel[i].handle);
+                    }
+                    if (S_sfx[Channel[i].sound_id].usefulness > 0)
+                    {
+                        S_sfx[Channel[i].sound_id].usefulness--;
+                    }
+                }
+            }
+        }
+    }
+
+    Channel[i].mo = origin;
+
+    vol = (SoundCurve[dist] * (snd_MaxVolume * 8) * volume) >> 14;
+    if (origin == listener)
+    {
+        sep = 128;
+//              vol = (volume*(snd_MaxVolume+1)*8)>>7;
+    }
+    else
+    {
+        angle = R_PointToAngle2(listener->x,
+                                listener->y,
+                                Channel[i].mo->x, Channel[i].mo->y);
+        angle = (angle - viewangle) >> 24;
+        sep = angle * 2 - 128;
+        if (sep < 64)
+            sep = -sep;
+        if (sep > 192)
+            sep = 512 - sep;
+//              vol = SoundCurve[dist];
+    }
+
+    // if the sfxinfo_t is marked as 'can be pitch shifted'
+    if (S_sfx[sound_id].pitch)
+    {
+        Channel[i].pitch = (byte) (NORM_PITCH + (M_Random() & 7) - (M_Random() & 7));
+    }
+    else
+    {
+        Channel[i].pitch = NORM_PITCH;
+    }
+
+    if (S_sfx[sound_id].lumpnum == 0)
+    {
+        S_sfx[sound_id].lumpnum = I_GetSfxLumpNum(&S_sfx[sound_id]);
+    }
+
+    Channel[i].handle = I_StartSound(&S_sfx[sound_id],
+                                     i,
+                                     vol,
+                                     sep,
+                                     Channel[i].pitch);
+    Channel[i].sound_id = sound_id;
+    Channel[i].priority = priority;
+    Channel[i].volume = volume;
+    if (S_sfx[sound_id].usefulness < 0)
+    {
+        S_sfx[sound_id].usefulness = 1;
+    }
+    else
+    {
+        S_sfx[sound_id].usefulness++;
+    }
+}
+
+//==========================================================================
+//
+// S_StopSoundID
+//
+//==========================================================================
+
+boolean S_StopSoundID(int sound_id, int priority)
+{
+    int i;
+    int lp;                     //least priority
+    int found;
+
+    if (S_sfx[sound_id].numchannels == -1)
+    {
+        return (true);
+    }
+    lp = -1;                    //denote the argument sound_id
+    found = 0;
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (Channel[i].sound_id == sound_id && Channel[i].mo)
+        {
+            found++;            //found one.  Now, should we replace it??
+            if (priority >= Channel[i].priority)
+            {                   // if we're gonna kill one, then this'll be it
+                lp = i;
+                priority = Channel[i].priority;
+            }
+        }
+    }
+    if (found < S_sfx[sound_id].numchannels)
+    {
+        return (true);
+    }
+    else if (lp == -1)
+    {
+        return (false);         // don't replace any sounds
+    }
+    if (Channel[lp].handle)
+    {
+        if (I_SoundIsPlaying(Channel[lp].handle))
+        {
+            I_StopSound(Channel[lp].handle);
+        }
+        if (S_sfx[Channel[lp].sound_id].usefulness > 0)
+        {
+            S_sfx[Channel[lp].sound_id].usefulness--;
+        }
+        Channel[lp].mo = NULL;
+    }
+    return (true);
+}
+
+//==========================================================================
+//
+// S_StopSound
+//
+//==========================================================================
+
+void S_StopSound(mobj_t * origin)
+{
+    int i;
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (Channel[i].mo == origin)
+        {
+            I_StopSound(Channel[i].handle);
+            if (S_sfx[Channel[i].sound_id].usefulness > 0)
+            {
+                S_sfx[Channel[i].sound_id].usefulness--;
+            }
+            Channel[i].handle = 0;
+            Channel[i].mo = NULL;
+        }
+    }
+}
+
+//==========================================================================
+//
+// S_StopAllSound
+//
+//==========================================================================
+
+void S_StopAllSound(void)
+{
+    int i;
+
+    //stop all sounds
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (Channel[i].handle)
+        {
+            S_StopSound(Channel[i].mo);
+        }
+    }
+    memset(Channel, 0, 8 * sizeof(channel_t));
+}
+
+//==========================================================================
+//
+// S_SoundLink
+//
+//==========================================================================
+
+void S_SoundLink(mobj_t * oldactor, mobj_t * newactor)
+{
+    int i;
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (Channel[i].mo == oldactor)
+            Channel[i].mo = newactor;
+    }
+}
+
+//==========================================================================
+//
+// S_PauseSound
+//
+//==========================================================================
+
+void S_PauseSound(void)
+{
+    if (cdmusic)
+    {
+        I_CDMusStop();
+    }
+    else
+    {
+        I_PauseSong();
+    }
+}
+
+//==========================================================================
+//
+// S_ResumeSound
+//
+//==========================================================================
+
+void S_ResumeSound(void)
+{
+    if (cdmusic)
+    {
+        I_CDMusResume();
+    }
+    else
+    {
+        I_ResumeSong();
+    }
+}
+
+//==========================================================================
+//
+// S_UpdateSounds
+//
+//==========================================================================
+
+void S_UpdateSounds(mobj_t * listener)
+{
+    int i, dist, vol;
+    int angle;
+    int sep;
+    int priority;
+    int absx;
+    int absy;
+
+    I_UpdateSound();
+
+    // If we are looping a CD track, we need to check if it has
+    // finished playing and needs to restart.
+    if (cdmusic && ShouldRestartCDTrack())
+    {
+        StartCDTrack(cd_current_track, true);
+    }
+
+    if (snd_MaxVolume == 0)
+    {
+        return;
+    }
+
+    // Update any Sequences
+    SN_UpdateActiveSequences();
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (!Channel[i].handle || S_sfx[Channel[i].sound_id].usefulness == -1)
+        {
+            continue;
+        }
+        if (!I_SoundIsPlaying(Channel[i].handle))
+        {
+            if (S_sfx[Channel[i].sound_id].usefulness > 0)
+            {
+                S_sfx[Channel[i].sound_id].usefulness--;
+            }
+            Channel[i].handle = 0;
+            Channel[i].mo = NULL;
+            Channel[i].sound_id = 0;
+        }
+        if (Channel[i].mo == NULL || Channel[i].sound_id == 0
+         || Channel[i].mo == listener || listener == NULL)
+        {
+            continue;
+        }
+        else
+        {
+            absx = abs(Channel[i].mo->x - listener->x);
+            absy = abs(Channel[i].mo->y - listener->y);
+            dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
+            dist >>= FRACBITS;
+
+            if (dist >= MAX_SND_DIST)
+            {
+                S_StopSound(Channel[i].mo);
+                continue;
+            }
+            if (dist < 0)
+            {
+                dist = 0;
+            }
+            //vol = SoundCurve[dist];
+            vol =
+                (SoundCurve[dist] * (snd_MaxVolume * 8) *
+                 Channel[i].volume) >> 14;
+            if (Channel[i].mo == listener)
+            {
+                sep = 128;
+            }
+            else
+            {
+                angle = R_PointToAngle2(listener->x, listener->y,
+                                        Channel[i].mo->x, Channel[i].mo->y);
+                angle = (angle - viewangle) >> 24;
+                sep = angle * 2 - 128;
+                if (sep < 64)
+                    sep = -sep;
+                if (sep > 192)
+                    sep = 512 - sep;
+            }
+            I_UpdateSoundParams(i, vol, sep);
+            priority = S_sfx[Channel[i].sound_id].priority;
+            priority *= PRIORITY_MAX_ADJUST - (dist / DIST_ADJUST);
+            Channel[i].priority = priority;
+        }
+    }
+}
+
+//==========================================================================
+//
+// S_Init
+//
+//==========================================================================
+
+void S_Init(void)
+{
+    I_SetOPLDriverVer(opl_doom2_1_666);
+    SoundCurve = W_CacheLumpName("SNDCURVE", PU_STATIC);
+//      SoundCurve = Z_Malloc(MAX_SND_DIST, PU_STATIC, NULL);
+
+    if (snd_Channels > 8)
+    {
+        snd_Channels = 8;
+    }
+    I_SetMusicVolume(snd_MusicVolume * 8);
+
+    I_AtExit(S_ShutDown, true);
+
+    // Hexen defaults to pitch-shifting on
+    if (snd_pitchshift == -1)
+    {
+        snd_pitchshift = 1;
+    }
+
+    I_PrecacheSounds(S_sfx, NUMSFX);
+
+    // Attempt to setup CD music
+    if (snd_musicdevice == SNDDEVICE_CD)
+    {
+        ST_Message("    Attempting to initialize CD Music: ");
+        if (!cdrom)
+        {
+            cdmusic = (I_CDMusInit() != -1);
+        }
+        else
+        {
+            // The user is trying to use the cdrom for both game and music
+            cdmusic = false;
+        }
+
+        if (cdmusic)
+        {
+            ST_Message("initialized.\n");
+        }
+        else
+        {
+            ST_Message("failed.\n");
+        }
+
+        I_CDMusPrintStartup();
+    }
+}
+
+//==========================================================================
+//
+// S_GetChannelInfo
+//
+//==========================================================================
+
+void S_GetChannelInfo(SoundInfo_t * s)
+{
+    int i;
+    ChanInfo_t *c;
+
+    s->channelCount = snd_Channels;
+    s->musicVolume = snd_MusicVolume;
+    s->soundVolume = snd_MaxVolume;
+    for (i = 0; i < snd_Channels; i++)
+    {
+        c = &s->chan[i];
+        c->id = Channel[i].sound_id;
+        c->priority = Channel[i].priority;
+        c->name = S_sfx[c->id].name;
+        c->mo = Channel[i].mo;
+
+        if (c->mo != NULL)
+        {
+            c->distance = P_AproxDistance(c->mo->x - viewx, c->mo->y - viewy)
+                >> FRACBITS;
+        }
+        else
+        {
+            c->distance = 0;
+        }
+    }
+}
+
+//==========================================================================
+//
+// S_GetSoundPlayingInfo
+//
+//==========================================================================
+
+boolean S_GetSoundPlayingInfo(mobj_t * mobj, int sound_id)
+{
+    int i;
+
+    for (i = 0; i < snd_Channels; i++)
+    {
+        if (Channel[i].sound_id == sound_id && Channel[i].mo == mobj)
+        {
+            if (I_SoundIsPlaying(Channel[i].handle))
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+//==========================================================================
+//
+// S_SetMusicVolume
+//
+//==========================================================================
+
+void S_SetMusicVolume(void)
+{
+    if (cdmusic)
+    {
+        I_CDMusSetVolume(snd_MusicVolume * 16); // 0-255
+    }
+    else
+    {
+        I_SetMusicVolume(snd_MusicVolume * 8);
+    }
+    if (snd_MusicVolume == 0)
+    {
+        if (!cdmusic)
+        {
+            I_PauseSong();
+        }
+        MusicPaused = true;
+    }
+    else if (MusicPaused)
+    {
+        if (!cdmusic)
+        {
+            I_ResumeSong();
+        }
+        MusicPaused = false;
+    }
+}
+
+//==========================================================================
+//
+// S_ShutDown
+//
+//==========================================================================
+
+void S_ShutDown(void)
+{
+    I_StopSong();
+    I_UnRegisterSong(RegisteredSong);
+    I_ShutdownSound();
+    if (cdmusic)
+    {
+        I_CDMusStop();
+    }
+}
+
+//==========================================================================
+//
+// S_InitScript
+//
+//==========================================================================
+
+void S_InitScript(void)
+{
+    int i;
+
+    SC_OpenLump("sndinfo");
+
+    while (SC_GetString())
+    {
+        if (*sc_String == '$')
+        {
+            if (!strcasecmp(sc_String, "$ARCHIVEPATH"))
+            {
+                SC_MustGetString();
+            }
+            else if (!strcasecmp(sc_String, "$MAP"))
+            {
+                SC_MustGetNumber();
+                SC_MustGetString();
+                if (sc_Number)
+                {
+                    P_PutMapSongLump(sc_Number, sc_String);
+                }
+            }
+            continue;
+        }
+        else
+        {
+            for (i = 0; i < NUMSFX; i++)
+            {
+                if (!strcmp(S_sfx[i].tagname, sc_String))
+                {
+                    SC_MustGetString();
+                    if (*sc_String != '?')
+                    {
+                        M_StringCopy(S_sfx[i].name, sc_String,
+                                     sizeof(S_sfx[i].name));
+                    }
+                    else
+                    {
+                        M_StringCopy(S_sfx[i].name, "default",
+                                     sizeof(S_sfx[i].name));
+                    }
+                    break;
+                }
+            }
+            if (i == NUMSFX)
+            {
+                SC_MustGetString();
+            }
+        }
+    }
+    SC_Close();
+
+    for (i = 0; i < NUMSFX; i++)
+    {
+        if (!strcmp(S_sfx[i].name, ""))
+        {
+            M_StringCopy(S_sfx[i].name, "default", sizeof(S_sfx[i].name));
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/hexen/s_sound.h b/games/NXDoom/src/hexen/s_sound.h
new file mode 100644
index 000000000..f8284be77
--- /dev/null
+++ b/games/NXDoom/src/hexen/s_sound.h
@@ -0,0 +1,94 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __S_SOUND__
+#define __S_SOUND__
+
+/*
+typedef struct
+{
+    char name[8];
+    int p1;
+} musicinfo_t;
+*/
+
+/*
+typedef struct sfxinfo_s
+{
+    char tagName[32];
+    char lumpname[12];          // Only need 9 bytes, but padded out to be dword aligned
+    //struct sfxinfo_s *link; // Make alias for another sound
+    int priority;               // Higher priority takes precendence
+    int usefulness;             // Determines when a sound should be cached out
+    void *snd_ptr;
+    int lumpnum;
+    int numchannels;            // total number of channels a sound type may occupy
+    boolean changePitch;
+} sfxinfo_t;
+*/
+
+typedef struct
+{
+    mobj_t *mo;
+    int sound_id;
+    int handle;
+    int volume;
+    int pitch;
+    int priority;
+} channel_t;
+
+typedef struct
+{
+    int id;
+    unsigned short priority;
+    char *name;
+    mobj_t *mo;
+    int distance;
+} ChanInfo_t;
+
+typedef struct
+{
+    int channelCount;
+    int musicVolume;
+    int soundVolume;
+    ChanInfo_t chan[8];
+} SoundInfo_t;
+
+extern int snd_MaxVolume;
+extern int snd_MusicVolume;
+extern int snd_Channels;
+extern boolean cdmusic;
+
+void S_Start(void);
+void S_StartSound(mobj_t * origin, int sound_id);
+int S_GetSoundID(char *name);
+void S_StartSoundAtVolume(mobj_t * origin, int sound_id, int volume);
+void S_StopSound(mobj_t * origin);
+void S_StopAllSound(void);
+void S_PauseSound(void);
+void S_ResumeSound(void);
+void S_UpdateSounds(mobj_t * listener);
+void S_StartSong(int song, boolean loop);
+void S_StartSongName(const char *songLump, boolean loop);
+void S_Init(void);
+void S_GetChannelInfo(SoundInfo_t * s);
+void S_SetMusicVolume(void);
+boolean S_GetSoundPlayingInfo(mobj_t * mobj, int sound_id);
+boolean S_StartCustomCDTrack(int tracknum);
+int S_GetCurrentCDTrack(void);
+
+#endif
diff --git a/games/NXDoom/src/hexen/sb_bar.c b/games/NXDoom/src/hexen/sb_bar.c
new file mode 100644
index 000000000..fa94d59a3
--- /dev/null
+++ b/games/NXDoom/src/hexen/sb_bar.c
@@ -0,0 +1,2000 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "i_cdmus.h"
+#include "i_video.h"
+#include "m_bbox.h"
+#include "m_cheat.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "v_video.h"
+#include "i_swap.h"
+#include "am_map.h"
+
+
+// TYPES -------------------------------------------------------------------
+
+typedef struct Cheat_s
+{
+    void (*func) (player_t * player, struct Cheat_s * cheat);
+    cheatseq_t *seq;
+} Cheat_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void DrawSoundInfo(void);
+static void DrINumber(signed int val, int x, int y);
+static void DrRedINumber(signed int val, int x, int y);
+static void DrBNumber(signed int val, int x, int y);
+static void DrawCommonBar(void);
+static void DrawMainBar(void);
+static void DrawInventoryBar(void);
+static void DrawKeyBar(void);
+static void DrawWeaponPieces(void);
+static void DrawFullScreenStuff(void);
+static void DrawAnimatedIcons(void);
+static boolean HandleCheats(byte key);
+static boolean CheatAddKey(Cheat_t * cheat, byte key, boolean * eat);
+static void CheatGodFunc(player_t * player, Cheat_t * cheat);
+static void CheatNoClipFunc(player_t * player, Cheat_t * cheat);
+static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat);
+static void CheatHealthFunc(player_t * player, Cheat_t * cheat);
+static void CheatKeysFunc(player_t * player, Cheat_t * cheat);
+static void CheatSoundFunc(player_t * player, Cheat_t * cheat);
+static void CheatTickerFunc(player_t * player, Cheat_t * cheat);
+static void CheatArtifactAllFunc(player_t * player, Cheat_t * cheat);
+static void CheatPuzzleFunc(player_t * player, Cheat_t * cheat);
+static void CheatWarpFunc(player_t * player, Cheat_t * cheat);
+static void CheatPigFunc(player_t * player, Cheat_t * cheat);
+static void CheatMassacreFunc(player_t * player, Cheat_t * cheat);
+static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat);
+static void CheatQuickenFunc1(player_t * player, Cheat_t * cheat);
+static void CheatQuickenFunc2(player_t * player, Cheat_t * cheat);
+static void CheatQuickenFunc3(player_t * player, Cheat_t * cheat);
+static void CheatClassFunc1(player_t * player, Cheat_t * cheat);
+static void CheatClassFunc2(player_t * player, Cheat_t * cheat);
+static void CheatInitFunc(player_t * player, Cheat_t * cheat);
+static void CheatVersionFunc(player_t * player, Cheat_t * cheat);
+static void CheatDebugFunc(player_t * player, Cheat_t * cheat);
+static void CheatScriptFunc1(player_t * player, Cheat_t * cheat);
+static void CheatScriptFunc2(player_t * player, Cheat_t * cheat);
+static void CheatScriptFunc3(player_t * player, Cheat_t * cheat);
+static void CheatRevealFunc(player_t * player, Cheat_t * cheat);
+static void CheatTrackFunc1(player_t * player, Cheat_t * cheat);
+static void CheatTrackFunc2(player_t * player, Cheat_t * cheat);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DECLARATIONS ------------------------------------------------
+
+boolean DebugSound;             // Debug flag for displaying sound info
+boolean inventory;
+int curpos;
+int inv_ptr;
+int ArtifactFlash;
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int DisplayTicker = 0;
+static int HealthMarker;
+//static int ChainWiggle;
+static player_t *CPlayer;
+static int SpinFlylump;
+static int SpinMinotaurLump;
+static int SpinSpeedLump;
+static int SpinDefenseLump;
+
+static int FontBNumBase;
+static int PlayPalette;
+
+static patch_t *PatchH2BAR;
+static patch_t *PatchH2TOP;
+static patch_t *PatchLFEDGE;
+static patch_t *PatchRTEDGE;
+static patch_t *PatchARMCLEAR;
+static patch_t *PatchARTICLEAR;
+static patch_t *PatchMANACLEAR;
+static patch_t *PatchKILLS;
+static patch_t *PatchMANAVIAL1;
+static patch_t *PatchMANAVIAL2;
+static patch_t *PatchMANAVIALDIM1;
+static patch_t *PatchMANAVIALDIM2;
+static patch_t *PatchMANADIM1;
+static patch_t *PatchMANADIM2;
+static patch_t *PatchMANABRIGHT1;
+static patch_t *PatchMANABRIGHT2;
+static patch_t *PatchCHAIN;
+static patch_t *PatchSTATBAR;
+static patch_t *PatchKEYBAR;
+static patch_t *PatchLIFEGEM;
+static patch_t *PatchSELECTBOX;
+static patch_t *PatchINumbers[10];
+static patch_t *PatchNEGATIVE;
+static patch_t *PatchSmNumbers[10];
+static patch_t *PatchINVBAR;
+static patch_t *PatchWEAPONSLOT;
+static patch_t *PatchWEAPONFULL;
+static patch_t *PatchPIECE1;
+static patch_t *PatchPIECE2;
+static patch_t *PatchPIECE3;
+static patch_t *PatchINVLFGEM1;
+static patch_t *PatchINVLFGEM2;
+static patch_t *PatchINVRTGEM1;
+static patch_t *PatchINVRTGEM2;
+
+// Toggle god mode
+cheatseq_t CheatGodSeq = CHEAT("satan", 0);
+
+// Toggle no clipping mode
+cheatseq_t CheatNoClipSeq = CHEAT("casper", 0);
+
+// Get all weapons and mana
+cheatseq_t CheatWeaponsSeq = CHEAT("nra", 0);
+
+// Get full health
+cheatseq_t CheatHealthSeq =  CHEAT("clubmed", 0);
+
+// Get all keys
+cheatseq_t CheatKeysSeq = CHEAT("locksmith", 0);
+
+// Toggle sound debug info
+cheatseq_t CheatSoundSeq = CHEAT("noise", 0);
+
+// Toggle ticker
+cheatseq_t CheatTickerSeq = CHEAT("ticker", 0);
+
+// Get all artifacts
+cheatseq_t CheatArtifactAllSeq = CHEAT("indiana", 0);
+
+// Get all puzzle pieces
+cheatseq_t CheatPuzzleSeq = CHEAT("sherlock", 0);
+
+// Warp to new level
+cheatseq_t CheatWarpSeq = CHEAT("visit", 2);
+
+// Become a pig
+cheatseq_t CheatPigSeq = CHEAT("deliverance", 0);
+
+// Kill all monsters
+cheatseq_t CheatMassacreSeq = CHEAT("butcher", 0);
+
+cheatseq_t CheatIDKFASeq = CHEAT("conan", 0);
+
+cheatseq_t CheatQuickenSeq1 = CHEAT("martek", 0);
+
+cheatseq_t CheatQuickenSeq2 = CHEAT("martekmartek", 0);
+
+cheatseq_t CheatQuickenSeq3 = CHEAT("martekmartekmartek", 0);
+
+// New class
+cheatseq_t CheatClass1Seq = CHEAT("shadowcaster", 0);
+
+cheatseq_t CheatClass2Seq = CHEAT("shadowcaster", 1);
+
+cheatseq_t CheatInitSeq = CHEAT("init", 0);
+
+cheatseq_t CheatVersionSeq = CHEAT("mrjones", 0);
+
+cheatseq_t CheatDebugSeq = CHEAT("where", 0);
+
+cheatseq_t CheatScriptSeq1 = CHEAT("puke", 0);
+
+cheatseq_t CheatScriptSeq2 = CHEAT("puke", 1);
+
+cheatseq_t CheatScriptSeq3 = CHEAT("puke", 2);
+
+cheatseq_t CheatRevealSeq = CHEAT("mapsco", 0);
+
+cheatseq_t CheatTrackSeq1 = CHEAT("`", 0);
+
+cheatseq_t CheatTrackSeq2 = CHEAT("`", 2);
+
+static Cheat_t Cheats[] = {
+    {CheatTrackFunc1, &CheatTrackSeq1},
+    {CheatTrackFunc2, &CheatTrackSeq2},
+    {CheatGodFunc, &CheatGodSeq},
+    {CheatNoClipFunc, &CheatNoClipSeq},
+    {CheatWeaponsFunc, &CheatWeaponsSeq},
+    {CheatHealthFunc, &CheatHealthSeq},
+    {CheatKeysFunc, &CheatKeysSeq},
+    {CheatSoundFunc, &CheatSoundSeq},
+    {CheatTickerFunc, &CheatTickerSeq},
+    {CheatArtifactAllFunc, &CheatArtifactAllSeq},
+    {CheatPuzzleFunc, &CheatPuzzleSeq},
+    {CheatWarpFunc, &CheatWarpSeq},
+    {CheatPigFunc, &CheatPigSeq},
+    {CheatMassacreFunc, &CheatMassacreSeq},
+    {CheatIDKFAFunc, &CheatIDKFASeq},
+    {CheatQuickenFunc1, &CheatQuickenSeq1},
+    {CheatQuickenFunc2, &CheatQuickenSeq2},
+    {CheatQuickenFunc3, &CheatQuickenSeq3},
+    {CheatClassFunc1, &CheatClass1Seq},
+    {CheatClassFunc2, &CheatClass2Seq},
+    {CheatInitFunc, &CheatInitSeq},
+    {CheatVersionFunc, &CheatVersionSeq},
+    {CheatDebugFunc, &CheatDebugSeq},
+    {CheatScriptFunc1, &CheatScriptSeq1},
+    {CheatScriptFunc2, &CheatScriptSeq2},
+    {CheatScriptFunc3, &CheatScriptSeq3},
+    {CheatRevealFunc, &CheatRevealSeq},
+};
+
+#define SET_CHEAT(cheat, seq) \
+    { memcpy(cheat.sequence, seq, sizeof(seq)); \
+      cheat.sequence_len = sizeof(seq) - 1; }
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// SB_Init
+//
+//==========================================================================
+
+void SB_Init(void)
+{
+    int i;
+    int startLump;
+
+    PatchH2BAR = W_CacheLumpName("H2BAR", PU_STATIC);
+    PatchH2TOP = W_CacheLumpName("H2TOP", PU_STATIC);
+    PatchINVBAR = W_CacheLumpName("INVBAR", PU_STATIC);
+    PatchLFEDGE = W_CacheLumpName("LFEDGE", PU_STATIC);
+    PatchRTEDGE = W_CacheLumpName("RTEDGE", PU_STATIC);
+    PatchSTATBAR = W_CacheLumpName("STATBAR", PU_STATIC);
+    PatchKEYBAR = W_CacheLumpName("KEYBAR", PU_STATIC);
+    PatchSELECTBOX = W_CacheLumpName("SELECTBOX", PU_STATIC);
+    PatchARTICLEAR = W_CacheLumpName("ARTICLS", PU_STATIC);
+    PatchARMCLEAR = W_CacheLumpName("ARMCLS", PU_STATIC);
+    PatchMANACLEAR = W_CacheLumpName("MANACLS", PU_STATIC);
+    PatchMANAVIAL1 = W_CacheLumpName("MANAVL1", PU_STATIC);
+    PatchMANAVIAL2 = W_CacheLumpName("MANAVL2", PU_STATIC);
+    PatchMANAVIALDIM1 = W_CacheLumpName("MANAVL1D", PU_STATIC);
+    PatchMANAVIALDIM2 = W_CacheLumpName("MANAVL2D", PU_STATIC);
+    PatchMANADIM1 = W_CacheLumpName("MANADIM1", PU_STATIC);
+    PatchMANADIM2 = W_CacheLumpName("MANADIM2", PU_STATIC);
+    PatchMANABRIGHT1 = W_CacheLumpName("MANABRT1", PU_STATIC);
+    PatchMANABRIGHT2 = W_CacheLumpName("MANABRT2", PU_STATIC);
+    PatchINVLFGEM1 = W_CacheLumpName("invgeml1", PU_STATIC);
+    PatchINVLFGEM2 = W_CacheLumpName("invgeml2", PU_STATIC);
+    PatchINVRTGEM1 = W_CacheLumpName("invgemr1", PU_STATIC);
+    PatchINVRTGEM2 = W_CacheLumpName("invgemr2", PU_STATIC);
+
+//      PatchCHAINBACK = W_CacheLumpName("CHAINBACK", PU_STATIC);
+    startLump = W_GetNumForName("IN0");
+    for (i = 0; i < 10; i++)
+    {
+        PatchINumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
+    }
+    PatchNEGATIVE = W_CacheLumpName("NEGNUM", PU_STATIC);
+    FontBNumBase = W_GetNumForName("FONTB16");
+    startLump = W_GetNumForName("SMALLIN0");
+    for (i = 0; i < 10; i++)
+    {
+        PatchSmNumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
+    }
+    PlayPalette = W_GetNumForName("PLAYPAL");
+    SpinFlylump = W_GetNumForName("SPFLY0");
+    SpinMinotaurLump = W_GetNumForName("SPMINO0");
+    SpinSpeedLump = W_GetNumForName("SPBOOT0");
+    SpinDefenseLump = W_GetNumForName("SPSHLD0");
+
+    if (deathmatch)
+    {
+        PatchKILLS = W_CacheLumpName("KILLS", PU_STATIC);
+    }
+    SB_SetClassData();
+
+    if (gamemode == shareware)
+    {
+	SET_CHEAT(CheatGodSeq, "bgokey");
+	SET_CHEAT(CheatNoClipSeq, "rjohnson");
+	SET_CHEAT(CheatWeaponsSeq, "crhinehart");
+	SET_CHEAT(CheatHealthSeq,"sgurno");
+	SET_CHEAT(CheatKeysSeq, "mraymondjudy");
+	SET_CHEAT(CheatSoundSeq, "kschilder");
+	SET_CHEAT(CheatTickerSeq, "rrettenmund");
+	SET_CHEAT(CheatArtifactAllSeq, "braffel");
+	SET_CHEAT(CheatPuzzleSeq, "tmoore");
+	SET_CHEAT(CheatWarpSeq, "bpelletier");
+	SET_CHEAT(CheatPigSeq, "ebiessman");
+	SET_CHEAT(CheatMassacreSeq, "cstika");
+	SET_CHEAT(CheatIDKFASeq, "rambo");
+	SET_CHEAT(CheatQuickenSeq1, "quicken");
+	SET_CHEAT(CheatQuickenSeq2, "quickenquicken");
+	SET_CHEAT(CheatQuickenSeq3, "quickenquickenquicken");
+	SET_CHEAT(CheatClass1Seq, "plipo");
+	SET_CHEAT(CheatClass2Seq, "plipo");
+	SET_CHEAT(CheatVersionSeq, "pmacarther");
+	SET_CHEAT(CheatDebugSeq, "jsumwalt");
+	SET_CHEAT(CheatScriptSeq1, "mwagabaza");
+	SET_CHEAT(CheatScriptSeq2, "mwagabaza");
+	SET_CHEAT(CheatScriptSeq3, "mwagabaza");
+	SET_CHEAT(CheatRevealSeq, "reveal");
+    }
+}
+
+//==========================================================================
+//
+// SB_SetClassData
+//
+//==========================================================================
+
+void SB_SetClassData(void)
+{
+    int class;
+
+    class = PlayerClass[consoleplayer]; // original player class (not pig)
+    PatchWEAPONSLOT = W_CacheLumpNum(W_GetNumForName("wpslot0")
+                                     + class, PU_STATIC);
+    PatchWEAPONFULL = W_CacheLumpNum(W_GetNumForName("wpfull0")
+                                     + class, PU_STATIC);
+    PatchPIECE1 = W_CacheLumpNum(W_GetNumForName("wpiecef1")
+                                 + class, PU_STATIC);
+    PatchPIECE2 = W_CacheLumpNum(W_GetNumForName("wpiecef2")
+                                 + class, PU_STATIC);
+    PatchPIECE3 = W_CacheLumpNum(W_GetNumForName("wpiecef3")
+                                 + class, PU_STATIC);
+    PatchCHAIN = W_CacheLumpNum(W_GetNumForName("chain") + class, PU_STATIC);
+    if (!netgame)
+    {                           // single player game uses red life gem (the second gem)
+        PatchLIFEGEM = W_CacheLumpNum(W_GetNumForName("lifegem")
+                                      + maxplayers * class + 1, PU_STATIC);
+    }
+    else
+    {
+        PatchLIFEGEM = W_CacheLumpNum(W_GetNumForName("lifegem")
+                                      + maxplayers * class + consoleplayer,
+                                      PU_STATIC);
+    }
+    SB_state = -1;
+    UpdateState |= I_FULLSCRN;
+}
+
+//==========================================================================
+//
+// SB_Ticker
+//
+//==========================================================================
+
+void SB_Ticker(void)
+{
+    int delta;
+    int curHealth;
+
+    curHealth = players[consoleplayer].mo->health;
+    if (curHealth < 0)
+    {
+        curHealth = 0;
+    }
+    if (curHealth < HealthMarker)
+    {
+        delta = (HealthMarker - curHealth) >> 2;
+        if (delta < 1)
+        {
+            delta = 1;
+        }
+        else if (delta > 6)
+        {
+            delta = 6;
+        }
+        HealthMarker -= delta;
+    }
+    else if (curHealth > HealthMarker)
+    {
+        delta = (curHealth - HealthMarker) >> 2;
+        if (delta < 1)
+        {
+            delta = 1;
+        }
+        else if (delta > 6)
+        {
+            delta = 6;
+        }
+        HealthMarker += delta;
+    }
+}
+
+//==========================================================================
+//
+// DrINumber
+//
+// Draws a three digit number.
+//
+//==========================================================================
+
+static void DrINumber(signed int val, int x, int y)
+{
+    patch_t *patch;
+    int oldval;
+
+    oldval = val;
+    if (val < 0)
+    {
+        val = -val;
+        if (val > 99)
+        {
+            val = 99;
+        }
+        if (val > 9)
+        {
+            patch = PatchINumbers[val / 10];
+            V_DrawPatch(x + 8, y, patch);
+            V_DrawPatch(x, y, PatchNEGATIVE);
+        }
+        else
+        {
+            V_DrawPatch(x + 8, y, PatchNEGATIVE);
+        }
+        val = val % 10;
+        patch = PatchINumbers[val];
+        V_DrawPatch(x + 16, y, patch);
+        return;
+    }
+    if (val > 99)
+    {
+        patch = PatchINumbers[val / 100];
+        V_DrawPatch(x, y, patch);
+    }
+    val = val % 100;
+    if (val > 9 || oldval > 99)
+    {
+        patch = PatchINumbers[val / 10];
+        V_DrawPatch(x + 8, y, patch);
+    }
+    val = val % 10;
+    patch = PatchINumbers[val];
+    V_DrawPatch(x + 16, y, patch);
+}
+
+//==========================================================================
+//
+// DrRedINumber
+//
+// Draws a three digit number using the red font
+//
+//==========================================================================
+
+static void DrRedINumber(signed int val, int x, int y)
+{
+    patch_t *patch;
+    int oldval;
+
+    oldval = val;
+    if (val < 0)
+    {
+        val = 0;
+    }
+    if (val > 99)
+    {
+        patch =
+            W_CacheLumpNum(W_GetNumForName("inred0") + val / 100, PU_CACHE);
+        V_DrawPatch(x, y, patch);
+    }
+    val = val % 100;
+    if (val > 9 || oldval > 99)
+    {
+        patch =
+            W_CacheLumpNum(W_GetNumForName("inred0") + val / 10, PU_CACHE);
+        V_DrawPatch(x + 8, y, patch);
+    }
+    val = val % 10;
+    patch = W_CacheLumpNum(W_GetNumForName("inred0") + val, PU_CACHE);
+    V_DrawPatch(x + 16, y, patch);
+}
+
+//==========================================================================
+//
+// DrBNumber
+//
+// Draws a three digit number using FontB
+//
+//==========================================================================
+
+static void DrBNumber(signed int val, int x, int y)
+{
+    patch_t *patch;
+    int xpos;
+    int oldval;
+
+    oldval = val;
+    xpos = x;
+    if (val < 0)
+    {
+        val = 0;
+    }
+    if (val > 99)
+    {
+        patch = W_CacheLumpNum(FontBNumBase + val / 100, PU_CACHE);
+        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+    }
+    val = val % 100;
+    xpos += 12;
+    if (val > 9 || oldval > 99)
+    {
+        patch = W_CacheLumpNum(FontBNumBase + val / 10, PU_CACHE);
+        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+    }
+    val = val % 10;
+    xpos += 12;
+    patch = W_CacheLumpNum(FontBNumBase + val, PU_CACHE);
+    V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
+}
+
+//==========================================================================
+//
+// DrSmallNumber
+//
+// Draws a small two digit number.
+//
+//==========================================================================
+
+static void DrSmallNumber(int val, int x, int y)
+{
+    patch_t *patch;
+
+    if (val <= 0)
+    {
+        return;
+    }
+    if (val > 999)
+    {
+        val %= 1000;
+    }
+    if (val > 99)
+    {
+        patch = PatchSmNumbers[val / 100];
+        V_DrawPatch(x, y, patch);
+        patch = PatchSmNumbers[(val % 100) / 10];
+        V_DrawPatch(x + 4, y, patch);
+    }
+    else if (val > 9)
+    {
+        patch = PatchSmNumbers[val / 10];
+        V_DrawPatch(x + 4, y, patch);
+    }
+    val %= 10;
+    patch = PatchSmNumbers[val];
+    V_DrawPatch(x + 8, y, patch);
+}
+
+/*
+//==========================================================================
+//
+// ShadeLine
+//
+//==========================================================================
+
+static void ShadeLine(int x, int y, int height, int shade)
+{
+	byte *dest;
+	byte *shades;
+
+	shades = colormaps+9*256+shade*2*256;
+	dest = I_VideoBuffer+y*SCREENWIDTH+x;
+	while(height--)
+	{
+		*(dest) = *(shades+*dest);
+		dest += SCREENWIDTH;
+	}
+}
+
+//==========================================================================
+//
+// ShadeChain
+//
+//==========================================================================
+
+static void ShadeChain(void)
+{
+	int i;
+
+	for(i = 0; i < 16; i++)
+	{
+		ShadeLine(277+i, 190, 10, i/2);
+		ShadeLine(19+i, 190, 10, 7-(i/2));
+	}
+}
+*/
+
+//==========================================================================
+//
+// DrawSoundInfo
+//
+// Displays sound debugging information.
+//
+//==========================================================================
+
+static void DrawSoundInfo(void)
+{
+    int i;
+    SoundInfo_t s;
+    ChanInfo_t *c;
+    char text[32];
+    int x;
+    int y;
+    int xPos[7] = { 1, 75, 112, 156, 200, 230, 260 };
+
+    if (leveltime & 16)
+    {
+        MN_DrTextA("*** SOUND DEBUG INFO ***", xPos[0], 20);
+    }
+    S_GetChannelInfo(&s);
+    if (s.channelCount == 0)
+    {
+        return;
+    }
+    x = 0;
+    MN_DrTextA("NAME", xPos[x++], 30);
+    MN_DrTextA("MO.T", xPos[x++], 30);
+    MN_DrTextA("MO.X", xPos[x++], 30);
+    MN_DrTextA("MO.Y", xPos[x++], 30);
+    MN_DrTextA("ID", xPos[x++], 30);
+    MN_DrTextA("PRI", xPos[x++], 30);
+    MN_DrTextA("DIST", xPos[x++], 30);
+    for (i = 0; i < s.channelCount; i++)
+    {
+        c = &s.chan[i];
+        x = 0;
+        y = 40 + i * 10;
+        if (c->mo == NULL)
+        {                       // Channel is unused
+            MN_DrTextA("------", xPos[0], y);
+            continue;
+        }
+        M_snprintf(text, sizeof(text), "%s", c->name);
+        M_ForceUppercase(text);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->mo->type);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->mo->x >> FRACBITS);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->mo->y >> FRACBITS);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", (int) c->id);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->priority);
+        MN_DrTextA(text, xPos[x++], y);
+        M_snprintf(text, sizeof(text), "%d", c->distance);
+        MN_DrTextA(text, xPos[x++], y);
+    }
+    UpdateState |= I_FULLSCRN;
+    BorderNeedRefresh = true;
+}
+
+//==========================================================================
+//
+// SB_Drawer
+//
+//==========================================================================
+
+char patcharti[][10] = {
+    {"ARTIBOX"},                // none
+    {"ARTIINVU"},               // invulnerability
+    {"ARTIPTN2"},               // health
+    {"ARTISPHL"},               // superhealth
+    {"ARTIHRAD"},               // healing radius
+    {"ARTISUMN"},               // summon maulator
+    {"ARTITRCH"},               // torch
+    {"ARTIPORK"},               // egg
+    {"ARTISOAR"},               // fly
+    {"ARTIBLST"},               // blast radius
+    {"ARTIPSBG"},               // poison bag
+    {"ARTITELO"},               // teleport other
+    {"ARTISPED"},               // speed
+    {"ARTIBMAN"},               // boost mana
+    {"ARTIBRAC"},               // boost armor
+    {"ARTIATLP"},               // teleport
+    {"ARTISKLL"},               // arti_puzzskull
+    {"ARTIBGEM"},               // arti_puzzgembig
+    {"ARTIGEMR"},               // arti_puzzgemred
+    {"ARTIGEMG"},               // arti_puzzgemgreen1
+    {"ARTIGMG2"},               // arti_puzzgemgreen2
+    {"ARTIGEMB"},               // arti_puzzgemblue1
+    {"ARTIGMB2"},               // arti_puzzgemblue2
+    {"ARTIBOK1"},               // arti_puzzbook1
+    {"ARTIBOK2"},               // arti_puzzbook2
+    {"ARTISKL2"},               // arti_puzzskull2
+    {"ARTIFWEP"},               // arti_puzzfweapon
+    {"ARTICWEP"},               // arti_puzzcweapon
+    {"ARTIMWEP"},               // arti_puzzmweapon
+    {"ARTIGEAR"},               // arti_puzzgear1
+    {"ARTIGER2"},               // arti_puzzgear2
+    {"ARTIGER3"},               // arti_puzzgear3
+    {"ARTIGER4"},               // arti_puzzgear4
+};
+
+int SB_state = -1;
+static int oldarti = 0;
+static int oldartiCount = 0;
+static int oldfrags = -9999;
+static int oldmana1 = -1;
+static int oldmana2 = -1;
+static int oldarmor = -1;
+static int oldhealth = -1;
+static int oldlife = -1;
+static int oldpieces = -1;
+static int oldweapon = -1;
+static int oldkeys = -1;
+
+
+void SB_Drawer(void)
+{
+    // Sound info debug stuff
+    if (DebugSound == true)
+    {
+        DrawSoundInfo();
+    }
+    CPlayer = &players[consoleplayer];
+    if (viewheight == SCREENHEIGHT && !automapactive)
+    {
+        DrawFullScreenStuff();
+        SB_state = -1;
+    }
+    else
+    {
+        if (SB_state == -1)
+        {
+            V_DrawPatch(0, 134, PatchH2BAR);
+            oldhealth = -1;
+        }
+        DrawCommonBar();
+        if (!inventory)
+        {
+            if (SB_state != 0)
+            {
+                // Main interface
+                if (!automapactive)
+                {
+                    V_DrawPatch(38, 162, PatchSTATBAR);
+                }
+                else
+                {
+                    V_DrawPatch(38, 162, PatchKEYBAR);
+                }
+                oldarti = 0;
+                oldmana1 = -1;
+                oldmana2 = -1;
+                oldarmor = -1;
+                oldpieces = -1;
+                oldfrags = -9999;       //can't use -1, 'cuz of negative frags
+                oldlife = -1;
+                oldweapon = -1;
+                oldkeys = -1;
+            }
+            if (!automapactive)
+            {
+                DrawMainBar();
+            }
+            else
+            {
+                DrawKeyBar();
+            }
+            SB_state = 0;
+        }
+        else
+        {
+            DrawInventoryBar();
+            SB_state = 1;
+        }
+    }
+    SB_PaletteFlash(false);
+    DrawAnimatedIcons();
+}
+
+//==========================================================================
+//
+// DrawAnimatedIcons
+//
+//==========================================================================
+
+static void DrawAnimatedIcons(void)
+{
+    int frame;
+    static boolean hitCenterFrame;
+
+    // Wings of wrath
+    if (CPlayer->powers[pw_flight])
+    {
+        if (CPlayer->powers[pw_flight] > BLINKTHRESHOLD
+            || !(CPlayer->powers[pw_flight] & 16))
+        {
+            frame = (leveltime / 3) & 15;
+            if (CPlayer->mo->flags2 & MF2_FLY)
+            {
+                if (hitCenterFrame && (frame != 15 && frame != 0))
+                {
+                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + 15,
+                                                       PU_CACHE));
+                }
+                else
+                {
+                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + frame,
+                                                       PU_CACHE));
+                    hitCenterFrame = false;
+                }
+            }
+            else
+            {
+                if (!hitCenterFrame && (frame != 15 && frame != 0))
+                {
+                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + frame,
+                                                       PU_CACHE));
+                    hitCenterFrame = false;
+                }
+                else
+                {
+                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + 15,
+                                                       PU_CACHE));
+                    hitCenterFrame = true;
+                }
+            }
+        }
+        BorderTopRefresh = true;
+        UpdateState |= I_MESSAGES;
+    }
+
+    // Speed Boots
+    if (CPlayer->powers[pw_speed])
+    {
+        if (CPlayer->powers[pw_speed] > BLINKTHRESHOLD
+            || !(CPlayer->powers[pw_speed] & 16))
+        {
+            frame = (leveltime / 3) & 15;
+            V_DrawPatch(60, 19, W_CacheLumpNum(SpinSpeedLump + frame,
+                                               PU_CACHE));
+        }
+        BorderTopRefresh = true;
+        UpdateState |= I_MESSAGES;
+    }
+
+    // Defensive power
+    if (CPlayer->powers[pw_invulnerability])
+    {
+        if (CPlayer->powers[pw_invulnerability] > BLINKTHRESHOLD
+            || !(CPlayer->powers[pw_invulnerability] & 16))
+        {
+            frame = (leveltime / 3) & 15;
+            V_DrawPatch(260, 19, W_CacheLumpNum(SpinDefenseLump + frame,
+                                                PU_CACHE));
+        }
+        BorderTopRefresh = true;
+        UpdateState |= I_MESSAGES;
+    }
+
+    // Minotaur Active
+    if (CPlayer->powers[pw_minotaur])
+    {
+        if (CPlayer->powers[pw_minotaur] > BLINKTHRESHOLD
+            || !(CPlayer->powers[pw_minotaur] & 16))
+        {
+            frame = (leveltime / 3) & 15;
+            V_DrawPatch(300, 19, W_CacheLumpNum(SpinMinotaurLump + frame,
+                                                PU_CACHE));
+        }
+        BorderTopRefresh = true;
+        UpdateState |= I_MESSAGES;
+    }
+}
+
+//==========================================================================
+//
+// SB_PaletteFlash
+//
+// Sets the new palette based upon the current values of
+// consoleplayer->damagecount and consoleplayer->bonuscount.
+//
+//==========================================================================
+
+void SB_PaletteFlash(boolean forceChange)
+{
+    static int sb_palette = 0;
+    int palette;
+    byte *pal;
+
+    if (forceChange)
+    {
+        sb_palette = -1;
+    }
+    if (gamestate == GS_LEVEL)
+    {
+        CPlayer = &players[consoleplayer];
+        if (CPlayer->poisoncount)
+        {
+            palette = 0;
+            palette = (CPlayer->poisoncount + 7) >> 3;
+            if (palette >= NUMPOISONPALS)
+            {
+                palette = NUMPOISONPALS - 1;
+            }
+            palette += STARTPOISONPALS;
+        }
+        else if (CPlayer->damagecount)
+        {
+            palette = (CPlayer->damagecount + 7) >> 3;
+            if (palette >= NUMREDPALS)
+            {
+                palette = NUMREDPALS - 1;
+            }
+            palette += STARTREDPALS;
+        }
+        else if (CPlayer->bonuscount)
+        {
+            palette = (CPlayer->bonuscount + 7) >> 3;
+            if (palette >= NUMBONUSPALS)
+            {
+                palette = NUMBONUSPALS - 1;
+            }
+            palette += STARTBONUSPALS;
+        }
+        else if (CPlayer->mo->flags2 & MF2_ICEDAMAGE)
+        {                       // Frozen player
+            palette = STARTICEPAL;
+        }
+        else
+        {
+            palette = 0;
+        }
+    }
+    else
+    {
+        palette = 0;
+    }
+    if (palette != sb_palette)
+    {
+        sb_palette = palette;
+        pal = (byte *) W_CacheLumpNum(PlayPalette, PU_CACHE) + palette * 768;
+        I_SetPalette(pal);
+    }
+}
+
+//==========================================================================
+//
+// DrawCommonBar
+//
+//==========================================================================
+
+void DrawCommonBar(void)
+{
+    int healthPos;
+
+    V_DrawPatch(0, 134, PatchH2TOP);
+
+    if (oldhealth != HealthMarker)
+    {
+        oldhealth = HealthMarker;
+        healthPos = HealthMarker;
+        if (healthPos < 0)
+        {
+            healthPos = 0;
+        }
+        if (healthPos > 100)
+        {
+            healthPos = 100;
+        }
+        V_DrawPatch(28 + (((healthPos * 196) / 100) % 9), 193, PatchCHAIN);
+        V_DrawPatch(7 + ((healthPos * 11) / 5), 193, PatchLIFEGEM);
+        V_DrawPatch(0, 193, PatchLFEDGE);
+        V_DrawPatch(277, 193, PatchRTEDGE);
+//              ShadeChain();
+        UpdateState |= I_STATBAR;
+    }
+}
+
+//==========================================================================
+//
+// DrawMainBar
+//
+//==========================================================================
+
+void DrawMainBar(void)
+{
+    int i;
+    int temp;
+    patch_t *manaPatch1, *manaPatch2;
+    patch_t *manaVialPatch1, *manaVialPatch2;
+
+    manaPatch1 = NULL;
+    manaPatch2 = NULL;
+    manaVialPatch1 = NULL;
+    manaVialPatch2 = NULL;
+
+    // Ready artifact
+    if (ArtifactFlash)
+    {
+        V_DrawPatch(144, 160, PatchARTICLEAR);
+        V_DrawPatch(148, 164, W_CacheLumpNum(W_GetNumForName("useartia")
+                                             + ArtifactFlash - 1, PU_CACHE));
+        ArtifactFlash--;
+        oldarti = -1;           // so that the correct artifact fills in after the flash
+        UpdateState |= I_STATBAR;
+    }
+    else if (oldarti != CPlayer->readyArtifact
+             || oldartiCount != CPlayer->inventory[inv_ptr].count)
+    {
+        V_DrawPatch(144, 160, PatchARTICLEAR);
+        if (CPlayer->readyArtifact > 0)
+        {
+            V_DrawPatch(143, 163,
+                        W_CacheLumpName(patcharti[CPlayer->readyArtifact],
+                                        PU_CACHE));
+            if (CPlayer->inventory[inv_ptr].count > 1)
+            {
+                DrSmallNumber(CPlayer->inventory[inv_ptr].count, 162, 184);
+            }
+        }
+        oldarti = CPlayer->readyArtifact;
+        oldartiCount = CPlayer->inventory[inv_ptr].count;
+        UpdateState |= I_STATBAR;
+    }
+
+    // Frags
+    if (deathmatch)
+    {
+        temp = 0;
+        for (i = 0; i < maxplayers; i++)
+        {
+            temp += CPlayer->frags[i];
+        }
+        if (temp != oldfrags)
+        {
+            V_DrawPatch(38, 162, PatchKILLS);
+            DrINumber(temp, 40, 176);
+            oldfrags = temp;
+            UpdateState |= I_STATBAR;
+        }
+    }
+    else
+    {
+        temp = HealthMarker;
+        if (temp < 0)
+        {
+            temp = 0;
+        }
+        else if (temp > 100)
+        {
+            temp = 100;
+        }
+        if (oldlife != temp)
+        {
+            oldlife = temp;
+            V_DrawPatch(41, 178, PatchARMCLEAR);
+            if (temp >= 25)
+            {
+                DrINumber(temp, 40, 176);
+            }
+            else
+            {
+                DrRedINumber(temp, 40, 176);
+            }
+            UpdateState |= I_STATBAR;
+        }
+    }
+    // Mana
+    temp = CPlayer->mana[0];
+    if (oldmana1 != temp)
+    {
+        V_DrawPatch(77, 178, PatchMANACLEAR);
+        DrSmallNumber(temp, 79, 181);
+        manaVialPatch1 = (patch_t *) 1; // force a vial update
+        if (temp == 0)
+        {                       // Draw Dim Mana icon
+            manaPatch1 = PatchMANADIM1;
+        }
+        else if (oldmana1 == 0)
+        {
+            manaPatch1 = PatchMANABRIGHT1;
+        }
+        oldmana1 = temp;
+        UpdateState |= I_STATBAR;
+    }
+    temp = CPlayer->mana[1];
+    if (oldmana2 != temp)
+    {
+        V_DrawPatch(109, 178, PatchMANACLEAR);
+        DrSmallNumber(temp, 111, 181);
+        manaVialPatch1 = (patch_t *) 1; // force a vial update
+        if (temp == 0)
+        {                       // Draw Dim Mana icon
+            manaPatch2 = PatchMANADIM2;
+        }
+        else if (oldmana2 == 0)
+        {
+            manaPatch2 = PatchMANABRIGHT2;
+        }
+        oldmana2 = temp;
+        UpdateState |= I_STATBAR;
+    }
+    if (oldweapon != CPlayer->readyweapon || manaPatch1 || manaPatch2
+        || manaVialPatch1)
+    {                           // Update mana graphics based upon mana count/weapon type
+        if (CPlayer->readyweapon == WP_FIRST)
+        {
+            manaPatch1 = PatchMANADIM1;
+            manaPatch2 = PatchMANADIM2;
+            manaVialPatch1 = PatchMANAVIALDIM1;
+            manaVialPatch2 = PatchMANAVIALDIM2;
+        }
+        else if (CPlayer->readyweapon == WP_SECOND)
+        {
+            if (!manaPatch1)
+            {
+                manaPatch1 = PatchMANABRIGHT1;
+            }
+            manaVialPatch1 = PatchMANAVIAL1;
+            manaPatch2 = PatchMANADIM2;
+            manaVialPatch2 = PatchMANAVIALDIM2;
+        }
+        else if (CPlayer->readyweapon == WP_THIRD)
+        {
+            manaPatch1 = PatchMANADIM1;
+            manaVialPatch1 = PatchMANAVIALDIM1;
+            if (!manaPatch2)
+            {
+                manaPatch2 = PatchMANABRIGHT2;
+            }
+            manaVialPatch2 = PatchMANAVIAL2;
+        }
+        else
+        {
+            manaVialPatch1 = PatchMANAVIAL1;
+            manaVialPatch2 = PatchMANAVIAL2;
+            if (!manaPatch1)
+            {
+                manaPatch1 = PatchMANABRIGHT1;
+            }
+            if (!manaPatch2)
+            {
+                manaPatch2 = PatchMANABRIGHT2;
+            }
+        }
+        V_DrawPatch(77, 164, manaPatch1);
+        V_DrawPatch(110, 164, manaPatch2);
+        V_DrawPatch(94, 164, manaVialPatch1);
+        for (i = 165; i < 187 - (22 * CPlayer->mana[0]) / MAX_MANA; i++)
+        {
+            I_VideoBuffer[i * SCREENWIDTH + 95] = 0;
+            I_VideoBuffer[i * SCREENWIDTH + 96] = 0;
+            I_VideoBuffer[i * SCREENWIDTH + 97] = 0;
+        }
+        V_DrawPatch(102, 164, manaVialPatch2);
+        for (i = 165; i < 187 - (22 * CPlayer->mana[1]) / MAX_MANA; i++)
+        {
+            I_VideoBuffer[i * SCREENWIDTH + 103] = 0;
+            I_VideoBuffer[i * SCREENWIDTH + 104] = 0;
+            I_VideoBuffer[i * SCREENWIDTH + 105] = 0;
+        }
+        oldweapon = CPlayer->readyweapon;
+        UpdateState |= I_STATBAR;
+    }
+    // Armor
+    temp = AutoArmorSave[CPlayer->class]
+        + CPlayer->armorpoints[ARMOR_ARMOR] +
+        CPlayer->armorpoints[ARMOR_SHIELD] +
+        CPlayer->armorpoints[ARMOR_HELMET] +
+        CPlayer->armorpoints[ARMOR_AMULET];
+    if (oldarmor != temp)
+    {
+        oldarmor = temp;
+        V_DrawPatch(255, 178, PatchARMCLEAR);
+        DrINumber(FixedDiv(temp, 5 * FRACUNIT) >> FRACBITS, 250, 176);
+        UpdateState |= I_STATBAR;
+    }
+    // Weapon Pieces
+    if (oldpieces != CPlayer->pieces)
+    {
+        DrawWeaponPieces();
+        oldpieces = CPlayer->pieces;
+        UpdateState |= I_STATBAR;
+    }
+}
+
+//==========================================================================
+//
+// DrawInventoryBar
+//
+//==========================================================================
+
+void DrawInventoryBar(void)
+{
+    int i;
+    int x;
+
+    x = inv_ptr - curpos;
+    UpdateState |= I_STATBAR;
+    V_DrawPatch(38, 162, PatchINVBAR);
+    for (i = 0; i < 7; i++)
+    {
+        //V_DrawPatch(50+i*31, 160, W_CacheLumpName("ARTIBOX", PU_CACHE));
+        if (CPlayer->inventorySlotNum > x + i
+            && CPlayer->inventory[x + i].type != arti_none)
+        {
+            V_DrawPatch(50 + i * 31, 163,
+                        W_CacheLumpName(patcharti
+                                        [CPlayer->inventory[x + i].type],
+                                        PU_CACHE));
+            if (CPlayer->inventory[x + i].count > 1)
+            {
+                DrSmallNumber(CPlayer->inventory[x + i].count, 68 + i * 31,
+                              185);
+            }
+        }
+    }
+    V_DrawPatch(50 + curpos * 31, 163, PatchSELECTBOX);
+    if (x != 0)
+    {
+        V_DrawPatch(42, 163, !(leveltime & 4) ? PatchINVLFGEM1 :
+                    PatchINVLFGEM2);
+    }
+    if (CPlayer->inventorySlotNum - x > 7)
+    {
+        V_DrawPatch(269, 163, !(leveltime & 4) ? PatchINVRTGEM1 :
+                    PatchINVRTGEM2);
+    }
+}
+
+//==========================================================================
+//
+// DrawKeyBar
+//
+//==========================================================================
+
+void DrawKeyBar(void)
+{
+    int i;
+    int xPosition;
+    int temp;
+
+    if (oldkeys != CPlayer->keys)
+    {
+        xPosition = 46;
+        for (i = 0; i < NUM_KEY_TYPES && xPosition <= 126; i++)
+        {
+            if (CPlayer->keys & (1 << i))
+            {
+                V_DrawPatch(xPosition, 164,
+                            W_CacheLumpNum(W_GetNumForName("keyslot1") + i,
+                                           PU_CACHE));
+                xPosition += 20;
+            }
+        }
+        oldkeys = CPlayer->keys;
+        UpdateState |= I_STATBAR;
+    }
+    temp = AutoArmorSave[CPlayer->class]
+        + CPlayer->armorpoints[ARMOR_ARMOR] +
+        CPlayer->armorpoints[ARMOR_SHIELD] +
+        CPlayer->armorpoints[ARMOR_HELMET] +
+        CPlayer->armorpoints[ARMOR_AMULET];
+    if (oldarmor != temp)
+    {
+        for (i = 0; i < NUMARMOR; i++)
+        {
+            if (!CPlayer->armorpoints[i])
+            {
+                continue;
+            }
+            if (CPlayer->armorpoints[i] <=
+                (ArmorIncrement[CPlayer->class][i] >> 2))
+            {
+                V_DrawTLPatch(150 + 31 * i, 164,
+                              W_CacheLumpNum(W_GetNumForName("armslot1") +
+                                             i, PU_CACHE));
+            }
+            else if (CPlayer->armorpoints[i] <=
+                     (ArmorIncrement[CPlayer->class][i] >> 1))
+            {
+                V_DrawAltTLPatch(150 + 31 * i, 164,
+                                 W_CacheLumpNum(W_GetNumForName("armslot1")
+                                                + i, PU_CACHE));
+            }
+            else
+            {
+                V_DrawPatch(150 + 31 * i, 164,
+                            W_CacheLumpNum(W_GetNumForName("armslot1") + i,
+                                           PU_CACHE));
+            }
+        }
+        oldarmor = temp;
+        UpdateState |= I_STATBAR;
+    }
+}
+
+//==========================================================================
+//
+// DrawWeaponPieces
+//
+//==========================================================================
+
+static int PieceX[NUMCLASSES][3] = {
+    {190, 225, 234},
+    {190, 212, 225},
+    {190, 205, 224},
+    {0, 0, 0}                   // Pig is never used
+};
+
+static void DrawWeaponPieces(void)
+{
+    if (CPlayer->pieces == 7)
+    {
+        V_DrawPatch(190, 162, PatchWEAPONFULL);
+        return;
+    }
+    V_DrawPatch(190, 162, PatchWEAPONSLOT);
+    if (CPlayer->pieces & WPIECE1)
+    {
+        V_DrawPatch(PieceX[PlayerClass[consoleplayer]][0], 162, PatchPIECE1);
+    }
+    if (CPlayer->pieces & WPIECE2)
+    {
+        V_DrawPatch(PieceX[PlayerClass[consoleplayer]][1], 162, PatchPIECE2);
+    }
+    if (CPlayer->pieces & WPIECE3)
+    {
+        V_DrawPatch(PieceX[PlayerClass[consoleplayer]][2], 162, PatchPIECE3);
+    }
+}
+
+//==========================================================================
+//
+// DrawFullScreenStuff
+//
+//==========================================================================
+
+void DrawFullScreenStuff(void)
+{
+    int i;
+    int x;
+    int temp;
+
+    UpdateState |= I_FULLSCRN;
+    if (CPlayer->mo->health > 0)
+    {
+        DrBNumber(CPlayer->mo->health, 5, 180);
+    }
+    else
+    {
+        DrBNumber(0, 5, 180);
+    }
+    if (deathmatch)
+    {
+        temp = 0;
+        for (i = 0; i < maxplayers; i++)
+        {
+            if (playeringame[i])
+            {
+                temp += CPlayer->frags[i];
+            }
+        }
+        DrINumber(temp, 45, 185);
+    }
+    if (!inventory)
+    {
+        if (CPlayer->readyArtifact > 0)
+        {
+            V_DrawTLPatch(286, 170, W_CacheLumpName("ARTIBOX", PU_CACHE));
+            V_DrawPatch(284, 169,
+                        W_CacheLumpName(patcharti[CPlayer->readyArtifact],
+                                        PU_CACHE));
+            if (CPlayer->inventory[inv_ptr].count > 1)
+            {
+                DrSmallNumber(CPlayer->inventory[inv_ptr].count, 302, 192);
+            }
+        }
+    }
+    else
+    {
+        x = inv_ptr - curpos;
+        for (i = 0; i < 7; i++)
+        {
+            V_DrawTLPatch(50 + i * 31, 168, W_CacheLumpName("ARTIBOX",
+                                                            PU_CACHE));
+            if (CPlayer->inventorySlotNum > x + i
+                && CPlayer->inventory[x + i].type != arti_none)
+            {
+                V_DrawPatch(49 + i * 31, 167,
+                            W_CacheLumpName(patcharti
+                                            [CPlayer->inventory[x + i].type],
+                                            PU_CACHE));
+                if (CPlayer->inventory[x + i].count > 1)
+                {
+                    DrSmallNumber(CPlayer->inventory[x + i].count,
+                                  66 + i * 31, 188);
+                }
+            }
+        }
+        V_DrawPatch(50 + curpos * 31, 167, PatchSELECTBOX);
+        if (x != 0)
+        {
+            V_DrawPatch(40, 167, !(leveltime & 4) ? PatchINVLFGEM1 :
+                        PatchINVLFGEM2);
+        }
+        if (CPlayer->inventorySlotNum - x > 7)
+        {
+            V_DrawPatch(268, 167, !(leveltime & 4) ?
+                        PatchINVRTGEM1 : PatchINVRTGEM2);
+        }
+    }
+}
+
+
+//==========================================================================
+//
+// Draw_TeleportIcon
+//
+//==========================================================================
+void Draw_TeleportIcon(void)
+{
+    patch_t *patch;
+    patch = W_CacheLumpNum(W_GetNumForName("teleicon"), PU_CACHE);
+    V_DrawPatch(100, 68, patch);
+    UpdateState |= I_FULLSCRN;
+    I_FinishUpdate();
+    UpdateState |= I_FULLSCRN;
+}
+
+//==========================================================================
+//
+// Draw_SaveIcon
+//
+//==========================================================================
+void Draw_SaveIcon(void)
+{
+    patch_t *patch;
+    patch = W_CacheLumpNum(W_GetNumForName("saveicon"), PU_CACHE);
+    V_DrawPatch(100, 68, patch);
+    UpdateState |= I_FULLSCRN;
+    I_FinishUpdate();
+    UpdateState |= I_FULLSCRN;
+}
+
+//==========================================================================
+//
+// Draw_LoadIcon
+//
+//==========================================================================
+void Draw_LoadIcon(void)
+{
+    patch_t *patch;
+    patch = W_CacheLumpNum(W_GetNumForName("loadicon"), PU_CACHE);
+    V_DrawPatch(100, 68, patch);
+    UpdateState |= I_FULLSCRN;
+    I_FinishUpdate();
+    UpdateState |= I_FULLSCRN;
+}
+
+
+
+//==========================================================================
+//
+// SB_Responder
+//
+//==========================================================================
+
+boolean SB_Responder(event_t * event)
+{
+    if (event->type == ev_keydown)
+    {
+        if (HandleCheats(event->data1))
+        {                       // Need to eat the key
+            return (true);
+        }
+    }
+    return (false);
+}
+
+//==========================================================================
+//
+// HandleCheats
+//
+// Returns true if the caller should eat the key.
+//
+//==========================================================================
+
+static boolean HandleCheats(byte key)
+{
+    int i;
+    boolean eat;
+
+    if (gameskill == sk_nightmare)
+    {                           // Can't cheat in nightmare mode
+        return (false);
+    }
+    else if (netgame)
+    {                           // change CD track is the only cheat available in deathmatch
+        eat = false;
+        if (cdmusic)
+        {
+            if (CheatAddKey(&Cheats[0], key, &eat))
+            {
+                Cheats[0].func(&players[consoleplayer], &Cheats[0]);
+                S_StartSound(NULL, SFX_PLATFORM_STOP);
+            }
+            if (CheatAddKey(&Cheats[1], key, &eat))
+            {
+                Cheats[1].func(&players[consoleplayer], &Cheats[1]);
+                S_StartSound(NULL, SFX_PLATFORM_STOP);
+            }
+        }
+        return eat;
+    }
+    if (players[consoleplayer].health <= 0)
+    {                           // Dead players can't cheat
+        return (false);
+    }
+    eat = false;
+    for (i = 0; i<arrlen(Cheats); ++i)
+    {
+        if (CheatAddKey(&Cheats[i], key, &eat))
+        {
+            Cheats[i].func(&players[consoleplayer], &Cheats[i]);
+            S_StartSound(NULL, SFX_PLATFORM_STOP);
+        }
+    }
+    return (eat);
+}
+
+//==========================================================================
+//
+// CheatAddkey
+//
+// Returns true if the added key completed the cheat, false otherwise.
+//
+//==========================================================================
+
+static boolean CheatAddKey(Cheat_t * cheat, byte key, boolean * eat)
+{
+/*
+    if (!cheat->pos)
+    {
+        cheat->pos = cheat->sequence;
+        cheat->currentArg = 0;
+    }
+    if (*cheat->pos == 0)
+    {
+        *eat = true;
+        cheat->args[cheat->currentArg++] = key;
+        cheat->pos++;
+    }
+    else if (CheatLookup[key] == *cheat->pos)
+    {
+        cheat->pos++;
+    }
+    else
+    {
+        cheat->pos = cheat->sequence;
+        cheat->currentArg = 0;
+    }
+    if (*cheat->pos == 0xff)
+    {
+        cheat->pos = cheat->sequence;
+        cheat->currentArg = 0;
+        return (true);
+    }
+    return (false);
+    */
+
+    *eat = cht_CheckCheat(cheat->seq, key);
+
+    return *eat;
+}
+
+//==========================================================================
+//
+// CHEAT FUNCTIONS
+//
+//==========================================================================
+
+static void CheatGodFunc(player_t * player, Cheat_t * cheat)
+{
+    player->cheats ^= CF_GODMODE;
+    if (player->cheats & CF_GODMODE)
+    {
+        P_SetMessage(player, TXT_CHEATGODON, true);
+    }
+    else
+    {
+        P_SetMessage(player, TXT_CHEATGODOFF, true);
+    }
+    SB_state = -1;
+}
+
+static void CheatNoClipFunc(player_t * player, Cheat_t * cheat)
+{
+    player->cheats ^= CF_NOCLIP;
+    if (player->cheats & CF_NOCLIP)
+    {
+        P_SetMessage(player, TXT_CHEATNOCLIPON, true);
+    }
+    else
+    {
+        P_SetMessage(player, TXT_CHEATNOCLIPOFF, true);
+    }
+}
+
+static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat)
+{
+    int i;
+
+    for (i = 0; i < NUMARMOR; i++)
+    {
+        player->armorpoints[i] = ArmorIncrement[player->class][i];
+    }
+    for (i = 0; i < NUMWEAPONS; i++)
+    {
+        player->weaponowned[i] = true;
+    }
+    for (i = 0; i < NUMMANA; i++)
+    {
+        player->mana[i] = MAX_MANA;
+    }
+    P_SetMessage(player, TXT_CHEATWEAPONS, true);
+}
+
+static void CheatHealthFunc(player_t * player, Cheat_t * cheat)
+{
+    if (player->morphTics)
+    {
+        player->health = player->mo->health = MAXMORPHHEALTH;
+    }
+    else
+    {
+        player->health = player->mo->health = MAXHEALTH;
+    }
+    P_SetMessage(player, TXT_CHEATHEALTH, true);
+}
+
+static void CheatKeysFunc(player_t * player, Cheat_t * cheat)
+{
+    player->keys = 2047;
+    P_SetMessage(player, TXT_CHEATKEYS, true);
+}
+
+static void CheatSoundFunc(player_t * player, Cheat_t * cheat)
+{
+    DebugSound = !DebugSound;
+    if (DebugSound)
+    {
+        P_SetMessage(player, TXT_CHEATSOUNDON, true);
+    }
+    else
+    {
+        P_SetMessage(player, TXT_CHEATSOUNDOFF, true);
+    }
+}
+
+static void CheatTickerFunc(player_t * player, Cheat_t * cheat)
+{
+    DisplayTicker = !DisplayTicker;
+    if (DisplayTicker)
+    {
+        P_SetMessage(player, TXT_CHEATTICKERON, true);
+    }
+    else
+    {
+        P_SetMessage(player, TXT_CHEATTICKEROFF, true);
+    }
+
+    I_DisplayFPSDots(DisplayTicker);
+}
+
+static void CheatArtifactAllFunc(player_t * player, Cheat_t * cheat)
+{
+    int i;
+    int j;
+
+    for (i = arti_none + 1; i < arti_firstpuzzitem; i++)
+    {
+        for (j = 0; j < 25; j++)
+        {
+            P_GiveArtifact(player, i, NULL);
+        }
+    }
+    P_SetMessage(player, TXT_CHEATARTIFACTS3, true);
+}
+
+static void CheatPuzzleFunc(player_t * player, Cheat_t * cheat)
+{
+    int i;
+
+    for (i = arti_firstpuzzitem; i < NUMARTIFACTS; i++)
+    {
+        P_GiveArtifact(player, i, NULL);
+    }
+    P_SetMessage(player, TXT_CHEATARTIFACTS3, true);
+}
+
+static void CheatInitFunc(player_t * player, Cheat_t * cheat)
+{
+    G_DeferedInitNew(gameskill, gameepisode, gamemap);
+    P_SetMessage(player, TXT_CHEATWARP, true);
+}
+
+static void CheatWarpFunc(player_t * player, Cheat_t * cheat)
+{
+    int tens;
+    int ones;
+    int map;
+    char mapName[9];
+    char args[2];
+
+    cht_GetParam(cheat->seq, args);
+
+    tens = args[0] - '0';
+    ones = args[1] - '0';
+    if (tens < 0 || tens > 9 || ones < 0 || ones > 9)
+    {                           // Bad map
+        P_SetMessage(player, TXT_CHEATBADINPUT, true);
+        return;
+    }
+    map = P_TranslateMap((args[0] - '0') * 10 + args[1] - '0');
+    if (map == -1)
+    {                           // Not found
+        P_SetMessage(player, TXT_CHEATNOMAP, true);
+        return;
+    }
+    if (map == gamemap)
+    {                           // Don't try to teleport to current map
+        P_SetMessage(player, TXT_CHEATBADINPUT, true);
+        return;
+    }
+    M_snprintf(mapName, sizeof(mapName), "MAP%02d", map);
+    if (W_CheckNumForName(mapName) == -1)
+    {                       // Can't find
+        P_SetMessage(player, TXT_CHEATNOMAP, true);
+        return;
+    }
+    P_SetMessage(player, TXT_CHEATWARP, true);
+    G_TeleportNewMap(map, 0);
+}
+
+static void CheatPigFunc(player_t * player, Cheat_t * cheat)
+{
+    if (player->morphTics)
+    {
+        P_UndoPlayerMorph(player);
+    }
+    else
+    {
+        P_MorphPlayer(player);
+    }
+    P_SetMessage(player, "SQUEAL!!", true);
+}
+
+static void CheatMassacreFunc(player_t * player, Cheat_t * cheat)
+{
+    int count;
+    char buffer[80];
+
+    count = P_Massacre();
+    M_snprintf(buffer, sizeof(buffer), "%d MONSTERS KILLED\n", count);
+    P_SetMessage(player, buffer, true);
+}
+
+static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat)
+{
+    int i;
+    if (player->morphTics)
+    {
+        return;
+    }
+    for (i = 1; i < NUMWEAPONS; i++)
+    {
+        player->weaponowned[i] = false;
+    }
+
+    // In the original code, NUMWEAPONS was 8. So the writes to weaponowned
+    // overflowed the array. We must set the following fields to zero as
+    // well:
+
+    player->mana[0] = 0;
+    player->mana[1] = 0;
+    player->attackdown = 0;
+    player->usedown = 0;
+
+    player->pendingweapon = WP_FIRST;
+    P_SetMessage(player, TXT_CHEATIDKFA, true);
+}
+
+static void CheatQuickenFunc1(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, "TRYING TO CHEAT?  THAT'S ONE....", true);
+}
+
+static void CheatQuickenFunc2(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, "THAT'S TWO....", true);
+}
+
+static void CheatQuickenFunc3(player_t * player, Cheat_t * cheat)
+{
+    P_DamageMobj(player->mo, NULL, player->mo, 10000);
+    P_SetMessage(player, "THAT'S THREE!  TIME TO DIE.", true);
+}
+
+static void CheatClassFunc1(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, "ENTER NEW PLAYER CLASS (0 - 2)", true);
+}
+
+static void CheatClassFunc2(player_t * player, Cheat_t * cheat)
+{
+    int i;
+    int class;
+    char args[2];
+
+    cht_GetParam(cheat->seq, args);
+
+    if (player->morphTics)
+    {                           // don't change class if the player is morphed
+        return;
+    }
+    class = args[0] - '0';
+    if (class > 2 || class < 0)
+    {
+        P_SetMessage(player, "INVALID PLAYER CLASS", true);
+        return;
+    }
+    player->class = class;
+    for (i = 0; i < NUMARMOR; i++)
+    {
+        player->armorpoints[i] = 0;
+    }
+    PlayerClass[consoleplayer] = class;
+    P_PostMorphWeapon(player, WP_FIRST);
+    SB_SetClassData();
+    SB_state = -1;
+    UpdateState |= I_FULLSCRN;
+}
+
+static void CheatVersionFunc(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, HEXEN_VERSIONTEXT, true);
+}
+
+static void CheatDebugFunc(player_t * player, Cheat_t * cheat)
+{
+    char textBuffer[50];
+    M_snprintf(textBuffer, sizeof(textBuffer),
+               "MAP %d (%d)  X:%5d  Y:%5d  Z:%5d",
+               P_GetMapWarpTrans(gamemap),
+               gamemap,
+               player->mo->x >> FRACBITS,
+               player->mo->y >> FRACBITS, player->mo->z >> FRACBITS);
+    P_SetMessage(player, textBuffer, true);
+}
+
+static void CheatScriptFunc1(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, "RUN WHICH SCRIPT(01-99)?", true);
+}
+
+static void CheatScriptFunc2(player_t * player, Cheat_t * cheat)
+{
+    P_SetMessage(player, "RUN WHICH SCRIPT(01-99)?", true);
+}
+
+static void CheatScriptFunc3(player_t * player, Cheat_t * cheat)
+{
+    int script;
+    byte script_args[3];
+    int tens, ones;
+    char textBuffer[40];
+    char args[2];
+
+    cht_GetParam(cheat->seq, args);
+
+    tens = args[0] - '0';
+    ones = args[1] - '0';
+    script = tens * 10 + ones;
+    if (script < 1)
+        return;
+    if (script > 99)
+        return;
+    script_args[0] = script_args[1] = script_args[2] = 0;
+
+    if (P_StartACS(script, 0, script_args, player->mo, NULL, 0))
+    {
+        M_snprintf(textBuffer, sizeof(textBuffer),
+                   "RUNNING SCRIPT %.2d", script);
+        P_SetMessage(player, textBuffer, true);
+    }
+}
+
+
+static void CheatRevealFunc(player_t * player, Cheat_t * cheat)
+{
+    cheating = (cheating + 1) % 3;
+}
+
+//===========================================================================
+//
+// CheatTrackFunc1
+//
+//===========================================================================
+
+static void CheatTrackFunc1(player_t * player, Cheat_t * cheat)
+{
+    char buffer[80];
+
+    if (!cdmusic)
+    {
+        return;
+    }
+
+    if (I_CDMusInit() == -1)
+    {
+        P_SetMessage(player, "ERROR INITIALIZING CD", true);
+    }
+
+    M_snprintf(buffer, sizeof(buffer), "ENTER DESIRED CD TRACK (%.2d - %.2d):\n",
+               I_CDMusFirstTrack(), I_CDMusLastTrack());
+    P_SetMessage(player, buffer, true);
+}
+
+//===========================================================================
+//
+// CheatTrackFunc2
+//
+//===========================================================================
+
+static void CheatTrackFunc2(player_t * player, Cheat_t * cheat)
+{
+    char buffer[80];
+    int track;
+    char args[2];
+
+    cht_GetParam(cheat->seq, args);
+
+    if (!cdmusic)
+    {
+        return;
+    }
+
+    track = (args[0] - '0') * 10 + (args[1] - '0');
+    if (track < I_CDMusFirstTrack() || track > I_CDMusLastTrack())
+    {
+        P_SetMessage(player, "INVALID TRACK NUMBER\n", true);
+        return;
+    }
+
+    if (track == S_GetCurrentCDTrack())
+    {
+        return;
+    }
+
+    if (!S_StartCustomCDTrack(track))
+    {
+        M_snprintf(buffer, sizeof(buffer),
+                   "ERROR WHILE TRYING TO PLAY CD TRACK: %.2d\n", track);
+        P_SetMessage(player, buffer, true);
+    }
+    else
+    {
+        // No error encountered while attempting to play the track
+        M_snprintf(buffer, sizeof(buffer), "PLAYING TRACK: %.2d\n", track);
+        P_SetMessage(player, buffer, true);
+    }
+}
diff --git a/games/NXDoom/src/hexen/sc_man.c b/games/NXDoom/src/hexen/sc_man.c
new file mode 100644
index 000000000..489bc72e0
--- /dev/null
+++ b/games/NXDoom/src/hexen/sc_man.c
@@ -0,0 +1,465 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include <string.h>
+#include <stdlib.h>
+#include "h2def.h"
+#include "i_system.h"
+#include "m_misc.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAX_STRING_SIZE 64
+#define ASCII_COMMENT (';')
+#define ASCII_QUOTE (34)
+#define LUMP_SCRIPT 1
+#define FILE_ZONE_SCRIPT 2
+
+// TYPES -------------------------------------------------------------------
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void CheckOpen(void);
+static void OpenScript(const char *name, int type);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+char *sc_String;
+int sc_Number;
+int sc_Line;
+boolean sc_End;
+boolean sc_Crossed;
+boolean sc_FileScripts = false;
+const char *sc_ScriptsDir = "";
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static char ScriptName[16];
+static char *ScriptBuffer;
+static char *ScriptPtr;
+static char *ScriptEndPtr;
+static char StringBuffer[MAX_STRING_SIZE];
+static int ScriptLumpNum;
+static boolean ScriptOpen = false;
+static int ScriptSize;
+static boolean AlreadyGot = false;
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// SC_Open
+//
+//==========================================================================
+
+void SC_Open(const char *name)
+{
+    char fileName[128];
+
+    if (sc_FileScripts == true)
+    {
+        M_snprintf(fileName, sizeof(fileName), "%s%s.txt", sc_ScriptsDir, name);
+        SC_OpenFile(fileName);
+    }
+    else
+    {
+        SC_OpenLump(name);
+    }
+}
+
+//==========================================================================
+//
+// SC_OpenLump
+//
+// Loads a script (from the WAD files) and prepares it for parsing.
+//
+//==========================================================================
+
+void SC_OpenLump(const char *name)
+{
+    OpenScript(name, LUMP_SCRIPT);
+}
+
+//==========================================================================
+//
+// SC_OpenFile
+//
+// Loads a script (from a file) and prepares it for parsing.  Uses the
+// zone memory allocator for memory allocation and de-allocation.
+//
+//==========================================================================
+
+void SC_OpenFile(const char *name)
+{
+    OpenScript(name, FILE_ZONE_SCRIPT);
+}
+
+//==========================================================================
+//
+// OpenScript
+//
+//==========================================================================
+
+static void OpenScript(const char *name, int type)
+{
+    SC_Close();
+    if (type == LUMP_SCRIPT)
+    {                           // Lump script
+        ScriptLumpNum = W_GetNumForName(name);
+        ScriptBuffer = (char *) W_CacheLumpNum(ScriptLumpNum, PU_STATIC);
+        ScriptSize = W_LumpLength(ScriptLumpNum);
+        M_StringCopy(ScriptName, name, sizeof(ScriptName));
+    }
+    else if (type == FILE_ZONE_SCRIPT)
+    {                           // File script - zone
+        ScriptLumpNum = -1;
+        ScriptSize = M_ReadFile(name, (byte **) & ScriptBuffer);
+        M_ExtractFileBase(name, ScriptName);
+    }
+    ScriptPtr = ScriptBuffer;
+    ScriptEndPtr = ScriptPtr + ScriptSize;
+    sc_Line = 1;
+    sc_End = false;
+    ScriptOpen = true;
+    sc_String = StringBuffer;
+    AlreadyGot = false;
+}
+
+//==========================================================================
+//
+// SC_Close
+//
+//==========================================================================
+
+void SC_Close(void)
+{
+    if (ScriptOpen)
+    {
+        if (ScriptLumpNum >= 0)
+        {
+            W_ReleaseLumpNum(ScriptLumpNum);
+        }
+        else
+        {
+            Z_Free(ScriptBuffer);
+        }
+        ScriptOpen = false;
+    }
+}
+
+//==========================================================================
+//
+// SC_GetString
+//
+//==========================================================================
+
+boolean SC_GetString(void)
+{
+    char *text;
+    boolean foundToken;
+
+    CheckOpen();
+    if (AlreadyGot)
+    {
+        AlreadyGot = false;
+        return true;
+    }
+    foundToken = false;
+    sc_Crossed = false;
+    if (ScriptPtr >= ScriptEndPtr)
+    {
+        sc_End = true;
+        return false;
+    }
+    while (foundToken == false)
+    {
+        while (ScriptPtr < ScriptEndPtr && *ScriptPtr <= 32)
+        {
+            if (*ScriptPtr++ == '\n')
+            {
+                sc_Line++;
+                sc_Crossed = true;
+            }
+        }
+        if (ScriptPtr >= ScriptEndPtr)
+        {
+            sc_End = true;
+            return false;
+        }
+        if (*ScriptPtr != ASCII_COMMENT)
+        {                       // Found a token
+            foundToken = true;
+        }
+        else
+        {                       // Skip comment
+            while (*ScriptPtr++ != '\n')
+            {
+                if (ScriptPtr >= ScriptEndPtr)
+                {
+                    sc_End = true;
+                    return false;
+                }
+            }
+            sc_Line++;
+            sc_Crossed = true;
+        }
+    }
+    text = sc_String;
+    if (*ScriptPtr == ASCII_QUOTE)
+    {                           // Quoted string
+        ScriptPtr++;
+        while (*ScriptPtr != ASCII_QUOTE)
+        {
+            *text++ = *ScriptPtr++;
+            if (ScriptPtr == ScriptEndPtr
+                || text == &sc_String[MAX_STRING_SIZE - 1])
+            {
+                break;
+            }
+        }
+        ScriptPtr++;
+    }
+    else
+    {                           // Normal string
+        while ((*ScriptPtr > 32) && (*ScriptPtr != ASCII_COMMENT))
+        {
+            *text++ = *ScriptPtr++;
+            if (ScriptPtr == ScriptEndPtr
+                || text == &sc_String[MAX_STRING_SIZE - 1])
+            {
+                break;
+            }
+        }
+    }
+    *text = 0;
+    return true;
+}
+
+//==========================================================================
+//
+// SC_MustGetString
+//
+//==========================================================================
+
+void SC_MustGetString(void)
+{
+    if (SC_GetString() == false)
+    {
+        SC_ScriptError("Missing string.");
+    }
+}
+
+//==========================================================================
+//
+// SC_MustGetStringName
+//
+//==========================================================================
+
+void SC_MustGetStringName(char *name)
+{
+    SC_MustGetString();
+    if (SC_Compare(name) == false)
+    {
+        SC_ScriptError(NULL);
+    }
+}
+
+//==========================================================================
+//
+// SC_GetNumber
+//
+//==========================================================================
+
+boolean SC_GetNumber(void)
+{
+    char *stopper;
+
+    CheckOpen();
+    if (SC_GetString())
+    {
+        sc_Number = strtol(sc_String, &stopper, 0);
+        if (*stopper != 0)
+        {
+            I_Error("SC_GetNumber: Bad numeric constant \"%s\".\n"
+                    "Script %s, Line %d", sc_String, ScriptName, sc_Line);
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+//==========================================================================
+//
+// SC_MustGetNumber
+//
+//==========================================================================
+
+void SC_MustGetNumber(void)
+{
+    if (SC_GetNumber() == false)
+    {
+        SC_ScriptError("Missing integer.");
+    }
+}
+
+//==========================================================================
+//
+// SC_UnGet
+//
+// Assumes there is a valid string in sc_String.
+//
+//==========================================================================
+
+void SC_UnGet(void)
+{
+    AlreadyGot = true;
+}
+
+//==========================================================================
+//
+// SC_Check
+//
+// Returns true if another token is on the current line.
+//
+//==========================================================================
+
+/*
+boolean SC_Check(void)
+{
+	char *text;
+
+	CheckOpen();
+	text = ScriptPtr;
+	if(text >= ScriptEndPtr)
+	{
+		return false;
+	}
+	while(*text <= 32)
+	{
+		if(*text == '\n')
+		{
+			return false;
+		}
+		text++;
+		if(text == ScriptEndPtr)
+		{
+			return false;
+		}
+	}
+	if(*text == ASCII_COMMENT)
+	{
+		return false;
+	}
+	return true;
+}
+*/
+
+//==========================================================================
+//
+// SC_MatchString
+//
+// Returns the index of the first match to sc_String from the passed
+// array of strings, or -1 if not found.
+//
+//==========================================================================
+
+int SC_MatchString(const char **strings)
+{
+    int i;
+
+    for (i = 0; *strings != NULL; i++)
+    {
+        if (SC_Compare(*strings++))
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+//==========================================================================
+//
+// SC_MustMatchString
+//
+//==========================================================================
+
+int SC_MustMatchString(const char **strings)
+{
+    int i;
+
+    i = SC_MatchString(strings);
+    if (i == -1)
+    {
+        SC_ScriptError(NULL);
+    }
+    return i;
+}
+
+//==========================================================================
+//
+// SC_Compare
+//
+//==========================================================================
+
+boolean SC_Compare(const char *text)
+{
+    if (strcasecmp(text, sc_String) == 0)
+    {
+        return true;
+    }
+    return false;
+}
+
+//==========================================================================
+//
+// SC_ScriptError
+//
+//==========================================================================
+
+void SC_ScriptError(const char *message)
+{
+    if (message == NULL)
+    {
+        message = "Bad syntax.";
+    }
+    I_Error("Script error, \"%s\" line %d: %s", ScriptName, sc_Line, message);
+}
+
+//==========================================================================
+//
+// CheckOpen
+//
+//==========================================================================
+
+static void CheckOpen(void)
+{
+    if (ScriptOpen == false)
+    {
+        I_Error("SC_ call before SC_Open().");
+    }
+}
diff --git a/games/NXDoom/src/hexen/sn_sonix.c b/games/NXDoom/src/hexen/sn_sonix.c
new file mode 100644
index 000000000..81c506bab
--- /dev/null
+++ b/games/NXDoom/src/hexen/sn_sonix.c
@@ -0,0 +1,535 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include <string.h>
+#include "m_random.h"
+#include "h2def.h"
+#include "i_system.h"
+#include "i_sound.h"
+#include "s_sound.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define SS_MAX_SCRIPTS	64
+#define SS_TEMPBUFFER_SIZE	1024
+#define SS_SEQUENCE_NAME_LENGTH 32
+
+#define SS_SCRIPT_NAME "SNDSEQ"
+#define SS_STRING_PLAY			"play"
+#define SS_STRING_PLAYUNTILDONE "playuntildone"
+#define SS_STRING_PLAYTIME		"playtime"
+#define SS_STRING_PLAYREPEAT	"playrepeat"
+#define SS_STRING_DELAY			"delay"
+#define SS_STRING_DELAYRAND		"delayrand"
+#define SS_STRING_VOLUME		"volume"
+#define SS_STRING_END			"end"
+#define SS_STRING_STOPSOUND		"stopsound"
+
+// TYPES -------------------------------------------------------------------
+
+typedef enum
+{
+    SS_CMD_NONE,
+    SS_CMD_PLAY,
+    SS_CMD_WAITUNTILDONE,       // used by PLAYUNTILDONE
+    SS_CMD_PLAYTIME,
+    SS_CMD_PLAYREPEAT,
+    SS_CMD_DELAY,
+    SS_CMD_DELAYRAND,
+    SS_CMD_VOLUME,
+    SS_CMD_STOPSOUND,
+    SS_CMD_END
+} sscmds_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void VerifySequencePtr(int *base, int *ptr);
+static int GetSoundOffset(char *name);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static struct
+{
+    char name[SS_SEQUENCE_NAME_LENGTH];
+    int scriptNum;
+    int stopSound;
+} SequenceTranslate[SEQ_NUMSEQ] =
+{
+    {
+    "Platform", 0, 0},
+    {
+    "Platform", 0, 0},          // a 'heavy' platform is just a platform
+    {
+    "PlatformMetal", 0, 0},
+    {
+    "Platform", 0, 0},          // same with a 'creak' platform
+    {
+    "Silence", 0, 0},
+    {
+    "Lava", 0, 0},
+    {
+    "Water", 0, 0},
+    {
+    "Ice", 0, 0},
+    {
+    "Earth", 0, 0},
+    {
+    "PlatformMetal2", 0, 0},
+    {
+    "DoorNormal", 0, 0},
+    {
+    "DoorHeavy", 0, 0},
+    {
+    "DoorMetal", 0, 0},
+    {
+    "DoorCreak", 0, 0},
+    {
+    "Silence", 0, 0},
+    {
+    "Lava", 0, 0},
+    {
+    "Water", 0, 0},
+    {
+    "Ice", 0, 0},
+    {
+    "Earth", 0, 0},
+    {
+    "DoorMetal2", 0, 0},
+    {
+    "Wind", 0, 0}
+};
+
+static int *SequenceData[SS_MAX_SCRIPTS];
+
+int ActiveSequences;
+seqnode_t *SequenceListHead;
+
+// CODE --------------------------------------------------------------------
+
+//==========================================================================
+//
+// VerifySequencePtr
+//
+//   Verifies the integrity of the temporary ptr, and ensures that the ptr
+//              isn't exceeding the size of the temporary buffer
+//==========================================================================
+
+static void VerifySequencePtr(int *base, int *ptr)
+{
+    if (ptr - base > SS_TEMPBUFFER_SIZE)
+    {
+        I_Error("VerifySequencePtr:  tempPtr >= %d\n", SS_TEMPBUFFER_SIZE);
+    }
+}
+
+//==========================================================================
+//
+// GetSoundOffset
+//
+//==========================================================================
+
+static int GetSoundOffset(char *name)
+{
+    int i;
+
+    for (i = 0; i < NUMSFX; i++)
+    {
+        if (!strcasecmp(name, S_sfx[i].tagname))
+        {
+            return i;
+        }
+    }
+    SC_ScriptError("GetSoundOffset:  Unknown sound name\n");
+    return 0;
+}
+
+//==========================================================================
+//
+// SN_InitSequenceScript
+//
+//==========================================================================
+
+void SN_InitSequenceScript(void)
+{
+    int i, j;
+    int inSequence;
+    int *tempDataStart = NULL;
+    int *tempDataPtr = NULL;
+
+    inSequence = -1;
+    ActiveSequences = 0;
+    for (i = 0; i < SS_MAX_SCRIPTS; i++)
+    {
+        SequenceData[i] = NULL;
+    }
+    SC_Open(SS_SCRIPT_NAME);
+    while (SC_GetString())
+    {
+        if (*sc_String == ':')
+        {
+            if (inSequence != -1)
+            {
+                SC_ScriptError("SN_InitSequenceScript:  Nested Script Error");
+            }
+            tempDataStart = (int *) Z_Malloc(SS_TEMPBUFFER_SIZE,
+                                             PU_STATIC, NULL);
+            memset(tempDataStart, 0, SS_TEMPBUFFER_SIZE);
+            tempDataPtr = tempDataStart;
+            for (i = 0; i < SS_MAX_SCRIPTS; i++)
+            {
+                if (SequenceData[i] == NULL)
+                {
+                    break;
+                }
+            }
+            if (i == SS_MAX_SCRIPTS)
+            {
+                I_Error("Number of SS Scripts >= SS_MAX_SCRIPTS");
+            }
+            for (j = 0; j < SEQ_NUMSEQ; j++)
+            {
+                if (!strcasecmp(SequenceTranslate[j].name, sc_String + 1))
+                {
+                    SequenceTranslate[j].scriptNum = i;
+                    inSequence = j;
+                    break;
+                }
+            }
+            continue;           // parse the next command
+        }
+        if (inSequence == -1)
+        {
+            continue;
+        }
+        if (SC_Compare(SS_STRING_PLAYUNTILDONE))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            SC_MustGetString();
+            *tempDataPtr++ = SS_CMD_PLAY;
+            *tempDataPtr++ = GetSoundOffset(sc_String);
+            *tempDataPtr++ = SS_CMD_WAITUNTILDONE;
+        }
+        else if (SC_Compare(SS_STRING_PLAY))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            SC_MustGetString();
+            *tempDataPtr++ = SS_CMD_PLAY;
+            *tempDataPtr++ = GetSoundOffset(sc_String);
+        }
+        else if (SC_Compare(SS_STRING_PLAYTIME))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            SC_MustGetString();
+            *tempDataPtr++ = SS_CMD_PLAY;
+            *tempDataPtr++ = GetSoundOffset(sc_String);
+            SC_MustGetNumber();
+            *tempDataPtr++ = SS_CMD_DELAY;
+            *tempDataPtr++ = sc_Number;
+        }
+        else if (SC_Compare(SS_STRING_PLAYREPEAT))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            SC_MustGetString();
+            *tempDataPtr++ = SS_CMD_PLAYREPEAT;
+            *tempDataPtr++ = GetSoundOffset(sc_String);
+        }
+        else if (SC_Compare(SS_STRING_DELAY))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            *tempDataPtr++ = SS_CMD_DELAY;
+            SC_MustGetNumber();
+            *tempDataPtr++ = sc_Number;
+        }
+        else if (SC_Compare(SS_STRING_DELAYRAND))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            *tempDataPtr++ = SS_CMD_DELAYRAND;
+            SC_MustGetNumber();
+            *tempDataPtr++ = sc_Number;
+            SC_MustGetNumber();
+            *tempDataPtr++ = sc_Number;
+        }
+        else if (SC_Compare(SS_STRING_VOLUME))
+        {
+            VerifySequencePtr(tempDataStart, tempDataPtr);
+            *tempDataPtr++ = SS_CMD_VOLUME;
+            SC_MustGetNumber();
+            *tempDataPtr++ = sc_Number;
+        }
+        else if (SC_Compare(SS_STRING_END))
+        {
+            int dataSize;
+
+            *tempDataPtr++ = SS_CMD_END;
+            dataSize = (tempDataPtr - tempDataStart) * sizeof(int);
+            SequenceData[i] = (int *) Z_Malloc(dataSize, PU_STATIC, NULL);
+            memcpy(SequenceData[i], tempDataStart, dataSize);
+            Z_Free(tempDataStart);
+            inSequence = -1;
+        }
+        else if (SC_Compare(SS_STRING_STOPSOUND))
+        {
+            SC_MustGetString();
+            SequenceTranslate[inSequence].stopSound =
+                GetSoundOffset(sc_String);
+            *tempDataPtr++ = SS_CMD_STOPSOUND;
+        }
+        else
+        {
+            SC_ScriptError("SN_InitSequenceScript:  Unknown commmand.\n");
+        }
+    }
+}
+
+//==========================================================================
+//
+//  SN_StartSequence
+//
+//==========================================================================
+
+void SN_StartSequence(mobj_t * mobj, int sequence)
+{
+    seqnode_t *node;
+
+    SN_StopSequence(mobj);      // Stop any previous sequence
+    node = (seqnode_t *) Z_Malloc(sizeof(seqnode_t), PU_STATIC, NULL);
+    node->sequencePtr = SequenceData[SequenceTranslate[sequence].scriptNum];
+    node->sequence = sequence;
+    node->mobj = mobj;
+    node->delayTics = 0;
+    node->stopSound = SequenceTranslate[sequence].stopSound;
+    node->volume = 127;         // Start at max volume
+
+    if (!SequenceListHead)
+    {
+        SequenceListHead = node;
+        node->next = node->prev = NULL;
+    }
+    else
+    {
+        SequenceListHead->prev = node;
+        node->next = SequenceListHead;
+        node->prev = NULL;
+        SequenceListHead = node;
+    }
+    ActiveSequences++;
+    return;
+}
+
+//==========================================================================
+//
+//  SN_StartSequenceName
+//
+//==========================================================================
+
+void SN_StartSequenceName(mobj_t * mobj, char *name)
+{
+    int i;
+
+    for (i = 0; i < SEQ_NUMSEQ; i++)
+    {
+        if (!strcmp(name, SequenceTranslate[i].name))
+        {
+            SN_StartSequence(mobj, i);
+            return;
+        }
+    }
+}
+
+//==========================================================================
+//
+//  SN_StopSequence
+//
+//==========================================================================
+
+void SN_StopSequence(mobj_t * mobj)
+{
+    seqnode_t *node;
+
+    for (node = SequenceListHead; node; node = node->next)
+    {
+        if (node->mobj == mobj)
+        {
+            S_StopSound(mobj);
+            if (node->stopSound)
+            {
+                S_StartSoundAtVolume(mobj, node->stopSound, node->volume);
+            }
+            if (SequenceListHead == node)
+            {
+                SequenceListHead = node->next;
+            }
+            if (node->prev)
+            {
+                node->prev->next = node->next;
+            }
+            if (node->next)
+            {
+                node->next->prev = node->prev;
+            }
+            Z_Free(node);
+            ActiveSequences--;
+        }
+    }
+}
+
+//==========================================================================
+//
+//  SN_UpdateActiveSequences
+//
+//==========================================================================
+
+void SN_UpdateActiveSequences(void)
+{
+    seqnode_t *node;
+    boolean sndPlaying;
+
+    if (!ActiveSequences || paused)
+    {                           // No sequences currently playing/game is paused
+        return;
+    }
+    for (node = SequenceListHead; node; node = node->next)
+    {
+        if (node->delayTics)
+        {
+            node->delayTics--;
+            continue;
+        }
+        sndPlaying = S_GetSoundPlayingInfo(node->mobj, node->currentSoundID);
+        switch (*node->sequencePtr)
+        {
+            case SS_CMD_PLAY:
+                if (!sndPlaying)
+                {
+                    node->currentSoundID = *(node->sequencePtr + 1);
+                    S_StartSoundAtVolume(node->mobj, node->currentSoundID,
+                                         node->volume);
+                }
+                node->sequencePtr += 2;
+                break;
+            case SS_CMD_WAITUNTILDONE:
+                if (!sndPlaying)
+                {
+                    node->sequencePtr++;
+                    node->currentSoundID = 0;
+                }
+                break;
+            case SS_CMD_PLAYREPEAT:
+                if (!sndPlaying)
+                {
+                    node->currentSoundID = *(node->sequencePtr + 1);
+                    S_StartSoundAtVolume(node->mobj, node->currentSoundID,
+                                         node->volume);
+                }
+                break;
+            case SS_CMD_DELAY:
+                node->delayTics = *(node->sequencePtr + 1);
+                node->sequencePtr += 2;
+                node->currentSoundID = 0;
+                break;
+            case SS_CMD_DELAYRAND:
+                node->delayTics = *(node->sequencePtr + 1) +
+                    M_Random() % (*(node->sequencePtr + 2) -
+                                  *(node->sequencePtr + 1));
+                node->sequencePtr += 2;
+                node->currentSoundID = 0;
+                break;
+            case SS_CMD_VOLUME:
+                node->volume = (127 * (*(node->sequencePtr + 1))) / 100;
+                node->sequencePtr += 2;
+                break;
+            case SS_CMD_STOPSOUND:
+                // Wait until something else stops the sequence
+                break;
+            case SS_CMD_END:
+                SN_StopSequence(node->mobj);
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+//==========================================================================
+//
+//  SN_StopAllSequences
+//
+//==========================================================================
+
+void SN_StopAllSequences(void)
+{
+    seqnode_t *node;
+
+    for (node = SequenceListHead; node; node = node->next)
+    {
+        node->stopSound = 0;    // don't play any stop sounds
+        SN_StopSequence(node->mobj);
+    }
+}
+
+//==========================================================================
+//
+//  SN_GetSequenceOffset
+//
+//==========================================================================
+
+int SN_GetSequenceOffset(int sequence, int *sequencePtr)
+{
+    return (sequencePtr -
+            SequenceData[SequenceTranslate[sequence].scriptNum]);
+}
+
+//==========================================================================
+//
+//  SN_ChangeNodeData
+//
+//      nodeNum zero is the first node
+//==========================================================================
+
+void SN_ChangeNodeData(int nodeNum, int seqOffset, int delayTics, int volume,
+                       int currentSoundID)
+{
+    int i;
+    seqnode_t *node;
+
+    i = 0;
+    node = SequenceListHead;
+    while (node && i < nodeNum)
+    {
+        node = node->next;
+        i++;
+    }
+    if (!node)
+    {                           // reach the end of the list before finding the nodeNum-th node
+        return;
+    }
+    node->delayTics = delayTics;
+    node->volume = volume;
+    node->sequencePtr += seqOffset;
+    node->currentSoundID = currentSoundID;
+}
diff --git a/games/NXDoom/src/hexen/sounds.c b/games/NXDoom/src/hexen/sounds.c
new file mode 100644
index 000000000..fe322baa4
--- /dev/null
+++ b/games/NXDoom/src/hexen/sounds.c
@@ -0,0 +1,313 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#include "h2def.h"
+#include "sounds.h"
+
+// Music info
+
+/*
+musicinfo_t S_music[] =
+{
+	{ "MUS_E1M1", 0 }, // 1-1
+	{ "MUS_E1M2", 0 },
+	{ "MUS_E1M3", 0 },
+	{ "MUS_E1M4", 0 },
+	{ "MUS_E1M5", 0 },
+	{ "MUS_E1M6", 0 },
+	{ "MUS_E1M7", 0 },
+	{ "MUS_E1M8", 0 },
+	{ "MUS_E1M9", 0 },
+	{ "MUS_E2M1", 0 }, // 2-1
+	{ "MUS_E2M2", 0 },
+	{ "MUS_E2M3", 0 },
+	{ "MUS_E2M4", 0 },
+	{ "MUS_E1M4", 0 },
+	{ "MUS_E2M6", 0 },
+	{ "MUS_E2M7", 0 },
+	{ "MUS_E2M8", 0 },
+	{ "MUS_E2M9", 0 },
+	{ "MUS_E1M1", 0 }, // 3-1
+	{ "MUS_E3M2", 0 },
+	{ "MUS_E3M3", 0 },
+	{ "MUS_E1M6", 0 },
+	{ "MUS_E1M3", 0 },
+	{ "MUS_E1M2", 0 },
+	{ "MUS_E1M5", 0 },
+	{ "MUS_E1M9", 0 },
+	{ "MUS_E2M6", 0 },
+	{ "MUS_E1M6", 0 }, // 4-1
+	{ "MUS_TITL", 0 },
+	{ "MUS_INTR", 0 },
+	{ "MUS_CPTD", 0 }
+};
+*/
+
+// Sound info
+
+#define SOUND(name, priority, numchannels, pitchshift) \
+    { name, "", priority, NULL, pitchshift, 0, -1, 0, numchannels, NULL }
+
+sfxinfo_t S_sfx[] = {
+    // tagname, lumpname, priority, usefulness, snd_ptr, lumpnum, numchannels,
+    //              pitchshift
+    SOUND("", 0, 0, 0),
+    SOUND("PlayerFighterNormalDeath", 256, 2, 1),
+    SOUND("PlayerFighterCrazyDeath", 256, 2, 1),
+    SOUND("PlayerFighterExtreme1Death", 256, 2, 1),
+    SOUND("PlayerFighterExtreme2Death", 256, 2, 1),
+    SOUND("PlayerFighterExtreme3Death", 256, 2, 1),
+    SOUND("PlayerFighterBurnDeath", 256, 2, 1),
+    SOUND("PlayerClericNormalDeath", 256, 2, 1),
+    SOUND("PlayerClericCrazyDeath", 256, 2, 1),
+    SOUND("PlayerClericExtreme1Death", 256, 2, 1),
+    SOUND("PlayerClericExtreme2Death", 256, 2, 1),
+    SOUND("PlayerClericExtreme3Death", 256, 2, 1),
+    SOUND("PlayerClericBurnDeath", 256, 2, 1),
+    SOUND("PlayerMageNormalDeath", 256, 2, 0),
+    SOUND("PlayerMageCrazyDeath", 256, 2, 0),
+    SOUND("PlayerMageExtreme1Death", 256, 2, 0),
+    SOUND("PlayerMageExtreme2Death", 256, 2, 0),
+    SOUND("PlayerMageExtreme3Death", 256, 2, 0),
+    SOUND("PlayerMageBurnDeath", 256, 2, 0),
+    SOUND("PlayerFighterPain", 256, 2, 1),
+    SOUND("PlayerClericPain", 256, 2, 1),
+    SOUND("PlayerMagePain", 256, 2, 0),
+    SOUND("PlayerFighterGrunt", 256, 2, 1),
+    SOUND("PlayerClericGrunt", 256, 2, 1),
+    SOUND("PlayerMageGrunt", 256, 2, 0),
+    SOUND("PlayerLand", 32, 2, 1),
+    SOUND("PlayerPoisonCough", 256, 2, 1),
+    SOUND("PlayerFighterFallingScream", 256, 2, 1),
+    SOUND("PlayerClericFallingScream", 256, 2, 1),
+    SOUND("PlayerMageFallingScream", 256, 2, 0),
+    SOUND("PlayerFallingSplat", 256, 2, 1),
+    SOUND("PlayerFighterFailedUse", 256, 1, 1),
+    SOUND("PlayerClericFailedUse", 256, 1, 1),
+    SOUND("PlayerMageFailedUse", 256, 1, 0),
+    SOUND("PlatformStart", 36, 2, 1),
+    SOUND("PlatformStartMetal", 36, 2, 1),
+    SOUND("PlatformStop", 40, 2, 1),
+    SOUND("StoneMove", 32, 2, 1),
+    SOUND("MetalMove", 32, 2, 1),
+    SOUND("DoorOpen", 36, 2, 1),
+    SOUND("DoorLocked", 36, 2, 1),
+    SOUND("DoorOpenMetal", 36, 2, 1),
+    SOUND("DoorCloseMetal", 36, 2, 1),
+    SOUND("DoorCloseLight", 36, 2, 1),
+    SOUND("DoorCloseHeavy", 36, 2, 1),
+    SOUND("DoorCreak", 36, 2, 1),
+    SOUND("PickupWeapon", 36, 2, 0),
+    SOUND("PickupArtifact", 36, 2, 1),
+    SOUND("PickupKey", 36, 2, 1),
+    SOUND("PickupItem", 36, 2, 1),
+    SOUND("PickupPiece", 36, 2, 0),
+    SOUND("WeaponBuild", 36, 2, 0),
+    SOUND("UseArtifact", 36, 2, 1),
+    SOUND("BlastRadius", 36, 2, 1),
+    SOUND("Teleport", 256, 2, 1),
+    SOUND("ThunderCrash", 30, 2, 1),
+    SOUND("FighterPunchMiss", 80, 2, 1),
+    SOUND("FighterPunchHitThing", 80, 2, 1),
+    SOUND("FighterPunchHitWall", 80, 2, 1),
+    SOUND("FighterGrunt", 80, 2, 1),
+    SOUND("FighterAxeHitThing", 80, 2, 1),
+    SOUND("FighterHammerMiss", 80, 2, 1),
+    SOUND("FighterHammerHitThing", 80, 2, 1),
+    SOUND("FighterHammerHitWall", 80, 2, 1),
+    SOUND("FighterHammerContinuous", 32, 2, 1),
+    SOUND("FighterHammerExplode", 80, 2, 1),
+    SOUND("FighterSwordFire", 80, 2, 1),
+    SOUND("FighterSwordExplode", 80, 2, 1),
+    SOUND("ClericCStaffFire", 80, 2, 1),
+    SOUND("ClericCStaffExplode", 40, 2, 1),
+    SOUND("ClericCStaffHitThing", 80, 2, 1),
+    SOUND("ClericFlameFire", 80, 2, 1),
+    SOUND("ClericFlameExplode", 80, 2, 1),
+    SOUND("ClericFlameCircle", 80, 2, 1),
+    SOUND("MageWandFire", 80, 2, 1),
+    SOUND("MageLightningFire", 80, 2, 1),
+    SOUND("MageLightningZap", 32, 2, 1),
+    SOUND("MageLightningContinuous", 32, 2, 1),
+    SOUND("MageLightningReady", 30, 2, 1),
+    SOUND("MageShardsFire", 80, 2, 1),
+    SOUND("MageShardsExplode", 36, 2, 1),
+    SOUND("MageStaffFire", 80, 2, 1),
+    SOUND("MageStaffExplode", 40, 2, 1),
+    SOUND("Switch1", 32, 2, 1),
+    SOUND("Switch2", 32, 2, 1),
+    SOUND("SerpentSight", 32, 2, 1),
+    SOUND("SerpentActive", 32, 2, 1),
+    SOUND("SerpentPain", 32, 2, 1),
+    SOUND("SerpentAttack", 32, 2, 1),
+    SOUND("SerpentMeleeHit", 32, 2, 1),
+    SOUND("SerpentDeath", 40, 2, 1),
+    SOUND("SerpentBirth", 32, 2, 1),
+    SOUND("SerpentFXContinuous", 32, 2, 1),
+    SOUND("SerpentFXHit", 32, 2, 1),
+    SOUND("PotteryExplode", 32, 2, 1),
+    SOUND("Drip", 32, 2, 1),
+    SOUND("CentaurSight", 32, 2, 1),
+    SOUND("CentaurActive", 32, 2, 1),
+    SOUND("CentaurPain", 32, 2, 1),
+    SOUND("CentaurAttack", 32, 2, 1),
+    SOUND("CentaurDeath", 40, 2, 1),
+    SOUND("CentaurLeaderAttack", 32, 2, 1),
+    SOUND("CentaurMissileExplode", 32, 2, 1),
+    SOUND("Wind", 1, 2, 1),
+    SOUND("BishopSight", 32, 2, 1),
+    SOUND("BishopActive", 32, 2, 1),
+    SOUND("BishopPain", 32, 2, 1),
+    SOUND("BishopAttack", 32, 2, 1),
+    SOUND("BishopDeath", 40, 2, 1),
+    SOUND("BishopMissileExplode", 32, 2, 1),
+    SOUND("BishopBlur", 32, 2, 1),
+    SOUND("DemonSight", 32, 2, 1),
+    SOUND("DemonActive", 32, 2, 1),
+    SOUND("DemonPain", 32, 2, 1),
+    SOUND("DemonAttack", 32, 2, 1),
+    SOUND("DemonMissileFire", 32, 2, 1),
+    SOUND("DemonMissileExplode", 32, 2, 1),
+    SOUND("DemonDeath", 40, 2, 1),
+    SOUND("WraithSight", 32, 2, 1),
+    SOUND("WraithActive", 32, 2, 1),
+    SOUND("WraithPain", 32, 2, 1),
+    SOUND("WraithAttack", 32, 2, 1),
+    SOUND("WraithMissileFire", 32, 2, 1),
+    SOUND("WraithMissileExplode", 32, 2, 1),
+    SOUND("WraithDeath", 40, 2, 1),
+    SOUND("PigActive1", 32, 2, 1),
+    SOUND("PigActive2", 32, 2, 1),
+    SOUND("PigPain", 32, 2, 1),
+    SOUND("PigAttack", 32, 2, 1),
+    SOUND("PigDeath", 40, 2, 1),
+    SOUND("MaulatorSight", 32, 2, 1),
+    SOUND("MaulatorActive", 32, 2, 1),
+    SOUND("MaulatorPain", 32, 2, 1),
+    SOUND("MaulatorHamSwing", 32, 2, 1),
+    SOUND("MaulatorHamHit", 32, 2, 1),
+    SOUND("MaulatorMissileHit", 32, 2, 1),
+    SOUND("MaulatorDeath", 40, 2, 1),
+    SOUND("FreezeDeath", 40, 2, 1),
+    SOUND("FreezeShatter", 40, 2, 1),
+    SOUND("EttinSight", 32, 2, 1),
+    SOUND("EttinActive", 32, 2, 1),
+    SOUND("EttinPain", 32, 2, 1),
+    SOUND("EttinAttack", 32, 2, 1),
+    SOUND("EttinDeath", 40, 2, 1),
+    SOUND("FireDemonSpawn", 32, 2, 1),
+    SOUND("FireDemonActive", 32, 2, 1),
+    SOUND("FireDemonPain", 32, 2, 1),
+    SOUND("FireDemonAttack", 32, 2, 1),
+    SOUND("FireDemonMissileHit", 32, 2, 1),
+    SOUND("FireDemonDeath", 40, 2, 1),
+    SOUND("IceGuySight", 32, 2, 1),
+    SOUND("IceGuyActive", 32, 2, 1),
+    SOUND("IceGuyAttack", 32, 2, 1),
+    SOUND("IceGuyMissileExplode", 32, 2, 1),
+    SOUND("SorcererSight", 256, 2, 1),
+    SOUND("SorcererActive", 256, 2, 1),
+    SOUND("SorcererPain", 256, 2, 1),
+    SOUND("SorcererSpellCast", 256, 2, 1),
+    SOUND("SorcererBallWoosh", 256, 4, 1),
+    SOUND("SorcererDeathScream", 256, 2, 1),
+    SOUND("SorcererBishopSpawn", 80, 2, 1),
+    SOUND("SorcererBallPop", 80, 2, 1),
+    SOUND("SorcererBallBounce", 80, 3, 1),
+    SOUND("SorcererBallExplode", 80, 3, 1),
+    SOUND("SorcererBigBallExplode", 80, 3, 1),
+    SOUND("SorcererHeadScream", 256, 2, 1),
+    SOUND("DragonSight", 64, 2, 1),
+    SOUND("DragonActive", 64, 2, 1),
+    SOUND("DragonWingflap", 64, 2, 1),
+    SOUND("DragonAttack", 64, 2, 1),
+    SOUND("DragonPain", 64, 2, 1),
+    SOUND("DragonDeath", 64, 2, 1),
+    SOUND("DragonFireballExplode", 32, 2, 1),
+    SOUND("KoraxSight", 256, 2, 1),
+    SOUND("KoraxActive", 256, 2, 1),
+    SOUND("KoraxPain", 256, 2, 1),
+    SOUND("KoraxAttack", 256, 2, 1),
+    SOUND("KoraxCommand", 256, 2, 1),
+    SOUND("KoraxDeath", 256, 2, 1),
+    SOUND("KoraxStep", 128, 2, 1),
+    SOUND("ThrustSpikeRaise", 32, 2, 1),
+    SOUND("ThrustSpikeLower", 32, 2, 1),
+    SOUND("GlassShatter", 32, 2, 1),
+    SOUND("FlechetteBounce", 32, 2, 1),
+    SOUND("FlechetteExplode", 32, 2, 1),
+    SOUND("LavaMove", 36, 2, 1),
+    SOUND("WaterMove", 36, 2, 1),
+    SOUND("IceStartMove", 36, 2, 1),
+    SOUND("EarthStartMove", 36, 2, 1),
+    SOUND("WaterSplash", 32, 2, 1),
+    SOUND("LavaSizzle", 32, 2, 1),
+    SOUND("SludgeGloop", 32, 2, 1),
+    SOUND("HolySymbolFire", 64, 2, 1),
+    SOUND("SpiritActive", 32, 2, 1),
+    SOUND("SpiritAttack", 32, 2, 1),
+    SOUND("SpiritDie", 32, 2, 1),
+    SOUND("ValveTurn", 36, 2, 1),
+    SOUND("RopePull", 36, 2, 1),
+    SOUND("FlyBuzz", 20, 2, 1),
+    SOUND("Ignite", 32, 2, 1),
+    SOUND("PuzzleSuccess", 256, 2, 1),
+    SOUND("PuzzleFailFighter", 256, 2, 1),
+    SOUND("PuzzleFailCleric", 256, 2, 1),
+    SOUND("PuzzleFailMage", 256, 2, 1),
+    SOUND("Earthquake", 32, 2, 1),
+    SOUND("BellRing", 32, 2, 0),
+    SOUND("TreeBreak", 32, 2, 1),
+    SOUND("TreeExplode", 32, 2, 1),
+    SOUND("SuitofArmorBreak", 32, 2, 1),
+    SOUND("PoisonShroomPain", 20, 2, 1),
+    SOUND("PoisonShroomDeath", 32, 2, 1),
+    SOUND("Ambient1", 1, 1, 1),
+    SOUND("Ambient2", 1, 1, 1),
+    SOUND("Ambient3", 1, 1, 1),
+    SOUND("Ambient4", 1, 1, 1),
+    SOUND("Ambient5", 1, 1, 1),
+    SOUND("Ambient6", 1, 1, 1),
+    SOUND("Ambient7", 1, 1, 1),
+    SOUND("Ambient8", 1, 1, 1),
+    SOUND("Ambient9", 1, 1, 1),
+    SOUND("Ambient10", 1, 1, 1),
+    SOUND("Ambient11", 1, 1, 1),
+    SOUND("Ambient12", 1, 1, 1),
+    SOUND("Ambient13", 1, 1, 1),
+    SOUND("Ambient14", 1, 1, 1),
+    SOUND("Ambient15", 1, 1, 1),
+    SOUND("StartupTick", 32, 2, 1),
+    SOUND("SwitchOtherLevel", 32, 2, 1),
+    SOUND("Respawn", 32, 2, 1),
+    SOUND("KoraxVoiceGreetings", 512, 2, 1),
+    SOUND("KoraxVoiceReady", 512, 2, 1),
+    SOUND("KoraxVoiceBlood", 512, 2, 1),
+    SOUND("KoraxVoiceGame", 512, 2, 1),
+    SOUND("KoraxVoiceBoard", 512, 2, 1),
+    SOUND("KoraxVoiceWorship", 512, 2, 1),
+    SOUND("KoraxVoiceMaybe", 512, 2, 1),
+    SOUND("KoraxVoiceStrong", 512, 2, 1),
+    SOUND("KoraxVoiceFace", 512, 2, 1),
+    SOUND("BatScream", 32, 2, 1),
+    SOUND("Chat", 512, 2, 1),
+    SOUND("MenuMove", 32, 2, 1),
+    SOUND("ClockTick", 32, 2, 1),
+    SOUND("Fireball", 32, 2, 1),
+    SOUND("PuppyBeat", 30, 2, 1),
+    SOUND("MysticIncant", 32, 4, 1),
+};
diff --git a/games/NXDoom/src/hexen/sounds.h b/games/NXDoom/src/hexen/sounds.h
new file mode 100644
index 000000000..1fe2345f2
--- /dev/null
+++ b/games/NXDoom/src/hexen/sounds.h
@@ -0,0 +1,321 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __SOUNDSH__
+#define __SOUNDSH__
+
+#include "i_sound.h"
+
+#define MAX_SND_DIST    2025
+#define MAX_CHANNELS    16
+
+// Music identifiers
+
+typedef enum
+{
+    mus_e1m1,
+    mus_e1m2,
+    mus_e1m3,
+    mus_e1m4,
+    mus_e1m5,
+    mus_e1m6,
+    mus_e1m7,
+    mus_e1m8,
+    mus_e1m9,
+    mus_e2m1,
+    mus_e2m2,
+    mus_e2m3,
+    mus_e2m4,
+    mus_e2m5,
+    mus_e2m6,
+    mus_e2m7,
+    mus_e2m8,
+    mus_e2m9,
+    mus_e3m1,
+    mus_e3m2,
+    mus_e3m3,
+    mus_e3m4,
+    mus_e3m5,
+    mus_e3m6,
+    mus_e3m7,
+    mus_e3m8,
+    mus_e3m9,
+    mus_e4m1,
+    mus_titl,
+    mus_intr,
+    mus_cptd,
+    NUMMUSIC
+} musicenum_t;
+
+// Sound identifiers
+
+typedef enum
+{
+    SFX_NONE,
+    SFX_PLAYER_FIGHTER_NORMAL_DEATH,    // class specific death screams
+    SFX_PLAYER_FIGHTER_CRAZY_DEATH,
+    SFX_PLAYER_FIGHTER_EXTREME1_DEATH,
+    SFX_PLAYER_FIGHTER_EXTREME2_DEATH,
+    SFX_PLAYER_FIGHTER_EXTREME3_DEATH,
+    SFX_PLAYER_FIGHTER_BURN_DEATH,
+    SFX_PLAYER_CLERIC_NORMAL_DEATH,
+    SFX_PLAYER_CLERIC_CRAZY_DEATH,
+    SFX_PLAYER_CLERIC_EXTREME1_DEATH,
+    SFX_PLAYER_CLERIC_EXTREME2_DEATH,
+    SFX_PLAYER_CLERIC_EXTREME3_DEATH,
+    SFX_PLAYER_CLERIC_BURN_DEATH,
+    SFX_PLAYER_MAGE_NORMAL_DEATH,
+    SFX_PLAYER_MAGE_CRAZY_DEATH,
+    SFX_PLAYER_MAGE_EXTREME1_DEATH,
+    SFX_PLAYER_MAGE_EXTREME2_DEATH,
+    SFX_PLAYER_MAGE_EXTREME3_DEATH,
+    SFX_PLAYER_MAGE_BURN_DEATH,
+    SFX_PLAYER_FIGHTER_PAIN,
+    SFX_PLAYER_CLERIC_PAIN,
+    SFX_PLAYER_MAGE_PAIN,
+    SFX_PLAYER_FIGHTER_GRUNT,
+    SFX_PLAYER_CLERIC_GRUNT,
+    SFX_PLAYER_MAGE_GRUNT,
+    SFX_PLAYER_LAND,
+    SFX_PLAYER_POISONCOUGH,
+    SFX_PLAYER_FIGHTER_FALLING_SCREAM,  // class specific falling screams
+    SFX_PLAYER_CLERIC_FALLING_SCREAM,
+    SFX_PLAYER_MAGE_FALLING_SCREAM,
+    SFX_PLAYER_FALLING_SPLAT,
+    SFX_PLAYER_FIGHTER_FAILED_USE,
+    SFX_PLAYER_CLERIC_FAILED_USE,
+    SFX_PLAYER_MAGE_FAILED_USE,
+    SFX_PLATFORM_START,
+    SFX_PLATFORM_STARTMETAL,
+    SFX_PLATFORM_STOP,
+    SFX_STONE_MOVE,
+    SFX_METAL_MOVE,
+    SFX_DOOR_OPEN,
+    SFX_DOOR_LOCKED,
+    SFX_DOOR_METAL_OPEN,
+    SFX_DOOR_METAL_CLOSE,
+    SFX_DOOR_LIGHT_CLOSE,
+    SFX_DOOR_HEAVY_CLOSE,
+    SFX_DOOR_CREAK,
+    SFX_PICKUP_WEAPON,
+    SFX_PICKUP_ARTIFACT,
+    SFX_PICKUP_KEY,
+    SFX_PICKUP_ITEM,
+    SFX_PICKUP_PIECE,
+    SFX_WEAPON_BUILD,
+    SFX_ARTIFACT_USE,
+    SFX_ARTIFACT_BLAST,
+    SFX_TELEPORT,
+    SFX_THUNDER_CRASH,
+    SFX_FIGHTER_PUNCH_MISS,
+    SFX_FIGHTER_PUNCH_HITTHING,
+    SFX_FIGHTER_PUNCH_HITWALL,
+    SFX_FIGHTER_GRUNT,
+    SFX_FIGHTER_AXE_HITTHING,
+    SFX_FIGHTER_HAMMER_MISS,
+    SFX_FIGHTER_HAMMER_HITTHING,
+    SFX_FIGHTER_HAMMER_HITWALL,
+    SFX_FIGHTER_HAMMER_CONTINUOUS,
+    SFX_FIGHTER_HAMMER_EXPLODE,
+    SFX_FIGHTER_SWORD_FIRE,
+    SFX_FIGHTER_SWORD_EXPLODE,
+    SFX_CLERIC_CSTAFF_FIRE,
+    SFX_CLERIC_CSTAFF_EXPLODE,
+    SFX_CLERIC_CSTAFF_HITTHING,
+    SFX_CLERIC_FLAME_FIRE,
+    SFX_CLERIC_FLAME_EXPLODE,
+    SFX_CLERIC_FLAME_CIRCLE,
+    SFX_MAGE_WAND_FIRE,
+    SFX_MAGE_LIGHTNING_FIRE,
+    SFX_MAGE_LIGHTNING_ZAP,
+    SFX_MAGE_LIGHTNING_CONTINUOUS,
+    SFX_MAGE_LIGHTNING_READY,
+    SFX_MAGE_SHARDS_FIRE,
+    SFX_MAGE_SHARDS_EXPLODE,
+    SFX_MAGE_STAFF_FIRE,
+    SFX_MAGE_STAFF_EXPLODE,
+    SFX_SWITCH1,
+    SFX_SWITCH2,
+    SFX_SERPENT_SIGHT,
+    SFX_SERPENT_ACTIVE,
+    SFX_SERPENT_PAIN,
+    SFX_SERPENT_ATTACK,
+    SFX_SERPENT_MELEEHIT,
+    SFX_SERPENT_DEATH,
+    SFX_SERPENT_BIRTH,
+    SFX_SERPENTFX_CONTINUOUS,
+    SFX_SERPENTFX_HIT,
+    SFX_POTTERY_EXPLODE,
+    SFX_DRIP,
+    SFX_CENTAUR_SIGHT,
+    SFX_CENTAUR_ACTIVE,
+    SFX_CENTAUR_PAIN,
+    SFX_CENTAUR_ATTACK,
+    SFX_CENTAUR_DEATH,
+    SFX_CENTAURLEADER_ATTACK,
+    SFX_CENTAUR_MISSILE_EXPLODE,
+    SFX_WIND,
+    SFX_BISHOP_SIGHT,
+    SFX_BISHOP_ACTIVE,
+    SFX_BISHOP_PAIN,
+    SFX_BISHOP_ATTACK,
+    SFX_BISHOP_DEATH,
+    SFX_BISHOP_MISSILE_EXPLODE,
+    SFX_BISHOP_BLUR,
+    SFX_DEMON_SIGHT,
+    SFX_DEMON_ACTIVE,
+    SFX_DEMON_PAIN,
+    SFX_DEMON_ATTACK,
+    SFX_DEMON_MISSILE_FIRE,
+    SFX_DEMON_MISSILE_EXPLODE,
+    SFX_DEMON_DEATH,
+    SFX_WRAITH_SIGHT,
+    SFX_WRAITH_ACTIVE,
+    SFX_WRAITH_PAIN,
+    SFX_WRAITH_ATTACK,
+    SFX_WRAITH_MISSILE_FIRE,
+    SFX_WRAITH_MISSILE_EXPLODE,
+    SFX_WRAITH_DEATH,
+    SFX_PIG_ACTIVE1,
+    SFX_PIG_ACTIVE2,
+    SFX_PIG_PAIN,
+    SFX_PIG_ATTACK,
+    SFX_PIG_DEATH,
+    SFX_MAULATOR_SIGHT,
+    SFX_MAULATOR_ACTIVE,
+    SFX_MAULATOR_PAIN,
+    SFX_MAULATOR_HAMMER_SWING,
+    SFX_MAULATOR_HAMMER_HIT,
+    SFX_MAULATOR_MISSILE_HIT,
+    SFX_MAULATOR_DEATH,
+    SFX_FREEZE_DEATH,
+    SFX_FREEZE_SHATTER,
+    SFX_ETTIN_SIGHT,
+    SFX_ETTIN_ACTIVE,
+    SFX_ETTIN_PAIN,
+    SFX_ETTIN_ATTACK,
+    SFX_ETTIN_DEATH,
+    SFX_FIRED_SPAWN,
+    SFX_FIRED_ACTIVE,
+    SFX_FIRED_PAIN,
+    SFX_FIRED_ATTACK,
+    SFX_FIRED_MISSILE_HIT,
+    SFX_FIRED_DEATH,
+    SFX_ICEGUY_SIGHT,
+    SFX_ICEGUY_ACTIVE,
+    SFX_ICEGUY_ATTACK,
+    SFX_ICEGUY_FX_EXPLODE,
+    SFX_SORCERER_SIGHT,
+    SFX_SORCERER_ACTIVE,
+    SFX_SORCERER_PAIN,
+    SFX_SORCERER_SPELLCAST,
+    SFX_SORCERER_BALLWOOSH,
+    SFX_SORCERER_DEATHSCREAM,
+    SFX_SORCERER_BISHOPSPAWN,
+    SFX_SORCERER_BALLPOP,
+    SFX_SORCERER_BALLBOUNCE,
+    SFX_SORCERER_BALLEXPLODE,
+    SFX_SORCERER_BIGBALLEXPLODE,
+    SFX_SORCERER_HEADSCREAM,
+    SFX_DRAGON_SIGHT,
+    SFX_DRAGON_ACTIVE,
+    SFX_DRAGON_WINGFLAP,
+    SFX_DRAGON_ATTACK,
+    SFX_DRAGON_PAIN,
+    SFX_DRAGON_DEATH,
+    SFX_DRAGON_FIREBALL_EXPLODE,
+    SFX_KORAX_SIGHT,
+    SFX_KORAX_ACTIVE,
+    SFX_KORAX_PAIN,
+    SFX_KORAX_ATTACK,
+    SFX_KORAX_COMMAND,
+    SFX_KORAX_DEATH,
+    SFX_KORAX_STEP,
+    SFX_THRUSTSPIKE_RAISE,
+    SFX_THRUSTSPIKE_LOWER,
+    SFX_STAINEDGLASS_SHATTER,
+    SFX_FLECHETTE_BOUNCE,
+    SFX_FLECHETTE_EXPLODE,
+    SFX_LAVA_MOVE,
+    SFX_WATER_MOVE,
+    SFX_ICE_STARTMOVE,
+    SFX_EARTH_STARTMOVE,
+    SFX_WATER_SPLASH,
+    SFX_LAVA_SIZZLE,
+    SFX_SLUDGE_GLOOP,
+    SFX_CHOLY_FIRE,
+    SFX_SPIRIT_ACTIVE,
+    SFX_SPIRIT_ATTACK,
+    SFX_SPIRIT_DIE,
+    SFX_VALVE_TURN,
+    SFX_ROPE_PULL,
+    SFX_FLY_BUZZ,
+    SFX_IGNITE,
+    SFX_PUZZLE_SUCCESS,
+    SFX_PUZZLE_FAIL_FIGHTER,
+    SFX_PUZZLE_FAIL_CLERIC,
+    SFX_PUZZLE_FAIL_MAGE,
+    SFX_EARTHQUAKE,
+    SFX_BELLRING,
+    SFX_TREE_BREAK,
+    SFX_TREE_EXPLODE,
+    SFX_SUITOFARMOR_BREAK,
+    SFX_POISONSHROOM_PAIN,
+    SFX_POISONSHROOM_DEATH,
+    SFX_AMBIENT1,
+    SFX_AMBIENT2,
+    SFX_AMBIENT3,
+    SFX_AMBIENT4,
+    SFX_AMBIENT5,
+    SFX_AMBIENT6,
+    SFX_AMBIENT7,
+    SFX_AMBIENT8,
+    SFX_AMBIENT9,
+    SFX_AMBIENT10,
+    SFX_AMBIENT11,
+    SFX_AMBIENT12,
+    SFX_AMBIENT13,
+    SFX_AMBIENT14,
+    SFX_AMBIENT15,
+    SFX_STARTUP_TICK,
+    SFX_SWITCH_OTHERLEVEL,
+    SFX_RESPAWN,
+    SFX_KORAX_VOICE_1,
+    SFX_KORAX_VOICE_2,
+    SFX_KORAX_VOICE_3,
+    SFX_KORAX_VOICE_4,
+    SFX_KORAX_VOICE_5,
+    SFX_KORAX_VOICE_6,
+    SFX_KORAX_VOICE_7,
+    SFX_KORAX_VOICE_8,
+    SFX_KORAX_VOICE_9,
+    SFX_BAT_SCREAM,
+    SFX_CHAT,
+    SFX_MENU_MOVE,
+    SFX_CLOCK_TICK,
+    SFX_FIREBALL,
+    SFX_PUPPYBEAT,
+    SFX_MYSTICINCANT,
+    NUMSFX
+} sfxenum_t;
+
+
+extern sfxinfo_t S_sfx[];
+extern musicinfo_t S_music[];
+
+
+#endif
diff --git a/games/NXDoom/src/hexen/st_start.c b/games/NXDoom/src/hexen/st_start.c
new file mode 100644
index 000000000..aa104358d
--- /dev/null
+++ b/games/NXDoom/src/hexen/st_start.c
@@ -0,0 +1,310 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include <stdarg.h>
+
+#include "config.h"
+
+#include "h2def.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "i_videohr.h"
+#include "s_sound.h"
+#include "st_start.h"
+
+
+// MACROS ------------------------------------------------------------------
+#define ST_MAX_NOTCHES		32
+#define ST_NOTCH_WIDTH		16
+#define ST_NOTCH_HEIGHT		23
+#define ST_PROGRESS_X		64      // Start of notches x screen pos.
+#define ST_PROGRESS_Y		441     // Start of notches y screen pos.
+
+#define ST_NETPROGRESS_X		288
+#define ST_NETPROGRESS_Y		32
+#define ST_NETNOTCH_WIDTH		8
+#define ST_NETNOTCH_HEIGHT		16
+#define ST_MAX_NETNOTCHES		8
+
+byte *ST_LoadScreen(void);
+void ST_UpdateNotches(int notchPosition);
+void ST_UpdateNetNotches(int notchPosition);
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+static const byte *bitmap = NULL;
+int graphical_startup = 1;
+static boolean using_graphical_startup;
+
+static const byte notchTable[] = {
+    // plane 0
+    0x00, 0x80, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40,
+    0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xC0,
+    0x0F, 0x90, 0x1B, 0x68, 0x3D, 0xBC, 0x3F, 0xFC, 0x20, 0x08, 0x20, 0x08,
+    0x2F, 0xD8, 0x37, 0xD8, 0x37, 0xF8, 0x1F, 0xF8, 0x1C, 0x50,
+
+    // plane 1
+    0x00, 0x80, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0xA0,
+    0x30, 0x6C, 0x24, 0x94, 0x42, 0x4A, 0x60, 0x0E, 0x60, 0x06, 0x7F, 0xF6,
+    0x7F, 0xF6, 0x7F, 0xF6, 0x5E, 0xF6, 0x38, 0x16, 0x23, 0xAC,
+
+    // plane 2
+    0x00, 0x80, 0x01, 0x80, 0x01, 0x80, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
+    0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xE0,
+    0x30, 0x6C, 0x24, 0x94, 0x52, 0x6A, 0x7F, 0xFE, 0x60, 0x0E, 0x60, 0x0E,
+    0x6F, 0xD6, 0x77, 0xD6, 0x56, 0xF6, 0x38, 0x36, 0x23, 0xAC,
+
+    // plane 3
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80,
+    0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0x80, 0x02, 0x40,
+    0x0F, 0x90, 0x1B, 0x68, 0x3D, 0xB4, 0x1F, 0xF0, 0x1F, 0xF8, 0x1F, 0xF8,
+    0x10, 0x28, 0x08, 0x28, 0x29, 0x08, 0x07, 0xE8, 0x1C, 0x50
+};
+
+
+// Red Network Progress notches
+static const byte netnotchTable[] = {
+    // plane 0
+    0x80, 0x50, 0xD0, 0xf0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xD0, 0xF0, 0xC0,
+    0x70, 0x50, 0x80, 0x60,
+
+    // plane 1
+    0x60, 0xE0, 0xE0, 0xA0, 0xA0, 0xA0, 0xE0, 0xA0, 0xA0, 0xA0, 0xE0, 0xA0,
+    0xA0, 0xE0, 0x60, 0x00,
+
+    // plane 2
+    0x80, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x10, 0x10, 0x80, 0x60,
+
+    // plane 3
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00
+};
+
+// CODE --------------------------------------------------------------------
+
+
+
+//--------------------------------------------------------------------------
+//
+// Startup Screen Functions
+//
+//--------------------------------------------------------------------------
+
+
+//==========================================================================
+//
+// ST_Init - Do the startup screen
+//
+//==========================================================================
+
+void ST_Init(void)
+{
+    byte *pal;
+    byte *buffer;
+    
+    using_graphical_startup = false;
+
+    if (graphical_startup && !debugmode && !testcontrols)
+    {
+        I_SetWindowTitleHR("Hexen startup - " PACKAGE_STRING);
+
+        // Set 640x480x16 mode
+        if (I_SetVideoModeHR())
+        {
+            using_graphical_startup = true;
+            I_InitWindowIcon();
+
+            S_StartSongName("orb", true);
+
+            I_ClearScreenHR();
+            I_InitPaletteHR();
+            I_BlackPaletteHR();
+
+            // Load graphic
+            buffer = ST_LoadScreen();
+            pal = buffer;
+            bitmap = buffer + 16 * 3;
+
+            I_SlamHR(bitmap);
+            I_FadeToPaletteHR(pal);
+            Z_Free(buffer);
+        }
+    }
+}
+
+void ST_Done(void)
+{
+    if (using_graphical_startup)
+    {
+        I_ClearScreenHR();
+        I_UnsetVideoModeHR();
+    }
+}
+
+
+//==========================================================================
+//
+// ST_UpdateNotches
+//
+//==========================================================================
+
+void ST_UpdateNotches(int notchPosition)
+{
+    int x = ST_PROGRESS_X + notchPosition * ST_NOTCH_WIDTH;
+    int y = ST_PROGRESS_Y;
+    I_SlamBlockHR(x, y, ST_NOTCH_WIDTH, ST_NOTCH_HEIGHT, notchTable);
+}
+
+
+//==========================================================================
+//
+// ST_UpdateNetNotches - indicates network progress
+//
+//==========================================================================
+
+void ST_UpdateNetNotches(int notchPosition)
+{
+    int x = ST_NETPROGRESS_X + notchPosition * ST_NETNOTCH_WIDTH;
+    int y = ST_NETPROGRESS_Y;
+    I_SlamBlockHR(x, y, ST_NETNOTCH_WIDTH, ST_NETNOTCH_HEIGHT, netnotchTable);
+}
+
+
+//==========================================================================
+//
+// ST_Progress - increments progress indicator
+//
+//==========================================================================
+
+void ST_Progress(void)
+{
+    // Check for ESC press -- during startup all events eaten here
+    if (I_CheckAbortHR())
+    {
+        I_Quit();
+    }
+
+    if (using_graphical_startup)
+    {
+        static int notchPosition = 0;
+
+        if (notchPosition < ST_MAX_NOTCHES)
+        {
+            ST_UpdateNotches(notchPosition);
+            S_StartSound(NULL, SFX_STARTUP_TICK);
+            //I_Sleep(1000);
+            notchPosition++;
+        }
+    }
+
+    printf(".");
+}
+
+
+//==========================================================================
+//
+// ST_NetProgress - indicates network progress
+//
+//==========================================================================
+
+void ST_NetProgress(void)
+{
+    printf("*");
+
+    if (using_graphical_startup)
+    {
+        static int netnotchPosition = 0;
+
+        if (netnotchPosition < ST_MAX_NETNOTCHES)
+        {
+            ST_UpdateNetNotches(netnotchPosition);
+            S_StartSound(NULL, SFX_DRIP);
+            netnotchPosition++;
+        }
+    }
+}
+
+
+//==========================================================================
+//
+// ST_NetDone - net progress complete
+//
+//==========================================================================
+void ST_NetDone(void)
+{
+    if (using_graphical_startup)
+    {
+        S_StartSound(NULL, SFX_PICKUP_WEAPON);
+    }
+}
+
+
+//==========================================================================
+//
+// ST_Message - gives debug message
+//
+//==========================================================================
+
+void ST_Message(const char *message, ...)
+{
+    va_list argptr;
+
+    va_start(argptr, message);
+    vprintf(message, argptr);
+    va_end(argptr);
+}
+
+//==========================================================================
+//
+// ST_RealMessage - gives user message
+//
+//==========================================================================
+
+void ST_RealMessage(const char *message, ...)
+{
+    va_list argptr;
+
+    va_start(argptr, message);
+    vprintf(message, argptr);
+    va_end(argptr);
+}
+
+
+
+//==========================================================================
+//
+// ST_LoadScreen - loads startup graphic
+//
+//==========================================================================
+
+
+byte *ST_LoadScreen(void)
+{
+    int length, lump;
+    byte *buffer;
+
+    lump = W_GetNumForName("STARTUP");
+    length = W_LumpLength(lump);
+    buffer = (byte *) Z_Malloc(length, PU_STATIC, NULL);
+    W_ReadLump(lump, buffer);
+    return (buffer);
+}
+
diff --git a/games/NXDoom/src/hexen/st_start.h b/games/NXDoom/src/hexen/st_start.h
new file mode 100644
index 000000000..d38d28303
--- /dev/null
+++ b/games/NXDoom/src/hexen/st_start.h
@@ -0,0 +1,41 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef STSTART_H
+#define STSTART_H
+
+#include "doomtype.h"
+
+// HEADER FILES ------------------------------------------------------------
+
+// MACROS ------------------------------------------------------------------
+
+// TYPES -------------------------------------------------------------------
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+extern void ST_Init(void);
+extern void ST_Done(void);
+extern void ST_Message(const char *message, ...) PRINTF_ATTR(1, 2);
+extern void ST_RealMessage(const char *message, ...) PRINTF_ATTR(1, 2);
+extern void ST_Progress(void);
+extern void ST_NetProgress(void);
+extern void ST_NetDone(void);
+
+// PUBLIC DATA DECLARATIONS ------------------------------------------------
+ 
+extern int graphical_startup;
+
+#endif
diff --git a/games/NXDoom/src/hexen/sv_save.c b/games/NXDoom/src/hexen/sv_save.c
new file mode 100644
index 000000000..007e63340
--- /dev/null
+++ b/games/NXDoom/src/hexen/sv_save.c
@@ -0,0 +1,3508 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// HEADER FILES ------------------------------------------------------------
+
+#include "h2def.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "i_swap.h"
+#include "p_local.h"
+
+// MACROS ------------------------------------------------------------------
+
+#define MAX_TARGET_PLAYERS 512
+#define MOBJ_NULL -1
+#define MOBJ_XX_PLAYER -2
+#define MAX_MAPS 99
+#define BASE_SLOT 6
+#define REBORN_SLOT 7
+#define REBORN_DESCRIPTION "TEMP GAME"
+#define MAX_THINKER_SIZE 256
+
+// TYPES -------------------------------------------------------------------
+
+typedef enum
+{
+    ASEG_GAME_HEADER = 101,
+    ASEG_MAP_HEADER,
+    ASEG_WORLD,
+    ASEG_POLYOBJS,
+    ASEG_MOBJS,
+    ASEG_THINKERS,
+    ASEG_SCRIPTS,
+    ASEG_PLAYERS,
+    ASEG_SOUNDS,
+    ASEG_MISC,
+    ASEG_END
+} gameArchiveSegment_t;
+
+typedef enum
+{
+    TC_NULL,
+    TC_MOVE_CEILING,
+    TC_VERTICAL_DOOR,
+    TC_MOVE_FLOOR,
+    TC_PLAT_RAISE,
+    TC_INTERPRET_ACS,
+    TC_FLOOR_WAGGLE,
+    TC_LIGHT,
+    TC_PHASE,
+    TC_BUILD_PILLAR,
+    TC_ROTATE_POLY,
+    TC_MOVE_POLY,
+    TC_POLY_DOOR
+} thinkClass_t;
+
+typedef struct
+{
+    thinkClass_t tClass;
+    think_t thinkerFunc;
+    void (*writeFunc)(thinker_t *thinker);
+    void (*readFunc)(thinker_t *thinker);
+    void (*restoreFunc)(thinker_t *thinker);
+    size_t size;
+} thinkInfo_t;
+
+typedef struct
+{
+    thinker_t thinker;
+    sector_t *sector;
+} ssthinker_t;
+
+// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+
+void P_SpawnPlayer(mapthing_t * mthing);
+
+// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
+
+// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
+
+static void ArchiveWorld(void);
+static void UnarchiveWorld(void);
+static void ArchivePolyobjs(void);
+static void UnarchivePolyobjs(void);
+static void ArchiveMobjs(void);
+static void UnarchiveMobjs(void);
+static void ArchiveThinkers(void);
+static void UnarchiveThinkers(void);
+static void ArchiveScripts(void);
+static void UnarchiveScripts(void);
+static void ArchivePlayers(void);
+static void UnarchivePlayers(void);
+static void ArchiveSounds(void);
+static void UnarchiveSounds(void);
+static void ArchiveMisc(void);
+static void UnarchiveMisc(void);
+static void SetMobjArchiveNums(void);
+static void RemoveAllThinkers(void);
+static int GetMobjNum(mobj_t * mobj);
+static void SetMobjPtr(mobj_t **ptr, unsigned int archiveNum);
+static void RestoreSSThinker(thinker_t *sst);
+static void RestorePlatRaise(thinker_t *thinker);
+static void RestoreMoveCeiling(thinker_t *thinker);
+static void AssertSegment(gameArchiveSegment_t segType);
+static void ClearSaveSlot(int slot);
+static void CopySaveSlot(int sourceSlot, int destSlot);
+static void CopyFile(char *sourceName, char *destName);
+static boolean ExistingFile(char *name);
+static void SV_OpenRead(char *fileName);
+static void SV_OpenWrite(char *fileName);
+static void SV_Close(void);
+static void SV_Read(void *buffer, int size);
+static byte SV_ReadByte(void);
+static uint16_t SV_ReadWord(void);
+static uint32_t SV_ReadLong(void);
+static void *SV_ReadPtr(void);
+static void SV_Write(const void *buffer, int size);
+static void SV_WriteByte(byte val);
+static void SV_WriteWord(unsigned short val);
+static void SV_WriteLong(unsigned int val);
+static void SV_WritePtr(void *ptr);
+
+// EXTERNAL DATA DECLARATIONS ----------------------------------------------
+
+// PUBLIC DATA DEFINITIONS -------------------------------------------------
+
+#define DEFAULT_SAVEPATH                "hexndata/"
+
+char *SavePath = DEFAULT_SAVEPATH;
+
+int vanilla_savegame_limit = 1;
+
+// PRIVATE DATA DEFINITIONS ------------------------------------------------
+
+static int MobjCount;
+static mobj_t **MobjList;
+static mobj_t ***TargetPlayerAddrs;
+static int TargetPlayerCount;
+static boolean SavingPlayers;
+static FILE *SavingFP;
+
+// CODE --------------------------------------------------------------------
+
+// Autogenerated functions for reading/writing structs:
+
+//
+// acsstore_t
+//
+
+static void StreamIn_acsstore_t(acsstore_t *str)
+{
+    int i;
+
+    // int map;
+    str->map = SV_ReadLong();
+
+    // int script;
+    str->script = SV_ReadLong();
+
+    // byte args[4];
+    for (i=0; i<4; ++i)
+    {
+        str->args[i] = SV_ReadByte();
+    }
+}
+
+static void StreamOut_acsstore_t(acsstore_t *str)
+{
+    int i;
+
+    // int map;
+    SV_WriteLong(str->map);
+
+    // int script;
+    SV_WriteLong(str->script);
+
+    // byte args[4];
+    for (i=0; i<4; ++i)
+    {
+        SV_WriteByte(str->args[i]);
+    }
+}
+
+
+//
+// ticcmd_t
+// (this is based on the Vanilla definition of the struct)
+//
+
+static void StreamIn_ticcmd_t(ticcmd_t *str)
+{
+    // char forwardmove;
+    str->forwardmove = SV_ReadByte();
+
+    // char sidemove;
+    str->sidemove = SV_ReadByte();
+
+    // short angleturn;
+    str->angleturn = SV_ReadWord();
+
+    // short consistancy;
+    str->consistancy = SV_ReadWord();
+
+    // byte chatchar;
+    str->chatchar = SV_ReadByte();
+
+    // byte buttons;
+    str->buttons = SV_ReadByte();
+
+    // byte lookfly;
+    str->lookfly = SV_ReadByte();
+
+    // byte arti;
+    str->arti = SV_ReadByte();
+}
+
+static void StreamOut_ticcmd_t(ticcmd_t *str)
+{
+    // char forwardmove;
+    SV_WriteByte(str->forwardmove);
+
+    // char sidemove;
+    SV_WriteByte(str->sidemove);
+
+    // short angleturn;
+    SV_WriteWord(str->angleturn);
+
+    // short consistancy;
+    SV_WriteWord(str->consistancy);
+
+    // byte chatchar;
+    SV_WriteByte(str->chatchar);
+
+    // byte buttons;
+    SV_WriteByte(str->buttons);
+
+    // byte lookfly;
+    SV_WriteByte(str->lookfly);
+
+    // byte arti;
+    SV_WriteByte(str->arti);
+}
+
+
+
+//
+// inventory_t
+//
+
+static void StreamIn_inventory_t(inventory_t *str)
+{
+    // int type;
+    str->type = SV_ReadLong();
+
+    // int count;
+    str->count = SV_ReadLong();
+}
+
+static void StreamOut_inventory_t(inventory_t *str)
+{
+    // int type;
+    SV_WriteLong(str->type);
+
+    // int count;
+    SV_WriteLong(str->count);
+}
+
+
+//
+// pspdef_t
+//
+
+static void StreamIn_pspdef_t(pspdef_t *str)
+{
+    int state_num;
+
+    // state_t *state;
+
+    // This is a pointer; it is stored as an index into the states table.
+
+    state_num = SV_ReadLong();
+
+    if (state_num != 0)
+    {
+        str->state = states + state_num;
+    }
+    else
+    {
+        str->state = NULL;
+    }
+
+    // int tics;
+    str->tics = SV_ReadLong();
+
+    // fixed_t sx, sy;
+    str->sx = SV_ReadLong();
+    str->sy = SV_ReadLong();
+}
+
+static void StreamOut_pspdef_t(pspdef_t *str)
+{
+    // state_t *state;
+    // This is a pointer; store the index in the states table,
+    // rather than the pointer itself.
+    if (str->state != NULL)
+    {
+        SV_WriteLong(str->state - states);
+    }
+    else
+    {
+        SV_WriteLong(0);
+    }
+
+    // int tics;
+    SV_WriteLong(str->tics);
+
+    // fixed_t sx, sy;
+    SV_WriteLong(str->sx);
+    SV_WriteLong(str->sy);
+}
+
+
+//
+// player_t
+//
+
+static void StreamIn_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t *mo;
+    // Pointer value is reset on load.
+    str->mo = SV_ReadPtr();
+    str->mo = NULL;
+
+    // playerstate_t playerstate;
+    str->playerstate = SV_ReadLong();
+
+    // ticcmd_t cmd;
+    StreamIn_ticcmd_t(&str->cmd);
+
+    // pclass_t class;
+    str->class = SV_ReadLong();
+
+    // fixed_t viewz;
+    str->viewz = SV_ReadLong();
+
+    // fixed_t viewheight;
+    str->viewheight = SV_ReadLong();
+
+    // fixed_t deltaviewheight;
+    str->deltaviewheight = SV_ReadLong();
+
+    // fixed_t bob;
+    str->bob = SV_ReadLong();
+
+    // int flyheight;
+    str->flyheight = SV_ReadLong();
+
+    // int lookdir;
+    str->lookdir = SV_ReadLong();
+
+    // boolean centering;
+    str->centering = SV_ReadLong();
+
+    // int health;
+    str->health = SV_ReadLong();
+
+    // int armorpoints[NUMARMOR];
+    for (i=0; i<NUMARMOR; ++i)
+    {
+        str->armorpoints[i] = SV_ReadLong();
+    }
+
+    // inventory_t inventory[NUMINVENTORYSLOTS];
+    for (i=0; i<NUMINVENTORYSLOTS; ++i)
+    {
+        StreamIn_inventory_t(&str->inventory[i]);
+    }
+
+    // artitype_t readyArtifact;
+    str->readyArtifact = SV_ReadLong();
+
+    // int artifactCount;
+    str->artifactCount = SV_ReadLong();
+
+    // int inventorySlotNum;
+    str->inventorySlotNum = SV_ReadLong();
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        str->powers[i] = SV_ReadLong();
+    }
+
+    // int keys;
+    str->keys = SV_ReadLong();
+
+    // int pieces;
+    str->pieces = SV_ReadLong();
+
+    // signed int frags[MAXPLAYERS];
+    for (i=0; i<maxplayers; ++i)
+    {
+        str->frags[i] = SV_ReadLong();
+    }
+
+    // weapontype_t readyweapon;
+    str->readyweapon = SV_ReadLong();
+
+    // weapontype_t pendingweapon;
+    str->pendingweapon = SV_ReadLong();
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        str->weaponowned[i] = SV_ReadLong();
+    }
+
+    // int mana[NUMMANA];
+    for (i=0; i<NUMMANA; ++i)
+    {
+        str->mana[i] = SV_ReadLong();
+    }
+
+    // int attackdown, usedown;
+    str->attackdown = SV_ReadLong();
+    str->usedown = SV_ReadLong();
+
+    // int cheats;
+    str->cheats = SV_ReadLong();
+
+    // int refire;
+    str->refire = SV_ReadLong();
+
+    // int killcount, itemcount, secretcount;
+    str->killcount = SV_ReadLong();
+    str->itemcount = SV_ReadLong();
+    str->secretcount = SV_ReadLong();
+
+    // char message[80];
+    for (i=0; i<80; ++i)
+    {
+        str->message[i] = SV_ReadByte();
+    }
+
+    // int messageTics;
+    str->messageTics = SV_ReadLong();
+
+    // short ultimateMessage;
+    str->ultimateMessage = SV_ReadWord();
+
+    // short yellowMessage;
+    str->yellowMessage = SV_ReadWord();
+
+    // int damagecount, bonuscount;
+    str->damagecount = SV_ReadLong();
+    str->bonuscount = SV_ReadLong();
+
+    // int poisoncount;
+    str->poisoncount = SV_ReadLong();
+
+    // mobj_t *poisoner;
+    // Pointer value is reset.
+    str->poisoner = SV_ReadPtr();
+    str->poisoner = NULL;
+
+    // mobj_t *attacker;
+    // Pointer value is reset.
+    str->attacker = SV_ReadPtr();
+    str->attacker = NULL;
+
+    // int extralight;
+    str->extralight = SV_ReadLong();
+
+    // int fixedcolormap;
+    str->fixedcolormap = SV_ReadLong();
+
+    // int colormap;
+    str->colormap = SV_ReadLong();
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        StreamIn_pspdef_t(&str->psprites[i]);
+    }
+
+    // int morphTics;
+    str->morphTics = SV_ReadLong();
+
+    // unsigned int jumpTics;
+    str->jumpTics = SV_ReadLong();
+
+    // unsigned int worldTimer;
+    str->worldTimer = SV_ReadLong();
+}
+
+static void StreamOut_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t *mo;
+    SV_WritePtr(str->mo);
+
+    // playerstate_t playerstate;
+    SV_WriteLong(str->playerstate);
+
+    // ticcmd_t cmd;
+    StreamOut_ticcmd_t(&str->cmd);
+
+    // pclass_t class;
+    SV_WriteLong(str->class);
+
+    // fixed_t viewz;
+    SV_WriteLong(str->viewz);
+
+    // fixed_t viewheight;
+    SV_WriteLong(str->viewheight);
+
+    // fixed_t deltaviewheight;
+    SV_WriteLong(str->deltaviewheight);
+
+    // fixed_t bob;
+    SV_WriteLong(str->bob);
+
+    // int flyheight;
+    SV_WriteLong(str->flyheight);
+
+    // int lookdir;
+    SV_WriteLong(str->lookdir);
+
+    // boolean centering;
+    SV_WriteLong(str->centering);
+
+    // int health;
+    SV_WriteLong(str->health);
+
+    // int armorpoints[NUMARMOR];
+    for (i=0; i<NUMARMOR; ++i)
+    {
+        SV_WriteLong(str->armorpoints[i]);
+    }
+
+    // inventory_t inventory[NUMINVENTORYSLOTS];
+    for (i=0; i<NUMINVENTORYSLOTS; ++i)
+    {
+        StreamOut_inventory_t(&str->inventory[i]);
+    }
+
+    // artitype_t readyArtifact;
+    SV_WriteLong(str->readyArtifact);
+
+    // int artifactCount;
+    SV_WriteLong(str->artifactCount);
+
+    // int inventorySlotNum;
+    SV_WriteLong(str->inventorySlotNum);
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        SV_WriteLong(str->powers[i]);
+    }
+
+    // int keys;
+    SV_WriteLong(str->keys);
+
+    // int pieces;
+    SV_WriteLong(str->pieces);
+
+    // signed int frags[MAXPLAYERS];
+    for (i=0; i<maxplayers; ++i)
+    {
+        SV_WriteLong(str->frags[i]);
+    }
+
+    // weapontype_t readyweapon;
+    SV_WriteLong(str->readyweapon);
+
+    // weapontype_t pendingweapon;
+    SV_WriteLong(str->pendingweapon);
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        SV_WriteLong(str->weaponowned[i]);
+    }
+
+    // int mana[NUMMANA];
+    for (i=0; i<NUMMANA; ++i)
+    {
+        SV_WriteLong(str->mana[i]);
+    }
+
+    // int attackdown, usedown;
+    SV_WriteLong(str->attackdown);
+    SV_WriteLong(str->usedown);
+
+    // int cheats;
+    SV_WriteLong(str->cheats);
+
+    // int refire;
+    SV_WriteLong(str->refire);
+
+    // int killcount, itemcount, secretcount;
+    SV_WriteLong(str->killcount);
+    SV_WriteLong(str->itemcount);
+    SV_WriteLong(str->secretcount);
+
+    // char message[80];
+    for (i=0; i<80; ++i)
+    {
+        SV_WriteByte(str->message[i]);
+    }
+
+    // int messageTics;
+    SV_WriteLong(str->messageTics);
+
+    // short ultimateMessage;
+    SV_WriteWord(str->ultimateMessage);
+
+    // short yellowMessage;
+    SV_WriteWord(str->yellowMessage);
+
+    // int damagecount, bonuscount;
+    SV_WriteLong(str->damagecount);
+    SV_WriteLong(str->bonuscount);
+
+    // int poisoncount;
+    SV_WriteLong(str->poisoncount);
+
+    // mobj_t *poisoner;
+    SV_WritePtr(str->poisoner);
+
+    // mobj_t *attacker;
+    SV_WritePtr(str->attacker);
+
+    // int extralight;
+    SV_WriteLong(str->extralight);
+
+    // int fixedcolormap;
+    SV_WriteLong(str->fixedcolormap);
+
+    // int colormap;
+    SV_WriteLong(str->colormap);
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        StreamOut_pspdef_t(&str->psprites[i]);
+    }
+
+    // int morphTics;
+    SV_WriteLong(str->morphTics);
+
+    // unsigned int jumpTics;
+    SV_WriteLong(str->jumpTics);
+
+    // unsigned int worldTimer;
+    SV_WriteLong(str->worldTimer);
+}
+
+
+//
+// thinker_t
+//
+
+static void StreamIn_thinker_t(thinker_t *str)
+{
+    // struct thinker_s *prev, *next;
+    // Pointers are discarded:
+    str->prev = SV_ReadPtr();
+    str->prev = NULL;
+    str->next = SV_ReadPtr();
+    str->next = NULL;
+
+    // think_t function;
+    // Function pointer is discarded:
+    str->function = SV_ReadPtr();
+    str->function = NULL;
+}
+
+static void StreamOut_thinker_t(thinker_t *str)
+{
+    // struct thinker_s *prev, *next;
+    SV_WritePtr(str->prev);
+    SV_WritePtr(str->next);
+
+    // think_t function;
+    SV_WritePtr(&str->function);
+}
+
+
+//
+// mobj_t
+//
+
+static void StreamInMobjSpecials(mobj_t *mobj)
+{
+    unsigned int special1, special2;
+
+    special1 = SV_ReadLong();
+    special2 = SV_ReadLong();
+
+    mobj->special1.i = special1;
+    mobj->special2.i = special2;
+
+    switch (mobj->type)
+    {
+            // Just special1
+        case MT_BISH_FX:
+        case MT_HOLY_FX:
+        case MT_DRAGON:
+        case MT_THRUSTFLOOR_UP:
+        case MT_THRUSTFLOOR_DOWN:
+        case MT_MINOTAUR:
+        case MT_SORCFX1:
+            SetMobjPtr(&mobj->special1.m, special1);
+            break;
+
+            // Just special2
+        case MT_LIGHTNING_FLOOR:
+        case MT_LIGHTNING_ZAP:
+            SetMobjPtr(&mobj->special2.m, special2);
+            break;
+
+            // Both special1 and special2
+        case MT_HOLY_TAIL:
+        case MT_LIGHTNING_CEILING:
+            SetMobjPtr(&mobj->special1.m, special1);
+            SetMobjPtr(&mobj->special2.m, special2);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void StreamIn_mobj_t(mobj_t *str)
+{
+    unsigned int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // fixed_t x, y, z;
+    str->x = SV_ReadLong();
+    str->y = SV_ReadLong();
+    str->z = SV_ReadLong();
+
+    // struct mobj_s *snext, *sprev;
+    // Pointer values are discarded:
+    str->snext = SV_ReadPtr();
+    str->snext = NULL;
+    str->sprev = SV_ReadPtr();
+    str->sprev = NULL;
+
+    // angle_t angle;
+    str->angle = SV_ReadLong();
+
+    // spritenum_t sprite;
+    str->sprite = SV_ReadLong();
+
+    // int frame;
+    str->frame = SV_ReadLong();
+
+    // struct mobj_s *bnext, *bprev;
+    // Values are read but discarded; this will be restored when the thing's
+    // position is set.
+    str->bnext = SV_ReadPtr();
+    str->bnext = NULL;
+    str->bprev = SV_ReadPtr();
+    str->bprev = NULL;
+
+    // struct subsector_s *subsector;
+    // Read but discard: pointer will be restored when thing position is set.
+    str->subsector = SV_ReadPtr();
+    str->subsector = NULL;
+
+    // fixed_t floorz, ceilingz;
+    str->floorz = SV_ReadLong();
+    str->ceilingz = SV_ReadLong();
+
+    // fixed_t floorpic;
+    str->floorpic = SV_ReadLong();
+
+    // fixed_t radius, height;
+    str->radius = SV_ReadLong();
+    str->height = SV_ReadLong();
+
+    // fixed_t momx, momy, momz;
+    str->momx = SV_ReadLong();
+    str->momy = SV_ReadLong();
+    str->momz = SV_ReadLong();
+
+    // int validcount;
+    str->validcount = SV_ReadLong();
+
+    // mobjtype_t type;
+    str->type = SV_ReadLong();
+
+    // mobjinfo_t *info;
+    // Pointer value is read but discarded.
+    str->info = SV_ReadPtr();
+    str->info = NULL;
+
+    // int tics;
+    str->tics = SV_ReadLong();
+
+    // state_t *state;
+    // Restore as index into states table.
+    i = SV_ReadLong();
+    str->state = &states[i];
+
+    // int damage;
+    str->damage = SV_ReadLong();
+
+    // int flags;
+    str->flags = SV_ReadLong();
+
+    // int flags2;
+    str->flags2 = SV_ReadLong();
+
+    // specialval_t special1;
+    // specialval_t special2;
+    // Read in special values: there are special cases to deal with with
+    // mobj pointers.
+    StreamInMobjSpecials(str);
+
+    // int health;
+    str->health = SV_ReadLong();
+
+    // int movedir;
+    str->movedir = SV_ReadLong();
+
+    // int movecount;
+    str->movecount = SV_ReadLong();
+
+    // struct mobj_s *target;
+    i = SV_ReadLong();
+    SetMobjPtr(&str->target, i);
+
+    // int reactiontime;
+    str->reactiontime = SV_ReadLong();
+
+    // int threshold;
+    str->threshold = SV_ReadLong();
+
+    // struct player_s *player;
+    // Saved as player number.
+    i = SV_ReadLong();
+    if (i == 0)
+    {
+        str->player = NULL;
+    }
+    else
+    {
+        str->player = &players[i - 1];
+        str->player->mo = str;
+    }
+
+    // int lastlook;
+    str->lastlook = SV_ReadLong();
+
+    // fixed_t floorclip;
+    str->floorclip = SV_ReadLong();
+
+    // int archiveNum;
+    str->archiveNum = SV_ReadLong();
+
+    // short tid;
+    str->tid = SV_ReadWord();
+
+    // byte special;
+    str->special = SV_ReadByte();
+
+    // byte args[5];
+    for (i=0; i<5; ++i)
+    {
+        str->args[i] = SV_ReadByte();
+    }
+}
+
+static void StreamOutMobjSpecials(mobj_t *mobj)
+{
+    unsigned int special1, special2;
+    boolean corpse;
+    
+    corpse = (mobj->flags & MF_CORPSE) != 0;
+    special1 = mobj->special1.i;
+    special2 = mobj->special2.i;
+
+    switch (mobj->type)
+    {
+            // Just special1
+        case MT_BISH_FX:
+        case MT_HOLY_FX:
+        case MT_DRAGON:
+        case MT_THRUSTFLOOR_UP:
+        case MT_THRUSTFLOOR_DOWN:
+        case MT_MINOTAUR:
+        case MT_SORCFX1:
+        case MT_MSTAFF_FX2:
+            if (corpse)
+            {
+                special1 = MOBJ_NULL;
+            }
+            else
+            {
+                special1 = GetMobjNum(mobj->special1.m);
+            }
+            break;
+
+            // Just special2
+        case MT_LIGHTNING_FLOOR:
+        case MT_LIGHTNING_ZAP:
+            if (corpse)
+            {
+                special2 = MOBJ_NULL;
+            }
+            else
+            {
+                special2 = GetMobjNum(mobj->special2.m);
+            }
+            break;
+
+            // Both special1 and special2
+        case MT_HOLY_TAIL:
+        case MT_LIGHTNING_CEILING:
+            if (corpse)
+            {
+                special1 = MOBJ_NULL;
+                special2 = MOBJ_NULL;
+            }
+            else
+            {
+                special1 = GetMobjNum(mobj->special1.m);
+                special2 = GetMobjNum(mobj->special2.m);
+            }
+            break;
+
+            // Miscellaneous
+        case MT_KORAX:
+            special1 = 0; // Searching index
+            break;
+
+        default:
+            break;
+    }
+
+    // Write special values to savegame file.
+
+    SV_WriteLong(special1);
+    SV_WriteLong(special2);
+}
+
+static void StreamOut_mobj_t(mobj_t *str)
+{
+    int i;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // fixed_t x, y, z;
+    SV_WriteLong(str->x);
+    SV_WriteLong(str->y);
+    SV_WriteLong(str->z);
+
+    // struct mobj_s *snext, *sprev;
+    SV_WritePtr(str->snext);
+    SV_WritePtr(str->sprev);
+
+    // angle_t angle;
+    SV_WriteLong(str->angle);
+
+    // spritenum_t sprite;
+    SV_WriteLong(str->sprite);
+
+    // int frame;
+    SV_WriteLong(str->frame);
+
+    // struct mobj_s *bnext, *bprev;
+    SV_WritePtr(str->bnext);
+    SV_WritePtr(str->bprev);
+
+    // struct subsector_s *subsector;
+    SV_WritePtr(str->subsector);
+
+    // fixed_t floorz, ceilingz;
+    SV_WriteLong(str->floorz);
+    SV_WriteLong(str->ceilingz);
+
+    // fixed_t floorpic;
+    SV_WriteLong(str->floorpic);
+
+    // fixed_t radius, height;
+    SV_WriteLong(str->radius);
+    SV_WriteLong(str->height);
+
+    // fixed_t momx, momy, momz;
+    SV_WriteLong(str->momx);
+    SV_WriteLong(str->momy);
+    SV_WriteLong(str->momz);
+
+    // int validcount;
+    SV_WriteLong(str->validcount);
+
+    // mobjtype_t type;
+    SV_WriteLong(str->type);
+
+    // mobjinfo_t *info;
+    SV_WritePtr(str->info);
+
+    // int tics;
+    SV_WriteLong(str->tics);
+
+    // state_t *state;
+    // Save as index into the states table.
+    SV_WriteLong(str->state - states);
+
+    // int damage;
+    SV_WriteLong(str->damage);
+
+    // int flags;
+    SV_WriteLong(str->flags);
+
+    // int flags2;
+    SV_WriteLong(str->flags2);
+
+    // specialval_t special1;
+    // specialval_t special2;
+    // There are lots of special cases for the special values:
+    StreamOutMobjSpecials(str);
+
+    // int health;
+    SV_WriteLong(str->health);
+
+    // int movedir;
+    SV_WriteLong(str->movedir);
+
+    // int movecount;
+    SV_WriteLong(str->movecount);
+
+    // struct mobj_s *target;
+    if ((str->flags & MF_CORPSE) != 0)
+    {
+        SV_WriteLong(MOBJ_NULL);
+    }
+    else
+    {
+        SV_WriteLong(GetMobjNum(str->target));
+    }
+
+    // int reactiontime;
+    SV_WriteLong(str->reactiontime);
+
+    // int threshold;
+    SV_WriteLong(str->threshold);
+
+    // struct player_s *player;
+    // Stored as index into players[] array, if there is a player pointer.
+    if (str->player != NULL)
+    {
+        SV_WriteLong(str->player - players + 1);
+    }
+    else
+    {
+        SV_WriteLong(0);
+    }
+
+    // int lastlook;
+    SV_WriteLong(str->lastlook);
+
+    // fixed_t floorclip;
+    SV_WriteLong(str->floorclip);
+
+    // int archiveNum;
+    SV_WriteLong(str->archiveNum);
+
+    // short tid;
+    SV_WriteWord(str->tid);
+
+    // byte special;
+    SV_WriteByte(str->special);
+
+    // byte args[5];
+    for (i=0; i<5; ++i)
+    {
+        SV_WriteByte(str->args[i]);
+    }
+}
+
+
+//
+// floormove_t
+//
+
+static void StreamIn_floormove_t(thinker_t *thinker)
+{
+    floormove_t *str = (floormove_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = sectors + i;
+
+    // floor_e type;
+    str->type = SV_ReadLong();
+
+    // int crush;
+    str->crush = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int newspecial;
+    str->newspecial = SV_ReadLong();
+
+    // short texture;
+    str->texture = SV_ReadWord();
+
+    // fixed_t floordestheight;
+    str->floordestheight = SV_ReadLong();
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // int delayCount;
+    str->delayCount = SV_ReadLong();
+
+    // int delayTotal;
+    str->delayTotal = SV_ReadLong();
+
+    // fixed_t stairsDelayHeight;
+    str->stairsDelayHeight = SV_ReadLong();
+
+    // fixed_t stairsDelayHeightDelta;
+    str->stairsDelayHeightDelta = SV_ReadLong();
+
+    // fixed_t resetHeight;
+    str->resetHeight = SV_ReadLong();
+
+    // short resetDelay;
+    str->resetDelay = SV_ReadWord();
+
+    // short resetDelayCount;
+    str->resetDelayCount = SV_ReadWord();
+
+    // byte textureChange;
+    str->textureChange = SV_ReadByte();
+}
+
+static void StreamOut_floormove_t(thinker_t *thinker)
+{
+    floormove_t *str = (floormove_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // floor_e type;
+    SV_WriteLong(str->type);
+
+    // int crush;
+    SV_WriteLong(str->crush);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int newspecial;
+    SV_WriteLong(str->newspecial);
+
+    // short texture;
+    SV_WriteWord(str->texture);
+
+    // fixed_t floordestheight;
+    SV_WriteLong(str->floordestheight);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // int delayCount;
+    SV_WriteLong(str->delayCount);
+
+    // int delayTotal;
+    SV_WriteLong(str->delayTotal);
+
+    // fixed_t stairsDelayHeight;
+    SV_WriteLong(str->stairsDelayHeight);
+
+    // fixed_t stairsDelayHeightDelta;
+    SV_WriteLong(str->stairsDelayHeightDelta);
+
+    // fixed_t resetHeight;
+    SV_WriteLong(str->resetHeight);
+
+    // short resetDelay;
+    SV_WriteWord(str->resetDelay);
+
+    // short resetDelayCount;
+    SV_WriteWord(str->resetDelayCount);
+
+    // byte textureChange;
+    SV_WriteByte(str->textureChange);
+}
+
+
+//
+// plat_t
+//
+
+static void StreamIn_plat_t(thinker_t *thinker)
+{
+    plat_t *str = (plat_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = sectors + i;
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // fixed_t low;
+    str->low = SV_ReadLong();
+
+    // fixed_t high;
+    str->high = SV_ReadLong();
+
+    // int wait;
+    str->wait = SV_ReadLong();
+
+    // int count;
+    str->count = SV_ReadLong();
+
+    // plat_e status;
+    str->status = SV_ReadLong();
+
+    // plat_e oldstatus;
+    str->oldstatus = SV_ReadLong();
+
+    // int crush;
+    str->crush = SV_ReadLong();
+
+    // int tag;
+    str->tag = SV_ReadLong();
+
+    // plattype_e type;
+    str->type = SV_ReadLong();
+}
+
+static void StreamOut_plat_t(thinker_t *thinker)
+{
+    plat_t *str = (plat_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // fixed_t low;
+    SV_WriteLong(str->low);
+
+    // fixed_t high;
+    SV_WriteLong(str->high);
+
+    // int wait;
+    SV_WriteLong(str->wait);
+
+    // int count;
+    SV_WriteLong(str->count);
+
+    // plat_e status;
+    SV_WriteLong(str->status);
+
+    // plat_e oldstatus;
+    SV_WriteLong(str->oldstatus);
+
+    // int crush;
+    SV_WriteLong(str->crush);
+
+    // int tag;
+    SV_WriteLong(str->tag);
+
+    // plattype_e type;
+    SV_WriteLong(str->type);
+}
+
+
+//
+// ceiling_t
+//
+
+static void StreamIn_ceiling_t(thinker_t *thinker)
+{
+    ceiling_t *str = (ceiling_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = sectors + i;
+
+    // ceiling_e type;
+    str->type = SV_ReadLong();
+
+    // fixed_t bottomheight, topheight;
+    str->bottomheight = SV_ReadLong();
+    str->topheight = SV_ReadLong();
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // int crush;
+    str->crush = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int tag;
+    str->tag = SV_ReadLong();
+
+    // int olddirection;
+    str->olddirection = SV_ReadLong();
+}
+
+static void StreamOut_ceiling_t(thinker_t *thinker)
+{
+    ceiling_t *str = (ceiling_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // ceiling_e type;
+    SV_WriteLong(str->type);
+
+    // fixed_t bottomheight, topheight;
+    SV_WriteLong(str->bottomheight);
+    SV_WriteLong(str->topheight);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // int crush;
+    SV_WriteLong(str->crush);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int tag;
+    SV_WriteLong(str->tag);
+
+    // int olddirection;
+    SV_WriteLong(str->olddirection);
+}
+
+
+//
+// light_t
+//
+
+static void StreamIn_light_t(thinker_t *thinker)
+{
+    light_t *str = (light_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = sectors + i;
+
+    // lighttype_t type;
+    str->type = SV_ReadLong();
+
+    // int value1;
+    str->value1 = SV_ReadLong();
+
+    // int value2;
+    str->value2 = SV_ReadLong();
+
+    // int tics1;
+    str->tics1 = SV_ReadLong();
+
+    // int tics2;
+    str->tics2 = SV_ReadLong();
+
+    // int count;
+    str->count = SV_ReadLong();
+}
+
+static void StreamOut_light_t(thinker_t *thinker)
+{
+    light_t *str = (light_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // lighttype_t type;
+    SV_WriteLong(str->type);
+
+    // int value1;
+    SV_WriteLong(str->value1);
+
+    // int value2;
+    SV_WriteLong(str->value2);
+
+    // int tics1;
+    SV_WriteLong(str->tics1);
+
+    // int tics2;
+    SV_WriteLong(str->tics2);
+
+    // int count;
+    SV_WriteLong(str->count);
+}
+
+
+//
+// vldoor_t
+//
+
+static void StreamIn_vldoor_t(thinker_t *thinker)
+{
+    vldoor_t *str = (vldoor_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // vldoor_e type;
+    str->type = SV_ReadLong();
+
+    // fixed_t topheight;
+    str->topheight = SV_ReadLong();
+
+    // fixed_t speed;
+    str->speed = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int topwait;
+    str->topwait = SV_ReadLong();
+
+    // int topcountdown;
+    str->topcountdown = SV_ReadLong();
+}
+
+static void StreamOut_vldoor_t(thinker_t *thinker)
+{
+    vldoor_t *str = (vldoor_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // vldoor_e type;
+    SV_WriteLong(str->type);
+
+    // fixed_t topheight;
+    SV_WriteLong(str->topheight);
+
+    // fixed_t speed;
+    SV_WriteLong(str->speed);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int topwait;
+    SV_WriteLong(str->topwait);
+
+    // int topcountdown;
+    SV_WriteLong(str->topcountdown);
+}
+
+
+//
+// phase_t
+//
+
+static void StreamIn_phase_t(thinker_t *thinker)
+{
+    phase_t *str = (phase_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // int index;
+    str->index = SV_ReadLong();
+
+    // int base;
+    str->base = SV_ReadLong();
+}
+
+static void StreamOut_phase_t(thinker_t *thinker)
+{
+    phase_t *str = (phase_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // int index;
+    SV_WriteLong(str->index);
+
+    // int base;
+    SV_WriteLong(str->base);
+}
+
+
+//
+// acs_t
+//
+
+static void StreamIn_acs_t(thinker_t *thinker)
+{
+    acs_t *str = (acs_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // mobj_t *activator;
+    i = SV_ReadLong();
+    SetMobjPtr(&str->activator, i);
+
+    // line_t *line;
+    i = SV_ReadLong();
+    if (i != -1)
+    {
+        str->line = &lines[i];
+    }
+    else
+    {
+        str->line = NULL;
+    }
+
+    // int side;
+    str->side = SV_ReadLong();
+
+    // int number;
+    str->number = SV_ReadLong();
+
+    // int infoIndex;
+    str->infoIndex = SV_ReadLong();
+
+    // int delayCount;
+    str->delayCount = SV_ReadLong();
+
+    // int stack[ACS_STACK_DEPTH];
+    for (i=0; i<ACS_STACK_DEPTH; ++i)
+    {
+        str->stack[i] = SV_ReadLong();
+    }
+
+    // int stackPtr;
+    str->stackPtr = SV_ReadLong();
+
+    // int vars[MAX_ACS_SCRIPT_VARS];
+    for (i=0; i<MAX_ACS_SCRIPT_VARS; ++i)
+    {
+        str->vars[i] = SV_ReadLong();
+    }
+
+    // int *ip;
+    str->ip = SV_ReadLong();
+}
+
+static void StreamOut_acs_t(thinker_t *thinker)
+{
+    acs_t *str = (acs_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // mobj_t *activator;
+    SV_WriteLong(GetMobjNum(str->activator));
+
+    // line_t *line;
+    if (str->line != NULL)
+    {
+        SV_WriteLong(str->line - lines);
+    }
+    else
+    {
+        SV_WriteLong(-1);
+    }
+
+    // int side;
+    SV_WriteLong(str->side);
+
+    // int number;
+    SV_WriteLong(str->number);
+
+    // int infoIndex;
+    SV_WriteLong(str->infoIndex);
+
+    // int delayCount;
+    SV_WriteLong(str->delayCount);
+
+    // int stack[ACS_STACK_DEPTH];
+    for (i=0; i<ACS_STACK_DEPTH; ++i)
+    {
+        SV_WriteLong(str->stack[i]);
+    }
+
+    // int stackPtr;
+    SV_WriteLong(str->stackPtr);
+
+    // int vars[MAX_ACS_SCRIPT_VARS];
+    for (i=0; i<MAX_ACS_SCRIPT_VARS; ++i)
+    {
+        SV_WriteLong(str->vars[i]);
+    }
+
+    // int *ip;
+    SV_WriteLong(str->ip);
+}
+
+
+//
+// polyevent_t
+//
+
+static void StreamIn_polyevent_t(thinker_t *thinker)
+{
+    polyevent_t *str = (polyevent_t *) thinker;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // int polyobj;
+    str->polyobj = SV_ReadLong();
+
+    // int speed;
+    str->speed = SV_ReadLong();
+
+    // unsigned int dist;
+    str->dist = SV_ReadLong();
+
+    // int angle;
+    str->angle = SV_ReadLong();
+
+    // fixed_t xSpeed;
+    str->xSpeed = SV_ReadLong();
+
+    // fixed_t ySpeed;
+    str->ySpeed = SV_ReadLong();
+}
+
+static void StreamOut_polyevent_t(thinker_t *thinker)
+{
+    polyevent_t *str = (polyevent_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // int polyobj;
+    SV_WriteLong(str->polyobj);
+
+    // int speed;
+    SV_WriteLong(str->speed);
+
+    // unsigned int dist;
+    SV_WriteLong(str->dist);
+
+    // int angle;
+    SV_WriteLong(str->angle);
+
+    // fixed_t xSpeed;
+    SV_WriteLong(str->xSpeed);
+
+    // fixed_t ySpeed;
+    SV_WriteLong(str->ySpeed);
+}
+
+
+//
+// pillar_t
+//
+
+static void StreamIn_pillar_t(thinker_t *thinker)
+{
+    pillar_t *str = (pillar_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // int ceilingSpeed;
+    str->ceilingSpeed = SV_ReadLong();
+
+    // int floorSpeed;
+    str->floorSpeed = SV_ReadLong();
+
+    // int floordest;
+    str->floordest = SV_ReadLong();
+
+    // int ceilingdest;
+    str->ceilingdest = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // int crush;
+    str->crush = SV_ReadLong();
+}
+
+static void StreamOut_pillar_t(thinker_t *thinker)
+{
+    pillar_t *str = (pillar_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // int ceilingSpeed;
+    SV_WriteLong(str->ceilingSpeed);
+
+    // int floorSpeed;
+    SV_WriteLong(str->floorSpeed);
+
+    // int floordest;
+    SV_WriteLong(str->floordest);
+
+    // int ceilingdest;
+    SV_WriteLong(str->ceilingdest);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // int crush;
+    SV_WriteLong(str->crush);
+}
+
+
+//
+// polydoor_t
+//
+
+static void StreamIn_polydoor_t(thinker_t *thinker)
+{
+    polydoor_t *str = (polydoor_t *) thinker;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // int polyobj;
+    str->polyobj = SV_ReadLong();
+
+    // int speed;
+    str->speed = SV_ReadLong();
+
+    // int dist;
+    str->dist = SV_ReadLong();
+
+    // int totalDist;
+    str->totalDist = SV_ReadLong();
+
+    // int direction;
+    str->direction = SV_ReadLong();
+
+    // fixed_t xSpeed, ySpeed;
+    str->xSpeed = SV_ReadLong();
+    str->ySpeed = SV_ReadLong();
+
+    // int tics;
+    str->tics = SV_ReadLong();
+
+    // int waitTics;
+    str->waitTics = SV_ReadLong();
+
+    // podoortype_t type;
+    str->type = SV_ReadLong();
+
+    // boolean close;
+    str->close = SV_ReadLong();
+}
+
+static void StreamOut_polydoor_t(thinker_t *thinker)
+{
+    polydoor_t *str = (polydoor_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // int polyobj;
+    SV_WriteLong(str->polyobj);
+
+    // int speed;
+    SV_WriteLong(str->speed);
+
+    // int dist;
+    SV_WriteLong(str->dist);
+
+    // int totalDist;
+    SV_WriteLong(str->totalDist);
+
+    // int direction;
+    SV_WriteLong(str->direction);
+
+    // fixed_t xSpeed, ySpeed;
+    SV_WriteLong(str->xSpeed);
+    SV_WriteLong(str->ySpeed);
+
+    // int tics;
+    SV_WriteLong(str->tics);
+
+    // int waitTics;
+    SV_WriteLong(str->waitTics);
+
+    // podoortype_t type;
+    SV_WriteLong(str->type);
+
+    // boolean close;
+    SV_WriteLong(str->close);
+}
+
+
+//
+// floorWaggle_t
+//
+
+static void StreamIn_floorWaggle_t(thinker_t *thinker)
+{
+    floorWaggle_t *str = (floorWaggle_t *) thinker;
+
+    int i;
+
+    // thinker_t thinker;
+    StreamIn_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    i = SV_ReadLong();
+    str->sector = &sectors[i];
+
+    // fixed_t originalHeight;
+    str->originalHeight = SV_ReadLong();
+
+    // fixed_t accumulator;
+    str->accumulator = SV_ReadLong();
+
+    // fixed_t accDelta;
+    str->accDelta = SV_ReadLong();
+
+    // fixed_t targetScale;
+    str->targetScale = SV_ReadLong();
+
+    // fixed_t scale;
+    str->scale = SV_ReadLong();
+
+    // fixed_t scaleDelta;
+    str->scaleDelta = SV_ReadLong();
+
+    // int ticker;
+    str->ticker = SV_ReadLong();
+
+    // int state;
+    str->state = SV_ReadLong();
+}
+
+static void StreamOut_floorWaggle_t(thinker_t *thinker)
+{
+    floorWaggle_t *str = (floorWaggle_t *) thinker;
+
+    // thinker_t thinker;
+    StreamOut_thinker_t(&str->thinker);
+
+    // sector_t *sector;
+    SV_WriteLong(str->sector - sectors);
+
+    // fixed_t originalHeight;
+    SV_WriteLong(str->originalHeight);
+
+    // fixed_t accumulator;
+    SV_WriteLong(str->accumulator);
+
+    // fixed_t accDelta;
+    SV_WriteLong(str->accDelta);
+
+    // fixed_t targetScale;
+    SV_WriteLong(str->targetScale);
+
+    // fixed_t scale;
+    SV_WriteLong(str->scale);
+
+    // fixed_t scaleDelta;
+    SV_WriteLong(str->scaleDelta);
+
+    // int ticker;
+    SV_WriteLong(str->ticker);
+
+    // int state;
+    SV_WriteLong(str->state);
+}
+
+
+//==========================================================================
+//
+// SV_SaveGame
+//
+//==========================================================================
+
+void SV_SaveGame(int slot, const char *description)
+{
+    char fileName[100];
+    char versionText[HXS_VERSION_TEXT_LENGTH];
+    unsigned int i;
+
+    // Open the output file
+    M_snprintf(fileName, sizeof(fileName), "%shex6.hxs", SavePath);
+    SV_OpenWrite(fileName);
+
+    // Write game save description
+    SV_Write(description, HXS_DESCRIPTION_LENGTH);
+
+    // Write version info
+    memset(versionText, 0, HXS_VERSION_TEXT_LENGTH);
+    M_StringCopy(versionText, HXS_VERSION_TEXT, HXS_VERSION_TEXT_LENGTH);
+    SV_Write(versionText, HXS_VERSION_TEXT_LENGTH);
+
+    // Place a header marker
+    SV_WriteLong(ASEG_GAME_HEADER);
+
+    // Write current map and difficulty
+    SV_WriteByte(gamemap);
+    SV_WriteByte(gameskill);
+
+    // Write global script info
+    for (i = 0; i < MAX_ACS_WORLD_VARS; ++i)
+    {
+        SV_WriteLong(WorldVars[i]);
+    }
+
+    for (i = 0; i < MAX_ACS_STORE + 1; ++i)
+    {
+        StreamOut_acsstore_t(&ACSStore[i]);
+    }
+
+    ArchivePlayers();
+
+    // Place a termination marker
+    SV_WriteLong(ASEG_END);
+
+    // Close the output file
+    SV_Close();
+
+    // Save out the current map
+    SV_SaveMap(true);           // true = save player info
+
+    // Clear all save files at destination slot
+    ClearSaveSlot(slot);
+
+    // Copy base slot to destination slot
+    CopySaveSlot(BASE_SLOT, slot);
+}
+
+//==========================================================================
+//
+// SV_SaveMap
+//
+//==========================================================================
+
+void SV_SaveMap(boolean savePlayers)
+{
+    char fileName[100];
+
+    SavingPlayers = savePlayers;
+
+    // Open the output file
+    M_snprintf(fileName, sizeof(fileName), "%shex6%02d.hxs", SavePath, gamemap);
+    SV_OpenWrite(fileName);
+
+    // Place a header marker
+    SV_WriteLong(ASEG_MAP_HEADER);
+
+    // Write the level timer
+    SV_WriteLong(leveltime);
+
+    // Set the mobj archive numbers
+    SetMobjArchiveNums();
+
+    ArchiveWorld();
+    ArchivePolyobjs();
+    ArchiveMobjs();
+    ArchiveThinkers();
+    ArchiveScripts();
+    ArchiveSounds();
+    ArchiveMisc();
+
+    // Place a termination marker
+    SV_WriteLong(ASEG_END);
+
+    // Close the output file
+    SV_Close();
+}
+
+//==========================================================================
+//
+// SV_LoadGame
+//
+//==========================================================================
+
+void SV_LoadGame(int slot)
+{
+    int i;
+    char fileName[100];
+    char version_text[HXS_VERSION_TEXT_LENGTH];
+    player_t playerBackup[MAXPLAYERS];
+    mobj_t *mobj;
+
+    // Copy all needed save files to the base slot
+    if (slot != BASE_SLOT)
+    {
+        ClearSaveSlot(BASE_SLOT);
+        CopySaveSlot(slot, BASE_SLOT);
+    }
+
+    // Create the name
+    M_snprintf(fileName, sizeof(fileName), "%shex6.hxs", SavePath);
+
+    // Load the file
+    SV_OpenRead(fileName);
+
+    // Set the save pointer and skip the description field
+    fseek(SavingFP, HXS_DESCRIPTION_LENGTH, SEEK_CUR);
+
+    // Check the version text
+
+    for (i = 0; i < sizeof(version_text); ++i)
+    {
+        version_text[i] = SV_ReadByte();
+    }
+    if (strncmp(version_text, HXS_VERSION_TEXT, HXS_VERSION_TEXT_LENGTH) != 0)
+    {                           // Bad version
+        return;
+    }
+
+    AssertSegment(ASEG_GAME_HEADER);
+
+    gameepisode = 1;
+    gamemap = SV_ReadByte();
+    gameskill = SV_ReadByte();
+
+    // Read global script info
+
+    for (i = 0; i < MAX_ACS_WORLD_VARS; ++i)
+    {
+        WorldVars[i] = SV_ReadLong();
+    }
+
+    for (i = 0; i < MAX_ACS_STORE + 1; ++i)
+    {
+        StreamIn_acsstore_t(&ACSStore[i]);
+    }
+
+    // Read the player structures
+    UnarchivePlayers();
+
+    AssertSegment(ASEG_END);
+
+    // Save player structs
+    for (i = 0; i < maxplayers; i++)
+    {
+        playerBackup[i] = players[i];
+    }
+
+    SV_Close();
+
+    // Load the current map
+    SV_LoadMap();
+
+    // Don't need the player mobj relocation info for load game
+    Z_Free(TargetPlayerAddrs);
+
+    // Restore player structs
+    inv_ptr = 0;
+    curpos = 0;
+    for (i = 0; i < maxplayers; i++)
+    {
+        mobj = players[i].mo;
+        players[i] = playerBackup[i];
+        players[i].mo = mobj;
+        if (i == consoleplayer)
+        {
+            players[i].readyArtifact = players[i].inventory[inv_ptr].type;
+        }
+    }
+
+    // Set Bestslideline after loading
+    P_InitSlideLine();
+}
+
+//==========================================================================
+//
+// SV_UpdateRebornSlot
+//
+// Copies the base slot to the reborn slot.
+//
+//==========================================================================
+
+void SV_UpdateRebornSlot(void)
+{
+    ClearSaveSlot(REBORN_SLOT);
+    CopySaveSlot(BASE_SLOT, REBORN_SLOT);
+}
+
+//==========================================================================
+//
+// SV_ClearRebornSlot
+//
+//==========================================================================
+
+void SV_ClearRebornSlot(void)
+{
+    ClearSaveSlot(REBORN_SLOT);
+}
+
+//==========================================================================
+//
+// SV_MapTeleport
+//
+//==========================================================================
+
+void SV_MapTeleport(int map, int position)
+{
+    int i;
+    int j;
+    char fileName[100];
+    player_t playerBackup[MAXPLAYERS];
+    mobj_t *targetPlayerMobj;
+    mobj_t *mobj;
+    int inventoryPtr;
+    int currentInvPos;
+    boolean rClass;
+    boolean playerWasReborn;
+    boolean oldWeaponowned[NUMWEAPONS];
+    int oldKeys = 0;
+    int oldPieces = 0;
+    int bestWeapon;
+
+    if (!deathmatch)
+    {
+        if (P_GetMapCluster(gamemap) == P_GetMapCluster(map))
+        {                       // Same cluster - save map without saving player mobjs
+            SV_SaveMap(false);
+        }
+        else
+        {                       // Entering new cluster - clear base slot
+            ClearSaveSlot(BASE_SLOT);
+        }
+    }
+
+    // Store player structs for later
+    rClass = randomclass;
+    randomclass = false;
+    for (i = 0; i < maxplayers; i++)
+    {
+        playerBackup[i] = players[i];
+    }
+
+    // Save some globals that get trashed during the load
+    inventoryPtr = inv_ptr;
+    currentInvPos = curpos;
+
+    // Only SV_LoadMap() uses TargetPlayerAddrs, so it's NULLed here
+    // for the following check (player mobj redirection)
+    TargetPlayerAddrs = NULL;
+
+    gamemap = map;
+    M_snprintf(fileName, sizeof(fileName), "%shex6%02d.hxs", SavePath, gamemap);
+    if (!deathmatch && ExistingFile(fileName))
+    {                           // Unarchive map
+        SV_LoadMap();
+    }
+    else
+    {                           // New map
+        G_InitNew(gameskill, gameepisode, gamemap);
+
+        // Destroy all freshly spawned players
+        for (i = 0; i < maxplayers; i++)
+        {
+            if (playeringame[i])
+            {
+                P_RemoveMobj(players[i].mo);
+            }
+        }
+    }
+
+    // Restore player structs
+    targetPlayerMobj = NULL;
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        players[i] = playerBackup[i];
+        P_ClearMessage(&players[i]);
+        players[i].attacker = NULL;
+        players[i].poisoner = NULL;
+
+        if (netgame)
+        {
+            if (players[i].playerstate == PST_DEAD)
+            {                   // In a network game, force all players to be alive
+                players[i].playerstate = PST_REBORN;
+            }
+            if (!deathmatch)
+            {                   // Cooperative net-play, retain keys and weapons
+                oldKeys = players[i].keys;
+                oldPieces = players[i].pieces;
+                for (j = 0; j < NUMWEAPONS; j++)
+                {
+                    oldWeaponowned[j] = players[i].weaponowned[j];
+                }
+            }
+        }
+        playerWasReborn = (players[i].playerstate == PST_REBORN);
+        if (deathmatch)
+        {
+            memset(players[i].frags, 0, sizeof(players[i].frags));
+            mobj = P_SpawnMobj(playerstarts[0][i].x << 16,
+                               playerstarts[0][i].y << 16, 0,
+                               MT_PLAYER_FIGHTER);
+            players[i].mo = mobj;
+            G_DeathMatchSpawnPlayer(i);
+            P_RemoveMobj(mobj);
+        }
+        else
+        {
+            P_SpawnPlayer(&playerstarts[position][i]);
+        }
+
+        if (playerWasReborn && netgame && !deathmatch)
+        {                       // Restore keys and weapons when reborn in co-op
+            players[i].keys = oldKeys;
+            players[i].pieces = oldPieces;
+            for (bestWeapon = 0, j = 0; j < NUMWEAPONS; j++)
+            {
+                if (oldWeaponowned[j])
+                {
+                    bestWeapon = j;
+                    players[i].weaponowned[j] = true;
+                }
+            }
+            players[i].mana[MANA_1] = 25;
+            players[i].mana[MANA_2] = 25;
+            if (bestWeapon)
+            {                   // Bring up the best weapon
+                players[i].pendingweapon = bestWeapon;
+            }
+        }
+
+        if (targetPlayerMobj == NULL)
+        {                       // The poor sap
+            targetPlayerMobj = players[i].mo;
+        }
+    }
+    randomclass = rClass;
+
+    // Redirect anything targeting a player mobj
+    if (TargetPlayerAddrs)
+    {
+        for (i = 0; i < TargetPlayerCount; i++)
+        {
+            *TargetPlayerAddrs[i] = targetPlayerMobj;
+        }
+        Z_Free(TargetPlayerAddrs);
+    }
+
+    // Destroy all things touching players
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (playeringame[i])
+        {
+            P_TeleportMove(players[i].mo, players[i].mo->x, players[i].mo->y);
+        }
+    }
+
+    // Restore trashed globals
+    inv_ptr = inventoryPtr;
+    curpos = currentInvPos;
+
+    // Launch waiting scripts
+    if (!deathmatch)
+    {
+        P_CheckACSStore();
+    }
+
+    // For single play, save immediately into the reborn slot
+    if (!netgame)
+    {
+        SV_SaveGame(REBORN_SLOT, REBORN_DESCRIPTION);
+    }
+}
+
+//==========================================================================
+//
+// SV_GetRebornSlot
+//
+//==========================================================================
+
+int SV_GetRebornSlot(void)
+{
+    return (REBORN_SLOT);
+}
+
+//==========================================================================
+//
+// SV_RebornSlotAvailable
+//
+// Returns true if the reborn slot is available.
+//
+//==========================================================================
+
+boolean SV_RebornSlotAvailable(void)
+{
+    char fileName[100];
+
+    M_snprintf(fileName, sizeof(fileName), "%shex%d.hxs", SavePath, REBORN_SLOT);
+    return ExistingFile(fileName);
+}
+
+//==========================================================================
+//
+// SV_LoadMap
+//
+//==========================================================================
+
+void SV_LoadMap(void)
+{
+    char fileName[100];
+
+    // Load a base level
+    G_InitNew(gameskill, gameepisode, gamemap);
+
+    // Remove all thinkers
+    RemoveAllThinkers();
+
+    // Create the name
+    M_snprintf(fileName, sizeof(fileName), "%shex6%02d.hxs", SavePath, gamemap);
+
+    // Load the file
+    SV_OpenRead(fileName);
+
+    AssertSegment(ASEG_MAP_HEADER);
+
+    // Read the level timer
+    leveltime = SV_ReadLong();
+
+    UnarchiveWorld();
+    UnarchivePolyobjs();
+    UnarchiveMobjs();
+    UnarchiveThinkers();
+    UnarchiveScripts();
+    UnarchiveSounds();
+    UnarchiveMisc();
+
+    AssertSegment(ASEG_END);
+
+    // Free mobj list and save buffer
+    Z_Free(MobjList);
+    SV_Close();
+}
+
+//==========================================================================
+//
+// SV_InitBaseSlot
+//
+//==========================================================================
+
+void SV_InitBaseSlot(void)
+{
+    ClearSaveSlot(BASE_SLOT);
+}
+
+//==========================================================================
+//
+// ArchivePlayers
+//
+//==========================================================================
+
+static void ArchivePlayers(void)
+{
+    int i;
+
+    SV_WriteLong(ASEG_PLAYERS);
+    for (i = 0; i < maxplayers; i++)
+    {
+        SV_WriteByte(playeringame[i]);
+    }
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        SV_WriteByte(PlayerClass[i]);
+        StreamOut_player_t(&players[i]);
+    }
+}
+
+//==========================================================================
+//
+// UnarchivePlayers
+//
+//==========================================================================
+
+static void UnarchivePlayers(void)
+{
+    int i;
+
+    AssertSegment(ASEG_PLAYERS);
+    for (i = 0; i < maxplayers; i++)
+    {
+        playeringame[i] = SV_ReadByte();
+    }
+    for (i = 0; i < maxplayers; i++)
+    {
+        if (!playeringame[i])
+        {
+            continue;
+        }
+        PlayerClass[i] = SV_ReadByte();
+        StreamIn_player_t(&players[i]);
+        P_ClearMessage(&players[i]);
+    }
+}
+
+//==========================================================================
+//
+// ArchiveWorld
+//
+//==========================================================================
+
+static void ArchiveWorld(void)
+{
+    int i;
+    int j;
+    sector_t *sec;
+    line_t *li;
+    side_t *si;
+
+    SV_WriteLong(ASEG_WORLD);
+    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
+    {
+        SV_WriteWord(sec->floorheight >> FRACBITS);
+        SV_WriteWord(sec->ceilingheight >> FRACBITS);
+        SV_WriteWord(sec->floorpic);
+        SV_WriteWord(sec->ceilingpic);
+        SV_WriteWord(sec->lightlevel);
+        SV_WriteWord(sec->special);
+        SV_WriteWord(sec->tag);
+        SV_WriteWord(sec->seqType);
+    }
+    for (i = 0, li = lines; i < numlines; i++, li++)
+    {
+        SV_WriteWord(li->flags);
+        SV_WriteByte(li->special);
+        SV_WriteByte(li->arg1);
+        SV_WriteByte(li->arg2);
+        SV_WriteByte(li->arg3);
+        SV_WriteByte(li->arg4);
+        SV_WriteByte(li->arg5);
+        for (j = 0; j < 2; j++)
+        {
+            if (li->sidenum[j] == -1)
+            {
+                continue;
+            }
+            si = &sides[li->sidenum[j]];
+            SV_WriteWord(si->textureoffset >> FRACBITS);
+            SV_WriteWord(si->rowoffset >> FRACBITS);
+            SV_WriteWord(si->toptexture);
+            SV_WriteWord(si->bottomtexture);
+            SV_WriteWord(si->midtexture);
+        }
+    }
+}
+
+//==========================================================================
+//
+// UnarchiveWorld
+//
+//==========================================================================
+
+static void UnarchiveWorld(void)
+{
+    int i;
+    int j;
+    sector_t *sec;
+    line_t *li;
+    side_t *si;
+
+    AssertSegment(ASEG_WORLD);
+    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
+    {
+        sec->floorheight = SV_ReadWord() << FRACBITS;
+        sec->ceilingheight = SV_ReadWord() << FRACBITS;
+        sec->floorpic = SV_ReadWord();
+        sec->ceilingpic = SV_ReadWord();
+        sec->lightlevel = SV_ReadWord();
+        sec->special = SV_ReadWord();
+        sec->tag = SV_ReadWord();
+        sec->seqType = SV_ReadWord();
+        sec->specialdata = 0;
+        sec->soundtarget = 0;
+    }
+    for (i = 0, li = lines; i < numlines; i++, li++)
+    {
+        li->flags = SV_ReadWord();
+        li->special = SV_ReadByte();
+        li->arg1 = SV_ReadByte();
+        li->arg2 = SV_ReadByte();
+        li->arg3 = SV_ReadByte();
+        li->arg4 = SV_ReadByte();
+        li->arg5 = SV_ReadByte();
+        for (j = 0; j < 2; j++)
+        {
+            if (li->sidenum[j] == -1)
+            {
+                continue;
+            }
+            si = &sides[li->sidenum[j]];
+            si->textureoffset = SV_ReadWord() << FRACBITS;
+            si->rowoffset = SV_ReadWord() << FRACBITS;
+            si->toptexture = SV_ReadWord();
+            si->bottomtexture = SV_ReadWord();
+            si->midtexture = SV_ReadWord();
+        }
+    }
+}
+
+//==========================================================================
+//
+// SetMobjArchiveNums
+//
+// Sets the archive numbers in all mobj structs.  Also sets the MobjCount
+// global.  Ignores player mobjs if SavingPlayers is false.
+//
+//==========================================================================
+
+static void SetMobjArchiveNums(void)
+{
+    mobj_t *mobj;
+    thinker_t *thinker;
+
+    MobjCount = 0;
+    for (thinker = thinkercap.next; thinker != &thinkercap;
+         thinker = thinker->next)
+    {
+        if (thinker->function == P_MobjThinker)
+        {
+            mobj = (mobj_t *) thinker;
+            if (mobj->player && !SavingPlayers)
+            {                   // Skipping player mobjs
+                continue;
+            }
+            mobj->archiveNum = MobjCount++;
+        }
+    }
+}
+
+//==========================================================================
+//
+// ArchiveMobjs
+//
+//==========================================================================
+
+static void ArchiveMobjs(void)
+{
+    int count;
+    thinker_t *thinker;
+
+    SV_WriteLong(ASEG_MOBJS);
+    SV_WriteLong(MobjCount);
+    count = 0;
+    for (thinker = thinkercap.next; thinker != &thinkercap;
+         thinker = thinker->next)
+    {
+        if (thinker->function != P_MobjThinker)
+        {                       // Not a mobj thinker
+            continue;
+        }
+        if (((mobj_t *) thinker)->player && !SavingPlayers)
+        {                       // Skipping player mobjs
+            continue;
+        }
+        count++;
+        StreamOut_mobj_t((mobj_t *) thinker);
+    }
+    if (count != MobjCount)
+    {
+        I_Error("ArchiveMobjs: bad mobj count");
+    }
+}
+
+//==========================================================================
+//
+// UnarchiveMobjs
+//
+//==========================================================================
+
+static void UnarchiveMobjs(void)
+{
+    int i;
+    mobj_t *mobj;
+
+    AssertSegment(ASEG_MOBJS);
+    TargetPlayerAddrs = Z_Malloc(MAX_TARGET_PLAYERS * sizeof(mobj_t **),
+                                 PU_STATIC, NULL);
+    TargetPlayerCount = 0;
+    MobjCount = SV_ReadLong();
+    MobjList = Z_Malloc(MobjCount * sizeof(mobj_t *), PU_STATIC, NULL);
+    for (i = 0; i < MobjCount; i++)
+    {
+        MobjList[i] = Z_Malloc(sizeof(mobj_t), PU_LEVEL, NULL);
+    }
+    for (i = 0; i < MobjCount; i++)
+    {
+        mobj = MobjList[i];
+        StreamIn_mobj_t(mobj);
+
+        // Restore broken pointers.
+        mobj->info = &mobjinfo[mobj->type];
+        P_SetThingPosition(mobj);
+        mobj->floorz = mobj->subsector->sector->floorheight;
+        mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+
+        mobj->thinker.function = P_MobjThinker;
+        P_AddThinker(&mobj->thinker);
+    }
+    P_CreateTIDList();
+    P_InitCreatureCorpseQueue(true);    // true = scan for corpses
+}
+
+//==========================================================================
+//
+// GetMobjNum
+//
+//==========================================================================
+
+static int GetMobjNum(mobj_t * mobj)
+{
+    if (mobj == NULL)
+    {
+        return MOBJ_NULL;
+    }
+    if (mobj->player && !SavingPlayers)
+    {
+        return MOBJ_XX_PLAYER;
+    }
+    return mobj->archiveNum;
+}
+
+//==========================================================================
+//
+// SetMobjPtr
+//
+//==========================================================================
+
+static void SetMobjPtr(mobj_t **ptr, unsigned int archiveNum)
+{
+    if (archiveNum == MOBJ_NULL)
+    {
+        *ptr = NULL;
+    }
+    else if (archiveNum == MOBJ_XX_PLAYER)
+    {
+        if (TargetPlayerCount == MAX_TARGET_PLAYERS)
+        {
+            I_Error("RestoreMobj: exceeded MAX_TARGET_PLAYERS");
+        }
+        TargetPlayerAddrs[TargetPlayerCount++] = ptr;
+        *ptr = NULL;
+    }
+    else
+    {
+        *ptr = MobjList[archiveNum];
+    }
+}
+
+//==========================================================================
+//
+// Thinker types list.
+//
+// This is used by ArchiveThinkers and UnarchiveThinkers, below.
+//
+// Original comment:
+// "This list has been prioritized using frequency estimates"
+//
+//==========================================================================
+
+static thinkInfo_t ThinkerInfo[] = {
+    {
+     TC_MOVE_FLOOR,
+     T_MoveFloor,
+     StreamOut_floormove_t,
+     StreamIn_floormove_t,
+     RestoreSSThinker,
+     sizeof(floormove_t)
+    },
+    {
+     TC_PLAT_RAISE,
+     T_PlatRaise,
+     StreamOut_plat_t,
+     StreamIn_plat_t,
+     RestorePlatRaise,
+     sizeof(plat_t)
+    },
+    {
+     TC_MOVE_CEILING,
+     T_MoveCeiling,
+     StreamOut_ceiling_t,
+     StreamIn_ceiling_t,
+     RestoreMoveCeiling,
+     sizeof(ceiling_t)
+    },
+    {
+     TC_LIGHT,
+     T_Light,
+     StreamOut_light_t,
+     StreamIn_light_t,
+     NULL,
+     sizeof(light_t)
+    },
+    {
+     TC_VERTICAL_DOOR,
+     T_VerticalDoor,
+     StreamOut_vldoor_t,
+     StreamIn_vldoor_t,
+     RestoreSSThinker,
+     sizeof(vldoor_t)
+    },
+    {
+     TC_PHASE,
+     T_Phase,
+     StreamOut_phase_t,
+     StreamIn_phase_t,
+     NULL,
+     sizeof(phase_t)
+    },
+    {
+     TC_INTERPRET_ACS,
+     T_InterpretACS,
+     StreamOut_acs_t,
+     StreamIn_acs_t,
+     NULL,
+     sizeof(acs_t)
+    },
+    {
+     TC_ROTATE_POLY,
+     T_RotatePoly,
+     StreamOut_polyevent_t,
+     StreamIn_polyevent_t,
+     NULL,
+     sizeof(polyevent_t)
+    },
+    {
+     TC_BUILD_PILLAR,
+     T_BuildPillar,
+     StreamOut_pillar_t,
+     StreamIn_pillar_t,
+     RestoreSSThinker,
+     sizeof(pillar_t)
+    },
+    {
+     TC_MOVE_POLY,
+     T_MovePoly,
+     StreamOut_polyevent_t,
+     StreamIn_polyevent_t,
+     NULL,
+     sizeof(polyevent_t)
+    },
+    {
+     TC_POLY_DOOR,
+     T_PolyDoor,
+     StreamOut_polydoor_t,
+     StreamIn_polydoor_t,
+     NULL,
+     sizeof(polydoor_t)
+    },
+    {
+     TC_FLOOR_WAGGLE,
+     T_FloorWaggle,
+     StreamOut_floorWaggle_t,
+     StreamIn_floorWaggle_t,
+     RestoreSSThinker,
+     sizeof(floorWaggle_t)
+    },
+    { TC_NULL, NULL, NULL, NULL, NULL, 0},
+};
+
+//==========================================================================
+//
+// ArchiveThinkers
+//
+//==========================================================================
+
+static void ArchiveThinkers(void)
+{
+    thinker_t *thinker;
+    thinkInfo_t *info;
+
+    SV_WriteLong(ASEG_THINKERS);
+    for (thinker = thinkercap.next; thinker != &thinkercap;
+         thinker = thinker->next)
+    {
+        for (info = ThinkerInfo; info->tClass != TC_NULL; info++)
+        {
+            if (thinker->function == info->thinkerFunc)
+            {
+                SV_WriteByte(info->tClass);
+                info->writeFunc(thinker);
+                break;
+            }
+        }
+    }
+    // Add a termination marker
+    SV_WriteByte(TC_NULL);
+}
+
+//==========================================================================
+//
+// UnarchiveThinkers
+//
+//==========================================================================
+
+static void UnarchiveThinkers(void)
+{
+    int tClass;
+    thinker_t *thinker;
+    thinkInfo_t *info;
+
+    AssertSegment(ASEG_THINKERS);
+    while ((tClass = SV_ReadByte()) != TC_NULL)
+    {
+        for (info = ThinkerInfo; info->tClass != TC_NULL; info++)
+        {
+            if (tClass == info->tClass)
+            {
+                thinker = Z_Malloc(info->size, PU_LEVEL, NULL);
+                info->readFunc(thinker);
+                thinker->function = info->thinkerFunc;
+                if (info->restoreFunc)
+                {
+                    info->restoreFunc(thinker);
+                }
+                P_AddThinker(thinker);
+                break;
+            }
+        }
+        if (info->tClass == TC_NULL)
+        {
+            I_Error("UnarchiveThinkers: Unknown tClass %d in "
+                    "savegame", tClass);
+        }
+    }
+}
+
+//==========================================================================
+//
+// RestoreSSThinker
+//
+//==========================================================================
+
+static void RestoreSSThinker(thinker_t *thinker)
+{
+    ssthinker_t *sst = (ssthinker_t *) thinker;
+    sst->sector->specialdata = sst->thinker.function;
+}
+
+//==========================================================================
+//
+// RestorePlatRaise
+//
+//==========================================================================
+
+static void RestorePlatRaise(thinker_t *thinker)
+{
+    plat_t *plat = (plat_t *) thinker;
+    plat->sector->specialdata = T_PlatRaise;
+    P_AddActivePlat(plat);
+}
+
+//==========================================================================
+//
+// RestoreMoveCeiling
+//
+//==========================================================================
+
+static void RestoreMoveCeiling(thinker_t *thinker)
+{
+    ceiling_t *ceiling = (ceiling_t *) thinker;
+    ceiling->sector->specialdata = T_MoveCeiling;
+    P_AddActiveCeiling(ceiling);
+}
+
+//==========================================================================
+//
+// ArchiveScripts
+//
+//==========================================================================
+
+static void ArchiveScripts(void)
+{
+    int i;
+
+    SV_WriteLong(ASEG_SCRIPTS);
+    for (i = 0; i < ACScriptCount; i++)
+    {
+        SV_WriteWord(ACSInfo[i].state);
+        SV_WriteWord(ACSInfo[i].waitValue);
+    }
+
+    for (i = 0; i< MAX_ACS_MAP_VARS; ++i)
+    {
+        SV_WriteLong(MapVars[i]);
+    }
+}
+
+//==========================================================================
+//
+// UnarchiveScripts
+//
+//==========================================================================
+
+static void UnarchiveScripts(void)
+{
+    int i;
+
+    AssertSegment(ASEG_SCRIPTS);
+    for (i = 0; i < ACScriptCount; i++)
+    {
+        ACSInfo[i].state = SV_ReadWord();
+        ACSInfo[i].waitValue = SV_ReadWord();
+    }
+
+    for (i = 0; i < MAX_ACS_MAP_VARS; ++i)
+    {
+        MapVars[i] = SV_ReadLong();
+    }
+}
+
+//==========================================================================
+//
+// ArchiveMisc
+//
+//==========================================================================
+
+static void ArchiveMisc(void)
+{
+    int ix;
+
+    SV_WriteLong(ASEG_MISC);
+    for (ix = 0; ix < maxplayers; ix++)
+    {
+        SV_WriteLong(localQuakeHappening[ix]);
+    }
+}
+
+//==========================================================================
+//
+// UnarchiveMisc
+//
+//==========================================================================
+
+static void UnarchiveMisc(void)
+{
+    int ix;
+
+    AssertSegment(ASEG_MISC);
+    for (ix = 0; ix < maxplayers; ix++)
+    {
+        localQuakeHappening[ix] = SV_ReadLong();
+    }
+}
+
+//==========================================================================
+//
+// RemoveAllThinkers
+//
+//==========================================================================
+
+static void RemoveAllThinkers(void)
+{
+    thinker_t *thinker;
+    thinker_t *nextThinker;
+
+    thinker = thinkercap.next;
+    while (thinker != &thinkercap)
+    {
+        nextThinker = thinker->next;
+        if (thinker->function == P_MobjThinker)
+        {
+            P_RemoveMobj((mobj_t *) thinker);
+        }
+        else
+        {
+            Z_Free(thinker);
+        }
+        thinker = nextThinker;
+    }
+    P_InitThinkers();
+}
+
+//==========================================================================
+//
+// ArchiveSounds
+//
+//==========================================================================
+
+static void ArchiveSounds(void)
+{
+    seqnode_t *node;
+    sector_t *sec;
+    int difference;
+    int i;
+
+    SV_WriteLong(ASEG_SOUNDS);
+
+    // Save the sound sequences
+    SV_WriteLong(ActiveSequences);
+    for (node = SequenceListHead; node; node = node->next)
+    {
+        SV_WriteLong(node->sequence);
+        SV_WriteLong(node->delayTics);
+        SV_WriteLong(node->volume);
+        SV_WriteLong(SN_GetSequenceOffset(node->sequence,
+                                           node->sequencePtr));
+        SV_WriteLong(node->currentSoundID);
+        for (i = 0; i < po_NumPolyobjs; i++)
+        {
+            if (node->mobj == (mobj_t *) & polyobjs[i].startSpot)
+            {
+                break;
+            }
+        }
+        if (i == po_NumPolyobjs)
+        {                       // Sound is attached to a sector, not a polyobj
+            sec = R_PointInSubsector(node->mobj->x, node->mobj->y)->sector;
+            difference = (int) ((byte *) sec
+                                - (byte *) & sectors[0]) / sizeof(sector_t);
+            SV_WriteLong(0);   // 0 -- sector sound origin
+        }
+        else
+        {
+            SV_WriteLong(1);   // 1 -- polyobj sound origin
+            difference = i;
+        }
+        SV_WriteLong(difference);
+    }
+}
+
+//==========================================================================
+//
+// UnarchiveSounds
+//
+//==========================================================================
+
+static void UnarchiveSounds(void)
+{
+    int i;
+    int numSequences;
+    int sequence;
+    int delayTics;
+    int volume;
+    int seqOffset;
+    int soundID;
+    int polySnd;
+    int secNum;
+    mobj_t *sndMobj;
+
+    AssertSegment(ASEG_SOUNDS);
+
+    // Reload and restart all sound sequences
+    numSequences = SV_ReadLong();
+    i = 0;
+    while (i < numSequences)
+    {
+        sequence = SV_ReadLong();
+        delayTics = SV_ReadLong();
+        volume = SV_ReadLong();
+        seqOffset = SV_ReadLong();
+
+        soundID = SV_ReadLong();
+        polySnd = SV_ReadLong();
+        secNum = SV_ReadLong();
+        if (!polySnd)
+        {
+            sndMobj = (mobj_t *) & sectors[secNum].soundorg;
+        }
+        else
+        {
+            sndMobj = (mobj_t *) & polyobjs[secNum].startSpot;
+        }
+        SN_StartSequence(sndMobj, sequence);
+        SN_ChangeNodeData(i, seqOffset, delayTics, volume, soundID);
+        i++;
+    }
+}
+
+//==========================================================================
+//
+// ArchivePolyobjs
+//
+//==========================================================================
+
+static void ArchivePolyobjs(void)
+{
+    int i;
+
+    SV_WriteLong(ASEG_POLYOBJS);
+    SV_WriteLong(po_NumPolyobjs);
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        SV_WriteLong(polyobjs[i].tag);
+        SV_WriteLong(polyobjs[i].angle);
+        SV_WriteLong(polyobjs[i].startSpot.x);
+        SV_WriteLong(polyobjs[i].startSpot.y);
+    }
+}
+
+//==========================================================================
+//
+// UnarchivePolyobjs
+//
+//==========================================================================
+
+static void UnarchivePolyobjs(void)
+{
+    int i;
+    fixed_t deltaX;
+    fixed_t deltaY;
+
+    AssertSegment(ASEG_POLYOBJS);
+    if (SV_ReadLong() != po_NumPolyobjs)
+    {
+        I_Error("UnarchivePolyobjs: Bad polyobj count");
+    }
+    for (i = 0; i < po_NumPolyobjs; i++)
+    {
+        if (SV_ReadLong() != polyobjs[i].tag)
+        {
+            I_Error("UnarchivePolyobjs: Invalid polyobj tag");
+        }
+        PO_RotatePolyobj(polyobjs[i].tag, (angle_t) SV_ReadLong());
+        deltaX = SV_ReadLong() - polyobjs[i].startSpot.x;
+        deltaY = SV_ReadLong() - polyobjs[i].startSpot.y;
+        PO_MovePolyobj(polyobjs[i].tag, deltaX, deltaY);
+    }
+}
+
+//==========================================================================
+//
+// AssertSegment
+//
+//==========================================================================
+
+static void AssertSegment(gameArchiveSegment_t segType)
+{
+    if (SV_ReadLong() != segType)
+    {
+        I_Error("Corrupt save game: Segment [%d] failed alignment check",
+                segType);
+    }
+}
+
+//==========================================================================
+//
+// ClearSaveSlot
+//
+// Deletes all save game files associated with a slot number.
+//
+//==========================================================================
+
+static void ClearSaveSlot(int slot)
+{
+    int i;
+    char fileName[100];
+
+    for (i = 0; i < MAX_MAPS; i++)
+    {
+        M_snprintf(fileName, sizeof(fileName),
+                   "%shex%d%02d.hxs", SavePath, slot, i);
+        M_remove(fileName);
+    }
+    M_snprintf(fileName, sizeof(fileName), "%shex%d.hxs", SavePath, slot);
+    M_remove(fileName);
+}
+
+//==========================================================================
+//
+// CopySaveSlot
+//
+// Copies all the save game files from one slot to another.
+//
+//==========================================================================
+
+static void CopySaveSlot(int sourceSlot, int destSlot)
+{
+    int i;
+    char sourceName[100];
+    char destName[100];
+
+    for (i = 0; i < MAX_MAPS; i++)
+    {
+        M_snprintf(sourceName, sizeof(sourceName),
+                   "%shex%d%02d.hxs", SavePath, sourceSlot, i);
+        if (ExistingFile(sourceName))
+        {
+            M_snprintf(destName, sizeof(destName),
+                       "%shex%d%02d.hxs", SavePath, destSlot, i);
+            CopyFile(sourceName, destName);
+        }
+    }
+    M_snprintf(sourceName, sizeof(sourceName),
+               "%shex%d.hxs", SavePath, sourceSlot);
+    if (ExistingFile(sourceName))
+    {
+        M_snprintf(destName, sizeof(destName),
+                   "%shex%d.hxs", SavePath, destSlot);
+        CopyFile(sourceName, destName);
+    }
+    else
+    {
+        I_Error("Could not load savegame %s", sourceName);
+    }
+}
+
+//==========================================================================
+//
+// CopyFile
+//
+// This function was rewritten to copy files with minimal strain on zone
+// allocation and allow for big maps that technically work in vanilla to
+// save without error.
+//==========================================================================
+
+static void CopyFile(char *source_name, char *dest_name)
+{
+    const int BUFFER_CHUNK_SIZE = 0x10000;
+
+    byte *buffer;
+    int file_length, file_remaining;
+    FILE *read_handle, *write_handle;
+    int buf_count, read_count, write_count;
+
+    read_handle = M_fopen(source_name, "rb");
+    if (read_handle == NULL)
+    {
+        I_Error ("Couldn't read file %s", source_name);
+    }
+    file_length = file_remaining = M_FileLength(read_handle);
+
+    // Vanilla savegame emulation.
+    //
+    // CopyFile() typically calls M_ReadFile() which stores the entire file
+    // in memory: Chocolate Hexen should force an allocation error here
+    // whenever it's appropriate.
+
+    if (vanilla_savegame_limit)
+    {
+        buffer = Z_Malloc(file_length, PU_STATIC, NULL);
+        Z_Free(buffer);
+    }
+
+    write_handle = M_fopen(dest_name, "wb");
+    if (write_handle == NULL)
+    {
+        I_Error ("Couldn't read file %s", dest_name);
+    }
+
+    buffer = Z_Malloc (BUFFER_CHUNK_SIZE, PU_STATIC, NULL);
+
+    do
+    {
+        buf_count = BUFFER_CHUNK_SIZE;
+        if( file_remaining < BUFFER_CHUNK_SIZE)
+        {
+            buf_count = file_remaining;
+        }
+
+        read_count = fread(buffer, 1, buf_count, read_handle);
+        if (read_count < buf_count)
+        {
+            I_Error ("Couldn't read file %s", source_name);
+        }
+
+        write_count = fwrite(buffer, 1, buf_count, write_handle);
+        if (write_count < buf_count)
+        {
+            I_Error ("Couldn't write to file %s", dest_name);
+        }
+
+        file_remaining -= buf_count;
+    } while (file_remaining > 0);
+
+    Z_Free(buffer);
+    fclose(read_handle);
+    fclose(write_handle);
+}
+
+//==========================================================================
+//
+// ExistingFile
+//
+//==========================================================================
+
+static boolean ExistingFile(char *name)
+{
+    FILE *fp;
+
+    if ((fp = M_fopen(name, "rb")) != NULL)
+    {
+        fclose(fp);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+//==========================================================================
+//
+// SV_Open
+//
+//==========================================================================
+
+static void SV_OpenRead(char *fileName)
+{
+    SavingFP = M_fopen(fileName, "rb");
+
+    // Should never happen, only if hex6.hxs cannot ever be created.
+    if (SavingFP == NULL)
+    {
+        I_Error("Could not load savegame %s", fileName);
+    }
+}
+
+static void SV_OpenWrite(char *fileName)
+{
+    SavingFP = M_fopen(fileName, "wb");
+}
+
+//==========================================================================
+//
+// SV_Close
+//
+//==========================================================================
+
+static void SV_Close(void)
+{
+    if (SavingFP)
+    {
+        fclose(SavingFP);
+        SavingFP = NULL;
+    }
+}
+
+//==========================================================================
+//
+// SV_Read
+//
+//==========================================================================
+
+static void SV_Read(void *buffer, int size)
+{
+    int retval = fread(buffer, 1, size, SavingFP);
+    if (retval != size)
+    {
+        I_Error("Incomplete read in SV_Read: Expected %d, got %d bytes",
+            size, retval);
+    }
+}
+
+static byte SV_ReadByte(void)
+{
+    byte result;
+    SV_Read(&result, sizeof(byte));
+    return result;
+}
+
+static uint16_t SV_ReadWord(void)
+{
+    uint16_t result;
+    SV_Read(&result, sizeof(unsigned short));
+    return SHORT(result);
+}
+
+static uint32_t SV_ReadLong(void)
+{
+    uint32_t result;
+    SV_Read(&result, sizeof(int));
+    return LONG(result);
+}
+
+static void *SV_ReadPtr(void)
+{
+    return (void *) (intptr_t) SV_ReadLong();
+}
+
+//==========================================================================
+//
+// SV_Write
+//
+//==========================================================================
+
+static void SV_Write(const void *buffer, int size)
+{
+    fwrite(buffer, size, 1, SavingFP);
+}
+
+static void SV_WriteByte(byte val)
+{
+    fwrite(&val, sizeof(byte), 1, SavingFP);
+}
+
+static void SV_WriteWord(unsigned short val)
+{
+    val = SHORT(val);
+    fwrite(&val, sizeof(unsigned short), 1, SavingFP);
+}
+
+static void SV_WriteLong(unsigned int val)
+{
+    val = LONG(val);
+    fwrite(&val, sizeof(int), 1, SavingFP);
+}
+
+static void SV_WritePtr(void *val)
+{
+    long ptr;
+
+    // Write a pointer value. In Vanilla Hexen pointers are 32-bit but
+    // nowadays they might be larger. Whatever value we write here isn't
+    // going to be much use when we reload the game.
+
+    ptr = (long)(intptr_t) val;
+    SV_WriteLong((unsigned int) (ptr & 0xffffffff));
+}
diff --git a/games/NXDoom/src/hexen/textdefs.h b/games/NXDoom/src/hexen/textdefs.h
new file mode 100644
index 000000000..febeb178d
--- /dev/null
+++ b/games/NXDoom/src/hexen/textdefs.h
@@ -0,0 +1,172 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+// MN_menu.c ---------------------------------------------------------------
+
+#define PRESSKEY	"press a key."
+#define PRESSYN		"press y or n."
+#define TXT_PAUSED	"PAUSED"
+#define QUITMSG		"are you sure you want to\nquit this great game?"
+#define LOADNET		"you can't do load while in a net game!\n\n"PRESSKEY
+#define QLOADNET	"you can't quickload during a netgame!\n\n"PRESSKEY
+#define QSAVESPOT	"you haven't picked a quicksave slot yet!\n\n"PRESSKEY
+#define SAVEDEAD 	"you can't save if you aren't playing!\n\n"PRESSKEY
+#define QSPROMPT 	"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
+#define QLPROMPT	"do you want to quickload the game named"\
+					"\n\n'%s'?\n\n"PRESSYN
+#define NEWGAME		"you can't start a new game\n"\
+					"while in a network game.\n\n"PRESSKEY
+#define MSGOFF		"Messages OFF"
+#define MSGON		"Messages ON"
+#define NETEND		"you can't end a netgame!\n\n"PRESSKEY
+#define ENDGAME		"are you sure you want to end the game?\n\n"PRESSYN
+#define DOSY		"(press y to quit to dos.)"
+#define TXT_GAMMA_LEVEL_OFF	"GAMMA CORRECTION OFF"
+#define TXT_GAMMA_LEVEL_1	"GAMMA CORRECTION LEVEL 1"
+#define TXT_GAMMA_LEVEL_2	"GAMMA CORRECTION LEVEL 2"
+#define TXT_GAMMA_LEVEL_3	"GAMMA CORRECTION LEVEL 3"
+#define TXT_GAMMA_LEVEL_4	"GAMMA CORRECTION LEVEL 4"
+#define	EMPTYSTRING	"empty slot"
+
+// P_inter.c ---------------------------------------------------------------
+
+// Mana
+
+#define TXT_MANA_1				"BLUE MANA"
+#define TXT_MANA_2				"GREEN MANA"
+#define TXT_MANA_BOTH			"COMBINED MANA"
+
+// Keys
+
+#define	TXT_KEY_STEEL		"STEEL KEY"
+#define	TXT_KEY_CAVE		"CAVE KEY"
+#define	TXT_KEY_AXE			"AXE KEY"
+#define	TXT_KEY_FIRE		"FIRE KEY"
+#define	TXT_KEY_EMERALD		"EMERALD KEY"
+#define	TXT_KEY_DUNGEON		"DUNGEON KEY"
+#define	TXT_KEY_SILVER		"SILVER KEY"
+#define	TXT_KEY_RUSTED		"RUSTED KEY"
+#define	TXT_KEY_HORN		"HORN KEY"
+#define	TXT_KEY_SWAMP		"SWAMP KEY"
+#define TXT_KEY_CASTLE		"CASTLE KEY"
+
+// Artifacts
+
+#define TXT_ARTIINVULNERABILITY		"ICON OF THE DEFENDER"
+#define TXT_ARTIHEALTH				"QUARTZ FLASK"
+#define TXT_ARTISUPERHEALTH			"MYSTIC URN"
+#define TXT_ARTISUMMON				"DARK SERVANT"
+#define TXT_ARTITORCH				"TORCH"
+#define TXT_ARTIEGG					"PORKALATOR"
+#define TXT_ARTIFLY					"WINGS OF WRATH"
+#define TXT_ARTITELEPORT			"CHAOS DEVICE"
+#define TXT_ARTIPOISONBAG			"FLECHETTE"
+#define TXT_ARTITELEPORTOTHER		"BANISHMENT DEVICE"
+#define TXT_ARTISPEED				"BOOTS OF SPEED"
+#define TXT_ARTIBOOSTMANA			"KRATER OF MIGHT"
+#define TXT_ARTIBOOSTARMOR			"DRAGONSKIN BRACERS"
+#define TXT_ARTIBLASTRADIUS			"DISC OF REPULSION"
+#define TXT_ARTIHEALINGRADIUS		"MYSTIC AMBIT INCANT"
+
+// Puzzle artifacts
+
+#define TXT_ARTIPUZZSKULL			"YORICK'S SKULL"
+#define TXT_ARTIPUZZGEMBIG			"HEART OF D'SPARIL"
+#define TXT_ARTIPUZZGEMRED			"RUBY PLANET"
+#define TXT_ARTIPUZZGEMGREEN1		"EMERALD PLANET"
+#define TXT_ARTIPUZZGEMGREEN2		"EMERALD PLANET"
+#define TXT_ARTIPUZZGEMBLUE1		"SAPPHIRE PLANET"
+#define TXT_ARTIPUZZGEMBLUE2		"SAPPHIRE PLANET"
+#define TXT_ARTIPUZZBOOK1			"DAEMON CODEX"
+#define TXT_ARTIPUZZBOOK2			"LIBER OSCURA"
+#define TXT_ARTIPUZZSKULL2			"FLAME MASK"
+#define TXT_ARTIPUZZFWEAPON			"GLAIVE SEAL"
+#define TXT_ARTIPUZZCWEAPON			"HOLY RELIC"
+#define TXT_ARTIPUZZMWEAPON			"SIGIL OF THE MAGUS"
+#define TXT_ARTIPUZZGEAR			"CLOCK GEAR"
+#define TXT_USEPUZZLEFAILED			"YOU CANNOT USE THIS HERE"
+
+// Items
+
+#define TXT_ITEMHEALTH			"CRYSTAL VIAL"
+#define TXT_ITEMBAGOFHOLDING	"BAG OF HOLDING"
+#define TXT_ITEMSHIELD1			"SILVER SHIELD"
+#define TXT_ITEMSHIELD2			"ENCHANTED SHIELD"
+#define TXT_ITEMSUPERMAP		"MAP SCROLL"
+#define TXT_ARMOR1				"MESH ARMOR"
+#define TXT_ARMOR2				"FALCON SHIELD"
+#define TXT_ARMOR3				"PLATINUM HELMET"
+#define TXT_ARMOR4				"AMULET OF WARDING"
+
+// Weapons
+
+#define TXT_WEAPON_F2			"TIMON'S AXE"
+#define TXT_WEAPON_F3			"HAMMER OF RETRIBUTION"
+#define TXT_WEAPON_F4			"QUIETUS ASSEMBLED"
+#define TXT_WEAPON_C2			"SERPENT STAFF"
+#define TXT_WEAPON_C3			"FIRESTORM"
+#define TXT_WEAPON_C4			"WRAITHVERGE ASSEMBLED"
+#define TXT_WEAPON_M2			"FROST SHARDS"
+#define TXT_WEAPON_M3			"ARC OF DEATH"
+#define TXT_WEAPON_M4			"BLOODSCOURGE ASSEMBLED"
+#define TXT_QUIETUS_PIECE		"SEGMENT OF QUIETUS"
+#define TXT_WRAITHVERGE_PIECE	"SEGMENT OF WRAITHVERGE"
+#define TXT_BLOODSCOURGE_PIECE	"SEGMENT OF BLOODSCOURGE"
+
+// SB_bar.c ----------------------------------------------------------------
+
+#define TXT_CHEATGODON			"GOD MODE ON"
+#define TXT_CHEATGODOFF			"GOD MODE OFF"
+#define TXT_CHEATNOCLIPON		"NO CLIPPING ON"
+#define TXT_CHEATNOCLIPOFF		"NO CLIPPING OFF"
+#define TXT_CHEATWEAPONS		"ALL WEAPONS"
+#define TXT_CHEATHEALTH			"FULL HEALTH"
+#define TXT_CHEATKEYS			"ALL KEYS"
+#define TXT_CHEATSOUNDON		"SOUND DEBUG ON"
+#define TXT_CHEATSOUNDOFF		"SOUND DEBUG OFF"
+#define TXT_CHEATTICKERON		"TICKER ON"
+#define TXT_CHEATTICKEROFF		"TICKER OFF"
+#define TXT_CHEATARTIFACTS3		"ALL ARTIFACTS"
+#define TXT_CHEATARTIFACTSFAIL	"BAD INPUT"
+#define TXT_CHEATWARP			"LEVEL WARP"
+#define TXT_CHEATSCREENSHOT		"SCREENSHOT"
+#define TXT_CHEATIDDQD			"TRYING TO CHEAT, EH?  NOW YOU DIE!"
+#define TXT_CHEATIDKFA			"CHEATER - YOU DON'T DESERVE WEAPONS"
+#define TXT_CHEATBADINPUT		"BAD INPUT"
+#define TXT_CHEATNOMAP			"CAN'T FIND MAP"
+
+// G_game.c ----------------------------------------------------------------
+
+#define TXT_GAMESAVED			"GAME SAVED"
+
+// M_misc.c ----------------------------------------------------------------
+
+#define HUSTR_CHATMACRO1 "I'm ready to kick butt!"
+#define HUSTR_CHATMACRO2 "I'm OK."
+#define HUSTR_CHATMACRO3 "I'm not looking too good!"
+#define HUSTR_CHATMACRO4 "Help!"
+#define HUSTR_CHATMACRO5 "You suck!"
+#define HUSTR_CHATMACRO6 "Next time, scumbag..."
+#define HUSTR_CHATMACRO7 "Come here!"
+#define HUSTR_CHATMACRO8 "I'll take care of it."
+#define HUSTR_CHATMACRO9 "Yes"
+#define HUSTR_CHATMACRO0 "No"
+
+// AM_map.c ----------------------------------------------------------------
+
+#define AMSTR_FOLLOWON		"FOLLOW MODE ON"
+#define AMSTR_FOLLOWOFF		"FOLLOW MODE OFF"
diff --git a/games/NXDoom/src/hexen/xddefs.h b/games/NXDoom/src/hexen/xddefs.h
new file mode 100644
index 000000000..544f4ce28
--- /dev/null
+++ b/games/NXDoom/src/hexen/xddefs.h
@@ -0,0 +1,189 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+
+#ifndef __XDDEFS__
+#define __XDDEFS__
+
+#include "doomtype.h"
+#include "v_patch.h"
+
+//--------------------------------------------------------------------------
+//
+// Map level types
+//
+//--------------------------------------------------------------------------
+
+// lump order in a map wad
+enum
+{
+    ML_LABEL,
+    ML_THINGS,
+    ML_LINEDEFS,
+    ML_SIDEDEFS,
+    ML_VERTEXES,
+    ML_SEGS,
+    ML_SSECTORS,
+    ML_NODES,
+    ML_SECTORS,
+    ML_REJECT,
+    ML_BLOCKMAP,
+    ML_BEHAVIOR
+};
+
+typedef PACKED_STRUCT (
+{
+    short x;
+    short y;
+})  mapvertex_t;
+
+typedef PACKED_STRUCT (
+{
+    short textureoffset;
+    short rowoffset;
+    char toptexture[8];
+    char bottomtexture[8];
+    char midtexture[8];
+    short sector;               // on viewer's side
+}) mapsidedef_t;
+
+typedef PACKED_STRUCT (
+{
+    short v1;
+    short v2;
+    short flags;
+    byte special;
+    byte arg1;
+    byte arg2;
+    byte arg3;
+    byte arg4;
+    byte arg5;
+    short sidenum[2];           // sidenum[1] will be -1 if one sided
+}) maplinedef_t;
+
+#define	ML_BLOCKING			0x0001
+#define	ML_BLOCKMONSTERS	0x0002
+#define	ML_TWOSIDED			0x0004
+#define	ML_DONTPEGTOP		0x0008
+#define	ML_DONTPEGBOTTOM	0x0010
+#define ML_SECRET			0x0020  // don't map as two sided: IT'S A SECRET!
+#define ML_SOUNDBLOCK		0x0040  // don't let sound cross two of these
+#define	ML_DONTDRAW			0x0080  // don't draw on the automap
+#define	ML_MAPPED			0x0100  // set if already drawn in automap
+#define ML_REPEAT_SPECIAL	0x0200  // special is repeatable
+#define ML_SPAC_SHIFT		10
+#define ML_SPAC_MASK		0x1c00
+#define GET_SPAC(flags) ((flags&ML_SPAC_MASK)>>ML_SPAC_SHIFT)
+
+// Special activation types
+#define SPAC_CROSS		0       // when player crosses line
+#define SPAC_USE		1       // when player uses line
+#define SPAC_MCROSS		2       // when monster crosses line
+#define SPAC_IMPACT		3       // when projectile hits line
+#define SPAC_PUSH		4       // when player/monster pushes line
+#define SPAC_PCROSS		5       // when projectile crosses line
+
+typedef PACKED_STRUCT (
+{
+    short floorheight;
+    short ceilingheight;
+    char floorpic[8];
+    char ceilingpic[8];
+    short lightlevel;
+    short special;
+    short tag;
+}) mapsector_t;
+
+typedef PACKED_STRUCT (
+{
+    short numsegs;
+    short firstseg;             // segs are stored sequentially
+}) mapsubsector_t;
+
+typedef PACKED_STRUCT (
+{
+    short v1;
+    short v2;
+    short angle;
+    short linedef;
+    short side;
+    short offset;
+}) mapseg_t;
+
+#define	NF_SUBSECTOR	0x8000
+typedef PACKED_STRUCT (
+{
+    short x, y, dx, dy;         // partition line
+    short bbox[2][4];           // bounding box for each child
+    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
+}) mapnode_t;
+
+typedef PACKED_STRUCT (
+{
+    short tid;
+    short x;
+    short y;
+    short height;
+    short angle;
+    short type;
+    short options;
+    byte special;
+    byte arg1;
+    byte arg2;
+    byte arg3;
+    byte arg4;
+    byte arg5;
+}) mapthing_t;
+
+#define MTF_EASY		1
+#define MTF_NORMAL		2
+#define MTF_HARD		4
+#define MTF_AMBUSH		8
+#define MTF_DORMANT		16
+#define MTF_FIGHTER		32
+#define MTF_CLERIC		64
+#define MTF_MAGE		128
+#define MTF_GSINGLE		256
+#define MTF_GCOOP		512
+#define MTF_GDEATHMATCH	1024
+
+//--------------------------------------------------------------------------
+//
+// Texture definition
+//
+//--------------------------------------------------------------------------
+
+typedef PACKED_STRUCT (
+{
+    short originx;
+    short originy;
+    short patch;
+    short stepdir;
+    short colormap;
+}) mappatch_t;
+
+typedef PACKED_STRUCT (
+{
+    char name[8];
+    boolean masked;
+    short width;
+    short height;
+    int obsolete;
+    short patchcount;
+    mappatch_t patches[1];
+}) maptexture_t;
+
+#endif // __XDDEFS__
diff --git a/games/NXDoom/src/i_cdmus.c b/games/NXDoom/src/i_cdmus.c
new file mode 100644
index 000000000..caad87af8
--- /dev/null
+++ b/games/NXDoom/src/i_cdmus.c
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+//
+// 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.
+//
+//
+// Hexen CD interface.
+//
+
+#include <stdio.h>
+
+#include "SDL.h"
+
+#include "doomtype.h"
+
+#include "i_cdmus.h"
+
+int cd_Error;
+
+int I_CDMusInit(void)
+{
+    fprintf(stderr,
+        "I_CDMusInit: CD music playback is no longer supported! "
+        "Please use digital music packs instead:\n"
+        "https://www.chocolate-doom.org/wiki/index.php/Digital_music_packs\n");
+    return -1;
+}
+
+// We cannot print status messages inline during startup, they must
+// be deferred until after I_CDMusInit has returned.
+
+void I_CDMusPrintStartup(void)
+{
+}
+
+int I_CDMusPlay(int track)
+{
+    return 0;
+}
+
+int I_CDMusStop(void)
+{
+    return 0;
+}
+
+int I_CDMusResume(void)
+{
+    return 0;
+}
+
+int I_CDMusSetVolume(int volume)
+{
+    return 0;
+}
+
+int I_CDMusFirstTrack(void)
+{
+    return 0;
+}
+
+int I_CDMusLastTrack(void)
+{
+    return 0;
+}
+
+int I_CDMusTrackLength(int track_num)
+{
+    return 0;
+}
+
diff --git a/games/NXDoom/src/i_cdmus.h b/games/NXDoom/src/i_cdmus.h
new file mode 100644
index 000000000..31db2a659
--- /dev/null
+++ b/games/NXDoom/src/i_cdmus.h
@@ -0,0 +1,41 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+//
+// 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.
+//
+
+// i_cdmus.h
+
+#ifndef __ICDMUS__
+#define __ICDMUS__
+
+#define CDERR_NOTINSTALLED   10 // MSCDEX not installed
+#define CDERR_NOAUDIOSUPPORT 11 // CD-ROM Doesn't support audio
+#define CDERR_NOAUDIOTRACKS  12 // Current CD has no audio tracks
+#define CDERR_BADDRIVE       20 // Bad drive number
+#define CDERR_BADTRACK       21 // Bad track number
+#define CDERR_IOCTLBUFFMEM   22 // Not enough low memory for IOCTL
+#define CDERR_DEVREQBASE     100        // DevReq errors
+
+extern int cd_Error;
+
+int I_CDMusInit(void);
+void I_CDMusPrintStartup(void);
+int I_CDMusPlay(int track);
+int I_CDMusStop(void);
+int I_CDMusResume(void);
+int I_CDMusSetVolume(int volume);
+int I_CDMusFirstTrack(void);
+int I_CDMusLastTrack(void);
+int I_CDMusTrackLength(int track);
+
+#endif
diff --git a/games/NXDoom/src/i_endoom.c b/games/NXDoom/src/i_endoom.c
new file mode 100644
index 000000000..9beacc901
--- /dev/null
+++ b/games/NXDoom/src/i_endoom.c
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    Exit text-mode ENDOOM screen.
+//
+
+#include <stdio.h>
+#include <string.h>
+
+#include "config.h"
+#include "doomtype.h"
+#include "i_video.h"
+
+#include "txt_main.h"
+
+#define ENDOOM_W 80
+#define ENDOOM_H 25
+
+// 
+// Displays the text mode ending screen after the game quits
+//
+
+void I_Endoom(byte *endoom_data)
+{
+    unsigned char *screendata;
+    int y;
+    int indent;
+
+    // Set up text mode screen
+
+    TXT_Init();
+
+    TXT_SetWindowTitle(PACKAGE_STRING);
+    // SDL2-TODO I_InitWindowTitle();
+    // SDL2-TODO I_InitWindowIcon();
+
+    // Write the data to the screen memory
+
+    screendata = TXT_GetScreenData();
+
+    indent = (ENDOOM_W - TXT_SCREEN_W) / 2;
+
+    for (y=0; y<TXT_SCREEN_H; ++y)
+    {
+        memcpy(screendata + (y * TXT_SCREEN_W * 2),
+               endoom_data + (y * ENDOOM_W + indent) * 2,
+               TXT_SCREEN_W * 2);
+    }
+
+    // Wait for a keypress
+
+    while (true)
+    {
+        TXT_UpdateScreen();
+
+        if (TXT_GetChar() > 0)
+        {
+            break;
+        }
+
+        TXT_Sleep(0);
+    }
+
+    // Shut down text mode screen
+
+    TXT_Shutdown();
+}
+
diff --git a/games/NXDoom/src/i_endoom.h b/games/NXDoom/src/i_endoom.h
new file mode 100644
index 000000000..8c8ff457f
--- /dev/null
+++ b/games/NXDoom/src/i_endoom.h
@@ -0,0 +1,29 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    Exit text-mode ENDOOM screen.
+//
+
+
+#ifndef __I_ENDOOM__
+#define __I_ENDOOM__
+
+// Display the Endoom screen on shutdown.  Pass a pointer to the
+// ENDOOM lump.
+
+void I_Endoom(byte *data);
+
+#endif
+
diff --git a/games/NXDoom/src/i_flmusic.c b/games/NXDoom/src/i_flmusic.c
new file mode 100644
index 000000000..a0978a0f1
--- /dev/null
+++ b/games/NXDoom/src/i_flmusic.c
@@ -0,0 +1,332 @@
+//
+// Copyright(C) 2022 Roman Fomin
+// Copyright(C) 2023 Michael Day
+//
+// 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.
+//
+// DESCRIPTION:
+//      FluidSynth backend
+
+#include "config.h"
+
+#ifdef HAVE_FLUIDSYNTH
+
+#include "fluidsynth.h"
+
+#if (FLUIDSYNTH_VERSION_MAJOR < 2 ||                                           \
+     (FLUIDSYNTH_VERSION_MAJOR == 2 && FLUIDSYNTH_VERSION_MINOR < 2))
+
+typedef int fluid_int_t;
+typedef long fluid_long_long_t;
+
+#else
+
+typedef fluid_long_long_t fluid_int_t;
+
+#endif
+
+#include "SDL_mixer.h"
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "i_sound.h"
+#include "m_misc.h"
+#include "memio.h"
+#include "mus2mid.h"
+
+#include <string.h>
+
+char *fsynth_sf_path = "";
+int fsynth_chorus_active = 1;
+float fsynth_chorus_depth = 5.0f;
+float fsynth_chorus_level = 0.35f;
+int fsynth_chorus_nr = 3;
+float fsynth_chorus_speed = 0.3f;
+char *fsynth_midibankselect = "gs";
+int fsynth_polyphony = 256;
+int fsynth_reverb_active = 1;
+float fsynth_reverb_damp = 0.4f;
+float fsynth_reverb_level = 0.15f;
+float fsynth_reverb_roomsize = 0.6f;
+float fsynth_reverb_width = 4.0f;
+float fsynth_gain = 1.0f;
+
+static fluid_synth_t *synth = NULL;
+static fluid_settings_t *settings = NULL;
+static fluid_player_t *player = NULL;
+
+static void FL_Mix_Callback(void *udata, Uint8 *stream, int len)
+{
+    int result;
+
+    result = fluid_synth_write_s16(synth, len / 4, stream, 0, 2, stream, 1, 2);
+
+    if (result != FLUID_OK)
+    {
+        fprintf(stderr,
+                "FL_Mix_Callback: Error generating FluidSynth audio.\n");
+    }
+}
+
+static boolean I_FL_InitMusic(void)
+{
+    int sf_id;
+
+    if (strlen(fsynth_sf_path) == 0)
+    {
+        fprintf(stderr,
+                "I_FL_InitMusic: No FluidSynth soundfont file specified.\n");
+        return false;
+    }
+
+    settings = new_fluid_settings();
+
+    fluid_settings_setnum(settings, "synth.sample-rate", snd_samplerate);
+    fluid_settings_setstr(settings, "synth.midi-bank-select",
+                          fsynth_midibankselect);
+    fluid_settings_setint(settings, "synth.polyphony", fsynth_polyphony);
+
+    fluid_settings_setint(settings, "synth.chorus.active",
+                          fsynth_chorus_active);
+    fluid_settings_setint(settings, "synth.reverb.active",
+                          fsynth_reverb_active);
+
+    if (fsynth_reverb_active)
+    {
+        fluid_settings_setnum(settings, "synth.reverb.room-size",
+                              fsynth_reverb_roomsize);
+        fluid_settings_setnum(settings, "synth.reverb.damp",
+                              fsynth_reverb_damp);
+        fluid_settings_setnum(settings, "synth.reverb.width",
+                              fsynth_reverb_width);
+        fluid_settings_setnum(settings, "synth.reverb.level",
+                              fsynth_reverb_level);
+    }
+
+    if (fsynth_chorus_active)
+    {
+        fluid_settings_setnum(settings, "synth.chorus.level",
+                              fsynth_chorus_level);
+        fluid_settings_setnum(settings, "synth.chorus.depth",
+                              fsynth_chorus_depth);
+        fluid_settings_setint(settings, "synth.chorus.nr", fsynth_chorus_nr);
+        fluid_settings_setnum(settings, "synth.chorus.speed",
+                              fsynth_chorus_speed);
+    }
+
+    if (fsynth_gain < 0.0f)
+    {
+        fsynth_gain = 0.0f;
+    }
+    if (fsynth_gain > 10.0f)
+    {
+        fsynth_gain = 10.0f;
+    }
+
+    synth = new_fluid_synth(settings);
+
+    if (synth == NULL)
+    {
+        fprintf(stderr,
+                "I_FL_InitMusic: FluidSynth failed to initialize synth.\n");
+        return false;
+    }
+
+    sf_id = fluid_synth_sfload(synth, fsynth_sf_path, true);
+    if (sf_id == FLUID_FAILED)
+    {
+        delete_fluid_synth(synth);
+        synth = NULL;
+        delete_fluid_settings(settings);
+        settings = NULL;
+        fprintf(stderr,
+                "I_FL_InitMusic: Error loading FluidSynth soundfont: '%s'.\n",
+                fsynth_sf_path);
+        return false;
+    }
+
+    printf("I_FL_InitMusic: Using '%s'.\n", fsynth_sf_path);
+
+    return true;
+}
+
+static void I_FL_SetMusicVolume(int volume)
+{
+    if (synth == NULL)
+    {
+        return;
+    }
+    // FluidSynth's default is 0.2. Make 1.0 the maximum.
+    // 0 -- 0.2 -- 10.0
+    fluid_synth_set_gain(synth, ((float) volume / 127) * fsynth_gain);
+}
+
+static void I_FL_PauseSong(void)
+{
+    if (player)
+    {
+        Mix_HookMusic(NULL, NULL);
+    }
+}
+
+static void I_FL_ResumeSong(void)
+{
+    if (player)
+    {
+        Mix_HookMusic(FL_Mix_Callback, NULL);
+    }
+}
+
+static void I_FL_PlaySong(void *handle, boolean looping)
+{
+    if (player)
+    {
+        fluid_player_set_loop(player, looping ? -1 : 1);
+        fluid_player_play(player);
+    }
+}
+
+static void I_FL_StopSong(void)
+{
+    if (player)
+    {
+        fluid_player_stop(player);
+    }
+}
+
+// Determine whether memory block is a .mid file
+
+static boolean IsMid(const byte *mem, int len)
+{
+    return len > 4 && !memcmp(mem, "MThd", 4);
+}
+
+static void *I_FL_RegisterSong(void *data, int len)
+{
+    int result = FLUID_FAILED;
+
+    player = new_fluid_player(synth);
+
+    if (player == NULL)
+    {
+        fprintf(stderr,
+                "I_FL_RegisterSong: FluidSynth failed to initialize player.\n");
+        return NULL;
+    }
+
+    if (IsMid(data, len))
+    {
+        result = fluid_player_add_mem(player, data, len);
+
+        if (result == FLUID_FAILED)
+        {
+            fprintf(stderr,
+                    "I_FL_RegisterSong: FluidSynth failed to load MIDI.\n");
+            return NULL;
+        }
+    }
+    else
+    {
+        // Assume a MUS file and try to convert
+        MEMFILE *instream;
+        MEMFILE *outstream;
+        void *outbuf;
+        size_t outbuf_len;
+
+        instream = mem_fopen_read(data, len);
+        outstream = mem_fopen_write();
+
+        if (mus2mid(instream, outstream) == 0)
+        {
+            mem_get_buf(outstream, &outbuf, &outbuf_len);
+            result = fluid_player_add_mem(player, outbuf, outbuf_len);
+        }
+
+        mem_fclose(instream);
+        mem_fclose(outstream);
+
+        if (result == FLUID_FAILED)
+        {
+            fprintf(stderr,
+                    "I_FL_RegisterSong: FluidSynth failed to load MUS.\n");
+            return NULL;
+        }
+    }
+
+    Mix_HookMusic(FL_Mix_Callback, NULL);
+    return player;
+}
+
+static void I_FL_UnRegisterSong(void *handle)
+{
+    if (player)
+    {
+        fluid_synth_program_reset(synth);
+        fluid_synth_system_reset(synth);
+
+        Mix_HookMusic(NULL, NULL);
+
+        delete_fluid_player(player);
+        player = NULL;
+    }
+}
+
+static void I_FL_ShutdownMusic(void)
+{
+    I_FL_StopSong();
+    I_FL_UnRegisterSong(NULL);
+
+    if (synth)
+    {
+        delete_fluid_synth(synth);
+        synth = NULL;
+    }
+
+    if (settings)
+    {
+        delete_fluid_settings(settings);
+        settings = NULL;
+    }
+}
+
+static boolean I_FL_MusicIsPlaying(void)
+{
+    if (player == NULL)
+    {
+        return false;
+    }
+
+    return (fluid_player_get_status(player) == FLUID_PLAYER_PLAYING);
+}
+
+static const snddevice_t music_fl_devices[] =
+{
+    SNDDEVICE_FSYNTH,
+};
+
+const music_module_t music_fl_module =
+{
+    music_fl_devices,
+    arrlen(music_fl_devices),
+    I_FL_InitMusic,
+    I_FL_ShutdownMusic,
+    I_FL_SetMusicVolume,
+    I_FL_PauseSong,
+    I_FL_ResumeSong,
+    I_FL_RegisterSong,
+    I_FL_UnRegisterSong,
+    I_FL_PlaySong,
+    I_FL_StopSong,
+    I_FL_MusicIsPlaying,
+    NULL // Poll
+};
+
+#endif
diff --git a/games/NXDoom/src/i_glob.c b/games/NXDoom/src/i_glob.c
new file mode 100644
index 000000000..79c3e8983
--- /dev/null
+++ b/games/NXDoom/src/i_glob.c
@@ -0,0 +1,373 @@
+//
+// Copyright(C) 2018 Simon Howard
+//
+// 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.
+//
+//
+// File globbing API. This allows the contents of the filesystem
+// to be interrogated.
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "i_glob.h"
+#include "m_misc.h"
+#include "config.h"
+
+#if defined(_WIN32)
+#include <win_opendir.h>
+#ifndef S_ISDIR
+#define S_ISDIR(m)      (((m)& S_IFMT) == S_IFDIR)
+#endif
+#elif defined(HAVE_DIRENT_H)
+#include <dirent.h>
+#include <sys/stat.h>
+#elif defined(__WATCOMC__)
+// Watcom has the same API in a different header.
+#include <direct.h>
+#else
+#define NO_DIRENT_IMPLEMENTATION
+#endif
+
+#ifndef NO_DIRENT_IMPLEMENTATION
+
+// Only the fields d_name and (as an XSI extension) d_ino are specified
+// in POSIX.1.  Other than Linux, the d_type field is available mainly
+// only on BSD systems.  The remaining fields are available on many, but
+// not all systems.
+static boolean IsDirectory(char *dir, struct dirent *de)
+{
+#if defined(_DIRENT_HAVE_D_TYPE)
+    if (de->d_type != DT_UNKNOWN && de->d_type != DT_LNK)
+    {
+        return de->d_type == DT_DIR;
+    }
+    else
+#endif
+    {
+        char *filename;
+        struct stat sb;
+        int result;
+
+        filename = M_StringJoin(dir, DIR_SEPARATOR_S, de->d_name, NULL);
+        result = M_stat(filename, &sb);
+        free(filename);
+
+        if (result != 0)
+        {
+            return false;
+        }
+
+        return S_ISDIR(sb.st_mode);
+    }
+}
+
+struct glob_s
+{
+    char **globs;
+    int num_globs;
+    int flags;
+    DIR *dir;
+    char *directory;
+    char *last_filename;
+    // These fields are only used when the GLOB_FLAG_SORTED flag is set:
+    char **filenames;
+    int filenames_len;
+    int next_index;
+};
+
+static void FreeStringList(char **globs, int num_globs)
+{
+    int i;
+    for (i = 0; i < num_globs; ++i)
+    {
+        free(globs[i]);
+    }
+    free(globs);
+}
+
+glob_t *I_StartMultiGlob(const char *directory, int flags,
+                         const char *glob, ...)
+{
+    char **globs;
+    int num_globs;
+    glob_t *result;
+    va_list args;
+
+    globs = malloc(sizeof(char *));
+    if (globs == NULL)
+    {
+        return NULL;
+    }
+    globs[0] = M_StringDuplicate(glob);
+    num_globs = 1;
+
+    va_start(args, glob);
+    for (;;)
+    {
+        const char *arg = va_arg(args, const char *);
+        char **new_globs;
+
+        if (arg == NULL)
+        {
+            break;
+        }
+
+        new_globs = realloc(globs, sizeof(char *) * (num_globs + 1));
+        if (new_globs == NULL)
+        {
+            FreeStringList(globs, num_globs);
+        }
+        globs = new_globs;
+        globs[num_globs] = M_StringDuplicate(arg);
+        ++num_globs;
+    }
+    va_end(args);
+
+    result = malloc(sizeof(glob_t));
+    if (result == NULL)
+    {
+        FreeStringList(globs, num_globs);
+        return NULL;
+    }
+
+    result->dir = opendir(directory);
+    if (result->dir == NULL)
+    {
+        FreeStringList(globs, num_globs);
+        free(result);
+        return NULL;
+    }
+
+    result->directory = M_StringDuplicate(directory);
+    result->globs = globs;
+    result->num_globs = num_globs;
+    result->flags = flags;
+    result->last_filename = NULL;
+    result->filenames = NULL;
+    result->filenames_len = 0;
+    result->next_index = -1;
+    return result;
+}
+
+glob_t *I_StartGlob(const char *directory, const char *glob, int flags)
+{
+    return I_StartMultiGlob(directory, flags, glob, NULL);
+}
+
+void I_EndGlob(glob_t *glob)
+{
+    if (glob == NULL)
+    {
+        return;
+    }
+
+    FreeStringList(glob->globs, glob->num_globs);
+    FreeStringList(glob->filenames, glob->filenames_len);
+
+    free(glob->directory);
+    free(glob->last_filename);
+    (void) closedir(glob->dir);
+    free(glob);
+}
+
+static boolean MatchesGlob(const char *name, const char *glob, int flags)
+{
+    int n, g;
+
+    while (*glob != '\0')
+    {
+        n = *name;
+        g = *glob;
+
+        if ((flags & GLOB_FLAG_NOCASE) != 0)
+        {
+            n = tolower(n);
+            g = tolower(g);
+        }
+
+        if (g == '*')
+        {
+            // To handle *-matching we skip past the * and recurse
+            // to check each subsequent character in turn. If none
+            // match then the whole match is a failure.
+            while (*name != '\0')
+            {
+                if (MatchesGlob(name, glob + 1, flags))
+                {
+                    return true;
+                }
+                ++name;
+            }
+            return glob[1] == '\0';
+        }
+        else if (g != '?' && n != g)
+        {
+            // For normal characters the name must match the glob,
+            // but for ? we don't care what the character is.
+            return false;
+        }
+
+        ++name;
+        ++glob;
+    }
+
+    // Match successful when glob and name end at the same time.
+    return *name == '\0';
+}
+
+static boolean MatchesAnyGlob(const char *name, glob_t *glob)
+{
+    int i;
+
+    for (i = 0; i < glob->num_globs; ++i)
+    {
+        if (MatchesGlob(name, glob->globs[i], glob->flags))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+static char *NextGlob(glob_t *glob)
+{
+    struct dirent *de;
+
+    do
+    {
+        de = readdir(glob->dir);
+        if (de == NULL)
+        {
+            return NULL;
+        }
+    } while (IsDirectory(glob->directory, de)
+          || !MatchesAnyGlob(de->d_name, glob));
+
+    // Return the fully-qualified path, not just the bare filename.
+    return M_StringJoin(glob->directory, DIR_SEPARATOR_S, de->d_name, NULL);
+}
+
+static void ReadAllFilenames(glob_t *glob)
+{
+    char *name;
+
+    glob->filenames = NULL;
+    glob->filenames_len = 0;
+    glob->next_index = 0;
+
+    for (;;)
+    {
+        name = NextGlob(glob);
+        if (name == NULL)
+        {
+            break;
+        }
+        glob->filenames = realloc(glob->filenames,
+                                  (glob->filenames_len + 1) * sizeof(char *));
+        glob->filenames[glob->filenames_len] = name;
+        ++glob->filenames_len;
+    }
+}
+
+static void SortFilenames(char **filenames, int len, int flags)
+{
+    char *pivot, *tmp;
+    int i, left_len, cmp;
+
+    if (len <= 1)
+    {
+        return;
+    }
+    pivot = filenames[len - 1];
+    left_len = 0;
+    for (i = 0; i < len-1; ++i)
+    {
+        if ((flags & GLOB_FLAG_NOCASE) != 0)
+        {
+            cmp = strcasecmp(filenames[i], pivot);
+        }
+        else
+        {
+            cmp = strcmp(filenames[i], pivot);
+        }
+
+        if (cmp < 0)
+        {
+            tmp = filenames[i];
+            filenames[i] = filenames[left_len];
+            filenames[left_len] = tmp;
+            ++left_len;
+        }
+    }
+    filenames[len - 1] = filenames[left_len];
+    filenames[left_len] = pivot;
+
+    SortFilenames(filenames, left_len, flags);
+    SortFilenames(&filenames[left_len + 1], len - left_len - 1, flags);
+}
+
+const char *I_NextGlob(glob_t *glob)
+{
+    const char *result;
+
+    if (glob == NULL)
+    {
+        return NULL;
+    }
+
+    // In unsorted mode we just return the filenames as we read
+    // them back from the system API.
+    if ((glob->flags & GLOB_FLAG_SORTED) == 0)
+    {
+        free(glob->last_filename);
+        glob->last_filename = NextGlob(glob);
+        return glob->last_filename;
+    }
+
+    // In sorted mode we read the whole list of filenames into memory,
+    // sort them and return them one at a time.
+    if (glob->next_index < 0)
+    {
+        ReadAllFilenames(glob);
+        SortFilenames(glob->filenames, glob->filenames_len, glob->flags);
+    }
+    if (glob->next_index >= glob->filenames_len)
+    {
+        return NULL;
+    }
+    result = glob->filenames[glob->next_index];
+    ++glob->next_index;
+    return result;
+}
+
+#else /* #ifdef NO_DIRENT_IMPLEMENTATION */
+
+#warning No native implementation of file globbing.
+
+glob_t *I_StartGlob(const char *directory, const char *glob, int flags)
+{
+    return NULL;
+}
+
+void I_EndGlob(glob_t *glob)
+{
+}
+
+const char *I_NextGlob(glob_t *glob)
+{
+    return "";
+}
+
+#endif /* #ifdef NO_DIRENT_IMPLEMENTATION */
+
diff --git a/games/NXDoom/src/i_glob.h b/games/NXDoom/src/i_glob.h
new file mode 100644
index 000000000..f976db01c
--- /dev/null
+++ b/games/NXDoom/src/i_glob.h
@@ -0,0 +1,44 @@
+//
+// Copyright(C) 2018 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific file globbing interface.
+//
+
+
+#ifndef __I_GLOB__
+#define __I_GLOB__
+
+#define GLOB_FLAG_NOCASE  0x01
+#define GLOB_FLAG_SORTED  0x02
+
+typedef struct glob_s glob_t;
+
+// Start reading a list of file paths from the given directory which match
+// the given glob pattern. I_EndGlob() must be called on completion.
+glob_t *I_StartGlob(const char *directory, const char *glob, int flags);
+
+// Same as I_StartGlob but multiple glob patterns can be provided. The list
+// of patterns must be terminated with NULL.
+glob_t *I_StartMultiGlob(const char *directory, int flags,
+                         const char *glob, ...);
+
+// Finish reading file list.
+void I_EndGlob(glob_t *glob);
+
+// Read the name of the next globbed filename. NULL is returned if there
+// are no more found.
+const char *I_NextGlob(glob_t *glob);
+
+#endif
+
diff --git a/games/NXDoom/src/i_input.c b/games/NXDoom/src/i_input.c
new file mode 100644
index 000000000..091aa6b88
--- /dev/null
+++ b/games/NXDoom/src/i_input.c
@@ -0,0 +1,473 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     SDL implementation of system-specific input interface.
+//
+
+#include <string.h>
+
+#include "SDL.h"
+#include "SDL_keycode.h"
+
+#include "doomkeys.h"
+#include "doomtype.h"
+#include "d_event.h"
+#include "i_input.h"
+#include "m_argv.h"
+#include "m_config.h"
+
+static const int scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
+
+// Lookup table for mapping ASCII characters to their equivalent when
+// shift is pressed on a US layout keyboard. This is the original table
+// as found in the Doom sources, comments and all.
+static const char shiftxform[] =
+{
+    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, ' ', '!', '"', '#', '$', '%', '&',
+    '"', // shift-'
+    '(', ')', '*', '+',
+    '<', // shift-,
+    '_', // shift--
+    '>', // shift-.
+    '?', // shift-/
+    ')', // shift-0
+    '!', // shift-1
+    '@', // shift-2
+    '#', // shift-3
+    '$', // shift-4
+    '%', // shift-5
+    '^', // shift-6
+    '&', // shift-7
+    '*', // shift-8
+    '(', // shift-9
+    ':',
+    ':', // shift-;
+    '<',
+    '+', // shift-=
+    '>', '?', '@',
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+    'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    '[', // shift-[
+    '!', // shift-backslash - OH MY GOD DOES WATCOM SUCK
+    ']', // shift-]
+    '"', '_',
+    '\'', // shift-`
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+    'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    '{', '|', '}', '~', 127
+};
+
+// If true, I_StartTextInput() has been called, and we are populating
+// the data3 field of ev_keydown events.
+static boolean text_input_enabled = true;
+
+// Bit mask of mouse button state.
+static unsigned int mouse_button_state = 0;
+
+// Disallow mouse and joystick movement to cause forward/backward
+// motion.  Specified with the '-novert' command line parameter.
+// This is an int to allow saving to config file
+int novert = 0;
+
+// If true, keyboard mapping is ignored, like in Vanilla Doom.
+// The sensible thing to do is to disable this if you have a non-US
+// keyboard.
+
+int vanilla_keyboard_mapping = true;
+
+// Mouse acceleration
+//
+// This emulates some of the behavior of DOS mouse drivers by increasing
+// the speed when the mouse is moved fast.
+//
+// The mouse input values are input directly to the game, but when
+// the values exceed the value of mouse_threshold, they are multiplied
+// by mouse_acceleration to increase the speed.
+float mouse_acceleration = 2.0;
+int mouse_threshold = 10;
+
+// Translates the SDL key to a value of the type found in doomkeys.h
+static int TranslateKey(SDL_Keysym *sym)
+{
+    int scancode = sym->scancode;
+
+    switch (scancode)
+    {
+        case SDL_SCANCODE_LCTRL:
+        case SDL_SCANCODE_RCTRL:
+            return KEY_RCTRL;
+
+        case SDL_SCANCODE_LSHIFT:
+        case SDL_SCANCODE_RSHIFT:
+            return KEY_RSHIFT;
+
+        case SDL_SCANCODE_LALT:
+            return KEY_LALT;
+
+        case SDL_SCANCODE_RALT:
+            return KEY_RALT;
+
+        default:
+            if (scancode >= 0 && scancode < arrlen(scancode_translate_table))
+            {
+                return scancode_translate_table[scancode];
+            }
+            else
+            {
+                return 0;
+            }
+    }
+}
+
+// Get the localized version of the key press. This takes into account the
+// keyboard layout, but does not apply any changes due to modifiers, (eg.
+// shift-, alt-, etc.)
+static int GetLocalizedKey(SDL_Keysym *sym)
+{
+    // When using Vanilla mapping, we just base everything off the scancode
+    // and always pretend the user is using a US layout keyboard.
+    if (vanilla_keyboard_mapping)
+    {
+        return TranslateKey(sym);
+    }
+    else
+    {
+        int result = sym->sym;
+
+        if (result < 0 || result >= 128)
+        {
+            result = 0;
+        }
+
+        return result;
+    }
+}
+
+// Get the equivalent ASCII (Unicode?) character for a keypress.
+static int GetTypedChar(SDL_Keysym *sym)
+{
+    // We only return typed characters when entering text, after
+    // I_StartTextInput() has been called. Otherwise we return nothing.
+    if (!text_input_enabled)
+    {
+        return 0;
+    }
+
+    // If we're strictly emulating Vanilla, we should always act like
+    // we're using a US layout keyboard (in ev_keydown, data1=data2).
+    // Otherwise we should use the native key mapping.
+    if (vanilla_keyboard_mapping)
+    {
+        int result = TranslateKey(sym);
+
+        // If shift is held down, apply the original uppercase
+        // translation table used under DOS.
+        if ((SDL_GetModState() & KMOD_SHIFT) != 0
+         && result >= 0 && result < arrlen(shiftxform))
+        {
+            result = shiftxform[result];
+        }
+
+        return result;
+    }
+    else
+    {
+        SDL_Event next_event;
+
+        // Special cases, where we always return a fixed value.
+        switch (sym->sym)
+        {
+            case SDLK_BACKSPACE: return KEY_BACKSPACE;
+            case SDLK_RETURN:    return KEY_ENTER;
+            default:
+                break;
+        }
+
+        // The following is a gross hack, but I don't see an easier way
+        // of doing this within the SDL2 API (in SDL1 it was easier).
+        // We want to get the fully transformed input character associated
+        // with this keypress - correct keyboard layout, appropriately
+        // transformed by any modifier keys, etc. So peek ahead in the SDL
+        // event queue and see if the key press is immediately followed by
+        // an SDL_TEXTINPUT event. If it is, it's reasonable to assume the
+        // key press and the text input are connected. Technically the SDL
+        // API does not guarantee anything of the sort, but in practice this
+        // is what happens and I've verified it through manual inspect of
+        // the SDL source code.
+        //
+        // In an ideal world we'd split out ev_keydown into a separate
+        // ev_textinput event, as SDL2 has done. But this doesn't work
+        // (I experimented with the idea), because lots of Doom's code is
+        // based around different responders "eating" events to stop them
+        // being passed on to another responder. If code is listening for
+        // a text input, it cannot block the corresponding keydown events
+        // which can affect other responders.
+        //
+        // So we're stuck with this as a rather fragile alternative.
+
+        if (SDL_PeepEvents(&next_event, 1, SDL_PEEKEVENT,
+                           SDL_FIRSTEVENT, SDL_LASTEVENT) == 1
+         && next_event.type == SDL_TEXTINPUT)
+        {
+            // If an SDL_TEXTINPUT event is found, we always assume it
+            // matches the key press. The input text must be a single
+            // ASCII character - if it isn't, it's possible the input
+            // char is a Unicode value instead; better to send a null
+            // character than the unshifted key.
+            if (strlen(next_event.text.text) == 1
+             && (next_event.text.text[0] & 0x80) == 0)
+            {
+                return next_event.text.text[0];
+            }
+        }
+
+        // Failed to find anything :/
+        return 0;
+    }
+}
+
+void I_HandleKeyboardEvent(SDL_Event *sdlevent)
+{
+    // XXX: passing pointers to event for access after this function
+    // has terminated is undefined behaviour
+    event_t event;
+
+    switch (sdlevent->type)
+    {
+        case SDL_KEYDOWN:
+            event.type = ev_keydown;
+            event.data1 = TranslateKey(&sdlevent->key.keysym);
+            event.data2 = GetLocalizedKey(&sdlevent->key.keysym);
+            event.data3 = GetTypedChar(&sdlevent->key.keysym);
+
+            if (event.data1 != 0)
+            {
+                D_PostEvent(&event);
+            }
+            break;
+
+        case SDL_KEYUP:
+            event.type = ev_keyup;
+            event.data1 = TranslateKey(&sdlevent->key.keysym);
+
+            // data2/data3 are initialized to zero for ev_keyup.
+            // For ev_keydown it's the shifted Unicode character
+            // that was typed, but if something wants to detect
+            // key releases it should do so based on data1
+            // (key ID), not the printable char.
+
+            event.data2 = 0;
+            event.data3 = 0;
+
+            if (event.data1 != 0)
+            {
+                D_PostEvent(&event);
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+void I_StartTextInput(int x1, int y1, int x2, int y2)
+{
+    text_input_enabled = true;
+
+    if (!vanilla_keyboard_mapping)
+    {
+        // SDL2-TODO: SDL_SetTextInputRect(...);
+        SDL_StartTextInput();
+    }
+}
+
+void I_StopTextInput(void)
+{
+    text_input_enabled = false;
+
+    if (!vanilla_keyboard_mapping)
+    {
+        SDL_StopTextInput();
+    }
+}
+
+static void UpdateMouseButtonState(unsigned int button, boolean on)
+{
+    static event_t event;
+
+    if (button < SDL_BUTTON_LEFT || button > MAX_MOUSE_BUTTONS)
+    {
+        return;
+    }
+
+    // Note: button "0" is left, button "1" is right,
+    // button "2" is middle for Doom.  This is different
+    // to how SDL sees things.
+    // In the end: Left=0, Right=1, Middle=2,
+    // WheelUp=3 WheelDown=4, XButton1=5, XButton2=6
+
+    switch (button)
+    {
+        case SDL_BUTTON_LEFT:
+            button = 0;
+            break;
+
+        case SDL_BUTTON_RIGHT:
+            button = 1;
+            break;
+
+        case SDL_BUTTON_MIDDLE:
+            button = 2;
+            break;
+
+        default:
+            // SDL buttons are indexed from 1.
+            // And the wheel is mapped to button 3/4
+            // So we have to increment 2 and decrement 1 => inc 1.
+            button++;
+            break;
+    }
+
+    // Turn bit representing this button on or off.
+
+    if (on)
+    {
+        mouse_button_state |= (1 << button);
+    }
+    else
+    {
+        mouse_button_state &= ~(1 << button);
+    }
+
+    // Post an event with the new button state.
+
+    event.type = ev_mouse;
+    event.data1 = mouse_button_state;
+    event.data2 = event.data3 = 0;
+    D_PostEvent(&event);
+}
+
+static void MapMouseWheelToButtons(SDL_MouseWheelEvent *wheel)
+{
+    // SDL2 distinguishes button events from mouse wheel events.
+    // We want to treat the mouse wheel as two buttons, as per
+    // SDL1
+    static event_t up, down;
+    int button;
+
+    if (wheel->y <= 0)
+    {   // scroll down
+        button = 4;
+    }
+    else
+    {   // scroll up
+        button = 3;
+    }
+
+    // post a button down event
+    mouse_button_state |= (1 << button);
+    down.type = ev_mouse;
+    down.data1 = mouse_button_state;
+    down.data2 = down.data3 = 0;
+    D_PostEvent(&down);
+
+    // post a button up event
+    mouse_button_state &= ~(1 << button);
+    up.type = ev_mouse;
+    up.data1 = mouse_button_state;
+    up.data2 = up.data3 = 0;
+    D_PostEvent(&up);
+}
+
+void I_HandleMouseEvent(SDL_Event *sdlevent)
+{
+    switch (sdlevent->type)
+    {
+        case SDL_MOUSEBUTTONDOWN:
+            UpdateMouseButtonState(sdlevent->button.button, true);
+            break;
+
+        case SDL_MOUSEBUTTONUP:
+            UpdateMouseButtonState(sdlevent->button.button, false);
+            break;
+
+        case SDL_MOUSEWHEEL:
+            MapMouseWheelToButtons(&(sdlevent->wheel));
+            break;
+
+        default:
+            break;
+    }
+}
+
+static int AccelerateMouse(int val)
+{
+    if (val < 0)
+        return -AccelerateMouse(-val);
+
+    if (val > mouse_threshold)
+    {
+        return (int)((val - mouse_threshold) * mouse_acceleration + mouse_threshold);
+    }
+    else
+    {
+        return val;
+    }
+}
+
+//
+// Read the change in mouse state to generate mouse motion events
+//
+// This is to combine all mouse movement for a tic into one mouse
+// motion event.
+void I_ReadMouse(void)
+{
+    int x, y;
+    event_t ev;
+
+    SDL_GetRelativeMouseState(&x, &y);
+
+    if (x != 0 || y != 0) 
+    {
+        ev.type = ev_mouse;
+        ev.data1 = mouse_button_state;
+        ev.data2 = AccelerateMouse(x);
+
+        if (!novert)
+        {
+            ev.data3 = -AccelerateMouse(y);
+        }
+        else
+        {
+            ev.data3 = 0;
+        }
+
+        // XXX: undefined behaviour since event is scoped to
+        // this function
+        D_PostEvent(&ev);
+    }
+}
+
+// Bind all variables controlling input options.
+void I_BindInputVariables(void)
+{
+    M_BindFloatVariable("mouse_acceleration",      &mouse_acceleration);
+    M_BindIntVariable("mouse_threshold",           &mouse_threshold);
+    M_BindIntVariable("vanilla_keyboard_mapping",  &vanilla_keyboard_mapping);
+    M_BindIntVariable("novert",                    &novert);
+}
diff --git a/games/NXDoom/src/i_input.h b/games/NXDoom/src/i_input.h
new file mode 100644
index 000000000..0dda76d07
--- /dev/null
+++ b/games/NXDoom/src/i_input.h
@@ -0,0 +1,49 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    System-specific keyboard/mouse input.
+//
+
+
+#ifndef __I_INPUT__
+#define __I_INPUT__
+
+#include "doomtype.h"
+
+#include "SDL.h"
+
+
+#define MAX_MOUSE_BUTTONS 8
+
+extern float mouse_acceleration;
+extern int mouse_threshold;
+
+void I_BindInputVariables(void);
+void I_ReadMouse(void);
+
+// I_StartTextInput begins text input, activating the on-screen keyboard
+// (if one is used). The caller indicates that any entered text will be
+// displayed in the rectangle given by the provided set of coordinates.
+void I_StartTextInput(int x1, int y1, int x2, int y2);
+
+// I_StopTextInput finishes text input, deactivating the on-screen keyboard
+// (if one is used).
+void I_StopTextInput(void);
+
+void I_HandleKeyboardEvent(SDL_Event *sdlevent);
+void I_HandleMouseEvent(SDL_Event *sdlevent);
+
+
+#endif
diff --git a/games/NXDoom/src/i_joystick.c b/games/NXDoom/src/i_joystick.c
new file mode 100644
index 000000000..9e28a1008
--- /dev/null
+++ b/games/NXDoom/src/i_joystick.c
@@ -0,0 +1,826 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//       SDL Joystick code.
+//
+
+
+#include "SDL.h"
+#include "SDL_joystick.h"
+#include "SDL_gamecontroller.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "d_event.h"
+#include "i_joystick.h"
+#include "i_system.h"
+
+#include "m_config.h"
+#include "m_fixed.h"
+#include "m_misc.h"
+
+static SDL_GameController *gamepad = NULL;
+static SDL_Joystick *joystick = NULL;
+
+// Configuration variables:
+
+// Standard default.cfg Joystick enable/disable
+
+static int usejoystick = 0;
+
+// Use SDL_gamecontroller interface for the selected device
+static int use_gamepad = 0;
+
+// SDL_GameControllerType of gamepad
+static int gamepad_type = 0;
+
+// SDL GUID and index of the joystick to use.
+static char *joystick_guid = "";
+static int joystick_index = -1;
+
+// Which joystick axis to use for horizontal movement, and whether to
+// invert the direction:
+
+static int joystick_x_axis = 0;
+static int joystick_x_invert = 0;
+
+// Which joystick axis to use for vertical movement, and whether to
+// invert the direction:
+
+static int joystick_y_axis = 1;
+static int joystick_y_invert = 0;
+
+// Which joystick axis to use for strafing?
+
+static int joystick_strafe_axis = -1;
+static int joystick_strafe_invert = 0;
+
+// Which joystick axis to use for looking?
+
+static int joystick_look_axis = -1;
+static int joystick_look_invert = 0;
+
+// Configurable dead zone for each axis, specified as a percentage of the axis
+// max value.
+static int joystick_x_dead_zone = 33;
+static int joystick_y_dead_zone = 33;
+static int joystick_strafe_dead_zone = 33;
+static int joystick_look_dead_zone = 33;
+
+int use_analog = 0;
+
+int joystick_turn_sensitivity = 10;
+int joystick_move_sensitivity = 10;
+int joystick_look_sensitivity = 10;
+
+// Virtual to physical button joystick button mapping. By default this
+// is a straight mapping.
+static int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS] = {
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
+};
+
+void I_ShutdownGamepad(void)
+{
+    if (gamepad != NULL)
+    {
+        SDL_GameControllerClose(gamepad);
+        gamepad = NULL;
+        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+    }
+}
+
+static int FindFirstGamepad(void)
+{
+    int i;
+    int gamepadindex = -1;
+
+    for (i = 0; i < SDL_NumJoysticks(); ++i)
+    {
+        if (SDL_IsGameController(i))
+        {
+            gamepadindex = i;
+            break;
+        }
+    }
+
+    return gamepadindex;
+}
+
+static int FindSpecificGamepad(SDL_JoystickGUID guid)
+{
+    SDL_JoystickGUID dev_guid;
+    int i;
+    int gamepadindex = -1;
+
+    for (i = 0; i < SDL_NumJoysticks(); ++i)
+    {
+        dev_guid = SDL_JoystickGetDeviceGUID(i);
+        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+        {
+            gamepadindex = i;
+            break;
+        }
+    }
+
+    return gamepadindex;
+}
+
+static int DeviceIndexGamepad(void)
+{
+    SDL_JoystickGUID guid, dev_guid;
+    int index = -1;
+
+    if (strcmp(joystick_guid, ""))
+    {
+        guid = SDL_JoystickGetGUIDFromString(joystick_guid);
+
+        // First, look for the gamepad at the previously-used index.
+        if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
+        {
+            dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
+            if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+            {
+                return joystick_index;
+            }
+        }
+
+        // Maybe the index has moved?
+        index = FindSpecificGamepad(guid);
+    }
+
+    // If the previous gamepad isn't present, see if a different one is
+    // available.
+    if (index < 0)
+    {
+        index = FindFirstGamepad();
+    }
+
+    return index;
+}
+
+void I_InitGamepad(void)
+{
+    SDL_JoystickGUID guid;
+    int index;
+
+    if (!use_gamepad)
+    {
+        return;
+    }
+
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
+    {
+        return;
+    }
+
+    index = DeviceIndexGamepad();
+
+    if (index < 0)
+    {
+        printf("I_InitGamepad: No gamepad found.\n");
+        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+        return;
+    }
+
+    gamepad = SDL_GameControllerOpen(index);
+
+    if (gamepad == NULL)
+    {
+        printf("I_InitGamepad: Failed to open gamepad: %s\n", SDL_GetError());
+        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+        return;
+    }
+
+    joystick_index = index;
+    gamepad_type = SDL_GameControllerTypeForIndex(index);
+
+    if (strcmp(joystick_guid, ""))
+    {
+        joystick_guid = malloc(GUID_STRING_BUF_SIZE);
+    }
+
+    guid = SDL_JoystickGetDeviceGUID(joystick_index);
+    SDL_JoystickGetGUIDString(guid, joystick_guid, GUID_STRING_BUF_SIZE);
+
+    // GameController events do not fire if Joystick events are disabled.
+    SDL_JoystickEventState(SDL_ENABLE);
+    SDL_GameControllerEventState(SDL_ENABLE);
+
+    printf("I_InitGamepad: %s\n", SDL_GameControllerName(gamepad));
+    I_AtExit(I_ShutdownGamepad, true);
+}
+
+static int GetTriggerStateGamepad(SDL_GameControllerAxis trigger)
+{
+    return (SDL_GameControllerGetAxis(gamepad, trigger) > TRIGGER_THRESHOLD);
+}
+
+// Get the state of the given virtual button.
+
+static int ReadButtonStateGamepad(int vbutton)
+{
+    int physbutton, state;
+
+    // Map from virtual button to physical (SDL) button.
+    if (vbutton < NUM_VIRTUAL_BUTTONS)
+    {
+        physbutton = joystick_physical_buttons[vbutton];
+    }
+    else
+    {
+        physbutton = vbutton;
+    }
+
+    switch (physbutton)
+    {
+        case GAMEPAD_BUTTON_TRIGGERLEFT:
+            state = GetTriggerStateGamepad(SDL_CONTROLLER_AXIS_TRIGGERLEFT);
+            break;
+
+        case GAMEPAD_BUTTON_TRIGGERRIGHT:
+            state = GetTriggerStateGamepad(SDL_CONTROLLER_AXIS_TRIGGERRIGHT);
+            break;
+
+        default:
+            state = SDL_GameControllerGetButton(gamepad, physbutton);
+            break;
+    }
+
+    return state;
+}
+
+// Get a bitmask of all currently-pressed buttons
+
+static int GetButtonsStateGamepad(void)
+{
+    int i;
+    int result = 0;
+
+    for (i = 0; i < MAX_VIRTUAL_BUTTONS; ++i)
+    {
+        if (ReadButtonStateGamepad(i))
+        {
+            result |= 1u << i;
+        }
+    }
+
+    return result;
+}
+
+// Read the state of an axis, inverting if necessary.
+
+static int GetAxisStateGamepad(const int *axis_values, int axis, int invert,
+                               int dead_zone)
+{
+    int result;
+
+    // Axis -1 means disabled.
+
+    if (axis < 0)
+    {
+        return 0;
+    }
+
+    // Dead zone is expressed as percentage of axis max value
+    dead_zone = 32768 * dead_zone / 100;
+
+    result = axis_values[axis];
+
+    if (result < dead_zone && result > -dead_zone)
+    {
+        return 0;
+    }
+
+    if (invert)
+    {
+        result = -result;
+    }
+
+    result *= FRACUNIT / 32768; // Want FXP number between -1 and 1
+
+    return result;
+}
+
+#define DIRECTION_DEADZONE (50 * 32768 / 100)
+
+static int GetDirectionalInputGamepad(const int *axis_values)
+{
+    int value;
+    int dpad = JOY_DIR_NONE;
+    int leftstick = JOY_DIR_NONE;
+    int rightstick = JOY_DIR_NONE;
+
+    // Dpad.
+    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_UP))
+    {
+        dpad |=  JOY_DIR_UP;
+    }
+
+    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_DOWN))
+    {
+        dpad |=  JOY_DIR_DOWN;
+    }
+
+    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_LEFT))
+    {
+        dpad |=  JOY_DIR_LEFT;
+    }
+
+    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_RIGHT))
+    {
+        dpad |= JOY_DIR_RIGHT;
+    }
+
+    // Left stick.
+    value = axis_values[SDL_CONTROLLER_AXIS_LEFTY];
+
+    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
+    {
+        if (value > 0)
+        {
+            leftstick |= JOY_DIR_DOWN;
+        }
+        else
+        {
+            leftstick |= JOY_DIR_UP;
+        }
+    }
+
+    value = axis_values[SDL_CONTROLLER_AXIS_LEFTX];
+
+    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
+    {
+        if (value > 0)
+        {
+            leftstick |= JOY_DIR_RIGHT;
+        }
+        else
+        {
+            leftstick |= JOY_DIR_LEFT;
+        }
+    }
+
+    // Right stick.
+    value = axis_values[SDL_CONTROLLER_AXIS_RIGHTX];
+
+    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
+    {
+        if (value > 0)
+        {
+            rightstick |= JOY_DIR_RIGHT;
+        }
+        else
+        {
+            rightstick |= JOY_DIR_LEFT;
+        }
+    }
+
+    value = axis_values[SDL_CONTROLLER_AXIS_RIGHTY];
+
+    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
+    {
+        if (value > 0)
+        {
+            rightstick |= JOY_DIR_DOWN;
+        }
+        else
+        {
+            rightstick |= JOY_DIR_UP;
+        }
+    }
+
+    return ((dpad << DPAD_SHIFT) | (leftstick << LSTICK_SHIFT) |
+            (rightstick << RSTICK_SHIFT));
+}
+
+void I_UpdateGamepad(void)
+{
+    if (gamepad != NULL)
+    {
+        event_t ev;
+        int axis_values[SDL_CONTROLLER_AXIS_MAX];
+
+        axis_values[SDL_CONTROLLER_AXIS_LEFTX] =
+            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_LEFTX);
+
+        axis_values[SDL_CONTROLLER_AXIS_LEFTY] =
+            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_LEFTY);
+
+        axis_values[SDL_CONTROLLER_AXIS_RIGHTX] =
+            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_RIGHTX);
+
+        axis_values[SDL_CONTROLLER_AXIS_RIGHTY] =
+            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_RIGHTY);
+
+        ev.type = ev_joystick;
+        ev.data1 = GetButtonsStateGamepad();
+        ev.data2 = GetAxisStateGamepad(axis_values, joystick_x_axis,
+                                       joystick_x_invert, joystick_x_dead_zone);
+        ev.data3 = GetAxisStateGamepad(axis_values, joystick_y_axis,
+                                       joystick_y_invert, joystick_y_dead_zone);
+        ev.data4 = GetAxisStateGamepad(axis_values, joystick_strafe_axis,
+                                       joystick_strafe_invert,
+                                       joystick_strafe_dead_zone);
+        ev.data5 = GetAxisStateGamepad(axis_values, joystick_look_axis,
+                                       joystick_look_invert,
+                                       joystick_look_dead_zone);
+        ev.data6 = GetDirectionalInputGamepad(axis_values);
+
+        D_PostEvent(&ev);
+    }
+}
+
+void I_ShutdownJoystick(void)
+{
+    if (joystick != NULL)
+    {
+        SDL_JoystickClose(joystick);
+        joystick = NULL;
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+    }
+}
+
+static boolean IsValidAxis(int axis)
+{
+    int num_axes;
+
+    if (axis < 0)
+    {
+        return true;
+    }
+
+    if (IS_BUTTON_AXIS(axis))
+    {
+        return true;
+    }
+
+    if (IS_HAT_AXIS(axis))
+    {
+        return HAT_AXIS_HAT(axis) < SDL_JoystickNumHats(joystick);
+    }
+
+    num_axes = SDL_JoystickNumAxes(joystick);
+
+    return axis < num_axes;
+}
+
+static int DeviceIndex(void)
+{
+    SDL_JoystickGUID guid, dev_guid;
+    int i;
+
+    guid = SDL_JoystickGetGUIDFromString(joystick_guid);
+
+    // GUID identifies a class of device rather than a specific device.
+    // Check if joystick_index has the expected GUID, as this can act
+    // as a tie-breaker in case there are multiple identical devices.
+    if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
+    {
+        dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
+        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+        {
+            return joystick_index;
+        }
+    }
+
+    // Check all devices to look for one with the expected GUID.
+    for (i = 0; i < SDL_NumJoysticks(); ++i)
+    {
+        dev_guid = SDL_JoystickGetDeviceGUID(i);
+        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+        {
+            printf("I_InitJoystick: Joystick moved to index %d.\n", i);
+            return i;
+        }
+    }
+
+    // No joystick found with the expected GUID.
+    return -1;
+}
+
+void I_InitJoystick(void)
+{
+    int index;
+
+    if (!usejoystick || !strcmp(joystick_guid, ""))
+    {
+        return;
+    }
+
+    if (use_gamepad)
+    {
+        I_InitGamepad();
+        return;
+    }
+
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
+    {
+        return;
+    }
+
+    index = DeviceIndex();
+
+    if (index < 0)
+    {
+        printf("I_InitJoystick: Couldn't find joystick with GUID \"%s\": "
+               "device not found or not connected?\n",
+               joystick_guid);
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+        return;
+    }
+
+    // Open the joystick
+
+    joystick = SDL_JoystickOpen(index);
+
+    if (joystick == NULL)
+    {
+        printf("I_InitJoystick: Failed to open joystick #%i: %s\n", index,
+               SDL_GetError());
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+        return;
+    }
+
+    if (!IsValidAxis(joystick_x_axis)
+     || !IsValidAxis(joystick_y_axis)
+     || !IsValidAxis(joystick_strafe_axis)
+     || !IsValidAxis(joystick_look_axis))
+    {
+        printf("I_InitJoystick: Invalid joystick axis for configured joystick "
+               "(run joystick setup again)\n");
+
+        SDL_JoystickClose(joystick);
+        joystick = NULL;
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+    }
+
+    SDL_JoystickEventState(SDL_ENABLE);
+
+    // Initialized okay!
+
+    printf("I_InitJoystick: %s\n", SDL_JoystickName(joystick));
+
+    I_AtExit(I_ShutdownJoystick, true);
+}
+
+static boolean IsAxisButton(int physbutton)
+{
+    if (IS_BUTTON_AXIS(joystick_x_axis))
+    {
+        if (physbutton == BUTTON_AXIS_NEG(joystick_x_axis)
+         || physbutton == BUTTON_AXIS_POS(joystick_x_axis))
+        {
+            return true;
+        }
+    }
+    if (IS_BUTTON_AXIS(joystick_y_axis))
+    {
+        if (physbutton == BUTTON_AXIS_NEG(joystick_y_axis)
+         || physbutton == BUTTON_AXIS_POS(joystick_y_axis))
+        {
+            return true;
+        }
+    }
+    if (IS_BUTTON_AXIS(joystick_strafe_axis))
+    {
+        if (physbutton == BUTTON_AXIS_NEG(joystick_strafe_axis)
+         || physbutton == BUTTON_AXIS_POS(joystick_strafe_axis))
+        {
+            return true;
+        }
+    }
+    if (IS_BUTTON_AXIS(joystick_look_axis))
+    {
+        if (physbutton == BUTTON_AXIS_NEG(joystick_look_axis)
+         || physbutton == BUTTON_AXIS_POS(joystick_look_axis))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Get the state of the given virtual button.
+
+static int ReadButtonState(int vbutton)
+{
+    int physbutton;
+
+    // Map from virtual button to physical (SDL) button.
+    if (vbutton < NUM_VIRTUAL_BUTTONS)
+    {
+        physbutton = joystick_physical_buttons[vbutton];
+    }
+    else
+    {
+        physbutton = vbutton;
+    }
+
+    // Never read axis buttons as buttons.
+    if (IsAxisButton(physbutton))
+    {
+        return 0;
+    }
+
+    return SDL_JoystickGetButton(joystick, physbutton);
+}
+
+// Get a bitmask of all currently-pressed buttons
+
+static int GetButtonsState(void)
+{
+    int i;
+    int result = 0;
+
+    for (i = 0; i < MAX_VIRTUAL_BUTTONS; ++i)
+    {
+        if (ReadButtonState(i))
+        {
+            result |= 1 << i;
+        }
+    }
+
+    return result;
+}
+
+// Read the state of an axis, inverting if necessary.
+
+static int GetAxisState(int axis, int invert, int dead_zone)
+{
+    int result;
+
+    // Axis -1 means disabled.
+
+    if (axis < 0)
+    {
+        return 0;
+    }
+
+    // Is this a button axis, or a hat axis?
+    // If so, we need to handle it specially.
+
+    result = 0;
+
+    if (IS_BUTTON_AXIS(axis))
+    {
+        if (SDL_JoystickGetButton(joystick, BUTTON_AXIS_NEG(axis)))
+        {
+            result -= 32767;
+        }
+        if (SDL_JoystickGetButton(joystick, BUTTON_AXIS_POS(axis)))
+        {
+            result += 32767;
+        }
+    }
+    else if (IS_HAT_AXIS(axis))
+    {
+        int direction = HAT_AXIS_DIRECTION(axis);
+        int hatval = SDL_JoystickGetHat(joystick, HAT_AXIS_HAT(axis));
+
+        if (direction == HAT_AXIS_HORIZONTAL)
+        {
+            if ((hatval & SDL_HAT_LEFT) != 0)
+            {
+                result -= 32767;
+            }
+            else if ((hatval & SDL_HAT_RIGHT) != 0)
+            {
+                result += 32767;
+            }
+        }
+        else if (direction == HAT_AXIS_VERTICAL)
+        {
+            if ((hatval & SDL_HAT_UP) != 0)
+            {
+                result -= 32767;
+            }
+            else if ((hatval & SDL_HAT_DOWN) != 0)
+            {
+                result += 32767;
+            }
+        }
+    }
+    else
+    {
+        result = SDL_JoystickGetAxis(joystick, axis);
+
+        // Dead zone is expressed as percentage of axis max value
+        dead_zone = 32768 * dead_zone / 100;
+
+        if (result < dead_zone && result > -dead_zone)
+        {
+            result = 0;
+        }
+    }
+
+    if (invert)
+    {
+        result = -result;
+    }
+
+    result *= FRACUNIT / 32768; // Want FXP number between -1 and 1
+
+    return result;
+}
+
+static int GetDirectionalInput(int x, int y)
+{
+    int retval = JOY_DIR_NONE;
+
+    if (x > 0)
+    {
+        retval |= JOY_DIR_RIGHT;
+    }
+    else if (x < 0)
+    {
+        retval |= JOY_DIR_LEFT;
+    }
+
+    if (y > 0)
+    {
+        retval |= JOY_DIR_DOWN;
+    }
+    else if (y < 0)
+    {
+        retval |= JOY_DIR_UP;
+    }
+
+    return (retval << DPAD_SHIFT);
+}
+
+void I_UpdateJoystick(void)
+{
+    if (use_gamepad)
+    {
+        I_UpdateGamepad();
+        return;
+    }
+
+    if (joystick != NULL)
+    {
+        event_t ev;
+
+        ev.type = ev_joystick;
+        ev.data1 = GetButtonsState();
+        ev.data2 = GetAxisState(joystick_x_axis, joystick_x_invert,
+                                joystick_x_dead_zone);
+        ev.data3 = GetAxisState(joystick_y_axis, joystick_y_invert,
+                                joystick_y_dead_zone);
+        ev.data4 = GetAxisState(joystick_strafe_axis, joystick_strafe_invert,
+                                joystick_strafe_dead_zone);
+        ev.data5 = GetAxisState(joystick_look_axis, joystick_look_invert,
+                                joystick_look_dead_zone);
+        ev.data6 = GetDirectionalInput(ev.data2, ev.data3);
+        D_PostEvent(&ev);
+    }
+}
+
+void I_BindJoystickVariables(void)
+{
+    int i;
+
+    M_BindIntVariable("use_joystick",          &usejoystick);
+    M_BindIntVariable("use_gamepad",           &use_gamepad);
+    M_BindIntVariable("gamepad_type",          &gamepad_type);
+    M_BindStringVariable("joystick_guid",      &joystick_guid);
+    M_BindIntVariable("joystick_index",        &joystick_index);
+    M_BindIntVariable("joystick_x_axis",       &joystick_x_axis);
+    M_BindIntVariable("joystick_y_axis",       &joystick_y_axis);
+    M_BindIntVariable("joystick_strafe_axis",  &joystick_strafe_axis);
+    M_BindIntVariable("joystick_x_invert",     &joystick_x_invert);
+    M_BindIntVariable("joystick_y_invert",     &joystick_y_invert);
+    M_BindIntVariable("joystick_strafe_invert",&joystick_strafe_invert);
+    M_BindIntVariable("joystick_look_axis",    &joystick_look_axis);
+    M_BindIntVariable("joystick_look_invert",  &joystick_look_invert);
+    M_BindIntVariable("joystick_x_dead_zone", &joystick_x_dead_zone);
+    M_BindIntVariable("joystick_y_dead_zone", &joystick_y_dead_zone);
+    M_BindIntVariable("joystick_strafe_dead_zone", &joystick_strafe_dead_zone);
+    M_BindIntVariable("joystick_look_dead_zone", &joystick_look_dead_zone);
+    M_BindIntVariable("use_analog", &use_analog);
+    M_BindIntVariable("joystick_turn_sensitivity", &joystick_turn_sensitivity);
+    M_BindIntVariable("joystick_move_sensitivity", &joystick_move_sensitivity);
+    M_BindIntVariable("joystick_look_sensitivity", &joystick_look_sensitivity);
+
+    for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
+    {
+        char name[32];
+        M_snprintf(name, sizeof(name), "joystick_physical_button%i", i);
+        M_BindIntVariable(name, &joystick_physical_buttons[i]);
+    }
+}
+
diff --git a/games/NXDoom/src/i_joystick.h b/games/NXDoom/src/i_joystick.h
new file mode 100644
index 000000000..15c8daa30
--- /dev/null
+++ b/games/NXDoom/src/i_joystick.h
@@ -0,0 +1,115 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      System-specific joystick interface.
+//
+
+
+#ifndef __I_JOYSTICK__
+#define __I_JOYSTICK__
+
+#include "SDL_gamecontroller.h"
+
+// Number of "virtual" joystick buttons defined in configuration files.
+// This needs to be at least as large as the number of different key
+// bindings supported by the higher-level game code (joyb* variables).
+#define NUM_VIRTUAL_BUTTONS 17
+
+// Max allowed number of virtual mappings. Chosen to be less than joybspeed
+// autorun value.
+#define MAX_VIRTUAL_BUTTONS 20
+
+// If this bit is set in a configuration file axis value, the axis is
+// not actually a joystick axis, but instead is a "button axis". This
+// means that instead of reading an SDL joystick axis, we read the
+// state of two buttons to get the axis value. This is needed for eg.
+// the PS3 SIXAXIS controller, where the D-pad buttons register as
+// buttons, not as two axes.
+#define BUTTON_AXIS 0x10000
+
+// Query whether a given axis value describes a button axis.
+#define IS_BUTTON_AXIS(axis) ((axis) >= 0 && ((axis) & BUTTON_AXIS) != 0)
+
+// Get the individual buttons from a button axis value.
+#define BUTTON_AXIS_NEG(axis)  ((axis) & 0xff)
+#define BUTTON_AXIS_POS(axis)  (((axis) >> 8) & 0xff)
+
+// Create a button axis value from two button values.
+#define CREATE_BUTTON_AXIS(neg, pos) (BUTTON_AXIS | (neg) | ((pos) << 8))
+
+// If this bit is set in an axis value, the axis is not actually a
+// joystick axis, but is a "hat" axis. This means that we read (one of)
+// the hats on the joystick.
+#define HAT_AXIS    0x20000
+
+#define IS_HAT_AXIS(axis) ((axis) >= 0 && ((axis) & HAT_AXIS) != 0)
+
+// Get the hat number from a hat axis value.
+#define HAT_AXIS_HAT(axis)         ((axis) & 0xff)
+// Which axis of the hat? (horizonal or vertical)
+#define HAT_AXIS_DIRECTION(axis)   (((axis) >> 8) & 0xff)
+
+#define CREATE_HAT_AXIS(hat, direction) \
+    (HAT_AXIS | (hat) | ((direction) << 8))
+
+#define HAT_AXIS_HORIZONTAL 1
+#define HAT_AXIS_VERTICAL   2
+
+// When a trigger reads greater than this, consider it to be pressed.  30 comes
+// from XINPUT_GAMEPAD_TRIGGER_THRESHOLD in xinput.h, and is scaled here for
+// the SDL_GameController trigger max value.
+#define TRIGGER_THRESHOLD (30 * 32767 / 255)
+
+// To be used with SDL_JoystickGetGUIDString; see SDL_joystick.h
+#define GUID_STRING_BUF_SIZE 33
+
+// Helper macros for bitpacked directional data from gamepad inputs.
+#define DPAD_SHIFT 0
+#define LSTICK_SHIFT 4
+#define RSTICK_SHIFT 8
+#define JOY_GET_DPAD(x) (((x) >> DPAD_SHIFT) & 0xf)
+#define JOY_GET_LSTICK(x) (((x) >> LSTICK_SHIFT) & 0xf)
+#define JOY_GET_RSTICK(x) (((x) >> RSTICK_SHIFT) & 0xf)
+
+// 4-way direction data for gamepad directional inputs.
+enum
+{
+    JOY_DIR_NONE = 0x0,
+    JOY_DIR_UP = 0x1,
+    JOY_DIR_DOWN = 0x2,
+    JOY_DIR_LEFT = 0x4,
+    JOY_DIR_RIGHT = 0x8
+};
+
+// Extend the SDL_GameControllerButton enum to include the triggers.
+enum
+{
+    GAMEPAD_BUTTON_TRIGGERLEFT = SDL_CONTROLLER_BUTTON_MAX,
+    GAMEPAD_BUTTON_TRIGGERRIGHT,
+    GAMEPAD_BUTTON_MAX
+};
+
+extern int use_analog;
+extern int joystick_turn_sensitivity;
+extern int joystick_move_sensitivity;
+extern int joystick_look_sensitivity;
+
+void I_InitJoystick(void);
+void I_ShutdownJoystick(void);
+void I_UpdateJoystick(void);
+
+void I_BindJoystickVariables(void);
+
+#endif /* #ifndef __I_JOYSTICK__ */
+
diff --git a/games/NXDoom/src/i_main.c b/games/NXDoom/src/i_main.c
new file mode 100644
index 000000000..851f0e9d2
--- /dev/null
+++ b/games/NXDoom/src/i_main.c
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Main program, simply calls D_DoomMain high level loop.
+//
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "SDL.h"
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_misc.h"
+
+
+//
+// D_DoomMain()
+// Not a globally visible function, just included for source reference,
+// calls all startup code, parses command line options.
+//
+
+void D_DoomMain (void);
+
+int main(int argc, char **argv)
+{
+    // save arguments
+
+    myargc = argc;
+    myargv = malloc(argc * sizeof(char *));
+    assert(myargv != NULL);
+
+    for (int i = 0; i < argc; i++)
+    {
+        myargv[i] = M_StringDuplicate(argv[i]);
+    }
+
+    //!
+    // Print the program version and exit.
+    //
+    if (M_ParmExists("-version") || M_ParmExists("--version")) {
+        puts(PACKAGE_STRING);
+        exit(0);
+    }
+
+#if defined(_WIN32)
+    // compose a proper command line from loose file paths passed as arguments
+    // to allow for loading WADs and DEHACKED patches by drag-and-drop
+    M_AddLooseFiles();
+#endif
+
+    M_FindResponseFile();
+    M_SetExeDir();
+
+    SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1");
+
+    // start doom
+
+    D_DoomMain ();
+
+    return 0;
+}
+
diff --git a/games/NXDoom/src/i_musicpack.c b/games/NXDoom/src/i_musicpack.c
new file mode 100644
index 000000000..10a2d1648
--- /dev/null
+++ b/games/NXDoom/src/i_musicpack.c
@@ -0,0 +1,1496 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System interface for music.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "SDL.h"
+
+#include "i_glob.h"
+
+#include "config.h"
+#include "doomtype.h"
+#include "memio.h"
+#include "mus2mid.h"
+
+#include "deh_str.h"
+#include "gusconf.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "sha1.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+
+char *music_pack_path = "";
+
+
+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+#define MID_HEADER_MAGIC "MThd"
+#define MUS_HEADER_MAGIC "MUS\x1a"
+
+// Starting with 2.6.0, SDL_mixer supports OGG and FLAC looping natively.
+// TODO: Once SDL_mixer 2.6.0+ is a requirement, delete the old looping code.
+#if !defined(USE_SDL_MIXER_LOOPING)
+#if defined(SDL_MIXER_VERSION_ATLEAST)
+#if SDL_MIXER_VERSION_ATLEAST(2, 6, 0)
+#define USE_SDL_MIXER_LOOPING 1
+#else
+#define USE_SDL_MIXER_LOOPING 0
+#endif // SDL_MIXER_VERSION_ATLEAST(2, 6, 0)
+#else
+#define USE_SDL_MIXER_LOOPING 0
+#endif // defined(SDL_MIXER_VERSION_ATLEAST)
+#endif // !defined(USE_SDL_MIXER_LOOPING)
+
+#if !USE_SDL_MIXER_LOOPING
+#define FLAC_HEADER "fLaC"
+#define OGG_HEADER "OggS"
+
+// Looping Vorbis metadata tag names. These have been defined by ZDoom
+// for specifying the start and end positions for looping music tracks
+// in .ogg and .flac files.
+// More information is here: http://zdoom.org/wiki/Audio_loop
+#define LOOP_START_TAG "LOOP_START"
+#define LOOP_END_TAG   "LOOP_END"
+
+// FLAC metadata headers that we care about.
+#define FLAC_STREAMINFO      0
+#define FLAC_VORBIS_COMMENT  4
+
+// Ogg metadata headers that we care about.
+#define OGG_ID_HEADER        1
+#define OGG_COMMENT_HEADER   3
+#endif // !USE_SDL_MIXER_LOOPING
+
+// Structure for music substitution.
+// We store a mapping based on SHA1 checksum -> filename of substitute music
+// file to play, so that substitution occurs based on content rather than
+// lump name. This has some inherent advantages:
+//  * Music for Plutonia (reused from Doom 1) works automatically.
+//  * If a PWAD replaces music, the replacement music is used rather than
+//    the substitute music for the IWAD.
+//  * If a PWAD reuses music from an IWAD (even from a different game), we get
+//    the high quality version of the music automatically (neat!)
+
+typedef struct
+{
+    const char *hash_prefix;
+    const char *filename;
+} subst_music_t;
+
+#if !USE_SDL_MIXER_LOOPING
+// Structure containing parsed metadata read from a digital music track:
+typedef struct
+{
+    boolean valid;
+    unsigned int samplerate_hz;
+    int start_time, end_time;
+} file_metadata_t;
+#endif // !USE_SDL_MIXER_LOOPING
+
+static subst_music_t *subst_music = NULL;
+static unsigned int subst_music_len = 0;
+
+static boolean music_initialized = false;
+
+// If this is true, this module initialized SDL sound and has the 
+// responsibility to shut it down
+
+static boolean sdl_was_initialized = false;
+
+#if !USE_SDL_MIXER_LOOPING
+// If true, we are playing a substitute digital track rather than in-WAD
+// MIDI/MUS track, and file_metadata contains loop metadata.
+static file_metadata_t file_metadata;
+
+// Position (in samples) that we have reached in the current track.
+// This is updated by the TrackPositionCallback function.
+static unsigned int current_track_pos;
+#endif // !USE_SDL_MIXER_LOOPING
+
+// Currently playing music track.
+static Mix_Music *current_track_music = NULL;
+
+// If true, the currently playing track is being played on loop.
+static boolean current_track_loop;
+
+// Table of known hashes and filenames to look up for them. This allows
+// users to drop in a set of files without having to also provide a
+// configuration file.
+static const subst_music_t known_filenames[] = {
+    // Doom 1 music files.
+    {"b2e05b4e8dff8d76f8f4", "d_inter.{ext}"},
+    {"0c0acce45130bab935d2", "d_intro.{ext}"},
+    {"fca4086939a68ae4ed84", "d_victor.{ext}"},
+    {"5971e5e20554f47ca065", "d_intro.{ext}"},
+    {"99767e32769229897f77", "d_e1m1.{ext}"},
+    {"b5e7dfb4efe9e688bf2a", "d_e1m2.{ext}"},
+    {"fda8fa73e4d30a6b961c", "d_e1m3.{ext}"},
+    {"3805f9bf3f1702f7e7f5", "d_e1m4.{ext}"},
+    {"f546ed823b234fe39165", "d_e1m5.{ext}"},
+    {"4450811b5a6748cfd83e", "d_e1m6.{ext}"},
+    {"73edb50d96b0ac03be34", "d_e1m7.{ext}"},
+    {"47d711a6fd32f5047879", "d_e1m8.{ext}"},
+    {"62c631c2fdaa5ecd9a8d", "d_e1m9.{ext}"},
+    {"7702a6449585428e7185", "d_e2m1.{ext}"},
+    {"1cb1810989cbfae2b29b", "d_e2m2.{ext}"},
+    {"7d740f3c881a22945e47", "d_e2m4.{ext}"},
+    {"ae9c3dc2f9aeea002327", "d_e2m6.{ext}"},
+    {"b26aad3caa420e9a2c76", "d_e2m7.{ext}"},
+    {"90f06251a2a90bfaefd4", "d_e2m8.{ext}"},
+    {"b2fb439f23c08c8e2577", "d_e3m1.{ext}"},
+    {"b6c07bb249526b864208", "d_e3m2.{ext}"},
+    {"ce3587ee503ffe707b2d", "d_e3m3.{ext}"},
+    {"d746ea2aa16b3237422c", "d_e3m8.{ext}"},
+    {"3da3b1335560a92912e6", "d_bunny.{ext}"},
+
+    // Duplicates that don't have identical hashes:
+    {"4a5badc4f10a7d4ed021", "d_inter.{ext}"},  // E2M3
+    {"36b14bf165b3fdd3958e", "d_e1m7.{ext}"},   // E3M5
+    {"e77c3d42f2ea87f04607", "d_e1m6.{ext}"},   // E3M6
+    {"3d85ec9c10b5ea465568", "d_e2m7.{ext}"},   // E3M7
+    {"4d42e2ce1c1ff192500e", "d_e1m9.{ext}"},   // E3M9
+
+    // These tracks are reused in Alien Vendetta, but are MIDs:
+    {"a05e45f67e1b64733fe3", "d_e2m1.{ext}"},   // MAP02
+    {"8024ae1616ddd97ce330", "d_e1m4.{ext}"},   // MAP03
+    {"3af8d79ddba49edaf9eb", "d_victor.{ext}"}, // MAP05
+    {"a55352c96c025b6bd08a", "d_inter.{ext}"},  // MAP07
+    {"76d1fc25ab7b1b4a58d6", "d_e1m8.{ext}"},   // MAP11
+    {"497777f0863eca7cea87", "d_e1m2.{ext}"},   // MAP12
+    {"0228fd87f8762f112fb6", "d_e2m2.{ext}"},   // MAP13
+    {"db94e8e1d7c02092eab5", "d_e1m6.{ext}"},   // MAP14
+    {"5a8d7a307eebc952795c", "d_e2m7.{ext}"},   // MAP16
+    {"1a36b692bf26d94a72cc", "d_e1m7.{ext}"},   // MAP23
+    {"37c6cefa351b06995152", "d_e1m5.{ext}"},   // MAP27
+    {"36b97b87fe98348d44b6", "d_e2m6.{ext}"},   // MAP28
+
+    // Doom II music files.
+    {"79080e9681a2d7bec3fb", "d_runnin.{ext}"},  // MAP01,15
+    {"868b3aae73c7b12e92c0", "d_stalks.{ext}"},  // MAP02,11,17
+    {"19237754d2eb85f41d84", "d_countd.{ext}"},  // MAP03,21
+    {"00abff3b61b25a6855d2", "d_betwee.{ext}"},  // MAP04
+    {"954636c7ee09edf5d98f", "d_doom.{ext}"},    // MAP05,13
+    {"8d32b2b7aa3b806474c1", "d_the_da.{ext}"},  // MAP06,12,24
+    {"41efc3c84bb321af2b6b", "d_shawn.{ext}"},   // MAP07,19,29
+    // Assuming single D_DDTBLU: http://doomwiki.org/wiki/Doom_II_music#Trivia
+    {"51c0872fec9f43259318", "d_ddtblu.{ext}"},  // MAP08
+    {"acb7ad85494d18235df8", "d_ddtblu.{ext}"},  // MAP14,22
+    {"4b7ceccbf47e78e2fa0b", "d_in_cit.{ext}"},  // MAP09
+    {"1d1f4a9edba174584e11", "d_dead.{ext}"},    // MAP10,16
+    {"1736c81aac77f9bffd3d", "d_romero.{ext}"},  // MAP18,27
+    {"a55d400570ad255a576b", "d_messag.{ext}"},  // MAP20,26
+    {"29d30c3fbd712016f2e5", "d_ampie.{ext}"},   // MAP23
+    {"bcfe9786afdcfb704afa", "d_adrian.{ext}"},  // MAP25
+    {"e05c10389e71836834ae", "d_tense.{ext}"},   // MAP28
+    {"b779022b1d0f0010b8f0", "d_openin.{ext}"},  // MAP30
+    {"a9a5f7b0ab3be0f4fc24", "d_evil.{ext}"},    // MAP31
+    {"4503d155aafec0296689", "d_ultima.{ext}"},  // MAP32
+    {"56f2363f01df38908c77", "d_dm2ttl.{ext}"},
+    {"71e58baf9e9dea4dd24a", "d_dm2int.{ext}"},
+    {"e632318629869811f7dc", "d_read_m.{ext}"},
+
+    // Duplicate filenames: the above filenames are the "canonical" files
+    // for the given SHA1 hashes, but we can also look for these filenames
+    // corresponding to the duplicated music tracks too.
+    {"868b3aae73c7b12e92c0", "d_stlks2.{ext}"},
+    {"868b3aae73c7b12e92c0", "d_stlks3.{ext}"},
+    {"8d32b2b7aa3b806474c1", "d_theda2.{ext}"},
+    {"8d32b2b7aa3b806474c1", "d_theda3.{ext}"},
+    {"954636c7ee09edf5d98f", "d_doom2.{ext}"},
+    {"acb7ad85494d18235df8", "d_ddtbl2.{ext}"},
+    {"acb7ad85494d18235df8", "d_ddtbl3.{ext}"},
+    {"79080e9681a2d7bec3fb", "d_runni2.{ext}"},
+    {"1d1f4a9edba174584e11", "d_dead2.{ext}"},
+    {"41efc3c84bb321af2b6b", "d_shawn2.{ext}"},
+    {"41efc3c84bb321af2b6b", "d_shawn3.{ext}"},
+    {"19237754d2eb85f41d84", "d_count2.{ext}"},
+    {"a55d400570ad255a576b", "d_messg2.{ext}"},
+    {"1736c81aac77f9bffd3d", "d_romer2.{ext}"},
+
+    // These tracks are reused in Alien Vendetta, but are MIDs:
+    {"9433604c098b7b1119a4", "d_in_cit.{ext}"},  // MAP26
+
+    // Heretic tracks.
+    {"12818ca0d3c957e7d57e", "mus_titl.{ext}"},
+    {"5cb988538ce1b1857349", "mus_intr.{ext}"},
+    {"6f126abe35a78b61b930", "mus_cptd.{ext}"},
+    {"62557250f0427c067dc9", "mus_e1m1.{ext}"},
+    {"1e8d5fd814490b9ae166", "mus_e1m2.{ext}"},
+    {"f0f31e8834e85035d434", "mus_e1m3.{ext}"},
+    {"054d6997405cc5a32b46", "mus_e1m4.{ext}"},
+    {"31950ab062cc1e5ca49d", "mus_e1m5.{ext}"},
+    {"7389024fbab0dff47211", "mus_e1m6.{ext}"},
+    {"f2aa312dddd0a294a095", "mus_e1m7.{ext}"},
+    {"cd6856731d1ae1f3aa4e", "mus_e1m8.{ext}"},
+    {"d7fe793f266733d92e61", "mus_e1m9.{ext}"},
+    {"933545b48fad8c66f042", "mus_e2m1.{ext}"},
+    {"bf88ecd4ae1621222592", "mus_e2m2.{ext}"},
+    {"4f619f87a828c2ca4801", "mus_e2m3.{ext}"},
+    {"13033a83c49424b2f2ab", "mus_e2m4.{ext}"},
+    {"b3851f9351ae411d9de3", "mus_e2m6.{ext}"},
+    {"82539791159fbbc02a23", "mus_e2m7.{ext}"},
+    {"fd9e53a49cfa62c463a0", "mus_e2m8.{ext}"},
+    {"29503959324d2ca67958", "mus_e2m9.{ext}"},
+    {"3aa632257c5be375b97b", "mus_e3m2.{ext}"},
+    {"69ba0dce7913d53b67a8", "mus_e3m3.{ext}"},
+
+    // These Heretic tracks are reused in Alien Vendetta, but are MIDs:
+    {"51344131e8d260753ce7", "mus_e2m3.{ext}"},  // MAP15
+    {"78b570b2397570440aff", "mus_e1m1.{ext}"},  // MAP19
+    {"ee21ba9fad4de3dfaef0", "mus_e1m4.{ext}"},  // MAP29
+    {"d2bb643a60696ccbca03", "mus_e1m9.{ext}"},  // MAP32
+
+    // Hexen tracks:
+    {"fbf55fc1ee26bd01266b", "winnowr.{ext}"},
+    {"71776e2da2b7ba607d81", "jachr.{ext}"},
+    {"c5c8630608b8132b33cd", "simonr.{ext}"},
+    {"43683b3f55a031de88d4", "wutzitr.{ext}"},
+    {"a6062883f29436ef73db", "falconr.{ext}"},
+    {"512cb6cc9b558d5f0fef", "levelr.{ext}"},
+    {"d31226ae75fce6a24208", "chartr.{ext}"},
+    {"bf1f1e561bbdba4e699f", "swampr.{ext}"},
+    {"b303193f756ca0e2de0f", "deepr.{ext}"},
+    {"f0635f0386d883b00186", "fubasr.{ext}"},
+    {"18f2a01f83df6e3abedc", "grover.{ext}"},
+    {"b2527eb0522f08b2cf5f", "fortr.{ext}"},
+    {"343addba8ba53a20a160", "foojar.{ext}"},
+    {"c13109045b06b5a63386", "sixater.{ext}"},
+    {"693525aaf69eac5429ab", "wobabyr.{ext}"},
+    {"8f884223811c2bb8311d", "cryptr.{ext}"},
+    {"de540e6826e62b32c01c", "fantar.{ext}"},
+    {"efdff548df918934f71f", "blechr.{ext}"},
+    {"de91f150f6a127e72e35", "voidr.{ext}"},
+    {"e0497fe27289fe18515b", "chap_1r.{ext}"},
+    {"f2ef1abdc3f672a3519a", "chap_2r.{ext}"},
+    {"78cd9882f61cc441bef4", "chap_3r.{ext}"},
+    {"97b2b575d9d096c1f89f", "chap_4r.{ext}"},
+    {"ad0197a0f6c52ac30915", "chippyr.{ext}"},
+    {"30506c62e9f0989ffe09", "percr.{ext}"},
+    {"3542803beaa43bf1de1a", "secretr.{ext}"},
+    {"81067721f40c611d09fb", "bonesr.{ext}"},
+    {"4822af2e1a2eb7faf660", "octor.{ext}"},
+    {"26bb3cec902ed8008fc2", "rithmr.{ext}"},
+    {"94ab641c7aa93caac77a", "stalkr.{ext}"},
+    {"d0a3f337c54b0703b4d3", "borkr.{ext}"},
+    {"79e7781ec7eb9b9434b5", "crucibr.{ext}"},
+    {"c2786e5581a7f8801969", "hexen.{ext}"},
+    {"97fae9a084c0efda5151", "hub.{ext}"},
+    {"c5da52d5c2ec4803ef8f", "hall.{ext}"},
+    {"1e71bc0e2feafb06214e", "orb.{ext}"},
+    {"bc9dcfa6632e847e03af", "chess.{ext}"},
+
+    // Hexen CD tracks: alternate filenames for a ripped copy of
+    // the CD soundtrack.
+    {"71776e2da2b7ba607d81", "hexen02.{ext}"},   // level  2 (jachr)
+    {"efdff548df918934f71f", "hexen03.{ext}"},   // level 26 (blechr)
+    {"c2786e5581a7f8801969", "hexen04.{ext}"},   // (hexen)
+    {"1e71bc0e2feafb06214e", "hexen05.{ext}"},   // (orb)
+    {"f0635f0386d883b00186", "hexen06.{ext}"},   // level 10 (fubasr)
+    {"bc9dcfa6632e847e03af", "hexen07.{ext}"},   // (chess)
+    {"8f884223811c2bb8311d", "hexen08.{ext}"},   // level 24 (cryptr)
+    {"a6062883f29436ef73db", "hexen09.{ext}"},   // level  5 (falconr)
+    {"4822af2e1a2eb7faf660", "hexen10.{ext}"},   // level 36 (octor)
+    {"26bb3cec902ed8008fc2", "hexen11.{ext}"},   // level 37 (rithmr)
+    {"c13109045b06b5a63386", "hexen12.{ext}"},   // level 22 (sixater)
+    {"fbf55fc1ee26bd01266b", "hexen13.{ext}"},   // level  1 (winnowr)
+    {"bf1f1e561bbdba4e699f", "hexen14.{ext}"},   // level  8 (swampr)
+    {"43683b3f55a031de88d4", "hexen15.{ext}"},   // level  4 (wutzitr)
+    {"81067721f40c611d09fb", "hexen16.{ext}"},   // level 35 (bonesr)
+    {"e0497fe27289fe18515b", "hexen17.{ext}"},   // level 28 (chap_1r)
+    {"97b2b575d9d096c1f89f", "hexen18.{ext}"},   // level 31 (chap_4r)
+    {"de540e6826e62b32c01c", "hexen19.{ext}"},   // level 25 (fantar)
+    {"343addba8ba53a20a160", "hexen20.{ext}"},   // level 21 (foojar)
+    {"512cb6cc9b558d5f0fef", "hexen21.{ext}"},   // level  6 (levelr)
+    {"c5c8630608b8132b33cd", "hexen22.{ext}"},   // level  3 (simonr)
+
+    // Strife:
+    {"8ac2b2b47707f0fdf8f6", "d_logo.{ext}"},   // Title
+    {"62e1c58054a1f1bc39b2", "d_action.{ext}"}, // 1,15,28
+    {"12fa000f3fa1edac5c4f", "d_tavern.{ext}"}, // 2
+    {"695e56ab3251792d20e5", "d_danger.{ext}"}, // 3,11
+    {"96fe30e8712217b60dd7", "d_fast.{ext}"},   // 4
+    {"61345598a3de04aad508", "d_darker.{ext}"}, // 6,14
+    {"52353e9a435b7b1cb268", "d_strike.{ext}"}, // 7,19
+    {"061164504907bffc9c22", "d_slide.{ext}"},  // 8,18,22
+    {"3dbb4b703ce69aafcdd5", "d_tribal.{ext}"}, // 9
+    {"393773688eba050c3548", "d_march.{ext}"},  // 10
+    {"3cba3c627de065a667dd", "d_mood.{ext}"},   // 12
+    {"b1f65a333e5c70255784", "d_castle.{ext}"}, // 13
+    {"e1455a83a04c9ac4a09f", "d_fight.{ext}"},  // 16,31
+    {"17f822b7374b1f069b89", "d_spense.{ext}"}, // 17
+    {"e66c5a1a7d05f021f4ae", "d_dark.{ext}"},   // 20
+    {"1c92bd0625026af30dad", "d_tech.{ext}"},   // 21,27
+    {"7ae280713d078de7933a", "d_drone.{ext}"},  // 23,30
+    {"4a664afd0d7eae79c97a", "d_panthr.{ext}"}, // 24
+    {"4a7d62beeac5601ccf21", "d_sad.{ext}"},    // 25
+    {"e60e109779400f2855d7", "d_instry.{ext}"}, // 26,29
+    {"b7d36878faeb291d6df5", "d_happy.{ext}"},  // Better ending
+    {"ff4a342c8c5ec51b06c3", "d_end.{ext}"},    // Worse ending
+    // This conflicts with Doom's d_intro:
+    //{"ec8fa484c4e85adbf700", "d_intro.{ext}"},  // 5
+};
+
+#if !USE_SDL_MIXER_LOOPING
+// Given a time string (for LOOP_START/LOOP_END), parse it and return
+// the time (in # samples since start of track) it represents.
+static unsigned int ParseVorbisTime(unsigned int samplerate_hz, char *value)
+{
+    char *num_start, *p;
+    unsigned int result = 0;
+    char c;
+
+    if (strchr(value, ':') == NULL)
+    {
+	return atoi(value);
+    }
+
+    result = 0;
+    num_start = value;
+
+    for (p = value; *p != '\0'; ++p)
+    {
+        if (*p == '.' || *p == ':')
+        {
+            c = *p; *p = '\0';
+            result = result * 60 + atoi(num_start);
+            num_start = p + 1;
+            *p = c;
+        }
+
+        if (*p == '.')
+        {
+            return result * samplerate_hz
+	         + (unsigned int) (atof(p) * samplerate_hz);
+        }
+    }
+
+    return (result * 60 + atoi(num_start)) * samplerate_hz;
+}
+
+// Given a vorbis comment string (eg. "LOOP_START=12345"), set fields
+// in the metadata structure as appropriate.
+static void ParseVorbisComment(file_metadata_t *metadata, char *comment)
+{
+    char *eq, *key, *value;
+
+    eq = strchr(comment, '=');
+
+    if (eq == NULL)
+    {
+        return;
+    }
+
+    key = comment;
+    *eq = '\0';
+    value = eq + 1;
+
+    if (!strcmp(key, LOOP_START_TAG))
+    {
+        metadata->start_time = ParseVorbisTime(metadata->samplerate_hz, value);
+    }
+    else if (!strcmp(key, LOOP_END_TAG))
+    {
+        metadata->end_time = ParseVorbisTime(metadata->samplerate_hz, value);
+    }
+}
+
+// Parse a vorbis comments structure, reading from the given file.
+static void ParseVorbisComments(file_metadata_t *metadata, FILE *fs)
+{
+    uint32_t buf;
+    unsigned int num_comments, i, comment_len;
+    char *comment;
+
+    // We must have read the sample rate already from an earlier header.
+    if (metadata->samplerate_hz == 0)
+    {
+	return;
+    }
+
+    // Skip the starting part we don't care about.
+    if (fread(&buf, 4, 1, fs) < 1)
+    {
+        return;
+    }
+    if (fseek(fs, LONG(buf), SEEK_CUR) != 0)
+    {
+	return;
+    }
+
+    // Read count field for number of comments.
+    if (fread(&buf, 4, 1, fs) < 1)
+    {
+        return;
+    }
+    num_comments = LONG(buf);
+
+    // Read each individual comment.
+    for (i = 0; i < num_comments; ++i)
+    {
+        // Read length of comment.
+        if (fread(&buf, 4, 1, fs) < 1)
+	{
+            return;
+	}
+
+        comment_len = LONG(buf);
+
+        // Read actual comment data into string buffer.
+        comment = calloc(1, comment_len + 1);
+        if (comment == NULL
+         || fread(comment, 1, comment_len, fs) < comment_len)
+        {
+            free(comment);
+            break;
+        }
+
+        // Parse comment string.
+        ParseVorbisComment(metadata, comment);
+        free(comment);
+    }
+}
+
+static void ParseFlacStreaminfo(file_metadata_t *metadata, FILE *fs)
+{
+    byte buf[34];
+
+    // Read block data.
+    if (fread(buf, sizeof(buf), 1, fs) < 1)
+    {
+        return;
+    }
+
+    // We only care about sample rate and song length.
+    metadata->samplerate_hz = (buf[10] << 12) | (buf[11] << 4)
+                            | (buf[12] >> 4);
+    // Song length is actually a 36 bit field, but 32 bits should be
+    // enough for everybody.
+    //metadata->song_length = (buf[14] << 24) | (buf[15] << 16)
+    //                      | (buf[16] << 8) | buf[17];
+}
+
+static void ParseFlacFile(file_metadata_t *metadata, FILE *fs)
+{
+    byte header[4];
+    unsigned int block_type;
+    size_t block_len;
+    boolean last_block;
+
+    for (;;)
+    {
+        long pos = -1;
+
+        // Read METADATA_BLOCK_HEADER:
+        if (fread(header, 4, 1, fs) < 1)
+        {
+            return;
+        }
+
+        block_type = header[0] & ~0x80;
+        last_block = (header[0] & 0x80) != 0;
+        block_len = (header[1] << 16) | (header[2] << 8) | header[3];
+
+        pos = ftell(fs);
+        if (pos < 0)
+        {
+            return;
+        }
+
+        if (block_type == FLAC_STREAMINFO)
+        {
+            ParseFlacStreaminfo(metadata, fs);
+        }
+        else if (block_type == FLAC_VORBIS_COMMENT)
+        {
+            ParseVorbisComments(metadata, fs);
+        }
+
+        if (last_block)
+        {
+            break;
+        }
+
+        // Seek to start of next block.
+        if (fseek(fs, pos + block_len, SEEK_SET) != 0)
+        {
+            return;
+        }
+    }
+}
+
+static void ParseOggIdHeader(file_metadata_t *metadata, FILE *fs)
+{
+    byte buf[21];
+
+    if (fread(buf, sizeof(buf), 1, fs) < 1)
+    {
+        return;
+    }
+
+    metadata->samplerate_hz = (buf[8] << 24) | (buf[7] << 16)
+                            | (buf[6] << 8) | buf[5];
+}
+
+static void ParseOggFile(file_metadata_t *metadata, FILE *fs)
+{
+    byte buf[7];
+    unsigned int offset;
+
+    // Scan through the start of the file looking for headers. They
+    // begin '[byte]vorbis' where the byte value indicates header type.
+    memset(buf, 0, sizeof(buf));
+
+    for (offset = 0; offset < 100 * 1024; ++offset)
+    {
+	// buf[] is used as a sliding window. Each iteration, we
+	// move the buffer one byte to the left and read an extra
+	// byte onto the end.
+        memmove(buf, buf + 1, sizeof(buf) - 1);
+
+        if (fread(&buf[6], 1, 1, fs) < 1)
+        {
+            return;
+        }
+
+        if (!memcmp(buf + 1, "vorbis", 6))
+        {
+            switch (buf[0])
+            {
+                case OGG_ID_HEADER:
+                    ParseOggIdHeader(metadata, fs);
+                    break;
+                case OGG_COMMENT_HEADER:
+		    ParseVorbisComments(metadata, fs);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+}
+
+static void ReadLoopPoints(const char *filename, file_metadata_t *metadata)
+{
+    FILE *fs;
+    char header[4];
+
+    metadata->valid = false;
+    metadata->samplerate_hz = 0;
+    metadata->start_time = 0;
+    metadata->end_time = -1;
+
+    fs = M_fopen(filename, "rb");
+
+    if (fs == NULL)
+    {
+        return;
+    }
+
+    // Check for a recognized file format; use the first four bytes
+    // of the file.
+
+    if (fread(header, 4, 1, fs) < 1)
+    {
+        fclose(fs);
+        return;
+    }
+
+    if (memcmp(header, FLAC_HEADER, 4) == 0)
+    {
+        ParseFlacFile(metadata, fs);
+    }
+    else if (memcmp(header, OGG_HEADER, 4) == 0)
+    {
+        ParseOggFile(metadata, fs);
+    }
+
+    fclose(fs);
+
+    // Only valid if at the very least we read the sample rate.
+    metadata->valid = metadata->samplerate_hz > 0;
+
+    // If start and end time are both zero, ignore the loop tags.
+    // This is consistent with other source ports.
+    if (metadata->start_time == 0 && metadata->end_time == 0)
+    {
+        metadata->valid = false;
+    }
+}
+#endif // !USE_SDL_MIXER_LOOPING
+
+// Given a MUS lump, look up a substitute MUS file to play instead
+// (or NULL to just use normal MIDI playback).
+
+static const char *GetSubstituteMusicFile(void *data, size_t data_len)
+{
+    sha1_context_t context;
+    sha1_digest_t hash;
+    const char *filename;
+    char hash_str[sizeof(sha1_digest_t) * 2 + 1];
+    unsigned int i;
+
+    // Don't bother doing a hash if we're never going to find anything.
+    if (subst_music_len == 0)
+    {
+        return NULL;
+    }
+
+    SHA1_Init(&context);
+    SHA1_Update(&context, data, data_len);
+    SHA1_Final(hash, &context);
+
+    // Build a string representation of the hash.
+    for (i = 0; i < sizeof(sha1_digest_t); ++i)
+    {
+        M_snprintf(hash_str + i * 2, sizeof(hash_str) - i * 2,
+                   "%02x", hash[i]);
+    }
+
+    // Look for a hash that matches.
+    // The substitute mapping list can (intentionally) contain multiple
+    // filename mappings for the same hash. This allows us to try
+    // different files and fall back if our first choice isn't found.
+
+    filename = NULL;
+
+    for (i = 0; i < subst_music_len; ++i)
+    {
+        if (M_StringStartsWith(hash_str, subst_music[i].hash_prefix))
+        {
+            filename = subst_music[i].filename;
+
+            // If the file exists, then use this file in preference to
+            // any fallbacks. But we always return a filename if it's
+            // in the list, even if it's just so we can print an error
+            // message to the user saying it doesn't exist.
+            if (M_FileExists(filename))
+            {
+                break;
+            }
+        }
+    }
+
+    return filename;
+}
+
+static char *GetFullPath(const char *musicdir, const char *path)
+{
+    char *result;
+    char *systemized_path;
+
+    // Starting with directory separator means we have an absolute path,
+    // so just return it.
+    if (path[0] == DIR_SEPARATOR)
+    {
+        return M_StringDuplicate(path);
+    }
+
+#ifdef _WIN32
+    // d:\path\...
+    if (isalpha(path[0]) && path[1] == ':' && path[2] == DIR_SEPARATOR)
+    {
+        return M_StringDuplicate(path);
+    }
+#endif
+
+    // Paths in the substitute filenames can contain Unix-style /
+    // path separators, but we should convert this to the separator
+    // for the native platform.
+    systemized_path = M_StringReplace(path, "/", DIR_SEPARATOR_S);
+
+    // Copy config filename and cut off the filename to just get the
+    // parent dir.
+    result = M_StringJoin(musicdir, systemized_path, NULL);
+    free(systemized_path);
+
+    return result;
+}
+
+// If filename ends with .{ext}, check if a .ogg, .flac or .mp3 exists with
+// that name, returning it if found. If none exist, NULL is returned. If the
+// filename doesn't end with .{ext} then it just acts as a wrapper around
+// GetFullPath().
+static char *ExpandFileExtension(const char *musicdir, const char *filename)
+{
+    static const char *extns[] = {".flac", ".ogg", ".mp3"};
+    char *replaced, *result;
+    int i;
+
+    if (!M_StringEndsWith(filename, ".{ext}"))
+    {
+        return GetFullPath(musicdir, filename);
+    }
+
+    for (i = 0; i < arrlen(extns); ++i)
+    {
+        replaced = M_StringReplace(filename, ".{ext}", extns[i]);
+        result = GetFullPath(musicdir, replaced);
+        free(replaced);
+        if (M_FileExists(result))
+        {
+            return result;
+        }
+        free(result);
+    }
+
+    return NULL;
+}
+
+// Add a substitute music file to the lookup list.
+static void AddSubstituteMusic(const char *musicdir, const char *hash_prefix,
+                               const char *filename)
+{
+    subst_music_t *s;
+    char *path;
+
+    path = ExpandFileExtension(musicdir, filename);
+    if (path == NULL)
+    {
+        return;
+    }
+
+    ++subst_music_len;
+    subst_music =
+        I_Realloc(subst_music, sizeof(subst_music_t) * subst_music_len);
+    s = &subst_music[subst_music_len - 1];
+    s->hash_prefix = hash_prefix;
+    s->filename = path;
+}
+
+static const char *ReadHashPrefix(char *line)
+{
+    char *result;
+    char *p;
+    int i, len;
+
+    for (p = line; *p != '\0' && !isspace(*p) && *p != '='; ++p)
+    {
+        if (!isxdigit(*p))
+        {
+            return NULL;
+        }
+    }
+
+    len = p - line;
+    if (len == 0 || len > sizeof(sha1_digest_t) * 2)
+    {
+        return NULL;
+    }
+
+    result = malloc(len + 1);
+    if (result == NULL)
+    {
+        return NULL;
+    }
+
+    for (i = 0; i < len; ++i)
+    {
+        result[i] = tolower(line[i]);
+    }
+    result[len] = '\0';
+
+    return result;
+}
+
+// Parse a line from substitute music configuration file; returns error
+// message or NULL for no error.
+
+static const char *ParseSubstituteLine(char *musicdir, char *line)
+{
+    const char *hash_prefix;
+    char *filename;
+    char *p;
+
+    // Strip out comments if present.
+    p = strchr(line, '#');
+    if (p != NULL)
+    {
+        while (p > line && isspace(*(p - 1)))
+        {
+            --p;
+        }
+        *p = '\0';
+    }
+
+    // Skip leading spaces.
+    for (p = line; *p != '\0' && isspace(*p); ++p);
+
+    // Empty line? This includes comment lines now that comments have
+    // been stripped.
+    if (*p == '\0')
+    {
+        return NULL;
+    }
+
+    hash_prefix = ReadHashPrefix(p);
+    if (hash_prefix == NULL)
+    {
+        return "Invalid hash prefix";
+    }
+
+    p += strlen(hash_prefix);
+
+    // Skip spaces.
+    for (; *p != '\0' && isspace(*p); ++p);
+
+    if (*p != '=')
+    {
+        return "Expected '='";
+    }
+
+    ++p;
+
+    // Skip spaces.
+    for (; *p != '\0' && isspace(*p); ++p);
+
+    filename = p;
+
+    // We're now at the filename. Cut off trailing space characters.
+    while (strlen(p) > 0 && isspace(p[strlen(p) - 1]))
+    {
+        p[strlen(p) - 1] = '\0';
+    }
+
+    if (strlen(p) == 0)
+    {
+        return "No filename specified for music substitution";
+    }
+
+    // Expand full path and add to our database of substitutes.
+    AddSubstituteMusic(musicdir, hash_prefix, filename);
+
+    return NULL;
+}
+
+// Read a substitute music configuration file.
+
+static boolean ReadSubstituteConfig(char *musicdir, const char *filename)
+{
+    char *buffer;
+    char *line;
+    int linenum = 1;
+
+    // This unnecessarily opens the file twice...
+    if (!M_FileExists(filename))
+    {
+        return false;
+    }
+
+    M_ReadFile(filename, (byte **) &buffer);
+
+    line = buffer;
+
+    while (line != NULL)
+    {
+        const char *error;
+        char *next;
+
+        // find end of line
+        char *eol = strchr(line, '\n');
+        if (eol != NULL)
+        {
+            // change the newline into NUL
+            *eol = '\0';
+            next = eol + 1;
+        }
+        else
+        {
+            // end of buffer
+            next = NULL;
+        }
+
+        error = ParseSubstituteLine(musicdir, line);
+
+        if (error != NULL)
+        {
+            fprintf(stderr, "%s:%i: Error: %s\n", filename, linenum, error);
+        }
+
+        ++linenum;
+        line = next;
+    }
+
+    Z_Free(buffer);
+
+    return true;
+}
+
+// Find substitute configs and try to load them.
+
+static void LoadSubstituteConfigs(void)
+{
+    glob_t *glob;
+    char *musicdir;
+    const char *path;
+    unsigned int old_music_len;
+    unsigned int i;
+
+    // We can configure the path to music packs using the music_pack_path
+    // configuration variable. Otherwise we use the current directory, or
+    // $configdir/music to look for .cfg files.
+    if (strcmp(music_pack_path, "") != 0)
+    {
+        musicdir = M_StringJoin(music_pack_path, DIR_SEPARATOR_S, NULL);
+    }
+    else if (!strcmp(configdir, exedir))
+    {
+        musicdir = M_StringDuplicate("");
+    }
+    else
+    {
+        musicdir = M_StringJoin(configdir, "music", DIR_SEPARATOR_S, NULL);
+    }
+
+    // Load all music packs, by searching for .cfg files.
+    glob = I_StartGlob(musicdir, "*.cfg", GLOB_FLAG_SORTED|GLOB_FLAG_NOCASE);
+    for (;;)
+    {
+        path = I_NextGlob(glob);
+        if (path == NULL)
+        {
+            break;
+        }
+        ReadSubstituteConfig(musicdir, path);
+    }
+    I_EndGlob(glob);
+
+    if (subst_music_len > 0)
+    {
+        printf("Loaded %u music substitutions from config files.\n",
+               subst_music_len);
+    }
+
+    old_music_len = subst_music_len;
+
+    // Add entries from known filenames list. We add this after those from the
+    // configuration files, so that the entries here can be overridden.
+    for (i = 0; i < arrlen(known_filenames); ++i)
+    {
+        AddSubstituteMusic(musicdir, known_filenames[i].hash_prefix,
+                           known_filenames[i].filename);
+    }
+
+    if (subst_music_len > old_music_len)
+    {
+        printf("Configured %u music substitutions based on filename.\n",
+               subst_music_len - old_music_len);
+    }
+
+    free(musicdir);
+}
+
+// Returns true if the given lump number is a music lump that should
+// be included in substitute configs.
+// Identifying music lumps by name is not feasible; some games (eg.
+// Heretic, Hexen) don't have a common naming pattern for music lumps.
+
+static boolean IsMusicLump(int lumpnum)
+{
+    byte *data;
+    boolean result;
+
+    if (W_LumpLength(lumpnum) < 4)
+    {
+        return false;
+    }
+
+    data = W_CacheLumpNum(lumpnum, PU_STATIC);
+
+    result = memcmp(data, MUS_HEADER_MAGIC, 4) == 0
+          || memcmp(data, MID_HEADER_MAGIC, 4) == 0;
+
+    W_ReleaseLumpNum(lumpnum);
+
+    return result;
+}
+
+// Dump an example config file containing checksums for all MIDI music
+// found in the WAD directory.
+
+static void DumpSubstituteConfig(const char *filename)
+{
+    sha1_context_t context;
+    sha1_digest_t digest;
+    char name[9];
+    byte *data;
+    FILE *fs;
+    unsigned int lumpnum;
+    size_t h;
+
+    fs = M_fopen(filename, "w");
+
+    if (fs == NULL)
+    {
+        I_Error("Failed to open %s for writing", filename);
+        return;
+    }
+
+    fprintf(fs, "# Example %s substitute MIDI file.\n\n", PACKAGE_NAME);
+    fprintf(fs, "# SHA1 hash                              = filename\n");
+
+    for (lumpnum = 0; lumpnum < numlumps; ++lumpnum)
+    {
+        strncpy(name, lumpinfo[lumpnum]->name, 8);
+        name[8] = '\0';
+
+        if (!IsMusicLump(lumpnum))
+        {
+            continue;
+        }
+
+        // Calculate hash.
+        data = W_CacheLumpNum(lumpnum, PU_STATIC);
+        SHA1_Init(&context);
+        SHA1_Update(&context, data, W_LumpLength(lumpnum));
+        SHA1_Final(digest, &context);
+        W_ReleaseLumpNum(lumpnum);
+
+        // Print line.
+        for (h = 0; h < sizeof(sha1_digest_t); ++h)
+        {
+            fprintf(fs, "%02x", digest[h]);
+        }
+
+        fprintf(fs, " = %s.ogg\n", name);
+    }
+
+    fprintf(fs, "\n");
+    fclose(fs);
+
+    printf("Substitute MIDI config file written to %s.\n", filename);
+    I_Quit();
+}
+
+// Shutdown music
+
+static void I_MP_ShutdownMusic(void)
+{
+    if (music_initialized)
+    {
+        Mix_HaltMusic();
+        music_initialized = false;
+
+        if (sdl_was_initialized)
+        {
+            Mix_CloseAudio();
+            SDL_QuitSubSystem(SDL_INIT_AUDIO);
+            sdl_was_initialized = false;
+        }
+    }
+}
+
+static boolean SDLIsInitialized(void)
+{
+    int freq, channels;
+    Uint16 format;
+
+    return Mix_QuerySpec(&freq, &format, &channels) != 0;
+}
+
+#if !USE_SDL_MIXER_LOOPING
+// Callback function that is invoked to track current track position.
+void TrackPositionCallback(int chan, void *stream, int len, void *udata)
+{
+    // Position is doubled up twice: for 16-bit samples and for stereo.
+    current_track_pos += len / 4;
+}
+#endif // !USE_SDL_MIXER_LOOPING
+
+// Initialize music subsystem
+static boolean I_MP_InitMusic(void)
+{
+    int i;
+
+    //!
+    // @category obscure
+    // @arg <file>
+    //
+    // Read all MIDI files from loaded WAD files, dump an example
+    // substitution music config file to the specified file, and quit.
+    //
+    i = M_CheckParmWithArgs("-dumpsubstconfig", 1);
+
+    if (i > 0)
+    {
+        DumpSubstituteConfig(myargv[i + 1]);
+    }
+
+    // If we're in GENMIDI mode, try to load sound packs.
+    LoadSubstituteConfigs();
+
+    // We can't initialize if we don't have any substitute files to work with.
+    // If so, don't bother with SDL initialization etc.
+    if (subst_music_len == 0)
+    {
+        return false;
+    }
+
+    // If SDL_mixer is not initialized, we have to initialize it
+    // and have the responsibility to shut it down later on.
+    if (SDLIsInitialized())
+    {
+        music_initialized = true;
+    }
+    else if (SDL_Init(SDL_INIT_AUDIO) < 0)
+    {
+        fprintf(stderr, "Unable to set up sound.\n");
+    }
+    else if (Mix_OpenAudioDevice(snd_samplerate, AUDIO_S16SYS, 2, 1024, NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
+    {
+        fprintf(stderr, "Error initializing SDL_mixer: %s\n",
+                Mix_GetError());
+        SDL_QuitSubSystem(SDL_INIT_AUDIO);
+    }
+    else
+    {
+        SDL_PauseAudio(0);
+
+        sdl_was_initialized = true;
+        music_initialized = true;
+    }
+
+    // Initialize SDL_Mixer for digital music playback
+    Mix_Init(MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3);
+
+#if !USE_SDL_MIXER_LOOPING
+    // Register an effect function to track the music position.
+    Mix_RegisterEffect(MIX_CHANNEL_POST, TrackPositionCallback, NULL, NULL);
+#endif // !USE_SDL_MIXER_LOOPING
+
+    return music_initialized;
+}
+
+// Set music volume (0 - 127)
+
+static void I_MP_SetMusicVolume(int volume)
+{
+    Mix_VolumeMusic((volume * MIX_MAX_VOLUME) / 127);
+}
+
+// Start playing a mid
+
+static void I_MP_PlaySong(void *handle, boolean looping)
+{
+    int loops;
+
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    if (handle == NULL)
+    {
+        return;
+    }
+
+    current_track_music = (Mix_Music *) handle;
+    current_track_loop = looping;
+
+    if (looping)
+    {
+        loops = -1;
+    }
+    else
+    {
+        loops = 1;
+    }
+
+#if !USE_SDL_MIXER_LOOPING
+    // Don't loop when playing substitute music, as we do it
+    // ourselves instead.
+    if (file_metadata.valid)
+    {
+        loops = 1;
+        SDL_LockAudio();
+        current_track_pos = 0;  // start of track
+        SDL_UnlockAudio();
+    }
+#endif // !USE_SDL_MIXER_LOOPING
+
+    if (Mix_PlayMusic(current_track_music, loops) == -1)
+    {
+        fprintf(stderr, "I_MP_PlaySong: Error starting track: %s\n",
+                Mix_GetError());
+    }
+}
+
+static void I_MP_PauseSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    Mix_PauseMusic();
+}
+
+static void I_MP_ResumeSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    Mix_ResumeMusic();
+}
+
+static void I_MP_StopSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    Mix_HaltMusic();
+    current_track_music = NULL;
+}
+
+static void I_MP_UnRegisterSong(void *handle)
+{
+    Mix_Music *music = (Mix_Music *) handle;
+
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    if (handle == NULL)
+    {
+        return;
+    }
+
+    Mix_FreeMusic(music);
+}
+
+static void *I_MP_RegisterSong(void *data, int len)
+{
+    const char *filename;
+    Mix_Music *music;
+
+    if (!music_initialized)
+    {
+        return NULL;
+    }
+
+    // See if we're substituting this MUS for a high-quality replacement.
+    filename = GetSubstituteMusicFile(data, len);
+    if (filename == NULL)
+    {
+        return NULL;
+    }
+
+    music = Mix_LoadMUS(filename);
+    if (music == NULL)
+    {
+        // Fall through and play MIDI normally, but print an error
+        // message.
+        fprintf(stderr, "Failed to load substitute music file: %s: %s\n",
+                filename, Mix_GetError());
+        return NULL;
+    }
+
+#if !USE_SDL_MIXER_LOOPING
+    // Read loop point metadata from the file so that we know where
+    // to loop the music.
+    ReadLoopPoints(filename, &file_metadata);
+#endif // !USE_SDL_MIXER_LOOPING
+    return music;
+}
+
+// Is the song playing?
+static boolean I_MP_MusicIsPlaying(void)
+{
+    if (!music_initialized)
+    {
+        return false;
+    }
+
+    return Mix_PlayingMusic();
+}
+
+#if !USE_SDL_MIXER_LOOPING
+// Get position in substitute music track, in seconds since start of track.
+static double GetMusicPosition(void)
+{
+    unsigned int music_pos;
+    int freq;
+
+    Mix_QuerySpec(&freq, NULL, NULL);
+
+    SDL_LockAudio();
+    music_pos = current_track_pos;
+    SDL_UnlockAudio();
+
+    return (double) music_pos / freq;
+}
+
+static void RestartCurrentTrack(void)
+{
+    double start = (double) file_metadata.start_time
+                 / file_metadata.samplerate_hz;
+
+    // If the track finished we need to restart it.
+    if (current_track_music != NULL)
+    {
+        Mix_PlayMusic(current_track_music, 1);
+    }
+
+    Mix_SetMusicPosition(start);
+    SDL_LockAudio();
+    current_track_pos = file_metadata.start_time;
+    SDL_UnlockAudio();
+}
+#endif // !USE_SDL_MIXER_LOOPING
+
+// Poll music position; if we have passed the loop point end position
+// then we need to go back.
+static void I_MP_PollMusic(void)
+{
+#if !USE_SDL_MIXER_LOOPING
+    // When playing substitute tracks, loop tags only apply if we're playing
+    // a looping track. Tracks like the title screen music have the loop
+    // tags ignored.
+    if (current_track_loop && file_metadata.valid)
+    {
+        double end = (double) file_metadata.end_time
+                   / file_metadata.samplerate_hz;
+
+        // If we have reached the loop end point then we have to take action.
+        if (file_metadata.end_time >= 0 && GetMusicPosition() >= end)
+        {
+            RestartCurrentTrack();
+        }
+
+        // Have we reached the actual end of track (not loop end)?
+        if (!Mix_PlayingMusic())
+        {
+            RestartCurrentTrack();
+        }
+    }
+#endif // !USE_SDL_MIXER_LOOPING
+}
+
+const music_module_t music_pack_module =
+{
+    NULL,
+    0,
+    I_MP_InitMusic,
+    I_MP_ShutdownMusic,
+    I_MP_SetMusicVolume,
+    I_MP_PauseSong,
+    I_MP_ResumeSong,
+    I_MP_RegisterSong,
+    I_MP_UnRegisterSong,
+    I_MP_PlaySong,
+    I_MP_StopSong,
+    I_MP_MusicIsPlaying,
+    I_MP_PollMusic,
+};
+
+
+#else // DISABLE_SDL2MIXER
+
+
+static boolean I_NULL_InitMusic(void)
+{
+    return false;
+}
+
+
+static void I_NULL_ShutdownMusic(void)
+{
+}
+
+
+static void I_NULL_SetMusicVolume(int volume)
+{
+}
+
+
+static void I_NULL_PauseSong(void)
+{
+}
+
+
+static void I_NULL_ResumeSong(void)
+{
+}
+
+
+static void *I_NULL_RegisterSong(void *data, int len)
+{
+    return NULL;
+}
+
+
+static void I_NULL_UnRegisterSong(void *handle)
+{
+}
+
+
+static void I_NULL_PlaySong(void *handle, boolean looping)
+{
+}
+
+
+static void I_NULL_StopSong(void)
+{
+}
+
+
+static boolean I_NULL_MusicIsPlaying(void)
+{
+    return false;
+}
+
+
+static void I_NULL_PollMusic(void)
+{
+}
+
+const music_module_t music_pack_module =
+{
+    NULL,
+    0,
+    I_NULL_InitMusic,
+    I_NULL_ShutdownMusic,
+    I_NULL_SetMusicVolume,
+    I_NULL_PauseSong,
+    I_NULL_ResumeSong,
+    I_NULL_RegisterSong,
+    I_NULL_UnRegisterSong,
+    I_NULL_PlaySong,
+    I_NULL_StopSong,
+    I_NULL_MusicIsPlaying,
+    I_NULL_PollMusic,
+};
+
+
+#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/src/i_oplmusic.c b/games/NXDoom/src/i_oplmusic.c
new file mode 100644
index 000000000..54e7dac3c
--- /dev/null
+++ b/games/NXDoom/src/i_oplmusic.c
@@ -0,0 +1,1898 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   System interface for music.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "memio.h"
+#include "mus2mid.h"
+
+#include "deh_main.h"
+#include "i_sound.h"
+#include "i_swap.h"
+#include "m_misc.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "opl.h"
+#include "midifile.h"
+
+// #define OPL_MIDI_DEBUG
+
+#define MAXMIDLENGTH (96 * 1024)
+#define GENMIDI_NUM_INSTRS  128
+#define GENMIDI_NUM_PERCUSSION 47
+
+#define GENMIDI_HEADER          "#OPL_II#"
+#define GENMIDI_FLAG_FIXED      0x0001         /* fixed pitch */
+#define GENMIDI_FLAG_2VOICE     0x0004         /* double voice (OPL3) */
+
+#define PERCUSSION_LOG_LEN 16
+
+typedef PACKED_STRUCT (
+{
+    byte tremolo;
+    byte attack;
+    byte sustain;
+    byte waveform;
+    byte scale;
+    byte level;
+}) genmidi_op_t;
+
+typedef PACKED_STRUCT (
+{
+    genmidi_op_t modulator;
+    byte feedback;
+    genmidi_op_t carrier;
+    byte unused;
+    short base_note_offset;
+}) genmidi_voice_t;
+
+typedef PACKED_STRUCT (
+{
+    unsigned short flags;
+    byte fine_tuning;
+    byte fixed_note;
+
+    genmidi_voice_t voices[2];
+}) genmidi_instr_t;
+
+// Data associated with a channel of a track that is currently playing.
+
+typedef struct
+{
+    // The instrument currently used for this track.
+
+    genmidi_instr_t *instrument;
+
+    // Volume level
+
+    int volume;
+    int volume_base;
+
+    // Pan
+
+    int pan;
+
+    // Pitch bend value:
+
+    int bend;
+
+} opl_channel_data_t;
+
+// Data associated with a track that is currently playing.
+
+typedef struct
+{
+    // Track iterator used to read new events.
+
+    midi_track_iter_t *iter;
+} opl_track_data_t;
+
+typedef struct opl_voice_s opl_voice_t;
+
+struct opl_voice_s
+{
+    // Index of this voice:
+    int index;
+
+    // The operators used by this voice:
+    int op1, op2;
+
+    // Array used by voice:
+    int array;
+
+    // Currently-loaded instrument data
+    genmidi_instr_t *current_instr;
+
+    // The voice number in the instrument to use.
+    // This is normally set to zero; if this is a double voice
+    // instrument, it may be one.
+    unsigned int current_instr_voice;
+
+    // The channel currently using this voice.
+    opl_channel_data_t *channel;
+
+    // The midi key that this voice is playing.
+    unsigned int key;
+
+    // The note being played.  This is normally the same as
+    // the key, but if the instrument is a fixed pitch
+    // instrument, it is different.
+    unsigned int note;
+
+    // The frequency value being used.
+    unsigned int freq;
+
+    // The volume of the note being played on this channel.
+    unsigned int note_volume;
+
+    // The current volume (register value) that has been set for this channel.
+    unsigned int car_volume;
+    unsigned int mod_volume;
+
+    // Pan.
+    unsigned int reg_pan;
+
+    // Priority.
+    unsigned int priority;
+};
+
+// Operators used by the different voices.
+
+static const int voice_operators[2][OPL_NUM_VOICES] = {
+    { 0x00, 0x01, 0x02, 0x08, 0x09, 0x0a, 0x10, 0x11, 0x12 },
+    { 0x03, 0x04, 0x05, 0x0b, 0x0c, 0x0d, 0x13, 0x14, 0x15 }
+};
+
+// Frequency values to use for each note.
+
+static const unsigned short frequency_curve[] = {
+
+    0x133, 0x133, 0x134, 0x134, 0x135, 0x136, 0x136, 0x137,   // -1
+    0x137, 0x138, 0x138, 0x139, 0x139, 0x13a, 0x13b, 0x13b,
+    0x13c, 0x13c, 0x13d, 0x13d, 0x13e, 0x13f, 0x13f, 0x140,
+    0x140, 0x141, 0x142, 0x142, 0x143, 0x143, 0x144, 0x144,
+
+    0x145, 0x146, 0x146, 0x147, 0x147, 0x148, 0x149, 0x149,   // -2
+    0x14a, 0x14a, 0x14b, 0x14c, 0x14c, 0x14d, 0x14d, 0x14e,
+    0x14f, 0x14f, 0x150, 0x150, 0x151, 0x152, 0x152, 0x153,
+    0x153, 0x154, 0x155, 0x155, 0x156, 0x157, 0x157, 0x158,
+
+    // These are used for the first seven MIDI note values:
+
+    0x158, 0x159, 0x15a, 0x15a, 0x15b, 0x15b, 0x15c, 0x15d,   // 0
+    0x15d, 0x15e, 0x15f, 0x15f, 0x160, 0x161, 0x161, 0x162,
+    0x162, 0x163, 0x164, 0x164, 0x165, 0x166, 0x166, 0x167,
+    0x168, 0x168, 0x169, 0x16a, 0x16a, 0x16b, 0x16c, 0x16c,
+
+    0x16d, 0x16e, 0x16e, 0x16f, 0x170, 0x170, 0x171, 0x172,   // 1
+    0x172, 0x173, 0x174, 0x174, 0x175, 0x176, 0x176, 0x177,
+    0x178, 0x178, 0x179, 0x17a, 0x17a, 0x17b, 0x17c, 0x17c,
+    0x17d, 0x17e, 0x17e, 0x17f, 0x180, 0x181, 0x181, 0x182,
+
+    0x183, 0x183, 0x184, 0x185, 0x185, 0x186, 0x187, 0x188,   // 2
+    0x188, 0x189, 0x18a, 0x18a, 0x18b, 0x18c, 0x18d, 0x18d,
+    0x18e, 0x18f, 0x18f, 0x190, 0x191, 0x192, 0x192, 0x193,
+    0x194, 0x194, 0x195, 0x196, 0x197, 0x197, 0x198, 0x199,
+
+    0x19a, 0x19a, 0x19b, 0x19c, 0x19d, 0x19d, 0x19e, 0x19f,   // 3
+    0x1a0, 0x1a0, 0x1a1, 0x1a2, 0x1a3, 0x1a3, 0x1a4, 0x1a5,
+    0x1a6, 0x1a6, 0x1a7, 0x1a8, 0x1a9, 0x1a9, 0x1aa, 0x1ab,
+    0x1ac, 0x1ad, 0x1ad, 0x1ae, 0x1af, 0x1b0, 0x1b0, 0x1b1,
+
+    0x1b2, 0x1b3, 0x1b4, 0x1b4, 0x1b5, 0x1b6, 0x1b7, 0x1b8,   // 4
+    0x1b8, 0x1b9, 0x1ba, 0x1bb, 0x1bc, 0x1bc, 0x1bd, 0x1be,
+    0x1bf, 0x1c0, 0x1c0, 0x1c1, 0x1c2, 0x1c3, 0x1c4, 0x1c4,
+    0x1c5, 0x1c6, 0x1c7, 0x1c8, 0x1c9, 0x1c9, 0x1ca, 0x1cb,
+
+    0x1cc, 0x1cd, 0x1ce, 0x1ce, 0x1cf, 0x1d0, 0x1d1, 0x1d2,   // 5
+    0x1d3, 0x1d3, 0x1d4, 0x1d5, 0x1d6, 0x1d7, 0x1d8, 0x1d8,
+    0x1d9, 0x1da, 0x1db, 0x1dc, 0x1dd, 0x1de, 0x1de, 0x1df,
+    0x1e0, 0x1e1, 0x1e2, 0x1e3, 0x1e4, 0x1e5, 0x1e5, 0x1e6,
+
+    0x1e7, 0x1e8, 0x1e9, 0x1ea, 0x1eb, 0x1ec, 0x1ed, 0x1ed,   // 6
+    0x1ee, 0x1ef, 0x1f0, 0x1f1, 0x1f2, 0x1f3, 0x1f4, 0x1f5,
+    0x1f6, 0x1f6, 0x1f7, 0x1f8, 0x1f9, 0x1fa, 0x1fb, 0x1fc,
+    0x1fd, 0x1fe, 0x1ff, 0x200, 0x201, 0x201, 0x202, 0x203,
+
+    // First note of looped range used for all octaves:
+
+    0x204, 0x205, 0x206, 0x207, 0x208, 0x209, 0x20a, 0x20b,   // 7
+    0x20c, 0x20d, 0x20e, 0x20f, 0x210, 0x210, 0x211, 0x212,
+    0x213, 0x214, 0x215, 0x216, 0x217, 0x218, 0x219, 0x21a,
+    0x21b, 0x21c, 0x21d, 0x21e, 0x21f, 0x220, 0x221, 0x222,
+
+    0x223, 0x224, 0x225, 0x226, 0x227, 0x228, 0x229, 0x22a,   // 8
+    0x22b, 0x22c, 0x22d, 0x22e, 0x22f, 0x230, 0x231, 0x232,
+    0x233, 0x234, 0x235, 0x236, 0x237, 0x238, 0x239, 0x23a,
+    0x23b, 0x23c, 0x23d, 0x23e, 0x23f, 0x240, 0x241, 0x242,
+
+    0x244, 0x245, 0x246, 0x247, 0x248, 0x249, 0x24a, 0x24b,   // 9
+    0x24c, 0x24d, 0x24e, 0x24f, 0x250, 0x251, 0x252, 0x253,
+    0x254, 0x256, 0x257, 0x258, 0x259, 0x25a, 0x25b, 0x25c,
+    0x25d, 0x25e, 0x25f, 0x260, 0x262, 0x263, 0x264, 0x265,
+
+    0x266, 0x267, 0x268, 0x269, 0x26a, 0x26c, 0x26d, 0x26e,   // 10
+    0x26f, 0x270, 0x271, 0x272, 0x273, 0x275, 0x276, 0x277,
+    0x278, 0x279, 0x27a, 0x27b, 0x27d, 0x27e, 0x27f, 0x280,
+    0x281, 0x282, 0x284, 0x285, 0x286, 0x287, 0x288, 0x289,
+
+    0x28b, 0x28c, 0x28d, 0x28e, 0x28f, 0x290, 0x292, 0x293,   // 11
+    0x294, 0x295, 0x296, 0x298, 0x299, 0x29a, 0x29b, 0x29c,
+    0x29e, 0x29f, 0x2a0, 0x2a1, 0x2a2, 0x2a4, 0x2a5, 0x2a6,
+    0x2a7, 0x2a9, 0x2aa, 0x2ab, 0x2ac, 0x2ae, 0x2af, 0x2b0,
+
+    0x2b1, 0x2b2, 0x2b4, 0x2b5, 0x2b6, 0x2b7, 0x2b9, 0x2ba,   // 12
+    0x2bb, 0x2bd, 0x2be, 0x2bf, 0x2c0, 0x2c2, 0x2c3, 0x2c4,
+    0x2c5, 0x2c7, 0x2c8, 0x2c9, 0x2cb, 0x2cc, 0x2cd, 0x2ce,
+    0x2d0, 0x2d1, 0x2d2, 0x2d4, 0x2d5, 0x2d6, 0x2d8, 0x2d9,
+
+    0x2da, 0x2dc, 0x2dd, 0x2de, 0x2e0, 0x2e1, 0x2e2, 0x2e4,   // 13
+    0x2e5, 0x2e6, 0x2e8, 0x2e9, 0x2ea, 0x2ec, 0x2ed, 0x2ee,
+    0x2f0, 0x2f1, 0x2f2, 0x2f4, 0x2f5, 0x2f6, 0x2f8, 0x2f9,
+    0x2fb, 0x2fc, 0x2fd, 0x2ff, 0x300, 0x302, 0x303, 0x304,
+
+    0x306, 0x307, 0x309, 0x30a, 0x30b, 0x30d, 0x30e, 0x310,   // 14
+    0x311, 0x312, 0x314, 0x315, 0x317, 0x318, 0x31a, 0x31b,
+    0x31c, 0x31e, 0x31f, 0x321, 0x322, 0x324, 0x325, 0x327,
+    0x328, 0x329, 0x32b, 0x32c, 0x32e, 0x32f, 0x331, 0x332,
+
+    0x334, 0x335, 0x337, 0x338, 0x33a, 0x33b, 0x33d, 0x33e,   // 15
+    0x340, 0x341, 0x343, 0x344, 0x346, 0x347, 0x349, 0x34a,
+    0x34c, 0x34d, 0x34f, 0x350, 0x352, 0x353, 0x355, 0x357,
+    0x358, 0x35a, 0x35b, 0x35d, 0x35e, 0x360, 0x361, 0x363,
+
+    0x365, 0x366, 0x368, 0x369, 0x36b, 0x36c, 0x36e, 0x370,   // 16
+    0x371, 0x373, 0x374, 0x376, 0x378, 0x379, 0x37b, 0x37c,
+    0x37e, 0x380, 0x381, 0x383, 0x384, 0x386, 0x388, 0x389,
+    0x38b, 0x38d, 0x38e, 0x390, 0x392, 0x393, 0x395, 0x397,
+
+    0x398, 0x39a, 0x39c, 0x39d, 0x39f, 0x3a1, 0x3a2, 0x3a4,   // 17
+    0x3a6, 0x3a7, 0x3a9, 0x3ab, 0x3ac, 0x3ae, 0x3b0, 0x3b1,
+    0x3b3, 0x3b5, 0x3b7, 0x3b8, 0x3ba, 0x3bc, 0x3bd, 0x3bf,
+    0x3c1, 0x3c3, 0x3c4, 0x3c6, 0x3c8, 0x3ca, 0x3cb, 0x3cd,
+
+    // The last note has an incomplete range, and loops round back to
+    // the start.  Note that the last value is actually a buffer overrun
+    // and does not fit with the other values.
+
+    0x3cf, 0x3d1, 0x3d2, 0x3d4, 0x3d6, 0x3d8, 0x3da, 0x3db,   // 18
+    0x3dd, 0x3df, 0x3e1, 0x3e3, 0x3e4, 0x3e6, 0x3e8, 0x3ea,
+    0x3ec, 0x3ed, 0x3ef, 0x3f1, 0x3f3, 0x3f5, 0x3f6, 0x3f8,
+    0x3fa, 0x3fc, 0x3fe, 0x36c,
+};
+
+// Mapping from MIDI volume level to OPL level value.
+
+static const unsigned int volume_mapping_table[] = {
+    0, 1, 3, 5, 6, 8, 10, 11,
+    13, 14, 16, 17, 19, 20, 22, 23,
+    25, 26, 27, 29, 30, 32, 33, 34,
+    36, 37, 39, 41, 43, 45, 47, 49,
+    50, 52, 54, 55, 57, 59, 60, 61,
+    63, 64, 66, 67, 68, 69, 71, 72,
+    73, 74, 75, 76, 77, 79, 80, 81,
+    82, 83, 84, 84, 85, 86, 87, 88,
+    89, 90, 91, 92, 92, 93, 94, 95,
+    96, 96, 97, 98, 99, 99, 100, 101,
+    101, 102, 103, 103, 104, 105, 105, 106,
+    107, 107, 108, 109, 109, 110, 110, 111,
+    112, 112, 113, 113, 114, 114, 115, 115,
+    116, 117, 117, 118, 118, 119, 119, 120,
+    120, 121, 121, 122, 122, 123, 123, 123,
+    124, 124, 125, 125, 126, 126, 127, 127
+};
+
+static opl_driver_ver_t opl_drv_ver = opl_doom_1_9;
+static boolean music_initialized = false;
+
+//static boolean musicpaused = false;
+static int start_music_volume;
+static int current_music_volume;
+
+// GENMIDI lump instrument data:
+
+static genmidi_instr_t *main_instrs;
+static genmidi_instr_t *percussion_instrs;
+static char (*main_instr_names)[32];
+static char (*percussion_names)[32];
+
+// Voices:
+
+static opl_voice_t voices[OPL_NUM_VOICES * 2];
+static opl_voice_t *voice_free_list[OPL_NUM_VOICES * 2];
+static opl_voice_t *voice_alloced_list[OPL_NUM_VOICES * 2];
+static int voice_free_num;
+static int voice_alloced_num;
+static int opl_opl3mode;
+static int num_opl_voices;
+
+// Data for each channel.
+
+static opl_channel_data_t channels[MIDI_CHANNELS_PER_TRACK];
+
+// Track data for playing tracks:
+
+static opl_track_data_t *tracks;
+static unsigned int num_tracks = 0;
+static unsigned int running_tracks = 0;
+static boolean song_looping;
+
+// Tempo control variables
+
+static unsigned int ticks_per_beat;
+static unsigned int us_per_beat;
+
+// Mini-log of recently played percussion instruments:
+
+static uint8_t last_perc[PERCUSSION_LOG_LEN];
+static unsigned int last_perc_count;
+
+// Configuration file variable, containing the port number for the
+// adlib chip.
+
+char *snd_dmxoption = "";
+int opl_io_port = 0x388;
+
+// If true, OPL sound channels are reversed to their correct arrangement
+// (as intended by the MIDI standard) rather than the backwards one
+// used by DMX due to a bug.
+
+static boolean opl_stereo_correct = false;
+
+// Load instrument table from GENMIDI lump:
+
+static boolean LoadInstrumentTable(void)
+{
+    byte *lump;
+
+    lump = W_CacheLumpName(DEH_String("genmidi"), PU_STATIC);
+
+    // DMX does not check header
+
+    main_instrs = (genmidi_instr_t *) (lump + strlen(GENMIDI_HEADER));
+    percussion_instrs = main_instrs + GENMIDI_NUM_INSTRS;
+    main_instr_names =
+        (char (*)[32]) (percussion_instrs + GENMIDI_NUM_PERCUSSION);
+    percussion_names = main_instr_names + GENMIDI_NUM_INSTRS;
+
+    return true;
+}
+
+// Get the next available voice from the freelist.
+
+static opl_voice_t *GetFreeVoice(void)
+{
+    opl_voice_t *result;
+    int i;
+
+    // None available?
+
+    if (voice_free_num == 0)
+    {
+        return NULL;
+    }
+
+    // Remove from free list
+
+    result = voice_free_list[0];
+
+    voice_free_num--;
+
+    for (i = 0; i < voice_free_num; i++)
+    {
+        voice_free_list[i] = voice_free_list[i + 1];
+    }
+
+    // Add to allocated list
+
+    voice_alloced_list[voice_alloced_num++] = result;
+
+    return result;
+}
+
+// Release a voice back to the freelist.
+
+static void VoiceKeyOff(opl_voice_t *voice);
+
+static void ReleaseVoice(int index)
+{
+    opl_voice_t *voice;
+    boolean double_voice;
+    int i;
+
+    // Doom 2 1.666 OPL crash emulation.
+    if (index >= voice_alloced_num)
+    {
+
+        voice_alloced_num = 0;
+        voice_free_num = 0;
+        return;
+    }
+
+    voice = voice_alloced_list[index];
+
+    VoiceKeyOff(voice);
+
+    voice->channel = NULL;
+    voice->note = 0;
+
+    double_voice = voice->current_instr_voice != 0;
+    
+    // Remove from alloced list.
+
+    voice_alloced_num--;
+
+    for (i = index; i < voice_alloced_num; i++)
+    {
+        voice_alloced_list[i] = voice_alloced_list[i + 1];
+    }
+
+    // Search to the end of the freelist (This is how Doom behaves!)
+
+    voice_free_list[voice_free_num++] = voice;
+
+    if (double_voice && opl_drv_ver < opl_doom_1_9)
+    {
+        ReleaseVoice(index);
+    }
+}
+
+// Load data to the specified operator
+
+static void LoadOperatorData(int operator, genmidi_op_t *data,
+                             boolean max_level, unsigned int *volume)
+{
+    int level;
+
+    // The scale and level fields must be combined for the level register.
+    // For the carrier wave we always set the maximum level.
+
+    level = data->scale;
+
+    if (max_level)
+    {
+        level |= 0x3f;
+    }
+    else
+    {
+        level |= data->level;
+    }
+
+    *volume = level;
+
+    OPL_WriteRegister(OPL_REGS_LEVEL + operator, level);
+    OPL_WriteRegister(OPL_REGS_TREMOLO + operator, data->tremolo);
+    OPL_WriteRegister(OPL_REGS_ATTACK + operator, data->attack);
+    OPL_WriteRegister(OPL_REGS_SUSTAIN + operator, data->sustain);
+    OPL_WriteRegister(OPL_REGS_WAVEFORM + operator, data->waveform);
+}
+
+// Set the instrument for a particular voice.
+
+static void SetVoiceInstrument(opl_voice_t *voice,
+                               genmidi_instr_t *instr,
+                               unsigned int instr_voice)
+{
+    genmidi_voice_t *data;
+    unsigned int modulating;
+
+    // Instrument already set for this channel?
+
+    if (voice->current_instr == instr
+     && voice->current_instr_voice == instr_voice)
+    {
+        return;
+    }
+
+    voice->current_instr = instr;
+    voice->current_instr_voice = instr_voice;
+
+    data = &instr->voices[instr_voice];
+
+    // Are we usind modulated feedback mode?
+
+    modulating = (data->feedback & 0x01) == 0;
+
+    // Doom loads the second operator first, then the first.
+    // The carrier is set to minimum volume until the voice volume
+    // is set in SetVoiceVolume (below).  If we are not using
+    // modulating mode, we must set both to minimum volume.
+
+    LoadOperatorData(voice->op2 | voice->array, &data->carrier, true,
+                     &voice->car_volume);
+    LoadOperatorData(voice->op1 | voice->array, &data->modulator, !modulating,
+                     &voice->mod_volume);
+
+    // Set feedback register that control the connection between the
+    // two operators.  Turn on bits in the upper nybble; I think this
+    // is for OPL3, where it turns on channel A/B.
+
+    OPL_WriteRegister((OPL_REGS_FEEDBACK + voice->index) | voice->array,
+                      data->feedback | voice->reg_pan);
+
+    // Calculate voice priority.
+
+    voice->priority = 0x0f - (data->carrier.attack >> 4)
+                    + 0x0f - (data->carrier.sustain & 0x0f);
+}
+
+static void SetVoiceVolume(opl_voice_t *voice, unsigned int volume)
+{
+    genmidi_voice_t *opl_voice;
+    unsigned int midi_volume;
+    unsigned int full_volume;
+    unsigned int car_volume;
+    unsigned int mod_volume;
+
+    voice->note_volume = volume;
+
+    opl_voice = &voice->current_instr->voices[voice->current_instr_voice];
+
+    // Multiply note volume and channel volume to get the actual volume.
+
+    midi_volume = 2 * (volume_mapping_table[voice->channel->volume] + 1);
+
+    full_volume = (volume_mapping_table[voice->note_volume] * midi_volume)
+                >> 9;
+
+    // The volume value to use in the register:
+    car_volume = 0x3f - full_volume;
+
+    // Update the volume register(s) if necessary.
+
+    if (car_volume != (voice->car_volume & 0x3f))
+    {
+        voice->car_volume = car_volume | (voice->car_volume & 0xc0);
+
+        OPL_WriteRegister((OPL_REGS_LEVEL + voice->op2) | voice->array,
+                          voice->car_volume);
+
+        // If we are using non-modulated feedback mode, we must set the
+        // volume for both voices.
+
+        if ((opl_voice->feedback & 0x01) != 0
+         && opl_voice->modulator.level != 0x3f)
+        {
+            mod_volume = opl_voice->modulator.level;
+            if (mod_volume < car_volume)
+            {
+                mod_volume = car_volume;
+            }
+
+            mod_volume |= voice->mod_volume & 0xc0;
+
+            if(mod_volume != voice->mod_volume)
+            {
+                voice->mod_volume = mod_volume;
+                OPL_WriteRegister((OPL_REGS_LEVEL + voice->op1) | voice->array,
+                                  mod_volume |
+                                  (opl_voice->modulator.scale & 0xc0));
+            }
+        }
+    }
+}
+
+static void SetVoicePan(opl_voice_t *voice, unsigned int pan)
+{
+    genmidi_voice_t *opl_voice;
+
+    voice->reg_pan = pan;
+    opl_voice = &voice->current_instr->voices[voice->current_instr_voice];;
+
+    OPL_WriteRegister((OPL_REGS_FEEDBACK + voice->index) | voice->array,
+                      opl_voice->feedback | pan);
+}
+
+// Initialize the voice table and freelist
+
+static void InitVoices(void)
+{
+    int i;
+
+    // Start with an empty free list.
+    
+    voice_free_num = num_opl_voices;
+    voice_alloced_num = 0;
+
+    // Initialize each voice.
+
+    for (i = 0; i < num_opl_voices; ++i)
+    {
+        voices[i].index = i % OPL_NUM_VOICES;
+        voices[i].op1 = voice_operators[0][i % OPL_NUM_VOICES];
+        voices[i].op2 = voice_operators[1][i % OPL_NUM_VOICES];
+        voices[i].array = (i / OPL_NUM_VOICES) << 8;
+        voices[i].current_instr = NULL;
+
+        // Add this voice to the freelist.
+
+        voice_free_list[i] = &voices[i];
+    }
+}
+
+static void SetChannelVolume(opl_channel_data_t *channel, unsigned int volume,
+                             boolean clip_start);
+
+// Set music volume (0 - 127)
+
+static void I_OPL_SetMusicVolume(int volume)
+{
+    unsigned int i;
+
+    if (current_music_volume == volume)
+    {
+        return;
+    }
+
+    // Internal state variable.
+
+    current_music_volume = volume;
+
+    // Update the volume of all voices.
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        if (i == 15)
+        {
+            SetChannelVolume(&channels[i], volume, false);
+        }
+        else
+        {
+            SetChannelVolume(&channels[i], channels[i].volume_base, false);
+        }
+    }
+}
+
+static void VoiceKeyOff(opl_voice_t *voice)
+{
+    OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array,
+                      voice->freq >> 8);
+}
+
+static opl_channel_data_t *TrackChannelForEvent(opl_track_data_t *track,
+                                                midi_event_t *event)
+{
+    unsigned int channel_num = event->data.channel.channel;
+
+    // MIDI uses track #9 for percussion, but for MUS it's track #15
+    // instead. Because DMX works on MUS data internally, we need to
+    // swap back to the MUS version of the channel number.
+    if (channel_num == 9)
+    {
+        channel_num = 15;
+    }
+    else if (channel_num == 15)
+    {
+        channel_num = 9;
+    }
+
+    return &channels[channel_num];
+}
+
+// Get the frequency that we should be using for a voice.
+
+static void KeyOffEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    opl_channel_data_t *channel;
+    int i;
+    unsigned int key;
+
+/*
+    printf("note off: channel %i, %i, %i\n",
+           event->data.channel.channel,
+           event->data.channel.param1,
+           event->data.channel.param2);
+*/
+
+    channel = TrackChannelForEvent(track, event);
+    key = event->data.channel.param1;
+
+    // Turn off voices being used to play this key.
+    // If it is a double voice instrument there will be two.
+
+    for (i = 0; i < voice_alloced_num; i++)
+    {
+        if (voice_alloced_list[i]->channel == channel
+         && voice_alloced_list[i]->key == key)
+        {
+            // Finished with this voice now.
+
+            ReleaseVoice(i);
+
+            i--;
+        }
+    }
+}
+
+// When all voices are in use, we must discard an existing voice to
+// play a new note.  Find and free an existing voice.  The channel
+// passed to the function is the channel for the new note to be
+// played.
+
+static void ReplaceExistingVoice(void)
+{
+    int i;
+    int result;
+
+    // Check the allocated voices, if we find an instrument that is
+    // of a lower priority to the new instrument, discard it.
+    // If a voice is being used to play the second voice of an instrument,
+    // use that, as second voices are non-essential.
+    // Lower numbered MIDI channels implicitly have a higher priority
+    // than higher-numbered channels, eg. MIDI channel 1 is never
+    // discarded for MIDI channel 2.
+
+    result = 0;
+
+    for (i = 0; i < voice_alloced_num; i++)
+    {
+        if (voice_alloced_list[i]->current_instr_voice != 0
+         || voice_alloced_list[i]->channel
+         >= voice_alloced_list[result]->channel)
+        {
+            result = i;
+        }
+    }
+
+    ReleaseVoice(result);
+}
+
+// Alternate versions of ReplaceExistingVoice() used when emulating old
+// versions of the DMX library used in Doom 1.666, Heretic and Hexen.
+
+static void ReplaceExistingVoiceDoom1(void)
+{
+    int i;
+    int result;
+
+    result = 0;
+
+    for (i = 0; i < voice_alloced_num; i++)
+    {
+        if (voice_alloced_list[i]->channel
+          > voice_alloced_list[result]->channel)
+        {
+            result = i;
+        }
+    }
+
+    ReleaseVoice(result);
+}
+
+static void ReplaceExistingVoiceDoom2(opl_channel_data_t *channel)
+{
+    int i;
+    int result;
+    int priority;
+
+    result = 0;
+
+    priority = 0x8000;
+
+    for (i = 0; i < voice_alloced_num - 3; i++)
+    {
+        if (voice_alloced_list[i]->priority < priority
+         && voice_alloced_list[i]->channel >= channel)
+        {
+            priority = voice_alloced_list[i]->priority;
+            result = i;
+        }
+    }
+
+    ReleaseVoice(result);
+}
+
+
+static unsigned int FrequencyForVoice(opl_voice_t *voice)
+{
+    genmidi_voice_t *gm_voice;
+    signed int freq_index;
+    unsigned int octave;
+    unsigned int sub_index;
+    signed int note;
+
+    note = voice->note;
+
+    // Apply note offset.
+    // Don't apply offset if the instrument is a fixed note instrument.
+
+    gm_voice = &voice->current_instr->voices[voice->current_instr_voice];
+
+    if ((SHORT(voice->current_instr->flags) & GENMIDI_FLAG_FIXED) == 0)
+    {
+        note += (signed short) SHORT(gm_voice->base_note_offset);
+    }
+
+    // Avoid possible overflow due to base note offset:
+
+    while (note < 0)
+    {
+        note += 12;
+    }
+
+    while (note > 95)
+    {
+        note -= 12;
+    }
+
+    freq_index = 64 + 32 * note + voice->channel->bend;
+
+    // If this is the second voice of a double voice instrument, the
+    // frequency index can be adjusted by the fine tuning field.
+
+    if (voice->current_instr_voice != 0)
+    {
+        freq_index += (voice->current_instr->fine_tuning / 2) - 64;
+    }
+
+    if (freq_index < 0)
+    {
+        freq_index = 0;
+    }
+
+    // The first 7 notes use the start of the table, while
+    // consecutive notes loop around the latter part.
+
+    if (freq_index < 284)
+    {
+        return frequency_curve[freq_index];
+    }
+
+    sub_index = (freq_index - 284) % (12 * 32);
+    octave = (freq_index - 284) / (12 * 32);
+
+    // Once the seventh octave is reached, things break down.
+    // We can only go up to octave 7 as a maximum anyway (the OPL
+    // register only has three bits for octave number), but for the
+    // notes in octave 7, the first five bits have octave=7, the
+    // following notes have octave=6.  This 7/6 pattern repeats in
+    // following octaves (which are technically impossible to
+    // represent anyway).
+
+    if (octave >= 7)
+    {
+        octave = 7;
+    }
+
+    // Calculate the resulting register value to use for the frequency.
+
+    return frequency_curve[sub_index + 284] | (octave << 10);
+}
+
+// Update the frequency that a voice is programmed to use.
+
+static void UpdateVoiceFrequency(opl_voice_t *voice)
+{
+    unsigned int freq;
+
+    // Calculate the frequency to use for this voice and update it
+    // if neccessary.
+
+    freq = FrequencyForVoice(voice);
+
+    if (voice->freq != freq)
+    {
+        OPL_WriteRegister((OPL_REGS_FREQ_1 + voice->index) | voice->array,
+                          freq & 0xff);
+        OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array,
+                          (freq >> 8) | 0x20);
+
+        voice->freq = freq;
+    }
+}
+
+// Program a single voice for an instrument.  For a double voice
+// instrument (GENMIDI_FLAG_2VOICE), this is called twice for each
+// key on event.
+
+static void VoiceKeyOn(opl_channel_data_t *channel,
+                       genmidi_instr_t *instrument,
+                       unsigned int instrument_voice,
+                       unsigned int note,
+                       unsigned int key,
+                       unsigned int volume)
+{
+    opl_voice_t *voice;
+
+    if (!opl_opl3mode && opl_drv_ver == opl_doom1_1_666)
+    {
+        instrument_voice = 0;
+    }
+
+    // Find a voice to use for this new note.
+
+    voice = GetFreeVoice();
+
+    if (voice == NULL)
+    {
+        return;
+    }
+
+    voice->channel = channel;
+    voice->key = key;
+
+    // Work out the note to use.  This is normally the same as
+    // the key, unless it is a fixed pitch instrument.
+
+    if ((SHORT(instrument->flags) & GENMIDI_FLAG_FIXED) != 0)
+    {
+        voice->note = instrument->fixed_note;
+    }
+    else
+    {
+        voice->note = note;
+    }
+
+    voice->reg_pan = channel->pan;
+
+    // Program the voice with the instrument data:
+
+    SetVoiceInstrument(voice, instrument, instrument_voice);
+
+    // Set the volume level.
+
+    SetVoiceVolume(voice, volume);
+
+    // Write the frequency value to turn the note on.
+
+    voice->freq = 0;
+    UpdateVoiceFrequency(voice);
+}
+
+static void KeyOnEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    genmidi_instr_t *instrument;
+    opl_channel_data_t *channel;
+    unsigned int note, key, volume, voicenum;
+    boolean double_voice;
+
+/*
+    printf("note on: channel %i, %i, %i\n",
+           event->data.channel.channel,
+           event->data.channel.param1,
+           event->data.channel.param2);
+*/
+
+    note = event->data.channel.param1;
+    key = event->data.channel.param1;
+    volume = event->data.channel.param2;
+
+    // A volume of zero means key off. Some MIDI tracks, eg. the ones
+    // in AV.wad, use a second key on with a volume of zero to mean
+    // key off.
+    if (volume <= 0)
+    {
+        KeyOffEvent(track, event);
+        return;
+    }
+
+    // The channel.
+    channel = TrackChannelForEvent(track, event);
+
+    // Percussion channel is treated differently.
+    if (event->data.channel.channel == 9)
+    {
+        if (key < 35 || key > 81)
+        {
+            return;
+        }
+
+        instrument = &percussion_instrs[key - 35];
+
+        last_perc[last_perc_count] = key;
+        last_perc_count = (last_perc_count + 1) % PERCUSSION_LOG_LEN;
+        note = 60;
+    }
+    else
+    {
+        instrument = channel->instrument;
+    }
+
+    double_voice = (SHORT(instrument->flags) & GENMIDI_FLAG_2VOICE) != 0;
+
+    switch (opl_drv_ver)
+    {
+        case opl_doom1_1_666:
+            voicenum = double_voice + 1;
+            if (!opl_opl3mode)
+            {
+                voicenum = 1;
+            }
+            while (voice_alloced_num > num_opl_voices - voicenum)
+            {
+                ReplaceExistingVoiceDoom1();
+            }
+
+            // Find and program a voice for this instrument.  If this
+            // is a double voice instrument, we must do this twice.
+
+            if (double_voice)
+            {
+                VoiceKeyOn(channel, instrument, 1, note, key, volume);
+            }
+
+            VoiceKeyOn(channel, instrument, 0, note, key, volume);
+            break;
+        case opl_doom2_1_666:
+            if (voice_alloced_num == num_opl_voices)
+            {
+                ReplaceExistingVoiceDoom2(channel);
+            }
+            if (voice_alloced_num == num_opl_voices - 1 && double_voice)
+            {
+                ReplaceExistingVoiceDoom2(channel);
+            }
+
+            // Find and program a voice for this instrument.  If this
+            // is a double voice instrument, we must do this twice.
+
+            if (double_voice)
+            {
+                VoiceKeyOn(channel, instrument, 1, note, key, volume);
+            }
+
+            VoiceKeyOn(channel, instrument, 0, note, key, volume);
+            break;
+        default:
+        case opl_doom_1_9:
+            if (voice_free_num == 0)
+            {
+                ReplaceExistingVoice();
+            }
+
+            // Find and program a voice for this instrument.  If this
+            // is a double voice instrument, we must do this twice.
+
+            VoiceKeyOn(channel, instrument, 0, note, key, volume);
+
+            if (double_voice)
+            {
+                VoiceKeyOn(channel, instrument, 1, note, key, volume);
+            }
+            break;
+    }
+}
+
+static void ProgramChangeEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    opl_channel_data_t *channel;
+    int instrument;
+
+    // Set the instrument used on this channel.
+
+    channel = TrackChannelForEvent(track, event);
+    instrument = event->data.channel.param1;
+    channel->instrument = &main_instrs[instrument];
+
+    // TODO: Look through existing voices that are turned on on this
+    // channel, and change the instrument.
+}
+
+static void SetChannelVolume(opl_channel_data_t *channel, unsigned int volume,
+                             boolean clip_start)
+{
+    unsigned int i;
+
+    channel->volume_base = volume;
+
+    if (volume > current_music_volume)
+    {
+        volume = current_music_volume;
+    }
+
+    if (clip_start && volume > start_music_volume)
+    {
+        volume = start_music_volume;
+    }
+
+    channel->volume = volume;
+
+    // Update all voices that this channel is using.
+
+    for (i = 0; i < num_opl_voices; ++i)
+    {
+        if (voices[i].channel == channel)
+        {
+            SetVoiceVolume(&voices[i], voices[i].note_volume);
+        }
+    }
+}
+
+static void SetChannelPan(opl_channel_data_t *channel, unsigned int pan)
+{
+    unsigned int reg_pan;
+    unsigned int i;
+
+    // The DMX library has the stereo channels backwards, maybe because
+    // Paul Radek had a Soundblaster card with the channels reversed, or
+    // perhaps it was just a bug in the OPL3 support that was never
+    // finished. By default we preserve this bug, but we also provide a
+    // secret DMXOPTION to fix it.
+    if (opl_stereo_correct)
+    {
+        pan = 144 - pan;
+    }
+
+    if (opl_opl3mode)
+    {
+        if (pan >= 96)
+        {
+            reg_pan = 0x10;
+        }
+        else if (pan <= 48)
+        {
+            reg_pan = 0x20;
+        }
+        else
+        {
+            reg_pan = 0x30;
+        }
+        if (channel->pan != reg_pan)
+        {
+            channel->pan = reg_pan;
+            for (i = 0; i < num_opl_voices; i++)
+            {
+                if (voices[i].channel == channel)
+                {
+                    SetVoicePan(&voices[i], reg_pan);
+                }
+            }
+        }
+    }
+}
+
+// Handler for the MIDI_CONTROLLER_ALL_NOTES_OFF channel event.
+static void AllNotesOff(opl_channel_data_t *channel, unsigned int param)
+{
+    int i;
+
+    for (i = 0; i < voice_alloced_num; i++)
+    {
+        if (voice_alloced_list[i]->channel == channel)
+        {
+            // Finished with this voice now.
+
+            ReleaseVoice(i);
+            
+            i--;
+        }
+    }
+}
+
+static void ControllerEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    opl_channel_data_t *channel;
+    unsigned int controller;
+    unsigned int param;
+
+/*
+    printf("change controller: channel %i, %i, %i\n",
+           event->data.channel.channel,
+           event->data.channel.param1,
+           event->data.channel.param2);
+*/
+
+    channel = TrackChannelForEvent(track, event);
+    controller = event->data.channel.param1;
+    param = event->data.channel.param2;
+
+    switch (controller)
+    {
+        case MIDI_CONTROLLER_VOLUME_MSB:
+            SetChannelVolume(channel, param, true);
+            break;
+
+        case MIDI_CONTROLLER_PAN:
+            SetChannelPan(channel, param);
+            break;
+
+        case MIDI_CONTROLLER_ALL_NOTES_OFF:
+            AllNotesOff(channel, param);
+            break;
+
+        default:
+#ifdef OPL_MIDI_DEBUG
+            fprintf(stderr, "Unknown MIDI controller type: %u\n", controller);
+#endif
+            break;
+    }
+}
+
+// Process a pitch bend event.
+
+static void PitchBendEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    opl_channel_data_t *channel;
+    int i;
+    opl_voice_t *voice_updated_list[OPL_NUM_VOICES * 2];
+    unsigned int voice_updated_num = 0;
+    opl_voice_t *voice_not_updated_list[OPL_NUM_VOICES * 2];
+    unsigned int voice_not_updated_num = 0;
+
+    // Update the channel bend value.  Only the MSB of the pitch bend
+    // value is considered: this is what Doom does.
+
+    channel = TrackChannelForEvent(track, event);
+    channel->bend = event->data.channel.param2 - 64;
+
+    // Update all voices for this channel.
+
+	for (i = 0; i < voice_alloced_num; ++i)
+    {
+        if (voice_alloced_list[i]->channel == channel)
+        {
+            UpdateVoiceFrequency(voice_alloced_list[i]);
+            voice_updated_list[voice_updated_num++] = voice_alloced_list[i];
+        }
+        else
+        {
+            voice_not_updated_list[voice_not_updated_num++] =
+            voice_alloced_list[i];
+        }
+    }
+
+    for (i = 0; i < voice_not_updated_num; i++)
+    {
+        voice_alloced_list[i] = voice_not_updated_list[i];
+    }
+
+    for (i = 0; i < voice_updated_num; i++)
+    {
+        voice_alloced_list[i + voice_not_updated_num] = voice_updated_list[i];
+    }
+}
+
+static void MetaSetTempo(unsigned int tempo)
+{
+    OPL_AdjustCallbacks((float) us_per_beat / tempo);
+    us_per_beat = tempo;
+}
+
+// Process a meta event.
+
+static void MetaEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    byte *data = event->data.meta.data;
+    unsigned int data_len = event->data.meta.length;
+
+    switch (event->data.meta.type)
+    {
+        // Things we can just ignore.
+
+        case MIDI_META_SEQUENCE_NUMBER:
+        case MIDI_META_TEXT:
+        case MIDI_META_COPYRIGHT:
+        case MIDI_META_TRACK_NAME:
+        case MIDI_META_INSTR_NAME:
+        case MIDI_META_LYRICS:
+        case MIDI_META_MARKER:
+        case MIDI_META_CUE_POINT:
+        case MIDI_META_SEQUENCER_SPECIFIC:
+            break;
+
+        case MIDI_META_SET_TEMPO:
+            if (data_len == 3)
+            {
+                MetaSetTempo((data[0] << 16) | (data[1] << 8) | data[2]);
+            }
+            break;
+
+        // End of track - actually handled when we run out of events
+        // in the track, see below.
+
+        case MIDI_META_END_OF_TRACK:
+            break;
+
+        default:
+#ifdef OPL_MIDI_DEBUG
+            fprintf(stderr, "Unknown MIDI meta event type: %u\n",
+                            event->data.meta.type);
+#endif
+            break;
+    }
+}
+
+// Process a MIDI event from a track.
+
+static void ProcessEvent(opl_track_data_t *track, midi_event_t *event)
+{
+    switch (event->event_type)
+    {
+        case MIDI_EVENT_NOTE_OFF:
+            KeyOffEvent(track, event);
+            break;
+
+        case MIDI_EVENT_NOTE_ON:
+            KeyOnEvent(track, event);
+            break;
+
+        case MIDI_EVENT_CONTROLLER:
+            ControllerEvent(track, event);
+            break;
+
+        case MIDI_EVENT_PROGRAM_CHANGE:
+            ProgramChangeEvent(track, event);
+            break;
+
+        case MIDI_EVENT_PITCH_BEND:
+            PitchBendEvent(track, event);
+            break;
+
+        case MIDI_EVENT_META:
+            MetaEvent(track, event);
+            break;
+
+        // SysEx events can be ignored.
+
+        case MIDI_EVENT_SYSEX:
+        case MIDI_EVENT_SYSEX_SPLIT:
+            break;
+
+        default:
+#ifdef OPL_MIDI_DEBUG
+            fprintf(stderr, "Unknown MIDI event type %i\n", event->event_type);
+#endif
+            break;
+    }
+}
+
+static void ScheduleTrack(opl_track_data_t *track);
+static void InitChannel(opl_channel_data_t *channel);
+
+// Restart a song from the beginning.
+
+static void RestartSong(void *unused)
+{
+    unsigned int i;
+
+    running_tracks = num_tracks;
+
+    start_music_volume = current_music_volume;
+
+    for (i = 0; i < num_tracks; ++i)
+    {
+        MIDI_RestartIterator(tracks[i].iter);
+        ScheduleTrack(&tracks[i]);
+    }
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        InitChannel(&channels[i]);
+    }
+}
+
+// Callback function invoked when another event needs to be read from
+// a track.
+
+static void TrackTimerCallback(void *arg)
+{
+    opl_track_data_t *track = arg;
+    midi_event_t *event;
+
+    // Get the next event and process it.
+
+    if (!MIDI_GetNextEvent(track->iter, &event))
+    {
+        return;
+    }
+
+    ProcessEvent(track, event);
+
+    // End of track?
+
+    if (event->event_type == MIDI_EVENT_META
+     && event->data.meta.type == MIDI_META_END_OF_TRACK)
+    {
+        --running_tracks;
+
+        // When all tracks have finished, restart the song.
+        // Don't restart the song immediately, but wait for 5ms
+        // before triggering a restart.  Otherwise it is possible
+        // to construct an empty MIDI file that causes the game
+        // to lock up in an infinite loop. (5ms should be short
+        // enough not to be noticeable by the listener).
+
+        if (running_tracks <= 0 && song_looping)
+        {
+            OPL_SetCallback(5000, RestartSong, NULL);
+        }
+
+        return;
+    }
+
+    // Reschedule the callback for the next event in the track.
+
+    ScheduleTrack(track);
+}
+
+static void ScheduleTrack(opl_track_data_t *track)
+{
+    unsigned int nticks;
+    uint64_t us;
+
+    // Get the number of microseconds until the next event.
+
+    nticks = MIDI_GetDeltaTime(track->iter);
+    us = ((uint64_t) nticks * us_per_beat) / ticks_per_beat;
+
+    // Set a timer to be invoked when the next event is
+    // ready to play.
+
+    OPL_SetCallback(us, TrackTimerCallback, track);
+}
+
+// Initialize a channel.
+
+static void InitChannel(opl_channel_data_t *channel)
+{
+    // TODO: Work out sensible defaults?
+
+    channel->instrument = &main_instrs[0];
+    channel->volume = current_music_volume;
+    channel->volume_base = 100;
+    if (channel->volume > channel->volume_base)
+    {
+        channel->volume = channel->volume_base;
+    }
+    channel->pan = 0x30;
+    channel->bend = 0;
+}
+
+// Start a MIDI track playing:
+
+static void StartTrack(midi_file_t *file, unsigned int track_num)
+{
+    opl_track_data_t *track;
+
+    track = &tracks[track_num];
+    track->iter = MIDI_IterateTrack(file, track_num);
+
+    // Schedule the first event.
+
+    ScheduleTrack(track);
+}
+
+// Start playing a mid
+
+static void I_OPL_PlaySong(void *handle, boolean looping)
+{
+    midi_file_t *file;
+    unsigned int i;
+
+    if (!music_initialized || handle == NULL)
+    {
+        return;
+    }
+
+    file = handle;
+
+    // Allocate track data.
+
+    tracks = malloc(MIDI_NumTracks(file) * sizeof(opl_track_data_t));
+
+    num_tracks = MIDI_NumTracks(file);
+    running_tracks = num_tracks;
+    song_looping = looping;
+
+    ticks_per_beat = MIDI_GetFileTimeDivision(file);
+
+    // Default is 120 bpm.
+    // TODO: this is wrong
+
+    us_per_beat = 500 * 1000;
+
+    start_music_volume = current_music_volume;
+
+    for (i = 0; i < num_tracks; ++i)
+    {
+        StartTrack(file, i);
+    }
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        InitChannel(&channels[i]);
+    }
+
+    // If the music was previously paused, it needs to be unpaused; playing
+    // a new song implies that we turn off pause. This matches vanilla
+    // behavior of the DMX library, and some of the higher-level code in
+    // s_sound.c relies on this.
+    OPL_SetPaused(0);
+}
+
+static void I_OPL_PauseSong(void)
+{
+    unsigned int i;
+
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    // Pause OPL callbacks.
+
+    OPL_SetPaused(1);
+
+    // Turn off all main instrument voices (not percussion).
+    // This is what Vanilla does.
+
+    for (i = 0; i < num_opl_voices; ++i)
+    {
+        if (voices[i].channel != NULL
+         && voices[i].current_instr < percussion_instrs)
+        {
+            VoiceKeyOff(&voices[i]);
+        }
+    }
+}
+
+static void I_OPL_ResumeSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    OPL_SetPaused(0);
+}
+
+static void I_OPL_StopSong(void)
+{
+    unsigned int i;
+
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    OPL_Lock();
+
+    // Stop all playback.
+
+    OPL_ClearCallbacks();
+
+    // Free all voices.
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        AllNotesOff(&channels[i], 0);
+    }
+
+    // Free all track data.
+
+    for (i = 0; i < num_tracks; ++i)
+    {
+        MIDI_FreeIterator(tracks[i].iter);
+    }
+
+    free(tracks);
+
+    tracks = NULL;
+    num_tracks = 0;
+
+    OPL_Unlock();
+}
+
+static void I_OPL_UnRegisterSong(void *handle)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    if (handle != NULL)
+    {
+        MIDI_FreeFile(handle);
+    }
+}
+
+// Determine whether memory block is a .mid file
+
+static boolean IsMid(byte *mem, int len)
+{
+    return len > 4 && !memcmp(mem, "MThd", 4);
+}
+
+static boolean ConvertMus(byte *musdata, int len, char *filename)
+{
+    MEMFILE *instream;
+    MEMFILE *outstream;
+    void *outbuf;
+    size_t outbuf_len;
+    int result;
+
+    instream = mem_fopen_read(musdata, len);
+    outstream = mem_fopen_write();
+
+    result = mus2mid(instream, outstream);
+
+    if (result == 0)
+    {
+        mem_get_buf(outstream, &outbuf, &outbuf_len);
+
+        M_WriteFile(filename, outbuf, outbuf_len);
+    }
+
+    mem_fclose(instream);
+    mem_fclose(outstream);
+
+    return result;
+}
+
+static void *I_OPL_RegisterSong(void *data, int len)
+{
+    midi_file_t *result;
+    char *filename;
+
+    if (!music_initialized)
+    {
+        return NULL;
+    }
+
+    // MUS files begin with "MUS"
+    // Reject anything which doesnt have this signature
+
+    filename = M_TempFile("doom.mid");
+
+    if (IsMid(data, len) && len < MAXMIDLENGTH)
+    {
+        M_WriteFile(filename, data, len);
+    }
+    else
+    {
+        // Assume a MUS file and try to convert
+
+        ConvertMus(data, len, filename);
+    }
+
+    result = MIDI_LoadFile(filename);
+
+    if (result == NULL)
+    {
+        fprintf(stderr, "I_OPL_RegisterSong: Failed to load MID.\n");
+    }
+
+    // remove file now
+
+    M_remove(filename);
+    free(filename);
+
+    return result;
+}
+
+// Is the song playing?
+
+static boolean I_OPL_MusicIsPlaying(void)
+{
+    if (!music_initialized)
+    {
+        return false;
+    }
+
+    return num_tracks > 0;
+}
+
+// Shutdown music
+
+static void I_OPL_ShutdownMusic(void)
+{
+    if (music_initialized)
+    {
+        // Stop currently-playing track, if there is one:
+
+        I_OPL_StopSong();
+
+        OPL_Shutdown();
+
+        // Release GENMIDI lump
+
+        W_ReleaseLumpName(DEH_String("genmidi"));
+
+        music_initialized = false;
+    }
+}
+
+// Initialize music subsystem
+
+static boolean I_OPL_InitMusic(void)
+{
+    const char *dmxoption;
+    opl_init_result_t chip_type;
+
+    OPL_SetSampleRate(snd_samplerate);
+
+    chip_type = OPL_Init(opl_io_port);
+    if (chip_type == OPL_INIT_NONE)
+    {
+        printf("Dude.  The Adlib isn't responding.\n");
+        return false;
+    }
+
+    // The DMXOPTION variable must be set to enable OPL3 support.
+    // As an extension, we also allow it to be set from the config file.
+    dmxoption = getenv("DMXOPTION");
+    if (dmxoption == NULL)
+    {
+        dmxoption = snd_dmxoption != NULL ? snd_dmxoption : "";
+    }
+
+    if (chip_type == OPL_INIT_OPL3 && strstr(dmxoption, "-opl3") != NULL)
+    {
+        opl_opl3mode = 1;
+        num_opl_voices = OPL_NUM_VOICES * 2;
+    }
+    else
+    {
+        opl_opl3mode = 0;
+        num_opl_voices = OPL_NUM_VOICES;
+    }
+
+    // Secret, undocumented DMXOPTION that reverses the stereo channels
+    // into their correct orientation.
+    opl_stereo_correct = strstr(dmxoption, "-reverse") != NULL;
+
+    // Initialize all registers.
+
+    OPL_InitRegisters(opl_opl3mode);
+
+    // Load instruments from GENMIDI lump:
+
+    if (!LoadInstrumentTable())
+    {
+        OPL_Shutdown();
+        return false;
+    }
+
+    InitVoices();
+
+    tracks = NULL;
+    num_tracks = 0;
+    music_initialized = true;
+
+    return true;
+}
+
+const static snddevice_t music_opl_devices[] =
+{
+    SNDDEVICE_ADLIB,
+    SNDDEVICE_SB,
+};
+
+const music_module_t music_opl_module =
+{
+    music_opl_devices,
+    arrlen(music_opl_devices),
+    I_OPL_InitMusic,
+    I_OPL_ShutdownMusic,
+    I_OPL_SetMusicVolume,
+    I_OPL_PauseSong,
+    I_OPL_ResumeSong,
+    I_OPL_RegisterSong,
+    I_OPL_UnRegisterSong,
+    I_OPL_PlaySong,
+    I_OPL_StopSong,
+    I_OPL_MusicIsPlaying,
+    NULL,  // Poll
+};
+
+void I_SetOPLDriverVer(opl_driver_ver_t ver)
+{
+    opl_drv_ver = ver;
+}
+
+//----------------------------------------------------------------------
+//
+// Development / debug message generation, to help developing GENMIDI
+// lumps.
+//
+//----------------------------------------------------------------------
+
+static int NumActiveChannels(void)
+{
+    int i;
+
+    for (i = MIDI_CHANNELS_PER_TRACK - 1; i >= 0; --i)
+    {
+        if (channels[i].instrument != &main_instrs[0])
+        {
+            return i + 1;
+        }
+    }
+
+    return 0;
+}
+
+static int ChannelInUse(opl_channel_data_t *channel)
+{
+    int i;
+
+    for (i = 0; i < voice_alloced_num; i++)
+    {
+        if (voice_alloced_list[i]->channel == channel)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+void I_OPL_DevMessages(char *result, size_t result_len)
+{
+    char tmp[80];
+    int instr_num;
+    int lines;
+    int i;
+
+    if (num_tracks == 0)
+    {
+        M_snprintf(result, result_len, "No OPL track!");
+        return;
+    }
+
+    M_snprintf(result, result_len, "Tracks:\n");
+    lines = 1;
+
+    for (i = 0; i < NumActiveChannels(); ++i)
+    {
+        if (channels[i].instrument == NULL)
+        {
+            continue;
+        }
+
+        instr_num = channels[i].instrument - main_instrs;
+
+        M_snprintf(tmp, sizeof(tmp),
+                   "chan %i: %c i#%i (%s)\n",
+                   i,
+                   ChannelInUse(&channels[i]) ? '\'' : ' ',
+                   instr_num + 1,
+                   main_instr_names[instr_num]);
+        M_StringConcat(result, tmp, result_len);
+
+        ++lines;
+    }
+
+    M_snprintf(tmp, sizeof(tmp), "\nLast percussion:\n");
+    M_StringConcat(result, tmp, result_len);
+    lines += 2;
+
+    i = (last_perc_count + PERCUSSION_LOG_LEN - 1) % PERCUSSION_LOG_LEN;
+
+    do {
+        if (last_perc[i] == 0)
+        {
+            break;
+        }
+
+        M_snprintf(tmp, sizeof(tmp),
+                   "%cp#%i (%s)\n",
+                   i == 0 ? '\'' : ' ',
+                   last_perc[i],
+                   percussion_names[last_perc[i] - 35]);
+        M_StringConcat(result, tmp, result_len);
+        ++lines;
+
+        i = (i + PERCUSSION_LOG_LEN - 1) % PERCUSSION_LOG_LEN;
+    } while (lines < 25 && i != last_perc_count);
+}
+
diff --git a/games/NXDoom/src/i_pcsound.c b/games/NXDoom/src/i_pcsound.c
new file mode 100644
index 000000000..c3ec62803
--- /dev/null
+++ b/games/NXDoom/src/i_pcsound.c
@@ -0,0 +1,338 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System interface for PC speaker sound.
+//
+
+#include "SDL.h"
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "deh_str.h"
+#include "i_sound.h"
+#include "m_misc.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "pcsound.h"
+
+#define TIMER_FREQ 1193181 /* hz */
+
+static boolean pcs_initialized = false;
+
+static SDL_mutex *sound_lock;
+static GameMission_t gamemission;
+
+static uint8_t *current_sound_lump = NULL;
+static uint8_t *current_sound_pos = NULL;
+static unsigned int current_sound_remaining = 0;
+static int current_sound_handle = 0;
+static int current_sound_lump_num = -1;
+
+static const uint16_t divisors[] = {
+    0,
+    6818, 6628, 6449, 6279, 6087, 5906, 5736, 5575,
+    5423, 5279, 5120, 4971, 4830, 4697, 4554, 4435,
+    4307, 4186, 4058, 3950, 3836, 3728, 3615, 3519,
+    3418, 3323, 3224, 3131, 3043, 2960, 2875, 2794,
+    2711, 2633, 2560, 2485, 2415, 2348, 2281, 2213,
+    2153, 2089, 2032, 1975, 1918, 1864, 1810, 1757,
+    1709, 1659, 1612, 1565, 1521, 1478, 1435, 1395,
+    1355, 1316, 1280, 1242, 1207, 1173, 1140, 1107,
+    1075, 1045, 1015,  986,  959,  931,  905,  879,
+     854,  829,  806,  783,  760,  739,  718,  697,
+     677,  658,  640,  621,  604,  586,  570,  553,
+     538,  522,  507,  493,  479,  465,  452,  439,
+     427,  415,  403,  391,  380,  369,  359,  348,
+     339,  329,  319,  310,  302,  293,  285,  276,
+     269,  261,  253,  246,  239,  232,  226,  219,
+     213,  207,  201,  195,  190,  184,  179,
+};
+
+static void PCSCallbackFunc(int *duration, int *freq)
+{
+    unsigned int tone;
+
+    *duration = 1000 / 140;
+
+    if (SDL_LockMutex(sound_lock) < 0)
+    {
+        *freq = 0;
+        return;
+    }
+
+    if (current_sound_lump != NULL && current_sound_remaining > 0)
+    {
+        // Read the next tone
+
+        tone = *current_sound_pos;
+
+        // Use the tone -> frequency lookup table.  See pcspkr10.zip
+        // for a full discussion of this.
+        // Check we don't overflow the frequency table.
+
+        if (tone < arrlen(divisors) && divisors[tone] != 0)
+        {
+            *freq = (int) (TIMER_FREQ / divisors[tone]);
+        }
+        else
+        {
+            *freq = 0;
+        }
+
+        ++current_sound_pos;
+        --current_sound_remaining;
+    }
+    else
+    {
+        *freq = 0;
+    }
+
+    SDL_UnlockMutex(sound_lock);
+}
+
+static boolean CachePCSLump(sfxinfo_t *sfxinfo)
+{
+    int lumplen;
+    int headerlen;
+
+    // Free the current sound lump back to the cache
+ 
+    if (current_sound_lump != NULL)
+    {
+        W_ReleaseLumpNum(current_sound_lump_num);
+        current_sound_lump = NULL;
+    }
+
+    // Load from WAD
+
+    current_sound_lump = W_CacheLumpNum(sfxinfo->lumpnum, PU_STATIC);
+    lumplen = W_LumpLength(sfxinfo->lumpnum);
+
+    // Read header
+  
+    if (current_sound_lump[0] != 0x00 || current_sound_lump[1] != 0x00)
+    {
+        return false;
+    }
+
+    headerlen = (current_sound_lump[3] << 8) | current_sound_lump[2];
+
+    if (headerlen > lumplen - 4)
+    {
+        return false;
+    }
+
+    // Header checks out ok
+
+    current_sound_remaining = headerlen;
+    current_sound_pos = current_sound_lump + 4;
+    current_sound_lump_num = sfxinfo->lumpnum;
+
+    return true;
+}
+
+// These Doom PC speaker sounds are not played - this can be seen in the 
+// Heretic source code, where there are remnants of this left over
+// from Doom.
+
+static boolean IsDisabledSound(sfxinfo_t *sfxinfo)
+{
+    int i;
+    const char *disabled_sounds[] = {
+        "posact",
+        "bgact",
+        "dmact",
+        "dmpain",
+        "popain",
+        "sawidl",
+        "rifle",
+    };
+
+    for (i=0; i<arrlen(disabled_sounds); ++i)
+    {
+        if (!strcmp(sfxinfo->name, disabled_sounds[i]))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static int I_PCS_StartSound(sfxinfo_t *sfxinfo,
+                            int channel,
+                            int vol,
+                            int sep,
+                            int pitch)
+{
+    int result;
+
+    if (!pcs_initialized)
+    {
+        return -1;
+    }
+
+    if (IsDisabledSound(sfxinfo))
+    {
+        return -1;
+    }
+
+    if (SDL_LockMutex(sound_lock) < 0)
+    {
+        return -1;
+    }
+
+    result = CachePCSLump(sfxinfo);
+
+    if (result)
+    {
+        current_sound_handle = channel;
+    }
+
+    SDL_UnlockMutex(sound_lock);
+
+    if (result)
+    {
+        return channel;
+    }
+    else
+    {
+        return -1;
+    }
+}
+
+static void I_PCS_StopSound(int handle)
+{
+    if (!pcs_initialized)
+    {
+        return;
+    }
+
+    if (SDL_LockMutex(sound_lock) < 0)
+    {
+        return;
+    }
+
+    // If this is the channel currently playing, immediately end it.
+
+    if (current_sound_handle == handle)
+    {
+        current_sound_remaining = 0;
+    }
+    
+    SDL_UnlockMutex(sound_lock);
+}
+
+//
+// Retrieve the raw data lump index
+//  for a given SFX name.
+//
+
+static int I_PCS_GetSfxLumpNum(sfxinfo_t* sfx)
+{
+    char namebuf[9];
+
+    if (gamemission == doom || gamemission == strife)
+    {
+        M_snprintf(namebuf, sizeof(namebuf), "dp%s", DEH_String(sfx->name));
+
+        if (gamemission == strife && W_CheckNumForName(namebuf) == -1)
+        {
+            // Missing sounds replaced with DPRIFLE.
+            M_snprintf(namebuf, sizeof(namebuf), "dp%s", DEH_String("rifle"));
+        }
+    }
+    else
+    {
+        M_StringCopy(namebuf, DEH_String(sfx->name), sizeof(namebuf));
+    }
+
+    return W_GetNumForName(namebuf);
+}
+
+
+static boolean I_PCS_SoundIsPlaying(int handle)
+{
+    if (!pcs_initialized)
+    {
+        return false;
+    }
+
+    if (handle != current_sound_handle)
+    {
+        return false;
+    }
+
+    return current_sound_lump != NULL && current_sound_remaining > 0;
+}
+
+static boolean I_PCS_InitSound(GameMission_t mission)
+{
+    gamemission = mission;
+
+    // Use the sample rate from the configuration file
+
+    PCSound_SetSampleRate(snd_samplerate);
+
+    // Initialize the PC speaker subsystem.
+
+    pcs_initialized = PCSound_Init(PCSCallbackFunc);
+
+    if (pcs_initialized)
+    {
+        sound_lock = SDL_CreateMutex();
+    }
+
+    return pcs_initialized;
+}
+
+static void I_PCS_ShutdownSound(void)
+{
+    if (pcs_initialized)
+    {
+        PCSound_Shutdown();
+    }
+}
+
+static void I_PCS_UpdateSound(void)
+{
+    // no-op.
+}
+
+void I_PCS_UpdateSoundParams(int channel, int vol, int sep)
+{
+    // no-op.
+}
+
+static const snddevice_t sound_pcsound_devices[] =
+{
+    SNDDEVICE_PCSPEAKER,
+};
+
+const sound_module_t sound_pcsound_module =
+{
+    sound_pcsound_devices,
+    arrlen(sound_pcsound_devices),
+    I_PCS_InitSound,
+    I_PCS_ShutdownSound,
+    I_PCS_GetSfxLumpNum,
+    I_PCS_UpdateSound,
+    I_PCS_UpdateSoundParams,
+    I_PCS_StartSound,
+    I_PCS_StopSound,
+    I_PCS_SoundIsPlaying,
+};
+
diff --git a/games/NXDoom/src/i_sdlmusic.c b/games/NXDoom/src/i_sdlmusic.c
new file mode 100644
index 000000000..70502d0b2
--- /dev/null
+++ b/games/NXDoom/src/i_sdlmusic.c
@@ -0,0 +1,473 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System interface for music.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "SDL.h"
+
+#include "config.h"
+#include "doomtype.h"
+#include "memio.h"
+#include "mus2mid.h"
+
+#include "deh_str.h"
+#include "gusconf.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "sha1.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+
+char *timidity_cfg_path = "";
+
+static char *temp_timidity_cfg = NULL;
+
+// If the temp_timidity_cfg config variable is set, generate a "wrapper"
+// config file for Timidity to point to the actual config file. This
+// is needed to inject a "dir" command so that the patches are read
+// relative to the actual config file.
+
+static boolean WriteWrapperTimidityConfig(char *write_path)
+{
+    char *path;
+    FILE *fstream;
+
+    if (!strcmp(timidity_cfg_path, ""))
+    {
+        return false;
+    }
+
+    fstream = M_fopen(write_path, "w");
+
+    if (fstream == NULL)
+    {
+        return false;
+    }
+
+    path = M_DirName(timidity_cfg_path);
+    fprintf(fstream, "dir %s\n", path);
+    free(path);
+
+    fprintf(fstream, "source %s\n", timidity_cfg_path);
+    fclose(fstream);
+
+    return true;
+}
+
+
+// putenv requires a non-const string whose lifetime is the whole program
+// so can't use a string directly, have to do this silliness
+static char sdl_mixer_disable_fluidsynth[] = "SDL_MIXER_DISABLE_FLUIDSYNTH=1";
+
+
+void I_InitTimidityConfig(void)
+{
+    char *env_string;
+    boolean success;
+
+    temp_timidity_cfg = M_TempFile("timidity.cfg");
+
+    if (snd_musicdevice == SNDDEVICE_GUS)
+    {
+        success = GUS_WriteConfig(temp_timidity_cfg);
+    }
+    else
+    {
+        success = WriteWrapperTimidityConfig(temp_timidity_cfg);
+    }
+
+    // Set the TIMIDITY_CFG environment variable to point to the temporary
+    // config file.
+    if (success)
+    {
+        env_string = M_StringJoin("TIMIDITY_CFG=", temp_timidity_cfg, NULL);
+        putenv(env_string);
+        // env_string deliberately not freed; see putenv manpage
+
+        // If we're explicitly configured to use Timidity (either through
+        // timidity_cfg_path or GUS mode), then disable Fluidsynth, because
+        // SDL_mixer considers Fluidsynth a higher priority than Timidity and
+        // therefore can end up circumventing Timidity entirely.
+        putenv(sdl_mixer_disable_fluidsynth);
+    }
+    else
+    {
+        free(temp_timidity_cfg);
+        temp_timidity_cfg = NULL;
+    }
+}
+
+
+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+
+#define MAXMIDLENGTH (96 * 1024)
+
+static boolean music_initialized = false;
+
+// If this is true, this module initialized SDL sound and has the
+// responsibility to shut it down
+
+static boolean sdl_was_initialized = false;
+
+static boolean musicpaused = false;
+static int current_music_volume;
+
+
+// Remove the temporary config file generated by I_InitTimidityConfig().
+
+static void RemoveTimidityConfig(void)
+{
+    if (temp_timidity_cfg != NULL)
+    {
+        M_remove(temp_timidity_cfg);
+        free(temp_timidity_cfg);
+    }
+}
+
+// Shutdown music
+
+static void I_SDL_ShutdownMusic(void)
+{
+    if (music_initialized)
+    {
+        Mix_HaltMusic();
+        music_initialized = false;
+
+        if (sdl_was_initialized)
+        {
+            Mix_CloseAudio();
+            SDL_QuitSubSystem(SDL_INIT_AUDIO);
+            sdl_was_initialized = false;
+        }
+    }
+}
+
+static boolean SDLIsInitialized(void)
+{
+    int freq, channels;
+    Uint16 format;
+
+    return Mix_QuerySpec(&freq, &format, &channels) != 0;
+}
+
+#ifdef _WIN32
+// putenv requires a non-const string whose lifetime is the whole program
+static char sdl_mixer_disable_nativemidi[] = "SDL_MIXER_DISABLE_NATIVEMIDI=1";
+#endif
+
+// Initialize music subsystem
+static boolean I_SDL_InitMusic(void)
+{
+    // If SDL_mixer is not initialized, we have to initialize it
+    // and have the responsibility to shut it down later on.
+
+    if (SDLIsInitialized())
+    {
+        music_initialized = true;
+    }
+    else
+    {
+        if (SDL_Init(SDL_INIT_AUDIO) < 0)
+        {
+            fprintf(stderr, "Unable to set up sound.\n");
+        }
+        else if (Mix_OpenAudioDevice(snd_samplerate, AUDIO_S16SYS, 2, 1024, NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
+        {
+            fprintf(stderr, "Error initializing SDL_mixer: %s\n",
+                    Mix_GetError());
+            SDL_QuitSubSystem(SDL_INIT_AUDIO);
+        }
+        else
+        {
+            SDL_PauseAudio(0);
+
+            sdl_was_initialized = true;
+            music_initialized = true;
+        }
+    }
+
+    #ifdef _WIN32
+    // Never let SDL Mixer use native midi on Windows. Avoids SDL Mixer bug
+    // where music volume affects global application volume.
+    putenv(sdl_mixer_disable_nativemidi);
+    #endif
+
+    // Initialize SDL_Mixer for MIDI music playback
+    Mix_Init(MIX_INIT_MID);
+
+    // Once initialization is complete, the temporary Timidity config
+    // file can be removed.
+
+    RemoveTimidityConfig();
+
+    // If snd_musiccmd is set, we need to call Mix_SetMusicCMD to
+    // configure an external music playback program.
+
+    if (strlen(snd_musiccmd) > 0)
+    {
+        Mix_SetMusicCMD(snd_musiccmd);
+    }
+
+    return music_initialized;
+}
+
+//
+// SDL_mixer's native MIDI music playing does not pause properly.
+// As a workaround, set the volume to 0 when paused.
+//
+
+static void UpdateMusicVolume(void)
+{
+    int vol;
+
+    if (musicpaused)
+    {
+        vol = 0;
+    }
+    else
+    {
+        vol = (current_music_volume * MIX_MAX_VOLUME) / 127;
+    }
+
+    Mix_VolumeMusic(vol);
+}
+
+// Set music volume (0 - 127)
+
+static void I_SDL_SetMusicVolume(int volume)
+{
+    // Internal state variable.
+    current_music_volume = volume;
+
+    UpdateMusicVolume();
+}
+
+// Start playing a mid
+
+static void I_SDL_PlaySong(void *handle, boolean looping)
+{
+    int loops;
+
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    if (handle == NULL)
+    {
+        return;
+    }
+
+    if (looping)
+    {
+        loops = -1;
+    }
+    else
+    {
+        loops = 1;
+    }
+
+    Mix_PlayMusic((Mix_Music *) handle, loops);
+}
+
+static void I_SDL_PauseSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    musicpaused = true;
+
+    UpdateMusicVolume();
+}
+
+static void I_SDL_ResumeSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    musicpaused = false;
+
+    UpdateMusicVolume();
+}
+
+static void I_SDL_StopSong(void)
+{
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    Mix_HaltMusic();
+}
+
+static void I_SDL_UnRegisterSong(void *handle)
+{
+    Mix_Music *music = (Mix_Music *) handle;
+
+    if (!music_initialized)
+    {
+        return;
+    }
+
+    if (handle != NULL)
+    {
+        Mix_FreeMusic(music);
+    }
+}
+
+// Determine whether memory block is a .mid file 
+
+static boolean IsMid(byte *mem, int len)
+{
+    return len > 4 && !memcmp(mem, "MThd", 4);
+}
+
+static boolean ConvertMus(byte *musdata, int len, const char *filename)
+{
+    MEMFILE *instream;
+    MEMFILE *outstream;
+    void *outbuf;
+    size_t outbuf_len;
+    int result;
+
+    instream = mem_fopen_read(musdata, len);
+    outstream = mem_fopen_write();
+
+    result = mus2mid(instream, outstream);
+
+    if (result == 0)
+    {
+        mem_get_buf(outstream, &outbuf, &outbuf_len);
+
+        M_WriteFile(filename, outbuf, outbuf_len);
+    }
+
+    mem_fclose(instream);
+    mem_fclose(outstream);
+
+    return result;
+}
+
+static void *I_SDL_RegisterSong(void *data, int len)
+{
+    char *filename;
+    Mix_Music *music;
+
+    if (!music_initialized)
+    {
+        return NULL;
+    }
+
+    // MUS files begin with "MUS"
+    // Reject anything which doesnt have this signature
+
+    filename = M_TempFile("doom.mid");
+
+    if (IsMid(data, len) && len < MAXMIDLENGTH)
+    {
+        M_WriteFile(filename, data, len);
+    }
+    else
+    {
+	// Assume a MUS file and try to convert
+
+        ConvertMus(data, len, filename);
+    }
+
+    // Load the MIDI. In an ideal world we'd be using Mix_LoadMUS_RW()
+    // by now, but Mix_SetMusicCMD() only works with Mix_LoadMUS(), so
+    // we have to generate a temporary file.
+
+    music = Mix_LoadMUS(filename);
+    if (music == NULL)
+    {
+        // Failed to load
+        fprintf(stderr, "Error loading midi: %s\n", Mix_GetError());
+    }
+
+    // Remove the temporary MIDI file; however, when using an external
+    // MIDI program we can't delete the file. Otherwise, the program
+    // won't find the file to play. This means we leave a mess on
+    // disk :(
+
+    if (strlen(snd_musiccmd) == 0)
+    {
+        M_remove(filename);
+    }
+
+    free(filename);
+
+    return music;
+}
+
+// Is the song playing?
+static boolean I_SDL_MusicIsPlaying(void)
+{
+    if (!music_initialized)
+    {
+        return false;
+    }
+
+    return Mix_PlayingMusic();
+}
+
+static const snddevice_t music_sdl_devices[] =
+{
+    SNDDEVICE_PAS,
+    SNDDEVICE_GUS,
+    SNDDEVICE_WAVEBLASTER,
+    SNDDEVICE_SOUNDCANVAS,
+    SNDDEVICE_GENMIDI,
+    SNDDEVICE_AWE32,
+};
+
+const music_module_t music_sdl_module =
+{
+    music_sdl_devices,
+    arrlen(music_sdl_devices),
+    I_SDL_InitMusic,
+    I_SDL_ShutdownMusic,
+    I_SDL_SetMusicVolume,
+    I_SDL_PauseSong,
+    I_SDL_ResumeSong,
+    I_SDL_RegisterSong,
+    I_SDL_UnRegisterSong,
+    I_SDL_PlaySong,
+    I_SDL_StopSong,
+    I_SDL_MusicIsPlaying,
+    NULL,  // Poll
+};
+
+
+#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/src/i_sdlsound.c b/games/NXDoom/src/i_sdlsound.c
new file mode 100644
index 000000000..18a51a09d
--- /dev/null
+++ b/games/NXDoom/src/i_sdlsound.c
@@ -0,0 +1,1146 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2008 David Flater
+//
+// 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.
+//
+// DESCRIPTION:
+//	System interface for sound.
+//
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "SDL.h"
+
+#ifdef HAVE_LIBSAMPLERATE
+#include <samplerate.h>
+#endif
+
+#include "deh_str.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "doomtype.h"
+
+
+int use_libsamplerate = 0;
+
+// Scale factor used when converting libsamplerate floating point numbers
+// to integers. Too high means the sounds can clip; too low means they
+// will be too quiet. This is an amount that should avoid clipping most
+// of the time: with all the Doom IWAD sound effects, at least. If a PWAD
+// is used, clipping might occur.
+
+float libsamplerate_scale = 0.65f;
+
+
+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+
+#define LOW_PASS_FILTER
+//#define DEBUG_DUMP_WAVS
+#define NUM_CHANNELS 16
+
+typedef struct allocated_sound_s allocated_sound_t;
+
+struct allocated_sound_s
+{
+    sfxinfo_t *sfxinfo;
+    Mix_Chunk chunk;
+    int use_count;
+    int pitch;
+    allocated_sound_t *prev, *next;
+};
+
+static boolean sound_initialized = false;
+
+static allocated_sound_t *channels_playing[NUM_CHANNELS];
+
+static int mixer_freq;
+static Uint16 mixer_format;
+static int mixer_channels;
+static boolean use_sfx_prefix;
+static boolean (*ExpandSoundData)(sfxinfo_t *sfxinfo,
+                                  byte *data,
+                                  int samplerate,
+                                  int length) = NULL;
+
+// Doubly-linked list of allocated sounds.
+// When a sound is played, it is moved to the head, so that the oldest
+// sounds not used recently are at the tail.
+
+static allocated_sound_t *allocated_sounds_head = NULL;
+static allocated_sound_t *allocated_sounds_tail = NULL;
+static int allocated_sounds_size = 0;
+
+
+// Hook a sound into the linked list at the head.
+
+static void AllocatedSoundLink(allocated_sound_t *snd)
+{
+    snd->prev = NULL;
+
+    snd->next = allocated_sounds_head;
+    allocated_sounds_head = snd;
+
+    if (allocated_sounds_tail == NULL)
+    {
+        allocated_sounds_tail = snd;
+    }
+    else
+    {
+        snd->next->prev = snd;
+    }
+}
+
+// Unlink a sound from the linked list.
+
+static void AllocatedSoundUnlink(allocated_sound_t *snd)
+{
+    if (snd->prev == NULL)
+    {
+        allocated_sounds_head = snd->next;
+    }
+    else
+    {
+        snd->prev->next = snd->next;
+    }
+
+    if (snd->next == NULL)
+    {
+        allocated_sounds_tail = snd->prev;
+    }
+    else
+    {
+        snd->next->prev = snd->prev;
+    }
+}
+
+static void FreeAllocatedSound(allocated_sound_t *snd)
+{
+    // Unlink from linked list.
+
+    AllocatedSoundUnlink(snd);
+
+    // Keep track of the amount of allocated sound data:
+
+    allocated_sounds_size -= snd->chunk.alen;
+
+    free(snd);
+}
+
+// Search from the tail backwards along the allocated sounds list, find
+// and free a sound that is not in use, to free up memory.  Return true
+// for success.
+
+static boolean FindAndFreeSound(void)
+{
+    allocated_sound_t *snd;
+
+    snd = allocated_sounds_tail;
+
+    while (snd != NULL)
+    {
+        if (snd->use_count == 0)
+        {
+            FreeAllocatedSound(snd);
+            return true;
+        }
+
+        snd = snd->prev;
+    }
+
+    // No available sounds to free...
+
+    return false;
+}
+
+// Enforce SFX cache size limit.  We are just about to allocate "len"
+// bytes on the heap for a new sound effect, so free up some space
+// so that we keep allocated_sounds_size < snd_cachesize
+
+static void ReserveCacheSpace(size_t len)
+{
+    if (snd_cachesize <= 0)
+    {
+        return;
+    }
+
+    // Keep freeing sound effects that aren't currently being played,
+    // until there is enough space for the new sound.
+
+    while (allocated_sounds_size + len > snd_cachesize)
+    {
+        // Free a sound.  If there is nothing more to free, stop.
+
+        if (!FindAndFreeSound())
+        {
+            break;
+        }
+    }
+}
+
+// Allocate a block for a new sound effect.
+
+static allocated_sound_t *AllocateSound(sfxinfo_t *sfxinfo, size_t len)
+{
+    allocated_sound_t *snd;
+
+    // Keep allocated sounds within the cache size.
+
+    ReserveCacheSpace(len);
+
+    // Allocate the sound structure and data.  The data will immediately
+    // follow the structure, which acts as a header.
+
+    do
+    {
+        snd = malloc(sizeof(allocated_sound_t) + len);
+
+        // Out of memory?  Try to free an old sound, then loop round
+        // and try again.
+
+        if (snd == NULL && !FindAndFreeSound())
+        {
+            return NULL;
+        }
+
+    } while (snd == NULL);
+
+    // Skip past the chunk structure for the audio buffer
+
+    snd->chunk.abuf = (byte *) (snd + 1);
+    snd->chunk.alen = len;
+    snd->chunk.allocated = 1;
+    snd->chunk.volume = MIX_MAX_VOLUME;
+    snd->pitch = NORM_PITCH;
+
+    snd->sfxinfo = sfxinfo;
+    snd->use_count = 0;
+
+    // Keep track of how much memory all these cached sounds are using...
+
+    allocated_sounds_size += len;
+
+    AllocatedSoundLink(snd);
+
+    return snd;
+}
+
+// Lock a sound, to indicate that it may not be freed.
+
+static void LockAllocatedSound(allocated_sound_t *snd)
+{
+    // Increase use count, to stop the sound being freed.
+
+    ++snd->use_count;
+
+    //printf("++ %s: Use count=%i\n", snd->sfxinfo->name, snd->use_count);
+
+    // When we use a sound, re-link it into the list at the head, so
+    // that the oldest sounds fall to the end of the list for freeing.
+
+    AllocatedSoundUnlink(snd);
+    AllocatedSoundLink(snd);
+}
+
+// Unlock a sound to indicate that it may now be freed.
+
+static void UnlockAllocatedSound(allocated_sound_t *snd)
+{
+    if (snd->use_count <= 0)
+    {
+        I_Error("Sound effect released more times than it was locked...");
+    }
+
+    --snd->use_count;
+
+    //printf("-- %s: Use count=%i\n", snd->sfxinfo->name, snd->use_count);
+}
+
+// Search through the list of allocated sounds and return the one that matches
+// the supplied sfxinfo entry and pitch level.
+
+static allocated_sound_t * GetAllocatedSoundBySfxInfoAndPitch(sfxinfo_t *sfxinfo, int pitch)
+{
+    allocated_sound_t * p = allocated_sounds_head;
+
+    while (p != NULL)
+    {
+        if (p->sfxinfo == sfxinfo && p->pitch == pitch)
+        {
+            return p;
+        }
+        p = p->next;
+    }
+
+    return NULL;
+}
+
+// Allocate a new sound chunk and pitch-shift an existing sound up-or-down
+// into it.
+
+static allocated_sound_t * PitchShift(allocated_sound_t *insnd, int pitch)
+{
+    allocated_sound_t * outsnd;
+    Sint16 *inp, *outp;
+    Sint16 *srcbuf, *dstbuf;
+    Uint32 srclen, dstlen;
+
+    srcbuf = (Sint16 *)insnd->chunk.abuf;
+    srclen = insnd->chunk.alen;
+
+    // determine ratio pitch:NORM_PITCH and apply to srclen, then invert.
+    // This is an approximation of vanilla behaviour based on measurements
+    dstlen = (int)((1 + (1 - (float)pitch / NORM_PITCH)) * srclen);
+
+    // ensure that the new buffer is an even length
+    if ((dstlen % 2) == 0)
+    {
+        dstlen++;
+    }
+
+    outsnd = AllocateSound(insnd->sfxinfo, dstlen);
+
+    if (!outsnd)
+    {
+        return NULL;
+    }
+
+    outsnd->pitch = pitch;
+    dstbuf = (Sint16 *)outsnd->chunk.abuf;
+
+    // loop over output buffer. find corresponding input cell, copy over
+    for (outp = dstbuf; outp < dstbuf + dstlen/2; ++outp)
+    {
+        inp = srcbuf + (int)((float)(outp - dstbuf) / dstlen * srclen);
+        *outp = *inp;
+    }
+
+    return outsnd;
+}
+
+// When a sound stops, check if it is still playing.  If it is not,
+// we can mark the sound data as CACHE to be freed back for other
+// means.
+
+static void ReleaseSoundOnChannel(int channel)
+{
+    allocated_sound_t *snd = channels_playing[channel];
+
+    Mix_HaltChannel(channel);
+
+    if (snd == NULL)
+    {
+        return;
+    }
+
+    channels_playing[channel] = NULL;
+
+    UnlockAllocatedSound(snd);
+
+    // if the sound is a pitch-shift and it's not in use, immediately
+    // free it
+    if (snd->pitch != NORM_PITCH && snd->use_count <= 0)
+    {
+        FreeAllocatedSound(snd);
+    }
+}
+
+#ifdef HAVE_LIBSAMPLERATE
+
+// Returns the conversion mode for libsamplerate to use.
+
+static int SRC_ConversionMode(void)
+{
+    switch (use_libsamplerate)
+    {
+        // 0 = disabled
+
+        default:
+        case 0:
+            return -1;
+
+        // Ascending numbers give higher quality
+
+        case 1:
+            return SRC_LINEAR;
+        case 2:
+            return SRC_ZERO_ORDER_HOLD;
+        case 3:
+            return SRC_SINC_FASTEST;
+        case 4:
+            return SRC_SINC_MEDIUM_QUALITY;
+        case 5:
+            return SRC_SINC_BEST_QUALITY;
+    }
+}
+
+// libsamplerate-based generic sound expansion function for any sample rate
+//   unsigned 8 bits --> signed 16 bits
+//   mono --> stereo
+//   samplerate --> mixer_freq
+// Returns number of clipped samples.
+// DWF 2008-02-10 with cleanups by Simon Howard.
+
+static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
+                                   byte *data,
+                                   int samplerate,
+                                   int length)
+{
+    SRC_DATA src_data;
+    float *data_in;
+    uint32_t i, abuf_index=0, clipped=0;
+//    uint32_t alen;
+    int retn;
+    int16_t *expanded;
+    allocated_sound_t *snd;
+    Mix_Chunk *chunk;
+
+    src_data.input_frames = length;
+    data_in = malloc(length * sizeof(float));
+    src_data.data_in = data_in;
+    src_data.src_ratio = (double)mixer_freq / samplerate;
+
+    // We include some extra space here in case of rounding-up.
+    src_data.output_frames = src_data.src_ratio * length + (mixer_freq / 4);
+    src_data.data_out = malloc(src_data.output_frames * sizeof(float));
+
+    assert(src_data.data_in != NULL && src_data.data_out != NULL);
+
+    // Convert input data to floats
+
+    for (i=0; i<length; ++i)
+    {
+        // Unclear whether 128 should be interpreted as "zero" or whether a
+        // symmetrical range should be assumed.  The following assumes a
+        // symmetrical range.
+        data_in[i] = data[i] / 127.5 - 1;
+    }
+
+    // Do the sound conversion
+
+    retn = src_simple(&src_data, SRC_ConversionMode(), 1);
+    assert(retn == 0);
+
+    // Allocate the new chunk.
+
+//    alen = src_data.output_frames_gen * 4;
+
+    snd = AllocateSound(sfxinfo, src_data.output_frames_gen * 4);
+
+    if (snd == NULL)
+    {
+        return false;
+    }
+
+    chunk = &snd->chunk;
+    expanded = (int16_t *) chunk->abuf;
+
+    // Convert the result back into 16-bit integers.
+
+    for (i=0; i<src_data.output_frames_gen; ++i)
+    {
+        // libsamplerate does not limit itself to the -1.0 .. 1.0 range on
+        // output, so a multiplier less than INT16_MAX (32767) is required
+        // to avoid overflows or clipping.  However, the smaller the
+        // multiplier, the quieter the sound effects get, and the more you
+        // have to turn down the music to keep it in balance.
+
+        // 22265 is the largest multiplier that can be used to resample all
+        // of the Vanilla DOOM sound effects to 48 kHz without clipping
+        // using SRC_SINC_BEST_QUALITY.  It is close enough (only slightly
+        // too conservative) for SRC_SINC_MEDIUM_QUALITY and
+        // SRC_SINC_FASTEST.  PWADs with interestingly different sound
+        // effects or target rates other than 48 kHz might still result in
+        // clipping--I don't know if there's a limit to it.
+
+        // As the number of clipped samples increases, the signal is
+        // gradually overtaken by noise, with the loudest parts going first.
+        // However, a moderate amount of clipping is often tolerated in the
+        // quest for the loudest possible sound overall.  The results of
+        // using INT16_MAX as the multiplier are not all that bad, but
+        // artifacts are noticeable during the loudest parts.
+
+        float cvtval_f =
+            src_data.data_out[i] * libsamplerate_scale * INT16_MAX;
+        int32_t cvtval_i = cvtval_f + (cvtval_f < 0 ? -0.5 : 0.5);
+
+        // Asymmetrical sound worries me, so we won't use -32768.
+        if (cvtval_i < -INT16_MAX)
+        {
+            cvtval_i = -INT16_MAX;
+            ++clipped;
+        }
+        else if (cvtval_i > INT16_MAX)
+        {
+            cvtval_i = INT16_MAX;
+            ++clipped;
+        }
+
+        // Left and right channels
+
+        expanded[abuf_index++] = cvtval_i;
+        expanded[abuf_index++] = cvtval_i;
+    }
+
+    free(data_in);
+    free(src_data.data_out);
+
+    if (clipped > 0)
+    {
+        fprintf(stderr, "Sound '%s': clipped %u samples (%0.2f %%)\n", 
+                        sfxinfo->name, clipped,
+                        400.0 * clipped / chunk->alen);
+    }
+
+    return true;
+}
+
+#endif
+
+static boolean ConvertibleRatio(int freq1, int freq2)
+{
+    int ratio;
+
+    if (freq1 > freq2)
+    {
+        return ConvertibleRatio(freq2, freq1);
+    }
+    else if ((freq2 % freq1) != 0)
+    {
+        // Not in a direct ratio
+
+        return false;
+    }
+    else
+    {
+        // Check the ratio is a power of 2
+
+        ratio = freq2 / freq1;
+
+        while ((ratio & 1) == 0)
+        {
+            ratio = ratio >> 1;
+        }
+
+        return ratio == 1;
+    }
+}
+
+#ifdef DEBUG_DUMP_WAVS
+
+// Debug code to dump resampled sound effects to WAV files for analysis.
+
+static void WriteWAV(char *filename, byte *data,
+                     uint32_t length, int samplerate)
+{
+    FILE *wav;
+    unsigned int i;
+    unsigned short s;
+
+    wav = M_fopen(filename, "wb");
+
+    // Header
+
+    fwrite("RIFF", 1, 4, wav);
+    i = LONG(36 + samplerate);
+    fwrite(&i, 4, 1, wav);
+    fwrite("WAVE", 1, 4, wav);
+
+    // Subchunk 1
+
+    fwrite("fmt ", 1, 4, wav);
+    i = LONG(16);
+    fwrite(&i, 4, 1, wav);           // Length
+    s = SHORT(1);
+    fwrite(&s, 2, 1, wav);           // Format (PCM)
+    s = SHORT(2);
+    fwrite(&s, 2, 1, wav);           // Channels (2=stereo)
+    i = LONG(samplerate);
+    fwrite(&i, 4, 1, wav);           // Sample rate
+    i = LONG(samplerate * 2 * 2);
+    fwrite(&i, 4, 1, wav);           // Byte rate (samplerate * stereo * 16 bit)
+    s = SHORT(2 * 2);
+    fwrite(&s, 2, 1, wav);           // Block align (stereo * 16 bit)
+    s = SHORT(16);
+    fwrite(&s, 2, 1, wav);           // Bits per sample (16 bit)
+
+    // Data subchunk
+
+    fwrite("data", 1, 4, wav);
+    i = LONG(length);
+    fwrite(&i, 4, 1, wav);           // Data length
+    fwrite(data, 1, length, wav);    // Data
+
+    fclose(wav);
+}
+
+#endif
+
+// Generic sound expansion function for any sample rate.
+// Returns number of clipped samples (always 0).
+
+static boolean ExpandSoundData_SDL(sfxinfo_t *sfxinfo,
+                                   byte *data,
+                                   int samplerate,
+                                   int length)
+{
+    SDL_AudioCVT convertor;
+    allocated_sound_t *snd;
+    Mix_Chunk *chunk;
+    uint32_t expanded_length;
+
+    // Calculate the length of the expanded version of the sample.
+
+    expanded_length = (uint32_t) ((((uint64_t) length) * mixer_freq) / samplerate);
+
+    // Double up twice: 8 -> 16 bit and mono -> stereo
+
+    expanded_length *= 4;
+
+    // Allocate a chunk in which to expand the sound
+
+    snd = AllocateSound(sfxinfo, expanded_length);
+
+    if (snd == NULL)
+    {
+        return false;
+    }
+
+    chunk = &snd->chunk;
+
+    // If we can, use the standard / optimized SDL conversion routines.
+
+    if (samplerate <= mixer_freq
+     && ConvertibleRatio(samplerate, mixer_freq)
+     && SDL_BuildAudioCVT(&convertor,
+                          AUDIO_U8, 1, samplerate,
+                          mixer_format, mixer_channels, mixer_freq))
+    {
+        convertor.len = length;
+        convertor.buf = malloc(convertor.len * convertor.len_mult);
+        assert(convertor.buf != NULL);
+        memcpy(convertor.buf, data, length);
+
+        SDL_ConvertAudio(&convertor);
+
+        memcpy(chunk->abuf, convertor.buf, chunk->alen);
+        free(convertor.buf);
+    }
+    else
+    {
+        Sint16 *expanded = (Sint16 *) chunk->abuf;
+        int expanded_length;
+        int expand_ratio;
+        int i;
+
+        // Generic expansion if conversion does not work:
+        //
+        // SDL's audio conversion only works for rate conversions that are
+        // powers of 2; if the two formats are not in a direct power of 2
+        // ratio, do this naive conversion instead.
+
+        // number of samples in the converted sound
+
+        expanded_length = ((uint64_t) length * mixer_freq) / samplerate;
+        expand_ratio = (length << 8) / expanded_length;
+
+        for (i=0; i<expanded_length; ++i)
+        {
+            Sint16 sample;
+            int src;
+
+            src = (i * expand_ratio) >> 8;
+
+            sample = data[src] | (data[src] << 8);
+            sample -= 32768;
+
+            // expand 8->16 bits, mono->stereo
+
+            expanded[i * 2] = expanded[i * 2 + 1] = sample;
+        }
+
+#ifdef LOW_PASS_FILTER
+        // Perform a low-pass filter on the upscaled sound to filter
+        // out high-frequency noise from the conversion process.
+
+        {
+            float rc, dt, alpha;
+
+            // Low-pass filter for cutoff frequency f:
+            //
+            // For sampling rate r, dt = 1 / r
+            // rc = 1 / 2*pi*f
+            // alpha = dt / (rc + dt)
+
+            // Filter to the half sample rate of the original sound effect
+            // (maximum frequency, by nyquist)
+
+            dt = 1.0f / mixer_freq;
+            rc = 1.0f / (3.14f * samplerate);
+            alpha = dt / (rc + dt);
+
+            // Both channels are processed in parallel, hence [i-2]:
+
+            for (i=2; i<expanded_length * 2; ++i)
+            {
+                expanded[i] = (Sint16) (alpha * expanded[i]
+                                      + (1 - alpha) * expanded[i-2]);
+            }
+        }
+#endif /* #ifdef LOW_PASS_FILTER */
+    }
+
+    return true;
+}
+
+// Load and convert a sound effect
+// Returns true if successful
+
+static boolean CacheSFX(sfxinfo_t *sfxinfo)
+{
+    int lumpnum;
+    unsigned int lumplen;
+    int samplerate;
+    unsigned int length;
+    byte *data;
+
+    // need to load the sound
+
+    lumpnum = sfxinfo->lumpnum;
+    data = W_CacheLumpNum(lumpnum, PU_STATIC);
+    lumplen = W_LumpLength(lumpnum);
+
+    // Check the header, and ensure this is a valid sound
+
+    if (lumplen < 8
+     || data[0] != 0x03 || data[1] != 0x00)
+    {
+        // Invalid sound
+
+        return false;
+    }
+
+    // 16 bit sample rate field, 32 bit length field
+
+    samplerate = (data[3] << 8) | data[2];
+    length = (data[7] << 24) | (data[6] << 16) | (data[5] << 8) | data[4];
+
+    // If the header specifies that the length of the sound is greater than
+    // the length of the lump itself, this is an invalid sound lump
+
+    // We also discard sound lumps that are less than 49 samples long,
+    // as this is how DMX behaves - although the actual cut-off length
+    // seems to vary slightly depending on the sample rate.  This needs
+    // further investigation to better understand the correct
+    // behavior.
+
+    if (length > lumplen - 8 || length <= 48)
+    {
+        return false;
+    }
+
+    // The DMX sound library seems to skip the first 16 and last 16
+    // bytes of the lump - reason unknown.
+
+    data += 16;
+    length -= 32;
+
+    // Sample rate conversion
+
+    if (!ExpandSoundData(sfxinfo, data + 8, samplerate, length))
+    {
+        return false;
+    }
+
+#ifdef DEBUG_DUMP_WAVS
+    {
+        char filename[16];
+        allocated_sound_t * snd;
+
+        M_snprintf(filename, sizeof(filename), "%s.wav",
+                   DEH_String(sfxinfo->name));
+        snd = GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH);
+        WriteWAV(filename, snd->chunk.abuf, snd->chunk.alen,mixer_freq);
+    }
+#endif
+
+    // don't need the original lump any more
+  
+    W_ReleaseLumpNum(lumpnum);
+
+    return true;
+}
+
+static void GetSfxLumpName(sfxinfo_t *sfx, char *buf, size_t buf_len)
+{
+    // Linked sfx lumps? Get the lump number for the sound linked to.
+
+    if (sfx->link != NULL)
+    {
+        sfx = sfx->link;
+    }
+
+    // Doom adds a DS* prefix to sound lumps; Heretic and Hexen don't
+    // do this.
+
+    if (use_sfx_prefix)
+    {
+        M_snprintf(buf, buf_len, "ds%s", DEH_String(sfx->name));
+    }
+    else
+    {
+        M_StringCopy(buf, DEH_String(sfx->name), buf_len);
+    }
+}
+
+// Preload all the sound effects - stops nasty ingame freezes
+
+static void I_SDL_PrecacheSounds(sfxinfo_t *sounds, int num_sounds)
+{
+    char namebuf[9];
+    int i;
+
+    printf("I_SDL_PrecacheSounds: Precaching all sound effects..");
+
+    for (i=0; i<num_sounds; ++i)
+    {
+        if ((i % 6) == 0)
+        {
+            printf(".");
+            fflush(stdout);
+        }
+
+        GetSfxLumpName(&sounds[i], namebuf, sizeof(namebuf));
+
+        sounds[i].lumpnum = W_CheckNumForName(namebuf);
+
+        if (sounds[i].lumpnum != -1)
+        {
+            CacheSFX(&sounds[i]);
+        }
+    }
+
+    printf("\n");
+}
+
+// Load a SFX chunk into memory and ensure that it is locked.
+
+static boolean LockSound(sfxinfo_t *sfxinfo)
+{
+    // If the sound isn't loaded, load it now
+    if (GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH) == NULL)
+    {
+        if (!CacheSFX(sfxinfo))
+        {
+            return false;
+        }
+    }
+
+    LockAllocatedSound(GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH));
+
+    return true;
+}
+
+//
+// Retrieve the raw data lump index
+//  for a given SFX name.
+//
+
+static int I_SDL_GetSfxLumpNum(sfxinfo_t *sfx)
+{
+    char namebuf[9];
+
+    GetSfxLumpName(sfx, namebuf, sizeof(namebuf));
+
+    return W_GetNumForName(namebuf);
+}
+
+static void I_SDL_UpdateSoundParams(int handle, int vol, int sep)
+{
+    int left, right;
+
+    if (!sound_initialized || handle < 0 || handle >= NUM_CHANNELS)
+    {
+        return;
+    }
+
+    left = ((254 - sep) * vol) / 127;
+    right = ((sep) * vol) / 127;
+
+    if (left < 0) left = 0;
+    else if ( left > 255) left = 255;
+    if (right < 0) right = 0;
+    else if (right > 255) right = 255;
+
+    Mix_SetPanning(handle, left, right);
+}
+
+//
+// Starting a sound means adding it
+//  to the current list of active sounds
+//  in the internal channels.
+// As the SFX info struct contains
+//  e.g. a pointer to the raw data,
+//  it is ignored.
+// As our sound handling does not handle
+//  priority, it is ignored.
+// Pitching (that is, increased speed of playback)
+//  is set, but currently not used by mixing.
+//
+
+static int I_SDL_StartSound(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch)
+{
+    allocated_sound_t *snd;
+
+    if (!sound_initialized || channel < 0 || channel >= NUM_CHANNELS)
+    {
+        return -1;
+    }
+
+    // Release a sound effect if there is already one playing
+    // on this channel
+
+    ReleaseSoundOnChannel(channel);
+
+    // Get the sound data
+
+    if (!LockSound(sfxinfo))
+    {
+        return -1;
+    }
+
+    snd = GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, pitch);
+
+    if (snd == NULL)
+    {
+        allocated_sound_t *newsnd;
+        // fetch the base sound effect, un-pitch-shifted
+        snd = GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH);
+
+        if (snd == NULL)
+        {
+            return -1;
+        }
+
+        if (snd_pitchshift)
+        {
+            newsnd = PitchShift(snd, pitch);
+
+            if (newsnd)
+            {
+                LockAllocatedSound(newsnd);
+                UnlockAllocatedSound(snd);
+                snd = newsnd;
+            }
+        }
+    }
+    else
+    {
+        LockAllocatedSound(snd);
+    }
+
+    // play sound
+
+    Mix_PlayChannel(channel, &snd->chunk, 0);
+
+    channels_playing[channel] = snd;
+
+    // set separation, etc.
+
+    I_SDL_UpdateSoundParams(channel, vol, sep);
+
+    return channel;
+}
+
+static void I_SDL_StopSound(int handle)
+{
+    if (!sound_initialized || handle < 0 || handle >= NUM_CHANNELS)
+    {
+        return;
+    }
+
+    // Sound data is no longer needed; release the
+    // sound data being used for this channel
+
+    ReleaseSoundOnChannel(handle);
+}
+
+
+static boolean I_SDL_SoundIsPlaying(int handle)
+{
+    if (!sound_initialized || handle < 0 || handle >= NUM_CHANNELS)
+    {
+        return false;
+    }
+
+    return Mix_Playing(handle);
+}
+
+//
+// Periodically called to update the sound system
+//
+
+static void I_SDL_UpdateSound(void)
+{
+    int i;
+
+    // Check all channels to see if a sound has finished
+
+    for (i=0; i<NUM_CHANNELS; ++i)
+    {
+        if (channels_playing[i] && !I_SDL_SoundIsPlaying(i))
+        {
+            // Sound has finished playing on this channel,
+            // but sound data has not been released to cache
+
+            ReleaseSoundOnChannel(i);
+        }
+    }
+}
+
+static void I_SDL_ShutdownSound(void)
+{
+    if (!sound_initialized)
+    {
+        return;
+    }
+
+    Mix_CloseAudio();
+    SDL_QuitSubSystem(SDL_INIT_AUDIO);
+
+    sound_initialized = false;
+}
+
+// Calculate slice size, based on snd_maxslicetime_ms.
+// The result must be a power of two.
+
+static int GetSliceSize(void)
+{
+    int limit;
+    int n;
+
+    limit = (snd_samplerate * snd_maxslicetime_ms) / 1000;
+
+    // Try all powers of two, not exceeding the limit.
+
+    for (n=0;; ++n)
+    {
+        // 2^n <= limit < 2^n+1 ?
+
+        if ((1 << (n + 1)) > limit)
+        {
+            return (1 << n);
+        }
+    }
+
+    // Should never happen?
+
+    return 1024;
+}
+
+static boolean I_SDL_InitSound(GameMission_t mission)
+{
+    int i;
+
+    use_sfx_prefix = (mission == doom || mission == strife);
+
+    // No sounds yet
+    for (i=0; i<NUM_CHANNELS; ++i)
+    {
+        channels_playing[i] = NULL;
+    }
+
+    if (SDL_Init(SDL_INIT_AUDIO) < 0)
+    {
+        fprintf(stderr, "Unable to set up sound.\n");
+        return false;
+    }
+
+    if (Mix_OpenAudioDevice(snd_samplerate, AUDIO_S16SYS, 2, GetSliceSize(), NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
+    {
+        fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
+        return false;
+    }
+
+    ExpandSoundData = ExpandSoundData_SDL;
+
+    Mix_QuerySpec(&mixer_freq, &mixer_format, &mixer_channels);
+
+#ifdef HAVE_LIBSAMPLERATE
+    if (use_libsamplerate != 0)
+    {
+        if (SRC_ConversionMode() < 0)
+        {
+            I_Error("I_SDL_InitSound: Invalid value for use_libsamplerate: %i",
+                    use_libsamplerate);
+        }
+
+        ExpandSoundData = ExpandSoundData_SRC;
+    }
+#else
+    if (use_libsamplerate != 0)
+    {
+        fprintf(stderr, "I_SDL_InitSound: use_libsamplerate=%i, but "
+                        "libsamplerate support not compiled in.\n",
+                        use_libsamplerate);
+    }
+#endif
+
+    Mix_AllocateChannels(NUM_CHANNELS);
+
+    SDL_PauseAudio(0);
+
+    sound_initialized = true;
+
+    return true;
+}
+
+static const snddevice_t sound_sdl_devices[] =
+{
+    SNDDEVICE_SB,
+    SNDDEVICE_PAS,
+    SNDDEVICE_GUS,
+    SNDDEVICE_WAVEBLASTER,
+    SNDDEVICE_SOUNDCANVAS,
+    SNDDEVICE_AWE32,
+};
+
+const sound_module_t sound_sdl_module =
+{
+    sound_sdl_devices,
+    arrlen(sound_sdl_devices),
+    I_SDL_InitSound,
+    I_SDL_ShutdownSound,
+    I_SDL_GetSfxLumpNum,
+    I_SDL_UpdateSound,
+    I_SDL_UpdateSoundParams,
+    I_SDL_StartSound,
+    I_SDL_StopSound,
+    I_SDL_SoundIsPlaying,
+    I_SDL_PrecacheSounds,
+};
+
+
+#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/src/i_sound.c b/games/NXDoom/src/i_sound.c
new file mode 100644
index 000000000..7a7bdb31a
--- /dev/null
+++ b/games/NXDoom/src/i_sound.c
@@ -0,0 +1,540 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "doomtype.h"
+
+#include "gusconf.h"
+#include "i_sound.h"
+#include "i_video.h"
+#include "m_argv.h"
+#include "m_config.h"
+
+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+#endif  // DISABLE_SDL2MIXER
+
+
+// Sound sample rate to use for digital output (Hz)
+
+int snd_samplerate = 44100;
+
+// Maximum number of bytes to dedicate to allocated sound effects.
+// (Default: 64MB)
+
+int snd_cachesize = 64 * 1024 * 1024;
+
+// Config variable that controls the sound buffer size.
+// We default to 28ms (1000 / 35fps = 1 buffer per tic).
+
+int snd_maxslicetime_ms = 28;
+
+// External command to invoke to play back music.
+
+char *snd_musiccmd = "";
+
+// Whether to vary the pitch of sound effects
+// Each game will set the default differently
+
+int snd_pitchshift = -1;
+
+int snd_musicdevice = SNDDEVICE_SB;
+int snd_sfxdevice = SNDDEVICE_SB;
+
+// Low-level sound and music modules we are using
+static const sound_module_t *sound_module;
+static const music_module_t *music_module;
+
+// If true, the music pack module was successfully initialized.
+static boolean music_packs_active = false;
+
+// This is either equal to music_module or &music_pack_module,
+// depending on whether the current track is substituted.
+static const music_module_t *active_music_module;
+
+
+// DOS-specific options: These are unused but should be maintained
+// so that the config file can be shared between chocolate
+// doom and doom.exe
+
+static int snd_sbport = 0;
+static int snd_sbirq = 0;
+static int snd_sbdma = 0;
+static int snd_mport = 0;
+
+// Compiled-in sound modules:
+
+static const sound_module_t *sound_modules[] =
+{
+#ifndef DISABLE_SDL2MIXER
+    &sound_sdl_module,
+#endif // DISABLE_SDL2MIXER
+    &sound_pcsound_module,
+    NULL,
+};
+
+// Compiled-in music modules:
+
+static const music_module_t *music_modules[] =
+{
+#ifdef _WIN32
+    &music_win_module,
+#endif
+#ifdef HAVE_FLUIDSYNTH
+    &music_fl_module,
+#endif // HAVE_FLUIDSYNTH
+#ifndef DISABLE_SDL2MIXER
+    &music_sdl_module,
+#endif // DISABLE_SDL2MIXER
+    &music_opl_module,
+    NULL,
+};
+
+// Check if a sound device is in the given list of devices
+
+static boolean SndDeviceInList(snddevice_t device, const snddevice_t *list,
+                               int len)
+{
+    int i;
+
+    for (i=0; i<len; ++i)
+    {
+        if (device == list[i])
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Find and initialize a sound_module_t appropriate for the setting
+// in snd_sfxdevice.
+
+static void InitSfxModule(GameMission_t mission)
+{
+    int i;
+
+    sound_module = NULL;
+
+    for (i=0; sound_modules[i] != NULL; ++i)
+    {
+        // Is the sfx device in the list of devices supported by
+        // this module?
+
+        if (SndDeviceInList(snd_sfxdevice, 
+                            sound_modules[i]->sound_devices,
+                            sound_modules[i]->num_sound_devices))
+        {
+            // Initialize the module
+
+            if (sound_modules[i]->Init(mission))
+            {
+                sound_module = sound_modules[i];
+                return;
+            }
+        }
+    }
+}
+
+// Initialize music according to snd_musicdevice.
+
+static void InitMusicModule(void)
+{
+    int i;
+
+    music_module = NULL;
+
+    for (i=0; music_modules[i] != NULL; ++i)
+    {
+        // Is the music device in the list of devices supported
+        // by this module?
+
+        if (SndDeviceInList(snd_musicdevice, 
+                            music_modules[i]->sound_devices,
+                            music_modules[i]->num_sound_devices))
+        {
+        #ifdef _WIN32
+            // Skip the native Windows MIDI module if using Timidity.
+
+            if (strcmp(timidity_cfg_path, "") &&
+                music_modules[i] == &music_win_module)
+            {
+                continue;
+            }
+        #endif
+
+            // Initialize the module
+
+            if (music_modules[i]->Init())
+            {
+                music_module = music_modules[i];
+                return;
+            }
+        }
+    }
+}
+
+//
+// Initializes sound stuff, including volume
+// Sets channels, SFX and music volume,
+//  allocates channel buffer, sets S_sfx lookup.
+//
+
+void I_InitSound(GameMission_t mission)
+{
+    boolean nosound, nosfx, nomusic, nomusicpacks;
+
+    //!
+    // @vanilla
+    //
+    // Disable all sound output.
+    //
+
+    nosound = M_CheckParm("-nosound") > 0;
+
+    //!
+    // @vanilla
+    //
+    // Disable sound effects. 
+    //
+
+    nosfx = M_CheckParm("-nosfx") > 0;
+
+    //!
+    // @vanilla
+    //
+    // Disable music.
+    //
+
+    nomusic = M_CheckParm("-nomusic") > 0;
+
+    //!
+    //
+    // Disable substitution music packs.
+    //
+
+    nomusicpacks = M_ParmExists("-nomusicpacks");
+
+    // Auto configure the music pack directory.
+    M_SetMusicPackDir();
+
+    // Initialize the sound and music subsystems.
+
+    if (!nosound && !screensaver_mode)
+    {
+        // This is kind of a hack. If native MIDI is enabled, set up
+        // the TIMIDITY_CFG environment variable here before SDL_mixer
+        // is opened.
+
+        if (!nomusic
+         && (snd_musicdevice == SNDDEVICE_GENMIDI
+          || snd_musicdevice == SNDDEVICE_GUS))
+        {
+            I_InitTimidityConfig();
+        }
+
+        if (!nosfx)
+        {
+            InitSfxModule(mission);
+        }
+
+        if (!nomusic)
+        {
+            InitMusicModule();
+            active_music_module = music_module;
+        }
+
+        // We may also have substitute MIDIs we can load.
+        if (!nomusicpacks && music_module != NULL)
+        {
+            music_packs_active = music_pack_module.Init();
+        }
+    }
+}
+
+void I_ShutdownSound(void)
+{
+    if (sound_module != NULL)
+    {
+        sound_module->Shutdown();
+    }
+
+    if (music_packs_active)
+    {
+        music_pack_module.Shutdown();
+    }
+
+    if (music_module != NULL)
+    {
+        music_module->Shutdown();
+    }
+}
+
+int I_GetSfxLumpNum(sfxinfo_t *sfxinfo)
+{
+    if (sound_module != NULL)
+    {
+        return sound_module->GetSfxLumpNum(sfxinfo);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+void I_UpdateSound(void)
+{
+    if (sound_module != NULL)
+    {
+        sound_module->Update();
+    }
+
+    if (active_music_module != NULL && active_music_module->Poll != NULL)
+    {
+        active_music_module->Poll();
+    }
+}
+
+static void CheckVolumeSeparation(int *vol, int *sep)
+{
+    if (*sep < 0)
+    {
+        *sep = 0;
+    }
+    else if (*sep > 254)
+    {
+        *sep = 254;
+    }
+
+    if (*vol < 0)
+    {
+        *vol = 0;
+    }
+    else if (*vol > 127)
+    {
+        *vol = 127;
+    }
+}
+
+void I_UpdateSoundParams(int channel, int vol, int sep)
+{
+    if (sound_module != NULL)
+    {
+        CheckVolumeSeparation(&vol, &sep);
+        sound_module->UpdateSoundParams(channel, vol, sep);
+    }
+}
+
+int I_StartSound(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch)
+{
+    if (sound_module != NULL)
+    {
+        CheckVolumeSeparation(&vol, &sep);
+        return sound_module->StartSound(sfxinfo, channel, vol, sep, pitch);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+void I_StopSound(int channel)
+{
+    if (sound_module != NULL)
+    {
+        sound_module->StopSound(channel);
+    }
+}
+
+boolean I_SoundIsPlaying(int channel)
+{
+    if (sound_module != NULL)
+    {
+        return sound_module->SoundIsPlaying(channel);
+    }
+    else
+    {
+        return false;
+    }
+}
+
+void I_PrecacheSounds(sfxinfo_t *sounds, int num_sounds)
+{
+    if (sound_module != NULL && sound_module->CacheSounds != NULL)
+    {
+        sound_module->CacheSounds(sounds, num_sounds);
+    }
+}
+
+void I_InitMusic(void)
+{
+}
+
+void I_ShutdownMusic(void)
+{
+
+}
+
+void I_SetMusicVolume(int volume)
+{
+    if (music_module != NULL)
+    {
+        music_module->SetMusicVolume(volume);
+
+        if (music_packs_active && music_module != &music_pack_module)
+        {
+            music_pack_module.SetMusicVolume(volume);
+        }
+    }
+}
+
+void I_PauseSong(void)
+{
+    if (active_music_module != NULL)
+    {
+        active_music_module->PauseMusic();
+    }
+}
+
+void I_ResumeSong(void)
+{
+    if (active_music_module != NULL)
+    {
+        active_music_module->ResumeMusic();
+    }
+}
+
+void *I_RegisterSong(void *data, int len)
+{
+    // If the music pack module is active, check to see if there is a
+    // valid substitution for this track. If there is, we set the
+    // active_music_module pointer to the music pack module for the
+    // duration of this particular track.
+    if (music_packs_active)
+    {
+        void *handle;
+
+        handle = music_pack_module.RegisterSong(data, len);
+        if (handle != NULL)
+        {
+            active_music_module = &music_pack_module;
+            return handle;
+        }
+    }
+
+    // No substitution for this track, so use the main module.
+    active_music_module = music_module;
+    if (active_music_module != NULL)
+    {
+        return active_music_module->RegisterSong(data, len);
+    }
+    else
+    {
+        return NULL;
+    }
+}
+
+void I_UnRegisterSong(void *handle)
+{
+    if (active_music_module != NULL)
+    {
+        active_music_module->UnRegisterSong(handle);
+    }
+}
+
+void I_PlaySong(void *handle, boolean looping)
+{
+    if (active_music_module != NULL)
+    {
+        active_music_module->PlaySong(handle, looping);
+    }
+}
+
+void I_StopSong(void)
+{
+    if (active_music_module != NULL)
+    {
+        active_music_module->StopSong();
+    }
+}
+
+boolean I_MusicIsPlaying(void)
+{
+    if (active_music_module != NULL)
+    {
+        return active_music_module->MusicIsPlaying();
+    }
+    else
+    {
+        return false;
+    }
+}
+
+void I_BindSoundVariables(void)
+{
+    M_BindIntVariable("snd_musicdevice",         &snd_musicdevice);
+    M_BindIntVariable("snd_sfxdevice",           &snd_sfxdevice);
+    M_BindIntVariable("snd_sbport",              &snd_sbport);
+    M_BindIntVariable("snd_sbirq",               &snd_sbirq);
+    M_BindIntVariable("snd_sbdma",               &snd_sbdma);
+    M_BindIntVariable("snd_mport",               &snd_mport);
+    M_BindIntVariable("snd_maxslicetime_ms",     &snd_maxslicetime_ms);
+    M_BindStringVariable("snd_musiccmd",         &snd_musiccmd);
+    M_BindStringVariable("snd_dmxoption",        &snd_dmxoption);
+    M_BindIntVariable("snd_samplerate",          &snd_samplerate);
+    M_BindIntVariable("snd_cachesize",           &snd_cachesize);
+    M_BindIntVariable("opl_io_port",             &opl_io_port);
+    M_BindIntVariable("snd_pitchshift",          &snd_pitchshift);
+
+    M_BindStringVariable("music_pack_path",      &music_pack_path);
+    M_BindStringVariable("timidity_cfg_path",    &timidity_cfg_path);
+    M_BindStringVariable("gus_patch_path",       &gus_patch_path);
+    M_BindIntVariable("gus_ram_kb",              &gus_ram_kb);
+#ifdef _WIN32
+    M_BindStringVariable("winmm_midi_device",    &winmm_midi_device);
+    M_BindIntVariable("winmm_complevel",         &winmm_complevel);
+    M_BindIntVariable("winmm_reset_type",        &winmm_reset_type);
+    M_BindIntVariable("winmm_reset_delay",       &winmm_reset_delay);
+#endif
+
+#ifdef HAVE_FLUIDSYNTH
+    M_BindIntVariable("fsynth_chorus_active",       &fsynth_chorus_active);
+    M_BindFloatVariable("fsynth_chorus_depth",      &fsynth_chorus_depth);
+    M_BindFloatVariable("fsynth_chorus_level",      &fsynth_chorus_level);
+    M_BindIntVariable("fsynth_chorus_nr",           &fsynth_chorus_nr);
+    M_BindFloatVariable("fsynth_chorus_speed",      &fsynth_chorus_speed);
+    M_BindStringVariable("fsynth_midibankselect",   &fsynth_midibankselect);
+    M_BindIntVariable("fsynth_polyphony",           &fsynth_polyphony);
+    M_BindIntVariable("fsynth_reverb_active",       &fsynth_reverb_active);
+    M_BindFloatVariable("fsynth_reverb_damp",       &fsynth_reverb_damp);
+    M_BindFloatVariable("fsynth_reverb_level",      &fsynth_reverb_level);
+    M_BindFloatVariable("fsynth_reverb_roomsize",   &fsynth_reverb_roomsize);
+    M_BindFloatVariable("fsynth_reverb_width",      &fsynth_reverb_width);
+    M_BindFloatVariable("fsynth_gain",              &fsynth_gain);
+    M_BindStringVariable("fsynth_sf_path",          &fsynth_sf_path);
+#endif // HAVE_FLUIDSYNTH
+
+    M_BindIntVariable("use_libsamplerate",       &use_libsamplerate);
+    M_BindFloatVariable("libsamplerate_scale",   &libsamplerate_scale);
+}
+
diff --git a/games/NXDoom/src/i_sound.h b/games/NXDoom/src/i_sound.h
new file mode 100644
index 000000000..376e1bb9c
--- /dev/null
+++ b/games/NXDoom/src/i_sound.h
@@ -0,0 +1,300 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The not so system specific sound interface.
+//
+
+
+#ifndef __I_SOUND__
+#define __I_SOUND__
+
+#include "doomtype.h"
+#include "d_mode.h"
+
+// so that the individual game logic and sound driver code agree
+#define NORM_PITCH 127
+
+//
+// SoundFX struct.
+//
+typedef struct sfxinfo_struct	sfxinfo_t;
+
+struct sfxinfo_struct
+{
+    // tag name, used for hexen.
+    const char *tagname;
+
+    // lump name.  If we are running with use_sfx_prefix=true, a
+    // 'DS' (or 'DP' for PC speaker sounds) is prepended to this.
+
+    char name[9];
+
+    // Sfx priority
+    int priority;
+
+    // referenced sound if a link
+    sfxinfo_t *link;
+
+    // pitch if a link (Doom), whether to pitch-shift (Hexen)
+    int pitch;
+
+    // volume if a link
+    int volume;
+
+    // this is checked every second to see if sound
+    // can be thrown out (if 0, then decrement, if -1,
+    // then throw out, if > 0, then it is in use)
+    int usefulness;
+
+    // lump number of sfx
+    int lumpnum;
+
+    // Maximum number of channels that the sound can be played on 
+    // (Heretic)
+    int numchannels;
+
+    // data used by the low level code
+    void *driver_data;
+};
+
+//
+// MusicInfo struct.
+//
+typedef struct
+{
+    // up to 6-character name
+    const char *name;
+
+    // lump number of music
+    int lumpnum;
+
+    // music data
+    void *data;
+
+    // music handle once registered
+    void *handle;
+
+} musicinfo_t;
+
+typedef enum 
+{
+    SNDDEVICE_NONE = 0,
+    SNDDEVICE_PCSPEAKER = 1,
+    SNDDEVICE_ADLIB = 2,
+    SNDDEVICE_SB = 3,
+    SNDDEVICE_PAS = 4,
+    SNDDEVICE_GUS = 5,
+    SNDDEVICE_WAVEBLASTER = 6,
+    SNDDEVICE_SOUNDCANVAS = 7,
+    SNDDEVICE_GENMIDI = 8,
+    SNDDEVICE_AWE32 = 9,
+    SNDDEVICE_CD = 10,
+    SNDDEVICE_FSYNTH = 11,
+} snddevice_t;
+
+// Interface for sound modules
+
+typedef struct
+{
+    // List of sound devices that this sound module is used for.
+
+    const snddevice_t *sound_devices;
+    int num_sound_devices;
+
+    // Initialise sound module
+    // Returns true if successfully initialised
+
+    boolean (*Init)(GameMission_t mission);
+
+    // Shutdown sound module
+
+    void (*Shutdown)(void);
+
+    // Returns the lump index of the given sound.
+
+    int (*GetSfxLumpNum)(sfxinfo_t *sfxinfo);
+
+    // Called periodically to update the subsystem.
+
+    void (*Update)(void);
+
+    // Update the sound settings on the given channel.
+
+    void (*UpdateSoundParams)(int channel, int vol, int sep);
+
+    // Start a sound on a given channel.  Returns the channel id
+    // or -1 on failure.
+
+    int (*StartSound)(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch);
+
+    // Stop the sound playing on the given channel.
+
+    void (*StopSound)(int channel);
+
+    // Query if a sound is playing on the given channel
+
+    boolean (*SoundIsPlaying)(int channel);
+
+    // Called on startup to precache sound effects (if necessary)
+
+    void (*CacheSounds)(sfxinfo_t *sounds, int num_sounds);
+
+} sound_module_t;
+
+void I_InitSound(GameMission_t mission);
+void I_ShutdownSound(void);
+int I_GetSfxLumpNum(sfxinfo_t *sfxinfo);
+void I_UpdateSound(void);
+void I_UpdateSoundParams(int channel, int vol, int sep);
+int I_StartSound(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch);
+void I_StopSound(int channel);
+boolean I_SoundIsPlaying(int channel);
+void I_PrecacheSounds(sfxinfo_t *sounds, int num_sounds);
+
+// Interface for music modules
+
+typedef struct
+{
+    // List of sound devices that this music module is used for.
+
+    const snddevice_t *sound_devices;
+    int num_sound_devices;
+
+    // Initialise the music subsystem
+
+    boolean (*Init)(void);
+
+    // Shutdown the music subsystem
+
+    void (*Shutdown)(void);
+
+    // Set music volume - range 0-127
+
+    void (*SetMusicVolume)(int volume);
+
+    // Pause music
+
+    void (*PauseMusic)(void);
+
+    // Un-pause music
+
+    void (*ResumeMusic)(void);
+
+    // Register a song handle from data
+    // Returns a handle that can be used to play the song
+
+    void *(*RegisterSong)(void *data, int len);
+
+    // Un-register (free) song data
+
+    void (*UnRegisterSong)(void *handle);
+
+    // Play the song
+
+    void (*PlaySong)(void *handle, boolean looping);
+
+    // Stop playing the current song.
+
+    void (*StopSong)(void);
+
+    // Query if music is playing.
+
+    boolean (*MusicIsPlaying)(void);
+
+    // Invoked periodically to poll.
+
+    void (*Poll)(void);
+} music_module_t;
+
+void I_InitMusic(void);
+void I_ShutdownMusic(void);
+void I_SetMusicVolume(int volume);
+void I_PauseSong(void);
+void I_ResumeSong(void);
+void *I_RegisterSong(void *data, int len);
+void I_UnRegisterSong(void *handle);
+void I_PlaySong(void *handle, boolean looping);
+void I_StopSong(void);
+boolean I_MusicIsPlaying(void);
+
+extern int snd_sfxdevice;
+extern int snd_musicdevice;
+extern int snd_samplerate;
+extern int snd_cachesize;
+extern int snd_maxslicetime_ms;
+extern char *snd_musiccmd;
+extern int snd_pitchshift;
+extern char *snd_dmxoption;
+extern int use_libsamplerate;
+extern float libsamplerate_scale;
+
+void I_BindSoundVariables(void);
+
+// DMX version to emulate for OPL emulation:
+typedef enum {
+    opl_doom1_1_666,    // Doom 1 v1.666
+    opl_doom2_1_666,    // Doom 2 v1.666, Hexen, Heretic
+    opl_doom_1_9        // Doom v1.9, Strife
+} opl_driver_ver_t;
+
+void I_SetOPLDriverVer(opl_driver_ver_t ver);
+void I_OPL_DevMessages(char *, size_t);
+
+// Sound modules
+
+void I_InitTimidityConfig(void);
+extern const sound_module_t sound_sdl_module;
+extern const sound_module_t sound_pcsound_module;
+extern const music_module_t music_sdl_module;
+extern const music_module_t music_opl_module;
+extern const music_module_t music_pack_module;
+extern const music_module_t music_win_module;
+extern const music_module_t music_fl_module;
+
+// For OPL module:
+
+extern int opl_io_port;
+
+// For native music module:
+
+extern char *music_pack_path;
+extern char *timidity_cfg_path;
+#ifdef _WIN32
+extern char *winmm_midi_device;
+extern int winmm_complevel;
+extern int winmm_reset_type;
+extern int winmm_reset_delay;
+#endif
+
+// For FluidSynth module:
+
+#ifdef HAVE_FLUIDSYNTH
+extern char *fsynth_sf_path;
+extern int fsynth_chorus_active;
+extern float fsynth_chorus_depth;
+extern float fsynth_chorus_level;
+extern int fsynth_chorus_nr;
+extern float fsynth_chorus_speed;
+extern char *fsynth_midibankselect;
+extern int fsynth_polyphony;
+extern int fsynth_reverb_active;
+extern float fsynth_reverb_damp;
+extern float fsynth_reverb_level;
+extern float fsynth_reverb_roomsize;
+extern float fsynth_reverb_width;
+extern float fsynth_gain;
+#endif // HAVE_FLUIDSYNTH
+
+#endif
diff --git a/games/NXDoom/src/i_swap.h b/games/NXDoom/src/i_swap.h
new file mode 100644
index 000000000..3dee8e3f6
--- /dev/null
+++ b/games/NXDoom/src/i_swap.h
@@ -0,0 +1,43 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Endianess handling, swapping 16bit and 32bit.
+//
+
+
+#ifndef __I_SWAP__
+#define __I_SWAP__
+
+#include "SDL_endian.h"
+
+// Endianess handling.
+// WAD files are stored little endian.
+
+// Just use SDL's endianness swapping functions.
+
+// These are deliberately cast to signed values; this is the behaviour
+// of the macros in the original source and some code relies on it.
+
+#define SHORT(x)  ((signed short) SDL_SwapLE16(x))
+#define LONG(x)   ((signed int) SDL_SwapLE32(x))
+
+// Defines for checking the endianness of the system.
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+#define SYS_BIG_ENDIAN
+#endif
+
+#endif
+
diff --git a/games/NXDoom/src/i_system.c b/games/NXDoom/src/i_system.c
new file mode 100644
index 000000000..dba359035
--- /dev/null
+++ b/games/NXDoom/src/i_system.c
@@ -0,0 +1,470 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <stdarg.h>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+#include "SDL.h"
+
+#include "config.h"
+
+#include "deh_str.h"
+#include "doomtype.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "i_joystick.h"
+#include "i_sound.h"
+#include "i_timer.h"
+#include "i_video.h"
+
+#include "i_system.h"
+
+#include "w_wad.h"
+#include "z_zone.h"
+
+#define DEFAULT_RAM 16 /* MiB */
+#define MIN_RAM     4  /* MiB */
+
+
+typedef struct atexit_listentry_s atexit_listentry_t;
+
+struct atexit_listentry_s
+{
+    atexit_func_t func;
+    boolean run_on_error;
+    atexit_listentry_t *next;
+};
+
+static atexit_listentry_t *exit_funcs = NULL;
+
+void I_AtExit(atexit_func_t func, boolean run_on_error)
+{
+    atexit_listentry_t *entry;
+
+    entry = malloc(sizeof(*entry));
+
+    entry->func = func;
+    entry->run_on_error = run_on_error;
+    entry->next = exit_funcs;
+    exit_funcs = entry;
+}
+
+// Tactile feedback function, probably used for the Logitech Cyberman
+
+void I_Tactile(int on, int off, int total)
+{
+}
+
+// Zone memory auto-allocation function that allocates the zone size
+// by trying progressively smaller zone sizes until one is found that
+// works.
+
+static byte *AutoAllocMemory(int *size, int default_ram, int min_ram)
+{
+    byte *zonemem;
+
+    // Allocate the zone memory.  This loop tries progressively smaller
+    // zone sizes until a size is found that can be allocated.
+    // If we used the -mb command line parameter, only the parameter
+    // provided is accepted.
+
+    zonemem = NULL;
+
+    while (zonemem == NULL)
+    {
+        // We need a reasonable minimum amount of RAM to start.
+
+        if (default_ram < min_ram)
+        {
+            I_Error("Unable to allocate %i MiB of RAM for zone", default_ram);
+        }
+
+        // Try to allocate the zone memory.
+
+        *size = default_ram * 1024 * 1024;
+
+        zonemem = malloc(*size);
+
+        // Failed to allocate?  Reduce zone size until we reach a size
+        // that is acceptable.
+
+        if (zonemem == NULL)
+        {
+            default_ram -= 1;
+        }
+    }
+
+    return zonemem;
+}
+
+byte *I_ZoneBase (int *size)
+{
+    byte *zonemem;
+    int min_ram, default_ram;
+    int p;
+
+    //!
+    // @category obscure
+    // @arg <mb>
+    //
+    // Specify the heap size, in MiB.
+    //
+
+    p = M_CheckParmWithArgs("-mb", 1);
+
+    if (p > 0)
+    {
+        default_ram = atoi(myargv[p+1]);
+        min_ram = default_ram;
+    }
+    else
+    {
+        // Because of the 8-byte pointer size in a 64-bit build, the default
+        // heap size (16 MiB) is insufficient compared to a 32-bit build. For
+        // example, the Alien Vendetta avm62402.lmp demo completes successfully
+        // on a 32-bit build, but terminates with an out of memory error on a
+        // 64-bit build. Therefore, to maintain consistency with a 32-bit
+        // build, the heap size should be increased.
+
+        if (sizeof(void *) == 8)
+        {
+            default_ram = DEFAULT_RAM * 2;
+        }
+        else
+        {
+            default_ram = DEFAULT_RAM;
+        }
+        min_ram = MIN_RAM;
+    }
+
+    zonemem = AutoAllocMemory(size, default_ram, min_ram);
+
+    printf("zone memory: %p, %x allocated for zone\n", 
+           zonemem, *size);
+
+    return zonemem;
+}
+
+void I_PrintBanner(const char *msg)
+{
+    int i;
+    int spaces = 35 - (strlen(msg) / 2);
+
+    for (i=0; i<spaces; ++i)
+        putchar(' ');
+
+    puts(msg);
+}
+
+void I_PrintDivider(void)
+{
+    int i;
+
+    for (i=0; i<75; ++i)
+    {
+        putchar('=');
+    }
+
+    putchar('\n');
+}
+
+void I_PrintStartupBanner(const char *gamedescription)
+{
+    I_PrintDivider();
+    I_PrintBanner(gamedescription);
+    I_PrintDivider();
+    
+    printf(
+    " " PACKAGE_NAME " is free software, covered by the GNU General Public\n"
+    " License.  There is NO warranty; not even for MERCHANTABILITY or FITNESS\n"
+    " FOR A PARTICULAR PURPOSE. You are welcome to change and distribute\n"
+    " copies under certain conditions. See the source for more information.\n");
+
+    I_PrintDivider();
+}
+
+// 
+// I_ConsoleStdout
+//
+// Returns true if stdout is a real console, false if it is a file
+//
+
+boolean I_ConsoleStdout(void)
+{
+#ifdef _WIN32
+    // SDL "helpfully" always redirects stdout to a file.
+    return false;
+#else
+    return isatty(fileno(stdout));
+#endif
+}
+
+//
+// I_Init
+//
+/*
+void I_Init (void)
+{
+    I_CheckIsScreensaver();
+    I_InitTimer();
+    I_InitJoystick();
+}
+void I_BindVariables(void)
+{
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
+}
+*/
+
+//
+// I_Quit
+//
+
+void I_Quit (void)
+{
+    atexit_listentry_t *entry;
+
+    // Run through all exit functions
+ 
+    entry = exit_funcs; 
+
+    while (entry != NULL)
+    {
+        entry->func();
+        entry = entry->next;
+    }
+
+    SDL_Quit();
+
+    exit(0);
+}
+
+
+
+//
+// I_Error
+//
+
+static boolean already_quitting = false;
+
+void I_Error (const char *error, ...)
+{
+    char msgbuf[512];
+    va_list argptr;
+    atexit_listentry_t *entry;
+    boolean exit_gui_popup;
+
+    if (already_quitting)
+    {
+        fprintf(stderr, "Warning: recursive call to I_Error detected.\n");
+        exit(-1);
+    }
+    else
+    {
+        already_quitting = true;
+    }
+
+    // Message first.
+    va_start(argptr, error);
+    //fprintf(stderr, "\nError: ");
+    vfprintf(stderr, error, argptr);
+    fprintf(stderr, "\n\n");
+    va_end(argptr);
+    fflush(stderr);
+
+    // Write a copy of the message into buffer.
+    va_start(argptr, error);
+    memset(msgbuf, 0, sizeof(msgbuf));
+    M_vsnprintf(msgbuf, sizeof(msgbuf), error, argptr);
+    va_end(argptr);
+
+    // Shutdown. Here might be other errors.
+
+    entry = exit_funcs;
+
+    while (entry != NULL)
+    {
+        if (entry->run_on_error)
+        {
+            entry->func();
+        }
+
+        entry = entry->next;
+    }
+
+    //!
+    // @category obscure
+    //
+    // If specified, don't show a GUI window for error messages when the
+    // game exits with an error.
+    //
+    exit_gui_popup = !M_ParmExists("-nogui");
+
+    // Pop up a GUI dialog box to show the error message, if the
+    // game was not run from the console (and the user will
+    // therefore be unable to otherwise see the message).
+    if (exit_gui_popup && !I_ConsoleStdout())
+    {
+        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
+                                 PACKAGE_STRING, msgbuf, NULL);
+    }
+
+    // abort();
+
+    SDL_Quit();
+
+    exit(-1);
+}
+
+//
+// I_Realloc
+//
+
+void *I_Realloc(void *ptr, size_t size)
+{
+    void *new_ptr;
+
+    new_ptr = realloc(ptr, size);
+
+    if (size != 0 && new_ptr == NULL)
+    {
+        I_Error ("I_Realloc: failed on reallocation of %zu bytes", size);
+    }
+
+    return new_ptr;
+}
+
+//
+// Read Access Violation emulation.
+//
+// From PrBoom+, by entryway.
+//
+
+// C:\>debug
+// -d 0:0
+//
+// DOS 6.22:
+// 0000:0000  (57 92 19 00) F4 06 70 00-(16 00)
+// DOS 7.1:
+// 0000:0000  (9E 0F C9 00) 65 04 70 00-(16 00)
+// Win98:
+// 0000:0000  (9E 0F C9 00) 65 04 70 00-(16 00)
+// DOSBox under XP:
+// 0000:0000  (00 00 00 F1) ?? ?? ?? 00-(07 00)
+
+#define DOS_MEM_DUMP_SIZE 10
+
+static const unsigned char mem_dump_dos622[DOS_MEM_DUMP_SIZE] = {
+  0x57, 0x92, 0x19, 0x00, 0xF4, 0x06, 0x70, 0x00, 0x16, 0x00};
+static const unsigned char mem_dump_win98[DOS_MEM_DUMP_SIZE] = {
+  0x9E, 0x0F, 0xC9, 0x00, 0x65, 0x04, 0x70, 0x00, 0x16, 0x00};
+static const unsigned char mem_dump_dosbox[DOS_MEM_DUMP_SIZE] = {
+  0x00, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00};
+static unsigned char mem_dump_custom[DOS_MEM_DUMP_SIZE];
+
+static const unsigned char *dos_mem_dump = mem_dump_dos622;
+
+boolean I_GetMemoryValue(unsigned int offset, void *value, int size)
+{
+    static boolean firsttime = true;
+
+    if (firsttime)
+    {
+        int p, i, val;
+
+        firsttime = false;
+        i = 0;
+
+        //!
+        // @category compat
+        // @arg <version>
+        //
+        // Specify DOS version to emulate for NULL pointer dereference
+        // emulation.  Supported versions are: dos622, dos71, dosbox.
+        // The default is to emulate DOS 7.1 (Windows 98).
+        //
+
+        p = M_CheckParmWithArgs("-setmem", 1);
+
+        if (p > 0)
+        {
+            if (!strcasecmp(myargv[p + 1], "dos622"))
+            {
+                dos_mem_dump = mem_dump_dos622;
+            }
+            if (!strcasecmp(myargv[p + 1], "dos71"))
+            {
+                dos_mem_dump = mem_dump_win98;
+            }
+            else if (!strcasecmp(myargv[p + 1], "dosbox"))
+            {
+                dos_mem_dump = mem_dump_dosbox;
+            }
+            else
+            {
+                for (i = 0; i < DOS_MEM_DUMP_SIZE; ++i)
+                {
+                    ++p;
+
+                    if (p >= myargc || myargv[p][0] == '-')
+                    {
+                        break;
+                    }
+
+                    M_StrToInt(myargv[p], &val);
+                    mem_dump_custom[i++] = (unsigned char) val;
+                }
+
+                dos_mem_dump = mem_dump_custom;
+            }
+        }
+    }
+
+    switch (size)
+    {
+    case 1:
+        *((unsigned char *) value) = dos_mem_dump[offset];
+        return true;
+    case 2:
+        *((unsigned short *) value) = dos_mem_dump[offset]
+                                    | (dos_mem_dump[offset + 1] << 8);
+        return true;
+    case 4:
+        *((unsigned int *) value) = dos_mem_dump[offset]
+                                  | (dos_mem_dump[offset + 1] << 8)
+                                  | (dos_mem_dump[offset + 2] << 16)
+                                  | (dos_mem_dump[offset + 3] << 24);
+        return true;
+    }
+
+    return false;
+}
+
diff --git a/games/NXDoom/src/i_system.h b/games/NXDoom/src/i_system.h
new file mode 100644
index 000000000..78376f3cc
--- /dev/null
+++ b/games/NXDoom/src/i_system.h
@@ -0,0 +1,86 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __I_SYSTEM__
+#define __I_SYSTEM__
+
+#include "d_ticcmd.h"
+#include "d_event.h"
+
+
+typedef void (*atexit_func_t)(void);
+
+// Called by DoomMain.
+void I_Init (void);
+
+// Called by startup code
+// to get the ammount of memory to malloc
+// for the zone management.
+byte*	I_ZoneBase (int *size);
+
+boolean I_ConsoleStdout(void);
+
+
+// Asynchronous interrupt functions should maintain private queues
+// that are read by the synchronous functions
+// to be converted into events.
+
+// Either returns a null ticcmd,
+// or calls a loadable driver to build it.
+// This ticcmd will then be modified by the gameloop
+// for normal input.
+ticcmd_t* I_BaseTiccmd (void);
+
+
+// Called by M_Responder when quit is selected.
+// Clean exit, displays sell blurb.
+void I_Quit (void) NORETURN;
+
+void I_Error (const char *error, ...) NORETURN PRINTF_ATTR(1, 2);
+
+void I_Tactile (int on, int off, int total);
+
+void *I_Realloc(void *ptr, size_t size);
+
+boolean I_GetMemoryValue(unsigned int offset, void *value, int size);
+
+// Schedule a function to be called when the program exits.
+// If run_if_error is true, the function is called if the exit
+// is due to an error (I_Error)
+
+void I_AtExit(atexit_func_t func, boolean run_if_error);
+
+// Add all system-specific config file variable bindings.
+
+void I_BindVariables(void);
+
+// Print startup banner copyright message.
+
+void I_PrintStartupBanner(const char *gamedescription);
+
+// Print a centered text banner displaying the given string.
+
+void I_PrintBanner(const char *text);
+
+// Print a dividing line for startup banners.
+
+void I_PrintDivider(void);
+
+#endif
+
diff --git a/games/NXDoom/src/i_timer.c b/games/NXDoom/src/i_timer.c
new file mode 100644
index 000000000..4ec6fb047
--- /dev/null
+++ b/games/NXDoom/src/i_timer.c
@@ -0,0 +1,82 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Timer functions.
+//
+
+#include "SDL.h"
+
+#include "i_timer.h"
+#include "doomtype.h"
+
+//
+// I_GetTime
+// returns time in 1/35th second tics
+//
+
+static Uint32 basetime = 0;
+
+int  I_GetTime (void)
+{
+    Uint32 ticks;
+
+    ticks = SDL_GetTicks();
+
+    if (basetime == 0)
+        basetime = ticks;
+
+    ticks -= basetime;
+
+    return (ticks * TICRATE) / 1000;    
+}
+
+//
+// Same as I_GetTime, but returns time in milliseconds
+//
+
+int I_GetTimeMS(void)
+{
+    Uint32 ticks;
+
+    ticks = SDL_GetTicks();
+
+    if (basetime == 0)
+        basetime = ticks;
+
+    return ticks - basetime;
+}
+
+// Sleep for a specified number of ms
+
+void I_Sleep(int ms)
+{
+    SDL_Delay(ms);
+}
+
+void I_WaitVBL(int count)
+{
+    I_Sleep((count * 1000) / 70);
+}
+
+
+void I_InitTimer(void)
+{
+    // initialize timer
+
+    SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "1");
+
+    SDL_Init(SDL_INIT_TIMER);
+}
+
diff --git a/games/NXDoom/src/i_timer.h b/games/NXDoom/src/i_timer.h
new file mode 100644
index 000000000..9b3dbb8d1
--- /dev/null
+++ b/games/NXDoom/src/i_timer.h
@@ -0,0 +1,42 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      System-specific timer interface
+//
+
+
+#ifndef __I_TIMER__
+#define __I_TIMER__
+
+#define TICRATE 35
+
+// Called by D_DoomLoop,
+// returns current time in tics.
+int I_GetTime (void);
+
+// returns current time in ms
+int I_GetTimeMS (void);
+
+// Pause for a specified number of ms
+void I_Sleep(int ms);
+
+// Initialize timer
+void I_InitTimer(void);
+
+// Wait for vertical retrace or pause a bit.
+void I_WaitVBL(int count);
+
+#endif
+
diff --git a/games/NXDoom/src/i_video.c b/games/NXDoom/src/i_video.c
new file mode 100644
index 000000000..6ff3b80e1
--- /dev/null
+++ b/games/NXDoom/src/i_video.c
@@ -0,0 +1,1537 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM graphics stuff for SDL.
+//
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL.h"
+#include "SDL_opengl.h"
+
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#endif
+
+#include "config.h"
+#include "d_loop.h"
+#include "deh_str.h"
+#include "doomtype.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "tables.h"
+#include "v_diskicon.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+// These are (1) the window (or the full screen) that our game is rendered to
+// and (2) the renderer that scales the texture (see below) into this window.
+
+static SDL_Window *screen;
+static SDL_Renderer *renderer;
+
+// Window title
+
+static const char *window_title = "";
+
+// These are (1) the 320x200x8 paletted buffer that we draw to (i.e. the one
+// that holds I_VideoBuffer), (2) the 320x200x32 RGBA intermediate buffer that
+// we blit the former buffer to, (3) the intermediate 320x200 texture that we
+// load the RGBA buffer to and that we render into another texture (4) which
+// is upscaled by an integer factor UPSCALE using "nearest" scaling and which
+// in turn is finally rendered to screen using "linear" scaling.
+
+static SDL_Surface *screenbuffer = NULL;
+static SDL_Surface *argbbuffer = NULL;
+static SDL_Texture *texture = NULL;
+static SDL_Texture *texture_upscaled = NULL;
+
+static SDL_Rect blit_rect = {
+    0,
+    0,
+    SCREENWIDTH,
+    SCREENHEIGHT
+};
+
+// palette
+
+static SDL_Color palette[256];
+static boolean palette_to_set;
+
+// display has been set up?
+
+static boolean initialized = false;
+
+// disable mouse?
+
+static boolean nomouse = false;
+int usemouse = 1;
+
+// Save screenshots in PNG format.
+
+int png_screenshots = 0;
+
+// SDL video driver name
+
+char *video_driver = "";
+
+// Window position:
+
+char *window_position = "center";
+
+// SDL display number on which to run.
+
+int video_display = 0;
+
+// Screen width and height, from configuration file.
+
+int window_width = 800;
+int window_height = 600;
+
+// Fullscreen mode, 0x0 for SDL_WINDOW_FULLSCREEN_DESKTOP.
+
+int fullscreen_width = 0, fullscreen_height = 0;
+
+// Maximum number of pixels to use for intermediate scale buffer.
+
+static int max_scaling_buffer_pixels = 16000000;
+
+// Run in full screen mode?  (int type for config code)
+
+int fullscreen = true;
+
+// Aspect ratio correction mode
+
+int aspect_ratio_correct = true;
+static int actualheight;
+
+// Smooth pixel scaling
+int smooth_pixel_scaling = true;
+
+// Force integer scales for resolution-independent rendering
+
+int integer_scaling = false;
+
+// VGA Porch palette change emulation
+
+int vga_porch_flash = false;
+
+// Force software rendering, for systems which lack effective hardware
+// acceleration
+
+int force_software_renderer = false;
+
+// Time to wait for the screen to settle on startup before starting the
+// game (ms)
+
+static int startup_delay = 1000;
+
+// Grab the mouse? (int type for config code). nograbmouse_override allows
+// this to be temporarily disabled via the command line.
+
+static int grabmouse = true;
+static boolean nograbmouse_override = false;
+
+// The screen buffer; this is modified to draw things to the screen
+
+pixel_t *I_VideoBuffer = NULL;
+
+// If true, game is running as a screensaver
+
+boolean screensaver_mode = false;
+
+// Flag indicating whether the screen is currently visible:
+// when the screen isnt visible, don't render the screen
+
+boolean screenvisible = true;
+
+// If true, we display dots at the bottom of the screen to 
+// indicate FPS.
+
+static boolean display_fps_dots;
+
+// If this is true, the screen is rendered but not blitted to the
+// video buffer.
+
+static boolean noblit;
+
+// Callback function to invoke to determine whether to grab the 
+// mouse pointer.
+
+static grabmouse_callback_t grabmouse_callback = NULL;
+
+// Does the window currently have focus?
+
+static boolean window_focused = true;
+
+// Window resize state.
+
+static boolean need_resize = false;
+static unsigned int last_resize_time;
+#define RESIZE_DELAY 500
+
+// Gamma correction level to use
+
+int usegamma = 0;
+
+// Joystick/gamepad hysteresis
+unsigned int joywait = 0;
+
+// Icon RGB data and dimensions
+static const unsigned int *icon_data;
+static int icon_w;
+static int icon_h;
+
+static boolean MouseShouldBeGrabbed()
+{
+    // never grab the mouse when in screensaver mode
+   
+    if (screensaver_mode)
+        return false;
+
+    // if the window doesn't have focus, never grab it
+
+    if (!window_focused)
+        return false;
+
+    // always grab the mouse when full screen (dont want to 
+    // see the mouse pointer)
+
+    if (fullscreen)
+        return true;
+
+    // Don't grab the mouse if mouse input is disabled
+
+    if (!usemouse || nomouse)
+        return false;
+
+    // if we specify not to grab the mouse, never grab
+
+    if (nograbmouse_override || !grabmouse)
+        return false;
+
+    // Invoke the grabmouse callback function to determine whether
+    // the mouse should be grabbed
+
+    if (grabmouse_callback != NULL)
+    {
+        return grabmouse_callback();
+    }
+    else
+    {
+        return true;
+    }
+}
+
+void I_SetGrabMouseCallback(grabmouse_callback_t func)
+{
+    grabmouse_callback = func;
+}
+
+// Set the variable controlling FPS dots.
+
+void I_DisplayFPSDots(boolean dots_on)
+{
+    display_fps_dots = dots_on;
+}
+
+static void SetShowCursor(boolean show)
+{
+    if (!screensaver_mode)
+    {
+        // When the cursor is hidden, grab the input.
+        // Relative mode implicitly hides the cursor.
+        SDL_SetRelativeMouseMode(!show);
+        SDL_GetRelativeMouseState(NULL, NULL);
+    }
+}
+
+void I_ShutdownGraphics(void)
+{
+    if (initialized)
+    {
+        SetShowCursor(true);
+
+        SDL_FreeSurface(argbbuffer);
+        SDL_FreeSurface(screenbuffer);
+        SDL_DestroyTexture(texture_upscaled);
+        SDL_DestroyTexture(texture);
+        SDL_DestroyRenderer(renderer);
+        SDL_DestroyWindow(screen);
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+        initialized = false;
+    }
+}
+
+
+
+//
+// I_StartFrame
+//
+void I_StartFrame (void)
+{
+    // er?
+
+}
+
+// Adjust window_width / window_height variables to be an an aspect
+// ratio consistent with the aspect_ratio_correct variable.
+static void AdjustWindowSize(void)
+{
+    if (aspect_ratio_correct || integer_scaling)
+    {
+        if (window_width * actualheight <= window_height * SCREENWIDTH)
+        {
+            // We round up window_height if the ratio is not exact; this leaves
+            // the result stable.
+            window_height = (window_width * actualheight + SCREENWIDTH - 1) / SCREENWIDTH;
+        }
+        else
+        {
+            window_width = window_height * SCREENWIDTH / actualheight;
+        }
+    }
+}
+
+static void HandleWindowEvent(SDL_WindowEvent *event)
+{
+    int i;
+
+    switch (event->event)
+    {
+#if 0 // SDL2-TODO
+        case SDL_ACTIVEEVENT:
+            // need to update our focus state
+            UpdateFocus();
+            break;
+#endif
+        case SDL_WINDOWEVENT_EXPOSED:
+            palette_to_set = true;
+            break;
+
+        case SDL_WINDOWEVENT_RESIZED:
+            need_resize = true;
+            last_resize_time = SDL_GetTicks();
+            break;
+
+        // Don't render the screen when the window is minimized:
+
+        case SDL_WINDOWEVENT_MINIMIZED:
+            screenvisible = false;
+            break;
+
+        case SDL_WINDOWEVENT_MAXIMIZED:
+        case SDL_WINDOWEVENT_RESTORED:
+            screenvisible = true;
+            break;
+
+        // Update the value of window_focused when we get a focus event
+        //
+        // We try to make ourselves be well-behaved: the grab on the mouse
+        // is removed if we lose focus (such as a popup window appearing),
+        // and we dont move the mouse around if we aren't focused either.
+
+        case SDL_WINDOWEVENT_FOCUS_GAINED:
+            window_focused = true;
+            break;
+
+        case SDL_WINDOWEVENT_FOCUS_LOST:
+            window_focused = false;
+            break;
+
+        // We want to save the user's preferred monitor to use for running the
+        // game, so that next time we're run we start on the same display. So
+        // every time the window is moved, find which display we're now on and
+        // update the video_display config variable.
+
+        case SDL_WINDOWEVENT_MOVED:
+            i = SDL_GetWindowDisplayIndex(screen);
+            if (i >= 0)
+            {
+                video_display = i;
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static boolean ToggleFullScreenKeyShortcut(SDL_Keysym *sym)
+{
+    Uint16 flags = (KMOD_LALT | KMOD_RALT);
+#if defined(__MACOSX__)
+    flags |= (KMOD_LGUI | KMOD_RGUI);
+#endif
+    return (sym->scancode == SDL_SCANCODE_RETURN || 
+            sym->scancode == SDL_SCANCODE_KP_ENTER) && (sym->mod & flags) != 0;
+}
+
+static void I_ToggleFullScreen(void)
+{
+    unsigned int flags = 0;
+
+    // TODO: Consider implementing fullscreen toggle for SDL_WINDOW_FULLSCREEN
+    // (mode-changing) setup. This is hard because we have to shut down and
+    // restart again.
+    if (fullscreen_width != 0 || fullscreen_height != 0)
+    {
+        return;
+    }
+
+    fullscreen = !fullscreen;
+
+    if (fullscreen)
+    {
+        flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+    }
+
+    SDL_SetWindowFullscreen(screen, flags);
+
+    if (!fullscreen)
+    {
+        AdjustWindowSize();
+        SDL_SetWindowSize(screen, window_width, window_height);
+    }
+}
+
+void I_GetEvent(void)
+{
+    SDL_Event sdlevent;
+
+    SDL_PumpEvents();
+
+    while (SDL_PollEvent(&sdlevent))
+    {
+        switch (sdlevent.type)
+        {
+            case SDL_KEYDOWN:
+                if (ToggleFullScreenKeyShortcut(&sdlevent.key.keysym))
+                {
+                    I_ToggleFullScreen();
+                    break;
+                }
+                // deliberate fall-though
+
+            case SDL_KEYUP:
+		I_HandleKeyboardEvent(&sdlevent);
+                break;
+
+            case SDL_MOUSEBUTTONDOWN:
+            case SDL_MOUSEBUTTONUP:
+            case SDL_MOUSEWHEEL:
+                if (usemouse && !nomouse && window_focused)
+                {
+                    I_HandleMouseEvent(&sdlevent);
+                }
+                break;
+
+            case SDL_QUIT:
+                if (screensaver_mode)
+                {
+                    I_Quit();
+                }
+                else
+                {
+                    event_t event;
+                    event.type = ev_quit;
+                    D_PostEvent(&event);
+                }
+                break;
+
+            case SDL_WINDOWEVENT:
+                if (sdlevent.window.windowID == SDL_GetWindowID(screen))
+                {
+                    HandleWindowEvent(&sdlevent.window);
+                }
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+//
+// I_StartTic
+//
+void I_StartTic (void)
+{
+    if (!initialized)
+    {
+        return;
+    }
+
+    I_GetEvent();
+
+    if (usemouse && !nomouse && window_focused)
+    {
+        I_ReadMouse();
+    }
+
+    if (joywait < I_GetTime())
+    {
+        I_UpdateJoystick();
+    }
+}
+
+
+//
+// I_UpdateNoBlit
+//
+void I_UpdateNoBlit (void)
+{
+    // what is this?
+}
+
+static void UpdateGrab(void)
+{
+    static boolean currently_grabbed = false;
+    boolean grab;
+
+    grab = MouseShouldBeGrabbed();
+
+    if (screensaver_mode)
+    {
+        // Hide the cursor in screensaver mode
+
+        SetShowCursor(false);
+    }
+    else if (grab && !currently_grabbed)
+    {
+        SetShowCursor(false);
+    }
+    else if (!grab && currently_grabbed)
+    {
+        int screen_w, screen_h;
+
+        SetShowCursor(true);
+
+        // When releasing the mouse from grab, warp the mouse cursor to
+        // the bottom-right of the screen. This is a minimally distracting
+        // place for it to appear - we may only have released the grab
+        // because we're at an end of level intermission screen, for
+        // example.
+
+        SDL_GetWindowSize(screen, &screen_w, &screen_h);
+        SDL_WarpMouseInWindow(screen, screen_w - 16, screen_h - 16);
+        SDL_GetRelativeMouseState(NULL, NULL);
+    }
+
+    currently_grabbed = grab;
+}
+
+static void LimitTextureSize(int *w_upscale, int *h_upscale)
+{
+    SDL_RendererInfo rinfo;
+    int orig_w, orig_h;
+
+    orig_w = *w_upscale;
+    orig_h = *h_upscale;
+
+    // Query renderer and limit to maximum texture dimensions of hardware:
+    if (SDL_GetRendererInfo(renderer, &rinfo) != 0)
+    {
+        I_Error("CreateUpscaledTexture: SDL_GetRendererInfo() call failed: %s",
+                SDL_GetError());
+    }
+
+    while (*w_upscale * SCREENWIDTH > rinfo.max_texture_width)
+    {
+        --*w_upscale;
+    }
+    while (*h_upscale * SCREENHEIGHT > rinfo.max_texture_height)
+    {
+        --*h_upscale;
+    }
+
+    if ((*w_upscale < 1 && rinfo.max_texture_width > 0) ||
+        (*h_upscale < 1 && rinfo.max_texture_height > 0))
+    {
+        I_Error("CreateUpscaledTexture: Can't create a texture big enough for "
+                "the whole screen! Maximum texture size %dx%d",
+                rinfo.max_texture_width, rinfo.max_texture_height);
+    }
+
+    // We limit the amount of texture memory used for the intermediate buffer,
+    // since beyond a certain point there are diminishing returns. Also,
+    // depending on the hardware there may be performance problems with very
+    // huge textures, so the user can use this to reduce the maximum texture
+    // size if desired.
+
+    if (max_scaling_buffer_pixels < SCREENWIDTH * SCREENHEIGHT)
+    {
+        I_Error("CreateUpscaledTexture: max_scaling_buffer_pixels too small "
+                "to create a texture buffer: %d < %d",
+                max_scaling_buffer_pixels, SCREENWIDTH * SCREENHEIGHT);
+    }
+
+    while (*w_upscale * *h_upscale * SCREENWIDTH * SCREENHEIGHT
+           > max_scaling_buffer_pixels)
+    {
+        if (*w_upscale > *h_upscale)
+        {
+            --*w_upscale;
+        }
+        else
+        {
+            --*h_upscale;
+        }
+    }
+
+    if (*w_upscale != orig_w || *h_upscale != orig_h)
+    {
+        printf("CreateUpscaledTexture: Limited texture size to %dx%d "
+               "(max %d pixels, max texture size %dx%d)\n",
+               *w_upscale * SCREENWIDTH, *h_upscale * SCREENHEIGHT,
+               max_scaling_buffer_pixels,
+               rinfo.max_texture_width, rinfo.max_texture_height);
+    }
+}
+
+static void CreateUpscaledTexture(boolean force)
+{
+    int w, h;
+    int h_upscale, w_upscale;
+    static int h_upscale_old, w_upscale_old;
+
+    SDL_Texture *new_texture, *old_texture;
+
+    // Get the size of the renderer output. The units this gives us will be
+    // real world pixels, which are not necessarily equivalent to the screen's
+    // window size (because of highdpi).
+    if (SDL_GetRendererOutputSize(renderer, &w, &h) != 0)
+    {
+        I_Error("Failed to get renderer output size: %s", SDL_GetError());
+    }
+
+    // When the screen or window dimensions do not match the aspect ratio
+    // of the texture, the rendered area is scaled down to fit. Calculate
+    // the actual dimensions of the rendered area.
+
+    if (w * actualheight < h * SCREENWIDTH)
+    {
+        // Tall window.
+
+        h = w * actualheight / SCREENWIDTH;
+    }
+    else
+    {
+        // Wide window.
+
+        w = h * SCREENWIDTH / actualheight;
+    }
+
+    // Pick texture size the next integer multiple of the screen dimensions.
+    // If one screen dimension matches an integer multiple of the original
+    // resolution, there is no need to overscale in this direction.
+
+    w_upscale = (w + SCREENWIDTH - 1) / SCREENWIDTH;
+    h_upscale = (h + SCREENHEIGHT - 1) / SCREENHEIGHT;
+
+    // Minimum texture dimensions of 320x200.
+
+    if (w_upscale < 1)
+    {
+        w_upscale = 1;
+    }
+    if (h_upscale < 1)
+    {
+        h_upscale = 1;
+    }
+
+    LimitTextureSize(&w_upscale, &h_upscale);
+
+    // Create a new texture only if the upscale factors have actually changed.
+
+    if (h_upscale == h_upscale_old && w_upscale == w_upscale_old && !force)
+    {
+        return;
+    }
+
+    h_upscale_old = h_upscale;
+    w_upscale_old = w_upscale;
+
+    // Set the scaling quality for rendering the upscaled texture to "linear",
+    // which looks much softer and smoother than "nearest" but does a better
+    // job at downscaling from the upscaled texture to screen.
+
+    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
+
+    new_texture = SDL_CreateTexture(renderer,
+                                SDL_PIXELFORMAT_ARGB8888,
+                                SDL_TEXTUREACCESS_TARGET,
+                                w_upscale*SCREENWIDTH,
+                                h_upscale*SCREENHEIGHT);
+
+    old_texture = texture_upscaled;
+    texture_upscaled = new_texture;
+
+    if (old_texture != NULL)
+    {
+        SDL_DestroyTexture(old_texture);
+    }
+}
+
+//
+// I_FinishUpdate
+//
+void I_FinishUpdate (void)
+{
+    static int lasttic;
+    int tics;
+    int i;
+
+    if (!initialized)
+        return;
+
+    if (noblit)
+        return;
+
+    if (need_resize)
+    {
+        if (SDL_GetTicks() > last_resize_time + RESIZE_DELAY)
+        {
+            int flags;
+            // When the window is resized (we're not in fullscreen mode),
+            // save the new window size.
+            flags = SDL_GetWindowFlags(screen);
+            if ((flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == 0)
+            {
+                SDL_GetWindowSize(screen, &window_width, &window_height);
+
+                // Adjust the window by resizing again so that the window
+                // is the right aspect ratio.
+                AdjustWindowSize();
+                SDL_SetWindowSize(screen, window_width, window_height);
+            }
+            CreateUpscaledTexture(false);
+            need_resize = false;
+            palette_to_set = true;
+        }
+        else
+        {
+            return;
+        }
+    }
+
+    UpdateGrab();
+
+#if 0 // SDL2-TODO
+    // Don't update the screen if the window isn't visible.
+    // Not doing this breaks under Windows when we alt-tab away 
+    // while fullscreen.
+
+    if (!(SDL_GetAppState() & SDL_APPACTIVE))
+        return;
+#endif
+
+    // draws little dots on the bottom of the screen
+
+    if (display_fps_dots)
+    {
+	i = I_GetTime();
+	tics = i - lasttic;
+	lasttic = i;
+	if (tics > 20) tics = 20;
+
+	for (i=0 ; i<tics*4 ; i+=4)
+	    I_VideoBuffer[ (SCREENHEIGHT-1)*SCREENWIDTH + i] = 0xff;
+	for ( ; i<20*4 ; i+=4)
+	    I_VideoBuffer[ (SCREENHEIGHT-1)*SCREENWIDTH + i] = 0x0;
+    }
+
+    // Draw disk icon before blit, if necessary.
+    V_DrawDiskIcon();
+
+    if (palette_to_set)
+    {
+        SDL_SetPaletteColors(screenbuffer->format->palette, palette, 0, 256);
+        palette_to_set = false;
+
+        if (vga_porch_flash)
+        {
+            // "flash" the pillars/letterboxes with palette changes, emulating
+            // VGA "porch" behaviour (GitHub issue #832)
+            SDL_SetRenderDrawColor(renderer, palette[0].r, palette[0].g,
+                palette[0].b, SDL_ALPHA_OPAQUE);
+        }
+    }
+
+    // Blit from the paletted 8-bit screen buffer to the intermediate
+    // 32-bit RGBA buffer and update the intermediate texture with the
+    // contents of the RGBA buffer.
+
+    SDL_LockTexture(texture, &blit_rect, &argbbuffer->pixels,
+                    &argbbuffer->pitch);
+    SDL_LowerBlit(screenbuffer, &blit_rect, argbbuffer, &blit_rect);
+    SDL_UnlockTexture(texture);
+
+    // Make sure the pillarboxes are kept clear each frame.
+
+    SDL_RenderClear(renderer);
+
+    if (smooth_pixel_scaling && !force_software_renderer)
+    {
+        // Render this intermediate texture into the upscaled texture
+        // using "nearest" integer scaling.
+        SDL_SetRenderTarget(renderer, texture_upscaled);
+        SDL_RenderCopy(renderer, texture, NULL, NULL);
+
+        // Finally, render this upscaled texture to screen using linear scaling.
+
+        SDL_SetRenderTarget(renderer, NULL);
+        SDL_RenderCopy(renderer, texture_upscaled, NULL, NULL);
+    }
+    else
+    {
+        SDL_SetRenderTarget(renderer, NULL);
+        SDL_RenderCopy(renderer, texture, NULL, NULL);
+    }
+
+
+    // Draw!
+
+    SDL_RenderPresent(renderer);
+
+    // Restore background and undo the disk indicator, if it was drawn.
+    V_RestoreDiskBackground();
+}
+
+
+//
+// I_ReadScreen
+//
+void I_ReadScreen (pixel_t* scr)
+{
+    memcpy(scr, I_VideoBuffer, SCREENWIDTH*SCREENHEIGHT*sizeof(*scr));
+}
+
+
+//
+// I_SetPalette
+//
+void I_SetPalette (byte *doompalette)
+{
+    int i;
+
+    for (i=0; i<256; ++i)
+    {
+        // Zero out the bottom two bits of each channel - the PC VGA
+        // controller only supports 6 bits of accuracy.
+
+        palette[i].a = 0xFFU;
+        palette[i].r = gammatable[usegamma][*doompalette++] & ~3;
+        palette[i].g = gammatable[usegamma][*doompalette++] & ~3;
+        palette[i].b = gammatable[usegamma][*doompalette++] & ~3;
+    }
+
+    palette_to_set = true;
+}
+
+// Given an RGB value, find the closest matching palette index.
+
+int I_GetPaletteIndex(int r, int g, int b)
+{
+    int best, best_diff, diff;
+    int i;
+
+    best = 0; best_diff = INT_MAX;
+
+    for (i = 0; i < 256; ++i)
+    {
+        diff = (r - palette[i].r) * (r - palette[i].r)
+             + (g - palette[i].g) * (g - palette[i].g)
+             + (b - palette[i].b) * (b - palette[i].b);
+
+        if (diff < best_diff)
+        {
+            best = i;
+            best_diff = diff;
+        }
+
+        if (diff == 0)
+        {
+            break;
+        }
+    }
+
+    return best;
+}
+
+// 
+// Set the window title
+//
+
+void I_SetWindowTitle(const char *title)
+{
+    window_title = title;
+}
+
+//
+// Call the SDL function to set the window title, based on 
+// the title set with I_SetWindowTitle.
+//
+
+void I_InitWindowTitle(void)
+{
+    char *buf;
+
+    buf = M_StringJoin(window_title, " - ", PACKAGE_STRING, NULL);
+    SDL_SetWindowTitle(screen, buf);
+    free(buf);
+}
+
+void I_RegisterWindowIcon(const unsigned int *icon, int width, int height)
+{
+    icon_data = icon;
+    icon_w = width;
+    icon_h = height;
+}
+
+// Set the application icon
+
+void I_InitWindowIcon(void)
+{
+    SDL_Surface *surface;
+
+    surface = SDL_CreateRGBSurfaceFrom((void *) icon_data, icon_w, icon_h,
+                                       32, icon_w * 4,
+                                       0xffu << 24, 0xffu << 16,
+                                       0xffu << 8, 0xffu << 0);
+
+    SDL_SetWindowIcon(screen, surface);
+    SDL_FreeSurface(surface);
+}
+
+// Set video size to a particular scale factor (1x, 2x, 3x, etc.)
+
+static void SetScaleFactor(int factor)
+{
+    int height;
+
+    // Pick 320x200 or 320x240, depending on aspect ratio correct
+    if (aspect_ratio_correct)
+    {
+        height = SCREENHEIGHT_4_3;
+    }
+    else
+    {
+        height = SCREENHEIGHT;
+    }
+
+    window_width = factor * SCREENWIDTH;
+    window_height = factor * height;
+    fullscreen = false;
+}
+
+void I_GraphicsCheckCommandLine(void)
+{
+    int i;
+
+    //!
+    // @category video
+    // @vanilla
+    //
+    // Disable blitting the screen.
+    //
+
+    noblit = M_CheckParm ("-noblit");
+
+    //!
+    // @category video 
+    //
+    // Don't grab the mouse when running in windowed mode.
+    //
+
+    nograbmouse_override = M_ParmExists("-nograbmouse");
+
+    // default to fullscreen mode, allow override with command line
+    // nofullscreen because we love prboom
+
+    //!
+    // @category video 
+    //
+    // Run in a window.
+    //
+
+    if (M_CheckParm("-window") || M_CheckParm("-nofullscreen"))
+    {
+        fullscreen = false;
+    }
+
+    //!
+    // @category video 
+    //
+    // Run in fullscreen mode.
+    //
+
+    if (M_CheckParm("-fullscreen"))
+    {
+        fullscreen = true;
+    }
+
+    //!
+    // @category video 
+    //
+    // Disable the mouse.
+    //
+
+    nomouse = M_CheckParm("-nomouse") > 0;
+
+    //!
+    // @category video
+    // @arg <W>
+    //
+    // Specify the screen width, in pixels.  Implies -window.
+    //
+
+    i = M_CheckParmWithArgs("-width", 1);
+
+    if (i > 0)
+    {
+        window_width = atoi(myargv[i + 1]);
+        fullscreen = false;
+    }
+
+    //!
+    // @category video
+    // @arg <H>
+    //
+    // Specify the screen height, in pixels.  Implies -window.
+    //
+
+    i = M_CheckParmWithArgs("-height", 1);
+
+    if (i > 0)
+    {
+        window_height = atoi(myargv[i + 1]);
+        fullscreen = false;
+    }
+
+    //!
+    // @category video
+    // @arg <WxH>
+    //
+    // Specify the dimensions of the window.  Implies -window.
+    //
+
+    i = M_CheckParmWithArgs("-geometry", 1);
+
+    if (i > 0)
+    {
+        int w, h, s;
+
+        s = sscanf(myargv[i + 1], "%ix%i", &w, &h);
+        if (s == 2)
+        {
+            window_width = w;
+            window_height = h;
+            fullscreen = false;
+        }
+    }
+
+    //!
+    // @category video
+    // @arg <x>
+    //
+    // Specify the display number on which to show the screen.
+    //
+
+    i = M_CheckParmWithArgs("-display", 1);
+
+    if (i > 0)
+    {
+        int display = atoi(myargv[i + 1]);
+        if (display >= 0)
+        {
+            video_display = display;
+        }
+    }
+
+    //!
+    // @category video
+    //
+    // Don't scale up the screen.  Implies -window.
+    //
+
+    if (M_CheckParm("-1")) 
+    {
+        SetScaleFactor(1);
+    }
+
+    //!
+    // @category video
+    //
+    // Double up the screen to 2x its normal size.  Implies -window.
+    //
+
+    if (M_CheckParm("-2")) 
+    {
+        SetScaleFactor(2);
+    }
+
+    //!
+    // @category video
+    //
+    // Double up the screen to 3x its normal size.  Implies -window.
+    //
+
+    if (M_CheckParm("-3")) 
+    {
+        SetScaleFactor(3);
+    }
+}
+
+// Check if we have been invoked as a screensaver by xscreensaver.
+
+void I_CheckIsScreensaver(void)
+{
+    char *env;
+
+    env = getenv("XSCREENSAVER_WINDOW");
+
+    if (env != NULL)
+    {
+        screensaver_mode = true;
+    }
+}
+
+static void SetSDLVideoDriver(void)
+{
+    // Allow a default value for the SDL video driver to be specified
+    // in the configuration file.
+
+    if (strcmp(video_driver, "") != 0)
+    {
+        char *env_string;
+
+        env_string = M_StringJoin("SDL_VIDEODRIVER=", video_driver, NULL);
+        putenv(env_string);
+        free(env_string);
+    }
+}
+
+// Check the display bounds of the display referred to by 'video_display' and
+// set x and y to a location that places the window in the center of that
+// display.
+static void CenterWindow(int *x, int *y, int w, int h)
+{
+    SDL_Rect bounds;
+
+    if (SDL_GetDisplayBounds(video_display, &bounds) < 0)
+    {
+        fprintf(stderr, "CenterWindow: Failed to read display bounds "
+                        "for display #%d!\n", video_display);
+        return;
+    }
+
+    *x = bounds.x + SDL_max((bounds.w - w) / 2, 0);
+    *y = bounds.y + SDL_max((bounds.h - h) / 2, 0);
+}
+
+void I_GetWindowPosition(int *x, int *y, int w, int h)
+{
+    // Check that video_display corresponds to a display that really exists,
+    // and if it doesn't, reset it.
+    if (video_display < 0 || video_display >= SDL_GetNumVideoDisplays())
+    {
+        fprintf(stderr,
+                "I_GetWindowPosition: We were configured to run on display #%d, "
+                "but it no longer exists (max %d). Moving to display 0.\n",
+                video_display, SDL_GetNumVideoDisplays() - 1);
+        video_display = 0;
+    }
+
+    // in fullscreen mode, the window "position" still matters, because
+    // we use it to control which display we run fullscreen on.
+
+    if (fullscreen)
+    {
+        CenterWindow(x, y, w, h);
+        return;
+    }
+
+    // in windowed mode, the desired window position can be specified
+    // in the configuration file.
+
+    if (window_position == NULL || !strcmp(window_position, ""))
+    {
+        *x = *y = SDL_WINDOWPOS_UNDEFINED;
+    }
+    else if (!strcmp(window_position, "center"))
+    {
+        // Note: SDL has a SDL_WINDOWPOS_CENTER, but this is useless for our
+        // purposes, since we also want to control which display we appear on.
+        // So we have to do this ourselves.
+        CenterWindow(x, y, w, h);
+    }
+    else if (sscanf(window_position, "%i,%i", x, y) != 2)
+    {
+        // invalid format: revert to default
+        fprintf(stderr, "I_GetWindowPosition: invalid window_position setting\n");
+        *x = *y = SDL_WINDOWPOS_UNDEFINED;
+    }
+}
+
+static void SetVideoMode(void)
+{
+    int w, h;
+    int x, y;
+    int window_flags = 0, renderer_flags = 0;
+    SDL_DisplayMode mode;
+
+    w = window_width;
+    h = window_height;
+
+    // In windowed mode, the window can be resized while the game is
+    // running.
+    window_flags = SDL_WINDOW_RESIZABLE;
+
+    // Set the highdpi flag - this makes a big difference on Macs with
+    // retina displays, especially when using small window sizes.
+    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+
+    if (fullscreen)
+    {
+        if (fullscreen_width == 0 && fullscreen_height == 0)
+        {
+            // This window_flags means "Never change the screen resolution!
+            // Instead, draw to the entire screen by scaling the texture
+            // appropriately".
+            window_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+        }
+        else
+        {
+            w = fullscreen_width;
+            h = fullscreen_height;
+            window_flags |= SDL_WINDOW_FULLSCREEN;
+        }
+    }
+
+    // Running without window decorations is potentially useful if you're
+    // playing in three window mode and want to line up three game windows
+    // next to each other on a single desktop.
+    // Deliberately not documented because I'm not sure how useful this is yet.
+    if (M_ParmExists("-borderless"))
+    {
+        window_flags |= SDL_WINDOW_BORDERLESS;
+    }
+
+    I_GetWindowPosition(&x, &y, w, h);
+
+    // Create window and renderer contexts. We set the window title
+    // later anyway and leave the window position "undefined". If
+    // "window_flags" contains the fullscreen flag (see above), then
+    // w and h are ignored.
+
+    if (screen == NULL)
+    {
+        screen = SDL_CreateWindow(NULL, x, y, w, h, window_flags);
+
+        if (screen == NULL)
+        {
+            I_Error("Error creating window for video startup: %s",
+            SDL_GetError());
+        }
+
+        SDL_SetWindowMinimumSize(screen, SCREENWIDTH, actualheight);
+
+        I_InitWindowTitle();
+        I_InitWindowIcon();
+    }
+
+    // The SDL_RENDERER_TARGETTEXTURE flag is required to render the
+    // intermediate texture into the upscaled texture.
+    renderer_flags = SDL_RENDERER_TARGETTEXTURE;
+	
+    if (SDL_GetCurrentDisplayMode(video_display, &mode) != 0)
+    {
+        I_Error("Could not get display mode for video display #%d: %s",
+        video_display, SDL_GetError());
+    }
+
+    // Turn on vsync if we aren't in a -timedemo
+    if (!singletics && mode.refresh_rate > 0)
+    {
+        renderer_flags |= SDL_RENDERER_PRESENTVSYNC;
+    }
+
+    if (force_software_renderer)
+    {
+        renderer_flags |= SDL_RENDERER_SOFTWARE;
+        renderer_flags &= ~SDL_RENDERER_PRESENTVSYNC;
+    }
+
+    if (renderer != NULL)
+    {
+        SDL_DestroyRenderer(renderer);
+        // all associated textures get destroyed
+        texture = NULL;
+        texture_upscaled = NULL;
+    }
+
+    renderer = SDL_CreateRenderer(screen, -1, renderer_flags);
+
+    // If we could not find a matching render driver,
+    // try again without hardware acceleration.
+
+    if (renderer == NULL && !force_software_renderer)
+    {
+        renderer_flags |= SDL_RENDERER_SOFTWARE;
+        renderer_flags &= ~SDL_RENDERER_PRESENTVSYNC;
+
+        renderer = SDL_CreateRenderer(screen, -1, renderer_flags);
+
+        // If this helped, save the setting for later.
+        if (renderer != NULL)
+        {
+            force_software_renderer = 1;
+        }
+    }
+
+    if (renderer == NULL)
+    {
+        I_Error("Error creating renderer for screen window: %s",
+                SDL_GetError());
+    }
+
+    // Important: Set the "logical size" of the rendering context. At the same
+    // time this also defines the aspect ratio that is preserved while scaling
+    // and stretching the texture into the window.
+
+    if (aspect_ratio_correct || integer_scaling)
+    {
+        SDL_RenderSetLogicalSize(renderer,
+                                 SCREENWIDTH,
+                                 actualheight);
+    }
+
+    // Force integer scales for resolution-independent rendering.
+
+    SDL_RenderSetIntegerScale(renderer, integer_scaling);
+
+    // Blank out the full screen area in case there is any junk in
+    // the borders that won't otherwise be overwritten.
+
+    SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+    SDL_RenderClear(renderer);
+    SDL_RenderPresent(renderer);
+
+    // Create the 8-bit paletted and the 32-bit RGBA screenbuffer surfaces.
+
+    if (screenbuffer != NULL)
+    {
+        SDL_FreeSurface(screenbuffer);
+        screenbuffer = NULL;
+    }
+
+    if (screenbuffer == NULL)
+    {
+        screenbuffer = SDL_CreateRGBSurface(0,
+                                            SCREENWIDTH, SCREENHEIGHT, 8,
+                                            0, 0, 0, 0);
+        SDL_FillRect(screenbuffer, NULL, 0);
+    }
+
+    // Format of argbbuffer must match the screen pixel format because we
+    // import the surface data into the texture.
+
+    if (argbbuffer != NULL)
+    {
+        SDL_FreeSurface(argbbuffer);
+        argbbuffer = NULL;
+    }
+
+    if (argbbuffer == NULL)
+    {
+	    // pixels and pitch will be filled with the texture's values
+	    // in I_FinishUpdate()
+	    argbbuffer = SDL_CreateRGBSurfaceWithFormatFrom(
+                     NULL, w, h, 0, 0, SDL_PIXELFORMAT_ARGB8888);
+    }
+
+    if (texture != NULL)
+    {
+        SDL_DestroyTexture(texture);
+    }
+
+    // Set the scaling quality for rendering the intermediate texture into
+    // the upscaled texture to "nearest", which is gritty and pixelated and
+    // resembles software scaling pretty well.
+
+    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "nearest");
+
+    // Create the intermediate texture that the RGBA surface gets loaded into.
+    // The SDL_TEXTUREACCESS_STREAMING flag means that this texture's content
+    // is going to change frequently.
+
+    texture = SDL_CreateTexture(renderer,
+                                SDL_PIXELFORMAT_ARGB8888,
+                                SDL_TEXTUREACCESS_STREAMING,
+                                SCREENWIDTH, SCREENHEIGHT);
+
+    // Workaround for SDL 2.0.14+ alt-tab bug (taken from Doom Retro via Prboom-plus and Woof)
+#if defined(_WIN32)
+    {
+        SDL_version ver;
+        SDL_GetVersion(&ver);
+        if (ver.major == 2 && ver.minor == 0 && (ver.patch == 14 || ver.patch == 16))
+        {
+           SDL_SetHintWithPriority(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1", SDL_HINT_OVERRIDE);
+        }
+    }
+#endif
+
+    // Initially create the upscaled texture for rendering to screen
+
+    CreateUpscaledTexture(true);
+}
+
+void I_InitGraphics(void)
+{
+    SDL_Event dummy;
+    byte *doompal;
+    char *env;
+
+    // Pass through the XSCREENSAVER_WINDOW environment variable to 
+    // SDL_WINDOWID, to embed the SDL window into the Xscreensaver
+    // window.
+
+    env = getenv("XSCREENSAVER_WINDOW");
+
+    if (env != NULL)
+    {
+        char winenv[30];
+        unsigned int winid;
+
+        sscanf(env, "0x%x", &winid);
+        M_snprintf(winenv, sizeof(winenv), "SDL_WINDOWID=%u", winid);
+
+        putenv(winenv);
+    }
+
+    SetSDLVideoDriver();
+
+    if (SDL_Init(SDL_INIT_VIDEO) < 0) 
+    {
+        I_Error("Failed to initialize video: %s", SDL_GetError());
+    }
+
+    // When in screensaver mode, run full screen and auto detect
+    // screen dimensions (don't change video mode)
+    if (screensaver_mode)
+    {
+        fullscreen = true;
+    }
+
+    if (aspect_ratio_correct == 1)
+    {
+        actualheight = SCREENHEIGHT_4_3;
+    }
+    else
+    {
+        actualheight = SCREENHEIGHT;
+    }
+
+    // Create the game window; this may switch graphic modes depending
+    // on configuration.
+    AdjustWindowSize();
+    SetVideoMode();
+
+    // Start with a clear black screen
+    // (screen will be flipped after we set the palette)
+
+    SDL_FillRect(screenbuffer, NULL, 0);
+
+    // Set the palette
+
+    doompal = W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE);
+    I_SetPalette(doompal);
+    SDL_SetPaletteColors(screenbuffer->format->palette, palette, 0, 256);
+
+    // SDL2-TODO UpdateFocus();
+    UpdateGrab();
+
+    // On some systems, it takes a second or so for the screen to settle
+    // after changing modes.  We include the option to add a delay when
+    // setting the screen mode, so that the game doesn't start immediately
+    // with the player unable to see anything.
+
+    if (fullscreen && !screensaver_mode)
+    {
+        SDL_Delay(startup_delay);
+    }
+
+    // The actual 320x200 canvas that we draw to. This is the pixel buffer of
+    // the 8-bit paletted screen buffer that gets blit on an intermediate
+    // 32-bit RGBA screen buffer that gets loaded into a texture that gets
+    // finally rendered into our window or full screen in I_FinishUpdate().
+
+    I_VideoBuffer = screenbuffer->pixels;
+    V_RestoreBuffer();
+
+    // Clear the screen to black.
+
+    memset(I_VideoBuffer, 0, SCREENWIDTH * SCREENHEIGHT * sizeof(*I_VideoBuffer));
+
+    // clear out any events waiting at the start and center the mouse
+  
+    while (SDL_PollEvent(&dummy));
+
+    initialized = true;
+
+    // Call I_ShutdownGraphics on quit
+
+    I_AtExit(I_ShutdownGraphics, true);
+}
+
+// Bind all variables controlling video options into the configuration
+// file system.
+void I_BindVideoVariables(void)
+{
+    M_BindIntVariable("use_mouse",                 &usemouse);
+    M_BindIntVariable("fullscreen",                &fullscreen);
+    M_BindIntVariable("video_display",             &video_display);
+    M_BindIntVariable("aspect_ratio_correct",      &aspect_ratio_correct);
+    M_BindIntVariable("integer_scaling",           &integer_scaling);
+    M_BindIntVariable("smooth_pixel_scaling",      &smooth_pixel_scaling);
+    M_BindIntVariable("vga_porch_flash",           &vga_porch_flash);
+    M_BindIntVariable("startup_delay",             &startup_delay);
+    M_BindIntVariable("fullscreen_width",          &fullscreen_width);
+    M_BindIntVariable("fullscreen_height",         &fullscreen_height);
+    M_BindIntVariable("force_software_renderer",   &force_software_renderer);
+    M_BindIntVariable("max_scaling_buffer_pixels", &max_scaling_buffer_pixels);
+    M_BindIntVariable("window_width",              &window_width);
+    M_BindIntVariable("window_height",             &window_height);
+    M_BindIntVariable("grabmouse",                 &grabmouse);
+    M_BindStringVariable("video_driver",           &video_driver);
+    M_BindStringVariable("window_position",        &window_position);
+    M_BindIntVariable("usegamma",                  &usegamma);
+    M_BindIntVariable("png_screenshots",           &png_screenshots);
+}
\ No newline at end of file
diff --git a/games/NXDoom/src/i_video.h b/games/NXDoom/src/i_video.h
new file mode 100644
index 000000000..d98b8f507
--- /dev/null
+++ b/games/NXDoom/src/i_video.h
@@ -0,0 +1,110 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __I_VIDEO__
+#define __I_VIDEO__
+
+#include "doomtype.h"
+
+// Screen width and height.
+
+#define SCREENWIDTH  320
+#define SCREENHEIGHT 200
+
+// Screen height used when aspect_ratio_correct=true.
+
+#define SCREENHEIGHT_4_3 240
+
+typedef boolean (*grabmouse_callback_t)(void);
+
+// Called by D_DoomMain,
+// determines the hardware configuration
+// and sets up the video mode
+void I_InitGraphics (void);
+
+void I_GraphicsCheckCommandLine(void);
+
+void I_ShutdownGraphics(void);
+
+// Takes full 8 bit values.
+void I_SetPalette (byte* palette);
+int I_GetPaletteIndex(int r, int g, int b);
+
+void I_UpdateNoBlit (void);
+void I_FinishUpdate (void);
+
+void I_ReadScreen (pixel_t* scr);
+
+void I_BeginRead (void);
+
+void I_SetWindowTitle(const char *title);
+
+void I_CheckIsScreensaver(void);
+void I_SetGrabMouseCallback(grabmouse_callback_t func);
+
+void I_DisplayFPSDots(boolean dots_on);
+void I_BindVideoVariables(void);
+
+void I_InitWindowTitle(void);
+void I_RegisterWindowIcon(const unsigned int *icon, int width, int height);
+void I_InitWindowIcon(void);
+
+// Called before processing any tics in a frame (just after displaying a frame).
+// Time consuming syncronous operations are performed here (joystick reading).
+
+void I_StartFrame (void);
+
+// Called before processing each tic in a frame.
+// Quick syncronous operations are performed here.
+
+void I_StartTic (void);
+
+// Enable the loading disk image displayed when reading from disk.
+
+void I_EnableLoadingDisk(int xoffs, int yoffs);
+
+extern char *video_driver;
+extern boolean screenvisible;
+
+extern int vanilla_keyboard_mapping;
+extern boolean screensaver_mode;
+extern int usegamma;
+extern pixel_t *I_VideoBuffer;
+
+extern int screen_width;
+extern int screen_height;
+extern int fullscreen;
+extern int aspect_ratio_correct;
+extern int integer_scaling;
+extern int smooth_pixel_scaling;
+extern int vga_porch_flash;
+extern int force_software_renderer;
+
+extern int png_screenshots;
+
+extern char *window_position;
+void I_GetWindowPosition(int *x, int *y, int w, int h);
+
+// Joystic/gamepad hysteresis
+extern unsigned int joywait;
+
+extern int usemouse;
+
+
+#endif
\ No newline at end of file
diff --git a/games/NXDoom/src/i_videohr.c b/games/NXDoom/src/i_videohr.c
new file mode 100644
index 000000000..08e230336
--- /dev/null
+++ b/games/NXDoom/src/i_videohr.c
@@ -0,0 +1,257 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     SDL emulation of VGA 640x480x4 planar video mode,
+//     for Hexen startup loading screen.
+//
+
+#include "SDL.h"
+#include "string.h"
+
+#include "doomtype.h"
+#include "i_timer.h"
+#include "i_video.h"
+
+// Palette fade-in takes two seconds
+
+#define FADE_TIME 2000
+
+#define HR_SCREENWIDTH 640
+#define HR_SCREENHEIGHT 480
+
+static SDL_Window *hr_screen = NULL;
+static SDL_Surface *hr_surface = NULL;
+static const char *window_title = "";
+
+boolean I_SetVideoModeHR(void)
+{
+    int x, y;
+
+    if (SDL_Init(SDL_INIT_VIDEO) < 0)
+    {
+        return false;
+    }
+
+    I_GetWindowPosition(&x, &y, HR_SCREENWIDTH, HR_SCREENHEIGHT);
+
+    // Create screen surface at the native desktop pixel depth (bpp=0),
+    // as we cannot trust true 8-bit to reliably work nowadays.
+    hr_screen = SDL_CreateWindow(window_title, x, y,
+        HR_SCREENWIDTH, HR_SCREENHEIGHT,
+        0);
+
+    if (hr_screen == NULL)
+    {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return false;
+    }
+
+    // We do all actual drawing into an intermediate surface.
+    hr_surface = SDL_CreateRGBSurface(0, HR_SCREENWIDTH, HR_SCREENHEIGHT,
+                                      8, 0, 0, 0, 0);
+
+    return true;
+}
+
+void I_SetWindowTitleHR(const char *title)
+{
+    window_title = title;
+}
+
+void I_UnsetVideoModeHR(void)
+{
+    if (hr_screen != NULL)
+    {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        hr_screen = NULL;
+        SDL_FreeSurface(hr_surface);
+        hr_surface = NULL;
+    }
+}
+
+void I_ClearScreenHR(void)
+{
+    SDL_Rect area = { 0, 0, HR_SCREENWIDTH, HR_SCREENHEIGHT };
+
+    SDL_FillRect(hr_surface, &area, 0);
+}
+
+void I_SlamBlockHR(int x, int y, int w, int h, const byte *src)
+{
+    SDL_Rect blit_rect;
+    const byte *srcptrs[4];
+    byte srcbits[4];
+    byte *dest;
+    int x1, y1;
+    int i;
+    int bit;
+
+    // Set up source pointers to read from source buffer - each 4-bit 
+    // pixel has its bits split into four sub-buffers
+
+    for (i=0; i<4; ++i)
+    {
+        srcptrs[i] = src + (i * w * h / 8);
+    }
+
+    if (SDL_LockSurface(hr_surface) < 0)
+    {
+        return;
+    }
+
+    // Draw each pixel
+
+    bit = 0;
+
+    for (y1=y; y1<y+h; ++y1)
+    {
+        dest = ((byte *) hr_surface->pixels) + y1 * hr_surface->pitch + x;
+
+        for (x1=x; x1<x+w; ++x1)
+        {
+            // Get the bits for this pixel
+            // For each bit, find the byte containing it, shift down
+            // and mask out the specific bit wanted.
+
+            for (i=0; i<4; ++i)
+            {
+                srcbits[i] = (srcptrs[i][bit / 8] >> (7 - (bit % 8))) & 0x1;
+            }
+
+            // Reassemble the pixel value
+
+            *dest = (srcbits[0] << 0) 
+                  | (srcbits[1] << 1)
+                  | (srcbits[2] << 2)
+                  | (srcbits[3] << 3);
+
+            // Next pixel!
+
+            ++dest;
+            ++bit;
+        }
+    }
+
+    SDL_UnlockSurface(hr_surface);
+
+    // Update the region we drew.
+    blit_rect.x = x;
+    blit_rect.y = y;
+    blit_rect.w = w;
+    blit_rect.h = h;
+    SDL_BlitSurface(hr_surface, &blit_rect,
+                    SDL_GetWindowSurface(hr_screen), &blit_rect);
+    SDL_UpdateWindowSurfaceRects(hr_screen, &blit_rect, 1);
+}
+
+void I_SlamHR(const byte *buffer)
+{
+    I_SlamBlockHR(0, 0, HR_SCREENWIDTH, HR_SCREENHEIGHT, buffer);
+}
+
+void I_InitPaletteHR(void)
+{
+    // ...
+}
+
+void I_SetPaletteHR(const byte *palette)
+{
+    SDL_Rect screen_rect = {0, 0, HR_SCREENWIDTH, HR_SCREENHEIGHT};
+    SDL_Color sdlpal[16];
+    int i;
+
+    for (i=0; i<16; ++i)
+    {
+        sdlpal[i].r = palette[i * 3 + 0] * 4;
+        sdlpal[i].g = palette[i * 3 + 1] * 4;
+        sdlpal[i].b = palette[i * 3 + 2] * 4;
+    }
+
+    // After setting colors, update the screen.
+    SDL_SetPaletteColors(hr_surface->format->palette, sdlpal, 0, 16);
+    SDL_BlitSurface(hr_surface, &screen_rect,
+                    SDL_GetWindowSurface(hr_screen), &screen_rect);
+    SDL_UpdateWindowSurfaceRects(hr_screen, &screen_rect, 1);
+}
+
+void I_FadeToPaletteHR(const byte *palette)
+{
+    byte tmppal[16 * 3];
+    int starttime;
+    int elapsed;
+    int i;
+
+    starttime = I_GetTimeMS();
+
+    for (;;)
+    {
+        elapsed = I_GetTimeMS() - starttime;
+
+        if (elapsed >= FADE_TIME)
+        {
+            break;
+        }
+
+        // Generate the fake palette
+
+        for (i=0; i<16 * 3; ++i) 
+        {
+            tmppal[i] = (palette[i] * elapsed) / FADE_TIME;
+        }
+
+        I_SetPaletteHR(tmppal);
+        SDL_UpdateWindowSurface(hr_screen);
+
+        // Sleep a bit
+
+        I_Sleep(10);
+    }
+
+    // Set the final palette
+
+    I_SetPaletteHR(palette);
+}
+
+void I_BlackPaletteHR(void)
+{
+    byte blackpal[16 * 3];
+
+    memset(blackpal, 0, sizeof(blackpal));
+
+    I_SetPaletteHR(blackpal);
+}
+
+// Check if the user has hit the escape key to abort startup.
+boolean I_CheckAbortHR(void)
+{
+    SDL_Event ev;
+    boolean result = false;
+
+    // Not initialized?
+    if (hr_surface == NULL)
+    {
+        return false;
+    }
+
+    while (SDL_PollEvent(&ev))
+    {
+        if (ev.type == SDL_KEYDOWN && ev.key.keysym.sym == SDLK_ESCAPE)
+        {
+            result = true;
+        }
+    }
+
+    return result;
+}
+
diff --git a/games/NXDoom/src/i_videohr.h b/games/NXDoom/src/i_videohr.h
new file mode 100644
index 000000000..d0a0dca50
--- /dev/null
+++ b/games/NXDoom/src/i_videohr.h
@@ -0,0 +1,35 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     SDL emulation of VGA 640x480x4 planar video mode,
+//     for Hexen startup loading screen.
+//
+
+#ifndef I_VIDEOHR_H
+#define I_VIDEOHR_H
+
+boolean I_SetVideoModeHR(void);
+void I_UnsetVideoModeHR(void);
+void I_SetWindowTitleHR(const char *title);
+void I_ClearScreenHR(void);
+void I_SlamBlockHR(int x, int y, int w, int h, const byte *src);
+void I_SlamHR(const byte *buffer);
+void I_InitPaletteHR(void);
+void I_SetPaletteHR(const byte *palette);
+void I_FadeToPaletteHR(const byte *palette);
+void I_BlackPaletteHR(void);
+boolean I_CheckAbortHR(void);
+
+#endif /* #ifndef I_VIDEOHR_H */
+
diff --git a/games/NXDoom/src/i_winmusic.c b/games/NXDoom/src/i_winmusic.c
new file mode 100644
index 000000000..6871fe224
--- /dev/null
+++ b/games/NXDoom/src/i_winmusic.c
@@ -0,0 +1,1920 @@
+//
+// Copyright(C) 2021-2022 Roman Fomin
+// Copyright(C) 2022 ceski
+//
+// 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.
+//
+// DESCRIPTION:
+//      Windows native MIDI
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <mmsystem.h>
+#include <mmreg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "doomtype.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "memio.h"
+#include "mus2mid.h"
+#include "midifile.h"
+#include "midifallback.h"
+
+enum
+{
+    COMP_VANILLA,
+    COMP_STANDARD,
+    COMP_FULL,
+};
+
+enum
+{
+    RESET_TYPE_NONE,
+    RESET_TYPE_GM,
+    RESET_TYPE_GS,
+    RESET_TYPE_XG,
+};
+
+char *winmm_midi_device = NULL;
+int winmm_complevel = COMP_VANILLA;
+int winmm_reset_type = RESET_TYPE_GM;
+int winmm_reset_delay = 0;
+
+static const byte gm_system_on[] = {
+    0xF0, 0x7E, 0x7F, 0x09, 0x01, 0xF7
+};
+
+static const byte gs_reset[] = {
+    0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7
+};
+
+static const byte xg_system_on[] = {
+    0xF0, 0x43, 0x10, 0x4C, 0x00, 0x00, 0x7E, 0x00, 0xF7
+};
+
+static const byte ff_loopStart[] = {'l', 'o', 'o', 'p', 'S', 't', 'a', 'r', 't'};
+static const byte ff_loopEnd[] = {'l', 'o', 'o', 'p', 'E', 'n', 'd'};
+
+static boolean use_fallback;
+
+#define DEFAULT_VOLUME 100
+static byte channel_volume[MIDI_CHANNELS_PER_TRACK];
+static float volume_factor = 0.0f;
+static boolean update_volume = false;
+
+typedef enum
+{
+    STATE_STARTUP,
+    STATE_SHUTDOWN,
+    STATE_EXIT,
+    STATE_STOPPING,
+    STATE_STOPPED,
+    STATE_PLAYING,
+    STATE_PAUSED
+} win_midi_state_t;
+
+static win_midi_state_t win_midi_state;
+
+static DWORD timediv;
+static DWORD tempo;
+
+static UINT MidiDevice;
+static HMIDISTRM hMidiStream;
+static MIDIHDR MidiStreamHdr;
+static HANDLE hBufferReturnEvent;
+static HANDLE hStoppedEvent;
+static HANDLE hPlayerThread;
+static CRITICAL_SECTION CriticalSection;
+
+#define EMIDI_DEVICE (1U << EMIDI_DEVICE_GENERAL_MIDI)
+
+// This is a reduced Windows MIDIEVENT structure for MEVT_F_SHORT
+// type of events.
+
+typedef struct
+{
+    DWORD dwDeltaTime;
+    DWORD dwStreamID; // always 0
+    DWORD dwEvent;
+} native_event_t;
+
+typedef struct
+{
+    midi_track_iter_t *iter;
+    unsigned int elapsed_time;
+    unsigned int saved_elapsed_time;
+    boolean end_of_track;
+    boolean saved_end_of_track;
+    unsigned int emidi_device_flags;
+    boolean emidi_designated;
+    boolean emidi_program;
+    boolean emidi_volume;
+    int emidi_loop_count;
+} win_midi_track_t;
+
+typedef struct
+{
+    win_midi_track_t *tracks;
+    unsigned int elapsed_time;
+    unsigned int saved_elapsed_time;
+    unsigned int num_tracks;
+    boolean registered;
+    boolean looping;
+    boolean ff_loop;
+    boolean ff_restart;
+    boolean rpg_loop;
+} win_midi_song_t;
+
+static win_midi_song_t song;
+
+#define BUFFER_INITIAL_SIZE 8192
+
+#define PLAYER_THREAD_WAIT_TIME 3000
+
+typedef struct
+{
+    byte *data;
+    unsigned int size;
+    unsigned int position;
+    boolean prepared;
+} buffer_t;
+
+static buffer_t buffer;
+
+// Maximum of 4 events in the buffer for faster volume updates.
+
+#define STREAM_MAX_EVENTS   4
+
+#define MAKE_EVT(a, b, c, d)                                                   \
+    ((DWORD)(a) | ((DWORD)(b) << 8) | ((DWORD)(c) << 16) | ((DWORD)(d) << 24))
+
+#define PADDED_SIZE(x) (((x) + sizeof(DWORD) - 1) & ~(sizeof(DWORD) - 1))
+
+// Check for midiStream errors.
+
+static void MidiError(const char *prefix, DWORD dwError)
+{
+    wchar_t werror[MAXERRORLENGTH];
+    MMRESULT mmr;
+
+    mmr = midiOutGetErrorTextW(dwError, (LPWSTR) werror, MAXERRORLENGTH);
+    if (mmr == MMSYSERR_NOERROR)
+    {
+        char *error = M_ConvertWideToUtf8(werror);
+        fprintf(stderr, "%s: %s.\n", prefix, error);
+        free(error);
+    }
+    else
+    {
+        fprintf(stderr, "%s: Unknown midiStream error.\n", prefix);
+    }
+}
+
+// midiStream callback.
+
+static void CALLBACK MidiStreamProc(HMIDIOUT hMidi, UINT uMsg,
+                                    DWORD_PTR dwInstance, DWORD_PTR dwParam1,
+                                    DWORD_PTR dwParam2)
+{
+    if (uMsg == MOM_DONE)
+    {
+        SetEvent(hBufferReturnEvent);
+    }
+}
+
+// Unprepare MIDI header. The calling thread must have exclusive access to the
+// shared resources in this function.
+
+static void UnprepareHeader(void)
+{
+    // Avoid ASan detection. Commentary by Microsoft: "It looks like
+    // midiOutPrepareHeader() allocates with HeapAlloc(), and then
+    // midiOutUnprepareHeader() deallocates with GlobalFree(GlobalHandle
+    // (...)). By design, this kind of allocator mismatch is an issue that ASan
+    // is designed to catch. It is theoretically possible for us to support
+    // this kind of code, but it’s not very high priority since it is undefined
+    // behavior, though it happens to work right now outside of ASan."
+    // https://developercommunity.visualstudio.com/t/1597288
+
+#ifndef __SANITIZE_ADDRESS__
+    MIDIHDR *hdr = &MidiStreamHdr;
+    MMRESULT mmr;
+
+    mmr = midiOutUnprepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR));
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiOutUnprepareHeader", mmr);
+    }
+#endif
+}
+
+// Allocate buffer. The calling thread must have exclusive access to the shared
+// resources in this function.
+
+static void AllocateBuffer(const unsigned int size)
+{
+    buffer.size = PADDED_SIZE(size);
+    buffer.data = I_Realloc(buffer.data, buffer.size);
+}
+
+// Pads the buffer with zeros so that an integral number of DWORDs are stored.
+// Required for long messages (SysEx). Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static void WriteBufferPad(void)
+{
+    unsigned int padding = PADDED_SIZE(buffer.position);
+    memset(buffer.data + buffer.position, 0, padding - buffer.position);
+    buffer.position = padding;
+}
+
+// Writes message data to buffer. Call this function from the MIDI thread only,
+// with exclusive access to shared resources.
+
+static void WriteBuffer(const byte *ptr, unsigned int size)
+{
+    if (buffer.prepared)
+    {
+        UnprepareHeader();
+        buffer.prepared = false;
+    }
+
+    if (buffer.position + size >= buffer.size)
+    {
+        AllocateBuffer(size + buffer.size * 2);
+    }
+
+    memcpy(buffer.data + buffer.position, ptr, size);
+    buffer.position += size;
+}
+
+// Streams out the current buffer. Call this function from the MIDI thread only,
+// with exclusive access to shared resources.
+
+static void StreamOut(void)
+{
+    MIDIHDR *hdr = &MidiStreamHdr;
+    MMRESULT mmr;
+
+    memset(hdr, 0, sizeof(*hdr));
+    hdr->lpData = (LPSTR)buffer.data;
+    hdr->dwBytesRecorded = buffer.position;
+    hdr->dwBufferLength = buffer.size;
+
+    // Reset buffer position even if midiStreamOut fails.
+    buffer.position = 0;
+
+    mmr = midiOutPrepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR));
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiOutPrepareHeader", mmr);
+        return;
+    }
+
+    buffer.prepared = true;
+
+    mmr = midiStreamOut(hMidiStream, hdr, sizeof(MIDIHDR));
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamOut", mmr);
+    }
+}
+
+// Writes a short MIDI message. Call this function from the MIDI thread only,
+// with exclusive access to shared resources.
+
+static void SendShortMsg(unsigned int delta_time, byte status, byte channel,
+                         byte param1, byte param2)
+{
+    native_event_t native_event;
+    native_event.dwDeltaTime = delta_time;
+    native_event.dwStreamID = 0;
+    native_event.dwEvent = MAKE_EVT(status | channel, param1, param2, MEVT_SHORTMSG);
+    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
+}
+
+// Writes a short MIDI message (from an event). Call this function from the MIDI
+// thread only, with exclusive access to shared resources.
+
+static void SendChannelMsg(unsigned int delta_time, const midi_event_t *event,
+                           boolean use_param2)
+{
+    SendShortMsg(delta_time, event->event_type, event->data.channel.channel,
+                 event->data.channel.param1,
+                 use_param2 ? event->data.channel.param2 : 0);
+}
+
+// Writes a long MIDI message (SysEx). Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static void SendLongMsg(unsigned int delta_time, const byte *ptr,
+                        unsigned int length)
+{
+    native_event_t native_event;
+    native_event.dwDeltaTime = delta_time;
+    native_event.dwStreamID = 0;
+    native_event.dwEvent = MAKE_EVT(length, 0, 0, MEVT_LONGMSG);
+    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
+    WriteBuffer(ptr, length);
+    WriteBufferPad();
+}
+
+// Writes an RPN message set to NULL (0x7F). Prevents accidental data entry.
+// Call this function from the MIDI thread only, with exclusive access to shared
+// resources.
+
+static void SendNullRPN(unsigned int delta_time, const midi_event_t *event)
+{
+    const byte channel = event->data.channel.channel;
+    SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER, channel,
+                 MIDI_CONTROLLER_RPN_LSB, MIDI_RPN_NULL);
+    SendShortMsg(0, MIDI_EVENT_CONTROLLER, channel,
+                 MIDI_CONTROLLER_RPN_MSB, MIDI_RPN_NULL);
+}
+
+// Writes a NOP message (ticks). Call this function from the MIDI thread only,
+// with exclusive access to shared resources.
+
+static void SendNOPMsg(unsigned int delta_time)
+{
+    native_event_t native_event;
+    native_event.dwDeltaTime = delta_time;
+    native_event.dwStreamID = 0;
+    native_event.dwEvent = MAKE_EVT(0, 0, 0, MEVT_NOP);
+    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
+}
+
+// Writes a NOP message (milliseconds). Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static void SendDelayMsg(unsigned int time_ms)
+{
+    // Convert ms to ticks (see "Standard MIDI Files 1.0" page 14).
+    const unsigned int ticks = (float) time_ms * 1000 * timediv / tempo + 0.5f;
+    SendNOPMsg(ticks);
+}
+
+// Writes a tempo MIDI meta message. Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static void UpdateTempo(unsigned int delta_time, const midi_event_t *event)
+{
+    native_event_t native_event;
+
+    tempo = MAKE_EVT(event->data.meta.data[2], event->data.meta.data[1],
+                     event->data.meta.data[0], 0);
+
+    native_event.dwDeltaTime = delta_time;
+    native_event.dwStreamID = 0;
+    native_event.dwEvent = MAKE_EVT(tempo, 0, 0, MEVT_TEMPO);
+    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
+}
+
+// Writes a MIDI volume message. The value is scaled by the volume slider. Call
+// this function from the MIDI thread only, with exclusive access to shared
+// resources.
+
+static void SendManualVolumeMsg(unsigned int delta_time, byte channel,
+                                byte volume)
+{
+    unsigned int scaled_volume;
+
+    scaled_volume = volume * volume_factor + 0.5f;
+
+    if (scaled_volume > 127)
+    {
+        scaled_volume = 127;
+    }
+
+    SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER, channel,
+                 MIDI_CONTROLLER_VOLUME_MSB, scaled_volume);
+
+    channel_volume[channel] = volume;
+}
+
+// Writes a MIDI volume message (from an event). The value is scaled by the
+// volume slider. Call this function from the MIDI thread only, with exclusive
+// access to shared resources.
+
+static void SendVolumeMsg(unsigned int delta_time, const midi_event_t *event)
+{
+    SendManualVolumeMsg(delta_time, event->data.channel.channel,
+                        event->data.channel.param2);
+}
+
+// Sets each channel to its saved volume level, scaled by the volume slider.
+// Call this function from the MIDI thread only, with exclusive access to shared
+// resources.
+
+static void UpdateVolume(void)
+{
+    int i;
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        SendManualVolumeMsg(0, i, channel_volume[i]);
+    }
+}
+
+// Sets each channel to the default volume level, scaled by the volume slider.
+// Call this function from the MIDI thread only, with exclusive access to shared
+// resources.
+
+static void ResetVolume(void)
+{
+    int i;
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        SendManualVolumeMsg(0, i, DEFAULT_VOLUME);
+    }
+}
+
+// Writes "notes off" and "sound off" messages for each channel. Some devices
+// may support only one or the other. Held notes (sustained, etc.) are released
+// to prevent hanging notes. Call this function from the MIDI thread only, with
+// exclusive access to shared resources.
+
+static void SendNotesSoundOff(void)
+{
+    int i;
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_ALL_NOTES_OFF, 0);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_ALL_SOUND_OFF, 0);
+    }
+}
+
+// Resets commonly used controllers. This is only for a reset type of "none" for
+// devices that don't support SysEx resets. Call this function from the MIDI
+// thread only, with exclusive access to shared resources.
+
+static void ResetControllers(void)
+{
+    int i;
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        // Reset commonly used controllers.
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RESET_ALL_CTRLS, 0);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_PAN, 64);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_BANK_SELECT_MSB, 0);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_BANK_SELECT_LSB, 0);
+        SendShortMsg(0, MIDI_EVENT_PROGRAM_CHANGE, i, 0, 0);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_REVERB, 40);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_CHORUS, 0);
+    }
+}
+
+// Resets the pitch bend sensitivity for each channel. This must be sent during
+// a reset due to an MS GS Wavetable Synth bug. Call this function from the MIDI
+// thread only, with exclusive access to shared resources.
+
+static void ResetPitchBendSensitivity(void)
+{
+    int i;
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+    {
+        // Set RPN MSB/LSB to pitch bend sensitivity.
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_LSB, 0);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_MSB, 0);
+
+        // Reset pitch bend sensitivity to +/- 2 semitones and 0 cents.
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_DATA_ENTRY_MSB, 2);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_DATA_ENTRY_LSB, 0);
+
+        // Set RPN MSB/LSB to null value after data entry.
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_LSB, 127);
+        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_MSB, 127);
+    }
+}
+
+// Resets the MIDI device. Call this function before each song starts and once
+// at shut down. Call this function from the MIDI thread only, with exclusive
+// access to shared resources.
+
+static void ResetDevice(void)
+{
+    MIDI_ResetFallback();
+    use_fallback = false;
+
+    switch (winmm_reset_type)
+    {
+        case RESET_TYPE_NONE:
+            ResetControllers();
+            break;
+
+        case RESET_TYPE_GS:
+            SendLongMsg(0, gs_reset, sizeof(gs_reset));
+            use_fallback = (winmm_complevel != COMP_VANILLA);
+            break;
+
+        case RESET_TYPE_XG:
+            SendLongMsg(0, xg_system_on, sizeof(xg_system_on));
+            break;
+
+        default:
+            SendLongMsg(0, gm_system_on, sizeof(gm_system_on));
+            break;
+    }
+
+    // MS GS Wavetable Synth doesn't reset pitch bend sensitivity.
+    ResetPitchBendSensitivity();
+
+    // Reset volume (initial playback or on shutdown if no SysEx reset).
+    // Scale by slider on initial playback, max on shutdown.
+    if (win_midi_state == STATE_STARTUP)
+    {
+        ResetVolume();
+    }
+    else if (winmm_reset_type == RESET_TYPE_NONE)
+    {
+        volume_factor = 1.0f;
+        ResetVolume();
+    }
+
+    // Send delay after reset. This is for hardware devices only (e.g. SC-55).
+    if (winmm_reset_delay > 0)
+    {
+        SendDelayMsg(winmm_reset_delay);
+    }
+}
+
+// Normally, volume is controlled by channel volume messages. Roland defined a
+// special SysEx message called "part level" that is equivalent to this. MS GS
+// Wavetable Synth ignores these messages, but other MIDI devices support them.
+// Returns true if there is a match. Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static boolean IsPartLevel(const byte *msg, unsigned int length)
+{
+    if (length == 10 &&
+        msg[0] == 0x41 && // Roland
+        msg[2] == 0x42 && // GS
+        msg[3] == 0x12 && // DT1
+        msg[4] == 0x40 && // Address MSB
+        msg[5] >= 0x10 && // Address
+        msg[5] <= 0x1F && // Address
+        msg[6] == 0x19 && // Address LSB
+        msg[9] == 0xF7)   // SysEx EOX
+    {
+        const byte checksum =
+            128 - ((int) msg[4] + msg[5] + msg[6] + msg[7]) % 128;
+
+        if (msg[8] == checksum)
+        {
+            // GS Part Level (aka Channel Volume)
+            // 41 <dev> 42 12 40 <ch> 19 <vol> <sum> F7
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Checks if the current SysEx message matches any known SysEx reset message.
+// Returns true if there is a match. Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static boolean IsSysExReset(const byte *msg, unsigned int length)
+{
+    if (length < 5)
+    {
+        return false;
+    }
+
+    switch (msg[0])
+    {
+        case 0x41: // Roland
+            switch (msg[2])
+            {
+                case 0x42: // GS
+                    switch (msg[3])
+                    {
+                        case 0x12: // DT1
+                            if (length == 10 &&
+                                msg[4] == 0x00 &&  // Address MSB
+                                msg[5] == 0x00 &&  // Address
+                                msg[6] == 0x7F &&  // Address LSB
+                              ((msg[7] == 0x00 &&  // Data     (MODE-1)
+                                msg[8] == 0x01) || // Checksum (MODE-1)
+                               (msg[7] == 0x01 &&  // Data     (MODE-2)
+                                msg[8] == 0x00)))  // Checksum (MODE-2)
+                            {
+                                // SC-88 System Mode Set
+                                // 41 <dev> 42 12 00 00 7F 00 01 F7 (MODE-1)
+                                // 41 <dev> 42 12 00 00 7F 01 00 F7 (MODE-2)
+                                return true;
+                            }
+                            else if (length == 10 &&
+                                     msg[4] == 0x40 && // Address MSB
+                                     msg[5] == 0x00 && // Address
+                                     msg[6] == 0x7F && // Address LSB
+                                     msg[7] == 0x00 && // Data (GS Reset)
+                                     msg[8] == 0x41)   // Checksum
+                            {
+                                // GS Reset
+                                // 41 <dev> 42 12 40 00 7F 00 41 F7
+                                return true;
+                            }
+                            break;
+                    }
+                    break;
+            }
+            break;
+
+        case 0x43: // Yamaha
+            switch (msg[2])
+            {
+                case 0x2B: // TG300
+                    if (length == 9 &&
+                        msg[3] == 0x00 && // Start Address b20 - b14
+                        msg[4] == 0x00 && // Start Address b13 - b7
+                        msg[5] == 0x7F && // Start Address b6 - b0
+                        msg[6] == 0x00 && // Data
+                        msg[7] == 0x01)   // Checksum
+                    {
+                        // TG300 All Parameter Reset
+                        // 43 <dev> 2B 00 00 7F 00 01 F7
+                        return true;
+                    }
+                    break;
+
+                case 0x4C: // XG
+                    if (length == 8 &&
+                        msg[3] == 0x00 &&  // Address High
+                        msg[4] == 0x00 &&  // Address Mid
+                       (msg[5] == 0x7E ||  // Address Low (System On)
+                        msg[5] == 0x7F) && // Address Low (All Parameter Reset)
+                        msg[6] == 0x00)    // Data
+                    {
+                        // XG System On, XG All Parameter Reset
+                        // 43 <dev> 4C 00 00 7E 00 F7
+                        // 43 <dev> 4C 00 00 7F 00 F7
+                        return true;
+                    }
+                    break;
+            }
+            break;
+
+        case 0x7E: // Universal Non-Real Time
+            switch (msg[2])
+            {
+                case 0x09: // General Midi
+                    if (length == 5 &&
+                       (msg[3] == 0x01 || // GM System On
+                        msg[3] == 0x02 || // GM System Off
+                        msg[3] == 0x03))  // GM2 System On
+                    {
+                        // GM System On/Off, GM2 System On
+                        // 7E <dev> 09 01 F7
+                        // 7E <dev> 09 02 F7
+                        // 7E <dev> 09 03 F7
+                        return true;
+                    }
+                    break;
+            }
+            break;
+    }
+    return false;
+}
+
+// Writes a MIDI SysEx message. Call this function from the MIDI thread only,
+// with exclusive access to shared resources.
+
+static void SendSysExMsg(unsigned int delta_time, const midi_event_t *event)
+{
+    native_event_t native_event;
+    const byte event_type = MIDI_EVENT_SYSEX;
+    const byte *data = event->data.sysex.data;
+    const unsigned int length = event->data.sysex.length;
+
+    if (IsPartLevel(data, length))
+    {
+        byte channel;
+
+        // Convert "block number" to a channel number.
+        if (data[5] == 0x10) // Channel 10
+        {
+            channel = 9;
+        }
+        else if (data[5] < 0x1A) // Channels 1-9
+        {
+            channel = (data[5] & 0x0F) - 1;
+        }
+        else // Channels 11-16
+        {
+            channel = data[5] & 0x0F;
+        }
+
+        // Replace SysEx part level message with channel volume message.
+        SendManualVolumeMsg(delta_time, channel, data[7]);
+        return;
+    }
+
+    // Send the SysEx message.
+    native_event.dwDeltaTime = delta_time;
+    native_event.dwStreamID = 0;
+    native_event.dwEvent = MAKE_EVT(length + sizeof(byte), 0, 0, MEVT_LONGMSG);
+    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
+    WriteBuffer(&event_type, sizeof(byte));
+    WriteBuffer(data, length);
+    WriteBufferPad();
+
+    if (IsSysExReset(data, length))
+    {
+        // SysEx reset also resets volume. Take the default channel volumes
+        // and scale them by the user's volume slider.
+        ResetVolume();
+
+        // Disable instrument fallback and give priority to MIDI file. Fallback
+        // assumes GS (SC-55 level) and the MIDI file could be GM, GM2, XG, or
+        // GS (SC-88 or higher). Preserve the composer's intent.
+        if (use_fallback)
+        {
+            MIDI_ResetFallback();
+            use_fallback = false;
+        }
+    }
+}
+
+// Writes a MIDI program change message. If applicable, emulates capital tone
+// fallback to fix invalid instruments. Call this function from the MIDI thread
+// only, with exclusive access to shared resources.
+
+static void SendProgramMsg(unsigned int delta_time, byte channel, byte program,
+                           const midi_fallback_t *fallback)
+{
+    switch ((int)fallback->type)
+    {
+        case FALLBACK_BANK_MSB:
+            SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER, channel,
+                         MIDI_CONTROLLER_BANK_SELECT_MSB, fallback->value);
+            SendShortMsg(0, MIDI_EVENT_PROGRAM_CHANGE, channel, program, 0);
+            break;
+
+        case FALLBACK_DRUMS:
+            SendShortMsg(delta_time, MIDI_EVENT_PROGRAM_CHANGE, channel,
+                         fallback->value, 0);
+            break;
+
+        default:
+            SendShortMsg(delta_time, MIDI_EVENT_PROGRAM_CHANGE, channel,
+                         program, 0);
+            break;
+    }
+}
+
+// Sets a Final Fantasy or RPG Maker loop point. Call this function from the
+// MIDI thread only, with exclusive access to shared resources.
+
+static void SetLoopPoint(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < song.num_tracks; ++i)
+    {
+        MIDI_SetLoopPoint(song.tracks[i].iter);
+        song.tracks[i].saved_end_of_track = song.tracks[i].end_of_track;
+        song.tracks[i].saved_elapsed_time = song.tracks[i].elapsed_time;
+    }
+    song.saved_elapsed_time = song.elapsed_time;
+}
+
+// Checks if the MIDI meta message contains a Final Fantasy loop marker. Call
+// this function from the MIDI thread only, with exclusive access to shared
+// resources.
+
+static void CheckFFLoop(const midi_event_t *event)
+{
+    if (event->data.meta.length == sizeof(ff_loopStart) &&
+        !memcmp(event->data.meta.data, ff_loopStart, sizeof(ff_loopStart)))
+    {
+        SetLoopPoint();
+        song.ff_loop = true;
+    }
+    else if (song.ff_loop && event->data.meta.length == sizeof(ff_loopEnd) &&
+             !memcmp(event->data.meta.data, ff_loopEnd, sizeof(ff_loopEnd)))
+    {
+        song.ff_restart = true;
+    }
+}
+
+// Writes an EMIDI message. Call this function from the MIDI thread only, with
+// exclusive access to shared resources.
+
+static void SendEMIDI(unsigned int delta_time, const midi_event_t *event,
+                      win_midi_track_t *track, const midi_fallback_t *fallback)
+{
+    unsigned int i;
+    unsigned int flag;
+    int count;
+
+    switch (event->data.channel.param1)
+    {
+        case EMIDI_CONTROLLER_TRACK_DESIGNATION:
+            if (track->elapsed_time < timediv)
+            {
+                flag = event->data.channel.param2;
+
+                if (flag == EMIDI_DEVICE_ALL)
+                {
+                    track->emidi_device_flags = UINT_MAX;
+                    track->emidi_designated = true;
+                }
+                else if (flag <= EMIDI_DEVICE_ULTRASOUND)
+                {
+                    track->emidi_device_flags |= 1U << flag;
+                    track->emidi_designated = true;
+                }
+            }
+            SendNOPMsg(delta_time);
+            break;
+
+        case EMIDI_CONTROLLER_TRACK_EXCLUSION:
+            if (song.rpg_loop)
+            {
+                SetLoopPoint();
+            }
+            else if (track->elapsed_time < timediv)
+            {
+                flag = event->data.channel.param2;
+
+                if (!track->emidi_designated)
+                {
+                    track->emidi_device_flags = UINT_MAX;
+                    track->emidi_designated = true;
+                }
+
+                if (flag <= EMIDI_DEVICE_ULTRASOUND)
+                {
+                    track->emidi_device_flags &= ~(1U << flag);
+                }
+            }
+            SendNOPMsg(delta_time);
+            break;
+
+        case EMIDI_CONTROLLER_PROGRAM_CHANGE:
+            if (track->emidi_program || track->elapsed_time < timediv)
+            {
+                track->emidi_program = true;
+                SendProgramMsg(delta_time, event->data.channel.channel,
+                               event->data.channel.param2, fallback);
+            }
+            else
+            {
+                SendNOPMsg(delta_time);
+            }
+            break;
+
+        case EMIDI_CONTROLLER_VOLUME:
+            if (track->emidi_volume || track->elapsed_time < timediv)
+            {
+                track->emidi_volume = true;
+                SendVolumeMsg(delta_time, event);
+            }
+            else
+            {
+                SendNOPMsg(delta_time);
+            }
+            break;
+
+        case EMIDI_CONTROLLER_LOOP_BEGIN:
+            count = event->data.channel.param2;
+            count = (count == 0) ? (-1) : count;
+            track->emidi_loop_count = count;
+            MIDI_SetLoopPoint(track->iter);
+            SendNOPMsg(delta_time);
+            break;
+
+        case EMIDI_CONTROLLER_LOOP_END:
+            if (event->data.channel.param2 == EMIDI_LOOP_FLAG)
+            {
+                if (track->emidi_loop_count != 0)
+                {
+                    MIDI_RestartAtLoopPoint(track->iter);
+                }
+
+                if (track->emidi_loop_count > 0)
+                {
+                    track->emidi_loop_count--;
+                }
+            }
+            SendNOPMsg(delta_time);
+            break;
+
+        case EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN:
+            count = event->data.channel.param2;
+            count = (count == 0) ? (-1) : count;
+            for (i = 0; i < song.num_tracks; ++i)
+            {
+                song.tracks[i].emidi_loop_count = count;
+                MIDI_SetLoopPoint(song.tracks[i].iter);
+                song.tracks[i].saved_end_of_track = song.tracks[i].end_of_track;
+                song.tracks[i].saved_elapsed_time = song.tracks[i].elapsed_time;
+            }
+            song.saved_elapsed_time = song.elapsed_time;
+            SendNOPMsg(delta_time);
+            break;
+
+        case EMIDI_CONTROLLER_GLOBAL_LOOP_END:
+            if (event->data.channel.param2 == EMIDI_LOOP_FLAG)
+            {
+                for (i = 0; i < song.num_tracks; ++i)
+                {
+                    if (song.tracks[i].emidi_loop_count != 0)
+                    {
+                        MIDI_RestartAtLoopPoint(song.tracks[i].iter);
+                        song.tracks[i].end_of_track =
+                            song.tracks[i].saved_end_of_track;
+                        song.tracks[i].elapsed_time =
+                            song.tracks[i].saved_elapsed_time;
+                        song.elapsed_time = song.saved_elapsed_time;
+                    }
+
+                    if (song.tracks[i].emidi_loop_count > 0)
+                    {
+                        song.tracks[i].emidi_loop_count--;
+                    }
+                }
+            }
+            SendNOPMsg(delta_time);
+            break;
+    }
+}
+
+// Writes a MIDI meta message. Call this function from the MIDI thread only,
+// with exclusive access to shared resources.
+
+static void SendMetaMsg(unsigned int delta_time, const midi_event_t *event,
+                        win_midi_track_t *track)
+{
+    switch (event->data.meta.type)
+    {
+        case MIDI_META_END_OF_TRACK:
+            track->end_of_track = true;
+            SendNOPMsg(delta_time);
+            break;
+
+        case MIDI_META_SET_TEMPO:
+            UpdateTempo(delta_time, event);
+            break;
+
+        case MIDI_META_MARKER:
+            if (winmm_complevel != COMP_VANILLA)
+            {
+                CheckFFLoop(event);
+            }
+            SendNOPMsg(delta_time);
+            break;
+
+        default:
+            SendNOPMsg(delta_time);
+            break;
+    }
+}
+
+// AddToBuffer function for vanilla (DMX MPU-401) compatibility level. Do not
+// call this function directly. See the AddToBuffer function pointer.
+
+static boolean AddToBuffer_Vanilla(unsigned int delta_time,
+                                   const midi_event_t *event,
+                                   win_midi_track_t *track)
+{
+    switch ((int) event->event_type)
+    {
+        case MIDI_EVENT_SYSEX:
+            SendNOPMsg(delta_time);
+            return false;
+
+        case MIDI_EVENT_META:
+            SendMetaMsg(delta_time, event, track);
+            break;
+
+        case MIDI_EVENT_CONTROLLER:
+            switch (event->data.channel.param1)
+            {
+                case MIDI_CONTROLLER_BANK_SELECT_MSB:
+                case MIDI_CONTROLLER_BANK_SELECT_LSB:
+                    // DMX has broken bank select support and runs in GM mode.
+                    SendChannelMsg(delta_time, event, false);
+                    break;
+
+                case MIDI_CONTROLLER_MODULATION:
+                case MIDI_CONTROLLER_PAN:
+                case MIDI_CONTROLLER_EXPRESSION:
+                case MIDI_CONTROLLER_HOLD1_PEDAL:
+                case MIDI_CONTROLLER_SOFT_PEDAL:
+                case MIDI_CONTROLLER_REVERB:
+                case MIDI_CONTROLLER_CHORUS:
+                case MIDI_CONTROLLER_ALL_SOUND_OFF:
+                case MIDI_CONTROLLER_ALL_NOTES_OFF:
+                    SendChannelMsg(delta_time, event, true);
+                    break;
+
+                case MIDI_CONTROLLER_VOLUME_MSB:
+                    SendVolumeMsg(delta_time, event);
+                    break;
+
+                case MIDI_CONTROLLER_RESET_ALL_CTRLS:
+                    // MS GS Wavetable Synth resets volume if param2 isn't zero.
+                    SendChannelMsg(delta_time, event, false);
+                    break;
+
+                default:
+                    SendNOPMsg(delta_time);
+                    break;
+            }
+            break;
+
+        case MIDI_EVENT_NOTE_OFF:
+        case MIDI_EVENT_NOTE_ON:
+        case MIDI_EVENT_PITCH_BEND:
+            SendChannelMsg(delta_time, event, true);
+            break;
+
+        case MIDI_EVENT_PROGRAM_CHANGE:
+            SendChannelMsg(delta_time, event, false);
+            break;
+
+        default:
+            SendNOPMsg(delta_time);
+            break;
+    }
+
+    return true;
+}
+
+// AddToBuffer function for standard and full MIDI compatibility levels. Do not
+// call this function directly. See the AddToBuffer function pointer.
+
+static boolean AddToBuffer_Standard(unsigned int delta_time,
+                                    const midi_event_t *event,
+                                    win_midi_track_t *track)
+{
+    midi_fallback_t fallback = {FALLBACK_NONE, 0};
+
+    if (use_fallback)
+    {
+        MIDI_CheckFallback(event, &fallback, winmm_complevel == COMP_FULL);
+    }
+
+    switch ((int) event->event_type)
+    {
+        case MIDI_EVENT_SYSEX:
+            if (winmm_complevel == COMP_FULL)
+            {
+                SendSysExMsg(delta_time, event);
+            }
+            else
+            {
+                SendNOPMsg(delta_time);
+            }
+            return false;
+
+        case MIDI_EVENT_META:
+            SendMetaMsg(delta_time, event, track);
+            return true;
+    }
+
+    if (track->emidi_designated && (EMIDI_DEVICE & ~track->emidi_device_flags))
+    {
+        // Send NOP if this device has been excluded from this track.
+        SendNOPMsg(delta_time);
+        return true;
+    }
+
+    switch ((int) event->event_type)
+    {
+        case MIDI_EVENT_CONTROLLER:
+            switch (event->data.channel.param1)
+            {
+                case MIDI_CONTROLLER_BANK_SELECT_MSB:
+                case MIDI_CONTROLLER_MODULATION:
+                case MIDI_CONTROLLER_DATA_ENTRY_MSB:
+                case MIDI_CONTROLLER_PAN:
+                case MIDI_CONTROLLER_EXPRESSION:
+                case MIDI_CONTROLLER_DATA_ENTRY_LSB:
+                case MIDI_CONTROLLER_HOLD1_PEDAL:
+                case MIDI_CONTROLLER_SOFT_PEDAL:
+                case MIDI_CONTROLLER_REVERB:
+                case MIDI_CONTROLLER_CHORUS:
+                case MIDI_CONTROLLER_ALL_SOUND_OFF:
+                case MIDI_CONTROLLER_ALL_NOTES_OFF:
+                case MIDI_CONTROLLER_POLY_MODE_OFF:
+                case MIDI_CONTROLLER_POLY_MODE_ON:
+                    SendChannelMsg(delta_time, event, true);
+                    break;
+
+                case MIDI_CONTROLLER_VOLUME_MSB:
+                    if (track->emidi_volume)
+                    {
+                        SendNOPMsg(delta_time);
+                    }
+                    else
+                    {
+                        SendVolumeMsg(delta_time, event);
+                    }
+                    break;
+
+                case MIDI_CONTROLLER_VOLUME_LSB:
+                    SendNOPMsg(delta_time);
+                    break;
+
+                case MIDI_CONTROLLER_BANK_SELECT_LSB:
+                    SendChannelMsg(delta_time, event,
+                                   fallback.type != FALLBACK_BANK_LSB);
+                    break;
+
+                case MIDI_CONTROLLER_NRPN_LSB:
+                case MIDI_CONTROLLER_NRPN_MSB:
+                    if (winmm_complevel == COMP_FULL)
+                    {
+                        SendChannelMsg(delta_time, event, true);
+                    }
+                    else
+                    {
+                        // MS GS Wavetable Synth nulls RPN for any NRPN.
+                        SendNullRPN(delta_time, event);
+                    }
+                    break;
+
+                case MIDI_CONTROLLER_RPN_LSB:
+                    switch (event->data.channel.param2)
+                    {
+                        case MIDI_RPN_PITCH_BEND_SENS_LSB:
+                        case MIDI_RPN_FINE_TUNING_LSB:
+                        case MIDI_RPN_COARSE_TUNING_LSB:
+                        case MIDI_RPN_NULL:
+                            SendChannelMsg(delta_time, event, true);
+                            break;
+
+                        default:
+                            if (winmm_complevel == COMP_FULL)
+                            {
+                                SendChannelMsg(delta_time, event, true);
+                            }
+                            else
+                            {
+                                // MS GS Wavetable Synth ignores other RPNs.
+                                SendNullRPN(delta_time, event);
+                            }
+                            break;
+                    }
+                    break;
+
+                case MIDI_CONTROLLER_RPN_MSB:
+                    switch (event->data.channel.param2)
+                    {
+                        case MIDI_RPN_MSB:
+                        case MIDI_RPN_NULL:
+                            SendChannelMsg(delta_time, event, true);
+                            break;
+
+                        default:
+                            if (winmm_complevel == COMP_FULL)
+                            {
+                                SendChannelMsg(delta_time, event, true);
+                            }
+                            else
+                            {
+                                // MS GS Wavetable Synth ignores other RPNs.
+                                SendNullRPN(delta_time, event);
+                            }
+                            break;
+                    }
+                    break;
+
+                case EMIDI_CONTROLLER_TRACK_DESIGNATION:
+                case EMIDI_CONTROLLER_TRACK_EXCLUSION:
+                case EMIDI_CONTROLLER_PROGRAM_CHANGE:
+                case EMIDI_CONTROLLER_VOLUME:
+                case EMIDI_CONTROLLER_LOOP_BEGIN:
+                case EMIDI_CONTROLLER_LOOP_END:
+                case EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN:
+                case EMIDI_CONTROLLER_GLOBAL_LOOP_END:
+                    SendEMIDI(delta_time, event, track, &fallback);
+                    break;
+
+                case MIDI_CONTROLLER_RESET_ALL_CTRLS:
+                    // MS GS Wavetable Synth resets volume if param2 isn't zero.
+                    SendChannelMsg(delta_time, event, false);
+                    break;
+
+                default:
+                    if (winmm_complevel == COMP_FULL)
+                    {
+                        SendChannelMsg(delta_time, event, true);
+                    }
+                    else
+                    {
+                        SendNOPMsg(delta_time);
+                    }
+                    break;
+            }
+            break;
+
+        case MIDI_EVENT_NOTE_OFF:
+        case MIDI_EVENT_NOTE_ON:
+        case MIDI_EVENT_PITCH_BEND:
+            SendChannelMsg(delta_time, event, true);
+            break;
+
+        case MIDI_EVENT_PROGRAM_CHANGE:
+            if (track->emidi_program)
+            {
+                SendNOPMsg(delta_time);
+            }
+            else
+            {
+                SendProgramMsg(delta_time, event->data.channel.channel,
+                               event->data.channel.param1, &fallback);
+            }
+            break;
+
+        case MIDI_EVENT_AFTERTOUCH:
+            if (winmm_complevel == COMP_FULL)
+            {
+                SendChannelMsg(delta_time, event, true);
+            }
+            else
+            {
+                SendNOPMsg(delta_time);
+            }
+            break;
+
+        case MIDI_EVENT_CHAN_AFTERTOUCH:
+            if (winmm_complevel == COMP_FULL)
+            {
+                SendChannelMsg(delta_time, event, false);
+            }
+            else
+            {
+                SendNOPMsg(delta_time);
+            }
+            break;
+
+        default:
+            SendNOPMsg(delta_time);
+            break;
+    }
+
+    return true;
+}
+
+// Function pointer determined by the desired MIDI compatibility level. Set
+// during initialization by the main thread, then called from the MIDI thread
+// only. The calling thread must have exclusive access to the shared resources
+// in this function.
+
+static boolean (*AddToBuffer)(unsigned int delta_time,
+                              const midi_event_t *event,
+                              win_midi_track_t *track) = AddToBuffer_Vanilla;
+
+// Restarts a song that uses a Final Fantasy or RPG Maker loop point. Call this
+// function from the MIDI thread only, with exclusive access to shared
+// resources.
+
+static void RestartLoop(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < song.num_tracks; ++i)
+    {
+        MIDI_RestartAtLoopPoint(song.tracks[i].iter);
+        song.tracks[i].end_of_track = song.tracks[i].saved_end_of_track;
+        song.tracks[i].elapsed_time = song.tracks[i].saved_elapsed_time;
+    }
+    song.elapsed_time = song.saved_elapsed_time;
+}
+
+// Restarts a song that uses standard looping. Call this function from the MIDI
+// thread only, with exclusive access to shared resources.
+
+static void RestartTracks(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < song.num_tracks; ++i)
+    {
+        MIDI_RestartIterator(song.tracks[i].iter);
+        song.tracks[i].elapsed_time = 0;
+        song.tracks[i].end_of_track = false;
+        song.tracks[i].emidi_device_flags = 0;
+        song.tracks[i].emidi_designated = false;
+        song.tracks[i].emidi_program = false;
+        song.tracks[i].emidi_volume = false;
+        song.tracks[i].emidi_loop_count = 0;
+    }
+    song.elapsed_time = 0;
+}
+
+// The controllers "EMIDI track exclusion" and "RPG Maker loop point" share the
+// same number (CC#111) and are not compatible with each other. As a workaround,
+// allow an RPG Maker loop point only if no other EMIDI events are present. Call
+// this function from the MIDI thread only, before the song starts, with
+// exclusive access to shared resources.
+
+static boolean IsRPGLoop(void)
+{
+    unsigned int i;
+    unsigned int num_rpg_events = 0;
+    unsigned int num_emidi_events = 0;
+    midi_event_t *event = NULL;
+
+    for (i = 0; i < song.num_tracks; ++i)
+    {
+        while (MIDI_GetNextEvent(song.tracks[i].iter, &event))
+        {
+            if (event->event_type == MIDI_EVENT_CONTROLLER)
+            {
+                switch (event->data.channel.param1)
+                {
+                    case EMIDI_CONTROLLER_TRACK_EXCLUSION:
+                        num_rpg_events++;
+                        break;
+
+                    case EMIDI_CONTROLLER_TRACK_DESIGNATION:
+                    case EMIDI_CONTROLLER_PROGRAM_CHANGE:
+                    case EMIDI_CONTROLLER_VOLUME:
+                    case EMIDI_CONTROLLER_LOOP_BEGIN:
+                    case EMIDI_CONTROLLER_LOOP_END:
+                    case EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN:
+                    case EMIDI_CONTROLLER_GLOBAL_LOOP_END:
+                        num_emidi_events++;
+                        break;
+                }
+            }
+        }
+
+        MIDI_RestartIterator(song.tracks[i].iter);
+    }
+
+    return (num_rpg_events == 1 && num_emidi_events == 0);
+}
+
+// Fills the output buffer with events from the current song and then streams it
+// out. Call this function from the MIDI thread only, with exclusive access to
+// shared resources.
+
+static void FillBuffer(void)
+{
+    unsigned int i;
+    int num_events;
+
+    for (num_events = 0; num_events < STREAM_MAX_EVENTS; )
+    {
+        midi_event_t *event = NULL;
+        win_midi_track_t *track = NULL;
+        unsigned int min_time = UINT_MAX;
+        unsigned int delta_time;
+
+        // Find next event across all tracks.
+        for (i = 0; i < song.num_tracks; ++i)
+        {
+            if (!song.tracks[i].end_of_track)
+            {
+                unsigned int time = song.tracks[i].elapsed_time +
+                                    MIDI_GetDeltaTime(song.tracks[i].iter);
+                if (time < min_time)
+                {
+                    min_time = time;
+                    track = &song.tracks[i];
+                }
+            }
+        }
+
+        // No more events. Restart or stop song.
+        if (track == NULL)
+        {
+            if (song.elapsed_time)
+            {
+                if (song.ff_restart || song.rpg_loop)
+                {
+                    song.ff_restart = false;
+                    RestartLoop();
+                    continue;
+                }
+                else if (song.looping)
+                {
+                    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
+                    {
+                        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RESET_ALL_CTRLS, 0);
+                    }
+                    RestartTracks();
+                    continue;
+                }
+            }
+            break;
+        }
+
+        track->elapsed_time = min_time;
+        delta_time = min_time - song.elapsed_time;
+        song.elapsed_time = min_time;
+
+        if (!MIDI_GetNextEvent(track->iter, &event))
+        {
+            track->end_of_track = true;
+            continue;
+        }
+
+        // Restart FF loop after sending all events that share same timediv.
+        if (song.ff_restart && MIDI_GetDeltaTime(track->iter) > 0)
+        {
+            song.ff_restart = false;
+            RestartLoop();
+            continue;
+        }
+
+        if (!AddToBuffer(delta_time, event, track))
+        {
+            StreamOut();
+            return;
+        }
+
+        num_events++;
+    }
+
+    if (num_events)
+    {
+        StreamOut();
+    }
+}
+
+// The Windows API documentation states: "Applications should not call any
+// multimedia functions from inside the callback function, as doing so can
+// cause a deadlock." We use a thread to avoid possible deadlocks.
+
+static DWORD WINAPI PlayerProc(void)
+{
+    boolean keep_going = true;
+
+    while (keep_going)
+    {
+        if (WaitForSingleObject(hBufferReturnEvent, INFINITE) != WAIT_OBJECT_0)
+        {
+            continue;
+        }
+
+        // The MIDI thread must have exclusive access to shared resources until
+        // the end of the current loop iteration or when the thread exits.
+        EnterCriticalSection(&CriticalSection);
+
+        switch (win_midi_state)
+        {
+            case STATE_STARTUP:
+                ResetDevice();
+                StreamOut();
+                song.rpg_loop = IsRPGLoop();
+                win_midi_state = STATE_PLAYING;
+                break;
+
+            case STATE_SHUTDOWN:
+                // Send notes/sound off prior to reset to prevent volume spikes.
+                SendNotesSoundOff();
+                ResetDevice();
+                StreamOut();
+                win_midi_state = STATE_EXIT;
+                break;
+
+            case STATE_EXIT:
+                keep_going = false;
+                break;
+
+            case STATE_PLAYING:
+                if (update_volume)
+                {
+                    UpdateVolume();
+                    StreamOut();
+                    update_volume = false;
+                    break;
+                }
+                FillBuffer();
+                break;
+
+            case STATE_STOPPING:
+                // Send notes/sound off to prevent hanging notes.
+                SendNotesSoundOff();
+                StreamOut();
+                win_midi_state = STATE_STOPPED;
+                break;
+
+            case STATE_STOPPED:
+                SetEvent(hStoppedEvent);
+                break;
+
+            case STATE_PAUSED:
+                break;
+        }
+
+        LeaveCriticalSection(&CriticalSection);
+    }
+
+    return 0;
+}
+
+// Restarts the MIDI stream. Call this function from the main thread only, with
+// exclusive access to shared resources.
+
+static void StreamStart(void)
+{
+    MMRESULT mmr;
+
+    SetEvent(hBufferReturnEvent);
+
+    mmr = midiStreamRestart(hMidiStream);
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamRestart", mmr);
+    }
+}
+
+// Turns off notes but does not release all held ones (use SendNotesSoundOff()
+// to prevent hanging notes). The output buffer is returned to the callback
+// function and flagged as MHDR_DONE. Call this function from the main thread
+// only, with exclusive access to shared resources.
+
+static void StreamStop(void)
+{
+    MMRESULT mmr;
+
+    mmr = midiStreamStop(hMidiStream);
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamStop", mmr);
+    }
+
+    ResetEvent(hBufferReturnEvent);
+    ResetEvent(hStoppedEvent);
+}
+
+static boolean I_WIN_InitMusic(void)
+{
+    const int all_devices = midiOutGetNumDevs();
+    int i;
+    MMRESULT mmr;
+
+    if (winmm_midi_device == NULL)
+    {
+        winmm_midi_device = M_StringDuplicate("");
+    }
+
+    for (i = 0; i < all_devices; i++)
+    {
+        MIDIOUTCAPS caps;
+
+        if (midiOutGetDevCaps(i, &caps, sizeof(caps)) == MMSYSERR_NOERROR &&
+            !strncasecmp(winmm_midi_device, caps.szPname, MAXPNAMELEN))
+        {
+            MidiDevice = i;
+            break;
+        }
+    }
+
+    if (i == all_devices)
+    {
+        free(winmm_midi_device);
+        winmm_midi_device = M_StringDuplicate("Microsoft MIDI Mapper");
+        MidiDevice = MIDI_MAPPER;
+    }
+
+    mmr = midiStreamOpen(&hMidiStream, &MidiDevice, (DWORD)1,
+                         (DWORD_PTR)MidiStreamProc, (DWORD_PTR)NULL,
+                         CALLBACK_FUNCTION);
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamOpen", mmr);
+        hMidiStream = NULL;
+        return false;
+    }
+
+    AllocateBuffer(BUFFER_INITIAL_SIZE);
+
+    hBufferReturnEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+    hStoppedEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+    hPlayerThread =
+        CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) PlayerProc, 0, 0, 0);
+    SetThreadPriority(hPlayerThread, THREAD_PRIORITY_TIME_CRITICAL);
+    InitializeCriticalSectionAndSpinCount(&CriticalSection, 1024);
+
+    AddToBuffer = (winmm_complevel == COMP_VANILLA) ? AddToBuffer_Vanilla
+                                                    : AddToBuffer_Standard;
+    MIDI_InitFallback();
+
+    return true;
+}
+
+static void I_WIN_SetMusicVolume(int volume)
+{
+    static int last_volume = -1;
+
+    if (last_volume == volume)
+    {
+        // Ignore holding key down in volume menu.
+        return;
+    }
+    last_volume = volume;
+
+    EnterCriticalSection(&CriticalSection);
+    volume_factor = sqrtf((float)volume / 120);
+    update_volume = song.registered;
+    LeaveCriticalSection(&CriticalSection);
+}
+
+static void I_WIN_StopSong(void)
+{
+    if (!hMidiStream)
+    {
+        return;
+    }
+
+    EnterCriticalSection(&CriticalSection);
+    StreamStop();
+    win_midi_state = STATE_STOPPING;
+    StreamStart();
+    LeaveCriticalSection(&CriticalSection);
+
+    WaitForSingleObject(hStoppedEvent, PLAYER_THREAD_WAIT_TIME);
+    StreamStop();
+}
+
+static void I_WIN_PlaySong(void *handle, boolean looping)
+{
+    if (!hMidiStream)
+    {
+        return;
+    }
+
+    EnterCriticalSection(&CriticalSection);
+    song.looping = looping;
+    win_midi_state = STATE_STARTUP;
+    StreamStart();
+    LeaveCriticalSection(&CriticalSection);
+}
+
+static void I_WIN_PauseSong(void)
+{
+    if (!hMidiStream)
+    {
+        return;
+    }
+
+    I_WIN_StopSong();
+
+    EnterCriticalSection(&CriticalSection);
+    win_midi_state = STATE_PAUSED;
+    LeaveCriticalSection(&CriticalSection);
+}
+
+static void I_WIN_ResumeSong(void)
+{
+    if (!hMidiStream)
+    {
+        return;
+    }
+
+    EnterCriticalSection(&CriticalSection);
+    if (win_midi_state == STATE_PAUSED)
+    {
+        win_midi_state = STATE_PLAYING;
+        StreamStart();
+    }
+    LeaveCriticalSection(&CriticalSection);
+}
+
+// Determine whether memory block is a .mid file 
+
+static boolean IsMid(byte *mem, int len)
+{
+    return len > 4 && !memcmp(mem, "MThd", 4);
+}
+
+static boolean ConvertMus(byte *musdata, int len, const char *filename)
+{
+    MEMFILE *instream;
+    MEMFILE *outstream;
+    void *outbuf;
+    size_t outbuf_len;
+    int result;
+
+    instream = mem_fopen_read(musdata, len);
+    outstream = mem_fopen_write();
+
+    result = mus2mid(instream, outstream);
+
+    if (result == 0)
+    {
+        mem_get_buf(outstream, &outbuf, &outbuf_len);
+
+        M_WriteFile(filename, outbuf, outbuf_len);
+    }
+
+    mem_fclose(instream);
+    mem_fclose(outstream);
+
+    return result;
+}
+
+static void *I_WIN_RegisterSong(void *data, int len)
+{
+    unsigned int i;
+    char *filename;
+    midi_file_t *file;
+
+    MIDIPROPTIMEDIV prop_timediv;
+    MIDIPROPTEMPO prop_tempo;
+    MMRESULT mmr;
+
+    if (!hMidiStream)
+    {
+        return NULL;
+    }
+
+    // MUS files begin with "MUS"
+    // Reject anything which doesnt have this signature
+
+    filename = M_TempFile("doom.mid");
+
+    if (IsMid(data, len))
+    {
+        M_WriteFile(filename, data, len);
+    }
+    else
+    {
+        // Assume a MUS file and try to convert
+
+        ConvertMus(data, len, filename);
+    }
+
+    file = MIDI_LoadFile(filename);
+
+    M_remove(filename);
+    free(filename);
+
+    if (file == NULL)
+    {
+        fprintf(stderr, "I_WIN_RegisterSong: Failed to load MID.\n");
+        return NULL;
+    }
+
+    prop_timediv.cbStruct = sizeof(MIDIPROPTIMEDIV);
+    prop_timediv.dwTimeDiv = MIDI_GetFileTimeDivision(file);
+    mmr = midiStreamProperty(hMidiStream, (LPBYTE)&prop_timediv,
+                             MIDIPROP_SET | MIDIPROP_TIMEDIV);
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamProperty", mmr);
+        return NULL;
+    }
+    timediv = prop_timediv.dwTimeDiv;
+
+    // Set initial tempo.
+    prop_tempo.cbStruct = sizeof(MIDIPROPTIMEDIV);
+    prop_tempo.dwTempo = 500000; // 120 BPM
+    mmr = midiStreamProperty(hMidiStream, (LPBYTE)&prop_tempo,
+                             MIDIPROP_SET | MIDIPROP_TEMPO);
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamProperty", mmr);
+        return NULL;
+    }
+    tempo = prop_tempo.dwTempo;
+
+    song.num_tracks = MIDI_NumTracks(file);
+    song.tracks = calloc(song.num_tracks, sizeof(win_midi_track_t));
+    for (i = 0; i < song.num_tracks; ++i)
+    {
+        song.tracks[i].iter = MIDI_IterateTrack(file, i);
+    }
+    song.registered = true;
+
+    return file;
+}
+
+static void I_WIN_UnRegisterSong(void *handle)
+{
+    if (!hMidiStream)
+    {
+        return;
+    }
+
+    if (song.tracks)
+    {
+        unsigned int i;
+        for (i = 0; i < song.num_tracks; ++i)
+        {
+            MIDI_FreeIterator(song.tracks[i].iter);
+            song.tracks[i].iter = NULL;
+        }
+        free(song.tracks);
+        song.tracks = NULL;
+    }
+    if (handle)
+    {
+        MIDI_FreeFile(handle);
+    }
+    song.elapsed_time = 0;
+    song.saved_elapsed_time = 0;
+    song.num_tracks = 0;
+    song.registered = false;
+    song.looping = false;
+    song.ff_loop = false;
+    song.ff_restart = false;
+    song.rpg_loop = false;
+}
+
+static void I_WIN_ShutdownMusic(void)
+{
+    MMRESULT mmr;
+
+    if (!hMidiStream)
+    {
+        return;
+    }
+
+    EnterCriticalSection(&CriticalSection);
+    StreamStop();
+    I_WIN_UnRegisterSong(NULL);
+    win_midi_state = STATE_SHUTDOWN;
+    StreamStart();
+    LeaveCriticalSection(&CriticalSection);
+
+    if (WaitForSingleObject(hPlayerThread, PLAYER_THREAD_WAIT_TIME) ==
+        WAIT_OBJECT_0)
+    {
+        CloseHandle(hPlayerThread);
+        hPlayerThread = NULL;
+    }
+    StreamStop();
+
+    if (buffer.prepared)
+    {
+        UnprepareHeader();
+        buffer.prepared = false;
+    }
+
+    mmr = midiStreamClose(hMidiStream);
+    if (mmr != MMSYSERR_NOERROR)
+    {
+        MidiError("midiStreamClose", mmr);
+    }
+    hMidiStream = NULL;
+
+    free(buffer.data);
+    buffer.data = NULL;
+    buffer.size = 0;
+    buffer.position = 0;
+
+    CloseHandle(hBufferReturnEvent);
+    CloseHandle(hStoppedEvent);
+    DeleteCriticalSection(&CriticalSection);
+}
+
+static boolean I_WIN_MusicIsPlaying(void)
+{
+    return (song.num_tracks > 0);
+}
+
+static const snddevice_t music_win_devices[] =
+{
+    SNDDEVICE_PAS,
+    SNDDEVICE_WAVEBLASTER,
+    SNDDEVICE_SOUNDCANVAS,
+    SNDDEVICE_GENMIDI,
+    SNDDEVICE_AWE32,
+};
+
+const music_module_t music_win_module =
+{
+    music_win_devices,
+    arrlen(music_win_devices),
+    I_WIN_InitMusic,
+    I_WIN_ShutdownMusic,
+    I_WIN_SetMusicVolume,
+    I_WIN_PauseSong,
+    I_WIN_ResumeSong,
+    I_WIN_RegisterSong,
+    I_WIN_UnRegisterSong,
+    I_WIN_PlaySong,
+    I_WIN_StopSong,
+    I_WIN_MusicIsPlaying,
+    NULL,  // Poll
+};
+
+#endif
diff --git a/games/NXDoom/src/m_argv.c b/games/NXDoom/src/m_argv.c
new file mode 100644
index 000000000..724a42b67
--- /dev/null
+++ b/games/NXDoom/src/m_argv.c
@@ -0,0 +1,556 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL_stdinc.h"
+
+#include "doomtype.h"
+#include "d_iwad.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "m_argv.h"  // haleyjd 20110212: warning fix
+
+int		myargc;
+char**		myargv;
+
+
+
+
+//
+// M_CheckParm
+// Checks for the given parameter
+// in the program's command line arguments.
+// Returns the argument number (1 to argc-1)
+// or 0 if not present
+//
+
+int M_CheckParmWithArgs(const char *check, int num_args)
+{
+    int i;
+
+    // Check if myargv[i] has been set to NULL in LoadResponseFile(),
+    // which may call I_Error(), which in turn calls M_ParmExists("-nogui").
+
+    for (i = 1; i < myargc - num_args && myargv[i]; i++)
+    {
+	if (!strcasecmp(check, myargv[i]))
+	    return i;
+    }
+
+    return 0;
+}
+
+//
+// M_ParmExists
+//
+// Returns true if the given parameter exists in the program's command
+// line arguments, false if not.
+//
+
+boolean M_ParmExists(const char *check)
+{
+    return M_CheckParm(check) != 0;
+}
+
+int M_CheckParm(const char *check)
+{
+    return M_CheckParmWithArgs(check, 0);
+}
+
+#define MAXARGVS        100
+
+static void LoadResponseFile(int argv_index, const char *filename)
+{
+    FILE *handle;
+    int size;
+    char *infile;
+    char *file;
+    char **newargv;
+    int newargc;
+    int i, k;
+
+    // Read the response file into memory
+    handle = M_fopen(filename, "rb");
+
+    if (handle == NULL)
+    {
+        printf ("\nNo such response file!");
+        exit(1);
+    }
+
+    printf("Found response file %s!\n", filename);
+
+    size = M_FileLength(handle);
+
+    // Read in the entire file
+    // Allocate one byte extra - this is in case there is an argument
+    // at the end of the response file, in which case a '\0' will be
+    // needed.
+
+    file = malloc(size + 1);
+
+    i = 0;
+
+    while (i < size)
+    {
+        k = fread(file + i, 1, size - i, handle);
+
+        if (k < 0)
+        {
+            I_Error("Failed to read full contents of '%s'", filename);
+        }
+
+        i += k;
+    }
+
+    fclose(handle);
+
+    // Create new arguments list array
+
+    newargv = malloc(sizeof(char *) * MAXARGVS);
+    newargc = 0;
+    memset(newargv, 0, sizeof(char *) * MAXARGVS);
+
+    // Copy all the arguments in the list up to the response file
+
+    if (argv_index >= MAXARGVS)
+    {
+        I_Error("Too many arguments up to the response file!");
+    }
+
+    for (i=0; i<argv_index; ++i)
+    {
+        newargv[i] = myargv[i];
+        myargv[i] = NULL;
+        ++newargc;
+    }
+
+    infile = file;
+    k = 0;
+
+    while(k < size)
+    {
+        // Skip past space characters to the next argument
+
+        while(k < size && isspace(infile[k]))
+        {
+            ++k;
+        }
+
+        if (k >= size)
+        {
+            break;
+        }
+
+        // If the next argument is enclosed in quote marks, treat
+        // the contents as a single argument.  This allows long filenames
+        // to be specified.
+
+        if (infile[k] == '\"')
+        {
+            char *argstart;
+            // Skip the first character(")
+            ++k;
+
+            argstart = &infile[k];
+
+            // Read all characters between quotes
+
+            while (k < size && infile[k] != '\"' && infile[k] != '\n')
+            {
+                ++k;
+            }
+
+            if (k >= size || infile[k] == '\n')
+            {
+                I_Error("Quotes unclosed in response file '%s'",
+                        filename);
+            }
+
+            // Cut off the string at the closing quote
+
+            infile[k] = '\0';
+            ++k;
+
+            if (newargc >= MAXARGVS)
+            {
+                I_Error("Too many arguments in the response file!");
+            }
+
+            newargv[newargc++] = M_StringDuplicate(argstart);
+        }
+        else
+        {
+            char *argstart;
+            // Read in the next argument until a space is reached
+
+            argstart = &infile[k];
+
+            while(k < size && !isspace(infile[k]))
+            {
+                ++k;
+            }
+
+            // Cut off the end of the argument at the first space
+
+            infile[k] = '\0';
+            ++k;
+
+            if (newargc >= MAXARGVS)
+            {
+                I_Error("Too many arguments in the response file!");
+            }
+
+            newargv[newargc++] = M_StringDuplicate(argstart);
+        }
+    }
+
+    // Add arguments following the response file argument
+
+    if (newargc + myargc - (argv_index + 1) >= MAXARGVS)
+    {
+        I_Error("Too many arguments following the response file!");
+    }
+
+    for (i=argv_index + 1; i<myargc; ++i)
+    {
+        newargv[newargc] = myargv[i];
+        myargv[i] = NULL;
+        ++newargc;
+    }
+
+    // Free any old strings in myargv which were not moved to newargv
+    for (i = 0; i < myargc; ++i)
+    {
+        if (myargv[i] != NULL)
+        {
+            free(myargv[i]);
+            myargv[i] = NULL;
+        }
+    }
+
+    free(myargv);
+    myargv = newargv;
+    myargc = newargc;
+
+    free(file);
+
+#if 0
+    // Disabled - Vanilla Doom does not do this.
+    // Display arguments
+
+    printf("%d command-line args:\n", myargc);
+
+    for (k=1; k<myargc; k++)
+    {
+        printf("'%s'\n", myargv[k]);
+    }
+#endif
+}
+
+//
+// Find a Response File
+//
+
+void M_FindResponseFile(void)
+{
+    int i;
+
+    for (i = 1; i < myargc; i++)
+    {
+        if (myargv[i][0] == '@')
+        {
+            LoadResponseFile(i, myargv[i] + 1);
+        }
+    }
+
+    for (;;)
+    {
+        //!
+        // @arg <file>
+        //
+        // Load extra command-line arguments from the given response
+        // file.  Arguments read from the file are inserted into the
+        // command line, replacing this argument.  A response file can
+        // also be loaded using the abbreviated syntax '@file.rsp'.
+        //
+        i = M_CheckParmWithArgs("-response", 1);
+        if (i <= 0)
+        {
+            break;
+        }
+        // Replace the -response argument so that the next time through
+        // the loop we'll ignore it. Since some parameters stop reading when
+        // an argument beginning with a '-' is encountered, we keep something
+        // that starts with a '-'.
+        free(myargv[i]);
+        myargv[i] = M_StringDuplicate("-_");
+        LoadResponseFile(i + 1, myargv[i + 1]);
+    }
+}
+
+#if defined(_WIN32)
+enum
+{
+    FILETYPE_UNKNOWN = 0x0,
+    FILETYPE_IWAD =    0x2,
+    FILETYPE_PWAD =    0x4,
+    FILETYPE_DEH =     0x8,
+    FILETYPE_DEMO =    0x10,
+};
+
+static boolean FileIsDemoLump(const char *filename)
+{
+    FILE *handle;
+    int count, ver;
+    byte buf[12], *p = buf;
+
+    handle = M_fopen(filename, "rb");
+
+    if (handle == NULL)
+    {
+        return false;
+    }
+
+    count = fread(buf, 1, sizeof(buf), handle);
+    fclose(handle);
+
+    if (count != sizeof(buf))
+    {
+        return false;
+    }
+
+    ver = *p++;
+
+    if (ver >= 0 && ver <= 4) // v1.0/v1.1/v1.2
+    {
+        p--;
+    }
+    else
+    {
+        switch (ver)
+        {
+            case 104: // v1.4
+            case 105: // v1.5
+            case 106: // v1.6/v1.666
+            case 107: // v1.7/v1.7a
+            case 108: // v1.8
+            case 109: // v1.9
+            case 111: // v1.91 hack
+                break;
+            default:
+                return false;
+                break;
+        }
+    }
+
+    if (*p++ > 5) // skill
+    {
+        return false;
+    }
+    if (*p++ > 9) // episode
+    {
+        return false;
+    }
+    if (*p++ > 99) // map
+    {
+        return false;
+    }
+
+    return true;
+}
+
+static int GuessFileType(const char *name)
+{
+    int ret = FILETYPE_UNKNOWN;
+    const char *base;
+    char *lower;
+    static boolean iwad_found = false, demo_found = false;
+
+    base = M_BaseName(name);
+    lower = M_StringDuplicate(base);
+    M_ForceLowercase(lower);
+
+    // only ever add one argument to the -iwad parameter
+
+    if (iwad_found == false && D_IsIWADName(lower))
+    {
+        ret = FILETYPE_IWAD;
+        iwad_found = true;
+    }
+    else if (M_StringEndsWith(lower, ".wad"))
+    {
+        ret = FILETYPE_PWAD;
+    }
+    else if (M_StringEndsWith(lower, ".lmp"))
+    {
+        // only ever add one argument to the -playdemo parameter
+
+        if (demo_found == false && FileIsDemoLump(name))
+        {
+            ret = FILETYPE_DEMO;
+            demo_found = true;
+        }
+        else
+        {
+            ret = FILETYPE_PWAD;
+        }
+    }
+    else if (M_StringEndsWith(lower, ".deh") ||
+//           M_StringEndsWith(lower, ".bex") ||
+             M_StringEndsWith(lower, ".hhe") ||
+             M_StringEndsWith(lower, ".seh"))
+    {
+        ret = FILETYPE_DEH;
+    }
+
+    free(lower);
+
+    return ret;
+}
+
+typedef struct
+{
+    char *str;
+    int type, stable;
+} argument_t;
+
+static int CompareByFileType(const void *a, const void *b)
+{
+    const argument_t *arg_a = (const argument_t *) a;
+    const argument_t *arg_b = (const argument_t *) b;
+
+    const int ret = arg_a->type - arg_b->type;
+
+    return ret ? ret : (arg_a->stable - arg_b->stable);
+}
+
+void M_AddLooseFiles(void)
+{
+    int i, types = 0;
+    char **newargv;
+    argument_t *arguments;
+
+    if (myargc < 2)
+    {
+        return;
+    }
+
+    // allocate space for up to four additional regular parameters
+    // (-iwad, -merge, -deh, -playdemo)
+
+    arguments = malloc((myargc + 4) * sizeof(*arguments));
+    memset(arguments, 0, (myargc + 4) * sizeof(*arguments));
+
+    // check the command line and make sure it does not already
+    // contain any regular parameters or response files
+    // but only fully-qualified LFS or UNC file paths
+
+    for (i = 1; i < myargc; i++)
+    {
+        char *arg = myargv[i];
+        int type;
+
+        if (strlen(arg) < 3 ||
+            arg[0] == '-' ||
+            arg[0] == '@' ||
+            ((!isalpha(arg[0]) || arg[1] != ':' || arg[2] != '\\') &&
+            (arg[0] != '\\' || arg[1] != '\\')))
+        {
+            free(arguments);
+            return;
+        }
+
+        type = GuessFileType(arg);
+        arguments[i].str = arg;
+        arguments[i].type = type;
+        arguments[i].stable = i;
+        types |= type;
+    }
+
+    // add space for one additional regular parameter
+    // for each discovered file type in the new argument  list
+    // and sort parameters right before their corresponding file paths
+
+    if (types & FILETYPE_IWAD)
+    {
+        arguments[myargc].str = M_StringDuplicate("-iwad");
+        arguments[myargc].type = FILETYPE_IWAD - 1;
+        myargc++;
+    }
+    if (types & FILETYPE_PWAD)
+    {
+        arguments[myargc].str = M_StringDuplicate("-merge");
+        arguments[myargc].type = FILETYPE_PWAD - 1;
+        myargc++;
+    }
+    if (types & FILETYPE_DEH)
+    {
+        arguments[myargc].str = M_StringDuplicate("-deh");
+        arguments[myargc].type = FILETYPE_DEH - 1;
+        myargc++;
+    }
+    if (types & FILETYPE_DEMO)
+    {
+        arguments[myargc].str = M_StringDuplicate("-playdemo");
+        arguments[myargc].type = FILETYPE_DEMO - 1;
+        myargc++;
+    }
+
+    newargv = malloc(myargc * sizeof(*newargv));
+
+    // sort the argument list by file type, except for the zeroth argument
+    // which is the executable invocation itself
+
+    SDL_qsort(arguments + 1, myargc - 1, sizeof(*arguments), CompareByFileType);
+
+    newargv[0] = myargv[0];
+
+    for (i = 1; i < myargc; i++)
+    {
+        newargv[i] = arguments[i].str;
+    }
+
+    free(arguments);
+
+    free(myargv);
+    myargv = newargv;
+}
+#endif
+
+// Return the name of the executable used to start the program:
+
+const char *M_GetExecutableName(void)
+{
+    return M_BaseName(myargv[0]);
+}
+
+char *exedir = NULL;
+
+void M_SetExeDir(void)
+{
+    char *dirname;
+
+    dirname = M_DirName(myargv[0]);
+    exedir = M_StringJoin(dirname, DIR_SEPARATOR_S, NULL);
+    free(dirname);
+}
diff --git a/games/NXDoom/src/m_argv.h b/games/NXDoom/src/m_argv.h
new file mode 100644
index 000000000..b42f11cd4
--- /dev/null
+++ b/games/NXDoom/src/m_argv.h
@@ -0,0 +1,53 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Nil.
+//    
+
+
+#ifndef __M_ARGV__
+#define __M_ARGV__
+
+#include "doomtype.h"
+
+//
+// MISC
+//
+extern  int	myargc;
+extern  char**	myargv;
+
+extern char *exedir;
+void M_SetExeDir(void);
+
+// Returns the position of the given parameter
+// in the arg list (0 if not found).
+int M_CheckParm (const char* check);
+
+// Same as M_CheckParm, but checks that num_args arguments are available
+// following the specified argument.
+int M_CheckParmWithArgs(const char *check, int num_args);
+
+void M_FindResponseFile(void);
+void M_AddLooseFiles(void);
+
+// Parameter has been specified?
+
+boolean M_ParmExists(const char *check);
+
+// Get name of executable used to run this program:
+
+const char *M_GetExecutableName(void);
+
+#endif
diff --git a/games/NXDoom/src/m_bbox.c b/games/NXDoom/src/m_bbox.c
new file mode 100644
index 000000000..fb3f270d1
--- /dev/null
+++ b/games/NXDoom/src/m_bbox.c
@@ -0,0 +1,54 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Main loop menu stuff.
+//	Random number LUT.
+//	Default Config File.
+//	PCX Screenshots.
+//
+
+
+
+#include "m_bbox.h"
+
+
+
+
+void M_ClearBox (fixed_t *box)
+{
+    box[BOXTOP] = box[BOXRIGHT] = INT_MIN;
+    box[BOXBOTTOM] = box[BOXLEFT] = INT_MAX;
+}
+
+void
+M_AddToBox
+( fixed_t*	box,
+  fixed_t	x,
+  fixed_t	y )
+{
+    if (x<box[BOXLEFT])
+	box[BOXLEFT] = x;
+    else if (x>box[BOXRIGHT])
+	box[BOXRIGHT] = x;
+    if (y<box[BOXBOTTOM])
+	box[BOXBOTTOM] = y;
+    else if (y>box[BOXTOP])
+	box[BOXTOP] = y;
+}
+
+
+
+
+
diff --git a/games/NXDoom/src/m_bbox.h b/games/NXDoom/src/m_bbox.h
new file mode 100644
index 000000000..5a7af57c4
--- /dev/null
+++ b/games/NXDoom/src/m_bbox.h
@@ -0,0 +1,47 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    Nil.
+//    
+
+
+#ifndef __M_BBOX__
+#define __M_BBOX__
+
+#include <limits.h>
+
+#include "m_fixed.h"
+
+
+// Bounding box coordinate storage.
+enum
+{
+    BOXTOP,
+    BOXBOTTOM,
+    BOXLEFT,
+    BOXRIGHT
+};	// bbox coordinates
+
+// Bounding box functions.
+void M_ClearBox (fixed_t*	box);
+
+void
+M_AddToBox
+( fixed_t*	box,
+  fixed_t	x,
+  fixed_t	y );
+
+
+#endif
diff --git a/games/NXDoom/src/m_cheat.c b/games/NXDoom/src/m_cheat.c
new file mode 100644
index 000000000..1565f9ef5
--- /dev/null
+++ b/games/NXDoom/src/m_cheat.c
@@ -0,0 +1,89 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Cheat sequence checking.
+//
+
+
+
+#include <string.h>
+
+#include "doomtype.h"
+#include "m_cheat.h"
+
+//
+// CHEAT SEQUENCE PACKAGE
+//
+
+//
+// Called in st_stuff module, which handles the input.
+// Returns a 1 if the cheat was successful, 0 if failed.
+//
+int
+cht_CheckCheat
+( cheatseq_t*	cht,
+  char		key )
+{
+    // if we make a short sequence on a cheat with parameters, this 
+    // will not work in vanilla doom.  behave the same.
+
+    if (cht->parameter_chars > 0 && strlen(cht->sequence) < cht->sequence_len)
+        return false;
+    
+    if (cht->chars_read < strlen(cht->sequence))
+    {
+        // still reading characters from the cheat code
+        // and verifying.  reset back to the beginning 
+        // if a key is wrong
+
+        if (key == cht->sequence[cht->chars_read])
+            ++cht->chars_read;
+        else
+            cht->chars_read = 0;
+        
+        cht->param_chars_read = 0;
+    }
+    else if (cht->param_chars_read < cht->parameter_chars)
+    {
+        // we have passed the end of the cheat sequence and are 
+        // entering parameters now 
+        
+        cht->parameter_buf[cht->param_chars_read] = key;
+        
+        ++cht->param_chars_read;
+    }
+
+    if (cht->chars_read >= strlen(cht->sequence)
+     && cht->param_chars_read >= cht->parameter_chars)
+    {
+        cht->chars_read = cht->param_chars_read = 0;
+
+        return true;
+    }
+    
+    // cheat not matched yet
+
+    return false;
+}
+
+void
+cht_GetParam
+( cheatseq_t*	cht,
+  char*		buffer )
+{
+    memcpy(buffer, cht->parameter_buf, cht->parameter_chars);
+}
+
+
diff --git a/games/NXDoom/src/m_cheat.h b/games/NXDoom/src/m_cheat.h
new file mode 100644
index 000000000..6775e709e
--- /dev/null
+++ b/games/NXDoom/src/m_cheat.h
@@ -0,0 +1,62 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Cheat code checking.
+//
+
+
+#ifndef __M_CHEAT__
+#define __M_CHEAT__
+
+//
+// CHEAT SEQUENCE PACKAGE
+//
+
+// declaring a cheat
+
+#define CHEAT(value, parameters) \
+    { value, sizeof(value) - 1, parameters, 0, 0, "" }
+
+#define MAX_CHEAT_LEN 25
+#define MAX_CHEAT_PARAMS 5
+
+typedef struct
+{
+    // settings for this cheat
+
+    char sequence[MAX_CHEAT_LEN];
+    size_t sequence_len;
+    int parameter_chars;
+
+    // state used during the game
+
+    size_t chars_read;
+    int param_chars_read;
+    char parameter_buf[MAX_CHEAT_PARAMS];
+} cheatseq_t;
+
+int
+cht_CheckCheat
+( cheatseq_t*		cht,
+  char			key );
+
+
+void
+cht_GetParam
+( cheatseq_t*		cht,
+  char*			buffer );
+
+
+#endif
diff --git a/games/NXDoom/src/m_config.c b/games/NXDoom/src/m_config.c
new file mode 100644
index 000000000..e1a0260a2
--- /dev/null
+++ b/games/NXDoom/src/m_config.c
@@ -0,0 +1,2811 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    Configuration file interface.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <assert.h>
+#include <locale.h>
+
+#include "SDL_filesystem.h"
+
+#include "config.h"
+
+#include "doomtype.h"
+#include "doomkeys.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+
+#include "z_zone.h"
+
+//
+// DEFAULTS
+//
+
+// Location where all configuration data is stored - 
+// default.cfg, savegames, etc.
+
+const char *configdir;
+
+static char *autoload_path = "";
+
+// Default filenames for configuration files.
+
+static const char *default_main_config;
+static const char *default_extra_config;
+
+typedef enum 
+{
+    DEFAULT_INT,
+    DEFAULT_INT_HEX,
+    DEFAULT_STRING,
+    DEFAULT_FLOAT,
+    DEFAULT_KEY,
+} default_type_t;
+
+typedef struct
+{
+    // Name of the variable
+    const char *name;
+
+    // Pointer to the location in memory of the variable
+    union {
+        int *i;
+        char **s;
+        float *f;
+    } location;
+
+    // Type of the variable
+    default_type_t type;
+
+    // If this is a key value, the original integer scancode we read from
+    // the config file before translating it to the internal key value.
+    // If zero, we didn't read this value from a config file.
+    int untranslated;
+
+    // The value we translated the scancode into when we read the 
+    // config file on startup.  If the variable value is different from
+    // this, it has been changed and needs to be converted; otherwise,
+    // use the 'untranslated' value.
+    int original_translated;
+
+    // If true, this config variable has been bound to a variable
+    // and is being used.
+    boolean bound;
+} default_t;
+
+typedef struct
+{
+    default_t *defaults;
+    int numdefaults;
+    const char *filename;
+} default_collection_t;
+
+#define CONFIG_VARIABLE_GENERIC(name, type) \
+    { #name, {NULL}, type, 0, 0, false }
+
+#define CONFIG_VARIABLE_KEY(name) \
+    CONFIG_VARIABLE_GENERIC(name, DEFAULT_KEY)
+#define CONFIG_VARIABLE_INT(name) \
+    CONFIG_VARIABLE_GENERIC(name, DEFAULT_INT)
+#define CONFIG_VARIABLE_INT_HEX(name) \
+    CONFIG_VARIABLE_GENERIC(name, DEFAULT_INT_HEX)
+#define CONFIG_VARIABLE_FLOAT(name) \
+    CONFIG_VARIABLE_GENERIC(name, DEFAULT_FLOAT)
+#define CONFIG_VARIABLE_STRING(name) \
+    CONFIG_VARIABLE_GENERIC(name, DEFAULT_STRING)
+
+//! @begin_config_file default
+
+static default_t	doom_defaults_list[] =
+{
+    //!
+    // Mouse sensitivity.  This value is used to multiply input mouse
+    // movement to control the effect of moving the mouse.
+    //
+    // The "normal" maximum value available for this through the
+    // in-game options menu is 9. A value of 31 or greater will cause
+    // the game to crash when entering the options menu.
+    //
+
+    CONFIG_VARIABLE_INT(mouse_sensitivity),
+
+    //!
+    // Volume of sound effects, range 0-15.
+    //
+
+    CONFIG_VARIABLE_INT(sfx_volume),
+
+    //!
+    // Volume of in-game music, range 0-15.
+    //
+
+    CONFIG_VARIABLE_INT(music_volume),
+
+    //!
+    // @game strife
+    //
+    // If non-zero, dialogue text is displayed over characters' pictures
+    // when engaging actors who have voices.
+    //
+
+    CONFIG_VARIABLE_INT(show_talk),
+
+    //!
+    // @game strife
+    //
+    // Volume of voice sound effects, range 0-15.
+    //
+
+    CONFIG_VARIABLE_INT(voice_volume),
+
+    //!
+    // @game doom
+    //
+    // If non-zero, messages are displayed on the heads-up display
+    // in the game ("picked up a clip", etc).  If zero, these messages
+    // are not displayed.
+    //
+
+    CONFIG_VARIABLE_INT(show_messages),
+
+    //!
+    // Keyboard key to turn right.
+    //
+
+    CONFIG_VARIABLE_KEY(key_right),
+
+    //!
+    // Keyboard key to turn left.
+    //
+
+    CONFIG_VARIABLE_KEY(key_left),
+
+    //!
+    // Keyboard key to move forward.
+    //
+
+    CONFIG_VARIABLE_KEY(key_up),
+
+    //!
+    // Keyboard key to move backward.
+    //
+
+    CONFIG_VARIABLE_KEY(key_down),
+
+    //!
+    // Keyboard key to strafe left.
+    //
+
+    CONFIG_VARIABLE_KEY(key_strafeleft),
+
+    //!
+    // Keyboard key to strafe right.
+    //
+
+    CONFIG_VARIABLE_KEY(key_straferight),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to use health.
+    //
+
+    CONFIG_VARIABLE_KEY(key_useHealth),
+
+    //!
+    // @game hexen
+    //
+    // Keyboard key to jump.
+    //
+
+    CONFIG_VARIABLE_KEY(key_jump),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to fly upward.
+    //
+
+    CONFIG_VARIABLE_KEY(key_flyup),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to fly downwards.
+    //
+
+    CONFIG_VARIABLE_KEY(key_flydown),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to center flying.
+    //
+
+    CONFIG_VARIABLE_KEY(key_flycenter),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to look up.
+    //
+
+    CONFIG_VARIABLE_KEY(key_lookup),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to look down.
+    //
+
+    CONFIG_VARIABLE_KEY(key_lookdown),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to center the view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_lookcenter),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to query inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invquery),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to display mission objective.
+    //
+
+    CONFIG_VARIABLE_KEY(key_mission),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to display inventory popup.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invPop),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to display keys popup.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invKey),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to jump to start of inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invHome),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to jump to end of inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invEnd),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to scroll left in the inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invleft),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to scroll right in the inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invright),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to scroll left in the inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invLeft),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to scroll right in the inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invRight),
+
+    //!
+    // @game heretic hexen
+    //
+    // Keyboard key to use the current item in the inventory.
+    //
+
+    CONFIG_VARIABLE_KEY(key_useartifact),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to use inventory item.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invUse),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to drop an inventory item.
+    //
+
+    CONFIG_VARIABLE_KEY(key_invDrop),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to look up.
+    //
+
+    CONFIG_VARIABLE_KEY(key_lookUp),
+
+    //!
+    // @game strife
+    //
+    // Keyboard key to look down.
+    //
+
+    CONFIG_VARIABLE_KEY(key_lookDown),
+
+    //!
+    // Keyboard key to fire the currently selected weapon.
+    //
+
+    CONFIG_VARIABLE_KEY(key_fire),
+
+    //!
+    // Keyboard key to "use" an object, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_KEY(key_use),
+
+    //!
+    // Keyboard key to turn on strafing.  When held down, pressing the
+    // key to turn left or right causes the player to strafe left or
+    // right instead.
+    //
+
+    CONFIG_VARIABLE_KEY(key_strafe),
+
+    //!
+    // Keyboard key to make the player run.
+    //
+
+    CONFIG_VARIABLE_KEY(key_speed),
+
+    //!
+    // If non-zero, mouse input is enabled.  If zero, mouse input is
+    // disabled.
+    //
+
+    CONFIG_VARIABLE_INT(use_mouse),
+
+    //!
+    // Mouse button to fire the currently selected weapon.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_fire),
+
+    //!
+    // Mouse button to turn on strafing.  When held down, the player
+    // will strafe left and right instead of turning left and right.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_strafe),
+
+    //!
+    // Mouse button to move forward.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_forward),
+
+    //!
+    // Mouse button to turn on running.  When held down, the player
+    // will run while moving.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_speed),
+
+    //!
+    // @game hexen strife
+    //
+    // Mouse button to jump.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_jump),
+
+    //!
+    // If non-zero, joystick input is enabled.
+    //
+
+    CONFIG_VARIABLE_INT(use_joystick),
+
+    //!
+    // Joystick virtual button that fires the current weapon.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_fire),
+
+    //!
+    // Joystick virtual button that makes the player strafe while
+    // held down.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_strafe),
+
+    //!
+    // Joystick virtual button to "use" an object, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_use),
+
+    //!
+    // Joystick virtual button that makes the player run while held
+    // down.
+    //
+    // If this has a value of 20 or greater, the player will always run,
+    // even if use_joystick is 0.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_speed),
+
+    //!
+    // @game hexen strife
+    //
+    // Joystick virtual button that makes the player jump.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_jump),
+
+    //!
+    // @game doom heretic hexen
+    //
+    // Screen size, range 3-11.
+    //
+    // A value of 11 gives a full-screen view with the status bar not
+    // displayed.  A value of 10 gives a full-screen view with the
+    // status bar displayed.
+    //
+
+    CONFIG_VARIABLE_INT(screenblocks),
+
+    //!
+    // @game strife
+    //
+    // Screen size, range 3-11.
+    //
+    // A value of 11 gives a full-screen view with the status bar not
+    // displayed.  A value of 10 gives a full-screen view with the
+    // status bar displayed.
+    //
+
+    CONFIG_VARIABLE_INT(screensize),
+
+    //!
+    // @game doom
+    //
+    // Screen detail.  Zero gives normal "high detail" mode, while
+    // a non-zero value gives "low detail" mode.
+    //
+
+    CONFIG_VARIABLE_INT(detaillevel),
+
+    //!
+    // Number of sounds that will be played simultaneously.
+    //
+
+    CONFIG_VARIABLE_INT(snd_channels),
+
+    //!
+    // Music output device.  A non-zero value gives MIDI sound output,
+    // while a value of zero disables music.
+    //
+
+    CONFIG_VARIABLE_INT(snd_musicdevice),
+
+    //!
+    // Sound effects device.  A value of zero disables in-game sound
+    // effects, a value of 1 enables PC speaker sound effects, while
+    // a value in the range 2-9 enables the "normal" digital sound
+    // effects.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sfxdevice),
+
+    //!
+    // SoundBlaster I/O port. Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sbport),
+
+    //!
+    // SoundBlaster IRQ.  Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sbirq),
+
+    //!
+    // SoundBlaster DMA channel.  Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sbdma),
+
+    //!
+    // Output port to use for OPL MIDI playback.  Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_mport),
+
+    //!
+    // Gamma correction level.  A value of zero disables gamma
+    // correction, while a value in the range 1-4 gives increasing
+    // levels of gamma correction.
+    //
+
+    CONFIG_VARIABLE_INT(usegamma),
+
+    //!
+    // @game hexen
+    //
+    // Directory in which to store savegames.
+    //
+
+    CONFIG_VARIABLE_STRING(savedir),
+
+    //!
+    // @game hexen
+    //
+    // Controls whether messages are displayed in the heads-up display.
+    // If this has a non-zero value, messages are displayed.
+    //
+
+    CONFIG_VARIABLE_INT(messageson),
+
+    //!
+    // @game strife
+    //
+    // Name of background flat used by view border.
+    //
+
+    CONFIG_VARIABLE_STRING(back_flat),
+
+    //!
+    // @game strife
+    //
+    // Multiplayer nickname (?).
+    //
+
+    CONFIG_VARIABLE_STRING(nickname),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+0 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro0),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+1 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro1),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+2 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro2),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+3 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro3),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+4 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro4),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+5 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro5),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+6 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro6),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+7 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro7),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+8 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro8),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+9 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro9),
+
+    //!
+    // @game strife
+    //
+    // Serial port number to use for SERSETUP.EXE (unused).
+    //
+
+    CONFIG_VARIABLE_INT(comport),
+};
+
+static default_collection_t doom_defaults =
+{
+    doom_defaults_list,
+    arrlen(doom_defaults_list),
+    NULL,
+};
+
+//! @begin_config_file extended
+
+static default_t extra_defaults_list[] =
+{
+    //!
+    // Name of the SDL video driver to use.  If this is an empty string,
+    // the default video driver is used.
+    //
+
+    CONFIG_VARIABLE_STRING(video_driver),
+
+    //!
+    // Position of the window on the screen when running in windowed
+    // mode. Accepted values are: "" (empty string) - don't care,
+    // "center" - place window at center of screen, "x,y" - place
+    // window at the specified coordinates.
+    //
+
+    CONFIG_VARIABLE_STRING(window_position),
+
+    //!
+    // If non-zero, the game will run in full screen mode.  If zero,
+    // the game will run in a window.
+    //
+
+    CONFIG_VARIABLE_INT(fullscreen),
+
+    //!
+    // Index of the display on which the game should run. This has no
+    // effect if running in windowed mode (fullscreen=0) and
+    // window_position is not set to "center".
+    //
+
+    CONFIG_VARIABLE_INT(video_display),
+
+    //!
+    // If non-zero, the screen will be stretched vertically to display
+    // correctly on a square pixel video mode.
+    //
+
+    CONFIG_VARIABLE_INT(aspect_ratio_correct),
+
+    //!
+    // If non-zero, the screen will have smooth scaling.
+    //
+
+    CONFIG_VARIABLE_INT(smooth_pixel_scaling),
+
+    //!
+    // If non-zero, forces integer scales for resolution-independent rendering.
+    //
+
+    CONFIG_VARIABLE_INT(integer_scaling),
+
+    // If non-zero, any pillar/letter boxes drawn around the game area
+    // will "flash" when the game palette changes, simulating the VGA
+    // "porch"
+
+    CONFIG_VARIABLE_INT(vga_porch_flash),
+
+    //!
+    // Window width when running in windowed mode.
+    //
+
+    CONFIG_VARIABLE_INT(window_width),
+
+    //!
+    // Window height when running in windowed mode.
+    //
+
+    CONFIG_VARIABLE_INT(window_height),
+
+    //!
+    // Width for screen mode when running fullscreen.
+    // If this and fullscreen_height are both set to zero, we run
+    // fullscreen as a desktop window that covers the entire screen,
+    // rather than ever switching screen modes. It should usually
+    // be unnecessary to set this value.
+    //
+
+    CONFIG_VARIABLE_INT(fullscreen_width),
+
+    //!
+    // Height for screen mode when running fullscreen.
+    // See documentation for fullscreen_width.
+    //
+
+    CONFIG_VARIABLE_INT(fullscreen_height),
+
+    //!
+    // If non-zero, force the use of a software renderer. For use on
+    // systems lacking hardware acceleration.
+    //
+
+    CONFIG_VARIABLE_INT(force_software_renderer),
+
+    //!
+    // Maximum number of pixels to use for intermediate scaling buffer.
+    // More pixels mean that the screen can be rendered more precisely,
+    // but there are diminishing returns on quality. The default limits to
+    // 16,000,000 pixels, which is enough to cover 4K monitor standards.
+
+    CONFIG_VARIABLE_INT(max_scaling_buffer_pixels),
+
+    //!
+    // Number of milliseconds to wait on startup after the video mode
+    // has been set, before the game will start.  This allows the
+    // screen to settle on some monitors that do not display an image
+    // for a brief interval after changing video modes.
+    //
+
+    CONFIG_VARIABLE_INT(startup_delay),
+
+    //!
+    // @game heretic hexen strife
+    //
+    // If non-zero, display the graphical startup screen.
+    //
+
+    CONFIG_VARIABLE_INT(graphical_startup),
+
+    //!
+    // @game doom heretic strife
+    //
+    // If non-zero, the ENDOOM text screen is displayed when exiting the
+    // game. If zero, the ENDOOM screen is not displayed.
+    //
+
+    CONFIG_VARIABLE_INT(show_endoom),
+
+    //!
+    // @game doom strife
+    //
+    // If non-zero, a disk activity indicator is displayed when data is read
+    // from disk. If zero, the disk activity indicator is not displayed.
+    //
+
+    CONFIG_VARIABLE_INT(show_diskicon),
+
+    //!
+    // If non-zero, save screenshots in PNG format. If zero, screenshots are
+    // saved in PCX format, as Vanilla Doom does.
+    //
+
+    CONFIG_VARIABLE_INT(png_screenshots),
+
+    //!
+    // Sound output sample rate, in Hz.  Typical values to use are
+    // 11025, 22050, 44100 and 48000.
+    //
+
+    CONFIG_VARIABLE_INT(snd_samplerate),
+
+    //!
+    // Maximum number of bytes to allocate for caching converted sound
+    // effects in memory. If set to zero, there is no limit applied.
+    //
+
+    CONFIG_VARIABLE_INT(snd_cachesize),
+
+    //!
+    // Maximum size of the output sound buffer size in milliseconds.
+    // Sound output is generated periodically in slices. Higher values
+    // might be more efficient but will introduce latency to the
+    // sound output. The default is 28ms (one slice per tic with the
+    // 35fps timer).
+    //
+
+    CONFIG_VARIABLE_INT(snd_maxslicetime_ms),
+
+    //!
+    // If non-zero, sound effects will have their pitch varied up or
+    // down by a random amount during play. If zero, sound effects
+    // play back at their default pitch.
+    //
+
+    CONFIG_VARIABLE_INT(snd_pitchshift),
+
+    //!
+    // External command to invoke to perform MIDI playback. If set to
+    // the empty string, SDL_mixer's internal MIDI playback is used.
+    // This only has any effect when snd_musicdevice is set to General
+    // MIDI output.
+    //
+
+    CONFIG_VARIABLE_STRING(snd_musiccmd),
+
+    //!
+    // Value to set for the DMXOPTION environment variable. If this contains
+    // "-opl3", output for an OPL3 chip is generated when in OPL MIDI
+    // playback mode.
+    //
+
+    CONFIG_VARIABLE_STRING(snd_dmxoption),
+
+    //!
+    // The I/O port to use to access the OPL chip.  Only relevant when
+    // using native OPL music playback.
+    //
+
+    CONFIG_VARIABLE_INT_HEX(opl_io_port),
+
+    //!
+    // Controls whether libsamplerate support is used for performing
+    // sample rate conversions of sound effects.  Support for this
+    // must be compiled into the program.
+    //
+    // If zero, libsamplerate support is disabled.  If non-zero,
+    // libsamplerate is enabled. Increasing values roughly correspond
+    // to higher quality conversion; the higher the quality, the
+    // slower the conversion process.  Linear conversion = 1;
+    // Zero order hold = 2; Fast Sinc filter = 3; Medium quality
+    // Sinc filter = 4; High quality Sinc filter = 5.
+    //
+
+    CONFIG_VARIABLE_INT(use_libsamplerate),
+
+    //!
+    // Scaling factor used by libsamplerate. This is used when converting
+    // sounds internally back into integer form; normally it should not
+    // be necessary to change it from the default value. The only time
+    // it might be needed is if a PWAD file is loaded that contains very
+    // loud sounds, in which case the conversion may cause sound clipping
+    // and the scale factor should be reduced. The lower the value, the
+    // quieter the sound effects become, so it should be set as high as is
+    // possible without clipping occurring.
+
+    CONFIG_VARIABLE_FLOAT(libsamplerate_scale),
+
+    //!
+    // Full path to a directory in which WAD files and dehacked patches
+    // can be placed to be automatically loaded on startup. A subdirectory
+    // of this directory matching the IWAD name is checked to find the
+    // files to load.
+
+    CONFIG_VARIABLE_STRING(autoload_path),
+
+    //!
+    // Full path to a directory containing configuration files for
+    // substitute music packs. These packs contain high quality renderings
+    // of game music to be played instead of using the system's built-in
+    // MIDI playback.
+    //
+
+    CONFIG_VARIABLE_STRING(music_pack_path),
+
+#ifdef HAVE_FLUIDSYNTH
+    //!
+    // If 1, activate the FluidSynth chorus effects module. If 0, no chorus
+    // will be added to the output signal.
+    //
+
+    CONFIG_VARIABLE_INT(fsynth_chorus_active),
+
+    //!
+    // Specifies the modulation depth of the FluidSynth chorus. Default is
+    // 5.0, range is 0.0 to 256.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_chorus_depth),
+
+    //!
+    // Specifies the output amplitude of the FluidSynth chorus signal. Default
+    // is 0.35, range is 0.0 to 10.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_chorus_level),
+
+    //!
+    // Sets the voice count of the FluidSynth chorus signal. Default is 3,
+    // range is 0 to 99.
+    //
+
+    CONFIG_VARIABLE_INT(fsynth_chorus_nr),
+
+    //!
+    // Sets the FluidSynth chorus modulation speed in Hz. Default is 0.3,
+    // range is 0.1 to 5.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_chorus_speed),
+
+    //!
+    // This setting defines how FluidSynth interprets Bank Select messages. The
+    // default is "gs". Other possible values are "gm", "xg" and "mma".
+    //
+
+    CONFIG_VARIABLE_STRING(fsynth_midibankselect),
+
+    //!
+    // Sets the number of FluidSynth voices that can be played in parallel.
+    // Default is 256, range is 1 - 65535.
+    //
+
+    CONFIG_VARIABLE_INT(fsynth_polyphony),
+
+    //!
+    // If 1, activate the FluidSynth reverb effects module. If 0, no reverb
+    // will be added to the output signal.
+    //
+
+    CONFIG_VARIABLE_INT(fsynth_reverb_active),
+
+    //!
+    // Sets the amount of FluidSynth reverb damping. Default is 0.4, range is
+    // 0.0 to 1.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_reverb_damp),
+
+    //!
+    // Sets the FluidSynth reverb amplitude. Default is 0.15, range is 0.0 -
+    // 1.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_reverb_level),
+
+    //!
+    // Sets the room size(i.e. amount of wet) FluidSynth reverb. Default is
+    // 0.6, range is 0.0 - 1.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_reverb_roomsize),
+
+    //!
+    // Sets the stereo spread of the FluidSynth reverb signal. Default is
+    // 0.4, range is 0.0 - 100.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_reverb_width),
+
+    //!
+    // Fine tune the FluidSynth output level. Default is 1.0,
+    // range is 0.0 - 10.0.
+    //
+
+    CONFIG_VARIABLE_FLOAT(fsynth_gain),
+
+    //!
+    // Full path to a soundfont file to use with FluidSynth MIDI playback.
+    //
+
+    CONFIG_VARIABLE_STRING(fsynth_sf_path),
+#endif // HAVE_FLUIDSYNTH
+
+    //!
+    // Full path to a Timidity configuration file to use for MIDI
+    // playback. The file will be evaluated from the directory where
+    // it is evaluated, so there is no need to add "dir" commands
+    // into it.
+    //
+
+    CONFIG_VARIABLE_STRING(timidity_cfg_path),
+
+    //!
+    // Path to GUS patch files to use when operating in GUS emulation
+    // mode.
+    //
+
+    CONFIG_VARIABLE_STRING(gus_patch_path),
+
+    //!
+    // Number of kilobytes of RAM to use in GUS emulation mode. Valid
+    // values are 256, 512, 768 or 1024.
+    //
+
+    CONFIG_VARIABLE_INT(gus_ram_kb),
+
+#ifdef _WIN32
+    //!
+    // MIDI device for native Windows MIDI.
+    //
+
+    CONFIG_VARIABLE_STRING(winmm_midi_device),
+
+    //!
+    // Compatibility level for native Windows MIDI, default 0. Valid values are
+    // 0 (Vanilla), 1 (Standard), 2 (Full).
+    //
+
+    CONFIG_VARIABLE_INT(winmm_complevel),
+
+    //!
+    // Reset device type for native Windows MIDI, default 1. Valid values are
+    // 0 (None), 1 (GM Mode), 2 (GS Mode), 3 (XG Mode).
+    //
+
+    CONFIG_VARIABLE_INT(winmm_reset_type),
+
+    //!
+    // Reset device delay for native Windows MIDI, default 0, median value 100 ms.
+    //
+
+    CONFIG_VARIABLE_INT(winmm_reset_delay),
+#endif
+
+    //!
+    // @game doom strife
+    //
+    // If non-zero, the Vanilla savegame limit is enforced; if the
+    // savegame exceeds 180224 bytes in size, the game will exit with
+    // an error.  If this has a value of zero, there is no limit to
+    // the size of savegames.
+    //
+
+    CONFIG_VARIABLE_INT(vanilla_savegame_limit),
+
+    //!
+    // @game doom strife
+    //
+    // If non-zero, the Vanilla demo size limit is enforced; the game
+    // exits with an error when a demo exceeds the demo size limit
+    // (128KiB by default).  If this has a value of zero, there is no
+    // limit to the size of demos.
+    //
+
+    CONFIG_VARIABLE_INT(vanilla_demo_limit),
+
+    //!
+    // If non-zero, the game behaves like Vanilla Doom, always assuming
+    // an American keyboard mapping.  If this has a value of zero, the
+    // native keyboard mapping of the keyboard is used.
+    //
+
+    CONFIG_VARIABLE_INT(vanilla_keyboard_mapping),
+
+    //!
+    // Name to use in network games for identification.  This is only
+    // used on the "waiting" screen while waiting for the game to start.
+    //
+
+    CONFIG_VARIABLE_STRING(player_name),
+
+    //!
+    // If this is non-zero, the mouse will be "grabbed" when running
+    // in windowed mode so that it can be used as an input device.
+    // When running full screen, this has no effect.
+    //
+
+    CONFIG_VARIABLE_INT(grabmouse),
+
+    //!
+    // If non-zero, all vertical mouse movement is ignored.  This
+    // emulates the behavior of the "novert" tool available under DOS
+    // that performs the same function.
+    //
+
+    CONFIG_VARIABLE_INT(novert),
+
+    //!
+    // Mouse acceleration factor.  When the speed of mouse movement
+    // exceeds the threshold value (mouse_threshold), the speed is
+    // multiplied by this value.
+    //
+
+    CONFIG_VARIABLE_FLOAT(mouse_acceleration),
+
+    //!
+    // Mouse acceleration threshold.  When the speed of mouse movement
+    // exceeds this threshold value, the speed is multiplied by an
+    // acceleration factor (mouse_acceleration).
+    //
+
+    CONFIG_VARIABLE_INT(mouse_threshold),
+
+    //!
+    // Mouse button to strafe left.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_strafeleft),
+
+    //!
+    // Mouse button to strafe right.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_straferight),
+
+    //!
+    // Mouse button to turn left.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_turnleft),
+
+    //!
+    // Mouse button to turn right.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_turnright),
+
+    //!
+    // Mouse button to "use" an object, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_use),
+
+    //!
+    // Mouse button to move backwards.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_backward),
+
+    //!
+    // Mouse button to cycle to the previous weapon.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_prevweapon),
+
+    //!
+    // Mouse button to cycle to the next weapon.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_nextweapon),
+    
+    //!
+    // @game heretic
+    //
+    // Mouse button to move to the left in the inventory.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_invleft),
+
+    //!
+    // @game heretic
+    //
+    // Mouse button to move to the right in the inventory.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_invright),
+
+    //!
+    // @game heretic hexen
+    //
+    // Mouse button to use artifact.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_useartifact),
+
+    //!
+    // If non-zero, double-clicking a mouse button acts like pressing
+    // the "use" key to use an object in-game, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_INT(dclick_use),
+
+    //!
+    // SDL GUID string indicating the joystick to use. An empty string
+    // indicates that no joystick is configured.
+    //
+
+    CONFIG_VARIABLE_STRING(joystick_guid),
+
+    //!
+    // Index of SDL joystick to use; this is only used in the case where
+    // multiple identical joystick devices are connected which have the
+    // same GUID, to distinguish between devices.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_index),
+
+    //!
+    // If non-zero, use analog movement when playing with a gamepad.
+    //
+
+    CONFIG_VARIABLE_INT(use_analog),
+
+    //!
+    // Joystick axis to use to for horizontal (X) movement.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_x_axis),
+
+    //!
+    // If non-zero, movement on the horizontal joystick axis is inverted.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_x_invert),
+
+    //!
+    // Joystick turn analog sensitivity, specified as a value between 0 and 20.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_turn_sensitivity),
+
+    //!
+    // Joystick axis to use to for vertical (Y) movement.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_y_axis),
+
+    //!
+    // If non-zero, movement on the vertical joystick axis is inverted.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_y_invert),
+
+    //!
+    // Joystick axis to use to for strafing movement.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_strafe_axis),
+
+    //!
+    // If non-zero, movement on the joystick axis used for strafing
+    // is inverted.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_strafe_invert),
+
+    //!
+    // Joystick move and strafe analog sensitivity, specified as a value
+    // between 0 and 20.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_move_sensitivity),
+    //!
+    // Joystick axis to use to for looking up and down.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_look_axis),
+
+    //!
+    // If non-zero, movement on the joystick axis used for looking
+    // is inverted.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_look_invert),
+
+    //!
+    // Joystick look analog sensitivity, specified as a value between 0 and 20.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_look_sensitivity),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #0.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button0),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #1.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button1),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #2.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button2),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #3.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button3),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #4.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button4),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #5.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button5),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #6.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button6),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #7.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button7),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #8.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button8),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #9.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button9),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #10.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button10),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #11.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button11),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #12.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button12),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #13.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button13),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #14.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button14),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #15.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button15),
+
+    //!
+    // The physical joystick button that corresponds to joystick
+    // virtual button #16.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_physical_button16),
+
+    //!
+    // If non-zero, use the SDL_GameController interface instead of the
+    // SDL_Joystick interface.
+    //
+
+    CONFIG_VARIABLE_INT(use_gamepad),
+
+    //!
+    // Stores the SDL_GameControllerType of the last configured gamepad.
+    //
+
+    CONFIG_VARIABLE_INT(gamepad_type),
+
+    //!
+    // Joystick x axis dead zone, specified as a percentage of the axis max
+    // value.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_x_dead_zone),
+
+    //!
+    // Joystick y axis dead zone, specified as a percentage of the axis max
+    // value.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_y_dead_zone),
+
+    //!
+    // Joystick strafe axis dead zone, specified as a percentage of the axis
+    // max value.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_strafe_dead_zone),
+
+    //!
+    // Joystick look axis dead zone, specified as a percentage of the axis max
+    // value.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_look_dead_zone),
+
+    //!
+    // Joystick virtual button to make the player strafe left.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_strafeleft),
+
+    //!
+    // Joystick virtual button to make the player strafe right.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_straferight),
+
+    //!
+    // Joystick virtual button to activate the menu.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_menu_activate),
+
+    //!
+    // Joystick virtual button to toggle the automap.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_toggle_automap),
+
+    //!
+    // Joystick virtual button that cycles to the previous weapon.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_prevweapon),
+
+    //!
+    // Joystick virtual button that cycles to the next weapon.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_nextweapon),
+
+    //!
+    // @game heretic hexen
+    // Joystick virtual button to activate artifact.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_useartifact),
+
+    //!
+    // @game heretic hexen
+    // Joystick virtual button to move left in the inventory.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_invleft),
+
+    //!
+    // @game heretic hexen
+    // Joystick virtual button to move right in the inventory.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_invright),
+
+    //!
+    // @game heretic hexen
+    // Joystick virtual button to fly up.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_flyup),
+
+    //!
+    // @game heretic hexen
+    // Joystick virtual button to fly down.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_flydown),
+
+    //!
+    // @game heretic hexen
+    // Joystick virtual button to center flying.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_flycenter),
+
+    //!
+    // Key to pause or unpause the game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_pause),
+
+    //!
+    // Key that activates the menu when pressed.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_activate),
+
+    //!
+    // Key that moves the cursor up on the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_up),
+
+    //!
+    // Key that moves the cursor down on the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_down),
+
+    //!
+    // Key that moves the currently selected slider on the menu left.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_left),
+
+    //!
+    // Key that moves the currently selected slider on the menu right.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_right),
+
+    //!
+    // Key to go back to the previous menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_back),
+
+    //!
+    // Key to activate the currently selected menu item.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_forward),
+
+    //!
+    // Key to answer 'yes' to a question in the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_confirm),
+
+    //!
+    // Key to answer 'no' to a question in the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_abort),
+
+    //!
+    // Keyboard shortcut to bring up the help screen.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_help),
+
+    //!
+    // Keyboard shortcut to bring up the save game menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_save),
+
+    //!
+    // Keyboard shortcut to bring up the load game menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_load),
+
+    //!
+    // Keyboard shortcut to bring up the sound volume menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_volume),
+
+    //!
+    // Keyboard shortcut to toggle the detail level.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_detail),
+
+    //!
+    // Keyboard shortcut to quicksave the current game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_qsave),
+
+    //!
+    // Keyboard shortcut to end the game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_endgame),
+
+    //!
+    // Keyboard shortcut to toggle heads-up messages.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_messages),
+
+    //!
+    // Keyboard shortcut to load the last quicksave.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_qload),
+
+    //!
+    // Keyboard shortcut to quit the game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_quit),
+
+    //!
+    // Keyboard shortcut to toggle the gamma correction level.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_gamma),
+
+    //!
+    // Keyboard shortcut to switch view in multiplayer.
+    //
+
+    CONFIG_VARIABLE_KEY(key_spy),
+
+    //!
+    // Keyboard shortcut to increase the screen size.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_incscreen),
+
+    //!
+    // Keyboard shortcut to decrease the screen size.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_decscreen),
+
+    //!
+    // Keyboard shortcut to save a screenshot.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_screenshot),
+
+    //!
+    // Key to toggle the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_toggle),
+
+    //!
+    // Key to pan north when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_north),
+
+    //!
+    // Key to pan south when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_south),
+
+    //!
+    // Key to pan east when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_east),
+
+    //!
+    // Key to pan west when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_west),
+
+    //!
+    // Key to zoom in when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_zoomin),
+
+    //!
+    // Key to zoom out when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_zoomout),
+
+    //!
+    // Key to zoom out the maximum amount when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_maxzoom),
+
+    //!
+    // Key to toggle follow mode when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_follow),
+
+    //!
+    // Key to toggle the grid display when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_grid),
+
+    //!
+    // Key to set a mark when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_mark),
+
+    //!
+    // Key to clear all marks when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_clearmark),
+
+    //!
+    // Key to select weapon 1.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon1),
+
+    //!
+    // Key to select weapon 2.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon2),
+
+    //!
+    // Key to select weapon 3.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon3),
+
+    //!
+    // Key to select weapon 4.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon4),
+
+    //!
+    // Key to select weapon 5.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon5),
+
+    //!
+    // Key to select weapon 6.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon6),
+
+    //!
+    // Key to select weapon 7.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon7),
+
+    //!
+    // Key to select weapon 8.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon8),
+
+    //!
+    // Key to cycle to the previous weapon.
+    //
+
+    CONFIG_VARIABLE_KEY(key_prevweapon),
+
+    //!
+    // Key to cycle to the next weapon.
+    //
+
+    CONFIG_VARIABLE_KEY(key_nextweapon),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "quartz flask" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_quartz),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "mystic urn" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_urn),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "timebomb of the ancients" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_bomb),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "tome of power" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_tome),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "ring of invincibility" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_ring),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "chaos device" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_chaosdevice),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "shadowsphere" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_shadowsphere),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "wings of wrath" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_wings),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "torch" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_torch),
+
+    //!
+    // @game heretic
+    //
+    // Key to use "morph ovum" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_morph),
+
+    //!
+    // @game hexen
+    //
+    // Key to use one of each artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_all),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "quartz flask" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_health),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "flechette" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_poisonbag),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "disc of repulsion" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_blastradius),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "chaos device" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_teleport),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "banishment device" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_teleportother),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "porkalator" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_egg),
+
+    //!
+    // @game hexen
+    //
+    // Key to use "icon of the defender" artifact.
+    //
+
+    CONFIG_VARIABLE_KEY(key_arti_invulnerability),
+
+    //!
+    // Key to re-display last message.
+    //
+
+    CONFIG_VARIABLE_KEY(key_message_refresh),
+
+    //!
+    // Key to quit the game when recording a demo.
+    //
+
+    CONFIG_VARIABLE_KEY(key_demo_quit),
+
+    //!
+    // Key to send a message during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msg),
+
+    //!
+    // Key to send a message to player 1 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer1),
+
+    //!
+    // Key to send a message to player 2 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer2),
+
+    //!
+    // Key to send a message to player 3 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer3),
+
+    //!
+    // Key to send a message to player 4 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer4),
+
+    //!
+    // @game hexen strife
+    //
+    // Key to send a message to player 5 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer5),
+
+    //!
+    // @game hexen strife
+    //
+    // Key to send a message to player 6 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer6),
+
+    //!
+    // @game hexen strife
+    //
+    // Key to send a message to player 7 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer7),
+
+    //!
+    // @game hexen strife
+    //
+    // Key to send a message to player 8 during multiplayer games.
+    //
+
+    CONFIG_VARIABLE_KEY(key_multi_msgplayer8),
+};
+
+static default_collection_t extra_defaults =
+{
+    extra_defaults_list,
+    arrlen(extra_defaults_list),
+    NULL,
+};
+
+// Search a collection for a variable
+
+static default_t *SearchCollection(default_collection_t *collection, const char *name)
+{
+    int i;
+
+    for (i=0; i<collection->numdefaults; ++i) 
+    {
+        if (!strcmp(name, collection->defaults[i].name))
+        {
+            return &collection->defaults[i];
+        }
+    }
+
+    return NULL;
+}
+
+// Mapping from DOS keyboard scan code to internal key code (as defined
+// in doomkey.h). I think I (fraggle) reused this from somewhere else
+// but I can't find where. Anyway, notes:
+//  * KEY_PAUSE is wrong - it's in the KEY_NUMLOCK spot. This shouldn't
+//    matter in terms of Vanilla compatibility because neither of
+//    those were valid for key bindings.
+//  * There is no proper scan code for PrintScreen (on DOS machines it
+//    sends an interrupt). So I added a fake scan code of 126 for it.
+//    The presence of this is important so we can bind PrintScreen as
+//    a screenshot key.
+static const int scantokey[128] =
+{
+    0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6',
+    '7',    '8',    '9',    '0',    '-',    '=',    KEY_BACKSPACE, 9,
+    'q',    'w',    'e',    'r',    't',    'y',    'u',    'i',
+    'o',    'p',    '[',    ']',    13,		KEY_RCTRL, 'a',    's',
+    'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';',
+    '\'',   '`',    KEY_RSHIFT,'\\',   'z',    'x',    'c',    'v',
+    'b',    'n',    'm',    ',',    '.',    '/',    KEY_RSHIFT,KEYP_MULTIPLY,
+    KEY_RALT,  ' ',  KEY_CAPSLOCK,KEY_F1,  KEY_F2,   KEY_F3,   KEY_F4,   KEY_F5,
+    KEY_F6,   KEY_F7,   KEY_F8,   KEY_F9,   KEY_F10,  /*KEY_NUMLOCK?*/KEY_PAUSE,KEY_SCRLCK,KEY_HOME,
+    KEY_UPARROW,KEY_PGUP,KEY_MINUS,KEY_LEFTARROW,KEYP_5,KEY_RIGHTARROW,KEYP_PLUS,KEY_END,
+    KEY_DOWNARROW,KEY_PGDN,KEY_INS,KEY_DEL,0,   0,      0,      KEY_F11,
+    KEY_F12,  0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      KEY_PRTSCR, 0
+};
+
+
+static void SaveDefaultCollection(default_collection_t *collection)
+{
+    default_t *defaults;
+    int i, v;
+    FILE *f;
+	
+    f = M_fopen(collection->filename, "w");
+    if (!f)
+	return; // can't write the file, but don't complain
+
+    defaults = collection->defaults;
+		
+    for (i=0 ; i<collection->numdefaults ; i++)
+    {
+        int chars_written;
+
+        // Ignore unbound variables
+
+        if (!defaults[i].bound)
+        {
+            continue;
+        }
+
+        // Print the name and line up all values at 30 characters
+
+        chars_written = fprintf(f, "%s ", defaults[i].name);
+
+        for (; chars_written < 30; ++chars_written)
+            fprintf(f, " ");
+
+        // Print the value
+
+        switch (defaults[i].type) 
+        {
+            case DEFAULT_KEY:
+
+                // use the untranslated version if we can, to reduce
+                // the possibility of screwing up the user's config
+                // file
+                
+                v = *defaults[i].location.i;
+
+                if (v == KEY_RSHIFT)
+                {
+                    // Special case: for shift, force scan code for
+                    // right shift, as this is what Vanilla uses.
+                    // This overrides the change check below, to fix
+                    // configuration files made by old versions that
+                    // mistakenly used the scan code for left shift.
+
+                    v = 54;
+                }
+                else if (defaults[i].untranslated
+                      && v == defaults[i].original_translated)
+                {
+                    // Has not been changed since the last time we
+                    // read the config file.
+
+                    v = defaults[i].untranslated;
+                }
+                else
+                {
+                    // search for a reverse mapping back to a scancode
+                    // in the scantokey table
+
+                    int s;
+
+                    for (s=0; s<128; ++s)
+                    {
+                        if (scantokey[s] == v)
+                        {
+                            v = s;
+                            break;
+                        }
+                    }
+                }
+
+	        fprintf(f, "%i", v);
+                break;
+
+            case DEFAULT_INT:
+	        fprintf(f, "%i", *defaults[i].location.i);
+                break;
+
+            case DEFAULT_INT_HEX:
+	        fprintf(f, "0x%x", *defaults[i].location.i);
+                break;
+
+            case DEFAULT_FLOAT:
+                fprintf(f, "%f", *defaults[i].location.f);
+                break;
+
+            case DEFAULT_STRING:
+	        fprintf(f,"\"%s\"", *defaults[i].location.s);
+                break;
+        }
+
+        fprintf(f, "\n");
+    }
+
+    fclose (f);
+}
+
+// Parses integer values in the configuration file
+
+static int ParseIntParameter(const char *strparm)
+{
+    int parm;
+
+    if (strparm[0] == '0' && strparm[1] == 'x')
+        sscanf(strparm+2, "%x", (unsigned int *) &parm);
+    else
+        sscanf(strparm, "%i", &parm);
+
+    return parm;
+}
+
+static void SetVariable(default_t *def, const char *value)
+{
+    int intparm;
+
+    // parameter found
+
+    switch (def->type)
+    {
+        case DEFAULT_STRING:
+            *def->location.s = M_StringDuplicate(value);
+            break;
+
+        case DEFAULT_INT:
+        case DEFAULT_INT_HEX:
+            *def->location.i = ParseIntParameter(value);
+            break;
+
+        case DEFAULT_KEY:
+
+            // translate scancodes read from config
+            // file (save the old value in untranslated)
+
+            intparm = ParseIntParameter(value);
+            def->untranslated = intparm;
+            if (intparm >= 0 && intparm < 128)
+            {
+                intparm = scantokey[intparm];
+            }
+            else
+            {
+                intparm = 0;
+            }
+
+            def->original_translated = intparm;
+            *def->location.i = intparm;
+            break;
+
+        case DEFAULT_FLOAT:
+        {
+            // Different locales use different decimal separators.
+            // However, the choice of the current locale isn't always
+            // under our own control. If the atof() function fails to
+            // parse the string representing the floating point number
+            // using the current locale's decimal separator, it will
+            // return 0, resulting in silent sound effects. To
+            // mitigate this, we replace the first non-digit,
+            // non-minus character in the string with the current
+            // locale's decimal separator before passing it to atof().
+            struct lconv *lc = localeconv();
+            char dec, *str;
+            int i = 0;
+
+            dec = lc->decimal_point[0];
+            str = M_StringDuplicate(value);
+
+            // Skip sign indicators.
+            if (str[i] == '-' || str[i] == '+')
+            {
+                i++;
+            }
+
+            for ( ; str[i] != '\0'; i++)
+            {
+                if (!isdigit(str[i]))
+                {
+                    str[i] = dec;
+                    break;
+                }
+            }
+
+            *def->location.f = (float) atof(str);
+            free(str);
+        }
+            break;
+    }
+}
+
+static void LoadDefaultCollection(default_collection_t *collection)
+{
+    FILE *f;
+    default_t *def;
+    char defname[80];
+    char strparm[100];
+
+    // read the file in, overriding any set defaults
+    f = M_fopen(collection->filename, "r");
+
+    if (f == NULL)
+    {
+        // File not opened, but don't complain. 
+        // It's probably just the first time they ran the game.
+
+        return;
+    }
+
+    while (!feof(f))
+    {
+        if (fscanf(f, "%79s %99[^\n]\n", defname, strparm) != 2)
+        {
+            // This line doesn't match
+
+            continue;
+        }
+
+        // Find the setting in the list
+
+        def = SearchCollection(collection, defname);
+
+        if (def == NULL || !def->bound)
+        {
+            // Unknown variable?  Unbound variables are also treated
+            // as unknown.
+
+            continue;
+        }
+
+        // Strip off trailing non-printable characters (\r characters
+        // from DOS text files)
+
+        while (strlen(strparm) > 0 && !isprint(strparm[strlen(strparm)-1]))
+        {
+            strparm[strlen(strparm)-1] = '\0';
+        }
+
+        // Surrounded by quotes? If so, remove them.
+        if (strlen(strparm) >= 2
+         && strparm[0] == '"' && strparm[strlen(strparm) - 1] == '"')
+        {
+            strparm[strlen(strparm) - 1] = '\0';
+            memmove(strparm, strparm + 1, sizeof(strparm) - 1);
+        }
+
+        SetVariable(def, strparm);
+    }
+
+    fclose (f);
+}
+
+// Set the default filenames to use for configuration files.
+
+void M_SetConfigFilenames(const char *main_config, const char *extra_config)
+{
+    default_main_config = main_config;
+    default_extra_config = extra_config;
+}
+
+//
+// M_SaveDefaults
+//
+
+void M_SaveDefaults (void)
+{
+    SaveDefaultCollection(&doom_defaults);
+    SaveDefaultCollection(&extra_defaults);
+}
+
+//
+// Save defaults to alternate filenames
+//
+
+void M_SaveDefaultsAlternate(const char *main, const char *extra)
+{
+    const char *orig_main;
+    const char *orig_extra;
+
+    // Temporarily change the filenames
+
+    orig_main = doom_defaults.filename;
+    orig_extra = extra_defaults.filename;
+
+    doom_defaults.filename = main;
+    extra_defaults.filename = extra;
+
+    M_SaveDefaults();
+
+    // Restore normal filenames
+
+    doom_defaults.filename = orig_main;
+    extra_defaults.filename = orig_extra;
+}
+
+//
+// M_LoadDefaults
+//
+
+void M_LoadDefaults (void)
+{
+    int i;
+
+    // This variable is a special snowflake for no good reason.
+    M_BindStringVariable("autoload_path", &autoload_path);
+
+    // check for a custom default file
+
+    //!
+    // @arg <file>
+    // @vanilla
+    //
+    // Load main configuration from the specified file, instead of the
+    // default.
+    //
+
+    i = M_CheckParmWithArgs("-config", 1);
+
+    if (i)
+    {
+	doom_defaults.filename = myargv[i+1];
+	printf ("	default file: %s\n",doom_defaults.filename);
+    }
+    else
+    {
+        doom_defaults.filename
+            = M_StringJoin(configdir, default_main_config, NULL);
+    }
+
+    printf("saving config in %s\n", doom_defaults.filename);
+
+    //!
+    // @arg <file>
+    //
+    // Load additional configuration from the specified file, instead of
+    // the default.
+    //
+
+    i = M_CheckParmWithArgs("-extraconfig", 1);
+
+    if (i)
+    {
+        extra_defaults.filename = myargv[i+1];
+        printf("        extra configuration file: %s\n", 
+               extra_defaults.filename);
+    }
+    else
+    {
+        extra_defaults.filename
+            = M_StringJoin(configdir, default_extra_config, NULL);
+    }
+
+    LoadDefaultCollection(&doom_defaults);
+    LoadDefaultCollection(&extra_defaults);
+}
+
+// Get a configuration file variable by its name
+
+static default_t *GetDefaultForName(const char *name)
+{
+    default_t *result;
+
+    // Try the main list and the extras
+
+    result = SearchCollection(&doom_defaults, name);
+
+    if (result == NULL)
+    {
+        result = SearchCollection(&extra_defaults, name);
+    }
+
+    // Not found? Internal error.
+
+    if (result == NULL)
+    {
+        I_Error("Unknown configuration variable: '%s'", name);
+    }
+
+    return result;
+}
+
+//
+// Bind a variable to a given configuration file variable, by name.
+//
+
+void M_BindIntVariable(const char *name, int *location)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+    assert(variable->type == DEFAULT_INT
+        || variable->type == DEFAULT_INT_HEX
+        || variable->type == DEFAULT_KEY);
+
+    variable->location.i = location;
+    variable->bound = true;
+}
+
+void M_BindFloatVariable(const char *name, float *location)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+    assert(variable->type == DEFAULT_FLOAT);
+
+    variable->location.f = location;
+    variable->bound = true;
+}
+
+void M_BindStringVariable(const char *name, char **location)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+    assert(variable->type == DEFAULT_STRING);
+
+    variable->location.s = location;
+    variable->bound = true;
+}
+
+// Set the value of a particular variable; an API function for other
+// parts of the program to assign values to config variables by name.
+
+boolean M_SetVariable(const char *name, const char *value)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+
+    if (variable == NULL || !variable->bound)
+    {
+        return false;
+    }
+
+    SetVariable(variable, value);
+
+    return true;
+}
+
+// Get the value of a variable.
+
+int M_GetIntVariable(const char *name)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+
+    if (variable == NULL || !variable->bound
+     || (variable->type != DEFAULT_INT && variable->type != DEFAULT_INT_HEX))
+    {
+        return 0;
+    }
+
+    return *variable->location.i;
+}
+
+const char *M_GetStringVariable(const char *name)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+
+    if (variable == NULL || !variable->bound
+     || variable->type != DEFAULT_STRING)
+    {
+        return NULL;
+    }
+
+    return *variable->location.s;
+}
+
+float M_GetFloatVariable(const char *name)
+{
+    default_t *variable;
+
+    variable = GetDefaultForName(name);
+
+    if (variable == NULL || !variable->bound
+     || variable->type != DEFAULT_FLOAT)
+    {
+        return 0;
+    }
+
+    return *variable->location.f;
+}
+
+// Get the path to the default configuration dir to use, if NULL
+// is passed to M_SetConfigDir.
+
+static char *GetDefaultConfigDir(void)
+{
+#if !defined(_WIN32) || defined(_WIN32_WCE)
+
+    // Configuration settings are stored in an OS-appropriate path
+    // determined by SDL.  On typical Unix systems, this might be
+    // ~/.local/share/chocolate-doom.  On Windows, we behave like
+    // Vanilla Doom and save in the current directory.
+
+    char *result;
+    char *copy;
+
+    result = SDL_GetPrefPath("", PACKAGE_TARNAME);
+    if (result != NULL)
+    {
+        copy = M_StringDuplicate(result);
+        SDL_free(result);
+        return copy;
+    }
+#endif /* #ifndef _WIN32 */
+    return M_StringDuplicate(exedir);
+}
+
+// 
+// SetConfigDir:
+//
+// Sets the location of the configuration directory, where configuration
+// files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
+//
+
+void M_SetConfigDir(const char *dir)
+{
+    // Use the directory that was passed, or find the default.
+
+    if (dir != NULL)
+    {
+        configdir = dir;
+    }
+    else
+    {
+        configdir = GetDefaultConfigDir();
+    }
+
+    if (strcmp(configdir, exedir) != 0)
+    {
+        printf("Using %s for configuration and saves\n", configdir);
+    }
+
+    // Make the directory if it doesn't already exist:
+
+    M_MakeDirectory(configdir);
+}
+
+#define MUSIC_PACK_README \
+"Extract music packs into this directory in .flac or .ogg format;\n"   \
+"they will be automatically loaded based on filename to replace the\n" \
+"in-game music with high quality versions.\n\n" \
+"For more information check here:\n\n" \
+"  <https://www.chocolate-doom.org/wiki/index.php/Digital_music_packs>\n\n"
+
+// Set the value of music_pack_path if it is currently empty, and create
+// the directory if necessary.
+void M_SetMusicPackDir(void)
+{
+    const char *current_path;
+    char *prefdir, *music_pack_path, *readme_path;
+
+    current_path = M_GetStringVariable("music_pack_path");
+
+    if (current_path != NULL && strlen(current_path) > 0)
+    {
+        return;
+    }
+
+    prefdir = SDL_GetPrefPath("", PACKAGE_TARNAME);
+    if (prefdir == NULL)
+    {
+        printf("M_SetMusicPackDir: SDL_GetPrefPath failed, music pack directory not set\n");
+        return;
+    }
+    music_pack_path = M_StringJoin(prefdir, "music-packs", NULL);
+
+    M_MakeDirectory(prefdir);
+    M_MakeDirectory(music_pack_path);
+    M_SetVariable("music_pack_path", music_pack_path);
+
+    // We write a README file with some basic instructions on how to use
+    // the directory.
+    readme_path = M_StringJoin(music_pack_path, DIR_SEPARATOR_S,
+                               "README.txt", NULL);
+    M_WriteFile(readme_path, MUSIC_PACK_README, strlen(MUSIC_PACK_README));
+
+    free(readme_path);
+    free(music_pack_path);
+    SDL_free(prefdir);
+}
+
+//
+// Calculate the path to the directory to use to store save games.
+// Creates the directory as necessary.
+//
+
+char *M_GetSaveGameDir(const char *iwadname)
+{
+    char *savegamedir;
+    char *topdir;
+    int p;
+
+    //!
+    // @arg <directory>
+    //
+    // Specify a path from which to load and save games.  If the
+    // directory does not exist then it will automatically be created.
+    //
+
+    p = M_CheckParmWithArgs("-savedir", 1);
+    if (p)
+    {
+        savegamedir = myargv[p + 1];
+        if (!M_FileExists(savegamedir))
+        {
+            M_MakeDirectory(savegamedir);
+        }
+
+        // add separator at end just in case
+        savegamedir = M_StringJoin(savegamedir, DIR_SEPARATOR_S, NULL);
+
+        printf("Save directory changed to %s.\n", savegamedir);
+    }
+#ifdef _WIN32
+    // In -cdrom mode, we write savegames to a specific directory
+    // in addition to configs.
+
+    else if (M_ParmExists("-cdrom"))
+    {
+        savegamedir = M_StringDuplicate(configdir);
+    }
+#endif
+    // If not "doing" a configuration directory (Windows), don't "do"
+    // a savegame directory, either.
+    else if (!strcmp(configdir, exedir))
+    {
+	savegamedir = M_StringDuplicate("");
+    }
+    else
+    {
+        // ~/.local/share/chocolate-doom/savegames
+
+        topdir = M_StringJoin(configdir, "savegames", NULL);
+        M_MakeDirectory(topdir);
+
+        // eg. ~/.local/share/chocolate-doom/savegames/doom2.wad/
+
+        savegamedir = M_StringJoin(topdir, DIR_SEPARATOR_S, iwadname,
+                                   DIR_SEPARATOR_S, NULL);
+
+        M_MakeDirectory(savegamedir);
+
+        free(topdir);
+    }
+
+    return savegamedir;
+}
+
+//
+// Calculate the path to the directory for autoloaded WADs/DEHs.
+// Creates the directory as necessary.
+//
+char *M_GetAutoloadDir(const char *iwadname)
+{
+    char *result;
+
+    if (autoload_path == NULL || strlen(autoload_path) == 0)
+    {
+        char *prefdir;
+        prefdir = SDL_GetPrefPath("", PACKAGE_TARNAME);
+        if (prefdir == NULL)
+        {
+            printf("M_GetAutoloadDir: SDL_GetPrefPath failed\n");
+            return NULL;
+        }
+        autoload_path = M_StringJoin(prefdir, "autoload", NULL);
+        SDL_free(prefdir);
+    }
+
+    M_MakeDirectory(autoload_path);
+
+    result = M_StringJoin(autoload_path, DIR_SEPARATOR_S, iwadname, NULL);
+    M_MakeDirectory(result);
+
+    // TODO: Add README file
+
+    return result;
+}
\ No newline at end of file
diff --git a/games/NXDoom/src/m_config.h b/games/NXDoom/src/m_config.h
new file mode 100644
index 000000000..5939b6bef
--- /dev/null
+++ b/games/NXDoom/src/m_config.h
@@ -0,0 +1,43 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Configuration file interface.
+//    
+
+
+#ifndef __M_CONFIG__
+#define __M_CONFIG__
+
+#include "doomtype.h"
+
+void M_LoadDefaults(void);
+void M_SaveDefaults(void);
+void M_SaveDefaultsAlternate(const char *main, const char *extra);
+void M_SetConfigDir(const char *dir);
+void M_SetMusicPackDir(void);
+void M_BindIntVariable(const char *name, int *variable);
+void M_BindFloatVariable(const char *name, float *variable);
+void M_BindStringVariable(const char *name, char **variable);
+boolean M_SetVariable(const char *name, const char *value);
+int M_GetIntVariable(const char *name);
+const char *M_GetStringVariable(const char *name);
+float M_GetFloatVariable(const char *name);
+void M_SetConfigFilenames(const char *main_config, const char *extra_config);
+char *M_GetSaveGameDir(const char *iwadname);
+char *M_GetAutoloadDir(const char *iwadname);
+
+extern const char *configdir;
+
+#endif
diff --git a/games/NXDoom/src/m_controls.c b/games/NXDoom/src/m_controls.c
new file mode 100644
index 000000000..1a5f520e1
--- /dev/null
+++ b/games/NXDoom/src/m_controls.c
@@ -0,0 +1,457 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+
+#include "doomtype.h"
+#include "doomkeys.h"
+
+#include "m_config.h"
+#include "m_misc.h"
+
+//
+// Keyboard controls
+//
+
+int key_right = KEY_RIGHTARROW;
+int key_left = KEY_LEFTARROW;
+
+int key_up = KEY_UPARROW;
+int key_down = KEY_DOWNARROW; 
+int key_strafeleft = ',';
+int key_straferight = '.';
+int key_fire = KEY_RCTRL;
+int key_use = ' ';
+int key_strafe = KEY_RALT;
+int key_speed = KEY_RSHIFT; 
+
+// 
+// Heretic keyboard controls
+//
+ 
+int key_flyup = KEY_PGUP;
+int key_flydown = KEY_INS;
+int key_flycenter = KEY_HOME;
+
+int key_lookup = KEY_PGDN;
+int key_lookdown = KEY_DEL;
+int key_lookcenter = KEY_END;
+
+int key_invleft = '[';
+int key_invright = ']';
+int key_useartifact = KEY_ENTER;
+
+int key_arti_quartz = 0;
+int key_arti_urn = 0;
+int key_arti_bomb = 0;
+int key_arti_tome = 127;
+int key_arti_ring = 0;
+int key_arti_chaosdevice = 0;
+int key_arti_shadowsphere = 0;
+int key_arti_wings = 0;
+int key_arti_torch = 0;
+int key_arti_morph = 0;
+
+//
+// Hexen key controls
+//
+
+int key_jump = '/';
+
+int key_arti_all             = KEY_BACKSPACE;
+int key_arti_health          = '\\';
+int key_arti_poisonbag       = '0';
+int key_arti_blastradius     = '9';
+int key_arti_teleport        = '8';
+int key_arti_teleportother   = '7';
+int key_arti_egg             = '6';
+int key_arti_invulnerability = '5';
+
+//
+// Strife key controls
+//
+// haleyjd 09/01/10
+//
+
+// Note: Strife also uses key_invleft, key_invright, key_jump, key_lookup, and
+// key_lookdown, but with different default values.
+
+int key_usehealth = 'h';
+int key_invquery  = 'q';
+int key_mission   = 'w';
+int key_invpop    = 'z';
+int key_invkey    = 'k';
+int key_invhome   = KEY_HOME;
+int key_invend    = KEY_END;
+int key_invuse    = KEY_ENTER;
+int key_invdrop   = KEY_BACKSPACE;
+
+
+//
+// Mouse controls
+//
+
+int mousebfire = 0;
+int mousebstrafe = 1;
+int mousebforward = 2;
+int mousebspeed = 3;
+
+int mousebjump = -1;
+
+int mousebstrafeleft = -1;
+int mousebstraferight = -1;
+int mousebturnleft = -1;
+int mousebturnright = -1;
+int mousebbackward = -1;
+int mousebuse = -1;
+
+int mousebprevweapon = -1;
+int mousebnextweapon = -1;
+int mousebinvleft = -1;
+int mousebinvright = -1;
+int mousebuseartifact = -1;
+
+int key_message_refresh = KEY_ENTER;
+int key_pause = KEY_PAUSE;
+int key_demo_quit = 'q';
+int key_spy = KEY_F12;
+
+// Multiplayer chat keys:
+
+int key_multi_msg = 't';
+int key_multi_msgplayer[8];
+
+// Weapon selection keys:
+
+int key_weapon1 = '1';
+int key_weapon2 = '2';
+int key_weapon3 = '3';
+int key_weapon4 = '4';
+int key_weapon5 = '5';
+int key_weapon6 = '6';
+int key_weapon7 = '7';
+int key_weapon8 = '8';
+int key_prevweapon = 0;
+int key_nextweapon = 0;
+
+// Map control keys:
+
+int key_map_north     = KEY_UPARROW;
+int key_map_south     = KEY_DOWNARROW;
+int key_map_east      = KEY_RIGHTARROW;
+int key_map_west      = KEY_LEFTARROW;
+int key_map_zoomin    = '=';
+int key_map_zoomout   = '-';
+int key_map_toggle    = KEY_TAB;
+int key_map_maxzoom   = '0';
+int key_map_follow    = 'f';
+int key_map_grid      = 'g';
+int key_map_mark      = 'm';
+int key_map_clearmark = 'c';
+
+// menu keys:
+
+int key_menu_activate  = KEY_ESCAPE;
+int key_menu_up        = KEY_UPARROW;
+int key_menu_down      = KEY_DOWNARROW;
+int key_menu_left      = KEY_LEFTARROW;
+int key_menu_right     = KEY_RIGHTARROW;
+int key_menu_back      = KEY_BACKSPACE;
+int key_menu_forward   = KEY_ENTER;
+int key_menu_confirm   = 'y';
+int key_menu_abort     = 'n';
+
+int key_menu_help      = KEY_F1;
+int key_menu_save      = KEY_F2;
+int key_menu_load      = KEY_F3;
+int key_menu_volume    = KEY_F4;
+int key_menu_detail    = KEY_F5;
+int key_menu_qsave     = KEY_F6;
+int key_menu_endgame   = KEY_F7;
+int key_menu_messages  = KEY_F8;
+int key_menu_qload     = KEY_F9;
+int key_menu_quit      = KEY_F10;
+int key_menu_gamma     = KEY_F11;
+
+int key_menu_incscreen = KEY_EQUALS;
+int key_menu_decscreen = KEY_MINUS;
+int key_menu_screenshot = 0;
+
+//
+// Joystick controls
+//
+
+int joybfire = 0;
+int joybstrafe = 1;
+int joybuse = 3;
+int joybspeed = 2;
+
+int joybstrafeleft = -1;
+int joybstraferight = -1;
+
+int joybjump = -1;
+
+int joybprevweapon = -1;
+int joybnextweapon = -1;
+
+int joybmenu = -1;
+int joybautomap = -1;
+
+int joybuseartifact = -1;
+int joybinvleft = -1;
+int joybinvright = -1;
+
+int joybflyup = -1;
+int joybflydown = -1;
+int joybflycenter = -1;
+
+// Control whether if a mouse button is double clicked, it acts like 
+// "use" has been pressed
+
+int dclick_use = 1;
+ 
+// 
+// Bind all of the common controls used by Doom and all other games.
+//
+
+void M_BindBaseControls(void)
+{
+    M_BindIntVariable("key_right",          &key_right);
+    M_BindIntVariable("key_left",           &key_left);
+    M_BindIntVariable("key_up",             &key_up);
+    M_BindIntVariable("key_down",           &key_down);
+    M_BindIntVariable("key_strafeleft",     &key_strafeleft);
+    M_BindIntVariable("key_straferight",    &key_straferight);
+    M_BindIntVariable("key_fire",           &key_fire);
+    M_BindIntVariable("key_use",            &key_use);
+    M_BindIntVariable("key_strafe",         &key_strafe);
+    M_BindIntVariable("key_speed",          &key_speed);
+
+    M_BindIntVariable("mouseb_fire",        &mousebfire);
+    M_BindIntVariable("mouseb_strafe",      &mousebstrafe);
+    M_BindIntVariable("mouseb_forward",     &mousebforward);
+    M_BindIntVariable("mouseb_speed",       &mousebspeed);
+
+    M_BindIntVariable("joyb_fire",          &joybfire);
+    M_BindIntVariable("joyb_strafe",        &joybstrafe);
+    M_BindIntVariable("joyb_use",           &joybuse);
+    M_BindIntVariable("joyb_speed",         &joybspeed);
+
+    M_BindIntVariable("joyb_menu_activate", &joybmenu);
+    M_BindIntVariable("joyb_toggle_automap", &joybautomap);
+
+    // Extra controls that are not in the Vanilla versions:
+
+    M_BindIntVariable("joyb_strafeleft",     &joybstrafeleft);
+    M_BindIntVariable("joyb_straferight",    &joybstraferight);
+    M_BindIntVariable("mouseb_strafeleft",   &mousebstrafeleft);
+    M_BindIntVariable("mouseb_straferight",  &mousebstraferight);
+    M_BindIntVariable("mouseb_turnleft",     &mousebturnleft);
+    M_BindIntVariable("mouseb_turnright",    &mousebturnright);
+    M_BindIntVariable("mouseb_use",          &mousebuse);
+    M_BindIntVariable("mouseb_backward",     &mousebbackward);
+    M_BindIntVariable("dclick_use",          &dclick_use);
+    M_BindIntVariable("key_pause",           &key_pause);
+    M_BindIntVariable("key_message_refresh", &key_message_refresh);
+}
+
+void M_BindHereticControls(void)
+{
+    M_BindIntVariable("key_flyup",          &key_flyup);
+    M_BindIntVariable("key_flydown",        &key_flydown);
+    M_BindIntVariable("key_flycenter",      &key_flycenter);
+
+    M_BindIntVariable("key_lookup",         &key_lookup);
+    M_BindIntVariable("key_lookdown",       &key_lookdown);
+    M_BindIntVariable("key_lookcenter",     &key_lookcenter);
+
+    M_BindIntVariable("key_invleft",        &key_invleft);
+    M_BindIntVariable("key_invright",       &key_invright);
+    M_BindIntVariable("key_useartifact",    &key_useartifact);
+
+    M_BindIntVariable("mouseb_invleft", &mousebinvleft);
+    M_BindIntVariable("mouseb_invright", &mousebinvright);
+    M_BindIntVariable("mouseb_useartifact", &mousebuseartifact);
+
+    M_BindIntVariable("joyb_invleft", &joybinvleft);
+    M_BindIntVariable("joyb_invright", &joybinvright);
+    M_BindIntVariable("joyb_useartifact", &joybuseartifact);
+
+    M_BindIntVariable("joyb_flyup", &joybflyup);
+    M_BindIntVariable("joyb_flydown", &joybflydown);
+    M_BindIntVariable("joyb_flycenter", &joybflycenter);
+
+    M_BindIntVariable("key_arti_quartz",        &key_arti_quartz);
+    M_BindIntVariable("key_arti_urn",           &key_arti_urn);
+    M_BindIntVariable("key_arti_bomb",          &key_arti_bomb);
+    M_BindIntVariable("key_arti_tome",          &key_arti_tome);
+    M_BindIntVariable("key_arti_ring",          &key_arti_ring);
+    M_BindIntVariable("key_arti_chaosdevice",   &key_arti_chaosdevice);
+    M_BindIntVariable("key_arti_shadowsphere",  &key_arti_shadowsphere);
+    M_BindIntVariable("key_arti_wings",         &key_arti_wings);
+    M_BindIntVariable("key_arti_torch",         &key_arti_torch);
+    M_BindIntVariable("key_arti_morph",         &key_arti_morph);
+}
+
+void M_BindHexenControls(void)
+{
+    M_BindIntVariable("key_jump",           &key_jump);
+    M_BindIntVariable("mouseb_jump",        &mousebjump);
+    M_BindIntVariable("joyb_jump",          &joybjump);
+
+    M_BindIntVariable("key_arti_all",             &key_arti_all);
+    M_BindIntVariable("key_arti_health",          &key_arti_health);
+    M_BindIntVariable("key_arti_poisonbag",       &key_arti_poisonbag);
+    M_BindIntVariable("key_arti_blastradius",     &key_arti_blastradius);
+    M_BindIntVariable("key_arti_teleport",        &key_arti_teleport);
+    M_BindIntVariable("key_arti_teleportother",   &key_arti_teleportother);
+    M_BindIntVariable("key_arti_egg",             &key_arti_egg);
+    M_BindIntVariable("key_arti_invulnerability", &key_arti_invulnerability);
+}
+
+void M_BindStrifeControls(void)
+{
+    // These are shared with all games, but have different defaults:
+    key_message_refresh = '/';
+
+    // These keys are shared with Heretic/Hexen but have different defaults:
+    key_jump     = 'a';
+    key_lookup   = KEY_PGUP;
+    key_lookdown = KEY_PGDN;
+    key_invleft  = KEY_INS;
+    key_invright = KEY_DEL;
+
+    M_BindIntVariable("key_jump",           &key_jump);
+    M_BindIntVariable("key_lookUp",         &key_lookup);
+    M_BindIntVariable("key_lookDown",       &key_lookdown);
+    M_BindIntVariable("key_invLeft",        &key_invleft);
+    M_BindIntVariable("key_invRight",       &key_invright);
+
+    // Custom Strife-only Keys:
+    M_BindIntVariable("key_useHealth",      &key_usehealth);
+    M_BindIntVariable("key_invquery",       &key_invquery);
+    M_BindIntVariable("key_mission",        &key_mission);
+    M_BindIntVariable("key_invPop",         &key_invpop);
+    M_BindIntVariable("key_invKey",         &key_invkey);
+    M_BindIntVariable("key_invHome",        &key_invhome);
+    M_BindIntVariable("key_invEnd",         &key_invend);
+    M_BindIntVariable("key_invUse",         &key_invuse);
+    M_BindIntVariable("key_invDrop",        &key_invdrop);
+
+    // Strife also supports jump on mouse and joystick, and in the exact same
+    // manner as Hexen!
+    M_BindIntVariable("mouseb_jump",        &mousebjump);
+    M_BindIntVariable("joyb_jump",          &joybjump);
+
+    // Subset of inventory actions common to Heretic/Hexen and Strife.
+    M_BindIntVariable("joyb_invleft",       &joybinvleft);
+    M_BindIntVariable("joyb_invright",      &joybinvright);
+    // This is technically "invuse" in Strife, but let's reuse the value.
+    M_BindIntVariable("joyb_useartifact",   &joybuseartifact);
+}
+
+void M_BindWeaponControls(void)
+{
+    M_BindIntVariable("key_weapon1",        &key_weapon1);
+    M_BindIntVariable("key_weapon2",        &key_weapon2);
+    M_BindIntVariable("key_weapon3",        &key_weapon3);
+    M_BindIntVariable("key_weapon4",        &key_weapon4);
+    M_BindIntVariable("key_weapon5",        &key_weapon5);
+    M_BindIntVariable("key_weapon6",        &key_weapon6);
+    M_BindIntVariable("key_weapon7",        &key_weapon7);
+    M_BindIntVariable("key_weapon8",        &key_weapon8);
+
+    M_BindIntVariable("key_prevweapon",     &key_prevweapon);
+    M_BindIntVariable("key_nextweapon",     &key_nextweapon);
+
+    M_BindIntVariable("joyb_prevweapon",    &joybprevweapon);
+    M_BindIntVariable("joyb_nextweapon",    &joybnextweapon);
+
+    M_BindIntVariable("mouseb_prevweapon",  &mousebprevweapon);
+    M_BindIntVariable("mouseb_nextweapon",  &mousebnextweapon);
+}
+
+void M_BindMapControls(void)
+{
+    M_BindIntVariable("key_map_north",      &key_map_north);
+    M_BindIntVariable("key_map_south",      &key_map_south);
+    M_BindIntVariable("key_map_east",       &key_map_east);
+    M_BindIntVariable("key_map_west",       &key_map_west);
+    M_BindIntVariable("key_map_zoomin",     &key_map_zoomin);
+    M_BindIntVariable("key_map_zoomout",    &key_map_zoomout);
+    M_BindIntVariable("key_map_toggle",     &key_map_toggle);
+    M_BindIntVariable("key_map_maxzoom",    &key_map_maxzoom);
+    M_BindIntVariable("key_map_follow",     &key_map_follow);
+    M_BindIntVariable("key_map_grid",       &key_map_grid);
+    M_BindIntVariable("key_map_mark",       &key_map_mark);
+    M_BindIntVariable("key_map_clearmark",  &key_map_clearmark);
+}
+
+void M_BindMenuControls(void)
+{
+    M_BindIntVariable("key_menu_activate",  &key_menu_activate);
+    M_BindIntVariable("key_menu_up",        &key_menu_up);
+    M_BindIntVariable("key_menu_down",      &key_menu_down);
+    M_BindIntVariable("key_menu_left",      &key_menu_left);
+    M_BindIntVariable("key_menu_right",     &key_menu_right);
+    M_BindIntVariable("key_menu_back",      &key_menu_back);
+    M_BindIntVariable("key_menu_forward",   &key_menu_forward);
+    M_BindIntVariable("key_menu_confirm",   &key_menu_confirm);
+    M_BindIntVariable("key_menu_abort",     &key_menu_abort);
+
+    M_BindIntVariable("key_menu_help",      &key_menu_help);
+    M_BindIntVariable("key_menu_save",      &key_menu_save);
+    M_BindIntVariable("key_menu_load",      &key_menu_load);
+    M_BindIntVariable("key_menu_volume",    &key_menu_volume);
+    M_BindIntVariable("key_menu_detail",    &key_menu_detail);
+    M_BindIntVariable("key_menu_qsave",     &key_menu_qsave);
+    M_BindIntVariable("key_menu_endgame",   &key_menu_endgame);
+    M_BindIntVariable("key_menu_messages",  &key_menu_messages);
+    M_BindIntVariable("key_menu_qload",     &key_menu_qload);
+    M_BindIntVariable("key_menu_quit",      &key_menu_quit);
+    M_BindIntVariable("key_menu_gamma",     &key_menu_gamma);
+
+    M_BindIntVariable("key_menu_incscreen", &key_menu_incscreen);
+    M_BindIntVariable("key_menu_decscreen", &key_menu_decscreen);
+    M_BindIntVariable("key_menu_screenshot",&key_menu_screenshot);
+    M_BindIntVariable("key_demo_quit",      &key_demo_quit);
+    M_BindIntVariable("key_spy",            &key_spy);
+}
+
+void M_BindChatControls(unsigned int num_players)
+{
+    char name[32];  // haleyjd: 20 not large enough - Thank you, come again!
+    unsigned int i; // haleyjd: signedness conflict
+
+    M_BindIntVariable("key_multi_msg",     &key_multi_msg);
+
+    for (i=0; i<num_players; ++i)
+    {
+        M_snprintf(name, sizeof(name), "key_multi_msgplayer%i", i + 1);
+        M_BindIntVariable(name, &key_multi_msgplayer[i]);
+    }
+}
+
+//
+// Apply custom patches to the default values depending on the
+// platform we are running on.
+//
+
+void M_ApplyPlatformDefaults(void)
+{
+    // no-op. Add your platform-specific patches here.
+}
+
diff --git a/games/NXDoom/src/m_controls.h b/games/NXDoom/src/m_controls.h
new file mode 100644
index 000000000..7a8a2eafa
--- /dev/null
+++ b/games/NXDoom/src/m_controls.h
@@ -0,0 +1,194 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef __M_CONTROLS_H__
+#define __M_CONTROLS_H__
+ 
+extern int key_right;
+extern int key_left;
+
+extern int key_up;
+extern int key_down;
+extern int key_strafeleft;
+extern int key_straferight;
+extern int key_fire;
+extern int key_use;
+extern int key_strafe;
+extern int key_speed;
+
+extern int key_jump;
+ 
+extern int key_flyup;
+extern int key_flydown;
+extern int key_flycenter;
+extern int key_lookup;
+extern int key_lookdown;
+extern int key_lookcenter;
+extern int key_invleft;
+extern int key_invright;
+extern int key_useartifact;
+
+// villsa [STRIFE] strife keys
+extern int key_usehealth;
+extern int key_invquery;
+extern int key_mission;
+extern int key_invpop;
+extern int key_invkey;
+extern int key_invhome;
+extern int key_invend;
+extern int key_invuse;
+extern int key_invdrop;
+
+extern int key_message_refresh;
+extern int key_pause;
+
+extern int key_multi_msg;
+extern int key_multi_msgplayer[8];
+
+extern int key_weapon1;
+extern int key_weapon2;
+extern int key_weapon3;
+extern int key_weapon4;
+extern int key_weapon5;
+extern int key_weapon6;
+extern int key_weapon7;
+extern int key_weapon8;
+
+extern int key_arti_quartz;
+extern int key_arti_urn;
+extern int key_arti_bomb;
+extern int key_arti_tome;
+extern int key_arti_ring;
+extern int key_arti_chaosdevice;
+extern int key_arti_shadowsphere;
+extern int key_arti_wings;
+extern int key_arti_torch;
+extern int key_arti_morph;
+
+extern int key_arti_all;
+extern int key_arti_health;
+extern int key_arti_poisonbag;
+extern int key_arti_blastradius;
+extern int key_arti_teleport;
+extern int key_arti_teleportother;
+extern int key_arti_egg;
+extern int key_arti_invulnerability;
+
+extern int key_demo_quit;
+extern int key_spy;
+extern int key_prevweapon;
+extern int key_nextweapon;
+
+extern int key_map_north;
+extern int key_map_south;
+extern int key_map_east;
+extern int key_map_west;
+extern int key_map_zoomin;
+extern int key_map_zoomout;
+extern int key_map_toggle;
+extern int key_map_maxzoom;
+extern int key_map_follow;
+extern int key_map_grid;
+extern int key_map_mark;
+extern int key_map_clearmark;
+
+// menu keys:
+
+extern int key_menu_activate;
+extern int key_menu_up;
+extern int key_menu_down;
+extern int key_menu_left;
+extern int key_menu_right;
+extern int key_menu_back;
+extern int key_menu_forward;
+extern int key_menu_confirm;
+extern int key_menu_abort;
+
+extern int key_menu_help;
+extern int key_menu_save;
+extern int key_menu_load;
+extern int key_menu_volume;
+extern int key_menu_detail;
+extern int key_menu_qsave;
+extern int key_menu_endgame;
+extern int key_menu_messages;
+extern int key_menu_qload;
+extern int key_menu_quit;
+extern int key_menu_gamma;
+
+extern int key_menu_incscreen;
+extern int key_menu_decscreen;
+extern int key_menu_screenshot;
+
+extern int mousebfire;
+extern int mousebstrafe;
+extern int mousebforward;
+extern int mousebspeed;
+
+extern int mousebjump;
+
+extern int mousebstrafeleft;
+extern int mousebstraferight;
+extern int mousebturnleft;
+extern int mousebturnright;
+extern int mousebbackward;
+extern int mousebuse;
+
+extern int mousebprevweapon;
+extern int mousebnextweapon;
+extern int mousebinvleft;
+extern int mousebinvright;
+extern int mousebuseartifact;
+
+extern int joybfire;
+extern int joybstrafe;
+extern int joybuse;
+extern int joybspeed;
+
+extern int joybjump;
+
+extern int joybstrafeleft;
+extern int joybstraferight;
+
+extern int joybprevweapon;
+extern int joybnextweapon;
+
+extern int joybmenu;
+extern int joybautomap;
+
+extern int joybuseartifact;
+extern int joybinvleft;
+extern int joybinvright;
+
+extern int joybflyup;
+extern int joybflydown;
+extern int joybflycenter;
+
+extern int dclick_use;
+
+void M_BindBaseControls(void);
+void M_BindHereticControls(void);
+void M_BindHexenControls(void);
+void M_BindStrifeControls(void);
+void M_BindWeaponControls(void);
+void M_BindMapControls(void);
+void M_BindMenuControls(void);
+void M_BindChatControls(unsigned int num_players);
+
+void M_ApplyPlatformDefaults(void);
+
+#endif /* #ifndef __M_CONTROLS_H__ */
+
diff --git a/games/NXDoom/src/m_fixed.c b/games/NXDoom/src/m_fixed.c
new file mode 100644
index 000000000..d2c181847
--- /dev/null
+++ b/games/NXDoom/src/m_fixed.c
@@ -0,0 +1,62 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Fixed point implementation.
+//
+
+
+
+#include "stdlib.h"
+
+#include "doomtype.h"
+#include "i_system.h"
+
+#include "m_fixed.h"
+
+
+
+
+// Fixme. __USE_C_FIXED__ or something.
+
+fixed_t
+FixedMul
+( fixed_t	a,
+  fixed_t	b )
+{
+    return ((int64_t) a * (int64_t) b) >> FRACBITS;
+}
+
+
+
+//
+// FixedDiv, C version.
+//
+
+fixed_t FixedDiv(fixed_t a, fixed_t b)
+{
+    if ((abs(a) >> 14) >= abs(b))
+    {
+	return (a^b) < 0 ? INT_MIN : INT_MAX;
+    }
+    else
+    {
+	int64_t result;
+
+	result = ((int64_t) a << FRACBITS) / b;
+
+	return (fixed_t) result;
+    }
+}
+
diff --git a/games/NXDoom/src/m_fixed.h b/games/NXDoom/src/m_fixed.h
new file mode 100644
index 000000000..733b2901c
--- /dev/null
+++ b/games/NXDoom/src/m_fixed.h
@@ -0,0 +1,39 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Fixed point arithemtics, implementation.
+//
+
+
+#ifndef __M_FIXED__
+#define __M_FIXED__
+
+
+
+
+//
+// Fixed point, 32bit as 16.16.
+//
+#define FRACBITS		16
+#define FRACUNIT		(1<<FRACBITS)
+
+typedef int fixed_t;
+
+fixed_t FixedMul	(fixed_t a, fixed_t b);
+fixed_t FixedDiv	(fixed_t a, fixed_t b);
+
+
+
+#endif
diff --git a/games/NXDoom/src/m_misc.c b/games/NXDoom/src/m_misc.c
new file mode 100644
index 000000000..daa58ff05
--- /dev/null
+++ b/games/NXDoom/src/m_misc.c
@@ -0,0 +1,965 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Miscellaneous.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <io.h>
+#include <direct.h>
+#else
+#include <sys/types.h>
+#endif
+
+#include "doomtype.h"
+
+#include "i_system.h"
+#include "m_misc.h"
+#include "z_zone.h"
+
+#ifdef _WIN32
+static wchar_t *ConvertMultiByteToWide(const char *str, UINT code_page)
+{
+    wchar_t *wstr = NULL;
+    int wlen = 0;
+
+    wlen = MultiByteToWideChar(code_page, 0, str, -1, NULL, 0);
+
+    if (!wlen)
+    {
+        errno = EINVAL;
+        printf("ConvertMultiByteToWide: Failed to convert path to wide encoding.\n");
+        return NULL;
+    }
+
+    wstr = malloc(sizeof(wchar_t) * wlen);
+
+    if (!wstr)
+    {
+        I_Error("ConvertMultiByteToWide: Failed to allocate new string.");
+        return NULL;
+    }
+
+    if (MultiByteToWideChar(code_page, 0, str, -1, wstr, wlen) == 0)
+    {
+        errno = EINVAL;
+        printf("ConvertMultiByteToWide: Failed to convert path to wide encoding.\n");
+        free(wstr);
+        return NULL;
+    }
+
+    return wstr;
+}
+
+static char *ConvertWideToMultiByte(const wchar_t *wstr, UINT code_page)
+{
+    char *str = NULL;
+    int len = 0;
+
+    len = WideCharToMultiByte(code_page, 0, wstr, -1, NULL, 0, NULL, NULL);
+
+    if (!len)
+    {
+        errno = EINVAL;
+        printf("ConvertWideToMultiByte: Failed to convert path to multibyte encoding.\n");
+        return NULL;
+    }
+
+    str = malloc(sizeof(char) * len);
+
+    if (!str)
+    {
+        I_Error("ConvertWideToMultiByte: Failed to allocate new string.");
+        return NULL;
+    }
+
+    if (WideCharToMultiByte(code_page, 0, wstr, -1, str, len, NULL, NULL) == 0)
+    {
+        errno = EINVAL;
+        printf("ConvertWideToMultiByte: Failed to convert path to multibyte encoding.\n");
+        free(str);
+        return NULL;
+    }
+
+    return str;
+}
+
+// Convert wide string to a UTF8 string. The result is newly allocated and must
+// be freed by the caller after use.
+
+char *M_ConvertWideToUtf8(const wchar_t *wstr)
+{
+    return ConvertWideToMultiByte(wstr, CP_UTF8);
+}
+
+// Convert UTF8 string to a wide string. The result is newly allocated and must
+// be freed by the caller after use.
+
+wchar_t *M_ConvertUtf8ToWide(const char *str)
+{
+    return ConvertMultiByteToWide(str, CP_UTF8);
+}
+#endif
+
+FILE *M_fopen(const char *filename, const char *mode)
+{
+#ifdef _WIN32
+    FILE *file;
+    wchar_t *wname = NULL;
+    wchar_t *wmode = NULL;
+
+    wname = M_ConvertUtf8ToWide(filename);
+
+    if (!wname)
+    {
+        return NULL;
+    }
+
+    wmode = M_ConvertUtf8ToWide(mode);
+
+    if (!wmode)
+    {
+        free(wname);
+        return NULL;
+    }
+
+    file = _wfopen(wname, wmode);
+
+    free(wname);
+    free(wmode);
+
+    return file;
+#else
+    return fopen(filename, mode);
+#endif
+}
+
+int M_remove(const char *path)
+{
+#ifdef _WIN32
+    wchar_t *wpath = NULL;
+    int ret;
+
+    wpath = M_ConvertUtf8ToWide(path);
+
+    if (!wpath)
+    {
+        return 0;
+    }
+
+    ret = _wremove(wpath);
+
+    free(wpath);
+
+    return ret;
+#else
+    return remove(path);
+#endif
+}
+
+int M_rename(const char *oldname, const char *newname)
+{
+#ifdef _WIN32
+    wchar_t *wold = NULL;
+    wchar_t *wnew = NULL;
+    int ret;
+
+    wold = M_ConvertUtf8ToWide(oldname);
+
+    if (!wold)
+    {
+        return 0;
+    }
+
+    wnew = M_ConvertUtf8ToWide(newname);
+
+    if (!wnew)
+    {
+        free(wold);
+        return 0;
+    }
+
+    ret = _wrename(wold, wnew);
+
+    free(wold);
+    free(wnew);
+
+    return ret;
+#else
+    return rename(oldname, newname);
+#endif
+}
+
+int M_stat(const char *path, struct stat *buf)
+{
+#ifdef _WIN32
+    wchar_t *wpath = NULL;
+    struct _stat wbuf;
+    int ret;
+
+    wpath = M_ConvertUtf8ToWide(path);
+
+    if (!wpath)
+    {
+        return -1;
+    }
+
+    ret = _wstat(wpath, &wbuf);
+
+    // The _wstat() function expects a struct _stat* parameter that is
+    // incompatible with struct stat*. We copy only the required compatible
+    // field.
+    buf->st_mode = wbuf.st_mode;
+
+    free(wpath);
+
+    return ret;
+#else
+    return stat(path, buf);
+#endif
+}
+
+#ifdef _WIN32
+typedef struct {
+    char *var;
+    const char *name;
+} env_var_t;
+
+static env_var_t *env_vars;
+static int num_vars;
+#endif
+
+char *M_getenv(const char *name)
+{
+#ifdef _WIN32
+    int i;
+    wchar_t *wenv = NULL, *wname = NULL;
+    char *env = NULL;
+
+    for (i = 0; i < num_vars; ++i)
+    {
+        if (!strcasecmp(name, env_vars[i].name))
+        {
+            return env_vars[i].var;
+        }
+    }
+
+    wname = M_ConvertUtf8ToWide(name);
+
+    if (!wname)
+    {
+        return NULL;
+    }
+
+    wenv = _wgetenv(wname);
+
+    free(wname);
+
+    if (wenv)
+    {
+        env = M_ConvertWideToUtf8(wenv);
+    }
+    else
+    {
+        env = NULL;
+    }
+
+    env_vars = I_Realloc(env_vars, (num_vars + 1) * sizeof(*env_vars));
+    env_vars[num_vars].var = env;
+    env_vars[num_vars].name = M_StringDuplicate(name);
+    ++num_vars;
+
+    return env;
+#else
+    return getenv(name);
+#endif
+}
+
+//
+// Create a directory
+//
+
+void M_MakeDirectory(const char *path)
+{
+#ifdef _WIN32
+    wchar_t *wdir;
+
+    wdir = M_ConvertUtf8ToWide(path);
+
+    if (!wdir)
+    {
+        return;
+    }
+
+    _wmkdir(wdir);
+
+    free(wdir);
+#else
+    mkdir(path, 0755);
+#endif
+}
+
+// Check if a file exists
+
+boolean M_FileExists(const char *filename)
+{
+    FILE *fstream;
+
+    fstream = M_fopen(filename, "r");
+
+    if (fstream != NULL)
+    {
+        fclose(fstream);
+        return true;
+    }
+    else
+    {
+        // If we can't open because the file is a directory, the 
+        // "file" exists at least!
+
+        return errno == EISDIR;
+    }
+}
+
+// Check if a file exists by probing for common case variation of its filename.
+// Returns a newly allocated string that the caller is responsible for freeing.
+
+char *M_FileCaseExists(const char *path)
+{
+    char *path_dup, *filename, *ext;
+
+    path_dup = M_StringDuplicate(path);
+
+    // 0: actual path
+    if (M_FileExists(path_dup))
+    {
+        return path_dup;
+    }
+
+    filename = strrchr(path_dup, DIR_SEPARATOR);
+    if (filename != NULL)
+    {
+        filename++;
+    }
+    else
+    {
+        filename = path_dup;
+    }
+
+    // 1: lowercase filename, e.g. doom2.wad
+    M_ForceLowercase(filename);
+
+    if (M_FileExists(path_dup))
+    {
+        return path_dup;
+    }
+
+    // 2: uppercase filename, e.g. DOOM2.WAD
+    M_ForceUppercase(filename);
+
+    if (M_FileExists(path_dup))
+    {
+        return path_dup;
+    }
+
+    // 3. uppercase basename with lowercase extension, e.g. DOOM2.wad
+    ext = strrchr(path_dup, '.');
+    if (ext != NULL && ext > filename)
+    {
+        M_ForceLowercase(ext + 1);
+
+        if (M_FileExists(path_dup))
+        {
+            return path_dup;
+        }
+    }
+
+    // 4. lowercase filename with uppercase first letter, e.g. Doom2.wad
+    if (strlen(filename) > 1)
+    {
+        M_ForceLowercase(filename + 1);
+
+        if (M_FileExists(path_dup))
+        {
+            return path_dup;
+        }
+    }
+
+    // 5. no luck
+    free(path_dup);
+    return NULL;
+}
+
+//
+// Determine the length of an open file.
+//
+
+long M_FileLength(FILE *handle)
+{ 
+    long savedpos;
+    long length;
+
+    // save the current position in the file
+    savedpos = ftell(handle);
+    
+    // jump to the end and find the length
+    fseek(handle, 0, SEEK_END);
+    length = ftell(handle);
+
+    // go back to the old location
+    fseek(handle, savedpos, SEEK_SET);
+
+    return length;
+}
+
+//
+// M_WriteFile
+//
+
+boolean M_WriteFile(const char *name, const void *source, int length)
+{
+    FILE *handle;
+    int	count;
+	
+    handle = M_fopen(name, "wb");
+
+    if (handle == NULL)
+	return false;
+
+    count = fwrite(source, 1, length, handle);
+    fclose(handle);
+	
+    if (count < length)
+	return false;
+		
+    return true;
+}
+
+
+//
+// M_ReadFile
+//
+
+int M_ReadFile(const char *name, byte **buffer)
+{
+    FILE *handle;
+    int	count, length;
+    byte *buf;
+	
+    handle = M_fopen(name, "rb");
+    if (handle == NULL)
+	I_Error ("Couldn't read file %s", name);
+
+    // find the size of the file by seeking to the end and
+    // reading the current position
+
+    length = M_FileLength(handle);
+    
+    buf = Z_Malloc (length + 1, PU_STATIC, NULL);
+    count = fread(buf, 1, length, handle);
+    fclose (handle);
+	
+    if (count < length)
+	I_Error ("Couldn't read file %s", name);
+		
+    buf[length] = '\0';
+    *buffer = buf;
+    return length;
+}
+
+// Returns the path to a temporary file of the given name, stored
+// inside the system temporary directory.
+//
+// The returned value must be freed with Z_Free after use.
+
+char *M_TempFile(const char *s)
+{
+    const char *tempdir;
+
+#ifdef _WIN32
+
+    // Check the TEMP environment variable to find the location.
+
+    tempdir = M_getenv("TEMP");
+
+    if (tempdir == NULL)
+    {
+        tempdir = ".";
+    }
+#else
+    // Check the $TMPDIR environment variable to find the location.
+
+    tempdir = getenv("TMPDIR");
+
+    if (tempdir == NULL)
+    {
+        tempdir = "/tmp";
+    }
+#endif
+
+    return M_StringJoin(tempdir, DIR_SEPARATOR_S, s, NULL);
+}
+
+boolean M_StrToInt(const char *str, int *result)
+{
+    return sscanf(str, " 0x%x", (unsigned int *) result) == 1
+        || sscanf(str, " 0X%x", (unsigned int *) result) == 1
+        || sscanf(str, " 0%o", (unsigned int *) result) == 1
+        || sscanf(str, " %d", result) == 1;
+}
+
+// Returns the directory portion of the given path, without the trailing
+// slash separator character. If no directory is described in the path,
+// the string "." is returned. In either case, the result is newly allocated
+// and must be freed by the caller after use.
+char *M_DirName(const char *path)
+{
+    char *result;
+    const char *pf, *pb;
+
+    pf = strrchr(path, '/');
+#ifdef _WIN32
+    pb = strrchr(path, '\\');
+#else
+    pb = NULL;
+#endif
+    if (pf == NULL && pb == NULL)
+    {
+        return M_StringDuplicate(".");
+    }
+    else
+    {
+        const char *p = (pb > pf) ? pb : pf;
+        result = M_StringDuplicate(path);
+        result[p - path] = '\0';
+        return result;
+    }
+}
+
+// Returns the base filename described by the given path (without the
+// directory name). The result points inside path and nothing new is
+// allocated.
+const char *M_BaseName(const char *path)
+{
+    const char *pf, *pb;
+
+    pf = strrchr(path, '/');
+#ifdef _WIN32
+    pb = strrchr(path, '\\');
+#else
+    pb = NULL;
+#endif
+    if (pf == NULL && pb == NULL)
+    {
+        return path;
+    }
+    else
+    {
+        const char *p = (pb > pf) ? pb : pf;
+        return p + 1;
+    }
+}
+
+void M_ExtractFileBase(const char *path, char *dest)
+{
+    const char *src;
+    const char *filename;
+    int length;
+
+    src = path + strlen(path) - 1;
+
+    // back up until a \ or the start
+    while (src != path && *(src - 1) != DIR_SEPARATOR)
+    {
+	src--;
+    }
+
+    filename = src;
+
+    // Copy up to eight characters
+    // Note: Vanilla Doom exits with an error if a filename is specified
+    // with a base of more than eight characters.  To remove the 8.3
+    // filename limit, instead we simply truncate the name.
+
+    length = 0;
+    memset(dest, 0, 8);
+
+    while (*src != '\0' && *src != '.')
+    {
+        if (length >= 8)
+        {
+            printf("Warning: Truncated '%s' lump name to '%.8s'.\n",
+                   filename, dest);
+            break;
+        }
+
+	dest[length++] = toupper((int)*src++);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC M_ForceUppercase
+//
+// Change string to uppercase.
+//
+//---------------------------------------------------------------------------
+
+void M_ForceUppercase(char *text)
+{
+    char *p;
+
+    for (p = text; *p != '\0'; ++p)
+    {
+        *p = toupper(*p);
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+// PROC M_ForceLowercase
+//
+// Change string to lowercase.
+//
+//---------------------------------------------------------------------------
+
+void M_ForceLowercase(char *text)
+{
+    char *p;
+
+    for (p = text; *p != '\0'; ++p)
+    {
+        *p = tolower(*p);
+    }
+}
+
+//
+// M_StrCaseStr
+//
+// Case-insensitive version of strstr()
+//
+
+const char *M_StrCaseStr(const char *haystack, const char *needle)
+{
+    unsigned int haystack_len;
+    unsigned int needle_len;
+    unsigned int len;
+    unsigned int i;
+
+    haystack_len = strlen(haystack);
+    needle_len = strlen(needle);
+
+    if (haystack_len < needle_len)
+    {
+        return NULL;
+    }
+
+    len = haystack_len - needle_len;
+
+    for (i = 0; i <= len; ++i)
+    {
+        if (!strncasecmp(haystack + i, needle, needle_len))
+        {
+            return haystack + i;
+        }
+    }
+
+    return NULL;
+}
+
+//
+// Safe version of strdup() that checks the string was successfully
+// allocated.
+//
+
+char *M_StringDuplicate(const char *orig)
+{
+    char *result;
+
+    result = strdup(orig);
+
+    if (result == NULL)
+    {
+        I_Error("Failed to duplicate string (length %zu)\n",
+                strlen(orig));
+    }
+
+    return result;
+}
+
+//
+// String replace function.
+//
+
+char *M_StringReplace(const char *haystack, const char *needle,
+                      const char *replacement)
+{
+    char *result, *dst;
+    const char *p;
+    size_t needle_len = strlen(needle);
+    size_t result_len, dst_len;
+
+    // Iterate through occurrences of 'needle' and calculate the size of
+    // the new string.
+    result_len = strlen(haystack) + 1;
+    p = haystack;
+
+    for (;;)
+    {
+        p = strstr(p, needle);
+        if (p == NULL)
+        {
+            break;
+        }
+
+        p += needle_len;
+        result_len += strlen(replacement) - needle_len;
+    }
+
+    // Construct new string.
+
+    result = malloc(result_len);
+    if (result == NULL)
+    {
+        I_Error("M_StringReplace: Failed to allocate new string");
+        return NULL;
+    }
+
+    dst = result; dst_len = result_len;
+    p = haystack;
+
+    while (*p != '\0')
+    {
+        if (!strncmp(p, needle, needle_len))
+        {
+            M_StringCopy(dst, replacement, dst_len);
+            p += needle_len;
+            dst += strlen(replacement);
+            dst_len -= strlen(replacement);
+        }
+        else
+        {
+            *dst = *p;
+            ++dst; --dst_len;
+            ++p;
+        }
+    }
+
+    *dst = '\0';
+
+    return result;
+}
+
+// Safe string copy function that works like OpenBSD's strlcpy().
+// Returns true if the string was not truncated.
+
+boolean M_StringCopy(char *dest, const char *src, size_t dest_size)
+{
+    size_t len;
+
+    if (dest_size >= 1)
+    {
+        dest[dest_size - 1] = '\0';
+        strncpy(dest, src, dest_size - 1);
+    }
+    else
+    {
+        return false;
+    }
+
+    len = strlen(dest);
+    return src[len] == '\0';
+}
+
+// Safe string concat function that works like OpenBSD's strlcat().
+// Returns true if string not truncated.
+
+boolean M_StringConcat(char *dest, const char *src, size_t dest_size)
+{
+    size_t offset;
+
+    offset = strlen(dest);
+    if (offset > dest_size)
+    {
+        offset = dest_size;
+    }
+
+    return M_StringCopy(dest + offset, src, dest_size - offset);
+}
+
+// Returns true if 's' begins with the specified prefix.
+
+boolean M_StringStartsWith(const char *s, const char *prefix)
+{
+    return strlen(s) >= strlen(prefix)
+        && strncmp(s, prefix, strlen(prefix)) == 0;
+}
+
+// Returns true if 's' ends with the specified suffix.
+
+boolean M_StringEndsWith(const char *s, const char *suffix)
+{
+    return strlen(s) >= strlen(suffix)
+        && strcmp(s + strlen(s) - strlen(suffix), suffix) == 0;
+}
+
+// Return a newly-malloced string with all the strings given as arguments
+// concatenated together.
+
+char *M_StringJoin(const char *s, ...)
+{
+    char *result;
+    const char *v;
+    va_list args;
+    size_t result_len;
+
+    result_len = strlen(s) + 1;
+
+    va_start(args, s);
+    for (;;)
+    {
+        v = va_arg(args, const char *);
+        if (v == NULL)
+        {
+            break;
+        }
+
+        result_len += strlen(v);
+    }
+    va_end(args);
+
+    result = malloc(result_len);
+
+    if (result == NULL)
+    {
+        I_Error("M_StringJoin: Failed to allocate new string.");
+        return NULL;
+    }
+
+    M_StringCopy(result, s, result_len);
+
+    va_start(args, s);
+    for (;;)
+    {
+        v = va_arg(args, const char *);
+        if (v == NULL)
+        {
+            break;
+        }
+
+        M_StringConcat(result, v, result_len);
+    }
+    va_end(args);
+
+    return result;
+}
+
+// On Windows, vsnprintf() is _vsnprintf().
+#ifdef _WIN32
+#if _MSC_VER < 1400 /* not needed for Visual Studio 2008 */
+#define vsnprintf _vsnprintf
+#endif
+#endif
+
+// Safe, portable vsnprintf().
+int M_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args)
+{
+    int result;
+
+    if (buf_len < 1)
+    {
+        return 0;
+    }
+
+    // Windows (and other OSes?) has a vsnprintf() that doesn't always
+    // append a trailing \0. So we must do it, and write into a buffer
+    // that is one byte shorter; otherwise this function is unsafe.
+    result = vsnprintf(buf, buf_len, s, args);
+
+    // If truncated, change the final char in the buffer to a \0.
+    // A negative result indicates a truncated buffer on Windows.
+    if (result < 0 || result >= buf_len)
+    {
+        buf[buf_len - 1] = '\0';
+        result = buf_len - 1;
+    }
+
+    return result;
+}
+
+// Safe, portable snprintf().
+int M_snprintf(char *buf, size_t buf_len, const char *s, ...)
+{
+    va_list args;
+    int result;
+    va_start(args, s);
+    result = M_vsnprintf(buf, buf_len, s, args);
+    va_end(args);
+    return result;
+}
+
+//
+// M_NormalizeSlashes
+//
+// Remove trailing slashes, translate backslashes to slashes
+// The string to normalize is passed and returned in str
+//
+// killough 11/98: rewritten
+//
+// [STRIFE] - haleyjd 20110210: Borrowed from Eternity and adapted to respect
+// the DIR_SEPARATOR define used by Choco Doom. This routine originated in
+// BOOM.
+//
+void M_NormalizeSlashes(char *str)
+{
+    char *p;
+
+    // Convert all slashes/backslashes to DIR_SEPARATOR
+    for (p = str; *p; p++)
+    {
+        if ((*p == '/' || *p == '\\') && *p != DIR_SEPARATOR)
+        {
+            *p = DIR_SEPARATOR;
+        }
+    }
+
+    // Remove trailing slashes
+    while (p > str && *--p == DIR_SEPARATOR)
+    {
+        *p = 0;
+    }
+
+    // Collapse multiple slashes
+    for (p = str; (*str++ = *p); )
+    {
+        if (*p++ == DIR_SEPARATOR)
+        {
+            while (*p == DIR_SEPARATOR)
+            {
+                p++;
+            }
+        }
+    }
+}
diff --git a/games/NXDoom/src/m_misc.h b/games/NXDoom/src/m_misc.h
new file mode 100644
index 000000000..6dc18ccfa
--- /dev/null
+++ b/games/NXDoom/src/m_misc.h
@@ -0,0 +1,107 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Miscellaneous.
+//    
+
+
+#ifndef __M_MISC__
+#define __M_MISC__
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+
+#include "doomtype.h"
+
+#ifdef _WIN32
+wchar_t *M_ConvertUtf8ToWide(const char *str);
+char *M_ConvertWideToUtf8(const wchar_t *wstr);
+#endif
+
+FILE *M_fopen(const char *filename, const char *mode);
+int M_remove(const char *path);
+int M_rename(const char *oldname, const char *newname);
+int M_stat(const char *path, struct stat *buf);
+char *M_getenv(const char *name);
+boolean M_WriteFile(const char *name, const void *source, int length);
+int M_ReadFile(const char *name, byte **buffer);
+void M_MakeDirectory(const char *dir);
+char *M_TempFile(const char *s);
+boolean M_FileExists(const char *file);
+char *M_FileCaseExists(const char *file);
+long M_FileLength(FILE *handle);
+boolean M_StrToInt(const char *str, int *result);
+char *M_DirName(const char *path);
+const char *M_BaseName(const char *path);
+void M_ExtractFileBase(const char *path, char *dest);
+void M_ForceUppercase(char *text);
+void M_ForceLowercase(char *text);
+const char *M_StrCaseStr(const char *haystack, const char *needle);
+char *M_StringDuplicate(const char *orig);
+boolean M_StringCopy(char *dest, const char *src, size_t dest_size);
+boolean M_StringConcat(char *dest, const char *src, size_t dest_size);
+char *M_StringReplace(const char *haystack, const char *needle,
+                      const char *replacement);
+char *M_StringJoin(const char *s, ...);
+boolean M_StringStartsWith(const char *s, const char *prefix);
+boolean M_StringEndsWith(const char *s, const char *suffix);
+int M_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args);
+int M_snprintf(char *buf, size_t buf_len, const char *s, ...) PRINTF_ATTR(3, 4);
+void M_NormalizeSlashes(char *str);
+
+
+// debugging code to check there are no loops in a linked list
+// disabled unless explicitly requested
+#ifdef DEBUG_LINKED_LISTS
+
+
+#define LINKED_LIST_CHECK_NO_CYCLE(list_type, list, next_member)  \
+    do                                                            \
+    {                                                             \
+        if (list != NULL) {                                       \
+            list_type *slow, *fast;                               \
+            slow = list;                                          \
+            fast = list->next_member;                             \
+            while (fast) {                                        \
+                if (!fast->next_member) {                         \
+                    break;                                        \
+                }                                                 \
+                fast = fast->next_member->next_member;            \
+                slow = slow->next_member;                         \
+                if (slow == fast) {                               \
+                    fprintf(stderr, "loop in linked list " # list " in %s:%d", __FILE__, __LINE__); \
+                    __builtin_trap();                             \
+                }                                                 \
+            }                                                     \
+        }                                                         \
+    } while (0)                                                   \
+
+
+
+#else  // DEBUG_LINKED_LISTS
+
+
+#define LINKED_LIST_CHECK_NO_CYCLE(list_type, list, next_member)  \
+    do                                                            \
+    {                                                             \
+    } while (0)                                                   \
+
+
+#endif  // DEBUG_LINKED_LISTS
+
+
+#endif
+
diff --git a/games/NXDoom/src/manifest.xml b/games/NXDoom/src/manifest.xml
new file mode 100644
index 000000000..05a19e7ad
--- /dev/null
+++ b/games/NXDoom/src/manifest.xml
@@ -0,0 +1,12 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+
+  <!-- Declare app as DPI aware, so that Windows Vista and later will not
+       apply DPI virtualization. -->
+
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
+
diff --git a/games/NXDoom/src/memio.c b/games/NXDoom/src/memio.c
new file mode 100644
index 000000000..299a66bf7
--- /dev/null
+++ b/games/NXDoom/src/memio.c
@@ -0,0 +1,197 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Emulates the IO functions in C stdio.h reading and writing to 
+// memory.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "memio.h"
+
+#include "z_zone.h"
+
+typedef enum {
+	MODE_READ,
+	MODE_WRITE,
+} memfile_mode_t;
+
+struct _MEMFILE {
+	unsigned char *buf;
+	size_t buflen;
+	size_t alloced;
+	unsigned int position;
+	memfile_mode_t mode;
+};
+
+// Open a memory area for reading
+
+MEMFILE *mem_fopen_read(void *buf, size_t buflen)
+{
+	MEMFILE *file;
+
+	file = Z_Malloc(sizeof(MEMFILE), PU_STATIC, 0);
+
+	file->buf = (unsigned char *) buf;
+	file->buflen = buflen;
+	file->position = 0;
+	file->mode = MODE_READ;
+
+	return file;
+}
+
+// Read bytes
+
+size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream)
+{
+	size_t items;
+
+	if (stream->mode != MODE_READ)
+	{
+		printf("not a read stream\n");
+		return -1;
+	}
+
+	// Trying to read more bytes than we have left?
+	
+	items = nmemb;
+
+	if (items * size > stream->buflen - stream->position) 
+	{
+		items = (stream->buflen - stream->position) / size;
+	}
+	
+	// Copy bytes to buffer
+	
+	memcpy(buf, stream->buf + stream->position, items * size);
+
+	// Update position
+
+	stream->position += items * size;
+	
+	return items;
+}
+
+// Open a memory area for writing
+
+MEMFILE *mem_fopen_write(void)
+{
+	MEMFILE *file;
+
+	file = Z_Malloc(sizeof(MEMFILE), PU_STATIC, 0);
+
+	file->alloced = 1024;
+	file->buf = Z_Malloc(file->alloced, PU_STATIC, 0);
+	file->buflen = 0;
+	file->position = 0;
+	file->mode = MODE_WRITE;
+
+	return file;
+}
+
+// Write bytes to stream
+
+size_t mem_fwrite(const void *ptr, size_t size, size_t nmemb, MEMFILE *stream)
+{
+	size_t bytes;
+
+	if (stream->mode != MODE_WRITE)
+	{
+		return -1;
+	}
+	
+	// More bytes than can fit in the buffer?
+	// If so, reallocate bigger.
+
+	bytes = size * nmemb;
+	
+	while (bytes > stream->alloced - stream->position)
+	{
+		unsigned char *newbuf;
+
+		newbuf = Z_Malloc(stream->alloced * 2, PU_STATIC, 0);
+		memcpy(newbuf, stream->buf, stream->alloced);
+		Z_Free(stream->buf);
+		stream->buf = newbuf;
+		stream->alloced *= 2;
+	}
+
+	// Copy into buffer
+	
+	memcpy(stream->buf + stream->position, ptr, bytes);
+	stream->position += bytes;
+
+	if (stream->position > stream->buflen)
+		stream->buflen = stream->position;
+
+	return nmemb;
+}
+
+void mem_get_buf(MEMFILE *stream, void **buf, size_t *buflen)
+{
+	*buf = stream->buf;
+	*buflen = stream->buflen;
+}
+
+void mem_fclose(MEMFILE *stream)
+{
+	if (stream->mode == MODE_WRITE)
+	{
+		Z_Free(stream->buf);
+	}
+
+	Z_Free(stream);
+}
+
+long mem_ftell(MEMFILE *stream)
+{
+	return stream->position;
+}
+
+int mem_fseek(MEMFILE *stream, signed long position, mem_rel_t whence)
+{
+	unsigned int newpos;
+
+	switch (whence)
+	{
+		case MEM_SEEK_SET:
+			newpos = (int) position;
+			break;
+
+		case MEM_SEEK_CUR:
+			newpos = (int) (stream->position + position);
+			break;
+			
+		case MEM_SEEK_END:
+			newpos = (int) (stream->buflen + position);
+			break;
+		default:
+			return -1;
+	}
+
+	if (newpos < stream->buflen)
+	{
+		stream->position = newpos;
+		return 0;
+	}
+	else
+	{
+		printf("Error seeking to %u\n", newpos);
+		return -1;
+	}
+}
+
+
diff --git a/games/NXDoom/src/memio.h b/games/NXDoom/src/memio.h
new file mode 100644
index 000000000..03706a317
--- /dev/null
+++ b/games/NXDoom/src/memio.h
@@ -0,0 +1,38 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef MEMIO_H
+#define MEMIO_H
+
+typedef struct _MEMFILE MEMFILE;
+
+typedef enum 
+{
+	MEM_SEEK_SET,
+	MEM_SEEK_CUR,
+	MEM_SEEK_END,
+} mem_rel_t;
+
+MEMFILE *mem_fopen_read(void *buf, size_t buflen);
+size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream);
+MEMFILE *mem_fopen_write(void);
+size_t mem_fwrite(const void *ptr, size_t size, size_t nmemb, MEMFILE *stream);
+void mem_get_buf(MEMFILE *stream, void **buf, size_t *buflen);
+void mem_fclose(MEMFILE *stream);
+long mem_ftell(MEMFILE *stream);
+int mem_fseek(MEMFILE *stream, signed long offset, mem_rel_t whence);
+
+#endif /* #ifndef MEMIO_H */
+	  
diff --git a/games/NXDoom/src/midifallback.c b/games/NXDoom/src/midifallback.c
new file mode 100644
index 000000000..615d6880f
--- /dev/null
+++ b/games/NXDoom/src/midifallback.c
@@ -0,0 +1,370 @@
+//
+// Copyright(C) 2022 ceski
+//
+// 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.
+//
+// DESCRIPTION:
+//      MIDI instrument fallback support
+//
+
+#ifdef _WIN32
+
+#include "doomtype.h"
+#include "midifile.h"
+#include "midifallback.h"
+
+static const byte drums_table[128] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+    0x18, 0x19, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+    0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+    0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+    0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F
+};
+
+static byte variation[128][128];
+static byte bank_msb[MIDI_CHANNELS_PER_TRACK];
+static byte drum_map[MIDI_CHANNELS_PER_TRACK];
+static boolean selected[MIDI_CHANNELS_PER_TRACK];
+
+static void UpdateDrumMap(const byte *msg, unsigned int length)
+{
+    byte idx;
+    byte checksum;
+
+    // GS allows drums on any channel using SysEx messages.
+    // The message format is F0 followed by:
+    //
+    // 41 10 42 12 40 <ch> 15 <map> <sum> F7
+    //
+    // <ch> is [11-19, 10, 1A-1F] for channels 1-16. Note the position of 10.
+    // <map> is 00-02 for off (normal part), drum map 1, or drum map 2.
+    // <sum> is checksum.
+
+    if (length == 10 &&
+        msg[0] == 0x41 && // Roland
+        msg[1] == 0x10 && // Device ID
+        msg[2] == 0x42 && // GS
+        msg[3] == 0x12 && // DT1
+        msg[4] == 0x40 && // Address MSB
+        msg[6] == 0x15 && // Address LSB
+        msg[9] == 0xF7)   // SysEx EOX
+    {
+        checksum = 128 - ((int)msg[4] + msg[5] + msg[6] + msg[7]) % 128;
+
+        if (msg[8] != checksum)
+        {
+            return;
+        }
+
+        if (msg[5] == 0x10) // Channel 10
+        {
+            idx = 9;
+        }
+        else if (msg[5] < 0x1A) // Channels 1-9
+        {
+            idx = (msg[5] & 0x0F) - 1;
+        }
+        else // Channels 11-16
+        {
+            idx = msg[5] & 0x0F;
+        }
+
+        drum_map[idx] = msg[7];
+    }
+}
+
+static boolean GetProgramFallback(byte idx, byte program,
+                                  midi_fallback_t *fallback)
+{
+    if (drum_map[idx] == 0) // Normal channel
+    {
+        if (bank_msb[idx] == 0 || variation[bank_msb[idx]][program])
+        {
+            // Found a capital or variation for this bank select MSB.
+            selected[idx] = true;
+            return false;
+        }
+
+        fallback->type = FALLBACK_BANK_MSB;
+
+        if (!selected[idx] || bank_msb[idx] > 63)
+        {
+            // Fall to capital when no instrument has (successfully)
+            // selected this variation or if the variation is above 63.
+            fallback->value = 0;
+            return true;
+        }
+
+        // A previous instrument used this variation but it's not
+        // valid for the current instrument. Fall to the next valid
+        // "sub-capital" (next variation that is a multiple of 8).
+        fallback->value = (bank_msb[idx] / 8) * 8;
+        while (fallback->value > 0)
+        {
+            if (variation[fallback->value][program])
+            {
+                break;
+            }
+            fallback->value -= 8;
+        }
+        return true;
+    }
+    else // Drums channel
+    {
+        if (program != drums_table[program])
+        {
+            // Use drum set from drums fallback table.
+            // Drums 0-63 and 127: same as original SC-55 (1.00 - 1.21).
+            // Drums 64-126: standard drum set (0).
+            fallback->type = FALLBACK_DRUMS;
+            fallback->value = drums_table[program];
+            selected[idx] = true;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void MIDI_CheckFallback(const midi_event_t *event, midi_fallback_t *fallback,
+                        boolean allow_sysex)
+{
+    byte idx;
+    byte program;
+
+    switch ((int)event->event_type)
+    {
+        case MIDI_EVENT_SYSEX:
+            if (allow_sysex)
+            {
+                UpdateDrumMap(event->data.sysex.data, event->data.sysex.length);
+            }
+            break;
+
+        case MIDI_EVENT_CONTROLLER:
+            idx = event->data.channel.channel;
+            switch (event->data.channel.param1)
+            {
+                case MIDI_CONTROLLER_BANK_SELECT_MSB:
+                    bank_msb[idx] = event->data.channel.param2;
+                    selected[idx] = false;
+                    break;
+
+                case MIDI_CONTROLLER_BANK_SELECT_LSB:
+                    selected[idx] = false;
+                    if (event->data.channel.param2 > 0)
+                    {
+                        // Bank select LSB > 0 not supported. This also
+                        // preserves user's current SC-XX map.
+                        fallback->type = FALLBACK_BANK_LSB;
+                        fallback->value = 0;
+                        return;
+                    }
+                    break;
+
+                case EMIDI_CONTROLLER_PROGRAM_CHANGE:
+                    program = event->data.channel.param2;
+                    if (GetProgramFallback(idx, program, fallback))
+                    {
+                        return;
+                    }
+                    break;
+            }
+            break;
+
+        case MIDI_EVENT_PROGRAM_CHANGE:
+            idx = event->data.channel.channel;
+            program = event->data.channel.param1;
+            if (GetProgramFallback(idx, program, fallback))
+            {
+                return;
+            }
+            break;
+    }
+
+    fallback->type = FALLBACK_NONE;
+    fallback->value = 0;
+}
+
+void MIDI_ResetFallback(void)
+{
+    int i;
+
+    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; i++)
+    {
+        bank_msb[i] = 0;
+        drum_map[i] = 0;
+        selected[i] = false;
+    }
+
+    // Channel 10 (index 9) is set to drum map 1 by default.
+    drum_map[9] = 1;
+}
+
+void MIDI_InitFallback(void)
+{
+    byte program;
+
+    MIDI_ResetFallback();
+
+    // Capital
+    for (program = 0; program < 128; program++)
+    {
+        variation[0][program] = 1;
+    }
+
+    // Variation #1
+    variation[1][38] = 1;
+    variation[1][57] = 1;
+    variation[1][60] = 1;
+    variation[1][80] = 1;
+    variation[1][81] = 1;
+    variation[1][98] = 1;
+    variation[1][102] = 1;
+    variation[1][104] = 1;
+    variation[1][120] = 1;
+    variation[1][121] = 1;
+    variation[1][122] = 1;
+    variation[1][123] = 1;
+    variation[1][124] = 1;
+    variation[1][125] = 1;
+    variation[1][126] = 1;
+    variation[1][127] = 1;
+
+    // Variation #2
+    variation[2][102] = 1;
+    variation[2][120] = 1;
+    variation[2][122] = 1;
+    variation[2][123] = 1;
+    variation[2][124] = 1;
+    variation[2][125] = 1;
+    variation[2][126] = 1;
+    variation[2][127] = 1;
+
+    // Variation #3
+    variation[3][122] = 1;
+    variation[3][123] = 1;
+    variation[3][124] = 1;
+    variation[3][125] = 1;
+    variation[3][126] = 1;
+    variation[3][127] = 1;
+
+    // Variation #4
+    variation[4][122] = 1;
+    variation[4][124] = 1;
+    variation[4][125] = 1;
+    variation[4][126] = 1;
+
+    // Variation #5
+    variation[5][122] = 1;
+    variation[5][124] = 1;
+    variation[5][125] = 1;
+    variation[5][126] = 1;
+
+    // Variation #6
+    variation[6][125] = 1;
+
+    // Variation #7
+    variation[7][125] = 1;
+
+    // Variation #8
+    variation[8][0] = 1;
+    variation[8][1] = 1;
+    variation[8][2] = 1;
+    variation[8][3] = 1;
+    variation[8][4] = 1;
+    variation[8][5] = 1;
+    variation[8][6] = 1;
+    variation[8][11] = 1;
+    variation[8][12] = 1;
+    variation[8][14] = 1;
+    variation[8][16] = 1;
+    variation[8][17] = 1;
+    variation[8][19] = 1;
+    variation[8][21] = 1;
+    variation[8][24] = 1;
+    variation[8][25] = 1;
+    variation[8][26] = 1;
+    variation[8][27] = 1;
+    variation[8][28] = 1;
+    variation[8][30] = 1;
+    variation[8][31] = 1;
+    variation[8][38] = 1;
+    variation[8][39] = 1;
+    variation[8][40] = 1;
+    variation[8][48] = 1;
+    variation[8][50] = 1;
+    variation[8][61] = 1;
+    variation[8][62] = 1;
+    variation[8][63] = 1;
+    variation[8][80] = 1;
+    variation[8][81] = 1;
+    variation[8][107] = 1;
+    variation[8][115] = 1;
+    variation[8][116] = 1;
+    variation[8][117] = 1;
+    variation[8][118] = 1;
+    variation[8][125] = 1;
+
+    // Variation #9
+    variation[9][14] = 1;
+    variation[9][118] = 1;
+    variation[9][125] = 1;
+
+    // Variation #16
+    variation[16][0] = 1;
+    variation[16][4] = 1;
+    variation[16][5] = 1;
+    variation[16][6] = 1;
+    variation[16][16] = 1;
+    variation[16][19] = 1;
+    variation[16][24] = 1;
+    variation[16][25] = 1;
+    variation[16][28] = 1;
+    variation[16][39] = 1;
+    variation[16][62] = 1;
+    variation[16][63] = 1;
+
+    // Variation #24
+    variation[24][4] = 1;
+    variation[24][6] = 1;
+
+    // Variation #32
+    variation[32][16] = 1;
+    variation[32][17] = 1;
+    variation[32][24] = 1;
+    variation[32][52] = 1;
+
+    // CM-64 Map (PCM)
+    for (program = 0; program < 64; program++)
+    {
+        variation[126][program] = 1;
+    }
+
+    // CM-64 Map (LA)
+    for (program = 0; program < 128; program++)
+    {
+        variation[127][program] = 1;
+    }
+}
+
+#endif
diff --git a/games/NXDoom/src/midifallback.h b/games/NXDoom/src/midifallback.h
new file mode 100644
index 000000000..6093b2e6f
--- /dev/null
+++ b/games/NXDoom/src/midifallback.h
@@ -0,0 +1,47 @@
+//
+// Copyright(C) 2022 ceski
+//
+// 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.
+//
+// DESCRIPTION:
+//      MIDI instrument fallback support
+//
+
+#ifdef _WIN32
+
+#ifndef MIDIFALLBACK_H
+#define MIDIFALLBACK_H
+
+#include "doomtype.h"
+#include "midifile.h"
+
+typedef enum midi_fallback_type_t
+{
+    FALLBACK_NONE,
+    FALLBACK_BANK_MSB,
+    FALLBACK_BANK_LSB,
+    FALLBACK_DRUMS,
+} midi_fallback_type_t;
+
+typedef struct midi_fallback_t
+{
+    midi_fallback_type_t type;
+    byte value;
+} midi_fallback_t;
+
+void MIDI_CheckFallback(const midi_event_t *event, midi_fallback_t *fallback,
+                        boolean allow_sysex);
+void MIDI_ResetFallback(void);
+void MIDI_InitFallback(void);
+
+#endif // MIDIFALLBACK_H
+
+#endif // _WIN32
diff --git a/games/NXDoom/src/midifile.c b/games/NXDoom/src/midifile.c
new file mode 100644
index 000000000..258154eea
--- /dev/null
+++ b/games/NXDoom/src/midifile.c
@@ -0,0 +1,838 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//    Reading of MIDI files.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "doomtype.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "midifile.h"
+
+#define HEADER_CHUNK_ID "MThd"
+#define TRACK_CHUNK_ID  "MTrk"
+#define MAX_BUFFER_SIZE 0x10000
+
+// haleyjd 09/09/10: packing required
+#ifdef _MSC_VER
+#pragma pack(push, 1)
+#endif
+
+typedef PACKED_STRUCT (
+{
+    byte chunk_id[4];
+    unsigned int chunk_size;
+}) chunk_header_t;
+
+typedef PACKED_STRUCT (
+{
+    chunk_header_t chunk_header;
+    unsigned short format_type;
+    unsigned short num_tracks;
+    unsigned short time_division;
+}) midi_header_t;
+
+// haleyjd 09/09/10: packing off.
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
+
+typedef struct
+{
+    // Length in bytes:
+
+    unsigned int data_len;
+
+    // Events in this track:
+
+    midi_event_t *events;
+    int num_events;
+} midi_track_t;
+
+struct midi_track_iter_s
+{
+    midi_track_t *track;
+    unsigned int position;
+    unsigned int loop_point;
+};
+
+struct midi_file_s
+{
+    midi_header_t header;
+
+    // All tracks in this file:
+    midi_track_t *tracks;
+    unsigned int num_tracks;
+
+    // Data buffer used to store data read for SysEx or meta events:
+    byte *buffer;
+    unsigned int buffer_size;
+};
+
+// Check the header of a chunk:
+
+static boolean CheckChunkHeader(chunk_header_t *chunk,
+                                const char *expected_id)
+{
+    boolean result;
+    
+    result = (memcmp((char *) chunk->chunk_id, expected_id, 4) == 0);
+
+    if (!result)
+    {
+        fprintf(stderr, "CheckChunkHeader: Expected '%s' chunk header, "
+                        "got '%c%c%c%c'\n",
+                        expected_id,
+                        chunk->chunk_id[0], chunk->chunk_id[1],
+                        chunk->chunk_id[2], chunk->chunk_id[3]);
+    }
+
+    return result;
+}
+
+// Read a single byte.  Returns false on error.
+
+static boolean ReadByte(byte *result, FILE *stream)
+{
+    int c;
+
+    c = fgetc(stream);
+
+    if (c == EOF)
+    {
+        fprintf(stderr, "ReadByte: Unexpected end of file\n");
+        return false;
+    }
+    else
+    {
+        *result = (byte) c;
+
+        return true;
+    }
+}
+
+// Read a variable-length value.
+
+static boolean ReadVariableLength(unsigned int *result, FILE *stream)
+{
+    int i;
+    byte b = 0;
+
+    *result = 0;
+
+    for (i=0; i<4; ++i)
+    {
+        if (!ReadByte(&b, stream))
+        {
+            fprintf(stderr, "ReadVariableLength: Error while reading "
+                            "variable-length value\n");
+            return false;
+        }
+
+        // Insert the bottom seven bits from this byte.
+
+        *result <<= 7;
+        *result |= b & 0x7f;
+
+        // If the top bit is not set, this is the end.
+
+        if ((b & 0x80) == 0)
+        {
+            return true;
+        }
+    }
+
+    fprintf(stderr, "ReadVariableLength: Variable-length value too "
+                    "long: maximum of four bytes\n");
+    return false;
+}
+
+// Read a byte sequence into the data buffer.
+
+static void *ReadByteSequence(unsigned int num_bytes, FILE *stream)
+{
+    unsigned int i;
+    byte *result;
+
+    // Allocate a buffer. Allocate one extra byte, as malloc(0) is
+    // non-portable.
+
+    result = malloc(num_bytes + 1);
+
+    if (result == NULL)
+    {
+        fprintf(stderr, "ReadByteSequence: Failed to allocate buffer\n");
+        return NULL;
+    }
+
+    // Read the data:
+
+    for (i=0; i<num_bytes; ++i)
+    {
+        if (!ReadByte(&result[i], stream))
+        {
+            fprintf(stderr, "ReadByteSequence: Error while reading byte %u\n",
+                            i);
+            free(result);
+            return NULL;
+        }
+    }
+
+    return result;
+}
+
+// Read a MIDI channel event.
+// two_param indicates that the event type takes two parameters
+// (three byte) otherwise it is single parameter (two byte)
+
+static boolean ReadChannelEvent(midi_event_t *event,
+                                byte event_type, boolean two_param,
+                                FILE *stream)
+{
+    byte b = 0;
+
+    // Set basics:
+
+    event->event_type = event_type & 0xf0;
+    event->data.channel.channel = event_type & 0x0f;
+
+    // Read parameters:
+
+    if (!ReadByte(&b, stream))
+    {
+        fprintf(stderr, "ReadChannelEvent: Error while reading channel "
+                        "event parameters\n");
+        return false;
+    }
+
+    event->data.channel.param1 = b;
+
+    // Second parameter:
+
+    if (two_param)
+    {
+        if (!ReadByte(&b, stream))
+        {
+            fprintf(stderr, "ReadChannelEvent: Error while reading channel "
+                            "event parameters\n");
+            return false;
+        }
+
+        event->data.channel.param2 = b;
+    }
+
+    return true;
+}
+
+// Read sysex event:
+
+static boolean ReadSysExEvent(midi_event_t *event, int event_type,
+                              FILE *stream)
+{
+    event->event_type = event_type;
+
+    if (!ReadVariableLength(&event->data.sysex.length, stream))
+    {
+        fprintf(stderr, "ReadSysExEvent: Failed to read length of "
+                                        "SysEx block\n");
+        return false;
+    }
+
+    // Read the byte sequence:
+
+    event->data.sysex.data = ReadByteSequence(event->data.sysex.length, stream);
+
+    if (event->data.sysex.data == NULL)
+    {
+        fprintf(stderr, "ReadSysExEvent: Failed while reading SysEx event\n");
+        return false;
+    }
+
+    return true;
+}
+
+// Read meta event:
+
+static boolean ReadMetaEvent(midi_event_t *event, FILE *stream)
+{
+    byte b = 0;
+
+    event->event_type = MIDI_EVENT_META;
+
+    // Read meta event type:
+
+    if (!ReadByte(&b, stream))
+    {
+        fprintf(stderr, "ReadMetaEvent: Failed to read meta event type\n");
+        return false;
+    }
+
+    event->data.meta.type = b;
+
+    // Read length of meta event data:
+
+    if (!ReadVariableLength(&event->data.meta.length, stream))
+    {
+        fprintf(stderr, "ReadSysExEvent: Failed to read length of "
+                                        "SysEx block\n");
+        return false;
+    }
+
+    // Read the byte sequence:
+
+    event->data.meta.data = ReadByteSequence(event->data.meta.length, stream);
+
+    if (event->data.meta.data == NULL)
+    {
+        fprintf(stderr, "ReadSysExEvent: Failed while reading SysEx event\n");
+        return false;
+    }
+
+    return true;
+}
+
+static boolean ReadEvent(midi_event_t *event, unsigned int *last_event_type,
+                         FILE *stream)
+{
+    byte event_type = 0;
+
+    if (!ReadVariableLength(&event->delta_time, stream))
+    {
+        fprintf(stderr, "ReadEvent: Failed to read event timestamp\n");
+        return false;
+    }
+
+    if (!ReadByte(&event_type, stream))
+    {
+        fprintf(stderr, "ReadEvent: Failed to read event type\n");
+        return false;
+    }
+
+    // All event types have their top bit set.  Therefore, if 
+    // the top bit is not set, it is because we are using the "same
+    // as previous event type" shortcut to save a byte.  Skip back
+    // a byte so that we read this byte again.
+
+    if ((event_type & 0x80) == 0)
+    {
+        event_type = *last_event_type;
+
+        if (fseek(stream, -1, SEEK_CUR) < 0)
+        {
+            fprintf(stderr, "ReadEvent: Unable to seek in stream\n");
+            return false;
+        }
+    }
+    else
+    {
+        *last_event_type = event_type;
+    }
+
+    // Check event type:
+
+    switch (event_type & 0xf0)
+    {
+        // Two parameter channel events:
+
+        case MIDI_EVENT_NOTE_OFF:
+        case MIDI_EVENT_NOTE_ON:
+        case MIDI_EVENT_AFTERTOUCH:
+        case MIDI_EVENT_CONTROLLER:
+        case MIDI_EVENT_PITCH_BEND:
+            return ReadChannelEvent(event, event_type, true, stream);
+
+        // Single parameter channel events:
+
+        case MIDI_EVENT_PROGRAM_CHANGE:
+        case MIDI_EVENT_CHAN_AFTERTOUCH:
+            return ReadChannelEvent(event, event_type, false, stream);
+
+        default:
+            break;
+    }
+
+    // Specific value?
+
+    switch (event_type)
+    {
+        case MIDI_EVENT_SYSEX:
+        case MIDI_EVENT_SYSEX_SPLIT:
+            return ReadSysExEvent(event, event_type, stream);
+
+        case MIDI_EVENT_META:
+            return ReadMetaEvent(event, stream);
+
+        default:
+            break;
+    }
+
+    fprintf(stderr, "ReadEvent: Unknown MIDI event type: 0x%x\n", event_type);
+    return false;
+}
+
+// Free an event:
+
+static void FreeEvent(midi_event_t *event)
+{
+    // Some event types have dynamically allocated buffers assigned
+    // to them that must be freed.
+
+    switch (event->event_type)
+    {
+        case MIDI_EVENT_SYSEX:
+        case MIDI_EVENT_SYSEX_SPLIT:
+            free(event->data.sysex.data);
+            break;
+
+        case MIDI_EVENT_META:
+            free(event->data.meta.data);
+            break;
+
+        default:
+            // Nothing to do.
+            break;
+    }
+}
+
+// Read and check the track chunk header
+
+static boolean ReadTrackHeader(midi_track_t *track, FILE *stream)
+{
+    size_t records_read;
+    chunk_header_t chunk_header;
+
+    records_read = fread(&chunk_header, sizeof(chunk_header_t), 1, stream);
+
+    if (records_read < 1)
+    {
+        return false;
+    }
+
+    if (!CheckChunkHeader(&chunk_header, TRACK_CHUNK_ID))
+    {
+        return false;
+    }
+
+    track->data_len = SDL_SwapBE32(chunk_header.chunk_size);
+
+    return true;
+}
+
+static boolean ReadTrack(midi_track_t *track, FILE *stream)
+{
+    midi_event_t *new_events;
+    midi_event_t *event;
+    unsigned int last_event_type;
+
+    track->num_events = 0;
+    track->events = NULL;
+
+    // Read the header:
+
+    if (!ReadTrackHeader(track, stream))
+    {
+        return false;
+    }
+
+    // Then the events:
+
+    last_event_type = 0;
+
+    for (;;)
+    {
+        // Resize the track slightly larger to hold another event:
+
+        new_events = I_Realloc(track->events, 
+                             sizeof(midi_event_t) * (track->num_events + 1));
+        track->events = new_events;
+
+        // Read the next event:
+
+        event = &track->events[track->num_events];
+        if (!ReadEvent(event, &last_event_type, stream))
+        {
+            return false;
+        }
+
+        ++track->num_events;
+
+        // End of track?
+
+        if (event->event_type == MIDI_EVENT_META
+         && event->data.meta.type == MIDI_META_END_OF_TRACK)
+        {
+            break;
+        }
+    }
+
+    return true;
+}
+
+// Free a track:
+
+static void FreeTrack(midi_track_t *track)
+{
+    unsigned int i;
+
+    for (i=0; i<track->num_events; ++i)
+    {
+        FreeEvent(&track->events[i]);
+    }
+
+    free(track->events);
+}
+
+static boolean ReadAllTracks(midi_file_t *file, FILE *stream)
+{
+    unsigned int i;
+
+    // Allocate list of tracks and read each track:
+
+    file->tracks = malloc(sizeof(midi_track_t) * file->num_tracks);
+
+    if (file->tracks == NULL)
+    {
+        return false;
+    }
+
+    memset(file->tracks, 0, sizeof(midi_track_t) * file->num_tracks);
+
+    // Read each track:
+
+    for (i=0; i<file->num_tracks; ++i)
+    {
+        if (!ReadTrack(&file->tracks[i], stream))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// Read and check the header chunk.
+
+static boolean ReadFileHeader(midi_file_t *file, FILE *stream)
+{
+    size_t records_read;
+    unsigned int format_type;
+
+    records_read = fread(&file->header, sizeof(midi_header_t), 1, stream);
+
+    if (records_read < 1)
+    {
+        return false;
+    }
+
+    if (!CheckChunkHeader(&file->header.chunk_header, HEADER_CHUNK_ID)
+     || SDL_SwapBE32(file->header.chunk_header.chunk_size) != 6)
+    {
+        fprintf(stderr, "ReadFileHeader: Invalid MIDI chunk header! "
+                        "chunk_size=%i\n",
+                        SDL_SwapBE32(file->header.chunk_header.chunk_size));
+        return false;
+    }
+
+    format_type = SDL_SwapBE16(file->header.format_type);
+    file->num_tracks = SDL_SwapBE16(file->header.num_tracks);
+
+    if ((format_type != 0 && format_type != 1)
+     || file->num_tracks < 1)
+    {
+        fprintf(stderr, "ReadFileHeader: Only type 0/1 "
+                                         "MIDI files supported!\n");
+        return false;
+    }
+
+    return true;
+}
+
+void MIDI_FreeFile(midi_file_t *file)
+{
+    int i;
+
+    if (file->tracks != NULL)
+    {
+        for (i=0; i<file->num_tracks; ++i)
+        {
+            FreeTrack(&file->tracks[i]);
+        }
+
+        free(file->tracks);
+    }
+
+    free(file);
+}
+
+midi_file_t *MIDI_LoadFile(char *filename)
+{
+    midi_file_t *file;
+    FILE *stream;
+
+    file = malloc(sizeof(midi_file_t));
+
+    if (file == NULL)
+    {
+        return NULL;
+    }
+
+    file->tracks = NULL;
+    file->num_tracks = 0;
+    file->buffer = NULL;
+    file->buffer_size = 0;
+
+    // Open file
+
+    stream = M_fopen(filename, "rb");
+
+    if (stream == NULL)
+    {
+        fprintf(stderr, "MIDI_LoadFile: Failed to open '%s'\n", filename);
+        MIDI_FreeFile(file);
+        return NULL;
+    }
+
+    // Read MIDI file header
+
+    if (!ReadFileHeader(file, stream))
+    {
+        fclose(stream);
+        MIDI_FreeFile(file);
+        return NULL;
+    }
+
+    // Read all tracks:
+
+    if (!ReadAllTracks(file, stream))
+    {
+        fclose(stream);
+        MIDI_FreeFile(file);
+        return NULL;
+    }
+
+    fclose(stream);
+
+    return file;
+}
+
+// Get the number of tracks in a MIDI file.
+
+unsigned int MIDI_NumTracks(midi_file_t *file)
+{
+    return file->num_tracks;
+}
+
+// Start iterating over the events in a track.
+
+midi_track_iter_t *MIDI_IterateTrack(midi_file_t *file, unsigned int track)
+{
+    midi_track_iter_t *iter;
+
+    assert(track < file->num_tracks);
+
+    iter = malloc(sizeof(*iter));
+    iter->track = &file->tracks[track];
+    iter->position = 0;
+    iter->loop_point = 0;
+
+    return iter;
+}
+
+void MIDI_FreeIterator(midi_track_iter_t *iter)
+{
+    free(iter);
+}
+
+// Get the time until the next MIDI event in a track.
+
+unsigned int MIDI_GetDeltaTime(midi_track_iter_t *iter)
+{
+    if (iter->position < iter->track->num_events)
+    {
+        midi_event_t *next_event;
+
+        next_event = &iter->track->events[iter->position];
+
+        return next_event->delta_time;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// Get a pointer to the next MIDI event.
+
+int MIDI_GetNextEvent(midi_track_iter_t *iter, midi_event_t **event)
+{
+    if (iter->position < iter->track->num_events)
+    {
+        *event = &iter->track->events[iter->position];
+        ++iter->position;
+
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+unsigned int MIDI_GetFileTimeDivision(midi_file_t *file)
+{
+    short result = SDL_SwapBE16(file->header.time_division);
+
+    // Negative time division indicates SMPTE time and must be handled
+    // differently.
+    if (result < 0)
+    {
+        return (signed int)(-(result/256))
+             * (signed int)(result & 0xFF);
+    }
+    else
+    {
+        return result;
+    }
+}
+
+void MIDI_RestartIterator(midi_track_iter_t *iter)
+{
+    iter->position = 0;
+    iter->loop_point = 0;
+}
+
+void MIDI_SetLoopPoint(midi_track_iter_t *iter)
+{
+    iter->loop_point = iter->position;
+}
+
+void MIDI_RestartAtLoopPoint(midi_track_iter_t *iter)
+{
+    iter->position = iter->loop_point;
+}
+
+#ifdef TEST
+
+static char *MIDI_EventTypeToString(midi_event_type_t event_type)
+{
+    switch (event_type)
+    {
+        case MIDI_EVENT_NOTE_OFF:
+            return "MIDI_EVENT_NOTE_OFF";
+        case MIDI_EVENT_NOTE_ON:
+            return "MIDI_EVENT_NOTE_ON";
+        case MIDI_EVENT_AFTERTOUCH:
+            return "MIDI_EVENT_AFTERTOUCH";
+        case MIDI_EVENT_CONTROLLER:
+            return "MIDI_EVENT_CONTROLLER";
+        case MIDI_EVENT_PROGRAM_CHANGE:
+            return "MIDI_EVENT_PROGRAM_CHANGE";
+        case MIDI_EVENT_CHAN_AFTERTOUCH:
+            return "MIDI_EVENT_CHAN_AFTERTOUCH";
+        case MIDI_EVENT_PITCH_BEND:
+            return "MIDI_EVENT_PITCH_BEND";
+        case MIDI_EVENT_SYSEX:
+            return "MIDI_EVENT_SYSEX";
+        case MIDI_EVENT_SYSEX_SPLIT:
+            return "MIDI_EVENT_SYSEX_SPLIT";
+        case MIDI_EVENT_META:
+            return "MIDI_EVENT_META";
+
+        default:
+            return "(unknown)";
+    }
+}
+
+void PrintTrack(midi_track_t *track)
+{
+    midi_event_t *event;
+    unsigned int i;
+
+    for (i=0; i<track->num_events; ++i)
+    {
+        event = &track->events[i];
+
+        if (event->delta_time > 0)
+        {
+            printf("Delay: %u ticks\n", event->delta_time);
+        }
+
+        printf("Event type: %s (%i)\n",
+               MIDI_EventTypeToString(event->event_type),
+               event->event_type);
+
+        switch(event->event_type)
+        {
+            case MIDI_EVENT_NOTE_OFF:
+            case MIDI_EVENT_NOTE_ON:
+            case MIDI_EVENT_AFTERTOUCH:
+            case MIDI_EVENT_CONTROLLER:
+            case MIDI_EVENT_PROGRAM_CHANGE:
+            case MIDI_EVENT_CHAN_AFTERTOUCH:
+            case MIDI_EVENT_PITCH_BEND:
+                printf("\tChannel: %u\n", event->data.channel.channel);
+                printf("\tParameter 1: %u\n", event->data.channel.param1);
+                printf("\tParameter 2: %u\n", event->data.channel.param2);
+                break;
+
+            case MIDI_EVENT_SYSEX:
+            case MIDI_EVENT_SYSEX_SPLIT:
+                printf("\tLength: %u\n", event->data.sysex.length);
+                break;
+
+            case MIDI_EVENT_META:
+                printf("\tMeta type: %u\n", event->data.meta.type);
+                printf("\tLength: %u\n", event->data.meta.length);
+                break;
+        }
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    midi_file_t *file;
+    unsigned int i;
+
+    if (argc < 2)
+    {
+        printf("Usage: %s <filename>\n", argv[0]);
+        exit(1);
+    }
+
+    file = MIDI_LoadFile(argv[1]);
+
+    if (file == NULL)
+    {
+        fprintf(stderr, "Failed to open %s\n", argv[1]);
+        exit(1);
+    }
+
+    for (i=0; i<file->num_tracks; ++i)
+    {
+        printf("\n== Track %u ==\n\n", i);
+
+        PrintTrack(&file->tracks[i]);
+    }
+
+    return 0;
+}
+
+#endif
+
diff --git a/games/NXDoom/src/midifile.h b/games/NXDoom/src/midifile.h
new file mode 100644
index 000000000..035d6f8aa
--- /dev/null
+++ b/games/NXDoom/src/midifile.h
@@ -0,0 +1,232 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     MIDI file parsing.
+//
+
+#ifndef MIDIFILE_H
+#define MIDIFILE_H
+
+typedef struct midi_file_s midi_file_t;
+typedef struct midi_track_iter_s midi_track_iter_t;
+
+#define MIDI_CHANNELS_PER_TRACK 16
+
+#define MIDI_RPN_MSB                 0x00
+#define MIDI_RPN_PITCH_BEND_SENS_LSB 0x00
+#define MIDI_RPN_FINE_TUNING_LSB     0x01
+#define MIDI_RPN_COARSE_TUNING_LSB   0x02
+#define MIDI_RPN_NULL                0x7F
+
+typedef enum
+{
+    MIDI_EVENT_NOTE_OFF        = 0x80,
+    MIDI_EVENT_NOTE_ON         = 0x90,
+    MIDI_EVENT_AFTERTOUCH      = 0xA0,
+    MIDI_EVENT_CONTROLLER      = 0xB0,
+    MIDI_EVENT_PROGRAM_CHANGE  = 0xC0,
+    MIDI_EVENT_CHAN_AFTERTOUCH = 0xD0,
+    MIDI_EVENT_PITCH_BEND      = 0xE0,
+
+    MIDI_EVENT_SYSEX           = 0xF0,
+    MIDI_EVENT_SYSEX_SPLIT     = 0xF7,
+    MIDI_EVENT_META            = 0xFF,
+} midi_event_type_t;
+
+typedef enum
+{
+    MIDI_CONTROLLER_BANK_SELECT_MSB = 0x00,
+    MIDI_CONTROLLER_MODULATION      = 0x01,
+    MIDI_CONTROLLER_BREATH_CONTROL  = 0x02,
+    MIDI_CONTROLLER_FOOT_CONTROL    = 0x04,
+    MIDI_CONTROLLER_PORTAMENTO      = 0x05,
+    MIDI_CONTROLLER_DATA_ENTRY_MSB  = 0x06,
+    MIDI_CONTROLLER_VOLUME_MSB      = 0x07,
+    MIDI_CONTROLLER_PAN             = 0x0A,
+    MIDI_CONTROLLER_EXPRESSION      = 0x0B,
+
+    MIDI_CONTROLLER_BANK_SELECT_LSB = 0x20,
+    MIDI_CONTROLLER_DATA_ENTRY_LSB  = 0x26,
+    MIDI_CONTROLLER_VOLUME_LSB      = 0X27,
+
+    MIDI_CONTROLLER_HOLD1_PEDAL     = 0x40,
+    MIDI_CONTROLLER_SOFT_PEDAL      = 0x43,
+
+    MIDI_CONTROLLER_REVERB          = 0x5B,
+    MIDI_CONTROLLER_CHORUS          = 0x5D,
+
+    MIDI_CONTROLLER_NRPN_LSB        = 0x62,
+    MIDI_CONTROLLER_NRPN_MSB        = 0x63,
+    MIDI_CONTROLLER_RPN_LSB         = 0x64,
+    MIDI_CONTROLLER_RPN_MSB         = 0x65,
+
+    MIDI_CONTROLLER_ALL_SOUND_OFF   = 0x78,
+    MIDI_CONTROLLER_RESET_ALL_CTRLS = 0x79,
+    MIDI_CONTROLLER_ALL_NOTES_OFF   = 0x7B,
+
+    MIDI_CONTROLLER_POLY_MODE_OFF   = 0x7E,
+    MIDI_CONTROLLER_POLY_MODE_ON    = 0x7F,
+} midi_controller_t;
+
+typedef enum
+{
+    MIDI_META_SEQUENCE_NUMBER       = 0x00,
+
+    MIDI_META_TEXT                  = 0x01,
+    MIDI_META_COPYRIGHT             = 0x02,
+    MIDI_META_TRACK_NAME            = 0x03,
+    MIDI_META_INSTR_NAME            = 0x04,
+    MIDI_META_LYRICS                = 0x05,
+    MIDI_META_MARKER                = 0x06,
+    MIDI_META_CUE_POINT             = 0x07,
+
+    MIDI_META_CHANNEL_PREFIX        = 0x20,
+    MIDI_META_END_OF_TRACK          = 0x2F,
+
+    MIDI_META_SET_TEMPO             = 0x51,
+    MIDI_META_SMPTE_OFFSET          = 0x54,
+    MIDI_META_TIME_SIGNATURE        = 0x58,
+    MIDI_META_KEY_SIGNATURE         = 0x59,
+    MIDI_META_SEQUENCER_SPECIFIC    = 0x7F,
+} midi_meta_event_type_t;
+
+#define EMIDI_LOOP_FLAG 0x7F
+
+typedef enum
+{
+    EMIDI_DEVICE_GENERAL_MIDI  = 0x00,
+    EMIDI_DEVICE_SOUND_CANVAS  = 0x01,
+    EMIDI_DEVICE_AWE32         = 0x02,
+    EMIDI_DEVICE_WAVE_BLASTER  = 0x03,
+    EMIDI_DEVICE_SOUND_BLASTER = 0x04,
+    EMIDI_DEVICE_PRO_AUDIO     = 0x05,
+    EMIDI_DEVICE_SOUND_MAN_16  = 0x06,
+    EMIDI_DEVICE_ADLIB         = 0x07,
+    EMIDI_DEVICE_SOUNDSCAPE    = 0x08,
+    EMIDI_DEVICE_ULTRASOUND    = 0x09,
+    EMIDI_DEVICE_ALL           = 0x7F,
+} emidi_device_t;
+
+typedef enum
+{
+    EMIDI_CONTROLLER_TRACK_DESIGNATION = 0x6E,
+    EMIDI_CONTROLLER_TRACK_EXCLUSION   = 0x6F,
+    EMIDI_CONTROLLER_PROGRAM_CHANGE    = 0x70,
+    EMIDI_CONTROLLER_VOLUME            = 0x71,
+    EMIDI_CONTROLLER_LOOP_BEGIN        = 0x74,
+    EMIDI_CONTROLLER_LOOP_END          = 0x75,
+    EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN = 0x76,
+    EMIDI_CONTROLLER_GLOBAL_LOOP_END   = 0x77,
+} emidi_controller_t;
+
+typedef struct
+{
+    // Meta event type:
+
+    unsigned int type;
+
+    // Length:
+
+    unsigned int length;
+
+    // Meta event data:
+
+    byte *data;
+} midi_meta_event_data_t;
+
+typedef struct
+{
+    // Length:
+
+    unsigned int length;
+
+    // Event data:
+
+    byte *data;
+} midi_sysex_event_data_t;
+
+typedef struct
+{
+    // The channel number to which this applies:
+
+    unsigned int channel;
+
+    // Extra parameters:
+
+    unsigned int param1;
+    unsigned int param2;
+} midi_channel_event_data_t;
+
+typedef struct
+{
+    // Time between the previous event and this event.
+    unsigned int delta_time;
+
+    // Type of event:
+    midi_event_type_t event_type;
+
+    union
+    {
+        midi_channel_event_data_t channel;
+        midi_meta_event_data_t meta;
+        midi_sysex_event_data_t sysex;
+    } data;
+} midi_event_t;
+
+// Load a MIDI file.
+
+midi_file_t *MIDI_LoadFile(char *filename);
+
+// Free a MIDI file.
+
+void MIDI_FreeFile(midi_file_t *file);
+
+// Get the time division value from the MIDI header.
+
+unsigned int MIDI_GetFileTimeDivision(midi_file_t *file);
+
+// Get the number of tracks in a MIDI file.
+
+unsigned int MIDI_NumTracks(midi_file_t *file);
+
+// Start iterating over the events in a track.
+
+midi_track_iter_t *MIDI_IterateTrack(midi_file_t *file, unsigned int track_num);
+
+// Free an iterator.
+
+void MIDI_FreeIterator(midi_track_iter_t *iter);
+
+// Get the time until the next MIDI event in a track.
+
+unsigned int MIDI_GetDeltaTime(midi_track_iter_t *iter);
+
+// Get a pointer to the next MIDI event.
+
+int MIDI_GetNextEvent(midi_track_iter_t *iter, midi_event_t **event);
+
+// Reset an iterator to the beginning of a track.
+
+void MIDI_RestartIterator(midi_track_iter_t *iter);
+
+// Set loop point to current position.
+
+void MIDI_SetLoopPoint(midi_track_iter_t *iter);
+
+// Set position to saved loop point.
+
+void MIDI_RestartAtLoopPoint(midi_track_iter_t *iter);
+
+#endif /* #ifndef MIDIFILE_H */
+
diff --git a/games/NXDoom/src/mus2mid.c b/games/NXDoom/src/mus2mid.c
new file mode 100644
index 000000000..f81f939f2
--- /dev/null
+++ b/games/NXDoom/src/mus2mid.c
@@ -0,0 +1,736 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2006 Ben Ryves 2006
+//
+// 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.
+//
+// mus2mid.c - Ben Ryves 2006 - http://benryves.com - benryves@benryves.com
+// Use to convert a MUS file into a single track, type 0 MIDI file.
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "i_swap.h"
+
+#include "memio.h"
+#include "mus2mid.h"
+
+#define NUM_CHANNELS 16
+
+#define MIDI_PERCUSSION_CHAN 9
+#define MUS_PERCUSSION_CHAN 15
+
+// MUS event codes
+typedef enum
+{
+    mus_releasekey = 0x00,
+    mus_presskey = 0x10,
+    mus_pitchwheel = 0x20,
+    mus_systemevent = 0x30,
+    mus_changecontroller = 0x40,
+    mus_scoreend = 0x60
+} musevent;
+
+// MIDI event codes
+typedef enum
+{
+    midi_releasekey = 0x80,
+    midi_presskey = 0x90,
+    midi_aftertouchkey = 0xA0,
+    midi_changecontroller = 0xB0,
+    midi_changepatch = 0xC0,
+    midi_aftertouchchannel = 0xD0,
+    midi_pitchwheel = 0xE0
+} midievent;
+
+// Structure to hold MUS file header
+typedef PACKED_STRUCT (
+{
+    byte id[4];
+    unsigned short scorelength;
+    unsigned short scorestart;
+    unsigned short primarychannels;
+    unsigned short secondarychannels;
+    unsigned short instrumentcount;
+}) musheader;
+
+// Standard MIDI type 0 header + track header
+static const byte midiheader[] =
+{
+    'M', 'T', 'h', 'd',     // Main header
+    0x00, 0x00, 0x00, 0x06, // Header size
+    0x00, 0x00,             // MIDI type (0)
+    0x00, 0x01,             // Number of tracks
+    0x00, 0x46,             // Resolution
+    'M', 'T', 'r', 'k',        // Start of track
+    0x00, 0x00, 0x00, 0x00  // Placeholder for track length
+};
+
+// Cached channel velocities
+static byte channelvelocities[] =
+{
+    127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127
+};
+
+// Timestamps between sequences of MUS events
+
+static unsigned int queuedtime = 0;
+
+// Counter for the length of the track
+
+static unsigned int tracksize;
+
+static const byte controller_map[] =
+{
+    0x00, 0x20, 0x01, 0x07, 0x0A, 0x0B, 0x5B, 0x5D,
+    0x40, 0x43, 0x78, 0x7B, 0x7E, 0x7F, 0x79
+};
+
+static int channel_map[NUM_CHANNELS];
+
+// Write timestamp to a MIDI file.
+
+static boolean WriteTime(unsigned int time, MEMFILE *midioutput)
+{
+    unsigned int buffer = time & 0x7F;
+    byte writeval;
+
+    while ((time >>= 7) != 0)
+    {
+        buffer <<= 8;
+        buffer |= ((time & 0x7F) | 0x80);
+    }
+
+    for (;;)
+    {
+        writeval = (byte)(buffer & 0xFF);
+
+        if (mem_fwrite(&writeval, 1, 1, midioutput) != 1)
+        {
+            return true;
+        }
+
+        ++tracksize;
+
+        if ((buffer & 0x80) != 0)
+        {
+            buffer >>= 8;
+        }
+        else
+        {
+            queuedtime = 0;
+            return false;
+        }
+    }
+}
+
+
+// Write the end of track marker
+static boolean WriteEndTrack(MEMFILE *midioutput)
+{
+    byte endtrack[] = {0xFF, 0x2F, 0x00};
+
+    if (WriteTime(queuedtime, midioutput))
+    {
+        return true;
+    }
+
+    if (mem_fwrite(endtrack, 1, 3, midioutput) != 3)
+    {
+        return true;
+    }
+
+    tracksize += 3;
+    return false;
+}
+
+// Write a key press event
+static boolean WritePressKey(byte channel, byte key,
+                             byte velocity, MEMFILE *midioutput)
+{
+    byte working = midi_presskey | channel;
+
+    if (WriteTime(queuedtime, midioutput))
+    {
+        return true;
+    }
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = key & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = velocity & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    tracksize += 3;
+
+    return false;
+}
+
+// Write a key release event
+static boolean WriteReleaseKey(byte channel, byte key,
+                               MEMFILE *midioutput)
+{
+    byte working = midi_releasekey | channel;
+
+    if (WriteTime(queuedtime, midioutput))
+    {
+        return true;
+    }
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = key & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = 0;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    tracksize += 3;
+
+    return false;
+}
+
+// Write a pitch wheel/bend event
+static boolean WritePitchWheel(byte channel, short wheel,
+                               MEMFILE *midioutput)
+{
+    byte working = midi_pitchwheel | channel;
+
+    if (WriteTime(queuedtime, midioutput))
+    {
+        return true;
+    }
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = wheel & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = (wheel >> 7) & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    tracksize += 3;
+    return false;
+}
+
+// Write a patch change event
+static boolean WriteChangePatch(byte channel, byte patch,
+                                MEMFILE *midioutput)
+{
+    byte working = midi_changepatch | channel;
+
+    if (WriteTime(queuedtime, midioutput))
+    {
+        return true;
+    }
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = patch & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    tracksize += 2;
+
+    return false;
+}
+
+// Write a valued controller change event
+
+static boolean WriteChangeController_Valued(byte channel,
+                                            byte control,
+                                            byte value,
+                                            MEMFILE *midioutput)
+{
+    byte working = midi_changecontroller | channel;
+
+    if (WriteTime(queuedtime, midioutput))
+    {
+        return true;
+    }
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    working = control & 0x7F;
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    // Quirk in vanilla DOOM? MUS controller values should be
+    // 7-bit, not 8-bit.
+
+    working = value;// & 0x7F;
+
+    // Fix on said quirk to stop MIDI players from complaining that
+    // the value is out of range:
+
+    if (working & 0x80)
+    {
+        working = 0x7F;
+    }
+
+    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+    {
+        return true;
+    }
+
+    tracksize += 3;
+
+    return false;
+}
+
+// Write a valueless controller change event
+static boolean WriteChangeController_Valueless(byte channel,
+                                               byte control,
+                                               MEMFILE *midioutput)
+{
+    return WriteChangeController_Valued(channel, control, 0,
+                                             midioutput);
+}
+
+// Allocate a free MIDI channel.
+
+static int AllocateMIDIChannel(void)
+{
+    int result;
+    int max;
+    int i;
+
+    // Find the current highest-allocated channel.
+
+    max = -1;
+
+    for (i=0; i<NUM_CHANNELS; ++i)
+    {
+        if (channel_map[i] > max)
+        {
+            max = channel_map[i];
+        }
+    }
+
+    // max is now equal to the highest-allocated MIDI channel.  We can
+    // now allocate the next available channel.  This also works if
+    // no channels are currently allocated (max=-1)
+
+    result = max + 1;
+
+    // Don't allocate the MIDI percussion channel!
+
+    if (result == MIDI_PERCUSSION_CHAN)
+    {
+        ++result;
+    }
+
+    return result;
+}
+
+// Given a MUS channel number, get the MIDI channel number to use
+// in the outputted file.
+
+static int GetMIDIChannel(int mus_channel, MEMFILE *midioutput)
+{
+    // Find the MIDI channel to use for this MUS channel.
+    // MUS channel 15 is the percusssion channel.
+
+    if (mus_channel == MUS_PERCUSSION_CHAN)
+    {
+        return MIDI_PERCUSSION_CHAN;
+    }
+    else
+    {
+        // If a MIDI channel hasn't been allocated for this MUS channel
+        // yet, allocate the next free MIDI channel.
+
+        if (channel_map[mus_channel] == -1)
+        {
+            channel_map[mus_channel] = AllocateMIDIChannel();
+
+            // First time using the channel, send an "all notes off"
+            // event. This fixes "The D_DDTBLU disease" described here:
+            // https://www.doomworld.com/vb/source-ports/66802-the
+            WriteChangeController_Valueless(channel_map[mus_channel], 0x7b,
+                                            midioutput);
+        }
+
+        return channel_map[mus_channel];
+    }
+}
+
+static boolean ReadMusHeader(MEMFILE *file, musheader *header)
+{
+    boolean result;
+
+    result = mem_fread(&header->id, sizeof(byte), 4, file) == 4
+          && mem_fread(&header->scorelength, sizeof(short), 1, file) == 1
+          && mem_fread(&header->scorestart, sizeof(short), 1, file) == 1
+          && mem_fread(&header->primarychannels, sizeof(short), 1, file) == 1
+          && mem_fread(&header->secondarychannels, sizeof(short), 1, file) == 1
+          && mem_fread(&header->instrumentcount, sizeof(short), 1, file) == 1;
+
+    if (result)
+    {
+        header->scorelength = SHORT(header->scorelength);
+        header->scorestart = SHORT(header->scorestart);
+        header->primarychannels = SHORT(header->primarychannels);
+        header->secondarychannels = SHORT(header->secondarychannels);
+        header->instrumentcount = SHORT(header->instrumentcount);
+    }
+
+    return result;
+}
+
+
+// Read a MUS file from a stream (musinput) and output a MIDI file to
+// a stream (midioutput).
+//
+// Returns 0 on success or 1 on failure.
+
+boolean mus2mid(MEMFILE *musinput, MEMFILE *midioutput)
+{
+    // Header for the MUS file
+    musheader musfileheader;
+
+    // Descriptor for the current MUS event
+    byte eventdescriptor;
+    int channel; // Channel number
+    musevent event;
+
+
+    // Bunch of vars read from MUS lump
+    byte key;
+    byte controllernumber;
+    byte controllervalue;
+
+    // Buffer used for MIDI track size record
+    byte tracksizebuffer[4];
+
+    // Flag for when the score end marker is hit.
+    int hitscoreend = 0;
+
+    // Temp working byte
+    byte working;
+    // Used in building up time delays
+    unsigned int timedelay;
+
+    // Initialise channel map to mark all channels as unused.
+
+    for (channel=0; channel<NUM_CHANNELS; ++channel)
+    {
+        channel_map[channel] = -1;
+    }
+
+    // Grab the header
+
+    if (!ReadMusHeader(musinput, &musfileheader))
+    {
+        return true;
+    }
+
+#ifdef CHECK_MUS_HEADER
+    // Check MUS header
+    if (musfileheader.id[0] != 'M'
+     || musfileheader.id[1] != 'U'
+     || musfileheader.id[2] != 'S'
+     || musfileheader.id[3] != 0x1A)
+    {
+        return true;
+    }
+#endif
+
+    // Seek to where the data is held
+    if (mem_fseek(musinput, (long)musfileheader.scorestart,
+                  MEM_SEEK_SET) != 0)
+    {
+        return true;
+    }
+
+    // So, we can assume the MUS file is faintly legit. Let's start
+    // writing MIDI data...
+
+    mem_fwrite(midiheader, 1, sizeof(midiheader), midioutput);
+    tracksize = 0;
+
+    // Now, process the MUS file:
+    while (!hitscoreend)
+    {
+        // Handle a block of events:
+
+        while (!hitscoreend)
+        {
+            // Fetch channel number and event code:
+
+            if (mem_fread(&eventdescriptor, 1, 1, musinput) != 1)
+            {
+                return true;
+            }
+
+            channel = GetMIDIChannel(eventdescriptor & 0x0F, midioutput);
+            event = eventdescriptor & 0x70;
+
+            switch (event)
+            {
+                case mus_releasekey:
+                    if (mem_fread(&key, 1, 1, musinput) != 1)
+                    {
+                        return true;
+                    }
+
+                    if (WriteReleaseKey(channel, key, midioutput))
+                    {
+                        return true;
+                    }
+
+                    break;
+
+                case mus_presskey:
+                    if (mem_fread(&key, 1, 1, musinput) != 1)
+                    {
+                        return true;
+                    }
+
+                    if (key & 0x80)
+                    {
+                        if (mem_fread(&channelvelocities[channel], 1, 1, musinput) != 1)
+                        {
+                            return true;
+                        }
+
+                        channelvelocities[channel] &= 0x7F;
+                    }
+
+                    if (WritePressKey(channel, key,
+                                      channelvelocities[channel], midioutput))
+                    {
+                        return true;
+                    }
+
+                    break;
+
+                case mus_pitchwheel:
+                    if (mem_fread(&key, 1, 1, musinput) != 1)
+                    {
+                        break;
+                    }
+                    if (WritePitchWheel(channel, (short)(key * 64), midioutput))
+                    {
+                        return true;
+                    }
+
+                    break;
+
+                case mus_systemevent:
+                    if (mem_fread(&controllernumber, 1, 1, musinput) != 1)
+                    {
+                        return true;
+                    }
+                    if (controllernumber < 10 || controllernumber > 14)
+                    {
+                        return true;
+                    }
+
+                    if (WriteChangeController_Valueless(channel,
+                                                        controller_map[controllernumber],
+                                                        midioutput))
+                    {
+                        return true;
+                    }
+
+                    break;
+
+                case mus_changecontroller:
+                    if (mem_fread(&controllernumber, 1, 1, musinput) != 1)
+                    {
+                        return true;
+                    }
+
+                    if (mem_fread(&controllervalue, 1, 1, musinput) != 1)
+                    {
+                        return true;
+                    }
+
+                    if (controllernumber == 0)
+                    {
+                        if (WriteChangePatch(channel, controllervalue,
+                                             midioutput))
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        if (controllernumber < 1 || controllernumber > 9)
+                        {
+                            return true;
+                        }
+
+                        if (WriteChangeController_Valued(channel,
+                                                         controller_map[controllernumber],
+                                                         controllervalue,
+                                                         midioutput))
+                        {
+                            return true;
+                        }
+                    }
+
+                    break;
+
+                case mus_scoreend:
+                    hitscoreend = 1;
+                    break;
+
+                default:
+                    return true;
+                    break;
+            }
+
+            if (eventdescriptor & 0x80)
+            {
+                break;
+            }
+        }
+        // Now we need to read the time code:
+        if (!hitscoreend)
+        {
+            timedelay = 0;
+            for (;;)
+            {
+                if (mem_fread(&working, 1, 1, musinput) != 1)
+                {
+                    return true;
+                }
+
+                timedelay = timedelay * 128 + (working & 0x7F);
+                if ((working & 0x80) == 0)
+                {
+                    break;
+                }
+            }
+            queuedtime += timedelay;
+        }
+    }
+
+    // End of track
+    if (WriteEndTrack(midioutput))
+    {
+        return true;
+    }
+
+    // Write the track size into the stream
+    if (mem_fseek(midioutput, 18, MEM_SEEK_SET))
+    {
+        return true;
+    }
+
+    tracksizebuffer[0] = (tracksize >> 24) & 0xff;
+    tracksizebuffer[1] = (tracksize >> 16) & 0xff;
+    tracksizebuffer[2] = (tracksize >> 8) & 0xff;
+    tracksizebuffer[3] = tracksize & 0xff;
+
+    if (mem_fwrite(tracksizebuffer, 1, 4, midioutput) != 4)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+#ifdef STANDALONE
+
+#include "m_misc.h"
+#include "z_zone.h"
+
+int main(int argc, char *argv[])
+{
+    MEMFILE *src, *dst;
+    byte *infile;
+    long infile_len;
+    void *outfile;
+    size_t outfile_len;
+
+    if (argc != 3)
+    {
+        printf("Usage: %s <musfile> <midfile>\n", argv[0]);
+        exit(-1);
+    }
+
+    Z_Init();
+
+    infile_len = M_ReadFile(argv[1], &infile);
+
+    src = mem_fopen_read(infile, infile_len);
+    dst = mem_fopen_write();
+
+    if (mus2mid(src, dst))
+    {
+        fprintf(stderr, "mus2mid() failed\n");
+        exit(-1);
+    }
+
+    // Write result to output file:
+
+    mem_get_buf(dst, &outfile, &outfile_len);
+
+    M_WriteFile(argv[2], outfile, outfile_len);
+
+    return 0;
+}
+
+#endif
+
diff --git a/games/NXDoom/src/mus2mid.h b/games/NXDoom/src/mus2mid.h
new file mode 100644
index 000000000..324025a2c
--- /dev/null
+++ b/games/NXDoom/src/mus2mid.h
@@ -0,0 +1,29 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2006 Ben Ryves 2006
+//
+// 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.
+//
+//
+// mus2mid.h - Ben Ryves 2006 - http://benryves.com - benryves@benryves.com
+// Use to convert a MUS file into a single track, type 0 MIDI file.
+
+#ifndef MUS2MID_H
+#define MUS2MID_H
+
+#include "doomtype.h"
+#include "memio.h"
+
+boolean mus2mid(MEMFILE *musinput, MEMFILE *midioutput);
+
+#endif /* #ifndef MUS2MID_H */
+
diff --git a/games/NXDoom/src/net_client.c b/games/NXDoom/src/net_client.c
new file mode 100644
index 000000000..19b720fa6
--- /dev/null
+++ b/games/NXDoom/src/net_client.c
@@ -0,0 +1,1229 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Network client code
+//
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "doomtype.h"
+#include "deh_main.h"
+#include "deh_str.h"
+#include "d_loop.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_argv.h"
+#include "m_fixed.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "net_client.h"
+#include "net_common.h"
+#include "net_defs.h"
+#include "net_gui.h"
+#include "net_io.h"
+#include "net_packet.h"
+#include "net_query.h"
+#include "net_server.h"
+#include "net_structrw.h"
+#include "net_petname.h"
+#include "w_checksum.h"
+#include "w_wad.h"
+
+
+typedef enum
+{
+    // waiting for the game to launch
+
+    CLIENT_STATE_WAITING_LAUNCH,
+
+    // waiting for the game to start
+
+    CLIENT_STATE_WAITING_START,
+
+    // in game
+
+    CLIENT_STATE_IN_GAME,
+
+} net_clientstate_t;
+
+// Type of structure used in the receive window
+
+typedef struct
+{
+    // Whether this tic has been received yet
+
+    boolean active;
+
+    // Last time we sent a resend request for this tic
+
+    unsigned int resend_time;
+
+    // Tic data from server
+
+    net_full_ticcmd_t cmd;
+
+} net_server_recv_t;
+
+// Type of structure used in the send window
+
+typedef struct
+{
+    // Whether this slot is active yet
+
+    boolean active;
+
+    // The tic number
+
+    unsigned int seq;
+
+    // Time the command was generated
+
+    unsigned int time;
+
+    // Ticcmd diff
+
+    net_ticdiff_t cmd;
+} net_server_send_t;
+
+
+static net_connection_t client_connection;
+static net_clientstate_t client_state;
+static net_addr_t *server_addr;
+static net_context_t *client_context;
+
+// game settings, as received from the server when the game started
+
+static net_gamesettings_t settings;
+
+// Why did the server reject us?
+char *net_client_reject_reason = NULL;
+
+// true if the client code is in use
+
+boolean net_client_connected;
+
+// true if we have received waiting data from the server,
+// and the wait data that was received.
+
+boolean net_client_received_wait_data;
+net_waitdata_t net_client_wait_data;
+
+// Waiting at the initial wait screen for the game to be launched?
+
+boolean net_waiting_for_launch = false;
+
+// Name that we send to the server
+
+char *net_player_name = NULL;
+
+// Connected but not participating in the game (observer)
+
+boolean drone = false;
+
+// The last ticcmd constructed
+
+static ticcmd_t last_ticcmd;
+
+// Buffer of ticcmd diffs being sent to the server
+
+static net_server_send_t send_queue[BACKUPTICS];
+
+// Receive window
+
+static ticcmd_t recvwindow_cmd_base[NET_MAXPLAYERS];
+static int recvwindow_start;
+static net_server_recv_t recvwindow[BACKUPTICS];
+
+// Whether we need to send an acknowledgement and
+// when gamedata was last received.
+
+static boolean need_to_acknowledge;
+static unsigned int gamedata_recv_time;
+
+// The latency (time between when we sent our command and we got all
+// the other players' commands from the server) for the last tic we
+// received. We include this latency in tics we send to the server so
+// that they can adjust to us.
+static int last_latency;
+
+// Hash checksums of our wad directory and dehacked data.
+
+sha1_digest_t net_local_wad_sha1sum;
+sha1_digest_t net_local_deh_sha1sum;
+
+// Are we playing with the freedoom IWAD?
+
+unsigned int net_local_is_freedoom;
+
+#define NET_CL_ExpandTicNum(b) NET_ExpandTicNum(recvwindow_start, (b))
+
+// Called when we become disconnected from the server
+
+static void NET_CL_Disconnected(void)
+{
+    D_ReceiveTic(NULL, NULL);
+}
+
+// Called when a packet is received from the server containing game
+// data. This updates the clock synchronization variable (offsetms)
+// using a PID filter that keeps client clocks in sync.
+static void UpdateClockSync(unsigned int seq,
+                            unsigned int remote_latency)
+{
+    static int last_error, cumul_error;
+    int latency, error;
+
+    if (seq == send_queue[seq % BACKUPTICS].seq)
+    {
+        latency = I_GetTimeMS() - send_queue[seq % BACKUPTICS].time;
+    }
+    else if (seq > send_queue[seq % BACKUPTICS].seq)
+    {
+        // We have received the ticcmd from the server before we have
+        // even sent ours
+
+        latency = 0;
+    }
+    else
+    {
+        return;
+    }
+
+    // PID filter. These are manually trained parameters.
+#define KP 0.1
+#define KI 0.01
+#define KD 0.02
+
+    // How does our latency compare to the worst other player?
+    error = latency - remote_latency;
+    cumul_error += error;
+
+    offsetms = KP * (FRACUNIT * error)
+             - KI * (FRACUNIT * cumul_error)
+             + (KD * FRACUNIT) * (last_error - error);
+
+    last_error = error;
+    last_latency = latency;
+
+    NET_Log("client: latency %d, remote %d -> offset=%dms, cumul_error=%d",
+            latency, remote_latency, offsetms / FRACUNIT, cumul_error);
+}
+
+// Expand a net_full_ticcmd_t, applying the diffs in cmd->cmds as
+// patches against recvwindow_cmd_base.  Place the results into
+// the d_net.c structures (netcmds/nettics) and save the new ticcmd
+// back into recvwindow_cmd_base.
+
+static void NET_CL_ExpandFullTiccmd(net_full_ticcmd_t *cmd, unsigned int seq,
+                                    ticcmd_t *ticcmds)
+{
+    int i;
+
+    // Expand tic diffs for all players
+    
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        if (i == settings.consoleplayer && !drone)
+        {
+            continue;
+        }
+        
+        if (cmd->playeringame[i])
+        {
+            net_ticdiff_t *diff;
+
+            diff = &cmd->cmds[i];
+
+            // Use the ticcmd diff to patch the previous ticcmd to
+            // the new ticcmd
+
+            NET_TiccmdPatch(&recvwindow_cmd_base[i], diff, &ticcmds[i]);
+
+            // Store a copy for next time
+
+            recvwindow_cmd_base[i] = ticcmds[i];
+        }
+    }
+}
+
+// Advance the receive window
+
+static void NET_CL_AdvanceWindow(void)
+{
+    ticcmd_t ticcmds[NET_MAXPLAYERS];
+
+    while (recvwindow[0].active)
+    {
+        // Expand tic diff data into d_net.c structures
+
+        NET_CL_ExpandFullTiccmd(&recvwindow[0].cmd, recvwindow_start,
+                                ticcmds);
+        D_ReceiveTic(ticcmds, recvwindow[0].cmd.playeringame);
+
+        // Advance the window
+
+        memmove(recvwindow, recvwindow + 1,
+                sizeof(net_server_recv_t) * (BACKUPTICS - 1));
+        memset(&recvwindow[BACKUPTICS-1], 0, sizeof(net_server_recv_t));
+
+        ++recvwindow_start;
+
+        NET_Log("client: advanced receive window to %d", recvwindow_start);
+    }
+}
+
+// Shut down the client code, etc.  Invoked after a disconnect.
+
+static void NET_CL_Shutdown(void)
+{
+    if (net_client_connected)
+    {
+        net_client_connected = false;
+
+        NET_ReleaseAddress(server_addr);
+
+        // Shut down network module, etc.  To do.
+    }
+}
+
+void NET_CL_LaunchGame(void)
+{
+    NET_Conn_NewReliable(&client_connection, NET_PACKET_TYPE_LAUNCH);
+}
+
+void NET_CL_StartGame(net_gamesettings_t *settings)
+{
+    net_packet_t *packet;
+
+    // Start from a ticcmd of all zeros
+
+    memset(&last_ticcmd, 0, sizeof(ticcmd_t));
+    
+    // Send packet
+
+    packet = NET_Conn_NewReliable(&client_connection, 
+                                  NET_PACKET_TYPE_GAMESTART);
+
+    NET_WriteSettings(packet, settings);
+}
+
+static void NET_CL_SendGameDataACK(void)
+{
+    net_packet_t *packet;
+
+    packet = NET_NewPacket(10);
+
+    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA_ACK);
+    NET_WriteInt8(packet, recvwindow_start & 0xff);
+
+    NET_Conn_SendPacket(&client_connection, packet);
+
+    NET_FreePacket(packet);
+
+    need_to_acknowledge = false;
+}
+
+static void NET_CL_SendTics(int start, int end)
+{
+    net_packet_t *packet;
+    int i;
+
+    if (!net_client_connected)
+    {
+        // Disconnected from server
+
+        return;
+    }
+
+    if (start < 0)
+        start = 0;
+    
+    // Build a new packet to send to the server
+
+    packet = NET_NewPacket(512);
+    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA);
+
+    // Write the start tic and number of tics.  Send only the low byte
+    // of start - it can be inferred by the server.
+
+    NET_WriteInt8(packet, recvwindow_start & 0xff);
+    NET_WriteInt8(packet, start & 0xff);
+    NET_WriteInt8(packet, end - start + 1);
+
+    // Add the tics.
+
+    for (i=start; i<=end; ++i)
+    {
+        net_server_send_t *sendobj;
+
+        sendobj = &send_queue[i % BACKUPTICS];
+
+        NET_WriteInt16(packet, last_latency);
+
+        NET_WriteTiccmdDiff(packet, &sendobj->cmd, settings.lowres_turn);
+    }
+    
+    // Send the packet
+
+    NET_Conn_SendPacket(&client_connection, packet);
+    
+    // All done!
+
+    NET_FreePacket(packet);
+
+    // Acknowledgement has been sent as part of the packet
+
+    need_to_acknowledge = false;
+}
+
+// Add a new ticcmd to the send queue
+
+void NET_CL_SendTiccmd(ticcmd_t *ticcmd, int maketic)
+{
+    net_ticdiff_t diff;
+    net_server_send_t *sendobj;
+    int starttic, endtic;
+    
+    // Calculate the difference to the last ticcmd
+
+    NET_TiccmdDiff(&last_ticcmd, ticcmd, &diff);
+    
+    // Store in the send queue
+
+    sendobj = &send_queue[maketic % BACKUPTICS];
+    sendobj->active = true;
+    sendobj->seq = maketic;
+    sendobj->time = I_GetTimeMS();
+    sendobj->cmd = diff;
+
+    last_ticcmd = *ticcmd;
+
+    // Send to server.
+
+    starttic = maketic - settings.extratics;
+    endtic = maketic;
+
+    if (starttic < 0)
+        starttic = 0;
+
+    NET_Log("client: generated tic %d, sending %d-%d",
+            maketic, starttic, endtic);
+    NET_CL_SendTics(starttic, endtic);
+}
+
+// Parse a SYN packet received back from the server indicating a successful
+// connection attempt.
+static void NET_CL_ParseSYN(net_packet_t *packet)
+{
+    net_protocol_t protocol;
+    char *server_version;
+
+    NET_Log("client: processing SYN response");
+
+    server_version = NET_ReadSafeString(packet);
+    if (server_version == NULL)
+    {
+        NET_Log("client: error: failed to read server version");
+        return;
+    }
+
+    protocol = NET_ReadProtocol(packet);
+    if (protocol == NET_PROTOCOL_UNKNOWN)
+    {
+        NET_Log("client: error: can't find a common protocol");
+        return;
+    }
+
+    // We are now successfully connected.
+    NET_Log("client: connected to server");
+    client_connection.state = NET_CONN_STATE_CONNECTED;
+    client_connection.protocol = protocol;
+
+    // Even though we have negotiated a compatible protocol, the game may still
+    // desync. Chocolate Doom's philosophy makes this unlikely, but if we're
+    // playing with a forked version, or even against a different version that
+    // fixes a compatibility issue, we may still have problems.
+    if (strcmp(server_version, PACKAGE_STRING) != 0)
+    {
+        fprintf(stderr, "NET_CL_ParseSYN: This is '%s', but the server is "
+                "'%s'. It is possible that this mismatch may cause the game "
+                "to desync.\n", PACKAGE_STRING, server_version);
+    }
+}
+
+static void SetRejectReason(const char *s)
+{
+    free(net_client_reject_reason);
+    if (s != NULL)
+    {
+        net_client_reject_reason = strdup(s);
+    }
+    else
+    {
+        net_client_reject_reason = NULL;
+    }
+}
+
+static void NET_CL_ParseReject(net_packet_t *packet)
+{
+    char *msg;
+
+    msg = NET_ReadSafeString(packet);
+    if (msg == NULL)
+    {
+        return;
+    }
+
+    if (client_connection.state == NET_CONN_STATE_CONNECTING)
+    {
+        client_connection.state = NET_CONN_STATE_DISCONNECTED;
+        client_connection.disconnect_reason = NET_DISCONNECT_REMOTE;
+        SetRejectReason(msg);
+    }
+}
+
+// data received while we are waiting for the game to start
+
+static void NET_CL_ParseWaitingData(net_packet_t *packet)
+{
+    net_waitdata_t wait_data;
+
+    if (!NET_ReadWaitData(packet, &wait_data))
+    {
+        // Invalid packet?
+        return;
+    }
+
+    if (wait_data.num_players > wait_data.max_players
+     || wait_data.ready_players > wait_data.num_players
+     || wait_data.max_players > NET_MAXPLAYERS)
+    {
+        // insane data
+
+        return;
+    }
+
+    if ((wait_data.consoleplayer >= 0 && drone)
+     || (wait_data.consoleplayer < 0 && !drone)
+     || (wait_data.consoleplayer >= wait_data.num_players))
+    {
+        // Invalid player number
+
+        return;
+    }
+
+    memcpy(&net_client_wait_data, &wait_data, sizeof(net_waitdata_t));
+    net_client_received_wait_data = true;
+}
+
+static void NET_CL_ParseLaunch(net_packet_t *packet)
+{
+    unsigned int num_players;
+
+    NET_Log("client: processing launch packet");
+
+    if (client_state != CLIENT_STATE_WAITING_LAUNCH)
+    {
+        NET_Log("client: error: not in waiting launch state, client_state=%d",
+                client_state);
+        return;
+    }
+
+    // The launch packet contains the number of players that will be
+    // in the game when it starts, so that we can do the startup
+    // progress indicator (the wait data is unreliable).
+
+    if (!NET_ReadInt8(packet, &num_players))
+    {
+        NET_Log("client: error: failed to read number of players");
+        return;
+    }
+
+    net_client_wait_data.num_players = num_players;
+    client_state = CLIENT_STATE_WAITING_START;
+    NET_Log("client: now waiting for game start");
+}
+
+static void NET_CL_ParseGameStart(net_packet_t *packet)
+{
+    NET_Log("client: processing game start packet");
+
+    if (!NET_ReadSettings(packet, &settings))
+    {
+        NET_Log("client: error: failed to read settings");
+        return;
+    }
+
+    if (client_state != CLIENT_STATE_WAITING_START)
+    {
+        NET_Log("client: error: not in waiting start state, client_state=%d",
+                client_state);
+        return;
+    }
+
+    if (settings.num_players > NET_MAXPLAYERS
+     || settings.consoleplayer >= (signed int) settings.num_players)
+    {
+        // insane values
+        NET_Log("client: error: bad settings, num_players=%d, consoleplayer=%d",
+                settings.num_players, settings.consoleplayer);
+        return;
+    }
+
+    if ((drone && settings.consoleplayer >= 0)
+     || (!drone && settings.consoleplayer < 0))
+    {
+        // Invalid player number: must be positive for real players,
+        // negative for drones
+        NET_Log("client: error: mismatch: drone=%d, consoleplayer=%d",
+                drone, settings.consoleplayer);
+        return;
+    }
+
+    NET_Log("client: beginning game state");
+    client_state = CLIENT_STATE_IN_GAME;
+
+    // Clear the receive window
+
+    memset(recvwindow, 0, sizeof(recvwindow));
+    recvwindow_start = 0;
+    memset(&recvwindow_cmd_base, 0, sizeof(recvwindow_cmd_base));
+
+    // Clear the send queue
+
+    memset(&send_queue, 0x00, sizeof(send_queue));
+}
+
+static void NET_CL_SendResendRequest(int start, int end)
+{
+    net_packet_t *packet;
+    unsigned int nowtime;
+    int i;
+
+    //printf("CL: Send resend %i-%i\n", start, end);
+    
+    packet = NET_NewPacket(64);
+    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA_RESEND);
+    NET_WriteInt32(packet, start);
+    NET_WriteInt8(packet, end - start + 1);
+    NET_Conn_SendPacket(&client_connection, packet);
+    NET_FreePacket(packet);
+
+    nowtime = I_GetTimeMS();
+
+    // Save the time we sent the resend request
+
+    for (i=start; i<=end; ++i)
+    {
+        int index;
+
+        index = i - recvwindow_start;
+
+        if (index < 0 || index >= BACKUPTICS)
+            continue;
+
+        recvwindow[index].resend_time = nowtime;
+    }
+}
+
+// Check for expired resend requests
+
+static void NET_CL_CheckResends(void)
+{
+    int i;
+    int resend_start, resend_end;
+    unsigned int nowtime;
+    boolean maybe_deadlocked;
+
+    nowtime = I_GetTimeMS();
+    maybe_deadlocked = nowtime - gamedata_recv_time > 1000;
+
+    resend_start = -1;
+    resend_end = -1;
+
+    for (i=0; i<BACKUPTICS; ++i)
+    {
+        net_server_recv_t *recvobj;
+        boolean need_resend;
+
+        recvobj = &recvwindow[i];
+
+        // if need_resend is true, this tic needs another retransmit
+        // request (300ms timeout)
+
+        need_resend = !recvobj->active
+                   && recvobj->resend_time != 0
+                   && nowtime > recvobj->resend_time + 300;
+
+        // if no game data has been received in a long time, we may be in
+        // a deadlock scenario where tics from the server have been lost, so
+        // we've stopped generating any more, so the server isn't sending us
+        // any, so we don't get any to trigger a resend request. So force the
+        // first few tics in the receive window to be requested.
+        if (i == 0 && !recvobj->active && recvobj->resend_time == 0
+         && maybe_deadlocked)
+        {
+            need_resend = true;
+        }
+
+        if (need_resend)
+        {
+            // Start a new run of resend tics?
+
+            if (resend_start < 0)
+            {
+                resend_start = i;
+            }
+
+            resend_end = i;
+        }
+        else if (resend_start >= 0)
+        {
+            // End of a run of resend tics
+            NET_Log("client: resend request timed out for %d-%d (%d)",
+                    recvwindow_start + resend_start,
+                    recvwindow_start + resend_end,
+                    recvwindow[resend_start].resend_time);
+            NET_CL_SendResendRequest(recvwindow_start + resend_start,
+                                     recvwindow_start + resend_end);
+            resend_start = -1;
+        }
+    }
+
+    if (resend_start >= 0)
+    {
+        NET_Log("client: resend request timed out for %d-%d (%d)",
+                recvwindow_start + resend_start,
+                recvwindow_start + resend_end,
+                recvwindow[resend_start].resend_time);
+        NET_CL_SendResendRequest(recvwindow_start + resend_start,
+                                 recvwindow_start + resend_end);
+    }
+
+    // We have received some data from the server and not acknowledged
+    // it yet.  Normally this gets acknowledged when we send our game
+    // data, but if the client is a drone we need to do this.
+
+    if (need_to_acknowledge && nowtime - gamedata_recv_time > 200)
+    {
+        NET_Log("client: no game data received since %d: triggering ack",
+                gamedata_recv_time);
+        NET_CL_SendGameDataACK();
+    }
+}
+
+
+// Parsing of NET_PACKET_TYPE_GAMEDATA packets
+// (packets containing the actual ticcmd data)
+
+static void NET_CL_ParseGameData(net_packet_t *packet)
+{
+    net_server_recv_t *recvobj;
+    unsigned int seq, num_tics;
+    unsigned int nowtime;
+    int resend_start, resend_end;
+    size_t i;
+    int index;
+
+    NET_Log("client: processing game data packet");
+
+    // Read header
+    if (!NET_ReadInt8(packet, &seq)
+     || !NET_ReadInt8(packet, &num_tics))
+    {
+        NET_Log("client: error: failed to read header");
+        return;
+    }
+
+    nowtime = I_GetTimeMS();
+
+    // Whatever happens, we now need to send an acknowledgement of our
+    // current receive point.
+
+    if (!need_to_acknowledge)
+    {
+        need_to_acknowledge = true;
+        gamedata_recv_time = nowtime;
+    }
+
+    // Expand byte value into the full tic number
+    seq = NET_CL_ExpandTicNum(seq);
+    NET_Log("client: got game data, seq=%d, num_tics=%d", seq, num_tics);
+
+    for (i=0; i<num_tics; ++i)
+    {
+        net_full_ticcmd_t cmd;
+
+        index = seq - recvwindow_start + i;
+
+        if (!NET_ReadFullTiccmd(packet, &cmd, settings.lowres_turn))
+        {
+            NET_Log("client: error: failed to read ticcmd %d", i);
+            return;
+        }
+
+        if (index < 0 || index >= BACKUPTICS)
+        {
+            // Out of range of the recv window
+
+            continue;
+        }
+
+        // Store in the receive window
+
+        recvobj = &recvwindow[index];
+
+        recvobj->active = true;
+        recvobj->cmd = cmd;
+        NET_Log("client: stored tic %d in receive window", seq + i);
+
+        // If a packet is lost or arrives out of order, we might get
+        // the tic in the next packet instead (because of extratic).
+        // If that's the case then the latency for receiving that tic
+        // now will be bogus. So we only use the last tic in the packet
+        // to trigger a clock sync update.
+        if (i == num_tics - 1)
+        {
+            UpdateClockSync(seq + i, cmd.latency);
+        }
+    }
+
+    // Has this been received out of sequence, ie. have we not received
+    // all tics before the first tic in this packet?  If so, send a 
+    // resend request.
+
+    //printf("CL: %p: %i\n", client, seq);
+
+    resend_end = seq - recvwindow_start;
+
+    if (resend_end <= 0)
+        return;
+
+    if (resend_end >= BACKUPTICS)
+        resend_end = BACKUPTICS - 1;
+
+    index = resend_end - 1;
+    resend_start = resend_end;
+    
+    while (index >= 0)
+    {
+        recvobj = &recvwindow[index];
+
+        if (recvobj->active)
+        {
+            // ended our run of unreceived tics
+
+            break;
+        }
+
+        if (recvobj->resend_time != 0)
+        {
+            // Already sent a resend request for this tic
+
+            break;
+        }
+
+        resend_start = index;
+        --index;
+    }
+
+    // Possibly send a resend request
+    if (resend_start < resend_end)
+    {
+        NET_Log("client: request resend for %d-%d before %d",
+                recvwindow_start + resend_start,
+                recvwindow_start + resend_end - 1, seq);
+        NET_CL_SendResendRequest(recvwindow_start + resend_start, 
+                                 recvwindow_start + resend_end - 1);
+    }
+}
+
+// Parse a resend request from the server due to a dropped packet
+
+static void NET_CL_ParseResendRequest(net_packet_t *packet)
+{
+    static unsigned int start;
+    static unsigned int end;
+    static unsigned int num_tics;
+
+    NET_Log("client: processing resend request");
+
+    if (drone)
+    {
+        // Drones don't send gamedata.
+        NET_Log("client: error: resend request but we're a drone?");
+        return;
+    }
+
+    if (!NET_ReadInt32(packet, &start)
+     || !NET_ReadInt8(packet, &num_tics))
+    {
+        NET_Log("client: error: couldn't read start and num_tics");
+        return;
+    }
+
+    end = start + num_tics - 1;
+
+    //printf("requested resend %i-%i .. ", start, end);
+    NET_Log("client: resend request: start=%d, num_tics=%d", start, num_tics);
+
+    // Check we have the tics being requested.  If not, reduce the 
+    // window of tics to only what we have.
+
+    while (start <= end
+        && (!send_queue[start % BACKUPTICS].active
+         || send_queue[start % BACKUPTICS].seq != start))
+    {
+        ++start;
+    }
+     
+    while (start <= end
+        && (!send_queue[end % BACKUPTICS].active
+         || send_queue[end % BACKUPTICS].seq != end))
+    {
+        --end;
+    }
+
+    // Resend those tics
+    if (start <= end)
+    {
+        NET_Log("client: resending %d-%d", start, end);
+        NET_CL_SendTics(start, end);
+    }
+    else
+    {
+        NET_Log("client: don't have the tics to resend");
+    }
+}
+
+// Console message that the server wants the client to print
+
+static void NET_CL_ParseConsoleMessage(net_packet_t *packet)
+{
+    char *msg;
+
+    msg = NET_ReadSafeString(packet);
+
+    if (msg == NULL)
+    {
+        return;
+    }
+
+    printf("Message from server:\n%s\n", msg);
+}
+
+// parse a received packet
+
+static void NET_CL_ParsePacket(net_packet_t *packet)
+{
+    unsigned int packet_type;
+
+    if (!NET_ReadInt16(packet, &packet_type))
+    {
+        return;
+    }
+
+    NET_Log("client: packet from server, type %d",
+            packet_type & ~NET_RELIABLE_PACKET);
+    NET_LogPacket(packet);
+
+    if (NET_Conn_Packet(&client_connection, packet, &packet_type))
+    {
+        // Packet eaten by the common connection code
+    }
+    else
+    {
+        switch (packet_type)
+        {
+            case NET_PACKET_TYPE_SYN:
+                NET_CL_ParseSYN(packet);
+                break;
+
+            case NET_PACKET_TYPE_REJECTED:
+                NET_CL_ParseReject(packet);
+                break;
+
+            case NET_PACKET_TYPE_WAITING_DATA:
+                NET_CL_ParseWaitingData(packet);
+                break;
+
+            case NET_PACKET_TYPE_LAUNCH:
+                NET_CL_ParseLaunch(packet);
+                break;
+
+            case NET_PACKET_TYPE_GAMESTART:
+                NET_CL_ParseGameStart(packet);
+                break;
+
+            case NET_PACKET_TYPE_GAMEDATA:
+                NET_CL_ParseGameData(packet);
+                break;
+
+            case NET_PACKET_TYPE_GAMEDATA_RESEND:
+                NET_CL_ParseResendRequest(packet);
+                break;
+
+            case NET_PACKET_TYPE_CONSOLE_MESSAGE:
+                NET_CL_ParseConsoleMessage(packet);
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+// "Run" the client code: check for new packets, send packets as
+// needed
+
+void NET_CL_Run(void)
+{
+    net_addr_t *addr;
+    net_packet_t *packet;
+    
+    if (!net_client_connected)
+    {
+        return;
+    }
+    
+    while (NET_RecvPacket(client_context, &addr, &packet))
+    {
+        // only accept packets from the server
+
+        if (addr == server_addr)
+        {
+            NET_CL_ParsePacket(packet);
+        }
+
+        NET_FreePacket(packet);
+        NET_ReleaseAddress(addr);
+    }
+
+    // Run the common connection code to send any packets as needed
+
+    NET_Conn_Run(&client_connection);
+
+    if (client_connection.state == NET_CONN_STATE_DISCONNECTED
+     || client_connection.state == NET_CONN_STATE_DISCONNECTED_SLEEP)
+    {
+        NET_CL_Disconnected();
+
+        NET_CL_Shutdown();
+    }
+
+    net_waiting_for_launch =
+            client_connection.state == NET_CONN_STATE_CONNECTED
+         && client_state == CLIENT_STATE_WAITING_LAUNCH;
+
+    if (client_state == CLIENT_STATE_IN_GAME)
+    {
+        // Possibly advance the receive window
+
+        NET_CL_AdvanceWindow();
+
+        // Check if our resend requests have timed out
+
+        NET_CL_CheckResends();
+    }
+}
+
+static void NET_CL_SendSYN(net_connect_data_t *data)
+{
+    net_packet_t *packet;
+
+    NET_Log("client: sending SYN");
+
+    packet = NET_NewPacket(10);
+    NET_WriteInt16(packet, NET_PACKET_TYPE_SYN);
+    NET_WriteInt32(packet, NET_MAGIC_NUMBER);
+    NET_WriteString(packet, PACKAGE_STRING);
+    NET_WriteProtocolList(packet);
+    NET_WriteConnectData(packet, data);
+    NET_WriteString(packet, net_player_name);
+    NET_Conn_SendPacket(&client_connection, packet);
+    NET_FreePacket(packet);
+}
+
+// Connect to a server
+boolean NET_CL_Connect(net_addr_t *addr, net_connect_data_t *data)
+{
+    int start_time;
+    int last_send_time;
+    boolean sent_hole_punch;
+
+    server_addr = addr;
+    NET_ReferenceAddress(addr);
+
+    memcpy(net_local_wad_sha1sum, data->wad_sha1sum, sizeof(sha1_digest_t));
+    memcpy(net_local_deh_sha1sum, data->deh_sha1sum, sizeof(sha1_digest_t));
+    net_local_is_freedoom = data->is_freedoom;
+
+    // create a new network I/O context and add just the necessary module
+    client_context = NET_NewContext();
+
+    // initialize module for client mode
+    if (!addr->module->InitClient())
+    {
+        SetRejectReason("Failed to initialize client module");
+        return false;
+    }
+
+    NET_AddModule(client_context, addr->module);
+
+    net_client_connected = true;
+    net_client_received_wait_data = false;
+    sent_hole_punch = false;
+
+    NET_Conn_InitClient(&client_connection, addr, NET_PROTOCOL_UNKNOWN);
+
+    // try to connect
+    start_time = I_GetTimeMS();
+    last_send_time = -1;
+    SetRejectReason("Unknown reason");
+
+    while (client_connection.state == NET_CONN_STATE_CONNECTING)
+    {
+        int nowtime = I_GetTimeMS();
+
+        // Send a SYN packet every second.
+        if (nowtime - last_send_time > 1000 || last_send_time < 0)
+        {
+            NET_CL_SendSYN(data);
+            last_send_time = nowtime;
+        }
+
+        // time out after 5 seconds
+        if (nowtime - start_time > 5000)
+        {
+            SetRejectReason("No response from server");
+            break;
+        }
+
+        if (!sent_hole_punch && nowtime - start_time > 2000)
+        {
+            NET_Log("client: no response to SYN, requesting hole punch");
+            NET_RequestHolePunch(client_context, addr);
+            sent_hole_punch = true;
+        }
+
+        // run client code
+        NET_CL_Run();
+
+        // run the server, just in case we are doing a loopback connect
+        NET_SV_Run();
+
+        // Don't hog the CPU
+        I_Sleep(1);
+    }
+
+    if (client_connection.state == NET_CONN_STATE_CONNECTED)
+    {
+        // connected ok!
+        NET_Log("client: connected successfully");
+        SetRejectReason(NULL);
+        client_state = CLIENT_STATE_WAITING_LAUNCH;
+        drone = data->drone;
+
+        return true;
+    }
+    else
+    {
+        // failed to connect
+        NET_Log("client: failed to connect");
+        NET_CL_Shutdown();
+
+        return false;
+    }
+}
+
+// read game settings received from server
+
+boolean NET_CL_GetSettings(net_gamesettings_t *_settings)
+{
+    if (client_state != CLIENT_STATE_IN_GAME)
+    {
+        return false;
+    }
+
+    memcpy(_settings, &settings, sizeof(net_gamesettings_t));
+
+    return true;
+}
+
+// disconnect from the server
+
+void NET_CL_Disconnect(void)
+{
+    int start_time;
+
+    if (!net_client_connected)
+    {
+        return;
+    }
+
+    NET_Log("client: beginning disconnect");
+    NET_Conn_Disconnect(&client_connection);
+
+    start_time = I_GetTimeMS();
+
+    while (client_connection.state != NET_CONN_STATE_DISCONNECTED
+        && client_connection.state != NET_CONN_STATE_DISCONNECTED_SLEEP)
+    {
+        if (I_GetTimeMS() - start_time > 5000)
+        {
+            // time out after 5 seconds
+
+            NET_Log("client: no acknowledgement of disconnect received");
+            client_state = CLIENT_STATE_WAITING_START;
+
+            fprintf(stderr, "NET_CL_Disconnect: Timeout while disconnecting "
+                            "from server\n");
+            break;
+        }
+
+        NET_CL_Run();
+        NET_SV_Run();
+
+        I_Sleep(1);
+    }
+
+    // Finished sending disconnect packets, etc.
+    NET_Log("client: disconnect complete");
+    NET_CL_Shutdown();
+}
+
+void NET_CL_Init(void)
+{
+    // Try to set from the USER and USERNAME environment variables
+    // Otherwise, fallback to "Player"
+
+    if (net_player_name == NULL)
+    {
+        net_player_name = NET_GetRandomPetName();
+    }
+}
+
+void NET_Init(void)
+{
+    NET_OpenLog();
+    NET_CL_Init();
+}
+
+void NET_BindVariables(void)
+{
+    M_BindStringVariable("player_name", &net_player_name);
+}
diff --git a/games/NXDoom/src/net_client.h b/games/NXDoom/src/net_client.h
new file mode 100644
index 000000000..37ba01984
--- /dev/null
+++ b/games/NXDoom/src/net_client.h
@@ -0,0 +1,53 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Network client code
+//
+
+#ifndef NET_CLIENT_H
+#define NET_CLIENT_H
+
+#include "doomtype.h"
+#include "d_ticcmd.h"
+#include "sha1.h"
+#include "net_defs.h"
+
+boolean NET_CL_Connect(net_addr_t *addr, net_connect_data_t *data);
+void NET_CL_Disconnect(void);
+void NET_CL_Run(void);
+void NET_CL_Init(void);
+void NET_CL_LaunchGame(void);
+void NET_CL_StartGame(net_gamesettings_t *settings);
+void NET_CL_SendTiccmd(ticcmd_t *ticcmd, int maketic);
+boolean NET_CL_GetSettings(net_gamesettings_t *_settings);
+void NET_Init(void);
+
+void NET_BindVariables(void);
+
+extern boolean net_client_connected;
+extern boolean net_client_received_wait_data;
+extern net_waitdata_t net_client_wait_data;
+extern char *net_client_reject_reason;
+extern boolean net_waiting_for_launch;
+extern char *net_player_name;
+
+extern sha1_digest_t net_server_wad_sha1sum;
+extern sha1_digest_t net_server_deh_sha1sum;
+extern unsigned int net_server_is_freedoom;
+extern sha1_digest_t net_local_wad_sha1sum;
+extern sha1_digest_t net_local_deh_sha1sum;
+extern unsigned int net_local_is_freedoom;
+
+extern boolean drone;
+
+#endif /* #ifndef NET_CLIENT_H */
diff --git a/games/NXDoom/src/net_common.c b/games/NXDoom/src/net_common.c
new file mode 100644
index 000000000..99b32c256
--- /dev/null
+++ b/games/NXDoom/src/net_common.c
@@ -0,0 +1,527 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Common code shared between the client and server
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "d_mode.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_argv.h"
+#include "m_misc.h"
+
+#include "net_common.h"
+#include "net_io.h"
+#include "net_packet.h"
+#include "net_structrw.h"
+
+// connections time out after 30 seconds
+
+#define CONNECTION_TIMEOUT_LEN 30
+
+// maximum time between sending packets
+
+#define KEEPALIVE_PERIOD 1
+
+// reliable packet that is guaranteed to reach its destination
+
+struct net_reliable_packet_s
+{
+    net_packet_t *packet;
+    int last_send_time;
+    int seq;
+    net_reliable_packet_t *next;
+};
+
+static FILE *net_debug = NULL;
+
+static void NET_Conn_Init(net_connection_t *conn, net_addr_t *addr,
+                          net_protocol_t protocol)
+{
+    conn->last_send_time = -1;
+    conn->num_retries = 0;
+    conn->addr = addr;
+    conn->protocol = protocol;
+    conn->reliable_packets = NULL;
+    conn->reliable_send_seq = 0;
+    conn->reliable_recv_seq = 0;
+    conn->keepalive_recv_time = I_GetTimeMS();
+}
+
+// Initialize as a client connection
+
+void NET_Conn_InitClient(net_connection_t *conn, net_addr_t *addr,
+                         net_protocol_t protocol)
+{
+    NET_Conn_Init(conn, addr, protocol);
+    conn->state = NET_CONN_STATE_CONNECTING;
+}
+
+// Initialize as a server connection
+
+void NET_Conn_InitServer(net_connection_t *conn, net_addr_t *addr,
+                         net_protocol_t protocol)
+{
+    NET_Conn_Init(conn, addr, protocol);
+    conn->state = NET_CONN_STATE_CONNECTED;
+}
+
+// Send a packet to a connection
+// All packets should be sent through this interface, as it maintains the
+// keepalive_send_time counter.
+
+void NET_Conn_SendPacket(net_connection_t *conn, net_packet_t *packet)
+{
+    conn->keepalive_send_time = I_GetTimeMS();
+    NET_SendPacket(conn->addr, packet);
+}
+
+static void NET_Conn_ParseDisconnect(net_connection_t *conn, net_packet_t *packet)
+{
+    net_packet_t *reply;
+
+    // Other end wants to disconnect
+    // Send a DISCONNECT_ACK reply.
+    
+    reply = NET_NewPacket(10);
+    NET_WriteInt16(reply, NET_PACKET_TYPE_DISCONNECT_ACK);
+    NET_Conn_SendPacket(conn, reply);
+    NET_FreePacket(reply);
+
+    conn->last_send_time = I_GetTimeMS();
+    
+    conn->state = NET_CONN_STATE_DISCONNECTED_SLEEP;
+    conn->disconnect_reason = NET_DISCONNECT_REMOTE;
+}
+
+// Parse a DISCONNECT_ACK packet
+
+static void NET_Conn_ParseDisconnectACK(net_connection_t *conn,
+                                        net_packet_t *packet)
+{
+
+    if (conn->state == NET_CONN_STATE_DISCONNECTING)
+    {
+        // We have received an acknowledgement to our disconnect
+        // request. We have been disconnected successfully.
+        
+        conn->state = NET_CONN_STATE_DISCONNECTED;
+        conn->disconnect_reason = NET_DISCONNECT_LOCAL;
+        conn->last_send_time = -1;
+    }
+}
+
+static void NET_Conn_ParseReliableACK(net_connection_t *conn, net_packet_t *packet)
+{
+    unsigned int seq;
+
+    if (!NET_ReadInt8(packet, &seq))
+    {
+        return;
+    }
+
+    if (conn->reliable_packets == NULL)
+    {
+        return;
+    }
+            
+    // Is this an acknowledgement for the first packet in the list?
+
+    if (seq == (unsigned int)((conn->reliable_packets->seq + 1) & 0xff))
+    {
+        net_reliable_packet_t *rp;
+
+        // Discard it, then.
+        // Unlink from the list.
+
+        rp = conn->reliable_packets;
+        conn->reliable_packets = rp->next;
+        
+        NET_FreePacket(rp->packet);
+        free(rp);
+    }
+}
+
+// Process the header of a reliable packet
+//
+// Returns true if the packet should be discarded (incorrect sequence)
+
+static boolean NET_Conn_ReliablePacket(net_connection_t *conn, 
+                                       net_packet_t *packet)
+{
+    unsigned int seq;
+    net_packet_t *reply;
+    boolean result;
+
+    // Read the sequence number
+
+    if (!NET_ReadInt8(packet, &seq))
+    {
+        return true;
+    }
+
+    if (seq != (unsigned int)(conn->reliable_recv_seq & 0xff))
+    {
+        // This is not the next expected packet in the sequence!
+        //
+        // Discard the packet.  If we were smart, we would use a proper
+        // sliding window protocol to do this, but I'm lazy.
+
+        result = true;
+    }
+    else
+    {
+        // Now we can receive the next packet in the sequence.
+
+        conn->reliable_recv_seq = (conn->reliable_recv_seq + 1) & 0xff;
+    
+        result = false;
+    }
+
+    // Send an acknowledgement
+
+    // Note: this is braindead.  It would be much more sensible to 
+    // include this in the next packet, rather than the overhead of
+    // sending a complete packet just for one byte of information.
+
+    reply = NET_NewPacket(10);
+
+    NET_WriteInt16(reply, NET_PACKET_TYPE_RELIABLE_ACK);
+    NET_WriteInt8(reply, conn->reliable_recv_seq & 0xff);
+
+    NET_Conn_SendPacket(conn, reply);
+
+    NET_FreePacket(reply);
+
+    return result;
+}
+
+// Process a packet received by the server
+//
+// Returns true if eaten by common code
+
+boolean NET_Conn_Packet(net_connection_t *conn, net_packet_t *packet, 
+                        unsigned int *packet_type)
+{
+    conn->keepalive_recv_time = I_GetTimeMS();
+
+    // Is this a reliable packet?
+
+    if (*packet_type & NET_RELIABLE_PACKET)
+    {
+        if (NET_Conn_ReliablePacket(conn, packet)) 
+        {
+            // Invalid packet: eat it.
+
+            return true;
+        }
+
+        // Remove the reliable bit
+
+        *packet_type &= ~NET_RELIABLE_PACKET;
+    }
+    
+    switch (*packet_type)
+    {
+        case NET_PACKET_TYPE_DISCONNECT:
+            NET_Conn_ParseDisconnect(conn, packet);
+            break;
+        case NET_PACKET_TYPE_DISCONNECT_ACK:
+            NET_Conn_ParseDisconnectACK(conn, packet);
+            break;
+        case NET_PACKET_TYPE_KEEPALIVE:
+            // No special action needed.
+            break;
+        case NET_PACKET_TYPE_RELIABLE_ACK:
+            NET_Conn_ParseReliableACK(conn, packet);
+            break;
+        default:
+            // Not a common packet
+
+            return false;
+    }
+
+    // We found a packet that we found interesting, and ate it.
+
+    return true;
+}
+
+void NET_Conn_Disconnect(net_connection_t *conn)
+{
+    if (conn->state != NET_CONN_STATE_DISCONNECTED
+     && conn->state != NET_CONN_STATE_DISCONNECTING
+     && conn->state != NET_CONN_STATE_DISCONNECTED_SLEEP)
+    {
+        conn->state = NET_CONN_STATE_DISCONNECTING;
+        conn->disconnect_reason = NET_DISCONNECT_LOCAL;
+        conn->last_send_time = -1;
+        conn->num_retries = 0;
+    }
+}
+
+void NET_Conn_Run(net_connection_t *conn)
+{
+    net_packet_t *packet;
+    unsigned int nowtime;
+
+    nowtime = I_GetTimeMS();
+
+    if (conn->state == NET_CONN_STATE_CONNECTED)
+    {
+        // Check the keepalive counters
+
+        if (nowtime - conn->keepalive_recv_time > CONNECTION_TIMEOUT_LEN * 1000)
+        {
+            // Haven't received any packets from the other end in a long
+            // time.  Assume disconnected.
+
+            conn->state = NET_CONN_STATE_DISCONNECTED;
+            conn->disconnect_reason = NET_DISCONNECT_TIMEOUT;
+        }
+        
+        if (nowtime - conn->keepalive_send_time > KEEPALIVE_PERIOD * 1000)
+        {
+            // We have not sent anything in a long time.
+            // Send a keepalive.
+
+            packet = NET_NewPacket(10);
+            NET_WriteInt16(packet, NET_PACKET_TYPE_KEEPALIVE);
+            NET_Conn_SendPacket(conn, packet);
+            NET_FreePacket(packet);
+        }
+
+        // Check the reliable packet list. Has the first packet in the
+        // list timed out?
+        //
+        // NB.  This is braindead, we have a fixed time of one second.
+
+        if (conn->reliable_packets != NULL
+         && (conn->reliable_packets->last_send_time < 0
+          || nowtime - conn->reliable_packets->last_send_time > 1000))
+        {
+            // Packet timed out, time to resend
+
+            NET_Conn_SendPacket(conn, conn->reliable_packets->packet);
+            conn->reliable_packets->last_send_time = nowtime;
+        }
+    }
+    else if (conn->state == NET_CONN_STATE_DISCONNECTING)
+    {
+        // Waiting for a reply to our DISCONNECT request.
+
+        if (conn->last_send_time < 0
+         || nowtime - conn->last_send_time > 1000)
+        {
+            // it has been a second since the last disconnect packet 
+            // was sent, and still no reply.
+
+            if (conn->num_retries < MAX_RETRIES)
+            {
+                // send another disconnect
+
+                packet = NET_NewPacket(10);
+                NET_WriteInt16(packet, NET_PACKET_TYPE_DISCONNECT);
+                NET_Conn_SendPacket(conn, packet);
+                NET_FreePacket(packet);
+                conn->last_send_time = nowtime;
+
+                ++conn->num_retries;
+            }
+            else 
+            {
+                // No more retries allowed.
+                // Force disconnect.
+
+                conn->state = NET_CONN_STATE_DISCONNECTED;
+                conn->disconnect_reason = NET_DISCONNECT_LOCAL;
+            }
+        }
+    }
+    else if (conn->state == NET_CONN_STATE_DISCONNECTED_SLEEP)
+    {
+        // We are disconnected, waiting in case we need to send
+        // a DISCONNECT_ACK to the server again.
+
+        if (nowtime - conn->last_send_time > 5000)
+        {
+            // Idle for 5 seconds, switch state
+
+            conn->state = NET_CONN_STATE_DISCONNECTED;
+            conn->disconnect_reason = NET_DISCONNECT_REMOTE;
+        }
+    }
+}
+
+net_packet_t *NET_Conn_NewReliable(net_connection_t *conn, int packet_type)
+{
+    net_packet_t *packet;
+    net_reliable_packet_t *rp;
+    net_reliable_packet_t **listend;
+
+    // Generate a packet with the right header
+
+    packet = NET_NewPacket(100);
+
+    NET_WriteInt16(packet, packet_type | NET_RELIABLE_PACKET);
+
+    // write the low byte of the send sequence number
+    
+    NET_WriteInt8(packet, conn->reliable_send_seq & 0xff);
+
+    // Add to the list of reliable packets
+
+    rp = malloc(sizeof(net_reliable_packet_t));
+    rp->packet = packet;
+    rp->next = NULL;
+    rp->seq = conn->reliable_send_seq;
+    rp->last_send_time = -1;
+
+    for (listend = &conn->reliable_packets; 
+         *listend != NULL; 
+         listend = &((*listend)->next));
+
+    *listend = rp;
+
+    // Count along the sequence
+
+    conn->reliable_send_seq = (conn->reliable_send_seq + 1) & 0xff;
+
+    // Finished
+    
+    return packet;
+}
+
+// Used to expand the least significant byte of a tic number into 
+// the full tic number, from the current tic number
+
+unsigned int NET_ExpandTicNum(unsigned int relative, unsigned int b)
+{
+    unsigned int l, h;
+    unsigned int result;
+
+    h = relative & ~0xff;
+    l = relative & 0xff;
+
+    result = h | b;
+
+    if (l < 0x40 && b > 0xb0)
+        result -= 0x100;
+    if (l > 0xb0 && b < 0x40)
+        result += 0x100;
+    
+    return result;
+}
+
+// Check that game settings are valid
+
+boolean NET_ValidGameSettings(GameMode_t mode, GameMission_t mission,
+                              net_gamesettings_t *settings)
+{
+    if (settings->ticdup <= 0)
+        return false;
+
+    if (settings->extratics < 0)
+        return false;
+
+    if (settings->deathmatch < 0 || settings->deathmatch > 2)
+        return false;
+
+    if (settings->skill < sk_noitems || settings->skill > sk_nightmare)
+        return false;
+
+    if (!D_ValidGameVersion(mission, settings->gameversion))
+        return false;
+
+    if (!D_ValidEpisodeMap(mission, mode, settings->episode, settings->map))
+        return false;
+
+    return true;
+}
+
+static void CloseLog(void)
+{
+    if (net_debug != NULL)
+    {
+        fclose(net_debug);
+        net_debug = NULL;
+    }
+}
+
+void NET_OpenLog(void)
+{
+    int p;
+
+    p = M_CheckParmWithArgs("-netlog", 1);
+    if (p > 0)
+    {
+        net_debug = M_fopen(myargv[p + 1], "w");
+        if (net_debug == NULL)
+        {
+            I_Error("Failed to open %s to write debug log.", myargv[p + 1]);
+        }
+        I_AtExit(CloseLog, true);
+    }
+}
+
+void NET_Log(const char *fmt, ...)
+{
+    va_list args;
+
+    if (net_debug == NULL)
+    {
+        return;
+    }
+
+    fprintf(net_debug, "%8d: ", I_GetTimeMS());
+    va_start(args, fmt);
+    vfprintf(net_debug, fmt, args);
+    va_end(args);
+    fprintf(net_debug, "\n");
+}
+
+void NET_LogPacket(net_packet_t *packet)
+{
+    int i, bytes;
+
+    if (net_debug == NULL)
+    {
+        return;
+    }
+
+    bytes = packet->len - packet->pos;
+    if (bytes == 0)
+    {
+        return;
+    }
+    fprintf(net_debug, "\t%02x", packet->data[packet->pos]);
+    for (i = 1; i < bytes; ++i)
+    {
+        if ((i % 16) == 0)
+        {
+            fprintf(net_debug, "\n\t");
+        }
+        else
+        {
+            fprintf(net_debug, " ");
+        }
+        fprintf(net_debug, "%02x", packet->data[packet->pos + i]);
+    }
+    fprintf(net_debug, "\n");
+}
+
diff --git a/games/NXDoom/src/net_common.h b/games/NXDoom/src/net_common.h
new file mode 100644
index 000000000..15a7684ae
--- /dev/null
+++ b/games/NXDoom/src/net_common.h
@@ -0,0 +1,106 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Common code shared between the client and server
+//
+
+#ifndef NET_COMMON_H
+#define NET_COMMON_H
+
+#include "d_mode.h"
+#include "net_defs.h"
+#include "net_packet.h"
+
+typedef enum
+{
+    // Client has sent a SYN, is waiting for a SYN in response.
+    NET_CONN_STATE_CONNECTING,
+
+    // Successfully connected.
+    NET_CONN_STATE_CONNECTED,
+
+    // Sent a DISCONNECT packet, waiting for a DISCONNECT_ACK reply
+    NET_CONN_STATE_DISCONNECTING,
+
+    // Client successfully disconnected
+    NET_CONN_STATE_DISCONNECTED,
+
+    // We are disconnected, but in a sleep state, waiting for several
+    // seconds.  This is in case the DISCONNECT_ACK we sent failed
+    // to arrive, and we need to send another one.  We keep this as
+    // a valid connection for a few seconds until we are sure that
+    // the other end has successfully disconnected as well.
+    NET_CONN_STATE_DISCONNECTED_SLEEP,
+
+} net_connstate_t;
+
+// Reason a connection was terminated
+
+typedef enum
+{
+    // As the result of a local disconnect request
+
+    NET_DISCONNECT_LOCAL,
+
+    // As the result of a remote disconnect request
+
+    NET_DISCONNECT_REMOTE,
+
+    // Timeout (no data received in a long time)
+
+    NET_DISCONNECT_TIMEOUT,
+
+} net_disconnect_reason_t;
+
+#define MAX_RETRIES 5
+
+typedef struct net_reliable_packet_s net_reliable_packet_t;
+
+typedef struct 
+{
+    net_connstate_t state;
+    net_disconnect_reason_t disconnect_reason;
+    net_addr_t *addr;
+    net_protocol_t protocol;
+    int last_send_time;
+    int num_retries;
+    int keepalive_send_time;
+    int keepalive_recv_time;
+    net_reliable_packet_t *reliable_packets;
+    int reliable_send_seq;
+    int reliable_recv_seq;
+} net_connection_t;
+
+
+void NET_Conn_SendPacket(net_connection_t *conn, net_packet_t *packet);
+void NET_Conn_InitClient(net_connection_t *conn, net_addr_t *addr,
+                         net_protocol_t protocol);
+void NET_Conn_InitServer(net_connection_t *conn, net_addr_t *addr,
+                         net_protocol_t protocol);
+boolean NET_Conn_Packet(net_connection_t *conn, net_packet_t *packet,
+                        unsigned int *packet_type);
+void NET_Conn_Disconnect(net_connection_t *conn);
+void NET_Conn_Run(net_connection_t *conn);
+net_packet_t *NET_Conn_NewReliable(net_connection_t *conn, int packet_type);
+
+// Other miscellaneous common functions
+unsigned int NET_ExpandTicNum(unsigned int relative, unsigned int b);
+boolean NET_ValidGameSettings(GameMode_t mode, GameMission_t mission,
+                              net_gamesettings_t *settings);
+
+void NET_OpenLog(void);
+void NET_Log(const char *fmt, ...);
+void NET_LogPacket(net_packet_t *packet);
+
+#endif /* #ifndef NET_COMMON_H */
+
diff --git a/games/NXDoom/src/net_dedicated.c b/games/NXDoom/src/net_dedicated.c
new file mode 100644
index 000000000..dcb9f8fae
--- /dev/null
+++ b/games/NXDoom/src/net_dedicated.c
@@ -0,0 +1,80 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dedicated server code.
+// 
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+
+#include "i_system.h"
+#include "i_timer.h"
+
+#include "m_argv.h"
+
+#include "net_common.h"
+#include "net_sdl.h"
+#include "net_server.h"
+
+// 
+// People can become confused about how dedicated servers work.  Game
+// options are specified to the controlling player who is the first to
+// join a game.  Bomb out with an error message if game options are
+// specified to a dedicated server.
+//
+
+static const char *not_dedicated_options[] =
+{
+    "-deh", "-iwad", "-cdrom", "-gameversion", "-nomonsters", "-respawn",
+    "-fast", "-altdeath", "-deathmatch", "-turbo", "-merge", "-af", "-as",
+    "-aa", "-file", "-wart", "-skill", "-episode", "-timer", "-avg", "-warp",
+    "-loadgame", "-longtics", "-extratics", "-dup", "-shorttics", NULL,
+};
+
+static void CheckForClientOptions(void)
+{
+    int i;
+
+    for (i=0; not_dedicated_options[i] != NULL; ++i)
+    {
+        if (M_CheckParm(not_dedicated_options[i]) > 0)
+        {
+            I_Error("The command line parameter '%s' was specified to a "
+                    "dedicated server.\nGame parameters should be specified "
+                    "to the first player to join a server, \nnot to the "
+                    "server itself. ",
+                    not_dedicated_options[i]);
+        }
+    }
+}
+
+void NET_DedicatedServer(void)
+{
+    CheckForClientOptions();
+
+    NET_OpenLog();
+    NET_SV_Init();
+    NET_SV_AddModule(&net_sdl_module);
+    NET_SV_RegisterWithMaster();
+
+    while (true)
+    {
+        NET_SV_Run();
+        // TODO: Block on socket instead of polling.
+        I_Sleep(1);
+    }
+}
+
diff --git a/games/NXDoom/src/net_dedicated.h b/games/NXDoom/src/net_dedicated.h
new file mode 100644
index 000000000..3d7387b57
--- /dev/null
+++ b/games/NXDoom/src/net_dedicated.h
@@ -0,0 +1,25 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Dedicated server code.
+// 
+
+#ifndef NET_DEDICATED_H
+#define NET_DEDICATED_H
+
+void NET_DedicatedServer(void);
+
+#endif /* #ifndef NET_DEDICATED_H */
+
+
diff --git a/games/NXDoom/src/net_defs.h b/games/NXDoom/src/net_defs.h
new file mode 100644
index 000000000..ab852c08e
--- /dev/null
+++ b/games/NXDoom/src/net_defs.h
@@ -0,0 +1,276 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Definitions for use in networking code.
+//
+
+#ifndef NET_DEFS_H
+#define NET_DEFS_H 
+
+#include <stdio.h>
+
+#include "doomtype.h"
+#include "d_ticcmd.h"
+#include "sha1.h"
+
+// Absolute maximum number of "nodes" in the game.  This is different to
+// NET_MAXPLAYERS, as there may be observers that are not participating
+// (eg. left/right monitors)
+
+#define MAXNETNODES 16
+
+// The maximum number of players, multiplayer/networking.
+// This is the maximum supported by the networking code; individual games
+// have their own values for MAXPLAYERS that can be smaller.
+
+#define NET_MAXPLAYERS 8
+
+// Maximum length of a player's name.
+
+#define MAXPLAYERNAME 30
+
+// Networking and tick handling related.
+
+#define BACKUPTICS 128
+
+typedef struct _net_module_s net_module_t;
+typedef struct _net_packet_s net_packet_t;
+typedef struct _net_addr_s net_addr_t;
+typedef struct _net_context_s net_context_t;
+
+struct _net_packet_s
+{
+    byte *data;
+    size_t len;
+    size_t alloced;
+    unsigned int pos;
+};
+
+struct _net_module_s
+{
+    // Initialize this module for use as a client
+
+    boolean (*InitClient)(void);
+
+    // Initialize this module for use as a server
+
+    boolean (*InitServer)(void);
+
+    // Send a packet
+
+    void (*SendPacket)(net_addr_t *addr, net_packet_t *packet);
+
+    // Check for new packets to receive
+    //
+    // Returns true if packet received
+
+    boolean (*RecvPacket)(net_addr_t **addr, net_packet_t **packet);
+
+    // Converts an address to a string
+
+    void (*AddrToString)(net_addr_t *addr, char *buffer, int buffer_len);
+
+    // Free back an address when no longer in use
+
+    void (*FreeAddress)(net_addr_t *addr);
+
+    // Try to resolve a name to an address
+
+    net_addr_t *(*ResolveAddress)(const char *addr);
+};
+
+// net_addr_t
+
+struct _net_addr_s
+{
+    net_module_t *module;
+    int refcount;
+    void *handle;
+};
+
+// Magic number sent when connecting to check this is a valid client
+#define NET_MAGIC_NUMBER     1454104972U
+
+// Old magic number used by Chocolate Doom versions before v3.0:
+#define NET_OLD_MAGIC_NUMBER 3436803284U
+
+// header field value indicating that the packet is a reliable packet
+
+#define NET_RELIABLE_PACKET (1 << 15)
+
+// Supported protocols. If you're developing a fork of Chocolate
+// Doom, you can add your own entry to this list while maintaining
+// compatibility with Chocolate Doom servers. Higher-numbered enum values
+// will be preferred when negotiating a protocol for the client and server
+// to use, so the order matters.
+// NOTE: The values in this enum do not have any special value outside of
+// the program they're compiled in. What matters is the string representation.
+typedef enum
+{
+    // Protocol introduced with Chocolate Doom v3.0. Each compatibility-
+    // breaking change to the network protocol will produce a new protocol
+    // number in this enum.
+    NET_PROTOCOL_CHOCOLATE_DOOM_0,
+
+    // Add your own protocol here; be sure to add a name for it to the list
+    // in net_common.c too.
+
+    NET_NUM_PROTOCOLS,
+    NET_PROTOCOL_UNKNOWN,
+} net_protocol_t;
+
+// packet types
+
+typedef enum
+{
+    NET_PACKET_TYPE_SYN,
+    NET_PACKET_TYPE_ACK, // deprecated
+    NET_PACKET_TYPE_REJECTED,
+    NET_PACKET_TYPE_KEEPALIVE,
+    NET_PACKET_TYPE_WAITING_DATA,
+    NET_PACKET_TYPE_GAMESTART,
+    NET_PACKET_TYPE_GAMEDATA,
+    NET_PACKET_TYPE_GAMEDATA_ACK,
+    NET_PACKET_TYPE_DISCONNECT,
+    NET_PACKET_TYPE_DISCONNECT_ACK,
+    NET_PACKET_TYPE_RELIABLE_ACK,
+    NET_PACKET_TYPE_GAMEDATA_RESEND,
+    NET_PACKET_TYPE_CONSOLE_MESSAGE,
+    NET_PACKET_TYPE_QUERY,
+    NET_PACKET_TYPE_QUERY_RESPONSE,
+    NET_PACKET_TYPE_LAUNCH,
+    NET_PACKET_TYPE_NAT_HOLE_PUNCH,
+} net_packet_type_t;
+
+typedef enum
+{
+    NET_MASTER_PACKET_TYPE_ADD,
+    NET_MASTER_PACKET_TYPE_ADD_RESPONSE,
+    NET_MASTER_PACKET_TYPE_QUERY,
+    NET_MASTER_PACKET_TYPE_QUERY_RESPONSE,
+    NET_MASTER_PACKET_TYPE_GET_METADATA,
+    NET_MASTER_PACKET_TYPE_GET_METADATA_RESPONSE,
+    NET_MASTER_PACKET_TYPE_SIGN_START,
+    NET_MASTER_PACKET_TYPE_SIGN_START_RESPONSE,
+    NET_MASTER_PACKET_TYPE_SIGN_END,
+    NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE,
+    NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH,
+    NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL,
+} net_master_packet_type_t;
+
+// Settings specified when the client connects to the server.
+
+typedef struct
+{
+    int gamemode;
+    int gamemission;
+    int lowres_turn;
+    int drone;
+    int max_players;
+    int is_freedoom;
+    sha1_digest_t wad_sha1sum;
+    sha1_digest_t deh_sha1sum;
+    int player_class;
+} net_connect_data_t;
+
+// Game settings sent by client to server when initiating game start,
+// and received from the server by clients when the game starts.
+
+typedef struct
+{
+    int ticdup;
+    int extratics;
+    int deathmatch;
+    int episode;
+    int nomonsters;
+    int fast_monsters;
+    int respawn_monsters;
+    int map;
+    int skill;
+    int gameversion;
+    int lowres_turn;
+    int new_sync;
+    int timelimit;
+    int loadgame;
+    int random;  // [Strife only]
+
+    // These fields are only used by the server when sending a game
+    // start message:
+
+    int num_players;
+    int consoleplayer;
+
+    // Hexen player classes:
+
+    int player_classes[NET_MAXPLAYERS];
+
+} net_gamesettings_t;
+
+#define NET_TICDIFF_FORWARD      (1 << 0)
+#define NET_TICDIFF_SIDE         (1 << 1)
+#define NET_TICDIFF_TURN         (1 << 2)
+#define NET_TICDIFF_BUTTONS      (1 << 3)
+#define NET_TICDIFF_CONSISTANCY  (1 << 4)
+#define NET_TICDIFF_CHATCHAR     (1 << 5)
+#define NET_TICDIFF_RAVEN        (1 << 6)
+#define NET_TICDIFF_STRIFE       (1 << 7)
+
+typedef struct
+{
+    unsigned int diff;
+    ticcmd_t cmd;
+} net_ticdiff_t;
+
+// Complete set of ticcmds from all players
+
+typedef struct 
+{
+    signed int latency;
+    unsigned int seq;
+    boolean playeringame[NET_MAXPLAYERS];
+    net_ticdiff_t cmds[NET_MAXPLAYERS];
+} net_full_ticcmd_t;
+
+// Data sent in response to server queries
+
+typedef struct
+{
+    const char *version;
+    int server_state;
+    int num_players;
+    int max_players;
+    int gamemode;
+    int gamemission;
+    const char *description;
+    net_protocol_t protocol;
+} net_querydata_t;
+
+// Data sent by the server while waiting for the game to start.
+
+typedef struct
+{
+    int num_players;
+    int num_drones;
+    int ready_players;
+    int max_players;
+    int is_controller;
+    int consoleplayer;
+    char player_names[NET_MAXPLAYERS][MAXPLAYERNAME];
+    char player_addrs[NET_MAXPLAYERS][MAXPLAYERNAME];
+    sha1_digest_t wad_sha1sum;
+    sha1_digest_t deh_sha1sum;
+    int is_freedoom;
+} net_waitdata_t;
+
+#endif /* #ifndef NET_DEFS_H */
diff --git a/games/NXDoom/src/net_gui.c b/games/NXDoom/src/net_gui.c
new file mode 100644
index 000000000..0a73fa43c
--- /dev/null
+++ b/games/NXDoom/src/net_gui.c
@@ -0,0 +1,434 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Graphical stuff related to the networking code:
+//
+//  * The client waiting screen when we are waiting for the server to
+//    start the game.
+//   
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "config.h"
+#include "doomkeys.h"
+
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "m_argv.h"
+#include "m_misc.h"
+
+#include "net_client.h"
+#include "net_gui.h"
+#include "net_query.h"
+#include "net_server.h"
+
+#include "textscreen.h"
+
+static txt_window_t *window;
+static int old_max_players;
+static txt_label_t *player_labels[NET_MAXPLAYERS];
+static txt_label_t *ip_labels[NET_MAXPLAYERS];
+static txt_label_t *drone_label;
+static txt_label_t *master_msg_label;
+static boolean had_warning;
+
+// Number of players we expect to be in the game. When the number is
+// reached, we auto-start the game (if we're the controller). If
+// zero, do not autostart.
+static int expected_nodes;
+
+static void EscapePressed(TXT_UNCAST_ARG(widget), void *unused)
+{
+    TXT_Shutdown();
+    I_Quit();
+}
+
+static void StartGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    NET_CL_LaunchGame();
+}
+
+static void OpenWaitDialog(void)
+{
+    txt_window_action_t *cancel;
+
+    TXT_SetDesktopTitle(PACKAGE_STRING);
+
+    window = TXT_NewWindow("Waiting for game start...");
+
+    TXT_AddWidget(window, TXT_NewLabel("\nPlease wait...\n\n"));
+
+    cancel = TXT_NewWindowAction(KEY_ESCAPE, "Cancel");
+    TXT_SignalConnect(cancel, "pressed", EscapePressed, NULL);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, cancel);
+    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_BOTTOM,
+                                  TXT_SCREEN_W / 2, TXT_SCREEN_H - 9);
+
+    old_max_players = 0;
+}
+
+static void BuildWindow(void)
+{
+    char buf[50];
+    txt_table_t *table;
+    int i;
+
+    TXT_ClearTable(window);
+    table = TXT_NewTable(3);
+    TXT_AddWidget(window, table);
+
+    // Add spacers
+
+    TXT_AddWidget(table, NULL);
+    TXT_AddWidget(table, TXT_NewStrut(25, 1));
+    TXT_AddWidget(table, TXT_NewStrut(17, 1));
+
+    // Player labels
+
+    for (i = 0; i < net_client_wait_data.max_players; ++i)
+    {
+        M_snprintf(buf, sizeof(buf), " %i. ", i + 1);
+        TXT_AddWidget(table, TXT_NewLabel(buf));
+        player_labels[i] = TXT_NewLabel("");
+        ip_labels[i] = TXT_NewLabel("");
+        TXT_AddWidget(table, player_labels[i]);
+        TXT_AddWidget(table, ip_labels[i]);
+    }
+
+    drone_label = TXT_NewLabel("");
+
+    TXT_AddWidget(window, drone_label);
+}
+
+static void UpdateGUI(void)
+{
+    txt_window_action_t *startgame;
+    char buf[50];
+    unsigned int i;
+
+    // If the value of max_players changes, we must rebuild the
+    // contents of the window. This includes when the first
+    // waiting data packet is received.
+
+    if (net_client_received_wait_data)
+    {
+        if (net_client_wait_data.max_players != old_max_players)
+        {
+            BuildWindow();
+        }
+    }
+    else
+    {
+        return;
+    }
+
+    for (i = 0; i < net_client_wait_data.max_players; ++i)
+    {
+        txt_color_t color = TXT_COLOR_BRIGHT_WHITE;
+
+        if ((signed) i == net_client_wait_data.consoleplayer)
+        {
+            color = TXT_COLOR_YELLOW;
+        }
+
+        TXT_SetFGColor(player_labels[i], color);
+        TXT_SetFGColor(ip_labels[i], color);
+
+        if (i < net_client_wait_data.num_players)
+        {
+            TXT_SetLabel(player_labels[i],
+                         net_client_wait_data.player_names[i]);
+            TXT_SetLabel(ip_labels[i],
+                         net_client_wait_data.player_addrs[i]);
+        }
+        else
+        {
+            TXT_SetLabel(player_labels[i], "");
+            TXT_SetLabel(ip_labels[i], "");
+        }
+    }
+
+    if (net_client_wait_data.num_drones > 0)
+    {
+        M_snprintf(buf, sizeof(buf), " (+%i observer clients)",
+                   net_client_wait_data.num_drones);
+        TXT_SetLabel(drone_label, buf);
+    }
+    else
+    {
+        TXT_SetLabel(drone_label, "");
+    }
+
+    if (net_client_wait_data.is_controller)
+    {
+        startgame = TXT_NewWindowAction(' ', "Start game");
+        TXT_SignalConnect(startgame, "pressed", StartGame, NULL);
+    }
+    else
+    {
+        startgame = NULL;
+    }
+
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, startgame);
+}
+
+static void BuildMasterStatusWindow(void)
+{
+    txt_window_t *master_window;
+
+    master_window = TXT_NewWindow(NULL);
+    master_msg_label = TXT_NewLabel("");
+    TXT_AddWidget(master_window, master_msg_label);
+
+    // This window is here purely for information, so it should be
+    // in the background.
+
+    TXT_LowerWindow(master_window);
+    TXT_SetWindowPosition(master_window, TXT_HORIZ_CENTER, TXT_VERT_CENTER,
+                                         TXT_SCREEN_W / 2, TXT_SCREEN_H - 4);
+    TXT_SetWindowAction(master_window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(master_window, TXT_HORIZ_CENTER, NULL);
+    TXT_SetWindowAction(master_window, TXT_HORIZ_RIGHT, NULL);
+}
+
+static void CheckMasterStatus(void)
+{
+    boolean added;
+
+    if (!NET_Query_CheckAddedToMaster(&added))
+    {
+        return;
+    }
+
+    if (master_msg_label == NULL)
+    {
+        BuildMasterStatusWindow();
+    }
+
+    if (added)
+    {
+        TXT_SetLabel(master_msg_label,
+            "Your server is now registered with the global master server.\n"
+            "Other players can find your server online.");
+    }
+    else
+    {
+        TXT_SetLabel(master_msg_label,
+            "Failed to register with the master server. Your server is not\n"
+            "publicly accessible. You may need to reconfigure your Internet\n"
+            "router to add a port forward for UDP port 2342. Look up\n"
+            "information on port forwarding online.");
+    }
+}
+
+static void PrintSHA1Digest(const char *s, const byte *digest)
+{
+    unsigned int i;
+
+    printf("%s: ", s);
+
+    for (i=0; i<sizeof(sha1_digest_t); ++i)
+    {
+        printf("%02x", digest[i]);
+    }
+
+    printf("\n");
+}
+
+static void CloseWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+{
+    TXT_CAST_ARG(txt_window_t, window);
+
+    TXT_CloseWindow(window);
+}
+
+static void CheckSHA1Sums(void)
+{
+    boolean correct_wad, correct_deh;
+    boolean same_freedoom;
+    txt_window_t *window;
+    txt_window_action_t *cont_button;
+
+    if (!net_client_received_wait_data || had_warning)
+    {
+        return;
+    }
+
+    correct_wad = memcmp(net_local_wad_sha1sum,
+                         net_client_wait_data.wad_sha1sum, 
+                         sizeof(sha1_digest_t)) == 0;
+    correct_deh = memcmp(net_local_deh_sha1sum,
+                         net_client_wait_data.deh_sha1sum, 
+                         sizeof(sha1_digest_t)) == 0;
+    same_freedoom = net_client_wait_data.is_freedoom == net_local_is_freedoom;
+
+    if (correct_wad && correct_deh && same_freedoom)
+    {
+        return;
+    }
+
+    if (!correct_wad)
+    {
+        printf("Warning: WAD SHA1 does not match server:\n");
+        PrintSHA1Digest("Local", net_local_wad_sha1sum);
+        PrintSHA1Digest("Server", net_client_wait_data.wad_sha1sum);
+    }
+
+    if (!same_freedoom)
+    {
+        printf("Warning: Mixing Freedoom with non-Freedoom\n");
+        printf("Local: %u  Server: %i\n",
+               net_local_is_freedoom, 
+               net_client_wait_data.is_freedoom);
+    }
+
+    if (!correct_deh)
+    {
+        printf("Warning: Dehacked SHA1 does not match server:\n");
+        PrintSHA1Digest("Local", net_local_deh_sha1sum);
+        PrintSHA1Digest("Server", net_client_wait_data.deh_sha1sum);
+    }
+
+    window = TXT_NewWindow("WARNING!");
+
+    cont_button = TXT_NewWindowAction(KEY_ENTER, "Continue");
+    TXT_SignalConnect(cont_button, "pressed", CloseWindow, window);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, cont_button);
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+
+    if (!same_freedoom)
+    {
+        // If Freedoom and Doom IWADs are mixed, the WAD directory
+        // will be wrong, but this is not neccessarily a problem.
+        // Display a different message to the WAD directory message.
+
+        if (net_local_is_freedoom)
+        {
+            TXT_AddWidget(window, TXT_NewLabel
+            ("You are using the Freedoom IWAD to play with players\n"
+             "using an official Doom IWAD.  Make sure that you are\n"
+             "playing the same levels as other players.\n"));
+        }
+        else
+        {
+            TXT_AddWidget(window, TXT_NewLabel
+            ("You are using an official IWAD to play with players\n"
+             "using the Freedoom IWAD.  Make sure that you are\n"
+             "playing the same levels as other players.\n"));
+        }
+    }
+    else if (!correct_wad)
+    {
+        TXT_AddWidget(window, TXT_NewLabel
+            ("Your WAD directory does not match other players in the game.\n"
+             "Check that you have loaded the exact same WAD files as other\n"
+             "players.\n"));
+    }
+
+    if (!correct_deh)
+    {
+        TXT_AddWidget(window, TXT_NewLabel
+            ("Your dehacked signature does not match other players in the\n"
+             "game.  Check that you have loaded the same dehacked patches\n"
+             "as other players.\n"));
+    }
+
+    TXT_AddWidget(window, TXT_NewLabel
+            ("If you continue, this may cause your game to desync."));
+
+    had_warning = true;
+}
+
+static void ParseCommandLineArgs(void)
+{
+    int i;
+
+    //!
+    // @arg <n>
+    // @category net
+    //
+    // Autostart the netgame when n nodes (clients) have joined the server.
+    //
+
+    i = M_CheckParmWithArgs("-nodes", 1);
+    if (i > 0)
+    {
+        expected_nodes = atoi(myargv[i + 1]);
+    }
+}
+
+static void CheckAutoLaunch(void)
+{
+    int nodes;
+
+    if (net_client_received_wait_data
+     && net_client_wait_data.is_controller
+     && expected_nodes > 0)
+    {
+        nodes = net_client_wait_data.num_players
+              + net_client_wait_data.num_drones;
+
+        if (nodes >= expected_nodes)
+        {
+            StartGame(NULL, NULL);
+            expected_nodes = 0;
+        }
+    }
+}
+
+void NET_WaitForLaunch(void)
+{
+    if (!TXT_Init())
+    {
+        fprintf(stderr, "Failed to initialize GUI\n");
+        exit(-1);
+    }
+
+    TXT_SetColor(TXT_COLOR_BLUE, 0x04, 0x14, 0x40); // Romero's "funky blue" color
+    
+    I_InitWindowIcon();
+
+    ParseCommandLineArgs();
+    OpenWaitDialog();
+    had_warning = false;
+
+    while (net_waiting_for_launch)
+    {
+        UpdateGUI();
+        CheckAutoLaunch();
+        CheckSHA1Sums();
+        CheckMasterStatus();
+
+        TXT_DispatchEvents();
+        TXT_DrawDesktop();
+
+        NET_CL_Run();
+        NET_SV_Run();
+
+        if (!net_client_connected)
+        {
+            I_Error("Lost connection to server");
+        }
+
+        TXT_Sleep(100);
+    }
+
+    TXT_Shutdown();
+}
diff --git a/games/NXDoom/src/net_gui.h b/games/NXDoom/src/net_gui.h
new file mode 100644
index 000000000..4f4198b60
--- /dev/null
+++ b/games/NXDoom/src/net_gui.h
@@ -0,0 +1,29 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Graphical stuff related to the networking code:
+//
+//  * The client waiting screen when we are waiting for the server to
+//    start the game.
+//
+
+
+#ifndef NET_GUI_H
+#define NET_GUI_H
+
+#include "doomtype.h"
+
+extern void NET_WaitForLaunch(void);
+
+#endif /* #ifndef NET_GUI_H */
+
diff --git a/games/NXDoom/src/net_io.c b/games/NXDoom/src/net_io.c
new file mode 100644
index 000000000..02519afe2
--- /dev/null
+++ b/games/NXDoom/src/net_io.c
@@ -0,0 +1,147 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Network packet I/O.  Base layer for sending/receiving packets,
+//     through the network module system
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "net_defs.h"
+#include "net_io.h"
+#include "z_zone.h"
+
+#define MAX_MODULES 16
+
+struct _net_context_s
+{
+    net_module_t *modules[MAX_MODULES];
+    int num_modules;
+};
+
+net_addr_t net_broadcast_addr;
+
+net_context_t *NET_NewContext(void)
+{
+    net_context_t *context;
+
+    context = Z_Malloc(sizeof(net_context_t), PU_STATIC, 0);
+    context->num_modules = 0;
+
+    return context;
+}
+
+void NET_AddModule(net_context_t *context, net_module_t *module)
+{
+    if (context->num_modules >= MAX_MODULES)
+    {
+        I_Error("NET_AddModule: No more modules for context");
+    }
+    
+    context->modules[context->num_modules] = module;
+    ++context->num_modules;
+}
+
+net_addr_t *NET_ResolveAddress(net_context_t *context, const char *addr)
+{
+    int i;
+    net_addr_t *result;
+
+    for (i=0; i<context->num_modules; ++i)
+    {
+        result = context->modules[i]->ResolveAddress(addr);
+
+        if (result != NULL)
+        {
+            NET_ReferenceAddress(result);
+            return result;
+        }
+    }
+
+    return NULL;
+}
+
+void NET_SendPacket(net_addr_t *addr, net_packet_t *packet)
+{
+    addr->module->SendPacket(addr, packet);
+}
+
+void NET_SendBroadcast(net_context_t *context, net_packet_t *packet)
+{
+    int i;
+
+    for (i=0; i<context->num_modules; ++i)
+    {
+        context->modules[i]->SendPacket(&net_broadcast_addr, packet);
+    }
+}
+
+boolean NET_RecvPacket(net_context_t *context, 
+                       net_addr_t **addr, 
+                       net_packet_t **packet)
+{
+    int i;
+    
+    // check all modules for new packets
+    
+    for (i=0; i<context->num_modules; ++i)
+    {
+        if (context->modules[i]->RecvPacket(addr, packet))
+        {
+            NET_ReferenceAddress(*addr);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Note: this prints into a static buffer, calling again overwrites
+// the first result
+
+char *NET_AddrToString(net_addr_t *addr)
+{
+    static char buf[128];
+
+    addr->module->AddrToString(addr, buf, sizeof(buf) - 1);
+
+    return buf;
+}
+
+void NET_ReferenceAddress(net_addr_t *addr)
+{
+    if (addr == NULL)
+    {
+        return;
+    }
+    ++addr->refcount;
+    //printf("%s: +refcount=%d\n", NET_AddrToString(addr), addr->refcount);
+}
+
+void NET_ReleaseAddress(net_addr_t *addr)
+{
+    if (addr == NULL)
+    {
+        return;
+    }
+
+    --addr->refcount;
+    //printf("%s: -refcount=%d\n", NET_AddrToString(addr), addr->refcount);
+    if (addr->refcount <= 0)
+    {
+        addr->module->FreeAddress(addr);
+    }
+}
+
diff --git a/games/NXDoom/src/net_io.h b/games/NXDoom/src/net_io.h
new file mode 100644
index 000000000..d61a1eb3d
--- /dev/null
+++ b/games/NXDoom/src/net_io.h
@@ -0,0 +1,61 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Network packet manipulation (net_packet_t)
+//
+
+#ifndef NET_IO_H
+#define NET_IO_H
+
+#include "net_defs.h"
+
+extern net_addr_t net_broadcast_addr;
+
+// Create a new network context.
+net_context_t *NET_NewContext(void);
+
+// Add a network module to a context.
+void NET_AddModule(net_context_t *context, net_module_t *module);
+
+// Send a packet to the given address.
+void NET_SendPacket(net_addr_t *addr, net_packet_t *packet);
+
+// Send a broadcast using all modules in the given context.
+void NET_SendBroadcast(net_context_t *context, net_packet_t *packet);
+
+// Check all modules in the given context and receive a packet, returning true
+// if a packet was received. The result is stored in *packet and the source is
+// stored in *addr, with an implicit reference added. The packet must be freed
+// by the caller and the reference releasd.
+boolean NET_RecvPacket(net_context_t *context, net_addr_t **addr,
+                       net_packet_t **packet);
+
+// Return a string representation of the given address. The result points to a
+// static buffer and will become invalid with the next call.
+char *NET_AddrToString(net_addr_t *addr);
+
+// Add a reference to the given address.
+void NET_ReferenceAddress(net_addr_t *addr);
+
+// Release a reference to the given address. When there are no more references,
+// the address will be freed.
+void NET_ReleaseAddress(net_addr_t *addr);
+
+// Resolve a string representation of an address. If successful, a net_addr_t
+// pointer is received with an implicit reference that must be freed by the
+// caller when it is no longer needed.
+net_addr_t *NET_ResolveAddress(net_context_t *context, const char *address);
+
+#endif  /* #ifndef NET_IO_H */
+
diff --git a/games/NXDoom/src/net_loop.c b/games/NXDoom/src/net_loop.c
new file mode 100644
index 000000000..65140fa3b
--- /dev/null
+++ b/games/NXDoom/src/net_loop.c
@@ -0,0 +1,231 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Loopback network module for server compiled into the client
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "net_defs.h"
+#include "net_loop.h"
+#include "net_packet.h"
+
+#define MAX_QUEUE_SIZE 16
+
+typedef struct
+{
+    net_packet_t *packets[MAX_QUEUE_SIZE];
+    int head, tail;
+} packet_queue_t;
+
+static packet_queue_t client_queue;
+static packet_queue_t server_queue;
+static net_addr_t client_addr;
+static net_addr_t server_addr;
+
+static void QueueInit(packet_queue_t *queue)
+{
+    queue->head = queue->tail = 0;
+}
+
+static void QueuePush(packet_queue_t *queue, net_packet_t *packet)
+{
+    int new_tail;
+
+    new_tail = (queue->tail + 1) % MAX_QUEUE_SIZE;
+
+    if (new_tail == queue->head)
+    {
+        // queue is full
+        
+        return;
+    }
+
+    queue->packets[queue->tail] = packet;
+    queue->tail = new_tail;
+}
+
+static net_packet_t *QueuePop(packet_queue_t *queue)
+{
+    net_packet_t *packet;
+    
+    if (queue->tail == queue->head)
+    {
+        // queue empty
+
+        return NULL;
+    }
+
+    packet = queue->packets[queue->head];
+    queue->head = (queue->head + 1) % MAX_QUEUE_SIZE;
+
+    return packet;
+}
+
+//-----------------------------------------------------------------------------
+//
+// Client end code
+//
+//-----------------------------------------------------------------------------
+
+static boolean NET_CL_InitClient(void)
+{
+    QueueInit(&client_queue);
+
+    return true;
+}
+
+static boolean NET_CL_InitServer(void)
+{
+    I_Error("NET_CL_InitServer: attempted to initialize client pipe end as a server!");
+    return false;
+}
+
+static void NET_CL_SendPacket(net_addr_t *addr, net_packet_t *packet)
+{
+    QueuePush(&server_queue, NET_PacketDup(packet));
+}
+
+static boolean NET_CL_RecvPacket(net_addr_t **addr, net_packet_t **packet)
+{
+    net_packet_t *popped;
+
+    popped = QueuePop(&client_queue);
+
+    if (popped != NULL)
+    {
+        *packet = popped;
+        *addr = &client_addr;
+        client_addr.module = &net_loop_client_module;
+        
+        return true;
+    }
+
+    return false;
+}
+
+static void NET_CL_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
+{
+    M_snprintf(buffer, buffer_len, "local server");
+}
+
+static void NET_CL_FreeAddress(net_addr_t *addr)
+{
+}
+
+static net_addr_t *NET_CL_ResolveAddress(const char *address)
+{
+    if (address == NULL)
+    {
+        client_addr.module = &net_loop_client_module;
+
+        return &client_addr;
+    }
+    else
+    {
+        return NULL;
+    }
+}
+
+net_module_t net_loop_client_module =
+{
+    NET_CL_InitClient,
+    NET_CL_InitServer,
+    NET_CL_SendPacket,
+    NET_CL_RecvPacket,
+    NET_CL_AddrToString,
+    NET_CL_FreeAddress,
+    NET_CL_ResolveAddress,
+};
+
+//-----------------------------------------------------------------------------
+//
+// Server end code
+//
+//-----------------------------------------------------------------------------
+
+static boolean NET_SV_InitClient(void)
+{
+    I_Error("NET_SV_InitClient: attempted to initialize server pipe end as a client!");
+    return false;
+}
+
+static boolean NET_SV_InitServer(void)
+{
+    QueueInit(&server_queue);
+
+    return true;
+}
+
+static void NET_SV_SendPacket(net_addr_t *addr, net_packet_t *packet)
+{
+    QueuePush(&client_queue, NET_PacketDup(packet));
+}
+
+static boolean NET_SV_RecvPacket(net_addr_t **addr, net_packet_t **packet)
+{
+    net_packet_t *popped;
+
+    popped = QueuePop(&server_queue);
+
+    if (popped != NULL)
+    {
+        *packet = popped;
+        *addr = &server_addr;
+        server_addr.module = &net_loop_server_module;
+        
+        return true;
+    }
+
+    return false;
+}
+
+static void NET_SV_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
+{
+    M_snprintf(buffer, buffer_len, "local client");
+}
+
+static void NET_SV_FreeAddress(net_addr_t *addr)
+{
+}
+
+static net_addr_t *NET_SV_ResolveAddress(const char *address)
+{
+    if (address == NULL)
+    {
+        server_addr.module = &net_loop_server_module;
+        return &server_addr;
+    }
+    else
+    {
+        return NULL;
+    }
+}
+
+net_module_t net_loop_server_module =
+{
+    NET_SV_InitClient,
+    NET_SV_InitServer,
+    NET_SV_SendPacket,
+    NET_SV_RecvPacket,
+    NET_SV_AddrToString,
+    NET_SV_FreeAddress,
+    NET_SV_ResolveAddress,
+};
+
+
diff --git a/games/NXDoom/src/net_loop.h b/games/NXDoom/src/net_loop.h
new file mode 100644
index 000000000..5a2e58ee1
--- /dev/null
+++ b/games/NXDoom/src/net_loop.h
@@ -0,0 +1,27 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Loopback network module for server compiled into the client
+//
+
+#ifndef NET_LOOP_H
+#define NET_LOOP_H
+
+#include "net_defs.h"
+
+extern net_module_t net_loop_client_module;
+extern net_module_t net_loop_server_module;
+
+#endif /* #ifndef NET_LOOP_H */
+
diff --git a/games/NXDoom/src/net_packet.c b/games/NXDoom/src/net_packet.c
new file mode 100644
index 000000000..23bfda675
--- /dev/null
+++ b/games/NXDoom/src/net_packet.c
@@ -0,0 +1,328 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Network packet manipulation (net_packet_t)
+//
+
+#include <ctype.h>
+#include <string.h>
+#include "m_misc.h"
+#include "net_packet.h"
+#include "z_zone.h"
+
+static int total_packet_memory = 0;
+
+net_packet_t *NET_NewPacket(int initial_size)
+{
+    net_packet_t *packet;
+
+    packet = (net_packet_t *) Z_Malloc(sizeof(net_packet_t), PU_STATIC, 0);
+    
+    if (initial_size == 0)
+        initial_size = 256;
+
+    packet->alloced = initial_size;
+    packet->data = Z_Malloc(initial_size, PU_STATIC, 0);
+    packet->len = 0;
+    packet->pos = 0;
+
+    total_packet_memory += sizeof(net_packet_t) + initial_size;
+
+    //printf("total packet memory: %i bytes\n", total_packet_memory);
+    //printf("%p: allocated\n", packet);
+
+    return packet;
+}
+
+// duplicates an existing packet
+
+net_packet_t *NET_PacketDup(net_packet_t *packet)
+{
+    net_packet_t *newpacket;
+
+    newpacket = NET_NewPacket(packet->len);
+    memcpy(newpacket->data, packet->data, packet->len);
+    newpacket->len = packet->len;
+
+    return newpacket;
+}
+
+void NET_FreePacket(net_packet_t *packet)
+{
+    //printf("%p: destroyed\n", packet);
+    
+    total_packet_memory -= sizeof(net_packet_t) + packet->alloced;
+    Z_Free(packet->data);
+    Z_Free(packet);
+}
+
+// Read a byte from the packet, returning true if read
+// successfully
+
+boolean NET_ReadInt8(net_packet_t *packet, unsigned int *data)
+{
+    if (packet->pos + 1 > packet->len)
+        return false;
+
+    *data = packet->data[packet->pos];
+
+    packet->pos += 1;
+
+    return true;
+}
+
+// Read a 16-bit integer from the packet, returning true if read
+// successfully
+
+boolean NET_ReadInt16(net_packet_t *packet, unsigned int *data)
+{
+    byte *p;
+
+    if (packet->pos + 2 > packet->len)
+        return false;
+
+    p = packet->data + packet->pos;
+
+    *data = (p[0] << 8) | p[1];
+    packet->pos += 2;
+
+    return true;
+}
+
+// Read a 32-bit integer from the packet, returning true if read
+// successfully
+
+boolean NET_ReadInt32(net_packet_t *packet, unsigned int *data)
+{
+    byte *p;
+
+    if (packet->pos + 4 > packet->len)
+        return false;
+
+    p = packet->data + packet->pos;
+
+    *data = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
+    packet->pos += 4;
+    
+    return true;
+}
+
+// Signed read functions
+
+boolean NET_ReadSInt8(net_packet_t *packet, signed int *data)
+{
+    if (NET_ReadInt8(packet,(unsigned int *) data))
+    {
+        if (*data & (1 << 7))
+        {
+            *data &= ~(1 << 7);
+            *data -= (1 << 7);
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+boolean NET_ReadSInt16(net_packet_t *packet, signed int *data)
+{
+    if (NET_ReadInt16(packet, (unsigned int *) data))
+    {
+        if (*data & (1 << 15))
+        {
+            *data &= ~(1 << 15);
+            *data -= (1 << 15);
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+boolean NET_ReadSInt32(net_packet_t *packet, signed int *data)
+{
+    if (NET_ReadInt32(packet, (unsigned int *) data))
+    {
+        if (*data & (1U << 31))
+        {
+            *data &= ~(1U << 31);
+            *data -= (1U << 31);
+        }
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+// Read a string from the packet.  Returns NULL if a terminating 
+// NUL character was not found before the end of the packet.
+
+char *NET_ReadString(net_packet_t *packet)
+{
+    char *start;
+
+    start = (char *) packet->data + packet->pos;
+
+    // Search forward for a NUL character
+
+    while (packet->pos < packet->len && packet->data[packet->pos] != '\0')
+    {
+        ++packet->pos;
+    }
+
+    if (packet->pos >= packet->len)
+    {
+        // Reached the end of the packet
+
+        return NULL;
+    }
+
+    // packet->data[packet->pos] == '\0': We have reached a terminating
+    // NULL.  Skip past this NULL and continue reading immediately 
+    // after it.
+
+    ++packet->pos;
+    
+    return start;
+}
+
+// Read a string from the packet, but (potentially) modify it to strip
+// out any unprintable characters which could be malicious control codes.
+// Note that this may modify the original packet contents.
+char *NET_ReadSafeString(net_packet_t *packet)
+{
+    char *r, *w, *result;
+
+    result = NET_ReadString(packet);
+    if (result == NULL)
+    {
+        return NULL;
+    }
+
+    // w is always <= r, so we never produce a longer string than the original.
+    w = result;
+    for (r = result; *r != '\0'; ++r)
+    {
+        // TODO: This is a very naive way of producing a safe string; only
+        // ASCII characters are allowed. Probably this should really support
+        // UTF-8 characters as well.
+        if (isprint(*r) || *r == '\n')
+        {
+            *w = *r;
+            ++w;
+        }
+    }
+    *w = '\0';
+
+    return result;
+}
+
+// Dynamically increases the size of a packet
+
+static void NET_IncreasePacket(net_packet_t *packet)
+{
+    byte *newdata;
+
+    total_packet_memory -= packet->alloced;
+   
+    packet->alloced *= 2;
+
+    newdata = Z_Malloc(packet->alloced, PU_STATIC, 0);
+
+    memcpy(newdata, packet->data, packet->len);
+
+    Z_Free(packet->data);
+    packet->data = newdata;
+
+    total_packet_memory += packet->alloced;
+}
+
+// Write a single byte to the packet
+
+void NET_WriteInt8(net_packet_t *packet, unsigned int i)
+{
+    if (packet->len + 1 > packet->alloced)
+        NET_IncreasePacket(packet);
+
+    packet->data[packet->len] = i;
+    packet->len += 1;
+}
+
+// Write a 16-bit integer to the packet
+
+void NET_WriteInt16(net_packet_t *packet, unsigned int i)
+{
+    byte *p;
+    
+    if (packet->len + 2 > packet->alloced)
+        NET_IncreasePacket(packet);
+
+    p = packet->data + packet->len;
+
+    p[0] = (i >> 8) & 0xff;
+    p[1] = i & 0xff;
+
+    packet->len += 2;
+}
+
+
+// Write a single byte to the packet
+
+void NET_WriteInt32(net_packet_t *packet, unsigned int i)
+{
+    byte *p;
+
+    if (packet->len + 4 > packet->alloced)
+        NET_IncreasePacket(packet);
+
+    p = packet->data + packet->len;
+
+    p[0] = (i >> 24) & 0xff;
+    p[1] = (i >> 16) & 0xff;
+    p[2] = (i >> 8) & 0xff;
+    p[3] = i & 0xff;
+
+    packet->len += 4;
+}
+
+void NET_WriteString(net_packet_t *packet, const char *string)
+{
+    byte *p;
+    size_t string_size;
+
+    string_size = strlen(string) + 1;
+
+    // Increase the packet size until large enough to hold the string
+
+    while (packet->len + string_size > packet->alloced)
+    {
+        NET_IncreasePacket(packet);
+    }
+
+    p = packet->data + packet->len;
+
+    M_StringCopy((char *) p, string, string_size);
+
+    packet->len += string_size;
+}
+
+
+
+
diff --git a/games/NXDoom/src/net_packet.h b/games/NXDoom/src/net_packet.h
new file mode 100644
index 000000000..6beb44b2a
--- /dev/null
+++ b/games/NXDoom/src/net_packet.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Definitions for use in networking code.
+//
+
+#ifndef NET_PACKET_H
+#define NET_PACKET_H
+
+#include "net_defs.h"
+
+net_packet_t *NET_NewPacket(int initial_size);
+net_packet_t *NET_PacketDup(net_packet_t *packet);
+void NET_FreePacket(net_packet_t *packet);
+
+boolean NET_ReadInt8(net_packet_t *packet, unsigned int *data);
+boolean NET_ReadInt16(net_packet_t *packet, unsigned int *data);
+boolean NET_ReadInt32(net_packet_t *packet, unsigned int *data);
+
+boolean NET_ReadSInt8(net_packet_t *packet, signed int *data);
+boolean NET_ReadSInt16(net_packet_t *packet, signed int *data);
+boolean NET_ReadSInt32(net_packet_t *packet, signed int *data);
+
+char *NET_ReadString(net_packet_t *packet);
+char *NET_ReadSafeString(net_packet_t *packet);
+
+void NET_WriteInt8(net_packet_t *packet, unsigned int i);
+void NET_WriteInt16(net_packet_t *packet, unsigned int i);
+void NET_WriteInt32(net_packet_t *packet, unsigned int i);
+
+void NET_WriteString(net_packet_t *packet, const char *string);
+
+#endif /* #ifndef NET_PACKET_H */
+
diff --git a/games/NXDoom/src/net_petname.c b/games/NXDoom/src/net_petname.c
new file mode 100644
index 000000000..db6600db6
--- /dev/null
+++ b/games/NXDoom/src/net_petname.c
@@ -0,0 +1,118 @@
+//
+// Copyright(C) 2019 Jonathan Dowland
+//
+// 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.
+//
+// DESCRIPTION:
+//     Generate a randomized, private, memorable name for a Player
+//
+
+#include <stdlib.h>
+#include <time.h>
+#include "doomtype.h"
+#include "m_misc.h"
+
+static const char * const adjectives [] = {
+    "Grumpy",
+    "Ecstatic",
+    "Surly",
+    "Prepared",
+    "Crafty",
+    "Alert",
+    "Sluggish",
+    "Testy",
+    "Reluctant",
+    "Languid",
+    "Passive",
+    "Pacifist",
+    "Aggressive",
+    "Hostile",
+    "Bubbly",
+    "Giggly",
+    "Laughing",
+    "Crying",
+    "Frowning",
+    "Torpid",
+    "Lethargic",
+    "Manic",
+    "Patient",
+    "Protective",
+    "Philosophical",
+    "Enquiring",
+    "Debating",
+    "Furious",
+    "Laid-Back",
+    "Easy-Going",
+    "Cromulent",
+    "Excitable",
+    "Tired",
+    "Exhausted",
+    "Ruminating",
+    "Redundant",
+    "Sporty",
+    "Ginger",
+    "Scary",
+    "Posh",
+    "Baby",
+};
+
+static const char * const nouns[] = {
+    "Frad",
+    // Doom
+    "Cacodemon",
+    "Arch-Vile",
+    "Cyberdemon",
+    "Imp",
+    "Demon",
+    "Mancubus",
+    "Arachnotron",
+    "Baron",
+    "Knight",
+    "Revenant",
+    // Hexen
+    "Ettin",
+    "Maulotaur",
+    "Centaur",
+    "Afrit",
+    "Serpent",
+    // Heretic
+    "Disciple",
+    "Gargoyle",
+    "Golem",
+    "Lich",
+    // Strife
+    "Sentinel",
+    "Acolyte",
+    "Templar",
+    "Reaver",
+    "Spectre",
+};
+
+/*
+ * ideally we would export this and the caller would invoke it during
+ * their setup routine. But, the two callers only invoke getRandomPetName
+ * once, so the initialization might as well occur then.
+ */
+static void InitPetName()
+{
+    srand((unsigned int)time(NULL));
+}
+
+char *NET_GetRandomPetName()
+{
+    const char *a, *n;
+
+    InitPetName();
+    a = adjectives[rand() % arrlen(adjectives)];
+    n = nouns[rand() % arrlen(nouns)];
+
+    return M_StringJoin(a, " ", n, NULL);
+}
diff --git a/games/NXDoom/src/net_petname.h b/games/NXDoom/src/net_petname.h
new file mode 100644
index 000000000..292250744
--- /dev/null
+++ b/games/NXDoom/src/net_petname.h
@@ -0,0 +1,18 @@
+//
+// Copyright(C) 2019 Jonathan Dowland
+//
+// 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.
+//
+// DESCRIPTION:
+//     Generate a randomized, private, memorable name for a Player
+//
+
+char *NET_GetRandomPetName();
diff --git a/games/NXDoom/src/net_query.c b/games/NXDoom/src/net_query.c
new file mode 100644
index 000000000..d9c8b2d96
--- /dev/null
+++ b/games/NXDoom/src/net_query.c
@@ -0,0 +1,1006 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Querying servers to find their current status.
+//
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_misc.h"
+
+#include "net_common.h"
+#include "net_defs.h"
+#include "net_io.h"
+#include "net_packet.h"
+#include "net_query.h"
+#include "net_structrw.h"
+#include "net_sdl.h"
+
+// DNS address of the Internet master server.
+
+#define MASTER_SERVER_ADDRESS "master.chocolate-doom.org:2342"
+
+// Time to wait for a response before declaring a timeout.
+
+#define QUERY_TIMEOUT_SECS 2
+
+// Time to wait for secure demo signatures before declaring a timeout.
+
+#define SIGNATURE_TIMEOUT_SECS 5
+
+// Number of query attempts to make before giving up on a server.
+
+#define QUERY_MAX_ATTEMPTS 3
+
+typedef enum
+{
+    QUERY_TARGET_SERVER,       // Normal server target.
+    QUERY_TARGET_MASTER,       // The master server.
+    QUERY_TARGET_BROADCAST     // Send a broadcast query
+} query_target_type_t;
+
+typedef enum
+{
+    QUERY_TARGET_QUEUED,       // Query not yet sent
+    QUERY_TARGET_QUERIED,      // Query sent, waiting response
+    QUERY_TARGET_RESPONDED,    // Response received
+    QUERY_TARGET_NO_RESPONSE
+} query_target_state_t;
+
+typedef struct
+{
+    query_target_type_t type;
+    query_target_state_t state;
+    net_addr_t *addr;
+    net_querydata_t data;
+    unsigned int ping_time;
+    unsigned int query_time;
+    unsigned int query_attempts;
+    boolean printed;
+} query_target_t;
+
+static boolean registered_with_master = false;
+static boolean got_master_response = false;
+
+static net_context_t *query_context;
+static query_target_t *targets;
+static int num_targets;
+
+static boolean query_loop_running = false;
+static boolean printed_header = false;
+static int last_query_time = 0;
+
+static char *securedemo_start_message = NULL;
+
+// Resolve the master server address.
+
+net_addr_t *NET_Query_ResolveMaster(net_context_t *context)
+{
+    net_addr_t *addr;
+
+    addr = NET_ResolveAddress(context, MASTER_SERVER_ADDRESS);
+
+    if (addr == NULL)
+    {
+        fprintf(stderr, "Warning: Failed to resolve address "
+                        "for master server: %s\n", MASTER_SERVER_ADDRESS);
+    }
+
+    return addr;
+}
+
+// Send a registration packet to the master server to register
+// ourselves with the global list.
+
+void NET_Query_AddToMaster(net_addr_t *master_addr)
+{
+    net_packet_t *packet;
+
+    packet = NET_NewPacket(10);
+    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_ADD);
+    NET_SendPacket(master_addr, packet);
+    NET_FreePacket(packet);
+}
+
+// Process a packet received from the master server.
+
+void NET_Query_AddResponse(net_packet_t *packet)
+{
+    unsigned int result;
+
+    if (!NET_ReadInt16(packet, &result))
+    {
+        return;
+    }
+
+    if (result != 0)
+    {
+        // Only show the message once.
+
+        if (!registered_with_master)
+        {
+            printf("Registered with master server at %s\n",
+                   MASTER_SERVER_ADDRESS);
+            registered_with_master = true;
+        }
+    }
+    else
+    {
+        // Always show rejections.
+
+        printf("Failed to register with master server at %s\n",
+               MASTER_SERVER_ADDRESS);
+    }
+
+    got_master_response = true;
+}
+
+boolean NET_Query_CheckAddedToMaster(boolean *result)
+{
+    // Got response from master yet?
+
+    if (!got_master_response)
+    {
+        return false;
+    }
+
+    *result = registered_with_master;
+    return true;
+}
+
+// Send a query to the master server.
+
+static void NET_Query_SendMasterQuery(net_addr_t *addr)
+{
+    net_packet_t *packet;
+
+    packet = NET_NewPacket(4);
+    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_QUERY);
+    NET_SendPacket(addr, packet);
+    NET_FreePacket(packet);
+
+    // We also send a NAT_HOLE_PUNCH_ALL packet so that servers behind
+    // NAT gateways will open themselves up to us.
+    packet = NET_NewPacket(4);
+    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL);
+    NET_SendPacket(addr, packet);
+    NET_FreePacket(packet);
+}
+
+// Send a hole punch request to the master server for the server at the
+// given address.
+void NET_RequestHolePunch(net_context_t *context, net_addr_t *addr)
+{
+    net_addr_t *master_addr;
+    net_packet_t *packet;
+
+    master_addr = NET_Query_ResolveMaster(context);
+    if (master_addr == NULL)
+    {
+        return;
+    }
+
+    packet = NET_NewPacket(32);
+    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH);
+    NET_WriteString(packet, NET_AddrToString(addr));
+    NET_SendPacket(master_addr, packet);
+
+    NET_FreePacket(packet);
+    NET_ReleaseAddress(master_addr);
+}
+
+// Given the specified address, find the target associated.  If no
+// target is found, and 'create' is true, a new target is created.
+
+static query_target_t *GetTargetForAddr(net_addr_t *addr, boolean create)
+{
+    query_target_t *target;
+    int i;
+
+    for (i=0; i<num_targets; ++i)
+    {
+        if (targets[i].addr == addr)
+        {
+            return &targets[i];
+        }
+    }
+
+    if (!create)
+    {
+        return NULL;
+    }
+
+    targets = I_Realloc(targets, sizeof(query_target_t) * (num_targets + 1));
+
+    target = &targets[num_targets];
+    target->type = QUERY_TARGET_SERVER;
+    target->state = QUERY_TARGET_QUEUED;
+    target->printed = false;
+    target->query_attempts = 0;
+    target->addr = addr;
+    NET_ReferenceAddress(addr);
+    ++num_targets;
+
+    return target;
+}
+
+static void FreeTargets(void)
+{
+    int i;
+
+    for (i = 0; i < num_targets; ++i)
+    {
+        NET_ReleaseAddress(targets[i].addr);
+    }
+    free(targets);
+    targets = NULL;
+    num_targets = 0;
+}
+
+// Transmit a query packet
+
+static void NET_Query_SendQuery(net_addr_t *addr)
+{
+    net_packet_t *request;
+
+    request = NET_NewPacket(10);
+    NET_WriteInt16(request, NET_PACKET_TYPE_QUERY);
+
+    if (addr == NULL)
+    {
+        NET_SendBroadcast(query_context, request);
+    }
+    else
+    {
+        NET_SendPacket(addr, request);
+    }
+
+    NET_FreePacket(request);
+}
+
+static void NET_Query_ParseResponse(net_addr_t *addr, net_packet_t *packet,
+                                    net_query_callback_t callback,
+                                    void *user_data)
+{
+    unsigned int packet_type;
+    net_querydata_t querydata;
+    query_target_t *target;
+
+    // Read the header
+
+    if (!NET_ReadInt16(packet, &packet_type)
+     || packet_type != NET_PACKET_TYPE_QUERY_RESPONSE)
+    {
+        return;
+    }
+
+    // Read query data
+
+    if (!NET_ReadQueryData(packet, &querydata))
+    {
+        return;
+    }
+
+    // Find the target that responded.
+
+    target = GetTargetForAddr(addr, false);
+
+    // If the target is not found, it may be because we are doing
+    // a LAN broadcast search, in which case we need to create a
+    // target for the new responder.
+
+    if (target == NULL)
+    {
+        query_target_t *broadcast_target;
+
+        broadcast_target = GetTargetForAddr(NULL, false);
+
+        // Not in broadcast mode, unexpected response that came out
+        // of nowhere. Ignore.
+
+        if (broadcast_target == NULL
+         || broadcast_target->state != QUERY_TARGET_QUERIED)
+        {
+            return;
+        }
+
+        // Create new target.
+
+        target = GetTargetForAddr(addr, true);
+        broadcast_target = GetTargetForAddr(NULL, false);
+        target->state = QUERY_TARGET_QUERIED;
+        target->query_time = broadcast_target->query_time;
+    }
+
+    if (target->state != QUERY_TARGET_RESPONDED)
+    {
+        target->state = QUERY_TARGET_RESPONDED;
+        memcpy(&target->data, &querydata, sizeof(net_querydata_t));
+
+        // Calculate RTT.
+
+        target->ping_time = I_GetTimeMS() - target->query_time;
+
+        // Invoke callback to signal that we have a new address.
+
+        callback(addr, &target->data, target->ping_time, user_data);
+    }
+}
+
+// Parse a response packet from the master server.
+
+static void NET_Query_ParseMasterResponse(net_addr_t *master_addr,
+                                          net_packet_t *packet)
+{
+    unsigned int packet_type;
+    query_target_t *target;
+    char *addr_str;
+    net_addr_t *addr;
+
+    // Read the header.  We are only interested in query responses.
+
+    if (!NET_ReadInt16(packet, &packet_type)
+     || packet_type != NET_MASTER_PACKET_TYPE_QUERY_RESPONSE)
+    {
+        return;
+    }
+
+    // Read a list of strings containing the addresses of servers
+    // that the master knows about.
+
+    for (;;)
+    {
+        addr_str = NET_ReadString(packet);
+
+        if (addr_str == NULL)
+        {
+            break;
+        }
+
+        // Resolve address and add to targets list if it is not already
+        // there.
+
+        addr = NET_ResolveAddress(query_context, addr_str);
+        if (addr != NULL)
+        {
+            GetTargetForAddr(addr, true);
+            NET_ReleaseAddress(addr);
+        }
+    }
+
+    // Mark the master as having responded.
+
+    target = GetTargetForAddr(master_addr, true);
+    target->state = QUERY_TARGET_RESPONDED;
+}
+
+static void NET_Query_ParsePacket(net_addr_t *addr, net_packet_t *packet,
+                                  net_query_callback_t callback,
+                                  void *user_data)
+{
+    query_target_t *target;
+
+    // This might be the master server responding.
+
+    target = GetTargetForAddr(addr, false);
+
+    if (target != NULL && target->type == QUERY_TARGET_MASTER)
+    {
+        NET_Query_ParseMasterResponse(addr, packet);
+    }
+    else
+    {
+        NET_Query_ParseResponse(addr, packet, callback, user_data);
+    }
+}
+
+static void NET_Query_GetResponse(net_query_callback_t callback,
+                                  void *user_data)
+{
+    net_addr_t *addr;
+    net_packet_t *packet;
+
+    if (NET_RecvPacket(query_context, &addr, &packet))
+    {
+        NET_Query_ParsePacket(addr, packet, callback, user_data);
+        NET_ReleaseAddress(addr);
+        NET_FreePacket(packet);
+    }
+}
+
+// Find a target we have not yet queried and send a query.
+
+static void SendOneQuery(void)
+{
+    unsigned int now;
+    unsigned int i;
+
+    now = I_GetTimeMS();
+
+    // Rate limit - only send one query every 50ms.
+
+    if (now - last_query_time < 50)
+    {
+        return;
+    }
+
+    for (i = 0; i < num_targets; ++i)
+    {
+        // Not queried yet?
+        // Or last query timed out without a response?
+
+        if (targets[i].state == QUERY_TARGET_QUEUED
+         || (targets[i].state == QUERY_TARGET_QUERIED
+             && now - targets[i].query_time > QUERY_TIMEOUT_SECS * 1000))
+        {
+            break;
+        }
+    }
+
+    if (i >= num_targets)
+    {
+        return;
+    }
+
+    // Found a target to query.  Send a query; how to do this depends on
+    // the target type.
+
+    switch (targets[i].type)
+    {
+        case QUERY_TARGET_SERVER:
+            NET_Query_SendQuery(targets[i].addr);
+            break;
+
+        case QUERY_TARGET_BROADCAST:
+            NET_Query_SendQuery(NULL);
+            break;
+
+        case QUERY_TARGET_MASTER:
+            NET_Query_SendMasterQuery(targets[i].addr);
+            break;
+    }
+
+    //printf("Queried %s\n", NET_AddrToString(targets[i].addr));
+    targets[i].state = QUERY_TARGET_QUERIED;
+    targets[i].query_time = now;
+    ++targets[i].query_attempts;
+
+    last_query_time = now;
+}
+
+// Time out servers that have been queried and not responded.
+
+static void CheckTargetTimeouts(void)
+{
+    unsigned int i;
+    unsigned int now;
+
+    now = I_GetTimeMS();
+
+    for (i = 0; i < num_targets; ++i)
+    {
+        /*
+        printf("target %i: state %i, queries %i, query time %i\n",
+               i, targets[i].state, targets[i].query_attempts,
+               now - targets[i].query_time);
+        */
+
+        // We declare a target to be "no response" when we've sent
+        // multiple query packets to it (QUERY_MAX_ATTEMPTS) and
+        // received no response to any of them.
+
+        if (targets[i].state == QUERY_TARGET_QUERIED
+         && targets[i].query_attempts >= QUERY_MAX_ATTEMPTS
+         && now - targets[i].query_time > QUERY_TIMEOUT_SECS * 1000)
+        {
+            targets[i].state = QUERY_TARGET_NO_RESPONSE;
+
+            if (targets[i].type == QUERY_TARGET_MASTER)
+            {
+                fprintf(stderr, "NET_MasterQuery: no response "
+                                "from master server.\n");
+            }
+        }
+    }
+}
+
+// If all targets have responded or timed out, returns true.
+
+static boolean AllTargetsDone(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < num_targets; ++i)
+    {
+        if (targets[i].state != QUERY_TARGET_RESPONDED
+         && targets[i].state != QUERY_TARGET_NO_RESPONSE)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// Polling function, invoked periodically to send queries and
+// interpret new responses received from remote servers.
+// Returns zero when the query sequence has completed and all targets
+// have returned responses or timed out.
+
+int NET_Query_Poll(net_query_callback_t callback, void *user_data)
+{
+    CheckTargetTimeouts();
+
+    // Send a query.  This will only send a single query at once.
+
+    SendOneQuery();
+
+    // Check for a response
+
+    NET_Query_GetResponse(callback, user_data);
+
+    return !AllTargetsDone();
+}
+
+// Stop the query loop
+
+static void NET_Query_ExitLoop(void)
+{
+    query_loop_running = false;
+}
+
+// Loop waiting for responses.
+// The specified callback is invoked when a new server responds.
+
+static void NET_Query_QueryLoop(net_query_callback_t callback, void *user_data)
+{
+    query_loop_running = true;
+
+    while (query_loop_running && NET_Query_Poll(callback, user_data))
+    {
+        // Don't thrash the CPU
+
+        I_Sleep(1);
+    }
+}
+
+void NET_Query_Init(void)
+{
+    if (query_context == NULL)
+    {
+        query_context = NET_NewContext();
+        NET_AddModule(query_context, &net_sdl_module);
+        net_sdl_module.InitClient();
+    }
+
+    free(targets);
+    targets = NULL;
+    num_targets = 0;
+
+    printed_header = false;
+}
+
+// Callback that exits the query loop when the first server is found.
+
+static void NET_Query_ExitCallback(net_addr_t *addr, net_querydata_t *data,
+                                   unsigned int ping_time, void *user_data)
+{
+    NET_Query_ExitLoop();
+}
+
+// Search the targets list and find a target that has responded.
+// If none have responded, returns NULL.
+
+static query_target_t *FindFirstResponder(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < num_targets; ++i)
+    {
+        if (targets[i].type == QUERY_TARGET_SERVER
+         && targets[i].state == QUERY_TARGET_RESPONDED)
+        {
+            return &targets[i];
+        }
+    }
+
+    return NULL;
+}
+
+// Return a count of the number of responses.
+
+static int GetNumResponses(void)
+{
+    unsigned int i;
+    int result;
+
+    result = 0;
+
+    for (i = 0; i < num_targets; ++i)
+    {
+        if (targets[i].type == QUERY_TARGET_SERVER
+         && targets[i].state == QUERY_TARGET_RESPONDED)
+        {
+            ++result;
+        }
+    }
+
+    return result;
+}
+
+int NET_StartLANQuery(void)
+{
+    query_target_t *target;
+
+    NET_Query_Init();
+
+    // Add a broadcast target to the list.
+
+    target = GetTargetForAddr(NULL, true);
+    target->type = QUERY_TARGET_BROADCAST;
+
+    return 1;
+}
+
+int NET_StartMasterQuery(void)
+{
+    net_addr_t *master;
+    query_target_t *target;
+
+    NET_Query_Init();
+
+    // Resolve master address and add to targets list.
+
+    master = NET_Query_ResolveMaster(query_context);
+
+    if (master == NULL)
+    {
+        return 0;
+    }
+
+    target = GetTargetForAddr(master, true);
+    target->type = QUERY_TARGET_MASTER;
+    NET_ReleaseAddress(master);
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------
+
+static void formatted_printf(int wide, const char *s, ...) PRINTF_ATTR(2, 3);
+static void formatted_printf(int wide, const char *s, ...)
+{
+    va_list args;
+    int i;
+
+    va_start(args, s);
+    i = vprintf(s, args);
+    va_end(args);
+
+    while (i < wide)
+    {
+        putchar(' ');
+        ++i;
+    }
+}
+
+static const char *GameDescription(GameMode_t mode, GameMission_t mission)
+{
+    switch (mission)
+    {
+        case doom:
+            if (mode == shareware)
+                return "swdoom";
+            else if (mode == registered)
+                return "regdoom";
+            else if (mode == retail)
+                return "ultdoom";
+            else
+                return "doom";
+        case doom2:
+            return "doom2";
+        case pack_tnt:
+            return "tnt";
+        case pack_plut:
+            return "plutonia";
+        case pack_chex:
+            return "chex";
+        case pack_hacx:
+            return "hacx";
+        case heretic:
+            return "heretic";
+        case hexen:
+            return "hexen";
+        case strife:
+            return "strife";
+        default:
+            return "?";
+    }
+}
+
+static void PrintHeader(void)
+{
+    int i;
+
+    putchar('\n');
+    formatted_printf(5, "Ping");
+    formatted_printf(18, "Address");
+    formatted_printf(8, "Players");
+    puts("Description");
+
+    for (i=0; i<70; ++i)
+        putchar('=');
+    putchar('\n');
+}
+
+// Callback function that just prints information in a table.
+
+static void NET_QueryPrintCallback(net_addr_t *addr,
+                                   net_querydata_t *data,
+                                   unsigned int ping_time,
+                                   void *user_data)
+{
+    // If this is the first server, print the header.
+
+    if (!printed_header)
+    {
+        PrintHeader();
+        printed_header = true;
+    }
+
+    formatted_printf(5, "%4i", ping_time);
+    formatted_printf(22, "%s", NET_AddrToString(addr));
+    formatted_printf(4, "%i/%i ", data->num_players,
+                                  data->max_players);
+
+    if (data->gamemode != indetermined)
+    {
+        printf("(%s) ", GameDescription(data->gamemode, 
+                                        data->gamemission));
+    }
+
+    if (data->server_state)
+    {
+        printf("(game running) ");
+    }
+
+    printf("%s\n", data->description);
+}
+
+void NET_LANQuery(void)
+{
+    if (NET_StartLANQuery())
+    {
+        printf("\nSearching for servers on local LAN ...\n");
+
+        NET_Query_QueryLoop(NET_QueryPrintCallback, NULL);
+
+        printf("\n%i server(s) found.\n", GetNumResponses());
+        FreeTargets();
+    }
+}
+
+void NET_MasterQuery(void)
+{
+    if (NET_StartMasterQuery())
+    {
+        printf("\nSearching for servers on Internet ...\n");
+
+        NET_Query_QueryLoop(NET_QueryPrintCallback, NULL);
+
+        printf("\n%i server(s) found.\n", GetNumResponses());
+        FreeTargets();
+    }
+}
+
+void NET_QueryAddress(const char *addr_str)
+{
+    net_addr_t *addr;
+    query_target_t *target;
+
+    NET_Query_Init();
+
+    addr = NET_ResolveAddress(query_context, addr_str);
+
+    if (addr == NULL)
+    {
+        I_Error("NET_QueryAddress: Host '%s' not found!", addr_str);
+    }
+
+    // Add the address to the list of targets.
+
+    target = GetTargetForAddr(addr, true);
+
+    printf("\nQuerying '%s'...\n", addr_str);
+
+    // Run query loop.
+
+    NET_Query_QueryLoop(NET_Query_ExitCallback, NULL);
+
+    // Check if the target responded.
+
+    if (target->state == QUERY_TARGET_RESPONDED)
+    {
+        NET_QueryPrintCallback(addr, &target->data, target->ping_time, NULL);
+        NET_ReleaseAddress(addr);
+        FreeTargets();
+    }
+    else
+    {
+        I_Error("No response from '%s'", addr_str);
+    }
+}
+
+net_addr_t *NET_FindLANServer(void)
+{
+    query_target_t *target;
+    query_target_t *responder;
+    net_addr_t *result;
+
+    NET_Query_Init();
+
+    // Add a broadcast target to the list.
+
+    target = GetTargetForAddr(NULL, true);
+    target->type = QUERY_TARGET_BROADCAST;
+
+    // Run the query loop, and stop at the first target found.
+
+    NET_Query_QueryLoop(NET_Query_ExitCallback, NULL);
+
+    responder = FindFirstResponder();
+
+    if (responder != NULL)
+    {
+        result = responder->addr;
+        NET_ReferenceAddress(result);
+    }
+    else
+    {
+        result = NULL;
+    }
+
+    FreeTargets();
+    return result;
+}
+
+// Block until a packet of the given type is received from the given
+// address.
+
+static net_packet_t *BlockForPacket(net_addr_t *addr, unsigned int packet_type,
+                                    unsigned int timeout_ms)
+{
+    net_packet_t *packet;
+    net_addr_t *packet_src;
+    unsigned int read_packet_type;
+    unsigned int start_time;
+
+    start_time = I_GetTimeMS();
+
+    while (I_GetTimeMS() < start_time + timeout_ms)
+    {
+        if (!NET_RecvPacket(query_context, &packet_src, &packet))
+        {
+            I_Sleep(20);
+            continue;
+        }
+
+        // Caller doesn't need additional reference.
+        NET_ReleaseAddress(packet_src);
+
+        if (packet_src == addr
+         && NET_ReadInt16(packet, &read_packet_type)
+         && packet_type == read_packet_type)
+        {
+            return packet;
+        }
+
+        NET_FreePacket(packet);
+    }
+
+    // Timeout - no response.
+
+    return NULL;
+}
+
+// Query master server for secure demo start seed value.
+
+boolean NET_StartSecureDemo(prng_seed_t seed)
+{
+    net_packet_t *request, *response;
+    net_addr_t *master_addr;
+    char *signature;
+    boolean result;
+
+    NET_Query_Init();
+    master_addr = NET_Query_ResolveMaster(query_context);
+
+    // Send request packet to master server.
+
+    request = NET_NewPacket(10);
+    NET_WriteInt16(request, NET_MASTER_PACKET_TYPE_SIGN_START);
+    NET_SendPacket(master_addr, request);
+    NET_FreePacket(request);
+
+    // Block for response and read contents.
+    // The signed start message will be saved for later.
+
+    response = BlockForPacket(master_addr,
+                              NET_MASTER_PACKET_TYPE_SIGN_START_RESPONSE,
+                              SIGNATURE_TIMEOUT_SECS * 1000);
+
+    result = false;
+
+    if (response != NULL)
+    {
+        if (NET_ReadPRNGSeed(response, seed))
+        {
+            signature = NET_ReadString(response);
+
+            if (signature != NULL)
+            {
+                securedemo_start_message = M_StringDuplicate(signature);
+                result = true;
+            }
+        }
+
+        NET_FreePacket(response);
+    }
+
+    return result;
+}
+
+// Query master server for secure demo end signature.
+
+char *NET_EndSecureDemo(sha1_digest_t demo_hash)
+{
+    net_packet_t *request, *response;
+    net_addr_t *master_addr;
+    char *signature;
+
+    master_addr = NET_Query_ResolveMaster(query_context);
+
+    // Construct end request and send to master server.
+
+    request = NET_NewPacket(10);
+    NET_WriteInt16(request, NET_MASTER_PACKET_TYPE_SIGN_END);
+    NET_WriteSHA1Sum(request, demo_hash);
+    NET_WriteString(request, securedemo_start_message);
+    NET_SendPacket(master_addr, request);
+    NET_FreePacket(request);
+
+    // Block for response. The response packet simply contains a string
+    // with the ASCII signature.
+
+    response = BlockForPacket(master_addr,
+                              NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE,
+                              SIGNATURE_TIMEOUT_SECS * 1000);
+
+    if (response == NULL)
+    {
+        return NULL;
+    }
+
+    signature = NET_ReadString(response);
+
+    NET_FreePacket(response);
+
+    return signature;
+}
+
diff --git a/games/NXDoom/src/net_query.h b/games/NXDoom/src/net_query.h
new file mode 100644
index 000000000..e0c9e9bef
--- /dev/null
+++ b/games/NXDoom/src/net_query.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Querying servers to find their current status.
+//
+
+#ifndef NET_QUERY_H
+#define NET_QUERY_H
+
+#include "net_defs.h"
+
+typedef void (*net_query_callback_t)(net_addr_t *addr,
+                                     net_querydata_t *querydata,
+                                     unsigned int ping_time,
+                                     void *user_data);
+
+extern int NET_StartLANQuery(void);
+extern int NET_StartMasterQuery(void);
+
+extern void NET_LANQuery(void);
+extern void NET_MasterQuery(void);
+extern void NET_QueryAddress(const char *addr);
+extern net_addr_t *NET_FindLANServer(void);
+
+extern int NET_Query_Poll(net_query_callback_t callback, void *user_data);
+
+extern net_addr_t *NET_Query_ResolveMaster(net_context_t *context);
+extern void NET_Query_AddToMaster(net_addr_t *master_addr);
+extern boolean NET_Query_CheckAddedToMaster(boolean *result);
+extern void NET_Query_AddResponse(net_packet_t *packet);
+extern void NET_RequestHolePunch(net_context_t *context, net_addr_t *addr);
+
+#endif /* #ifndef NET_QUERY_H */
+
diff --git a/games/NXDoom/src/net_sdl.c b/games/NXDoom/src/net_sdl.c
new file mode 100644
index 000000000..2965f4234
--- /dev/null
+++ b/games/NXDoom/src/net_sdl.c
@@ -0,0 +1,441 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Networking module which uses SDL_net
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "net_defs.h"
+#include "net_io.h"
+#include "net_packet.h"
+#include "net_sdl.h"
+#include "z_zone.h"
+
+//
+// NETWORKING
+//
+
+
+#ifndef DISABLE_SDL2NET
+
+
+#include <SDL_net.h>
+
+#define DEFAULT_PORT 2342
+
+static boolean initted = false;
+static int port = DEFAULT_PORT;
+static UDPsocket udpsocket;
+static UDPpacket *recvpacket;
+
+typedef struct
+{
+    net_addr_t net_addr;
+    IPaddress sdl_addr;
+} addrpair_t;
+
+static addrpair_t **addr_table;
+static int addr_table_size = -1;
+
+// Initializes the address table
+
+static void NET_SDL_InitAddrTable(void)
+{
+    addr_table_size = 16;
+
+    addr_table = Z_Malloc(sizeof(addrpair_t *) * addr_table_size,
+                          PU_STATIC, 0);
+    memset(addr_table, 0, sizeof(addrpair_t *) * addr_table_size);
+}
+
+static boolean AddressesEqual(IPaddress *a, IPaddress *b)
+{
+    return a->host == b->host
+        && a->port == b->port;
+}
+
+// Finds an address by searching the table.  If the address is not found,
+// it is added to the table.
+
+static net_addr_t *NET_SDL_FindAddress(IPaddress *addr)
+{
+    addrpair_t *new_entry;
+    int empty_entry = -1;
+    int i;
+
+    if (addr_table_size < 0)
+    {
+        NET_SDL_InitAddrTable();
+    }
+
+    for (i=0; i<addr_table_size; ++i)
+    {
+        if (addr_table[i] != NULL
+         && AddressesEqual(addr, &addr_table[i]->sdl_addr))
+        {
+            return &addr_table[i]->net_addr;
+        }
+
+        if (empty_entry < 0 && addr_table[i] == NULL)
+            empty_entry = i;
+    }
+
+    // Was not found in list.  We need to add it.
+
+    // Is there any space in the table? If not, increase the table size
+
+    if (empty_entry < 0)
+    {
+        addrpair_t **new_addr_table;
+        int new_addr_table_size;
+
+        // after reallocing, we will add this in as the first entry
+        // in the new block of memory
+
+        empty_entry = addr_table_size;
+        
+        // allocate a new array twice the size, init to 0 and copy 
+        // the existing table in.  replace the old table.
+
+        new_addr_table_size = addr_table_size * 2;
+        new_addr_table = Z_Malloc(sizeof(addrpair_t *) * new_addr_table_size,
+                                  PU_STATIC, 0);
+        memset(new_addr_table, 0, sizeof(addrpair_t *) * new_addr_table_size);
+        memcpy(new_addr_table, addr_table, 
+               sizeof(addrpair_t *) * addr_table_size);
+        Z_Free(addr_table);
+        addr_table = new_addr_table;
+        addr_table_size = new_addr_table_size;
+    }
+
+    // Add a new entry
+    
+    new_entry = Z_Malloc(sizeof(addrpair_t), PU_STATIC, 0);
+
+    new_entry->sdl_addr = *addr;
+    new_entry->net_addr.refcount = 0;
+    new_entry->net_addr.handle = &new_entry->sdl_addr;
+    new_entry->net_addr.module = &net_sdl_module;
+
+    addr_table[empty_entry] = new_entry;
+
+    return &new_entry->net_addr;
+}
+
+static void NET_SDL_FreeAddress(net_addr_t *addr)
+{
+    int i;
+    
+    for (i=0; i<addr_table_size; ++i)
+    {
+        if (addr == &addr_table[i]->net_addr)
+        {
+            Z_Free(addr_table[i]);
+            addr_table[i] = NULL;
+            return;
+        }
+    }
+
+    I_Error("NET_SDL_FreeAddress: Attempted to remove an unused address!");
+}
+
+static boolean NET_SDL_InitClient(void)
+{
+    int p;
+
+    if (initted)
+        return true;
+
+    //!
+    // @category net
+    // @arg <n>
+    //
+    // Use the specified UDP port for communications, instead of 
+    // the default (2342).
+    //
+
+    p = M_CheckParmWithArgs("-port", 1);
+    if (p > 0)
+        port = atoi(myargv[p+1]);
+
+    SDLNet_Init();
+
+    udpsocket = SDLNet_UDP_Open(0);
+
+    if (udpsocket == NULL)
+    {
+        I_Error("NET_SDL_InitClient: Unable to open a socket!");
+    }
+    
+    recvpacket = SDLNet_AllocPacket(1500);
+
+#ifdef DROP_PACKETS
+    srand(time(NULL));
+#endif
+
+    initted = true;
+
+    return true;
+}
+
+static boolean NET_SDL_InitServer(void)
+{
+    int p;
+
+    if (initted)
+        return true;
+
+    p = M_CheckParmWithArgs("-port", 1);
+    if (p > 0)
+        port = atoi(myargv[p+1]);
+
+    SDLNet_Init();
+
+    udpsocket = SDLNet_UDP_Open(port);
+
+    if (udpsocket == NULL)
+    {
+        I_Error("NET_SDL_InitServer: Unable to bind to port %i", port);
+    }
+
+    recvpacket = SDLNet_AllocPacket(1500);
+#ifdef DROP_PACKETS
+    srand(time(NULL));
+#endif
+
+    initted = true;
+
+    return true;
+}
+
+static void NET_SDL_SendPacket(net_addr_t *addr, net_packet_t *packet)
+{
+    UDPpacket sdl_packet;
+    IPaddress ip;
+   
+    if (addr == &net_broadcast_addr)
+    {
+        SDLNet_ResolveHost(&ip, NULL, port);
+        ip.host = INADDR_BROADCAST;
+    }
+    else
+    {
+        ip = *((IPaddress *) addr->handle);
+    }
+
+#if 0
+    {
+        static int this_second_sent = 0;
+        static int lasttime;
+
+        this_second_sent += packet->len + 64;
+
+        if (I_GetTime() - lasttime > TICRATE)
+        {
+            printf("%i bytes sent in the last second\n", this_second_sent);
+            lasttime = I_GetTime();
+            this_second_sent = 0;
+        }
+    }
+#endif
+
+#ifdef DROP_PACKETS
+    if ((rand() % 4) == 0)
+        return;
+#endif
+
+    sdl_packet.channel = 0;
+    sdl_packet.data = packet->data;
+    sdl_packet.len = packet->len;
+    sdl_packet.address = ip;
+
+    if (!SDLNet_UDP_Send(udpsocket, -1, &sdl_packet))
+    {
+        I_Error("NET_SDL_SendPacket: Error transmitting packet: %s",
+                SDLNet_GetError());
+    }
+}
+
+static boolean NET_SDL_RecvPacket(net_addr_t **addr, net_packet_t **packet)
+{
+    int result;
+
+    result = SDLNet_UDP_Recv(udpsocket, recvpacket);
+
+    if (result < 0)
+    {
+        I_Error("NET_SDL_RecvPacket: Error receiving packet: %s",
+                SDLNet_GetError());
+    }
+
+    // no packets received
+
+    if (result == 0)
+        return false;
+
+    // Put the data into a new packet structure
+
+    *packet = NET_NewPacket(recvpacket->len);
+    memcpy((*packet)->data, recvpacket->data, recvpacket->len);
+    (*packet)->len = recvpacket->len;
+
+    // Address
+
+    *addr = NET_SDL_FindAddress(&recvpacket->address);
+
+    return true;
+}
+
+void NET_SDL_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
+{
+    IPaddress *ip;
+    uint32_t host;
+    uint16_t port;
+
+    ip = (IPaddress *) addr->handle;
+    host = SDLNet_Read32(&ip->host);
+    port = SDLNet_Read16(&ip->port);
+
+    M_snprintf(buffer, buffer_len, "%i.%i.%i.%i",
+               (host >> 24) & 0xff, (host >> 16) & 0xff,
+               (host >> 8) & 0xff, host & 0xff);
+
+    // If we are using the default port we just need to show the IP address,
+    // but otherwise we need to include the port. This is important because
+    // we use the string representation in the setup tool to provided an
+    // address to connect to.
+    if (port != DEFAULT_PORT)
+    {
+        char portbuf[10];
+        M_snprintf(portbuf, sizeof(portbuf), ":%i", port);
+        M_StringConcat(buffer, portbuf, buffer_len);
+    }
+}
+
+net_addr_t *NET_SDL_ResolveAddress(const char *address)
+{
+    IPaddress ip;
+    char *addr_hostname;
+    int addr_port;
+    int result;
+    char *colon;
+
+    colon = strchr(address, ':');
+
+    addr_hostname = M_StringDuplicate(address);
+    if (colon != NULL)
+    {
+	addr_hostname[colon - address] = '\0';
+	addr_port = atoi(colon + 1);
+    }
+    else
+    {
+	addr_port = port;
+    }
+    
+    result = SDLNet_ResolveHost(&ip, addr_hostname, addr_port);
+
+    free(addr_hostname);
+
+    if (result)
+    {
+        // unable to resolve
+
+        return NULL;
+    }
+    else
+    {
+        return NET_SDL_FindAddress(&ip);
+    }
+}
+
+// Complete module
+
+net_module_t net_sdl_module =
+{
+    NET_SDL_InitClient,
+    NET_SDL_InitServer,
+    NET_SDL_SendPacket,
+    NET_SDL_RecvPacket,
+    NET_SDL_AddrToString,
+    NET_SDL_FreeAddress,
+    NET_SDL_ResolveAddress,
+};
+
+
+#else // DISABLE_SDL2NET
+
+// no-op implementation
+
+
+static boolean NET_NULL_InitClient(void)
+{
+    return false;
+}
+
+
+static boolean NET_NULL_InitServer(void)
+{
+    return false;
+}
+
+
+static void NET_NULL_SendPacket(net_addr_t *addr, net_packet_t *packet)
+{
+}
+
+
+static boolean NET_NULL_RecvPacket(net_addr_t **addr, net_packet_t **packet)
+{
+    return false;
+}
+
+
+static void NET_NULL_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
+{
+
+}
+
+
+static void NET_NULL_FreeAddress(net_addr_t *addr)
+{
+}
+
+
+net_addr_t *NET_NULL_ResolveAddress(const char *address)
+{
+    return NULL;
+}
+
+
+net_module_t net_sdl_module =
+{
+    NET_NULL_InitClient,
+    NET_NULL_InitServer,
+    NET_NULL_SendPacket,
+    NET_NULL_RecvPacket,
+    NET_NULL_AddrToString,
+    NET_NULL_FreeAddress,
+    NET_NULL_ResolveAddress,
+};
+
+
+#endif // DISABLE_SDL2NET
diff --git a/games/NXDoom/src/net_sdl.h b/games/NXDoom/src/net_sdl.h
new file mode 100644
index 000000000..c249de1c4
--- /dev/null
+++ b/games/NXDoom/src/net_sdl.h
@@ -0,0 +1,26 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Networking module which uses SDL_net
+//
+
+#ifndef NET_SDL_H
+#define NET_SDL_H
+
+#include "net_defs.h"
+
+extern net_module_t net_sdl_module;
+
+#endif /* #ifndef NET_SDL_H */
+
diff --git a/games/NXDoom/src/net_server.c b/games/NXDoom/src/net_server.c
new file mode 100644
index 000000000..9374b64ec
--- /dev/null
+++ b/games/NXDoom/src/net_server.c
@@ -0,0 +1,2097 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Network server code
+//
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+
+#include "doomtype.h"
+#include "d_mode.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "m_argv.h"
+#include "m_misc.h"
+
+#include "net_client.h"
+#include "net_common.h"
+#include "net_defs.h"
+#include "net_io.h"
+#include "net_loop.h"
+#include "net_packet.h"
+#include "net_query.h"
+#include "net_server.h"
+#include "net_sdl.h"
+#include "net_structrw.h"
+
+// How often to refresh our registration with the master server.
+#define MASTER_REFRESH_PERIOD 30  /* twice per minute */
+
+// How often to re-resolve the address of the master server?
+#define MASTER_RESOLVE_PERIOD 8 * 60 * 60 /* 8 hours */
+
+typedef enum
+{
+    // waiting for the game to be "launched" (key player to press the start
+    // button)
+
+    SERVER_WAITING_LAUNCH,
+
+    // game has been launched, we are waiting for all players to be ready
+    // so the game can start.
+
+    SERVER_WAITING_START,
+
+    // in a game
+
+    SERVER_IN_GAME,
+} net_server_state_t;
+
+typedef struct
+{
+    boolean active;
+    int player_number;
+    net_addr_t *addr;
+    net_connection_t connection;
+    int last_send_time;
+    char *name;
+
+    // If true, the client has sent the NET_PACKET_TYPE_GAMESTART
+    // message indicating that it is ready for the game to start.
+
+    boolean ready;
+
+    // Time that this client connected to the server.
+    // This is used to determine the controller (oldest client).
+
+    unsigned int connect_time;
+
+    // Last time new gamedata was received from this client
+
+    int last_gamedata_time;
+
+    // recording a demo without -longtics
+
+    boolean recording_lowres;
+
+    // send queue: items to send to the client
+    // this is a circular buffer
+
+    int sendseq;
+    net_full_ticcmd_t sendqueue[BACKUPTICS];
+
+    // Latest acknowledged by the client
+
+    unsigned int acknowledged;
+
+    // Value of max_players specified by the client on connect.
+
+    int max_players;
+
+    // Observer: receives data but does not participate in the game.
+
+    boolean drone;
+
+    // SHA1 hash sums of the client's WAD directory and dehacked data
+
+    sha1_digest_t wad_sha1sum;
+    sha1_digest_t deh_sha1sum;
+
+    // Is this client is playing with the Freedoom IWAD?
+
+    unsigned int is_freedoom;
+
+    // Player class (for Hexen)
+
+    int player_class;
+
+} net_client_t;
+
+// structure used for the recv window
+
+typedef struct 
+{
+    // Whether this tic has been received yet
+
+    boolean active;
+
+    // Latency value received from the client
+
+    signed int latency;
+
+    // Last time we sent a resend request for this tic
+
+    unsigned int resend_time;
+
+    // Tic data itself
+
+    net_ticdiff_t diff;
+} net_client_recv_t;
+
+static net_server_state_t server_state;
+static boolean server_initialized = false;
+static net_client_t clients[MAXNETNODES];
+static net_client_t *sv_players[NET_MAXPLAYERS];
+static net_context_t *server_context;
+static unsigned int sv_gamemode;
+static unsigned int sv_gamemission;
+static net_gamesettings_t sv_settings;
+
+// For registration with master server:
+
+static net_addr_t *master_server = NULL;
+static unsigned int master_refresh_time;
+static unsigned int master_resolve_time;
+
+// receive window
+
+static unsigned int recvwindow_start;
+static net_client_recv_t recvwindow[BACKUPTICS][NET_MAXPLAYERS];
+
+#define NET_SV_ExpandTicNum(b) NET_ExpandTicNum(recvwindow_start, (b))
+
+static void NET_SV_DisconnectClient(net_client_t *client)
+{
+    if (client->active)
+    {
+        NET_Conn_Disconnect(&client->connection);
+    }
+}
+
+static boolean ClientConnected(net_client_t *client)
+{
+    // Check that the client is properly connected: ie. not in the 
+    // process of connecting or disconnecting
+
+    return client->active 
+        && client->connection.state == NET_CONN_STATE_CONNECTED;
+}
+
+// Send a message to be displayed on a client's console
+
+static void NET_SV_SendConsoleMessage(net_client_t *client, const char *s, ...) PRINTF_ATTR(2, 3);
+static void NET_SV_SendConsoleMessage(net_client_t *client, const char *s, ...)
+{
+    char buf[1024];
+    va_list args;
+    net_packet_t *packet;
+
+    va_start(args, s);
+    M_vsnprintf(buf, sizeof(buf), s, args);
+    va_end(args);
+    
+    packet = NET_Conn_NewReliable(&client->connection, 
+                                  NET_PACKET_TYPE_CONSOLE_MESSAGE);
+
+    NET_WriteString(packet, buf);
+}
+
+// Send a message to all clients
+
+static void NET_SV_BroadcastMessage(const char *s, ...) PRINTF_ATTR(1, 2);
+static void NET_SV_BroadcastMessage(const char *s, ...)
+{
+    char buf[1024];
+    va_list args;
+    int i;
+
+    va_start(args, s);
+    M_vsnprintf(buf, sizeof(buf), s, args);
+    va_end(args);
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]))
+        {
+            NET_SV_SendConsoleMessage(&clients[i], "%s", buf);
+        }
+    }
+
+    printf("%s\n", buf);
+}
+
+
+// Assign player numbers to connected clients
+
+static void NET_SV_AssignPlayers(void)
+{
+    int i;
+    int pl;
+
+    pl = 0;
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]))
+        {
+            if (!clients[i].drone)
+            {
+                sv_players[pl] = &clients[i];
+                sv_players[pl]->player_number = pl;
+                ++pl;
+            }
+            else
+            {
+                clients[i].player_number = -1;
+            }
+        }
+    }
+
+    for (; pl<NET_MAXPLAYERS; ++pl)
+    {
+        sv_players[pl] = NULL;
+    }
+}
+
+// Returns the number of players currently connected.
+
+static int NET_SV_NumPlayers(void)
+{
+    int i;
+    int result;
+
+    result = 0;
+
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        if (sv_players[i] != NULL && ClientConnected(sv_players[i]))
+        {
+            result += 1;
+        }
+    }
+
+    return result;
+}
+
+// Returns the number of players ready to start the game.
+
+static int NET_SV_NumReadyPlayers(void)
+{
+    int result = 0;
+    int i;
+
+    for (i = 0; i < MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i])
+         && !clients[i].drone && clients[i].ready)
+        {
+            ++result;
+        }
+    }
+
+    return result;
+}
+
+// Returns the maximum number of players that can play.
+
+static int NET_SV_MaxPlayers(void)
+{
+    int i;
+
+    for (i = 0; i < MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]))
+        {
+            return clients[i].max_players;
+        }
+    }
+
+    return NET_MAXPLAYERS;
+}
+
+// Returns the number of drones currently connected.
+
+static int NET_SV_NumDrones(void)
+{
+    int i;
+    int result;
+
+    result = 0;
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]) && clients[i].drone)
+        {
+            result += 1;
+        }
+    }
+
+    return result;
+}
+
+// returns the number of clients connected
+
+static int NET_SV_NumClients(void)
+{
+    int count;
+    int i;
+
+    count = 0;
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]))
+        {
+            ++count;
+        }
+    }
+
+    return count;
+}
+
+// returns a pointer to the client which controls the server
+
+static net_client_t *NET_SV_Controller(void)
+{
+    net_client_t *best;
+    int i;
+
+    // Find the oldest client (first to connect).
+
+    best = NULL;
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        // Can't be controller?
+
+        if (!ClientConnected(&clients[i]) || clients[i].drone)
+        {
+            continue;
+        }
+
+        if (best == NULL || clients[i].connect_time < best->connect_time)
+        {
+            best = &clients[i];
+        }
+    }
+
+    return best;
+}
+
+typedef enum
+{
+    RANGE_LOCALHOST,   // Same process or 127.x
+    RANGE_PRIVATE,     // RFC 1918
+    RANGE_PUBLIC,      // The public Internet
+} ip_range_t;
+
+static ip_range_t ClientAddressRange(const char *addr)
+{
+    if (!strcmp(addr, "local client")
+     || M_StringStartsWith(addr, "127."))
+    {
+        return RANGE_LOCALHOST;
+    }
+    if (M_StringStartsWith(addr, "10.")
+     || M_StringStartsWith(addr, "192.168."))
+    {
+        return RANGE_PRIVATE;
+    }
+    return RANGE_PUBLIC;
+}
+
+static void NET_SV_SendWaitingData(net_client_t *client)
+{
+    net_waitdata_t wait_data;
+    net_packet_t *packet;
+    net_client_t *controller;
+    ip_range_t client_range, player_range;
+    const char *addr;
+    int i;
+
+    NET_SV_AssignPlayers();
+
+    controller = NET_SV_Controller();
+
+    wait_data.num_players = NET_SV_NumPlayers();
+    wait_data.num_drones = NET_SV_NumDrones();
+    wait_data.ready_players = NET_SV_NumReadyPlayers();
+    wait_data.max_players = NET_SV_MaxPlayers();
+    wait_data.is_controller = (client == controller);
+    wait_data.consoleplayer = client->player_number;
+
+    // Send the WAD and dehacked checksums of the controlling client.
+    // If no controller found (?), send the details that the client
+    // is expecting anyway.
+
+    if (controller == NULL)
+    {
+        controller = client;
+    }
+
+    memcpy(&wait_data.wad_sha1sum, &controller->wad_sha1sum,
+           sizeof(sha1_digest_t));
+    memcpy(&wait_data.deh_sha1sum, &controller->deh_sha1sum,
+           sizeof(sha1_digest_t));
+    wait_data.is_freedoom = controller->is_freedoom;
+
+    // We only send IP addresses to locally-connected clients (including
+    // the 127.* loopback range):
+    addr = NET_AddrToString(client->connection.addr);
+    client_range = ClientAddressRange(addr);
+
+    // set name and address of each player:
+
+    for (i = 0; i < wait_data.num_players; ++i)
+    {
+        M_StringCopy(wait_data.player_names[i],
+                     sv_players[i]->name,
+                     MAXPLAYERNAME);
+
+        // For privacy, only local clients or those on a LAN get to see
+        // addresses. Public clients only get to see their own address,
+        // though we do reveal localhost addresses since they're harmless,
+        // and we do reveal when a client is connected via LAN.
+        addr = NET_AddrToString(sv_players[i]->addr);
+        player_range = ClientAddressRange(addr);
+        if (client_range == RANGE_LOCALHOST || client_range == RANGE_PRIVATE
+         || i == wait_data.consoleplayer || player_range == RANGE_LOCALHOST)
+        {
+            M_StringCopy(wait_data.player_addrs[i], addr, MAXPLAYERNAME);
+        }
+        else if (player_range == RANGE_PRIVATE)
+        {
+            M_snprintf(wait_data.player_addrs[i], MAXPLAYERNAME,
+                       "[LAN player]");
+        }
+        else
+        {
+            M_snprintf(wait_data.player_addrs[i], MAXPLAYERNAME,
+                       "[address hidden]");
+        }
+    }
+
+    // Construct packet:
+
+    packet = NET_NewPacket(10);
+    NET_WriteInt16(packet, NET_PACKET_TYPE_WAITING_DATA);
+    NET_WriteWaitData(packet, &wait_data);
+
+    // Send packet to client and free
+
+    NET_Conn_SendPacket(&client->connection, packet);
+    NET_FreePacket(packet);
+}
+
+// Find the latest tic which has been acknowledged as received by
+// all clients.
+
+static unsigned int NET_SV_LatestAcknowledged(void)
+{
+    unsigned int lowtic = UINT_MAX;
+    int i;
+
+    for (i=0; i<MAXNETNODES; ++i) 
+    {
+        if (ClientConnected(&clients[i]))
+        {
+            if (clients[i].acknowledged < lowtic)
+            {
+                lowtic = clients[i].acknowledged;
+            }
+        }
+    }
+
+    return lowtic;
+}
+
+
+// Possibly advance the recv window if all connected clients have
+// used the data in the window
+
+static void NET_SV_AdvanceWindow(void)
+{
+    unsigned int lowtic;
+    int i;
+
+    if (NET_SV_NumPlayers() <= 0)
+    {
+        return;
+    }
+
+    lowtic = NET_SV_LatestAcknowledged();
+
+    // Advance the recv window until it catches up with lowtic
+
+    while (recvwindow_start < lowtic)
+    {
+        boolean should_advance;
+
+        // Check we have tics from all players for first tic in
+        // the recv window
+        
+        should_advance = true;
+
+        for (i=0; i<NET_MAXPLAYERS; ++i)
+        {
+            if (sv_players[i] == NULL || !ClientConnected(sv_players[i]))
+            {
+                continue;
+            }
+
+            if (!recvwindow[0][i].active)
+            {
+                should_advance = false;
+                break;
+            }
+        }
+
+        if (!should_advance)
+        {
+            // The first tic is not complete: ie. we have not 
+            // received tics from all connected players.  This can
+            // happen if only one player is in the game.
+
+            break;
+        }
+        
+        // Advance the window
+
+        memmove(recvwindow, recvwindow + 1,
+                sizeof(*recvwindow) * (BACKUPTICS - 1));
+        memset(&recvwindow[BACKUPTICS-1], 0, sizeof(*recvwindow));
+        ++recvwindow_start;
+        NET_Log("server: advanced receive window to %d", recvwindow_start);
+    }
+}
+
+// Given an address, find the corresponding client
+
+static net_client_t *NET_SV_FindClient(net_addr_t *addr)
+{
+    int i;
+
+    for (i=0; i<MAXNETNODES; ++i) 
+    {
+        if (clients[i].active && clients[i].addr == addr)
+        {
+            // found the client
+
+            return &clients[i];
+        }
+    }
+
+    return NULL;
+}
+
+// send a rejection packet to a client
+
+static void NET_SV_SendReject(net_addr_t *addr, const char *msg)
+{
+    net_packet_t *packet;
+
+    NET_Log("server: sending reject to %s", NET_AddrToString(addr));
+
+    packet = NET_NewPacket(10);
+    NET_WriteInt16(packet, NET_PACKET_TYPE_REJECTED);
+    NET_WriteString(packet, msg);
+    NET_SendPacket(addr, packet);
+    NET_FreePacket(packet);
+}
+
+static void NET_SV_InitNewClient(net_client_t *client, net_addr_t *addr,
+                                 net_protocol_t protocol)
+{
+    client->active = true;
+    client->connect_time = I_GetTimeMS();
+    NET_Conn_InitServer(&client->connection, addr, protocol);
+    client->addr = addr;
+    NET_ReferenceAddress(addr);
+    client->last_send_time = -1;
+
+    // init the ticcmd send queue
+
+    client->sendseq = 0;
+    client->acknowledged = 0;
+    client->drone = false;
+    client->ready = false;
+
+    client->last_gamedata_time = 0;
+
+    memset(client->sendqueue, 0xff, sizeof(client->sendqueue));
+
+    NET_Log("server: initialized new client from %s", NET_AddrToString(addr));
+}
+
+// parse a SYN from a client(initiating a connection)
+
+static void NET_SV_ParseSYN(net_packet_t *packet, net_client_t *client,
+                            net_addr_t *addr)
+{
+    unsigned int magic;
+    net_connect_data_t data;
+    net_packet_t *reply;
+    net_protocol_t protocol;
+    char *player_name;
+    char *client_version;
+    int num_players;
+    int i;
+
+    NET_Log("server: processing SYN packet");
+
+    // Read the magic number and check it is the expected one.
+    if (!NET_ReadInt32(packet, &magic))
+    {
+        NET_Log("server: error: no magic number for SYN");
+        return;
+    }
+
+    switch (magic)
+    {
+        case NET_MAGIC_NUMBER:
+            break;
+
+        case NET_OLD_MAGIC_NUMBER:
+            NET_Log("server: error: client using old magic number: %d", magic);
+            NET_SV_SendReject(addr,
+                "You are using an old client version that is not supported by "
+                "this server. This server is running " PACKAGE_STRING ".");
+            return;
+
+        default:
+            NET_Log("server: error: wrong magic number: %d", magic);
+            return;
+    }
+
+    // Read the client version string. We actually now only use this when
+    // sending a reject message, as we only reject if we can't negotiate a
+    // common protocol (below).
+    client_version = NET_ReadString(packet);
+    if (client_version == NULL)
+    {
+        NET_Log("server: error: no version from client");
+        return;
+    }
+
+    // Read the client's list of accepted protocols. Net play between forks
+    // of Chocolate Doom is accepted provided that they can negotiate a
+    // common accepted protocol.
+    protocol = NET_ReadProtocolList(packet);
+    if (protocol == NET_PROTOCOL_UNKNOWN)
+    {
+        char reject_msg[256];
+
+        M_snprintf(reject_msg, sizeof(reject_msg),
+            "Version mismatch: server version is: " PACKAGE_STRING "; "
+            "client is: %s. No common compatible protocol could be "
+            "negotiated.", client_version);
+        NET_SV_SendReject(addr, reject_msg);
+        NET_Log("server: error: no common protocol");
+        return;
+    }
+
+    // Read connect data, and check that the game mode/mission are valid
+    // and the max_players value is in a sensible range.
+    if (!NET_ReadConnectData(packet, &data))
+    {
+        NET_Log("server: error: failed to read connect data");
+        return;
+    }
+
+    if (!D_ValidGameMode(data.gamemission, data.gamemode)
+     || data.max_players > NET_MAXPLAYERS)
+    {
+        NET_Log("server: error: invalid connect data, max_players=%d, "
+                "gamemission=%d, gamemode=%d",
+                data.max_players, data.gamemission, data.gamemode);
+        return;
+    }
+
+    // Read the player's name
+    player_name = NET_ReadString(packet);
+    if (player_name == NULL)
+    {
+        NET_Log("server: error: failed to read player name");
+        return;
+    }
+
+    // At this point we have received a valid SYN.
+
+    // Not accepting new connections?
+    if (server_state != SERVER_WAITING_LAUNCH)
+    {
+        NET_Log("server: error: not in waiting launch state, server_state=%d",
+                server_state);
+        NET_SV_SendReject(addr,
+                          "Server is not currently accepting connections");
+        return;
+    }
+
+    // Before accepting a new client, check that there is a slot free.
+    NET_SV_AssignPlayers();
+    num_players = NET_SV_NumPlayers();
+
+    if ((!data.drone && num_players >= NET_SV_MaxPlayers())
+     || NET_SV_NumClients() >= MAXNETNODES)
+    {
+        NET_Log("server: no more players, num_players=%d, max=%d",
+                num_players, NET_SV_MaxPlayers());
+        NET_SV_SendReject(addr, "Server is full!");
+        return;
+    }
+
+    // TODO: Add server option to allow rejecting clients which set
+    // lowres_turn.  This is potentially desirable as the presence of such
+    // clients affects turning resolution.
+
+    // Adopt the game mode and mission of the first connecting client:
+    if (num_players == 0 && !data.drone)
+    {
+        sv_gamemode = data.gamemode;
+        sv_gamemission = data.gamemission;
+        NET_Log("server: new game, mode=%d, mission=%d",
+                sv_gamemode, sv_gamemission);
+    }
+
+    // Check the connecting client is playing the same game as all
+    // the other clients
+    if (data.gamemode != sv_gamemode || data.gamemission != sv_gamemission)
+    {
+        char msg[128];
+        NET_Log("server: wrong mode/mission, %d != %d || %d != %d",
+                data.gamemode, sv_gamemode, data.gamemission, sv_gamemission);
+        M_snprintf(msg, sizeof(msg),
+                   "Game mismatch: server is %s (%s), client is %s (%s)",
+                   D_GameMissionString(sv_gamemission),
+                   D_GameModeString(sv_gamemode),
+                   D_GameMissionString(data.gamemission),
+                   D_GameModeString(data.gamemode));
+
+        NET_SV_SendReject(addr, msg);
+        return;
+    }
+
+    // Allocate a client slot if there isn't one already
+    if (client == NULL)
+    {
+        // find a slot, or return if none found
+
+        for (i=0; i<MAXNETNODES; ++i)
+        {
+            if (!clients[i].active)
+            {
+                client = &clients[i];
+                break;
+            }
+        }
+
+        if (client == NULL)
+        {
+            return;
+        }
+    }
+    else
+    {
+        // If this is a recently-disconnected client, deactivate
+        // to allow immediate reconnection
+
+        if (client->connection.state == NET_CONN_STATE_DISCONNECTED)
+        {
+            client->active = false;
+        }
+    }
+
+    // Client already connected?
+    if (client->active)
+    {
+        NET_Log("server: client is already initialized (duplicate SYN?)");
+        return;
+    }
+
+    // Activate, initialize connection
+    NET_SV_InitNewClient(client, addr, protocol);
+
+    // Save the SHA1 checksums and other details.
+    memcpy(client->wad_sha1sum, data.wad_sha1sum, sizeof(sha1_digest_t));
+    memcpy(client->deh_sha1sum, data.deh_sha1sum, sizeof(sha1_digest_t));
+    client->is_freedoom = data.is_freedoom;
+    client->max_players = data.max_players;
+    client->name = M_StringDuplicate(player_name);
+    client->recording_lowres = data.lowres_turn;
+    client->drone = data.drone;
+    client->player_class = data.player_class;
+
+    // Send a reply back to the client, indicating a successful connection
+    // and specifying the protocol that will be used for communications.
+    reply = NET_Conn_NewReliable(&client->connection, NET_PACKET_TYPE_SYN);
+    NET_WriteString(reply, PACKAGE_STRING);
+    NET_WriteProtocol(reply, protocol);
+}
+
+// Parse a launch packet. This is sent by the key player when the "start"
+// button is pressed, and causes the startup process to continue.
+
+static void NET_SV_ParseLaunch(net_packet_t *packet, net_client_t *client)
+{
+    net_packet_t *launchpacket;
+    int num_players;
+    unsigned int i;
+
+    NET_Log("server: processing launch packet");
+
+    // Only the controller can launch the game.
+
+    if (client != NET_SV_Controller())
+    {
+        NET_Log("server: error: this client isn't the controller, %d != %d",
+                client, NET_SV_Controller());
+        return;
+    }
+
+    // Can only launch when we are in the waiting state.
+
+    if (server_state != SERVER_WAITING_LAUNCH)
+    {
+        NET_Log("server: error: not in waiting launch state, state=%d",
+                server_state);
+        return;
+    }
+
+    // Forward launch on to all clients.
+    NET_Log("server: sending launch to all clients");
+    NET_SV_AssignPlayers();
+    num_players = NET_SV_NumPlayers();
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (!ClientConnected(&clients[i]))
+            continue;
+
+        launchpacket = NET_Conn_NewReliable(&clients[i].connection,
+                                            NET_PACKET_TYPE_LAUNCH);
+        NET_WriteInt8(launchpacket, num_players);
+    }
+
+    // Now in launch state.
+
+    server_state = SERVER_WAITING_START;
+}
+
+// Transition to the in-game state and send all players the start game
+// message. Invoked once all players have indicated they are ready to
+// start the game.
+
+static void StartGame(void)
+{
+    net_packet_t *startpacket;
+    unsigned int i;
+    int nowtime;
+
+    // Assign player numbers
+
+    NET_SV_AssignPlayers();
+
+    // Check if anyone is recording a demo and set lowres_turn if so.
+
+    sv_settings.lowres_turn = false;
+
+    for (i = 0; i < NET_MAXPLAYERS; ++i)
+    {
+        if (sv_players[i] != NULL && sv_players[i]->recording_lowres)
+        {
+            sv_settings.lowres_turn = true;
+        }
+    }
+
+    sv_settings.num_players = NET_SV_NumPlayers();
+
+    // Copy player classes:
+
+    for (i = 0; i < NET_MAXPLAYERS; ++i)
+    {
+        if (sv_players[i] != NULL)
+        {
+            sv_settings.player_classes[i] = sv_players[i]->player_class;
+        }
+        else
+        {
+            sv_settings.player_classes[i] = 0;
+        }
+    }
+
+    nowtime = I_GetTimeMS();
+
+    // Send start packets to each connected node
+
+    for (i = 0; i < MAXNETNODES; ++i)
+    {
+        if (!ClientConnected(&clients[i]))
+            continue;
+
+        clients[i].last_gamedata_time = nowtime;
+
+        startpacket = NET_Conn_NewReliable(&clients[i].connection,
+                                           NET_PACKET_TYPE_GAMESTART);
+
+        sv_settings.consoleplayer = clients[i].player_number;
+
+        NET_WriteSettings(startpacket, &sv_settings);
+    }
+
+    // Change server state
+    NET_Log("server: beginning game state");
+    server_state = SERVER_IN_GAME;
+
+    memset(recvwindow, 0, sizeof(recvwindow));
+    recvwindow_start = 0;
+}
+
+// Returns true when all nodes have indicated readiness to start the game.
+
+static boolean AllNodesReady(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]) && !clients[i].ready)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// Check if the game should start, and if so, start it.
+
+static void CheckStartGame(void)
+{
+    if (!AllNodesReady())
+    {
+        NET_Log("server: not all clients ready to start yet");
+        return;
+    }
+
+    NET_Log("server: all clients ready, starting game");
+    StartGame();
+}
+
+// Send waiting data with current status to all nodes that are ready to
+// start the game.
+
+static void SendAllWaitingData(void)
+{
+    unsigned int i;
+
+    for (i = 0; i < MAXNETNODES; ++i)
+    {
+        if (ClientConnected(&clients[i]) && clients[i].ready)
+        {
+            NET_SV_SendWaitingData(&clients[i]);
+        }
+    }
+}
+
+// Parse a game start packet
+
+static void NET_SV_ParseGameStart(net_packet_t *packet, net_client_t *client)
+{
+    net_gamesettings_t settings;
+
+    NET_Log("server: processing game start packet");
+
+    // Can only start a game if we are in the waiting start state.
+
+    if (server_state != SERVER_WAITING_START)
+    {
+        NET_Log("server: error: not in waiting start state, server_state=%d",
+                server_state);
+        return;
+    }
+
+    if (client == NET_SV_Controller())
+    {
+        if (!NET_ReadSettings(packet, &settings))
+        {
+            // Malformed packet
+            NET_Log("server: error: no settings from controller");
+            return;
+        }
+
+        // Check the game settings are valid
+
+        if (!NET_ValidGameSettings(sv_gamemode, sv_gamemission, &settings))
+        {
+            NET_Log("server: error: invalid game settings");
+            return;
+        }
+
+        sv_settings = settings;
+    }
+
+    client->ready = true;
+
+    CheckStartGame();
+
+    // Update all ready clients with the current state (number of players
+    // ready, etc.). This is used by games that show startup progress
+    // (eg. Hexen's spinal loading)
+
+    SendAllWaitingData();
+}
+
+// Send a resend request to a client
+
+static void NET_SV_SendResendRequest(net_client_t *client, int start, int end)
+{
+    net_packet_t *packet;
+    net_client_recv_t *recvobj;
+    int i;
+    unsigned int nowtime;
+    int index;
+
+    NET_Log("server: send resend to %s for tics %d-%d",
+            NET_AddrToString(client->addr), start, end);
+
+    packet = NET_NewPacket(20);
+
+    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA_RESEND);
+    NET_WriteInt32(packet, start);
+    NET_WriteInt8(packet, end - start + 1);
+
+    NET_Conn_SendPacket(&client->connection, packet);
+    NET_FreePacket(packet);
+
+    // Store the time we send the resend request
+
+    nowtime = I_GetTimeMS();
+
+    for (i=start; i<=end; ++i)
+    {
+        index = i - recvwindow_start;
+
+        if (index >= BACKUPTICS)
+        {
+            // Outside the range
+
+            continue;
+        }
+        
+        recvobj = &recvwindow[index][client->player_number];
+
+        recvobj->resend_time = nowtime;
+    }
+}
+
+// Check for expired resend requests
+
+static void NET_SV_CheckResends(net_client_t *client)
+{
+    int i;
+    int player;
+    int resend_start, resend_end;
+    unsigned int nowtime;
+
+    nowtime = I_GetTimeMS();
+
+    player = client->player_number;
+    resend_start = -1;
+    resend_end = -1;
+
+    for (i=0; i<BACKUPTICS; ++i)
+    {
+        net_client_recv_t *recvobj;
+        boolean need_resend;
+
+        recvobj = &recvwindow[i][player];
+
+        // if need_resend is true, this tic needs another retransmit
+        // request (300ms timeout)
+
+        need_resend = !recvobj->active
+                   && recvobj->resend_time != 0
+                   && nowtime > recvobj->resend_time + 300;
+
+        if (need_resend)
+        {
+            // Start a new run of resend tics?
+            if (resend_start < 0)
+            {
+                resend_start = i;
+            }
+            resend_end = i;
+        }
+        else if (resend_start >= 0)
+        {
+            // End of a run of resend tics
+            NET_Log("server: resend request to %s timed out for %d-%d (%d)",
+                    NET_AddrToString(client->addr),
+                    recvwindow_start + resend_start,
+                    recvwindow_start + resend_end,
+                    &recvwindow[resend_start][player].resend_time);
+            NET_SV_SendResendRequest(client, 
+                                     recvwindow_start + resend_start,
+                                     recvwindow_start + resend_end);
+
+            resend_start = -1;
+        }
+    }
+
+    if (resend_start >= 0)
+    {
+        NET_Log("server: resend request to %s timed out for %d-%d (%d)",
+                NET_AddrToString(client->addr),
+                recvwindow_start + resend_start,
+                recvwindow_start + resend_end,
+                &recvwindow[resend_start][player].resend_time);
+        NET_SV_SendResendRequest(client,
+                                 recvwindow_start + resend_start,
+                                 recvwindow_start + resend_end);
+    }
+}
+
+// Process game data from a client
+
+static void NET_SV_ParseGameData(net_packet_t *packet, net_client_t *client)
+{
+    net_client_recv_t *recvobj;
+    unsigned int seq;
+    unsigned int ackseq;
+    unsigned int num_tics;
+    unsigned int nowtime;
+    size_t i;
+    int player;
+    int resend_start, resend_end;
+    int index;
+
+    if (server_state != SERVER_IN_GAME)
+    {
+        NET_Log("server: error: not in game state: server_state=%d",
+                server_state);
+        return;
+    }
+
+    if (client->drone)
+    {
+        // Drones do not contribute any game data.
+        NET_Log("server: error: game data from a drone?");
+        return;
+    }
+
+    player = client->player_number;
+
+    // Read header
+    if (!NET_ReadInt8(packet, &ackseq)
+     || !NET_ReadInt8(packet, &seq)
+     || !NET_ReadInt8(packet, &num_tics))
+    {
+        NET_Log("server: error: failed to read header");
+        return;
+    }
+
+    NET_Log("server: got game data, seq=%d, num_tics=%d, ackseq=%d",
+            seq, num_tics, ackseq);
+
+    // Get the current time
+    nowtime = I_GetTimeMS();
+
+    // Expand 8-bit values to the full sequence number
+    ackseq = NET_SV_ExpandTicNum(ackseq);
+    seq = NET_SV_ExpandTicNum(seq);
+
+    // Sanity checks
+
+    for (i=0; i<num_tics; ++i)
+    {
+        net_ticdiff_t diff;
+        signed int latency;
+
+        if (!NET_ReadSInt16(packet, &latency)
+         || !NET_ReadTiccmdDiff(packet, &diff, sv_settings.lowres_turn))
+        {
+            return;
+        }
+
+        index = seq + i - recvwindow_start;
+
+        if (index < 0 || index >= BACKUPTICS)
+        {
+            // Not in range of the recv window
+
+            continue;
+        }
+
+        recvobj = &recvwindow[index][player];
+        recvobj->active = true;
+        recvobj->diff = diff;
+        recvobj->latency = latency;
+
+        client->last_gamedata_time = nowtime;
+        NET_Log("server: stored tic %d for player %d", seq + i, player);
+    }
+
+    // Higher acknowledgement point?
+
+    if (ackseq > client->acknowledged)
+    {
+        NET_Log("server: acknowledged up to %d", ackseq);
+        client->acknowledged = ackseq;
+    }
+
+    // Has this been received out of sequence, ie. have we not received
+    // all tics before the first tic in this packet?  If so, send a 
+    // resend request.
+
+    //printf("SV: %p: %i\n", client, seq);
+
+    resend_end = seq - recvwindow_start;
+
+    if (resend_end <= 0)
+        return;
+
+    if (resend_end >= BACKUPTICS)
+        resend_end = BACKUPTICS - 1;
+
+    index = resend_end - 1;
+    resend_start = resend_end;
+    
+    while (index >= 0)
+    {
+        recvobj = &recvwindow[index][player];
+
+        if (recvobj->active)
+        {
+            // ended our run of unreceived tics
+
+            break;
+        }
+
+        if (recvobj->resend_time != 0)
+        {
+            // Already sent a resend request for this tic
+
+            break;
+        }
+
+        resend_start = index;
+        --index;
+    }
+
+    // Possibly send a resend request
+    if (resend_start < resend_end)
+    {
+        NET_Log("server: request resend for %d-%d before %d",
+                recvwindow_start + resend_start,
+                recvwindow_start + resend_end - 1, seq);
+        NET_SV_SendResendRequest(client, 
+                                 recvwindow_start + resend_start, 
+                                 recvwindow_start + resend_end - 1);
+    }
+}
+
+static void NET_SV_ParseGameDataACK(net_packet_t *packet, net_client_t *client)
+{
+    unsigned int ackseq;
+
+    NET_Log("server: processing game data ack packet");
+
+    if (server_state != SERVER_IN_GAME)
+    {
+        NET_Log("server: error: not in game state, server_state=%d",
+                server_state);
+        return;
+    }
+
+    // Read header
+
+    if (!NET_ReadInt8(packet, &ackseq))
+    {
+        NET_Log("server: error: missing acknowledgement field");
+        return;
+    }
+
+    // Expand 8-bit values to the full sequence number
+
+    ackseq = NET_SV_ExpandTicNum(ackseq);
+
+    // Higher acknowledgement point than we already have?
+
+    if (ackseq > client->acknowledged)
+    {
+        NET_Log("server: acknowledged up to %d", ackseq);
+        client->acknowledged = ackseq;
+    }
+}
+
+static void NET_SV_SendTics(net_client_t *client, 
+                            unsigned int start, unsigned int end)
+{
+    net_packet_t *packet;
+    unsigned int i;
+
+    packet = NET_NewPacket(500);
+
+    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA);
+
+    // Send the start tic and number of tics
+
+    NET_WriteInt8(packet, start & 0xff);
+    NET_WriteInt8(packet, end-start + 1);
+
+    // Write the tics
+
+    for (i=start; i<=end; ++i)
+    {
+        net_full_ticcmd_t *cmd;
+
+        cmd = &client->sendqueue[i % BACKUPTICS];
+
+        if (i != cmd->seq)
+        {
+            I_Error("Wanted to send %i, but %i is in its place", i, cmd->seq);
+        }
+
+        // Add command
+       
+        NET_WriteFullTiccmd(packet, cmd, sv_settings.lowres_turn);
+    }
+    
+    // Send packet
+
+    NET_Conn_SendPacket(&client->connection, packet);
+    
+    NET_FreePacket(packet);
+}
+
+// Parse a retransmission request from a client
+
+static void NET_SV_ParseResendRequest(net_packet_t *packet, net_client_t *client)
+{
+    unsigned int start, last;
+    unsigned int num_tics;
+    unsigned int i;
+
+    NET_Log("server: processing resend request");
+
+    // Read the starting tic and number of tics
+
+    if (!NET_ReadInt32(packet, &start)
+     || !NET_ReadInt8(packet, &num_tics))
+    {
+        NET_Log("server: error: missing fields for resend");
+        return;
+    }
+
+    //printf("SV: %p: resend %i-%i\n", client, start, start+num_tics-1);
+
+    // Check we have all the requested tics
+
+    last = start + num_tics - 1;
+
+    for (i=start; i<=last; ++i)
+    {
+        net_full_ticcmd_t *cmd;
+
+        cmd = &client->sendqueue[i % BACKUPTICS];
+
+        if (i != cmd->seq)
+        {
+            // We do not have the requested tic (any more)
+            // This is pretty fatal.  We could disconnect the client, 
+            // but then again this could be a spoofed packet.  Just 
+            // ignore it.
+            NET_Log("server: error: don't have tic %d any more, "
+                    "can't resend", i);
+            return;
+        }
+    }
+
+    // Resend those tics
+    NET_Log("server: resending tics %d-%d", start, last);
+    NET_SV_SendTics(client, start, last);
+}
+
+// Send a response back to the client
+
+void NET_SV_SendQueryResponse(net_addr_t *addr)
+{
+    net_packet_t *reply;
+    net_querydata_t querydata;
+    int p;
+
+    // Version
+
+    querydata.version = PACKAGE_STRING;
+
+    // Server state
+
+    querydata.server_state = server_state;
+
+    // Number of players/maximum players
+
+    querydata.num_players = NET_SV_NumPlayers();
+    querydata.max_players = NET_SV_MaxPlayers();
+
+    // Game mode/mission
+
+    querydata.gamemode = sv_gamemode;
+    querydata.gamemission = sv_gamemission;
+
+    //!
+    // @category net
+    // @arg <name>
+    //
+    // When starting a network server, specify a name for the server.
+    //
+
+    p = M_CheckParmWithArgs("-servername", 1);
+
+    if (p > 0)
+    {
+        querydata.description = myargv[p + 1];
+    }
+    else
+    {
+        querydata.description = "Unnamed server";
+    }
+
+    // Send it and we're done.
+    NET_Log("server: sending query response to %s", NET_AddrToString(addr));
+    reply = NET_NewPacket(64);
+    NET_WriteInt16(reply, NET_PACKET_TYPE_QUERY_RESPONSE);
+    NET_WriteQueryData(reply, &querydata);
+    NET_SendPacket(addr, reply);
+    NET_FreePacket(reply);
+}
+
+static void NET_SV_ParseHolePunch(net_packet_t *packet)
+{
+    const char *addr_string;
+    net_packet_t *sendpacket;
+    net_addr_t *addr;
+
+    addr_string = NET_ReadString(packet);
+    if (addr_string == NULL)
+    {
+        NET_Log("server: error: hole punch request but no address provided");
+        return;
+    }
+
+    addr = NET_ResolveAddress(server_context, addr_string);
+    if (addr == NULL)
+    {
+        NET_Log("server: error: failed to resolve address: %s", addr_string);
+        return;
+    }
+
+    sendpacket = NET_NewPacket(16);
+    NET_WriteInt16(sendpacket, NET_PACKET_TYPE_NAT_HOLE_PUNCH);
+    NET_SendPacket(addr, sendpacket);
+    NET_FreePacket(sendpacket);
+    NET_ReleaseAddress(addr);
+    NET_Log("server: sent hole punch to %s", addr_string);
+}
+
+static void NET_SV_MasterPacket(net_packet_t *packet)
+{
+    unsigned int packet_type;
+
+    // Read the packet type
+
+    if (!NET_ReadInt16(packet, &packet_type))
+    {
+        NET_Log("server: error: no packet type in master server message");
+        return;
+    }
+
+    NET_Log("server: packet from master server; type %d", packet_type);
+    NET_LogPacket(packet);
+
+    switch (packet_type)
+    {
+        case NET_MASTER_PACKET_TYPE_ADD_RESPONSE:
+            NET_Query_AddResponse(packet);
+            break;
+
+        case NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH:
+            NET_SV_ParseHolePunch(packet);
+            break;
+    }
+}
+
+// Process a packet received by the server
+
+static void NET_SV_Packet(net_packet_t *packet, net_addr_t *addr)
+{
+    net_client_t *client;
+    unsigned int packet_type;
+
+    // Response from master server?
+
+    if (addr != NULL && addr == master_server)
+    {
+        NET_SV_MasterPacket(packet);
+        return;
+    }
+
+    // Find which client this packet came from
+
+    client = NET_SV_FindClient(addr);
+
+    // Read the packet type
+
+    if (!NET_ReadInt16(packet, &packet_type))
+    {
+        // no packet type
+
+        return;
+    }
+
+    NET_Log("server: packet from %s; type %d", NET_AddrToString(addr),
+            packet_type & ~NET_RELIABLE_PACKET);
+    NET_LogPacket(packet);
+
+    if (packet_type == NET_PACKET_TYPE_SYN)
+    {
+        NET_SV_ParseSYN(packet, client, addr);
+    }
+    else if (packet_type == NET_PACKET_TYPE_QUERY)
+    {
+        NET_SV_SendQueryResponse(addr);
+    }
+    else if (client == NULL)
+    {
+        // Must come from a valid client; ignore otherwise
+    }
+    else if (NET_Conn_Packet(&client->connection, packet, &packet_type))
+    {
+        // Packet was eaten by the common connection code
+    }
+    else
+    {
+        //printf("SV: %s: %i\n", NET_AddrToString(addr), packet_type);
+
+        switch (packet_type)
+        {
+            case NET_PACKET_TYPE_GAMESTART:
+                NET_SV_ParseGameStart(packet, client);
+                break;
+            case NET_PACKET_TYPE_LAUNCH:
+                NET_SV_ParseLaunch(packet, client);
+                break;
+            case NET_PACKET_TYPE_GAMEDATA:
+                NET_SV_ParseGameData(packet, client);
+                break;
+            case NET_PACKET_TYPE_GAMEDATA_ACK:
+                NET_SV_ParseGameDataACK(packet, client);
+                break;
+            case NET_PACKET_TYPE_GAMEDATA_RESEND:
+                NET_SV_ParseResendRequest(packet, client);
+                break;
+            default:
+                // unknown packet type
+
+                break;
+        }
+    }
+}
+
+
+static void NET_SV_PumpSendQueue(net_client_t *client)
+{
+    net_full_ticcmd_t cmd;
+    int recv_index;
+    int num_players;
+    int i;
+    int starttic, endtic;
+
+    // If a client has not sent any acknowledgments for a while,
+    // wait until they catch up.
+
+    if (client->sendseq - NET_SV_LatestAcknowledged() > 40)
+    {
+        return;
+    }
+    
+    // Work out the index into the receive window
+   
+    recv_index = client->sendseq - recvwindow_start;
+
+    if (recv_index < 0 || recv_index >= BACKUPTICS)
+    {
+        return;
+    }
+
+    // Check if we can generate a new entry for the send queue
+    // using the data in recvwindow.
+
+    num_players = 0;
+
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        if (sv_players[i] == client)
+        {
+            // Client does not rely on itself for data
+
+            continue;
+        }
+
+        if (sv_players[i] == NULL || !ClientConnected(sv_players[i]))
+        {
+            continue;
+        }
+
+        if (!recvwindow[recv_index][i].active)
+        {
+            // We do not have this player's ticcmd, so we cannot
+            // generate a complete command yet.
+
+            return;
+        }
+
+        ++num_players;
+    }
+
+    // If this is a game with only a single player in it, we might
+    // be sending a ticcmd set containing 0 ticcmds. This is fine;
+    // however, there's nothing to stop the game running on ahead
+    // and never stopping. Don't let the server get too far ahead
+    // of the client.
+
+    if (num_players == 0 && client->sendseq > recvwindow_start + 10)
+    {
+        return;
+    }
+
+    // We have all data we need to generate a command for this tic.
+    
+    cmd.seq = client->sendseq;
+
+    // Add ticcmds from all players
+
+    cmd.latency = 0;
+
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        net_client_recv_t *recvobj;
+
+        if (sv_players[i] == client)
+        {
+            // Not the player we are sending to
+
+            cmd.playeringame[i] = false;
+            continue;
+        }
+        
+        if (sv_players[i] == NULL || !recvwindow[recv_index][i].active)
+        {
+            cmd.playeringame[i] = false;
+            continue;
+        }
+
+        cmd.playeringame[i] = true;
+
+        recvobj = &recvwindow[recv_index][i];
+
+        cmd.cmds[i] = recvobj->diff;
+
+        if (recvobj->latency > cmd.latency)
+            cmd.latency = recvobj->latency;
+    }
+
+    //printf("SV: %i: latency %i\n", client->player_number, cmd.latency);
+
+    // Add into the queue
+
+    client->sendqueue[client->sendseq % BACKUPTICS] = cmd;
+
+    // Transmit the new tic to the client
+
+    starttic = client->sendseq - sv_settings.extratics;
+    endtic = client->sendseq;
+
+    if (starttic < 0)
+        starttic = 0;
+
+    NET_Log("server: send tics %d-%d to %s", starttic, endtic,
+            NET_AddrToString(client->addr));
+    NET_SV_SendTics(client, starttic, endtic);
+
+    ++client->sendseq;
+}
+
+// Prevent against deadlock: resend requests are usually only
+// triggered if we miss a packet and receive the next one.
+// If we miss a whole load of packets, we can end up in a 
+// deadlock situation where the client will not send any more.
+// If we don't receive any game data in a while, trigger a resend
+// request for the next tic we're expecting.
+
+void NET_SV_CheckDeadlock(net_client_t *client)
+{
+    int nowtime;
+    int i;
+
+    // Don't expect game data from clients.
+
+    if (client->drone)
+    {
+        return;
+    }
+
+    nowtime = I_GetTimeMS();
+
+    // If we haven't received anything for a long time, it may be a deadlock.
+
+    if (nowtime - client->last_gamedata_time > 1000)
+    {
+        NET_Log("server: no gamedata from %s since %d - deadlock?",
+                NET_AddrToString(client->addr),
+                client->last_gamedata_time);
+
+        // Search the receive window for the first tic we are expecting
+        // from this player.
+
+        for (i=0; i<BACKUPTICS; ++i)
+        {
+            if (!recvwindow[i][client->player_number].active)
+            {
+                NET_Log("server: deadlock: sending resend request for %d-%d",
+                        recvwindow_start + i, recvwindow_start + i + 5);
+
+                // Found a tic we haven't received.  Send a resend request.
+
+                NET_SV_SendResendRequest(client,
+                                         recvwindow_start + i,
+                                         recvwindow_start + i + 5);
+
+                client->last_gamedata_time = nowtime;
+                break;
+            }
+        }
+
+        // If we sent a resend request to break the deadlock, also trigger a
+        // resend of any tics we have sitting in the send queue, in case the
+        // client is blocked waiting on tics from us that have been lost.
+        // This fixes deadlock with some older clients which do not send
+        // resends to break deadlock.
+        if (i < BACKUPTICS && client->sendseq > client->acknowledged)
+        {
+            NET_Log("server: also resending tics %d-%d to break deadlock",
+                    client->acknowledged, client->sendseq - 1);
+            NET_SV_SendTics(client, client->acknowledged, client->sendseq - 1);
+        }
+    }
+}
+
+// Called when all players have disconnected.  Return to listening for 
+// players to start a new game, and disconnect any drones still connected.
+
+static void NET_SV_GameEnded(void)
+{
+    int i;
+
+    server_state = SERVER_WAITING_LAUNCH;
+    sv_gamemode = indetermined;
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (clients[i].active)
+        {
+            NET_SV_DisconnectClient(&clients[i]);
+        }
+    }
+}
+
+// Perform any needed action on a client
+
+static void NET_SV_RunClient(net_client_t *client)
+{
+    // Run common code
+
+    NET_Conn_Run(&client->connection);
+
+    if (client->connection.state == NET_CONN_STATE_DISCONNECTED
+     && client->connection.disconnect_reason == NET_DISCONNECT_TIMEOUT)
+    {
+        NET_Log("server: client at %s timed out",
+                NET_AddrToString(client->addr));
+        NET_SV_BroadcastMessage("Client '%s' timed out and disconnected",
+                                client->name);
+    }
+
+    // Is this client disconnected?
+
+    if (client->connection.state == NET_CONN_STATE_DISCONNECTED)
+    {
+        client->active = false;
+
+        // If we were about to start a game, any player disconnecting
+        // should cause an abort.
+
+        if (server_state == SERVER_WAITING_START && !client->drone)
+        {
+            NET_SV_BroadcastMessage("Game startup aborted because "
+                                    "player '%s' disconnected.",
+                                    client->name);
+            NET_SV_GameEnded();
+        }
+
+        free(client->name);
+        NET_ReleaseAddress(client->addr);
+
+        // Are there any clients left connected?  If not, return the
+        // server to the waiting-for-players state.
+        //
+	// Disconnect any drones still connected.
+
+        if (NET_SV_NumPlayers() <= 0)
+        {
+            NET_Log("server: no player clients left, game ended");
+            NET_SV_GameEnded();
+        }
+    }
+
+    if (!ClientConnected(client))
+    {
+        // client has not yet finished connecting
+
+        return;
+    }
+
+    if (server_state == SERVER_WAITING_LAUNCH)
+    {
+        // Waiting for the game to start
+
+        // Send information once every second
+
+        if (client->last_send_time < 0 
+         || I_GetTimeMS() - client->last_send_time > 1000)
+        {
+            NET_SV_SendWaitingData(client);
+            client->last_send_time = I_GetTimeMS();
+        }
+    }
+
+    if (server_state == SERVER_IN_GAME)
+    {
+        NET_SV_PumpSendQueue(client);
+        NET_SV_CheckDeadlock(client);
+    }
+}
+
+// Add a network module to the server context
+
+void NET_SV_AddModule(net_module_t *module)
+{
+    module->InitServer();
+    NET_AddModule(server_context, module);
+}
+
+// Initialize server and wait for connections
+
+void NET_SV_Init(void)
+{
+    int i;
+
+    // initialize send/receive context
+
+    server_context = NET_NewContext();
+
+    // no clients yet
+   
+    for (i=0; i<MAXNETNODES; ++i) 
+    {
+        clients[i].active = false;
+    }
+
+    NET_SV_AssignPlayers();
+
+    server_state = SERVER_WAITING_LAUNCH;
+    sv_gamemode = indetermined;
+    server_initialized = true;
+}
+
+static void UpdateMasterServer(void)
+{
+    unsigned int now;
+
+    now = I_GetTimeMS();
+
+    // The address of the master server can change. Periodically
+    // re-resolve the master server to update.
+
+    if (now - master_resolve_time > MASTER_RESOLVE_PERIOD * 1000)
+    {
+        net_addr_t *new_addr;
+
+        new_addr = NET_Query_ResolveMaster(server_context);
+        NET_ReleaseAddress(master_server);
+        master_server = new_addr;
+
+        master_resolve_time = now;
+    }
+
+    // Possibly refresh our registration with the master server.
+
+    if (now - master_refresh_time > MASTER_REFRESH_PERIOD * 1000)
+    {
+        NET_Query_AddToMaster(master_server);
+        master_refresh_time = now;
+    }
+}
+
+void NET_SV_RegisterWithMaster(void)
+{
+    //!
+    // @category net
+    //
+    // When running a server, don't register with the global master server.
+    // Implies -server.
+    //
+
+    if (!M_CheckParm("-privateserver"))
+    {
+        master_server = NET_Query_ResolveMaster(server_context);
+    }
+    else
+    {
+        master_server = NULL;
+    }
+
+    // Send request.
+
+    if (master_server != NULL)
+    {
+        NET_Query_AddToMaster(master_server);
+        master_refresh_time = I_GetTimeMS();
+        master_resolve_time = master_refresh_time;
+    }
+}
+
+// Run server code to check for new packets/send packets as the server
+// requires
+
+void NET_SV_Run(void)
+{
+    net_addr_t *addr;
+    net_packet_t *packet;
+    int i;
+
+    if (!server_initialized)
+    {
+        return;
+    }
+
+    while (NET_RecvPacket(server_context, &addr, &packet))
+    {
+        NET_SV_Packet(packet, addr);
+        NET_FreePacket(packet);
+        NET_ReleaseAddress(addr);
+    }
+
+    if (master_server != NULL)
+    {
+        UpdateMasterServer();
+    }
+
+    // "Run" any clients that may have things to do, independent of responses
+    // to received packets
+
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (clients[i].active)
+        {
+            NET_SV_RunClient(&clients[i]);
+        }
+    }
+
+    switch (server_state)
+    {
+        case SERVER_WAITING_LAUNCH:
+            break;
+
+        case SERVER_WAITING_START:
+            CheckStartGame();
+            break;
+
+        case SERVER_IN_GAME:
+            NET_SV_AdvanceWindow();
+
+            for (i = 0; i < NET_MAXPLAYERS; ++i)
+            {
+                if (sv_players[i] != NULL && ClientConnected(sv_players[i]))
+                {
+                    NET_SV_CheckResends(sv_players[i]);
+                }
+            }
+            break;
+    }
+}
+
+void NET_SV_Shutdown(void)
+{
+    int i;
+    boolean running;
+    int start_time;
+
+    if (!server_initialized)
+    {
+        return;
+    }
+    
+    fprintf(stderr, "SV: Shutting down server...\n");
+
+    // Disconnect all clients
+    
+    for (i=0; i<MAXNETNODES; ++i)
+    {
+        if (clients[i].active)
+        {
+            NET_SV_DisconnectClient(&clients[i]);
+        }
+    }
+
+    // Wait for all clients to finish disconnecting
+
+    start_time = I_GetTimeMS();
+    running = true;
+
+    while (running)
+    {
+        // Check if any clients are still not finished
+
+        running = false;
+
+        for (i=0; i<MAXNETNODES; ++i)
+        {
+            if (clients[i].active)
+            {
+                running = true;
+            }
+        }
+
+        // Timed out?
+
+        if (I_GetTimeMS() - start_time > 5000)
+        {
+            running = false;
+            fprintf(stderr, "SV: Timed out waiting for clients to disconnect.\n");
+        }
+
+        // Run the client code in case this is a loopback client.
+
+        NET_CL_Run();
+        NET_SV_Run();
+
+        // Don't hog the CPU
+
+        I_Sleep(1);
+    }
+}
diff --git a/games/NXDoom/src/net_server.h b/games/NXDoom/src/net_server.h
new file mode 100644
index 000000000..b9de7456e
--- /dev/null
+++ b/games/NXDoom/src/net_server.h
@@ -0,0 +1,42 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Network server code
+//
+
+#ifndef NET_SERVER_H
+#define NET_SERVER_H
+
+// initialize server and wait for connections
+
+void NET_SV_Init(void);
+
+// run server: check for new packets received etc.
+
+void NET_SV_Run(void);
+
+// Shut down the server
+// Blocks until all clients disconnect, or until a 5 second timeout
+
+void NET_SV_Shutdown(void);
+
+// Add a network module to the context used by the server
+
+void NET_SV_AddModule(net_module_t *module);
+
+// Register server with master server.
+
+void NET_SV_RegisterWithMaster(void);
+
+#endif /* #ifndef NET_SERVER_H */
+
diff --git a/games/NXDoom/src/net_structrw.c b/games/NXDoom/src/net_structrw.c
new file mode 100644
index 000000000..2dbd2740a
--- /dev/null
+++ b/games/NXDoom/src/net_structrw.c
@@ -0,0 +1,676 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// Reading and writing various structures into packets
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "net_packet.h"
+#include "net_structrw.h"
+
+// String names for the enum values in net_protocol_t, which are what is
+// sent over the wire. Every enum value must have an entry in this list.
+static struct
+{
+    net_protocol_t protocol;
+    const char *name;
+} protocol_names[] = {
+    {NET_PROTOCOL_CHOCOLATE_DOOM_0, "CHOCOLATE_DOOM_0"},
+};
+
+void NET_WriteConnectData(net_packet_t *packet, net_connect_data_t *data)
+{
+    NET_WriteInt8(packet, data->gamemode);
+    NET_WriteInt8(packet, data->gamemission);
+    NET_WriteInt8(packet, data->lowres_turn);
+    NET_WriteInt8(packet, data->drone);
+    NET_WriteInt8(packet, data->max_players);
+    NET_WriteInt8(packet, data->is_freedoom);
+    NET_WriteSHA1Sum(packet, data->wad_sha1sum);
+    NET_WriteSHA1Sum(packet, data->deh_sha1sum);
+    NET_WriteInt8(packet, data->player_class);
+}
+
+boolean NET_ReadConnectData(net_packet_t *packet, net_connect_data_t *data)
+{
+    return NET_ReadInt8(packet, (unsigned int *) &data->gamemode)
+        && NET_ReadInt8(packet, (unsigned int *) &data->gamemission)
+        && NET_ReadInt8(packet, (unsigned int *) &data->lowres_turn)
+        && NET_ReadInt8(packet, (unsigned int *) &data->drone)
+        && NET_ReadInt8(packet, (unsigned int *) &data->max_players)
+        && NET_ReadInt8(packet, (unsigned int *) &data->is_freedoom)
+        && NET_ReadSHA1Sum(packet, data->wad_sha1sum)
+        && NET_ReadSHA1Sum(packet, data->deh_sha1sum)
+        && NET_ReadInt8(packet, (unsigned int *) &data->player_class);
+}
+
+void NET_WriteSettings(net_packet_t *packet, net_gamesettings_t *settings)
+{
+    int i;
+
+    NET_WriteInt8(packet, settings->ticdup);
+    NET_WriteInt8(packet, settings->extratics);
+    NET_WriteInt8(packet, settings->deathmatch);
+    NET_WriteInt8(packet, settings->nomonsters);
+    NET_WriteInt8(packet, settings->fast_monsters);
+    NET_WriteInt8(packet, settings->respawn_monsters);
+    NET_WriteInt8(packet, settings->episode);
+    NET_WriteInt8(packet, settings->map);
+    NET_WriteInt8(packet, settings->skill);
+    NET_WriteInt8(packet, settings->gameversion);
+    NET_WriteInt8(packet, settings->lowres_turn);
+    NET_WriteInt8(packet, settings->new_sync);
+    NET_WriteInt32(packet, settings->timelimit);
+    NET_WriteInt8(packet, settings->loadgame);
+    NET_WriteInt8(packet, settings->random);
+    NET_WriteInt8(packet, settings->num_players);
+    NET_WriteInt8(packet, settings->consoleplayer);
+
+    for (i = 0; i < settings->num_players; ++i)
+    {
+        NET_WriteInt8(packet, settings->player_classes[i]);
+    }
+}
+
+boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings)
+{
+    boolean success;
+    int i;
+
+    success = NET_ReadInt8(packet, (unsigned int *) &settings->ticdup)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->extratics)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->deathmatch)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->nomonsters)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->fast_monsters)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->respawn_monsters)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->episode)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->map)
+           && NET_ReadSInt8(packet, &settings->skill)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->gameversion)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->lowres_turn)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->new_sync)
+           && NET_ReadInt32(packet, (unsigned int *) &settings->timelimit)
+           && NET_ReadSInt8(packet, (signed int *) &settings->loadgame)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->random)
+           && NET_ReadInt8(packet, (unsigned int *) &settings->num_players)
+           && NET_ReadSInt8(packet, (signed int *) &settings->consoleplayer);
+
+    if (!success)
+    {
+        return false;
+    }
+
+    for (i = 0; i < settings->num_players && i < NET_MAXPLAYERS; ++i)
+    {
+        if (!NET_ReadInt8(packet,
+                          (unsigned int *) &settings->player_classes[i]))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+boolean NET_ReadQueryData(net_packet_t *packet, net_querydata_t *query)
+{
+    boolean success;
+
+    query->version = NET_ReadSafeString(packet);
+
+    success = query->version != NULL
+          && NET_ReadInt8(packet, (unsigned int *) &query->server_state)
+          && NET_ReadInt8(packet, (unsigned int *) &query->num_players)
+          && NET_ReadInt8(packet, (unsigned int *) &query->max_players)
+          && NET_ReadInt8(packet, (unsigned int *) &query->gamemode)
+          && NET_ReadInt8(packet, (unsigned int *) &query->gamemission);
+
+    if (!success)
+    {
+        return false;
+    }
+
+    query->description = NET_ReadSafeString(packet);
+
+    // We read the list of protocols supported by the server. However,
+    // old versions of Chocolate Doom do not support this field; it is
+    // okay if it cannot be successfully read.
+    query->protocol = NET_ReadProtocolList(packet);
+
+    return query->description != NULL;
+}
+
+void NET_WriteQueryData(net_packet_t *packet, net_querydata_t *query)
+{
+    NET_WriteString(packet, query->version);
+    NET_WriteInt8(packet, query->server_state);
+    NET_WriteInt8(packet, query->num_players);
+    NET_WriteInt8(packet, query->max_players);
+    NET_WriteInt8(packet, query->gamemode);
+    NET_WriteInt8(packet, query->gamemission);
+    NET_WriteString(packet, query->description);
+
+    // Write a list of all supported protocols. Note that the query->protocol
+    // field is ignored here; it is only used when receiving.
+    NET_WriteProtocolList(packet);
+}
+
+void NET_WriteTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff,
+                         boolean lowres_turn)
+{
+    // Header
+
+    NET_WriteInt8(packet, diff->diff);
+
+    // Write the fields which are enabled:
+
+    if (diff->diff & NET_TICDIFF_FORWARD)
+        NET_WriteInt8(packet, diff->cmd.forwardmove);
+    if (diff->diff & NET_TICDIFF_SIDE)
+        NET_WriteInt8(packet, diff->cmd.sidemove);
+    if (diff->diff & NET_TICDIFF_TURN)
+    {
+        if (lowres_turn)
+        {
+            NET_WriteInt8(packet, diff->cmd.angleturn / 256);
+        }
+        else
+        {
+            NET_WriteInt16(packet, diff->cmd.angleturn);
+        }
+    }
+    if (diff->diff & NET_TICDIFF_BUTTONS)
+        NET_WriteInt8(packet, diff->cmd.buttons);
+    if (diff->diff & NET_TICDIFF_CONSISTANCY)
+        NET_WriteInt8(packet, diff->cmd.consistancy);
+    if (diff->diff & NET_TICDIFF_CHATCHAR)
+        NET_WriteInt8(packet, diff->cmd.chatchar);
+    if (diff->diff & NET_TICDIFF_RAVEN)
+    {
+        NET_WriteInt8(packet, diff->cmd.lookfly);
+        NET_WriteInt8(packet, diff->cmd.arti);
+    }
+    if (diff->diff & NET_TICDIFF_STRIFE)
+    {
+        NET_WriteInt8(packet, diff->cmd.buttons2);
+        NET_WriteInt16(packet, diff->cmd.inventory);
+    }
+}
+
+boolean NET_ReadTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff,
+                           boolean lowres_turn)
+{
+    unsigned int val;
+    signed int sval;
+
+    // Read header
+
+    if (!NET_ReadInt8(packet, &diff->diff))
+        return false;
+    
+    // Read fields
+
+    if (diff->diff & NET_TICDIFF_FORWARD)
+    {
+        if (!NET_ReadSInt8(packet, &sval))
+            return false;
+        diff->cmd.forwardmove = sval;
+    }
+
+    if (diff->diff & NET_TICDIFF_SIDE)
+    {
+        if (!NET_ReadSInt8(packet, &sval))
+            return false;
+        diff->cmd.sidemove = sval;
+    }
+
+    if (diff->diff & NET_TICDIFF_TURN)
+    {
+        if (lowres_turn)
+        {
+            if (!NET_ReadSInt8(packet, &sval))
+                return false;
+            diff->cmd.angleturn = sval * 256;
+        }
+        else
+        {
+            if (!NET_ReadSInt16(packet, &sval))
+                return false;
+            diff->cmd.angleturn = sval;
+        }
+    }
+
+    if (diff->diff & NET_TICDIFF_BUTTONS)
+    {
+        if (!NET_ReadInt8(packet, &val))
+            return false;
+        diff->cmd.buttons = val;
+    }
+
+    if (diff->diff & NET_TICDIFF_CONSISTANCY)
+    {
+        if (!NET_ReadInt8(packet, &val))
+            return false;
+        diff->cmd.consistancy = val;
+    }
+
+    if (diff->diff & NET_TICDIFF_CHATCHAR)
+    {
+        if (!NET_ReadInt8(packet, &val))
+            return false;
+        diff->cmd.chatchar = val;
+    }
+
+    if (diff->diff & NET_TICDIFF_RAVEN)
+    {
+        if (!NET_ReadInt8(packet, &val))
+            return false;
+        diff->cmd.lookfly = val;
+
+        if (!NET_ReadInt8(packet, &val))
+            return false;
+        diff->cmd.arti = val;
+    }
+
+    if (diff->diff & NET_TICDIFF_STRIFE)
+    {
+        if (!NET_ReadInt8(packet, &val))
+            return false;
+        diff->cmd.buttons2 = val;
+
+        if (!NET_ReadInt16(packet, &val))
+            return false;
+        diff->cmd.inventory = val;
+    }
+
+    return true;
+}
+
+void NET_TiccmdDiff(ticcmd_t *tic1, ticcmd_t *tic2, net_ticdiff_t *diff)
+{
+    diff->diff = 0;
+    diff->cmd = *tic2;
+
+    if (tic1->forwardmove != tic2->forwardmove)
+        diff->diff |= NET_TICDIFF_FORWARD;
+    if (tic1->sidemove != tic2->sidemove)
+        diff->diff |= NET_TICDIFF_SIDE;
+    if (tic1->angleturn != tic2->angleturn)
+        diff->diff |= NET_TICDIFF_TURN;
+    if (tic1->buttons != tic2->buttons)
+        diff->diff |= NET_TICDIFF_BUTTONS;
+    if (tic1->consistancy != tic2->consistancy)
+        diff->diff |= NET_TICDIFF_CONSISTANCY;
+    if (tic2->chatchar != 0)
+        diff->diff |= NET_TICDIFF_CHATCHAR;
+
+    // Heretic/Hexen-specific
+
+    if (tic1->lookfly != tic2->lookfly || tic2->arti != 0)
+        diff->diff |= NET_TICDIFF_RAVEN;
+
+    // Strife-specific
+
+    if (tic1->buttons2 != tic2->buttons2 || tic2->inventory != 0)
+        diff->diff |= NET_TICDIFF_STRIFE;
+}
+
+void NET_TiccmdPatch(ticcmd_t *src, net_ticdiff_t *diff, ticcmd_t *dest)
+{
+    memmove(dest, src, sizeof(ticcmd_t));
+
+    // Apply the diff
+
+    if (diff->diff & NET_TICDIFF_FORWARD)
+        dest->forwardmove = diff->cmd.forwardmove;
+    if (diff->diff & NET_TICDIFF_SIDE)
+        dest->sidemove = diff->cmd.sidemove;
+    if (diff->diff & NET_TICDIFF_TURN)
+        dest->angleturn = diff->cmd.angleturn;
+    if (diff->diff & NET_TICDIFF_BUTTONS)
+        dest->buttons = diff->cmd.buttons;
+    if (diff->diff & NET_TICDIFF_CONSISTANCY)
+        dest->consistancy = diff->cmd.consistancy;
+
+    if (diff->diff & NET_TICDIFF_CHATCHAR)
+        dest->chatchar = diff->cmd.chatchar;
+    else
+        dest->chatchar = 0;
+
+    // Heretic/Hexen specific:
+
+    if (diff->diff & NET_TICDIFF_RAVEN)
+    {
+        dest->lookfly = diff->cmd.lookfly;
+        dest->arti = diff->cmd.arti;
+    }
+    else
+    {
+        dest->arti = 0;
+    }
+
+    // Strife-specific:
+
+    if (diff->diff & NET_TICDIFF_STRIFE)
+    {
+        dest->buttons2 = diff->cmd.buttons2;
+        dest->inventory = diff->cmd.inventory;
+    }
+    else
+    {
+        dest->inventory = 0;
+    }
+}
+
+// 
+// net_full_ticcmd_t
+// 
+
+boolean NET_ReadFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn)
+{
+    unsigned int bitfield;
+    int i;
+
+    // Latency
+
+    if (!NET_ReadSInt16(packet, &cmd->latency))
+    {
+        return false;
+    }
+
+    // Regenerate playeringame from the "header" bitfield
+
+    if (!NET_ReadInt8(packet, &bitfield))
+    {
+        return false;
+    }
+          
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        cmd->playeringame[i] = (bitfield & (1 << i)) != 0;
+    }
+        
+    // Read cmds
+
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        if (cmd->playeringame[i])
+        {
+            if (!NET_ReadTiccmdDiff(packet, &cmd->cmds[i], lowres_turn))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+void NET_WriteFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn)
+{
+    unsigned int bitfield;
+    int i;
+
+    // Write the latency
+
+    NET_WriteInt16(packet, cmd->latency);
+
+    // Write "header" byte indicating which players are active
+    // in this ticcmd
+
+    bitfield = 0;
+    
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        if (cmd->playeringame[i])
+        {
+            bitfield |= 1 << i;
+        }
+    }
+    
+    NET_WriteInt8(packet, bitfield);
+
+    // Write player ticcmds
+
+    for (i=0; i<NET_MAXPLAYERS; ++i)
+    {
+        if (cmd->playeringame[i])
+        {
+            NET_WriteTiccmdDiff(packet, &cmd->cmds[i], lowres_turn);
+        }
+    }
+}
+
+void NET_WriteWaitData(net_packet_t *packet, net_waitdata_t *data)
+{
+    int i;
+
+    NET_WriteInt8(packet, data->num_players);
+    NET_WriteInt8(packet, data->num_drones);
+    NET_WriteInt8(packet, data->ready_players);
+    NET_WriteInt8(packet, data->max_players);
+    NET_WriteInt8(packet, data->is_controller);
+    NET_WriteInt8(packet, data->consoleplayer);
+
+    for (i = 0; i < data->num_players && i < NET_MAXPLAYERS; ++i)
+    {
+        NET_WriteString(packet, data->player_names[i]);
+        NET_WriteString(packet, data->player_addrs[i]);
+    }
+
+    NET_WriteSHA1Sum(packet, data->wad_sha1sum);
+    NET_WriteSHA1Sum(packet, data->deh_sha1sum);
+    NET_WriteInt8(packet, data->is_freedoom);
+}
+
+boolean NET_ReadWaitData(net_packet_t *packet, net_waitdata_t *data)
+{
+    int i;
+    char *s;
+
+    if (!NET_ReadInt8(packet, (unsigned int *) &data->num_players)
+     || !NET_ReadInt8(packet, (unsigned int *) &data->num_drones)
+     || !NET_ReadInt8(packet, (unsigned int *) &data->ready_players)
+     || !NET_ReadInt8(packet, (unsigned int *) &data->max_players)
+     || !NET_ReadInt8(packet, (unsigned int *) &data->is_controller)
+     || !NET_ReadSInt8(packet, &data->consoleplayer))
+    {
+        return false;
+    }
+
+    for (i = 0; i < data->num_players && i < NET_MAXPLAYERS; ++i)
+    {
+        s = NET_ReadString(packet);
+
+        if (s == NULL || strlen(s) >= MAXPLAYERNAME)
+        {
+            return false;
+        }
+
+        M_StringCopy(data->player_names[i], s, MAXPLAYERNAME);
+
+        s = NET_ReadString(packet);
+
+        if (s == NULL || strlen(s) >= MAXPLAYERNAME)
+        {
+            return false;
+        }
+
+        M_StringCopy(data->player_addrs[i], s, MAXPLAYERNAME);
+    }
+
+    return NET_ReadSHA1Sum(packet, data->wad_sha1sum)
+        && NET_ReadSHA1Sum(packet, data->deh_sha1sum)
+        && NET_ReadInt8(packet, (unsigned int *) &data->is_freedoom);
+}
+
+static boolean NET_ReadBlob(net_packet_t *packet, uint8_t *buf, size_t len)
+{
+    unsigned int b;
+    int i;
+
+    for (i=0; i<len; ++i)
+    {
+        if (!NET_ReadInt8(packet, &b))
+        {
+            return false;
+        }
+
+        buf[i] = b;
+    }
+
+    return true;
+}
+
+static void NET_WriteBlob(net_packet_t *packet, uint8_t *buf, size_t len)
+{
+    int i;
+
+    for (i=0; i<len; ++i)
+    {
+        NET_WriteInt8(packet, buf[i]);
+    }
+}
+
+boolean NET_ReadSHA1Sum(net_packet_t *packet, sha1_digest_t digest)
+{
+    return NET_ReadBlob(packet, digest, sizeof(sha1_digest_t));
+}
+
+void NET_WriteSHA1Sum(net_packet_t *packet, sha1_digest_t digest)
+{
+    NET_WriteBlob(packet, digest, sizeof(sha1_digest_t));
+}
+
+boolean NET_ReadPRNGSeed(net_packet_t *packet, prng_seed_t seed)
+{
+    return NET_ReadBlob(packet, seed, sizeof(prng_seed_t));
+}
+
+void NET_WritePRNGSeed(net_packet_t *packet, prng_seed_t seed)
+{
+    NET_WriteBlob(packet, seed, sizeof(prng_seed_t));
+}
+
+static net_protocol_t ParseProtocolName(const char *name)
+{
+    int i;
+
+    for (i = 0; i < arrlen(protocol_names); ++i)
+    {
+        if (!strcmp(protocol_names[i].name, name))
+        {
+            return protocol_names[i].protocol;
+        }
+    }
+
+    return NET_PROTOCOL_UNKNOWN;
+}
+
+// NET_ReadProtocol reads a single string-format protocol name from the given
+// packet, returning NET_PROTOCOL_UNKNOWN if the string describes an unknown
+// protocol.
+net_protocol_t NET_ReadProtocol(net_packet_t *packet)
+{
+    const char *name;
+
+    name = NET_ReadString(packet);
+    if (name == NULL)
+    {
+        return NET_PROTOCOL_UNKNOWN;
+    }
+
+    return ParseProtocolName(name);
+}
+
+// NET_WriteProtocol writes a single string-format protocol name to a packet.
+void NET_WriteProtocol(net_packet_t *packet, net_protocol_t protocol)
+{
+    int i;
+
+    for (i = 0; i < arrlen(protocol_names); ++i)
+    {
+        if (protocol_names[i].protocol == protocol)
+        {
+            NET_WriteString(packet, protocol_names[i].name);
+            return;
+        }
+    }
+
+    // If you add an entry to the net_protocol_t enum, a corresponding entry
+    // must be added to the protocol_names list.
+    I_Error("NET_WriteProtocol: protocol %d missing from protocol_names "
+            "list; please add it.", protocol);
+}
+
+// NET_ReadProtocolList reads a list of string-format protocol names from
+// the given packet, returning a single protocol number. The protocol that is
+// returned is the last protocol in the list that is a supported protocol. If
+// no recognized protocols are read, NET_PROTOCOL_UNKNOWN is returned.
+net_protocol_t NET_ReadProtocolList(net_packet_t *packet)
+{
+    net_protocol_t result;
+    unsigned int num_protocols;
+    int i;
+
+    if (!NET_ReadInt8(packet, &num_protocols))
+    {
+        return NET_PROTOCOL_UNKNOWN;
+    }
+
+    result = NET_PROTOCOL_UNKNOWN;
+
+    for (i = 0; i < num_protocols; ++i)
+    {
+        net_protocol_t p;
+        const char *name;
+
+        name = NET_ReadString(packet);
+        if (name == NULL)
+        {
+            return NET_PROTOCOL_UNKNOWN;
+        }
+
+        p = ParseProtocolName(name);
+        if (p != NET_PROTOCOL_UNKNOWN)
+        {
+            result = p;
+        }
+    }
+
+    return result;
+}
+
+// NET_WriteProtocolList writes a list of string-format protocol names into
+// the given packet, all the supported protocols in the net_protocol_t enum.
+// This is slightly different to other functions in this file, in that there
+// is nothing the caller can "choose" to write; the built-in list of all
+// protocols is always sent.
+void NET_WriteProtocolList(net_packet_t *packet)
+{
+    int i;
+
+    NET_WriteInt8(packet, NET_NUM_PROTOCOLS);
+
+    for (i = 0; i < NET_NUM_PROTOCOLS; ++i)
+    {
+        NET_WriteProtocol(packet, i);
+    }
+}
+
diff --git a/games/NXDoom/src/net_structrw.h b/games/NXDoom/src/net_structrw.h
new file mode 100644
index 000000000..68de20dd8
--- /dev/null
+++ b/games/NXDoom/src/net_structrw.h
@@ -0,0 +1,55 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef NET_STRUCTRW_H
+#define NET_STRUCTRW_H
+
+#include "aes_prng.h"
+#include "sha1.h"
+#include "net_defs.h"
+#include "net_packet.h"
+
+void NET_WriteConnectData(net_packet_t *packet, net_connect_data_t *data);
+boolean NET_ReadConnectData(net_packet_t *packet, net_connect_data_t *data);
+
+extern void NET_WriteSettings(net_packet_t *packet, net_gamesettings_t *settings);
+extern boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings);
+
+extern void NET_WriteQueryData(net_packet_t *packet, net_querydata_t *querydata);
+extern boolean NET_ReadQueryData(net_packet_t *packet, net_querydata_t *querydata);
+
+extern void NET_WriteTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff, boolean lowres_turn);
+extern boolean NET_ReadTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff, boolean lowres_turn);
+extern void NET_TiccmdDiff(ticcmd_t *tic1, ticcmd_t *tic2, net_ticdiff_t *diff);
+extern void NET_TiccmdPatch(ticcmd_t *src, net_ticdiff_t *diff, ticcmd_t *dest);
+
+boolean NET_ReadFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn);
+void NET_WriteFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn);
+
+boolean NET_ReadSHA1Sum(net_packet_t *packet, sha1_digest_t digest);
+void NET_WriteSHA1Sum(net_packet_t *packet, sha1_digest_t digest);
+
+void NET_WriteWaitData(net_packet_t *packet, net_waitdata_t *data);
+boolean NET_ReadWaitData(net_packet_t *packet, net_waitdata_t *data);
+
+boolean NET_ReadPRNGSeed(net_packet_t *packet, prng_seed_t seed);
+void NET_WritePRNGSeed(net_packet_t *packet, prng_seed_t seed);
+
+// Protocol list exchange.
+net_protocol_t NET_ReadProtocol(net_packet_t *packet);
+void NET_WriteProtocol(net_packet_t *packet, net_protocol_t protocol);
+net_protocol_t NET_ReadProtocolList(net_packet_t *packet);
+void NET_WriteProtocolList(net_packet_t *packet);
+
+#endif /* #ifndef NET_STRUCTRW_H */
diff --git a/games/NXDoom/src/p_rejectpad.c b/games/NXDoom/src/p_rejectpad.c
new file mode 100644
index 000000000..b336464c5
--- /dev/null
+++ b/games/NXDoom/src/p_rejectpad.c
@@ -0,0 +1,81 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+// Padding of Reject Lump
+//
+
+
+#include <stdio.h>
+#include <string.h>
+
+#include "m_argv.h"
+#include "p_rejectpad.h"
+
+
+// Pad the REJECT lump with extra data when the lump is too small,
+// to simulate a REJECT buffer overflow in Vanilla Doom.
+
+void PadRejectArray(byte *array, unsigned int len, int totallines)
+{
+    unsigned int i;
+    unsigned int byte_num;
+    byte *dest;
+    unsigned int padvalue;
+
+    // Values to pad the REJECT array with:
+
+    unsigned int rejectpad[4] =
+    {
+        0,                                    // Size
+        0,                                    // Part of z_zone block header
+        50,                                   // PU_LEVEL
+        0x1d4a11                              // DOOM_CONST_ZONEID
+    };
+
+    rejectpad[0] = ((totallines * 4 + 3) & ~3) + 24;
+
+    // Copy values from rejectpad into the destination array.
+
+    dest = array;
+
+    for (i=0; i<len && i<sizeof(rejectpad); ++i)
+    {
+        byte_num = i % 4;
+        *dest = (rejectpad[i / 4] >> (byte_num * 8)) & 0xff;
+        ++dest;
+    }
+
+    // We only have a limited pad size.  Print a warning if the
+    // REJECT lump is too small.
+
+    if (len > sizeof(rejectpad))
+    {
+        fprintf(stderr, "PadRejectArray: REJECT lump too short to pad! (%u > %i)\n",
+                        len, (int) sizeof(rejectpad));
+
+        // Pad remaining space with 0 (or 0xff, if specified on command line).
+
+        if (M_CheckParm("-reject_pad_with_ff"))
+        {
+            padvalue = 0xff;
+        }
+        else
+        {
+            padvalue = 0x00;
+        }
+
+        memset(array + sizeof(rejectpad), padvalue, len - sizeof(rejectpad));
+    }
+}
diff --git a/games/NXDoom/src/p_rejectpad.h b/games/NXDoom/src/p_rejectpad.h
new file mode 100644
index 000000000..78ab84070
--- /dev/null
+++ b/games/NXDoom/src/p_rejectpad.h
@@ -0,0 +1,28 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+// Padding of Reject Lump
+//    
+
+
+#ifndef __P_REJECTPAD__
+#define __P_REJECTPAD__
+
+#include "doomtype.h"
+
+// Padding of Reject Lump
+void PadRejectArray(byte *array, unsigned int len, int totallines);
+
+#endif
diff --git a/games/NXDoom/src/setup-res.rc.in b/games/NXDoom/src/setup-res.rc.in
new file mode 100644
index 000000000..2be914f96
--- /dev/null
+++ b/games/NXDoom/src/setup-res.rc.in
@@ -0,0 +1,28 @@
+1 ICON "@top_srcdir@/data/setup.ico"
+
+1 24 MOVEABLE PURE "@top_builddir@/src/setup/setup-manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+  BLOCK "040904E4"
+  {
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+   VALUE "FileDescription", "@PACKAGE_STRING@ Setup"
+   VALUE "InternalName", "@PACKAGE_TARNAME@"
+   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+   VALUE "LegalCopyright", "GNU General Public License"
+   VALUE "ProductName", "@PACKAGE_NAME@ Setup"
+   VALUE "ProductVersion", "@PACKAGE_VERSION@"
+  }
+ }
+ BLOCK "VarFileInfo"
+ {
+  VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/games/NXDoom/src/setup/.gitignore b/games/NXDoom/src/setup/.gitignore
new file mode 100644
index 000000000..f41d11c73
--- /dev/null
+++ b/games/NXDoom/src/setup/.gitignore
@@ -0,0 +1,7 @@
+Makefile.in
+Makefile
+.deps
+setup-manifest.xml
+*.rc
+tags
+TAGS
diff --git a/games/NXDoom/src/setup/CMakeLists.txt b/games/NXDoom/src/setup/CMakeLists.txt
new file mode 100644
index 000000000..c25af6599
--- /dev/null
+++ b/games/NXDoom/src/setup/CMakeLists.txt
@@ -0,0 +1,32 @@
+add_library(setup STATIC
+            compatibility.c     compatibility.h
+            display.c           display.h
+            joystick.c          joystick.h
+            keyboard.c          keyboard.h
+            mainmenu.c
+            mode.c              mode.h
+            mouse.c             mouse.h
+            multiplayer.c       multiplayer.h
+            sound.c             sound.h
+            execute.c           execute.h
+            txt_joyaxis.c       txt_joyaxis.h
+            txt_joybinput.c     txt_joybinput.h
+            txt_keyinput.c      txt_keyinput.h
+            txt_mouseinput.c    txt_mouseinput.h)
+
+target_include_directories(setup PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
+
+if (DEFINED EMSCRIPTEN)
+    set(SDL_FLAGS "-s USE_SDL=2")
+    if(ENABLE_SDL2_MIXER)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
+    endif()
+else()
+    set(SDL_LINK_LIBS, "SDL2::SDL2")
+    if(ENABLE_SDL2_MIXER)
+        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
+    endif()
+endif()
+target_link_libraries(setup textscreen ${SDL_LINK_LIBS})
+set_target_properties(setup PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+set_target_properties(setup PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/setup/Makefile.am b/games/NXDoom/src/setup/Makefile.am
new file mode 100644
index 000000000..493b0b472
--- /dev/null
+++ b/games/NXDoom/src/setup/Makefile.am
@@ -0,0 +1,42 @@
+
+AM_CFLAGS = @SDL_CFLAGS@                                           \
+            @SDLMIXER_CFLAGS@                                      \
+            -I$(top_srcdir)/textscreen -I$(top_srcdir)/src
+
+noinst_LIBRARIES = libsetup.a
+
+libsetup_a_SOURCES =                            \
+    compatibility.c   compatibility.h           \
+    display.c         display.h                 \
+    joystick.c        joystick.h                \
+    keyboard.c        keyboard.h                \
+    mainmenu.c                                  \
+    mode.c            mode.h                    \
+    mouse.c           mouse.h                   \
+    multiplayer.c     multiplayer.h             \
+    sound.c           sound.h                   \
+    execute.c         execute.h                 \
+    txt_joyaxis.c     txt_joyaxis.h             \
+    txt_joybinput.c   txt_joybinput.h           \
+    txt_keyinput.c    txt_keyinput.h            \
+    txt_mouseinput.c  txt_mouseinput.h
+
+EXTRA_DIST=                                     \
+    CMakeLists.txt                              \
+    setup_icon.c
+
+appdir = $(prefix)/share/applications
+app_DATA = @PACKAGE_RDNS@.Setup.desktop
+
+CLEANFILES = $(app_DATA)
+
+@PACKAGE_RDNS@.Setup.desktop : Setup.desktop
+	cp Setup.desktop $@
+
+if HAVE_ICONS
+
+setup_icon.c : $(top_builddir)/data/setup.png
+	$(top_builddir)/data/convert-icon $(top_builddir)/data/setup.png $@
+
+endif
+
diff --git a/games/NXDoom/src/setup/Setup.desktop.in b/games/NXDoom/src/setup/Setup.desktop.in
new file mode 100644
index 000000000..2a5e71fa1
--- /dev/null
+++ b/games/NXDoom/src/setup/Setup.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=@PACKAGE_SHORTNAME@ Setup
+Exec=@PROGRAM_PREFIX@setup
+Icon=@PROGRAM_PREFIX@setup
+Type=Application
+Comment=Setup tool for @PACKAGE_SHORTNAME@
+Categories=Settings;
+Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla;
diff --git a/games/NXDoom/src/setup/compatibility.c b/games/NXDoom/src/setup/compatibility.c
new file mode 100644
index 000000000..b96228f61
--- /dev/null
+++ b/games/NXDoom/src/setup/compatibility.c
@@ -0,0 +1,51 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// Sound control menu
+
+#include <stdlib.h>
+
+#include "m_config.h"
+#include "textscreen.h"
+#include "mode.h"
+
+#include "compatibility.h"
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-compat"
+
+int vanilla_savegame_limit = 1;
+int vanilla_demo_limit = 1;
+
+void CompatibilitySettings(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+
+    window = TXT_NewWindow("Compatibility");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_AddWidgets(window,
+                   TXT_NewCheckBox("Vanilla savegame limit",
+                                   &vanilla_savegame_limit),
+                   TXT_NewCheckBox("Vanilla demo limit",
+                                   &vanilla_demo_limit),
+                   NULL);
+}
+
+void BindCompatibilityVariables(void)
+{
+    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
+    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
+}
+
diff --git a/games/NXDoom/src/setup/compatibility.h b/games/NXDoom/src/setup/compatibility.h
new file mode 100644
index 000000000..39a5fc8f7
--- /dev/null
+++ b/games/NXDoom/src/setup/compatibility.h
@@ -0,0 +1,24 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_COMPATIBILITY_H
+#define SETUP_COMPATIBILITY_H
+
+void CompatibilitySettings(void *widget, void *user_data);
+void BindCompatibilityVariables(void);
+
+extern int vanilla_savegame_limit;
+extern int vanilla_demo_limit;
+
+#endif /* #ifndef SETUP_COMPATIBILITY_H */
diff --git a/games/NXDoom/src/setup/display.c b/games/NXDoom/src/setup/display.c
new file mode 100644
index 000000000..0f89a0931
--- /dev/null
+++ b/games/NXDoom/src/setup/display.c
@@ -0,0 +1,289 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#include "textscreen.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "mode.h"
+
+#include "display.h"
+#include "config.h"
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-display"
+
+
+typedef struct
+{
+    int w, h;
+} window_size_t;
+
+// List of aspect ratio-uncorrected window sizes:
+static window_size_t window_sizes_unscaled[] =
+{
+    { 320,  200 },
+    { 640,  400 },
+    { 960,  600 },
+    { 1280, 800 },
+    { 1600, 1000 },
+    { 0, 0},
+};
+
+// List of aspect ratio-corrected window sizes:
+static window_size_t window_sizes_scaled[] =
+{
+    { 320,  240 },
+    { 512,  400 },
+    { 640,  480 },
+    { 800,  600 },
+    { 960,  720 },
+    { 1024, 800 },
+    { 1280, 960 },
+    { 1600, 1200 },
+    { 1920, 1440 },
+    { 0, 0},
+};
+
+static char *video_driver = "";
+static char *window_position = "";
+static int video_display = 0;
+static int aspect_ratio_correct = 1;
+static int integer_scaling = 0;
+static int smooth_pixel_scaling = 1;
+static int vga_porch_flash = 0;
+static int force_software_renderer = 0;
+static int fullscreen = 1;
+static int fullscreen_width = 0, fullscreen_height = 0;
+static int window_width = 800, window_height = 600;
+static int startup_delay = 1000;
+static int max_scaling_buffer_pixels = 16000000;
+static int usegamma = 0;
+
+int graphical_startup = 1;
+int show_endoom = 1;
+int show_diskicon = 1;
+int png_screenshots = 0;
+
+static int system_video_env_set;
+
+// Set the SDL_VIDEODRIVER environment variable
+
+void SetDisplayDriver(void)
+{
+    static int first_time = 1;
+
+    if (first_time)
+    {
+        system_video_env_set = getenv("SDL_VIDEODRIVER") != NULL;
+
+        first_time = 0;
+    }
+
+    // Don't override the command line environment, if it has been set.
+
+    if (system_video_env_set)
+    {
+        return;
+    }
+
+    // Use the value from the configuration file, if it has been set.
+
+    if (strcmp(video_driver, "") != 0)
+    {
+        char *env_string;
+
+        env_string = M_StringJoin("SDL_VIDEODRIVER=", video_driver, NULL);
+        putenv(env_string);
+        free(env_string);
+    }
+}
+
+static void WindowSizeSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(size))
+{
+    TXT_CAST_ARG(window_size_t, size);
+
+    window_width = size->w;
+    window_height = size->h;
+}
+
+static txt_radiobutton_t *SizeSelectButton(window_size_t *size)
+{
+    char buf[15];
+    txt_radiobutton_t *result;
+
+    M_snprintf(buf, sizeof(buf), "%ix%i", size->w, size->h);
+    result = TXT_NewRadioButton(buf, &window_width, size->w);
+    TXT_SignalConnect(result, "selected", WindowSizeSelected, size);
+
+    return result;
+}
+
+static void GenerateSizesTable(TXT_UNCAST_ARG(widget),
+                               TXT_UNCAST_ARG(sizes_table))
+{
+    TXT_CAST_ARG(txt_table_t, sizes_table);
+    window_size_t *sizes;
+    boolean have_size;
+    int i;
+
+    // Pick which window sizes list to use
+    if (aspect_ratio_correct == 1)
+    {
+        sizes = window_sizes_scaled;
+    }
+    else
+    {
+        sizes = window_sizes_unscaled;
+    }
+
+    // Build the table
+    TXT_ClearTable(sizes_table);
+    TXT_SetColumnWidths(sizes_table, 14, 14, 14);
+
+    TXT_AddWidget(sizes_table, TXT_NewSeparator("Window size"));
+
+    have_size = false;
+
+    for (i = 0; sizes[i].w != 0; ++i)
+    {
+        TXT_AddWidget(sizes_table, SizeSelectButton(&sizes[i]));
+        have_size = have_size || window_width == sizes[i].w;
+    }
+
+    // Windows can be any arbitrary size. We key off the width of the
+    // window in pixels. If the current size is not in the list of
+    // standard (integer multiply) sizes, create a special button to
+    // mean "the current window size".
+    if (!have_size)
+    {
+        static window_size_t current_size;
+        current_size.w = window_width;
+        current_size.h = window_height;
+        TXT_AddWidget(sizes_table, SizeSelectButton(&current_size));
+    }
+}
+
+static void AdvancedDisplayConfig(TXT_UNCAST_ARG(widget),
+                                  TXT_UNCAST_ARG(sizes_table))
+{
+    TXT_CAST_ARG(txt_table_t, sizes_table);
+    txt_window_t *window;
+    txt_checkbox_t *ar_checkbox;
+
+    window = TXT_NewWindow("Advanced display options");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_SetColumnWidths(window, 40);
+
+    TXT_AddWidgets(window,
+        ar_checkbox = TXT_NewCheckBox("Force correct aspect ratio",
+                                      &aspect_ratio_correct),
+        TXT_If(gamemission == heretic || gamemission == hexen
+            || gamemission == strife,
+            TXT_NewCheckBox("Graphical startup", &graphical_startup)),
+        TXT_If(gamemission == doom || gamemission == heretic
+            || gamemission == strife,
+            TXT_NewCheckBox("Show ENDOOM screen on exit",
+                            &show_endoom)),
+#ifdef HAVE_LIBPNG
+        TXT_NewCheckBox("Save screenshots in PNG format",
+                        &png_screenshots),
+#endif
+        TXT_NewCheckBox("Smooth pixel scaling", &smooth_pixel_scaling),
+        NULL);
+
+    TXT_SignalConnect(ar_checkbox, "changed", GenerateSizesTable, sizes_table);
+}
+
+void ConfigDisplay(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+    txt_table_t *sizes_table;
+    txt_window_action_t *advanced_button;
+
+    // Open the window
+    window = TXT_NewWindow("Display Configuration");
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    // Build window:
+    TXT_AddWidgets(window,
+        TXT_NewCheckBox("Full screen", &fullscreen),
+        TXT_NewConditional(&fullscreen, 0,
+            sizes_table = TXT_NewTable(3)),
+        NULL);
+
+    TXT_SetColumnWidths(window, 42);
+
+    // The window is set at a fixed vertical position.  This keeps
+    // the top of the window stationary when switching between
+    // fullscreen and windowed mode (which causes the window's
+    // height to change).
+    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
+                                  TXT_SCREEN_W / 2, 6);
+
+    GenerateSizesTable(NULL, sizes_table);
+
+    // Button to open "advanced" window.
+    // Need to pass a pointer to the window sizes table, as some of the options
+    // in there trigger a rebuild of it.
+    advanced_button = TXT_NewWindowAction('a', "Advanced");
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, advanced_button);
+    TXT_SignalConnect(advanced_button, "pressed",
+                      AdvancedDisplayConfig, sizes_table);
+}
+
+void BindDisplayVariables(void)
+{
+    M_BindIntVariable("video_display",             &video_display);
+    M_BindIntVariable("aspect_ratio_correct",      &aspect_ratio_correct);
+    M_BindIntVariable("integer_scaling",           &integer_scaling);
+    M_BindIntVariable("smooth_pixel_scaling",      &smooth_pixel_scaling);
+    M_BindIntVariable("fullscreen",                &fullscreen);
+    M_BindIntVariable("fullscreen_width",          &fullscreen_width);
+    M_BindIntVariable("fullscreen_height",         &fullscreen_height);
+    M_BindIntVariable("window_width",              &window_width);
+    M_BindIntVariable("window_height",             &window_height);
+    M_BindIntVariable("startup_delay",             &startup_delay);
+    M_BindStringVariable("video_driver",           &video_driver);
+    M_BindStringVariable("window_position",        &window_position);
+    M_BindIntVariable("usegamma",                  &usegamma);
+    M_BindIntVariable("png_screenshots",           &png_screenshots);
+    M_BindIntVariable("vga_porch_flash",           &vga_porch_flash);
+    M_BindIntVariable("force_software_renderer",   &force_software_renderer);
+    M_BindIntVariable("max_scaling_buffer_pixels", &max_scaling_buffer_pixels);
+
+    if (gamemission == doom || gamemission == heretic
+     || gamemission == strife)
+    {
+        M_BindIntVariable("show_endoom",               &show_endoom);
+    }
+
+    if (gamemission == doom || gamemission == strife)
+    {
+        M_BindIntVariable("show_diskicon",             &show_diskicon);
+    }
+
+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
+    {
+        M_BindIntVariable("graphical_startup",        &graphical_startup);
+    }
+}
\ No newline at end of file
diff --git a/games/NXDoom/src/setup/display.h b/games/NXDoom/src/setup/display.h
new file mode 100644
index 000000000..0c20c51a2
--- /dev/null
+++ b/games/NXDoom/src/setup/display.h
@@ -0,0 +1,26 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_DISPLAY_H 
+#define SETUP_DISPLAY_H
+
+void ConfigDisplay(void *widget, void *user_data);
+void SetDisplayDriver(void);
+void BindDisplayVariables(void);
+
+extern int show_endoom;
+extern int graphical_startup;
+extern int png_screenshots;
+
+#endif /* #ifndef SETUP_DISPLAY_H */
diff --git a/games/NXDoom/src/setup/execute.c b/games/NXDoom/src/setup/execute.c
new file mode 100644
index 000000000..2dc0ba85d
--- /dev/null
+++ b/games/NXDoom/src/setup/execute.c
@@ -0,0 +1,429 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// Code for invoking Doom
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <sys/types.h>
+
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <process.h>
+#include <shellapi.h>
+
+#else
+
+#include <sys/wait.h>
+#include <unistd.h>
+
+#endif
+
+#include "textscreen.h"
+
+#include "config.h"
+#include "execute.h"
+#include "mode.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+
+struct execute_context_s
+{
+    char *response_file;
+    FILE *stream;
+};
+
+// Returns the path to a temporary file of the given name, stored
+// inside the system temporary directory.
+
+static char *TempFile(const char *s)
+{
+    const char *tempdir;
+
+#ifdef _WIN32
+    // Check the TEMP environment variable to find the location.
+
+    tempdir = M_getenv("TEMP");
+
+    if (tempdir == NULL)
+    {
+        tempdir = ".";
+    }
+#else
+    // Check the $TMPDIR environment variable to find the location.
+
+    tempdir = getenv("TMPDIR");
+
+    if (tempdir == NULL)
+    {
+        tempdir = "/tmp";
+    }
+#endif
+
+    return M_StringJoin(tempdir, DIR_SEPARATOR_S, s, NULL);
+}
+
+static int ArgumentNeedsEscape(const char *arg)
+{
+    const char *p;
+
+    for (p = arg; *p != '\0'; ++p)
+    {
+        if (isspace(*p))
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+// Arguments passed to the setup tool should be passed through to the
+// game when launching a game.  Calling this adds all arguments from
+// myargv to the output context.
+
+void PassThroughArguments(execute_context_t *context)
+{
+    int i;
+
+    for (i = 1; i < myargc; ++i)
+    {
+        if (ArgumentNeedsEscape(myargv[i]))
+        {
+            AddCmdLineParameter(context, "\"%s\"", myargv[i]);
+        }
+        else
+        {
+            AddCmdLineParameter(context, "%s", myargv[i]);
+        }
+    }
+}
+
+execute_context_t *NewExecuteContext(void)
+{
+    execute_context_t *result;
+
+    result = malloc(sizeof(execute_context_t));
+    
+    result->response_file = TempFile("chocolat.rsp");
+    result->stream = M_fopen(result->response_file, "w");
+
+    if (result->stream == NULL)
+    {
+        fprintf(stderr, "Error opening response file\n");
+        exit(-1);
+    }
+    
+    return result;
+}
+
+void AddCmdLineParameter(execute_context_t *context, const char *s, ...)
+{
+    va_list args;
+
+    va_start(args, s);
+
+    vfprintf(context->stream, s, args);
+    fprintf(context->stream, "\n");
+
+    va_end(args);
+}
+
+#if defined(_WIN32)
+
+boolean OpenFolder(const char *path)
+{
+    // "If the function succeeds, it returns a value greater than 32."
+    return (int)ShellExecute(NULL, "open", path, NULL, NULL, SW_SHOWDEFAULT) > 32;
+}
+
+// Wait for the specified process to exit.  Returns the exit code.
+static unsigned int WaitForProcessExit(HANDLE subprocess)
+{
+    DWORD exit_code;
+
+    for (;;)
+    {
+        WaitForSingleObject(subprocess, INFINITE);
+
+        if (!GetExitCodeProcess(subprocess, &exit_code))
+        {
+            return -1;
+        }
+
+        if (exit_code != STILL_ACTIVE)
+        {
+            return exit_code;
+        }
+    }
+}
+
+static void ConcatWCString(wchar_t *buf, const char *value)
+{
+    MultiByteToWideChar(CP_OEMCP, 0,
+                        value, strlen(value) + 1,
+                        buf + wcslen(buf), strlen(value) + 1);
+}
+
+// Build the command line string, a wide character string of the form:
+//
+// "program" "arg"
+
+static wchar_t *BuildCommandLine(const char *program, const char *arg)
+{
+    wchar_t exe_path[MAX_PATH];
+    wchar_t *result;
+    wchar_t *sep;
+
+    // Get the path to this .exe file.
+
+    GetModuleFileNameW(NULL, exe_path, MAX_PATH);
+
+    // Allocate buffer to contain result string.
+
+    result = calloc(wcslen(exe_path) + strlen(program) + strlen(arg) + 6,
+                    sizeof(wchar_t));
+
+    wcscpy(result, L"\"");
+
+    // Copy the path part of the filename (including ending \)
+    // into the result buffer:
+
+    sep = wcsrchr(exe_path, DIR_SEPARATOR);
+
+    if (sep != NULL)
+    {
+        wcsncpy(result + 1, exe_path, sep - exe_path + 1);
+        result[sep - exe_path + 2] = '\0';
+    }
+
+    // Concatenate the name of the program:
+
+    ConcatWCString(result, program);
+
+    // End of program name, start of argument:
+
+    wcscat(result, L"\" \"");
+
+    ConcatWCString(result, arg);
+
+    wcscat(result, L"\"");
+
+    return result;
+}
+
+static int ExecuteCommand(const char *program, const char *arg)
+{
+    STARTUPINFOW startup_info;
+    PROCESS_INFORMATION proc_info;
+    wchar_t *command;
+    int result = 0;
+
+    command = BuildCommandLine(program, arg);
+
+    // Invoke the program:
+
+    memset(&proc_info, 0, sizeof(proc_info));
+    memset(&startup_info, 0, sizeof(startup_info));
+    startup_info.cb = sizeof(startup_info);
+
+    if (!CreateProcessW(NULL, command,
+                        NULL, NULL, FALSE, 0, NULL, NULL,
+                        &startup_info, &proc_info))
+    {
+        result = -1;
+    }
+    else
+    {
+        // Wait for the process to finish, and save the exit code.
+
+        result = WaitForProcessExit(proc_info.hProcess);
+
+        CloseHandle(proc_info.hProcess);
+        CloseHandle(proc_info.hThread);
+    }
+
+    free(command);
+
+    return result;
+}
+
+#else
+
+boolean OpenFolder(const char *path)
+{
+    char *cmd;
+    int result;
+
+#if defined(__MACOSX__)
+    cmd = M_StringJoin("open \"", path, "\"", NULL);
+#else
+    cmd = M_StringJoin("xdg-open \"", path, "\"", NULL);
+#endif
+    result = system(cmd);
+    free(cmd);
+
+    return result == 0;
+}
+
+// Given the specified program name, get the full path to the program,
+// assuming that it is in the same directory as this program is.
+
+static char *GetFullExePath(const char *program)
+{
+    char *result;
+    char *sep;
+    size_t result_len;
+    unsigned int path_len;
+
+    sep = strrchr(myargv[0], DIR_SEPARATOR);
+
+    if (sep == NULL)
+    {
+        result = M_StringDuplicate(program);
+    }
+    else
+    {
+        path_len = sep - myargv[0] + 1;
+        result_len = strlen(program) + path_len + 1;
+        result = malloc(result_len);
+
+        M_StringCopy(result, myargv[0], result_len);
+        result[path_len] = '\0';
+
+        M_StringConcat(result, program, result_len);
+    }
+
+    return result;
+}
+
+static int ExecuteCommand(const char *program, const char *arg)
+{
+    pid_t childpid;
+    int result;
+    const char *argv[3];
+
+    childpid = fork();
+
+    if (childpid == 0) 
+    {
+        // This is the child.  Execute the command.
+
+        argv[0] = GetFullExePath(program);
+        argv[1] = arg;
+        argv[2] = NULL;
+
+        execvp(argv[0], (char **) argv);
+
+        exit(0x80);
+    }
+    else
+    {
+        // This is the parent.  Wait for the child to finish, and return
+        // the status code.
+
+        waitpid(childpid, &result, 0);
+
+        if (WIFEXITED(result) && WEXITSTATUS(result) != 0x80) 
+        {
+            return WEXITSTATUS(result);
+        }
+        else
+        {
+            return -1;
+        }
+    }
+}
+
+#endif
+
+int ExecuteDoom(execute_context_t *context)
+{
+    char *response_file_arg;
+    int result;
+    
+    fclose(context->stream);
+
+    // Build the command line
+
+    response_file_arg = M_StringJoin("@", context->response_file, NULL);
+
+    // Run Doom
+
+    result = ExecuteCommand(GetExecutableName(), response_file_arg);
+
+    free(response_file_arg);
+
+    // Destroy context
+    M_remove(context->response_file);
+    free(context->response_file);
+    free(context);
+
+    return result;
+}
+
+static void TestCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(data))
+{
+    execute_context_t *exec;
+    char *main_cfg;
+    char *extra_cfg;
+    txt_window_t *testwindow;
+
+    testwindow = TXT_MessageBox("Starting Doom",
+                                "Starting Doom to test the\n"
+                                "settings.  Please wait.");
+    TXT_DrawDesktop();
+
+    // Save temporary configuration files with the current configuration
+
+    main_cfg = TempFile("tmp.cfg");
+    extra_cfg = TempFile("extratmp.cfg");
+
+    M_SaveDefaultsAlternate(main_cfg, extra_cfg);
+
+    // Run with the -testcontrols parameter
+
+    exec = NewExecuteContext();
+    AddCmdLineParameter(exec, "-testcontrols");
+    AddCmdLineParameter(exec, "-config \"%s\"", main_cfg);
+    AddCmdLineParameter(exec, "-extraconfig \"%s\"", extra_cfg);
+    ExecuteDoom(exec);
+
+    TXT_CloseWindow(testwindow);
+
+    // Delete the temporary config files
+
+    M_remove(main_cfg);
+    M_remove(extra_cfg);
+    free(main_cfg);
+    free(extra_cfg);
+}
+
+txt_window_action_t *TestConfigAction(void)
+{
+    txt_window_action_t *test_action;
+    
+    test_action = TXT_NewWindowAction('t', "Test");
+    TXT_SignalConnect(test_action, "pressed", TestCallback, NULL);
+
+    return test_action;
+}
+
diff --git a/games/NXDoom/src/setup/execute.h b/games/NXDoom/src/setup/execute.h
new file mode 100644
index 000000000..21530f14d
--- /dev/null
+++ b/games/NXDoom/src/setup/execute.h
@@ -0,0 +1,40 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TESTCONFIG_H
+#define TESTCONFIG_H
+
+#include "doomtype.h"
+#include "textscreen.h"
+
+typedef struct execute_context_s execute_context_t;
+
+#define IWAD_DOOM2    (1 << 0)       /* doom2.wad */
+#define IWAD_PLUTONIA (1 << 1)       /* plutonia.wad */
+#define IWAD_TNT      (1 << 2)       /* tnt.wad */
+#define IWAD_DOOM     (1 << 3)       /* doom.wad */
+#define IWAD_DOOM1    (1 << 4)       /* doom1.wad */
+#define IWAD_CHEX     (1 << 5)       /* chex.wad */
+
+execute_context_t *NewExecuteContext(void);
+void AddCmdLineParameter(execute_context_t *context, const char *s, ...) PRINTF_ATTR(2, 3);
+void PassThroughArguments(execute_context_t *context);
+int ExecuteDoom(execute_context_t *context);
+int FindInstalledIWADs(void);
+boolean OpenFolder(const char *path);
+
+txt_window_action_t *TestConfigAction(void);
+
+#endif /* #ifndef TESTCONFIG_H */
+
diff --git a/games/NXDoom/src/setup/joystick.c b/games/NXDoom/src/setup/joystick.c
new file mode 100644
index 000000000..3a2b5a908
--- /dev/null
+++ b/games/NXDoom/src/setup/joystick.c
@@ -0,0 +1,1365 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "i_joystick.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "textscreen.h"
+
+#include "execute.h"
+#include "joystick.h"
+#include "mode.h"
+#include "txt_joyaxis.h"
+#include "txt_joybinput.h"
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-gamepad"
+
+typedef struct
+{
+    const char *name;  // Config file name
+    int value;
+} joystick_config_t;
+
+typedef struct
+{
+    const char *name;
+    int axes, buttons, hats;
+    const joystick_config_t *configs;
+} known_joystick_t;
+
+// SDL joystick successfully initialized?
+
+static int joystick_initted = 0;
+
+// Joystick enable/disable
+
+static int usejoystick = 0;
+
+// GUID and index of joystick to use.
+
+char *joystick_guid = "";
+int joystick_index = -1;
+
+// Calibration button. This is the button the user pressed at the
+// start of the calibration sequence. They *must* press this button
+// for each subsequent sequence.
+
+static int calibrate_button = -1;
+
+// Which joystick axis to use for horizontal movement, and whether to
+// invert the direction:
+
+static int joystick_x_axis = 0;
+static int joystick_x_invert = 0;
+
+// Which joystick axis to use for vertical movement, and whether to
+// invert the direction:
+
+static int joystick_y_axis = 1;
+static int joystick_y_invert = 0;
+
+// Strafe axis.
+
+static int joystick_strafe_axis = -1;
+static int joystick_strafe_invert = 0;
+
+// Look axis.
+
+static int joystick_look_axis = -1;
+static int joystick_look_invert = 0;
+
+// Configurable dead zone for each axis, specified as a percentage of the axis
+// max value.
+static int joystick_x_dead_zone = 33;
+static int joystick_y_dead_zone = 33;
+static int joystick_strafe_dead_zone = 33;
+static int joystick_look_dead_zone = 33;
+
+int use_analog = 0;
+
+int joystick_turn_sensitivity = 10;
+int joystick_move_sensitivity = 10;
+int joystick_look_sensitivity = 10;
+
+// Virtual to physical mapping.
+int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS] = {
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
+};
+
+static txt_button_t *joystick_button;
+static txt_joystick_axis_t *x_axis_widget;
+static txt_joystick_axis_t *y_axis_widget;
+
+//
+// Calibration
+//
+
+static txt_window_t *calibration_window;
+static SDL_Joystick **all_joysticks = NULL;
+static int all_joysticks_len = 0;
+
+// Known controllers.
+// There are lots of game controllers on the market. Try to configure
+// them in a consistent way:
+//
+// * Use the D-pad rather than an analog stick. left/right turns the
+//   player, up/down moves forward/backward - ie. a "traditional"
+//   layout like Vanilla Doom rather than something more elaborate.
+// * No strafe axis.
+// * Fire and run keys together, on the main right-side buttons,
+//   ideally arranged so both can be controlled/covered simultaneously
+//   with the thumb.
+// * Jump/use keys in the same cluster if possible.
+// * Strafe left/right configured to map to shoulder buttons if they
+//   are present. No "strafe on" key unless shoulder buttons not present.
+// * If a second set of shoulder buttons are also present, these map
+//   to prev weapon/next weapon.
+// * Menu button mapped to start button.
+//
+// With the common right-side button arrangement that looks like this,
+// which is similar to the Vanilla default configuration when using
+// a Gravis Gamepad:
+//
+//    B        A = Fire
+//  A   D      B = Jump
+//    C        C = Speed
+//             D = Use
+
+// Always loaded before others, to get a known starting configuration.
+static const joystick_config_t empty_defaults[] =
+{
+    {"joystick_x_axis",            -1},
+    {"joystick_x_invert",          0},
+    {"joystick_y_axis",            -1},
+    {"joystick_y_invert",          0},
+    {"joystick_strafe_axis",       -1},
+    {"joystick_strafe_invert",     0},
+    {"joystick_look_axis",         -1},
+    {"joystick_look_invert",       0},
+    {"joyb_fire",                  -1},
+    {"joyb_use",                   -1},
+    {"joyb_strafe",                -1},
+    {"joyb_speed",                 -1},
+    {"joyb_strafeleft",            -1},
+    {"joyb_straferight",           -1},
+    {"joyb_prevweapon",            -1},
+    {"joyb_nextweapon",            -1},
+    {"joyb_jump",                  -1},
+    {"joyb_menu_activate",         -1},
+    {"joyb_toggle_automap",        -1},
+    {"joyb_useartifact",           -1},
+    {"joyb_invleft",               -1},
+    {"joyb_invright",              -1},
+    {"joyb_flyup",                 -1},
+    {"joyb_flydown",               -1},
+    {"joyb_flycenter",             -1},
+    {"joystick_physical_button0",  0},
+    {"joystick_physical_button1",  1},
+    {"joystick_physical_button2",  2},
+    {"joystick_physical_button3",  3},
+    {"joystick_physical_button4",  4},
+    {"joystick_physical_button5",  5},
+    {"joystick_physical_button6",  6},
+    {"joystick_physical_button7",  7},
+    {"joystick_physical_button8",  8},
+    {"joystick_physical_button9",  9},
+    {"joystick_physical_button10",  10},
+    {"joystick_physical_button11",  11},
+    {"joystick_physical_button12",  12},
+    {"joystick_physical_button13",  13},
+    {"joystick_physical_button14",  14},
+    {"joystick_physical_button15",  15},
+    {"joystick_physical_button16",  16},
+    {NULL, 0},
+};
+
+static const joystick_config_t ps3_controller[] =
+{
+    {"joystick_x_axis",        CREATE_BUTTON_AXIS(7, 5)},
+    {"joystick_y_axis",        CREATE_BUTTON_AXIS(4, 6)},
+    {"joyb_fire",              15},  // Square
+    {"joyb_speed",             14},  // X
+    {"joyb_use",               13},  // Circle
+    {"joyb_jump",              12},  // Triangle
+    {"joyb_strafeleft",        8},   // Bottom shoulder buttons
+    {"joyb_straferight",       9},
+    {"joyb_prevweapon",        10},  // Top shoulder buttons
+    {"joyb_nextweapon",        11},
+    {"joyb_menu_activate",     3},   // Start
+    {NULL, 0},
+};
+
+// Playstation 4 Dual Shock 4 (DS4)
+static const joystick_config_t ps4_ds4_controller[] =
+{
+    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
+    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
+    {"joyb_fire",              0},  // Square
+    {"joyb_speed",             1},  // X
+    {"joyb_use",               2},  // Circle
+    {"joyb_jump",              3},  // Triangle
+    {"joyb_strafeleft",        6},  // Bottom shoulder buttons
+    {"joyb_straferight",       7},
+    {"joyb_prevweapon",        4},  // Top shoulder buttons
+    {"joyb_nextweapon",        5},
+    {"joyb_menu_activate",     12}, // Playstation logo button
+};
+
+static const joystick_config_t airflo_controller[] =
+{
+    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
+    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
+    {"joyb_fire",              2},  // "3"
+    {"joyb_speed",             0},  // "1"
+    {"joyb_jump",              3},  // "4"
+    {"joyb_use",               1},  // "2"
+    {"joyb_strafeleft",        6},  // Bottom shoulder buttons
+    {"joyb_straferight",       7},
+    {"joyb_prevweapon",        4},  // Top shoulder buttons
+    {"joyb_nextweapon",        5},
+    {"joyb_menu_activate",     9},  // "10", where "Start" usually is.
+    {NULL, 0},
+};
+
+// Wii controller is weird, so we have to take some liberties.
+// Also it's not a HID device, so it won't appear the same everywhere.
+// Assume there is no nunchuk or classic controller attached.
+
+// When using WJoy on OS X.
+static const joystick_config_t wii_controller_wjoy[] =
+{
+    {"joystick_x_axis",        CREATE_BUTTON_AXIS(2, 3)},
+    {"joystick_y_axis",        CREATE_BUTTON_AXIS(1, 0)},
+    {"joyb_fire",              9},  // Button 1
+    {"joyb_speed",             10}, // Button 2
+    {"joyb_use",               5},  // Button B (trigger)
+    {"joyb_prevweapon",        7},  // -
+    {"joyb_nextweapon",        6},  // +
+    {"joyb_menu_activate",     9},  // Button A
+    {NULL, 0},
+};
+
+// Xbox 360 controller. Thanks to Brad Harding for the details.
+static const joystick_config_t xbox360_controller[] =
+{
+    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
+    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
+    {"joystick_strafe_axis",   2},  // Trigger buttons form an axis(???)
+    {"joyb_fire",              2},  // X
+    {"joyb_speed",             0},  // A
+    {"joyb_jump",              3},  // Y
+    {"joyb_use",               1},  // B
+    {"joyb_prevweapon",        4},  // LB
+    {"joyb_nextweapon",        5},  // RB
+    {"joyb_menu_activate",     9},  // Start
+    {NULL, 0},
+};
+
+// Xbox 360 controller under Linux.
+static const joystick_config_t xbox360_controller_linux[] =
+{
+    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
+    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
+    // Ideally we'd like the trigger buttons to be strafe left/right
+    // But Linux presents each trigger button as its own axis, which
+    // we can't really work with. So we have to settle for a
+    // suboptimal setup.
+    {"joyb_fire",              2},  // X
+    {"joyb_speed",             0},  // A
+    {"joyb_jump",              3},  // Y
+    {"joyb_use",               1},  // B
+    {"joyb_strafeleft",        4},  // LB
+    {"joyb_straferight",       5},  // RB
+    {"joyb_menu_activate",     7},  // Start
+    {"joyb_prevweapon",        6},  // Back
+    {NULL, 0},
+};
+
+// Logitech Dual Action (F310, F710). Thanks to Brad Harding for details.
+static const joystick_config_t logitech_f310_controller[] =
+{
+    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
+    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
+    {"joyb_fire",              0},  // X
+    {"joyb_speed",             1},  // A
+    {"joyb_jump",              3},  // Y
+    {"joyb_use",               2},  // B
+    {"joyb_strafeleft",        6},  // LT
+    {"joyb_straferight",       7},  // RT
+    {"joyb_prevweapon",        4},  // LB
+    {"joyb_nextweapon",        5},  // RB
+    {"joyb_menu_activate",     11}, // Start
+    {NULL, 0},
+};
+
+// Multilaser JS030 gamepad, similar to a PS2 controller.
+static const joystick_config_t multilaser_js030_controller[] =
+{
+    {"joystick_x_axis",        0},   // Left stick / D-pad
+    {"joystick_y_axis",        1},
+    {"joyb_fire",              3},   // Square
+    {"joyb_speed",             2},   // X
+    {"joyb_use",               1},   // Circle
+    {"joyb_jump",              0},   // Triangle
+    {"joyb_strafeleft",        6},   // Bottom shoulder buttons
+    {"joyb_straferight",       7},
+    {"joyb_prevweapon",        4},   // Top shoulder buttons
+    {"joyb_nextweapon",        5},
+    {"joyb_menu_activate",     9},   // Start
+    {NULL, 0},
+};
+
+// Buffalo Classic USB Gamepad (thanks Fabian Greffrath).
+static const joystick_config_t buffalo_classic_controller[] =
+{
+    {"joystick_x_axis",        0},
+    {"joystick_y_axis",        1},
+    {"joyb_use",               0},    // A
+    {"joyb_speed",             1},    // B
+    {"joyb_jump",              2},    // X
+    {"joyb_fire",              3},    // Y
+    {"joyb_strafeleft",        4},    // Left shoulder
+    {"joyb_straferight",       5},    // Right shoulder
+    {"joyb_prevweapon",        6},    // Select
+    {"joyb_menu_activate",     7},    // Start
+    {NULL, 0},
+};
+
+// Config for if the user is actually using an old PC joystick or gamepad,
+// probably via a USB-Gameport adapter.
+static const joystick_config_t pc_gameport_controller[] =
+{
+    {"joystick_x_axis",        0},
+    {"joystick_y_axis",        1},
+    // Button configuration is the default as used for Vanilla Doom,
+    // Heretic and Hexen. When playing with a Gravis Gamepad, this
+    // layout should also be vaguely similar to the standard layout
+    // described above.
+    {"joyb_fire",              0},
+    {"joyb_strafe",            1},
+    {"joyb_use",               3},
+    {"joyb_speed",             2},
+    {NULL, 0},
+};
+
+// http://www.8bitdo.com/nes30pro/ and http://www.8bitdo.com/fc30pro/
+static const joystick_config_t nes30_pro_controller[] =
+{
+    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
+    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
+    {"joyb_fire",              4},  // Y
+    {"joyb_speed",             1},  // B
+    {"joyb_jump",              3},  // X
+    {"joyb_use",               0},  // A
+    {"joyb_strafeleft",        6},  // L1
+    {"joyb_straferight",       7}, // R1
+    {"joyb_prevweapon",        8},  // L2
+    {"joyb_nextweapon",        9},  // R2
+    {"joyb_menu_activate",     11}, // Start
+    {"joyb_toggle_automap",    10}, // Select
+    {NULL, 0},
+};
+
+// http://www.8bitdo.com/sfc30/ or http://www.8bitdo.com/snes30/
+// and http://www.nes30.com/ and http://www.fc30.com/
+static const joystick_config_t sfc30_controller[] =
+{
+    {"joystick_x_axis",        0},
+    {"joystick_y_axis",        1},
+    {"joyb_fire",              4}, // Y
+    {"joyb_speed",             1}, // B
+    {"joyb_jump",              3}, // X
+    {"joyb_use",               0}, // A
+    {"joyb_strafeleft",        6}, // L
+    {"joyb_straferight",       7}, // R
+    {"joyb_menu_activate",    11}, // Start
+    {"joyb_toggle_automap",   10}, // Select
+    {NULL, 0},
+};
+
+static const known_joystick_t known_joysticks[] =
+{
+    {
+        "PLAYSTATION(R)3 Controller",
+        4, 19, 0,
+        ps3_controller,
+    },
+
+    {
+        "AIRFLO             ",
+        4, 13, 1,
+        airflo_controller,
+    },
+
+    {
+        "Wiimote (*",  // WJoy includes the Wiimote MAC address.
+        6, 26, 0,
+        wii_controller_wjoy,
+    },
+
+    {
+        "Controller (XBOX 360 For Windows)",
+        5, 10, 1,
+        xbox360_controller,
+    },
+
+    {
+        "Controller (XBOX One For Windows)",
+        5, 10, 1,
+        xbox360_controller,
+    },
+
+    // Xbox 360 controller as it appears on Linux.
+    {
+        "Microsoft X-Box 360 pad",
+        6, 11, 1,
+        xbox360_controller_linux,
+    },
+
+    // Xbox One controller as it appears on Linux.
+    {
+        "Microsoft X-Box One pad",
+        6, 11, 1,
+        xbox360_controller_linux,
+    },
+
+    {
+        "Logitech Dual Action",
+        4, 12, 1,
+        logitech_f310_controller,
+    },
+
+    {
+        "USB Vibration Joystick",
+        4, 12, 1,
+        multilaser_js030_controller,
+    },
+
+    {
+        "USB,2-axis 8-button gamepad  ",
+        2, 8, 0,
+        buffalo_classic_controller,
+    },
+
+    // PS4 controller just appears as the generic-sounding "Wireless
+    // Controller". Hopefully the number of buttons/axes/hats should be
+    // enough to distinguish it from other gamepads.
+    {
+        "Wireless Controller",
+        6, 14, 1,
+        ps4_ds4_controller,
+    },
+
+    // This is the configuration for the USB-Gameport adapter listed on
+    // this page as the "Mayflash USB to Gameport Adapter" (though the
+    // device is labeled as "Super Joy Box 7"):
+    // https://sites.google.com/site/joystickrehab/itemcatal
+    // TODO: Add extra configurations here for other USB-Gameport adapters,
+    // which should just be the same configuration.
+    {
+        "WiseGroup.,Ltd Gameport to USB Controller",
+        4, 8, 1,
+        pc_gameport_controller,
+    },
+
+    // How the Super Joy Box 7 appears on Mac OS X.
+    {
+        "Gameport to USB Controller",
+        2, 8, 1,
+        pc_gameport_controller,
+    },
+
+    // 8Bitdo NES30 Pro, http://www.8bitdo.com/nes30pro/
+    {
+        "8Bitdo NES30 Pro",
+        4, 16, 1,
+        nes30_pro_controller,
+    },
+
+    // the above, NES variant, via USB on Linux/Raspbian (odd values)
+    {
+        "8Bitdo NES30 Pro*",
+        6, 15, 1,
+        nes30_pro_controller,
+    },
+
+    // the above, NES variant, connected over bluetooth
+    {
+        "8Bitdo NES30 Pro",
+        6, 16, 1,
+        nes30_pro_controller,
+    },
+
+    // 8bitdo NES30 Pro, in joystick mode (R1+Power), swaps the D-Pad
+    // and analog stick inputs.  Only applicable over Bluetooth. On USB,
+    // this mode registers the device as an Xbox 360 pad.
+    {
+        "8Bitdo NES30 Pro Joystick",
+        6, 16, 1,
+        nes30_pro_controller,
+    },
+
+    // variant of the above, via USB on Mac
+    // Note: untested, but theorized to exist based on us comparing
+    // a NES30 Pro tested on Linux with a FC30 Pro tested with Mac & Linux
+    {
+        "8Bitdo NES30 Pro",
+        4, 15, 1,
+        nes30_pro_controller,
+    },
+
+
+    // 8Bitdo FC30 Pro, http://8bitdo.cn/fc30pro/
+    // connected over bluetooth
+    {
+        "8Bitdo FC30 Pro",
+        4, 16, 1,
+        nes30_pro_controller,
+    },
+
+    // variant of the above, via USB on Linux/Raspbian
+    {
+        "8Bitdo FC30 Pro*",
+        6, 15, 1,
+        nes30_pro_controller,
+    },
+
+    // variant of the above, Linux/bluetooth
+    {
+        "8Bitdo FC30 Pro",
+	6, 16, 1,
+	nes30_pro_controller,
+    },
+
+    // variant of the above, via USB on Mac
+    {
+        "8Bitdo FC30 Pro",
+        4, 15, 1,
+        nes30_pro_controller,
+    },
+
+    // 8Bitdo SFC30 SNES replica controller
+    // in default mode and in controller mode (Start+R)
+    // the latter suffixes "Joystick" to the name
+    // http://www.8bitdo.com/sfc30/
+    {
+        "8Bitdo SFC30 GamePad*",
+        4, 16, 1,
+        sfc30_controller,
+    },
+
+    // As above, but as detected on RHEL Linux (odd extra axes)
+    {
+        "8Bitdo SFC30 GamePad*",
+        6, 16, 1,
+        sfc30_controller,
+    },
+
+    // SNES30 colour variation of the above
+    // http://www.8bitdo.com/snes30/
+    {
+        "8Bitdo SNES30 GamePad*",
+        4, 16, 1,
+        sfc30_controller,
+    },
+
+    // 8Bitdo SFC30 SNES replica controller in USB controller mode
+    // tested with firmware V2.68 (Beta); latest stable V2.65 doesn't work on
+    // OS X in USB controller mode
+    // Names seen so far:
+    //     'SFC30 Joystick' (OS X)
+    //     'SFC30              SFC30 Joystick' (Fedora 24; RHEL7)
+    // XXX: there is probably a SNES30 variant of this too
+    {
+        "SFC30 *",
+        4, 12, 1,
+        sfc30_controller,
+    },
+
+    // NES30 (not pro), tested in default and "hold R whilst turning on"
+    // mode, with whatever firmware it came with out of the box. Latter
+    // mode puts " Joystick" suffix on the name string
+    {
+        "8Bitdo NES30 GamePad*",
+        4, 16, 1,
+        sfc30_controller, // identical to SFC30
+    },
+    // FC30 variant of the above
+    {
+        "8Bitdo FC30 GamePad*",
+        4, 16, 1,
+        sfc30_controller, // identical to SFC30
+    },
+
+    // NES30 in USB mode
+    {
+        "NES30*",
+        4, 12, 1,
+        sfc30_controller, // identical to SFC30
+    },
+    // FC30 variant of the above
+    {
+        "FC30*",
+        4, 12, 1,
+        sfc30_controller, // identical to SFC30
+    },
+};
+
+// Use SDL_GameController interface
+int use_gamepad = 0;
+
+// SDL_GameControllerType of gamepad
+int gamepad_type = 0;
+
+// Based on Unity Doom mapping
+static const joystick_config_t modern_gamepad[] =
+{
+    {"joystick_x_axis", SDL_CONTROLLER_AXIS_RIGHTX},
+    {"joystick_y_axis", SDL_CONTROLLER_AXIS_LEFTY},
+    {"joystick_strafe_axis", SDL_CONTROLLER_AXIS_LEFTX},
+    {"joystick_look_axis", SDL_CONTROLLER_AXIS_RIGHTY},
+    {"joyb_fire", GAMEPAD_BUTTON_TRIGGERRIGHT},
+    {"joyb_speed", GAMEPAD_BUTTON_TRIGGERLEFT},
+    {"joyb_use", SDL_CONTROLLER_BUTTON_B},
+    {"joyb_jump", SDL_CONTROLLER_BUTTON_A},
+    {"joyb_prevweapon", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
+    {"joyb_nextweapon", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
+    {"joyb_menu_activate", SDL_CONTROLLER_BUTTON_START},
+    {"joyb_toggle_automap", SDL_CONTROLLER_BUTTON_Y},
+    {"joyb_useartifact", SDL_CONTROLLER_BUTTON_X},
+    {"joyb_invleft", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
+    {"joyb_invright", SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
+    {"joyb_flyup", SDL_CONTROLLER_BUTTON_DPAD_UP},
+    {"joyb_flydown", SDL_CONTROLLER_BUTTON_DPAD_DOWN},
+    {"joyb_flycenter", SDL_CONTROLLER_BUTTON_LEFTSTICK},
+    {NULL, 0},
+};
+
+// Based on the SNES Doom mapping
+static const joystick_config_t classic_gamepad[] =
+{
+    {"joystick_x_axis", SDL_CONTROLLER_AXIS_LEFTX},
+    {"joystick_y_axis", SDL_CONTROLLER_AXIS_LEFTY},
+    {"joyb_fire", SDL_CONTROLLER_BUTTON_X},                    // SNES Y
+    {"joyb_speed", SDL_CONTROLLER_BUTTON_A},                   // SNES B
+    {"joyb_use", SDL_CONTROLLER_BUTTON_B},                     // SNES A
+    {"joyb_strafeleft", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},   // SNES L
+    {"joyb_straferight", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER}, // SNES R
+    {"joyb_nextweapon", SDL_CONTROLLER_BUTTON_Y},              // SNES X
+    {"joyb_menu_activate", SDL_CONTROLLER_BUTTON_START},       // SNES Start
+    {"joyb_toggle_automap", SDL_CONTROLLER_BUTTON_BACK},       // SNES Select
+    {NULL, 0},
+};
+
+// SNES Doom mapping with extra shoulder buttons
+static const joystick_config_t classic_gamepad_plus[] =
+{
+    {"joystick_x_axis", SDL_CONTROLLER_AXIS_LEFTX},
+    {"joystick_y_axis", SDL_CONTROLLER_AXIS_LEFTY},
+    {"joyb_fire", SDL_CONTROLLER_BUTTON_X},                    // SNES Y
+    {"joyb_speed", SDL_CONTROLLER_BUTTON_A},                   // SNES B
+    {"joyb_use", SDL_CONTROLLER_BUTTON_B},                     // SNES A
+    {"joyb_strafeleft", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},   // L1
+    {"joyb_straferight", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER}, // R1
+    {"joyb_prevweapon", GAMEPAD_BUTTON_TRIGGERLEFT},           // L2
+    {"joyb_nextweapon", GAMEPAD_BUTTON_TRIGGERRIGHT},          // R2
+    {"joyb_menu_activate", SDL_CONTROLLER_BUTTON_START},       // SNES Start
+    {"joyb_toggle_automap", SDL_CONTROLLER_BUTTON_BACK},       // SNES Select
+    {NULL, 0},
+};
+
+static const known_joystick_t *GetJoystickType(int index)
+{
+    SDL_Joystick *joystick;
+    const char *name;
+    int axes, buttons, hats;
+    int i;
+
+    joystick = all_joysticks[index];
+    name = SDL_JoystickName(joystick);
+    axes = SDL_JoystickNumAxes(joystick);
+    buttons = SDL_JoystickNumButtons(joystick);
+    hats = SDL_JoystickNumHats(joystick);
+
+    for (i = 0; i < arrlen(known_joysticks); ++i)
+    {
+        // Check for a name match. If the name ends in '*', this means
+        // ignore the rest.
+        if (M_StringEndsWith(known_joysticks[i].name, "*"))
+        {
+            if (strncmp(known_joysticks[i].name, name,
+                        strlen(known_joysticks[i].name) - 1) != 0)
+            {
+                continue;
+            }
+        }
+        else
+        {
+            if (strcmp(known_joysticks[i].name, name) != 0)
+            {
+                continue;
+            }
+        }
+
+        if (known_joysticks[i].axes == axes
+         && known_joysticks[i].buttons == buttons
+         && known_joysticks[i].hats == hats)
+        {
+            return &known_joysticks[i];
+        }
+    }
+
+    printf("Unknown joystick '%s' with %i axes, %i buttons, %i hats\n",
+           name, axes, buttons, hats);
+    printf("Please consider sending in details about your gamepad!\n");
+
+    return NULL;
+}
+
+// Query if the joystick at the given index is a known joystick type.
+static boolean IsKnownJoystick(int index)
+{
+    return GetJoystickType(index) != NULL;
+}
+
+// Load a configuration set.
+static void LoadConfigurationSet(const joystick_config_t *configs)
+{
+    const joystick_config_t *config;
+    char buf[10];
+    int button;
+    int i;
+
+    button = 0;
+
+    for (i = 0; configs[i].name != NULL; ++i)
+    {
+        config = &configs[i];
+
+        // Don't overwrite autorun if it is set.
+        if (!strcmp(config->name, "joyb_speed") &&
+            joybspeed >= MAX_VIRTUAL_BUTTONS)
+        {
+            continue;
+        }
+
+        // For buttons, set the virtual button mapping as well.
+        if (M_StringStartsWith(config->name, "joyb_") && config->value >= 0)
+        {
+            joystick_physical_buttons[button] = config->value;
+            M_snprintf(buf, sizeof(buf), "%i", button);
+            M_SetVariable(config->name, buf);
+            ++button;
+        }
+        else
+        {
+            M_snprintf(buf, sizeof(buf), "%i", config->value);
+            M_SetVariable(config->name, buf);
+        }
+    }
+}
+
+// Load configuration for joystick_index based on known types.
+static void LoadKnownConfiguration(void)
+{
+    const known_joystick_t *jstype;
+
+    jstype = GetJoystickType(joystick_index);
+    if (jstype == NULL)
+    {
+        return;
+    }
+
+    LoadConfigurationSet(empty_defaults);
+    LoadConfigurationSet(jstype->configs);
+}
+
+static void InitJoystick(void)
+{
+    if (!joystick_initted)
+    {
+        joystick_initted = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0;
+    }
+}
+
+static void UnInitJoystick(void)
+{
+    if (joystick_initted)
+    {
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+        joystick_initted = 0;
+    }
+}
+
+// We identify joysticks using GUID where possible, but joystick_index
+// is used to distinguish between different devices. As the index can
+// change, UpdateJoystickIndex() checks to see if it is still valid and
+// updates it as appropriate.
+static void UpdateJoystickIndex(void)
+{
+    SDL_JoystickGUID guid, dev_guid;
+    int i;
+
+    guid = SDL_JoystickGetGUIDFromString(joystick_guid);
+
+    // Is joystick_index already correct?
+    if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
+    {
+        dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
+        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+        {
+            return;
+        }
+    }
+
+    // If index is not correct, look for the first device with the
+    // expected GUID. It may have moved to a different index.
+    for (i = 0; i < SDL_NumJoysticks(); ++i)
+    {
+        dev_guid = SDL_JoystickGetDeviceGUID(i);
+        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+        {
+            joystick_index = i;
+            return;
+        }
+    }
+
+    // Not found; it's possible the device is disconnected. Do not
+    // reset joystick_guid or joystick_index in case they are
+    // reconnected later.
+}
+
+// Set the label showing the name of the currently selected joystick
+static void SetJoystickButtonLabel(void)
+{
+    SDL_JoystickGUID guid, dev_guid;
+    const char *name;
+
+    if (!usejoystick || !strcmp(joystick_guid, ""))
+    {
+        name = "None set";
+    }
+    else
+    {
+        name = "Not found (device disconnected?)";
+
+        // Use the device name if the GUID and index match.
+        if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
+        {
+            guid = SDL_JoystickGetGUIDFromString(joystick_guid);
+            dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
+            if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
+            {
+                name = SDL_JoystickNameForIndex(joystick_index);
+            }
+        }
+    }
+
+    TXT_SetButtonLabel(joystick_button, (char *) name);
+}
+
+// Try to open all joysticks visible to SDL.
+
+static int OpenAllJoysticks(void)
+{
+    int i;
+    int result;
+
+    InitJoystick();
+
+    // SDL_JoystickOpen() all joysticks.
+
+    all_joysticks_len = SDL_NumJoysticks();
+    all_joysticks = calloc(all_joysticks_len, sizeof(SDL_Joystick *));
+
+    result = 0;
+
+    for (i = 0; i < all_joysticks_len; ++i)
+    {
+        all_joysticks[i] = SDL_JoystickOpen(i);
+
+        // If any joystick is successfully opened, return true.
+
+        if (all_joysticks[i] != NULL)
+        {
+            result = 1;
+        }
+    }
+
+    // Success? Turn on joystick events.
+
+    if (result)
+    {
+        SDL_JoystickEventState(SDL_ENABLE);
+    }
+    else
+    {
+        free(all_joysticks);
+        all_joysticks = NULL;
+    }
+
+    return result;
+}
+
+// Close all the joysticks opened with OpenAllJoysticks()
+
+static void CloseAllJoysticks(void)
+{
+    int i;
+
+    for (i = 0; i < all_joysticks_len; ++i)
+    {
+        if (all_joysticks[i] != NULL)
+        {
+            SDL_JoystickClose(all_joysticks[i]);
+        }
+    }
+
+    SDL_JoystickEventState(SDL_DISABLE);
+
+    free(all_joysticks);
+    all_joysticks = NULL;
+
+    UnInitJoystick();
+}
+
+static void CalibrateXAxis(void)
+{
+    TXT_ConfigureJoystickAxis(x_axis_widget, calibrate_button, NULL);
+}
+
+// Given the SDL_JoystickID instance ID from a button event, set the
+// joystick_guid and joystick_index config variables.
+static boolean SetJoystickGUID(SDL_JoystickID joy_id)
+{
+    SDL_JoystickGUID guid;
+    int i;
+
+    for (i = 0; i < all_joysticks_len; ++i)
+    {
+        if (SDL_JoystickInstanceID(all_joysticks[i]) == joy_id)
+        {
+            guid = SDL_JoystickGetGUID(all_joysticks[i]);
+            joystick_guid = malloc(GUID_STRING_BUF_SIZE);
+            SDL_JoystickGetGUIDString(guid, joystick_guid,
+                                      GUID_STRING_BUF_SIZE);
+            joystick_index = i;
+
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static void GetGamepadDefaultConfig(void)
+{
+    boolean have_four_shoulder, have_dual_sticks;
+    char *mapping;
+    SDL_JoystickGUID guid;
+
+    guid = SDL_JoystickGetGUID(all_joysticks[joystick_index]);
+    mapping = SDL_GameControllerMappingForGUID(guid);
+    have_four_shoulder =
+        strstr(mapping, "leftshoulder") && strstr(mapping, "rightshoulder") &&
+        strstr(mapping, "lefttrigger") && strstr(mapping, "righttrigger");
+    have_dual_sticks = strstr(mapping, "leftx") && strstr(mapping, "rightx");
+    SDL_free(mapping);
+
+    LoadConfigurationSet(empty_defaults);
+
+    if (have_four_shoulder && have_dual_sticks)
+    {
+        LoadConfigurationSet(modern_gamepad);
+    }
+    else if (have_four_shoulder)
+    {
+        LoadConfigurationSet(classic_gamepad_plus);
+    }
+    else
+    {
+        LoadConfigurationSet(classic_gamepad);
+    }
+}
+
+static int CalibrationEventCallback(SDL_Event *event, void *user_data)
+{
+    if (event->type != SDL_JOYBUTTONDOWN)
+    {
+        return 0;
+    }
+
+    if (!SetJoystickGUID(event->jbutton.which))
+    {
+        return 0;
+    }
+
+    if (SDL_IsGameController(joystick_index))
+    {
+        usejoystick = 1;
+        use_gamepad = 1;
+        gamepad_type = SDL_GameControllerTypeForIndex(joystick_index);
+        LoadConfigurationSet(empty_defaults);
+        GetGamepadDefaultConfig();
+        TXT_CloseWindow(calibration_window);
+        return 1;
+    }
+
+    // At this point, we have a button press.
+    // In the first "center" stage, we're just trying to work out which
+    // joystick is being configured and which button the user is pressing.
+    usejoystick = 1;
+    use_gamepad = 0;
+    gamepad_type = SDL_CONTROLLER_TYPE_UNKNOWN;
+    calibrate_button = event->jbutton.button;
+
+    // If the joystick is a known one, auto-load default
+    // config for it. Otherwise, proceed with calibration.
+    if (IsKnownJoystick(joystick_index))
+    {
+        LoadKnownConfiguration();
+        TXT_CloseWindow(calibration_window);
+    }
+    else
+    {
+        TXT_CloseWindow(calibration_window);
+
+        // Calibrate joystick axes: Y axis first, then X axis once
+        // completed.
+        TXT_ConfigureJoystickAxis(y_axis_widget, calibrate_button,
+                                  CalibrateXAxis);
+    }
+
+    return 1;
+}
+
+static void NoJoystick(void)
+{
+    TXT_MessageBox(NULL, "No gamepads or joysticks could be found.\n\n"
+                         "Try configuring your controller from within\n"
+                         "your OS first. Maybe you need to install\n"
+                         "some drivers or otherwise configure it.");
+
+    usejoystick = 0;
+    use_gamepad = 0;
+    joystick_index = -1;
+    SetJoystickButtonLabel();
+}
+
+static void RefreshJoystickWindow(TXT_UNCAST_ARG(widget),
+                                  TXT_UNCAST_ARG(unused))
+{
+    ConfigJoystick(NULL, NULL);
+}
+
+static void CalibrateWindowClosed(TXT_UNCAST_ARG(widget),
+                                  TXT_UNCAST_ARG(joystick_window))
+{
+    TXT_CAST_ARG(txt_window_t, joystick_window);
+    TXT_SDL_SetEventCallback(NULL, NULL);
+    SetJoystickButtonLabel();
+    CloseAllJoysticks();
+
+    // Refresh Joystick window to update button and axis widgets.
+    TXT_SignalConnect(joystick_window, "closed", RefreshJoystickWindow, NULL);
+    TXT_CloseWindow(joystick_window);
+}
+
+static void CalibrateJoystick(TXT_UNCAST_ARG(widget),
+                              TXT_UNCAST_ARG(joystick_window))
+{
+    TXT_CAST_ARG(txt_window_t, joystick_window);
+
+    // Try to open all available joysticks.  If none are opened successfully,
+    // bomb out with an error.
+
+    if (!OpenAllJoysticks())
+    {
+        NoJoystick();
+        return;
+    }
+
+    calibration_window = TXT_NewWindow("Gamepad/Joystick calibration");
+
+    TXT_AddWidgets(calibration_window,
+                   TXT_NewStrut(0, 1),
+                   TXT_NewLabel("Center the D-pad or joystick,\n"
+                                "and press a button."),
+                   TXT_NewStrut(0, 1),
+                   NULL);
+
+    TXT_SetWindowAction(calibration_window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(calibration_window, TXT_HORIZ_CENTER, 
+                        TXT_NewWindowAbortAction(calibration_window));
+    TXT_SetWindowAction(calibration_window, TXT_HORIZ_RIGHT, NULL);
+
+    TXT_SDL_SetEventCallback(CalibrationEventCallback, NULL);
+
+    TXT_SignalConnect(calibration_window, "closed", CalibrateWindowClosed,
+                      joystick_window);
+
+    // Start calibration
+}
+
+//
+// GUI
+//
+
+static void AddJoystickControl(TXT_UNCAST_ARG(table), const char *label, int *var)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_joystick_input_t *joy_input;
+
+    joy_input = TXT_NewJoystickInput(var);
+
+    TXT_AddWidgets(table,
+                   TXT_NewLabel(label),
+                   joy_input,
+                   TXT_TABLE_EMPTY,
+                   NULL);
+}
+
+static void SwapLRSticks(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    // Single pad/stick controllers don't get a joystick_strafe_axis value
+    if (joystick_strafe_axis >= 0)
+    {
+        if (joystick_x_axis == SDL_CONTROLLER_AXIS_LEFTX)
+        {
+            joystick_x_axis = SDL_CONTROLLER_AXIS_RIGHTX;
+            joystick_y_axis = SDL_CONTROLLER_AXIS_LEFTY;
+            joystick_strafe_axis = SDL_CONTROLLER_AXIS_LEFTX;
+            joystick_look_axis = SDL_CONTROLLER_AXIS_RIGHTY;
+        }
+        else
+        {
+            joystick_x_axis = SDL_CONTROLLER_AXIS_LEFTX;
+            joystick_y_axis = SDL_CONTROLLER_AXIS_RIGHTY;
+            joystick_strafe_axis = SDL_CONTROLLER_AXIS_RIGHTX;
+            joystick_look_axis = SDL_CONTROLLER_AXIS_LEFTY;
+        }
+    }
+}
+
+static void AdjustAnalog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+
+    window = TXT_NewWindow("Analog Settings");
+    TXT_SetTableColumns(window, 2);
+    TXT_SetColumnWidths(window, 10, 6);
+    TXT_AddWidgets(window,
+        TXT_NewCheckBox("Use analog controls", &use_analog),
+        TXT_NewSeparator("Sensitivity"),
+        TXT_NewLabel("Movement"),
+        TXT_NewSpinControl(&joystick_move_sensitivity, 0, 20),
+        TXT_NewLabel("Turn"),
+        TXT_NewSpinControl(&joystick_turn_sensitivity, 0, 20),
+        NULL);
+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
+    {
+        TXT_AddWidgets(window,
+            TXT_NewLabel("Look"),
+            TXT_NewSpinControl(&joystick_look_sensitivity, 0, 20), NULL);
+    }
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER,
+        TXT_NewWindowEscapeAction(window));
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+    TXT_SetWidgetAlign(window, TXT_HORIZ_CENTER);
+}
+
+static void MoreControls(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+
+    window = TXT_NewWindow("Additional Gamepad/Joystick buttons");
+    TXT_SetTableColumns(window, 6);
+    TXT_SetColumnWidths(window, 20, 10, 1, 20, 10, 0);
+
+    AddJoystickControl(window, "Use inventory item", &joybuseartifact);
+    AddJoystickControl(window, "Inventory left", &joybinvleft);
+    AddJoystickControl(window, "Inventory right", &joybinvright);
+    if (gamemission == heretic || gamemission == hexen)
+    {
+        AddJoystickControl(window, "Fly up", &joybflyup);
+        AddJoystickControl(window, "Fly down", &joybflydown);
+        AddJoystickControl(window, "Fly center", &joybflycenter);
+    }
+
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER,
+        TXT_NewWindowEscapeAction(window));
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+    TXT_SetWidgetAlign(window, TXT_HORIZ_CENTER);
+}
+
+void ConfigJoystick(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+
+    window = TXT_NewWindow("Gamepad/Joystick configuration");
+    TXT_SetTableColumns(window, 6);
+    TXT_SetColumnWidths(window, 18, 10, 1, 18, 10, 0);
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_AddWidgets(window,
+                   TXT_NewLabel("Controller"),
+                   joystick_button = TXT_NewButton("zzzz"),
+                   TXT_TABLE_EOL,
+
+                   TXT_NewSeparator("Axes"),
+                   TXT_NewLabel("Forward/backward"),
+                   y_axis_widget = TXT_NewJoystickAxis(&joystick_y_axis,
+                                                       &joystick_y_invert,
+                                                       &joystick_y_dead_zone,
+                                                       JOYSTICK_AXIS_VERTICAL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_EMPTY,
+                   TXT_TABLE_EMPTY,
+
+                   TXT_NewLabel("Turn left/right"),
+                   x_axis_widget =
+                        TXT_NewJoystickAxis(&joystick_x_axis,
+                                            &joystick_x_invert,
+                                            &joystick_x_dead_zone,
+                                            JOYSTICK_AXIS_HORIZONTAL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_EMPTY,
+                   TXT_TABLE_EMPTY,
+
+                   TXT_NewLabel("Strafe left/right"),
+                   TXT_NewJoystickAxis(&joystick_strafe_axis,
+                                       &joystick_strafe_invert,
+                                       &joystick_strafe_dead_zone,
+                                        JOYSTICK_AXIS_HORIZONTAL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_EMPTY,
+                   TXT_TABLE_EMPTY,
+                   NULL);
+
+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
+    {
+        TXT_AddWidgets(window,
+                   TXT_NewLabel("Look up/down"),
+                   TXT_NewJoystickAxis(&joystick_look_axis,
+                                       &joystick_look_invert,
+                                       &joystick_look_dead_zone,
+                                        JOYSTICK_AXIS_VERTICAL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_EMPTY,
+                   TXT_TABLE_EMPTY,
+                   NULL);
+    }
+
+    TXT_AddWidget(window,
+        TXT_NewConditional(&use_gamepad, 1,
+                   TXT_NewButton2("Swap L and R sticks", SwapLRSticks, NULL)));
+    TXT_AddWidget(window, TXT_TABLE_EOL);
+
+    TXT_AddWidget(window,
+                   TXT_NewButton2("Analog settings", AdjustAnalog, NULL));
+    TXT_AddWidget(window, TXT_TABLE_EOL);
+
+    TXT_AddWidget(window, TXT_NewSeparator("Buttons"));
+
+    AddJoystickControl(window, "Fire/Attack", &joybfire);
+    AddJoystickControl(window, "Strafe Left", &joybstrafeleft);
+
+    AddJoystickControl(window, "Use", &joybuse);
+    AddJoystickControl(window, "Strafe Right", &joybstraferight);
+
+    AddJoystickControl(window, "Previous weapon", &joybprevweapon);
+    AddJoystickControl(window, "Strafe", &joybstrafe);
+
+    AddJoystickControl(window, "Next weapon", &joybnextweapon);
+
+    // High values of joybspeed are used to activate the "always run mode"
+    // trick in Vanilla Doom.  If this has been enabled, not only is the
+    // joybspeed value meaningless, but the control itself is useless.
+
+    if (joybspeed < MAX_VIRTUAL_BUTTONS)
+    {
+        AddJoystickControl(window, "Run", &joybspeed);
+    }
+
+    if (gamemission == hexen || gamemission == strife)
+    {
+        AddJoystickControl(window, "Jump", &joybjump);
+    }
+
+    AddJoystickControl(window, "Activate menu", &joybmenu);
+
+    AddJoystickControl(window, "Toggle Automap", &joybautomap);
+
+    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
+    {
+        TXT_AddWidget(window,
+                       TXT_NewButton2("More controls...", MoreControls, NULL));
+        TXT_AddWidget(window, TXT_TABLE_EOL);
+    }
+
+    TXT_SignalConnect(joystick_button, "pressed", CalibrateJoystick, window);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
+
+    InitJoystick();
+    UpdateJoystickIndex();
+    SetJoystickButtonLabel();
+    UnInitJoystick();
+}
+
+void BindJoystickVariables(void)
+{
+    int i;
+
+    M_BindIntVariable("use_joystick",           &usejoystick);
+    M_BindIntVariable("use_gamepad",            &use_gamepad);
+    M_BindIntVariable("gamepad_type",           &gamepad_type);
+    M_BindStringVariable("joystick_guid",       &joystick_guid);
+    M_BindIntVariable("joystick_index",         &joystick_index);
+    M_BindIntVariable("joystick_x_axis",        &joystick_x_axis);
+    M_BindIntVariable("joystick_y_axis",        &joystick_y_axis);
+    M_BindIntVariable("joystick_strafe_axis",   &joystick_strafe_axis);
+    M_BindIntVariable("joystick_x_invert",      &joystick_x_invert);
+    M_BindIntVariable("joystick_y_invert",      &joystick_y_invert);
+    M_BindIntVariable("joystick_strafe_invert", &joystick_strafe_invert);
+    M_BindIntVariable("joystick_look_axis",   &joystick_look_axis);
+    M_BindIntVariable("joystick_look_invert", &joystick_look_invert);
+    M_BindIntVariable("joystick_x_dead_zone", &joystick_x_dead_zone);
+    M_BindIntVariable("joystick_y_dead_zone", &joystick_y_dead_zone);
+    M_BindIntVariable("joystick_strafe_dead_zone", &joystick_strafe_dead_zone);
+    M_BindIntVariable("joystick_look_dead_zone", &joystick_look_dead_zone);
+    M_BindIntVariable("use_analog", &use_analog);
+    M_BindIntVariable("joystick_turn_sensitivity", &joystick_turn_sensitivity);
+    M_BindIntVariable("joystick_move_sensitivity", &joystick_move_sensitivity);
+    M_BindIntVariable("joystick_look_sensitivity", &joystick_look_sensitivity);
+
+    for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
+    {
+        char name[32];
+        M_snprintf(name, sizeof(name), "joystick_physical_button%i", i);
+        M_BindIntVariable(name, &joystick_physical_buttons[i]);
+    }
+}
+
diff --git a/games/NXDoom/src/setup/joystick.h b/games/NXDoom/src/setup/joystick.h
new file mode 100644
index 000000000..dd17b7d92
--- /dev/null
+++ b/games/NXDoom/src/setup/joystick.h
@@ -0,0 +1,32 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_JOYSTICK_H
+#define SETUP_JOYSTICK_H
+
+
+#include "i_joystick.h"
+
+
+extern int joystick_index;
+extern int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS];
+extern int use_gamepad;
+extern int gamepad_type;
+
+
+void ConfigJoystick(void *widget, void *user_data);
+void BindJoystickVariables(void);
+
+#endif /* #ifndef SETUP_JOYSTICK_H */
+
diff --git a/games/NXDoom/src/setup/keyboard.c b/games/NXDoom/src/setup/keyboard.c
new file mode 100644
index 000000000..02de4f88b
--- /dev/null
+++ b/games/NXDoom/src/setup/keyboard.c
@@ -0,0 +1,448 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include "textscreen.h"
+#include "doomtype.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+
+#include "execute.h"
+#include "txt_keyinput.h"
+
+#include "mode.h"
+#include "joystick.h"
+#include "keyboard.h"
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-keyboard"
+
+int vanilla_keyboard_mapping = 1;
+
+static int always_run = 0;
+
+// Keys within these groups cannot have the same value.
+
+static int *controls[] = { &key_left, &key_right, &key_up, &key_down,
+                           &key_strafeleft, &key_straferight, &key_fire,
+                           &key_use, &key_strafe, &key_speed, &key_jump,
+                           &key_flyup, &key_flydown, &key_flycenter,
+                           &key_lookup, &key_lookdown, &key_lookcenter,
+                           &key_invleft, &key_invright, &key_invquery,
+                           &key_invuse, &key_invpop, &key_mission, &key_invkey,
+                           &key_invhome, &key_invend, &key_invdrop,
+                           &key_useartifact, &key_pause, &key_usehealth,
+                           &key_weapon1, &key_weapon2, &key_weapon3,
+                           &key_weapon4, &key_weapon5, &key_weapon6,
+                           &key_weapon7, &key_weapon8,
+                           &key_arti_quartz, &key_arti_urn, &key_arti_bomb,
+                           &key_arti_tome, &key_arti_ring, &key_arti_chaosdevice,
+                           &key_arti_shadowsphere, &key_arti_wings, 
+                           &key_arti_torch, &key_arti_morph,
+                           &key_arti_all, &key_arti_health, &key_arti_poisonbag,
+                           &key_arti_blastradius, &key_arti_teleport,
+                           &key_arti_teleportother, &key_arti_egg,
+                           &key_arti_invulnerability,
+                           &key_prevweapon, &key_nextweapon, NULL };
+
+static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,
+                           &key_menu_left, &key_menu_right, &key_menu_back,
+                           &key_menu_forward, NULL };
+
+static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
+                            &key_menu_volume, &key_menu_detail, &key_menu_qsave,
+                            &key_menu_endgame, &key_menu_messages, &key_spy,
+                            &key_menu_qload, &key_menu_quit, &key_menu_gamma,
+                            &key_menu_incscreen, &key_menu_decscreen, 
+                            &key_menu_screenshot,
+                            &key_message_refresh, &key_multi_msg,
+                            &key_multi_msgplayer[0], &key_multi_msgplayer[1],
+                            &key_multi_msgplayer[2], &key_multi_msgplayer[3], NULL };
+
+static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east,
+                           &key_map_west, &key_map_zoomin, &key_map_zoomout,
+                           &key_map_toggle, &key_map_maxzoom, &key_map_follow,
+                           &key_map_grid, &key_map_mark, &key_map_clearmark,
+                           NULL };
+
+static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
+{
+    if (always_run)
+    {
+        /*
+         <Janizdreg> if you want to pick one for chocolate doom to use, 
+                     pick 29, since that is the most universal one that 
+                     also works with heretic, hexen and strife =P
+
+         NB. This choice also works with original, ultimate and final exes.
+        */
+
+        joybspeed = 29;
+    }
+    else
+    {
+        joybspeed = 2;
+    }
+}
+
+static int VarInGroup(int *variable, int **group)
+{
+    unsigned int i;
+
+    for (i=0; group[i] != NULL; ++i)
+    {
+        if (group[i] == variable)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static void CheckKeyGroup(int *variable, int **group)
+{
+    unsigned int i;
+
+    // Don't check unless the variable is in this group.
+
+    if (!VarInGroup(variable, group))
+    {
+        return;
+    }
+
+    // If another variable has the same value as the new value, reset it.
+
+    for (i=0; group[i] != NULL; ++i)
+    {
+        if (*variable == *group[i] && group[i] != variable)
+        {
+            // A different key has the same value.  Clear the existing
+            // value. This ensures that no two keys can have the same
+            // value.
+
+            *group[i] = 0;
+        }
+    }
+}
+
+// Callback invoked when a key control is set
+
+static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+{
+    TXT_CAST_ARG(int, variable);
+
+    CheckKeyGroup(variable, controls);
+    CheckKeyGroup(variable, menu_nav);
+    CheckKeyGroup(variable, shortcuts);
+    CheckKeyGroup(variable, map_keys);
+}
+
+// Add a label and keyboard input to the specified table.
+
+static void AddKeyControl(TXT_UNCAST_ARG(table), const char *name, int *var)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_key_input_t *key_input;
+
+    TXT_AddWidget(table, TXT_NewLabel(name));
+    key_input = TXT_NewKeyInput(var);
+    TXT_AddWidget(table, key_input);
+
+    TXT_SignalConnect(key_input, "set", KeySetCallback, var);
+}
+
+static void AddSectionLabel(TXT_UNCAST_ARG(table), const char *title,
+                            boolean add_space)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    char buf[64];
+
+    if (add_space)
+    {
+        TXT_AddWidgets(table,
+                       TXT_NewStrut(0, 1),
+                       TXT_TABLE_EOL,
+                       NULL);
+    }
+
+    M_snprintf(buf, sizeof(buf), " - %s - ", title);
+
+    TXT_AddWidgets(table,
+                   TXT_NewLabel(buf),
+                   TXT_TABLE_EOL,
+                   NULL);
+}
+static void ConfigExtraKeys(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+    txt_scrollpane_t *scrollpane;
+    txt_table_t *table;
+    boolean extra_keys = gamemission == heretic
+                      || gamemission == hexen
+                      || gamemission == strife;
+
+    window = TXT_NewWindow("Extra keyboard controls");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    table = TXT_NewTable(2);
+
+    TXT_SetColumnWidths(table, 21, 9);
+
+    if (extra_keys)
+    {
+        // When we have extra controls, a scrollable pane must be used.
+
+        scrollpane = TXT_NewScrollPane(0, 13, table);
+        TXT_AddWidget(window, scrollpane);
+
+        AddSectionLabel(table, "View", false);
+
+        AddKeyControl(table, "Look up", &key_lookup);
+        AddKeyControl(table, "Look down", &key_lookdown);
+        AddKeyControl(table, "Center view", &key_lookcenter);
+
+        if (gamemission == heretic || gamemission == hexen)
+        {
+            AddSectionLabel(table, "Flying", true);
+
+            AddKeyControl(table, "Fly up", &key_flyup);
+            AddKeyControl(table, "Fly down", &key_flydown);
+            AddKeyControl(table, "Fly center", &key_flycenter);
+        }
+
+        AddSectionLabel(table, "Inventory", true);
+
+        AddKeyControl(table, "Inventory left", &key_invleft);
+        AddKeyControl(table, "Inventory right", &key_invright);
+
+        if (gamemission == strife)
+        {
+            AddKeyControl(table, "Home", &key_invhome);
+            AddKeyControl(table, "End", &key_invend);
+            AddKeyControl(table, "Query", &key_invquery);
+            AddKeyControl(table, "Drop", &key_invdrop);
+            AddKeyControl(table, "Show weapons", &key_invpop);
+            AddKeyControl(table, "Show mission", &key_mission);
+            AddKeyControl(table, "Show keys", &key_invkey);
+            AddKeyControl(table, "Use", &key_invuse);
+            AddKeyControl(table, "Use health", &key_usehealth);
+        }
+        else
+        {
+            AddKeyControl(table, "Use artifact", &key_useartifact);
+        }
+
+        if (gamemission == heretic)
+        {
+            AddSectionLabel(table, "Artifacts", true);
+
+            AddKeyControl(table, "Quartz Flask", &key_arti_quartz);
+            AddKeyControl(table, "Mystic Urn", &key_arti_urn);
+            AddKeyControl(table, "Timebomb", &key_arti_bomb);
+            AddKeyControl(table, "Tome of Power", &key_arti_tome);
+            AddKeyControl(table, "Ring of Invincibility ", &key_arti_ring);
+            AddKeyControl(table, "Chaos Device", &key_arti_chaosdevice);
+            AddKeyControl(table, "Shadowsphere", &key_arti_shadowsphere);
+            AddKeyControl(table, "Wings of Wrath", &key_arti_wings);
+            AddKeyControl(table, "Torch", &key_arti_torch);
+            AddKeyControl(table, "Morph Ovum", &key_arti_morph);
+        }
+
+        if (gamemission == hexen)
+        {
+            AddSectionLabel(table, "Artifacts", true);
+
+            AddKeyControl(table, "One of each", &key_arti_all);
+            AddKeyControl(table, "Quartz Flask", &key_arti_health);
+            AddKeyControl(table, "Flechette", &key_arti_poisonbag);
+            AddKeyControl(table, "Disc of Repulsion", &key_arti_blastradius);
+            AddKeyControl(table, "Chaos Device", &key_arti_teleport);
+            AddKeyControl(table, "Banishment Device", &key_arti_teleportother);
+            AddKeyControl(table, "Porkalator", &key_arti_egg);
+            AddKeyControl(table, "Icon of the Defender",
+                          &key_arti_invulnerability);
+        }
+    }
+    else
+    {
+        TXT_AddWidget(window, table);
+    }
+
+    AddSectionLabel(table, "Weapons", extra_keys);
+
+    AddKeyControl(table, "Weapon 1", &key_weapon1);
+    AddKeyControl(table, "Weapon 2", &key_weapon2);
+    AddKeyControl(table, "Weapon 3", &key_weapon3);
+    AddKeyControl(table, "Weapon 4", &key_weapon4);
+    AddKeyControl(table, "Weapon 5", &key_weapon5);
+    AddKeyControl(table, "Weapon 6", &key_weapon6);
+    AddKeyControl(table, "Weapon 7", &key_weapon7);
+    AddKeyControl(table, "Weapon 8", &key_weapon8);
+    AddKeyControl(table, "Previous weapon", &key_prevweapon);
+    AddKeyControl(table, "Next weapon", &key_nextweapon);
+}
+
+static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+    txt_table_t *table;
+    txt_scrollpane_t *scrollpane;
+
+    window = TXT_NewWindow("Other keys");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    table = TXT_NewTable(2);
+
+    TXT_SetColumnWidths(table, 25, 9);
+
+    AddSectionLabel(table, "Menu navigation", false);
+
+    AddKeyControl(table, "Activate menu",         &key_menu_activate);
+    AddKeyControl(table, "Move cursor up",        &key_menu_up);
+    AddKeyControl(table, "Move cursor down",      &key_menu_down);
+    AddKeyControl(table, "Move slider left",      &key_menu_left);
+    AddKeyControl(table, "Move slider right",     &key_menu_right);
+    AddKeyControl(table, "Go to previous menu",   &key_menu_back);
+    AddKeyControl(table, "Activate menu item",    &key_menu_forward);
+    AddKeyControl(table, "Confirm action",        &key_menu_confirm);
+    AddKeyControl(table, "Cancel action",         &key_menu_abort);
+
+    AddSectionLabel(table, "Shortcut keys", true);
+
+    AddKeyControl(table, "Pause game",            &key_pause);
+    AddKeyControl(table, "Help screen",           &key_menu_help);
+    AddKeyControl(table, "Save game",             &key_menu_save);
+    AddKeyControl(table, "Load game",             &key_menu_load);
+    AddKeyControl(table, "Sound volume",          &key_menu_volume);
+    AddKeyControl(table, "Toggle detail",         &key_menu_detail);
+    AddKeyControl(table, "Quick save",            &key_menu_qsave);
+    AddKeyControl(table, "End game",              &key_menu_endgame);
+    AddKeyControl(table, "Toggle messages",       &key_menu_messages);
+    AddKeyControl(table, "Quick load",            &key_menu_qload);
+    AddKeyControl(table, "Quit game",             &key_menu_quit);
+    AddKeyControl(table, "Toggle gamma",          &key_menu_gamma);
+    AddKeyControl(table, "Multiplayer spy",       &key_spy);
+
+    AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
+    AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
+    AddKeyControl(table, "Save a screenshot",     &key_menu_screenshot);
+
+    AddKeyControl(table, "Display last message",  &key_message_refresh);
+    AddKeyControl(table, "Finish recording demo", &key_demo_quit);
+
+    AddSectionLabel(table, "Map", true);
+    AddKeyControl(table, "Toggle map",            &key_map_toggle);
+    AddKeyControl(table, "Zoom in",               &key_map_zoomin);
+    AddKeyControl(table, "Zoom out",              &key_map_zoomout);
+    AddKeyControl(table, "Maximum zoom out",      &key_map_maxzoom);
+    AddKeyControl(table, "Follow mode",           &key_map_follow);
+    AddKeyControl(table, "Pan north",             &key_map_north);
+    AddKeyControl(table, "Pan south",             &key_map_south);
+    AddKeyControl(table, "Pan east",              &key_map_east);
+    AddKeyControl(table, "Pan west",              &key_map_west);
+    AddKeyControl(table, "Toggle grid",           &key_map_grid);
+    AddKeyControl(table, "Mark location",         &key_map_mark);
+    AddKeyControl(table, "Clear all marks",       &key_map_clearmark);
+
+    AddSectionLabel(table, "Multiplayer", true);
+
+    AddKeyControl(table, "Send message",          &key_multi_msg);
+    AddKeyControl(table, "- to player 1",         &key_multi_msgplayer[0]);
+    AddKeyControl(table, "- to player 2",         &key_multi_msgplayer[1]);
+    AddKeyControl(table, "- to player 3",         &key_multi_msgplayer[2]);
+    AddKeyControl(table, "- to player 4",         &key_multi_msgplayer[3]);
+
+    if (gamemission == hexen || gamemission == strife)
+    {
+        AddKeyControl(table, "- to player 5",     &key_multi_msgplayer[4]);
+        AddKeyControl(table, "- to player 6",     &key_multi_msgplayer[5]);
+        AddKeyControl(table, "- to player 7",     &key_multi_msgplayer[6]);
+        AddKeyControl(table, "- to player 8",     &key_multi_msgplayer[7]);
+    }
+
+    scrollpane = TXT_NewScrollPane(0, 13, table);
+
+    TXT_AddWidget(window, scrollpane);
+}
+
+void ConfigKeyboard(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+    txt_checkbox_t *run_control;
+
+    always_run = joybspeed >= 20;
+
+    window = TXT_NewWindow("Keyboard configuration");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    // The window is on a 5-column grid layout that looks like:
+    // Label | Control | | Label | Control
+    // There is a small gap between the two conceptual "columns" of
+    // controls, just for spacing.
+    TXT_SetTableColumns(window, 5);
+    TXT_SetColumnWidths(window, 15, 8, 2, 15, 8);
+
+    TXT_AddWidget(window, TXT_NewSeparator("Movement"));
+    AddKeyControl(window, "Move Forward", &key_up);
+    TXT_AddWidget(window, TXT_TABLE_EMPTY);
+    AddKeyControl(window, "Strafe Left", &key_strafeleft);
+
+    AddKeyControl(window, "Move Backward", &key_down);
+    TXT_AddWidget(window, TXT_TABLE_EMPTY);
+    AddKeyControl(window, "Strafe Right", &key_straferight);
+
+    AddKeyControl(window, "Turn Left", &key_left);
+    TXT_AddWidget(window, TXT_TABLE_EMPTY);
+    AddKeyControl(window, "Run", &key_speed);
+
+    AddKeyControl(window, "Turn Right", &key_right);
+    TXT_AddWidget(window, TXT_TABLE_EMPTY);
+    AddKeyControl(window, "Strafe On", &key_strafe);
+
+    if (gamemission == hexen || gamemission == strife)
+    {
+        AddKeyControl(window, "Jump", &key_jump);
+    }
+
+    TXT_AddWidget(window, TXT_NewSeparator("Action"));
+    AddKeyControl(window, "Fire/Attack", &key_fire);
+    TXT_AddWidget(window, TXT_TABLE_EMPTY);
+    AddKeyControl(window, "Use", &key_use);
+
+    TXT_AddWidgets(window,
+                   TXT_NewButton2("More controls...", ConfigExtraKeys, NULL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_TABLE_EMPTY,
+                   TXT_NewButton2("Other keys...", OtherKeysDialog, NULL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+
+                   TXT_NewSeparator("Misc."),
+                   run_control = TXT_NewCheckBox("Always run", &always_run),
+                   TXT_TABLE_EOL,
+                   TXT_NewInvertedCheckBox("Use native keyboard mapping",
+                                           &vanilla_keyboard_mapping),
+                   TXT_TABLE_EOL,
+                   NULL);
+
+    TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
+}
+
+void BindKeyboardVariables(void)
+{
+    M_BindIntVariable("vanilla_keyboard_mapping", &vanilla_keyboard_mapping);
+}
diff --git a/games/NXDoom/src/setup/keyboard.h b/games/NXDoom/src/setup/keyboard.h
new file mode 100644
index 000000000..81b8b91a2
--- /dev/null
+++ b/games/NXDoom/src/setup/keyboard.h
@@ -0,0 +1,23 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_KEYBOARD_H 
+#define SETUP_KEYBOARD_H 
+
+void ConfigKeyboard(void *widget, void *user_data);
+void BindKeyboardVariables(void);
+
+extern int vanilla_keyboard_mapping;
+
+#endif /* #ifndef SETUP_KEYBOARD_H */
diff --git a/games/NXDoom/src/setup/mainmenu.c b/games/NXDoom/src/setup/mainmenu.c
new file mode 100644
index 000000000..94b765f37
--- /dev/null
+++ b/games/NXDoom/src/setup/mainmenu.c
@@ -0,0 +1,346 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "textscreen.h"
+
+#include "execute.h"
+
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "z_zone.h"
+
+#include "setup_icon.c"
+#include "mode.h"
+
+#include "compatibility.h"
+#include "display.h"
+#include "joystick.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "multiplayer.h"
+#include "sound.h"
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup"
+
+static const int cheat_sequence[] =
+{
+    KEY_UPARROW, KEY_UPARROW, KEY_DOWNARROW, KEY_DOWNARROW,
+    KEY_LEFTARROW, KEY_RIGHTARROW, KEY_LEFTARROW, KEY_RIGHTARROW,
+    'b', 'a', KEY_ENTER, 0
+};
+
+static unsigned int cheat_sequence_index = 0;
+
+// I think these are good "sensible" defaults:
+
+static void SensibleDefaults(void)
+{
+    key_up = 'w';
+    key_down = 's';
+    key_strafeleft = 'a';
+    key_straferight = 'd';
+    key_jump = '/';
+    key_lookup = KEY_PGUP;
+    key_lookdown = KEY_PGDN;
+    key_lookcenter = KEY_HOME;
+    key_flyup = KEY_INS;
+    key_flydown = KEY_DEL;
+    key_flycenter = KEY_END;
+    key_prevweapon = ',';
+    key_nextweapon = '.';
+    key_invleft = '[';
+    key_invright = ']';
+    key_message_refresh = '\'';
+    key_mission = 'i';              // Strife keys
+    key_invpop = 'o';
+    key_invkey = 'p';
+    key_multi_msgplayer[0] = 'g';
+    key_multi_msgplayer[1] = 'h';
+    key_multi_msgplayer[2] = 'j';
+    key_multi_msgplayer[3] = 'k';
+    key_multi_msgplayer[4] = 'v';
+    key_multi_msgplayer[5] = 'b';
+    key_multi_msgplayer[6] = 'n';
+    key_multi_msgplayer[7] = 'm';
+    mousebprevweapon = 4;           // Scroll wheel = weapon cycle
+    mousebnextweapon = 3;
+    snd_musicdevice = 3;
+    joybspeed = 29;                 // Always run
+    vanilla_savegame_limit = 0;
+    vanilla_keyboard_mapping = 0;
+    vanilla_demo_limit = 0;
+    graphical_startup = 0;
+    show_endoom = 0;
+    dclick_use = 0;
+    novert = 1;
+    snd_dmxoption = "-opl3 -reverse";
+    png_screenshots = 1;
+}
+
+static int MainMenuKeyPress(txt_window_t *window, int key, void *user_data)
+{
+    if (key == cheat_sequence[cheat_sequence_index])
+    {
+        ++cheat_sequence_index;
+
+        if (cheat_sequence[cheat_sequence_index] == 0)
+        {
+            SensibleDefaults();
+            cheat_sequence_index = 0;
+
+            window = TXT_MessageBox(NULL, "    \x01    ");
+
+            return 1;
+        }
+    }
+    else
+    {
+        cheat_sequence_index = 0;
+    }
+
+    return 0;
+}
+
+static void DoQuit(void *widget, void *dosave)
+{
+    if (dosave != NULL)
+    {
+        M_SaveDefaults();
+    }
+
+    TXT_Shutdown();
+
+    exit(0);
+}
+
+static void QuitConfirm(void *unused1, void *unused2)
+{
+    txt_window_t *window;
+    txt_label_t *label;
+    txt_button_t *yes_button;
+    txt_button_t *no_button;
+
+    window = TXT_NewWindow(NULL);
+
+    TXT_AddWidgets(window, 
+                   label = TXT_NewLabel("Exiting setup.\nSave settings?"),
+                   TXT_NewStrut(24, 0),
+                   yes_button = TXT_NewButton2("  Yes  ", DoQuit, DoQuit),
+                   no_button = TXT_NewButton2("  No   ", DoQuit, NULL),
+                   NULL);
+
+    TXT_SetWidgetAlign(label, TXT_HORIZ_CENTER);
+    TXT_SetWidgetAlign(yes_button, TXT_HORIZ_CENTER);
+    TXT_SetWidgetAlign(no_button, TXT_HORIZ_CENTER);
+
+    // Only an "abort" button in the middle.
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, 
+                        TXT_NewWindowAbortAction(window));
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+}
+
+static void LaunchDoom(void *unused1, void *unused2)
+{
+    execute_context_t *exec;
+    
+    // Save configuration first
+
+    M_SaveDefaults();
+
+    // Shut down textscreen GUI
+
+    TXT_Shutdown();
+
+    // Launch Doom
+
+    exec = NewExecuteContext();
+    PassThroughArguments(exec);
+    ExecuteDoom(exec);
+
+    exit(0);
+}
+
+static txt_button_t *GetLaunchButton(void)
+{
+    const char *label;
+
+    switch (gamemission)
+    {
+        case doom:
+            label = "Save parameters and launch DOOM";
+            break;
+        case heretic:
+            label = "Save parameters and launch Heretic";
+            break;
+        case hexen:
+            label = "Save parameters and launch Hexen";
+            break;
+        case strife:
+            label = "Save parameters and launch STRIFE!";
+            break;
+        default:
+            label = "Save parameters and launch game";
+            break;
+    }
+
+    return TXT_NewButton2(label, LaunchDoom, NULL);
+}
+
+void MainMenu(void)
+{
+    txt_window_t *window;
+    txt_window_action_t *quit_action;
+    txt_window_action_t *warp_action;
+
+    window = TXT_NewWindow("Main Menu");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_AddWidgets(window,
+        TXT_NewButton2("Configure Display",
+                       (TxtWidgetSignalFunc) ConfigDisplay, NULL),
+        TXT_NewButton2("Configure Sound",
+                       (TxtWidgetSignalFunc) ConfigSound, NULL),
+        TXT_NewButton2("Configure Keyboard",
+                       (TxtWidgetSignalFunc) ConfigKeyboard, NULL),
+        TXT_NewButton2("Configure Mouse",
+                       (TxtWidgetSignalFunc) ConfigMouse, NULL),
+        TXT_NewButton2("Configure Gamepad/Joystick",
+                       (TxtWidgetSignalFunc) ConfigJoystick, NULL),
+        TXT_NewButton2("Compatibility",
+                       (TxtWidgetSignalFunc) CompatibilitySettings, NULL),
+        GetLaunchButton(),
+        TXT_NewStrut(0, 1),
+        TXT_NewButton2("Start a Network Game",
+                       (TxtWidgetSignalFunc) StartMultiGame, NULL),
+        TXT_NewButton2("Join a Network Game",
+                       (TxtWidgetSignalFunc) JoinMultiGame, NULL),
+        TXT_NewButton2("Multiplayer Configuration",
+                       (TxtWidgetSignalFunc) MultiplayerConfig, NULL),
+        NULL);
+
+    quit_action = TXT_NewWindowAction(KEY_ESCAPE, "Quit");
+    warp_action = TXT_NewWindowAction(KEY_F2, "Warp");
+    TXT_SignalConnect(quit_action, "pressed", QuitConfirm, NULL);
+    TXT_SignalConnect(warp_action, "pressed",
+                      (TxtWidgetSignalFunc) WarpMenu, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, quit_action);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, warp_action);
+
+    TXT_SetKeyListener(window, MainMenuKeyPress, NULL);
+}
+
+//
+// Initialize all configuration variables, load config file, etc
+//
+
+static void InitConfig(void)
+{
+    M_SetConfigDir(NULL);
+    InitBindings();
+
+    SetChatMacroDefaults();
+    SetPlayerNameDefault();
+
+    M_LoadDefaults();
+
+    // Create and configure the music pack directory if it does not
+    // already exist.
+    M_SetMusicPackDir();
+}
+
+//
+// Application icon
+//
+
+static void SetIcon(void)
+{
+    SDL_Surface *surface;
+
+    surface = SDL_CreateRGBSurfaceFrom((void *) setup_icon_data, setup_icon_w,
+                                       setup_icon_h, 32, setup_icon_w * 4,
+                                       0xffu << 24, 0xffu << 16,
+                                       0xffu << 8, 0xffu << 0);
+
+    SDL_SetWindowIcon(TXT_SDLWindow, surface);
+    SDL_FreeSurface(surface);
+}
+
+static void SetWindowTitle(void)
+{
+    char *title;
+
+    title = M_StringReplace(PACKAGE_NAME " Setup ver " PACKAGE_VERSION,
+                            "Doom",
+                            GetGameTitle());
+
+
+    TXT_SetDesktopTitle(title);
+
+    free(title);
+}
+
+// Initialize the textscreen library.
+
+static void InitTextscreen(void)
+{
+    SetDisplayDriver();
+
+    if (!TXT_Init())
+    {
+        fprintf(stderr, "Failed to initialize GUI\n");
+        exit(-1);
+    }
+
+    // Set Romero's "funky blue" color:
+    // <https://doomwiki.org/wiki/Romero_Blue>
+    TXT_SetColor(TXT_COLOR_BLUE, 0x04, 0x14, 0x40);
+
+    SetIcon();
+    SetWindowTitle();
+}
+
+
+// 
+// Initialize and run the textscreen GUI.
+//
+
+static void RunGUI(void)
+{
+    InitTextscreen();
+
+    TXT_GUIMainLoop();
+}
+
+static void MissionSet(void)
+{
+    SetWindowTitle();
+    InitConfig();
+    MainMenu();
+}
+
+void D_DoomMain(void)
+{
+    SetupMission(MissionSet);
+
+    RunGUI();
+}
diff --git a/games/NXDoom/src/setup/mode.c b/games/NXDoom/src/setup/mode.c
new file mode 100644
index 000000000..0f6040943
--- /dev/null
+++ b/games/NXDoom/src/setup/mode.c
@@ -0,0 +1,384 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "config.h"
+#include "textscreen.h"
+
+#include "doomtype.h"
+#include "d_mode.h"
+#include "d_iwad.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+
+#include "compatibility.h"
+#include "display.h"
+#include "joystick.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "multiplayer.h"
+#include "sound.h"
+
+#include "mode.h"
+
+GameMission_t gamemission;
+static const iwad_t **iwads;
+
+typedef struct
+{
+    const char *label;
+    GameMission_t mission;
+    int mask;
+    const char *name;
+    const char *config_file;
+    const char *extra_config_file;
+    const char *executable;
+} mission_config_t;
+
+// Default mission to fall back on, if no IWADs are found at all:
+
+#define DEFAULT_MISSION (&mission_configs[0])
+
+static mission_config_t mission_configs[] =
+{
+    {
+        "Doom",
+        doom,
+        IWAD_MASK_DOOM,
+        "doom",
+        "default.cfg",
+        PROGRAM_PREFIX "doom.cfg",
+        PROGRAM_PREFIX "doom"
+    },
+    {
+        "Heretic",
+        heretic,
+        IWAD_MASK_HERETIC,
+        "heretic",
+        "heretic.cfg",
+        PROGRAM_PREFIX "heretic.cfg",
+        PROGRAM_PREFIX "heretic"
+    },
+    {
+        "Hexen",
+        hexen,
+        IWAD_MASK_HEXEN,
+        "hexen",
+        "hexen.cfg",
+        PROGRAM_PREFIX "hexen.cfg",
+        PROGRAM_PREFIX "hexen"
+    },
+    {
+        "Strife",
+        strife,
+        IWAD_MASK_STRIFE,
+        "strife",
+        "strife.cfg",
+        PROGRAM_PREFIX "strife.cfg",
+        PROGRAM_PREFIX "strife"
+    }
+};
+
+static GameSelectCallback game_selected_callback;
+
+// Miscellaneous variables that aren't used in setup.
+
+static int showMessages = 1;
+static int screenblocks = 9;
+static int detailLevel = 0;
+static char *savedir = NULL;
+static char *executable = NULL;
+static const char *game_title = "Doom";
+static char *back_flat = "F_PAVE01";
+static int comport = 0;
+static char *nickname = NULL;
+
+static void BindMiscVariables(void)
+{
+    if (gamemission == doom)
+    {
+        M_BindIntVariable("detaillevel",   &detailLevel);
+        M_BindIntVariable("show_messages", &showMessages);
+    }
+
+    if (gamemission == hexen)
+    {
+        M_BindStringVariable("savedir", &savedir);
+        M_BindIntVariable("messageson", &showMessages);
+
+        // Hexen has a variable to control the savegame directory
+        // that is used.
+
+        savedir = M_GetSaveGameDir("hexen.wad");
+
+        // On Windows, hexndata\ is the default.
+
+        if (!strcmp(savedir, ""))
+        {
+            free(savedir);
+            savedir = "hexndata" DIR_SEPARATOR_S;
+        }
+    }
+
+    if (gamemission == strife)
+    {
+        // Strife has a different default value than the other games
+        screenblocks = 10;
+
+        M_BindStringVariable("back_flat",   &back_flat);
+        M_BindStringVariable("nickname",    &nickname);
+
+        M_BindIntVariable("screensize",     &screenblocks);
+        M_BindIntVariable("comport",        &comport);
+    }
+    else
+    {
+        M_BindIntVariable("screenblocks",   &screenblocks);
+    }
+
+}
+
+//
+// Initialise all configuration file bindings.
+//
+
+void InitBindings(void)
+{
+    M_ApplyPlatformDefaults();
+
+    // Keyboard, mouse, joystick controls
+
+    M_BindBaseControls();
+    M_BindWeaponControls();
+    M_BindMapControls();
+    M_BindMenuControls();
+
+    if (gamemission == heretic || gamemission == hexen)
+    {
+        M_BindHereticControls();
+    }
+
+    if (gamemission == hexen)
+    {
+        M_BindHexenControls();
+    }
+
+    if (gamemission == strife)
+    {
+        M_BindStrifeControls();
+    }
+
+    // All other variables
+
+    BindCompatibilityVariables();
+    BindDisplayVariables();
+    BindJoystickVariables();
+    BindKeyboardVariables();
+    BindMouseVariables();
+    BindSoundVariables();
+    BindMiscVariables();
+    BindMultiplayerVariables();
+}
+
+// Set the name of the executable program to run the game:
+
+static void SetExecutable(mission_config_t *config)
+{
+    char *extension;
+
+    free(executable);
+
+#ifdef _WIN32
+    extension = ".exe";
+#else
+    extension = "";
+#endif
+
+    executable = M_StringJoin(config->executable, extension, NULL);
+}
+
+static void SetMission(mission_config_t *config)
+{
+    iwads = D_FindAllIWADs(config->mask);
+    gamemission = config->mission;
+    SetExecutable(config);
+    game_title = config->label;
+    M_SetConfigFilenames(config->config_file, config->extra_config_file);
+}
+
+static mission_config_t *GetMissionForName(const char *name)
+{
+    int i;
+
+    for (i=0; i<arrlen(mission_configs); ++i)
+    {
+        if (!strcmp(mission_configs[i].name, name))
+        {
+            return &mission_configs[i];
+        }
+    }
+
+    return NULL;
+}
+
+// Check the name of the executable.  If it contains one of the game
+// names (eg. chocolate-hexen-setup.exe) then use that game.
+
+static boolean CheckExecutableName(GameSelectCallback callback)
+{
+    mission_config_t *config;
+    const char *exe_name;
+    int i;
+
+    exe_name = M_GetExecutableName();
+
+    for (i=0; i<arrlen(mission_configs); ++i)
+    {
+        config = &mission_configs[i];
+
+        if (strstr(exe_name, config->name) != NULL)
+        {
+            SetMission(config);
+            callback();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static void GameSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(config))
+{
+    TXT_CAST_ARG(mission_config_t, config);
+
+    SetMission(config);
+    game_selected_callback();
+}
+
+static void OpenGameSelectDialog(GameSelectCallback callback)
+{
+    mission_config_t *mission = NULL;
+    txt_window_t *window;
+    const iwad_t **iwads;
+    int num_games;
+    int i;
+
+    window = TXT_NewWindow("Select game");
+
+    TXT_AddWidget(window, TXT_NewLabel("Select a game to configure:\n"));
+    num_games = 0;
+
+    // Add a button for each game.
+
+    for (i=0; i<arrlen(mission_configs); ++i)
+    {
+        // Do we have any IWADs for this game installed?
+        // If so, add a button.
+
+        iwads = D_FindAllIWADs(mission_configs[i].mask);
+
+        if (iwads[0] != NULL)
+        {
+            mission = &mission_configs[i];
+            TXT_AddWidget(window, TXT_NewButton2(mission_configs[i].label,
+                                                 GameSelected,
+                                                 &mission_configs[i]));
+            ++num_games;
+        }
+
+        free(iwads);
+    }
+
+    TXT_AddWidget(window, TXT_NewStrut(0, 1));
+
+    // No IWADs found at all?  Fall back to doom, then.
+
+    if (num_games == 0)
+    {
+        TXT_CloseWindow(window);
+        SetMission(DEFAULT_MISSION);
+        callback();
+        return;
+    }
+
+    // Only one game? Use that game, and don't bother with a dialog.
+
+    if (num_games == 1)
+    {
+        TXT_CloseWindow(window);
+        SetMission(mission);
+        callback();
+        return;
+    }
+
+    game_selected_callback = callback;
+}
+
+void SetupMission(GameSelectCallback callback)
+{
+    mission_config_t *config;
+    const char *mission_name;
+    int p;
+
+    //!
+    // @arg <game>
+    //
+    // Specify the game to configure the settings for.  Valid
+    // values are 'doom', 'heretic', 'hexen' and 'strife'.
+    //
+
+    p = M_CheckParm("-game");
+
+    if (p > 0)
+    {
+        mission_name = myargv[p + 1];
+
+        config = GetMissionForName(mission_name);
+
+        if (config == NULL)
+        {
+            I_Error("Invalid parameter - '%s'", mission_name);
+        }
+
+        SetMission(config);
+        callback();
+    }
+    else if (!CheckExecutableName(callback))
+    {
+        OpenGameSelectDialog(callback);
+    }
+}
+
+const char *GetExecutableName(void)
+{
+    return executable;
+}
+
+const char *GetGameTitle(void)
+{
+    return game_title;
+}
+
+const iwad_t **GetIwads(void)
+{
+    return iwads;
+}
+
diff --git a/games/NXDoom/src/setup/mode.h b/games/NXDoom/src/setup/mode.h
new file mode 100644
index 000000000..2687a4889
--- /dev/null
+++ b/games/NXDoom/src/setup/mode.h
@@ -0,0 +1,31 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_MODE_H
+#define SETUP_MODE_H
+
+#include "d_mode.h"
+#include "d_iwad.h"
+
+typedef void (*GameSelectCallback)(void);
+extern GameMission_t gamemission;
+
+void SetupMission(GameSelectCallback callback);
+void InitBindings(void);
+const char *GetExecutableName(void);
+const char *GetGameTitle(void);
+const iwad_t **GetIwads(void);
+
+#endif /* #ifndef SETUP_MODE_H */
+
diff --git a/games/NXDoom/src/setup/mouse.c b/games/NXDoom/src/setup/mouse.c
new file mode 100644
index 000000000..95a833209
--- /dev/null
+++ b/games/NXDoom/src/setup/mouse.c
@@ -0,0 +1,176 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+
+#include "textscreen.h"
+#include "doomtype.h"
+#include "m_config.h"
+#include "m_controls.h"
+
+#include "execute.h"
+#include "txt_mouseinput.h"
+
+#include "mode.h"
+#include "mouse.h"
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-mouse"
+
+static int usemouse = 1;
+
+static int mouseSensitivity = 5;
+static float mouse_acceleration = 2.0;
+static int mouse_threshold = 10;
+static int grabmouse = 1;
+
+int novert = 0;
+
+static int *all_mouse_buttons[] = {
+    &mousebfire,
+    &mousebstrafe,
+    &mousebforward,
+    &mousebstrafeleft,
+    &mousebstraferight,
+    &mousebbackward,
+    &mousebuse,
+    &mousebjump,
+    &mousebprevweapon,
+    &mousebnextweapon,
+    &mousebspeed,
+    &mousebinvleft,
+    &mousebinvright,
+    &mousebuseartifact,
+    &mousebturnleft,
+    &mousebturnright,
+};
+
+static void MouseSetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+{
+    TXT_CAST_ARG(int, variable);
+    unsigned int i;
+
+    // Check if the same mouse button is used for a different action
+    // If so, set the other action(s) to -1 (unset)
+
+    for (i=0; i<arrlen(all_mouse_buttons); ++i)
+    {
+        if (*all_mouse_buttons[i] == *variable
+         && all_mouse_buttons[i] != variable)
+        {
+            *all_mouse_buttons[i] = -1;
+        }
+    }
+}
+
+static void AddMouseControl(TXT_UNCAST_ARG(table), const char *label, int *var)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_mouse_input_t *mouse_input;
+
+    TXT_AddWidget(table, TXT_NewLabel(label));
+
+    mouse_input = TXT_NewMouseInput(var);
+    TXT_AddWidget(table, mouse_input);
+
+    TXT_SignalConnect(mouse_input, "set", MouseSetCallback, var);
+}
+
+static void ConfigExtraButtons(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+    txt_table_t *buttons_table;
+
+    window = TXT_NewWindow("Additional mouse buttons");
+
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_AddWidgets(window,
+                   buttons_table = TXT_NewTable(4),
+                   NULL);
+
+    TXT_SetColumnWidths(buttons_table, 16, 11, 16, 10);
+
+    AddMouseControl(buttons_table, "Move forward", &mousebforward);
+    AddMouseControl(buttons_table, "Strafe left", &mousebstrafeleft);
+    AddMouseControl(buttons_table, "Move backward", &mousebbackward);
+    AddMouseControl(buttons_table, "Strafe right", &mousebstraferight);
+    AddMouseControl(buttons_table, "Previous weapon", &mousebprevweapon);
+    AddMouseControl(buttons_table, "Strafe on", &mousebstrafe);
+    AddMouseControl(buttons_table, "Next weapon", &mousebnextweapon);
+    AddMouseControl(buttons_table, "Run", &mousebspeed);
+    
+    if (gamemission == heretic || gamemission == hexen)
+    {
+      AddMouseControl(buttons_table, "Inventory left", &mousebinvleft);
+      AddMouseControl(buttons_table, "Inventory right", &mousebinvright);
+      AddMouseControl(buttons_table, "Use artifact", &mousebuseartifact);
+    }
+
+    if (gamemission == hexen || gamemission == strife)
+    {
+        AddMouseControl(buttons_table, "Jump", &mousebjump);
+    }
+}
+
+void ConfigMouse(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+
+    window = TXT_NewWindow("Mouse configuration");
+
+    TXT_SetTableColumns(window, 2);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_AddWidgets(window,
+                   TXT_NewCheckBox("Enable mouse", &usemouse),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewInvertedCheckBox("Allow vertical mouse movement", 
+                                           &novert),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewCheckBox("Grab mouse in windowed mode", 
+                                   &grabmouse),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewCheckBox("Double click acts as \"use\"",
+                                   &dclick_use),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+
+                   TXT_NewSeparator("Mouse motion"),
+                   TXT_NewLabel("Speed"),
+                   TXT_NewSpinControl(&mouseSensitivity, 1, 256),
+                   TXT_NewLabel("Acceleration"),
+                   TXT_NewFloatSpinControl(&mouse_acceleration, 1.0, 5.0),
+                   TXT_NewLabel("Acceleration threshold"),
+                   TXT_NewSpinControl(&mouse_threshold, 0, 32),
+
+                   TXT_NewSeparator("Buttons"),
+                   NULL);
+
+    AddMouseControl(window, "Fire/Attack", &mousebfire);
+    AddMouseControl(window, "Use", &mousebuse);
+
+    TXT_AddWidget(window,
+                  TXT_NewButton2("More controls...", ConfigExtraButtons, NULL));
+}
+
+void BindMouseVariables(void)
+{
+    M_BindIntVariable("use_mouse",               &usemouse);
+    M_BindIntVariable("novert",                  &novert);
+    M_BindIntVariable("grabmouse",               &grabmouse);
+    M_BindIntVariable("mouse_sensitivity",       &mouseSensitivity);
+    M_BindIntVariable("mouse_threshold",         &mouse_threshold);
+    M_BindFloatVariable("mouse_acceleration",    &mouse_acceleration);
+}
diff --git a/games/NXDoom/src/setup/mouse.h b/games/NXDoom/src/setup/mouse.h
new file mode 100644
index 000000000..bc32bd555
--- /dev/null
+++ b/games/NXDoom/src/setup/mouse.h
@@ -0,0 +1,23 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_MOUSE_H
+#define SETUP_MOUSE_H
+
+void ConfigMouse(void *widget, void *user_data);
+void BindMouseVariables(void);
+
+extern int novert;
+
+#endif /* #ifndef SETUP_MOUSE_H */
diff --git a/games/NXDoom/src/setup/multiplayer.c b/games/NXDoom/src/setup/multiplayer.c
new file mode 100644
index 000000000..dfb2d2666
--- /dev/null
+++ b/games/NXDoom/src/setup/multiplayer.c
@@ -0,0 +1,1191 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "textscreen.h"
+
+#include "d_iwad.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "doom/d_englsh.h"
+#include "m_controls.h"
+
+#include "multiplayer.h"
+#include "mode.h"
+#include "execute.h"
+
+#include "net_io.h"
+#include "net_query.h"
+
+#include "net_petname.h"
+
+#define MULTI_START_HELP_URL "https://www.chocolate-doom.org/setup-multi-start"
+#define MULTI_JOIN_HELP_URL "https://www.chocolate-doom.org/setup-multi-join"
+#define MULTI_CONFIG_HELP_URL "https://www.chocolate-doom.org/setup-multi-config"
+#define LEVEL_WARP_HELP_URL "https://www.chocolate-doom.org/setup-level-warp"
+
+#define NUM_WADS 10
+#define NUM_EXTRA_PARAMS 10
+
+typedef enum
+{
+    WARP_ExMy,
+    WARP_MAPxy,
+} warptype_t;
+
+// Fallback IWADs to use if no IWADs are detected.
+
+static const iwad_t fallback_iwads[] = {
+    { "doom.wad",     doom,     registered,  "Doom" },
+    { "heretic.wad",  heretic,  retail,      "Heretic" },
+    { "hexen.wad",    hexen,    commercial,  "Hexen" },
+    { "strife1.wad",  strife,   commercial,  "Strife" },
+};
+
+// Array of IWADs found to be installed
+
+static const iwad_t **found_iwads;
+static const char **iwad_labels;
+
+// Index of the currently selected IWAD
+
+static int found_iwad_selected = -1;
+
+// Filename to pass to '-iwad'.
+
+static const char *iwadfile;
+
+static const char *wad_extensions[] = { "wad", "lmp", "deh", NULL };
+
+static const char *doom_skills[] =
+{
+    "I'm too young to die.", "Hey, not too rough.", "Hurt me plenty.",
+    "Ultra-Violence.", "NIGHTMARE!",
+};
+
+static const char *chex_skills[] =
+{
+    "Easy does it", "Not so sticky", "Gobs of goo", "Extreme ooze",
+    "SUPER SLIMEY!"
+};
+
+static const char *heretic_skills[] =
+{
+    "Thou needeth a wet-nurse", "Yellowbellies-R-us", "Bringest them oneth",
+    "Thou art a smite-meister", "Black plague possesses thee"
+};
+
+static const char *hexen_fighter_skills[] =
+{
+    "Squire", "Knight", "Warrior", "Berserker", "Titan"
+};
+
+static const char *hexen_cleric_skills[] =
+{
+    "Altar boy", "Acolyte", "Priest", "Cardinal", "Pope"
+};
+
+static const char *hexen_mage_skills[] =
+{
+    "Apprentice", "Enchanter", "Sorceror", "Warlock", "Archimage"
+};
+
+static const char *strife_skills[] =
+{
+    "Training", "Rookie", "Veteran", "Elite", "Bloodbath"
+};
+
+static const char *character_classes[] = { "Fighter", "Cleric", "Mage" };
+
+static const char *gamemodes[] = { "Co-operative", "Deathmatch", "Deathmatch 2.0" };
+
+static const char *strife_gamemodes[] =
+{
+    "Normal deathmatch",
+    "Items respawn", // (altdeath)
+};
+
+static char *net_player_name;
+static char *chat_macros[10];
+
+static char *wads[NUM_WADS];
+static char *extra_params[NUM_EXTRA_PARAMS];
+static int character_class = 0;
+static int skill = 2;
+static int nomonsters = 0;
+static int deathmatch = 0;
+static int strife_altdeath = 0;
+static int fast = 0;
+static int respawn = 0;
+static int udpport = 2342;
+static int timer = 0;
+static int privateserver = 0;
+
+static txt_dropdown_list_t *skillbutton;
+static txt_button_t *warpbutton;
+static warptype_t warptype = WARP_MAPxy;
+static int warpepisode = 1;
+static int warpmap = 1;
+
+// Address to connect to when joining a game
+
+static char *connect_address = NULL;
+
+static txt_window_t *query_window;
+static int query_servers_found;
+
+// Find an IWAD from its description
+
+static const iwad_t *GetCurrentIWAD(void)
+{
+    return found_iwads[found_iwad_selected];
+}
+
+// Is the currently selected IWAD the Chex Quest chex.wad?
+
+static boolean IsChexQuest(const iwad_t *iwad)
+{
+    return !strcmp(iwad->name, "chex.wad");
+}
+
+static void AddWADs(execute_context_t *exec)
+{
+    int have_wads = 0;
+    int i;
+ 
+    for (i=0; i<NUM_WADS; ++i)
+    {
+        if (wads[i] != NULL && strlen(wads[i]) > 0)
+        {
+            if (!have_wads)
+            {
+                AddCmdLineParameter(exec, "-merge");
+                have_wads = 1;
+            }
+
+            AddCmdLineParameter(exec, "\"%s\"", wads[i]);
+        }
+    }
+}
+
+static void AddExtraParameters(execute_context_t *exec)
+{
+    int i;
+    
+    for (i=0; i<NUM_EXTRA_PARAMS; ++i)
+    {
+        if (extra_params[i] != NULL && strlen(extra_params[i]) > 0)
+        {
+            AddCmdLineParameter(exec, "%s", extra_params[i]);
+        }
+    }
+}
+
+static void AddIWADParameter(execute_context_t *exec)
+{
+    if (iwadfile != NULL)
+    {
+        AddCmdLineParameter(exec, "-iwad %s", iwadfile);
+    }
+}
+
+// Callback function invoked to launch the game.
+// This is used when starting a server and also when starting a
+// single player game via the "warp" menu.
+
+static void StartGame(int multiplayer)
+{
+    execute_context_t *exec;
+
+    exec = NewExecuteContext();
+
+    // Extra parameters come first, before all others; this way,
+    // they can override any of the options set in the dialog.
+
+    AddExtraParameters(exec);
+
+    AddIWADParameter(exec);
+    AddCmdLineParameter(exec, "-skill %i", skill + 1);
+
+    if (gamemission == hexen)
+    {
+        AddCmdLineParameter(exec, "-class %i", character_class);
+    }
+
+    if (nomonsters)
+    {
+        AddCmdLineParameter(exec, "-nomonsters");
+    }
+
+    if (fast)
+    {
+        AddCmdLineParameter(exec, "-fast");
+    }
+
+    if (respawn)
+    {
+        AddCmdLineParameter(exec, "-respawn");
+    }
+
+    if (warptype == WARP_ExMy)
+    {
+        // TODO: select IWAD based on warp type
+        AddCmdLineParameter(exec, "-warp %i %i", warpepisode, warpmap);
+    }
+    else if (warptype == WARP_MAPxy)
+    {
+        AddCmdLineParameter(exec, "-warp %i", warpmap);
+    }
+
+    // Multiplayer-specific options:
+
+    if (multiplayer)
+    {
+        AddCmdLineParameter(exec, "-server");
+        AddCmdLineParameter(exec, "-port %i", udpport);
+
+        if (deathmatch == 1)
+        {
+            AddCmdLineParameter(exec, "-deathmatch");
+        }
+        else if (deathmatch == 2 || strife_altdeath != 0)
+        {
+            AddCmdLineParameter(exec, "-altdeath");
+        }
+
+        if (timer > 0)
+        {
+            AddCmdLineParameter(exec, "-timer %i", timer);
+        }
+
+        if (privateserver)
+        {
+            AddCmdLineParameter(exec, "-privateserver");
+        }
+    }
+
+    AddWADs(exec);
+
+    TXT_Shutdown();
+ 
+    M_SaveDefaults();
+    PassThroughArguments(exec);
+
+    ExecuteDoom(exec);
+
+    exit(0);
+}
+
+static void StartServerGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    StartGame(1);
+}
+
+static void StartSinglePlayerGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    StartGame(0);
+}
+
+static void UpdateWarpButton(void)
+{
+    char buf[10];
+
+    if (warptype == WARP_ExMy)
+    {
+        M_snprintf(buf, sizeof(buf), "E%iM%i", warpepisode, warpmap);
+    }
+    else if (warptype == WARP_MAPxy)
+    {
+        M_snprintf(buf, sizeof(buf), "MAP%02i", warpmap);
+    }
+
+    TXT_SetButtonLabel(warpbutton, buf);
+}
+
+static void UpdateSkillButton(void)
+{
+    const iwad_t *iwad = GetCurrentIWAD();
+
+    if (IsChexQuest(iwad))
+    {
+        skillbutton->values = chex_skills;
+    }
+    else switch(gamemission)
+    {
+        default:
+        case doom:
+            skillbutton->values = doom_skills;
+            break;
+
+        case heretic:
+            skillbutton->values = heretic_skills;
+            break;
+
+        case hexen:
+            if (character_class == 0)
+            {
+                skillbutton->values = hexen_fighter_skills;
+            }
+            else if (character_class == 1)
+            {
+                skillbutton->values = hexen_cleric_skills;
+            }
+            else
+            {
+                skillbutton->values = hexen_mage_skills;
+            }
+            break;
+
+        case strife:
+            skillbutton->values = strife_skills;
+            break;
+    }
+}
+
+static void SetExMyWarp(TXT_UNCAST_ARG(widget), void *val)
+{
+    int l;
+
+    l = (intptr_t) val;
+
+    warpepisode = l / 10;
+    warpmap = l % 10;
+
+    UpdateWarpButton();
+}
+
+static void SetMAPxyWarp(TXT_UNCAST_ARG(widget), void *val)
+{
+    int l;
+
+    l = (intptr_t) val;
+
+    warpmap = l;
+
+    UpdateWarpButton();
+}
+
+static void CloseLevelSelectDialog(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(window))
+{
+    TXT_CAST_ARG(txt_window_t, window);
+
+    TXT_CloseWindow(window);
+}
+
+static void LevelSelectDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
+{
+    txt_window_t *window;
+    txt_button_t *button;
+    const iwad_t *iwad;
+    char buf[10];
+    int episodes;
+    int x, y;
+    int l;
+    int i;
+
+    window = TXT_NewWindow("Select level");
+    iwad = GetCurrentIWAD();
+
+    if (warptype == WARP_ExMy)
+    {
+        episodes = D_GetNumEpisodes(iwad->mission, iwad->mode);
+        TXT_SetTableColumns(window, episodes);
+
+        // ExMy levels
+
+        for (y=1; y<10; ++y)
+        {
+            for (x=1; x<=episodes; ++x)
+            {
+                if (IsChexQuest(iwad) && (x > 1 || y > 5))
+                {
+                    continue;
+                }
+
+                if (!D_ValidEpisodeMap(iwad->mission, iwad->mode, x, y))
+                {
+                    TXT_AddWidget(window, NULL);
+                    continue;
+                }
+
+                M_snprintf(buf, sizeof(buf),
+                           " E%dM%d ", x, y);
+                button = TXT_NewButton(buf);
+                TXT_SignalConnect(button, "pressed",
+                                  SetExMyWarp, (void *) (intptr_t) (x * 10 + y));
+                TXT_SignalConnect(button, "pressed",
+                                  CloseLevelSelectDialog, window);
+                TXT_AddWidget(window, button);
+
+                if (warpepisode == x && warpmap == y)
+                {
+                    TXT_SelectWidget(window, button);
+                }
+            }
+        }
+    }
+    else
+    {
+        TXT_SetTableColumns(window, 6);
+
+        for (i=0; i<60; ++i)
+        {
+            x = i % 6;
+            y = i / 6;
+
+            l = x * 10 + y + 1;
+
+            if (!D_ValidEpisodeMap(iwad->mission, iwad->mode, 1, l))
+            {
+                TXT_AddWidget(window, NULL);
+                continue;
+            }
+
+            M_snprintf(buf, sizeof(buf), " MAP%02d ", l);
+            button = TXT_NewButton(buf);
+            TXT_SignalConnect(button, "pressed", 
+                              SetMAPxyWarp, (void *) (intptr_t) l);
+            TXT_SignalConnect(button, "pressed",
+                              CloseLevelSelectDialog, window);
+            TXT_AddWidget(window, button);
+
+            if (warpmap == l)
+            {
+                TXT_SelectWidget(window, button);
+            }
+        }
+    }
+}
+
+static void IWADSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    const iwad_t *iwad;
+
+    // Find the iwad_t selected
+
+    iwad = GetCurrentIWAD();
+
+    // Update iwadfile
+
+    iwadfile = iwad->name;
+}
+
+// Called when the IWAD button is changed, to update warptype.
+
+static void UpdateWarpType(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    warptype_t new_warptype;
+    const iwad_t *iwad;
+
+    // Get the selected IWAD
+
+    iwad = GetCurrentIWAD();
+
+    // Find the new warp type
+
+    if (D_IsEpisodeMap(iwad->mission))
+    {
+        new_warptype = WARP_ExMy;
+    }
+    else
+    {
+        new_warptype = WARP_MAPxy;
+    }
+
+    // Reset to E1M1 / MAP01 when the warp type is changed.
+
+    if (new_warptype != warptype)
+    {
+        warpepisode = 1;
+        warpmap = 1;
+    }
+
+    warptype = new_warptype;
+
+    UpdateWarpButton();
+    UpdateSkillButton();
+}
+
+// Get an IWAD list with a default fallback IWAD that is appropriate
+// for the game we are configuring (matches gamemission global variable).
+
+static const iwad_t **GetFallbackIwadList(void)
+{
+    static const iwad_t *fallback_iwad_list[2];
+    unsigned int i;
+
+    // Default to use if we don't find something better.
+
+    fallback_iwad_list[0] = &fallback_iwads[0];
+    fallback_iwad_list[1] = NULL;
+
+    for (i = 0; i < arrlen(fallback_iwads); ++i)
+    {
+        if (gamemission == fallback_iwads[i].mission)
+        {
+            fallback_iwad_list[0] = &fallback_iwads[i];
+            break;
+        }
+    }
+
+    return fallback_iwad_list;
+}
+
+static txt_widget_t *IWADSelector(void)
+{
+    txt_dropdown_list_t *dropdown;
+    txt_widget_t *result;
+    int num_iwads;
+    unsigned int i;
+
+    // Find out what WADs are installed
+
+    found_iwads = GetIwads();
+
+    // Build a list of the descriptions for all installed IWADs
+
+    num_iwads = 0;
+
+    for (i=0; found_iwads[i] != NULL; ++i)
+    {
+         ++num_iwads;
+    }
+
+    iwad_labels = malloc(sizeof(*iwad_labels) * num_iwads);
+
+    for (i=0; i < num_iwads; ++i)
+    {
+        iwad_labels[i] = found_iwads[i]->description;
+    }
+
+    // If no IWADs are found, provide Doom 2 as an option, but
+    // we're probably screwed.
+
+    if (num_iwads == 0)
+    {
+        found_iwads = GetFallbackIwadList();
+        num_iwads = 1;
+    }
+
+    // Build a dropdown list of IWADs
+
+    if (num_iwads < 2)
+    {
+        // We have only one IWAD.  Show as a label.
+
+        result = (txt_widget_t *) TXT_NewLabel(found_iwads[0]->description);
+    }
+    else
+    {
+        // Dropdown list allowing IWAD to be selected.
+
+        dropdown = TXT_NewDropdownList(&found_iwad_selected, 
+                                       iwad_labels, num_iwads);
+
+        TXT_SignalConnect(dropdown, "changed", IWADSelected, NULL);
+
+        result = (txt_widget_t *) dropdown;
+    }
+
+    // The first time the dialog is opened, found_iwad_selected=-1,
+    // so select the first IWAD in the list. Don't lose the setting
+    // if we close and reopen the dialog.
+
+    if (found_iwad_selected < 0 || found_iwad_selected >= num_iwads)
+    {
+        found_iwad_selected = 0;
+    }
+
+    IWADSelected(NULL, NULL);
+
+    return result;
+}
+
+// Create the window action button to start the game.  This invokes
+// a different callback depending on whether to start a multiplayer
+// or single player game.
+
+static txt_window_action_t *StartGameAction(int multiplayer)
+{
+    txt_window_action_t *action;
+    TxtWidgetSignalFunc callback;
+
+    action = TXT_NewWindowAction(KEY_F10, "Start");
+
+    if (multiplayer)
+    {
+        callback = StartServerGame;
+    }
+    else
+    {
+        callback = StartSinglePlayerGame;
+    }
+
+    TXT_SignalConnect(action, "pressed", callback, NULL);
+
+    return action;
+}
+
+static void OpenWadsWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
+{
+    txt_window_t *window;
+    int i;
+
+    window = TXT_NewWindow("Add WADs");
+
+    for (i=0; i<NUM_WADS; ++i)
+    {
+        TXT_AddWidget(window,
+                      TXT_NewFileSelector(&wads[i], 60, "Select a WAD file",
+                                          wad_extensions));
+    }
+}
+
+static void OpenExtraParamsWindow(TXT_UNCAST_ARG(widget), 
+                                  TXT_UNCAST_ARG(user_data))
+{
+    txt_window_t *window;
+    int i;
+
+    window = TXT_NewWindow("Extra command line parameters");
+    
+    for (i=0; i<NUM_EXTRA_PARAMS; ++i)
+    {
+        TXT_AddWidget(window, TXT_NewInputBox(&extra_params[i], 70));
+    }
+}
+
+static txt_window_action_t *WadWindowAction(void)
+{
+    txt_window_action_t *action;
+
+    action = TXT_NewWindowAction('w', "Add WADs");
+    TXT_SignalConnect(action, "pressed", OpenWadsWindow, NULL);
+
+    return action;
+}
+
+static txt_dropdown_list_t *GameTypeDropdown(void)
+{
+    switch (gamemission)
+    {
+        case doom:
+        default:
+            return TXT_NewDropdownList(&deathmatch, gamemodes, 3);
+
+        // Heretic and Hexen don't support Deathmatch II:
+
+        case heretic:
+        case hexen:
+            return TXT_NewDropdownList(&deathmatch, gamemodes, 2);
+
+        // Strife supports both deathmatch modes, but doesn't support
+        // multiplayer co-op. Use a different variable to indicate whether
+        // to use altdeath or not.
+
+        case strife:
+            return TXT_NewDropdownList(&strife_altdeath, strife_gamemodes, 2);
+    }
+}
+
+// "Start game" menu.  This is used for the start server window
+// and the single player warp menu.  The parameters specify
+// the window title and whether to display multiplayer options.
+
+static void StartGameMenu(const char *window_title, int multiplayer)
+{
+    txt_window_t *window;
+    txt_widget_t *iwad_selector;
+
+    window = TXT_NewWindow(window_title);
+    TXT_SetTableColumns(window, 2);
+    TXT_SetColumnWidths(window, 12, 6);
+
+    if (multiplayer)
+    {
+        TXT_SetWindowHelpURL(window, MULTI_START_HELP_URL);
+    }
+    else
+    {
+        TXT_SetWindowHelpURL(window, LEVEL_WARP_HELP_URL);
+    }
+
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, WadWindowAction());
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, StartGameAction(multiplayer));
+
+    TXT_AddWidgets(window,
+                   TXT_NewLabel("Game"),
+                   iwad_selector = IWADSelector(),
+                   NULL);
+
+    if (gamemission == hexen)
+    {
+        txt_dropdown_list_t *cc_dropdown;
+        TXT_AddWidgets(window,
+                       TXT_NewLabel("Character class "),
+                       cc_dropdown = TXT_NewDropdownList(&character_class,
+                                                         character_classes, 3),
+                       NULL);
+
+        // Update skill level dropdown when the character class is changed:
+
+        TXT_SignalConnect(cc_dropdown, "changed", UpdateWarpType, NULL);
+    }
+
+    TXT_AddWidgets(window,
+                   TXT_NewLabel("Skill"),
+                   skillbutton = TXT_NewDropdownList(&skill, doom_skills, 5),
+                   TXT_NewLabel("Level warp"),
+                   warpbutton = TXT_NewButton2("?", LevelSelectDialog, NULL),
+                   NULL);
+
+    if (multiplayer)
+    {
+        TXT_AddWidgets(window,
+               TXT_NewLabel("Game type"),
+               GameTypeDropdown(),
+               TXT_NewLabel("Time limit"),
+               TXT_NewHorizBox(TXT_NewIntInputBox(&timer, 2),
+                               TXT_NewLabel("minutes"),
+                               NULL),
+               NULL);
+    }
+
+    TXT_AddWidgets(window,
+                   TXT_NewSeparator("Monster options"),
+                   TXT_NewInvertedCheckBox("Monsters enabled", &nomonsters),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewCheckBox("Fast monsters", &fast),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewCheckBox("Respawning monsters", &respawn),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   NULL);
+
+    if (multiplayer)
+    {
+        TXT_AddWidgets(window,
+                       TXT_NewSeparator("Advanced"),
+                       TXT_NewLabel("UDP port"),
+                       TXT_NewIntInputBox(&udpport, 5),
+                       TXT_NewInvertedCheckBox("Register with master server",
+                                               &privateserver),
+                       TXT_TABLE_OVERFLOW_RIGHT,
+                       NULL);
+    }
+
+    TXT_AddWidgets(window,
+                   TXT_NewButton2("Add extra parameters...",
+                                  OpenExtraParamsWindow, NULL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   NULL);
+
+    TXT_SignalConnect(iwad_selector, "changed", UpdateWarpType, NULL);
+
+    UpdateWarpType(NULL, NULL);
+    UpdateWarpButton();
+}
+
+void StartMultiGame(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    StartGameMenu("Start multiplayer game", 1);
+}
+
+void WarpMenu(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    StartGameMenu("Level Warp", 0);
+}
+
+static void DoJoinGame(void *unused1, void *unused2)
+{
+    execute_context_t *exec;
+
+    if (connect_address == NULL || strlen(connect_address) <= 0)
+    {
+        TXT_MessageBox(NULL, "Please enter a server address\n"
+                             "to connect to.");
+        return;
+    }
+
+    exec = NewExecuteContext();
+
+    AddCmdLineParameter(exec, "-connect %s", connect_address);
+
+    if (gamemission == hexen)
+    {
+        AddCmdLineParameter(exec, "-class %i", character_class);
+    }
+
+    // Extra parameters come first, so that they can be used to override
+    // the other parameters.
+
+    AddExtraParameters(exec);
+    AddIWADParameter(exec);
+    AddWADs(exec);
+
+    TXT_Shutdown();
+    
+    M_SaveDefaults();
+
+    PassThroughArguments(exec);
+
+    ExecuteDoom(exec);
+
+    exit(0);
+}
+
+static txt_window_action_t *JoinGameAction(void)
+{
+    txt_window_action_t *action;
+
+    action = TXT_NewWindowAction(KEY_F10, "Connect");
+    TXT_SignalConnect(action, "pressed", DoJoinGame, NULL);
+
+    return action;
+}
+
+static void SelectQueryAddress(TXT_UNCAST_ARG(button),
+                               TXT_UNCAST_ARG(querydata))
+{
+    TXT_CAST_ARG(txt_button_t, button);
+    TXT_CAST_ARG(net_querydata_t, querydata);
+    int i;
+
+    if (querydata->server_state != 0)
+    {
+        TXT_MessageBox("Cannot connect to server",
+                       "Gameplay is already in progress\n"
+                       "on this server.");
+        return;
+    }
+
+    // Set address to connect to:
+
+    free(connect_address);
+    connect_address = M_StringDuplicate(button->label);
+
+    // Auto-choose IWAD if there is already a player connected.
+
+    if (querydata->num_players > 0)
+    {
+        for (i = 0; found_iwads[i] != NULL; ++i)
+        {
+            if (found_iwads[i]->mode == querydata->gamemode
+             && found_iwads[i]->mission == querydata->gamemission)
+            {
+                found_iwad_selected = i;
+                iwadfile = found_iwads[i]->name;
+                break;
+            }
+        }
+
+        if (found_iwads[i] == NULL)
+        {
+            TXT_MessageBox(NULL,
+                           "The game on this server seems to be:\n"
+                           "\n"
+                           "   %s\n"
+                           "\n"
+                           "but the IWAD file %s is not found!\n"
+                           "Without the required IWAD file, it may not be\n"
+                           "possible to join this game.",
+                           D_SuggestGameName(querydata->gamemission,
+                                             querydata->gamemode),
+                           D_SuggestIWADName(querydata->gamemission,
+                                             querydata->gamemode));
+        }
+    }
+
+    // Finished with search.
+
+    TXT_CloseWindow(query_window);
+}
+
+static void QueryResponseCallback(net_addr_t *addr,
+                                  net_querydata_t *querydata,
+                                  unsigned int ping_time,
+                                  TXT_UNCAST_ARG(results_table))
+{
+    TXT_CAST_ARG(txt_table_t, results_table);
+    char ping_time_str[16];
+    char description[47];
+
+    // When we connect we'll have to negotiate a common protocol that we
+    // can agree upon between the client and server. If we can't then we
+    // won't be able to connect, so it's pointless to include it in the
+    // results list. If protocol==NET_PROTOCOL_UNKNOWN then this may be
+    // an old, pre-3.0 Chocolate Doom server that doesn't support the new
+    // protocol negotiation mechanism, or it may be an incompatible fork.
+    if (querydata->protocol == NET_PROTOCOL_UNKNOWN)
+    {
+        return;
+    }
+
+    M_snprintf(ping_time_str, sizeof(ping_time_str), "%ims", ping_time);
+
+    // Build description from server name field. Because there is limited
+    // space, we only include the player count if there are already players
+    // connected to the server.
+    if (querydata->num_players > 0)
+    {
+        M_snprintf(description, sizeof(description), "(%d/%d) ",
+                   querydata->num_players, querydata->max_players);
+    }
+    else
+    {
+        M_StringCopy(description, "", sizeof(description));
+    }
+
+    M_StringConcat(description, querydata->description, sizeof(description));
+
+    TXT_AddWidgets(results_table,
+                   TXT_NewLabel(ping_time_str),
+                   TXT_NewButton2(NET_AddrToString(addr),
+                                  SelectQueryAddress, querydata),
+                   TXT_NewLabel(description),
+                   NULL);
+
+    ++query_servers_found;
+}
+
+static void QueryPeriodicCallback(TXT_UNCAST_ARG(results_table))
+{
+    TXT_CAST_ARG(txt_table_t, results_table);
+
+    if (!NET_Query_Poll(QueryResponseCallback, results_table))
+    {
+        TXT_SetPeriodicCallback(NULL, NULL, 0);
+
+        if (query_servers_found == 0)
+        {
+            TXT_AddWidgets(results_table,
+                TXT_TABLE_EMPTY,
+                TXT_NewLabel("No compatible servers found."),
+                NULL
+            );
+        }
+    }
+}
+
+static void QueryWindowClosed(TXT_UNCAST_ARG(window), void *unused)
+{
+    TXT_SetPeriodicCallback(NULL, NULL, 0);
+}
+
+static void ServerQueryWindow(const char *title)
+{
+    txt_table_t *results_table;
+
+    query_servers_found = 0;
+
+    query_window = TXT_NewWindow(title);
+
+    TXT_AddWidget(query_window,
+                  TXT_NewScrollPane(70, 10,
+                                    results_table = TXT_NewTable(3)));
+
+    TXT_SetColumnWidths(results_table, 7, 22, 40);
+    TXT_SetPeriodicCallback(QueryPeriodicCallback, results_table, 1);
+
+    TXT_SignalConnect(query_window, "closed", QueryWindowClosed, NULL);
+}
+
+static void FindInternetServer(TXT_UNCAST_ARG(widget),
+                               TXT_UNCAST_ARG(user_data))
+{
+    NET_StartMasterQuery();
+    ServerQueryWindow("Find Internet server");
+}
+
+static void FindLANServer(TXT_UNCAST_ARG(widget),
+                          TXT_UNCAST_ARG(user_data))
+{
+    NET_StartLANQuery();
+    ServerQueryWindow("Find LAN server");
+}
+
+void JoinMultiGame(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+    txt_inputbox_t *address_box;
+
+    window = TXT_NewWindow("Join multiplayer game");
+    TXT_SetTableColumns(window, 2);
+    TXT_SetColumnWidths(window, 12, 12);
+
+    TXT_SetWindowHelpURL(window, MULTI_JOIN_HELP_URL);
+
+    TXT_AddWidgets(window,
+                   TXT_NewLabel("Game"),
+                   IWADSelector(),
+                   NULL);
+
+    if (gamemission == hexen)
+    {
+        TXT_AddWidgets(window,
+                       TXT_NewLabel("Character class "),
+                       TXT_NewDropdownList(&character_class,
+                                           character_classes, 3),
+                       NULL);
+    }
+
+    TXT_AddWidgets(window,
+                   TXT_NewSeparator("Server"),
+                   TXT_NewLabel("Connect to address: "),
+                   address_box = TXT_NewInputBox(&connect_address, 30),
+
+                   TXT_NewButton2("Find server on Internet...",
+                                  FindInternetServer, NULL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewButton2("Find server on local network...",
+                                  FindLANServer, NULL),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewStrut(0, 1),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewButton2("Add extra parameters...",
+                                  OpenExtraParamsWindow, NULL),
+                   NULL);
+
+    TXT_SelectWidget(window, address_box);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, WadWindowAction());
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, JoinGameAction());
+}
+
+void SetChatMacroDefaults(void)
+{
+    int i;
+    const char *const defaults[] =
+    {
+        HUSTR_CHATMACRO0,
+        HUSTR_CHATMACRO1,
+        HUSTR_CHATMACRO2,
+        HUSTR_CHATMACRO3,
+        HUSTR_CHATMACRO4,
+        HUSTR_CHATMACRO5,
+        HUSTR_CHATMACRO6,
+        HUSTR_CHATMACRO7,
+        HUSTR_CHATMACRO8,
+        HUSTR_CHATMACRO9,
+    };
+    
+    // If the chat macros have not been set, initialize with defaults.
+
+    for (i=0; i<10; ++i)
+    {
+        if (chat_macros[i] == NULL)
+        {
+            chat_macros[i] = M_StringDuplicate(defaults[i]);
+        }
+    }
+}
+
+void SetPlayerNameDefault(void)
+{
+    if (net_player_name == NULL)
+    {
+        net_player_name = NET_GetRandomPetName();
+    }
+}
+
+void MultiplayerConfig(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+    txt_label_t *label;
+    txt_table_t *table;
+    char buf[10];
+    int i;
+
+    window = TXT_NewWindow("Multiplayer Configuration");
+    TXT_SetWindowHelpURL(window, MULTI_CONFIG_HELP_URL);
+
+    TXT_AddWidgets(window,
+                   TXT_NewStrut(0, 1),
+                   TXT_NewHorizBox(TXT_NewLabel("Player name:  "),
+                                   TXT_NewInputBox(&net_player_name, 25),
+                                   NULL),
+                   TXT_NewStrut(0, 1),
+                   TXT_NewSeparator("Chat macros"),
+                   NULL);
+
+    table = TXT_NewTable(2);
+
+    for (i=0; i<10; ++i)
+    {
+        M_snprintf(buf, sizeof(buf), "#%i ", i + 1);
+
+        label = TXT_NewLabel(buf);
+        TXT_SetFGColor(label, TXT_COLOR_BRIGHT_CYAN);
+
+        TXT_AddWidgets(table,
+                       label,
+                       TXT_NewInputBox(&chat_macros[(i + 1) % 10], 40),
+                       NULL);
+    }
+
+    TXT_AddWidget(window, table);
+}
+
+void BindMultiplayerVariables(void)
+{
+    char buf[15];
+    int i;
+
+    M_BindStringVariable("player_name", &net_player_name);
+
+    for (i=0; i<10; ++i)
+    {
+        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
+        M_BindStringVariable(buf, &chat_macros[i]);
+    }
+
+    switch (gamemission)
+    {
+        case doom:
+            M_BindChatControls(4);
+            key_multi_msgplayer[0] = 'g';
+            key_multi_msgplayer[1] = 'i';
+            key_multi_msgplayer[2] = 'b';
+            key_multi_msgplayer[3] = 'r';
+            break;
+
+        case heretic:
+            M_BindChatControls(4);
+            key_multi_msgplayer[0] = 'g';
+            key_multi_msgplayer[1] = 'y';
+            key_multi_msgplayer[2] = 'r';
+            key_multi_msgplayer[3] = 'b';
+            break;
+
+        case hexen:
+            M_BindChatControls(8);
+            key_multi_msgplayer[0] = 'b';
+            key_multi_msgplayer[1] = 'r';
+            key_multi_msgplayer[2] = 'y';
+            key_multi_msgplayer[3] = 'g';
+            key_multi_msgplayer[4] = 'j';
+            key_multi_msgplayer[5] = 'w';
+            key_multi_msgplayer[6] = 'h';
+            key_multi_msgplayer[7] = 'p';
+            break;
+
+        default:
+            break;
+    }
+}
+
diff --git a/games/NXDoom/src/setup/multiplayer.h b/games/NXDoom/src/setup/multiplayer.h
new file mode 100644
index 000000000..911afbd0c
--- /dev/null
+++ b/games/NXDoom/src/setup/multiplayer.h
@@ -0,0 +1,29 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_MULTIPLAYER_H
+#define SETUP_MULTIPLAYER_H
+
+void StartMultiGame(void *widget, void *user_data);
+void WarpMenu(void *widget, void *user_data);
+void JoinMultiGame(void *widget, void *user_data);
+void MultiplayerConfig(void *widget, void *user_data);
+
+void SetChatMacroDefaults(void);
+void SetPlayerNameDefault(void);
+
+void BindMultiplayerVariables(void);
+
+#endif /* #ifndef SETUP_MULTIPLAYER_H */
+
diff --git a/games/NXDoom/src/setup/setup-manifest.xml.in b/games/NXDoom/src/setup/setup-manifest.xml.in
new file mode 100644
index 000000000..111ad0f88
--- /dev/null
+++ b/games/NXDoom/src/setup/setup-manifest.xml.in
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- Magic manifest file that should make Windows Vista/7 not
+     attempt to gain elevated privileges for chocolate-setup.
+     
+     Based on:
+     
+     http://www.cygwin.com/ml/cygwin/2006-12/msg00580.html
+  -->
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
+          manifestVersion="1.0">
+
+  <!-- The "name" field in this tag should be the same as the executable's
+       name -->
+  <assemblyIdentity version="0.0.0.0" processorArchitecture="X86"
+                    name="@PROGRAM_PREFIX@setup.exe" type="win32"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <!-- Stop the Program Compatibility Assistant appearing: -->
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- 8 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- 8.1 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- 10 -->
+    </application>
+  </compatibility>
+
+  <!-- Declare app as DPI aware, so that Windows Vista and later will not
+       apply DPI virtualization. -->
+
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
+
diff --git a/games/NXDoom/src/setup/setup_icon.c b/games/NXDoom/src/setup/setup_icon.c
new file mode 100644
index 000000000..748cc93e9
--- /dev/null
+++ b/games/NXDoom/src/setup/setup_icon.c
@@ -0,0 +1,2736 @@
+static int setup_icon_w = 128;
+static int setup_icon_h = 128;
+
+static const unsigned int setup_icon_data[] = {
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
+    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
+    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
+    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
+    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
+    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
+    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
+    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
+    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
+    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
+    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
+    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
+    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
+    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
+    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
+    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
+    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
+    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
+    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
+    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
+    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
+    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
+    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
+    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
+    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
+    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
+    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
+    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
+    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
+    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
+    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
+    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
+    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
+    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
+    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
+    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
+    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
+    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
+    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
+    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
+    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
+    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
+    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
+    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
+    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
+    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x93756aff, 0x90756aff, 0x8b7974ff, 0x877b7bff, 
+    0x877b7bff, 0x877b7bff, 0x877b7bff, 0x877b7bff, 0x877b7bff, 0x928888ff, 
+    0xaba3a3ff, 0xaaa3a3ff, 0xaaa3a3ff, 0xa9a2a2ff, 0xa8a2a2ff, 0xa7a1a0ff, 
+    0xa6a09fff, 0xa6a09fff, 0xa59e9eff, 0x938989ff, 0x867a7aff, 0x867a79ff, 
+    0x867a79ff, 0x867979ff, 0x857878ff, 0x837676ff, 0x817474ff, 0x7f7272ff, 
+    0x807373ff, 0x928989ff, 0x968e8eff, 0x958d8dff, 0x938b8cff, 0x918989ff, 
+    0x8e8787ff, 0x8d8585ff, 0x8c8484ff, 0x898282ff, 0x837b7bff, 0x695c5cff, 
+    0x675a5aff, 0x655959ff, 0x635657ff, 0x615455ff, 0x5f5253ff, 0x5e5152ff, 
+    0x5c4e4fff, 0x5a4c4dff, 0x665a5bff, 0x756d6dff, 0x736b6bff, 0x72696aff, 
+    0x706767ff, 0x6e6666ff, 0x6d6464ff, 0x6b6262ff, 0x685f60ff, 0x685f5fff, 
+    0x504344ff, 0x443637ff, 0x423336ff, 0x45373bff, 0x473a41ff, 0x4a3c47ff, 
+    0x4c3f4bff, 0x54424dff, 0x5e454cff, 0x674e55ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
+    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
+    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
+    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
+    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
+    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
+    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
+    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
+    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
+    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
+    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
+    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
+    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
+    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
+    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
+    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
+    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
+    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
+    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
+    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
+    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8e9faeff, 0x94a5b3ff, 
+    0x93a3b2ff, 0x93a3b2ff, 0x92a2b1ff, 0x92a1b1ff, 0x91a0b0ff, 0x90a0afff, 
+    0x8f9faeff, 0x8394a5ff, 0x647b92ff, 0x647a92ff, 0x647a92ff, 0x647a91ff, 
+    0x647a91ff, 0x647990ff, 0x637890ff, 0x637890ff, 0x637890ff, 0x78899cff, 
+    0x8795a5ff, 0x8694a4ff, 0x8694a4ff, 0x8593a3ff, 0x8490a1ff, 0x828ea0ff, 
+    0x808d9dff, 0x7f8b9cff, 0x7c899aff, 0x5c6e86ff, 0x566882ff, 0x546680ff, 
+    0x53657eff, 0x51627cff, 0x4f617aff, 0x4d5e78ff, 0x4c5d77ff, 0x495b75ff, 
+    0x4f5f77ff, 0x697486ff, 0x687384ff, 0x677183ff, 0x656f81ff, 0x636e80ff, 
+    0x626c7eff, 0x606a7cff, 0x5e697aff, 0x5c6678ff, 0x4b576dff, 0x35435fff, 
+    0x33415cff, 0x32405bff, 0x2f3d58ff, 0x2e3b57ff, 0x2c3955ff, 0x2a3854ff, 
+    0x283552ff, 0x273450ff, 0x3f485eff, 0x485063ff, 0x464f61ff, 0x475065ff, 
+    0x485067ff, 0x475169ff, 0x49526cff, 0x4a536eff, 0x4b5471ff, 0x4c5573ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x1b3f5eff, 0x1a3e60ff, 0x1a3e5fff, 0x193d5fff, 0x193c5eff, 0x193c5eff, 
+    0x183b5dff, 0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 
+    0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 
+    0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
+    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
+    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
+    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
+    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
+    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
+    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
+    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x1b3e5eff, 0x1a3e5fff, 0x193d5fff, 0x193c5eff, 
+    0x193c5eff, 0x183b5dff, 0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 
+    0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 
+    0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 
+    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
+    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
+    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
+    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
+    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
+    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
+    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
+    0x041541ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1b3e5dff, 0x193d5fff, 
+    0x193c5eff, 0x193c5eff, 0x183b5dff, 0x183a5dff, 0x183a5cff, 0x17395cff, 
+    0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 
+    0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 
+    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
+    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
+    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
+    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
+    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
+    0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
+    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
+    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x1b3d5dff, 0x193c5eff, 0x193c5eff, 0x183b5dff, 0x183a5dff, 0x183a5cff, 
+    0x17395cff, 0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 
+    0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 
+    0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
+    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
+    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
+    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
+    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
+    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 
+    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
+    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x1b3c5cff, 0x193c5eff, 0x183b5dff, 0x183a5dff, 
+    0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 
+    0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 
+    0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
+    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
+    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
+    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
+    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
+    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
+    0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 
+    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1b3c5cff, 0x183b5dff, 
+    0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 0x16375aff, 
+    0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 
+    0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 
+    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
+    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
+    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
+    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
+    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
+    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 
+    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x1a3b5bff, 0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 
+    0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 
+    0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
+    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
+    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
+    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
+    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
+    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
+    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
+    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x1a3a5bff, 0x183a5cff, 0x17395cff, 0x17385bff, 
+    0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 
+    0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 
+    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
+    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
+    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
+    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
+    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
+    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
+    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
+    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1a3a5aff, 0x17395cff, 
+    0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 
+    0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 
+    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
+    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
+    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
+    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
+    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
+    0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
+    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
+    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x19395aff, 0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 
+    0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 
+    0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
+    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
+    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
+    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
+    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
+    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 
+    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
+    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x193859ff, 0x17385bff, 0x16375aff, 0x16375aff, 
+    0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 
+    0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
+    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
+    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
+    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
+    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
+    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
+    0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 
+    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x193859ff, 0x16375aff, 
+    0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 
+    0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 
+    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
+    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
+    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
+    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
+    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
+    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 
+    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x183758ff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 
+    0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
+    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
+    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
+    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x36496aff, 
+    0xadb5c3ff, 0xbec4cfff, 0xbec4cfff, 0xbec4cfff, 0xbec4cfff, 0xbec4ceff, 
+    0xbec4ceff, 0xacb3c1ff, 0x324364ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
+    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
+    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x183758ff, 0x163659ff, 0x153559ff, 0x153558ff, 
+    0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 
+    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
+    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
+    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
+    0x0d244cff, 0xc9ced7ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xc7cad0ff, 0x081b41ff, 
+    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
+    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
+    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x183657ff, 0x153559ff, 
+    0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 
+    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
+    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
+    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
+    0x0d254dff, 0x0d244cff, 0x0c244cff, 0xf4f5f7ff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xf4f5f6ff, 0x06122cff, 0x071a40ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
+    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
+    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x173557ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 
+    0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
+    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
+    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
+    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x20355aff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfdfdfdff, 0x19243bff, 0x05112cff, 0x06193fff, 
+    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
+    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x173556ff, 0x153458ff, 0x143357ff, 0x143357ff, 
+    0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
+    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
+    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
+    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
+    0x3f5070ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0x374054ff, 
+    0x041029ff, 0x04102bff, 0x06173eff, 0x061944ff, 0x061843ff, 0x061743ff, 
+    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x173456ff, 0x143357ff, 
+    0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 
+    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
+    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
+    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
+    0x0c234bff, 0x0c224bff, 0x5c6c86ff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 
+    0xfafafaff, 0x565e6eff, 0x041029ff, 0x040f29ff, 0x04102bff, 0x06163dff, 
+    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x163355ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
+    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
+    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
+    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
+    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x7b879dff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 
+    0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0x737a87ff, 0x040f29ff, 0x040f29ff, 
+    0x040e28ff, 0x040e2aff, 0x05153dff, 0x051642ff, 0x051641ff, 0x041541ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x163355ff, 0x143256ff, 0x133156ff, 0x133156ff, 
+    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
+    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
+    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
+    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x132850ff, 
+    0xaeb5c2ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xa5a9b2ff, 
+    0x0d1731ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 0x030e2aff, 0x05143cff, 
+    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x163254ff, 0x133156ff, 
+    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
+    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
+    0x0f2950ff, 0x253b5fff, 0x243b5fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
+    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x20355aff, 
+    0x909aadff, 0xeff0f3ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 
+    0xf5f5f5ff, 0xf4f4f4ff, 0xe3e4e6ff, 0x868a96ff, 0x18223aff, 0x030d28ff, 
+    0x030d27ff, 0x020d29ff, 0x04123bff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x17254dff, 0x18264eff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x153154ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
+    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
+    0x0f2a50ff, 0x0f2950ff, 0x576883ff, 0xfafbfcff, 0xfdfdfeff, 0xb7becaff, 
+    0x50627fff, 0x0e264eff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0f254dff, 
+    0x78859bff, 0xf4f5f6ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 
+    0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 
+    0xe4e5e6ff, 0x6c7180ff, 0x05102aff, 0x020c26ff, 0x030d28ff, 0x04133bff, 
+    0x051541ff, 0x414d6cff, 0x9da2b0ff, 0xdededfff, 0xd9d9daff, 0x444e69ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x153154ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
+    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
+    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x183056ff, 0xe3e6eaff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xdbdee4ff, 0x76839aff, 0x1a3056ff, 
+    0x22365bff, 0xc5cad4ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 
+    0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 
+    0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xb1b4baff, 0x172038ff, 
+    0x0f1831ff, 0x636979ff, 0xc1c3c9ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 
+    0xddddddff, 0xc1c3c6ff, 0x0c193fff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x153053ff, 0x122f55ff, 
+    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
+    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x8693a7ff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xf4f5f7ff, 0xe9ebefff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 
+    0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 
+    0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xd1d2d4ff, 0xd9dadbff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 
+    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0x6e7382ff, 0x031138ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x142f53ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
+    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
+    0x284062ff, 0xf5f6f7ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 
+    0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 
+    0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 
+    0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 
+    0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 
+    0xceced0ff, 0x1e2541ff, 0x041239ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x142f52ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
+    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
+    0x0f284fff, 0x0e284fff, 0xabb4c1ff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfdfdfdff, 0xfcfcfcff, 0xd4d6daff, 0x8a8f9aff, 0x606877ff, 0x4a5264ff, 
+    0x4a5264ff, 0x5e6575ff, 0x868a96ff, 0xcaccd0ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 
+    0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 
+    0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0x8b8e98ff, 0x050d2dff, 0x051239ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x142e52ff, 0x112d53ff, 
+    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
+    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x465977ff, 0xfefefeff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xfdfdfdff, 0xb6bac1ff, 0x353e53ff, 0x041029ff, 0x041029ff, 
+    0x040f29ff, 0x040f29ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 0x030d28ff, 
+    0x30384dff, 0xaaadb4ff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 
+    0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 
+    0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd1d1d1ff, 
+    0x343a53ff, 0x050e2eff, 0x05123aff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x132d51ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
+    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0xc0c6d0ff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xf1f2f3ff, 0x545d6dff, 0x05102aff, 0x041029ff, 
+    0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 
+    0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0x4c5365ff, 0xdbdcddff, 
+    0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 
+    0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 
+    0xd2d2d2ff, 0xd0d0d0ff, 0x999ca4ff, 0x050f2eff, 0x050f2eff, 0x05123aff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x132d51ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
+    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
+    0x0e264eff, 0xc4cad3ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xe7e8ebff, 0x323c50ff, 0x05102aff, 
+    0x041029ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0x040e28ff, 
+    0x030e28ff, 0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0x020c26ff, 
+    0x020c26ff, 0x2b3348ff, 0xcfd0d2ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 
+    0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 
+    0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0x9b9ea6ff, 0x050f2eff, 
+    0x050f30ff, 0x050f30ff, 0x05123aff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x132c50ff, 0x102c52ff, 
+    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
+    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x324666ff, 0xd9dce0ff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf7f7f8ff, 0x3f485bff, 
+    0x05102aff, 0x041029ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 
+    0x040e28ff, 0x030e28ff, 0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 
+    0x020c26ff, 0x020c26ff, 0x020c26ff, 0x020c27ff, 0x373e53ff, 0xdbdbdcff, 
+    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 
+    0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xafb0b5ff, 
+    0x242d47ff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 0x05123aff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x122c50ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
+    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
+    0x172d51ff, 0xaaafb8ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 
+    0x787e8cff, 0x05102aff, 0x041029ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 
+    0x09132cff, 0x5e6575ff, 0xabaeb6ff, 0xcbcdd1ff, 0xcaccd0ff, 0xa8abb2ff, 
+    0x595f70ff, 0x07112aff, 0x020c26ff, 0x020c26ff, 0x020c27ff, 0x020c27ff, 
+    0x020c27ff, 0x696e7eff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 
+    0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 
+    0x888b96ff, 0x0f1836ff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 
+    0x060f31ff, 0x061032ff, 0x05123bff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x122b4fff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
+    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
+    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0b2047ff, 0x6d7685ff, 0xf8f9f9ff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfdfdfdff, 0xe0e1e4ff, 0x0d1731ff, 0x041029ff, 0x041029ff, 0x040f29ff, 
+    0x040f29ff, 0x262f45ff, 0xcacbd0ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xbec0c5ff, 0x222a41ff, 0x020c27ff, 
+    0x020c27ff, 0x020c27ff, 0x020c29ff, 0x0b142fff, 0xc2c3c7ff, 0xdadadaff, 
+    0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 
+    0xc9c9caff, 0x585e70ff, 0x050f2eff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 
+    0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x05123bff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x122a4fff, 0x0f2a50ff, 
+    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
+    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
+    0x0a1f47ff, 0x384359ff, 0xdddfe2ff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0x747a88ff, 0x041029ff, 0x041029ff, 
+    0x040f29ff, 0x040f29ff, 0x1e273eff, 0xd8d9dcff, 0xefefefff, 0xeeeeeeff, 
+    0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 
+    0xcbcccfff, 0x19223aff, 0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 
+    0x656a7aff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 
+    0xd0d0d0ff, 0xb4b5b9ff, 0x2d354eff, 0x050f2eff, 0x050f30ff, 0x050f30ff, 
+    0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 
+    0x061034ff, 0x061034ff, 0x05123bff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x112a4eff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
+    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
+    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a1e46ff, 0x888f9bff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0x273247ff, 
+    0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0xa5a9b1ff, 0xefefefff, 
+    0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0x9699a2ff, 0x020c29ff, 0x040d29ff, 
+    0x040d29ff, 0x040d2aff, 0x212943ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 
+    0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0x6a6f7fff, 0x050f2eff, 0x050f30ff, 
+    0x050f30ff, 0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 
+    0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x05123cff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x11294eff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
+    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
+    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
+    0xafb6c2ff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 
+    0xdbdde0ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0x1f273eff, 
+    0xeeeeeeff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 
+    0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xddddddff, 
+    0x1c243cff, 0x040d29ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 0xbebec2ff, 
+    0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0x898c97ff, 
+    0x050f30ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 
+    0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 
+    0x061035ff, 0x061136ff, 0x05123cff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11284dff, 0x0e284fff, 
+    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
+    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
+    0x0a1f48ff, 0x0a1f48ff, 0xc3c8d2ff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 
+    0xfafafaff, 0xf8f8f8ff, 0xc0c3c8ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 
+    0x040e28ff, 0x596070ff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 
+    0xdededeff, 0xddddddff, 0x525769ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 
+    0x050d2cff, 0xa5a7aeff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 
+    0xccccccff, 0x989ba3ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 0x060f31ff, 
+    0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 
+    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x07133bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x10284dff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
+    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
+    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0xcdd1d9ff, 0xfdfdfdff, 
+    0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xabafb7ff, 0x040f29ff, 
+    0x040e28ff, 0x040e28ff, 0x030e28ff, 0x6d7281ff, 0xecececff, 0xebebebff, 
+    0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 
+    0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0x646979ff, 0x040d2bff, 
+    0x040d2cff, 0x050d2cff, 0x050d2cff, 0x9496a0ff, 0xd0d0d0ff, 0xcfcfcfff, 
+    0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xa1a3aaff, 0x050f30ff, 0x050f31ff, 
+    0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 
+    0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
+    0x061137ff, 0x081237ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x10274cff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
+    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
+    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
+    0xc2c7d1ff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 
+    0xbbbec4ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 0x030d28ff, 0x5d6373ff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 
+    0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 
+    0x53596cff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x9fa1a9ff, 
+    0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0x989ba2ff, 
+    0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 
+    0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 
+    0x061136ff, 0x061137ff, 0x061137ff, 0x081237ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x10264cff, 0x0d264dff, 
+    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
+    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
+    0x091d47ff, 0x091d46ff, 0xb0b6c3ff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 
+    0xf5f5f5ff, 0xf4f4f4ff, 0xd2d3d6ff, 0x040e28ff, 0x030e28ff, 0x030d28ff, 
+    0x030d27ff, 0x262f45ff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 
+    0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 
+    0xdadadaff, 0xd8d8d8ff, 0x222a45ff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 
+    0x050d2dff, 0xb4b5b9ff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0x8b8e98ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 
+    0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 
+    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x081237ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x0f264bff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
+    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
+    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x8992a6ff, 0xf8f8f8ff, 
+    0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf0f0f0ff, 0x1b253cff, 
+    0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0xaeb0b7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 
+    0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0x9fa1aaff, 0x050d2cff, 0x050d2cff, 
+    0x050d2dff, 0x050d2dff, 0x1b233fff, 0xccccccff, 0xccccccff, 0xcacacaff, 
+    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0x6e7281ff, 0x061031ff, 0x061032ff, 
+    0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 
+    0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 
+    0x061138ff, 0x081238ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x0f254bff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
+    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
+    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x223359ff, 
+    0xc5c9d2ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 
+    0xefefefff, 0x636979ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0x020c26ff, 
+    0x283046ff, 0xd8d9daff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 
+    0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xcacbccff, 0x252c46ff, 
+    0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x575d6fff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0x9a9ca3ff, 
+    0x1a2342ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 
+    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 
+    0x061137ff, 0x061138ff, 0x061138ff, 0x081238ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f244bff, 0x0c244cff, 
+    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
+    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
+    0x4c5979ff, 0xe5e6eaff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 
+    0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xc4c5caff, 0x05102aff, 0x020c26ff, 
+    0x020c26ff, 0x020c26ff, 0x020c26ff, 0x373e53ff, 0xcecfd1ff, 0xe0e0e0ff, 
+    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xc3c4c7ff, 
+    0x353b53ff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x07112fff, 
+    0xabacb2ff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 
+    0xc2c2c2ff, 0xc1c1c1ff, 0xafb0b3ff, 0x39415bff, 0x061034ff, 0x061034ff, 
+    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
+    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x081238ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x0e244bff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
+    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
+    0x0b1f48ff, 0x848da2ff, 0xf6f6f7ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 
+    0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 
+    0x5b6171ff, 0x020c26ff, 0x020c26ff, 0x020c26ff, 0x020c27ff, 0x020c27ff, 
+    0x121b34ff, 0x737886ff, 0xbbbcc0ff, 0xd8d8d9ff, 0xd7d7d8ff, 0xb7b8bdff, 
+    0x707483ff, 0x131a37ff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 
+    0x050f2eff, 0x51576aff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbbbbbbff, 
+    0x636879ff, 0x081236ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
+    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
+    0x061239ff, 0x081339ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x0e234aff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
+    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
+    0x091d46ff, 0x1e3057ff, 0xbcc1ccff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 
+    0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xd9dadbff, 0x252d43ff, 0x020c26ff, 0x020c27ff, 
+    0x020c27ff, 0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 0x060f2cff, 
+    0x060f2dff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 
+    0x050e2dff, 0x050f2eff, 0x242d47ff, 0xbebfc1ff, 0xc9c9c9ff, 0xc7c7c7ff, 
+    0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 
+    0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 0x8b8d97ff, 0x151f40ff, 0x061136ff, 
+    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
+    0x061138ff, 0x061239ff, 0x061239ff, 0x081339ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e224aff, 0x0b224aff, 
+    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
+    0x091d47ff, 0x091d46ff, 0x081c46ff, 0xb2b8c5ff, 0xf8f8f8ff, 0xf7f7f7ff, 
+    0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 
+    0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xc2c4c8ff, 
+    0x182139ff, 0x020c27ff, 0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 
+    0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 
+    0x050d2dff, 0x050e2dff, 0x050f2eff, 0x19223dff, 0xadaeb3ff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 
+    0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 
+    0x80838eff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
+    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x081339ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x0d2249ff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
+    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0xc3c7d0ff, 
+    0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 
+    0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xe3e3e3ff, 0xc9cacdff, 0x2f374cff, 0x020c29ff, 0x040d29ff, 
+    0x040d29ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 
+    0x050d2dff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 0x2e364eff, 0xb6b7baff, 
+    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 
+    0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 
+    0xb6b6b6ff, 0xb5b5b5ff, 0x8b8e96ff, 0x061137ff, 0x061137ff, 0x061137ff, 
+    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
+    0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x0d2149ff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
+    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
+    0x071b45ff, 0x525f7cff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 
+    0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 
+    0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdadadbff, 
+    0x878a95ff, 0x19213aff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 
+    0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x151e3aff, 0x6f7482ff, 
+    0xc4c4c5ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 
+    0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 
+    0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb3b3b3ff, 0x3b435dff, 0x061137ff, 
+    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
+    0x06123aff, 0x06123aff, 0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0d2148ff, 0x0a2049ff, 
+    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
+    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0xb5bac5ff, 0xf2f2f2ff, 
+    0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 
+    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xd3d3d4ff, 0x999ca5ff, 0x595f71ff, 
+    0x383e55ff, 0x232a44ff, 0x232a45ff, 0x373d55ff, 0x585d6fff, 0x93969fff, 
+    0xc6c6c7ff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 
+    0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 
+    0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb3b3b3ff, 0x848791ff, 
+    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
+    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x08133aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x0c2048ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
+    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
+    0x2d3c60ff, 0xececedff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 
+    0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 
+    0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 
+    0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 
+    0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 
+    0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb3b3b3ff, 
+    0xafafb0ff, 0x242d4cff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
+    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x0c1f47ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
+    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
+    0x061944ff, 0x061843ff, 0x061743ff, 0x8d95a7ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe2e2e2ff, 
+    0xdbdbdcff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 
+    0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 
+    0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 
+    0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xb8b9baff, 
+    0xbbbbbbff, 0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 
+    0xb3b3b3ff, 0xb1b1b1ff, 0x696d7dff, 0x061137ff, 0x061138ff, 0x061138ff, 
+    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x06123aff, 0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0c1f47ff, 0x091e47ff, 
+    0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
+    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x15254eff, 
+    0xdadcdfff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xd8d9daff, 
+    0x898d98ff, 0x293147ff, 0x242c43ff, 0xbabcc1ff, 0xddddddff, 0xdbdbdbff, 
+    0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 
+    0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 
+    0xa3a4aaff, 0x252d4bff, 0x202947ff, 0x666a7cff, 0xacadb0ff, 0xb6b6b6ff, 
+    0xb5b5b5ff, 0xb3b3b3ff, 0xb1b1b1ff, 0xa4a5a8ff, 0x141e41ff, 0x061138ff, 
+    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x08143bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x0b1e46ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 
+    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
+    0x051642ff, 0x051641ff, 0x5f6a84ff, 0xe9e9e9ff, 0xe7e7e7ff, 0xc1c3c7ff, 
+    0x616776ff, 0x0e1731ff, 0x020c27ff, 0x020c27ff, 0x020c29ff, 0x0f1732ff, 
+    0x828591ff, 0xd9d9d9ff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 
+    0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 
+    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 
+    0xbebebeff, 0x707483ff, 0x0f183bff, 0x061034ff, 0x061035ff, 0x061035ff, 
+    0x0f183bff, 0x4f556bff, 0x97999fff, 0xb1b1b1ff, 0xb0b0b0ff, 0x484e65ff, 
+    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x07133bff, 0x07143bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x0b1d46ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
+    0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 
+    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x323d59ff, 
+    0x353c51ff, 0x030d27ff, 0x020c27ff, 0x020c27ff, 0x020c27ff, 0x020c29ff, 
+    0x040d29ff, 0x040d29ff, 0x040d2aff, 0x2b334bff, 0x9497a1ff, 0xd3d3d3ff, 
+    0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 
+    0xbfbfc0ff, 0x838691ff, 0x272f4dff, 0x061034ff, 0x061034ff, 0x061035ff, 
+    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x071238ff, 0x2c3452ff, 
+    0x28314fff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
+    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x07133bff, 0x06133cff, 0x07143bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0b1d45ff, 0x081c46ff, 
+    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 
+    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x031034ff, 0x020c27ff, 0x020c27ff, 0x020c27ff, 
+    0x020c29ff, 0x040d29ff, 0x040d29ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 
+    0x050d2cff, 0x1d2440ff, 0x9c9ea7ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 
+    0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 
+    0xc2c2c2ff, 0x90929bff, 0x1a2342ff, 0x061034ff, 0x061034ff, 0x061034ff, 
+    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
+    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
+    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x07143cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x0a1c45ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
+    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x031034ff, 
+    0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 0x040d2aff, 0x040d2bff, 
+    0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x676b7bff, 0xcfcfcfff, 
+    0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0x5e6375ff, 0x061034ff, 0x061034ff, 
+    0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
+    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
+    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
+    0x06133cff, 0x07143cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x0a1b45ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
+    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
+    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x031035ff, 0x040d29ff, 0x040d29ff, 0x040d2aff, 
+    0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 
+    0x4c5266ff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 
+    0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0x464c64ff, 
+    0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 
+    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
+    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
+    0x06133cff, 0x06133cff, 0x06133dff, 0x07143cff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x091b44ff, 0x071a45ff, 
+    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
+    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x031135ff, 
+    0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 
+    0x050d2dff, 0x050e2dff, 0x333b53ff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 
+    0xbebebeff, 0x2f3652ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 
+    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
+    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
+    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x07143cff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x091a44ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
+    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x031136ff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 
+    0x050d2dff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 0x19223eff, 0xcacacaff, 
+    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 
+    0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0x172041ff, 0x061035ff, 0x061035ff, 
+    0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 
+    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
+    0x06133cff, 0x08133cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x091a43ff, 0x061944ff, 0x061843ff, 0x061743ff, 
+    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041137ff, 
+    0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 0x050f2eff, 
+    0x061031ff, 0xc3c3c5ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 
+    0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xb5b6b7ff, 0x071136ff, 
+    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 
+    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
+    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
+    0x06133dff, 0x06133cff, 0x06123dff, 0x08143dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x081a43ff, 0x061843ff, 
+    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041137ff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 
+    0x050f2eff, 0x050f30ff, 0x050f30ff, 0xa4a6acff, 0xc6c6c6ff, 0xc4c4c4ff, 
+    0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 
+    0x999ba2ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
+    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
+    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 
+    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x08143dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x081942ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041137ff, 
+    0x050f2eff, 0x050f2eff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 0x363d57ff, 
+    0x9ea0a7ff, 0xa9aaafff, 0xa8a9aeff, 0xa7a8adff, 0xa6a7acff, 0xa4a5aaff, 
+    0xa3a4a9ff, 0x95979fff, 0x323955ff, 0x061035ff, 0x061136ff, 0x061136ff, 
+    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
+    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
+    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
+    0x06133eff, 0x08143dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x081842ff, 0x051742ff, 0x051642ff, 0x051641ff, 
+    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041138ff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 
+    0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 
+    0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 
+    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
+    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
+    0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 
+    0x06133dff, 0x06133eff, 0x06133eff, 0x08143eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x071841ff, 0x051642ff, 
+    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041138ff, 
+    0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 
+    0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 
+    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
+    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
+    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 
+    0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x07143eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x071741ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041139ff, 0x060f31ff, 0x061031ff, 0x061032ff, 
+    0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 
+    0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 
+    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
+    0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 
+    0x05133fff, 0x07143eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x071740ff, 0x041541ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x04113aff, 
+    0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 
+    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 
+    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
+    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
+    0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 
+    0x06133eff, 0x05133fff, 0x05133fff, 0x07143eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x061640ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x05123aff, 0x061034ff, 0x061034ff, 0x061034ff, 
+    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
+    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
+    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 
+    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 
+    0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x07143eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05123aff, 
+    0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
+    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
+    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
+    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
+    0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 
+    0x05133fff, 0x07143eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x05123bff, 0x061035ff, 0x061035ff, 0x061136ff, 
+    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
+    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
+    0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 
+    0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 
+    0x05133eff, 0x05133fff, 0x05133fff, 0x07153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06123bff, 
+    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
+    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
+    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 
+    0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 
+    0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x06153eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x06123cff, 0x061137ff, 0x061137ff, 0x061137ff, 
+    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
+    0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 
+    0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 
+    0x04143fff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06123cff, 
+    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
+    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
+    0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 
+    0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 
+    0x051440ff, 0x04143fff, 0x04143fff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x06123cff, 0x061138ff, 0x061138ff, 0x061239ff, 
+    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
+    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 
+    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 
+    0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 
+    0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06123dff, 
+    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
+    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
+    0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 
+    0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x06123dff, 0x06123aff, 0x06123aff, 0x06123aff, 
+    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
+    0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 
+    0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 
+    0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05133dff, 
+    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
+    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 
+    0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 
+    0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 
+    0x04143fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x05133eff, 0x06123aff, 0x06123aff, 0x06123bff, 
+    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
+    0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 
+    0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 
+    0x04143fff, 0x04143fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05133eff, 
+    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
+    0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 
+    0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 
+    0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e163bff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x05133eff, 0x06133cff, 0x06133cff, 0x06133cff, 
+    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 
+    0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 
+    0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x0f163aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x2e1f2fea, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05133dff, 
+    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
+    0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 
+    0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x2e1f30e9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x5a2d2d22, 0x231c32f7, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x05133eff, 0x06133dff, 0x06133cff, 0x06123dff, 
+    0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 
+    0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 
+    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
+    0x041440ff, 0x041440ff, 0x231b33f6, 0x58303020, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x552c254b, 0x4c292a97, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4627299d, 
+    0x4625299d, 0x46272a9d, 0x4627299d, 0x4627299d, 0x4627299d, 0x4627299d, 
+    0x4627299c, 0x4627299c, 0x4827299c, 0x4827299c, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
+    0x4827299b, 0x4827299b, 0x4c292a97, 0x552c254b, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+};
diff --git a/games/NXDoom/src/setup/sound.c b/games/NXDoom/src/setup/sound.c
new file mode 100644
index 000000000..982ce00bc
--- /dev/null
+++ b/games/NXDoom/src/setup/sound.c
@@ -0,0 +1,410 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+// Sound control menu
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <mmsystem.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "textscreen.h"
+#include "m_config.h"
+#include "m_misc.h"
+
+#include "execute.h"
+#include "mode.h"
+#include "sound.h"
+
+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+#endif  // DISABLE_SDL2MIXER
+
+
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-sound"
+
+typedef enum
+{
+    OPLMODE_OPL2,
+    OPLMODE_OPL3,
+    NUM_OPLMODES,
+} oplmode_t;
+
+static const char *opltype_strings[] =
+{
+    "OPL2",
+    "OPL3"
+};
+
+static const char *cfg_extension[] = { "cfg", NULL };
+
+#ifdef HAVE_FLUIDSYNTH
+static const char *sf_extension[] = { "sf2", "sf3", NULL };
+#endif
+
+// Config file variables:
+
+int snd_sfxdevice = SNDDEVICE_SB;
+int snd_musicdevice = SNDDEVICE_SB;
+int snd_samplerate = 44100;
+int opl_io_port = 0x388;
+int snd_cachesize = 64 * 1024 * 1024;
+int snd_maxslicetime_ms = 28;
+char *snd_musiccmd = "";
+int snd_pitchshift = 0;
+char *snd_dmxoption = "";
+
+static int numChannels = 8;
+static int sfxVolume = 8;
+static int musicVolume = 8;
+static int voiceVolume = 15;
+static int show_talk = 0;
+int use_libsamplerate = 0;
+float libsamplerate_scale = 0.65;
+
+char *music_pack_path = NULL;
+char *timidity_cfg_path = NULL;
+static char *gus_patch_path = NULL;
+static int gus_ram_kb = 1024;
+#ifdef _WIN32
+#define MAX_MIDI_DEVICES 20
+static char *midi_names[MAX_MIDI_DEVICES];
+static int midi_index;
+char *winmm_midi_device = NULL;
+int winmm_complevel = 0;
+int winmm_reset_type = 1;
+int winmm_reset_delay = 0;
+#endif
+
+#ifdef HAVE_FLUIDSYNTH
+char *fsynth_sf_path = NULL;
+int fsynth_chorus_active = 1;
+float fsynth_chorus_depth = 5.0f;
+float fsynth_chorus_level = 0.35f;
+int fsynth_chorus_nr = 3;
+float fsynth_chorus_speed = 0.3f;
+char *fsynth_midibankselect = "gs";
+int fsynth_polyphony = 256;
+int fsynth_reverb_active = 1;
+float fsynth_reverb_damp = 0.4f;
+float fsynth_reverb_level = 0.15f;
+float fsynth_reverb_roomsize = 0.6f;
+float fsynth_reverb_width = 4.0f;
+float fsynth_gain = 1.0f;
+#endif // HAVE_FLUIDSYNTH
+
+// DOS specific variables: these are unused but should be maintained
+// so that the config file can be shared between chocolate
+// doom and doom.exe
+
+static int snd_sbport = 0;
+static int snd_sbirq = 0;
+static int snd_sbdma = 0;
+static int snd_mport = 0;
+
+static int snd_oplmode;
+
+static void UpdateSndDevices(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(data))
+{
+    switch (snd_oplmode)
+    {
+        default:
+        case OPLMODE_OPL2:
+            snd_dmxoption = "";
+            break;
+
+        case OPLMODE_OPL3:
+            snd_dmxoption = "-opl3";
+            break;
+    }
+}
+
+static txt_dropdown_list_t *OPLTypeSelector(void)
+{
+    txt_dropdown_list_t *result;
+
+    if (snd_dmxoption != NULL && strstr(snd_dmxoption, "-opl3") != NULL)
+    {
+        snd_oplmode = OPLMODE_OPL3;
+    }
+    else
+    {
+        snd_oplmode = OPLMODE_OPL2;
+    }
+
+    result = TXT_NewDropdownList(&snd_oplmode, opltype_strings, 2);
+
+    TXT_SignalConnect(result, "changed", UpdateSndDevices, NULL);
+
+    return result;
+}
+
+static void OpenMusicPackDir(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    if (!OpenFolder(music_pack_path))
+    {
+        TXT_MessageBox("Error", "Failed to open music pack directory.");
+    }
+}
+
+#ifdef _WIN32
+static void UpdateMidiDevice(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(data))
+{
+    free(winmm_midi_device);
+    winmm_midi_device = M_StringDuplicate(midi_names[midi_index]);
+}
+
+static txt_dropdown_list_t *MidiDeviceSelector(void)
+{
+    txt_dropdown_list_t *result;
+    int num_devices = 1;
+    int all_devices = midiOutGetNumDevs();
+    int i;
+
+    midi_index = 0;
+    free(midi_names[0]);
+    midi_names[0] = M_StringDuplicate("Microsoft MIDI Mapper");
+
+    if (all_devices > MAX_MIDI_DEVICES - num_devices)
+    {
+        all_devices = MAX_MIDI_DEVICES - num_devices;
+    }
+
+    for (i = 0; i < all_devices; i++)
+    {
+        MIDIOUTCAPS caps;
+
+        if (midiOutGetDevCaps(i, &caps, sizeof(caps)) == MMSYSERR_NOERROR)
+        {
+            free(midi_names[num_devices]);
+            midi_names[num_devices] = M_StringDuplicate(caps.szPname);
+
+            if (!strncasecmp(winmm_midi_device, midi_names[num_devices],
+                             MAXPNAMELEN))
+            {
+                // Set the dropdown list index to the saved device.
+                midi_index = num_devices;
+            }
+
+            num_devices++;
+        }
+    }
+
+    free(winmm_midi_device);
+    winmm_midi_device = M_StringDuplicate(midi_names[midi_index]);
+
+    result = TXT_NewDropdownList(&midi_index, (const char **) midi_names,
+                                 num_devices);
+    TXT_SignalConnect(result, "changed", UpdateMidiDevice, NULL);
+
+    return result;
+}
+#endif
+
+void ConfigSound(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+    txt_window_action_t *music_action;
+
+    // Build the window
+
+    window = TXT_NewWindow("Sound configuration");
+    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
+
+    TXT_SetColumnWidths(window, 40);
+    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
+                                  TXT_SCREEN_W / 2, 3);
+
+    music_action = TXT_NewWindowAction('m', "Music Packs");
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, music_action);
+    TXT_SignalConnect(music_action, "pressed", OpenMusicPackDir, NULL);
+
+    TXT_AddWidgets(window,
+        TXT_NewSeparator("Sound effects"),
+        TXT_NewRadioButton("Disabled", &snd_sfxdevice, SNDDEVICE_NONE),
+        TXT_If(gamemission == doom || gamemission == strife,
+            TXT_NewRadioButton("PC speaker effects", &snd_sfxdevice,
+                               SNDDEVICE_PCSPEAKER)),
+        TXT_NewRadioButton("Digital sound effects",
+                           &snd_sfxdevice,
+                           SNDDEVICE_SB),
+        TXT_If(gamemission == doom || gamemission == heretic
+            || gamemission == hexen,
+            TXT_NewConditional(&snd_sfxdevice, SNDDEVICE_SB,
+                TXT_NewHorizBox(
+                    TXT_NewStrut(4, 0),
+                    TXT_NewCheckBox("Pitch-shifted sounds", &snd_pitchshift),
+                    NULL))),
+        TXT_If(gamemission == strife,
+            TXT_NewConditional(&snd_sfxdevice, SNDDEVICE_SB,
+                TXT_NewHorizBox(
+                    TXT_NewStrut(4, 0),
+                    TXT_NewCheckBox("Show text with voices", &show_talk),
+                    NULL))),
+
+        TXT_NewSeparator("Music"),
+        TXT_NewRadioButton("Disabled", &snd_musicdevice, SNDDEVICE_NONE),
+
+        TXT_NewRadioButton("OPL (Adlib/Soundblaster)", &snd_musicdevice,
+                           SNDDEVICE_SB),
+        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_SB,
+            TXT_NewHorizBox(
+                TXT_NewStrut(4, 0),
+                TXT_NewLabel("Chip type: "),
+                OPLTypeSelector(),
+                NULL)),
+
+        TXT_NewRadioButton("GUS (emulated)", &snd_musicdevice, SNDDEVICE_GUS),
+        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GUS,
+            TXT_MakeTable(2,
+                TXT_NewStrut(4, 0),
+                TXT_NewLabel("Path to patch files: "),
+                TXT_NewStrut(4, 0),
+                TXT_NewFileSelector(&gus_patch_path, 34,
+                                    "Select directory containing GUS patches",
+                                    TXT_DIRECTORY),
+                NULL)),
+
+        TXT_NewRadioButton("Native MIDI", &snd_musicdevice, SNDDEVICE_GENMIDI),
+#ifdef _WIN32
+        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GENMIDI,
+            TXT_NewHorizBox(
+                TXT_NewStrut(4, 0),
+                TXT_NewLabel("Device: "),
+                MidiDeviceSelector(),
+                NULL)),
+#endif
+        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GENMIDI,
+            TXT_MakeTable(2,
+                TXT_NewStrut(4, 0),
+                TXT_NewLabel("Timidity configuration file: "),
+                TXT_NewStrut(4, 0),
+                TXT_NewFileSelector(&timidity_cfg_path, 34,
+                                    "Select Timidity config file",
+                                    cfg_extension),
+                NULL)),
+#ifdef HAVE_FLUIDSYNTH
+        TXT_NewRadioButton("FluidSynth", &snd_musicdevice, SNDDEVICE_FSYNTH),
+        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_FSYNTH,
+            TXT_MakeTable(2,
+                TXT_NewStrut(4, 0),
+                TXT_NewLabel("Soundfont file: "),
+                TXT_NewStrut(4, 0),
+                TXT_NewFileSelector(&fsynth_sf_path, 34,
+                                    "Select FluidSynth soundfont file",
+                                    sf_extension),
+                NULL)),
+#endif
+        NULL);
+}
+
+void BindSoundVariables(void)
+{
+    M_BindIntVariable("snd_sfxdevice",            &snd_sfxdevice);
+    M_BindIntVariable("snd_musicdevice",          &snd_musicdevice);
+    M_BindIntVariable("snd_channels",             &numChannels);
+    M_BindIntVariable("snd_samplerate",           &snd_samplerate);
+    M_BindIntVariable("sfx_volume",               &sfxVolume);
+    M_BindIntVariable("music_volume",             &musicVolume);
+
+    M_BindIntVariable("use_libsamplerate",        &use_libsamplerate);
+    M_BindFloatVariable("libsamplerate_scale",    &libsamplerate_scale);
+
+    M_BindIntVariable("gus_ram_kb",               &gus_ram_kb);
+    M_BindStringVariable("gus_patch_path",        &gus_patch_path);
+    M_BindStringVariable("music_pack_path",     &music_pack_path);
+    M_BindStringVariable("timidity_cfg_path",     &timidity_cfg_path);
+#ifdef _WIN32
+    M_BindStringVariable("winmm_midi_device",     &winmm_midi_device);
+    M_BindIntVariable("winmm_complevel",          &winmm_complevel);
+    M_BindIntVariable("winmm_reset_type",         &winmm_reset_type);
+    M_BindIntVariable("winmm_reset_delay",        &winmm_reset_delay);
+#endif
+
+#ifdef HAVE_FLUIDSYNTH
+    M_BindIntVariable("fsynth_chorus_active",     &fsynth_chorus_active);
+    M_BindFloatVariable("fsynth_chorus_depth",    &fsynth_chorus_depth);
+    M_BindFloatVariable("fsynth_chorus_level",    &fsynth_chorus_level);
+    M_BindIntVariable("fsynth_chorus_nr",         &fsynth_chorus_nr);
+    M_BindFloatVariable("fsynth_chorus_speed",    &fsynth_chorus_speed);
+    M_BindStringVariable("fsynth_midibankselect", &fsynth_midibankselect);
+    M_BindIntVariable("fsynth_polyphony",         &fsynth_polyphony);
+    M_BindIntVariable("fsynth_reverb_active",     &fsynth_reverb_active);
+    M_BindFloatVariable("fsynth_reverb_damp",     &fsynth_reverb_damp);
+    M_BindFloatVariable("fsynth_reverb_level",    &fsynth_reverb_level);
+    M_BindFloatVariable("fsynth_reverb_roomsize", &fsynth_reverb_roomsize);
+    M_BindFloatVariable("fsynth_reverb_width",    &fsynth_reverb_width);
+    M_BindFloatVariable("fsynth_gain",            &fsynth_gain);
+    M_BindStringVariable("fsynth_sf_path",        &fsynth_sf_path);
+#endif // HAVE_FLUIDSYNTH
+
+    M_BindIntVariable("snd_sbport",               &snd_sbport);
+    M_BindIntVariable("snd_sbirq",                &snd_sbirq);
+    M_BindIntVariable("snd_sbdma",                &snd_sbdma);
+    M_BindIntVariable("snd_mport",                &snd_mport);
+    M_BindIntVariable("snd_maxslicetime_ms",      &snd_maxslicetime_ms);
+    M_BindStringVariable("snd_musiccmd",          &snd_musiccmd);
+    M_BindStringVariable("snd_dmxoption",         &snd_dmxoption);
+
+    M_BindIntVariable("snd_cachesize",            &snd_cachesize);
+    M_BindIntVariable("opl_io_port",              &opl_io_port);
+
+    M_BindIntVariable("snd_pitchshift",           &snd_pitchshift);
+
+    if (gamemission == strife)
+    {
+        M_BindIntVariable("voice_volume",         &voiceVolume);
+        M_BindIntVariable("show_talk",            &show_talk);
+    }
+
+    music_pack_path = M_StringDuplicate("");
+    timidity_cfg_path = M_StringDuplicate("");
+    gus_patch_path = M_StringDuplicate("");
+
+#ifdef _WIN32
+    winmm_midi_device = M_StringDuplicate("");
+#endif
+
+#ifdef HAVE_FLUIDSYNTH
+    fsynth_sf_path = M_StringDuplicate("");
+#endif
+
+    // All versions of Heretic and Hexen did pitch-shifting.
+    // Most versions of Doom did not and Strife never did.
+    snd_pitchshift = gamemission == heretic || gamemission == hexen;
+
+    // Default sound volumes - different games use different values.
+
+    switch (gamemission)
+    {
+        case doom:
+        default:
+            sfxVolume = 8;  musicVolume = 8;
+            break;
+        case heretic:
+        case hexen:
+            sfxVolume = 10; musicVolume = 10;
+            break;
+        case strife:
+            sfxVolume = 8;  musicVolume = 13;
+            break;
+    }
+}
+
diff --git a/games/NXDoom/src/setup/sound.h b/games/NXDoom/src/setup/sound.h
new file mode 100644
index 000000000..a21570135
--- /dev/null
+++ b/games/NXDoom/src/setup/sound.h
@@ -0,0 +1,24 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef SETUP_SOUND_H
+#define SETUP_SOUND_H
+
+#include "i_sound.h"
+
+void ConfigSound(void *widget, void *user_data);
+void BindSoundVariables(void);
+
+
+#endif /* #ifndef SETUP_SOUND_H */
diff --git a/games/NXDoom/src/setup/txt_joyaxis.c b/games/NXDoom/src/setup/txt_joyaxis.c
new file mode 100644
index 000000000..620c0bfa4
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_joyaxis.c
@@ -0,0 +1,654 @@
+//
+// Copyright(C) 2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL.h"
+
+#include "joystick.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "m_controls.h"
+#include "m_misc.h"
+
+#include "textscreen.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_joyaxis.h"
+#include "txt_utf8.h"
+
+#define JOYSTICK_AXIS_WIDTH 20
+
+static const char *CalibrationLabel(txt_joystick_axis_t *joystick_axis)
+{
+    switch (joystick_axis->config_stage)
+    {
+        case CONFIG_CENTER:
+            return "Center the D-pad or joystick,\n"
+                   "and press a button.";
+
+        case CONFIG_STAGE1:
+            if (joystick_axis->dir == JOYSTICK_AXIS_VERTICAL)
+            {
+                return "Push the D-pad or joystick up,\n"
+                       "and press the button.";
+            }
+            else
+            {
+                return "Push the D-pad or joystick to the\n"
+                       "left, and press the button.";
+            }
+
+        case CONFIG_STAGE2:
+            if (joystick_axis->dir == JOYSTICK_AXIS_VERTICAL)
+            {
+                return "Push the D-pad or joystick down,\n"
+                       "and press the button.";
+            }
+            else
+            {
+                return "Push the D-pad or joystick to the\n"
+                       "right, and press the button.";
+            }
+    }
+
+    return NULL;
+}
+
+static void SetCalibrationLabel(txt_joystick_axis_t *joystick_axis)
+{
+    TXT_SetLabel(joystick_axis->config_label, CalibrationLabel(joystick_axis));
+}
+
+// Search all axes on joystick being configured; find a button that is
+// pressed (other than the calibrate button). Returns the button number.
+
+static int FindPressedAxisButton(txt_joystick_axis_t *joystick_axis)
+{
+    int i;
+
+    for (i = 0; i < SDL_JoystickNumButtons(joystick_axis->joystick); ++i)
+    {
+        if (i == joystick_axis->config_button)
+        {
+            continue;
+        }
+
+        if (SDL_JoystickGetButton(joystick_axis->joystick, i))
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+// Look for a hat that isn't centered. Returns the encoded hat axis.
+
+static int FindUncenteredHat(SDL_Joystick *joystick, int *axis_invert)
+{
+    int i, hatval;
+
+    for (i = 0; i < SDL_JoystickNumHats(joystick); ++i)
+    {
+        hatval = SDL_JoystickGetHat(joystick, i);
+
+        switch (hatval)
+        {
+            case SDL_HAT_LEFT:
+            case SDL_HAT_RIGHT:
+                *axis_invert = hatval != SDL_HAT_LEFT;
+                return CREATE_HAT_AXIS(i, HAT_AXIS_HORIZONTAL);
+
+            case SDL_HAT_UP:
+            case SDL_HAT_DOWN:
+                *axis_invert = hatval != SDL_HAT_UP;
+                return CREATE_HAT_AXIS(i, HAT_AXIS_VERTICAL);
+
+            // If the hat is centered, or is not pointing in a
+            // definite direction, then ignore it. We don't accept
+            // the hat being pointed to the upper-left for example,
+            // because it's ambiguous.
+            case SDL_HAT_CENTERED:
+            default:
+                break;
+        }
+    }
+
+    // None found.
+    return -1;
+}
+
+static boolean CalibrateAxis(txt_joystick_axis_t *joystick_axis)
+{
+    int best_axis;
+    int best_value;
+    int best_invert;
+    Sint16 axis_value;
+    int i;
+
+    // Check all axes to find which axis has the largest value.  We test
+    // for one axis at a time, so eg. when we prompt to push the joystick 
+    // left, whichever axis has the largest value is the left axis.
+
+    best_axis = 0;
+    best_value = 0;
+    best_invert = 0;
+
+    for (i = 0; i < SDL_JoystickNumAxes(joystick_axis->joystick); ++i)
+    {
+        axis_value = SDL_JoystickGetAxis(joystick_axis->joystick, i);
+
+        if (joystick_axis->bad_axis[i])
+        {
+            continue;
+        }
+
+        if (abs(axis_value) > best_value)
+        {
+            best_value = abs(axis_value);
+            best_invert = axis_value > 0;
+            best_axis = i;
+        }
+    }
+
+    // Did we find one axis that had a significant value?
+
+    if (best_value > 32768 / 4)
+    {
+        // Save the best values we have found
+
+        *joystick_axis->axis = best_axis;
+        *joystick_axis->invert = best_invert;
+        return true;
+    }
+
+    // Otherwise, maybe this is a "button axis", like the PS3 SIXAXIS
+    // controller that exposes the D-pad as four individual buttons.
+    // Search for a button.
+
+    i = FindPressedAxisButton(joystick_axis);
+
+    if (i >= 0)
+    {
+        *joystick_axis->axis = CREATE_BUTTON_AXIS(i, 0);
+        *joystick_axis->invert = 0;
+        return true;
+    }
+
+    // Maybe it's a D-pad that is presented as a hat. This sounds weird
+    // but gamepads like this really do exist; an example is the
+    // Nyko AIRFLO Ex.
+
+    i = FindUncenteredHat(joystick_axis->joystick, joystick_axis->invert);
+
+    if (i >= 0)
+    {
+        *joystick_axis->axis = i;
+        return true;
+    }
+
+    // User pressed the button without pushing the joystick anywhere.
+    return false;
+}
+
+static boolean SetButtonAxisPositive(txt_joystick_axis_t *joystick_axis)
+{
+    int button;
+
+    button = FindPressedAxisButton(joystick_axis);
+
+    if (button >= 0)
+    {
+        *joystick_axis->axis |= CREATE_BUTTON_AXIS(0, button);
+        return true;
+    }
+
+    return false;
+}
+
+static void IdentifyBadAxes(txt_joystick_axis_t *joystick_axis)
+{
+    int i, val;
+
+    free(joystick_axis->bad_axis);
+
+    joystick_axis->bad_axis
+        = calloc(SDL_JoystickNumAxes(joystick_axis->joystick),
+                                     sizeof(boolean));
+
+    // Look for uncentered axes.
+
+    for (i = 0; i < SDL_JoystickNumAxes(joystick_axis->joystick); ++i)
+    {
+        val = SDL_JoystickGetAxis(joystick_axis->joystick, i);
+
+        joystick_axis->bad_axis[i] = abs(val) > (32768 / 5);
+
+        if (joystick_axis->bad_axis[i])
+        {
+            printf("Ignoring uncentered joystick axis #%i: %i\n", i, val);
+        }
+    }
+}
+
+static int NextCalibrateStage(txt_joystick_axis_t *joystick_axis)
+{
+    switch (joystick_axis->config_stage)
+    {
+        case CONFIG_CENTER:
+            return CONFIG_STAGE1;
+
+        // After pushing to the left, there are two possibilities:
+        // either it is a button axis, in which case we need to find
+        // the other button, or we can just move on to the next axis.
+        case CONFIG_STAGE1:
+            if (IS_BUTTON_AXIS(*joystick_axis->axis))
+            {
+                return CONFIG_STAGE2;
+            }
+            else
+            {
+                return CONFIG_CENTER;
+            }
+
+        case CONFIG_STAGE2:
+            return CONFIG_CENTER;
+    }
+
+    return -1;
+}
+
+static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_axis))
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+    boolean advance;
+
+    if (event->type != SDL_JOYBUTTONDOWN)
+    {
+        return 0;
+    }
+
+    // At this point, we have a button press.
+    // In the first "center" stage, we're just trying to work out which
+    // joystick is being configured and which button the user is pressing.
+    if (joystick_axis->config_stage == CONFIG_CENTER)
+    {
+        joystick_axis->config_button = event->jbutton.button;
+        IdentifyBadAxes(joystick_axis);
+
+        // Advance to next stage.
+        joystick_axis->config_stage = CONFIG_STAGE1;
+        SetCalibrationLabel(joystick_axis);
+
+        return 1;
+    }
+
+    // In subsequent stages, the user is asked to push in a specific
+    // direction and press the button. They must push the same button
+    // as they did before; this is necessary to support button axes.
+    if (event->jbutton.which == SDL_JoystickInstanceID(joystick_axis->joystick)
+     && event->jbutton.button == joystick_axis->config_button)
+    {
+        switch (joystick_axis->config_stage)
+        {
+            default:
+            case CONFIG_STAGE1:
+                advance = CalibrateAxis(joystick_axis);
+                break;
+
+            case CONFIG_STAGE2:
+                advance = SetButtonAxisPositive(joystick_axis);
+                break;
+        }
+
+        // Advance to the next calibration stage?
+
+        if (advance)
+        {
+            joystick_axis->config_stage = NextCalibrateStage(joystick_axis);
+            SetCalibrationLabel(joystick_axis);
+
+            // Finished?
+            if (joystick_axis->config_stage == CONFIG_CENTER)
+            {
+                TXT_CloseWindow(joystick_axis->config_window);
+
+                if (joystick_axis->callback != NULL)
+                {
+                    joystick_axis->callback();
+                }
+            }
+
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static void CalibrateWindowClosed(TXT_UNCAST_ARG(widget),
+                                  TXT_UNCAST_ARG(joystick_axis))
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+
+    free(joystick_axis->bad_axis);
+    joystick_axis->bad_axis = NULL;
+
+    SDL_JoystickClose(joystick_axis->joystick);
+    SDL_JoystickEventState(SDL_DISABLE);
+    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+    TXT_SDL_SetEventCallback(NULL, NULL);
+}
+
+void TXT_ConfigureJoystickAxis(txt_joystick_axis_t *joystick_axis,
+                               int using_button,
+                               txt_joystick_axis_callback_t callback)
+{
+    // Open the joystick first.
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
+    {
+        return;
+    }
+
+    joystick_axis->joystick = SDL_JoystickOpen(joystick_index);
+    if (joystick_axis->joystick == NULL)
+    {
+        TXT_MessageBox(NULL, "Please configure a controller first!");
+        return;
+    }
+
+    SDL_JoystickEventState(SDL_ENABLE);
+
+    // Build the prompt window.
+
+    joystick_axis->config_window
+        = TXT_NewWindow("Gamepad/Joystick calibration");
+    TXT_AddWidgets(joystick_axis->config_window,
+                   TXT_NewStrut(0, 1),
+                   joystick_axis->config_label = TXT_NewLabel(""),
+                   TXT_NewStrut(0, 1),
+                   NULL);
+
+    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_CENTER,
+                        TXT_NewWindowAbortAction(joystick_axis->config_window));
+    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_RIGHT, NULL);
+    TXT_SetWidgetAlign(joystick_axis->config_window, TXT_HORIZ_CENTER);
+
+    if (using_button >= 0)
+    {
+        joystick_axis->config_stage = CONFIG_STAGE1;
+        joystick_axis->config_button = using_button;
+        IdentifyBadAxes(joystick_axis);
+    }
+    else
+    {
+        joystick_axis->config_stage = CONFIG_CENTER;
+    }
+
+    SetCalibrationLabel(joystick_axis);
+
+    // Close the joystick and shut down joystick subsystem when the window
+    // is closed.
+    TXT_SignalConnect(joystick_axis->config_window, "closed",
+                      CalibrateWindowClosed, joystick_axis);
+
+    TXT_SDL_SetEventCallback(EventCallback, joystick_axis);
+
+    // When successfully calibrated, invoke this callback:
+    joystick_axis->callback = callback;
+}
+
+void TXT_ConfigureGamepadAxis(txt_joystick_axis_t *joystick_axis,
+                              int using_button,
+                              txt_joystick_axis_callback_t callback)
+{
+    // Build the prompt window.
+
+    joystick_axis->config_window = TXT_NewWindow("Configure axis");
+    TXT_SetTableColumns(joystick_axis->config_window, 2);
+    TXT_SetColumnWidths(joystick_axis->config_window, 10, 5);
+    TXT_AddWidgets(joystick_axis->config_window,
+                   TXT_NewCheckBox("Invert", joystick_axis->invert),
+                   TXT_TABLE_EMPTY,
+                   TXT_NewLabel("Dead zone"),
+                   TXT_NewSpinControl(joystick_axis->dead_zone, 10, 90),
+                   NULL);
+
+    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(
+        joystick_axis->config_window, TXT_HORIZ_CENTER,
+        TXT_NewWindowEscapeAction(joystick_axis->config_window));
+    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_RIGHT, NULL);
+    TXT_SetWidgetAlign(joystick_axis->config_window, TXT_HORIZ_CENTER);
+}
+
+static void TXT_JoystickAxisSizeCalc(TXT_UNCAST_ARG(joystick_axis))
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+
+    // All joystickinputs are the same size.
+
+    joystick_axis->widget.w = JOYSTICK_AXIS_WIDTH;
+    joystick_axis->widget.h = 1;
+}
+
+static void TXT_JoystickAxisDrawer(TXT_UNCAST_ARG(joystick_axis))
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+    char buf[JOYSTICK_AXIS_WIDTH + 1];
+    int i;
+
+    if (*joystick_axis->axis < 0)
+    {
+        M_StringCopy(buf, "(none)", sizeof(buf));
+    }
+    else if (IS_BUTTON_AXIS(*joystick_axis->axis))
+    {
+        int neg, pos;
+
+        neg = BUTTON_AXIS_NEG(*joystick_axis->axis);
+        pos = BUTTON_AXIS_POS(*joystick_axis->axis);
+        M_snprintf(buf, sizeof(buf), "BUTTONS #%i+#%i", neg, pos);
+    }
+    else if (IS_HAT_AXIS(*joystick_axis->axis))
+    {
+        int hat, dir;
+
+        hat = HAT_AXIS_HAT(*joystick_axis->axis);
+        dir = HAT_AXIS_DIRECTION(*joystick_axis->axis);
+
+        M_snprintf(buf, sizeof(buf), "HAT #%i (%s)", hat,
+                   dir == HAT_AXIS_HORIZONTAL ? "horizontal" : "vertical");
+    }
+    else
+    {
+        M_snprintf(buf, sizeof(buf), "AXIS #%i", *joystick_axis->axis);
+    }
+
+    TXT_SetWidgetBG(joystick_axis);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    TXT_DrawString(buf);
+
+    for (i = TXT_UTF8_Strlen(buf); i < joystick_axis->widget.w; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void GetAxisDescription(int axis, char *buf, size_t buf_len)
+{
+    switch (axis)
+    {
+        case SDL_CONTROLLER_AXIS_INVALID:
+            M_StringCopy(buf, "(none)", sizeof(buf));
+            break;
+
+        case SDL_CONTROLLER_AXIS_LEFTX:
+            M_StringCopy(buf, "Left X", sizeof(buf));
+            break;
+
+        case SDL_CONTROLLER_AXIS_LEFTY:
+            M_StringCopy(buf, "Left Y", sizeof(buf));
+            break;
+
+        case SDL_CONTROLLER_AXIS_RIGHTX:
+            M_StringCopy(buf, "Right X", sizeof(buf));
+            break;
+
+        case SDL_CONTROLLER_AXIS_RIGHTY:
+            M_StringCopy(buf, "Right Y", sizeof(buf));
+            break;
+
+        default:
+            M_StringCopy(buf, "(unknown)", sizeof(buf));
+            break;
+    }
+}
+
+static void TXT_GamepadAxisDrawer(TXT_UNCAST_ARG(joystick_axis))
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+    char buf[JOYSTICK_AXIS_WIDTH + 1];
+    int i;
+
+    GetAxisDescription(*joystick_axis->axis, buf, sizeof(buf));
+
+    TXT_SetWidgetBG(joystick_axis);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    TXT_DrawString(buf);
+
+    for (i = TXT_UTF8_Strlen(buf); i < joystick_axis->widget.w; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_JoystickAxisDestructor(TXT_UNCAST_ARG(joystick_axis))
+{
+}
+
+static int TXT_JoystickAxisKeyPress(TXT_UNCAST_ARG(joystick_axis), int key)
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+
+    if (key == KEY_ENTER)
+    {
+        TXT_ConfigureJoystickAxis(joystick_axis, -1, NULL);
+        return 1;
+    }
+
+    if (key == KEY_BACKSPACE || key == KEY_DEL)
+    {
+        *joystick_axis->axis = -1;
+    }
+
+    return 0;
+}
+
+static int TXT_GamepadAxisKeyPress(TXT_UNCAST_ARG(joystick_axis), int key)
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
+
+    if (key == KEY_ENTER)
+    {
+        TXT_ConfigureGamepadAxis(joystick_axis, -1, NULL);
+        return 1;
+    }
+
+    if (key == KEY_BACKSPACE || key == KEY_DEL)
+    {
+        *joystick_axis->axis = -1;
+    }
+
+    return 0;
+}
+
+static void TXT_JoystickAxisMousePress(TXT_UNCAST_ARG(widget),
+                                       int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, widget);
+
+    // Clicking is like pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_JoystickAxisKeyPress(widget, KEY_ENTER);
+    }
+}
+
+static void TXT_GamepadAxisMousePress(TXT_UNCAST_ARG(widget), int x, int y,
+                                      int b)
+{
+    TXT_CAST_ARG(txt_joystick_axis_t, widget);
+
+    // Clicking is like pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_GamepadAxisKeyPress(widget, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_joystick_axis_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_JoystickAxisSizeCalc,
+    TXT_JoystickAxisDrawer,
+    TXT_JoystickAxisKeyPress,
+    TXT_JoystickAxisDestructor,
+    TXT_JoystickAxisMousePress,
+    NULL,
+};
+
+txt_widget_class_t txt_gamepad_axis_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_JoystickAxisSizeCalc,
+    TXT_GamepadAxisDrawer,
+    TXT_GamepadAxisKeyPress,
+    TXT_JoystickAxisDestructor,
+    TXT_GamepadAxisMousePress,
+    NULL,
+};
+
+txt_joystick_axis_t *TXT_NewJoystickAxis(int *axis, int *invert, int *dead_zone,
+                                         txt_joystick_axis_direction_t dir)
+{
+    txt_joystick_axis_t *joystick_axis;
+
+    joystick_axis = malloc(sizeof(txt_joystick_axis_t));
+
+    if (use_gamepad)
+    {
+        TXT_InitWidget(joystick_axis, &txt_gamepad_axis_class);
+    }
+    else
+    {
+        TXT_InitWidget(joystick_axis, &txt_joystick_axis_class);
+    }
+    joystick_axis->axis = axis;
+    joystick_axis->invert = invert;
+    joystick_axis->dead_zone = dead_zone;
+    joystick_axis->dir = dir;
+    joystick_axis->bad_axis = NULL;
+
+    return joystick_axis;
+}
+
diff --git a/games/NXDoom/src/setup/txt_joyaxis.h b/games/NXDoom/src/setup/txt_joyaxis.h
new file mode 100644
index 000000000..f0527c5b1
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_joyaxis.h
@@ -0,0 +1,90 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_JOY_AXIS_H
+#define TXT_JOY_AXIS_H
+
+typedef struct txt_joystick_axis_s txt_joystick_axis_t;
+
+typedef enum
+{
+    JOYSTICK_AXIS_HORIZONTAL,
+    JOYSTICK_AXIS_VERTICAL,
+} txt_joystick_axis_direction_t;
+
+typedef enum
+{
+    CONFIG_CENTER,      // "Center the joystick and press a button..."
+    CONFIG_STAGE1,      // "Top or left and press a button..."
+    CONFIG_STAGE2,      // [Optional] "Bottom or right and press a button..."
+} txt_joystick_axis_stage_t;
+
+// Callback invoked when calibration is completed.
+typedef void (*txt_joystick_axis_callback_t)(void);
+
+#include "txt_widget.h"
+#include "txt_window.h"
+
+#include "SDL.h"
+
+//
+// A joystick axis.
+//
+
+struct txt_joystick_axis_s
+{
+    txt_widget_t widget;
+    int *axis, *invert, *dead_zone;
+    txt_joystick_axis_direction_t dir;
+
+    // Only used when configuring:
+
+    // Configuration prompt window and label.
+    txt_window_t *config_window;
+    txt_label_t *config_label;
+
+    // SDL joystick handle for reading joystick state.
+    SDL_Joystick *joystick;
+
+    // "Bad" joystick axes. Sometimes an axis can be stuck or "bad". An
+    // example I found is that if you unplug the nunchuck extension from
+    // a Wii remote, the axes from the nunchuck can be stuck at one of
+    // the maximum values. These have to be ignored, so when we ask the
+    // user to center the joystick, we look for bad axes that are not
+    // close to zero.
+    boolean *bad_axis;
+
+    // Stage we have reached in configuring joystick axis.
+    txt_joystick_axis_stage_t config_stage;
+
+    // Button to press to advance to next stage.
+    int config_button;
+
+    // Callback invoked when the axis is calibrated.
+    txt_joystick_axis_callback_t callback;
+};
+
+txt_joystick_axis_t *TXT_NewJoystickAxis(int *axis, int *invert, int *dead_zone,
+                                         txt_joystick_axis_direction_t dir);
+
+// Configure a joystick axis widget.
+//   axis: The axis widget to configure.
+//   using_button: If non-negative, use this joystick button as the button
+//       to expect from the user. Otherwise, ask.
+void TXT_ConfigureJoystickAxis(txt_joystick_axis_t *axis, int using_button,
+                               txt_joystick_axis_callback_t callback);
+
+#endif /* #ifndef TXT_JOY_AXIS_H */
+
+
diff --git a/games/NXDoom/src/setup/txt_joybinput.c b/games/NXDoom/src/setup/txt_joybinput.c
new file mode 100644
index 000000000..a4362e340
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_joybinput.c
@@ -0,0 +1,780 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL_joystick.h"
+#include "SDL_gamecontroller.h"
+
+#include "doomkeys.h"
+#include "joystick.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "m_controls.h"
+#include "m_misc.h"
+
+#include "txt_joybinput.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_label.h"
+#include "txt_sdl.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+#define JOYSTICK_INPUT_WIDTH 10
+
+
+// Joystick button variables.
+// The ordering of this array is important. We will always try to map
+// each variable to the virtual button with the same array index. For
+// example: joybfire should always be 0, and then we change
+// joystick_physical_buttons[0] to point to the physical joystick
+// button that the user wants to use for firing. We do this so that
+// the menus work (the game code is hard coded to interpret
+// button #0 = select menu item, button #1 = go back to previous menu).
+static int *all_joystick_buttons[NUM_VIRTUAL_BUTTONS] =
+{
+    &joybfire,
+    &joybuse,
+    &joybstrafe,
+    &joybspeed,
+    &joybstrafeleft,
+    &joybstraferight,
+    &joybprevweapon,
+    &joybnextweapon,
+    &joybjump,
+    &joybmenu,
+    &joybautomap,
+    &joybuseartifact,
+    &joybinvleft,
+    &joybinvright,
+    &joybflyup,
+    &joybflydown,
+    &joybflycenter,
+};
+
+// For indirection so that we're not dependent on item ordering in the
+// SDL_GameControllerButton enum.
+static const int gamepad_buttons[GAMEPAD_BUTTON_MAX] =
+{
+   SDL_CONTROLLER_BUTTON_A,
+   SDL_CONTROLLER_BUTTON_B,
+   SDL_CONTROLLER_BUTTON_X,
+   SDL_CONTROLLER_BUTTON_Y,
+   SDL_CONTROLLER_BUTTON_BACK,
+   SDL_CONTROLLER_BUTTON_GUIDE,
+   SDL_CONTROLLER_BUTTON_START,
+   SDL_CONTROLLER_BUTTON_LEFTSTICK,
+   SDL_CONTROLLER_BUTTON_RIGHTSTICK,
+   SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+   SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
+   SDL_CONTROLLER_BUTTON_DPAD_UP,
+   SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+   SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+   SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
+   SDL_CONTROLLER_BUTTON_MISC1,
+   SDL_CONTROLLER_BUTTON_PADDLE1,
+   SDL_CONTROLLER_BUTTON_PADDLE2,
+   SDL_CONTROLLER_BUTTON_PADDLE3,
+   SDL_CONTROLLER_BUTTON_PADDLE4,
+   SDL_CONTROLLER_BUTTON_TOUCHPAD,
+   GAMEPAD_BUTTON_TRIGGERLEFT,
+   GAMEPAD_BUTTON_TRIGGERRIGHT,
+};
+
+// Items in the following button lists are ordered according to gamepad_buttons
+// above.
+static const char *xbox360_buttons[GAMEPAD_BUTTON_MAX] =
+{
+    "A",
+    "B",
+    "X",
+    "Y",
+    "BACK",
+    "GUIDE",
+    "START",
+    "LSB",
+    "RSB",
+    "LB",
+    "RB",
+    "DPAD U",
+    "DPAD D",
+    "DPAD L",
+    "DPAD R",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "LT",
+    "RT",
+};
+
+static const char *xboxone_buttons[GAMEPAD_BUTTON_MAX] =
+{
+    "A",
+    "B",
+    "X",
+    "Y",
+    "VIEW",
+    "XBOX",
+    "MENU",
+    "LSB",
+    "RSB",
+    "LB",
+    "RB",
+    "DPAD U",
+    "DPAD D",
+    "DPAD L",
+    "DPAD R",
+    "PROFILE",
+    "P1",
+    "P2",
+    "P3",
+    "P4",
+    "",
+    "LT",
+    "RT",
+};
+
+static const char *ps3_buttons[GAMEPAD_BUTTON_MAX] =
+{
+    "X",
+    "CIRCLE",
+    "SQUARE",
+    "TRIANGLE",
+    "SELECT",
+    "PS",
+    "START",
+    "L3",
+    "R3",
+    "L1",
+    "R1",
+    "DPAD U",
+    "DPAD D",
+    "DPAD L",
+    "DPAD R",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "L2",
+    "R2",
+};
+
+static const char *ps4_buttons[GAMEPAD_BUTTON_MAX] =
+{
+    "X",
+    "CIRCLE",
+    "SQUARE",
+    "TRIANGLE",
+    "SHARE",
+    "PS",
+    "OPTIONS",
+    "L3",
+    "R3",
+    "L1",
+    "R1",
+    "DPAD U",
+    "DPAD D",
+    "DPAD L",
+    "DPAD R",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "TOUCH",
+    "L2",
+    "R2",
+};
+
+static const char *ps5_buttons[GAMEPAD_BUTTON_MAX] =
+{
+    "X",
+    "CIRCLE",
+    "SQUARE",
+    "TRIANGLE",
+    "SHARE",
+    "PS",
+    "OPTIONS",
+    "L3",
+    "R3",
+    "L1",
+    "R1",
+    "DPAD U",
+    "DPAD D",
+    "DPAD L",
+    "DPAD R",
+    "MUTE",
+    "",
+    "",
+    "",
+    "",
+    "TOUCH",
+    "L2",
+    "R2",
+};
+
+static const char *switchpro_buttons[GAMEPAD_BUTTON_MAX] =
+{
+    "B",
+    "A",
+    "Y",
+    "X",
+    "MINUS",
+    "HOME",
+    "PLUS",
+    "LSB",
+    "RSB",
+    "L",
+    "R",
+    "DPAD U",
+    "DPAD D",
+    "DPAD L",
+    "DPAD R",
+    "CAPTURE",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "ZL",
+    "ZR",
+};
+
+static int PhysicalForVirtualButton(int vbutton)
+{
+    if (vbutton < NUM_VIRTUAL_BUTTONS)
+    {
+        return joystick_physical_buttons[vbutton];
+    }
+    else
+    {
+        return vbutton;
+    }
+}
+
+// Get the virtual button number for the given variable, ie. the
+// variable's index in all_joystick_buttons[NUM_VIRTUAL_BUTTONS].
+static int VirtualButtonForVariable(int *variable)
+{
+    int i;
+
+    for (i = 0; i < arrlen(all_joystick_buttons); ++i)
+    {
+        if (variable == all_joystick_buttons[i])
+        {
+            return i;
+        }
+    }
+
+    I_Error("Couldn't find virtual button");
+    return -1;
+}
+
+// Rearrange joystick button configuration to be in "canonical" form:
+// each joyb* variable should have a value equal to its index in
+// all_joystick_buttons[NUM_VIRTUAL_BUTTONS] above.
+static void CanonicalizeButtons(void)
+{
+    int new_mapping[NUM_VIRTUAL_BUTTONS];
+    int vbutton;
+    int i;
+
+    for (i = 0; i < arrlen(all_joystick_buttons); ++i)
+    {
+        vbutton = *all_joystick_buttons[i];
+
+        // Don't remap the speed key if it's bound to "always run".
+        // Also preserve "unbound" variables.
+        if ((all_joystick_buttons[i] == &joybspeed &&
+             vbutton >= MAX_VIRTUAL_BUTTONS) ||
+            vbutton < 0)
+        {
+            new_mapping[i] = i;
+        }
+        else
+        {
+            new_mapping[i] = PhysicalForVirtualButton(vbutton);
+            *all_joystick_buttons[i] = i;
+        }
+    }
+
+    for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
+    {
+        joystick_physical_buttons[i] = new_mapping[i];
+    }
+}
+
+// Check all existing buttons and clear any using the specified physical
+// button.
+static void ClearVariablesUsingButton(int physbutton)
+{
+    int vbutton;
+    int i;
+
+    for (i = 0; i < arrlen(all_joystick_buttons); ++i)
+    {
+        vbutton = *all_joystick_buttons[i];
+
+        if (vbutton >= 0 && physbutton == PhysicalForVirtualButton(vbutton))
+        {
+            *all_joystick_buttons[i] = -1;
+        }
+    }
+}
+
+// Called in response to SDL events when the prompt window is open:
+
+static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_input))
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+
+    // Got the joystick button press?
+
+    if (event->type == SDL_JOYBUTTONDOWN)
+    {
+        int vbutton, physbutton;
+
+        // Before changing anything, remap button configuration into
+        // canonical form, to avoid conflicts.
+        CanonicalizeButtons();
+
+        vbutton = VirtualButtonForVariable(joystick_input->variable);
+        physbutton = event->jbutton.button;
+
+        if (joystick_input->check_conflicts)
+        {
+            ClearVariablesUsingButton(physbutton);
+        }
+
+        // Set mapping.
+        *joystick_input->variable = vbutton;
+        joystick_physical_buttons[vbutton] = physbutton;
+
+        TXT_CloseWindow(joystick_input->prompt_window);
+        return 1;
+    }
+
+    return 0;
+}
+
+static int EventCallbackGamepad(SDL_Event *event,
+                                TXT_UNCAST_ARG(joystick_input))
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+
+    // Got the joystick button press?
+
+    if (event->type == SDL_CONTROLLERBUTTONDOWN ||
+        event->type == SDL_CONTROLLERAXISMOTION)
+    {
+        int vbutton, physbutton, axis;
+
+        // Before changing anything, remap button configuration into
+        // canonical form, to avoid conflicts.
+        CanonicalizeButtons();
+
+        vbutton = VirtualButtonForVariable(joystick_input->variable);
+        axis = event->caxis.axis;
+
+        if (event->type == SDL_CONTROLLERAXISMOTION &&
+            (axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT ||
+             axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT) &&
+            event->caxis.value > TRIGGER_THRESHOLD)
+        {
+            if (axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT)
+            {
+                physbutton = GAMEPAD_BUTTON_TRIGGERLEFT;
+            }
+            else
+            {
+                physbutton = GAMEPAD_BUTTON_TRIGGERRIGHT;
+            }
+        }
+        else if (event->type == SDL_CONTROLLERBUTTONDOWN)
+        {
+            physbutton = event->cbutton.button;
+        }
+        else
+        {
+            return 0;
+        }
+
+        if (joystick_input->check_conflicts)
+        {
+            ClearVariablesUsingButton(physbutton);
+        }
+
+        // Set mapping.
+        *joystick_input->variable = vbutton;
+        joystick_physical_buttons[vbutton] = physbutton;
+
+        TXT_CloseWindow(joystick_input->prompt_window);
+        return 1;
+    }
+
+    return 0;
+}
+
+// When the prompt window is closed, disable the event callback function;
+// we are no longer interested in receiving notification of events.
+
+static void PromptWindowClosed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(joystick))
+{
+    TXT_CAST_ARG(SDL_Joystick, joystick);
+
+    SDL_JoystickClose(joystick);
+    TXT_SDL_SetEventCallback(NULL, NULL);
+    SDL_JoystickEventState(SDL_DISABLE);
+    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+}
+
+static void PromptWindowClosedGamepad(TXT_UNCAST_ARG(widget),
+                                      TXT_UNCAST_ARG(joystick))
+{
+    TXT_CAST_ARG(SDL_GameController, joystick);
+
+    SDL_GameControllerClose(joystick);
+    TXT_SDL_SetEventCallback(NULL, NULL);
+    SDL_JoystickEventState(SDL_DISABLE);
+    SDL_GameControllerEventState(SDL_DISABLE);
+    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+}
+
+static void OpenErrorWindow(void)
+{
+    TXT_MessageBox(NULL, "Please configure a controller first!");
+}
+
+static void OpenPromptWindow(txt_joystick_input_t *joystick_input)
+{
+    txt_window_t *window;
+    SDL_Joystick *joystick;
+
+    // Silently update when the shift button is held down.
+
+    joystick_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
+
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
+    {
+        return;
+    }
+
+    // Check the current joystick is valid
+
+    joystick = SDL_JoystickOpen(joystick_index);
+
+    if (joystick == NULL)
+    {
+        OpenErrorWindow();
+        return;
+    }
+
+    // Open the prompt window
+
+    window = TXT_MessageBox(NULL, "Press the new button on the controller...");
+
+    TXT_SDL_SetEventCallback(EventCallback, joystick_input);
+    TXT_SignalConnect(window, "closed", PromptWindowClosed, joystick);
+    joystick_input->prompt_window = window;
+
+    SDL_JoystickEventState(SDL_ENABLE);
+}
+
+static void OpenPromptWindowGamepad(txt_joystick_input_t *joystick_input)
+{
+    txt_window_t *window;
+    SDL_GameController *gamepad;
+
+    // Silently update when the shift button is held down.
+
+    joystick_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
+
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
+    {
+        return;
+    }
+
+    // Check the current joystick is valid
+
+    gamepad = SDL_GameControllerOpen(joystick_index);
+
+    if (gamepad == NULL)
+    {
+        OpenErrorWindow();
+        return;
+    }
+
+    // Open the prompt window
+
+    window = TXT_MessageBox(NULL, "Press the new button on the controller...");
+
+    TXT_SDL_SetEventCallback(EventCallbackGamepad, joystick_input);
+    TXT_SignalConnect(window, "closed", PromptWindowClosedGamepad, gamepad);
+    joystick_input->prompt_window = window;
+
+    // GameController events do not fire if Joystick events are disabled.
+    SDL_JoystickEventState(SDL_ENABLE);
+    SDL_GameControllerEventState(SDL_ENABLE);
+}
+
+static void TXT_JoystickInputSizeCalc(TXT_UNCAST_ARG(joystick_input))
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+
+    // All joystickinputs are the same size.
+
+    joystick_input->widget.w = JOYSTICK_INPUT_WIDTH;
+    joystick_input->widget.h = 1;
+}
+
+static void GetJoystickButtonDescription(int vbutton, char *buf,
+                                         size_t buf_len)
+{
+    M_snprintf(buf, buf_len, "BUTTON #%i",
+               PhysicalForVirtualButton(vbutton) + 1);
+}
+
+static void TXT_JoystickInputDrawer(TXT_UNCAST_ARG(joystick_input))
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+    char buf[20];
+    int i;
+
+    if (*joystick_input->variable < 0)
+    {
+        M_StringCopy(buf, "(none)", sizeof(buf));
+    }
+    else
+    {
+        GetJoystickButtonDescription(*joystick_input->variable,
+                                     buf, sizeof(buf));
+    }
+
+    TXT_SetWidgetBG(joystick_input);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    TXT_DrawString(buf);
+
+    for (i = TXT_UTF8_Strlen(buf); i < JOYSTICK_INPUT_WIDTH; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static int GetGamepadButtonIndex(int button)
+{
+    int i;
+
+    for (i = 0; i < arrlen(gamepad_buttons); ++i)
+    {
+        if (button == gamepad_buttons[i])
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+static void GetGamepadButtonDescription(int vbutton, char *buf, size_t buf_len)
+{
+    int index;
+
+    index = GetGamepadButtonIndex(PhysicalForVirtualButton(vbutton));
+
+    if (index < 0)
+    {
+        M_StringCopy(buf, "(unknown)", buf_len);
+        return;
+    }
+
+    switch (gamepad_type)
+    {
+        case SDL_CONTROLLER_TYPE_XBOX360:
+            M_snprintf(buf, buf_len, "%s", xbox360_buttons[index]);
+            break;
+
+        case SDL_CONTROLLER_TYPE_XBOXONE:
+            M_snprintf(buf, buf_len, "%s", xboxone_buttons[index]);
+            break;
+
+        case SDL_CONTROLLER_TYPE_PS3:
+            M_snprintf(buf, buf_len, "%s", ps3_buttons[index]);
+            break;
+
+        case SDL_CONTROLLER_TYPE_PS4:
+            M_snprintf(buf, buf_len, "%s", ps4_buttons[index]);
+            break;
+
+        case SDL_CONTROLLER_TYPE_PS5:
+            M_snprintf(buf, buf_len, "%s", ps5_buttons[index]);
+            break;
+
+        case SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO:
+            M_snprintf(buf, buf_len, "%s", switchpro_buttons[index]);
+            break;
+
+        default:
+            M_snprintf(buf, buf_len, "BUTTON #%i",
+                       PhysicalForVirtualButton(vbutton) + 1);
+            break;
+    }
+}
+
+static void TXT_GamepadInputDrawer(TXT_UNCAST_ARG(joystick_input))
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+    char buf[20]; // Need to fit "BUTTON #XX"
+    int i;
+
+    if (*joystick_input->variable < 0)
+    {
+        M_StringCopy(buf, "(none)", sizeof(buf));
+    }
+    else
+    {
+        GetGamepadButtonDescription(*joystick_input->variable, buf,
+                                    sizeof(buf));
+    }
+
+    TXT_SetWidgetBG(joystick_input);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    TXT_DrawString(buf);
+
+    for (i = TXT_UTF8_Strlen(buf); i < JOYSTICK_INPUT_WIDTH; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_JoystickInputDestructor(TXT_UNCAST_ARG(joystick_input))
+{
+}
+
+static int TXT_JoystickInputKeyPress(TXT_UNCAST_ARG(joystick_input), int key)
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+
+    if (key == KEY_ENTER)
+    {
+        // Open a window to prompt for the new joystick press
+        OpenPromptWindow(joystick_input);
+
+        return 1;
+    }
+
+    if (key == KEY_BACKSPACE || key == KEY_DEL)
+    {
+        *joystick_input->variable = -1;
+    }
+
+    return 0;
+}
+
+static int TXT_GamepadInputKeyPress(TXT_UNCAST_ARG(joystick_input), int key)
+{
+    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
+
+    if (key == KEY_ENTER)
+    {
+        // Open a window to prompt for the new joystick press
+        OpenPromptWindowGamepad(joystick_input);
+
+        return 1;
+    }
+
+    if (key == KEY_BACKSPACE || key == KEY_DEL)
+    {
+        *joystick_input->variable = -1;
+    }
+
+    return 0;
+}
+
+static void TXT_JoystickInputMousePress(TXT_UNCAST_ARG(widget),
+                                        int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_joystick_input_t, widget);
+
+    // Clicking is like pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_JoystickInputKeyPress(widget, KEY_ENTER);
+    }
+}
+
+static void TXT_GamepadInputMousePress(TXT_UNCAST_ARG(widget), int x, int y,
+                                       int b)
+{
+    TXT_CAST_ARG(txt_joystick_input_t, widget);
+
+    // Clicking is like pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_GamepadInputKeyPress(widget, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_joystick_input_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_JoystickInputSizeCalc,
+    TXT_JoystickInputDrawer,
+    TXT_JoystickInputKeyPress,
+    TXT_JoystickInputDestructor,
+    TXT_JoystickInputMousePress,
+    NULL,
+};
+
+txt_widget_class_t txt_gamepad_input_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_JoystickInputSizeCalc,
+    TXT_GamepadInputDrawer,
+    TXT_GamepadInputKeyPress,
+    TXT_JoystickInputDestructor,
+    TXT_GamepadInputMousePress,
+    NULL,
+};
+
+txt_joystick_input_t *TXT_NewJoystickInput(int *variable)
+{
+    txt_joystick_input_t *joystick_input;
+
+    joystick_input = malloc(sizeof(txt_joystick_input_t));
+
+    if (use_gamepad)
+    {
+        TXT_InitWidget(joystick_input, &txt_gamepad_input_class);
+    }
+    else
+    {
+        TXT_InitWidget(joystick_input, &txt_joystick_input_class);
+    }
+    joystick_input->variable = variable;
+
+    return joystick_input;
+}
+
diff --git a/games/NXDoom/src/setup/txt_joybinput.h b/games/NXDoom/src/setup/txt_joybinput.h
new file mode 100644
index 000000000..26a9f24c3
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_joybinput.h
@@ -0,0 +1,40 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_JOYB_INPUT_H
+#define TXT_JOYB_INPUT_H
+
+typedef struct txt_joystick_input_s txt_joystick_input_t;
+
+#include "txt_widget.h"
+#include "txt_window.h"
+
+//
+// A joystick input is like an input box.  When selected, a box pops up
+// allowing a joystick button to be pressed to select it.
+//
+
+struct txt_joystick_input_s
+{
+    txt_widget_t widget;
+    int *variable;
+    txt_window_t *prompt_window;
+    int check_conflicts;
+};
+
+txt_joystick_input_t *TXT_NewJoystickInput(int *variable);
+
+#endif /* #ifndef TXT_JOYB_INPUT_H */
+
+
diff --git a/games/NXDoom/src/setup/txt_keyinput.c b/games/NXDoom/src/setup/txt_keyinput.c
new file mode 100644
index 000000000..6c3b35917
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_keyinput.c
@@ -0,0 +1,185 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+#include "m_misc.h"
+
+#include "txt_keyinput.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_label.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+#define KEY_INPUT_WIDTH 8
+
+static int KeyPressCallback(txt_window_t *window, int key, 
+                            TXT_UNCAST_ARG(key_input))
+{
+    TXT_CAST_ARG(txt_key_input_t, key_input);
+
+    if (key != KEY_ESCAPE)
+    {
+        // Got the key press. Save to the variable and close the window.
+
+        *key_input->variable = key;
+
+        if (key_input->check_conflicts)
+        {
+            TXT_EmitSignal(key_input, "set");
+        }
+
+        TXT_CloseWindow(window);
+
+        // Return to normal input mode now that we have the key.
+        TXT_SetInputMode(TXT_INPUT_NORMAL);
+
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+static void ReleaseGrab(TXT_UNCAST_ARG(window), TXT_UNCAST_ARG(unused))
+{
+    // SDL2-TODO: Needed?
+    // SDL_WM_GrabInput(SDL_GRAB_OFF);
+}
+
+static void OpenPromptWindow(txt_key_input_t *key_input)
+{
+    txt_window_t *window;
+
+    // Silently update when the shift button is held down.
+
+    key_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
+
+    window = TXT_MessageBox(NULL, "Press the new key...");
+
+    TXT_SetKeyListener(window, KeyPressCallback, key_input);
+
+    // Switch to raw input mode while we're grabbing the key.
+    TXT_SetInputMode(TXT_INPUT_RAW);
+
+    // Grab input while reading the key.  On Windows Mobile
+    // handheld devices, the hardware keypresses are only
+    // detected when input is grabbed.
+
+    // SDL2-TODO: Needed?
+    //SDL_WM_GrabInput(SDL_GRAB_ON);
+    TXT_SignalConnect(window, "closed", ReleaseGrab, NULL);
+}
+
+static void TXT_KeyInputSizeCalc(TXT_UNCAST_ARG(key_input))
+{
+    TXT_CAST_ARG(txt_key_input_t, key_input);
+
+    // All keyinputs are the same size.
+
+    key_input->widget.w = KEY_INPUT_WIDTH;
+    key_input->widget.h = 1;
+}
+
+
+static void TXT_KeyInputDrawer(TXT_UNCAST_ARG(key_input))
+{
+    TXT_CAST_ARG(txt_key_input_t, key_input);
+    char buf[20];
+    int i;
+
+    if (*key_input->variable == 0)
+    {
+        M_StringCopy(buf, "(none)", sizeof(buf));
+    }
+    else
+    {
+        TXT_GetKeyDescription(*key_input->variable, buf, sizeof(buf));
+    }
+
+    TXT_SetWidgetBG(key_input);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    TXT_DrawString(buf);
+
+    for (i = TXT_UTF8_Strlen(buf); i < KEY_INPUT_WIDTH; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_KeyInputDestructor(TXT_UNCAST_ARG(key_input))
+{
+}
+
+static int TXT_KeyInputKeyPress(TXT_UNCAST_ARG(key_input), int key)
+{
+    TXT_CAST_ARG(txt_key_input_t, key_input);
+
+    if (key == KEY_ENTER)
+    {
+        // Open a window to prompt for the new key press
+
+        OpenPromptWindow(key_input);
+
+        return 1;
+    }
+
+    if (key == KEY_BACKSPACE || key == KEY_DEL)
+    {
+        *key_input->variable = 0;
+    }
+
+    return 0;
+}
+
+static void TXT_KeyInputMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_key_input_t, widget);
+            
+    // Clicking is like pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_KeyInputKeyPress(widget, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_key_input_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_KeyInputSizeCalc,
+    TXT_KeyInputDrawer,
+    TXT_KeyInputKeyPress,
+    TXT_KeyInputDestructor,
+    TXT_KeyInputMousePress,
+    NULL,
+};
+
+txt_key_input_t *TXT_NewKeyInput(int *variable)
+{
+    txt_key_input_t *key_input;
+
+    key_input = malloc(sizeof(txt_key_input_t));
+
+    TXT_InitWidget(key_input, &txt_key_input_class);
+    key_input->variable = variable;
+
+    return key_input;
+}
+
diff --git a/games/NXDoom/src/setup/txt_keyinput.h b/games/NXDoom/src/setup/txt_keyinput.h
new file mode 100644
index 000000000..334d6c1cf
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_keyinput.h
@@ -0,0 +1,38 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_KEY_INPUT_H
+#define TXT_KEY_INPUT_H
+
+typedef struct txt_key_input_s txt_key_input_t;
+
+#include "txt_widget.h"
+
+//
+// A key input is like an input box.  When selected, a box pops up
+// allowing a key to be selected.
+//
+
+struct txt_key_input_s
+{
+    txt_widget_t widget;
+    int *variable;
+    int check_conflicts;
+};
+
+txt_key_input_t *TXT_NewKeyInput(int *variable);
+
+#endif /* #ifndef TXT_KEY_INPUT_H */
+
+
diff --git a/games/NXDoom/src/setup/txt_mouseinput.c b/games/NXDoom/src/setup/txt_mouseinput.c
new file mode 100644
index 000000000..99196a581
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_mouseinput.c
@@ -0,0 +1,184 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+#include "m_misc.h"
+
+#include "txt_mouseinput.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_label.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+// eg. "BUTTON #10"
+#define MOUSE_INPUT_WIDTH 10
+
+static int MousePressCallback(txt_window_t *window, 
+                              int x, int y, int b,
+                              TXT_UNCAST_ARG(mouse_input))
+{
+    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
+
+    // Got the mouse press.  Save to the variable and close the window.
+
+    *mouse_input->variable = b - TXT_MOUSE_BASE;
+
+    if (mouse_input->check_conflicts)
+    {
+        TXT_EmitSignal(mouse_input, "set");
+    }
+
+    TXT_CloseWindow(window);
+
+    return 1;
+}
+
+static void OpenPromptWindow(txt_mouse_input_t *mouse_input)
+{
+    txt_window_t *window;
+
+    // Silently update when the shift key is held down.
+    mouse_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
+
+    window = TXT_MessageBox(NULL, "Press the new mouse button...");
+
+    TXT_SetMouseListener(window, MousePressCallback, mouse_input);
+}
+
+static void TXT_MouseInputSizeCalc(TXT_UNCAST_ARG(mouse_input))
+{
+    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
+
+    // All mouseinputs are the same size.
+
+    mouse_input->widget.w = MOUSE_INPUT_WIDTH;
+    mouse_input->widget.h = 1;
+}
+
+static void GetMouseButtonDescription(int button, char *buf, size_t buf_len)
+{
+    switch (button)
+    {
+        case 0:
+            M_StringCopy(buf, "LEFT", buf_len);
+            break;
+        case 1:
+            M_StringCopy(buf, "RIGHT", buf_len);
+            break;
+        case 2:
+            M_StringCopy(buf, "MID", buf_len);
+            break;
+        case 3:
+            M_StringCopy(buf, "WHEEL UP", buf_len);
+            break;
+        case 4:
+            M_StringCopy(buf, "WHEEL DOWN", buf_len);
+            break;
+        default:
+            M_snprintf(buf, buf_len, "BUTTON #%i", button - 1);
+            break;
+    }
+}
+
+static void TXT_MouseInputDrawer(TXT_UNCAST_ARG(mouse_input))
+{
+    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
+    char buf[20];
+    int i;
+
+    if (*mouse_input->variable < 0)
+    {
+        M_StringCopy(buf, "(none)", sizeof(buf));
+    }
+    else
+    {
+        GetMouseButtonDescription(*mouse_input->variable, buf, sizeof(buf));
+    }
+
+    TXT_SetWidgetBG(mouse_input);
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+    
+    TXT_DrawString(buf);
+    
+    for (i = TXT_UTF8_Strlen(buf); i < MOUSE_INPUT_WIDTH; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_MouseInputDestructor(TXT_UNCAST_ARG(mouse_input))
+{
+}
+
+static int TXT_MouseInputKeyPress(TXT_UNCAST_ARG(mouse_input), int key)
+{
+    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
+
+    if (key == KEY_ENTER)
+    {
+        // Open a window to prompt for the new mouse press
+
+        OpenPromptWindow(mouse_input);
+
+        return 1;
+    }
+
+    if (key == KEY_BACKSPACE || key == KEY_DEL)
+    {
+        *mouse_input->variable = -1;
+    }
+
+    return 0;
+}
+
+static void TXT_MouseInputMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_mouse_input_t, widget);
+
+    // Clicking is like pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_MouseInputKeyPress(widget, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_mouse_input_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_MouseInputSizeCalc,
+    TXT_MouseInputDrawer,
+    TXT_MouseInputKeyPress,
+    TXT_MouseInputDestructor,
+    TXT_MouseInputMousePress,
+    NULL,
+};
+
+txt_mouse_input_t *TXT_NewMouseInput(int *variable)
+{
+    txt_mouse_input_t *mouse_input;
+
+    mouse_input = malloc(sizeof(txt_mouse_input_t));
+
+    TXT_InitWidget(mouse_input, &txt_mouse_input_class);
+    mouse_input->variable = variable;
+
+    return mouse_input;
+}
+
diff --git a/games/NXDoom/src/setup/txt_mouseinput.h b/games/NXDoom/src/setup/txt_mouseinput.h
new file mode 100644
index 000000000..2b05c3718
--- /dev/null
+++ b/games/NXDoom/src/setup/txt_mouseinput.h
@@ -0,0 +1,38 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_MOUSE_INPUT_H
+#define TXT_MOUSE_INPUT_H
+
+typedef struct txt_mouse_input_s txt_mouse_input_t;
+
+#include "txt_widget.h"
+
+//
+// A mouse input is like an input box.  When selected, a box pops up
+// allowing a mouse to be selected.
+//
+
+struct txt_mouse_input_s
+{
+    txt_widget_t widget;
+    int *variable;
+    int check_conflicts;
+};
+
+txt_mouse_input_t *TXT_NewMouseInput(int *variable);
+
+#endif /* #ifndef TXT_MOUSE_INPUT_H */
+
+
diff --git a/games/NXDoom/src/sha1.c b/games/NXDoom/src/sha1.c
new file mode 100644
index 000000000..8504134a9
--- /dev/null
+++ b/games/NXDoom/src/sha1.c
@@ -0,0 +1,321 @@
+/* sha1.c - SHA1 hash function
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ *
+ * Please see below for more legal information!
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+
+/*  Test vectors:
+ *
+ *  "abc"
+ *  A999 3E36 4706 816A BA3E  2571 7850 C26C 9CD0 D89D
+ *
+ *  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+ *  8498 3E44 1C3B D26E BAAE  4AA1 F951 29E5 E546 70F1
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "i_swap.h"
+#include "sha1.h"
+
+void SHA1_Init(sha1_context_t *hd)
+{
+    hd->h0 = 0x67452301;
+    hd->h1 = 0xefcdab89;
+    hd->h2 = 0x98badcfe;
+    hd->h3 = 0x10325476;
+    hd->h4 = 0xc3d2e1f0;
+    hd->nblocks = 0;
+    hd->count = 0;
+}
+
+
+/****************
+ * Transform the message X which consists of 16 32-bit-words
+ */
+static void Transform(sha1_context_t *hd, byte *data)
+{
+    uint32_t a,b,c,d,e,tm;
+    uint32_t x[16];
+
+    /* get values from the chaining vars */
+    a = hd->h0;
+    b = hd->h1;
+    c = hd->h2;
+    d = hd->h3;
+    e = hd->h4;
+
+#ifdef SYS_BIG_ENDIAN
+    memcpy(x, data, 64);
+#else
+    {
+        int i;
+        byte *p2;
+        for(i=0, p2=(byte*)x; i < 16; i++, p2 += 4 )
+        {
+            p2[3] = *data++;
+            p2[2] = *data++;
+            p2[1] = *data++;
+            p2[0] = *data++;
+        }
+    }
+#endif
+
+
+#define K1  0x5A827999L
+#define K2  0x6ED9EBA1L
+#define K3  0x8F1BBCDCL
+#define K4  0xCA62C1D6L
+#define F1(x,y,z)   ( z ^ ( x & ( y ^ z ) ) )
+#define F2(x,y,z)   ( x ^ y ^ z )
+#define F3(x,y,z)   ( ( x & y ) | ( z & ( x | y ) ) )
+#define F4(x,y,z)   ( x ^ y ^ z )
+
+#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+
+#define M(i) ( tm =   x[i&0x0f] ^ x[(i-14)&0x0f] \
+		    ^ x[(i-8)&0x0f] ^ x[(i-3)&0x0f] \
+	       , (x[i&0x0f] = rol(tm,1)) )
+
+#define R(a,b,c,d,e,f,k,m)  do { e += rol( a, 5 )     \
+				      + f( b, c, d )  \
+				      + k	      \
+				      + m;	      \
+				 b = rol( b, 30 );    \
+			       } while(0)
+    R( a, b, c, d, e, F1, K1, x[ 0] );
+    R( e, a, b, c, d, F1, K1, x[ 1] );
+    R( d, e, a, b, c, F1, K1, x[ 2] );
+    R( c, d, e, a, b, F1, K1, x[ 3] );
+    R( b, c, d, e, a, F1, K1, x[ 4] );
+    R( a, b, c, d, e, F1, K1, x[ 5] );
+    R( e, a, b, c, d, F1, K1, x[ 6] );
+    R( d, e, a, b, c, F1, K1, x[ 7] );
+    R( c, d, e, a, b, F1, K1, x[ 8] );
+    R( b, c, d, e, a, F1, K1, x[ 9] );
+    R( a, b, c, d, e, F1, K1, x[10] );
+    R( e, a, b, c, d, F1, K1, x[11] );
+    R( d, e, a, b, c, F1, K1, x[12] );
+    R( c, d, e, a, b, F1, K1, x[13] );
+    R( b, c, d, e, a, F1, K1, x[14] );
+    R( a, b, c, d, e, F1, K1, x[15] );
+    R( e, a, b, c, d, F1, K1, M(16) );
+    R( d, e, a, b, c, F1, K1, M(17) );
+    R( c, d, e, a, b, F1, K1, M(18) );
+    R( b, c, d, e, a, F1, K1, M(19) );
+    R( a, b, c, d, e, F2, K2, M(20) );
+    R( e, a, b, c, d, F2, K2, M(21) );
+    R( d, e, a, b, c, F2, K2, M(22) );
+    R( c, d, e, a, b, F2, K2, M(23) );
+    R( b, c, d, e, a, F2, K2, M(24) );
+    R( a, b, c, d, e, F2, K2, M(25) );
+    R( e, a, b, c, d, F2, K2, M(26) );
+    R( d, e, a, b, c, F2, K2, M(27) );
+    R( c, d, e, a, b, F2, K2, M(28) );
+    R( b, c, d, e, a, F2, K2, M(29) );
+    R( a, b, c, d, e, F2, K2, M(30) );
+    R( e, a, b, c, d, F2, K2, M(31) );
+    R( d, e, a, b, c, F2, K2, M(32) );
+    R( c, d, e, a, b, F2, K2, M(33) );
+    R( b, c, d, e, a, F2, K2, M(34) );
+    R( a, b, c, d, e, F2, K2, M(35) );
+    R( e, a, b, c, d, F2, K2, M(36) );
+    R( d, e, a, b, c, F2, K2, M(37) );
+    R( c, d, e, a, b, F2, K2, M(38) );
+    R( b, c, d, e, a, F2, K2, M(39) );
+    R( a, b, c, d, e, F3, K3, M(40) );
+    R( e, a, b, c, d, F3, K3, M(41) );
+    R( d, e, a, b, c, F3, K3, M(42) );
+    R( c, d, e, a, b, F3, K3, M(43) );
+    R( b, c, d, e, a, F3, K3, M(44) );
+    R( a, b, c, d, e, F3, K3, M(45) );
+    R( e, a, b, c, d, F3, K3, M(46) );
+    R( d, e, a, b, c, F3, K3, M(47) );
+    R( c, d, e, a, b, F3, K3, M(48) );
+    R( b, c, d, e, a, F3, K3, M(49) );
+    R( a, b, c, d, e, F3, K3, M(50) );
+    R( e, a, b, c, d, F3, K3, M(51) );
+    R( d, e, a, b, c, F3, K3, M(52) );
+    R( c, d, e, a, b, F3, K3, M(53) );
+    R( b, c, d, e, a, F3, K3, M(54) );
+    R( a, b, c, d, e, F3, K3, M(55) );
+    R( e, a, b, c, d, F3, K3, M(56) );
+    R( d, e, a, b, c, F3, K3, M(57) );
+    R( c, d, e, a, b, F3, K3, M(58) );
+    R( b, c, d, e, a, F3, K3, M(59) );
+    R( a, b, c, d, e, F4, K4, M(60) );
+    R( e, a, b, c, d, F4, K4, M(61) );
+    R( d, e, a, b, c, F4, K4, M(62) );
+    R( c, d, e, a, b, F4, K4, M(63) );
+    R( b, c, d, e, a, F4, K4, M(64) );
+    R( a, b, c, d, e, F4, K4, M(65) );
+    R( e, a, b, c, d, F4, K4, M(66) );
+    R( d, e, a, b, c, F4, K4, M(67) );
+    R( c, d, e, a, b, F4, K4, M(68) );
+    R( b, c, d, e, a, F4, K4, M(69) );
+    R( a, b, c, d, e, F4, K4, M(70) );
+    R( e, a, b, c, d, F4, K4, M(71) );
+    R( d, e, a, b, c, F4, K4, M(72) );
+    R( c, d, e, a, b, F4, K4, M(73) );
+    R( b, c, d, e, a, F4, K4, M(74) );
+    R( a, b, c, d, e, F4, K4, M(75) );
+    R( e, a, b, c, d, F4, K4, M(76) );
+    R( d, e, a, b, c, F4, K4, M(77) );
+    R( c, d, e, a, b, F4, K4, M(78) );
+    R( b, c, d, e, a, F4, K4, M(79) );
+
+    /* update chainig vars */
+    hd->h0 += a;
+    hd->h1 += b;
+    hd->h2 += c;
+    hd->h3 += d;
+    hd->h4 += e;
+}
+
+
+/* Update the message digest with the contents
+ * of INBUF with length INLEN.
+ */
+void SHA1_Update(sha1_context_t *hd, byte *inbuf, size_t inlen)
+{
+    if (hd->count == 64)
+    {
+        /* flush the buffer */
+	Transform(hd, hd->buf);
+	hd->count = 0;
+	hd->nblocks++;
+    }
+    if (!inbuf)
+	return;
+    if (hd->count)
+    {
+	for (; inlen && hd->count < 64; inlen--)
+	    hd->buf[hd->count++] = *inbuf++;
+	SHA1_Update(hd, NULL, 0);
+	if (!inlen)
+	    return;
+    }
+
+    while (inlen >= 64)
+    {
+	Transform(hd, inbuf);
+	hd->count = 0;
+	hd->nblocks++;
+	inlen -= 64;
+	inbuf += 64;
+    }
+    for (; inlen && hd->count < 64; inlen--)
+	hd->buf[hd->count++] = *inbuf++;
+}
+
+
+/* The routine final terminates the computation and
+ * returns the digest.
+ * The handle is prepared for a new cycle, but adding bytes to the
+ * handle will the destroy the returned buffer.
+ * Returns: 20 bytes representing the digest.
+ */
+
+void SHA1_Final(sha1_digest_t digest, sha1_context_t *hd)
+{
+    uint32_t t, msb, lsb;
+    byte *p;
+
+    SHA1_Update(hd, NULL, 0); /* flush */;
+
+    t = hd->nblocks;
+    /* multiply by 64 to make a byte count */
+    lsb = t << 6;
+    msb = t >> 26;
+    /* add the count */
+    t = lsb;
+    if ((lsb += hd->count) < t)
+	msb++;
+    /* multiply by 8 to make a bit count */
+    t = lsb;
+    lsb <<= 3;
+    msb <<= 3;
+    msb |= t >> 29;
+
+    if (hd->count < 56)
+    {
+        /* enough room */
+	hd->buf[hd->count++] = 0x80; /* pad */
+	while (hd->count < 56)
+	    hd->buf[hd->count++] = 0;  /* pad */
+    }
+    else
+    {
+        /* need one extra block */
+	hd->buf[hd->count++] = 0x80; /* pad character */
+	while (hd->count < 64)
+	    hd->buf[hd->count++] = 0;
+	SHA1_Update(hd, NULL, 0);  /* flush */;
+	memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
+    }
+    /* append the 64 bit count */
+    hd->buf[56] = msb >> 24;
+    hd->buf[57] = msb >> 16;
+    hd->buf[58] = msb >>  8;
+    hd->buf[59] = msb	   ;
+    hd->buf[60] = lsb >> 24;
+    hd->buf[61] = lsb >> 16;
+    hd->buf[62] = lsb >>  8;
+    hd->buf[63] = lsb	   ;
+    Transform(hd, hd->buf);
+
+    p = hd->buf;
+#ifdef SYS_BIG_ENDIAN
+#define X(a) do { *(uint32_t*)p = hd->h##a ; p += 4; } while(0)
+#else /* little endian */
+#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16;	 \
+		      *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0)
+#endif
+    X(0);
+    X(1);
+    X(2);
+    X(3);
+    X(4);
+#undef X
+
+    memcpy(digest, hd->buf, sizeof(sha1_digest_t));
+}
+
+void SHA1_UpdateInt32(sha1_context_t *context, unsigned int val)
+{
+    byte buf[4];
+
+    buf[0] = (val >> 24) & 0xff;
+    buf[1] = (val >> 16) & 0xff;
+    buf[2] = (val >> 8) & 0xff;
+    buf[3] = val & 0xff;
+
+    SHA1_Update(context, buf, 4);
+}
+
+void SHA1_UpdateString(sha1_context_t *context, char *str)
+{
+    SHA1_Update(context, (byte *) str, strlen(str) + 1);
+}
+
diff --git a/games/NXDoom/src/sha1.h b/games/NXDoom/src/sha1.h
new file mode 100644
index 000000000..249571be3
--- /dev/null
+++ b/games/NXDoom/src/sha1.h
@@ -0,0 +1,40 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     SHA-1 digest.
+//
+
+#ifndef __SHA1_H__
+#define __SHA1_H__
+
+#include "doomtype.h"
+
+typedef struct sha1_context_s sha1_context_t;
+typedef byte sha1_digest_t[20];
+
+struct sha1_context_s {
+    uint32_t h0,h1,h2,h3,h4;
+    uint32_t nblocks;
+    byte buf[64];
+    int count;
+};
+
+void SHA1_Init(sha1_context_t *context);
+void SHA1_Update(sha1_context_t *context, byte *buf, size_t len);
+void SHA1_Final(sha1_digest_t digest, sha1_context_t *context);
+void SHA1_UpdateInt32(sha1_context_t *context, unsigned int val);
+void SHA1_UpdateString(sha1_context_t *context, char *str);
+
+#endif /* #ifndef __SHA1_H__ */
+
diff --git a/games/NXDoom/src/strife-res.rc.in b/games/NXDoom/src/strife-res.rc.in
new file mode 100644
index 000000000..ab9a2580d
--- /dev/null
+++ b/games/NXDoom/src/strife-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/strife.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+  BLOCK "040904E4"
+  {
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+   VALUE "FileDescription", "@PACKAGE_STRING@"
+   VALUE "InternalName", "@PACKAGE_TARNAME@"
+   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+   VALUE "ProductName", "@PACKAGE_NAME@"
+   VALUE "ProductVersion", "@PACKAGE_VERSION@"
+  }
+ }
+ BLOCK "VarFileInfo"
+ {
+  VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/games/NXDoom/src/strife/.gitignore b/games/NXDoom/src/strife/.gitignore
new file mode 100644
index 000000000..d4e88e5a2
--- /dev/null
+++ b/games/NXDoom/src/strife/.gitignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+tags
+TAGS
diff --git a/games/NXDoom/src/strife/CMakeLists.txt b/games/NXDoom/src/strife/CMakeLists.txt
new file mode 100644
index 000000000..20d336cdb
--- /dev/null
+++ b/games/NXDoom/src/strife/CMakeLists.txt
@@ -0,0 +1,92 @@
+set(STRIFE_SOURCES
+    am_map.c        am_map.h
+    deh_ammo.c
+    deh_cheat.c
+    deh_strife.c
+    deh_frame.c
+    deh_misc.c      deh_misc.h
+    deh_ptr.c
+    deh_sound.c
+    deh_thing.c
+    deh_weapon.c
+                    d_englsh.h
+    d_items.c       d_items.h
+    d_main.c        d_main.h
+    d_net.c
+                    doomdata.h
+    doomdef.c       doomdef.h
+    doomstat.c      doomstat.h
+                    d_player.h
+    dstrings.c      dstrings.h
+                    d_textur.h
+                    d_think.h
+    f_finale.c      f_finale.h
+    f_wipe.c        f_wipe.h
+    g_game.c        g_game.h
+    hu_lib.c        hu_lib.h
+    hu_stuff.c      hu_stuff.h
+    info.c          info.h
+    m_menu.c        m_menu.h
+    m_random.c      m_random.h
+    m_saves.c       m_saves.h
+    p_ceilng.c
+    p_dialog.c      p_dialog.h
+    p_doors.c
+    p_enemy.c
+    p_floor.c
+    p_inter.c       p_inter.h
+    p_lights.c
+                    p_local.h
+    p_map.c
+    p_maputl.c
+    p_mobj.c        p_mobj.h
+    p_plats.c
+    p_pspr.c        p_pspr.h
+    p_saveg.c       p_saveg.h
+    p_setup.c       p_setup.h
+    p_sight.c
+    p_spec.c        p_spec.h
+    p_switch.c
+    p_telept.c
+    p_tick.c        p_tick.h
+    p_user.c
+    r_bsp.c         r_bsp.h
+    r_data.c        r_data.h
+                    r_defs.h
+    r_draw.c        r_draw.h
+                    r_local.h
+    r_main.c        r_main.h
+    r_plane.c       r_plane.h
+    r_segs.c        r_segs.h
+    r_sky.c         r_sky.h
+                    r_state.h
+    r_things.c      r_things.h
+    s_sound.c       s_sound.h
+    sounds.c        sounds.h
+    st_lib.c        st_lib.h
+    st_stuff.c      st_stuff.h
+    wi_stuff.c      wi_stuff.h)
+
+add_library(strife STATIC ${STRIFE_SOURCES})
+
+target_include_directories(strife PRIVATE "../" "../../win32/" "${CMAKE_CURRENT_BINARY_DIR}/../../")
+if (DEFINED EMSCRIPTEN)
+    set(SDL_FLAGS "-s USE_SDL=2")
+    if(ENABLE_SDL2_MIXER)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
+    endif()
+    if(ENABLE_SDL2_NET)
+        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
+    endif()
+else()
+    set(SDL_LINK_LIBS, "SDL2::SDL2")
+    if(ENABLE_SDL2_MIXER)
+        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
+    endif()
+    if(ENABLE_SDL2_NET)
+        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
+    endif()
+endif()
+target_link_libraries(strife textscreen ${SDL_LINK_LIBS})
+set_target_properties(strife PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
+set_target_properties(strife PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/strife/Makefile.am b/games/NXDoom/src/strife/Makefile.am
new file mode 100644
index 000000000..36d7b0c58
--- /dev/null
+++ b/games/NXDoom/src/strife/Makefile.am
@@ -0,0 +1,85 @@
+AM_CFLAGS=-I$(top_srcdir)/src                           \
+          -I$(top_srcdir)/textscreen                    \
+          @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+
+EXTRA_DIST =                    \
+        CMakeLists.txt          \
+        strife_icon.c
+
+noinst_LIBRARIES=libstrife.a
+
+libstrife_a_SOURCES =           \
+am_map.c           am_map.h     \
+deh_ammo.c                      \
+deh_cheat.c                     \
+deh_strife.c                    \
+deh_frame.c                     \
+deh_misc.c         deh_misc.h   \
+deh_ptr.c                       \
+deh_sound.c                     \
+deh_thing.c                     \
+deh_weapon.c                    \
+                   d_englsh.h   \
+d_items.c          d_items.h    \
+d_main.c           d_main.h     \
+d_net.c                         \
+                   doomdata.h   \
+doomdef.c          doomdef.h    \
+doomstat.c         doomstat.h   \
+                   d_player.h   \
+dstrings.c         dstrings.h   \
+                   d_textur.h   \
+                   d_think.h    \
+f_finale.c         f_finale.h   \
+f_wipe.c           f_wipe.h     \
+g_game.c           g_game.h     \
+hu_lib.c           hu_lib.h     \
+hu_stuff.c         hu_stuff.h   \
+info.c             info.h       \
+m_menu.c           m_menu.h     \
+m_random.c         m_random.h   \
+m_saves.c          m_saves.h    \
+p_ceilng.c                      \
+p_dialog.c         p_dialog.h   \
+p_doors.c                       \
+p_enemy.c                       \
+p_floor.c                       \
+p_inter.c          p_inter.h    \
+p_lights.c                      \
+                   p_local.h    \
+p_map.c                         \
+p_maputl.c                      \
+p_mobj.c           p_mobj.h     \
+p_plats.c                       \
+p_pspr.c           p_pspr.h     \
+p_saveg.c          p_saveg.h    \
+p_setup.c          p_setup.h    \
+p_sight.c                       \
+p_spec.c           p_spec.h     \
+p_switch.c                      \
+p_telept.c                      \
+p_tick.c           p_tick.h     \
+p_user.c                        \
+r_bsp.c            r_bsp.h      \
+r_data.c           r_data.h     \
+                   r_defs.h     \
+r_draw.c           r_draw.h     \
+                   r_local.h    \
+r_main.c           r_main.h     \
+r_plane.c          r_plane.h    \
+r_segs.c           r_segs.h     \
+r_sky.c            r_sky.h      \
+                   r_state.h    \
+r_things.c         r_things.h   \
+s_sound.c          s_sound.h    \
+sounds.c           sounds.h     \
+st_lib.c           st_lib.h     \
+st_stuff.c         st_stuff.h   \
+wi_stuff.c         wi_stuff.h
+
+if HAVE_ICONS
+
+strife_icon.c : $(top_builddir)/data/strife.png
+	$(top_builddir)/data/convert-icon $(top_builddir)/data/strife.png $@
+
+endif
diff --git a/games/NXDoom/src/strife/am_map.c b/games/NXDoom/src/strife/am_map.c
new file mode 100644
index 000000000..e36fb56d5
--- /dev/null
+++ b/games/NXDoom/src/strife/am_map.c
@@ -0,0 +1,1415 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:  the automap code
+//
+
+
+#include <stdio.h>
+
+#include "deh_main.h"
+
+#include "z_zone.h"
+#include "doomkeys.h"
+#include "doomdef.h"
+#include "m_misc.h"
+#include "st_stuff.h"
+#include "p_local.h"
+#include "w_wad.h"
+
+#include "m_cheat.h"
+#include "m_controls.h"
+#include "i_system.h"
+#include "i_timer.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "dstrings.h"
+
+#include "am_map.h"
+
+
+// Automap colors
+#define BACKGROUND      240         // haleyjd [STRIFE]
+#define WALLCOLORS      5           // villsa [STRIFE]
+#define WALLRANGE       16
+#define TSWALLCOLORS    16
+#define FDWALLCOLORS    122         // villsa [STRIFE]
+#define CDWALLCOLORS    116
+#define CTWALLCOLORS    19          // villsa [STRIFE]
+#define SPWALLCOLORS    243         // villsa [STRIFE]
+#define THINGCOLORS     233         // villsa [STRIFE]
+#define MISSILECOLORS   227         // villsa [STRIFE]
+#define SHOOTABLECOLORS 235         // villsa [STRIFE]
+
+// drawing stuff
+
+#define AM_NUMMARKPOINTS 10
+
+// scale on entry
+#define INITSCALEMTOF (.2*FRACUNIT)
+// how much the automap moves window per tic in frame-buffer coordinates
+// moves 140 pixels in 1 second
+#define F_PANINC	4
+// how much zoom-in per tic
+// goes to 2x in 1 second
+#define M_ZOOMIN        ((int) (1.02*FRACUNIT))
+// how much zoom-out per tic
+// pulls out to 0.5x in 1 second
+#define M_ZOOMOUT       ((int) (FRACUNIT/1.02))
+
+// translates between frame-buffer and map distances
+#define FTOM(x) FixedMul(((x)<<16),scale_ftom)
+#define MTOF(x) (FixedMul((x),scale_mtof)>>16)
+// translates between frame-buffer and map coordinates
+#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
+#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
+
+// the following is crap
+#define LINE_NEVERSEE ML_DONTDRAW
+
+typedef struct
+{
+    int x, y;
+} fpoint_t;
+
+typedef struct
+{
+    fpoint_t a, b;
+} fline_t;
+
+typedef struct
+{
+    fixed_t		x,y;
+} mpoint_t;
+
+typedef struct
+{
+    mpoint_t a, b;
+} mline_t;
+
+typedef struct
+{
+    fixed_t slp, islp;
+} islope_t;
+
+
+
+//
+// The vector graphics for the automap.
+//  A line drawing of the player pointing right,
+//   starting from the middle.
+//
+#define R ((8*PLAYERRADIUS)/7)
+mline_t player_arrow[] = {
+    { { -R+R/8, 0 }, { R, 0 } }, // -----
+    { { R, 0 }, { R-R/2, R/4 } },  // ----->
+    { { R, 0 }, { R-R/2, -R/4 } },
+    { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
+    { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
+    { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
+    { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
+};
+#undef R
+
+#define R ((8*PLAYERRADIUS)/7)
+mline_t cheat_player_arrow[] = {
+    { { -R+R/8, 0 }, { R, 0 } }, // -----
+    { { R, 0 }, { R-R/2, R/6 } },  // ----->
+    { { R, 0 }, { R-R/2, -R/6 } },
+    { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
+    { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
+    { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
+    { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
+    { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
+    { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
+    { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
+    { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
+    { { -R/6, -R/6 }, { 0, -R/6 } },
+    { { 0, -R/6 }, { 0, R/4 } },
+    { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
+    { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
+    { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
+};
+#undef R
+
+#define R (FRACUNIT)
+mline_t triangle_guy[] = {
+    { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
+    { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0      ), (fixed_t)(R    ) } },
+    { { (fixed_t)(0      ), (fixed_t)(R    ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
+};
+#undef R
+
+#define R (FRACUNIT)
+mline_t thintriangle_guy[] = {
+    { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
+    { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+    { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
+};
+#undef R
+
+
+
+
+static int 	cheating = 0;
+//static int 	grid = 0;     [STRIFE]: no such variable
+
+boolean    	automapactive = false;
+static int 	finit_width = SCREENWIDTH;
+static int 	finit_height = SCREENHEIGHT - 32;
+
+// location of window on screen
+static int 	f_x;
+static int	f_y;
+
+// size of window on screen
+static int 	f_w;
+static int	f_h;
+
+static int 	lightlev; 		// used for funky strobing effect
+static byte*	fb; 			// pseudo-frame buffer
+static int 	amclock;
+
+static mpoint_t m_paninc; // how far the window pans each tic (map coords)
+static fixed_t 	mtof_zoommul; // how far the window zooms in each tic (map coords)
+static fixed_t 	ftom_zoommul; // how far the window zooms in each tic (fb coords)
+
+static fixed_t 	m_x, m_y;   // LL x,y where the window is on the map (map coords)
+static fixed_t 	m_x2, m_y2; // UR x,y where the window is on the map (map coords)
+
+//
+// width/height of window on map (map coords)
+//
+static fixed_t 	m_w;
+static fixed_t	m_h;
+
+// based on level size
+static fixed_t 	min_x;
+static fixed_t	min_y; 
+static fixed_t 	max_x;
+static fixed_t  max_y;
+
+static fixed_t 	max_w; // max_x-min_x,
+static fixed_t  max_h; // max_y-min_y
+
+// based on player size
+static fixed_t 	min_w;
+static fixed_t  min_h;
+
+
+static fixed_t 	min_scale_mtof; // used to tell when to stop zooming out
+static fixed_t 	max_scale_mtof; // used to tell when to stop zooming in
+
+// old stuff for recovery later
+static fixed_t old_m_w, old_m_h;
+static fixed_t old_m_x, old_m_y;
+
+// old location used by the Follower routine
+static mpoint_t f_oldloc;
+
+// used by MTOF to scale from map-to-frame-buffer coords
+static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
+// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
+static fixed_t scale_ftom;
+
+static player_t *plr; // the player represented by an arrow
+
+static patch_t *marknums[10]; // numbers used for marking by the automap
+static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
+static int markpointnum = 0; // next point to be assigned
+static int mapmarknum = 0;  // villsa [STRIFE] unused but this was meant to be used for objective based markers
+static int followplayer = 1; // specifies whether to follow the player around
+
+cheatseq_t cheat_amap = CHEAT("topo", 0);   // villsa [STRIFE]
+
+static boolean stopped = true;
+
+
+// Calculates the slope and slope according to the x-axis of a line
+// segment in map coordinates (with the upright y-axis n' all) so
+// that it can be used with the brain-dead drawing stuff.
+
+void
+AM_getIslope
+( mline_t*	ml,
+  islope_t*	is )
+{
+    int dx, dy;
+
+    dy = ml->a.y - ml->b.y;
+    dx = ml->b.x - ml->a.x;
+    if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
+    else is->islp = FixedDiv(dx, dy);
+    if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
+    else is->slp = FixedDiv(dy, dx);
+
+}
+
+//
+//
+//
+void AM_activateNewScale(void)
+{
+    m_x += m_w/2;
+    m_y += m_h/2;
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+    m_x -= m_w/2;
+    m_y -= m_h/2;
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+//
+//
+//
+void AM_saveScaleAndLoc(void)
+{
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+}
+
+//
+//
+//
+void AM_restoreScaleAndLoc(void)
+{
+
+    m_w = old_m_w;
+    m_h = old_m_h;
+    if (!followplayer)
+    {
+	m_x = old_m_x;
+	m_y = old_m_y;
+    } else {
+	m_x = plr->mo->x - m_w/2;
+	m_y = plr->mo->y - m_h/2;
+    }
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+
+    // Change the scaling multipliers
+    scale_mtof = FixedDiv(f_w<<FRACBITS, m_w);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+//
+// adds a marker at the current location
+//
+void AM_addMark(void)
+{
+    markpoints[markpointnum].x = plr->mo->x; // 20160306 [STRIFE]: use player position
+    markpoints[markpointnum].y = plr->mo->y;
+    //markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
+    ++markpointnum; // haleyjd 20141101: [STRIFE] does not wrap around
+}
+
+//
+// Determines bounding box of all vertices,
+// sets global variables controlling zoom range.
+//
+void AM_findMinMaxBoundaries(void)
+{
+    int i;
+    fixed_t a;
+    fixed_t b;
+
+    min_x = min_y =  INT_MAX;
+    max_x = max_y = -INT_MAX;
+  
+    for (i=0;i<numvertexes;i++)
+    {
+	if (vertexes[i].x < min_x)
+	    min_x = vertexes[i].x;
+	else if (vertexes[i].x > max_x)
+	    max_x = vertexes[i].x;
+    
+	if (vertexes[i].y < min_y)
+	    min_y = vertexes[i].y;
+	else if (vertexes[i].y > max_y)
+	    max_y = vertexes[i].y;
+    }
+  
+    max_w = max_x - min_x;
+    max_h = max_y - min_y;
+
+    min_w = 2*PLAYERRADIUS; // const? never changed?
+    min_h = 2*PLAYERRADIUS;
+
+    a = FixedDiv(f_w<<FRACBITS, max_w);
+    b = FixedDiv(f_h<<FRACBITS, max_h);
+  
+    min_scale_mtof = a < b ? a : b;
+    max_scale_mtof = FixedDiv(f_h<<FRACBITS, 2*PLAYERRADIUS);
+
+}
+
+
+//
+//
+//
+void AM_changeWindowLoc(void)
+{
+    if (m_paninc.x || m_paninc.y)
+    {
+	followplayer = 0;
+	f_oldloc.x = INT_MAX;
+    }
+
+    m_x += m_paninc.x;
+    m_y += m_paninc.y;
+
+    if (m_x + m_w/2 > max_x)
+	m_x = max_x - m_w/2;
+    else if (m_x + m_w/2 < min_x)
+	m_x = min_x - m_w/2;
+  
+    if (m_y + m_h/2 > max_y)
+	m_y = max_y - m_h/2;
+    else if (m_y + m_h/2 < min_y)
+	m_y = min_y - m_h/2;
+
+    m_x2 = m_x + m_w;
+    m_y2 = m_y + m_h;
+}
+
+
+//
+//
+//
+void AM_initVariables(void)
+{
+    int pnum;
+    static event_t st_notify = { ev_keyup, AM_MSGENTERED, 0, 0 };
+
+    automapactive = true;
+    fb = I_VideoBuffer;
+
+    f_oldloc.x = INT_MAX;
+    amclock = 0;
+    lightlev = 0;
+
+    m_paninc.x = m_paninc.y = 0;
+    ftom_zoommul = FRACUNIT;
+    mtof_zoommul = FRACUNIT;
+
+    m_w = FTOM(f_w);
+    m_h = FTOM(f_h);
+
+    // find player to center on initially
+    if (playeringame[consoleplayer])
+    {
+        plr = &players[consoleplayer];
+    }
+    else
+    {
+        plr = &players[0];
+
+	for (pnum=0;pnum<MAXPLAYERS;pnum++)
+        {
+	    if (playeringame[pnum])
+            {
+                plr = &players[pnum];
+		break;
+            }
+        }
+    }
+
+    m_x = plr->mo->x - m_w/2;
+    m_y = plr->mo->y - m_h/2;
+    AM_changeWindowLoc();
+
+    // for saving & restoring
+    old_m_x = m_x;
+    old_m_y = m_y;
+    old_m_w = m_w;
+    old_m_h = m_h;
+
+    // inform the status bar of the change
+    ST_Responder(&st_notify);
+
+}
+
+//
+// AM_loadPics
+//
+// haleyjd 08/27/10: [STRIFE] Changed marknums to PLMNUM%d
+//
+void AM_loadPics(void)
+{
+    int i;
+    char namebuf[9];
+  
+    for (i=0;i<10;i++)
+    {
+        DEH_snprintf(namebuf, 9, "PLMNUM%d", i);
+        marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
+    }
+
+}
+
+void AM_unloadPics(void)
+{
+    int i;
+    char namebuf[9];
+  
+    for (i=0;i<10;i++)
+    {
+        DEH_snprintf(namebuf, 9, "PLMNUM%d", i);
+        W_ReleaseLumpName(namebuf);
+    }
+}
+
+void AM_clearMarks(void)
+{
+    int i;
+
+    for (i=0;i<AM_NUMMARKPOINTS;i++)
+	markpoints[i].x = -1; // means empty
+    markpointnum = 0;
+}
+
+//
+// should be called at the start of every level
+// right now, i figure it out myself
+//
+void AM_LevelInit(void)
+{
+    f_x = f_y = 0;
+    f_w = finit_width;
+    f_h = finit_height;
+
+    AM_clearMarks();
+
+    AM_findMinMaxBoundaries();
+    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7*FRACUNIT));
+    if (scale_mtof > max_scale_mtof)
+	scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+}
+
+
+
+
+//
+//
+//
+void AM_Stop (void)
+{
+    static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED, 0 };
+
+    AM_unloadPics();
+    automapactive = false;
+    ST_Responder(&st_notify);
+    stopped = true;
+}
+
+//
+//
+//
+void AM_Start (void)
+{
+    static int lastlevel = -1;
+    //static int lastepisode = -1;
+
+    if (!stopped) AM_Stop();
+    stopped = false;
+    if (lastlevel != gamemap  /*|| lastepisode != gameepisode*/)
+    {
+	AM_LevelInit();
+	lastlevel = gamemap;
+	//lastepisode = gameepisode;
+    }
+    AM_initVariables();
+    AM_loadPics();
+}
+
+//
+// set the window scale to the maximum size
+//
+void AM_minOutWindowScale(void)
+{
+    scale_mtof = min_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+//
+// set the window scale to the minimum size
+//
+void AM_maxOutWindowScale(void)
+{
+    scale_mtof = max_scale_mtof;
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+    AM_activateNewScale();
+}
+
+
+//
+// Handle events (user inputs) in automap mode
+//
+boolean
+AM_Responder
+( event_t*	ev )
+{
+
+    int rc;
+    static int bigstate=0;
+    static int joywait = 0;
+    static char buffer[20];
+    int key;
+
+    rc = false;
+
+    if (ev->type == ev_joystick && joybautomap >= 0
+        && (ev->data1 & (1 << joybautomap)) != 0 && joywait < I_GetTime())
+    {
+        joywait = I_GetTime() + 5;
+
+        if (!automapactive)
+        {
+            AM_Start ();
+            viewactive = false;
+        }
+        else
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+        }
+
+        return true;
+    }
+
+
+    if (!automapactive)
+    {
+	if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
+	{
+	    AM_Start ();
+	    viewactive = false;
+	    rc = true;
+	}
+    }
+    else if (ev->type == ev_keydown)
+    {
+	rc = true;
+        key = ev->data1;
+
+        if (key == key_map_east)          // pan right
+        {
+            if (!followplayer) m_paninc.x = FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_west)     // pan left
+        {
+            if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_north)    // pan up
+        {
+            if (!followplayer) m_paninc.y = FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_south)    // pan down
+        {
+            if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_zoomout)  // zoom out
+        {
+            mtof_zoommul = M_ZOOMOUT;
+            ftom_zoommul = M_ZOOMIN;
+        }
+        else if (key == key_map_zoomin)   // zoom in
+        {
+            mtof_zoommul = M_ZOOMIN;
+            ftom_zoommul = M_ZOOMOUT;
+        }
+        else if (key == key_map_toggle)
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+        }
+        else if (key == key_map_maxzoom)
+        {
+            bigstate = !bigstate;
+            if (bigstate)
+            {
+                AM_saveScaleAndLoc();
+                AM_minOutWindowScale();
+            }
+            else AM_restoreScaleAndLoc();
+        }
+        else if (key == key_map_follow)
+        {
+            followplayer = !followplayer;
+            f_oldloc.x = INT_MAX;
+            if (followplayer)
+                plr->message = DEH_String(AMSTR_FOLLOWON);
+            else
+                plr->message = DEH_String(AMSTR_FOLLOWOFF);
+        }
+        // haleyjd 20141101: [STRIFE] grid is not supported
+        /*
+        else if (key == key_map_grid)
+        {
+            grid = !grid;
+            if (grid)
+                plr->message = DEH_String(AMSTR_GRIDON);
+            else
+                plr->message = DEH_String(AMSTR_GRIDOFF);
+        }
+        */
+        else if (key == key_map_mark)
+        {
+            // haleyjd 20141101: [STRIFE] if full, mark 9 is replaced
+            if(markpointnum == AM_NUMMARKPOINTS)
+                --markpointnum;
+            M_snprintf(buffer, sizeof(buffer),
+                       "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum + 1); // [STRIFE]
+            plr->message = buffer;
+            AM_addMark();
+        }
+        else if (key == key_map_clearmark)
+        {
+            // haleyjd 20141101: [STRIFE] clears last mark only
+            if(markpointnum > 0)
+            {
+                markpoints[markpointnum - 1].x = -1;
+                --markpointnum;
+                plr->message = DEH_String(AMSTR_MARKSCLEARED);
+            }
+        }
+        else
+        {
+            rc = false;
+        }
+
+	if (!deathmatch && cht_CheckCheat(&cheat_amap, ev->data2))
+	{
+	    rc = false;
+	    cheating = (cheating+1) % 3;
+	}
+    }
+    else if (ev->type == ev_keyup)
+    {
+        rc = false;
+        key = ev->data1;
+
+        if (key == key_map_east)
+        {
+            if (!followplayer) m_paninc.x = 0;
+        }
+        else if (key == key_map_west)
+        {
+            if (!followplayer) m_paninc.x = 0;
+        }
+        else if (key == key_map_north)
+        {
+            if (!followplayer) m_paninc.y = 0;
+        }
+        else if (key == key_map_south)
+        {
+            if (!followplayer) m_paninc.y = 0;
+        }
+        else if (key == key_map_zoomout || key == key_map_zoomin)
+        {
+            mtof_zoommul = FRACUNIT;
+            ftom_zoommul = FRACUNIT;
+        }
+    }
+
+    return rc;
+
+}
+
+
+//
+// Zooming
+//
+void AM_changeWindowScale(void)
+{
+
+    // Change the scaling multipliers
+    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
+    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+
+    if (scale_mtof < min_scale_mtof)
+	AM_minOutWindowScale();
+    else if (scale_mtof > max_scale_mtof)
+	AM_maxOutWindowScale();
+    else
+	AM_activateNewScale();
+}
+
+
+//
+//
+//
+void AM_doFollowPlayer(void)
+{
+
+    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
+    {
+	m_x = FTOM(MTOF(plr->mo->x)) - m_w/2;
+	m_y = FTOM(MTOF(plr->mo->y)) - m_h/2;
+	m_x2 = m_x + m_w;
+	m_y2 = m_y + m_h;
+	f_oldloc.x = plr->mo->x;
+	f_oldloc.y = plr->mo->y;
+
+	//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
+	//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
+	//  m_x = plr->mo->x - m_w/2;
+	//  m_y = plr->mo->y - m_h/2;
+
+    }
+
+}
+
+//
+//
+//
+void AM_updateLightLev(void)
+{
+    static int nexttic = 0;
+    //static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
+    static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
+    static int litelevelscnt = 0;
+   
+    // Change light level
+    if (amclock>nexttic)
+    {
+	lightlev = litelevels[litelevelscnt++];
+	if (litelevelscnt == arrlen(litelevels)) litelevelscnt = 0;
+	nexttic = amclock + 6 - (amclock % 6);
+    }
+
+}
+
+
+//
+// Updates on Game Tick
+//
+void AM_Ticker (void)
+{
+
+    if (!automapactive)
+	return;
+
+    amclock++;
+
+    if (followplayer)
+	AM_doFollowPlayer();
+
+    // Change the zoom if necessary
+    if (ftom_zoommul != FRACUNIT)
+	AM_changeWindowScale();
+
+    // Change x,y location
+    if (m_paninc.x || m_paninc.y)
+	AM_changeWindowLoc();
+
+    // Update light level
+    // AM_updateLightLev();
+
+}
+
+
+//
+// Clear automap frame buffer.
+//
+void AM_clearFB(int color)
+{
+    memset(fb, color, f_w*f_h);
+}
+
+
+//
+// Automap clipping of lines.
+//
+// Based on Cohen-Sutherland clipping algorithm but with a slightly
+// faster reject and precalculated slopes.  If the speed is needed,
+// use a hash algorithm to handle  the common cases.
+//
+boolean
+AM_clipMline
+( mline_t*	ml,
+  fline_t*	fl )
+{
+    enum
+    {
+	LEFT	=1,
+	RIGHT	=2,
+	BOTTOM	=4,
+	TOP	=8
+    };
+    
+    register int	outcode1 = 0;
+    register int	outcode2 = 0;
+    register int	outside;
+    
+    fpoint_t	tmp;
+    int		dx;
+    int		dy;
+
+    
+#define DOOUTCODE(oc, mx, my) \
+    (oc) = 0; \
+    if ((my) < 0) (oc) |= TOP; \
+    else if ((my) >= f_h) (oc) |= BOTTOM; \
+    if ((mx) < 0) (oc) |= LEFT; \
+    else if ((mx) >= f_w) (oc) |= RIGHT;
+
+    
+    // do trivial rejects and outcodes
+    if (ml->a.y > m_y2)
+	outcode1 = TOP;
+    else if (ml->a.y < m_y)
+	outcode1 = BOTTOM;
+
+    if (ml->b.y > m_y2)
+	outcode2 = TOP;
+    else if (ml->b.y < m_y)
+	outcode2 = BOTTOM;
+    
+    if (outcode1 & outcode2)
+	return false; // trivially outside
+
+    if (ml->a.x < m_x)
+	outcode1 |= LEFT;
+    else if (ml->a.x > m_x2)
+	outcode1 |= RIGHT;
+    
+    if (ml->b.x < m_x)
+	outcode2 |= LEFT;
+    else if (ml->b.x > m_x2)
+	outcode2 |= RIGHT;
+    
+    if (outcode1 & outcode2)
+	return false; // trivially outside
+
+    // transform to frame-buffer coordinates.
+    fl->a.x = CXMTOF(ml->a.x);
+    fl->a.y = CYMTOF(ml->a.y);
+    fl->b.x = CXMTOF(ml->b.x);
+    fl->b.y = CYMTOF(ml->b.y);
+
+    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+
+    if (outcode1 & outcode2)
+	return false;
+
+    while (outcode1 | outcode2)
+    {
+	// may be partially inside box
+	// find an outside point
+	if (outcode1)
+	    outside = outcode1;
+	else
+	    outside = outcode2;
+	
+	// clip to each side
+	if (outside & TOP)
+	{
+	    dy = fl->a.y - fl->b.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.x = fl->a.x + (dx*(fl->a.y))/dy;
+	    tmp.y = 0;
+	}
+	else if (outside & BOTTOM)
+	{
+	    dy = fl->a.y - fl->b.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.x = fl->a.x + (dx*(fl->a.y-f_h))/dy;
+	    tmp.y = f_h-1;
+	}
+	else if (outside & RIGHT)
+	{
+	    dy = fl->b.y - fl->a.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.y = fl->a.y + (dy*(f_w-1 - fl->a.x))/dx;
+	    tmp.x = f_w-1;
+	}
+	else if (outside & LEFT)
+	{
+	    dy = fl->b.y - fl->a.y;
+	    dx = fl->b.x - fl->a.x;
+	    tmp.y = fl->a.y + (dy*(-fl->a.x))/dx;
+	    tmp.x = 0;
+	}
+        else
+        {
+            tmp.x = 0;
+            tmp.y = 0;
+        }
+
+	if (outside == outcode1)
+	{
+	    fl->a = tmp;
+	    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+	}
+	else
+	{
+	    fl->b = tmp;
+	    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+	}
+	
+	if (outcode1 & outcode2)
+	    return false; // trivially outside
+    }
+
+    return true;
+}
+#undef DOOUTCODE
+
+
+//
+// Classic Bresenham w/ whatever optimizations needed for speed
+//
+void
+AM_drawFline
+( fline_t*	fl,
+  int		color )
+{
+    register int x;
+    register int y;
+    register int dx;
+    register int dy;
+    register int sx;
+    register int sy;
+    register int ax;
+    register int ay;
+    register int d;
+    
+    static int fuck = 0;
+
+    // For debugging only
+    if (      fl->a.x < 0 || fl->a.x >= f_w
+	   || fl->a.y < 0 || fl->a.y >= f_h
+	   || fl->b.x < 0 || fl->b.x >= f_w
+	   || fl->b.y < 0 || fl->b.y >= f_h)
+    {
+        DEH_fprintf(stderr, "fuck %d \r", fuck++);
+	return;
+    }
+
+#define PUTDOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)
+
+    dx = fl->b.x - fl->a.x;
+    ax = 2 * (dx<0 ? -dx : dx);
+    sx = dx<0 ? -1 : 1;
+
+    dy = fl->b.y - fl->a.y;
+    ay = 2 * (dy<0 ? -dy : dy);
+    sy = dy<0 ? -1 : 1;
+
+    x = fl->a.x;
+    y = fl->a.y;
+
+    if (ax > ay)
+    {
+	d = ay - ax/2;
+	while (1)
+	{
+	    PUTDOT(x,y,color);
+	    if (x == fl->b.x) return;
+	    if (d>=0)
+	    {
+		y += sy;
+		d -= ax;
+	    }
+	    x += sx;
+	    d += ay;
+	}
+    }
+    else
+    {
+	d = ax - ay/2;
+	while (1)
+	{
+	    PUTDOT(x, y, color);
+	    if (y == fl->b.y) return;
+	    if (d >= 0)
+	    {
+		x += sx;
+		d -= ay;
+	    }
+	    y += sy;
+	    d += ax;
+	}
+    }
+}
+
+
+//
+// Clip lines, draw visible part sof lines.
+//
+void
+AM_drawMline
+( mline_t*	ml,
+  int		color )
+{
+    static fline_t fl;
+
+    if (AM_clipMline(ml, &fl))
+	AM_drawFline(&fl, color); // draws it on frame buffer using fb coords
+}
+
+
+
+//
+// Draws flat (floor/ceiling tile) aligned grid lines.
+//
+/*void AM_drawGrid(int color)
+{
+    fixed_t x, y;
+    fixed_t start, end;
+    mline_t ml;
+
+    // Figure out start of vertical gridlines
+    start = m_x;
+    if ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS))
+	start += (MAPBLOCKUNITS<<FRACBITS)
+	    - ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS));
+    end = m_x + m_w;
+
+    // draw vertical gridlines
+    ml.a.y = m_y;
+    ml.b.y = m_y+m_h;
+    for (x=start; x<end; x+=(MAPBLOCKUNITS<<FRACBITS))
+    {
+	ml.a.x = x;
+	ml.b.x = x;
+	AM_drawMline(&ml, color);
+    }
+
+    // Figure out start of horizontal gridlines
+    start = m_y;
+    if ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS))
+	start += (MAPBLOCKUNITS<<FRACBITS)
+	    - ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS));
+    end = m_y + m_h;
+
+    // draw horizontal gridlines
+    ml.a.x = m_x;
+    ml.b.x = m_x + m_w;
+    for (y=start; y<end; y+=(MAPBLOCKUNITS<<FRACBITS))
+    {
+	ml.a.y = y;
+	ml.b.y = y;
+	AM_drawMline(&ml, color);
+    }
+
+}*/
+
+//
+// Determines visible lines, draws them.
+// This is LineDef based, not LineSeg based.
+//
+void AM_drawWalls(void)
+{
+    int i;
+    line_t* line;
+    static mline_t l;
+
+    for(i = 0; i < numlines; i++)
+    {
+        line = &lines[i];
+
+        l.a.x = line->v1->x;
+        l.a.y = line->v1->y;
+        l.b.x = line->v2->x;
+        l.b.y = line->v2->y;
+
+        if(cheating || (line->flags & ML_MAPPED))
+        {
+            if((line->flags & LINE_NEVERSEE) && !cheating)
+                continue;
+
+            // villsa [STRIFE]
+            if(line->special == 145 || line->special == 186)
+            {
+                AM_drawMline(&l, SPWALLCOLORS);
+            }
+            // villsa [STRIFE] lightlev is unused here
+            else if(!line->backsector)
+            {
+                AM_drawMline(&l, WALLCOLORS);
+            }
+            else
+            {
+                if(line->special == 39)
+                { // teleporters
+                    AM_drawMline(&l, WALLCOLORS+WALLRANGE/2);
+                }
+                else if (line->flags & ML_SECRET) // secret door
+                {
+                    // villsa [STRIFE] just draw the wall as is!
+                    AM_drawMline(&l, WALLCOLORS);
+                }
+                else if(line->backsector->floorheight != line->frontsector->floorheight)
+                {
+                    AM_drawMline(&l, FDWALLCOLORS); // floor level change
+                }
+                else if(line->backsector->ceilingheight != line->frontsector->ceilingheight)
+                {
+                        AM_drawMline(&l, CDWALLCOLORS); // ceiling level change
+                }
+                else if (cheating)
+                {
+                    AM_drawMline(&l, TSWALLCOLORS);
+                }
+            }
+        }
+        // villsa [STRIFE] show all of the map on map 15
+        else if(plr->powers[pw_allmap] || gamemap == 15)
+        {
+            if(!(line->flags & LINE_NEVERSEE))
+                AM_drawMline(&l, CTWALLCOLORS);
+        }
+    }
+}
+
+
+//
+// Rotation in 2D.
+// Used to rotate player arrow line character.
+//
+void
+AM_rotate
+( fixed_t*	x,
+  fixed_t*	y,
+  angle_t	a )
+{
+    fixed_t tmpx;
+
+    tmpx =
+	FixedMul(*x,finecosine[a>>ANGLETOFINESHIFT])
+	- FixedMul(*y,finesine[a>>ANGLETOFINESHIFT]);
+    
+    *y   =
+	FixedMul(*x,finesine[a>>ANGLETOFINESHIFT])
+	+ FixedMul(*y,finecosine[a>>ANGLETOFINESHIFT]);
+
+    *x = tmpx;
+}
+
+void
+AM_drawLineCharacter
+( mline_t*	lineguy,
+  int		lineguylines,
+  fixed_t	scale,
+  angle_t	angle,
+  int		color,
+  fixed_t	x,
+  fixed_t	y )
+{
+    int		i;
+    mline_t	l;
+
+    for (i=0;i<lineguylines;i++)
+    {
+	l.a.x = lineguy[i].a.x;
+	l.a.y = lineguy[i].a.y;
+
+	if (scale)
+	{
+	    l.a.x = FixedMul(scale, l.a.x);
+	    l.a.y = FixedMul(scale, l.a.y);
+	}
+
+	if (angle)
+	    AM_rotate(&l.a.x, &l.a.y, angle);
+
+	l.a.x += x;
+	l.a.y += y;
+
+	l.b.x = lineguy[i].b.x;
+	l.b.y = lineguy[i].b.y;
+
+	if (scale)
+	{
+	    l.b.x = FixedMul(scale, l.b.x);
+	    l.b.y = FixedMul(scale, l.b.y);
+	}
+
+	if (angle)
+	    AM_rotate(&l.b.x, &l.b.y, angle);
+	
+	l.b.x += x;
+	l.b.y += y;
+
+	AM_drawMline(&l, color);
+    }
+}
+
+void AM_drawPlayers(void)
+{
+    int		i;
+    player_t*	p;
+    // villsa [STRIFE] updated array
+    static int 	their_colors[] = { 0x80, 0x40, 0xB0, 0x10, 0x30, 0x50, 0xA0, 0x60, 0x90 };
+    int		their_color = -1;
+    int		color;
+
+    if (!netgame)
+    {
+        // villsa [STRIFE] don't draw cheating player arrow.
+        // Player arrow is yellow instead of white
+        AM_drawLineCharacter
+		(player_arrow, arrlen(player_arrow), 0, plr->mo->angle,
+		 224, plr->mo->x, plr->mo->y);
+	return;
+    }
+
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+	their_color++;
+	p = &players[i];
+
+        // villsa [STRIFE] check for gameskill??
+	if((gameskill && deathmatch && !singledemo) && p != plr)
+	    continue;
+
+	if(!playeringame[i])
+	    continue;
+
+        // villsa [STRIFE] change to 27
+	if(p->powers[pw_invisibility])
+	    color = 27; // *close* to black
+	else
+	    color = their_colors[their_color];
+	
+	AM_drawLineCharacter
+	    (player_arrow, arrlen(player_arrow), 0, p->mo->angle,
+	     color, p->mo->x, p->mo->y);
+    }
+
+}
+
+//
+// AM_drawThings
+//
+// villsa [STRIFE] no arguments
+//
+void AM_drawThings(void)
+{
+    int         i;
+    mobj_t*     t;
+    int         colors;
+    fixed_t     radius;
+
+    // villsa [STRIFE] almost re-written
+    // specific things can have different radius, color and appearence
+    for(i = 0; i < numsectors; i++)
+    {
+        t = sectors[i].thinglist;
+        while(t)
+        {
+            radius = t->radius;
+
+            if(t->flags & (MF_MISSILE|MF_SPECIAL))
+            {
+                colors = MISSILECOLORS;
+            }
+            else if(t->flags & MF_COUNTKILL)
+            {
+                colors = SHOOTABLECOLORS;
+            }
+            else
+            {
+                colors = THINGCOLORS;
+                radius = (16<<FRACBITS);
+            }
+
+            AM_drawLineCharacter (thintriangle_guy, arrlen(thintriangle_guy),
+                radius, t->angle, colors, t->x, t->y);
+
+            t = t->snext;
+        }
+    }
+}
+
+//
+// AM_drawMarks
+//
+void AM_drawMarks(void)
+{
+    int i, fx, fy, w, h;
+
+    for(i = 0; i < AM_NUMMARKPOINTS; i++)
+    {
+        if(markpoints[i].x != -1)
+        {
+            //      w = SHORT(marknums[i]->width);
+            //      h = SHORT(marknums[i]->height);
+            w = 5; // because something's wrong with the wad, i guess
+            h = 6; // because something's wrong with the wad, i guess
+            fx = CXMTOF(markpoints[i].x);
+            fy = CYMTOF(markpoints[i].y);
+            if(fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
+            {
+                // villsa [STRIFE]
+                if(i >= mapmarknum)
+                    V_DrawPatch(fx, fy, marknums[i]);
+            }
+        }
+    }
+
+}
+
+// villsa [STRIFE] unused
+/*void AM_drawCrosshair(int color)
+{
+    fb[(f_w*(f_h+1))/2] = color; // single point for now
+}*/
+
+void AM_Drawer (void)
+{
+    if (!automapactive) return;
+
+    AM_clearFB(BACKGROUND);
+
+    // villsa [STRIFE] not used
+    /*if(grid)
+        AM_drawGrid(GRIDCOLORS);*/
+
+    AM_drawWalls();
+    AM_drawPlayers();
+
+    // villsa [STRIFE] draw things when map powerup is enabled
+    if(cheating == 2 || plr->powers[pw_allmap] > 1)
+        AM_drawThings();
+
+    // villsa [STRIFE] not used
+    //AM_drawCrosshair(XHAIRCOLORS);
+
+    AM_drawMarks();
+    V_MarkRect(f_x, f_y, f_w, f_h);
+
+}
diff --git a/games/NXDoom/src/strife/am_map.h b/games/NXDoom/src/strife/am_map.h
new file mode 100644
index 000000000..572d2389b
--- /dev/null
+++ b/games/NXDoom/src/strife/am_map.h
@@ -0,0 +1,49 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  AutoMap module.
+//
+
+#ifndef __AMMAP_H__
+#define __AMMAP_H__
+
+#include "d_event.h"
+#include "m_cheat.h"
+
+// Used by ST StatusBar stuff.
+#define AM_MSGHEADER (('a'<<24)+('m'<<16))
+#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
+#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
+
+
+// Called by main loop.
+boolean AM_Responder (event_t* ev);
+
+// Called by main loop.
+void AM_Ticker (void);
+
+// Called by main loop,
+// called instead of view drawer if automap active.
+void AM_Drawer (void);
+
+// Called to force the automap to quit
+// if the level is completed while it is up.
+void AM_Stop (void);
+
+
+extern cheatseq_t cheat_amap;
+
+
+#endif
diff --git a/games/NXDoom/src/strife/d_englsh.h b/games/NXDoom/src/strife/d_englsh.h
new file mode 100644
index 000000000..57312a89f
--- /dev/null
+++ b/games/NXDoom/src/strife/d_englsh.h
@@ -0,0 +1,593 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Printed strings for translation.
+//	English language support (default).
+//
+
+#ifndef __D_ENGLSH__
+#define __D_ENGLSH__
+
+//
+//	Printed strings for translation
+//
+
+//
+// D_Main.C
+//
+#define D_DEVSTR	"Development mode ON.\n"
+#define D_CDROM	"CD-ROM Version: Accessing strife.cd\n"
+
+//
+//	M_Menu.C
+//
+#define PRESSKEY 	"press a key."
+#define PRESSYN 	"press y or n."
+#define QUITMSG	"are you sure you want to\nquit this great game?"
+// [STRIFE] modified:
+#define LOADNET 	"you can't load while in a net game!\n\n"PRESSKEY
+#define QLOADNET	"you can't quickload during a netgame!\n\n"PRESSKEY
+// [STRIFE] modified:
+#define QSAVESPOT	"you haven't picked a\nquicksave slot yet!\n\n"PRESSKEY
+// [STRIFE] modified:
+#define SAVEDEAD 	"you're not playing a game\n\n"PRESSKEY
+#define QSPROMPT 	"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
+// [STRIFE] modified:
+#define QLPROMPT	"do you want to quickload\n\n'%s'?\n\n"PRESSYN
+
+#define NEWGAME	\
+"you can't start a new game\n"\
+"while in a network game.\n\n"PRESSKEY
+
+#define NIGHTMARE	\
+"are you sure? this skill level\n"\
+"isn't even remotely fair.\n\n"PRESSYN
+
+#define SWSTRING	\
+"this is the shareware version of doom.\n\n"\
+"you need to order the entire trilogy.\n\n"PRESSKEY
+
+#define MSGOFF	"Messages OFF"
+#define MSGON		"Messages ON"
+#define NETEND	"you can't end a netgame!\n\n"PRESSKEY
+#define ENDGAME	"are you sure you want\nto end the game?\n\n"PRESSYN
+
+// haleyjd 09/11/10: [STRIFE] No "to dos." on this
+#define DOSY		"(press y to quit)" 
+
+#define DETAILHI	"High detail"
+#define DETAILLO	"Low detail"
+#define GAMMALVL0	"Gamma correction OFF"
+#define GAMMALVL1	"Gamma correction level 1"
+#define GAMMALVL2	"Gamma correction level 2"
+#define GAMMALVL3	"Gamma correction level 3"
+#define GAMMALVL4	"Gamma correction level 4"
+#define EMPTYSTRING	"empty slot"
+
+//
+//	P_inter.C
+//
+#define GOTARMOR	"Picked up the armor."
+#define GOTMEGA	"Picked up the MegaArmor!"
+#define GOTHTHBONUS	"Picked up a health bonus."
+#define GOTARMBONUS	"Picked up an armor bonus."
+#define GOTSTIM	"Picked up a stimpack."
+#define GOTMEDINEED	"Picked up a medikit that you REALLY need!"
+#define GOTMEDIKIT	"Picked up a medikit."
+#define GOTSUPER	"Supercharge!"
+
+#define GOTBLUECARD	"Picked up a blue keycard."
+#define GOTYELWCARD	"Picked up a yellow keycard."
+#define GOTREDCARD	"Picked up a red keycard."
+#define GOTBLUESKUL	"Picked up a blue skull key."
+#define GOTYELWSKUL	"Picked up a yellow skull key."
+#define GOTREDSKULL	"Picked up a red skull key."
+
+#define GOTINVUL	"Invulnerability!"
+#define GOTBERSERK	"Berserk!"
+#define GOTINVIS	"Partial Invisibility"
+#define GOTSUIT	"Radiation Shielding Suit"
+#define GOTMAP	"Computer Area Map"
+#define GOTVISOR	"Light Amplification Visor"
+#define GOTMSPHERE	"MegaSphere!"
+
+#define GOTCLIP	"Picked up a clip."
+#define GOTCLIPBOX	"Picked up a box of bullets."
+#define GOTROCKET	"Picked up a rocket."
+#define GOTROCKBOX	"Picked up a box of rockets."
+#define GOTCELL	"Picked up an energy cell."
+#define GOTCELLBOX	"Picked up an energy cell pack."
+#define GOTSHELLS	"Picked up 4 shotgun shells."
+#define GOTSHELLBOX	"Picked up a box of shotgun shells."
+#define GOTBACKPACK	"Picked up a backpack full of ammo!"
+
+#define GOTBFG9000	"You got the BFG9000!  Oh, yes."
+#define GOTCHAINGUN	"You got the chaingun!"
+#define GOTCHAINSAW	"A chainsaw!  Find some meat!"
+#define GOTLAUNCHER	"You got the rocket launcher!"
+#define GOTPLASMA	"You got the plasma gun!"
+#define GOTSHOTGUN	"You got the shotgun!"
+#define GOTSHOTGUN2	"You got the super shotgun!"
+
+//
+// P_Doors.C
+//
+#define PD_BLUEO	"You need a blue key to activate this object"
+#define PD_REDO	"You need a red key to activate this object"
+#define PD_YELLOWO	"You need a yellow key to activate this object"
+#define PD_BLUEK	"You need a blue key to open this door"
+#define PD_REDK	"You need a red key to open this door"
+#define PD_YELLOWK	"You need a yellow key to open this door"
+
+//
+//	G_game.C
+//
+#define GGSAVED	"game saved."
+
+//
+//	HU_stuff.C
+//
+#define HUSTR_MSGU	"[Message unsent]"
+
+// haleyjd 08/31/10: [STRIFE] Strife map names
+
+#define HUSTR_1         "AREA  1: sanctuary"
+#define HUSTR_2         "AREA  2: town"
+#define HUSTR_3         "AREA  3: front base"
+#define HUSTR_4         "AREA  4: power station"
+#define HUSTR_5         "AREA  5: prison"
+#define HUSTR_6         "AREA  6: sewers"
+#define HUSTR_7         "AREA  7: castle"
+#define HUSTR_8         "AREA  8: Audience Chamber"
+#define HUSTR_9         "AREA  9: Castle: Programmer's Keep"
+
+#define HUSTR_10        "AREA 10: New Front Base"
+#define HUSTR_11        "AREA 11: Borderlands"
+#define HUSTR_12        "AREA 12: the temple of the oracle"
+#define HUSTR_13        "AREA 13: Catacombs"
+#define HUSTR_14        "AREA 14: mines"
+#define HUSTR_15        "AREA 15: Fortress: Administration"
+#define HUSTR_16        "AREA 16: Fortress: Bishop's Tower"
+#define HUSTR_17        "AREA 17: Fortress: The Bailey"
+#define HUSTR_18        "AREA 18: Fortress: Stores"
+#define HUSTR_19        "AREA 19: Fortress: Security Complex"
+
+#define HUSTR_20        "AREA 20: Factory: Receiving"
+#define HUSTR_21        "AREA 21: Factory: Manufacturing"
+#define HUSTR_22        "AREA 22: Factory: Forge"
+#define HUSTR_23        "AREA 23: Order Commons"
+#define HUSTR_24        "AREA 24: Factory: Conversion Chapel"
+#define HUSTR_25        "AREA 25: Catacombs: Ruined Temple"
+#define HUSTR_26        "AREA 26: proving grounds"
+#define HUSTR_27        "AREA 27: The Lab"
+#define HUSTR_28        "AREA 28: Alien Ship"
+#define HUSTR_29        "AREA 29: Entity's Lair"
+
+#define HUSTR_30        "AREA 30: Abandoned Front Base"
+#define HUSTR_31        "AREA 31: Training Facility"
+
+#define HUSTR_32        "AREA  1: Sanctuary"
+#define HUSTR_33        "AREA  2: Town"
+#define HUSTR_34        "AREA  3: Movement Base"
+
+// haleyjd 20110219: [STRIFE] replaced all with Strife chat macros:
+#define HUSTR_CHATMACRO1        "Fucker!"
+#define HUSTR_CHATMACRO2        "--SPLAT-- Instant wall art."
+#define HUSTR_CHATMACRO3        "That had to hurt!"
+#define HUSTR_CHATMACRO4        "Smackings!"
+#define HUSTR_CHATMACRO5        "Gib-O-Matic baby."
+#define HUSTR_CHATMACRO6        "Burn!  Yah! Yah!"
+#define HUSTR_CHATMACRO7        "Buh-Bye!"
+#define HUSTR_CHATMACRO8        "Sizzle chest!"
+#define HUSTR_CHATMACRO9        "That sucked!"
+#define HUSTR_CHATMACRO0        "Mommy?"
+
+#define HUSTR_TALKTOSELF1	"You mumble to yourself"
+#define HUSTR_TALKTOSELF2	"Who's there?"
+#define HUSTR_TALKTOSELF3	"You scare yourself"
+#define HUSTR_TALKTOSELF4	"You start to rave"
+#define HUSTR_TALKTOSELF5	"You've lost it..."
+
+#define HUSTR_MESSAGESENT	"[Message Sent]"
+
+// The following should NOT be changed unless it seems
+// just AWFULLY necessary
+
+// [STRIFE]: Not used, as strings are local to hu_stuff.c
+//#define HUSTR_PLRGREEN	"Green: "
+//#define HUSTR_PLRINDIGO	"Indigo: "
+//#define HUSTR_PLRBROWN	"Brown: "
+//#define HUSTR_PLRRED		"Red: "
+
+#define HUSTR_KEYGREEN	'g'
+#define HUSTR_KEYINDIGO	'i'
+#define HUSTR_KEYBROWN	'b'
+#define HUSTR_KEYRED	'r'
+
+//
+//	AM_map.C
+//
+
+#define AMSTR_FOLLOWON	"Follow Mode ON"
+#define AMSTR_FOLLOWOFF	"Follow Mode OFF"
+
+#define AMSTR_GRIDON	"Grid ON"
+#define AMSTR_GRIDOFF	"Grid OFF"
+
+#define AMSTR_MARKEDSPOT        "Marked Spot"
+#define AMSTR_MARKSCLEARED      "Last Mark Cleared" // [STRIFE]
+
+//
+//	ST_stuff.C
+//
+
+#define STSTR_MUS               "Music Change"
+#define STSTR_NOMUS             "IMPOSSIBLE SELECTION"
+#define STSTR_DQDON             "You're Invincible!"   // [STRIFE]
+#define STSTR_DQDOFF            "You're a looney!"     // [STRIFE]
+
+#define STSTR_KFAADDED          "Very Happy Ammo Added"
+#define STSTR_FAADDED           "Ammo Added"           // [STRIFE]
+
+#define STSTR_NCON              "No Clipping Mode ON"
+#define STSTR_NCOFF             "No Clipping Mode OFF"
+
+#define STSTR_BEHOLD            "Bzrk, Inviso, Mask, Health, Pack, Stats"  // [STRIFE]
+#define STSTR_BEHOLDX           "Power-up Toggled"
+
+#define STSTR_CHOPPERS          "... doesn't suck - GM"
+#define STSTR_CLEV              "Changing Level..."
+
+//
+//	F_Finale.C
+//
+#define E1TEXT \
+"Once you beat the big badasses and\n"\
+"clean out the moon base you're supposed\n"\
+"to win, aren't you? Aren't you? Where's\n"\
+"your fat reward and ticket home? What\n"\
+"the hell is this? It's not supposed to\n"\
+"end this way!\n"\
+"\n" \
+"It stinks like rotten meat, but looks\n"\
+"like the lost Deimos base.  Looks like\n"\
+"you're stuck on The Shores of Hell.\n"\
+"The only way out is through.\n"\
+"\n"\
+"To continue the DOOM experience, play\n"\
+"The Shores of Hell and its amazing\n"\
+"sequel, Inferno!\n"
+
+
+#define E2TEXT \
+"You've done it! The hideous cyber-\n"\
+"demon lord that ruled the lost Deimos\n"\
+"moon base has been slain and you\n"\
+"are triumphant! But ... where are\n"\
+"you? You clamber to the edge of the\n"\
+"moon and look down to see the awful\n"\
+"truth.\n" \
+"\n"\
+"Deimos floats above Hell itself!\n"\
+"You've never heard of anyone escaping\n"\
+"from Hell, but you'll make the bastards\n"\
+"sorry they ever heard of you! Quickly,\n"\
+"you rappel down to  the surface of\n"\
+"Hell.\n"\
+"\n" \
+"Now, it's on to the final chapter of\n"\
+"DOOM! -- Inferno."
+
+
+#define E3TEXT \
+"The loathsome spiderdemon that\n"\
+"masterminded the invasion of the moon\n"\
+"bases and caused so much death has had\n"\
+"its ass kicked for all time.\n"\
+"\n"\
+"A hidden doorway opens and you enter.\n"\
+"You've proven too tough for Hell to\n"\
+"contain, and now Hell at last plays\n"\
+"fair -- for you emerge from the door\n"\
+"to see the green fields of Earth!\n"\
+"Home at last.\n" \
+"\n"\
+"You wonder what's been happening on\n"\
+"Earth while you were battling evil\n"\
+"unleashed. It's good that no Hell-\n"\
+"spawn could have come through that\n"\
+"door with you ..."
+
+
+#define E4TEXT \
+"the spider mastermind must have sent forth\n"\
+"its legions of hellspawn before your\n"\
+"final confrontation with that terrible\n"\
+"beast from hell.  but you stepped forward\n"\
+"and brought forth eternal damnation and\n"\
+"suffering upon the horde as a true hero\n"\
+"would in the face of something so evil.\n"\
+"\n"\
+"besides, someone was gonna pay for what\n"\
+"happened to daisy, your pet rabbit.\n"\
+"\n"\
+"but now, you see spread before you more\n"\
+"potential pain and gibbitude as a nation\n"\
+"of demons run amok among our cities.\n"\
+"\n"\
+"next stop, hell on earth!"
+
+
+// after level 6, put this:
+
+#define C1TEXT \
+"YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
+"STARPORT. BUT SOMETHING IS WRONG. THE\n" \
+"MONSTERS HAVE BROUGHT THEIR OWN REALITY\n" \
+"WITH THEM, AND THE STARPORT'S TECHNOLOGY\n" \
+"IS BEING SUBVERTED BY THEIR PRESENCE.\n" \
+"\n"\
+"AHEAD, YOU SEE AN OUTPOST OF HELL, A\n" \
+"FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n" \
+"YOU CAN PENETRATE INTO THE HAUNTED HEART\n" \
+"OF THE STARBASE AND FIND THE CONTROLLING\n" \
+"SWITCH WHICH HOLDS EARTH'S POPULATION\n" \
+"HOSTAGE."
+
+// After level 11, put this:
+
+#define C2TEXT \
+"YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
+"HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"\
+"THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"\
+"HUMAN LEFT ON THE FACE OF THE PLANET.\n"\
+"CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"\
+"AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"\
+"YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"\
+"THAT YOU HAVE SAVED YOUR SPECIES.\n"\
+"\n"\
+"BUT THEN, EARTH CONTROL BEAMS DOWN A\n"\
+"MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"\
+"THE SOURCE OF THE ALIEN INVASION. IF YOU\n"\
+"GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"\
+"ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"\
+"YOUR OWN HOME CITY, NOT FAR FROM THE\n"\
+"STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"\
+"UP AND RETURN TO THE FRAY."
+
+
+// After level 20, put this:
+
+#define C3TEXT \
+"YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
+"SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"\
+"YOU SEE NO WAY TO DESTROY THE CREATURES'\n"\
+"ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"\
+"TEETH AND PLUNGE THROUGH IT.\n"\
+"\n"\
+"THERE MUST BE A WAY TO CLOSE IT ON THE\n"\
+"OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"\
+"GOT TO GO THROUGH HELL TO GET TO IT?"
+
+
+// After level 29, put this:
+
+#define C4TEXT \
+"THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
+"DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"\
+"YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"\
+"HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"\
+"UP AND DIES, ITS THRASHING LIMBS\n"\
+"DEVASTATING UNTOLD MILES OF HELL'S\n"\
+"SURFACE.\n"\
+"\n"\
+"YOU'VE DONE IT. THE INVASION IS OVER.\n"\
+"EARTH IS SAVED. HELL IS A WRECK. YOU\n"\
+"WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"\
+"DIE, NOW. WIPING THE SWEAT FROM YOUR\n"\
+"FOREHEAD YOU BEGIN THE LONG TREK BACK\n"\
+"HOME. REBUILDING EARTH OUGHT TO BE A\n"\
+"LOT MORE FUN THAN RUINING IT WAS.\n"
+
+
+
+// Before level 31, put this:
+
+#define C5TEXT \
+"CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
+"LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"\
+"HUMANS, RATHER THAN DEMONS. YOU WONDER\n"\
+"WHO THE INMATES OF THIS CORNER OF HELL\n"\
+"WILL BE."
+
+
+// Before level 32, put this:
+
+#define C6TEXT \
+"CONGRATULATIONS, YOU'VE FOUND THE\n"\
+"SUPER SECRET LEVEL!  YOU'D BETTER\n"\
+"BLAZE THROUGH THIS ONE!\n"
+
+
+// after map 06	
+
+#define P1TEXT  \
+"You gloat over the steaming carcass of the\n"\
+"Guardian.  With its death, you've wrested\n"\
+"the Accelerator from the stinking claws\n"\
+"of Hell.  You relax and glance around the\n"\
+"room.  Damn!  There was supposed to be at\n"\
+"least one working prototype, but you can't\n"\
+"see it. The demons must have taken it.\n"\
+"\n"\
+"You must find the prototype, or all your\n"\
+"struggles will have been wasted. Keep\n"\
+"moving, keep fighting, keep killing.\n"\
+"Oh yes, keep living, too."
+
+
+// after map 11
+
+#define P2TEXT \
+"Even the deadly Arch-Vile labyrinth could\n"\
+"not stop you, and you've gotten to the\n"\
+"prototype Accelerator which is soon\n"\
+"efficiently and permanently deactivated.\n"\
+"\n"\
+"You're good at that kind of thing."
+
+
+// after map 20
+
+#define P3TEXT \
+"You've bashed and battered your way into\n"\
+"the heart of the devil-hive.  Time for a\n"\
+"Search-and-Destroy mission, aimed at the\n"\
+"Gatekeeper, whose foul offspring is\n"\
+"cascading to Earth.  Yeah, he's bad. But\n"\
+"you know who's worse!\n"\
+"\n"\
+"Grinning evilly, you check your gear, and\n"\
+"get ready to give the bastard a little Hell\n"\
+"of your own making!"
+
+// after map 30
+
+#define P4TEXT \
+"The Gatekeeper's evil face is splattered\n"\
+"all over the place.  As its tattered corpse\n"\
+"collapses, an inverted Gate forms and\n"\
+"sucks down the shards of the last\n"\
+"prototype Accelerator, not to mention the\n"\
+"few remaining demons.  You're done. Hell\n"\
+"has gone back to pounding bad dead folks \n"\
+"instead of good live ones.  Remember to\n"\
+"tell your grandkids to put a rocket\n"\
+"launcher in your coffin. If you go to Hell\n"\
+"when you die, you'll need it for some\n"\
+"final cleaning-up ..."
+
+// before map 31
+
+#define P5TEXT \
+"You've found the second-hardest level we\n"\
+"got. Hope you have a saved game a level or\n"\
+"two previous.  If not, be prepared to die\n"\
+"aplenty. For master marines only."
+
+// before map 32
+
+#define P6TEXT \
+"Betcha wondered just what WAS the hardest\n"\
+"level we had ready for ya?  Now you know.\n"\
+"No one gets out alive."
+
+
+#define T1TEXT \
+"You've fought your way out of the infested\n"\
+"experimental labs.   It seems that UAC has\n"\
+"once again gulped it down.  With their\n"\
+"high turnover, it must be hard for poor\n"\
+"old UAC to buy corporate health insurance\n"\
+"nowadays..\n"\
+"\n"\
+"Ahead lies the military complex, now\n"\
+"swarming with diseased horrors hot to get\n"\
+"their teeth into you. With luck, the\n"\
+"complex still has some warlike ordnance\n"\
+"laying around."
+
+
+#define T2TEXT \
+"You hear the grinding of heavy machinery\n"\
+"ahead.  You sure hope they're not stamping\n"\
+"out new hellspawn, but you're ready to\n"\
+"ream out a whole herd if you have to.\n"\
+"They might be planning a blood feast, but\n"\
+"you feel about as mean as two thousand\n"\
+"maniacs packed into one mad killer.\n"\
+"\n"\
+"You don't plan to go down easy."
+
+
+#define T3TEXT \
+"The vista opening ahead looks real damn\n"\
+"familiar. Smells familiar, too -- like\n"\
+"fried excrement. You didn't like this\n"\
+"place before, and you sure as hell ain't\n"\
+"planning to like it now. The more you\n"\
+"brood on it, the madder you get.\n"\
+"Hefting your gun, an evil grin trickles\n"\
+"onto your face. Time to take some names."
+
+#define T4TEXT \
+"Suddenly, all is silent, from one horizon\n"\
+"to the other. The agonizing echo of Hell\n"\
+"fades away, the nightmare sky turns to\n"\
+"blue, the heaps of monster corpses start \n"\
+"to evaporate along with the evil stench \n"\
+"that filled the air. Jeeze, maybe you've\n"\
+"done it. Have you really won?\n"\
+"\n"\
+"Something rumbles in the distance.\n"\
+"A blue light begins to glow inside the\n"\
+"ruined skull of the demon-spitter."
+
+
+#define T5TEXT \
+"What now? Looks totally different. Kind\n"\
+"of like King Tut's condo. Well,\n"\
+"whatever's here can't be any worse\n"\
+"than usual. Can it?  Or maybe it's best\n"\
+"to let sleeping gods lie.."
+
+
+#define T6TEXT \
+"Time for a vacation. You've burst the\n"\
+"bowels of hell and by golly you're ready\n"\
+"for a break. You mutter to yourself,\n"\
+"Maybe someone else can kick Hell's ass\n"\
+"next time around. Ahead lies a quiet town,\n"\
+"with peaceful flowing water, quaint\n"\
+"buildings, and presumably no Hellspawn.\n"\
+"\n"\
+"As you step off the transport, you hear\n"\
+"the stomp of a cyberdemon's iron shoe."
+
+
+
+//
+// Character cast strings F_FINALE.C
+//
+#define CC_ZOMBIE	"ZOMBIEMAN"
+#define CC_SHOTGUN	"SHOTGUN GUY"
+#define CC_HEAVY	"HEAVY WEAPON DUDE"
+#define CC_IMP	"IMP"
+#define CC_DEMON	"DEMON"
+#define CC_LOST	"LOST SOUL"
+#define CC_CACO	"CACODEMON"
+#define CC_HELL	"HELL KNIGHT"
+#define CC_BARON	"BARON OF HELL"
+#define CC_ARACH	"ARACHNOTRON"
+#define CC_PAIN	"PAIN ELEMENTAL"
+#define CC_REVEN	"REVENANT"
+#define CC_MANCU	"MANCUBUS"
+#define CC_ARCH	"ARCH-VILE"
+#define CC_SPIDER	"THE SPIDER MASTERMIND"
+#define CC_CYBER	"THE CYBERDEMON"
+#define CC_HERO	"OUR HERO"
+
+
+#endif
diff --git a/games/NXDoom/src/strife/d_items.c b/games/NXDoom/src/strife/d_items.c
new file mode 100644
index 000000000..a57ed61ea
--- /dev/null
+++ b/games/NXDoom/src/strife/d_items.c
@@ -0,0 +1,159 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+
+
+// We are referring to sprite numbers.
+#include "info.h"
+
+#include "d_items.h"
+
+
+//
+// PSPRITE ACTIONS for waepons.
+// This struct controls the weapon animations.
+//
+// Each entry is:
+//   ammo/amunition type
+//  upstate
+//  downstate
+// readystate
+// atkstate, i.e. attack/fire/hit frame
+// flashstate, muzzle flash
+//
+
+// villsa [STRIFE]
+weaponinfo_t	weaponinfo[NUMWEAPONS] =
+{
+    {
+        // fist
+        am_noammo,
+        S_PNCH_03,
+        S_PNCH_02,
+        S_PNCH_01,
+        S_PNCH_04,
+        S_NULL,
+        1
+    },	
+    {
+        // electric bow
+        am_elecbolts,
+        S_XBOW_02,
+        S_XBOW_01,
+        S_XBOW_00,
+        S_XBOW_03,
+        S_NULL,
+        1
+    },	
+    {
+        // rifle
+        am_bullets,
+        S_RIFG_02,
+        S_RIFG_01,
+        S_RIFG_00,
+        S_RIFF_00,
+        S_NULL,
+        1
+    },
+    {
+        // missile launcher
+        am_missiles,
+        S_MMIS_02,
+        S_MMIS_01,
+        S_MMIS_00,
+        S_MMIS_03,
+        S_NULL,
+        0
+    },
+    {
+        // grenade launcher
+        am_hegrenades,
+        S_GREN_02,
+        S_GREN_01,
+        S_GREN_00,
+        S_GREN_03,
+        S_GREF_00,
+        0
+    },
+    {
+        // flame thrower
+        am_cell,
+        S_FLMT_03,
+        S_FLMT_02,
+        S_FLMT_00,
+        S_FLMF_00,
+        S_NULL,
+        1
+    },
+    {
+        // mauler
+        am_cell,
+        S_BLST_05,
+        S_BLST_04,
+        S_BLST_00,
+        S_BLSF_00,
+        S_NULL,
+        0
+    },
+    {
+        // sigil
+        am_noammo,
+        S_SIGH_06,
+        S_SIGH_05,
+        S_SIGH_00,
+        S_SIGH_07,
+        S_SIGF_00,
+        0
+    },
+    {
+        // poison bow
+        am_poisonbolts,
+        S_XBOW_15,
+        S_XBOW_14,
+        S_XBOW_13,
+        S_XBOW_16,
+        S_NULL,
+        1
+    },
+    {
+        // wp grenade launcher
+        am_wpgrenades,
+        S_GREN_10,
+        S_GREN_09,
+        S_GREN_08,
+        S_GREN_11,
+        S_GREF_03,
+        0
+    },
+    {
+        // torpedo
+        am_cell,
+        S_BLST_18,
+        S_BLST_17,
+        S_BLST_13,
+        S_BLST_19,
+        S_NULL,
+        0
+    },	
+};
+
+
+
+
+
+
+
+
diff --git a/games/NXDoom/src/strife/d_items.h b/games/NXDoom/src/strife/d_items.h
new file mode 100644
index 000000000..eb4d725f2
--- /dev/null
+++ b/games/NXDoom/src/strife/d_items.h
@@ -0,0 +1,42 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Items: key cards, artifacts, weapon, ammunition.
+//
+
+
+#ifndef __D_ITEMS__
+#define __D_ITEMS__
+
+#include "doomdef.h"
+
+
+
+// Weapon info: sprite frames, ammunition use.
+typedef struct
+{
+    ammotype_t	ammo;
+    int		upstate;
+    int		downstate;
+    int		readystate;
+    int		atkstate;
+    int		flashstate;
+    boolean     availabledemo;    // villsa [STRIFE]
+
+} weaponinfo_t;
+
+extern  weaponinfo_t    weaponinfo[NUMWEAPONS];
+
+#endif
diff --git a/games/NXDoom/src/strife/d_main.c b/games/NXDoom/src/strife/d_main.c
new file mode 100644
index 000000000..56372b538
--- /dev/null
+++ b/games/NXDoom/src/strife/d_main.c
@@ -0,0 +1,2191 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM main program (D_DoomMain) and game loop (D_DoomLoop),
+//	plus functions to determine game mode (shareware, registered),
+//	parse command line parameters, configure game parameters (turbo),
+//	and call the startup functions.
+//
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "deh_main.h"
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "dstrings.h"
+#include "sounds.h"
+
+#include "txt_main.h"
+#include "txt_io.h"
+
+#include "d_iwad.h"
+
+#include "z_zone.h"
+#include "w_main.h"
+#include "w_wad.h"
+#include "s_sound.h"
+#include "v_diskicon.h"
+#include "v_video.h"
+
+#include "f_finale.h"
+#include "f_wipe.h"
+
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "m_saves.h" // haleyjd [STRIFE]
+#include "p_saveg.h"
+#include "p_dialog.h" // haleyjd [STRIFE]
+
+#include "i_endoom.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "i_swap.h"
+
+#include "g_game.h"
+
+#include "hu_stuff.h"
+#include "wi_stuff.h"
+#include "st_stuff.h"
+#include "am_map.h"
+#include "net_client.h"
+#include "net_dedicated.h"
+#include "net_query.h"
+
+#include "p_setup.h"
+#include "r_local.h"
+
+#include "d_main.h"
+
+#include "strife_icon.c"
+
+//
+// D-DoomLoop()
+// Not a globally visible function,
+//  just included for source reference,
+//  called by D_DoomMain, never exits.
+// Manages timing and IO,
+//  calls all ?_Responder, ?_Ticker, and ?_Drawer,
+//  calls I_GetTime, I_StartFrame, and I_StartTic
+//
+void D_DoomLoop (void);
+
+static boolean D_AddFile(char *filename);
+
+// Location where savegames are stored
+
+char *          savegamedir;
+
+// location of IWAD and WAD files
+
+char *          iwadfile;
+
+
+boolean         devparm;        // started game with -devparm
+boolean         nomonsters;     // checkparm of -nomonsters
+boolean         respawnparm;    // checkparm of -respawn
+boolean         fastparm;       // checkparm of -fast
+boolean         flipparm;       // [STRIFE] haleyjd 20110629: checkparm of -flip
+boolean         randomparm;     // [STRIFE] haleyjd 20130915: checkparm of -random
+
+boolean         showintro = true;   // [STRIFE] checkparm of -nograph, disables intro
+
+
+skill_t		startskill;
+int             startepisode;
+int		startmap;
+boolean		autostart;
+int             startloadgame;
+
+boolean		advancedemo;
+
+// villsa [STRIFE] workparm variable (similar to devparm?)
+boolean         workparm = false;
+
+// villsa [STRIFE] stonecold cheat variable
+boolean         stonecold = false;
+
+// haleyjd 09/11/10: [STRIFE] Game type variables
+boolean         isregistered;
+boolean         isdemoversion;
+
+// Store demo, do not accept any inputs
+// haleyjd [STRIFE] Unused.
+//boolean         storedemo;
+
+
+int             show_endoom = 1;
+int             show_diskicon = 1;
+int             graphical_startup = 1;
+static boolean  using_text_startup;
+
+// If true, startup has completed and the main game loop has started.
+
+static boolean main_loop_started = false;
+
+// fraggle 06/03/11 [STRIFE]: Unused config variable, preserved
+// for compatibility:
+
+static int comport = 0;
+
+// fraggle 06/03/11 [STRIFE]: Multiplayer nickname?
+char *nickname = NULL;
+
+void D_ConnectNetGame(void);
+void D_CheckNetGame(void);
+
+
+//
+// D_ProcessEvents
+// Send all the events of the given timestamp down the responder chain
+//
+void D_ProcessEvents (void)
+{
+    event_t*    ev;
+
+    // haleyjd 08/22/2010: [STRIFE] there is no such thing as a "store demo" 
+    // version of Strife
+
+    // IF STORE DEMO, DO NOT ACCEPT INPUT
+    //if (storedemo)
+    //    return;
+
+    while ((ev = D_PopEvent()) != NULL)
+    {
+        if (M_Responder (ev))
+            continue;               // menu ate the event
+        G_Responder (ev);
+    }
+}
+
+
+
+
+//
+// D_Display
+//  draw current display, possibly wiping it from the previous
+//
+// wipegamestate can be set to -1 to force a wipe on the next draw
+//
+// haleyjd 08/23/10: [STRIFE]:
+// * Changes to eliminate intermission and change timing of screenwipe
+// * 20100901: Added ST_DrawExternal and popupactivestate static variable
+// * 20110206: Start wipegamestate at GS_UNKNOWN (STRIFE-TODO: rename?)
+//
+gamestate_t     wipegamestate = GS_UNKNOWN;
+
+void D_Display (void)
+{
+    static  boolean             viewactivestate = false;
+    static  boolean             menuactivestate = false;
+    static  boolean             inhelpscreensstate = false;
+    static  boolean             popupactivestate = false; // [STRIFE]
+    static  boolean             fullscreen = false;
+    static  gamestate_t         oldgamestate = -1;
+    static  int                 borderdrawcount;
+    int                         nowtime;
+    int                         tics;
+    int                         wipestart;
+    int                         y;
+    boolean                     done;
+    boolean                     wipe;
+    boolean                     redrawsbar;
+
+    if (nodrawers)
+        return;                    // for comparative timing / profiling
+
+    redrawsbar = false;
+    
+    // change the view size if needed
+    if (setsizeneeded)
+    {
+        R_ExecuteSetViewSize ();
+        oldgamestate = -1;                      // force background redraw
+        borderdrawcount = 3;
+    }
+
+    // save the current screen if about to wipe
+    if (gamestate != wipegamestate)
+    {
+        wipe = true;
+        wipe_StartScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+    }
+    else
+        wipe = false;
+
+    if (gamestate == GS_LEVEL && gametic)
+        HU_Erase();
+
+    // do buffered drawing
+    switch (gamestate)
+    {
+    case GS_LEVEL:
+        if (!gametic)
+            break;
+        if (automapactive)
+            AM_Drawer ();
+        if (wipe || (viewheight != 200 && fullscreen) )
+            redrawsbar = true;
+        // haleyjd 08/29/10: [STRIFE] Always redraw sbar if menu is/was active
+        if (menuactivestate || (inhelpscreensstate && !inhelpscreens))
+            redrawsbar = true;              // just put away the help screen
+        ST_Drawer (viewheight == 200, redrawsbar );
+        fullscreen = viewheight == 200;
+        break;
+      
+     // haleyjd 08/23/2010: [STRIFE] No intermission
+     /*
+     case GS_INTERMISSION:
+         WI_Drawer ();
+         break;
+     */
+
+    case GS_FINALE:
+        F_Drawer ();
+        break;
+
+    case GS_DEMOSCREEN:
+        D_PageDrawer ();
+        break;
+    
+    default:
+        break;
+    }
+    
+    // draw buffered stuff to screen
+    I_UpdateNoBlit ();
+
+    // draw the view directly
+    if (gamestate == GS_LEVEL && !automapactive && gametic)
+        R_RenderPlayerView (&players[displayplayer]);
+
+    // clean up border stuff
+    if (gamestate != oldgamestate && gamestate != GS_LEVEL)
+        I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
+
+    // see if the border needs to be initially drawn
+    if (gamestate == GS_LEVEL && oldgamestate != GS_LEVEL)
+    {
+        viewactivestate = false;        // view was not active
+        R_FillBackScreen ();    // draw the pattern into the back screen
+    }
+
+    // see if the border needs to be updated to the screen
+    if (gamestate == GS_LEVEL && !automapactive && scaledviewwidth != 320)
+    {
+        if (menuactive || menuactivestate || !viewactivestate)
+        {
+            borderdrawcount = 3;
+            popupactivestate = false;
+        }
+        if (borderdrawcount)
+        {
+            R_DrawViewBorder ();    // erase old menu stuff
+            borderdrawcount--;
+        }
+
+    }
+
+    if (testcontrols)
+    {
+        // Box showing current mouse speed
+
+        V_DrawMouseSpeedBox(testcontrols_mousespeed);
+    }
+
+    menuactivestate = menuactive;
+    viewactivestate = viewactive;
+    inhelpscreensstate = inhelpscreens;
+    oldgamestate = wipegamestate = gamestate;
+
+    // haleyjd 20120208: [STRIFE] Rogue moved this down to below border drawing
+    if (gamestate == GS_LEVEL && gametic)
+    {
+        HU_Drawer ();
+        if(ST_DrawExternal()) 
+            popupactivestate = true;
+        else if(popupactivestate)
+        {
+            popupactivestate = false;
+            menuactivestate = 1;
+        }
+    }
+
+    // draw pause pic
+    if (paused)
+    {
+        if (automapactive)
+            y = 4;
+        else
+            y = viewwindowy+4;
+        V_DrawPatchDirect(viewwindowx + (scaledviewwidth - 68) / 2, y,
+                          W_CacheLumpName (DEH_String("M_PAUSE"), PU_CACHE));
+    }
+
+
+    // menus go directly to the screen
+    M_Drawer ();          // menu is drawn even on top of everything
+    NetUpdate ();         // send out any new accumulation
+
+
+    // normal update
+    if (!wipe)
+    {
+        I_FinishUpdate ();              // page flip or blit buffer
+        return;
+    }
+    
+    // wipe update
+    wipe_EndScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+    wipestart = I_GetTime () - 1;
+
+    do
+    {
+        do
+        {
+            nowtime = I_GetTime ();
+            tics = nowtime - wipestart;
+            I_Sleep(1);
+        } while (tics < 3); // haleyjd 08/23/2010: [STRIFE] Changed from == 0 to < 3
+
+        // haleyjd 08/26/10: [STRIFE] Changed to use ColorXForm wipe.
+        wipestart = nowtime;
+        done = wipe_ScreenWipe(wipe_ColorXForm
+                               , 0, 0, SCREENWIDTH, SCREENHEIGHT, tics);
+        I_UpdateNoBlit ();
+        M_Drawer ();                            // menu is drawn even on top of wipes
+        I_FinishUpdate ();                      // page flip or blit buffer
+    } while (!done);
+}
+
+//
+// Add configuration file variable bindings.
+//
+
+
+static const char * const chat_macro_defaults[10] =
+{
+    HUSTR_CHATMACRO0,
+    HUSTR_CHATMACRO1,
+    HUSTR_CHATMACRO2,
+    HUSTR_CHATMACRO3,
+    HUSTR_CHATMACRO4,
+    HUSTR_CHATMACRO5,
+    HUSTR_CHATMACRO6,
+    HUSTR_CHATMACRO7,
+    HUSTR_CHATMACRO8,
+    HUSTR_CHATMACRO9
+};
+
+
+void D_BindVariables(void)
+{
+    int i;
+
+    M_ApplyPlatformDefaults();
+
+    I_BindInputVariables();
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
+
+    M_BindBaseControls();
+    M_BindWeaponControls();
+    M_BindMapControls();
+    M_BindMenuControls();
+    M_BindStrifeControls(); // haleyjd 09/01/10: [STRIFE]
+    M_BindChatControls(MAXPLAYERS);
+
+    // haleyjd 20130915: Strife chat keys
+    key_multi_msgplayer[0] = '1';
+    key_multi_msgplayer[1] = '2';
+    key_multi_msgplayer[2] = '3';
+    key_multi_msgplayer[3] = '4';
+    key_multi_msgplayer[4] = '5';
+    key_multi_msgplayer[5] = '6';
+    key_multi_msgplayer[6] = '7';
+    key_multi_msgplayer[7] = '8';
+
+    NET_BindVariables();
+
+    // haleyjd 08/29/10: [STRIFE]
+    // * Added voice volume
+    // * Added back flat
+    // * Removed show_messages
+    // * Added show_talk
+    // fraggle 03/06/10: [STRIFE]
+    // * Removed detailLevel
+    // * screenblocks -> screensize
+    // * Added nickname, comport
+
+    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
+    M_BindIntVariable("sfx_volume",             &sfxVolume);
+    M_BindIntVariable("music_volume",           &musicVolume);
+    M_BindIntVariable("voice_volume",           &voiceVolume); 
+    M_BindIntVariable("show_talk",              &dialogshowtext);
+    M_BindIntVariable("screensize",             &screenblocks);
+    M_BindIntVariable("snd_channels",           &snd_channels);
+    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
+    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
+    M_BindIntVariable("show_endoom",            &show_endoom);
+    M_BindIntVariable("show_diskicon",          &show_diskicon);
+    M_BindIntVariable("graphical_startup",      &graphical_startup);
+
+    M_BindStringVariable("back_flat",           &back_flat);
+    M_BindStringVariable("nickname",            &nickname);
+
+    M_BindIntVariable("comport",                &comport);
+
+    // Multiplayer chat macros
+
+    for (i=0; i<10; ++i)
+    {
+        char buf[12];
+
+        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
+        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
+        M_BindStringVariable(buf, &chat_macros[i]);
+    }
+}
+
+//
+// D_GrabMouseCallback
+//
+// Called to determine whether to grab the mouse pointer
+//
+
+boolean D_GrabMouseCallback(void)
+{
+    // Drone players don't need mouse focus
+
+    if (drone)
+        return false;
+
+    // when menu is active or game is paused, release the mouse.
+
+    if (menuactive || paused)
+        return false;
+
+    // only grab mouse when playing levels (but not demos)
+
+    return (gamestate == GS_LEVEL) && !demoplayback;
+}
+
+// During startup, never grab the mouse.
+
+static boolean D_StartupGrabCallback(void)
+{
+    return false;
+}
+
+//
+//  D_DoomLoop
+//
+//  haleyjd 08/23/10: [STRIFE] Verified unmodified.
+//
+void D_DoomLoop (void)
+{
+    if (demorecording)
+        G_BeginRecording ();
+
+    main_loop_started = true;
+
+    TryRunTics();
+
+    if (!showintro)
+    {
+        I_RegisterWindowIcon(strife_icon_data, strife_icon_w, strife_icon_h);
+        I_InitGraphics();
+    }
+
+    if (show_diskicon)
+    {
+        V_EnableLoadingDisk("STDISK", SCREENWIDTH - LOADING_DISK_W, 3);
+    }
+    I_SetGrabMouseCallback(D_GrabMouseCallback);
+
+    V_RestoreBuffer();
+    R_ExecuteSetViewSize();
+
+    D_StartGameLoop();
+
+    if (testcontrols)
+    {
+        wipegamestate = gamestate;
+    }
+
+    while (1)
+    {
+        // frame syncronous IO operations
+        I_StartFrame ();
+
+        // process one or more tics
+        TryRunTics (); // will run at least one tic
+
+        S_UpdateSounds (players[consoleplayer].mo);// move positional sounds
+
+        // Update display, next frame, with current state.
+        if (screenvisible)
+            D_Display ();
+    }
+}
+
+
+
+//
+//  DEMO LOOP
+//
+int             demosequence;
+int             pagetic;
+const char      *pagename;
+
+
+//
+// D_PageTicker
+// Handles timing for warped projection
+//
+// haleyjd 08/22/2010: [STRIFE] verified unmodified
+//
+void D_PageTicker (void)
+{
+    if (--pagetic < 0)
+        D_AdvanceDemo ();
+}
+
+
+
+//
+// D_PageDrawer
+//
+// haleyjd 08/22/2010: [STRIFE] verified unmodified
+//
+void D_PageDrawer (void)
+{
+    V_DrawPatch (0, 0, W_CacheLumpName(pagename, PU_CACHE));
+}
+
+
+//
+// D_AdvanceDemo
+// Called after each demo or intro demosequence finishes
+//
+// haleyjd 08/22/2010: [STRIFE] verified unmodified
+//
+void D_AdvanceDemo (void)
+{
+    advancedemo = true;
+}
+
+
+//
+// This cycles through the demo sequences.
+// FIXME - version dependend demo numbers?
+//
+// [STRIFE] Modified for the opening slideshow and the exit screen
+//
+void D_DoAdvanceDemo (void)
+{
+    players[consoleplayer].playerstate = PST_LIVE;  // not reborn
+    advancedemo = false;
+    usergame = false;               // no save / end game here
+    paused = false;
+    gameaction = ga_nothing;
+    
+    // villsa 09/12/10: [STRIFE] converted pagetics to ticrate
+    switch (demosequence)
+    {
+    case -5: // exit the game
+        I_Quit();
+        return;
+    case -4: // show exit screen
+        menuactive = false;
+        pagetic = 3*TICRATE;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("PANEL7");
+        S_StartMusic(mus_fast);
+        if(isdemoversion)
+            demosequence = -3; // show Velocity logo
+        else
+            demosequence = -5; // exit
+        return;
+    case -3: // show Velocity logo for demo version
+        pagetic = 6*TICRATE;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("vellogo");
+        demosequence = -5; // exit
+        return;
+    case -2: // title screen
+        pagetic = 6*TICRATE;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("TITLEPIC");
+        S_StartMusic(mus_logo);
+        demosequence = -1; // start intro cinematic
+        return;
+    case -1: // start of intro cinematic
+        pagetic = 10;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("PANEL0");
+        S_StartSound(NULL, sfx_rb2act);
+        wipegamestate = -1;
+        break;
+    case 0: // Rogue logo
+        pagetic = 4*TICRATE;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("RGELOGO");
+        wipegamestate = -1;
+        break;
+    case 1:
+        pagetic = 7*TICRATE;              // The comet struck our planet without
+        gamestate = GS_DEMOSCREEN;        // warning.We lost our paradise in a 
+        pagename = DEH_String("PANEL1");  // single, violent stroke.
+        I_StartVoice(DEH_String("pro1")); 
+        S_StartMusic(mus_intro);
+        break;
+    case 2:
+        pagetic = 9*TICRATE;              // The impact released a virus which 
+        gamestate = GS_DEMOSCREEN;        // swept through the land and killed 
+        pagename = DEH_String("PANEL2");  // millions. They turned out to be 
+        I_StartVoice(DEH_String("pro2")); // the lucky ones...
+        break;
+    case 3:
+        pagetic = 12*TICRATE;             // For those that did not die became 
+        gamestate = GS_DEMOSCREEN;        // mutations of humanity. Some became
+        pagename = DEH_String("PANEL3");  // fanatics who heard the voice of a
+        I_StartVoice(DEH_String("pro3")); // malignant God in their heads, and 
+        break;                            // called themselves the Order.
+    case 4:
+        pagetic = 11*TICRATE;             // Those of us who were deaf to this
+        pagename = DEH_String("PANEL4");  // voice suffer horribly and are 
+        gamestate = GS_DEMOSCREEN;        // forced to serve these ruthless
+        I_StartVoice(DEH_String("pro4")); // psychotics, who wield weapons more
+        break;                            // powerful than anything we can muster.
+    case 5:
+        pagetic = 10*TICRATE;             // They destroy our women and children,
+        gamestate = GS_DEMOSCREEN;        // so that we must hide them underground,
+        pagename = DEH_String("PANEL5");  // and live like animals in constant
+        I_StartVoice(DEH_String("pro5")); // fear for our lives.
+        break;
+    case 6:                               // But there are whispers of discontent.
+        pagetic = 16*TICRATE;             // If we organize, can we defeat our
+        gamestate = GS_DEMOSCREEN;        // masters? Weapons are being stolen,
+        pagename = DEH_String("PANEL6");  // soldiers are being trained. A 
+        I_StartVoice(DEH_String("pro6")); // Movement is born! Born of lifelong 
+        break;                            // STRIFE!
+    case 7: // titlepic again - unused...
+        pagetic = 9*TICRATE;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("TITLEPIC");
+        wipegamestate = -1;
+        break;
+    case 8: // demo
+        ClearTmp();
+        pagetic = 9*TICRATE;
+        G_DeferedPlayDemo(DEH_String("demo1"));
+        break;
+    case 9: // velocity logo? - unused...
+        pagetic = 6*TICRATE;
+        gamestate = GS_DEMOSCREEN;
+        pagename = DEH_String("vellogo");
+        wipegamestate = -1;
+        break;
+    case 10: // credits
+        gamestate = GS_DEMOSCREEN;
+        pagetic = 12*TICRATE;
+        pagename = DEH_String("CREDIT");
+        wipegamestate = -1;
+        break;
+    default:
+        break;
+    }
+
+    ++demosequence;
+
+    if(demosequence > 11)
+        demosequence = -2;
+    if(demosequence == 7 || demosequence == 9)
+        ++demosequence;
+}
+
+
+
+//
+// D_StartTitle
+//
+// [STRIFE]
+// haleyjd 09/11/10: Small modifications for new demo sequence.
+//
+void D_StartTitle (void)
+{
+    gamestate = GS_DEMOSCREEN;
+    gameaction = ga_nothing;
+    demosequence = -2;
+    D_AdvanceDemo ();
+}
+
+//
+// D_QuitGame
+//
+// [STRIFE] New function
+// haleyjd 09/11/10: Sets up the quit game snippet powered by the
+// demo sequence.
+//
+void D_QuitGame(void)
+{
+    gameaction = ga_nothing;
+    demosequence = -4;
+    D_AdvanceDemo();
+}
+
+// Strings for dehacked replacements of the startup banner
+//
+// These are from the original source: some of them are perhaps
+// not used in any dehacked patches
+
+static const char *banners[] =
+{
+    // strife1.wad:
+
+    "                      "
+    "STRIFE:  Quest for the Sigil v1.2"
+    "                                 "
+};
+
+//
+// Get game name: if the startup banner has been replaced, use that.
+// Otherwise, use the name given
+// 
+
+static char *GetGameName(char *gamename)
+{
+    size_t i;
+    const char *deh_sub;
+    
+    for (i=0; i<arrlen(banners); ++i)
+    {
+        // Has the banner been replaced?
+
+        deh_sub = DEH_String(banners[i]);
+        
+        if (deh_sub != banners[i])
+        {
+            size_t gamename_size;
+
+            // Has been replaced
+            // We need to expand via printf to include the Doom version 
+            // number
+            // We also need to cut off spaces to get the basic name
+
+            gamename_size = strlen(deh_sub) + 10;
+            gamename = Z_Malloc(gamename_size, PU_STATIC, 0);
+            M_snprintf(gamename, gamename_size, deh_sub,
+                       STRIFE_VERSION / 100, STRIFE_VERSION % 100);
+
+            while (gamename[0] != '\0' && isspace(gamename[0]))
+            {
+                memmove(gamename, gamename + 1, gamename_size - 1);
+            }
+
+            while (gamename[0] != '\0' && isspace(gamename[strlen(gamename)-1]))
+                gamename[strlen(gamename) - 1] = '\0';
+
+            return gamename;
+        }
+    }
+
+    return gamename;
+}
+
+//
+// Find out what version of Doom is playing.
+//
+
+void D_IdentifyVersion(void)
+{
+    // gamemission is set up by the D_FindIWAD function.  But if 
+    // we specify '-iwad', we have to identify using 
+    // IdentifyIWADByName.  However, if the iwad does not match
+    // any known IWAD name, we may have a dilemma.  Try to 
+    // identify by its contents.
+    
+    // STRIFE-TODO: some elaborate checks? for now we assume...
+    // The logic in strife1.exe is simple:
+    // * if strife1.wad is found, set isregistered = true
+    // * if strife0.wad is found, set isdemoversion = true
+
+    // Make sure gamemode is set up correctly
+    gamemode = commercial;
+    gamemission = strife;
+    isregistered = true;
+
+    // Load voices.wad 
+    if(isregistered)
+    {
+        char *name = NULL;
+        int p;
+
+        // If -iwad was used, check and see if voices.wad exists on the same
+        // filepath.
+        if((p = M_CheckParm("-iwad")) && p < myargc - 1)
+        {
+            const char *iwad = myargv[p + 1];
+            size_t  len      = strlen(iwad) + 1;
+            char   *iwadpath = Z_Malloc(len, PU_STATIC, NULL);
+            char   *voiceswad;
+
+            // extract base path of IWAD parameter
+            M_GetFilePath(iwad, iwadpath, len);
+
+            // concatenate with /voices.wad
+            voiceswad = M_SafeFilePath(iwadpath, "voices.wad");
+            Z_Free(iwadpath);
+
+            name = M_FileCaseExists(voiceswad);
+            Z_Free(voiceswad);
+        }
+
+        // not found? try global search paths
+        if(!name)
+            name = D_FindWADByName("voices.wad");
+
+        // still not found? too bad.
+        if(!name)
+        {
+            disable_voices = 1;
+
+            if(devparm)
+                 printf("Voices disabled\n");
+        }
+        else
+        {
+            // add it.
+            D_AddFile(name);
+            free(name);
+        }
+    }
+}
+
+#if 0
+//
+// DoTimeBomb
+//
+// haleyjd 08/23/2010: [STRIFE] New function
+// Code with no xrefs; probably left over from a private alpha or beta.
+// Translated here because it explains what the SERIAL lump was meant to do.
+//
+void DoTimeBomb(void)
+{
+    dosdate_t date;
+    char *serial;
+    int serialnum;
+    int serial_year;
+    int serial_month;
+
+    serial = W_CacheLumpName("serial", PU_CACHE);
+    serialnum = atoi(serial);
+
+    // Rogue, much like Governor Mourel, were lousy liars. These deceptive
+    // error messages are pretty low :P
+    dos_getdate(&date);
+    if(date.year > 1996 || date.day > 15 && date.month > 4)
+        I_Error("Data error! Corrupted WAD File!");
+    serial_year = serialnum / 10000;
+    serial_month = serialnum / 100 - 100 * serial_year;
+    if(date.year < serial_year || 
+       date.day < serialnum - 100 * serial_month - 10000 * serial_year &&
+       date.month < serial_month)
+       I_Error("Bad wadfile");
+}
+#endif
+
+// Set the gamedescription string
+
+void D_SetGameDescription(void)
+{
+    gamedescription = GetGameName("Strife: Quest for the Sigil");
+}
+
+//      print title for every printed line
+static char title[128] = "";
+
+static void InitTitleString(void)
+{
+    switch (gameversion)
+    {
+    case exe_strife_1_2:
+        DEH_snprintf(title, sizeof(title), "                      "
+                                           "STRIFE:  Quest for the Sigil v1.2"
+                                           "                                  "
+                                           );
+        break;
+    case exe_strife_1_31:
+    default:
+        DEH_snprintf(title, sizeof(title), "                      "
+                                           "STRIFE:  Quest for the Sigil v1.31"
+                                           "                                 "
+                                           );
+        break;
+    }
+}
+
+static boolean D_AddFile(char *filename)
+{
+    wad_file_t *handle;
+
+    printf(" adding %s\n", filename);
+    handle = W_AddFile(filename);
+
+    return handle != NULL;
+}
+
+// Copyright message banners
+// Some dehacked mods replace these.  These are only displayed if they are 
+// replaced by dehacked.
+// haleyjd 08/22/2010: [STRIFE] altered to match strings from binary
+static const char *copyright_banners[] =
+{
+    "===========================================================================\n"
+    "ATTENTION:  This version of STRIFE has extra files added to it.\n"
+    "        You will not receive technical support for modified games.\n"
+    "===========================================================================\n",
+
+    "===========================================================================\n"
+    "             This version is NOT SHAREWARE, do not distribute!\n"
+    "         Please report software piracy to the SPA: 1-800-388-PIR8\n"
+    "===========================================================================\n",
+
+    "===========================================================================\n"
+    "                                Shareware!\n"
+    "===========================================================================\n"
+};
+
+// Prints a message only if it has been modified by dehacked.
+
+void PrintDehackedBanners(void)
+{
+    size_t i;
+
+    for (i=0; i<arrlen(copyright_banners); ++i)
+    {
+        const char *deh_s;
+
+        deh_s = DEH_String(copyright_banners[i]);
+
+        if (deh_s != copyright_banners[i])
+        {
+            printf("%s", deh_s);
+
+            // Make sure the modified banner always ends in a newline character.
+            // If it doesn't, add a newline.  This fixes av.wad.
+
+            if (deh_s[strlen(deh_s) - 1] != '\n')
+            {
+                printf("\n");
+            }
+        }
+    }
+}
+
+static const struct
+{
+    const char *description;
+    const char *cmdline;
+    GameVersion_t version;
+} gameversions[] = {
+    { "Strife 1.2",          "1.2",       exe_strife_1_2  },
+    { "Strife 1.31",         "1.31",      exe_strife_1_31 },
+    { NULL,                  NULL,        0               }
+};
+
+// Initialize the game version
+
+static void InitGameVersion(void)
+{
+    int p;
+
+    // haleyjd: we support emulating either the 1.2 or the 1.31 versions of
+    // Strife, which are the most significant. 1.2 is the most mature version
+    // that still has the single saveslot restriction, whereas 1.31 is the
+    // final revision. The differences between the two are barely worth
+    // mentioning aside from that main one.
+
+    //!
+    // @arg <version>
+    // @category compat
+    //
+    // Emulate a specific version of Strife. Valid values are "1.2" and "1.31".
+    //
+
+    p = M_CheckParmWithArgs("-gameversion", 1);
+
+    if (p)
+    {
+        int i;
+        for (i=0; gameversions[i].description != NULL; ++i)
+        {
+            if (!strcmp(myargv[p+1], gameversions[i].cmdline))
+            {
+                gameversion = gameversions[i].version;
+                break;
+            }
+        }
+
+        if (gameversions[i].description == NULL)
+        {
+            printf("Supported game versions:\n");
+
+            for (i=0; gameversions[i].description != NULL; ++i)
+            {
+                printf("\t%s (%s)\n", gameversions[i].cmdline,
+                        gameversions[i].description);
+            }
+
+            I_Error("Unknown game version '%s'", myargv[p+1]);
+        }
+    }
+    else
+    {
+        gameversion = exe_strife_1_31;
+    }
+}
+
+void PrintGameVersion(void)
+{
+    int i;
+
+    for (i=0; gameversions[i].description != NULL; ++i)
+    {
+        if (gameversions[i].version == gameversion)
+        {
+            printf("Emulating the behavior of the "
+                   "'%s' executable.\n", gameversions[i].description);
+            break;
+        }
+    }
+}
+
+// Function called at exit to display the ENDOOM screen
+
+static void D_Endoom(void)
+{
+    byte *endoom;
+
+    // Don't show ENDOOM if we have it disabled, or we're running
+    // in screensaver or control test mode. Only show it once the
+    // game has actually started.
+
+
+    if (!show_endoom || !main_loop_started || screensaver_mode || testcontrols)
+    {
+        return;
+    }
+
+    // haleyjd 08/27/10: [STRIFE] ENDOOM -> ENDSTRF
+    endoom = W_CacheLumpName(DEH_String("ENDSTRF"), PU_STATIC);
+
+    I_Endoom(endoom);
+}
+
+//
+// D_GetCursorColumn
+//
+static int D_GetCursorColumn(void)
+{
+    int x, y;
+    TXT_GetXY(&x, &y);
+    return x;
+}
+
+//
+// D_GetCursorRow
+//
+static int D_GetCursorRow(void)
+{
+    int x, y;
+    TXT_GetXY(&x, &y);
+    return y;
+}
+
+//
+// D_SetCursorPosition
+//
+static void D_SetCursorPosition(int column, int row)
+{
+    TXT_GotoXY(column, row);
+}
+
+//
+// D_SetChar
+//
+static void D_SetChar(char c)
+{
+    int x, y;
+    // Backup position
+    TXT_GetXY(&x, &y);
+    TXT_PutChar(c);
+    // Restore position
+    TXT_GotoXY(x, y);
+}
+
+//
+// D_DrawText
+//
+static void D_DrawText(const char *string, int bc, int fc)
+{
+    int column;
+    int row;
+    int i;
+
+    if (!using_text_startup)
+    {
+        return;
+    }
+
+    // Set text color
+    TXT_BGColor(bc, 0);
+    TXT_FGColor(fc);
+
+    // Get column position
+    column = D_GetCursorColumn();
+
+    // Get row position
+    row = D_GetCursorRow();
+
+    for (i = 0; i < strlen(string); i++)
+    {
+        // Set character
+        D_SetChar(string[i]);
+
+        // Check cursor position
+        if (++column >= 80)
+            column = 0;
+
+        // Set postition
+        D_SetCursorPosition(column, row);
+    }
+}
+
+//=============================================================================
+//
+// haleyjd: Chocolate Strife Specifics
+//
+// None of the code in here is from the original executable, but is needed for
+// other reasons.
+
+//
+// D_PatchClipCallback
+//
+// haleyjd 08/28/10: Clip patches to the framebuffer without errors.
+// Returns false if V_DrawPatch should return without drawing.
+//
+boolean D_PatchClipCallback(patch_t *patch, int x, int y)
+{
+    // note that offsets were already accounted for in V_DrawPatch
+    return (x >= 0 && y >= 0 
+            && x + SHORT(patch->width) <= SCREENWIDTH 
+            && y + SHORT(patch->height) <= SCREENHEIGHT);
+}
+
+//
+// D_InitChocoStrife
+//
+// haleyjd 08/28/10: Take care of some Strife-specific initialization
+// that is necessitated by Chocolate Doom issues, such as setting global 
+// callbacks.
+//
+static void D_InitChocoStrife(void)
+{
+    // set the V_DrawPatch clipping callback
+    V_SetPatchClipCallback(D_PatchClipCallback);
+}
+
+
+//
+// STRIFE Graphical Intro Sequence
+//
+
+#define MAXINTROPROGRESS 69
+
+static int introprogress;        // track the progress of the intro
+
+static byte *rawgfx_startup0;    // raw linear gfx for intro
+static byte *rawgfx_startp[4];
+static byte *rawgfx_startlz[2];
+static byte *rawgfx_startbot;
+
+//
+// D_IntroBackground
+//
+// [STRIFE] New function
+// haleyjd 20110206: Strife only drew this once, but for supporting double-
+// buffered or page-flipped surfaces it is best to redraw the entire screen
+// every frame.
+//
+static void D_IntroBackground(void)
+{
+    if(!showintro)
+        return;
+
+    // Fill the background entirely (wasn't needed in vanilla)
+    V_DrawFilledBox(0, 0, SCREENWIDTH, SCREENHEIGHT, 0);
+
+    // Strife cleared the screen somewhere in the low-level code between the
+    // intro and the titlescreen, so this is to take care of that and get
+    // proper fade-in behavior on the titlescreen
+    if(introprogress >= MAXINTROPROGRESS)
+    {
+        I_FinishUpdate();
+        return;
+    }
+
+    // Draw a 95-pixel rect from STARTUP0 starting at y=57 to (0,41) on the
+    // screen (this was a memcpy directly to 0xA3340 in low DOS memory)
+    V_DrawBlock(0, 41, 320, 95, rawgfx_startup0 + (320*57));
+}
+
+//
+// D_InitIntroSequence
+//
+// [STRIFE] New function
+// haleyjd 20110206: Initialize the graphical introduction sequence
+//
+
+static void D_InitIntroSequence(void)
+{
+    byte *textScreen;
+    char string[80];
+
+    if (devparm || !graphical_startup || testcontrols)
+    {
+        using_text_startup = false;
+        showintro = false;
+        return;
+    }
+
+    if(showintro)
+    {
+        // In vanilla Strife, Mode 13h was initialized directly in D_DoomMain.
+        // We have to be a little more courteous of the low-level code here.
+        I_SetGrabMouseCallback(D_StartupGrabCallback);
+        I_RegisterWindowIcon(strife_icon_data, strife_icon_h, strife_icon_w);
+        I_InitGraphics();
+        V_RestoreBuffer(); // make the V_ routines work
+
+        // Load all graphics
+        rawgfx_startup0   = W_CacheLumpName("STARTUP0", PU_STATIC);
+        rawgfx_startp[0]  = W_CacheLumpName("STRTPA1",  PU_STATIC);
+        rawgfx_startp[1]  = W_CacheLumpName("STRTPB1",  PU_STATIC);
+        rawgfx_startp[2]  = W_CacheLumpName("STRTPC1",  PU_STATIC);
+        rawgfx_startp[3]  = W_CacheLumpName("STRTPD1",  PU_STATIC);
+        rawgfx_startlz[0] = W_CacheLumpName("STRTLZ1",  PU_STATIC);
+        rawgfx_startlz[1] = W_CacheLumpName("STRTLZ2",  PU_STATIC);
+        rawgfx_startbot   = W_CacheLumpName("STRTBOT",  PU_STATIC);
+
+        // Draw the background
+        D_IntroBackground();
+
+        using_text_startup = false;
+    }
+    else
+    {
+        if (!TXT_Init())
+        {
+            using_text_startup = false;
+            return;
+        }
+
+        I_InitWindowTitle();
+        I_InitWindowIcon();
+
+        // Clear screen
+        textScreen = TXT_GetScreenData();
+        memset(textScreen, 0, 4000);
+
+        using_text_startup = true;
+
+        // Print title
+
+        D_SetCursorPosition(0, 0);
+        D_DrawText(title, TXT_COLOR_GREEN, TXT_COLOR_BLACK);
+
+        DEH_snprintf(string, sizeof(string), "Rogue Entertainment");
+        D_SetCursorPosition(40 - strlen(string) / 2, 5);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        DEH_snprintf(string, sizeof(string), "and");
+        D_SetCursorPosition(40 - strlen(string) / 2, 7);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        DEH_snprintf(string, sizeof(string), "Velocity Games");
+        D_SetCursorPosition(40 - strlen(string) / 2, 9);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        DEH_snprintf(string, sizeof(string), "present");
+        D_SetCursorPosition(40 - strlen(string) / 2, 11);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        DEH_snprintf(string, sizeof(string), "S T R I F E");
+        D_SetCursorPosition(40 - strlen(string) / 2, 14);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        DEH_snprintf(string, sizeof(string), "Loading...");
+        D_SetCursorPosition(40 - strlen(string) / 2, 17);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        DEH_snprintf(string, sizeof(string),
+                    "[                                                  ]");
+        D_SetCursorPosition(14, 18);
+        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
+
+        TXT_UpdateScreen();
+    }
+}
+
+//
+// D_DrawIntroSequence
+//
+// [STRIFE] New function
+// haleyjd 20110206: Refresh the intro sequence
+//
+static void D_DrawIntroSequence(void)
+{
+    int laserpos;
+    int robotpos;
+    int i;
+
+    if (showintro)
+    {
+        D_IntroBackground(); // haleyjd: refresh the background
+
+        // Laser position
+        laserpos = (200 * introprogress / MAXINTROPROGRESS) + 60;
+
+        // BUG: (?) Due to this clip, the laser never even comes close to
+        // touching the peasant; confirmed with vanilla. This MAY have been
+        // intentional, for effect, however, since no death frames are shown 
+        // either... kind of a black-out death.
+        if (laserpos > 200)
+            laserpos = 200;
+
+        // Draw the laser
+        // Blitted 16 bytes for 16 rows starting at 705280 + laserpos
+        // (705280 - 0xA0000) / 320 == 156
+        V_DrawBlock(laserpos, 156, 16, 16, rawgfx_startlz[laserpos % 2]);
+
+        // Robot position
+        robotpos = laserpos % 5 - 2;
+
+        // Draw the robot
+        // Blitted 48 bytes for 48 rows starting at 699534 + (320*robotpos)
+        // 699534 - 0xA0000 == 44174, which % 320 == 14, / 320 == 138
+        V_DrawBlock(14, 138 + robotpos, 48, 48, rawgfx_startbot);
+
+        // Draw the peasant
+        // Blitted 32 bytes for 64 rows starting at 699142
+        // 699142 - 0xA0000 == 43782, which % 320 == 262, / 320 == 136
+        V_DrawBlock(262, 136, 32, 64, rawgfx_startp[laserpos % 4]);
+
+        I_FinishUpdate();
+    }
+    else if (using_text_startup)
+    {
+        // Laser position
+        laserpos = 50 * introprogress / MAXINTROPROGRESS;
+
+        if (laserpos > 50)
+        {
+            laserpos = 50;
+        }
+
+        for (i = 0; i < laserpos; i++)
+        {
+            D_SetCursorPosition(15 + i, 18);
+            D_DrawText("#", TXT_COLOR_GREEN, TXT_COLOR_BLUE);
+        }
+
+        I_Sleep(10);
+
+        TXT_UpdateScreen();
+    }
+}
+
+//
+// D_IntroTick
+//
+// Advance the intro sequence
+//
+void D_IntroTick(void)
+{
+    static boolean didsound = false; // haleyjd 20120209
+    
+    if(devparm)
+        return;
+
+    ++introprogress;
+    if(introprogress >= MAXINTROPROGRESS)
+    {
+        D_IntroBackground(); // haleyjd: clear the bg anyway
+        
+        // haleyjd 20120209: This isn't 100% true to vanilla because vanilla
+        // would play this sound a half-dozen times. BUT, in vanilla, for 
+        // whatever reason, under DMX, playing the same sound multiple times
+        // doesn't add up violently like it does under SDL_mixer. This means
+        // that without this one-time limitation, the sound is far too loud.
+        if(!didsound)
+        {
+            S_StartSound(NULL, sfx_psdtha);
+            didsound = true;
+        }
+    }
+    else
+        D_DrawIntroSequence();
+}
+
+//
+// End Chocolate Strife Specifics
+//
+//=============================================================================
+
+static void G_CheckDemoStatusAtExit (void)
+{
+    G_CheckDemoStatus();
+}
+
+//
+// D_DoomMain
+//
+void D_DoomMain (void)
+{
+    int             p;
+    char            file[256];
+    char            demolumpname[9];
+
+    I_AtExit(D_Endoom, false);
+
+    // haleyjd 20110206 [STRIFE]: -nograph parameter
+
+    //!
+    // @vanilla
+    //
+    // Disable graphical introduction sequence
+    //
+
+    if (M_ParmExists("-nograph"))
+        showintro = false;
+
+    // Undocumented:
+    // Invoked by setup to test the controls.
+
+    if (M_ParmExists("-testcontrols"))
+    {
+        testcontrols = true;
+        showintro = false;
+    }
+
+    // haleyjd 20110206: Moved up -devparm for max visibility
+
+    //!
+    // @vanilla
+    //
+    // Developer mode. Implies -nograph.
+    //
+
+    devparm = M_CheckParm ("-devparm");
+
+    // print banner
+
+    I_PrintBanner(PACKAGE_STRING);
+
+    //DEH_printf("Z_Init: Init zone memory allocation daemon. \n"); [STRIFE] removed
+    Z_Init ();
+
+    //!
+    // @category net
+    //
+    // Start a dedicated server, routing packets but not participating
+    // in the game itself.
+    //
+
+    if (M_CheckParm("-dedicated") > 0)
+    {
+        printf("Dedicated server mode.\n");
+        NET_DedicatedServer();
+
+        // Never returns
+    }
+
+    //!
+    // @category net
+    //
+    // Query the Internet master server for a global list of active
+    // servers.
+    //
+
+    if (M_CheckParm("-search"))
+    {
+        NET_MasterQuery();
+        exit(0);
+    }
+
+    //!
+    // @arg <address>
+    // @category net
+    //
+    // Query the status of the server running on the given IP
+    // address.
+    //
+
+    p = M_CheckParmWithArgs("-query", 1);
+
+    if (p)
+    {
+        NET_QueryAddress(myargv[p+1]);
+        exit(0);
+    }
+
+    //!
+    // @category net
+    //
+    // Search the local LAN for running servers.
+    //
+
+    if (M_CheckParm("-localsearch"))
+    {
+        NET_LANQuery();
+        exit(0);
+    }
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Disable monsters.
+    //
+
+    nomonsters = M_CheckParm ("-nomonsters");
+
+    //!
+    // @category obscure
+    // @vanilla
+    //
+    // Set Rogue playtesting mode
+    // (god mode; no cliping mode toggled by backspace).
+    //
+
+    workparm = M_CheckParm ("-work");
+
+    //!
+    // @category obscure
+    // @vanilla
+    //
+    // Flip player gun sprites (broken).
+    //
+
+    flipparm = M_CheckParm ("-flip");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Respawn monsters after they are killed.
+    //
+
+    respawnparm = M_CheckParm ("-respawn");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Items respawn at random locations
+    //
+
+    randomparm = M_CheckParm ("-random");
+
+    //!
+    // @category game
+    // @vanilla
+    //
+    // Monsters move faster.
+    //
+
+    fastparm = M_CheckParm ("-fast");
+
+    I_DisplayFPSDots(devparm);
+
+    // haleyjd 20110206 [STRIFE]: -devparm implies -nograph
+    if(devparm)
+        showintro = false;
+
+    // Note: Vanilla Strife does not understand the -deathmatch command
+    // line parameter. deathmatch=1 is the default behavior when
+    // playing a netgame.
+
+    //!
+    // @category net
+    // @vanilla
+    //
+    // Start a deathmatch game.  Weapons do not stay in place and
+    // all items respawn after 30 seconds.
+    //
+
+    if (M_CheckParm ("-altdeath"))
+        deathmatch = 2;
+
+    if (devparm)
+        DEH_printf(D_DEVSTR);
+    
+    // find which dir to use for config files
+
+#ifdef _WIN32
+
+    //!
+    // @category obscure
+    // @platform windows
+    // @vanilla
+    //
+    // Save configuration data and savegames in c:\strife.cd,
+    // allowing play from CD.
+    //
+
+    if (M_CheckParm("-cdrom") > 0)
+    {
+        printf(D_CDROM);
+
+        // haleyjd 08/22/2010: [STRIFE] Use strife.cd folder for -cdrom
+        M_SetConfigDir("c:\\strife.cd\\");
+    }
+    else
+#endif
+    {
+        // Auto-detect the configuration dir.
+
+        M_SetConfigDir(NULL);
+    }
+    
+    //!
+    // @category game
+    // @arg <x>
+    // @vanilla
+    //
+    // Turbo mode.  The player's speed is multiplied by x%.  If unspecified,
+    // x defaults to 200.  Values are rounded up to 10 and down to 400.
+    //
+
+    if ( (p=M_CheckParm ("-turbo")) )
+    {
+        int     scale = 200;
+
+        if (p<myargc-1)
+            scale = atoi (myargv[p+1]);
+        if (scale < 10)
+            scale = 10;
+        if (scale > 400)
+            scale = 400;
+        DEH_printf("turbo scale: %i%%\n", scale);
+        forwardmove[0] = forwardmove[0]*scale/100;
+        forwardmove[1] = forwardmove[1]*scale/100;
+        sidemove[0] = sidemove[0]*scale/100;
+        sidemove[1] = sidemove[1]*scale/100;
+    }
+    
+    // init subsystems
+    // DEH_printf("V_Init: allocate screens.\n"); [STRIFE] removed
+    V_Init ();
+
+    // Load configuration files before initialising other subsystems.
+    // haleyjd 08/22/2010: [STRIFE] - use strife.cfg
+    // DEH_printf("M_LoadDefaults: Load system defaults.\n"); [STRIFE] removed
+    M_SetConfigFilenames("strife.cfg", PROGRAM_PREFIX "strife.cfg");
+    D_BindVariables();
+    M_LoadDefaults();
+
+    // Save configuration at exit.
+    I_AtExit(M_SaveDefaults, false);
+
+    // Find the main IWAD file and load it.
+    iwadfile = D_FindIWAD(IWAD_MASK_STRIFE, &gamemission);
+
+    // None found?
+    if (iwadfile == NULL)
+    {
+        I_Error("Game mode indeterminate.  No IWAD file was found.  Try\n"
+                "specifying one with the '-iwad' command line parameter.\n");
+    }
+
+    modifiedgame = false;
+
+    if(devparm) // [STRIFE] Devparm only
+        DEH_printf("W_Init: Init WADfiles.\n");
+    D_AddFile(iwadfile);
+    W_CheckCorrectIWAD(strife);
+    D_IdentifyVersion();
+
+    //!
+    // @category mod
+    //
+    // Disable auto-loading of .wad files.
+    //
+    if (!M_ParmExists("-noautoload"))
+    {
+        char *autoload_dir;
+        autoload_dir = M_GetAutoloadDir("strife1.wad");
+        if (autoload_dir != NULL)
+        {
+            DEH_AutoLoadPatches(autoload_dir);
+            W_AutoLoadWADs(autoload_dir);
+            free(autoload_dir);
+        }
+    }
+
+    // Load dehacked patches specified on the command line.
+    DEH_ParseCommandLine();
+
+    // Load PWAD files.
+    modifiedgame = W_ParseCommandLine();
+
+    // [STRIFE] serial number output
+    if(devparm)
+    {
+        char msgbuf[80];
+        char *serial  = W_CacheLumpName("SERIAL", PU_CACHE);
+        int serialnum = atoi(serial);
+
+        DEH_snprintf(msgbuf, sizeof(msgbuf), "Wad Serial Number: %d:", serialnum);
+        printf("%s\n", msgbuf);
+    }
+
+    // add any files specified on the command line with -file wadfile
+    // to the wad list
+    //
+
+    // Debug:
+//    W_PrintDirectory();
+
+    //!
+    // @arg <demo>
+    // @category demo
+    // @vanilla
+    //
+    // Play back the demo named demo.lmp.
+    //
+
+    p = M_CheckParmWithArgs ("-playdemo", 1);
+
+    if (!p)
+    {
+        //!
+        // @arg <demo>
+        // @category demo
+        // @vanilla
+        //
+        // Play back the demo named demo.lmp, determining the framerate
+        // of the screen.
+        //
+	p = M_CheckParmWithArgs("-timedemo", 1);
+
+    }
+
+    if (p)
+    {
+        char *uc_filename = strdup(myargv[p + 1]);
+        M_ForceUppercase(uc_filename);
+
+        // With Vanilla you have to specify the file without extension,
+        // but make that optional.
+        if (M_StringEndsWith(uc_filename, ".LMP"))
+        {
+            M_StringCopy(file, myargv[p + 1], sizeof(file));
+        }
+        else
+        {
+            DEH_snprintf(file, sizeof(file), "%s.lmp", myargv[p+1]);
+        }
+
+        free(uc_filename);
+
+        if (D_AddFile (file))
+        {
+            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
+                         sizeof(demolumpname));
+        }
+        else
+        {
+            // If file failed to load, still continue trying to play
+            // the demo in the same way as Vanilla Doom.  This makes
+            // tricks like "-playdemo demo1" possible.
+
+            M_StringCopy(demolumpname, myargv[p + 1], sizeof(demolumpname));
+        }
+
+        printf("Playing demo %s.\n", file);
+    }
+
+    I_AtExit(G_CheckDemoStatusAtExit, true);
+
+    // Generate the WAD hash table.  Speed things up a bit.
+
+    W_GenerateHashTable();
+
+    InitGameVersion();
+    InitTitleString();
+    D_SetGameDescription();
+    I_SetWindowTitle(gamedescription);
+    savegamedir = M_GetSaveGameDir("strife1.wad");
+
+    // fraggle 20130405: I_InitTimer is needed here for the netgame
+    // startup. Start low-level sound init here too.
+    I_InitTimer();
+    I_InitSound(strife);
+    I_InitMusic();
+
+    if(devparm) // [STRIFE]
+        printf ("NET_Init: Init network subsystem.\n");
+    NET_Init();
+    D_ConnectNetGame();
+
+    // haleyjd 20110210: Create Strife hub save folders
+    M_CreateSaveDirs(savegamedir);
+
+    I_GraphicsCheckCommandLine();
+
+    // haleyjd 20110206 [STRIFE] Startup the introduction sequence
+    D_InitIntroSequence();
+
+    // haleyjd 20110924: moved S_Init up to here
+    if(devparm) // [STRIFE]
+        DEH_printf("S_Init: Setting up sound.\n");
+    S_Init (sfxVolume * 8, musicVolume * 8, voiceVolume * 8); // [STRIFE]: voice
+    D_IntroTick(); // [STRIFE]
+
+    // Check for -file in shareware
+    if (modifiedgame)
+    {
+        // These are the lumps that will be checked in IWAD,
+        // if any one is not present, execution will be aborted.
+        // haleyjd 08/22/2010: [STRIFE] Check for Strife lumps.
+        char name[3][8]=
+        {
+            "map23", "map30", "ROB3E1"
+        };
+        int i;
+
+        // haleyjd 08/22/2010: [STRIFE] Changed string to match binary
+        // STRIFE-FIXME: Needs to test isdemoversion variable
+        if ( gamemode == shareware)
+            I_Error(DEH_String("\nYou cannot -file with the demo "
+                               "version. You must buy the real game!"));
+
+        // Check for fake IWAD with right name,
+        // but w/o all the lumps of the registered version. 
+        // STRIFE-FIXME: Needs to test isregistered variable
+        if (gamemode == registered)
+            for (i = 0; i < 3; i++)
+                if (W_CheckNumForName(name[i])<0)
+                    I_Error(DEH_String("\nThis is not the registered version."));
+    }
+    
+    D_IntroTick(); // [STRIFE]
+    
+    // get skill / episode / map from parms
+    startskill = sk_easy; // [STRIFE]: inits to sk_easy
+    startepisode = 1;
+    startmap = 1;
+    autostart = false;
+
+    //!
+    // @category game
+    // @arg <skill>
+    // @vanilla
+    //
+    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
+    // 0 disables all monsters.
+    //
+
+    p = M_CheckParmWithArgs("-skill", 1);
+
+    if (p)
+    {
+        startskill = myargv[p+1][0]-'1';
+        autostart = true;
+    }
+
+    // [STRIFE] no such thing in Strife
+    //
+    // // @category game
+    // // @arg <n>
+    // // @vanilla
+    // //
+    // // Start playing episode n (1-4).
+    // //
+
+    // p = M_CheckParmWithArgs("-episode", 1);
+
+    // if (p)
+    // {
+    //     startepisode = myargv[p+1][0]-'0';
+    //     startmap = 1;
+    //     autostart = true;
+    // }
+
+    timelimit = 0;
+
+    //! 
+    // @arg <n>
+    // @category net
+    // @vanilla
+    //
+    // For multiplayer games: exit each level after n minutes.
+    //
+
+    p = M_CheckParmWithArgs("-timer", 1);
+
+    if (p)
+    {
+        timelimit = atoi(myargv[p+1]);
+        printf("timer: %i\n", timelimit);
+    }
+
+    //!
+    // @category net
+    // @vanilla
+    //
+    // Austin Virtual Gaming: end levels after 20 minutes.
+    //
+
+    p = M_CheckParm ("-avg");
+
+    if (p)
+    {
+        timelimit = 20;
+    }
+
+    //!
+    // @category game
+    // @arg x
+    // @vanilla
+    //
+    // Start a game immediately, warping to level x.
+    //
+
+    p = M_CheckParmWithArgs("-warp", 1);
+
+    if (p)
+    {
+        if (gamemode == commercial)
+            startmap = atoi (myargv[p+1]);
+        else
+        {
+            startepisode = myargv[p+1][0]-'0';
+
+            if (p + 2 < myargc)
+            {
+                startmap = myargv[p+2][0]-'0';
+            }
+            else
+            {
+                startmap = 1;
+            }
+        }
+        autostart = true;
+    }
+
+    if (testcontrols)
+    {
+        startepisode = 1;
+        startmap = 3;
+        autostart = true;
+    }
+
+    // Check for load game parameter
+    // We do this here and save the slot number, so that the network code
+    // can override it or send the load slot to other players.
+
+    //!
+    // @category game
+    // @arg <s>
+    // @vanilla
+    //
+    // Load the game in slot s.
+    //
+
+    p = M_CheckParmWithArgs("-loadgame", 1);
+    
+    if (p)
+    {
+        startloadgame = atoi(myargv[p+1]);
+    }
+    else
+    {
+        // Not loading a game
+        startloadgame = -1;
+    }
+
+    if (W_CheckNumForName("SS_START") >= 0
+     || W_CheckNumForName("FF_END") >= 0)
+    {
+        I_PrintDivider();
+        printf(" WARNING: The loaded WAD file contains modified sprites or\n"
+               " floor textures.  You may want to use the '-merge' command\n"
+               " line option instead of '-file'.\n");
+    }
+
+    I_PrintStartupBanner(gamedescription);
+    PrintDehackedBanners();
+
+    // haleyjd 08/28/10: Init Choco Strife stuff.
+    D_InitChocoStrife();
+
+    // haleyjd 08/22/2010: [STRIFE] Modified string to match binary
+    if(devparm) // [STRIFE]
+       DEH_printf("R_Init: Loading Graphics - ");
+    R_Init ();
+    D_IntroTick(); // [STRIFE]
+
+    if(devparm) // [STRIFE]
+        DEH_printf("\nP_Init: Init Playloop state.\n");
+    P_Init ();
+    D_IntroTick(); // [STRIFE]
+
+    if(devparm) // [STRIFE]
+        DEH_printf("I_Init: Setting up machine state.\n");
+    I_CheckIsScreensaver();
+    I_InitJoystick();
+    D_IntroTick(); // [STRIFE]
+
+    D_IntroTick(); // [STRIFE]
+
+    if(devparm) // [STRIFE]
+        DEH_printf("M_Init: Init Menu.\n");
+    M_Init ();
+    D_IntroTick(); // [STRIFE]
+
+    // haleyjd 20110924: Moved S_Init up.
+    D_IntroTick();
+
+    // haleyjd 20110220: This stuff was done in I_StartupSound in vanilla, but 
+    // we'll do it here instead so we don't have to modify the low-level shared
+    // code with Strife-specific stuff.
+
+    //!
+    // @vanilla
+    //
+    // Disable voice dialog and show dialog as text instead,
+    // even if voices.wad can be found.
+    //
+
+    if(disable_voices || M_CheckParm("-novoice"))
+    {
+        dialogshowtext = disable_voices = 1;
+    }
+
+    if(devparm)
+        DEH_printf("  Play voices = %d\n", disable_voices == 0);
+
+    if(devparm) // [STRIFE]
+        DEH_printf("D_CheckNetGame: Checking network game status.\n");
+    D_CheckNetGame ();
+
+    PrintGameVersion();
+
+    if(devparm)
+        DEH_printf("HU_Init: Setting up heads up display.\n");
+    HU_Init ();
+    D_IntroTick(); // [STRIFE]
+
+    if(devparm)
+        DEH_printf("ST_Init: Init status bar.\n");
+    ST_Init ();
+    D_IntroTick(); // [STRIFE]
+
+    // haleyjd [STRIFE] -statcopy used to be here...
+    D_IntroTick(); // [STRIFE]
+
+    // If Doom II without a MAP01 lump, this is a store demo.  
+    // Moved this here so that MAP01 isn't constantly looked up
+    // in the main loop.
+    // haleyjd 08/23/2010: [STRIFE] There is no storedemo version of Strife
+    /*
+    if (gamemode == commercial && W_CheckNumForName("map01") < 0)
+        storedemo = true;
+    */
+
+    //!
+    // @arg <x>
+    // @category demo
+    // @vanilla
+    //
+    // Record a demo named x.lmp.
+    //
+
+    p = M_CheckParmWithArgs("-record", 1);
+
+    if (p)
+    {
+        G_RecordDemo (myargv[p+1]);
+        autostart = true;
+    }
+    D_IntroTick(); // [STRIFE]
+
+    p = M_CheckParmWithArgs("-playdemo", 1);
+    if (p)
+    {
+        singledemo = true;              // quit after one demo
+        G_DeferedPlayDemo (demolumpname);
+        D_DoomLoop ();  // never returns
+    }
+    D_IntroTick(); // [STRIFE]
+
+    p = M_CheckParmWithArgs("-timedemo", 1);
+    if (p)
+    {
+        G_TimeDemo (demolumpname);
+        D_DoomLoop ();  // never returns
+    }
+    D_IntroTick(); // [STRIFE]
+
+    if (startloadgame >= 0)
+    {
+        // [STRIFE]: different, for hubs
+        M_LoadSelect(startloadgame);
+    }
+    D_IntroTick(); // [STRIFE]
+
+
+    if (gameaction != ga_loadgame )
+    {
+        if (autostart || netgame)
+            G_InitNew (startskill, startmap);
+        else
+            D_StartTitle ();                // start up intro loop
+    }
+
+    if (using_text_startup)
+    {
+        TXT_Shutdown();
+    }
+
+    D_DoomLoop ();  // never returns
+}
diff --git a/games/NXDoom/src/strife/d_main.h b/games/NXDoom/src/strife/d_main.h
new file mode 100644
index 000000000..22f55488d
--- /dev/null
+++ b/games/NXDoom/src/strife/d_main.h
@@ -0,0 +1,64 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __D_MAIN__
+#define __D_MAIN__
+
+#include "doomdef.h"
+
+#include "v_patch.h"
+
+
+// Read events from all input devices
+
+void D_ProcessEvents (void); 
+	
+
+//
+// BASE LEVEL
+//
+void D_PageTicker (void);
+void D_PageDrawer (void);
+void D_AdvanceDemo (void);
+void D_DoAdvanceDemo (void);
+void D_StartTitle (void);
+void D_QuitGame (void); // [STRIFE]
+
+void D_IntroTick(void); // [STRIFE]
+
+boolean D_PatchClipCallback(patch_t *patch, int x, int y); // [STRIFE]
+
+
+//
+// GLOBAL VARIABLES
+//
+
+extern  gameaction_t    gameaction;
+extern  boolean         isregistered;   // villsa [STRIFE]
+extern  boolean        isdemoversion;  // haleyjd [STRIFE]
+extern  boolean         stonecold;      // villsa [STRIFE]
+extern  boolean         workparm;       // villsa [STRIFE]
+extern boolean advancedemo;
+
+// haleyjd 20130915 [STRIFE]: need nickname
+extern char *nickname;
+
+
+#endif
+
diff --git a/games/NXDoom/src/strife/d_net.c b/games/NXDoom/src/strife/d_net.c
new file mode 100644
index 000000000..26d807830
--- /dev/null
+++ b/games/NXDoom/src/strife/d_net.c
@@ -0,0 +1,290 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM Network game communication and protocol,
+//	all OS independend parts.
+//
+
+#include <stdlib.h>
+
+#include "d_main.h"
+#include "m_argv.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "g_game.h"
+#include "doomdef.h"
+#include "doomstat.h"
+#include "w_checksum.h"
+
+#include "deh_main.h"
+
+#include "d_loop.h"
+
+ticcmd_t *netcmds;
+
+// Called when a player leaves the game
+
+static void PlayerQuitGame(player_t *player)
+{
+    static char exitmsg[80];
+    unsigned int player_num;
+
+    player_num = player - players;
+
+    // Do this the same way as Vanilla Doom does, to allow dehacked
+    // replacements of this message
+
+    M_StringCopy(exitmsg, DEH_String("Player 1 left the game"),
+                 sizeof(exitmsg));
+
+    exitmsg[7] += player_num;
+
+    playeringame[player_num] = false;
+    players[consoleplayer].message = exitmsg;
+
+    // TODO: check if it is sensible to do this:
+
+    if (demorecording) 
+    {
+        G_CheckDemoStatus ();
+    }
+}
+
+static void RunTic(ticcmd_t *cmds, boolean *ingame)
+{
+    unsigned int i;
+
+    // Check for player quits.
+
+    for (i = 0; i < MAXPLAYERS; ++i)
+    {
+        if (!demoplayback && playeringame[i] && !ingame[i])
+        {
+            PlayerQuitGame(&players[i]);
+        }
+    }
+
+    netcmds = cmds;
+
+    // check that there are players in the game.  if not, we cannot
+    // run a tic.
+
+    if (advancedemo)
+        D_DoAdvanceDemo ();
+
+    M_Ticker();
+    G_Ticker();
+}
+
+static void NullMenuTicker()
+{
+    // no-op.
+}
+
+static loop_interface_t strife_loop_interface = {
+    D_ProcessEvents,
+    G_BuildTiccmd,
+    RunTic,
+    NullMenuTicker
+};
+
+
+// Load game settings from the specified structure and 
+// set global variables.
+
+static void LoadGameSettings(net_gamesettings_t *settings)
+{
+    unsigned int i;
+
+    deathmatch = settings->deathmatch;
+    ticdup = settings->ticdup;
+    startepisode = settings->episode;
+    startmap = settings->map;
+    startskill = settings->skill;
+    startloadgame = settings->loadgame;
+    lowres_turn = settings->lowres_turn;
+    nomonsters = settings->nomonsters;
+    fastparm = settings->fast_monsters;
+    respawnparm = settings->respawn_monsters;
+    timelimit = settings->timelimit;
+    consoleplayer = settings->consoleplayer;
+    randomparm = settings->random;
+
+    if (lowres_turn)
+    {
+        printf("NOTE: Turning resolution is reduced; this is probably "
+               "because there is a client recording a Vanilla demo.\n");
+    }
+
+    for (i = 0; i < MAXPLAYERS; ++i)
+    {
+        playeringame[i] = i < settings->num_players;
+    }
+}
+
+// Save the game settings from global variables to the specified
+// game settings structure.
+
+static void SaveGameSettings(net_gamesettings_t *settings)
+{
+    // Fill in game settings structure with appropriate parameters
+    // for the new game
+
+    settings->deathmatch = deathmatch;
+    settings->episode = startepisode;
+    settings->map = startmap;
+    settings->skill = startskill;
+    settings->loadgame = startloadgame;
+    settings->gameversion = gameversion;
+    settings->nomonsters = nomonsters;
+    settings->fast_monsters = fastparm;
+    settings->respawn_monsters = respawnparm;
+    settings->timelimit = timelimit;
+    settings->random = randomparm;
+
+    settings->lowres_turn = M_ParmExists("-record")
+                         && !M_ParmExists("-longtics");
+}
+
+static void InitConnectData(net_connect_data_t *connect_data)
+{
+    connect_data->drone = false;
+    connect_data->max_players = MAXPLAYERS;
+
+    //!
+    // @category net
+    //
+    // Run as the left screen in three screen mode.
+    //
+
+    if (M_CheckParm("-left") > 0)
+    {
+        viewangleoffset = ANG90;
+        connect_data->drone = true;
+    }
+
+    //! 
+    // @category net
+    //
+    // Run as the right screen in three screen mode.
+    //
+
+    if (M_CheckParm("-right") > 0)
+    {
+        viewangleoffset = ANG270;
+        connect_data->drone = true;
+    }
+
+    //
+    // Connect data
+    //
+
+    // Game type fields:
+
+    connect_data->gamemode = gamemode;
+    connect_data->gamemission = gamemission;
+
+    // Are we recording a demo? Possibly set lowres turn mode
+
+    connect_data->lowres_turn = M_CheckParm("-record") > 0
+                             && M_CheckParm("-longtics") == 0;
+
+    // Read checksums of our WAD directory and dehacked information
+
+    W_Checksum(connect_data->wad_sha1sum);
+    DEH_Checksum(connect_data->deh_sha1sum);
+
+    connect_data->is_freedoom = 0;
+}
+
+void D_ConnectNetGame(void)
+{
+    net_connect_data_t connect_data;
+
+    InitConnectData(&connect_data);
+    netgame = D_InitNetGame(&connect_data);
+
+    //!
+    // @category net
+    //
+    // Start the game playing as though in a netgame with a single
+    // player.  This can also be used to play back single player netgame
+    // demos.
+    //
+
+    if (M_CheckParm("-solo-net") > 0)
+    {
+        netgame = true;
+    }
+}
+
+//
+// D_CheckNetGame
+// Works out player numbers among the net participants
+//
+void D_CheckNetGame(void)
+{
+    net_gamesettings_t settings;
+
+    D_RegisterLoopCallbacks(&strife_loop_interface);
+
+    if (netgame)
+    {
+        autostart = true;
+    }
+
+    SaveGameSettings(&settings);
+    D_StartNetGame(&settings, NULL);
+    LoadGameSettings(&settings);
+
+    // Strife games are always deathmatch, though -altdeath is
+    // supported for respawning items.
+
+    if (netgame && deathmatch == 0)
+    {
+        deathmatch = 1;
+    }
+
+    DEH_printf("startmap: %i, skill: %i, enemies: %i, random: %i\n",
+               startmap, startskill, !nomonsters, randomparm);
+
+
+    DEH_printf("player %i of %i (%i nodes)\n",
+               consoleplayer+1, settings.num_players, settings.num_players);
+
+    // Show players here; the server might have specified a time limit
+
+    if (timelimit > 0 && deathmatch)
+    {
+        // Gross hack to work like Vanilla:
+
+        if (timelimit == 20 && M_CheckParm("-avg"))
+        {
+            DEH_printf("Austin Virtual Gaming: Levels will end "
+                           "after 20 minutes\n");
+        }
+        else
+        {
+            DEH_printf("Levels will end after %d minute", timelimit);
+            if (timelimit > 1)
+                printf("s");
+            printf(".\n");
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/strife/d_player.h b/games/NXDoom/src/strife/d_player.h
new file mode 100644
index 000000000..1f5b4ec00
--- /dev/null
+++ b/games/NXDoom/src/strife/d_player.h
@@ -0,0 +1,249 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//
+
+
+#ifndef __D_PLAYER__
+#define __D_PLAYER__
+
+
+// The player data structure depends on a number
+// of other structs: items (internal inventory),
+// animation states (closely tied to the sprites
+// used to represent them, unfortunately).
+#include "d_items.h"
+#include "p_pspr.h"
+
+// In addition, the player is just a special
+// case of the generic moving object/actor.
+#include "p_mobj.h"
+
+// Finally, for odd reasons, the player input
+// is buffered within the player data struct,
+// as commands per game tick.
+#include "d_ticcmd.h"
+
+#include "net_defs.h"
+
+
+
+
+//
+// Player states.
+//
+typedef enum
+{
+    // Playing or camping.
+    PST_LIVE,
+    // Dead on the ground, view follows killer.
+    PST_DEAD,
+    // Ready to restart/respawn???
+    PST_REBORN		
+
+} playerstate_t;
+
+
+//
+// Player internal flags, for cheats and debug.
+//
+typedef enum
+{
+    // No clipping, walk through barriers.
+    CF_NOCLIP		= 1,
+    // No damage, no health loss.
+    CF_GODMODE		= 2,
+    // Not really a cheat, just a debug aid.
+    CF_NOMOMENTUM	= 4,
+    // villsa [STRIFE] new cheat
+    // set when on fire and disable inventory
+    CF_ONFIRE           = 8,
+    // villsa [STRIFE] new cheat
+    // auto-use medkits
+    CF_AUTOHEALTH       = 16
+
+} cheat_t;
+
+// haleyjd 08/30/10: [STRIFE]
+// Player Inventory Item Structure
+typedef struct inventory_s
+{
+    int sprite; // a sprite number
+    int type;   // a thing type
+    int amount; // amount being carried
+} inventory_t;
+
+#define NUMINVENTORY 32
+
+//
+// Extended player object info: player_t
+//
+// haleyjd 08/30/10: [STRIFE]
+// * Transformed to match binary structure layout.
+//
+typedef struct player_s
+{
+    mobj_t*		mo;
+    playerstate_t	playerstate;
+    ticcmd_t		cmd;
+
+    // Determine POV,
+    //  including viewpoint bobbing during movement.
+    // Focal origin above r.z
+    fixed_t		viewz;
+    // Base height above floor for viewz.
+    fixed_t		viewheight;
+    // Bob/squat speed.
+    fixed_t         	deltaviewheight;
+    // bounded/scaled total momentum.
+    fixed_t         	bob;	
+
+    // This is only used between levels,
+    // mo->health is used during levels.
+    int			health;	
+    short		armorpoints; // [STRIFE] Changed to short
+    // Armor type is 0-2.
+    short		armortype;   // [STRIFE] Changed to short
+
+    // Power ups. invinc and invis are tic counters.
+    int			powers[NUMPOWERS];
+
+    // [STRIFE] Additions:
+    int			sigiltype;               // Type of Sigil carried
+    int			nukagecount;             // Nukage exposure counter
+    int			questflags;              // Quest bit flags
+    int			pitch;                   // Up/down look angle
+    boolean		centerview;              // True if view should be centered
+    inventory_t		inventory[NUMINVENTORY]; // Player inventory items
+    boolean		st_update;               // If true, update status bar
+    short		numinventory;            // Num. active inventory items
+    short		inventorycursor;         // Selected inventory item
+    short		accuracy;                // Accuracy stat
+    short		stamina;                 // Stamina stat
+    
+    boolean		cards[NUMCARDS];
+    boolean		backpack;
+
+    // True if button down last tic.
+    int			attackdown;
+    int			usedown;
+    int			inventorydown;   // [STRIFE] Use inventory item
+    
+    // Frags, kills of other players.
+    int			frags[MAXPLAYERS];
+    weapontype_t	readyweapon;
+    
+    // Is wp_nochange if not changing.
+    weapontype_t	pendingweapon;
+
+    boolean		weaponowned[NUMWEAPONS];
+    int			ammo[NUMAMMO];
+    int			maxammo[NUMAMMO];
+
+    // Bit flags, for cheats and debug.
+    // See cheat_t, above.
+    int			cheats;
+
+    // Refired shots are less accurate.
+    int			refire;
+
+     // For intermission stats.
+    short		killcount;    // [STRIFE] Changed to short
+    //int		itemcount;    // [STRIFE] Eliminated these.
+    //int		secretcount;
+
+    // Hint messages.
+    const char		*message;
+    
+    // For screen flashing (red or bright).
+    int			damagecount;
+    int			bonuscount;
+
+    // Who did damage (NULL for floors/ceilings).
+    mobj_t*		attacker;
+    
+    // So gun flashes light up areas.
+    int			extralight;
+
+    // Current PLAYPAL, ???
+    //  can be set to REDCOLORMAP for pain, etc.
+    int			fixedcolormap;
+
+    // Player skin colorshift,
+    //  0-3 for which color to draw player.
+    //int			colormap; [STRIFE] no such? or did it become the below?
+
+    // [STRIFE] For use of teleport beacons
+    short		allegiance;  
+
+    // Overlay view sprites (gun, etc).
+    pspdef_t		psprites[NUMPSPRITES];
+
+    // [STRIFE] Inefficient means of tracking automap state on all maps
+    boolean		mapstate[40];
+
+    // True if secret level has been done.
+    //boolean		didsecret;   [STRIFE] Removed this.
+
+} player_t;
+
+
+//
+// INTERMISSION
+// Structure passed e.g. to WI_Start(wb)
+//
+typedef struct
+{
+    boolean	in;	// whether the player is in game
+    
+    // Player stats, kills, collected items etc.
+    int		skills;
+    int		sitems;
+    int		ssecret;
+    int		stime; 
+    int		frags[4];
+    int		score;	// current score on entry, modified on return
+  
+} wbplayerstruct_t;
+
+typedef struct
+{
+    int		epsd;	// episode # (0-2)
+
+    // if true, splash the secret level
+    boolean	didsecret;
+    
+    // previous and next levels, origin 0
+    int		last;
+    int		next;	
+    
+    int		maxkills;
+    int		maxitems;
+    int		maxsecret;
+    int		maxfrags;
+
+    // the par time
+    int		partime;
+    
+    // index of this player in game
+    int		pnum;	
+
+    wbplayerstruct_t	plyr[MAXPLAYERS];
+
+} wbstartstruct_t;
+
+
+#endif
diff --git a/games/NXDoom/src/strife/d_textur.h b/games/NXDoom/src/strife/d_textur.h
new file mode 100644
index 000000000..1afe040eb
--- /dev/null
+++ b/games/NXDoom/src/strife/d_textur.h
@@ -0,0 +1,43 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Typedefs related to to textures etc.,
+//	 isolated here to make it easier separating modules.
+//    
+
+
+#ifndef __D_TEXTUR__
+#define __D_TEXTUR__
+
+#include "doomtype.h"
+
+
+
+
+//
+// Flats?
+//
+// a pic is an unmasked block of pixels
+typedef struct
+{
+    byte		width;
+    byte		height;
+    byte		data;
+} pic_t;
+
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/d_think.h b/games/NXDoom/src/strife/d_think.h
new file mode 100644
index 000000000..0966ad960
--- /dev/null
+++ b/games/NXDoom/src/strife/d_think.h
@@ -0,0 +1,68 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  MapObj data. Map Objects or mobjs are actors, entities,
+//  thinker, take-your-pick... anything that moves, acts, or
+//  suffers state changes of more or less violent nature.
+//
+
+
+#ifndef __D_THINK__
+#define __D_THINK__
+
+
+
+
+
+//
+// Experimental stuff.
+// To compile this as "ANSI C with classes"
+//  we will need to handle the various
+//  action functions cleanly.
+//
+typedef  void (*actionf_v)();
+typedef  void (*actionf_p1)( void* );
+typedef  void (*actionf_p2)( void*, void* );
+
+typedef union
+{
+  actionf_v	acv;
+  actionf_p1	acp1;
+  actionf_p2	acp2;
+
+} actionf_t;
+
+
+
+
+
+// Historically, "think_t" is yet another
+//  function pointer to a routine to handle
+//  an actor.
+typedef actionf_t  think_t;
+
+
+// Doubly linked list of actors.
+typedef struct thinker_s
+{
+    struct thinker_s*	prev;
+    struct thinker_s*	next;
+    think_t		function;
+    
+} thinker_t;
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/deh_ammo.c b/games/NXDoom/src/strife/deh_ammo.c
new file mode 100644
index 000000000..dd8bee546
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_ammo.c
@@ -0,0 +1,103 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Ammo" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomdef.h"
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "p_local.h"
+
+static void *DEH_AmmoStart(deh_context_t *context, char *line)
+{
+    int ammo_number = 0;
+
+    if (sscanf(line, "Ammo %i", &ammo_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (ammo_number < 0 || ammo_number >= NUMAMMO)
+    {
+        DEH_Warning(context, "Invalid ammo number: %i", ammo_number);
+        return NULL;
+    }
+    
+    return &maxammo[ammo_number];
+}
+
+static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    int ivalue;
+    int ammo_number;
+
+    if (tag == NULL)
+        return;
+
+    ammo_number = ((int *) tag) - maxammo;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    // maxammo
+
+    if (!strcasecmp(variable_name, "Per ammo"))
+        clipammo[ammo_number] = ivalue;
+    else if (!strcasecmp(variable_name, "Max ammo"))
+        maxammo[ammo_number] = ivalue;
+    else
+    {
+        DEH_Warning(context, "Field named '%s' not found", variable_name);
+    }
+}
+
+static void DEH_AmmoSHA1Hash(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        SHA1_UpdateInt32(context, clipammo[i]);
+        SHA1_UpdateInt32(context, maxammo[i]);
+    }
+}
+
+deh_section_t deh_section_ammo =
+{
+    "Ammo",
+    NULL,
+    DEH_AmmoStart,
+    DEH_AmmoParseLine,
+    NULL,
+    DEH_AmmoSHA1Hash,
+};
+
diff --git a/games/NXDoom/src/strife/deh_cheat.c b/games/NXDoom/src/strife/deh_cheat.c
new file mode 100644
index 000000000..78e037f66
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_cheat.c
@@ -0,0 +1,148 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Cheat" sections in dehacked files
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "am_map.h"
+#include "st_stuff.h"
+
+typedef struct 
+{
+    const char *name;
+    cheatseq_t *seq;
+} deh_cheat_t;
+
+static deh_cheat_t allcheats[] =
+{
+    // haleyjd 20110224: filled in all cheats
+    {"Change music",        &cheat_mus },
+    {"Level Warp",          &cheat_clev },
+    {"Stealth Boots",       &cheat_stealth },
+    {"Sigil piece",         &cheat_lego },
+    {"FPS",                 &cheat_mypos },
+    {"TeleportMapSpot",     &cheat_scoot },
+    {"Gold&StatTokens",     &cheat_midas },
+    {"God mode",            &cheat_god },
+    {"Keys",                &cheat_keys },
+    {"Weapons & Ammo",      &cheat_ammo },
+    {"Massacre",            &cheat_nuke },
+    {"No Clipping",         &cheat_noclip },
+    {"Berserk",             &cheat_powerup[0] },
+    {"Invisibility",        &cheat_powerup[1] },
+    {"Enviro Suit",         &cheat_powerup[2] },
+    {"Health",              &cheat_powerup[3] },
+    {"Backpack",            &cheat_powerup[4] },
+    // STRIFE-FIXME/TODO: Does SeHackEd not support PUMPUP{S,T,nil}, or "DOTS" ?
+};
+
+static deh_cheat_t *FindCheatByName(char *name)
+{
+    size_t i;
+    
+    for (i=0; i<arrlen(allcheats); ++i)
+    {
+        if (!strcasecmp(allcheats[i].name, name))
+            return &allcheats[i];
+    }
+
+    return NULL;
+}
+
+static void *DEH_CheatStart(deh_context_t *context, char *line)
+{
+    return NULL;
+}
+
+static void DEH_CheatParseLine(deh_context_t *context, char *line, void *tag)
+{
+    deh_cheat_t *cheat;
+    char *variable_name;
+    char *value;
+    unsigned char *unsvalue;
+    unsigned int i;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    unsvalue = (unsigned char *) value;
+
+    cheat = FindCheatByName(variable_name);
+
+    if (cheat == NULL)
+    {
+        DEH_Warning(context, "Unknown cheat '%s'", variable_name);
+        return;
+    }
+
+    // write the value into the cheat sequence
+
+    i = 0;
+
+    while (unsvalue[i] != 0 && unsvalue[i] != 0xff)
+    {
+        // If the cheat length exceeds the Vanilla limit, stop.  This
+        // does not apply if we have the limit turned off.
+
+        if (!deh_allow_long_cheats && i >= cheat->seq->sequence_len)
+        {
+            DEH_Warning(context, "Cheat sequence longer than supported by "
+                                 "Vanilla dehacked");
+            break;
+        }
+
+        if (deh_apply_cheats)
+        {
+            cheat->seq->sequence[i] = unsvalue[i];
+        }
+        ++i;
+
+        // Absolute limit - don't exceed
+
+        if (i >= MAX_CHEAT_LEN - cheat->seq->parameter_chars)
+        {
+            DEH_Error(context, "Cheat sequence too long!");
+            return;
+        }
+    }
+
+    if (deh_apply_cheats)
+    {
+        cheat->seq->sequence[i] = '\0';
+    }
+}
+
+deh_section_t deh_section_cheat =
+{
+    "Cheat",
+    NULL,
+    DEH_CheatStart,
+    DEH_CheatParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/strife/deh_frame.c b/games/NXDoom/src/strife/deh_frame.c
new file mode 100644
index 000000000..c36f3e34c
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_frame.c
@@ -0,0 +1,159 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Frame" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "d_items.h"
+#include "info.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+DEH_BEGIN_MAPPING(state_mapping, state_t)
+  DEH_MAPPING("Sprite number",    sprite)
+  DEH_MAPPING("Sprite subnumber", frame)
+  DEH_MAPPING("Duration",         tics)
+  DEH_MAPPING("Next frame",       nextstate)
+  DEH_UNSUPPORTED_MAPPING("Action pointer")
+DEH_END_MAPPING
+
+static void *DEH_FrameStart(deh_context_t *context, char *line)
+{
+    int frame_number = 0;
+    state_t *state;
+    
+    if (sscanf(line, "Frame %i", &frame_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+    
+    if (frame_number < 0 || frame_number >= NUMSTATES)
+    {
+        DEH_Warning(context, "Invalid frame number: %i", frame_number);
+        return NULL;
+    }
+
+    if (frame_number >= DEH_VANILLA_NUMSTATES) 
+    {
+        DEH_Warning(context, "Attempt to modify frame %i: this will cause "
+                             "problems in Vanilla dehacked.", frame_number);
+    }
+
+    state = &states[frame_number];
+
+    return state;
+}
+
+// Simulate a frame overflow: Doom has 967 frames in the states[] array, but
+// DOS dehacked internally only allocates memory for 966.  As a result, 
+// attempts to set frame 966 (the last frame) will overflow the dehacked
+// array and overwrite the weaponinfo[] array instead.
+//
+// This is noticable in Batman Doom where it is impossible to switch weapons
+// away from the fist once selected.
+
+static void DEH_FrameOverflow(deh_context_t *context, char *varname, int value)
+{
+    if (!strcasecmp(varname, "Duration"))
+    {
+        weaponinfo[0].ammo = value;
+    }
+    else if (!strcasecmp(varname, "Codep frame")) 
+    {
+        weaponinfo[0].upstate = value;
+    }
+    else if (!strcasecmp(varname, "Next frame")) 
+    {
+        weaponinfo[0].downstate = value;
+    }
+    else if (!strcasecmp(varname, "Unknown 1"))
+    {
+        weaponinfo[0].readystate = value;
+    }
+    else if (!strcasecmp(varname, "Unknown 2"))
+    {
+        weaponinfo[0].atkstate = value;
+    }
+    else
+    {
+        DEH_Error(context, "Unable to simulate frame overflow: field '%s'",
+                  varname);
+    }
+}
+
+static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
+{
+    state_t *state;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    state = (state_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    if (state == &states[NUMSTATES - 1])
+    {
+        DEH_FrameOverflow(context, variable_name, ivalue);
+    }
+    else
+    {
+        // set the appropriate field
+
+        DEH_SetMapping(context, &state_mapping, state, variable_name, ivalue);
+    }
+}
+
+static void DEH_FrameSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
+    }
+}
+
+deh_section_t deh_section_frame =
+{
+    "Frame",
+    NULL,
+    DEH_FrameStart,
+    DEH_FrameParseLine,
+    NULL,
+    DEH_FrameSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/strife/deh_misc.c b/games/NXDoom/src/strife/deh_misc.c
new file mode 100644
index 000000000..7c78658b7
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_misc.c
@@ -0,0 +1,228 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Misc" sections in dehacked files
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+#include "deh_misc.h"
+
+// Dehacked: "Initial Health" 
+// This is the initial health a player has when starting anew.
+// See G_PlayerReborn in g_game.c
+
+int deh_initial_health = DEH_DEFAULT_INITIAL_HEALTH;
+
+// Dehacked: "Initial bullets"
+// This is the number of bullets the player has when starting anew.
+// See G_PlayerReborn in g_game.c
+
+int deh_initial_bullets = DEH_DEFAULT_INITIAL_BULLETS;
+
+// Dehacked: "Max Health"
+// This is the maximum health that can be reached using medikits 
+// alone.  See P_TouchSpecialThing in p_inter.c
+
+int deh_max_health = DEH_DEFAULT_MAX_HEALTH;
+
+// Dehacked: "Max Armor"
+// This is the maximum armor which can be reached by picking up
+// armor helmets. See P_TouchSpecialThing in p_inter.c
+
+int deh_max_armor = DEH_DEFAULT_MAX_ARMOR;
+
+// Dehacked: "Green Armor Class"
+// This is the armor class that is given when picking up the green 
+// armor or an armor helmet. See P_TouchSpecialThing in p_inter.c
+//
+// DOS dehacked only modifies the behavior of the green armor shirt,
+// the armor class set by armor helmets is not affected.
+
+int deh_green_armor_class = DEH_DEFAULT_GREEN_ARMOR_CLASS;
+
+// Dehacked: "Blue Armor Class"
+// This is the armor class that is given when picking up the blue 
+// armor or a megasphere. See P_TouchSpecialThing in p_inter.c
+//
+// DOS dehacked only modifies the MegaArmor behavior and not
+// the MegaSphere, which always gives armor type 2.
+
+int deh_blue_armor_class = DEH_DEFAULT_BLUE_ARMOR_CLASS;
+
+// Dehacked: "Max soulsphere"
+// The maximum health which can be reached by picking up the
+// soulsphere.  See P_TouchSpecialThing in p_inter.c
+
+int deh_max_soulsphere = DEH_DEFAULT_MAX_SOULSPHERE;
+
+// Dehacked: "Soulsphere health"
+// The amount of health bonus that picking up a soulsphere
+// gives.  See P_TouchSpecialThing in p_inter.c
+
+int deh_soulsphere_health = DEH_DEFAULT_SOULSPHERE_HEALTH;
+
+// Dehacked: "Megasphere health"
+// This is what the health is set to after picking up a 
+// megasphere.  See P_TouchSpecialThing in p_inter.c
+
+int deh_megasphere_health = DEH_DEFAULT_MEGASPHERE_HEALTH;
+
+// Dehacked: "God mode health"
+// This is what the health value is set to when cheating using
+// the IDDQD god mode cheat.  See ST_Responder in st_stuff.c
+
+int deh_god_mode_health = DEH_DEFAULT_GOD_MODE_HEALTH;
+
+// Dehacked: "IDFA Armor"
+// This is what the armor is set to when using the IDFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idfa_armor = DEH_DEFAULT_IDFA_ARMOR;
+
+// Dehacked: "IDFA Armor Class"
+// This is what the armor class is set to when using the IDFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idfa_armor_class = DEH_DEFAULT_IDFA_ARMOR_CLASS;
+
+// Dehacked: "IDKFA Armor"
+// This is what the armor is set to when using the IDKFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idkfa_armor = DEH_DEFAULT_IDKFA_ARMOR;
+
+// Dehacked: "IDKFA Armor Class"
+// This is what the armor class is set to when using the IDKFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idkfa_armor_class = DEH_DEFAULT_IDKFA_ARMOR_CLASS;
+
+// Dehacked: "BFG Cells/Shot"
+// This is the number of CELLs firing the BFG uses up.
+// See P_CheckAmmo and A_FireBFG in p_pspr.c
+
+int deh_bfg_cells_per_shot = DEH_DEFAULT_BFG_CELLS_PER_SHOT;
+
+// Dehacked: "Monsters infight"
+// This controls whether monsters can harm other monsters of the same 
+// species.  For example, whether an imp fireball will damage other
+// imps.  The value of this in dehacked patches is weird - '202' means
+// off, while '221' means on.
+//
+// See PIT_CheckThing in p_map.c
+
+int deh_species_infighting = DEH_DEFAULT_SPECIES_INFIGHTING;
+
+static struct
+{
+    const char *deh_name;
+    int *value;
+} misc_settings[] = {
+    {"Initial Health",      &deh_initial_health},
+    {"Initial Bullets",     &deh_initial_bullets},
+    {"Max Health",          &deh_max_health},
+    {"Max Armor",           &deh_max_armor},
+    {"LeatherArmorClass",   &deh_green_armor_class},
+    {"Metal Armor Class",   &deh_blue_armor_class},
+    {"Max Soulsphere",      &deh_max_soulsphere},
+    {"Soulsphere Health",   &deh_soulsphere_health},
+    {"Megasphere Health",   &deh_megasphere_health},
+    {"God Mode Health",     &deh_god_mode_health},
+    {"IDFA Armor",          &deh_idfa_armor},
+    {"IDFA Armor Class",    &deh_idfa_armor_class},
+    {"IDKFA Armor",         &deh_idkfa_armor},
+    {"IDKFA Armor Class",   &deh_idkfa_armor_class},
+    {"Mauler Cells/Shot",   &deh_bfg_cells_per_shot},
+};
+
+static void *DEH_MiscStart(deh_context_t *context, char *line)
+{
+    return NULL;
+}
+
+static void DEH_MiscParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    int ivalue;
+    size_t i;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    if (!strcasecmp(variable_name, "Monsters Infight"))
+    {
+        // See notes above.
+ 
+        if (ivalue == 202)
+        {
+            deh_species_infighting = 0;
+        }
+        else if (ivalue == 221)
+        {
+            deh_species_infighting = 1;
+        }
+        else
+        {
+            DEH_Warning(context, 
+                        "Invalid value for 'Monsters Infight': %i", ivalue);
+        }
+
+        return;
+    }
+
+    for (i=0; i<arrlen(misc_settings); ++i)
+    {
+        if (!strcasecmp(variable_name, misc_settings[i].deh_name))
+        {
+            *misc_settings[i].value = ivalue;
+            return;
+        }
+    }
+
+    DEH_Warning(context, "Unknown Misc variable '%s'", variable_name);
+}
+
+static void DEH_MiscSHA1Sum(sha1_context_t *context)
+{
+    unsigned int i;
+
+    for (i=0; i<arrlen(misc_settings); ++i)
+    {
+        SHA1_UpdateInt32(context, *misc_settings[i].value);
+    }
+}
+
+deh_section_t deh_section_misc =
+{
+    "Misc",
+    NULL,
+    DEH_MiscStart,
+    DEH_MiscParseLine,
+    NULL,
+    DEH_MiscSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/strife/deh_misc.h b/games/NXDoom/src/strife/deh_misc.h
new file mode 100644
index 000000000..f29428f55
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_misc.h
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Misc" sections in dehacked files
+//
+
+#ifndef DEH_MISC_H
+#define DEH_MISC_H
+
+#define DEH_DEFAULT_INITIAL_HEALTH 100
+#define DEH_DEFAULT_INITIAL_BULLETS 50
+#define DEH_DEFAULT_MAX_HEALTH 200
+#define DEH_DEFAULT_MAX_ARMOR 200
+#define DEH_DEFAULT_GREEN_ARMOR_CLASS 1
+#define DEH_DEFAULT_BLUE_ARMOR_CLASS 2
+#define DEH_DEFAULT_MAX_SOULSPHERE 200
+#define DEH_DEFAULT_SOULSPHERE_HEALTH 100
+#define DEH_DEFAULT_MEGASPHERE_HEALTH 200
+#define DEH_DEFAULT_GOD_MODE_HEALTH 100
+#define DEH_DEFAULT_IDFA_ARMOR 200
+#define DEH_DEFAULT_IDFA_ARMOR_CLASS 2
+#define DEH_DEFAULT_IDKFA_ARMOR 200
+#define DEH_DEFAULT_IDKFA_ARMOR_CLASS 2
+#define DEH_DEFAULT_BFG_CELLS_PER_SHOT 40
+#define DEH_DEFAULT_SPECIES_INFIGHTING 0
+
+extern int deh_initial_health;
+extern int deh_initial_bullets;
+extern int deh_max_health;
+extern int deh_max_armor;
+extern int deh_green_armor_class;
+extern int deh_blue_armor_class;
+extern int deh_max_soulsphere;
+extern int deh_soulsphere_health;
+extern int deh_megasphere_health;
+extern int deh_god_mode_health;
+extern int deh_idfa_armor;
+extern int deh_idfa_armor_class;
+extern int deh_idkfa_armor;
+extern int deh_idkfa_armor_class;
+extern int deh_bfg_cells_per_shot;
+extern int deh_species_infighting;
+
+#if 0
+
+// To compile without dehacked, it's possible to use these:
+
+#define deh_initial_health      DEH_DEFAULT_INITIAL_HEALTH
+#define deh_initial_bullets     DEH_DEFAULT_INITIAL_BULLETS
+#define deh_max_health          DEH_DEFAULT_MAX_HEALTH
+#define deh_max_armor           DEH_DEFAULT_MAX_ARMOR
+#define deh_green_armor_class   DEH_DEFAULT_GREEN_ARMOR_CLASS
+#define deh_blue_armor_class    DEH_DEFAULT_BLUE_ARMOR_CLASS
+#define deh_max_soulsphere      DEH_DEFAULT_MAX_SOULSPHERE
+#define deh_soulsphere_health   DEH_DEFAULT_SOULSPHERE_HEALTH
+#define deh_megasphere_health   DEH_DEFAULT_MEGASPHERE_HEALTH
+#define deh_god_mode_health     DEH_DEFAULT_GOD_MODE_HEALTH
+#define deh_idfa_armor          DEH_DEFAULT_IDFA_ARMOR
+#define deh_idfa_armor_class    DEH_DEFAULT_IDFA_ARMOR_CLASS
+#define deh_idkfa_armor         DEH_DEFAULT_IDKFA_ARMOR
+#define deh_idkfa_armor_class   DEH_DEFAULT_IDKFA_ARMOR_CLASS
+#define deh_bfg_cells_per_shot  DEH_DEFAULT_BFG_CELLS_PER_SHOT
+#define deh_species_infighting  DEH_DEFAULT_SPECIES_INFIGHTING
+
+#endif
+
+#endif /* #ifndef DEH_MISC_H */
+
diff --git a/games/NXDoom/src/strife/deh_ptr.c b/games/NXDoom/src/strife/deh_ptr.c
new file mode 100644
index 000000000..5ca3116f2
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_ptr.c
@@ -0,0 +1,142 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses Action Pointer entries in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "info.h"
+
+#include "deh_defs.h"
+#include "deh_io.h"
+#include "deh_main.h"
+
+static actionf_t codeptrs[NUMSTATES];
+
+static int CodePointerIndex(actionf_t *ptr)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        if (!memcmp(&codeptrs[i], ptr, sizeof(actionf_t)))
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+static void DEH_PointerInit(void)
+{
+    int i;
+    
+    // Initialize list of dehacked pointers
+
+    for (i=0; i<NUMSTATES; ++i)
+        codeptrs[i] = states[i].action;
+}
+
+static void *DEH_PointerStart(deh_context_t *context, char *line)
+{
+    int frame_number = 0;
+    
+    // FIXME: can the third argument here be something other than "Frame"
+    // or are we ok?
+
+    if (sscanf(line, "Pointer %*i (%*s %i)", &frame_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (frame_number < 0 || frame_number >= NUMSTATES)
+    {
+        DEH_Warning(context, "Invalid frame number: %i", frame_number);
+        return NULL;
+    }
+
+    return &states[frame_number];
+}
+
+static void DEH_PointerParseLine(deh_context_t *context, char *line, void *tag)
+{
+    state_t *state;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    state = (state_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+//    printf("Set %s to %s for state\n", variable_name, value);
+
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    // set the appropriate field
+
+    if (!strcasecmp(variable_name, "Codep frame"))
+    {
+        if (ivalue < 0 || ivalue >= NUMSTATES)
+        {
+            DEH_Warning(context, "Invalid state '%i'", ivalue);
+        }
+        else
+        {        
+            state->action = codeptrs[ivalue];
+        }
+    }
+    else
+    {
+        DEH_Warning(context, "Unknown variable name '%s'", variable_name);
+    }
+}
+
+static void DEH_PointerSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMSTATES; ++i)
+    {
+        SHA1_UpdateInt32(context, CodePointerIndex(&states[i].action));
+    }
+}
+
+deh_section_t deh_section_pointer =
+{
+    "Pointer",
+    DEH_PointerInit,
+    DEH_PointerStart,
+    DEH_PointerParseLine,
+    NULL,
+    DEH_PointerSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/strife/deh_sound.c b/games/NXDoom/src/strife/deh_sound.c
new file mode 100644
index 000000000..8d178c785
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_sound.c
@@ -0,0 +1,102 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Sound" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+#include "sounds.h"
+
+DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t)
+    DEH_UNSUPPORTED_MAPPING("Offset")
+    DEH_UNSUPPORTED_MAPPING("Zero/One")
+    DEH_MAPPING("Value", priority)
+    DEH_MAPPING("Zero 1", link)
+    DEH_MAPPING("Zero 2", pitch)
+    DEH_MAPPING("Zero 3", volume)
+    DEH_UNSUPPORTED_MAPPING("Zero 4")
+    DEH_MAPPING("Neg. One 1", usefulness)
+    DEH_MAPPING("Neg. One 2", lumpnum)
+DEH_END_MAPPING
+
+static void *DEH_SoundStart(deh_context_t *context, char *line)
+{
+    int sound_number = 0;
+    
+    if (sscanf(line, "Sound %i", &sound_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (sound_number < 0 || sound_number >= NUMSFX)
+    {
+        DEH_Warning(context, "Invalid sound number: %i", sound_number);
+        return NULL;
+    }
+
+    if (sound_number >= DEH_VANILLA_NUMSFX)
+    {
+        DEH_Warning(context, "Attempt to modify SFX %i.  This will cause "
+                             "problems in Vanilla dehacked.", sound_number); 
+    }
+
+    return &S_sfx[sound_number];
+}
+
+static void DEH_SoundParseLine(deh_context_t *context, char *line, void *tag)
+{
+    sfxinfo_t *sfx;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    sfx = (sfxinfo_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    // Set the field value
+
+    DEH_SetMapping(context, &sound_mapping, sfx, variable_name, ivalue);
+}
+
+deh_section_t deh_section_sound =
+{
+    "Sound",
+    NULL,
+    DEH_SoundStart,
+    DEH_SoundParseLine,
+    NULL,
+    NULL,
+};
+
diff --git a/games/NXDoom/src/strife/deh_strife.c b/games/NXDoom/src/strife/deh_strife.c
new file mode 100644
index 000000000..76cb496c1
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_strife.c
@@ -0,0 +1,47 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Top-level dehacked definitions for Strife dehacked (sehacked)
+//
+
+#include <stdlib.h>
+#include "deh_defs.h"
+#include "deh_main.h"
+
+const char *deh_signatures[] =
+{
+    "Patch File for SeHackEd v0.4",
+    "Patch File for SeHackEd v0.3",
+    NULL
+};
+
+
+//
+// List of section types:
+//
+
+deh_section_t *deh_section_types[] =
+{
+    &deh_section_ammo,
+    &deh_section_cheat,
+    &deh_section_frame,
+    &deh_section_misc,
+    &deh_section_pointer,
+    &deh_section_sound,
+    &deh_section_text,
+    &deh_section_thing,
+    &deh_section_weapon,
+    NULL
+};
+
diff --git a/games/NXDoom/src/strife/deh_thing.c b/games/NXDoom/src/strife/deh_thing.c
new file mode 100644
index 000000000..72b92642e
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_thing.c
@@ -0,0 +1,132 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Thing" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "doomtype.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+#include "info.h"
+
+DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
+  DEH_MAPPING("ID #",                doomednum)
+  DEH_MAPPING("Initial frame",       spawnstate)
+  DEH_MAPPING("Hit points",          spawnhealth)
+  DEH_MAPPING("First moving frame",  seestate)
+  DEH_MAPPING("Alert sound",         seesound)
+  DEH_MAPPING("Reaction time",       reactiontime)
+  DEH_MAPPING("Attack sound",        attacksound)
+  DEH_MAPPING("Injury frame",        painstate)
+  DEH_MAPPING("Pain chance",         painchance)
+  DEH_MAPPING("Pain sound",          painsound)
+  DEH_MAPPING("Close attack frame",  meleestate)
+  DEH_MAPPING("Far attack frame",    missilestate)
+  DEH_MAPPING("Crash frame",         crashstate)
+  DEH_MAPPING("Death frame",         deathstate)
+  DEH_MAPPING("Exploding frame",     xdeathstate)
+  DEH_MAPPING("Death sound",         deathsound)
+  DEH_MAPPING("Speed",               speed)
+  DEH_MAPPING("Width",               radius)
+  DEH_MAPPING("Height",              height)
+  DEH_MAPPING("Mass",                mass)
+  DEH_MAPPING("Missile damage",      damage)
+  DEH_MAPPING("Action sound",        activesound)
+  DEH_MAPPING("Bits",                flags)
+  DEH_UNSUPPORTED_MAPPING("Name pointer")
+DEH_END_MAPPING
+
+static void *DEH_ThingStart(deh_context_t *context, char *line)
+{
+    int thing_number = 0;
+    mobjinfo_t *mobj;
+    
+    if (sscanf(line, "Thing %i", &thing_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    // dehacked files are indexed from 1
+    --thing_number;
+
+    if (thing_number < 0 || thing_number >= NUMMOBJTYPES)
+    {
+        DEH_Warning(context, "Invalid thing number: %i", thing_number);
+        return NULL;
+    }
+    
+    mobj = &mobjinfo[thing_number];
+    
+    return mobj;
+}
+
+static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
+{
+    mobjinfo_t *mobj;
+    char *variable_name, *value;
+    int ivalue;
+    
+    if (tag == NULL)
+       return;
+
+    mobj = (mobjinfo_t *) tag;
+
+    // Parse the assignment
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+    
+//    printf("Set %s to %s for mobj\n", variable_name, value);
+
+    // all values are integers
+
+    ivalue = atoi(value);
+    
+    // Set the field value
+
+    DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
+}
+
+static void DEH_ThingSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMMOBJTYPES; ++i)
+    {
+        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
+    }
+}
+
+deh_section_t deh_section_thing =
+{
+    "Thing",
+    NULL,
+    DEH_ThingStart,
+    DEH_ThingParseLine,
+    NULL,
+    DEH_ThingSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/strife/deh_weapon.c b/games/NXDoom/src/strife/deh_weapon.c
new file mode 100644
index 000000000..a178c338b
--- /dev/null
+++ b/games/NXDoom/src/strife/deh_weapon.c
@@ -0,0 +1,102 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Parses "Weapon" sections in dehacked files
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "d_items.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+
+DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
+  DEH_MAPPING("Ammo type",        ammo)
+  DEH_MAPPING("Deselect frame",   upstate)
+  DEH_MAPPING("Select frame",     downstate)
+  DEH_MAPPING("Bobbing frame",    readystate)
+  DEH_MAPPING("Shooting frame",   atkstate)
+  DEH_MAPPING("Firing frame",     flashstate)
+  DEH_UNSUPPORTED_MAPPING("? Unknown")
+DEH_END_MAPPING
+
+static void *DEH_WeaponStart(deh_context_t *context, char *line)
+{
+    int weapon_number = 0;
+
+    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (weapon_number < 0 || weapon_number >= NUMWEAPONS)
+    {
+        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
+        return NULL;
+    }
+    
+    return &weaponinfo[weapon_number];
+}
+
+static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    weaponinfo_t *weapon;
+    int ivalue;
+    
+    if (tag == NULL)
+        return;
+
+    weapon = (weaponinfo_t *) tag;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
+}
+
+static void DEH_WeaponSHA1Sum(sha1_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMWEAPONS ;++i)
+    {
+        DEH_StructSHA1Sum(context, &weapon_mapping, &weaponinfo[i]);
+    }
+}
+
+deh_section_t deh_section_weapon =
+{
+    "Weapon",
+    NULL,
+    DEH_WeaponStart,
+    DEH_WeaponParseLine,
+    NULL,
+    DEH_WeaponSHA1Sum,
+};
+
diff --git a/games/NXDoom/src/strife/doomdata.h b/games/NXDoom/src/strife/doomdata.h
new file mode 100644
index 000000000..abf313266
--- /dev/null
+++ b/games/NXDoom/src/strife/doomdata.h
@@ -0,0 +1,225 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  all external data is defined here
+//  most of the data is loaded into different structures at run time
+//  some internal structures shared by many modules are here
+//
+
+#ifndef __DOOMDATA__
+#define __DOOMDATA__
+
+// The most basic types we use, portability.
+#include "doomtype.h"
+
+// Some global defines, that configure the game.
+#include "doomdef.h"
+
+
+
+//
+// Map level types.
+// The following data structures define the persistent format
+// used in the lumps of the WAD files.
+//
+
+// Lump order in a map WAD: each map needs a couple of lumps
+// to provide a complete scene geometry description.
+enum
+{
+  ML_LABEL,		// A separator, name, ExMx or MAPxx
+  ML_THINGS,		// Monsters, items..
+  ML_LINEDEFS,		// LineDefs, from editing
+  ML_SIDEDEFS,		// SideDefs, from editing
+  ML_VERTEXES,		// Vertices, edited and BSP splits generated
+  ML_SEGS,		// LineSegs, from LineDefs split by BSP
+  ML_SSECTORS,		// SubSectors, list of LineSegs
+  ML_NODES,		// BSP nodes
+  ML_SECTORS,		// Sectors, from editing
+  ML_REJECT,		// LUT, sector-sector visibility	
+  ML_BLOCKMAP		// LUT, motion clipping, walls/grid element
+};
+
+
+// A single Vertex.
+typedef PACKED_STRUCT (
+{
+  short		x;
+  short		y;
+}) mapvertex_t;
+
+
+// A SideDef, defining the visual appearance of a wall,
+// by setting textures and offsets.
+typedef PACKED_STRUCT (
+{
+  short		textureoffset;
+  short		rowoffset;
+  char		toptexture[8];
+  char		bottomtexture[8];
+  char		midtexture[8];
+  // Front sector, towards viewer.
+  short		sector;
+}) mapsidedef_t;
+
+
+
+// A LineDef, as used for editing, and as input
+// to the BSP builder.
+typedef PACKED_STRUCT (
+{
+  short		v1;
+  short		v2;
+  short		flags;
+  short		special;
+  short		tag;
+  // sidenum[1] will be -1 if one sided
+  short		sidenum[2];		
+}) maplinedef_t;
+
+
+//
+// LineDef attributes.
+//
+
+// Solid, is an obstacle.
+#define ML_BLOCKING		1
+
+// Blocks monsters only.
+#define ML_BLOCKMONSTERS	2
+
+// Backside will not be present at all
+//  if not two sided.
+#define ML_TWOSIDED		4
+
+// If a texture is pegged, the texture will have
+// the end exposed to air held constant at the
+// top or bottom of the texture (stairs or pulled
+// down things) and will move with a height change
+// of one of the neighbor sectors.
+// Unpegged textures allways have the first row of
+// the texture at the top pixel of the line for both
+// top and bottom textures (use next to windows).
+
+// upper texture unpegged
+#define ML_DONTPEGTOP		8
+
+// lower texture unpegged
+#define ML_DONTPEGBOTTOM	16	
+
+// In AutoMap: don't map as two sided: IT'S A SECRET!
+#define ML_SECRET		32
+
+// Sound rendering: don't let sound cross two of these.
+#define ML_SOUNDBLOCK		64
+
+// Don't draw on the automap at all.
+#define ML_DONTDRAW		128
+
+// Set if already seen, thus drawn in automap.
+#define ML_MAPPED		256
+
+// villsa [STRIFE] jump over rails?
+#define ML_JUMPOVER             512
+
+// villsa [STRIFE] block flying things
+#define ML_BLOCKFLOATERS        1024
+
+// villsa [STRIFE] TODO - 25% or 75% transcluency?
+#define ML_TRANSPARENT1         2048
+
+// villsa [STRIFE] TODO - 25% or 75% transcluency?
+#define ML_TRANSPARENT2         4096
+
+
+
+
+// Sector definition, from editing.
+typedef	PACKED_STRUCT (
+{
+  short		floorheight;
+  short		ceilingheight;
+  char		floorpic[8];
+  char		ceilingpic[8];
+  short		lightlevel;
+  short		special;
+  short		tag;
+}) mapsector_t;
+
+// SubSector, as generated by BSP.
+typedef PACKED_STRUCT (
+{
+  short		numsegs;
+  // Index of first one, segs are stored sequentially.
+  short		firstseg;	
+}) mapsubsector_t;
+
+
+// LineSeg, generated by splitting LineDefs
+// using partition lines selected by BSP builder.
+typedef PACKED_STRUCT (
+{
+  short		v1;
+  short		v2;
+  short		angle;		
+  short		linedef;
+  short		side;
+  short		offset;
+}) mapseg_t;
+
+
+
+// BSP node structure.
+
+// Indicate a leaf.
+#define	NF_SUBSECTOR	0x8000
+
+typedef PACKED_STRUCT (
+{
+  // Partition line from (x,y) to x+dx,y+dy)
+  short		x;
+  short		y;
+  short		dx;
+  short		dy;
+
+  // Bounding box for each child,
+  // clip against view frustum.
+  short		bbox[2][4];
+
+  // If NF_SUBSECTOR its a subsector,
+  // else it's a node of another subtree.
+  unsigned short	children[2];
+
+}) mapnode_t;
+
+
+
+
+// Thing definition, position, orientation and type,
+// plus skill/visibility flags and attributes.
+typedef PACKED_STRUCT (
+{
+    short		x;
+    short		y;
+    short		angle;
+    short		type;
+    short		options;
+}) mapthing_t;
+
+
+
+
+
+#endif			// __DOOMDATA__
diff --git a/games/NXDoom/src/strife/doomdef.c b/games/NXDoom/src/strife/doomdef.c
new file mode 100644
index 000000000..d31f3efa2
--- /dev/null
+++ b/games/NXDoom/src/strife/doomdef.c
@@ -0,0 +1,28 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  DoomDef - basic defines for DOOM, e.g. Version, game mode
+//   and skill level, and display parameters.
+//
+
+
+
+#include "doomdef.h"
+
+// Location for any defines turned variables.
+
+// None.
+
+
diff --git a/games/NXDoom/src/strife/doomdef.h b/games/NXDoom/src/strife/doomdef.h
new file mode 100644
index 000000000..cdb645412
--- /dev/null
+++ b/games/NXDoom/src/strife/doomdef.h
@@ -0,0 +1,291 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Internally used data structures for virtually everything,
+//   lots of other stuff.
+//
+
+#ifndef __DOOMDEF__
+#define __DOOMDEF__
+
+#include <stdio.h>
+#include <string.h>
+
+#include "doomtype.h"
+#include "i_timer.h"
+#include "d_mode.h"
+
+//
+// Global parameters/defines.
+//
+// DOOM version
+//
+// haleyjd 09/28/10: Replaced with Strife version
+#define STRIFE_VERSION 101
+
+// Version code for cph's longtics hack ("v1.91")
+#define DOOM_191_VERSION 111
+
+
+// Maximum players for Strife:
+#define MAXPLAYERS 8
+
+// If rangecheck is undefined,
+// most parameter validation debugging code will not be compiled
+#define RANGECHECK
+
+// The current state of the game: whether we are
+// playing, gazing at the intermission screen,
+// the game final animation, or a demo. 
+typedef enum
+{
+    GS_LEVEL,
+    GS_UNKNOWN,
+    GS_FINALE,
+    GS_DEMOSCREEN,
+} gamestate_t;
+
+typedef enum
+{
+    ga_nothing,
+    ga_loadlevel,
+    ga_newgame,
+    ga_loadgame,
+    ga_savegame,
+    ga_playdemo,
+    ga_completed,
+    ga_victory,
+    ga_worlddone,
+    ga_screenshot
+} gameaction_t;
+
+//
+// Difficulty/skill settings/filters.
+//
+
+// Skill flags.
+#define	MTF_EASY                1
+#define	MTF_NORMAL              2
+#define	MTF_HARD                4
+// villsa [STRIFE] standing monsters
+#define MTF_STAND               8
+// villsa [STRIFE] don't spawn in single player
+#define MTF_NOTSINGLE           16
+// Deaf monsters/do not react to sound.
+#define MTF_AMBUSH              32
+// villsa [STRIFE] friendly to players
+#define MTF_FRIEND              64
+// villsa [STRIFE] TODO - identify
+#define MTF_UNKNOWN1            128
+// villsa [STRIFE] thing is translucent - STRIFE-TODO: But how much?
+#define MTF_TRANSLUCENT         256
+// villsa [STRIFE] thing is more - or less? - translucent - STRIFE-TODO
+#define MTF_MVIS                512
+// villsa [STRIFE] TODO - identify
+#define MTF_UNKNOWN2            1024
+
+
+
+//
+// Key cards.
+//
+// villsa [STRIFE]
+typedef enum
+{
+    key_BaseKey,        // 0
+    key_GovsKey,        // 1
+    key_Passcard,       // 2
+    key_IDCard,         // 3
+    key_PrisonKey,      // 4
+    key_SeveredHand,    // 5
+    key_Power1Key,      // 6
+    key_Power2Key,      // 7
+    key_Power3Key,      // 8
+    key_GoldKey,        // 9
+    key_IDBadge,        // 10
+    key_SilverKey,      // 11
+    key_OracleKey,      // 12
+    key_MilitaryID,     // 13
+    key_OrderKey,       // 14
+    key_WarehouseKey,   // 15
+    key_BrassKey,       // 16
+    key_RedCrystalKey,  // 17
+    key_BlueCrystalKey, // 18
+    key_ChapelKey,      // 19
+    key_CatacombKey,    // 20
+    key_SecurityKey,    // 21
+    key_CoreKey,        // 22
+    key_MaulerKey,      // 23
+    key_FactoryKey,     // 24
+    key_MineKey,        // 25
+    key_NewKey5,        // 26
+
+    NUMCARDS            // 27
+} card_t;
+
+
+
+// The defined weapons,
+//  including a marker indicating
+//  user has not changed weapon.
+// villsa [STRIFE]
+typedef enum
+{
+    wp_fist,
+    wp_elecbow,
+    wp_rifle,
+    wp_missile,
+    wp_hegrenade,
+    wp_flame,
+    wp_mauler,
+    wp_sigil,
+    wp_poisonbow,
+    wp_wpgrenade,
+    wp_torpedo,
+
+    NUMWEAPONS,
+    
+    // No pending weapon change.
+    wp_nochange
+
+} weapontype_t;
+
+
+// Ammunition types defined.
+typedef enum
+{
+    am_bullets,
+    am_elecbolts,
+    am_poisonbolts,
+    am_cell,
+    am_missiles,
+    am_hegrenades,
+    am_wpgrenades,
+
+    NUMAMMO,
+
+    am_noammo   // unlimited ammo
+
+} ammotype_t;
+
+
+// Power up artifacts.
+// villsa [STRIFE]
+typedef enum
+{
+    pw_strength,
+    pw_invisibility,
+    pw_ironfeet,
+    pw_allmap,
+    pw_communicator,
+    pw_targeter,
+    NUMPOWERS
+    
+} powertype_t;
+
+// villsa [STRIFE]
+// quest numbers
+typedef enum
+{               // Hex          Watcom Name               player_t offset
+    tk_quest1,  // 0x00000001   questflags & 1            0x4D
+    tk_quest2,  // 0x00000002   questflags & 2
+    tk_quest3,  // 0x00000004   questflags & 4
+    tk_quest4,  // 0x00000008   questflags & 8
+    tk_quest5,  // 0x00000010   questflags & 10h
+    tk_quest6,  // 0x00000020   questflags & 20h
+    tk_quest7,  // 0x00000040   questflags & 40h
+    tk_quest8,  // 0x00000080   questflags & 80h
+    tk_quest9,  // 0x00000100   BYTE1(questflags) & 1     0x4E
+    tk_quest10, // 0x00000200   BYTE1(questflags) & 2
+    tk_quest11, // 0x00000400   BYTE1(questflags) & 4
+    tk_quest12, // 0x00000800   BYTE1(questflags) & 8
+    tk_quest13, // 0x00001000   BYTE1(questflags) & 10h
+    tk_quest14, // 0x00002000   BYTE1(questflags) & 20h
+    tk_quest15, // 0x00004000   BYTE1(questflags) & 40h
+    tk_quest16, // 0x00008000   BYTE1(questflags) & 80h
+    tk_quest17, // 0x00010000   BYTE2(questflags) & 1     0x4F
+    tk_quest18, // 0x00020000   BYTE2(questflags) & 2
+    tk_quest19, // 0x00040000   BYTE2(questflags) & 4
+    tk_quest20, // 0x00080000   BYTE2(questflags) & 8
+    tk_quest21, // 0x00100000   BYTE2(questflags) & 10h
+    tk_quest22, // 0x00200000   BYTE2(questflags) & 20h
+    tk_quest23, // 0x00400000   BYTE2(questflags) & 40h
+    tk_quest24, // 0x00800000   BYTE2(questflags) & 80h
+    tk_quest25, // 0x01000000   BYTE3(questflags) & 1     0x50
+    tk_quest26, // 0x02000000   BYTE3(questflags) & 2
+    tk_quest27, // 0x04000000   BYTE3(questflags) & 4
+    tk_quest28, // 0x08000000   BYTE3(questflags) & 8
+    tk_quest29, // 0x10000000   BYTE3(questflags) & 10h
+    tk_quest30, // 0x20000000   BYTE3(questflags) & 20h
+    tk_quest31, // 0x40000000   BYTE3(questflags) & 40h
+    tk_quest32, // most likely unused
+    tk_numquests
+} questtype_t;
+
+// haleyjd 09/12/10: [STRIFE]
+// flag values for each quest.
+enum
+{ //  Name       Flag from bitnum      Purpose, if known
+    QF_QUEST1  = (1 << tk_quest1),  // Obtained Beldin's ring
+    QF_QUEST2  = (1 << tk_quest2),  // Stole the Chalice
+    QF_QUEST3  = (1 << tk_quest3),  // Permission to visit Irale (visited Macil)
+    QF_QUEST4  = (1 << tk_quest4),  // Accepted Gov. Mourel's "messy" chore
+    QF_QUEST5  = (1 << tk_quest5),  // Accepted Gov. Mourel's "bloody" chore
+    QF_QUEST6  = (1 << tk_quest6),  // Destroyed the Power Coupling
+    QF_QUEST7  = (1 << tk_quest7),  // Killed Blue Acolytes ("Scanning Team")
+    QF_QUEST8  = (1 << tk_quest8),  // Unused; formerly, picked up Broken Coupling
+    QF_QUEST9  = (1 << tk_quest9),  // Obtained Derwin's ear
+    QF_QUEST10 = (1 << tk_quest10), // Obtained Prison Pass
+    QF_QUEST11 = (1 << tk_quest11), // Obtained Prison Key
+    QF_QUEST12 = (1 << tk_quest12), // Obtained Judge Wolenick's hand
+    QF_QUEST13 = (1 << tk_quest13), // Freed the Prisoners
+    QF_QUEST14 = (1 << tk_quest14), // Destroyed the Power Crystal
+    QF_QUEST15 = (1 << tk_quest15), // Obtained Guard Uniform
+    QF_QUEST16 = (1 << tk_quest16), // Destroyed the Gate Mechanism
+    QF_QUEST17 = (1 << tk_quest17), // Heard Macil's story about the Sigil (MAP10)
+    QF_QUEST18 = (1 << tk_quest18), // Obtained Oracle Pass
+    QF_QUEST19 = (1 << tk_quest19),
+    QF_QUEST20 = (1 << tk_quest20),
+    QF_QUEST21 = (1 << tk_quest21), // Killed Bishop
+    QF_QUEST22 = (1 << tk_quest22), // Killed Oracle with QUEST21 set
+    QF_QUEST23 = (1 << tk_quest23), // Killed Oracle (always given)
+    QF_QUEST24 = (1 << tk_quest24), // Killed Macil
+    QF_QUEST25 = (1 << tk_quest25), // Destroyed the Converter
+    QF_QUEST26 = (1 << tk_quest26), // Killed Loremaster
+    QF_QUEST27 = (1 << tk_quest27), // Destroyed the Computer (checked for good ending)
+    QF_QUEST28 = (1 << tk_quest28), // Obtained Catacomb Key (checked by line type 228)
+    QF_QUEST29 = (1 << tk_quest29), // Destroyed the Mines Transmitter
+    QF_QUEST30 = (1 << tk_quest30),
+    QF_QUEST31 = (1 << tk_quest31),
+    QF_QUEST32 = (1U << tk_quest32), // Unused; BUG: Broken Coupling accidentally sets it.
+    
+    QF_ALLQUESTS  = (QF_QUEST31 + (QF_QUEST31 - 1)) // does not include bit 32!
+};
+
+//
+// Power up durations,
+//  how many seconds till expiration,
+//  assuming TICRATE is 35 ticks/second.
+//
+typedef enum
+{
+    INVISTICS	= (55*TICRATE), // villsa [STRIFE] changed from 60 to 55
+    IRONTICS	= (80*TICRATE), // villsa [STRIFE] changed from 60 to 80
+    PMUPTICS    = (80*TICRATE), // villsa [STRIFE]
+    TARGTICS    = (160*TICRATE),// villsa [STRIFE]
+    
+} powerduration_t;
+
+#endif          // __DOOMDEF__
diff --git a/games/NXDoom/src/strife/doomstat.c b/games/NXDoom/src/strife/doomstat.c
new file mode 100644
index 000000000..7f3116b5c
--- /dev/null
+++ b/games/NXDoom/src/strife/doomstat.c
@@ -0,0 +1,35 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Put all global tate variables here.
+//
+
+#include <stdio.h>
+
+#include "doomstat.h"
+
+
+// Game Mode - identify IWAD as shareware, retail etc.
+GameMode_t gamemode = indetermined;
+GameMission_t	gamemission = doom;
+GameVersion_t   gameversion = exe_strife_1_31;
+const char *gamedescription;
+
+// Set if homebrew PWAD stuff has been added.
+boolean	modifiedgame;
+
+
+
+
diff --git a/games/NXDoom/src/strife/doomstat.h b/games/NXDoom/src/strife/doomstat.h
new file mode 100644
index 000000000..4be2435b1
--- /dev/null
+++ b/games/NXDoom/src/strife/doomstat.h
@@ -0,0 +1,281 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   All the global variables that store the internal state.
+//   Theoretically speaking, the internal state of the engine
+//    should be found by looking at the variables collected
+//    here, and every relevant module will have to include
+//    this header file.
+//   In practice, things are a bit messy.
+//
+
+
+#ifndef __D_STATE__
+#define __D_STATE__
+
+// We need globally shared data structures,
+//  for defining the global state variables.
+#include "doomdata.h"
+#include "d_loop.h"
+
+// We need the playr data structure as well.
+#include "d_player.h"
+
+// Game mode/mission
+#include "d_mode.h"
+
+#include "net_defs.h"
+
+
+
+// ------------------------
+// Command line parameters.
+//
+extern  boolean	nomonsters;	// checkparm of -nomonsters
+extern  boolean	respawnparm;	// checkparm of -respawn
+extern  boolean	fastparm;	// checkparm of -fast
+extern  boolean randomparm;     // [STRIFE] checkparm of -random
+extern  boolean flipparm;       // [STRIFE] checkparm of -flip
+
+extern  boolean	devparm;	// DEBUG: launched with -devparm
+
+
+// -----------------------------------------------------
+// Game Mode - identify IWAD as shareware, retail etc.
+//
+extern GameMode_t	gamemode;
+extern GameMission_t	gamemission;
+extern GameVersion_t    gameversion;
+extern const char       *gamedescription;
+
+// Set if homebrew PWAD stuff has been added.
+extern  boolean	modifiedgame;
+
+
+// -------------------------------------------
+// Selected skill type, map etc.
+//
+
+// Defaults for menu, methinks.
+extern  skill_t		startskill;
+extern  int             startepisode;
+extern	int		startmap;
+
+// Savegame slot to load on startup.  This is the value provided to
+// the -loadgame option.  If this has not been provided, this is -1.
+
+extern  int             startloadgame;
+
+extern  boolean		autostart;
+
+// Selected by user. 
+extern  skill_t         gameskill;
+extern  int		gameepisode;
+extern  int		gamemap;
+
+// If non-zero, exit the level after this number of minutes
+extern  int             timelimit;
+
+// Nightmare mode flag, single player.
+extern  boolean         respawnmonsters;
+
+// Netgame? Only true if >1 player.
+extern  boolean	netgame;
+
+// 0=Co-op; 1=Deathmatch; 2=Altdeath
+extern  int	deathmatch;
+
+// -------------------------
+// Internal parameters for sound rendering.
+// These have been taken from the DOS version,
+//  but are not (yet) supported with Linux
+//  (e.g. no sound volume adjustment with menu.
+
+// From m_menu.c:
+//  Sound FX volume has default, 0 - 15
+//  Music volume has default, 0 - 15
+// These are multiplied by 8.
+extern int sfxVolume;
+extern int musicVolume;
+extern int voiceVolume; // haleyjd 08/29/10: [STRIFE]
+
+// Current music/sfx card - index useless
+//  w/o a reference LUT in a sound module.
+// Ideally, this would use indices found
+//  in: /usr/include/linux/soundcard.h
+extern int snd_MusicDevice;
+extern int snd_SfxDevice;
+// Config file? Same disclaimer as above.
+extern int snd_DesiredMusicDevice;
+extern int snd_DesiredSfxDevice;
+
+
+// -------------------------
+// Status flags for refresh.
+//
+
+// Depending on view size - no status bar?
+// Note that there is no way to disable the
+//  status bar explicitely.
+extern  boolean statusbaractive;
+
+extern  boolean automapactive;  // In AutoMap mode?
+extern  boolean	menuactive;     // Menu overlayed?
+extern  boolean menupause;      // haleyjd 08/29/10: [STRIFE]
+extern  int     menupausetime;  // haleyjd 09/04/10: [STRIFE]
+extern  boolean menuindialog;   // haleyjd: ditto
+extern  boolean	paused;         // Game Pause?
+
+
+extern  boolean		viewactive;
+
+extern  boolean		nodrawers;
+
+extern  boolean         testcontrols;
+extern  int             testcontrols_mousespeed;
+
+
+
+
+// This one is related to the 3-screen display mode.
+// ANG90 = left side, ANG270 = right
+extern  int	viewangleoffset;
+
+// Player taking events, and displaying.
+extern  int	consoleplayer;	
+extern  int	displayplayer;
+
+
+// -------------------------------------
+// Scores, rating.
+// Statistics on a given map, for intermission.
+//
+extern  int	totalkills;
+//extern	int	totalitems; [STRIFE] unused
+extern	int	totalsecret;
+
+// Timer, for scores.
+extern  int	levelstarttic;	// gametic at level start
+extern  int	leveltime;	// tics in game play for par
+
+
+
+// --------------------------------------
+// DEMO playback/recording related stuff.
+// No demo, there is a human player in charge?
+// Disable save/end game?
+extern  boolean	usergame;
+
+//?
+extern  boolean	demoplayback;
+extern  boolean	demorecording;
+extern  int     mouse_fire_countdown;   // villsa [STRIFE]
+extern  int     joystick_fire_countdown;
+
+extern fixed_t forwardmove[2];
+extern fixed_t sidemove[2];
+
+// Round angleturn in ticcmds to the nearest 256.  This is used when
+// recording Vanilla demos in netgames.
+
+extern boolean lowres_turn;
+
+// Quit after playing a demo from cmdline.
+extern  boolean		singledemo;	
+
+
+
+
+//?
+extern  gamestate_t     gamestate;
+
+
+
+
+
+
+//-----------------------------
+// Internal parameters, fixed.
+// These are set by the engine, and not changed
+//  according to user inputs. Partly load from
+//  WAD, partly set at startup time.
+
+
+// Bookkeeping on players - state.
+extern	player_t	players[MAXPLAYERS];
+
+// Alive? Disconnected?
+extern  boolean		playeringame[MAXPLAYERS];
+
+
+// Player spawn spots for deathmatch.
+#define MAX_DM_STARTS   10
+extern  mapthing_t      deathmatchstarts[MAX_DM_STARTS];
+extern  mapthing_t*	deathmatch_p;
+
+// Player spawn spots.
+extern  mapthing_t      playerstarts[MAXPLAYERS];
+
+// haleyjd 08/24/10: [STRIFE] rift spots
+#define MAXRIFTSPOTS 16
+extern  mapthing_t      riftSpots[MAXRIFTSPOTS];
+
+// Intermission stats.
+// Parameters for world map / intermission.
+extern  wbstartstruct_t		wminfo;	
+
+
+
+
+
+
+//-----------------------------------------
+// Internal parameters, used for engine.
+//
+
+// File handling stuff.
+extern  char *          savegamedir;
+
+// if true, load all graphics at level load
+extern  boolean         precache;
+
+
+// wipegamestate can be set to -1
+//  to force a wipe on the next draw
+extern  gamestate_t     wipegamestate;
+
+extern  int             mouseSensitivity;
+
+//extern  int             bodyqueslot; [STRIFE] unused
+
+
+
+// Needed to store the number of the dummy sky flat.
+// Used for rendering,
+//  as well as tracking projectiles etc.
+extern int		skyflatnum;
+
+
+
+// Netgame stuff (buffers and pointers, i.e. indices).
+
+
+extern	int		rndindex;
+
+extern  ticcmd_t        *netcmds;
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/dstrings.c b/games/NXDoom/src/strife/dstrings.c
new file mode 100644
index 000000000..86433ab28
--- /dev/null
+++ b/games/NXDoom/src/strife/dstrings.c
@@ -0,0 +1,73 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Globally defined strings.
+// 
+
+
+
+#include "dstrings.h"
+
+const char *doom1_endmsg[] =
+{
+  "are you sure you want to\nquit this great game?",
+  "please don't leave, there's more\ndemons to toast!",
+  "let's beat it -- this is turning\ninto a bloodbath!",
+  "i wouldn't leave if i were you.\ndos is much worse.",
+  "you're trying to say you like dos\nbetter than me, right?",
+  "don't leave yet -- there's a\ndemon around that corner!",
+  "ya know, next time you come in here\ni'm gonna toast ya.",
+  "go ahead and leave. see if i care.",
+};
+
+const char *doom2_endmsg[] =
+{
+  // QuitDOOM II messages
+  "are you sure you want to\nquit this great game?",
+  "you want to quit?\nthen, thou hast lost an eighth!",
+  "don't go now, there's a \ndimensional shambler waiting\nat the dos prompt!",
+  "get outta here and go back\nto your boring programs.",
+  "if i were your boss, i'd \n deathmatch ya in a minute!",
+  "look, bud. you leave now\nand you forfeit your body count!",
+  "just leave. when you come\nback, i'll be waiting with a bat.",
+  "you're lucky i don't smack\nyou for thinking about leaving.",
+};
+
+#if 0
+
+// UNUSED messages included in the source release
+
+char* endmsg[] =
+{
+  // DOOM1
+  QUITMSG,
+  // FinalDOOM?
+  "fuck you, pussy!\nget the fuck out!",
+  "you quit and i'll jizz\nin your cystholes!",
+  "if you leave, i'll make\nthe lord drink my jizz.",
+  "hey, ron! can we say\n'fuck' in the game?",
+  "i'd leave: this is just\nmore monsters and levels.\nwhat a load.",
+  "suck it down, asshole!\nyou're a fucking wimp!",
+  "don't quit now! we're \nstill spending your money!",
+
+  // Internal debug. Different style, too.
+  "THIS IS NO MESSAGE!\nPage intentionally left blank."
+};
+
+#endif
+
+  
+
+
diff --git a/games/NXDoom/src/strife/dstrings.h b/games/NXDoom/src/strife/dstrings.h
new file mode 100644
index 000000000..81115792a
--- /dev/null
+++ b/games/NXDoom/src/strife/dstrings.h
@@ -0,0 +1,41 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:
+//	DOOM strings, by language.
+//
+
+
+#ifndef __DSTRINGS__
+#define __DSTRINGS__
+
+
+// All important printed strings.
+
+#include "d_englsh.h"
+
+// Misc. other strings.
+#define SAVEGAMENAME	"doomsav"
+
+
+// QuitDOOM messages
+// 8 per each game type
+#define NUM_QUITMESSAGES   8
+
+extern const char *doom1_endmsg[];
+extern const char *doom2_endmsg[];
+
+
+#endif
diff --git a/games/NXDoom/src/strife/f_finale.c b/games/NXDoom/src/strife/f_finale.c
new file mode 100644
index 000000000..a6d139938
--- /dev/null
+++ b/games/NXDoom/src/strife/f_finale.c
@@ -0,0 +1,1047 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2010 James Haley, Samuel Villarreal
+//
+// 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.
+//
+// DESCRIPTION:
+//	Game completion, final screen animation.
+//
+// [STRIFE] Module marked finished 2010-09-13 22:56
+//
+
+
+#include <stdio.h>
+#include <ctype.h>
+
+// Functions.
+#include "deh_main.h"
+#include "i_system.h"
+#include "i_swap.h"
+#include "z_zone.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "s_sound.h"
+
+// Data.
+#include "d_main.h"
+#include "dstrings.h"
+#include "sounds.h"
+
+#include "doomstat.h"
+#include "r_state.h"
+
+#include "p_dialog.h" // [STRIFE]
+
+typedef enum
+{
+    F_STAGE_TEXT,
+    F_STAGE_ARTSCREEN,
+    F_STAGE_CAST,
+} finalestage_t;
+
+// ?
+//#include "doomstat.h"
+//#include "r_local.h"
+//#include "f_finale.h"
+
+// Stage of animation:
+finalestage_t finalestage;
+
+unsigned int finalecount;
+
+// haleyjd 09/12/10: [STRIFE] Slideshow variables
+const char   *slideshow_panel;
+unsigned int  slideshow_tics;
+int           slideshow_state;
+
+// haleyjd 09/13/10: [STRIFE] All this is unused.
+/*
+#define	TEXTSPEED	3
+#define	TEXTWAIT	250
+
+typedef struct
+{
+    GameMission_t mission;
+    int episode, level;
+    char *background;
+    char *text;
+} textscreen_t;
+
+static textscreen_t textscreens[] =
+{
+    { doom,      1, 8,  "FLOOR4_8",  E1TEXT},
+    { doom,      2, 8,  "SFLR6_1",   E2TEXT},
+    { doom,      3, 8,  "MFLR8_4",   E3TEXT},
+    { doom,      4, 8,  "MFLR8_3",   E4TEXT},
+
+    { doom2,     1, 6,  "SLIME16",   C1TEXT},
+    { doom2,     1, 11, "RROCK14",   C2TEXT},
+    { doom2,     1, 20, "RROCK07",   C3TEXT},
+    { doom2,     1, 30, "RROCK17",   C4TEXT},
+    { doom2,     1, 15, "RROCK13",   C5TEXT},
+    { doom2,     1, 31, "RROCK19",   C6TEXT},
+
+    { pack_tnt,  1, 6,  "SLIME16",   T1TEXT},
+    { pack_tnt,  1, 11, "RROCK14",   T2TEXT},
+    { pack_tnt,  1, 20, "RROCK07",   T3TEXT},
+    { pack_tnt,  1, 30, "RROCK17",   T4TEXT},
+    { pack_tnt,  1, 15, "RROCK13",   T5TEXT},
+    { pack_tnt,  1, 31, "RROCK19",   T6TEXT},
+
+    { pack_plut, 1, 6,  "SLIME16",   P1TEXT},
+    { pack_plut, 1, 11, "RROCK14",   P2TEXT},
+    { pack_plut, 1, 20, "RROCK07",   P3TEXT},
+    { pack_plut, 1, 30, "RROCK17",   P4TEXT},
+    { pack_plut, 1, 15, "RROCK13",   P5TEXT},
+    { pack_plut, 1, 31, "RROCK19",   P6TEXT},
+};
+
+char*	finaletext;
+char*	finaleflat;
+*/
+
+void	F_StartCast (void);
+void	F_CastTicker (void);
+boolean F_CastResponder (event_t *ev);
+void	F_CastDrawer (void);
+
+// [STRIFE] - Slideshow states enumeration
+enum
+{
+    // Exit states
+    SLIDE_EXITHACK    = -99, // Hacky exit - start a new dialog
+    SLIDE_HACKHACK    =  -9, // Bizarre unused state
+    SLIDE_EXIT        =  -1, // Exit to next finale state
+    SLIDE_CHOCO       =  -2, // haleyjd: This state is Choco-specific... see below.
+
+    // Unknown
+    SLIDE_UNKNOWN     =   0, // Dunno what it's for, possibly unused
+
+    // MAP03 - Macil's Programmer exposition
+    SLIDE_PROGRAMMER1 =   1, 
+    SLIDE_PROGRAMMER2,
+    SLIDE_PROGRAMMER3,
+    SLIDE_PROGRAMMER4, // Next state = -99
+
+    // MAP10 - Macil's Sigil exposition
+    SLIDE_SIGIL1      =   5,
+    SLIDE_SIGIL2,
+    SLIDE_SIGIL3,
+    SLIDE_SIGIL4, // Next state = -99
+
+    // MAP29 - Endings
+    // Good Ending
+    SLIDE_GOODEND1    =  10,
+    SLIDE_GOODEND2,
+    SLIDE_GOODEND3,
+    SLIDE_GOODEND4, // Next state = -1
+
+    // Bad Ending
+    SLIDE_BADEND1     =  14,
+    SLIDE_BADEND2,
+    SLIDE_BADEND3, // Next state = -1
+
+    // Blah Ending
+    SLIDE_BLAHEND1    =  17,
+    SLIDE_BLAHEND2,
+    SLIDE_BLAHEND3, // Next state = -1
+
+    // Demo Ending - haleyjd 20130301: v1.31 only
+    SLIDE_DEMOEND1    =  25,
+    SLIDE_DEMOEND2 // Next state = -1
+};
+
+//
+// F_StartFinale
+//
+// [STRIFE]
+// haleyjd 09/13/10: Modified to drive slideshow sequences.
+//
+void F_StartFinale (void)
+{
+#if 0
+    // haleyjd 20111006: see below...
+    patch_t *panel;
+#endif
+
+    gameaction = ga_nothing;
+    gamestate = GS_FINALE;
+    viewactive = false;
+    automapactive = false;
+    wipegamestate = -1; // [STRIFE]
+
+    // [STRIFE] Setup the slide show
+    slideshow_panel = DEH_String("PANEL0");
+
+    // haleyjd 20111006: These two lines of code *are* in vanilla Strife; 
+    // however, there, they were completely inconsequential due to the dirty
+    // rects system. No intervening V_MarkRect call means PANEL0 was never 
+    // drawn to the framebuffer. In Chocolate Strife, however, with no such
+    // system in place, this only manages to fuck up the fade-out that is
+    // supposed to happen at the beginning of all finales. So, don't do it!
+#if 0
+    panel = (patch_t *)W_CacheLumpName(slideshow_panel, PU_CACHE);
+    V_DrawPatch(0, 0, panel);
+#endif
+
+    switch(gamemap)
+    {
+    case 3:  // Macil's exposition on the Programmer
+        slideshow_state = SLIDE_PROGRAMMER1;
+        break;
+    case 9:  // Super hack for death of Programmer
+        slideshow_state = SLIDE_EXITHACK; 
+        break;
+    case 10: // Macil's exposition on the Sigil
+        slideshow_state = SLIDE_SIGIL1;
+        break;
+    case 29: // Endings
+        if(!netgame)
+        {
+            if(players[0].health <= 0)            // Bad ending 
+                slideshow_state = SLIDE_BADEND1;  // - Humanity goes extinct
+            else
+            {
+                if((players[0].questflags & QF_QUEST25) && // Converter destroyed
+                   (players[0].questflags & QF_QUEST27))   // Computer destroyed (wtf?!)
+                {
+                    // Good ending - You get the hot babe.
+                    slideshow_state = SLIDE_GOODEND1; 
+                }
+                else
+                {
+                    // Blah ending - You win the battle, but fail at life.
+                    slideshow_state = SLIDE_BLAHEND1;
+                }
+            }
+        }
+        break;
+    case 34: // For the demo version ending
+        slideshow_state = SLIDE_EXIT;
+        
+        // haleyjd 20130301: Somebody noticed the demo levels were missing the
+        // ending they used to have in the demo version EXE, I guess. But the
+        // weird thing is, this will only trigger if you run with strife0.wad,
+        // and no released version thereof actually works with the 1.31 EXE
+        // due to differing dialog formats... was there to be an updated demo
+        // that never got released?!
+        if(gameversion == exe_strife_1_31 && isdemoversion)
+            slideshow_state = SLIDE_DEMOEND1;
+        break;
+    }
+
+    S_ChangeMusic(mus_dark, 1);
+    slideshow_tics = 7;
+    finalestage = F_STAGE_TEXT;
+    finalecount = 0;
+}
+
+//
+// F_Responder
+//
+// [STRIFE] Verified unmodified
+//
+boolean F_Responder (event_t *event)
+{
+    if (finalestage == F_STAGE_CAST)
+        return F_CastResponder (event);
+
+    return false;
+}
+
+//
+// F_WaitTicker
+//
+// [STRIFE] New function
+// haleyjd 09/13/10: This is called from G_Ticker if gamestate is 1, but we
+// have no idea for what it's supposed to be. It is unused.
+//
+void F_WaitTicker(void)
+{
+    if(++finalecount >= 250)
+    {
+        gamestate   = GS_FINALE;
+        finalestage = 0;
+        finalecount = 0;
+    }
+}
+
+// 
+// F_DoSlideShow
+//
+// [STRIFE] New function
+// haleyjd 09/13/10: Handles slideshow states. Begging to be tabulated!
+//
+static void F_DoSlideShow(void)
+{
+    patch_t *patch;
+
+    switch(slideshow_state)
+    {
+    case SLIDE_UNKNOWN: // state #0, seems to be unused
+        slideshow_tics = 700;
+        slideshow_state = SLIDE_EXIT;
+        // falls through into state 1, so above is pointless? ...
+
+    case SLIDE_PROGRAMMER1: // state #1
+        slideshow_panel = DEH_String("SS2F1");
+        I_StartVoice(DEH_String("MAC10"));
+        slideshow_state = SLIDE_PROGRAMMER2;
+        slideshow_tics = 315;
+        break;
+    case SLIDE_PROGRAMMER2: // state #2
+        slideshow_panel = DEH_String("SS2F2");
+        I_StartVoice(DEH_String("MAC11"));
+        slideshow_state = SLIDE_PROGRAMMER3;
+        slideshow_tics = 350;
+        break;
+    case SLIDE_PROGRAMMER3: // state #3
+        slideshow_panel = DEH_String("SS2F3");
+        I_StartVoice(DEH_String("MAC12"));
+        slideshow_state = SLIDE_PROGRAMMER4;
+        slideshow_tics = 420;
+        break;
+    case SLIDE_PROGRAMMER4: // state #4
+        slideshow_panel = DEH_String("SS2F4");
+        I_StartVoice(DEH_String("MAC13"));
+        slideshow_state = SLIDE_EXITHACK; // End of slides
+        slideshow_tics = 595;
+        break;
+
+    case SLIDE_SIGIL1: // state #5
+        slideshow_panel = DEH_String("SS3F1");
+        I_StartVoice(DEH_String("MAC16"));
+        slideshow_state = SLIDE_SIGIL2;
+        slideshow_tics = 350;
+        break;
+    case SLIDE_SIGIL2: // state #6
+        slideshow_panel = DEH_String("SS3F2");
+        I_StartVoice(DEH_String("MAC17"));
+        slideshow_state = SLIDE_SIGIL3;
+        slideshow_tics = 420;
+        break;
+    case SLIDE_SIGIL3: // state #7
+        slideshow_panel = DEH_String("SS3F3");
+        I_StartVoice(DEH_String("MAC18"));
+        slideshow_tics = 420;
+        slideshow_state = SLIDE_SIGIL4;
+        break;
+    case SLIDE_SIGIL4: // state #8
+        slideshow_panel = DEH_String("SS3F4");
+        I_StartVoice(DEH_String("MAC19"));
+        slideshow_tics = 385;
+        slideshow_state = SLIDE_EXITHACK; // End of slides
+        break;
+
+    case SLIDE_GOODEND1: // state #10
+        slideshow_panel = DEH_String("SS4F1");
+        S_StartMusic(mus_happy);
+        I_StartVoice(DEH_String("RIE01"));
+        slideshow_state = SLIDE_GOODEND2;
+        slideshow_tics = 455;
+        break;
+    case SLIDE_GOODEND2: // state #11
+        slideshow_panel = DEH_String("SS4F2");
+        I_StartVoice(DEH_String("BBX01"));
+        slideshow_state = SLIDE_GOODEND3;
+        slideshow_tics = 385;
+        break;
+    case SLIDE_GOODEND3: // state #12
+        slideshow_panel = DEH_String("SS4F3");
+        I_StartVoice(DEH_String("BBX02"));
+        slideshow_state = SLIDE_GOODEND4;
+        slideshow_tics = 490;
+        break;
+    case SLIDE_GOODEND4: // state #13
+        slideshow_panel = DEH_String("SS4F4");
+        slideshow_state = SLIDE_EXIT; // Go to end credits
+        slideshow_tics = 980;
+        break;
+
+    case SLIDE_BADEND1: // state #14
+        S_StartMusic(mus_sad);
+        slideshow_panel = DEH_String("SS5F1");
+        I_StartVoice(DEH_String("SS501b"));
+        slideshow_state = SLIDE_BADEND2;
+        slideshow_tics = 385;
+        break;
+    case SLIDE_BADEND2: // state #15
+        slideshow_panel = DEH_String("SS5F2");
+        I_StartVoice(DEH_String("SS502b"));
+        slideshow_state = SLIDE_BADEND3;
+        slideshow_tics = 350;
+        break;
+    case SLIDE_BADEND3: // state #16
+        slideshow_panel = DEH_String("SS5F3");
+        I_StartVoice(DEH_String("SS503b"));
+        slideshow_state = SLIDE_EXIT; // Go to end credits
+        slideshow_tics = 385;
+        break;
+
+    case SLIDE_BLAHEND1: // state #17
+        S_StartMusic(mus_end);
+        slideshow_panel = DEH_String("SS6F1");
+        I_StartVoice(DEH_String("SS601A"));
+        slideshow_state = SLIDE_BLAHEND2;
+        slideshow_tics = 280;
+        break;
+    case SLIDE_BLAHEND2: // state #18
+        S_StartMusic(mus_end);
+        slideshow_panel = DEH_String("SS6F2");
+        I_StartVoice(DEH_String("SS602A"));
+        slideshow_state = SLIDE_BLAHEND3;
+        slideshow_tics = 280;
+        break;
+    case SLIDE_BLAHEND3: // state #19
+        S_StartMusic(mus_end);
+        slideshow_panel = DEH_String("SS6F3");
+        I_StartVoice(DEH_String("SS603A"));
+        slideshow_state = SLIDE_EXIT; // Go to credits
+        slideshow_tics = 315;
+        break;
+
+    case SLIDE_DEMOEND1: // state #25 - only exists in 1.31
+        slideshow_panel = DEH_String("PANEL7");
+        slideshow_tics = 175;
+        slideshow_state = SLIDE_DEMOEND2;
+        break;
+    case SLIDE_DEMOEND2: // state #26 - ditto
+        slideshow_panel = DEH_String("VELLOGO");
+        slideshow_tics = 175;
+        slideshow_state = SLIDE_EXIT; // Go to end credits
+        break;
+
+    case SLIDE_EXITHACK: // state -99: super hack state
+        gamestate = GS_LEVEL;
+        P_DialogStartP1();
+        break;
+    case SLIDE_HACKHACK: // state -9: unknown bizarre unused state
+        S_StartSound(NULL, sfx_rifle);
+        slideshow_tics = 3150;
+        break;
+    case SLIDE_EXIT: // state -1: proceed to next finale stage
+        finalecount = 0;
+        finalestage = F_STAGE_ARTSCREEN;
+        wipegamestate = -1;
+        S_StartMusic(mus_fast);
+        // haleyjd 20130301: The ONLY glitch fixed in 1.31 of Strife
+        // *would* be something this insignificant, of course!
+        if(gameversion != exe_strife_1_31)
+            slideshow_state = SLIDE_CHOCO; // haleyjd: see below...
+        break;
+    case SLIDE_CHOCO: 
+        // haleyjd 09/14/10: This wouldn't be necessary except that Choco
+        // doesn't support the V_MarkRect dirty rectangles system. This
+        // just so happens to have hidden the fact that the ending
+        // does a screenfade every ~19 seconds due to remaining stuck in
+        // SLIDE_EXIT state above, UNLESS the menus were active - the
+        // V_MarkRect calls in the menu system cause it to be visible. 
+        // This means that in order to get the same behavior as the vanilla
+        // EXE, I need different code. So, come to this state and only set 
+        // wipegamestate if menuactive is true.
+        finalecount = 0;
+        finalestage = F_STAGE_ARTSCREEN;
+        if(menuactive)
+            wipegamestate = -1;
+        S_StartMusic(mus_fast);
+        slideshow_state = SLIDE_CHOCO; // remain here.
+        break;
+    default:
+        break;
+    }
+
+    finalecount = 0;
+    if(gameversion != exe_strife_1_31) // See above. This was removed in 1.31.
+    {
+       patch = (patch_t *)W_CacheLumpName(DEH_String("PANEL0"), PU_CACHE);
+       V_DrawPatch(0, 0, patch);
+    }
+}
+
+//
+// F_Ticker
+//
+// [STRIFE] Modifications for new finales
+// haleyjd 09/13/10: Calls F_DoSlideShow
+//
+void F_Ticker (void)
+{
+    size_t          i;
+
+    // check for skipping
+    if (finalecount > 50) // [STRIFE] No commercial check
+    {
+        // go on to the next level
+        for (i=0 ; i<MAXPLAYERS ; i++)
+            if (players[i].cmd.buttons)
+                break;
+
+        if (i < MAXPLAYERS)
+            finalecount = slideshow_tics; // [STRIFE]
+    }
+    
+    // advance animation
+    finalecount++;
+
+    if (finalestage == F_STAGE_CAST)
+        F_CastTicker ();
+    else if(finalecount > slideshow_tics) // [STRIFE] Advance slideshow
+        F_DoSlideShow();
+
+    // [STRIFE]: Rest is unused
+    /*
+    if ( gamemode == commercial)
+        return;
+
+    if (finalestage == F_STAGE_TEXT
+        && finalecount>strlen (finaletext)*TEXTSPEED + TEXTWAIT)
+    {
+        finalecount = 0;
+        finalestage = F_STAGE_ARTSCREEN;
+        wipegamestate = -1;		// force a wipe
+        if (gameepisode == 3)
+            S_StartMusic (mus_logo);
+    }
+    */
+}
+
+// haleyjd 09/13/10: Not present in Strife: Cast drawing functions
+
+#include "hu_stuff.h"
+
+/*
+//
+// F_TextWrite
+//
+void F_TextWrite (void)
+{
+    byte*	src;
+    byte*	dest;
+    
+    int		x,y,w;
+    signed int	count;
+    char*	ch;
+    int		c;
+    int		cx;
+    int		cy;
+    
+    // erase the entire screen to a tiled background
+    src = W_CacheLumpName ( finaleflat , PU_CACHE);
+    dest = I_VideoBuffer;
+	
+    for (y=0 ; y<SCREENHEIGHT ; y++)
+    {
+	for (x=0 ; x<SCREENWIDTH/64 ; x++)
+	{
+	    memcpy (dest, src+((y&63)<<6), 64);
+	    dest += 64;
+	}
+	if (SCREENWIDTH&63)
+	{
+	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63);
+	    dest += (SCREENWIDTH&63);
+	}
+    }
+
+    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
+    
+    // draw some of the text onto the screen
+    cx = 10;
+    cy = 10;
+    ch = finaletext;
+	
+    count = ((signed int) finalecount - 10) / TEXTSPEED;
+    if (count < 0)
+	count = 0;
+    for ( ; count ; count-- )
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	if (c == '\n')
+	{
+	    cx = 10;
+	    cy += 11;
+	    continue;
+	}
+		
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c> HU_FONTSIZE)
+	{
+	    cx += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	if (cx+w > SCREENWIDTH)
+	    break;
+	V_DrawPatch(cx, cy, hu_font[c]);
+	cx+=w;
+    }
+	
+}
+*/
+
+//
+// Final DOOM 2 animation
+// Casting by id Software.
+//   in order of appearance
+//
+typedef struct
+{
+    int         isindemo; // [STRIFE] Changed from name, which is in mobjinfo
+    mobjtype_t  type;
+} castinfo_t;
+
+// haleyjd: [STRIFE] A new cast order was defined, however it is unused in any
+// of the released versions of Strife, even including the demo version :(
+castinfo_t      castorder[] = {
+    { 1, MT_PLAYER     },
+    { 1, MT_BEGGAR1    },
+    { 1, MT_PEASANT2_A },
+    { 1, MT_REBEL1     },
+    { 1, MT_GUARD1     },
+    { 1, MT_CRUSADER   },
+    { 1, MT_RLEADER2   },
+    { 0, MT_SENTINEL   },
+    { 0, MT_STALKER    },
+    { 0, MT_PROGRAMMER },
+    { 0, MT_REAVER     },
+    { 0, MT_PGUARD     },
+    { 0, MT_INQUISITOR },
+    { 0, MT_PRIEST     },
+    { 0, MT_SPECTRE_A  },
+    { 0, MT_BISHOP     },
+    { 0, MT_ENTITY     },
+    { 1, NUMMOBJTYPES  }
+};
+
+int		castnum;
+int		casttics;
+state_t*	caststate;
+boolean		castdeath;
+int		castframes;
+int		castonmelee;
+boolean		castattacking;
+
+//
+// F_StartCast
+//
+// haleyjd 09/13/10: [STRIFE] Heavily modified, yet unused.
+// Evidence suggests this was meant to be started from a menu item.
+// See m_menu.c for more info.
+//
+void F_StartCast (void)
+{
+    usergame = false;
+    gameaction = ga_nothing;
+    viewactive = false;
+    automapactive = false;
+    castnum = 0;
+    gamestate = GS_FINALE;
+    caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+    casttics = caststate->tics;
+    if(casttics > 50)
+        casttics = 50;
+    wipegamestate = -1;             // force a screen wipe
+    castdeath = false;
+    finalestage = F_STAGE_CAST;
+    castframes = 0;
+    castonmelee = 0;
+    castattacking = false;
+}
+
+
+//
+// F_CastTicker
+//
+// [STRIFE] Heavily modified, but unused.
+// haleyjd 09/13/10: Yeah, I bothered translating this even though it isn't
+// going to be seen, in part because I hope some Strife port or another will
+// pick it up and finish it, adding it as the optional menu item it was 
+// meant to be, or just adding it as part of the ending sequence.
+//
+void F_CastTicker (void)
+{
+    int         st;
+
+    if (--casttics > 0)
+        return;                  // not time to change state yet
+
+    if (caststate->tics == -1 || caststate->nextstate == S_NULL)
+    {
+        // switch from deathstate to next monster
+        castnum++;
+        castdeath = false;
+        if (isdemoversion)
+        {
+            // [STRIFE] Demo version had a shorter cast
+            if(!castorder[castnum].isindemo)
+                castnum = 0;
+        }
+        // [STRIFE] Break on type == NUMMOBJTYPES rather than name == NULL
+        if (castorder[castnum].type == NUMMOBJTYPES)
+            castnum = 0;
+        if (mobjinfo[castorder[castnum].type].seesound)
+            S_StartSound (NULL, mobjinfo[castorder[castnum].type].seesound);
+        caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+        castframes = 0;
+    }
+    else
+    {
+        int sfx = 0;
+
+        // just advance to next state in animation
+        if (caststate == &states[S_PLAY_05])    // villsa [STRIFE] - updated
+            goto stopattack;	// Oh, gross hack!
+        st = caststate->nextstate;
+        caststate = &states[st];
+        castframes++;
+
+        if (st != mobjinfo[castorder[castnum].type].meleestate &&
+            st != mobjinfo[castorder[castnum].type].missilestate)
+        {
+            if (st == S_PLAY_05)
+                sfx = sfx_rifle;
+            else
+                sfx = 0;
+        }
+        else
+            sfx = mobjinfo[castorder[castnum].type].attacksound;
+
+        if (sfx)
+            S_StartSound (NULL, sfx);
+    }
+
+    if (!castdeath && castframes == 12)
+    {
+        // go into attack frame
+        castattacking = true;
+        if (castonmelee)
+            caststate=&states[mobjinfo[castorder[castnum].type].meleestate];
+        else
+            caststate=&states[mobjinfo[castorder[castnum].type].missilestate];
+        castonmelee ^= 1;
+        if (caststate == &states[S_NULL])
+        {
+            if (castonmelee)
+                caststate = &states[mobjinfo[castorder[castnum].type].meleestate];
+            else
+                caststate = &states[mobjinfo[castorder[castnum].type].missilestate];
+        }
+    }
+
+    if (castattacking)
+    {
+        if (castframes == 24
+            ||	caststate == &states[mobjinfo[castorder[castnum].type].seestate] )
+        {
+stopattack:
+            castattacking = false;
+            castframes = 0;
+            caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+        }
+    }
+
+    casttics = caststate->tics;
+    if (casttics > 50) // [STRIFE] Cap tics
+        casttics = 50;
+    else if (casttics == -1)
+        casttics = 15;
+}
+
+
+//
+// F_CastResponder
+//
+// [STRIFE] This still exists in Strife but is never used.
+// It was used at some point in development, however, as they made
+// numerous modifications to the cast call system.
+//
+boolean F_CastResponder (event_t* ev)
+{
+    if (ev->type != ev_keydown)
+        return false;
+
+    if (castdeath)
+        return true;                    // already in dying frames
+
+    // go into death frame
+    castdeath = true;
+    caststate = &states[mobjinfo[castorder[castnum].type].deathstate];
+    casttics = caststate->tics;
+    if(casttics > 50) // [STRIFE] Upper bound on casttics
+        casttics = 50;
+    castframes = 0;
+    castattacking = false;
+    if (mobjinfo[castorder[castnum].type].deathsound)
+        S_StartSound (NULL, mobjinfo[castorder[castnum].type].deathsound);
+
+    return true;
+}
+
+//
+// F_CastPrint
+//
+// [STRIFE] Verified unmodified, and unused.
+//
+void F_CastPrint (char* text)
+{
+    char*	ch;
+    int		c;
+    int		cx;
+    int		w;
+    int		width;
+    
+    // find width
+    ch = text;
+    width = 0;
+	
+    while (ch)
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c> HU_FONTSIZE)
+	{
+	    width += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	width += w;
+    }
+    
+    // draw it
+    cx = 160-width/2;
+    ch = text;
+    while (ch)
+    {
+	c = *ch++;
+	if (!c)
+	    break;
+	c = toupper(c) - HU_FONTSTART;
+	if (c < 0 || c> HU_FONTSIZE)
+	{
+	    cx += 4;
+	    continue;
+	}
+		
+	w = SHORT (hu_font[c]->width);
+	V_DrawPatch(cx, 180, hu_font[c]);
+	cx+=w;
+    }
+	
+}
+
+// haleyjd 09/13/10: [STRIFE] Unfortunately they removed whatever was
+// partway finished of this function from the binary, as there is no
+// trace of it. This means we cannot know for sure what the cast call
+// would have looked like. :(
+/*
+//
+// F_CastDrawer
+//
+void F_CastDrawer (void)
+{
+    spritedef_t*	sprdef;
+    spriteframe_t*	sprframe;
+    int			lump;
+    boolean		flip;
+    patch_t*		patch;
+    
+    // erase the entire screen to a background
+    V_DrawPatch (0, 0, W_CacheLumpName (DEH_String("BOSSBACK"), PU_CACHE));
+
+    F_CastPrint (DEH_String(castorder[castnum].name));
+    
+    // draw the current frame in the middle of the screen
+    sprdef = &sprites[caststate->sprite];
+    sprframe = &sprdef->spriteframes[ caststate->frame & FF_FRAMEMASK];
+    lump = sprframe->lump[0];
+    flip = (boolean)sprframe->flip[0];
+			
+    patch = W_CacheLumpNum (lump+firstspritelump, PU_CACHE);
+    if (flip)
+	V_DrawPatchFlipped(160, 170, patch);
+    else
+	V_DrawPatch(160, 170, patch);
+}
+*/
+
+#ifdef STRIFE_DEMO_CODE
+//
+// F_DrawPatchCol
+//
+// [STRIFE] Verified unmodified, but not present in 1.2
+// It WAS present in the demo version, however...
+//
+void
+F_DrawPatchCol
+( int		x,
+  patch_t*	patch,
+  int		col )
+{
+    column_t*	column;
+    byte*	source;
+    byte*	dest;
+    byte*	desttop;
+    int		count;
+	
+    column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+    desttop = I_VideoBuffer + x;
+
+    // step through the posts in a column
+    while (column->topdelta != 0xff )
+    {
+	source = (byte *)column + 3;
+	dest = desttop + column->topdelta*SCREENWIDTH;
+	count = column->length;
+		
+	while (count--)
+	{
+	    *dest = *source++;
+	    dest += SCREENWIDTH;
+	}
+	column = (column_t *)(  (byte *)column + column->length + 4 );
+    }
+}
+#endif
+
+//
+// F_DrawMap34End
+//
+// [STRIFE] Modified from F_BunnyScroll
+// * In 1.2 and up this just causes a weird black screen.
+// * In the demo version, it was an actual scroll between two screens.
+// I have implemented both code segments, though only the black screen
+// one will currently be used, as full demo version support isn't looking
+// likely right now.
+//
+void F_DrawMap34End (void)
+{
+    signed int  scrolled;
+    int         x;
+//    patch_t*    p1;
+//    patch_t*    p2;
+
+//    p1 = W_CacheLumpName (DEH_String("credit"),  PU_LEVEL);
+//    p2 = W_CacheLumpName (DEH_String("vellogo"), PU_LEVEL);
+
+    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+
+    scrolled = (320 - ((signed int) finalecount-430)/2);
+    if (scrolled > 320)
+        scrolled = 320;
+    if (scrolled < 0)
+        scrolled = 0;
+
+#ifdef STRIFE_DEMO_CODE
+    for ( x=0 ; x<SCREENWIDTH ; x++)
+    {
+        if (x+scrolled < 320)
+            F_DrawPatchCol (x, p1, x+scrolled);
+        else
+            F_DrawPatchCol (x, p2, x+scrolled - 320);
+    }
+#else
+    // wtf this is supposed to do, I have no idea!
+    x = 1;
+    do
+    {
+        x += 11;
+    }
+    while(x < 320);
+#endif
+}
+
+// haleyjd 09/13/10: [STRIFE] Unused.
+/*
+static void F_ArtScreenDrawer(void)
+{
+    char *lumpname;
+    
+    if (gameepisode == 3)
+    {
+        F_BunnyScroll();
+    }
+    else
+    {
+        switch (gameepisode)
+        {
+            case 1:
+                if (gamemode == retail)
+                {
+                    lumpname = "CREDIT";
+                }
+                else
+                {
+                    lumpname = "HELP2";
+                }
+                break;
+            case 2:
+                lumpname = "VICTORY2";
+                break;
+            case 4:
+                lumpname = "ENDPIC";
+                break;
+            default:
+                return;
+        }
+
+        lumpname = DEH_String(lumpname);
+
+        V_DrawPatch (0, 0, W_CacheLumpName(lumpname, PU_CACHE));
+    }
+}
+*/
+
+//
+// F_Drawer
+//
+// [STRIFE]
+// haleyjd 09/13/10: Modified for slideshow, demo version, etc.
+//
+void F_Drawer (void)
+{
+    switch (finalestage)
+    {
+    case F_STAGE_CAST:
+        // Cast didn't have a drawer in any released version
+        //F_CastDrawer();
+        break;
+    case F_STAGE_TEXT:
+        // Draw slideshow panel
+        {
+            patch_t *slide = W_CacheLumpName(slideshow_panel, PU_CACHE);
+            V_DrawPatch(0, 0, slide);
+        }
+        break;
+    case F_STAGE_ARTSCREEN:
+        if(gamemap <= 29)
+        {
+            // draw credits
+            patch_t *credits = W_CacheLumpName(DEH_String("CREDIT"), PU_CACHE);
+            V_DrawPatch(0, 0, credits);
+        }
+        else if(gamemap == 34)
+        {
+            // demo version - does nothing meaningful in the final version
+            F_DrawMap34End();
+        }
+        break;
+    }
+}
+
diff --git a/games/NXDoom/src/strife/f_finale.h b/games/NXDoom/src/strife/f_finale.h
new file mode 100644
index 000000000..438083987
--- /dev/null
+++ b/games/NXDoom/src/strife/f_finale.h
@@ -0,0 +1,48 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//    
+
+
+#ifndef __F_FINALE__
+#define __F_FINALE__
+
+
+#include "doomtype.h"
+#include "d_event.h"
+//
+// FINALE
+//
+
+// Called by main loop.
+boolean F_Responder (event_t* ev);
+
+// Called by main loop.
+void F_Ticker (void);
+
+// haleyjd: [STRIFE] Called from G_Ticker as well...
+void F_WaitTicker(void);
+
+// Called by main loop.
+void F_Drawer (void);
+
+
+void F_StartFinale (void);
+
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/f_wipe.c b/games/NXDoom/src/strife/f_wipe.c
new file mode 100644
index 000000000..4e5176f51
--- /dev/null
+++ b/games/NXDoom/src/strife/f_wipe.c
@@ -0,0 +1,292 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Mission begin melt/wipe screen special effect.
+//
+
+#include <string.h>
+
+#include "z_zone.h"
+#include "i_video.h"
+#include "v_video.h"
+#include "m_random.h"
+
+#include "doomtype.h"
+
+#include "r_defs.h"   // haleyjd [STRIFE]
+#include "r_draw.h"
+
+#include "f_wipe.h"
+
+//
+//                       SCREEN WIPE PACKAGE
+//
+
+// when zero, stop the wipe
+static boolean	go = 0;
+
+static byte*	wipe_scr_start;
+static byte*	wipe_scr_end;
+static byte*	wipe_scr;
+
+
+void
+wipe_shittyColMajorXform
+( short*	array,
+  int		width,
+  int		height )
+{
+    int		x;
+    int		y;
+    short*	dest;
+
+    dest = (short*) Z_Malloc(width*height*2, PU_STATIC, 0);
+
+    for(y=0;y<height;y++)
+	for(x=0;x<width;x++)
+	    dest[x*height+y] = array[y*width+x];
+
+    memcpy(array, dest, width*height*2);
+
+    Z_Free(dest);
+
+}
+
+// haleyjd 08/26/10: [STRIFE] Verified unmodified.
+int
+wipe_initColorXForm
+( int	width,
+  int	height,
+  int	ticks )
+{
+    memcpy(wipe_scr, wipe_scr_start, width*height);
+    return 0;
+}
+
+//
+// wipe_doColorXForm
+//
+// haleyjd 08/26/10: [STRIFE]
+// * Rogue modified the unused ColorXForm wipe in-place in order to implement 
+//   their distinctive crossfade wipe.
+//
+int
+wipe_doColorXForm
+( int	width,
+  int	height,
+  int	ticks )
+{
+    byte *cur_screen = wipe_scr;
+    byte *end_screen = wipe_scr_end;
+    int   pix = width*height;
+    int   i;
+    boolean changed = false;
+
+    for(i = pix; i > 0; i--)
+    {
+        if(*cur_screen != *end_screen)
+        {
+            changed = true;
+            *cur_screen = xlatab[(*cur_screen << 8) + *end_screen];
+        }
+        ++cur_screen;
+        ++end_screen;
+    }
+
+    return !changed;
+}
+
+// haleyjd 08/26/10: [STRIFE] Verified unmodified.
+int
+wipe_exitColorXForm
+( int	width,
+  int	height,
+  int	ticks )
+{
+    return 0;
+}
+
+
+static int*	y;
+
+int
+wipe_initMelt
+( int	width,
+  int	height,
+  int	ticks )
+{
+    int i, r;
+    
+    // copy start screen to main screen
+    memcpy(wipe_scr, wipe_scr_start, width*height);
+    
+    // makes this wipe faster (in theory)
+    // to have stuff in column-major format
+    wipe_shittyColMajorXform((short*)wipe_scr_start, width/2, height);
+    wipe_shittyColMajorXform((short*)wipe_scr_end, width/2, height);
+    
+    // setup initial column positions
+    // (y<0 => not ready to scroll yet)
+    y = (int *) Z_Malloc(width*sizeof(int), PU_STATIC, 0);
+    y[0] = -(M_Random()%16);
+    for (i=1;i<width;i++)
+    {
+	r = (M_Random()%3) - 1;
+	y[i] = y[i-1] + r;
+	if (y[i] > 0) y[i] = 0;
+	else if (y[i] == -16) y[i] = -15;
+    }
+
+    return 0;
+}
+
+int
+wipe_doMelt
+( int	width,
+  int	height,
+  int	ticks )
+{
+    int		i;
+    int		j;
+    int		dy;
+    int		idx;
+    
+    short*	s;
+    short*	d;
+    boolean	done = true;
+
+    width/=2;
+
+    while (ticks--)
+    {
+	for (i=0;i<width;i++)
+	{
+	    if (y[i]<0)
+	    {
+		y[i]++; done = false;
+	    }
+	    else if (y[i] < height)
+	    {
+		dy = (y[i] < 16) ? y[i]+1 : 8;
+		if (y[i]+dy >= height) dy = height - y[i];
+		s = &((short *)wipe_scr_end)[i*height+y[i]];
+		d = &((short *)wipe_scr)[y[i]*width+i];
+		idx = 0;
+		for (j=dy;j;j--)
+		{
+		    d[idx] = *(s++);
+		    idx += width;
+		}
+		y[i] += dy;
+		s = &((short *)wipe_scr_start)[i*height];
+		d = &((short *)wipe_scr)[y[i]*width+i];
+		idx = 0;
+		for (j=height-y[i];j;j--)
+		{
+		    d[idx] = *(s++);
+		    idx += width;
+		}
+		done = false;
+	    }
+	}
+    }
+
+    return done;
+
+}
+
+int
+wipe_exitMelt
+( int	width,
+  int	height,
+  int	ticks )
+{
+    Z_Free(y);
+    Z_Free(wipe_scr_start);
+    Z_Free(wipe_scr_end);
+    return 0;
+}
+
+// haleyjd 08/26/10: [STRIFE] Verified unmodified.
+int
+wipe_StartScreen
+( int	x,
+  int	y,
+  int	width,
+  int	height )
+{
+    wipe_scr_start = Z_Malloc(SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
+    I_ReadScreen(wipe_scr_start);
+    return 0;
+}
+
+// haleyjd 08/26/10: [STRIFE] Verified unmodified.
+int
+wipe_EndScreen
+( int	x,
+  int	y,
+  int	width,
+  int	height )
+{
+    wipe_scr_end = Z_Malloc(SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
+    I_ReadScreen(wipe_scr_end);
+    V_DrawBlock(x, y, width, height, wipe_scr_start); // restore start scr.
+    return 0;
+}
+
+// haleyjd 08/26/10: [STRIFE] Verified unmodified.
+int
+wipe_ScreenWipe
+( int	wipeno,
+  int	x,
+  int	y,
+  int	width,
+  int	height,
+  int	ticks )
+{
+    int rc;
+    static int (*wipes[])(int, int, int) =
+    {
+	wipe_initColorXForm, wipe_doColorXForm, wipe_exitColorXForm,
+	wipe_initMelt, wipe_doMelt, wipe_exitMelt
+    };
+
+    // initial stuff
+    if (!go)
+    {
+	go = 1;
+        // haleyjd 20110629 [STRIFE]: We *must* use a temp buffer here.
+	wipe_scr = (byte *) Z_Malloc(width*height, PU_STATIC, 0); // DEBUG
+	//wipe_scr = I_VideoBuffer;
+	(*wipes[wipeno*3])(width, height, ticks);
+    }
+
+    // do a piece of wipe-in
+    V_MarkRect(0, 0, width, height);
+    rc = (*wipes[wipeno*3+1])(width, height, ticks);
+
+    // haleyjd 20110629 [STRIFE]: Copy temp buffer to the real screen.
+    V_DrawBlock(x, y, width, height, wipe_scr);
+
+    // final stuff
+    if (rc)
+    {
+	go = 0;
+	(*wipes[wipeno*3+2])(width, height, ticks);
+    }
+
+    return !go;
+}
+
diff --git a/games/NXDoom/src/strife/f_wipe.h b/games/NXDoom/src/strife/f_wipe.h
new file mode 100644
index 000000000..6ffd05872
--- /dev/null
+++ b/games/NXDoom/src/strife/f_wipe.h
@@ -0,0 +1,63 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Mission start screen wipe/melt, special effects.
+//	
+
+
+#ifndef __F_WIPE_H__
+#define __F_WIPE_H__
+
+//
+//                       SCREEN WIPE PACKAGE
+//
+
+enum
+{
+    // [STRIFE]: ColorXForm reimplemented as a proper crossfade
+    wipe_ColorXForm,
+    
+    // weird screen melt
+    wipe_Melt,	
+
+    wipe_NUMWIPES
+};
+
+int
+wipe_StartScreen
+( int		x,
+  int		y,
+  int		width,
+  int		height );
+
+
+int
+wipe_EndScreen
+( int		x,
+  int		y,
+  int		width,
+  int		height );
+
+
+int
+wipe_ScreenWipe
+( int		wipeno,
+  int		x,
+  int		y,
+  int		width,
+  int		height,
+  int		ticks );
+
+#endif
diff --git a/games/NXDoom/src/strife/g_game.c b/games/NXDoom/src/strife/g_game.c
new file mode 100644
index 000000000..50faee1c8
--- /dev/null
+++ b/games/NXDoom/src/strife/g_game.c
@@ -0,0 +1,2534 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "doomdef.h" 
+#include "doomkeys.h"
+#include "doomstat.h"
+
+#include "deh_main.h"
+#include "deh_misc.h"
+#include "z_zone.h"
+#include "f_finale.h"
+#include "m_argv.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "m_saves.h" // STRIFE
+#include "m_random.h"
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "p_setup.h"
+#include "p_saveg.h"
+#include "p_tick.h"
+#include "d_main.h"
+#include "wi_stuff.h"
+#include "hu_stuff.h"
+#include "st_stuff.h"
+#include "am_map.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+#include "w_wad.h"
+
+#include "p_local.h" 
+
+#include "s_sound.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+// SKY handling - still the wrong place.
+#include "r_data.h"
+#include "r_sky.h"
+
+#include "p_dialog.h"   // villsa [STRIFE]
+
+#include "g_game.h"
+
+
+#define SAVEGAMESIZE	0x2c000
+
+void	G_ReadDemoTiccmd (ticcmd_t* cmd); 
+void	G_WriteDemoTiccmd (ticcmd_t* cmd); 
+void	G_PlayerReborn (int player); 
+ 
+void	G_DoReborn (int playernum); 
+ 
+void	G_DoLoadLevel (void); 
+void	G_DoNewGame (void); 
+void	G_DoPlayDemo (void); 
+void	G_DoCompleted (void); 
+void	G_DoVictory (void); 
+void	G_DoWorldDone (void); 
+void	G_DoSaveGame (char *path); 
+ 
+// Gamestate the last time G_Ticker was called.
+
+gamestate_t     oldgamestate; 
+ 
+gameaction_t    gameaction; 
+gamestate_t     gamestate; 
+skill_t         gameskill = 2; // [STRIFE] Default value set to 2.
+boolean         respawnmonsters;
+//int             gameepisode; 
+int             gamemap;
+
+// haleyjd 08/24/10: [STRIFE] New variables
+int             destmap;   // current destination map when exiting
+int             riftdest;  // destination spot for player
+angle_t         riftangle; // player angle saved during exit
+
+// If non-zero, exit the level after this number of minutes.
+
+int             timelimit;
+
+boolean         paused; 
+boolean         sendpause;              // send a pause event next tic 
+boolean         sendsave;               // send a save event next tic 
+boolean         usergame;               // ok to save / end game 
+ 
+boolean         timingdemo;             // if true, exit with report on completion 
+boolean         nodrawers;              // for comparative timing purposes 
+int             starttime;              // for comparative timing purposes 
+ 
+boolean         viewactive; 
+ 
+int             deathmatch;             // only if started as net death 
+boolean         netgame;                // only true if packets are broadcast 
+boolean         playeringame[MAXPLAYERS]; 
+player_t        players[MAXPLAYERS]; 
+
+boolean         turbodetected[MAXPLAYERS];
+ 
+int             consoleplayer;          // player taking events and displaying 
+int             displayplayer;          // view being displayed 
+int             levelstarttic;          // gametic at level start 
+int             totalkills, /*totalitems,*/ totalsecret;    // for intermission 
+ 
+char           *demoname;
+boolean         demorecording; 
+boolean         longtics;               // cph's doom 1.91 longtics hack
+boolean         lowres_turn;            // low resolution turning for longtics
+boolean         demoplayback; 
+boolean		netdemo; 
+byte*		demobuffer;
+byte*		demo_p;
+byte*		demoend; 
+boolean         singledemo;             // quit after playing a demo from cmdline 
+ 
+boolean         precache = true;        // if true, load all graphics at start 
+
+boolean         testcontrols = false;    // Invoked by setup to test controls
+ 
+wbstartstruct_t wminfo;                 // parms for world map / intermission 
+ 
+byte            consistancy[MAXPLAYERS][BACKUPTICS]; 
+ 
+#define MAXPLMOVE		(forwardmove[1]) 
+ 
+#define TURBOTHRESHOLD	0x32
+
+fixed_t         forwardmove[2] = {0x19, 0x32}; 
+fixed_t         sidemove[2] = {0x18, 0x28}; 
+fixed_t         angleturn[3] = {640, 1280, 320};    // + slow turn 
+
+int mouse_fire_countdown = 0;    // villsa [STRIFE]
+int joystick_fire_countdown = 0;
+
+static int *weapon_keys[] = {
+    &key_weapon1,
+    &key_weapon2,
+    &key_weapon3,
+    &key_weapon4,
+    &key_weapon5,
+    &key_weapon6,
+    &key_weapon7,
+    &key_weapon8
+};
+
+// Set to -1 or +1 to switch to the previous or next weapon.
+
+static int next_weapon = 0;
+
+// Used for prev/next weapon keys.
+// STRIFE-TODO: Check this table makes sense.
+
+static const struct
+{
+    weapontype_t weapon;
+    weapontype_t weapon_num;
+} weapon_order_table[] = {
+    { wp_fist,                  wp_fist },
+    { wp_poisonbow,             wp_elecbow },
+    { wp_elecbow,               wp_elecbow },
+    { wp_rifle,                 wp_rifle },
+    { wp_missile,               wp_missile },
+    { wp_wpgrenade,             wp_hegrenade },
+    { wp_hegrenade,             wp_hegrenade },
+    { wp_flame,                 wp_flame },
+    { wp_torpedo,               wp_mauler },
+    { wp_mauler,                wp_mauler },
+    { wp_sigil,                 wp_sigil },
+};
+
+#define SLOWTURNTICS	6 
+ 
+#define NUMKEYS		256 
+#define MAX_JOY_BUTTONS 20
+
+static boolean  gamekeydown[NUMKEYS]; 
+static int      turnheld;		// for accelerative turning 
+ 
+static boolean  mousearray[MAX_MOUSE_BUTTONS + 1];
+static boolean *mousebuttons = &mousearray[1];  // allow [-1]
+
+// mouse values are used once 
+int             mousex;
+int             mousey;         
+
+static int      dclicktime;
+static boolean  dclickstate;
+static int      dclicks; 
+static int      dclicktime2;
+static boolean  dclickstate2;
+static int      dclicks2;
+
+// joystick values are repeated 
+static int      joyxmove;
+static int      joyymove;
+static int      joystrafemove;
+static int      joylook;
+static boolean  joyarray[MAX_JOY_BUTTONS + 1]; 
+static boolean *joybuttons = &joyarray[1];		// allow [-1] 
+ 
+static int      savegameslot = 6; // [STRIFE] initialized to 6
+static char     savedescription[32]; 
+ 
+int      testcontrols_mousespeed;
+ 
+#define	BODYQUESIZE	32
+
+mobj_t*		bodyque[BODYQUESIZE]; 
+//int       bodyqueslot; [STRIFE] unused
+ 
+int             vanilla_savegame_limit = 1;
+int             vanilla_demo_limit = 1;
+ 
+
+int G_CmdChecksum (ticcmd_t* cmd) 
+{ 
+    size_t		i;
+    int		sum = 0; 
+	 
+    for (i=0 ; i< sizeof(*cmd)/4 - 1 ; i++) 
+	sum += ((int *)cmd)[i]; 
+		 
+    return sum; 
+} 
+
+static boolean WeaponSelectable(weapontype_t weapon)
+{
+    player_t *player;
+
+    player = &players[consoleplayer];
+
+    // Can't select a weapon if we don't own it.
+
+    if (!player->weaponowned[weapon])
+    {
+        return false;
+    }
+
+    // Can't use registered-only weapons in demo mode:
+
+    if (isdemoversion && !weaponinfo[weapon].availabledemo)
+    {
+        return false;
+    }
+
+    // Special rules for switching to alternate versions of weapons.
+    // These must match the weapon-switching rules in P_PlayerThink()
+
+    // haleyjd 20141024: same fix here as in P_PlayerThink for torpedo.
+
+    if (weapon == wp_torpedo
+     && player->ammo[weaponinfo[wp_torpedo].ammo] < 30)
+    {
+        return false;
+    }
+
+    if (player->ammo[weaponinfo[weapon].ammo] == 0)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+static int G_NextWeapon(int direction)
+{
+    weapontype_t weapon;
+    int start_i, i;
+
+    // Find index in the table.
+
+    if (players[consoleplayer].pendingweapon == wp_nochange)
+    {
+        weapon = players[consoleplayer].readyweapon;
+    }
+    else
+    {
+        weapon = players[consoleplayer].pendingweapon;
+    }
+
+    for (i=0; i<arrlen(weapon_order_table); ++i)
+    {
+        if (weapon_order_table[i].weapon == weapon)
+        {
+            break;
+        }
+    }
+
+    // The current weapon must be present in weapon_order_table
+    // otherwise something has gone terribly wrong
+    if (i >= arrlen(weapon_order_table)) {
+        I_Error("Internal error: weapon %d not present in weapon_order_table", weapon);
+    }
+
+    // Switch weapon.
+    start_i = i;
+    do
+    {
+        i += direction;
+        i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
+    } while (i != start_i && !WeaponSelectable(weapon_order_table[i].weapon));
+
+    return weapon_order_table[i].weapon_num;
+}
+
+//
+// G_BuildTiccmd
+// Builds a ticcmd from all of the available inputs
+// or reads it from the demo buffer. 
+// If recording a demo, write it out 
+// 
+void G_BuildTiccmd (ticcmd_t* cmd, int maketic) 
+{ 
+    int		i; 
+    boolean	strafe;
+    boolean	bstrafe; 
+    int		speed;
+    int		tspeed; 
+    int		forward;
+    int		side;
+
+    memset(cmd, 0, sizeof(ticcmd_t));
+
+    cmd->consistancy = 
+        consistancy[consoleplayer][maketic%BACKUPTICS]; 
+
+    // villsa [STRIFE] look up key
+    if(gamekeydown[key_lookup] || (joylook < 0 && joystick_look_sensitivity))
+        cmd->buttons2 |= BT2_LOOKUP;
+
+    // villsa [STRIFE] look down key
+    if(gamekeydown[key_lookdown] || (joylook > 0 && joystick_look_sensitivity))
+        cmd->buttons2 |= BT2_LOOKDOWN;
+
+    // villsa [STRIFE] inventory use key
+    if(gamekeydown[key_invuse] || joybuttons[joybuseartifact])
+    {
+        player_t* player = &players[consoleplayer];
+        if(player->numinventory > 0)
+        {
+            cmd->buttons2 |= BT2_INVUSE;
+            cmd->inventory = player->inventory[player->inventorycursor].sprite;
+        }
+    }
+
+    // villsa [STRIFE] inventory drop key
+    if(gamekeydown[key_invdrop])
+    {
+        player_t* player = &players[consoleplayer];
+        if(player->numinventory > 0)
+        {
+            cmd->buttons2 |= BT2_INVDROP;
+            cmd->inventory = player->inventory[player->inventorycursor].sprite;
+        }
+    }
+
+    // villsa [STRIFE] use medkit
+    if(gamekeydown[key_usehealth])
+        cmd->buttons2 |= BT2_HEALTH;
+
+
+ 
+    strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe] 
+        || joybuttons[joybstrafe]; 
+
+    // fraggle: support the old "joyb_speed = 31" hack which
+    // allowed an autorun effect
+
+    speed = key_speed >= NUMKEYS
+         || joybspeed >= MAX_JOY_BUTTONS
+         || gamekeydown[key_speed] 
+         || joybuttons[joybspeed]
+         || mousebuttons[mousebspeed];
+ 
+    forward = side = 0;
+
+    // villsa [STRIFE] running causes centerview to occur
+    if(speed)
+        cmd->buttons2 |= BT2_CENTERVIEW;
+
+    // villsa [STRIFE] disable running if low on health
+    if (players[consoleplayer].health <= 15)
+        speed = 0;
+    
+    // use two stage accelerative turning
+    // on the keyboard and joystick
+    if (joyxmove < 0
+        || joyxmove > 0  
+        || gamekeydown[key_right]
+        || gamekeydown[key_left]
+        || mousebuttons[mousebturnright]
+        || mousebuttons[mousebturnleft])
+        turnheld += ticdup; 
+    else 
+        turnheld = 0; 
+
+    if (turnheld < SLOWTURNTICS) 
+        tspeed = 2;             // slow turn 
+    else 
+        tspeed = speed;
+    
+    // let movement keys cancel each other out
+    if (strafe) 
+    { 
+        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+        {
+            // fprintf(stderr, "strafe right\n");
+            side += sidemove[speed]; 
+        }
+        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+        {
+            //	fprintf(stderr, "strafe left\n");
+            side -= sidemove[speed]; 
+        }
+        if (use_analog && joyxmove)
+        {
+            joyxmove = joyxmove * joystick_move_sensitivity / 10;
+            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
+            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
+            side += FixedMul(sidemove[speed], joyxmove);
+        }
+        else if (joystick_move_sensitivity)
+        {
+            if (joyxmove > 0)
+                side += sidemove[speed];
+            if (joyxmove < 0)
+                side -= sidemove[speed];
+        }
+
+    } 
+    else 
+    { 
+        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+            cmd->angleturn -= angleturn[tspeed]; 
+        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+            cmd->angleturn += angleturn[tspeed]; 
+        if (use_analog && joyxmove)
+        {
+            // Cubic response curve allows for finer control when stick
+            // deflection is small.
+            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
+            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
+            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
+        }
+        else if (joystick_turn_sensitivity)
+        {
+            if (joyxmove > 0)
+                cmd->angleturn -= angleturn[tspeed];
+            if (joyxmove < 0)
+                cmd->angleturn += angleturn[tspeed];
+        }
+    } 
+
+    if (gamekeydown[key_up]) 
+    {
+        // fprintf(stderr, "up\n");
+        forward += forwardmove[speed]; 
+    }
+    if (gamekeydown[key_down]) 
+    {
+        // fprintf(stderr, "down\n");
+        forward -= forwardmove[speed]; 
+    }
+
+    if (use_analog && joyymove)
+    {
+        joyymove = joyymove * joystick_move_sensitivity / 10;
+        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
+        joyymove = (joyymove < -FRACUNIT) ? FRACUNIT : joyymove;
+        forward -= FixedMul(forwardmove[speed], joyymove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joyymove < 0)
+            forward += forwardmove[speed];
+        if (joyymove > 0)
+            forward -= forwardmove[speed];
+    }
+
+    if (gamekeydown[key_strafeleft]
+     || joybuttons[joybstrafeleft]
+     || mousebuttons[mousebstrafeleft])
+    {
+        side -= sidemove[speed];
+    }
+
+    if (gamekeydown[key_straferight]
+     || joybuttons[joybstraferight]
+     || mousebuttons[mousebstraferight])
+    {
+        side += sidemove[speed]; 
+    }
+
+    if (use_analog && joystrafemove)
+    {
+        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
+        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
+        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
+        side += FixedMul(sidemove[speed], joystrafemove);
+    }
+    else if (joystick_move_sensitivity)
+    {
+        if (joystrafemove < 0)
+            side -= sidemove[speed];
+        if (joystrafemove > 0)
+            side += sidemove[speed];
+    }
+    // buttons
+    cmd->chatchar = HU_dequeueChatChar(); 
+
+    // villsa [STRIFE] - add mouse button support for jump
+    if (gamekeydown[key_jump] || mousebuttons[mousebjump]
+     || joybuttons[joybjump])
+        cmd->buttons2 |= BT2_JUMP;
+ 
+    // villsa [STRIFE]: Moved mousebuttons[mousebfire] to below
+    if (gamekeydown[key_fire])
+        cmd->buttons |= BT_ATTACK;
+
+    // villsa [STRIFE]
+    if(mousebuttons[mousebfire])
+    {
+         if(mouse_fire_countdown <= 0)
+             cmd->buttons |= BT_ATTACK;
+         else
+             --mouse_fire_countdown;
+    }
+    if(joybuttons[joybfire])
+    {
+         if(joystick_fire_countdown <= 0)
+             cmd->buttons |= BT_ATTACK;
+         else
+             --joystick_fire_countdown;
+    }
+ 
+    if (gamekeydown[key_use]
+     || joybuttons[joybuse]
+     || mousebuttons[mousebuse])
+    { 
+        cmd->buttons |= BT_USE;
+        // clear double clicks if hit use button 
+        dclicks = 0;
+    } 
+
+    // If the previous or next weapon button is pressed, the
+    // next_weapon variable is set to change weapons when
+    // we generate a ticcmd.  Choose a new weapon.
+
+    if (gamestate == GS_LEVEL && next_weapon != 0)
+    {
+        i = G_NextWeapon(next_weapon);
+        cmd->buttons |= BT_CHANGE;
+        cmd->buttons |= i << BT_WEAPONSHIFT;
+    }
+    else
+    {
+        // Check weapon keys.
+
+        for (i=0; i<arrlen(weapon_keys); ++i)
+        {
+            int key = *weapon_keys[i];
+
+            if (gamekeydown[key])
+            {
+                cmd->buttons |= BT_CHANGE;
+                cmd->buttons |= i<<BT_WEAPONSHIFT;
+                break;
+            }
+        }
+    }
+
+    next_weapon = 0;
+
+    // mouse
+    if (mousebuttons[mousebforward]) 
+    {
+        forward += forwardmove[speed];
+    }
+    if (mousebuttons[mousebbackward])
+    {
+        forward -= forwardmove[speed];
+    }
+
+    if (dclick_use)
+    {
+        // forward double click
+        if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1 ) 
+        { 
+            dclickstate = mousebuttons[mousebforward]; 
+            if (dclickstate) 
+                dclicks++; 
+            if (dclicks == 2) 
+            { 
+                cmd->buttons |= BT_USE; 
+                dclicks = 0; 
+            } 
+            else 
+                dclicktime = 0; 
+        } 
+        else 
+        { 
+            dclicktime += ticdup; 
+            if (dclicktime > 20) 
+            { 
+                dclicks = 0; 
+                dclickstate = 0; 
+            } 
+        }
+        
+        // strafe double click
+        bstrafe =
+            mousebuttons[mousebstrafe] 
+            || joybuttons[joybstrafe]; 
+        if (bstrafe != dclickstate2 && dclicktime2 > 1 ) 
+        { 
+            dclickstate2 = bstrafe; 
+            if (dclickstate2) 
+                dclicks2++; 
+            if (dclicks2 == 2) 
+            { 
+                cmd->buttons |= BT_USE; 
+                dclicks2 = 0; 
+            } 
+            else 
+                dclicktime2 = 0; 
+        } 
+        else 
+        { 
+            dclicktime2 += ticdup; 
+            if (dclicktime2 > 20) 
+            { 
+                dclicks2 = 0; 
+                dclickstate2 = 0; 
+            } 
+        } 
+    }
+
+    forward += mousey; 
+
+    if (strafe) 
+        side += mousex*2; 
+    else 
+        cmd->angleturn -= mousex*0x8;
+
+    if (mousex == 0)
+    {
+        // No movement in the previous frame
+
+        testcontrols_mousespeed = 0;
+    }
+    
+    mousex = mousey = 0; 
+
+    if (forward > MAXPLMOVE) 
+        forward = MAXPLMOVE; 
+    else if (forward < -MAXPLMOVE) 
+        forward = -MAXPLMOVE; 
+    if (side > MAXPLMOVE) 
+        side = MAXPLMOVE; 
+    else if (side < -MAXPLMOVE) 
+        side = -MAXPLMOVE; 
+ 
+    cmd->forwardmove += forward; 
+    cmd->sidemove += side;
+    
+    // special buttons
+    if (sendpause) 
+    { 
+        sendpause = false; 
+        cmd->buttons = BT_SPECIAL | BTS_PAUSE; 
+    } 
+ 
+    if (sendsave) 
+    { 
+        sendsave = false; 
+        cmd->buttons = BT_SPECIAL | BTS_SAVEGAME | (savegameslot<<BTS_SAVESHIFT); 
+    } 
+
+    // low-res turning
+
+    if (lowres_turn)
+    {
+        static signed short carry = 0;
+        signed short desired_angleturn;
+
+        desired_angleturn = cmd->angleturn + carry;
+
+        // round angleturn to the nearest 256 unit boundary
+        // for recording demos with single byte values for turn
+
+        cmd->angleturn = (desired_angleturn + 128) & 0xff00;
+
+        // Carry forward the error from the reduced resolution to the
+        // next tic, so that successive small movements can accumulate.
+
+        carry = desired_angleturn - cmd->angleturn;
+    }
+} 
+ 
+
+//
+// G_DoLoadLevel 
+//
+void G_DoLoadLevel (void) 
+{ 
+    int             i; 
+
+    // haleyjd 10/03/10: [STRIFE] This is not done here.
+    //skyflatnum = R_FlatNumForName(DEH_String(SKYFLATNAME));
+
+    levelstarttic = gametic;        // for time calculation
+
+    if (wipegamestate == GS_LEVEL) 
+        wipegamestate = -1;             // force a wipe 
+
+    gamestate = GS_LEVEL; 
+
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+    { 
+        turbodetected[i] = false;
+
+        // haleyjd 20110204 [STRIFE]: PST_REBORN if players[i].health <= 0
+        if (playeringame[i] && (players[i].playerstate == PST_DEAD || players[i].health <= 0))
+            players[i].playerstate = PST_REBORN; 
+        memset (players[i].frags,0,sizeof(players[i].frags)); 
+    } 
+
+    P_SetupLevel (gamemap, 0, gameskill);    
+    displayplayer = consoleplayer;      // view the guy you are playing    
+    starttime = I_GetTime(); // haleyjd 20110204 [STRIFE]
+    gameaction = ga_nothing; 
+    Z_CheckHeap ();
+
+    // clear cmd building stuff
+
+    memset (gamekeydown, 0, sizeof(gamekeydown));
+    joyxmove = joyymove = joystrafemove = joylook = 0;
+    mousex = mousey = 0;
+    sendpause = sendsave = paused = false;
+    memset(mousearray, 0, sizeof(mousearray));
+    memset(joyarray, 0, sizeof(joyarray));
+
+    if (testcontrols)
+    {
+        players[consoleplayer].message = "Press escape to quit.";
+    }
+
+    P_DialogLoad(); // villsa [STRIFE]
+} 
+
+static void SetJoyButtons(unsigned int buttons_mask)
+{
+    int i;
+    player_t *const player = &players[consoleplayer];
+
+    for (i=0; i<MAX_JOY_BUTTONS; ++i)
+    {
+        int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!joybuttons[i] && button_on)
+        {
+            // Weapon cycling:
+
+            if (i == joybprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == joybnextweapon)
+            {
+                next_weapon = 1;
+            }
+            else if (i == joybinvleft)
+            {
+                if (player->inventorycursor > 0)
+                    player->inventorycursor--;
+            }
+            else if (i == joybinvright)
+            {
+                if (player->inventorycursor < player->numinventory - 1)
+                    player->inventorycursor++;
+            }
+        }
+
+        joybuttons[i] = button_on;
+    }
+}
+
+static void SetMouseButtons(unsigned int buttons_mask)
+{
+    int i;
+
+    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
+    {
+        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
+
+        // Detect button press:
+
+        if (!mousebuttons[i] && button_on)
+        {
+            if (i == mousebprevweapon)
+            {
+                next_weapon = -1;
+            }
+            else if (i == mousebnextweapon)
+            {
+                next_weapon = 1;
+            }
+        }
+
+	mousebuttons[i] = button_on;
+    }
+}
+
+//
+// G_Responder  
+// Get info needed to make ticcmd_ts for the players.
+// 
+boolean G_Responder (event_t* ev) 
+{ 
+    // allow spy mode changes even during the demo
+    if (gamestate == GS_LEVEL && ev->type == ev_keydown 
+        && ev->data1 == key_spy && (singledemo || !gameskill) ) // [STRIFE]: o_O
+    {
+        // spy mode 
+        do 
+        { 
+            displayplayer++; 
+            if (displayplayer == MAXPLAYERS) 
+                displayplayer = 0; 
+        } while (!playeringame[displayplayer] && displayplayer != consoleplayer); 
+        return true; 
+    }
+
+    // any other key pops up menu if in demos
+    if (gameaction == ga_nothing && !singledemo && 
+        (demoplayback || gamestate == GS_DEMOSCREEN) 
+        ) 
+    { 
+        if (ev->type == ev_keydown ||  
+            (ev->type == ev_mouse && ev->data1) || 
+            (ev->type == ev_joystick && ev->data1) ) 
+        { 
+            if(devparm && ev->data1 == 'g')
+                D_PageTicker(); // [STRIFE]: wat? o_O
+            else
+                M_StartControlPanel (); 
+            return true; 
+        } 
+        return false; 
+    } 
+
+    if (gamestate == GS_LEVEL) 
+    { 
+#if 0 
+        if (devparm && ev->type == ev_keydown && ev->data1 == ';') 
+        { 
+            G_DeathMatchSpawnPlayer (0); 
+            return true; 
+        } 
+#endif 
+        if (HU_Responder (ev)) 
+            return true;	// chat ate the event 
+        if (ST_Responder (ev)) 
+            return true;	// status window ate it 
+        if (AM_Responder (ev)) 
+            return true;	// automap ate it 
+    } 
+
+    if (gamestate == GS_FINALE) 
+    { 
+        if (F_Responder (ev)) 
+            return true;	// finale ate the event 
+    } 
+
+    if (testcontrols && ev->type == ev_mouse)
+    {
+        // If we are invoked by setup to test the controls, save the 
+        // mouse speed so that we can display it on-screen.
+        // Perform a low pass filter on this so that the thermometer 
+        // appears to move smoothly.
+
+        testcontrols_mousespeed = abs(ev->data2);
+    }
+
+    // If the next/previous weapon keys are pressed, set the next_weapon
+    // variable to change weapons when the next ticcmd is generated.
+
+    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
+    {
+        next_weapon = -1;
+    }
+    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
+    {
+        next_weapon = 1;
+    }
+
+    switch (ev->type) 
+    { 
+    case ev_keydown: 
+        if (ev->data1 == key_pause) 
+        { 
+            sendpause = true; 
+        }
+        else if (ev->data1 <NUMKEYS) 
+        {
+            gamekeydown[ev->data1] = true; 
+        }
+
+        return true;    // eat key down events 
+
+    case ev_keyup: 
+        if (ev->data1 <NUMKEYS) 
+            gamekeydown[ev->data1] = false; 
+        return false;   // always let key up events filter down 
+
+    case ev_mouse: 
+        SetMouseButtons(ev->data1);
+        mousex = ev->data2*(mouseSensitivity+5)/10; 
+        mousey = ev->data3*(mouseSensitivity+5)/10; 
+        return true;    // eat events 
+
+    case ev_joystick: 
+        SetJoyButtons(ev->data1);
+        joyxmove = ev->data2; 
+        joyymove = ev->data3; 
+        joystrafemove = ev->data4;
+        joylook = ev->data5;
+        return true;    // eat events 
+
+    default: 
+        break; 
+    } 
+
+    return false; 
+} 
+
+//
+// G_Ticker
+// Make ticcmd_ts for the players.
+//
+void G_Ticker (void) 
+{ 
+    int         i;
+    int         buf; 
+    ticcmd_t*   cmd;
+
+    // do player reborns if needed
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+        if (playeringame[i] && players[i].playerstate == PST_REBORN) 
+            G_DoReborn (i);
+
+    // do things to change the game state
+    while (gameaction != ga_nothing)
+    { 
+        switch (gameaction) 
+        { 
+        case ga_loadlevel: 
+            G_DoLoadLevel (); 
+            break; 
+        case ga_newgame:
+            G_DoNewGame (); 
+            break; 
+        case ga_loadgame: 
+            G_DoLoadGame(true); 
+            M_SaveMoveHereToMap(); // [STRIFE]
+            M_ReadMisObj();
+            break; 
+        case ga_savegame: 
+            M_SaveMoveMapToHere(); // [STRIFE]
+            M_SaveMisObj(savepath);
+            G_DoSaveGame(savepath); 
+            break; 
+        case ga_playdemo: 
+            G_DoPlayDemo (); 
+            break; 
+        case ga_completed: 
+            G_DoCompleted (); 
+            break; 
+        case ga_victory: 
+            F_StartFinale (); 
+            break; 
+        case ga_worlddone: 
+            G_DoWorldDone (); 
+            break; 
+        case ga_screenshot: 
+            V_ScreenShot("STRIFE%02i.%s"); // [STRIFE] file name, message
+            players[consoleplayer].message = DEH_String("STRIFE  by Rogue entertainment");
+            gameaction = ga_nothing; 
+            break; 
+        case ga_nothing: 
+            break; 
+        } 
+    }
+    
+    // get commands, check consistancy,
+    // and build new consistancy check
+    buf = (gametic/ticdup)%BACKUPTICS; 
+
+    // STRIFE-TODO: pnameprefixes bullcrap
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+        if (playeringame[i]) 
+        { 
+            cmd = &players[i].cmd; 
+
+            memcpy (cmd, &netcmds[i], sizeof(ticcmd_t)); 
+
+            if (demoplayback)
+                G_ReadDemoTiccmd (cmd); 
+            if (demorecording)
+                G_WriteDemoTiccmd (cmd);
+
+            // check for turbo cheats
+
+            // check ~ 4 seconds whether to display the turbo message. 
+            // store if the turbo threshold was exceeded in any tics
+            // over the past 4 seconds.  offset the checking period
+            // for each player so messages are not displayed at the
+            // same time.
+
+            if (cmd->forwardmove > TURBOTHRESHOLD)
+            {
+                turbodetected[i] = true;
+            }
+
+            if ((gametic & 31) == 0 
+                && ((gametic >> 5) % MAXPLAYERS) == i
+                && turbodetected[i])
+            {
+                static char turbomessage[80];
+                M_snprintf(turbomessage, sizeof(turbomessage),
+                           "%s is turbo!", player_names[i]);
+                players[consoleplayer].message = turbomessage;
+                turbodetected[i] = false;
+            }
+
+            if (netgame && !netdemo && !(gametic%ticdup) ) 
+            { 
+                if (gametic > BACKUPTICS 
+                    && consistancy[i][buf] != cmd->consistancy) 
+                { 
+                    I_Error ("consistency failure (%i should be %i)",
+                             cmd->consistancy, consistancy[i][buf]); 
+                } 
+                if (players[i].mo) 
+                    consistancy[i][buf] = players[i].mo->x; 
+                else 
+                    consistancy[i][buf] = rndindex; 
+            } 
+        }
+    }
+    
+    // check for special buttons
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+        if (playeringame[i]) 
+        { 
+            if (players[i].cmd.buttons & BT_SPECIAL) 
+            { 
+                switch (players[i].cmd.buttons & BT_SPECIALMASK) 
+                { 
+                case BTS_PAUSE: 
+                    paused ^= 1; 
+                    if (paused) 
+                        S_PauseSound (); 
+                    else 
+                        S_ResumeSound (); 
+                    break; 
+
+                case BTS_SAVEGAME: 
+                    if (!character_name[0]) // [STRIFE]
+                    {
+                        M_StringCopy(character_name, "NET GAME",
+                                     sizeof(character_name));
+                    }
+                    savegameslot =  
+                        (players[i].cmd.buttons & BTS_SAVEMASK)>>BTS_SAVESHIFT; 
+                    gameaction = ga_savegame; 
+                    break; 
+                } 
+            } 
+        }
+    }
+
+    // Have we just finished displaying an intermission screen?
+    // haleyjd 08/23/10: [STRIFE] No intermission.
+    /*
+    if (oldgamestate == GS_INTERMISSION && gamestate != GS_INTERMISSION)
+    {
+        WI_End();
+    }
+    */
+
+    oldgamestate = gamestate;
+
+    // do main actions
+    switch (gamestate) 
+    { 
+    case GS_LEVEL: 
+        P_Ticker (); 
+        ST_Ticker (); 
+        AM_Ticker (); 
+        HU_Ticker ();
+        break; 
+
+        // haleyjd 08/23/10: [STRIFE] No intermission.
+        /*
+    case GS_INTERMISSION: 
+        WI_Ticker (); 
+        break; 
+        */
+    case GS_UNKNOWN: // STRIFE-TODO: What is this? is it ever used??
+        F_WaitTicker();
+        break;
+
+    case GS_FINALE: 
+        F_Ticker (); 
+        break; 
+
+    case GS_DEMOSCREEN: 
+        D_PageTicker (); 
+        break;
+    }        
+} 
+ 
+ 
+//
+// PLAYER STRUCTURE FUNCTIONS
+// also see P_SpawnPlayer in P_Things
+//
+
+//
+// G_InitPlayer 
+// Called at the start.
+// Called by the game initialization functions.
+//
+// [STRIFE] No such function.
+/*
+void G_InitPlayer (int player) 
+{ 
+    player_t*	p; 
+ 
+    // set up the saved info         
+    p = &players[player]; 
+	 
+    // clear everything else to defaults 
+    G_PlayerReborn (player); 
+	 
+} 
+*/
+ 
+
+//
+// G_PlayerFinishLevel
+// Can when a player completes a level.
+//
+// [STRIFE] No such function. The equivalent to this logic was moved into
+// G_DoCompleted.
+/*
+void G_PlayerFinishLevel (int player) 
+{ 
+    player_t*	p; 
+	 
+    p = &players[player]; 
+	 
+    memset (p->powers, 0, sizeof (p->powers)); 
+    memset (p->cards, 0, sizeof (p->cards)); 
+    p->mo->flags &= ~MF_SHADOW;		// cancel invisibility 
+    p->extralight = 0;			// cancel gun flashes 
+    p->fixedcolormap = 0;		// cancel ir gogles 
+    p->damagecount = 0;			// no palette changes 
+    p->bonuscount = 0; 
+} 
+*/
+
+//
+// G_PlayerReborn
+// Called after a player dies 
+// almost everything is cleared and initialized 
+//
+// [STRIFE] Small changes for allegiance, inventory, health auto-use, and
+// mission objective.
+//
+void G_PlayerReborn (int player) 
+{ 
+    player_t*   p; 
+    int         i; 
+    int         frags[MAXPLAYERS]; 
+    int         killcount;
+    int         allegiance;
+
+    killcount = players[player].killcount;
+    allegiance = players[player].allegiance; // [STRIFE]
+
+    memcpy(frags,players[player].frags,sizeof(frags));
+
+    p = &players[player]; 
+    memset (p, 0, sizeof(*p)); 
+
+    memcpy(p->frags, frags, sizeof(p->frags));
+
+    p->usedown               = true;                 // don't do anything immediately
+    p->attackdown            = true;
+    p->inventorydown         = true;                 // villsa [STRIFE]
+    p->playerstate           = PST_LIVE;       
+    p->health                = deh_initial_health;   // Use dehacked value
+    p->readyweapon           = wp_fist;              // villsa [STRIFE] default to fists
+    p->pendingweapon         = wp_fist;              // villsa [STRIFE] default to fists
+    p->weaponowned[wp_fist]  = true;                 // villsa [STRIFE] default to fists
+    p->cheats               |= CF_AUTOHEALTH;        // villsa [STRIFE]
+    p->killcount             = killcount;
+    p->allegiance            = allegiance;           // villsa [STRIFE]
+    p->centerview            = true;                 // villsa [STRIFE]
+
+    for(i = 0; i < NUMAMMO; i++) 
+        p->maxammo[i] = maxammo[i]; 
+
+    // [STRIFE] clear inventory
+    for(i = 0; i < 32; i++)
+        p->inventory[i].type = NUMMOBJTYPES;
+
+    // villsa [STRIFE]: Default objective
+    M_StringCopy(mission_objective, DEH_String("Find help"),
+                 OBJECTIVE_LEN);
+}
+
+//
+// G_CheckSpot  
+// Returns false if the player cannot be respawned
+// at the given mapthing_t spot  
+// because something is occupying it 
+//
+// [STRIFE] Changed to eliminate body queue and an odd error message was added.
+//
+void P_SpawnPlayer (mapthing_t* mthing); 
+ 
+boolean
+G_CheckSpot
+( int		playernum,
+  mapthing_t*	mthing ) 
+{ 
+    fixed_t             x;
+    fixed_t             y; 
+    subsector_t*        ss; 
+    unsigned            an; 
+    mobj_t*             mo; 
+    int                 i;
+
+    if (!players[playernum].mo)
+    {
+        // [STRIFE] weird error message added here:
+        if(leveltime > 0)
+            players[playernum].message = DEH_String("you didn't have a body!");
+
+        // first spawn of level, before corpses
+        for (i=0 ; i<playernum ; i++)
+            if (players[i].mo->x == mthing->x << FRACBITS
+                && players[i].mo->y == mthing->y << FRACBITS)
+                return false;	
+        return true;
+    }
+
+    x = mthing->x << FRACBITS; 
+    y = mthing->y << FRACBITS; 
+
+    if (!P_CheckPosition (players[playernum].mo, x, y) ) 
+        return false; 
+
+    // flush an old corpse if needed
+    // [STRIFE] player corpses remove themselves after a short time, so
+    // evidently this wasn't needed.
+    /*
+    if (bodyqueslot >= BODYQUESIZE) 
+        P_RemoveMobj (bodyque[bodyqueslot%BODYQUESIZE]); 
+    bodyque[bodyqueslot%BODYQUESIZE] = players[playernum].mo; 
+    bodyqueslot++; 
+    */
+
+    // spawn a teleport fog 
+    ss = R_PointInSubsector (x,y); 
+    an = ( ANG45 * (((unsigned int) mthing->angle)/45) ) >> ANGLETOFINESHIFT; 
+
+    mo = P_SpawnMobj (x+20*finecosine[an], y+20*finesine[an] 
+                      , ss->sector->floorheight 
+                      , MT_TFOG); 
+
+    if (players[consoleplayer].viewz != 1) 
+        S_StartSound (mo, sfx_telept);	// don't start sound on first frame 
+
+    return true; 
+} 
+
+
+//
+// G_DeathMatchSpawnPlayer 
+// Spawns a player at one of the random death match spots 
+// called at level load and each death 
+//
+// [STRIFE]: Modified exit message to match binary.
+//
+void G_DeathMatchSpawnPlayer (int playernum) 
+{ 
+    int             i,j; 
+    int             selections; 
+
+    selections = deathmatch_p - deathmatchstarts; 
+    if (selections < 4) 
+        I_Error ("Only %i deathmatch spots, at least 4 required!", selections); 
+
+    for (j=0 ; j<20 ; j++) 
+    { 
+        i = P_Random() % selections; 
+        if (G_CheckSpot (playernum, &deathmatchstarts[i]) ) 
+        { 
+            deathmatchstarts[i].type = playernum+1; 
+            P_SpawnPlayer (&deathmatchstarts[i]); 
+            return; 
+        } 
+    } 
+
+    // no good spot, so the player will probably get stuck 
+    P_SpawnPlayer (&playerstarts[playernum]); 
+} 
+
+//
+// G_LoadPath
+//
+// haleyjd 20101003: [STRIFE] New function
+// Sets loadpath based on the map and "savepathtemp"
+//
+void G_LoadPath(int map)
+{
+    char mapbuf[33];
+
+    memset(mapbuf, 0, sizeof(mapbuf));
+    M_snprintf(mapbuf, sizeof(mapbuf), "%d", map);
+
+    // haleyjd: free if already set, and use M_SafeFilePath
+    if(loadpath)
+        Z_Free(loadpath);
+    loadpath = M_SafeFilePath(savepathtemp, mapbuf);
+}
+
+//
+// G_DoReborn
+// 
+void G_DoReborn (int playernum) 
+{ 
+    int                             i; 
+
+    if (!netgame)
+    {
+        // reload the level from scratch
+        // [STRIFE] Reborn level load
+        G_LoadPath(gamemap);
+        gameaction = ga_loadgame;
+    }
+    else 
+    {
+        // respawn at the start
+
+        // first dissasociate the corpse 
+        // [STRIFE] Checks for NULL first
+        if(players[playernum].mo)
+            players[playernum].mo->player = NULL;
+
+        // spawn at random spot if in death match 
+        if (deathmatch) 
+        { 
+            G_DeathMatchSpawnPlayer (playernum); 
+            return; 
+        } 
+
+        if (G_CheckSpot (playernum, &playerstarts[playernum]) ) 
+        { 
+            P_SpawnPlayer (&playerstarts[playernum]); 
+            return; 
+        }
+
+        // try to spawn at one of the other players spots 
+        for (i=0 ; i<MAXPLAYERS ; i++)
+        {
+            if (G_CheckSpot (playernum, &playerstarts[i]) ) 
+            { 
+                playerstarts[i].type = playernum+1;     // fake as other player 
+                P_SpawnPlayer (&playerstarts[i]);
+                playerstarts[i].type = i+1;             // restore 
+                return; 
+            }
+            // he's going to be inside something.  Too bad.
+        }
+        P_SpawnPlayer (&playerstarts[playernum]); 
+    } 
+} 
+ 
+//
+// G_ScreenShot
+//
+// [STRIFE] Verified unmodified
+//
+void G_ScreenShot (void) 
+{ 
+    gameaction = ga_screenshot; 
+} 
+
+// haleyjd 20100823: [STRIFE] Removed par times.
+
+//
+// G_DoCompleted 
+//
+
+//
+// G_RiftExitLevel
+//
+// haleyjd 20100824: [STRIFE] New function
+// * Called from some exit linedefs to exit to a specific riftspot in the 
+//   given destination map.
+//
+void G_RiftExitLevel(int map, int spot, angle_t angle)
+{
+    gameaction = ga_completed;
+    
+    // special handling for post-Sigil map changes
+    if(players[0].weaponowned[wp_sigil])
+    {
+        if(map == 3) // Front Base -> Abandoned Front Base
+            map = 30;
+        if(map == 7) // Castle -> New Front Base
+            map = 10;
+    }
+
+    // no rifting in deathmatch games
+    if(deathmatch)
+        spot = 0;
+
+    riftangle = angle;
+    riftdest  = spot;
+    destmap   = map;
+}
+
+//
+// G_Exit2
+//
+// haleyjd 20101003: [STRIFE] New function.
+// No xrefs to this, doesn't seem to be used. Could have gotten inlined
+// somewhere but I haven't seen it.
+//
+void G_Exit2(int dest, angle_t angle)
+{
+    riftdest = dest;
+    gameaction = ga_completed;
+    riftangle = angle;
+    destmap = gamemap;
+}
+
+//
+// G_ExitLevel
+//
+// haleyjd 20100824: [STRIFE]:
+// * Default to next map in numeric order; init destmap and riftdest.
+//
+void G_ExitLevel (int dest) 
+{
+    if(dest == 0)
+        dest = gamemap + 1;
+    destmap = dest;
+    riftdest = 0;
+    gameaction = ga_completed; 
+} 
+
+/*
+// haleyjd 20100823: [STRIFE] No secret exits in Strife.
+// Here's for the german edition.
+void G_SecretExitLevel (void) 
+{
+    // IF NO WOLF3D LEVELS, NO SECRET EXIT!
+    if ( (gamemode == commercial)
+        && (W_CheckNumForName("map31")<0))
+        secretexit = false;
+    else
+        secretexit = true; 
+    gameaction = ga_completed; 
+}
+*/
+
+//
+// G_StartFinale
+//
+// haleyjd 20100921: [STRIFE] New function.
+// This replaced G_SecretExitLevel in Strife. I don't know that it's actually
+// used anywhere in the game, but it *is* usable in mods via linetype 124,
+// W1 Start Finale.
+//
+void G_StartFinale(void)
+{
+    gameaction = ga_victory;
+}
+
+//
+// G_DoCompleted
+//
+// haleyjd 20100823: [STRIFE]:
+// * Removed G_PlayerFinishLevel and just sets some powerup states.
+// * Removed Chex, as not relevant to Strife.
+// * Removed DOOM level transfer logic 
+// * Removed intermission code.
+// * Added setting gameaction to ga_worlddone.
+//
+void G_DoCompleted (void) 
+{
+    int i;
+
+    // deal with powerup states
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        if(playeringame[i])
+        {
+            // [STRIFE] restore pw_allmap power from mapstate cache
+            if(destmap < 40)
+                players[i].powers[pw_allmap] = players[i].mapstate[destmap];
+
+            // Shadowarmor doesn't persist between maps in netgames
+            if(netgame)
+                players[i].powers[pw_invisibility] = 0;
+        }
+    }
+
+    stonecold = false;  // villsa [STRIFE]
+
+    if (automapactive) 
+        AM_Stop (); 
+
+    // [STRIFE] HUB SAVE
+    if(!deathmatch)
+        G_DoSaveGame(savepathtemp);
+    
+    gameaction = ga_worlddone;
+} 
+
+
+// haleyjd 20100824: [STRIFE] No secret exits.
+/*
+//
+// G_WorldDone 
+//
+void G_WorldDone (void) 
+{ 
+    gameaction = ga_worlddone; 
+
+    if (secretexit) 
+        players[consoleplayer].didsecret = true; 
+
+    if ( gamemode == commercial )
+    {
+	switch (gamemap)
+	{
+	  case 15:
+	  case 31:
+	    if (!secretexit)
+		break;
+	  case 6:
+	  case 11:
+	  case 20:
+	  case 30:
+	    F_StartFinale ();
+	    break;
+	}
+    }
+} 
+*/
+
+//
+// G_RiftPlayer
+//
+// haleyjd 20100824: [STRIFE] New function
+// Teleports the player to the appropriate rift spot.
+//
+void G_RiftPlayer(void)
+{
+    if(riftdest)
+    {
+        P_TeleportMove(players[0].mo, 
+                       riftSpots[riftdest - 1].x << FRACBITS, 
+                       riftSpots[riftdest - 1].y << FRACBITS);
+        players[0].mo->angle  = riftangle;
+        players[0].mo->health = players[0].health;
+    }
+}
+
+//
+// G_RiftCheat
+//
+// haleyjd 20100824: [STRIFE] New function
+// Called from the cheat code to jump to a rift spot.
+//
+boolean G_RiftCheat(int riftSpotNum)
+{
+    return P_TeleportMove(players[0].mo,
+                          riftSpots[riftSpotNum - 1].x << FRACBITS,
+                          riftSpots[riftSpotNum - 1].y << FRACBITS);
+}
+
+//
+// G_DoWorldDone
+//
+// haleyjd 20100824: [STRIFE] Added destmap -> gamemap set.
+//
+void G_DoWorldDone (void) 
+{        
+    int temp_leveltime = leveltime;
+    boolean temp_shadow = false;
+    boolean temp_mvis   = false;
+
+    gamestate = GS_LEVEL; 
+    gamemap = destmap;
+
+    // [STRIFE] HUB LOAD
+    G_LoadPath(destmap);
+    if (!deathmatch)
+    {
+        // Remember Shadowarmor across hub loads
+        if(players[0].mo->flags & MF_SHADOW)
+            temp_shadow = true;
+        if(players[0].mo->flags & MF_MVIS)
+            temp_mvis = true;
+    }
+    G_DoLoadGame(false);
+
+    // [STRIFE] leveltime carries over between maps
+    leveltime = temp_leveltime;
+
+    if(!deathmatch)
+    {
+        // [STRIFE]: transfer saved powerups
+        players[0].mo->flags &= ~(MF_SHADOW|MF_MVIS);
+        if(temp_shadow)
+            players[0].mo->flags |= MF_SHADOW;
+        if(temp_mvis)
+            players[0].mo->flags |= MF_MVIS;
+
+        // [STRIFE] HUB SAVE
+        G_RiftPlayer();
+        G_DoSaveGame(savepathtemp);
+        M_SaveMisObj(savepathtemp);
+    }
+
+    gameaction = ga_nothing; 
+    viewactive = true; 
+} 
+
+//
+// G_DoWorldDone2
+//
+// haleyjd 20101003: [STRIFE] New function. No xrefs; unused.
+//
+void G_DoWorldDone2(void)
+{
+    gamestate = GS_LEVEL;
+    gameaction = ga_nothing;
+    viewactive = true;
+}
+
+//
+// G_ReadCurrent
+//
+// haleyjd 20101003: [STRIFE] New function.
+// Reads the "CURRENT" file from the given path and then sets it to
+// gamemap.
+//
+void G_ReadCurrent(const char *path)
+{
+    char *temppath = NULL;
+    byte *buffer = NULL;
+
+    temppath = M_SafeFilePath(path, "\\current");
+
+    if(M_ReadFile(temppath, &buffer) <= 0)
+        gameaction = ga_newgame;
+    else
+    {
+        // haleyjd 20110211: do endian-correct read
+        gamemap = (((int)buffer[0])       |
+                   ((int)buffer[1] <<  8) |
+                   ((int)buffer[2] << 16) |
+                   ((int)buffer[3] << 24));
+        gameaction = ga_loadgame;
+        Z_Free(buffer);
+    }
+
+    Z_Free(temppath);
+    
+    G_LoadPath(gamemap);
+}
+
+//
+// G_InitFromSavegame
+// Can be called by the startup code or the menu task. 
+//
+
+char	savename[256];
+
+// [STRIFE]: No such function.
+/*
+void G_LoadGame (char* name)
+{
+    M_StringCopy(savename, name, sizeof(savename));
+    gameaction = ga_loadgame;
+}
+*/
+
+// haleyjd 20100928: [STRIFE] VERSIONSIZE == 8
+#define VERSIONSIZE             8
+
+void G_DoLoadGame (boolean userload) 
+{
+    int savedleveltime;
+
+    gameaction = ga_nothing;
+
+    save_stream = M_fopen(loadpath, "rb");
+
+    // [STRIFE] If the file does not exist, G_DoLoadLevel is called.
+    if (save_stream == NULL)
+    {
+        G_DoLoadLevel();
+        return;
+    }
+
+    savegame_error = false;
+
+    if (!P_ReadSaveGameHeader())
+    {
+        fclose(save_stream);
+        return;
+    }
+
+    // haleyjd: A comment would be good here, fraggle...
+    // Evidently this is a Choco-ism, necessitated by reading the savegame
+    // header *before* calling G_DoLoadLevel.
+    savedleveltime = leveltime;
+    
+    // load a base level
+
+    // STRIFE-TODO: ????
+    if(userload)
+        G_InitNew(gameskill, gamemap); 
+    else
+        G_DoLoadLevel();
+ 
+    leveltime = savedleveltime;
+
+    // dearchive all the modifications
+    // [STRIFE] some portions of player_t are not overwritten when loading
+    //   between hub levels
+    P_UnArchivePlayers (userload); 
+    P_UnArchiveWorld (); 
+    P_UnArchiveThinkers (); 
+    P_UnArchiveSpecials (); 
+ 
+    if (!P_ReadSaveGameEOF())
+        I_Error ("Bad savegame");
+
+    fclose(save_stream);
+    
+    if (setsizeneeded)
+        R_ExecuteSetViewSize ();
+    
+    // draw the pattern into the back screen
+    R_FillBackScreen ();
+} 
+
+//
+// G_WriteSaveName
+//
+// haleyjd 20101003: [STRIFE] New function
+//
+// Writes the character name to the NAME file.
+//
+boolean G_WriteSaveName(int slot, const char *charname)
+{
+    //char savedir[16];
+    char *tmpname;
+    boolean retval;
+
+    savegameslot = slot;
+
+    // haleyjd: removed special -cdrom treatment, as I believe it is taken
+    // care of automatically via using Choco's savegamedir setting.
+
+    // haleyjd: free previous path, if any, and allocate new one using
+    // M_SafeFilePath routine, which isn't limited to 128 characters.
+    if(savepathtemp)
+        Z_Free(savepathtemp);
+    savepathtemp = M_SafeFilePath(savegamedir, "strfsav6.ssg");
+
+    // haleyjd: as above.
+    if(savepath)
+        Z_Free(savepath);
+    savepath = M_SafeFilePath(savegamedir, M_MakeStrifeSaveDir(savegameslot, ""));
+
+    // haleyjd: memset full character_name for safety
+    memset(character_name, 0, CHARACTER_NAME_LEN);
+    M_StringCopy(character_name, charname, sizeof(character_name));
+
+    // haleyjd: use M_SafeFilePath
+    tmpname = M_SafeFilePath(savepathtemp, "name");
+
+    // Write the "name" file under the directory
+    retval = M_WriteFile(tmpname, character_name, 32);
+
+    Z_Free(tmpname);
+
+    return retval;
+}
+
+//
+// G_SaveGame
+// Called by the menu task.
+// Description is a 24 byte text string
+//
+// [STRIFE] No such function, at least in v1.2
+// STRIFE-TODO: Does this make a comeback in v1.31?
+/*
+void
+G_SaveGame
+( int	slot,
+  char*	description )
+{
+    savegameslot = slot;
+    M_StringCopy(savedescription, description, sizeof(savedescription));
+    sendsave = true;
+}
+*/
+
+void G_DoSaveGame (char *path)
+{ 
+    char *current_path;
+    char *savegame_file;
+    char *temp_savegame_file;
+    byte gamemapbytes[4];
+    char gamemapstr[33];
+
+    temp_savegame_file = P_TempSaveGameFile();
+    
+    // [STRIFE] custom save file path logic
+    memset(gamemapstr, 0, sizeof(gamemapstr));
+    M_snprintf(gamemapstr, sizeof(gamemapstr), "%d", gamemap);
+    savegame_file = M_SafeFilePath(path, gamemapstr);
+
+    // [STRIFE] write the "current" file, which tells which hub map
+    //   the save slot is currently on.
+    current_path = M_SafeFilePath(path, "current");
+    // haleyjd: endian-agnostic IO
+    gamemapbytes[0] = (byte)( gamemap        & 0xff);
+    gamemapbytes[1] = (byte)((gamemap >>  8) & 0xff);
+    gamemapbytes[2] = (byte)((gamemap >> 16) & 0xff);
+    gamemapbytes[3] = (byte)((gamemap >> 24) & 0xff);
+    M_WriteFile(current_path, gamemapbytes, 4);
+    Z_Free(current_path);
+
+    // Open the savegame file for writing.  We write to a temporary file
+    // and then rename it at the end if it was successfully written.
+    // This prevents an existing savegame from being overwritten by 
+    // a corrupted one, or if a savegame buffer overrun occurs.
+
+    save_stream = M_fopen(temp_savegame_file, "wb");
+
+    if (save_stream == NULL)
+    {
+        return;
+    }
+
+    savegame_error = false;
+
+    P_WriteSaveGameHeader(savedescription);
+ 
+    P_ArchivePlayers (); 
+    P_ArchiveWorld (); 
+    P_ArchiveThinkers (); 
+    P_ArchiveSpecials (); 
+
+    P_WriteSaveGameEOF();
+
+    // Enforce the same savegame size limit as in Vanilla Doom, 
+    // except if the vanilla_savegame_limit setting is turned off.
+    // [STRIFE]: Verified subject to same limit.
+
+    if (vanilla_savegame_limit && ftell(save_stream) > SAVEGAMESIZE)
+    {
+        I_Error ("Savegame buffer overrun");
+    }
+    
+    // Finish up, close the savegame file.
+
+    fclose(save_stream);
+
+    // Now rename the temporary savegame file to the actual savegame
+    // file, overwriting the old savegame if there was one there.
+
+    M_remove(savegame_file);
+    M_rename(temp_savegame_file, savegame_file);
+    
+    // haleyjd: free the savegame_file path
+    Z_Free(savegame_file);
+
+    gameaction = ga_nothing; 
+    //M_StringCopy(savedescription, "", sizeof(savedescription));
+
+    // [STRIFE]: custom message logic
+    if(!strcmp(path, savepath))
+    {
+        M_snprintf(savename, sizeof(savename), "%s saved.", character_name);
+        players[consoleplayer].message = savename;
+    }
+
+    // draw the pattern into the back screen
+    R_FillBackScreen ();
+} 
+ 
+
+//
+skill_t d_skill; 
+//int     d_episode; [STRIFE] No such thing as episodes in Strife
+int     d_map; 
+
+//
+// G_DeferedInitNew
+//
+// Can be called by the startup code or the menu task,
+// consoleplayer, displayplayer, playeringame[] should be set. 
+//
+// haleyjd 20100922: [STRIFE] Removed episode parameter
+//
+void G_DeferedInitNew(skill_t skill, int map)
+{ 
+    d_skill = skill; 
+    d_map = map; 
+    gameaction = ga_newgame; 
+} 
+
+//
+// G_DoNewGame
+//
+// [STRIFE] Code added to turn off the stonecold effect.
+//   Someone also removed the nomonsters reset...
+//
+void G_DoNewGame (void) 
+{
+    demoplayback = false; 
+    netdemo = false;
+    netgame = false;
+    deathmatch = false;
+    playeringame[1] = playeringame[2] = playeringame[3] = 0;
+    respawnparm = false;
+    fastparm = false;
+    stonecold = false;      // villsa [STRIFE]
+    //nomonsters = false;   [STRIFE] not set here!?!
+    consoleplayer = 0;
+    G_InitNew (d_skill, d_map);
+    gameaction = ga_nothing; 
+} 
+
+//
+// G_InitNew
+//
+// haleyjd 20100824: [STRIFE]:
+// * Added riftdest initialization
+// * Removed episode parameter
+//
+void
+G_InitNew
+( skill_t       skill,
+  int           map ) 
+{ 
+    const char *skytexturename;
+    int             i; 
+
+    if (paused) 
+    { 
+        paused = false; 
+        S_ResumeSound (); 
+    } 
+
+    if (skill > sk_nightmare) 
+        skill = sk_nightmare;
+
+    // [STRIFE] Removed episode nonsense and gamemap clipping
+
+    M_ClearRandom (); 
+
+    if (skill == sk_nightmare || respawnparm )
+        respawnmonsters = true;
+    else
+        respawnmonsters = false;
+
+    // [STRIFE] Strife skill level mobjinfo/states tweaking
+    // BUG: None of this code runs properly when loading save games, so
+    // basically it's impossible to play any skill level properly unless
+    // you never quit and reload from the command line.
+    if(!skill && gameskill)
+    {
+        // Setting to Baby skill... make things easier.
+
+        // Acolytes walk, attack, and feel pain slower
+        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
+            states[i].tics *= 2; 
+
+        // Reavers attack slower
+        for(i = S_ROB1_10; i <= S_ROB1_15; i++)
+            states[i].tics *= 2;
+
+        // Turrets attack slower
+        for(i = S_TURT_02; i <= S_TURT_03; i++)
+            states[i].tics *= 2;
+
+        // Crusaders attack and feel pain slower
+        for(i = S_ROB2_09; i <= S_ROB2_19; i++)
+            states[i].tics *= 2;
+
+        // Stalkers think, walk, and attack slower
+        for(i = S_SPID_03; i <= S_SPID_10; i++)
+            states[i].tics *= 2;
+
+        // The Bishop's homing missiles are faster (what?? BUG?)
+        mobjinfo[MT_SEEKMISSILE].speed *= 2;
+    }
+    if(skill && !gameskill)
+    {
+        // Setting a higher skill when previously on baby... make things normal
+
+        // Acolytes
+        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
+            states[i].tics >>= 1; 
+
+        // Reavers
+        for(i = S_ROB1_10; i <= S_ROB1_15; i++)
+            states[i].tics >>= 1;
+
+        // Turrets
+        for(i = S_TURT_02; i <= S_TURT_03; i++)
+            states[i].tics >>= 1;
+
+        // Crusaders
+        for(i = S_ROB2_09; i <= S_ROB2_19; i++)
+            states[i].tics >>= 1;
+
+        // Stalkers
+        for(i = S_SPID_03; i <= S_SPID_10; i++)
+            states[i].tics >>= 1;
+
+        // The Bishop's homing missiles - again, seemingly backward.
+        mobjinfo[MT_SEEKMISSILE].speed >>= 1;
+    }
+    if(fastparm || (skill == sk_nightmare && skill != gameskill))
+    {
+        // BLOODBATH! Make some things super-aggressive.
+        
+        // Acolytes walk, attack, and feel pain twice as fast
+        // (This makes just getting out of the first room almost impossible)
+        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
+            states[i].tics >>= 1;
+
+        // Bishop's homing missiles again get SLOWER and not faster o_O
+        mobjinfo[MT_SEEKMISSILE].speed >>= 1;
+    }
+    else if(skill != sk_nightmare && gameskill == sk_nightmare)
+    {
+        // Setting back to an ordinary skill after being on Bloodbath?
+        // Put stuff back to normal.
+
+        // Acolytes
+        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
+            states[i].tics *= 2;
+
+        // Bishop's homing missiles
+        mobjinfo[MT_SEEKMISSILE].speed *= 2;
+    }
+
+    // force players to be initialized upon first level load
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+        players[i].playerstate = PST_REBORN; 
+
+    usergame = true;                // will be set false if a demo 
+    paused = false; 
+    demoplayback = false; 
+    automapactive = false; 
+    viewactive = true; 
+    //gameepisode = episode; [STRIFE] no episodes
+    gamemap = map; 
+    gameskill = skill; 
+    riftdest = 0; // haleyjd 08/24/10: [STRIFE] init riftdest to zero on new game
+
+    // Set the sky to use.
+    //
+    // Note: This IS broken, but it is how Vanilla Doom behaves.
+    // See http://doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
+    //
+    // Because we set the sky here at the start of a game, not at the
+    // start of a level, the sky texture never changes unless we
+    // restore from a saved game.  This was fixed before the Doom
+    // source release, but this IS the way Vanilla DOS Doom behaves.
+
+    // [STRIFE] Strife skies (of which there are but two)
+    if(gamemap >= 9 && gamemap < 32)
+        skytexturename = "skymnt01";
+    else
+        skytexturename = "skymnt02";
+
+    skytexturename = DEH_String(skytexturename);
+
+    skytexture = R_TextureNumForName(skytexturename);
+
+    // [STRIFE] HUBS
+    G_LoadPath(gamemap);
+    G_DoLoadLevel();
+} 
+ 
+
+//
+// DEMO RECORDING 
+// 
+#define DEMOMARKER		0x80
+
+//
+// G_ReadDemoTiccmd
+//
+// [STRIFE] Modified for Strife ticcmd_t
+//
+void G_ReadDemoTiccmd (ticcmd_t* cmd) 
+{ 
+    if (*demo_p == DEMOMARKER) 
+    {
+        // end of demo data stream 
+        G_CheckDemoStatus (); 
+        return; 
+    }
+    cmd->forwardmove = ((signed char)*demo_p++); 
+    cmd->sidemove = ((signed char)*demo_p++); 
+    cmd->angleturn = ((unsigned char) *demo_p++)<<8; 
+    cmd->buttons = (unsigned char)*demo_p++; 
+    cmd->buttons2 = (unsigned char)*demo_p++; // [STRIFE]
+    cmd->inventory = (int)*demo_p++;          // [STRIFE]
+}
+
+// Increase the size of the demo buffer to allow unlimited demos
+
+static void IncreaseDemoBuffer(void)
+{
+    int current_length;
+    byte *new_demobuffer;
+    byte *new_demop;
+    int new_length;
+
+    // Find the current size
+
+    current_length = demoend - demobuffer;
+    
+    // Generate a new buffer twice the size
+    new_length = current_length * 2;
+    
+    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
+    new_demop = new_demobuffer + (demo_p - demobuffer);
+
+    // Copy over the old data
+
+    memcpy(new_demobuffer, demobuffer, current_length);
+
+    // Free the old buffer and point the demo pointers at the new buffer.
+
+    Z_Free(demobuffer);
+
+    demobuffer = new_demobuffer;
+    demo_p = new_demop;
+    demoend = demobuffer + new_length;
+}
+
+//
+// G_WriteDemoTiccmd
+//
+// [STRIFE] Modified for Strife ticcmd_t.
+//
+void G_WriteDemoTiccmd (ticcmd_t* cmd) 
+{ 
+    byte *demo_start;
+
+    if (gamekeydown[key_demo_quit])           // press q to end demo recording 
+        G_CheckDemoStatus (); 
+
+    demo_start = demo_p;
+
+    *demo_p++ = cmd->forwardmove; 
+    *demo_p++ = cmd->sidemove; 
+    *demo_p++ = cmd->angleturn >> 8; 
+    *demo_p++ = cmd->buttons; 
+    *demo_p++ = cmd->buttons2;                 // [STRIFE]
+    *demo_p++ = (byte)(cmd->inventory & 0xff); // [STRIFE]
+
+    // reset demo pointer back
+    demo_p = demo_start;
+
+    if (demo_p > demoend - 16)
+    {
+        if (vanilla_demo_limit)
+        {
+            // no more space 
+            G_CheckDemoStatus (); 
+            return; 
+        }
+        else
+        {
+            // Vanilla demo limit disabled: unlimited
+            // demo lengths!
+
+            IncreaseDemoBuffer();
+        }
+    } 
+
+    G_ReadDemoTiccmd (cmd);         // make SURE it is exactly the same 
+} 
+ 
+ 
+ 
+//
+// G_RecordDemo 
+// 
+// [STRIFE] Verified unmodified
+//
+void G_RecordDemo (const char* name)
+{
+    size_t demoname_size;
+    int             i;
+    int             maxsize;
+
+    usergame = false;
+    demoname_size = strlen(name) + 5;
+    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
+    M_snprintf(demoname, demoname_size, "%s.lmp", name);
+    maxsize = 0x20000;
+
+    //!
+    // @arg <size>
+    // @category demo
+    // @vanilla
+    //
+    // Specify the demo buffer size (KiB)
+    //
+
+    i = M_CheckParmWithArgs("-maxdemo", 1);
+    if (i)
+        maxsize = atoi(myargv[i+1])*1024;
+    demobuffer = Z_Malloc (maxsize,PU_STATIC,NULL); 
+    demoend = demobuffer + maxsize;
+
+    demorecording = true; 
+} 
+ 
+ 
+void G_BeginRecording (void) 
+{ 
+    int             i; 
+
+    //
+    // @category demo
+    //
+    // Record a high resolution "Doom 1.91" demo.
+    //
+    
+    // STRIFE-TODO: if somebody makes a "Strife Plus", we could add this.
+    /*
+    longtics = M_CheckParm("-longtics") != 0;
+    */
+    longtics = false;
+
+    // If not recording a longtics demo, record in low res
+    lowres_turn = !longtics;
+
+    demo_p = demobuffer;
+
+    // Save the right version code for this demo
+    *demo_p++ = STRIFE_VERSION;
+
+    *demo_p++ = gameskill; 
+    //*demo_p++ = gameepisode; [STRIFE] Doesn't have episodes.
+    *demo_p++ = gamemap; 
+    *demo_p++ = deathmatch; 
+    *demo_p++ = respawnparm;
+    *demo_p++ = fastparm;
+    *demo_p++ = nomonsters;
+    *demo_p++ = consoleplayer;
+ 
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+        *demo_p++ = playeringame[i]; 
+} 
+ 
+
+//
+// G_PlayDemo 
+//
+
+const char	*defdemoname;
+ 
+//
+// G_DeferedPlayDemo
+//
+// [STRIFE] Verified unmodified
+//
+void G_DeferedPlayDemo(const char *name)
+{ 
+    defdemoname = name; 
+    gameaction = ga_playdemo; 
+} 
+
+// Generate a string describing a demo version
+// [STRIFE] Modified to handle the one and only Strife demo version.
+static const char *DemoVersionDescription(int version)
+{
+    static char resultbuf[16];
+ 
+    // [STRIFE] All versions of Strife 1.1 and later use 101 as their 
+    // internal version number. Brilliant, huh? So we can't discern much
+    // here.
+
+    switch (version)
+    {
+    case 100: 
+        return "v1.0"; // v1.0 would be the ancient demo version
+    default:
+        break;
+    }
+
+    // Unknown version. Who knows?
+    M_snprintf(resultbuf, sizeof(resultbuf),
+               "%i.%i (unknown)", version / 100, version % 100);
+
+    return resultbuf;
+}
+
+//
+// G_DoPlayDemo
+//
+// [STRIFE] Modified for Strife demo format.
+//
+void G_DoPlayDemo (void) 
+{ 
+    skill_t skill; 
+    int     i, map; 
+    int     demoversion;
+
+    gameaction = ga_nothing; 
+    demobuffer = demo_p = W_CacheLumpName (defdemoname, PU_STATIC); 
+
+    demoversion = *demo_p++;
+
+    if (demoversion == STRIFE_VERSION)
+    {
+        longtics = false;
+    }
+    /* STRIFE-TODO: Not until/unless somebody makes a Strife-Plus :P
+    else if (demoversion == DOOM_191_VERSION)
+    {
+        // demo recorded with cph's modified "v1.91" doom exe
+        longtics = true;
+    }
+    */
+    else
+    {
+        const char *message = "Demo is from a different game version!\n"
+                              "(read %i, should be %i)\n"
+                              "\n"
+                              "*** You may need to upgrade your version "
+                                  "of Strife to v1.1 or later. ***\n"
+                              "    See: https://www.doomworld.com/classicdoom"
+                                        "/info/patches.php\n"
+                              "    This appears to be %s.";
+
+        I_Error(message, demoversion, STRIFE_VERSION,
+                         DemoVersionDescription(demoversion));
+    }
+    
+    skill = *demo_p++; 
+    //episode = *demo_p++; [STRIFE] No episodes
+    map = *demo_p++; 
+    deathmatch = *demo_p++;
+    respawnparm = *demo_p++;
+    fastparm = *demo_p++;
+    nomonsters = *demo_p++;
+    consoleplayer = *demo_p++;
+
+    for (i=0 ; i<MAXPLAYERS ; i++) 
+        playeringame[i] = *demo_p++; 
+
+    //!
+    // @category demo
+    // 
+    // Play back a demo recorded in a netgame with a single player.
+    //
+
+    if (playeringame[1] || M_ParmExists("-solo-net"))
+    {
+	netgame = true;
+	netdemo = true;
+    }
+
+    // don't spend a lot of time in loadlevel 
+    precache = false;
+    G_InitNew(skill, map); 
+    precache = true; 
+    
+    // [STRIFE] not here...
+    //starttime = I_GetTime (); 
+
+    usergame = false; 
+    demoplayback = true; 
+} 
+
+//
+// G_TimeDemo 
+//
+// [STRIFE] Verified unmodified
+//
+void G_TimeDemo (char* name) 
+{
+    //!
+    // @category video
+    // @vanilla
+    //
+    // Disable rendering the screen entirely.
+    //
+
+    nodrawers = M_ParmExists("-nodraw");
+
+    timingdemo = true; 
+    singletics = true; 
+
+    defdemoname = name; 
+    gameaction = ga_playdemo; 
+} 
+ 
+ 
+/* 
+=================== 
+= 
+= G_CheckDemoStatus 
+= 
+= Called after a death or level completion to allow demos to be cleaned up 
+= Returns true if a new demo loop action will take place 
+=================== 
+*/ 
+//
+// [STRIFE] Verified unmodified
+//
+boolean G_CheckDemoStatus (void) 
+{ 
+    int             endtime; 
+
+    if (timingdemo) 
+    { 
+        float fps;
+        int realtics;
+
+        endtime = I_GetTime (); 
+        realtics = endtime - starttime;
+        fps = ((float) gametic * TICRATE) / realtics;
+
+        // Prevent recursive calls
+        timingdemo = false;
+        demoplayback = false;
+
+        I_Error ("timed %i gametics in %i realtics (%f fps)",
+                 gametic, realtics, fps);
+    } 
+
+    if (demoplayback) 
+    { 
+        W_ReleaseLumpName(defdemoname);
+        demoplayback = false; 
+        netdemo = false;
+        netgame = false;
+        deathmatch = false;
+        playeringame[1] = playeringame[2] = playeringame[3] = 0;
+        respawnparm = false;
+        fastparm = false;
+        nomonsters = false;
+        consoleplayer = 0;
+        
+        if (singledemo) 
+            I_Quit (); 
+        else 
+            D_AdvanceDemo (); 
+
+        return true; 
+    } 
+ 
+    if (demorecording) 
+    { 
+        *demo_p++ = DEMOMARKER; 
+        M_WriteFile (demoname, demobuffer, demo_p - demobuffer); 
+        Z_Free (demobuffer); 
+        demorecording = false; 
+        I_Error ("Demo %s recorded", demoname); 
+    } 
+
+    return false; 
+} 
diff --git a/games/NXDoom/src/strife/g_game.h b/games/NXDoom/src/strife/g_game.h
new file mode 100644
index 000000000..9a0e47fb4
--- /dev/null
+++ b/games/NXDoom/src/strife/g_game.h
@@ -0,0 +1,89 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Duh.
+// 
+
+
+#ifndef __G_GAME__
+#define __G_GAME__
+
+#include "doomdef.h"
+#include "d_event.h"
+#include "d_ticcmd.h"
+#include "tables.h"
+
+//
+// GAME
+//
+void G_DeathMatchSpawnPlayer (int playernum);
+
+// [STRIFE] Removed episode parameter
+void G_InitNew (skill_t skill, int map);
+
+// Can be called by the startup code or M_Responder.
+// A normal game starts at map 1,
+// but a warp test can start elsewhere
+// [STRIFE] Removed episode parameter
+void G_DeferedInitNew (skill_t skill, int map);
+
+void G_DeferedPlayDemo(const char *demo);
+
+// Can be called by the startup code or M_Responder,
+// calls P_SetupLevel or W_EnterWorld.
+void G_LoadGame (char* name);
+
+void G_DoLoadGame (boolean userload);
+
+// Called by M_Responder.
+void G_SaveGame (int slot, char* description);
+
+// Only called by startup code.
+void G_RecordDemo (const char* name);
+
+void G_BeginRecording (void);
+
+void G_PlayDemo (char* name);
+void G_TimeDemo (char* name);
+boolean G_CheckDemoStatus (void);
+
+void G_RiftExitLevel(int map, int spot, angle_t angle); // [STRIFE]
+void G_ExitLevel (int dest);
+//void G_SecretExitLevel (void);
+
+void G_StartFinale(void); // [STRIFE]
+
+//void G_WorldDone (void);
+
+boolean G_RiftCheat(int riftSpotNum); // [STRIFE]
+
+// Read current data from inputs and build a player movement command.
+
+void G_BuildTiccmd (ticcmd_t *cmd, int maketic);
+
+void G_Ticker (void);
+boolean G_Responder (event_t*	ev);
+
+void G_ScreenShot (void);
+
+void G_DrawMouseSpeedBox(void);
+
+// [STRIFE]
+boolean G_WriteSaveName(int slot, const char *charname);
+void    G_ReadCurrent(const char *path);
+
+extern int vanilla_savegame_limit;
+extern int vanilla_demo_limit;
+#endif
diff --git a/games/NXDoom/src/strife/hu_lib.c b/games/NXDoom/src/strife/hu_lib.c
new file mode 100644
index 000000000..386c17d9d
--- /dev/null
+++ b/games/NXDoom/src/strife/hu_lib.c
@@ -0,0 +1,474 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  heads-up text and input code
+//
+
+
+#include <ctype.h>
+
+#include "doomdef.h"
+#include "doomkeys.h"
+
+#include "v_video.h"
+#include "i_swap.h"
+
+#include "d_main.h"
+#include "hu_lib.h"
+#include "r_local.h"
+#include "r_draw.h"
+#include "hu_stuff.h" // [STRIFE]
+
+#include "doomstat.h"
+
+// boolean : whether the screen is always erased
+#define noterased viewwindowx
+
+
+//
+// HUlib_drawYellowText
+//
+// haleyjd 20100918: [STRIFE] New function.
+//
+void HUlib_drawYellowText(int x, int y, const char *text)
+{
+    int start_x = x;
+    const char *rover = text;
+    char c;
+
+    while((c = *rover++))
+    {
+        if(c == '\n')
+        {
+            x = start_x;
+            y += 12;
+            continue;
+        }
+
+        // haleyjd 20110213: found MORE code ignored/misinterpreted by Hex-Rays:
+        // Underscores are replaced by spaces.
+        if(c == '_')
+            c = ' ';
+        else if (c == ' ' && x == start_x) // skip spaces at the start of a line
+            continue;
+
+        c = toupper(c) - HU_FONTSTART;
+
+        if(c >= 0 && c < HU_FONTSIZE)
+        {
+            patch_t *patch = yfont[(int) c];
+            int      width = SHORT(patch->width);
+
+            if(x + width <= (SCREENWIDTH - 20))
+            {
+                // haleyjd: STRIFE-TODO: bit different than the exe... for now
+                if(!D_PatchClipCallback(patch, x + SHORT(patch->leftoffset),
+                    y + SHORT(patch->topoffset)))
+                    return;
+                V_DrawPatchDirect(x, y, patch);
+                x = x + width;
+            }
+            else
+            {
+                x = start_x;
+                --rover;
+                y += 12;
+            }
+        }
+        else
+        {
+            x += 4;
+        }
+    }
+}
+
+//
+// HUlib_init
+//
+// [STRIFE] Verified unmodified.
+//
+void HUlib_init(void)
+{
+}
+
+//
+// HUlib_clearTextLine
+// 
+// [STRIFE] Verified unmodified.
+//
+void HUlib_clearTextLine(hu_textline_t* t)
+{
+    t->len = 0;
+    t->l[0] = 0;
+    t->needsupdate = true;
+}
+
+//
+// HUlib_initTextLine
+//
+// [STRIFE] Verified unmodified
+//
+void
+HUlib_initTextLine
+( hu_textline_t*        t,
+  int                   x,
+  int                   y,
+  patch_t**             f,
+  int                   sc )
+{
+    t->x = x;
+    t->y = y;
+    t->f = f;
+    t->sc = sc;
+    HUlib_clearTextLine(t);
+}
+
+//
+// HUlib_addCharToTextLine
+//
+// [STRIFE] Verified unmodified.
+//
+boolean
+HUlib_addCharToTextLine
+( hu_textline_t*        t,
+  char                  ch )
+{
+    if (t->len == HU_MAXLINELENGTH)
+        return false;
+    else
+    {
+        t->l[t->len++] = ch;
+        t->l[t->len] = 0;
+        t->needsupdate = 4;
+        return true;
+    }
+}
+
+//
+// HUlib_delCharFromTextLine
+//
+// [STRIFE] Verified unmodified.
+//
+boolean HUlib_delCharFromTextLine(hu_textline_t* t)
+{
+    if (!t->len) return false;
+    else
+    {
+        t->l[--t->len] = 0;
+        t->needsupdate = 4;
+        return true;
+    }
+}
+
+//
+// HUlib_drawTextLine
+//
+// haleyjd 09/18/10: [STRIFE] Modified to not draw underscores in text.
+//
+void
+HUlib_drawTextLine
+( hu_textline_t*        l,
+  boolean               drawcursor )
+{
+    int                 i;
+    int                 w;
+    int                 x;
+    unsigned char       c;
+
+    // draw the new stuff
+    x = l->x;
+
+    for(i = 0; i < l->len; i++)
+    {
+        c = toupper(l->l[i]);
+        if (c != ' ' && c >= l->sc && c < '_') // [STRIFE]: Underscores excluded
+        {
+            w = SHORT(l->f[c - l->sc]->width);
+            if (x+w > SCREENWIDTH)
+                break;
+            V_DrawPatchDirect(x, l->y, l->f[c - l->sc]);
+            x += w;
+        }
+        else
+        {
+            x += 4;
+            if (x >= SCREENWIDTH)
+                break;
+        }
+    }
+
+    // draw the cursor if requested
+    if (drawcursor
+        && x + SHORT(l->f['_' - l->sc]->width) <= SCREENWIDTH)
+    {
+        V_DrawPatchDirect(x, l->y, l->f['_' - l->sc]);
+    }
+}
+
+//
+// HUlib_eraseTextLine
+//
+// sorta called by HU_Erase and just better darn get things straight
+// 
+// [STRIFE] Verified unmodified.
+//
+void HUlib_eraseTextLine(hu_textline_t* l)
+{
+    int                 lh;
+    int                 y;
+    int                 yoffset;
+
+    // Only erases when NOT in automap and the screen is reduced,
+    // and the text must either need updating or refreshing
+    // (because of a recent change back from the automap)
+
+    if (!automapactive &&
+        viewwindowx && l->needsupdate)
+    {
+        lh = SHORT(l->f[0]->height) + 1;
+        for (y=l->y,yoffset=y*SCREENWIDTH ; y<l->y+lh ; y++,yoffset+=SCREENWIDTH)
+        {
+            if (y < viewwindowy || y >= viewwindowy + viewheight)
+                R_VideoErase(yoffset, SCREENWIDTH); // erase entire line
+            else
+            {
+                R_VideoErase(yoffset, viewwindowx); // erase left border
+                R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
+                // erase right border
+            }
+        }
+    }
+
+    if (l->needsupdate) l->needsupdate--;
+}
+
+//
+// HUlib_initSText
+//
+// [STRIFE] Verified unmodified.
+//
+void
+HUlib_initSText
+( hu_stext_t*   s,
+  int           x,
+  int           y,
+  int           h,
+  patch_t**     font,
+  int           startchar,
+  boolean*      on )
+{
+    int i;
+
+    s->h = h;
+    s->on = on;
+    s->laston = true;
+    s->cl = 0;
+    for (i=0;i<h;i++)
+    {
+        HUlib_initTextLine(&s->l[i],
+                           x, y - i*(SHORT(font[0]->height)+1),
+                           font, startchar);
+    }
+}
+
+//
+// HUlib_addLineToSText
+//
+// [STRIFE] Verified unmodified.
+//
+void HUlib_addLineToSText(hu_stext_t* s)
+{
+    int i;
+
+    // add a clear line
+    if (++s->cl == s->h)
+        s->cl = 0;
+    HUlib_clearTextLine(&s->l[s->cl]);
+
+    // everything needs updating
+    for (i=0 ; i<s->h ; i++)
+        s->l[i].needsupdate = 4;
+}
+
+//
+// HUlib_addMessageToSText
+//
+// [STRIFE] Verified unmodified.
+//
+void
+HUlib_addMessageToSText
+( hu_stext_t*	s,
+  const char	*prefix,
+  const char	*msg )
+{
+    HUlib_addLineToSText(s);
+    if (prefix)
+        while (*prefix)
+            HUlib_addCharToTextLine(&s->l[s->cl], *(prefix++));
+
+    while (*msg)
+        HUlib_addCharToTextLine(&s->l[s->cl], *(msg++));
+}
+
+//
+// HUlib_drawSText
+//
+// [STRIFE] Verified unmodified.
+//
+void HUlib_drawSText(hu_stext_t* s)
+{
+    int i, idx;
+    hu_textline_t *l;
+
+    if (!*s->on)
+        return; // if not on, don't draw
+
+    // draw everything
+    for (i=0 ; i<s->h ; i++)
+    {
+        idx = s->cl - i;
+        if (idx < 0)
+            idx += s->h; // handle queue of lines
+
+        l = &s->l[idx];
+
+        // need a decision made here on whether to skip the draw
+        HUlib_drawTextLine(l, false); // no cursor, please
+    }
+}
+
+//
+// HUlib_eraseSText
+//
+// [STRIFE] Verified unmodified.
+//
+void HUlib_eraseSText(hu_stext_t* s)
+{
+    int i;
+
+    for (i=0 ; i<s->h ; i++)
+    {
+        if (s->laston && !*s->on)
+            s->l[i].needsupdate = 4;
+        HUlib_eraseTextLine(&s->l[i]);
+    }
+    s->laston = *s->on;
+}
+
+//
+// HUlib_initIText
+//
+// [STRIFE] Verified unmodified.
+//
+void
+HUlib_initIText
+( hu_itext_t*   it,
+  int           x,
+  int           y,
+  patch_t**     font,
+  int           startchar,
+  boolean*      on )
+{
+    it->lm = 0; // default left margin is start of text
+    it->on = on;
+    it->laston = true;
+    HUlib_initTextLine(&it->l, x, y, font, startchar);
+}
+
+
+// The following deletion routines adhere to the left margin restriction
+// [STRIFE] Verified unmodified.
+void HUlib_delCharFromIText(hu_itext_t* it)
+{
+    if (it->l.len != it->lm)
+        HUlib_delCharFromTextLine(&it->l);
+}
+
+// [STRIFE] Verified unmodified.
+void HUlib_eraseLineFromIText(hu_itext_t* it)
+{
+    while (it->lm != it->l.len)
+        HUlib_delCharFromTextLine(&it->l);
+}
+
+// Resets left margin as well
+// [STRIFE] Verified unmodified.
+void HUlib_resetIText(hu_itext_t* it)
+{
+    it->lm = 0;
+    HUlib_clearTextLine(&it->l);
+}
+
+//
+// HUlib_addPrefixToIText
+//
+// [STRIFE] Verified unmodified.
+//
+void
+HUlib_addPrefixToIText
+( hu_itext_t*   it,
+  char*         str )
+{
+    while (*str)
+        HUlib_addCharToTextLine(&it->l, *(str++));
+    it->lm = it->l.len;
+}
+
+// wrapper function for handling general keyed input.
+// returns true if it ate the key
+// [STRIFE] Verified unmodified.
+boolean
+HUlib_keyInIText
+( hu_itext_t*	it,
+  unsigned char ch )
+{
+    ch = toupper(ch);
+
+    if (ch >= ' ' && ch <= '_') 
+        HUlib_addCharToTextLine(&it->l, (char) ch);
+    else if (ch == KEY_BACKSPACE) 
+        HUlib_delCharFromIText(it);
+    else if (ch != KEY_ENTER) 
+        return false; // did not eat key
+
+    return true; // ate the key
+}
+
+//
+// HUlib_drawIText
+//
+// [STRIFE] Verified unmodified.
+//
+void HUlib_drawIText(hu_itext_t* it)
+{
+    hu_textline_t *l = &it->l;
+
+    if (!*it->on)
+        return;
+    HUlib_drawTextLine(l, true); // draw the line w/ cursor
+}
+
+//
+// HUlib_eraseIText
+//
+// [STRIFE] Verified unmodified.
+//
+void HUlib_eraseIText(hu_itext_t* it)
+{
+    if (it->laston && !*it->on)
+        it->l.needsupdate = 4;
+    HUlib_eraseTextLine(&it->l);
+    it->laston = *it->on;
+}
+
diff --git a/games/NXDoom/src/strife/hu_lib.h b/games/NXDoom/src/strife/hu_lib.h
new file mode 100644
index 000000000..5639860d1
--- /dev/null
+++ b/games/NXDoom/src/strife/hu_lib.h
@@ -0,0 +1,185 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+#ifndef __HULIB__
+#define __HULIB__
+
+// We are referring to patches.
+#include "r_defs.h"
+
+// font stuff
+#define HU_CHARERASE	KEY_BACKSPACE
+
+#define HU_MAXLINES		4
+#define HU_MAXLINELENGTH	80
+
+//
+// Typedefs of widgets
+//
+
+// Text Line widget
+//  (parent of Scrolling Text and Input Text widgets)
+typedef struct
+{
+    // left-justified position of scrolling text window
+    int		x;
+    int		y;
+    
+    patch_t**	f;			// font
+    int		sc;			// start character
+    char	l[HU_MAXLINELENGTH+1];	// line of text
+    int		len;		      	// current line length
+
+    // whether this line needs to be udpated
+    int		needsupdate;	      
+
+} hu_textline_t;
+
+
+
+// Scrolling Text window widget
+//  (child of Text Line widget)
+typedef struct
+{
+    hu_textline_t	l[HU_MAXLINES];	// text lines to draw
+    int			h;		// height in lines
+    int			cl;		// current line number
+
+    // pointer to boolean stating whether to update window
+    boolean*		on;
+    boolean		laston;		// last value of *->on.
+
+} hu_stext_t;
+
+
+
+// Input Text Line widget
+//  (child of Text Line widget)
+typedef struct
+{
+    hu_textline_t	l;		// text line to input on
+
+     // left margin past which I am not to delete characters
+    int			lm;
+
+    // pointer to boolean stating whether to update window
+    boolean*		on; 
+    boolean		laston; // last value of *->on;
+
+} hu_itext_t;
+
+
+//
+// Widget creation, access, and update routines
+//
+
+// initializes heads-up widget library
+void HUlib_init(void);
+
+//
+// textline code
+//
+
+// clear a line of text
+void	HUlib_clearTextLine(hu_textline_t *t);
+
+void	HUlib_initTextLine(hu_textline_t *t, int x, int y, patch_t **f, int sc);
+
+// returns success
+boolean HUlib_addCharToTextLine(hu_textline_t *t, char ch);
+
+// returns success
+boolean HUlib_delCharFromTextLine(hu_textline_t *t);
+
+// draws tline
+void	HUlib_drawTextLine(hu_textline_t *l, boolean drawcursor);
+
+// erases text line
+void	HUlib_eraseTextLine(hu_textline_t *l);
+
+// villsa [STRIFE]
+void HUlib_drawYellowText(int x, int y, const char *text);
+
+
+//
+// Scrolling Text window widget routines
+//
+
+// ?
+void
+HUlib_initSText
+( hu_stext_t*	s,
+  int		x,
+  int		y,
+  int		h,
+  patch_t**	font,
+  int		startchar,
+  boolean*	on );
+
+// add a new line
+void HUlib_addLineToSText(hu_stext_t* s);  
+
+// ?
+void
+HUlib_addMessageToSText
+( hu_stext_t*	s,
+  const char	*prefix,
+  const char	*msg );
+
+// draws stext
+void HUlib_drawSText(hu_stext_t* s);
+
+// erases all stext lines
+void HUlib_eraseSText(hu_stext_t* s); 
+
+// Input Text Line widget routines
+void
+HUlib_initIText
+( hu_itext_t*	it,
+  int		x,
+  int		y,
+  patch_t**	font,
+  int		startchar,
+  boolean*	on );
+
+// enforces left margin
+void HUlib_delCharFromIText(hu_itext_t* it);
+
+// enforces left margin
+void HUlib_eraseLineFromIText(hu_itext_t* it);
+
+// resets line and left margin
+void HUlib_resetIText(hu_itext_t* it);
+
+// left of left-margin
+void
+HUlib_addPrefixToIText
+( hu_itext_t*	it,
+  char*		str );
+
+// whether eaten
+boolean
+HUlib_keyInIText
+( hu_itext_t*	it,
+  unsigned char ch );
+
+void HUlib_drawIText(hu_itext_t* it);
+
+// erases all itext lines
+void HUlib_eraseIText(hu_itext_t* it); 
+
+#endif
diff --git a/games/NXDoom/src/strife/hu_stuff.c b/games/NXDoom/src/strife/hu_stuff.c
new file mode 100644
index 000000000..34f8ff457
--- /dev/null
+++ b/games/NXDoom/src/strife/hu_stuff.c
@@ -0,0 +1,687 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  Heads-up displays
+//
+
+
+#include <ctype.h>
+
+#include "doomdef.h"
+#include "doomkeys.h"
+
+#include "z_zone.h"
+
+#include "deh_main.h"
+#include "i_input.h"
+#include "i_swap.h"
+#include "i_video.h"
+
+#include "d_main.h"
+#include "hu_stuff.h"
+#include "hu_lib.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "w_wad.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+//
+// Locally used constants, shortcuts.
+//
+#define HU_TITLE        (mapnames[gamemap-1])
+#define HU_TITLEHEIGHT  1
+#define HU_TITLEX       0
+
+// haleyjd 09/01/10: [STRIFE] 167 -> 160 to move up level name
+#define HU_TITLEY       (160 - SHORT(hu_font[0]->height))
+
+#define HU_INPUTTOGGLE  't'
+#define HU_INPUTX       HU_MSGX
+#define HU_INPUTY       (HU_MSGY + HU_MSGHEIGHT*(SHORT(hu_font[0]->height) +1))
+#define HU_INPUTWIDTH   64
+#define HU_INPUTHEIGHT  1
+
+char *chat_macros[10];
+
+// villsa [STRIFE]
+char player_names[8][16] =
+{
+    "1: ",
+    "2: ",
+    "3: ",
+    "4: ",
+    "5: ",
+    "6: ",
+    "7: ",
+    "8: "
+};
+
+char                    chat_char; // remove later.
+static player_t*        plr;
+patch_t*                hu_font[HU_FONTSIZE];
+patch_t*                yfont[HU_FONTSIZE];   // haleyjd 09/18/10: [STRIFE]
+static hu_textline_t    w_title;
+boolean                 chat_on;
+static hu_itext_t       w_chat;
+static boolean          always_off = false;
+static char             chat_dest[MAXPLAYERS];
+static hu_itext_t       w_inputbuffer[MAXPLAYERS];
+
+static boolean          message_on;
+boolean                 message_dontfuckwithme;
+static boolean          message_nottobefuckedwith;
+
+static hu_stext_t       w_message;
+static int              message_counter;
+
+
+static boolean          headsupactive = false;
+
+// haleyjd 20130915 [STRIFE]: true if setting nickname
+static boolean hu_setting_name = false;
+
+//
+// Builtin map names.
+// The actual names can be found in DStrings.h.
+//
+
+// haleyjd 08/31/10: [STRIFE] Changed for Strife level names.
+// List of names for levels.
+
+const char *mapnames[] =
+{
+    // Strife map names
+
+    // First "episode" - Quest to destroy the Order's Castle
+    HUSTR_1,
+    HUSTR_2,
+    HUSTR_3,
+    HUSTR_4,
+    HUSTR_5,
+    HUSTR_6,
+    HUSTR_7,
+    HUSTR_8,
+    HUSTR_9,
+
+    // Second "episode" - Kill the Bishop and Make a Choice
+    HUSTR_10,
+    HUSTR_11,
+    HUSTR_12,
+    HUSTR_13,
+    HUSTR_14,
+    HUSTR_15,
+    HUSTR_16,
+    HUSTR_17,
+    HUSTR_18,
+    HUSTR_19,
+
+    // Third "episode" - Shut down Factory, kill Loremaster and Entity
+    HUSTR_20,
+    HUSTR_21,
+    HUSTR_22,
+    HUSTR_23,
+    HUSTR_24,
+    HUSTR_25,
+    HUSTR_26,
+    HUSTR_27,
+    HUSTR_28,
+    HUSTR_29,
+
+    // "Secret" levels - Abandoned Base and Training Facility
+    HUSTR_30,
+    HUSTR_31,
+
+    // Demo version maps
+    HUSTR_32,
+    HUSTR_33,
+    HUSTR_34
+};
+
+//
+// HU_Init
+//
+// haleyjd 09/18/10: [STRIFE]
+// * Modified to load yfont along with hu_font.
+//
+void HU_Init(void)
+{
+    int		i;
+    int		j;
+    char	buffer[9];
+
+    // load the heads-up font
+    j = HU_FONTSTART;
+    for (i=0;i<HU_FONTSIZE;i++)
+    {
+        DEH_snprintf(buffer, 9, "STCFN%.3d", j++);
+        hu_font[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
+
+        // haleyjd 09/18/10: load yfont as well; and yes, this is exactly
+        // how Rogue did it :P
+        buffer[2] = 'B';
+        yfont[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
+    }
+}
+
+//
+// HU_Stop
+//
+// [STRIFE] Verified unmodified.
+//
+void HU_Stop(void)
+{
+    headsupactive = false;
+}
+
+//
+// HU_Start
+//
+// haleyjd 09/18/10: [STRIFE] Added a hack for nickname at the end.
+//
+void HU_Start(void)
+{
+    int         i;
+    const char *s;
+
+    // haleyjd 20120211: [STRIFE] not called here.
+    //if (headsupactive)
+    //    HU_Stop();
+    
+    // haleyjd 20120211: [STRIFE] moved up
+    // create the map title widget
+    HUlib_initTextLine(&w_title,
+                       HU_TITLEX, HU_TITLEY,
+                       hu_font,
+                       HU_FONTSTART);
+
+    // haleyjd 08/31/10: [STRIFE] Get proper map name.
+    s = HU_TITLE;
+
+    // [STRIFE] Removed Chex Quest stuff.
+
+    // dehacked substitution to get modified level name
+    s = DEH_String(s);
+    
+    while (*s)
+        HUlib_addCharToTextLine(&w_title, *(s++));
+
+    // haleyjd 20120211: [STRIFE] check for headsupactive
+    if(!headsupactive)
+    {
+        plr = &players[consoleplayer];
+        message_on = false;
+        message_dontfuckwithme = false;
+        message_nottobefuckedwith = false;
+        chat_on = false;
+
+        // create the message widget
+        HUlib_initSText(&w_message,
+                        HU_MSGX, HU_MSGY, HU_MSGHEIGHT,
+                        hu_font,
+                        HU_FONTSTART, &message_on);
+
+        // create the chat widget
+        HUlib_initIText(&w_chat,
+                        HU_INPUTX, HU_INPUTY,
+                        hu_font,
+                        HU_FONTSTART, &chat_on);
+
+        // create the inputbuffer widgets
+        for (i=0 ; i<MAXPLAYERS ; i++)
+            HUlib_initIText(&w_inputbuffer[i], 0, 0, 0, 0, &always_off);
+
+        headsupactive = true;
+
+        // haleyjd 09/18/10: [STRIFE] nickname weirdness. 
+        if(nickname != player_names[consoleplayer])
+        {
+            if(nickname != NULL && *nickname)
+            {
+                DEH_printf("have one\n");
+                nickname = player_names[consoleplayer];
+            }
+        }
+    }
+}
+
+//
+// HU_Drawer
+//
+// [STRIFE] Verified unmodified.
+//
+void HU_Drawer(void)
+{
+    HUlib_drawSText(&w_message);
+    HUlib_drawIText(&w_chat);
+    if (automapactive)
+        HUlib_drawTextLine(&w_title, false);
+}
+
+//
+// HU_Erase
+//
+// [STRIFE] Verified unmodified.
+//
+void HU_Erase(void)
+{
+    HUlib_eraseSText(&w_message);
+    HUlib_eraseIText(&w_chat);
+    HUlib_eraseTextLine(&w_title);
+}
+
+//
+// HU_addMessage
+//
+// haleyjd 09/18/10: [STRIFE] New function
+// See if you can tell whether or not I had trouble with this :P
+// Looks to be extremely buggy, hackish, and error-prone.
+//
+// <Markov> This is definitely not the best that Rogue had to offer. Markov.
+//
+//  Fastcall Registers:   edx          ebx
+//      Temp Registers:   esi          edi
+static void HU_addMessage(const char *prefix, const char *message)
+{
+    char  c;         // eax
+    int   width = 0; // edx
+    const char *rover1;    // ebx (in first loop)
+    const char *rover2;    // ecx (in second loop)
+    char *bufptr;    // ebx (in second loop)
+    char buffer[HU_MAXLINELENGTH+2];  // esp+52h
+
+    // Loop 1: Total up width of prefix.
+    rover1 = prefix;
+    if(rover1)
+    {
+        while((c = *rover1))
+        {
+            c = toupper(c) - HU_FONTSTART;
+            ++rover1;
+
+            if(c < 0 || c >= HU_FONTSIZE)
+                width += 4;
+            else
+                width += SHORT(hu_font[(int) c]->width);
+        }
+    }
+
+    // Loop 2: Copy as much of message into buffer as will fit on screen
+    bufptr = buffer;
+    rover2 = message;
+    while((c = *rover2))
+    {
+        if((c == ' ' || c == '-') && width > 285)
+            break;
+
+        *bufptr = c;
+        ++bufptr;       // BUG: No check for overflow.
+        ++rover2;
+        c = toupper(c);
+
+        if(c == ' ' || c < '!' || c >= '_')
+            width += 4;
+        else
+        {
+            c -= HU_FONTSTART;
+            width += SHORT(hu_font[(int) c]->width);
+        }
+    }
+
+    // Too big to fit?
+    // BUG: doesn't consider by how much it's over.
+    if(width > 320) 
+    {
+        // backup a char... hell if I know why.
+        --bufptr;
+        --rover2;
+    }
+
+    // rover2 is not at the end?
+    if((c = *rover2))
+    {
+        // if not ON a space...
+        if(c != ' ')
+        {
+            // back up both pointers til one is found.
+            // BUG: no check against LHS of buffer. Hurr!
+            while(*bufptr != ' ')
+            {
+                --bufptr;
+                --rover2;
+            }
+        }
+    }
+
+    *bufptr = '\0';
+
+    // Add two message lines.
+    HUlib_addMessageToSText(&w_message, prefix, buffer);
+    HUlib_addMessageToSText(&w_message, NULL,   rover2);
+}
+
+//
+// HU_Ticker
+//
+// haleyjd 09/18/10: [STRIFE] Changes to split up message into two lines,
+// and support for player names (STRIFE-TODO: unfinished!)
+//
+void HU_Ticker(void)
+{
+    int i, rc;
+    char c;
+    //char *prefix;  STRIFE-TODO
+
+    // tick down message counter if message is up
+    if (message_counter && !--message_counter)
+    {
+        message_on = false;
+        message_nottobefuckedwith = false;
+    }
+
+    // haleyjd 20110219: [STRIFE] this condition was removed
+    //if (showMessages || message_dontfuckwithme)
+    //{
+        // display message if necessary
+        if ((plr->message && !message_nottobefuckedwith)
+            || (plr->message && message_dontfuckwithme))
+        {
+            //HUlib_addMessageToSText(&w_message, 0, plr->message);
+            HU_addMessage(NULL, plr->message); // haleyjd [STRIFE]
+            plr->message = 0;
+            message_on = true;
+            message_counter = HU_MSGTIMEOUT;
+            message_nottobefuckedwith = message_dontfuckwithme;
+            message_dontfuckwithme = 0;
+        }
+    //} // else message_on = false;
+
+    // check for incoming chat characters
+    if (netgame)
+    {
+        for (i=0 ; i<MAXPLAYERS; i++)
+        {
+            if (!playeringame[i])
+                continue;
+            if (i != consoleplayer
+                && (c = players[i].cmd.chatchar))
+            {
+                if (c <= HU_CHANGENAME) // [STRIFE]: allow HU_CHANGENAME here
+                    chat_dest[i] = c;
+                else
+                {
+                    rc = HUlib_keyInIText(&w_inputbuffer[i], c);
+                    if (rc && c == KEY_ENTER)
+                    {
+                        if (w_inputbuffer[i].l.len
+                            && (chat_dest[i] == consoleplayer+1
+                             || chat_dest[i] == HU_BROADCAST))
+                        {
+                            HU_addMessage(player_names[i],
+                                          w_inputbuffer[i].l.l);
+
+                            message_nottobefuckedwith = true;
+                            message_on = true;
+                            message_counter = HU_MSGTIMEOUT;
+                            S_StartSound(0, sfx_radio);
+                        }
+                        else if(chat_dest[i] == HU_CHANGENAME)
+                        {
+                            // haleyjd 20130915 [STRIFE]: set player name
+                            DEH_snprintf(player_names[i], sizeof(player_names[i]),
+                                         "%.13s: ", w_inputbuffer[i].l.l);
+                        }
+                        HUlib_resetIText(&w_inputbuffer[i]);
+                    }
+                }
+                players[i].cmd.chatchar = 0;
+            }
+        }
+    }
+}
+
+#define QUEUESIZE		128
+
+static char	chatchars[QUEUESIZE];
+static int	head = 0;
+static int	tail = 0;
+
+//
+// HU_queueChatChar
+//
+// haleyjd 09/18/10: [STRIFE]
+// * No message is given if a chat queue overflow occurs.
+//
+void HU_queueChatChar(char c)
+{
+    chatchars[head] = c;
+    if (((head + 1) & (QUEUESIZE-1)) != tail)
+    {
+        head = (head + 1) & (QUEUESIZE-1);
+    }
+}
+
+//
+// HU_dequeueChatChar
+//
+// [STRIFE] Verified unmodified.
+//
+char HU_dequeueChatChar(void)
+{
+    char c;
+
+    if (head != tail)
+    {
+        c = chatchars[tail];
+        tail = (tail + 1) & (QUEUESIZE-1);
+    }
+    else
+    {
+        c = 0;
+    }
+
+    return c;
+}
+
+// fraggle 01/05/15: New functions to support the Chocolate input interface.
+static void StartChatInput(void)
+{
+    chat_on = true;
+    I_StartTextInput(HU_INPUTX, HU_INPUTY, SCREENWIDTH, HU_INPUTY + 8);
+}
+
+static void StopChatInput(void)
+{
+    chat_on = false;
+    I_StopTextInput();
+}
+
+//
+// HU_Responder
+//
+// haleyjd 09/18/10: [STRIFE]
+// * Mostly unmodified, except:
+//   - The default value of key_message_refresh is changed. That is handled
+//     elsewhere in Choco, however.
+//   - There is support for setting the player name through the chat
+//     mechanism.
+//
+boolean HU_Responder(event_t *ev)
+{
+    static char         lastmessage[HU_MAXLINELENGTH+1];
+    char*               macromessage;
+    boolean             eatkey = false;
+    static boolean      altdown = false;
+    unsigned char       c;
+    int                 i;
+    
+    static int          num_nobrainers = 0;
+
+    if (ev->data1 == KEY_RSHIFT)
+    {
+        return false;
+    }
+    else if (ev->data1 == KEY_RALT || ev->data1 == KEY_LALT)
+    {
+        altdown = ev->type == ev_keydown;
+        return false;
+    }
+
+    if (ev->type != ev_keydown)
+        return false;
+
+    if (!chat_on)
+    {
+        if (ev->data1 == key_message_refresh)
+        {
+            message_on = true;
+            message_counter = HU_MSGTIMEOUT;
+            eatkey = true;
+        }
+        else if (netgame && ev->data2 == key_multi_msg)
+        {
+            StartChatInput();
+            eatkey = true;
+            HUlib_resetIText(&w_chat);
+            HU_queueChatChar(HU_BROADCAST);
+        }
+        // [STRIFE]: You cannot go straight to chatting with a particular
+        // player from here... you must press 't' first. See below.
+    }
+    else
+    {
+        c = ev->data3;
+        // send a macro
+        if (altdown)
+        {
+            c = c - '0';
+            if (c > 9)
+                return false;
+            // fprintf(stderr, "got here\n");
+            macromessage = chat_macros[c];
+
+            // kill last message with a '\n'
+            HU_queueChatChar(KEY_ENTER); // DEBUG!!!
+
+            // send the macro message
+            while (*macromessage)
+                HU_queueChatChar(*macromessage++);
+            HU_queueChatChar(KEY_ENTER);
+
+            // leave chat mode and notify that it was sent
+            StopChatInput();
+            M_StringCopy(lastmessage, chat_macros[c], sizeof(lastmessage));
+            plr->message = lastmessage;
+            eatkey = true;
+        }
+        else
+        {
+            if(w_chat.l.len) // [STRIFE]: past first char of chat?
+            {
+                eatkey = HUlib_keyInIText(&w_chat, c);
+                if (eatkey)
+                    HU_queueChatChar(c);
+            }
+            else
+            {
+                // [STRIFE]: check for player-specific message;
+                // slightly different than vanilla, to allow keys to be customized
+                for(i = 0; i < MAXPLAYERS; i++)
+                {
+                    if (ev->data1 == key_multi_msgplayer[i])
+                        break;
+                }
+                if(i < MAXPLAYERS)
+                {
+                    // talking to self?
+                    if(i == consoleplayer)
+                    {
+                        num_nobrainers++;
+                        if (num_nobrainers < 3)
+                            plr->message = DEH_String(HUSTR_TALKTOSELF1);
+                        else if (num_nobrainers < 6)
+                            plr->message = DEH_String(HUSTR_TALKTOSELF2);
+                        else if (num_nobrainers < 9)
+                            plr->message = DEH_String(HUSTR_TALKTOSELF3);
+                        else if (num_nobrainers < 32)
+                            plr->message = DEH_String(HUSTR_TALKTOSELF4);
+                        else
+                            plr->message = DEH_String(HUSTR_TALKTOSELF5);
+                    }
+                    else
+                    {
+                        eatkey = true;
+                        HU_queueChatChar(i+1);
+                        DEH_snprintf(lastmessage, sizeof(lastmessage),
+                            "Talking to: %c", '1' + i);
+                        plr->message = lastmessage;
+                    }
+                }
+                else if(c == '$') // [STRIFE]: name changing
+                {
+                    eatkey = true;
+                    HU_queueChatChar(HU_CHANGENAME);
+                    M_StringCopy(lastmessage, DEH_String("Changing Name:"),
+                                 sizeof(lastmessage));
+                    plr->message = lastmessage;
+                    hu_setting_name = true;
+                }
+                else
+                {
+                    eatkey = HUlib_keyInIText(&w_chat, c);
+                    if (eatkey)
+                        HU_queueChatChar(c);
+                }
+            }
+
+            if (c == KEY_ENTER)
+            {
+                StopChatInput();
+                if (w_chat.l.len)
+                {
+                    // [STRIFE]: name setting
+                    if(hu_setting_name)
+                    {
+                        DEH_snprintf(lastmessage, sizeof(lastmessage),
+                            "%s now %.13s", player_names[consoleplayer],
+                            w_chat.l.l);
+                        // haleyjd 20141024: missing name set for local client
+                        DEH_snprintf(player_names[consoleplayer],
+                            sizeof(player_names[consoleplayer]),
+                            "%.13s: ", w_chat.l.l);
+                        hu_setting_name = false;
+                    }
+                    else
+                    {
+                        M_StringCopy(lastmessage, w_chat.l.l,
+                                     sizeof(lastmessage));
+                    }
+                    plr->message = lastmessage;
+                }
+            }
+            else if (c == KEY_ESCAPE)
+            {
+                StopChatInput();
+            }
+        }
+    }
+
+    return eatkey;
+}
diff --git a/games/NXDoom/src/strife/hu_stuff.h b/games/NXDoom/src/strife/hu_stuff.h
new file mode 100644
index 000000000..2140d830e
--- /dev/null
+++ b/games/NXDoom/src/strife/hu_stuff.h
@@ -0,0 +1,75 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  Head up display
+//
+
+#ifndef __HU_STUFF_H__
+#define __HU_STUFF_H__
+
+#include "d_event.h"
+#include "v_patch.h"
+
+//
+// Globally visible constants.
+//
+#define HU_FONTSTART    '!'     // the first font characters
+#define HU_FONTEND      '_'     // the last font characters
+
+// Calculate # of glyphs in font.
+#define HU_FONTSIZE     (HU_FONTEND - HU_FONTSTART + 1)	
+
+#define HU_BROADCAST    9       // haleyjd [STRIFE] Changed 5 -> 9
+#define HU_CHANGENAME   10      // haleyjd [STRIFE] Special command
+
+#define HU_MSGX         0
+#define HU_MSGY         (SHORT(hu_font[0]->height) + 1) // [STRIFE]: DOOM bug fix
+#define HU_MSGWIDTH     64      // in characters
+#define HU_MSGHEIGHT    2       // in lines
+
+#define HU_MSGTIMEOUT   (8*TICRATE) // haleyjd [STRIFE] Doubled message timeout
+
+
+//
+// HEADS UP TEXT
+//
+
+void HU_Init(void);
+void HU_Start(void);
+
+boolean HU_Responder(event_t* ev);
+
+void HU_Ticker(void);
+void HU_Drawer(void);
+char HU_dequeueChatChar(void);
+void HU_Erase(void);
+
+extern char *chat_macros[10];
+extern char player_names[8][16];   // villsa [STRIFE]
+
+// haleyjd [STRIFE] externalized:
+extern const char *mapnames[];
+
+// [STRIFE]
+extern patch_t* yfont[HU_FONTSIZE];   // haleyjd 09/18/10: [STRIFE]
+extern patch_t *hu_font[HU_FONTSIZE];
+
+extern boolean message_dontfuckwithme;
+
+extern boolean chat_on;
+extern boolean sendsave;
+
+
+#endif
+
diff --git a/games/NXDoom/src/strife/info.c b/games/NXDoom/src/strife/info.c
new file mode 100644
index 000000000..7976299b8
--- /dev/null
+++ b/games/NXDoom/src/strife/info.c
@@ -0,0 +1,11041 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Thing frame/state LUT,
+//	generated by multigen utilitiy.
+//	This one is the original DOOM version, preserved.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+// Data.
+#include "sounds.h"
+#include "m_fixed.h"
+
+#include "info.h"
+
+#include "p_mobj.h"
+
+// villsa [STRIFE]
+const char *sprnames[NUMSPRITES+1] =
+{
+    "PLAY", "PNCH", "WAVE", "RBPY", "TRGT", "XBOW", "MMIS", "RIFG", 
+    "RIFF", "FLMT", "FLMF", "BLST", "BLSF", "GREN", "GREF", "SIGH", 
+    "SIGF", "POW1", "POW2", "POW3", "ZAP1", "SPRY", "BLOD", "PUFY", 
+    "SHT1", "SHT2", "GRIN", "GRAP", "UBAM", "BNG2", "BNG4", "BNG3", 
+    "FLBE", "XPRK", "OCLW", "CCLW", "TEND", "MICR", "MISS", "AROW", 
+    "ARWP", "TORP", "THIT", "TWAV", "MISL", "TFOG", "IFOG", "SHRD", 
+    "RGIB", "MRYS", "MRNO", "MRST", "MRLK", "MRBD", "MRPN", "MRGT", 
+    "BURN", "DISR", "PEAS", "GIBS", "AGRD", "ARMR", "SACR", "TNK1", 
+    "TNK2", "TNK3", "TNK4", "TNK5", "TNK6", "NEAL", "BEGR", "HMN1", 
+    "LEDR", "LEAD", "ROB1", "PGRD", "ROB2", "MLDR", "ORCL", "PRST", 
+    "PDED", "ALN1", "AL1P", "NODE", "MTHD", "MNAM", "MNAL", "MDTH", 
+    "NEST", "PODD", "ZAP6", "ZOT3", "ZAP7", "ZOT1", "ZAP5", "ZOT2", 
+    "SEWR", "SPID", "ROB3", "RBB3", "PRGR", "BASE", "FRBL", "KLAX", 
+    "TURT", "BALL", "PSTN", "SECR", "TARG", "RING", "EARS", "COMM", 
+    "BOOM", "RATT", "HOGN", "DEAD", "SBAN", "BOTR", "HATR", "TOPR", 
+    "COUP", "BUBB", "BUBF", "BUBC", "ASPR", "SPDL", "TOKN", "OTOK", 
+    "HELT", "GUNT", "FULL", "MEAT", "JUNK", "FFOT", "DIE1", "BEAC", 
+    "ARM1", "ARM2", "BARW", "BART", "LAMP", "LANT", "BARL", "BOWL", 
+    "BRAZ", "TRCH", "LTRH", "LMPC", "LOGS", "TRHO", "WATR", "MUGG", 
+    "FUSL", "CRD1", "CRD2", "TPAS", "KY1G", "KY2S", "KY3B", "HAND", 
+    "CRYS", "PRIS", "PWR1", "PWR2", "PWR3", "ORAC", "GYID", "FUBR", 
+    "WARE", "RCRY", "BCRY", "CHAP", "TUNL", "BLTK", "SECK", "MINE", 
+    "REBL", "PROC", "ANKH", "GOID", "STMP", "MDKT", "COIN", "CRED", 
+    "SACK", "CHST", "SHD1", "MASK", "UNIF", "OFIC", "PMAP", "PMUP", 
+    "BLIT", "BBOX", "MSSL", "ROKT", "BRY1", "CPAC", "PQRL", "XQRL", 
+    "GRN1", "GRN2", "BKPK", "RELC", "RIFL", "FLAM", "BFLM", "MMSL", 
+    "TRPD", "GRND", "CBOW", "SIGL", "LITE", "CNDL", "CLBR", "LITS", 
+    "LITB", "LITG", "ROK1", "ROK2", "ROK3", "ROK4", "LOGG", "RUB1", 
+    "RUB2", "RUB3", "RUB4", "RUB5", "RUB6", "RUB7", "RUB8", "CHAN", 
+    "STAT", "DSTA", "CRAB", "CAGE", "TREE", "TRE1", "BUSH", "SHRB", 
+    "STAK", "BAR1", "VASE", "STOL", "POT1", "TUB1", "ANVL", "TLMP", 
+    "TRAY", "APOW", "AFED", "DRIP", "CDRP", "SPLH", "WTFT", "HERT", 
+    "TELP", "MONI", "STEL", "STLA", "STLE", "HUGE", "STLG", NULL
+};
+
+
+// Doesn't work with g++, needs actionf_p1
+// villsa [STRIFE]
+void A_Look();
+void A_RandomWalk();
+void A_FriendLook();
+void A_Listen();
+void A_Chase();
+void A_FaceTarget();
+void A_PeasantPunch();
+void A_ReaverAttack();
+void A_BulletAttack();
+void A_CheckTargetVisible();
+void A_SentinelAttack();
+void A_StalkerThink();
+void A_StalkerSetLook();
+void A_StalkerDrop();
+void A_StalkerScratch();
+void A_FloatWeave();
+void A_RobotMelee();
+void A_TemplarMauler();
+void A_CrusaderAttack();
+void A_CrusaderLeft();
+void A_CrusaderRight();
+void A_CheckTargetVisible2();
+void A_InqFlyCheck();
+void A_InqGrenade();
+void A_InqTakeOff();
+void A_InqFly();
+void A_FireSigilWeapon();
+void A_ProgrammerAttack();
+void A_Sigil_A_Action();
+void A_SpectreEAttack();
+void A_SpectreCAttack();
+void A_AlertSpectreC();
+void A_Sigil_E_Action();
+void A_SigilTrail();
+void A_SpectreDAttack();
+void A_FireSigilEOffshoot();
+void A_ShadowOff();
+void A_ModifyVisibility();
+void A_ShadowOn();
+void A_SetTLOptions();
+void A_BossMeleeAtk();
+void A_BishopAttack();
+void A_FireHookShot();
+void A_FireChainShot();
+void A_MissileSmoke();
+void A_SpawnSparkPuff();
+void A_Tracer();
+void A_ProgrammerMelee();
+void A_Scream();
+void A_XScream();
+void A_Pain();
+void A_PeasantCrash();
+void A_Fall();
+void A_HideZombie();
+void A_MerchantPain();
+void A_ProgrammerDie();
+void A_InqTossArm();
+void A_SpawnSpectreB();
+void A_SpawnSpectreD();
+void A_SpawnSpectreE();
+void A_SpawnEntity();
+void A_EntityDeath();
+void A_SpawnZombie();
+void A_ZombieInSpecialSector();
+void A_CrystalExplode();
+void A_QuestMsg();
+void A_ExtraLightOff();
+void A_CrystalRadiusAtk();
+void A_DeathExplode5();
+void A_DeathExplode1();
+void A_DeathExplode2();
+void A_DeathExplode3();
+void A_RaiseAlarm();
+void A_MissileTick();
+void A_SpawnGrenadeFire();
+void A_NodeChunk();
+void A_HeadChunk();
+void A_BurnSpread();
+void A_AcolyteSpecial();
+void A_BossDeath();
+void A_InqChase();
+void A_StalkerChase();
+void A_PlayerScream();
+void A_TeleportBeacon();
+void A_BodyParts();
+void A_ClaxonBlare();
+void A_ActiveSound();
+void A_ClearSoundTarget();
+void A_DropBurnFlesh();
+void A_FlameDeath();
+void A_ClearForceField();
+void A_WeaponReady();
+void A_ReFire();
+void A_CheckReload();
+void A_Lower();
+void A_Raise();
+void A_GunFlash();
+void A_Punch();
+void A_FireFlameThrower();
+void A_FireMissile();
+void A_FireMauler2();
+void A_FireGrenade();
+void A_FireElectricBolt();
+void A_FirePoisonBolt();
+void A_FireRifle();
+void A_FireMauler1();
+void A_SigilSound();
+void A_FireSigil();
+void A_GunFlashThinker();
+void A_Light0();
+void A_Light1();
+void A_Light2();
+void A_SigilShock();
+void A_TorpedoExplode();
+void A_MaulerSound();
+
+// villsa [STRIFE]
+state_t states[NUMSTATES] =
+{
+
+/*S_NULL*/          { SPR_PLAY, 0, -1, { NULL }, S_NULL },      //00
+/*S_PNCH_00*/       { SPR_PNCH, 0, 0, { A_Light0 }, S_NULL },       //01
+/*S_WAVE_00*/       { SPR_WAVE, 32768, 3, { NULL }, S_WAVE_01 },        //02
+/*S_WAVE_01*/       { SPR_WAVE, 32769, 3, { NULL }, S_WAVE_02 },        //03
+/*S_WAVE_02*/       { SPR_WAVE, 32770, 3, { NULL }, S_WAVE_03 },        //04
+/*S_WAVE_03*/       { SPR_WAVE, 32771, 3, { NULL }, S_WAVE_00 },        //05
+/*S_RBPY_00*/       { SPR_RBPY, 32768, 3, { NULL }, S_RBPY_01 },        //06
+/*S_RBPY_01*/       { SPR_RBPY, 32769, 3, { NULL }, S_RBPY_02 },        //07
+/*S_RBPY_02*/       { SPR_RBPY, 32770, 3, { NULL }, S_RBPY_03 },        //08
+/*S_RBPY_03*/       { SPR_RBPY, 32771, 3, { NULL }, S_RBPY_00 },        //09
+/*S_TRGT_00*/       { SPR_TRGT, 0, -1, { NULL }, S_NULL },      //10
+/*S_TRGT_01*/       { SPR_TRGT, 1, -1, { NULL }, S_NULL },      //11
+/*S_TRGT_02*/       { SPR_TRGT, 2, -1, { NULL }, S_NULL },      //12
+/*S_PNCH_01*/       { SPR_PNCH, 0, 1, { A_WeaponReady }, S_PNCH_01 },       //13
+/*S_PNCH_02*/       { SPR_PNCH, 0, 1, { A_Lower }, S_PNCH_02 },     //14
+/*S_PNCH_03*/       { SPR_PNCH, 0, 1, { A_Raise }, S_PNCH_03 },     //15
+/*S_PNCH_04*/       { SPR_PNCH, 1, 4, { NULL }, S_PNCH_05 },        //16
+/*S_PNCH_05*/       { SPR_PNCH, 2, 4, { A_Punch }, S_PNCH_06 },     //17
+/*S_PNCH_06*/       { SPR_PNCH, 3, 5, { NULL }, S_PNCH_07 },        //18
+/*S_PNCH_07*/       { SPR_PNCH, 2, 4, { NULL }, S_PNCH_08 },        //19
+/*S_PNCH_08*/       { SPR_PNCH, 1, 5, { A_ReFire }, S_PNCH_01 },        //20
+/*S_XBOW_00*/       { SPR_XBOW, 0, 1, { A_WeaponReady }, S_XBOW_00 },       //21
+/*S_XBOW_01*/       { SPR_XBOW, 0, 1, { A_Lower }, S_XBOW_01 },     //22
+/*S_XBOW_02*/       { SPR_XBOW, 0, 1, { A_Raise }, S_XBOW_02 },     //23
+/*S_XBOW_03*/       { SPR_XBOW, 0, 3, { A_GunFlashThinker }, S_XBOW_04 },       //24
+/*S_XBOW_04*/       { SPR_XBOW, 1, 6, { A_FireElectricBolt }, S_XBOW_05 },      //25
+/*S_XBOW_05*/       { SPR_XBOW, 2, 4, { NULL }, S_XBOW_06 },        //26
+/*S_XBOW_06*/       { SPR_XBOW, 3, 6, { NULL }, S_XBOW_07 },        //27
+/*S_XBOW_07*/       { SPR_XBOW, 4, 3, { NULL }, S_XBOW_08 },        //28
+/*S_XBOW_08*/       { SPR_XBOW, 5, 5, { NULL }, S_XBOW_09 },        //29
+/*S_XBOW_09*/       { SPR_XBOW, 6, 5, { A_CheckReload }, S_XBOW_00 },       //30
+/*S_XBOW_10*/       { SPR_XBOW, 10, 5, { NULL }, S_XBOW_11 },       //31
+/*S_XBOW_11*/       { SPR_XBOW, 11, 5, { NULL }, S_XBOW_12 },       //32
+/*S_XBOW_12*/       { SPR_XBOW, 12, 5, { NULL }, S_XBOW_10 },       //33
+/*S_XBOW_13*/       { SPR_XBOW, 7, 1, { A_WeaponReady }, S_XBOW_13 },       //34
+/*S_XBOW_14*/       { SPR_XBOW, 7, 1, { A_Lower }, S_XBOW_14 },     //35
+/*S_XBOW_15*/       { SPR_XBOW, 7, 1, { A_Raise }, S_XBOW_15 },     //36
+/*S_XBOW_16*/       { SPR_XBOW, 7, 3, { NULL }, S_XBOW_17 },        //37
+/*S_XBOW_17*/       { SPR_XBOW, 1, 6, { A_FirePoisonBolt }, S_XBOW_18 },        //38
+/*S_XBOW_18*/       { SPR_XBOW, 2, 4, { NULL }, S_XBOW_19 },        //39
+/*S_XBOW_19*/       { SPR_XBOW, 3, 6, { NULL }, S_XBOW_20 },        //40
+/*S_XBOW_20*/       { SPR_XBOW, 4, 3, { NULL }, S_XBOW_21 },        //41
+/*S_XBOW_21*/       { SPR_XBOW, 8, 5, { NULL }, S_XBOW_22 },        //42
+/*S_XBOW_22*/       { SPR_XBOW, 9, 5, { A_CheckReload }, S_XBOW_13 },       //43
+/*S_MMIS_00*/       { SPR_MMIS, 0, 1, { A_WeaponReady }, S_MMIS_00 },       //44
+/*S_MMIS_01*/       { SPR_MMIS, 0, 1, { A_Lower }, S_MMIS_01 },     //45
+/*S_MMIS_02*/       { SPR_MMIS, 0, 1, { A_Raise }, S_MMIS_02 },     //46
+/*S_MMIS_03*/       { SPR_MMIS, 0, 4, { A_FireMissile }, S_MMIS_04 },       //47
+/*S_MMIS_04*/       { SPR_MMIS, 1, 4, { A_Light1 }, S_MMIS_05 },        //48
+/*S_MMIS_05*/       { SPR_MMIS, 32770, 5, { NULL }, S_MMIS_06 },        //49
+/*S_MMIS_06*/       { SPR_MMIS, 32771, 2, { A_Light2 }, S_MMIS_07 },        //50
+/*S_MMIS_07*/       { SPR_MMIS, 32772, 2, { NULL }, S_MMIS_08 },        //51
+/*S_MMIS_08*/       { SPR_MMIS, 32773, 2, { A_Light0 }, S_MMIS_09 },        //52
+/*S_MMIS_09*/       { SPR_MMIS, 5, 0, { A_ReFire }, S_MMIS_00 },        //53
+/*S_RIFG_00*/       { SPR_RIFG, 0, 1, { A_WeaponReady }, S_RIFG_00 },       //54
+/*S_RIFG_01*/       { SPR_RIFG, 1, 1, { A_Lower }, S_RIFG_01 },     //55
+/*S_RIFG_02*/       { SPR_RIFG, 0, 1, { A_Raise }, S_RIFG_02 },     //56
+/*S_RIFF_00*/       { SPR_RIFF, 0, 3, { A_FireRifle }, S_RIFF_01 },     //57
+/*S_RIFF_01*/       { SPR_RIFF, 1, 3, { A_FireRifle }, S_RIFG_03 },     //58
+/*S_RIFG_03*/       { SPR_RIFG, 3, 3, { A_FireRifle }, S_RIFG_04 },     //59
+/*S_RIFG_04*/       { SPR_RIFG, 2, 0, { A_ReFire }, S_RIFG_05 },        //60
+/*S_RIFG_05*/       { SPR_RIFG, 1, 2, { NULL }, S_RIFG_00 },        //61
+/*S_FLMT_00*/       { SPR_FLMT, 0, 3, { A_WeaponReady }, S_FLMT_01 },       //62
+/*S_FLMT_01*/       { SPR_FLMT, 1, 3, { A_WeaponReady }, S_FLMT_00 },       //63
+/*S_FLMT_02*/       { SPR_FLMT, 0, 1, { A_Lower }, S_FLMT_02 },     //64
+/*S_FLMT_03*/       { SPR_FLMT, 0, 1, { A_Raise }, S_FLMT_03 },     //65
+/*S_FLMF_00*/       { SPR_FLMF, 0, 2, { A_FireFlameThrower }, S_FLMF_01 },      //66
+/*S_FLMF_01*/       { SPR_FLMF, 1, 3, { A_ReFire }, S_FLMT_00 },        //67
+/*S_BLST_00*/       { SPR_BLST, 5, 6, { A_WeaponReady }, S_BLST_01 },       //68
+/*S_BLST_01*/       { SPR_BLST, 6, 6, { A_WeaponReady }, S_BLST_02 },       //69
+/*S_BLST_02*/       { SPR_BLST, 7, 6, { A_WeaponReady }, S_BLST_03 },       //70
+/*S_BLST_03*/       { SPR_BLST, 0, 6, { A_WeaponReady }, S_BLST_00 },       //71
+/*S_BLST_04*/       { SPR_BLST, 0, 1, { A_Lower }, S_BLST_04 },     //72
+/*S_BLST_05*/       { SPR_BLST, 0, 1, { A_Raise }, S_BLST_05 },     //73
+/*S_BLSF_00*/       { SPR_BLSF, 32768, 5, { A_FireMauler1 }, S_BLST_06 },       //74
+/*S_BLST_06*/       { SPR_BLST, 32769, 3, { A_Light1 }, S_BLST_07 },        //75
+/*S_BLST_07*/       { SPR_BLST, 2, 2, { A_Light2 }, S_BLST_08 },        //76
+/*S_BLST_08*/       { SPR_BLST, 3, 2, { NULL }, S_BLST_09 },        //77
+/*S_BLST_09*/       { SPR_BLST, 4, 2, { NULL }, S_BLST_10 },        //78
+/*S_BLST_10*/       { SPR_BLST, 0, 7, { A_Light0 }, S_BLST_11 },        //79
+/*S_BLST_11*/       { SPR_BLST, 7, 7, { NULL }, S_BLST_12 },        //80
+/*S_BLST_12*/       { SPR_BLST, 6, 7, { A_CheckReload }, S_BLST_00 },       //81
+/*S_BLST_13*/       { SPR_BLST, 8, 7, { A_WeaponReady }, S_BLST_14 },       //82
+/*S_BLST_14*/       { SPR_BLST, 9, 7, { A_WeaponReady }, S_BLST_15 },       //83
+/*S_BLST_15*/       { SPR_BLST, 10, 7, { A_WeaponReady }, S_BLST_16 },      //84
+/*S_BLST_16*/       { SPR_BLST, 11, 7, { A_WeaponReady }, S_BLST_13 },      //85
+/*S_BLST_17*/       { SPR_BLST, 8, 1, { A_Lower }, S_BLST_17 },     //86
+/*S_BLST_18*/       { SPR_BLST, 8, 1, { A_Raise }, S_BLST_18 },     //87
+/*S_BLST_19*/       { SPR_BLST, 8, 20, { A_MaulerSound }, S_BLST_20 },      //88
+/*S_BLST_20*/       { SPR_BLST, 9, 10, { A_Light1 }, S_BLSF_01 },       //89
+/*S_BLSF_01*/       { SPR_BLSF, 32768, 10, { A_FireMauler2 }, S_BLST_21 },      //90
+/*S_BLST_21*/       { SPR_BLST, 32769, 3, { A_Light2 }, S_BLST_22 },        //91
+/*S_BLST_22*/       { SPR_BLST, 2, 2, { NULL }, S_BLST_23 },        //92
+/*S_BLST_23*/       { SPR_BLST, 3, 2, { A_Light0 }, S_BLST_24 },        //93
+/*S_BLST_24*/       { SPR_BLST, 4, 2, { A_ReFire }, S_BLST_13 },        //94
+/*S_GREN_00*/       { SPR_GREN, 0, 1, { A_WeaponReady }, S_GREN_00 },       //95
+/*S_GREN_01*/       { SPR_GREN, 0, 1, { A_Lower }, S_GREN_01 },     //96
+/*S_GREN_02*/       { SPR_GREN, 0, 1, { A_Raise }, S_GREN_02 },     //97
+/*S_GREN_03*/       { SPR_GREN, 0, 5, { A_FireGrenade }, S_GREN_04 },       //98
+/*S_GREN_04*/       { SPR_GREN, 1, 10, { NULL }, S_GREN_05 },       //99
+/*S_GREN_05*/       { SPR_GREN, 0, 5, { A_FireGrenade }, S_GREN_06 },       //100
+/*S_GREN_06*/       { SPR_GREN, 2, 10, { NULL }, S_GREN_07 },       //101
+/*S_GREN_07*/       { SPR_GREN, 0, 0, { A_ReFire }, S_GREN_00 },        //102
+/*S_GREF_00*/       { SPR_GREF, 32768, 5, { A_Light1 }, S_PNCH_00 },        //103
+/*S_GREF_01*/       { SPR_GREF, 0, 10, { A_Light0 }, S_PNCH_00 },       //104
+/*S_GREF_02*/       { SPR_GREF, 32769, 5, { A_Light2 }, S_PNCH_00 },        //105
+/*S_GREN_08*/       { SPR_GREN, 3, 1, { A_WeaponReady }, S_GREN_08 },       //106
+/*S_GREN_09*/       { SPR_GREN, 3, 1, { A_Lower }, S_GREN_09 },     //107
+/*S_GREN_10*/       { SPR_GREN, 3, 1, { A_Raise }, S_GREN_10 },     //108
+/*S_GREN_11*/       { SPR_GREN, 3, 5, { A_FireGrenade }, S_GREN_12 },       //109
+/*S_GREN_12*/       { SPR_GREN, 4, 10, { NULL }, S_GREN_13 },       //110
+/*S_GREN_13*/       { SPR_GREN, 3, 5, { A_FireGrenade }, S_GREN_14 },       //111
+/*S_GREN_14*/       { SPR_GREN, 5, 10, { NULL }, S_GREN_15 },       //112
+/*S_GREN_15*/       { SPR_GREN, 0, 0, { A_ReFire }, S_GREN_08 },        //113
+/*S_GREF_03*/       { SPR_GREF, 32770, 5, { A_Light1 }, S_PNCH_00 },        //114
+/*S_GREF_04*/       { SPR_GREF, 2, 10, { A_Light0 }, S_PNCH_00 },       //115
+/*S_GREF_05*/       { SPR_GREF, 32771, 5, { A_Light2 }, S_PNCH_00 },        //116
+/*S_SIGH_00*/       { SPR_SIGH, 32768, 1, { A_WeaponReady }, S_SIGH_00 },       //117
+/*S_SIGH_01*/       { SPR_SIGH, 32769, -1, { NULL }, S_NULL },      //118
+/*S_SIGH_02*/       { SPR_SIGH, 32770, -1, { NULL }, S_NULL },      //119
+/*S_SIGH_03*/       { SPR_SIGH, 32771, -1, { NULL }, S_NULL },      //120
+/*S_SIGH_04*/       { SPR_SIGH, 32772, -1, { NULL }, S_NULL },      //121
+/*S_SIGH_05*/       { SPR_SIGH, 32768, 1, { A_Lower }, S_SIGH_05 },     //122
+/*S_SIGH_06*/       { SPR_SIGH, 32768, 1, { A_Raise }, S_SIGH_06 },     //123
+/*S_SIGH_07*/       { SPR_SIGH, 32768, 18, { A_SigilSound }, S_SIGH_08 },       //124
+/*S_SIGH_08*/       { SPR_SIGH, 32768, 3, { A_GunFlash }, S_SIGH_09 },      //125
+/*S_SIGH_09*/       { SPR_SIGH, 0, 10, { A_FireSigil }, S_SIGH_10 },        //126
+/*S_SIGH_10*/       { SPR_SIGH, 0, 5, { A_GunFlashThinker }, S_SIGH_00 },       //127
+/*S_SIGF_00*/       { SPR_SIGF, 32768, 4, { A_Light2 }, S_SIGF_01 },        //128
+/*S_SIGF_01*/       { SPR_SIGF, 32769, 6, { A_SigilShock }, S_SIGF_02 },        //129
+/*S_SIGF_02*/       { SPR_SIGF, 32770, 4, { A_Light1 }, S_PNCH_00 },        //130
+/*S_POW1_00*/       { SPR_POW1, 0, 4, { NULL }, S_POW1_01 },        //131
+/*S_POW1_01*/       { SPR_POW1, 1, 4, { NULL }, S_POW1_02 },        //132
+/*S_POW1_02*/       { SPR_POW1, 2, 4, { NULL }, S_POW1_03 },        //133
+/*S_POW1_03*/       { SPR_POW1, 3, 4, { NULL }, S_POW1_04 },        //134
+/*S_POW1_04*/       { SPR_POW1, 4, 4, { NULL }, S_NULL },       //135
+/*S_POW1_05*/       { SPR_POW1, 5, 4, { NULL }, S_POW1_06 },        //136
+/*S_POW1_06*/       { SPR_POW1, 6, 4, { NULL }, S_POW1_07 },        //137
+/*S_POW1_07*/       { SPR_POW1, 7, 4, { NULL }, S_POW1_08 },        //138
+/*S_POW1_08*/       { SPR_POW1, 8, 4, { NULL }, S_POW1_09 },        //139
+/*S_POW1_09*/       { SPR_POW1, 9, 4, { NULL }, S_NULL },       //140
+/*S_POW2_00*/       { SPR_POW2, 0, 4, { NULL }, S_POW2_01 },        //141
+/*S_POW2_01*/       { SPR_POW2, 1, 4, { NULL }, S_POW2_02 },        //142
+/*S_POW2_02*/       { SPR_POW2, 2, 4, { NULL }, S_POW2_03 },        //143
+/*S_POW2_03*/       { SPR_POW2, 3, 4, { NULL }, S_NULL },       //144
+/*S_POW3_00*/       { SPR_POW3, 0, 3, { NULL }, S_POW3_01 },        //145
+/*S_POW3_01*/       { SPR_POW3, 1, 3, { NULL }, S_POW3_02 },        //146
+/*S_POW3_02*/       { SPR_POW3, 2, 3, { NULL }, S_POW3_03 },        //147
+/*S_POW3_03*/       { SPR_POW3, 3, 3, { NULL }, S_POW3_04 },        //148
+/*S_POW3_04*/       { SPR_POW3, 4, 3, { NULL }, S_POW3_05 },        //149
+/*S_POW3_05*/       { SPR_POW3, 5, 3, { NULL }, S_POW3_06 },        //150
+/*S_POW3_06*/       { SPR_POW3, 6, 3, { NULL }, S_POW3_07 },        //151
+/*S_POW3_07*/       { SPR_POW3, 7, 3, { NULL }, S_NULL },       //152
+/*S_ZAP1_00*/       { SPR_ZAP1, 1, 3, { A_DeathExplode3 }, S_ZAP1_02 },     //153
+/*S_ZAP1_01*/       { SPR_ZAP1, 0, 3, { A_RaiseAlarm }, S_ZAP1_02 },        //154
+/*S_ZAP1_02*/       { SPR_ZAP1, 1, 3, { NULL }, S_ZAP1_03 },        //155
+/*S_ZAP1_03*/       { SPR_ZAP1, 2, 3, { NULL }, S_ZAP1_04 },        //156
+/*S_ZAP1_04*/       { SPR_ZAP1, 3, 3, { NULL }, S_ZAP1_05 },        //157
+/*S_ZAP1_05*/       { SPR_ZAP1, 4, 3, { NULL }, S_ZAP1_06 },        //158
+/*S_ZAP1_06*/       { SPR_ZAP1, 5, 3, { NULL }, S_ZAP1_07 },        //159
+/*S_ZAP1_07*/       { SPR_ZAP1, 4, 3, { NULL }, S_ZAP1_08 },        //160
+/*S_ZAP1_08*/       { SPR_ZAP1, 3, 2, { NULL }, S_ZAP1_09 },        //161
+/*S_ZAP1_09*/       { SPR_ZAP1, 2, 2, { NULL }, S_ZAP1_10 },        //162
+/*S_ZAP1_10*/       { SPR_ZAP1, 1, 2, { NULL }, S_ZAP1_11 },        //163
+/*S_ZAP1_11*/       { SPR_ZAP1, 0, 1, { NULL }, S_NULL },       //164
+/*S_SPRY_00*/       { SPR_SPRY, 0, 3, { NULL }, S_SPRY_01 },        //165
+/*S_SPRY_01*/       { SPR_SPRY, 1, 3, { NULL }, S_SPRY_02 },        //166
+/*S_SPRY_02*/       { SPR_SPRY, 2, 3, { NULL }, S_SPRY_03 },        //167
+/*S_SPRY_03*/       { SPR_SPRY, 3, 3, { NULL }, S_SPRY_04 },        //168
+/*S_SPRY_04*/       { SPR_SPRY, 4, 3, { NULL }, S_SPRY_05 },        //169
+/*S_SPRY_05*/       { SPR_SPRY, 5, 3, { NULL }, S_SPRY_06 },        //170
+/*S_SPRY_06*/       { SPR_SPRY, 6, 2, { NULL }, S_NULL },       //171
+/*S_BLOD_00*/       { SPR_BLOD, 2, 8, { NULL }, S_BLOD_01 },        //172
+/*S_BLOD_01*/       { SPR_BLOD, 1, 8, { NULL }, S_BLOD_02 },        //173
+/*S_BLOD_02*/       { SPR_BLOD, 0, 8, { NULL }, S_NULL },       //174
+/*S_PUFY_00*/       { SPR_PUFY, 32768, 4, { NULL }, S_PUFY_01 },        //175
+/*S_PUFY_01*/       { SPR_PUFY, 1, 4, { NULL }, S_PUFY_02 },        //176
+/*S_PUFY_02*/       { SPR_PUFY, 2, 4, { NULL }, S_PUFY_03 },        //177
+/*S_PUFY_03*/       { SPR_PUFY, 3, 4, { NULL }, S_NULL },       //178
+/*S_SHT1_00*/       { SPR_SHT1, 0, 4, { NULL }, S_SHT1_01 },        //179
+/*S_SHT1_01*/       { SPR_SHT1, 1, 4, { NULL }, S_SHT1_00 },        //180
+/*S_SHT2_00*/       { SPR_SHT2, 0, 5, { NULL }, S_SHT2_01 },        //181
+/*S_SHT2_01*/       { SPR_SHT2, 1, 5, { NULL }, S_POW1_00 },        //182
+/*S_GRIN_00*/       { SPR_GRIN, 0, 3, { A_MissileTick }, S_GRIN_01 },       //183
+/*S_GRIN_01*/       { SPR_GRIN, 1, 3, { A_MissileTick }, S_GRIN_00 },       //184
+/*S_GRAP_00*/       { SPR_GRAP, 0, 3, { A_MissileTick }, S_GRAP_01 },       //185
+/*S_GRAP_01*/       { SPR_GRAP, 1, 3, { A_MissileTick }, S_GRAP_00 },       //186
+/*S_UBAM_00*/       { SPR_UBAM, 0, 3, { A_MissileTick }, S_UBAM_01 },       //187
+/*S_UBAM_01*/       { SPR_UBAM, 1, 3, { A_MissileTick }, S_UBAM_00 },       //188
+/*S_BNG2_00*/       { SPR_BNG2, 32768, 4, { A_DeathExplode5 }, S_BNG2_01 },     //189
+/*S_BNG2_01*/       { SPR_BNG2, 32769, 4, { NULL }, S_BNG2_02 },        //190
+/*S_BNG2_02*/       { SPR_BNG2, 32770, 4, { NULL }, S_BNG2_03 },        //191
+/*S_BNG2_03*/       { SPR_BNG2, 32771, 4, { NULL }, S_BNG2_04 },        //192
+/*S_BNG2_04*/       { SPR_BNG2, 32772, 4, { NULL }, S_BNG2_05 },        //193
+/*S_BNG2_05*/       { SPR_BNG2, 32773, 4, { NULL }, S_BNG2_06 },        //194
+/*S_BNG2_06*/       { SPR_BNG2, 32774, 4, { NULL }, S_BNG2_07 },        //195
+/*S_BNG2_07*/       { SPR_BNG2, 32775, 4, { NULL }, S_BNG2_08 },        //196
+/*S_BNG2_08*/       { SPR_BNG2, 32776, 4, { NULL }, S_NULL },       //197
+/*S_BNG4_00*/       { SPR_BNG4, 32768, 2, { A_DeathExplode5 }, S_BNG4_01 },     //198
+/*S_BNG4_01*/       { SPR_BNG4, 32769, 3, { NULL }, S_BNG4_02 },        //199
+/*S_BNG4_02*/       { SPR_BNG4, 32770, 3, { NULL }, S_BNG4_03 },        //200
+/*S_BNG4_03*/       { SPR_BNG4, 32771, 3, { NULL }, S_BNG4_04 },        //201
+/*S_BNG4_04*/       { SPR_BNG4, 32772, 3, { NULL }, S_BNG4_05 },        //202
+/*S_BNG4_05*/       { SPR_BNG4, 32773, 3, { NULL }, S_BNG4_06 },        //203
+/*S_BNG4_06*/       { SPR_BNG4, 32774, 3, { NULL }, S_BNG4_07 },        //204
+/*S_BNG4_07*/       { SPR_BNG4, 32775, 3, { NULL }, S_BNG4_08 },        //205
+/*S_BNG4_08*/       { SPR_BNG4, 32776, 3, { NULL }, S_BNG4_09 },        //206
+/*S_BNG4_09*/       { SPR_BNG4, 32777, 3, { NULL }, S_BNG4_10 },        //207
+/*S_BNG4_10*/       { SPR_BNG4, 32778, 3, { NULL }, S_BNG4_11 },        //208
+/*S_BNG4_11*/       { SPR_BNG4, 32779, 3, { NULL }, S_BNG4_12 },        //209
+/*S_BNG4_12*/       { SPR_BNG4, 32780, 3, { NULL }, S_BNG4_13 },        //210
+/*S_BNG4_13*/       { SPR_BNG4, 32781, 3, { NULL }, S_NULL },       //211
+/*S_BNG3_00*/       { SPR_BNG3, 32768, 3, { A_DeathExplode5 }, S_BNG3_01 },     //212
+/*S_BNG3_01*/       { SPR_BNG3, 32769, 3, { NULL }, S_BNG3_02 },        //213
+/*S_BNG3_02*/       { SPR_BNG3, 32770, 3, { NULL }, S_BNG3_03 },        //214
+/*S_BNG3_03*/       { SPR_BNG3, 32771, 3, { NULL }, S_BNG3_04 },        //215
+/*S_BNG3_04*/       { SPR_BNG3, 32772, 3, { NULL }, S_BNG3_05 },        //216
+/*S_BNG3_05*/       { SPR_BNG3, 32773, 3, { NULL }, S_BNG3_06 },        //217
+/*S_BNG3_06*/       { SPR_BNG3, 32774, 3, { NULL }, S_BNG3_07 },        //218
+/*S_BNG3_07*/       { SPR_BNG3, 32775, 3, { NULL }, S_NULL },       //219
+/*S_BNG3_08*/       { SPR_BNG3, 0, 1, { A_SpawnGrenadeFire }, S_NULL },     //220
+/*S_BNG3_09*/       { SPR_BNG3, 32769, 2, { A_DeathExplode1 }, S_BNG3_10 },     //221
+/*S_BNG3_10*/       { SPR_BNG3, 32770, 2, { A_MissileTick }, S_FLBE_00 },       //222
+/*S_FLBE_00*/       { SPR_FLBE, 32768, 2, { A_BurnSpread }, S_FLBE_01 },        //223
+/*S_FLBE_01*/       { SPR_FLBE, 32769, 2, { A_MissileTick }, S_FLBE_02 },       //224
+/*S_FLBE_02*/       { SPR_FLBE, 32770, 2, { A_DeathExplode1 }, S_FLBE_03 },     //225
+/*S_FLBE_03*/       { SPR_FLBE, 32771, 3, { A_MissileTick }, S_FLBE_04 },       //226
+/*S_FLBE_04*/       { SPR_FLBE, 32772, 3, { A_DeathExplode1 }, S_FLBE_05 },     //227
+/*S_FLBE_05*/       { SPR_FLBE, 32773, 3, { A_MissileTick }, S_FLBE_06 },       //228
+/*S_FLBE_06*/       { SPR_FLBE, 32774, 3, { A_BurnSpread }, S_FLBE_03 },        //229
+/*S_FLBE_07*/       { SPR_FLBE, 32775, 2, { NULL }, S_FLBE_08 },        //230
+/*S_FLBE_08*/       { SPR_FLBE, 32776, 2, { A_BurnSpread }, S_FLBE_09 },        //231
+/*S_FLBE_09*/       { SPR_FLBE, 32777, 2, { NULL }, S_FLBE_10 },        //232
+/*S_FLBE_10*/       { SPR_FLBE, 32778, 2, { NULL }, S_NULL },       //233
+/*S_XPRK_00*/       { SPR_XPRK, 0, 1, { A_ClearForceField }, S_NULL },      //234
+/*S_OCLW_00*/       { SPR_OCLW, 0, 2, { A_FireChainShot }, S_OCLW_00 },     //235
+/*S_CCLW_00*/       { SPR_CCLW, 0, 6, { NULL }, S_NULL },       //236
+/*S_TEND_00*/       { SPR_TEND, 0, 20, { NULL }, S_NULL },      //237
+/*S_MICR_00*/       { SPR_MICR, 32768, 6, { A_MissileSmoke }, S_MICR_00 },      //238
+/*S_MISS_00*/       { SPR_MISS, 32768, 4, { A_MissileSmoke }, S_MISS_01 },      //239
+/*S_MISS_01*/       { SPR_MISS, 32769, 3, { A_Tracer }, S_MISS_00 },        //240
+/*S_AROW_00*/       { SPR_AROW, 0, 10, { A_ActiveSound }, S_AROW_00 },      //241
+/*S_ARWP_00*/       { SPR_ARWP, 0, 10, { A_ActiveSound }, S_ARWP_00 },      //242
+/*S_AROW_01*/       { SPR_AROW, 0, 1, { NULL }, S_NULL },       //243
+/*S_TORP_00*/       { SPR_TORP, 32768, 4, { NULL }, S_TORP_01 },        //244
+/*S_TORP_01*/       { SPR_TORP, 32769, 4, { NULL }, S_TORP_02 },        //245
+/*S_TORP_02*/       { SPR_TORP, 32770, 4, { NULL }, S_TORP_03 },        //246
+/*S_TORP_03*/       { SPR_TORP, 32771, 4, { NULL }, S_TORP_00 },        //247
+/*S_THIT_00*/       { SPR_THIT, 32768, 8, { NULL }, S_THIT_01 },        //248
+/*S_THIT_01*/       { SPR_THIT, 32769, 8, { NULL }, S_THIT_02 },        //249
+/*S_THIT_02*/       { SPR_THIT, 32770, 8, { A_TorpedoExplode }, S_THIT_03 },        //250
+/*S_THIT_03*/       { SPR_THIT, 32771, 8, { NULL }, S_THIT_04 },        //251
+/*S_THIT_04*/       { SPR_THIT, 32772, 8, { NULL }, S_NULL },       //252
+/*S_TWAV_00*/       { SPR_TWAV, 32768, 9, { NULL }, S_TWAV_01 },        //253
+/*S_TWAV_01*/       { SPR_TWAV, 32769, 9, { NULL }, S_TWAV_02 },        //254
+/*S_TWAV_02*/       { SPR_TWAV, 32770, 9, { NULL }, S_NULL },       //255
+/*S_MISL_00*/       { SPR_MISL, 32768, 5, { NULL }, S_MISL_02 },        //256
+/*S_MISL_01*/       { SPR_MISL, 32768, 5, { A_DeathExplode2 }, S_MISL_02 },     //257
+/*S_MISL_02*/       { SPR_MISL, 32769, 5, { NULL }, S_MISL_03 },        //258
+/*S_MISL_03*/       { SPR_MISL, 32770, 4, { NULL }, S_MISL_04 },        //259
+/*S_MISL_04*/       { SPR_MISL, 32771, 2, { NULL }, S_MISL_05 },        //260
+/*S_MISL_05*/       { SPR_MISL, 32772, 2, { NULL }, S_MISL_06 },        //261
+/*S_MISL_06*/       { SPR_MISL, 32773, 2, { NULL }, S_MISL_07 },        //262
+/*S_MISL_07*/       { SPR_MISL, 32774, 2, { NULL }, S_NULL },       //263
+/*S_TFOG_00*/       { SPR_TFOG, 32768, 6, { NULL }, S_TFOG_01 },        //264
+/*S_TFOG_01*/       { SPR_TFOG, 32769, 6, { NULL }, S_TFOG_02 },        //265
+/*S_TFOG_02*/       { SPR_TFOG, 32770, 6, { NULL }, S_TFOG_03 },        //266
+/*S_TFOG_03*/       { SPR_TFOG, 32771, 6, { NULL }, S_TFOG_04 },        //267
+/*S_TFOG_04*/       { SPR_TFOG, 32772, 6, { NULL }, S_TFOG_05 },        //268
+/*S_TFOG_05*/       { SPR_TFOG, 32773, 6, { NULL }, S_TFOG_06 },        //269
+/*S_TFOG_06*/       { SPR_TFOG, 32772, 6, { NULL }, S_TFOG_07 },        //270
+/*S_TFOG_07*/       { SPR_TFOG, 32771, 6, { NULL }, S_TFOG_08 },        //271
+/*S_TFOG_08*/       { SPR_TFOG, 32770, 6, { NULL }, S_TFOG_09 },        //272
+/*S_TFOG_09*/       { SPR_TFOG, 32769, 6, { NULL }, S_NULL },       //273
+/*S_IFOG_00*/       { SPR_IFOG, 32768, 6, { NULL }, S_IFOG_01 },        //274
+/*S_IFOG_01*/       { SPR_IFOG, 32769, 6, { NULL }, S_IFOG_02 },        //275
+/*S_IFOG_02*/       { SPR_IFOG, 32768, 6, { NULL }, S_IFOG_03 },        //276
+/*S_IFOG_03*/       { SPR_IFOG, 32769, 6, { NULL }, S_IFOG_04 },        //277
+/*S_IFOG_04*/       { SPR_IFOG, 32770, 6, { NULL }, S_IFOG_05 },        //278
+/*S_IFOG_05*/       { SPR_IFOG, 32771, 6, { NULL }, S_IFOG_06 },        //279
+/*S_IFOG_06*/       { SPR_IFOG, 32772, 6, { NULL }, S_NULL },       //280
+/*S_SHRD_00*/       { SPR_SHRD, 0, 128, { NULL }, S_NULL },     //281
+/*S_SHRD_01*/       { SPR_SHRD, 1, 128, { NULL }, S_NULL },     //282
+/*S_SHRD_02*/       { SPR_SHRD, 2, 128, { NULL }, S_NULL },     //283
+/*S_SHRD_03*/       { SPR_SHRD, 3, 128, { NULL }, S_NULL },     //284
+/*S_SHRD_04*/       { SPR_SHRD, 4, 128, { NULL }, S_NULL },     //285
+/*S_SHRD_05*/       { SPR_SHRD, 5, 128, { NULL }, S_NULL },     //286
+/*S_PLAY_00*/       { SPR_PLAY, 0, -1, { NULL }, S_NULL },      //287
+/*S_PLAY_01*/       { SPR_PLAY, 0, 4, { NULL }, S_PLAY_02 },        //288
+/*S_PLAY_02*/       { SPR_PLAY, 1, 4, { NULL }, S_PLAY_03 },        //289
+/*S_PLAY_03*/       { SPR_PLAY, 2, 4, { NULL }, S_PLAY_04 },        //290
+/*S_PLAY_04*/       { SPR_PLAY, 3, 4, { NULL }, S_PLAY_01 },        //291
+/*S_PLAY_05*/       { SPR_PLAY, 4, 12, { NULL }, S_PLAY_00 },       //292
+/*S_PLAY_06*/       { SPR_PLAY, 5, 6, { NULL }, S_PLAY_05 },        //293
+/*S_PLAY_07*/       { SPR_PLAY, 16, 4, { A_Pain }, S_PLAY_08 },     //294
+/*S_PLAY_08*/       { SPR_PLAY, 16, 4, { NULL }, S_PLAY_00 },       //295
+/*S_PLAY_09*/       { SPR_PLAY, 6, 4, { NULL }, S_PLAY_10 },        //296
+/*S_PLAY_10*/       { SPR_PLAY, 7, 3, { A_PlayerScream }, S_PLAY_11 },      //297
+/*S_PLAY_11*/       { SPR_PLAY, 8, 3, { A_Fall }, S_PLAY_12 },      //298
+/*S_PLAY_12*/       { SPR_PLAY, 9, 4, { NULL }, S_PLAY_13 },        //299
+/*S_PLAY_13*/       { SPR_PLAY, 10, 4, { NULL }, S_PLAY_14 },       //300
+/*S_PLAY_14*/       { SPR_PLAY, 11, 4, { NULL }, S_PLAY_15 },       //301
+/*S_PLAY_15*/       { SPR_PLAY, 12, 4, { NULL }, S_PLAY_16 },       //302
+/*S_PLAY_16*/       { SPR_PLAY, 13, 4, { NULL }, S_PLAY_17 },       //303
+/*S_PLAY_17*/       { SPR_PLAY, 14, 4, { NULL }, S_PLAY_18 },       //304
+/*S_PLAY_18*/       { SPR_PLAY, 15, 700, { NULL }, S_RGIB_07 },     //305
+/*S_RGIB_00*/       { SPR_RGIB, 0, 5, { A_BodyParts }, S_RGIB_01 },     //306
+/*S_RGIB_01*/       { SPR_RGIB, 1, 5, { A_XScream }, S_RGIB_02 },       //307
+/*S_RGIB_02*/       { SPR_RGIB, 2, 5, { A_Fall }, S_RGIB_03 },      //308
+/*S_RGIB_03*/       { SPR_RGIB, 3, 5, { A_BodyParts }, S_RGIB_04 },     //309
+/*S_RGIB_04*/       { SPR_RGIB, 4, 5, { A_BodyParts }, S_RGIB_05 },     //310
+/*S_RGIB_05*/       { SPR_RGIB, 5, 5, { A_BodyParts }, S_RGIB_06 },     //311
+/*S_RGIB_06*/       { SPR_RGIB, 6, 5, { A_BodyParts }, S_RGIB_07 },     //312
+/*S_RGIB_07*/       { SPR_RGIB, 7, 1400, { NULL }, S_NULL },        //313
+/*S_MRYS_00*/       { SPR_MRYS, 0, 30, { NULL }, S_MRST_00 },       //314
+/*S_MRNO_00*/       { SPR_MRNO, 0, 6, { NULL }, S_MRNO_01 },        //315
+/*S_MRNO_01*/       { SPR_MRNO, 1, 6, { NULL }, S_MRNO_02 },        //316
+/*S_MRNO_02*/       { SPR_MRNO, 2, 10, { NULL }, S_MRNO_03 },       //317
+/*S_MRNO_03*/       { SPR_MRNO, 1, 6, { NULL }, S_MRNO_04 },        //318
+/*S_MRNO_04*/       { SPR_MRNO, 0, 6, { NULL }, S_MRST_00 },        //319
+/*S_MRST_00*/       { SPR_MRST, 0, 10, { A_FriendLook }, S_MRST_00 },       //320
+/*S_MRLK_00*/       { SPR_MRLK, 0, 30, { A_ActiveSound }, S_MRST_00 },      //321
+/*S_MRLK_01*/       { SPR_MRLK, 1, 30, { NULL }, S_MRST_00 },       //322
+/*S_MRBD_00*/       { SPR_MRBD, 0, 4, { NULL }, S_MRBD_01 },        //323
+/*S_MRBD_01*/       { SPR_MRBD, 1, 4, { NULL }, S_MRBD_02 },        //324
+/*S_MRBD_02*/       { SPR_MRBD, 2, 4, { NULL }, S_MRBD_03 },        //325
+/*S_MRBD_03*/       { SPR_MRBD, 3, 4, { NULL }, S_MRBD_04 },        //326
+/*S_MRBD_04*/       { SPR_MRBD, 4, 4, { NULL }, S_MRBD_05 },        //327
+/*S_MRBD_05*/       { SPR_MRBD, 3, 4, { NULL }, S_MRBD_06 },        //328
+/*S_MRBD_06*/       { SPR_MRBD, 2, 4, { NULL }, S_MRBD_07 },        //329
+/*S_MRBD_07*/       { SPR_MRBD, 1, 4, { NULL }, S_MRBD_08 },        //330
+/*S_MRBD_08*/       { SPR_MRBD, 0, 5, { NULL }, S_MRBD_09 },        //331
+/*S_MRBD_09*/       { SPR_MRBD, 5, 6, { NULL }, S_MRST_00 },        //332
+/*S_MRPN_00*/       { SPR_MRPN, 0, 3, { NULL }, S_MRPN_01 },        //333
+/*S_MRPN_01*/       { SPR_MRPN, 1, 3, { A_Pain }, S_MRPN_02 },      //334
+/*S_MRPN_02*/       { SPR_MRPN, 2, 3, { NULL }, S_MRPN_03 },        //335
+/*S_MRPN_03*/       { SPR_MRPN, 3, 9, { A_MerchantPain }, S_MRPN_04 },      //336
+/*S_MRPN_04*/       { SPR_MRPN, 2, 4, { NULL }, S_MRPN_05 },        //337
+/*S_MRPN_05*/       { SPR_MRPN, 1, 3, { NULL }, S_MRPN_06 },        //338
+/*S_MRPN_06*/       { SPR_MRPN, 0, 3, { A_ClearSoundTarget }, S_MRST_00 },      //339
+/*S_MRGT_00*/       { SPR_MRGT, 0, 5, { NULL }, S_MRGT_01 },        //340
+/*S_MRGT_01*/       { SPR_MRGT, 1, 5, { NULL }, S_MRGT_02 },        //341
+/*S_MRGT_02*/       { SPR_MRGT, 2, 5, { NULL }, S_MRGT_03 },        //342
+/*S_MRGT_03*/       { SPR_MRGT, 3, 5, { NULL }, S_MRGT_04 },        //343
+/*S_MRGT_04*/       { SPR_MRGT, 4, 5, { NULL }, S_MRGT_05 },        //344
+/*S_MRGT_05*/       { SPR_MRGT, 5, 5, { NULL }, S_MRGT_06 },        //345
+/*S_MRGT_06*/       { SPR_MRGT, 6, 5, { NULL }, S_MRGT_07 },        //346
+/*S_MRGT_07*/       { SPR_MRGT, 7, 5, { NULL }, S_MRGT_08 },        //347
+/*S_MRGT_08*/       { SPR_MRGT, 8, 5, { NULL }, S_MRST_00 },        //348
+/*S_BURN_00*/       { SPR_BURN, 0, 3, { A_Scream }, S_BURN_01 },        //349
+/*S_BURN_01*/       { SPR_BURN, 1, 3, { A_DropBurnFlesh }, S_BURN_02 },     //350
+/*S_BURN_02*/       { SPR_BURN, 2, 3, { A_RandomWalk }, S_BURN_03 },        //351
+/*S_BURN_03*/       { SPR_BURN, 3, 3, { A_Fall }, S_BURN_04 },      //352
+/*S_BURN_04*/       { SPR_BURN, 4, 5, { A_DropBurnFlesh }, S_BURN_05 },     //353
+/*S_BURN_05*/       { SPR_BURN, 5, 5, { A_RandomWalk }, S_BURN_06 },        //354
+/*S_BURN_06*/       { SPR_BURN, 6, 5, { A_RandomWalk }, S_BURN_07 },        //355
+/*S_BURN_07*/       { SPR_BURN, 7, 5, { A_RandomWalk }, S_BURN_08 },        //356
+/*S_BURN_08*/       { SPR_BURN, 8, 5, { A_DropBurnFlesh }, S_BURN_09 },     //357
+/*S_BURN_09*/       { SPR_BURN, 9, 5, { A_RandomWalk }, S_BURN_10 },        //358
+/*S_BURN_10*/       { SPR_BURN, 10, 5, { A_RandomWalk }, S_BURN_11 },       //359
+/*S_BURN_11*/       { SPR_BURN, 11, 5, { A_RandomWalk }, S_BURN_12 },       //360
+/*S_BURN_12*/       { SPR_BURN, 12, 3, { A_DropBurnFlesh }, S_BURN_13 },        //361
+/*S_BURN_13*/       { SPR_BURN, 13, 3, { NULL }, S_BURN_14 },       //362
+/*S_BURN_14*/       { SPR_BURN, 14, 5, { NULL }, S_BURN_15 },       //363
+/*S_BURN_15*/       { SPR_BURN, 15, 5, { NULL }, S_BURN_16 },       //364
+/*S_BURN_16*/       { SPR_BURN, 16, 5, { NULL }, S_BURN_17 },       //365
+/*S_BURN_17*/       { SPR_BURN, 15, 5, { NULL }, S_BURN_18 },       //366
+/*S_BURN_18*/       { SPR_BURN, 16, 5, { NULL }, S_BURN_19 },       //367
+/*S_BURN_19*/       { SPR_BURN, 17, 7, { NULL }, S_BURN_20 },       //368
+/*S_BURN_20*/       { SPR_BURN, 18, 7, { NULL }, S_BURN_21 },       //369
+/*S_BURN_21*/       { SPR_BURN, 19, 7, { NULL }, S_BURN_22 },       //370
+/*S_BURN_22*/       { SPR_BURN, 20, 7, { NULL }, S_BURN_23 },       //371
+/*S_BURN_23*/       { SPR_BURN, 21, 700, { A_PeasantCrash }, S_NULL },      //372
+/*S_DISR_00*/       { SPR_DISR, 0, 5, { NULL }, S_DISR_01 },        //373
+/*S_DISR_01*/       { SPR_DISR, 1, 5, { NULL }, S_DISR_02 },        //374
+/*S_DISR_02*/       { SPR_DISR, 2, 5, { NULL }, S_DISR_03 },        //375
+/*S_DISR_03*/       { SPR_DISR, 3, 5, { A_Fall }, S_DISR_04 },      //376
+/*S_DISR_04*/       { SPR_DISR, 4, 5, { NULL }, S_DISR_05 },        //377
+/*S_DISR_05*/       { SPR_DISR, 5, 5, { NULL }, S_DISR_06 },        //378
+/*S_DISR_06*/       { SPR_DISR, 6, 4, { NULL }, S_DISR_07 },        //379
+/*S_DISR_07*/       { SPR_DISR, 7, 4, { NULL }, S_DISR_08 },        //380
+/*S_DISR_08*/       { SPR_DISR, 8, 4, { NULL }, S_DISR_09 },        //381
+/*S_DISR_09*/       { SPR_DISR, 9, 4, { NULL }, S_MEAT_03 },        //382
+/*S_PEAS_00*/       { SPR_PEAS, 0, 10, { A_FriendLook }, S_PEAS_00 },       //383
+/*S_PEAS_01*/       { SPR_PEAS, 0, 5, { A_RandomWalk }, S_PEAS_02 },        //384
+/*S_PEAS_02*/       { SPR_PEAS, 0, 5, { A_RandomWalk }, S_PEAS_03 },        //385
+/*S_PEAS_03*/       { SPR_PEAS, 1, 5, { A_RandomWalk }, S_PEAS_04 },        //386
+/*S_PEAS_04*/       { SPR_PEAS, 1, 5, { A_RandomWalk }, S_PEAS_05 },        //387
+/*S_PEAS_05*/       { SPR_PEAS, 2, 5, { A_RandomWalk }, S_PEAS_06 },        //388
+/*S_PEAS_06*/       { SPR_PEAS, 2, 5, { A_RandomWalk }, S_PEAS_07 },        //389
+/*S_PEAS_07*/       { SPR_PEAS, 3, 5, { A_RandomWalk }, S_PEAS_08 },        //390
+/*S_PEAS_08*/       { SPR_PEAS, 3, 5, { A_RandomWalk }, S_PEAS_00 },        //391
+/*S_PEAS_09*/       { SPR_PEAS, 4, 10, { A_FaceTarget }, S_PEAS_10 },       //392
+/*S_PEAS_10*/       { SPR_PEAS, 5, 8, { A_PeasantPunch }, S_PEAS_11 },      //393
+/*S_PEAS_11*/       { SPR_PEAS, 4, 8, { NULL }, S_PEAS_01 },        //394
+/*S_PEAS_12*/       { SPR_PEAS, 14, 3, { NULL }, S_PEAS_13 },       //395
+/*S_PEAS_13*/       { SPR_PEAS, 14, 3, { A_Pain }, S_PEAS_09 },     //396
+/*S_PEAS_14*/       { SPR_PEAS, 6, 5, { NULL }, S_PEAS_15 },        //397
+/*S_PEAS_15*/       { SPR_PEAS, 7, 10, { A_PeasantCrash }, S_PEAS_16 },     //398
+/*S_PEAS_16*/       { SPR_PEAS, 8, 6, { NULL }, S_PEAS_15 },        //399
+/*S_PEAS_17*/       { SPR_PEAS, 6, 5, { NULL }, S_PEAS_18 },        //400
+/*S_PEAS_18*/       { SPR_PEAS, 7, 5, { A_Scream }, S_PEAS_19 },        //401
+/*S_PEAS_19*/       { SPR_PEAS, 8, 6, { NULL }, S_PEAS_20 },        //402
+/*S_PEAS_20*/       { SPR_PEAS, 9, 5, { A_Fall }, S_PEAS_21 },      //403
+/*S_PEAS_21*/       { SPR_PEAS, 10, 5, { NULL }, S_PEAS_22 },       //404
+/*S_PEAS_22*/       { SPR_PEAS, 11, 6, { NULL }, S_PEAS_23 },       //405
+/*S_PEAS_23*/       { SPR_PEAS, 12, 8, { NULL }, S_PEAS_24 },       //406
+/*S_PEAS_24*/       { SPR_PEAS, 13, 1400, { NULL }, S_GIBS_08 },        //407
+/*S_GIBS_00*/       { SPR_GIBS, 12, 5, { A_BodyParts }, S_GIBS_01 },        //408
+/*S_GIBS_01*/       { SPR_GIBS, 13, 5, { A_XScream }, S_GIBS_02 },      //409
+/*S_GIBS_02*/       { SPR_GIBS, 14, 5, { A_Fall }, S_GIBS_03 },     //410
+/*S_GIBS_03*/       { SPR_GIBS, 15, 4, { A_BodyParts }, S_GIBS_04 },        //411
+/*S_GIBS_04*/       { SPR_GIBS, 16, 4, { A_BodyParts }, S_GIBS_05 },        //412
+/*S_GIBS_05*/       { SPR_GIBS, 17, 4, { A_BodyParts }, S_GIBS_06 },        //413
+/*S_GIBS_06*/       { SPR_GIBS, 18, 4, { A_BodyParts }, S_GIBS_07 },        //414
+/*S_GIBS_07*/       { SPR_GIBS, 19, 4, { NULL }, S_GIBS_08 },       //415
+/*S_GIBS_08*/       { SPR_GIBS, 20, 5, { NULL }, S_GIBS_09 },       //416
+/*S_GIBS_09*/       { SPR_GIBS, 21, 1400, { NULL }, S_NULL },       //417
+/*S_PEAS_25*/       { SPR_PEAS, 0, 5, { A_ZombieInSpecialSector }, S_PEAS_25 },     //418
+/*S_AGRD_00*/       { SPR_AGRD, 0, 5, { A_ZombieInSpecialSector }, S_AGRD_00 },     //419
+/*S_ARMR_00*/       { SPR_ARMR, 0, -1, { NULL }, S_NULL },      //420
+/*S_ARMR_01*/       { SPR_ARMR, 0, -1, { A_HideZombie }, S_NULL },      //421
+/*S_PLAY_19*/       { SPR_PLAY, 0, 175, { A_SpawnZombie }, S_PLAY_19 },     //422
+/*S_SACR_00*/       { SPR_SACR, 0, -1, { NULL }, S_NULL },      //423
+/*S_TNK1_00*/       { SPR_TNK1, 0, 15, { NULL }, S_TNK1_01 },       //424
+/*S_TNK1_01*/       { SPR_TNK1, 1, 11, { NULL }, S_TNK1_02 },       //425
+/*S_TNK1_02*/       { SPR_TNK1, 2, 40, { NULL }, S_TNK1_00 },       //426
+/*S_TNK2_00*/       { SPR_TNK2, 0, 15, { NULL }, S_TNK2_01 },       //427
+/*S_TNK2_01*/       { SPR_TNK2, 1, 11, { NULL }, S_TNK2_02 },       //428
+/*S_TNK2_02*/       { SPR_TNK2, 2, 40, { NULL }, S_TNK2_00 },       //429
+/*S_TNK3_00*/       { SPR_TNK3, 0, 15, { NULL }, S_TNK3_01 },       //430
+/*S_TNK3_01*/       { SPR_TNK3, 1, 11, { NULL }, S_TNK3_02 },       //431
+/*S_TNK3_02*/       { SPR_TNK3, 2, 40, { NULL }, S_TNK3_00 },       //432
+/*S_TNK4_00*/       { SPR_TNK4, 0, 15, { NULL }, S_TNK4_01 },       //433
+/*S_TNK4_01*/       { SPR_TNK4, 1, 11, { NULL }, S_TNK4_02 },       //434
+/*S_TNK4_02*/       { SPR_TNK4, 2, 40, { NULL }, S_TNK4_00 },       //435
+/*S_TNK5_00*/       { SPR_TNK5, 0, 15, { NULL }, S_TNK5_01 },       //436
+/*S_TNK5_01*/       { SPR_TNK5, 1, 11, { NULL }, S_TNK5_02 },       //437
+/*S_TNK5_02*/       { SPR_TNK5, 2, 40, { NULL }, S_TNK5_00 },       //438
+/*S_TNK6_00*/       { SPR_TNK6, 0, 15, { NULL }, S_TNK6_01 },       //439
+/*S_TNK6_01*/       { SPR_TNK6, 1, 11, { NULL }, S_TNK6_02 },       //440
+/*S_TNK6_02*/       { SPR_TNK6, 2, 40, { NULL }, S_TNK6_00 },       //441
+/*S_NEAL_00*/       { SPR_NEAL, 0, 15, { A_ActiveSound }, S_NEAL_01 },      //442
+/*S_NEAL_01*/       { SPR_NEAL, 1, 40, { A_ActiveSound }, S_NEAL_00 },      //443
+/*S_NEAL_02*/       { SPR_NEAL, 2, 5, { A_ShadowOn }, S_NEAL_03 },      //444
+/*S_NEAL_03*/       { SPR_NEAL, 1, 4, { A_Pain }, S_NEAL_04 },      //445
+/*S_NEAL_04*/       { SPR_NEAL, 2, 5, { A_ShadowOff }, S_NEAL_00 },     //446
+/*S_NEAL_05*/       { SPR_NEAL, 1, 6, { NULL }, S_NEAL_06 },        //447
+/*S_NEAL_06*/       { SPR_NEAL, 2, 13, { A_PeasantCrash }, S_NEAL_05 },     //448
+/*S_NEAL_07*/       { SPR_NEAL, 3, 5, { NULL }, S_NEAL_08 },        //449
+/*S_NEAL_08*/       { SPR_NEAL, 4, 5, { A_Scream }, S_NEAL_09 },        //450
+/*S_NEAL_09*/       { SPR_NEAL, 5, 6, { NULL }, S_NEAL_10 },        //451
+/*S_NEAL_10*/       { SPR_NEAL, 6, 5, { A_Fall }, S_NEAL_11 },      //452
+/*S_NEAL_11*/       { SPR_NEAL, 7, 5, { NULL }, S_NEAL_12 },        //453
+/*S_NEAL_12*/       { SPR_NEAL, 8, 6, { NULL }, S_NEAL_13 },        //454
+/*S_NEAL_13*/       { SPR_NEAL, 9, -1, { NULL }, S_NULL },      //455
+/*S_BEGR_00*/       { SPR_BEGR, 0, 10, { A_Look }, S_BEGR_00 },     //456
+/*S_BEGR_01*/       { SPR_BEGR, 0, 4, { A_RandomWalk }, S_BEGR_02 },        //457
+/*S_BEGR_02*/       { SPR_BEGR, 0, 4, { A_RandomWalk }, S_BEGR_03 },        //458
+/*S_BEGR_03*/       { SPR_BEGR, 1, 4, { A_RandomWalk }, S_BEGR_04 },        //459
+/*S_BEGR_04*/       { SPR_BEGR, 1, 4, { A_RandomWalk }, S_BEGR_05 },        //460
+/*S_BEGR_05*/       { SPR_BEGR, 2, 4, { A_RandomWalk }, S_BEGR_06 },        //461
+/*S_BEGR_06*/       { SPR_BEGR, 2, 4, { A_RandomWalk }, S_BEGR_01 },        //462
+/*S_BEGR_07*/       { SPR_BEGR, 3, 8, { NULL }, S_BEGR_08 },        //463
+/*S_BEGR_08*/       { SPR_BEGR, 4, 8, { A_PeasantPunch }, S_BEGR_09 },      //464
+/*S_BEGR_09*/       { SPR_BEGR, 4, 1, { A_Chase }, S_BEGR_10 },     //465
+/*S_BEGR_10*/       { SPR_BEGR, 3, 8, { A_CheckTargetVisible }, S_BEGR_07 },        //466
+/*S_BEGR_11*/       { SPR_BEGR, 0, 3, { A_Pain }, S_BEGR_12 },      //467
+/*S_BEGR_12*/       { SPR_BEGR, 0, 3, { A_Chase }, S_BEGR_07 },     //468
+/*S_BEGR_13*/       { SPR_BEGR, 5, 4, { NULL }, S_BEGR_14 },        //469
+/*S_BEGR_14*/       { SPR_BEGR, 6, 4, { A_Scream }, S_BEGR_15 },        //470
+/*S_BEGR_15*/       { SPR_BEGR, 7, 4, { NULL }, S_BEGR_16 },        //471
+/*S_BEGR_16*/       { SPR_BEGR, 8, 4, { A_Fall }, S_BEGR_17 },      //472
+/*S_BEGR_17*/       { SPR_BEGR, 9, 4, { NULL }, S_BEGR_18 },        //473
+/*S_BEGR_18*/       { SPR_BEGR, 10, 4, { NULL }, S_BEGR_19 },       //474
+/*S_BEGR_19*/       { SPR_BEGR, 11, 4, { NULL }, S_BEGR_20 },       //475
+/*S_BEGR_20*/       { SPR_BEGR, 12, 4, { NULL }, S_BEGR_21 },       //476
+/*S_BEGR_21*/       { SPR_BEGR, 13, -1, { NULL }, S_NULL },     //477
+/*S_BEGR_22*/       { SPR_BEGR, 5, 5, { A_BodyParts }, S_GIBS_01 },     //478
+/*S_HMN1_00*/       { SPR_HMN1, 15, 5, { A_FriendLook }, S_HMN1_00 },       //479
+/*S_HMN1_01*/       { SPR_HMN1, 16, 8, { NULL }, S_HMN1_00 },       //480
+/*S_HMN1_02*/       { SPR_HMN1, 17, 8, { NULL }, S_HMN1_00 },       //481
+/*S_HMN1_03*/       { SPR_HMN1, 0, 6, { A_RandomWalk }, S_HMN1_04 },        //482
+/*S_HMN1_04*/       { SPR_HMN1, 1, 6, { A_RandomWalk }, S_HMN1_05 },        //483
+/*S_HMN1_05*/       { SPR_HMN1, 2, 6, { A_RandomWalk }, S_HMN1_06 },        //484
+/*S_HMN1_06*/       { SPR_HMN1, 3, 6, { A_RandomWalk }, S_HMN1_07 },        //485
+/*S_HMN1_07*/       { SPR_HMN1, 0, 6, { A_RandomWalk }, S_HMN1_08 },        //486
+/*S_HMN1_08*/       { SPR_HMN1, 1, 6, { A_RandomWalk }, S_HMN1_09 },        //487
+/*S_HMN1_09*/       { SPR_HMN1, 2, 6, { A_RandomWalk }, S_HMN1_10 },        //488
+/*S_HMN1_10*/       { SPR_HMN1, 3, 6, { A_RandomWalk }, S_HMN1_00 },        //489
+/*S_HMN1_11*/       { SPR_HMN1, 0, 3, { A_Chase }, S_HMN1_12 },     //490
+/*S_HMN1_12*/       { SPR_HMN1, 0, 3, { A_Chase }, S_HMN1_13 },     //491
+/*S_HMN1_13*/       { SPR_HMN1, 1, 3, { A_Chase }, S_HMN1_14 },     //492
+/*S_HMN1_14*/       { SPR_HMN1, 1, 3, { A_Chase }, S_HMN1_15 },     //493
+/*S_HMN1_15*/       { SPR_HMN1, 2, 3, { A_Chase }, S_HMN1_16 },     //494
+/*S_HMN1_16*/       { SPR_HMN1, 2, 3, { A_Chase }, S_HMN1_17 },     //495
+/*S_HMN1_17*/       { SPR_HMN1, 3, 3, { A_Chase }, S_HMN1_18 },     //496
+/*S_HMN1_18*/       { SPR_HMN1, 3, 3, { A_Chase }, S_HMN1_11 },     //497
+/*S_HMN1_19*/       { SPR_HMN1, 4, 10, { A_FaceTarget }, S_HMN1_20 },       //498
+/*S_HMN1_20*/       { SPR_HMN1, 32773, 10, { A_BulletAttack }, S_HMN1_21 },     //499
+/*S_HMN1_21*/       { SPR_HMN1, 4, 10, { A_BulletAttack }, S_HMN1_11 },     //500
+/*S_HMN1_22*/       { SPR_HMN1, 14, 3, { NULL }, S_HMN1_23 },       //501
+/*S_HMN1_23*/       { SPR_HMN1, 14, 3, { A_Pain }, S_HMN1_11 },     //502
+/*S_HMN1_24*/       { SPR_HMN1, 6, 5, { NULL }, S_HMN1_25 },        //503
+/*S_HMN1_25*/       { SPR_HMN1, 7, 5, { A_Scream }, S_HMN1_26 },        //504
+/*S_HMN1_26*/       { SPR_HMN1, 8, 3, { A_Fall }, S_HMN1_27 },      //505
+/*S_HMN1_27*/       { SPR_HMN1, 9, 4, { NULL }, S_HMN1_28 },        //506
+/*S_HMN1_28*/       { SPR_HMN1, 10, 3, { NULL }, S_HMN1_29 },       //507
+/*S_HMN1_29*/       { SPR_HMN1, 11, 3, { NULL }, S_HMN1_30 },       //508
+/*S_HMN1_30*/       { SPR_HMN1, 12, 3, { NULL }, S_HMN1_31 },       //509
+/*S_HMN1_31*/       { SPR_HMN1, 13, -1, { NULL }, S_NULL },     //510
+/*S_RGIB_08*/       { SPR_RGIB, 0, 4, { A_BodyParts }, S_RGIB_09 },     //511
+/*S_RGIB_09*/       { SPR_RGIB, 1, 4, { A_XScream }, S_RGIB_10 },       //512
+/*S_RGIB_10*/       { SPR_RGIB, 2, 3, { A_Fall }, S_RGIB_11 },      //513
+/*S_RGIB_11*/       { SPR_RGIB, 3, 3, { A_BodyParts }, S_RGIB_12 },     //514
+/*S_RGIB_12*/       { SPR_RGIB, 4, 3, { A_BodyParts }, S_RGIB_13 },     //515
+/*S_RGIB_13*/       { SPR_RGIB, 5, 3, { A_BodyParts }, S_RGIB_14 },     //516
+/*S_RGIB_14*/       { SPR_RGIB, 6, 3, { NULL }, S_RGIB_15 },        //517
+/*S_RGIB_15*/       { SPR_RGIB, 7, 1400, { NULL }, S_NULL },        //518
+/*S_LEDR_00*/       { SPR_LEDR, 2, 5, { A_FriendLook }, S_LEDR_00 },        //519
+/*S_LEDR_01*/       { SPR_LEDR, 0, 8, { NULL }, S_LEDR_00 },        //520
+/*S_LEDR_02*/       { SPR_LEDR, 1, 8, { NULL }, S_LEDR_00 },        //521
+/*S_LEAD_00*/       { SPR_LEAD, 0, 6, { A_RandomWalk }, S_LEAD_01 },        //522
+/*S_LEAD_01*/       { SPR_LEAD, 1, 6, { A_RandomWalk }, S_LEAD_02 },        //523
+/*S_LEAD_02*/       { SPR_LEAD, 2, 6, { A_RandomWalk }, S_LEAD_03 },        //524
+/*S_LEAD_03*/       { SPR_LEAD, 3, 6, { A_RandomWalk }, S_LEDR_00 },        //525
+/*S_LEAD_04*/       { SPR_LEAD, 0, 3, { A_Chase }, S_LEAD_05 },     //526
+/*S_LEAD_05*/       { SPR_LEAD, 0, 3, { A_Chase }, S_LEAD_06 },     //527
+/*S_LEAD_06*/       { SPR_LEAD, 1, 3, { A_Chase }, S_LEAD_07 },     //528
+/*S_LEAD_07*/       { SPR_LEAD, 1, 3, { A_Chase }, S_LEAD_08 },     //529
+/*S_LEAD_08*/       { SPR_LEAD, 2, 3, { A_Chase }, S_LEAD_09 },     //530
+/*S_LEAD_09*/       { SPR_LEAD, 2, 3, { A_Chase }, S_LEAD_10 },     //531
+/*S_LEAD_10*/       { SPR_LEAD, 3, 3, { A_Chase }, S_LEAD_11 },     //532
+/*S_LEAD_11*/       { SPR_LEAD, 3, 3, { A_Chase }, S_LEAD_04 },     //533
+/*S_LEAD_12*/       { SPR_LEAD, 4, 2, { A_FaceTarget }, S_LEAD_13 },        //534
+/*S_LEAD_13*/       { SPR_LEAD, 32773, 2, { A_BulletAttack }, S_LEAD_14 },      //535
+/*S_LEAD_14*/       { SPR_LEAD, 4, 1, { A_CheckTargetVisible }, S_LEAD_12 },        //536
+/*S_LEAD_15*/       { SPR_LEAD, 24, 3, { NULL }, S_LEAD_16 },       //537
+/*S_LEAD_16*/       { SPR_LEAD, 24, 3, { A_Pain }, S_LEAD_04 },     //538
+/*S_LEAD_17*/       { SPR_LEAD, 4, 4, { A_FaceTarget }, S_LEAD_18 },        //539
+/*S_LEAD_18*/       { SPR_LEAD, 32773, 4, { A_BulletAttack }, S_LEAD_19 },      //540
+/*S_LEAD_19*/       { SPR_LEAD, 4, 2, { A_CheckTargetVisible }, S_LEAD_17 },        //541
+/*S_LEAD_20*/       { SPR_LEAD, 6, 5, { NULL }, S_LEAD_21 },        //542
+/*S_LEAD_21*/       { SPR_LEAD, 7, 5, { A_Scream }, S_LEAD_22 },        //543
+/*S_LEAD_22*/       { SPR_LEAD, 8, 4, { NULL }, S_LEAD_23 },        //544
+/*S_LEAD_23*/       { SPR_LEAD, 9, 4, { NULL }, S_LEAD_24 },        //545
+/*S_LEAD_24*/       { SPR_LEAD, 10, 3, { NULL }, S_LEAD_25 },       //546
+/*S_LEAD_25*/       { SPR_LEAD, 11, 3, { A_Fall }, S_LEAD_26 },     //547
+/*S_LEAD_26*/       { SPR_LEAD, 12, 3, { NULL }, S_LEAD_27 },       //548
+/*S_LEAD_27*/       { SPR_LEAD, 13, 3, { NULL }, S_LEAD_28 },       //549
+/*S_LEAD_28*/       { SPR_LEAD, 14, 3, { NULL }, S_LEAD_29 },       //550
+/*S_LEAD_29*/       { SPR_LEAD, 15, 3, { NULL }, S_LEAD_30 },       //551
+/*S_LEAD_30*/       { SPR_LEAD, 16, 3, { NULL }, S_LEAD_31 },       //552
+/*S_LEAD_31*/       { SPR_LEAD, 17, 3, { NULL }, S_LEAD_32 },       //553
+/*S_LEAD_32*/       { SPR_LEAD, 18, 3, { NULL }, S_LEAD_33 },       //554
+/*S_LEAD_33*/       { SPR_LEAD, 19, 3, { NULL }, S_LEAD_34 },       //555
+/*S_LEAD_34*/       { SPR_LEAD, 20, 3, { NULL }, S_LEAD_35 },       //556
+/*S_LEAD_35*/       { SPR_LEAD, 21, 3, { NULL }, S_LEAD_36 },       //557
+/*S_LEAD_36*/       { SPR_LEAD, 22, 3, { A_SpawnSpectreD }, S_LEAD_37 },        //558
+/*S_LEAD_37*/       { SPR_LEAD, 23, -1, { NULL }, S_NULL },     //559
+/*S_PUFY_04*/       { SPR_PUFY, 1, 4, { NULL }, S_PUFY_05 },        //560
+/*S_PUFY_05*/       { SPR_PUFY, 2, 4, { NULL }, S_PUFY_06 },        //561
+/*S_PUFY_06*/       { SPR_PUFY, 1, 4, { NULL }, S_PUFY_07 },        //562
+/*S_PUFY_07*/       { SPR_PUFY, 2, 4, { NULL }, S_PUFY_08 },        //563
+/*S_PUFY_08*/       { SPR_PUFY, 3, 4, { NULL }, S_NULL },       //564
+/*S_MICR_01*/       { SPR_MICR, 32768, 2, { A_Tracer }, S_MICR_02 },        //565
+/*S_MICR_02*/       { SPR_MICR, 32768, 2, { A_Tracer }, S_MICR_01 },        //566
+/*S_ROB1_00*/       { SPR_ROB1, 0, 10, { A_Look }, S_ROB1_01 },     //567
+/*S_ROB1_01*/       { SPR_ROB1, 0, 10, { A_Look }, S_ROB1_00 },     //568
+/*S_ROB1_02*/       { SPR_ROB1, 1, 3, { A_Chase }, S_ROB1_03 },     //569
+/*S_ROB1_03*/       { SPR_ROB1, 1, 3, { A_Chase }, S_ROB1_04 },     //570
+/*S_ROB1_04*/       { SPR_ROB1, 2, 3, { A_Chase }, S_ROB1_05 },     //571
+/*S_ROB1_05*/       { SPR_ROB1, 2, 3, { A_Chase }, S_ROB1_06 },     //572
+/*S_ROB1_06*/       { SPR_ROB1, 3, 3, { A_Chase }, S_ROB1_07 },     //573
+/*S_ROB1_07*/       { SPR_ROB1, 3, 3, { A_Chase }, S_ROB1_08 },     //574
+/*S_ROB1_08*/       { SPR_ROB1, 4, 3, { A_Chase }, S_ROB1_09 },     //575
+/*S_ROB1_09*/       { SPR_ROB1, 4, 3, { A_Chase }, S_ROB1_02 },     //576
+/*S_ROB1_10*/       { SPR_ROB1, 7, 6, { A_FaceTarget }, S_ROB1_11 },        //577
+/*S_ROB1_11*/       { SPR_ROB1, 8, 8, { A_RobotMelee }, S_ROB1_12 },        //578
+/*S_ROB1_12*/       { SPR_ROB1, 7, 6, { NULL }, S_ROB1_02 },        //579
+/*S_ROB1_13*/       { SPR_ROB1, 5, 8, { A_FaceTarget }, S_ROB1_14 },        //580
+/*S_ROB1_14*/       { SPR_ROB1, 32774, 11, { A_ReaverAttack }, S_ROB1_02 },        //581
+/*S_ROB1_15*/       { SPR_ROB1, 0, 2, { NULL }, S_ROB1_16 },        //582
+/*S_ROB1_16*/       { SPR_ROB1, 0, 2, { A_Pain }, S_ROB1_02 },      //583
+/*S_ROB1_17*/       { SPR_ROB1, 32777, 6, { NULL }, S_ROB1_18 },        //584
+/*S_ROB1_18*/       { SPR_ROB1, 32778, 6, { A_Scream }, S_ROB1_19 },        //585
+/*S_ROB1_19*/       { SPR_ROB1, 32779, 5, { NULL }, S_ROB1_20 },        //586
+/*S_ROB1_20*/       { SPR_ROB1, 32780, 5, { A_Fall }, S_ROB1_21 },      //587
+/*S_ROB1_21*/       { SPR_ROB1, 32781, 5, { NULL }, S_ROB1_22 },        //588
+/*S_ROB1_22*/       { SPR_ROB1, 32782, 5, { NULL }, S_ROB1_23 },        //589
+/*S_ROB1_23*/       { SPR_ROB1, 32783, 5, { NULL }, S_ROB1_24 },        //590
+/*S_ROB1_24*/       { SPR_ROB1, 32784, 6, { A_DeathExplode3 }, S_ROB1_25 },     //591
+/*S_ROB1_25*/       { SPR_ROB1, 17, -1, { NULL }, S_NULL },     //592
+/*S_ROB1_26*/       { SPR_ROB1, 32779, 5, { A_BodyParts }, S_ROB1_27 },     //593
+/*S_ROB1_27*/       { SPR_ROB1, 32780, 5, { A_XScream }, S_ROB1_28 },       //594
+/*S_ROB1_28*/       { SPR_ROB1, 32781, 5, { A_BodyParts }, S_ROB1_29 },     //595
+/*S_ROB1_29*/       { SPR_ROB1, 32782, 5, { A_Fall }, S_ROB1_30 },      //596
+/*S_ROB1_30*/       { SPR_ROB1, 32783, 5, { A_BodyParts }, S_ROB1_31 },     //597
+/*S_ROB1_31*/       { SPR_ROB1, 32784, 5, { A_DeathExplode3 }, S_ROB1_32 },     //598
+/*S_ROB1_32*/       { SPR_ROB1, 17, -1, { NULL }, S_NULL },     //599
+/*S_AGRD_01*/       { SPR_AGRD, 0, 5, { A_FriendLook }, S_AGRD_01 },        //600
+/*S_AGRD_02*/       { SPR_AGRD, 1, 8, { A_ShadowOff }, S_AGRD_01 },     //601
+/*S_AGRD_03*/       { SPR_AGRD, 3, 8, { NULL }, S_AGRD_01 },        //602
+/*S_AGRD_04*/       { SPR_AGRD, 0, 5, { A_RandomWalk }, S_AGRD_05 },        //603
+/*S_AGRD_05*/       { SPR_AGRD, 1, 5, { A_RandomWalk }, S_AGRD_06 },        //604
+/*S_AGRD_06*/       { SPR_AGRD, 2, 5, { A_RandomWalk }, S_AGRD_07 },        //605
+/*S_AGRD_07*/       { SPR_AGRD, 3, 5, { A_RandomWalk }, S_AGRD_08 },        //606
+/*S_AGRD_08*/       { SPR_AGRD, 0, 5, { A_RandomWalk }, S_AGRD_09 },        //607
+/*S_AGRD_09*/       { SPR_AGRD, 1, 5, { A_RandomWalk }, S_AGRD_10 },        //608
+/*S_AGRD_10*/       { SPR_AGRD, 2, 5, { A_RandomWalk }, S_AGRD_11 },        //609
+/*S_AGRD_11*/       { SPR_AGRD, 3, 5, { A_RandomWalk }, S_AGRD_01 },        //610
+/*S_AGRD_12*/       { SPR_AGRD, 0, 6, { A_ModifyVisibility }, S_AGRD_14 },      //611
+/*S_AGRD_13*/       { SPR_AGRD, 0, 6, { A_SetTLOptions }, S_AGRD_14 },      //612
+/*S_AGRD_14*/       { SPR_AGRD, 1, 6, { A_Chase }, S_AGRD_15 },     //613
+/*S_AGRD_15*/       { SPR_AGRD, 2, 6, { A_Chase }, S_AGRD_16 },     //614
+/*S_AGRD_16*/       { SPR_AGRD, 3, 6, { A_Chase }, S_AGRD_13 },     //615
+/*S_AGRD_17*/       { SPR_AGRD, 4, 8, { A_FaceTarget }, S_AGRD_18 },        //616
+/*S_AGRD_18*/       { SPR_AGRD, 5, 4, { A_BulletAttack }, S_AGRD_19 },      //617
+/*S_AGRD_19*/       { SPR_AGRD, 4, 4, { A_BulletAttack }, S_AGRD_20 },      //618
+/*S_AGRD_20*/       { SPR_AGRD, 5, 6, { A_BulletAttack }, S_AGRD_13 },      //619
+/*S_AGRD_21*/       { SPR_AGRD, 14, 0, { A_ShadowOn }, S_AGRD_22 },     //620
+/*S_AGRD_22*/       { SPR_AGRD, 14, 8, { A_Pain }, S_AGRD_12 },     //621
+/*S_AGRD_23*/       { SPR_AGRD, 14, 8, { A_Pain }, S_AGRD_13 },     //622
+/*S_AGRD_24*/       { SPR_AGRD, 6, 4, { NULL }, S_AGRD_25 },        //623
+/*S_AGRD_25*/       { SPR_AGRD, 7, 4, { A_Scream }, S_AGRD_26 },        //624
+/*S_AGRD_26*/       { SPR_AGRD, 8, 4, { NULL }, S_AGRD_27 },        //625
+/*S_AGRD_27*/       { SPR_AGRD, 9, 3, { NULL }, S_AGRD_28 },        //626
+/*S_AGRD_28*/       { SPR_AGRD, 10, 3, { A_Fall }, S_AGRD_29 },     //627
+/*S_AGRD_29*/       { SPR_AGRD, 11, 3, { NULL }, S_AGRD_30 },       //628
+/*S_AGRD_30*/       { SPR_AGRD, 12, 3, { A_AcolyteSpecial }, S_AGRD_31 },       //629
+/*S_AGRD_31*/       { SPR_AGRD, 13, 1400, { NULL }, S_GIBS_20 },        //630
+/*S_GIBS_10*/       { SPR_GIBS, 0, 5, { A_Fall }, S_GIBS_11 },      //631
+/*S_GIBS_11*/       { SPR_GIBS, 1, 5, { A_BodyParts }, S_GIBS_12 },     //632
+/*S_GIBS_12*/       { SPR_GIBS, 2, 5, { A_BodyParts }, S_GIBS_13 },     //633
+/*S_GIBS_13*/       { SPR_GIBS, 3, 4, { A_BodyParts }, S_GIBS_14 },     //634
+/*S_GIBS_14*/       { SPR_GIBS, 4, 4, { A_XScream }, S_GIBS_15 },       //635
+/*S_GIBS_15*/       { SPR_GIBS, 5, 4, { A_BodyParts }, S_GIBS_16 },     //636
+/*S_GIBS_16*/       { SPR_GIBS, 6, 4, { NULL }, S_GIBS_17 },        //637
+/*S_GIBS_17*/       { SPR_GIBS, 7, 4, { NULL }, S_GIBS_18 },        //638
+/*S_GIBS_18*/       { SPR_GIBS, 8, 5, { NULL }, S_GIBS_19 },        //639
+/*S_GIBS_19*/       { SPR_GIBS, 9, 5, { A_AcolyteSpecial }, S_GIBS_20 },        //640
+/*S_GIBS_20*/       { SPR_GIBS, 10, 5, { NULL }, S_GIBS_21 },       //641
+/*S_GIBS_21*/       { SPR_GIBS, 11, 1400, { NULL }, S_NULL },       //642
+/*S_PGRD_00*/       { SPR_PGRD, 0, 5, { A_FriendLook }, S_PGRD_00 },        //643
+/*S_PGRD_01*/       { SPR_PGRD, 1, 10, { NULL }, S_PGRD_00 },       //644
+/*S_PGRD_02*/       { SPR_PGRD, 2, 10, { NULL }, S_PGRD_00 },       //645
+/*S_PGRD_03*/       { SPR_PGRD, 1, 10, { A_RandomWalk }, S_PGRD_00 },       //646
+/*S_PGRD_04*/       { SPR_PGRD, 0, 3, { A_Chase }, S_PGRD_05 },     //647
+/*S_PGRD_05*/       { SPR_PGRD, 0, 3, { A_Chase }, S_PGRD_06 },     //648
+/*S_PGRD_06*/       { SPR_PGRD, 1, 3, { A_Chase }, S_PGRD_07 },     //649
+/*S_PGRD_07*/       { SPR_PGRD, 1, 3, { A_Chase }, S_PGRD_08 },     //650
+/*S_PGRD_08*/       { SPR_PGRD, 2, 3, { A_Chase }, S_PGRD_09 },     //651
+/*S_PGRD_09*/       { SPR_PGRD, 2, 3, { A_Chase }, S_PGRD_10 },     //652
+/*S_PGRD_10*/       { SPR_PGRD, 3, 3, { A_Chase }, S_PGRD_11 },     //653
+/*S_PGRD_11*/       { SPR_PGRD, 3, 3, { A_Chase }, S_PGRD_04 },     //654
+/*S_PGRD_12*/       { SPR_PGRD, 4, 8, { A_FaceTarget }, S_PGRD_13 },        //655
+/*S_PGRD_13*/       { SPR_PGRD, 5, 8, { A_RobotMelee }, S_PGRD_04 },        //656
+/*S_PGRD_14*/       { SPR_PGRD, 32774, 8, { A_FaceTarget }, S_PGRD_15 },        //657
+/*S_PGRD_15*/       { SPR_PGRD, 32775, 8, { A_TemplarMauler }, S_PGRD_04 },     //658
+/*S_PGRD_16*/       { SPR_PGRD, 0, 2, { NULL }, S_PGRD_17 },        //659
+/*S_PGRD_17*/       { SPR_PGRD, 0, 2, { A_Pain }, S_PGRD_04 },      //660
+/*S_PGRD_18*/       { SPR_PGRD, 32776, 4, { A_BodyParts }, S_PGRD_19 },     //661
+/*S_PGRD_19*/       { SPR_PGRD, 32777, 4, { A_Scream }, S_PGRD_20 },        //662
+/*S_PGRD_20*/       { SPR_PGRD, 32778, 4, { A_BodyParts }, S_PGRD_21 },     //663
+/*S_PGRD_21*/       { SPR_PGRD, 32779, 4, { A_Fall }, S_PGRD_22 },      //664
+/*S_PGRD_22*/       { SPR_PGRD, 32780, 4, { NULL }, S_PGRD_23 },        //665
+/*S_PGRD_23*/       { SPR_PGRD, 32781, 4, { NULL }, S_PGRD_24 },        //666
+/*S_PGRD_24*/       { SPR_PGRD, 14, 4, { A_BodyParts }, S_PGRD_25 },        //667
+/*S_PGRD_25*/       { SPR_PGRD, 15, 4, { NULL }, S_PGRD_26 },       //668
+/*S_PGRD_26*/       { SPR_PGRD, 16, 4, { NULL }, S_PGRD_27 },       //669
+/*S_PGRD_27*/       { SPR_PGRD, 17, 4, { NULL }, S_PGRD_28 },       //670
+/*S_PGRD_28*/       { SPR_PGRD, 18, 3, { NULL }, S_PGRD_29 },       //671
+/*S_PGRD_29*/       { SPR_PGRD, 19, 3, { NULL }, S_PGRD_30 },       //672
+/*S_PGRD_30*/       { SPR_PGRD, 20, 3, { NULL }, S_PGRD_31 },       //673
+/*S_PGRD_31*/       { SPR_PGRD, 21, 3, { NULL }, S_PGRD_32 },       //674
+/*S_PGRD_32*/       { SPR_PGRD, 22, 3, { NULL }, S_PGRD_33 },       //675
+/*S_PGRD_33*/       { SPR_PGRD, 23, 3, { NULL }, S_PGRD_34 },       //676
+/*S_PGRD_34*/       { SPR_PGRD, 24, 3, { NULL }, S_PGRD_35 },       //677
+/*S_PGRD_35*/       { SPR_PGRD, 25, 3, { NULL }, S_PGRD_36 },       //678
+/*S_PGRD_36*/       { SPR_PGRD, 26, 3, { NULL }, S_PGRD_37 },       //679
+/*S_PGRD_37*/       { SPR_PGRD, 27, -1, { NULL }, S_NULL },     //680
+/*S_ROB2_00*/       { SPR_ROB2, 16, 10, { A_Look }, S_ROB2_00 },        //681
+/*S_ROB2_01*/       { SPR_ROB2, 0, 3, { A_Chase }, S_ROB2_02 },     //682
+/*S_ROB2_02*/       { SPR_ROB2, 0, 3, { A_Chase }, S_ROB2_03 },     //683
+/*S_ROB2_03*/       { SPR_ROB2, 1, 3, { A_Chase }, S_ROB2_04 },     //684
+/*S_ROB2_04*/       { SPR_ROB2, 1, 3, { A_Chase }, S_ROB2_05 },     //685
+/*S_ROB2_05*/       { SPR_ROB2, 2, 3, { A_Chase }, S_ROB2_06 },     //686
+/*S_ROB2_06*/       { SPR_ROB2, 2, 3, { A_Chase }, S_ROB2_07 },     //687
+/*S_ROB2_07*/       { SPR_ROB2, 3, 3, { A_Chase }, S_ROB2_08 },     //688
+/*S_ROB2_08*/       { SPR_ROB2, 3, 3, { A_Chase }, S_ROB2_01 },     //689
+/*S_ROB2_09*/       { SPR_ROB2, 4, 3, { A_FaceTarget }, S_ROB2_10 },        //690
+/*S_ROB2_10*/       { SPR_ROB2, 32773, 2, { A_CrusaderAttack }, S_ROB2_11 },        //691
+/*S_ROB2_11*/       { SPR_ROB2, 32772, 2, { A_CrusaderLeft }, S_ROB2_12 },      //692
+/*S_ROB2_12*/       { SPR_ROB2, 32773, 3, { A_CrusaderLeft }, S_ROB2_13 },      //693
+/*S_ROB2_13*/       { SPR_ROB2, 32772, 2, { A_CrusaderLeft }, S_ROB2_14 },      //694
+/*S_ROB2_14*/       { SPR_ROB2, 32773, 2, { A_CrusaderLeft }, S_ROB2_15 },      //695
+/*S_ROB2_15*/       { SPR_ROB2, 32772, 2, { A_CrusaderRight }, S_ROB2_16 },     //696
+/*S_ROB2_16*/       { SPR_ROB2, 32773, 2, { A_CrusaderRight }, S_ROB2_17 },     //697
+/*S_ROB2_17*/       { SPR_ROB2, 32772, 2, { A_CrusaderRight }, S_ROB2_18 },     //698
+/*S_ROB2_18*/       { SPR_ROB2, 5, 2, { A_CheckTargetVisible2 }, S_ROB2_09 },       //699
+/*S_ROB2_19*/       { SPR_ROB2, 3, 1, { A_Pain }, S_ROB2_01 },      //700
+/*S_ROB2_20*/       { SPR_ROB2, 6, 3, { A_Scream }, S_ROB2_21 },        //701
+/*S_ROB2_21*/       { SPR_ROB2, 7, 5, { A_BodyParts }, S_ROB2_22 },     //702
+/*S_ROB2_22*/       { SPR_ROB2, 32776, 4, { A_BodyParts }, S_ROB2_23 },     //703
+/*S_ROB2_23*/       { SPR_ROB2, 32777, 4, { A_DeathExplode2 }, S_ROB2_24 },     //704
+/*S_ROB2_24*/       { SPR_ROB2, 32778, 4, { A_Fall }, S_ROB2_25 },      //705
+/*S_ROB2_25*/       { SPR_ROB2, 11, 4, { A_DeathExplode2 }, S_ROB2_26 },        //706
+/*S_ROB2_26*/       { SPR_ROB2, 12, 4, { A_BodyParts }, S_ROB2_27 },        //707
+/*S_ROB2_27*/       { SPR_ROB2, 13, 4, { A_BodyParts }, S_ROB2_28 },        //708
+/*S_ROB2_28*/       { SPR_ROB2, 14, 4, { A_DeathExplode2 }, S_ROB2_29 },        //709
+/*S_ROB2_29*/       { SPR_ROB2, 15, -1, { A_BossDeath }, S_NULL },      //710
+/*S_MLDR_00*/       { SPR_MLDR, 0, 10, { A_Look }, S_MLDR_00 },     //711
+/*S_MLDR_01*/       { SPR_MLDR, 0, 3, { A_Chase }, S_MLDR_02 },     //712
+/*S_MLDR_02*/       { SPR_MLDR, 0, 3, { A_Chase }, S_MLDR_03 },     //713
+/*S_MLDR_03*/       { SPR_MLDR, 1, 3, { A_Chase }, S_MLDR_04 },     //714
+/*S_MLDR_04*/       { SPR_MLDR, 1, 3, { A_Chase }, S_MLDR_05 },     //715
+/*S_MLDR_05*/       { SPR_MLDR, 2, 3, { A_Chase }, S_MLDR_06 },     //716
+/*S_MLDR_06*/       { SPR_MLDR, 2, 3, { A_Chase }, S_MLDR_07 },     //717
+/*S_MLDR_07*/       { SPR_MLDR, 3, 3, { A_Chase }, S_MLDR_08 },     //718
+/*S_MLDR_08*/       { SPR_MLDR, 3, 3, { A_Chase }, S_MLDR_01 },     //719
+/*S_MLDR_09*/       { SPR_MLDR, 4, 3, { A_FaceTarget }, S_MLDR_10 },        //720
+/*S_MLDR_10*/       { SPR_MLDR, 32773, 2, { A_BishopAttack }, S_MLDR_01 },      //721
+/*S_MLDR_11*/       { SPR_MLDR, 3, 1, { A_Pain }, S_MLDR_01 },      //722
+/*S_MLDR_12*/       { SPR_MLDR, 32774, 3, { NULL }, S_MLDR_13 },        //723
+/*S_MLDR_13*/       { SPR_MLDR, 32775, 5, { A_Scream }, S_MLDR_14 },        //724
+/*S_MLDR_14*/       { SPR_MLDR, 32776, 4, { A_BodyParts }, S_MLDR_15 },     //725
+/*S_MLDR_15*/       { SPR_MLDR, 32777, 4, { A_DeathExplode2 }, S_MLDR_16 },     //726
+/*S_MLDR_16*/       { SPR_MLDR, 32778, 4, { NULL }, S_MLDR_17 },        //727
+/*S_MLDR_17*/       { SPR_MLDR, 32779, 4, { NULL }, S_MLDR_18 },        //728
+/*S_MLDR_18*/       { SPR_MLDR, 32780, 4, { A_Fall }, S_MLDR_19 },      //729
+/*S_MLDR_19*/       { SPR_MLDR, 32781, 4, { NULL }, S_MLDR_20 },        //730
+/*S_MLDR_20*/       { SPR_MLDR, 32782, 4, { A_BodyParts }, S_MLDR_21 },     //731
+/*S_MLDR_21*/       { SPR_MLDR, 32783, 4, { NULL }, S_MLDR_22 },        //732
+/*S_MLDR_22*/       { SPR_MLDR, 32784, 4, { A_BodyParts }, S_MLDR_23 },     //733
+/*S_MLDR_23*/       { SPR_MLDR, 32785, 4, { NULL }, S_MLDR_24 },        //734
+/*S_MLDR_24*/       { SPR_MLDR, 32786, 4, { A_BodyParts }, S_MLDR_25 },     //735
+/*S_MLDR_25*/       { SPR_MLDR, 32787, 4, { NULL }, S_MLDR_26 },        //736
+/*S_MLDR_26*/       { SPR_MLDR, 32788, 4, { A_BodyParts }, S_MLDR_27 },     //737
+/*S_MLDR_27*/       { SPR_MLDR, 21, 4, { A_SpawnSpectreB }, S_NULL },       //738
+/*S_ORCL_00*/       { SPR_ORCL, 0, -1, { NULL }, S_NULL },      //739
+/*S_ORCL_01*/       { SPR_ORCL, 1, 5, { NULL }, S_ORCL_02 },        //740
+/*S_ORCL_02*/       { SPR_ORCL, 2, 5, { NULL }, S_ORCL_03 },        //741
+/*S_ORCL_03*/       { SPR_ORCL, 3, 5, { NULL }, S_ORCL_04 },        //742
+/*S_ORCL_04*/       { SPR_ORCL, 4, 5, { NULL }, S_ORCL_05 },        //743
+/*S_ORCL_05*/       { SPR_ORCL, 5, 5, { NULL }, S_ORCL_06 },        //744
+/*S_ORCL_06*/       { SPR_ORCL, 6, 5, { NULL }, S_ORCL_07 },        //745
+/*S_ORCL_07*/       { SPR_ORCL, 7, 5, { NULL }, S_ORCL_08 },        //746
+/*S_ORCL_08*/       { SPR_ORCL, 8, 5, { NULL }, S_ORCL_09 },        //747
+/*S_ORCL_09*/       { SPR_ORCL, 9, 5, { NULL }, S_ORCL_10 },        //748
+/*S_ORCL_10*/       { SPR_ORCL, 10, 5, { NULL }, S_ORCL_11 },       //749
+/*S_ORCL_11*/       { SPR_ORCL, 11, 5, { A_Fall }, S_ORCL_12 },     //750
+/*S_ORCL_12*/       { SPR_ORCL, 12, 5, { NULL }, S_ORCL_13 },       //751
+/*S_ORCL_13*/       { SPR_ORCL, 13, 5, { A_AlertSpectreC }, S_ORCL_14 },        //752
+/*S_ORCL_14*/       { SPR_ORCL, 14, 5, { NULL }, S_ORCL_15 },       //753
+/*S_ORCL_15*/       { SPR_ORCL, 15, 5, { NULL }, S_ORCL_16 },       //754
+/*S_ORCL_16*/       { SPR_ORCL, 16, -1, { NULL }, S_NULL },     //755
+/*S_PRST_00*/       { SPR_PRST, 0, 10, { A_Look }, S_PRST_01 },     //756
+/*S_PRST_01*/       { SPR_PRST, 1, 10, { A_FloatWeave }, S_PRST_00 },       //757
+/*S_PRST_02*/       { SPR_PRST, 0, 4, { A_Chase }, S_PRST_03 },     //758
+/*S_PRST_03*/       { SPR_PRST, 0, 4, { A_FloatWeave }, S_PRST_04 },        //759
+/*S_PRST_04*/       { SPR_PRST, 1, 4, { A_Chase }, S_PRST_05 },     //760
+/*S_PRST_05*/       { SPR_PRST, 1, 4, { A_FloatWeave }, S_PRST_06 },        //761
+/*S_PRST_06*/       { SPR_PRST, 2, 4, { A_Chase }, S_PRST_07 },     //762
+/*S_PRST_07*/       { SPR_PRST, 2, 4, { A_FloatWeave }, S_PRST_08 },        //763
+/*S_PRST_08*/       { SPR_PRST, 3, 4, { A_Chase }, S_PRST_09 },     //764
+/*S_PRST_09*/       { SPR_PRST, 3, 4, { A_FloatWeave }, S_PRST_02 },        //765
+/*S_PRST_10*/       { SPR_PRST, 4, 4, { A_FaceTarget }, S_PRST_11 },        //766
+/*S_PRST_11*/       { SPR_PRST, 5, 4, { A_BossMeleeAtk }, S_PRST_12 },      //767
+/*S_PRST_12*/       { SPR_PRST, 4, 4, { A_FloatWeave }, S_PRST_02 },        //768
+/*S_PRST_13*/       { SPR_PRST, 4, 4, { A_FaceTarget }, S_PRST_14 },        //769
+/*S_PRST_14*/       { SPR_PRST, 5, 4, { A_FireHookShot }, S_PRST_15 },      //770
+/*S_PRST_15*/       { SPR_PRST, 4, 4, { A_FloatWeave }, S_PRST_02 },        //771
+/*S_PDED_00*/       { SPR_PDED, 0, 6, { NULL }, S_PDED_01 },        //772
+/*S_PDED_01*/       { SPR_PDED, 1, 6, { A_Scream }, S_PDED_02 },        //773
+/*S_PDED_02*/       { SPR_PDED, 2, 6, { NULL }, S_PDED_03 },        //774
+/*S_PDED_03*/       { SPR_PDED, 3, 6, { A_Fall }, S_PDED_04 },      //775
+/*S_PDED_04*/       { SPR_PDED, 4, 6, { NULL }, S_PDED_05 },        //776
+/*S_PDED_05*/       { SPR_PDED, 5, 5, { NULL }, S_PDED_06 },        //777
+/*S_PDED_06*/       { SPR_PDED, 6, 5, { NULL }, S_PDED_07 },        //778
+/*S_PDED_07*/       { SPR_PDED, 7, 5, { NULL }, S_PDED_08 },        //779
+/*S_PDED_08*/       { SPR_PDED, 8, 5, { NULL }, S_PDED_09 },        //780
+/*S_PDED_09*/       { SPR_PDED, 9, 5, { NULL }, S_PDED_10 },        //781
+/*S_PDED_10*/       { SPR_PDED, 8, 5, { NULL }, S_PDED_11 },        //782
+/*S_PDED_11*/       { SPR_PDED, 9, 5, { NULL }, S_PDED_12 },        //783
+/*S_PDED_12*/       { SPR_PDED, 8, 5, { NULL }, S_PDED_14 },        //784
+/*S_PDED_13*/       { SPR_PDED, 9, 5, { NULL }, S_PDED_14 },        //785
+/*S_PDED_14*/       { SPR_PDED, 10, 5, { NULL }, S_PDED_15 },       //786
+/*S_PDED_15*/       { SPR_PDED, 11, 5, { NULL }, S_PDED_16 },       //787
+/*S_PDED_16*/       { SPR_PDED, 12, 4, { NULL }, S_PDED_17 },       //788
+/*S_PDED_17*/       { SPR_PDED, 13, 4, { NULL }, S_PDED_18 },       //789
+/*S_PDED_18*/       { SPR_PDED, 14, 4, { NULL }, S_PDED_19 },       //790
+/*S_PDED_19*/       { SPR_PDED, 15, 4, { NULL }, S_PDED_20 },       //791
+/*S_PDED_20*/       { SPR_PDED, 16, 4, { A_SpawnSpectreE }, S_PDED_21 },        //792
+/*S_PDED_21*/       { SPR_PDED, 17, 4, { NULL }, S_PDED_22 },       //793
+/*S_PDED_22*/       { SPR_PDED, 18, 4, { NULL }, S_PDED_23 },       //794
+/*S_PDED_23*/       { SPR_PDED, 19, -1, { NULL }, S_NULL },     //795
+/*S_ALN1_00*/       { SPR_ALN1, 0, 10, { A_Look }, S_ALN1_01 },     //796
+/*S_ALN1_01*/       { SPR_ALN1, 1, 10, { A_FloatWeave }, S_ALN1_00 },       //797
+/*S_ALN1_02*/       { SPR_ALN1, 32768, 4, { A_Chase }, S_ALN1_03 },     //798
+/*S_ALN1_03*/       { SPR_ALN1, 32769, 4, { A_Chase }, S_ALN1_04 },     //799
+/*S_ALN1_04*/       { SPR_ALN1, 32770, 4, { A_FloatWeave }, S_ALN1_05 },        //800
+/*S_ALN1_05*/       { SPR_ALN1, 32771, 4, { A_Chase }, S_ALN1_06 },     //801
+/*S_ALN1_06*/       { SPR_ALN1, 32772, 4, { A_Chase }, S_ALN1_07 },     //802
+/*S_ALN1_07*/       { SPR_ALN1, 32773, 4, { A_Chase }, S_ALN1_08 },     //803
+/*S_ALN1_08*/       { SPR_ALN1, 32774, 4, { A_FloatWeave }, S_ALN1_09 },        //804
+/*S_ALN1_09*/       { SPR_ALN1, 32775, 4, { A_Chase }, S_ALN1_10 },     //805
+/*S_ALN1_10*/       { SPR_ALN1, 32776, 4, { A_Chase }, S_ALN1_11 },     //806
+/*S_ALN1_11*/       { SPR_ALN1, 32777, 4, { A_Chase }, S_ALN1_12 },     //807
+/*S_ALN1_12*/       { SPR_ALN1, 32778, 4, { A_FloatWeave }, S_ALN1_02 },        //808
+/*S_ALN1_13*/       { SPR_ALN1, 32777, 4, { A_FaceTarget }, S_ALN1_14 },        //809
+/*S_ALN1_14*/       { SPR_ALN1, 32776, 4, { A_BossMeleeAtk }, S_ALN1_15 },      //810
+/*S_ALN1_15*/       { SPR_ALN1, 32775, 4, { NULL }, S_ALN1_04 },        //811
+/*S_ALN1_16*/       { SPR_ALN1, 32777, 4, { A_FaceTarget }, S_ALN1_17 },        //812
+/*S_ALN1_17*/       { SPR_ALN1, 32776, 4, { A_ProgrammerAttack }, S_ALN1_18 },      //813
+/*S_ALN1_18*/       { SPR_ALN1, 32775, 4, { NULL }, S_ALN1_12 },        //814
+/*S_ALN1_19*/       { SPR_ALN1, 9, 2, { A_Pain }, S_ALN1_08 },      //815
+/*S_AL1P_00*/       { SPR_AL1P, 32768, 6, { A_NodeChunk }, S_AL1P_01 },     //816
+/*S_AL1P_01*/       { SPR_AL1P, 32769, 6, { A_Scream }, S_AL1P_02 },        //817
+/*S_AL1P_02*/       { SPR_AL1P, 32770, 6, { A_NodeChunk }, S_AL1P_03 },     //818
+/*S_AL1P_03*/       { SPR_AL1P, 32771, 6, { NULL }, S_AL1P_04 },        //819
+/*S_AL1P_04*/       { SPR_AL1P, 32772, 6, { NULL }, S_AL1P_05 },        //820
+/*S_AL1P_05*/       { SPR_AL1P, 32773, 6, { A_NodeChunk }, S_AL1P_06 },     //821
+/*S_AL1P_06*/       { SPR_AL1P, 32774, 6, { NULL }, S_AL1P_07 },        //822
+/*S_AL1P_07*/       { SPR_AL1P, 32775, 6, { A_NodeChunk }, S_AL1P_08 },     //823
+/*S_AL1P_08*/       { SPR_AL1P, 32776, 6, { NULL }, S_AL1P_09 },        //824
+/*S_AL1P_09*/       { SPR_AL1P, 32777, 6, { NULL }, S_AL1P_10 },        //825
+/*S_AL1P_10*/       { SPR_AL1P, 32778, 6, { NULL }, S_AL1P_11 },        //826
+/*S_AL1P_11*/       { SPR_AL1P, 32779, 5, { NULL }, S_AL1P_12 },        //827
+/*S_AL1P_12*/       { SPR_AL1P, 32780, 5, { NULL }, S_AL1P_13 },        //828
+/*S_AL1P_13*/       { SPR_AL1P, 32781, 5, { A_HeadChunk }, S_AL1P_14 },     //829
+/*S_AL1P_14*/       { SPR_AL1P, 32782, 5, { NULL }, S_AL1P_15 },        //830
+/*S_AL1P_15*/       { SPR_AL1P, 32783, 5, { NULL }, S_AL1P_16 },        //831
+/*S_AL1P_16*/       { SPR_AL1P, 32784, 5, { NULL }, S_AL1P_17 },        //832
+/*S_AL1P_17*/       { SPR_AL1P, 32785, 5, { A_BossDeath }, S_NULL },        //833
+/*S_NODE_00*/       { SPR_NODE, 32768, 6, { NULL }, S_NODE_01 },        //834
+/*S_NODE_01*/       { SPR_NODE, 32769, 6, { NULL }, S_NODE_02 },        //835
+/*S_NODE_02*/       { SPR_NODE, 32770, 6, { NULL }, S_NODE_03 },        //836
+/*S_NODE_03*/       { SPR_NODE, 32771, 6, { NULL }, S_NODE_04 },        //837
+/*S_NODE_04*/       { SPR_NODE, 32772, 6, { NULL }, S_NODE_05 },        //838
+/*S_NODE_05*/       { SPR_NODE, 32773, 6, { NULL }, S_NODE_06 },        //839
+/*S_NODE_06*/       { SPR_NODE, 32774, 6, { NULL }, S_NULL },       //840
+/*S_MTHD_00*/       { SPR_MTHD, 32768, 5, { NULL }, S_MTHD_01 },        //841
+/*S_MTHD_01*/       { SPR_MTHD, 32769, 5, { NULL }, S_MTHD_02 },        //842
+/*S_MTHD_02*/       { SPR_MTHD, 32770, 5, { NULL }, S_MTHD_03 },        //843
+/*S_MTHD_03*/       { SPR_MTHD, 32771, 5, { NULL }, S_MTHD_04 },        //844
+/*S_MTHD_04*/       { SPR_MTHD, 32772, 5, { NULL }, S_MTHD_05 },        //845
+/*S_MTHD_05*/       { SPR_MTHD, 32773, 5, { NULL }, S_MTHD_06 },        //846
+/*S_MTHD_06*/       { SPR_MTHD, 32774, 5, { NULL }, S_MTHD_07 },        //847
+/*S_MTHD_07*/       { SPR_MTHD, 32775, 5, { NULL }, S_MTHD_08 },        //848
+/*S_MTHD_08*/       { SPR_MTHD, 32776, 5, { NULL }, S_MTHD_09 },        //849
+/*S_MTHD_09*/       { SPR_MTHD, 32777, 5, { NULL }, S_MTHD_10 },        //850
+/*S_MTHD_10*/       { SPR_MTHD, 32778, 5, { NULL }, S_NULL },       //851
+/*S_ALN1_20*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_21 },        //852
+/*S_ALN1_21*/       { SPR_ALN1, 8, 4, { A_FireSigilEOffshoot }, S_ALN1_22 },        //853
+/*S_ALN1_22*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_12 },        //854
+/*S_ALN1_23*/       { SPR_ALN1, 0, 5, { A_FloatWeave }, S_ALN1_24 },        //855
+/*S_ALN1_24*/       { SPR_ALN1, 1, 5, { A_FloatWeave }, S_ALN1_25 },        //856
+/*S_ALN1_25*/       { SPR_ALN1, 2, 5, { A_FloatWeave }, S_ALN1_26 },        //857
+/*S_ALN1_26*/       { SPR_ALN1, 3, 5, { A_FloatWeave }, S_ALN1_27 },        //858
+/*S_ALN1_27*/       { SPR_ALN1, 4, 5, { A_FloatWeave }, S_ALN1_28 },        //859
+/*S_ALN1_28*/       { SPR_ALN1, 5, 5, { A_FloatWeave }, S_ALN1_29 },        //860
+/*S_ALN1_29*/       { SPR_ALN1, 6, 5, { A_FloatWeave }, S_ALN1_30 },        //861
+/*S_ALN1_30*/       { SPR_ALN1, 7, 5, { A_FloatWeave }, S_ALN1_31 },        //862
+/*S_ALN1_31*/       { SPR_ALN1, 8, 5, { A_FloatWeave }, S_ALN1_32 },        //863
+/*S_ALN1_32*/       { SPR_ALN1, 9, 5, { A_FloatWeave }, S_ALN1_33 },        //864
+/*S_ALN1_33*/       { SPR_ALN1, 10, 5, { A_FloatWeave }, S_ALN1_23 },       //865
+/*S_ALN1_34*/       { SPR_ALN1, 0, 5, { A_Chase }, S_ALN1_35 },     //866
+/*S_ALN1_35*/       { SPR_ALN1, 1, 5, { A_Chase }, S_ALN1_36 },     //867
+/*S_ALN1_36*/       { SPR_ALN1, 2, 5, { A_FloatWeave }, S_ALN1_37 },        //868
+/*S_ALN1_37*/       { SPR_ALN1, 3, 5, { A_Chase }, S_ALN1_38 },     //869
+/*S_ALN1_38*/       { SPR_ALN1, 4, 5, { A_Chase }, S_ALN1_39 },     //870
+/*S_ALN1_39*/       { SPR_ALN1, 5, 5, { A_Chase }, S_ALN1_40 },     //871
+/*S_ALN1_40*/       { SPR_ALN1, 6, 5, { A_FloatWeave }, S_ALN1_41 },        //872
+/*S_ALN1_41*/       { SPR_ALN1, 7, 5, { A_Chase }, S_ALN1_42 },     //873
+/*S_ALN1_42*/       { SPR_ALN1, 8, 5, { A_Chase }, S_ALN1_43 },     //874
+/*S_ALN1_43*/       { SPR_ALN1, 9, 5, { A_Chase }, S_ALN1_44 },     //875
+/*S_ALN1_44*/       { SPR_ALN1, 10, 5, { A_FloatWeave }, S_ALN1_34 },       //876
+/*S_ALN1_45*/       { SPR_ALN1, 9, 4, { A_FaceTarget }, S_ALN1_46 },        //877
+/*S_ALN1_46*/       { SPR_ALN1, 8, 4, { A_BossMeleeAtk }, S_ALN1_47 },      //878
+/*S_ALN1_47*/       { SPR_ALN1, 2, 4, { NULL }, S_ALN1_36 },        //879
+/*S_ALN1_48*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_49 },        //880
+/*S_ALN1_49*/       { SPR_ALN1, 8, 4, { A_SpectreCAttack }, S_ALN1_50 },        //881
+/*S_ALN1_50*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_44 },        //882
+/*S_ALN1_51*/       { SPR_ALN1, 9, 2, { A_Pain }, S_ALN1_40 },      //883
+/*S_ALN1_52*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_53 },        //884
+/*S_ALN1_53*/       { SPR_ALN1, 8, 4, { A_SpectreDAttack }, S_ALN1_54 },        //885
+/*S_ALN1_54*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_12 },        //886
+/*S_ALN1_55*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_56 },        //887
+/*S_ALN1_56*/       { SPR_ALN1, 8, 4, { A_SpectreEAttack }, S_ALN1_57 },        //888
+/*S_ALN1_57*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_12 },        //889
+/*S_MNAM_00*/       { SPR_MNAM, 0, 100, { A_FloatWeave }, S_MNAM_01 },      //890
+/*S_MNAM_01*/       { SPR_MNAM, 32769, 60, { A_FloatWeave }, S_MNAM_02 },       //891
+/*S_MNAM_02*/       { SPR_MNAM, 32770, 4, { A_FloatWeave }, S_MNAM_03 },        //892
+/*S_MNAM_03*/       { SPR_MNAM, 32771, 4, { A_FloatWeave }, S_MNAM_04 },        //893
+/*S_MNAM_04*/       { SPR_MNAM, 32772, 4, { A_FloatWeave }, S_MNAM_05 },        //894
+/*S_MNAM_05*/       { SPR_MNAM, 32773, 4, { A_FloatWeave }, S_MNAM_06 },        //895
+/*S_MNAM_06*/       { SPR_MNAM, 32774, 4, { A_FloatWeave }, S_MNAM_07 },        //896
+/*S_MNAM_07*/       { SPR_MNAM, 32775, 4, { A_FloatWeave }, S_MNAM_08 },        //897
+/*S_MNAM_08*/       { SPR_MNAM, 32776, 4, { A_FloatWeave }, S_MNAM_09 },        //898
+/*S_MNAM_09*/       { SPR_MNAM, 32777, 4, { A_FloatWeave }, S_MNAM_10 },        //899
+/*S_MNAM_10*/       { SPR_MNAM, 32778, 4, { A_FloatWeave }, S_MNAM_11 },        //900
+/*S_MNAM_11*/       { SPR_MNAM, 32779, 4, { A_FloatWeave }, S_MNAL_00 },        //901
+/*S_MNAL_00*/       { SPR_MNAL, 32768, 4, { A_Look }, S_MNAL_01 },      //902
+/*S_MNAL_01*/       { SPR_MNAL, 32769, 4, { A_FloatWeave }, S_MNAL_00 },        //903
+/*S_MNAL_02*/       { SPR_MNAL, 32768, 4, { A_Chase }, S_MNAL_03 },     //904
+/*S_MNAL_03*/       { SPR_MNAL, 32769, 4, { A_Chase }, S_MNAL_04 },     //905
+/*S_MNAL_04*/       { SPR_MNAL, 32770, 4, { A_FloatWeave }, S_MNAL_05 },        //906
+/*S_MNAL_05*/       { SPR_MNAL, 32771, 4, { A_Chase }, S_MNAL_06 },     //907
+/*S_MNAL_06*/       { SPR_MNAL, 32772, 4, { A_Chase }, S_MNAL_07 },     //908
+/*S_MNAL_07*/       { SPR_MNAL, 32773, 4, { A_Chase }, S_MNAL_08 },     //909
+/*S_MNAL_08*/       { SPR_MNAL, 32774, 4, { A_FloatWeave }, S_MNAL_09 },        //910
+/*S_MNAL_09*/       { SPR_MNAL, 32775, 4, { A_Chase }, S_MNAL_10 },     //911
+/*S_MNAL_10*/       { SPR_MNAL, 32776, 4, { A_Chase }, S_MNAL_11 },     //912
+/*S_MNAL_11*/       { SPR_MNAL, 32777, 4, { A_Chase }, S_MNAL_12 },     //913
+/*S_MNAL_12*/       { SPR_MNAL, 32778, 4, { A_FloatWeave }, S_MNAL_02 },        //914
+/*S_MNAL_13*/       { SPR_MNAL, 32777, 4, { A_FaceTarget }, S_MNAL_14 },        //915
+/*S_MNAL_14*/       { SPR_MNAL, 32776, 4, { A_BossMeleeAtk }, S_MNAL_15 },      //916
+/*S_MNAL_15*/       { SPR_MNAL, 32770, 4, { NULL }, S_MNAL_04 },        //917
+/*S_MNAL_16*/       { SPR_MNAL, 32773, 4, { A_FaceTarget }, S_MNAL_17 },        //918
+/*S_MNAL_17*/       { SPR_MNAL, 32776, 4, { A_FireSigilWeapon }, S_MNAL_18 },       //919
+/*S_MNAL_18*/       { SPR_MNAL, 32772, 4, { NULL }, S_MNAL_12 },        //920
+/*S_MNAL_19*/       { SPR_MNAL, 32777, 2, { A_Pain }, S_MNAL_08 },      //921
+/*S_MNAL_20*/       { SPR_MNAL, 32779, 7, { A_NodeChunk }, S_MNAL_21 },     //922
+/*S_MNAL_21*/       { SPR_MNAL, 32780, 7, { A_Scream }, S_MNAL_22 },        //923
+/*S_MNAL_22*/       { SPR_MNAL, 32781, 7, { A_NodeChunk }, S_MNAL_23 },     //924
+/*S_MNAL_23*/       { SPR_MNAL, 32782, 7, { A_NodeChunk }, S_MNAL_24 },     //925
+/*S_MNAL_24*/       { SPR_MNAL, 32783, 7, { A_HeadChunk }, S_MNAL_25 },     //926
+/*S_MNAL_25*/       { SPR_MNAL, 32784, 64, { A_NodeChunk }, S_MNAL_26 },        //927
+/*S_MNAL_26*/       { SPR_MNAL, 32784, 6, { A_EntityDeath }, S_NULL },      //928
+/*S_MNAL_27*/       { SPR_MNAL, 32785, 10, { A_Look }, S_MNAL_27 },     //929
+/*S_MNAL_28*/       { SPR_MNAL, 32785, 5, { A_FloatWeave }, S_MNAL_29 },        //930
+/*S_MNAL_29*/       { SPR_MNAL, 32786, 5, { A_Chase }, S_MNAL_30 },     //931
+/*S_MNAL_30*/       { SPR_MNAL, 32787, 5, { A_Chase }, S_MNAL_31 },     //932
+/*S_MNAL_31*/       { SPR_MNAL, 32788, 5, { A_FloatWeave }, S_MNAL_32 },        //933
+/*S_MNAL_32*/       { SPR_MNAL, 32789, 5, { A_Chase }, S_MNAL_33 },     //934
+/*S_MNAL_33*/       { SPR_MNAL, 32790, 5, { A_FloatWeave }, S_MNAL_28 },        //935
+/*S_MNAL_34*/       { SPR_MNAL, 32786, 4, { A_FaceTarget }, S_MNAL_35 },        //936
+/*S_MNAL_35*/       { SPR_MNAL, 32785, 4, { A_BossMeleeAtk }, S_MNAL_36 },      //937
+/*S_MNAL_36*/       { SPR_MNAL, 32787, 4, { A_FloatWeave }, S_MNAL_29 },        //938
+/*S_MNAL_37*/       { SPR_MNAL, 32790, 4, { A_FaceTarget }, S_MNAL_38 },        //939
+/*S_MNAL_38*/       { SPR_MNAL, 32788, 4, { A_FireSigilEOffshoot }, S_MNAL_39 },        //940
+/*S_MNAL_39*/       { SPR_MNAL, 32789, 4, { A_FloatWeave }, S_MNAL_32 },        //941
+/*S_MNAL_40*/       { SPR_MNAL, 32785, 2, { A_Pain }, S_MNAL_28 },      //942
+/*S_MDTH_00*/       { SPR_MDTH, 32768, 3, { A_Scream }, S_MDTH_01 },        //943
+/*S_MDTH_01*/       { SPR_MDTH, 32769, 3, { A_BodyParts }, S_MDTH_02 },     //944
+/*S_MDTH_02*/       { SPR_MDTH, 32770, 3, { A_Fall }, S_MDTH_03 },      //945
+/*S_MDTH_03*/       { SPR_MDTH, 32771, 3, { A_BodyParts }, S_MDTH_04 },     //946
+/*S_MDTH_04*/       { SPR_MDTH, 32772, 3, { A_BodyParts }, S_MDTH_05 },     //947
+/*S_MDTH_05*/       { SPR_MDTH, 32773, 3, { A_BodyParts }, S_MDTH_06 },     //948
+/*S_MDTH_06*/       { SPR_MDTH, 32774, 3, { A_BodyParts }, S_MDTH_07 },     //949
+/*S_MDTH_07*/       { SPR_MDTH, 32775, 3, { A_BodyParts }, S_MDTH_08 },     //950
+/*S_MDTH_08*/       { SPR_MDTH, 32776, 3, { A_BodyParts }, S_MDTH_09 },     //951
+/*S_MDTH_09*/       { SPR_MDTH, 32777, 3, { A_BodyParts }, S_MDTH_10 },     //952
+/*S_MDTH_10*/       { SPR_MDTH, 32778, 3, { A_BodyParts }, S_MDTH_11 },     //953
+/*S_MDTH_11*/       { SPR_MDTH, 32779, 3, { A_BodyParts }, S_MDTH_12 },     //954
+/*S_MDTH_12*/       { SPR_MDTH, 32780, 3, { A_BodyParts }, S_MDTH_13 },     //955
+/*S_MDTH_13*/       { SPR_MDTH, 32781, 3, { A_BodyParts }, S_MDTH_14 },     //956
+/*S_MDTH_14*/       { SPR_MDTH, 32782, 3, { A_BossDeath }, S_NULL },        //957
+/*S_NEST_00*/       { SPR_NEST, 0, -1, { NULL }, S_NULL },      //958
+/*S_PODD_00*/       { SPR_PODD, 0, 60, { A_Look }, S_PODD_00 },     //959
+/*S_PODD_01*/       { SPR_PODD, 0, 360, { NULL }, S_PODD_02 },      //960
+/*S_PODD_02*/       { SPR_PODD, 1, 9, { A_Fall }, S_PODD_03 },      //961
+/*S_PODD_03*/       { SPR_PODD, 2, 9, { NULL }, S_PODD_04 },        //962
+/*S_PODD_04*/       { SPR_PODD, 3, 9, { A_SpawnEntity }, S_PODD_05 },       //963
+/*S_PODD_05*/       { SPR_PODD, 4, -1, { NULL }, S_NULL },      //964
+/*S_ZAP6_00*/       { SPR_ZAP6, 32768, 4, { NULL }, S_ZAP6_01 },        //965
+/*S_ZAP6_01*/       { SPR_ZAP6, 32769, 4, { A_SigilTrail }, S_ZAP6_02 },        //966
+/*S_ZAP6_02*/       { SPR_ZAP6, 32770, 4, { A_SigilTrail }, S_ZAP6_00 },        //967
+/*S_ZOT3_00*/       { SPR_ZOT3, 32768, 4, { NULL }, S_ZOT3_01 },        //968
+/*S_ZOT3_01*/       { SPR_ZOT3, 32769, 4, { NULL }, S_ZOT3_02 },        //969
+/*S_ZOT3_02*/       { SPR_ZOT3, 32770, 4, { NULL }, S_ZOT3_03 },        //970
+/*S_ZOT3_03*/       { SPR_ZOT3, 32771, 4, { NULL }, S_ZOT3_04 },        //971
+/*S_ZOT3_04*/       { SPR_ZOT3, 32772, 4, { NULL }, S_ZOT3_00 },        //972
+/*S_ZAP6_03*/       { SPR_ZAP6, 32768, 5, { NULL }, S_ZAP6_04 },        //973
+/*S_ZAP6_04*/       { SPR_ZAP6, 32769, 5, { NULL }, S_ZAP6_05 },        //974
+/*S_ZAP6_05*/       { SPR_ZAP6, 32770, 5, { NULL }, S_NULL },       //975
+/*S_ZAP7_00*/       { SPR_ZAP7, 32768, 4, { A_Sigil_E_Action }, S_ZAP7_01 },        //976
+/*S_ZAP7_01*/       { SPR_ZAP7, 32769, 4, { A_Sigil_E_Action }, S_ZAP7_02 },        //977
+/*S_ZAP7_02*/       { SPR_ZAP7, 32770, 6, { A_Sigil_E_Action }, S_ZAP7_03 },        //978
+/*S_ZAP7_03*/       { SPR_ZAP7, 32771, 6, { A_Sigil_E_Action }, S_ZAP7_04 },        //979
+/*S_ZAP7_04*/       { SPR_ZAP7, 32772, 6, { A_Sigil_E_Action }, S_ZAP7_00 },        //980
+/*S_ZOT1_00*/       { SPR_ZOT1, 32768, 4, { NULL }, S_ZOT1_01 },        //981
+/*S_ZOT1_01*/       { SPR_ZOT1, 32769, 4, { NULL }, S_ZOT1_02 },        //982
+/*S_ZOT1_02*/       { SPR_ZOT1, 32770, 6, { NULL }, S_ZOT1_03 },        //983
+/*S_ZOT1_03*/       { SPR_ZOT1, 32771, 6, { NULL }, S_ZOT1_04 },        //984
+/*S_ZOT1_04*/       { SPR_ZOT1, 32771, 6, { NULL }, S_ZOT1_00 },        //985
+/*S_ZAP5_00*/       { SPR_ZAP5, 32768, 4, { A_MissileTick }, S_ZAP5_01 },       //986
+/*S_ZAP5_01*/       { SPR_ZAP5, 32769, 4, { A_Sigil_A_Action }, S_ZAP5_02 },        //987
+/*S_ZAP5_02*/       { SPR_ZAP5, 32770, 4, { A_MissileTick }, S_ZAP5_03 },       //988
+/*S_ZAP5_03*/       { SPR_ZAP5, 32771, 4, { A_MissileTick }, S_ZAP5_00 },       //989
+/*S_ZOT2_00*/       { SPR_ZOT2, 32768, 4, { A_Tracer }, S_ZOT2_01 },        //990
+/*S_ZOT2_01*/       { SPR_ZOT2, 32769, 4, { A_Tracer }, S_ZOT2_02 },        //991
+/*S_ZOT2_02*/       { SPR_ZOT2, 32770, 6, { A_Tracer }, S_ZOT2_03 },        //992
+/*S_ZOT2_03*/       { SPR_ZOT2, 32771, 6, { A_Tracer }, S_ZOT2_04 },        //993
+/*S_ZOT2_04*/       { SPR_ZOT2, 32772, 5, { A_Tracer }, S_ZOT2_00 },        //994
+/*S_SEWR_00*/       { SPR_SEWR, 0, 10, { A_Look }, S_SEWR_00 },     //995
+/*S_SEWR_01*/       { SPR_SEWR, 0, 6, { A_FloatWeave }, S_SEWR_02 },        //996
+/*S_SEWR_02*/       { SPR_SEWR, 0, 6, { A_Chase }, S_SEWR_01 },     //997
+/*S_SEWR_03*/       { SPR_SEWR, 1, 4, { A_FaceTarget }, S_SEWR_04 },        //998
+/*S_SEWR_04*/       { SPR_SEWR, 32770, 8, { A_SentinelAttack }, S_SEWR_05 },        //999
+/*S_SEWR_05*/       { SPR_SEWR, 32770, 4, { A_CheckTargetVisible }, S_SEWR_04 },        //1000
+/*S_SEWR_06*/       { SPR_SEWR, 3, 5, { A_Pain }, S_SEWR_05 },      //1001
+/*S_SEWR_07*/       { SPR_SEWR, 3, 7, { A_Fall }, S_SEWR_08 },      //1002
+/*S_SEWR_08*/       { SPR_SEWR, 32772, 8, { A_BodyParts }, S_SEWR_09 },     //1003
+/*S_SEWR_09*/       { SPR_SEWR, 32773, 5, { A_Scream }, S_SEWR_10 },        //1004
+/*S_SEWR_10*/       { SPR_SEWR, 32774, 4, { A_BodyParts }, S_SEWR_11 },     //1005
+/*S_SEWR_11*/       { SPR_SEWR, 32775, 4, { A_BodyParts }, S_SEWR_12 },     //1006
+/*S_SEWR_12*/       { SPR_SEWR, 8, 4, { NULL }, S_SEWR_13 },        //1007
+/*S_SEWR_13*/       { SPR_SEWR, 9, 5, { NULL }, S_NULL },       //1008
+/*S_SPID_00*/       { SPR_SPID, 0, 1, { A_StalkerSetLook }, S_SPID_00 },        //1009
+/*S_SPID_01*/       { SPR_SPID, 0, 10, { A_Look }, S_SPID_01 },     //1010
+/*S_SPID_02*/       { SPR_SPID, 9, 10, { A_Look }, S_SPID_02 },     //1011
+/*S_SPID_03*/       { SPR_SPID, 0, 1, { A_StalkerThink }, S_SPID_04 },      //1012
+/*S_SPID_04*/       { SPR_SPID, 0, 3, { A_Chase }, S_SPID_05 },     //1013
+/*S_SPID_05*/       { SPR_SPID, 1, 3, { A_Chase }, S_SPID_06 },     //1014
+/*S_SPID_06*/       { SPR_SPID, 1, 3, { A_Chase }, S_SPID_07 },     //1015
+/*S_SPID_07*/       { SPR_SPID, 2, 3, { A_StalkerChase }, S_SPID_08 },      //1016
+/*S_SPID_08*/       { SPR_SPID, 2, 3, { A_Chase }, S_SPID_03 },     //1017
+/*S_SPID_09*/       { SPR_SPID, 9, 3, { A_FaceTarget }, S_SPID_10 },        //1018
+/*S_SPID_10*/       { SPR_SPID, 10, 3, { A_StalkerScratch }, S_SPID_18 },       //1019
+/*S_SPID_11*/       { SPR_SPID, 2, 2, { A_StalkerDrop }, S_SPID_12 },       //1020
+/*S_SPID_12*/       { SPR_SPID, 8, 3, { NULL }, S_SPID_13 },        //1021
+/*S_SPID_13*/       { SPR_SPID, 7, 3, { NULL }, S_SPID_14 },        //1022
+/*S_SPID_14*/       { SPR_SPID, 6, 3, { NULL }, S_SPID_15 },        //1023
+/*S_SPID_15*/       { SPR_SPID, 5, 3, { NULL }, S_SPID_16 },        //1024
+/*S_SPID_16*/       { SPR_SPID, 4, 3, { NULL }, S_SPID_17 },        //1025
+/*S_SPID_17*/       { SPR_SPID, 3, 3, { NULL }, S_SPID_09 },        //1026
+/*S_SPID_18*/       { SPR_SPID, 9, 3, { A_StalkerChase }, S_SPID_19 },      //1027
+/*S_SPID_19*/       { SPR_SPID, 9, 3, { A_Chase }, S_SPID_20 },     //1028
+/*S_SPID_20*/       { SPR_SPID, 10, 3, { A_Chase }, S_SPID_21 },        //1029
+/*S_SPID_21*/       { SPR_SPID, 10, 3, { A_Chase }, S_SPID_22 },        //1030
+/*S_SPID_22*/       { SPR_SPID, 11, 3, { A_StalkerChase }, S_SPID_23 },     //1031
+/*S_SPID_23*/       { SPR_SPID, 11, 3, { A_Chase }, S_SPID_18 },        //1032
+/*S_SPID_24*/       { SPR_SPID, 11, 1, { A_Pain }, S_SPID_03 },     //1033
+/*S_SPID_25*/       { SPR_SPID, 14, 4, { NULL }, S_SPID_26 },       //1034
+/*S_SPID_26*/       { SPR_SPID, 15, 4, { A_Scream }, S_SPID_27 },       //1035
+/*S_SPID_27*/       { SPR_SPID, 16, 4, { NULL }, S_SPID_28 },       //1036
+/*S_SPID_28*/       { SPR_SPID, 17, 4, { NULL }, S_SPID_29 },       //1037
+/*S_SPID_29*/       { SPR_SPID, 18, 4, { NULL }, S_SPID_30 },       //1038
+/*S_SPID_30*/       { SPR_SPID, 19, 4, { NULL }, S_SPID_31 },       //1039
+/*S_SPID_31*/       { SPR_SPID, 20, 4, { A_Fall }, S_SPID_32 },     //1040
+/*S_SPID_32*/       { SPR_SPID, 21, 4, { NULL }, S_SPID_33 },       //1041
+/*S_SPID_33*/       { SPR_SPID, 22, 4, { NULL }, S_SPID_34 },       //1042
+/*S_SPID_34*/       { SPR_SPID, 32791, 4, { NULL }, S_SPID_35 },        //1043
+/*S_SPID_35*/       { SPR_SPID, 32792, 4, { NULL }, S_SPID_36 },        //1044
+/*S_SPID_36*/       { SPR_SPID, 32793, 4, { NULL }, S_SPID_37 },        //1045
+/*S_SPID_37*/       { SPR_SPID, 32794, 4, { NULL }, S_NULL },       //1046
+/*S_ROB3_00*/       { SPR_ROB3, 0, 10, { A_Look }, S_ROB3_01 },     //1047
+/*S_ROB3_01*/       { SPR_ROB3, 1, 10, { A_Look }, S_ROB3_00 },     //1048
+/*S_ROB3_02*/       { SPR_ROB3, 1, 3, { A_InqChase }, S_ROB3_03 },      //1049
+/*S_ROB3_03*/       { SPR_ROB3, 1, 3, { A_Chase }, S_ROB3_04 },     //1050
+/*S_ROB3_04*/       { SPR_ROB3, 2, 4, { A_Chase }, S_ROB3_05 },     //1051
+/*S_ROB3_05*/       { SPR_ROB3, 2, 4, { A_Chase }, S_ROB3_06 },     //1052
+/*S_ROB3_06*/       { SPR_ROB3, 3, 4, { A_Chase }, S_ROB3_07 },     //1053
+/*S_ROB3_07*/       { SPR_ROB3, 3, 4, { A_Chase }, S_ROB3_08 },     //1054
+/*S_ROB3_08*/       { SPR_ROB3, 4, 3, { A_InqChase }, S_ROB3_09 },      //1055
+/*S_ROB3_09*/       { SPR_ROB3, 4, 3, { A_InqFlyCheck }, S_ROB3_02 },       //1056
+/*S_ROB3_10*/       { SPR_ROB3, 0, 2, { A_InqFlyCheck }, S_ROB3_11 },       //1057
+/*S_ROB3_11*/       { SPR_ROB3, 5, 6, { A_FaceTarget }, S_ROB3_12 },        //1058
+/*S_ROB3_12*/       { SPR_ROB3, 32774, 8, { A_ReaverAttack }, S_ROB3_13 },     //1059
+/*S_ROB3_13*/       { SPR_ROB3, 6, 8, { A_ReaverAttack }, S_ROB3_02 },     //1060
+/*S_ROB3_14*/       { SPR_ROB3, 10, 12, { A_FaceTarget }, S_ROB3_15 },      //1061
+/*S_ROB3_15*/       { SPR_ROB3, 32777, 6, { A_InqGrenade }, S_ROB3_16 },        //1062
+/*S_ROB3_16*/       { SPR_ROB3, 10, 12, { NULL }, S_ROB3_02 },      //1063
+/*S_ROB3_17*/       { SPR_ROB3, 32775, 8, { A_InqTakeOff }, S_ROB3_18 },        //1064
+/*S_ROB3_18*/       { SPR_ROB3, 32776, 4, { A_InqFly }, S_ROB3_19 },        //1065
+/*S_ROB3_19*/       { SPR_ROB3, 32775, 4, { A_InqFly }, S_ROB3_18 },        //1066
+/*S_ROB3_20*/       { SPR_ROB3, 11, 4, { A_BodyParts }, S_ROB3_21 },        //1067
+/*S_ROB3_21*/       { SPR_ROB3, 12, 4, { A_Scream }, S_ROB3_22 },       //1068
+/*S_ROB3_22*/       { SPR_ROB3, 13, 4, { A_BodyParts }, S_ROB3_23 },        //1069
+/*S_ROB3_23*/       { SPR_ROB3, 32782, 4, { A_DeathExplode1 }, S_ROB3_24 },     //1070
+/*S_ROB3_24*/       { SPR_ROB3, 32783, 4, { A_BodyParts }, S_ROB3_25 },     //1071
+/*S_ROB3_25*/       { SPR_ROB3, 32784, 4, { A_Fall }, S_ROB3_26 },      //1072
+/*S_ROB3_26*/       { SPR_ROB3, 17, 4, { A_BodyParts }, S_ROB3_27 },        //1073
+/*S_ROB3_27*/       { SPR_ROB3, 18, 4, { A_BodyParts }, S_ROB3_28 },        //1074
+/*S_ROB3_28*/       { SPR_ROB3, 19, 4, { A_BodyParts }, S_ROB3_29 },        //1075
+/*S_ROB3_29*/       { SPR_ROB3, 20, 4, { A_BodyParts }, S_ROB3_30 },        //1076
+/*S_ROB3_30*/       { SPR_ROB3, 21, 4, { A_BodyParts }, S_ROB3_31 },        //1077
+/*S_ROB3_31*/       { SPR_ROB3, 32790, 4, { A_DeathExplode1 }, S_ROB3_32 },     //1078
+/*S_ROB3_32*/       { SPR_ROB3, 32791, 4, { A_BodyParts }, S_ROB3_33 },     //1079
+/*S_ROB3_33*/       { SPR_ROB3, 32792, 4, { A_BodyParts }, S_ROB3_34 },     //1080
+/*S_ROB3_34*/       { SPR_ROB3, 25, 4, { A_BodyParts }, S_ROB3_35 },        //1081
+/*S_ROB3_35*/       { SPR_ROB3, 26, 4, { A_BodyParts }, S_ROB3_36 },        //1082
+/*S_ROB3_36*/       { SPR_ROB3, 27, 3, { A_BodyParts }, S_ROB3_37 },        //1083
+/*S_ROB3_37*/       { SPR_ROB3, 32796, 3, { A_DeathExplode1 }, S_RBB3_00 },     //1084
+/*S_RBB3_00*/       { SPR_RBB3, 32768, 3, { A_InqTossArm }, S_RBB3_01 },        //1085
+/*S_RBB3_01*/       { SPR_RBB3, 32769, 3, { A_BodyParts }, S_RBB3_02 },     //1086
+/*S_RBB3_02*/       { SPR_RBB3, 2, 3, { A_BodyParts }, S_RBB3_03 },     //1087
+/*S_RBB3_03*/       { SPR_RBB3, 3, 3, { A_BodyParts }, S_RBB3_04 },     //1088
+/*S_RBB3_04*/       { SPR_RBB3, 4, -1, { A_BossDeath }, S_NULL },       //1089
+/*S_RBB3_05*/       { SPR_RBB3, 32773, 5, { NULL }, S_RBB3_06 },        //1090
+/*S_RBB3_06*/       { SPR_RBB3, 32774, 5, { NULL }, S_RBB3_07 },        //1091
+/*S_RBB3_07*/       { SPR_RBB3, 7, -1, { NULL }, S_NULL },      //1092
+/*S_PRGR_00*/       { SPR_PRGR, 0, 5, { A_Look }, S_PRGR_01 },      //1093
+/*S_PRGR_01*/       { SPR_PRGR, 0, 1, { A_FloatWeave }, S_PRGR_00 },        //1094
+/*S_PRGR_02*/       { SPR_PRGR, 0, 160, { A_FloatWeave }, S_PRGR_03 },      //1095
+/*S_PRGR_03*/       { SPR_PRGR, 1, 5, { A_FloatWeave }, S_PRGR_04 },        //1096
+/*S_PRGR_04*/       { SPR_PRGR, 2, 5, { A_FloatWeave }, S_PRGR_05 },        //1097
+/*S_PRGR_05*/       { SPR_PRGR, 3, 5, { A_FloatWeave }, S_PRGR_06 },        //1098
+/*S_PRGR_06*/       { SPR_PRGR, 4, 2, { A_FloatWeave }, S_PRGR_07 },        //1099
+/*S_PRGR_07*/       { SPR_PRGR, 5, 2, { A_FloatWeave }, S_PRGR_08 },        //1100
+/*S_PRGR_08*/       { SPR_PRGR, 4, 3, { A_Chase }, S_PRGR_09 },     //1101
+/*S_PRGR_09*/       { SPR_PRGR, 5, 3, { A_Chase }, S_PRGR_06 },     //1102
+/*S_PRGR_10*/       { SPR_PRGR, 4, 2, { A_FloatWeave }, S_PRGR_11 },        //1103
+/*S_PRGR_11*/       { SPR_PRGR, 5, 3, { A_FloatWeave }, S_PRGR_12 },        //1104
+/*S_PRGR_12*/       { SPR_PRGR, 4, 3, { A_FaceTarget }, S_PRGR_13 },        //1105
+/*S_PRGR_13*/       { SPR_PRGR, 5, 4, { A_ProgrammerMelee }, S_PRGR_06 },       //1106
+/*S_PRGR_14*/       { SPR_PRGR, 6, 5, { A_FaceTarget }, S_PRGR_15 },        //1107
+/*S_PRGR_15*/       { SPR_PRGR, 7, 5, { A_FloatWeave }, S_PRGR_16 },        //1108
+/*S_PRGR_16*/       { SPR_PRGR, 32776, 5, { A_FaceTarget }, S_PRGR_17 },        //1109
+/*S_PRGR_17*/       { SPR_PRGR, 32777, 5, { A_ProgrammerAttack }, S_PRGR_06 },      //1110
+/*S_PRGR_18*/       { SPR_PRGR, 10, 5, { A_Pain }, S_PRGR_19 },     //1111
+/*S_PRGR_19*/       { SPR_PRGR, 11, 5, { A_FloatWeave }, S_PRGR_06 },       //1112
+/*S_PRGR_20*/       { SPR_PRGR, 32779, 7, { A_BodyParts }, S_PRGR_21 },     //1113
+/*S_PRGR_21*/       { SPR_PRGR, 32780, 7, { A_Scream }, S_PRGR_22 },        //1114
+/*S_PRGR_22*/       { SPR_PRGR, 32781, 7, { A_BodyParts }, S_PRGR_23 },     //1115
+/*S_PRGR_23*/       { SPR_PRGR, 32782, 7, { A_Fall }, S_PRGR_24 },      //1116
+/*S_PRGR_24*/       { SPR_PRGR, 32783, 7, { A_BodyParts }, S_PRGR_25 },     //1117
+/*S_PRGR_25*/       { SPR_PRGR, 32784, 7, { A_ProgrammerDie }, S_PRGR_26 },     //1118
+/*S_PRGR_26*/       { SPR_PRGR, 32785, 7, { NULL }, S_PRGR_27 },        //1119
+/*S_PRGR_27*/       { SPR_PRGR, 32786, 6, { NULL }, S_PRGR_28 },        //1120
+/*S_PRGR_28*/       { SPR_PRGR, 32787, 5, { NULL }, S_PRGR_29 },        //1121
+/*S_PRGR_29*/       { SPR_PRGR, 32788, 5, { NULL }, S_PRGR_30 },        //1122
+/*S_PRGR_30*/       { SPR_PRGR, 32789, 5, { NULL }, S_PRGR_31 },        //1123
+/*S_PRGR_31*/       { SPR_PRGR, 32790, 5, { NULL }, S_PRGR_32 },        //1124
+/*S_PRGR_32*/       { SPR_PRGR, 32791, 32, { NULL }, S_PRGR_33 },       //1125
+/*S_PRGR_33*/       { SPR_PRGR, 32791, -1, { A_BossDeath }, S_NULL },       //1126
+/*S_BASE_00*/       { SPR_BASE, 32768, 5, { A_DeathExplode3 }, S_BASE_01 },     //1127
+/*S_BASE_01*/       { SPR_BASE, 32769, 5, { NULL }, S_BASE_02 },        //1128
+/*S_BASE_02*/       { SPR_BASE, 32770, 5, { NULL }, S_BASE_03 },        //1129
+/*S_BASE_03*/       { SPR_BASE, 32771, 5, { NULL }, S_BASE_04 },        //1130
+/*S_BASE_04*/       { SPR_BASE, 4, 5, { NULL }, S_BASE_05 },        //1131
+/*S_BASE_05*/       { SPR_BASE, 5, 5, { NULL }, S_BASE_06 },        //1132
+/*S_BASE_06*/       { SPR_BASE, 6, 5, { NULL }, S_BASE_07 },        //1133
+/*S_BASE_07*/       { SPR_BASE, 7, -1, { NULL }, S_NULL },      //1134
+/*S_FRBL_00*/       { SPR_FRBL, 32768, 3, { NULL }, S_FRBL_01 },        //1135
+/*S_FRBL_01*/       { SPR_FRBL, 32769, 3, { NULL }, S_FRBL_02 },        //1136
+/*S_FRBL_02*/       { SPR_FRBL, 32770, 3, { A_MissileTick }, S_FRBL_00 },       //1137
+/*S_FRBL_03*/       { SPR_FRBL, 32771, 5, { A_FlameDeath }, S_FRBL_04 },        //1138
+/*S_FRBL_04*/       { SPR_FRBL, 32772, 5, { NULL }, S_FRBL_05 },        //1139
+/*S_FRBL_05*/       { SPR_FRBL, 32773, 5, { NULL }, S_FRBL_06 },        //1140
+/*S_FRBL_06*/       { SPR_FRBL, 32774, 5, { NULL }, S_FRBL_07 },        //1141
+/*S_FRBL_07*/       { SPR_FRBL, 32775, 5, { NULL }, S_FRBL_08 },        //1142
+/*S_FRBL_08*/       { SPR_FRBL, 32776, 5, { NULL }, S_NULL },       //1143
+/*S_KLAX_00*/       { SPR_KLAX, 0, 5, { A_Listen }, S_KLAX_00 },        //1144
+/*S_KLAX_01*/       { SPR_KLAX, 1, 6, { A_ClaxonBlare }, S_KLAX_02 },       //1145
+/*S_KLAX_02*/       { SPR_KLAX, 2, 60, { NULL }, S_KLAX_01 },       //1146
+/*S_TURT_00*/       { SPR_TURT, 0, 5, { A_Listen }, S_TURT_00 },        //1147
+/*S_TURT_01*/       { SPR_TURT, 0, 2, { A_Chase }, S_TURT_01 },     //1148
+/*S_TURT_02*/       { SPR_TURT, 1, 4, { A_BulletAttack }, S_TURT_03 },      //1149
+/*S_TURT_03*/       { SPR_TURT, 3, 3, { A_CheckTargetVisible }, S_TURT_04 },        //1150
+/*S_TURT_04*/       { SPR_TURT, 0, 4, { A_CheckTargetVisible }, S_TURT_02 },        //1151
+/*S_BALL_00*/       { SPR_BALL, 32768, 6, { NULL }, S_BALL_01 },        //1152
+/*S_BALL_01*/       { SPR_BALL, 32769, 6, { NULL }, S_BALL_02 },        //1153
+/*S_BALL_02*/       { SPR_BALL, 32770, 6, { NULL }, S_BALL_03 },        //1154
+/*S_BALL_03*/       { SPR_BALL, 32771, 6, { NULL }, S_BALL_04 },        //1155
+/*S_BALL_04*/       { SPR_BALL, 32772, 6, { NULL }, S_TURT_05 },        //1156
+/*S_TURT_05*/       { SPR_TURT, 2, -1, { NULL }, S_NULL },      //1157
+/*S_PSTN_00*/       { SPR_PSTN, 0, 8, { NULL }, S_PSTN_01 },        //1158
+/*S_PSTN_01*/       { SPR_PSTN, 1, 8, { NULL }, S_PSTN_00 },        //1159
+/*S_PSTN_02*/       { SPR_PSTN, 32768, 4, { A_Scream }, S_PSTN_03 },        //1160
+/*S_PSTN_03*/       { SPR_PSTN, 32769, 4, { A_Fall }, S_PSTN_04 },      //1161
+/*S_PSTN_04*/       { SPR_PSTN, 32770, 4, { A_QuestMsg }, S_PSTN_05 },      //1162
+/*S_PSTN_05*/       { SPR_PSTN, 32771, 4, { A_SpawnSparkPuff }, S_PSTN_06 },        //1163
+/*S_PSTN_06*/       { SPR_PSTN, 32772, 4, { A_BodyParts }, S_PSTN_07 },     //1164
+/*S_PSTN_07*/       { SPR_PSTN, 32773, 4, { NULL }, S_PSTN_08 },        //1165
+/*S_PSTN_08*/       { SPR_PSTN, 32774, 4, { A_SpawnSparkPuff }, S_PSTN_09 },        //1166
+/*S_PSTN_09*/       { SPR_PSTN, 7, 4, { NULL }, S_PSTN_10 },        //1167
+/*S_PSTN_10*/       { SPR_PSTN, 8, -1, { NULL }, S_NULL },      //1168
+/*S_SECR_00*/       { SPR_SECR, 32768, 4, { NULL }, S_SECR_01 },        //1169
+/*S_SECR_01*/       { SPR_SECR, 32769, 4, { NULL }, S_SECR_02 },        //1170
+/*S_SECR_02*/       { SPR_SECR, 32770, 4, { NULL }, S_SECR_03 },        //1171
+/*S_SECR_03*/       { SPR_SECR, 32771, 4, { NULL }, S_SECR_00 },        //1172
+/*S_SECR_04*/       { SPR_SECR, 32772, 5, { A_SpawnSparkPuff }, S_SECR_05 },        //1173
+/*S_SECR_05*/       { SPR_SECR, 32773, 5, { A_Fall }, S_SECR_06 },      //1174
+/*S_SECR_06*/       { SPR_SECR, 32774, 5, { A_QuestMsg }, S_SECR_07 },      //1175
+/*S_SECR_07*/       { SPR_SECR, 32775, 5, { A_BodyParts }, S_SECR_08 },     //1176
+/*S_SECR_08*/       { SPR_SECR, 32776, 5, { A_SpawnSparkPuff }, S_SECR_09 },        //1177
+/*S_SECR_09*/       { SPR_SECR, 9, 5, { NULL }, S_SECR_10 },        //1178
+/*S_SECR_10*/       { SPR_SECR, 10, 5, { A_SpawnSparkPuff }, S_SECR_11 },       //1179
+/*S_SECR_11*/       { SPR_SECR, 11, 5, { NULL }, S_SECR_12 },       //1180
+/*S_SECR_12*/       { SPR_SECR, 12, 5, { A_SpawnSparkPuff }, S_SECR_13 },       //1181
+/*S_SECR_13*/       { SPR_SECR, 13, 5, { NULL }, S_SECR_14 },       //1182
+/*S_SECR_14*/       { SPR_SECR, 14, 5, { A_SpawnSparkPuff }, S_SECR_15 },       //1183
+/*S_SECR_15*/       { SPR_SECR, 15, -1, { NULL }, S_NULL },     //1184
+/*S_XPRK_01*/       { SPR_XPRK, 0, -1, { NULL }, S_NULL },      //1185
+/*S_XPRK_02*/       { SPR_XPRK, 0, 1, { A_ClearForceField }, S_BNG3_00 },       //1186
+/*S_TARG_00*/       { SPR_TARG, 0, -1, { NULL }, S_NULL },      //1187
+/*S_RING_00*/       { SPR_RING, 0, -1, { NULL }, S_NULL },      //1188
+/*S_EARS_00*/       { SPR_EARS, 0, -1, { NULL }, S_NULL },      //1189
+/*S_COMM_00*/       { SPR_COMM, 0, -1, { NULL }, S_NULL },      //1190
+/*S_BOOM_00*/       { SPR_BOOM, 32768, 1, { A_CrystalRadiusAtk }, S_BOOM_01 },     //1191
+/*S_BOOM_01*/       { SPR_BOOM, 32769, 3, { A_QuestMsg }, S_BOOM_02 },      //1192
+/*S_BOOM_02*/       { SPR_BOOM, 32770, 2, { A_CrystalExplode }, S_BOOM_03 },        //1193
+/*S_BOOM_03*/       { SPR_BOOM, 32771, 3, { A_SpawnSparkPuff }, S_BOOM_04 },        //1194
+/*S_BOOM_04*/       { SPR_BOOM, 32772, 3, { NULL }, S_BOOM_05 },        //1195
+/*S_BOOM_05*/       { SPR_BOOM, 32773, 3, { NULL }, S_BOOM_06 },        //1196
+/*S_BOOM_06*/       { SPR_BOOM, 32774, 3, { A_SpawnSparkPuff }, S_BOOM_07 },        //1197
+/*S_BOOM_07*/       { SPR_BOOM, 32775, 1, { A_CrystalRadiusAtk }, S_BOOM_08 },     //1198
+/*S_BOOM_08*/       { SPR_BOOM, 32776, 3, { NULL }, S_BOOM_09 },        //1199
+/*S_BOOM_09*/       { SPR_BOOM, 32777, 3, { A_SpawnSparkPuff }, S_BOOM_10 },        //1200
+/*S_BOOM_10*/       { SPR_BOOM, 32778, 3, { A_SpawnSparkPuff }, S_BOOM_11 },        //1201
+/*S_BOOM_11*/       { SPR_BOOM, 32779, 3, { A_SpawnSparkPuff }, S_BOOM_12 },        //1202
+/*S_BOOM_12*/       { SPR_BOOM, 32780, 3, { NULL }, S_BOOM_13 },        //1203
+/*S_BOOM_13*/       { SPR_BOOM, 32781, 3, { NULL }, S_BOOM_14 },        //1204
+/*S_BOOM_14*/       { SPR_BOOM, 32782, 3, { A_SpawnSparkPuff }, S_BOOM_15 },        //1205
+/*S_BOOM_15*/       { SPR_BOOM, 32783, 3, { NULL }, S_BOOM_16 },        //1206
+/*S_BOOM_16*/       { SPR_BOOM, 32784, 3, { NULL }, S_BOOM_17 },        //1207
+/*S_BOOM_17*/       { SPR_BOOM, 32785, 3, { NULL }, S_BOOM_18 },        //1208
+/*S_BOOM_18*/       { SPR_BOOM, 32786, 3, { NULL }, S_BOOM_19 },        //1209
+/*S_BOOM_19*/       { SPR_BOOM, 32787, 3, { NULL }, S_BOOM_20 },        //1210
+/*S_BOOM_20*/       { SPR_BOOM, 32788, 3, { A_ExtraLightOff }, S_BOOM_21 },     //1211
+/*S_BOOM_21*/       { SPR_BOOM, 32789, 3, { NULL }, S_BOOM_22 },        //1212
+/*S_BOOM_22*/       { SPR_BOOM, 32790, 3, { NULL }, S_BOOM_23 },        //1213
+/*S_BOOM_23*/       { SPR_BOOM, 32791, 3, { NULL }, S_BOOM_24 },        //1214
+/*S_BOOM_24*/       { SPR_BOOM, 32792, 3, { NULL }, S_NULL },       //1215
+/*S_RATT_00*/       { SPR_RATT, 0, 10, { A_Look }, S_RATT_00 },     //1216
+/*S_RATT_01*/       { SPR_RATT, 0, 4, { A_Chase }, S_RATT_02 },     //1217
+/*S_RATT_02*/       { SPR_RATT, 0, 4, { A_Chase }, S_RATT_03 },     //1218
+/*S_RATT_03*/       { SPR_RATT, 1, 4, { A_Chase }, S_RATT_04 },     //1219
+/*S_RATT_04*/       { SPR_RATT, 1, 4, { A_Chase }, S_RATT_01 },     //1220
+/*S_RATT_05*/       { SPR_RATT, 0, 8, { A_RandomWalk }, S_RATT_06 },        //1221
+/*S_RATT_06*/       { SPR_RATT, 1, 4, { A_RandomWalk }, S_RATT_01 },        //1222
+/*S_HOGN_00*/       { SPR_HOGN, 0, 2, { A_ZombieInSpecialSector }, S_HOGN_00 },     //1223
+/*S_HOGN_01*/       { SPR_HOGN, 1, 1, { A_ZombieInSpecialSector }, S_HOGN_02 },     //1224
+/*S_HOGN_02*/       { SPR_HOGN, 2, 1, { A_Pain }, S_HOGN_00 },      //1225
+/*S_DEAD_00*/       { SPR_DEAD, 0, -1, { NULL }, S_NULL },      //1226
+/*S_SBAN_00*/       { SPR_SBAN, 0, -1, { NULL }, S_NULL },      //1227
+/*S_BOTR_00*/       { SPR_BOTR, 0, -1, { NULL }, S_NULL },      //1228
+/*S_HATR_00*/       { SPR_HATR, 0, -1, { NULL }, S_NULL },      //1229
+/*S_TOPR_00*/       { SPR_TOPR, 0, -1, { NULL }, S_NULL },      //1230
+/*S_COUP_00*/       { SPR_COUP, 0, 5, { NULL }, S_COUP_01 },        //1231
+/*S_COUP_01*/       { SPR_COUP, 1, 5, { NULL }, S_COUP_00 },        //1232
+/*S_COUP_02*/       { SPR_COUP, 2, -1, { NULL }, S_COUP_01 },       //1233
+/*S_BUBB_00*/       { SPR_BUBB, 0, 4, { A_ActiveSound }, S_BUBB_00 },       //1234
+/*S_BUBF_00*/       { SPR_BUBF, 0, 4, { A_ActiveSound }, S_BUBF_00 },       //1235
+/*S_BUBC_00*/       { SPR_BUBC, 0, 4, { A_ActiveSound }, S_BUBC_00 },       //1236
+/*S_ASPR_00*/       { SPR_ASPR, 0, 4, { A_ActiveSound }, S_ASPR_00 },       //1237
+/*S_SPDL_00*/       { SPR_SPDL, 0, 5, { A_ActiveSound }, S_SPDL_01 },       //1238
+/*S_SPDL_01*/       { SPR_SPDL, 1, 5, { A_ActiveSound }, S_SPDL_02 },       //1239
+/*S_SPDL_02*/       { SPR_SPDL, 2, 5, { A_ActiveSound }, S_SPDL_00 },       //1240
+/*S_TOKN_00*/       { SPR_TOKN, 0, -1, { NULL }, S_NULL },      //1241
+/*S_OTOK_00*/       { SPR_OTOK, 0, -1, { NULL }, S_NULL },      //1242
+/*S_HELT_00*/       { SPR_HELT, 0, -1, { NULL }, S_NULL },      //1243
+/*S_GUNT_00*/       { SPR_GUNT, 0, -1, { NULL }, S_NULL },      //1244
+/*S_FULL_00*/       { SPR_FULL, 0, 35, { NULL }, S_FULL_01 },       //1245
+/*S_FULL_01*/       { SPR_FULL, 1, 35, { NULL }, S_FULL_00 },       //1246
+/*S_MEAT_00*/       { SPR_MEAT, 0, 700, { NULL }, S_NULL },     //1247
+/*S_MEAT_01*/       { SPR_MEAT, 1, 700, { NULL }, S_NULL },     //1248
+/*S_MEAT_02*/       { SPR_MEAT, 2, 700, { NULL }, S_NULL },     //1249
+/*S_MEAT_03*/       { SPR_MEAT, 3, 700, { NULL }, S_NULL },     //1250
+/*S_MEAT_04*/       { SPR_MEAT, 4, 700, { NULL }, S_NULL },     //1251
+/*S_MEAT_05*/       { SPR_MEAT, 5, 700, { NULL }, S_NULL },     //1252
+/*S_MEAT_06*/       { SPR_MEAT, 6, 700, { NULL }, S_NULL },     //1253
+/*S_MEAT_07*/       { SPR_MEAT, 7, 700, { NULL }, S_NULL },     //1254
+/*S_MEAT_08*/       { SPR_MEAT, 8, 700, { NULL }, S_NULL },     //1255
+/*S_MEAT_09*/       { SPR_MEAT, 9, 700, { NULL }, S_NULL },     //1256
+/*S_MEAT_10*/       { SPR_MEAT, 10, 700, { NULL }, S_NULL },        //1257
+/*S_MEAT_11*/       { SPR_MEAT, 11, 700, { NULL }, S_NULL },        //1258
+/*S_MEAT_12*/       { SPR_MEAT, 12, 700, { NULL }, S_NULL },        //1259
+/*S_MEAT_13*/       { SPR_MEAT, 13, 700, { NULL }, S_NULL },        //1260
+/*S_MEAT_14*/       { SPR_MEAT, 14, 700, { NULL }, S_NULL },        //1261
+/*S_MEAT_15*/       { SPR_MEAT, 15, 700, { NULL }, S_NULL },        //1262
+/*S_MEAT_16*/       { SPR_MEAT, 16, 700, { NULL }, S_NULL },        //1263
+/*S_MEAT_17*/       { SPR_MEAT, 17, 700, { NULL }, S_NULL },        //1264
+/*S_MEAT_18*/       { SPR_MEAT, 18, 700, { NULL }, S_NULL },        //1265
+/*S_MEAT_19*/       { SPR_MEAT, 19, 700, { NULL }, S_NULL },        //1266
+/*S_JUNK_00*/       { SPR_JUNK, 0, 700, { NULL }, S_NULL },     //1267
+/*S_JUNK_01*/       { SPR_JUNK, 1, 700, { NULL }, S_NULL },     //1268
+/*S_JUNK_02*/       { SPR_JUNK, 2, 700, { NULL }, S_NULL },     //1269
+/*S_JUNK_03*/       { SPR_JUNK, 3, 700, { NULL }, S_NULL },     //1270
+/*S_JUNK_04*/       { SPR_JUNK, 4, 700, { NULL }, S_NULL },     //1271
+/*S_JUNK_05*/       { SPR_JUNK, 5, 700, { NULL }, S_NULL },     //1272
+/*S_JUNK_06*/       { SPR_JUNK, 6, 700, { NULL }, S_NULL },     //1273
+/*S_JUNK_07*/       { SPR_JUNK, 7, 700, { NULL }, S_NULL },     //1274
+/*S_JUNK_08*/       { SPR_JUNK, 8, 700, { NULL }, S_NULL },     //1275
+/*S_JUNK_09*/       { SPR_JUNK, 9, 700, { NULL }, S_NULL },     //1276
+/*S_JUNK_10*/       { SPR_JUNK, 10, 700, { NULL }, S_NULL },        //1277
+/*S_JUNK_11*/       { SPR_JUNK, 11, 700, { NULL }, S_NULL },        //1278
+/*S_JUNK_12*/       { SPR_JUNK, 12, 700, { NULL }, S_NULL },        //1279
+/*S_JUNK_13*/       { SPR_JUNK, 13, 700, { NULL }, S_NULL },        //1280
+/*S_JUNK_14*/       { SPR_JUNK, 14, 700, { NULL }, S_NULL },        //1281
+/*S_JUNK_15*/       { SPR_JUNK, 15, 700, { NULL }, S_NULL },        //1282
+/*S_JUNK_16*/       { SPR_JUNK, 16, 700, { NULL }, S_NULL },        //1283
+/*S_JUNK_17*/       { SPR_JUNK, 17, 700, { NULL }, S_NULL },        //1284
+/*S_JUNK_18*/       { SPR_JUNK, 18, 700, { NULL }, S_NULL },        //1285
+/*S_JUNK_19*/       { SPR_JUNK, 19, 700, { NULL }, S_NULL },        //1286
+/*S_FFOT_00*/       { SPR_FFOT, 0, 9, { NULL }, S_FFOT_01 },        //1287
+/*S_FFOT_01*/       { SPR_FFOT, 1, 9, { NULL }, S_FFOT_02 },        //1288
+/*S_FFOT_02*/       { SPR_FFOT, 2, 9, { NULL }, S_FFOT_03 },        //1289
+/*S_FFOT_03*/       { SPR_FFOT, 3, 9, { NULL }, S_NULL },       //1290
+/*S_DIE1_00*/       { SPR_DIE1, 0, -1, { NULL }, S_NULL },      //1291
+/*S_BEAC_00*/       { SPR_BEAC, 0, -1, { NULL }, S_NULL },      //1292
+/*S_BEAC_01*/       { SPR_BEAC, 0, 30, { NULL }, S_BEAC_02 },       //1293
+/*S_BEAC_02*/       { SPR_BEAC, 0, 160, { A_TeleportBeacon }, S_BEAC_01 },      //1294
+/*S_ARM1_00*/       { SPR_ARM1, 0, -1, { NULL }, S_NULL },      //1295
+/*S_ARM2_00*/       { SPR_ARM2, 0, -1, { NULL }, S_NULL },      //1296
+/*S_BARW_00*/       { SPR_BARW, 0, -1, { NULL }, S_NULL },      //1297
+/*S_BARW_01*/       { SPR_BARW, 1, 2, { A_Scream }, S_BARW_02 },        //1298
+/*S_BARW_02*/       { SPR_BARW, 2, 2, { NULL }, S_BARW_03 },        //1299
+/*S_BARW_03*/       { SPR_BARW, 3, 2, { A_Fall }, S_BARW_04 },      //1300
+/*S_BARW_04*/       { SPR_BARW, 4, 2, { NULL }, S_BARW_05 },        //1301
+/*S_BARW_05*/       { SPR_BARW, 5, 2, { NULL }, S_BARW_06 },        //1302
+/*S_BARW_06*/       { SPR_BARW, 6, 2, { NULL }, S_BARW_07 },        //1303
+/*S_BARW_07*/       { SPR_BARW, 7, -1, { NULL }, S_NULL },      //1304
+/*S_BART_00*/       { SPR_BART, 0, -1, { NULL }, S_NULL },      //1305
+/*S_BART_01*/       { SPR_BART, 32769, 2, { A_Scream }, S_BART_02 },        //1306
+/*S_BART_02*/       { SPR_BART, 32770, 2, { NULL }, S_BART_03 },        //1307
+/*S_BART_03*/       { SPR_BART, 32771, 2, { NULL }, S_BART_04 },        //1308
+/*S_BART_04*/       { SPR_BART, 32772, 2, { A_Fall }, S_BART_05 },      //1309
+/*S_BART_05*/       { SPR_BART, 32773, 2, { A_DeathExplode2 }, S_BART_06 },     //1310
+/*S_BART_06*/       { SPR_BART, 32774, 2, { NULL }, S_BART_07 },        //1311
+/*S_BART_07*/       { SPR_BART, 32775, 2, { NULL }, S_BART_08 },        //1312
+/*S_BART_08*/       { SPR_BART, 32776, 2, { NULL }, S_BART_09 },        //1313
+/*S_BART_09*/       { SPR_BART, 32777, 3, { NULL }, S_BART_10 },        //1314
+/*S_BART_10*/       { SPR_BART, 32778, 3, { NULL }, S_BART_11 },        //1315
+/*S_BART_11*/       { SPR_BART, 11, -1, { NULL }, S_NULL },     //1316
+/*S_LAMP_00*/       { SPR_LAMP, 0, -1, { NULL }, S_NULL },      //1317
+/*S_LANT_00*/       { SPR_LANT, 0, -1, { NULL }, S_NULL },      //1318
+/*S_BARL_00*/       { SPR_BARL, 32768, 4, { NULL }, S_BARL_01 },        //1319
+/*S_BARL_01*/       { SPR_BARL, 32769, 4, { NULL }, S_BARL_02 },        //1320
+/*S_BARL_02*/       { SPR_BARL, 32770, 4, { NULL }, S_BARL_03 },        //1321
+/*S_BARL_03*/       { SPR_BARL, 32771, 4, { NULL }, S_BARL_00 },        //1322
+/*S_BOWL_00*/       { SPR_BOWL, 32768, 4, { A_ActiveSound }, S_BOWL_01 },       //1323
+/*S_BOWL_01*/       { SPR_BOWL, 32769, 4, { NULL }, S_BOWL_02 },        //1324
+/*S_BOWL_02*/       { SPR_BOWL, 32770, 4, { NULL }, S_BOWL_03 },        //1325
+/*S_BOWL_03*/       { SPR_BOWL, 32771, 4, { NULL }, S_BOWL_00 },        //1326
+/*S_BRAZ_00*/       { SPR_BRAZ, 32768, 4, { A_ActiveSound }, S_BRAZ_01 },       //1327
+/*S_BRAZ_01*/       { SPR_BRAZ, 32769, 4, { NULL }, S_BRAZ_02 },        //1328
+/*S_BRAZ_02*/       { SPR_BRAZ, 32770, 4, { NULL }, S_BRAZ_03 },        //1329
+/*S_BRAZ_03*/       { SPR_BRAZ, 32771, 4, { NULL }, S_BRAZ_00 },        //1330
+/*S_TRCH_00*/       { SPR_TRCH, 32768, 4, { A_ActiveSound }, S_TRCH_01 },       //1331
+/*S_TRCH_01*/       { SPR_TRCH, 32769, 4, { NULL }, S_TRCH_02 },        //1332
+/*S_TRCH_02*/       { SPR_TRCH, 32770, 4, { NULL }, S_TRCH_03 },        //1333
+/*S_TRCH_03*/       { SPR_TRCH, 32771, 4, { NULL }, S_TRCH_00 },        //1334
+/*S_LTRH_00*/       { SPR_LTRH, 32768, 4, { NULL }, S_LTRH_01 },        //1335
+/*S_LTRH_01*/       { SPR_LTRH, 32769, 4, { NULL }, S_LTRH_02 },        //1336
+/*S_LTRH_02*/       { SPR_LTRH, 32770, 4, { NULL }, S_LTRH_03 },        //1337
+/*S_LTRH_03*/       { SPR_LTRH, 32771, 4, { NULL }, S_LTRH_00 },        //1338
+/*S_LMPC_00*/       { SPR_LMPC, 32768, 4, { A_ActiveSound }, S_LMPC_01 },       //1339
+/*S_LMPC_01*/       { SPR_LMPC, 32769, 4, { NULL }, S_LMPC_02 },        //1340
+/*S_LMPC_02*/       { SPR_LMPC, 32770, 4, { NULL }, S_LMPC_03 },        //1341
+/*S_LMPC_03*/       { SPR_LMPC, 32771, 4, { NULL }, S_LMPC_00 },        //1342
+/*S_LOGS_00*/       { SPR_LOGS, 32768, 4, { A_ActiveSound }, S_LOGS_01 },       //1343
+/*S_LOGS_01*/       { SPR_LOGS, 32769, 4, { NULL }, S_LOGS_02 },        //1344
+/*S_LOGS_02*/       { SPR_LOGS, 32770, 4, { NULL }, S_LOGS_03 },        //1345
+/*S_LOGS_03*/       { SPR_LOGS, 32771, 4, { NULL }, S_LOGS_00 },        //1346
+/*S_TRHO_00*/       { SPR_TRHO, 0, -1, { NULL }, S_NULL },      //1347
+/*S_WATR_00*/       { SPR_WATR, 0, -1, { NULL }, S_NULL },      //1348
+/*S_MUGG_00*/       { SPR_MUGG, 0, -1, { NULL }, S_NULL },      //1349
+/*S_FUSL_00*/       { SPR_FUSL, 0, -1, { NULL }, S_NULL },      //1350
+/*S_CRD1_00*/       { SPR_CRD1, 0, -1, { NULL }, S_NULL },      //1351
+/*S_CRD2_00*/       { SPR_CRD2, 0, -1, { NULL }, S_NULL },      //1352
+/*S_TPAS_00*/       { SPR_TPAS, 0, -1, { NULL }, S_NULL },      //1353
+/*S_KY1G_00*/       { SPR_KY1G, 0, -1, { NULL }, S_NULL },      //1354
+/*S_KY2S_00*/       { SPR_KY2S, 0, -1, { NULL }, S_NULL },      //1355
+/*S_KY3B_00*/       { SPR_KY3B, 0, -1, { NULL }, S_NULL },      //1356
+/*S_HAND_00*/       { SPR_HAND, 0, -1, { NULL }, S_NULL },      //1357
+/*S_CRYS_00*/       { SPR_CRYS, 0, 16, { A_ActiveSound }, S_CRYS_01 },      //1358
+/*S_CRYS_01*/       { SPR_CRYS, 1, 5, { A_ActiveSound }, S_CRYS_02 },       //1359
+/*S_CRYS_02*/       { SPR_CRYS, 2, 4, { A_ActiveSound }, S_CRYS_03 },       //1360
+/*S_CRYS_03*/       { SPR_CRYS, 3, 4, { A_ActiveSound }, S_CRYS_04 },       //1361
+/*S_CRYS_04*/       { SPR_CRYS, 4, 4, { A_ActiveSound }, S_CRYS_05 },       //1362
+/*S_CRYS_05*/       { SPR_CRYS, 5, 4, { A_ActiveSound }, S_CRYS_00 },       //1363
+/*S_PRIS_00*/       { SPR_PRIS, 0, -1, { NULL }, S_NULL },      //1364
+/*S_PWR1_00*/       { SPR_PWR1, 0, -1, { NULL }, S_NULL },      //1365
+/*S_PWR2_00*/       { SPR_PWR2, 0, -1, { NULL }, S_NULL },      //1366
+/*S_PWR3_00*/       { SPR_PWR3, 0, -1, { NULL }, S_NULL },      //1367
+/*S_ORAC_00*/       { SPR_ORAC, 0, -1, { NULL }, S_NULL },      //1368
+/*S_GYID_00*/       { SPR_GYID, 0, -1, { NULL }, S_NULL },      //1369
+/*S_FUBR_00*/       { SPR_FUBR, 0, -1, { NULL }, S_NULL },      //1370
+/*S_WARE_00*/       { SPR_WARE, 0, -1, { NULL }, S_NULL },      //1371
+/*S_RCRY_00*/       { SPR_RCRY, 32768, -1, { NULL }, S_NULL },      //1372
+/*S_BCRY_00*/       { SPR_BCRY, 32768, -1, { NULL }, S_NULL },      //1373
+/*S_CHAP_00*/       { SPR_CHAP, 0, -1, { NULL }, S_NULL },      //1374
+/*S_TUNL_00*/       { SPR_TUNL, 0, -1, { NULL }, S_NULL },      //1375
+/*S_BLTK_00*/       { SPR_BLTK, 0, -1, { NULL }, S_NULL },      //1376
+/*S_SECK_00*/       { SPR_SECK, 0, -1, { NULL }, S_NULL },      //1377
+/*S_MINE_00*/       { SPR_MINE, 0, -1, { NULL }, S_NULL },      //1378
+/*S_REBL_00*/       { SPR_REBL, 0, -1, { NULL }, S_NULL },      //1379
+/*S_PROC_00*/       { SPR_PROC, 0, -1, { NULL }, S_NULL },      //1380
+/*S_ANKH_00*/       { SPR_ANKH, 0, -1, { NULL }, S_NULL },      //1381
+/*S_GOID_00*/       { SPR_GOID, 0, -1, { NULL }, S_NULL },      //1382
+/*S_STMP_00*/       { SPR_STMP, 0, -1, { NULL }, S_NULL },      //1383
+/*S_MDKT_00*/       { SPR_MDKT, 0, -1, { NULL }, S_NULL },      //1384
+/*S_COIN_00*/       { SPR_COIN, 0, -1, { NULL }, S_NULL },      //1385
+/*S_CRED_00*/       { SPR_CRED, 0, -1, { NULL }, S_NULL },      //1386
+/*S_SACK_00*/       { SPR_SACK, 0, -1, { NULL }, S_NULL },      //1387
+/*S_CHST_00*/       { SPR_CHST, 0, -1, { NULL }, S_NULL },      //1388
+/*S_SHD1_00*/       { SPR_SHD1, 0, 17, { A_ShadowOff }, S_SHD1_01 },        //1389
+/*S_SHD1_01*/       { SPR_SHD1, 0, 17, { A_ModifyVisibility }, S_SHD1_02 },     //1390
+/*S_SHD1_02*/       { SPR_SHD1, 0, 17, { A_ShadowOn }, S_SHD1_03 },     //1391
+/*S_SHD1_03*/       { SPR_SHD1, 0, 17, { A_ModifyVisibility }, S_SHD1_00 },     //1392
+/*S_MASK_00*/       { SPR_MASK, 0, -1, { NULL }, S_NULL },      //1393
+/*S_UNIF_00*/       { SPR_UNIF, 0, -1, { NULL }, S_NULL },      //1394
+/*S_OFIC_00*/       { SPR_OFIC, 0, -1, { NULL }, S_NULL },      //1395
+/*S_PMAP_00*/       { SPR_PMAP, 32768, 6, { NULL }, S_PMAP_01 },        //1396
+/*S_PMAP_01*/       { SPR_PMAP, 32769, 6, { NULL }, S_PMAP_00 },        //1397
+/*S_PMUP_00*/       { SPR_PMUP, 32768, 6, { NULL }, S_PMUP_01 },        //1398
+/*S_PMUP_01*/       { SPR_PMUP, 32769, 6, { NULL }, S_PMUP_00 },        //1399
+/*S_BLIT_00*/       { SPR_BLIT, 0, -1, { NULL }, S_NULL },      //1400
+/*S_BBOX_00*/       { SPR_BBOX, 0, -1, { NULL }, S_NULL },      //1401
+/*S_MSSL_00*/       { SPR_MSSL, 0, -1, { NULL }, S_NULL },      //1402
+/*S_ROKT_00*/       { SPR_ROKT, 0, -1, { NULL }, S_NULL },      //1403
+/*S_BRY1_00*/       { SPR_BRY1, 0, 6, { NULL }, S_BRY1_01 },        //1404
+/*S_BRY1_01*/       { SPR_BRY1, 1, 6, { NULL }, S_BRY1_00 },        //1405
+/*S_CPAC_00*/       { SPR_CPAC, 0, 6, { NULL }, S_CPAC_01 },        //1406
+/*S_CPAC_01*/       { SPR_CPAC, 1, 6, { NULL }, S_CPAC_00 },        //1407
+/*S_PQRL_00*/       { SPR_PQRL, 0, -1, { NULL }, S_NULL },      //1408
+/*S_XQRL_00*/       { SPR_XQRL, 0, -1, { NULL }, S_NULL },      //1409
+/*S_GRN1_00*/       { SPR_GRN1, 0, -1, { NULL }, S_NULL },      //1410
+/*S_GRN2_00*/       { SPR_GRN2, 0, -1, { NULL }, S_NULL },      //1411
+/*S_BKPK_00*/       { SPR_BKPK, 0, -1, { NULL }, S_NULL },      //1412
+/*S_RELC_00*/       { SPR_RELC, 32768, -1, { NULL }, S_NULL },      //1413
+/*S_RIFL_00*/       { SPR_RIFL, 0, -1, { NULL }, S_NULL },      //1414
+/*S_RIFL_01*/       { SPR_RIFL, 1, -1, { NULL }, S_NULL },      //1415
+/*S_FLAM_00*/       { SPR_FLAM, 0, -1, { NULL }, S_NULL },      //1416
+/*S_BFLM_00*/       { SPR_BFLM, 0, -1, { NULL }, S_NULL },      //1417
+/*S_MMSL_00*/       { SPR_MMSL, 0, -1, { NULL }, S_NULL },      //1418
+/*S_TRPD_00*/       { SPR_TRPD, 0, -1, { NULL }, S_NULL },      //1419
+/*S_GRND_00*/       { SPR_GRND, 0, -1, { NULL }, S_NULL },      //1420
+/*S_CBOW_00*/       { SPR_CBOW, 0, -1, { NULL }, S_NULL },      //1421
+/*S_SIGL_00*/       { SPR_SIGL, 0, -1, { NULL }, S_NULL },      //1422
+/*S_SIGL_01*/       { SPR_SIGL, 1, -1, { NULL }, S_NULL },      //1423
+/*S_SIGL_02*/       { SPR_SIGL, 2, -1, { NULL }, S_NULL },      //1424
+/*S_SIGL_03*/       { SPR_SIGL, 3, -1, { NULL }, S_NULL },      //1425
+/*S_SIGL_04*/       { SPR_SIGL, 4, -1, { NULL }, S_NULL },      //1426
+/*S_LITE_00*/       { SPR_LITE, 32768, -1, { NULL }, S_NULL },      //1427
+/*S_CNDL_00*/       { SPR_CNDL, 32768, -1, { NULL }, S_NULL },      //1428
+/*S_CLBR_00*/       { SPR_CLBR, 32768, -1, { NULL }, S_NULL },      //1429
+/*S_LITS_00*/       { SPR_LITS, 32768, -1, { NULL }, S_NULL },      //1430
+/*S_LITB_00*/       { SPR_LITB, 32768, -1, { NULL }, S_NULL },      //1431
+/*S_LITG_00*/       { SPR_LITG, 32768, -1, { NULL }, S_NULL },      //1432
+/*S_ROK1_00*/       { SPR_ROK1, 0, -1, { NULL }, S_NULL },      //1433
+/*S_ROK2_00*/       { SPR_ROK2, 0, -1, { NULL }, S_NULL },      //1434
+/*S_ROK3_00*/       { SPR_ROK3, 0, -1, { NULL }, S_NULL },      //1435
+/*S_ROK4_00*/       { SPR_ROK4, 0, -1, { NULL }, S_NULL },      //1436
+/*S_LOGG_00*/       { SPR_LOGG, 0, 5, { A_ActiveSound }, S_LOGG_01 },       //1437
+/*S_LOGG_01*/       { SPR_LOGG, 1, 5, { A_ActiveSound }, S_LOGG_02 },       //1438
+/*S_LOGG_02*/       { SPR_LOGG, 2, 5, { A_ActiveSound }, S_LOGG_03 },       //1439
+/*S_LOGG_03*/       { SPR_LOGG, 3, 5, { A_ActiveSound }, S_LOGG_00 },       //1440
+/*S_RUB1_00*/       { SPR_RUB1, 0, -1, { NULL }, S_NULL },      //1441
+/*S_RUB2_00*/       { SPR_RUB2, 0, -1, { NULL }, S_NULL },      //1442
+/*S_RUB3_00*/       { SPR_RUB3, 0, -1, { NULL }, S_NULL },      //1443
+/*S_RUB4_00*/       { SPR_RUB4, 0, -1, { NULL }, S_NULL },      //1444
+/*S_RUB5_00*/       { SPR_RUB5, 0, -1, { NULL }, S_NULL },      //1445
+/*S_RUB6_00*/       { SPR_RUB6, 0, -1, { NULL }, S_NULL },      //1446
+/*S_RUB7_00*/       { SPR_RUB7, 0, -1, { NULL }, S_NULL },      //1447
+/*S_RUB8_00*/       { SPR_RUB8, 0, -1, { NULL }, S_NULL },      //1448
+/*S_CHAN_00*/       { SPR_CHAN, 0, -1, { NULL }, S_NULL },      //1449
+/*S_STAT_00*/       { SPR_STAT, 0, -1, { NULL }, S_NULL },      //1450
+/*S_DSTA_00*/       { SPR_DSTA, 0, -1, { NULL }, S_NULL },      //1451
+/*S_CRAB_00*/       { SPR_CRAB, 0, -1, { NULL }, S_NULL },      //1452
+/*S_CAGE_00*/       { SPR_CAGE, 0, -1, { NULL }, S_NULL },      //1453
+/*S_TREE_00*/       { SPR_TREE, 0, -1, { NULL }, S_NULL },      //1454
+/*S_TREE_01*/       { SPR_TREE, 1, -1, { NULL }, S_NULL },      //1455
+/*S_TREE_02*/       { SPR_TREE, 2, -1, { NULL }, S_NULL },      //1456
+/*S_TRE1_00*/       { SPR_TRE1, 0, -1, { NULL }, S_NULL },      //1457
+/*S_BUSH_00*/       { SPR_BUSH, 0, -1, { NULL }, S_NULL },      //1458
+/*S_SHRB_00*/       { SPR_SHRB, 0, -1, { NULL }, S_NULL },      //1459
+/*S_STAK_00*/       { SPR_STAK, 0, -1, { NULL }, S_NULL },      //1460
+/*S_BAR1_00*/       { SPR_BAR1, 0, -1, { NULL }, S_NULL },      //1461
+/*S_VASE_00*/       { SPR_VASE, 0, -1, { NULL }, S_NULL },      //1462
+/*S_VASE_01*/       { SPR_VASE, 1, -1, { NULL }, S_NULL },      //1463
+/*S_STOL_00*/       { SPR_STOL, 0, -1, { NULL }, S_NULL },      //1464
+/*S_POT1_00*/       { SPR_POT1, 0, -1, { NULL }, S_NULL },      //1465
+/*S_TUB1_00*/       { SPR_TUB1, 0, -1, { NULL }, S_NULL },      //1466
+/*S_ANVL_00*/       { SPR_ANVL, 0, -1, { NULL }, S_NULL },      //1467
+/*S_TLMP_00*/       { SPR_TLMP, 0, -1, { NULL }, S_NULL },      //1468
+/*S_TLMP_01*/       { SPR_TLMP, 1, -1, { NULL }, S_NULL },      //1469
+/*S_TRAY_00*/       { SPR_TRAY, 0, -1, { NULL }, S_NULL },      //1470
+/*S_APOW_00*/       { SPR_APOW, 0, 4, { A_ActiveSound }, S_APOW_00 },       //1471
+/*S_AFED_00*/       { SPR_AFED, 0, -1, { NULL }, S_NULL },      //1472
+/*S_DRIP_00*/       { SPR_DRIP, 0, 6, { A_ActiveSound }, S_DRIP_01 },       //1473
+/*S_DRIP_01*/       { SPR_DRIP, 1, 4, { NULL }, S_DRIP_02 },        //1474
+/*S_DRIP_02*/       { SPR_DRIP, 2, 4, { NULL }, S_DRIP_03 },        //1475
+/*S_DRIP_03*/       { SPR_DRIP, 3, 4, { A_ActiveSound }, S_DRIP_04 },       //1476
+/*S_DRIP_04*/       { SPR_DRIP, 4, 4, { NULL }, S_DRIP_05 },        //1477
+/*S_DRIP_05*/       { SPR_DRIP, 5, 4, { NULL }, S_DRIP_06 },        //1478
+/*S_DRIP_06*/       { SPR_DRIP, 6, 4, { A_ActiveSound }, S_DRIP_07 },       //1479
+/*S_DRIP_07*/       { SPR_DRIP, 7, 4, { NULL }, S_DRIP_00 },        //1480
+/*S_CDRP_00*/       { SPR_CDRP, 0, 10, { NULL }, S_CDRP_01 },       //1481
+/*S_CDRP_01*/       { SPR_CDRP, 1, 8, { NULL }, S_CDRP_02 },        //1482
+/*S_CDRP_02*/       { SPR_CDRP, 2, 8, { NULL }, S_CDRP_03 },        //1483
+/*S_CDRP_03*/       { SPR_CDRP, 3, 8, { NULL }, S_CDRP_00 },        //1484
+/*S_SPLH_00*/       { SPR_SPLH, 0, 4, { NULL }, S_SPLH_01 },        //1485
+/*S_SPLH_01*/       { SPR_SPLH, 1, 4, { NULL }, S_SPLH_02 },        //1486
+/*S_SPLH_02*/       { SPR_SPLH, 2, 4, { NULL }, S_SPLH_03 },        //1487
+/*S_SPLH_03*/       { SPR_SPLH, 3, 8, { NULL }, S_SPLH_04 },        //1488
+/*S_SPLH_04*/       { SPR_SPLH, 4, 4, { NULL }, S_SPLH_05 },        //1489
+/*S_SPLH_05*/       { SPR_SPLH, 5, 4, { NULL }, S_SPLH_06 },        //1490
+/*S_SPLH_06*/       { SPR_SPLH, 6, 4, { NULL }, S_SPLH_07 },        //1491
+/*S_SPLH_07*/       { SPR_SPLH, 7, 4, { A_ActiveSound }, S_SPLH_00 },       //1492
+/*S_WTFT_00*/       { SPR_WTFT, 0, 4, { NULL }, S_WTFT_01 },        //1493
+/*S_WTFT_01*/       { SPR_WTFT, 1, 4, { NULL }, S_WTFT_02 },        //1494
+/*S_WTFT_02*/       { SPR_WTFT, 2, 4, { NULL }, S_WTFT_03 },        //1495
+/*S_WTFT_03*/       { SPR_WTFT, 3, 4, { A_ActiveSound }, S_WTFT_00 },       //1496
+/*S_HERT_00*/       { SPR_HERT, 32768, 4, { NULL }, S_HERT_01 },        //1497
+/*S_HERT_01*/       { SPR_HERT, 32769, 4, { NULL }, S_HERT_02 },        //1498
+/*S_HERT_02*/       { SPR_HERT, 32770, 4, { NULL }, S_HERT_00 },        //1499
+/*S_TELP_00*/       { SPR_TELP, 32768, 3, { NULL }, S_TELP_01 },        //1500
+/*S_TELP_01*/       { SPR_TELP, 32769, 3, { NULL }, S_TELP_02 },        //1501
+/*S_TELP_02*/       { SPR_TELP, 32770, 3, { NULL }, S_TELP_03 },        //1502
+/*S_TELP_03*/       { SPR_TELP, 32771, 3, { NULL }, S_TELP_00 },        //1503
+/*S_MONI_00*/       { SPR_MONI, 0, -1, { NULL }, S_NULL },      //1504
+/*S_STEL_00*/       { SPR_STEL, 0, -1, { NULL }, S_NULL },      //1505
+/*S_STLA_00*/       { SPR_STLA, 0, -1, { NULL }, S_NULL },      //1506
+/*S_STLE_00*/       { SPR_STLE, 0, -1, { NULL }, S_NULL },      //1507
+/*S_HUGE_00*/       { SPR_HUGE, 0, 4, { NULL }, S_HUGE_01 },        //1508
+/*S_HUGE_01*/       { SPR_HUGE, 1, 5, { NULL }, S_HUGE_02 },        //1509
+/*S_HUGE_02*/       { SPR_HUGE, 2, 5, { NULL }, S_HUGE_03 },        //1510
+/*S_HUGE_03*/       { SPR_HUGE, 3, 5, { NULL }, S_HUGE_00 },        //1511
+/*S_STLG_00*/       { SPR_STLG, 0, -1, { NULL }, S_NULL },      //1512
+/*S_STLG_01*/       { SPR_STLG, 1, -1, { NULL }, S_NULL },      //1513
+/*S_STLG_02*/       { SPR_STLG, 2, -1, { NULL }, S_NULL },      //1514
+/*S_STLG_03*/       { SPR_STLG, 3, -1, { NULL }, S_NULL },      //1515
+/*S_STLG_04*/       { SPR_STLG, 4, -1, { NULL }, S_NULL },      //1516
+/*S_STLG_05*/       { SPR_STLG, 5, -1, { NULL }, S_NULL },      //1517
+};
+
+
+// villsa [STRIFE]
+mobjinfo_t mobjinfo[NUMMOBJTYPES] =
+{
+    {       /*MT_FIELDGUARD*/
+        25,     //doomednum
+        S_TOKN_00,      //spawnstate
+        10,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_XPRK_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        2*FRACUNIT,     //radius
+        1*FRACUNIT,     //height
+        10000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SHOOTABLE|MF_NOSECTOR|MF_NODIALOG,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PLAYER*/
+        -1,     //doomednum
+        S_PLAY_00,      //spawnstate
+        100,        //spawnhealth
+        S_PLAY_01,      //seestate
+        sfx_None,       //seesound
+        0,      //reactiontime
+        sfx_None,       //attacksound
+        S_PLAY_07,      //painstate
+        255,        //painchance
+        sfx_plpain,     //painsound
+        S_NULL,     //meleestate
+        S_PLAY_05,      //missilestate
+        S_NULL,     //crashstate
+        S_PLAY_09,      //deathstate
+        S_RGIB_00,      //xdeathstate
+        sfx_pldeth,     //deathsound
+        0,      //speed
+        18*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_NOTDMATCH|MF_ALLY,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SHOPKEEPER_W*/
+        116,        //doomednum
+        S_MRST_00,      //spawnstate
+        10000000,       //spawnhealth
+        S_MRPN_00,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_MRPN_00,      //painstate
+        150,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        5000,       //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH,      //flags
+        "Weapon_Smith",     //namepointer
+    },
+
+    {       /*MT_SHOPKEEPER_B*/
+        72,     //doomednum
+        S_MRST_00,      //spawnstate
+        10000000,       //spawnhealth
+        S_MRPN_00,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_MRPN_00,      //painstate
+        150,        //painchance
+        sfx_ambbar,     //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        5000,       //mass
+        0,      //damage
+        sfx_ambppl,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH|MF_COLORSWAP1|MF_COLORSWAP3,      //flags
+        "Bar_Keep",     //namepointer
+    },
+
+    {       /*MT_SHOPKEEPER_A*/
+        73,     //doomednum
+        S_MRST_00,      //spawnstate
+        10000000,       //spawnhealth
+        S_MRPN_00,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_MRPN_00,      //painstate
+        150,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        5000,       //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH|MF_COLORSWAP2|MF_COLORSWAP3,      //flags
+        "Armorer",      //namepointer
+    },
+
+    {       /*MT_SHOPKEEPER_M*/
+        74,     //doomednum
+        S_MRST_00,      //spawnstate
+        10000000,       //spawnhealth
+        S_MRPN_00,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_MRPN_00,      //painstate
+        150,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH|MF_COLORSWAP1|MF_COLORSWAP2
+        |MF_COLORSWAP3,     //flags
+        "Medic",        //namepointer
+    },
+
+    {       /*MT_PEASANT2_A*/
+        3004,       //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        4,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT2_B*/
+        130,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        5,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT2_C*/
+        131,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        5,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT5_A*/
+        65,     //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        7,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT5_B*/
+        132,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        7,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT5_C*/
+        133,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        7,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT4_A*/
+        66,     //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP2,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT4_B*/
+        134,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP2,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT4_C*/
+        135,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP2,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT6_A*/
+        67,     //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT6_B*/
+        136,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        7,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT6_C*/
+        137,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT3_A*/
+        172,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP3,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT3_B*/
+        173,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP3,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT3_C*/
+        174,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP3,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT8_A*/
+        175,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2
+        |MF_COLORSWAP3,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT8_B*/
+        176,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2
+        |MF_COLORSWAP3,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT8_C*/
+        177,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2
+        |MF_COLORSWAP3,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT7_A*/
+        178,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP3,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT7_B*/
+        179,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP3,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT7_C*/
+        180,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP3,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PEASANT1*/
+        181,        //doomednum
+        S_PEAS_00,      //spawnstate
+        31,     //spawnhealth
+        S_PEAS_01,      //seestate
+        sfx_rebact,     //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_PEAS_12,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_PEAS_09,      //meleestate
+        S_NULL,     //missilestate
+        S_PEAS_14,      //crashstate
+        S_PEAS_17,      //deathstate
+        S_GIBS_00,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
+        |MF_COLORSWAP2|MF_COLORSWAP3,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ZOMBIE*/
+        169,        //doomednum
+        S_PEAS_25,      //spawnstate
+        31,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_AGRD_00,      //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_GIBS_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_psdtha,     //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BECOMING*/
+        201,        //doomednum
+        S_ARMR_00,      //spawnstate
+        61,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_ARMR_01,      //painstate
+        255,        //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_GIBS_10,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_psdtha,     //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ZOMBIESPAWNER*/
+        170,        //doomednum
+        S_PLAY_19,      //spawnstate
+        20,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_telept,     //activesound
+        MF_SHOOTABLE|MF_NOSECTOR,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_HUGE_TANK_1*/
+        209,        //doomednum
+        S_TNK1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        192*FRACUNIT,       //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_HUGE_TANK_2*/
+        210,        //doomednum
+        S_TNK2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        192*FRACUNIT,       //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_HUGE_TANK_3*/
+        211,        //doomednum
+        S_TNK3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        192*FRACUNIT,       //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TANK_4*/
+        213,        //doomednum
+        S_TNK4_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TANK_5*/
+        214,        //doomednum
+        S_TNK5_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TANK_6*/
+        229,        //doomednum
+        S_TNK6_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        50000,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_KNEELING_GUY*/
+        204,        //doomednum
+        S_NEAL_00,      //spawnstate
+        51,     //spawnhealth
+        S_NEAL_00,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NEAL_02,      //painstate
+        255,        //painchance
+        sfx_static,     //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NEAL_05,      //crashstate
+        S_NEAL_07,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_static,     //deathsound
+        0,      //speed
+        6*FRACUNIT,     //radius
+        6*FRACUNIT,     //height
+        50000,      //mass
+        0,      //damage
+        sfx_chant,      //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BEGGAR1*/
+        141,        //doomednum
+        S_BEGR_00,      //spawnstate
+        20,     //spawnhealth
+        S_BEGR_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_BEGR_11,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_BEGR_07,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BEGR_13,      //deathstate
+        S_BEGR_22,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        3,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        "Beggar",       //namepointer
+    },
+
+    {       /*MT_BEGGAR2*/
+        155,        //doomednum
+        S_BEGR_00,      //spawnstate
+        20,     //spawnhealth
+        S_BEGR_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_BEGR_11,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_BEGR_07,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BEGR_13,      //deathstate
+        S_BEGR_22,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        3,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        "Beggar",       //namepointer
+    },
+
+    {       /*MT_BEGGAR3*/
+        156,        //doomednum
+        S_BEGR_00,      //spawnstate
+        20,     //spawnhealth
+        S_BEGR_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_BEGR_11,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_BEGR_07,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BEGR_13,      //deathstate
+        S_BEGR_22,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        3,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        "Beggar",       //namepointer
+    },
+
+    {       /*MT_BEGGAR4*/
+        157,        //doomednum
+        S_BEGR_00,      //spawnstate
+        20,     //spawnhealth
+        S_BEGR_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_BEGR_11,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_BEGR_07,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BEGR_13,      //deathstate
+        S_BEGR_22,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        3,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        "Beggar",       //namepointer
+    },
+
+    {       /*MT_BEGGAR5*/
+        158,        //doomednum
+        S_BEGR_00,      //spawnstate
+        20,     //spawnhealth
+        S_BEGR_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_meatht,     //attacksound
+        S_BEGR_11,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_BEGR_07,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BEGR_13,      //deathstate
+        S_BEGR_22,      //xdeathstate
+        sfx_psdtha,     //deathsound
+        3,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
+        "Beggar",       //namepointer
+    },
+
+    {       /*MT_REBEL1*/
+        9,      //doomednum
+        S_HMN1_00,      //spawnstate
+        60,     //spawnhealth
+        S_HMN1_11,      //seestate
+        sfx_wpnup,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HMN1_22,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_HMN1_19,      //missilestate
+        S_NULL,     //crashstate
+        S_HMN1_24,      //deathstate
+        S_RGIB_08,      //xdeathstate
+        sfx_rebdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
+        "Rebel",        //namepointer
+    },
+
+    {       /*MT_REBEL2*/
+        144,        //doomednum
+        S_HMN1_00,      //spawnstate
+        60,     //spawnhealth
+        S_HMN1_11,      //seestate
+        sfx_wpnup,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HMN1_22,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_HMN1_19,      //missilestate
+        S_NULL,     //crashstate
+        S_HMN1_24,      //deathstate
+        S_RGIB_08,      //xdeathstate
+        sfx_rebdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
+        "Rebel",        //namepointer
+    },
+
+    {       /*MT_REBEL3*/
+        145,        //doomednum
+        S_HMN1_00,      //spawnstate
+        60,     //spawnhealth
+        S_HMN1_11,      //seestate
+        sfx_wpnup,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HMN1_22,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_HMN1_19,      //missilestate
+        S_NULL,     //crashstate
+        S_HMN1_24,      //deathstate
+        S_RGIB_08,      //xdeathstate
+        sfx_rebdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
+        "Rebel",        //namepointer
+    },
+
+    {       /*MT_REBEL4*/
+        149,        //doomednum
+        S_HMN1_00,      //spawnstate
+        60,     //spawnhealth
+        S_HMN1_11,      //seestate
+        sfx_wpnup,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HMN1_22,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_HMN1_19,      //missilestate
+        S_NULL,     //crashstate
+        S_HMN1_24,      //deathstate
+        S_RGIB_08,      //xdeathstate
+        sfx_rebdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
+        "Rebel",        //namepointer
+    },
+
+    {       /*MT_REBEL5*/
+        150,        //doomednum
+        S_HMN1_00,      //spawnstate
+        60,     //spawnhealth
+        S_HMN1_11,      //seestate
+        sfx_wpnup,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HMN1_22,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_HMN1_19,      //missilestate
+        S_NULL,     //crashstate
+        S_HMN1_24,      //deathstate
+        S_RGIB_08,      //xdeathstate
+        sfx_rebdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
+        "Rebel",        //namepointer
+    },
+
+    {       /*MT_REBEL6*/
+        151,        //doomednum
+        S_HMN1_00,      //spawnstate
+        60,     //spawnhealth
+        S_HMN1_11,      //seestate
+        sfx_wpnup,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HMN1_22,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_HMN1_19,      //missilestate
+        S_NULL,     //crashstate
+        S_HMN1_24,      //deathstate
+        S_RGIB_08,      //xdeathstate
+        sfx_rebdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
+        "Rebel",        //namepointer
+    },
+
+    {       /*MT_RLEADER*/
+        64,     //doomednum
+        S_LEDR_00,      //spawnstate
+        95,     //spawnhealth
+        S_LEAD_04,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_LEAD_15,      //painstate
+        250,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_LEAD_12,      //missilestate
+        S_NULL,     //crashstate
+        S_LEAD_04,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOTDMATCH,     //flags
+        "MACIL",        //namepointer
+    },
+
+    {       /*MT_RLEADER2*/
+        200,        //doomednum
+        S_LEDR_00,      //spawnstate
+        95,     //spawnhealth
+        S_LEAD_04,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_LEAD_15,      //painstate
+        200,        //painchance
+        sfx_pespna,     //painsound
+        S_NULL,     //meleestate
+        S_LEAD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_LEAD_20,      //deathstate
+        S_LEAD_20,      //xdeathstate
+        sfx_slop,       //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_rebact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOTDMATCH|MF_SPECTRAL,     //flags
+        "MACIL",        //namepointer
+    },
+
+    {       /*MT_MISSILESMOKE*/
+        -1,     //doomednum
+        S_PUFY_04,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_rflite,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_REAVER*/
+        3001,       //doomednum
+        S_ROB1_00,      //spawnstate
+        150,        //spawnhealth
+        S_ROB1_02,      //seestate
+        sfx_revsee,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_ROB1_15,      //painstate
+        128,        //painchance
+        sfx_reavpn,     //painsound
+        S_ROB1_10,      //meleestate
+        S_ROB1_13,      //missilestate
+        S_NULL,     //crashstate
+        S_ROB1_17,      //deathstate
+        S_ROB1_26,      //xdeathstate
+        sfx_revdth,     //deathsound
+        12,     //speed
+        20*FRACUNIT,        //radius
+        60*FRACUNIT,        //height
+        500,        //mass
+        0,      //damage
+        sfx_revact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_GUARD1*/
+        3002,       //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac1,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,     //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD2*/
+        142,        //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac2,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1,       //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD3*/
+        143,        //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac3,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP2,       //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD4*/
+        146,        //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac1,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1|MF_COLORSWAP2,     //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD5*/
+        147,        //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac2,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP3,       //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD6*/
+        148,        //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac3,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1|MF_COLORSWAP3,     //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD7*/
+        232,        //doomednum
+        S_AGRD_01,      //spawnstate
+        60,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac3,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP2|MF_COLORSWAP3,     //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_GUARD8*/
+        231,        //doomednum
+        S_AGRD_01,      //spawnstate
+        60,     //spawnhealth
+        S_AGRD_13,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_23,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac3,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1|MF_COLORSWAP2
+        |MF_COLORSWAP3,     //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_SHADOWGUARD*/
+        58,     //doomednum
+        S_AGRD_01,      //spawnstate
+        70,     //spawnhealth
+        S_AGRD_12,      //seestate
+        sfx_agrsee,     //seesound
+        8,      //reactiontime
+        sfx_rifle,      //attacksound
+        S_AGRD_21,      //painstate
+        150,        //painchance
+        sfx_agrdpn,     //painsound
+        S_NULL,     //meleestate
+        S_AGRD_17,      //missilestate
+        S_NULL,     //crashstate
+        S_AGRD_24,      //deathstate
+        S_GIBS_10,      //xdeathstate
+        sfx_agrdth,     //deathsound
+        7,      //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_agrac2,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,     //flags
+        "ACOLYTE",      //namepointer
+    },
+
+    {       /*MT_PGUARD*/
+        3003,       //doomednum
+        S_PGRD_00,      //spawnstate
+        300,        //spawnhealth
+        S_PGRD_04,      //seestate
+        sfx_pgrsee,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_PGRD_16,      //painstate
+        100,        //painchance
+        sfx_pgrdpn,     //painsound
+        S_PGRD_12,      //meleestate
+        S_PGRD_14,      //missilestate
+        S_NULL,     //crashstate
+        S_PGRD_18,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_pgrdth,     //deathsound
+        8,      //speed
+        20*FRACUNIT,        //radius
+        60*FRACUNIT,        //height
+        500,        //mass
+        0,      //damage
+        sfx_pgract,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD|MF_COUNTKILL,      //flags
+        "TEMPLAR",      //namepointer
+    },
+
+    {       /*MT_CRUSADER*/
+        3005,       //doomednum
+        S_ROB2_00,      //spawnstate
+        400,        //spawnhealth
+        S_ROB2_01,      //seestate
+        sfx_rb2see,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_ROB2_19,      //painstate
+        128,        //painchance
+        sfx_rb2pn,      //painsound
+        S_NULL,     //meleestate
+        S_ROB2_09,      //missilestate
+        S_NULL,     //crashstate
+        S_ROB2_20,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_rb2dth,     //deathsound
+        8,      //speed
+        40*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        400,        //mass
+        0,      //damage
+        sfx_rb2act,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BISHOP*/
+        187,        //doomednum
+        S_MLDR_00,      //spawnstate
+        500,        //spawnhealth
+        S_MLDR_01,      //seestate
+        sfx_rb2see,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_MLDR_11,      //painstate
+        128,        //painchance
+        sfx_rb2pn,      //painsound
+        S_NULL,     //meleestate
+        S_MLDR_09,      //missilestate
+        S_NULL,     //crashstate
+        S_MLDR_12,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_pgrdth,     //deathsound
+        8,      //speed
+        40*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        500,        //mass
+        0,      //damage
+        sfx_rb2act,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL
+        |MF_NOTDMATCH,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ORACLE*/
+        199,        //doomednum
+        S_ORCL_00,      //spawnstate
+        1,      //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ORCL_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        15*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD|MF_COUNTKILL|MF_NOTDMATCH,      //flags
+        "ORACLE",       //namepointer
+    },
+
+    {       /*MT_PRIEST*/
+        12,     //doomednum
+        S_PRST_00,      //spawnstate
+        800,        //spawnhealth
+        S_PRST_02,      //seestate
+        sfx_lorsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_lorpn,      //painsound
+        S_PRST_10,      //meleestate
+        S_PRST_13,      //missilestate
+        S_NULL,     //crashstate
+        S_PDED_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_slop,       //deathsound
+        10,     //speed
+        15*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_tend,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST|MF_FLOAT
+        |MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL|MF_NOTDMATCH,       //flags
+        "PRIEST",       //namepointer
+    },
+
+    {       /*MT_SPECTRE_A*/
+        129,        //doomednum
+        S_ALN1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_ALN1_02,      //seestate
+        sfx_alnsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_ALN1_19,      //painstate
+        250,        //painchance
+        sfx_alnpn,      //painsound
+        S_ALN1_13,      //meleestate
+        S_ALN1_16,      //missilestate
+        S_NULL,     //crashstate
+        S_AL1P_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_alndth,     //deathsound
+        12,     //speed
+        64*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_NODE*/
+        -1,     //doomednum
+        S_NODE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOTDMATCH,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SPECTREHEAD*/
+        -1,     //doomednum
+        S_MTHD_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOTDMATCH,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SPECTRE_B*/
+        75,     //doomednum
+        S_ALN1_00,      //spawnstate
+        1200,       //spawnhealth
+        S_ALN1_02,      //seestate
+        sfx_alnsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_ALN1_19,      //painstate
+        50,     //painchance
+        sfx_alnpn,      //painsound
+        S_ALN1_13,      //meleestate
+        S_ALN1_20,      //missilestate
+        S_NULL,     //crashstate
+        S_AL1P_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_alndth,     //deathsound
+        12,     //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SPECTRE_C*/
+        76,     //doomednum
+        S_ALN1_23,      //spawnstate
+        1500,       //spawnhealth
+        S_ALN1_34,      //seestate
+        sfx_alnsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_ALN1_51,      //painstate
+        50,     //painchance
+        sfx_alnpn,      //painsound
+        S_ALN1_45,      //meleestate
+        S_ALN1_48,      //missilestate
+        S_NULL,     //crashstate
+        S_AL1P_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_alndth,     //deathsound
+        12,     //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SPECTRE_D*/
+        167,        //doomednum
+        S_ALN1_00,      //spawnstate
+        1700,       //spawnhealth
+        S_ALN1_02,      //seestate
+        sfx_alnsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_ALN1_19,      //painstate
+        50,     //painchance
+        sfx_alnpn,      //painsound
+        S_ALN1_13,      //meleestate
+        S_ALN1_52,      //missilestate
+        S_NULL,     //crashstate
+        S_AL1P_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_alndth,     //deathsound
+        12,     //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SPECTRE_E*/
+        168,        //doomednum
+        S_ALN1_00,      //spawnstate
+        2000,       //spawnhealth
+        S_ALN1_02,      //seestate
+        sfx_alnsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_ALN1_19,      //painstate
+        50,     //painchance
+        sfx_alnpn,      //painsound
+        S_ALN1_13,      //meleestate
+        S_ALN1_55,      //missilestate
+        S_NULL,     //crashstate
+        S_AL1P_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_alndth,     //deathsound
+        12,     //speed
+        24*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ENTITY*/
+        128,        //doomednum
+        S_MNAM_00,      //spawnstate
+        2500,       //spawnhealth
+        S_MNAL_02,      //seestate
+        sfx_mnalse,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_MNAL_19,      //painstate
+        255,        //painchance
+        sfx_alnpn,      //painsound
+        S_MNAL_13,      //meleestate
+        S_MNAL_16,      //missilestate
+        S_NULL,     //crashstate
+        S_MNAL_20,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_mnaldt,     //deathsound
+        13,     //speed
+        130*FRACUNIT,       //radius
+        200*FRACUNIT,       //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SUBENTITY*/
+        -1,     //doomednum
+        S_MNAL_27,      //spawnstate
+        990,        //spawnhealth
+        S_MNAL_28,      //seestate
+        sfx_alnsee,     //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_MNAL_40,      //painstate
+        255,        //painchance
+        sfx_alnpn,      //painsound
+        S_MNAL_34,      //meleestate
+        S_MNAL_37,      //missilestate
+        S_NULL,     //crashstate
+        S_MDTH_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_alndth,     //deathsound
+        14,     //speed
+        130*FRACUNIT,       //radius
+        200*FRACUNIT,       //height
+        1000,       //mass
+        0,      //damage
+        sfx_alnact,     //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
+        |MF_MVIS|MF_SPECTRAL,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_NEST*/
+        26,     //doomednum
+        S_NEST_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        84*FRACUNIT,        //radius
+        47*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_NOTDMATCH,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_POD*/
+        198,        //doomednum
+        S_PODD_00,      //spawnstate
+        1000,       //spawnhealth
+        S_PODD_01,      //seestate
+        sfx_slop,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        25*FRACUNIT,        //radius
+        91*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_NOTDMATCH,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_B_SHOT*/
+        -1,     //doomednum
+        S_ZAP6_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        30*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        70,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_SB_SHOT*/
+        -1,     //doomednum
+        S_ZAP6_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        30*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        20,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_C_SHOT*/
+        -1,     //doomednum
+        S_ZOT3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        30*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        70,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_SC_SHOT*/
+        -1,     //doomednum
+        S_ZOT3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        30*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        20,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_E_OFFSHOOT*/
+        -1,     //doomednum
+        S_ZAP6_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        30*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        10,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_TRAIL*/
+        -1,     //doomednum
+        S_ZAP6_03,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_E_SHOT*/
+        -1,     //doomednum
+        S_ZAP7_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_02,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        18*FRACUNIT,        //speed
+        20*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        130,        //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_SE_SHOT*/
+        -1,     //doomednum
+        S_ZAP7_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_02,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        18*FRACUNIT,        //speed
+        20*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        30,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_A_ZAP_LEFT*/
+        -1,     //doomednum
+        S_ZOT1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_06,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        22*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        24*FRACUNIT,        //height
+        100,        //mass
+        100,        //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_A_ZAP_RIGHT*/
+        -1,     //doomednum
+        S_ZOT1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_06,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        22*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        24*FRACUNIT,        //height
+        100,        //mass
+        50,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_A_GROUND*/
+        -1,     //doomednum
+        S_ZAP5_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        70,     //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        18*FRACUNIT,        //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_SHADOW,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_D_SHOT*/
+        -1,     //doomednum
+        S_ZOT2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        28*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        120,        //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SIGIL_SD_SHOT*/
+        -1,     //doomednum
+        S_ZOT2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_sigil,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sglhit,     //deathsound
+        28*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        60,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SENTINEL*/
+        3006,       //doomednum
+        S_SEWR_00,      //spawnstate
+        100,        //spawnhealth
+        S_SEWR_01,      //seestate
+        sfx_sntsee,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_SEWR_06,      //painstate
+        255,        //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_SEWR_03,      //missilestate
+        S_NULL,     //crashstate
+        S_SEWR_07,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_sntdth,     //deathsound
+        7,      //speed
+        23*FRACUNIT,        //radius
+        53*FRACUNIT,        //height
+        300,        //mass
+        0,      //damage
+        sfx_sntact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_SPAWNCEILING|MF_NOGRAVITY|MF_GIVEQUEST
+        |MF_FLOAT|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_STALKER*/
+        186,        //doomednum
+        S_SPID_00,      //spawnstate
+        80,     //spawnhealth
+        S_SPID_03,      //seestate
+        sfx_spisit,     //seesound
+        8,      //reactiontime
+        sfx_spdatk,     //attacksound
+        S_SPID_24,      //painstate
+        40,     //painchance
+        sfx_spdatk,     //painsound
+        S_SPID_09,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_SPID_25,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_spidth,     //deathsound
+        16,     //speed
+        31*FRACUNIT,        //radius
+        25*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_spisit,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_SPAWNCEILING|MF_NOGRAVITY|MF_DROPOFF
+        |MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_INQUISITOR*/
+        16,     //doomednum
+        S_ROB3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_ROB3_02,      //seestate
+        sfx_inqsee,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_ROB3_10,      //missilestate
+        S_NULL,     //crashstate
+        S_ROB3_20,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_inqdth,     //deathsound
+        12,     //speed
+        40*FRACUNIT,        //radius
+        110*FRACUNIT,       //height
+        1000,       //mass
+        0,      //damage
+        sfx_inqact,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_NOBLOOD|MF_COUNTKILL,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_INQARM*/
+        -1,     //doomednum
+        S_RBB3_05,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        25,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOBLOOD,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PROGRAMMER*/
+        71,     //doomednum
+        S_PRGR_00,      //spawnstate
+        1100,       //spawnhealth
+        S_PRGR_02,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_revbld,     //attacksound
+        S_PRGR_18,      //painstate
+        50,     //painchance
+        sfx_prgpn,      //painsound
+        S_PRGR_10,      //meleestate
+        S_PRGR_14,      //missilestate
+        S_NULL,     //crashstate
+        S_PRGR_20,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_rb2dth,     //deathsound
+        26,     //speed
+        45*FRACUNIT,        //radius
+        60*FRACUNIT,        //height
+        800,        //mass
+        4,      //damage
+        sfx_progac,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST|MF_FLOAT
+        |MF_NOBLOOD|MF_COUNTKILL|MF_NOTDMATCH,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PROGRAMMERBASE*/
+        -1,     //doomednum
+        S_BASE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOBLOOD,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_HOOKSHOT*/
+        -1,     //doomednum
+        S_OCLW_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_chain,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_CCLW_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        20*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        14*FRACUNIT,        //height
+        100,        //mass
+        2,      //damage
+        sfx_swish,      //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CHAINSHOT*/
+        -1,     //doomednum
+        S_TEND_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_tend,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MINIMISSLE*/
+        -1,     //doomednum
+        S_MICR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_rlaunc,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_MISL_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_mislht,     //deathsound
+        20*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        14*FRACUNIT,        //height
+        100,        //mass
+        10,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_C_MISSILE*/
+        -1,     //doomednum
+        S_MICR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_rlaunc,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_MISL_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_mislht,     //deathsound
+        20*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        14*FRACUNIT,        //height
+        100,        //mass
+        7,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SEEKMISSILE*/
+        -1,     //doomednum
+        S_MISS_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_rlaunc,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_MISL_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_mislht,     //deathsound
+        20*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        14*FRACUNIT,        //height
+        100,        //mass
+        10,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ELECARROW*/
+        -1,     //doomednum
+        S_AROW_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_swish,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_ZAP1_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_firxpl,     //deathsound
+        30*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        10*FRACUNIT,        //height
+        100,        //mass
+        10,     //damage
+        sfx_swish,      //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_POISARROW*/
+        -1,     //doomednum
+        S_ARWP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_swish,      //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_AROW_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        30*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        10*FRACUNIT,        //height
+        100,        //mass
+        500,        //damage
+        sfx_swish,      //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_R_LASER*/
+        -1,     //doomednum
+        S_SHT1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_POW1_09,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        40*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        8*FRACUNIT,     //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_L_LASER*/
+        -1,     //doomednum
+        S_SHT1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_plasma,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_POW1_05,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        40*FRACUNIT,        //speed
+        10*FRACUNIT,        //radius
+        8*FRACUNIT,     //height
+        100,        //mass
+        1,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_HEGRENADE*/
+        -1,     //doomednum
+        S_GRAP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_phoot,      //seesound
+        30,     //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BNG4_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        15*FRACUNIT,        //speed
+        13*FRACUNIT,        //radius
+        13*FRACUNIT,        //height
+        20,     //mass
+        1,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PGRENADE*/
+        -1,     //doomednum
+        S_GRIN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_phoot,      //seesound
+        40,     //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BNG3_08,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        15*FRACUNIT,        //speed
+        13*FRACUNIT,        //radius
+        13*FRACUNIT,        //height
+        20,     //mass
+        1,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_INQGRENADE*/
+        -1,     //doomednum
+        S_UBAM_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_phoot,      //seesound
+        15,     //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BNG2_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        25*FRACUNIT,        //speed
+        13*FRACUNIT,        //radius
+        13*FRACUNIT,        //height
+        15,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PFLAME*/
+        -1,     //doomednum
+        S_BNG3_09,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        120,        //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_FLBE_07,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TORPEDO*/
+        -1,     //doomednum
+        S_TORP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_protfl,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_THIT_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        20*FRACUNIT,        //speed
+        13*FRACUNIT,        //radius
+        8*FRACUNIT,     //height
+        100,        //mass
+        1,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TORPEDOSPREAD*/
+        -1,     //doomednum
+        S_TWAV_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_TWAV_02,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        35*FRACUNIT,        //speed
+        13*FRACUNIT,        //radius
+        13*FRACUNIT,        //height
+        100,        //mass
+        10,     //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SFIREBALL*/
+        -1,     //doomednum
+        S_FRBL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_flburn,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_FRBL_03,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        15*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        11*FRACUNIT,        //height
+        10,     //mass
+        4,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_C_FLAME*/
+        -1,     //doomednum
+        S_FRBL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_flburn,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_FRBL_03,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        35*FRACUNIT,        //speed
+        8*FRACUNIT,     //radius
+        11*FRACUNIT,        //height
+        50,     //mass
+        1,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_STRIFEPUFF3*/
+        -1,     //doomednum
+        S_SHT2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_STRIFEPUFF*/
+        -1,     //doomednum
+        S_PUFY_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SPARKPUFF*/
+        -1,     //doomednum
+        S_POW3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BLOOD_DEATH*/
+        -1,     //doomednum
+        S_SPRY_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TFOG*/
+        -1,     //doomednum
+        S_TFOG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_IFOG*/
+        -1,     //doomednum
+        S_IFOG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TELEPORTMAN*/
+        14,     //doomednum
+        S_NULL,     //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOSECTOR|MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_01*/
+        24,     //doomednum
+        S_KLAX_00,      //spawnstate
+        1000,       //spawnhealth
+        S_KLAX_01,      //seestate
+        sfx_None,       //seesound
+        60,     //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_STAND|MF_SPAWNCEILING|MF_NOGRAVITY,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TURRET*/
+        27,     //doomednum
+        S_TURT_00,      //spawnstate
+        125,        //spawnhealth
+        S_TURT_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_TURT_02,      //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_TURT_02,      //missilestate
+        S_NULL,     //crashstate
+        S_BALL_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_mislht,     //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        10000000,       //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SHOOTABLE|MF_STAND|MF_SPAWNCEILING|MF_NOGRAVITY|MF_NOBLOOD
+        |MF_COUNTKILL,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_GATE*/
+        45,     //doomednum
+        S_PSTN_00,      //spawnstate
+        100,        //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_PSTN_02,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        16,     //speed
+        20*FRACUNIT,        //radius
+        76*FRACUNIT,        //height
+        10000000,       //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_GIVEQUEST|MF_NODIALOG|MF_NOBLOOD,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_COMPUTER*/
+        182,        //doomednum
+        S_SECR_00,      //spawnstate
+        80,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_SECR_04,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        27,     //speed
+        26*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100000,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_GIVEQUEST|MF_NODIALOG|MF_NOBLOOD,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_INV_MED1*/
+        2011,       //doomednum
+        S_STMP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        20,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Med_patch",     //namepointer
+    },
+
+    {       /*MT_INV_MED2*/
+        2012,       //doomednum
+        S_MDKT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        15,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Medical_kit",      //namepointer
+    },
+
+    {       /*MT_INV_MED3*/
+        83,     //doomednum
+        S_FULL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        5,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Surgery_Kit",      //namepointer
+    },
+
+    {       /*MT_DEGNINORE*/
+        59,     //doomednum
+        S_XPRK_01,      //spawnstate
+        10,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_XPRK_02,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        10,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,        //flags
+        "Degnin_Ore",       //namepointer
+    },
+
+    {       /*MT_INV_ARMOR2*/
+        2019,       //doomednum
+        S_ARM1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        3,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Metal_Armor",      //namepointer
+    },
+
+    {       /*MT_INV_ARMOR1*/
+        2018,       //doomednum
+        S_ARM2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        5,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Leather_Armor",        //namepointer
+    },
+
+    {       /*MT_MISC_22*/
+        2014,       //doomednum
+        S_WATR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_11*/
+        164,        //doomednum
+        S_MUGG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_KEY_BASE*/
+        230,        //doomednum
+        S_FUSL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Base_Key",     //namepointer
+    },
+
+    {       /*MT_GOVSKEY*/
+        -1,     //doomednum
+        S_REBL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Govs_Key",     //namepointer
+    },
+
+    {       /*MT_KEY_TRAVEL*/
+        185,        //doomednum
+        S_TPAS_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Passcard",     //namepointer
+    },
+
+    {       /*MT_KEY_ID_BLUE*/
+        184,        //doomednum
+        S_CRD1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "ID_Badge",     //namepointer
+    },
+
+    {       /*MT_PRISONKEY*/
+        -1,     //doomednum
+        S_PRIS_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        11,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
+        "Prison_Key",       //namepointer
+    },
+
+    {       /*MT_KEY_HAND*/
+        91,     //doomednum
+        S_HAND_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        12,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
+        "Severed_Hand",     //namepointer
+    },
+
+    {       /*MT_POWER1KEY*/
+        -1,     //doomednum
+        S_PWR1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Power1_Key",       //namepointer
+    },
+
+    {       /*MT_POWER2KEY*/
+        -1,     //doomednum
+        S_PWR2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Power2_Key",       //namepointer
+    },
+
+    {       /*MT_POWER3KEY*/
+        -1,     //doomednum
+        S_PWR3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Power3_Key",       //namepointer
+    },
+
+    {       /*MT_KEY_GOLD*/
+        40,     //doomednum
+        S_KY1G_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Gold_Key",     //namepointer
+    },
+
+    {       /*MT_KEY_ID_GOLD*/
+        13,     //doomednum
+        S_CRD2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "ID_Card",      //namepointer
+    },
+
+    {       /*MT_KEY_SILVER*/
+        38,     //doomednum
+        S_KY2S_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Silver_Key",       //namepointer
+    },
+
+    {       /*MT_KEY_ORACLE*/
+        61,     //doomednum
+        S_ORAC_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Oracle_Key",       //namepointer
+    },
+
+    {       /*MT_MILITARYID*/
+        -1,     //doomednum
+        S_GYID_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Military_ID",      //namepointer
+    },
+
+    {       /*MT_KEY_ORDER*/
+        86,     //doomednum
+        S_FUBR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Order_Key",        //namepointer
+    },
+
+    {       /*MT_KEY_WAREHOUSE*/
+        166,        //doomednum
+        S_WARE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Warehouse_Key",        //namepointer
+    },
+
+    {       /*MT_KEY_BRASS*/
+        39,     //doomednum
+        S_KY3B_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Brass_Key",        //namepointer
+    },
+
+    {       /*MT_KEY_RED_CRYSTAL*/
+        192,        //doomednum
+        S_RCRY_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Red_Crystal_Key",      //namepointer
+    },
+
+    {       /*MT_KEY_BLUE_CRYSTAL*/
+        193,        //doomednum
+        S_BCRY_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Blue_Crystal_Key",     //namepointer
+    },
+
+    {       /*MT_KEY_CHAPEL*/
+        195,        //doomednum
+        S_CHAP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Chapel_Key",       //namepointer
+    },
+
+    {       /*MT_CATACOMBKEY*/
+        -1,     //doomednum
+        S_TUNL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        28,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
+        "Catacomb_Key",     //namepointer
+    },
+
+    {       /*MT_SECURITYKEY*/
+        -1,     //doomednum
+        S_SECK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Security_Key",     //namepointer
+    },
+
+    {       /*MT_KEY_CORE*/
+        236,        //doomednum
+        S_GOID_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Core_Key",     //namepointer
+    },
+
+    {       /*MT_KEY_MAULER*/
+        233,        //doomednum
+        S_BLTK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Mauler_Key",       //namepointer
+    },
+
+    {       /*MT_KEY_FACTORY*/
+        234,        //doomednum
+        S_PROC_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Factory_Key",      //namepointer
+    },
+
+    {       /*MT_KEY_MINE*/
+        235,        //doomednum
+        S_MINE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "MINE_KEY",     //namepointer
+    },
+
+    {       /*MT_NEWKEY5*/
+        -1,     //doomednum
+        S_BLTK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "New_Key5",     //namepointer
+    },
+
+    {       /*MT_INV_SHADOWARMOR*/
+        2024,       //doomednum
+        S_SHD1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        2,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Shadow_armor",     //namepointer
+    },
+
+    {       /*MT_INV_SUIT*/
+        2025,       //doomednum
+        S_MASK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        5,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Environmental_Suit",       //namepointer
+    },
+
+    {       /*MT_QUEST_UNIFORM*/
+        90,     //doomednum
+        S_UNIF_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        15,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST,        //flags
+        "Guard_Uniform",        //namepointer
+    },
+
+    {       /*MT_QUEST_GUARD_UNIFORM*/
+        52,     //doomednum
+        S_OFIC_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Officer's_Uniform",        //namepointer
+    },
+
+    {       /*MT_INV_SUPERMAP*/
+        2026,       //doomednum
+        S_PMAP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "map",      //namepointer
+    },
+
+    {       /*MT_INV_RADAR*/
+        2027,       //doomednum
+        S_PMUP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        1,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "scanner",      //namepointer
+    },
+
+    {       /*MT_BEACON*/
+        10,     //doomednum
+        S_BEAC_00,      //spawnstate
+        5,      //spawnhealth
+        S_BEAC_01,      //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        3,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_DROPPED,      //flags
+        "Teleporter_Beacon",        //namepointer
+    },
+
+    {       /*MT_INV_TARGETER*/
+        207,        //doomednum
+        S_TARG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        5,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Targeter",     //namepointer
+    },
+
+    {       /*MT_MONY_1*/
+        93,     //doomednum
+        S_COIN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        2147483647,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
+        "coin",     //namepointer
+    },
+
+    {       /*MT_MONY_10*/
+        138,        //doomednum
+        S_CRED_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
+        "10_gold",       //namepointer
+    },
+
+    {       /*MT_MONY_25*/
+        139,        //doomednum
+        S_SACK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
+        "25_gold",       //namepointer
+    },
+
+    {       /*MT_MONY_50*/
+        140,        //doomednum
+        S_CHST_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
+        "50_gold",       //namepointer
+    },
+
+    {       /*MT_MONY_300*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        3,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_DROPPED,     //flags
+        "300_gold",      //namepointer
+    },
+
+    {       /*MT_TOKEN_RING*/
+        -1,     //doomednum
+        S_RING_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        1,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
+        "ring",     //namepointer
+    },
+
+    {       /*MT_INV_CHALICE*/
+        205,        //doomednum
+        S_RELC_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        2,      //speed
+        10*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_DROPPED,     //flags
+        "Offering_Chalice",      //namepointer
+    },
+
+    {       /*MT_TOKEN_EAR*/
+        -1,     //doomednum
+        S_EARS_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        9,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST,        //flags
+        "ear",      //namepointer
+    },
+
+    {       /*MT_INV_COMMUNICATOR*/
+        206,        //doomednum
+        S_COMM_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_NOTDMATCH,     //flags
+        "Communicator",        //namepointer
+    },
+
+    {       /*MT_AGREN*/
+        152,        //doomednum
+        S_GRN1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "HE-Grenade_Rounds",        //namepointer
+    },
+
+    {       /*MT_APGREN*/
+        153,        //doomednum
+        S_GRN2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Phosphorus-Grenade_Rounds",     //namepointer
+    },
+
+    {       /*MT_ACLIP*/
+        2007,       //doomednum
+        S_BLIT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "clip_of_bullets",      //namepointer
+    },
+
+    {       /*MT_AAMMOBOX*/
+        2048,       //doomednum
+        S_BBOX_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "ammo",       //namepointer
+    },
+
+    {       /*MT_AMINI*/
+        2010,       //doomednum
+        S_MSSL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "mini_missiles",        //namepointer
+    },
+
+    {       /*MT_AMINIBOX*/
+        2046,       //doomednum
+        S_ROKT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "crate_of_missiles",        //namepointer
+    },
+
+    {       /*MT_ACELL*/
+        2047,       //doomednum
+        S_BRY1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "energy_pod",       //namepointer
+    },
+
+    {       /*MT_APCELL*/
+        17,     //doomednum
+        S_CPAC_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "energy_pack",      //namepointer
+    },
+
+    {       /*MT_APAROW*/
+        115,        //doomednum
+        S_PQRL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "poison_bolts",     //namepointer
+    },
+
+    {       /*MT_AAROW*/
+        114,        //doomednum
+        S_XQRL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "electric_bolts",       //namepointer
+    },
+
+    {       /*MT_INV_SATCHEL*/
+        183,        //doomednum
+        S_BKPK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "ammo_satchel",     //namepointer
+    },
+
+    {       /*MT_PULSE*/
+        2002,       //doomednum
+        S_RIFL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "assault_gun",      //namepointer
+    },
+
+    {       /*MT_RIFLESTAND*/
+        2006,       //doomednum
+        S_RIFL_01,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "assault_gun",      //namepointer
+    },
+
+    {       /*MT_FLAMETHROWER*/
+        2005,       //doomednum
+        S_FLAM_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "flame_thrower",        //namepointer
+    },
+
+    {       /*MT_TOKEN_FLAME_THROWER_PARTS*/
+        -1,     //doomednum
+        S_BFLM_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "flame_thrower_parts",      //namepointer
+    },
+
+    {       /*MT_MISSILELAUNCHER*/
+        2003,       //doomednum
+        S_MMSL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "mini_missile_launcher",        //namepointer
+    },
+
+    {       /*MT_BLASTER*/
+        2004,       //doomednum
+        S_TRPD_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "mauler",       //namepointer
+    },
+
+    {       /*MT_CROSSBOW*/
+        2001,       //doomednum
+        S_CBOW_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "crossbow",     //namepointer
+    },
+
+    {       /*MT_GRENADELAUNCHER*/
+        154,        //doomednum
+        S_GRND_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Grenade_launcher",     //namepointer
+    },
+
+    {       /*MT_SIGIL_A*/
+        77,     //doomednum
+        S_SIGL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "SIGIL",        //namepointer
+    },
+
+    {       /*MT_SIGIL_B*/
+        78,     //doomednum
+        S_SIGL_01,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "SIGIL",        //namepointer
+    },
+
+    {       /*MT_SIGIL_C*/
+        79,     //doomednum
+        S_SIGL_02,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "SIGIL",        //namepointer
+    },
+
+    {       /*MT_SIGIL_D*/
+        80,     //doomednum
+        S_SIGL_03,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "SIGIL",        //namepointer
+    },
+
+    {       /*MT_SIGIL_E*/
+        81,     //doomednum
+        S_SIGL_04,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "SIGIL",        //namepointer
+    },
+
+    {       /*MT_POWER_CRYSTAL*/
+        92,     //doomednum
+        S_CRYS_00,      //spawnstate
+        50,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BOOM_00,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_explod,     //deathsound
+        14,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        99999999,       //mass
+        0,      //damage
+        sfx_reactr,     //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST|MF_NOBLOOD,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RAT*/
+        85,     //doomednum
+        S_RATT_00,      //spawnstate
+        5,      //spawnhealth
+        S_RATT_01,      //seestate
+        sfx_ratact,     //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_RATT_05,      //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_MEAT_16,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_ratact,     //deathsound
+        13,     //speed
+        10*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_ratact,     //activesound
+        MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,        //flags
+        "rat_buddy",        //namepointer
+    },
+
+    {       /*MT_MISC_05*/
+        82,     //doomednum
+        S_BARW_00,      //spawnstate
+        10,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BARW_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_wbrldt,     //deathsound
+        0,      //speed
+        10*FRACUNIT,        //radius
+        32*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_06*/
+        94,     //doomednum
+        S_BART_00,      //spawnstate
+        30,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_BART_01,      //deathstate
+        S_NULL,     //xdeathstate
+        sfx_barexp,     //deathsound
+        0,      //speed
+        10*FRACUNIT,        //radius
+        32*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_15*/
+        208,        //doomednum
+        S_HOGN_00,      //spawnstate
+        99999999,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_HOGN_01,      //painstate
+        255,        //painchance
+        sfx_mtalht,     //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        10*FRACUNIT,        //radius
+        72*FRACUNIT,        //height
+        9999999,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT14*/
+        95,     //doomednum
+        S_LITS_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        4*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT13*/
+        96,     //doomednum
+        S_LITB_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        4*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT12*/
+        97,     //doomednum
+        S_LITG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        4*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT18*/
+        2028,       //doomednum
+        S_LITE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR2*/
+        48,     //doomednum
+        S_MONI_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR3*/
+        54,     //doomednum
+        S_STEL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR4*/
+        55,     //doomednum
+        S_STLA_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        80*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR5*/
+        56,     //doomednum
+        S_STLE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR6*/
+        57,     //doomednum
+        S_HUGE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        24*FRACUNIT,        //radius
+        192*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR7*/
+        227,        //doomednum
+        S_APOW_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        24*FRACUNIT,        //radius
+        192*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_amaln2,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE2*/
+        98,     //doomednum
+        S_STLG_02,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        54*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE3*/
+        161,        //doomednum
+        S_STLG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE4*/
+        160,        //doomednum
+        S_STLG_01,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE6*/
+        159,        //doomednum
+        S_STLG_03,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE7*/
+        162,        //doomednum
+        S_STLG_04,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE5*/
+        163,        //doomednum
+        S_STLG_05,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        25*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT2*/
+        34,     //doomednum
+        S_CNDL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT3*/
+        35,     //doomednum
+        S_CLBR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_03*/
+        103,        //doomednum
+        S_DRIP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_wdrip,      //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_13*/
+        104,        //doomednum
+        S_SPLH_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_wfall,      //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_02*/
+        53,     //doomednum
+        S_CDRP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        1*FRACUNIT,     //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_SPAWNCEILING|MF_NOGRAVITY,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_07*/
+        112,        //doomednum
+        S_WTFT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_wsplsh,     //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BIO2*/
+        113,        //doomednum
+        S_HERT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TELEPORTSTAND*/
+        23,     //doomednum
+        S_TELP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_SHADOW,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_DEADTHING1*/
+        22,     //doomednum
+        S_ROB2_28,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_DEADTHING2*/
+        15,     //doomednum
+        S_PLAY_18,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_DEADTHING3*/
+        18,     //doomednum
+        S_PEAS_24,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_DEADTHING4*/
+        21,     //doomednum
+        S_AGRD_31,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_DEADTHING5*/
+        20,     //doomednum
+        S_ROB1_25,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_DEADTHING6*/
+        19,     //doomednum
+        S_HMN1_31,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BIO1*/
+        212,        //doomednum
+        S_SACR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_GIBS*/
+        54,     //doomednum
+        S_DEAD_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_04*/
+        70,     //doomednum
+        S_BARL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        48*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT11*/
+        105,        //doomednum
+        S_BOWL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_smfire,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT10*/
+        106,        //doomednum
+        S_BRAZ_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        10*FRACUNIT,        //radius
+        32*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_smfire,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT9*/
+        107,        //doomednum
+        S_TRCH_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        0*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_smfire,     //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT8*/
+        108,        //doomednum
+        S_TRHO_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        0*FRACUNIT,     //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_14*/
+        109,        //doomednum
+        S_CHAN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        93*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_SPAWNCEILING|MF_NOGRAVITY,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT1*/
+        28,     //doomednum
+        S_CAGE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        3*FRACUNIT,     //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_SPAWNCEILING|MF_NOGRAVITY,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR8*/
+        110,        //doomednum
+        S_STAT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR9*/
+        44,     //doomednum
+        S_DSTA_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT15*/
+        111,        //doomednum
+        S_LTRH_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        4*FRACUNIT,     //radius
+        72*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT4*/
+        43,     //doomednum
+        S_LAMP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        3*FRACUNIT,     //radius
+        80*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT5*/
+        46,     //doomednum
+        S_LANT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        3*FRACUNIT,     //radius
+        80*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ROCK1*/
+        99,     //doomednum
+        S_ROK1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ROCK2*/
+        100,        //doomednum
+        S_ROK2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ROCK3*/
+        101,        //doomednum
+        S_ROK3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_ROCK4*/
+        102,        //doomednum
+        S_ROK4_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE7*/
+        215,        //doomednum
+        S_LOGG_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_wriver,     //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE1*/
+        29,     //doomednum
+        S_RUB1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE2*/
+        30,     //doomednum
+        S_RUB2_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE3*/
+        31,     //doomednum
+        S_RUB3_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE4*/
+        32,     //doomednum
+        S_RUB4_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE5*/
+        36,     //doomednum
+        S_RUB5_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE6*/
+        37,     //doomednum
+        S_RUB6_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE7*/
+        41,     //doomednum
+        S_RUB7_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_RUBBLE8*/
+        42,     //doomednum
+        S_RUB8_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_08*/
+        117,        //doomednum
+        S_CRAB_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT6*/
+        47,     //doomednum
+        S_LMPC_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        10*FRACUNIT,        //radius
+        72*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_smfire,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT7*/
+        50,     //doomednum
+        S_LOGS_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        10*FRACUNIT,        //radius
+        80*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_smfire,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE2*/
+        51,     //doomednum
+        S_TREE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        15*FRACUNIT,        //radius
+        109*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE3*/
+        202,        //doomednum
+        S_TREE_01,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        15*FRACUNIT,        //radius
+        109*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE4*/
+        203,        //doomednum
+        S_TREE_02,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        15*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE1*/
+        33,     //doomednum
+        S_TRE1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        15*FRACUNIT,        //radius
+        80*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE6*/
+        60,     //doomednum
+        S_BUSH_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        15*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TREE5*/
+        62,     //doomednum
+        S_SHRB_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_CAVE1*/
+        63,     //doomednum
+        S_STAK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR1*/
+        69,     //doomednum
+        S_BAR1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_10*/
+        165,        //doomednum
+        S_VASE_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        12*FRACUNIT,        //radius
+        24*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_09*/
+        188,        //doomednum
+        S_VASE_01,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        12*FRACUNIT,        //radius
+        32*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_17*/
+        189,        //doomednum
+        S_STOL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        6*FRACUNIT,     //radius
+        24*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_18*/
+        190,        //doomednum
+        S_POT1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_19*/
+        191,        //doomednum
+        S_TUB1_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_20*/
+        194,        //doomednum
+        S_ANVL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        32*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT16*/
+        196,        //doomednum
+        S_TLMP_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        11*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT17*/
+        197,        //doomednum
+        S_TLMP_01,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        8*FRACUNIT,     //radius
+        64*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_21*/
+        68,     //doomednum
+        S_TRAY_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        24*FRACUNIT,        //radius
+        40*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_12*/
+        228,        //doomednum
+        S_AFED_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        12*FRACUNIT,        //radius
+        24*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_26*/
+        216,        //doomednum
+        S_SBAN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        24*FRACUNIT,        //radius
+        96*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_23*/
+        217,        //doomednum
+        S_BOTR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_24*/
+        218,        //doomednum
+        S_HATR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MISC_25*/
+        219,        //doomednum
+        S_TOPR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_COUPLING*/
+        220,        //doomednum
+        S_COUP_00,      //spawnstate
+        40,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        6,      //speed
+        17*FRACUNIT,        //radius
+        64*FRACUNIT,        //height
+        999999,     //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SOLID|MF_SHOOTABLE|MF_GIVEQUEST|MF_NODIALOG|MF_DROPPED
+        |MF_NOBLOOD|MF_NOTDMATCH,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_COUPLING_BROKEN*/
+        226,        //doomednum
+        S_COUP_02,      //spawnstate
+        40,     //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        512*FRACUNIT,       //speed
+        16*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        1,      //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST|MF_DROPPED,     //flags
+        "BROKEN_POWER_COUPLING",        //namepointer
+    },
+
+    {       /*MT_PILLAR10*/
+        221,        //doomednum
+        S_BUBB_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_amaln5,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR11*/
+        222,        //doomednum
+        S_BUBF_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        72*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_amaln6,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR12*/
+        223,        //doomednum
+        S_BUBF_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        72*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_amaln4,     //activesound
+        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_PILLAR13*/
+        224,        //doomednum
+        S_ASPR_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        16*FRACUNIT,        //radius
+        128*FRACUNIT,       //height
+        100,        //mass
+        0,      //damage
+        sfx_amaln3,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_LIGHT19*/
+        225,        //doomednum
+        S_SPDL_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        32*FRACUNIT,        //radius
+        56*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_amaln1,     //activesound
+        MF_SOLID,       //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_MEAT*/
+        -1,     //doomednum
+        S_MEAT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_JUNK*/
+        -1,     //doomednum
+        S_JUNK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_BURNDROP*/
+        -1,     //doomednum
+        S_FFOT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_AMMO*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Ammo",       //namepointer
+    },
+
+    {       /*MT_TOKEN_HEALTH*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Health",     //namepointer
+    },
+
+    {       /*MT_TOKEN*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "info",     //namepointer
+    },
+
+    {       /*MT_TOKEN_ALARM*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "alarm",        //namepointer
+    },
+
+    {       /*MT_TOKEN_DOOR1*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_SHOPCLOSE*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_PRISON_PASS*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        10,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST,        //flags
+        "Prison_pass",      //namepointer
+    },
+
+    {       /*MT_TOKEN_DOOR3*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_STAMINA*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_NEW_ACCURACY*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_REPORT*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "report",       //namepointer
+    },
+
+    {       /*MT_TOKEN_TOUGHNESS*/
+        -1,     //doomednum
+        S_HELT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Toughness",        //namepointer
+    },
+
+    {       /*MT_TOKEN_ACCURACY*/
+        -1,     //doomednum
+        S_GUNT_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        "Accuracy",     //namepointer
+    },
+
+    {       /*MT_TOKEN_ORACLE_PASS*/
+        -1,     //doomednum
+        S_OTOK_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        18,     //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL|MF_GIVEQUEST,        //flags
+        "Oracle_Pass",      //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST1*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST2*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST3*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST4*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "quest4",       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST5*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "quest5",       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST6*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "quest6",       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST7*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST8*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST9*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST10*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST11*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST12*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST13*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_CRYSTAL*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You've_Blown_Up_the_Crystal",     //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST15*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_GATEQUEST*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You've_Blown_Up_the_Gates",       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST17*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST18*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST19*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST20*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_BISHOP*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You_Killed_the_Bishop!",        //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST22*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_ORACLE*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You've_Killed_The_Oracle!",        //namepointer
+    },
+
+    {       /*MT_TOKEN_MACIL*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You_Killed_Macil!",     //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST25*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_LOREMASTER*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You've_Killed_The_Loremaster!",        //namepointer
+    },
+
+    {       /*MT_SECRQUEST*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        "You've_Blown_Up_the_Computer",      //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST28*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST29*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST30*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_TOKEN_QUEST31*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        0,      //flags
+        NULL,       //namepointer
+    },
+
+    {       /*MT_SLIDESHOW*/
+        -1,     //doomednum
+        S_TOKN_00,      //spawnstate
+        1000,       //spawnhealth
+        S_NULL,     //seestate
+        sfx_None,       //seesound
+        8,      //reactiontime
+        sfx_None,       //attacksound
+        S_NULL,     //painstate
+        0,      //painchance
+        sfx_None,       //painsound
+        S_NULL,     //meleestate
+        S_NULL,     //missilestate
+        S_NULL,     //crashstate
+        S_NULL,     //deathstate
+        S_NULL,     //xdeathstate
+        sfx_None,       //deathsound
+        0,      //speed
+        20*FRACUNIT,        //radius
+        16*FRACUNIT,        //height
+        100,        //mass
+        0,      //damage
+        sfx_None,       //activesound
+        MF_SPECIAL,     //flags
+        NULL,       //namepointer
+    },
+
+};
+
+
+
diff --git a/games/NXDoom/src/strife/info.h b/games/NXDoom/src/strife/info.h
new file mode 100644
index 000000000..4c8edc7b6
--- /dev/null
+++ b/games/NXDoom/src/strife/info.h
@@ -0,0 +1,2219 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Thing frame/state LUT,
+//	generated by multigen utilitiy.
+//	This one is the original DOOM version, preserved.
+//
+
+#ifndef __INFO__
+#define __INFO__
+
+// Needed for action function pointer handling.
+#include "d_think.h"
+
+// villsa [STRIFE]
+typedef enum
+{
+    SPR_PLAY, // 0
+    SPR_PNCH, // 1
+    SPR_WAVE, // 2
+    SPR_RBPY, // 3
+    SPR_TRGT, // 4
+    SPR_XBOW, // 5
+    SPR_MMIS, // 6
+    SPR_RIFG, // 7
+    SPR_RIFF, // 8
+    SPR_FLMT, // 9
+    SPR_FLMF, // 10
+    SPR_BLST, // 11
+    SPR_BLSF, // 12
+    SPR_GREN, // 13
+    SPR_GREF, // 14
+    SPR_SIGH, // 15
+    SPR_SIGF, // 16
+    SPR_POW1, // 17
+    SPR_POW2, // 18
+    SPR_POW3, // 19
+    SPR_ZAP1, // 20
+    SPR_SPRY, // 21
+    SPR_BLOD, // 22
+    SPR_PUFY, // 23
+    SPR_SHT1, // 24
+    SPR_SHT2, // 25
+    SPR_GRIN, // 26
+    SPR_GRAP, // 27
+    SPR_UBAM, // 28
+    SPR_BNG2, // 29
+    SPR_BNG4, // 30
+    SPR_BNG3, // 31
+    SPR_FLBE, // 32
+    SPR_XPRK, // 33
+    SPR_OCLW, // 34
+    SPR_CCLW, // 35
+    SPR_TEND, // 36
+    SPR_MICR, // 37
+    SPR_MISS, // 38
+    SPR_AROW, // 39
+    SPR_ARWP, // 40
+    SPR_TORP, // 41
+    SPR_THIT, // 42
+    SPR_TWAV, // 43
+    SPR_MISL, // 44
+    SPR_TFOG, // 45
+    SPR_IFOG, // 46
+    SPR_SHRD, // 47
+    SPR_RGIB, // 48
+    SPR_MRYS, // 49
+    SPR_MRNO, // 50
+    SPR_MRST, // 51
+    SPR_MRLK, // 52
+    SPR_MRBD, // 53
+    SPR_MRPN, // 54
+    SPR_MRGT, // 55
+    SPR_BURN, // 56
+    SPR_DISR, // 57
+    SPR_PEAS, // 58
+    SPR_GIBS, // 59
+    SPR_AGRD, // 60
+    SPR_ARMR, // 61
+    SPR_SACR, // 62
+    SPR_TNK1, // 63
+    SPR_TNK2, // 64
+    SPR_TNK3, // 65
+    SPR_TNK4, // 66
+    SPR_TNK5, // 67
+    SPR_TNK6, // 68
+    SPR_NEAL, // 69
+    SPR_BEGR, // 70
+    SPR_HMN1, // 71
+    SPR_LEDR, // 72
+    SPR_LEAD, // 73
+    SPR_ROB1, // 74
+    SPR_PGRD, // 75
+    SPR_ROB2, // 76
+    SPR_MLDR, // 77
+    SPR_ORCL, // 78
+    SPR_PRST, // 79
+    SPR_PDED, // 80
+    SPR_ALN1, // 81
+    SPR_AL1P, // 82
+    SPR_NODE, // 83
+    SPR_MTHD, // 84
+    SPR_MNAM, // 85
+    SPR_MNAL, // 86
+    SPR_MDTH, // 87
+    SPR_NEST, // 88
+    SPR_PODD, // 89
+    SPR_ZAP6, // 90
+    SPR_ZOT3, // 91
+    SPR_ZAP7, // 92
+    SPR_ZOT1, // 93
+    SPR_ZAP5, // 94
+    SPR_ZOT2, // 95
+    SPR_SEWR, // 96
+    SPR_SPID, // 97
+    SPR_ROB3, // 98
+    SPR_RBB3, // 99
+    SPR_PRGR, // 100
+    SPR_BASE, // 
+    SPR_FRBL, // 
+    SPR_KLAX, // 
+    SPR_TURT, // 
+    SPR_BALL, // 105
+    SPR_PSTN, // 
+    SPR_SECR, // 
+    SPR_TARG, // 
+    SPR_RING, // 
+    SPR_EARS, // 110
+    SPR_COMM, // 
+    SPR_BOOM, // 
+    SPR_RATT, // 
+    SPR_HOGN, // 
+    SPR_DEAD, // 115
+    SPR_SBAN, // 
+    SPR_BOTR, // 
+    SPR_HATR, // 
+    SPR_TOPR, // 
+    SPR_COUP, // 120
+    SPR_BUBB, // 
+    SPR_BUBF, // 
+    SPR_BUBC, // 
+    SPR_ASPR, // 
+    SPR_SPDL, // 125
+    SPR_TOKN, // 
+    SPR_OTOK, // 
+    SPR_HELT, // 
+    SPR_GUNT, // 
+    SPR_FULL, // 130
+    SPR_MEAT, // 
+    SPR_JUNK, // 
+    SPR_FFOT, // 
+    SPR_DIE1, // 
+    SPR_BEAC, // 135
+    SPR_ARM1, // 
+    SPR_ARM2, // 
+    SPR_BARW, // 
+    SPR_BART, // 
+    SPR_LAMP, // 140
+    SPR_LANT, // 
+    SPR_BARL, // 
+    SPR_BOWL, // 
+    SPR_BRAZ, // 
+    SPR_TRCH, // 145
+    SPR_LTRH, // 
+    SPR_LMPC, // 
+    SPR_LOGS, // 
+    SPR_TRHO, // 
+    SPR_WATR, // 150
+    SPR_MUGG, // 
+    SPR_FUSL, // 
+    SPR_CRD1, // 
+    SPR_CRD2, // 
+    SPR_TPAS, // 155
+    SPR_KY1G, // 
+    SPR_KY2S, // 
+    SPR_KY3B, // 
+    SPR_HAND, // 
+    SPR_CRYS, // 160
+    SPR_PRIS, // 
+    SPR_PWR1, // 
+    SPR_PWR2, // 
+    SPR_PWR3, // 
+    SPR_ORAC, // 165
+    SPR_GYID, // 
+    SPR_FUBR, // 
+    SPR_WARE, // 
+    SPR_RCRY, // 
+    SPR_BCRY, // 170
+    SPR_CHAP, // 
+    SPR_TUNL, // 
+    SPR_BLTK, // 
+    SPR_SECK, // 
+    SPR_MINE, // 175
+    SPR_REBL, // 
+    SPR_PROC, // 
+    SPR_ANKH, // 
+    SPR_GOID, // 
+    SPR_STMP, // 180
+    SPR_MDKT, // 
+    SPR_COIN, // 
+    SPR_CRED, // 
+    SPR_SACK, // 
+    SPR_CHST, // 185
+    SPR_SHD1, // 
+    SPR_MASK, // 
+    SPR_UNIF, // 
+    SPR_OFIC, // 
+    SPR_PMAP, // 190
+    SPR_PMUP, // 
+    SPR_BLIT, // 
+    SPR_BBOX, // 
+    SPR_MSSL, // 
+    SPR_ROKT, // 195
+    SPR_BRY1, // 
+    SPR_CPAC, // 
+    SPR_PQRL, // 
+    SPR_XQRL, // 
+    SPR_GRN1, // 200
+    SPR_GRN2, // 
+    SPR_BKPK, // 
+    SPR_RELC, // 
+    SPR_RIFL, // 
+    SPR_FLAM, // 205
+    SPR_BFLM, // 
+    SPR_MMSL, // 
+    SPR_TRPD, // 
+    SPR_GRND, // 
+    SPR_CBOW, // 210
+    SPR_SIGL, // 
+    SPR_LITE, // 
+    SPR_CNDL, // 
+    SPR_CLBR, // 
+    SPR_LITS, // 215
+    SPR_LITB, // 
+    SPR_LITG, // 
+    SPR_ROK1, // 
+    SPR_ROK2, // 
+    SPR_ROK3, // 220
+    SPR_ROK4, // 
+    SPR_LOGG, // 
+    SPR_RUB1, // 
+    SPR_RUB2, // 
+    SPR_RUB3, // 225
+    SPR_RUB4, // 
+    SPR_RUB5, // 
+    SPR_RUB6, // 
+    SPR_RUB7, // 
+    SPR_RUB8, // 230
+    SPR_CHAN, // 
+    SPR_STAT, // 
+    SPR_DSTA, // 
+    SPR_CRAB, // 
+    SPR_CAGE, // 235
+    SPR_TREE, // 
+    SPR_TRE1, // 
+    SPR_BUSH, // 
+    SPR_SHRB, // 
+    SPR_STAK, // 240
+    SPR_BAR1, // 
+    SPR_VASE, // 
+    SPR_STOL, // 
+    SPR_POT1, // 
+    SPR_TUB1, // 245
+    SPR_ANVL, // 
+    SPR_TLMP, // 
+    SPR_TRAY, // 
+    SPR_APOW, // 
+    SPR_AFED, // 250
+    SPR_DRIP, // 
+    SPR_CDRP, // 
+    SPR_SPLH, // 
+    SPR_WTFT, // 
+    SPR_HERT, // 
+    SPR_TELP, // 
+    SPR_MONI, // 
+    SPR_STEL, // 
+    SPR_STLA, // 
+    SPR_STLE, // 260
+    SPR_HUGE, // 261
+    SPR_STLG, // 262
+    NUMSPRITES
+
+} spritenum_t;
+
+// villsa [STRIFE]
+typedef enum
+{
+    S_NULL,     // 00
+    S_PNCH_00,      // 01
+    S_WAVE_00,      // 02
+    S_WAVE_01,      // 03
+    S_WAVE_02,      // 04
+    S_WAVE_03,      // 05
+    S_RBPY_00,      // 06
+    S_RBPY_01,      // 07
+    S_RBPY_02,      // 08
+    S_RBPY_03,      // 09
+    S_TRGT_00,      // 10
+    S_TRGT_01,      // 11
+    S_TRGT_02,      // 12
+    S_PNCH_01,      // 13
+    S_PNCH_02,      // 14
+    S_PNCH_03,      // 15
+    S_PNCH_04,      // 16
+    S_PNCH_05,      // 17
+    S_PNCH_06,      // 18
+    S_PNCH_07,      // 19
+    S_PNCH_08,      // 20
+    S_XBOW_00,      // 21
+    S_XBOW_01,      // 22
+    S_XBOW_02,      // 23
+    S_XBOW_03,      // 24
+    S_XBOW_04,      // 25
+    S_XBOW_05,      // 26
+    S_XBOW_06,      // 27
+    S_XBOW_07,      // 28
+    S_XBOW_08,      // 29
+    S_XBOW_09,      // 30
+    S_XBOW_10,      // 31
+    S_XBOW_11,      // 32
+    S_XBOW_12,      // 33
+    S_XBOW_13,      // 34
+    S_XBOW_14,      // 35
+    S_XBOW_15,      // 36
+    S_XBOW_16,      // 37
+    S_XBOW_17,      // 38
+    S_XBOW_18,      // 39
+    S_XBOW_19,      // 40
+    S_XBOW_20,      // 41
+    S_XBOW_21,      // 42
+    S_XBOW_22,      // 43
+    S_MMIS_00,      // 44
+    S_MMIS_01,      // 45
+    S_MMIS_02,      // 46
+    S_MMIS_03,      // 47
+    S_MMIS_04,      // 48
+    S_MMIS_05,      // 49
+    S_MMIS_06,      // 50
+    S_MMIS_07,      // 51
+    S_MMIS_08,      // 52
+    S_MMIS_09,      // 53
+    S_RIFG_00,      // 54
+    S_RIFG_01,      // 55
+    S_RIFG_02,      // 56
+    S_RIFF_00,      // 57
+    S_RIFF_01,      // 58
+    S_RIFG_03,      // 59
+    S_RIFG_04,      // 60
+    S_RIFG_05,      // 61
+    S_FLMT_00,      // 62
+    S_FLMT_01,      // 63
+    S_FLMT_02,      // 64
+    S_FLMT_03,      // 65
+    S_FLMF_00,      // 66
+    S_FLMF_01,      // 67
+    S_BLST_00,      // 68
+    S_BLST_01,      // 69
+    S_BLST_02,      // 70
+    S_BLST_03,      // 71
+    S_BLST_04,      // 72
+    S_BLST_05,      // 73
+    S_BLSF_00,      // 74
+    S_BLST_06,      // 75
+    S_BLST_07,      // 76
+    S_BLST_08,      // 77
+    S_BLST_09,      // 78
+    S_BLST_10,      // 79
+    S_BLST_11,      // 80
+    S_BLST_12,      // 81
+    S_BLST_13,      // 82
+    S_BLST_14,      // 83
+    S_BLST_15,      // 84
+    S_BLST_16,      // 85
+    S_BLST_17,      // 86
+    S_BLST_18,      // 87
+    S_BLST_19,      // 88
+    S_BLST_20,      // 89
+    S_BLSF_01,      // 90
+    S_BLST_21,      // 91
+    S_BLST_22,      // 92
+    S_BLST_23,      // 93
+    S_BLST_24,      // 94
+    S_GREN_00,      // 95
+    S_GREN_01,      // 96
+    S_GREN_02,      // 97
+    S_GREN_03,      // 98
+    S_GREN_04,      // 99
+    S_GREN_05,      // 100
+    S_GREN_06,      // 101
+    S_GREN_07,      // 102
+    S_GREF_00,      // 103
+    S_GREF_01,      // 104
+    S_GREF_02,      // 105
+    S_GREN_08,      // 106
+    S_GREN_09,      // 107
+    S_GREN_10,      // 108
+    S_GREN_11,      // 109
+    S_GREN_12,      // 110
+    S_GREN_13,      // 111
+    S_GREN_14,      // 112
+    S_GREN_15,      // 113
+    S_GREF_03,      // 114
+    S_GREF_04,      // 115
+    S_GREF_05,      // 116
+    S_SIGH_00,      // 117
+    S_SIGH_01,      // 118
+    S_SIGH_02,      // 119
+    S_SIGH_03,      // 120
+    S_SIGH_04,      // 121
+    S_SIGH_05,      // 122
+    S_SIGH_06,      // 123
+    S_SIGH_07,      // 124
+    S_SIGH_08,      // 125
+    S_SIGH_09,      // 126
+    S_SIGH_10,      // 127
+    S_SIGF_00,      // 128
+    S_SIGF_01,      // 129
+    S_SIGF_02,      // 130
+    S_POW1_00,      // 131
+    S_POW1_01,      // 132
+    S_POW1_02,      // 133
+    S_POW1_03,      // 134
+    S_POW1_04,      // 135
+    S_POW1_05,      // 136
+    S_POW1_06,      // 137
+    S_POW1_07,      // 138
+    S_POW1_08,      // 139
+    S_POW1_09,      // 140
+    S_POW2_00,      // 141
+    S_POW2_01,      // 142
+    S_POW2_02,      // 143
+    S_POW2_03,      // 144
+    S_POW3_00,      // 145
+    S_POW3_01,      // 146
+    S_POW3_02,      // 147
+    S_POW3_03,      // 148
+    S_POW3_04,      // 149
+    S_POW3_05,      // 150
+    S_POW3_06,      // 151
+    S_POW3_07,      // 152
+    S_ZAP1_00,      // 153
+    S_ZAP1_01,      // 154
+    S_ZAP1_02,      // 155
+    S_ZAP1_03,      // 156
+    S_ZAP1_04,      // 157
+    S_ZAP1_05,      // 158
+    S_ZAP1_06,      // 159
+    S_ZAP1_07,      // 160
+    S_ZAP1_08,      // 161
+    S_ZAP1_09,      // 162
+    S_ZAP1_10,      // 163
+    S_ZAP1_11,      // 164
+    S_SPRY_00,      // 165
+    S_SPRY_01,      // 166
+    S_SPRY_02,      // 167
+    S_SPRY_03,      // 168
+    S_SPRY_04,      // 169
+    S_SPRY_05,      // 170
+    S_SPRY_06,      // 171
+    S_BLOD_00,      // 172
+    S_BLOD_01,      // 173
+    S_BLOD_02,      // 174
+    S_PUFY_00,      // 175
+    S_PUFY_01,      // 176
+    S_PUFY_02,      // 177
+    S_PUFY_03,      // 178
+    S_SHT1_00,      // 179
+    S_SHT1_01,      // 180
+    S_SHT2_00,      // 181
+    S_SHT2_01,      // 182
+    S_GRIN_00,      // 183
+    S_GRIN_01,      // 184
+    S_GRAP_00,      // 185
+    S_GRAP_01,      // 186
+    S_UBAM_00,      // 187
+    S_UBAM_01,      // 188
+    S_BNG2_00,      // 189
+    S_BNG2_01,      // 190
+    S_BNG2_02,      // 191
+    S_BNG2_03,      // 192
+    S_BNG2_04,      // 193
+    S_BNG2_05,      // 194
+    S_BNG2_06,      // 195
+    S_BNG2_07,      // 196
+    S_BNG2_08,      // 197
+    S_BNG4_00,      // 198
+    S_BNG4_01,      // 199
+    S_BNG4_02,      // 200
+    S_BNG4_03,      // 201
+    S_BNG4_04,      // 202
+    S_BNG4_05,      // 203
+    S_BNG4_06,      // 204
+    S_BNG4_07,      // 205
+    S_BNG4_08,      // 206
+    S_BNG4_09,      // 207
+    S_BNG4_10,      // 208
+    S_BNG4_11,      // 209
+    S_BNG4_12,      // 210
+    S_BNG4_13,      // 211
+    S_BNG3_00,      // 212
+    S_BNG3_01,      // 213
+    S_BNG3_02,      // 214
+    S_BNG3_03,      // 215
+    S_BNG3_04,      // 216
+    S_BNG3_05,      // 217
+    S_BNG3_06,      // 218
+    S_BNG3_07,      // 219
+    S_BNG3_08,      // 220
+    S_BNG3_09,      // 221
+    S_BNG3_10,      // 222
+    S_FLBE_00,      // 223
+    S_FLBE_01,      // 224
+    S_FLBE_02,      // 225
+    S_FLBE_03,      // 226
+    S_FLBE_04,      // 227
+    S_FLBE_05,      // 228
+    S_FLBE_06,      // 229
+    S_FLBE_07,      // 230
+    S_FLBE_08,      // 231
+    S_FLBE_09,      // 232
+    S_FLBE_10,      // 233
+    S_XPRK_00,      // 234
+    S_OCLW_00,      // 235
+    S_CCLW_00,      // 236
+    S_TEND_00,      // 237
+    S_MICR_00,      // 238
+    S_MISS_00,      // 239
+    S_MISS_01,      // 240
+    S_AROW_00,      // 241
+    S_ARWP_00,      // 242
+    S_AROW_01,      // 243
+    S_TORP_00,      // 244
+    S_TORP_01,      // 245
+    S_TORP_02,      // 246
+    S_TORP_03,      // 247
+    S_THIT_00,      // 248
+    S_THIT_01,      // 249
+    S_THIT_02,      // 250
+    S_THIT_03,      // 251
+    S_THIT_04,      // 252
+    S_TWAV_00,      // 253
+    S_TWAV_01,      // 254
+    S_TWAV_02,      // 255
+    S_MISL_00,      // 256
+    S_MISL_01,      // 257
+    S_MISL_02,      // 258
+    S_MISL_03,      // 259
+    S_MISL_04,      // 260
+    S_MISL_05,      // 261
+    S_MISL_06,      // 262
+    S_MISL_07,      // 263
+    S_TFOG_00,      // 264
+    S_TFOG_01,      // 265
+    S_TFOG_02,      // 266
+    S_TFOG_03,      // 267
+    S_TFOG_04,      // 268
+    S_TFOG_05,      // 269
+    S_TFOG_06,      // 270
+    S_TFOG_07,      // 271
+    S_TFOG_08,      // 272
+    S_TFOG_09,      // 273
+    S_IFOG_00,      // 274
+    S_IFOG_01,      // 275
+    S_IFOG_02,      // 276
+    S_IFOG_03,      // 277
+    S_IFOG_04,      // 278
+    S_IFOG_05,      // 279
+    S_IFOG_06,      // 280
+    S_SHRD_00,      // 281
+    S_SHRD_01,      // 282
+    S_SHRD_02,      // 283
+    S_SHRD_03,      // 284
+    S_SHRD_04,      // 285
+    S_SHRD_05,      // 286
+    S_PLAY_00,      // 287
+    S_PLAY_01,      // 288
+    S_PLAY_02,      // 289
+    S_PLAY_03,      // 290
+    S_PLAY_04,      // 291
+    S_PLAY_05,      // 292
+    S_PLAY_06,      // 293
+    S_PLAY_07,      // 294
+    S_PLAY_08,      // 295
+    S_PLAY_09,      // 296
+    S_PLAY_10,      // 297
+    S_PLAY_11,      // 298
+    S_PLAY_12,      // 299
+    S_PLAY_13,      // 300
+    S_PLAY_14,      // 301
+    S_PLAY_15,      // 302
+    S_PLAY_16,      // 303
+    S_PLAY_17,      // 304
+    S_PLAY_18,      // 305
+    S_RGIB_00,      // 306
+    S_RGIB_01,      // 307
+    S_RGIB_02,      // 308
+    S_RGIB_03,      // 309
+    S_RGIB_04,      // 310
+    S_RGIB_05,      // 311
+    S_RGIB_06,      // 312
+    S_RGIB_07,      // 313
+    S_MRYS_00,      // 314
+    S_MRNO_00,      // 315
+    S_MRNO_01,      // 316
+    S_MRNO_02,      // 317
+    S_MRNO_03,      // 318
+    S_MRNO_04,      // 319
+    S_MRST_00,      // 320
+    S_MRLK_00,      // 321
+    S_MRLK_01,      // 322
+    S_MRBD_00,      // 323
+    S_MRBD_01,      // 324
+    S_MRBD_02,      // 325
+    S_MRBD_03,      // 326
+    S_MRBD_04,      // 327
+    S_MRBD_05,      // 328
+    S_MRBD_06,      // 329
+    S_MRBD_07,      // 330
+    S_MRBD_08,      // 331
+    S_MRBD_09,      // 332
+    S_MRPN_00,      // 333
+    S_MRPN_01,      // 334
+    S_MRPN_02,      // 335
+    S_MRPN_03,      // 336
+    S_MRPN_04,      // 337
+    S_MRPN_05,      // 338
+    S_MRPN_06,      // 339
+    S_MRGT_00,      // 340
+    S_MRGT_01,      // 341
+    S_MRGT_02,      // 342
+    S_MRGT_03,      // 343
+    S_MRGT_04,      // 344
+    S_MRGT_05,      // 345
+    S_MRGT_06,      // 346
+    S_MRGT_07,      // 347
+    S_MRGT_08,      // 348
+    S_BURN_00,      // 349
+    S_BURN_01,      // 350
+    S_BURN_02,      // 351
+    S_BURN_03,      // 352
+    S_BURN_04,      // 353
+    S_BURN_05,      // 354
+    S_BURN_06,      // 355
+    S_BURN_07,      // 356
+    S_BURN_08,      // 357
+    S_BURN_09,      // 358
+    S_BURN_10,      // 359
+    S_BURN_11,      // 360
+    S_BURN_12,      // 361
+    S_BURN_13,      // 362
+    S_BURN_14,      // 363
+    S_BURN_15,      // 364
+    S_BURN_16,      // 365
+    S_BURN_17,      // 366
+    S_BURN_18,      // 367
+    S_BURN_19,      // 368
+    S_BURN_20,      // 369
+    S_BURN_21,      // 370
+    S_BURN_22,      // 371
+    S_BURN_23,      // 372
+    S_DISR_00,      // 373
+    S_DISR_01,      // 374
+    S_DISR_02,      // 375
+    S_DISR_03,      // 376
+    S_DISR_04,      // 377
+    S_DISR_05,      // 378
+    S_DISR_06,      // 379
+    S_DISR_07,      // 380
+    S_DISR_08,      // 381
+    S_DISR_09,      // 382
+    S_PEAS_00,      // 383
+    S_PEAS_01,      // 384
+    S_PEAS_02,      // 385
+    S_PEAS_03,      // 386
+    S_PEAS_04,      // 387
+    S_PEAS_05,      // 388
+    S_PEAS_06,      // 389
+    S_PEAS_07,      // 390
+    S_PEAS_08,      // 391
+    S_PEAS_09,      // 392
+    S_PEAS_10,      // 393
+    S_PEAS_11,      // 394
+    S_PEAS_12,      // 395
+    S_PEAS_13,      // 396
+    S_PEAS_14,      // 397
+    S_PEAS_15,      // 398
+    S_PEAS_16,      // 399
+    S_PEAS_17,      // 400
+    S_PEAS_18,      // 401
+    S_PEAS_19,      // 402
+    S_PEAS_20,      // 403
+    S_PEAS_21,      // 404
+    S_PEAS_22,      // 405
+    S_PEAS_23,      // 406
+    S_PEAS_24,      // 407
+    S_GIBS_00,      // 408
+    S_GIBS_01,      // 409
+    S_GIBS_02,      // 410
+    S_GIBS_03,      // 411
+    S_GIBS_04,      // 412
+    S_GIBS_05,      // 413
+    S_GIBS_06,      // 414
+    S_GIBS_07,      // 415
+    S_GIBS_08,      // 416
+    S_GIBS_09,      // 417
+    S_PEAS_25,      // 418
+    S_AGRD_00,      // 419
+    S_ARMR_00,      // 420
+    S_ARMR_01,      // 421
+    S_PLAY_19,      // 422
+    S_SACR_00,      // 423
+    S_TNK1_00,      // 424
+    S_TNK1_01,      // 425
+    S_TNK1_02,      // 426
+    S_TNK2_00,      // 427
+    S_TNK2_01,      // 428
+    S_TNK2_02,      // 429
+    S_TNK3_00,      // 430
+    S_TNK3_01,      // 431
+    S_TNK3_02,      // 432
+    S_TNK4_00,      // 433
+    S_TNK4_01,      // 434
+    S_TNK4_02,      // 435
+    S_TNK5_00,      // 436
+    S_TNK5_01,      // 437
+    S_TNK5_02,      // 438
+    S_TNK6_00,      // 439
+    S_TNK6_01,      // 440
+    S_TNK6_02,      // 441
+    S_NEAL_00,      // 442
+    S_NEAL_01,      // 443
+    S_NEAL_02,      // 444
+    S_NEAL_03,      // 445
+    S_NEAL_04,      // 446
+    S_NEAL_05,      // 447
+    S_NEAL_06,      // 448
+    S_NEAL_07,      // 449
+    S_NEAL_08,      // 450
+    S_NEAL_09,      // 451
+    S_NEAL_10,      // 452
+    S_NEAL_11,      // 453
+    S_NEAL_12,      // 454
+    S_NEAL_13,      // 455
+    S_BEGR_00,      // 456
+    S_BEGR_01,      // 457
+    S_BEGR_02,      // 458
+    S_BEGR_03,      // 459
+    S_BEGR_04,      // 460
+    S_BEGR_05,      // 461
+    S_BEGR_06,      // 462
+    S_BEGR_07,      // 463
+    S_BEGR_08,      // 464
+    S_BEGR_09,      // 465
+    S_BEGR_10,      // 466
+    S_BEGR_11,      // 467
+    S_BEGR_12,      // 468
+    S_BEGR_13,      // 469
+    S_BEGR_14,      // 470
+    S_BEGR_15,      // 471
+    S_BEGR_16,      // 472
+    S_BEGR_17,      // 473
+    S_BEGR_18,      // 474
+    S_BEGR_19,      // 475
+    S_BEGR_20,      // 476
+    S_BEGR_21,      // 477
+    S_BEGR_22,      // 478
+    S_HMN1_00,      // 479
+    S_HMN1_01,      // 480
+    S_HMN1_02,      // 481
+    S_HMN1_03,      // 482
+    S_HMN1_04,      // 483
+    S_HMN1_05,      // 484
+    S_HMN1_06,      // 485
+    S_HMN1_07,      // 486
+    S_HMN1_08,      // 487
+    S_HMN1_09,      // 488
+    S_HMN1_10,      // 489
+    S_HMN1_11,      // 490
+    S_HMN1_12,      // 491
+    S_HMN1_13,      // 492
+    S_HMN1_14,      // 493
+    S_HMN1_15,      // 494
+    S_HMN1_16,      // 495
+    S_HMN1_17,      // 496
+    S_HMN1_18,      // 497
+    S_HMN1_19,      // 498
+    S_HMN1_20,      // 499
+    S_HMN1_21,      // 500
+    S_HMN1_22,      // 501
+    S_HMN1_23,      // 502
+    S_HMN1_24,      // 503
+    S_HMN1_25,      // 504
+    S_HMN1_26,      // 505
+    S_HMN1_27,      // 506
+    S_HMN1_28,      // 507
+    S_HMN1_29,      // 508
+    S_HMN1_30,      // 509
+    S_HMN1_31,      // 510
+    S_RGIB_08,      // 511
+    S_RGIB_09,      // 512
+    S_RGIB_10,      // 513
+    S_RGIB_11,      // 514
+    S_RGIB_12,      // 515
+    S_RGIB_13,      // 516
+    S_RGIB_14,      // 517
+    S_RGIB_15,      // 518
+    S_LEDR_00,      // 519
+    S_LEDR_01,      // 520
+    S_LEDR_02,      // 521
+    S_LEAD_00,      // 522
+    S_LEAD_01,      // 523
+    S_LEAD_02,      // 524
+    S_LEAD_03,      // 525
+    S_LEAD_04,      // 526
+    S_LEAD_05,      // 527
+    S_LEAD_06,      // 528
+    S_LEAD_07,      // 529
+    S_LEAD_08,      // 530
+    S_LEAD_09,      // 531
+    S_LEAD_10,      // 532
+    S_LEAD_11,      // 533
+    S_LEAD_12,      // 534
+    S_LEAD_13,      // 535
+    S_LEAD_14,      // 536
+    S_LEAD_15,      // 537
+    S_LEAD_16,      // 538
+    S_LEAD_17,      // 539
+    S_LEAD_18,      // 540
+    S_LEAD_19,      // 541
+    S_LEAD_20,      // 542
+    S_LEAD_21,      // 543
+    S_LEAD_22,      // 544
+    S_LEAD_23,      // 545
+    S_LEAD_24,      // 546
+    S_LEAD_25,      // 547
+    S_LEAD_26,      // 548
+    S_LEAD_27,      // 549
+    S_LEAD_28,      // 550
+    S_LEAD_29,      // 551
+    S_LEAD_30,      // 552
+    S_LEAD_31,      // 553
+    S_LEAD_32,      // 554
+    S_LEAD_33,      // 555
+    S_LEAD_34,      // 556
+    S_LEAD_35,      // 557
+    S_LEAD_36,      // 558
+    S_LEAD_37,      // 559
+    S_PUFY_04,      // 560
+    S_PUFY_05,      // 561
+    S_PUFY_06,      // 562
+    S_PUFY_07,      // 563
+    S_PUFY_08,      // 564
+    S_MICR_01,      // 565
+    S_MICR_02,      // 566
+    S_ROB1_00,      // 567
+    S_ROB1_01,      // 568
+    S_ROB1_02,      // 569
+    S_ROB1_03,      // 570
+    S_ROB1_04,      // 571
+    S_ROB1_05,      // 572
+    S_ROB1_06,      // 573
+    S_ROB1_07,      // 574
+    S_ROB1_08,      // 575
+    S_ROB1_09,      // 576
+    S_ROB1_10,      // 577
+    S_ROB1_11,      // 578
+    S_ROB1_12,      // 579
+    S_ROB1_13,      // 580
+    S_ROB1_14,      // 581
+    S_ROB1_15,      // 582
+    S_ROB1_16,      // 583
+    S_ROB1_17,      // 584
+    S_ROB1_18,      // 585
+    S_ROB1_19,      // 586
+    S_ROB1_20,      // 587
+    S_ROB1_21,      // 588
+    S_ROB1_22,      // 589
+    S_ROB1_23,      // 590
+    S_ROB1_24,      // 591
+    S_ROB1_25,      // 592
+    S_ROB1_26,      // 593
+    S_ROB1_27,      // 594
+    S_ROB1_28,      // 595
+    S_ROB1_29,      // 596
+    S_ROB1_30,      // 597
+    S_ROB1_31,      // 598
+    S_ROB1_32,      // 599
+    S_AGRD_01,      // 600
+    S_AGRD_02,      // 601
+    S_AGRD_03,      // 602
+    S_AGRD_04,      // 603
+    S_AGRD_05,      // 604
+    S_AGRD_06,      // 605
+    S_AGRD_07,      // 606
+    S_AGRD_08,      // 607
+    S_AGRD_09,      // 608
+    S_AGRD_10,      // 609
+    S_AGRD_11,      // 610
+    S_AGRD_12,      // 611
+    S_AGRD_13,      // 612
+    S_AGRD_14,      // 613
+    S_AGRD_15,      // 614
+    S_AGRD_16,      // 615
+    S_AGRD_17,      // 616
+    S_AGRD_18,      // 617
+    S_AGRD_19,      // 618
+    S_AGRD_20,      // 619
+    S_AGRD_21,      // 620
+    S_AGRD_22,      // 621
+    S_AGRD_23,      // 622
+    S_AGRD_24,      // 623
+    S_AGRD_25,      // 624
+    S_AGRD_26,      // 625
+    S_AGRD_27,      // 626
+    S_AGRD_28,      // 627
+    S_AGRD_29,      // 628
+    S_AGRD_30,      // 629
+    S_AGRD_31,      // 630
+    S_GIBS_10,      // 631
+    S_GIBS_11,      // 632
+    S_GIBS_12,      // 633
+    S_GIBS_13,      // 634
+    S_GIBS_14,      // 635
+    S_GIBS_15,      // 636
+    S_GIBS_16,      // 637
+    S_GIBS_17,      // 638
+    S_GIBS_18,      // 639
+    S_GIBS_19,      // 640
+    S_GIBS_20,      // 641
+    S_GIBS_21,      // 642
+    S_PGRD_00,      // 643
+    S_PGRD_01,      // 644
+    S_PGRD_02,      // 645
+    S_PGRD_03,      // 646
+    S_PGRD_04,      // 647
+    S_PGRD_05,      // 648
+    S_PGRD_06,      // 649
+    S_PGRD_07,      // 650
+    S_PGRD_08,      // 651
+    S_PGRD_09,      // 652
+    S_PGRD_10,      // 653
+    S_PGRD_11,      // 654
+    S_PGRD_12,      // 655
+    S_PGRD_13,      // 656
+    S_PGRD_14,      // 657
+    S_PGRD_15,      // 658
+    S_PGRD_16,      // 659
+    S_PGRD_17,      // 660
+    S_PGRD_18,      // 661
+    S_PGRD_19,      // 662
+    S_PGRD_20,      // 663
+    S_PGRD_21,      // 664
+    S_PGRD_22,      // 665
+    S_PGRD_23,      // 666
+    S_PGRD_24,      // 667
+    S_PGRD_25,      // 668
+    S_PGRD_26,      // 669
+    S_PGRD_27,      // 670
+    S_PGRD_28,      // 671
+    S_PGRD_29,      // 672
+    S_PGRD_30,      // 673
+    S_PGRD_31,      // 674
+    S_PGRD_32,      // 675
+    S_PGRD_33,      // 676
+    S_PGRD_34,      // 677
+    S_PGRD_35,      // 678
+    S_PGRD_36,      // 679
+    S_PGRD_37,      // 680
+    S_ROB2_00,      // 681
+    S_ROB2_01,      // 682
+    S_ROB2_02,      // 683
+    S_ROB2_03,      // 684
+    S_ROB2_04,      // 685
+    S_ROB2_05,      // 686
+    S_ROB2_06,      // 687
+    S_ROB2_07,      // 688
+    S_ROB2_08,      // 689
+    S_ROB2_09,      // 690
+    S_ROB2_10,      // 691
+    S_ROB2_11,      // 692
+    S_ROB2_12,      // 693
+    S_ROB2_13,      // 694
+    S_ROB2_14,      // 695
+    S_ROB2_15,      // 696
+    S_ROB2_16,      // 697
+    S_ROB2_17,      // 698
+    S_ROB2_18,      // 699
+    S_ROB2_19,      // 700
+    S_ROB2_20,      // 701
+    S_ROB2_21,      // 702
+    S_ROB2_22,      // 703
+    S_ROB2_23,      // 704
+    S_ROB2_24,      // 705
+    S_ROB2_25,      // 706
+    S_ROB2_26,      // 707
+    S_ROB2_27,      // 708
+    S_ROB2_28,      // 709
+    S_ROB2_29,      // 710
+    S_MLDR_00,      // 711
+    S_MLDR_01,      // 712
+    S_MLDR_02,      // 713
+    S_MLDR_03,      // 714
+    S_MLDR_04,      // 715
+    S_MLDR_05,      // 716
+    S_MLDR_06,      // 717
+    S_MLDR_07,      // 718
+    S_MLDR_08,      // 719
+    S_MLDR_09,      // 720
+    S_MLDR_10,      // 721
+    S_MLDR_11,      // 722
+    S_MLDR_12,      // 723
+    S_MLDR_13,      // 724
+    S_MLDR_14,      // 725
+    S_MLDR_15,      // 726
+    S_MLDR_16,      // 727
+    S_MLDR_17,      // 728
+    S_MLDR_18,      // 729
+    S_MLDR_19,      // 730
+    S_MLDR_20,      // 731
+    S_MLDR_21,      // 732
+    S_MLDR_22,      // 733
+    S_MLDR_23,      // 734
+    S_MLDR_24,      // 735
+    S_MLDR_25,      // 736
+    S_MLDR_26,      // 737
+    S_MLDR_27,      // 738
+    S_ORCL_00,      // 739
+    S_ORCL_01,      // 740
+    S_ORCL_02,      // 741
+    S_ORCL_03,      // 742
+    S_ORCL_04,      // 743
+    S_ORCL_05,      // 744
+    S_ORCL_06,      // 745
+    S_ORCL_07,      // 746
+    S_ORCL_08,      // 747
+    S_ORCL_09,      // 748
+    S_ORCL_10,      // 749
+    S_ORCL_11,      // 750
+    S_ORCL_12,      // 751
+    S_ORCL_13,      // 752
+    S_ORCL_14,      // 753
+    S_ORCL_15,      // 754
+    S_ORCL_16,      // 755
+    S_PRST_00,      // 756
+    S_PRST_01,      // 757
+    S_PRST_02,      // 758
+    S_PRST_03,      // 759
+    S_PRST_04,      // 760
+    S_PRST_05,      // 761
+    S_PRST_06,      // 762
+    S_PRST_07,      // 763
+    S_PRST_08,      // 764
+    S_PRST_09,      // 765
+    S_PRST_10,      // 766
+    S_PRST_11,      // 767
+    S_PRST_12,      // 768
+    S_PRST_13,      // 769
+    S_PRST_14,      // 770
+    S_PRST_15,      // 771
+    S_PDED_00,      // 772
+    S_PDED_01,      // 773
+    S_PDED_02,      // 774
+    S_PDED_03,      // 775
+    S_PDED_04,      // 776
+    S_PDED_05,      // 777
+    S_PDED_06,      // 778
+    S_PDED_07,      // 779
+    S_PDED_08,      // 780
+    S_PDED_09,      // 781
+    S_PDED_10,      // 782
+    S_PDED_11,      // 783
+    S_PDED_12,      // 784
+    S_PDED_13,      // 785
+    S_PDED_14,      // 786
+    S_PDED_15,      // 787
+    S_PDED_16,      // 788
+    S_PDED_17,      // 789
+    S_PDED_18,      // 790
+    S_PDED_19,      // 791
+    S_PDED_20,      // 792
+    S_PDED_21,      // 793
+    S_PDED_22,      // 794
+    S_PDED_23,      // 795
+    S_ALN1_00,      // 796
+    S_ALN1_01,      // 797
+    S_ALN1_02,      // 798
+    S_ALN1_03,      // 799
+    S_ALN1_04,      // 800
+    S_ALN1_05,      // 801
+    S_ALN1_06,      // 802
+    S_ALN1_07,      // 803
+    S_ALN1_08,      // 804
+    S_ALN1_09,      // 805
+    S_ALN1_10,      // 806
+    S_ALN1_11,      // 807
+    S_ALN1_12,      // 808
+    S_ALN1_13,      // 809
+    S_ALN1_14,      // 810
+    S_ALN1_15,      // 811
+    S_ALN1_16,      // 812
+    S_ALN1_17,      // 813
+    S_ALN1_18,      // 814
+    S_ALN1_19,      // 815
+    S_AL1P_00,      // 816
+    S_AL1P_01,      // 817
+    S_AL1P_02,      // 818
+    S_AL1P_03,      // 819
+    S_AL1P_04,      // 820
+    S_AL1P_05,      // 821
+    S_AL1P_06,      // 822
+    S_AL1P_07,      // 823
+    S_AL1P_08,      // 824
+    S_AL1P_09,      // 825
+    S_AL1P_10,      // 826
+    S_AL1P_11,      // 827
+    S_AL1P_12,      // 828
+    S_AL1P_13,      // 829
+    S_AL1P_14,      // 830
+    S_AL1P_15,      // 831
+    S_AL1P_16,      // 832
+    S_AL1P_17,      // 833
+    S_NODE_00,      // 834
+    S_NODE_01,      // 835
+    S_NODE_02,      // 836
+    S_NODE_03,      // 837
+    S_NODE_04,      // 838
+    S_NODE_05,      // 839
+    S_NODE_06,      // 840
+    S_MTHD_00,      // 841
+    S_MTHD_01,      // 842
+    S_MTHD_02,      // 843
+    S_MTHD_03,      // 844
+    S_MTHD_04,      // 845
+    S_MTHD_05,      // 846
+    S_MTHD_06,      // 847
+    S_MTHD_07,      // 848
+    S_MTHD_08,      // 849
+    S_MTHD_09,      // 850
+    S_MTHD_10,      // 851
+    S_ALN1_20,      // 852
+    S_ALN1_21,      // 853
+    S_ALN1_22,      // 854
+    S_ALN1_23,      // 855
+    S_ALN1_24,      // 856
+    S_ALN1_25,      // 857
+    S_ALN1_26,      // 858
+    S_ALN1_27,      // 859
+    S_ALN1_28,      // 860
+    S_ALN1_29,      // 861
+    S_ALN1_30,      // 862
+    S_ALN1_31,      // 863
+    S_ALN1_32,      // 864
+    S_ALN1_33,      // 865
+    S_ALN1_34,      // 866
+    S_ALN1_35,      // 867
+    S_ALN1_36,      // 868
+    S_ALN1_37,      // 869
+    S_ALN1_38,      // 870
+    S_ALN1_39,      // 871
+    S_ALN1_40,      // 872
+    S_ALN1_41,      // 873
+    S_ALN1_42,      // 874
+    S_ALN1_43,      // 875
+    S_ALN1_44,      // 876
+    S_ALN1_45,      // 877
+    S_ALN1_46,      // 878
+    S_ALN1_47,      // 879
+    S_ALN1_48,      // 880
+    S_ALN1_49,      // 881
+    S_ALN1_50,      // 882
+    S_ALN1_51,      // 883
+    S_ALN1_52,      // 884
+    S_ALN1_53,      // 885
+    S_ALN1_54,      // 886
+    S_ALN1_55,      // 887
+    S_ALN1_56,      // 888
+    S_ALN1_57,      // 889
+    S_MNAM_00,      // 890
+    S_MNAM_01,      // 891
+    S_MNAM_02,      // 892
+    S_MNAM_03,      // 893
+    S_MNAM_04,      // 894
+    S_MNAM_05,      // 895
+    S_MNAM_06,      // 896
+    S_MNAM_07,      // 897
+    S_MNAM_08,      // 898
+    S_MNAM_09,      // 899
+    S_MNAM_10,      // 900
+    S_MNAM_11,      // 901
+    S_MNAL_00,      // 902
+    S_MNAL_01,      // 903
+    S_MNAL_02,      // 904
+    S_MNAL_03,      // 905
+    S_MNAL_04,      // 906
+    S_MNAL_05,      // 907
+    S_MNAL_06,      // 908
+    S_MNAL_07,      // 909
+    S_MNAL_08,      // 910
+    S_MNAL_09,      // 911
+    S_MNAL_10,      // 912
+    S_MNAL_11,      // 913
+    S_MNAL_12,      // 914
+    S_MNAL_13,      // 915
+    S_MNAL_14,      // 916
+    S_MNAL_15,      // 917
+    S_MNAL_16,      // 918
+    S_MNAL_17,      // 919
+    S_MNAL_18,      // 920
+    S_MNAL_19,      // 921
+    S_MNAL_20,      // 922
+    S_MNAL_21,      // 923
+    S_MNAL_22,      // 924
+    S_MNAL_23,      // 925
+    S_MNAL_24,      // 926
+    S_MNAL_25,      // 927
+    S_MNAL_26,      // 928
+    S_MNAL_27,      // 929
+    S_MNAL_28,      // 930
+    S_MNAL_29,      // 931
+    S_MNAL_30,      // 932
+    S_MNAL_31,      // 933
+    S_MNAL_32,      // 934
+    S_MNAL_33,      // 935
+    S_MNAL_34,      // 936
+    S_MNAL_35,      // 937
+    S_MNAL_36,      // 938
+    S_MNAL_37,      // 939
+    S_MNAL_38,      // 940
+    S_MNAL_39,      // 941
+    S_MNAL_40,      // 942
+    S_MDTH_00,      // 943
+    S_MDTH_01,      // 944
+    S_MDTH_02,      // 945
+    S_MDTH_03,      // 946
+    S_MDTH_04,      // 947
+    S_MDTH_05,      // 948
+    S_MDTH_06,      // 949
+    S_MDTH_07,      // 950
+    S_MDTH_08,      // 951
+    S_MDTH_09,      // 952
+    S_MDTH_10,      // 953
+    S_MDTH_11,      // 954
+    S_MDTH_12,      // 955
+    S_MDTH_13,      // 956
+    S_MDTH_14,      // 957
+    S_NEST_00,      // 958
+    S_PODD_00,      // 959
+    S_PODD_01,      // 960
+    S_PODD_02,      // 961
+    S_PODD_03,      // 962
+    S_PODD_04,      // 963
+    S_PODD_05,      // 964
+    S_ZAP6_00,      // 965
+    S_ZAP6_01,      // 966
+    S_ZAP6_02,      // 967
+    S_ZOT3_00,      // 968
+    S_ZOT3_01,      // 969
+    S_ZOT3_02,      // 970
+    S_ZOT3_03,      // 971
+    S_ZOT3_04,      // 972
+    S_ZAP6_03,      // 973
+    S_ZAP6_04,      // 974
+    S_ZAP6_05,      // 975
+    S_ZAP7_00,      // 976
+    S_ZAP7_01,      // 977
+    S_ZAP7_02,      // 978
+    S_ZAP7_03,      // 979
+    S_ZAP7_04,      // 980
+    S_ZOT1_00,      // 981
+    S_ZOT1_01,      // 982
+    S_ZOT1_02,      // 983
+    S_ZOT1_03,      // 984
+    S_ZOT1_04,      // 985
+    S_ZAP5_00,      // 986
+    S_ZAP5_01,      // 987
+    S_ZAP5_02,      // 988
+    S_ZAP5_03,      // 989
+    S_ZOT2_00,      // 990
+    S_ZOT2_01,      // 991
+    S_ZOT2_02,      // 992
+    S_ZOT2_03,      // 993
+    S_ZOT2_04,      // 994
+    S_SEWR_00,      // 995
+    S_SEWR_01,      // 996
+    S_SEWR_02,      // 997
+    S_SEWR_03,      // 998
+    S_SEWR_04,      // 999
+    S_SEWR_05,      // 1000
+    S_SEWR_06,      // 1001
+    S_SEWR_07,      // 1002
+    S_SEWR_08,      // 1003
+    S_SEWR_09,      // 1004
+    S_SEWR_10,      // 1005
+    S_SEWR_11,      // 1006
+    S_SEWR_12,      // 1007
+    S_SEWR_13,      // 1008
+    S_SPID_00,      // 1009
+    S_SPID_01,      // 1010
+    S_SPID_02,      // 1011
+    S_SPID_03,      // 1012
+    S_SPID_04,      // 1013
+    S_SPID_05,      // 1014
+    S_SPID_06,      // 1015
+    S_SPID_07,      // 1016
+    S_SPID_08,      // 1017
+    S_SPID_09,      // 1018
+    S_SPID_10,      // 1019
+    S_SPID_11,      // 1020
+    S_SPID_12,      // 1021
+    S_SPID_13,      // 1022
+    S_SPID_14,      // 1023
+    S_SPID_15,      // 1024
+    S_SPID_16,      // 1025
+    S_SPID_17,      // 1026
+    S_SPID_18,      // 1027
+    S_SPID_19,      // 1028
+    S_SPID_20,      // 1029
+    S_SPID_21,      // 1030
+    S_SPID_22,      // 1031
+    S_SPID_23,      // 1032
+    S_SPID_24,      // 1033
+    S_SPID_25,      // 1034
+    S_SPID_26,      // 1035
+    S_SPID_27,      // 1036
+    S_SPID_28,      // 1037
+    S_SPID_29,      // 1038
+    S_SPID_30,      // 1039
+    S_SPID_31,      // 1040
+    S_SPID_32,      // 1041
+    S_SPID_33,      // 1042
+    S_SPID_34,      // 1043
+    S_SPID_35,      // 1044
+    S_SPID_36,      // 1045
+    S_SPID_37,      // 1046
+    S_ROB3_00,      // 1047
+    S_ROB3_01,      // 1048
+    S_ROB3_02,      // 1049
+    S_ROB3_03,      // 1050
+    S_ROB3_04,      // 1051
+    S_ROB3_05,      // 1052
+    S_ROB3_06,      // 1053
+    S_ROB3_07,      // 1054
+    S_ROB3_08,      // 1055
+    S_ROB3_09,      // 1056
+    S_ROB3_10,      // 1057
+    S_ROB3_11,      // 1058
+    S_ROB3_12,      // 1059
+    S_ROB3_13,      // 1060
+    S_ROB3_14,      // 1061
+    S_ROB3_15,      // 1062
+    S_ROB3_16,      // 1063
+    S_ROB3_17,      // 1064
+    S_ROB3_18,      // 1065
+    S_ROB3_19,      // 1066
+    S_ROB3_20,      // 1067
+    S_ROB3_21,      // 1068
+    S_ROB3_22,      // 1069
+    S_ROB3_23,      // 1070
+    S_ROB3_24,      // 1071
+    S_ROB3_25,      // 1072
+    S_ROB3_26,      // 1073
+    S_ROB3_27,      // 1074
+    S_ROB3_28,      // 1075
+    S_ROB3_29,      // 1076
+    S_ROB3_30,      // 1077
+    S_ROB3_31,      // 1078
+    S_ROB3_32,      // 1079
+    S_ROB3_33,      // 1080
+    S_ROB3_34,      // 1081
+    S_ROB3_35,      // 1082
+    S_ROB3_36,      // 1083
+    S_ROB3_37,      // 1084
+    S_RBB3_00,      // 1085
+    S_RBB3_01,      // 1086
+    S_RBB3_02,      // 1087
+    S_RBB3_03,      // 1088
+    S_RBB3_04,      // 1089
+    S_RBB3_05,      // 1090
+    S_RBB3_06,      // 1091
+    S_RBB3_07,      // 1092
+    S_PRGR_00,      // 1093
+    S_PRGR_01,      // 1094
+    S_PRGR_02,      // 1095
+    S_PRGR_03,      // 1096
+    S_PRGR_04,      // 1097
+    S_PRGR_05,      // 1098
+    S_PRGR_06,      // 1099
+    S_PRGR_07,      // 1100
+    S_PRGR_08,      // 1101
+    S_PRGR_09,      // 1102
+    S_PRGR_10,      // 1103
+    S_PRGR_11,      // 1104
+    S_PRGR_12,      // 1105
+    S_PRGR_13,      // 1106
+    S_PRGR_14,      // 1107
+    S_PRGR_15,      // 1108
+    S_PRGR_16,      // 1109
+    S_PRGR_17,      // 1110
+    S_PRGR_18,      // 1111
+    S_PRGR_19,      // 1112
+    S_PRGR_20,      // 1113
+    S_PRGR_21,      // 1114
+    S_PRGR_22,      // 1115
+    S_PRGR_23,      // 1116
+    S_PRGR_24,      // 1117
+    S_PRGR_25,      // 1118
+    S_PRGR_26,      // 1119
+    S_PRGR_27,      // 1120
+    S_PRGR_28,      // 1121
+    S_PRGR_29,      // 1122
+    S_PRGR_30,      // 1123
+    S_PRGR_31,      // 1124
+    S_PRGR_32,      // 1125
+    S_PRGR_33,      // 1126
+    S_BASE_00,      // 1127
+    S_BASE_01,      // 1128
+    S_BASE_02,      // 1129
+    S_BASE_03,      // 1130
+    S_BASE_04,      // 1131
+    S_BASE_05,      // 1132
+    S_BASE_06,      // 1133
+    S_BASE_07,      // 1134
+    S_FRBL_00,      // 1135
+    S_FRBL_01,      // 1136
+    S_FRBL_02,      // 1137
+    S_FRBL_03,      // 1138
+    S_FRBL_04,      // 1139
+    S_FRBL_05,      // 1140
+    S_FRBL_06,      // 1141
+    S_FRBL_07,      // 1142
+    S_FRBL_08,      // 1143
+    S_KLAX_00,      // 1144
+    S_KLAX_01,      // 1145
+    S_KLAX_02,      // 1146
+    S_TURT_00,      // 1147
+    S_TURT_01,      // 1148
+    S_TURT_02,      // 1149
+    S_TURT_03,      // 1150
+    S_TURT_04,      // 1151
+    S_BALL_00,      // 1152
+    S_BALL_01,      // 1153
+    S_BALL_02,      // 1154
+    S_BALL_03,      // 1155
+    S_BALL_04,      // 1156
+    S_TURT_05,      // 1157
+    S_PSTN_00,      // 1158
+    S_PSTN_01,      // 1159
+    S_PSTN_02,      // 1160
+    S_PSTN_03,      // 1161
+    S_PSTN_04,      // 1162
+    S_PSTN_05,      // 1163
+    S_PSTN_06,      // 1164
+    S_PSTN_07,      // 1165
+    S_PSTN_08,      // 1166
+    S_PSTN_09,      // 1167
+    S_PSTN_10,      // 1168
+    S_SECR_00,      // 1169
+    S_SECR_01,      // 1170
+    S_SECR_02,      // 1171
+    S_SECR_03,      // 1172
+    S_SECR_04,      // 1173
+    S_SECR_05,      // 1174
+    S_SECR_06,      // 1175
+    S_SECR_07,      // 1176
+    S_SECR_08,      // 1177
+    S_SECR_09,      // 1178
+    S_SECR_10,      // 1179
+    S_SECR_11,      // 1180
+    S_SECR_12,      // 1181
+    S_SECR_13,      // 1182
+    S_SECR_14,      // 1183
+    S_SECR_15,      // 1184
+    S_XPRK_01,      // 1185
+    S_XPRK_02,      // 1186
+    S_TARG_00,      // 1187
+    S_RING_00,      // 1188
+    S_EARS_00,      // 1189
+    S_COMM_00,      // 1190
+    S_BOOM_00,      // 1191
+    S_BOOM_01,      // 1192
+    S_BOOM_02,      // 1193
+    S_BOOM_03,      // 1194
+    S_BOOM_04,      // 1195
+    S_BOOM_05,      // 1196
+    S_BOOM_06,      // 1197
+    S_BOOM_07,      // 1198
+    S_BOOM_08,      // 1199
+    S_BOOM_09,      // 1200
+    S_BOOM_10,      // 1201
+    S_BOOM_11,      // 1202
+    S_BOOM_12,      // 1203
+    S_BOOM_13,      // 1204
+    S_BOOM_14,      // 1205
+    S_BOOM_15,      // 1206
+    S_BOOM_16,      // 1207
+    S_BOOM_17,      // 1208
+    S_BOOM_18,      // 1209
+    S_BOOM_19,      // 1210
+    S_BOOM_20,      // 1211
+    S_BOOM_21,      // 1212
+    S_BOOM_22,      // 1213
+    S_BOOM_23,      // 1214
+    S_BOOM_24,      // 1215
+    S_RATT_00,      // 1216
+    S_RATT_01,      // 1217
+    S_RATT_02,      // 1218
+    S_RATT_03,      // 1219
+    S_RATT_04,      // 1220
+    S_RATT_05,      // 1221
+    S_RATT_06,      // 1222
+    S_HOGN_00,      // 1223
+    S_HOGN_01,      // 1224
+    S_HOGN_02,      // 1225
+    S_DEAD_00,      // 1226
+    S_SBAN_00,      // 1227
+    S_BOTR_00,      // 1228
+    S_HATR_00,      // 1229
+    S_TOPR_00,      // 1230
+    S_COUP_00,      // 1231
+    S_COUP_01,      // 1232
+    S_COUP_02,      // 1233
+    S_BUBB_00,      // 1234
+    S_BUBF_00,      // 1235
+    S_BUBC_00,      // 1236
+    S_ASPR_00,      // 1237
+    S_SPDL_00,      // 1238
+    S_SPDL_01,      // 1239
+    S_SPDL_02,      // 1240
+    S_TOKN_00,      // 1241
+    S_OTOK_00,      // 1242
+    S_HELT_00,      // 1243
+    S_GUNT_00,      // 1244
+    S_FULL_00,      // 1245
+    S_FULL_01,      // 1246
+    S_MEAT_00,      // 1247
+    S_MEAT_01,      // 1248
+    S_MEAT_02,      // 1249
+    S_MEAT_03,      // 1250
+    S_MEAT_04,      // 1251
+    S_MEAT_05,      // 1252
+    S_MEAT_06,      // 1253
+    S_MEAT_07,      // 1254
+    S_MEAT_08,      // 1255
+    S_MEAT_09,      // 1256
+    S_MEAT_10,      // 1257
+    S_MEAT_11,      // 1258
+    S_MEAT_12,      // 1259
+    S_MEAT_13,      // 1260
+    S_MEAT_14,      // 1261
+    S_MEAT_15,      // 1262
+    S_MEAT_16,      // 1263
+    S_MEAT_17,      // 1264
+    S_MEAT_18,      // 1265
+    S_MEAT_19,      // 1266
+    S_JUNK_00,      // 1267
+    S_JUNK_01,      // 1268
+    S_JUNK_02,      // 1269
+    S_JUNK_03,      // 1270
+    S_JUNK_04,      // 1271
+    S_JUNK_05,      // 1272
+    S_JUNK_06,      // 1273
+    S_JUNK_07,      // 1274
+    S_JUNK_08,      // 1275
+    S_JUNK_09,      // 1276
+    S_JUNK_10,      // 1277
+    S_JUNK_11,      // 1278
+    S_JUNK_12,      // 1279
+    S_JUNK_13,      // 1280
+    S_JUNK_14,      // 1281
+    S_JUNK_15,      // 1282
+    S_JUNK_16,      // 1283
+    S_JUNK_17,      // 1284
+    S_JUNK_18,      // 1285
+    S_JUNK_19,      // 1286
+    S_FFOT_00,      // 1287
+    S_FFOT_01,      // 1288
+    S_FFOT_02,      // 1289
+    S_FFOT_03,      // 1290
+    S_DIE1_00,      // 1291
+    S_BEAC_00,      // 1292
+    S_BEAC_01,      // 1293
+    S_BEAC_02,      // 1294
+    S_ARM1_00,      // 1295
+    S_ARM2_00,      // 1296
+    S_BARW_00,      // 1297
+    S_BARW_01,      // 1298
+    S_BARW_02,      // 1299
+    S_BARW_03,      // 1300
+    S_BARW_04,      // 1301
+    S_BARW_05,      // 1302
+    S_BARW_06,      // 1303
+    S_BARW_07,      // 1304
+    S_BART_00,      // 1305
+    S_BART_01,      // 1306
+    S_BART_02,      // 1307
+    S_BART_03,      // 1308
+    S_BART_04,      // 1309
+    S_BART_05,      // 1310
+    S_BART_06,      // 1311
+    S_BART_07,      // 1312
+    S_BART_08,      // 1313
+    S_BART_09,      // 1314
+    S_BART_10,      // 1315
+    S_BART_11,      // 1316
+    S_LAMP_00,      // 1317
+    S_LANT_00,      // 1318
+    S_BARL_00,      // 1319
+    S_BARL_01,      // 1320
+    S_BARL_02,      // 1321
+    S_BARL_03,      // 1322
+    S_BOWL_00,      // 1323
+    S_BOWL_01,      // 1324
+    S_BOWL_02,      // 1325
+    S_BOWL_03,      // 1326
+    S_BRAZ_00,      // 1327
+    S_BRAZ_01,      // 1328
+    S_BRAZ_02,      // 1329
+    S_BRAZ_03,      // 1330
+    S_TRCH_00,      // 1331
+    S_TRCH_01,      // 1332
+    S_TRCH_02,      // 1333
+    S_TRCH_03,      // 1334
+    S_LTRH_00,      // 1335
+    S_LTRH_01,      // 1336
+    S_LTRH_02,      // 1337
+    S_LTRH_03,      // 1338
+    S_LMPC_00,      // 1339
+    S_LMPC_01,      // 1340
+    S_LMPC_02,      // 1341
+    S_LMPC_03,      // 1342
+    S_LOGS_00,      // 1343
+    S_LOGS_01,      // 1344
+    S_LOGS_02,      // 1345
+    S_LOGS_03,      // 1346
+    S_TRHO_00,      // 1347
+    S_WATR_00,      // 1348
+    S_MUGG_00,      // 1349
+    S_FUSL_00,      // 1350
+    S_CRD1_00,      // 1351
+    S_CRD2_00,      // 1352
+    S_TPAS_00,      // 1353
+    S_KY1G_00,      // 1354
+    S_KY2S_00,      // 1355
+    S_KY3B_00,      // 1356
+    S_HAND_00,      // 1357
+    S_CRYS_00,      // 1358
+    S_CRYS_01,      // 1359
+    S_CRYS_02,      // 1360
+    S_CRYS_03,      // 1361
+    S_CRYS_04,      // 1362
+    S_CRYS_05,      // 1363
+    S_PRIS_00,      // 1364
+    S_PWR1_00,      // 1365
+    S_PWR2_00,      // 1366
+    S_PWR3_00,      // 1367
+    S_ORAC_00,      // 1368
+    S_GYID_00,      // 1369
+    S_FUBR_00,      // 1370
+    S_WARE_00,      // 1371
+    S_RCRY_00,      // 1372
+    S_BCRY_00,      // 1373
+    S_CHAP_00,      // 1374
+    S_TUNL_00,      // 1375
+    S_BLTK_00,      // 1376
+    S_SECK_00,      // 1377
+    S_MINE_00,      // 1378
+    S_REBL_00,      // 1379
+    S_PROC_00,      // 1380
+    S_ANKH_00,      // 1381
+    S_GOID_00,      // 1382
+    S_STMP_00,      // 1383
+    S_MDKT_00,      // 1384
+    S_COIN_00,      // 1385
+    S_CRED_00,      // 1386
+    S_SACK_00,      // 1387
+    S_CHST_00,      // 1388
+    S_SHD1_00,      // 1389
+    S_SHD1_01,      // 1390
+    S_SHD1_02,      // 1391
+    S_SHD1_03,      // 1392
+    S_MASK_00,      // 1393
+    S_UNIF_00,      // 1394
+    S_OFIC_00,      // 1395
+    S_PMAP_00,      // 1396
+    S_PMAP_01,      // 1397
+    S_PMUP_00,      // 1398
+    S_PMUP_01,      // 1399
+    S_BLIT_00,      // 1400
+    S_BBOX_00,      // 1401
+    S_MSSL_00,      // 1402
+    S_ROKT_00,      // 1403
+    S_BRY1_00,      // 1404
+    S_BRY1_01,      // 1405
+    S_CPAC_00,      // 1406
+    S_CPAC_01,      // 1407
+    S_PQRL_00,      // 1408
+    S_XQRL_00,      // 1409
+    S_GRN1_00,      // 1410
+    S_GRN2_00,      // 1411
+    S_BKPK_00,      // 1412
+    S_RELC_00,      // 1413
+    S_RIFL_00,      // 1414
+    S_RIFL_01,      // 1415
+    S_FLAM_00,      // 1416
+    S_BFLM_00,      // 1417
+    S_MMSL_00,      // 1418
+    S_TRPD_00,      // 1419
+    S_GRND_00,      // 1420
+    S_CBOW_00,      // 1421
+    S_SIGL_00,      // 1422
+    S_SIGL_01,      // 1423
+    S_SIGL_02,      // 1424
+    S_SIGL_03,      // 1425
+    S_SIGL_04,      // 1426
+    S_LITE_00,      // 1427
+    S_CNDL_00,      // 1428
+    S_CLBR_00,      // 1429
+    S_LITS_00,      // 1430
+    S_LITB_00,      // 1431
+    S_LITG_00,      // 1432
+    S_ROK1_00,      // 1433
+    S_ROK2_00,      // 1434
+    S_ROK3_00,      // 1435
+    S_ROK4_00,      // 1436
+    S_LOGG_00,      // 1437
+    S_LOGG_01,      // 1438
+    S_LOGG_02,      // 1439
+    S_LOGG_03,      // 1440
+    S_RUB1_00,      // 1441
+    S_RUB2_00,      // 1442
+    S_RUB3_00,      // 1443
+    S_RUB4_00,      // 1444
+    S_RUB5_00,      // 1445
+    S_RUB6_00,      // 1446
+    S_RUB7_00,      // 1447
+    S_RUB8_00,      // 1448
+    S_CHAN_00,      // 1449
+    S_STAT_00,      // 1450
+    S_DSTA_00,      // 1451
+    S_CRAB_00,      // 1452
+    S_CAGE_00,      // 1453
+    S_TREE_00,      // 1454
+    S_TREE_01,      // 1455
+    S_TREE_02,      // 1456
+    S_TRE1_00,      // 1457
+    S_BUSH_00,      // 1458
+    S_SHRB_00,      // 1459
+    S_STAK_00,      // 1460
+    S_BAR1_00,      // 1461
+    S_VASE_00,      // 1462
+    S_VASE_01,      // 1463
+    S_STOL_00,      // 1464
+    S_POT1_00,      // 1465
+    S_TUB1_00,      // 1466
+    S_ANVL_00,      // 1467
+    S_TLMP_00,      // 1468
+    S_TLMP_01,      // 1469
+    S_TRAY_00,      // 1470
+    S_APOW_00,      // 1471
+    S_AFED_00,      // 1472
+    S_DRIP_00,      // 1473
+    S_DRIP_01,      // 1474
+    S_DRIP_02,      // 1475
+    S_DRIP_03,      // 1476
+    S_DRIP_04,      // 1477
+    S_DRIP_05,      // 1478
+    S_DRIP_06,      // 1479
+    S_DRIP_07,      // 1480
+    S_CDRP_00,      // 1481
+    S_CDRP_01,      // 1482
+    S_CDRP_02,      // 1483
+    S_CDRP_03,      // 1484
+    S_SPLH_00,      // 1485
+    S_SPLH_01,      // 1486
+    S_SPLH_02,      // 1487
+    S_SPLH_03,      // 1488
+    S_SPLH_04,      // 1489
+    S_SPLH_05,      // 1490
+    S_SPLH_06,      // 1491
+    S_SPLH_07,      // 1492
+    S_WTFT_00,      // 1493
+    S_WTFT_01,      // 1494
+    S_WTFT_02,      // 1495
+    S_WTFT_03,      // 1496
+    S_HERT_00,      // 1497
+    S_HERT_01,      // 1498
+    S_HERT_02,      // 1499
+    S_TELP_00,      // 1500
+    S_TELP_01,      // 1501
+    S_TELP_02,      // 1502
+    S_TELP_03,      // 1503
+    S_MONI_00,      // 1504
+    S_STEL_00,      // 1505
+    S_STLA_00,      // 1506
+    S_STLE_00,      // 1507
+    S_HUGE_00,      // 1508
+    S_HUGE_01,      // 1509
+    S_HUGE_02,      // 1510
+    S_HUGE_03,      // 1511
+    S_STLG_00,      // 1512
+    S_STLG_01,      // 1513
+    S_STLG_02,      // 1514
+    S_STLG_03,      // 1515
+    S_STLG_04,      // 1516
+    S_STLG_05,      // 1517
+    NUMSTATES
+
+} statenum_t;
+
+
+typedef struct
+{
+    spritenum_t sprite;
+    int frame;
+    int tics;
+    // void (*action) ();
+    actionf_t action;
+    statenum_t nextstate;
+    //int misc1;    // villsa [STRIFE] unused
+    //int misc2;    // villsa [STRIFE] unused
+} state_t;
+
+extern state_t	states[NUMSTATES];
+extern const char *sprnames[];
+
+typedef enum
+{
+    MT_FIELDGUARD,      //000
+    MT_PLAYER,      //001
+    MT_SHOPKEEPER_W,        //002
+    MT_SHOPKEEPER_B,        //003
+    MT_SHOPKEEPER_A,        //004
+    MT_SHOPKEEPER_M,        //005
+    MT_PEASANT2_A,      //006
+    MT_PEASANT2_B,      //007
+    MT_PEASANT2_C,      //008
+    MT_PEASANT5_A,      //009
+    MT_PEASANT5_B,      //010
+    MT_PEASANT5_C,      //011
+    MT_PEASANT4_A,      //012
+    MT_PEASANT4_B,      //013
+    MT_PEASANT4_C,      //014
+    MT_PEASANT6_A,      //015
+    MT_PEASANT6_B,      //016
+    MT_PEASANT6_C,      //017
+    MT_PEASANT3_A,      //018
+    MT_PEASANT3_B,      //019
+    MT_PEASANT3_C,      //020
+    MT_PEASANT8_A,      //021
+    MT_PEASANT8_B,      //022
+    MT_PEASANT8_C,      //023
+    MT_PEASANT7_A,      //024
+    MT_PEASANT7_B,      //025
+    MT_PEASANT7_C,      //026
+    MT_PEASANT1,        //027
+    MT_ZOMBIE,      //028
+    MT_BECOMING,        //029
+    MT_ZOMBIESPAWNER,       //030
+    MT_HUGE_TANK_1,     //031
+    MT_HUGE_TANK_2,     //032
+    MT_HUGE_TANK_3,     //033
+    MT_TANK_4,      //034
+    MT_TANK_5,      //035
+    MT_TANK_6,      //036
+    MT_KNEELING_GUY,        //037
+    MT_BEGGAR1,     //038
+    MT_BEGGAR2,     //039
+    MT_BEGGAR3,     //040
+    MT_BEGGAR4,     //041
+    MT_BEGGAR5,     //042
+    MT_REBEL1,      //043
+    MT_REBEL2,      //044
+    MT_REBEL3,      //045
+    MT_REBEL4,      //046
+    MT_REBEL5,      //047
+    MT_REBEL6,      //048
+    MT_RLEADER,     //049
+    MT_RLEADER2,        //050
+    MT_MISSILESMOKE,        //051
+    MT_REAVER,      //052
+    MT_GUARD1,      //053
+    MT_GUARD2,      //054
+    MT_GUARD3,      //055
+    MT_GUARD4,      //056
+    MT_GUARD5,      //057
+    MT_GUARD6,      //058
+    MT_GUARD7,      //059
+    MT_GUARD8,      //060
+    MT_SHADOWGUARD,     //061
+    MT_PGUARD,      //062
+    MT_CRUSADER,        //063
+    MT_BISHOP,      //064
+    MT_ORACLE,      //065
+    MT_PRIEST,      //066
+    MT_SPECTRE_A,      //067
+    MT_NODE,        //068
+    MT_SPECTREHEAD,        //069
+    MT_SPECTRE_B,      //070
+    MT_SPECTRE_C,      //071
+    MT_SPECTRE_D,      //072
+    MT_SPECTRE_E,      //073
+    MT_ENTITY,      //074
+    MT_SUBENTITY,       //075
+    MT_NEST,        //076
+    MT_POD,     //077
+    MT_SIGIL_B_SHOT,        //078
+    MT_SIGIL_SB_SHOT,       //079
+    MT_SIGIL_C_SHOT,        //080
+    MT_SIGIL_SC_SHOT,       //081
+    MT_SIGIL_E_OFFSHOOT,        //082
+    MT_SIGIL_TRAIL,     //083
+    MT_SIGIL_E_SHOT,        //084
+    MT_SIGIL_SE_SHOT,       //085
+    MT_SIGIL_A_ZAP_LEFT,        //086
+    MT_SIGIL_A_ZAP_RIGHT,       //087
+    MT_SIGIL_A_GROUND,      //088
+    MT_SIGIL_D_SHOT,        //089
+    MT_SIGIL_SD_SHOT,       //090
+    MT_SENTINEL,        //091
+    MT_STALKER,     //092
+    MT_INQUISITOR,      //093
+    MT_INQARM,      //094
+    MT_PROGRAMMER,      //095
+    MT_PROGRAMMERBASE,      //096
+    MT_HOOKSHOT,        //097
+    MT_CHAINSHOT,       //098
+    MT_MINIMISSLE,      //099
+    MT_C_MISSILE,       //100
+    MT_SEEKMISSILE,     //101
+    MT_ELECARROW,       //102
+    MT_POISARROW,       //103
+    MT_R_LASER,     //104
+    MT_L_LASER,     //105
+    MT_HEGRENADE,       //106
+    MT_PGRENADE,        //107
+    MT_INQGRENADE,      //108
+    MT_PFLAME,      //109
+    MT_TORPEDO,     //110
+    MT_TORPEDOSPREAD,       //111
+    MT_SFIREBALL,       //112
+    MT_C_FLAME,     //113
+    MT_STRIFEPUFF3,     //114
+    MT_STRIFEPUFF,      //115
+    MT_SPARKPUFF,       //116
+    MT_BLOOD_DEATH,     //117
+    MT_TFOG,        //118
+    MT_IFOG,        //119
+    MT_TELEPORTMAN,     //120
+    MT_MISC_01,     //121
+    MT_TURRET,      //122
+    MT_GATE,        //123
+    MT_COMPUTER,        //124
+    MT_INV_MED1,        //125
+    MT_INV_MED2,        //126
+    MT_INV_MED3,        //127
+    MT_DEGNINORE,       //128
+    MT_INV_ARMOR2,      //129
+    MT_INV_ARMOR1,      //130
+    MT_MISC_22,     //131
+    MT_MISC_11,     //132
+    MT_KEY_BASE,        //133
+    MT_GOVSKEY,     //134
+    MT_KEY_TRAVEL,      //135
+    MT_KEY_ID_BLUE,     //136
+    MT_PRISONKEY,       //137
+    MT_KEY_HAND,        //138
+    MT_POWER1KEY,       //139
+    MT_POWER2KEY,       //140
+    MT_POWER3KEY,       //141
+    MT_KEY_GOLD,        //142
+    MT_KEY_ID_GOLD,     //143
+    MT_KEY_SILVER,      //144
+    MT_KEY_ORACLE,      //145
+    MT_MILITARYID,      //146
+    MT_KEY_ORDER,       //147
+    MT_KEY_WAREHOUSE,       //148
+    MT_KEY_BRASS,       //149
+    MT_KEY_RED_CRYSTAL,     //150
+    MT_KEY_BLUE_CRYSTAL,        //151
+    MT_KEY_CHAPEL,      //152
+    MT_CATACOMBKEY,     //153
+    MT_SECURITYKEY,     //154
+    MT_KEY_CORE,        //155
+    MT_KEY_MAULER,      //156
+    MT_KEY_FACTORY,     //157
+    MT_KEY_MINE,        //158
+    MT_NEWKEY5,     //159
+    MT_INV_SHADOWARMOR,     //160
+    MT_INV_SUIT,        //161
+    MT_QUEST_UNIFORM,       //162
+    MT_QUEST_GUARD_UNIFORM,     //163
+    MT_INV_SUPERMAP,        //164
+    MT_INV_RADAR,       //165
+    MT_BEACON,      //166
+    MT_INV_TARGETER,        //167
+    MT_MONY_1,      //168
+    MT_MONY_10,     //169
+    MT_MONY_25,     //170
+    MT_MONY_50,     //171
+    MT_MONY_300,        //172
+    MT_TOKEN_RING,      //173
+    MT_INV_CHALICE,     //174
+    MT_TOKEN_EAR,       //175
+    MT_INV_COMMUNICATOR,        //176
+    MT_AGREN,       //177
+    MT_APGREN,      //178
+    MT_ACLIP,       //179
+    MT_AAMMOBOX,        //180
+    MT_AMINI,       //181
+    MT_AMINIBOX,        //182
+    MT_ACELL,       //183
+    MT_APCELL,      //184
+    MT_APAROW,      //185
+    MT_AAROW,       //186
+    MT_INV_SATCHEL,     //187
+    MT_PULSE,       //188
+    MT_RIFLESTAND,      //189
+    MT_FLAMETHROWER,        //190
+    MT_TOKEN_FLAME_THROWER_PARTS,       //191
+    MT_MISSILELAUNCHER,     //192
+    MT_BLASTER,     //193
+    MT_CROSSBOW,        //194
+    MT_GRENADELAUNCHER,     //195
+    MT_SIGIL_A,     //196
+    MT_SIGIL_B,     //197
+    MT_SIGIL_C,     //198
+    MT_SIGIL_D,     //199
+    MT_SIGIL_E,     //200
+    MT_POWER_CRYSTAL,       //201
+    MT_RAT,     //202
+    MT_MISC_05,     //203
+    MT_MISC_06,     //204
+    MT_MISC_15,     //205
+    MT_LIGHT14,     //206
+    MT_LIGHT13,     //207
+    MT_LIGHT12,     //208
+    MT_LIGHT18,     //209
+    MT_PILLAR2,     //210
+    MT_PILLAR3,     //211
+    MT_PILLAR4,     //212
+    MT_PILLAR5,     //213
+    MT_PILLAR6,     //214
+    MT_PILLAR7,     //215
+    MT_CAVE2,       //216
+    MT_CAVE3,       //217
+    MT_CAVE4,       //218
+    MT_CAVE6,       //219
+    MT_CAVE7,       //220
+    MT_CAVE5,       //221
+    MT_LIGHT2,      //222
+    MT_LIGHT3,      //223
+    MT_MISC_03,     //224
+    MT_MISC_13,     //225
+    MT_MISC_02,     //226
+    MT_MISC_07,     //227
+    MT_BIO2,        //228
+    MT_TELEPORTSTAND,       //229
+    MT_DEADTHING1,      //230
+    MT_DEADTHING2,      //231
+    MT_DEADTHING3,      //232
+    MT_DEADTHING4,      //233
+    MT_DEADTHING5,      //234
+    MT_DEADTHING6,      //235
+    MT_BIO1,        //236
+    MT_GIBS,        //237
+    MT_MISC_04,     //238
+    MT_LIGHT11,     //239
+    MT_LIGHT10,     //240
+    MT_LIGHT9,      //241
+    MT_LIGHT8,      //242
+    MT_MISC_14,     //243
+    MT_LIGHT1,      //244
+    MT_PILLAR8,     //245
+    MT_PILLAR9,     //246
+    MT_LIGHT15,     //247
+    MT_LIGHT4,      //248
+    MT_LIGHT5,      //249
+    MT_ROCK1,       //250
+    MT_ROCK2,       //251
+    MT_ROCK3,       //252
+    MT_ROCK4,       //253
+    MT_TREE7,       //254
+    MT_RUBBLE1,     //255
+    MT_RUBBLE2,     //256
+    MT_RUBBLE3,     //257
+    MT_RUBBLE4,     //258
+    MT_RUBBLE5,     //259
+    MT_RUBBLE6,     //260
+    MT_RUBBLE7,     //261
+    MT_RUBBLE8,     //262
+    MT_MISC_08,     //263
+    MT_LIGHT6,      //264
+    MT_LIGHT7,      //265
+    MT_TREE2,       //266
+    MT_TREE3,       //267
+    MT_TREE4,       //268
+    MT_TREE1,       //269
+    MT_TREE6,       //270
+    MT_TREE5,       //271
+    MT_CAVE1,       //272
+    MT_PILLAR1,     //273
+    MT_MISC_10,     //274
+    MT_MISC_09,     //275
+    MT_MISC_17,     //276
+    MT_MISC_18,     //277
+    MT_MISC_19,     //278
+    MT_MISC_20,     //279
+    MT_LIGHT16,     //280
+    MT_LIGHT17,     //281
+    MT_MISC_21,     //282
+    MT_MISC_12,     //283
+    MT_MISC_26,     //284
+    MT_MISC_23,     //285
+    MT_MISC_24,     //286
+    MT_MISC_25,     //287
+    MT_COUPLING,        //288
+    MT_COUPLING_BROKEN,     //289
+    MT_PILLAR10,        //290
+    MT_PILLAR11,        //291
+    MT_PILLAR12,        //292
+    MT_PILLAR13,        //293
+    MT_LIGHT19,     //294
+    MT_MEAT,        //295
+    MT_JUNK,        //296
+    MT_BURNDROP,        //297
+    MT_TOKEN_AMMO,      //298
+    MT_TOKEN_HEALTH,        //299
+    MT_TOKEN,       //300
+    MT_TOKEN_ALARM,     //301
+    MT_TOKEN_DOOR1,     //302
+    MT_TOKEN_SHOPCLOSE,     //303
+    MT_TOKEN_PRISON_PASS,       //304
+    MT_TOKEN_DOOR3,     //305
+    MT_TOKEN_STAMINA,       //306
+    MT_TOKEN_NEW_ACCURACY,      //307
+    MT_TOKEN_REPORT,        //308
+    MT_TOKEN_TOUGHNESS,     //309
+    MT_TOKEN_ACCURACY,      //310
+    MT_TOKEN_ORACLE_PASS,       //311
+    MT_TOKEN_QUEST1,        //312
+    MT_TOKEN_QUEST2,        //313
+    MT_TOKEN_QUEST3,        //314
+    MT_TOKEN_QUEST4,        //315
+    MT_TOKEN_QUEST5,        //316
+    MT_TOKEN_QUEST6,        //317
+    MT_TOKEN_QUEST7,        //318
+    MT_TOKEN_QUEST8,        //319
+    MT_TOKEN_QUEST9,        //320
+    MT_TOKEN_QUEST10,       //321
+    MT_TOKEN_QUEST11,       //322
+    MT_TOKEN_QUEST12,       //323
+    MT_TOKEN_QUEST13,       //324
+    MT_TOKEN_CRYSTAL,       //325
+    MT_TOKEN_QUEST15,       //326
+    MT_GATEQUEST,       //327
+    MT_TOKEN_QUEST17,       //328
+    MT_TOKEN_QUEST18,       //329
+    MT_TOKEN_QUEST19,       //330
+    MT_TOKEN_QUEST20,       //331
+    MT_TOKEN_BISHOP,        //332
+    MT_TOKEN_QUEST22,       //333
+    MT_TOKEN_ORACLE,        //334
+    MT_TOKEN_MACIL,     //335
+    MT_TOKEN_QUEST25,       //336
+    MT_TOKEN_LOREMASTER,        //337
+    MT_SECRQUEST,       //338
+    MT_TOKEN_QUEST28,       //339
+    MT_TOKEN_QUEST29,       //340
+    MT_TOKEN_QUEST30,       //341
+    MT_TOKEN_QUEST31,       //342
+    MT_SLIDESHOW,       //343
+    NUMMOBJTYPES
+
+} mobjtype_t;
+
+// villsa [STRIFE] updated mobjinfo struct
+typedef struct
+{
+    int     doomednum;
+    int     spawnstate;
+    int     spawnhealth;
+    int     seestate;
+    int     seesound;
+    int     reactiontime;
+    int     attacksound;
+    int     painstate;
+    int     painchance;
+    int     painsound;
+    int     meleestate;
+    int     missilestate;
+    int     crashstate;
+    int     deathstate;
+    int     xdeathstate;
+    int     deathsound;
+    int     speed;
+    int     radius;
+    int     height;
+    int     mass;
+    int     damage;
+    int     activesound;
+    int     flags;
+    const char *name;
+} mobjinfo_t;
+
+extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
+
+#endif
diff --git a/games/NXDoom/src/strife/m_menu.c b/games/NXDoom/src/strife/m_menu.c
new file mode 100644
index 000000000..d277fd3c7
--- /dev/null
+++ b/games/NXDoom/src/strife/m_menu.c
@@ -0,0 +1,2466 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	DOOM selection menu, options, episode etc.
+//	Sliders and icons. Kinda widget stuff.
+//
+
+
+#include <stdlib.h>
+#include <ctype.h>
+
+
+#include "doomdef.h"
+#include "doomkeys.h"
+#include "dstrings.h"
+
+#include "d_main.h"
+#include "deh_main.h"
+
+#include "i_input.h"
+#include "i_joystick.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "i_timer.h"
+#include "i_video.h"
+#include "z_zone.h"
+#include "v_video.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+
+
+#include "hu_stuff.h"
+
+#include "g_game.h"
+
+#include "m_argv.h"
+#include "m_controls.h"
+#include "m_misc.h"
+#include "m_saves.h"    // [STRIFE]
+#include "p_saveg.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+// Data.
+#include "sounds.h"
+
+#include "m_menu.h"
+#include "p_dialog.h"
+
+
+void M_QuitStrife(int);
+
+
+//
+// defaulted values
+//
+int			mouseSensitivity = 5;
+
+// [STRIFE]: removed this entirely
+// Show messages has default, 0 = off, 1 = on
+//int			showMessages = 1;
+	
+
+// Blocky mode, has default, 0 = high, 1 = normal
+int			detailLevel = 0;
+int			screenblocks = 10; // [STRIFE] default 10, not 9
+
+// temp for screenblocks (0-9)
+int			screenSize;
+
+// -1 = no quicksave slot picked!
+int			quickSaveSlot;
+
+ // 1 = message to be printed
+int			messageToPrint;
+// ...and here is the message string!
+const char		*messageString;
+
+// message x & y
+int			messx;
+int			messy;
+int			messageLastMenuActive;
+
+// timed message = no input from user
+boolean			messageNeedsInput;
+
+void    (*messageRoutine)(int response);
+
+char gammamsg[5][26] =
+{
+    GAMMALVL0,
+    GAMMALVL1,
+    GAMMALVL2,
+    GAMMALVL3,
+    GAMMALVL4
+};
+
+// we are going to be entering a savegame string
+int			saveStringEnter;              
+int             	saveSlot;	// which slot to save in
+int			saveCharIndex;	// which char we're editing
+// old save description before edit
+char			saveOldString[SAVESTRINGSIZE];  
+
+boolean                 inhelpscreens;
+boolean                 menuactive;
+boolean                 menupause;      // haleyjd 08/29/10: [STRIFE] New global
+int                     menupausetime;  // haleyjd 09/04/10: [STRIFE] New global
+boolean                 menuindialog;   // haleyjd 09/04/10: ditto
+
+// haleyjd 08/27/10: [STRIFE] SKULLXOFF == -28, LINEHEIGHT == 19
+#define CURSORXOFF		-28
+#define LINEHEIGHT		19
+
+char			savegamestrings[10][SAVESTRINGSIZE];
+
+char	endstring[160];
+
+// haleyjd 09/04/10: [STRIFE] Moved menuitem / menu structures into header
+// because they are needed externally by the dialog engine.
+
+// haleyjd 08/27/10: [STRIFE] skull* stuff changed to cursor* stuff
+short		itemOn;			// menu item skull is on
+short		cursorAnimCounter;	// skull animation counter
+short		whichCursor;		// which skull to draw
+
+// graphic name of cursors
+// haleyjd 08/27/10: [STRIFE] M_SKULL* -> M_CURS*
+const char *cursorName[8] = {"M_CURS1", "M_CURS2", "M_CURS3", "M_CURS4",
+                             "M_CURS5", "M_CURS6", "M_CURS7", "M_CURS8" };
+
+// haleyjd 20110210 [STRIFE]: skill level for menus
+int menuskill;
+
+// current menudef
+menu_t*	currentMenu;                          
+
+// haleyjd 03/01/13: [STRIFE] v1.31-only:
+// Keeps track of whether the save game menu is being used to name a new
+// character slot, or to just save the current game. In the v1.31 disassembly
+// this was the new dword_8632C variable.
+boolean namingCharacter; 
+
+//
+// PROTOTYPES
+//
+void M_NewGame(int choice);
+void M_Episode(int choice);
+void M_ChooseSkill(int choice);
+void M_LoadGame(int choice);
+void M_SaveGame(int choice);
+void M_Options(int choice);
+void M_EndGame(int choice);
+void M_ReadThis(int choice);
+void M_ReadThis2(int choice);
+void M_ReadThis3(int choice); // [STRIFE]
+
+//void M_ChangeMessages(int choice); [STRIFE]
+void M_ChangeSensitivity(int choice);
+void M_SfxVol(int choice);
+void M_VoiceVol(int choice); // [STRIFE]
+void M_MusicVol(int choice);
+void M_SizeDisplay(int choice);
+void M_StartGame(int choice);
+void M_Sound(int choice);
+
+//void M_FinishReadThis(int choice); - [STRIFE] unused
+void M_SaveSelect(int choice);
+void M_ReadSaveStrings(void);
+void M_QuickSave(void);
+void M_QuickLoad(void);
+
+void M_DrawMainMenu(void);
+void M_DrawReadThis1(void);
+void M_DrawReadThis2(void);
+void M_DrawReadThis3(void); // [STRIFE]
+void M_DrawNewGame(void);
+void M_DrawEpisode(void);
+void M_DrawOptions(void);
+void M_DrawSound(void);
+void M_DrawLoad(void);
+void M_DrawSave(void);
+
+void M_DrawSaveLoadBorder(int x,int y);
+void M_SetupNextMenu(menu_t *menudef);
+void M_DrawThermo(int x,int y,int thermWidth,int thermDot);
+void M_DrawEmptyCell(menu_t *menu,int item);
+void M_DrawSelCell(menu_t *menu,int item);
+int  M_StringWidth(const char *string);
+int  M_StringHeight(const char *string);
+void M_StartMessage(const char *string,void *routine,boolean input);
+void M_StopMessage(void);
+
+
+
+
+//
+// DOOM MENU
+//
+enum
+{
+    newgame = 0,
+    options,
+    loadgame,
+    savegame,
+    readthis,
+    quitdoom,
+    main_end
+} main_e;
+
+menuitem_t MainMenu[]=
+{
+    {1,"M_NGAME",M_NewGame,'n'},
+    {1,"M_OPTION",M_Options,'o'},
+    {1,"M_LOADG",M_LoadGame,'l'},
+    {1,"M_SAVEG",M_SaveGame,'s'},
+    // Another hickup with Special edition.
+    {1,"M_RDTHIS",M_ReadThis,'h'}, // haleyjd 08/28/10: 'r' -> 'h'
+    {1,"M_QUITG",M_QuitStrife,'q'}
+};
+
+menu_t  MainDef =
+{
+    main_end,
+    NULL,
+    MainMenu,
+    M_DrawMainMenu,
+    97,45, // haleyjd 08/28/10: [STRIFE] changed y coord
+    0
+};
+
+
+//
+// EPISODE SELECT
+//
+/*
+enum
+{
+    ep1,
+    ep2,
+    ep3,
+    ep4,
+    ep_end
+} episodes_e;
+
+menuitem_t EpisodeMenu[]=
+{
+    {1,"M_EPI1", M_Episode,'k'},
+    {1,"M_EPI2", M_Episode,'t'},
+    {1,"M_EPI3", M_Episode,'i'},
+    {1,"M_EPI4", M_Episode,'t'}
+};
+
+menu_t  EpiDef =
+{
+    ep_end,		// # of menu items
+    &MainDef,		// previous menu
+    EpisodeMenu,	// menuitem_t ->
+    M_DrawEpisode,	// drawing routine ->
+    48,63,              // x,y
+    ep1			// lastOn
+};
+*/
+
+//
+// NEW GAME
+//
+enum
+{
+    killthings,
+    toorough,
+    hurtme,
+    violence,
+    nightmare,
+    newg_end
+} newgame_e;
+
+menuitem_t NewGameMenu[]=
+{
+    // haleyjd 08/28/10: [STRIFE] changed all shortcut letters
+    {1,"M_JKILL",   M_ChooseSkill, 't'},
+    {1,"M_ROUGH",   M_ChooseSkill, 'r'},
+    {1,"M_HURT",    M_ChooseSkill, 'v'},
+    {1,"M_ULTRA",   M_ChooseSkill, 'e'},
+    {1,"M_NMARE",   M_ChooseSkill, 'b'}
+};
+
+menu_t  NewDef =
+{
+    newg_end,           // # of menu items
+    &MainDef,           // previous menu - haleyjd [STRIFE] changed to MainDef
+    NewGameMenu,        // menuitem_t ->
+    M_DrawNewGame,      // drawing routine ->
+    48,63,              // x,y
+    toorough            // lastOn - haleyjd [STRIFE]: default to skill 1
+};
+
+//
+// OPTIONS MENU
+//
+enum
+{
+    // haleyjd 08/28/10: [STRIFE] Removed messages, mouse sens., detail.
+    endgame,
+    scrnsize,
+    option_empty1,
+    soundvol,
+    opt_end
+} options_e;
+
+menuitem_t OptionsMenu[]=
+{
+    // haleyjd 08/28/10: [STRIFE] Removed messages, mouse sens., detail.
+    {1,"M_ENDGAM",	M_EndGame,'e'},
+    {2,"M_SCRNSZ",	M_SizeDisplay,'s'},
+    {-1,"",0,'\0'},
+    {1,"M_SVOL",	M_Sound,'s'}
+};
+
+menu_t  OptionsDef =
+{
+    opt_end,
+    &MainDef,
+    OptionsMenu,
+    M_DrawOptions,
+    60,37,
+    0
+};
+
+//
+// Read This! MENU 1 & 2 & [STRIFE] 3
+//
+enum
+{
+    rdthsempty1,
+    read1_end
+} read_e;
+
+menuitem_t ReadMenu1[] =
+{
+    {1,"",M_ReadThis2,0}
+};
+
+menu_t  ReadDef1 =
+{
+    read1_end,
+    &MainDef,
+    ReadMenu1,
+    M_DrawReadThis1,
+    280,185,
+    0
+};
+
+enum
+{
+    rdthsempty2,
+    read2_end
+} read_e2;
+
+menuitem_t ReadMenu2[]=
+{
+    {1,"",M_ReadThis3,0} // haleyjd 08/28/10: [STRIFE] Go to ReadThis3
+};
+
+menu_t  ReadDef2 =
+{
+    read2_end,
+    &ReadDef1,
+    ReadMenu2,
+    M_DrawReadThis2,
+    250,185, // haleyjd 08/28/10: [STRIFE] changed coords
+    0
+};
+
+// haleyjd 08/28/10: Added Read This! menu 3
+enum
+{
+    rdthsempty3,
+    read3_end
+} read_e3;
+
+menuitem_t ReadMenu3[]=
+{
+    {1,"",M_ClearMenus,0}
+};
+
+menu_t  ReadDef3 =
+{
+    read3_end,
+    &ReadDef2,
+    ReadMenu3,
+    M_DrawReadThis3,
+    250, 185,
+    0
+};
+
+//
+// SOUND VOLUME MENU
+//
+enum
+{
+    sfx_vol,
+    sfx_empty1,
+    music_vol,
+    sfx_empty2,
+    voice_vol,
+    sfx_empty3,
+    sfx_mouse,
+    sfx_empty4,
+    sound_end
+} sound_e;
+
+// haleyjd 08/29/10:
+// [STRIFE] 
+// * Added voice volume
+// * Moved mouse sensitivity here (who knows why...)
+menuitem_t SoundMenu[]=
+{
+    {2,"M_SFXVOL",M_SfxVol,'s'},
+    {-1,"",0,'\0'},
+    {2,"M_MUSVOL",M_MusicVol,'m'},
+    {-1,"",0,'\0'},
+    {2,"M_VOIVOL",M_VoiceVol,'v'}, 
+    {-1,"",0,'\0'},
+    {2,"M_MSENS",M_ChangeSensitivity,'m'},
+    {-1,"",0,'\0'}
+};
+
+menu_t  SoundDef =
+{
+    sound_end,
+    &OptionsDef,
+    SoundMenu,
+    M_DrawSound,
+    80,35,       // [STRIFE] changed y coord 64 -> 35
+    0
+};
+
+//
+// LOAD GAME MENU
+//
+enum
+{
+    load1,
+    load2,
+    load3,
+    load4,
+    load5,
+    load6,
+    load_end
+} load_e;
+
+menuitem_t LoadMenu[]=
+{
+    {1,"", M_LoadSelect,'1'},
+    {1,"", M_LoadSelect,'2'},
+    {1,"", M_LoadSelect,'3'},
+    {1,"", M_LoadSelect,'4'},
+    {1,"", M_LoadSelect,'5'},
+    {1,"", M_LoadSelect,'6'}
+};
+
+menu_t  LoadDef =
+{
+    load_end,
+    &MainDef,
+    LoadMenu,
+    M_DrawLoad,
+    80,54,
+    0
+};
+
+//
+// SAVE GAME MENU
+//
+menuitem_t SaveMenu[]=
+{
+    {1,"", M_SaveSelect,'1'},
+    {1,"", M_SaveSelect,'2'},
+    {1,"", M_SaveSelect,'3'},
+    {1,"", M_SaveSelect,'4'},
+    {1,"", M_SaveSelect,'5'},
+    {1,"", M_SaveSelect,'6'}
+};
+
+menu_t  SaveDef =
+{
+    load_end,
+    &MainDef,
+    SaveMenu,
+    M_DrawSave,
+    80,54,
+    0
+};
+
+void M_DrawNameChar(void);
+
+//
+// NAME CHARACTER MENU
+//
+// [STRIFE]
+// haleyjd 20110210: New "Name Your Character" Menu
+//
+menu_t NameCharDef =
+{
+    load_end,
+    &NewDef,
+    SaveMenu,
+    M_DrawNameChar,
+    80,54,
+    0
+};
+
+
+//
+// M_ReadSaveStrings
+//  read the strings from the savegame files
+//
+// [STRIFE]
+// haleyjd 20110210: Rewritten to read "name" file in each slot directory
+//
+void M_ReadSaveStrings(void)
+{
+    FILE *handle;
+    int   i;
+    char *fname = NULL;
+
+    for(i = 0; i < load_end; i++)
+    {
+        int retval;
+        if(fname)
+            Z_Free(fname);
+        fname = M_SafeFilePath(savegamedir, M_MakeStrifeSaveDir(i, "\\name"));
+
+        handle = M_fopen(fname, "rb");
+        if(handle == NULL)
+        {
+            M_StringCopy(savegamestrings[i], DEH_String(EMPTYSTRING),
+                         sizeof(savegamestrings[i]));
+            LoadMenu[i].status = 0;
+            continue;
+        }
+        retval = fread(savegamestrings[i], 1, SAVESTRINGSIZE, handle);
+        fclose(handle);
+        LoadMenu[i].status = retval == SAVESTRINGSIZE;
+    }
+
+    if(fname)
+        Z_Free(fname);
+}
+
+//
+// M_DrawNameChar
+//
+// haleyjd 09/22/10: [STRIFE] New function
+// Handler for drawing the "Name Your Character" menu.
+//
+void M_DrawNameChar(void)
+{
+    int i;
+
+    M_WriteText(72, 28, DEH_String("Name Your Character"));
+
+    for (i = 0;i < load_end; i++)
+    {
+        M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
+        M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
+    }
+
+    if (saveStringEnter)
+    {
+        i = M_StringWidth(savegamestrings[quickSaveSlot]);
+        M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*quickSaveSlot,"_");
+    }
+}
+
+//
+// M_DoNameChar
+//
+// haleyjd 09/22/10: [STRIFE] New function
+// Handler for items in the "Name Your Character" menu.
+//
+void M_DoNameChar(int choice)
+{
+    int map;
+
+    // 20130301: clear naming character flag for 1.31 save logic
+    if(gameversion == exe_strife_1_31)
+        namingCharacter = false;
+    sendsave = 1;
+    ClearTmp();
+    G_WriteSaveName(choice, savegamestrings[choice]);
+    quickSaveSlot = choice;  
+    SaveDef.lastOn = choice;
+    ClearSlot();
+    FromCurr();
+    
+    if(isdemoversion)
+        map = 33;
+    else
+        map = 2;
+
+    G_DeferedInitNew(menuskill, map);
+    M_ClearMenus(0);
+}
+
+//
+// M_LoadGame & Cie.
+//
+void M_DrawLoad(void)
+{
+    int             i;
+
+    V_DrawPatchDirect(72, 28, 
+                      W_CacheLumpName(DEH_String("M_LOADG"), PU_CACHE));
+
+    for (i = 0;i < load_end; i++)
+    {
+        M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
+        M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
+    }
+}
+
+
+
+//
+// Draw border for the savegame description
+//
+void M_DrawSaveLoadBorder(int x,int y)
+{
+    int             i;
+
+    V_DrawPatchDirect(x - 8, y + 7,
+                      W_CacheLumpName(DEH_String("M_LSLEFT"), PU_CACHE));
+
+    for (i = 0;i < 24;i++)
+    {
+        V_DrawPatchDirect(x, y + 7,
+                          W_CacheLumpName(DEH_String("M_LSCNTR"), PU_CACHE));
+        x += 8;
+    }
+
+    V_DrawPatchDirect(x, y + 7, 
+                      W_CacheLumpName(DEH_String("M_LSRGHT"), PU_CACHE));
+}
+
+
+
+//
+// User wants to load this game
+//
+void M_LoadSelect(int choice)
+{
+    // [STRIFE]: completely rewritten
+    char *name = NULL;
+
+    G_WriteSaveName(choice, savegamestrings[choice]);
+    ToCurr();
+
+    // use safe & portable filepath concatenation for Choco
+    name = M_SafeFilePath(savegamedir, M_MakeStrifeSaveDir(choice, ""));
+
+    G_ReadCurrent(name);
+    quickSaveSlot = choice;
+    M_ClearMenus(0);
+
+    Z_Free(name);
+}
+
+//
+// Selected from DOOM menu
+//
+// [STRIFE] Verified unmodified
+//
+void M_LoadGame (int choice)
+{
+    if (netgame)
+    {
+        M_StartMessage(DEH_String(LOADNET), NULL, false);
+        return;
+    }
+
+    M_SetupNextMenu(&LoadDef);
+    M_ReadSaveStrings();
+}
+
+
+//
+//  M_SaveGame & Cie.
+//
+void M_DrawSave(void)
+{
+    int             i;
+
+    V_DrawPatchDirect(72, 28, W_CacheLumpName(DEH_String("M_SAVEG"), PU_CACHE));
+    for (i = 0;i < load_end; i++)
+    {
+        M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
+        M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
+    }
+
+    if (saveStringEnter)
+    {
+        i = M_StringWidth(savegamestrings[quickSaveSlot]);
+        M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*quickSaveSlot,"_");
+    }
+}
+
+//
+// M_Responder calls this when user is finished
+//
+void M_DoSave(int slot)
+{
+    // [STRIFE]: completely rewritten
+    if(slot >= 0)
+    {
+        sendsave = 1;
+        G_WriteSaveName(slot, savegamestrings[slot]);
+        M_ClearMenus(0);
+        quickSaveSlot = slot;        
+        // haleyjd 20130922: slight divergence. We clear the destination slot 
+        // of files here, which vanilla did not do. As a result, 1.31 had 
+        // broken save behavior to the point of unusability. fraggle agrees 
+        // this is detrimental enough to be fixed - unconditionally, for now.
+        ClearSlot();        
+        FromCurr();
+    }
+    else
+        M_StartMessage(DEH_String(QSAVESPOT), NULL, false);
+}
+
+//
+// User wants to save. Start string input for M_Responder
+//
+void M_SaveSelect(int choice)
+{
+    int x, y;
+
+    // we are going to be intercepting all chars
+    saveStringEnter = 1;
+
+    // We need to turn on text input:
+    x = LoadDef.x - 11;
+    y = LoadDef.y + choice * LINEHEIGHT - 4;
+    I_StartTextInput(x, y, x + 8 + 24 * 8 + 8, y + LINEHEIGHT - 2);
+
+    // [STRIFE]
+    quickSaveSlot = choice;
+    //saveSlot = choice;
+
+    M_StringCopy(saveOldString, savegamestrings[choice], sizeof(saveOldString));
+    if (!strcmp(savegamestrings[choice], DEH_String(EMPTYSTRING)))
+        savegamestrings[choice][0] = 0;
+    saveCharIndex = strlen(savegamestrings[choice]);
+}
+
+//
+// Selected from DOOM menu
+//
+void M_SaveGame (int choice)
+{
+    // [STRIFE]
+    if (netgame)
+    {
+        // haleyjd 20110211: Hooray for Rogue's awesome multiplayer support...
+        M_StartMessage(DEH_String("You can't save a netgame"), NULL, false);
+        return;
+    }
+    if (!usergame)
+    {
+        M_StartMessage(DEH_String(SAVEDEAD),NULL,false);
+        return;
+    }
+
+    if (gamestate != GS_LEVEL)
+        return;
+
+    // [STRIFE]
+    if(gameversion == exe_strife_1_31)
+    {
+        // haleyjd 20130301: in 1.31, we can choose a slot again.
+        M_SetupNextMenu(&SaveDef);
+        M_ReadSaveStrings();
+    }
+    else
+    {
+        // In 1.2 and lower, you save over your character slot exclusively
+        M_ReadSaveStrings();
+        M_DoSave(quickSaveSlot);
+    }
+}
+
+
+
+//
+//      M_QuickSave
+//
+char    tempstring[80];
+
+void M_QuickSaveResponse(int key)
+{
+    if (key == key_menu_confirm)
+    {
+        M_DoSave(quickSaveSlot);
+        S_StartSound(NULL, sfx_mtalht); // [STRIFE] sound
+    }
+}
+
+void M_QuickSave(void)
+{
+    if (netgame)
+    {
+        // haleyjd 20110211 [STRIFE]: More fun...
+        M_StartMessage(DEH_String("You can't save a netgame"), NULL, false);
+        return;
+    }
+
+    if (!usergame)
+    {
+        S_StartSound(NULL, sfx_oof);
+        return;
+    }
+
+    if (gamestate != GS_LEVEL)
+        return;
+
+    if (quickSaveSlot < 0)
+    {
+        M_StartControlPanel();
+        M_ReadSaveStrings();
+        M_SetupNextMenu(&SaveDef);
+        quickSaveSlot = -2;	// means to pick a slot now
+        return;
+    }
+    DEH_snprintf(tempstring, 80, QSPROMPT, savegamestrings[quickSaveSlot]);
+    M_StartMessage(tempstring,M_QuickSaveResponse,true);
+}
+
+
+
+//
+// M_QuickLoadResponse
+//
+void M_QuickLoadResponse(int key)
+{
+    if (key == key_menu_confirm)
+    {
+        M_LoadSelect(quickSaveSlot);
+        S_StartSound(NULL, sfx_mtalht); // [STRIFE] sound
+    }
+}
+
+//
+// M_QuickLoad
+//
+// [STRIFE] Verified unmodified
+//
+void M_QuickLoad(void)
+{
+    if (netgame)
+    {
+        M_StartMessage(DEH_String(QLOADNET),NULL,false);
+        return;
+    }
+
+    if (quickSaveSlot < 0)
+    {
+        M_StartMessage(DEH_String(QSAVESPOT),NULL,false);
+        return;
+    }
+    DEH_snprintf(tempstring, 80, QLPROMPT, savegamestrings[quickSaveSlot]);
+    M_StartMessage(tempstring,M_QuickLoadResponse,true);
+}
+
+
+
+
+//
+// Read This Menus
+// Had a "quick hack to fix romero bug"
+// haleyjd 08/28/10: [STRIFE] Draw HELP1, unconditionally.
+//
+void M_DrawReadThis1(void)
+{
+    inhelpscreens = true;
+
+    V_DrawPatchDirect (0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE));
+}
+
+
+
+//
+// Read This Menus
+// haleyjd 08/28/10: [STRIFE] Not optional, draws HELP2
+//
+void M_DrawReadThis2(void)
+{
+    inhelpscreens = true;
+
+    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP2"), PU_CACHE));
+}
+
+
+//
+// Read This Menus
+// haleyjd 08/28/10: [STRIFE] New function to draw HELP3.
+//
+void M_DrawReadThis3(void)
+{
+    inhelpscreens = true;
+    
+    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP3"), PU_CACHE));
+}
+
+//
+// Change Sfx & Music volumes
+//
+// haleyjd 08/29/10: [STRIFE]
+// * Changed title graphic coordinates
+// * Added voice volume and sensitivity sliders
+//
+void M_DrawSound(void)
+{
+    V_DrawPatchDirect (100, 10, W_CacheLumpName(DEH_String("M_SVOL"), PU_CACHE));
+
+    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_vol+1),
+                 16,sfxVolume);
+
+    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(music_vol+1),
+                 16,musicVolume);
+
+    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(voice_vol+1),
+                 16,voiceVolume);
+
+    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_mouse+1),
+                 16,mouseSensitivity);
+}
+
+void M_Sound(int choice)
+{
+    M_SetupNextMenu(&SoundDef);
+}
+
+void M_SfxVol(int choice)
+{
+    switch(choice)
+    {
+    case 0:
+        if (sfxVolume)
+            sfxVolume--;
+        break;
+    case 1:
+        if (sfxVolume < 15)
+            sfxVolume++;
+        break;
+    }
+
+    S_SetSfxVolume(sfxVolume * 8);
+}
+
+//
+// M_VoiceVol
+//
+// haleyjd 08/29/10: [STRIFE] New function
+// Sets voice volume level.
+//
+void M_VoiceVol(int choice)
+{
+    switch(choice)
+    {
+    case 0:
+        if (voiceVolume)
+            voiceVolume--;
+        break;
+    case 1:
+        if (voiceVolume < 15)
+            voiceVolume++;
+        break;
+    }
+
+    S_SetVoiceVolume(voiceVolume * 8);
+}
+
+void M_MusicVol(int choice)
+{
+    switch(choice)
+    {
+    case 0:
+        if (musicVolume)
+            musicVolume--;
+        break;
+    case 1:
+        if (musicVolume < 15)
+            musicVolume++;
+        break;
+    }
+
+    S_SetMusicVolume(musicVolume * 8);
+}
+
+
+
+
+//
+// M_DrawMainMenu
+//
+// haleyjd 08/27/10: [STRIFE] Changed x coordinate; M_DOOM -> M_STRIFE
+//
+void M_DrawMainMenu(void)
+{
+    V_DrawPatchDirect(84, 2,
+                      W_CacheLumpName(DEH_String("M_STRIFE"), PU_CACHE));
+}
+
+
+
+
+//
+// M_NewGame
+//
+// haleyjd 08/31/10: [STRIFE] Changed M_NEWG -> M_NGAME
+//
+void M_DrawNewGame(void)
+{
+    V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NGAME"), PU_CACHE));
+    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_SKILL"), PU_CACHE));
+}
+
+void M_NewGame(int choice)
+{
+    if (netgame && !demoplayback)
+    {
+        M_StartMessage(DEH_String(NEWGAME),NULL,false);
+        return;
+    }
+    // haleyjd 09/07/10: [STRIFE] Removed Chex Quest and DOOM gamemodes
+    if(gameversion == exe_strife_1_31)
+       namingCharacter = true; // for 1.31 save logic
+    M_SetupNextMenu(&NewDef);
+}
+
+
+//
+//      M_Episode
+//
+
+// haleyjd: [STRIFE] Unused
+/*
+int     epi;
+
+void M_DrawEpisode(void)
+{
+    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_EPISOD"), PU_CACHE));
+}
+
+void M_VerifyNightmare(int key)
+{
+    if (key != key_menu_confirm)
+        return;
+
+    G_DeferedInitNew(nightmare, 1);
+    M_ClearMenus (0);
+}
+*/
+
+void M_ChooseSkill(int choice)
+{
+    // haleyjd 09/07/10: Removed nightmare confirmation
+    // [STRIFE]: start "Name Your Character" menu
+    menuskill = choice;
+    currentMenu = &NameCharDef;
+    itemOn = NameCharDef.lastOn;
+    M_ReadSaveStrings();
+}
+
+/*
+// haleyjd [STRIFE] Unused
+void M_Episode(int choice)
+{
+    if ( (gamemode == shareware)
+	 && choice)
+    {
+	M_StartMessage(DEH_String(SWSTRING),NULL,false);
+	M_SetupNextMenu(&ReadDef1);
+	return;
+    }
+
+    // Yet another hack...
+    if ( (gamemode == registered)
+	 && (choice > 2))
+    {
+      fprintf( stderr,
+	       "M_Episode: 4th episode requires UltimateDOOM\n");
+      choice = 0;
+    }
+	 
+    epi = choice;
+    M_SetupNextMenu(&NewDef);
+}
+*/
+
+
+//
+// M_Options
+//
+char    detailNames[2][9]	= {"M_GDHIGH","M_GDLOW"};
+char	msgNames[2][9]		= {"M_MSGOFF","M_MSGON"};
+
+
+void M_DrawOptions(void)
+{
+    // haleyjd 08/27/10: [STRIFE] M_OPTTTL -> M_OPTION
+    V_DrawPatchDirect(108, 15, 
+                      W_CacheLumpName(DEH_String("M_OPTION"), PU_CACHE));
+
+    // haleyjd 08/26/10: [STRIFE] Removed messages, sensitivity, detail.
+
+    M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(scrnsize+1),
+                 9,screenSize);
+}
+
+void M_Options(int choice)
+{
+    M_SetupNextMenu(&OptionsDef);
+}
+
+//
+// M_AutoUseHealth
+//
+// [STRIFE] New function
+// haleyjd 20110211: toggle autouse health state
+//
+void M_AutoUseHealth(void)
+{
+    if(!netgame && usergame)
+    {
+        players[consoleplayer].cheats ^= CF_AUTOHEALTH;
+
+        if(players[consoleplayer].cheats & CF_AUTOHEALTH)
+            players[consoleplayer].message = DEH_String("Auto use health ON");
+        else
+            players[consoleplayer].message = DEH_String("Auto use health OFF");
+    }
+}
+
+//
+// M_ChangeShowText
+//
+// [STRIFE] New function
+//
+void M_ChangeShowText(void)
+{
+    dialogshowtext ^= true;
+
+    if(dialogshowtext)
+        players[consoleplayer].message = DEH_String("Conversation Text On");
+    else
+        players[consoleplayer].message = DEH_String("Conversation Text Off");
+}
+
+//
+//      Toggle messages on/off
+//
+// [STRIFE] Messages cannot be disabled in Strife
+/*
+void M_ChangeMessages(int choice)
+{
+    // warning: unused parameter `int choice'
+    choice = 0;
+    showMessages = 1 - showMessages;
+
+    if (!showMessages)
+        players[consoleplayer].message = DEH_String(MSGOFF);
+    else
+        players[consoleplayer].message = DEH_String(MSGON);
+
+    message_dontfuckwithme = true;
+}
+*/
+
+
+//
+// M_EndGame
+//
+void M_EndGameResponse(int key)
+{
+    if (key != key_menu_confirm)
+        return;
+
+    currentMenu->lastOn = itemOn;
+    M_ClearMenus (0);
+    D_StartTitle ();
+}
+
+void M_EndGame(int choice)
+{
+    choice = 0;
+    if (!usergame)
+    {
+        S_StartSound(NULL,sfx_oof);
+        return;
+    }
+
+    if (netgame)
+    {
+        M_StartMessage(DEH_String(NETEND),NULL,false);
+        return;
+    }
+
+    M_StartMessage(DEH_String(ENDGAME),M_EndGameResponse,true);
+}
+
+
+
+
+//
+// M_ReadThis
+//
+void M_ReadThis(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&ReadDef1);
+}
+
+//
+// M_ReadThis2
+//
+// haleyjd 08/28/10: [STRIFE] Eliminated DOOM stuff.
+//
+void M_ReadThis2(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&ReadDef2);
+}
+
+//
+// M_ReadThis3
+//
+// haleyjd 08/28/10: [STRIFE] New function.
+//
+void M_ReadThis3(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&ReadDef3);
+}
+
+/*
+// haleyjd 08/28/10: [STRIFE] Not used.
+void M_FinishReadThis(int choice)
+{
+    choice = 0;
+    M_SetupNextMenu(&MainDef);
+}
+*/
+
+#if 0
+
+//
+// M_CheckStartCast
+//
+// [STRIFE] New but unused function. Was going to start a cast
+//   call from within the menu system... not functional even in
+//   the earliest demo version.
+//
+void M_CheckStartCast()
+{
+    if(usergame)
+    {
+        M_StartMessage(DEH_String("You have to end your game first."), NULL, false);
+        return;
+    }
+
+    F_StartCast();
+    M_ClearMenus(0);
+}
+#endif
+
+//
+// M_QuitResponse
+//
+// haleyjd 09/11/10: [STRIFE] Modifications to start up endgame
+// demosequence.
+//
+void M_QuitResponse(int key)
+{
+    char buffer[20];
+
+    if (key != key_menu_confirm)
+        return;
+
+    if(netgame)
+        I_Quit();
+    else
+    {
+        DEH_snprintf(buffer, sizeof(buffer), "qfmrm%i", gametic % 8 + 1);
+        I_StartVoice(buffer);
+        D_QuitGame();
+    }
+}
+
+/*
+// haleyjd 09/11/10: [STRIFE] Unused
+static char *M_SelectEndMessage(void)
+{
+}
+*/
+
+//
+// M_QuitStrife
+//
+// [STRIFE] Renamed from M_QuitDOOM
+// haleyjd 09/11/10: No randomized text message; that's taken care of
+// by the randomized voice message after confirmation.
+//
+void M_QuitStrife(int choice)
+{
+    DEH_snprintf(endstring, sizeof(endstring),
+                 "Do you really want to leave?\n\n" DOSY);
+  
+    M_StartMessage(endstring, M_QuitResponse, true);
+}
+
+
+
+
+void M_ChangeSensitivity(int choice)
+{
+    switch(choice)
+    {
+    case 0:
+        if (mouseSensitivity)
+            mouseSensitivity--;
+        break;
+    case 1:
+        if (mouseSensitivity < 9)
+            mouseSensitivity++;
+        break;
+    }
+}
+
+/*
+// haleyjd [STRIFE] Unused
+void M_ChangeDetail(int choice)
+{
+    choice = 0;
+    detailLevel = 1 - detailLevel;
+
+    R_SetViewSize (screenblocks, detailLevel);
+
+    if (!detailLevel)
+	players[consoleplayer].message = DEH_String(DETAILHI);
+    else
+	players[consoleplayer].message = DEH_String(DETAILLO);
+}
+*/
+
+// [STRIFE] Verified unmodified
+void M_SizeDisplay(int choice)
+{
+    switch(choice)
+    {
+    case 0:
+        if (screenSize > 0)
+        {
+            screenblocks--;
+            screenSize--;
+        }
+        break;
+    case 1:
+        if (screenSize < 8)
+        {
+            screenblocks++;
+            screenSize++;
+        }
+        break;
+    }
+
+    R_SetViewSize (screenblocks, detailLevel);
+}
+
+
+
+
+//
+//      Menu Functions
+//
+
+//
+// M_DrawThermo
+//
+// haleyjd 08/28/10: [STRIFE] Changes to some patch coordinates.
+//
+void
+M_DrawThermo
+( int	x,
+  int	y,
+  int	thermWidth,
+  int	thermDot )
+{
+    int         xx;
+    int         yy; // [STRIFE] Needs a temp y coordinate variable
+    int         i;
+
+    xx = x;
+    yy = y + 6; // [STRIFE] +6 to y coordinate
+    V_DrawPatchDirect(xx, yy, W_CacheLumpName(DEH_String("M_THERML"), PU_CACHE));
+    xx += 8;
+    for (i=0;i<thermWidth;i++)
+    {
+        V_DrawPatchDirect(xx, yy, W_CacheLumpName(DEH_String("M_THERMM"), PU_CACHE));
+        xx += 8;
+    }
+    V_DrawPatchDirect(xx, yy, W_CacheLumpName(DEH_String("M_THERMR"), PU_CACHE));
+
+    // [STRIFE] +2 to initial y coordinate
+    V_DrawPatchDirect((x + 8) + thermDot * 8, y + 2,
+                      W_CacheLumpName(DEH_String("M_THERMO"), PU_CACHE));
+}
+
+
+// haleyjd: These are from DOOM v0.5 and the prebeta! They drew those ugly red &
+// blue checkboxes... preserved for historical interest, as not in Strife.
+void
+M_DrawEmptyCell
+( menu_t*	menu,
+  int		item )
+{
+    V_DrawPatchDirect(menu->x - 10, menu->y + item * LINEHEIGHT - 1, 
+                      W_CacheLumpName(DEH_String("M_CELL1"), PU_CACHE));
+}
+
+void
+M_DrawSelCell
+( menu_t*	menu,
+  int		item )
+{
+    V_DrawPatchDirect(menu->x - 10, menu->y + item * LINEHEIGHT - 1,
+                      W_CacheLumpName(DEH_String("M_CELL2"), PU_CACHE));
+}
+
+
+void
+M_StartMessage
+( const char	*string,
+  void*		routine,
+  boolean	input )
+{
+    messageLastMenuActive = menuactive;
+    messageToPrint = 1;
+    messageString = string;
+    messageRoutine = routine;
+    messageNeedsInput = input;
+    menuactive = true;
+    return;
+}
+
+
+
+void M_StopMessage(void)
+{
+    menuactive = messageLastMenuActive;
+    messageToPrint = 0;
+}
+
+
+
+//
+// Find string width from hu_font chars
+//
+int M_StringWidth(const char *string)
+{
+    size_t             i;
+    int             w = 0;
+    int             c;
+
+    for (i = 0;i < strlen(string);i++)
+    {
+        c = toupper(string[i]) - HU_FONTSTART;
+        if (c < 0 || c >= HU_FONTSIZE)
+            w += 4;
+        else
+            w += SHORT (hu_font[c]->width);
+    }
+
+    return w;
+}
+
+
+
+//
+//      Find string height from hu_font chars
+//
+int M_StringHeight(const char *string)
+{
+    size_t             i;
+    int             h;
+    int             height = SHORT(hu_font[0]->height);
+
+    h = height;
+    for (i = 0;i < strlen(string);i++)
+        if (string[i] == '\n')
+            h += height;
+
+    return h;
+}
+
+
+//
+// M_WriteText
+//
+// Write a string using the hu_font
+// haleyjd 09/04/10: [STRIFE]
+// * Rogue made a lot of changes to this for the dialog system.
+//
+int
+M_WriteText
+( int           x,
+  int           y,
+  const char*   string) // haleyjd: made const for safety w/dialog engine
+{
+    int	        w;
+    const char* ch;
+    int         c;
+    int         cx;
+    int         cy;
+
+    ch = string;
+    cx = x;
+    cy = y;
+
+    while(1)
+    {
+        c = *ch++;
+        if (!c)
+            break;
+
+        // haleyjd 09/04/10: [STRIFE] Don't draw spaces at the start of lines.
+        if(c == ' ' && cx == x)
+            continue;
+
+        if (c == '\n')
+        {
+            cx = x;
+            cy += 11; // haleyjd 09/04/10: [STRIFE]: Changed 12 -> 11
+            continue;
+        }
+
+        c = toupper(c) - HU_FONTSTART;
+        if (c < 0 || c>= HU_FONTSIZE)
+        {
+            cx += 4;
+            continue;
+        }
+
+        w = SHORT (hu_font[c]->width);
+
+        // haleyjd 09/04/10: [STRIFE] Different linebreak handling
+        if (cx + w > SCREENWIDTH - 20)
+        {
+            cx = x;
+            cy += 11;
+            --ch;
+        }
+        else
+        {
+            V_DrawPatchDirect(cx, cy, hu_font[c]);
+            cx += w;
+        }
+    }
+
+    // [STRIFE] Return final y coordinate.
+    return cy + 12;
+}
+
+//
+// M_DialogDimMsg
+//
+// [STRIFE] New function
+// haleyjd 09/04/10: Painstakingly transformed from the assembly code, as the
+// decompiler could not touch it. Redimensions a string to fit on screen, leaving
+// at least a 20 pixel margin on the right side. The string passed in must be
+// writable.
+//
+void M_DialogDimMsg(int x, int y, char *str, boolean useyfont)
+{
+    int rightbound = (SCREENWIDTH - 20) - x;
+    patch_t **fontarray;  // ebp
+    int linewidth = 0;    // esi
+    int i = 0;            // edx
+    char *message = str;  // edi
+    char  bl;             // bl
+
+    if(useyfont)
+       fontarray = yfont;
+    else
+       fontarray = hu_font;
+
+    bl = toupper(*message);
+
+    if(!bl)
+        return;
+
+    // outer loop - run to end of string
+    do
+    {
+        if(bl != '\n')
+        {
+            int charwidth; // eax
+            int tempwidth; // ecx
+
+            if(bl < HU_FONTSTART || bl > HU_FONTEND)
+                charwidth = 4;
+            else
+                charwidth = SHORT(fontarray[bl - HU_FONTSTART]->width);
+
+            tempwidth = linewidth + charwidth;
+
+            // Test if the line still fits within the boundary...
+            if(tempwidth >= rightbound)
+            {
+                // Doesn't fit...
+                char *tempptr = &message[i]; // ebx
+                char  al;                    // al
+
+                // inner loop - run backward til a space (or the start of the
+                // string) is found, subtracting width off the current line.
+                // BUG: shouldn't we stop at a previous '\n' too?
+                while(*tempptr != ' ' && i > 0)
+                {
+                    tempptr--;
+                    // BUG: they didn't add the first char to linewidth yet...
+                    linewidth -= charwidth; 
+                    i--;
+                    al = toupper(*tempptr);
+                    if(al < HU_FONTSTART || al > HU_FONTEND)
+                        charwidth = 4;
+                    else
+                        charwidth = SHORT(fontarray[al - HU_FONTSTART]->width);
+                }
+                // Replace the space with a linebreak.
+                // BUG: what if i is zero? ... infinite loop time!
+                message[i] = '\n';
+                linewidth = 0;
+            }
+            else
+            {
+                // The line does fit.
+                // Spaces at the start of a line don't count though.
+                if(!(bl == ' ' && linewidth == 0))
+                    linewidth += charwidth;
+            }
+        }
+        else
+            linewidth = 0; // '\n' seen, so reset the line width
+    }
+    while((bl = toupper(message[++i])) != 0); // step to the next character
+}
+
+// These keys evaluate to a "null" key in Vanilla Doom that allows weird
+// jumping in the menus. Preserve this behavior for accuracy.
+
+static boolean IsNullKey(int key)
+{
+    return key == KEY_PAUSE || key == KEY_CAPSLOCK
+        || key == KEY_SCRLCK || key == KEY_NUMLOCK;
+}
+
+//
+// CONTROL PANEL
+//
+
+//
+// M_Responder
+//
+boolean M_Responder (event_t* ev)
+{
+    int             ch;
+    int             key;
+    int             i;
+    static  int     joywait = 0;
+    static  int     mousewait = 0;
+    static  int     mousey = 0;
+    static  int     lasty = 0;
+    static  int     mousex = 0;
+    static  int     lastx = 0;
+    int dir;
+
+    // In testcontrols mode, none of the function keys should do anything
+    // - the only key is escape to quit.
+
+    if (testcontrols)
+    {
+        if (ev->type == ev_quit
+         || (ev->type == ev_keydown
+          && (ev->data1 == key_menu_activate || ev->data1 == key_menu_quit)))
+        {
+            I_Quit();
+            return true;
+        }
+
+        return false;
+    }
+
+    // "close" button pressed on window?
+    if (ev->type == ev_quit)
+    {
+        // First click on close button = bring up quit confirm message.
+        // Second click on close button = confirm quit
+
+        if (menuactive && messageToPrint && messageRoutine == M_QuitResponse)
+        {
+            M_QuitResponse(key_menu_confirm);
+        }
+        else
+        {
+            S_StartSound(NULL, sfx_swtchn);
+            M_QuitStrife(0);
+        }
+
+        return true;
+    }
+
+    // key is the key pressed, ch is the actual character typed
+  
+    ch = 0;
+    key = -1;
+
+    if (ev->type == ev_joystick && joywait < I_GetTime())
+    {
+        if (JOY_GET_DPAD(ev->data6) != JOY_DIR_NONE)
+        {
+            dir = JOY_GET_DPAD(ev->data6);
+        }
+        else if (JOY_GET_LSTICK(ev->data6) != JOY_DIR_NONE)
+        {
+            dir = JOY_GET_LSTICK(ev->data6);
+        }
+        else
+        {
+            dir = JOY_GET_RSTICK(ev->data6);
+        }
+
+        if (dir & JOY_DIR_UP)
+        {
+            key = key_menu_up;
+            joywait = I_GetTime() + 5;
+        }
+        else if (dir & JOY_DIR_DOWN)
+        {
+            key = key_menu_down;
+            joywait = I_GetTime() + 5;
+        }
+        if (dir & JOY_DIR_LEFT)
+        {
+            key = key_menu_left;
+            joywait = I_GetTime() + 5;
+        }
+        else if (dir & JOY_DIR_RIGHT)
+        {
+            key = key_menu_right;
+            joywait = I_GetTime() + 5;
+        }
+
+#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
+#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (ev->data1 & (1 << (x))) != 0)
+
+        if (JOY_BUTTON_PRESSED(joybfire))
+        {
+            // Simulate a 'Y' keypress when Doom show a Y/N dialog with Fire button.
+            if (messageToPrint && messageNeedsInput)
+            {
+                key = key_menu_confirm;
+            }
+            else
+            {
+                key = key_menu_forward;
+            }
+            joywait = I_GetTime() + 5;
+            joystick_fire_countdown = 5;
+        }
+        if (JOY_BUTTON_PRESSED(joybuse))
+        {
+            // Simulate a 'N' keypress when Doom show a Y/N dialog with Use button.
+            if (messageToPrint && messageNeedsInput)
+            {
+                key = key_menu_abort;
+            }
+            else
+            {
+                key = key_menu_back;
+            }
+            joywait = I_GetTime() + 5;
+        }
+        if (JOY_BUTTON_PRESSED(joybmenu))
+        {
+            key = key_menu_activate;
+            joywait = I_GetTime() + 5;
+        }
+    }
+    else
+    {
+        if (ev->type == ev_mouse && mousewait < I_GetTime())
+        {
+            mousey += ev->data3;
+            if (mousey < lasty-30)
+            {
+                key = key_menu_down;
+                mousewait = I_GetTime() + 5;
+                mousey = lasty -= 30;
+            }
+            else if (mousey > lasty+30)
+            {
+                key = key_menu_up;
+                mousewait = I_GetTime() + 5;
+                mousey = lasty += 30;
+            }
+
+            mousex += ev->data2;
+            if (mousex < lastx-30)
+            {
+                key = key_menu_left;
+                mousewait = I_GetTime() + 5;
+                mousex = lastx -= 30;
+            }
+            else if (mousex > lastx+30)
+            {
+                key = key_menu_right;
+                mousewait = I_GetTime() + 5;
+                mousex = lastx += 30;
+            }
+
+            if (ev->data1&1)
+            {
+                key = key_menu_forward;
+                mousewait = I_GetTime() + 15;
+                mouse_fire_countdown = 5;   // villsa [STRIFE]
+            }
+
+            if (ev->data1&2)
+            {
+                key = key_menu_back;
+                mousewait = I_GetTime() + 15;
+            }
+        }
+        else
+        {
+            if (ev->type == ev_keydown)
+            {
+                key = ev->data1;
+                ch = ev->data2;
+            }
+        }
+    }
+
+    if (key == -1)
+        return false;
+
+    // Save Game string input
+    if (saveStringEnter)
+    {
+        switch(key)
+        {
+        case KEY_BACKSPACE:
+            if (saveCharIndex > 0)
+            {
+                saveCharIndex--;
+                savegamestrings[quickSaveSlot][saveCharIndex] = 0;
+            }
+            break;
+
+        case KEY_ESCAPE:
+            saveStringEnter = 0;
+            I_StopTextInput();
+            M_StringCopy(savegamestrings[quickSaveSlot], saveOldString,
+                         sizeof(savegamestrings[quickSaveSlot]));
+            break;
+
+        case KEY_ENTER:
+            // [STRIFE]
+            saveStringEnter = 0;
+            I_StopTextInput();
+            if(gameversion == exe_strife_1_31 && !namingCharacter)
+            {
+               // In 1.31, we can be here as a result of normal saving again,
+               // whereas in 1.2 this only ever happens when naming your
+               // character to begin a new game.
+               M_DoSave(quickSaveSlot);
+               return true;
+            }
+            if (savegamestrings[quickSaveSlot][0])
+                M_DoNameChar(quickSaveSlot);
+            break;
+
+        default:
+            // Savegame name entry. This is complicated.
+            // Vanilla has a bug where the shift key is ignored when entering
+            // a savegame name. If vanilla_keyboard_mapping is on, we want
+            // to emulate this bug by using ev->data1. But if it's turned off,
+            // it implies the user doesn't care about Vanilla emulation:
+            // instead, use ev->data3 which gives the fully-translated and
+            // modified key input.
+
+            if (ev->type != ev_keydown)
+            {
+                break;
+            }
+
+            if (vanilla_keyboard_mapping)
+            {
+                ch = ev->data1;
+            }
+            else
+            {
+                ch = ev->data3;
+            }
+
+            ch = toupper(ch);
+
+            if (ch != ' '
+                && (ch - HU_FONTSTART < 0 || ch - HU_FONTSTART >= HU_FONTSIZE))
+            {
+                break;
+            }
+
+            if (ch >= 32 && ch <= 127 &&
+                saveCharIndex < SAVESTRINGSIZE-1 &&
+                M_StringWidth(savegamestrings[quickSaveSlot]) <
+                (SAVESTRINGSIZE-2)*8)
+            {
+                savegamestrings[quickSaveSlot][saveCharIndex++] = ch;
+                savegamestrings[quickSaveSlot][saveCharIndex] = 0;
+            }
+            break;
+        }
+        return true;
+    }
+
+    // Take care of any messages that need input
+    if (messageToPrint)
+    {
+        if (messageNeedsInput)
+        {
+            if (key != ' ' && key != KEY_ESCAPE
+                && key != key_menu_confirm && key != key_menu_abort)
+            {
+                return false;
+            }
+        }
+
+        menuactive = messageLastMenuActive;
+        messageToPrint = 0;
+        if (messageRoutine)
+            messageRoutine(key);
+
+        menupause = false;                // [STRIFE] unpause
+        menuactive = false;
+        S_StartSound(NULL, sfx_mtalht);   // [STRIFE] sound
+        return true;
+    }
+
+    // [STRIFE]:
+    // * In v1.2 this is moved to F9 (quickload)
+    // * In v1.31 it is moved to F12 with DM spy, and quicksave
+    //   functionality is restored separate from normal saving
+    /*
+    if (devparm && key == key_menu_help)
+    {
+        G_ScreenShot ();
+        return true;
+    }
+    */
+
+    // F-Keys
+    if (!menuactive)
+    {
+        if (key == key_menu_decscreen)      // Screen size down
+        {
+            if (automapactive || chat_on)
+                return false;
+            M_SizeDisplay(0);
+            S_StartSound(NULL, sfx_stnmov);
+            return true;
+        }
+        else if (key == key_menu_incscreen) // Screen size up
+        {
+            if (automapactive || chat_on)
+                return false;
+            M_SizeDisplay(1);
+            S_StartSound(NULL, sfx_stnmov);
+            return true;
+        }
+        else if (key == key_menu_help)     // Help key
+        {
+            M_StartControlPanel ();
+            // haleyjd 08/29/10: [STRIFE] always ReadDef1
+            currentMenu = &ReadDef1; 
+
+            itemOn = 0;
+            S_StartSound(NULL, sfx_swtchn);
+            return true;
+        }
+        else if (key == key_menu_save)     // Save
+        {
+            // [STRIFE]: Hub saves
+            if(gameversion == exe_strife_1_31)
+                namingCharacter = false; // just saving normally, in 1.31
+
+            if(netgame || players[consoleplayer].health <= 0 ||
+                players[consoleplayer].cheats & CF_ONFIRE)
+            {
+                S_StartSound(NULL, sfx_oof);
+            }
+            else
+            {
+                M_StartControlPanel();
+                S_StartSound(NULL, sfx_swtchn);
+                M_SaveGame(0);
+            }
+            return true;
+        }
+        else if (key == key_menu_load)     // Load
+        {
+            // [STRIFE]: Hub saves
+            if(gameversion == exe_strife_1_31)
+            {
+                // 1.31: normal save loading
+                namingCharacter = false;
+                M_StartControlPanel();
+                M_LoadGame(0);
+                S_StartSound(NULL, sfx_swtchn);
+            }
+            else
+            {
+                // Pre 1.31: quickload only
+                S_StartSound(NULL, sfx_swtchn);
+                M_QuickLoad();
+            }
+            return true;
+        }
+        else if (key == key_menu_volume)   // Sound Volume
+        {
+            M_StartControlPanel ();
+            currentMenu = &SoundDef;
+            itemOn = sfx_vol;
+            S_StartSound(NULL, sfx_swtchn);
+            return true;
+        }
+        else if (key == key_menu_detail)   // Detail toggle
+        {
+            //M_ChangeDetail(0);
+            M_AutoUseHealth(); // [STRIFE]
+            S_StartSound(NULL, sfx_swtchn);
+            return true;
+        }
+        else if (key == key_menu_qsave)    // Quicksave
+        {
+            // [STRIFE]: Hub saves
+            if(gameversion == exe_strife_1_31)
+                namingCharacter = false; // for 1.31 save changes
+
+            if(netgame || players[consoleplayer].health <= 0 ||
+               players[consoleplayer].cheats & CF_ONFIRE)
+            {
+                S_StartSound(NULL, sfx_oof);
+            }
+            else
+            {
+                S_StartSound(NULL, sfx_swtchn);
+                M_QuickSave();
+            }
+            return true;
+        }
+        else if (key == key_menu_endgame)  // End game
+        {
+            S_StartSound(NULL, sfx_swtchn);
+            M_EndGame(0);
+            return true;
+        }
+        else if (key == key_menu_messages) // Toggle messages
+        {
+            //M_ChangeMessages(0);
+            M_ChangeShowText(); // [STRIFE]
+            S_StartSound(NULL, sfx_swtchn);
+            return true;
+        }
+        else if (key == key_menu_qload)    // Quickload
+        {
+            // [STRIFE]
+            // * v1.2: takes a screenshot
+            // * v1.31: does quickload again
+            if(gameversion == exe_strife_1_31)
+            {
+                namingCharacter = false;
+                S_StartSound(NULL, sfx_swtchn);
+                M_QuickLoad();
+            }
+            else
+                G_ScreenShot();
+            return true;
+        }
+        else if (key == key_menu_quit)     // Quit DOOM
+        {
+            S_StartSound(NULL, sfx_swtchn);
+            M_QuitStrife(0);
+            return true;
+        }
+        else if (key == key_menu_gamma)    // gamma toggle
+        {
+            usegamma++;
+            if (usegamma > 4)
+                usegamma = 0;
+            players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
+            I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
+            return true;
+        }
+        else if(gameversion == exe_strife_1_31 && key == key_spy)
+        {
+            // haleyjd 20130301: 1.31 moved screenshots to F12.
+            G_ScreenShot();
+            return true;
+        }
+        else if (key != 0 && key == key_menu_screenshot)
+        {
+            G_ScreenShot();
+            return true;
+        }
+    }
+
+    // Pop-up menu?
+    if (!menuactive)
+    {
+        if (key == key_menu_activate)
+        {
+            M_StartControlPanel ();
+            S_StartSound(NULL, sfx_swtchn);
+            return true;
+        }
+        return false;
+    }
+
+    
+    // Keys usable within menu
+
+    if (key == key_menu_down)
+    {
+        // Move down to next item
+
+        do
+        {
+            if (itemOn+1 > currentMenu->numitems-1)
+                itemOn = 0;
+            else itemOn++;
+            S_StartSound(NULL, sfx_pstop);
+        } while(currentMenu->menuitems[itemOn].status==-1);
+
+        return true;
+    }
+    else if (key == key_menu_up)
+    {
+        // Move back up to previous item
+
+        do
+        {
+            if (!itemOn)
+                itemOn = currentMenu->numitems-1;
+            else itemOn--;
+            S_StartSound(NULL, sfx_pstop);
+        } while(currentMenu->menuitems[itemOn].status==-1);
+
+        return true;
+    }
+    else if (key == key_menu_left)
+    {
+        // Slide slider left
+
+        if (currentMenu->menuitems[itemOn].routine &&
+            currentMenu->menuitems[itemOn].status == 2)
+        {
+            S_StartSound(NULL, sfx_stnmov);
+            currentMenu->menuitems[itemOn].routine(0);
+        }
+        return true;
+    }
+    else if (key == key_menu_right)
+    {
+        // Slide slider right
+
+        if (currentMenu->menuitems[itemOn].routine &&
+            currentMenu->menuitems[itemOn].status == 2)
+        {
+            S_StartSound(NULL, sfx_stnmov);
+            currentMenu->menuitems[itemOn].routine(1);
+        }
+        return true;
+    }
+    else if (key == key_menu_forward)
+    {
+        // Activate menu item
+
+        if (currentMenu->menuitems[itemOn].routine &&
+            currentMenu->menuitems[itemOn].status)
+        {
+            currentMenu->lastOn = itemOn;
+            if (currentMenu->menuitems[itemOn].status == 2)
+            {
+                currentMenu->menuitems[itemOn].routine(1);      // right arrow
+                S_StartSound(NULL, sfx_stnmov);
+            }
+            else
+            {
+                currentMenu->menuitems[itemOn].routine(itemOn);
+                //S_StartSound(NULL, sfx_swish); [STRIFE] No sound is played here.
+            }
+        }
+        return true;
+    }
+    else if (key == key_menu_activate)
+    {
+        // Deactivate menu
+        if(gameversion == exe_strife_1_31) // [STRIFE]: 1.31 saving
+            namingCharacter = false;
+
+        if(menuindialog) // [STRIFE] - Get out of dialog engine semi-gracefully
+            P_DialogDoChoice(-1);
+
+        currentMenu->lastOn = itemOn;
+        M_ClearMenus (0);
+        S_StartSound(NULL, sfx_mtalht); // villsa [STRIFE]: sounds
+        return true;
+    }
+    else if (key == key_menu_back)
+    {
+        // Go back to previous menu
+
+        currentMenu->lastOn = itemOn;
+        if (currentMenu->prevMenu)
+        {
+            currentMenu = currentMenu->prevMenu;
+            itemOn = currentMenu->lastOn;
+            S_StartSound(NULL, sfx_swtchn);
+        }
+        return true;
+    }
+
+    // Keyboard shortcut?
+    // Vanilla Strife has a weird behavior where it jumps to the scroll bars
+    // when certain keys are pressed, so emulate this.
+
+    else if (ch != 0 || IsNullKey(key))
+    {
+        // Keyboard shortcut?
+
+        for (i = itemOn+1;i < currentMenu->numitems;i++)
+        {
+            if (currentMenu->menuitems[i].alphaKey == ch)
+            {
+                itemOn = i;
+                S_StartSound(NULL, sfx_pstop);
+                return true;
+            }
+        }
+
+        for (i = 0;i <= itemOn;i++)
+        {
+            if (currentMenu->menuitems[i].alphaKey == ch)
+            {
+                itemOn = i;
+                S_StartSound(NULL, sfx_pstop);
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
+
+//
+// M_StartControlPanel
+//
+void M_StartControlPanel (void)
+{
+    // intro might call this repeatedly
+    if (menuactive)
+        return;
+    
+    menuactive = 1;
+    menupause = true;
+    currentMenu = &MainDef;         // JDC
+    itemOn = currentMenu->lastOn;   // JDC
+}
+
+
+//
+// M_Drawer
+// Called after the view has been rendered,
+// but before it has been blitted.
+//
+void M_Drawer (void)
+{
+    static short	x;
+    static short	y;
+    unsigned int	i;
+    unsigned int	max;
+    char		string[80];
+    const char          *name;
+    int			start;
+
+    inhelpscreens = false;
+    
+    // Horiz. & Vertically center string and print it.
+    if (messageToPrint)
+    {
+        start = 0;
+        y = 100 - M_StringHeight(messageString) / 2;
+        while (messageString[start] != '\0')
+        {
+            int foundnewline = 0;
+
+            for (i = 0; i < strlen(messageString + start); i++)
+            {
+                if (messageString[start + i] == '\n')
+                {
+                    M_StringCopy(string, messageString + start,
+                                 sizeof(string));
+                    if (i < sizeof(string))
+                    {
+                        string[i] = '\0';
+                    }
+
+                    foundnewline = 1;
+                    start += i + 1;
+                    break;
+                }
+            }
+
+            if (!foundnewline)
+            {
+                M_StringCopy(string, messageString + start,
+                             sizeof(string));
+                start += strlen(string);
+            }
+
+            x = 160 - M_StringWidth(string) / 2;
+            M_WriteText(x, y, string);
+            y += SHORT(hu_font[0]->height);
+        }
+
+        return;
+    }
+
+    if (!menuactive)
+        return;
+
+    if (currentMenu->routine)
+        currentMenu->routine();         // call Draw routine
+    
+    // DRAW MENU
+    x = currentMenu->x;
+    y = currentMenu->y;
+    max = currentMenu->numitems;
+
+    for (i=0;i<max;i++)
+    {
+        name = DEH_String(currentMenu->menuitems[i].name);
+
+        if (name[0])
+        {
+            V_DrawPatchDirect (x, y, W_CacheLumpName(name, PU_CACHE));
+        }
+        y += LINEHEIGHT;
+    }
+
+    
+    // haleyjd 08/27/10: [STRIFE] Adjust to draw spinning Sigil
+    // DRAW SIGIL
+    V_DrawPatchDirect(x + CURSORXOFF, currentMenu->y - 5 + itemOn*LINEHEIGHT,
+                      W_CacheLumpName(DEH_String(cursorName[whichCursor]),
+                                      PU_CACHE));
+
+}
+
+
+//
+// M_ClearMenus
+//
+// haleyjd 08/28/10: [STRIFE] Added an int param so this can be called by menus.
+//         09/08/10: Added menupause.
+//
+void M_ClearMenus (int choice)
+{
+    choice = 0;     // haleyjd: for no warning; not from decompilation.
+    menuactive = 0;
+    menupause = 0;
+}
+
+
+
+
+//
+// M_SetupNextMenu
+//
+void M_SetupNextMenu(menu_t *menudef)
+{
+    currentMenu = menudef;
+    itemOn = currentMenu->lastOn;
+}
+
+
+//
+// M_Ticker
+//
+// haleyjd 08/27/10: [STRIFE] Rewritten for Sigil cursor
+//
+void M_Ticker (void)
+{
+    if (--cursorAnimCounter <= 0)
+    {
+        whichCursor = (whichCursor + 1) % 8;
+        cursorAnimCounter = 5;
+    }
+}
+
+
+//
+// M_Init
+//
+// haleyjd 08/27/10: [STRIFE] Removed DOOM gamemode stuff
+//
+void M_Init (void)
+{
+    currentMenu = &MainDef;
+    menuactive = 0;
+    itemOn = currentMenu->lastOn;
+    whichCursor = 0;
+    cursorAnimCounter = 10;
+    screenSize = screenblocks - 3;
+    messageToPrint = 0;
+    messageString = NULL;
+    messageLastMenuActive = menuactive; // STRIFE-FIXME: assigns 0 here...
+    quickSaveSlot = -1;
+
+    // [STRIFE]: Initialize savegame paths and clear temporary directory
+    G_WriteSaveName(5, "ME");
+    ClearTmp();
+
+    // Here we could catch other version dependencies,
+    //  like HELP1/2, and four episodes.
+}
+
diff --git a/games/NXDoom/src/strife/m_menu.h b/games/NXDoom/src/strife/m_menu.h
new file mode 100644
index 000000000..08ad1a244
--- /dev/null
+++ b/games/NXDoom/src/strife/m_menu.h
@@ -0,0 +1,104 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Menu widget stuff, episode selection and such.
+//    
+
+
+#ifndef __M_MENU__
+#define __M_MENU__
+
+#include "d_event.h"
+
+//
+// MENU TYPEDEFS
+//
+
+// haleyjd 09/04/10: [STRIFE] Made external
+
+typedef struct
+{
+    // 0 = no cursor here, 1 = ok, 2 = arrows ok
+    short	status;
+    
+    char	name[10];
+    
+    // choice = menu item #.
+    // if status = 2,
+    //   choice=0:leftarrow,1:rightarrow
+    void	(*routine)(int choice);
+    
+    // hotkey in menu
+    char	alphaKey;			
+} menuitem_t;
+
+typedef struct menu_s
+{
+    short		numitems;	// # of menu items
+    struct menu_s*	prevMenu;	// previous menu
+    menuitem_t*		menuitems;	// menu items
+    void		(*routine)();	// draw routine
+    short		x;
+    short		y;		// x,y of menu
+    short		lastOn;		// last item user was on in menu
+} menu_t;
+
+extern menu_t*	currentMenu;    // villsa [STRIFE] made external
+extern short itemOn;
+
+//
+// MENUS
+//
+// Called by main loop,
+// saves config file and calls I_Quit when user exits.
+// Even when the menu is not displayed,
+// this can resize the view and change game parameters.
+// Does all the real work of the menu interaction.
+boolean M_Responder (event_t *ev);
+
+
+// Called by main loop,
+// only used for menu (skull cursor) animation.
+void M_Ticker (void);
+
+// Called by main loop,
+// draws the menus directly into the screen buffer.
+void M_Drawer (void);
+
+// Called by D_DoomMain,
+// loads the config file.
+void M_Init (void);
+
+// Called by intro code to force menu up upon a keypress,
+// does nothing if menu is already up.
+void M_StartControlPanel (void);
+
+// haleyjd 09/04/10: Externalized. Draws menu text.
+int M_WriteText(int x, int y, const char *string);
+
+// haleyjd 09/04/10: [STRIFE] New function.
+void M_DialogDimMsg(int x, int y, char *str, boolean useyfont);
+
+// haleyjd [STRIFE] Externalized
+void M_ClearMenus (int choice);
+void M_LoadSelect(int choice);
+
+extern int detailLevel;
+extern int screenblocks;
+
+extern  boolean	inhelpscreens;
+
+
+#endif    
diff --git a/games/NXDoom/src/strife/m_random.c b/games/NXDoom/src/strife/m_random.c
new file mode 100644
index 000000000..2098c1a7a
--- /dev/null
+++ b/games/NXDoom/src/strife/m_random.c
@@ -0,0 +1,80 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Random number LUT.
+//
+
+
+#include <time.h>
+
+#include "m_random.h"
+
+//
+// M_Random
+// Returns a 0-255 number
+//
+
+static const unsigned char rndtable[256] = {
+    0,   8, 109, 220, 222, 241, 149, 107,  75, 248, 254, 140,  16,  66 ,
+    74,  21, 211,  47,  80, 242, 154,  27, 205, 128, 161,  89,  77,  36 ,
+    95, 110,  85,  48, 212, 140, 211, 249,  22,  79, 200,  50,  28, 188 ,
+    52, 140, 202, 120,  68, 145,  62,  70, 184, 190,  91, 197, 152, 224 ,
+    149, 104,  25, 178, 252, 182, 202, 182, 141, 197,   4,  81, 181, 242 ,
+    145,  42,  39, 227, 156, 198, 225, 193, 219,  93, 122, 175, 249,   0 ,
+    175, 143,  70, 239,  46, 246, 163,  53, 163, 109, 168, 135,   2, 235 ,
+    25,  92,  20, 145, 138,  77,  69, 166,  78, 176, 173, 212, 166, 113 ,
+    94, 161,  41,  50, 239,  49, 111, 164,  70,  60,   2,  37, 171,  75 ,
+    136, 156,  11,  56,  42, 146, 138, 229,  73, 146,  77,  61,  98, 196 ,
+    135, 106,  63, 197, 195,  86,  96, 203, 113, 101, 170, 247, 181, 113 ,
+    80, 250, 108,   7, 255, 237, 129, 226,  79, 107, 112, 166, 103, 241 ,
+    24, 223, 239, 120, 198,  58,  60,  82, 128,   3, 184,  66, 143, 224 ,
+    145, 224,  81, 206, 163,  45,  63,  90, 168, 114,  59,  33, 159,  95 ,
+    28, 139, 123,  98, 125, 196,  15,  70, 194, 253,  54,  14, 109, 226 ,
+    71,  17, 161,  93, 186,  87, 244, 138,  20,  52, 123, 251,  26,  36 ,
+    17,  46,  52, 231, 232,  76,  31, 221,  84,  37, 216, 165, 212, 106 ,
+    197, 242,  98,  43,  39, 175, 254, 145, 190,  84, 118, 222, 187, 136 ,
+    120, 163, 236, 249
+};
+
+int	rndindex = 0;
+int	prndindex = 0;
+
+// Which one is deterministic?
+int P_Random (void)
+{
+    prndindex = (prndindex+1)&0xff;
+    return rndtable[prndindex];
+}
+
+int M_Random (void)
+{
+    rndindex = (rndindex+1)&0xff;
+    return rndtable[rndindex];
+}
+
+//
+// M_ClearRandom
+//
+// haleyjd 20110204 [STRIFE]: No "seeding" of M_Random index
+//
+void M_ClearRandom (void)
+{
+    prndindex = 0;
+    rndindex = 0;
+}
+
+
+
+
diff --git a/games/NXDoom/src/strife/m_random.h b/games/NXDoom/src/strife/m_random.h
new file mode 100644
index 000000000..aa6291ae9
--- /dev/null
+++ b/games/NXDoom/src/strife/m_random.h
@@ -0,0 +1,39 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//    
+
+
+#ifndef __M_RANDOM__
+#define __M_RANDOM__
+
+
+#include "doomtype.h"
+
+
+
+// Returns a number from 0 to 255,
+// from a lookup table.
+int M_Random (void);
+
+// As M_Random, but used only by the play simulation.
+int P_Random (void);
+
+// Fix randoms for demos.
+void M_ClearRandom (void);
+
+
+#endif
diff --git a/games/NXDoom/src/strife/m_saves.c b/games/NXDoom/src/strife/m_saves.c
new file mode 100644
index 000000000..561ec6a23
--- /dev/null
+++ b/games/NXDoom/src/strife/m_saves.c
@@ -0,0 +1,482 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2010 James Haley, Samuel Villarreal
+//
+// 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.
+//
+// DESCRIPTION:
+//
+// [STRIFE] New Module
+//
+// Strife Hub Saving Code
+//
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "z_zone.h"
+#include "i_glob.h"
+#include "i_system.h"
+#include "d_player.h"
+#include "deh_str.h"
+#include "doomstat.h"
+#include "m_misc.h"
+#include "m_saves.h"
+#include "p_dialog.h"
+
+//
+// File Paths
+//
+// Strife maintains multiple file paths related to savegames.
+//
+char *savepath;     // The actual path of the selected saveslot
+char *savepathtemp; // The path of the temporary saveslot (strfsav6.ssg)
+char *loadpath;     // Path used while loading the game
+
+char character_name[CHARACTER_NAME_LEN]; // Name of "character" for saveslot
+
+//
+// ClearTmp
+//
+// Clear the temporary save directory
+//
+void ClearTmp(void)
+{
+    glob_t *glob;
+
+    if(savepathtemp == NULL)
+        I_Error("you fucked up savedir man!");
+
+    glob = I_StartGlob(savepathtemp, "*", 0);
+    if (glob == NULL)
+        I_Error("ClearTmp: Couldn't open dir %s", savepathtemp);
+
+    for (;;)
+    {
+        const char *path = I_NextGlob(glob);
+
+        if (path == NULL)
+        {
+            break;
+        }
+        M_remove(path);
+    }
+
+    I_EndGlob(glob);
+}
+
+//
+// ClearSlot
+//
+// Clear a single save slot folder
+//
+void ClearSlot(void)
+{
+    glob_t *glob;
+
+    if(savepath == NULL)
+        I_Error("userdir is fucked up man!");
+
+    glob = I_StartGlob(savepath, "*", 0);
+    if (glob == NULL)
+        I_Error("ClearSlot: Couldn't open dir %s", savepath);
+
+    for (;;)
+    {
+        const char *filepath = I_NextGlob(glob);
+
+        if (filepath == NULL)
+        {
+            break;
+        }
+
+        M_remove(filepath);
+    }
+
+    I_EndGlob(glob);
+}
+
+//
+// FromCurr
+//
+// Copying files from savepathtemp to savepath
+//
+void FromCurr(void)
+{
+    glob_t *glob;
+
+    glob = I_StartGlob(savepathtemp, "*", 0);
+
+    if (glob == NULL)
+        I_Error("FromCurr: Couldn't open dir %s", savepathtemp);
+
+    for (;;)
+    {
+        byte *filebuffer;
+        int filelen;
+        const char *srcfilename;
+        char *dstfilename;
+
+        srcfilename = I_NextGlob(glob);
+        if (srcfilename == NULL)
+        {
+            break;
+        }
+
+        dstfilename = M_SafeFilePath(savepath, M_BaseName(srcfilename));
+
+        filelen = M_ReadFile(srcfilename, &filebuffer);
+        M_WriteFile(dstfilename, filebuffer, filelen);
+
+        Z_Free(filebuffer);
+        Z_Free(dstfilename);
+    }
+
+    I_EndGlob(glob);
+}
+
+//
+// ToCurr
+//
+// Copying files from savepath to savepathtemp
+//
+void ToCurr(void)
+{
+    glob_t *glob;
+
+    ClearTmp();
+
+    // BUG: Rogue copypasta'd this error message, which is why we don't know
+    // the real original name of this function.
+    glob = I_StartGlob(savepath, "*", 0);
+    if (glob == NULL)
+        I_Error("ClearSlot: Couldn't open dir %s", savepath);
+
+    for (;;)
+    {
+        byte *filebuffer;
+        int filelen;
+        const char *srcfilename;
+        char *dstfilename;
+
+        srcfilename = I_NextGlob(glob);
+        if (srcfilename == NULL)
+        {
+            break;
+        }
+
+        dstfilename = M_SafeFilePath(savepathtemp, M_BaseName(srcfilename));
+
+        filelen = M_ReadFile(srcfilename, &filebuffer);
+        M_WriteFile(dstfilename, filebuffer, filelen);
+
+        Z_Free(filebuffer);
+        Z_Free(dstfilename);
+    }
+
+    I_EndGlob(glob);
+}
+
+//
+// M_SaveMoveMapToHere
+//
+// Moves a map to the "HERE" save.
+//
+void M_SaveMoveMapToHere(void)
+{
+    char *mapsave  = NULL;
+    char *heresave = NULL;
+    char tmpnum[33];
+
+    // haleyjd: no itoa available...
+    M_snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
+
+    // haleyjd: use M_SafeFilePath, not sprintf
+    mapsave  = M_SafeFilePath(savepath, tmpnum);
+    heresave = M_SafeFilePath(savepath, "here");
+
+    // haleyjd: use M_FileExists, not access
+    if(M_FileExists(mapsave))
+    {
+        M_remove(heresave);
+        M_rename(mapsave, heresave);
+    }
+
+    Z_Free(mapsave);
+    Z_Free(heresave);
+}
+
+//
+// M_SaveMoveHereToMap
+//
+// Moves the "HERE" save to a map.
+//
+void M_SaveMoveHereToMap(void)
+{
+    char *mapsave  = NULL;
+    char *heresave = NULL;
+    char tmpnum[33];
+
+    // haleyjd: no itoa available...
+    M_snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
+
+    mapsave  = M_SafeFilePath(savepathtemp, tmpnum);
+    heresave = M_SafeFilePath(savepathtemp, "here");
+
+    if(M_FileExists(heresave))
+    {
+        M_remove(mapsave);
+        M_rename(heresave, mapsave);
+    }
+
+    Z_Free(mapsave);
+    Z_Free(heresave);
+}
+
+//
+// M_SaveMisObj
+//
+// Writes the mission objective into the MIS_OBJ file.
+//
+boolean M_SaveMisObj(const char *path)
+{
+    boolean result;
+    char *destpath = NULL;
+
+    // haleyjd 20110210: use M_SafeFilePath, not sprintf
+    destpath = M_SafeFilePath(path, "mis_obj");
+    result   = M_WriteFile(destpath, mission_objective, OBJECTIVE_LEN);
+
+    Z_Free(destpath);
+    return result;
+}
+
+//
+// M_ReadMisObj
+//
+// Reads the mission objective from the MIS_OBJ file.
+//
+void M_ReadMisObj(void)
+{
+    FILE *f = NULL;
+    char *srcpath = NULL;
+
+    // haleyjd: use M_SafeFilePath, not sprintf
+    srcpath = M_SafeFilePath(savepathtemp, "mis_obj");
+
+    if((f = M_fopen(srcpath, "rb")))
+    {
+        int retval = fread(mission_objective, 1, OBJECTIVE_LEN, f);
+        fclose(f);
+        if (retval != OBJECTIVE_LEN)
+        {
+            I_Error("M_ReadMisObj: error while reading mission objective");
+        }
+    }
+
+    Z_Free(srcpath);
+}
+
+//=============================================================================
+//
+// Original Routines
+//
+// haleyjd - None of the below code is derived from Strife itself, but has been
+// adapted or created in order to provide secure, portable filepath handling
+// for the purposes of savegame support. This is partially needed to allow for
+// differences in Choco due to it being multiplatform. The rest exists because
+// I cannot stand programming in an impoverished ANSI C environment that
+// calls sprintf on fixed-size buffers. :P
+//
+
+//
+// M_Calloc
+//
+// haleyjd 20110210 - original routine
+// Because Choco doesn't have Z_Calloc O_o
+//
+void *M_Calloc(size_t n1, size_t n2)
+{
+    return (n1 *= n2) ? memset(Z_Malloc(n1, PU_STATIC, NULL), 0, n1) : NULL;
+}
+
+//
+// M_StringAlloc
+//
+// haleyjd: This routine takes any number of strings and a number of extra
+// characters, calculates their combined length, and calls Z_Alloca to create
+// a temporary buffer of that size. This is extremely useful for allocation of
+// file paths, and is used extensively in d_main.c.  The pointer returned is
+// to a temporary Z_Alloca buffer, which lives until the next main loop
+// iteration, so don't cache it. Note that this idiom is not possible with the
+// normal non-standard alloca function, which allocates stack space.
+//
+// [STRIFE] - haleyjd 20110210
+// This routine is taken from the Eternity Engine and adapted to do without
+// Z_Alloca. I need secure string concatenation for filepath handling. The
+// only difference from use in EE is that the pointer returned in *str must
+// be manually freed.
+//
+int M_StringAlloc(char **str, int numstrs, size_t extra, const char *str1, ...)
+{
+    va_list args;
+    size_t len = extra;
+
+    if(numstrs < 1)
+        I_Error("M_StringAlloc: invalid input\n");
+
+    len += strlen(str1);
+
+    --numstrs;
+
+    if(numstrs != 0)
+    {   
+        va_start(args, str1);
+
+        while(numstrs != 0)
+        {
+            const char *argstr = va_arg(args, const char *);
+
+            len += strlen(argstr);
+
+            --numstrs;
+        }
+
+        va_end(args);
+    }
+
+    ++len;
+
+    *str = (char *)(M_Calloc(1, len));
+
+    return len;
+}
+
+//
+// M_SafeFilePath
+//
+// haleyjd 20110210 - original routine.
+// This routine performs safe, portable concatenation of a base file path
+// with another path component or file name. The returned string is Z_Malloc'd
+// and should be freed when it has exhausted its usefulness.
+//
+char *M_SafeFilePath(const char *basepath, const char *newcomponent)
+{
+    int   newstrlen = 0;
+    char *newstr = NULL;
+
+    if (!strcmp(basepath, ""))
+    {
+        basepath = ".";
+    }
+
+    // Always throw in a slash. M_NormalizeSlashes will remove it in the case
+    // that either basepath or newcomponent includes a redundant slash at the
+    // end or beginning respectively.
+    newstrlen = M_StringAlloc(&newstr, 3, 1, basepath, "/", newcomponent);
+    M_snprintf(newstr, newstrlen, "%s/%s", basepath, newcomponent);
+    M_NormalizeSlashes(newstr);
+
+    return newstr;
+}
+
+//
+// M_CreateSaveDirs
+//
+// haleyjd 20110210: Vanilla Strife went tits-up if it didn't have the full set
+// of save folders which were created externally by the installer. fraggle says
+// that's no good for Choco purposes, and I agree, so this routine will create
+// the full set of folders under the configured savegamedir.
+//
+void M_CreateSaveDirs(const char *savedir)
+{
+    int i;
+
+    for(i = 0; i < 7; i++)
+    {
+        char *compositedir;
+
+        // compose the full path by concatenating with savedir
+        compositedir = M_SafeFilePath(savedir, M_MakeStrifeSaveDir(i, ""));
+
+        M_MakeDirectory(compositedir);
+
+        Z_Free(compositedir);
+    }
+}
+
+//
+// M_MakeStrifeSaveDir
+//
+// haleyjd 20110211: Convenience routine
+//
+char *M_MakeStrifeSaveDir(int slotnum, const char *extra)
+{
+    static char tmpbuffer[32];
+
+    M_snprintf(tmpbuffer, sizeof(tmpbuffer),
+               "strfsav%d.ssg%s", slotnum, extra);
+
+    return tmpbuffer;
+}
+
+// 
+// M_GetFilePath
+//
+// haleyjd: STRIFE-FIXME: Temporary?
+// Code borrowed from Eternity, and modified to return separator char
+//
+char M_GetFilePath(const char *fn, char *dest, size_t len)
+{
+    boolean found_slash = false;
+    char *p;
+    char sepchar = '\0';
+
+    memset(dest, 0, len);
+
+    p = dest + len - 1;
+
+    M_StringCopy(dest, fn, len);
+
+    while(p >= dest)
+    {
+        if(*p == '/' || *p == '\\')
+        {
+            sepchar = *p;
+            found_slash = true; // mark that the path ended with a slash
+            *p = '\0';
+            break;
+        }
+        *p = '\0';
+        p--;
+    }
+
+    // haleyjd: in the case that no slash was ever found, yet the
+    // path string is empty, we are dealing with a file local to the
+    // working directory. The proper path to return for such a string is
+    // not "", but ".", since the format strings add a slash now. When
+    // the string is empty but a slash WAS found, we really do want to
+    // return the empty string, since the path is relative to the root.
+    if(!found_slash && *dest == '\0')
+        *dest = '.';
+
+    // if a separator is not found, default to forward, because Windows 
+    // supports that too.
+    if(sepchar == '\0') 
+        sepchar = '/';
+
+    return sepchar;
+}
+
+// EOF
+
+
diff --git a/games/NXDoom/src/strife/m_saves.h b/games/NXDoom/src/strife/m_saves.h
new file mode 100644
index 000000000..ce278cba9
--- /dev/null
+++ b/games/NXDoom/src/strife/m_saves.h
@@ -0,0 +1,55 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2010 James Haley, Samuel Villareal
+//
+// 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.
+//
+// DESCRIPTION:
+//
+// [STRIFE] New Module
+//
+// Strife Hub Saving Code
+//
+
+#ifndef M_SAVES_H__
+#define M_SAVES_H__
+
+#define CHARACTER_NAME_LEN 32
+
+extern char *savepath;
+extern char *savepathtemp;
+extern char *loadpath;
+extern char character_name[CHARACTER_NAME_LEN];
+
+// Strife Savegame Functions
+void ClearTmp(void);
+void ClearSlot(void);
+void FromCurr(void);
+void ToCurr(void);
+void M_SaveMoveMapToHere(void);
+void M_SaveMoveHereToMap(void);
+
+boolean M_SaveMisObj(const char *path);
+void    M_ReadMisObj(void);
+
+// Custom Utilities for Filepath Handling
+void *M_Calloc(size_t n1, size_t n2);
+int   M_StringAlloc(char **str, int numstrs, size_t extra, const char *str1, ...);
+char *M_SafeFilePath(const char *basepath, const char *newcomponent);
+char  M_GetFilePath(const char *fn, char *dest, size_t len);
+char *M_MakeStrifeSaveDir(int slotnum, const char *extra);
+void  M_CreateSaveDirs(const char *savedir);
+
+#endif
+
+// EOF
+
+
diff --git a/games/NXDoom/src/strife/p_ceilng.c b/games/NXDoom/src/strife/p_ceilng.c
new file mode 100644
index 000000000..93c0c7f2e
--- /dev/null
+++ b/games/NXDoom/src/strife/p_ceilng.c
@@ -0,0 +1,343 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
+//
+
+
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+//
+// CEILINGS
+//
+
+
+ceiling_t*	activeceilings[MAXCEILINGS];
+
+
+//
+// T_MoveCeiling
+//
+
+void T_MoveCeiling (ceiling_t* ceiling)
+{
+    result_e	res;
+	
+    switch(ceiling->direction)
+    {
+      case 0:
+	// IN STASIS
+	break;
+      case 1:
+	// UP
+	res = T_MovePlane(ceiling->sector,
+			  ceiling->speed,
+			  ceiling->topheight,
+			  false,1,ceiling->direction);
+	
+	if (!(leveltime&7))
+	{
+	    switch(ceiling->type)
+	    {
+	      case silentCrushAndRaise:
+		break;
+	      default:
+		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
+		// ?
+		break;
+	    }
+	}
+	
+	if (res == pastdest)
+	{
+	    switch(ceiling->type)
+	    {
+	      case raiseToHighest:
+		P_RemoveActiveCeiling(ceiling);
+		break;
+		
+	      case silentCrushAndRaise:
+		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
+	      case fastCrushAndRaise:
+	      case crushAndRaise:
+		ceiling->direction = -1;
+		break;
+		
+	      default:
+		break;
+	    }
+	    
+	}
+	break;
+	
+      case -1:
+	// DOWN
+	res = T_MovePlane(ceiling->sector,
+			  ceiling->speed,
+			  ceiling->bottomheight,
+			  ceiling->crush,1,ceiling->direction);
+	
+	if (!(leveltime&7))
+	{
+	    switch(ceiling->type)
+	    {
+	      case silentCrushAndRaise: break;
+	      default:
+		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
+	    }
+	}
+	
+	if (res == pastdest)
+	{
+	    switch(ceiling->type)
+	    {
+	      case silentCrushAndRaise:
+		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
+	      case crushAndRaise:
+		ceiling->speed = CEILSPEED;
+	      case fastCrushAndRaise:
+		ceiling->direction = 1;
+		break;
+
+	      case lowerAndCrush:
+	      case lowerToFloor:
+		P_RemoveActiveCeiling(ceiling);
+		break;
+
+	      default:
+		break;
+	    }
+	}
+	else // ( res != pastdest )
+	{
+	    if (res == crushed)
+	    {
+		switch(ceiling->type)
+		{
+		  case silentCrushAndRaise:
+		  case crushAndRaise:
+		  case lowerAndCrush:
+		    ceiling->speed = CEILSPEED / 8;
+		    break;
+
+		  default:
+		    break;
+		}
+	    }
+	}
+	break;
+    }
+}
+
+
+//
+// EV_DoCeiling
+// Move a ceiling up/down and all around!
+//
+// haleyjd 10/04/10: [STRIFE] Changes:
+// * Fast crushers were made 2x as fast.
+// * lowerAndCrush was apparently "fixed" to actually crush, and was also
+//   altered to lower all the way to the floor rather than remain 8 above.
+// * silentCrushAndRaise and crushAndRaise no longer crush.
+int
+EV_DoCeiling
+( line_t*       line,
+  ceiling_e     type )
+{
+    int         secnum;
+    int         rtn;
+    sector_t*   sec;
+    ceiling_t*  ceiling;
+
+    secnum = -1;
+    rtn = 0;
+
+    //	Reactivate in-stasis ceilings...for certain types.
+    switch(type)
+    {
+    case fastCrushAndRaise:
+    case silentCrushAndRaise:
+    case crushAndRaise:
+        P_ActivateInStasisCeiling(line);
+    default:
+        break;
+    }
+
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        // new door thinker
+        rtn = 1;
+        ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVSPEC, 0);
+        P_AddThinker (&ceiling->thinker);
+        sec->specialdata = ceiling;
+        ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+        ceiling->sector = sec;
+        ceiling->crush = false;
+
+        switch(type)
+        {
+        case fastCrushAndRaise:
+            // [STRIFE]: Speed of fast crushers increased by 2x!
+            ceiling->crush = true;
+            ceiling->topheight = sec->ceilingheight;
+            ceiling->bottomheight = sec->floorheight + (8*FRACUNIT);
+            ceiling->direction = -1;
+            ceiling->speed = CEILSPEED * 4; // [STRIFE] Was CEILSPEED * 2
+            break;
+        
+        case lowerAndCrush:
+            // [STRIFE] lowerAndCrush doesn't seem to have crushed in DOOM,
+            // but it was certainly made to do so in Strife! It is also
+            // changed to lower all the way to the floor.
+            ceiling->crush = 1;
+            ceiling->direction = -1;
+            ceiling->speed = CEILSPEED;
+            ceiling->bottomheight = sec->floorheight;
+            break;
+
+        case silentCrushAndRaise:
+        case crushAndRaise:
+            // [STRIFE] haleyjd 20130209: Turns out these types do NOT crush
+            // in Strife... yeah, that makes a lot of sense. Thanks to Gez for
+            // having detected this difference.
+            //ceiling->crush = true;
+            ceiling->topheight = sec->ceilingheight;
+
+        case lowerToFloor:
+            ceiling->bottomheight = sec->floorheight;
+            if (type != lowerToFloor)
+                ceiling->bottomheight += 8*FRACUNIT;
+            ceiling->direction = -1;
+            ceiling->speed = CEILSPEED;
+            break;
+
+        case raiseToHighest:
+            ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
+            ceiling->direction = 1;
+            ceiling->speed = CEILSPEED;
+            break;
+        }
+
+        ceiling->tag = sec->tag;
+        ceiling->type = type;
+        P_AddActiveCeiling(ceiling);
+    }
+    return rtn;
+}
+
+
+//
+// Add an active ceiling
+//
+void P_AddActiveCeiling(ceiling_t* c)
+{
+    int		i;
+    
+    for (i = 0; i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i] == NULL)
+	{
+	    activeceilings[i] = c;
+	    return;
+	}
+    }
+}
+
+
+
+//
+// Remove a ceiling's thinker
+//
+void P_RemoveActiveCeiling(ceiling_t* c)
+{
+    int		i;
+	
+    for (i = 0;i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i] == c)
+	{
+	    activeceilings[i]->sector->specialdata = NULL;
+	    P_RemoveThinker (&activeceilings[i]->thinker);
+	    activeceilings[i] = NULL;
+	    break;
+	}
+    }
+}
+
+
+
+//
+// Restart a ceiling that's in-stasis
+//
+void P_ActivateInStasisCeiling(line_t* line)
+{
+    int		i;
+	
+    for (i = 0;i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i]
+	    && (activeceilings[i]->tag == line->tag)
+	    && (activeceilings[i]->direction == 0))
+	{
+	    activeceilings[i]->direction = activeceilings[i]->olddirection;
+	    activeceilings[i]->thinker.function.acp1
+	      = (actionf_p1)T_MoveCeiling;
+	}
+    }
+}
+
+
+
+//
+// EV_CeilingCrushStop
+// Stop a ceiling from crushing!
+//
+int	EV_CeilingCrushStop(line_t	*line)
+{
+    int		i;
+    int		rtn;
+	
+    rtn = 0;
+    for (i = 0;i < MAXCEILINGS;i++)
+    {
+	if (activeceilings[i]
+	    && (activeceilings[i]->tag == line->tag)
+	    && (activeceilings[i]->direction != 0))
+	{
+	    activeceilings[i]->olddirection = activeceilings[i]->direction;
+	    activeceilings[i]->thinker.function.acv = (actionf_v)NULL;
+	    activeceilings[i]->direction = 0;		// in-stasis
+	    rtn = 1;
+	}
+    }
+    
+
+    return rtn;
+}
diff --git a/games/NXDoom/src/strife/p_dialog.c b/games/NXDoom/src/strife/p_dialog.c
new file mode 100644
index 000000000..e2988a481
--- /dev/null
+++ b/games/NXDoom/src/strife/p_dialog.c
@@ -0,0 +1,1413 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2010 James Haley, Samuel Villarreal
+//
+// 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.
+//
+// DESCRIPTION:
+//
+// [STRIFE] New Module
+//
+// Dialog Engine for Strife
+//
+
+#include <stdlib.h>
+
+#include "z_zone.h"
+#include "w_wad.h"
+#include "deh_str.h"
+#include "d_main.h"
+#include "d_mode.h"
+#include "d_player.h"
+#include "doomstat.h"
+#include "m_random.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "r_main.h"
+#include "v_video.h"
+#include "p_local.h"
+#include "sounds.h"
+#include "p_dialog.h"
+#include "s_sound.h"
+#include "p_local.h"
+#include "p_inter.h"
+
+//
+// Defines and Macros
+//
+
+// haleyjd: size of the original Strife mapdialog_t structure.
+#define ORIG_MAPDIALOG_SIZE 0x5EC
+
+#define DIALOG_INT(field, ptr)    \
+    field = ((int)ptr[0]        | \
+            ((int)ptr[1] <<  8) | \
+            ((int)ptr[2] << 16) | \
+            ((int)ptr[3] << 24)); \
+    ptr += 4;
+
+#define DIALOG_STR(field, ptr, len) \
+    memcpy(field, ptr, len);        \
+    ptr += len;
+
+//
+// Globals
+//
+
+// This can be toggled at runtime to determine if the full dialog messages
+// are subtitled on screen or not. Defaults to off.
+int dialogshowtext = false;
+
+// The global mission objective buffer. This gets written to and read from file,
+// and is set by dialogs and line actions.
+char mission_objective[OBJECTIVE_LEN];
+
+//
+// Static Globals
+//
+
+// True if SCRIPT00 is loaded.
+static boolean script0loaded;
+
+// Number of dialogs defined in the current level's script.
+static int numleveldialogs;
+
+// The actual level dialogs. This didn't exist in Strife, but is new to account
+// for structure alignment/packing concerns, given that Chocolate Doom is
+// multiplatform.
+static mapdialog_t *leveldialogs;
+
+// The actual script00 dialogs. As above.
+static mapdialog_t *script0dialogs;
+
+// Number of dialogs defined in the SCRIPT00 lump.
+static int numscript0dialogs;
+
+// The player engaged in dialog. This is always player 1, though, since Rogue
+// never completed the ability to use dialog outside of single-player mode.
+static player_t *dialogplayer;
+
+// The object to which the player is speaking.
+static mobj_t   *dialogtalker;
+
+// The talker's current angle
+static angle_t dialogtalkerangle;
+
+// The currently active mapdialog object.
+static mapdialog_t *currentdialog;
+
+// Text at the end of the choices
+static char dialoglastmsgbuffer[48];
+
+// Item to display to player when picked up or recieved
+static char pickupstring[46];
+
+// Health based on gameskill given by the front's medic
+static const int healthamounts[] = { -100 , -75, -50, -50, -100 };
+
+//=============================================================================
+//
+// Dialog State Sets
+//
+// These are used to animate certain actors in response to what happens in
+// their dialog sequences.
+//
+
+typedef struct dialogstateset_s
+{
+    mobjtype_t type;  // the type of object
+    statenum_t greet; // greeting state, for start of dialog
+    statenum_t yes;   // "yes" state, for an affirmative response
+    statenum_t no;    // "no" state, when you don't have the right items
+} dialogstateset_t;
+
+static dialogstateset_t dialogstatesets[] =
+{
+    { MT_PLAYER,       S_NULL,    S_NULL,    S_NULL    },
+    { MT_SHOPKEEPER_W, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
+    { MT_SHOPKEEPER_B, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
+    { MT_SHOPKEEPER_A, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
+    { MT_SHOPKEEPER_M, S_MRGT_00, S_MRYS_00, S_MRNO_00 }
+};
+
+// Rogue stored this in a static global rather than making it a define...
+static int numdialogstatesets = arrlen(dialogstatesets);
+
+// Current dialog talker state
+static dialogstateset_t *dialogtalkerstates;
+
+//=============================================================================
+//
+// Random Messages
+//
+// Rogue hard-coded these so they wouldn't have to repeat them several times
+// in the SCRIPT00 lump, apparently.
+//
+
+#define MAXRNDMESSAGES 10
+
+typedef struct rndmessage_s
+{
+    const char *type_name;
+    int nummessages;
+    const char *messages[MAXRNDMESSAGES];
+} rndmessage_t;
+
+static rndmessage_t rndMessages[] = 
+{
+    // Peasants
+    {
+        "PEASANT",
+        10,
+        {
+            "PLEASE DON'T HURT ME.",
+            
+            "IF YOU'RE LOOKING TO HURT ME, I'M \n"
+            "NOT REALLY WORTH THE EFFORT.",
+            
+            "I DON'T KNOW ANYTHING.",
+            
+            "GO AWAY OR I'LL CALL THE GUARDS!",
+            
+            "I WISH SOMETIMES THAT ALL THESE \n"
+            "REBELS WOULD JUST LEARN THEIR \n"
+            "PLACE AND STOP THIS NONSENSE.",
+
+            "JUST LEAVE ME ALONE, OK?",
+
+            "I'M NOT SURE, BUT SOMETIMES I THINK \n"
+            "THAT I KNOW SOME OF THE ACOLYTES.",
+
+            "THE ORDER'S GOT EVERYTHING AROUND HERE PRETTY WELL LOCKED UP TIGHT.",
+
+            "THERE'S NO WAY THAT THIS IS JUST A \n"
+            "SECURITY FORCE.",
+
+            "I'VE HEARD THAT THE ORDER IS REALLY \n"
+            "NERVOUS ABOUT THE FRONT'S \n"
+            "ACTIONS AROUND HERE."
+        }
+    },
+    // Rebel
+    {
+        "REBEL",
+        10,
+        {
+            "THERE'S NO WAY THE ORDER WILL \n"
+            "STAND AGAINST US.",
+
+            "WE'RE ALMOST READY TO STRIKE. \n"
+            "MACIL'S PLANS ARE FALLING IN PLACE.",
+
+            "WE'RE ALL BEHIND YOU, DON'T WORRY.",
+
+            "DON'T GET TOO CLOSE TO ANY OF THOSE BIG ROBOTS. THEY'LL MELT YOU DOWN \n"
+            "FOR SCRAP!",
+
+            "THE DAY OF OUR GLORY WILL SOON \n"
+            "COME, AND THOSE WHO OPPOSE US WILL \n"
+            "BE CRUSHED!",
+
+            "DON'T GET TOO COMFORTABLE. WE'VE \n"
+            "STILL GOT OUR WORK CUT OUT FOR US.",
+
+            "MACIL SAYS THAT YOU'RE THE NEW \n"
+            "HOPE. BEAR THAT IN MIND.",
+
+            "ONCE WE'VE TAKEN THESE CHARLATANS DOWN, WE'LL BE ABLE TO REBUILD THIS "
+            "WORLD AS IT SHOULD BE.",
+
+            "REMEMBER THAT YOU AREN'T FIGHTING \n"
+            "JUST FOR YOURSELF, BUT FOR \n"
+            "EVERYONE HERE AND OUTSIDE.",
+
+            "AS LONG AS ONE OF US STILL STANDS, \n"
+            "WE WILL WIN."
+        }
+    },
+    // Acolyte
+    {
+        "AGUARD",
+        10,
+        {
+            "MOVE ALONG,  PEASANT.",
+
+            "FOLLOW THE TRUE FAITH, ONLY THEN \n"
+            "WILL YOU BEGIN TO UNDERSTAND.",
+
+            "ONLY THROUGH DEATH CAN ONE BE \n"
+            "TRULY REBORN.",
+
+            "I'M NOT INTERESTED IN YOUR USELESS \n"
+            "DRIVEL.",
+
+            "IF I HAD WANTED TO TALK TO YOU I \n"
+            "WOULD HAVE TOLD YOU SO.",
+
+            "GO AND ANNOY SOMEONE ELSE!",
+
+            "KEEP MOVING!",
+
+            "IF THE ALARM GOES OFF, JUST STAY OUT OF OUR WAY!",
+
+            "THE ORDER WILL CLEANSE THE WORLD \n"
+            "AND USHER IT INTO THE NEW ERA.",
+
+            "PROBLEM?  NO, I THOUGHT NOT.",
+        }
+    },
+    // Beggar
+    {
+        "BEGGAR",
+        10,
+        {
+            "ALMS FOR THE POOR?",
+
+            "WHAT ARE YOU LOOKING AT, SURFACER?",
+
+            "YOU WOULDN'T HAVE ANY EXTRA FOOD, WOULD YOU?",
+
+            "YOU  SURFACE PEOPLE WILL NEVER \n"
+            "                                                                 "
+            "                                      UNDERSTAND US.",
+
+            "HA, THE GUARDS CAN'T FIND US.  THOSE \n"
+            "IDIOTS DON'T EVEN KNOW WE EXIST.",
+
+            "ONE DAY EVERYONE BUT THOSE WHO SERVE THE ORDER WILL BE FORCED TO "
+            "  JOIN US.",
+
+            "STARE NOW,  BUT YOU KNOW THAT THIS WILL BE YOUR OWN FACE ONE DAY.",
+
+            // Note: "NOTHING THING" is an authentic typo
+            "THERE'S NOTHING THING MORE \n"
+            "ANNOYING THAN A SURFACER WITH AN ATTITUDE!",
+
+            "THE ORDER WILL MAKE SHORT WORK OF YOUR PATHETIC FRONT.",
+
+            "WATCH YOURSELF SURFACER. WE KNOW OUR ENEMIES!"
+        }
+    },
+    // Templar
+    {
+        "PGUARD",
+        10,
+        {
+            "WE ARE THE HANDS OF FATE. TO EARN \n"
+            "OUR WRATH IS TO FIND OBLIVION!",
+
+            "THE ORDER WILL CLEANSE THE WORLD \n"
+            "OF THE WEAK AND CORRUPT!",
+
+            "OBEY THE WILL OF THE MASTERS!",
+
+            "LONG LIFE TO THE BROTHERS OF THE \n"
+            "ORDER!",
+
+            "FREE WILL IS AN ILLUSION THAT BINDS \n"
+            "THE WEAK MINDED.",
+
+            "POWER IS THE PATH TO GLORY. TO \n"
+            "FOLLOW THE ORDER IS TO WALK THAT \n"
+            "PATH!",
+
+            "TAKE YOUR PLACE AMONG THE \n"
+            "RIGHTEOUS, JOIN US!",
+
+            "THE ORDER PROTECTS ITS OWN.",
+
+            "ACOLYTES?  THEY HAVE YET TO SEE THE FULL GLORY OF THE ORDER.",
+
+            "IF THERE IS ANY HONOR INSIDE THAT \n"
+            "PATHETIC SHELL OF A BODY, \n"
+            "YOU'LL ENTER INTO THE ARMS OF THE \n"
+            "ORDER."
+        }
+    }
+};
+
+// And again, this could have been a define, but was a variable.
+static int numrndmessages = arrlen(rndMessages);
+
+//=============================================================================
+//
+// Dialog Menu Structure
+//
+// The Strife dialog system is actually just a serious abuse of the DOOM menu
+// engine. Hence why it doesn't work in multiplayer games or during demo
+// recording.
+//
+
+#define NUMDIALOGMENUITEMS 6
+
+static void P_DialogDrawer(void);
+
+static menuitem_t dialogmenuitems[] =
+{
+    { 1, "", P_DialogDoChoice, '1' }, // These items are loaded dynamically
+    { 1, "", P_DialogDoChoice, '2' },
+    { 1, "", P_DialogDoChoice, '3' },
+    { 1, "", P_DialogDoChoice, '4' },
+    { 1, "", P_DialogDoChoice, '5' },
+    { 1, "", P_DialogDoChoice, '6' }  // Item 6 is always the dismissal item
+};
+
+static menu_t dialogmenu =
+{
+    NUMDIALOGMENUITEMS, 
+    NULL, 
+    dialogmenuitems, 
+    P_DialogDrawer, 
+    42, 
+    75, 
+    0
+};
+
+// Lump number of the dialog background picture, if any.
+static int dialogbgpiclumpnum;
+
+// Name of current speaking character.
+static const char *dialogname;
+
+// Current dialog text.
+static const char *dialogtext;
+
+//=============================================================================
+//
+// Routines
+//
+
+//
+// P_ParseDialogLump
+//
+// haleyjd 09/02/10: This is an original function added to parse out the 
+// dialogs from the dialog lump rather than reading them raw from the lump 
+// pointer. This avoids problems with structure packing.
+//
+static void P_ParseDialogLump(byte *lump, mapdialog_t **dialogs, 
+                              int numdialogs, int tag)
+{
+    int i;
+    byte *rover = lump;
+
+    *dialogs = Z_Malloc(numdialogs * sizeof(mapdialog_t), tag, NULL);
+
+    for(i = 0; i < numdialogs; i++)
+    {
+        int j;
+        mapdialog_t *curdialog = &((*dialogs)[i]);
+
+        DIALOG_INT(curdialog->speakerid,    rover);
+        DIALOG_INT(curdialog->dropitem,     rover);
+        DIALOG_INT(curdialog->checkitem[0], rover);
+        DIALOG_INT(curdialog->checkitem[1], rover);
+        DIALOG_INT(curdialog->checkitem[2], rover);
+        DIALOG_INT(curdialog->jumptoconv,   rover);
+        DIALOG_STR(curdialog->name,         rover, MDLG_NAMELEN);
+        DIALOG_STR(curdialog->voice,        rover, MDLG_LUMPLEN);
+        DIALOG_STR(curdialog->backpic,      rover, MDLG_LUMPLEN);
+        DIALOG_STR(curdialog->text,         rover, MDLG_TEXTLEN);
+
+        // copy choices
+        for(j = 0; j < 5; j++)
+        {
+            mapdlgchoice_t *curchoice = &(curdialog->choices[j]);
+            DIALOG_INT(curchoice->giveitem,         rover);
+            DIALOG_INT(curchoice->needitems[0],     rover);
+            DIALOG_INT(curchoice->needitems[1],     rover);
+            DIALOG_INT(curchoice->needitems[2],     rover);
+            DIALOG_INT(curchoice->needamounts[0],   rover);
+            DIALOG_INT(curchoice->needamounts[1],   rover);
+            DIALOG_INT(curchoice->needamounts[2],   rover);
+            DIALOG_STR(curchoice->text,             rover, MDLG_CHOICELEN);
+            DIALOG_STR(curchoice->textok,           rover, MDLG_MSGLEN);
+            DIALOG_INT(curchoice->next,             rover);
+            DIALOG_INT(curchoice->objective,        rover);
+            DIALOG_STR(curchoice->textno,           rover, MDLG_MSGLEN);
+        }
+    }
+}
+
+//
+// P_DialogLoad
+//
+// [STRIFE] New function
+// haleyjd 09/02/10: Loads the dialog script for the current map. Also loads 
+// SCRIPT00 if it has not yet been loaded.
+//
+void P_DialogLoad(void)
+{
+    char lumpname[9];
+    int  lumpnum;
+
+    // load the SCRIPTxy lump corresponding to MAPxy, if it exists.
+    DEH_snprintf(lumpname, sizeof(lumpname), "script%02d", gamemap);
+    if((lumpnum = W_CheckNumForName(lumpname)) == -1)
+        numleveldialogs = 0;
+    else
+    {
+        byte *leveldialogptr = W_CacheLumpNum(lumpnum, PU_STATIC);
+        numleveldialogs = W_LumpLength(lumpnum) / ORIG_MAPDIALOG_SIZE;
+        P_ParseDialogLump(leveldialogptr, &leveldialogs, numleveldialogs, 
+                          PU_LEVEL);
+        Z_Free(leveldialogptr); // haleyjd: free the original lump
+    }
+
+    // also load SCRIPT00 if it has not been loaded yet
+    if(!script0loaded)
+    {
+        byte *script0ptr;
+
+        script0loaded = true; 
+        // BUG: Rogue should have used W_GetNumForName here...
+        lumpnum = W_CheckNumForName(DEH_String("script00")); 
+        script0ptr = W_CacheLumpNum(lumpnum, PU_STATIC);
+        numscript0dialogs = W_LumpLength(lumpnum) / ORIG_MAPDIALOG_SIZE;
+        P_ParseDialogLump(script0ptr, &script0dialogs, numscript0dialogs,
+                          PU_STATIC);
+        Z_Free(script0ptr); // haleyjd: free the original lump
+    }
+}
+
+//
+// P_PlayerHasItem
+//
+// [STRIFE] New function
+// haleyjd 09/02/10: Checks for inventory items, quest flags, etc. for dialogs.
+// Returns the amount possessed, or 0 if none.
+//
+int P_PlayerHasItem(player_t *player, mobjtype_t type)
+{
+    int i;
+
+    if(type > 0)
+    {
+        // check keys
+        if(type >= MT_KEY_BASE && type < MT_INV_SHADOWARMOR)
+            return (player->cards[type - MT_KEY_BASE]);
+
+        // check sigil pieces
+        if(type >= MT_SIGIL_A && type <= MT_SIGIL_E)
+            return (type - MT_SIGIL_A <= player->sigiltype);
+
+        // check quest tokens
+        if(type >= MT_TOKEN_QUEST1 && type <= MT_TOKEN_QUEST31)
+            return (player->questflags & (1 << (type - MT_TOKEN_QUEST1)));
+
+        // check inventory
+        for(i = 0; i < 32; i++)
+        {
+            if(type == player->inventory[i].type)
+                return player->inventory[i].amount;
+        }
+    }
+    return 0;
+}
+
+//
+// P_DialogFind
+//
+// [STRIFE] New function
+// haleyjd 09/03/10: Looks for a dialog definition matching the given 
+// Script ID # for an mobj.
+//
+mapdialog_t *P_DialogFind(mobjtype_t type, int jumptoconv)
+{
+    int i;
+
+    // check the map-specific dialogs first
+    for(i = 0; i < numleveldialogs; i++)
+    {
+        if(type == leveldialogs[i].speakerid)
+        {
+            if(jumptoconv <= 1)
+                return &leveldialogs[i];
+            else
+                --jumptoconv;
+        }
+    }
+
+    // check SCRIPT00 dialogs next
+    for(i = 0; i < numscript0dialogs; i++)
+    {
+        if(type == script0dialogs[i].speakerid)
+            return &script0dialogs[i];
+    }
+
+    // the default dialog is script 0 in the SCRIPT00 lump.
+    return &script0dialogs[0];
+}
+
+//
+// P_DialogGetStates
+//
+// [STRIFE] New function
+// haleyjd 09/03/10: Find the set of special dialog states (greetings, yes, no)
+// for a particular thing type.
+//
+static dialogstateset_t *P_DialogGetStates(mobjtype_t type)
+{
+    int i;
+
+    // look for a match by type
+    for(i = 0; i < numdialogstatesets; i++)
+    {
+        if(type == dialogstatesets[i].type)
+            return &dialogstatesets[i];
+    }
+
+    // return the default 0 record if no match.
+    return &dialogstatesets[0];
+}
+
+//
+// P_DialogGetMsg
+//
+// [STRIFE] New function
+// haleyjd 09/03/10: Redirects dialog messages when the script indicates that
+// the actor should use a random message stored in the executable instead.
+//
+static const char *P_DialogGetMsg(const char *message)
+{
+    // if the message starts with "RANDOM"...
+    if(!strncasecmp(message, DEH_String("RANDOM"), 6))
+    {
+        int i;
+        const char *nameloc = message + 7;
+
+        // look for a match in rndMessages for the string starting 
+        // 7 chars after "RANDOM_"
+        for(i = 0; i < numrndmessages; i++)
+        {
+            if(!strncasecmp(nameloc, rndMessages[i].type_name, 4))
+            {
+                // found a match, so return a random message
+                int rnd = M_Random();
+                int nummessages = rndMessages[i].nummessages;
+                return DEH_String(rndMessages[i].messages[rnd % nummessages]);
+            }
+        }
+    }
+
+    // otherwise, just return the message passed in.
+    return message;
+}
+
+//
+// P_GiveInventoryItem
+//
+// [STRIFE] New function
+// haleyjd 09/03/10: Give an inventory item to the player, if possible.
+// villsa 09/09/10: Fleshed out routine
+//
+boolean P_GiveInventoryItem(player_t *player, int sprnum, mobjtype_t type)
+{
+    int curinv = 0;
+    int i;
+    boolean ok = false;
+    mobjtype_t item = 0;
+    inventory_t* invtail;
+
+    // repaint the status bar due to inventory changing
+    player->st_update = true;
+
+    while(1)
+    {
+        // inventory is full
+        if(curinv > player->numinventory)
+            return true;
+
+        item = player->inventory[curinv].type;
+        if(type < item)
+        {
+            if(curinv != MAXINVENTORYSLOTS)
+            {
+                // villsa - sort inventory item if needed
+                invtail = &player->inventory[player->numinventory - 1];
+                if(player->numinventory >= (curinv + 1))
+                {
+                    for(i = player->numinventory; i >= (curinv + 1); --i)    
+                    {
+                        invtail[1].sprite   = invtail[0].sprite;
+                        invtail[1].type     = invtail[0].type;
+                        invtail[1].amount   = invtail[0].amount;
+
+                        invtail--;
+                    }
+                }
+
+                // villsa - add inventory item
+                player->inventory[curinv].amount = 1;
+                player->inventory[curinv].sprite = sprnum;
+                player->inventory[curinv].type = type;
+
+                // sort cursor if needed
+                if(player->numinventory)
+                {
+                    if(curinv <= player->inventorycursor)
+                        player->inventorycursor++;
+                }
+
+                player->numinventory++;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        if(type == item)
+            break;
+
+        curinv++;
+    }
+
+    // check amount of inventory item by using the mass from mobjinfo
+    if(player->inventory[curinv].amount < mobjinfo[item].mass)
+    {
+        player->inventory[curinv].amount++;
+        ok = true;
+    }
+    else
+        ok = false;
+
+    return ok;
+}
+
+//
+// P_GiveItemToPlayer
+//
+// [STRIFE] New function
+// haleyjd 09/03/10: Sorts out how to give something to the player.
+// Not strictly just for inventory items.
+// villsa 09/09/10: Fleshed out function
+//
+boolean P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type)
+{
+    int i = 0;
+    line_t junk;
+    int sound = sfx_itemup; // haleyjd 09/21/10: different sounds for items
+
+    // set quest if mf_givequest flag is set
+    if(mobjinfo[type].flags & MF_GIVEQUEST)
+        player->questflags |= 1 << (mobjinfo[type].speed - 1);
+
+    // check for keys
+    if(type >= MT_KEY_BASE && type <= MT_NEWKEY5)
+    {
+        P_GiveCard(player, type - MT_KEY_BASE);
+        return true;
+    }
+
+    // check for quest tokens
+    if(type >= MT_TOKEN_QUEST1 && type <= MT_TOKEN_QUEST31)
+    {
+        if(mobjinfo[type].name)
+        {
+            M_StringCopy(pickupstring, DEH_String(mobjinfo[type].name), 39);
+            player->message = pickupstring;
+        }
+        player->questflags |= 1 << (type - MT_TOKEN_QUEST1);
+
+        if(player == &players[consoleplayer])
+            S_StartSound(NULL, sound);
+        return true;
+    }
+
+    // haleyjd 09/22/10: Refactored to give sprites higher priority than
+    // mobjtypes and to implement missing logic.
+    switch(sprnum)
+    {
+    case SPR_HELT: // This is given only by the "DONNYTRUMP" cheat (aka Midas)
+        P_GiveInventoryItem(player, SPR_HELT, MT_TOKEN_TOUGHNESS);
+        P_GiveInventoryItem(player, SPR_GUNT, MT_TOKEN_ACCURACY);
+
+        // [STRIFE] Bizarre...
+        for(i = 0; i < 5 * player->accuracy + 300; i++)
+            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    case SPR_ARM1: // Armor 1
+        if(!P_GiveArmor(player, -2))
+            P_GiveInventoryItem(player, sprnum, type);
+        break;
+
+    case SPR_ARM2: // Armor 2
+        if(!P_GiveArmor(player, -1))
+            P_GiveInventoryItem(player, sprnum, type);
+        break;
+
+    case SPR_COIN: // 1 Gold
+        P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    case SPR_CRED: // 10 Gold
+        for(i = 0; i < 10; i++)
+            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    case SPR_SACK: // 25 gold
+        for(i = 0; i < 25; i++)
+            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    case SPR_CHST: // 50 gold
+        for(i = 0; i < 50; i++)
+            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break; // haleyjd 20141215: missing break, caused Rowan to not take ring from you.
+
+    case SPR_BBOX: // Box of Bullets
+        if(!P_GiveAmmo(player, am_bullets, 5))
+            return false;
+        break;
+
+    case SPR_BLIT: // Bullet Clip
+        if(!P_GiveAmmo(player, am_bullets, 1))
+            return false;
+        break;
+
+    case SPR_PMAP: // Map powerup
+        if(!P_GivePower(player, pw_allmap))
+            return false;
+        sound = sfx_yeah; // bluh-doop!
+        break;
+
+    case SPR_COMM: // Communicator
+        if(!P_GivePower(player, pw_communicator))
+            return false;
+        sound = sfx_yeah; // bluh-doop!
+        break;
+
+    case SPR_MSSL: // Mini-missile
+        if(!P_GiveAmmo(player, am_missiles, 1))
+            return false;
+        break;
+
+    case SPR_ROKT: // Crate of missiles
+        if(!P_GiveAmmo(player, am_missiles, 5))
+            return false;
+        break;
+
+    case SPR_BRY1: // Battery cell
+        if(!P_GiveAmmo(player, am_cell, 1))
+            return false;
+        break;
+
+    case SPR_CPAC: // Cell pack
+        if(!P_GiveAmmo(player, am_cell, 5))
+            return false;
+        break;
+
+    case SPR_PQRL: // Poison bolts
+        if(!P_GiveAmmo(player, am_poisonbolts, 5))
+            return false;
+        break;
+
+    case SPR_XQRL: // Electric bolts
+        if(!P_GiveAmmo(player, am_elecbolts, 5))
+            return false;
+        break;
+
+    case SPR_GRN1: // HE Grenades
+        if(!P_GiveAmmo(player, am_hegrenades, 1))
+            return false;
+        break;
+
+    case SPR_GRN2: // WP Grenades
+        if(!P_GiveAmmo(player, am_wpgrenades, 1))
+            return false;
+        break;
+
+    case SPR_BKPK: // Backpack (aka Ammo Satchel)
+        if(!player->backpack)
+        {
+            for(i = 0; i < NUMAMMO; i++)
+                player->maxammo[i] *= 2;
+
+            player->backpack = true;
+        }
+        for(i = 0; i < NUMAMMO; i++)
+            P_GiveAmmo(player, i, 1);
+        break;
+
+    case SPR_RIFL: // Assault Rifle
+        if(player->weaponowned[wp_rifle])
+            return false;
+
+        if(!P_GiveWeapon(player, wp_rifle, false))
+            return false;
+        
+        sound = sfx_wpnup; // SHK-CHK!
+        break;
+
+    case SPR_FLAM: // Flamethrower
+        if(player->weaponowned[wp_flame])
+            return false;
+
+        if(!P_GiveWeapon(player, wp_flame, false))
+            return false;
+
+        sound = sfx_wpnup; // SHK-CHK!
+        break;
+
+    case SPR_MMSL: // Mini-missile Launcher
+        if(player->weaponowned[wp_missile])
+            return false;
+
+        if(!P_GiveWeapon(player, wp_missile, false))
+            return false;
+
+        sound = sfx_wpnup; // SHK-CHK!
+        break;
+
+    case SPR_TRPD: // Mauler
+        if(player->weaponowned[wp_mauler])
+            return false;
+
+        if(!P_GiveWeapon(player, wp_mauler, false))
+            return false;
+
+        sound = sfx_wpnup; // SHK-CHK!
+        break;
+
+    case SPR_CBOW: // Here's a crossbow. Just aim straight, and *SPLAT!*
+        if(player->weaponowned[wp_elecbow])
+            return false;
+
+        if(!P_GiveWeapon(player, wp_elecbow, false))
+            return false;
+
+        sound = sfx_wpnup; // SHK-CHK!
+        break;
+
+    case SPR_TOKN: // Miscellaneous items - These are determined by thingtype.
+        switch(type)
+        {
+        case MT_KEY_HAND: // Severed hand
+            P_GiveCard(player, key_SeveredHand);
+            break;
+
+        case MT_MONY_300: // 300 Gold (this is the only way to get it, in fact)
+            for(i = 0; i < 300; i++)
+                P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+            break;
+
+        case MT_TOKEN_AMMO: // Ammo token - you get this from the Weapons Trainer
+            if(player->ammo[am_bullets] >= 50)
+                return false;
+
+            player->ammo[am_bullets] = 50;
+            break;
+
+        case MT_TOKEN_HEALTH: // Health token - from the Front's doctor
+            if(!P_GiveBody(player, healthamounts[gameskill]))
+                return false;
+            break;
+
+        case MT_TOKEN_ALARM: // Alarm token - particularly from the Oracle.
+            P_NoiseAlert(player->mo, player->mo);
+            A_AlertSpectreC(dialogtalker); // BUG: assumes in a dialog o_O
+            break;
+
+        case MT_TOKEN_DOOR1: // Door special 1
+            junk.tag = 222;
+            EV_DoDoor(&junk, vld_open);
+            break;
+
+        case MT_TOKEN_PRISON_PASS: // Door special 1 - Prison pass
+            junk.tag = 223;
+            EV_DoDoor(&junk, vld_open);
+            if(gamemap == 2) // If on Tarnhill, give Prison pass object
+                P_GiveInventoryItem(player, sprnum, type);
+            break;
+
+        case MT_TOKEN_SHOPCLOSE: // Door special 3 - "Shop close" - unused?
+            junk.tag = 222;
+            EV_DoDoor(&junk, vld_close);
+            break;
+
+        case MT_TOKEN_DOOR3: // Door special 4 (or 3? :P ) 
+            junk.tag = 224;
+            EV_DoDoor(&junk, vld_close);
+            break;
+
+        case MT_TOKEN_STAMINA: // Stamina upgrade
+            if(player->stamina >= 100)
+                return false;
+
+            player->stamina += 10;
+            P_GiveBody(player, 200); // full healing
+            break;
+
+        case MT_TOKEN_NEW_ACCURACY: // Accuracy upgrade
+            if(player->accuracy >= 100)
+                return false;
+
+            player->accuracy += 10;
+            break;
+
+        case MT_SLIDESHOW: // Slideshow (start a finale)
+            gameaction = ga_victory;
+            if(gamemap == 10)
+                P_GiveItemToPlayer(player, SPR_TOKN, MT_TOKEN_QUEST17);
+            break;
+        
+        default: // The default is to just give it as an inventory item.
+            P_GiveInventoryItem(player, sprnum, type);
+            break;
+        }
+        break;
+
+    default: // The ultimate default: Give it as an inventory item.
+        if(!P_GiveInventoryItem(player, sprnum, type))
+            return false;
+        break;
+    }
+
+    // Play sound.
+    if(player == &players[consoleplayer])
+        S_StartSound(NULL, sound);
+
+    return true;
+}
+
+//
+// P_TakeDialogItem
+//
+// [STRIFE] New function
+// haleyjd 09/03/10: Removes needed items from the player's inventory.
+//
+static void P_TakeDialogItem(player_t *player, int type, int amount)
+{
+    int i;
+
+    if(amount <= 0)
+        return;
+
+    for(i = 0; i < player->numinventory; i++)
+    {
+        // find a matching item
+        if(type != player->inventory[i].type)
+            continue;
+
+        // if there is none left...
+        if((player->inventory[i].amount -= amount) < 1)
+        {
+            // ...shift everything above it down
+            int j;
+
+            // BUG: They should have stopped at j < numinventory. This
+            // seems to implicitly assume that numinventory is always at
+            // least one less than the max # of slots, otherwise it 
+            // pulls in data from the following player_t fields:
+            // st_update, numinventory, inventorycursor, accuracy, stamina
+            for(j = i + 1; j <= player->numinventory; j++)
+            {
+                inventory_t *item1 = &(player->inventory[j - 1]);
+                inventory_t *item2 = &(player->inventory[j]);
+
+                *item1 = *item2;
+            }
+
+            // blank the topmost slot
+            // BUG: This will overwrite the aforementioned fields if
+            // numinventory is equal to the number of slots!
+            // STRIFE-TODO: Overflow emulation?
+            player->inventory[player->numinventory].type = NUMMOBJTYPES;
+            player->inventory[player->numinventory].sprite = -1;
+            player->numinventory--;
+
+            // update cursor position
+            if(player->inventorycursor >= player->numinventory)
+            {
+                if(player->inventorycursor)
+                    player->inventorycursor--;
+            }
+        } // end if
+        
+        return; // done!
+
+    } // end for
+}
+
+//
+// P_DialogDrawer
+//
+// This function is set as the drawer callback for the dialog menu.
+//
+static void P_DialogDrawer(void)
+{
+    angle_t angle;
+    int y;
+    int i;
+    int height;
+    int finaly;
+    char choicetext[64];
+    char choicetext2[64];
+
+    // Run down bonuscount faster than usual so that flashes from being given
+    // items are less obvious.
+    if(dialogplayer->bonuscount)
+    {
+        dialogplayer->bonuscount -= 3;
+        if(dialogplayer->bonuscount < 0)
+            dialogplayer->bonuscount = 0;
+    }
+
+    angle = R_PointToAngle2(dialogplayer->mo->x,
+                            dialogplayer->mo->y,
+                            dialogtalker->x,
+                            dialogtalker->y);
+    angle -= dialogplayer->mo->angle;
+
+    // Dismiss the dialog if the player is out of alignment, or the thing he was
+    // talking to is now engaged in battle.
+    if ((angle > ANG45 && angle < (ANG270+ANG45))
+     || (dialogtalker->flags & MF_NODIALOG) != 0)
+    {
+        P_DialogDoChoice(dialogmenu.numitems - 1);
+    }
+
+    dialogtalker->reactiontime = 2;
+
+    // draw background
+    if(dialogbgpiclumpnum != -1)
+    {
+        patch_t *patch = W_CacheLumpNum(dialogbgpiclumpnum, PU_CACHE);
+        V_DrawPatchDirect(0, 0, patch);
+    }
+
+    // if there's a valid background pic, delay drawing the rest of the menu 
+    // for a while; otherwise, it will appear immediately
+    if(dialogbgpiclumpnum == -1 || menupausetime <= gametic)
+    {
+        if(menuindialog)
+        {
+            // time to pause the game?
+            if(menupausetime + 3 < gametic)
+                menupause = true;
+        }
+
+        // draw character name
+        M_WriteText(12, 18, dialogname);
+        y = 28;
+
+        // show text (optional for dialogs with voices)
+        if(dialogshowtext || currentdialog->voice[0] == '\0')
+            y = M_WriteText(20, 28, dialogtext);
+
+        height = 20 * dialogmenu.numitems;
+
+        finaly = 175 - height;     // preferred height
+        if(y > finaly)
+            finaly = 199 - height; // height it will bump down to if necessary.
+
+        // draw divider
+        M_WriteText(42, finaly - 6, DEH_String("______________________________"));
+
+        dialogmenu.y = finaly + 6;
+        y = 0;
+
+        // draw the menu items
+        for(i = 0; i < dialogmenu.numitems - 1; i++)
+        {
+            DEH_snprintf(choicetext, sizeof(choicetext),
+                         "%d) %s", i + 1, currentdialog->choices[i].text);
+            
+            // alternate text for items that need money
+            if(currentdialog->choices[i].needamounts[0] > 0)
+            {
+                // haleyjd 20120401: necessary to avoid undefined behavior:
+                M_StringCopy(choicetext2, choicetext, sizeof(choicetext2));
+                DEH_snprintf(choicetext, sizeof(choicetext),
+                             "%s for %d", choicetext2,
+                             currentdialog->choices[i].needamounts[0]);
+            }
+
+            M_WriteText(dialogmenu.x, dialogmenu.y + 3 + y, choicetext);
+            y += 19;
+        }
+
+        // draw the final item for dismissing the dialog
+        M_WriteText(dialogmenu.x, 19 * i + dialogmenu.y + 3, dialoglastmsgbuffer);
+    }
+}
+
+//
+// P_DialogDoChoice
+//
+// [STRIFE] New function
+// haleyjd 09/05/10: Handles making a choice in a dialog. Installed as the
+// callback for all items in the dialogmenu structure.
+//
+void P_DialogDoChoice(int choice)
+{
+    int i = 0, nextdialog = 0;
+    boolean candochoice = true;
+    const char *message = NULL;
+    mapdlgchoice_t *currentchoice;
+
+    if(choice == -1)
+        choice = dialogmenu.numitems - 1;
+
+    currentchoice = &(currentdialog->choices[choice]);
+
+    I_StartVoice(NULL); // STRIFE-TODO: verify (should stop previous voice I believe)
+
+    // villsa 09/08/10: converted into for loop
+    for(i = 0; i < MDLG_MAXITEMS; i++)
+    {
+        if(P_PlayerHasItem(dialogplayer, currentchoice->needitems[i]) <
+                                         currentchoice->needamounts[i])
+        {
+            candochoice = false; // nope, missing something
+        }
+    }
+
+    if(choice != dialogmenu.numitems - 1 && candochoice)
+    {
+        int item;
+
+        message = currentchoice->textok;
+        if(dialogtalkerstates->yes)
+            P_SetMobjState(dialogtalker, dialogtalkerstates->yes);
+
+        item = currentchoice->giveitem;
+        if(item < 0 || 
+           P_GiveItemToPlayer(dialogplayer, 
+                              states[mobjinfo[item].spawnstate].sprite, 
+                              item))
+        {
+            // if successful, take needed items
+            int count = 0;
+            // villsa 09/08/10: converted into for loop
+            for(count = 0; count < MDLG_MAXITEMS; count++)
+            {
+                P_TakeDialogItem(dialogplayer, 
+                                 currentchoice->needitems[count],
+                                 currentchoice->needamounts[count]);
+            }
+        }
+        else
+            message = DEH_String("You seem to have enough!");
+
+        // store next dialog into the talking actor
+        nextdialog = currentchoice->next;
+        if(nextdialog != 0)
+            dialogtalker->miscdata = (byte)(abs(nextdialog));
+    }
+    else
+    {
+        // not successful
+        message = currentchoice->textno;
+        if(dialogtalkerstates->no)
+            P_SetMobjState(dialogtalker, dialogtalkerstates->no);
+    }
+    
+    if(choice != dialogmenu.numitems - 1)
+    {
+        int objective;
+        char *objlump;
+
+        if((objective = currentchoice->objective))
+        {
+            DEH_snprintf(mission_objective, OBJECTIVE_LEN, "log%i", objective);
+            objlump = W_CacheLumpName(mission_objective, PU_CACHE);
+            M_StringCopy(mission_objective, objlump, OBJECTIVE_LEN);
+        }
+        // haleyjd 20130301: v1.31 hack: if first char of message is a period,
+        // clear the player's message. Is this actually used anywhere?
+        if(gameversion == exe_strife_1_31 && message[0] == '.')
+            message = NULL;
+        dialogplayer->message = message;
+    }
+
+    dialogtalker->angle = dialogtalkerangle;
+    dialogplayer->st_update = true;
+    M_ClearMenus(0);
+
+    if(nextdialog >= 0 || gameaction == ga_victory) // Macil hack
+        menuindialog = false;
+    else
+        P_DialogStart(dialogplayer);
+}
+
+//
+// P_DialogStartP1
+//
+// [STRIFE] New function
+// haleyjd 09/13/10: This is a hack used by the finale system.
+//
+void P_DialogStartP1(void)
+{
+    P_DialogStart(&players[0]);
+}
+
+//
+// P_DialogStart
+//
+// villsa [STRIFE] New function
+//
+void P_DialogStart(player_t *player)
+{
+    int i = 0;
+    int pic;
+    int rnd = 0;
+    const char *byetext;
+    int jumptoconv;
+
+    if(menuactive || netgame)
+        return;
+
+    // are we facing towards our NPC?
+    P_AimLineAttack(player->mo, player->mo->angle, (128*FRACUNIT));
+    if(!linetarget)
+    {
+        P_AimLineAttack(player->mo, player->mo->angle + (ANG90/16), (128*FRACUNIT));
+        if(!linetarget)
+            P_AimLineAttack(player->mo, player->mo->angle - (ANG90/16), (128*FRACUNIT));
+    }
+
+    if(!linetarget)
+       return;
+
+    // already in combat, can't talk to it
+    if(linetarget->flags & MF_NODIALOG)
+       return;
+
+    // set pointer to the character talking
+    dialogtalker = linetarget;
+
+    // play a sound
+    if(player == &players[consoleplayer])
+       S_StartSound(0, sfx_radio);
+
+    linetarget->target = player->mo;         // target the player
+    dialogtalker->reactiontime = 2;          // set reactiontime
+    dialogtalkerangle = dialogtalker->angle; // remember original angle
+
+    // face talker towards player
+    A_FaceTarget(dialogtalker);
+
+    // face towards NPC's direction
+    player->mo->angle = R_PointToAngle2(player->mo->x,
+                                        player->mo->y,
+                                        dialogtalker->x,
+                                        dialogtalker->y);
+    // set pointer to player talking
+    dialogplayer = player;
+
+    // haleyjd 09/08/10: get any stored dialog state from this object
+    jumptoconv = linetarget->miscdata;
+
+    // check item requirements
+    while(1)
+    {
+        int i = 0;
+        currentdialog = P_DialogFind(linetarget->type, jumptoconv);
+
+        // dialog's jumptoconv equal to 0? There's nothing to jump to.
+        if(currentdialog->jumptoconv == 0)
+            break;
+
+        // villsa 09/08/10: converted into for loop
+        for(i = 0; i < MDLG_MAXITEMS; i++)
+        {
+            // if the item is non-zero, the player must have at least one in his
+            // or her inventory
+            if(currentdialog->checkitem[i] != 0 &&
+                P_PlayerHasItem(dialogplayer, currentdialog->checkitem[i]) < 1)
+                break;
+        }
+
+        if(i < MDLG_MAXITEMS) // didn't find them all? this is our dialog!
+            break;
+
+        jumptoconv = currentdialog->jumptoconv;
+    }
+
+    M_DialogDimMsg(20, 28, currentdialog->text, false);
+    dialogtext = P_DialogGetMsg(currentdialog->text);
+
+    // get states
+    dialogtalkerstates = P_DialogGetStates(linetarget->type);
+
+    // have talker greet the player
+    if(dialogtalkerstates->greet)
+        P_SetMobjState(dialogtalker, dialogtalkerstates->greet);
+
+    // get talker's name
+    if(currentdialog->name[0])
+        dialogname = currentdialog->name;
+    else
+    {
+        // use a fallback:
+        if(mobjinfo[linetarget->type].name)
+            dialogname = DEH_String(mobjinfo[linetarget->type].name); // mobjtype name
+        else
+            dialogname = DEH_String("Person"); // default name - like Joe in Doom 3 :P
+    }
+
+    // setup number of choices to choose from
+    for(i = 0; i < MDLG_MAXCHOICES; i++)
+    {
+        if(!currentdialog->choices[i].giveitem)
+            break;
+    }
+
+    // set number of choices to menu
+    dialogmenu.numitems = i + 1;
+
+    rnd = M_Random() % 3;
+
+    // setup dialog menu
+    M_StartControlPanel();
+    menupause = false;
+    menuindialog = true;
+    menupausetime = gametic + 17;
+    currentMenu = &dialogmenu;
+
+    if(i >= dialogmenu.lastOn)
+        itemOn = dialogmenu.lastOn;
+    else
+        itemOn = 0;
+
+    // get backdrop
+    pic = W_CheckNumForName(currentdialog->backpic);
+    dialogbgpiclumpnum = pic;
+    if(pic != -1)
+        V_DrawPatchDirect(0, 0, W_CacheLumpNum(pic, PU_CACHE));
+
+    // get voice
+    I_StartVoice(currentdialog->voice);
+
+    // get bye text
+    switch(rnd)
+    {
+    case 2:
+        byetext = DEH_String("BYE!");
+        break;
+    case 1:
+        byetext = DEH_String("Thanks, Bye!");
+        break;
+    default:
+    case 0:
+        byetext = DEH_String("See you later!");
+        break;
+    }
+
+    DEH_snprintf(dialoglastmsgbuffer, sizeof(dialoglastmsgbuffer),
+                 "%d) %s", i + 1, byetext);
+}
+
+// EOF
+
+
diff --git a/games/NXDoom/src/strife/p_dialog.h b/games/NXDoom/src/strife/p_dialog.h
new file mode 100644
index 000000000..08bef81ea
--- /dev/null
+++ b/games/NXDoom/src/strife/p_dialog.h
@@ -0,0 +1,102 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1996 Rogue Entertainment / Velocity, Inc.
+// Copyright(C) 2010 James Haley, Samuel Villareal
+//
+// 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.
+//
+// DESCRIPTION:
+//
+// [STRIFE] New Module
+//
+// Dialog Engine for Strife
+//
+
+#ifndef P_DIALOG_H__
+#define P_DIALOG_H__
+
+#define OBJECTIVE_LEN       300
+
+#define MAXINVENTORYSLOTS   30
+
+#define MDLG_CHOICELEN      32
+#define MDLG_MSGLEN         80
+#define MDLG_NAMELEN        16
+#define MDLG_LUMPLEN        8
+#define MDLG_TEXTLEN        320
+#define MDLG_MAXCHOICES     5
+#define MDLG_MAXITEMS       3
+
+extern char mission_objective[OBJECTIVE_LEN];
+
+extern int dialogshowtext;
+
+// villsa - convenient macro for giving objective logs to player
+#define GiveObjective(x, minlumpnum) \
+do { \
+  int obj_ln  = W_CheckNumForName(DEH_String(x)); \
+  if(obj_ln > minlumpnum) \
+    M_StringCopy(mission_objective, W_CacheLumpNum(obj_ln, PU_CACHE), \
+                 OBJECTIVE_LEN);\
+} while(0)
+
+// haleyjd - voice and objective in one
+#define GiveVoiceObjective(voice, log, minlumpnum) \
+do { \
+  int obj_ln = W_CheckNumForName(DEH_String(log)); \
+  I_StartVoice(DEH_String(voice)); \
+  if(obj_ln > minlumpnum) \
+    M_StringCopy(mission_objective, W_CacheLumpNum(obj_ln, PU_CACHE), \
+                 OBJECTIVE_LEN);\
+} while(0)
+
+typedef struct mapdlgchoice_s
+{
+    int  giveitem;                      // item given when successful
+    int  needitems[MDLG_MAXITEMS];      // item needed for success
+    int  needamounts[MDLG_MAXITEMS];    // amount of items needed
+    char text[MDLG_CHOICELEN];          // normal text
+    char textok[MDLG_MSGLEN];           // message given on success
+    int next;                           // next dialog?
+    int objective;                      // ???
+    char textno[MDLG_MSGLEN];           // message given on failure
+} mapdlgchoice_t;
+
+typedef struct mapdialog_s
+{
+    int speakerid;                      // script ID# for mobjtype that will use this dialog
+    int dropitem;                       // item to drop if that thingtype is killed
+    int checkitem[MDLG_MAXITEMS];       // item(s) needed to see this dialog
+    int jumptoconv;                     // conversation to jump to when... ?
+    char name[MDLG_NAMELEN];            // name of speaker
+    char voice[MDLG_LUMPLEN];           // voice file to play
+    char backpic[MDLG_LUMPLEN];         // backdrop pic for character, if any
+    char text[MDLG_TEXTLEN];            // main message text
+    
+    // options that this dialog gives the player
+    mapdlgchoice_t choices[MDLG_MAXCHOICES];
+} mapdialog_t;
+
+void         P_DialogLoad(void);
+void         P_DialogStart(player_t *player);
+void         P_DialogDoChoice(int choice);
+boolean      P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type);
+boolean      P_GiveInventoryItem(player_t *player, int sprnum, mobjtype_t type);
+boolean      P_UseInventoryItem(player_t* player, int item);
+void         P_DialogStartP1(void);
+mapdialog_t* P_DialogFind(mobjtype_t type, int jumptoconv);
+int          P_PlayerHasItem(player_t *player, mobjtype_t type);
+
+#endif
+
+// EOF
+
+
diff --git a/games/NXDoom/src/strife/p_doors.c b/games/NXDoom/src/strife/p_doors.c
new file mode 100644
index 000000000..30f6e3118
--- /dev/null
+++ b/games/NXDoom/src/strife/p_doors.c
@@ -0,0 +1,1370 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION: Door animation code (opening/closing)
+//
+
+
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "deh_main.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+
+// [STRIFE]
+#include "p_dialog.h"
+#include "i_system.h"
+
+
+//
+// VERTICAL DOORS
+//
+
+//
+// T_VerticalDoor
+//
+void T_VerticalDoor(vldoor_t* door)
+{
+    result_e res1;
+    result_e res2;
+
+    switch(door->direction)
+    {
+    case 0:
+        // WAITING
+        if (!--door->topcountdown)
+        {
+            switch(door->type)
+            {
+            case vld_blazeRaise:
+                door->direction = -1; // time to go back down
+                S_StartSound(&door->sector->soundorg, sfx_bdcls);
+                break;
+
+            case vld_normal:
+                door->direction = -1; // time to go back down
+                // villsa [STRIFE] closesound added
+                S_StartSound(&door->sector->soundorg, door->closesound);
+                break;
+
+                // villsa [STRIFE]
+            case vld_shopClose:
+                door->direction = 1;
+                door->speed = (2*FRACUNIT);
+                S_StartSound(&door->sector->soundorg, door->opensound);
+                break;
+
+            case vld_close30ThenOpen:
+                door->direction = 1;
+
+                // villsa [STRIFE] opensound added
+                S_StartSound(&door->sector->soundorg, door->opensound);
+                break;
+
+            default:
+                break;
+            }
+        }
+        break;
+
+    case 2:
+        //  INITIAL WAIT
+        if (!--door->topcountdown)
+        {
+            switch(door->type)
+            {
+            case vld_raiseIn5Mins:
+                door->direction = 1;
+                door->type = vld_normal;
+
+                // villsa [STRIFE] opensound added
+                S_StartSound(&door->sector->soundorg, door->opensound);
+                break;
+
+            default:
+                break;
+            }
+        }
+        break;
+
+        // villsa [STRIFE]
+    case -2:
+        // SPLIT
+        res1 = T_MovePlane(door->sector, door->speed, door->topheight, 0, 1, 1);
+        res2 = T_MovePlane(door->sector, door->speed, door->topwait, 0, 0, -1);
+
+        if(res1 == pastdest && res2 == pastdest)
+        {
+            door->sector->specialdata = NULL;
+            P_RemoveThinker(&door->thinker);  // unlink and free
+        }
+
+        break;
+
+    case -1:
+        // DOWN
+        res1 = T_MovePlane(door->sector, door->speed, door->sector->floorheight, false, 1, door->direction);
+        if(res1 == pastdest)
+        {
+            switch(door->type)
+            {
+            case vld_normal:
+            case vld_close:
+            case vld_blazeRaise:
+            case vld_blazeClose:
+                door->sector->specialdata = NULL;
+                P_RemoveThinker (&door->thinker);  // unlink and free
+                // villsa [STRIFE] no sounds
+                break;
+
+            case vld_close30ThenOpen:
+                door->direction = 0;
+                door->topcountdown = TICRATE*30;
+                break;
+
+                // villsa [STRIFE]
+            case vld_shopClose:
+                door->direction = 0;
+                door->topcountdown = TICRATE*120;
+                break;
+
+            default:
+                break;
+            }
+        }
+        else if(res1 == crushed)
+        {
+            switch(door->type)
+            {
+            case vld_blazeClose:
+            case vld_close:		// DO NOT GO BACK UP!
+            case vld_shopClose:     // villsa [STRIFE]
+                break;
+
+            default:
+                door->direction = 1;
+                // villsa [STRIFE] opensound added
+                S_StartSound(&door->sector->soundorg, door->opensound);
+                break;
+            }
+        }
+        break;
+
+    case 1:
+        // UP
+        res1 = T_MovePlane(door->sector,
+            door->speed,
+            door->topheight,
+            false,1,door->direction);
+
+        if(res1 == pastdest)
+        {
+            switch(door->type)
+            {
+            case vld_blazeRaise:
+            case vld_normal:
+                door->direction = 0; // wait at top
+                door->topcountdown = door->topwait;
+                break;
+
+            case vld_close30ThenOpen:
+            case vld_blazeOpen:
+            case vld_open:
+            case vld_shopClose:     // villsa [STRIFE]
+                door->sector->specialdata = NULL;
+                P_RemoveThinker (&door->thinker);  // unlink and free
+                break;
+
+            default:
+                break;
+            }
+        }
+        break;
+    }
+}
+
+
+//
+// EV_DoLockedDoor
+// Move a locked door up/down
+//
+// [STRIFE] This game has a crap load of keys. And this function doesn't even
+// deal with all of them...
+//
+int EV_DoLockedDoor(line_t* line, vldoor_e type, mobj_t* thing)
+{
+    player_t* p;
+
+    p = thing->player;
+
+    if(!p)
+        return 0;
+
+    switch(line->special)
+    {
+    case 99:
+    case 133:
+        if(!p->cards[key_IDCard])
+        {
+            p->message = DEH_String("You need an id card");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 134:
+    case 135:
+        if(!p->cards[key_IDBadge])
+        {
+            p->message = DEH_String("You need an id badge");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 136:
+    case 137:
+        if(!p->cards[key_Passcard])
+        {
+            p->message = DEH_String("You need a pass card");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 151:
+    case 164:
+        if(!p->cards[key_GoldKey])
+        {
+            p->message = DEH_String("You need a gold key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 153:
+    case 163:
+        if(!p->cards[key_SilverKey])
+        {
+            p->message = DEH_String("You need a silver key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 152:
+    case 162:
+        if(!p->cards[key_BrassKey])
+        {
+            p->message = DEH_String("You need a brass key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 167:
+    case 168:
+        if(!p->cards[key_SeveredHand])
+        {
+            p->message = DEH_String("Hand print not on file");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 171:
+        if(!p->cards[key_PrisonKey])
+        {
+            p->message = DEH_String("You don't have the key to the prison");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 172:
+        if(!p->cards[key_Power1Key])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 173:
+        if(!p->cards[key_Power2Key])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 176:
+        if(!p->cards[key_Power3Key])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 189:
+        if(!p->cards[key_OracleKey])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 191:
+        if(!p->cards[key_MilitaryID])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 192:
+        if(!p->cards[key_WarehouseKey])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+
+    case 223:
+        if(!p->cards[key_MineKey])
+        {
+            p->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return 0;
+        }
+        break;
+    }
+
+    return EV_DoDoor(line,type);
+}
+
+
+//
+// EV_DoDoor
+//
+
+int EV_DoDoor(line_t* line, vldoor_e type)
+{
+    int         secnum, rtn;
+    sector_t*   sec;
+    vldoor_t*   door;
+
+    secnum = -1;
+    rtn = 0;
+
+    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if(sec->specialdata)
+            continue;
+
+
+        // new door thinker
+        rtn = 1;
+        door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+        P_AddThinker (&door->thinker);
+        sec->specialdata = door;
+
+        door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+        door->sector = sec;
+        door->type = type;
+        door->topwait = VDOORWAIT;
+        door->speed = VDOORSPEED;
+        R_SoundNumForDoor(door);    // villsa [STRIFE] set door sounds
+
+        switch(type)
+        {
+            // villsa [STRIFE] new door type
+        case vld_splitOpen:
+            door->direction = -2;
+            door->topheight = P_FindLowestCeilingSurrounding(sec);
+            door->topheight -= 4*FRACUNIT;
+            door->speed = FRACUNIT;
+            // yes, it using topwait to get the floor height
+            door->topwait = P_FindLowestFloorSurrounding(sec);
+            if(door->topheight == sec->ceilingheight)
+                continue;
+
+            S_StartSound(&sec->soundorg, door->opensound);
+            break;
+
+            // villsa [STRIFE] new door type
+        case vld_splitRaiseNearest:
+            door->direction = -2;
+            door->topheight = P_FindLowestCeilingSurrounding(sec);
+            door->topheight -= 4*FRACUNIT;
+            door->speed = FRACUNIT;
+            // yes, it using topwait to get the floor height
+            door->topwait = P_FindHighestFloorSurrounding(sec);
+            if(door->topheight == sec->ceilingheight)
+                continue;
+
+            S_StartSound(&sec->soundorg, door->opensound);
+            break;
+
+        case vld_blazeClose:
+        case vld_shopClose:     // villsa [STRIFE]
+            door->topheight = P_FindLowestCeilingSurrounding(sec);
+            door->topheight -= 4*FRACUNIT;
+            door->direction = -1;
+            door->speed = VDOORSPEED * 4;
+            S_StartSound(&door->sector->soundorg, sfx_bdcls);
+            break;
+
+        case vld_close:
+            door->topheight = P_FindLowestCeilingSurrounding(sec);
+            door->topheight -= 4*FRACUNIT;
+            door->direction = -1;
+
+            // villsa [STRIFE] set door sounds
+            S_StartSound(&door->sector->soundorg, door->opensound);
+            break;
+
+        case vld_close30ThenOpen:
+            door->topheight = sec->ceilingheight;
+            door->direction = -1;
+
+            // villsa [STRIFE] set door sounds
+            S_StartSound(&door->sector->soundorg, door->closesound);
+            break;
+
+        case vld_blazeRaise:
+        case vld_blazeOpen:
+            door->direction = 1;
+            door->topheight = P_FindLowestCeilingSurrounding(sec);
+            door->topheight -= 4*FRACUNIT;
+            door->speed = VDOORSPEED * 4;
+            if (door->topheight != sec->ceilingheight)
+                S_StartSound(&door->sector->soundorg, sfx_bdopn);
+            break;
+
+        case vld_normal:
+        case vld_open:
+            door->direction = 1;
+            door->topheight = P_FindLowestCeilingSurrounding(sec);
+            door->topheight -= 4*FRACUNIT;
+
+            if(door->topheight != sec->ceilingheight)
+                S_StartSound(&door->sector->soundorg, door->opensound);
+            break;
+
+        default:
+            break;
+        }
+
+    }
+    return rtn;
+}
+
+//
+// EV_ClearForceFields
+//
+// villsa [STRIFE] new function
+//
+boolean EV_ClearForceFields(line_t* line)
+{
+    int         secnum;
+    sector_t*   sec;
+    int         i;
+    line_t*     secline;
+    boolean     ret = false;
+
+    secnum = -1;
+
+    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        line->special = 0;
+        ret = true;
+
+        // haleyjd 09/18/10: fixed to continue w/linecount == 0, not return
+        for(i = 0; i < sec->linecount; i++)
+        {
+            secline = sec->lines[i];
+            if(!(secline->flags & ML_TWOSIDED))
+                continue;
+            if(secline->special != 148)
+                continue;
+
+            secline->flags &= ~ML_BLOCKING;
+            secline->special = 0;
+            sides[secline->sidenum[0]].midtexture = 0;
+            sides[secline->sidenum[1]].midtexture = 0;
+        }
+    }
+
+    return ret;
+}
+
+
+//
+// EV_VerticalDoor : open a door manually, no tag value
+//
+// [STRIFE] Tons of new door types were added.
+//
+void EV_VerticalDoor(line_t* line, mobj_t* thing)
+{
+    player_t*   player;
+    sector_t*   sec;
+    vldoor_t*   door;
+    int         side;
+
+    side = 0;   // only front sides can be used
+
+    //	Check for locks
+    player = thing->player;
+
+    // haleyjd 09/15/10: [STRIFE] myriad checks here...
+    switch(line->special)
+    {
+    case 26:  // DR ID Card door
+    case 32:  // D1 ID Card door
+        if(!player->cards[key_IDCard])
+        {
+            player->message = DEH_String("You need an id card to open this door");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 27:  // DR Pass Card door
+    case 34:  // D1 Pass Card door
+        if(!player->cards[key_Passcard])
+        {
+            player->message = DEH_String("You need a pass card key to open this door");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 28:  // DR ID Badge door
+    case 33:  // D1 ID Badge door
+        if(!player->cards[key_IDBadge])
+        {
+            player->message = DEH_String("You need an id badge to open this door");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 156: // D1 brass key door
+    case 161: // DR brass key door
+        if(!player->cards[key_BrassKey])
+        {
+            player->message = DEH_String("You need a brass key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 157: // D1 silver key door
+    case 160: // DR silver key door
+        if(!player->cards[key_SilverKey])
+        {
+            player->message = DEH_String("You need a silver key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 158: // D1 gold key door
+    case 159: // DR gold key door
+        if(!player->cards[key_GoldKey])
+        {
+            player->message = DEH_String("You need a gold key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+        // villsa [STRIFE] added 09/15/10
+    case 165:
+        player->message = DEH_String("That doesn't seem to work");
+        S_StartSound(NULL, sfx_oof);
+        return;
+
+    case 166: // DR Hand Print door
+        if(!player->cards[key_SeveredHand])
+        {
+            player->message = DEH_String("Hand print not on file");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 169: // DR Base key door
+        if(!player->cards[key_BaseKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 170: // DR Gov's Key door
+        if(!player->cards[key_GovsKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 190: // DR Order Key door
+        if(!player->cards[key_OrderKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 205: // DR "Only in retail"
+        player->message = DEH_String("THIS AREA IS ONLY AVAILABLE IN THE "
+                                     "RETAIL VERSION OF STRIFE");
+        S_StartSound(NULL, sfx_oof);
+        return;
+
+    case 213: // DR Chalice door
+        if(!P_PlayerHasItem(player, MT_INV_CHALICE))
+        {
+            player->message = DEH_String("You need the chalice!");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 217: // DR Core Key door
+        if(!player->cards[key_CoreKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 221: // DR Mauler Key door
+        if(!player->cards[key_MaulerKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 224: // DR Chapel Key door
+        if(!player->cards[key_ChapelKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 225: // DR Catacomb Key door
+        if(!player->cards[key_CatacombKey])
+        {
+            player->message = DEH_String("You don't have the key");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    case 232: // DR Oracle Pass door
+        if(!(player->questflags & QF_QUEST18))
+        {
+            player->message = DEH_String("You need the Oracle Pass!");
+            S_StartSound(NULL, sfx_oof);
+            return;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    // if the sector has an active thinker, use it
+    sec = sides[ line->sidenum[side^1]] .sector;
+
+    if (sec->specialdata)
+    {
+        door = sec->specialdata;
+        // [STRIFE] Adjusted to handle linetypes handled here by Strife.
+        // BUG: Not all door types are checked here. This means that certain 
+        // door lines are allowed to fall through and start a new thinker on the
+        // sector! This is why some doors can become jammed in Strife - stuck in 
+        // midair, or unable to be opened at all. Multiple thinkers will fight 
+        // over how to move the door. They should have added a default return if
+        // they weren't going to handle this unconditionally...
+        switch(line->special)
+        {
+        case 1:         // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
+        case 26:
+        case 27:
+        case 28:
+        case 117:
+        case 159:       // villsa
+        case 160:       // haleyjd
+        case 161:       // villsa
+        case 166:       // villsa
+        case 169:       // villsa
+        case 170:       // villsa
+        case 190:       // villsa
+        case 213:       // villsa
+        case 232:       // villsa
+            if(door->direction == -1)
+                door->direction = 1;    // go back up
+            else
+            {
+                if (!thing->player)
+                    return;
+
+                // When is a door not a door?
+                // In Vanilla, door->direction is set, even though
+                // "specialdata" might not actually point at a door.
+
+                if (door->thinker.function.acp1 == (actionf_p1) T_VerticalDoor)
+                {
+                    door->direction = -1;   // start going down immediately
+                }
+                else if (door->thinker.function.acp1 == (actionf_p1) T_PlatRaise)
+                {
+                    // Erm, this is a plat, not a door.
+                    // This notably causes a problem in ep1-0500.lmp where
+                    // a plat and a door are cross-referenced; the door
+                    // doesn't open on 64-bit.
+                    // The direction field in vldoor_t corresponds to the wait
+                    // field in plat_t.  Let's set that to -1 instead.
+
+                    plat_t *plat;
+
+                    plat = (plat_t *) door;
+                    plat->wait = -1;
+                }
+                else
+                {
+                    // This isn't a door OR a plat.  Now we're in trouble.
+
+                    fprintf(stderr, "EV_VerticalDoor: Tried to close "
+                        "something that wasn't a door.\n");
+
+                    // Try closing it anyway. At least it will work on 32-bit
+                    // machines.
+
+                    door->direction = -1;
+                }
+            }
+            return;
+        default:
+            break;
+        }
+    }
+
+    // haleyjd 09/15/10: [STRIFE] Removed DOOM door sounds
+
+    // new door thinker
+    door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+    P_AddThinker (&door->thinker);
+    sec->specialdata = door;
+    door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 1;
+    door->speed = VDOORSPEED;
+    door->topwait = VDOORWAIT;
+    R_SoundNumForDoor(door);   // haleyjd 09/15/10: [STRIFE] Get door sounds
+
+    // for proper sound - [STRIFE] - verified complete
+    switch(line->special)
+    {
+    case 117:   // BLAZING DOOR RAISE
+    case 118:   // BLAZING DOOR OPEN
+        S_StartSound(&sec->soundorg, sfx_bdopn);
+        break;
+
+    default:    // NORMAL DOOR SOUND
+        S_StartSound(&sec->soundorg, door->opensound);
+        break;
+    }
+
+    // haleyjd: [STRIFE] - verified all.
+    switch(line->special)
+    {
+    case 1:
+    case 26:
+    case 27:
+    case 28:
+        door->type = vld_normal;
+        break;
+
+    case 31:
+    case 32:
+    case 33:
+    case 34:
+    case 156:   // villsa [STRIFE]
+    case 157:   // villsa [STRIFE]
+    case 158:   // villsa [STRIFE]
+        door->type = vld_open;
+        line->special = 0;
+        break;
+
+    case 117:	// blazing door raise
+        door->type = vld_blazeRaise;
+        door->speed = VDOORSPEED*4;
+        break;
+
+    case 118:	// blazing door open
+        door->type = vld_blazeOpen;
+        line->special = 0;
+        door->speed = VDOORSPEED*4;
+        break;
+
+    default:
+        // haleyjd: [STRIFE] pretty important to have this here!
+        door->type = vld_normal;
+        break;
+    }
+
+    // find the top and bottom of the movement range
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4*FRACUNIT;
+}
+
+
+//
+// Spawn a door that closes after 30 seconds
+//
+void P_SpawnDoorCloseIn30 (sector_t* sec)
+{
+    vldoor_t*   door;
+
+    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
+
+    P_AddThinker (&door->thinker);
+
+    sec->specialdata = door;
+    sec->special = 0;
+
+    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 0;
+    door->type = vld_normal;
+    door->speed = VDOORSPEED;
+    door->topcountdown = 30 * TICRATE;
+}
+
+//
+// Spawn a door that opens after 5 minutes
+//
+void
+P_SpawnDoorRaiseIn5Mins
+( sector_t*	sec,
+  int		secnum )
+{
+    vldoor_t*	door;
+	
+    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
+    
+    P_AddThinker (&door->thinker);
+
+    sec->specialdata = door;
+    sec->special = 0;
+
+    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+    door->sector = sec;
+    door->direction = 2;
+    door->type = vld_raiseIn5Mins;
+    door->speed = VDOORSPEED;
+    door->topheight = P_FindLowestCeilingSurrounding(sec);
+    door->topheight -= 4*FRACUNIT;
+    door->topwait = VDOORWAIT;
+    door->topcountdown = 5 * 60 * TICRATE;
+}
+
+
+// villsa [STRIFE] resurrected sliding doors
+//
+
+//
+// villsa [STRIFE]
+//
+// Sliding door name information
+//
+static slidename_t slideFrameNames[MAXSLIDEDOORS] =
+{
+    // SIGLDR
+    {
+        "SIGLDR01",  // frame1
+        "SIGLDR02",  // frame2
+        "SIGLDR03",  // frame3
+        "SIGLDR04",  // frame4
+        "SIGLDR05",  // frame5
+        "SIGLDR06",  // frame6
+        "SIGLDR07",  // frame7
+        "SIGLDR08"   // frame8
+    },
+    // DORSTN
+    {
+        "DORSTN01",  // frame1
+        "DORSTN02",  // frame2
+        "DORSTN03",  // frame3
+        "DORSTN04",  // frame4
+        "DORSTN05",  // frame5
+        "DORSTN06",  // frame6
+        "DORSTN07",  // frame7
+        "DORSTN08"   // frame8
+    },
+
+    // DORQTR
+    {
+        "DORQTR01",  // frame1
+        "DORQTR02",  // frame2
+        "DORQTR03",  // frame3
+        "DORQTR04",  // frame4
+        "DORQTR05",  // frame5
+        "DORQTR06",  // frame6
+        "DORQTR07",  // frame7
+        "DORQTR08"   // frame8
+    },
+
+    // DORCRG
+    {
+        "DORCRG01",  // frame1
+        "DORCRG02",  // frame2
+        "DORCRG03",  // frame3
+        "DORCRG04",  // frame4
+        "DORCRG05",  // frame5
+        "DORCRG06",  // frame6
+        "DORCRG07",  // frame7
+        "DORCRG08"   // frame8
+    },
+
+    // DORCHN
+    {
+        "DORCHN01",  // frame1
+        "DORCHN02",  // frame2
+        "DORCHN03",  // frame3
+        "DORCHN04",  // frame4
+        "DORCHN05",  // frame5
+        "DORCHN06",  // frame6
+        "DORCHN07",  // frame7
+        "DORCHN08"   // frame8
+    },
+
+    // DORIRS
+    {
+        "DORIRS01",  // frame1
+        "DORIRS02",  // frame2
+        "DORIRS03",  // frame3
+        "DORIRS04",  // frame4
+        "DORIRS05",  // frame5
+        "DORIRS06",  // frame6
+        "DORIRS07",  // frame7
+        "DORIRS08"   // frame8
+    },
+
+    // DORALN
+    {
+        "DORALN01",  // frame1
+        "DORALN02",  // frame2
+        "DORALN03",  // frame3
+        "DORALN04",  // frame4
+        "DORALN05",  // frame5
+        "DORALN06",  // frame6
+        "DORALN07",  // frame7
+        "DORALN08"   // frame8
+    },
+
+    {"\0","\0","\0","\0","\0","\0","\0","\0"}
+};
+
+//
+// villsa [STRIFE]
+//
+// Sliding door open sounds
+//
+static sfxenum_t slideOpenSounds[MAXSLIDEDOORS] =
+{
+    sfx_drlmto, sfx_drston, sfx_airlck, sfx_drsmto,
+    sfx_drchno, sfx_airlck, sfx_airlck, sfx_None
+};
+
+//
+// villsa [STRIFE]
+//
+// Sliding door close sounds
+//
+static sfxenum_t slideCloseSounds[MAXSLIDEDOORS] =
+{
+    sfx_drlmtc, sfx_drston, sfx_airlck, sfx_drsmtc,
+    sfx_drchnc, sfx_airlck, sfx_airlck, sfx_None
+};
+
+slideframe_t slideFrames[MAXSLIDEDOORS];
+
+//
+// P_InitSlidingDoorFrames
+//
+// villsa [STRIFE] resurrected
+//
+void P_InitSlidingDoorFrames(void)
+{
+    int i;
+    int f1;
+    int f2;
+    int f3;
+    int f4;
+
+    memset(slideFrames, 0, sizeof(slideframe_t) * MAXSLIDEDOORS);
+	
+    for(i = 0; i < MAXSLIDEDOORS; i++)
+    {
+	if(!slideFrameNames[i].frame1[0])
+	    break;
+			
+	f1 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame1));
+	f2 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame2));
+	f3 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame3));
+	f4 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame4));
+
+	slideFrames[i].frames[0] = f1;
+	slideFrames[i].frames[1] = f2;
+	slideFrames[i].frames[2] = f3;
+	slideFrames[i].frames[3] = f4;
+		
+	f1 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame5));
+	f2 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame6));
+	f3 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame7));
+	f4 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame8));
+
+	slideFrames[i].frames[4] = f1;
+	slideFrames[i].frames[5] = f2;
+	slideFrames[i].frames[6] = f3;
+	slideFrames[i].frames[7] = f4;
+    }
+}
+
+
+//
+// P_FindSlidingDoorType
+//
+// Return index into "slideFrames" array
+// for which door type to use
+//
+// villsa [STRIFE] resurrected
+//
+int P_FindSlidingDoorType(line_t* line)
+{
+    int i;
+    int val;
+	
+    for(i = 0; i < MAXSLIDEDOORS-1; i++)
+    {
+        val = sides[line->sidenum[0]].toptexture;
+	if(val == slideFrames[i].frames[0])
+	    return i;
+    }
+	
+    return -1;
+}
+
+//
+// T_SlidingDoor
+//
+// villsa [STRIFE] resurrected
+//
+void T_SlidingDoor(slidedoor_t* door)
+{
+    sector_t* sec;
+
+    sec = door->frontsector;
+
+    switch(door->status)
+    {
+    case sd_opening:
+        if(!door->timer--)
+        {
+            if(++door->frame == SNUMFRAMES)
+            {
+                // IF DOOR IS DONE OPENING...
+                door->line1->flags &= ~ML_BLOCKING;
+                door->line2->flags &= ~ML_BLOCKING;
+
+                if(door->type == sdt_openOnly)
+                {
+                    door->frontsector->specialdata = NULL;
+                    P_RemoveThinker (&door->thinker);
+                    return;
+                }
+
+                door->timer = SDOORWAIT;
+                door->status = sd_waiting;
+            }
+            else
+            {
+                // IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
+                door->timer = SWAITTICS;
+
+                sides[door->line2->sidenum[0]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+
+                sides[door->line2->sidenum[1]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+
+                sides[door->line1->sidenum[0]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+
+                sides[door->line1->sidenum[1]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+            }
+        }
+
+        return;
+
+    case sd_waiting:
+        // IF DOOR IS DONE WAITING...
+        if(!door->timer--)
+        {
+            fixed_t speed;
+            fixed_t cheight;
+
+            sec = door->frontsector;
+
+            // CAN DOOR CLOSE?
+            if(sec->thinglist != NULL)
+            {
+                door->timer = SDOORWAIT;
+                return;
+            }
+            else
+            {
+
+                cheight = sec->ceilingheight;
+                speed = cheight - sec->floorheight - (10*FRACUNIT);
+
+                // something blocking it?
+                if(T_MovePlane(sec, speed, sec->floorheight, 0, 1, -1) == crushed)
+                {
+                    door->timer = SDOORWAIT;
+                    return;
+                }
+                else
+                {
+                    // Instantly move plane
+                    T_MovePlane(sec, (128*FRACUNIT), cheight, 0, 1, 1);
+
+                    // turn line blocking back on
+                    door->line1->flags |= ML_BLOCKING;
+                    door->line2->flags |= ML_BLOCKING;
+
+                    // play close sound
+                    S_StartSound(&sec->soundorg, slideCloseSounds[door->whichDoorIndex]);
+
+                    door->status = sd_closing;
+                    door->timer = SWAITTICS;
+                }
+            }
+        }
+
+        return;
+
+    case sd_closing:
+        if (!door->timer--)
+        {
+            if(--door->frame < 0)
+            {
+                // IF DOOR IS DONE CLOSING...
+                T_MovePlane(sec, (128*FRACUNIT), sec->floorheight, 0, 1, -1);
+                door->frontsector->specialdata = NULL;
+                P_RemoveThinker (&door->thinker);
+                return;
+            }
+            else
+            {
+                // IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
+                door->timer = SWAITTICS;
+
+                sides[door->line2->sidenum[0]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+
+                sides[door->line2->sidenum[1]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+
+                sides[door->line1->sidenum[0]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+
+                sides[door->line1->sidenum[1]].midtexture =
+                    slideFrames[door->whichDoorIndex].frames[door->frame];
+            }
+        }
+
+        return;
+    }
+}
+
+//
+// EV_RemoteSlidingDoor
+//
+// villsa [STRIFE] new function
+//
+int EV_RemoteSlidingDoor(line_t* line, mobj_t* thing)
+{
+    int		    secnum;
+    sector_t*       sec;
+    int             i;
+    int             rtn;
+    line_t*         secline;
+	
+    secnum = -1;
+    rtn = 0;
+    
+    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if(sec->specialdata)
+            continue;
+
+        for(i = 0; i < 4; i++)
+        {
+            secline = sec->lines[i];
+
+            if(P_FindSlidingDoorType(secline) < 0)
+                continue;
+
+            EV_SlidingDoor(secline, thing);
+            rtn = 1;
+        }
+    }
+
+    return rtn;
+}
+
+
+//
+// EV_SlidingDoor
+//
+// villsa [STRIFE]
+//
+void EV_SlidingDoor(line_t* line, mobj_t* thing)
+{
+    sector_t*       sec;
+    slidedoor_t*    door;
+    int             i;
+    line_t*         secline;
+
+    // Make sure door isn't already being animated
+    sec = sides[line->sidenum[1]].sector;
+    door = NULL;
+    if(sec->specialdata)
+    {
+        if (!thing->player)
+            return;
+
+        door = sec->specialdata;
+        if(door->type == sdt_openAndClose)
+        {
+            if(door->status == sd_waiting)
+            {
+                door->status = sd_closing;
+                door->timer = SWAITTICS;    // villsa [STRIFE]
+            }
+        }
+        else
+            return;
+    }
+
+    // Init sliding door vars
+    if(!door)
+    {
+        door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+        P_AddThinker (&door->thinker);
+
+        sec->specialdata = door;
+
+        door->type = sdt_openAndClose;
+        door->status = sd_opening;
+        door->whichDoorIndex = P_FindSlidingDoorType(line);
+
+        // villsa [STRIFE] different error message
+        if(door->whichDoorIndex < 0)
+            I_Error(DEH_String("EV_SlidingDoor: Textures are not defined for sliding door!"));
+
+        sides[line->sidenum[0]].midtexture = sides[line->sidenum[0]].toptexture;
+
+        // villsa [STRIFE]
+        door->line1 = line;
+        door->line2 = line;
+
+        // villsa [STRIFE] this loop assumes that the sliding door is made up
+        // of only four linedefs!
+        for(i = 0; i < 4; i++)
+        {
+            secline = sec->lines[i];
+            if(secline != line)
+            {
+                side_t* side1;
+                side_t* side2;
+
+                side1 = &sides[secline->sidenum[0]];
+                side2 = &sides[line->sidenum[0]];
+
+                if(side1->toptexture == side2->toptexture)
+                    door->line2 = secline;
+            }
+        }
+
+        door->thinker.function.acp1 = (actionf_p1)T_SlidingDoor;
+        door->timer = SWAITTICS;
+        door->frontsector = sec;
+        door->frame = 0;
+
+        // villsa [STRIFE] preset flags
+        door->line1->flags |= ML_BLOCKING;
+        door->line2->flags |= ML_BLOCKING;
+
+        // villsa [STRIFE] set the closing sector
+        T_MovePlane(
+            door->frontsector,
+            (128*FRACUNIT),
+            P_FindLowestCeilingSurrounding(door->frontsector),
+            0,
+            1,
+            1);
+
+        // villsa [STRIFE] play open sound
+        S_StartSound(&door->frontsector->soundorg, slideOpenSounds[door->whichDoorIndex]);
+    }
+}
+
diff --git a/games/NXDoom/src/strife/p_enemy.c b/games/NXDoom/src/strife/p_enemy.c
new file mode 100644
index 000000000..7763a87b0
--- /dev/null
+++ b/games/NXDoom/src/strife/p_enemy.c
@@ -0,0 +1,3388 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Enemy thinking, AI.
+//	Action Pointer Functions
+//	that are associated with states/frames. 
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "m_random.h"
+#include "i_system.h"
+#include "doomdef.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "s_sound.h"
+#include "g_game.h"
+#include "z_zone.h"     // villsa [STRIFE]
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+// [STRIFE] Dialog / Inventory
+#include "p_dialog.h"
+#include "deh_str.h"
+#include "w_wad.h"
+#include "f_finale.h"
+#include "p_inter.h"
+
+// Forward Declarations:
+void A_RandomWalk(mobj_t *);
+void A_ProgrammerAttack(mobj_t* actor);
+void A_FireSigilEOffshoot(mobj_t *actor);
+void A_SpectreCAttack(mobj_t *actor);
+void A_SpectreDAttack(mobj_t *actor);
+void A_SpectreEAttack(mobj_t *actor);
+
+void P_ThrustMobj(mobj_t *actor, angle_t angle, fixed_t force);
+
+typedef enum
+{
+    DI_EAST,
+    DI_NORTHEAST,
+    DI_NORTH,
+    DI_NORTHWEST,
+    DI_WEST,
+    DI_SOUTHWEST,
+    DI_SOUTH,
+    DI_SOUTHEAST,
+    DI_NODIR,
+    NUMDIRS
+    
+} dirtype_t;
+
+
+//
+// P_NewChaseDir related LUT.
+//
+dirtype_t opposite[] =
+{
+  DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST,
+  DI_EAST, DI_NORTHEAST, DI_NORTH, DI_NORTHWEST, DI_NODIR
+};
+
+dirtype_t diags[] =
+{
+    DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST
+};
+
+
+
+
+
+void A_Fall (mobj_t *actor);
+
+
+//
+// ENEMY THINKING
+// Enemies are allways spawned
+// with targetplayer = -1, threshold = 0
+// Most monsters are spawned unaware of all players,
+// but some can be made preaware
+//
+
+
+//
+// Called by P_NoiseAlert.
+// Recursively traverse adjacent sectors,
+// sound blocking lines cut off traversal.
+//
+// haleyjd 09/05/10: [STRIFE] Verified unmodified
+//
+
+mobj_t*		soundtarget;
+
+void
+P_RecursiveSound
+( sector_t*	sec,
+  int		soundblocks )
+{
+    int		i;
+    line_t*	check;
+    sector_t*	other;
+	
+    // wake up all monsters in this sector
+    if (sec->validcount == validcount
+	&& sec->soundtraversed <= soundblocks+1)
+    {
+	return;		// already flooded
+    }
+    
+    sec->validcount = validcount;
+    sec->soundtraversed = soundblocks+1;
+    sec->soundtarget = soundtarget;
+	
+    for (i=0 ;i<sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	if (! (check->flags & ML_TWOSIDED) )
+	    continue;
+	
+	P_LineOpening (check);
+
+	if (openrange <= 0)
+	    continue;	// closed door
+	
+	if ( sides[ check->sidenum[0] ].sector == sec)
+	    other = sides[ check->sidenum[1] ] .sector;
+	else
+	    other = sides[ check->sidenum[0] ].sector;
+	
+	if (check->flags & ML_SOUNDBLOCK)
+	{
+	    if (!soundblocks)
+		P_RecursiveSound (other, 1);
+	}
+	else
+	    P_RecursiveSound (other, soundblocks);
+    }
+}
+
+
+
+//
+// P_NoiseAlert
+// If a monster yells at a player,
+// it will alert other monsters to the player.
+//
+// haleyjd 09/05/10: [STRIFE] Verified unmodified
+//
+void
+P_NoiseAlert
+( mobj_t*	target,
+  mobj_t*	emmiter )
+{
+    soundtarget = target;
+    validcount++;
+    P_RecursiveSound (emmiter->subsector->sector, 0);
+}
+
+//
+// P_WakeUpThing
+//
+// villsa [STRIFE] New function
+// Wakes up an mobj.nearby when somebody has been punched.
+//
+static void P_WakeUpThing(mobj_t* puncher, mobj_t* bystander)
+{
+    if(!(bystander->flags & MF_NODIALOG))
+    {
+        bystander->target = puncher;
+        if(bystander->info->seesound)
+            S_StartSound(bystander, bystander->info->seesound);
+        P_SetMobjState(bystander, bystander->info->seestate);
+    }
+}
+
+//
+// P_DoPunchAlert
+//
+// villsa [STRIFE] New function (by Quasar ;)
+// Wake up buddies nearby when the player thinks he's gotten too clever
+// with the punch dagger. Walks sector links.
+//
+void P_DoPunchAlert(mobj_t *puncher, mobj_t *punchee)
+{   
+   mobj_t *rover;
+   
+   // don't bother with this crap if we're already on alert
+   if(punchee->subsector->sector->soundtarget)
+      return;
+      
+   // gotta still be alive to call for help
+   if(punchee->health <= 0)
+      return;
+      
+   // has to be something you can wake up and kill too
+   if(!(punchee->flags & MF_COUNTKILL) || punchee->flags & MF_NODIALOG)
+      return;
+   
+   // make the punchee hurt - haleyjd 09/05/10: Fixed to use painstate.
+   punchee->target = puncher;
+   P_SetMobjState(punchee, punchee->info->painstate); 
+   
+   // wake up everybody nearby
+   
+   // scan forward on sector list
+   for(rover = punchee->snext; rover; rover = rover->snext)
+   {
+      // we only wake up certain thing types (Acolytes and Templars?)
+      if(rover->health > 0 && rover->type >= MT_GUARD1 && rover->type <= MT_PGUARD &&
+         (P_CheckSight(rover, puncher) || P_CheckSight(rover, punchee)))
+      {
+         P_WakeUpThing(puncher, rover);
+         rover->flags |= MF_NODIALOG;
+      }
+   }
+
+   // scan backward on sector list
+   for(rover = punchee->sprev; rover; rover = rover->sprev)
+   {
+      // we only wake up certain thing types (Acolytes and Templars?)
+      if(rover->health > 0 && rover->type >= MT_GUARD1 && rover->type <= MT_PGUARD &&
+         (P_CheckSight(rover, puncher) || P_CheckSight(rover, punchee)))
+      {
+         P_WakeUpThing(puncher, rover);
+         rover->flags |= MF_NODIALOG;
+      }
+   }
+}
+
+
+
+
+//
+// P_CheckMeleeRange
+//
+// [STRIFE] Minor change to meleerange.
+//
+boolean P_CheckMeleeRange(mobj_t* actor)
+{
+    mobj_t*	pl;
+    fixed_t	dist;
+
+    if(!actor->target)
+        return false;
+
+    pl = actor->target;
+    if(actor->z + 3 * actor->height / 2 < pl->z) // villsa [STRIFE]
+        return false;
+
+    dist = P_AproxDistance(pl->x - actor->x, pl->y - actor->y);
+
+    if(dist >= MELEERANGE - 20*FRACUNIT + pl->info->radius)
+        return false;
+
+    if(!P_CheckSight (actor, actor->target))
+        return false;
+
+    return true;
+}
+
+//
+// P_CheckMissileRange
+//
+// [STRIFE]
+// Changes to eliminate DOOM-specific code and to allow for
+// varying attack ranges for Strife monsters, as well as a general tweak
+// to considered distance for all monsters.
+//
+boolean P_CheckMissileRange(mobj_t* actor)
+{
+    fixed_t dist;
+
+    if(!P_CheckSight(actor, actor->target))
+        return false;
+
+    if(actor->flags & MF_JUSTHIT)
+    {
+        // the target just hit the enemy,
+        // so fight back!
+        actor->flags &= ~MF_JUSTHIT;
+        return true;
+    }
+
+    if(actor->reactiontime)
+        return false;	// do not attack yet
+
+    // OPTIMIZE: get this from a global checksight
+    dist = P_AproxDistance(actor->x-actor->target->x,
+                           actor->y-actor->target->y) - 64*FRACUNIT;
+    
+    if (!actor->info->meleestate)
+        dist -= 128*FRACUNIT;       // no melee attack, so fire more
+
+    dist >>= 16;
+
+    // villsa [STRIFE] checks for acolytes
+    //  haleyjd 09/05/10: Repaired to match disassembly: Was including 
+    //  SHADOWGUARD in the wrong case, was missing MT_SENTINEL entirely.
+    //  Structure of ASM also indicates this was probably a switch 
+    //  statement turned into a cascading if/else by the compiler.
+    switch(actor->type)
+    {
+    case MT_GUARD1:
+    case MT_GUARD2:
+    case MT_GUARD3:
+    case MT_GUARD4:
+    case MT_GUARD5:
+    case MT_GUARD6:
+        // oddly, not all Acolytes are included here...
+        dist >>= 4;
+        break;
+    case MT_SHADOWGUARD:
+    case MT_CRUSADER:
+    case MT_SENTINEL:
+        dist >>= 1;
+        break;
+    default:
+        break;
+    }
+    
+    // villsa [STRIFE] changed to 150
+    if (dist > 150)
+        dist = 150;
+
+    // haleyjd 20100910: Hex-Rays was leaving this out completely:
+    if (actor->type == MT_CRUSADER && dist > 120)
+        dist = 120;
+
+    // haleyjd 20110224 [STRIFE]: reversed predicate
+    return (dist < P_Random());
+}
+
+//
+// P_CheckRobotRange
+//
+// villsa [STRIFE] New function
+//
+boolean P_CheckRobotRange(mobj_t *actor)
+{
+    fixed_t dist;
+
+    if(!P_CheckSight(actor, actor->target))
+        return false;
+
+    if(actor->reactiontime)
+        return false;    // do not attack yet
+
+    dist = (P_AproxDistance(actor->x-actor->target->x,
+                            actor->y-actor->target->y) - 64*FRACUNIT) >> FRACBITS;
+
+    return (dist < 200);
+}
+
+
+//
+// P_Move
+// Move in the current direction,
+// returns false if the move is blocked.
+//
+// [STRIFE]
+// villsa/haleyjd 09/05/10: Modified for terrain types and 3D object 
+// clipping. Below constants are verified to be unmodified:
+//
+fixed_t	xspeed[8] = {FRACUNIT,47000,0,-47000,-FRACUNIT,-47000,0,47000};
+fixed_t yspeed[8] = {0,47000,FRACUNIT,47000,0,-47000,-FRACUNIT,-47000};
+
+
+boolean P_Move (mobj_t*	actor)
+{
+    fixed_t	tryx;
+    fixed_t	tryy;
+
+    line_t*	ld;
+
+    // warning: 'catch', 'throw', and 'try'
+    // are all C++ reserved words
+    boolean	try_ok;
+    boolean	good;
+
+    if (actor->movedir == DI_NODIR)
+        return false;
+
+    if ((unsigned)actor->movedir >= 8)
+        I_Error ("Weird actor->movedir!");
+
+    tryx = actor->x + actor->info->speed*xspeed[actor->movedir];
+    tryy = actor->y + actor->info->speed*yspeed[actor->movedir];
+
+    try_ok = P_TryMove (actor, tryx, tryy);
+
+    if (!try_ok)
+    {
+        // open any specials
+        if (actor->flags & MF_FLOAT && floatok)
+        {
+            // must adjust height
+            if (actor->z < tmfloorz)
+                actor->z += FLOATSPEED; // [STRIFE] Note FLOATSPEED == 5*FRACUNIT
+            else
+                actor->z -= FLOATSPEED;
+
+            actor->flags |= MF_INFLOAT;
+            return true;
+        }
+
+        if (!numspechit)
+            return false;
+
+        actor->movedir = DI_NODIR;
+        good = false;
+        while (numspechit--)
+        {
+            ld = spechit[numspechit];
+            // if the special is not a door
+            // that can be opened,
+            // return false
+            if (P_UseSpecialLine (actor, ld,0))
+                good = true;
+        }
+        return good;
+    }
+    else
+    {
+        actor->flags &= ~(MF_INFLOAT|MF_FEETCLIPPED);   // villsa [STRIFE]
+
+        // villsa [STRIFE]
+        if(P_GetTerrainType(actor) != FLOOR_SOLID)
+            actor->flags |= MF_FEETCLIPPED;
+    }
+
+
+    // villsa [STRIFE] Removed pulling non-floating actors down to the ground.
+    //  (haleyjd 09/05/10: Verified)
+    /*if (! (actor->flags & MF_FLOAT) )	
+          actor->z = actor->floorz;*/
+
+    return true; 
+}
+
+
+//
+// TryWalk
+// Attempts to move actor on
+// in its current (ob->moveangle) direction.
+// If blocked by either a wall or an actor
+// returns FALSE
+// If move is either clear or blocked only by a door,
+// returns TRUE and sets...
+// If a door is in the way,
+// an OpenDoor call is made to start it opening.
+//
+// haleyjd 09/05/10: [STRIFE] Verified unmodified.
+//
+boolean P_TryWalk (mobj_t* actor)
+{
+    if (!P_Move (actor))
+    {
+        return false;
+    }
+
+    actor->movecount = P_Random()&15;
+    return true;
+}
+
+
+
+//
+// P_NewChaseDir
+//
+
+void P_NewChaseDir(mobj_t* actor)
+{
+    fixed_t	deltax;
+    fixed_t	deltay;
+    
+    dirtype_t	d[3];
+    
+    int		tdir;
+    dirtype_t	olddir;
+    
+    dirtype_t	turnaround;
+
+    // villsa [STRIFE] don't bomb out and instead set spawnstate
+    if(!actor->target)
+    {
+        //I_Error("P_NewChaseDir: called with no target");
+        P_SetMobjState(actor, actor->info->spawnstate);
+        return;
+    }
+
+    olddir = actor->movedir;
+    turnaround=opposite[olddir];
+
+    deltax = actor->target->x - actor->x;
+    deltay = actor->target->y - actor->y;
+
+    if (deltax>10*FRACUNIT)
+        d[1]= DI_EAST;
+    else if (deltax<-10*FRACUNIT)
+        d[1]= DI_WEST;
+    else
+        d[1]=DI_NODIR;
+
+    if (deltay<-10*FRACUNIT)
+        d[2]= DI_SOUTH;
+    else if (deltay>10*FRACUNIT)
+        d[2]= DI_NORTH;
+    else
+        d[2]=DI_NODIR;
+
+    // try direct route
+    if (d[1] != DI_NODIR
+        && d[2] != DI_NODIR)
+    {
+        actor->movedir = diags[((deltay<0)<<1)+(deltax>0)];
+        if (actor->movedir != (int) turnaround && P_TryWalk(actor))
+            return;
+    }
+
+    // try other directions
+    if (P_Random() > 200
+        ||  abs(deltay)>abs(deltax))
+    {
+        tdir=d[1];
+        d[1]=d[2];
+        d[2]=tdir;
+    }
+
+    if (d[1]==turnaround)
+        d[1]=DI_NODIR;
+    if (d[2]==turnaround)
+        d[2]=DI_NODIR;
+
+    if (d[1]!=DI_NODIR)
+    {
+        actor->movedir = d[1];
+        if (P_TryWalk(actor))
+        {
+            // either moved forward or attacked
+            return;
+        }
+    }
+
+    if (d[2]!=DI_NODIR)
+    {
+        actor->movedir =d[2];
+
+        if (P_TryWalk(actor))
+            return;
+    }
+
+    // there is no direct path to the player,
+    // so pick another direction.
+    if (olddir!=DI_NODIR)
+    {
+        actor->movedir =olddir;
+
+        if (P_TryWalk(actor))
+            return;
+    }
+
+    // randomly determine direction of search
+    if (P_Random()&1) 	
+    {
+        for ( tdir=DI_EAST;
+              tdir<=DI_SOUTHEAST;
+              tdir++ )
+        {
+            if (tdir != (int) turnaround)
+            {
+                actor->movedir =tdir;
+
+                if ( P_TryWalk(actor) )
+                    return;
+            }
+        }
+    }
+    else
+    {
+        for ( tdir=DI_SOUTHEAST;
+              tdir != (DI_EAST-1);
+              tdir-- )
+        {
+            if (tdir != (int) turnaround)
+            {
+                actor->movedir = tdir;
+
+                if ( P_TryWalk(actor) )
+                    return;
+            }
+        }
+    }
+
+    if (turnaround !=  DI_NODIR)
+    {
+        actor->movedir =turnaround;
+        if ( P_TryWalk(actor) )
+            return;
+    }
+
+    actor->movedir = DI_NODIR;	// can not move
+}
+
+//
+// P_NewRandomDir
+//
+// villsa [STRIFE] new function
+//
+// haleyjd: Almost identical to the tail-end of P_NewChaseDir, this function 
+// finds a purely random direction for an object to walk. Called from 
+// A_RandomWalk.
+//
+// Shockingly similar to the RandomWalk pointer in Eternity :)
+//
+void P_NewRandomDir(mobj_t* actor)
+{
+    int dir = 0;
+    int omovedir = opposite[actor->movedir]; // haleyjd 20110223: nerfed this...
+
+    // randomly determine direction of search
+    if(P_Random() & 1)
+    {
+        // Try all non-reversal directions forward, first
+        for(dir = 0; dir < DI_NODIR; dir++)
+        {
+            if(dir != omovedir)
+            {
+                actor->movedir = dir;
+                if(P_Random() & 1)
+                {
+                    if(P_TryWalk(actor))
+                        break;
+                }
+            }
+        }
+
+        // haleyjd 20110223: logic missing entirely:
+        // failed all non-reversal directions? try reversing
+        if(dir > DI_SOUTHEAST) 
+        {
+            if(omovedir == DI_NODIR)
+            {
+                actor->movedir = DI_NODIR;
+                return;
+            }
+            actor->movedir = omovedir;
+            if(P_TryWalk(actor))
+                return;
+            else
+            {
+                actor->movedir = DI_NODIR;
+                return;
+            }
+        }
+    }
+    else
+    {
+        // Try directions one at a time in backward order
+        dir = DI_SOUTHEAST;
+        while(1)
+        {
+            // haleyjd 09/05/10: missing random code.
+            if(dir != omovedir)
+            {
+                actor->movedir = dir;
+
+                // villsa 09/06/10: un-inlined code
+                if(P_TryWalk(actor))
+                    return;
+            }
+
+            // Ran out of non-reversal directions to try? Reverse.
+            if(--dir == -1)
+            {
+                if(omovedir == DI_NODIR)
+                {
+                    actor->movedir = DI_NODIR;
+                    return;
+                }
+                actor->movedir = omovedir;
+                // villsa 09/06/10: un-inlined code
+                if(P_TryWalk(actor))
+                    return;
+                else
+                {
+                    actor->movedir = DI_NODIR;
+                    return;
+                }
+            } // end if(--dir == -1)
+        } // end while(1)
+    } // end else
+}
+
+
+//
+// P_LookForPlayers
+//
+// If allaround is false, only look 180 degrees in front.
+// Returns true if a player is targeted.
+//
+// [STRIFE]
+// haleyjd 09/05/10: Modifications to support friendly units.
+//
+boolean
+P_LookForPlayers
+( mobj_t*	actor,
+  boolean	allaround )
+{
+    int         c;
+    int         stop;
+    player_t*   player;
+    angle_t     an;
+    fixed_t     dist;
+    mobj_t  *   master = players[actor->miscdata].mo;
+    int consecutive_missing = 0; // for breaking infinite loop
+
+    // haleyjd 09/05/10: handle Allies
+    if(actor->flags & MF_ALLY)
+    {
+        // Deathmatch: support team behavior for Rebels.
+        if(netgame)
+        {
+            // Rebels adopt the allied player's target if it is not of the same
+            // allegiance. Other allies do it unconditionally.
+            if(master && master->target && 
+               (master->target->type != MT_REBEL1 ||
+                master->target->miscdata != actor->miscdata))
+            {
+                actor->target = master->target;
+            }
+            else
+            {
+                // haleyjd 09/06/10: Note that this sets actor->target in Strife!
+                P_BulletSlope(actor);
+
+                // Clear target if nothing is visible, or if the target is a
+                // friendly Rebel or the allied player.
+                if (linetarget == NULL
+                 || (actor->target->type == MT_REBEL1
+                  && actor->target->miscdata == actor->miscdata)
+                 || actor->target == master)
+                {
+                    actor->target = NULL;
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            // Single-player: Adopt any non-allied player target.
+            if(master && master->target && !(master->target->flags & MF_ALLY))
+            {
+                actor->target = master->target;
+                return true;
+            }
+
+            // haleyjd 09/06/10: Note that this sets actor->target in Strife!
+            P_BulletSlope(actor);
+
+            // Clear target if nothing is visible, or if the target is an ally.
+            if(!linetarget || actor->target->flags & MF_ALLY)
+            {
+                actor->target = NULL;
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    c = 0;
+
+    // The 3 below is probably a mistake (it should be MAXPLAYERS - 1, or 7)
+    // and in vanilla this can potentially cause an infinite loop in
+    // multiplayer. Unfortunately we can't correct the mistake - doing so will
+    // cause desyncs. Upon spawning, each enemy's lastlook is initialized to a
+    // random value between 0 and 7 (i.e MAXPLAYERS - 1). There's a chance
+    // that the first call of this function for that enemy will return early
+    // courtesy of the actor->lastlook == stop condition. In a single-player
+    // game this occurs when (actor->lastlook - 1) & 3 equals 0, or when
+    // lastlook equals 1 or 5.
+
+    // If you use MAXPLAYERS - 1, it has the side effect of altering which
+    // enemies are affected by an early actor->lastlook == stop return. Now it
+    // happens when (actor->lastlook - 1) & 7 equals 0, or when lastlook equals
+    // 1, *not* 1 and 5 as above.
+
+    stop = (actor->lastlook-1)&3;
+
+    for ( ; ; actor->lastlook = (actor->lastlook+1)&3 )
+    {
+        if (!playeringame[actor->lastlook])
+        {
+            // Break the vanilla infinite loop here. It can occur if there are
+            // > 4 players and players 0 - 3 all quit the game. Error out
+            // instead.
+            if (consecutive_missing == 4)
+            {
+                I_Error("P_LookForPlayers: No player 1 - 4.\n");
+            }
+            consecutive_missing++;
+            continue;
+        }
+
+        consecutive_missing = 0;
+
+        if (c++ == 2
+            || actor->lastlook == stop)
+        {
+            // done looking
+            return false;	
+        }
+
+        player = &players[actor->lastlook];
+
+        if (player->health <= 0)
+            continue;           // dead
+
+        if (!P_CheckSight (actor, player->mo))
+            continue;           // out of sight
+
+        if (!allaround)
+        {
+            an = R_PointToAngle2(actor->x,
+                                 actor->y, 
+                                 player->mo->x,
+                                 player->mo->y) - actor->angle;
+
+            if (an > ANG90 && an < ANG270)
+            {
+                dist = P_AproxDistance (player->mo->x - actor->x,
+                    player->mo->y - actor->y);
+                // if real close, react anyway
+                if (dist > MELEERANGE)
+                    continue;       // behind back
+            }
+        }
+
+        actor->target = player->mo;
+        return true;
+    }
+
+    return false;
+}
+
+// haleyjd 09/05/10: [STRIFE] Removed A_KeenDie
+
+//
+// ACTION ROUTINES
+//
+
+//
+// A_Look
+// Stay in state until a player is sighted.
+//
+// [STRIFE]
+// haleyjd 09/05/10: Adjusted for allies, Inquisitors, etc.
+//
+void A_Look (mobj_t* actor)
+{
+    mobj_t*         targ;
+
+    actor->threshold = 0;       // any shot will wake up
+    targ = actor->subsector->sector->soundtarget;
+
+    if (targ
+        && (targ->flags & MF_SHOOTABLE) )
+    {
+        // [STRIFE] Allies wander when they call this.
+        if(actor->flags & MF_ALLY)
+            A_RandomWalk(actor);
+        else
+        {
+            actor->target = targ;
+
+            if ( actor->flags & MF_AMBUSH )
+            {
+                if (P_CheckSight (actor, actor->target))
+                    goto seeyou;
+            }
+            else
+                goto seeyou;
+        }
+    }
+
+    // haleyjd 09/05/10: This is bizarre, as Rogue keeps using the GIVEQUEST flag
+    // as a parameter to control allaround look behavior. Did they just run out of
+    // flags, or what? 
+    // STRIFE-TODO: Needs serious verification.
+    if (!P_LookForPlayers(actor, (actor->flags & MF_GIVEQUEST) != 0))
+        return;
+
+    // go into chase state
+seeyou:
+    if (actor->info->seesound)
+    {
+        int         sound   = actor->info->seesound;
+        mobj_t *    emitter = actor;
+
+        // [STRIFE] Removed DOOM random sounds.
+
+        // [STRIFE] Only Inquisitors roar loudly here.
+        if (actor->type == MT_INQUISITOR)
+            emitter = NULL;
+
+        S_StartSound (emitter, sound);
+    }
+
+    // [STRIFE] Set threshold (kinda odd as it's still set to 0 above...)
+    actor->threshold = 20;
+
+    P_SetMobjState (actor, actor->info->seestate);
+}
+
+//
+// A_RandomWalk
+//
+// [STRIFE] New function.
+// haleyjd 09/05/10: Action routine used to meander about.
+//
+void A_RandomWalk(mobj_t* actor)
+{
+    // Standing actors do not wander.
+    if(actor->flags & MF_STAND)
+        return;
+
+    if(actor->reactiontime)
+        actor->reactiontime--; // count down reaction time
+    else
+    {
+        // turn to a new angle
+        if(actor->movedir < DI_NODIR)
+        {
+            int delta;
+
+            actor->angle &= (7u << 29);
+            delta = actor->angle - (actor->movedir << 29);
+
+            if(delta < 0)
+                actor->angle += ANG90/2;
+            else if(delta > 0)
+                actor->angle -= ANG90/2;
+        }
+
+        // try moving
+        if(--actor->movecount < 0 || !P_Move(actor))
+        {
+            P_NewRandomDir(actor);
+            actor->movecount += 5;
+        }
+    }
+}
+
+//
+// A_FriendLook
+//
+// [STRIFE] New function
+// haleyjd 09/05/10: Action function used mostly by mundane characters such as
+// peasants.
+//
+void A_FriendLook(mobj_t* actor)
+{
+    mobj_t *soundtarget = actor->subsector->sector->soundtarget;
+
+    actor->threshold = 0;
+
+    if(soundtarget && soundtarget->flags & MF_SHOOTABLE)
+    {
+        // Handle allies, except on maps 3 and 34 (Front Base/Movement Base)
+        if((actor->flags & MF_ALLY) == (soundtarget->flags & MF_ALLY) &&
+            gamemap != 3 && gamemap != 34)
+        {
+            // STRIFE-TODO: Needs serious verification.
+            if(P_LookForPlayers(actor, (actor->flags & MF_GIVEQUEST) != 0))
+            {
+                P_SetMobjState(actor, actor->info->seestate);
+                actor->flags |= MF_NODIALOG;
+                return;
+            }
+        }
+        else
+        {
+            actor->target = soundtarget;
+
+            if(!(actor->flags & MF_AMBUSH) || P_CheckSight(actor, actor->target))
+            {
+                actor->threshold = 10;
+                P_SetMobjState(actor, actor->info->seestate);
+                return;
+            }
+        }
+    }
+
+    // do some idle animation
+    if(P_Random() < 30)
+    {
+        int t = P_Random();
+        P_SetMobjState(actor, (t & 1) + actor->info->spawnstate + 1);
+    }
+
+    // wander around a bit
+    if(!(actor->flags & MF_STAND) && P_Random() < 40)
+        P_SetMobjState(actor, actor->info->spawnstate + 3);
+}
+
+//
+// A_Listen
+//
+// [STRIFE] New function
+// haleyjd 09/05/10: Action routine used to strictly listen for a target.
+//
+void A_Listen(mobj_t* actor)
+{
+    mobj_t *soundtarget;
+
+    actor->threshold = 0;
+
+    soundtarget = actor->subsector->sector->soundtarget;
+
+    if(soundtarget && (soundtarget->flags & MF_SHOOTABLE))
+    {
+        if((actor->flags & MF_ALLY) != (soundtarget->flags & MF_ALLY))
+        {
+            actor->target = soundtarget;
+
+            if(!(actor->flags & MF_AMBUSH) || P_CheckSight(actor, actor->target))
+            {
+                if(actor->info->seesound)
+                    S_StartSound(actor, actor->info->seesound);
+
+                actor->threshold = 10;
+
+                P_SetMobjState(actor, actor->info->seestate);
+            }
+        }
+    }
+}
+
+
+//
+// A_Chase
+// Actor has a melee attack,
+// so it tries to close as fast as possible
+//
+// haleyjd 09/05/10: [STRIFE] Various minor changes
+//
+void A_Chase (mobj_t*	actor)
+{
+    int         delta;
+
+    if (actor->reactiontime)
+        actor->reactiontime--;
+
+    // modify target threshold
+    if  (actor->threshold)
+    {
+        // haleyjd 20110204 [STRIFE]: No health <= 0 check here!
+        if (actor->target)
+            actor->threshold--;
+        else
+            actor->threshold = 0;
+    }
+    
+    // turn towards movement direction if not there yet
+    if (actor->movedir < 8)
+    {
+        actor->angle &= (7u << 29);
+        delta = actor->angle - (actor->movedir << 29);
+
+        if (delta > 0)
+            actor->angle -= ANG90/2;
+        else if (delta < 0)
+            actor->angle += ANG90/2;
+    }
+
+    if (!actor->target
+        || !(actor->target->flags&MF_SHOOTABLE))
+    {
+        // look for a new target
+        if (P_LookForPlayers(actor, true))
+            return; 	// got a new target
+
+        P_SetMobjState (actor, actor->info->spawnstate);
+        return;
+    }
+    
+    // do not attack twice in a row
+    if (actor->flags & MF_JUSTATTACKED)
+    {
+        actor->flags &= ~MF_JUSTATTACKED;
+        // [STRIFE] Checks only against fastparm, not gameskill == 5
+        if (!fastparm)
+            P_NewChaseDir (actor);
+        return;
+    }
+    
+    // check for melee attack
+    if (actor->info->meleestate
+        && P_CheckMeleeRange (actor))
+    {
+        if (actor->info->attacksound)
+            S_StartSound (actor, actor->info->attacksound);
+
+        P_SetMobjState (actor, actor->info->meleestate);
+        return;
+    }
+    
+    // check for missile attack
+    if (actor->info->missilestate)
+    {
+        // [STRIFE] Checks only fastparm.
+        if (!fastparm && actor->movecount)
+        {
+            goto nomissile;
+        }
+
+        if (!P_CheckMissileRange (actor))
+            goto nomissile;
+
+        P_SetMobjState (actor, actor->info->missilestate);
+
+        // [STRIFE] Add NODIALOG flag to disable dialog
+        actor->flags |= (MF_NODIALOG|MF_JUSTATTACKED);
+        return;
+    }
+
+    // ?
+nomissile:
+    // possibly choose another target
+    if (netgame
+        && !actor->threshold
+        && !P_CheckSight (actor, actor->target) )
+    {
+        if (P_LookForPlayers(actor, true))
+            return; // got a new target
+    }
+    
+    // chase towards player
+    if (--actor->movecount<0
+        || !P_Move (actor))
+    {
+        P_NewChaseDir (actor);
+    }
+
+    // [STRIFE] Changes to active sound behavior:
+    // * Significantly more frequent
+    // * Acolytes have randomized wandering sounds
+
+    // make active sound
+    if (actor->info->activesound && P_Random () < 38)
+    {
+        if(actor->info->activesound >= sfx_agrac1 &&
+           actor->info->activesound <= sfx_agrac4)
+        {
+            S_StartSound(actor, sfx_agrac1 + P_Random() % 4);
+        }
+        else
+            S_StartSound(actor, actor->info->activesound);
+    }
+}
+
+
+//
+// A_FaceTarget
+//
+// [STRIFE]
+// haleyjd 09/05/10: Handling for visibility-modifying flags.
+//
+void A_FaceTarget (mobj_t* actor)
+{
+    if (!actor->target)
+        return;
+
+    actor->flags &= ~MF_AMBUSH;
+
+    actor->angle = R_PointToAngle2 (actor->x,
+                                    actor->y,
+                                    actor->target->x,
+                                    actor->target->y);
+
+    if(actor->target->flags & MF_SHADOW)
+    {
+        // [STRIFE] increased SHADOW inaccuracy by a power of 2
+        int t = P_Random();
+        actor->angle += (t - P_Random()) << 22;
+    }
+    else if(actor->target->flags & MF_MVIS)
+    {
+        // [STRIFE] MVIS gives even worse aiming!
+        int t = P_Random();
+        actor->angle += (t - P_Random()) << 23;
+    }
+}
+
+//
+// A_PeasantPunch
+//
+// [STRIFE] New function
+// haleyjd 09/05/10: Attack used by Peasants as a one-time retaliation
+// when the player or a monster injures them. Weak doesn't begin to
+// describe it :P
+//
+void A_PeasantPunch(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    A_FaceTarget(actor);
+    if(P_CheckMeleeRange(actor))
+        P_DamageMobj(actor->target, actor, actor, 2 * (P_Random() % 5) + 2);
+}
+
+//
+// A_ReaverAttack
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action routine used by Reavers to fire bullets.
+// Also apparently used by Inquistors, though they don't seem to use
+// it too often, as they're content to blow your face off with their
+// HE grenades instead.
+//
+void A_ReaverAttack(mobj_t* actor)
+{
+    int i = 0;
+    fixed_t slope;
+
+    if(!actor->target)
+        return;
+
+    S_StartSound(actor, sfx_reavat);
+    A_FaceTarget(actor);
+
+    slope = P_AimLineAttack(actor, actor->angle, 2048*FRACUNIT);
+
+    do
+    {
+        int     t          = P_Random();
+        angle_t shootangle = actor->angle + ((t - P_Random()) << 20);
+        int     damage     = 3*((P_Random() & 7) + 1);
+
+        P_LineAttack(actor, shootangle, 2048*FRACUNIT, slope, damage);
+        ++i;
+    }
+    while(i < 3);
+}
+
+//
+// A_BulletAttack
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for generic bullet attacks. Used by
+// a lot of different characters, including Acolytes, Rebels, and Macil.
+//
+void A_BulletAttack(mobj_t* actor)
+{
+    int t, damage;
+    fixed_t slope;
+    angle_t shootangle;
+
+    if(!actor->target)
+        return;
+
+    S_StartSound(actor, sfx_rifle);
+    A_FaceTarget(actor);
+    
+    slope = P_AimLineAttack(actor, actor->angle, 2048*FRACUNIT);
+    t = P_Random();
+    shootangle = ((t - P_Random()) << 19) + actor->angle;
+    damage = 3 * (P_Random() % 5 + 1);
+
+    P_LineAttack(actor, shootangle, 2048*FRACUNIT, slope, damage);
+}
+
+//
+// A_CheckTargetVisible
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action routine which sets a thing back to its
+// seestate at random, or if it cannot see its target, or its target
+// is dead. Used by diverse actors.
+//
+void A_CheckTargetVisible(mobj_t* actor)
+{
+    A_FaceTarget(actor);
+
+    if(P_Random() >= 30)
+    {
+        mobj_t *target = actor->target;
+        
+        if(!target || target->health <= 0 || !P_CheckSight(actor, target) ||
+            P_Random() < 40)
+        {
+            P_SetMobjState(actor, actor->info->seestate);
+        }
+    }
+}
+
+//
+// A_SentinelAttack
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function implementing the Sentinel's laser attack
+// villsa 09/06/10 implemented
+//
+void A_SentinelAttack(mobj_t* actor)
+{
+    mobj_t* mo;
+    mobj_t* mo2;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    angle_t an;
+    int i;
+
+    mo = P_SpawnFacingMissile(actor, actor->target, MT_L_LASER);
+    an = actor->angle >> ANGLETOFINESHIFT;
+
+    if(mo->momy | mo->momx) // villsa - fixed typo (yes, they actually used '|' instead of'||')
+    {
+        for(i = 8; i > 1; i--)
+        {
+            x = mo->x + FixedMul(mobjinfo[MT_L_LASER].radius * i, finecosine[an]);
+            y = mo->y + FixedMul(mobjinfo[MT_L_LASER].radius * i, finesine[an]);
+            z = mo->z + i * (mo->momz >> 2);
+            mo2 = P_SpawnMobj(x, y, z, MT_R_LASER);
+            mo2->target = actor;
+            mo2->momx = mo->momx;
+            mo2->momy = mo->momy;
+            mo2->momz = mo->momz;
+            P_CheckMissileSpawn(mo2);
+        }
+    }
+
+    mo->z += mo->momz >> 2;
+}
+
+//
+// A_StalkerThink
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function to drive Stalker logic.
+//
+void A_StalkerThink(mobj_t* actor)
+{
+    statenum_t statenum;
+
+    if(actor->flags & MF_NOGRAVITY)
+    {
+        if(actor->ceilingz - actor->info->height <= actor->z)
+            return;
+        statenum = S_SPID_11; // 1020
+    }
+    else
+        statenum = S_SPID_18; // 1027
+
+    P_SetMobjState(actor, statenum);
+}
+
+//
+// A_StalkerSetLook
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function to marshall transitions to the
+// Stalker's spawnstate.
+//
+void A_StalkerSetLook(mobj_t* actor)
+{
+    statenum_t statenum;
+
+    if(!actor) // weird; totally unnecessary.
+        return;
+
+    if(actor->flags & MF_NOGRAVITY)
+    {
+        if(actor->state->nextstate == S_SPID_01) // 1010
+            return;
+        statenum = S_SPID_01; // 1010
+    }
+    else
+    {
+        if(actor->state->nextstate == S_SPID_02) // 1011
+            return;
+        statenum = S_SPID_02; // 1011
+    }
+
+    P_SetMobjState(actor, statenum);
+}
+
+//
+// A_StalkerDrop
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Dead simple: removes NOGRAVITY status.
+//
+void A_StalkerDrop(mobj_t* actor)
+{
+    actor->flags &= ~MF_NOGRAVITY;
+}
+
+//
+// A_StalkerScratch
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for Stalker's attack.
+//
+void A_StalkerScratch(mobj_t* actor)
+{
+    if(actor->flags & MF_NOGRAVITY)
+    {
+        // Drop him down before he can attack
+        P_SetMobjState(actor, S_SPID_11); // 1020
+        return;
+    }
+
+    if(!actor->target)
+        return;
+
+    A_FaceTarget(actor);
+    if(P_CheckMeleeRange(actor))
+        P_DamageMobj(actor->target, actor, actor, 2 * (P_Random() % 8) + 2);
+}
+
+//
+// A_FloatWeave
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function which is responsible for floating
+// actors' constant upward and downward movement. Probably a really bad
+// idea in retrospect given how dodgy the 3D clipping implementation is.
+//
+void A_FloatWeave(mobj_t* actor)
+{
+    fixed_t height;
+    fixed_t z;
+
+    if(actor->threshold)
+        return;
+
+    if(actor->flags & MF_INFLOAT)
+        return;
+
+    height = actor->info->height;         // v2
+    z      = actor->floorz + 96*FRACUNIT; // v1
+
+    if ( z > actor->ceilingz - height - 16*FRACUNIT )
+        z = actor->ceilingz - height - 16*FRACUNIT;
+
+    if ( z >= actor->z )
+        actor->momz += FRACUNIT;
+    else
+        actor->momz -= FRACUNIT;
+
+    if ( z == actor->z )
+        actor->threshold = 4;
+    else
+        actor->threshold = 8;
+}
+
+//
+// A_RobotMelee
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for Reaver and Templar melee attacks.
+//
+void A_RobotMelee(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    A_FaceTarget(actor);
+    if(P_CheckMeleeRange(actor))
+    {
+        S_StartSound(actor, sfx_revbld);
+        P_DamageMobj(actor->target, actor, actor, 3 * (P_Random() % 8 + 1));
+    }
+}
+
+//
+// A_TemplarMauler
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Exactly what it sounds like. Kicks your ass.
+//
+void A_TemplarMauler(mobj_t* actor)
+{
+    int i, t;
+    int angle;
+    int bangle;
+    int damage;
+    int slope;
+
+    if(!actor->target)
+        return;
+
+    S_StartSound(actor, sfx_pgrdat);
+    A_FaceTarget(actor);
+    bangle = actor->angle;
+    slope = P_AimLineAttack(actor, bangle, 2048*FRACUNIT);
+
+    for(i = 0; i < 10; i++)
+    {
+        // haleyjd 09/06/10: Very carefully preserved order of P_Random calls
+        damage = (P_Random() & 4) * 2;
+        t = P_Random();
+        angle = bangle + ((t - P_Random()) << 19);
+        t = P_Random();
+        slope = ((t - P_Random()) << 5) + slope;
+        P_LineAttack(actor, angle, 2112*FRACUNIT, slope, damage);
+    }
+}
+
+//
+// A_CrusaderAttack
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Action function for the Crusader's Flamethrower.
+// Very similar to the player's flamethrower, seeing how it was ripped
+// off a Crusader by the Rat People ;)
+//
+void A_CrusaderAttack(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    actor->z += (8*FRACUNIT);
+
+    if(P_CheckRobotRange(actor))
+    {
+        A_FaceTarget(actor);
+        actor->angle -= (ANG90 / 8);
+        P_SpawnFacingMissile(actor, actor->target, MT_C_FLAME);
+    }
+    else if(P_CheckMissileRange(actor))
+    {
+        A_FaceTarget(actor);
+        actor->z += (16*FRACUNIT);
+        P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
+
+        actor->angle -= (ANG45 / 32);
+        actor->z -= (16*FRACUNIT);
+        P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
+
+        actor->angle += (ANG45 / 16);
+        P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
+
+        P_SetMobjState(actor, actor->info->seestate);
+        actor->reactiontime += 15;
+    }
+    else
+        P_SetMobjState(actor, actor->info->seestate);
+    
+    actor->z -= (8*FRACUNIT);
+}
+
+//
+// A_CrusaderLeft
+//
+// villsa [STRIFE] new codepointer
+//
+void A_CrusaderLeft(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    actor->angle += (ANG90 / 16);
+    mo = P_SpawnFacingMissile(actor, actor->target, MT_C_FLAME);
+    mo->momz = FRACUNIT;
+    mo->z += (16*FRACUNIT);
+
+}
+
+//
+// A_CrusaderRight
+//
+// villsa [STRIFE] new codepointer
+//
+void A_CrusaderRight(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    actor->angle -= (ANG90 / 16);
+    mo = P_SpawnFacingMissile(actor, actor->target, MT_C_FLAME);
+    mo->momz = FRACUNIT;
+    mo->z += (16*FRACUNIT);
+}
+
+//
+// A_CheckTargetVisible2
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Mostly the same as CheckTargetVisible, except without
+// the randomness.
+//
+void A_CheckTargetVisible2(mobj_t* actor)
+{
+    if(!actor->target || actor->target->health <= 0 || 
+        !P_CheckSight(actor, actor->target))
+    {
+        P_SetMobjState(actor, actor->info->seestate);
+    }
+}
+
+//
+// A_InqFlyCheck
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function to check if an Inquisitor wishes
+// to take to flight.
+//
+void A_InqFlyCheck(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    A_FaceTarget(actor);
+
+    // if not in "robot" range, shoot grenades.
+    if(!P_CheckRobotRange(actor))
+        P_SetMobjState(actor, S_ROB3_14); // 1061
+
+    if(actor->z != actor->target->z)
+    {
+        // Take off all zig!
+        if(actor->z + actor->height + 54*FRACUNIT < actor->ceilingz)
+            P_SetMobjState(actor, S_ROB3_17); // 1064
+    }
+}
+
+//
+// A_InqGrenade
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Inquisitor grenade attack action routine.
+//
+void A_InqGrenade(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    if(!actor->target)
+        return;
+
+    A_FaceTarget(actor);
+
+    actor->z += MAXRADIUS;
+
+    // grenade 1
+    actor->angle -= (ANG45 / 32);
+    mo = P_SpawnFacingMissile(actor, actor->target, MT_INQGRENADE);
+    mo->momz += (9*FRACUNIT);
+
+    // grenade 2
+    actor->angle += (ANG45 / 16);
+    mo = P_SpawnFacingMissile(actor, actor->target, MT_INQGRENADE);
+    mo->momz += (16*FRACUNIT);
+
+    actor->z -= MAXRADIUS;
+}
+
+//
+// A_InqTakeOff
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Makes an Inquisitor start flying.
+//
+void A_InqTakeOff(mobj_t* actor)
+{
+    angle_t an;
+    fixed_t speed = actor->info->speed * (2 * FRACUNIT / 3);
+    fixed_t dist;
+
+    if(!actor->target)
+        return;
+
+    S_StartSound(actor, sfx_inqjmp);
+
+    actor->z += 64 * FRACUNIT;
+
+    A_FaceTarget(actor);
+
+    an = actor->angle >> ANGLETOFINESHIFT;
+
+    actor->momx = FixedMul(finecosine[an], speed);
+    actor->momy = FixedMul(finesine[an],   speed);
+
+    dist = P_AproxDistance(actor->target->x - actor->x,
+                           actor->target->y - actor->y);
+
+    dist /= speed;
+    if(dist < 1)
+        dist = 1;
+
+    actor->momz = (actor->target->z - actor->z) / dist;
+    actor->reactiontime = 60;
+    actor->flags |= MF_NOGRAVITY;
+}
+
+//
+// A_InqFly
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Handles an Inquisitor in flight.
+//
+void A_InqFly(mobj_t* actor)
+{
+    if(!(leveltime & 7))
+        S_StartSound(actor, sfx_inqjmp);
+
+    if(--actor->reactiontime < 0 || !actor->momx || !actor->momy ||
+        actor->z <= actor->floorz)
+    {
+        // Come in for a landing.
+        P_SetMobjState(actor, actor->info->seestate);
+        actor->reactiontime = 0;
+        actor->flags &= ~MF_NOGRAVITY;
+    }
+}
+
+//
+// A_FireSigilWeapon
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for the Entity's attack.
+//
+void A_FireSigilWeapon(mobj_t* actor)
+{
+    int choice = P_Random() % 5;
+
+    // STRIFE-TODO: Needs verification. This switch is just weird.
+    switch(choice)
+    {
+    case 0:
+        A_ProgrammerAttack(actor);
+        break;
+    // ain't not seen no case 1, bub...
+    case 2:
+        A_FireSigilEOffshoot(actor);
+        break;
+    case 3:
+        A_SpectreCAttack(actor);
+        break;
+    case 4:
+        A_SpectreDAttack(actor);
+        break;
+    case 5: // BUG: never used? wtf were they thinking?
+        A_SpectreEAttack(actor);
+        break;
+    default:
+        break;
+    }
+}
+
+//
+// A_ProgrammerAttack
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for the Programmer's main
+// attack; equivalent to the player's first Sigil.
+//
+void A_ProgrammerAttack(mobj_t* actor)
+{
+    mobj_t *mo;
+
+    if(!actor->target)
+        return;
+
+    mo = P_SpawnMobj(actor->target->x, actor->target->y, ONFLOORZ, 
+                     MT_SIGIL_A_GROUND);
+    mo->threshold = 25;
+    mo->target = actor;
+    mo->health = -2;
+    mo->tracer = actor->target;
+}
+
+//
+// A_Sigil_A_Action
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Called by MT_SIGIL_A_GROUND to zot anyone nearby with
+// corny looking lightning bolts.
+//
+void A_Sigil_A_Action(mobj_t* actor)
+{
+    int t, x, y, type;
+    mobj_t *mo;
+
+    if(actor->threshold)
+        actor->threshold--;
+
+    t = P_Random();
+    actor->momx += ((t & 3) - (P_Random() & 3)) << FRACBITS;
+    t = P_Random();
+    actor->momy += ((t & 3) - (P_Random() & 3)) << FRACBITS;
+
+    t = P_Random();
+    x = 50*FRACUNIT * ((t & 3) - (P_Random() & 3)) + actor->x;
+    t = P_Random();
+    y = 50*FRACUNIT * ((t & 3) - (P_Random() & 3)) + actor->y;
+
+    if(actor->threshold <= 25)
+        type = MT_SIGIL_A_ZAP_LEFT;
+    else
+        type = MT_SIGIL_A_ZAP_RIGHT;
+
+    mo = P_SpawnMobj(x, y, ONCEILINGZ, type);
+    mo->momz = -18 * FRACUNIT;
+    mo->target = actor->target;
+    mo->health = actor->health;
+
+    mo = P_SpawnMobj(actor->x, actor->y,  ONCEILINGZ, MT_SIGIL_A_ZAP_RIGHT);
+    mo->momz = -18 * FRACUNIT;
+    mo->target = actor->target;
+    mo->health = actor->health;
+}
+
+//
+// A_SpectreEAttack
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for the Loremaster's Spectre.
+// Equivalent to the player's final Sigil attack.
+//
+void A_SpectreEAttack(mobj_t* actor)
+{
+    mobj_t *mo;
+
+    if(!actor->target)
+        return;
+    
+    mo = P_SpawnMissile(actor, actor->target, MT_SIGIL_SE_SHOT);
+    mo->health = -2;
+}
+
+//
+// A_SpectreCAttack
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Action routine for the Oracle's Spectre. Equivalent to the player's
+// third Sigil attack.
+//
+void A_SpectreCAttack(mobj_t* actor)
+{
+    mobj_t* mo;
+    int i;
+
+    if(!actor->target)
+        return;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (32*FRACUNIT), MT_SIGIL_A_ZAP_RIGHT);
+    mo->momz = -(18*FRACUNIT);
+    mo->target = actor;
+    mo->health = -2;
+    mo->tracer = actor->target;
+    
+    actor->angle -= ANG90;
+    for(i = 0; i < 20; i++)
+    {
+        actor->angle += (ANG90 / 10);
+        mo = P_SpawnMortar(actor, MT_SIGIL_C_SHOT);
+        mo->health = -2;
+        mo->z = actor->z + (32*FRACUNIT);
+    }
+    actor->angle -= ANG90;
+}
+
+//
+// A_AlertSpectreC
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function called by the Oracle when it is
+// killed. Finds an MT_SPECTRE_C anywhere on the map and awakens it.
+//
+void A_AlertSpectreC(mobj_t* actor)
+{
+    thinker_t *th;
+
+    for(th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if(th->function.acp1 == (actionf_p1)P_MobjThinker)
+        {
+            mobj_t *mo = (mobj_t *)th;
+
+            if(mo->type == MT_SPECTRE_C)
+            {
+                P_SetMobjState(mo, mo->info->seestate);
+                mo->target = actor->target;
+                return;
+            }
+        }
+    }
+}
+
+//
+// A_Sigil_E_Action
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Action routine for Sigil "E" shots. Spawns the room-filling
+// lightning bolts that seem to often do almost nothing.
+//
+void A_Sigil_E_Action(mobj_t* actor)
+{
+    actor->angle += ANG90;
+    P_SpawnMortar(actor, MT_SIGIL_E_OFFSHOOT);
+
+    actor->angle -= ANG180;
+    P_SpawnMortar(actor, MT_SIGIL_E_OFFSHOOT);
+
+    actor->angle += ANG90;
+    P_SpawnMortar(actor, MT_SIGIL_E_OFFSHOOT);
+
+}
+
+//
+// A_SigilTrail
+//
+// villsa [STRIFE] new codepointer
+//
+void A_SigilTrail(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x - actor->momx,
+                     actor->y - actor->momy,
+                     actor->z, MT_SIGIL_TRAIL);
+
+    mo->angle = actor->angle;
+    mo->health = actor->health;
+
+}
+
+//
+// A_SpectreDAttack
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function for Macil's Spectre.
+// Equivalent of the player's fourth Sigil attack.
+//
+void A_SpectreDAttack(mobj_t* actor)
+{
+    mobj_t *mo;
+
+    if(!actor->target)
+        return;
+
+    mo = P_SpawnMissile(actor, actor->target, MT_SIGIL_SD_SHOT);
+    mo->health = -2;
+    mo->tracer = actor->target;
+}
+
+//
+// A_FireSigilEOffshoot
+//
+// [STRIFE] New function
+// haleyjd 09/06/10: Action function to fire part of a Sigil E
+// attack. Used at least by the Entity.
+//
+void A_FireSigilEOffshoot(mobj_t* actor)
+{
+    mobj_t *mo;
+
+    if(!actor->target)
+        return;
+
+    mo = P_SpawnMissile(actor, actor->target, MT_SIGIL_E_OFFSHOOT);
+    mo->health = -2;
+}
+
+//
+// A_ShadowOff
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Disables SHADOW and MVIS flags.
+//
+void A_ShadowOff(mobj_t* actor)
+{
+    actor->flags &= ~(MF_SHADOW|MF_MVIS);
+}
+
+//
+// A_ModifyVisibility
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Turns on SHADOW, and turns off MVIS.
+//
+void A_ModifyVisibility(mobj_t* actor)
+{
+    actor->flags |= MF_SHADOW;
+    actor->flags &= ~MF_MVIS;
+}
+
+//
+// A_ShadowOn
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Turns on SHADOW and MVIS.
+//
+void A_ShadowOn(mobj_t* actor)
+{
+    actor->flags |= (MF_SHADOW|MF_MVIS);
+}
+
+//
+// A_SetTLOptions
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Sets SHADOW and/or MVIS based on the thing's spawnpoint options.
+//
+void A_SetTLOptions(mobj_t* actor)
+{
+    if(actor->spawnpoint.options & MTF_TRANSLUCENT)
+        actor->flags |= MF_SHADOW;
+    if(actor->spawnpoint.options & MTF_MVIS)
+        actor->flags |= MF_MVIS;
+}
+
+//
+// A_BossMeleeAtk
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Gratuitous melee attack used by multiple boss characters,
+// just for the sake of having one. It's not like anybody in their right
+// mind would get close to any of the maniacs that use this ;)
+//
+void A_BossMeleeAtk(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    P_DamageMobj(actor->target, actor, actor, 10 * (P_Random() & 9));
+}
+
+//
+// A_BishopAttack
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Bishop's homing missile attack.
+//
+void A_BishopAttack(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    if(!actor->target)
+        return;
+
+    actor->z += MAXRADIUS;
+
+    mo = P_SpawnMissile(actor, actor->target, MT_SEEKMISSILE);
+    mo->tracer = actor->target;
+
+    actor->z -= MAXRADIUS;
+}
+
+//
+// A_FireHookShot
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Action function for the Loremaster's hookshot attack.
+//
+void A_FireHookShot(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    P_SpawnMissile(actor, actor->target, MT_HOOKSHOT);
+}
+
+//
+// A_FireChainShot
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Action function for the hookshot projectile. Spawns echoes
+// to create a chain-like appearance.
+//
+void A_FireChainShot(mobj_t* actor)
+{
+    S_StartSound(actor, sfx_tend);
+
+    P_SpawnMobj(actor->x, actor->y, actor->z, MT_CHAINSHOT); // haleyjd: fixed type
+
+    P_SpawnMobj(actor->x - (actor->momx >> 1),
+                actor->y - (actor->momy >> 1),
+                actor->z, MT_CHAINSHOT);
+
+    P_SpawnMobj(actor->x - actor->momx,
+                actor->y - actor->momy,
+                actor->z, MT_CHAINSHOT);
+}
+
+//
+// A_MissileSmoke
+//
+// villsa [STRIFE] new codepointer
+//
+void A_MissileSmoke(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    S_StartSound(actor, sfx_rflite);
+    P_SpawnPuff(actor->x, actor->y, actor->z);
+    mo = P_SpawnMobj(actor->x - actor->momx,
+                     actor->y - actor->momy,
+                     actor->z, MT_MISSILESMOKE);
+
+    mo->momz = FRACUNIT;
+}
+
+//
+// A_SpawnSparkPuff
+//
+// villsa [STRIFE] new codepointer
+//
+void A_SpawnSparkPuff(mobj_t* actor)
+{
+    int r;
+    mobj_t* mo;
+    fixed_t x;
+    fixed_t y;
+
+    r = P_Random();
+    x = (10*FRACUNIT) * ((r & 3) - (P_Random() & 3)) + actor->x;
+    r = P_Random();
+    y = (10*FRACUNIT) * ((r & 3) - (P_Random() & 3)) + actor->y;
+
+    mo = P_SpawnMobj(x, y, actor->z, MT_SPARKPUFF);
+    P_SetMobjState(mo, S_BNG4_01); // 199
+    mo->momz = FRACUNIT;
+}
+
+
+// haleyjd 09/05/10: [STRIFE] Removed:
+// A_PosAttack, A_SPosAttack, A_CPosAttack, A_CPosRefire, A_SpidRefire, 
+// A_BspiAttack, A_TroopAttack, A_SargAttack, A_HeadAttack, A_CyberAttack,
+// A_BruisAttack, A_SkelMissile
+
+
+int TRACEANGLE = 0xE000000; // villsa [STRIFE] changed from 0xC000000 to 0xE000000
+
+//
+// A_Tracer
+//
+void A_Tracer (mobj_t* actor)
+{
+    angle_t exact;
+    fixed_t dist;
+    fixed_t slope;
+    mobj_t* dest;
+    //mobj_t* th;
+
+    // villsa [STRIFE] removed all randomization and puff code
+
+    // adjust direction
+    dest = actor->tracer;
+
+    if(!dest || dest->health <= 0)
+        return;
+
+    // change angle	
+    exact = R_PointToAngle2(actor->x, actor->y, dest->x, dest->y);
+
+    if(exact != actor->angle)
+    {
+        // villsa [STRIFE] slightly different algorithm
+        if(exact - actor->angle <= 0x80000000)
+        {
+            actor->angle += TRACEANGLE;
+            if(exact - actor->angle > 0x80000000)
+                actor->angle = exact;
+        }
+        else
+        {
+            actor->angle -= TRACEANGLE;
+            if (exact - actor->angle < 0x80000000)
+                actor->angle = exact;
+        }
+    }
+
+    exact = actor->angle>>ANGLETOFINESHIFT;
+    actor->momx = FixedMul (actor->info->speed, finecosine[exact]);
+    actor->momy = FixedMul (actor->info->speed, finesine[exact]);
+
+    // change slope
+    dist = P_AproxDistance (dest->x - actor->x,
+        dest->y - actor->y);
+
+    dist = dist / actor->info->speed;
+
+    if (dist < 1)
+        dist = 1;
+    slope = (dest->z+40*FRACUNIT - actor->z) / dist;
+
+    if (slope < actor->momz)
+        actor->momz -= FRACUNIT/8;
+    else
+        actor->momz += FRACUNIT/8;
+}
+
+//
+// A_ProgrammerMelee
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Melee attack for the Programmer.
+// haleyjd - fixed damage formula
+//
+void A_ProgrammerMelee(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    A_FaceTarget(actor);
+    if(P_CheckMeleeRange(actor))
+    {
+        int damage = 6 * (P_Random() % 10 + 1);
+        
+        S_StartSound(actor, sfx_mtalht);
+        P_DamageMobj(actor->target, actor, actor, damage);
+    }
+
+}
+
+// haleyjd 09/05/10: [STRIFE] Removed:
+// A_SkelWhoosh, A_SkelFist, PIT_VileCheck, A_VileChase, A_VileStart, 
+// A_StartFire, A_FireCrackle, A_Fire, A_VileTarget, A_VileAttack
+// A_FatRaise, A_FatAttack1, A_FatAttack2, A_FatAttack3, A_SkullAttack, 
+// A_PainShootSkull, A_PainAttack, A_PainDie
+
+//
+// A_Scream
+//
+// villsa [STRIFE] 
+// * Has no random death sounds, so play deathsound directly
+// * Full-volume roars for the Entity and Inquisitor.
+//
+void A_Scream(mobj_t* actor)
+{
+    if(!actor->info->deathsound)
+        return;
+
+    // Check for bosses.
+    if(actor->type == MT_ENTITY || actor->type == MT_INQUISITOR)
+        S_StartSound(NULL, actor->info->deathsound);   // full volume
+    else
+        S_StartSound(actor, actor->info->deathsound);
+}
+
+//
+// A_XScream
+//
+// villsa [STRIFE]
+// * Robots will play deathsound while non-robots play the slop sfx
+//
+void A_XScream(mobj_t* actor)
+{
+    int sound;
+
+    if(actor->flags & MF_NOBLOOD && actor->info->deathsound)
+        sound = actor->info->deathsound;
+    else
+        sound = sfx_slop;
+
+    S_StartSound(actor, sound);
+}
+
+//
+// A_Pain
+//
+// villsa [STRIFE] 
+// * Play random peasant sounds; otherwise play painsound directly
+//
+void A_Pain(mobj_t* actor)
+{
+    int sound = actor->info->painsound;
+
+    if(sound)
+    {
+        if(sound >= sfx_pespna && sound <= sfx_pespnd)
+            sound = sfx_pespna + (P_Random() % 4);
+        
+        S_StartSound(actor, sound);
+    }
+}
+
+//
+// A_PeasantCrash
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Called from Peasant's "crash" state (not to be confused with
+// Heretic crash states), which is invoked when the Peasant has taken
+// critical but sub-fatal damage. It will "bleed out" the rest of its
+// health by calling this function repeatedly.
+//
+void A_PeasantCrash(mobj_t* actor)
+{
+    // Set NODIALOG, because you probably wouldn't feel like talking either
+    // if somebody just stabbed you in the gut with a punch dagger...
+    actor->flags |= MF_NODIALOG;
+
+    if(!(P_Random() % 5))
+    {
+        A_Pain(actor);  // inlined in asm
+        actor->health--;
+    }
+
+    if(actor->health <= 0)
+        P_KillMobj(actor->target, actor);
+}
+
+//
+// A_Fall
+//
+// [STRIFE]
+// * Set NODIALOG, and clear NOGRAVITY and SHADOW
+//
+void A_Fall (mobj_t *actor)
+{
+    // villsa [STRIFE] set NODIALOG flag to stop dialog
+    actor->flags |= MF_NODIALOG;
+
+    // actor is on ground, it can be walked over
+    // villsa [STRIFE] remove nogravity/shadow flags as well
+    actor->flags &= ~(MF_SOLID|MF_NOGRAVITY|MF_SHADOW);
+}
+
+//
+// A_HideZombie
+//
+// villsa [STRIFE] new codepointer
+// Used by the "Becoming" Acolytes on the Loremaster's level.
+//
+void A_HideZombie(mobj_t* actor)
+{
+    line_t junk;
+
+    junk.tag = 999;
+    EV_DoDoor(&junk, vld_blazeClose);
+
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+//
+// A_MerchantPain
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Pain pointer for merchant characters. They close up shop for
+// a while and set off the alarm.
+//
+void A_MerchantPain(mobj_t* actor)
+{
+    line_t junk;
+
+    junk.tag = 999;
+    EV_DoDoor(&junk, vld_shopClose);
+
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+// haleyjd 09/05/10: Removed unused CheckBossEnd Choco routine.
+
+// haleyjd 09/05/10: [STRIFE] Removed:
+// A_Hoof, A_Metal, A_BabyMetal, A_OpenShotgun2, A_LoadShotgun2, 
+// A_CloseShotgun2, A_BrainAwake, A_BrainPain, A_BrainScream, A_BrainExplode,
+// A_BrainDie, A_BrainSpit, A_SpawnSound, A_SpawnFly
+
+//
+// A_ProgrammerDie
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Action routine for the Programmer's grisly death. Spawns the 
+// separate mechanical base object and sends it flying off in some random 
+// direction.
+//
+void A_ProgrammerDie(mobj_t* actor)
+{
+    int r;
+    angle_t an;
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 24*FRACUNIT, MT_PROGRAMMERBASE);
+
+    // haleyjd 20110223: fix add w/ANG180
+    r = P_Random();
+    an = ((r - P_Random()) << 22) + actor->angle + ANG180;
+    mo->angle = an;
+
+    P_ThrustMobj(mo, an, mo->info->speed);  // inlined in asm
+
+    mo->momz = P_Random() << 9;
+}
+
+//
+// A_InqTossArm
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Inquisitor death action. Spawns an arm and tosses it.
+//
+void A_InqTossArm(mobj_t* actor)
+{
+    int r;
+    angle_t an;
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (24*FRACUNIT), MT_INQARM);
+
+    r = P_Random();
+    an = ((r - P_Random()) << 22) + actor->angle - ANG90;
+    mo->angle = an;
+
+    P_ThrustMobj(mo, an, mo->info->speed);  // inlined in asm
+
+    mo->momz = P_Random() << 10;
+}
+
+//
+// A_SpawnSpectreA
+//
+// villsa [STRIFE] new codepointer (unused)
+// 09/08/10: Spawns Spectre A. Or would, if anything actually used this.
+// This is evidence that the Programmer's spectre, which appears in the 
+// Catacombs in the final version, was originally meant to be spawned
+// after his death.
+//
+void A_SpawnSpectreA(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_A);
+    mo->momz = P_Random() << 9;
+}
+
+//
+// A_SpawnSpectreB
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Action function to spawn the Bishop's spectre.
+//
+void A_SpawnSpectreB(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_B);
+    mo->momz = P_Random() << 9;
+}
+
+//
+// A_SpawnSpectreC
+//
+// villsa [STRIFE] new codepointer (unused)
+// 09/08/10: Action function to spawn the Oracle's spectre. Also
+// unused, because the Oracle's spectre is already present on the
+// map and is awakened on his death. Also left over from the 
+// unreleased beta (and demo) versions.
+//
+void A_SpawnSpectreC(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_C);
+    mo->momz = P_Random() << 9;
+}
+
+//
+// A_SpawnSpectreD
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Action function to spawn Macil's Spectre.
+//
+void A_SpawnSpectreD(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_D);
+    mo->momz = P_Random() << 9;
+}
+
+//
+// A_SpawnSpectreE
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Action function to spawn the Loremaster's Spectre.
+//
+void A_SpawnSpectreE(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_E);
+    mo->momz = P_Random() << 9;
+}
+
+// [STRIFE] New statics - Remember the Entity's spawning position.
+static fixed_t entity_pos_x = 0;
+static fixed_t entity_pos_y = 0;
+static fixed_t entity_pos_z = 0;
+
+//
+// A_SpawnEntity
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: You will fall on your knees before the True God, the One Light.
+//
+void A_SpawnEntity(mobj_t* actor)
+{
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 70*FRACUNIT, MT_ENTITY);
+    mo->momz = 5*FRACUNIT;
+
+    entity_pos_x = mo->x;
+    entity_pos_y = mo->y;
+    entity_pos_z = mo->z;
+}
+
+//
+// P_ThrustMobj
+//
+// villsa [STRIFE] new function
+// Thrusts an thing in a specified force/direction
+// Beware! This is inlined everywhere in the asm
+//
+void P_ThrustMobj(mobj_t *actor, angle_t angle, fixed_t force)
+{
+    angle_t an = angle >> ANGLETOFINESHIFT;
+    actor->momx += FixedMul(finecosine[an], force);
+    actor->momy += FixedMul(finesine[an],   force);
+}
+
+//
+// A_EntityDeath
+//
+// [STRIFE]
+// haleyjd 09/08/10: The death of the Entity's spectre brings forth
+// three subentities, which are significantly less dangerous on their
+// own but threatening together.
+//
+void A_EntityDeath(mobj_t* actor)
+{
+    mobj_t *subentity;
+    angle_t an;
+    fixed_t dist;
+
+    dist = 2 * mobjinfo[MT_SUBENTITY].radius;
+
+    // Subentity One
+    an = actor->angle >> ANGLETOFINESHIFT;
+    subentity = P_SpawnMobj(FixedMul(finecosine[an], dist) + entity_pos_x,
+                            FixedMul(finesine[an],   dist) + entity_pos_y,
+                            entity_pos_z, MT_SUBENTITY);
+    subentity->target = actor->target;
+    A_FaceTarget(subentity);
+    P_ThrustMobj(subentity, subentity->angle, 625 << 13);
+
+    // Subentity Two
+    an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
+    subentity = P_SpawnMobj(FixedMul(finecosine[an], dist) + entity_pos_x, 
+                            FixedMul(finesine[an],   dist) + entity_pos_y,
+                            entity_pos_z, MT_SUBENTITY);
+    subentity->target = actor->target;
+    P_ThrustMobj(subentity, actor->angle + ANG90, 4);
+    A_FaceTarget(subentity);
+
+    // Subentity Three
+    an = (actor->angle - ANG90) >> ANGLETOFINESHIFT;
+    subentity = P_SpawnMobj(FixedMul(finecosine[an], dist) + entity_pos_x, 
+                            FixedMul(finesine[an],   dist) + entity_pos_y,
+                            entity_pos_z, MT_SUBENTITY);
+    subentity->target = actor->target;
+    P_ThrustMobj(subentity, actor->angle - ANG90, 4);
+    A_FaceTarget(subentity);
+}
+
+//
+// A_SpawnZombie
+//
+// villsa [STRIFE] new codepointer
+//
+void A_SpawnZombie(mobj_t* actor)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z, MT_ZOMBIE);
+}
+
+//
+// A_ZombieInSpecialSector
+//
+// villsa [STRIFE] new codepointer
+//
+void A_ZombieInSpecialSector(mobj_t* actor)
+{
+    sector_t* sector;
+    fixed_t force;
+    angle_t angle;
+    int tagval;
+
+    sector = actor->subsector->sector;
+    if(actor->z != sector->floorheight)
+        return;
+
+    if(sector->special <= 15)
+        P_DamageMobj(actor, NULL, NULL, 999);
+    else if(sector->special == 18)
+    {
+        tagval = sector->tag - 100;
+        force = (tagval % 10) << 12;
+        angle = (tagval / 10) << 29;
+        P_ThrustMobj(actor, angle, force);  // inlined in asm
+    }
+}
+
+//
+// A_CrystalExplode
+//
+// villsa [STRIFE] new codepointer
+// Throws out debris from the Power Crystal and sets its sector floorheight
+// to the lowest surrounding floor (this is maybe the only time a direct
+// level-changing action is done by an object in this fashion in any of
+// the DOOM engine games... they usually call a line special instead)
+//
+void A_CrystalExplode(mobj_t* actor)
+{
+    sector_t* sector;
+    mobj_t* rubble;
+    int i;
+    int r;
+
+    sector = actor->subsector->sector;
+    sector->lightlevel = 0;
+    sector->floorheight = P_FindLowestFloorSurrounding(sector);
+
+    // spawn rubble
+    for(i = 0; i < 8; i++)
+    {
+        rubble = P_SpawnMobj(actor->x, actor->y, actor->z, MT_RUBBLE1 + i);
+        r = P_Random();
+        rubble->momx = ((r & 0x0f) - (P_Random() & 7)) << FRACBITS;
+        r = P_Random();
+        rubble->momy = ((r & 7) - (P_Random() & 7)) << FRACBITS;
+        rubble->momz = ((P_Random() & 3) << FRACBITS) + (7*FRACUNIT);
+    }
+}
+
+// [STRIFE] New static global - buffer used for various player messages.
+static char pmsgbuffer[80];
+
+// 
+// P_FreePrisoners
+//
+// haleyjd 09/08/10: [STRIFE] New function
+// * Called when the prisoners get freed, obviously. Gives a
+//   message and awards quest token 13.
+//
+void P_FreePrisoners(void)
+{
+    int i;
+
+    DEH_snprintf(pmsgbuffer, sizeof(pmsgbuffer), "You've freed the prisoners!");
+
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_QUEST13);
+        players[i].message = pmsgbuffer;
+    }
+}
+
+//
+// P_DestroyConverter
+//
+// haleyjd 09/08/10: [STRIFE] New function
+// * Called when the converter is shut down in the factory.
+//   Gives several items and a message.
+//
+void P_DestroyConverter(void)
+{
+    int i;
+
+    DEH_snprintf(pmsgbuffer, sizeof(pmsgbuffer), "You've destroyed the Converter!");
+
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_QUEST25);
+        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_STAMINA);
+        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
+        players[i].message = pmsgbuffer;
+    }
+}
+
+//
+// A_QuestMsg
+//
+// villsa [STRIFE] new codepointer
+// Displays text based on quest item's name
+// Quest item is based on actor's speed
+//
+void A_QuestMsg(mobj_t* actor)
+{
+    const char *name;
+    int quest;
+    int i;
+
+    // get name
+    name = DEH_String(mobjinfo[(MT_TOKEN_QUEST1 - 1) + actor->info->speed].name);
+    M_StringCopy(pmsgbuffer, name, sizeof(pmsgbuffer));   // inlined in asm
+
+    // give quest and display message to players
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        quest = 1 << (actor->info->speed - 1);
+        players[i].message = pmsgbuffer;
+        players[i].questflags |= quest;
+    }
+}
+
+//
+// A_ExtraLightOff
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Called by the Power Crystal to turn off the extended
+// flash of light caused by its explosion.
+//
+void A_ExtraLightOff(mobj_t* actor)
+{
+    if(!actor->target)
+        return;
+
+    if(!actor->target->player)
+        return;
+
+    actor->target->player->extralight = 0;
+}
+
+//
+// A_CrystalRadiusAtk
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Called by the power crystal when it dies.
+//
+void A_CrystalRadiusAtk(mobj_t* actor)
+{
+    P_RadiusAttack(actor, actor->target, 512);
+
+    if(!(actor->target && actor->target->player))
+        return;
+
+    // set extralight to 5 for near full-bright
+    actor->target->player->extralight = 5;
+}
+
+//
+// A_DeathExplode5
+//
+// villsa [STRIFE] new codepointer
+//
+void A_DeathExplode5(mobj_t* actor)
+{
+    P_RadiusAttack(actor, actor->target, 192);
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+//
+// A_DeathExplode1
+//
+// villsa [STRIFE] new codepointer
+//
+void A_DeathExplode1(mobj_t* actor)
+{
+    P_RadiusAttack(actor, actor->target, 128);
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+//
+// A_DeathExplode2
+//
+// villsa [STRIFE] new codepointer
+//
+void A_DeathExplode2(mobj_t* actor)
+{
+    P_RadiusAttack(actor, actor->target, 64);
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+//
+// A_DeathExplode3
+//
+// villsa [STRIFE] new codepointer
+//
+void A_DeathExplode3(mobj_t* actor)
+{
+    P_RadiusAttack(actor, actor->target, 32);
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+//
+// A_RaiseAlarm
+//
+// villsa [STRIFE] new codepointer
+// 09/08/10: Set off the infamous alarm. This is just a noise alert.
+//
+void A_RaiseAlarm(mobj_t* actor)
+{
+    if(actor->target && actor->target->player)
+        P_NoiseAlert(actor->target, actor); // inlined in asm
+}
+
+//
+// A_MissileTick
+// villsa [STRIFE] - new codepointer
+//
+void A_MissileTick(mobj_t* actor)
+{
+    if(--actor->reactiontime <= 0)
+    {
+        P_ExplodeMissile(actor);
+        actor->flags &= ~MF_MISSILE;
+    }
+}
+
+//
+// A_SpawnGrenadeFire
+// villsa [STRIFE] - new codepointer
+//
+void A_SpawnGrenadeFire(mobj_t* actor)
+{
+    P_SpawnMobj(actor->x, actor->y, actor->z, MT_PFLAME);
+}
+
+//
+// A_NodeChunk
+//
+// villsa [STRIFE] - new codepointer
+// Throw out "nodes" from a spectral entity
+//
+void A_NodeChunk(mobj_t* actor)
+{
+    int r;
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 10*FRACUNIT, MT_NODE);
+    r = P_Random();
+    mo->momx = ((r & 0x0f) - (P_Random() & 7)) << FRACBITS;
+    r = P_Random();
+    mo->momy = ((r & 7) - (P_Random() & 0x0f)) << FRACBITS;
+    mo->momz = (P_Random() & 0x0f) << FRACBITS;
+}
+
+//
+// A_HeadChunk
+//
+// villsa [STRIFE] - new codepointer
+// Throw out the little "eye"-like object from a spectral entity when it dies.
+//
+void A_HeadChunk(mobj_t* actor)
+{
+    int r;
+    mobj_t* mo;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 10*FRACUNIT, MT_SPECTREHEAD);
+    r = P_Random();
+    mo->momx = ((r & 7) - (P_Random() & 0x0f)) << FRACBITS;
+    r = P_Random();
+    mo->momy = ((r & 0x0f) - (P_Random() & 7)) << FRACBITS;
+    mo->momz = (P_Random() & 7) << FRACBITS;
+}
+
+//
+// A_BurnSpread
+// villsa [STRIFE] - new codepointer
+//
+void A_BurnSpread(mobj_t* actor)
+{
+    int t;
+    mobj_t* mo;
+    fixed_t x;
+    fixed_t y;
+
+    actor->momz -= (8*FRACUNIT);
+
+    t = P_Random();
+    actor->momx += ((t & 3) - (P_Random() & 3)) << FRACBITS;
+    t = P_Random();
+    actor->momy += ((t & 3) - (P_Random() & 3)) << FRACBITS;
+
+    S_StartSound(actor, sfx_lgfire);
+
+    if(actor->flags & MF_DROPPED)
+        return; // not the parent
+
+    // haleyjd 20110223: match order of calls in binary
+    y = actor->y + (((P_Random() + 12) & 31) << FRACBITS);
+    x = actor->x + (((P_Random() + 12) & 31) << FRACBITS);
+
+    // spawn child
+    mo = P_SpawnMobj(x, y, actor->z + (4*FRACUNIT), MT_PFLAME);
+
+    t = P_Random();
+    mo->momx += ((t & 7) - (P_Random() & 7)) << FRACBITS;
+    t = P_Random();
+    mo->momy += ((t & 7) - (P_Random() & 7)) << FRACBITS;
+    mo->momz -= FRACUNIT;
+    mo->flags |= MF_DROPPED;
+    mo->reactiontime = (P_Random() & 3) + 2;
+}
+
+//
+// A_BossDeath
+//
+// Possibly trigger special effects
+// if on first boss level
+//
+// haleyjd 09/17/10: [STRIFE]
+// * Modified to handle all Strife bosses.
+//
+void A_BossDeath (mobj_t* actor)
+{
+    int i;
+    thinker_t *th;
+    line_t junk;
+
+    // only the following types can be a boss:
+    switch(actor->type)
+    {
+    case MT_CRUSADER:
+    case MT_SPECTRE_A:
+    case MT_SPECTRE_B:
+    case MT_SPECTRE_C:
+    case MT_SPECTRE_D:
+    case MT_SPECTRE_E:
+    case MT_SUBENTITY:
+    case MT_PROGRAMMER:
+        break;
+    default:
+        return;
+    }
+
+    // check for a living player
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        if(playeringame[i] && players[i].health > 0)
+            break;
+    }
+    if(i == MAXPLAYERS)
+        return; // everybody's dead.
+
+    // check for a still living boss
+    for(th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if(th->function.acp1 == (actionf_p1) P_MobjThinker)
+        {
+            mobj_t *mo = (mobj_t *)th;
+
+            if(mo != actor && mo->type == actor->type && mo->health > 0)
+                return; // one is still alive.
+        }
+    }
+
+    // Victory!
+    switch(actor->type)
+    {
+    case MT_CRUSADER:
+        junk.tag = 667;
+        EV_DoFloor(&junk, lowerFloorToLowest);
+        break;
+
+    case MT_SPECTRE_A:
+        GiveVoiceObjective("VOC95", "LOG95", 0);
+        junk.tag = 999;
+        EV_DoFloor(&junk, lowerFloorToLowest);
+        break;
+
+    case MT_SPECTRE_B:
+        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_BISHOP);
+        GiveVoiceObjective("VOC74", "LOG74", 0);
+        break;
+
+    case MT_SPECTRE_C:
+        // Look for an MT_ORACLE - this is for in case the player awakened the 
+        // Oracle's spectre without killing the Oracle, which is possible by 
+        // looking up to max and firing the Sigil at it. If this were not done,
+        // a serious sequence break possibility would arise where one could 
+        // kill both the Oracle AND Macil, possibly throwing the game out of
+        // sorts entirely. Too bad they thought of it ;)  However this also
+        // causes a bug sometimes! The Oracle, in its death state, sets the
+        // Spectre C back to its seestate. If the Spectre C is already dead,
+        // it becomes an undead ghost monster. Then it's a REAL spectre ;)
+        for(th = thinkercap.next; th != &thinkercap; th = th->next)
+        {
+            if(th->function.acp1 == (actionf_p1) P_MobjThinker)
+            {
+                mobj_t *mo = (mobj_t *)th;
+
+                // KILL ALL ORACLES! RAWWR!
+                if(mo != actor && mo->type == MT_ORACLE && mo->health > 0)
+                    P_KillMobj(actor, mo);
+            }
+        }
+        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_ORACLE);
+        
+        // Bishop is dead? - verify.
+        if(players[0].questflags & QF_QUEST21) 
+            P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_QUEST22);
+
+        // Macil is dead?
+        if(players[0].questflags & QF_QUEST24)
+        {
+            // Loremaster is dead?
+            if(players[0].questflags & QF_QUEST26)
+            {
+                // We wield the complete sigil, blahblah
+                GiveVoiceObjective("VOC85", "LOG85", 0);
+            }
+        }
+        else
+        {
+            // So much for prognostication!
+            GiveVoiceObjective("VOC87", "LOG87", 0);
+        }
+        junk.tag = 222;         // Open the exit door again;
+        EV_DoDoor(&junk, vld_open); // Note this is NOT the Loremaster door...
+        break;
+
+    case MT_SPECTRE_D:
+        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_MACIL);
+        if(players[0].questflags & QF_QUEST25) // Destroyed converter?
+            GiveVoiceObjective("VOC106", "LOG106", 0);
+        else
+            GiveVoiceObjective("VOC79", "LOG79", 0);
+        break;
+
+    case MT_SPECTRE_E:
+        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_LOREMASTER);
+        if(!netgame)
+        {
+            P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_STAMINA);
+            P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
+        }
+        if(players[0].sigiltype == 4)
+            GiveVoiceObjective("VOC85", "LOG85", 0);
+        else
+            GiveVoiceObjective("VOC83", "LOG83", 0);
+        junk.tag = 666;
+        EV_DoFloor(&junk, lowerFloorToLowest);
+        break;
+
+    case MT_SUBENTITY:
+        F_StartFinale();
+        break;
+
+    case MT_PROGRAMMER:
+        F_StartFinale();
+        G_ExitLevel(0);
+        break;
+
+    default:
+        // Real classy, Rogue.
+        if(actor->type)
+            I_Error("Error: Unconnected BossDeath id %d", actor->type);
+        break;
+    }
+}
+
+//
+// A_AcolyteSpecial
+//
+// villsa [STRIFE] - new codepointer
+// Awards quest #7 when all the Blue Acolytes are killed in Tarnhill
+//
+void A_AcolyteSpecial(mobj_t* actor)
+{
+    int i;
+    thinker_t* th;
+
+    if(actor->type != MT_GUARD8)
+        return; // must be MT_GUARD8
+
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        if(playeringame[i] && players[i].health > 0)
+            break;
+    }
+
+    if(i == 8)
+        return;
+
+    for(th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+        if(th->function.acp1 == (actionf_p1) P_MobjThinker)
+        {
+            mobj_t *mo = (mobj_t *)th;
+
+            // Found a living MT_GUARD8?
+            if(mo != actor && mo->type == actor->type && mo->health > 0)
+                return;
+        }
+    }
+
+    // All MT_GUARD8 are dead, give quest token #7 to all players
+    for(i = 0; i < MAXPLAYERS; i++)
+        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_QUEST7);
+
+    // play voice, give objective
+    GiveVoiceObjective("VOC14", "LOG14", 0);
+}
+
+//
+// A_InqChase
+// villsa [STRIFE] - new codepointer
+//
+void A_InqChase(mobj_t* actor)
+{
+    S_StartSound(actor, sfx_inqact);
+    A_Chase(actor);
+}
+
+//
+// A_StalkerChase
+// villsa [STRIFE] - new codepointer
+//
+void A_StalkerChase(mobj_t* actor)
+{
+    S_StartSound(actor, sfx_spdwlk);
+    A_Chase(actor);
+}
+
+//
+// A_PlayerScream
+//
+// [STRIFE]
+// * Modified to eliminate gamemode check and to use Strife sound.
+//
+void A_PlayerScream (mobj_t* mo)
+{
+    // Default death sound.
+    int sound = sfx_pldeth;
+
+    // villsa [STRIFE] don't check for gamemode
+    if(mo->health < -50)
+    {
+        // IF THE PLAYER DIES
+        // LESS THAN -50% WITHOUT GIBBING
+        sound = sfx_plxdth;  // villsa [STRIFE] different sound
+    }
+
+    S_StartSound (mo, sound);
+}
+
+//
+// A_TeleportBeacon
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_TeleportBeacon(mobj_t* actor)
+{
+    mobj_t* mobj;
+    mobj_t* fog;
+    fixed_t fog_x;
+    fixed_t fog_y;
+
+    if(actor->target != players[actor->miscdata].mo)
+        actor->target = players[actor->miscdata].mo;
+
+    mobj = P_SpawnMobj(actor->x, actor->y, ONFLOORZ, MT_REBEL1);
+
+    // haleyjd 20141024: missing code from disassembly; transfer allegiance
+    // originally from master player to the rebel.
+    mobj->miscdata = actor->miscdata;
+
+    if(!P_TryMove(mobj, mobj->x, mobj->y))
+    {
+        // Rebel is probably stuck in something.. too bad
+        P_RemoveMobj(mobj);
+        return;
+    }
+
+    // beacon no longer special
+    actor->flags &= ~MF_SPECIAL;
+
+    // 20160306: set rebel threshold
+    mobj->threshold = 100;
+
+    // set rebel color and flags
+    mobj->flags |= ((actor->miscdata << MF_TRANSSHIFT) | MF_NODIALOG);
+    mobj->target = NULL;
+
+    // double Rebel's health in deathmatch mode
+    if(deathmatch)
+        mobj->health <<= 1;
+
+    if(actor->target)
+    {
+        mobj_t* targ = actor->target->target;
+
+        if(targ)
+        {
+            if(targ->type != MT_REBEL1 || targ->miscdata != mobj->miscdata)
+                mobj->target = targ;
+        }
+    }
+
+    P_SetMobjState(mobj, mobj->info->seestate);
+    mobj->angle = actor->angle;
+
+    fog_x = mobj->x + FixedMul(20*FRACUNIT, finecosine[actor->angle>>ANGLETOFINESHIFT]);
+    fog_y = mobj->y + FixedMul(20*FRACUNIT, finesine[actor->angle>>ANGLETOFINESHIFT]);
+
+    fog = P_SpawnMobj(fog_x, fog_y, mobj->z, MT_TFOG);
+    S_StartSound(fog, sfx_telept);
+
+    if(--actor->health < 0)
+        P_RemoveMobj(actor);
+}
+
+//
+// A_BodyParts
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Spawns gibs when organic actors get splattered, or junk
+// when robots explode.
+//
+void A_BodyParts(mobj_t* actor)
+{
+    mobjtype_t type;
+    mobj_t* mo;
+    angle_t an;
+
+    if(actor->flags & MF_NOBLOOD) // Robots are flagged NOBLOOD
+        type = MT_JUNK;
+    else
+        type = MT_MEAT;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (24*FRACUNIT), type);
+    P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 19));
+
+    an = (P_Random() << 13) / 255;
+    mo->angle = an << ANGLETOFINESHIFT;
+
+    mo->momx = FixedMul(finecosine[an], (P_Random() & 0x0f) << FRACBITS);
+    mo->momy = FixedMul(finesine[an], (P_Random() & 0x0f) << FRACBITS);
+    mo->momz = (P_Random() & 0x0f) << FRACBITS;
+}
+
+//
+// A_ClaxonBlare
+//
+// [STRIFE] New function
+// haleyjd 09/08/10: The ever-dreadful Strife alarm!
+//
+void A_ClaxonBlare(mobj_t* actor)
+{
+    // Timer ran down?
+    if(--actor->reactiontime < 0)
+    {
+        // reset to initial state
+        actor->target = NULL;
+        actor->reactiontime = actor->info->reactiontime;
+
+        // listen for more noise
+        A_Listen(actor);
+        
+        // If we heard something, stay on for a while,
+        // otherwise return to spawnstate.
+        if(actor->target)
+            actor->reactiontime = 50;
+        else
+            P_SetMobjState(actor, actor->info->spawnstate);
+    }
+
+    // When almost ran down, clear the soundtarget so it doesn't
+    // retrigger the alarm.
+    // Also, play the harsh, grating claxon.
+    if(actor->reactiontime == 2)
+        actor->subsector->sector->soundtarget = NULL;
+    else if(actor->reactiontime > 50)
+        S_StartSound(actor, sfx_alarm);
+}
+
+//
+// A_ActiveSound
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Plays an object's active sound periodically.
+//
+void A_ActiveSound(mobj_t* actor)
+{
+    if(actor->info->activesound)
+    {
+        if(!(leveltime & 7)) // haleyjd: added parens
+            S_StartSound(actor, actor->info->activesound);
+    }
+}
+
+//
+// A_ClearSoundTarget
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Clears the actor's sector soundtarget, so that the actor
+// will not be continually alerted/awakened ad infinitum. Used by
+// shopkeepers.
+//
+void A_ClearSoundTarget(mobj_t* actor)
+{
+    actor->subsector->sector->soundtarget = NULL;
+}
+
+//
+// A_DropBurnFlesh
+//
+// villsa [STRIFE] new codepointer
+//
+void A_DropBurnFlesh(mobj_t* actor)
+{
+    mobj_t* mo;
+    mobjtype_t type;
+
+    type = actor->type;
+
+    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (24*FRACUNIT), MT_BURNDROP);
+    mo->momz = -FRACUNIT;
+
+    actor->type = MT_SFIREBALL;
+    P_RadiusAttack(actor, actor, 64);
+    actor->type = type;
+}
+
+//
+// A_FlameDeath
+//
+// villsa [STRIFE] new codepointer
+// 09/06/10: Death animation for flamethrower fireballs.
+//
+void A_FlameDeath(mobj_t* actor)
+{
+    actor->flags |= MF_NOGRAVITY;
+    actor->momz = (P_Random() & 3) << FRACBITS;
+}
+
+//
+// A_ClearForceField
+//
+// villsa [STRIFE] new codepointer
+// check for all matching lines in the sector
+// and disable blocking/midtextures
+//
+void A_ClearForceField(mobj_t* actor)
+{
+    int i;
+    sector_t *sec;
+    line_t *secline;
+
+    actor->flags &= ~(MF_SOLID|MF_SPECIAL);
+    sec = actor->subsector->sector;
+
+    if(!sec->linecount)
+        return;
+
+    for(i = 0; i < sec->linecount; i++)
+    {
+        secline = sec->lines[i];
+        // BUG: will crash if 1S line has TWOSIDED flag!
+        if(!(secline->flags & ML_TWOSIDED))
+            continue;
+        if(secline->special != 148)
+            continue;
+
+        secline->flags &= ~ML_BLOCKING;
+        secline->special = 0;
+        sides[secline->sidenum[0]].midtexture = 0;
+        sides[secline->sidenum[1]].midtexture = 0;
+    }
+}
+
diff --git a/games/NXDoom/src/strife/p_floor.c b/games/NXDoom/src/strife/p_floor.c
new file mode 100644
index 000000000..8efb52cca
--- /dev/null
+++ b/games/NXDoom/src/strife/p_floor.c
@@ -0,0 +1,597 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Floor animation: raising stairs.
+//
+
+
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+// Data.
+#include "sounds.h"
+
+//entryway
+#define STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE 10
+
+//
+// FLOORS
+//
+
+//
+// Move a plane (floor or ceiling) and check for crushing
+//
+// [STRIFE] Various changes were made to remove calls to P_ChangeSector when
+// P_ChangeSector returns true.
+//
+result_e
+T_MovePlane
+( sector_t*     sector,
+ fixed_t        speed,
+ fixed_t        dest,
+ boolean        crush,
+ int            floorOrCeiling,
+ int            direction )
+{
+    boolean     flag;
+    fixed_t     lastpos;
+
+    switch(floorOrCeiling)
+    {
+    case 0:
+        // FLOOR
+        switch(direction)
+        {
+        case -1:
+            // DOWN
+            if (sector->floorheight - speed < dest)
+            {
+                // villsa [STRIFE] unused
+                //lastpos = sector->floorheight;
+                sector->floorheight = dest;
+                flag = P_ChangeSector(sector,crush);
+
+                // villsa [STRIFE] unused
+                /*if (flag == true)
+                {
+                    sector->floorheight =lastpos;
+                    P_ChangeSector(sector,crush);
+                    //return crushed;
+                }*/
+                return pastdest;
+            }
+            else
+            {
+                // villsa [STRIFE] unused
+                //lastpos = sector->floorheight;
+                sector->floorheight -= speed;
+                flag = P_ChangeSector(sector,crush);
+
+                // villsa [STRIFE] unused
+                /*if (flag == true)
+                {
+                    sector->floorheight = lastpos;
+                    P_ChangeSector(sector,crush);
+                    return crushed;
+                }*/
+                return ok;
+             }
+             break;
+
+        case 1:
+            // UP
+            if (sector->floorheight + speed > dest)
+            {
+                lastpos = sector->floorheight;
+                sector->floorheight = dest;
+                flag = P_ChangeSector(sector,crush);
+                if (flag == true)
+                {
+                    sector->floorheight = lastpos;
+                    P_ChangeSector(sector,crush);
+                    //return crushed;
+                }
+                return pastdest;
+            }
+            else
+            {
+                // COULD GET CRUSHED
+                lastpos = sector->floorheight;
+                sector->floorheight += speed;
+                flag = P_ChangeSector(sector,crush);
+                if (flag == true)
+                {
+                    // haleyjd 20130210: Bug fix - Strife DOES do this.
+                    if (crush == true)
+                        return crushed;
+                    sector->floorheight = lastpos;
+                    P_ChangeSector(sector,crush);
+                    return crushed;
+                }
+                else
+                    return ok;
+            }
+            break;
+        }
+        break;
+
+    case 1:
+        // CEILING
+        switch(direction)
+        {
+        case -1:
+            // DOWN
+            if (sector->ceilingheight - speed < dest)
+            {
+                lastpos = sector->ceilingheight;
+                sector->ceilingheight = dest;
+                flag = P_ChangeSector(sector,crush);
+
+                if (flag == true)
+                {
+                    sector->ceilingheight = lastpos;
+                    P_ChangeSector(sector,crush);
+                    //return crushed;
+                }
+                return pastdest;
+            }
+            else
+            {
+                // COULD GET CRUSHED
+                lastpos = sector->ceilingheight;
+                sector->ceilingheight -= speed;
+                flag = P_ChangeSector(sector,crush);
+
+                if (flag == true)
+                {
+                    if (crush == true)
+                        return crushed;
+                    sector->ceilingheight = lastpos;
+                    P_ChangeSector(sector,crush);
+                    return crushed;
+                }
+            }
+            break;
+
+        case 1:
+            // UP
+            if (sector->ceilingheight + speed > dest)
+            {
+                // villsa [STRIFE] unused
+                //lastpos = sector->ceilingheight;
+                sector->ceilingheight = dest;
+
+                // villsa [STRIFE] unused
+                //flag = P_ChangeSector(sector,crush);
+                /*if (flag == true)
+                {
+                    sector->ceilingheight = lastpos;
+                    P_ChangeSector(sector,crush);
+                    //return crushed;
+                }*/
+                return pastdest;
+            }
+            else
+            {
+                // villsa [STRIFE] unused
+                //lastpos = sector->ceilingheight;
+                sector->ceilingheight += speed;
+
+                // villsa [STRIFE] unused
+                //flag = P_ChangeSector(sector,crush);
+                return ok;
+            }
+            break;
+        }
+        break;
+
+    }
+    return ok;
+}
+
+
+//
+// MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
+//
+void T_MoveFloor(floormove_t* floor)
+{
+    result_e	res;
+	
+    res = T_MovePlane(floor->sector,
+		      floor->speed,
+		      floor->floordestheight,
+		      floor->crush,0,floor->direction);
+    
+    if (!(leveltime&7))
+	S_StartSound(&floor->sector->soundorg, sfx_stnmov);
+    
+    if (res == pastdest)
+    {
+	floor->sector->specialdata = NULL;
+
+	if (floor->direction == 1)
+	{
+	    switch(floor->type)
+	    {
+	      case donutRaise:
+		floor->sector->special = floor->newspecial;
+		floor->sector->floorpic = floor->texture;
+	      default:
+		break;
+	    }
+	}
+	else if (floor->direction == -1)
+	{
+	    switch(floor->type)
+	    {
+	      case lowerAndChange:
+		floor->sector->special = floor->newspecial;
+		floor->sector->floorpic = floor->texture;
+	      default:
+		break;
+	    }
+	}
+	P_RemoveThinker(&floor->thinker);
+
+	S_StartSound(&floor->sector->soundorg, sfx_pstop);
+    }
+
+}
+
+//
+// HANDLE FLOOR TYPES
+//
+// haleyjd 09/16/2010: [STRIFE] Modifications to floortypes:
+// * raiseFloor24 was changed into raiseFloor64
+// * turboLower does not appear to adjust the floor height (STRIFE-TODO: verify)
+// * raiseFloor512AndChange type was added.
+//
+int
+EV_DoFloor
+( line_t*       line,
+  floor_e       floortype )
+{
+    int                 secnum;
+    int                 rtn;
+    int                 i;
+    sector_t*           sec;
+    floormove_t*        floor;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        // ALREADY MOVING?  IF SO, KEEP GOING...
+        if (sec->specialdata)
+            continue;
+
+        // new floor thinker
+        rtn = 1;
+        floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+        P_AddThinker (&floor->thinker);
+        sec->specialdata = floor;
+        floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+        floor->type = floortype;
+        floor->crush = false;
+
+        switch(floortype)
+        {
+        case lowerFloor: // [STRIFE] verified unmodified
+            floor->direction = -1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = 
+                P_FindHighestFloorSurrounding(sec);
+            break;
+
+        case lowerFloorToLowest: // [STRIFE] verified unmodified
+            floor->direction = -1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = 
+                P_FindLowestFloorSurrounding(sec);
+            break;
+
+        case turboLower: // [STRIFE] Modified: does not += 8
+            floor->direction = -1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED * 4;
+            floor->floordestheight = 
+                P_FindHighestFloorSurrounding(sec);
+            //if (floor->floordestheight != sec->floorheight)
+            //    floor->floordestheight += 8*FRACUNIT;
+            break;
+
+        case raiseFloorCrush: // [STRIFE] verified unmodified
+            floor->crush = true;
+        case raiseFloor:
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = 
+                P_FindLowestCeilingSurrounding(sec);
+            if (floor->floordestheight > sec->ceilingheight)
+                floor->floordestheight = sec->ceilingheight;
+            floor->floordestheight -= (8*FRACUNIT)*
+                (floortype == raiseFloorCrush);
+            break;
+
+        case raiseFloorTurbo: // [STRIFE] verified unmodified
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED*4;
+            floor->floordestheight = 
+                P_FindNextHighestFloor(sec,sec->floorheight);
+            break;
+
+        case raiseFloorToNearest: // [STRIFE] verified unmodified
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = 
+                P_FindNextHighestFloor(sec,sec->floorheight);
+            break;
+
+        case raiseFloor64: // [STRIFE] modified from raiseFloor24!
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = floor->sector->floorheight + 
+                64 * FRACUNIT; // [STRIFE]
+            break;
+
+        case raiseFloor512: // [STRIFE] verified unmodified
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = floor->sector->floorheight +
+                512 * FRACUNIT;
+            break;
+
+        case raiseFloor24AndChange: // [STRIFE] verified unmodified
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = floor->sector->floorheight +
+                24 * FRACUNIT;
+            sec->floorpic = line->frontsector->floorpic;
+            sec->special = line->frontsector->special;
+            break;
+
+        case raiseFloor512AndChange: // [STRIFE] New floor type
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = floor->sector->floorheight +
+                512 * FRACUNIT;
+            sec->floorpic = line->frontsector->floorpic;
+            sec->special = line->frontsector->special;
+            break;
+
+        case raiseToTexture: // [STRIFE] verified unmodified
+            {
+                int	minsize = INT_MAX;
+                side_t*	side;
+
+                floor->direction = 1;
+                floor->sector = sec;
+                floor->speed = FLOORSPEED;
+                for (i = 0; i < sec->linecount; i++)
+                {
+                    if (twoSided (secnum, i) )
+                    {
+                        side = getSide(secnum,i,0);
+                        if (side->bottomtexture >= 0)
+                            if (textureheight[side->bottomtexture] < 
+                                minsize)
+                                minsize = 
+                                textureheight[side->bottomtexture];
+                        side = getSide(secnum,i,1);
+                        if (side->bottomtexture >= 0)
+                            if (textureheight[side->bottomtexture] < 
+                                minsize)
+                                minsize = 
+                                textureheight[side->bottomtexture];
+                    }
+                }
+                floor->floordestheight =
+                    floor->sector->floorheight + minsize;
+            }
+            break;
+
+        case lowerAndChange: // [STRIFE] verified unmodified
+            floor->direction = -1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            floor->floordestheight = 
+                P_FindLowestFloorSurrounding(sec);
+            floor->texture = sec->floorpic;
+
+            for (i = 0; i < sec->linecount; i++)
+            {
+                if ( twoSided(secnum, i) )
+                {
+                    if (getSide(secnum,i,0)->sector-sectors == secnum)
+                    {
+                        sec = getSector(secnum,i,1);
+
+                        if (sec->floorheight == floor->floordestheight)
+                        {
+                            floor->texture = sec->floorpic;
+                            floor->newspecial = sec->special;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        sec = getSector(secnum,i,0);
+
+                        if (sec->floorheight == floor->floordestheight)
+                        {
+                            floor->texture = sec->floorpic;
+                            floor->newspecial = sec->special;
+                            break;
+                        }
+                    }
+                }
+            }
+        default:
+            break;
+        }
+    }
+    return rtn;
+}
+
+
+
+
+//
+// BUILD A STAIRCASE!
+//
+int
+EV_BuildStairs
+( line_t*	line,
+  stair_e	type )
+{
+    int                 secnum;
+    int                 height;
+    int                 i;
+    int                 newsecnum;
+    int                 texture;
+    int                 ok;
+    int                 rtn;
+
+    sector_t*           sec;
+    sector_t*           tsec;
+
+    floormove_t*        floor;
+
+    // Either Watcom or Rogue moved the switch out of the loop below, probably
+    // because it was a loop invariant, and put the default values in the 
+    // initializers here. I cannot be bothered to figure it out without doing
+    // this myself :P
+    fixed_t             stairsize = 8*FRACUNIT;
+    fixed_t             speed     = FLOORSPEED;
+    int                 direction = 1;
+
+    switch(type)
+    {
+    case build8: // [STRIFE] Verified unmodified.
+        speed = FLOORSPEED/4;
+        break;
+    case turbo16: // [STRIFE] Verified unmodified.
+        speed = FLOORSPEED*4;
+        stairsize = 16*FRACUNIT;
+        break;
+    case buildDown16: // [STRIFE] New stair type
+        stairsize = -16*FRACUNIT;
+        direction = -1;
+        break;
+    }
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        // ALREADY MOVING?  IF SO, KEEP GOING...
+        if (sec->specialdata)
+            continue;
+
+        // new floor thinker
+        rtn = 1;
+        floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+        P_AddThinker (&floor->thinker);
+        sec->tag = 0; // haleyjd 20140919: [STRIFE] clears tag of first stair sector
+        sec->specialdata = floor;
+        floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+        floor->direction = direction; // haleyjd 20140919: bug fix: direction, not "1"
+        floor->sector = sec;
+        floor->speed = speed;
+        height = sec->floorheight + stairsize;
+        floor->floordestheight = height;
+        // Initialize
+        floor->type = lowerFloor;
+        // entryway
+        // Uninitialized crush field will not be equal to 0 or 1 (true)
+        // with high probability. So, initialize it with any other value
+        floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
+
+        texture = sec->floorpic;
+
+        // Find next sector to raise
+        // 1.	Find 2-sided line with same sector side[0]
+        // 2.	Other side is the next sector to raise
+        do
+        {
+            ok = 0;
+            for (i = 0;i < sec->linecount;i++)
+            {
+                if ( !((sec->lines[i])->flags & ML_TWOSIDED) )
+                    continue;
+
+                tsec = (sec->lines[i])->frontsector;
+                newsecnum = tsec-sectors;
+
+                if (secnum != newsecnum)
+                    continue;
+
+                tsec = (sec->lines[i])->backsector;
+                newsecnum = tsec - sectors;
+
+                if (tsec->floorpic != texture)
+                    continue;
+
+                height += stairsize;
+
+                if (tsec->specialdata)
+                    continue;
+
+                sec = tsec;
+                secnum = newsecnum;
+                floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+
+                P_AddThinker (&floor->thinker);
+
+                sec->specialdata = floor;
+                floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+                floor->direction = direction; // [STRIFE]: for buildDown16
+                floor->sector = sec;
+                floor->speed = speed;
+                floor->floordestheight = height;
+                // Initialize
+                floor->type = lowerFloor;
+                // entryway
+                // Uninitialized crush field will not be equal to 0 or 1 (true)
+                // with high probability. So, initialize it with any other value
+                floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
+                ok = 1;
+                break;
+            }
+        } while(ok);
+    }
+    return rtn;
+}
+
diff --git a/games/NXDoom/src/strife/p_inter.c b/games/NXDoom/src/strife/p_inter.c
new file mode 100644
index 000000000..bf36cb147
--- /dev/null
+++ b/games/NXDoom/src/strife/p_inter.c
@@ -0,0 +1,1411 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Handling interactions (i.e., collisions).
+//
+
+// Data.
+#include "doomdef.h"
+#include "dstrings.h"
+#include "sounds.h"
+#include "deh_main.h"
+#include "deh_misc.h"
+#include "doomstat.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "i_system.h"
+#include "am_map.h"
+#include "p_local.h"
+#include "p_dialog.h"   // villsa [STRIFE]
+#include "s_sound.h"
+#include "p_inter.h"
+
+#include "hu_stuff.h"   // villsa [STRIFE]
+#include "z_zone.h"     // villsa [STRIFE]
+
+// haleyjd [STRIFE]
+#include "w_wad.h"
+#include "p_pspr.h"
+#include "p_dialog.h"
+#include "f_finale.h"
+
+
+#define BONUSADD    6
+
+
+// a weapon is found with two clip loads,
+// a big item has five clip loads
+// villsa [STRIFE] updated arrays
+int maxammo[NUMAMMO]    = { 250, 50, 25, 400, 100, 30, 16 };
+int clipammo[NUMAMMO]   = { 10, 4, 2, 20, 4, 6, 4 };
+
+
+//
+// GET STUFF
+//
+
+//
+// P_GiveAmmo
+// Num is the number of clip loads,
+// not the individual count (0= 1/2 clip).
+// Returns false if the ammo can't be picked up at all
+//
+// [STRIFE] Modified for Strife ammo types
+//
+boolean P_GiveAmmo(player_t* player, ammotype_t ammo, int num)
+{
+    int		oldammo;
+
+    if(ammo == am_noammo)
+        return false;
+
+    if(ammo >= NUMAMMO)
+        I_Error ("P_GiveAmmo: bad type %i", ammo);
+
+    if(player->ammo[ammo] == player->maxammo[ammo])
+        return false;
+
+    if(num)
+        num *= clipammo[ammo];
+    else
+        num = clipammo[ammo]/2;
+
+    if(gameskill == sk_baby
+        || gameskill == sk_nightmare)
+    {
+        // give double ammo in trainer mode,
+        // you'll need in nightmare
+        num <<= 1;
+    }
+
+    oldammo = player->ammo[ammo];
+    player->ammo[ammo] += num;
+
+    if(player->ammo[ammo] > player->maxammo[ammo])
+        player->ammo[ammo] = player->maxammo[ammo];
+
+    // If non zero ammo, 
+    // don't change up weapons,
+    // player was lower on purpose.
+    if(oldammo)
+        return true;
+
+    // We were down to zero,
+    // so select a new weapon.
+    // Preferences are not user selectable.
+
+    // villsa [STRIFE] ammo update
+    // where's the check for grenades? - haleyjd: verified no switch to grenades
+    //   haleyjd 10/03/10: don't change to electric bow when picking up poison
+    //   arrows.
+    if(!player->readyweapon)
+    {
+        switch(ammo)
+        {
+        case am_bullets:
+            if(player->weaponowned[wp_rifle])
+                player->pendingweapon = wp_rifle;
+            break;
+
+        case am_elecbolts:
+            if(player->weaponowned[wp_elecbow])
+                player->pendingweapon = wp_elecbow;
+            break;
+
+        case am_cell:
+            if(player->weaponowned[wp_mauler])
+                player->pendingweapon = wp_mauler;
+            break;
+
+        case am_missiles:
+            if(player->weaponowned[wp_missile])
+                player->pendingweapon = wp_missile;
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return true;
+}
+
+
+//
+// P_GiveWeapon
+// The weapon name may have a MF_DROPPED flag ored in.
+//
+// villsa [STRIFE] some stuff has been changed/moved around
+//
+boolean P_GiveWeapon(player_t* player, weapontype_t weapon, boolean dropped)
+{
+    boolean gaveammo;
+    boolean gaveweapon;
+
+    // villsa [STRIFE] new code for giving alternate version
+    // of the weapon to player
+    if(player->weaponowned[weapon])
+        gaveweapon = false;
+    else
+    {
+        gaveweapon = true;
+        player->weaponowned[weapon] = true;
+
+        // Alternate "sister" weapons that you also get as a bonus:
+        switch(weapon)
+        {
+        case wp_elecbow:
+            player->weaponowned[wp_poisonbow] = true;
+            break;
+
+        case wp_hegrenade:
+            player->weaponowned[wp_wpgrenade] = true;
+            break;
+
+        case wp_mauler:
+            player->weaponowned[wp_torpedo] = true;
+            break;
+
+        default:
+            break;
+        }
+
+        // check for the standard weapons only
+        if(weapon > player->readyweapon && weapon <= wp_sigil)
+            player->pendingweapon = weapon;
+
+    }
+
+    if(netgame && (deathmatch != 2) && !dropped)
+    {
+        // leave placed weapons forever on net games
+        if(!gaveweapon)
+            return false;
+
+        player->bonuscount += BONUSADD;
+        player->weaponowned[weapon] = true;
+
+        if(deathmatch)
+            P_GiveAmmo(player, weaponinfo[weapon].ammo, 5);
+        else
+            P_GiveAmmo(player, weaponinfo[weapon].ammo, 2);
+
+        if(player == &players[consoleplayer])
+            S_StartSound (NULL, sfx_wpnup);
+        return false;
+    }
+
+    if(weaponinfo[weapon].ammo != am_noammo)
+    {
+        // give one clip with a dropped weapon,
+        // two clips with a found weapon
+        if(dropped)
+            gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 1);
+        else
+            gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
+    }
+    else
+        gaveammo = false;
+
+    return(gaveweapon || gaveammo);
+}
+
+
+
+//
+// P_GiveBody
+// Returns false if the body isn't needed at all
+//
+// villsa [STRIFE] a lot of changes have been added for stamina
+//
+boolean P_GiveBody(player_t* player, int num)
+{
+    int maxhealth;
+    int healing;
+
+    maxhealth = MAXHEALTH + player->stamina;
+
+    if(num >= 0) // haleyjd 20100923: fixed to give proper amount of health
+    {
+        mobj_t *mo; // haleyjd 20110225: needed below...
+
+        // any healing to do?
+        if(player->health >= maxhealth)
+            return false;
+
+        // give, and cap to maxhealth
+        player->health += num;
+        if(player->health >= maxhealth)
+            player->health = maxhealth;
+
+        // Set mo->health for consistency.
+        // haleyjd 20110225: Seems Strife can call this on a NULL player->mo
+        // when giving items to players that are not in the game...
+        mo = P_SubstNullMobj(player->mo);
+        mo->health = player->health;
+    }
+    else
+    {
+        // [STRIFE] handle healing from the Front's medic
+        // The amount the player's health will be set to scales up with stamina
+        // increases.
+        // Ex 1: On the wimpiest skill level, -100 is sent in. This restores 
+        //       full health no matter what your stamina.
+        //       (100*100)/100 = 100
+        //       (200*100)/100 = 200
+        // Ex 2: On the most stringent skill levels, -50 is sent in. This will
+        //       restore at most half of your health.
+        //       (100*50)/100 = 50
+        //       (200*50)/100 = 100
+        healing = (-num * maxhealth) / MAXHEALTH;
+
+        // This is also the "threshold" of healing. You need less health than
+        // the amount that will be restored in order to get any benefit.
+        // So on the easiest skill you will always be fully healed.
+        // On the hardest skill you must have less than 50 health, and will
+        // only recover to 50 (assuming base stamina stat)
+        if(player->health >= healing)
+            return false;
+
+        // Set health. BUG: Oddly, mo->health is NOT set here...
+        player->health = healing;
+    }
+
+    return true;
+}
+
+
+
+//
+// P_GiveArmor
+// Returns false if the armor is worse
+// than the current armor.
+//
+// [STRIFE] Modified for Strife armor items
+//
+boolean P_GiveArmor(player_t* player, int armortype)
+{
+    int hits;
+
+    // villsa [STRIFE]
+    if(armortype < 0)
+    {
+        if(player->armorpoints)
+            return false;
+
+        armortype = -armortype;
+    }
+
+    hits = armortype * 100;
+    if(player->armorpoints >= hits)
+        return false;   // don't pick up
+
+    player->armortype = armortype;
+    player->armorpoints = hits;
+
+    return true;
+}
+
+
+
+//
+// P_GiveCard
+//
+// [STRIFE] Modified to use larger bonuscount
+//
+boolean P_GiveCard(player_t* player, card_t card)
+{
+    if (player->cards[card])
+        return false;
+    
+    // villsa [STRIFE] multiply by 2
+    player->bonuscount = BONUSADD * 2;
+    player->cards[card] = true;
+
+    return true;
+}
+
+
+//
+// P_GivePower
+//
+// [STRIFE] Modifications for new powerups
+//
+boolean P_GivePower(player_t* player, powertype_t power)
+{
+    // haleyjd 09/14/10: [STRIFE] moved to top, exception for Shadow Armor
+    if(player->powers[power] && power != pw_invisibility)
+        return false;	// already got it
+
+    // if giving pw_invisibility and player already has MVIS, no can do.
+    if(power == pw_invisibility && (player->mo->flags & MF_MVIS))
+        return false;
+
+    // villsa [STRIFE]
+    switch (power) {
+    case pw_targeter:
+    {
+        player->powers[power] = TARGTICS;
+        P_SetPsprite(player, ps_targcenter, S_TRGT_00); // 10
+        P_SetPsprite(player, ps_targleft,   S_TRGT_01); // 11
+        P_SetPsprite(player, ps_targright,  S_TRGT_02); // 12
+
+        player->psprites[ps_targcenter].sx  = (160*FRACUNIT);
+        player->psprites[ps_targleft  ].sy  = (100*FRACUNIT);
+        player->psprites[ps_targcenter].sy  = (100*FRACUNIT);
+        player->psprites[ps_targright ].sy  = (100*FRACUNIT);
+        return true;
+    }
+
+    case pw_invisibility:
+    {
+        // if player already had this power...
+        if(player->powers[power])
+        {
+            // remove SHADOW, give MVIS.
+            player->mo->flags &= ~MF_SHADOW;
+            player->mo->flags |= MF_MVIS;
+        }
+        else // give SHADOW
+            player->mo->flags |= MF_SHADOW;
+
+        // set tics if giving shadow, or renew them if MVIS.
+        player->powers[power] = INVISTICS;
+
+        return true;
+    }
+
+    case pw_ironfeet:
+    {
+        player->powers[power] = IRONTICS;
+        return true;
+    }
+
+    case pw_strength:
+    {
+        P_GiveBody(player, 100);
+        player->powers[power] = 1;
+        return true;
+    }
+
+    // villsa [STRIFE]
+    case pw_allmap:
+    {
+        // remember in mapstate
+        if(gamemap < 40)
+            player->mapstate[gamemap] = true;
+
+        player->powers[power] = 1;
+        return true;
+    }
+
+    // villsa [STRIFE]
+    case pw_communicator:
+    {
+        player->powers[power] = 1;
+        return true;
+    }
+
+    case NUMPOWERS:
+        // This should never actually happen
+        break;
+    }
+
+    return true;
+}
+
+
+// villsa [STRIFE]
+static char pickupmsg[80];
+
+//
+// P_TouchSpecialThing
+//
+// [STRIFE] Rewritten for Strife collectables.
+//
+void P_TouchSpecialThing(mobj_t* special, mobj_t* toucher)
+{
+    player_t*   player;
+    int         i;
+    fixed_t     delta;
+    int         sound;
+
+    delta = special->z - toucher->z;
+
+    if(delta > toucher->height || delta < -8*FRACUNIT)
+        return; // out of reach
+
+    sound = sfx_itemup;
+    player = toucher->player;
+
+    // Dead thing touching.
+    // Can happen with a sliding player corpse.
+    if(toucher->health <= 0)
+        return;
+
+    // villsa [STRIFE] damage toucher if special is spectral
+    // haleyjd 09/21/10: corrected to test for SPECTRE thingtypes specifically
+    switch(special->type)
+    {
+    case MT_SPECTRE_A:
+    case MT_SPECTRE_B:
+    case MT_SPECTRE_C:
+    case MT_SPECTRE_D:
+    case MT_SPECTRE_E:
+    case MT_ENTITY:
+    case MT_SUBENTITY:
+        P_DamageMobj(toucher, NULL, NULL, 5);
+        return;
+    default:
+        break;
+    }
+
+    // villsa [STRIFE]
+    pickupmsg[0] = 0;
+
+    // Identify by sprite.
+    // villsa [STRIFE] new items
+    switch(special->sprite)
+    {
+    // bullets
+    case SPR_BLIT: // haleyjd: fixed missing MF_DROPPED check
+        if(!P_GiveAmmo(player, am_bullets, !(special->flags & MF_DROPPED)))
+            return;
+        break;
+
+    // box of bullets
+    case SPR_BBOX:
+        if(!P_GiveAmmo(player, am_bullets, 5))
+            return;
+        break;
+
+    // missile
+    case SPR_MSSL:
+        if(!P_GiveAmmo(player, am_missiles, 1))
+            return;
+        break;
+
+    // box of missiles
+    case SPR_ROKT:
+        if(!P_GiveAmmo(player, am_missiles, 5))
+            return;
+        break;
+
+    // battery
+    case SPR_BRY1:
+        if(!P_GiveAmmo(player, am_cell, 1))
+            return;
+        break;
+
+    // cell pack
+    case SPR_CPAC:
+        if(!P_GiveAmmo(player, am_cell, 5))
+            return;
+        break;
+
+    // poison bolts
+    case SPR_PQRL:
+        if(!P_GiveAmmo(player, am_poisonbolts, 5))
+            return;
+        break;
+
+    // electric bolts
+    case SPR_XQRL:
+        if(!P_GiveAmmo(player, am_elecbolts, 5))
+            return;
+        break;
+
+    // he grenades
+    case SPR_GRN1:
+        if(!P_GiveAmmo(player, am_hegrenades, 1))
+            return;
+        break;
+
+    // wp grenades
+    case SPR_GRN2:
+        if(!P_GiveAmmo(player, am_wpgrenades, 1))
+            return;
+        break;
+
+    // rifle
+    case SPR_RIFL:
+        if(!P_GiveWeapon(player, wp_rifle, (special->flags & MF_DROPPED) != 0))
+            return;
+        sound = sfx_wpnup; // haleyjd: SHK-CHK!
+        break;
+
+    // flame thrower
+    case SPR_FLAM:
+        if(!P_GiveWeapon(player, wp_flame, false))
+            return;
+        // haleyjd: gives extra ammo.
+        P_GiveAmmo(player, am_cell, 3);
+        sound = sfx_wpnup; // haleyjd: SHK-CHK!
+        break;
+
+    // missile launcher
+    case SPR_MMSL:
+        if(!P_GiveWeapon(player, wp_missile, false))
+            return;
+        sound = sfx_wpnup; // haleyjd: SHK-CHK!
+        break;
+
+    // grenade launcher
+    case SPR_GRND:
+        if(!P_GiveWeapon(player, wp_hegrenade,
+                         (special->flags & MF_DROPPED) != 0))
+            return;
+        sound = sfx_wpnup; // haleyjd: SHK-CHK!
+        break;
+
+    // mauler
+    case SPR_TRPD:
+        if(!P_GiveWeapon(player, wp_mauler, false))
+            return;
+        sound = sfx_wpnup; // haleyjd: SHK-CHK!
+        break;
+
+    // electric bolt crossbow
+    case SPR_CBOW:
+        if(!P_GiveWeapon(player, wp_elecbow,
+                         (special->flags & MF_DROPPED) != 0))
+            return;
+        sound = sfx_wpnup; // haleyjd: SHK-CHK!
+        break;
+
+    // haleyjd 09/21/10: missed case: THE SIGIL!
+    case SPR_SIGL:
+        if(!P_GiveWeapon(player, wp_sigil, (special->flags & MF_DROPPED) != 0))
+        {
+            player->sigiltype = special->frame;
+            return;
+        }
+        
+        if(netgame)
+            player->sigiltype = 4;
+
+        player->pendingweapon = wp_sigil;
+        player->st_update = true;
+        if(deathmatch)
+            return;
+        sound = sfx_wpnup;
+        break;
+
+    // backpack
+    case SPR_BKPK:
+        if(!player->backpack)
+        {
+            for(i = 0; i < NUMAMMO; i++)
+                player->maxammo[i] *= 2;
+
+            player->backpack = true;
+        }
+        for(i = 0; i < NUMAMMO; i++)
+            P_GiveAmmo(player, i, 1);
+        break;
+
+    // 1 Gold
+    case SPR_COIN:
+        P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    // 10 Gold
+    case SPR_CRED:
+        for(i = 0; i < 10; i++)
+            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    // 25 Gold
+    case SPR_SACK:
+        // haleyjd 09/21/10: missed code: if a SPR_SACK object has negative
+        // health, it will give that much gold - STRIFE-TODO: verify
+        if(special->health < 0)
+        {
+            for(i = special->health; i != 0; i++)
+                P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        }
+        else
+        {
+            for(i = 0; i < 25; i++)
+                P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        }
+        break;
+
+    // 50 Gold
+    case SPR_CHST:
+        for(i = 0; i < 50; i++)
+            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
+        break;
+
+    // Leather Armor
+    case SPR_ARM1:
+        if(!P_GiveArmor(player, -2))
+            if(!P_GiveInventoryItem(player, special->sprite, special->type))
+                pickupmsg[0] = '!';
+        break;
+
+    // Metal Armor
+    case SPR_ARM2:
+        if(!P_GiveArmor(player, -1))
+            if(!P_GiveInventoryItem(player, special->sprite, special->type))
+                pickupmsg[0] = '!';
+        break;
+
+    // All-map powerup
+    case SPR_PMAP:
+        if(!P_GivePower(player, pw_allmap))
+            return;
+        sound = sfx_yeah;
+        break;
+
+    // The Comm Unit - because you need Blackbird whining in your ear the
+    // whole time and telling you how lost she is :P
+    case SPR_COMM:
+        if(!P_GivePower(player, pw_communicator))
+            return;
+        sound = sfx_yeah;
+        break;
+
+    // haleyjd 09/21/10: missed case - Shadow Armor; though, I do not know why
+    // this has a case distinct from generic inventory items... Maybe it started
+    // out as an auto-use-if-possible item much like regular armor...
+    case SPR_SHD1:
+        if(!P_GiveInventoryItem(player, SPR_SHD1, special->type))
+            pickupmsg[0] = '!';
+        break;
+
+    // villsa [STRIFE] check default items
+    case SPR_TOKN:
+    default:
+        if(special->type >= MT_KEY_BASE && special->type <= MT_NEWKEY5)
+        {
+            // haleyjd 09/21/10: Strife player still picks up keys that
+            // he has already found. (break, not return)
+            if(!P_GiveCard(player, special->type - MT_KEY_BASE))
+                break; 
+        }
+        else
+        {
+            if(!P_GiveInventoryItem(player, special->sprite, special->type))
+                pickupmsg[0] = '!';
+        }
+        break;
+    }
+
+    // villsa [STRIFE] set message
+    if(!pickupmsg[0])
+    {
+        if(special->info->name)
+        {
+            DEH_snprintf(pickupmsg, sizeof(pickupmsg), 
+                         "You picked up the %s.", DEH_String(special->info->name));
+        }
+        else
+            DEH_snprintf(pickupmsg, sizeof(pickupmsg), "You picked up the item.");
+    }
+    // use the first character to indicate that the player is full on items
+    else if(pickupmsg[0] == '!')
+    {
+        DEH_snprintf(pickupmsg, sizeof(pickupmsg), "You cannot hold any more.");
+        player->message = pickupmsg;
+        return;
+    }
+
+    if(special->flags & MF_GIVEQUEST)
+    {
+        // [STRIFE]: Award quest flag based on the thing's speed. Quest 8 was
+        // apparently at some point given by the Broken Power Coupling, which is
+        // why they don't want to award it if you have Quest 6 (which is 
+        // acquired by destroying the Front's working power coupling). BUT, the 
+        // broken coupling object's speed is NOT 8... it is 512*FRACUNIT. For
+        // strict portability beyond the x86, we need to AND the operand by 31.
+        if(special->info->speed != 8 || !(player->questflags & QF_QUEST6))
+            player->questflags |= 1 << ((special->info->speed - 1) & 31);
+    }
+
+
+    // haleyjd 08/30/10: [STRIFE] No itemcount
+    //if (special->flags & MF_COUNTITEM)
+    //    player->itemcount++;
+
+    P_RemoveMobj(special);
+    player->message = pickupmsg;
+    player->bonuscount += BONUSADD;
+
+    if(player == &players[consoleplayer])
+        S_StartSound(NULL, sound);
+}
+
+// villsa [STRIFE]
+static char plrkilledmsg[80];
+
+//
+// KillMobj
+//
+// [STRIFE] Major modifications for drop types, no tic randomization, etc.
+//
+void P_KillMobj(mobj_t* source, mobj_t* target)
+{
+    mobjtype_t  item;
+    mobj_t*     mo;
+    line_t      junk;
+    int         i;
+
+    // villsa [STRIFE] corpse and dropoff are removed, but why when these two flags
+    // are set a few lines later? watcom nonsense perhaps?
+    target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_BOUNCE|MF_CORPSE|MF_DROPOFF);
+
+    // villsa [STRIFE] unused
+    /*
+    if (target->type != MT_SKULL)
+        target->flags &= ~MF_NOGRAVITY;
+    */
+
+    target->flags |= MF_CORPSE|MF_DROPOFF;
+    target->height = FRACUNIT;  // villsa [STRIFE] set to fracunit instead of >>= 2
+
+    if(source && source->player)
+    {
+        // count for intermission
+        if(target->flags & MF_COUNTKILL)
+            source->player->killcount++;
+
+        if(target->player)
+        {
+            source->player->frags[target->player-players]++;
+
+            // villsa [STRIFE] new messages when fragging players
+            // haleyjd 20141024: corrected; uses player->allegiance, not mo->miscdata
+            DEH_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
+                         "%s killed %s",
+                         player_names[source->player->allegiance],
+                         player_names[target->player->allegiance]);
+
+            if(netgame)
+                players[consoleplayer].message = plrkilledmsg;
+        }
+    }
+    else if(!netgame && (target->flags & MF_COUNTKILL))
+    {
+        // count all monster deaths,
+        // even those caused by other monsters
+        players[0].killcount++;
+    }
+    
+    if(target->player)
+    {
+        // count environment kills against you
+        if(!source)
+            target->player->frags[target->player-players]++;
+
+        if(gamemap == 29 && !netgame)
+        {
+            // haleyjd 09/13/10: [STRIFE] Give player the bad ending.
+            F_StartFinale();
+            return;
+        }
+
+        // villsa [STRIFE] spit out inventory items when killed
+        if(netgame)
+        {
+            int amount = 0;
+            mobj_t* loot;
+            int r = 0;
+
+            while(1)
+            {
+                if(target->player->inventory[0].amount <= 0)
+                    break;
+
+                item = target->player->inventory[0].type;
+                if(item == MT_MONY_1)
+                {
+                    loot = P_SpawnMobj(target->x, target->y, 
+                                       target->z + (24*FRACUNIT), MT_MONY_25);
+
+                    // [STRIFE] TODO - what the hell is it doing here?
+                    loot->health =  target->player->inventory[0].amount;
+                    loot->health = -target->player->inventory[0].amount;
+
+                    amount = target->player->inventory[0].amount;
+                }
+                else
+                {
+                    loot = P_SpawnMobj(target->x, target->y, 
+                                       target->z + (24*FRACUNIT), item);
+                    amount = 1;
+                }
+
+                P_RemoveInventoryItem(target->player, 0, amount);
+                r = P_Random();
+                loot->momx += ((r & 7) - (P_Random() & 7)) << FRACBITS;
+                loot->momy += ((P_Random() & 7) + 1) << FRACBITS;
+                loot->flags |= MF_DROPPED;
+            }
+        }
+
+        //target->flags &= ~MF_SOLID;
+        target->player->playerstate = PST_DEAD;
+        target->player->mo->momz += 5*FRACUNIT;  // [STRIFE]: small hop!
+        P_DropWeapon(target->player);
+
+        if(target->player == &players[consoleplayer]
+           && automapactive)
+        {
+            // don't die in auto map,
+            // switch view prior to dying
+            AM_Stop ();
+        }
+
+    }
+
+    // villsa [STRIFE] some modifications to setting states
+    if(target->state != &states[S_BURN_23])
+    {
+        if(target->health == -6666)
+            P_SetMobjState(target, S_DISR_00);  // 373
+        else
+        {
+            // haleyjd [STRIFE] 20160111: Rogue changed check from < to <=
+            if(target->health <= -target->info->spawnhealth 
+                && target->info->xdeathstate)
+                P_SetMobjState(target, target->info->xdeathstate);
+            else
+                P_SetMobjState(target, target->info->deathstate);
+        }
+    }
+
+    // villsa [STRIFE] no death tics randomization
+
+    // Drop stuff.
+    // villsa [STRIFE] get item from dialog target
+    item = P_DialogFind(target->type, target->miscdata)->dropitem;
+
+    if(!item)
+    {
+        // villsa [STRIFE] drop default items
+        switch(target->type)
+        {
+        case MT_ORACLE:
+            item = MT_MEAT;
+            break;
+
+        case MT_PROGRAMMER:
+            item = MT_SIGIL_A;
+            break;
+
+        case MT_PRIEST:
+            item = MT_JUNK;
+            break;
+
+        case MT_BISHOP:
+            item = MT_AMINIBOX;
+            break;
+
+        case MT_PGUARD:
+        case MT_CRUSADER:
+            item = MT_ACELL;
+            break;
+
+        case MT_RLEADER:
+            item = MT_AAMMOBOX;
+            break;
+
+        case MT_GUARD1:
+        case MT_REBEL1:
+        case MT_SHADOWGUARD:
+            item = MT_ACLIP;
+            break;
+
+        case MT_SPECTRE_B:
+            item = MT_SIGIL_B;
+            break;
+
+        case MT_SPECTRE_C:
+            item = MT_SIGIL_C;
+            break;
+
+        case MT_SPECTRE_D:
+            item = MT_SIGIL_D;
+            break;
+
+        case MT_SPECTRE_E:
+            item = MT_SIGIL_E;
+            break;
+
+        case MT_COUPLING:
+            junk.tag = 225;
+            EV_DoDoor(&junk, vld_close);
+
+            junk.tag = 44;
+            EV_DoFloor(&junk, lowerFloor);
+
+            GiveVoiceObjective("VOC13", "LOG13", 0);
+
+            item = MT_COUPLING_BROKEN;
+            players[0].questflags |= (1 << (mobjinfo[MT_COUPLING].speed - 1));
+            break;
+
+        default:
+            return;
+        }
+    }
+
+    // handle special case for scripted target's dropped item
+    switch(item)
+    {
+    case MT_TOKEN_SHOPCLOSE:
+        junk.tag = 222;
+        EV_DoDoor(&junk, vld_close);
+        P_NoiseAlert(players[0].mo, players[0].mo);
+
+        M_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
+                   "%s", DEH_String("You're dead!  You set off the alarm."));
+        if(!deathmatch)
+            players[consoleplayer].message = plrkilledmsg;
+
+        return;
+
+    case MT_TOKEN_PRISON_PASS:
+        junk.tag = 223;
+        EV_DoDoor(&junk, vld_open);
+        return;
+
+    case MT_TOKEN_DOOR3:
+        junk.tag = 224;
+        EV_DoDoor(&junk, vld_open);
+        return;
+
+    case MT_SIGIL_A:
+    case MT_SIGIL_B:
+    case MT_SIGIL_C:
+    case MT_SIGIL_D:
+    case MT_SIGIL_E:
+        for(i = 0; i < MAXPLAYERS; i++)
+        {
+            if(!P_GiveWeapon(&players[i], wp_sigil, false))
+            {
+                if(players[i].sigiltype++ > 4)
+                    players[i].sigiltype = 4;
+            }
+
+            // haleyjd 20110225: fixed these two assignments which Watcom munged
+            // up in the assembly by pre-incrementing the pointer into players[]
+            players[i].st_update = true;
+            players[i].pendingweapon = wp_sigil;
+        }
+        return;
+
+    case MT_TOKEN_ALARM:
+        P_NoiseAlert(players[0].mo, players[0].mo);
+
+        M_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
+                   "%s", DEH_String("You Fool!  You've set off the alarm"));
+        if(!deathmatch)
+            players[consoleplayer].message = plrkilledmsg;
+        return;
+
+    default:
+        break;
+    }
+
+    // villsa [STRIFE] toss out item
+    if(!deathmatch || !(mobjinfo[item].flags & MF_NOTDMATCH))
+    {
+        int r;
+
+        mo = P_SpawnMobj(target->x, target->y, target->z + (24*FRACUNIT), item);
+        r = P_Random();
+        mo->momx += ((r & 7) - (P_Random() & 7)) << FRACBITS;
+        r = P_Random();
+        mo->momy += ((r & 7) - (P_Random() & 7)) << FRACBITS;
+        mo->flags |= (MF_SPECIAL|MF_DROPPED);   // special versions of items
+    }
+}
+
+//
+// P_IsMobjBoss
+//
+// villsa [STRIFE] new function
+//
+static boolean P_IsMobjBoss(mobjtype_t type)
+{
+    switch(type)
+    {
+    case MT_PROGRAMMER:
+    case MT_BISHOP:
+    case MT_RLEADER:
+    case MT_ORACLE:
+    case MT_PRIEST:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
+
+//
+// P_DamageMobj
+// Damages both enemies and players
+// "inflictor" is the thing that caused the damage
+//  creature or missile, can be NULL (slime, etc)
+// "source" is the thing to target after taking damage
+//  creature or NULL
+// Source and inflictor are the same for melee attacks.
+// Source can be NULL for slime, barrel explosions
+// and other environmental stuff.
+//
+// [STRIFE] Extensive changes for spectrals, fire damage, disintegration, and
+//  a plethora of mobjtype-specific hacks.
+//
+void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage)
+{
+    angle_t     ang;
+    int         saved;
+    player_t*   player;
+    fixed_t     thrust;
+    int         temp;
+
+    if(!(target->flags & MF_SHOOTABLE) )
+        return; // shouldn't happen...
+
+    if(target->health <= 0)
+        return;
+
+    player = target->player;
+
+    // villsa [STRIFE] unused - skullfly check (removed)
+
+    // villsa [STRIFE] handle spectral stuff
+    // notes on projectile health:
+    // -2 == enemy spectral projectile
+    // -1 == player spectral projectile
+
+    // haleyjd 20110203: refactored completely
+    if(inflictor && (inflictor->flags & MF_SPECTRAL))
+    {
+        // players aren't damaged by their own (or others???) sigils
+        // STRIFE-TODO: verify in deathmatch
+        if(target->type == MT_PLAYER && inflictor->health == -1)
+            return;
+        // enemies aren't damaged by enemy sigil attacks
+        if((target->flags & MF_SPECTRAL) && inflictor->health == -2)
+            return;
+        // Macil2, Oracle, and Spectre C cannot be damaged by Sigil A
+        switch(target->type)
+        {
+        case MT_RLEADER2:
+        case MT_ORACLE:
+        case MT_SPECTRE_C:
+            // haleyjd: added source->player validity check for safety...
+            if(source->player && source->player->sigiltype < 1)
+                return;
+        default:
+            break;
+        }
+    }
+
+    // villsa [STRIFE] new checks for various actors
+    if(inflictor)
+    {
+        // Fire damage inflictors
+        if(inflictor->type == MT_SFIREBALL || 
+           inflictor->type == MT_C_FLAME   ||
+           inflictor->type == MT_PFLAME)
+        {
+            temp = damage / 2;
+
+            if(P_IsMobjBoss(target->type))
+                damage /= 2;
+            else if(inflictor->type == MT_PFLAME)
+            {
+                damage /= 2;
+                // robots take very little damage
+                if(target->flags & MF_NOBLOOD)
+                    damage = temp / 2;
+            }
+        }
+        else
+        {
+            switch(inflictor->type)
+            {
+            case MT_HOOKSHOT:
+                // haleyjd 20110203: should use source, not inflictor
+                ang = R_PointToAngle2(
+                        target->x,
+                        target->y,
+                        source->x,
+                        source->y) >> ANGLETOFINESHIFT;
+
+                target->momx += FixedMul(finecosine[ang], (12750*FRACUNIT) / target->info->mass);
+                target->momy += FixedMul(finesine[ang],   (12750*FRACUNIT) / target->info->mass);
+                target->reactiontime += 10;
+
+                temp = P_AproxDistance(target->x - source->x, target->y - source->y);
+                temp /= target->info->mass;
+
+                if(temp < 1)
+                    temp = 1;
+
+                target->momz = (source->z - target->z) / temp;
+                break;
+
+            case MT_POISARROW:
+                // don't affect robots
+                if(target->flags & MF_NOBLOOD)
+                    return;
+
+                // instant kill
+                damage = target->health + 10;
+                break;
+
+            default:
+                // Spectral retaliation, though this may in fact be unreachable
+                // since non-spectral inflictors are mostly filtered out.
+                if(target->flags & MF_SPECTRAL
+                    && !(inflictor->flags & MF_SPECTRAL))
+                {
+                    P_SetMobjState(target, target->info->missilestate);
+                    return; // take no damage
+                }
+                break;
+            }
+        }
+    }
+
+    // villsa [STRIFE] special cases for shopkeepers and macil
+    if((target->type >= MT_SHOPKEEPER_W && target->type <= MT_SHOPKEEPER_M)
+        || target->type == MT_RLEADER)
+    {
+        if(source)
+            target->target = source;
+
+        P_SetMobjState(target, target->info->painstate);
+        return;
+    }
+
+    // villsa [STRIFE] handle fieldguard damage
+    if(target->type == MT_FIELDGUARD)
+    {
+        // degnin ores are only allowed to damage the fieldguard
+        if(!inflictor || inflictor->type != MT_DEGNINORE)
+            return;
+
+        damage = target->health;
+    }
+
+    if(player && gameskill == sk_baby)
+        damage >>= 1;   // take half damage in trainer mode
+
+
+    // Some close combat weapons should not
+    // inflict thrust and push the victim out of reach,
+    // thus kick away unless using the chainsaw.
+    if (inflictor
+        && !(target->flags & MF_NOCLIP)
+        && (!source
+         || !source->player
+         || source->player->readyweapon != wp_flame))
+    {
+        ang = R_PointToAngle2(inflictor->x,
+                              inflictor->y,
+                              target->x,
+                              target->y);
+
+        thrust = damage * (FRACUNIT>>3) * 100 / target->info->mass;
+
+        // make fall forwards sometimes
+        if(damage < 40
+            && damage > target->health
+            && target->z - inflictor->z > 64*FRACUNIT
+            && (P_Random() & 1))
+        {
+            ang += ANG180;
+            thrust *= 4;
+        }
+
+        ang >>= ANGLETOFINESHIFT;
+        target->momx += FixedMul (thrust, finecosine[ang]);
+        target->momy += FixedMul (thrust, finesine[ang]);
+    }
+
+    // player specific
+    if(player)
+    {
+        // end of game hell hack
+        if (target->subsector->sector->special == 11
+            && damage >= target->health)
+        {
+            damage = target->health - 1;
+        }
+
+
+        // Below certain threshold,
+        // ignore damage in GOD mode.
+        // villsa [STRIFE] removed pw_invulnerability check
+        if(damage < 1000 && (player->cheats & CF_GODMODE))
+            return;
+
+        // villsa [STRIFE] flame attacks don't damage player if wearing envirosuit
+        if(player->powers[pw_ironfeet] && inflictor)
+        {
+            if(inflictor->type == MT_SFIREBALL || 
+               inflictor->type == MT_C_FLAME   || 
+               inflictor->type == MT_PFLAME)
+            {
+                damage = 0;
+            }
+        }
+
+        if(player->armortype)
+        {
+            if (player->armortype == 1)
+                saved = damage/3;
+            else
+                saved = damage/2;
+
+            if(player->armorpoints <= saved)
+            {
+                // armor is used up
+                saved = player->armorpoints;
+                player->armortype = 0;
+
+                // villsa [STRIFE]
+                P_UseInventoryItem(player, SPR_ARM1);
+                P_UseInventoryItem(player, SPR_ARM2);
+            }
+            player->armorpoints -= saved;
+            damage -= saved;
+        }
+        player->health -= damage;   // mirror mobj health here for Dave
+        
+        // [STRIFE] haleyjd 20130302: bug fix - this is *not* capped here.
+        //if(player->health < 0)
+        //    player->health = 0;
+
+        player->attacker = source;
+        player->damagecount += damage;  // add damage after armor / invuln
+
+        // haleyjd 20110203 [STRIFE]: target->target set here
+        if(target != source)
+            target->target = source;
+
+        if(player->damagecount > 100)
+            player->damagecount = 100;  // teleport stomp does 10k points...
+
+        temp = damage < 100 ? damage : 100;
+
+        if(player == &players[consoleplayer])
+            I_Tactile (40,10,40+temp*2);
+    }
+
+    // do the damage	
+    target->health -= damage;
+
+    // villsa [STRIFE] auto use medkits
+    if(player && player->health < 50)
+    {
+        if(deathmatch || player->cheats & CF_AUTOHEALTH)
+        {
+            while(player->health < 50 && P_UseInventoryItem(player, SPR_MDKT));
+            while(player->health < 50 && P_UseInventoryItem(player, SPR_STMP));
+        }
+    }
+
+
+    if(target->health <= 0)
+    {
+        // villsa [STRIFE] grenades hurt... OUCH
+        if(inflictor && inflictor->type == MT_HEGRENADE)
+            target->health = -target->info->spawnhealth;
+        else if(!(target->flags & MF_NOBLOOD))
+        {
+            // villsa [STRIFE] disintegration death
+            if(inflictor &&
+                (inflictor->type == MT_STRIFEPUFF3 || 
+                 inflictor->type == MT_L_LASER     || 
+                 inflictor->type == MT_TORPEDO     || 
+                 inflictor->type == MT_TORPEDOSPREAD))
+            {
+                S_StartSound(target, sfx_dsrptr);
+                target->health = -6666;
+            }
+        }
+
+        // villsa [STRIFE] flame death stuff
+        if(!(target->flags & MF_NOBLOOD)
+            && inflictor
+            && (inflictor->type == MT_SFIREBALL || 
+                inflictor->type == MT_C_FLAME   || 
+                inflictor->type == MT_PFLAME))
+        {
+            target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SHADOW|MF_MVIS);
+            if(target->player)
+            {
+                target->player->cheats |= CF_ONFIRE;
+                target->player->powers[pw_invisibility] = false;
+                target->player->readyweapon = 0;
+                P_SetPsprite(target->player, ps_weapon, S_WAVE_00); // 02
+                P_SetPsprite(target->player, ps_flash, S_NULL);
+            }
+
+            P_SetMobjState(target, S_BURN_00);  // 349
+            S_StartSound(target, sfx_burnme);
+
+            return;
+        }
+        
+        P_KillMobj(source, target);
+        return;
+    }
+
+    // villsa [STRIFE] set crash state
+    if(target->health <= 6 && target->info->crashstate)
+    {
+        P_SetMobjState(target, target->info->crashstate);
+        return;
+    }
+
+    if(damage)
+    {
+        // villsa [STRIFE] removed unused skullfly flag
+        if(P_Random() < target->info->painchance) 
+        {
+            target->flags |= MF_JUSTHIT;    // fight back!
+            P_SetMobjState (target, target->info->painstate);
+        }
+    }
+
+    target->reactiontime = 0;       // we're awake now...
+
+    // villsa [STRIFE] new checks for thing types
+    if (target->type != MT_PROGRAMMER
+        && (!target->threshold || target->type == MT_ENTITY)
+        && source && source != target
+        && source->type != MT_ENTITY
+        && ((source->flags & MF_ALLY) != (target->flags & MF_ALLY)))
+    {
+        // if not intent on another player,
+        // chase after this one
+        target->target = source;
+        target->threshold = BASETHRESHOLD;
+
+        if(target->state == &states[target->info->spawnstate]
+           && target->info->seestate != S_NULL)
+            P_SetMobjState (target, target->info->seestate);
+    }
+}
+
diff --git a/games/NXDoom/src/strife/p_inter.h b/games/NXDoom/src/strife/p_inter.h
new file mode 100644
index 000000000..c43fc0156
--- /dev/null
+++ b/games/NXDoom/src/strife/p_inter.h
@@ -0,0 +1,32 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//
+//
+
+
+#ifndef __P_INTER__
+#define __P_INTER__
+
+// haleyjd [STRIFE]: Multiple externals added
+boolean P_GiveCard(player_t* player, card_t card);
+boolean P_GiveBody(player_t* player, int num);
+boolean P_GiveArmor(player_t* player, int armortype);
+boolean P_GivePower(player_t* player, powertype_t power);
+boolean P_GiveAmmo(player_t* player, ammotype_t ammo, int num);
+boolean P_GiveWeapon(player_t* player, weapontype_t weapon, boolean dropped);
+void    P_KillMobj(mobj_t* source, mobj_t* target);
+
+#endif
diff --git a/games/NXDoom/src/strife/p_lights.c b/games/NXDoom/src/strife/p_lights.c
new file mode 100644
index 000000000..7fe509939
--- /dev/null
+++ b/games/NXDoom/src/strife/p_lights.c
@@ -0,0 +1,372 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Handle Sector base lighting effects.
+//	Muzzle flash?
+//
+
+
+
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+
+// State.
+#include "r_state.h"
+
+//
+// FIRELIGHT FLICKER
+//
+
+//
+// T_FireFlicker
+//
+// [STRIFE] 
+// haleyjd 2011023: Changes to amount and duration of flicker
+//
+void T_FireFlicker (fireflicker_t* flick)
+{
+    int	amount;
+
+    if (--flick->count)
+        return;
+
+    amount = (P_Random() & 3) * 8; // [STRIFE] 16 -> 8
+
+    if (flick->sector->lightlevel - amount < flick->minlight)
+        flick->sector->lightlevel = flick->minlight;
+    else
+        flick->sector->lightlevel = flick->maxlight - amount;
+
+    // [STRIFE] flicker count made random!
+    flick->count = (P_Random() & 3) + 1;
+}
+
+
+
+//
+// P_SpawnFireFlicker
+//
+// [STRIFE] 
+// haleyjd 2011023: Changes to minimum light level and initial duration
+//
+void P_SpawnFireFlicker (sector_t*      sector)
+{
+    fireflicker_t*      flick;
+
+    // Note that we are resetting sector attributes.
+    // Nothing special about it during gameplay.
+    sector->special = 0; 
+
+    flick = Z_Malloc ( sizeof(*flick), PU_LEVSPEC, 0);
+
+    P_AddThinker (&flick->thinker);
+
+    flick->thinker.function.acp1 = (actionf_p1) T_FireFlicker;
+    flick->sector = sector;
+    flick->maxlight = sector->lightlevel;
+    flick->minlight = sector->lightlevel - 32; // [STRIFE] changed from min surrounding+16
+    flick->count = 2;                          // [STRIFE]: Initial count 4 -> 2
+}
+
+
+
+//
+// BROKEN LIGHT FLASHING
+//
+
+
+//
+// T_LightFlash
+// Do flashing lights.
+//
+// [STRIFE] Verified unmodified
+//
+void T_LightFlash (lightflash_t* flash)
+{
+    if (--flash->count)
+        return;
+
+    if (flash->sector->lightlevel == flash->maxlight)
+    {
+        flash->sector->lightlevel = flash->minlight;
+        flash->count = (P_Random()&flash->mintime)+1;
+    }
+    else
+    {
+        flash->sector->lightlevel = flash->maxlight;
+        flash->count = (P_Random()&flash->maxtime)+1;
+    }
+}
+
+
+
+
+//
+// P_SpawnLightFlash
+// After the map has been loaded, scan each sector
+// for specials that spawn thinkers
+//
+// [STRIFE] Verified unmodified
+//
+void P_SpawnLightFlash (sector_t*	sector)
+{
+    lightflash_t*	flash;
+
+    // nothing special about it during gameplay
+    sector->special = 0;
+
+    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
+
+    P_AddThinker (&flash->thinker);
+
+    flash->thinker.function.acp1 = (actionf_p1) T_LightFlash;
+    flash->sector = sector;
+    flash->maxlight = sector->lightlevel;
+
+    flash->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
+    flash->maxtime = 64;
+    flash->mintime = 7;
+    flash->count = (P_Random()&flash->maxtime)+1;
+}
+
+
+
+//
+// STROBE LIGHT FLASHING
+//
+
+
+//
+// T_StrobeFlash
+//
+// [STRIFE] Verified unmodified
+//
+void T_StrobeFlash (strobe_t*           flash)
+{
+    if (--flash->count)
+        return;
+
+    if (flash->sector->lightlevel == flash->minlight)
+    {
+        flash-> sector->lightlevel = flash->maxlight;
+        flash->count = flash->brighttime;
+    }
+    else
+    {
+        flash-> sector->lightlevel = flash->minlight;
+        flash->count =flash->darktime;
+    }
+}
+
+
+
+//
+// P_SpawnStrobeFlash
+// After the map has been loaded, scan each sector
+// for specials that spawn thinkers
+//
+// [STRIFE] Verified unmodified
+//
+void
+P_SpawnStrobeFlash
+( sector_t*     sector,
+  int           fastOrSlow,
+  int           inSync )
+{
+    strobe_t*   flash;
+
+    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
+
+    P_AddThinker (&flash->thinker);
+
+    flash->sector = sector;
+    flash->darktime = fastOrSlow;
+    flash->brighttime = STROBEBRIGHT;
+    flash->thinker.function.acp1 = (actionf_p1) T_StrobeFlash;
+    flash->maxlight = sector->lightlevel;
+    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
+
+    if (flash->minlight == flash->maxlight)
+        flash->minlight = 0;
+
+    // nothing special about it during gameplay
+    sector->special = 0;
+
+    if (!inSync)
+        flash->count = (P_Random()&7)+1;
+    else
+        flash->count = 1;
+}
+
+
+//
+// Start strobing lights (usually from a trigger)
+//
+// [STRIFE] Verified unmodified
+//
+void EV_StartLightStrobing(line_t*      line)
+{
+    int         secnum;
+    sector_t*   sec;
+
+    secnum = -1;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+        if (sec->specialdata)
+            continue;
+
+        P_SpawnStrobeFlash (sec, SLOWDARK, 0);
+    }
+}
+
+
+
+//
+// TURN LINE'S TAG LIGHTS OFF
+//
+// [STRIFE] Verified unmodified
+//
+void EV_TurnTagLightsOff(line_t* line)
+{
+    int             i;
+    int             j;
+    int             min;
+    sector_t*       sector;
+    sector_t*       tsec;
+    line_t*         templine;
+
+    sector = sectors;
+
+    for (j = 0;j < numsectors; j++, sector++)
+    {
+        if (sector->tag == line->tag)
+        {
+            min = sector->lightlevel;
+            for (i = 0;i < sector->linecount; i++)
+            {
+                templine = sector->lines[i];
+                tsec = getNextSector(templine,sector);
+                if (!tsec)
+                    continue;
+                if (tsec->lightlevel < min)
+                    min = tsec->lightlevel;
+            }
+            sector->lightlevel = min;
+        }
+    }
+}
+
+
+//
+// TURN LINE'S TAG LIGHTS ON
+//
+// [STRIFE] Verified unmodified
+//
+void
+EV_LightTurnOn
+( line_t*       line,
+  int           bright )
+{
+    int         i;
+    int         j;
+    sector_t*   sector;
+    sector_t*   temp;
+    line_t*     templine;
+
+    sector = sectors;
+
+    for (i=0;i<numsectors;i++, sector++)
+    {
+        if (sector->tag == line->tag)
+        {
+            // bright = 0 means to search
+            // for highest light level
+            // surrounding sector
+            if (!bright)
+            {
+                for (j = 0;j < sector->linecount; j++)
+                {
+                    templine = sector->lines[j];
+                    temp = getNextSector(templine,sector);
+
+                    if (!temp)
+                        continue;
+
+                    if (temp->lightlevel > bright)
+                        bright = temp->lightlevel;
+                }
+            }
+            sector-> lightlevel = bright;
+        }
+    }
+}
+
+    
+//
+// Spawn glowing light
+//
+// [STRIFE] Verified unmodified
+//
+void T_Glow(glow_t*     g)
+{
+    switch(g->direction)
+    {
+    case -1:
+        // DOWN
+        g->sector->lightlevel -= GLOWSPEED;
+        if (g->sector->lightlevel <= g->minlight)
+        {
+            g->sector->lightlevel += GLOWSPEED;
+            g->direction = 1;
+        }
+        break;
+
+    case 1:
+        // UP
+        g->sector->lightlevel += GLOWSPEED;
+        if (g->sector->lightlevel >= g->maxlight)
+        {
+            g->sector->lightlevel -= GLOWSPEED;
+            g->direction = -1;
+        }
+        break;
+    }
+}
+
+//
+// [STRIFE] Verified unmodified
+//
+void P_SpawnGlowingLight(sector_t*	sector)
+{
+    glow_t*	g;
+
+    g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
+
+    P_AddThinker(&g->thinker);
+
+    g->sector = sector;
+    g->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
+    g->maxlight = sector->lightlevel;
+    g->thinker.function.acp1 = (actionf_p1) T_Glow;
+    g->direction = -1;
+
+    sector->special = 0;
+}
+
diff --git a/games/NXDoom/src/strife/p_local.h b/games/NXDoom/src/strife/p_local.h
new file mode 100644
index 000000000..abbb071ba
--- /dev/null
+++ b/games/NXDoom/src/strife/p_local.h
@@ -0,0 +1,311 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Play functions, animation, global header.
+//
+
+
+#ifndef __P_LOCAL__
+#define __P_LOCAL__
+
+#ifndef __R_LOCAL__
+#include "r_local.h"
+#endif
+
+#define FLOATSPEED		(FRACUNIT*5)    // villsa [STRIFE] change to 5 (was 4)
+
+
+#define MAXHEALTH		100
+#define VIEWHEIGHT		(41*FRACUNIT)
+
+// mapblocks are used to check movement
+// against lines and things
+#define MAPBLOCKUNITS	128
+#define MAPBLOCKSIZE	(MAPBLOCKUNITS*FRACUNIT)
+#define MAPBLOCKSHIFT	(FRACBITS+7)
+#define MAPBMASK		(MAPBLOCKSIZE-1)
+#define MAPBTOFRAC		(MAPBLOCKSHIFT-FRACBITS)
+
+
+// player radius for movement checking
+#define PLAYERRADIUS	16*FRACUNIT
+
+// MAXRADIUS is for precalculated sector block boxes
+// the spider demon is larger,
+// but we do not have any moving sectors nearby
+#define MAXRADIUS		32*FRACUNIT
+
+#define GRAVITY		FRACUNIT
+#define MAXMOVE		(30*FRACUNIT)
+
+#define USERANGE		(64*FRACUNIT)
+#define MELEERANGE		(64*FRACUNIT)
+#define PLAYERMELEERANGE	(80*FRACUNIT) // haleyjd [STRIFE] New constant
+#define MISSILERANGE	(32*64*FRACUNIT)
+
+// follow a player exlusively for 3 seconds
+#define	BASETHRESHOLD	 	100
+
+
+
+//
+// P_TICK
+//
+
+// both the head and tail of the thinker list
+extern	thinker_t	thinkercap;	
+
+
+void P_InitThinkers (void);
+void P_AddThinker (thinker_t* thinker);
+void P_RemoveThinker (thinker_t* thinker);
+
+
+//
+// P_PSPR
+//
+void P_SetupPsprites (player_t* curplayer);
+void P_MovePsprites (player_t* curplayer);
+void P_DropWeapon (player_t* player);
+
+
+//
+// P_USER
+//
+
+// haleyjd 09/15/10: externalized
+#define INVERSECOLORMAP         32
+
+void    P_PlayerThink (player_t* player);
+// haleyjd 08/30/10: [STRIFE] Needed externally
+void    P_Thrust (player_t* player, angle_t angle, fixed_t move);
+// villsa [STRIFE]
+const char *P_RemoveInventoryItem(player_t *player, int slot, int amount);
+
+
+//
+// P_MOBJ
+//
+#define ONFLOORZ		INT_MIN
+#define ONCEILINGZ		INT_MAX
+
+// Time interval for item respawning.
+#define ITEMQUESIZE		128
+
+extern mapthing_t	itemrespawnque[ITEMQUESIZE];
+extern int		itemrespawntime[ITEMQUESIZE];
+extern int		iquehead;
+extern int		iquetail;
+
+
+void P_RespawnSpecials (void);
+
+mobj_t*
+P_SpawnMobj
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z,
+  mobjtype_t	type );
+
+void 	P_RemoveMobj (mobj_t* th);
+mobj_t* P_SubstNullMobj (mobj_t* th);
+boolean	P_SetMobjState (mobj_t* mobj, statenum_t state);
+void 	P_MobjThinker (mobj_t* mobj);
+
+void	P_SpawnPuff (fixed_t x, fixed_t y, fixed_t z);
+mobj_t* P_SpawnSparkPuff(fixed_t x, fixed_t y, fixed_t z);  // villsa [STRIFE]
+void 	P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage);
+mobj_t* P_SpawnMissile (mobj_t* source, mobj_t* dest, mobjtype_t type);
+mobj_t* P_SpawnFacingMissile(mobj_t* source, mobj_t* target, mobjtype_t type);  // villsa [STRIFE]
+mobj_t* P_SpawnPlayerMissile(mobj_t* source, mobjtype_t type);
+mobj_t* P_SpawnMortar(mobj_t *source, mobjtype_t type); // villsa [STRIFE]
+void    P_ExplodeMissile (mobj_t* mo); // villsa [STRIFE]
+
+
+//
+// P_ENEMY
+//
+void P_NoiseAlert (mobj_t* target, mobj_t* emmiter);
+void P_DoPunchAlert(mobj_t *puncher, mobj_t *punchee);  // villsa [STRIFE]
+void A_BodyParts(mobj_t *actor);                        // haleyjd: [STRIFE]
+void A_AlertSpectreC(mobj_t* actor);
+void A_FaceTarget (mobj_t* actor);
+void P_FreePrisoners(void);
+void P_DestroyConverter(void);
+
+//
+// P_MAPUTL
+//
+typedef struct
+{
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	dx;
+    fixed_t	dy;
+    
+} divline_t;
+
+typedef struct
+{
+    fixed_t	frac;		// along trace line
+    boolean	isaline;
+    union {
+	mobj_t*	thing;
+	line_t*	line;
+    }			d;
+} intercept_t;
+
+// Extended MAXINTERCEPTS, to allow for intercepts overrun emulation.
+
+#define MAXINTERCEPTS_ORIGINAL 128
+#define MAXINTERCEPTS          (MAXINTERCEPTS_ORIGINAL + 61)
+
+extern intercept_t	intercepts[MAXINTERCEPTS];
+extern intercept_t*	intercept_p;
+
+typedef boolean (*traverser_t) (intercept_t *in);
+
+fixed_t P_AproxDistance (fixed_t dx, fixed_t dy);
+int 	P_PointOnLineSide (fixed_t x, fixed_t y, line_t* line);
+int 	P_PointOnDivlineSide (fixed_t x, fixed_t y, divline_t* line);
+void 	P_MakeDivline (line_t* li, divline_t* dl);
+fixed_t P_InterceptVector (divline_t* v2, divline_t* v1);
+int 	P_BoxOnLineSide (fixed_t* tmbox, line_t* ld);
+
+extern fixed_t		opentop;
+extern fixed_t 		openbottom;
+extern fixed_t		openrange;
+extern fixed_t		lowfloor;
+
+void 	P_LineOpening (line_t* linedef);
+
+boolean P_BlockLinesIterator (int x, int y, boolean(*func)(line_t*) );
+boolean P_BlockThingsIterator (int x, int y, boolean(*func)(mobj_t*) );
+
+#define PT_ADDLINES		1
+#define PT_ADDTHINGS	2
+#define PT_EARLYOUT		4
+
+extern divline_t	trace;
+
+boolean
+P_PathTraverse
+( fixed_t	x1,
+  fixed_t	y1,
+  fixed_t	x2,
+  fixed_t	y2,
+  int		flags,
+  boolean	(*trav) (intercept_t *));
+
+void P_UnsetThingPosition (mobj_t* thing);
+void P_SetThingPosition (mobj_t* thing);
+
+
+//
+// P_MAP
+//
+
+// If "floatok" true, move would be ok
+// if within "tmfloorz - tmceilingz".
+extern boolean      floatok;
+extern fixed_t      tmfloorz;
+extern fixed_t      tmceilingz;
+
+extern line_t      *ceilingline;
+extern line_t      *blockingline; // [STRIFE] New global
+
+extern int numspechit;
+extern line_t *spechit[];
+
+extern fixed_t attackrange;
+
+// slopes to top and bottom of target
+extern fixed_t topslope;
+extern fixed_t bottomslope;
+
+
+boolean P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y);
+boolean P_TryMove (mobj_t* thing, fixed_t x, fixed_t y);
+boolean P_CheckPositionZ(mobj_t* thing, fixed_t z);   // villsa [STRIFE]
+boolean P_TeleportMove (mobj_t* thing, fixed_t x, fixed_t y);
+void	P_SlideMove (mobj_t* mo);
+boolean P_CheckSight (mobj_t* t1, mobj_t* t2);
+void 	P_UseLines (player_t* player);
+
+boolean P_ChangeSector (sector_t* sector, boolean crunch);
+
+extern mobj_t*	linetarget;	// who got hit (or NULL)
+
+fixed_t
+P_AimLineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance );
+
+void
+P_LineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance,
+  fixed_t	slope,
+  int		damage );
+
+void
+P_RadiusAttack
+( mobj_t*	spot,
+  mobj_t*	source,
+  int		damage );
+
+
+
+//
+// P_SETUP
+//
+extern byte*		rejectmatrix;	// for fast sight rejection
+extern short*		blockmaplump;	// offsets in blockmap are from here
+extern short*		blockmap;
+extern int		bmapwidth;
+extern int		bmapheight;	// in mapblocks
+extern fixed_t		bmaporgx;
+extern fixed_t		bmaporgy;	// origin of block map
+extern mobj_t**		blocklinks;	// for thing chains
+
+
+//
+// P_INTER
+//
+extern int		maxammo[NUMAMMO];
+extern int		clipammo[NUMAMMO];
+
+void
+P_TouchSpecialThing
+( mobj_t*	special,
+  mobj_t*	toucher );
+
+void
+P_DamageMobj
+( mobj_t*	target,
+  mobj_t*	inflictor,
+  mobj_t*	source,
+  int		damage );
+
+
+//
+// P_SPEC
+//
+#include "p_spec.h"
+
+
+#endif	// __P_LOCAL__
diff --git a/games/NXDoom/src/strife/p_map.c b/games/NXDoom/src/strife/p_map.c
new file mode 100644
index 000000000..0aa2862f9
--- /dev/null
+++ b/games/NXDoom/src/strife/p_map.c
@@ -0,0 +1,1643 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard, Andrey Budko
+//
+// 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.
+//
+// DESCRIPTION:
+//	Movement, collision handling.
+//	Shooting and aiming.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "deh_misc.h"
+
+#include "m_bbox.h"
+#include "m_random.h"
+#include "i_system.h"
+
+#include "doomdef.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+// Data.
+#include "sounds.h"
+
+// Spechit overrun magic value.
+//
+// This is the value used by PrBoom-plus.  I think the value below is 
+// actually better and works with more demos.  However, I think
+// it's better for the spechits emulation to be compatible with
+// PrBoom-plus, at least so that the big spechits emulation list
+// on Doomworld can also be used with Chocolate Doom.
+
+#define DEFAULT_SPECHIT_MAGIC 0x01C09C98
+
+// This is from a post by myk on the Doomworld forums, 
+// outputted from entryway's spechit_magic generator for
+// s205n546.lmp.  The _exact_ value of this isn't too
+// important; as long as it is in the right general
+// range, it will usually work.  Otherwise, we can use
+// the generator (hacked doom2.exe) and provide it 
+// with -spechit.
+
+//#define DEFAULT_SPECHIT_MAGIC 0x84f968e8
+
+
+fixed_t     tmbbox[4];
+mobj_t*     tmthing;
+int         tmflags;
+fixed_t     tmx;
+fixed_t     tmy;
+
+
+// If "floatok" true, move would be ok
+// if within "tmfloorz - tmceilingz".
+boolean     floatok;
+
+fixed_t     tmfloorz;
+fixed_t     tmceilingz;
+fixed_t     tmdropoffz;
+
+// keep track of the line that lowers the ceiling,
+// so missiles don't explode against sky hack walls
+line_t*     ceilingline;
+
+// haleyjd 20110203: [STRIFE] New global
+// "blockingline" tracks the linedef responsible for blocking motion of an mobj
+// for purposes of doing impact special activation by missiles. Suspiciously 
+// similar to the solution used by Raven in Heretic and Hexen.
+line_t     *blockingline;
+
+// keep track of special lines as they are hit,
+// but don't process them until the move is proven valid
+
+// fraggle: I have increased the size of this buffer.  In the original Doom,
+// overrunning past this limit caused other bits of memory to be overwritten,
+// affecting demo playback.  However, in doing so, the limit was still 
+// exceeded.  So we have to support more than 8 specials.
+//
+// We keep the original limit, to detect what variables in memory were 
+// overwritten (see SpechitOverrun())
+
+#define MAXSPECIALCROSS 		20
+#define MAXSPECIALCROSS_ORIGINAL	8
+
+line_t*		spechit[MAXSPECIALCROSS];
+int		numspechit;
+
+
+
+//
+// TELEPORT MOVE
+// 
+
+//
+// PIT_StompThing
+//
+// [STRIFE] haleyjd 09/15/10: Modified so monsters can telestomp.
+//
+boolean PIT_StompThing (mobj_t* thing)
+{
+    fixed_t blockdist;
+
+    if (!(thing->flags & MF_SHOOTABLE) )
+        return true;
+
+    blockdist = thing->radius + tmthing->radius;
+
+    if ( abs(thing->x - tmx) >= blockdist
+        || abs(thing->y - tmy) >= blockdist )
+    {
+        // didn't hit it
+        return true;
+    }
+
+    // don't clip against self
+    if (thing == tmthing)
+        return true;
+
+    // [STRIFE] monsters DO stomp things, on all levels
+    // Basically, one thing involved must be a player.
+    // Monsters can telefrag players, and players can telefrag monsters, but
+    // monsters cannot telefrag other monsters.
+    if (!(tmthing->player || thing->player))
+        return false;
+
+    P_DamageMobj (thing, tmthing, tmthing, 10000);
+
+    return true;
+}
+
+
+//
+// P_TeleportMove
+//
+// [STRIFE]
+// haleyjd 09/15/10: Modified to set thing z position.
+//
+boolean P_TeleportMove(mobj_t*  thing, fixed_t  x, fixed_t  y)
+{
+    int                 xl;
+    int                 xh;
+    int                 yl;
+    int                 yh;
+    int                 bx;
+    int                 by;
+    
+    subsector_t*        newsubsec;
+    
+    // kill anything occupying the position
+    tmthing = thing;
+    tmflags = thing->flags;
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector (x,y);
+    ceilingline = NULL;
+    
+    // The base floor/ceiling is from the subsector
+    // that contains the point.
+    // Any contacted lines the step closer together
+    // will adjust them.
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+
+    validcount++;
+    numspechit = 0;
+    
+    // stomp on any things contacted
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
+
+    for (bx=xl ; bx<=xh ; bx++)
+        for (by=yl ; by<=yh ; by++)
+            if (!P_BlockThingsIterator(bx,by,PIT_StompThing))
+                return false;
+    
+    // the move is ok,
+    // so link the thing into its new position
+    P_UnsetThingPosition (thing);
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->x = x;
+    thing->y = y;
+    thing->z = tmfloorz; // haleyjd 09/15/10: [STRIFE] Rogue added a z-set here
+
+    P_SetThingPosition (thing);
+
+    return true;
+}
+
+
+//
+// MOVEMENT ITERATOR FUNCTIONS
+//
+
+static void SpechitOverrun(line_t *ld);
+
+//
+// PIT_CheckLine
+// Adjusts tmfloorz and tmceilingz as lines are contacted
+//
+boolean PIT_CheckLine (line_t* ld)
+{
+    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
+        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
+        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
+        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP] )
+        return true;
+
+    if (P_BoxOnLineSide (tmbbox, ld) != -1)
+        return true;
+
+    // A line has been hit
+    
+    // The moving thing's destination position will cross
+    // the given line.
+    // If this should not be allowed, return false.
+    // If the line is special, keep track of it
+    // to process later if the move is proven ok.
+    // NOTE: specials are NOT sorted by order,
+    // so two special lines that are only 8 pixels apart
+    // could be crossed in either order.
+    
+    if (!ld->backsector)
+        return false;           // one sided line
+
+    if (!(tmthing->flags & MF_MISSILE) )
+    {
+        // villsa [STRIFE] include jumpover flag
+        if ( ld->flags & ML_BLOCKING &&
+            (!(ld->flags & ML_JUMPOVER) || tmfloorz + (32*FRACUNIT) > tmthing->z) )
+            return false;   // explicitly blocking everything
+
+        // villsa [STRIFE] exclude floaters from blockmonster lines
+        if ( !tmthing->player && (ld->flags & ML_BLOCKMONSTERS) &&
+            !(tmthing->flags & MF_FLOAT))
+            return false;   // block monsters only
+
+        // villsa [STRIFE]
+        if ( ld->flags & ML_BLOCKFLOATERS && tmthing->flags & MF_FLOAT )
+            return false;   // block floaters only
+    }
+
+    // set openrange, opentop, openbottom
+    P_LineOpening (ld);	
+
+    // adjust floor / ceiling heights
+    if (opentop < tmceilingz)
+    {
+        tmceilingz = opentop;
+        ceilingline = ld;
+    }
+
+    if (openbottom > tmfloorz)
+        tmfloorz = openbottom;	
+
+    if (lowfloor < tmdropoffz)
+        tmdropoffz = lowfloor;
+
+    // if contacted a special line, add it to the list
+    if (ld->special)
+    {
+        spechit[numspechit] = ld;
+        numspechit++;
+
+        // fraggle: spechits overrun emulation code from prboom-plus
+        if (numspechit > MAXSPECIALCROSS_ORIGINAL)
+        {
+            SpechitOverrun(ld);
+        }
+    }
+
+    return true;
+}
+
+//
+// PIT_CheckThing
+//
+boolean PIT_CheckThing (mobj_t* thing)
+{
+    fixed_t             blockdist;
+    boolean             solid;
+    int                 damage;
+
+    if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE) ))
+        return true;
+
+    // don't clip against self
+    if (thing == tmthing)
+        return true;
+
+    blockdist = thing->radius + tmthing->radius;
+
+    if ( abs(thing->x - tmx) >= blockdist
+        || abs(thing->y - tmy) >= blockdist )
+    {
+        // didn't hit it
+        return true;	
+    }
+
+    // villsa [STRIFE] see if it went over / under
+    if(thing->height + thing->z < tmthing->z)
+        return true;    // overhead
+
+    // villsa [STRIFE] see if it went over / under
+    if (tmthing->z + tmthing->height < thing->z)
+        return true;    // underneath
+
+    // villsa [STRIFE] unused
+    // check for skulls slamming into things (removed)
+
+    // missiles can hit other things
+    if (tmthing->flags & MF_MISSILE)
+    {
+        // villsa [STRIFE] code to check over/under clipping moved to the beginning of the 
+        // function, so that it applies to everything.
+
+        // villsa [STRIFE] updated to strife version
+        if (tmthing->target && (tmthing->target->type == thing->type))
+        {
+            // Don't hit same species as originator.
+            if (thing == tmthing->target)
+                return true;
+
+            // sdh: Add deh_species_infighting here.  We can override the
+            // "monsters of the same species cant hurt each other" behavior
+            // through dehacked patches
+
+            if (thing->type != MT_PLAYER && !deh_species_infighting)
+            {
+                // Explode, but do no damage.
+                // Let players missile other players.
+                return false;
+            }
+        }
+
+        if (!(thing->flags & MF_SHOOTABLE))
+        {
+            // didn't do any damage
+            return !(thing->flags & MF_SOLID);
+        }
+
+        // haleyjd 09/01/10: [STRIFE] Spectral check:
+        // Missiles cannot hit SPECTRAL entities unless the missiles are also
+        // flagged as SPECTRAL.
+        if (thing->flags & MF_SPECTRAL && !(tmthing->flags & MF_SPECTRAL))
+            return true; // keep going
+
+        // damage / explode
+        // haleyjd 09/01/10: [STRIFE] Modified missile damage formula
+        damage = ((P_Random()&3)+1)*tmthing->info->damage;
+        P_DamageMobj (thing, tmthing, tmthing->target, damage);
+
+        // don't traverse any more
+        return false;
+    }
+    
+    // check for special pickup
+    if (thing->flags & MF_SPECIAL)
+    {
+        solid = (thing->flags & MF_SOLID) != 0;
+        if (tmthing->player) // villsa [STRIFE] no longer checks MF_PICKUP flag
+        {
+            // can remove thing
+            P_TouchSpecialThing (thing, tmthing);
+        }
+        return !solid;
+    }
+
+    return !(thing->flags & MF_SOLID);
+}
+
+
+//
+// MOVEMENT CLIPPING
+//
+
+//
+// P_CheckPosition
+// This is purely informative, nothing is modified
+// (except things picked up).
+// 
+// in:
+//  a mobj_t (can be valid or invalid)
+//  a position to be checked
+//   (doesn't need to be related to the mobj_t->x,y)
+//
+// during:
+//  special things are touched if MF_PICKUP
+//  early out on solid lines?
+//
+// out:
+//  newsubsec
+//  floorz
+//  ceilingz
+//  tmdropoffz
+//   the lowest point contacted
+//   (monsters won't move to a dropoff)
+//  speciallines[]
+//  numspeciallines
+//
+// haleyjd 20110203:
+// [STRIFE] Modified to clear blockingline in advance of P_BlockLinesIterator
+//
+boolean
+P_CheckPosition
+( mobj_t*   thing,
+  fixed_t   x,
+  fixed_t   y )
+{
+    int             xl;
+    int             xh;
+    int             yl;
+    int             yh;
+    int             bx;
+    int             by;
+    subsector_t*    newsubsec;
+
+    tmthing = thing;
+    tmflags = thing->flags;
+
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    newsubsec = R_PointInSubsector (x,y);
+    
+    // [STRIFE] clear blockingline (see P_XYMovement, P_BlockLinesIterator)
+    blockingline = NULL;
+    ceilingline  = NULL;
+    
+    // The base floor / ceiling is from the subsector
+    // that contains the point.
+    // Any contacted lines the step closer together
+    // will adjust them.
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+
+    validcount++;
+    numspechit = 0;
+
+    if ( tmflags & MF_NOCLIP )
+        return true;
+    
+    // Check things first, possibly picking things up.
+    // The bounding box is extended by MAXRADIUS
+    // because mobj_ts are grouped into mapblocks
+    // based on their origin point, and can overlap
+    // into adjacent blocks by up to MAXRADIUS units.
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
+
+    for (bx=xl ; bx<=xh ; bx++)
+        for (by=yl ; by<=yh ; by++)
+            if (!P_BlockThingsIterator(bx,by,PIT_CheckThing))
+                return false;
+    
+    // check lines
+    xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
+
+    for (bx=xl ; bx<=xh ; bx++)
+        for (by=yl ; by<=yh ; by++)
+            if (!P_BlockLinesIterator (bx,by,PIT_CheckLine))
+                return false;
+
+    return true;
+}
+
+
+//
+// P_TryMove
+// Attempt to move to a new position,
+// crossing special lines unless MF_TELEPORT is set.
+//
+boolean
+P_TryMove
+( mobj_t*	thing,
+  fixed_t	x,
+  fixed_t	y )
+{
+    fixed_t oldx;
+    fixed_t oldy;
+    int     side;
+    int     oldside;
+    line_t* ld;
+
+    floatok = false;
+    if (!P_CheckPosition (thing, x, y))
+        return false;       // solid wall or thing
+
+    if ( !(thing->flags & MF_NOCLIP) )
+    {
+        if (tmceilingz - tmfloorz < thing->height)
+            return false;   // doesn't fit
+
+        floatok = true;
+
+        // villsa [STRIFE] Removed MF_TELEPORT
+        if (tmceilingz - thing->z < thing->height)
+            return false;       // mobj must lower itself to fit
+
+        // villsa [STRIFE] non-robots are limited to 16 unit step height
+        if ((thing->flags & MF_NOBLOOD) == 0 && tmfloorz - thing->z > (16*FRACUNIT))
+            return false;
+        if (tmfloorz - thing->z > 24*FRACUNIT)
+            return false;       // too big a step up
+
+        // villsa [STRIFE] special case for missiles
+        if((thing->flags & MF_MISSILE) && tmfloorz - thing->z > 4*FRACUNIT)
+            return false;
+
+        // haleyjd 20110204 [STRIFE]: dropoff height changed 24 -> 32
+        if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT))
+            && tmfloorz - tmdropoffz > 32*FRACUNIT ) 
+            return false;       // don't stand over a dropoff
+    }
+    
+    // the move is ok,
+    // so link the thing into its new position
+    P_UnsetThingPosition (thing);
+
+    oldx = thing->x;
+    oldy = thing->y;
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+    thing->x = x;
+    thing->y = y;
+
+    P_SetThingPosition (thing);
+    
+    // if any special lines were hit, do the effect
+    if (! (thing->flags&MF_NOCLIP) ) // villsa [STRIFE] MF_TELEPORT not used
+    {
+        while (numspechit--)
+        {
+            // see if the line was crossed
+            ld = spechit[numspechit];
+            side = P_PointOnLineSide (thing->x, thing->y, ld);
+            oldside = P_PointOnLineSide (oldx, oldy, ld);
+            if (side != oldside)
+            {
+                if (ld->special)
+                    P_CrossSpecialLine (ld-lines, oldside, thing);
+            }
+        }
+    }
+
+    return true;
+}
+
+//
+// P_CheckPositionZ
+//
+// villsa [STRIFE] new function
+// Check colliding things on top of one another; ie., 3D Object Clipping
+//
+boolean P_CheckPositionZ(mobj_t* thing, fixed_t height)
+{
+    fixed_t         x;
+    fixed_t         y;
+    fixed_t         z;
+    int             xl;
+    int             xh;
+    int             yl;
+    int             yh;
+    int             bx;
+    int             by;
+    subsector_t*    newsubsec;
+
+    x = thing->x;
+    y = thing->y;
+    z = thing->z;
+
+    thing->z = height;
+
+    tmthing = thing;
+    tmflags = thing->flags;
+    tmx = x;
+    tmy = y;
+
+    tmbbox[BOXTOP] = y + tmthing->radius;
+    tmbbox[BOXBOTTOM] = y - tmthing->radius;
+    tmbbox[BOXRIGHT] = x + tmthing->radius;
+    tmbbox[BOXLEFT] = x - tmthing->radius;
+
+    ceilingline = 0;
+    newsubsec = thing->subsector;
+
+    // The base floor / ceiling is from the subsector
+    // that contains the point.
+    // Any contacted lines the step closer together
+    // will adjust them.
+
+    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+    tmceilingz = newsubsec->sector->ceilingheight;
+
+    if(tmflags & MF_NOCLIP)
+        return true;
+
+    // Check things first, possibly picking things up.
+    // The bounding box is extended by MAXRADIUS
+    // because mobj_ts are grouped into mapblocks
+    // based on their origin point, and can overlap
+    // into adjacent blocks by up to MAXRADIUS units.
+
+    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
+    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
+    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
+    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
+
+    for(bx = xl; bx <= xh; bx++)
+    {
+        for(by = yl; by <= yh; by++)
+        {
+            if(!P_BlockThingsIterator(bx, by, PIT_CheckThing))
+            {
+                tmthing->z = z;
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+
+//
+// P_ThingHeightClip
+// Takes a valid thing and adjusts the thing->floorz,
+// thing->ceilingz, and possibly thing->z.
+// This is called for all nearby monsters
+// whenever a sector changes height.
+// If the thing doesn't fit,
+// the z will be set to the lowest value
+// and false will be returned.
+//
+// [STRIFE] Verified unmodified
+//
+boolean P_ThingHeightClip (mobj_t* thing)
+{
+    boolean     onfloor;
+
+    onfloor = (thing->z == thing->floorz);
+
+    P_CheckPosition (thing, thing->x, thing->y);
+    // what about stranding a monster partially off an edge?
+
+    thing->floorz = tmfloorz;
+    thing->ceilingz = tmceilingz;
+
+    if (onfloor)
+    {
+        // walking monsters rise and fall with the floor
+        thing->z = thing->floorz;
+    }
+    else
+    {
+        // don't adjust a floating monster unless forced to
+        if (thing->z+thing->height > thing->ceilingz)
+            thing->z = thing->ceilingz - thing->height;
+    }
+
+    if (thing->ceilingz - thing->floorz < thing->height)
+        return false;
+
+    return true;
+}
+
+
+
+//
+// SLIDE MOVE
+// Allows the player to slide along any angled walls.
+//
+fixed_t		bestslidefrac;
+fixed_t		secondslidefrac;
+
+line_t*		bestslideline;
+line_t*		secondslideline;
+
+mobj_t*		slidemo;
+
+fixed_t		tmxmove;
+fixed_t		tmymove;
+
+
+
+//
+// P_HitSlideLine
+// Adjusts the xmove / ymove
+// so that the next move will slide along the wall.
+//
+// [STRIFE] Verified unmodified
+//
+void P_HitSlideLine (line_t* ld)
+{
+    int         side;
+
+    angle_t     lineangle;
+    angle_t     moveangle;
+    angle_t     deltaangle;
+
+    fixed_t     movelen;
+    fixed_t     newlen;
+
+
+    if (ld->slopetype == ST_HORIZONTAL)
+    {
+        tmymove = 0;
+        return;
+    }
+
+    if (ld->slopetype == ST_VERTICAL)
+    {
+        tmxmove = 0;
+        return;
+    }
+
+    side = P_PointOnLineSide (slidemo->x, slidemo->y, ld);
+
+    lineangle = R_PointToAngle2 (0,0, ld->dx, ld->dy);
+
+    if (side == 1)
+        lineangle += ANG180;
+
+    moveangle = R_PointToAngle2 (0,0, tmxmove, tmymove);
+    deltaangle = moveangle-lineangle;
+
+    if (deltaangle > ANG180)
+        deltaangle += ANG180;
+    //  I_Error ("SlideLine: ang>ANG180");
+
+    lineangle >>= ANGLETOFINESHIFT;
+    deltaangle >>= ANGLETOFINESHIFT;
+
+    movelen = P_AproxDistance (tmxmove, tmymove);
+    newlen = FixedMul (movelen, finecosine[deltaangle]);
+
+    tmxmove = FixedMul (newlen, finecosine[lineangle]);	
+    tmymove = FixedMul (newlen, finesine[lineangle]);	
+}
+
+
+//
+// PTR_SlideTraverse
+//
+// [STRIFE] Modified for smaller step-up height
+//
+boolean PTR_SlideTraverse (intercept_t* in)
+{
+    line_t* li;
+
+    if (!in->isaline)
+        I_Error ("PTR_SlideTraverse: not a line?");
+
+    li = in->d.line;
+
+    if ( ! (li->flags & ML_TWOSIDED) )
+    {
+        if (P_PointOnLineSide (slidemo->x, slidemo->y, li))
+        {
+            // don't hit the back side
+            return true;
+        }
+        goto isblocking;
+    }
+
+    // set openrange, opentop, openbottom
+    P_LineOpening (li);
+
+    if (openrange < slidemo->height)
+        goto isblocking;        // doesn't fit
+
+    if (opentop - slidemo->z < slidemo->height)
+        goto isblocking;        // mobj is too high
+
+    // villsa [STRIFE] change from 24 to 16
+    if (openbottom - slidemo->z > 16*FRACUNIT )
+        goto isblocking;        // too big a step up
+
+    // this line doesn't block movement
+    return true;
+
+    // the line does block movement,
+    // see if it is closer than best so far
+isblocking:
+    if (in->frac < bestslidefrac)
+    {
+        secondslidefrac = bestslidefrac;
+        secondslideline = bestslideline;
+        bestslidefrac = in->frac;
+        bestslideline = li;
+    }
+
+    return false;   // stop
+}
+
+
+
+//
+// P_SlideMove
+// The momx / momy move is bad, so try to slide
+// along a wall.
+// Find the first line hit, move flush to it,
+// and slide along it
+//
+// This is a kludgy mess.
+//
+// [STRIFE] Verified unmodified
+//
+void P_SlideMove (mobj_t* mo)
+{
+    fixed_t     leadx;
+    fixed_t     leady;
+    fixed_t     trailx;
+    fixed_t     traily;
+    fixed_t     newx;
+    fixed_t     newy;
+    int         hitcount;
+
+    slidemo = mo;
+    hitcount = 0;
+    
+retry:
+    if (++hitcount == 3)
+        goto stairstep;     // don't loop forever
+
+    // trace along the three leading corners
+    if (mo->momx > 0)
+    {
+        leadx = mo->x + mo->radius;
+        trailx = mo->x - mo->radius;
+    }
+    else
+    {
+        leadx = mo->x - mo->radius;
+        trailx = mo->x + mo->radius;
+    }
+
+    if (mo->momy > 0)
+    {
+        leady = mo->y + mo->radius;
+        traily = mo->y - mo->radius;
+    }
+    else
+    {
+        leady = mo->y - mo->radius;
+        traily = mo->y + mo->radius;
+    }
+
+    bestslidefrac = FRACUNIT+1;
+
+    P_PathTraverse ( leadx, leady, leadx+mo->momx, leady+mo->momy,
+                     PT_ADDLINES, PTR_SlideTraverse );
+    P_PathTraverse ( trailx, leady, trailx+mo->momx, leady+mo->momy,
+                     PT_ADDLINES, PTR_SlideTraverse );
+    P_PathTraverse ( leadx, traily, leadx+mo->momx, traily+mo->momy,
+                     PT_ADDLINES, PTR_SlideTraverse );
+    
+    // move up to the wall
+    if (bestslidefrac == FRACUNIT+1)
+    {
+        // the move most have hit the middle, so stairstep
+stairstep:
+        if (!P_TryMove (mo, mo->x, mo->y + mo->momy))
+            P_TryMove (mo, mo->x + mo->momx, mo->y);
+        return;
+    }
+
+    // fudge a bit to make sure it doesn't hit
+    bestslidefrac -= 0x800;
+    if (bestslidefrac > 0)
+    {
+        newx = FixedMul (mo->momx, bestslidefrac);
+        newy = FixedMul (mo->momy, bestslidefrac);
+
+        if (!P_TryMove (mo, mo->x+newx, mo->y+newy))
+            goto stairstep;
+    }
+    
+    // Now continue along the wall.
+    // First calculate remainder.
+    bestslidefrac = FRACUNIT-(bestslidefrac+0x800);
+
+    if (bestslidefrac > FRACUNIT)
+        bestslidefrac = FRACUNIT;
+
+    if (bestslidefrac <= 0)
+        return;
+
+    tmxmove = FixedMul (mo->momx, bestslidefrac);
+    tmymove = FixedMul (mo->momy, bestslidefrac);
+
+    P_HitSlideLine (bestslideline); // clip the moves
+
+    mo->momx = tmxmove;
+    mo->momy = tmymove;
+
+    if (!P_TryMove (mo, mo->x+tmxmove, mo->y+tmymove))
+    {
+        goto retry;
+    }
+}
+
+
+//
+// P_LineAttack
+//
+mobj_t*		linetarget;	// who got hit (or NULL)
+mobj_t*		shootthing;
+
+// Height if not aiming up or down
+// ???: use slope for monsters?
+fixed_t		shootz;	
+
+int		la_damage;
+fixed_t		attackrange;
+
+fixed_t		aimslope;
+
+
+//
+// PTR_AimTraverse
+// Sets linetaget and aimslope when a target is aimed at.
+//
+// [STRIFE] Verified unmodified
+//
+boolean
+PTR_AimTraverse (intercept_t* in)
+{
+    line_t*     li;
+    mobj_t*     th;
+    fixed_t     slope;
+    fixed_t     thingtopslope;
+    fixed_t     thingbottomslope;
+    fixed_t     dist;
+
+    if (in->isaline)
+    {
+        li = in->d.line;
+
+        if ( !(li->flags & ML_TWOSIDED) )
+            return false;       // stop
+
+        // Crosses a two sided line.
+        // A two sided line will restrict
+        // the possible target ranges.
+        P_LineOpening (li);
+
+        if (openbottom >= opentop)
+            return false;       // stop
+
+        dist = FixedMul (attackrange, in->frac);
+
+        // Return false if there is no back sector.  This should never
+        // be the case if the line is two-sided; however, some WADs
+        // (eg. ottawau.wad) use this as an "impassible glass" trick
+        // and rely on Vanilla Doom's (unintentional) support for this.
+
+        if (li->backsector == NULL)
+        {
+            return false;
+        }
+
+        if (li->frontsector->floorheight != li->backsector->floorheight)
+        {
+            slope = FixedDiv (openbottom - shootz , dist);
+            if (slope > bottomslope)
+                bottomslope = slope;
+        }
+
+        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+            slope = FixedDiv (opentop - shootz , dist);
+            if (slope < topslope)
+                topslope = slope;
+        }
+
+        if (topslope <= bottomslope)
+            return false;       // stop
+
+        return true;            // shot continues
+    }
+
+    // shoot a thing
+    th = in->d.thing;
+    if (th == shootthing)
+        return true;            // can't shoot self
+
+    if (!(th->flags&MF_SHOOTABLE))
+        return true;            // corpse or something
+
+    // check angles to see if the thing can be aimed at
+    dist = FixedMul (attackrange, in->frac);
+    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
+
+    if (thingtopslope < bottomslope)
+        return true;            // shot over the thing
+
+    thingbottomslope = FixedDiv (th->z - shootz, dist);
+
+    if (thingbottomslope > topslope)
+        return true;            // shot under the thing
+
+    // this thing can be hit!
+    if (thingtopslope > topslope)
+        thingtopslope = topslope;
+
+    if (thingbottomslope < bottomslope)
+        thingbottomslope = bottomslope;
+
+    aimslope = (thingtopslope+thingbottomslope)/2;
+    linetarget = th;
+
+    return false;               // don't go any farther
+}
+
+
+//
+// PTR_ShootTraverse
+//
+// [STRIFE] Changes for Spectres and Mauler puff/damage inflictor
+//
+boolean PTR_ShootTraverse (intercept_t* in)
+{
+    fixed_t             x;
+    fixed_t             y;
+    fixed_t             z;
+    fixed_t             frac;
+
+    line_t*             li;
+
+    mobj_t*             th;
+    mobj_t*             th2;    // villsa [STRIFE]
+
+    fixed_t             slope;
+    fixed_t             dist;
+    fixed_t             thingtopslope;
+    fixed_t             thingbottomslope;
+
+    if (in->isaline)
+    {
+        li = in->d.line;
+
+        if (li->special)
+            P_ShootSpecialLine (shootthing, li);
+
+        if ( !(li->flags & ML_TWOSIDED) )
+            goto hitline;
+
+        // crosses a two sided line
+        P_LineOpening (li);
+
+        dist = FixedMul (attackrange, in->frac);
+
+        // Check if backsector is NULL.  See comment in PTR_AimTraverse.
+
+        if (li->backsector == NULL)
+        {
+            goto hitline;
+        }
+
+        if (li->frontsector->floorheight != li->backsector->floorheight)
+        {
+            slope = FixedDiv (openbottom - shootz , dist);
+            if (slope > aimslope)
+                goto hitline;
+        }
+
+        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+            slope = FixedDiv (opentop - shootz , dist);
+            if (slope < aimslope)
+                goto hitline;
+        }
+
+        // shot continues
+        return true;
+
+
+        // hit line
+hitline:
+        // position a bit closer
+        frac = in->frac - FixedDiv (4*FRACUNIT,attackrange);
+        x = trace.x + FixedMul (trace.dx, frac);
+        y = trace.y + FixedMul (trace.dy, frac);
+        z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
+
+        if (li->frontsector->ceilingpic == skyflatnum)
+        {
+            // don't shoot the sky!
+            if (z > li->frontsector->ceilingheight)
+                return false;
+
+            // it's a sky hack wall
+            if	(li->backsector && li->backsector->ceilingpic == skyflatnum)
+                return false;
+        }
+
+        // villsa [STRIFE]
+        if(la_damage > 0)
+        {
+            // villsa [STRIFE] Test against Mauler attack range
+            if(attackrange != 2112*FRACUNIT)
+                P_SpawnPuff(x, y, z); // Spawn bullet puffs.
+            else
+                P_SpawnMobj(x, y, z, MT_STRIFEPUFF3);
+        }
+        
+        // don't go any farther
+        return false;	
+    }
+
+    // shoot a thing
+    th = in->d.thing;
+    if (th == shootthing)
+        return true;        // can't shoot self
+
+    if (!(th->flags&MF_SHOOTABLE))
+        return true;        // corpse or something
+
+    // haleyjd 09/18/10: [STRIFE] Corrected - not MVIS, but SPECTRAL.
+    if(th->flags & MF_SPECTRAL)
+        return true;        // is a spectral entity
+
+    // check angles to see if the thing can be aimed at
+    dist = FixedMul (attackrange, in->frac);
+    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
+
+    if (thingtopslope < aimslope)
+        return true;        // shot over the thing
+
+    thingbottomslope = FixedDiv (th->z - shootz, dist);
+
+    if (thingbottomslope > aimslope)
+        return true;        // shot under the thing
+
+    // hit thing
+    // position a bit closer
+    frac = in->frac - FixedDiv (10*FRACUNIT,attackrange);
+
+    x = trace.x + FixedMul (trace.dx, frac);
+    y = trace.y + FixedMul (trace.dy, frac);
+    z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
+
+    // villsa [STRIFE] Check for Mauler attack range
+    if(attackrange == 2112*FRACUNIT)
+    {
+        th2 = P_SpawnMobj(x, y, z, MT_STRIFEPUFF3);
+        th2->momz = -FRACUNIT;
+        P_DamageMobj(th, th2, shootthing, la_damage);
+        return false;
+    }
+
+    // villsa [STRIFE] disabled check for damage
+    //if (la_damage)
+    P_DamageMobj (th, shootthing, shootthing, la_damage);
+
+    // Spawn bullet puffs or blod spots,
+    // depending on target type.
+    if (in->d.thing->flags & MF_NOBLOOD)
+        P_SpawnSparkPuff(x, y, z);  // villsa [STRIFE] call spark puff function instead
+    else
+        P_SpawnBlood (x,y,z, la_damage);
+
+    // don't go any farther
+    return false;
+
+}
+
+
+//
+// P_AimLineAttack
+//
+// [STRIFE] Modified to support player->pitch
+//
+fixed_t
+P_AimLineAttack
+( mobj_t*	t1,
+  angle_t	angle,
+  fixed_t	distance )
+{
+    fixed_t     x2;
+    fixed_t     y2;
+
+    t1 = P_SubstNullMobj(t1);
+
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    
+    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
+    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
+    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
+
+    // can't shoot outside view angles
+    topslope = 100*FRACUNIT/160;	
+    bottomslope = -100*FRACUNIT/160;
+    
+    attackrange = distance;
+    linetarget = NULL;
+
+    P_PathTraverse ( t1->x, t1->y,
+                     x2, y2,
+                     PT_ADDLINES|PT_ADDTHINGS,
+                     PTR_AimTraverse );
+
+    if (linetarget)
+        return aimslope;
+    else    // villsa [STRIFE] checks for player pitch
+    {
+        if(t1->player)
+            return (t1->player->pitch << FRACBITS) / 160;
+    }
+
+    return 0;
+}
+ 
+
+//
+// P_LineAttack
+// If damage == 0, it is just a test trace
+// that will leave linetarget set.
+//
+// [STRIFE] Modified to check lines only if damage <= 0 (see P_RadiusAttack)
+//
+void
+P_LineAttack
+( mobj_t*       t1,
+  angle_t       angle,
+  fixed_t       distance,
+  fixed_t       slope,
+  int	        damage )
+{
+    fixed_t     x2;
+    fixed_t     y2;
+    int         traverseflags;
+
+    angle >>= ANGLETOFINESHIFT;
+    shootthing = t1;
+    la_damage = damage;
+    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
+    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
+    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
+    attackrange = distance;
+    aimslope = slope;
+
+    // villsa [STRIFE] test lines only if damage is <= 0
+    if(damage >= 1)
+        traverseflags = (PT_ADDLINES|PT_ADDTHINGS);
+    else
+        traverseflags = PT_ADDLINES;
+
+    P_PathTraverse(t1->x, t1->y,
+                   x2, y2,
+                   traverseflags,
+                   PTR_ShootTraverse);
+}
+ 
+
+
+//
+// USE LINES
+//
+// [STRIFE] Verified unmodified
+//
+mobj_t*     usething;
+
+boolean PTR_UseTraverse (intercept_t* in)
+{
+    int     side;
+
+    if (!in->d.line->special)
+    {
+        P_LineOpening (in->d.line);
+        if (openrange <= 0)
+        {
+            S_StartSound (usething, sfx_noway);
+
+            // can't use through a wall
+            return false;
+        }
+        // not a special line, but keep checking
+        return true ;
+    }
+
+    side = 0;
+    if (P_PointOnLineSide (usething->x, usething->y, in->d.line) == 1)
+        side = 1;
+
+    //  return false;       // don't use back side
+
+    P_UseSpecialLine (usething, in->d.line, side);
+
+    // can't use for than one special line in a row
+    return false;
+}
+
+
+//
+// P_UseLines
+// Looks for special lines in front of the player to activate.
+//
+// [STRIFE] Verified unmodified
+//
+void P_UseLines (player_t*	player)
+{
+    int     angle;
+    fixed_t x1;
+    fixed_t y1;
+    fixed_t x2;
+    fixed_t y2;
+
+    usething = player->mo;
+
+    angle = player->mo->angle >> ANGLETOFINESHIFT;
+
+    x1 = player->mo->x;
+    y1 = player->mo->y;
+    x2 = x1 + (USERANGE>>FRACBITS)*finecosine[angle];
+    y2 = y1 + (USERANGE>>FRACBITS)*finesine[angle];
+
+    P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse );
+}
+
+
+//
+// RADIUS ATTACK
+//
+mobj_t*     bombsource;
+mobj_t*     bombspot;
+int         bombdamage;
+
+
+//
+// PIT_RadiusAttack
+// "bombsource" is the creature
+// that caused the explosion at "bombspot".
+//
+// [STRIFE] Modified for Spectral and Inquisitor exclusions
+//
+boolean PIT_RadiusAttack (mobj_t* thing)
+{
+    fixed_t dx;
+    fixed_t dy;
+    fixed_t dist;
+
+    if (!(thing->flags & MF_SHOOTABLE))
+        return true;
+
+    // haleyjd 10/04/10: Spectrals are not damaged by blast radii
+    if(thing->flags & MF_SPECTRAL)
+        return true;
+
+    // Boss spider and cyborg
+    // take no damage from concussion.
+    // villsa [STRIFE] unused
+    // - haleyjd: INQUISITOR
+
+    if(thing->type == MT_INQUISITOR)
+        return true;
+
+    dx = abs(thing->x - bombspot->x);
+    dy = abs(thing->y - bombspot->y);
+
+    dist = dx>dy ? dx : dy;
+    dist = (dist - thing->radius) >> FRACBITS;
+
+    if (dist < 0)
+        dist = 0;
+
+    if (dist >= bombdamage)
+        return true;        // out of range
+
+    if ( P_CheckSight (thing, bombspot) )
+    {
+        // must be in direct path
+        P_DamageMobj (thing, bombspot, bombsource, bombdamage - dist);
+    }
+
+    return true;
+}
+
+
+//
+// P_RadiusAttack
+// Source is the creature that caused the explosion at spot.
+//
+// [STRIFE] Modified to emit "test" tracers which can shatter glass screens
+//          and windows.
+//
+void
+P_RadiusAttack
+( mobj_t*       spot,
+  mobj_t*       source,
+  int           damage )
+{
+    int         x;
+    int         y;
+    
+    int         xl;
+    int         xh;
+    int         yl;
+    int         yh;
+    
+    fixed_t     dist;
+
+    dist = (damage+MAXRADIUS)<<FRACBITS;
+    yh = (spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
+    yl = (spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
+    xh = (spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
+    xl = (spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
+    bombspot = spot;
+    bombsource = source;
+    bombdamage = damage;
+
+    for (y=yl ; y<=yh ; y++)
+        for (x=xl ; x<=xh ; x++)
+            P_BlockThingsIterator (x, y, PIT_RadiusAttack );
+
+    // villsa [STRIFE] Send out 0 damage tracers to shatter nearby glass.
+    spot->z += 32*FRACUNIT;
+    P_LineAttack(spot, 0,      dist, 1, 0);
+    P_LineAttack(spot, ANG90,  dist, 1, 0);
+    P_LineAttack(spot, ANG180, dist, 1, 0);
+    P_LineAttack(spot, ANG270, dist, 1, 0);
+    spot->z -= 32*FRACUNIT;
+}
+
+
+
+//
+// SECTOR HEIGHT CHANGING
+// After modifying a sectors floor or ceiling height,
+// call this routine to adjust the positions
+// of all things that touch the sector.
+//
+// If anything doesn't fit anymore, true will be returned.
+// If crunch is true, they will take damage
+//  as they are being crushed.
+// If Crunch is false, you should set the sector height back
+//  the way it was and call P_ChangeSector again
+//  to undo the changes.
+//
+boolean		crushchange;
+boolean		nofit;
+
+
+//
+// PIT_ChangeSector
+//
+// [STRIFE] Changes to crushing behavior
+//
+boolean PIT_ChangeSector (mobj_t*   thing)
+{
+    mobj_t*	mo;
+
+    if (P_ThingHeightClip (thing))
+    {
+        // keep checking
+        return true;
+    }
+
+    // crunch bodies to giblets
+    if (thing->health <= 0)
+    {
+        // villsa [STRIFE] do something with the player
+        if(thing->player && thing->subsector->sector->specialdata)
+        {
+            nofit = true;
+            return false;
+        }
+        //P_SetMobjState (thing, S_GIBS);   // villsa [STRIFE] unused
+
+        A_BodyParts(thing); // villsa [STRIFE] spit out meat/junk stuff
+        thing->flags &= ~MF_SOLID;
+        thing->height = 0;
+        thing->radius = 0;
+
+        // keep checking
+        return true;
+    }
+
+    // crunch dropped items
+    if (thing->flags & MF_DROPPED)
+    {
+        P_RemoveMobj (thing);
+
+        // keep checking
+        return true;
+    }
+
+    if (! (thing->flags & MF_SHOOTABLE) )
+    {
+        // assume it is bloody gibs or something
+        return true;
+    }
+    
+    nofit = true;
+
+    if (crushchange && !(leveltime&3) )
+    {
+        int t;
+        S_StartSound(thing, sfx_pcrush);   // villsa [STRIFE]
+        P_DamageMobj(thing,NULL,NULL,10);
+
+        // spray blood in a random direction
+        mo = P_SpawnMobj (thing->x,
+                          thing->y,
+                          thing->z + thing->height/2, MT_BLOOD_DEATH);
+
+        t = P_Random();
+        mo->momx = (t - P_Random ()) << 12;
+        t = P_Random();
+        mo->momy = (t - P_Random ()) << 12;
+    }
+
+    // keep checking (crush other things)
+    return true;
+}
+
+
+
+//
+// P_ChangeSector
+//
+// [STRIFE] Verified unmodified
+//
+boolean
+P_ChangeSector
+( sector_t* sector,
+  boolean   crunch )
+{
+    int     x;
+    int     y;
+
+    nofit = false;
+    crushchange = crunch;
+
+    // re-check heights for all things near the moving sector
+    for (x=sector->blockbox[BOXLEFT] ; x<= sector->blockbox[BOXRIGHT] ; x++)
+        for (y=sector->blockbox[BOXBOTTOM];y<= sector->blockbox[BOXTOP] ; y++)
+            P_BlockThingsIterator (x, y, PIT_ChangeSector);
+
+    return nofit;
+}
+
+// Code to emulate the behavior of Vanilla Doom when encountering an overrun
+// of the spechit array.  This is by Andrey Budko (e6y) and comes from his
+// PrBoom plus port.  A big thanks to Andrey for this.
+
+static void SpechitOverrun(line_t *ld)
+{
+    static unsigned int baseaddr = 0;
+    unsigned int addr;
+   
+    if (baseaddr == 0)
+    {
+        int p;
+
+        // This is the first time we have had an overrun.  Work out
+        // what base address we are going to use.
+        // Allow a spechit value to be specified on the command line.
+
+        //!
+        // @category compat
+        // @arg <n>
+        //
+        // Use the specified magic value when emulating spechit overruns.
+        //
+
+        p = M_CheckParmWithArgs("-spechit", 1);
+        
+        if (p > 0)
+        {
+            M_StrToInt(myargv[p+1], (int *) &baseaddr);
+        }
+        else
+        {
+            baseaddr = DEFAULT_SPECHIT_MAGIC;
+        }
+    }
+    
+    // Calculate address used in doom2.exe
+
+    addr = baseaddr + (ld - lines) * 0x3E;
+
+    switch(numspechit)
+    {
+        case 9: 
+        case 10:
+        case 11:
+        case 12:
+            tmbbox[numspechit-9] = addr;
+            break;
+        case 13: 
+            nofit = addr; // haleyjd 20110204: nofit/crushchange are in opposite 
+            break;        // order in the Strife binary.
+        case 14: 
+            crushchange = addr; 
+            break;
+        default:
+            fprintf(stderr, "SpechitOverrun: Warning: unable to emulate"
+                            "an overrun where numspechit=%i\n",
+                            numspechit);
+            break;
+    }
+}
+
diff --git a/games/NXDoom/src/strife/p_maputl.c b/games/NXDoom/src/strife/p_maputl.c
new file mode 100644
index 000000000..78ae34712
--- /dev/null
+++ b/games/NXDoom/src/strife/p_maputl.c
@@ -0,0 +1,1056 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+// Copyright(C) 2005, 2006 Andrey Budko
+//
+// 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.
+//
+// DESCRIPTION:
+//	Movement/collision utility functions,
+//	as used by function in p_map.c. 
+//	BLOCKMAP Iterator functions,
+//	and some PIT_* functions to use for iteration.
+//
+
+
+
+#include <stdlib.h>
+
+
+#include "m_bbox.h"
+#include "m_misc.h"
+
+#include "doomdef.h"
+#include "doomstat.h"
+#include "p_local.h"
+
+
+// State.
+#include "r_state.h"
+
+//
+// P_AproxDistance
+// Gives an estimation of distance (not exact)
+//
+// [STRIFE] Verified unmodified
+//
+fixed_t
+P_AproxDistance
+( fixed_t	dx,
+  fixed_t	dy )
+{
+    dx = abs(dx);
+    dy = abs(dy);
+    if (dx < dy)
+        return dx+dy-(dx>>1);
+    return dx+dy-(dy>>1);
+}
+
+
+//
+// P_PointOnLineSide
+// Returns 0 or 1
+//
+// [STRIFE] Verified unmodified
+//
+int
+P_PointOnLineSide
+( fixed_t	x,
+  fixed_t	y,
+  line_t*	line )
+{
+    fixed_t dx;
+    fixed_t dy;
+    fixed_t left;
+    fixed_t right;
+
+    if (!line->dx)
+    {
+        if (x <= line->v1->x)
+            return line->dy > 0;
+
+        return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+        if (y <= line->v1->y)
+            return line->dx < 0;
+
+        return line->dx > 0;
+    }
+
+    dx = (x - line->v1->x);
+    dy = (y - line->v1->y);
+
+    left = FixedMul ( line->dy>>FRACBITS , dx );
+    right = FixedMul ( dy , line->dx>>FRACBITS );
+
+    if (right < left)
+        return 0;       // front side
+    return 1;           // back side
+}
+
+
+
+//
+// P_BoxOnLineSide
+// Considers the line to be infinite
+// Returns side 0 or 1, -1 if box crosses the line.
+//
+// [STRIFE] Verified unmodified
+//
+int
+P_BoxOnLineSide
+( fixed_t*  tmbox,
+  line_t*   ld )
+{
+    int     p1 = 0;
+    int     p2 = 0;
+
+    switch (ld->slopetype)
+    {
+    case ST_HORIZONTAL:
+        p1 = tmbox[BOXTOP] > ld->v1->y;
+        p2 = tmbox[BOXBOTTOM] > ld->v1->y;
+        if (ld->dx < 0)
+        {
+            p1 ^= 1;
+            p2 ^= 1;
+        }
+        break;
+
+    case ST_VERTICAL:
+        p1 = tmbox[BOXRIGHT] < ld->v1->x;
+        p2 = tmbox[BOXLEFT] < ld->v1->x;
+        if (ld->dy < 0)
+        {
+            p1 ^= 1;
+            p2 ^= 1;
+        }
+        break;
+
+    case ST_POSITIVE:
+        p1 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXTOP], ld);
+        p2 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
+        break;
+
+    case ST_NEGATIVE:
+        p1 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
+        p2 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
+        break;
+    }
+
+    if (p1 == p2)
+        return p1;
+    return -1;
+}
+
+
+//
+// P_PointOnDivlineSide
+// Returns 0 or 1.
+//
+// [STRIFE] Verified unmodified
+//
+int
+P_PointOnDivlineSide
+( fixed_t       x,
+  fixed_t       y,
+  divline_t*    line )
+{
+    fixed_t dx;
+    fixed_t dy;
+    fixed_t left;
+    fixed_t right;
+
+    if (!line->dx)
+    {
+        if (x <= line->x)
+            return line->dy > 0;
+
+        return line->dy < 0;
+    }
+    if (!line->dy)
+    {
+        if (y <= line->y)
+            return line->dx < 0;
+
+        return line->dx > 0;
+    }
+
+    dx = (x - line->x);
+    dy = (y - line->y);
+
+    // try to quickly decide by looking at sign bits
+    if ( (line->dy ^ line->dx ^ dx ^ dy)&0x80000000 )
+    {
+        if ( (line->dy ^ dx) & 0x80000000 )
+            return 1;		// (left is negative)
+        return 0;
+    }
+
+    left = FixedMul ( line->dy>>8, dx>>8 );
+    right = FixedMul ( dy>>8 , line->dx>>8 );
+
+    if (right < left)
+        return 0;		// front side
+    return 1;			// back side
+}
+
+
+
+//
+// P_MakeDivline
+//
+void
+P_MakeDivline
+( line_t*	li,
+  divline_t*	dl )
+{
+    dl->x = li->v1->x;
+    dl->y = li->v1->y;
+    dl->dx = li->dx;
+    dl->dy = li->dy;
+}
+
+
+
+//
+// P_InterceptVector
+// Returns the fractional intercept point
+// along the first divline.
+// This is only called by the addthings
+// and addlines traversers.
+//
+// [STRIFE] Verified unmodified
+//
+fixed_t
+P_InterceptVector
+( divline_t*    v2,
+  divline_t*    v1 )
+{
+#if 1
+    fixed_t frac;
+    fixed_t num;
+    fixed_t den;
+
+    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
+
+    if (den == 0)
+        return 0;
+    //  I_Error ("P_InterceptVector: parallel");
+
+    num =
+        FixedMul ( (v1->x - v2->x)>>8 ,v1->dy )
+        +FixedMul ( (v2->y - v1->y)>>8, v1->dx );
+
+    frac = FixedDiv (num , den);
+
+    return frac;
+#else	// UNUSED, float debug.
+    float	frac;
+    float	num;
+    float	den;
+    float	v1x;
+    float	v1y;
+    float	v1dx;
+    float	v1dy;
+    float	v2x;
+    float	v2y;
+    float	v2dx;
+    float	v2dy;
+
+    v1x = (float)v1->x/FRACUNIT;
+    v1y = (float)v1->y/FRACUNIT;
+    v1dx = (float)v1->dx/FRACUNIT;
+    v1dy = (float)v1->dy/FRACUNIT;
+    v2x = (float)v2->x/FRACUNIT;
+    v2y = (float)v2->y/FRACUNIT;
+    v2dx = (float)v2->dx/FRACUNIT;
+    v2dy = (float)v2->dy/FRACUNIT;
+	
+    den = v1dy*v2dx - v1dx*v2dy;
+
+    if (den == 0)
+	return 0;	// parallel
+    
+    num = (v1x - v2x)*v1dy + (v2y - v1y)*v1dx;
+    frac = num / den;
+
+    return frac*FRACUNIT;
+#endif
+}
+
+
+//
+// P_LineOpening
+// Sets opentop and openbottom to the window
+// through a two sided line.
+// OPTIMIZE: keep this precalculated
+//
+// [STRIFE] Verified unmodified
+//
+fixed_t opentop;
+fixed_t openbottom;
+fixed_t openrange;
+fixed_t	lowfloor;
+
+
+void P_LineOpening (line_t* linedef)
+{
+    sector_t*   front;
+    sector_t*   back;
+
+    if (linedef->sidenum[1] == -1)
+    {
+        // single sided line
+        openrange = 0;
+        return;
+    }
+
+    front = linedef->frontsector;
+    back = linedef->backsector;
+
+    if (front->ceilingheight < back->ceilingheight)
+        opentop = front->ceilingheight;
+    else
+        opentop = back->ceilingheight;
+
+    if (front->floorheight > back->floorheight)
+    {
+        openbottom = front->floorheight;
+        lowfloor = back->floorheight;
+    }
+    else
+    {
+        openbottom = back->floorheight;
+        lowfloor = front->floorheight;
+    }
+
+    openrange = opentop - openbottom;
+}
+
+
+//
+// THING POSITION SETTING
+//
+
+
+//
+// P_UnsetThingPosition
+// Unlinks a thing from block map and sectors.
+// On each position change, BLOCKMAP and other
+// lookups maintaining lists ot things inside
+// these structures need to be updated.
+//
+// [STRIFE] Verified unmodified
+//
+void P_UnsetThingPosition (mobj_t* thing)
+{
+    int     blockx;
+    int     blocky;
+
+    if ( ! (thing->flags & MF_NOSECTOR) )
+    {
+        // inert things don't need to be in blockmap?
+        // unlink from subsector
+        if (thing->snext)
+            thing->snext->sprev = thing->sprev;
+
+        if (thing->sprev)
+            thing->sprev->snext = thing->snext;
+        else
+            thing->subsector->sector->thinglist = thing->snext;
+    }
+
+    if ( ! (thing->flags & MF_NOBLOCKMAP) )
+    {
+        // inert things don't need to be in blockmap
+        // unlink from block map
+        if (thing->bnext)
+            thing->bnext->bprev = thing->bprev;
+
+        if (thing->bprev)
+            thing->bprev->bnext = thing->bnext;
+        else
+        {
+            blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
+            blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
+
+            if (blockx>=0 && blockx < bmapwidth
+                && blocky>=0 && blocky <bmapheight)
+            {
+                blocklinks[blocky*bmapwidth+blockx] = thing->bnext;
+            }
+        }
+    }
+}
+
+
+//
+// P_SetThingPosition
+// Links a thing into both a block and a subsector
+// based on it's x y.
+// Sets thing->subsector properly
+//
+// [STRIFE] Verified unmodified
+//
+void
+P_SetThingPosition (mobj_t* thing)
+{
+    subsector_t*    ss;
+    sector_t*       sec;
+    int             blockx;
+    int             blocky;
+    mobj_t**        link;
+
+
+    // link into subsector
+    ss = R_PointInSubsector (thing->x,thing->y);
+    thing->subsector = ss;
+
+    if ( ! (thing->flags & MF_NOSECTOR) )
+    {
+        // invisible things don't go into the sector links
+        sec = ss->sector;
+
+        thing->sprev = NULL;
+        thing->snext = sec->thinglist;
+
+        if (sec->thinglist)
+            sec->thinglist->sprev = thing;
+
+        sec->thinglist = thing;
+    }
+
+
+    // link into blockmap
+    if ( ! (thing->flags & MF_NOBLOCKMAP) )
+    {
+        // inert things don't need to be in blockmap
+        blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
+        blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
+
+        if (blockx>=0
+            && blockx < bmapwidth
+            && blocky>=0
+            && blocky < bmapheight)
+        {
+            link = &blocklinks[blocky*bmapwidth+blockx];
+            thing->bprev = NULL;
+            thing->bnext = *link;
+            if (*link)
+                (*link)->bprev = thing;
+
+            *link = thing;
+        }
+        else
+        {
+            // thing is off the map
+            thing->bnext = thing->bprev = NULL;
+        }
+    }
+}
+
+
+
+//
+// BLOCK MAP ITERATORS
+// For each line/thing in the given mapblock,
+// call the passed PIT_* function.
+// If the function returns false,
+// exit with false without checking anything else.
+//
+
+
+//
+// P_BlockLinesIterator
+// The validcount flags are used to avoid checking lines
+// that are marked in multiple mapblocks,
+// so increment validcount before the first call
+// to P_BlockLinesIterator, then make one or more calls
+// to it.
+//
+// haleyjd 20110203:
+// [STRIFE] Modified to track blockingline
+//
+boolean
+P_BlockLinesIterator
+( int           x,
+  int           y,
+  boolean(*func)(line_t*) )
+{
+    int         offset;
+    short*      list;
+    line_t*     ld;
+
+    if (x<0
+     || y<0
+     || x>=bmapwidth
+     || y>=bmapheight)
+    {
+        return true;
+    }
+    
+    offset = y*bmapwidth+x;
+
+    offset = *(blockmap+offset);
+
+    for ( list = blockmaplump+offset ; *list != -1 ; list++)
+    {
+        ld = &lines[*list];
+
+        // [STRIFE]: set blockingline (see P_XYMovement @ p_mobj.c)
+        blockingline = ld;
+
+        if (ld->validcount == validcount)
+            continue; 	// line has already been checked
+
+        ld->validcount = validcount;
+
+        if ( !func(ld) )
+            return false;
+    }
+    return true;	// everything was checked
+}
+
+
+//
+// P_BlockThingsIterator
+//
+// [STRIFE] Verified unmodified
+//
+boolean
+P_BlockThingsIterator
+( int           x,
+  int           y,
+  boolean(*func)(mobj_t*) )
+{
+    mobj_t*     mobj;
+
+    if ( x<0
+      || y<0
+      || x>=bmapwidth
+      || y>=bmapheight)
+    {
+        return true;
+    }
+
+    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
+
+    for (mobj = blocklinks[y*bmapwidth+x] ;
+         mobj ;
+         mobj = mobj->bnext)
+    {
+        if (!func( mobj ) )
+            return false;
+    }
+    return true;
+}
+
+
+
+//
+// INTERCEPT ROUTINES
+//
+intercept_t	intercepts[MAXINTERCEPTS];
+intercept_t*	intercept_p;
+
+divline_t 	trace;
+boolean 	earlyout;
+int		ptflags;
+
+//static void InterceptsOverrun(int num_intercepts, intercept_t *intercept);
+
+//
+// PIT_AddLineIntercepts.
+// Looks for lines in the given block
+// that intercept the given trace
+// to add to the intercepts list.
+//
+// A line is crossed if its endpoints
+// are on opposite sides of the trace.
+// Returns true if earlyout and a solid line hit.
+//
+// haleyjd 20110204 [STRIFE]: Added Rogue's fix for intercepts overflows
+//
+boolean
+PIT_AddLineIntercepts (line_t* ld)
+{
+    int         s1;
+    int         s2;
+    fixed_t     frac;
+    divline_t   dl;
+
+    // avoid precision problems with two routines
+    if ( trace.dx > FRACUNIT*16
+      || trace.dy > FRACUNIT*16
+      || trace.dx < -FRACUNIT*16
+      || trace.dy < -FRACUNIT*16)
+    {
+        s1 = P_PointOnDivlineSide (ld->v1->x, ld->v1->y, &trace);
+        s2 = P_PointOnDivlineSide (ld->v2->x, ld->v2->y, &trace);
+    }
+    else
+    {
+        s1 = P_PointOnLineSide (trace.x, trace.y, ld);
+        s2 = P_PointOnLineSide (trace.x+trace.dx, trace.y+trace.dy, ld);
+    }
+
+    if (s1 == s2)
+        return true;    // line isn't crossed
+
+    // hit the line
+    P_MakeDivline (ld, &dl);
+    frac = P_InterceptVector (&trace, &dl);
+
+    if (frac < 0)
+        return true;    // behind source
+
+    // try to early out the check
+    if (earlyout
+        && frac < FRACUNIT
+        && !ld->backsector)
+    {
+        return false;   // stop checking
+    }
+
+
+    intercept_p->frac = frac;
+    intercept_p->isaline = true;
+    intercept_p->d.line = ld;
+    intercept_p++;
+
+    // haleyjd 20110204 [STRIFE]
+    // Evidently Rogue had trouble with intercepts overflows during
+    // development, as they added this check here which will stop adding
+    // intercepts if the array would be overflown.
+    if(intercept_p <= &intercepts[MAXINTERCEPTS_ORIGINAL-2])
+        return true;    // continue
+    else
+        return false;
+
+    // [STRIFE] Not needed?
+    //InterceptsOverrun(intercept_p - intercepts, intercept_p);
+}
+
+
+
+//
+// PIT_AddThingIntercepts
+//
+boolean PIT_AddThingIntercepts (mobj_t* thing)
+{
+    fixed_t     x1;
+    fixed_t     y1;
+    fixed_t     x2;
+    fixed_t     y2;
+
+    int         s1;
+    int         s2;
+
+    boolean     tracepositive;
+
+    divline_t   dl;
+
+    fixed_t     frac;
+
+    tracepositive = (trace.dx ^ trace.dy)>0;
+
+    // check a corner to corner crossection for hit
+    if (tracepositive)
+    {
+        x1 = thing->x - thing->radius;
+        y1 = thing->y + thing->radius;
+
+        x2 = thing->x + thing->radius;
+        y2 = thing->y - thing->radius;
+    }
+    else
+    {
+        x1 = thing->x - thing->radius;
+        y1 = thing->y - thing->radius;
+
+        x2 = thing->x + thing->radius;
+        y2 = thing->y + thing->radius;
+    }
+
+    s1 = P_PointOnDivlineSide (x1, y1, &trace);
+    s2 = P_PointOnDivlineSide (x2, y2, &trace);
+
+    if (s1 == s2)
+        return true;        // line isn't crossed
+
+    dl.x = x1;
+    dl.y = y1;
+    dl.dx = x2-x1;
+    dl.dy = y2-y1;
+
+    frac = P_InterceptVector (&trace, &dl);
+
+    if (frac < 0)
+        return true;        // behind source
+
+    intercept_p->frac = frac;
+    intercept_p->isaline = false;
+    intercept_p->d.thing = thing;
+    
+    intercept_p++;
+    
+    // haleyjd 20110204 [STRIFE]: As above, protection against intercepts
+    // overflows, courtesy of Rogue Software.
+    if(intercept_p <= &intercepts[MAXINTERCEPTS_ORIGINAL-2])
+        return true;            // keep going
+    else
+        return false;
+
+    // haleyjd [STRIFE]: Not needed?
+    //InterceptsOverrun(intercept_p - intercepts, intercept_p);
+}
+
+
+//
+// P_TraverseIntercepts
+// Returns true if the traverser function returns true
+// for all lines.
+//
+// [STRIFE] Verified unmodified.
+// 
+boolean
+P_TraverseIntercepts
+( traverser_t	func,
+  fixed_t	maxfrac )
+{
+    int             count;
+    fixed_t         dist;
+    intercept_t*    scan;
+    intercept_t*    in;
+
+    count = intercept_p - intercepts;
+
+    in = 0;         // shut up compiler warning
+
+    while (count--)
+    {
+        dist = INT_MAX;
+        for (scan = intercepts ; scan<intercept_p ; scan++)
+        {
+            if (scan->frac < dist)
+            {
+                dist = scan->frac;
+                in = scan;
+            }
+        }
+
+        if (dist > maxfrac)
+            return true;    // checked everything in range
+
+#if 0  // UNUSED
+        {
+            // don't check these yet, there may be others inserted
+            in = scan = intercepts;
+            for ( scan = intercepts ; scan<intercept_p ; scan++)
+                if (scan->frac > maxfrac)
+                    *in++ = *scan;
+            intercept_p = in;
+            return false;
+        }
+#endif
+
+        if ( !func (in) )
+            return false;   // don't bother going farther
+
+        in->frac = INT_MAX;
+    }
+
+    return true;            // everything was traversed
+}
+
+
+#if 0
+// Intercepts Overrun emulation, from PrBoom-plus.
+// Thanks to Andrey Budko (entryway) for researching this and his 
+// implementation of Intercepts Overrun emulation in PrBoom-plus
+// which this is based on.
+
+typedef struct
+{
+    int len;
+    void *addr;
+    boolean int16_array;
+} intercepts_overrun_t;
+
+// Intercepts memory table.  This is where various variables are located
+// in memory in Vanilla Doom.  When the intercepts table overflows, we
+// need to write to them.
+//
+// Almost all of the values to overwrite are 32-bit integers, except for
+// playerstarts, which is effectively an array of 16-bit integers and
+// must be treated differently.
+
+// haleyjd 20110204: NB: This array has *not* been updated for Strife,
+// because Strife has protection against intercepts overflows. The memory
+// layout of the 1.2 and 1.31 EXEs is radically different with respect
+// to this area of the BSS segment, so it would have to be redone entirely
+// if it were needed.
+
+static intercepts_overrun_t intercepts_overrun[] =
+{
+    {4,   NULL,                          false},
+    {4,   NULL, /* &earlyout, */         false},
+    {4,   NULL, /* &intercept_p, */      false},
+    {4,   &lowfloor,                     false},
+    {4,   &openbottom,                   false},
+    {4,   &opentop,                      false},
+    {4,   &openrange,                    false},
+    {4,   NULL,                          false},
+    {120, NULL, /* &activeplats, */      false},
+    {8,   NULL,                          false},
+    {4,   &bulletslope,                  false},
+    {4,   NULL, /* &swingx, */           false},
+    {4,   NULL, /* &swingy, */           false},
+    {4,   NULL,                          false},
+    {40,  &playerstarts,                 true},
+    {4,   NULL, /* &blocklinks, */       false},
+    {4,   &bmapwidth,                    false},
+    {4,   NULL, /* &blockmap, */         false},
+    {4,   &bmaporgx,                     false},
+    {4,   &bmaporgy,                     false},
+    {4,   NULL, /* &blockmaplump, */     false},
+    {4,   &bmapheight,                   false},
+    {0,   NULL,                          false},
+};
+
+// Overwrite a specific memory location with a value.
+
+static void InterceptsMemoryOverrun(int location, int value)
+{
+    int i, offset;
+    int index;
+    void *addr;
+
+    i = 0;
+    offset = 0;
+
+    // Search down the array until we find the right entry
+
+    while (intercepts_overrun[i].len != 0)
+    {
+        if (offset + intercepts_overrun[i].len > location)
+        {
+            addr = intercepts_overrun[i].addr;
+
+            // Write the value to the memory location.
+            // 16-bit and 32-bit values are written differently.
+
+            if (addr != NULL)
+            {
+                if (intercepts_overrun[i].int16_array)
+                {
+                    index = (location - offset) / 2;
+                    ((short *) addr)[index] = value & 0xffff;
+                    ((short *) addr)[index + 1] = (value >> 16) & 0xffff;
+                }
+                else
+                {
+                    index = (location - offset) / 4;
+                    ((int *) addr)[index] = value;
+                }
+            }
+
+            break;
+        }
+
+        offset += intercepts_overrun[i].len;
+        ++i;
+    }
+}
+
+// Emulate overruns of the intercepts[] array.
+
+static void InterceptsOverrun(int num_intercepts, intercept_t *intercept)
+{
+    int location;
+
+    if (num_intercepts <= MAXINTERCEPTS_ORIGINAL)
+    {
+        // No overrun
+
+        return;
+    }
+
+    location = (num_intercepts - MAXINTERCEPTS_ORIGINAL - 1) * 12;
+
+    // Overwrite memory that is overwritten in Vanilla Doom, using
+    // the values from the intercept structure.
+    //
+    // Note: the ->d.{thing,line} member should really have its
+    // address translated into the correct address value for 
+    // Vanilla Doom.
+
+    InterceptsMemoryOverrun(location, intercept->frac);
+    InterceptsMemoryOverrun(location + 4, intercept->isaline);
+    InterceptsMemoryOverrun(location + 8, (int) intercept->d.thing);
+}
+#endif
+
+
+//
+// P_PathTraverse
+// Traces a line from x1,y1 to x2,y2,
+// calling the traverser function for each.
+// Returns true if the traverser function returns true
+// for all lines.
+//
+// [STRIFE] Verified unmodified
+//
+boolean
+P_PathTraverse
+( fixed_t       x1,
+  fixed_t       y1,
+  fixed_t       x2,
+  fixed_t       y2,
+  int           flags,
+  boolean (*trav) (intercept_t *))
+{
+    fixed_t xt1;
+    fixed_t yt1;
+    fixed_t xt2;
+    fixed_t yt2;
+    
+    fixed_t xstep;
+    fixed_t ystep;
+    
+    fixed_t partial;
+    
+    fixed_t xintercept;
+    fixed_t yintercept;
+    
+    int     mapx;
+    int     mapy;
+    
+    int     mapxstep;
+    int     mapystep;
+
+    int     count;
+
+    earlyout = (flags & PT_EARLYOUT) != 0;
+
+    validcount++;
+    intercept_p = intercepts;
+
+    if ( ((x1-bmaporgx)&(MAPBLOCKSIZE-1)) == 0)
+        x1 += FRACUNIT;	// don't side exactly on a line
+
+    if ( ((y1-bmaporgy)&(MAPBLOCKSIZE-1)) == 0)
+        y1 += FRACUNIT;	// don't side exactly on a line
+
+    trace.x = x1;
+    trace.y = y1;
+    trace.dx = x2 - x1;
+    trace.dy = y2 - y1;
+
+    x1 -= bmaporgx;
+    y1 -= bmaporgy;
+    xt1 = x1>>MAPBLOCKSHIFT;
+    yt1 = y1>>MAPBLOCKSHIFT;
+
+    x2 -= bmaporgx;
+    y2 -= bmaporgy;
+    xt2 = x2>>MAPBLOCKSHIFT;
+    yt2 = y2>>MAPBLOCKSHIFT;
+
+    if (xt2 > xt1)
+    {
+        mapxstep = 1;
+        partial = FRACUNIT - ((x1>>MAPBTOFRAC)&(FRACUNIT-1));
+        ystep = FixedDiv (y2-y1,abs(x2-x1));
+    }
+    else if (xt2 < xt1)
+    {
+        mapxstep = -1;
+        partial = (x1>>MAPBTOFRAC)&(FRACUNIT-1);
+        ystep = FixedDiv (y2-y1,abs(x2-x1));
+    }
+    else
+    {
+        mapxstep = 0;
+        partial = FRACUNIT;
+        ystep = 256*FRACUNIT;
+    }	
+
+    yintercept = (y1>>MAPBTOFRAC) + FixedMul (partial, ystep);
+
+
+    if (yt2 > yt1)
+    {
+        mapystep = 1;
+        partial = FRACUNIT - ((y1>>MAPBTOFRAC)&(FRACUNIT-1));
+        xstep = FixedDiv (x2-x1,abs(y2-y1));
+    }
+    else if (yt2 < yt1)
+    {
+        mapystep = -1;
+        partial = (y1>>MAPBTOFRAC)&(FRACUNIT-1);
+        xstep = FixedDiv (x2-x1,abs(y2-y1));
+    }
+    else
+    {
+        mapystep = 0;
+        partial = FRACUNIT;
+        xstep = 256*FRACUNIT;
+    }	
+    xintercept = (x1>>MAPBTOFRAC) + FixedMul (partial, xstep);
+
+    // Step through map blocks.
+    // Count is present to prevent a round off error
+    // from skipping the break.
+    mapx = xt1;
+    mapy = yt1;
+
+    for (count = 0 ; count < 64 ; count++)
+    {
+        if (flags & PT_ADDLINES)
+        {
+            if (!P_BlockLinesIterator (mapx, mapy,PIT_AddLineIntercepts))
+                return false;   // early out
+        }
+
+        if (flags & PT_ADDTHINGS)
+        {
+            if (!P_BlockThingsIterator (mapx, mapy,PIT_AddThingIntercepts))
+                return false;   // early out
+        }
+
+        if (mapx == xt2
+         && mapy == yt2)
+        {
+            break;
+        }
+
+        if ( (yintercept >> FRACBITS) == mapy)
+        {
+            yintercept += ystep;
+            mapx += mapxstep;
+        }
+        else if ( (xintercept >> FRACBITS) == mapx)
+        {
+            xintercept += xstep;
+            mapy += mapystep;
+        }
+
+    }
+    // go through the sorted list
+    return P_TraverseIntercepts ( trav, FRACUNIT );
+}
+
+
+
diff --git a/games/NXDoom/src/strife/p_mobj.c b/games/NXDoom/src/strife/p_mobj.c
new file mode 100644
index 000000000..038c3edbe
--- /dev/null
+++ b/games/NXDoom/src/strife/p_mobj.c
@@ -0,0 +1,1360 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Moving object handling. Spawn functions.
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_random.h"
+#include "doomdef.h"
+#include "p_local.h"
+#include "sounds.h"
+#include "st_stuff.h"
+#include "hu_stuff.h"
+#include "s_sound.h"
+#include "doomstat.h"
+#include "d_main.h"     // villsa [STRIFE]
+
+
+void G_PlayerReborn (int player);
+void P_SpawnMapThing (mapthing_t*	mthing);
+
+
+//
+// P_SetMobjState
+// Returns true if the mobj is still present.
+//
+// [STRIFE] Verified unmodified
+//
+int test;
+
+boolean
+P_SetMobjState
+( mobj_t*	mobj,
+  statenum_t	state )
+{
+    state_t*	st;
+
+    do
+    {
+	if (state == S_NULL)
+	{
+	    mobj->state = (state_t *) S_NULL;
+	    P_RemoveMobj (mobj);
+	    return false;
+	}
+
+	st = &states[state];
+	mobj->state = st;
+	mobj->tics = st->tics;
+	mobj->sprite = st->sprite;
+	mobj->frame = st->frame;
+
+	// Modified handling.
+	// Call action functions when the state is set
+	if (st->action.acp1)		
+	    st->action.acp1(mobj);	
+	
+	state = st->nextstate;
+    } while (!mobj->tics);
+				
+    return true;
+}
+
+
+//
+// P_ExplodeMissile
+//
+// [STRIFE] Removed randomization of deathstate tics
+//
+void P_ExplodeMissile (mobj_t* mo)
+{
+    mo->momx = mo->momy = mo->momz = 0;
+
+    P_SetMobjState (mo, mobjinfo[mo->type].deathstate);
+
+    // villsa [STRIFE] removed tics randomization
+
+    mo->flags &= ~MF_MISSILE;
+
+    if (mo->info->deathsound)
+        S_StartSound (mo, mo->info->deathsound);
+}
+
+
+//
+// P_XYMovement
+//
+// [STRIFE] Modifications for:
+// * No SKULLFLY logic (replaced by BOUNCE flag)
+// * Missiles can activate G1/GR line types
+// * Player walking logic
+// * Air friction for players
+//
+#define STOPSPEED       0x1000
+#define FRICTION        0xe800
+#define AIRFRICTION     0xfff0  // [STRIFE]
+
+void P_XYMovement (mobj_t* mo) 
+{
+    fixed_t     ptryx;
+    fixed_t     ptryy;
+    player_t*   player;
+    fixed_t     xmove;
+    fixed_t     ymove;
+
+    // villsa [STRIFE] unused
+    /*
+    if (!mo->momx && !mo->momy)
+    {
+        if (mo->flags & MF_SKULLFLY)
+        {
+            // the skull slammed into something
+            mo->flags &= ~MF_SKULLFLY;
+            mo->momx = mo->momy = mo->momz = 0;
+
+            P_SetMobjState (mo, mo->info->spawnstate);
+        }
+        return;
+    }
+    */
+
+    player = mo->player;
+
+    if (mo->momx > MAXMOVE)
+        mo->momx = MAXMOVE;
+    else if (mo->momx < -MAXMOVE)
+        mo->momx = -MAXMOVE;
+
+    if (mo->momy > MAXMOVE)
+        mo->momy = MAXMOVE;
+    else if (mo->momy < -MAXMOVE)
+        mo->momy = -MAXMOVE;
+
+    xmove = mo->momx;
+    ymove = mo->momy;
+
+    do
+    {
+        if (xmove > MAXMOVE/2 || ymove > MAXMOVE/2)
+        {
+            ptryx = mo->x + xmove/2;
+            ptryy = mo->y + ymove/2;
+            xmove >>= 1;
+            ymove >>= 1;
+        }
+        else
+        {
+            ptryx = mo->x + xmove;
+            ptryy = mo->y + ymove;
+            xmove = ymove = 0;
+        }
+
+        if (!P_TryMove (mo, ptryx, ptryy))
+        {
+            // blocked move
+            if (mo->player)
+            {   // try to slide along it
+                P_SlideMove (mo);
+            }
+            // villsa [STRIFE] check for bouncy missiles
+            else if(mo->flags & MF_BOUNCE)
+            {
+                mo->momx >>= 3;
+                mo->momy >>= 3;
+
+                if (P_TryMove(mo, mo->x - xmove, ymove + mo->y))
+                    mo->momy = -mo->momy;
+                else
+                    mo->momx = -mo->momx;
+
+                xmove = 0;
+                ymove = 0;
+            }
+            else if (mo->flags & MF_MISSILE)
+            {
+                // haley 20110203: [STRIFE]
+                // This modification allows missiles to activate shoot specials.
+                // *** BUG: In vanilla Strife the second condition is simply
+                // if(numspechit). However, numspechit can be negative, and
+                // when it is, this accesses spechit[-2]. This always causes the
+                // DOS exe to read from NULL, and the 'special' value there (in
+                // DOS 6.22 at least) is 0x70, which does nothing.
+                if(blockingline && blockingline->special)
+                    P_ShootSpecialLine(mo, blockingline);
+                if(numspechit > 0)
+                    P_ShootSpecialLine(mo, spechit[numspechit-1]);
+
+                // explode a missile
+                if (ceilingline &&
+                    ceilingline->backsector &&
+                    ceilingline->backsector->ceilingpic == skyflatnum)
+                {
+                    // Hack to prevent missiles exploding
+                    // against the sky.
+                    // Does not handle sky floors.
+                    P_RemoveMobj (mo);
+                    return;
+                }
+                P_ExplodeMissile (mo);
+            }
+            else
+                mo->momx = mo->momy = 0;
+        }
+    } while (xmove || ymove);
+    
+    // slow down
+    if (player && player->cheats & CF_NOMOMENTUM)
+    {
+        // debug option for no sliding at all
+        mo->momx = mo->momy = 0;
+        return;
+    }
+
+    // villsa [STRIFE] replace skullfly flag with MF_BOUNCE
+    if (mo->flags & (MF_MISSILE | MF_BOUNCE) )
+        return;     // no friction for missiles ever
+
+    // haleyjd 20110224: [STRIFE] players experience friction even in the air,
+    // although less than when on the ground. With this fix, the 1.2-and-up 
+    // IWAD demo is now in sync!
+    if (mo->z > mo->floorz)
+    {
+        if(player)
+        {
+            mo->momx = FixedMul (mo->momx, AIRFRICTION);
+            mo->momy = FixedMul (mo->momy, AIRFRICTION);
+        }
+        return;     // no friction when airborne
+    }
+
+    if (mo->flags & MF_CORPSE)
+    {
+        // do not stop sliding
+        //  if halfway off a step with some momentum
+        if (mo->momx > FRACUNIT/4
+            || mo->momx < -FRACUNIT/4
+            || mo->momy > FRACUNIT/4
+            || mo->momy < -FRACUNIT/4)
+        {
+            if (mo->floorz != mo->subsector->sector->floorheight)
+                return;
+        }
+    }
+
+    if (mo->momx > -STOPSPEED
+        && mo->momx < STOPSPEED
+        && mo->momy > -STOPSPEED
+        && mo->momy < STOPSPEED
+        && (!player
+            || (player->cmd.forwardmove == 0
+                && player->cmd.sidemove == 0 ) ) )
+    {
+        // if in a walking frame, stop moving
+        // villsa [STRIFE]: different player state (haleyjd - verified 20110202)
+        if ( player&&(unsigned)((player->mo->state - states) - S_PLAY_01) < 4)
+            P_SetMobjState (player->mo, S_PLAY_00);
+
+        mo->momx = 0;
+        mo->momy = 0;
+    }
+    else
+    {
+        mo->momx = FixedMul (mo->momx, FRICTION);
+        mo->momy = FixedMul (mo->momy, FRICTION);
+    }
+}
+
+//
+// P_ZMovement
+//
+// [STRIFE] Modifications for:
+// * 3D Object Clipping
+// * Different momz handling
+// * No SKULLFLY logic (replaced with BOUNCE)
+// * Missiles don't hit sky flats
+//
+void P_ZMovement (mobj_t* mo)
+{
+    fixed_t	dist;
+    fixed_t	delta;
+
+    // check for smooth step up
+    if (mo->player && mo->z < mo->floorz)
+    {
+        mo->player->viewheight -= mo->floorz-mo->z;
+
+        mo->player->deltaviewheight
+            = (VIEWHEIGHT - mo->player->viewheight)>>3;
+    }
+    
+    // adjust height
+    // villsa [STRIFE] check for things standing on top of other things
+    if(!P_CheckPositionZ(mo, mo->z + mo->momz))
+    {
+        if(mo->momz >= 0)
+            mo->ceilingz = mo->height + mo->z;
+        else
+            mo->floorz = mo->z;
+    }
+
+    //mo->z += mo->momz; // villsa [STRIFE] unused
+
+    if ( mo->flags & MF_FLOAT
+        && mo->target)
+    {
+        // float down towards target if too close
+        if ( /*!(mo->flags & MF_SKULLFLY)   // villsa [STRIFE] unused
+             &&*/ !(mo->flags & MF_INFLOAT) )
+        {
+            dist = P_AproxDistance (mo->x - mo->target->x,
+                                    mo->y - mo->target->y);
+
+            delta =(mo->target->z + (mo->height>>1)) - mo->z;
+
+            if (delta<0 && dist < -(delta*3) )
+                mo->z -= FLOATSPEED;
+            else if (delta>0 && dist < (delta*3) )
+                mo->z += FLOATSPEED;
+        }
+    }
+    
+    // clip movement
+    if (mo->z <= mo->floorz)
+    {
+        // hit the floor
+
+        if (mo->flags & MF_BOUNCE)
+        {
+            // the skull slammed into something
+            // villsa [STRIFE] affect reactiontime
+            // momz is also shifted by 1
+            mo->momz = -mo->momz >> 1;
+            mo->reactiontime >>= 1;
+
+            // villsa [STRIFE] get terrain type
+            if(P_GetTerrainType(mo) != FLOOR_SOLID)
+                mo->flags &= ~MF_BOUNCE;
+        }
+
+        if (mo->momz < 0)
+        {
+            if (mo->player
+                && mo->momz < -GRAVITY*8)
+            {
+                // Squat down.
+                // Decrease viewheight for a moment
+                // after hitting the ground (hard),
+                // and utter appropriate sound.
+                mo->player->deltaviewheight = mo->momz>>3;
+
+                // villsa [STRIFE] fall damage
+                // haleyjd 09/18/10: Repaired calculation
+                if(mo->momz < -20*FRACUNIT)
+                    P_DamageMobj(mo, NULL, mo, mo->momz / -25000);
+
+                // haleyjd 20110224: *Any* fall centers your view, not just
+                // damaging falls (moved outside the above if).
+                mo->player->centerview = 1;
+                S_StartSound (mo, sfx_oof);
+            }
+            mo->momz = 0;
+        }
+        mo->z = mo->floorz;
+
+
+        // cph 2001/05/26 -
+        // See lost soul bouncing comment above. We need this here for bug
+        // compatibility with original Doom2 v1.9 - if a soul is charging and
+        // hit by a raising floor this incorrectly reverses its Y momentum.
+        //
+
+        // villsa [STRIFE] unused
+        /*
+        if (!correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
+            mo->momz = -mo->momz;
+        */
+
+        // villsa [STRIFE] also check for MF_BOUNCE
+        if ( (mo->flags & MF_MISSILE)
+            && !(mo->flags & (MF_NOCLIP|MF_BOUNCE)) )
+        {
+            P_ExplodeMissile (mo);
+        }
+    }
+    else // haleyjd 20110224: else here, not else if - Strife change or what?
+    {
+        if (! (mo->flags & MF_NOGRAVITY) )
+        {
+            if (mo->momz == 0)
+                mo->momz = -GRAVITY*2;
+            else
+                mo->momz -= GRAVITY;
+        }
+
+        if (mo->z + mo->height > mo->ceilingz)
+        {
+            // villsa [STRIFE] replace skullfly flag with MF_BOUNCE
+            if (mo->flags & MF_BOUNCE)
+            {
+                // villsa [STRIFE] affect reactiontime
+                // momz is also shifted by 1
+                mo->momz = -mo->momz >> 1;
+                mo->reactiontime >>= 1;
+            }
+
+            // hit the ceiling
+            if (mo->momz > 0)
+                mo->momz = 0;
+
+            mo->z = mo->ceilingz - mo->height;
+
+            // villsa [STRIFE] also check for MF_BOUNCE
+            if ( (mo->flags & MF_MISSILE)
+                && !(mo->flags & (MF_NOCLIP|MF_BOUNCE)) )
+            {
+                // villsa [STRIFE] check against skies
+                if(mo->subsector->sector->ceilingpic == skyflatnum)
+                    P_RemoveMobj(mo);
+                else
+                    P_ExplodeMissile (mo);
+            }
+        }
+    }
+} 
+
+
+
+//
+// P_NightmareRespawn
+//
+// [STRIFE] Modifications for:
+// * Destination fog z coordinate
+// * Restoration of all Strife mapthing flags
+//
+void
+P_NightmareRespawn (mobj_t* mobj)
+{
+    fixed_t      x;
+    fixed_t      y;
+    fixed_t      z; 
+    mobj_t*      mo;
+    mapthing_t*  mthing;
+
+    x = mobj->spawnpoint.x << FRACBITS; 
+    y = mobj->spawnpoint.y << FRACBITS; 
+
+    // somthing is occupying it's position?
+    if (!P_CheckPosition (mobj, x, y) ) 
+        return;	// no respwan
+
+    // spawn a teleport fog at old spot
+    // because of removal of the body?
+    mo = P_SpawnMobj (mobj->x,
+                      mobj->y,
+                      mobj->subsector->sector->floorheight , MT_TFOG); 
+    // initiate teleport sound
+    S_StartSound (mo, sfx_telept);
+
+    // spawn a teleport fog at the new spot
+    //ss = R_PointInSubsector (x,y); 
+
+    // haleyjd [STRIFE]: Uses ONFLOORZ instead of ss->sector->floorheight
+    mo = P_SpawnMobj (x, y, ONFLOORZ , MT_TFOG); 
+
+    S_StartSound (mo, sfx_telept);
+
+    // spawn the new monster
+    mthing = &mobj->spawnpoint;
+
+    // spawn it
+    if (mobj->info->flags & MF_SPAWNCEILING)
+        z = ONCEILINGZ;
+    else
+        z = ONFLOORZ;
+
+    // inherit attributes from deceased one
+    mo = P_SpawnMobj (x,y,z, mobj->type);
+    mo->spawnpoint = mobj->spawnpoint;
+    mo->angle = ANG45 * (mthing->angle/45);
+
+    if (mthing->options & MTF_AMBUSH)
+        mo->flags |= MF_AMBUSH;
+    if (mthing->options & MTF_STAND)       // [STRIFE] Standing mode, for NPCs
+        mobj->flags |= MF_STAND;
+    if (mthing->options & MTF_FRIEND)      // [STRIFE] Allies
+        mobj->flags |= MF_ALLY;
+    if (mthing->options & MTF_TRANSLUCENT) // [STRIFE] Translucent object
+        mobj->flags |= MF_SHADOW;
+    if (mthing->options & MTF_MVIS)        // [STRIFE] Alt. Translucency
+        mobj->flags |= MF_MVIS;
+
+    mo->reactiontime = 18;
+
+    // remove the old monster,
+    P_RemoveMobj (mobj);
+}
+
+
+//
+// P_MobjThinker
+//
+// [STRIFE] Modified for:
+// * Terrain effects
+// * Stonecold cheat
+// * Altered skill 5 respawn behavior
+//
+void P_MobjThinker (mobj_t* mobj)
+{
+    // momentum movement
+    if (mobj->momx
+        || mobj->momy
+        /*|| (mobj->flags&MF_SKULLFLY)*/ )  // villsa [STRIFE] unused
+    {
+        P_XYMovement (mobj);
+
+        // FIXME: decent NOP/NULL/Nil function pointer please.
+        if (mobj->thinker.function.acv == (actionf_v) (-1))
+            return;     // mobj was removed
+
+        // villsa [STRIFE] terrain clipping
+        if(P_GetTerrainType(mobj) == FLOOR_SOLID)
+            mobj->flags &= ~MF_FEETCLIPPED;
+        else
+            mobj->flags |= MF_FEETCLIPPED;
+
+    }
+    if ( (mobj->z != mobj->floorz && !(mobj->flags & MF_NOGRAVITY)) // villsa [STRIFE]
+        || mobj->momz )
+    {
+        P_ZMovement (mobj);
+
+        // FIXME: decent NOP/NULL/Nil function pointer please.
+        if (mobj->thinker.function.acv == (actionf_v) (-1))
+            return;     // mobj was removed
+
+        // villsa [STRIFE] terrain clipping and sounds
+        if(P_GetTerrainType(mobj) == FLOOR_SOLID)
+            mobj->flags &= ~MF_FEETCLIPPED;
+        else
+        {
+            S_StartSound(mobj, sfx_wsplsh);
+            mobj->flags |= MF_FEETCLIPPED;
+        }
+
+    }
+
+    
+    // cycle through states,
+    // calling action functions at transitions
+    if (mobj->tics != -1)
+    {
+        mobj->tics--;
+
+        // villsa [STRIFE] stonecold cheat
+        if(stonecold)
+        {
+            if(mobj->flags & MF_COUNTKILL)
+                P_DamageMobj(mobj, mobj, mobj, 10);
+        }
+
+        // you can cycle through multiple states in a tic
+        if (!mobj->tics)
+            if (!P_SetMobjState (mobj, mobj->state->nextstate) )
+                return;     // freed itself
+    }
+    else
+    {
+        // check for nightmare respawn
+        if (! (mobj->flags & MF_COUNTKILL) )
+            return;
+
+        if (!respawnmonsters)
+            return;
+
+        mobj->movecount++;
+
+        // haleyjd [STRIFE]: respawn time increased from 12 to 16
+        if (mobj->movecount < 16*TICRATE)
+            return;
+
+        if ( leveltime&31 )
+            return;
+
+        if (P_Random () > 4)
+            return;
+
+        // haleyjd [STRIFE]: NOTDMATCH things don't respawn
+        if(mobj->flags & MF_NOTDMATCH)
+            return;
+
+        P_NightmareRespawn (mobj);
+    }
+}
+
+
+//
+// P_SpawnMobj
+//
+// [STRIFE] Modifications to reactiontime and for terrain types.
+//
+mobj_t*
+P_SpawnMobj
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z,
+  mobjtype_t	type )
+{
+    mobj_t*	mobj;
+    state_t*	st;
+    mobjinfo_t*	info;
+
+    mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
+    memset (mobj, 0, sizeof (*mobj));
+    info = &mobjinfo[type];
+
+    mobj->type = type;
+    mobj->info = info;
+    mobj->x = x;
+    mobj->y = y;
+    mobj->radius = info->radius;
+    mobj->height = info->height;
+    mobj->flags = info->flags;
+    mobj->health = info->spawnhealth;
+
+    // haleyjd 09/25/10: [STRIFE] Doesn't do this; messes up flamethrower
+    // and a lot of other stuff using reactiontime as a counter.
+    //if (gameskill != sk_nightmare)
+    mobj->reactiontime = info->reactiontime;
+    
+    mobj->lastlook = P_Random () % MAXPLAYERS;
+    // do not set the state with P_SetMobjState,
+    // because action routines can not be called yet
+    st = &states[info->spawnstate];
+
+    mobj->state = st;
+    mobj->tics = st->tics;
+    mobj->sprite = st->sprite;
+    mobj->frame = st->frame;
+
+    // set subsector and/or block links
+    P_SetThingPosition (mobj);
+
+    mobj->floorz = mobj->subsector->sector->floorheight;
+    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+
+    if (z == ONFLOORZ)
+    {
+        mobj->z = mobj->floorz;
+
+        // villsa [STRIFE]
+        if(P_GetTerrainType(mobj) != FLOOR_SOLID)
+            mobj->flags |= MF_FEETCLIPPED;
+
+    }
+    else if (z == ONCEILINGZ)
+        mobj->z = mobj->ceilingz - mobj->info->height;
+    else 
+        mobj->z = z;
+
+    mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+
+    P_AddThinker (&mobj->thinker);
+
+    return mobj;
+}
+
+
+//
+// P_RemoveMobj
+//
+// [STRIFE] Modifications for item respawn timing
+//
+mapthing_t  itemrespawnque[ITEMQUESIZE];
+int         itemrespawntime[ITEMQUESIZE];
+int         iquehead;
+int         iquetail;
+
+void P_RemoveMobj (mobj_t* mobj)
+{
+    // villsa [STRIFE] removed invuln/invis. sphere exceptions
+    if ((mobj->flags & MF_SPECIAL)
+        && !(mobj->flags & MF_DROPPED))
+    {
+        itemrespawnque[iquehead] = mobj->spawnpoint;
+        itemrespawntime[iquehead] = leveltime + 30*TICRATE; // [STRIFE]
+
+        // [STRIFE] haleyjd 20130915
+        // -random parameter affects the behavior of respawning items here.
+        if(randomparm && iquehead != iquetail)
+        {
+            short type    = itemrespawnque[iquehead].type;
+            short options = itemrespawnque[iquehead].options;
+
+            // swap the type and options of iquehead and iquetail
+            itemrespawnque[iquehead].type    = itemrespawnque[iquetail].type;
+            itemrespawnque[iquehead].options = itemrespawnque[iquetail].options;
+            itemrespawnque[iquetail].type    = type;
+            itemrespawnque[iquetail].options = options;
+        }
+
+        iquehead = (iquehead+1)&(ITEMQUESIZE-1);
+
+        // lose one off the end?
+        if (iquehead == iquetail)
+            iquetail = (iquetail+1)&(ITEMQUESIZE-1);
+    }
+
+    // unlink from sector and block lists
+    P_UnsetThingPosition (mobj);
+    
+    // stop any playing sound
+    S_StopSound (mobj);
+    
+    // free block
+    P_RemoveThinker ((thinker_t*)mobj);
+}
+
+
+
+
+//
+// P_RespawnSpecials
+//
+// [STRIFE] modification to item respawn time handling
+//
+void P_RespawnSpecials (void)
+{
+    fixed_t     x;
+    fixed_t     y;
+    fixed_t     z;
+    
+    subsector_t*    ss; 
+    mobj_t*         mo;
+    mapthing_t*     mthing;
+    
+    int         i;
+
+    // only respawn items in deathmatch
+    if (deathmatch != 2)
+        return;
+
+    // nothing left to respawn?
+    if (iquehead == iquetail)
+        return;
+
+    // haleyjd [STRIFE]: 30 second wait is not accounted for here, see above.
+    if (leveltime < itemrespawntime[iquetail])
+        return;
+
+    mthing = &itemrespawnque[iquetail];
+
+    x = mthing->x << FRACBITS; 
+    y = mthing->y << FRACBITS; 
+
+    // spawn a teleport fog at the new spot
+    ss = R_PointInSubsector (x,y); 
+    mo = P_SpawnMobj (x, y, ss->sector->floorheight , MT_IFOG); 
+    S_StartSound (mo, sfx_itmbk);
+
+    // find which type to spawn
+    for (i=0 ; i< NUMMOBJTYPES ; i++)
+    {
+        if (mthing->type == mobjinfo[i].doomednum)
+            break;
+    }
+
+    if (i >= NUMMOBJTYPES)
+    {
+        I_Error("P_RespawnSpecials: Failed to find mobj type with doomednum "
+                "%d when respawning thing. This would cause a buffer overrun "
+                "in vanilla Strife.", mthing->type);
+    }
+
+    // spawn it
+    if (mobjinfo[i].flags & MF_SPAWNCEILING)
+        z = ONCEILINGZ;
+    else
+        z = ONFLOORZ;
+
+    mo = P_SpawnMobj (x,y,z, i);
+    mo->spawnpoint = *mthing;
+    mo->angle = ANG45 * (mthing->angle/45);
+
+    // pull it from the que
+    iquetail = (iquetail+1)&(ITEMQUESIZE-1);
+}
+
+
+
+
+//
+// P_SpawnPlayer
+// Called when a player is spawned on the level.
+// Most of the player structure stays unchanged
+//  between levels.
+//
+// [STRIFE] Modifications for:
+// * stonecold cheat, -workparm
+// * default inventory/questflags
+//
+void P_SpawnPlayer(mapthing_t* mthing)
+{
+    player_t*   p;
+    fixed_t     x;
+    fixed_t     y;
+    fixed_t     z;
+    mobj_t*     mobj;
+
+    if(mthing->type == 0)
+        return;
+
+    // not playing?
+    if(!playeringame[mthing->type-1])
+        return;
+
+    p = &players[mthing->type-1];
+
+    if (p->playerstate == PST_REBORN)
+        G_PlayerReborn (mthing->type-1);
+
+    x       = mthing->x << FRACBITS;
+    y       = mthing->y << FRACBITS;
+    z       = ONFLOORZ;
+    mobj    = P_SpawnMobj (x,y,z, MT_PLAYER);
+
+    // set color translations for player sprites
+    if(mthing->type > 1)
+        mobj->flags |= (mthing->type-1)<<MF_TRANSSHIFT;
+
+    mobj->angle  = ANG45 * (mthing->angle/45);
+    mobj->player = p;
+    mobj->health = p->health;
+
+    p->mo               = mobj;
+    p->playerstate      = PST_LIVE;	
+    p->refire           = 0;
+    p->message          = NULL;
+    p->damagecount      = 0;
+    p->bonuscount       = 0;
+    p->extralight       = 0;
+    p->fixedcolormap    = 0;
+    p->viewheight       = VIEWHEIGHT;
+
+    // setup gun psprite
+    P_SetupPsprites(p);
+
+    // villsa [STRIFE]
+    stonecold = false;
+
+    // villsa [STRIFE] what a nasty hack...
+    if(gamemap == 10)
+        p->weaponowned[wp_sigil] = true;
+
+    // villsa [STRIFE] instead of just giving cards in deathmatch mode, also
+    // set accuracy to 50 and give all quest flags
+    if(deathmatch)
+    {
+        int i;
+
+        p->accuracy = 50;
+        p->questflags = QF_ALLQUESTS; // 0x7fffffff
+
+        for(i = 0; i < NUMCARDS; i++)
+            p->cards[i] = true;
+    }
+
+    // villsa [STRIFE] set godmode?
+    if(workparm)
+        p->cheats |= CF_GODMODE;
+
+    if(mthing->type - 1 == consoleplayer)
+    {
+        // wake up the status bar
+        ST_Start ();
+        // wake up the heads up text
+        HU_Start ();
+    }
+}
+
+
+//
+// P_SpawnMapThing
+// The fields of the mapthing should
+// already be in host byte order.
+//
+// [STRIFE] Modifications for:
+// * No Lost Souls, item count
+// * New mapthing_t flag bits
+// * 8-player support
+//
+void P_SpawnMapThing (mapthing_t* mthing)
+{
+    int         i;
+    int         bit;
+    mobj_t*     mobj;
+    fixed_t     x;
+    fixed_t     y;
+    fixed_t     z;
+
+    // count deathmatch start positions
+    if (mthing->type == 11)
+    {
+        if (deathmatch_p < &deathmatchstarts[10])
+        {
+            memcpy (deathmatch_p, mthing, sizeof(*mthing));
+            deathmatch_p++;
+        }
+        return;
+    }
+
+    if (mthing->type <= 0)
+    {
+        // Thing type 0 is actually "player -1 start".  
+        // For some reason, Vanilla Doom accepts/ignores this.
+
+        return;
+    }
+
+    // check for players specially
+    // haleyjd 20120209: [STRIFE] 8 player starts
+    if (mthing->type <= 8)
+    {
+        // save spots for respawning in network games
+        playerstarts[mthing->type-1] = *mthing;
+        if (!deathmatch)
+            P_SpawnPlayer (mthing);
+
+        return;
+    }
+
+    // check for appropriate skill level
+    if (!netgame && (mthing->options & 16) )
+        return;
+
+    if (gameskill == sk_baby)
+        bit = 1;
+    else if (gameskill == sk_nightmare)
+        bit = 4;
+    else
+        // avoid undefined behavior (left shift by negative value and rhs too big)
+        // by accurately emulating what doom.exe did: reduce mod 32.
+        // For more details check:
+        // https://github.com/chocolate-doom/chocolate-doom/issues/1677
+        bit = (int) (1U << ((gameskill - 1) & 0x1F));
+
+    if (!(mthing->options & bit) )
+        return;
+
+    // find which type to spawn
+    for (i=0 ; i< NUMMOBJTYPES ; i++)
+        if (mthing->type == mobjinfo[i].doomednum)
+            break;
+
+    if (i==NUMMOBJTYPES)
+        I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",
+                 mthing->type,
+                 mthing->x, mthing->y);
+
+    // don't spawn keycards and players in deathmatch
+    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
+        return;
+
+    // don't spawn any monsters if -nomonsters
+    // villsa [STRIFE] Removed MT_SKULL
+    if (nomonsters && (mobjinfo[i].flags & MF_COUNTKILL))
+        return;
+    
+    // spawn it
+    x = mthing->x << FRACBITS;
+    y = mthing->y << FRACBITS;
+
+    if (mobjinfo[i].flags & MF_SPAWNCEILING)
+        z = ONCEILINGZ;
+    else
+        z = ONFLOORZ;
+    
+    mobj = P_SpawnMobj (x,y,z, i);
+    mobj->spawnpoint = *mthing;
+
+    if (mobj->tics > 0)
+        mobj->tics = 1 + (P_Random () % mobj->tics);
+    if (mobj->flags & MF_COUNTKILL)
+        totalkills++;
+
+    // villsa [STRIFE] unused
+    /*
+    if (mobj->flags & MF_COUNTITEM)
+        totalitems++;
+    */
+
+    mobj->angle = ANG45 * (mthing->angle/45);
+    if (mthing->options & MTF_AMBUSH)
+        mobj->flags |= MF_AMBUSH;
+    if (mthing->options & MTF_STAND)       // [STRIFE] Standing mode, for NPCs
+        mobj->flags |= MF_STAND;
+    if (mthing->options & MTF_FRIEND)      // [STRIFE] Allies
+        mobj->flags |= MF_ALLY;
+    if (mthing->options & MTF_TRANSLUCENT) // [STRIFE] Translucent object
+        mobj->flags |= MF_SHADOW;
+    if (mthing->options & MTF_MVIS)        // [STRIFE] Alt. Translucency
+        mobj->flags |= MF_MVIS;
+}
+
+
+
+//
+// GAME SPAWN FUNCTIONS
+//
+
+
+//
+// P_SpawnPuff
+//
+// [STRIFE] Modifications for:
+// * No spawn tics randomization
+// * Player melee behavior
+//
+
+void
+P_SpawnPuff
+( fixed_t	x,
+  fixed_t	y,
+  fixed_t	z )
+{
+    mobj_t*	th;
+    int t;
+    
+    t = P_Random();
+    z += ((t - P_Random()) << 10);
+
+    // [STRIFE] removed momz and tics randomization
+
+    th = P_SpawnMobj(x, y, z, MT_STRIFEPUFF); // [STRIFE]: new type
+
+    // don't make punches spark on the wall
+    // [STRIFE] Use a separate melee attack range for the player
+    if(attackrange == PLAYERMELEERANGE)
+        P_SetMobjState(th, S_POW2_00); // 141
+
+    // villsa [STRIFE] unused
+    /*
+    if (th->tics < 1)
+        th->tics = 1;
+    */
+}
+
+//
+// P_SpawnSparkPuff
+//
+// villsa [STRIFE] new function
+//
+mobj_t* P_SpawnSparkPuff(fixed_t x, fixed_t y, fixed_t z)
+{
+    int t = P_Random();
+    return P_SpawnMobj(x, y, ((t - P_Random()) << 10) + z, MT_SPARKPUFF);
+}
+
+//
+// P_SpawnBlood
+// 
+// [STRIFE] Modifications for:
+// * No spawn tics randomization
+// * Different damage ranges for state setting
+//
+void
+P_SpawnBlood
+( fixed_t       x,
+  fixed_t       y,
+  fixed_t       z,
+  int           damage )
+{
+    mobj_t*     th;
+    int temp;
+    
+    temp = P_Random();
+    z += (temp - P_Random()) << 10;
+    th = P_SpawnMobj(x, y, z, MT_BLOOD_DEATH);
+    th->momz = FRACUNIT*2;
+    
+    // villsa [STRIFE]: removed tics randomization
+
+    // villsa [STRIFE] different checks for damage range
+    if(damage >= 10 && damage <= 13)
+        P_SetMobjState(th, S_BLOD_00);
+    else if(damage >= 7 && damage < 10)
+        P_SetMobjState(th, S_BLOD_01);
+    else if(damage < 7)
+        P_SetMobjState(th, S_BLOD_02);
+}
+
+
+
+//
+// P_CheckMissileSpawn
+// Moves the missile forward a bit
+//  and possibly explodes it right there.
+//
+// [STRIFE] Modifications for:
+// * No spawn tics randomization
+//
+void P_CheckMissileSpawn (mobj_t* th)
+{
+    // villsa [STRIFE] removed tics randomization
+    
+    // move a little forward so an angle can
+    // be computed if it immediately explodes
+    th->x += (th->momx>>1);
+    th->y += (th->momy>>1);
+    th->z += (th->momz>>1);
+
+    if (!P_TryMove (th, th->x, th->y))
+        P_ExplodeMissile (th);
+}
+
+// Certain functions assume that a mobj_t pointer is non-NULL,
+// causing a crash in some situations where it is NULL.  Vanilla
+// Doom did not crash because of the lack of proper memory 
+// protection. This function substitutes NULL pointers for
+// pointers to a dummy mobj, to avoid a crash.
+
+mobj_t *P_SubstNullMobj(mobj_t *mobj)
+{
+    if (mobj == NULL)
+    {
+        static mobj_t dummy_mobj;
+
+        dummy_mobj.x = 0;
+        dummy_mobj.y = 0;
+        dummy_mobj.z = 0;
+        dummy_mobj.flags = 0;
+
+        mobj = &dummy_mobj;
+    }
+
+    return mobj;
+}
+
+//
+// P_SpawnMissile
+//
+// [STRIFE] Added MVIS inaccuracy
+//
+mobj_t*
+P_SpawnMissile
+( mobj_t*       source,
+  mobj_t*       dest,
+  mobjtype_t    type )
+{
+    mobj_t*     th;
+    angle_t     an;
+    int         dist;
+
+    th = P_SpawnMobj (source->x,
+                      source->y,
+                      source->z + 4*8*FRACUNIT, type);
+
+    if (th->info->seesound)
+        S_StartSound (th, th->info->seesound);
+
+    th->target = source;	// where it came from
+    an = R_PointToAngle2 (source->x, source->y, dest->x, dest->y);
+
+    // fuzzy player
+    if (dest->flags & MF_SHADOW)
+    {
+        int t = P_Random(); // haleyjd 20110223: remove order-of-evaluation dependencies
+        an += (t - P_Random()) << 21;
+    }
+    // villsa [STRIFE] check for heavily transparent things
+    else if(dest->flags & MF_MVIS)
+    {
+        int t = P_Random();
+        an += (t - P_Random()) << 22;
+    }
+
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul (th->info->speed, finecosine[an]);
+    th->momy = FixedMul (th->info->speed, finesine[an]);
+
+    dist = P_AproxDistance (dest->x - source->x, dest->y - source->y);
+    dist = dist / th->info->speed;
+
+    if (dist < 1)
+        dist = 1;
+
+    th->momz = (dest->z - source->z) / dist;
+    P_CheckMissileSpawn (th);
+
+    return th;
+}
+
+//
+// P_SpawnFacingMissile
+//
+// villsa [STRIFE] new function
+// Spawn a missile based on source's angle
+//
+mobj_t* P_SpawnFacingMissile(mobj_t* source, mobj_t* target, mobjtype_t type)
+{
+    mobj_t* th;
+    angle_t an;
+    fixed_t dist;
+
+    th = P_SpawnMobj(source->x, source->y, source->z + (32*FRACUNIT), type);
+
+    if(th->info->seesound)
+        S_StartSound(th, th->info->seesound);
+
+    th->target = source;    // where it came from
+    th->angle = source->angle; // haleyjd 09/06/10: fix0red
+    an = th->angle;
+
+    // fuzzy player
+    if (target->flags & MF_SHADOW)
+    {
+        int t = P_Random();
+        an += (t - P_Random()) << 21;
+    }
+    // villsa [STRIFE] check for heavily transparent things
+    else if(target->flags & MF_MVIS)
+    {
+        int t = P_Random();
+        an += (t - P_Random()) << 22;
+    }
+
+    an >>= ANGLETOFINESHIFT;
+    th->momx = FixedMul (th->info->speed, finecosine[an]);
+    th->momy = FixedMul (th->info->speed, finesine[an]);
+
+    dist = P_AproxDistance (target->x - source->x, target->y - source->y);
+    dist = dist / th->info->speed;
+
+    if(dist < 1)
+        dist = 1;
+
+    th->momz = (target->z - source->z) / dist;
+    P_CheckMissileSpawn (th);
+
+    return th;
+}
+
+//
+// P_SpawnPlayerMissile
+//
+// Tries to aim at a nearby monster
+// villsa [STRIFE] now returns a mobj
+// * Also modified to allow up/down look, and to account for foot-clipping
+//   by liquid terrain.
+//
+mobj_t* P_SpawnPlayerMissile(mobj_t* source, mobjtype_t type)
+{
+    mobj_t*	th;
+    angle_t	an;
+    
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	z;
+    fixed_t	slope;
+    
+    // see which target is to be aimed at
+    an = source->angle;
+    slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
+    
+    if (!linetarget)
+    {
+        an += 1<<26;
+        slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
+
+        if (!linetarget)
+        {
+            an -= 2<<26;
+            slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
+        }
+
+        if (!linetarget)
+        {
+            an = source->angle;
+
+            // haleyjd 09/21/10: [STRIFE] Removed, for look up/down support.
+            //slope = 0; 
+        }
+    }
+
+    // villsa [STRIFE]
+    if(linetarget)
+        source->target = linetarget;
+
+    x = source->x;
+    y = source->y;
+    
+    // villsa [STRIFE]
+    if(!(source->flags & MF_FEETCLIPPED))
+        z = source->z + 32*FRACUNIT;
+    else
+        z = source->z + 22*FRACUNIT;
+
+    th = P_SpawnMobj (x,y,z, type);
+
+    if (th->info->seesound)
+        S_StartSound (th, th->info->seesound);
+
+    th->target = source;
+    th->angle = an;
+    th->momx = FixedMul( th->info->speed,
+                         finecosine[an>>ANGLETOFINESHIFT]);
+    th->momy = FixedMul( th->info->speed,
+                         finesine[an>>ANGLETOFINESHIFT]);
+    th->momz = FixedMul( th->info->speed, slope);
+
+    P_CheckMissileSpawn (th);
+
+    return th;
+}
+
+//
+// P_SpawnMortar
+//
+// villsa [STRIFE] new function
+// Spawn a high-arcing ballistic projectile
+//
+mobj_t* P_SpawnMortar(mobj_t *source, mobjtype_t type)
+{
+    mobj_t* th;
+    angle_t an;
+    fixed_t slope;
+
+    an = source->angle;
+
+    th = P_SpawnMobj(source->x, source->y, source->z, type);
+    th->target = source;
+    th->angle = an;
+    an >>= ANGLETOFINESHIFT;
+
+    // haleyjd 20110203: corrected order of function calls
+    th->momx = FixedMul(th->info->speed, finecosine[an]);
+    th->momy = FixedMul(th->info->speed, finesine[an]);
+
+    P_CheckMissileSpawn(th);
+    
+    slope = P_AimLineAttack(source, source->angle, 1024*FRACUNIT);
+    th->momz = FixedMul(th->info->speed, slope);
+
+    return th;
+}
diff --git a/games/NXDoom/src/strife/p_mobj.h b/games/NXDoom/src/strife/p_mobj.h
new file mode 100644
index 000000000..3872f9d03
--- /dev/null
+++ b/games/NXDoom/src/strife/p_mobj.h
@@ -0,0 +1,330 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Map Objects, MObj, definition and handling.
+//
+
+
+#ifndef __P_MOBJ__
+#define __P_MOBJ__
+
+// Basics.
+#include "tables.h"
+#include "m_fixed.h"
+
+// We need the thinker_t stuff.
+#include "d_think.h"
+
+// We need the WAD data structure for Map things,
+// from the THINGS lump.
+#include "doomdata.h"
+
+// States are tied to finite states are
+//  tied to animation frames.
+// Needs precompiled tables/data structures.
+#include "info.h"
+
+
+
+
+
+
+//
+// NOTES: mobj_t
+//
+// mobj_ts are used to tell the refresh where to draw an image,
+// tell the world simulation when objects are contacted,
+// and tell the sound driver how to position a sound.
+//
+// The refresh uses the next and prev links to follow
+// lists of things in sectors as they are being drawn.
+// The sprite, frame, and angle elements determine which patch_t
+// is used to draw the sprite if it is visible.
+// The sprite and frame values are allmost allways set
+// from state_t structures.
+// The statescr.exe utility generates the states.h and states.c
+// files that contain the sprite/frame numbers from the
+// statescr.txt source file.
+// The xyz origin point represents a point at the bottom middle
+// of the sprite (between the feet of a biped).
+// This is the default origin position for patch_ts grabbed
+// with lumpy.exe.
+// A walking creature will have its z equal to the floor
+// it is standing on.
+//
+// The sound code uses the x,y, and subsector fields
+// to do stereo positioning of any sound effited by the mobj_t.
+//
+// The play simulation uses the blocklinks, x,y,z, radius, height
+// to determine when mobj_ts are touching each other,
+// touching lines in the map, or hit by trace lines (gunshots,
+// lines of sight, etc).
+// The mobj_t->flags element has various bit flags
+// used by the simulation.
+//
+// Every mobj_t is linked into a single sector
+// based on its origin coordinates.
+// The subsector_t is found with R_PointInSubsector(x,y),
+// and the sector_t can be found with subsector->sector.
+// The sector links are only used by the rendering code,
+// the play simulation does not care about them at all.
+//
+// Any mobj_t that needs to be acted upon by something else
+// in the play world (block movement, be shot, etc) will also
+// need to be linked into the blockmap.
+// If the thing has the MF_NOBLOCK flag set, it will not use
+// the block links. It can still interact with other things,
+// but only as the instigator (missiles will run into other
+// things, but nothing can run into a missile).
+// Each block in the grid is 128*128 units, and knows about
+// every line_t that it contains a piece of, and every
+// interactable mobj_t that has its origin contained.  
+//
+// A valid mobj_t is a mobj_t that has the proper subsector_t
+// filled in for its xy coordinates and is linked into the
+// sector from which the subsector was made, or has the
+// MF_NOSECTOR flag set (the subsector_t needs to be valid
+// even if MF_NOSECTOR is set), and is linked into a blockmap
+// block or has the MF_NOBLOCKMAP flag set.
+// Links should only be modified by the P_[Un]SetThingPosition()
+// functions.
+// Do not change the MF_NO? flags while a thing is valid.
+//
+// Any questions?
+//
+
+//
+// Misc. mobj flags
+//
+typedef enum
+{
+    // Call P_SpecialThing when touched.
+    MF_SPECIAL          = 1,
+
+    // Blocks.
+    MF_SOLID            = 2,
+
+    // Can be hit.
+    MF_SHOOTABLE        = 4,
+
+    // Don't use the sector links (invisible but touchable).
+    MF_NOSECTOR         = 8,
+
+    // Don't use the blocklinks (inert but displayable)
+    MF_NOBLOCKMAP       = 16,
+
+    // villsa [STRIFE] Stand around until alerted
+    MF_STAND            = 32,
+
+    // Will try to attack right back.
+    MF_JUSTHIT          = 64,
+
+    // Will take at least one step before attacking.
+    MF_JUSTATTACKED     = 128,
+
+    // On level spawning (initial position),
+    //  hang from ceiling instead of stand on floor.
+    MF_SPAWNCEILING     = 256,
+
+    // Don't apply gravity (every tic),
+    //  that is, object will float, keeping current height
+    //  or changing it actively.
+    MF_NOGRAVITY        = 512,
+
+    // Movement flags.
+    // This allows jumps from high places.
+    MF_DROPOFF          = 0x400,
+
+    // villsa [STRIFE] For players, count as quest item
+    MF_GIVEQUEST        = 0x800,
+
+    // Player cheat. ???
+    MF_NOCLIP           = 0x1000,
+
+    // villsa [STRIFE] are feet clipped into water/slude floor?
+    MF_FEETCLIPPED      = 0x2000,
+
+    // Allow moves to any height, no gravity.
+    // For active floaters, e.g. cacodemons, pain elementals.
+    MF_FLOAT            = 0x4000,
+
+    // villsa [STRIFE] can NPC talk?
+    MF_NODIALOG         = 0x8000,
+
+    // Don't hit same species, explode on block.
+    // Player missiles as well as fireballs of various kinds.
+    MF_MISSILE          = 0x10000,
+
+    // Dropped by a demon, not level spawned.
+    // E.g. ammo clips dropped by dying former humans.
+    MF_DROPPED          = 0x20000,
+
+    // Use fuzzy draw (shadow demons or spectres),
+    //  temporary player invisibility powerup.
+    MF_SHADOW           = 0x40000,
+
+    // Flag: don't bleed when shot (use puff),
+    //  barrels and shootable furniture shall not bleed.
+    MF_NOBLOOD          = 0x80000,
+
+    // Don't stop moving halfway off a step,
+    //  that is, have dead bodies slide down all the way.
+    MF_CORPSE           = 0x100000,
+
+    // Floating to a height for a move, ???
+    //  don't auto float to target's height.
+    MF_INFLOAT          = 0x200000,
+
+    // On kill, count this enemy object
+    //  towards intermission kill total.
+    // Happy gathering.
+    MF_COUNTKILL        = 0x400000,
+
+    // Not to be activated by sound, deaf monster.
+    MF_AMBUSH           = 0x800000,
+
+    // villsa [STRIFE] flag used for bouncing projectiles
+    MF_BOUNCE           = 0x1000000,
+
+    // Don't spawn this object
+    //  in death match mode (e.g. key cards).
+    MF_NOTDMATCH        = 0x2000000,
+
+    // villsa [STRIFE] friendly towards player with matching flag
+    MF_ALLY             = 0x4000000,
+
+    // villsa [STRIFE] 75% or 25% transparency? -- NEEDS VERIFICATION
+    MF_MVIS             = 0x8000000,
+
+    // villsa [STRIFE] color translation
+    MF_COLORSWAP1       = 0x10000000,
+
+    // villsa [STRIFE] color translation
+    MF_COLORSWAP2       = 0x20000000,
+
+    // villsa [STRIFE] color translation
+    MF_COLORSWAP3       = 0x40000000,
+
+    // villsa [STRIFE] spectral entity, only damaged by spectral missiles
+    MF_SPECTRAL         = 0x80000000,
+
+    // Player sprites in multiplayer modes are modified
+    //  using an internal color lookup table for re-indexing.
+    // haleyjd 09/06/10: redid for Strife translations
+    MF_TRANSLATION      = (MF_COLORSWAP1|MF_COLORSWAP2|MF_COLORSWAP3),
+
+    // Turns 0x10000000 into 0x01 to get a translation index.
+    // villsa [STRIFE] change from 26 to 28
+    MF_TRANSSHIFT       = 28
+
+} mobjflag_t;
+
+
+// Map Object definition.
+//
+// [STRIFE]: Amazingly, only one modification was made to mobj_t over DOOM 
+// 1.666, and that was the addition of the single-byte allegiance field for
+// tracking with which player friendly monsters are allied.
+//
+typedef struct mobj_s
+{
+    // List: thinker links.
+    thinker_t           thinker;
+
+    // Info for drawing: position.
+    fixed_t             x;
+    fixed_t             y;
+    fixed_t             z;
+
+    // More list: links in sector (if needed)
+    struct mobj_s*      snext;
+    struct mobj_s*      sprev;
+
+    //More drawing info: to determine current sprite.
+    angle_t             angle;  // orientation
+    spritenum_t         sprite; // used to find patch_t and flip value
+    int                 frame;  // might be ORed with FF_FULLBRIGHT
+
+    // Interaction info, by BLOCKMAP.
+    // Links in blocks (if needed).
+    struct mobj_s*      bnext;
+    struct mobj_s*      bprev;
+    
+    struct subsector_s* subsector;
+
+    // The closest interval over all contacted Sectors.
+    fixed_t             floorz;
+    fixed_t             ceilingz;
+
+    // For movement checking.
+    fixed_t             radius;
+    fixed_t             height;
+
+    // Momentums, used to update position.
+    fixed_t             momx;
+    fixed_t             momy;
+    fixed_t             momz;
+
+    // If == validcount, already checked.
+    int                 validcount;
+
+    mobjtype_t          type;
+    mobjinfo_t*         info;   // &mobjinfo[mobj->type]
+    
+    int                 tics;   // state tic counter
+    state_t*            state;
+    int                 flags;
+    int                 health;
+
+    // Movement direction, movement generation (zig-zagging).
+    int                 movedir;        // 0-7
+    int                 movecount;      // when 0, select a new dir
+
+    // Thing being chased/attacked (or NULL),
+    // also the originator for missiles.
+    struct mobj_s*      target;
+
+    // Reaction time: if non 0, don't attack yet.
+    // Used by player to freeze a bit after teleporting.
+    int                 reactiontime;   
+
+    // If >0, the target will be chased
+    // no matter what (even if shot)
+    int                 threshold;
+
+    // Additional info record for player avatars only.
+    // Only valid if type == MT_PLAYER
+    struct player_s*    player;
+
+    // Player number last looked for.
+    int                 lastlook;
+
+    // For nightmare respawn.
+    mapthing_t          spawnpoint;
+
+    // Thing being chased/attacked for tracers.
+    struct mobj_s*      tracer;
+
+    // [STRIFE] haleyjd 09/05/10: 
+    // * In multiplayer this stores allegiance, for friends and teleport beacons
+    // * In single-player this tracks dialog state.
+    byte                miscdata;
+    
+} mobj_t;
+
+// haleyjd [STRIFE] Exported
+void P_CheckMissileSpawn (mobj_t* th);
+
+#endif
diff --git a/games/NXDoom/src/strife/p_plats.c b/games/NXDoom/src/strife/p_plats.c
new file mode 100644
index 000000000..aeb0eb5aa
--- /dev/null
+++ b/games/NXDoom/src/strife/p_plats.c
@@ -0,0 +1,358 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Plats (i.e. elevator platforms) code, raising/lowering.
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+
+plat_t* activeplats[MAXPLATS];
+
+
+
+//
+// Move a plat up and down
+//
+void T_PlatRaise(plat_t* plat)
+{
+    result_e	res;
+
+    switch(plat->status)
+    {
+    case up:
+        res = T_MovePlane(plat->sector, plat->speed, plat->high, plat->crush, 0, 1);
+
+        if(plat->type == raiseAndChange
+            || plat->type == raiseToNearestAndChange)
+        {
+            if(!(leveltime&7))
+                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
+        }
+
+        // villsa [STRIFE]
+        if(plat->type == slowDWUS)
+        {
+            if(!(leveltime&7))
+                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
+        }
+
+
+        if(res == crushed && (!plat->crush))
+        {
+            plat->count = plat->wait;
+            plat->status = down;
+            S_StartSound(&plat->sector->soundorg, sfx_pstart);
+        }
+        else
+        {
+            if(res == pastdest)
+            {
+                plat->count = plat->wait;
+                plat->status = waiting;
+                S_StartSound(&plat->sector->soundorg, sfx_pstop);
+
+                switch(plat->type)
+                {
+                case blazeDWUS:
+                case downWaitUpStay:
+                case raiseAndChange:
+                case slowDWUS:  // villsa [STRIFE]
+                case raiseToNearestAndChange:
+                    P_RemoveActivePlat(plat);
+                    break;
+
+                default:
+                    break;
+                }
+            }
+        }
+        break;
+
+    case down:
+        res = T_MovePlane(plat->sector, plat->speed, plat->low, false, 0, -1);
+
+        // villsa [STRIFE]
+        if(plat->type == slowDWUS)
+        {
+            if(!(leveltime&7))
+                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
+        }
+
+        if(res == pastdest)
+        {
+            plat->count = plat->wait;
+            plat->status = waiting;
+            S_StartSound(&plat->sector->soundorg,sfx_pstop);
+
+            // villsa [STRIFE]
+            if(plat->type == upWaitDownStay)
+                P_RemoveActivePlat(plat);
+        }
+        break;
+
+    case waiting:
+        if(!--plat->count)
+        {
+            if(plat->sector->floorheight == plat->low)
+                plat->status = up;
+            else
+                plat->status = down;
+            S_StartSound(&plat->sector->soundorg,sfx_pstart);
+        }
+
+    case in_stasis:
+        break;
+    }
+}
+
+
+//
+// EV_DoPlat
+//
+// Do Platforms "amount" is only used for SOME platforms.
+//
+int EV_DoPlat(line_t* line, plattype_e type, int amount)
+{
+    plat_t*     plat;
+    int         secnum;
+    int         rtn;
+    sector_t*   sec;
+
+    secnum = -1;
+    rtn = 0;
+
+
+    //	Activate all <type> plats that are in_stasis
+    switch(type)
+    {
+    case perpetualRaise:
+        P_ActivateInStasis(line->tag);
+        break;
+
+    default:
+        break;
+    }
+
+    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+        sec = &sectors[secnum];
+
+        if (sec->specialdata)
+            continue;
+
+        // Find lowest & highest floors around sector
+        rtn = 1;
+        plat = Z_Malloc( sizeof(*plat), PU_LEVSPEC, 0);
+        P_AddThinker(&plat->thinker);
+
+        plat->type = type;
+        plat->sector = sec;
+        plat->sector->specialdata = plat;
+        plat->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
+        plat->crush = false;
+        plat->tag = line->tag;
+
+        switch(type)
+        {
+        case raiseToNearestAndChange:
+            plat->speed = PLATSPEED/2;
+            sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+            plat->high = P_FindNextHighestFloor(sec,sec->floorheight);
+            plat->wait = 0;
+            plat->status = up;
+
+            // NO MORE DAMAGE, IF APPLICABLE
+            sec->special = 0;		
+
+            S_StartSound(&sec->soundorg, sfx_stnmov);
+            break;
+
+        case raiseAndChange:
+            plat->speed = PLATSPEED/2;
+            sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+            plat->high = sec->floorheight + amount * FRACUNIT;
+            plat->wait = 0;
+            plat->status = up;
+
+            S_StartSound(&sec->soundorg, sfx_stnmov);
+            break;
+
+            // villsa [STRIFE]
+        case upWaitDownStay:
+            plat->speed = PLATSPEED * 4;
+            plat->high = P_FindNextHighestFloor(sec, sec->floorheight);
+            plat->low = sec->floorheight;
+            plat->wait = TICRATE * PLATWAIT;
+            plat->status = up;
+            S_StartSound(&sec->soundorg, sfx_pstart);
+            break;
+
+        case downWaitUpStay:
+            plat->speed = PLATSPEED * 4;
+            plat->low = P_FindLowestFloorSurrounding(sec);
+
+            if(plat->low > sec->floorheight)
+                plat->low = sec->floorheight;
+
+            plat->high = sec->floorheight;
+            plat->wait = TICRATE * PLATWAIT;
+            plat->status = down;
+            S_StartSound(&sec->soundorg, sfx_pstart);
+            break;
+
+            // villsa [STRIFE]
+        case slowDWUS:
+            plat->speed = PLATSPEED;
+            plat->low = P_FindLowestFloorSurrounding(sec);
+
+            if(plat->low > sec->floorheight)
+                plat->low = sec->floorheight;
+
+            plat->high = sec->floorheight;
+            plat->wait = TICRATE * (PLATWAIT * 10);
+            plat->status = down;
+            S_StartSound(&sec->soundorg,sfx_pstart);
+            break;
+
+        case blazeDWUS:
+            plat->speed = PLATSPEED * 8;
+            plat->low = P_FindLowestFloorSurrounding(sec);
+
+            if(plat->low > sec->floorheight)
+                plat->low = sec->floorheight;
+
+            plat->high = sec->floorheight;
+            plat->wait = TICRATE * PLATWAIT;
+            plat->status = down;
+            S_StartSound(&sec->soundorg, sfx_pstart);
+            break;
+
+        case perpetualRaise:
+            plat->speed = PLATSPEED;
+            plat->low = P_FindLowestFloorSurrounding(sec);
+
+            if(plat->low > sec->floorheight)
+                plat->low = sec->floorheight;
+
+            plat->high = P_FindHighestFloorSurrounding(sec);
+
+            if(plat->high < sec->floorheight)
+                plat->high = sec->floorheight;
+
+            plat->wait = TICRATE * PLATWAIT;
+            plat->status = P_Random() & 1;
+
+            S_StartSound(&sec->soundorg, sfx_pstart);
+            break;
+        }
+
+        P_AddActivePlat(plat);
+    }
+    return rtn;
+}
+
+
+//
+// P_ActivateInStasis
+//
+void P_ActivateInStasis(int tag)
+{
+    int i;
+
+    for(i = 0; i < MAXPLATS; i++)
+        if(activeplats[i]
+        && (activeplats[i])->tag == tag
+            && (activeplats[i])->status == in_stasis)
+        {
+            (activeplats[i])->status = (activeplats[i])->oldstatus;
+            (activeplats[i])->thinker.function.acp1
+                = (actionf_p1)T_PlatRaise;
+        }
+}
+
+//
+// EV_StopPlat
+//
+void EV_StopPlat(line_t* line)
+{
+    int j;
+
+    for(j = 0; j < MAXPLATS; j++)
+        if (activeplats[j]
+        && ((activeplats[j])->status != in_stasis)
+            && ((activeplats[j])->tag == line->tag))
+        {
+            (activeplats[j])->oldstatus = (activeplats[j])->status;
+            (activeplats[j])->status = in_stasis;
+            (activeplats[j])->thinker.function.acv = (actionf_v)NULL;
+        }
+}
+
+//
+// P_AddActivePlat
+//
+void P_AddActivePlat(plat_t* plat)
+{
+    int i;
+
+    for(i = 0; i < MAXPLATS; i++)
+    {
+        if (activeplats[i] == NULL)
+        {
+            activeplats[i] = plat;
+            return;
+        }
+    }
+
+    I_Error("P_AddActivePlat: no more plats!");
+}
+
+//
+// P_RemoveActivePlat
+//
+void P_RemoveActivePlat(plat_t* plat)
+{
+    int i;
+    for(i = 0; i < MAXPLATS; i++)
+    {
+        if(plat == activeplats[i])
+        {
+            (activeplats[i])->sector->specialdata = NULL;
+            P_RemoveThinker(&(activeplats[i])->thinker);
+            activeplats[i] = NULL;
+
+            return;
+        }
+    }
+
+    I_Error("P_RemoveActivePlat: can't find plat!");
+}
diff --git a/games/NXDoom/src/strife/p_pspr.c b/games/NXDoom/src/strife/p_pspr.c
new file mode 100644
index 000000000..f7f283935
--- /dev/null
+++ b/games/NXDoom/src/strife/p_pspr.c
@@ -0,0 +1,1003 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Weapon sprite animation, weapon objects.
+//	Action functions for weapons.
+//
+
+
+#include "doomdef.h"
+#include "d_event.h"
+
+#include "deh_misc.h"
+
+#include "m_random.h"
+#include "p_local.h"
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+
+// Data.
+#include "sounds.h"
+
+#include "p_pspr.h"
+
+#define LOWERSPEED		FRACUNIT*6
+#define RAISESPEED		FRACUNIT*6
+
+#define WEAPONBOTTOM	128*FRACUNIT
+#define WEAPONTOP		32*FRACUNIT
+
+
+
+//
+// P_SetPsprite
+//
+// [STRIFE]
+// villsa: Removed psprite sx, sy modification via misc1/2
+//
+void
+P_SetPsprite
+( player_t*     player,
+  int           position,
+  statenum_t    stnum )
+{
+    pspdef_t*   psp;
+    state_t*    state;
+
+    psp = &player->psprites[position];
+
+    do
+    {
+        if (!stnum)
+        {
+            // object removed itself
+            psp->state = NULL;
+            break;
+        }
+
+        state = &states[stnum];
+        psp->state = state;
+        psp->tics = state->tics;        // could be 0
+
+        // villsa [STRIFE] unused
+        /*if (state->misc1)
+        {
+            // coordinate set
+            psp->sx = state->misc1 << FRACBITS;
+            psp->sy = state->misc2 << FRACBITS;
+        }*/
+
+        // Call action routine.
+        // Modified handling.
+        if (state->action.acp2)
+        {
+            state->action.acp2(player, psp);
+            if (!psp->state)
+                break;
+        }
+
+        stnum = psp->state->nextstate;
+
+    } while (!psp->tics);
+    // an initial state of 0 could cycle through
+}
+
+// haleyjd 09/06/10: [STRIFE] Removed P_CalcSwing
+
+//
+// P_BringUpWeapon
+// Starts bringing the pending weapon up
+// from the bottom of the screen.
+// Uses player
+//
+// villsa [STRIFE] Modifications for Strife weapons
+//
+void P_BringUpWeapon (player_t* player)
+{
+    statenum_t  newstate;
+
+    if (player->pendingweapon == wp_nochange)
+        player->pendingweapon = player->readyweapon;
+
+    if (player->pendingweapon == wp_flame)
+        S_StartSound (player->mo, sfx_flidl);   // villsa [STRIFE] flame sounds
+
+    newstate = weaponinfo[player->pendingweapon].upstate;
+
+    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+    P_SetPsprite (player, ps_weapon, newstate);
+
+    // villsa [STRIFE] set various flash states
+    if(player->pendingweapon == wp_elecbow)
+        P_SetPsprite(player, ps_flash, S_XBOW_10); // 31
+    else if(player->pendingweapon == wp_sigil && player->sigiltype)
+        P_SetPsprite(player, ps_flash, S_SIGH_00 + player->sigiltype); // 117
+    else
+        P_SetPsprite(player, ps_flash, S_NULL);
+
+    player->pendingweapon = wp_nochange;
+}
+
+//
+// P_CheckAmmo
+// Returns true if there is enough ammo to shoot.
+// If not, selects the next weapon to use.
+//
+// villsa [STRIFE] Changes to handle Strife weapons
+//
+boolean P_CheckAmmo (player_t* player)
+{
+    ammotype_t          ammo;
+    int                 count;
+
+    ammo = weaponinfo[player->readyweapon].ammo;
+
+    // Minimal amount for one shot varies.
+    if (player->readyweapon == wp_torpedo)
+        count = 30;
+    else if (player->readyweapon == wp_mauler)
+        count = 20;
+    else
+        count = 1;      // Regular.
+
+    // Some do not need ammunition anyway.
+    // Return if current ammunition sufficient.
+    if (ammo == am_noammo || player->ammo[ammo] >= count)
+        return true;
+
+    // Out of ammo, pick a weapon to change to.
+    // Preferences are set here.
+
+    // villsa [STRIFE] new weapon preferences
+    if (player->weaponowned[wp_mauler] && player->ammo[am_cell] >= 20)
+        player->pendingweapon = wp_mauler;
+
+    else if(player->weaponowned[wp_rifle] && player->ammo[am_bullets])
+        player->pendingweapon = wp_rifle;
+
+    else if (player->weaponowned[wp_elecbow] && player->ammo[am_elecbolts])
+        player->pendingweapon = wp_elecbow;
+
+    else if (player->weaponowned[wp_missile] && player->ammo[am_missiles])
+        player->pendingweapon = wp_missile;
+
+    else if (player->weaponowned[wp_flame] && player->ammo[am_cell])
+        player->pendingweapon = wp_flame;
+
+    else if (player->weaponowned[wp_hegrenade] && player->ammo[am_hegrenades])
+        player->pendingweapon = wp_hegrenade;
+
+    else if (player->weaponowned[wp_poisonbow] && player->ammo[am_poisonbolts])
+        player->pendingweapon = wp_poisonbow;
+
+    else if (player->weaponowned[wp_wpgrenade] && player->ammo[am_wpgrenades])
+        player->pendingweapon = wp_wpgrenade;
+
+    // BUG: This will *never* be selected for an automatic switch because the 
+    // normal Mauler is higher priority and uses less ammo.
+    else if (player->weaponowned[wp_torpedo] && player->ammo[am_cell] >= 30)
+        player->pendingweapon = wp_torpedo; 
+
+    else
+        player->pendingweapon = wp_fist;
+
+
+    // Now set appropriate weapon overlay.
+    P_SetPsprite(player, ps_weapon, weaponinfo[player->readyweapon].downstate);
+
+    return false;
+}
+
+
+//
+// P_FireWeapon.
+//
+// villsa [STRIFE] Changes for player state and weapons
+//
+void P_FireWeapon (player_t* player)
+{
+    statenum_t  newstate;
+
+    if (!P_CheckAmmo (player))
+        return;
+
+    P_SetMobjState (player->mo, S_PLAY_05); // 292
+    newstate = weaponinfo[player->readyweapon].atkstate;
+    P_SetPsprite (player, ps_weapon, newstate);
+    
+    // villsa [STRIFE] exclude these weapons from causing noise
+    if(player->readyweapon > wp_elecbow && player->readyweapon != wp_poisonbow)
+        P_NoiseAlert (player->mo, player->mo);
+}
+
+
+
+//
+// P_DropWeapon
+// Player died, so put the weapon away.
+//
+void P_DropWeapon (player_t* player)
+{
+    P_SetPsprite (player,
+                  ps_weapon,
+                  weaponinfo[player->readyweapon].downstate);
+}
+
+
+
+//
+// A_WeaponReady
+// The player can fire the weapon
+// or change to another weapon at this time.
+// Follows after getting weapon up,
+// or after previous attack/fire sequence.
+//
+void A_WeaponReady( player_t* player, pspdef_t* psp)
+{
+    statenum_t  newstate;
+    int         angle;
+    
+    // get out of attack state
+    if (player->mo->state == &states[S_PLAY_05] || // 292
+        player->mo->state == &states[S_PLAY_06])   // 293
+    {
+        P_SetMobjState (player->mo, S_PLAY_00); // 287
+    }
+    
+    // villsa [STRIFE] check for wp_flame instead of chainsaw
+    // haleyjd 09/06/10: fixed state (00 rather than 01)
+    if (player->readyweapon == wp_flame
+        && psp->state == &states[S_FLMT_00]) // 62
+    {
+        S_StartSound (player->mo, sfx_flidl);
+    }
+    
+    // check for change
+    //  if player is dead, put the weapon away
+    if (player->pendingweapon != wp_nochange || !player->health)
+    {
+        // change weapon
+        //  (pending weapon should allready be validated)
+        newstate = weaponinfo[player->readyweapon].downstate;
+        P_SetPsprite (player, ps_weapon, newstate);
+        return;
+    }
+    
+    // check for fire
+    //  the missile launcher and torpedo do not auto fire
+    if (player->cmd.buttons & BT_ATTACK)
+    {
+        if ( !player->attackdown
+            || (player->readyweapon != wp_missile
+            && player->readyweapon != wp_torpedo)) // villsa [STRIFE] replace bfg with torpedo
+        {
+            player->attackdown = true;
+            P_FireWeapon (player);
+            return;
+        }
+    }
+    else
+        player->attackdown = false;
+    
+    // bob the weapon based on movement speed
+    angle = (128*leveltime)&FINEMASK;
+    psp->sx = FRACUNIT + FixedMul (player->bob, finecosine[angle]);
+    angle &= FINEANGLES/2-1;
+    psp->sy = WEAPONTOP + FixedMul (player->bob, finesine[angle]);
+}
+
+
+
+//
+// A_ReFire
+// The player can re-fire the weapon
+// without lowering it entirely.
+//
+void A_ReFire
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    
+    // check for fire
+    //  (if a weaponchange is pending, let it go through instead)
+    if ( (player->cmd.buttons & BT_ATTACK) 
+        && player->pendingweapon == wp_nochange
+        && player->health)
+    {
+        player->refire++;
+        P_FireWeapon (player);
+    }
+    else
+    {
+        player->refire = 0;
+        P_CheckAmmo (player);
+    }
+}
+
+//
+// A_CheckReload
+//
+void A_CheckReload(player_t* player, pspdef_t* psp)
+{
+    P_CheckAmmo(player);
+
+    // villsa [STRIFE] set animating sprite for crossbow
+    if(player->readyweapon == wp_elecbow)
+        P_SetPsprite(player, player->readyweapon, S_XBOW_10);
+}
+
+
+
+//
+// A_Lower
+// Lowers current weapon,
+//  and changes weapon at bottom.
+//
+void
+A_Lower
+( player_t*	player,
+  pspdef_t*	psp )
+{	
+    psp->sy += LOWERSPEED;
+
+    // Is already down.
+    if (psp->sy < WEAPONBOTTOM )
+        return;
+
+    // Player is dead.
+    if (player->playerstate == PST_DEAD)
+    {
+        psp->sy = WEAPONBOTTOM;
+
+        // don't bring weapon back up
+        return;
+    }
+    
+    // The old weapon has been lowered off the screen,
+    // so change the weapon and start raising it
+    if (!player->health)
+    {
+        // Player is dead, so keep the weapon off screen.
+        P_SetPsprite (player,  ps_weapon, S_NULL);
+        return;
+    }
+
+    player->readyweapon = player->pendingweapon; 
+
+    P_BringUpWeapon (player);
+}
+
+
+//
+// A_Raise
+//
+void
+A_Raise
+( player_t*	player,
+  pspdef_t*	psp )
+{
+    statenum_t  newstate;
+
+    psp->sy -= RAISESPEED;
+
+    if (psp->sy > WEAPONTOP )
+        return;
+
+    psp->sy = WEAPONTOP;
+
+    // The weapon has been raised all the way,
+    //  so change to the ready state.
+    newstate = weaponinfo[player->readyweapon].readystate;
+
+    P_SetPsprite (player, ps_weapon, newstate);
+}
+
+
+
+//
+// A_GunFlash
+//
+void
+A_GunFlash
+( player_t*	player,
+  pspdef_t*	psp ) 
+{
+    P_SetMobjState (player->mo, S_PLAY_06);
+    P_SetPsprite (player,ps_flash,weaponinfo[player->readyweapon].flashstate);
+}
+
+
+
+//
+// WEAPON ATTACKS
+//
+
+
+//
+// A_Punch
+//
+
+void A_Punch(player_t* player, pspdef_t* psp) 
+{
+    angle_t     angle;
+    int         damage;
+    int         slope;
+    int         sound;
+    int         stamina;
+    int         t;
+
+    // villsa [STRIFE] new damage formula
+    // haleyjd 09/19/10: seriously corrected...
+    stamina = player->stamina;
+    damage = (P_Random() & ((stamina/10) + 7)) * ((stamina/10) + 2);
+
+    if(player->powers[pw_strength])
+        damage *= 10;
+
+    angle = player->mo->angle;
+    t = P_Random();
+    angle += (t - P_Random()) << 18;
+    slope = P_AimLineAttack (player->mo, angle, PLAYERMELEERANGE);
+    P_LineAttack (player->mo, angle, PLAYERMELEERANGE, slope, damage);
+
+    // turn to face target
+    if(linetarget)
+    {
+        // villsa [STRIFE] check for non-flesh types
+        if(linetarget->flags & MF_NOBLOOD)
+            sound = sfx_mtalht;
+        else
+            sound = sfx_meatht;
+
+        S_StartSound (player->mo, sound);
+        player->mo->angle = R_PointToAngle2 (player->mo->x,
+                                             player->mo->y,
+                                             linetarget->x,
+                                             linetarget->y);
+
+        // villsa [STRIFE] apply flag
+        player->mo->flags |= MF_JUSTATTACKED;
+
+        // villsa [STRIFE] do punch alert routine
+        P_DoPunchAlert(player->mo, linetarget);
+    }
+    else
+        S_StartSound (player->mo, sfx_swish);
+}
+
+
+//
+// A_FireFlameThrower
+//
+// villsa [STRIFE] new codepointer
+//
+void A_FireFlameThrower(player_t* player, pspdef_t* psp) 
+{
+    mobj_t* mo;
+    int t;
+
+    P_SetMobjState(player->mo, S_PLAY_06);
+    player->ammo[weaponinfo[player->readyweapon].ammo]--;
+    t = P_Random();
+    player->mo->angle += (t - P_Random()) << 18;
+
+    mo = P_SpawnPlayerMissile(player->mo, MT_SFIREBALL);
+    mo->momz += (5*FRACUNIT);
+}
+
+//
+// A_FireMissile
+//
+// villsa [STRIFE] completly new compared to the original
+//
+void A_FireMissile(player_t* player, pspdef_t* psp) 
+{
+    angle_t an;
+    int t;
+
+    // haleyjd 09/19/10: I previously missed an add op that meant it should be
+    // accuracy * 5, not 4. Checks out with other sources.
+    an = player->mo->angle;
+    t = P_Random();
+    player->mo->angle += (t - P_Random()) << (19 - (player->accuracy * 5 / 100));
+    P_SetMobjState(player->mo, S_PLAY_06);
+    player->ammo[weaponinfo[player->readyweapon].ammo]--;
+    P_SpawnPlayerMissile(player->mo, MT_MINIMISSLE);
+    player->mo->angle = an;
+}
+
+//
+// A_FireMauler2
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_FireMauler2(player_t* player, pspdef_t* pspr)
+{
+    P_SetMobjState(player->mo, S_PLAY_06);
+    P_DamageMobj(player->mo, player->mo, NULL, 20);
+    player->ammo[weaponinfo[player->readyweapon].ammo] -= 30;
+    P_SpawnPlayerMissile(player->mo, MT_TORPEDO);
+    P_Thrust(player, player->mo->angle + ANG180, 512000);
+}
+
+//
+// A_FireGrenade
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_FireGrenade(player_t* player, pspdef_t* pspr)
+{
+    mobjtype_t type;
+    mobj_t* mo;
+    state_t* st1;
+    state_t* st2;
+    angle_t an;
+    fixed_t radius;
+
+    // decide on what type of grenade to spawn
+    if(player->readyweapon == wp_hegrenade)
+    {
+        type = MT_HEGRENADE;
+    }
+    else if(player->readyweapon == wp_wpgrenade)
+    {
+        type = MT_PGRENADE;
+    }
+    else
+    {
+        type = MT_HEGRENADE;
+        fprintf(stderr, "Warning: A_FireGrenade used on wrong weapon!\n");
+    }
+
+    player->ammo[weaponinfo[player->readyweapon].ammo]--;
+
+    // set flash frame
+    st1 = &states[(pspr->state - states) + weaponinfo[player->readyweapon].flashstate];
+    st2 = &states[weaponinfo[player->readyweapon].atkstate];
+    P_SetPsprite(player, ps_flash, st1 - st2);
+
+    player->mo->z += 32*FRACUNIT; // ugh
+    mo = P_SpawnMortar(player->mo, type);
+    player->mo->z -= 32*FRACUNIT; // ugh
+
+    // change momz based on player's pitch
+    mo->momz = FixedMul((player->pitch<<FRACBITS) / 160, mo->info->speed) + (8*FRACUNIT);
+    S_StartSound(mo, mo->info->seesound);
+
+    radius = mobjinfo[type].radius + player->mo->info->radius;
+    an = (player->mo->angle >> ANGLETOFINESHIFT);
+
+    mo->x += FixedMul(finecosine[an], radius + (4*FRACUNIT));
+    mo->y += FixedMul(finesine[an], radius + (4*FRACUNIT));
+
+    // shoot grenade from left or right side?
+    if(&states[weaponinfo[player->readyweapon].atkstate] == pspr->state)
+        an = (player->mo->angle - ANG90) >> ANGLETOFINESHIFT;
+    else
+        an = (player->mo->angle + ANG90) >> ANGLETOFINESHIFT;
+
+    mo->x += FixedMul((15*FRACUNIT), finecosine[an]);
+    mo->y += FixedMul((15*FRACUNIT), finesine[an]);
+
+    // set bounce flag
+    mo->flags |= MF_BOUNCE;
+}
+
+//
+// A_FireElectricBolt
+// villsa [STRIFE] - new codepointer
+//
+
+void A_FireElectricBolt(player_t* player, pspdef_t* pspr)
+{
+    angle_t an = player->mo->angle;
+    int t;
+
+    // haleyjd 09/19/10: Use 5 mul on accuracy here as well
+    t = P_Random();
+    player->mo->angle += (t - P_Random()) << (18 - (player->accuracy * 5 / 100));
+    player->ammo[weaponinfo[player->readyweapon].ammo]--;
+    P_SpawnPlayerMissile(player->mo, MT_ELECARROW);
+    player->mo->angle = an;
+    S_StartSound(player->mo, sfx_xbow);
+}
+
+//
+// A_FirePoisonBolt
+// villsa [STRIFE] - new codepointer
+//
+
+void A_FirePoisonBolt(player_t* player, pspdef_t* pspr)
+{
+    angle_t an = player->mo->angle;
+    int t;
+
+    // haleyjd 09/19/10: Use 5 mul on accuracy here as well
+    t = P_Random();
+    player->mo->angle += (t - P_Random()) << (18 - (player->accuracy * 5 / 100));
+    player->ammo[weaponinfo[player->readyweapon].ammo]--;
+    P_SpawnPlayerMissile(player->mo, MT_POISARROW);
+    player->mo->angle = an;
+    S_StartSound(player->mo, sfx_xbow);
+}
+
+//
+// P_BulletSlope
+// Sets a slope so a near miss is at aproximately
+// the height of the intended target
+//
+// haleyjd 09/06/10 [STRIFE] Modified with a little target hack...
+//
+fixed_t         bulletslope;
+
+
+void P_BulletSlope (mobj_t *mo)
+{
+    angle_t	an;
+    
+    // see which target is to be aimed at
+    an = mo->angle;
+    bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+
+    if (!linetarget)
+    {
+        an += 1<<26;
+        bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+        if (!linetarget)
+        {
+            an -= 2<<26;
+            bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+        }
+    }
+
+    // haleyjd 09/06/10: [STRIFE] Somebody added this here, and without it, you
+    // will get spurious crashing in routines such as P_LookForPlayers!
+    if(linetarget)
+        mo->target = linetarget;
+}
+
+
+//
+// P_GunShot
+//
+// [STRIFE] Modifications to support accuracy.
+//
+void
+P_GunShot
+( mobj_t*	mo,
+  boolean	accurate )
+{
+    angle_t     angle;
+    int         damage;
+
+    angle = mo->angle;
+
+    // villsa [STRIFE] apply player accuracy
+    // haleyjd 09/18/10: made some corrections: use 5x accuracy;
+    // eliminated order-of-evaluation dependency
+    if (!accurate)
+    {
+        int t = P_Random();
+        angle += (t - P_Random()) << (20 - ((mo->player->accuracy * 5) / 100));
+    }
+
+    // haleyjd 09/18/10 [STRIFE] corrected damage formula and moved down to
+    // preserve proper P_Random call order.
+    damage = 4 * (P_Random() % 3 + 1);
+
+    P_LineAttack (mo, angle, MISSILERANGE, bulletslope, damage);
+}
+
+//
+// A_FireRifle
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_FireRifle(player_t* player, pspdef_t* pspr)
+{
+    S_StartSound(player->mo, sfx_rifle);
+
+    if(player->ammo[weaponinfo[player->readyweapon].ammo])
+    {
+        P_SetMobjState(player->mo, S_PLAY_06); // 293
+        player->ammo[weaponinfo[player->readyweapon].ammo]--;
+        P_BulletSlope(player->mo);
+        P_GunShot(player->mo, !player->refire);
+    }
+}
+
+//
+// A_FireMauler1
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_FireMauler1(player_t* player, pspdef_t* pspr)
+{
+    int i;
+    angle_t angle;
+    int damage;
+
+    // haleyjd 09/18/10: Corrected ammo check to use >=
+    if(player->ammo[weaponinfo[player->readyweapon].ammo] >= 20)
+    {
+        player->ammo[weaponinfo[player->readyweapon].ammo] -= 20;
+        P_BulletSlope(player->mo);
+        S_StartSound(player->mo, sfx_pgrdat);
+
+        for(i = 0; i < 20; i++)
+        {
+            int t;
+            damage = 5*(P_Random ()%3+1);
+            angle = player->mo->angle;
+            t = P_Random();
+            angle += (t - P_Random()) << 19;
+            t = P_Random();
+            P_LineAttack(player->mo, angle, 2112*FRACUNIT,
+                         bulletslope + ((t - P_Random())<<5), damage);
+        }
+    }
+}
+
+//
+// A_SigilSound
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_SigilSound(player_t* player, pspdef_t* pspr)
+{
+    S_StartSound(player->mo, sfx_siglup);
+    player->extralight = 2;
+
+}
+
+//
+// A_FireSigil
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_FireSigil(player_t* player, pspdef_t* pspr)
+{
+    mobj_t* mo;
+    angle_t an;
+    int i;
+
+    // keep info on armor because sigil does piercing damage
+    i = player->armortype;
+    player->armortype = 0;
+
+    // BUG: setting inflictor causes firing the Sigil to always push the player
+    // toward the east, no matter what direction he is facing.
+    P_DamageMobj(player->mo, player->mo, NULL, 4 * (player->sigiltype + 1));
+
+    // restore armor
+    player->armortype = i;
+
+    S_StartSound(player->mo, sfx_siglup);
+
+    switch(player->sigiltype)
+    {
+        // falling lightning bolts from the sky
+    case 0:
+        P_BulletSlope(player->mo);
+        if(linetarget)
+        {
+            // haleyjd 09/18/10: corrected z coordinate
+            mo = P_SpawnMobj(linetarget->x, linetarget->y, ONFLOORZ, 
+                             MT_SIGIL_A_GROUND);
+            mo->tracer = linetarget;
+        }
+        else
+        {
+            an = player->mo->angle>>ANGLETOFINESHIFT;
+            mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, 
+                             MT_SIGIL_A_GROUND);
+            mo->momx += FixedMul((28*FRACUNIT), finecosine[an]);
+            mo->momy += FixedMul((28*FRACUNIT), finesine[an]);
+        }
+        mo->health = -1;
+        mo->target = player->mo;
+        break;
+
+        // simple projectile
+    case 1:
+        P_SpawnPlayerMissile(player->mo, MT_SIGIL_B_SHOT)->health = -1;
+        break;
+
+        // spread shot
+    case 2:
+        player->mo->angle -= ANG90; // starting at 270...
+        for(i = 0; i < 20; i++)     // increment by 1/10 of 90, 20 times.
+        {
+            player->mo->angle += (ANG90 / 10);
+            mo = P_SpawnMortar(player->mo, MT_SIGIL_C_SHOT);
+            mo->health = -1;
+            mo->z = player->mo->z + (32*FRACUNIT);
+        }
+        player->mo->angle -= ANG90; // subtract off the extra 90
+        break;
+
+        // tracer attack
+    case 3:
+        P_BulletSlope(player->mo);
+        if(linetarget)
+        {
+            mo = P_SpawnPlayerMissile(player->mo, MT_SIGIL_D_SHOT);
+            mo->tracer = linetarget;
+        }
+        else
+        {
+            an = player->mo->angle >> ANGLETOFINESHIFT;
+            mo = P_SpawnPlayerMissile(player->mo, MT_SIGIL_D_SHOT);
+            mo->momx += FixedMul(mo->info->speed, finecosine[an]);
+            mo->momy += FixedMul(mo->info->speed, finesine[an]);
+        }
+        mo->health = -1;
+        break;
+
+        // mega blast
+    case 4:
+        mo = P_SpawnPlayerMissile(player->mo, MT_SIGIL_E_SHOT);
+        mo->health = -1;
+        if(!linetarget)
+        {
+            an = (unsigned int)player->pitch >> ANGLETOFINESHIFT;
+            mo->momz += FixedMul(finesine[an], mo->info->speed); 
+        }
+        break;
+
+    default:
+        break;
+    }
+}
+
+//
+// A_GunFlashThinker
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_GunFlashThinker(player_t* player, pspdef_t* pspr)
+{
+    if(player->readyweapon == wp_sigil && player->sigiltype)
+        P_SetPsprite(player, ps_flash, S_SIGH_00 + player->sigiltype);
+    else
+        P_SetPsprite(player, ps_flash, S_NULL);
+
+}
+
+
+//
+// ?
+//
+void A_Light0 (player_t *player, pspdef_t *psp)
+{
+    player->extralight = 0;
+}
+
+void A_Light1 (player_t *player, pspdef_t *psp)
+{
+    player->extralight = 1;
+}
+
+void A_Light2 (player_t *player, pspdef_t *psp)
+{
+    player->extralight = 2;
+}
+
+//
+// A_SigilShock
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_SigilShock (player_t *player, pspdef_t *psp)
+{
+    player->extralight = -3;
+}
+
+//
+// A_TorpedoExplode
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_TorpedoExplode(mobj_t* actor)
+{
+    int i;
+
+    actor->angle -= ANG180;
+
+    for(i = 0; i < 80; i++)
+    {
+        actor->angle += (ANG90 / 20);
+        P_SpawnMortar(actor, MT_TORPEDOSPREAD)->target = actor->target;
+    }
+}
+
+//
+// A_MaulerSound
+//
+// villsa [STRIFE] - new codepointer
+//
+void A_MaulerSound(player_t *player, pspdef_t *psp)
+{
+    int t;
+    S_StartSound(player->mo, sfx_proton);
+    t = P_Random();
+    psp->sx += (t - P_Random()) << 10;
+    t = P_Random();
+    psp->sy += (t - P_Random()) << 10;
+
+}
+
+
+//
+// P_SetupPsprites
+// Called at start of level for each player.
+//
+void P_SetupPsprites(player_t* player) 
+{
+    int	i;
+
+    // remove all psprites
+    for(i = 0; i < NUMPSPRITES; i++)
+        player->psprites[i].state = NULL;
+
+    // spawn the gun
+    player->pendingweapon = player->readyweapon;
+    P_BringUpWeapon(player);
+}
+
+
+
+
+//
+// P_MovePsprites
+// Called every tic by player thinking routine.
+//
+void P_MovePsprites (player_t* player) 
+{
+    int		i;
+    pspdef_t*	psp;
+
+    psp = &player->psprites[0];
+    for(i = 0; i < NUMPSPRITES; i++, psp++)
+    {
+        // a null state means not active
+        if(psp->state)
+        {
+            // drop tic count and possibly change state
+
+            // a -1 tic count never changes
+            if(psp->tics != -1)	
+            {
+                psp->tics--;
+                if(!psp->tics)
+                    P_SetPsprite (player, i, psp->state->nextstate);
+            }
+        }
+    }
+    
+    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
+    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
+
+    // villsa [STRIFE] extra stuff for targeter
+    player->psprites[ps_targleft].sx =
+        (160*FRACUNIT) - ((100 - player->accuracy) << FRACBITS);
+
+    player->psprites[ps_targright].sx =
+        ((100 - player->accuracy) << FRACBITS) + (160*FRACUNIT);
+}
+
+
diff --git a/games/NXDoom/src/strife/p_pspr.h b/games/NXDoom/src/strife/p_pspr.h
new file mode 100644
index 000000000..ec4d13700
--- /dev/null
+++ b/games/NXDoom/src/strife/p_pspr.h
@@ -0,0 +1,86 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Sprite animation.
+//
+
+
+#ifndef __P_PSPR__
+#define __P_PSPR__
+
+// Basic data types.
+// Needs fixed point, and BAM angles.
+#include "m_fixed.h"
+#include "p_mobj.h"
+#include "tables.h"
+
+
+//
+// Needs to include the precompiled
+//  sprite animation tables.
+// Header generated by multigen utility.
+// This includes all the data for thing animation,
+// i.e. the Thing Atrributes table
+// and the Frame Sequence table.
+#include "info.h"
+
+
+
+//
+// Frame flags:
+// handles maximum brightness (torches, muzzle flare, light sources)
+//
+#define FF_FULLBRIGHT	0x8000	// flag in thing->frame
+#define FF_FRAMEMASK	0x7fff
+
+
+
+//
+// Overlay psprites are scaled shapes
+// drawn directly on the view screen,
+// coordinates are given for a 320*200 view screen.
+//
+typedef enum
+{
+    ps_weapon,
+    ps_flash,
+    ps_targcenter,  // villsa [STRIFE]
+    ps_targleft,    // villsa [STRIFE]
+    ps_targright,   // villsa [STRIFE]
+    NUMPSPRITES
+
+} psprnum_t;
+
+typedef struct
+{
+    state_t*	state;	// a NULL state means not active
+    int		tics;
+    fixed_t	sx;
+    fixed_t	sy;
+
+} pspdef_t;
+
+typedef struct player_s *playerptr;
+
+
+extern fixed_t bulletslope;
+
+
+// haleyjd [STRIFE] Exported
+void P_SetPsprite(playerptr player, int position, statenum_t stnum);
+void P_BulletSlope(mobj_t *mo);
+
+
+#endif
diff --git a/games/NXDoom/src/strife/p_saveg.c b/games/NXDoom/src/strife/p_saveg.c
new file mode 100644
index 000000000..f1782c1e5
--- /dev/null
+++ b/games/NXDoom/src/strife/p_saveg.c
@@ -0,0 +1,2208 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Archiving: SaveGame I/O.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dstrings.h"
+#include "deh_main.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "p_saveg.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+#define SAVEGAME_EOF 0x1d
+
+// haleyjd 09/28/10: [STRIFE] VERSIONSIZE == 8
+#define VERSIONSIZE 8 
+
+FILE *save_stream;
+int savegamelength;
+boolean savegame_error;
+
+// Get the filename of a temporary file to write the savegame to.  After
+// the file has been successfully saved, it will be renamed to the 
+// real file.
+
+char *P_TempSaveGameFile(void)
+{
+    static char *filename = NULL;
+
+    if (filename == NULL)
+    {
+        filename = M_StringJoin(savegamedir, "temp.dsg", NULL);
+    }
+
+    return filename;
+}
+
+// Get the filename of the save game file to use for the specified slot.
+
+char *P_SaveGameFile(int slot)
+{
+    static char *filename = NULL;
+    static size_t filename_size;
+    char basename[32];
+
+    if (filename == NULL)
+    {
+        filename_size = strlen(savegamedir) + 32;
+        filename = malloc(filename_size);
+    }
+
+    DEH_snprintf(basename, 32, SAVEGAMENAME "%d.dsg", slot);
+
+    M_snprintf(filename, filename_size, "%s%s", savegamedir, basename);
+
+    return filename;
+}
+
+// Endian-safe integer read/write functions
+
+static byte saveg_read8(void)
+{
+    byte result;
+
+    if (fread(&result, 1, 1, save_stream) < 1)
+    {
+        if (!savegame_error)
+        {
+            fprintf(stderr, "saveg_read8: Unexpected end of file while "
+                            "reading save game\n");
+
+            savegame_error = true;
+        }
+    }
+
+    return result;
+}
+
+static void saveg_write8(byte value)
+{
+    if (fwrite(&value, 1, 1, save_stream) < 1)
+    {
+        if (!savegame_error)
+        {
+            fprintf(stderr, "saveg_write8: Error while writing save game\n");
+
+            savegame_error = true;
+        }
+    }
+}
+
+static short saveg_read16(void)
+{
+    int result;
+
+    result = saveg_read8();
+    result |= saveg_read8() << 8;
+
+    return result;
+}
+
+static void saveg_write16(short value)
+{
+    saveg_write8(value & 0xff);
+    saveg_write8((value >> 8) & 0xff);
+}
+
+static int saveg_read32(void)
+{
+    int result;
+
+    result = saveg_read8();
+    result |= saveg_read8() << 8;
+    result |= saveg_read8() << 16;
+    result |= saveg_read8() << 24;
+
+    return result;
+}
+
+static void saveg_write32(int value)
+{
+    saveg_write8(value & 0xff);
+    saveg_write8((value >> 8) & 0xff);
+    saveg_write8((value >> 16) & 0xff);
+    saveg_write8((value >> 24) & 0xff);
+}
+
+// Pad to 4-byte boundaries
+
+static void saveg_read_pad(void)
+{
+    unsigned long pos;
+    int padding;
+    int i;
+
+    pos = ftell(save_stream);
+
+    padding = (4 - (pos & 3)) & 3;
+
+    for (i=0; i<padding; ++i)
+    {
+        saveg_read8();
+    }
+}
+
+static void saveg_write_pad(void)
+{
+    unsigned long pos;
+    int padding;
+    int i;
+
+    pos = ftell(save_stream);
+
+    padding = (4 - (pos & 3)) & 3;
+
+    for (i=0; i<padding; ++i)
+    {
+        saveg_write8(0);
+    }
+}
+
+
+// Pointers
+
+static void *saveg_readp(void)
+{
+    return (void *) (intptr_t) saveg_read32();
+}
+
+static void saveg_writep(const void *p)
+{
+    saveg_write32((intptr_t) p);
+}
+
+// Enum values are 32-bit integers.
+
+#define saveg_read_enum saveg_read32
+#define saveg_write_enum saveg_write32
+
+//
+// Structure read/write functions
+//
+
+//
+// mapthing_t
+//
+
+static void saveg_read_mapthing_t(mapthing_t *str)
+{
+    // short x;
+    str->x = saveg_read16();
+
+    // short y;
+    str->y = saveg_read16();
+
+    // short angle;
+    str->angle = saveg_read16();
+
+    // short type;
+    str->type = saveg_read16();
+
+    // short options;
+    str->options = saveg_read16();
+}
+
+static void saveg_write_mapthing_t(mapthing_t *str)
+{
+    // short x;
+    saveg_write16(str->x);
+
+    // short y;
+    saveg_write16(str->y);
+
+    // short angle;
+    saveg_write16(str->angle);
+
+    // short type;
+    saveg_write16(str->type);
+
+    // short options;
+    saveg_write16(str->options);
+}
+
+//
+// actionf_t
+// 
+
+static void saveg_read_actionf_t(actionf_t *str)
+{
+    // actionf_p1 acp1;
+    str->acp1 = saveg_readp();
+}
+
+static void saveg_write_actionf_t(actionf_t *str)
+{
+    // actionf_p1 acp1;
+    saveg_writep(str->acp1);
+}
+
+//
+// think_t
+//
+// This is just an actionf_t.
+//
+
+#define saveg_read_think_t saveg_read_actionf_t
+#define saveg_write_think_t saveg_write_actionf_t
+
+//
+// thinker_t
+//
+
+static void saveg_read_thinker_t(thinker_t *str)
+{
+    // struct thinker_s* prev;
+    str->prev = saveg_readp();
+
+    // struct thinker_s* next;
+    str->next = saveg_readp();
+
+    // think_t function;
+    saveg_read_think_t(&str->function);
+}
+
+static void saveg_write_thinker_t(thinker_t *str)
+{
+    // struct thinker_s* prev;
+    saveg_writep(str->prev);
+
+    // struct thinker_s* next;
+    saveg_writep(str->next);
+
+    // think_t function;
+    saveg_write_think_t(&str->function);
+}
+
+//
+// mobj_t
+//
+// haleyjd 09/28/10: [STRIFE] Changed to match Strife binary mobj_t structure.
+// 
+
+static void saveg_read_mobj_t(mobj_t *str)
+{
+    int pl;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // fixed_t x;
+    str->x = saveg_read32();
+
+    // fixed_t y;
+    str->y = saveg_read32();
+
+    // fixed_t z;
+    str->z = saveg_read32();
+
+    // struct mobj_s* snext;
+    str->snext = saveg_readp();
+
+    // struct mobj_s* sprev;
+    str->sprev = saveg_readp();
+
+    // angle_t angle;
+    str->angle = saveg_read32();
+
+    // spritenum_t sprite;
+    str->sprite = saveg_read_enum();
+
+    // int frame;
+    str->frame = saveg_read32();
+
+    // struct mobj_s* bnext;
+    str->bnext = saveg_readp();
+
+    // struct mobj_s* bprev;
+    str->bprev = saveg_readp();
+
+    // struct subsector_s* subsector;
+    str->subsector = saveg_readp();
+
+    // fixed_t floorz;
+    str->floorz = saveg_read32();
+
+    // fixed_t ceilingz;
+    str->ceilingz = saveg_read32();
+
+    // fixed_t radius;
+    str->radius = saveg_read32();
+
+    // fixed_t height;
+    str->height = saveg_read32();
+
+    // fixed_t momx;
+    str->momx = saveg_read32();
+
+    // fixed_t momy;
+    str->momy = saveg_read32();
+
+    // fixed_t momz;
+    str->momz = saveg_read32();
+
+    // int validcount;
+    str->validcount = saveg_read32();
+
+    // mobjtype_t type;
+    str->type = saveg_read_enum();
+
+    // mobjinfo_t* info;
+    str->info = saveg_readp();
+
+    // int tics;
+    str->tics = saveg_read32();
+
+    // state_t* state;
+    str->state = &states[saveg_read32()];
+
+    // int flags;
+    str->flags = saveg_read32();
+
+    // int health;
+    str->health = saveg_read32();
+
+    // int movedir;
+    str->movedir = saveg_read32();
+
+    // int movecount;
+    str->movecount = saveg_read32();
+
+    // struct mobj_s* target;
+    str->target = saveg_readp();
+
+    // int reactiontime;
+    str->reactiontime = saveg_read32();
+
+    // int threshold;
+    str->threshold = saveg_read32();
+
+    // struct player_s* player;
+    pl = saveg_read32();
+
+    if (pl > 0)
+    {
+        str->player = &players[pl - 1];
+        str->player->mo = str;
+    }
+    else
+    {
+        str->player = NULL;
+    }
+
+    // int lastlook;
+    str->lastlook = saveg_read32();
+
+    // mapthing_t spawnpoint;
+    saveg_read_mapthing_t(&str->spawnpoint);
+
+    // struct mobj_s* tracer;
+    str->tracer = saveg_readp();
+
+    // byte miscdata;
+    str->miscdata = saveg_read8(); // [STRIFE] Only change to mobj_t.
+}
+
+static void saveg_write_mobj_t(mobj_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // fixed_t x;
+    saveg_write32(str->x);
+
+    // fixed_t y;
+    saveg_write32(str->y);
+
+    // fixed_t z;
+    saveg_write32(str->z);
+
+    // struct mobj_s* snext;
+    saveg_writep(str->snext);
+
+    // struct mobj_s* sprev;
+    saveg_writep(str->sprev);
+
+    // angle_t angle;
+    saveg_write32(str->angle);
+
+    // spritenum_t sprite;
+    saveg_write_enum(str->sprite);
+
+    // int frame;
+    saveg_write32(str->frame);
+
+    // struct mobj_s* bnext;
+    saveg_writep(str->bnext);
+
+    // struct mobj_s* bprev;
+    saveg_writep(str->bprev);
+
+    // struct subsector_s* subsector;
+    saveg_writep(str->subsector);
+
+    // fixed_t floorz;
+    saveg_write32(str->floorz);
+
+    // fixed_t ceilingz;
+    saveg_write32(str->ceilingz);
+
+    // fixed_t radius;
+    saveg_write32(str->radius);
+
+    // fixed_t height;
+    saveg_write32(str->height);
+
+    // fixed_t momx;
+    saveg_write32(str->momx);
+
+    // fixed_t momy;
+    saveg_write32(str->momy);
+
+    // fixed_t momz;
+    saveg_write32(str->momz);
+
+    // int validcount;
+    saveg_write32(str->validcount);
+
+    // mobjtype_t type;
+    saveg_write_enum(str->type);
+
+    // mobjinfo_t* info;
+    saveg_writep(str->info);
+
+    // int tics;
+    saveg_write32(str->tics);
+
+    // state_t* state;
+    saveg_write32(str->state - states);
+
+    // int flags;
+    saveg_write32(str->flags);
+
+    // int health;
+    saveg_write32(str->health);
+
+    // int movedir;
+    saveg_write32(str->movedir);
+
+    // int movecount;
+    saveg_write32(str->movecount);
+
+    // struct mobj_s* target;
+    saveg_writep(str->target);
+
+    // int reactiontime;
+    saveg_write32(str->reactiontime);
+
+    // int threshold;
+    saveg_write32(str->threshold);
+
+    // struct player_s* player;
+    if (str->player)
+    {
+        saveg_write32(str->player - players + 1);
+    }
+    else
+    {
+        saveg_write32(0);
+    }
+
+    // int lastlook;
+    saveg_write32(str->lastlook);
+
+    // mapthing_t spawnpoint;
+    saveg_write_mapthing_t(&str->spawnpoint);
+
+    // struct mobj_s* tracer;
+    saveg_writep(str->tracer);
+
+    // byte miscdata;
+    saveg_write8(str->miscdata); // [STRIFE] Only change to mobj_t.
+}
+
+
+//
+// ticcmd_t
+//
+// haleyjd 09/28/10: [STRIFE] Modified for Strife binary ticcmd_t structure.
+//
+
+static void saveg_read_ticcmd_t(ticcmd_t *str)
+{
+    // signed char forwardmove;
+    str->forwardmove = saveg_read8();
+
+    // signed char sidemove;
+    str->sidemove = saveg_read8();
+
+    // short angleturn;
+    str->angleturn = saveg_read16();
+
+    // short consistancy;
+    // STRIFE-FIXME: throwing away top byte of consistancy until
+    // the true Strife ticcmd_t structure is available.
+    str->consistancy = (byte)saveg_read16();
+
+    // byte chatchar;
+    str->chatchar = saveg_read8();
+
+    // byte buttons;
+    str->buttons = saveg_read8();
+
+    // byte buttons2;
+    str->buttons2 = saveg_read8(); // [STRIFE]
+
+    // int inventory;
+    str->inventory = saveg_read32(); // [STRIFE]
+}
+
+static void saveg_write_ticcmd_t(ticcmd_t *str)
+{
+    // signed char forwardmove;
+    saveg_write8(str->forwardmove);
+
+    // signed char sidemove;
+    saveg_write8(str->sidemove);
+
+    // short angleturn;
+    saveg_write16(str->angleturn);
+
+    // short consistancy;
+    saveg_write16(str->consistancy);
+
+    // byte chatchar;
+    saveg_write8(str->chatchar);
+
+    // byte buttons;
+    saveg_write8(str->buttons);
+
+    // byte buttons2;
+    saveg_write8(str->buttons2); // [STRIFE]
+
+    // int inventory;
+    saveg_write32(str->inventory); // [STRIFE]
+}
+
+//
+// pspdef_t
+//
+
+static void saveg_read_pspdef_t(pspdef_t *str)
+{
+    int state;
+
+    // state_t* state;
+    state = saveg_read32();
+
+    if (state > 0)
+    {
+        str->state = &states[state];
+    }
+    else
+    {
+        str->state = NULL;
+    }
+
+    // int tics;
+    str->tics = saveg_read32();
+
+    // fixed_t sx;
+    str->sx = saveg_read32();
+
+    // fixed_t sy;
+    str->sy = saveg_read32();
+}
+
+static void saveg_write_pspdef_t(pspdef_t *str)
+{
+    // state_t* state;
+    if (str->state)
+    {
+        saveg_write32(str->state - states);
+    }
+    else
+    {
+        saveg_write32(0);
+    }
+
+    // int tics;
+    saveg_write32(str->tics);
+
+    // fixed_t sx;
+    saveg_write32(str->sx);
+
+    // fixed_t sy;
+    saveg_write32(str->sy);
+}
+
+//
+// inventory_t 
+//
+// haleyjd 09/28/10: [STRIFE] handle inventory input/output
+//
+
+static void saveg_read_inventory_t(inventory_t *str)
+{
+    //int sprite;
+    str->sprite = saveg_read32();
+
+    //int type;
+    str->type = saveg_read32();
+
+    //int amount;
+    str->amount = saveg_read32();
+}
+
+static void saveg_write_inventory_t(inventory_t *str)
+{
+    saveg_write32(str->sprite);
+    saveg_write32(str->type);
+    saveg_write32(str->amount);
+}
+
+//
+// player_t
+//
+// haleyjd 09/28/10: [STRIFE] Modified for Strife binary player_t structure.
+//
+
+static void saveg_read_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t* mo;
+    str->mo = saveg_readp();
+
+    // playerstate_t playerstate;
+    str->playerstate = saveg_read_enum();
+
+    // ticcmd_t cmd;
+    saveg_read_ticcmd_t(&str->cmd);
+
+    // fixed_t viewz;
+    str->viewz = saveg_read32();
+
+    // fixed_t viewheight;
+    str->viewheight = saveg_read32();
+
+    // fixed_t deltaviewheight;
+    str->deltaviewheight = saveg_read32();
+
+    // fixed_t bob;
+    str->bob = saveg_read32();
+
+    // int health;
+    str->health = saveg_read32();
+
+    // int armorpoints;
+    str->armorpoints = saveg_read16(); // [STRIFE] 32 -> 16
+
+    // int armortype;
+    str->armortype = saveg_read16(); // [STRIFE] 32 -> 16
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        str->powers[i] = saveg_read32();
+    }
+
+    // int sigiltype;
+    str->sigiltype = saveg_read32(); // [STRIFE]
+
+    // int nukagecount;
+    str->nukagecount = saveg_read32(); // [STRIFE]
+
+    // int questflags;
+    str->questflags = saveg_read32(); // [STRIFE]
+
+    // int pitch;
+    str->pitch = saveg_read32(); // [STRIFE]
+
+    // int centerview;
+    str->centerview = saveg_read32(); // [STRIFE]
+
+    // inventory_t inventory[NUMINVENTORY];
+    for(i = 0; i < NUMINVENTORY; i++)
+    {
+        saveg_read_inventory_t(&(str->inventory[i])); // [STRIFE]
+    }
+
+    // int st_update;
+    str->st_update = saveg_read32(); // [STRIFE]
+
+    // short numinventory;
+    str->numinventory = saveg_read16(); // [STRIFE]
+
+    // short inventorycursor;
+    str->inventorycursor = saveg_read16(); // [STRIFE]
+
+    // short accuracy;
+    str->accuracy = saveg_read16(); // [STRIFE]
+
+    // short stamina;
+    str->stamina = saveg_read16(); // [STRIFE]
+
+    // boolean cards[NUMCARDS];
+    for (i=0; i<NUMCARDS; ++i)
+    {
+        str->cards[i] = saveg_read32();
+    }
+
+    // boolean backpack;
+    str->backpack = saveg_read32();
+
+    // int attackdown;
+    str->attackdown = saveg_read32();
+
+    // int usedown;
+    str->usedown = saveg_read32();
+
+    // int inventorydown;
+    str->inventorydown = saveg_read32(); // [STRIFE]
+
+    // int frags[MAXPLAYERS];
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        str->frags[i] = saveg_read32();
+    }
+
+    // weapontype_t readyweapon;
+    str->readyweapon = saveg_read_enum();
+
+    // weapontype_t pendingweapon;
+    str->pendingweapon = saveg_read_enum();
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        str->weaponowned[i] = saveg_read32();
+    }
+
+    // int ammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        str->ammo[i] = saveg_read32();
+    }
+
+    // int maxammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        str->maxammo[i] = saveg_read32();
+    }
+
+    // int cheats;
+    str->cheats = saveg_read32();
+
+    // int refire;
+    str->refire = saveg_read32();
+
+    // short killcount;
+    str->killcount = saveg_read16(); // [STRIFE] 32 -> 16
+
+    // haleyjd 08/30/10 [STRIFE] No itemcount.
+    // int itemcount;
+    //str->itemcount = saveg_read32();
+
+    // haleyjd 08/30/10 [STRIFE] No secretcount.
+    // int secretcount;
+    //str->secretcount = saveg_read32();
+
+    // char* message;
+    str->message = saveg_readp();
+
+    // int damagecount;
+    str->damagecount = saveg_read32();
+
+    // int bonuscount;
+    str->bonuscount = saveg_read32();
+
+    // mobj_t* attacker;
+    str->attacker = saveg_readp();
+
+    // int extralight;
+    str->extralight = saveg_read32();
+
+    // int fixedcolormap;
+    str->fixedcolormap = saveg_read32();
+
+    // int colormap; - [STRIFE] no such field
+    //str->colormap = saveg_read32();
+
+    // short allegiance;
+    str->allegiance = saveg_read16(); // [STRIFE]
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        saveg_read_pspdef_t(&str->psprites[i]);
+    }
+
+    // int mapstate[40];
+    for(i = 0; i < 40; ++i) // [STRIFE]
+    {
+        str->mapstate[i] = saveg_read32();
+    }
+
+    // haleyjd 08/30/10: [STRIFE] No intermission, no didsecret.
+    // boolean didsecret;
+    //str->didsecret = saveg_read32();
+}
+
+static void saveg_write_player_t(player_t *str)
+{
+    int i;
+
+    // mobj_t* mo;
+    saveg_writep(str->mo);
+
+    // playerstate_t playerstate;
+    saveg_write_enum(str->playerstate);
+
+    // ticcmd_t cmd;
+    saveg_write_ticcmd_t(&str->cmd);
+
+    // fixed_t viewz;
+    saveg_write32(str->viewz);
+
+    // fixed_t viewheight;
+    saveg_write32(str->viewheight);
+
+    // fixed_t deltaviewheight;
+    saveg_write32(str->deltaviewheight);
+
+    // fixed_t bob;
+    saveg_write32(str->bob);
+
+    // int health;
+    saveg_write32(str->health);
+
+    // int armorpoints;
+    saveg_write16(str->armorpoints); // [STRIFE] 32 -> 16
+
+    // int armortype;
+    saveg_write16(str->armortype); // [STRIFE] 32 -> 16
+
+    // int powers[NUMPOWERS];
+    for (i=0; i<NUMPOWERS; ++i)
+    {
+        saveg_write32(str->powers[i]);
+    }
+
+    // int sigiltype;
+    saveg_write32(str->sigiltype); // [STRIFE]
+
+    // int nukagecount;
+    saveg_write32(str->nukagecount); // [STRIFE]
+
+    // int questflags;
+    saveg_write32(str->questflags); // [STRIFE]
+
+    // int pitch;
+    saveg_write32(str->pitch); // [STRIFE]
+
+    // int centerview;
+    saveg_write32(str->centerview); // [STRIFE]
+
+    // inventory_t inventory[NUMINVENTORY];
+    for(i = 0; i < NUMINVENTORY; ++i) // [STRIFE]
+    {
+        saveg_write_inventory_t(&str->inventory[i]);
+    }
+
+    // int st_update;
+    saveg_write32(str->st_update); // [STRIFE]
+
+    // short numinventory;
+    saveg_write16(str->numinventory); // [STRIFE]
+
+    // short inventorycursor;
+    saveg_write16(str->inventorycursor); // [STRIFE]
+
+    // short accuracy;
+    saveg_write16(str->accuracy); // [STRIFE]
+
+    // short stamina;
+    saveg_write16(str->stamina); // [STRIFE]
+
+    // boolean cards[NUMCARDS];
+    for (i=0; i<NUMCARDS; ++i)
+    {
+        saveg_write32(str->cards[i]);
+    }
+
+    // boolean backpack;
+    saveg_write32(str->backpack);
+
+    // int attackdown;
+    saveg_write32(str->attackdown);
+
+    // int usedown;
+    saveg_write32(str->usedown);
+
+    // int inventorydown;
+    saveg_write32(str->inventorydown); // [STRIFE]
+
+    // int frags[MAXPLAYERS];
+    for (i=0; i<MAXPLAYERS; ++i)
+    {
+        saveg_write32(str->frags[i]);
+    }
+
+    // weapontype_t readyweapon;
+    saveg_write_enum(str->readyweapon);
+
+    // weapontype_t pendingweapon;
+    saveg_write_enum(str->pendingweapon);
+
+    // boolean weaponowned[NUMWEAPONS];
+    for (i=0; i<NUMWEAPONS; ++i)
+    {
+        saveg_write32(str->weaponowned[i]);
+    }
+
+    // int ammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        saveg_write32(str->ammo[i]);
+    }
+
+    // int maxammo[NUMAMMO];
+    for (i=0; i<NUMAMMO; ++i)
+    {
+        saveg_write32(str->maxammo[i]);
+    }
+
+
+    // int cheats;
+    saveg_write32(str->cheats);
+
+    // int refire;
+    saveg_write32(str->refire);
+
+    // short killcount;
+    saveg_write16(str->killcount); // [STRIFE] 32 -> 16
+
+    // haleyjd 08/30/10 [STRIFE] No itemcount
+    // int itemcount;
+    //saveg_write32(str->itemcount);
+
+    // haleyjd 08/30/10 [STRIFE] No secretcount
+    // int secretcount;
+    //saveg_write32(str->secretcount);
+
+    // char* message;
+    saveg_writep(str->message);
+
+    // int damagecount;
+    saveg_write32(str->damagecount);
+
+    // int bonuscount;
+    saveg_write32(str->bonuscount);
+
+    // mobj_t* attacker;
+    saveg_writep(str->attacker);
+
+    // int extralight;
+    saveg_write32(str->extralight);
+
+    // int fixedcolormap;
+    saveg_write32(str->fixedcolormap);
+
+    // int colormap; [STRIFE] no such field
+    //saveg_write32(str->colormap);
+
+    // short allegiance;
+    saveg_write16(str->allegiance); // [STRIFE]
+
+    // pspdef_t psprites[NUMPSPRITES];
+    for (i=0; i<NUMPSPRITES; ++i)
+    {
+        saveg_write_pspdef_t(&str->psprites[i]);
+    }
+
+    // int mapstate[40];
+    for(i = 0; i < 40; ++i) // [STRIFE]
+    {
+        saveg_write32(str->mapstate[i]);
+    }
+
+    // haleyjd 08/30/10: [STRIFE] No intermission, no secret.
+    // boolean didsecret;
+    //saveg_write32(str->didsecret);
+}
+
+
+//
+// ceiling_t
+//
+
+static void saveg_read_ceiling_t(ceiling_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // ceiling_e type;
+    str->type = saveg_read_enum();
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // fixed_t bottomheight;
+    str->bottomheight = saveg_read32();
+
+    // fixed_t topheight;
+    str->topheight = saveg_read32();
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+
+    // boolean crush;
+    str->crush = saveg_read32();
+
+    // int direction;
+    str->direction = saveg_read32();
+
+    // int tag;
+    str->tag = saveg_read32();
+
+    // int olddirection;
+    str->olddirection = saveg_read32();
+}
+
+static void saveg_write_ceiling_t(ceiling_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // ceiling_e type;
+    saveg_write_enum(str->type);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // fixed_t bottomheight;
+    saveg_write32(str->bottomheight);
+
+    // fixed_t topheight;
+    saveg_write32(str->topheight);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+
+    // boolean crush;
+    saveg_write32(str->crush);
+
+    // int direction;
+    saveg_write32(str->direction);
+
+    // int tag;
+    saveg_write32(str->tag);
+
+    // int olddirection;
+    saveg_write32(str->olddirection);
+}
+
+//
+// vldoor_t
+//
+// haleyjd 09/28/10: [STRIFE] Modified for Strife binary vldoor_t structure.
+//
+
+static void saveg_read_vldoor_t(vldoor_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // vldoor_e type;
+    str->type = saveg_read_enum();
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // fixed_t topheight;
+    str->topheight = saveg_read32();
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+
+    // int direction;
+    str->direction = saveg_read32();
+
+    // int topwait;
+    str->topwait = saveg_read32();
+
+    // int topcountdown;
+    str->topcountdown = saveg_read32();
+
+    // villsa [STRIFE] new field - sound to play when opening
+    //int         opensound;
+    str->opensound = saveg_read32();
+
+    // villsa [STRIFE] new field - sound to play when closing
+    //int         closesound;
+    str->closesound = saveg_read32();
+}
+
+static void saveg_write_vldoor_t(vldoor_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // vldoor_e type;
+    saveg_write_enum(str->type);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // fixed_t topheight;
+    saveg_write32(str->topheight);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+
+    // int direction;
+    saveg_write32(str->direction);
+
+    // int topwait;
+    saveg_write32(str->topwait);
+
+    // int topcountdown;
+    saveg_write32(str->topcountdown);
+
+    // villsa [STRIFE] new field - sound to play when opening
+    //int         opensound;
+    saveg_write32(str->opensound);
+
+    // villsa [STRIFE] new field - sound to play when closing
+    //int         closesound;
+    saveg_write32(str->closesound);
+}
+
+//
+// slidedoor_t [STRIFE]: new thinker type
+//
+
+static void saveg_read_slidedoor_t(slidedoor_t *str)
+{
+    int sector;
+    int line;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sdt_e type;
+    str->type = saveg_read_enum();
+
+    // line_t *line1;
+    line = saveg_read32();
+    str->line1 = &lines[line];
+
+    // line_t *line2;
+    line = saveg_read32();
+    str->line2 = &lines[line];
+
+    // int frame;
+    str->frame = saveg_read32();
+
+    // int whichDoorIndex;
+    str->whichDoorIndex = saveg_read32();
+
+    // int timer;
+    str->timer = saveg_read32();
+
+    // sector_t *frontsector;
+    sector = saveg_read32();
+    str->frontsector = &sectors[sector];
+
+    // sd_e status;
+    str->status = saveg_read_enum();
+}
+
+static void saveg_write_slidedoor_t(slidedoor_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sdt_e type;
+    saveg_write_enum(str->type);
+
+    // line_t *line1;
+    saveg_write32(str->line1 - lines);
+
+    // line_t *line2;
+    saveg_write32(str->line2 - lines);
+
+    // int frame;
+    saveg_write32(str->frame);
+
+    // int whichDoorIndex;
+    saveg_write32(str->whichDoorIndex);
+
+    // int timer;
+    saveg_write32(str->timer);
+
+    // sector_t *frontsector;
+    saveg_write32(str->frontsector - sectors);
+
+    // sd_e status;
+    saveg_write_enum(str->status);
+}
+
+//
+// floormove_t
+//
+
+static void saveg_read_floormove_t(floormove_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // floor_e type;
+    str->type = saveg_read_enum();
+
+    // boolean crush;
+    str->crush = saveg_read32();
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int direction;
+    str->direction = saveg_read32();
+
+    // int newspecial;
+    str->newspecial = saveg_read32();
+
+    // short texture;
+    str->texture = saveg_read16();
+
+    // fixed_t floordestheight;
+    str->floordestheight = saveg_read32();
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+}
+
+static void saveg_write_floormove_t(floormove_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // floor_e type;
+    saveg_write_enum(str->type);
+
+    // boolean crush;
+    saveg_write32(str->crush);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int direction;
+    saveg_write32(str->direction);
+
+    // int newspecial;
+    saveg_write32(str->newspecial);
+
+    // short texture;
+    saveg_write16(str->texture);
+
+    // fixed_t floordestheight;
+    saveg_write32(str->floordestheight);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+}
+
+//
+// plat_t
+//
+
+static void saveg_read_plat_t(plat_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // fixed_t speed;
+    str->speed = saveg_read32();
+
+    // fixed_t low;
+    str->low = saveg_read32();
+
+    // fixed_t high;
+    str->high = saveg_read32();
+
+    // int wait;
+    str->wait = saveg_read32();
+
+    // int count;
+    str->count = saveg_read32();
+
+    // plat_e status;
+    str->status = saveg_read_enum();
+
+    // plat_e oldstatus;
+    str->oldstatus = saveg_read_enum();
+
+    // boolean crush;
+    str->crush = saveg_read32();
+
+    // int tag;
+    str->tag = saveg_read32();
+
+    // plattype_e type;
+    str->type = saveg_read_enum();
+}
+
+static void saveg_write_plat_t(plat_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // fixed_t speed;
+    saveg_write32(str->speed);
+
+    // fixed_t low;
+    saveg_write32(str->low);
+
+    // fixed_t high;
+    saveg_write32(str->high);
+
+    // int wait;
+    saveg_write32(str->wait);
+
+    // int count;
+    saveg_write32(str->count);
+
+    // plat_e status;
+    saveg_write_enum(str->status);
+
+    // plat_e oldstatus;
+    saveg_write_enum(str->oldstatus);
+
+    // boolean crush;
+    saveg_write32(str->crush);
+
+    // int tag;
+    saveg_write32(str->tag);
+
+    // plattype_e type;
+    saveg_write_enum(str->type);
+}
+
+//
+// lightflash_t
+//
+
+static void saveg_read_lightflash_t(lightflash_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int count;
+    str->count = saveg_read32();
+
+    // int maxlight;
+    str->maxlight = saveg_read32();
+
+    // int minlight;
+    str->minlight = saveg_read32();
+
+    // int maxtime;
+    str->maxtime = saveg_read32();
+
+    // int mintime;
+    str->mintime = saveg_read32();
+}
+
+static void saveg_write_lightflash_t(lightflash_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int count;
+    saveg_write32(str->count);
+
+    // int maxlight;
+    saveg_write32(str->maxlight);
+
+    // int minlight;
+    saveg_write32(str->minlight);
+
+    // int maxtime;
+    saveg_write32(str->maxtime);
+
+    // int mintime;
+    saveg_write32(str->mintime);
+}
+
+//
+// strobe_t
+//
+
+static void saveg_read_strobe_t(strobe_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int count;
+    str->count = saveg_read32();
+
+    // int minlight;
+    str->minlight = saveg_read32();
+
+    // int maxlight;
+    str->maxlight = saveg_read32();
+
+    // int darktime;
+    str->darktime = saveg_read32();
+
+    // int brighttime;
+    str->brighttime = saveg_read32();
+}
+
+static void saveg_write_strobe_t(strobe_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int count;
+    saveg_write32(str->count);
+
+    // int minlight;
+    saveg_write32(str->minlight);
+
+    // int maxlight;
+    saveg_write32(str->maxlight);
+
+    // int darktime;
+    saveg_write32(str->darktime);
+
+    // int brighttime;
+    saveg_write32(str->brighttime);
+}
+
+//
+// glow_t
+//
+
+static void saveg_read_glow_t(glow_t *str)
+{
+    int sector;
+
+    // thinker_t thinker;
+    saveg_read_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    sector = saveg_read32();
+    str->sector = &sectors[sector];
+
+    // int minlight;
+    str->minlight = saveg_read32();
+
+    // int maxlight;
+    str->maxlight = saveg_read32();
+
+    // int direction;
+    str->direction = saveg_read32();
+}
+
+static void saveg_write_glow_t(glow_t *str)
+{
+    // thinker_t thinker;
+    saveg_write_thinker_t(&str->thinker);
+
+    // sector_t* sector;
+    saveg_write32(str->sector - sectors);
+
+    // int minlight;
+    saveg_write32(str->minlight);
+
+    // int maxlight;
+    saveg_write32(str->maxlight);
+
+    // int direction;
+    saveg_write32(str->direction);
+}
+
+//
+// Write the header for a savegame
+//
+// haleyjd 09/28/10: [STRIFE] numerous modifications.
+//
+
+void P_WriteSaveGameHeader(char *description)
+{
+    char name[VERSIONSIZE]; 
+    int i; 
+
+    /*
+    [STRIFE] This is in the "NAME" file in a Strife save directory.
+    for (i=0; description[i] != '\0'; ++i)
+        saveg_write8(description[i]);
+    for (; i<SAVESTRINGSIZE; ++i)
+        saveg_write8(0);
+    */
+
+    memset (name,0,sizeof(name)); 
+    M_snprintf(name, sizeof(name), "ver %i", STRIFE_VERSION);
+
+    for (i=0; i<VERSIONSIZE; ++i)
+        saveg_write8(name[i]);
+
+    saveg_write8(gameskill);
+    
+    // [STRIFE] This information is implicit in the file being loaded.
+    //saveg_write8(gameepisode);
+    //saveg_write8(gamemap);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+        saveg_write8(playeringame[i]);
+
+    saveg_write8((leveltime >> 16) & 0xff);
+    saveg_write8((leveltime >> 8) & 0xff);
+    saveg_write8(leveltime & 0xff);
+}
+
+// 
+// Read the header for a savegame
+//
+
+boolean P_ReadSaveGameHeader(void)
+{
+    int	 i; 
+    byte a, b, c; 
+    char vcheck[VERSIONSIZE]; 
+    char read_vcheck[VERSIONSIZE];
+
+    // skip the description field 
+    /*
+    for (i=0; i<SAVESTRINGSIZE; ++i)
+        saveg_read8();
+    */
+    
+    for (i=0; i<VERSIONSIZE; ++i)
+        read_vcheck[i] = saveg_read8();
+
+    memset (vcheck,0,sizeof(vcheck));
+    M_snprintf(vcheck, sizeof(vcheck), "ver %i", STRIFE_VERSION);
+    if (strcmp(read_vcheck, vcheck) != 0)
+        return false;                       // bad version 
+
+    gameskill = saveg_read8();
+
+    // [STRIFE] This info is implicit in the file being read.
+    //gameepisode = saveg_read8();
+    //gamemap = saveg_read8();
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+        playeringame[i] = saveg_read8();
+
+    // get the times 
+    a = saveg_read8();
+    b = saveg_read8();
+    c = saveg_read8();
+    leveltime = (a<<16) + (b<<8) + c; 
+
+    return true;
+}
+
+//
+// Read the end of file marker.  Returns true if read successfully.
+// 
+
+boolean P_ReadSaveGameEOF(void)
+{
+    int value;
+
+    value = saveg_read8();
+
+    return value == SAVEGAME_EOF;
+}
+
+//
+// Write the end of file marker
+//
+
+void P_WriteSaveGameEOF(void)
+{
+    saveg_write8(SAVEGAME_EOF);
+}
+
+//
+// P_ArchivePlayers
+//
+// [STRIFE] Verified unmodified.
+//
+void P_ArchivePlayers (void)
+{
+    int         i;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+        if (!playeringame[i])
+            continue;
+
+        saveg_write_pad();
+
+        saveg_write_player_t(&players[i]);
+    }
+}
+
+
+
+//
+// P_UnArchivePlayers
+//
+// [STRIFE] Verified unmodified.
+//
+void P_UnArchivePlayers (boolean userload)
+{
+    int         i;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+        player_t dummy;
+
+        if (!playeringame[i])
+            continue;
+
+        saveg_read_pad();
+
+        // haleyjd [STRIFE]: not exactly how vanilla did it, but this is
+        // necessary because of Choco's change to the savegame code which
+        // reads it directly from file. When not a userload, all the player_t
+        // data loaded from the save is thrown away.
+        if(userload)
+        {
+            saveg_read_player_t(&players[i]);
+            players[i].mo = NULL;
+        }
+        else
+            saveg_read_player_t(&dummy);
+
+        // will be set when unarc thinker
+        players[i].message = NULL;
+        players[i].attacker = NULL;
+    }
+}
+
+
+//
+// P_ArchiveWorld
+//
+// haleyjd 09/28/10: [STRIFE] Minor modifications.
+//
+void P_ArchiveWorld (void)
+{
+    int                 i;
+    int                 j;
+    sector_t*           sec;
+    line_t*             li;
+    side_t*             si;
+    
+    // do sectors
+    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+    {
+        saveg_write16(sec->floorheight >> FRACBITS);
+        saveg_write16(sec->ceilingheight >> FRACBITS);
+        saveg_write16(sec->floorpic);
+        //saveg_write16(sec->ceilingpic); [STRIFE] not saved.
+        saveg_write16(sec->lightlevel);
+        saveg_write16(sec->special);            // needed?
+        //saveg_write16(sec->tag);                // needed? [STRIFE] not saved.
+    }
+
+    
+    // do lines
+    for (i=0, li = lines ; i<numlines ; i++,li++)
+    {
+        saveg_write16(li->flags);
+        saveg_write16(li->special);
+        //saveg_write16(li->tag); [STRIFE] not saved.
+        for (j=0 ; j<2 ; j++)
+        {
+            if (li->sidenum[j] == -1)
+                continue;
+
+            si = &sides[li->sidenum[j]];
+
+            // [STRIFE] offsets not saved.
+            //saveg_write16(si->textureoffset >> FRACBITS);
+            //saveg_write16(si->rowoffset >> FRACBITS);
+            saveg_write16(si->toptexture);
+            saveg_write16(si->bottomtexture);
+            saveg_write16(si->midtexture);
+        }
+    }
+}
+
+
+
+//
+// P_UnArchiveWorld
+//
+void P_UnArchiveWorld (void)
+{
+    int			i;
+    int			j;
+    sector_t*		sec;
+    line_t*		li;
+    side_t*		si;
+    
+    // do sectors
+    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+    {
+        sec->floorheight = saveg_read16() << FRACBITS;
+        sec->ceilingheight = saveg_read16() << FRACBITS;
+        sec->floorpic = saveg_read16();
+        //sec->ceilingpic = saveg_read16(); [STRIFE] not saved
+        sec->lightlevel = saveg_read16();
+        sec->special = saveg_read16();          // needed?
+        //sec->tag = saveg_read16();              // needed? [STRIFE] not saved
+        sec->specialdata = 0;
+        sec->soundtarget = 0;
+    }
+    
+    // do lines
+    for (i=0, li = lines ; i<numlines ; i++,li++)
+    {
+        li->flags = saveg_read16();
+        li->special = saveg_read16();
+        //li->tag = saveg_read16(); [STRIFE] not saved
+        for (j=0 ; j<2 ; j++)
+        {
+            if (li->sidenum[j] == -1)
+                continue;
+            si = &sides[li->sidenum[j]];
+            // [STRIFE] offsets not saved.
+            //si->textureoffset = saveg_read16() << FRACBITS;
+            //si->rowoffset = saveg_read16() << FRACBITS;
+            si->toptexture = saveg_read16();
+            si->bottomtexture = saveg_read16();
+            si->midtexture = saveg_read16();
+        }
+    }
+}
+
+
+
+
+
+//
+// Thinkers
+//
+typedef enum
+{
+    tc_end,
+    tc_mobj
+
+} thinkerclass_t;
+
+
+//
+// P_ArchiveThinkers
+//
+// [STRIFE] Verified unmodified.
+//
+void P_ArchiveThinkers (void)
+{
+    thinker_t*          th;
+
+    // save off the current thinkers
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+        if (th->function.acp1 == (actionf_p1)P_MobjThinker)
+        {
+            saveg_write8(tc_mobj);
+            saveg_write_pad();
+            saveg_write_mobj_t((mobj_t *) th);
+
+            continue;
+        }
+
+        // haleyjd: This may seem mysterious but in the DOOM prebeta, 
+        // different types of things used different thinker functions. 
+        // Those would have all been handled here and this message is 
+        // probably a relic of that old system, not to mention the odd
+        // name of this function, and use of an enumeration with only
+        // two values in it.
+
+        // I_Error ("P_ArchiveThinkers: Unknown thinker function");
+    }
+
+    // add a terminating marker
+    saveg_write8(tc_end);
+}
+
+
+
+//
+// P_UnArchiveThinkers
+//
+void P_UnArchiveThinkers (void)
+{
+    byte                tclass;
+    thinker_t*          currentthinker;
+    thinker_t*          next;
+    mobj_t*             mobj;
+    
+    // remove all the current thinkers
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+        next = currentthinker->next;
+
+        if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
+            P_RemoveMobj ((mobj_t *)currentthinker);
+        else
+            Z_Free (currentthinker);
+
+        currentthinker = next;
+    }
+    P_InitThinkers ();
+    
+    // read in saved thinkers
+    while (1)
+    {
+        tclass = saveg_read8();
+        switch (tclass)
+        {
+        case tc_end:
+            return; 	// end of list
+
+        case tc_mobj:
+            saveg_read_pad();
+            mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
+            saveg_read_mobj_t(mobj);
+
+            // haleyjd 09/29/10: Strife sets the targets of non-allied creatures
+            // who had a non-NULL target at save time to players[0].mo so that
+            // they won't fall back asleep.
+            //
+            // BUG: As the player may not have been spawned yet, we could be
+            // setting monsters' targets to the mobj which was spawned by 
+            // P_SetupLevel and then removed just above. Due to a subtle glitch
+            // in the DOOM engine whereby all things removed in this function
+            // are leaked until the next time P_SetupLevel is called, this is a
+            // safe operation - the call to P_InitThinkers above stops any of
+            // the objects removed, including the player's previous body, from
+            // being passed to Z_Free. One glitch relying on another!
+
+            if(mobj->target != NULL && (mobj->flags & MF_ALLY) != MF_ALLY)
+                mobj->target = players[0].mo;
+            else
+                mobj->target = NULL;
+
+            // WARNING! Strife does not seem to set tracer! I am leaving it be
+            // for now because so far no crashes have been observed, and failing
+            // to set this here will almost certainly crash Choco.
+            mobj->tracer = NULL;
+            P_SetThingPosition (mobj);
+            mobj->info = &mobjinfo[mobj->type];
+            // [STRIFE]: doesn't set these
+            //mobj->floorz = mobj->subsector->sector->floorheight;
+            //mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+            mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+            P_AddThinker (&mobj->thinker);
+            break;
+
+        default:
+            I_Error ("Unknown tclass %i in savegame",tclass);
+        }
+    }
+}
+
+
+//
+// P_ArchiveSpecials
+//
+enum
+{
+    tc_ceiling,
+    tc_door,
+    tc_floor,
+    tc_plat,
+    tc_flash,
+    tc_strobe,
+    tc_glow,
+    tc_slidingdoor, // [STRIFE]
+    tc_endspecials
+
+} specials_e;
+
+
+
+//
+// Things to handle:
+//
+// T_MoveCeiling, (ceiling_t: sector_t * swizzle), - active list
+// T_VerticalDoor, (vldoor_t: sector_t * swizzle),
+// T_SlidingDoor, (slidedoor_t: sector_t *, line_t * x 2 swizzle) [STRIFE]
+// T_MoveFloor, (floormove_t: sector_t * swizzle),
+// T_LightFlash, (lightflash_t: sector_t * swizzle),
+// T_StrobeFlash, (strobe_t: sector_t *),
+// T_Glow, (glow_t: sector_t *),
+// T_PlatRaise, (plat_t: sector_t *), - active list
+//
+void P_ArchiveSpecials (void)
+{
+    thinker_t*          th;
+    int                 i;
+
+    // save off the current thinkers
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+        if (th->function.acv == (actionf_v)NULL)
+        {
+            for (i = 0; i < MAXCEILINGS;i++)
+                if (activeceilings[i] == (ceiling_t *)th)
+                    break;
+
+            if (i<MAXCEILINGS)
+            {
+                saveg_write8(tc_ceiling);
+                saveg_write_pad();
+                saveg_write_ceiling_t((ceiling_t *) th);
+            }
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
+        {
+            saveg_write8(tc_ceiling);
+            saveg_write_pad();
+            saveg_write_ceiling_t((ceiling_t *) th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_VerticalDoor)
+        {
+            saveg_write8(tc_door);
+            saveg_write_pad();
+            saveg_write_vldoor_t((vldoor_t *) th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_SlidingDoor)
+        {
+            saveg_write8(tc_slidingdoor);
+            saveg_write_pad();
+            saveg_write_slidedoor_t((slidedoor_t *)th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_MoveFloor)
+        {
+            saveg_write8(tc_floor);
+            saveg_write_pad();
+            saveg_write_floormove_t((floormove_t *) th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_PlatRaise)
+        {
+            saveg_write8(tc_plat);
+            saveg_write_pad();
+            saveg_write_plat_t((plat_t *) th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_LightFlash)
+        {
+            saveg_write8(tc_flash);
+            saveg_write_pad();
+            saveg_write_lightflash_t((lightflash_t *) th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_StrobeFlash)
+        {
+            saveg_write8(tc_strobe);
+            saveg_write_pad();
+            saveg_write_strobe_t((strobe_t *) th);
+            continue;
+        }
+
+        if (th->function.acp1 == (actionf_p1)T_Glow)
+        {
+            saveg_write8(tc_glow);
+            saveg_write_pad();
+            saveg_write_glow_t((glow_t *) th);
+            continue;
+        }
+    }
+
+    // add a terminating marker
+    saveg_write8(tc_endspecials);
+}
+
+
+//
+// P_UnArchiveSpecials
+//
+void P_UnArchiveSpecials (void)
+{
+    byte                tclass;
+    ceiling_t*          ceiling;
+    vldoor_t*           door;
+    slidedoor_t*        slidedoor; // haleyjd [STRIFE]
+    floormove_t*        floor;
+    plat_t*             plat;
+    lightflash_t*       flash;
+    strobe_t*           strobe;
+    glow_t*             glow;
+
+
+    // read in saved thinkers
+    while (1)
+    {
+        tclass = saveg_read8();
+
+        switch (tclass)
+        {
+        case tc_endspecials:
+            return;	// end of list
+
+        case tc_ceiling:
+            saveg_read_pad();
+            ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL);
+            saveg_read_ceiling_t(ceiling);
+            ceiling->sector->specialdata = ceiling;
+
+            if (ceiling->thinker.function.acp1)
+                ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+
+            P_AddThinker (&ceiling->thinker);
+            P_AddActiveCeiling(ceiling);
+            break;
+
+        case tc_door:
+            saveg_read_pad();
+            door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL);
+            saveg_read_vldoor_t(door);
+            door->sector->specialdata = door;
+            door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
+            P_AddThinker (&door->thinker);
+            break;
+
+        case tc_slidingdoor:
+            // haleyjd 09/29/10: [STRIFE] New thinker type for sliding doors
+            saveg_read_pad();
+            slidedoor = Z_Malloc(sizeof(*slidedoor), PU_LEVEL, NULL);
+            saveg_read_slidedoor_t(slidedoor);
+            slidedoor->frontsector->specialdata = slidedoor;
+            slidedoor->thinker.function.acp1 = (actionf_p1)T_SlidingDoor;
+            P_AddThinker(&slidedoor->thinker);
+            break;
+
+        case tc_floor:
+            saveg_read_pad();
+            floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL);
+            saveg_read_floormove_t(floor);
+            floor->sector->specialdata = floor;
+            floor->thinker.function.acp1 = (actionf_p1)T_MoveFloor;
+            P_AddThinker (&floor->thinker);
+            break;
+
+        case tc_plat:
+            saveg_read_pad();
+            plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL);
+            saveg_read_plat_t(plat);
+            plat->sector->specialdata = plat;
+
+            if (plat->thinker.function.acp1)
+                plat->thinker.function.acp1 = (actionf_p1)T_PlatRaise;
+
+            P_AddThinker (&plat->thinker);
+            P_AddActivePlat(plat);
+            break;
+
+        case tc_flash:
+            saveg_read_pad();
+            flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL);
+            saveg_read_lightflash_t(flash);
+            flash->thinker.function.acp1 = (actionf_p1)T_LightFlash;
+            P_AddThinker (&flash->thinker);
+            break;
+
+        case tc_strobe:
+            saveg_read_pad();
+            strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL);
+            saveg_read_strobe_t(strobe);
+            strobe->thinker.function.acp1 = (actionf_p1)T_StrobeFlash;
+            P_AddThinker (&strobe->thinker);
+            break;
+
+        case tc_glow:
+            saveg_read_pad();
+            glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL);
+            saveg_read_glow_t(glow);
+            glow->thinker.function.acp1 = (actionf_p1)T_Glow;
+            P_AddThinker (&glow->thinker);
+            break;
+
+        default:
+            I_Error ("P_UnarchiveSpecials:Unknown tclass %i "
+                     "in savegame",tclass);
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/strife/p_saveg.h b/games/NXDoom/src/strife/p_saveg.h
new file mode 100644
index 000000000..d36f3b0da
--- /dev/null
+++ b/games/NXDoom/src/strife/p_saveg.h
@@ -0,0 +1,62 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Savegame I/O, archiving, persistence.
+//
+
+
+#ifndef __P_SAVEG__
+#define __P_SAVEG__
+
+#include <stdio.h>
+
+// maximum size of a savegame description
+
+#define SAVESTRINGSIZE 24
+
+// temporary filename to use while saving.
+
+char *P_TempSaveGameFile(void);
+
+// filename to use for a savegame slot
+
+char *P_SaveGameFile(int slot);
+
+// Savegame file header read/write functions
+
+boolean P_ReadSaveGameHeader(void);
+void P_WriteSaveGameHeader(char *description);
+
+// Savegame end-of-file read/write functions
+
+boolean P_ReadSaveGameEOF(void);
+void P_WriteSaveGameEOF(void);
+
+// Persistent storage/archiving.
+// These are the load / save game routines.
+void P_ArchivePlayers (void);
+void P_UnArchivePlayers (boolean userload);
+void P_ArchiveWorld (void);
+void P_UnArchiveWorld (void);
+void P_ArchiveThinkers (void);
+void P_UnArchiveThinkers (void);
+void P_ArchiveSpecials (void);
+void P_UnArchiveSpecials (void);
+
+extern FILE *save_stream;
+extern boolean savegame_error;
+
+
+#endif
diff --git a/games/NXDoom/src/strife/p_setup.c b/games/NXDoom/src/strife/p_setup.c
new file mode 100644
index 000000000..d6c3057b5
--- /dev/null
+++ b/games/NXDoom/src/strife/p_setup.c
@@ -0,0 +1,808 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Do all the WAD I/O, get map description,
+//	set up initial state and misc. LUTs.
+//
+
+
+
+#include <math.h>
+
+#include "z_zone.h"
+
+#include "deh_main.h"
+#include "i_swap.h"
+#include "m_argv.h"
+#include "m_bbox.h"
+
+#include "g_game.h"
+
+#include "i_system.h"
+#include "w_wad.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+#include "p_rejectpad.h"
+
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+
+void	P_SpawnMapThing (mapthing_t*	mthing);
+
+
+//
+// MAP related Lookup tables.
+// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
+//
+int		numvertexes;
+vertex_t*	vertexes;
+
+int		numsegs;
+seg_t*		segs;
+
+int		numsectors;
+sector_t*	sectors;
+
+int		numsubsectors;
+subsector_t*	subsectors;
+
+int		numnodes;
+node_t*		nodes;
+
+int		numlines;
+line_t*		lines;
+
+int		numsides;
+side_t*		sides;
+
+static int      totallines;
+
+// BLOCKMAP
+// Created from axis aligned bounding box
+// of the map, a rectangular array of
+// blocks of size ...
+// Used to speed up collision detection
+// by spatial subdivision in 2D.
+//
+// Blockmap size.
+int		bmapwidth;
+int		bmapheight;	// size in mapblocks
+short*		blockmap;	// int for larger maps
+// offsets in blockmap are from here
+short*		blockmaplump;		
+// origin of block map
+fixed_t		bmaporgx;
+fixed_t		bmaporgy;
+// for thing chains
+mobj_t**	blocklinks;		
+
+
+// REJECT
+// For fast sight rejection.
+// Speeds up enemy AI by skipping detailed
+//  LineOf Sight calculation.
+// Without special effect, this could be
+//  used as a PVS lookup as well.
+//
+byte*		rejectmatrix;
+
+
+// Maintain single and multi player starting spots.
+#define MAX_DEATHMATCH_STARTS	10
+
+mapthing_t	deathmatchstarts[MAX_DEATHMATCH_STARTS];
+mapthing_t*	deathmatch_p;
+mapthing_t	playerstarts[MAXPLAYERS];
+
+// haleyjd 08/24/10: [STRIFE] rift spots for player spawning
+mapthing_t      riftSpots[MAXRIFTSPOTS];
+
+
+
+
+//
+// P_LoadVertexes
+//
+void P_LoadVertexes (int lump)
+{
+    byte*		data;
+    int			i;
+    mapvertex_t*	ml;
+    vertex_t*		li;
+
+    // Determine number of lumps:
+    //  total lump length / vertex record length.
+    numvertexes = W_LumpLength (lump) / sizeof(mapvertex_t);
+
+    // Allocate zone memory for buffer.
+    vertexes = Z_Malloc (numvertexes*sizeof(vertex_t),PU_LEVEL,0);	
+
+    // Load data into cache.
+    data = W_CacheLumpNum (lump, PU_STATIC);
+	
+    ml = (mapvertex_t *)data;
+    li = vertexes;
+
+    // Copy and convert vertex coordinates,
+    // internal representation as fixed.
+    for (i=0 ; i<numvertexes ; i++, li++, ml++)
+    {
+	li->x = SHORT(ml->x)<<FRACBITS;
+	li->y = SHORT(ml->y)<<FRACBITS;
+    }
+
+    // Free buffer memory.
+    W_ReleaseLumpNum(lump);
+}
+
+
+
+//
+// P_LoadSegs
+//
+void P_LoadSegs (int lump)
+{
+    byte*		data;
+    int			i;
+    mapseg_t*		ml;
+    seg_t*		li;
+    line_t*		ldef;
+    int			linedef;
+    int			side;
+    int                 sidenum;
+	
+    numsegs = W_LumpLength (lump) / sizeof(mapseg_t);
+    segs = Z_Malloc (numsegs*sizeof(seg_t),PU_LEVEL,0);	
+    memset (segs, 0, numsegs*sizeof(seg_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    ml = (mapseg_t *)data;
+    li = segs;
+    for (i=0 ; i<numsegs ; i++, li++, ml++)
+    {
+	li->v1 = &vertexes[SHORT(ml->v1)];
+	li->v2 = &vertexes[SHORT(ml->v2)];
+
+	li->angle = (SHORT(ml->angle))<<16;
+	li->offset = (SHORT(ml->offset))<<16;
+	linedef = SHORT(ml->linedef);
+	ldef = &lines[linedef];
+	li->linedef = ldef;
+	side = SHORT(ml->side);
+	li->sidedef = &sides[ldef->sidenum[side]];
+	li->frontsector = sides[ldef->sidenum[side]].sector;
+
+        if (ldef-> flags & ML_TWOSIDED)
+        {
+            sidenum = ldef->sidenum[side ^ 1];
+
+            // If the sidenum is out of range, this may be a "glass hack"
+            // impassible window.  Point at side #0 (this may not be
+            // the correct Vanilla behavior; however, it seems to work for
+            // OTTAWAU.WAD, which is the one place I've seen this trick
+            // used).
+
+            if (sidenum < 0 || sidenum >= numsides)
+            {
+                sidenum = 0;
+            }
+
+            li->backsector = sides[sidenum].sector;
+        }
+        else
+        {
+	    li->backsector = 0;
+        }
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadSubsectors
+//
+void P_LoadSubsectors (int lump)
+{
+    byte*		data;
+    int			i;
+    mapsubsector_t*	ms;
+    subsector_t*	ss;
+	
+    numsubsectors = W_LumpLength (lump) / sizeof(mapsubsector_t);
+    subsectors = Z_Malloc (numsubsectors*sizeof(subsector_t),PU_LEVEL,0);	
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    ms = (mapsubsector_t *)data;
+    memset (subsectors,0, numsubsectors*sizeof(subsector_t));
+    ss = subsectors;
+    
+    for (i=0 ; i<numsubsectors ; i++, ss++, ms++)
+    {
+	ss->numlines = SHORT(ms->numsegs);
+	ss->firstline = SHORT(ms->firstseg);
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+
+//
+// P_LoadSectors
+//
+void P_LoadSectors (int lump)
+{
+    byte*		data;
+    int			i;
+    mapsector_t*	ms;
+    sector_t*		ss;
+	
+    numsectors = W_LumpLength (lump) / sizeof(mapsector_t);
+    sectors = Z_Malloc (numsectors*sizeof(sector_t),PU_LEVEL,0);	
+    memset (sectors, 0, numsectors*sizeof(sector_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    ms = (mapsector_t *)data;
+    ss = sectors;
+    for (i=0 ; i<numsectors ; i++, ss++, ms++)
+    {
+	ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
+	ss->ceilingheight = SHORT(ms->ceilingheight)<<FRACBITS;
+	ss->floorpic = R_FlatNumForName(ms->floorpic);
+	ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
+	ss->lightlevel = SHORT(ms->lightlevel);
+	ss->special = SHORT(ms->special);
+	ss->tag = SHORT(ms->tag);
+	ss->thinglist = NULL;
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadNodes
+//
+void P_LoadNodes (int lump)
+{
+    byte*	data;
+    int		i;
+    int		j;
+    int		k;
+    mapnode_t*	mn;
+    node_t*	no;
+	
+    numnodes = W_LumpLength (lump) / sizeof(mapnode_t);
+    nodes = Z_Malloc (numnodes*sizeof(node_t),PU_LEVEL,0);	
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    mn = (mapnode_t *)data;
+    no = nodes;
+    
+    for (i=0 ; i<numnodes ; i++, no++, mn++)
+    {
+	no->x = SHORT(mn->x)<<FRACBITS;
+	no->y = SHORT(mn->y)<<FRACBITS;
+	no->dx = SHORT(mn->dx)<<FRACBITS;
+	no->dy = SHORT(mn->dy)<<FRACBITS;
+	for (j=0 ; j<2 ; j++)
+	{
+	    no->children[j] = SHORT(mn->children[j]);
+	    for (k=0 ; k<4 ; k++)
+		no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
+	}
+    }
+	
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadThings
+//
+// haleyjd 08/24/10: [STRIFE]:
+// * Added code to record rift spots
+void P_LoadThings (int lump)
+{
+    byte               *data;
+    int			i;
+    mapthing_t         *mt;
+    mapthing_t          spawnthing;
+    int			numthings;
+//    boolean		spawn;
+
+    data = W_CacheLumpNum (lump,PU_STATIC);
+    numthings = W_LumpLength (lump) / sizeof(mapthing_t);
+
+    mt = (mapthing_t *)data;
+    for (i=0 ; i<numthings ; i++, mt++)
+    {
+//        spawn = true;
+
+        // Do not spawn cool, new monsters if !commercial
+        // STRIFE-TODO: replace with isregistered stuff
+        /*
+        if (gamemode != commercial)
+        {
+            switch (SHORT(mt->type))
+            {
+            case 68:	// Arachnotron
+            case 64:	// Archvile
+            case 88:	// Boss Brain
+            case 89:	// Boss Shooter
+            case 69:	// Hell Knight
+            case 67:	// Mancubus
+            case 71:	// Pain Elemental
+            case 65:	// Former Human Commando
+            case 66:	// Revenant
+            case 84:	// Wolf SS
+                spawn = false;
+                break;
+            }
+        }
+        if (spawn == false)
+            break;
+        */
+
+        // Do spawn all other stuff. 
+        spawnthing.x = SHORT(mt->x);
+        spawnthing.y = SHORT(mt->y);
+        spawnthing.angle = SHORT(mt->angle);
+        spawnthing.type = SHORT(mt->type);
+        spawnthing.options = SHORT(mt->options);
+
+        // haleyjd 08/24/2010: Special Strife checks
+        if(spawnthing.type >= 118 && spawnthing.type < 128)
+        {
+            // initialize riftSpots
+            int riftSpotNum = spawnthing.type - 118;
+            riftSpots[riftSpotNum] = spawnthing;
+            riftSpots[riftSpotNum].type = 1;
+        }
+        else if(spawnthing.type >= 9001 && spawnthing.type < 9011)
+        {
+            // STRIFE-TODO: mystery array of 90xx objects
+        }
+        else
+            P_SpawnMapThing(&spawnthing);
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadLineDefs
+// Also counts secret lines for intermissions.
+//
+void P_LoadLineDefs (int lump)
+{
+    byte*		data;
+    int			i;
+    maplinedef_t*	mld;
+    line_t*		ld;
+    vertex_t*		v1;
+    vertex_t*		v2;
+	
+    numlines = W_LumpLength (lump) / sizeof(maplinedef_t);
+    lines = Z_Malloc (numlines*sizeof(line_t),PU_LEVEL,0);	
+    memset (lines, 0, numlines*sizeof(line_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    mld = (maplinedef_t *)data;
+    ld = lines;
+    for (i=0 ; i<numlines ; i++, mld++, ld++)
+    {
+	ld->flags = SHORT(mld->flags);
+	ld->special = SHORT(mld->special);
+	ld->tag = SHORT(mld->tag);
+	v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
+	v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
+	ld->dx = v2->x - v1->x;
+	ld->dy = v2->y - v1->y;
+	
+	if (!ld->dx)
+	    ld->slopetype = ST_VERTICAL;
+	else if (!ld->dy)
+	    ld->slopetype = ST_HORIZONTAL;
+	else
+	{
+	    if (FixedDiv (ld->dy , ld->dx) > 0)
+		ld->slopetype = ST_POSITIVE;
+	    else
+		ld->slopetype = ST_NEGATIVE;
+	}
+		
+	if (v1->x < v2->x)
+	{
+	    ld->bbox[BOXLEFT] = v1->x;
+	    ld->bbox[BOXRIGHT] = v2->x;
+	}
+	else
+	{
+	    ld->bbox[BOXLEFT] = v2->x;
+	    ld->bbox[BOXRIGHT] = v1->x;
+	}
+
+	if (v1->y < v2->y)
+	{
+	    ld->bbox[BOXBOTTOM] = v1->y;
+	    ld->bbox[BOXTOP] = v2->y;
+	}
+	else
+	{
+	    ld->bbox[BOXBOTTOM] = v2->y;
+	    ld->bbox[BOXTOP] = v1->y;
+	}
+
+	ld->sidenum[0] = SHORT(mld->sidenum[0]);
+	ld->sidenum[1] = SHORT(mld->sidenum[1]);
+
+	if (ld->sidenum[0] != -1)
+	    ld->frontsector = sides[ld->sidenum[0]].sector;
+	else
+	    ld->frontsector = 0;
+
+	if (ld->sidenum[1] != -1)
+	    ld->backsector = sides[ld->sidenum[1]].sector;
+	else
+	    ld->backsector = 0;
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadSideDefs
+//
+void P_LoadSideDefs (int lump)
+{
+    byte*		data;
+    int			i;
+    mapsidedef_t*	msd;
+    side_t*		sd;
+	
+    numsides = W_LumpLength (lump) / sizeof(mapsidedef_t);
+    sides = Z_Malloc (numsides*sizeof(side_t),PU_LEVEL,0);	
+    memset (sides, 0, numsides*sizeof(side_t));
+    data = W_CacheLumpNum (lump,PU_STATIC);
+	
+    msd = (mapsidedef_t *)data;
+    sd = sides;
+    for (i=0 ; i<numsides ; i++, msd++, sd++)
+    {
+	sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
+	sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
+	sd->toptexture = R_TextureNumForName(msd->toptexture);
+	sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+	sd->midtexture = R_TextureNumForName(msd->midtexture);
+	sd->sector = &sectors[SHORT(msd->sector)];
+    }
+
+    W_ReleaseLumpNum(lump);
+}
+
+
+//
+// P_LoadBlockMap
+//
+void P_LoadBlockMap (int lump)
+{
+    int i;
+    int count;
+    int lumplen;
+
+    lumplen = W_LumpLength(lump);
+    count = lumplen / 2;
+	
+    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
+    W_ReadLump(lump, blockmaplump);
+    blockmap = blockmaplump + 4;
+
+    // Swap all short integers to native byte ordering.
+  
+    for (i=0; i<count; i++)
+    {
+	blockmaplump[i] = SHORT(blockmaplump[i]);
+    }
+		
+    // Read the header
+
+    bmaporgx = blockmaplump[0]<<FRACBITS;
+    bmaporgy = blockmaplump[1]<<FRACBITS;
+    bmapwidth = blockmaplump[2];
+    bmapheight = blockmaplump[3];
+	
+    // Clear out mobj chains
+
+    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
+    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
+    memset(blocklinks, 0, count);
+}
+
+
+
+//
+// P_GroupLines
+// Builds sector line lists and subsector sector numbers.
+// Finds block bounding boxes for sectors.
+//
+void P_GroupLines (void)
+{
+    line_t**		linebuffer;
+    int			i;
+    int			j;
+    line_t*		li;
+    sector_t*		sector;
+    subsector_t*	ss;
+    seg_t*		seg;
+    fixed_t		bbox[4];
+    int			block;
+	
+    // look up sector number for each subsector
+    ss = subsectors;
+    for (i=0 ; i<numsubsectors ; i++, ss++)
+    {
+	seg = &segs[ss->firstline];
+	ss->sector = seg->sidedef->sector;
+    }
+
+    // count number of lines in each sector
+    li = lines;
+    totallines = 0;
+    for (i=0 ; i<numlines ; i++, li++)
+    {
+	totallines++;
+	li->frontsector->linecount++;
+
+	if (li->backsector && li->backsector != li->frontsector)
+	{
+	    li->backsector->linecount++;
+	    totallines++;
+	}
+    }
+
+    // build line tables for each sector	
+    linebuffer = Z_Malloc (totallines*sizeof(line_t *), PU_LEVEL, 0);
+
+    for (i=0; i<numsectors; ++i)
+    {
+        // Assign the line buffer for this sector
+
+        sectors[i].lines = linebuffer;
+        linebuffer += sectors[i].linecount;
+
+        // Reset linecount to zero so in the next stage we can count
+        // lines into the list.
+
+        sectors[i].linecount = 0;
+    }
+
+    // Assign lines to sectors
+
+    for (i=0; i<numlines; ++i)
+    { 
+        li = &lines[i];
+
+        if (li->frontsector != NULL)
+        {
+            sector = li->frontsector;
+
+            sector->lines[sector->linecount] = li;
+            ++sector->linecount;
+        }
+
+        if (li->backsector != NULL && li->frontsector != li->backsector)
+        {
+            sector = li->backsector;
+
+            sector->lines[sector->linecount] = li;
+            ++sector->linecount;
+        }
+    }
+    
+    // Generate bounding boxes for sectors
+	
+    sector = sectors;
+    for (i=0 ; i<numsectors ; i++, sector++)
+    {
+	M_ClearBox (bbox);
+
+	for (j=0 ; j<sector->linecount; j++)
+	{
+            li = sector->lines[j];
+
+            M_AddToBox (bbox, li->v1->x, li->v1->y);
+            M_AddToBox (bbox, li->v2->x, li->v2->y);
+	}
+
+	// set the degenmobj_t to the middle of the bounding box
+	sector->soundorg.x = (bbox[BOXRIGHT]+bbox[BOXLEFT])/2;
+	sector->soundorg.y = (bbox[BOXTOP]+bbox[BOXBOTTOM])/2;
+		
+	// adjust bounding box to map blocks
+	block = (bbox[BOXTOP]-bmaporgy+MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block >= bmapheight ? bmapheight-1 : block;
+	sector->blockbox[BOXTOP]=block;
+
+	block = (bbox[BOXBOTTOM]-bmaporgy-MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block < 0 ? 0 : block;
+	sector->blockbox[BOXBOTTOM]=block;
+
+	block = (bbox[BOXRIGHT]-bmaporgx+MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block >= bmapwidth ? bmapwidth-1 : block;
+	sector->blockbox[BOXRIGHT]=block;
+
+	block = (bbox[BOXLEFT]-bmaporgx-MAXRADIUS)>>MAPBLOCKSHIFT;
+	block = block < 0 ? 0 : block;
+	sector->blockbox[BOXLEFT]=block;
+    }
+	
+}
+
+
+static void P_LoadReject(int lumpnum)
+{
+    int minlength;
+    int lumplen;
+
+    // Calculate the size that the REJECT lump *should* be.
+
+    minlength = (numsectors * numsectors + 7) / 8;
+
+    // If the lump meets the minimum length, it can be loaded directly.
+    // Otherwise, we need to allocate a buffer of the correct size
+    // and pad it with appropriate data.
+
+    lumplen = W_LumpLength(lumpnum);
+
+    if (lumplen >= minlength)
+    {
+        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
+    }
+    else
+    {
+        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
+        W_ReadLump(lumpnum, rejectmatrix);
+
+        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
+    }
+}
+
+//
+// P_SetupLevel
+//
+void
+P_SetupLevel
+( int       map,
+  int       playermask,
+  skill_t   skill)
+{
+    int     i;
+    char    lumpname[9];
+    int     lumpnum;
+
+    // haleyjd 20110205 [STRIFE]: removed totalitems and wminfo
+    totalkills =  totalsecret = 0;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+        // haleyjd 20100830: [STRIFE] Removed secretcount, itemcount
+        //         20110205: [STRIFE] Initialize players.allegiance
+        players[i].allegiance = i;
+        players[i].killcount = 0;
+    }
+
+    // Initial height of PointOfView
+    // will be set by player think.
+    players[consoleplayer].viewz = 1; 
+
+    // Make sure all sounds are stopped before Z_FreeTags.
+    S_Start ();
+
+    
+#if 0 // UNUSED
+    if (debugfile)
+    {
+        Z_FreeTags (PU_LEVEL, INT_MAX);
+        Z_FileDumpHeap (debugfile);
+    }
+    else
+#endif
+    Z_FreeTags (PU_LEVEL, PU_PURGELEVEL-1);
+
+
+    // UNUSED W_Profile ();
+    P_InitThinkers ();
+
+    // if working with a devlopment map, reload it
+    W_Reload();
+
+    // [STRIFE] Removed ExMy map support
+    if (map<10)
+        DEH_snprintf(lumpname, 9, "map0%i", map);
+    else
+        DEH_snprintf(lumpname, 9, "map%i", map);
+
+    lumpnum = W_GetNumForName (lumpname);
+
+    leveltime = 0;
+
+    // note: most of this ordering is important	
+    P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
+    P_LoadVertexes (lumpnum+ML_VERTEXES);
+    P_LoadSectors (lumpnum+ML_SECTORS);
+    P_LoadSideDefs (lumpnum+ML_SIDEDEFS);
+
+    P_LoadLineDefs (lumpnum+ML_LINEDEFS);
+    P_LoadSubsectors (lumpnum+ML_SSECTORS);
+    P_LoadNodes (lumpnum+ML_NODES);
+    P_LoadSegs (lumpnum+ML_SEGS);
+
+    P_GroupLines ();
+    P_LoadReject (lumpnum+ML_REJECT);
+
+    //bodyqueslot = 0; [STRIFE] unused
+    deathmatch_p = deathmatchstarts;
+    P_LoadThings (lumpnum+ML_THINGS);
+    
+    // if deathmatch, randomly spawn the active players
+    if (deathmatch)
+    {
+        for (i=0 ; i<MAXPLAYERS ; i++)
+            if (playeringame[i])
+            {
+                players[i].mo = NULL;
+                G_DeathMatchSpawnPlayer (i);
+            }
+
+    }
+
+    // clear special respawning que
+    iquehead = iquetail = 0;
+
+    // set up world state
+    P_SpawnSpecials ();
+
+    // build subsector connect matrix
+    // UNUSED P_ConnectSubsectors ();
+
+    // preload graphics
+    if (precache)
+        R_PrecacheLevel ();
+
+    //printf ("free memory: 0x%x\n", Z_FreeMemory());
+}
+
+
+
+//
+// P_Init
+//
+void P_Init (void)
+{
+    P_InitSwitchList();
+    P_InitPicAnims();
+    P_InitTerrainTypes();   // villsa [STRIFE]
+    R_InitSprites(sprnames);
+}
+
+
+
diff --git a/games/NXDoom/src/strife/p_setup.h b/games/NXDoom/src/strife/p_setup.h
new file mode 100644
index 000000000..393d76d8c
--- /dev/null
+++ b/games/NXDoom/src/strife/p_setup.h
@@ -0,0 +1,37 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//   Setup a game, startup stuff.
+//
+
+
+#ifndef __P_SETUP__
+#define __P_SETUP__
+
+
+
+
+// NOT called by W_Ticker. Fixme.
+// [STRIFE] Removed episode parameter
+void
+P_SetupLevel
+( int		map,
+  int		playermask,
+  skill_t	skill);
+
+// Called by startup code.
+void P_Init (void);
+
+#endif
diff --git a/games/NXDoom/src/strife/p_sight.c b/games/NXDoom/src/strife/p_sight.c
new file mode 100644
index 000000000..ed6e09e6e
--- /dev/null
+++ b/games/NXDoom/src/strife/p_sight.c
@@ -0,0 +1,360 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	LineOfSight/Visibility checks, uses REJECT Lookup Table.
+//
+
+
+
+#include "doomdef.h"
+
+#include "i_system.h"
+#include "p_local.h"
+
+// State.
+#include "r_state.h"
+
+//
+// P_CheckSight
+//
+fixed_t         sightzstart;        // eye z of looker
+fixed_t         topslope;
+fixed_t         bottomslope;        // slopes to top and bottom of target
+
+divline_t       strace;             // from t1 to t2
+fixed_t         t2x;
+fixed_t         t2y;
+
+int             sightcounts[2];
+
+
+//
+// P_DivlineSide
+// Returns side 0 (front), 1 (back), or 2 (on).
+//
+// [STRIFE] Verified unmodified
+//
+int
+P_DivlineSide
+( fixed_t       x,
+  fixed_t       y,
+  divline_t*    node )
+{
+    fixed_t     dx;
+    fixed_t     dy;
+    fixed_t     left;
+    fixed_t     right;
+
+    if (!node->dx)
+    {
+        if (x==node->x)
+            return 2;
+
+        if (x <= node->x)
+            return node->dy > 0;
+
+        return node->dy < 0;
+    }
+
+    if (!node->dy)
+    {
+        if (x==node->y)
+            return 2;
+
+        if (y <= node->y)
+            return node->dx < 0;
+
+        return node->dx > 0;
+    }
+
+    dx = (x - node->x);
+    dy = (y - node->y);
+
+    left =  (node->dy>>FRACBITS) * (dx>>FRACBITS);
+    right = (dy>>FRACBITS) * (node->dx>>FRACBITS);
+
+    if (right < left)
+        return 0;       // front side
+
+    if (left == right)
+        return 2;
+    return 1;           // back side
+}
+
+
+//
+// P_InterceptVector2
+// Returns the fractional intercept point
+// along the first divline.
+// This is only called by the addthings and addlines traversers.
+//
+// [STRIFE] Verified unmodified
+//
+fixed_t
+P_InterceptVector2
+( divline_t*        v2,
+  divline_t*        v1 )
+{
+    fixed_t	frac;
+    fixed_t	num;
+    fixed_t	den;
+
+    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
+
+    if (den == 0)
+        return 0;
+    //	I_Error ("P_InterceptVector: parallel");
+
+    num = FixedMul ( (v1->x - v2->x)>>8 ,v1->dy) + 
+        FixedMul ( (v2->y - v1->y)>>8 , v1->dx);
+    frac = FixedDiv (num , den);
+
+    return frac;
+}
+
+//
+// P_CrossSubsector
+// Returns true
+//  if strace crosses the given subsector successfully.
+//
+// [STRIFE] Verified unmodified
+//
+boolean P_CrossSubsector (int num)
+{
+    seg_t*          seg;
+    line_t*         line;
+    int             s1;
+    int             s2;
+    int             count;
+    subsector_t*    sub;
+    sector_t*       front;
+    sector_t*       back;
+    fixed_t         opentop;
+    fixed_t         openbottom;
+    divline_t       divl;
+    vertex_t*       v1;
+    vertex_t*       v2;
+    fixed_t         frac;
+    fixed_t         slope;
+
+#ifdef RANGECHECK
+    if (num>=numsubsectors)
+        I_Error ("P_CrossSubsector: ss %i with numss = %i",
+                 num,
+                 numsubsectors);
+#endif
+
+    sub = &subsectors[num];
+    
+    // check lines
+    count = sub->numlines;
+    seg = &segs[sub->firstline];
+
+    for ( ; count ; seg++, count--)
+    {
+        line = seg->linedef;
+
+        // allready checked other side?
+        if (line->validcount == validcount)
+            continue;
+
+        line->validcount = validcount;
+
+        v1 = line->v1;
+        v2 = line->v2;
+        s1 = P_DivlineSide (v1->x, v1->y, &strace);
+        s2 = P_DivlineSide (v2->x, v2->y, &strace);
+
+        // line isn't crossed?
+        if (s1 == s2)
+            continue;
+
+        divl.x = v1->x;
+        divl.y = v1->y;
+        divl.dx = v2->x - v1->x;
+        divl.dy = v2->y - v1->y;
+        s1 = P_DivlineSide (strace.x, strace.y, &divl);
+        s2 = P_DivlineSide (t2x, t2y, &divl);
+
+        // line isn't crossed?
+        if (s1 == s2)
+            continue;
+
+        // Backsector may be NULL if this is an "impassible
+        // glass" hack line.
+
+        if (line->backsector == NULL)
+        {
+            return false;
+        }
+
+        // stop because it is not two sided anyway
+        // might do this after updating validcount?
+        if ( !(line->flags & ML_TWOSIDED) )
+            return false;
+
+        // crosses a two sided line
+        front = seg->frontsector;
+        back = seg->backsector;
+
+        // no wall to block sight with?
+        if (front->floorheight == back->floorheight
+            && front->ceilingheight == back->ceilingheight)
+            continue;
+
+        // possible occluder
+        // because of ceiling height differences
+        if (front->ceilingheight < back->ceilingheight)
+            opentop = front->ceilingheight;
+        else
+            opentop = back->ceilingheight;
+
+        // because of ceiling height differences
+        if (front->floorheight > back->floorheight)
+            openbottom = front->floorheight;
+        else
+            openbottom = back->floorheight;
+
+        // quick test for totally closed doors
+        if (openbottom >= opentop)
+            return false;           // stop
+
+        frac = P_InterceptVector2 (&strace, &divl);
+
+        if (front->floorheight != back->floorheight)
+        {
+            slope = FixedDiv (openbottom - sightzstart , frac);
+            if (slope > bottomslope)
+                bottomslope = slope;
+        }
+
+        if (front->ceilingheight != back->ceilingheight)
+        {
+            slope = FixedDiv (opentop - sightzstart , frac);
+            if (slope < topslope)
+                topslope = slope;
+        }
+
+        if (topslope <= bottomslope)
+            return false;           // stop
+    }
+    // passed the subsector ok
+    return true;
+}
+
+
+
+//
+// P_CrossBSPNode
+// Returns true
+//  if strace crosses the given node successfully.
+//
+// [STRIFE] Verified unmodified
+//
+boolean P_CrossBSPNode (int bspnum)
+{
+    node_t*     bsp;
+    int         side;
+
+    if (bspnum & NF_SUBSECTOR)
+    {
+        if (bspnum == -1)
+            return P_CrossSubsector (0);
+        else
+            return P_CrossSubsector (bspnum&(~NF_SUBSECTOR));
+    }
+
+    bsp = &nodes[bspnum];
+
+    // decide which side the start point is on
+    side = P_DivlineSide (strace.x, strace.y, (divline_t *)bsp);
+    if (side == 2)
+        side = 0;       // an "on" should cross both sides
+
+    // cross the starting side
+    if (!P_CrossBSPNode (bsp->children[side]) )
+        return false;
+
+    // the partition plane is crossed here
+    if (side == P_DivlineSide (t2x, t2y,(divline_t *)bsp))
+    {
+        // the line doesn't touch the other side
+        return true;
+    }
+
+    // cross the ending side
+    return P_CrossBSPNode (bsp->children[side^1]);
+}
+
+
+//
+// P_CheckSight
+// Returns true
+//  if a straight line between t1 and t2 is unobstructed.
+// Uses REJECT.
+//
+// [STRIFE] Verified unmodified
+//
+boolean
+P_CheckSight
+( mobj_t*       t1,
+  mobj_t*       t2 )
+{
+    int         s1;
+    int         s2;
+    int         pnum;
+    int         bytenum;
+    int         bitnum;
+    
+    // First check for trivial rejection.
+
+    // Determine subsector entries in REJECT table.
+    s1 = (t1->subsector->sector - sectors);
+    s2 = (t2->subsector->sector - sectors);
+    pnum = s1*numsectors + s2;
+    bytenum = pnum>>3;
+    bitnum = 1 << (pnum&7);
+
+    // Check in REJECT table.
+    if (rejectmatrix[bytenum]&bitnum)
+    {
+        sightcounts[0]++;
+
+        // can't possibly be connected
+        return false;
+    }
+
+    // An unobstructed LOS is possible.
+    // Now look from eyes of t1 to any part of t2.
+    sightcounts[1]++;
+
+    validcount++;
+
+    sightzstart = t1->z + t1->height - (t1->height>>2);
+    topslope = (t2->z+t2->height) - sightzstart;
+    bottomslope = (t2->z) - sightzstart;
+
+    strace.x = t1->x;
+    strace.y = t1->y;
+    t2x = t2->x;
+    t2y = t2->y;
+    strace.dx = t2->x - t1->x;
+    strace.dy = t2->y - t1->y;
+
+    // the head node is the last node output
+    return P_CrossBSPNode (numnodes-1);	
+}
+
+
diff --git a/games/NXDoom/src/strife/p_spec.c b/games/NXDoom/src/strife/p_spec.c
new file mode 100644
index 000000000..de01eaa44
--- /dev/null
+++ b/games/NXDoom/src/strife/p_spec.c
@@ -0,0 +1,1984 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Implements special effects:
+//	Texture animation, height or lighting changes
+//	 according to adjacent sectors, respective
+//	 utility functions, etc.
+//	Line Tag handling. Line and Sector triggers.
+//
+
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "deh_main.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_argv.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+#include "p_local.h"
+
+#include "g_game.h"
+
+#include "s_sound.h"
+
+// State.
+#include "r_state.h"
+
+// Data.
+#include "sounds.h"
+
+// [STRIFE]
+#include "hu_stuff.h"
+#include "p_dialog.h"
+
+
+//
+// Animating textures and planes
+// There is another anim_t used in wi_stuff, unrelated.
+//
+typedef struct
+{
+    boolean	istexture;
+    int		picnum;
+    int		basepic;
+    int		numpics;
+    int		speed;
+    
+} anim_t;
+
+//
+//      source animation definition
+//
+typedef struct
+{
+    int 	istexture;	// if false, it is a flat
+    char	endname[9];
+    char	startname[9];
+    int		speed;
+} animdef_t;
+
+
+// haleyjd 08/30/10: [STRIFE] MAXANIMS raised from 32 to 40
+#define MAXANIMS                40
+
+//
+// P_InitPicAnims
+//
+
+// Floor/ceiling animation sequences,
+//  defined by first and last frame,
+//  i.e. the flat (64x64 tile) name to
+//  be used.
+// The full animation sequence is given
+//  using all the flats between the start
+//  and end entry, in the order found in
+//  the WAD file.
+//
+// haleyjd 08/29/10: [STRIFE] Changed animdefs.
+//
+animdef_t               animdefs[] =
+{
+    { false, "F_SCANR8", "F_SCANR5",  4},
+    { false, "F_WATR03", "F_WATR01",  8},
+    { false, "F_PWATR3", "F_PWATR1", 11},
+    { false, "F_SCANR4", "F_SCANR1",  4},
+    { true,  "SCAN08",   "SCAN05",    4},
+    { true,  "SWTRMG03", "SWTRMG01",  4},
+    { true,  "SCAN04",   "SCAN01",    4},
+    { true,  "COMP04",   "COMP01",    4},
+    { true,  "COMP08",   "COMP05",    6},
+    { true,  "COMP12",   "COMP09",   11},
+    { true,  "COMP16",   "COMP13",   12},
+    { true,  "COMP20",   "COMP17",   12},
+    { true,  "COMP24",   "COMP21",   12},
+    { true,  "COMP28",   "COMP25",   12},
+    { true,  "COMP32",   "COMP29",   12},
+    { true,  "COMP37",   "COMP33",   12},
+    { true,  "COMP41",   "COMP38",   12},
+    { true,  "COMP49",   "COMP42",   10},
+    { true,  "BRKGRY16", "BRKGRY13", 10},
+    { true,  "BRNSCN04", "BRNSCN01", 10},
+    { true,  "CONCRT12", "CONCRT09", 11},
+    { true,  "CONCRT25", "CONCRT22", 11},
+    { true,  "WALPMP02", "WALPMP01", 16},
+    { true,  "WALTEK17", "WALTEK16",  8},
+    { true,  "FORCE04",  "FORCE01",   4},
+    { true,  "FORCE08",  "FORCE05",   4},
+    { true,  "FAN02",    "FAN01",     4},
+    { false, "F_VWATR3", "P_VWATR1",  4},
+    { false, "F_HWATR3", "F_HWATR1",  4},
+    { false, "F_TELE2",  "F_TELE1",   4},
+    { false, "F_FAN2",   "F_FAN1",    4},
+    { false, "F_CONVY2", "F_CONVY1",  4},
+    { false, "F_RDALN4", "F_RDALN1",  4},
+    { -1,    "",         "",          0},
+};
+
+anim_t  anims[MAXANIMS];
+anim_t* lastanim;
+
+//
+//      Animating line specials
+//
+// haleyjd 08/29/10: [STRIFE] MAXLINEANIMS raised from 64 to 96
+#define MAXLINEANIMS            96
+
+short   numlinespecials = 0;
+line_t *linespeciallist[MAXLINEANIMS];
+
+
+
+void P_InitPicAnims (void)
+{
+    int		i;
+
+    
+    //	Init animation
+    lastanim = anims;
+    for (i=0 ; animdefs[i].istexture != -1 ; i++)
+    {
+        const char *startname, *endname;
+
+        startname = DEH_String(animdefs[i].startname);
+        endname = DEH_String(animdefs[i].endname);
+
+        if (animdefs[i].istexture)
+        {
+            // different episode ?
+            if (R_CheckTextureNumForName(startname) == -1)
+                continue;	
+
+            lastanim->picnum = R_TextureNumForName(endname);
+            lastanim->basepic = R_TextureNumForName(startname);
+        }
+        else
+        {
+            if (W_CheckNumForName(startname) == -1)
+                continue;
+
+            lastanim->picnum = R_FlatNumForName(endname);
+            lastanim->basepic = R_FlatNumForName(startname);
+        }
+
+        lastanim->istexture = animdefs[i].istexture;
+        lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
+
+        if (lastanim->numpics < 2)
+            I_Error ("P_InitPicAnims: bad cycle from %s to %s",
+            startname, endname);
+
+        lastanim->speed = animdefs[i].speed;
+        lastanim++;
+    }
+
+}
+
+// villsa [STRIFE] terrain type definitions
+typedef struct
+{
+    const char *flat;
+    int     type;
+    int     num;
+} terraintype_t;
+
+terraintype_t   terraintypes[] =
+{
+    {   "F_WATR03", FLOOR_WATER,    -1  },
+    {   "F_WATR02", FLOOR_WATER,    -1  },
+    {   "F_WATR01", FLOOR_WATER,    -1  },
+    {   "F_VWATR3", FLOOR_WATER,    -1  },
+    {   "F_VWATR2", FLOOR_WATER,    -1  },
+    {   "P_VWATR1", FLOOR_WATER,    -1  },
+    {   "F_HWATR3", FLOOR_WATER,    -1  },
+    {   "F_HWATR2", FLOOR_WATER,    -1  },
+    {   "F_HWATR1", FLOOR_WATER,    -1  },
+    {   "F_PWATR3", FLOOR_SLIME,    -1  },
+    {   "F_PWATR2", FLOOR_SLIME,    -1  },
+    {   "F_PWATR1", FLOOR_SLIME,    -1  },
+    {   "END",      FLOOR_END,      -1  },
+};
+
+//
+// P_GetTerrainType
+// villsa [STRIFE] new function
+//
+
+terraintype_e P_GetTerrainType(mobj_t* mobj)
+{
+    int i = 0;
+    subsector_t* ss = mobj->subsector;
+
+    if(mobj->z <= ss->sector->floorheight &&
+        terraintypes[0].type != FLOOR_END)
+    {
+        while(ss->sector->floorpic != terraintypes[i].num)
+        {
+            if(terraintypes[i+1].type == FLOOR_END)
+                return FLOOR_SOLID;
+
+            i++;
+        }
+
+        return terraintypes[i].type;
+    }
+
+    return FLOOR_SOLID;
+}
+
+//
+// P_InitTerrainTypes
+// villsa [STRIFE] new function
+// Initialize terrain types
+//
+
+void P_InitTerrainTypes(void)
+{
+    int i = 0;
+
+    if(terraintypes[0].type != FLOOR_END)
+    {
+        while(terraintypes[i].type != FLOOR_END)
+        {
+            terraintypes[i].num = R_FlatNumForName(terraintypes[i].flat);
+            i++;
+        }
+    }
+}
+
+
+
+//
+// UTILITIES
+//
+
+
+
+//
+// getSide()
+// Will return a side_t*
+//  given the number of the current sector,
+//  the line number, and the side (0/1) that you want.
+//
+side_t*
+getSide
+( int		currentSector,
+  int		line,
+  int		side )
+{
+    return &sides[ (sectors[currentSector].lines[line])->sidenum[side] ];
+}
+
+
+//
+// getSector()
+// Will return a sector_t*
+//  given the number of the current sector,
+//  the line number and the side (0/1) that you want.
+//
+sector_t*
+getSector
+( int		currentSector,
+  int		line,
+  int		side )
+{
+    return sides[ (sectors[currentSector].lines[line])->sidenum[side] ].sector;
+}
+
+
+//
+// twoSided()
+// Given the sector number and the line number,
+//  it will tell you whether the line is two-sided or not.
+//
+int
+twoSided
+( int	sector,
+  int	line )
+{
+    return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
+}
+
+
+
+
+//
+// getNextSector()
+// Return sector_t * of sector next to current.
+// NULL if not two-sided line
+//
+sector_t*
+getNextSector
+( line_t*	line,
+  sector_t*	sec )
+{
+    if (!(line->flags & ML_TWOSIDED))
+	return NULL;
+		
+    if (line->frontsector == sec)
+	return line->backsector;
+	
+    return line->frontsector;
+}
+
+
+
+//
+// P_FindLowestFloorSurrounding()
+// FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+fixed_t	P_FindLowestFloorSurrounding(sector_t* sec)
+{
+    int			i;
+    line_t*		check;
+    sector_t*		other;
+    fixed_t		floor = sec->floorheight;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+
+	if (!other)
+	    continue;
+	
+	if (other->floorheight < floor)
+	    floor = other->floorheight;
+    }
+    return floor;
+}
+
+
+
+//
+// P_FindHighestFloorSurrounding()
+// FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
+//
+fixed_t	P_FindHighestFloorSurrounding(sector_t *sec)
+{
+    int			i;
+    line_t*		check;
+    sector_t*		other;
+    fixed_t		floor = -500*FRACUNIT;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+	
+	if (!other)
+	    continue;
+	
+	if (other->floorheight > floor)
+	    floor = other->floorheight;
+    }
+    return floor;
+}
+
+
+
+//
+// P_FindNextHighestFloor
+// FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
+// Note: this should be doable w/o a fixed array.
+
+// Thanks to entryway for the Vanilla overflow emulation.
+
+// 20 adjoining sectors max!
+#define MAX_ADJOINING_SECTORS     20
+
+fixed_t
+P_FindNextHighestFloor
+( sector_t* sec,
+  int       currentheight )
+{
+    int         i;
+    int         h;
+    int         min;
+    line_t*     check;
+    sector_t*   other;
+    fixed_t     height = currentheight;
+    fixed_t     heightlist[MAX_ADJOINING_SECTORS + 2];
+
+    for (i=0, h=0; i < sec->linecount; i++)
+    {
+        check = sec->lines[i];
+        other = getNextSector(check,sec);
+
+        if (!other)
+            continue;
+        
+        if (other->floorheight > height)
+        {
+            // Emulation of memory (stack) overflow
+            if (h == MAX_ADJOINING_SECTORS + 1)
+            {
+                height = other->floorheight;
+            }
+            else if (h == MAX_ADJOINING_SECTORS + 2)
+            {
+                // Fatal overflow: game crashes at 22 sectors
+                I_Error("Sector with more than 22 adjoining sectors. "
+                        "Vanilla will crash here");
+            }
+
+            heightlist[h++] = other->floorheight;
+        }
+    }
+    
+    // Find lowest height in list
+    if (!h)
+    {
+        return currentheight;
+    }
+        
+    min = heightlist[0];
+    
+    // Range checking? 
+    for (i = 1; i < h; i++)
+    {
+        if (heightlist[i] < min)
+        {
+            min = heightlist[i];
+        }
+    }
+
+    return min;
+}
+
+//
+// FIND LOWEST CEILING IN THE SURROUNDING SECTORS
+//
+fixed_t
+P_FindLowestCeilingSurrounding(sector_t* sec)
+{
+    int			i;
+    line_t*		check;
+    sector_t*		other;
+    fixed_t		height = INT_MAX;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+
+	if (!other)
+	    continue;
+
+	if (other->ceilingheight < height)
+	    height = other->ceilingheight;
+    }
+    return height;
+}
+
+
+//
+// FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
+//
+fixed_t	P_FindHighestCeilingSurrounding(sector_t* sec)
+{
+    int		i;
+    line_t*	check;
+    sector_t*	other;
+    fixed_t	height = 0;
+	
+    for (i=0 ;i < sec->linecount ; i++)
+    {
+	check = sec->lines[i];
+	other = getNextSector(check,sec);
+
+	if (!other)
+	    continue;
+
+	if (other->ceilingheight > height)
+	    height = other->ceilingheight;
+    }
+    return height;
+}
+
+
+
+//
+// RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
+//
+int
+P_FindSectorFromLineTag
+( line_t*	line,
+  int		start )
+{
+    int	i;
+	
+    for (i=start+1;i<numsectors;i++)
+	if (sectors[i].tag == line->tag)
+	    return i;
+    
+    return -1;
+}
+
+
+
+
+//
+// Find minimum light from an adjacent sector
+//
+int
+P_FindMinSurroundingLight
+( sector_t*	sector,
+  int		max )
+{
+    int		i;
+    int		min;
+    line_t*	line;
+    sector_t*	check;
+	
+    min = max;
+    for (i=0 ; i < sector->linecount ; i++)
+    {
+	line = sector->lines[i];
+	check = getNextSector(line,sector);
+
+	if (!check)
+	    continue;
+
+	if (check->lightlevel < min)
+	    min = check->lightlevel;
+    }
+    return min;
+}
+
+
+
+//
+// EVENTS
+// Events are operations triggered by using, crossing,
+// or shooting special lines, or by timed thinkers.
+//
+
+// [STRIFE]
+static char crosslinestr[90];
+
+//
+// P_CrossSpecialLine - TRIGGER
+// Called every time a thing origin is about
+//  to cross a line with a non 0 special.
+//
+void
+P_CrossSpecialLine
+( int           linenum,
+  int           side,
+  mobj_t*       thing )
+{
+    line_t*     line;
+    side_t*     sidedef; // [STRIFE]
+    int         flag;    // [STRIFE]
+    int         ok;
+
+    line = &lines[linenum];
+
+    // haleyjd 09/21/10: corpses and missiles cannot activate any cross-over
+    // line types, *except* 182 (which is for the sake of missiles).
+    if((thing->flags & (MF_MISSILE|MF_CORPSE)) && line->special != 182)
+        return;
+
+    //	Triggers that other things can activate
+    if (!thing->player)
+    {
+        // Things that should NOT trigger specials...
+        // villsa [STRIFE] unused
+        //   haleyjd: removed dead switch. Strife only excludes missiles and
+        //   corpses, which is handled above.
+ 
+        ok = 0;
+
+        // [STRIFE] Added several line types. Removed none.
+        switch(line->special)
+        {
+        case 97:        // TELEPORT RETRIGGER
+        case 185:       // haleyjd: [STRIFE] Silent Teleport (used for Converter)
+        case 195:       // haleyjd: [STRIFE] Silent Teleport and Change Zombie
+        case 231:       // haleyjd: [STRIFE] WR Teleport (Silent at Source)
+        case 125:       // TELEPORT MONSTERONLY TRIGGER
+        case 126:       // TELEPORT MONSTERONLY RETRIGGER
+        case 182:       // haleyjd: [STRIFE] Break glass - it's a W1 type too!
+        case 10:        // PLAT DOWN-WAIT-UP-STAY TRIGGER
+        case 39:        // TELEPORT TRIGGER
+        case 88:        // PLAT DOWN-WAIT-UP-STAY RETRIGGER
+        case 4:         // RAISE DOOR
+            ok = 1;
+            break;
+        }
+        if (!ok)
+            return;
+    }
+
+    
+    // Note: could use some const's here.
+    switch (line->special)
+    {
+    //
+    // TRIGGERS.
+    // All from here to RETRIGGERS.
+    //
+    case 230:
+        // haleyjd 09/21/10: [STRIFE] W1 Open Door if Quest
+        sidedef = &sides[line->sidenum[0]];
+        flag = (sidedef->rowoffset >> FRACBITS) - 1;
+
+        if(!(thing->player->questflags & (1 << flag)))
+            break;
+        // fall-through:
+    case 2:
+        // Open Door - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_open);
+        line->special = 0;
+        break;
+
+    case 227:
+        // haleyjd 09/21/10: [STRIFE] W1 Close Door if Quest
+        sidedef = &sides[line->sidenum[0]];
+        flag = (sidedef->rowoffset >> FRACBITS) - 1;
+
+        if(!(thing->player->questflags & (1 << flag)))
+            break;
+        // fall-through:
+    case 3:
+        // Close Door - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_close);
+        line->special = 0;
+        break;
+
+    case 4:
+        // Raise Door - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_normal);
+        line->special = 0;
+        break;
+
+    case 5:
+        // Raise Floor - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloor);
+        line->special = 0;
+        break;
+
+    case 6:
+        // Fast Ceiling Crush & Raise - [STRIFE] Verified unmodified.
+        EV_DoCeiling(line,fastCrushAndRaise);
+        line->special = 0;
+        break;
+
+    case 8:
+        // Build Stairs - [STRIFE] Verified unmodified.
+        EV_BuildStairs(line,build8);
+        line->special = 0;
+        break;
+
+    case 10:
+        // PlatDownWaitUp - [STRIFE] Verified unmodified.
+        EV_DoPlat(line,downWaitUpStay,0);
+        line->special = 0;
+        break;
+
+    case 12:
+        // Light Turn On - brightest near - [STRIFE] Verified unmodified.
+        EV_LightTurnOn(line,0);
+        line->special = 0;
+        break;
+
+    case 13:
+        // Light Turn On 255 - [STRIFE] Verified unmodified.
+        EV_LightTurnOn(line,255);
+        line->special = 0;
+        break;
+
+    case 16:
+        // Close Door 30 - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_close30ThenOpen);
+        line->special = 0;
+        break;
+
+    case 17:
+        // Start Light Strobing - [STRIFE] Verified unmodified.
+        EV_StartLightStrobing(line);
+        line->special = 0;
+        break;
+
+    case 19:
+        // Lower Floor - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,lowerFloor);
+        line->special = 0;
+        break;
+
+    case 22:
+        // villsa [STRIFE] Verified unmodified.
+        // Raise floor to nearest height and change texture
+        EV_DoPlat(line,raiseToNearestAndChange,0);
+        line->special = 0;
+        break;
+
+    case 25:
+        // Ceiling Crush and Raise - [STRIFE] Verified unmodified.
+        EV_DoCeiling(line,crushAndRaise);
+        line->special = 0;
+        break;
+
+    case 30:
+        // Raise floor to shortest texture height - [STRIFE] Verified unmodified.
+        //  on either side of lines.
+        EV_DoFloor(line,raiseToTexture);
+        line->special = 0;
+        break;
+
+    case 35:
+        // Lights Very Dark - [STRIFE] Verified unmodified.
+        EV_LightTurnOn(line,35);
+        line->special = 0;
+        break;
+
+    case 36:
+        // Lower Floor (TURBO) - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,turboLower);
+        line->special = 0;
+        break;
+
+    case 37:
+        // LowerAndChange - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,lowerAndChange);
+        line->special = 0;
+        break;
+
+    case 193:
+        // haleyjd 09/21/10: [STRIFE] W1 Floor Lower to Lowest if Quest
+        sidedef = &sides[line->sidenum[0]];
+        flag = (sidedef->rowoffset >> FRACBITS) - 1; // note is fixed_t
+
+        // must have the questflag indicated in the line's y offset
+        if(!(thing->player->questflags & (1 << flag)))
+            break;
+        // fall-through:
+    case 38: 
+        // Lower Floor To Lowest - [STRIFE] Verified unmodified.
+        EV_DoFloor( line, lowerFloorToLowest );
+        line->special = 0;
+        break;
+
+    case 39:
+        // TELEPORT! - [STRIFE] Verified unmodified (except for 0 flags param)
+        EV_Teleport( line, side, thing, TF_NORMAL );
+        line->special = 0;
+        break;
+
+        /*case 40:
+        // RaiseCeilingLowerFloor
+        EV_DoCeiling( line, raiseToHighest );
+        EV_DoFloor( line, lowerFloorToLowest );
+        line->special = 0;
+        break;*/
+
+    case 44:
+        // Ceiling Crush - [STRIFE] Verified unmodified.
+        EV_DoCeiling( line, lowerAndCrush );
+        line->special = 0;
+        break;
+
+    case 52:
+        // EXIT! - haleyjd 09/21/10: [STRIFE] Exit to level tag/100
+        G_ExitLevel (line->tag / 100);
+        break;
+
+    case 53:
+        // Perpetual Platform Raise - [STRIFE] Verified unmodified.
+        EV_DoPlat(line,perpetualRaise,0);
+        line->special = 0;
+        break;
+
+    case 54:
+        // Platform Stop - [STRIFE] Verified unmodified.
+        EV_StopPlat(line);
+        line->special = 0;
+        break;
+
+    case 56:
+        // Raise Floor Crush - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloorCrush);
+        line->special = 0;
+        break;
+
+    case 57:
+        // Ceiling Crush Stop - [STRIFE] Verified unmodified.
+        EV_CeilingCrushStop(line);
+        line->special = 0;
+        break;
+
+    case 58:
+        // [STRIFE] raiseFloor24 was modified into raiseFloor64
+        // Raise Floor 64 
+        EV_DoFloor(line,raiseFloor64);
+        line->special = 0;
+        break;
+
+    case 59:
+        // Raise Floor 24 And Change - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloor24AndChange);
+        line->special = 0;
+        break;
+
+    case 104:
+        // Turn lights off in sector(tag) - [STRIFE] Verified unmodified.
+        EV_TurnTagLightsOff(line);
+        line->special = 0;
+        break;
+
+    case 108:
+        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified.
+        EV_DoDoor (line,vld_blazeRaise);
+        line->special = 0;
+        break;
+
+    case 109:
+        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified.
+        EV_DoDoor (line,vld_blazeOpen);
+        line->special = 0;
+        break;
+
+    case 100:
+        // Build Stairs Turbo 16 - [STRIFE] Verified unmodified.
+        EV_BuildStairs(line,turbo16);
+        line->special = 0;
+        break;
+
+    case 197:
+        // haleyjd 09/21/10: [STRIFE] Blazing Door Close if Has Sigil B
+        if(thing->player->sigiltype <= 0)
+            break;
+        // fall-through:
+    case 110:
+        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified.
+        EV_DoDoor (line,vld_blazeClose);
+        line->special = 0;
+        break;
+
+    case 119:
+        // Raise floor to nearest surr. floor - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloorToNearest);
+        line->special = 0;
+        break;
+
+    case 121:
+        // villsa [STRIFE] Verified unmodified.
+        // Blazing PlatDownWaitUpStay
+        EV_DoPlat(line,blazeDWUS,0);
+        line->special = 0;
+        break;
+
+    case 124:
+        // haleyjd 09/21/10: [STRIFE] W1 Start Finale
+        // Altered from G_SecretExitLevel.
+        G_StartFinale();
+        break;
+
+    case 125:
+        // TELEPORT MonsterONLY - [STRIFE] Verified unmodified
+        //    (except for 0 flags parameter)
+        if (!thing->player)
+        {
+            EV_Teleport( line, side, thing, TF_NORMAL );
+            line->special = 0;
+        }
+        break;
+
+    case 130:
+        // Raise Floor Turbo - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloorTurbo);
+        line->special = 0;
+        break;
+
+    case 141:
+        // Silent Ceiling Crush & Raise - [STRIFE] Verified unmodified.
+        EV_DoCeiling(line,silentCrushAndRaise);
+        line->special = 0;
+        break;
+
+    case 174:
+        // villsa [STRIFE] Split Open
+        EV_DoDoor(line, vld_splitOpen);
+        line->special = 0;
+        break;
+
+    case 183:
+        // villsa [STRIFE] Split Raise Nearest
+        EV_DoDoor(line, vld_splitRaiseNearest);
+        line->special = 0;
+        break;
+
+    case 178: 
+        // haleyjd 09/24/10: [STRIFE] W1 Build Stairs Down 16
+        EV_BuildStairs(line, buildDown16);
+        line->special = 0;
+        break;
+
+    case 179: 
+        // haleyjd 09/25/10: [STRIFE] W1 Ceiling Lower to Floor
+        EV_DoCeiling(line, lowerToFloor);
+        line->special = 0;
+        break;
+
+    case 182:
+        // haleyjd 09/21/10: [STRIFE] Break Glass
+        // 182 is a unique linetype in that it is both a G1 and a W1 linetype,
+        // but only missiles may activate it as a W1 type.
+        if(thing->flags & MF_MISSILE)
+            P_ChangeSwitchTexture(line, 1); // why 1? it will be cleared anyway.
+        break;
+
+    case 187:
+        // haleyjd 09/21/10: [STRIFE] W1 Clear Force Fields if Quest
+        sidedef = &sides[line->sidenum[0]];
+        flag = (sidedef->rowoffset >> FRACBITS) - 1; // note is fixed_t
+
+        // must have the questflag indicated in the line's y offset
+        if(!(thing->player->questflags & (1 << flag)))
+            break;
+
+        // Do it!
+        EV_ClearForceFields(line);
+        line->special = 0;
+        break;
+
+    case 188:
+        // haleyjd 09/21/10: [STRIFE] W1 Open Door if Quest 16 (Gate Mechanism 
+        // Destroyed)
+        if(!(thing->player->questflags & QF_QUEST16))
+            break;
+        EV_DoDoor(line, vld_open);
+        line->special = 0;
+        break;
+
+    case 196:
+        // haleyjd 09/26/10: [STRIFE] W1 Floor Lower to Lowest if Sigil Type > 0
+        if(thing->player->sigiltype > 0)
+        {
+            EV_DoFloor(line, lowerFloorToLowest);
+            line->special = 0;
+        }
+        break;
+
+    case 200:
+        // haleyjd 09/21/10: [STRIFE] W1 Open Door if Sigil Owned
+        if(!(thing->player->weaponowned[wp_sigil]))
+            break;
+        EV_DoDoor(line, vld_open);
+        line->special = 0;
+        break;
+
+    case 201:
+        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective (First Side Only)
+        if(side == 1)
+            break;
+        // fall-through:
+    case 202:
+        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective (Tag = VOC/LOG #)
+        // must be consoleplayer
+        if(thing->player != &players[consoleplayer])
+            break;
+
+        // must have comm unit
+        if(!(thing->player->powers[pw_communicator]))
+            break;
+
+        // load voice
+        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "voc%i", line->tag);
+        I_StartVoice(crosslinestr);
+
+        // load objective
+        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "log%i", line->tag);
+        GiveObjective(crosslinestr, 0);
+
+        // Put up a message
+        thing->player->message = DEH_String("Incoming Message...");
+        line->special = 0;
+        break;
+
+    case 210:
+        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective if Flamethrower????
+        // I don't think this is actually used anywhere o_O
+        // must be player 1...
+        if(thing->player != &players[0])
+            break;
+
+        // must have comm unit
+        if(!(thing->player->powers[pw_communicator]))
+            break;
+
+        // must have... the flamethrower?!
+        if(!(thing->player->weaponowned[wp_flame]))
+            break;
+
+        // load voice
+        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "voc%i", line->tag);
+        I_StartVoice(crosslinestr);
+
+        // load objective
+        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "log%i", line->tag);
+        GiveObjective(crosslinestr, 0);
+
+        // Put up a message
+        thing->player->message = DEH_String("Incoming Message from BlackBird...");
+        line->special = 0;
+        break;
+
+    case 212:
+        // haleyjd 09/25/10: [STRIFE] W1 Floor Lower to Lowest if Have Flamethrower
+        if(thing->player->weaponowned[wp_flame])
+        {
+            EV_DoFloor(line, lowerFloorToLowest);
+            line->special = 0;
+        }
+        break;
+
+    case 215:
+        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective if Quest (Tag/100, Tag%100)
+        // must be player 1...
+        if(thing->player != &players[0])
+            break;
+
+        // must have comm unit
+        if(!(thing->player->powers[pw_communicator]))
+            break;
+
+        if(line->tag != 0)
+        {
+            // test for questflag
+            if(!(thing->player->questflags & (1 << (line->tag % 100 - 1))))
+                break;
+        }
+
+        // start voice
+        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "voc%i", line->tag/100);
+        I_StartVoice(crosslinestr);
+
+        // give objective
+        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "log%i", line->tag/100);
+        GiveObjective(crosslinestr, 0);
+
+        // Put up a message
+        thing->player->message = DEH_String("Incoming Message from BlackBird...");
+        line->special = 0;
+        break;
+
+    case 204:
+        // haleyjd 09/21/10: [STRIFE] W1 Change Music (unused!)
+        if(thing->player != &players[0])
+            break;
+        S_ChangeMusic(line->tag, 1);
+        line->special = 0;
+        break;
+
+    case 228:
+        // haleyjd 09/21/10: [STRIFE] W1 Entity Voice?
+        if(!(thing->player->questflags & QF_QUEST24)) // Not killed Macil???
+            break; // STRIFE-TODO: verify...
+
+        if(!(thing->player->questflags & QF_QUEST28)) // ????? STRIFE-TODO
+            I_StartVoice(DEH_String("voc128"));
+        else
+            I_StartVoice(DEH_String("voc130"));
+        
+        line->special = 0;
+        break;
+
+        //
+        // RETRIGGERS.  All from here till end.
+        //
+    case 72:
+        // Ceiling Crush - [STRIFE] Verified unmodified.
+        EV_DoCeiling( line, lowerAndCrush );
+        break;
+
+    case 73:
+        // Ceiling Crush and Raise - [STRIFE] Verified unmodified.
+        EV_DoCeiling(line,crushAndRaise);
+        break;
+
+    case 74:
+        // Ceiling Crush Stop - [STRIFE] Verified unmodified.
+        EV_CeilingCrushStop(line);
+        break;
+
+    case 75:
+        // Close Door - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_close);
+        break;
+
+    case 76:
+        // Close Door 30 - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_close30ThenOpen);
+        break;
+
+    case 77:
+        // Fast Ceiling Crush & Raise - [STRIFE] Verified unmodified.
+        EV_DoCeiling(line,fastCrushAndRaise);
+        break;
+
+    case 79:
+        // Lights Very Dark - [STRIFE] Verified unmodified.
+        EV_LightTurnOn(line,35);
+        break;
+
+    case 80:
+        // Light Turn On - brightest near - [STRIFE] Verified unmodified.
+        EV_LightTurnOn(line,0);
+        break;
+
+    case 81:
+        // Light Turn On 255 - [STRIFE] Verified unmodified.
+        EV_LightTurnOn(line,255);
+        break;
+
+    case 82:
+        // Lower Floor To Lowest - [STRIFE] Verified unmodified.
+        EV_DoFloor( line, lowerFloorToLowest );
+        break;
+
+    case 83:
+        // Lower Floor - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,lowerFloor);
+        break;
+
+    case 84:
+        // LowerAndChange - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,lowerAndChange);
+        break;
+
+    case 86:
+        // Open Door - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_open);
+        break;
+
+    case 87:
+        // Perpetual Platform Raise - [STRIFE] Verified unmodified.
+        EV_DoPlat(line,perpetualRaise,0);
+        break;
+
+    case 88:
+        // PlatDownWaitUp - [STRIFE] Verified unmodified.
+        EV_DoPlat(line,downWaitUpStay,0);
+        break;
+
+    case 89:
+        // Platform Stop - [STRIFE] Verified unmodified.
+        EV_StopPlat(line);
+        break;
+
+    case 216:
+        // haleyjd 09/21/10: [STRIFE] WR Raise Door if Quest
+        sidedef = &sides[line->sidenum[0]];
+        flag = (sidedef->rowoffset >> FRACBITS) - 1; // note is fixed_t.
+
+        if(!(thing->player->questflags & (1 << flag)))
+            break;
+        // fall-through:
+    case 90: 
+        // Raise Door - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_normal);
+        break;
+
+    case 91:
+        // Raise Floor - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloor);
+        break;
+
+    case 92:
+        // [STRIFE] raiseFloor24 changed to raiseFloor64
+        // Raise Floor 64
+        EV_DoFloor(line,raiseFloor64);
+        break;
+
+    case 93:
+        // Raise Floor 24 And Change - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloor24AndChange);
+        break;
+
+    case 94:
+        // Raise Floor Crush - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloorCrush);
+        break;
+
+    case 95:
+        // villsa [STRIFE] Verified unmodified.
+        // Raise floor to nearest height
+        // and change texture.
+        EV_DoPlat(line,raiseToNearestAndChange,0);
+        break;
+
+    case 96:
+        // Raise floor to shortest texture height - [STRIFE] Verified unmodified.
+        // on either side of lines.
+        EV_DoFloor(line,raiseToTexture);
+        break;
+
+    case 97:
+        // TELEPORT! - [STRIFE] Verified unmodified (except for 0 flags param)
+        EV_Teleport( line, side, thing, TF_NORMAL );
+        break;
+
+    case 98:
+        // Lower Floor (TURBO) - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,turboLower);
+        break;
+
+    case 105:
+        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified.
+        EV_DoDoor (line,vld_blazeRaise);
+        break;
+
+    case 106:
+        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified.
+        EV_DoDoor (line,vld_blazeOpen);
+        break;
+
+    case 107:
+        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified.
+        EV_DoDoor (line,vld_blazeClose);
+        break;
+
+    case 120:
+        // villsa [STRIFE] Verified unmodified.
+        // Blazing PlatDownWaitUpStay.
+        EV_DoPlat(line,blazeDWUS,0);
+        break;
+
+    case 126:
+        // TELEPORT MonsterONLY. - [STRIFE] Verified unmodified (except for 0 flags param)
+        if (!thing->player)
+            EV_Teleport( line, side, thing, TF_NORMAL );
+        break;
+
+    case 128:
+        // Raise To Nearest Floor - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloorToNearest);
+        break;
+
+    case 129:
+        // Raise Floor Turbo - [STRIFE] Verified unmodified.
+        EV_DoFloor(line,raiseFloorTurbo);
+        break;
+
+    case 186:
+        // haleyjd [STRIFE] Exit Level to Spot, First Side Only
+        if(side == 1)
+            break;
+        // fall-through:
+    case 145:
+        // haleyjd [STRIFE] Exit Level to Spot
+        thing->momx = thing->momy = thing->momz = 0;
+        {
+            int map  = line->tag / 100;
+            int spot = line->tag % 100;
+
+            if(thing->player->weaponowned[wp_sigil])
+            {
+                if(map == 3)
+                    map = 30;
+                else if(map == 7)
+                    map = 10;
+            }
+
+            DEH_snprintf(crosslinestr, sizeof(crosslinestr), 
+                         "Entering%s", 
+                         DEH_String(mapnames[map - 1]) + 8);
+            thing->player->message = crosslinestr;
+
+            if(netgame && deathmatch)
+            {
+                if(levelTimer && levelTimeCount != 0)
+                {
+                    DEH_snprintf(crosslinestr, sizeof(crosslinestr), 
+                                 "%d min left", 
+                                 (levelTimeCount/TICRATE)/60);
+                    break;
+                }
+
+                // raise switch from floor
+                EV_DoFloor(line, raiseFloor64);
+            }
+            else
+            {
+                // normal single-player exit
+
+                // BUG: Here is the opening for a flaming player to cross past
+                // the exit line and hit a deathmatch switch ;) It's not so much
+                // that this is incorrect, as that they forgot to add such a 
+                // check to the other kind of exit lines too ;)
+                if(thing->player->health <= 0)
+                    break;
+
+                G_RiftExitLevel(map, spot, thing->angle);
+            }
+        }
+        break;
+
+    case 175:
+        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if < 16 Above Floor
+        if(thing->z < thing->floorz + 16 * FRACUNIT)
+            P_NoiseAlert(thing->player->mo, thing->player->mo);
+        break;
+
+    case 198:
+        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if No Guard Uniform
+        if(P_PlayerHasItem(thing->player, MT_QUEST_GUARD_UNIFORM))
+            break;
+        // fall-through:
+    case 150:
+        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm
+        P_NoiseAlert(thing->player->mo, thing->player->mo);
+        break;
+
+    case 208:
+        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if Have Flamethrower
+        // O_o - this is definitely unused. Was an entire flamethrower quest
+        // cut out of the game before release?
+        if(thing->player->weaponowned[wp_flame])
+            P_NoiseAlert(thing->player->mo, thing->player->mo);
+        break;
+
+    case 206:
+        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if Have Chalice
+        // This *is* used, inside the Tavern in Tarnhill. Oddly there is also
+        // one just randomly placed outside the entrance to the Power Station.
+        if(P_PlayerHasItem(thing->player, MT_INV_CHALICE))
+            P_NoiseAlert(thing->player->mo, thing->player->mo);
+        break;
+
+    case 184:
+        // villsa [STRIFE] plat up wait down stay
+        if(EV_DoPlat(line, upWaitDownStay, 0))
+            P_ChangeSwitchTexture(line, 1); // In P_CrossSpecialLine? Copypasta error?
+        break;
+
+    case 185:
+        // haleyjd 09/21/10: [STRIFE] Silent Teleport (used for Converter)
+        EV_Teleport(line, side, thing, TF_FULLSILENCE);
+        break;
+
+    case 195:
+        // haleyjd 09/21/10: [STRIFE] Silent Teleport and Change Zombie
+        EV_Teleport(line, side, thing, TF_FULLSILENCE);
+        P_SetMobjState(thing, S_AGRD_00); // 419
+        break;
+
+    case 203:
+        // haleyjd 09/21/10: [STRIFE] WR Change Music
+        if(thing->player != &players[0])
+            break;
+        S_ChangeMusic(line->tag, 1);
+        break;
+
+    case 231:
+        // haleyjd 09/21/10: [STRIFE] WR Teleport (Silent at Source)
+        EV_Teleport(line, side, thing, TF_SRCSILENCE);
+        break;
+        
+        // haleyjd 09/21/10: Moved one-time-use lines up above with the others.
+    }
+}
+
+
+
+//
+// P_ShootSpecialLine - IMPACT SPECIALS
+// Called when a thing shoots a special line.
+//
+void
+P_ShootSpecialLine
+( mobj_t*       thing,
+  line_t*       line )
+{
+    int         ok;
+
+    //	Impacts that other things can activate.
+    if (!thing->player)
+    {
+        ok = 0;
+        switch(line->special)
+        {
+        case 46:  // OPEN DOOR IMPACT
+        case 182: // villsa [STRIFE] for windows
+            ok = 1;
+            break;
+        }
+        if (!ok)
+            return;
+    }
+
+    switch(line->special)
+    {
+    case 24:
+        // RAISE FLOOR - [STRIFE] Verified unmodified
+        EV_DoFloor(line,raiseFloor);
+        P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 46:
+        // OPEN DOOR - [STRIFE] Verified unmodified.
+        EV_DoDoor(line,vld_open);
+        P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 47:
+        // villsa [STRIFE] Verified unmodified.
+        // RAISE FLOOR NEAR AND CHANGE
+        EV_DoPlat(line,raiseToNearestAndChange,0);
+        P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 180:
+        // haleyjd 09/22/10: [STRIFE] G1 Raise Floor 512 & Change
+        EV_DoFloor(line, raiseFloor512AndChange);
+        P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 182:
+        // villsa [STRIFE] G1 Break Glass
+        //   haleyjd: note that 182 is also a W1 type in P_CrossSpecialLine, but
+        //   can only be activated in that manner by an MF_MISSILE object.
+        P_ChangeSwitchTexture(line, 0);
+        break;
+    }
+}
+
+
+
+//
+// P_PlayerInSpecialSector
+// Called every tic frame
+//  that the player origin is in a special sector
+//
+// [STRIFE] Modified for new sector types and changes to old ones.
+//
+void P_PlayerInSpecialSector (player_t* player)
+{
+    sector_t*	sector;
+
+    sector = player->mo->subsector->sector;
+
+    // Falling, not all the way down yet?
+    if (player->mo->z != sector->floorheight)
+        return;	
+
+    // Has hitten ground.
+    switch (sector->special)
+    {
+    case 5:
+        // HELLSLIME DAMAGE
+        // [STRIFE] +2 to nukagecount
+        if(!player->powers[pw_ironfeet])
+            player->nukagecount += 2;
+        break;
+    
+    case 16:
+        // [STRIFE] +4 to nukagecount
+        if(!player->powers[pw_ironfeet])
+            player->nukagecount += 4;
+        break;
+
+    case 4:
+    case 7:
+        // [STRIFE] Immediate 5 damage every 31 tics
+        if(!player->powers[pw_ironfeet])
+            if(!(leveltime & 0x1f))
+                P_DamageMobj(player->mo, NULL, NULL, 5);
+        break;
+
+    case 9:
+        // SECRET SECTOR
+        //player->secretcount++; [STRIFE] Don't have a secret count.
+        sector->special = 0;
+        if(player - players == consoleplayer)
+            S_StartSound(NULL, sfx_yeah);
+        break;
+
+    case 11:
+        // EXIT SUPER DAMAGE! (for E1M8 finale)
+        player->cheats &= ~CF_GODMODE;
+
+        if (!(leveltime&0x1f))
+            P_DamageMobj (player->mo, NULL, NULL, 20);
+
+        if (player->health <= 10)
+            G_ExitLevel(0);
+        break;
+
+    case 15:
+        // haleyjd 08/30/10: [STRIFE] "Instant" Death sector
+        P_DamageMobj(player->mo, NULL, NULL, 999);
+        break;
+
+
+    case 18:
+        // haleyjd 08/30/10: [STRIFE] Water current
+        {
+            int tagval = sector->tag - 100;
+            fixed_t force;
+            angle_t angle;
+
+            if(player->cheats & CF_NOCLIP)
+                return;
+
+            force = (tagval % 10) << 12;
+            angle = (tagval / 10) << 29;
+
+            P_Thrust(player, angle, force);
+        }
+        break;
+
+    default:
+        I_Error ("P_PlayerInSpecialSector: "
+                 "unknown special %i",
+                 sector->special);
+        break;
+    };
+}
+
+
+
+
+//
+// P_UpdateSpecials
+// Animate planes, scroll walls, etc.
+//
+// [STRIFE] Modifications to support multiple scrolling line types.
+//
+boolean         levelTimer;
+int             levelTimeCount;
+
+void P_UpdateSpecials (void)
+{
+    anim_t*     anim;
+    int         pic;
+    int         i;
+    line_t*     line;
+
+
+    //  LEVEL TIMER
+    if (levelTimer == true)
+    {
+        if(levelTimeCount) // [STRIFE] Does not allow to go negative
+            levelTimeCount--;
+        
+        /*
+        // [STRIFE] Not done here. Exit lines check this manually instead.
+        if (!levelTimeCount)
+            G_ExitLevel(0);
+        */
+    }
+
+    //  ANIMATE FLATS AND TEXTURES GLOBALLY
+    for (anim = anims ; anim < lastanim ; anim++)
+    {
+        for (i=anim->basepic ; i<anim->basepic+anim->numpics ; i++)
+        {
+            pic = anim->basepic + ( (leveltime/anim->speed + i)%anim->numpics );
+            if (anim->istexture)
+                texturetranslation[i] = pic;
+            else
+                flattranslation[i] = pic;
+        }
+    }
+
+    
+    //  ANIMATE LINE SPECIALS
+    for (i = 0; i < numlinespecials; i++)
+    {
+        line = linespeciallist[i];
+        switch(line->special)
+        {
+        case 48:
+            // EFFECT FIRSTCOL SCROLL +
+            sides[line->sidenum[0]].textureoffset += FRACUNIT;
+            break;
+
+        case 142:
+            // haleyjd 09/25/10 [STRIFE] Scroll Up Slow
+            sides[line->sidenum[0]].rowoffset += FRACUNIT;
+            break;
+
+        case 143:
+            // haleyjd 09/25/10 [STRIFE] Scroll Down Fast (3 Units/Tic)
+            sides[line->sidenum[0]].rowoffset -= 3*FRACUNIT;
+            break;
+
+        case 149:
+            // haleyjd 09/25/10 [STRIFE] Scroll Down Slow
+            sides[line->sidenum[0]].rowoffset -= FRACUNIT;
+            break;
+        }
+    }
+
+    
+    //  DO BUTTONS
+    for (i = 0; i < MAXBUTTONS; i++)
+        if (buttonlist[i].btimer)
+        {
+            buttonlist[i].btimer--;
+            if (!buttonlist[i].btimer)
+            {
+                switch(buttonlist[i].where)
+                {
+                case top:
+                    sides[buttonlist[i].line->sidenum[0]].toptexture =
+                        buttonlist[i].btexture;
+                    break;
+
+                case middle:
+                    sides[buttonlist[i].line->sidenum[0]].midtexture =
+                        buttonlist[i].btexture;
+                    break;
+
+                case bottom:
+                    sides[buttonlist[i].line->sidenum[0]].bottomtexture =
+                        buttonlist[i].btexture;
+                    break;
+                }
+                S_StartSound(&buttonlist[i].soundorg,sfx_swtchn);
+                memset(&buttonlist[i],0,sizeof(button_t));
+            }
+        }
+}
+
+
+//
+// Donut overrun emulation
+//
+// Derived from the code from PrBoom+.  Thanks go to Andrey Budko (entryway)
+// as usual :-)
+//
+
+#define DONUT_FLOORHEIGHT_DEFAULT 0x00000000
+#define DONUT_FLOORPIC_DEFAULT 0x16
+
+static void DonutOverrun(fixed_t *s3_floorheight, short *s3_floorpic,
+                         line_t *line, sector_t *pillar_sector)
+{
+    static int first = 1;
+    static int tmp_s3_floorheight;
+    static int tmp_s3_floorpic;
+
+    if (first)
+    {
+        int p;
+
+        // This is the first time we have had an overrun.
+        first = 0;
+
+        // Default values
+        tmp_s3_floorheight = DONUT_FLOORHEIGHT_DEFAULT;
+        tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
+
+        //!
+        // @category compat
+        // @arg <x> <y>
+        //
+        // Use the specified magic values when emulating behavior caused
+        // by memory overruns from improperly constructed donuts.
+        // In Vanilla Strife this can differ depending on the operating
+        // system.  The default (if this option is not specified) is to
+        // emulate the behavior when running under Windows 98.
+
+        p = M_CheckParmWithArgs("-donut", 2);
+
+        if (p > 0)
+        {
+            // Dump of needed memory: (fixed_t)0000:0000 and (short)0000:0008
+            //
+            // C:\>debug
+            // -d 0:0
+            //
+            // DOS 6.22:
+            // 0000:0000    (57 92 19 00) F4 06 70 00-(16 00)
+            // DOS 7.1:
+            // 0000:0000    (9E 0F C9 00) 65 04 70 00-(16 00)
+            // Win98:
+            // 0000:0000    (00 00 00 00) 65 04 70 00-(16 00)
+            // DOSBox under XP:
+            // 0000:0000    (00 00 00 F1) ?? ?? ?? 00-(07 00)
+
+            M_StrToInt(myargv[p + 1], &tmp_s3_floorheight);
+            M_StrToInt(myargv[p + 2], &tmp_s3_floorpic);
+
+            if (tmp_s3_floorpic >= numflats)
+            {
+                fprintf(stderr,
+                        "DonutOverrun: The second parameter for \"-donut\" "
+                        "switch should be greater than 0 and less than number "
+                        "of flats (%d). Using default value (%d) instead. \n",
+                        numflats, DONUT_FLOORPIC_DEFAULT);
+                tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
+            }
+        }
+    }
+
+    /*
+    fprintf(stderr,
+            "Linedef: %d; Sector: %d; "
+            "New floor height: %d; New floor pic: %d\n",
+            line->iLineID, pillar_sector->iSectorID,
+            tmp_s3_floorheight >> 16, tmp_s3_floorpic);
+     */
+
+    *s3_floorheight = (fixed_t) tmp_s3_floorheight;
+    *s3_floorpic = (short) tmp_s3_floorpic;
+}
+
+
+//
+// Special Stuff that can not be categorized
+//
+int EV_DoDonut(line_t*	line)
+{
+    sector_t*		s1;
+    sector_t*		s2;
+    sector_t*		s3;
+    int			secnum;
+    int			rtn;
+    int			i;
+    floormove_t*	floor;
+    fixed_t s3_floorheight;
+    short s3_floorpic;
+
+    secnum = -1;
+    rtn = 0;
+    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+    {
+	s1 = &sectors[secnum];
+
+	// ALREADY MOVING?  IF SO, KEEP GOING...
+	if (s1->specialdata)
+	    continue;
+
+	rtn = 1;
+	s2 = getNextSector(s1->lines[0],s1);
+
+        // Vanilla Doom does not check if the linedef is one sided.  The
+        // game does not crash, but reads invalid memory and causes the
+        // sector floor to move "down" to some unknown height.
+        // DOSbox prints a warning about an invalid memory access.
+        //
+        // I'm not sure exactly what invalid memory is being read.  This
+        // isn't something that should be done, anyway.
+        // Just print a warning and return.
+
+        if (s2 == NULL)
+        {
+            fprintf(stderr,
+                    "EV_DoDonut: linedef had no second sidedef! "
+                    "Unexpected behavior may occur in Vanilla Doom. \n");
+	    break;
+        }
+
+	for (i = 0; i < s2->linecount; i++)
+	{
+	    s3 = s2->lines[i]->backsector;
+
+	    if (s3 == s1)
+		continue;
+
+            if (s3 == NULL)
+            {
+                // e6y
+                // s3 is NULL, so
+                // s3->floorheight is an int at 0000:0000
+                // s3->floorpic is a short at 0000:0008
+                // Trying to emulate
+
+                fprintf(stderr,
+                        "EV_DoDonut: WARNING: emulating buffer overrun due to "
+                        "NULL back sector. "
+                        "Unexpected behavior may occur in Vanilla Doom.\n");
+
+                DonutOverrun(&s3_floorheight, &s3_floorpic, line, s1);
+            }
+            else
+            {
+                s3_floorheight = s3->floorheight;
+                s3_floorpic = s3->floorpic;
+            }
+
+	    //	Spawn rising slime
+	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+	    P_AddThinker (&floor->thinker);
+	    s2->specialdata = floor;
+	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+	    floor->type = donutRaise;
+	    floor->crush = false;
+	    floor->direction = 1;
+	    floor->sector = s2;
+	    floor->speed = FLOORSPEED / 2;
+	    floor->texture = s3_floorpic;
+	    floor->newspecial = 0;
+	    floor->floordestheight = s3_floorheight;
+	    
+	    //	Spawn lowering donut-hole
+	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+	    P_AddThinker (&floor->thinker);
+	    s1->specialdata = floor;
+	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+	    floor->type = lowerFloor;
+	    floor->crush = false;
+	    floor->direction = -1;
+	    floor->sector = s1;
+	    floor->speed = FLOORSPEED / 2;
+	    floor->floordestheight = s3_floorheight;
+	    break;
+	}
+    }
+    return rtn;
+}
+
+
+
+//
+// SPECIAL SPAWNING
+//
+
+//
+// P_SpawnSpecials
+// After the map has been loaded, scan for specials
+//  that spawn thinkers
+//
+
+
+// Parses command line parameters.
+//
+// haleyjd 09/25/10: [STRIFE] Modifications for more scrolling line types and
+// for initialization of sliding door resources.
+//
+void P_SpawnSpecials (void)
+{
+    sector_t*   sector;
+    int         i;
+
+    // See if -TIMER was specified.
+
+    if (timelimit > 0 && deathmatch)
+    {
+        levelTimer = true;
+        levelTimeCount = timelimit * 60 * TICRATE;
+    }
+    else
+    {
+        levelTimer = false;
+    }
+
+    //	Init special SECTORs - [STRIFE] Verified unmodified.
+    sector = sectors;
+    for (i=0 ; i<numsectors ; i++, sector++)
+    {
+        if (!sector->special)
+            continue;
+
+        switch (sector->special)
+        {
+        case 1:
+            // FLICKERING LIGHTS
+            P_SpawnLightFlash (sector);
+            break;
+
+        case 2:
+            // STROBE FAST
+            P_SpawnStrobeFlash(sector,FASTDARK,0);
+            break;
+
+        case 3:
+            // STROBE SLOW
+            P_SpawnStrobeFlash(sector,SLOWDARK,0);
+            break;
+
+        case 4:
+            // STROBE FAST/DEATH SLIME
+            P_SpawnStrobeFlash(sector,FASTDARK,0);
+            sector->special = 4;
+            break;
+
+        case 8:
+            // GLOWING LIGHT
+            P_SpawnGlowingLight(sector);
+            break;
+        case 9:
+            // SECRET SECTOR
+            totalsecret++;
+            break;
+
+        case 10:
+            // DOOR CLOSE IN 30 SECONDS
+            P_SpawnDoorCloseIn30 (sector);
+            break;
+
+        case 12:
+            // SYNC STROBE SLOW
+            P_SpawnStrobeFlash (sector, SLOWDARK, 1);
+            break;
+
+        case 13:
+            // SYNC STROBE FAST
+            P_SpawnStrobeFlash (sector, FASTDARK, 1);
+            break;
+
+        case 14:
+            // DOOR RAISE IN 5 MINUTES
+            P_SpawnDoorRaiseIn5Mins (sector, i);
+            break;
+
+        case 17:
+            P_SpawnFireFlicker(sector);
+            break;
+        }
+    }
+
+
+    //	Init line EFFECTs
+    numlinespecials = 0;
+    for (i = 0;i < numlines; i++)
+    {
+        switch(lines[i].special)
+        {
+        case 48:  // EFFECT FIRSTCOL SCROLL+
+        case 142:
+        case 143:
+        case 149:
+            linespeciallist[numlinespecials] = &lines[i];
+            numlinespecials++;
+            break;
+        }
+    }
+
+    //	Init other misc stuff
+    for (i = 0;i < MAXCEILINGS;i++)
+        activeceilings[i] = NULL;
+
+    for (i = 0;i < MAXPLATS;i++)
+        activeplats[i] = NULL;
+
+    for (i = 0;i < MAXBUTTONS;i++)
+        memset(&buttonlist[i],0,sizeof(button_t));
+
+    // villsa [STRIFE]
+    P_InitSlidingDoorFrames();
+}
diff --git a/games/NXDoom/src/strife/p_spec.h b/games/NXDoom/src/strife/p_spec.h
new file mode 100644
index 000000000..684386afe
--- /dev/null
+++ b/games/NXDoom/src/strife/p_spec.h
@@ -0,0 +1,678 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//	Implements special effects:
+//	Texture animation, height or lighting changes
+//	 according to adjacent sectors, respective
+//	 utility functions, etc.
+//
+
+
+#ifndef __P_SPEC__
+#define __P_SPEC__
+
+
+//
+// End-level timer (-TIMER option)
+//
+extern	boolean levelTimer;
+extern	int	levelTimeCount;
+
+
+//      Define values for map objects
+#define MO_TELEPORTMAN          14
+
+
+// at game start
+void    P_InitPicAnims (void);
+
+// villsa [STRIFE]
+typedef enum
+{
+    FLOOR_WATER = 0,
+    FLOOR_SLIME = 1,
+    FLOOR_SOLID = 2,
+    FLOOR_END   = -1
+} terraintype_e;
+
+void P_InitTerrainTypes(void);                  // villsa [STRIFE]
+terraintype_e P_GetTerrainType(mobj_t* mobj);   // villsa [STRIFE]
+
+// at map load
+void    P_SpawnSpecials (void);
+
+// every tic
+void    P_UpdateSpecials (void);
+
+// when needed
+boolean
+P_UseSpecialLine
+( mobj_t*	thing,
+  line_t*	line,
+  int		side );
+
+void
+P_ShootSpecialLine
+( mobj_t*	thing,
+  line_t*	line );
+
+void
+P_CrossSpecialLine
+( int		linenum,
+  int		side,
+  mobj_t*	thing );
+
+void    P_PlayerInSpecialSector (player_t* player);
+
+int
+twoSided
+( int		sector,
+  int		line );
+
+sector_t*
+getSector
+( int		currentSector,
+  int		line,
+  int		side );
+
+side_t*
+getSide
+( int		currentSector,
+  int		line,
+  int		side );
+
+fixed_t P_FindLowestFloorSurrounding(sector_t* sec);
+fixed_t P_FindHighestFloorSurrounding(sector_t* sec);
+
+fixed_t
+P_FindNextHighestFloor
+( sector_t*	sec,
+  int		currentheight );
+
+fixed_t P_FindLowestCeilingSurrounding(sector_t* sec);
+fixed_t P_FindHighestCeilingSurrounding(sector_t* sec);
+
+int
+P_FindSectorFromLineTag
+( line_t*	line,
+  int		start );
+
+int
+P_FindMinSurroundingLight
+( sector_t*	sector,
+  int		max );
+
+sector_t*
+getNextSector
+( line_t*	line,
+  sector_t*	sec );
+
+
+//
+// SPECIAL
+//
+int     EV_DoDonut(line_t* line);
+boolean EV_ClearForceFields(line_t* line);  // villsa [STRIFE]
+
+
+//
+// P_LIGHTS
+//
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		count;
+    int		maxlight;
+    int		minlight;
+    
+} fireflicker_t;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		count;
+    int		maxlight;
+    int		minlight;
+    int		maxtime;
+    int		mintime;
+    
+} lightflash_t;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		count;
+    int		minlight;
+    int		maxlight;
+    int		darktime;
+    int		brighttime;
+    
+} strobe_t;
+
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    int		minlight;
+    int		maxlight;
+    int		direction;
+
+} glow_t;
+
+
+#define GLOWSPEED			8
+#define STROBEBRIGHT		5
+#define FASTDARK			15
+#define SLOWDARK			35
+
+void    P_SpawnFireFlicker (sector_t* sector);
+void    T_LightFlash (lightflash_t* flash);
+void    P_SpawnLightFlash (sector_t* sector);
+void    T_StrobeFlash (strobe_t* flash);
+
+void
+P_SpawnStrobeFlash
+( sector_t*	sector,
+  int		fastOrSlow,
+  int		inSync );
+
+void    EV_StartLightStrobing(line_t* line);
+void    EV_TurnTagLightsOff(line_t* line);
+
+void
+EV_LightTurnOn
+( line_t*	line,
+  int		bright );
+
+void    T_Glow(glow_t* g);
+void    P_SpawnGlowingLight(sector_t* sector);
+
+
+
+
+//
+// P_SWITCH
+//
+typedef struct
+{
+    char	name1[9];
+    char	name2[9];
+    short	episode;
+    int         sound;  // villsa [STRIFE]
+
+} switchlist_t;
+
+
+typedef enum
+{
+    top,
+    middle,
+    bottom
+
+} bwhere_e;
+
+
+typedef struct
+{
+    line_t*	line;
+    bwhere_e	where;
+    int		btexture;
+    int		btimer;
+    degenmobj_t *soundorg;
+
+} button_t;
+
+
+
+
+ // max # of wall switches in a level
+#define MAXSWITCHES		80  // villsa [STRIFE] changed from 50 to 80
+
+ // 4 players, 4 buttons each at once, max.
+#define MAXBUTTONS		16
+
+ // 1 second, in ticks. 
+#define BUTTONTIME      35             
+
+extern button_t	buttonlist[MAXBUTTONS]; 
+
+void
+P_ChangeSwitchTexture
+( line_t*	line,
+  int		useAgain );
+
+void P_InitSwitchList(void);
+
+
+//
+// P_PLATS
+//
+typedef enum
+{
+    up,
+    down,
+    waiting,
+    in_stasis
+
+} plat_e;
+
+
+
+typedef enum
+{
+    perpetualRaise,
+    downWaitUpStay,
+    slowDWUS,           // villsa [STRIFE]
+    raiseAndChange,
+    raiseToNearestAndChange,
+    blazeDWUS,
+    upWaitDownStay      // villsa [STRIFE]
+
+} plattype_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    sector_t*	sector;
+    fixed_t	speed;
+    fixed_t	low;
+    fixed_t	high;
+    int		wait;
+    int		count;
+    plat_e	status;
+    plat_e	oldstatus;
+    boolean	crush;
+    int		tag;
+    plattype_e	type;
+    
+} plat_t;
+
+
+
+#define PLATWAIT		3
+#define PLATSPEED		FRACUNIT
+#define MAXPLATS		30
+
+
+extern plat_t*	activeplats[MAXPLATS];
+
+void    T_PlatRaise(plat_t*	plat);
+
+int
+EV_DoPlat
+( line_t*	line,
+  plattype_e	type,
+  int		amount );
+
+void    P_AddActivePlat(plat_t* plat);
+void    P_RemoveActivePlat(plat_t* plat);
+void    EV_StopPlat(line_t* line);
+void    P_ActivateInStasis(int tag);
+
+
+//
+// P_DOORS
+//
+typedef enum
+{
+    vld_normal,
+    vld_close30ThenOpen,
+    vld_close,
+    vld_open,
+    vld_raiseIn5Mins,
+    vld_blazeRaise,
+    vld_blazeOpen,
+    vld_blazeClose,
+    vld_shopClose,          // villsa [STRIFE]
+    vld_splitRaiseNearest,  // villsa [STRIFE]
+    vld_splitOpen           // villsa [STRIFE]
+
+} vldoor_e;
+
+
+
+typedef struct
+{
+    thinker_t   thinker;
+    vldoor_e    type;
+    sector_t*   sector;
+    fixed_t     topheight;
+    fixed_t     speed;
+
+    // 1 = up, 0 = waiting at top, -1 = down
+    int         direction;
+    
+    // tics to wait at the top
+    int         topwait;
+    // (keep in case a door going down is reset)
+    // when it reaches 0, start going down
+    int         topcountdown;
+
+    // villsa [STRIFE] new field - sound to play when opening
+    int         opensound;
+
+    // villsa [STRIFE] new field - sound to play when closing
+    int         closesound;
+    
+} vldoor_t;
+
+
+
+#define VDOORSPEED		FRACUNIT*2
+#define VDOORWAIT		150
+
+void
+EV_VerticalDoor
+( line_t*	line,
+  mobj_t*	thing );
+
+int
+EV_DoDoor
+( line_t*	line,
+  vldoor_e	type );
+
+int
+EV_DoLockedDoor
+( line_t*	line,
+  vldoor_e	type,
+  mobj_t*	thing );
+
+void    T_VerticalDoor (vldoor_t* door);
+void    P_SpawnDoorCloseIn30 (sector_t* sec);
+
+void
+P_SpawnDoorRaiseIn5Mins
+( sector_t*	sec,
+  int		secnum );
+
+
+
+// villsa [STRIFE] resurrected sliding doors
+//
+//      Sliding doors...
+//
+typedef enum
+{
+    sd_opening,
+    sd_waiting,
+    sd_closing
+
+} sd_e;
+
+
+
+typedef enum
+{
+    sdt_openOnly,
+    sdt_closeOnly,
+    sdt_openAndClose
+
+} sdt_e;
+
+
+
+// villsa [STRIFE] Rogue added a second line_t in the struct
+// backsector is removed
+typedef struct
+{
+    thinker_t   thinker;
+    sdt_e       type;
+    line_t*     line1;
+    line_t*     line2;
+    int         frame;
+    int         whichDoorIndex;
+    int         timer;
+    sector_t*   frontsector;
+    sd_e        status;
+
+} slidedoor_t;
+
+// villsa [STRIFE] no front/back frames
+typedef struct
+{
+    char    frame1[9];
+    char    frame2[9];
+    char    frame3[9];
+    char    frame4[9];
+    char    frame5[9];
+    char    frame6[9];
+    char    frame7[9];
+    char    frame8[9];
+    
+} slidename_t;
+
+// villsa [STRIFE] no front/back frames
+typedef struct
+{
+    int frames[8];
+
+} slideframe_t;
+
+// haleyjd 09/29/10: [STRIFE] Externalized for savegames
+void T_SlidingDoor(slidedoor_t* door);
+
+
+// how many frames of animation
+#define SNUMFRAMES      8       // villsa [STRIFE] changed from 4 to 8
+
+#define SDOORWAIT       TICRATE*3
+#define SWAITTICS       4
+
+// how many diff. types of anims
+#define MAXSLIDEDOORS	8       // villsa [STRIFE] changed from 5 to 8                     
+
+void P_InitSlidingDoorFrames(void);
+void EV_SlidingDoor(line_t* line, mobj_t* thing);
+int EV_RemoteSlidingDoor(line_t* line, mobj_t* thing);
+
+
+
+//
+// P_CEILNG
+//
+typedef enum
+{
+    lowerToFloor,
+    raiseToHighest,
+    lowerAndCrush,
+    crushAndRaise,
+    fastCrushAndRaise,
+    silentCrushAndRaise
+
+} ceiling_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    ceiling_e	type;
+    sector_t*	sector;
+    fixed_t	bottomheight;
+    fixed_t	topheight;
+    fixed_t	speed;
+    boolean	crush;
+
+    // 1 = up, 0 = waiting, -1 = down
+    int		direction;
+
+    // ID
+    int		tag;                   
+    int		olddirection;
+    
+} ceiling_t;
+
+
+
+
+
+#define CEILSPEED		FRACUNIT
+#define CEILWAIT		150
+#define MAXCEILINGS		30
+
+extern ceiling_t*	activeceilings[MAXCEILINGS];
+
+int
+EV_DoCeiling
+( line_t*	line,
+  ceiling_e	type );
+
+void    T_MoveCeiling (ceiling_t* ceiling);
+void    P_AddActiveCeiling(ceiling_t* c);
+void    P_RemoveActiveCeiling(ceiling_t* c);
+int	EV_CeilingCrushStop(line_t* line);
+void    P_ActivateInStasisCeiling(line_t* line);
+
+
+//
+// P_FLOOR
+//
+typedef enum
+{
+    // lower floor to highest surrounding floor
+    lowerFloor,
+    
+    // lower floor to lowest surrounding floor
+    lowerFloorToLowest,
+    
+    // lower floor to highest surrounding floor VERY FAST
+    turboLower,
+    
+    // raise floor to lowest surrounding CEILING
+    raiseFloor,
+    
+    // raise floor to next highest surrounding floor
+    raiseFloorToNearest,
+
+    // raise floor to shortest height texture around it
+    raiseToTexture,
+    
+    // lower floor to lowest surrounding floor
+    //  and change floorpic
+    lowerAndChange,
+  
+    raiseFloor64,          // [STRIFE] changed from 24 to 64
+    raiseFloor24AndChange,
+    raiseFloorCrush,
+
+     // raise to next highest floor, turbo-speed
+    raiseFloorTurbo,       
+    donutRaise,
+    raiseFloor512,
+
+    // [STRIFE] New floor type - used for the coolant reactor pit
+    raiseFloor512AndChange
+    
+} floor_e;
+
+
+
+
+typedef enum
+{
+    build8,     // slowly build by 8
+    turbo16,    // quickly build by 16
+    buildDown16 // haleyjd 09/24/10: [STRIFE] new stair type
+} stair_e;
+
+
+
+typedef struct
+{
+    thinker_t	thinker;
+    floor_e	type;
+    boolean	crush;
+    sector_t*	sector;
+    int		direction;
+    int		newspecial;
+    short	texture;
+    fixed_t	floordestheight;
+    fixed_t	speed;
+
+} floormove_t;
+
+
+
+#define FLOORSPEED		FRACUNIT
+
+typedef enum
+{
+    ok,
+    crushed,
+    pastdest
+    
+} result_e;
+
+result_e
+T_MovePlane
+( sector_t*	sector,
+  fixed_t	speed,
+  fixed_t	dest,
+  boolean	crush,
+  int		floorOrCeiling,
+  int		direction );
+
+int
+EV_BuildStairs
+( line_t*	line,
+  stair_e	type );
+
+int
+EV_DoFloor
+( line_t*	line,
+  floor_e	floortype );
+
+void T_MoveFloor( floormove_t* floor);
+
+//
+// P_TELEPT
+//
+
+// [STRIFE] Teleportation flags - teleflags
+// Not to be conflated with telefrags, though they be tangentially related ;)
+typedef enum teleflags
+{
+    TF_NOSRCSND = 0x01,
+    TF_NODSTSND = 0x02,
+    TF_NODSTFOG = 0x10,
+    TF_NOSRCFOG = 0x20,
+
+    TF_NORMAL      = 0,
+    TF_DSTSILENCE  = (TF_NODSTSND|TF_NODSTFOG),    // 0x12 (18) (Not used)
+    TF_SRCSILENCE  = (TF_NOSRCSND|TF_NOSRCFOG),    // 0x21 (33)
+    TF_FULLSILENCE = (TF_SRCSILENCE|TF_DSTSILENCE) // 0x33 (51)
+
+} teleflags_e;
+
+int
+EV_Teleport
+( line_t*       line,
+  int           side,
+  mobj_t*       thing,
+  teleflags_e   flags);
+
+#endif
diff --git a/games/NXDoom/src/strife/p_switch.c b/games/NXDoom/src/strife/p_switch.c
new file mode 100644
index 000000000..849ab2bc0
--- /dev/null
+++ b/games/NXDoom/src/strife/p_switch.c
@@ -0,0 +1,1078 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// DESCRIPTION:
+//	Switches, buttons. Two-state animation. Exits.
+//
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "deh_main.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "g_game.h"
+#include "d_main.h" // villsa [STRIFE]
+#include "z_zone.h" // villsa [STRIFE]
+#include "w_wad.h"  // villsa [STRIFE]
+#include "s_sound.h"
+#include "m_random.h" // haleyjd [STRIFE]
+#include "p_dialog.h"
+#include "p_local.h"  // haleyjd [STRIFE]
+#include "m_bbox.h"   // villsa [STRIFE]
+#include "m_misc.h"
+
+// Data.
+#include "sounds.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+//
+// CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
+//
+// villsa [STRIFE] new switch list
+switchlist_t alphSwitchList[] =
+{
+    { "GLASS01",    "GLASS02",      1,  sfx_bglass  },
+    { "GLASS03",    "GLASS04",      1,  sfx_bglass  },
+    { "GLASS05",    "GLASS06",      1,  sfx_bglass  },
+    { "GLASS07",    "GLASS08",      1,  sfx_bglass  },
+    { "GLASS17",    "GLASS18",      1,  sfx_bglass  },
+    { "GLASS19",    "GLASS20",      1,  sfx_bglass  },
+    { "SWKNOB01",   "SWKNOB02",     1,  sfx_swknob  },
+    { "SWLITE01",   "SWLITE02",     1,  sfx_None    },
+    { "SWCHN01",    "SWCHN02",      1,  sfx_pulchn  },
+    { "COMP01",     "COMP04B",      1,  sfx_bglass  },
+    { "COMP05",     "COMP12B",      1,  sfx_bglass  },
+    { "COMP09",     "COMP12B",      1,  sfx_bglass  },
+    { "COMP12",     "COMP04B",      1,  sfx_bglass  },
+    { "COMP13",     "COMP12B",      1,  sfx_bglass  },
+    { "COMP17",     "COMP20B",      1,  sfx_bglass  },
+    { "COMP21",     "COMP28B",      1,  sfx_bglass  },
+    { "WALTEK09",   "WALTEKB1",     1,  sfx_None    },
+    { "WALTEK10",   "WALTEKB1",     1,  sfx_None    },
+    { "WALTEK15",   "WALTEKB1",     1,  sfx_None    },
+    { "SWFORC01",   "SWFORC02",     1,  sfx_None    },
+    { "SWEXIT01",   "SWEXIT02",     1,  sfx_None    },
+    { "DORSBK01",   "DORSBK02",     1,  sfx_swston  },
+    { "SWSLD01",    "SWSLD02",      1,  sfx_None    },
+    { "DORWS04",    "DORWS05",      1,  sfx_swbolt  },
+    { "SWIRON01",   "SWIRON02",     1,  sfx_None    },
+    { "GLASS09",    "GLASS10",      2,  sfx_bglass  },
+    { "GLASS11",    "GLASS12",      2,  sfx_bglass  },
+    { "GLASS13",    "GLASS14",      2,  sfx_bglass  },
+    { "GLASS15",    "GLASS16",      2,  sfx_bglass  },
+    { "SWFORC03",   "SWFORC04",     2,  sfx_None    },
+    { "SWCIT01",    "SWCIT02",      2,  sfx_None    },
+    { "SWTRMG01",   "SWTRMG04",     2,  sfx_None    },
+    { "SWMETL01",   "SWMETL02",     2,  sfx_None    },
+    { "SWWOOD01",   "SWWOOD02",     2,  sfx_None    },
+    { "SWTKBL01",   "SWTKBL02",     2,  sfx_None    },
+    { "AZWAL21",    "AZWAL22",      2,  sfx_None    },
+    { "SWINDT01",   "SWINDT02",     2,  sfx_None    },
+    { "SWRUST01",   "SWRUST02",     2,  sfx_None    },
+    { "SWCHAP01",   "SWCHAP02",     2,  sfx_None    },
+    { "SWALIN01",   "SWALIN02",     2,  sfx_None    },
+    { "SWWALG01",   "SWWALG02",     2,  sfx_None    },
+    { "SWWALG03",   "SWWALG04",     2,  sfx_None    },
+    { "SWTRAM01",   "SWTRAM02",     2,  sfx_None    },
+    { "SWTRAM03",   "SWTRAM04",     2,  sfx_None    },
+    { "SWORC01",    "SWORC02",      2,  sfx_None    },
+    { "SWBRIK01",   "SWBRIK02",     2,  sfx_None    },
+    { "SWIRON03",   "SWIRON04",     2,  sfx_None    },
+    { "SWIRON05",   "SWIRON06",     2,  sfx_None    },
+    { "SWIRON07",   "SWIRON08",     2,  sfx_None    },
+    { "SWCARD01",   "SWCARD02",     2,  sfx_keycrd  },
+    { "SWSIGN01",   "SWSIGN02",     2,  sfx_None    },
+    { "SWLEV01",    "SWLEV02",      2,  sfx_None    },
+    { "SWLEV03",    "SWLEV04",      2,  sfx_None    },
+    { "SWLEV05",    "SWLEV06",      2,  sfx_None    },
+    { "SWBRN01",    "SWBRN02",      2,  sfx_keycrd  },
+    { "SWPIP01",    "SWPIP02",      2,  sfx_valve   },
+    { "SWPALM01",   "SWPALM02",     2,  sfx_swscan  },
+    { "SWKNOB03",   "SWKNOB04",     2,  sfx_swknob  },
+    { "ALTSW01",    "ALTSW02",      2,  sfx_None    },
+    { "COMP25",     "COMP28B",      2,  sfx_bglass  },
+    { "COMP29",     "COMP20B",      2,  sfx_bglass  },
+    { "COMP33",     "COMP50",       2,  sfx_bglass  },
+    { "COMP42",     "COMP51",       2,  sfx_bglass  },
+    { "GODSCRN1",   "GODSCRN2",     2,  sfx_difool  },
+    { "ALIEN04",    "ALIEN05",      2,  sfx_None    },
+    { "CITADL04",   "CITADL05",     2,  sfx_None    },
+    { "SWITE03",    "SWITE04",      2,  sfx_None    },
+    { "SWTELP01",   "SWTELP02",     2,  sfx_None    },
+    { "BRNSCN01",   "BRNSCN05",     2,  sfx_firxpl  },
+};
+
+int		switchlist[MAXSWITCHES * 2];
+int		numswitches;
+button_t        buttonlist[MAXBUTTONS];
+
+//
+// P_InitSwitchList
+// Only called at game initialization.
+//
+void P_InitSwitchList(void)
+{
+    int i, slindex, episode;
+
+    // Note that this is called "episode" here but it's actually something
+    // quite different. As we progress from Shareware->Registered->Doom II
+    // we support more switch textures.
+    if (isregistered)
+    {
+        episode = 2;
+    }
+    else
+    {
+        episode = 1;
+    }
+
+    slindex = 0;
+
+    for (i = 0; i < arrlen(alphSwitchList); i++)
+    {
+	if (alphSwitchList[i].episode <= episode)
+	{
+	    switchlist[slindex++] =
+                R_TextureNumForName(DEH_String(alphSwitchList[i].name1));
+	    switchlist[slindex++] =
+                R_TextureNumForName(DEH_String(alphSwitchList[i].name2));
+	}
+    }
+
+    numswitches = slindex / 2;
+    switchlist[slindex] = -1;
+}
+
+
+//
+// P_StartButton
+// Start a button counting down till it turns off.
+//
+void P_StartButton(line_t* line, bwhere_e w, int texture, int time)
+{
+    int		i;
+    
+    // See if button is already pressed
+    for(i = 0; i < MAXBUTTONS; i++)
+    {
+	if(buttonlist[i].btimer && buttonlist[i].line == line)
+            return;
+    }
+    
+
+    
+    for(i = 0; i < MAXBUTTONS; i++)
+    {
+	if(!buttonlist[i].btimer)
+	{
+	    buttonlist[i].line = line;
+	    buttonlist[i].where = w;
+	    buttonlist[i].btexture = texture;
+	    buttonlist[i].btimer = time;
+	    buttonlist[i].soundorg = &line->frontsector->soundorg;
+	    return;
+	}
+    }
+    
+    I_Error("P_StartButton: no button slots left!");
+}
+
+
+//
+// P_SpawnBrokenGlass
+// villsa [STRIFE] new function
+//
+static void P_SpawnBrokenGlass(line_t* line)
+{
+    fixed_t x1;
+    fixed_t x2;
+    fixed_t y1;
+    fixed_t y2;
+    int i;
+    mobj_t* glass;
+    angle_t an;
+
+    x1 = (line->v2->x + line->v1->x) / 2;
+    y1 = (line->v2->y + line->v1->y) / 2;
+    x2 = ((line->frontsector->soundorg.x - x1) / 5) + x1;
+    y2 = ((line->frontsector->soundorg.y - y1) / 5) + y1;
+
+    for(i = 0; i < 7; i++)
+    {
+        glass = P_SpawnMobj(x2, y2, ONFLOORZ, MT_JUNK);
+        glass->z += (24*FRACUNIT);
+        glass->flags |= (MF_SHADOW|MF_MVIS);
+
+        P_SetMobjState(glass, P_Random() % 3 + S_SHRD_03); // 284
+
+        an = ((P_Random() << 13) / 255);
+
+        glass->angle = (an << ANGLETOFINESHIFT);
+        glass->momx = FixedMul(finecosine[an], (P_Random() & 3) << FRACBITS);
+        glass->momy = FixedMul(finesine[an],   (P_Random() & 3) << FRACBITS);
+        glass->momz = (P_Random() & 7) << FRACBITS;
+        glass->tics += (P_Random() + 7) & 7;
+    }
+}
+
+
+//
+// Function that changes wall texture.
+// Tell it if switch is ok to use again (1=yes, it's a button).
+//
+void P_ChangeSwitchTexture(line_t* line, int useAgain)
+{
+    int     texTop;
+    int     texMid;
+    int     texBot;
+    int     i;
+    int     sound;
+    boolean breakglass; // villsa [STRIFE]
+    switchlist_t* sl;   // villsa [STRIFE]
+
+    breakglass = false; // villsa [STRIFE]
+
+    texTop = sides[line->sidenum[0]].toptexture;
+    texMid = sides[line->sidenum[0]].midtexture;
+    texBot = sides[line->sidenum[0]].bottomtexture;
+
+    sound = sfx_swtchn;
+
+    // villsa [STRIFE] check for linetype 182 (break glass)
+    if(line->special == 182)
+    {
+        line->flags &= ~ML_BLOCKING;
+        breakglass = true;
+
+        if(useAgain)
+        {
+            // haleyjd 09/21/10: Corrected (>> 16 == next field)
+            texTop = 0;
+            texBot = 0;
+        }
+
+        if(texMid) // haleyjd 09/21/10: Corrected (>> 16 == next field)
+            useAgain = 0;
+
+        sound = sfx_bglass;
+    }
+
+    if(!useAgain)
+        line->special = 0;
+
+    for(i = 0; i < numswitches*2; i++)
+    {
+        sl = &alphSwitchList[i / 2]; // villsa [STRIFE]
+
+        if(switchlist[i] == texTop)
+        {
+            // villsa [STRIFE] set sound
+            if(sl->sound)
+                sound = sl->sound;
+
+            // haleyjd 20141026: [STRIFE]: Rogue fixed wrong sound origin
+            S_StartSound(&line->frontsector->soundorg, sound);
+            sides[line->sidenum[0]].toptexture = switchlist[i^1];
+
+            if(useAgain)
+                P_StartButton(line,top,switchlist[i],BUTTONTIME);
+
+            if(breakglass)
+                P_SpawnBrokenGlass(line);
+
+            return;
+        }
+        else
+        {
+            if(switchlist[i] == texMid)
+            {
+                // villsa [STRIFE] set sound
+                if(sl->sound)
+                    sound = sl->sound;
+
+                // haleyjd 20141026: [STRIFE]: Rogue fixed wrong sound origin
+                S_StartSound(&line->frontsector->soundorg, sound);
+                sides[line->sidenum[0]].midtexture = switchlist[i^1];
+
+                // villsa [STRIFE] affect second side of line
+                // BUG: will crash if 1S line is marked with TWOSIDED flag!
+                if(line->flags & ML_TWOSIDED)
+                    sides[line->sidenum[1]].midtexture = switchlist[i^1];
+
+                if(useAgain)
+                    P_StartButton(line, middle,switchlist[i],BUTTONTIME);
+
+                // villsa [STRIFE]: Mines Transmitter hack
+                if(sound == sfx_firxpl)
+                {
+                    breakglass = true;
+
+                    // give quest flag 29 to player
+                    players[0].questflags |= QF_QUEST29;
+
+                    // give stamina/accuracy items
+                    if(!netgame)
+                    {
+                        P_GiveItemToPlayer(players, SPR_TOKN, MT_TOKEN_STAMINA);
+                        P_GiveItemToPlayer(players, SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
+                    }
+
+                }
+
+                // villsa [STRIFE]
+                if(breakglass || sound == sfx_bglass)
+                    P_SpawnBrokenGlass(line);
+
+                return;
+            }
+            else
+            {
+                if(switchlist[i] == texBot)
+                {
+                    // villsa [STRIFE] set sound
+                    if(sl->sound)
+                        sound = sl->sound;
+
+                    // haleyjd 20141026: [STRIFE]: Rogue fixed wrong sound origin
+                    S_StartSound(&line->frontsector->soundorg, sound);
+                    sides[line->sidenum[0]].bottomtexture = switchlist[i^1];
+
+                    if(useAgain)
+                        P_StartButton(line, bottom,switchlist[i],BUTTONTIME);
+
+                    if(breakglass)
+                        P_SpawnBrokenGlass(line);
+
+                    return;
+                }
+            }
+        }
+    }
+}
+
+//
+// P_MoveWall
+//
+// villsa [STRIFE] New function.
+// Dynamically move a solid line. Unused in Strife
+//
+static void P_MoveWall(line_t *line, mobj_t *thing)
+{
+    vertex_t *v2;
+    vertex_t *v1;
+    fixed_t x;
+    fixed_t y;
+
+    v1 = line->v1;
+    v2 = line->v2;
+    S_StartSound(thing, sfx_stnmov);
+
+    if (line->dx)
+    {
+        if (thing->x >= v1->x)
+        {
+            v1->y -= (8 * FRACUNIT);
+            v2->y -= (8 * FRACUNIT);
+        }
+        else
+        {
+            v1->y += (8 * FRACUNIT);
+            v2->y += (8 * FRACUNIT);
+        }
+    }
+    else
+    {
+        if (thing->y >= v1->y)
+        {
+            v1->x -= (8 * FRACUNIT);
+            v2->x -= (8 * FRACUNIT);
+        }
+        else
+        {
+            v1->x += (8 * FRACUNIT);
+            v2->x += (8 * FRACUNIT);
+        }
+    }
+
+    if (v1->x >= v2->x)
+    {
+        line->bbox[BOXLEFT] = v2->x;
+        x = v1->x;
+    }
+    else
+    {
+        line->bbox[BOXLEFT] = v1->x;
+        x = v2->x;
+    }
+
+    line->bbox[BOXRIGHT] = x;
+
+    if (v1->y >= v2->y)
+    {
+        line->bbox[BOXBOTTOM] = v2->y;
+        y = v1->y;
+    }
+    else
+    {
+        line->bbox[BOXBOTTOM] = v1->y;
+        y = v2->y;
+    }
+
+    line->bbox[BOXTOP] = y;
+}
+
+// villsa [STRIFE]
+static char usemessage[92];
+
+//
+// P_UseSpecialLine
+// Called when a thing uses a special line.
+// Only the front sides of lines are usable.
+//
+boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side)
+{
+    // Err...
+    // Use the back sides of VERY SPECIAL lines...
+    if (side)
+    {
+        switch(line->special)
+        {
+        case 148: // haleyjd [STRIFE]
+            break;
+
+        default:
+            return false;
+        }
+    }
+    
+    // Switches that other things can activate.
+    if (!thing->player)
+    {
+        // never open secret doors
+        if (line->flags & ML_SECRET)
+            return false;
+
+        switch(line->special)
+        {
+        case 1:         // MANUAL DOOR RAISE
+        case 31:        // haleyjd [STRIFE]
+        case 144:       // haleyjd [STRIFE] Manual sliding door
+            break;
+
+        default:
+            return false;
+            break;
+        }
+    }
+   
+    // do something  
+    switch(line->special)
+    {
+        // MANUALS
+    case 1:             // Vertical Door
+    case 26:            // DR ID Card
+    case 27:            // DR Pass Card
+    case 28:            // DR ID Badge
+    case 31:            // Manual door open
+    case 32:            // D1 ID Card
+    case 33:            // D1 ID Badge
+    case 34:            // D1 Pass Card
+    case 117:           // Blazing door raise
+    case 118:           // Blazing door open
+    case 156:           // haleyjd [STRIFE] D1 Brass Key
+    case 157:           // haleyjd [STRIFE] D1 Silver Key
+    case 158:           // haleyjd [STRIFE] D1 Gold Key
+    case 159:           // haleyjd [STRIFE] DR Gold Key
+    case 160:           // haleyjd [STRIFE] DR Silver Key
+    case 161:           // haleyjd [STRIFE] DR Brass Key
+    case 165:           // villsa  [STRIFE] That doesn't seem to work
+    case 166:           // haleyjd [STRIFE] DR Hand Print
+    case 169:           // haleyjd [STRIFE] DR Base Key
+    case 170:           // haleyjd [STRIFE] DR Gov's Key
+    case 190:           // haleyjd [STRIFE] DR Order Key
+    case 205:           // villsa  [STRIFE] Available in retail only
+    case 213:           // haleyjd [STRIFE] DR Chalice
+    case 217:           // haleyjd [STRIFE] DR Core Key
+    case 221:           // haleyjd [STRIFE] DR Mauler Key
+    case 224:           // haleyjd [STRIFE] DR Chapel Key
+    case 225:           // haleyjd [STRIFE] DR Catacomb Key
+    case 232:           // villsa  [STRIFE] DR Oracle Pass
+        EV_VerticalDoor (line, thing);
+        break;
+
+    // haleyjd: For the sake of our sanity, I have reordered all the line
+    // specials from this point down so that they are strictly in numeric
+    // order, and not divided up in a semi-arbitrary fashion.
+
+    case 7:
+        // Build Stairs - [STRIFE] Verified unmodified
+        if (EV_BuildStairs(line,build8))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 9:
+        // Change Donut - [STRIFE] Verified unmodified
+        if (EV_DoDonut(line))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 11:
+        // Exit level - [STRIFE] Modified to take tag, etc.
+        P_ChangeSwitchTexture(line, 1);
+        if(levelTimer && levelTimeCount)
+            break;
+        G_ExitLevel(line->tag);
+        break;
+
+    case 14:
+        // Raise Floor 32 and change texture - [STRIFE] Verified unmodified
+        if (EV_DoPlat(line, raiseAndChange,32))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 15:
+        // Raise Floor 24 and change texture
+        if (EV_DoPlat(line, raiseAndChange,24))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 18:
+        // Raise Floor to next highest floor - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line, raiseFloorToNearest))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 20:
+        // Raise Plat next highest floor and change texture - [STRIFE] Verified unmodified
+        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 21:
+        // PlatDownWaitUpStay - [STRIFE] Verified unmodified
+        if (EV_DoPlat(line, downWaitUpStay,0))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 23:
+        // Lower Floor to Lowest - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,lowerFloorToLowest))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 29:
+        // Raise Door - [STRIFE] Verified unmodified
+        if (EV_DoDoor(line,vld_normal))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 40:
+        // villsa [STRIFE] Split Open Door
+        if(EV_DoDoor(line, vld_splitOpen))
+            P_ChangeSwitchTexture(line, 0);
+        break; // haleyjd
+
+    case 41:
+        // Lower Ceiling to Floor - [STRIFE] Verified unmodified
+        if (EV_DoCeiling(line,lowerToFloor))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 42:
+        // Close Door - [STRIFE] Verified unmodified
+        if (EV_DoDoor(line,vld_close))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 43:
+        // Lower Ceiling to Floor - [STRIFE] Verified unmodified
+        if (EV_DoCeiling(line,lowerToFloor))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 45:
+        // Lower Floor to Surrounding floor height - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,lowerFloor))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 49:
+        // Ceiling Crush And Raise - [STRIFE] Verified unmodified
+        if (EV_DoCeiling(line,crushAndRaise))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 50:
+        // Close Door - [STRIFE] Verified unmodified
+        if (EV_DoDoor(line,vld_close))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 51:
+        // [STRIFE] Modifed into S1 Start Finale (was Secret Exit)
+        P_ChangeSwitchTexture(line,0);
+        G_StartFinale();
+        break;
+
+    case 55:
+        // Raise Floor Crush - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloorCrush))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 60:
+        // Lower Floor to Lowest - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,lowerFloorToLowest))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 61:
+        // Open Door - [STRIFE] Verified unmodified
+        if (EV_DoDoor(line,vld_open))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 62:
+        // PlatDownWaitUpStay - [STRIFE] Verified unmodified
+        if (EV_DoPlat(line, downWaitUpStay,1))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 63:
+        // Raise Door - [STRIFE] Verified unmodified
+        if (EV_DoDoor(line,vld_normal))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 64:
+        // Raise Floor to ceiling - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloor))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 65:
+        // Raise Floor Crush - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloorCrush))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 66:
+        // Raise Floor 24 and change texture - [STRIFE] Verified unmodified
+        if (EV_DoPlat(line, raiseAndChange, 24))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 67:
+        // Raise Floor 32 and change texture - [STRIFE] Verified unmodified
+        if (EV_DoPlat(line, raiseAndChange, 32))
+            P_ChangeSwitchTexture(line,1);
+        break;
+   
+    case 68:
+        // Raise Plat to next highest floor and change texture - [STRIFE] Verified unmodified
+        if (EV_DoPlat(line, raiseToNearestAndChange, 0))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 69:
+        // Raise Floor to next highest floor - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line, raiseFloorToNearest))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 70:
+        // Turbo Lower Floor - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,turboLower))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 71:
+        // Turbo Lower Floor - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,turboLower))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 101:
+        // Raise Floor - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloor))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 102:
+        // Lower Floor to Surrounding floor height - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,lowerFloor))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 103:
+        // Open Door - [STRIFE] Verified unmodified
+        if (EV_DoDoor(line,vld_open))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 111:
+        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified
+        if (EV_DoDoor (line,vld_blazeRaise))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 112:
+        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified
+        if (EV_DoDoor (line,vld_blazeOpen))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 113:
+        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified
+        if (EV_DoDoor (line,vld_blazeClose))
+            P_ChangeSwitchTexture(line,0);
+        break;
+    
+    case 114:
+        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified
+        if (EV_DoDoor (line,vld_blazeRaise))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 115:
+        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified
+        if (EV_DoDoor (line,vld_blazeOpen))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 116:
+        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified
+        if (EV_DoDoor (line,vld_blazeClose))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 122:
+        // Blazing PlatDownWaitUpStay - [STRIFE] Verified unmodified
+        if(EV_DoPlat(line, blazeDWUS, 0))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 123:
+        // Blazing PlatDownWaitUpStay - [STRIFE] Verified unmodified
+        if(EV_DoPlat(line, blazeDWUS, 0))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 127:
+        // Build Stairs Turbo 16 - [STRIFE] Verified unmodified
+        if (EV_BuildStairs(line,turbo16))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 131:
+        // Raise Floor Turbo - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloorTurbo))
+            P_ChangeSwitchTexture(line,0);
+        break;
+    
+    case 132:
+        // Raise Floor Turbo - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloorTurbo))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 133: // [STRIFE] TODO - which key is it?
+    case 135: // [STRIFE] TODO - which key is it?
+    case 137: // [STRIFE] TODO - which key is it?
+        if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 99:  // [STRIFE] TODO: which key is it?
+    case 134: // [STRIFE] TODO: which key is it?
+    case 136: // [STRIFE] TODO: which key is it?
+        if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
+            P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 138:
+        // Light Turn On - [STRIFE] Verified unmodified
+        EV_LightTurnOn(line,255);
+        P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 139:
+        // Light Turn Off - [STRIFE] Verified unmodified
+        EV_LightTurnOn(line,35);
+        P_ChangeSwitchTexture(line,1);
+        break;
+
+    case 140:
+        // Raise Floor 512 - [STRIFE] Verified unmodified
+        if (EV_DoFloor(line,raiseFloor512))
+            P_ChangeSwitchTexture(line,0);
+        break;
+
+    case 144:
+        // villsa [STRIFE] manual sliding door
+        EV_SlidingDoor(line, thing);
+        break;
+
+    case 146:
+        // haleyjd 09/24/10: [STRIFE] S1 Build Stairs Down 16 (new type)
+        if(EV_BuildStairs(line, buildDown16))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 147:
+        // haleyjd 09/24/10: [STRIFE] S1 Clear Force Fields
+        if(EV_ClearForceFields(line))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 148:
+        // haleyjd 09/16/10: [STRIFE] using forcefields hurts
+        P_DamageMobj(thing, NULL, NULL, 16);
+        P_Thrust(thing->player, thing->angle + ANG180, 125*FRACUNIT/16);
+        break;
+
+    case 151: // villsa [STRIFE] BlzOpenDoor Gold key
+    case 152: // [STRIFE] TODO: which key is it?
+    case 153: // [STRIFE] TODO: which key is it?
+        if(EV_DoLockedDoor(line, vld_blazeOpen, thing))
+            P_ChangeSwitchTexture(line, 1);
+        break;
+
+    case 154:
+        // villsa [STRIFE] plat lower wait rise if have gold key
+        if(thing->player->cards[key_GoldKey])
+        {
+            if(EV_DoPlat(line, downWaitUpStay, 0))
+                P_ChangeSwitchTexture(line, 1);
+        }
+        else
+        {
+            thing->player->message = DEH_String("You need a gold key");
+            S_StartSound(thing, sfx_oof);
+        }
+        break;
+
+    case 155:
+        // villsa [STRIFE] raise plat wait lower
+        if(EV_DoPlat(line, upWaitDownStay, 0))
+            P_ChangeSwitchTexture(line, 1);
+        break;
+
+    case 162: // [STRIFE] TODO: which key is it?
+    case 163: // [STRIFE] TODO: which key is it?
+    case 164: // villsa [STRIFE] BlzOpenDoor Gold key
+    case 167: // [STRIFE] TODO: which key is it?
+        if(EV_DoLockedDoor(line, vld_blazeOpen, thing))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 168: // [STRIFE] TODO: which key is it?
+        // haleyjd 09/25/10: [STRIFE] SR Blaze Open Door ???? Key
+        if(EV_DoLockedDoor(line, vld_blazeOpen, thing))
+            P_ChangeSwitchTexture(line, 1);
+        break;
+
+    case 171: // [STRIFE] TODO: which key is it?
+        // haleyjd 09/25/10: [STRIFE] S1 Open Door ???? Key
+        if(EV_DoLockedDoor(line, vld_open, thing))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 172: // [STRIFE] TODO: which key is it?
+    case 173: // [STRIFE] TODO: which key is it?
+    case 176: // [STRIFE] TODO: which key is it?
+    case 191: // [STRIFE] TODO: which key is it?
+    case 192: // [STRIFE] TODO: which key is it?
+    case 223: // [STRIFE] TODO: which key is it?
+        if(EV_DoLockedDoor(line, vld_normal, thing))
+            P_ChangeSwitchTexture(line, 1);
+        break;
+
+    case 177:
+        // villsa [STRIFE] plat lower wait rise if have power3 key
+        if(thing->player->cards[key_Power3Key])
+        {
+            if(EV_DoPlat(line, downWaitUpStay, 0))
+                P_ChangeSwitchTexture(line, 1);
+        }
+        else
+        {
+            thing->player->message = DEH_String("You don't have the key");
+            S_StartSound(thing, sfx_oof);
+        }
+        break;
+
+    case 181:
+        // haleyjd 09/25/10: [STRIFE] S1 Floor Raise 512 & Change
+        if(EV_DoFloor(line, raiseFloor512AndChange))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 189: // [STRIFE] TODO: which key is it???
+        // haleyjd 09/25/10: [STRIFE] S1 Split Open Door ???? Key
+        if(EV_DoLockedDoor(line, vld_splitOpen, thing))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 194:
+        // villsa [STRIFE] S1 Free Prisoners
+        if(EV_DoDoor(line, vld_open))
+        {
+            P_ChangeSwitchTexture(line, 0);
+            P_FreePrisoners();
+        }
+        break;
+
+    case 199:
+        // haleyjd 09/25/10: [STRIFE] S1 Destroy Converter
+        if(EV_DoCeiling(line, lowerAndCrush))
+        {
+            P_ChangeSwitchTexture(line, 0);
+            P_DestroyConverter();
+        }
+        break;
+
+    case 207:
+        // villsa [STRIFE] SR Remote Sliding Door
+        if(EV_RemoteSlidingDoor(line, thing))
+            P_ChangeSwitchTexture(line, 1);
+        break; // haleyjd
+
+    case 209:
+        // haleyjd 09/24/10: [STRIFE] S1 Build Stairs Down 16 if Have Chalice
+        if(!P_PlayerHasItem(thing->player, MT_INV_CHALICE))
+        {
+            DEH_snprintf(usemessage, sizeof(usemessage), "You need the chalice!");
+            thing->player->message = usemessage;
+            S_StartSound(thing, sfx_oof);
+            break;
+        }
+        else if(EV_BuildStairs(line, buildDown16))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 211:
+        // villsa [STRIFE] S1 Play VOC## sound
+        if(&players[consoleplayer] == thing->player &&
+            thing->player->powers[pw_communicator])
+        {
+            DEH_snprintf(usemessage, sizeof(usemessage), "voc%i", line->tag);
+            I_StartVoice(usemessage);
+            line->special = 0;
+        }
+        break;
+
+    case 214:
+        // villsa [STRIFE] S1 slow lift lower wait up stay
+        if(EV_DoPlat(line, slowDWUS, 1))
+            P_ChangeSwitchTexture(line, 1);
+        break;
+
+    case 219:
+        // haleyjd 09/25/10: S1 Lower Floor Blue Crystal
+        if(!thing->player->cards[key_BlueCrystalKey])
+        {
+            thing->player->message = DEH_String("You need the Blue Crystal");
+            S_StartSound(thing, sfx_oof);
+        }
+        else if(EV_DoFloor(line, lowerFloor))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 220:
+        // haleyjd 09/25/10: S1 Lower Floor Red Crystal
+        if(!thing->player->cards[key_RedCrystalKey])
+        {
+            thing->player->message = DEH_String("You need the Red Crystal");
+            S_StartSound(thing, sfx_oof);
+        }
+        else if(EV_DoFloor(line, lowerFloor))
+            P_ChangeSwitchTexture(line, 0);
+        break;
+
+    case 226:
+        // villsa [STRIFE] S1 Complete Training Area
+        if(EV_DoFloor(line, lowerFloor))
+        {
+            P_GiveItemToPlayer(thing->player, SPR_TOKN, MT_TOKEN_STAMINA);
+            P_GiveItemToPlayer(thing->player, SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
+            P_ChangeSwitchTexture(line, 0);
+            DEH_snprintf(usemessage, sizeof(usemessage),
+                "Congratulations! You have completed the training area.");
+            thing->player->message = usemessage;
+        }
+        break;
+
+    case 229:
+        // villsa [STRIFE] SR Sigil Sliding Door
+        if(thing->player->sigiltype == 4)
+        {
+            if(EV_RemoteSlidingDoor(line, thing))
+                P_ChangeSwitchTexture(line, 1);
+        }
+        break; // haleyjd
+
+    case 233:
+        // villsa [STRIFE] objective given after revealing the computer
+        if(!EV_DoDoor(line, vld_splitOpen))
+            return true;
+
+        P_ChangeSwitchTexture(line, 1);
+        GiveVoiceObjective("voc70", "log70", 0);
+        
+        // haleyjd: Strife used sprintf here, not a direct set.
+        DEH_snprintf(usemessage, sizeof(usemessage), 
+                     "Incoming Message from BlackBird...");
+        thing->player->message = usemessage;
+
+        break;
+
+    case 234:
+        // haleyjd 09/24/10: [STRIFE] SR Raise Door if Quest 3
+        if(!(thing->player->questflags & QF_QUEST3)) // QUEST3 == Irale
+        {
+            // BUG: doesn't make sfx_oof sound like all other message-
+            // giving door types. I highly doubt this was intentional.
+            DEH_snprintf(usemessage, sizeof(usemessage), 
+                         "That doesn't seem to work!");
+            thing->player->message = usemessage;
+        }
+        else if(EV_DoDoor(line, vld_normal))
+            P_ChangeSwitchTexture(line, 1);
+        break;
+
+    case 235:
+        // haleyjd 09/25/10: [STRIFE] S1 Split Open Door if Have Sigil 4
+        if(thing->player->sigiltype == 4)
+        {
+            if(EV_DoDoor(line, vld_splitOpen))
+                P_ChangeSwitchTexture(line, 0);
+        }
+        break;
+
+    case 666:
+        // villsa [STRIFE] SR Move Wall
+        P_MoveWall(line, thing);
+        break;
+    }
+
+    return true;
+}
+
diff --git a/games/NXDoom/src/strife/p_telept.c b/games/NXDoom/src/strife/p_telept.c
new file mode 100644
index 000000000..aff3b0c3b
--- /dev/null
+++ b/games/NXDoom/src/strife/p_telept.c
@@ -0,0 +1,151 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Teleportation.
+//
+
+
+
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "s_sound.h"
+
+#include "p_local.h"
+
+
+// Data.
+#include "sounds.h"
+
+// State.
+#include "r_state.h"
+
+
+
+//
+// TELEPORTATION
+//
+// haleyjd 09/22/10: [STRIFE] Modified to take a flags parameter to control
+// silent teleportation. Rogue also removed the check for missiles, and the 
+// z-set was replaced with one in P_TeleportMove.
+//
+int
+EV_Teleport
+( line_t*       line,
+  int           side,
+  mobj_t*       thing,
+  teleflags_e   flags)
+{
+    int         i;
+    int         tag;
+    mobj_t*     m;
+    mobj_t*     fog = NULL;
+    unsigned    an;
+    thinker_t*  thinker;
+    sector_t*   sector;
+    fixed_t     oldx;
+    fixed_t     oldy;
+    fixed_t     oldz;
+
+    // haleyjd 20110205 [STRIFE]: this is not checked here
+    // don't teleport missiles
+    //if (thing->flags & MF_MISSILE)
+    //    return 0;
+
+    // Don't teleport if hit back of line,
+    //  so you can get out of teleporter.
+    if (side == 1)
+        return 0;
+
+    tag = line->tag;
+    for (i = 0; i < numsectors; i++)
+    {
+        if (sectors[ i ].tag == tag )
+        {
+            for (thinker = thinkercap.next;
+                thinker != &thinkercap;
+                thinker = thinker->next)
+            {
+                // not a mobj
+                if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
+                    continue;
+
+                m = (mobj_t *)thinker;
+
+                // not a teleportman
+                if (m->type != MT_TELEPORTMAN )
+                    continue;
+
+                sector = m->subsector->sector;
+                // wrong sector
+                if (sector-sectors != i )
+                    continue;
+
+                oldx = thing->x;
+                oldy = thing->y;
+                oldz = thing->z;
+
+                if (!P_TeleportMove (thing, m->x, m->y))
+                    return 0;
+
+                // fraggle: this was changed in final doom, 
+                // problem between normal doom2 1.9 and final doom
+                //
+                // Note that although chex.exe is based on Final Doom,
+                // it does not have this quirk.
+                //
+                // haleyjd 20110205 [STRIFE] This code is *not* present,
+                // because of a z-set which Rogue added to P_TeleportMove.
+                /*
+                if (gameversion < exe_final || gameversion == exe_chex)
+                    thing->z = thing->floorz;
+                */
+
+                if (thing->player)
+                    thing->player->viewz = thing->z+thing->player->viewheight;
+
+                // spawn teleport fog at source and destination
+                // haleyjd 09/22/10: [STRIFE] controlled by teleport flags
+                // BUG: Behavior would be undefined if this function were passed
+                // any combination of teleflags that has the NO*FOG but not the
+                // corresponding NO*SND flag - fortunately this is never done
+                // anywhere in the code.
+                if(!(flags & TF_NOSRCFOG))
+                    fog = P_SpawnMobj (oldx, oldy, oldz, MT_TFOG);
+                if(!(flags & TF_NOSRCSND))
+                    S_StartSound (fog, sfx_telept);
+                
+                an = m->angle >> ANGLETOFINESHIFT;
+                
+                if(!(flags & TF_NODSTFOG))
+                    fog = P_SpawnMobj (m->x+20*finecosine[an], m->y+20*finesine[an], 
+                                       thing->z, MT_TFOG);
+                if(!(flags & TF_NODSTSND))
+                    S_StartSound (fog, sfx_telept);
+
+                // don't move for a bit
+                if (thing->player)
+                    thing->reactiontime = 18;
+
+                thing->angle = m->angle;
+                thing->momx = thing->momy = thing->momz = 0;
+                return 1;
+            }
+        }
+    }
+    return 0;
+}
+
diff --git a/games/NXDoom/src/strife/p_tick.c b/games/NXDoom/src/strife/p_tick.c
new file mode 100644
index 000000000..3c6caa06c
--- /dev/null
+++ b/games/NXDoom/src/strife/p_tick.c
@@ -0,0 +1,160 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Archiving: SaveGame I/O.
+//	Thinker, Ticker.
+//
+
+
+#include "z_zone.h"
+#include "p_local.h"
+
+#include "doomstat.h"
+
+
+int leveltime;
+
+//
+// THINKERS
+// All thinkers should be allocated by Z_Malloc
+// so they can be operated on uniformly.
+// The actual structures will vary in size,
+// but the first element must be thinker_t.
+//
+
+
+
+// Both the head and tail of the thinker list.
+thinker_t   thinkercap;
+
+
+//
+// P_InitThinkers
+//
+// [STRIFE] Verified unmodified
+//
+void P_InitThinkers (void)
+{
+    thinkercap.prev = thinkercap.next  = &thinkercap;
+}
+
+
+
+
+//
+// P_AddThinker
+// Adds a new thinker at the end of the list.
+//
+// [STRIFE] Verified unmodified
+//
+void P_AddThinker (thinker_t* thinker)
+{
+    thinkercap.prev->next = thinker;
+    thinker->next = &thinkercap;
+    thinker->prev = thinkercap.prev;
+    thinkercap.prev = thinker;
+}
+
+
+
+//
+// P_RemoveThinker
+// Deallocation is lazy -- it will not actually be freed
+// until its thinking turn comes up.
+//
+// [STRIFE] Verified unmodified
+//
+void P_RemoveThinker (thinker_t* thinker)
+{
+  // FIXME: NOP.
+  thinker->function.acv = (actionf_v)(-1);
+}
+
+
+
+//
+// P_AllocateThinker
+// Allocates memory and adds a new thinker at the end of the list.
+//
+void P_AllocateThinker (thinker_t*	thinker)
+{
+}
+
+//
+// P_RunThinkers
+//
+// [STRIFE] Verified unmodified
+//
+void P_RunThinkers (void)
+{
+    thinker_t *currentthinker, *nextthinker;
+
+    currentthinker = thinkercap.next;
+    while (currentthinker != &thinkercap)
+    {
+        if ( currentthinker->function.acv == (actionf_v)(-1) )
+        {
+            // time to remove it
+            nextthinker = currentthinker->next;
+            currentthinker->next->prev = currentthinker->prev;
+            currentthinker->prev->next = currentthinker->next;
+            Z_Free (currentthinker);
+        }
+        else
+        {
+            if (currentthinker->function.acp1)
+                currentthinker->function.acp1 (currentthinker);
+            nextthinker = currentthinker->next;
+        }
+
+        currentthinker = nextthinker;
+    }
+}
+
+//
+// P_Ticker
+//
+// [STRIFE] Menu pause behavior modified
+//
+void P_Ticker (void)
+{
+    int     i;
+    
+    // run the tic
+    if (paused)
+        return;
+
+    // pause if in menu and at least one tic has been run
+    // haleyjd 09/08/10 [STRIFE]: menuactive -> menupause
+    if (!netgame 
+        && menupause 
+        && !demoplayback 
+        && players[consoleplayer].viewz != 1)
+    {
+        return;
+    }
+    
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+        if (playeringame[i])
+            P_PlayerThink (&players[i]);
+
+    P_RunThinkers ();
+    P_UpdateSpecials ();
+    P_RespawnSpecials ();
+
+    // for par times
+    leveltime++;
+}
diff --git a/games/NXDoom/src/strife/p_tick.h b/games/NXDoom/src/strife/p_tick.h
new file mode 100644
index 000000000..ddfcd74fc
--- /dev/null
+++ b/games/NXDoom/src/strife/p_tick.h
@@ -0,0 +1,33 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	?
+//
+
+
+#ifndef __P_TICK__
+#define __P_TICK__
+
+
+
+
+// Called by C_Ticker,
+// can call G_PlayerExited.
+// Carries out all thinking of monsters and players.
+void P_Ticker (void);
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/p_user.c b/games/NXDoom/src/strife/p_user.c
new file mode 100644
index 000000000..567608d11
--- /dev/null
+++ b/games/NXDoom/src/strife/p_user.c
@@ -0,0 +1,920 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Player related stuff.
+//	Bobbing POV/weapon, movement.
+//	Pending weapon.
+//
+
+#include <stdlib.h>
+
+#include "doomdef.h"
+#include "d_event.h"
+#include "p_local.h"
+#include "sounds.h"     // villsa [STRIFE]
+#include "p_dialog.h"   // villsa [STRIFE]
+#include "d_main.h"     // villsa [STRIFE]
+#include "doomstat.h"
+#include "deh_str.h"    // haleyjd [STRIFE]
+#include "z_zone.h"
+#include "w_wad.h"
+#include "p_pspr.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "s_sound.h"
+#include "p_inter.h"
+
+
+
+// Index of the special effects (INVUL inverse) map.
+#define LOOKPITCHAMOUNT         6                       // villsa [STRIFE]
+#define CENTERVIEWAMOUNT        (LOOKPITCHAMOUNT + 2)   // villsa [STRIFE]
+#define LOOKUPMAX               90                      // villsa [STRIFE]
+#define LOOKDOWNMAX             -110                    // villsa [STRIFE]
+
+
+void P_DropInventoryItem(player_t* player, int sprite); // villsa [STRIFE]
+boolean P_ItemBehavior(player_t* player, int item);     // villsa [STRIFE]
+static char useinventorymsg[44];    // villsa [STRIFE]
+
+//
+// Movement.
+//
+
+// 16 pixels of bob
+#define MAXBOB	0x100000	
+
+boolean		onground;
+
+
+//
+// P_Thrust
+// Moves the given origin along a given angle.
+//
+// [STRIFE] Verified unmodified
+//
+void
+P_Thrust
+( player_t*	player,
+  angle_t	angle,
+  fixed_t	move ) 
+{
+    angle >>= ANGLETOFINESHIFT;
+    
+    player->mo->momx += FixedMul(move,finecosine[angle]); 
+    player->mo->momy += FixedMul(move,finesine[angle]);
+}
+
+
+
+
+//
+// P_CalcHeight
+// Calculate the walking / running height adjustment
+//
+// [STRIFE] Some odd adjustments, and terrain view height adjustment
+//
+void P_CalcHeight (player_t* player) 
+{
+    int     angle;
+    fixed_t bob;
+    
+    // Regular movement bobbing
+    // (needs to be calculated for gun swing
+    // even if not on ground)
+    // OPTIMIZE: tablify angle
+    // Note: a LUT allows for effects
+    //  like a ramp with low health.
+    player->bob =
+        FixedMul (player->mo->momx, player->mo->momx)
+        + FixedMul (player->mo->momy,player->mo->momy);
+
+    player->bob >>= 2;
+
+    if (player->bob>MAXBOB)
+        player->bob = MAXBOB;
+
+    // haleyjd 20110205 [STRIFE]: No CF_NOMOMENTUM check, and Rogue also removed
+    // the dead code inside.
+    if (!onground)
+    {
+        /*
+        player->viewz = player->mo->z + VIEWHEIGHT;
+
+        if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
+            player->viewz = player->mo->ceilingz-4*FRACUNIT;
+        */
+
+        player->viewz = player->mo->z + player->viewheight;
+        return;
+    }
+
+    angle = (FINEANGLES/20*leveltime)&FINEMASK;
+    bob = FixedMul ( player->bob/2, finesine[angle]);
+
+    // move viewheight
+    if (player->playerstate == PST_LIVE)
+    {
+        player->viewheight += player->deltaviewheight;
+
+        if (player->viewheight > VIEWHEIGHT)
+        {
+            player->viewheight = VIEWHEIGHT;
+            player->deltaviewheight = 0;
+        }
+
+        if (player->viewheight < VIEWHEIGHT/2)
+        {
+            player->viewheight = VIEWHEIGHT/2;
+            if (player->deltaviewheight <= 0)
+                player->deltaviewheight = 1;
+        }
+
+        if (player->deltaviewheight)
+        {
+            player->deltaviewheight += FRACUNIT/4;
+            if (!player->deltaviewheight)
+                player->deltaviewheight = 1;
+        }
+    }
+    player->viewz = player->mo->z + player->viewheight + bob;
+
+    // villsa [STRIFE] account for terrain lowering the view
+    if(player->mo->flags & MF_FEETCLIPPED)
+        player->viewz -= 13*FRACUNIT;
+
+    if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
+        player->viewz = player->mo->ceilingz-4*FRACUNIT;
+
+    // haleyjd [STRIFE]: added a floorz clip here
+    if (player->viewz < player->mo->floorz)
+        player->viewz = player->mo->floorz;
+}
+
+
+
+//
+// P_MovePlayer
+//
+// [STRIFE] Adjustments to allow air control, jumping, and up/down look.
+//
+void P_MovePlayer (player_t* player)
+{
+    ticcmd_t*      cmd;
+
+    cmd = &player->cmd;
+
+    player->mo->angle += (cmd->angleturn<<16);
+
+    // Do not let the player control movement
+    //  if not onground.
+    onground = (player->mo->z <= player->mo->floorz);
+
+    // villsa [STRIFE] allows player to climb over things by jumping
+    // haleyjd 20110205: air control thrust should be 256, not cmd->forwardmove
+    if(!onground)
+    {
+        if(cmd->forwardmove)
+            P_Thrust (player, player->mo->angle, 256);
+    }
+    else
+    {
+        // villsa [STRIFE] jump button
+        if (cmd->buttons2 & BT2_JUMP)
+        {
+            if(!player->deltaviewheight)
+                player->mo->momz += 8*FRACUNIT;
+        }
+
+        // haleyjd 20110205 [STRIFE] Either Rogue or Watcom removed the
+        // redundant "onground" checks from these if's.
+        if (cmd->forwardmove)
+            P_Thrust (player, player->mo->angle, cmd->forwardmove*2048);
+
+        if (cmd->sidemove)
+            P_Thrust (player, player->mo->angle-ANG90, cmd->sidemove*2048);
+    }
+
+    // villsa [STRIFE] player walking state set
+    if ( (cmd->forwardmove || cmd->sidemove) 
+        && player->mo->state == &states[S_PLAY_00] )
+    {
+        P_SetMobjState (player->mo, S_PLAY_01);
+    }
+
+    // villsa [STRIFE] centerview button
+    if (cmd->buttons2 & BT2_CENTERVIEW)
+        player->centerview = 1;
+
+    // villsa [STRIFE] adjust player's pitch when centerviewing
+    if (player->centerview)
+    {
+        if (player->pitch <= 0)
+        {
+            if (player->pitch < 0)
+                player->pitch = player->pitch + CENTERVIEWAMOUNT;
+        }
+        else
+        {
+            player->pitch = player->pitch - CENTERVIEWAMOUNT;
+        }
+        if (abs(player->pitch) < CENTERVIEWAMOUNT)
+        {
+            player->pitch = 0;
+            player->centerview = 0;
+        }
+    }
+    
+    // villsa [STRIFE] look up action
+    if (cmd->buttons2 & BT2_LOOKUP)
+    {
+        player->pitch += LOOKPITCHAMOUNT;
+        if (player->pitch > LOOKUPMAX ||
+            player->pitch < LOOKDOWNMAX)
+            player->pitch -= LOOKPITCHAMOUNT;
+    }
+    else
+    {
+        // villsa [STRIFE] look down action
+        if (cmd->buttons2 & BT2_LOOKDOWN)
+        {
+            player->pitch -= LOOKPITCHAMOUNT;
+            if (player->pitch > LOOKUPMAX ||
+                player->pitch < LOOKDOWNMAX)
+                player->pitch += LOOKPITCHAMOUNT;
+        }
+    }
+
+}
+
+
+
+//
+// P_DeathThink
+// Fall on your face when dying.
+// Decrease POV height to floor height.
+//
+// [STRIFE] Modifications for up/down look.
+//
+#define ANG5    (ANG90/18)
+
+void P_DeathThink(player_t* player)
+{
+    angle_t angle;
+    angle_t delta;
+
+    P_MovePsprites(player);
+
+    // fall to the ground
+    if (player->viewheight > 6*FRACUNIT)
+        player->viewheight -= FRACUNIT;
+
+    if (player->viewheight < 6*FRACUNIT)
+        player->viewheight = 6*FRACUNIT;
+
+    player->deltaviewheight = 0;
+    onground = (player->mo->z <= player->mo->floorz);
+    P_CalcHeight(player);
+
+    if(player->attacker && player->attacker != player->mo)
+    {
+        angle = R_PointToAngle2 (player->mo->x,
+                                 player->mo->y,
+                                 player->attacker->x,
+                                 player->attacker->y);
+
+        delta = angle - player->mo->angle;
+
+        if (delta < ANG5 || delta > (unsigned)-ANG5)
+        {
+            // Looking at killer,
+            //  so fade damage flash down.
+            player->mo->angle = angle;
+
+            if (player->damagecount)
+                player->damagecount--;
+        }
+        else if (delta < ANG180)
+            player->mo->angle += ANG5;
+        else
+            player->mo->angle -= ANG5;
+    }
+    else if (player->damagecount)
+        player->damagecount--;
+
+    // villsa [STRIFE]
+    if(player->pitch <= 90)
+        player->pitch = player->pitch + 3;
+
+    if(player->cmd.buttons & BT_USE)
+        player->playerstate = PST_REBORN;
+}
+
+
+
+//
+// P_PlayerThink
+//
+// [STRIFE] Massive changes/additions:
+// * NOCLIP hack removed
+// * P_DeathThink moved up
+// * Inventory use/dropping
+// * Strife weapons logic
+// * Dialog
+// * Strife powerups and nukage behavior
+// * Fire Death/Sigil Shock
+//
+void P_PlayerThink (player_t* player)
+{
+    ticcmd_t*       cmd;
+    weapontype_t    newweapon;
+
+    // villsa [STRIFE] unused code (see ST_Responder)
+    /*
+    // fixme: do this in the cheat code
+    if (player->cheats & CF_NOCLIP)
+        player->mo->flags |= MF_NOCLIP;
+    else
+        player->mo->flags &= ~MF_NOCLIP;
+    */
+
+    // haleyjd 20110205 [STRIFE]: P_DeathThink moved up
+    if (player->playerstate == PST_DEAD)
+    {
+        P_DeathThink (player);
+        return;
+    }
+
+    // chain saw run forward
+    cmd = &player->cmd;
+    if (player->mo->flags & MF_JUSTATTACKED)
+    {
+        cmd->angleturn = 0;
+        cmd->forwardmove = 0xc800/512;
+        cmd->sidemove = 0;
+        player->mo->flags &= ~MF_JUSTATTACKED;
+    }
+
+    // Move around.
+    // Reactiontime is used to prevent movement
+    //  for a bit after a teleport.
+    if (player->mo->reactiontime)
+        player->mo->reactiontime--;
+    else
+        P_MovePlayer (player);
+
+    P_CalcHeight (player);
+
+    if (player->mo->subsector->sector->special)
+        P_PlayerInSpecialSector (player);
+
+    // villsa [STRIFE] handle inventory input
+    if(cmd->buttons2 & (BT2_HEALTH|BT2_INVUSE|BT2_INVDROP))
+    {
+        if(!player->inventorydown)
+        {
+            if(cmd->buttons2 & BT2_HEALTH)
+                P_UseInventoryItem(player, SPR_FULL);
+            else if(cmd->buttons2 & BT2_INVUSE)
+                P_UseInventoryItem(player, cmd->inventory);
+            else if(cmd->buttons2 & BT2_INVDROP)
+            {
+                P_DropInventoryItem(player, cmd->inventory);
+
+                // haleyjd 20110205: removed incorrect "else" here
+                // villsa [STRIFE]
+                if(workparm)
+                {
+                    int cheat = player->cheats ^ 1;
+                    player->cheats ^= CF_NOCLIP;
+
+                    if(cheat & CF_NOCLIP)
+                    {
+                        player->message = DEH_String("No Clipping Mode ON");
+                        player->mo->flags |= MF_NOCLIP;
+                    }
+                    else
+                    {
+                        player->mo->flags &= ~MF_NOCLIP;
+                        player->message = DEH_String("No Clipping Mode OFF");
+                    }
+                }
+            }
+        }
+
+        player->inventorydown = true;
+    }
+    else
+        player->inventorydown = false;
+
+    // Check for weapon change.
+
+    // A special event has no other buttons.
+    if(cmd->buttons & BT_SPECIAL)
+        cmd->buttons = 0;
+
+    if(cmd->buttons & BT_CHANGE)
+    {
+        // The actual changing of the weapon is done
+        //  when the weapon psprite can do it
+        //  (read: not in the middle of an attack).
+        newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
+
+        // villsa [STRIFE] select poison bow
+        if(newweapon == wp_elecbow)
+        {
+            if(player->weaponowned[wp_poisonbow] && player->readyweapon == wp_elecbow)
+            {
+                if(player->ammo[weaponinfo[wp_poisonbow].ammo])
+                    newweapon = wp_poisonbow;
+            }
+        }
+
+        // villsa [STRIFE] select wp grenade launcher
+        if(newweapon == wp_hegrenade)
+        {
+            if(player->weaponowned[wp_wpgrenade] && player->readyweapon == wp_hegrenade)
+            {
+                if(player->ammo[weaponinfo[wp_wpgrenade].ammo])
+                    newweapon = wp_wpgrenade;
+            }
+        }
+
+        // villsa [STRIFE] select torpedo
+        if(newweapon == wp_mauler)
+        {
+            if(player->weaponowned[wp_torpedo] && player->readyweapon == wp_mauler)
+            {
+                // haleyjd 20140924: bug fix - using wrong enum value am_cell
+                // caused this to check the missile launcher for rocket ammo
+                if(player->ammo[weaponinfo[wp_torpedo].ammo] >= 30)
+                    newweapon = wp_torpedo;
+            }
+        }
+
+        if(player->weaponowned[newweapon] && newweapon != player->readyweapon)
+        {
+            // villsa [STRIFE] check weapon if in demo mode or not
+            if(weaponinfo[newweapon].availabledemo || !isdemoversion)
+            {
+                if(player->ammo[weaponinfo[newweapon].ammo])
+                    player->pendingweapon = newweapon;
+                else
+                {
+                    // decide between electric bow or poison arrow
+                    if(newweapon == wp_elecbow &&
+                        player->ammo[am_poisonbolts] &&
+                        player->readyweapon != wp_poisonbow)
+                    {
+                        player->pendingweapon = wp_poisonbow;
+                    }
+                    // decide between hp grenade launcher or wp grenade launcher
+                    else if(newweapon == wp_hegrenade &&
+                        player->ammo[am_wpgrenades] &&
+                        player->readyweapon != wp_wpgrenade)
+                    {
+                        player->pendingweapon = wp_wpgrenade;
+                    }
+
+                    // villsa [STRIFE] - no check for mauler/torpedo??
+                }
+            }
+        }
+    }
+
+    // check for use
+    if(cmd->buttons & BT_USE)
+    {
+        if(!player->usedown)
+        {
+            P_DialogStart(player);  // villsa [STRIFE]
+            P_UseLines (player);
+            player->usedown = true;
+        }
+    }
+    else
+        player->usedown = false;
+
+    // cycle psprites
+    P_MovePsprites (player);
+
+    // Counters, time dependend power ups.
+
+    // Strength counts up to diminish fade.
+    if (player->powers[pw_strength])
+        player->powers[pw_strength]++;
+
+    // villsa [STRIFE] targeter powerup
+    if(player->powers[pw_targeter])
+    {
+        player->powers[pw_targeter]--;
+        if(player->powers[pw_targeter] == 1)
+        {
+            P_SetPsprite(player, ps_targcenter, S_NULL);
+            P_SetPsprite(player, ps_targleft,   S_NULL);
+            P_SetPsprite(player, ps_targright,  S_NULL);
+        }
+        else if(player->powers[pw_targeter] - 1 < 5*TICRATE)
+        {
+            if(player->powers[pw_targeter] & 32)
+            {
+                P_SetPsprite(player, ps_targright, S_NULL);
+                P_SetPsprite(player, ps_targleft,  S_TRGT_01);   // 11
+            }
+            else if(player->powers[pw_targeter] & 16) // haleyjd 20110205: missing else
+            {
+                P_SetPsprite(player, ps_targright, S_TRGT_02);  // 12
+                P_SetPsprite(player, ps_targleft,  S_NULL);
+            }
+        }
+    }
+
+    if(player->powers[pw_invisibility])
+    {
+        // villsa [STRIFE] remove mvis flag as well
+        if(!--player->powers[pw_invisibility])
+            player->mo->flags &= ~(MF_SHADOW|MF_MVIS);
+    }
+
+    if(player->powers[pw_ironfeet])
+    {
+        player->powers[pw_ironfeet]--;
+
+        // villsa [STRIFE] gasmask sound
+        if(!(leveltime & 0x3f))
+            S_StartSound(player->mo, sfx_mask);
+    }
+
+    if(player->powers[pw_allmap] > 1)
+        player->powers[pw_allmap]--;
+
+    // haleyjd 08/30/10: [STRIFE]
+    // Nukage count keeps track of exposure to hazardous conditions over time.
+    // After accumulating 16 total seconds or more of exposure, you will take
+    // 5 damage roughly once per second until the count drops back under 560
+    // tics.
+    if(player->nukagecount)
+    {
+        player->nukagecount--;
+        if(!(leveltime & 0x1f) && player->nukagecount > 16*TICRATE)
+            P_DamageMobj(player->mo, NULL, NULL, 5);
+    }
+
+    if(player->damagecount)
+        player->damagecount--;
+
+    if(player->bonuscount)
+        player->bonuscount--;
+
+    // villsa [STRIFE] checks for extralight
+    if(player->extralight >= 0)
+    {
+        if(player->cheats & CF_ONFIRE)
+            player->fixedcolormap = 1;
+        else
+            player->fixedcolormap = 0;
+    }
+    else // Sigil shock:
+        player->fixedcolormap = INVERSECOLORMAP;
+}
+
+
+//
+// P_RemoveInventoryItem
+// villsa [STRIFE] new function
+//
+const char* P_RemoveInventoryItem(player_t *player, int slot, int amount)
+{
+    mobjtype_t type;
+
+    player->inventory[slot].amount -= amount;
+    player->st_update = true;
+
+    type = player->inventory[slot].type;
+
+    if(!player->inventory[slot].amount)
+    {
+        // shift everything above it down
+        // see P_TakeDialogItem for notes on possible bugs
+        int j;
+
+        for(j = slot + 1; j <= player->numinventory; j++)
+        {
+            inventory_t *item1 = &(player->inventory[j - 1]);
+            inventory_t *item2 = &(player->inventory[j]);
+
+            *item1 = *item2;
+        }
+
+        player->inventory[player->numinventory].type = NUMMOBJTYPES;
+        player->inventory[player->numinventory].sprite = -1;
+        player->numinventory--;
+
+        // update cursor position
+        if(player->inventorycursor >= player->numinventory)
+        {
+            if(player->inventorycursor)
+                player->inventorycursor--;
+        }
+    }
+
+    return mobjinfo[type].name;
+}
+
+//
+// P_DropInventoryItem
+// villsa [STRIFE] new function
+//
+void P_DropInventoryItem(player_t* player, int sprite)
+{
+    int invslot;
+    inventory_t *item;
+    mobjtype_t type;
+    int amount;
+
+    invslot = 0;
+    amount = 1;
+
+    while(invslot < player->numinventory && sprite != player->inventory[invslot].sprite)
+        invslot++;
+
+    item = &(player->inventory[invslot]);
+    type = item->type;
+
+    if(item->amount)
+    {
+        angle_t angle;
+        fixed_t dist;
+        mobj_t* mo;
+        mobj_t* mobjitem;
+        fixed_t x;
+        fixed_t y;
+        fixed_t z;
+        int r;
+
+        if(item->type == MT_MONY_1)
+        {
+            if(item->amount >= 50)
+            {
+                type = MT_MONY_50;
+                amount = 50;
+            }
+            else if(item->amount >= 25)
+            {
+                type = MT_MONY_25;
+                amount = 25;
+            }
+            else if(item->amount >= 10)
+            {
+                type = MT_MONY_10;
+                amount = 10;
+            }
+        }
+
+        if(type >= NUMMOBJTYPES)
+            return;
+
+        angle = player->mo->angle;
+        r = P_Random();
+        angle = (angle + ((r - P_Random()) << 18)) >> ANGLETOFINESHIFT;
+
+        if(angle < 7618 && angle >= 6718)
+            angle = 7618;
+
+        else if(angle < 5570 && angle >= 4670)
+            angle = 5570;
+
+        else if(angle < 3522 && angle >= 2622)
+            angle = 3522;
+
+        else if(angle < 1474 && angle >= 574)
+            angle = 1474;
+
+        mo = player->mo;
+        dist = mobjinfo[type].radius + mo->info->radius + (4*FRACUNIT);
+
+        x = mo->x + FixedMul(finecosine[angle], dist);
+        y = mo->y + FixedMul(finesine[angle], dist);
+        z = mo->z + (10*FRACUNIT);
+        mobjitem = P_SpawnMobj(x, y, z, type);
+        mobjitem->flags |= (MF_SPECIAL|MF_DROPPED);
+
+        if(P_CheckPosition(mobjitem, x, y))
+        {
+            mobjitem->angle = (angle << ANGLETOFINESHIFT);
+            mobjitem->momx = FixedMul(finecosine[angle], (5*FRACUNIT)) + mo->momx;
+            mobjitem->momy = FixedMul(finesine[angle], (5*FRACUNIT)) + mo->momy;
+            mobjitem->momz = FRACUNIT;
+
+            P_RemoveInventoryItem(player, invslot, amount);
+        }
+        else
+            P_RemoveMobj(mobjitem);
+    }
+}
+
+//
+// P_TossDegninOre
+// villsa [STRIFE] new function
+//
+boolean P_TossDegninOre(player_t* player)
+{
+    angle_t angle;
+    mobj_t* mo;
+    mobj_t* ore;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    fixed_t dist;
+
+    angle = player->mo->angle >> ANGLETOFINESHIFT;
+
+    if(angle < 7618 && angle >= 6718)
+        angle = 7618;
+
+    else if(angle < 5570 && angle >= 4670)
+        angle = 5570;
+
+    else if(angle < 3522 && angle >= 2622)
+        angle = 3522;
+
+    else if(angle < 1474 && angle >= 574)
+        angle = 1474;
+
+    mo = player->mo;
+    dist = mobjinfo[MT_DEGNINORE].radius + mo->info->radius + (4*FRACUNIT);
+
+    x = mo->x + FixedMul(finecosine[angle], dist);
+    y = mo->y + FixedMul(finesine[angle], dist);
+    z = mo->z + (10*FRACUNIT);
+    ore = P_SpawnMobj(x, y, z, MT_DEGNINORE);
+
+    if(P_CheckPosition(ore, x, y))
+    {
+        ore->target = mo;
+        ore->angle = (angle << ANGLETOFINESHIFT);
+        ore->momx = FixedMul(finecosine[angle], (5*FRACUNIT));
+        ore->momy = FixedMul(finesine[angle], (5*FRACUNIT));
+        ore->momz = FRACUNIT;
+        return true;
+    }
+    else
+        P_RemoveMobj(ore);
+
+    return false;
+}
+
+//
+// P_SpawnTeleportBeacon
+//
+// villsa [STRIFE] new function
+// haleyjd 20140918: bug fixed to propagate allegiance properly.
+//
+boolean P_SpawnTeleportBeacon(player_t* player)
+{
+    angle_t angle;
+    int r;
+    mobj_t* mo;
+    mobj_t* beacon;
+    fixed_t x;
+    fixed_t y;
+    fixed_t z;
+    fixed_t dist;
+
+    angle = player->mo->angle;
+    r = P_Random();
+    angle = (angle + ((r - P_Random()) << 18)) >> ANGLETOFINESHIFT;
+
+    if(angle < 7618 && angle >= 6718)
+        angle = 7618;
+
+    else if(angle < 5570 && angle >= 4670)
+        angle = 5570;
+
+    else if(angle < 3522 && angle >= 2622)
+        angle = 3522;
+
+    else if(angle < 1474 && angle >= 574)
+        angle = 1474;
+
+    mo = player->mo;
+    dist = mobjinfo[MT_BEACON].radius + mo->info->radius + (4*FRACUNIT);
+
+    x = mo->x + FixedMul(finecosine[angle], dist);
+    y = mo->y + FixedMul(finesine[angle], dist);
+    z = mo->z + (10*FRACUNIT);
+    beacon = P_SpawnMobj(x, y, z, MT_BEACON);
+
+    if(P_CheckPosition(beacon, x, y))
+    {
+        beacon->target = mo;
+        beacon->miscdata = (byte)(player->allegiance);
+        beacon->angle = (angle << ANGLETOFINESHIFT);
+        beacon->momx = FixedMul(finecosine[angle], (5*FRACUNIT));
+        beacon->momy = FixedMul(finesine[angle], (5*FRACUNIT));
+        beacon->momz = FRACUNIT;
+        P_SetMobjState(beacon, beacon->info->seestate);
+        return true;
+    }
+    else
+        P_RemoveMobj(beacon);
+
+    return false;
+}
+
+//
+// P_UseInventoryItem
+// villsa [STRIFE] new function
+//
+boolean P_UseInventoryItem(player_t* player, int item)
+{
+    int i;
+    const char *name;
+
+    if(player->cheats & CF_ONFIRE)
+        return false;
+
+    for(i = 0; i < player->numinventory; i++)
+    {
+        if(item != player->inventory[i].sprite)
+            continue;
+
+        if(!P_ItemBehavior(player, item))
+            return false;
+
+        name = P_RemoveInventoryItem(player, i, 1);
+        if(name == NULL)
+            name = "Item";
+
+        M_snprintf(useinventorymsg, sizeof(useinventorymsg),
+                   "You used the %s.", name);
+        player->message = useinventorymsg;
+
+        if(player == &players[consoleplayer])
+            S_StartSound(NULL, sfx_itemup);
+
+        return true;
+    }
+    
+    return false;
+}
+
+//
+// P_ItemBehavior
+// villsa [STRIFE] new function
+//
+boolean P_ItemBehavior(player_t* player, int item)
+{
+    switch(item)
+    {
+    case SPR_ARM1:  // 136
+        return P_GiveArmor(player, 2);
+
+    case SPR_ARM2:  // 137
+        return P_GiveArmor(player, 1);
+
+    case SPR_SHD1:  // 186
+        return P_GivePower(player, pw_invisibility);
+
+    case SPR_MASK:  // 187
+        return P_GivePower(player, pw_ironfeet);
+
+    case SPR_PMUP:  // 191
+        if(!player->powers[pw_allmap])
+        {
+            player->message = "The scanner won't work without a map!";
+            return false;
+        }
+        player->powers[pw_allmap] = PMUPTICS;
+        return true; // haleyjd 20110228: repaired
+
+    case SPR_STMP:  // 180
+        return P_GiveBody(player, 10);
+
+    case SPR_MDKT:  // 181
+        return P_GiveBody(player, 25);
+
+    case SPR_FULL:  // 130
+        return P_GiveBody(player, 200);
+
+    case SPR_BEAC:  // 135
+        return P_SpawnTeleportBeacon(player);
+
+    case SPR_TARG:  // 108
+        return P_GivePower(player, pw_targeter);
+    }
+
+    return false;
+}
diff --git a/games/NXDoom/src/strife/r_bsp.c b/games/NXDoom/src/strife/r_bsp.c
new file mode 100644
index 000000000..64b9d5dfe
--- /dev/null
+++ b/games/NXDoom/src/strife/r_bsp.c
@@ -0,0 +1,583 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	BSP traversal, handling of LineSegs for rendering.
+//
+
+
+
+
+#include "doomdef.h"
+
+#include "m_bbox.h"
+
+#include "i_system.h"
+
+#include "r_main.h"
+#include "r_plane.h"
+#include "r_things.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+//#include "r_local.h"
+
+
+
+seg_t*		curline;
+side_t*		sidedef;
+line_t*		linedef;
+sector_t*	frontsector;
+sector_t*	backsector;
+
+drawseg_t	drawsegs[MAXDRAWSEGS];
+drawseg_t*	ds_p;
+
+
+void
+R_StoreWallRange
+( int	start,
+  int	stop );
+
+
+
+
+//
+// R_ClearDrawSegs
+//
+void R_ClearDrawSegs (void)
+{
+    ds_p = drawsegs;
+}
+
+
+
+//
+// ClipWallSegment
+// Clips the given range of columns
+// and includes it in the new clip list.
+//
+typedef	struct
+{
+    int	first;
+    int last;
+    
+} cliprange_t;
+
+// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
+// that can be generated in a scene by the DOOM engine. This was determined by
+// Lee Killough during BOOM development to be a function of the screensize.
+// The simplest thing we can do, other than fix this bug, is to let the game
+// render overage and then bomb out by detecting the overflow after the 
+// fact. -haleyjd
+//#define MAXSEGS		32
+#define MAXSEGS (SCREENWIDTH / 2 + 1)
+
+// newend is one past the last valid seg
+cliprange_t*	newend;
+cliprange_t	solidsegs[MAXSEGS];
+
+
+
+
+//
+// R_ClipSolidWallSegment
+// Does handle solid walls,
+//  e.g. single sided LineDefs (middle texture)
+//  that entirely block the view.
+// 
+void
+R_ClipSolidWallSegment
+( int			first,
+  int			last )
+{
+    cliprange_t*	next;
+    cliprange_t*	start;
+
+    // Find the first range that touches the range
+    //  (adjacent pixels are touching).
+    start = solidsegs;
+    while (start->last < first-1)
+	start++;
+
+    if (first < start->first)
+    {
+	if (last < start->first-1)
+	{
+	    // Post is entirely visible (above start),
+	    //  so insert a new clippost.
+	    R_StoreWallRange (first, last);
+	    next = newend;
+	    newend++;
+	    
+	    while (next != start)
+	    {
+		*next = *(next-1);
+		next--;
+	    }
+	    next->first = first;
+	    next->last = last;
+	    return;
+	}
+		
+	// There is a fragment above *start.
+	R_StoreWallRange (first, start->first - 1);
+	// Now adjust the clip size.
+	start->first = first;	
+    }
+
+    // Bottom contained in start?
+    if (last <= start->last)
+	return;			
+		
+    next = start;
+    while (last >= (next+1)->first-1)
+    {
+	// There is a fragment between two posts.
+	R_StoreWallRange (next->last + 1, (next+1)->first - 1);
+	next++;
+	
+	if (last <= next->last)
+	{
+	    // Bottom is contained in next.
+	    // Adjust the clip size.
+	    start->last = next->last;	
+	    goto crunch;
+	}
+    }
+	
+    // There is a fragment after *next.
+    R_StoreWallRange (next->last + 1, last);
+    // Adjust the clip size.
+    start->last = last;
+	
+    // Remove start+1 to next from the clip list,
+    // because start now covers their area.
+  crunch:
+    if (next == start)
+    {
+	// Post just extended past the bottom of one post.
+	return;
+    }
+    
+
+    while (next++ != newend)
+    {
+	// Remove a post.
+	*++start = *next;
+    }
+
+    newend = start+1;
+}
+
+
+
+//
+// R_ClipPassWallSegment
+// Clips the given range of columns,
+//  but does not includes it in the clip list.
+// Does handle windows,
+//  e.g. LineDefs with upper and lower texture.
+//
+void
+R_ClipPassWallSegment
+( int	first,
+  int	last )
+{
+    cliprange_t*	start;
+
+    // Find the first range that touches the range
+    //  (adjacent pixels are touching).
+    start = solidsegs;
+    while (start->last < first-1)
+	start++;
+
+    if (first < start->first)
+    {
+	if (last < start->first-1)
+	{
+	    // Post is entirely visible (above start).
+	    R_StoreWallRange (first, last);
+	    return;
+	}
+		
+	// There is a fragment above *start.
+	R_StoreWallRange (first, start->first - 1);
+    }
+
+    // Bottom contained in start?
+    if (last <= start->last)
+	return;			
+		
+    while (last >= (start+1)->first-1)
+    {
+	// There is a fragment between two posts.
+	R_StoreWallRange (start->last + 1, (start+1)->first - 1);
+	start++;
+	
+	if (last <= start->last)
+	    return;
+    }
+	
+    // There is a fragment after *next.
+    R_StoreWallRange (start->last + 1, last);
+}
+
+
+
+//
+// R_ClearClipSegs
+//
+void R_ClearClipSegs (void)
+{
+    solidsegs[0].first = -0x7fffffff;
+    solidsegs[0].last = -1;
+    solidsegs[1].first = viewwidth;
+    solidsegs[1].last = 0x7fffffff;
+    newend = solidsegs+2;
+}
+
+//
+// R_AddLine
+// Clips the given segment
+// and adds any visible pieces to the line list.
+//
+void R_AddLine (seg_t*	line)
+{
+    int			x1;
+    int			x2;
+    angle_t		angle1;
+    angle_t		angle2;
+    angle_t		span;
+    angle_t		tspan;
+    
+    curline = line;
+
+    // OPTIMIZE: quickly reject orthogonal back sides.
+    angle1 = R_PointToAngle (line->v1->x, line->v1->y);
+    angle2 = R_PointToAngle (line->v2->x, line->v2->y);
+    
+    // Clip to view edges.
+    // OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW).
+    span = angle1 - angle2;
+    
+    // Back side? I.e. backface culling?
+    if (span >= ANG180)
+	return;		
+
+    // Global angle needed by segcalc.
+    rw_angle1 = angle1;
+    angle1 -= viewangle;
+    angle2 -= viewangle;
+	
+    tspan = angle1 + clipangle;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return;
+	
+	angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return;	
+	angle2 = 0 - clipangle;
+    }
+    
+    // The seg is in the view range,
+    // but not necessarily visible.
+    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
+    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
+    x1 = viewangletox[angle1];
+    x2 = viewangletox[angle2];
+
+    // Does not cross a pixel?
+    if (x1 == x2)
+	return;				
+	
+    backsector = line->backsector;
+
+    // Single sided line?
+    if (!backsector)
+	goto clipsolid;		
+
+    // Closed door.
+    if (backsector->ceilingheight <= frontsector->floorheight
+	|| backsector->floorheight >= frontsector->ceilingheight)
+	goto clipsolid;		
+
+    // Window.
+    if (backsector->ceilingheight != frontsector->ceilingheight
+	|| backsector->floorheight != frontsector->floorheight)
+	goto clippass;	
+		
+    // Reject empty lines used for triggers
+    //  and special events.
+    // Identical floor and ceiling on both sides,
+    // identical light levels on both sides,
+    // and no middle texture.
+    if (backsector->ceilingpic == frontsector->ceilingpic
+	&& backsector->floorpic == frontsector->floorpic
+	&& backsector->lightlevel == frontsector->lightlevel
+	&& curline->sidedef->midtexture == 0)
+    {
+	return;
+    }
+    
+				
+  clippass:
+    R_ClipPassWallSegment (x1, x2-1);	
+    return;
+		
+  clipsolid:
+    R_ClipSolidWallSegment (x1, x2-1);
+}
+
+
+//
+// R_CheckBBox
+// Checks BSP node/subtree bounding box.
+// Returns true
+//  if some part of the bbox might be visible.
+//
+int	checkcoord[12][4] =
+{
+    {3,0,2,1},
+    {3,0,2,0},
+    {3,1,2,0},
+    {0},
+    {2,0,2,1},
+    {0,0,0,0},
+    {3,1,3,0},
+    {0},
+    {2,0,3,1},
+    {2,1,3,1},
+    {2,1,3,0}
+};
+
+
+boolean R_CheckBBox (fixed_t*	bspcoord)
+{
+    int			boxx;
+    int			boxy;
+    int			boxpos;
+
+    fixed_t		x1;
+    fixed_t		y1;
+    fixed_t		x2;
+    fixed_t		y2;
+    
+    angle_t		angle1;
+    angle_t		angle2;
+    angle_t		span;
+    angle_t		tspan;
+    
+    cliprange_t*	start;
+
+    int			sx1;
+    int			sx2;
+    
+    // Find the corners of the box
+    // that define the edges from current viewpoint.
+    if (viewx <= bspcoord[BOXLEFT])
+	boxx = 0;
+    else if (viewx < bspcoord[BOXRIGHT])
+	boxx = 1;
+    else
+	boxx = 2;
+		
+    if (viewy >= bspcoord[BOXTOP])
+	boxy = 0;
+    else if (viewy > bspcoord[BOXBOTTOM])
+	boxy = 1;
+    else
+	boxy = 2;
+		
+    boxpos = (boxy<<2)+boxx;
+    if (boxpos == 5)
+	return true;
+	
+    x1 = bspcoord[checkcoord[boxpos][0]];
+    y1 = bspcoord[checkcoord[boxpos][1]];
+    x2 = bspcoord[checkcoord[boxpos][2]];
+    y2 = bspcoord[checkcoord[boxpos][3]];
+    
+    // check clip list for an open space
+    angle1 = R_PointToAngle (x1, y1) - viewangle;
+    angle2 = R_PointToAngle (x2, y2) - viewangle;
+	
+    span = angle1 - angle2;
+
+    // Sitting on a line?
+    if (span >= ANG180)
+	return true;
+    
+    tspan = angle1 + clipangle;
+
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return false;	
+
+	angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return false;
+	
+	angle2 = 0 - clipangle;
+    }
+
+
+    // Find the first clippost
+    //  that touches the source post
+    //  (adjacent pixels are touching).
+    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
+    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
+    sx1 = viewangletox[angle1];
+    sx2 = viewangletox[angle2];
+
+    // Does not cross a pixel.
+    if (sx1 == sx2)
+	return false;			
+    sx2--;
+	
+    start = solidsegs;
+    while (start->last < sx2)
+	start++;
+    
+    if (sx1 >= start->first
+	&& sx2 <= start->last)
+    {
+	// The clippost contains the new span.
+	return false;
+    }
+
+    return true;
+}
+
+
+
+//
+// R_Subsector
+// Determine floor/ceiling planes.
+// Add sprites of things in sector.
+// Draw one or more line segments.
+//
+void R_Subsector (int num)
+{
+    int			count;
+    seg_t*		line;
+    subsector_t*	sub;
+	
+#ifdef RANGECHECK
+    if (num>=numsubsectors)
+	I_Error ("R_Subsector: ss %i with numss = %i",
+		 num,
+		 numsubsectors);
+#endif
+
+    sscount++;
+    sub = &subsectors[num];
+    frontsector = sub->sector;
+    count = sub->numlines;
+    line = &segs[sub->firstline];
+
+    if (frontsector->floorheight < viewz)
+    {
+	floorplane = R_FindPlane (frontsector->floorheight,
+				  frontsector->floorpic,
+				  frontsector->lightlevel);
+    }
+    else
+	floorplane = NULL;
+    
+    if (frontsector->ceilingheight > viewz 
+	|| frontsector->ceilingpic == skyflatnum)
+    {
+	ceilingplane = R_FindPlane (frontsector->ceilingheight,
+				    frontsector->ceilingpic,
+				    frontsector->lightlevel);
+    }
+    else
+	ceilingplane = NULL;
+		
+    R_AddSprites (frontsector);	
+
+    while (count--)
+    {
+	R_AddLine (line);
+	line++;
+    }
+
+    // check for solidsegs overflow - extremely unsatisfactory!
+    if(newend > &solidsegs[32])
+        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
+}
+
+
+
+
+//
+// RenderBSPNode
+// Renders all subsectors below a given node,
+//  traversing subtree recursively.
+// Just call with BSP root.
+void R_RenderBSPNode (int bspnum)
+{
+    node_t*	bsp;
+    int		side;
+
+    // Found a subsector?
+    if (bspnum & NF_SUBSECTOR)
+    {
+	if (bspnum == -1)			
+	    R_Subsector (0);
+	else
+	    R_Subsector (bspnum&(~NF_SUBSECTOR));
+	return;
+    }
+		
+    bsp = &nodes[bspnum];
+    
+    // Decide which side the view point is on.
+    side = R_PointOnSide (viewx, viewy, bsp);
+
+    // Recursively divide front space.
+    R_RenderBSPNode (bsp->children[side]); 
+
+    // Possibly divide back space.
+    if (R_CheckBBox (bsp->bbox[side^1]))	
+	R_RenderBSPNode (bsp->children[side^1]);
+}
+
+
diff --git a/games/NXDoom/src/strife/r_bsp.h b/games/NXDoom/src/strife/r_bsp.h
new file mode 100644
index 000000000..1723e6861
--- /dev/null
+++ b/games/NXDoom/src/strife/r_bsp.h
@@ -0,0 +1,61 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh module, BSP traversal and handling.
+//
+
+
+#ifndef __R_BSP__
+#define __R_BSP__
+
+
+
+extern seg_t*		curline;
+extern side_t*		sidedef;
+extern line_t*		linedef;
+extern sector_t*	frontsector;
+extern sector_t*	backsector;
+
+extern int		rw_x;
+extern int		rw_stopx;
+
+extern boolean		segtextured;
+
+// false if the back side is the same plane
+extern boolean		markfloor;		
+extern boolean		markceiling;
+
+extern boolean		skymap;
+
+extern drawseg_t	drawsegs[MAXDRAWSEGS];
+extern drawseg_t*	ds_p;
+
+extern lighttable_t**	hscalelight;
+extern lighttable_t**	vscalelight;
+extern lighttable_t**	dscalelight;
+
+
+typedef void (*drawfunc_t) (int start, int stop);
+
+
+// BSP?
+void R_ClearClipSegs (void);
+void R_ClearDrawSegs (void);
+
+
+void R_RenderBSPNode (int bspnum);
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_data.c b/games/NXDoom/src/strife/r_data.c
new file mode 100644
index 000000000..e7d70e073
--- /dev/null
+++ b/games/NXDoom/src/strife/r_data.c
@@ -0,0 +1,1010 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Preparation of data for rendering,
+//	generation of lookups, caching, retrieval by name.
+//
+
+#include <stdio.h>
+
+#include "d_main.h"
+#include "deh_main.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+#include "doomdef.h"
+#include "r_local.h"
+#include "p_local.h"
+#include "doomstat.h"
+#include "m_misc.h"
+#include "r_sky.h"
+#include "r_data.h"
+#include "sounds.h" // villsa [STRIFE]
+
+//
+// Graphics.
+// DOOM graphics for walls and sprites
+// is stored in vertical runs of opaque pixels (posts).
+// A column is composed of zero or more posts,
+// a patch or sprite is composed of zero or more columns.
+// 
+
+
+
+//
+// Texture definition.
+// Each texture is composed of one or more patches,
+// with patches being lumps stored in the WAD.
+// The lumps are referenced by number, and patched
+// into the rectangular texture space using origin
+// and possibly other attributes.
+//
+typedef PACKED_STRUCT (
+{
+    short	originx;
+    short	originy;
+    short	patch;
+    //short	stepdir;    // villsa [STRIFE] removed
+    //short	colormap;   // villsa [STRIFE] removed
+}) mappatch_t;
+
+
+//
+// Texture definition.
+// A DOOM wall texture is a list of patches
+// which are to be combined in a predefined order.
+//
+typedef PACKED_STRUCT (
+{
+    char		name[8];
+    int			masked;	
+    short		width;
+    short		height;
+    //int               obsolete;   // villsa [STRIFE] removed
+    short		patchcount;
+    mappatch_t	patches[1];
+}) maptexture_t;
+
+
+// A single patch from a texture definition,
+//  basically a rectangular area within
+//  the texture rectangle.
+typedef struct
+{
+    // Block origin (allways UL),
+    // which has allready accounted
+    // for the internal origin of the patch.
+    short	originx;	
+    short	originy;
+    int		patch;
+} texpatch_t;
+
+
+// A maptexturedef_t describes a rectangular texture,
+//  which is composed of one or more mappatch_t structures
+//  that arrange graphic patches.
+
+typedef struct texture_s texture_t;
+
+struct texture_s
+{
+    // Keep name for switch changing, etc.
+    char	name[8];		
+    short	width;
+    short	height;
+
+    // Index in textures list
+
+    int         index;
+
+    // Next in hash table chain
+
+    texture_t  *next;
+    
+    // All the patches[patchcount]
+    //  are drawn back to front into the cached texture.
+    short	patchcount;
+    texpatch_t	patches[1];		
+};
+
+
+
+int		firstflat;
+int		lastflat;
+int		numflats;
+
+int		firstpatch;
+int		lastpatch;
+int		numpatches;
+
+int		firstspritelump;
+int		lastspritelump;
+int		numspritelumps;
+
+int		numtextures;
+texture_t**	textures;
+texture_t**     textures_hashtable;
+
+
+int*			texturewidthmask;
+// needed for texture pegging
+fixed_t*		textureheight;		
+int*			texturecompositesize;
+short**			texturecolumnlump;
+unsigned short**	texturecolumnofs;
+byte**			texturecomposite;
+
+// for global animation
+int*		flattranslation;
+int*		texturetranslation;
+
+// needed for pre rendering
+fixed_t*	spritewidth;	
+fixed_t*	spriteoffset;
+fixed_t*	spritetopoffset;
+
+lighttable_t	*colormaps;
+
+
+//
+// MAPTEXTURE_T CACHING
+// When a texture is first needed,
+//  it counts the number of composite columns
+//  required in the texture and allocates space
+//  for a column directory and any new columns.
+// The directory will simply point inside other patches
+//  if there is only one patch in a given column,
+//  but any columns with multiple patches
+//  will have new column_ts generated.
+//
+
+
+
+//
+// R_DrawColumnInCache
+// Clip and draw a column
+//  from a patch into a cached post.
+//
+void
+R_DrawColumnInCache
+( column_t*	patch,
+  byte*		cache,
+  int		originy,
+  int		cacheheight )
+{
+    int		count;
+    int		position;
+    byte*	source;
+
+    while (patch->topdelta != 0xff)
+    {
+	source = (byte *)patch + 3;
+	count = patch->length;
+	position = originy + patch->topdelta;
+
+	if (position < 0)
+	{
+	    count += position;
+	    position = 0;
+	}
+
+	if (position + count > cacheheight)
+	    count = cacheheight - position;
+
+	if (count > 0)
+	    memcpy (cache + position, source, count);
+		
+	patch = (column_t *)(  (byte *)patch + patch->length + 4); 
+    }
+}
+
+
+
+//
+// R_GenerateComposite
+// Using the texture definition,
+//  the composite texture is created from the patches,
+//  and each column is cached.
+//
+void R_GenerateComposite (int texnum)
+{
+    byte*		block;
+    texture_t*		texture;
+    texpatch_t*		patch;	
+    patch_t*		realpatch;
+    int			x;
+    int			x1;
+    int			x2;
+    int			i;
+    column_t*		patchcol;
+    short*		collump;
+    unsigned short*	colofs;
+	
+    texture = textures[texnum];
+
+    block = Z_Malloc (texturecompositesize[texnum],
+		      PU_STATIC, 
+		      &texturecomposite[texnum]);	
+
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+    
+    // Composite the columns together.
+    for (i=0 , patch = texture->patches;
+	 i<texture->patchcount;
+	 i++, patch++)
+    {
+	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
+	x1 = patch->originx;
+	x2 = x1 + SHORT(realpatch->width);
+
+	if (x1<0)
+	    x = 0;
+	else
+	    x = x1;
+	
+	if (x2 > texture->width)
+	    x2 = texture->width;
+
+	for ( ; x<x2 ; x++)
+	{
+	    // Column does not have multiple patches?
+	    if (collump[x] >= 0)
+		continue;
+	    
+	    patchcol = (column_t *)((byte *)realpatch
+				    + LONG(realpatch->columnofs[x-x1]));
+	    R_DrawColumnInCache (patchcol,
+				 block + colofs[x],
+				 patch->originy,
+				 texture->height);
+	}
+						
+    }
+
+    // Now that the texture has been built in column cache,
+    //  it is purgable from zone memory.
+    Z_ChangeTag (block, PU_CACHE);
+}
+
+
+
+//
+// R_GenerateLookup
+//
+void R_GenerateLookup (int texnum)
+{
+    texture_t*		texture;
+    byte*		patchcount;	// patchcount[texture->width]
+    texpatch_t*		patch;	
+    patch_t*		realpatch;
+    int			x;
+    int			x1;
+    int			x2;
+    int			i;
+    short*		collump;
+    unsigned short*	colofs;
+	
+    texture = textures[texnum];
+
+    // Composited texture not created yet.
+    texturecomposite[texnum] = 0;
+    
+    texturecompositesize[texnum] = 0;
+    collump = texturecolumnlump[texnum];
+    colofs = texturecolumnofs[texnum];
+    
+    // Now count the number of columns
+    //  that are covered by more than one patch.
+    // Fill in the lump / offset, so columns
+    //  with only a single patch are all done.
+    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
+    memset (patchcount, 0, texture->width);
+
+    for (i=0 , patch = texture->patches;
+	 i<texture->patchcount;
+	 i++, patch++)
+    {
+	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
+	x1 = patch->originx;
+	x2 = x1 + SHORT(realpatch->width);
+	
+	if (x1 < 0)
+	    x = 0;
+	else
+	    x = x1;
+
+	if (x2 > texture->width)
+	    x2 = texture->width;
+	for ( ; x<x2 ; x++)
+	{
+	    patchcount[x]++;
+	    collump[x] = patch->patch;
+	    colofs[x] = LONG(realpatch->columnofs[x-x1])+3;
+	}
+    }
+	
+    for (x=0 ; x<texture->width ; x++)
+    {
+	if (!patchcount[x])
+	{
+	    printf ("R_GenerateLookup: column without a patch (%s)\n",
+		    texture->name);
+	    return;
+	}
+	// I_Error ("R_GenerateLookup: column without a patch");
+	
+	if (patchcount[x] > 1)
+	{
+	    // Use the cached block.
+	    collump[x] = -1;	
+	    colofs[x] = texturecompositesize[texnum];
+	    
+	    if (texturecompositesize[texnum] > 0x10000-texture->height)
+	    {
+		I_Error ("R_GenerateLookup: texture %i is >64k",
+			 texnum);
+	    }
+	    
+	    texturecompositesize[texnum] += texture->height;
+	}
+    }
+
+    Z_Free(patchcount);
+}
+
+
+
+
+//
+// R_GetColumn
+//
+byte*
+R_GetColumn
+( int		tex,
+  int		col )
+{
+    int		lump;
+    int		ofs;
+	
+    col &= texturewidthmask[tex];
+    lump = texturecolumnlump[tex][col];
+    ofs = texturecolumnofs[tex][col];
+    
+    if (lump > 0)
+	return (byte *)W_CacheLumpNum(lump,PU_CACHE)+ofs;
+
+    if (!texturecomposite[tex])
+	R_GenerateComposite (tex);
+
+    return texturecomposite[tex] + ofs;
+}
+
+
+static void GenerateTextureHashTable(void)
+{
+    texture_t **rover;
+    int i;
+    int key;
+
+    textures_hashtable 
+            = Z_Malloc(sizeof(texture_t *) * numtextures, PU_STATIC, 0);
+
+    memset(textures_hashtable, 0, sizeof(texture_t *) * numtextures);
+
+    // Add all textures to hash table
+
+    for (i=0; i<numtextures; ++i)
+    {
+        // Store index
+
+        textures[i]->index = i;
+
+        // Vanilla Doom does a linear search of the texures array
+        // and stops at the first entry it finds.  If there are two
+        // entries with the same name, the first one in the array
+        // wins. The new entry must therefore be added at the end
+        // of the hash chain, so that earlier entries win.
+
+        key = W_LumpNameHash(textures[i]->name) % numtextures;
+
+        rover = &textures_hashtable[key];
+
+        while (*rover != NULL)
+        {
+            rover = &(*rover)->next;
+        }
+
+        // Hook into hash table
+
+        textures[i]->next = NULL;
+        *rover = textures[i];
+    }
+}
+
+
+//
+// R_InitTextures
+// Initializes the texture list
+//  with the textures from the world map.
+//
+void R_InitTextures (void)
+{
+    maptexture_t*	mtexture;
+    texture_t*		texture;
+    mappatch_t*		mpatch;
+    texpatch_t*		patch;
+
+    int			i;
+    int			j;
+
+    int*		maptex;
+    int*		maptex2;
+    int*		maptex1;
+    
+    char		name[9];
+    char*		names;
+    char*		name_p;
+    
+    int*		patchlookup;
+    
+    int			nummappatches;
+    int			offset;
+    int			maxoff;
+    int			maxoff2;
+    int			numtextures1;
+    int			numtextures2;
+
+    int*		directory;
+    
+    int			temp1;
+    int			temp2;
+    int			temp3;
+
+
+    // Load the patch names from pnames.lmp.
+    names = W_CacheLumpName (DEH_String("PNAMES"), PU_STATIC);
+    nummappatches = LONG ( *((int *)names) );
+    name_p = names+4;
+    patchlookup = Z_Malloc(nummappatches*sizeof(*patchlookup), PU_STATIC, NULL);
+
+    for (i = 0; i < nummappatches; i++)
+    {
+        M_StringCopy(name, name_p + i * 8, sizeof(name));
+        patchlookup[i] = W_CheckNumForName (name);
+    }
+    W_ReleaseLumpName(DEH_String("PNAMES"));
+
+    // Load the map texture definitions from textures.lmp.
+    // The data is contained in one or two lumps,
+    //  TEXTURE1 for shareware, plus TEXTURE2 for commercial.
+    maptex = maptex1 = W_CacheLumpName (DEH_String("TEXTURE1"), PU_STATIC);
+    numtextures1 = LONG(*maptex);
+    maxoff = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE1")));
+    directory = maptex+1;
+
+    if (W_CheckNumForName (DEH_String("TEXTURE2")) != -1)
+    {
+        maptex2 = W_CacheLumpName (DEH_String("TEXTURE2"), PU_STATIC);
+        numtextures2 = LONG(*maptex2);
+        maxoff2 = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE2")));
+    }
+    else
+    {
+        maptex2 = NULL;
+        numtextures2 = 0;
+        maxoff2 = 0;
+    }
+    numtextures = numtextures1 + numtextures2;
+
+    textures = Z_Malloc (numtextures * sizeof(*textures), PU_STATIC, 0);
+    texturecolumnlump = Z_Malloc (numtextures * sizeof(*texturecolumnlump), PU_STATIC, 0);
+    texturecolumnofs = Z_Malloc (numtextures * sizeof(*texturecolumnofs), PU_STATIC, 0);
+    texturecomposite = Z_Malloc (numtextures * sizeof(*texturecomposite), PU_STATIC, 0);
+    texturecompositesize = Z_Malloc (numtextures * sizeof(*texturecompositesize), PU_STATIC, 0);
+    texturewidthmask = Z_Malloc (numtextures * sizeof(*texturewidthmask), PU_STATIC, 0);
+    textureheight = Z_Malloc (numtextures * sizeof(*textureheight), PU_STATIC, 0);
+
+    //	Really complex printing shit...
+    temp1 = W_GetNumForName (DEH_String("S_START"));  // P_???????
+    temp2 = W_GetNumForName (DEH_String("S_END")) - 1;
+    temp3 = ((temp2-temp1+63)/64) + ((numtextures+63)/64);
+
+    // If stdout is a real console, use the classic vanilla "filling
+    // up the box" effect, which uses backspace to "step back" inside
+    // the box.  If stdout is a file, don't draw the box.
+
+    // haleyjd 20110206 [STRIFE]: box is in devparm only
+    if (devparm && I_ConsoleStdout())
+    {
+        printf("[");
+        for (i = 0; i < temp3 + 9; i++)
+            printf(" ");
+        printf("]");
+        for (i = 0; i < temp3 + 10; i++)
+            printf("\b");
+    }
+
+    for (i=0 ; i<numtextures ; i++, directory++)
+    {
+        if (!(i&63))
+        {
+            // [STRIFE]: tick intro if not in devparm
+            if(devparm)
+                printf (".");
+            else
+                D_IntroTick();
+        }
+
+        if (i == numtextures1)
+        {
+            // Start looking in second texture file.
+            maptex = maptex2;
+            maxoff = maxoff2;
+            directory = maptex+1;
+        }
+
+        offset = LONG(*directory);
+
+        if (offset > maxoff)
+            I_Error ("R_InitTextures: bad texture directory");
+
+        mtexture = (maptexture_t *) ( (byte *)maptex + offset);
+
+        texture = textures[i] =
+            Z_Malloc (sizeof(texture_t)
+                      + sizeof(texpatch_t)*(SHORT(mtexture->patchcount)-1),
+                      PU_STATIC, 0);
+
+        texture->width = SHORT(mtexture->width);
+        texture->height = SHORT(mtexture->height);
+        texture->patchcount = SHORT(mtexture->patchcount);
+
+        memcpy (texture->name, mtexture->name, sizeof(texture->name));
+        mpatch = &mtexture->patches[0];
+        patch = &texture->patches[0];
+
+        for (j=0 ; j<texture->patchcount ; j++, mpatch++, patch++)
+        {
+            patch->originx = SHORT(mpatch->originx);
+            patch->originy = SHORT(mpatch->originy);
+            patch->patch = patchlookup[SHORT(mpatch->patch)];
+            if (patch->patch == -1)
+            {
+                I_Error ("R_InitTextures: Missing patch in texture %s",
+                         texture->name);
+            }
+        }		
+        texturecolumnlump[i] = Z_Malloc (texture->width*sizeof(**texturecolumnlump), PU_STATIC,0);
+        texturecolumnofs[i] = Z_Malloc (texture->width*sizeof(**texturecolumnofs), PU_STATIC,0);
+
+        j = 1;
+        while (j*2 <= texture->width)
+            j<<=1;
+
+        texturewidthmask[i] = j-1;
+        textureheight[i] = texture->height<<FRACBITS;
+    }
+
+    Z_Free(patchlookup);
+
+    W_ReleaseLumpName(DEH_String("TEXTURE1"));
+    if (maptex2)
+        W_ReleaseLumpName(DEH_String("TEXTURE2"));
+
+    // Precalculate whatever possible.	
+
+    for (i=0 ; i<numtextures ; i++)
+    {
+        // [STRIFE]: tick intro
+        if(!(i & 63))
+            D_IntroTick();
+        R_GenerateLookup (i);
+    }
+
+    // Create translation table for global animation.
+    texturetranslation = Z_Malloc ((numtextures+1)*sizeof(*texturetranslation), PU_STATIC, 0);
+
+    for (i=0 ; i<numtextures ; i++)
+        texturetranslation[i] = i;
+
+    GenerateTextureHashTable();
+}
+
+
+
+//
+// R_InitFlats
+//
+void R_InitFlats (void)
+{
+    int		i;
+	
+    firstflat = W_GetNumForName (DEH_String("F_START")) + 1;
+    lastflat = W_GetNumForName (DEH_String("F_END")) - 1;
+    numflats = lastflat - firstflat + 1;
+	
+    // Create translation table for global animation.
+    flattranslation = Z_Malloc ((numflats+1)*sizeof(*flattranslation), PU_STATIC, 0);
+    
+    for (i=0 ; i<numflats ; i++)
+	flattranslation[i] = i;
+}
+
+
+//
+// R_InitSpriteLumps
+// Finds the width and hoffset of all sprites in the wad,
+//  so the sprite does not need to be cached completely
+//  just for having the header info ready during rendering.
+//
+void R_InitSpriteLumps (void)
+{
+    int		i;
+    patch_t	*patch;
+
+    firstspritelump = W_GetNumForName (DEH_String("S_START")) + 1;
+    lastspritelump = W_GetNumForName (DEH_String("S_END")) - 1;
+
+    numspritelumps = lastspritelump - firstspritelump + 1;
+    spritewidth = Z_Malloc (numspritelumps*sizeof(*spritewidth), PU_STATIC, 0);
+    spriteoffset = Z_Malloc (numspritelumps*sizeof(*spriteoffset), PU_STATIC, 0);
+    spritetopoffset = Z_Malloc (numspritelumps*sizeof(*spritetopoffset), PU_STATIC, 0);
+
+    for (i=0 ; i< numspritelumps ; i++)
+    {
+        if(!(i&63))
+        {
+            // [STRIFE] tick intro if not in devparm
+            if(devparm)
+                printf (".");
+            else
+                D_IntroTick();
+        }
+
+        patch = W_CacheLumpNum (firstspritelump+i, PU_CACHE);
+        spritewidth[i] = SHORT(patch->width)<<FRACBITS;
+        spriteoffset[i] = SHORT(patch->leftoffset)<<FRACBITS;
+        spritetopoffset[i] = SHORT(patch->topoffset)<<FRACBITS;
+    }
+}
+
+
+
+//
+// R_InitColormaps
+//
+void R_InitColormaps (void)
+{
+    int	lump;
+
+    // Load in the light tables, 256 byte align tables.
+    lump = W_GetNumForName(DEH_String("COLORMAP"));
+    colormaps = W_CacheLumpNum(lump, PU_STATIC);
+}
+
+
+
+//
+// R_InitData
+// Locates all the lumps
+//  that will be used by all views
+// Must be called after W_Init.
+//
+void R_InitData (void)
+{
+    R_InitTextures ();
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick(); // [STRIFE] tick intro
+
+    R_InitFlats ();
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick();
+
+    R_InitSpriteLumps ();
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick();
+
+    R_InitColormaps ();
+}
+
+
+
+//
+// R_FlatNumForName
+// Retrieval, get a flat number for a flat name.
+//
+int R_FlatNumForName(const char *name)
+{
+    int		i;
+    char	namet[9];
+
+    i = W_CheckNumForName (name);
+
+    if (i == -1)
+    {
+	namet[8] = 0;
+	memcpy (namet, name,8);
+	I_Error ("R_FlatNumForName: %s not found",namet);
+    }
+    return i - firstflat;
+}
+
+
+
+
+//
+// R_CheckTextureNumForName
+// Check whether texture is available.
+// Filter out NoTexture indicator.
+//
+int	R_CheckTextureNumForName(const char *name)
+{
+    texture_t *texture;
+    int key;
+
+    // "NoTexture" marker.
+    if (name[0] == '-')		
+	return 0;
+		
+    key = W_LumpNameHash(name) % numtextures;
+
+    texture=textures_hashtable[key]; 
+    
+    while (texture != NULL)
+    {
+	if (!strncasecmp (texture->name, name, 8) )
+	    return texture->index;
+
+        texture = texture->next;
+    }
+    
+    return -1;
+}
+
+
+
+//
+// R_TextureNumForName
+// Calls R_CheckTextureNumForName,
+//  aborts with error message.
+//
+int	R_TextureNumForName (const char* name)
+{
+    int		i;
+	
+    i = R_CheckTextureNumForName (name);
+
+    if (i==-1)
+    {
+	I_Error ("R_TextureNumForName: %s not found",
+		 name);
+    }
+    return i;
+}
+
+//
+// R_SoundNumForDoor
+//
+// villsa [STRIFE] - new function
+// Set sounds associated with door though why
+// on earth is this function placed here?
+//
+void R_SoundNumForDoor(vldoor_t* door)
+{
+    int         i;
+    sector_t    *sector;
+    line_t      *line;
+    texture_t   *texture;
+    char        name[8];
+    char        c1;
+    char        c2;
+
+    // set default sounds
+    door->opensound = sfx_drsmto;
+    door->closesound = sfx_drsmtc;
+
+    for(sector = door->sector, i = 0; i < sector->linecount; i++)
+    {
+        line = sector->lines[i];
+
+        if(!(line->flags & ML_TWOSIDED))
+            continue;
+
+        texture = textures[sides[line->sidenum[0]].toptexture];
+        memcpy(name, texture->name, 8);
+
+        if(strncmp(name, "DOR", 3))
+            continue;
+
+        c1 = name[3];
+        c2 = name[4];
+
+        // S type
+        if(c1 == 'S')
+        {
+            door->opensound = sfx_drston;
+            door->closesound = sfx_drston;
+            return;
+        }
+
+        // M type
+        if(c1 == 'M')
+        {
+            // L subtype
+            if(c2 == 'L')
+            {
+                door->opensound = sfx_drlmto;
+                door->closesound = sfx_drlmtc;
+            }
+            // S subtype
+            else if(c2 == 'S')
+            {
+                door->opensound = sfx_drsmto;
+                door->closesound = sfx_drsmtc;
+            }
+            return;
+        }
+        // W type
+        else if(c1 == 'W')
+        {
+            // L subtype
+            if(c2 == 'L')
+            {
+                door->opensound = sfx_drlwud;
+                door->closesound = sfx_drlwud;
+            }
+            // S subtype
+            else if(c2 == 'S')
+            {
+                door->opensound = sfx_drswud;
+                door->closesound = sfx_drswud;
+            }
+            return;
+        }
+    }
+}
+
+
+
+
+//
+// R_PrecacheLevel
+// Preloads all relevant graphics for the level.
+//
+int		flatmemory;
+int		texturememory;
+int		spritememory;
+
+void R_PrecacheLevel (void)
+{
+    char*		flatpresent;
+    char*		texturepresent;
+    char*		spritepresent;
+
+    int			i;
+    int			j;
+    int			k;
+    int			lump;
+    
+    texture_t*		texture;
+    thinker_t*		th;
+    spriteframe_t*	sf;
+
+    if (demoplayback)
+	return;
+    
+    // Precache flats.
+    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
+    memset (flatpresent,0,numflats);	
+
+    for (i=0 ; i<numsectors ; i++)
+    {
+	flatpresent[sectors[i].floorpic] = 1;
+	flatpresent[sectors[i].ceilingpic] = 1;
+    }
+	
+    flatmemory = 0;
+
+    for (i=0 ; i<numflats ; i++)
+    {
+	if (flatpresent[i])
+	{
+	    lump = firstflat + i;
+	    flatmemory += lumpinfo[lump]->size;
+	    W_CacheLumpNum(lump, PU_CACHE);
+	}
+    }
+
+    Z_Free(flatpresent);
+    
+    // Precache textures.
+    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
+    memset (texturepresent,0, numtextures);
+	
+    for (i=0 ; i<numsides ; i++)
+    {
+	texturepresent[sides[i].toptexture] = 1;
+	texturepresent[sides[i].midtexture] = 1;
+	texturepresent[sides[i].bottomtexture] = 1;
+    }
+
+    // Sky texture is always present.
+    // Note that F_SKY1 is the name used to
+    //  indicate a sky floor/ceiling as a flat,
+    //  while the sky texture is stored like
+    //  a wall texture, with an episode dependend
+    //  name.
+    texturepresent[skytexture] = 1;
+	
+    texturememory = 0;
+    for (i=0 ; i<numtextures ; i++)
+    {
+	if (!texturepresent[i])
+	    continue;
+
+	texture = textures[i];
+	
+	for (j=0 ; j<texture->patchcount ; j++)
+	{
+	    lump = texture->patches[j].patch;
+	    texturememory += lumpinfo[lump]->size;
+	    W_CacheLumpNum(lump , PU_CACHE);
+	}
+    }
+
+    Z_Free(texturepresent);
+    
+    // Precache sprites.
+    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
+    memset (spritepresent,0, numsprites);
+	
+    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+    {
+	if (th->function.acp1 == (actionf_p1)P_MobjThinker)
+	    spritepresent[((mobj_t *)th)->sprite] = 1;
+    }
+	
+    spritememory = 0;
+    for (i=0 ; i<numsprites ; i++)
+    {
+	if (!spritepresent[i])
+	    continue;
+
+	for (j=0 ; j<sprites[i].numframes ; j++)
+	{
+	    sf = &sprites[i].spriteframes[j];
+	    for (k=0 ; k<8 ; k++)
+	    {
+		lump = firstspritelump + sf->lump[k];
+		spritememory += lumpinfo[lump]->size;
+		W_CacheLumpNum(lump , PU_CACHE);
+	    }
+	}
+    }
+
+    Z_Free(spritepresent);
+}
+
+
+
+
diff --git a/games/NXDoom/src/strife/r_data.h b/games/NXDoom/src/strife/r_data.h
new file mode 100644
index 000000000..efeb4f753
--- /dev/null
+++ b/games/NXDoom/src/strife/r_data.h
@@ -0,0 +1,56 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Refresh module, data I/O, caching, retrieval of graphics
+//  by name.
+//
+
+
+#ifndef __R_DATA__
+#define __R_DATA__
+
+#include "r_defs.h"
+#include "r_state.h"
+#include "p_spec.h"    // villsa [STRIFE]
+
+
+extern int numflats;
+
+
+// Retrieve column data for span blitting.
+byte*
+R_GetColumn
+( int		tex,
+  int		col );
+
+
+// I/O, setting up the stuff.
+void R_InitData (void);
+void R_PrecacheLevel (void);
+
+
+// Retrieval.
+// Floor/ceiling opaque texture tiles,
+// lookup by name. For animation?
+int R_FlatNumForName(const char *name);
+
+
+// Called by P_Ticker for switches and animations,
+// returns the texture number for the texture name.
+int R_TextureNumForName (const char *name);
+int R_CheckTextureNumForName (const char *name);
+void R_SoundNumForDoor(vldoor_t* door); // villsa [STRIFE]
+
+#endif
diff --git a/games/NXDoom/src/strife/r_defs.h b/games/NXDoom/src/strife/r_defs.h
new file mode 100644
index 000000000..a64ac8424
--- /dev/null
+++ b/games/NXDoom/src/strife/r_defs.h
@@ -0,0 +1,448 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Refresh/rendering module, shared data struct definitions.
+//
+
+
+#ifndef __R_DEFS__
+#define __R_DEFS__
+
+
+// Screenwidth.
+#include "doomdef.h"
+
+// Some more or less basic data types
+// we depend on.
+#include "m_fixed.h"
+
+// We rely on the thinker data struct
+// to handle sound origins in sectors.
+#include "d_think.h"
+// SECTORS do store MObjs anyway.
+#include "p_mobj.h"
+
+#include "i_video.h"
+
+#include "v_patch.h"
+
+
+
+
+// Silhouette, needed for clipping Segs (mainly)
+// and sprites representing things.
+#define SIL_NONE		0
+#define SIL_BOTTOM		1
+#define SIL_TOP			2
+#define SIL_BOTH		3
+
+#define MAXDRAWSEGS		256
+
+
+
+
+
+//
+// INTERNAL MAP TYPES
+//  used by play and refresh
+//
+
+//
+// Your plain vanilla vertex.
+// Note: transformed values not buffered locally,
+//  like some DOOM-alikes ("wt", "WebView") did.
+//
+typedef struct
+{
+    fixed_t	x;
+    fixed_t	y;
+    
+} vertex_t;
+
+
+// Forward of LineDefs, for Sectors.
+struct line_s;
+
+// Each sector has a degenmobj_t in its center
+//  for sound origin purposes.
+// I suppose this does not handle sound from
+//  moving objects (doppler), because
+//  position is prolly just buffered, not
+//  updated.
+typedef struct
+{
+    thinker_t		thinker;	// not used for anything
+    fixed_t		x;
+    fixed_t		y;
+    fixed_t		z;
+
+} degenmobj_t;
+
+//
+// The SECTORS record, at runtime.
+// Stores things/mobjs.
+//
+typedef	struct
+{
+    fixed_t	floorheight;
+    fixed_t	ceilingheight;
+    short	floorpic;
+    short	ceilingpic;
+    short	lightlevel;
+    short	special;
+    short	tag;
+
+    // 0 = untraversed, 1,2 = sndlines -1
+    int		soundtraversed;
+
+    // thing that made a sound (or null)
+    mobj_t*	soundtarget;
+
+    // mapblock bounding box for height changes
+    int		blockbox[4];
+
+    // origin for any sounds played by the sector
+    degenmobj_t	soundorg;
+
+    // if == validcount, already checked
+    int		validcount;
+
+    // list of mobjs in sector
+    mobj_t*	thinglist;
+
+    // thinker_t for reversable actions
+    void*	specialdata;
+
+    int			linecount;
+    struct line_s**	lines;	// [linecount] size
+    
+} sector_t;
+
+
+
+
+//
+// The SideDef.
+//
+
+typedef struct
+{
+    // add this to the calculated texture column
+    fixed_t	textureoffset;
+    
+    // add this to the calculated texture top
+    fixed_t	rowoffset;
+
+    // Texture indices.
+    // We do not maintain names here. 
+    short	toptexture;
+    short	bottomtexture;
+    short	midtexture;
+
+    // Sector the SideDef is facing.
+    sector_t*	sector;
+    
+} side_t;
+
+
+
+//
+// Move clipping aid for LineDefs.
+//
+typedef enum
+{
+    ST_HORIZONTAL,
+    ST_VERTICAL,
+    ST_POSITIVE,
+    ST_NEGATIVE
+
+} slopetype_t;
+
+
+
+typedef struct line_s
+{
+    // Vertices, from v1 to v2.
+    vertex_t*	v1;
+    vertex_t*	v2;
+
+    // Precalculated v2 - v1 for side checking.
+    fixed_t	dx;
+    fixed_t	dy;
+
+    // Animation related.
+    short	flags;
+    short	special;
+    short	tag;
+
+    // Visual appearance: SideDefs.
+    //  sidenum[1] will be -1 if one sided
+    short	sidenum[2];			
+
+    // Neat. Another bounding box, for the extent
+    //  of the LineDef.
+    fixed_t	bbox[4];
+
+    // To aid move clipping.
+    slopetype_t	slopetype;
+
+    // Front and back sector.
+    // Note: redundant? Can be retrieved from SideDefs.
+    sector_t*	frontsector;
+    sector_t*	backsector;
+
+    // if == validcount, already checked
+    int		validcount;
+
+    // thinker_t for reversable actions
+    void*	specialdata;		
+} line_t;
+
+
+
+
+//
+// A SubSector.
+// References a Sector.
+// Basically, this is a list of LineSegs,
+//  indicating the visible walls that define
+//  (all or some) sides of a convex BSP leaf.
+//
+typedef struct subsector_s
+{
+    sector_t*	sector;
+    short	numlines;
+    short	firstline;
+    
+} subsector_t;
+
+
+
+//
+// The LineSeg.
+//
+typedef struct
+{
+    vertex_t*	v1;
+    vertex_t*	v2;
+    
+    fixed_t	offset;
+
+    angle_t	angle;
+
+    side_t*	sidedef;
+    line_t*	linedef;
+
+    // Sector references.
+    // Could be retrieved from linedef, too.
+    // backsector is NULL for one sided lines
+    sector_t*	frontsector;
+    sector_t*	backsector;
+    
+} seg_t;
+
+
+
+//
+// BSP node.
+//
+typedef struct
+{
+    // Partition line.
+    fixed_t	x;
+    fixed_t	y;
+    fixed_t	dx;
+    fixed_t	dy;
+
+    // Bounding box for each child.
+    fixed_t	bbox[2][4];
+
+    // If NF_SUBSECTOR its a subsector.
+    unsigned short children[2];
+    
+} node_t;
+
+
+
+
+// PC direct to screen pointers
+//B UNUSED - keep till detailshift in r_draw.c resolved
+//extern byte*	destview;
+//extern byte*	destscreen;
+
+
+
+
+
+//
+// OTHER TYPES
+//
+
+// This could be wider for >8 bit display.
+// Indeed, true color support is posibble
+//  precalculating 24bpp lightmap/colormap LUT.
+//  from darkening PLAYPAL to all black.
+// Could even us emore than 32 levels.
+typedef byte	lighttable_t;	
+
+
+
+
+//
+// ?
+//
+typedef struct drawseg_s
+{
+    seg_t*		curline;
+    int			x1;
+    int			x2;
+
+    fixed_t		scale1;
+    fixed_t		scale2;
+    fixed_t		scalestep;
+
+    // 0=none, 1=bottom, 2=top, 3=both
+    int			silhouette;
+
+    // do not clip sprites above this
+    fixed_t		bsilheight;
+
+    // do not clip sprites below this
+    fixed_t		tsilheight;
+    
+    // Pointers to lists for sprite clipping,
+    //  all three adjusted so [x1] is first value.
+    short*		sprtopclip;		
+    short*		sprbottomclip;	
+    short*		maskedtexturecol;
+    
+} drawseg_t;
+
+
+
+// A vissprite_t is a thing
+//  that will be drawn during a refresh.
+// I.e. a sprite object that is partly visible.
+typedef struct vissprite_s
+{
+    // Doubly linked list.
+    struct vissprite_s*	prev;
+    struct vissprite_s*	next;
+    
+    int			x1;
+    int			x2;
+
+    // for line side calculation
+    fixed_t		gx;
+    fixed_t		gy;		
+
+    // global bottom / top for silhouette clipping
+    fixed_t		gz;
+    fixed_t		gzt;
+
+    // horizontal position of x1
+    fixed_t		startfrac;
+    
+    fixed_t		scale;
+    
+    // negative if flipped
+    fixed_t		xiscale;	
+
+    fixed_t		texturemid;
+    int			patch;
+
+    // for color translation and shadow draw,
+    //  maxbright frames as well
+    lighttable_t*	colormap;
+   
+    int			mobjflags;
+    
+} vissprite_t;
+
+
+//	
+// Sprites are patches with a special naming convention
+//  so they can be recognized by R_InitSprites.
+// The base name is NNNNFx or NNNNFxFx, with
+//  x indicating the rotation, x = 0, 1-7.
+// The sprite and frame specified by a thing_t
+//  is range checked at run time.
+// A sprite is a patch_t that is assumed to represent
+//  a three dimensional object and may have multiple
+//  rotations pre drawn.
+// Horizontal flipping is used to save space,
+//  thus NNNNF2F5 defines a mirrored patch.
+// Some sprites will only have one picture used
+// for all views: NNNNF0
+//
+typedef struct
+{
+    // If false use 0 for any position.
+    // Note: as eight entries are available,
+    //  we might as well insert the same name eight times.
+    boolean	rotate;
+
+    // Lump to use for view angles 0-7.
+    short	lump[8];
+
+    // Flip bit (1 = flip) to use for view angles 0-7.
+    byte	flip[8];
+    
+} spriteframe_t;
+
+
+
+//
+// A sprite definition:
+//  a number of animation frames.
+//
+typedef struct
+{
+    int			numframes;
+    spriteframe_t*	spriteframes;
+
+} spritedef_t;
+
+
+
+//
+// Now what is a visplane, anyway?
+// 
+typedef struct
+{
+  fixed_t		height;
+  int			picnum;
+  int			lightlevel;
+  int			minx;
+  int			maxx;
+  
+  // leave pads for [minx-1]/[maxx+1]
+  
+  byte		pad1;
+  // Here lies the rub for all
+  //  dynamic resize/change of resolution.
+  byte		top[SCREENWIDTH];
+  byte		pad2;
+  byte		pad3;
+  // See above.
+  byte		bottom[SCREENWIDTH];
+  byte		pad4;
+
+} visplane_t;
+
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_draw.c b/games/NXDoom/src/strife/r_draw.c
new file mode 100644
index 000000000..de6d1d0a9
--- /dev/null
+++ b/games/NXDoom/src/strife/r_draw.c
@@ -0,0 +1,968 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The actual span/column drawing functions.
+//	Here find the main potential for optimization,
+//	 e.g. inline assembly, different algorithms.
+//
+
+
+
+
+#include "doomdef.h"
+#include "deh_main.h"
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+
+// Needs access to LFB (guess what).
+#include "v_video.h"
+
+// State.
+#include "doomstat.h"
+
+
+// ?
+#define MAXWIDTH			1120
+#define MAXHEIGHT			832
+
+// status bar height at bottom of screen
+// haleyjd 08/31/10: Verified unmodified.
+#define SBARHEIGHT              32
+
+//
+// All drawing to the view buffer is accomplished in this file.
+// The other refresh files only know about ccordinates,
+//  not the architecture of the frame buffer.
+// Conveniently, the frame buffer is a linear one,
+//  and we need only the base address,
+//  and the total size == width*height*depth/8.,
+//
+
+
+byte*		viewimage; 
+int		viewwidth;
+int		scaledviewwidth;
+int		viewheight;
+int		viewwindowx;
+int		viewwindowy; 
+byte*		ylookup[MAXHEIGHT]; 
+int		columnofs[MAXWIDTH]; 
+
+// Color tables for different players,
+//  translate a limited part to another
+//  (color ramps used for  suit colors).
+//
+// [STRIFE] Unused.
+//byte          translations[3][256];	
+ 
+// Backing buffer containing the bezel drawn around the screen and 
+// surrounding background.
+
+static byte *background_buffer = NULL;
+
+// haleyjd 08/29/10: [STRIFE] Rogue added the ability to customize the view
+// border flat by storing it in the configuration file.
+char *back_flat = "F_PAVE01";
+
+//
+// R_DrawColumn
+// Source is the top of the column to scale.
+//
+lighttable_t*		dc_colormap; 
+int			dc_x; 
+int			dc_yl; 
+int			dc_yh; 
+fixed_t			dc_iscale; 
+fixed_t			dc_texturemid;
+
+// first pixel in a column (possibly virtual) 
+byte*			dc_source;		
+
+// just for profiling 
+int			dccount;
+
+//
+// A column is a vertical slice/span from a wall texture that,
+//  given the DOOM style restrictions on the view orientation,
+//  will always have constant z depth.
+// Thus a special case loop for very fast rendering can
+//  be used. It has also been used with Wolfenstein 3D.
+// 
+void R_DrawColumn (void) 
+{ 
+    int			count; 
+    byte*		dest; 
+    fixed_t		frac;
+    fixed_t		fracstep;	 
+ 
+    count = dc_yh - dc_yl; 
+
+    // Zero length, column does not exceed a pixel.
+    if (count < 0) 
+	return; 
+				 
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+	|| dc_yl < 0
+	|| dc_yh >= SCREENHEIGHT) 
+	I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x); 
+#endif 
+
+    // Framebuffer destination address.
+    // Use ylookup LUT to avoid multiply with ScreenWidth.
+    // Use columnofs LUT for subwindows? 
+    dest = ylookup[dc_yl] + columnofs[dc_x];  
+
+    // Determine scaling,
+    //  which is the only mapping to be done.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    // Inner loop that does the actual texture mapping,
+    //  e.g. a DDA-lile scaling.
+    // This is as fast as it gets.
+    do 
+    {
+	// Re-map color indices from wall texture column
+	//  using a lighting/special effects LUT.
+	*dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
+	
+	dest += SCREENWIDTH; 
+	frac += fracstep;
+	
+    } while (count--); 
+} 
+
+
+
+// UNUSED.
+// Loop unrolled.
+#if 0
+void R_DrawColumn (void) 
+{ 
+    int			count; 
+    byte*		source;
+    byte*		dest;
+    byte*		colormap;
+    
+    unsigned		frac;
+    unsigned		fracstep;
+    unsigned		fracstep2;
+    unsigned		fracstep3;
+    unsigned		fracstep4;	 
+ 
+    count = dc_yh - dc_yl + 1; 
+
+    source = dc_source;
+    colormap = dc_colormap;		 
+    dest = ylookup[dc_yl] + columnofs[dc_x];  
+	 
+    fracstep = dc_iscale<<9; 
+    frac = (dc_texturemid + (dc_yl-centery)*dc_iscale)<<9; 
+ 
+    fracstep2 = fracstep+fracstep;
+    fracstep3 = fracstep2+fracstep;
+    fracstep4 = fracstep3+fracstep;
+	
+    while (count >= 8) 
+    { 
+	dest[0] = colormap[source[frac>>25]]; 
+	dest[SCREENWIDTH] = colormap[source[(frac+fracstep)>>25]]; 
+	dest[SCREENWIDTH*2] = colormap[source[(frac+fracstep2)>>25]]; 
+	dest[SCREENWIDTH*3] = colormap[source[(frac+fracstep3)>>25]];
+	
+	frac += fracstep4; 
+
+	dest[SCREENWIDTH*4] = colormap[source[frac>>25]]; 
+	dest[SCREENWIDTH*5] = colormap[source[(frac+fracstep)>>25]]; 
+	dest[SCREENWIDTH*6] = colormap[source[(frac+fracstep2)>>25]]; 
+	dest[SCREENWIDTH*7] = colormap[source[(frac+fracstep3)>>25]]; 
+
+	frac += fracstep4; 
+	dest += SCREENWIDTH*8; 
+	count -= 8;
+    } 
+	
+    while (count > 0)
+    { 
+	*dest = colormap[source[frac>>25]]; 
+	dest += SCREENWIDTH; 
+	frac += fracstep; 
+	count--;
+    } 
+}
+#endif
+
+// haleyjd 09/06/10 [STRIFE] Removed low detail
+
+//
+// Spectre/Invisibility.
+//
+
+// haleyjd 09/06/10: ]STRIFE] replaced fuzzdraw with translucency.
+
+//
+// R_DrawMVisTLColumn
+//
+// villsa [STRIFE] new function
+// Replacement for R_DrawFuzzColumn
+//
+void R_DrawMVisTLColumn(void)
+{
+    int                 count; 
+    byte*               dest; 
+    fixed_t             frac;
+    fixed_t             fracstep;
+
+    // Adjust borders. Low... 
+    if (!dc_yl) 
+        dc_yl = 1;
+
+    // .. and high.
+    if (dc_yh == viewheight-1) 
+        dc_yh = viewheight - 2; 
+
+    count = dc_yh - dc_yl; 
+
+    // Zero length.
+    if (count < 0) 
+        return; 
+
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+        || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    {
+        I_Error ("R_DrawFuzzColumn: %i to %i at %i",
+                 dc_yl, dc_yh, dc_x);
+    }
+#endif
+    
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    // Looks familiar.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    do
+    {
+        byte src = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
+        byte col = xlatab[*dest + (src << 8)];
+        *dest = col;
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    } while(count--);
+}
+
+//
+// R_DrawTLColumn
+//
+// villsa [STRIFE] new function
+// Achieves a second translucency level using the same lookup table,
+// via inversion of the colors in the index computation.
+//
+void R_DrawTLColumn(void)
+{
+    int                 count; 
+    byte*               dest; 
+    fixed_t             frac;
+    fixed_t             fracstep;	 
+
+    // Adjust borders. Low... 
+    if (!dc_yl) 
+        dc_yl = 1;
+
+    // .. and high.
+    if (dc_yh == viewheight-1) 
+        dc_yh = viewheight - 2; 
+
+    count = dc_yh - dc_yl; 
+
+    // Zero length.
+    if (count < 0) 
+        return; 
+
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+        || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    {
+        I_Error ("R_DrawFuzzColumn2: %i to %i at %i",
+                 dc_yl, dc_yh, dc_x);
+    }
+#endif
+    
+    dest = ylookup[dc_yl] + columnofs[dc_x];
+
+    // Looks familiar.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    do
+    {
+        byte src = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
+        byte col = xlatab[(*dest << 8) + src];
+        *dest = col;
+        dest += SCREENWIDTH;
+        frac += fracstep;
+    } while(count--);
+}
+  
+ 
+
+//
+// R_DrawTranslatedColumn
+// Used to draw player sprites
+//  with the green colorramp mapped to others.
+// Could be used with different translation
+//  tables, e.g. the lighter colored version
+//  of the BaronOfHell, the HellKnight, uses
+//  identical sprites, kinda brightened up.
+//
+byte*	dc_translation;
+byte*	translationtables;
+
+void R_DrawTranslatedColumn (void) 
+{ 
+    int                 count; 
+    byte*               dest; 
+    fixed_t             frac;
+    fixed_t             fracstep;
+
+    count = dc_yh - dc_yl; 
+    if (count < 0) 
+        return; 
+
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+        || dc_yl < 0
+        || dc_yh >= SCREENHEIGHT)
+    {
+        I_Error ( "R_DrawColumn: %i to %i at %i",
+                 dc_yl, dc_yh, dc_x);
+    }
+
+#endif 
+
+    dest = ylookup[dc_yl] + columnofs[dc_x]; 
+
+    // Looks familiar.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    // Here we do an additional index re-mapping.
+    do 
+    {
+        // Translation tables are used
+        //  to map certain colorramps to other ones,
+        //  used with PLAY sprites.
+        // Thus the "green" ramp of the player 0 sprite
+        //  is mapped to gray, red, black/indigo. 
+        *dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
+        dest += SCREENWIDTH;
+        frac += fracstep; 
+    } while (count--); 
+} 
+
+// haleyjd 09/06/10 [STRIFE] Removed low detail
+
+//
+// R_DrawTRTLColumn
+//
+// villsa [STRIFE] new function
+// Combines translucency and color translation.
+//
+void R_DrawTRTLColumn(void)
+{
+    int                 count; 
+    byte*               dest; 
+    fixed_t             frac;
+    fixed_t             fracstep;
+
+    count = dc_yh - dc_yl; 
+    if (count < 0) 
+        return; 
+
+#ifdef RANGECHECK 
+    if ((unsigned)dc_x >= SCREENWIDTH
+        || dc_yl < 0
+        || dc_yh >= SCREENHEIGHT)
+    {
+        I_Error ( "R_DrawColumn: %i to %i at %i",
+                 dc_yl, dc_yh, dc_x);
+    }
+#endif 
+
+    dest = ylookup[dc_yl] + columnofs[dc_x]; 
+
+    // Looks familiar.
+    fracstep = dc_iscale; 
+    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+
+    // Here we do an additional index re-mapping.
+    do 
+    {
+        byte src = dc_colormap[dc_translation[dc_source[frac>>FRACBITS&127]]];
+        byte col = xlatab[(*dest << 8) + src];
+        *dest = col;
+        dest += SCREENWIDTH;
+        frac += fracstep; 
+    } while (count--); 
+}
+
+
+//
+// R_InitTranslationTables
+// Creates the translation tables to map
+//  the green color ramp to gray, brown, red.
+// Assumes a given structure of the PLAYPAL.
+// Could be read from a lump instead.
+//
+// haleyjd 08/26/10: [STRIFE]
+// * Added loading of XLATAB
+//
+void R_InitTranslationTables (void)
+{
+    int i;
+    byte col1, col2;
+
+    // [STRIFE] Load xlatab. Here's how Rogue did it:
+    //   v7 = W_CacheLumpName("XLATAB", PU_CACHE); // note potential cache bug...
+    //   HIWORD(v8) = (Z_Malloc(131072, PU_STATIC, NULL) + 65535) >> 16;
+    //   LOWORD(v8) = 0; // aligning to a 64K boundary, as if this is Wolf3D.
+    //   xlatab = v8;
+    //   memcpy(v8, v7, 65536);
+    // As you can see, they copypasta'd id's unnecessary 64K boundary alignment
+    // from the colormap code. Since this doesn't accomplish anything, and isn't
+    // strictly portable, all we need to do is this:
+
+    // villsa [STRIFE] 09/26/10: load table through this function instead
+    V_LoadXlaTable();
+
+    // villsa [STRIFE] allocate a larger size for translation tables
+    translationtables = Z_Malloc (256*8, PU_STATIC, 0);
+
+    col1 = 0xFA;
+    col2 = 0xE0;
+
+    // villsa [STRIFE] setup all translation tables
+    for(i = 0; i < 256; i++)
+    {
+        if(i >= 0x80 && i <= 0x8f)
+        {
+            translationtables [i      ] = (i & 0x0f) + 64;
+            translationtables [i+  256] = (i & 0x0f) - 80;
+            translationtables [i+2*256] = (i & 0x0f) + 16;
+            translationtables [i+3*256] = (i & 0x0f) + 48;
+            translationtables [i+4*256] = (i & 0x0f) + 80;
+            translationtables [i+5*256] = (i & 0x0f) + 96;
+            translationtables [i+6*256] = (i & 0x0f) - 112;
+        }
+        else if(i >= 0x50 && i<= 0x5f)
+        {
+            translationtables [i      ] = i;
+            translationtables [i+  256] = i;
+            translationtables [i+2*256] = i;
+            translationtables [i+3*256] = i;
+            translationtables [i+4*256] = (i & 0x0f) + 0x80;
+            translationtables [i+5*256] = (i & 0x0f) + 16;
+            translationtables [i+6*256] = (i & 0x0f) + 64;
+        }
+        else if(i >= 0xd0 && i<= 0xdf)
+        {
+            translationtables [i      ] = i;
+            translationtables [i+  256] = i;
+            translationtables [i+2*256] = i;
+            translationtables [i+3*256] = i;
+            translationtables [i+4*256] = (i & 0x0f) - 80;
+            translationtables [i+5*256] = (i & 0x0f) + 48;
+            translationtables [i+6*256] = (i & 0x0f) + 16;
+        }
+        else if(i >= 0xc0 && i<= 0xcf)
+        {
+            translationtables [i      ] = i;
+            translationtables [i+  256] = i;
+            translationtables [i+2*256] = i;
+            translationtables [i+3*256] = i;
+            translationtables [i+4*256] = (i & 0x0f) - 96;
+            translationtables [i+5*256] = (i & 0x0f) + 32;
+            translationtables [i+6*256] = (i & 0x0f);
+            // haleyjd 20110213: missing code:
+            if(!(i & 0x0f))
+                translationtables[i+6*256] = 1;
+        }
+        else if(i >= 0xf7 && i<= 0xfb)
+        {
+            translationtables [i      ] = col1;
+            translationtables [i+  256] = i;
+            translationtables [i+2*256] = i;
+            translationtables [i+3*256] = i;
+            translationtables [i+4*256] = i;
+            translationtables [i+5*256] = i;
+            translationtables [i+6*256] = i;
+        }
+        else if(i >= 0xf1 && i<= 0xf6)
+        {
+            translationtables [i      ] = (i & 0x0f) - 33;
+            translationtables [i+  256] = i;
+            translationtables [i+2*256] = i;
+            translationtables [i+3*256] = i;
+            translationtables [i+4*256] = i;
+            translationtables [i+5*256] = i;
+            translationtables [i+6*256] = i;
+        }
+        else if(i >= 0x20 && i <= 0x3f) // haleyjd 20110213: fixed upper end
+        {
+            translationtables [i      ] = col2;
+            translationtables [i+  256] = col2;
+            translationtables [i+2*256] = (i & 0x0f) - 48;
+            translationtables [i+3*256] = (i & 0x0f) - 48;
+            translationtables [i+4*256] = col2;
+            translationtables [i+5*256] = col2;
+            translationtables [i+6*256] = col2;
+        }
+        else  // Keep all other colors as is.
+        {
+            translationtables[i]=
+            translationtables[i+256]=
+            translationtables[i+2*256]=
+            translationtables[i+3*256]=
+            translationtables[i+4*256]=
+            translationtables[i+5*256]=
+            translationtables[i+6*256]=i;
+        }
+
+        ++col1;
+        ++col2;
+    }
+}
+
+
+
+
+//
+// R_DrawSpan 
+// With DOOM style restrictions on view orientation,
+//  the floors and ceilings consist of horizontal slices
+//  or spans with constant z depth.
+// However, rotation around the world z axis is possible,
+//  thus this mapping, while simpler and faster than
+//  perspective correct texture mapping, has to traverse
+//  the texture at an angle in all but a few cases.
+// In consequence, flats are not stored by column (like walls),
+//  and the inner loop has to step in texture space u and v.
+//
+int			ds_y; 
+int			ds_x1; 
+int			ds_x2;
+
+lighttable_t*		ds_colormap; 
+
+fixed_t			ds_xfrac; 
+fixed_t			ds_yfrac; 
+fixed_t			ds_xstep; 
+fixed_t			ds_ystep;
+
+// start of a 64*64 tile image 
+byte*			ds_source;	
+
+// just for profiling
+int			dscount;
+
+
+//
+// Draws the actual span.
+void R_DrawSpan (void) 
+{ 
+    unsigned int position, step;
+    byte *dest;
+    int count;
+    int spot;
+    unsigned int xtemp, ytemp;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1
+	|| ds_x1<0
+	|| ds_x2>=SCREENWIDTH
+	|| (unsigned)ds_y>SCREENHEIGHT)
+    {
+	I_Error( "R_DrawSpan: %i to %i at %i",
+		 ds_x1,ds_x2,ds_y);
+    }
+//	dscount++;
+#endif
+
+    // Pack position and step variables into a single 32-bit integer,
+    // with x in the top 16 bits and y in the bottom 16 bits.  For
+    // each 16-bit part, the top 6 bits are the integer part and the
+    // bottom 10 bits are the fractional part of the pixel position.
+
+    position = ((ds_xfrac << 10) & 0xffff0000)
+             | ((ds_yfrac >> 6)  & 0x0000ffff);
+    step = ((ds_xstep << 10) & 0xffff0000)
+         | ((ds_ystep >> 6)  & 0x0000ffff);
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+
+    // We do not check for zero spans here?
+    count = ds_x2 - ds_x1;
+
+    do
+    {
+	// Calculate current texture index in u,v.
+        ytemp = (position >> 4) & 0x0fc0;
+        xtemp = (position >> 26);
+        spot = xtemp | ytemp;
+
+	// Lookup pixel from flat texture tile,
+	//  re-index using light/colormap.
+	*dest++ = ds_colormap[ds_source[spot]];
+
+        position += step;
+
+    } while (count--);
+}
+
+
+
+// UNUSED.
+// Loop unrolled by 4.
+#if 0
+void R_DrawSpan (void) 
+{ 
+    unsigned	position, step;
+
+    byte*	source;
+    byte*	colormap;
+    byte*	dest;
+    
+    unsigned	count;
+    usingned	spot; 
+    unsigned	value;
+    unsigned	temp;
+    unsigned	xtemp;
+    unsigned	ytemp;
+		
+    position = ((ds_xfrac<<10)&0xffff0000) | ((ds_yfrac>>6)&0xffff);
+    step = ((ds_xstep<<10)&0xffff0000) | ((ds_ystep>>6)&0xffff);
+		
+    source = ds_source;
+    colormap = ds_colormap;
+    dest = ylookup[ds_y] + columnofs[ds_x1];	 
+    count = ds_x2 - ds_x1 + 1; 
+	
+    while (count >= 4) 
+    { 
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[0] = colormap[source[spot]]; 
+
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[1] = colormap[source[spot]];
+	
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[2] = colormap[source[spot]];
+	
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	dest[3] = colormap[source[spot]]; 
+		
+	count -= 4;
+	dest += 4;
+    } 
+    while (count > 0) 
+    { 
+	ytemp = position>>4;
+	ytemp = ytemp & 4032;
+	xtemp = position>>26;
+	spot = xtemp | ytemp;
+	position += step;
+	*dest++ = colormap[source[spot]]; 
+	count--;
+    } 
+} 
+#endif
+
+
+//
+// Again..
+//
+void R_DrawSpanLow (void)
+{
+    unsigned int position, step;
+    unsigned int xtemp, ytemp;
+    byte *dest;
+    int count;
+    int spot;
+
+#ifdef RANGECHECK
+    if (ds_x2 < ds_x1
+	|| ds_x1<0
+	|| ds_x2>=SCREENWIDTH
+	|| (unsigned)ds_y>SCREENHEIGHT)
+    {
+	I_Error( "R_DrawSpan: %i to %i at %i",
+		 ds_x1,ds_x2,ds_y);
+    }
+//	dscount++; 
+#endif
+
+    position = ((ds_xfrac << 10) & 0xffff0000)
+             | ((ds_yfrac >> 6)  & 0x0000ffff);
+    step = ((ds_xstep << 10) & 0xffff0000)
+         | ((ds_ystep >> 6)  & 0x0000ffff);
+
+    count = (ds_x2 - ds_x1);
+
+    // Blocky mode, need to multiply by 2.
+    ds_x1 <<= 1;
+    ds_x2 <<= 1;
+
+    dest = ylookup[ds_y] + columnofs[ds_x1];
+
+    do
+    {
+	// Calculate current texture index in u,v.
+        ytemp = (position >> 4) & 0x0fc0;
+        xtemp = (position >> 26);
+        spot = xtemp | ytemp;
+
+	// Lowres/blocky mode does it twice,
+	//  while scale is adjusted appropriately.
+	*dest++ = ds_colormap[ds_source[spot]];
+	*dest++ = ds_colormap[ds_source[spot]];
+
+	position += step;
+
+    } while (count--);
+}
+
+//
+// R_InitBuffer 
+// Creats lookup tables that avoid
+//  multiplies and other hazzles
+//  for getting the framebuffer address
+//  of a pixel to draw.
+//
+void
+R_InitBuffer
+( int		width,
+  int		height ) 
+{ 
+    int		i; 
+
+    // Handle resize,
+    //  e.g. smaller view windows
+    //  with border and/or status bar.
+    viewwindowx = (SCREENWIDTH-width) >> 1; 
+
+    // Column offset. For windows.
+    for (i=0 ; i<width ; i++) 
+	columnofs[i] = viewwindowx + i;
+
+    // Samw with base row offset.
+    if (width == SCREENWIDTH) 
+	viewwindowy = 0; 
+    else 
+	viewwindowy = (SCREENHEIGHT-SBARHEIGHT-height) >> 1; 
+
+    // Preclaculate all row offsets.
+    for (i=0 ; i<height ; i++) 
+	ylookup[i] = I_VideoBuffer + (i+viewwindowy)*SCREENWIDTH; 
+} 
+ 
+ 
+
+
+//
+// R_FillBackScreen
+// Fills the back screen with a pattern
+//  for variable screen sizes
+// Also draws a beveled edge.
+//
+// haleyjd 08/29/10: [STRIFE] Added support for configurable back_flat.
+//
+void R_FillBackScreen (void) 
+{ 
+    byte*	src;
+    byte*	dest; 
+    int		x;
+    int		y; 
+    patch_t*	patch;
+
+    char *name;
+
+    // If we are running full screen, there is no need to do any of this,
+    // and the background buffer can be freed if it was previously in use.
+
+    if (scaledviewwidth == SCREENWIDTH)
+    {
+        if (background_buffer != NULL)
+        {
+            Z_Free(background_buffer);
+            background_buffer = NULL;
+        }
+
+	return;
+    }
+
+    // Allocate the background buffer if necessary
+	
+    if (background_buffer == NULL)
+    {
+        background_buffer = Z_Malloc(SCREENWIDTH * (SCREENHEIGHT - SBARHEIGHT),
+                                     PU_STATIC, NULL);
+    }
+
+    // haleyjd 08/29/10: [STRIFE] Use configurable back_flat
+    name = back_flat;
+    
+    src = W_CacheLumpName(name, PU_CACHE); 
+    dest = background_buffer;
+	 
+    for (y=0 ; y<SCREENHEIGHT-SBARHEIGHT ; y++) 
+    { 
+	for (x=0 ; x<SCREENWIDTH/64 ; x++) 
+	{ 
+	    memcpy (dest, src+((y&63)<<6), 64); 
+	    dest += 64; 
+	} 
+
+	if (SCREENWIDTH&63) 
+	{ 
+	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63); 
+	    dest += (SCREENWIDTH&63); 
+	} 
+    } 
+     
+    // Draw screen and bezel; this is done to a separate screen buffer.
+
+    V_UseBuffer(background_buffer);
+
+    patch = W_CacheLumpName(DEH_String("brdr_t"),PU_CACHE);
+
+    for (x=0 ; x<scaledviewwidth ; x+=8)
+	V_DrawPatch(viewwindowx+x, viewwindowy-8, patch);
+    patch = W_CacheLumpName(DEH_String("brdr_b"),PU_CACHE);
+
+    for (x=0 ; x<scaledviewwidth ; x+=8)
+	V_DrawPatch(viewwindowx+x, viewwindowy+viewheight, patch);
+    patch = W_CacheLumpName(DEH_String("brdr_l"),PU_CACHE);
+
+    for (y=0 ; y<viewheight ; y+=8)
+	V_DrawPatch(viewwindowx-8, viewwindowy+y, patch);
+    patch = W_CacheLumpName(DEH_String("brdr_r"),PU_CACHE);
+
+    for (y=0 ; y<viewheight ; y+=8)
+	V_DrawPatch(viewwindowx+scaledviewwidth, viewwindowy+y, patch);
+
+    // Draw beveled edge. 
+    V_DrawPatch(viewwindowx-8,
+                viewwindowy-8,
+                W_CacheLumpName(DEH_String("brdr_tl"),PU_CACHE));
+    
+    V_DrawPatch(viewwindowx+scaledviewwidth,
+                viewwindowy-8,
+                W_CacheLumpName(DEH_String("brdr_tr"),PU_CACHE));
+    
+    V_DrawPatch(viewwindowx-8,
+                viewwindowy+viewheight,
+                W_CacheLumpName(DEH_String("brdr_bl"),PU_CACHE));
+    
+    V_DrawPatch(viewwindowx+scaledviewwidth,
+                viewwindowy+viewheight,
+                W_CacheLumpName(DEH_String("brdr_br"),PU_CACHE));
+
+    V_RestoreBuffer();
+} 
+ 
+
+//
+// Copy a screen buffer.
+//
+void
+R_VideoErase
+( unsigned	ofs,
+  int		count ) 
+{ 
+  // LFB copy.
+  // This might not be a good idea if memcpy
+  //  is not optiomal, e.g. byte by byte on
+  //  a 32bit CPU, as GNU GCC/Linux libc did
+  //  at one point.
+
+    if (background_buffer != NULL)
+    {
+        memcpy(I_VideoBuffer + ofs, background_buffer + ofs, count); 
+    }
+} 
+
+
+//
+// R_DrawViewBorder
+// Draws the border around the view
+//  for different size windows?
+//
+void R_DrawViewBorder (void) 
+{ 
+    int		top;
+    int		side;
+    int		ofs;
+    int		i; 
+ 
+    if (scaledviewwidth == SCREENWIDTH) 
+	return; 
+  
+    top = ((SCREENHEIGHT-SBARHEIGHT)-viewheight)/2; 
+    side = (SCREENWIDTH-scaledviewwidth)/2; 
+ 
+    // copy top and one line of left side 
+    R_VideoErase (0, top*SCREENWIDTH+side); 
+ 
+    // copy one line of right side and bottom 
+    ofs = (viewheight+top)*SCREENWIDTH-side; 
+    R_VideoErase (ofs, top*SCREENWIDTH+side); 
+ 
+    // copy sides using wraparound 
+    ofs = top*SCREENWIDTH + SCREENWIDTH-side; 
+    side <<= 1;
+    
+    for (i=1 ; i<viewheight ; i++) 
+    { 
+	R_VideoErase (ofs, side); 
+	ofs += SCREENWIDTH; 
+    } 
+
+    // ? 
+    V_MarkRect (0,0,SCREENWIDTH, SCREENHEIGHT-SBARHEIGHT); 
+} 
+ 
+ 
diff --git a/games/NXDoom/src/strife/r_draw.h b/games/NXDoom/src/strife/r_draw.h
new file mode 100644
index 000000000..b5c35a2d2
--- /dev/null
+++ b/games/NXDoom/src/strife/r_draw.h
@@ -0,0 +1,111 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __R_DRAW__
+#define __R_DRAW__
+
+
+
+
+extern lighttable_t*	dc_colormap;
+extern int		dc_x;
+extern int		dc_yl;
+extern int		dc_yh;
+extern fixed_t		dc_iscale;
+extern fixed_t		dc_texturemid;
+
+// first pixel in a column
+extern byte*		dc_source;		
+
+
+// The span blitting interface.
+// Hook in assembler or system specific BLT
+//  here.
+void 	R_DrawColumn (void);
+void 	R_DrawColumnLow (void);
+
+// The Spectre/Invisibility effect.
+//void 	R_DrawFuzzColumn (void);
+//void 	R_DrawFuzzColumnLow (void);
+
+// Draw with color translation tables,
+//  for player sprite rendering,
+//  Green/Red/Blue/Indigo shirts.
+void	R_DrawTranslatedColumn (void);
+void	R_DrawTranslatedColumnLow (void);
+
+// villsa [STRIFE] - transclucent rendering
+void    R_DrawTLColumn (void);
+void    R_DrawMVisTLColumn (void);
+void    R_DrawTRTLColumn (void);
+
+void
+R_VideoErase
+( unsigned	ofs,
+  int		count );
+
+extern int		ds_y;
+extern int		ds_x1;
+extern int		ds_x2;
+
+extern lighttable_t*	ds_colormap;
+
+extern fixed_t		ds_xfrac;
+extern fixed_t		ds_yfrac;
+extern fixed_t		ds_xstep;
+extern fixed_t		ds_ystep;
+
+// start of a 64*64 tile image
+extern byte*		ds_source;		
+
+extern byte*		translationtables;
+extern byte*		dc_translation;
+extern byte*		xlatab;            // haleyjd 08/26/10: [STRIFE]
+
+extern char *back_flat; // haleyjd 08/29/10: [STRIFE]
+
+// Span blitting for rows, floor/ceiling.
+// No Sepctre effect needed.
+void 	R_DrawSpan (void);
+
+// Low resolution mode, 160x200?
+void 	R_DrawSpanLow (void);
+
+
+void
+R_InitBuffer
+( int		width,
+  int		height );
+
+
+// Initialize color translation tables,
+//  for player rendering etc.
+void	R_InitTranslationTables (void);
+
+
+
+// Rendering function.
+void R_FillBackScreen (void);
+
+// If the view size is not full screen, draws a border around it.
+void R_DrawViewBorder (void);
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_local.h b/games/NXDoom/src/strife/r_local.h
new file mode 100644
index 000000000..1b9249210
--- /dev/null
+++ b/games/NXDoom/src/strife/r_local.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh (R_*) module, global header.
+//	All the rendering/drawing stuff is here.
+//
+
+#ifndef __R_LOCAL__
+#define __R_LOCAL__
+
+// Binary Angles, sine/cosine/atan lookups.
+#include "tables.h"
+
+// Screen size related parameters.
+#include "doomdef.h"
+
+// Include the refresh/render data structs.
+#include "r_data.h"
+
+
+
+//
+// Separate header file for each module.
+//
+#include "r_main.h"
+#include "r_bsp.h"
+#include "r_segs.h"
+#include "r_plane.h"
+#include "r_data.h"
+#include "r_things.h"
+#include "r_draw.h"
+
+#endif		// __R_LOCAL__
diff --git a/games/NXDoom/src/strife/r_main.c b/games/NXDoom/src/strife/r_main.c
new file mode 100644
index 000000000..f940bb0df
--- /dev/null
+++ b/games/NXDoom/src/strife/r_main.c
@@ -0,0 +1,944 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Rendering main loop and setup functions,
+//	 utility functions (BSP, geometry, trigonometry).
+//	See tables.c, too.
+//
+
+
+
+
+
+#include <stdlib.h>
+#include <math.h>
+
+
+#include "doomdef.h"
+#include "doomstat.h"   // villsa [STRIFE]
+#include "d_main.h"
+
+#include "m_bbox.h"
+#include "m_menu.h"
+
+#include "r_local.h"
+#include "r_sky.h"
+
+
+
+
+
+// Fineangles in the SCREENWIDTH wide window.
+#define FIELDOFVIEW		2048	
+
+
+
+int			viewangleoffset;
+
+// increment every time a check is made
+int			validcount = 1;		
+
+
+lighttable_t*		fixedcolormap;
+
+int			centerx;
+int			centery;
+
+fixed_t			centerxfrac;
+fixed_t			centeryfrac;
+fixed_t			projection;
+
+// just for profiling purposes
+int			framecount;	
+
+int			sscount;
+int			linecount;
+int			loopcount;
+
+fixed_t			viewx;
+fixed_t			viewy;
+fixed_t			viewz;
+
+int                     viewpitch;  // villsa [STRIFE]
+
+angle_t			viewangle;
+
+fixed_t			viewcos;
+fixed_t			viewsin;
+
+player_t*		viewplayer;
+
+// 0 = high, 1 = low
+int			detailshift;	
+
+//
+// precalculated math tables
+//
+angle_t			clipangle;
+
+// The viewangletox[viewangle + FINEANGLES/4] lookup
+// maps the visible view angles to screen X coordinates,
+// flattening the arc to a flat projection plane.
+// There will be many angles mapped to the same X. 
+int			viewangletox[FINEANGLES/2];
+
+// The xtoviewangleangle[] table maps a screen pixel
+// to the lowest viewangle that maps back to x ranges
+// from clipangle to -clipangle.
+angle_t			xtoviewangle[SCREENWIDTH+1];
+
+lighttable_t*		scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+lighttable_t*		scalelightfixed[MAXLIGHTSCALE];
+lighttable_t*		zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+// bumped light from gun blasts
+int			extralight;			
+
+
+
+void (*colfunc) (void);
+void (*basecolfunc) (void);
+void (*fuzzcolfunc) (void);
+void (*transcolfunc) (void);
+void (*spanfunc) (void);
+
+
+
+//
+// R_AddPointToBox
+// Expand a given bbox
+// so that it encloses a given point.
+//
+void
+R_AddPointToBox
+( int		x,
+  int		y,
+  fixed_t*	box )
+{
+    if (x< box[BOXLEFT])
+	box[BOXLEFT] = x;
+    if (x> box[BOXRIGHT])
+	box[BOXRIGHT] = x;
+    if (y< box[BOXBOTTOM])
+	box[BOXBOTTOM] = y;
+    if (y> box[BOXTOP])
+	box[BOXTOP] = y;
+}
+
+
+//
+// R_PointOnSide
+// Traverse BSP (sub) tree,
+//  check point against partition plane.
+// Returns side 0 (front) or 1 (back).
+//
+int
+R_PointOnSide
+( fixed_t	x,
+  fixed_t	y,
+  node_t*	node )
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    if (!node->dx)
+    {
+	if (x <= node->x)
+	    return node->dy > 0;
+	
+	return node->dy < 0;
+    }
+    if (!node->dy)
+    {
+	if (y <= node->y)
+	    return node->dx < 0;
+	
+	return node->dx > 0;
+    }
+	
+    dx = (x - node->x);
+    dy = (y - node->y);
+	
+    // Try to quickly decide by looking at sign bits.
+    if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
+    {
+	if  ( (node->dy ^ dx) & 0x80000000 )
+	{
+	    // (left is negative)
+	    return 1;
+	}
+	return 0;
+    }
+
+    left = FixedMul ( node->dy>>FRACBITS , dx );
+    right = FixedMul ( dy , node->dx>>FRACBITS );
+	
+    if (right < left)
+    {
+	// front side
+	return 0;
+    }
+    // back side
+    return 1;			
+}
+
+
+int
+R_PointOnSegSide
+( fixed_t	x,
+  fixed_t	y,
+  seg_t*	line )
+{
+    fixed_t	lx;
+    fixed_t	ly;
+    fixed_t	ldx;
+    fixed_t	ldy;
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    lx = line->v1->x;
+    ly = line->v1->y;
+	
+    ldx = line->v2->x - lx;
+    ldy = line->v2->y - ly;
+	
+    if (!ldx)
+    {
+	if (x <= lx)
+	    return ldy > 0;
+	
+	return ldy < 0;
+    }
+    if (!ldy)
+    {
+	if (y <= ly)
+	    return ldx < 0;
+	
+	return ldx > 0;
+    }
+	
+    dx = (x - lx);
+    dy = (y - ly);
+	
+    // Try to quickly decide by looking at sign bits.
+    if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
+    {
+	if  ( (ldy ^ dx) & 0x80000000 )
+	{
+	    // (left is negative)
+	    return 1;
+	}
+	return 0;
+    }
+
+    left = FixedMul ( ldy>>FRACBITS , dx );
+    right = FixedMul ( dy , ldx>>FRACBITS );
+	
+    if (right < left)
+    {
+	// front side
+	return 0;
+    }
+    // back side
+    return 1;			
+}
+
+
+//
+// R_PointToAngle
+// To get a global angle from cartesian coordinates,
+//  the coordinates are flipped until they are in
+//  the first octant of the coordinate system, then
+//  the y (<=x) is scaled and divided by x to get a
+//  tangent (slope) value which is looked up in the
+//  tantoangle[] table.
+
+//
+
+
+
+
+angle_t
+R_PointToAngle
+( fixed_t	x,
+  fixed_t	y )
+{	
+    x -= viewx;
+    y -= viewy;
+    
+    if ( (!x) && (!y) )
+	return 0;
+
+    if (x>= 0)
+    {
+	// x >=0
+	if (y>= 0)
+	{
+	    // y>= 0
+
+	    if (x>y)
+	    {
+		// octant 0
+		return tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 1
+		return ANG90-1-tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+	else
+	{
+	    // y<0
+	    y = -y;
+
+	    if (x>y)
+	    {
+		// octant 8
+		return 0 - tantoangle[SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 7
+		return ANG270+tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+    }
+    else
+    {
+	// x<0
+	x = -x;
+
+	if (y>= 0)
+	{
+	    // y>= 0
+	    if (x>y)
+	    {
+		// octant 3
+		return ANG180-1-tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 2
+		return ANG90+ tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+	else
+	{
+	    // y<0
+	    y = -y;
+
+	    if (x>y)
+	    {
+		// octant 4
+		return ANG180+tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		 // octant 5
+		return ANG270-1-tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+    }
+    return 0;
+}
+
+
+angle_t
+R_PointToAngle2
+( fixed_t	x1,
+  fixed_t	y1,
+  fixed_t	x2,
+  fixed_t	y2 )
+{	
+    viewx = x1;
+    viewy = y1;
+    
+    return R_PointToAngle (x2, y2);
+}
+
+
+fixed_t
+R_PointToDist
+( fixed_t	x,
+  fixed_t	y )
+{
+    int		angle;
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	temp;
+    fixed_t	dist;
+    fixed_t     frac;
+	
+    dx = abs(x - viewx);
+    dy = abs(y - viewy);
+	
+    if (dy>dx)
+    {
+	temp = dx;
+	dx = dy;
+	dy = temp;
+    }
+
+    // Fix crashes in udm1.wad
+
+    if (dx != 0)
+    {
+        frac = FixedDiv(dy, dx);
+    }
+    else
+    {
+	frac = 0;
+    }
+	
+    angle = (tantoangle[frac>>DBITS]+ANG90) >> ANGLETOFINESHIFT;
+
+    // use as cosine
+    dist = FixedDiv (dx, finesine[angle] );	
+	
+    return dist;
+}
+
+
+
+
+//
+// R_InitPointToAngle
+//
+void R_InitPointToAngle (void)
+{
+    // UNUSED - now getting from tables.c
+#if 0
+    int	i;
+    long	t;
+    float	f;
+//
+// slope (tangent) to angle lookup
+//
+    for (i=0 ; i<=SLOPERANGE ; i++)
+    {
+	f = atan( (float)i/SLOPERANGE )/(3.141592657*2);
+	t = 0xffffffff*f;
+	tantoangle[i] = t;
+    }
+#endif
+}
+
+
+//
+// R_ScaleFromGlobalAngle
+// Returns the texture mapping scale
+//  for the current line (horizontal span)
+//  at the given angle.
+// rw_distance must be calculated first.
+//
+fixed_t R_ScaleFromGlobalAngle (angle_t visangle)
+{
+    fixed_t		scale;
+    angle_t		anglea;
+    angle_t		angleb;
+    int			sinea;
+    int			sineb;
+    fixed_t		num;
+    int			den;
+
+    // UNUSED
+#if 0
+{
+    fixed_t		dist;
+    fixed_t		z;
+    fixed_t		sinv;
+    fixed_t		cosv;
+	
+    sinv = finesine[(visangle-rw_normalangle)>>ANGLETOFINESHIFT];	
+    dist = FixedDiv (rw_distance, sinv);
+    cosv = finecosine[(viewangle-visangle)>>ANGLETOFINESHIFT];
+    z = abs(FixedMul (dist, cosv));
+    scale = FixedDiv(projection, z);
+    return scale;
+}
+#endif
+
+    anglea = ANG90 + (visangle-viewangle);
+    angleb = ANG90 + (visangle-rw_normalangle);
+
+    // both sines are allways positive
+    sinea = finesine[anglea>>ANGLETOFINESHIFT];	
+    sineb = finesine[angleb>>ANGLETOFINESHIFT];
+    num = FixedMul(projection,sineb)<<detailshift;
+    den = FixedMul(rw_distance,sinea);
+
+    if (den > num>>16)
+    {
+	scale = FixedDiv (num, den);
+
+	if (scale > 64*FRACUNIT)
+	    scale = 64*FRACUNIT;
+	else if (scale < 256)
+	    scale = 256;
+    }
+    else
+	scale = 64*FRACUNIT;
+	
+    return scale;
+}
+
+
+
+//
+// R_InitTables
+//
+void R_InitTables (void)
+{
+    // UNUSED: now getting from tables.c
+#if 0
+    int		i;
+    float	a;
+    float	fv;
+    int		t;
+    
+    // viewangle tangent table
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	a = (i-FINEANGLES/4+0.5)*PI*2/FINEANGLES;
+	fv = FRACUNIT*tan (a);
+	t = fv;
+	finetangent[i] = t;
+    }
+    
+    // finesine table
+    for (i=0 ; i<5*FINEANGLES/4 ; i++)
+    {
+	// OPTIMIZE: mirror...
+	a = (i+0.5)*PI*2/FINEANGLES;
+	t = FRACUNIT*sin (a);
+	finesine[i] = t;
+    }
+#endif
+
+}
+
+
+
+//
+// R_InitTextureMapping
+//
+void R_InitTextureMapping (void)
+{
+    int			i;
+    int			x;
+    int			t;
+    fixed_t		focallength;
+    
+    // Use tangent table to generate viewangletox:
+    //  viewangletox will give the next greatest x
+    //  after the view angle.
+    //
+    // Calc focallength
+    //  so FIELDOFVIEW angles covers SCREENWIDTH.
+    focallength = FixedDiv (centerxfrac,
+			    finetangent[FINEANGLES/4+FIELDOFVIEW/2] );
+	
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	if (finetangent[i] > FRACUNIT*2)
+	    t = -1;
+	else if (finetangent[i] < -FRACUNIT*2)
+	    t = viewwidth+1;
+	else
+	{
+	    t = FixedMul (finetangent[i], focallength);
+	    t = (centerxfrac - t+FRACUNIT-1)>>FRACBITS;
+
+	    if (t < -1)
+		t = -1;
+	    else if (t>viewwidth+1)
+		t = viewwidth+1;
+	}
+	viewangletox[i] = t;
+    }
+    
+    // Scan viewangletox[] to generate xtoviewangle[]:
+    //  xtoviewangle will give the smallest view angle
+    //  that maps to x.	
+    for (x=0;x<=viewwidth;x++)
+    {
+	i = 0;
+	while (viewangletox[i]>x)
+	    i++;
+	xtoviewangle[x] = (i<<ANGLETOFINESHIFT)-ANG90;
+    }
+    
+    // Take out the fencepost cases from viewangletox.
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	t = FixedMul (finetangent[i], focallength);
+	t = centerx - t;
+	
+	if (viewangletox[i] == -1)
+	    viewangletox[i] = 0;
+	else if (viewangletox[i] == viewwidth+1)
+	    viewangletox[i]  = viewwidth;
+    }
+	
+    clipangle = xtoviewangle[0];
+}
+
+
+
+//
+// R_InitLightTables
+// Only inits the zlight table,
+//  because the scalelight table changes with view size.
+//
+#define DISTMAP		2
+
+void R_InitLightTables (void)
+{
+    int		i;
+    int		j;
+    int		level;
+    int		startmap; 	
+    int		scale;
+    
+    // Calculate the light levels to use
+    //  for each level / distance combination.
+    for (i=0 ; i< LIGHTLEVELS ; i++)
+    {
+	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
+	for (j=0 ; j<MAXLIGHTZ ; j++)
+	{
+	    scale = FixedDiv ((SCREENWIDTH/2*FRACUNIT), (j+1)<<LIGHTZSHIFT);
+	    scale >>= LIGHTSCALESHIFT;
+	    level = startmap - scale/DISTMAP;
+	    
+	    if (level < 0)
+		level = 0;
+
+	    if (level >= NUMCOLORMAPS)
+		level = NUMCOLORMAPS-1;
+
+	    zlight[i][j] = colormaps + level*256;
+	}
+    }
+}
+
+
+
+//
+// R_SetViewSize
+// Do not really change anything here,
+//  because it might be in the middle of a refresh.
+// The change will take effect next refresh.
+//
+boolean		setsizeneeded;
+int		setblocks;
+int		setdetail;
+
+
+void
+R_SetViewSize
+( int		blocks,
+  int		detail )
+{
+    setsizeneeded = true;
+    setblocks = blocks;
+    setdetail = detail;
+}
+
+
+//
+// R_ExecuteSetViewSize
+//
+void R_ExecuteSetViewSize (void)
+{
+    fixed_t	cosadj;
+    fixed_t	dy;
+    int		i;
+    int		j;
+    int		level;
+    int		startmap; 	
+
+    setsizeneeded = false;
+
+    if (setblocks == 11)
+    {
+	scaledviewwidth = SCREENWIDTH;
+	viewheight = SCREENHEIGHT;
+    }
+    else
+    {
+	scaledviewwidth = setblocks*32;
+	viewheight = (setblocks*168/10)&~7;
+    }
+    
+    detailshift = setdetail;
+    viewwidth = scaledviewwidth>>detailshift;
+	
+    // villsa [STRIFE] calculate centery from player's pitch
+    centery = (setblocks*players[consoleplayer].pitch);
+    centery = (unsigned int)(centery/10)+viewheight/2;
+
+    centerx = viewwidth/2;
+    centerxfrac = centerx<<FRACBITS;
+    centeryfrac = centery<<FRACBITS;
+    projection = centerxfrac;
+
+    //if (!detailshift) // villsa [STRIFE]
+    {
+	colfunc = basecolfunc = R_DrawColumn;
+	fuzzcolfunc = R_DrawTLColumn;   // villsa [STRIFE]
+	transcolfunc = R_DrawTranslatedColumn;
+	spanfunc = R_DrawSpan;
+    }
+    // villsa [STRIFE] unused detail stuff
+    /*else
+    {
+	colfunc = basecolfunc = R_DrawColumnLow;
+	fuzzcolfunc = R_DrawFuzzColumnLow;
+	transcolfunc = R_DrawTranslatedColumnLow;
+	spanfunc = R_DrawSpanLow;
+    }*/
+
+    R_InitBuffer (scaledviewwidth, viewheight);
+	
+    R_InitTextureMapping ();
+    
+    // psprite scales
+    pspritescale = FRACUNIT*viewwidth/SCREENWIDTH;
+    pspriteiscale = FRACUNIT*SCREENWIDTH/viewwidth;
+    
+    // thing clipping
+    for (i=0 ; i<viewwidth ; i++)
+	screenheightarray[i] = viewheight;
+    
+    // planes
+    for (i=0 ; i<viewheight ; i++)
+    {
+	// haleyjd 20120208: [STRIFE] viewheight/2 -> centery, accounts for up/down look
+        dy = ((i - centery)<<FRACBITS) + FRACUNIT/2;
+	dy = abs(dy);
+	yslope[i] = FixedDiv ( (viewwidth<<detailshift)/2*FRACUNIT, dy);
+    }
+	
+    for (i=0 ; i<viewwidth ; i++)
+    {
+	cosadj = abs(finecosine[xtoviewangle[i]>>ANGLETOFINESHIFT]);
+	distscale[i] = FixedDiv (FRACUNIT,cosadj);
+    }
+    
+    // Calculate the light levels to use
+    //  for each level / scale combination.
+    for (i=0 ; i< LIGHTLEVELS ; i++)
+    {
+	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
+	for (j=0 ; j<MAXLIGHTSCALE ; j++)
+	{
+	    level = startmap - j*SCREENWIDTH/(viewwidth<<detailshift)/DISTMAP;
+	    
+	    if (level < 0)
+		level = 0;
+
+	    if (level >= NUMCOLORMAPS)
+		level = NUMCOLORMAPS-1;
+
+	    scalelight[i][j] = colormaps + level*256;
+	}
+    }
+}
+
+
+
+//
+// R_Init
+//
+
+
+
+void R_Init (void)
+{
+    R_InitData ();
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick(); // [STRIFE] tick intro
+
+    R_InitPointToAngle ();
+    if(devparm)
+        printf (".");
+
+    R_InitTables ();
+    // viewwidth / viewheight / detailLevel are set by the defaults
+    if(devparm)
+        printf (".");
+
+    R_SetViewSize (screenblocks, detailLevel);
+    R_InitPlanes ();
+    if(devparm)
+        printf (".");
+    
+    R_InitLightTables ();
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick();
+    
+    R_InitSkyMap ();
+    if(!devparm)
+        D_IntroTick();
+
+    R_InitTranslationTables ();
+    if(devparm)
+        printf (".");
+    else
+        D_IntroTick();
+
+    framecount = 0;
+}
+
+
+//
+// R_PointInSubsector
+//
+subsector_t*
+R_PointInSubsector
+( fixed_t	x,
+  fixed_t	y )
+{
+    node_t*	node;
+    int		side;
+    int		nodenum;
+
+    // single subsector is a special case
+    if (!numnodes)				
+	return subsectors;
+		
+    nodenum = numnodes-1;
+
+    while (! (nodenum & NF_SUBSECTOR) )
+    {
+	node = &nodes[nodenum];
+	side = R_PointOnSide (x, y, node);
+	nodenum = node->children[side];
+    }
+	
+    return &subsectors[nodenum & ~NF_SUBSECTOR];
+}
+
+//
+// R_SetupPitch
+// villsa [STRIFE] new function
+// Calculate centery/centeryfrac for player viewpitch
+//
+
+void R_SetupPitch(player_t* player)
+{
+    int pitchfrac;
+    int i = 0;
+
+    if(viewpitch != player->pitch)
+    {
+        viewpitch   = player->pitch;
+        pitchfrac   = (setblocks * player->pitch) / 10;
+        centery     = pitchfrac + viewheight / 2;
+        centeryfrac = centery << FRACBITS;
+
+        for(i = 0; i < viewheight; i++)
+        {
+            yslope[i] = FixedDiv(viewwidth / 2 * FRACUNIT,
+                                 abs(((i - centery) << FRACBITS) + (FRACUNIT/2)));
+        }
+    }
+}
+
+
+//
+// R_SetupFrame
+//
+void R_SetupFrame (player_t* player)
+{		
+    int		i;
+    
+    R_SetupPitch(player);  // villsa [STRIFE]
+
+    viewplayer = player;
+    viewx = player->mo->x;
+    viewy = player->mo->y;
+    viewangle = player->mo->angle + viewangleoffset;
+    extralight = player->extralight;
+
+    viewz = player->viewz;
+    
+    viewsin = finesine[viewangle>>ANGLETOFINESHIFT];
+    viewcos = finecosine[viewangle>>ANGLETOFINESHIFT];
+	
+    sscount = 0;
+	
+    if (player->fixedcolormap)
+    {
+	fixedcolormap =
+	    colormaps
+	    + player->fixedcolormap*256*sizeof(lighttable_t);
+	
+	walllights = scalelightfixed;
+
+	for (i=0 ; i<MAXLIGHTSCALE ; i++)
+	    scalelightfixed[i] = fixedcolormap;
+    }
+    else
+	fixedcolormap = 0;
+		
+    framecount++;
+    validcount++;
+}
+
+
+
+//
+// R_RenderView
+//
+void R_RenderPlayerView (player_t* player)
+{	
+    R_SetupFrame (player);
+
+    // Clear buffers.
+    R_ClearClipSegs ();
+    R_ClearDrawSegs ();
+    R_ClearPlanes ();
+    R_ClearSprites ();
+    
+    // check for new console commands.
+    NetUpdate ();
+
+    // The head node is the last node output.
+    R_RenderBSPNode (numnodes-1);
+    
+    // Check for new console commands.
+    NetUpdate ();
+    
+    R_DrawPlanes ();
+    
+    // Check for new console commands.
+    NetUpdate ();
+    
+    R_DrawMasked ();
+
+    // Check for new console commands.
+    NetUpdate ();				
+}
diff --git a/games/NXDoom/src/strife/r_main.h b/games/NXDoom/src/strife/r_main.h
new file mode 100644
index 000000000..5a79bc622
--- /dev/null
+++ b/games/NXDoom/src/strife/r_main.h
@@ -0,0 +1,164 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+
+
+#ifndef __R_MAIN__
+#define __R_MAIN__
+
+#include "d_player.h"
+#include "r_data.h"
+
+
+
+
+//
+// POV related.
+//
+extern fixed_t		viewcos;
+extern fixed_t		viewsin;
+
+extern int		viewwindowx;
+extern int		viewwindowy;
+
+extern boolean setsizeneeded;
+
+
+extern int		centerx;
+extern int		centery;
+
+extern fixed_t		centerxfrac;
+extern fixed_t		centeryfrac;
+extern fixed_t		projection;
+
+extern int		validcount;
+
+extern int		linecount;
+extern int		loopcount;
+
+
+//
+// Lighting LUT.
+// Used for z-depth cuing per column/row,
+//  and other lighting effects (sector ambient, flash).
+//
+
+// Lighting constants.
+// Now why not 32 levels here?
+#define LIGHTLEVELS	        16
+#define LIGHTSEGSHIFT	         4
+
+#define MAXLIGHTSCALE		48
+#define LIGHTSCALESHIFT		12
+#define MAXLIGHTZ	       128
+#define LIGHTZSHIFT		20
+
+extern lighttable_t*	scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+extern lighttable_t*	scalelightfixed[MAXLIGHTSCALE];
+extern lighttable_t*	zlight[LIGHTLEVELS][MAXLIGHTZ];
+
+extern int		extralight;
+extern lighttable_t*	fixedcolormap;
+
+
+// Number of diminishing brightness levels.
+// There a 0-31, i.e. 32 LUT in the COLORMAP lump.
+#define NUMCOLORMAPS		32
+
+
+// Blocky/low detail mode.
+//B remove this?
+//  0 = high, 1 = low
+extern	int		detailshift;	
+
+
+//
+// Function pointers to switch refresh/drawing functions.
+// Used to select shadow mode etc.
+//
+extern void		(*colfunc) (void);
+extern void		(*transcolfunc) (void);
+extern void		(*basecolfunc) (void);
+extern void		(*fuzzcolfunc) (void);
+// No shadow effects on floors.
+extern void		(*spanfunc) (void);
+
+
+//
+// Utility functions.
+int
+R_PointOnSide
+( fixed_t	x,
+  fixed_t	y,
+  node_t*	node );
+
+int
+R_PointOnSegSide
+( fixed_t	x,
+  fixed_t	y,
+  seg_t*	line );
+
+angle_t
+R_PointToAngle
+( fixed_t	x,
+  fixed_t	y );
+
+angle_t
+R_PointToAngle2
+( fixed_t	x1,
+  fixed_t	y1,
+  fixed_t	x2,
+  fixed_t	y2 );
+
+fixed_t
+R_PointToDist
+( fixed_t	x,
+  fixed_t	y );
+
+
+fixed_t R_ScaleFromGlobalAngle (angle_t visangle);
+
+subsector_t*
+R_PointInSubsector
+( fixed_t	x,
+  fixed_t	y );
+
+void
+R_AddPointToBox
+( int		x,
+  int		y,
+  fixed_t*	box );
+
+
+
+//
+// REFRESH - the actual rendering functions.
+//
+
+// Called by G_Drawer.
+void R_RenderPlayerView (player_t *player);
+
+// Called by startup code.
+void R_Init (void);
+
+// Called by M_Responder.
+void R_SetViewSize (int blocks, int detail);
+
+void R_ExecuteSetViewSize(void);
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_plane.c b/games/NXDoom/src/strife/r_plane.c
new file mode 100644
index 000000000..5bc643cbc
--- /dev/null
+++ b/games/NXDoom/src/strife/r_plane.c
@@ -0,0 +1,447 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Here is a core component: drawing the floors and ceilings,
+//	 while maintaining a per column clipping list only.
+//	Moreover, the sky areas have to be determined.
+//
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "r_local.h"
+#include "r_sky.h"
+
+
+
+planefunction_t		floorfunc;
+planefunction_t		ceilingfunc;
+
+//
+// opening
+//
+
+// Here comes the obnoxious "visplane".
+// haleyjd 08/29/10: [STRIFE] MAXVISPLANES increased to 200
+#define MAXVISPLANES	200
+visplane_t		visplanes[MAXVISPLANES];
+visplane_t*		lastvisplane;
+visplane_t*		floorplane;
+visplane_t*		ceilingplane;
+
+// ?
+#define MAXOPENINGS	SCREENWIDTH*64
+short			openings[MAXOPENINGS];
+short*			lastopening;
+
+
+//
+// Clip values are the solid pixel bounding the range.
+//  floorclip starts out SCREENHEIGHT
+//  ceilingclip starts out -1
+//
+short			floorclip[SCREENWIDTH];
+short			ceilingclip[SCREENWIDTH];
+
+//
+// spanstart holds the start of a plane span
+// initialized to 0 at start
+//
+int			spanstart[SCREENHEIGHT];
+int			spanstop[SCREENHEIGHT];
+
+//
+// texture mapping
+//
+lighttable_t**		planezlight;
+fixed_t			planeheight;
+
+fixed_t			yslope[SCREENHEIGHT];
+fixed_t			distscale[SCREENWIDTH];
+fixed_t			basexscale;
+fixed_t			baseyscale;
+
+fixed_t			cachedheight[SCREENHEIGHT];
+fixed_t			cacheddistance[SCREENHEIGHT];
+fixed_t			cachedxstep[SCREENHEIGHT];
+fixed_t			cachedystep[SCREENHEIGHT];
+
+
+
+//
+// R_InitPlanes
+// Only at game startup.
+//
+void R_InitPlanes (void)
+{
+  // Doh!
+}
+
+
+//
+// R_MapPlane
+//
+// Uses global vars:
+//  planeheight
+//  ds_source
+//  basexscale
+//  baseyscale
+//  viewx
+//  viewy
+//
+// BASIC PRIMITIVE
+//
+void
+R_MapPlane
+( int		y,
+  int		x1,
+  int		x2 )
+{
+    angle_t	angle;
+    fixed_t	distance;
+    fixed_t	length;
+    unsigned	index;
+	
+#ifdef RANGECHECK
+    if (x2 < x1
+     || x1 < 0
+     || x2 >= viewwidth
+     || y > viewheight)
+    {
+	I_Error ("R_MapPlane: %i, %i at %i",x1,x2,y);
+    }
+#endif
+
+    if (planeheight != cachedheight[y])
+    {
+	cachedheight[y] = planeheight;
+	distance = cacheddistance[y] = FixedMul (planeheight, yslope[y]);
+	ds_xstep = cachedxstep[y] = FixedMul (distance,basexscale);
+	ds_ystep = cachedystep[y] = FixedMul (distance,baseyscale);
+    }
+    else
+    {
+	distance = cacheddistance[y];
+	ds_xstep = cachedxstep[y];
+	ds_ystep = cachedystep[y];
+    }
+	
+    length = FixedMul (distance,distscale[x1]);
+    angle = (viewangle + xtoviewangle[x1])>>ANGLETOFINESHIFT;
+    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
+    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
+
+    if (fixedcolormap)
+	ds_colormap = fixedcolormap;
+    else
+    {
+	index = distance >> LIGHTZSHIFT;
+	
+	if (index >= MAXLIGHTZ )
+	    index = MAXLIGHTZ-1;
+
+	ds_colormap = planezlight[index];
+    }
+	
+    ds_y = y;
+    ds_x1 = x1;
+    ds_x2 = x2;
+
+    // high or low detail
+    spanfunc ();	
+}
+
+
+//
+// R_ClearPlanes
+// At begining of frame.
+//
+void R_ClearPlanes (void)
+{
+    int		i;
+    angle_t	angle;
+    
+    // opening / clipping determination
+    for (i=0 ; i<viewwidth ; i++)
+    {
+	floorclip[i] = viewheight;
+	ceilingclip[i] = -1;
+    }
+
+    lastvisplane = visplanes;
+    lastopening = openings;
+    
+    // texture calculation
+    memset (cachedheight, 0, sizeof(cachedheight));
+
+    // left to right mapping
+    angle = (viewangle-ANG90)>>ANGLETOFINESHIFT;
+	
+    // scale will be unit scale at SCREENWIDTH/2 distance
+    basexscale = FixedDiv (finecosine[angle],centerxfrac);
+    baseyscale = -FixedDiv (finesine[angle],centerxfrac);
+}
+
+
+
+
+//
+// R_FindPlane
+//
+visplane_t*
+R_FindPlane
+( fixed_t	height,
+  int		picnum,
+  int		lightlevel )
+{
+    visplane_t*	check;
+	
+    if (picnum == skyflatnum)
+    {
+	height = 0;			// all skys map together
+	lightlevel = 0;
+    }
+	
+    for (check=visplanes; check<lastvisplane; check++)
+    {
+	if (height == check->height
+	    && picnum == check->picnum
+	    && lightlevel == check->lightlevel)
+	{
+	    break;
+	}
+    }
+    
+			
+    if (check < lastvisplane)
+	return check;
+		
+    if (lastvisplane - visplanes == MAXVISPLANES)
+	I_Error ("R_FindPlane: no more visplanes");
+		
+    lastvisplane++;
+
+    check->height = height;
+    check->picnum = picnum;
+    check->lightlevel = lightlevel;
+    check->minx = SCREENWIDTH;
+    check->maxx = -1;
+    
+    memset (check->top,0xff,sizeof(check->top));
+		
+    return check;
+}
+
+
+//
+// R_CheckPlane
+//
+visplane_t*
+R_CheckPlane
+( visplane_t*	pl,
+  int		start,
+  int		stop )
+{
+    int		intrl;
+    int		intrh;
+    int		unionl;
+    int		unionh;
+    int		x;
+	
+    if (start < pl->minx)
+    {
+	intrl = pl->minx;
+	unionl = start;
+    }
+    else
+    {
+	unionl = pl->minx;
+	intrl = start;
+    }
+	
+    if (stop > pl->maxx)
+    {
+	intrh = pl->maxx;
+	unionh = stop;
+    }
+    else
+    {
+	unionh = pl->maxx;
+	intrh = stop;
+    }
+
+    for (x=intrl ; x<= intrh ; x++)
+	if (pl->top[x] != 0xff)
+	    break;
+
+    if (x > intrh)
+    {
+	pl->minx = unionl;
+	pl->maxx = unionh;
+
+	// use the same one
+	return pl;		
+    }
+	
+    // make a new visplane
+    lastvisplane->height = pl->height;
+    lastvisplane->picnum = pl->picnum;
+    lastvisplane->lightlevel = pl->lightlevel;
+    
+    pl = lastvisplane++;
+    pl->minx = start;
+    pl->maxx = stop;
+
+    memset (pl->top,0xff,sizeof(pl->top));
+		
+    return pl;
+}
+
+
+//
+// R_MakeSpans
+//
+void
+R_MakeSpans
+( int		x,
+  int		t1,
+  int		b1,
+  int		t2,
+  int		b2 )
+{
+    while (t1 < t2 && t1<=b1)
+    {
+	R_MapPlane (t1,spanstart[t1],x-1);
+	t1++;
+    }
+    while (b1 > b2 && b1>=t1)
+    {
+	R_MapPlane (b1,spanstart[b1],x-1);
+	b1--;
+    }
+	
+    while (t2 < t1 && t2<=b2)
+    {
+	spanstart[t2] = x;
+	t2++;
+    }
+    while (b2 > b1 && b2>=t2)
+    {
+	spanstart[b2] = x;
+	b2--;
+    }
+}
+
+
+
+//
+// R_DrawPlanes
+// At the end of each frame.
+//
+void R_DrawPlanes (void)
+{
+    visplane_t*		pl;
+    int			light;
+    int			x;
+    int			stop;
+    int			angle;
+    int                 lumpnum;
+				
+#ifdef RANGECHECK
+    if (ds_p - drawsegs > MAXDRAWSEGS)
+	I_Error ("R_DrawPlanes: drawsegs overflow (%td)",
+		 ds_p - drawsegs);
+    
+    if (lastvisplane - visplanes > MAXVISPLANES)
+	I_Error ("R_DrawPlanes: visplane overflow (%td)",
+		 lastvisplane - visplanes);
+    
+    if (lastopening - openings > MAXOPENINGS)
+	I_Error ("R_DrawPlanes: opening overflow (%td)",
+		 lastopening - openings);
+#endif
+
+    for (pl = visplanes ; pl < lastvisplane ; pl++)
+    {
+	if (pl->minx > pl->maxx)
+	    continue;
+
+	
+	// sky flat
+	if (pl->picnum == skyflatnum)
+	{
+	    dc_iscale = pspriteiscale>>detailshift;
+	    
+	    // Sky is allways drawn full bright,
+	    //  i.e. colormaps[0] is used.
+	    // Because of this hack, sky is not affected
+	    //  by INVUL inverse mapping.
+	    dc_colormap = colormaps;
+	    dc_texturemid = skytexturemid;
+	    for (x=pl->minx ; x <= pl->maxx ; x++)
+	    {
+		dc_yl = pl->top[x];
+		dc_yh = pl->bottom[x];
+
+		if (dc_yl <= dc_yh)
+		{
+		    angle = (viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
+		    dc_x = x;
+		    dc_source = R_GetColumn(skytexture, angle);
+		    colfunc ();
+		}
+	    }
+	    continue;
+	}
+	
+	// regular flat
+        lumpnum = firstflat + flattranslation[pl->picnum];
+	ds_source = W_CacheLumpNum(lumpnum, PU_STATIC);
+	
+	planeheight = abs(pl->height-viewz);
+	light = (pl->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+	if (light >= LIGHTLEVELS)
+	    light = LIGHTLEVELS-1;
+
+	if (light < 0)
+	    light = 0;
+
+	planezlight = zlight[light];
+
+	pl->top[pl->maxx+1] = 0xff;
+	pl->top[pl->minx-1] = 0xff;
+		
+	stop = pl->maxx + 1;
+
+	for (x=pl->minx ; x<= stop ; x++)
+	{
+	    R_MakeSpans(x,pl->top[x-1],
+			pl->bottom[x-1],
+			pl->top[x],
+			pl->bottom[x]);
+	}
+	
+        W_ReleaseLumpNum(lumpnum);
+    }
+}
diff --git a/games/NXDoom/src/strife/r_plane.h b/games/NXDoom/src/strife/r_plane.h
new file mode 100644
index 000000000..57b50e5bc
--- /dev/null
+++ b/games/NXDoom/src/strife/r_plane.h
@@ -0,0 +1,76 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh, visplane stuff (floor, ceilings).
+//
+
+
+#ifndef __R_PLANE__
+#define __R_PLANE__
+
+
+#include "r_data.h"
+
+
+
+// Visplane related.
+extern  short*		lastopening;
+
+
+typedef void (*planefunction_t) (int top, int bottom);
+
+extern planefunction_t	floorfunc;
+extern planefunction_t	ceilingfunc_t;
+
+extern short		floorclip[SCREENWIDTH];
+extern short		ceilingclip[SCREENWIDTH];
+
+extern fixed_t		yslope[SCREENHEIGHT];
+extern fixed_t		distscale[SCREENWIDTH];
+
+void R_InitPlanes (void);
+void R_ClearPlanes (void);
+
+void
+R_MapPlane
+( int		y,
+  int		x1,
+  int		x2 );
+
+void
+R_MakeSpans
+( int		x,
+  int		t1,
+  int		b1,
+  int		t2,
+  int		b2 );
+
+void R_DrawPlanes (void);
+
+visplane_t*
+R_FindPlane
+( fixed_t	height,
+  int		picnum,
+  int		lightlevel );
+
+visplane_t*
+R_CheckPlane
+( visplane_t*	pl,
+  int		start,
+  int		stop );
+
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_segs.c b/games/NXDoom/src/strife/r_segs.c
new file mode 100644
index 000000000..179565035
--- /dev/null
+++ b/games/NXDoom/src/strife/r_segs.c
@@ -0,0 +1,754 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	All the clipping: columns, horizontal spans, sky columns.
+//
+
+
+
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "i_system.h"
+
+#include "doomdef.h"
+#include "doomstat.h"
+
+#include "r_local.h"
+#include "r_sky.h"
+
+
+// OPTIMIZE: closed two sided lines as single sided
+
+// True if any of the segs textures might be visible.
+boolean		segtextured;	
+
+// False if the back side is the same plane.
+boolean		markfloor;	
+boolean		markceiling;
+
+boolean		maskedtexture;
+int		toptexture;
+int		bottomtexture;
+int		midtexture;
+
+
+angle_t		rw_normalangle;
+// angle to line origin
+int		rw_angle1;	
+
+//
+// regular wall
+//
+int		rw_x;
+int		rw_stopx;
+angle_t		rw_centerangle;
+fixed_t		rw_offset;
+fixed_t		rw_distance;
+fixed_t		rw_scale;
+fixed_t		rw_scalestep;
+fixed_t		rw_midtexturemid;
+fixed_t		rw_toptexturemid;
+fixed_t		rw_bottomtexturemid;
+
+int		worldtop;
+int		worldbottom;
+int		worldhigh;
+int		worldlow;
+
+fixed_t		pixhigh;
+fixed_t		pixlow;
+fixed_t		pixhighstep;
+fixed_t		pixlowstep;
+
+fixed_t		topfrac;
+fixed_t		topstep;
+
+fixed_t		bottomfrac;
+fixed_t		bottomstep;
+
+
+lighttable_t**	walllights;
+
+short*		maskedtexturecol;
+
+
+
+//
+// R_RenderMaskedSegRange
+//
+void
+R_RenderMaskedSegRange
+( drawseg_t*	ds,
+  int		x1,
+  int		x2 )
+{
+    unsigned	index;
+    column_t*	col;
+    int		lightnum;
+    int		texnum;
+    
+    // Calculate light table.
+    // Use different light tables
+    //   for horizontal / vertical / diagonal. Diagonal?
+    // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+    curline = ds->curline;
+    frontsector = curline->frontsector;
+    backsector = curline->backsector;
+    texnum = texturetranslation[curline->sidedef->midtexture];
+	
+    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+    if (curline->v1->y == curline->v2->y)
+	lightnum--;
+    else if (curline->v1->x == curline->v2->x)
+	lightnum++;
+
+    if (lightnum < 0)		
+	walllights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+	walllights = scalelight[LIGHTLEVELS-1];
+    else
+	walllights = scalelight[lightnum];
+
+    maskedtexturecol = ds->maskedtexturecol;
+
+    rw_scalestep = ds->scalestep;		
+    spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
+    mfloorclip = ds->sprbottomclip;
+    mceilingclip = ds->sprtopclip;
+    
+    // find positioning
+    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
+    {
+	dc_texturemid = frontsector->floorheight > backsector->floorheight
+	    ? frontsector->floorheight : backsector->floorheight;
+	dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
+    }
+    else
+    {
+	dc_texturemid =frontsector->ceilingheight<backsector->ceilingheight
+	    ? frontsector->ceilingheight : backsector->ceilingheight;
+	dc_texturemid = dc_texturemid - viewz;
+    }
+    dc_texturemid += curline->sidedef->rowoffset;
+			
+    if (fixedcolormap)
+	dc_colormap = fixedcolormap;
+
+    // villsa [STRIFE] render as transparent (25% or 75%?)
+    if(curline->linedef->flags & ML_TRANSPARENT1)
+        colfunc = fuzzcolfunc;
+
+    // villsa [STRIFE] render as transparent (25% or 75%?)
+    if(curline->linedef->flags & ML_TRANSPARENT2)
+        colfunc = R_DrawMVisTLColumn;
+    
+    // draw the columns
+    for (dc_x = x1 ; dc_x <= x2 ; dc_x++)
+    {
+	// calculate lighting
+	if (maskedtexturecol[dc_x] != SHRT_MAX)
+	{
+	    if (!fixedcolormap)
+	    {
+		index = spryscale>>LIGHTSCALESHIFT;
+
+		if (index >=  MAXLIGHTSCALE )
+		    index = MAXLIGHTSCALE-1;
+
+		dc_colormap = walllights[index];
+	    }
+			
+	    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
+	    dc_iscale = 0xffffffffu / (unsigned)spryscale;
+	    
+	    // draw the texture
+	    col = (column_t *)( 
+		(byte *)R_GetColumn(texnum,maskedtexturecol[dc_x]) -3);
+			
+            // villsa [STRIFE] added 0 argument
+	    R_DrawMaskedColumn (col, 0);
+	    maskedtexturecol[dc_x] = SHRT_MAX;
+	}
+	spryscale += rw_scalestep;
+    }
+
+    colfunc = basecolfunc;  // villsa [STRIFE] reset draw routines
+	
+}
+
+
+
+
+//
+// R_RenderSegLoop
+// Draws zero, one, or two textures (and possibly a masked
+//  texture) for walls.
+// Can draw or mark the starting pixel of floor and ceiling
+//  textures.
+// CALLED: CORE LOOPING ROUTINE.
+//
+#define HEIGHTBITS		12
+#define HEIGHTUNIT		(1<<HEIGHTBITS)
+
+void R_RenderSegLoop (void)
+{
+    angle_t		angle;
+    unsigned		index;
+    int			yl;
+    int			yh;
+    int			mid;
+    fixed_t		texturecolumn;
+    int			top;
+    int			bottom;
+
+    for ( ; rw_x < rw_stopx ; rw_x++)
+    {
+	// mark floor / ceiling areas
+	yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
+
+	// no space above wall?
+	if (yl < ceilingclip[rw_x]+1)
+	    yl = ceilingclip[rw_x]+1;
+	
+	if (markceiling)
+	{
+	    top = ceilingclip[rw_x]+1;
+	    bottom = yl-1;
+
+	    if (bottom >= floorclip[rw_x])
+		bottom = floorclip[rw_x]-1;
+
+	    if (top <= bottom)
+	    {
+		ceilingplane->top[rw_x] = top;
+		ceilingplane->bottom[rw_x] = bottom;
+	    }
+	}
+		
+	yh = bottomfrac>>HEIGHTBITS;
+
+	if (yh >= floorclip[rw_x])
+	    yh = floorclip[rw_x]-1;
+
+	if (markfloor)
+	{
+	    top = yh+1;
+	    bottom = floorclip[rw_x]-1;
+	    if (top <= ceilingclip[rw_x])
+		top = ceilingclip[rw_x]+1;
+	    if (top <= bottom)
+	    {
+		floorplane->top[rw_x] = top;
+		floorplane->bottom[rw_x] = bottom;
+	    }
+	}
+	
+	// texturecolumn and lighting are independent of wall tiers
+	if (segtextured)
+	{
+	    // calculate texture offset
+	    angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
+	    texturecolumn = rw_offset-FixedMul(finetangent[angle],rw_distance);
+	    texturecolumn >>= FRACBITS;
+	    // calculate lighting
+	    index = rw_scale>>LIGHTSCALESHIFT;
+
+	    if (index >=  MAXLIGHTSCALE )
+		index = MAXLIGHTSCALE-1;
+
+	    dc_colormap = walllights[index];
+	    dc_x = rw_x;
+	    dc_iscale = 0xffffffffu / (unsigned)rw_scale;
+	}
+        else
+        {
+            // purely to shut up the compiler
+
+            texturecolumn = 0;
+        }
+	
+	// draw the wall tiers
+	if (midtexture)
+	{
+	    // single sided line
+	    dc_yl = yl;
+	    dc_yh = yh;
+	    dc_texturemid = rw_midtexturemid;
+	    dc_source = R_GetColumn(midtexture,texturecolumn);
+	    colfunc ();
+	    ceilingclip[rw_x] = viewheight;
+	    floorclip[rw_x] = -1;
+	}
+	else
+	{
+	    // two sided line
+	    if (toptexture)
+	    {
+		// top wall
+		mid = pixhigh>>HEIGHTBITS;
+		pixhigh += pixhighstep;
+
+		if (mid >= floorclip[rw_x])
+		    mid = floorclip[rw_x]-1;
+
+		if (mid >= yl)
+		{
+		    dc_yl = yl;
+		    dc_yh = mid;
+		    dc_texturemid = rw_toptexturemid;
+		    dc_source = R_GetColumn(toptexture,texturecolumn);
+		    colfunc ();
+		    ceilingclip[rw_x] = mid;
+		}
+		else
+		    ceilingclip[rw_x] = yl-1;
+	    }
+	    else
+	    {
+		// no top wall
+		if (markceiling)
+		    ceilingclip[rw_x] = yl-1;
+	    }
+			
+	    if (bottomtexture)
+	    {
+		// bottom wall
+		mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
+		pixlow += pixlowstep;
+
+		// no space above wall?
+		if (mid <= ceilingclip[rw_x])
+		    mid = ceilingclip[rw_x]+1;
+		
+		if (mid <= yh)
+		{
+		    dc_yl = mid;
+		    dc_yh = yh;
+		    dc_texturemid = rw_bottomtexturemid;
+		    dc_source = R_GetColumn(bottomtexture,
+					    texturecolumn);
+		    colfunc ();
+		    floorclip[rw_x] = mid;
+		}
+		else
+		    floorclip[rw_x] = yh+1;
+	    }
+	    else
+	    {
+		// no bottom wall
+		if (markfloor)
+		    floorclip[rw_x] = yh+1;
+	    }
+			
+	    if (maskedtexture)
+	    {
+		// save texturecol
+		//  for backdrawing of masked mid texture
+		maskedtexturecol[rw_x] = texturecolumn;
+	    }
+	}
+		
+	rw_scale += rw_scalestep;
+	topfrac += topstep;
+	bottomfrac += bottomstep;
+    }
+}
+
+
+
+
+//
+// R_StoreWallRange
+// A wall segment will be drawn
+//  between start and stop pixels (inclusive).
+//
+void
+R_StoreWallRange
+( int	start,
+  int	stop )
+{
+    fixed_t		hyp;
+    fixed_t		sineval;
+    angle_t		distangle, offsetangle;
+    fixed_t		vtop;
+    int			lightnum;
+
+    // don't overflow and crash
+    if (ds_p == &drawsegs[MAXDRAWSEGS])
+	return;		
+		
+#ifdef RANGECHECK
+    if (start >=viewwidth || start > stop)
+	I_Error ("Bad R_RenderWallRange: %i to %i", start , stop);
+#endif
+    
+    sidedef = curline->sidedef;
+    linedef = curline->linedef;
+
+    // mark the segment as visible for auto map
+    linedef->flags |= ML_MAPPED;
+    
+    // calculate rw_distance for scale calculation
+    rw_normalangle = curline->angle + ANG90;
+    offsetangle = abs((int) rw_normalangle - (int) rw_angle1);
+    
+    if (offsetangle > ANG90)
+	offsetangle = ANG90;
+
+    distangle = ANG90 - offsetangle;
+    hyp = R_PointToDist (curline->v1->x, curline->v1->y);
+    sineval = finesine[distangle>>ANGLETOFINESHIFT];
+    rw_distance = FixedMul (hyp, sineval);
+		
+	
+    ds_p->x1 = rw_x = start;
+    ds_p->x2 = stop;
+    ds_p->curline = curline;
+    rw_stopx = stop+1;
+    
+    // calculate scale at both ends and step
+    ds_p->scale1 = rw_scale = 
+	R_ScaleFromGlobalAngle (viewangle + xtoviewangle[start]);
+    
+    if (stop > start )
+    {
+	ds_p->scale2 = R_ScaleFromGlobalAngle (viewangle + xtoviewangle[stop]);
+	ds_p->scalestep = rw_scalestep = 
+	    (ds_p->scale2 - rw_scale) / (stop-start);
+    }
+    else
+    {
+	// UNUSED: try to fix the stretched line bug
+#if 0
+	if (rw_distance < FRACUNIT/2)
+	{
+	    fixed_t		trx,try;
+	    fixed_t		gxt,gyt;
+
+	    trx = curline->v1->x - viewx;
+	    try = curline->v1->y - viewy;
+			
+	    gxt = FixedMul(trx,viewcos); 
+	    gyt = -FixedMul(try,viewsin); 
+	    ds_p->scale1 = FixedDiv(projection, gxt-gyt)<<detailshift;
+	}
+#endif
+	ds_p->scale2 = ds_p->scale1;
+    }
+    
+    // calculate texture boundaries
+    //  and decide if floor / ceiling marks are needed
+    worldtop = frontsector->ceilingheight - viewz;
+    worldbottom = frontsector->floorheight - viewz;
+	
+    midtexture = toptexture = bottomtexture = maskedtexture = 0;
+    ds_p->maskedtexturecol = NULL;
+	
+    if (!backsector)
+    {
+	// single sided line
+	midtexture = texturetranslation[sidedef->midtexture];
+	// a single sided line is terminal, so it must mark ends
+	markfloor = markceiling = true;
+	if (linedef->flags & ML_DONTPEGBOTTOM)
+	{
+	    vtop = frontsector->floorheight +
+		textureheight[sidedef->midtexture];
+	    // bottom of texture at bottom
+	    rw_midtexturemid = vtop - viewz;	
+	}
+	else
+	{
+	    // top of texture at top
+	    rw_midtexturemid = worldtop;
+	}
+	rw_midtexturemid += sidedef->rowoffset;
+
+	ds_p->silhouette = SIL_BOTH;
+	ds_p->sprtopclip = screenheightarray;
+	ds_p->sprbottomclip = negonearray;
+	ds_p->bsilheight = INT_MAX;
+	ds_p->tsilheight = INT_MIN;
+    }
+    else
+    {
+	// two sided line
+	ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
+	ds_p->silhouette = 0;
+	
+	if (frontsector->floorheight > backsector->floorheight)
+	{
+	    ds_p->silhouette = SIL_BOTTOM;
+	    ds_p->bsilheight = frontsector->floorheight;
+	}
+	else if (backsector->floorheight > viewz)
+	{
+	    ds_p->silhouette = SIL_BOTTOM;
+	    ds_p->bsilheight = INT_MAX;
+	    // ds_p->sprbottomclip = negonearray;
+	}
+	
+	if (frontsector->ceilingheight < backsector->ceilingheight)
+	{
+	    ds_p->silhouette |= SIL_TOP;
+	    ds_p->tsilheight = frontsector->ceilingheight;
+	}
+	else if (backsector->ceilingheight < viewz)
+	{
+	    ds_p->silhouette |= SIL_TOP;
+	    ds_p->tsilheight = INT_MIN;
+	    // ds_p->sprtopclip = screenheightarray;
+	}
+		
+	if (backsector->ceilingheight <= frontsector->floorheight)
+	{
+	    ds_p->sprbottomclip = negonearray;
+	    ds_p->bsilheight = INT_MAX;
+	    ds_p->silhouette |= SIL_BOTTOM;
+	}
+	
+	if (backsector->floorheight >= frontsector->ceilingheight)
+	{
+	    ds_p->sprtopclip = screenheightarray;
+	    ds_p->tsilheight = INT_MIN;
+	    ds_p->silhouette |= SIL_TOP;
+	}
+	
+	worldhigh = backsector->ceilingheight - viewz;
+	worldlow = backsector->floorheight - viewz;
+		
+	// hack to allow height changes in outdoor areas
+	if (frontsector->ceilingpic == skyflatnum 
+	    && backsector->ceilingpic == skyflatnum)
+	{
+	    worldtop = worldhigh;
+	}
+	
+			
+	if (worldlow != worldbottom 
+	    || backsector->floorpic != frontsector->floorpic
+	    || backsector->lightlevel != frontsector->lightlevel)
+	{
+	    markfloor = true;
+	}
+	else
+	{
+	    // same plane on both sides
+	    markfloor = false;
+	}
+	
+			
+	if (worldhigh != worldtop 
+	    || backsector->ceilingpic != frontsector->ceilingpic
+	    || backsector->lightlevel != frontsector->lightlevel)
+	{
+	    markceiling = true;
+	}
+	else
+	{
+	    // same plane on both sides
+	    markceiling = false;
+	}
+	
+	if (backsector->ceilingheight <= frontsector->floorheight
+	    || backsector->floorheight >= frontsector->ceilingheight)
+	{
+	    // closed door
+	    markceiling = markfloor = true;
+	}
+	
+
+	if (worldhigh < worldtop)
+	{
+	    // top texture
+	    toptexture = texturetranslation[sidedef->toptexture];
+	    if (linedef->flags & ML_DONTPEGTOP)
+	    {
+		// top of texture at top
+		rw_toptexturemid = worldtop;
+	    }
+	    else
+	    {
+		vtop =
+		    backsector->ceilingheight
+		    + textureheight[sidedef->toptexture];
+		
+		// bottom of texture
+		rw_toptexturemid = vtop - viewz;	
+	    }
+	}
+	if (worldlow > worldbottom)
+	{
+	    // bottom texture
+	    bottomtexture = texturetranslation[sidedef->bottomtexture];
+
+	    if (linedef->flags & ML_DONTPEGBOTTOM )
+	    {
+		// bottom of texture at bottom
+		// top of texture at top
+		rw_bottomtexturemid = worldtop;
+	    }
+	    else	// top of texture at top
+		rw_bottomtexturemid = worldlow;
+	}
+	rw_toptexturemid += sidedef->rowoffset;
+	rw_bottomtexturemid += sidedef->rowoffset;
+	
+	// allocate space for masked texture tables
+	if (sidedef->midtexture)
+	{
+	    // masked midtexture
+	    maskedtexture = true;
+	    ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
+	    lastopening += rw_stopx - rw_x;
+	}
+    }
+    
+    // calculate rw_offset (only needed for textured lines)
+    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
+
+    if (segtextured)
+    {
+	offsetangle = rw_normalangle-rw_angle1;
+	
+	if (offsetangle > ANG180)
+	    offsetangle = 0 - offsetangle;
+
+	if (offsetangle > ANG90)
+	    offsetangle = ANG90;
+
+	sineval = finesine[offsetangle >>ANGLETOFINESHIFT];
+	rw_offset = FixedMul (hyp, sineval);
+
+	if (rw_normalangle-rw_angle1 < ANG180)
+	    rw_offset = -rw_offset;
+
+	rw_offset += sidedef->textureoffset + curline->offset;
+	rw_centerangle = ANG90 + viewangle - rw_normalangle;
+	
+	// calculate light table
+	//  use different light tables
+	//  for horizontal / vertical / diagonal
+	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+	if (!fixedcolormap)
+	{
+	    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+	    if (curline->v1->y == curline->v2->y)
+		lightnum--;
+	    else if (curline->v1->x == curline->v2->x)
+		lightnum++;
+
+	    if (lightnum < 0)		
+		walllights = scalelight[0];
+	    else if (lightnum >= LIGHTLEVELS)
+		walllights = scalelight[LIGHTLEVELS-1];
+	    else
+		walllights = scalelight[lightnum];
+	}
+    }
+    
+    // if a floor / ceiling plane is on the wrong side
+    //  of the view plane, it is definitely invisible
+    //  and doesn't need to be marked.
+    
+  
+    if (frontsector->floorheight >= viewz)
+    {
+	// above view plane
+	markfloor = false;
+    }
+    
+    if (frontsector->ceilingheight <= viewz 
+	&& frontsector->ceilingpic != skyflatnum)
+    {
+	// below view plane
+	markceiling = false;
+    }
+
+    
+    // calculate incremental stepping values for texture edges
+    worldtop >>= 4;
+    worldbottom >>= 4;
+	
+    topstep = -FixedMul (rw_scalestep, worldtop);
+    topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
+
+    bottomstep = -FixedMul (rw_scalestep,worldbottom);
+    bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
+	
+    if (backsector)
+    {	
+	worldhigh >>= 4;
+	worldlow >>= 4;
+
+	if (worldhigh < worldtop)
+	{
+	    pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
+	    pixhighstep = -FixedMul (rw_scalestep,worldhigh);
+	}
+	
+	if (worldlow > worldbottom)
+	{
+	    pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
+	    pixlowstep = -FixedMul (rw_scalestep,worldlow);
+	}
+    }
+    
+    // render it
+    if (markceiling)
+	ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
+    
+    if (markfloor)
+	floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
+
+    R_RenderSegLoop ();
+
+    
+    // save sprite clipping info
+    if ( ((ds_p->silhouette & SIL_TOP) || maskedtexture)
+	 && !ds_p->sprtopclip)
+    {
+	memcpy (lastopening, ceilingclip+start, 2*(rw_stopx-start));
+	ds_p->sprtopclip = lastopening - start;
+	lastopening += rw_stopx - start;
+    }
+    
+    if ( ((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
+	 && !ds_p->sprbottomclip)
+    {
+	memcpy (lastopening, floorclip+start, 2*(rw_stopx-start));
+	ds_p->sprbottomclip = lastopening - start;
+	lastopening += rw_stopx - start;	
+    }
+
+    if (maskedtexture && !(ds_p->silhouette&SIL_TOP))
+    {
+	ds_p->silhouette |= SIL_TOP;
+	ds_p->tsilheight = INT_MIN;
+    }
+    if (maskedtexture && !(ds_p->silhouette&SIL_BOTTOM))
+    {
+	ds_p->silhouette |= SIL_BOTTOM;
+	ds_p->bsilheight = INT_MAX;
+    }
+    ds_p++;
+}
+
diff --git a/games/NXDoom/src/strife/r_segs.h b/games/NXDoom/src/strife/r_segs.h
new file mode 100644
index 000000000..8e6a768f4
--- /dev/null
+++ b/games/NXDoom/src/strife/r_segs.h
@@ -0,0 +1,34 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh module, drawing LineSegs from BSP.
+//
+
+
+#ifndef __R_SEGS__
+#define __R_SEGS__
+
+
+extern lighttable_t **walllights;
+
+
+void
+R_RenderMaskedSegRange
+( drawseg_t*	ds,
+  int		x1,
+  int		x2 );
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_sky.c b/games/NXDoom/src/strife/r_sky.c
new file mode 100644
index 000000000..007740a8a
--- /dev/null
+++ b/games/NXDoom/src/strife/r_sky.c
@@ -0,0 +1,54 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Sky rendering. The DOOM sky is a texture map like any
+//  wall, wrapping around. A 1024 columns equal 360 degrees.
+//  The default sky map is 256 columns and repeats 4 times
+//  on a 320 screen?
+//  
+//
+
+
+
+// Needed for FRACUNIT.
+#include "m_fixed.h"
+
+// Needed for Flat retrieval.
+#include "r_data.h"
+
+
+#include "r_sky.h"
+
+//
+// sky mapping
+//
+int			skyflatnum;
+int			skytexture;
+int			skytexturemid;
+
+
+
+//
+// R_InitSkyMap
+// Called whenever the view size changes.
+//
+void R_InitSkyMap (void)
+{
+    // haleyjd 10/03/10: [STRIFE] Sky is set here, not in G_DoLoadLevel.
+    // Also skytexturemid changed from 100 to 199.
+    skyflatnum = R_FlatNumForName ( SKYFLATNAME );
+    skytexturemid = 199*FRACUNIT;
+}
+
diff --git a/games/NXDoom/src/strife/r_sky.h b/games/NXDoom/src/strife/r_sky.h
new file mode 100644
index 000000000..fbcfa1ae9
--- /dev/null
+++ b/games/NXDoom/src/strife/r_sky.h
@@ -0,0 +1,37 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Sky rendering.
+//
+
+
+#ifndef __R_SKY__
+#define __R_SKY__
+
+
+
+// SKY, store the number for name.
+#define			SKYFLATNAME  "F_SKY001" // villsa [STRIFE]
+
+// The sky map is 256*128*4 maps.
+#define ANGLETOSKYSHIFT		22
+
+extern  int		skytexture;
+extern int		skytexturemid;
+
+// Called whenever the view size changes.
+void R_InitSkyMap (void);
+
+#endif
diff --git a/games/NXDoom/src/strife/r_state.h b/games/NXDoom/src/strife/r_state.h
new file mode 100644
index 000000000..2a60e2fe8
--- /dev/null
+++ b/games/NXDoom/src/strife/r_state.h
@@ -0,0 +1,127 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh/render internal state variables (global).
+//
+
+
+#ifndef __R_STATE__
+#define __R_STATE__
+
+// Need data structure definitions.
+#include "d_player.h"
+#include "r_data.h"
+
+
+
+
+
+
+//
+// Refresh internal data structures,
+//  for rendering.
+//
+
+// needed for texture pegging
+extern fixed_t*		textureheight;
+
+// needed for pre rendering (fracs)
+extern fixed_t*		spritewidth;
+
+extern fixed_t*		spriteoffset;
+extern fixed_t*		spritetopoffset;
+
+extern lighttable_t*	colormaps;
+
+extern int		viewwidth;
+extern int		scaledviewwidth;
+extern int		viewheight;
+
+extern int		firstflat;
+
+// for global animation
+extern int*		flattranslation;	
+extern int*		texturetranslation;	
+
+
+// Sprite....
+extern int		firstspritelump;
+extern int		lastspritelump;
+extern int		numspritelumps;
+
+
+
+//
+// Lookup tables for map data.
+//
+extern int		numsprites;
+extern spritedef_t*	sprites;
+
+extern int		numvertexes;
+extern vertex_t*	vertexes;
+
+extern int		numsegs;
+extern seg_t*		segs;
+
+extern int		numsectors;
+extern sector_t*	sectors;
+
+extern int		numsubsectors;
+extern subsector_t*	subsectors;
+
+extern int		numnodes;
+extern node_t*		nodes;
+
+extern int		numlines;
+extern line_t*		lines;
+
+extern int		numsides;
+extern side_t*		sides;
+
+
+//
+// POV data.
+//
+extern fixed_t		viewx;
+extern fixed_t		viewy;
+extern fixed_t		viewz;
+
+extern angle_t		viewangle;
+extern player_t*	viewplayer;
+
+
+// ?
+extern angle_t		clipangle;
+
+extern int		viewangletox[FINEANGLES/2];
+extern angle_t		xtoviewangle[SCREENWIDTH+1];
+//extern fixed_t		finetangent[FINEANGLES/2];
+
+extern fixed_t		rw_distance;
+extern angle_t		rw_normalangle;
+
+
+
+// angle to line origin
+extern int		rw_angle1;
+
+// Segs count?
+extern int		sscount;
+
+extern visplane_t*	floorplane;
+extern visplane_t*	ceilingplane;
+
+
+#endif
diff --git a/games/NXDoom/src/strife/r_things.c b/games/NXDoom/src/strife/r_things.c
new file mode 100644
index 000000000..e49f7bc10
--- /dev/null
+++ b/games/NXDoom/src/strife/r_things.c
@@ -0,0 +1,1067 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Refresh of things, i.e. objects represented by sprites.
+//
+
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+
+#include "deh_main.h"
+#include "doomdef.h"
+
+#include "i_swap.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#include "r_local.h"
+
+#include "doomstat.h"
+
+// haleyjd
+#include "p_local.h"
+
+
+
+#define MINZ				(FRACUNIT*4)
+#define BASEYCENTER			100
+
+//void R_DrawColumn (void);
+//void R_DrawFuzzColumn (void);
+
+
+
+typedef struct
+{
+    int		x1;
+    int		x2;
+	
+    int		column;
+    int		topclip;
+    int		bottomclip;
+
+} maskdraw_t;
+
+
+
+//
+// Sprite rotation 0 is facing the viewer,
+//  rotation 1 is one angle turn CLOCKWISE around the axis.
+// This is not the same as the angle,
+//  which increases counter clockwise (protractor).
+// There was a lot of stuff grabbed wrong, so I changed it...
+//
+fixed_t		pspritescale;
+fixed_t		pspriteiscale;
+
+lighttable_t**	spritelights;
+
+// constant arrays
+//  used for psprite clipping and initializing clipping
+short		negonearray[SCREENWIDTH];
+short		screenheightarray[SCREENWIDTH];
+
+
+//
+// INITIALIZATION FUNCTIONS
+//
+
+// variables used to look up
+//  and range check thing_t sprites patches
+spritedef_t*	sprites;
+int		numsprites;
+
+spriteframe_t	sprtemp[29];
+int		maxframe;
+const char	*spritename;
+
+
+
+
+//
+// R_InstallSpriteLump
+// Local function for R_InitSprites.
+//
+void
+R_InstallSpriteLump
+( int		lump,
+  unsigned	frame,
+  unsigned	rotation,
+  boolean	flipped )
+{
+    int		r;
+	
+    if (frame >= 29 || rotation > 8)
+	I_Error("R_InstallSpriteLump: "
+		"Bad frame characters in lump %i", lump);
+	
+    if ((int)frame > maxframe)
+	maxframe = frame;
+		
+    if (rotation == 0)
+    {
+	// the lump should be used for all rotations
+	if (sprtemp[frame].rotate == false)
+	    I_Error ("R_InitSprites: Sprite %s frame %c has "
+		     "multip rot=0 lump", spritename, 'A'+frame);
+
+	if (sprtemp[frame].rotate == true)
+	    I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
+		     "and a rot=0 lump", spritename, 'A'+frame);
+			
+	sprtemp[frame].rotate = false;
+	for (r=0 ; r<8 ; r++)
+	{
+	    sprtemp[frame].lump[r] = lump - firstspritelump;
+	    sprtemp[frame].flip[r] = (byte)flipped;
+	}
+	return;
+    }
+	
+    // the lump is only used for one rotation
+    if (sprtemp[frame].rotate == false)
+	I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
+		 "and a rot=0 lump", spritename, 'A'+frame);
+		
+    sprtemp[frame].rotate = true;
+
+    // make 0 based
+    rotation--;		
+    if (sprtemp[frame].lump[rotation] != -1)
+	I_Error ("R_InitSprites: Sprite %s : %c : %c "
+		 "has two lumps mapped to it",
+		 spritename, 'A'+frame, '1'+rotation);
+		
+    sprtemp[frame].lump[rotation] = lump - firstspritelump;
+    sprtemp[frame].flip[rotation] = (byte)flipped;
+}
+
+
+
+
+//
+// R_InitSpriteDefs
+// Pass a null terminated list of sprite names
+//  (4 chars exactly) to be used.
+// Builds the sprite rotation matrixes to account
+//  for horizontally flipped sprites.
+// Will report an error if the lumps are inconsistant. 
+// Only called at startup.
+//
+// Sprite lump names are 4 characters for the actor,
+//  a letter for the frame, and a number for the rotation.
+// A sprite that is flippable will have an additional
+//  letter/number appended.
+// The rotation character can be 0 to signify no rotations.
+//
+void R_InitSpriteDefs (const char** namelist)
+{ 
+    const char **check;
+    int		i;
+    int		l;
+    int		frame;
+    int		rotation;
+    int		start;
+    int		end;
+    int		patched;
+		
+    // count the number of sprite names
+    check = namelist;
+    while (*check != NULL)
+	check++;
+
+    numsprites = check-namelist;
+	
+    if (!numsprites)
+	return;
+		
+    sprites = Z_Malloc(numsprites *sizeof(*sprites), PU_STATIC, NULL);
+	
+    start = firstspritelump-1;
+    end = lastspritelump+1;
+	
+    // scan all the lump names for each of the names,
+    //  noting the highest frame letter.
+    // Just compare 4 characters as ints
+    for (i=0 ; i<numsprites ; i++)
+    {
+	spritename = DEH_String(namelist[i]);
+	memset (sprtemp,-1, sizeof(sprtemp));
+		
+	maxframe = -1;
+	
+	// scan the lumps,
+	//  filling in the frames for whatever is found
+	for (l=start+1 ; l<end ; l++)
+	{
+	    if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
+	    {
+		frame = lumpinfo[l]->name[4] - 'A';
+		rotation = lumpinfo[l]->name[5] - '0';
+
+		if (modifiedgame)
+		    patched = W_GetNumForName (lumpinfo[l]->name);
+		else
+		    patched = l;
+
+		R_InstallSpriteLump (patched, frame, rotation, false);
+
+		if (lumpinfo[l]->name[6])
+		{
+		    frame = lumpinfo[l]->name[6] - 'A';
+		    rotation = lumpinfo[l]->name[7] - '0';
+		    R_InstallSpriteLump (l, frame, rotation, true);
+		}
+	    }
+	}
+	
+	// check the frames that were found for completeness
+	if (maxframe == -1)
+	{
+	    sprites[i].numframes = 0;
+	    continue;
+	}
+		
+	maxframe++;
+	
+	for (frame = 0 ; frame < maxframe ; frame++)
+	{
+	    switch ((int)sprtemp[frame].rotate)
+	    {
+	      case -1:
+		// no rotations were found for that frame at all
+		I_Error ("R_InitSprites: No patches found "
+			 "for %s frame %c", spritename, frame+'A');
+		break;
+		
+	      case 0:
+		// only the first rotation is needed
+		break;
+			
+	      case 1:
+		// must have all 8 frames
+		for (rotation=0 ; rotation<8 ; rotation++)
+		    if (sprtemp[frame].lump[rotation] == -1)
+			I_Error ("R_InitSprites: Sprite %s frame %c "
+				 "is missing rotations",
+				 spritename, frame+'A');
+		break;
+	    }
+	}
+	
+	// allocate space for the frames present and copy sprtemp to it
+	sprites[i].numframes = maxframe;
+	sprites[i].spriteframes = 
+	    Z_Malloc (maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
+	memcpy (sprites[i].spriteframes, sprtemp, maxframe*sizeof(spriteframe_t));
+    }
+
+}
+
+
+
+
+//
+// GAME FUNCTIONS
+//
+vissprite_t	vissprites[MAXVISSPRITES];
+vissprite_t*	vissprite_p;
+int		newvissprite;
+int             sprbotscreen;       // villsa [STRIFE]
+
+
+
+//
+// R_InitSprites
+// Called at program start.
+//
+void R_InitSprites (const char** namelist)
+{
+    int		i;
+	
+    for (i=0 ; i<SCREENWIDTH ; i++)
+    {
+	negonearray[i] = -1;
+    }
+	
+    R_InitSpriteDefs (namelist);
+}
+
+
+
+//
+// R_ClearSprites
+// Called at frame start.
+//
+void R_ClearSprites (void)
+{
+    vissprite_p = vissprites;
+}
+
+
+//
+// R_NewVisSprite
+//
+vissprite_t	overflowsprite;
+
+vissprite_t* R_NewVisSprite (void)
+{
+    if (vissprite_p == &vissprites[MAXVISSPRITES])
+	return &overflowsprite;
+    
+    vissprite_p++;
+    return vissprite_p-1;
+}
+
+
+
+//
+// R_DrawMaskedColumn
+// Used for sprites and masked mid textures.
+// Masked means: partly transparent, i.e. stored
+//  in posts/runs of opaque pixels.
+//
+short*		mfloorclip;
+short*		mceilingclip;
+
+fixed_t		spryscale;
+fixed_t		sprtopscreen;
+
+//
+// R_DrawMaskedColumn
+//
+// villsa [STRIFE] new baseclip argument
+//
+void R_DrawMaskedColumn (column_t *column, int baseclip)
+{
+    int		topscreen;
+    int 	bottomscreen;
+    fixed_t	basetexturemid;
+
+    basetexturemid = dc_texturemid;
+
+    for ( ; column->topdelta != 0xff ; ) 
+    {
+        // calculate unclipped screen coordinates
+        //  for post
+        topscreen = sprtopscreen + spryscale*column->topdelta;
+        bottomscreen = topscreen + spryscale*column->length;
+
+        dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
+        dc_yh = (bottomscreen-1)>>FRACBITS;
+
+        if (dc_yh >= mfloorclip[dc_x])
+            dc_yh = mfloorclip[dc_x]-1;
+        if (dc_yl <= mceilingclip[dc_x])
+            dc_yl = mceilingclip[dc_x]+1;
+
+        // villsa [STRIFE] checks for clipping
+        if(baseclip)
+        {
+            if(dc_yh > baseclip)
+                dc_yh = baseclip;
+        }
+
+        if (dc_yl <= dc_yh)
+        {
+            dc_source = (byte *)column + 3;
+            dc_texturemid = basetexturemid - (column->topdelta<<FRACBITS);
+            // dc_source = (byte *)column + 3 - column->topdelta;
+
+            // Drawn by either R_DrawColumn
+            //  or (SHADOW) R_DrawFuzzColumn.
+            colfunc ();	
+        }
+        column = (column_t *)(  (byte *)column + column->length + 4);
+    }
+
+    dc_texturemid = basetexturemid;
+}
+
+
+
+//
+// R_DrawVisSprite
+//  mfloorclip and mceilingclip should also be set.
+//
+void
+R_DrawVisSprite
+( vissprite_t*          vis,
+  int                   x1,
+  int                   x2 )
+{
+    column_t*           column;
+    int                 texturecolumn;
+    fixed_t             frac;
+    patch_t*            patch;
+    int                 clip;   // villsa [STRIFE]
+    int                 translation;    // villsa [STRIFE]
+
+    patch = W_CacheLumpNum (vis->patch+firstspritelump, PU_CACHE);
+
+    dc_colormap = vis->colormap;
+
+    // villsa [STRIFE]
+    // haleyjd 09/06/10: updated MF_TRANSLATION for Strife
+    translation = vis->mobjflags & MF_TRANSLATION;
+    
+    // villsa [STRIFE] unused
+    /*if (!dc_colormap)
+    {
+        // NULL colormap = shadow draw
+        colfunc = fuzzcolfunc;
+    }*/
+
+    // villsa [STRIFE] Handle the two types of translucency
+    if(vis->mobjflags & MF_SHADOW)
+    {
+        if(!translation)
+        {
+            if(vis->mobjflags & MF_MVIS)
+                colfunc = R_DrawMVisTLColumn;
+            else
+                colfunc = fuzzcolfunc;
+        }
+        else
+        {
+            colfunc = R_DrawTRTLColumn;
+            dc_translation = translationtables - 256 + (translation >> (MF_TRANSSHIFT - 8));
+        }
+    }
+    else if(vis->mobjflags & MF_MVIS)
+    {
+        // haleyjd 20141215: [STRIFE] Objects which are *only* MF_MVIS (players
+        // using double Shadow Armors, in particular) are totally invisible. 
+        // Upstreamed after discovered in SVE. Note this causes a 
+        // vanilla-accurate glitch with Shadow Acolytes - if they die while
+        // MF_MVIS is set, A_Fall fails to remove it and their corpse will
+        // completely disappear (that's also fixed in SVE, but not here).
+        return;
+    }
+    else if(translation)     // villsa [STRIFE] new translation tables
+    {
+        colfunc = transcolfunc;
+        dc_translation = translationtables - 256 + (translation >> (MF_TRANSSHIFT - 8));
+    }
+
+    dc_iscale = abs(vis->xiscale)>>detailshift;
+    dc_texturemid = vis->texturemid;
+    frac = vis->startfrac;
+    spryscale = vis->scale;
+    sprtopscreen = centeryfrac - FixedMul(dc_texturemid,spryscale);
+
+    // villsa [STRIFE] clip sprite's feet if needed
+    if(vis->mobjflags & MF_FEETCLIPPED)
+    {
+        sprbotscreen = sprtopscreen + FixedMul(spryscale, SHORT(patch->height) << FRACBITS);
+        clip = (sprbotscreen - FixedMul(10*FRACUNIT, spryscale)) >> FRACBITS;
+    }
+    else
+        clip = 0;
+
+    for (dc_x=vis->x1 ; dc_x<=vis->x2 ; dc_x++, frac += vis->xiscale)
+    {
+        texturecolumn = frac>>FRACBITS;
+#ifdef RANGECHECK
+        if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
+            I_Error ("R_DrawSpriteRange: bad texturecolumn");
+#endif
+        column = (column_t *) ((byte *)patch +
+                               LONG(patch->columnofs[texturecolumn]));
+        R_DrawMaskedColumn (column, clip);  // villsa [STRIFE] clip argument
+    }
+
+    colfunc = basecolfunc;
+}
+
+
+
+//
+// R_ProjectSprite
+// Generates a vissprite for a thing
+//  if it might be visible.
+//
+void R_ProjectSprite (mobj_t* thing)
+{
+    fixed_t		tr_x;
+    fixed_t		tr_y;
+    
+    fixed_t		gxt;
+    fixed_t		gyt;
+    
+    fixed_t		tx;
+    fixed_t		tz;
+
+    fixed_t		xscale;
+    
+    int			x1;
+    int			x2;
+
+    spritedef_t*	sprdef;
+    spriteframe_t*	sprframe;
+    int			lump;
+    
+    unsigned		rot;
+    boolean		flip;
+    
+    int			index;
+
+    vissprite_t*	vis;
+    
+    angle_t		ang;
+    fixed_t		iscale;
+    
+    // transform the origin point
+    tr_x = thing->x - viewx;
+    tr_y = thing->y - viewy;
+	
+    gxt = FixedMul(tr_x,viewcos); 
+    gyt = -FixedMul(tr_y,viewsin);
+    
+    tz = gxt-gyt; 
+
+    // thing is behind view plane?
+    if (tz < MINZ)
+	return;
+    
+    xscale = FixedDiv(projection, tz);
+	
+    gxt = -FixedMul(tr_x,viewsin); 
+    gyt = FixedMul(tr_y,viewcos); 
+    tx = -(gyt+gxt); 
+
+    // too far off the side?
+    if (abs(tx)>(tz<<2))
+	return;
+    
+    // decide which patch to use for sprite relative to player
+#ifdef RANGECHECK
+    if ((unsigned int) thing->sprite >= (unsigned int) numsprites)
+	I_Error ("R_ProjectSprite: invalid sprite number %i ",
+		 thing->sprite);
+#endif
+    sprdef = &sprites[thing->sprite];
+#ifdef RANGECHECK
+    if ( (thing->frame&FF_FRAMEMASK) >= sprdef->numframes )
+	I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
+		 thing->sprite, thing->frame);
+#endif
+    sprframe = &sprdef->spriteframes[ thing->frame & FF_FRAMEMASK];
+
+    if (sprframe->rotate)
+    {
+	// choose a different rotation based on player view
+	ang = R_PointToAngle (thing->x, thing->y);
+	rot = (ang-thing->angle+(unsigned)(ANG45/2)*9)>>29;
+	lump = sprframe->lump[rot];
+	flip = (boolean)sprframe->flip[rot];
+    }
+    else
+    {
+	// use single rotation for all views
+	lump = sprframe->lump[0];
+	flip = (boolean)sprframe->flip[0];
+    }
+    
+    // calculate edges of the shape
+    tx -= spriteoffset[lump];	
+    x1 = (centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS;
+
+    // off the right side?
+    if (x1 > viewwidth)
+	return;
+    
+    tx +=  spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS) - 1;
+
+    // off the left side
+    if (x2 < 0)
+	return;
+    
+    // store information in a vissprite
+    vis = R_NewVisSprite ();
+    vis->mobjflags = thing->flags;
+    vis->scale = xscale<<detailshift;
+    vis->gx = thing->x;
+    vis->gy = thing->y;
+    vis->gz = thing->z;
+
+    // villsa [STRIFE]
+    if(thing->flags & MF_FEETCLIPPED)
+        vis->gz -= (10*FRACUNIT);
+
+    // villsa [STRIFE]
+    vis->gzt = vis->gz + spritetopoffset[lump];
+
+    vis->texturemid = vis->gzt - viewz;
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
+    iscale = FixedDiv (FRACUNIT, xscale);
+
+    if (flip)
+    {
+	vis->startfrac = spritewidth[lump]-1;
+	vis->xiscale = -iscale;
+    }
+    else
+    {
+	vis->startfrac = 0;
+	vis->xiscale = iscale;
+    }
+
+    if (vis->x1 > x1)
+	vis->startfrac += vis->xiscale*(vis->x1-x1);
+    vis->patch = lump;
+    
+    // get light level
+    // villsa [STRIFE] unused
+    /*if (thing->flags & MF_SHADOW)
+    {
+	// shadow draw
+	vis->colormap = NULL;
+    }
+    else */if (fixedcolormap)
+    {
+	// fixed map
+	vis->colormap = fixedcolormap;
+    }
+    else if (thing->frame & FF_FULLBRIGHT)
+    {
+	// full bright
+	vis->colormap = colormaps;
+    }
+    
+    else
+    {
+	// diminished light
+	index = xscale>>(LIGHTSCALESHIFT-detailshift);
+
+	if (index >= MAXLIGHTSCALE) 
+	    index = MAXLIGHTSCALE-1;
+
+	vis->colormap = spritelights[index];
+    }	
+}
+
+
+
+
+//
+// R_AddSprites
+// During BSP traversal, this adds sprites by sector.
+//
+void R_AddSprites (sector_t* sec)
+{
+    mobj_t*		thing;
+    int			lightnum;
+
+    // BSP is traversed by subsector.
+    // A sector might have been split into several
+    //  subsectors during BSP building.
+    // Thus we check whether its already added.
+    if (sec->validcount == validcount)
+	return;		
+
+    // Well, now it will be done.
+    sec->validcount = validcount;
+	
+    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT)+extralight;
+
+    if (lightnum < 0)		
+	spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+	spritelights = scalelight[LIGHTLEVELS-1];
+    else
+	spritelights = scalelight[lightnum];
+
+    // Handle all things in sector.
+    for (thing = sec->thinglist ; thing ; thing = thing->snext)
+	R_ProjectSprite (thing);
+}
+
+
+//
+// R_DrawPSprite
+//
+void R_DrawPSprite (pspdef_t* psp)
+{
+    fixed_t		tx;
+    int			x1;
+    int			x2;
+    spritedef_t*	sprdef;
+    spriteframe_t*	sprframe;
+    int			lump;
+    boolean		flip;
+    vissprite_t*	vis;
+    vissprite_t		avis;
+    
+    // decide which patch to use
+#ifdef RANGECHECK
+    if ( (unsigned)psp->state->sprite >= (unsigned int) numsprites)
+        I_Error ("R_ProjectSprite: invalid sprite number %i ",
+                 psp->state->sprite);
+#endif
+    sprdef = &sprites[psp->state->sprite];
+#ifdef RANGECHECK
+    if ( (psp->state->frame & FF_FRAMEMASK)  >= sprdef->numframes)
+        I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
+                 psp->state->sprite, psp->state->frame);
+#endif
+    sprframe = &sprdef->spriteframes[ psp->state->frame & FF_FRAMEMASK ];
+
+    lump = sprframe->lump[0];
+    // [STRIFE] haleyjd 20110629: -flip replaces this.
+    //flip = (boolean)sprframe->flip[0];
+    flip = flipparm;
+    
+    // calculate edges of the shape
+    tx = psp->sx-160*FRACUNIT;
+
+    tx -= spriteoffset[lump];	
+    x1 = (centerxfrac + FixedMul (tx,pspritescale) ) >>FRACBITS;
+
+    // off the right side
+    if (x1 > viewwidth)
+        return;
+
+    tx +=  spritewidth[lump];
+    x2 = ((centerxfrac + FixedMul (tx, pspritescale) ) >>FRACBITS) - 1;
+
+    // off the left side
+    if (x2 < 0)
+        return;
+    
+    // store information in a vissprite
+    vis = &avis;
+    vis->mobjflags = 0;
+    vis->x1 = x1 < 0 ? 0 : x1;
+    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
+    vis->scale = pspritescale<<detailshift;
+    
+    if (flip)
+    {
+        vis->xiscale = -pspriteiscale;
+        vis->startfrac = spritewidth[lump]-1;
+    }
+    else
+    {
+        vis->xiscale = pspriteiscale;
+        vis->startfrac = 0;
+    }
+
+    // villsa [STRIFE] calculate y offset with view pitch
+    vis->texturemid = ((BASEYCENTER<<FRACBITS)+FRACUNIT/2)-(psp->sy-spritetopoffset[lump])
+        + FixedMul(vis->xiscale, (centery-viewheight/2)<<FRACBITS);
+
+    if (vis->x1 > x1)
+        vis->startfrac += vis->xiscale*(vis->x1-x1);
+
+    vis->patch = lump;
+
+    if (viewplayer->powers[pw_invisibility] > 4*32
+        || (viewplayer->powers[pw_invisibility] & 8))
+    {
+        // shadow draw
+        vis->colormap   = spritelights[MAXLIGHTSCALE-1];
+        vis->mobjflags |= MF_SHADOW;
+    }
+    else if(viewplayer->powers[pw_invisibility] & 4)
+    {
+        vis->mobjflags |= (MF_SHADOW|MF_MVIS);
+    }
+
+    // When not MVIS, or if SHADOW, behave normally:
+    if(!(viewplayer->mo->flags & MF_MVIS) || (viewplayer->mo->flags & MF_SHADOW))
+    {
+        if (fixedcolormap)
+        {
+            // fixed color
+            vis->colormap = fixedcolormap;
+        }
+        else if (psp->state->frame & FF_FULLBRIGHT)
+        {
+            // full bright
+            vis->colormap = colormaps;
+        }
+        else
+        {
+            // local light
+            vis->colormap = spritelights[MAXLIGHTSCALE-1];
+        }
+    }
+    else
+    {
+        // When MVIS, use invulnerability colormap
+        vis->colormap = colormaps + INVERSECOLORMAP * 256 * sizeof(lighttable_t);
+    }
+
+    R_DrawVisSprite (vis, vis->x1, vis->x2);
+}
+
+
+
+//
+// R_DrawPlayerSprites
+//
+void R_DrawPlayerSprites (void)
+{
+    int		i;
+    int		lightnum;
+    pspdef_t*	psp;
+    
+    // get light level
+    lightnum =
+	(viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) 
+	+extralight;
+
+    if (lightnum < 0)		
+	spritelights = scalelight[0];
+    else if (lightnum >= LIGHTLEVELS)
+	spritelights = scalelight[LIGHTLEVELS-1];
+    else
+	spritelights = scalelight[lightnum];
+    
+    // clip to screen bounds
+    mfloorclip = screenheightarray;
+    mceilingclip = negonearray;
+    
+    // add all active psprites
+    for (i=0, psp=viewplayer->psprites;
+	 i<NUMPSPRITES;
+	 i++,psp++)
+    {
+	if (psp->state)
+	    R_DrawPSprite (psp);
+    }
+}
+
+
+
+
+//
+// R_SortVisSprites
+//
+vissprite_t	vsprsortedhead;
+
+
+void R_SortVisSprites (void)
+{
+    int			i;
+    int			count;
+    vissprite_t*	ds;
+    vissprite_t*	best;
+    static vissprite_t	unsorted;
+    fixed_t		bestscale;
+
+    count = vissprite_p - vissprites;
+	
+    unsorted.next = unsorted.prev = &unsorted;
+
+    if (!count)
+	return;
+		
+    for (ds=vissprites ; ds<vissprite_p ; ds++)
+    {
+	ds->next = ds+1;
+	ds->prev = ds-1;
+    }
+    
+    vissprites[0].prev = &unsorted;
+    unsorted.next = &vissprites[0];
+    (vissprite_p-1)->next = &unsorted;
+    unsorted.prev = vissprite_p-1;
+    
+    // pull the vissprites out by scale
+
+    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
+    for (i=0 ; i<count ; i++)
+    {
+	bestscale = INT_MAX;
+        best = unsorted.next;
+	for (ds=unsorted.next ; ds!= &unsorted ; ds=ds->next)
+	{
+	    if (ds->scale < bestscale)
+	    {
+		bestscale = ds->scale;
+		best = ds;
+	    }
+	}
+	best->next->prev = best->prev;
+	best->prev->next = best->next;
+	best->next = &vsprsortedhead;
+	best->prev = vsprsortedhead.prev;
+	vsprsortedhead.prev->next = best;
+	vsprsortedhead.prev = best;
+    }
+}
+
+
+
+//
+// R_DrawSprite
+//
+void R_DrawSprite (vissprite_t* spr)
+{
+    drawseg_t*		ds;
+    short		clipbot[SCREENWIDTH];
+    short		cliptop[SCREENWIDTH];
+    int			x;
+    int			r1;
+    int			r2;
+    fixed_t		scale;
+    fixed_t		lowscale;
+    int			silhouette;
+		
+    for (x = spr->x1 ; x<=spr->x2 ; x++)
+	clipbot[x] = cliptop[x] = -2;
+    
+    // Scan drawsegs from end to start for obscuring segs.
+    // The first drawseg that has a greater scale
+    //  is the clip seg.
+    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
+    {
+	// determine if the drawseg obscures the sprite
+	if (ds->x1 > spr->x2
+	    || ds->x2 < spr->x1
+	    || (!ds->silhouette
+		&& !ds->maskedtexturecol) )
+	{
+	    // does not cover sprite
+	    continue;
+	}
+			
+	r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
+	r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
+
+	if (ds->scale1 > ds->scale2)
+	{
+	    lowscale = ds->scale2;
+	    scale = ds->scale1;
+	}
+	else
+	{
+	    lowscale = ds->scale1;
+	    scale = ds->scale2;
+	}
+		
+	if (scale < spr->scale
+	    || ( lowscale < spr->scale
+		 && !R_PointOnSegSide (spr->gx, spr->gy, ds->curline) ) )
+	{
+	    // masked mid texture?
+	    if (ds->maskedtexturecol)	
+		R_RenderMaskedSegRange (ds, r1, r2);
+	    // seg is behind sprite
+	    continue;			
+	}
+
+	
+	// clip this piece of the sprite
+	silhouette = ds->silhouette;
+	
+	if (spr->gz >= ds->bsilheight)
+	    silhouette &= ~SIL_BOTTOM;
+
+	if (spr->gzt <= ds->tsilheight)
+	    silhouette &= ~SIL_TOP;
+			
+	if (silhouette == 1)
+	{
+	    // bottom sil
+	    for (x=r1 ; x<=r2 ; x++)
+		if (clipbot[x] == -2)
+		    clipbot[x] = ds->sprbottomclip[x];
+	}
+	else if (silhouette == 2)
+	{
+	    // top sil
+	    for (x=r1 ; x<=r2 ; x++)
+		if (cliptop[x] == -2)
+		    cliptop[x] = ds->sprtopclip[x];
+	}
+	else if (silhouette == 3)
+	{
+	    // both
+	    for (x=r1 ; x<=r2 ; x++)
+	    {
+		if (clipbot[x] == -2)
+		    clipbot[x] = ds->sprbottomclip[x];
+		if (cliptop[x] == -2)
+		    cliptop[x] = ds->sprtopclip[x];
+	    }
+	}
+		
+    }
+    
+    // all clipping has been performed, so draw the sprite
+
+    // check for unclipped columns
+    for (x = spr->x1 ; x<=spr->x2 ; x++)
+    {
+	if (clipbot[x] == -2)		
+	    clipbot[x] = viewheight;
+
+	if (cliptop[x] == -2)
+	    cliptop[x] = -1;
+    }
+		
+    mfloorclip = clipbot;
+    mceilingclip = cliptop;
+    R_DrawVisSprite (spr, spr->x1, spr->x2);
+}
+
+
+
+
+//
+// R_DrawMasked
+//
+void R_DrawMasked (void)
+{
+    vissprite_t*	spr;
+    drawseg_t*		ds;
+	
+    R_SortVisSprites ();
+
+    if (vissprite_p > vissprites)
+    {
+	// draw all vissprites back to front
+	for (spr = vsprsortedhead.next ;
+	     spr != &vsprsortedhead ;
+	     spr=spr->next)
+	{
+	    
+	    R_DrawSprite (spr);
+	}
+    }
+    
+    // render any remaining masked mid textures
+    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
+	if (ds->maskedtexturecol)
+	    R_RenderMaskedSegRange (ds, ds->x1, ds->x2);
+    
+    // draw the psprites on top of everything
+    //  but does not draw on side views
+    if (!viewangleoffset)		
+	R_DrawPlayerSprites ();
+}
+
+
+
diff --git a/games/NXDoom/src/strife/r_things.h b/games/NXDoom/src/strife/r_things.h
new file mode 100644
index 000000000..edb14a54d
--- /dev/null
+++ b/games/NXDoom/src/strife/r_things.h
@@ -0,0 +1,66 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Rendering of moving objects, sprites.
+//
+
+
+#ifndef __R_THINGS__
+#define __R_THINGS__
+
+
+
+#define MAXVISSPRITES  	128
+
+extern vissprite_t	vissprites[MAXVISSPRITES];
+extern vissprite_t*	vissprite_p;
+extern vissprite_t	vsprsortedhead;
+
+// Constant arrays used for psprite clipping
+//  and initializing clipping.
+extern short		negonearray[SCREENWIDTH];
+extern short		screenheightarray[SCREENWIDTH];
+
+// vars for R_DrawMaskedColumn
+extern short*		mfloorclip;
+extern short*		mceilingclip;
+extern fixed_t		spryscale;
+extern fixed_t		sprtopscreen;
+
+extern fixed_t		pspritescale;
+extern fixed_t		pspriteiscale;
+
+
+// villsa [STIFE] new argument
+void R_DrawMaskedColumn (column_t *column, int baseclip);
+
+
+void R_SortVisSprites (void);
+
+void R_AddSprites (sector_t* sec);
+void R_AddPSprites (void);
+void R_DrawSprites (void);
+void R_InitSprites (const char** namelist);
+void R_ClearSprites (void);
+void R_DrawMasked (void);
+
+void
+R_ClipVisSprite
+( vissprite_t*		vis,
+  int			xl,
+  int			xh );
+
+
+#endif
diff --git a/games/NXDoom/src/strife/s_sound.c b/games/NXDoom/src/strife/s_sound.c
new file mode 100644
index 000000000..1de853fc0
--- /dev/null
+++ b/games/NXDoom/src/strife/s_sound.c
@@ -0,0 +1,825 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:  none
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "i_sound.h"
+#include "i_system.h"
+
+#include "deh_str.h"
+
+#include "doomstat.h"
+#include "doomtype.h"
+
+#include "sounds.h"
+#include "s_sound.h"
+
+#include "m_misc.h"
+#include "m_random.h"
+#include "m_argv.h"
+
+#include "p_local.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+// when to clip out sounds
+// Does not fit the large outdoor areas.
+
+#define S_CLIPPING_DIST (1200 * FRACUNIT)
+
+// Distance tp origin when sounds should be maxed out.
+// This should relate to movement clipping resolution
+// (see BLOCKMAP handling).
+// In the source code release: (160*FRACUNIT).  Changed back to the 
+// Vanilla value of 200 (why was this changed?)
+
+#define S_CLOSE_DIST (200 * FRACUNIT)
+
+// The range over which sound attenuates
+
+#define S_ATTENUATOR ((S_CLIPPING_DIST - S_CLOSE_DIST) >> FRACBITS)
+
+// Stereo separation
+
+#define S_STEREO_SWING (96 * FRACUNIT)
+
+#define NORM_PRIORITY 64
+#define NORM_SEP 128
+
+typedef struct
+{
+    // sound information (if null, channel avail.)
+    sfxinfo_t *sfxinfo;
+
+    // origin of sound
+    mobj_t *origin;
+
+    // handle of the sound being played
+    int handle;
+
+    int pitch;
+    
+} channel_t;
+
+// The set of channels available
+
+static channel_t *channels;
+
+// Maximum volume of a sound effect.
+// Internal default is max out of 0-15.
+
+int sfxVolume = 8;
+
+// Maximum volume of music. 
+
+int musicVolume = 13;
+
+// haleyjd 08/29/10: [STRIFE] New global variable
+// Volume of voice channel.
+
+int voiceVolume = 15;
+
+// Internal volume level, ranging from 0-127
+
+static int snd_SfxVolume;
+
+// haleyjd 09/11/10: [STRIFE] Internal voice volume level
+
+static int snd_VoiceVolume;
+
+// Whether songs are mus_paused
+
+static boolean mus_paused;        
+
+// Music currently being played
+
+static musicinfo_t *mus_playing = NULL;
+
+// Number of channels to use
+
+int snd_channels = 8;
+
+// haleyjd 09/11/10: [STRIFE] Handle of current voice channel.
+// This has been implemented at a higher level than it was implemented
+// in strife1.exe, as there it relied on a priority system which was
+// implicit in the SFX_PlayPatch API of DMX. Here we'll just ignore
+// the current voice channel when doing normal sound playing.
+
+static int i_voicehandle = -1;
+
+// haleyjd 09/11/10: [STRIFE] whether to play voices or not
+int disable_voices = 0;
+
+//
+// Initializes sound stuff, including volume
+// Sets channels, SFX and music volume,
+//  allocates channel buffer, sets S_sfx lookup.
+//
+// haleyjd 09/11/10: [STRIFE] Added voice volume
+//
+void S_Init(int sfxVolume, int musicVolume, int voiceVolume)
+{  
+    int i;
+
+    I_SetOPLDriverVer(opl_doom_1_9);
+    I_PrecacheSounds(S_sfx, NUMSFX);
+
+    S_SetSfxVolume(sfxVolume);
+    S_SetMusicVolume(musicVolume);
+    S_SetVoiceVolume(voiceVolume);
+
+    // Allocating the internal channels for mixing
+    // (the maximum numer of sounds rendered
+    // simultaneously) within zone memory.
+    channels = Z_Malloc(snd_channels*sizeof(channel_t), PU_STATIC, 0);
+
+    // Free all channels for use
+    for (i=0 ; i<snd_channels ; i++)
+    {
+        channels[i].sfxinfo = 0;
+    }
+
+    // no sounds are playing, and they are not mus_paused
+    mus_paused = 0;
+
+    // Note that sounds have not been cached (yet).
+    for (i=1 ; i<NUMSFX ; i++)
+    {
+        S_sfx[i].lumpnum = S_sfx[i].usefulness = -1;
+    }
+
+    I_AtExit(S_Shutdown, true);
+}
+
+void S_Shutdown(void)
+{
+    I_ShutdownSound();
+    I_ShutdownMusic();
+}
+
+static void S_StopChannel(int cnum)
+{
+    int i;
+    channel_t *c;
+
+    c = &channels[cnum];
+
+    // haleyjd: [STRIFE] If stopping the voice channel, set i_voicehandle to -1
+    if (cnum == i_voicehandle)
+        i_voicehandle = -1;
+
+    if (c->sfxinfo)
+    {
+        // stop the sound playing
+
+        if (I_SoundIsPlaying(c->handle))
+        {
+            I_StopSound(c->handle);
+        }
+
+        // check to see if other channels are playing the sound
+
+        for (i=0; i<snd_channels; i++)
+        {
+            if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
+            {
+                break;
+            }
+        }
+        
+        // degrade usefulness of sound data
+
+        c->sfxinfo->usefulness--;
+        c->sfxinfo = NULL;
+    }
+}
+
+//
+// Per level startup code.
+// Kills playing sounds at start of level,
+//  determines music if any, changes music.
+//
+// haleyjd 08/31/10: [STRIFE]
+// * Removed DOOM music handling and replaced with Strife code.
+//
+void S_Start(void)
+{
+    int cnum;
+    int mnum;
+
+    // kill all playing sounds at start of level
+    //  (trust me - a good idea)
+    for (cnum=0 ; cnum<snd_channels ; cnum++)
+    {
+        if (channels[cnum].sfxinfo)
+        {
+            S_StopChannel(cnum);
+        }
+    }
+
+    // start new music for the level
+    mus_paused = 0;
+
+    // [STRIFE] Some interesting math here ;)
+    if(gamemap <= 31)
+        mnum = 1;
+    else
+        mnum = -30;
+
+    S_ChangeMusic(gamemap + mnum, true);
+}
+
+void S_StopSound(mobj_t *origin)
+{
+    int cnum;
+
+    for (cnum=0 ; cnum<snd_channels ; cnum++)
+    {
+        // haleyjd: do not stop voice here.
+        if(cnum == i_voicehandle)
+            continue;
+
+        if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
+        {
+            S_StopChannel(cnum);
+            break;
+        }
+    }
+}
+
+//
+// S_GetChannel :
+//   If none available, return -1.  Otherwise channel #.
+//
+// haleyjd 09/11/10: [STRIFE] Added an "isvoice" parameter for supporting
+// voice playing.
+//
+static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo, boolean isvoice)
+{
+    // channel number to use
+    int                cnum;
+    
+    channel_t*        c;
+
+    // Find an open channel
+    for (cnum=0 ; cnum<snd_channels ; cnum++)
+    {
+        if (!channels[cnum].sfxinfo)
+        {
+            break;
+        } 
+        else if (origin && channels[cnum].origin == origin &&
+                 (isvoice || cnum != i_voicehandle)) // haleyjd
+        {
+            // haleyjd 20150220: [STRIFE] missing sound channel priority check
+            // Is a higher priority sound by same origin already playing?
+            if(!isvoice && sfxinfo->priority > channels[cnum].sfxinfo->priority)
+                return -1;
+
+            S_StopChannel(cnum);
+            break;
+        }
+    }
+
+    // None available
+    if (cnum == snd_channels)
+    {
+        // Look for lower priority
+        for (cnum=0 ; cnum<snd_channels ; cnum++)
+        {
+            if (channels[cnum].sfxinfo->priority >= sfxinfo->priority)
+            {
+                // haleyjd 09/11/10: [STRIFE] voice has absolute priority
+                if (isvoice || cnum != i_voicehandle)
+                    break;
+            }
+        }
+
+        if (cnum == snd_channels)
+        {
+            // FUCK!  No lower priority.  Sorry, Charlie.    
+            return -1;
+        }
+        else
+        {
+            // Otherwise, kick out lower priority.
+            S_StopChannel(cnum);
+        }
+    }
+
+    c = &channels[cnum];
+
+    // channel is decided to be cnum.
+    c->sfxinfo = sfxinfo;
+    c->origin = origin;
+
+    return cnum;
+}
+
+//
+// Changes volume and stereo-separation variables
+//  from the norm of a sound effect to be played.
+// If the sound is not audible, returns a 0.
+// Otherwise, modifies parameters and returns 1.
+//
+// [STRIFE]
+// haleyjd 20110220: changed to eliminate the gamemap == 8 hack that was
+// left over from Doom 1's original boss levels. Kind of amazing that Rogue
+// was able to catch the smallest things like that.
+//
+static int S_AdjustSoundParams(mobj_t *listener, mobj_t *source,
+                               int *vol, int *sep)
+{
+    fixed_t        approx_dist;
+    fixed_t        adx;
+    fixed_t        ady;
+    angle_t        angle;
+
+    // calculate the distance to sound origin
+    //  and clip it if necessary
+    adx = abs(listener->x - source->x);
+    ady = abs(listener->y - source->y);
+
+    // From _GG1_ p.428. Appox. eucledian distance fast.
+    approx_dist = adx + ady - ((adx < ady ? adx : ady)>>1);
+    
+    // [STRIFE] removed gamemap == 8 hack
+    if (approx_dist > S_CLIPPING_DIST)
+    {
+        return 0;
+    }
+    
+    // angle of source to listener
+    angle = R_PointToAngle2(listener->x,
+                            listener->y,
+                            source->x,
+                            source->y);
+
+    if (angle > listener->angle)
+    {
+        angle = angle - listener->angle;
+    }
+    else
+    {
+        angle = angle + (0xffffffff - listener->angle);
+    }
+
+    angle >>= ANGLETOFINESHIFT;
+
+    // stereo separation
+    *sep = 128 - (FixedMul(S_STEREO_SWING, finesine[angle]) >> FRACBITS);
+
+    // volume calculation
+    // [STRIFE] Removed gamemap == 8 hack
+    if (approx_dist < S_CLOSE_DIST)
+    {
+        *vol = snd_SfxVolume;
+    }
+    else
+    {
+        // distance effect
+        *vol = (snd_SfxVolume
+                * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
+            / S_ATTENUATOR; 
+    }
+    
+    return (*vol > 0);
+}
+
+void S_StartSound(void *origin_p, int sfx_id)
+{
+    sfxinfo_t *sfx;
+    mobj_t *origin;
+    int rc;
+    int sep;
+    int pitch;
+    int cnum;
+    int volume;
+
+    origin = (mobj_t *) origin_p;
+    volume = snd_SfxVolume;
+
+    // check for bogus sound #
+    if (sfx_id < 1 || sfx_id > NUMSFX)
+    {
+        // [STRIFE]: BUG - Note: vanilla had some extremely buggy and dangerous
+        // code here that tried to print the sprite name of the object playing 
+        // the bad sound. Because it invokes multiple undefined behaviors and 
+        // is of basically no consequence, it has deliberately not been ported.
+        I_Error("Bad sfx #: %d", sfx_id);
+    }
+
+    sfx = &S_sfx[sfx_id];
+
+    // Initialize sound parameters
+    if (sfx->link)
+    {
+        volume += sfx->volume;
+
+        if (volume < 1)
+        {
+            return;
+        }
+
+        if (volume > snd_SfxVolume)
+        {
+            volume = snd_SfxVolume;
+        }
+    }
+
+
+    // Check to see if it is audible,
+    //  and if not, modify the params
+    if (origin && origin != players[consoleplayer].mo)
+    {
+        rc = S_AdjustSoundParams(players[consoleplayer].mo,
+                                 origin,
+                                 &volume,
+                                 &sep);
+
+        if (origin->x == players[consoleplayer].mo->x
+         && origin->y == players[consoleplayer].mo->y)
+        {
+            sep = NORM_SEP;
+        }
+
+        if (!rc)
+        {
+            return;
+        }
+    }
+    else
+    {
+        sep = NORM_SEP;
+    }
+    pitch = NORM_PITCH;
+
+    // kill old sound [STRIFE] - nope!
+    //S_StopSound(origin);
+
+    // try to find a channel
+    cnum = S_GetChannel(origin, sfx, false); // haleyjd: not a voice.
+
+    if (cnum < 0)
+    {
+        return;
+    }
+
+    // increase the usefulness
+    if (sfx->usefulness++ < 0)
+    {
+        sfx->usefulness = 1;
+    }
+
+    if (sfx->lumpnum < 0)
+    {
+        sfx->lumpnum = I_GetSfxLumpNum(sfx);
+    }
+
+    channels[cnum].handle = I_StartSound(sfx, cnum, volume, sep, pitch);
+}
+
+
+// haleyjd 09/11/10: [STRIFE]
+// None of this was necessary in the vanilla EXE but Choco's low-level code
+// won't play nice with a temporary sfxinfo because it insists that the
+// "driver_data" member remain valid from the last time the sound was used,
+// even if it has already stopped playing. Thanks to this cuteness I get
+// to maintain a dynamic cache of sfxinfo objects!
+
+typedef struct voiceinfo_s
+{
+    sfxinfo_t sfx;
+    struct voiceinfo_s *next; // next on hash chain
+} voiceinfo_t;
+
+#define NUMVOICECHAINS 257
+
+//
+// Ripped from Eternity.
+//
+static unsigned int S_voiceHash(const char *str)
+{
+   const char *c = str;
+   unsigned int h = 0;
+
+   if(!str)
+      I_Error("S_voiceHash: cannot hash NULL string!\n");
+
+   // note: this needs to be case insensitive for lump names
+   while(*c)
+   {
+      h = 5 * h + toupper(*c);
+      ++c;
+   }
+
+   return h;
+}
+
+static voiceinfo_t *voices[NUMVOICECHAINS];
+
+//
+// S_getVoice
+//
+// Gets an entry from the voice table, if it exists. If it does not, one will be
+// created.
+//
+static voiceinfo_t *S_getVoice(const char *name, int lumpnum)
+{
+    voiceinfo_t *voice;
+    unsigned int hashkey = S_voiceHash(name) % NUMVOICECHAINS;
+
+    voice = voices[hashkey];
+
+    while(voice && strcasecmp(voice->sfx.name, name))
+        voice = voice->next;
+
+    if(!voice)
+    {
+        voice = calloc(1, sizeof(voiceinfo_t));
+
+        M_StringCopy(voice->sfx.name, name, sizeof(voice->sfx.name));
+        voice->sfx.priority = INT_MIN; // make highest possible priority
+        voice->sfx.pitch = -1;
+        voice->sfx.volume = -1;
+        voice->sfx.numchannels = -1;
+        voice->sfx.usefulness = -1;
+        voice->sfx.lumpnum = lumpnum;
+
+        // throw it onto the table.
+        voice->next = voices[hashkey];
+        voices[hashkey] = voice;
+    }
+
+    return voice;
+}
+
+//
+// I_StartVoice
+//
+// haleyjd 09/11/10: [STRIFE] New function
+// Note this was in i_sound.c in Strife itself, but relied on DMX-specific
+// features to ensure voice channels had absolute priority. Here we must
+// populate a fake sfxinfo_t and send the sound through some of the normal
+// routines. But in the end, it still works the same.
+//
+void I_StartVoice(const char *lumpname)
+{
+    int lumpnum;
+    voiceinfo_t *voice; // choco-specific
+    char lumpnamedup[9];
+
+    // no voices in deathmatch mode.
+    if(netgame)
+        return;
+
+    // STRIFE-TODO: checks if snd_SfxDevice == 83
+    // This is probably turning off voice if using PC speaker...
+
+    // user has disabled voices?
+    if(disable_voices)
+        return;
+
+    // have a voice playing already? stop it.
+    if(i_voicehandle >= 0)
+        S_StopChannel(i_voicehandle);
+
+    // Vanilla STRIFE appears to have stopped any current voice without
+    // starting a new one if NULL was passed in here, though I cannot 
+    // find an explicit check for NULL in the assembly. Either way, it 
+    // didn't crash, so do a check now:
+    if(lumpname == NULL)
+        return;
+
+    // Because of constness problems...
+    M_StringCopy(lumpnamedup, lumpname, sizeof(lumpnamedup));
+
+    if((lumpnum = W_CheckNumForName(lumpnamedup)) != -1)
+    {
+        // haleyjd: Choco-specific: get a voice structure
+        voice = S_getVoice(lumpnamedup, lumpnum);
+
+        // get a channel for the voice
+        i_voicehandle = S_GetChannel(NULL, &voice->sfx, true);
+
+        channels[i_voicehandle].handle 
+            = I_StartSound(&voice->sfx, i_voicehandle, snd_VoiceVolume, NORM_SEP, NORM_PITCH);
+    }
+}
+
+//
+// Stop and resume music, during game PAUSE.
+//
+
+void S_PauseSound(void)
+{
+    if (mus_playing && !mus_paused)
+    {
+        I_PauseSong();
+        mus_paused = true;
+    }
+}
+
+void S_ResumeSound(void)
+{
+    if (mus_playing && mus_paused)
+    {
+        I_ResumeSong();
+        mus_paused = false;
+    }
+}
+
+//
+// Updates music & sounds
+//
+
+void S_UpdateSounds(mobj_t *listener)
+{
+    int                audible;
+    int                cnum;
+    int                volume;
+    int                sep;
+    sfxinfo_t*        sfx;
+    channel_t*        c;
+
+    I_UpdateSound();
+
+    for (cnum=0; cnum<snd_channels; cnum++)
+    {
+        c = &channels[cnum];
+        sfx = c->sfxinfo;
+
+        if (c->sfxinfo)
+        {
+            if (I_SoundIsPlaying(c->handle))
+            {
+                // initialize parameters
+                volume = snd_SfxVolume;
+                sep = NORM_SEP;
+
+                if (sfx->link)
+                {
+                    volume += sfx->volume;
+                    if (volume < 1)
+                    {
+                        S_StopChannel(cnum);
+                        continue;
+                    }
+                    else if (volume > snd_SfxVolume)
+                    {
+                        volume = snd_SfxVolume;
+                    }
+                }
+
+                // check non-local sounds for distance clipping
+                //  or modify their params
+                if (c->origin && listener != c->origin)
+                {
+                    audible = S_AdjustSoundParams(listener,
+                                                  c->origin,
+                                                  &volume,
+                                                  &sep);
+
+                    if (!audible)
+                    {
+                        S_StopChannel(cnum);
+                    }
+                    else
+                    {
+                        I_UpdateSoundParams(c->handle, volume, sep);
+                    }
+                }
+            }
+            else
+            {
+                // if channel is allocated but sound has stopped,
+                //  free it
+                S_StopChannel(cnum);
+            }
+        }
+    }
+}
+
+void S_SetMusicVolume(int volume)
+{
+    if (volume < 0 || volume > 127)
+    {
+        I_Error("Attempt to set music volume at %d",
+                volume);
+    }    
+
+    I_SetMusicVolume(volume);
+}
+
+void S_SetSfxVolume(int volume)
+{
+    if (volume < 0 || volume > 127)
+    {
+        I_Error("Attempt to set sfx volume at %d", volume);
+    }
+
+    snd_SfxVolume = volume;
+}
+
+//
+// S_SetVoiceVolume
+//
+// haleyjd 09/11/10: [STRIFE]
+// Set the internal voice volume level.
+//
+void S_SetVoiceVolume(int volume)
+{
+    if (volume < 0 || volume > 127)
+    {
+        I_Error("Attempt to set voice volume at %d", volume);
+    }
+
+    snd_VoiceVolume = volume;
+}
+
+//
+// Starts some music with the music id found in sounds.h.
+//
+
+void S_StartMusic(int m_id)
+{
+    S_ChangeMusic(m_id, false);
+}
+
+void S_ChangeMusic(int musicnum, int looping)
+{
+    musicinfo_t *music = NULL;
+    char namebuf[9];
+    void *handle;
+
+    if (musicnum <= mus_None || musicnum >= NUMMUSIC)
+    {
+        I_Error("Bad music number %d", musicnum);
+    }
+    else
+    {
+        music = &S_music[musicnum];
+    }
+
+    if (mus_playing == music)
+    {
+        return;
+    }
+
+    // shutdown old music
+    S_StopMusic();
+
+    // get lumpnum if neccessary
+    if (!music->lumpnum)
+    {
+        M_snprintf(namebuf, sizeof(namebuf), "d_%s", DEH_String(music->name));
+        music->lumpnum = W_GetNumForName(namebuf);
+    }
+
+    music->data = W_CacheLumpNum(music->lumpnum, PU_STATIC);
+
+    handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
+    music->handle = handle;
+    I_PlaySong(handle, looping);
+
+    mus_playing = music;
+}
+
+boolean S_MusicPlaying(void)
+{
+    return I_MusicIsPlaying();
+}
+
+void S_StopMusic(void)
+{
+    if (mus_playing)
+    {
+        if (mus_paused)
+        {
+            I_ResumeSong();
+        }
+
+        I_StopSong();
+        I_UnRegisterSong(mus_playing->handle);
+        W_ReleaseLumpNum(mus_playing->lumpnum);
+        mus_playing->data = NULL;
+        mus_playing = NULL;
+    }
+}
+
diff --git a/games/NXDoom/src/strife/s_sound.h b/games/NXDoom/src/strife/s_sound.h
new file mode 100644
index 000000000..0521a94e1
--- /dev/null
+++ b/games/NXDoom/src/strife/s_sound.h
@@ -0,0 +1,95 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The not so system specific sound interface.
+//
+
+
+#ifndef __S_SOUND__
+#define __S_SOUND__
+
+#include "p_mobj.h"
+#include "sounds.h"
+
+//
+// Initializes sound stuff, including volume
+// Sets channels, SFX and music volume,
+//  allocates channel buffer, sets S_sfx lookup.
+//
+
+void S_Init(int sfxVolume, int musicVolume, int voiceVolume);
+
+
+// Shut down sound 
+
+void S_Shutdown(void);
+
+
+
+//
+// Per level startup code.
+// Kills playing sounds at start of level,
+//  determines music if any, changes music.
+//
+
+void S_Start(void);
+
+//
+// Start sound for thing at <origin>
+//  using <sound_id> from sounds.h
+//
+
+void S_StartSound(void *origin, int sound_id);
+
+// haleyjd 09/11/10: [STRIFE] Start a voice.
+void I_StartVoice(const char *lumpname);
+
+// Stop sound for thing at <origin>
+void S_StopSound(mobj_t *origin);
+
+
+// Start music using <music_id> from sounds.h
+void S_StartMusic(int music_id);
+
+// Start music using <music_id> from sounds.h,
+//  and set whether looping
+void S_ChangeMusic(int music_id, int looping);
+
+// query if music is playing
+boolean S_MusicPlaying(void);
+
+// Stops the music fer sure.
+void S_StopMusic(void);
+
+// Stop and resume music, during game PAUSE.
+void S_PauseSound(void);
+void S_ResumeSound(void);
+
+
+//
+// Updates music & sounds
+//
+void S_UpdateSounds(mobj_t *listener);
+
+void S_SetMusicVolume(int volume);
+void S_SetSfxVolume(int volume);
+void S_SetVoiceVolume(int volume); // haleyjd 09/11/10: [STRIFE]
+
+extern int snd_channels;
+
+extern int disable_voices;
+
+#endif
+
diff --git a/games/NXDoom/src/strife/sounds.c b/games/NXDoom/src/strife/sounds.c
new file mode 100644
index 000000000..27a4948f2
--- /dev/null
+++ b/games/NXDoom/src/strife/sounds.c
@@ -0,0 +1,227 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Created by a sound utility.
+//	Kept as a sample, DOOM2 sounds.
+//
+
+
+#include <stdlib.h>
+
+
+#include "doomtype.h"
+#include "sounds.h"
+
+//
+// Information about all the music
+//
+
+#define MUSIC(name) \
+    { name, 0, NULL, NULL }
+
+// villsa [STRIFE]
+musicinfo_t S_music[] =
+{
+    MUSIC(NULL),
+    MUSIC("logo"),
+    MUSIC("action"),
+    MUSIC("tavern"),
+    MUSIC("danger"),
+    MUSIC("fast"),
+    MUSIC("intro"),
+    MUSIC("darker"),
+    MUSIC("strike"),
+    MUSIC("slide"),
+    MUSIC("tribal"),
+    MUSIC("march"),
+    MUSIC("danger"),
+    MUSIC("mood"),
+    MUSIC("castle"),
+    MUSIC("darker"),
+    MUSIC("action"),
+    MUSIC("fight"),
+    MUSIC("spense"),
+    MUSIC("slide"),
+    MUSIC("strike"),
+    MUSIC("dark"),
+    MUSIC("tech"),
+    MUSIC("slide"),
+    MUSIC("drone"),
+    MUSIC("panthr"),
+    MUSIC("sad"),
+    MUSIC("instry"),
+    MUSIC("tech"),
+    MUSIC("action"),
+    MUSIC("instry"),
+    MUSIC("drone"),
+    MUSIC("fight"),
+    MUSIC("happy"),
+    MUSIC("end")
+
+
+};
+
+
+//
+// Information about all the sfx
+//
+
+#define SOUND(name, priority) \
+  { NULL, name, priority, NULL, -1, -1, 0, 0, -1, NULL }
+#define SOUND_LINK(name, priority, link_id, pitch, volume) \
+  { NULL, name, priority, &S_sfx[link_id], pitch, volume, 0, 0, -1, NULL }
+
+// villsa [STRIFE]
+sfxinfo_t S_sfx[] =
+{
+  // S_sfx[0] needs to be a dummy for odd reasons.
+  SOUND("none",     0),
+  SOUND("swish",     64),
+  SOUND("meatht",    64),
+  SOUND("mtalht",    64),
+  SOUND("wpnup",     78),
+  SOUND("rifle",     64),
+  SOUND("mislht",    64),
+  SOUND("barexp",    32),
+  SOUND("flburn",    64),
+  SOUND("flidl",     118),
+  SOUND("agrsee",    98),
+  SOUND("plpain",    96),
+  SOUND("pcrush",    96),
+  SOUND("pespna",    98),
+  SOUND("pespnb",    98),
+  SOUND("pespnc",    98),
+  SOUND("pespnd",    98),
+  SOUND("agrdpn",    98),
+  SOUND("pldeth",    32),
+  SOUND("plxdth",    32),
+  SOUND("slop",      78),
+  SOUND("rebdth",    98),
+  SOUND("agrdth",    98),
+  SOUND("lgfire",    211),
+  SOUND("smfire",    211),
+  SOUND("alarm",     210),
+  SOUND("drlmto",    98),
+  SOUND("drlmtc",    98),
+  SOUND("drsmto",    98),
+  SOUND("drsmtc",    98),
+  SOUND("drlwud",    98),
+  SOUND("drswud",    98),
+  SOUND("drston",    98),
+  SOUND("bdopn",     98),
+  SOUND("bdcls",     98),
+  SOUND("swtchn",    78),
+  SOUND("swbolt",    98),
+  SOUND("swscan",    98),
+  SOUND("yeah",      10),
+  SOUND("mask",      210),
+  SOUND("pstart",    100),
+  SOUND("pstop",     100),
+  SOUND("itemup",    78),
+  SOUND("bglass",    200),
+  SOUND("wriver",    201),
+  SOUND("wfall",     201),
+  SOUND("wdrip",     201),
+  SOUND("wsplsh",    95),
+  SOUND("rebact",    200),
+  SOUND("agrac1",    98),
+  SOUND("agrac2",    98),
+  SOUND("agrac3",    98),
+  SOUND("agrac4",    98),
+  SOUND("ambppl",    218),
+  SOUND("ambbar",    218),
+  SOUND("telept",    32),
+  SOUND("ratact",    99),
+  SOUND("itmbk",     100),
+  SOUND("xbow",      99),
+  SOUND("burnme",    95),
+  SOUND("oof",       96),
+  SOUND("wbrldt",    98),
+  SOUND("psdtha",    109),
+  SOUND("psdthb",    109),
+  SOUND("psdthc",    109),
+  SOUND("rb2pn",     96),
+  SOUND("rb2dth",    32),
+  SOUND("rb2see",    98),
+  SOUND("rb2act",    98),
+  SOUND("firxpl",    70),
+  SOUND("stnmov",    100),
+  SOUND("noway",     78),
+  SOUND("rlaunc",    64),
+  SOUND("rflite",    65),
+  SOUND("radio",     60),
+  SOUND("pulchn",    98),
+  SOUND("swknob",    98),
+  SOUND("keycrd",    98),
+  SOUND("swston",    98),
+  SOUND("sntsee",    98),
+  SOUND("sntdth",    98),
+  SOUND("sntact",    98),
+  SOUND("pgrdat",    64),
+  SOUND("pgrsee",    90),
+  SOUND("pgrdpn",    96),
+  SOUND("pgrdth",    32),
+  SOUND("pgract",    120),
+  SOUND("proton",    64),
+  SOUND("protfl",    64),
+  SOUND("plasma",    64),
+  SOUND("dsrptr",    30),
+  SOUND("reavat",    64),
+  SOUND("revbld",    64),
+  SOUND("revsee",    90),
+  SOUND("reavpn",    96),
+  SOUND("revdth",    32),
+  SOUND("revact",    120),
+  SOUND("spisit",    90),
+  SOUND("spdwlk",    65),
+  SOUND("spidth",    32),
+  SOUND("spdatk",    32),
+  SOUND("chant",     218),
+  SOUND("static",    32),
+  SOUND("chain",     70),
+  SOUND("tend",      100),
+  SOUND("phoot",     32),
+  SOUND("explod",    32),
+  SOUND("sigil",     32),
+  SOUND("sglhit",    32),
+  SOUND("siglup",    32),
+  SOUND("prgpn",     96),
+  SOUND("progac",    120),
+  SOUND("lorpn",     96),
+  SOUND("lorsee",    90),
+  SOUND("difool",    32),
+  SOUND("inqdth",    32),
+  SOUND("inqact",    98),
+  SOUND("inqsee",    90),
+  SOUND("inqjmp",    65),
+  SOUND("amaln1",    99),
+  SOUND("amaln2",    99),
+  SOUND("amaln3",    99),
+  SOUND("amaln4",    99),
+  SOUND("amaln5",    99),
+  SOUND("amaln6",    99),
+  SOUND("mnalse",    64),
+  SOUND("alnsee",    64),
+  SOUND("alnpn",     96),
+  SOUND("alnact",    120),
+  SOUND("alndth",    32),
+  SOUND("mnaldt",    32),
+  SOUND("reactr",    31),
+  SOUND("airlck",    98),
+  SOUND("drchno",    98),
+  SOUND("drchnc",    98),
+  SOUND("valve",     98)
+};
+
diff --git a/games/NXDoom/src/strife/sounds.h b/games/NXDoom/src/strife/sounds.h
new file mode 100644
index 000000000..38ed0bfcf
--- /dev/null
+++ b/games/NXDoom/src/strife/sounds.h
@@ -0,0 +1,222 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Created by the sound utility written by Dave Taylor.
+//	Kept as a sample, DOOM2  sounds. Frozen.
+//
+
+#ifndef __SOUNDS__
+#define __SOUNDS__
+
+#include "i_sound.h"
+
+// the complete set of sound effects
+extern sfxinfo_t	S_sfx[];
+
+// the complete set of music
+extern musicinfo_t	S_music[];
+
+//
+// Identifiers for all music in game.
+//
+
+// villsa [STRIFE]
+typedef enum
+{
+    mus_None,
+    mus_logo,
+    mus_action,
+    mus_tavern,
+    mus_danger,
+    mus_fast,
+    mus_intro,
+    mus_darker,
+    mus_strike,
+    mus_slide,
+    mus_tribal,
+    mus_march,
+    mus_danger2,
+    mus_mood,
+    mus_castle,
+    mus_darker2,
+    mus_action2,
+    mus_fight,
+    mus_spense,
+    mus_slide2,
+    mus_strike2,
+    mus_dark,
+    mus_tech,
+    mus_slide3,
+    mus_drone,
+    mus_panthr,
+    mus_sad,
+    mus_instry,
+    mus_tech2,
+    mus_action3,
+    mus_instry2,
+    mus_drone2,
+    mus_fight2,
+    mus_happy,
+    mus_end,
+    NUMMUSIC
+} musicenum_t;
+
+
+//
+// Identifiers for all sfx in game.
+//
+
+typedef enum
+{
+    sfx_None,
+    sfx_swish,
+    sfx_meatht,
+    sfx_mtalht,
+    sfx_wpnup,
+    sfx_rifle,
+    sfx_mislht,
+    sfx_barexp,
+    sfx_flburn,
+    sfx_flidl,
+    sfx_agrsee,
+    sfx_plpain,
+    sfx_pcrush,
+    sfx_pespna,
+    sfx_pespnb,
+    sfx_pespnc,
+    sfx_pespnd,
+    sfx_agrdpn,
+    sfx_pldeth,
+    sfx_plxdth,
+    sfx_slop,
+    sfx_rebdth,
+    sfx_agrdth,
+    sfx_lgfire,
+    sfx_smfire,
+    sfx_alarm,
+    sfx_drlmto,
+    sfx_drlmtc,
+    sfx_drsmto,
+    sfx_drsmtc,
+    sfx_drlwud,
+    sfx_drswud,
+    sfx_drston,
+    sfx_bdopn,
+    sfx_bdcls,
+    sfx_swtchn,
+    sfx_swbolt,
+    sfx_swscan,
+    sfx_yeah,
+    sfx_mask,
+    sfx_pstart,
+    sfx_pstop,
+    sfx_itemup,
+    sfx_bglass,
+    sfx_wriver,
+    sfx_wfall,
+    sfx_wdrip,
+    sfx_wsplsh,
+    sfx_rebact,
+    sfx_agrac1,
+    sfx_agrac2,
+    sfx_agrac3,
+    sfx_agrac4,
+    sfx_ambppl,
+    sfx_ambbar,
+    sfx_telept,
+    sfx_ratact,
+    sfx_itmbk,
+    sfx_xbow,
+    sfx_burnme,
+    sfx_oof,
+    sfx_wbrldt,
+    sfx_psdtha,
+    sfx_psdthb,
+    sfx_psdthc,
+    sfx_rb2pn,
+    sfx_rb2dth,
+    sfx_rb2see,
+    sfx_rb2act,
+    sfx_firxpl,
+    sfx_stnmov,
+    sfx_noway,
+    sfx_rlaunc,
+    sfx_rflite,
+    sfx_radio,
+    sfx_pulchn,
+    sfx_swknob,
+    sfx_keycrd,
+    sfx_swston,
+    sfx_sntsee,
+    sfx_sntdth,
+    sfx_sntact,
+    sfx_pgrdat,
+    sfx_pgrsee,
+    sfx_pgrdpn,
+    sfx_pgrdth,
+    sfx_pgract,
+    sfx_proton,
+    sfx_protfl,
+    sfx_plasma,
+    sfx_dsrptr,
+    sfx_reavat,
+    sfx_revbld,
+    sfx_revsee,
+    sfx_reavpn,
+    sfx_revdth,
+    sfx_revact,
+    sfx_spisit,
+    sfx_spdwlk,
+    sfx_spidth,
+    sfx_spdatk,
+    sfx_chant,
+    sfx_static,
+    sfx_chain,
+    sfx_tend,
+    sfx_phoot,
+    sfx_explod,
+    sfx_sigil,
+    sfx_sglhit,
+    sfx_siglup,
+    sfx_prgpn,
+    sfx_progac,
+    sfx_lorpn,
+    sfx_lorsee,
+    sfx_difool,
+    sfx_inqdth,
+    sfx_inqact,
+    sfx_inqsee,
+    sfx_inqjmp,
+    sfx_amaln1,
+    sfx_amaln2,
+    sfx_amaln3,
+    sfx_amaln4,
+    sfx_amaln5,
+    sfx_amaln6,
+    sfx_mnalse,
+    sfx_alnsee,
+    sfx_alnpn,
+    sfx_alnact,
+    sfx_alndth,
+    sfx_mnaldt,
+    sfx_reactr,
+    sfx_airlck,
+    sfx_drchno,
+    sfx_drchnc,
+    sfx_valve,
+    NUMSFX
+} sfxenum_t;
+
+#endif
diff --git a/games/NXDoom/src/strife/st_lib.c b/games/NXDoom/src/strife/st_lib.c
new file mode 100644
index 000000000..3ade09557
--- /dev/null
+++ b/games/NXDoom/src/strife/st_lib.c
@@ -0,0 +1,326 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	The status bar widget code.
+//
+
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include "deh_main.h"
+#include "doomdef.h"
+
+#include "z_zone.h"
+#include "v_video.h"
+
+#include "i_swap.h"
+#include "i_system.h"
+
+#include "w_wad.h"
+
+#include "st_stuff.h"
+#include "st_lib.h"
+#include "r_local.h"
+
+
+//
+// Hack display negative frags.
+//  Loads and store the stminus lump.
+//
+patch_t*		sttminus;
+
+void STlib_init(void)
+{
+    // haleyjd 08/28/10: [STRIFE] STTMINUS -> STCFN045
+    sttminus = (patch_t *) W_CacheLumpName(DEH_String("STCFN045"), PU_STATIC);
+}
+
+
+// 
+// STlib_initNum
+//
+// haleyjd 09/01/10: [STRIFE]
+// * Rogue removed the "on" member of st_number_t.
+void
+STlib_initNum
+( st_number_t*		n,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  int			width )
+{
+    n->x	= x;
+    n->y	= y;
+    n->width	= width;
+    n->num	= num;
+    n->p	= pl;
+}
+
+
+// 
+// STlib_drawNum
+//
+// A fairly efficient way to draw a number
+//  based on differences from the old number.
+// Note: worth the trouble?
+//
+// haleyjd 09/01/10: [STRIFE]
+// * Rogue removed the "refresh" parameter and caching code
+//
+void
+STlib_drawNum
+( st_number_t*  n)
+{
+    int         numdigits = n->width;
+    int         num = *n->num;
+
+    int         w = SHORT(n->p[0]->width) + 1; // [STRIFE] +1
+    int         x = n->x;
+
+    int         neg;
+
+    neg = num < 0;
+
+    if (neg)
+    {
+        if (numdigits == 2 && num < -9)
+            num = -9;
+        else if (numdigits == 3 && num < -99)
+            num = -99;
+
+        num = -num;
+    }
+
+    /* haleyjd 09/01/10: [STRIFE] Widget caching system removed by Rogue
+    // clear the area
+    x = n->x - numdigits*w;
+
+    if (n->y - ST_Y < 0)
+        I_Error("drawNum: n->y - ST_Y < 0");
+
+    V_CopyRect(x, n->y - ST_Y, st_backing_screen, w*numdigits, h, x, n->y);
+    */
+
+    // if non-number, do not draw it
+    if (num == 1994)
+        return;
+
+    x = n->x;
+
+    // in the special case of 0, you draw 0
+    if (!num)
+        V_DrawPatch(x - w, n->y, n->p[ 0 ]);
+
+    // draw the new number
+    while (num && numdigits--)
+    {
+        x -= w;
+        V_DrawPatch(x, n->y, n->p[ num % 10 ]);
+        num /= 10;
+    }
+
+    // draw a minus sign if necessary
+    if (neg)
+        V_DrawPatch(x - 8, n->y, sttminus);
+}
+
+
+// 
+// STlib_drawNumPositive
+//
+// haleyjd 09/01/10: [STRIFE] New function.
+// * Mostly the same as STlib_drawNum, except doesn't draw negatives.
+//
+void
+STlib_drawNumPositive
+( st_number_t*  n)
+{
+    int         numdigits = n->width;
+    int         num = *n->num;
+
+    int         w = SHORT(n->p[0]->width) + 1; // [STRIFE] +1
+    int         x = n->x;
+
+    // Don't draw negative values.
+    if (num < 0)
+        num = 0;
+
+    // if non-number, do not draw it
+    if (num == 1994)
+        return;
+
+    x = n->x;
+
+    // in the special case of 0, you draw 0
+    if (!num)
+        V_DrawPatch(x - w, n->y, n->p[ 0 ]);
+
+    // draw the new number
+    while (num && numdigits--)
+    {
+        x -= w;
+        V_DrawPatch(x, n->y, n->p[ num % 10 ]);
+        num /= 10;
+    }
+}
+
+
+// haleyjd 09/01/10: [STRIFE] All other functions were removed.
+/*
+void
+STlib_updateNum
+( st_number_t*		n,
+  boolean		refresh )
+{
+    if (*n->on) STlib_drawNum(n, refresh);
+}
+
+
+//
+void
+STlib_initPercent
+( st_percent_t*		p,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  boolean*		on,
+  patch_t*		percent )
+{
+    STlib_initNum(&p->n, x, y, pl, num, on, 3);
+    p->p = percent;
+}
+
+
+
+
+void
+STlib_updatePercent
+( st_percent_t*		per,
+  int			refresh )
+{
+    if (refresh && *per->n.on)
+	V_DrawPatch(per->n.x, per->n.y, per->p);
+    
+    STlib_updateNum(&per->n, refresh);
+}
+
+
+
+void
+STlib_initMultIcon
+( st_multicon_t*	i,
+  int			x,
+  int			y,
+  patch_t**		il,
+  int*			inum,
+  boolean*		on )
+{
+    i->x	= x;
+    i->y	= y;
+    i->oldinum 	= -1;
+    i->inum	= inum;
+    i->on	= on;
+    i->p	= il;
+}
+
+
+
+void
+STlib_updateMultIcon
+( st_multicon_t*	mi,
+  boolean		refresh )
+{
+    int			w;
+    int			h;
+    int			x;
+    int			y;
+
+    if (*mi->on
+	&& (mi->oldinum != *mi->inum || refresh)
+	&& (*mi->inum!=-1))
+    {
+	if (mi->oldinum != -1)
+	{
+	    x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
+	    y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
+	    w = SHORT(mi->p[mi->oldinum]->width);
+	    h = SHORT(mi->p[mi->oldinum]->height);
+
+	    if (y - ST_Y < 0)
+		I_Error("updateMultIcon: y - ST_Y < 0");
+
+	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
+	}
+	V_DrawPatch(mi->x, mi->y, mi->p[*mi->inum]);
+	mi->oldinum = *mi->inum;
+    }
+}
+
+
+
+void
+STlib_initBinIcon
+( st_binicon_t*		b,
+  int			x,
+  int			y,
+  patch_t*		i,
+  boolean*		val,
+  boolean*		on )
+{
+    b->x	= x;
+    b->y	= y;
+    b->oldval	= false;
+    b->val	= val;
+    b->on	= on;
+    b->p	= i;
+}
+
+
+
+void
+STlib_updateBinIcon
+( st_binicon_t*		bi,
+  boolean		refresh )
+{
+    int			x;
+    int			y;
+    int			w;
+    int			h;
+
+    if (*bi->on
+     && (bi->oldval != *bi->val || refresh))
+    {
+	x = bi->x - SHORT(bi->p->leftoffset);
+	y = bi->y - SHORT(bi->p->topoffset);
+	w = SHORT(bi->p->width);
+	h = SHORT(bi->p->height);
+
+	if (y - ST_Y < 0)
+	    I_Error("updateBinIcon: y - ST_Y < 0");
+
+	if (*bi->val)
+	    V_DrawPatch(bi->x, bi->y, bi->p);
+	else
+	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
+
+	bi->oldval = *bi->val;
+    }
+
+}
+*/
+
diff --git a/games/NXDoom/src/strife/st_lib.h b/games/NXDoom/src/strife/st_lib.h
new file mode 100644
index 000000000..b2c85a818
--- /dev/null
+++ b/games/NXDoom/src/strife/st_lib.h
@@ -0,0 +1,221 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+// 	The status bar widget code.
+//
+
+#ifndef __STLIB__
+#define __STLIB__
+
+
+// We are referring to patches.
+#include "r_defs.h"
+
+//
+// Typedefs of widgets
+//
+
+// Number widget
+
+typedef struct
+{
+    // upper right-hand corner
+    //  of the number (right-justified)
+    int         x;
+    int         y;
+
+    // max # of digits in number
+    int width;
+
+    // haleyjd 09/01/10: [STRIFE] Removed "oldnum" member
+    //int         oldnum;
+    
+    // pointer to current value
+    int*        num;
+
+    // haleyjd 09/01/10: [STRIFE] Removed "on" member
+    // boolean*    on;
+
+    // list of patches for 0-9
+    patch_t**   p;
+
+    // user data
+    int data;
+    
+} st_number_t;
+
+
+
+// Percent widget ("child" of number widget,
+//  or, more precisely, contains a number widget.)
+typedef struct
+{
+    // number information
+    st_number_t		n;
+
+    // percent sign graphic
+    patch_t*		p;
+    
+} st_percent_t;
+
+
+
+// Multiple Icon widget
+typedef struct
+{
+     // center-justified location of icons
+    int			x;
+    int			y;
+
+    // last icon number
+    int			oldinum;
+
+    // pointer to current icon
+    int*		inum;
+
+    // pointer to boolean stating
+    //  whether to update icon
+    boolean*		on;
+
+    // list of icons
+    patch_t**		p;
+    
+    // user data
+    int			data;
+    
+} st_multicon_t;
+
+
+
+
+// Binary Icon widget
+
+typedef struct
+{
+    // center-justified location of icon
+    int			x;
+    int			y;
+
+    // last icon value
+    boolean		oldval;
+
+    // pointer to current icon status
+    boolean*		val;
+
+    // pointer to boolean
+    //  stating whether to update icon
+    boolean*		on;  
+
+
+    patch_t*		p;	// icon
+    int			data;   // user data
+    
+} st_binicon_t;
+
+
+
+//
+// Widget creation, access, and update routines
+//
+
+// Initializes widget library.
+// More precisely, initialize STMINUS,
+//  everything else is done somewhere else.
+//
+void STlib_init(void);
+
+
+
+// Number widget routines
+
+// haleyjd 09/01/10: [STRIFE] Removed "on" parameter.
+void
+STlib_initNum
+( st_number_t*          n,
+  int                   x,
+  int                   y,
+  patch_t**             pl,
+  int*                  num,
+  int                   width );
+
+// haleyjd 09/01/10: [STRIFE] Made globally visible.
+void
+STlib_drawNum
+( st_number_t*  n);
+
+// haleyjd 09/01/10: [STRIFE] New function
+void
+STlib_drawNumPositive
+( st_number_t*  n);
+
+/* haleyjd 09/01/10: [STRIFE] All the below were removed
+void
+STlib_updateNum
+( st_number_t*		n,
+  boolean		refresh );
+
+
+// Percent widget routines
+void
+STlib_initPercent
+( st_percent_t*		p,
+  int			x,
+  int			y,
+  patch_t**		pl,
+  int*			num,
+  boolean*		on,
+  patch_t*		percent );
+
+
+void
+STlib_updatePercent
+( st_percent_t*		per,
+  int			refresh );
+
+
+// Multiple Icon widget routines
+void
+STlib_initMultIcon
+( st_multicon_t*	mi,
+  int			x,
+  int			y,
+  patch_t**		il,
+  int*			inum,
+  boolean*		on );
+
+
+void
+STlib_updateMultIcon
+( st_multicon_t*	mi,
+  boolean		refresh );
+
+// Binary Icon widget routines
+
+void
+STlib_initBinIcon
+( st_binicon_t*		b,
+  int			x,
+  int			y,
+  patch_t*		i,
+  boolean*		val,
+  boolean*		on );
+
+void
+STlib_updateBinIcon
+( st_binicon_t*		bi,
+  boolean		refresh );
+*/
+
+#endif
diff --git a/games/NXDoom/src/strife/st_stuff.c b/games/NXDoom/src/strife/st_stuff.c
new file mode 100644
index 000000000..ae1d4cd90
--- /dev/null
+++ b/games/NXDoom/src/strife/st_stuff.c
@@ -0,0 +1,1605 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Status bar code.
+//	Does the face/direction indicator animatin.
+//	Does palette indicators as well (red pain/berserk, bright pickup)
+//
+
+
+
+#include <stdio.h>
+
+#include "i_system.h"
+#include "i_video.h"
+#include "z_zone.h"
+#include "m_random.h"
+#include "w_wad.h"
+
+#include "deh_main.h"
+#include "deh_misc.h"
+#include "doomdef.h"
+#include "doomkeys.h"
+
+#include "g_game.h"
+
+#include "st_stuff.h"
+#include "st_lib.h"
+#include "r_local.h"
+
+#include "p_local.h"
+#include "p_inter.h"
+#include "p_dialog.h"   // villsa [STRIFE]
+
+#include "am_map.h"
+#include "m_cheat.h"
+#include "m_menu.h" // villsa [STRIFE]
+#include "m_misc.h"
+
+#include "s_sound.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+#include "i_swap.h"
+
+// State.
+#include "doomstat.h"
+#include "d_main.h"    // [STRIFE]
+
+// Data.
+#include "dstrings.h"
+#include "sounds.h"
+#include "m_controls.h"
+#include "hu_lib.h"     // [STRIFE]
+#include "hu_stuff.h"
+
+//
+// STATUS BAR DATA
+//
+
+// Palette indices.
+// For damage/bonus red-/gold-shifts
+#define STARTREDPALS            1
+#define STARTBONUSPALS          9
+#define NUMREDPALS              8
+#define NUMBONUSPALS            4
+// Radiation suit, green shift.
+#define RADIATIONPAL            13
+
+// Location of status bar
+#define ST_X                    0
+
+// Location and size of statistics,
+//  justified according to widget type.
+// Problem is, within which space? STbar? Screen?
+// Note: this could be read in by a lump.
+//       Problem is, is the stuff rendered
+//       into a buffer,
+//       or into the frame buffer?
+
+// AMMO number pos.
+// haleyjd 20100901: [STRIFE] Adjusted.
+#define ST_AMMOWIDTH            3
+#define ST_AMMOX                311
+#define ST_AMMOY                162
+
+// HEALTH number pos.
+// haleyjd 20100901: [STRIFE] Adjusted.
+#define ST_HEALTHWIDTH          3
+#define ST_HEALTHX              79
+#define ST_HEALTHY              162
+
+// [STRIFE]
+// Removed:
+// * Weapon pos.
+// * Frags pos.
+// * ARMOR number pos.
+// * Key icon positions.
+
+// Ammunition counter.
+// haleyjd 20110213 [STRIFE]: ammo counters for the popup widget
+#define ST_POPUPAMMOX       206
+static const int st_yforammo[NUMAMMO] = { 75, 99, 91, 139, 131, 115, 123 };
+static const int st_wforammo[NUMAMMO] = { 3,  3,  2,  3,   3,   2,   3   };
+
+// Indicate maximum ammunition.
+// Only needed because backpack exists.
+// haleyjd 20110213 [STRIFE]: maxammo counters for the popup widget
+#define ST_POPUPMAXAMMOX        239
+
+// [STRIFE]
+// Removed:
+// * Doom weapon stuff
+// * DETH title (???)
+
+// Dimensions given in characters.
+#define ST_MSGWIDTH             52
+
+// haleyjd 20100831: [STRIFE] 
+// * Removed faces.
+// haleyjd 20100901:
+// * Removed DOOM pre-beta cruft.
+// * Removed deathmatch frags/arms-related stuff.
+// * Removed arms panel stuff.
+// * Removed unused widgets.
+// * Removed more faces, keyboxes, st_randomnumber
+
+// graphics are drawn to a backing screen and blitted to the real screen
+//byte                   *st_backing_screen;  - [STRIFE]: Unused.
+
+// main player in game
+static player_t*        plyr; 
+
+// ST_Start() has just been called
+static boolean          st_firsttime;
+
+// lump number for PLAYPAL
+static int              lu_palette;
+
+// whether left-side main status bar is active
+static boolean          st_statusbaron;
+
+// villsa [STRIFE]
+static boolean          st_dosizedisplay = false;
+
+// haleyjd 09/01/10: [STRIFE]
+// Whether or not a popup is currently displayed
+static boolean          st_displaypopup = false;
+
+// villsa [STRIFE]
+static int              st_popupdisplaytics = 0;
+
+// villsa [STRIFE]
+// Whether or not show popup objective screen
+static boolean          st_showobjective = false;
+
+// villsa [STRIFE]
+static boolean          st_showinvpop = false;
+
+// villsa [STRIFE]
+static boolean          st_showkeys = false;
+
+// villsa [STRIFE] TODO - identify variables
+static int              st_keypage = -1;
+// [unused] static int              dword_88490 = 0;
+
+// haleyjd 09/19/10: [STRIFE] Cached player data
+static int              st_lastcursorpos;
+static int              st_lastammo;
+static int              st_lastarmortype;
+static int              st_lasthealth;
+
+// haleyjd 20100901: [STRIFE] sbar -> invback
+// main inventory background and other bits
+static patch_t*         invback;     // main bar
+static patch_t*         stback;      // multiplayer background
+static patch_t*         invtop;      // top bit
+static patch_t*         invpop;      // popup frame with text
+static patch_t*         invpop2;     // plain popup frame
+static patch_t*         invpbak;     // popup background w/details
+static patch_t*         invpbak2;    // plain popup background
+static patch_t*         invcursor;   // cursor
+
+// ammo/weapon/armor patches
+static patch_t*         invammo[NUMAMMO]; // ammo/weapons
+static patch_t*         invsigil[5];      // sigil pieces
+static patch_t*         invarmor[2];      // armor icons
+
+// names for ammo patches
+static const char *invammonames[NUMAMMO] =
+{
+    "I_BLIT",
+    "I_XQRL",
+    "I_PQRL",
+    "I_BRY1",
+    "I_ROKT",
+    "I_GRN1",
+    "I_GRN2"
+};
+
+// haleyjd 20100901: [STRIFE] Replaced tallnum, shortnum w/inv fonts
+// 0-9, green numbers
+static patch_t*         invfontg[10];
+
+// 0-9, yellow numbers
+static patch_t*         invfonty[10];
+
+// [unused] 3 key-cards, 3 skulls -- [STRIFE] has a lot more keys than 3 :P
+//static patch_t*         keys[NUMCARDS]; 
+
+// ready-weapon widget
+static st_number_t      w_ready; // haleyjd [STRIFE]: This is still used.
+
+// haleyjd: [STRIFE] This is still used but was changed to a st_number_t.
+// health widget
+static st_number_t      w_health;
+
+// ammo widgets
+static st_number_t      w_ammo[NUMAMMO];     // haleyjd [STRIFE]: Still used.
+
+// max ammo widgets
+static st_number_t      w_maxammo[NUMAMMO];  // haleyjd [STRIFE]: Still used.
+
+// [unused] number of frags so far in deathmatch
+//static int              st_fragscount;
+
+
+cheatseq_t cheat_mus        = CHEAT("spin", 2);         // [STRIFE]: idmus -> spin
+cheatseq_t cheat_god        = CHEAT("omnipotent", 0);   // [STRIFE]: iddqd -> omnipotent
+cheatseq_t cheat_ammo       = CHEAT("boomstix", 0);     // [STRIFE]: idfa -> boomstix
+cheatseq_t cheat_noclip     = CHEAT("elvis", 0);        // [STRIFE]: idclip -> elvis
+cheatseq_t cheat_clev       = CHEAT("rift", 2);         // [STRIFE]: idclev -> rift
+cheatseq_t cheat_mypos      = CHEAT("gps", 0);          // [STRIFE]: idmypos -> gps
+cheatseq_t cheat_scoot      = CHEAT("scoot", 1);        // [STRIFE]: new cheat scoot
+cheatseq_t cheat_nuke       = CHEAT("stonecold", 0);    // [STRIFE]: new cheat stonecold
+cheatseq_t cheat_keys       = CHEAT("jimmy", 0);        // [STRIFE]: new cheat jimmy (all keys)
+cheatseq_t cheat_stealth    = CHEAT("gripper", 0);      // [STRIFE]: new cheat gripper
+cheatseq_t cheat_midas      = CHEAT("donnytrump", 0);   // [STRIFE]: new cheat
+cheatseq_t cheat_lego       = CHEAT("lego", 0);         // [STRIFE]: new cheat
+cheatseq_t cheat_dev        = CHEAT("dots", 0);         // [STRIFE]: new cheat
+
+// haleyjd 20110224: enumeration for access to powerup cheats
+enum
+{
+    ST_PUMPUP_B,
+    ST_PUMPUP_I,
+    ST_PUMPUP_M,
+    ST_PUMPUP_H,
+    ST_PUMPUP_P,
+    ST_PUMPUP_S,
+    ST_PUMPUP_T,
+    ST_PUMPUP,
+    NUM_ST_PUMPUP
+};
+
+cheatseq_t cheat_powerup[NUM_ST_PUMPUP] = // [STRIFE]
+{
+    CHEAT("pumpupb", 0),
+    CHEAT("pumpupi", 0),
+    CHEAT("pumpupm", 0),
+    CHEAT("pumpuph", 0),
+    CHEAT("pumpupp", 0),
+    CHEAT("pumpups", 0),
+    CHEAT("pumpupt", 0),
+    CHEAT("pumpup", 0),
+};
+
+//cheatseq_t cheat_choppers = CHEAT("idchoppers", 0); [STRIFE] no such thing
+
+void M_SizeDisplay(int choice); // villsa [STRIFE]
+
+//
+// STATUS BAR CODE
+//
+void ST_Stop(void);
+
+// [STRIFE]
+static char st_msgbuf[ST_MSGWIDTH];
+
+// Respond to keyboard input events,
+//  intercept cheats.
+boolean ST_Responder(event_t* ev)
+{
+    // haleyjd 09/27/10: made static to ST_Responder
+    static boolean st_keystate = false;
+    int i;
+
+    // Filter automap on/off.
+    if(ev->type == ev_keyup)
+    {
+        if((ev->data1 & 0xffff0000) == AM_MSGHEADER)
+        {
+            switch(ev->data1)
+            {
+            case AM_MSGENTERED:
+                st_firsttime = true;
+                break;
+
+            case AM_MSGEXITED:
+                break;
+            }
+
+            return false;
+        }
+
+        // villsa [STRIFE]
+        if(ev->data1 != key_invpop &&
+           ev->data1 != key_mission &&
+           ev->data1 != key_invkey)
+            return false;
+
+        // villsa [STRIFE]
+        if(ev->data1 == key_invpop)
+            st_showinvpop = false;
+        else
+        {
+            if(ev->data1 == key_mission)
+                st_showobjective = false;
+            else
+            {
+                if(ev->data1 == key_invkey)
+                {
+                    st_showkeys = false;
+                    st_keystate = false;
+                }
+            }
+        }
+
+        if(!st_showkeys && !st_showobjective && !st_showinvpop)
+        {
+             if(!st_popupdisplaytics)
+             {
+                 st_displaypopup = false;
+                 if(st_dosizedisplay)
+                     M_SizeDisplay(true);
+
+                 st_dosizedisplay = false;
+             }
+        }
+
+        return true;
+    }
+
+    // if a user keypress...
+    if(ev->type != ev_keydown)
+        return false;
+
+    // haleyjd 20100927: No input allowed when the player is dead
+    if(plyr->mo->health <= 0)
+        return false;
+
+    // keydown events
+    if(ev->data1 == key_invquery) // inventory query
+    {
+        inventory_t *inv = &(plyr->inventory[plyr->inventorycursor]);
+        if(inv->amount)
+        {
+            DEH_snprintf(st_msgbuf, sizeof(st_msgbuf), "%d %s",
+                         inv->amount, 
+                         DEH_String(mobjinfo[inv->type].name));
+            plyr->message = st_msgbuf;
+        }
+    }
+
+    // villsa [STRIFE]
+    if(ev->data1 == key_invpop || ev->data1 == key_invkey || ev->data1 == key_mission)
+    {
+        if(ev->data1 == key_invkey)
+        {
+            st_showobjective = false;
+            st_showinvpop = false;
+
+            if(!st_keystate)
+            {
+                st_keystate = true;
+                if(++st_keypage > 2)
+                {
+                    st_popupdisplaytics = 0;
+                    st_showkeys = false;
+                    st_displaypopup = false;
+                    st_keypage = -1;
+                    return true;
+                }
+            }
+
+            if(netgame)
+                st_popupdisplaytics = 20;
+            else
+                st_popupdisplaytics = 50;
+
+            st_showkeys = true;
+        }
+        else
+        {
+            if(ev->data1 != key_mission || netgame)
+            {
+                if(ev->data1 ==  key_invpop)
+                {
+                    st_keypage = -1;
+                    st_popupdisplaytics = false;
+                    st_showkeys = false;
+                    st_showobjective = false;
+                    st_showinvpop = true;
+                }
+            }
+            else
+            {
+                st_showkeys = netgame;
+                st_showinvpop = netgame;
+                st_keypage = -1;
+
+                st_popupdisplaytics = ev->data2 ^ key_mission;
+
+                st_showobjective = true;
+            }
+        }
+
+        if(st_showkeys || st_showobjective || st_showinvpop)
+        {
+            st_displaypopup = true;
+            if(viewheight == SCREENHEIGHT)
+            {
+                M_SizeDisplay(false);
+                st_dosizedisplay = true;
+            }
+        }
+    }
+    
+    if(ev->data1 == key_invleft) // inventory move left
+    {
+        if(plyr->inventorycursor > 0)
+            plyr->inventorycursor--;
+        return true;
+    }
+    else if(ev->data1 == key_invright)
+    {
+        if(plyr->inventorycursor < plyr->numinventory - 1)
+            plyr->inventorycursor++;
+        return true;
+    }
+    else if(ev->data1 == key_invhome)
+    {
+        plyr->inventorycursor = 0;
+        return true;
+    }
+    else if(ev->data1 == key_invend)
+    {
+        if(plyr->numinventory)
+            plyr->inventorycursor = plyr->numinventory - 1;
+        else 
+            plyr->inventorycursor = 0;
+        return true;
+    }
+
+    //
+    // [STRIFE] Cheats which are allowed in netgames/demos:
+    //
+
+    // 'spin' cheat for changing music
+    if (cht_CheckCheat(&cheat_mus, ev->data2))
+    {
+        char        buf[3];
+        int         musnum;
+
+        plyr->message = DEH_String(STSTR_MUS);
+        cht_GetParam(&cheat_mus, buf);
+
+        musnum = (buf[0] - '0') * 10 + buf[1] - '0';
+
+        if (((buf[0]-'0')*10 + buf[1]-'0') > 35)
+            plyr->message = DEH_String(STSTR_NOMUS);
+        else
+            S_ChangeMusic(musnum, 1);
+    }
+    // [STRIFE]: "dev" cheat - "DOTS"
+    else if (cht_CheckCheat(&cheat_dev, ev->data2))
+    {
+        devparm = !devparm;
+        if (devparm)
+            plyr->message = DEH_String("devparm ON");
+        else
+            plyr->message = DEH_String("devparm OFF");
+    }
+
+    // [STRIFE] Cheats below are not allowed in netgames or demos
+    if(netgame || !usergame)
+        return false;
+
+    if (cht_CheckCheat(&cheat_god, ev->data2))
+    {
+        // 'omnipotent' cheat for toggleable god mode
+        plyr->cheats ^= CF_GODMODE;
+        if (plyr->cheats & CF_GODMODE)
+        {
+            if (plyr->mo)
+                plyr->mo->health = 100;
+
+            plyr->health = deh_god_mode_health;
+            plyr->st_update = true; // [STRIFE]
+            plyr->message = DEH_String(STSTR_DQDON);
+        }
+        else 
+        {
+            plyr->st_update = true;
+            plyr->message = DEH_String(STSTR_DQDOFF);
+        }
+    }
+    else if (cht_CheckCheat(&cheat_ammo, ev->data2))
+    {
+        // [STRIFE]: "BOOMSTIX" cheat for all normal weapons
+        plyr->armorpoints = deh_idkfa_armor;
+        plyr->armortype = deh_idkfa_armor_class;
+
+        for (i = 0; i < NUMWEAPONS; i++)
+            if(!isdemoversion || weaponinfo[i].availabledemo)
+                plyr->weaponowned[i] = true;
+        
+        // Takes away the Sigil, even if you already had it...
+        plyr->weaponowned[wp_sigil] = false;
+
+        for (i=0;i<NUMAMMO;i++)
+            plyr->ammo[i] = plyr->maxammo[i];
+
+        plyr->message = DEH_String(STSTR_FAADDED);
+    }
+    else if(cht_CheckCheat(&cheat_keys, ev->data2))
+    {
+        // villsa [STRIFE]: "JIMMY" cheat for all keys
+        #define FIRSTKEYSETAMOUNT   16
+
+        if(plyr->cards[FIRSTKEYSETAMOUNT - 1])
+        {
+            if(plyr->cards[NUMCARDS - 1] || isdemoversion)
+            {
+                for(i = 0; i < NUMCARDS; i++)
+                    plyr->cards[i] = false;
+
+                plyr->message = DEH_String("Keys removed");
+            }
+            else
+            {
+                for(i = 0; i < NUMCARDS; i++)
+                    plyr->cards[i] = true;
+
+                plyr->message = DEH_String("Cheater Keys Added");
+            }
+        }
+        else
+        {
+            for(i = 0; i < FIRSTKEYSETAMOUNT; i++)
+                plyr->cards[i] = true;
+
+            plyr->message = DEH_String("Cheater Keys Added");
+        }
+    }
+    else if (cht_CheckCheat(&cheat_noclip, ev->data2))
+    {
+        // [STRIFE] Removed idspispopd, added NOCLIP flag setting/removal
+        // Noclip cheat - "ELVIS" (hah-hah :P )
+
+        plyr->cheats ^= CF_NOCLIP;
+
+        if (plyr->cheats & CF_NOCLIP)
+        {
+            plyr->message = DEH_String(STSTR_NCON);
+            plyr->mo->flags |= MF_NOCLIP;
+        }
+        else
+        {
+            plyr->message = DEH_String(STSTR_NCOFF);
+            plyr->mo->flags &= ~MF_NOCLIP;
+        }
+    }
+    else if(cht_CheckCheat(&cheat_stealth, ev->data2))
+    {
+        // villsa [STRIFE]: "GRIPPER" cheat; nothing to do with stealth...
+        plyr->cheats ^= CF_NOMOMENTUM;
+        if(plyr->cheats & CF_NOMOMENTUM)
+            plyr->message = DEH_String("STEALTH BOOTS ON");
+        else
+            plyr->message = DEH_String("STEALTH BOOTS OFF");
+    }
+    
+    for(i = 0; i < ST_PUMPUP_B + 3; ++i)
+    {
+        // [STRIFE]: Handle berserk, invisibility, and envirosuit
+        if(cht_CheckCheat(&cheat_powerup[i], ev->data2))
+        {
+            if(plyr->powers[i])
+                plyr->powers[i] = (i != 1);
+            else
+                P_GivePower(plyr, i);
+            plyr->message = DEH_String(STSTR_BEHOLDX);
+        }
+    }
+    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_H], ev->data2))
+    {
+        // [STRIFE]: PUMPUPH gives medical inventory items
+        P_GiveItemToPlayer(plyr, SPR_STMP, MT_INV_MED1);
+        P_GiveItemToPlayer(plyr, SPR_MDKT, MT_INV_MED2);
+        P_GiveItemToPlayer(plyr, SPR_FULL, MT_INV_MED3);
+        plyr->message = DEH_String("you got the stuff!");
+    }
+    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_P], ev->data2))
+    {
+        // [STRIFE]: PUMPUPP gives backpack
+        if(!plyr->backpack)
+        {
+            for(i = 0; i < NUMAMMO; ++i)
+                plyr->maxammo[i] = 2 * plyr->maxammo[i];
+        }
+        plyr->backpack = true;
+
+        for(i = 0; i < NUMAMMO; ++i)
+            P_GiveAmmo(plyr, i, 1);
+        plyr->message = DEH_String("you got the stuff!");
+    }
+    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_S], ev->data2))
+    {
+        // [STRIFE]: PUMPUPS gives stamina and accuracy upgrades
+        P_GiveItemToPlayer(plyr, SPR_TOKN, MT_TOKEN_STAMINA);
+        P_GiveItemToPlayer(plyr, SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
+        plyr->message = DEH_String("you got the stuff!");
+    }
+    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_T], ev->data2))
+    {
+        // [STRIFE] PUMPUPT gives targeter
+        P_GivePower(plyr, pw_targeter);
+        plyr->message = DEH_String("you got the stuff!");
+    }
+    // [STRIFE]: PUMPUP
+    if (cht_CheckCheat(&cheat_powerup[ST_PUMPUP], ev->data2))
+    {
+        // 'behold' power-up menu
+        plyr->message = DEH_String(STSTR_BEHOLD);
+        return false;
+    }
+
+    if (cht_CheckCheat(&cheat_mypos, ev->data2))
+    {
+        // [STRIFE] 'GPS' for player position
+        static char buf[ST_MSGWIDTH];
+        M_snprintf(buf, sizeof(buf),
+                   "ang=0x%x;x,y=(0x%x,0x%x)",
+                   players[consoleplayer].mo->angle,
+                   players[consoleplayer].mo->x,
+                   players[consoleplayer].mo->y);
+        plyr->message = buf;
+    }
+
+    // 'rift' change-level cheat
+    if (cht_CheckCheat(&cheat_clev, ev->data2))
+    {
+        char            buf[3];
+        int             map;
+
+        cht_GetParam(&cheat_clev, buf);
+
+        map = (buf[0] - '0') * 10 + buf[1] - '0';
+
+        // haleyjd 20100901: Removed Chex Quest stuff.
+        // haleyjd 20100915: Removed retail/registered/shareware stuff
+
+        // haleyjd 20130301: different bounds in v1.31
+        // Ohmygod - this is not going to work.
+        if(gameversion == exe_strife_1_31)
+        {
+            if ((isdemoversion && (map < 32 || map > 34)) ||
+                (isregistered  && (map <= 0 || map > 34)))
+                return false;
+        }
+        else
+        {
+            if (map <= 0 || map > 40)
+                return false;
+        }
+
+        // So be it.
+        plyr->message = DEH_String(STSTR_CLEV);
+        G_RiftExitLevel(map, 0, plyr->mo->angle);
+    }
+    else if(cht_CheckCheat(&cheat_scoot, ev->data2))
+    {
+        char            buf[3];
+        int             spot;
+        
+        cht_GetParam(&cheat_scoot, buf);
+
+        spot = buf[0] - '0';
+
+        // BUG: should be <= 9. Shouldn't do anything bad though...
+        if(spot <= 10) 
+        {
+            plyr->message = DEH_String("Spawning to spot");
+            G_RiftCheat(spot);
+            return false;
+        }
+    }
+
+    // villsa [STRIFE]
+    if(cht_CheckCheat(&cheat_nuke, ev->data2))
+    {
+        stonecold ^= 1;
+        plyr->message = DEH_String("Kill 'em.  Kill 'em All");
+        return false;
+    }
+
+    // villsa [STRIFE]
+    if(cht_CheckCheat(&cheat_midas, ev->data2))
+    {
+        plyr->message = DEH_String("YOU GOT THE MIDAS TOUCH, BABY");
+        P_GiveItemToPlayer(plyr, SPR_HELT, MT_TOKEN_TOUGHNESS);
+    }
+
+    // villsa [STRIFE] 
+    // haleyjd 20110224: No sigil in demo version
+    if(!isdemoversion && cht_CheckCheat(&cheat_lego, ev->data2))
+    {
+        plyr->st_update = true;
+        if(plyr->weaponowned[wp_sigil])
+        {
+            if(++plyr->sigiltype > 4)
+            {
+                plyr->sigiltype = -1;
+                plyr->pendingweapon = wp_fist;
+                plyr->weaponowned[wp_sigil] = false;
+            }
+        }
+        else
+        {
+            plyr->weaponowned[wp_sigil] = true;
+            plyr->sigiltype = 0;
+        }
+        // BUG: This brings up a bad version of the Sigil (sigiltype -1) which
+        // causes some VERY interesting behavior, when you type LEGO for the
+        // sixth time. This shouldn't be done when taking it away, and yet it
+        // is here... verified with vanilla.
+        plyr->pendingweapon = wp_sigil;
+    }
+
+    return false;
+}
+
+
+/*
+int ST_calcPainOffset(void)
+{
+    // haleyjd 08/31/10: [STRIFE] Removed.
+}
+*/
+
+//
+// This is a not-very-pretty routine which handles
+//  the face states and their timing.
+// the precedence of expressions is:
+//  dead > evil grin > turned head > straight ahead
+//
+/*
+void ST_updateFaceWidget(void)
+{
+    // haleyjd 08/31/10: [STRIFE] Removed.
+}
+*/
+
+/*
+void ST_updateWidgets(void)
+{
+    // haleyjd 09/01/10: [STRIFE] Rogue merged this into ST_Ticker below.
+}
+*/
+
+//
+// ST_Ticker
+//
+// haleyjd 09/01/10: [STRIFE]
+// * Removed st_clock and st_randomnumber.
+// * Merged ST_updateWidgets here. Wasn't inlined, as doesn't exist separately 
+//   in the binary as inlined functions normally do.
+//
+void ST_Ticker (void)
+{
+    static int  largeammo = 1994; // means "n/a"
+
+    // must redirect the pointer if the ready weapon has changed.
+    if (weaponinfo[plyr->readyweapon].ammo == am_noammo)
+        w_ready.num = &largeammo;
+    else
+        w_ready.num = &plyr->ammo[weaponinfo[plyr->readyweapon].ammo];
+
+    w_ready.data = plyr->readyweapon;
+
+    // STRIFE-TODO: Gobbledeegunk.
+    /*
+    v2 = dword_88490-- == 1; // no clue yet...
+    if(v2)
+        dword_DC7F4 = dword_DC7F0;*/
+
+    if(st_popupdisplaytics)
+    {
+        int tics = st_popupdisplaytics;
+
+        --st_popupdisplaytics;
+        if(tics == 1)
+        {
+            st_displaypopup = false;
+            st_showkeys = false;
+            st_keypage = -1;
+
+            if(st_dosizedisplay)
+                M_SizeDisplay(true);  // mondo hack?
+
+            st_dosizedisplay = false;
+        }
+    }
+
+    // haleyjd 20100901: [STRIFE] Keys are handled on a popup
+    // haleyjd 20100831: [STRIFE] No face widget
+    // haleyjd 20100901: [STRIFE] Armor, weapons, frags, etc. handled elsewhere
+
+    // haleyjd: This is from the PRE-BETA! Left here because it amuses me ;)
+    // get rid of chat window if up because of message
+    //if (!--st_msgcounter)
+    //    st_chat = st_oldchat;
+}
+
+static int st_palette = 0;
+
+//
+// ST_doPaletteStuff
+//
+// haleyjd 20100831: [STRIFE]
+// * Changed radsuit palette handling for Strife nukagecount.
+// * All other logic verified to be unmodified.
+//
+void ST_doPaletteStuff(void)
+{
+
+    int		palette;
+    byte*	pal;
+    int		cnt;
+    int		bzc;
+
+    cnt = plyr->damagecount;
+
+    if (plyr->powers[pw_strength])
+    {
+        // slowly fade the berzerk out
+        bzc = 12 - (plyr->powers[pw_strength]>>6);
+
+        if (bzc > cnt)
+            cnt = bzc;
+    }
+
+    if (cnt)
+    {
+        palette = (cnt+7)>>3;
+
+        if (palette >= NUMREDPALS)
+            palette = NUMREDPALS-1;
+
+        palette += STARTREDPALS;
+    }
+
+    else if (plyr->bonuscount)
+    {
+        palette = (plyr->bonuscount+7)>>3;
+
+        if (palette >= NUMBONUSPALS)
+            palette = NUMBONUSPALS-1;
+
+        palette += STARTBONUSPALS;
+    }
+    // haleyjd 20100831: [STRIFE] Flash green when in nukage, not when has
+    // an environment suit (a breathing sound is played to indicate that
+    // instead).
+    else if ( plyr->nukagecount > 16*TICRATE || 
+              (plyr->nukagecount & 8))
+        palette = RADIATIONPAL;
+    else
+        palette = 0;
+
+    // haleyjd 08/31/10: Removed Chex Quest
+
+    if (palette != st_palette)
+    {
+        st_palette = palette;
+        pal = (byte *) W_CacheLumpNum (lu_palette, PU_CACHE)+palette*768;
+        I_SetPalette (pal);
+    }
+
+}
+
+/* 
+void ST_drawWidgets(boolean refresh)
+{
+    haleyjd 09/01/10: [STRIFE] Removed
+}
+*/
+
+//
+// ST_drawNumFontY
+//
+// haleyjd 20100919: [STRIFE] New function
+// Draws a small yellow number for inventory etc.
+//
+void ST_drawNumFontY(int x, int y, int num)
+{
+    if(!num)
+        V_DrawPatch(x, y, invfonty[0]);
+    
+    while(num)
+    {
+        V_DrawPatch(x, y, invfonty[num % 10]);
+        x -= SHORT(invfonty[0]->width) + 1;
+        num /= 10;
+    }
+}
+
+//
+// ST_drawNumFontY2
+//
+// haleyjd 20100919: [STRIFE] New function
+// As above, but turns negative numbers into zero.
+//
+void ST_drawNumFontY2(int x, int y, int num)
+{
+    if(!num)
+        V_DrawPatch(x, y, invfonty[0]);
+
+    if(num < 0)
+        num = 0;
+
+    while(num)
+    {
+        V_DrawPatchDirect(x, y, invfonty[num % 10]);
+        x -= SHORT(invfonty[0]->width) + 1;
+        num /= 10;
+    }
+}
+
+//
+// ST_drawLine
+//
+// haleyjd 20100920: [STRIFE] New function
+// Basic horizontal line drawing routine used for the health bars.
+//
+void ST_drawLine(int x, int y, int len, int color)
+{
+    byte putcolor = (byte)(color);
+    byte *drawpos = I_VideoBuffer + y * SCREENWIDTH + x;
+    int i = 0;
+
+    while(i < len)
+    {
+        *drawpos++ = putcolor;
+        ++i;
+    }
+}
+
+//
+// ST_doRefresh
+//
+// haleyjd 20100920: Evidence more than suggests that Rogue moved all status bar
+// drawing down to this function.
+//
+void ST_doRefresh(void)
+{
+    // draw status bar background to off-screen buff
+    if (st_statusbaron)
+    {
+        int firstinventory, icon_x, num_x, i, numdrawn;
+
+        // haleyjd 20100919: No backscreen caching in Strife.
+        //V_UseBuffer(st_backing_screen);
+
+        // TODO: only sometimes drawing?
+
+        plyr->st_update = false;
+
+        // cache data
+        st_lastcursorpos = plyr->inventorycursor;
+        st_lastammo      = weaponinfo[plyr->readyweapon].ammo;
+        st_lastarmortype = plyr->armortype;
+        st_lasthealth    = plyr->health;
+        st_firsttime     = false;
+
+        // draw main status bar
+        V_DrawPatch(ST_X, ST_Y, invback);
+
+        // draw multiplayer armor backdrop if netgame
+        // haleyjd 20131031: BUG - vanilla is accessing a NULL pointer here when
+        // playing back netdemos! It doesn't appear to draw anything, and there 
+        // is no apparent ill effect on gameplay, so the best we can do is check.
+        if(netgame && stback)
+            V_DrawPatch(ST_X, 173, stback);
+
+        if(plyr->inventorycursor >= 6)
+            firstinventory = plyr->inventorycursor - 5;
+        else
+            firstinventory = 0;
+
+        // Draw cursor.
+        if(plyr->numinventory)
+        {
+            V_DrawPatch(35 * (plyr->inventorycursor - firstinventory) + 42,
+                        180, invcursor);
+        }
+
+        // Draw inventory bar
+        for(num_x = 68, icon_x = 48, i = firstinventory, numdrawn = 0; 
+            num_x < 278; 
+            num_x += 35, icon_x += 35, i++, numdrawn++)
+        {
+            int lumpnum;
+            patch_t *patch;
+            char iconname[8];
+
+            if(plyr->numinventory <= numdrawn)
+                break;
+            
+            DEH_snprintf(iconname, sizeof(iconname), "I_%s",
+                         DEH_String(sprnames[plyr->inventory[i].sprite]));
+
+            lumpnum = W_CheckNumForName(iconname);
+            if(lumpnum == -1)
+                patch = W_CacheLumpName(DEH_String("STCFN063"), PU_CACHE);
+            else
+                patch = W_CacheLumpNum(lumpnum, PU_STATIC);
+
+            V_DrawPatch(icon_x, 182, patch);
+            ST_drawNumFontY(num_x, 191, plyr->inventory[i].amount);
+        }
+
+        // haleyjd 20100919: Draw sigil icon
+        if(plyr->weaponowned[wp_sigil])
+            V_DrawPatch(253, 175, invsigil[plyr->sigiltype]);
+
+        // haleyjd 20100919: Draw ammo
+        if(st_lastammo < NUMAMMO)
+            V_DrawPatch(290, 180, invammo[st_lastammo]);
+
+        // haleyjd 20100919: Draw armor
+        if(plyr->armortype)
+        {
+            V_DrawPatch(2, 177, invarmor[plyr->armortype - 1]);
+            ST_drawNumFontY(20, 191, plyr->armorpoints);
+        }
+
+        // haleyjd 20100920: Draw life bars.
+        {
+            int barlength;
+            int lifecolor1;
+            int lifecolor2;
+
+            barlength = plyr->health;
+            if(barlength > 100)
+                barlength = 200 - plyr->health;
+            barlength *= 2;
+
+            if(plyr->health < 11)      // Danger, Will Robinson!
+                lifecolor1 = 64;
+            else if(plyr->health < 21) // Caution
+                lifecolor1 = 80;
+            else                       // All is well.
+                lifecolor1 = 96;
+
+            if(plyr->cheats & CF_GODMODE) // Gold, probably a throwback to DOOM.
+                lifecolor1 = 226;
+
+            lifecolor2 = lifecolor1 + 3;
+
+            // Draw the normal health bars
+            ST_drawLine(49, 172, barlength, lifecolor1);
+            ST_drawLine(49, 173, barlength, lifecolor2);
+            ST_drawLine(49, 175, barlength, lifecolor1);
+            ST_drawLine(49, 176, barlength, lifecolor2);
+
+            // Draw the > 100 health lines
+            if(plyr->health > 100)
+            {
+                int oldbarlength = barlength;
+                lifecolor1 = 112;             // Shades of blue
+                lifecolor2 = lifecolor1 + 3;
+
+                // take up the difference not drawn by the first (<= 100) bar
+                barlength = 200 - barlength;
+
+                ST_drawLine(49 + oldbarlength, 172, barlength, lifecolor1);
+                ST_drawLine(49 + oldbarlength, 173, barlength, lifecolor2);
+                ST_drawLine(49 + oldbarlength, 175, barlength, lifecolor1);
+                ST_drawLine(49 + oldbarlength, 176, barlength, lifecolor2);
+            }
+        } // end local-scope block
+
+        // haleyjd 20100919: nope, not in Strife.
+        //V_RestoreBuffer();
+        //V_CopyRect(ST_X, 0, st_backing_screen, ST_WIDTH, ST_HEIGHT, ST_X, ST_Y);
+    }
+}
+
+// haleyjd [STRIFE]: Removed ST_diffDraw
+
+void ST_Drawer (boolean fullscreen, boolean refresh)
+{
+    st_statusbaron = (!fullscreen) || automapactive;
+    st_firsttime = st_firsttime || refresh;
+
+    // Do red-/gold-shifts from damage/items
+    ST_doPaletteStuff();
+
+    // If just after ST_Start(), refresh all
+    ST_doRefresh();
+    // Otherwise, update as little as possible
+    //ST_diffDraw(); [STRIFE]: nope
+}
+
+//
+// ST_calcFrags
+//
+// haleyjd [STRIFE] New function.
+// Calculate frags for display on the frags popup.
+//
+static int ST_calcFrags(int pnum)
+{
+    int i;
+    int result = 0;
+
+    for(i = 0; i < MAXPLAYERS; i++)
+    {
+        if(i == pnum) // self-frags
+            result -= players[pnum].frags[i];
+        else
+            result += players[pnum].frags[i];
+    }
+
+    return result;
+}
+
+//
+// ST_drawTime
+//
+// villsa [STRIFE] New function.
+// Draws game time on pop up screen
+//
+static void ST_drawTime(int x, int y, int time)
+{
+    int hours;
+    int minutes;
+    int seconds;
+    char string[16];
+
+    // haleyjd 20110213: fixed minutes
+    hours   = time / 3600;
+    minutes = (time / 60) % 60;
+    seconds = time % 60;
+
+    DEH_snprintf(string, 16, "%02d:%02d:%02d", hours, minutes, seconds);
+    HUlib_drawYellowText(x, y, string);
+}
+
+#define ST_KEYSPERPAGE   10
+#define ST_KEYS_X        20
+#define ST_KEYS_Y        63
+#define ST_KEYNAME_X     17
+#define ST_KEYNAME_Y      4
+#define ST_KEYS_YSTEP    17
+#define ST_KEYS_NUMROWS   4
+#define ST_KEYS_COL2X   160
+
+//
+// ST_drawKeysPopup
+//
+// haleyjd 20110213: [STRIFE] New function
+// This has taken the longest out of almost everything to get working properly.
+//
+static boolean ST_drawKeysPopup(void)
+{
+    int x, y, yt, key, keycount;
+    mobjinfo_t *info;
+
+    V_DrawXlaPatch(0, 56, invpbak2);
+    V_DrawPatchDirect(0, 56, invpop2);
+
+    if(deathmatch)
+    {
+        int pnum;
+        patch_t *colpatch;
+        char buffer[128];
+        int frags;
+
+        // In deathmatch, the keys popup is replaced by a chart of frag counts
+        
+        // first column
+        y  = 64;
+        yt = 66;
+        for(pnum = 0; pnum < MAXPLAYERS/2; pnum++)
+        {
+            DEH_snprintf(buffer, sizeof(buffer), "stcolor%d", pnum+1);
+            colpatch = W_CacheLumpName(buffer, PU_CACHE);
+            V_DrawPatchDirect(28, y, colpatch);
+            frags = ST_calcFrags(pnum);
+            DEH_snprintf(buffer, sizeof(buffer), "%s%d", player_names[pnum], frags);
+            HUlib_drawYellowText(38, yt, buffer);
+            if(!playeringame[pnum])
+                HUlib_drawYellowText(28, pnum*17 + 65, "X");
+            y  += 17;
+            yt += 17;
+        }
+
+        // second column
+        y  = 64;
+        yt = 66;
+        for(pnum = MAXPLAYERS/2; pnum < MAXPLAYERS; pnum++)
+        {
+            DEH_snprintf(buffer, sizeof(buffer), "stcolor%d", pnum+1);
+            colpatch = W_CacheLumpName(buffer, PU_CACHE);
+            V_DrawPatchDirect(158, y, colpatch);
+            frags = ST_calcFrags(pnum);
+            DEH_snprintf(buffer, sizeof(buffer), "%s%d", player_names[pnum], frags);
+            HUlib_drawYellowText(168, yt, buffer);
+            if(!playeringame[pnum])
+                HUlib_drawYellowText(158, pnum*17 - 3, "X");
+            y  += 17;
+            yt += 17;
+        }
+    }
+    else
+    {
+        // Bounds-check page number
+        if(st_keypage < 0 || st_keypage > 2)
+        {
+            st_keypage = -1;
+            st_popupdisplaytics = 0;
+            st_displaypopup = false;
+
+            return false;
+        }
+
+        // Are there any keys to display on this page?
+        if(st_keypage > 0)
+        {
+            boolean haskeyinrange = false;
+
+            for(key = ST_KEYSPERPAGE * st_keypage, keycount = 0;
+                keycount < ST_KEYSPERPAGE && key < NUMCARDS;
+                ++key, ++keycount)
+            {
+                if(plyr->cards[key])
+                    haskeyinrange = true;
+            }
+
+            if(!haskeyinrange)
+            {
+                st_displaypopup = false;
+                st_showkeys = false;
+                st_keypage = -1;
+                
+                return false;
+            }
+        }
+
+        // Draw the keys for the current page
+        key = ST_KEYSPERPAGE * st_keypage;
+        keycount = 0;
+        x = ST_KEYS_X;
+        y = ST_KEYS_Y;
+        info = &mobjinfo[MT_KEY_BASE + key];
+
+        for(; keycount < ST_KEYSPERPAGE && key < NUMCARDS; ++key, ++keycount, ++info)
+        {
+            char sprname[8];
+            patch_t *patch;
+            memset(sprname, 0, sizeof(sprname));
+
+            if(plyr->cards[key])
+            {
+                // Get spawnstate sprite name and load corresponding icon
+                DEH_snprintf(sprname, sizeof(sprname), "I_%s",
+                    sprnames[states[info->spawnstate].sprite]);
+                patch = W_CacheLumpName(sprname, PU_CACHE);
+                V_DrawPatchDirect(x, y, patch);
+                HUlib_drawYellowText(x + ST_KEYNAME_X, y + ST_KEYNAME_Y, info->name);
+            }
+
+            if(keycount != ST_KEYS_NUMROWS)
+                y += ST_KEYS_YSTEP;
+            else
+            {
+                x = ST_KEYS_COL2X;
+                y = ST_KEYS_Y;
+            }
+        }
+    }
+
+    return true;
+}
+
+//
+// ST_DrawExternal
+//
+// haleyjd 20100901: [STRIFE] New function.
+// * Draws external portions of the status bar such the top bar and popups.
+//
+boolean ST_DrawExternal(void)
+{
+    int i;
+
+    if(st_statusbaron)
+    {
+        V_DrawPatchDirect(0, 160, invtop);
+        STlib_drawNumPositive(&w_health);
+        STlib_drawNumPositive(&w_ready);
+    }
+    else
+    {
+        ammotype_t ammo;
+
+        ST_drawNumFontY2(15, 194, plyr->health);
+        ammo = weaponinfo[plyr->readyweapon].ammo;
+        if (ammo != am_noammo)
+            ST_drawNumFontY2(310, 194, plyr->ammo[ammo]);
+    }
+
+    if(!st_displaypopup)
+        return false;
+
+    // villsa [STRIFE] added 20100926
+    if(st_showobjective)
+    {
+        V_DrawXlaPatch(0, 56, invpbak2);
+        V_DrawPatchDirect(0, 56, invpop2);
+        M_DialogDimMsg(24, 74, mission_objective, true);
+        HUlib_drawYellowText(24, 74, mission_objective);
+        ST_drawTime(210, 64, leveltime / TICRATE);
+    }
+    else
+    {
+        int keys = 0;
+
+        // villsa [STRIFE] keys popup
+        if(st_showkeys || st_popupdisplaytics)
+            return ST_drawKeysPopup();
+
+        V_DrawXlaPatch(0, 56, invpbak);
+        V_DrawPatchDirect(0, 56, invpop);
+
+        for(i = 0; i < NUMCARDS; i++)
+        {
+            if(plyr->cards[i])
+                keys++;
+        }
+
+        ST_drawNumFontY2(261, 132, keys);
+
+         if(plyr->weaponowned[wp_elecbow])
+         {
+             V_DrawPatchDirect(38, 86, 
+                 W_CacheLumpName(DEH_String("CBOWA0"), PU_CACHE));
+         }
+         if(plyr->weaponowned[wp_rifle])
+         {
+             V_DrawPatchDirect(40, 107, 
+                 W_CacheLumpName(DEH_String("RIFLA0"), PU_CACHE));
+         }
+         if(plyr->weaponowned[wp_missile])
+         {
+             V_DrawPatchDirect(39, 131, 
+                 W_CacheLumpName(DEH_String("MMSLA0"), PU_CACHE));
+         }
+         if(plyr->weaponowned[wp_hegrenade])
+         {
+             V_DrawPatchDirect(78, 87, 
+                 W_CacheLumpName(DEH_String("GRNDA0"), PU_CACHE));
+         }
+         if(plyr->weaponowned[wp_flame])
+         {
+             V_DrawPatchDirect(80, 117, 
+                 W_CacheLumpName(DEH_String("FLAMA0"), PU_CACHE));
+         }
+         if(plyr->weaponowned[wp_mauler])
+         {
+             V_DrawPatchDirect(75, 142, 
+                 W_CacheLumpName(DEH_String("TRPDA0"), PU_CACHE));
+         }
+         
+         // haleyjd 20110213: draw ammo
+         for(i = 0; i < NUMAMMO; i++)
+         {
+             STlib_drawNumPositive(&w_ammo[i]);
+             STlib_drawNumPositive(&w_maxammo[i]);
+         }
+
+         ST_drawNumFontY2(261, 84,  plyr->accuracy);
+         ST_drawNumFontY2(261, 108, plyr->stamina);
+
+         if(plyr->powers[pw_communicator])
+         {
+             V_DrawPatchDirect(280, 130, 
+                 W_CacheLumpName(DEH_String("I_COMM"), PU_CACHE));
+         }
+    }
+
+    return true;
+}
+
+typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
+
+//
+// ST_loadUnloadGraphics
+//
+// Iterates through all graphics to be loaded or unloaded, along with
+// the variable they use, invoking the specified callback function.
+//
+// [STRIFE] Altered to load all Strife status bar resources.
+//
+static void ST_loadUnloadGraphics(load_callback_t callback)
+{
+    int         i;
+    char        namebuf[9];
+
+    // haleyjd 20100901: [STRIFE]
+    // Load the numbers, green and yellow
+    for (i=0;i<10;i++)
+    {
+        DEH_snprintf(namebuf, 9, "INVFONG%d", i);
+        callback(namebuf, &invfontg[i]);
+
+        DEH_snprintf(namebuf, 9, "INVFONY%d", i);
+        callback(namebuf, &invfonty[i]);
+    }
+
+    // haleyjd 20100919: load Sigil patches
+    if(!isdemoversion)
+    {
+        for(i = 0; i < 5; i++)
+        {
+            DEH_snprintf(namebuf, 9, "I_SGL%d", i+1);
+            callback(namebuf, &invsigil[i]);
+        }
+    }
+
+    // load ammo patches
+    for(i = 0; i < NUMAMMO; i++)
+        callback(DEH_String(invammonames[i]), &invammo[i]);
+
+    // load armor patches
+    callback(DEH_String("I_ARM2"), &invarmor[0]);
+    callback(DEH_String("I_ARM1"), &invarmor[1]);
+
+    // haleyjd 20100919: [STRIFE] 
+    // * No face, but there is this patch, which appears behind the armor
+    DEH_snprintf(namebuf, 9, "STBACK0%d", consoleplayer + 1);
+    if(netgame)
+        callback(namebuf, &stback);
+    
+    // 20100901:
+    // * Removed all unused DOOM stuff (arms, numbers, %, etc).
+
+    // haleyjd 20100901: [STRIFE]: stbar -> invback, added new patches
+    // status bar background bits
+    callback(DEH_String("INVBACK"),  &invback);
+    callback(DEH_String("INVTOP"),   &invtop);
+    callback(DEH_String("INVPOP"),   &invpop);
+    callback(DEH_String("INVPOP2"),  &invpop2);
+    callback(DEH_String("INVPBAK"),  &invpbak);
+    callback(DEH_String("INVPBAK2"), &invpbak2);
+    callback(DEH_String("INVCURS"),  &invcursor);
+}
+
+static void ST_loadCallback(const char *lumpname, patch_t **variable)
+{
+    *variable = W_CacheLumpName(lumpname, PU_STATIC);
+}
+
+void ST_loadGraphics(void)
+{
+    ST_loadUnloadGraphics(ST_loadCallback);
+}
+
+void ST_loadData(void)
+{
+//    static int dword_8848C = 1; // STRIFE-TODO: what is the purpose of this?
+//    dword_8848C = 0;
+
+    lu_palette = W_GetNumForName (DEH_String("PLAYPAL"));
+    ST_loadGraphics();
+}
+
+static void ST_unloadCallback(const char *lumpname, patch_t **variable)
+{
+    W_ReleaseLumpName(lumpname);
+    *variable = NULL;
+}
+
+void ST_unloadGraphics(void)
+{
+    ST_loadUnloadGraphics(ST_unloadCallback);
+}
+
+void ST_unloadData(void)
+{
+    ST_unloadGraphics();
+}
+
+//
+// ST_initData
+//
+// haleyjd 20100901: [STRIFE]
+// * Removed prebeta cruft, face stuff, keyboxes, and oldwe
+//
+void ST_initData(void)
+{
+    st_firsttime = true;
+    plyr = &players[consoleplayer];
+
+    st_statusbaron = true;
+
+    st_palette = -1;
+
+    STlib_init();
+}
+
+
+
+void ST_createWidgets(void)
+{
+    int i;
+
+    // ready weapon ammo
+    STlib_initNum(&w_ready,
+                  ST_AMMOX,
+                  ST_AMMOY,
+                  invfontg,
+                  &plyr->ammo[weaponinfo[plyr->readyweapon].ammo],
+                  ST_AMMOWIDTH);
+
+    // the last weapon type
+    w_ready.data = plyr->readyweapon; 
+
+    // health percentage
+    STlib_initNum(&w_health,
+                  ST_HEALTHX,
+                  ST_HEALTHY,
+                  invfontg,
+                  &plyr->health,
+                  ST_HEALTHWIDTH);
+
+    // haleyjd 20100831: [STRIFE] 
+    // * No face.
+    // 20100901:
+    // * No arms, weaponsowned, frags, armor, keyboxes
+
+    // haleyjd 20110213: Ammo Widgets!!!
+    for(i = 0; i < NUMAMMO; i++)
+    {
+        STlib_initNum(&w_ammo[i], ST_POPUPAMMOX, st_yforammo[i], 
+                      invfonty, &plyr->ammo[i], st_wforammo[i]);
+
+        STlib_initNum(&w_maxammo[i], ST_POPUPMAXAMMOX, st_yforammo[i],
+                      invfonty, &plyr->maxammo[i], st_wforammo[i]);
+    }
+}
+
+static boolean	st_stopped = true;
+
+
+void ST_Start (void)
+{
+    if (!st_stopped)
+        ST_Stop();
+
+    ST_initData();
+    ST_createWidgets();
+    st_stopped = false;
+}
+
+void ST_Stop (void)
+{
+    if (st_stopped)
+        return;
+
+    I_SetPalette (W_CacheLumpNum (lu_palette, PU_CACHE));
+
+    st_stopped = true;
+}
+
+void ST_Init (void)
+{
+    ST_loadData();
+
+    // haleyjd 20100919: This is not used by Strife. More memory for voices!
+    //st_backing_screen = (byte *) Z_Malloc(ST_WIDTH * ST_HEIGHT, PU_STATIC, 0);
+}
+
diff --git a/games/NXDoom/src/strife/st_stuff.h b/games/NXDoom/src/strife/st_stuff.h
new file mode 100644
index 000000000..167888ed7
--- /dev/null
+++ b/games/NXDoom/src/strife/st_stuff.h
@@ -0,0 +1,80 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Status bar code.
+//	Does the face/direction indicator animatin.
+//	Does palette indicators as well (red pain/berserk, bright pickup)
+//
+
+#ifndef __STSTUFF_H__
+#define __STSTUFF_H__
+
+#include "doomtype.h"
+#include "d_event.h"
+#include "m_cheat.h"
+
+// Size of statusbar.
+// Now sensitive for scaling.
+#define ST_HEIGHT	32
+#define ST_WIDTH	SCREENWIDTH
+#define ST_Y		(SCREENHEIGHT - ST_HEIGHT)
+
+
+//
+// STATUS BAR
+//
+
+// Called by main loop.
+boolean ST_Responder (event_t* ev);
+
+// Called by main loop.
+void ST_Ticker (void);
+
+// Called by main loop.
+void ST_Drawer (boolean fullscreen, boolean refresh);
+
+// haleyjd 09/01/10: [STRIFE] New function.
+// Called by main loop to draw external status bar bits.
+// Returns true if a popup is drawing.
+boolean ST_DrawExternal(void);
+
+// Called when the console player is spawned on each level.
+void ST_Start (void);
+
+// Called by startup code.
+void ST_Init (void);
+
+
+
+extern byte *st_backing_screen;
+
+extern cheatseq_t cheat_mus;     // [STRIFE]: idmus -> spin
+extern cheatseq_t cheat_god;     // [STRIFE]: iddqd -> omnipotent
+extern cheatseq_t cheat_ammo;    // [STRIFE]: idfa -> boomstix
+extern cheatseq_t cheat_noclip;  // [STRIFE]: idclip -> elvis
+extern cheatseq_t cheat_clev;    // [STRIFE]: idclev -> rift
+extern cheatseq_t cheat_mypos;   // [STRIFE]: idmypos -> gps
+extern cheatseq_t cheat_scoot;   // [STRIFE]: new cheat scoot
+extern cheatseq_t cheat_nuke;    // [STRIFE]: new cheat stonecold
+extern cheatseq_t cheat_keys;    // [STRIFE]: new cheat jimmy (all keys)
+extern cheatseq_t cheat_stealth; // [STRIFE]: new cheat gripper
+extern cheatseq_t cheat_midas;   // [STRIFE]: new cheat
+extern cheatseq_t cheat_lego;    // [STRIFE]: new cheat
+extern cheatseq_t cheat_dev;     // [STRIFE]: new cheat
+
+extern cheatseq_t cheat_powerup[];
+
+
+#endif
diff --git a/games/NXDoom/src/strife/strife_icon.c b/games/NXDoom/src/strife/strife_icon.c
new file mode 100644
index 000000000..93c43f9ad
--- /dev/null
+++ b/games/NXDoom/src/strife/strife_icon.c
@@ -0,0 +1,2736 @@
+static int strife_icon_w = 128;
+static int strife_icon_h = 128;
+
+static const unsigned int strife_icon_data[] = {
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
+    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
+    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
+    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
+    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
+    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
+    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
+    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
+    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
+    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
+    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
+    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
+    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
+    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
+    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
+    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
+    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
+    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
+    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
+    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
+    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
+    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
+    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
+    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
+    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
+    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
+    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
+    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
+    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
+    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
+    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
+    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
+    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
+    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
+    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
+    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
+    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
+    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
+    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
+    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
+    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
+    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
+    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
+    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
+    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
+    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
+    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
+    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
+    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
+    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
+    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
+    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
+    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
+    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
+    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
+    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
+    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
+    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
+    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x93756aff, 0x91766aff, 0xa89078ff, 0xb6a07fff, 
+    0xb6a07fff, 0xb6a07fff, 0xb6a07fff, 0xb6a07fff, 0xb6a07fff, 0xbca88bff, 
+    0xc7baa6ff, 0xc6b9a5ff, 0xc6b9a5ff, 0xc5b7a4ff, 0xc5b7a4ff, 0xc4b6a2ff, 
+    0xc3b5a0ff, 0xc3b5a0ff, 0xc2b49fff, 0xbba78bff, 0xb69e7bff, 0xb69d7bff, 
+    0xb69d7bff, 0xb69d7aff, 0xb59b79ff, 0xb39976ff, 0xb19774ff, 0xaf9572ff, 
+    0xae9573ff, 0xb3a188ff, 0xb3a38eff, 0xb1a18cff, 0xb0a08aff, 0xae9e88ff, 
+    0xac9c85ff, 0xab9a84ff, 0xa99883ff, 0xa79580ff, 0xa49179ff, 0x9a7d58ff, 
+    0x987b56ff, 0x977a55ff, 0x957852ff, 0x937550ff, 0x91734eff, 0x90724dff, 
+    0x8e704aff, 0x8c6e48ff, 0x8f7556ff, 0x93816aff, 0x917e68ff, 0x907d66ff, 
+    0x8e7a64ff, 0x8c7963ff, 0x8b7861ff, 0x89755fff, 0x86735cff, 0x86735cff, 
+    0x7c603eff, 0x775631ff, 0x755430ff, 0x785835ff, 0x7a5b3bff, 0x7d5c41ff, 
+    0x7f5f46ff, 0x74564aff, 0x5f464bff, 0x674e55ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
+    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
+    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
+    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
+    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
+    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
+    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
+    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
+    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
+    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
+    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
+    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
+    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
+    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
+    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
+    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
+    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
+    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
+    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
+    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
+    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
+    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
+    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
+    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
+    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
+    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
+    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
+    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
+    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
+    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
+    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
+    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
+    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
+    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
+    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
+    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
+    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
+    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
+    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
+    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
+    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
+    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
+    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
+    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
+    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
+    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
+    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
+    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
+    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
+    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
+    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
+    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
+    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
+    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfaf2b8ff, 0xfaf3bcff, 
+    0xf9f2baff, 0xf9f2baff, 0xf8f0b7ff, 0xf8efb7ff, 0xf7eeb5ff, 0xf7edb4ff, 
+    0xf6ecb3ff, 0xf8ecaaff, 0xffee97ff, 0xffee96ff, 0xffed95ff, 0xffec94ff, 
+    0xffec93ff, 0xffeb92ff, 0xffea90ff, 0xffe98fff, 0xffe88eff, 0xf7e49aff, 
+    0xf0e0a3ff, 0xefdea1ff, 0xefdea1ff, 0xeedd9fff, 0xecda9cff, 0xebd89aff, 
+    0xe9d698ff, 0xe8d596ff, 0xe6d293ff, 0xf3d67cff, 0xf5d676ff, 0xf3d373ff, 
+    0xf2d171ff, 0xf0cf6eff, 0xefcc6cff, 0xedca68ff, 0xecc867ff, 0xeac563ff, 
+    0xe5c367ff, 0xd7bd79ff, 0xd4ba78ff, 0xd2b876ff, 0xd1b674ff, 0xcfb472ff, 
+    0xceb271ff, 0xccb16fff, 0xcbaf6eff, 0xc9ad6cff, 0xcfac5eff, 0xd8ad4cff, 
+    0xd6aa4aff, 0xd5a848ff, 0xd3a646ff, 0xd2a545ff, 0xd0a243ff, 0xcfa042ff, 
+    0xcd9e40ff, 0xcc9d3eff, 0xbd9851ff, 0xb69658ff, 0xb59455ff, 0xb69659ff, 
+    0xb6965bff, 0xb7965dff, 0xb99761ff, 0xb99863ff, 0xba9966ff, 0xb99967ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcec71ff, 0xffef71ff, 0xffee70ff, 0xffed6eff, 0xffec6cff, 0xffeb6aff, 
+    0xffe969ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 
+    0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 
+    0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
+    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
+    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
+    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
+    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
+    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
+    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
+    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
+    0xffb027ff, 0xfcae26ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfceb6fff, 0xffee70ff, 0xffed6eff, 0xffec6cff, 
+    0xffeb6aff, 0xffe969ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 
+    0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 
+    0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
+    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
+    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
+    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
+    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
+    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
+    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
+    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xfcad25ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcea6eff, 0xffed6eff, 
+    0xffec6cff, 0xffeb6aff, 0xffe969ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 
+    0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 
+    0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 
+    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
+    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
+    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
+    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
+    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
+    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
+    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xfcac25ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfce96cff, 0xffec6cff, 0xffeb6aff, 0xffe969ff, 0xffe867ff, 0xffe765ff, 
+    0xffe663ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 
+    0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 
+    0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
+    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
+    0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 
+    0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
+    0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
+    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
+    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
+    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
+    0xffae26ff, 0xfcab25ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfce86aff, 0xffeb6aff, 0xffe969ff, 0xffe867ff, 
+    0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 
+    0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 
+    0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
+    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
+    0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
+    0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
+    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
+    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
+    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
+    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xfcab24ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfce768ff, 0xffe969ff, 
+    0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 
+    0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 
+    0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 
+    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
+    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 
+    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 
+    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 
+    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
+    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
+    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
+    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xfcaa24ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfce567ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 
+    0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 
+    0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
+    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
+    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
+    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
+    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
+    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
+    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
+    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
+    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
+    0xffac25ff, 0xfca924ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfce465ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 
+    0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 
+    0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
+    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
+    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
+    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
+    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
+    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
+    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
+    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
+    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xfca823ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfce363ff, 0xffe663ff, 
+    0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 
+    0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 
+    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
+    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
+    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
+    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
+    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
+    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
+    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
+    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xfca823ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfce261ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 
+    0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 
+    0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
+    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
+    0xffcb3aff, 0xffca38ff, 0xe8bf48ff, 0xbfac62ff, 0x9f9c74ff, 0x90937aff, 
+    0x828a7fff, 0x7f877dff, 0x7e847aff, 0x7c8277ff, 0x7b7f74ff, 0x7a7d70ff, 
+    0x797a6dff, 0x77776aff, 0x767567ff, 0x757264ff, 0x737060ff, 0x726d5eff, 
+    0x706a5aff, 0x6f6757ff, 0x6d6454ff, 0x6c6250ff, 0x6c5f4eff, 0x796647ff, 
+    0xaf8539ff, 0xfcb42aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
+    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
+    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
+    0xffaa24ff, 0xfca723ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfce260ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 
+    0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 
+    0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
+    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
+    0xffcd3cff, 0xffcb3aff, 0xdbbb52ff, 0x959c82ff, 0x7c8e91ff, 0x7a8b8dff, 
+    0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 
+    0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 
+    0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 
+    0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x987336ff, 0xfeb429ff, 0xffb429ff, 
+    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xfca622ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfce15eff, 0xffe35eff, 
+    0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 
+    0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 
+    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
+    0xffce3dff, 0xffcd3cff, 0xf7c740ff, 0xa6a47aff, 0x7d9194ff, 0x7c8e91ff, 
+    0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 
+    0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 
+    0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 
+    0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x5b4c3eff, 
+    0xe6a027ff, 0xfeb228ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
+    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
+    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xfca522ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfce05cff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 
+    0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
+    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
+    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xedc348ff, 0x939c88ff, 0x7d9194ff, 
+    0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 
+    0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 
+    0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 
+    0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 
+    0x594b3fff, 0x58483bff, 0xca8c27ff, 0xeda425ff, 0xfeb128ff, 0xffb127ff, 
+    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
+    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
+    0xffa723ff, 0xfca522ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcdf5bff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 
+    0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
+    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
+    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xf6c742ff, 0x919b8aff, 
+    0x7d9194ff, 0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 
+    0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 
+    0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 
+    0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 
+    0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0xc88b27ff, 0xe49b24ff, 
+    0xeca124ff, 0xfeaf27ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
+    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
+    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xfca421ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcde59ff, 0xffdf59ff, 
+    0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 
+    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
+    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xfecb3bff, 
+    0x9fa180ff, 0x7d9194ff, 0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 
+    0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 
+    0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 
+    0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 
+    0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 
+    0xc88926ff, 0xe49b23ff, 0xe49a23ff, 0xeca024ff, 0xfeae26ff, 0xffae26ff, 
+    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
+    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xfca321ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcdc57ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 
+    0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
+    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
+    0xffcb3aff, 0xcdb55dff, 0x7d9194ff, 0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 
+    0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 
+    0x6f7572ff, 0x6d726eff, 0x797563ff, 0x9c834eff, 0xa28648ff, 0xa18446ff, 
+    0xa08244ff, 0x746954ff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 
+    0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 
+    0x554335ff, 0x544031ff, 0xca8b25ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 
+    0xed9f23ff, 0xfeac26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
+    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
+    0xffa522ff, 0xfca221ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcdb55ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 
+    0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
+    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
+    0xffcd3cff, 0xffcb3aff, 0xfac83bff, 0x8b978aff, 0x7c8e91ff, 0x7a8b8dff, 
+    0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 
+    0x707875ff, 0x6f7572ff, 0x6d726eff, 0x998452ff, 0xe2a529ff, 0xe4a528ff, 
+    0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 0x826e4bff, 0x625c53ff, 0x615950ff, 
+    0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 
+    0x574538ff, 0x554335ff, 0x544031ff, 0x58412eff, 0xdd9623ff, 0xe49a23ff, 
+    0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xed9f22ff, 0xfeab25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
+    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xfca120ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcda54ff, 0xffdc54ff, 
+    0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 
+    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
+    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xd2b657ff, 0x7c8e91ff, 
+    0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 
+    0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x727268ff, 0xdda42bff, 
+    0xe4a528ff, 0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 0xe4a227ff, 0x816d48ff, 
+    0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 
+    0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x9f6e26ff, 
+    0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 
+    0xee9e23ff, 0xfea924ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
+    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xfca120ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcd952ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
+    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
+    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
+    0xa9a271ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 
+    0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 
+    0x83785cff, 0xe4a528ff, 0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 0xe4a227ff, 
+    0xe4a127ff, 0x806a46ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 
+    0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x674a2cff, 
+    0xb27a25ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xe79922ff, 
+    0xe69822ff, 0xe79822ff, 0xe79721ff, 0xef9e22ff, 0xfea824ff, 0xffa823ff, 
+    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
+    0xffa321ff, 0xfca020ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcd850ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
+    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
+    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
+    0xffc937ff, 0xffc835ff, 0x849086ff, 0x79888aff, 0x778586ff, 0x768383ff, 
+    0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 
+    0x6c6f6bff, 0x6b6c68ff, 0x736f5fff, 0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 
+    0xe4a227ff, 0xe4a127ff, 0xe4a127ff, 0x92733eff, 0x5e5349ff, 0x5c5146ff, 
+    0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x694d2fff, 
+    0xae7827ff, 0xe19923ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 
+    0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 
+    0xf09d21ff, 0xfea623ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
+    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xfc9f1fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcd74eff, 0xffd94fff, 
+    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
+    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
+    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xf9c437ff, 0x79888aff, 0x778586ff, 
+    0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 
+    0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0xbc8f38ff, 
+    0xe4a327ff, 0xe4a227ff, 0xe4a127ff, 0xe4a127ff, 0xe4a126ff, 0xca912dff, 
+    0x5e5246ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x674f33ff, 
+    0xab772aff, 0xe19a23ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe69923ff, 
+    0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 
+    0xe99820ff, 0xe89720ff, 0xe99720ff, 0xef9c21ff, 0xfea522ff, 0xffa522ff, 
+    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xfc9e1fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcd64dff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
+    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
+    0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xecbd3dff, 
+    0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 
+    0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 
+    0x66645dff, 0x716755ff, 0xd3992eff, 0xe4a127ff, 0xe4a127ff, 0xe4a126ff, 
+    0xe4a026ff, 0xe49f26ff, 0xbf8a2dff, 0x765c3aff, 0x5e4b3aff, 0x735634ff, 
+    0xaf7b2bff, 0xe19a24ff, 0xe49b23ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 
+    0xe69923ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 
+    0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 
+    0xf09920ff, 0xfea322ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
+    0xffa020ff, 0xfc9e1fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcd54bff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
+    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
+    0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
+    0xffc631ff, 0xebbc3dff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 
+    0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 
+    0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x73644eff, 0xce942eff, 
+    0xe4a126ff, 0xe4a026ff, 0xe49f26ff, 0xe49f25ff, 0xe49e25ff, 0xe49d25ff, 
+    0xe49c24ff, 0xe49c24ff, 0xe49b24ff, 0xe49b23ff, 0xe49a23ff, 0xe49a23ff, 
+    0xe59a22ff, 0xe69923ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 
+    0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 
+    0xea961fff, 0xeb951fff, 0xeb941fff, 0xf1981fff, 0xfea221ff, 0xffa221ff, 
+    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xfc9d1eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcd44aff, 0xffd54aff, 
+    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
+    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 
+    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xf6c035ff, 0x75807fff, 0x737d7cff, 
+    0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 
+    0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 
+    0x615950ff, 0x675a4aff, 0xb38433ff, 0xe49f26ff, 0xe49f25ff, 0xe49e25ff, 
+    0xe49d25ff, 0xe49c24ff, 0xe49c24ff, 0xe49b24ff, 0xe49b23ff, 0xe49a23ff, 
+    0xe49a23ff, 0xe59a22ff, 0xe69923ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 
+    0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 
+    0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 
+    0xf29820ff, 0xfea020ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xfc9c1eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcd249ff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
+    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
+    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xfec32fff, 
+    0x798079ff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 
+    0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 
+    0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x876839ff, 
+    0xd89727ff, 0xe49d25ff, 0xe49c24ff, 0xe49c24ff, 0xe49b24ff, 0xe49b23ff, 
+    0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xe79922ff, 
+    0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 
+    0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 
+    0xeb941eff, 0xec941fff, 0xec931eff, 0xf3971fff, 0xfe9f20ff, 0xff9f1fff, 
+    0xff9e1fff, 0xfc9b1eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcd147ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
+    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
+    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
+    0xffc32fff, 0xffc32fff, 0x9b8f64ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 
+    0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 
+    0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 
+    0x5b4e42ff, 0x594b3fff, 0x655039ff, 0xb8812aff, 0xe49c24ff, 0xe49b24ff, 
+    0xe49b23ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 
+    0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 
+    0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 
+    0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 
+    0xf3961eff, 0xfe9d1fff, 0xff9d1fff, 0xfc9b1dff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcd045ff, 0xffd244ff, 
+    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
+    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
+    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xc2a24dff, 0x6f7572ff, 
+    0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 
+    0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 
+    0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 
+    0x88622cff, 0xdb9524ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 
+    0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 
+    0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 
+    0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 
+    0xee931eff, 0xed921dff, 0xee921dff, 0xf3951eff, 0xfe9c1eff, 0xfc9a1dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfccf43ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
+    0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 
+    0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
+    0xf7bb31ff, 0x777869ff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 
+    0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 
+    0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 
+    0x554335ff, 0x544031ff, 0x523d2eff, 0x60442aff, 0xba7e24ff, 0xe59a22ff, 
+    0xe59922ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 
+    0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 
+    0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 
+    0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 
+    0xf4941dff, 0xfb981dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcce42ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
+    0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
+    0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
+    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xba9a4aff, 0x6b6c68ff, 0x696a64ff, 
+    0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 
+    0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 
+    0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 
+    0x4f3624ff, 0x926120ff, 0xe39822ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 
+    0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 
+    0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 
+    0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 
+    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf2921bff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfccd40ff, 0xffcf3fff, 
+    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 
+    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 
+    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xfdbd2dff, 
+    0x8f7e56ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 
+    0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 
+    0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 
+    0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x71481cff, 0xdb9022ff, 
+    0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 
+    0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 
+    0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 
+    0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xee8e1bff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfccc3eff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
+    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
+    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
+    0xffbe2dff, 0xffbd2dff, 0xf1b431ff, 0x7f7255ff, 0x65615aff, 0x635e57ff, 
+    0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 
+    0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 
+    0x513a2aff, 0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 
+    0x492c1aff, 0x603d1bff, 0xd48a20ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 
+    0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 
+    0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 
+    0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
+    0xf08f1cff, 0xef8e1bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfccb3cff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
+    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
+    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
+    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xf2b330ff, 
+    0x82704fff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 
+    0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 
+    0x523d2eff, 0x513a2aff, 0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 
+    0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x5b391bff, 0xd78d20ff, 
+    0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 
+    0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 
+    0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 
+    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xef8d1aff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcca3bff, 0xffcb3aff, 
+    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
+    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
+    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
+    0xffbb2cff, 0xffba2bff, 0xfab62dff, 0xa38141ff, 0x60574cff, 0x5e5349ff, 
+    0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 
+    0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 
+    0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 
+    0x442b1aff, 0x5d3b1bff, 0xdf9020ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 
+    0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 
+    0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 
+    0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf08c1aff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcc839ff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 
+    0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
+    0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
+    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
+    0xdda230ff, 0x816840ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 
+    0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 0x4e3524ff, 
+    0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 
+    0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x734a1cff, 0xe9951fff, 
+    0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 
+    0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 
+    0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
+    0xf28e1bff, 0xf08d1aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcc737ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
+    0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
+    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
+    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
+    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xfeb529ff, 0xc28e31ff, 0x6a543aff, 
+    0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 
+    0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 
+    0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 
+    0x3f291aff, 0xa6691dff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 
+    0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 
+    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
+    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf08c19ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcc636ff, 0xffc835ff, 
+    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 
+    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 
+    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
+    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
+    0xffb429ff, 0xfbb128ff, 0xc08a2dff, 0x6d5130ff, 0x523d2eff, 0x513a2aff, 
+    0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 
+    0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 
+    0x40291aff, 0x3f291aff, 0x3e281aff, 0x4b311bff, 0xe08d1eff, 0xeb941eff, 
+    0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 
+    0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 
+    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf18c19ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcc534ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
+    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
+    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
+    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
+    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xfcaf27ff, 
+    0xbd8428ff, 0x674827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 
+    0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 
+    0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 
+    0x8f5b1bff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 
+    0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
+    0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
+    0xf38d1aff, 0xf18b19ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcc432ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
+    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
+    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
+    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
+    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xfcad26ff, 0xb87c24ff, 0x5a391eff, 
+    0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 
+    0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 
+    0x3b271aff, 0x3a271aff, 0x49301bff, 0xe8911eff, 0xed931eff, 0xee931eff, 
+    0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 
+    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 
+    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf28b19ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcc330ff, 0xffc530ff, 
+    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
+    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
+    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
+    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
+    0xffad26ff, 0xf3a425ff, 0x8e5c1eff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 
+    0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 
+    0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0xb6721dff, 
+    0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 
+    0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 
+    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf18a19ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcc22fff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
+    0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
+    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
+    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
+    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
+    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xae731fff, 
+    0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 
+    0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 
+    0x37261aff, 0x81531bff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 
+    0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
+    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
+    0xf58c19ff, 0xf28a19ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcc12fff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
+    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
+    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
+    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
+    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0x925f1eff, 0x432a1aff, 0x412a1aff, 0x40291aff, 
+    0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 
+    0x38261aff, 0x37261aff, 0x35251aff, 0x593b1bff, 0xee921dff, 0xee911dff, 
+    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
+    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
+    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf28919ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcc02eff, 0xffc32fff, 
+    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 
+    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
+    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
+    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
+    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
+    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xef9e22ff, 0x452c1aff, 
+    0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 
+    0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x38261aff, 
+    0xea8f1dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 
+    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
+    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf38a19ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcc02eff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
+    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
+    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
+    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
+    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
+    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
+    0xffa723ff, 0x5d3d1bff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 
+    0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 
+    0x33241aff, 0x32241bff, 0xe18a1cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
+    0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
+    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
+    0xf58b19ff, 0xf38819ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcbf2eff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
+    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
+    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
+    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
+    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
+    0xffa823ff, 0xffa723ff, 0xffa723ff, 0x68441bff, 0x3e281aff, 0x3d281aff, 
+    0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 
+    0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0xd7841bff, 0xf0911cff, 
+    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 
+    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
+    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf48719ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcbe2dff, 0xffc02eff, 
+    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
+    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
+    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
+    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
+    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0x5b3b1bff, 
+    0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 
+    0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 
+    0xcf7e1cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 
+    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
+    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf48718ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcbd2dff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
+    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
+    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
+    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
+    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
+    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
+    0xf8a022ff, 0x412a1aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 
+    0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 
+    0x2f231bff, 0x2e221bff, 0xdd841cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
+    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
+    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
+    0xf78818ff, 0xf48718ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcbd2dff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
+    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
+    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
+    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
+    0xffa622ff, 0xffa522ff, 0xcb8320ff, 0x3b271aff, 0x3a271aff, 0x39261aff, 
+    0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 
+    0x31231bff, 0x2f231bff, 0x2e221bff, 0x2f241bff, 0xed8e1cff, 0xf18f1cff, 
+    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
+    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
+    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf58717ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcbc2cff, 0xffbe2dff, 
+    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
+    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
+    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
+    0xfcae27ff, 0xf8aa26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
+    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
+    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0x764c1cff, 0x3a271aff, 
+    0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 
+    0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 0x4a321bff, 
+    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
+    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
+    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf58616ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcbb2cff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
+    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
+    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
+    0xf4a928ff, 0x8e6327ff, 0x543824ff, 0x4e3320ff, 0x7b501fff, 0xd28d23ff, 
+    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
+    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xb8761eff, 
+    0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 
+    0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 
+    0x2c211bff, 0x85531cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
+    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
+    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
+    0xf88816ff, 0xf68516ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcba2cff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
+    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
+    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0x875e27ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 
+    0x4a2d1aff, 0x492c1aff, 0x744b1dff, 0xd18a22ff, 0xffaa24ff, 0xffa924ff, 
+    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xfda322ff, 
+    0xa96c1eff, 0x3e291aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 
+    0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 
+    0x2d221bff, 0x2c211bff, 0x2b211bff, 0xc5761bff, 0xf28e1bff, 0xf28e1bff, 
+    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
+    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
+    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf78516ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb92bff, 0xffbc2cff, 
+    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
+    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xf3a827ff, 0x4f3624ff, 0x4d3220ff, 
+    0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 
+    0x724a1dff, 0xd08921ff, 0xffa723ff, 0xffa723ff, 0xfba422ff, 0xd88b20ff, 
+    0xa86d1fff, 0x56381bff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 
+    0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 
+    0x2e221bff, 0x2d221bff, 0x2c211bff, 0x2b211bff, 0x5e3e1bff, 0xf28e1bff, 
+    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
+    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
+    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xf68515ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcb92bff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
+    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
+    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xe59d25ff, 
+    0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 
+    0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x55361bff, 0x4b301aff, 
+    0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 
+    0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 
+    0x2f231bff, 0x2e221bff, 0x2d221bff, 0x2c211bff, 0x2b211bff, 0x2b221bff, 
+    0xcb781bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
+    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
+    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
+    0xfa8715ff, 0xf78415ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcb82bff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
+    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
+    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xf8a926ff, 0x4f321dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 
+    0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 
+    0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 
+    0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 
+    0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 0x2c211bff, 0x2b211bff, 
+    0x29211bff, 0x90591bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
+    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
+    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
+    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xf78315ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb72aff, 0xffb92bff, 
+    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
+    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
+    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0x7e521eff, 0x492c1aff, 
+    0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 
+    0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 
+    0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 
+    0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 0x2c211bff, 
+    0x2b211bff, 0x29211bff, 0x6e471bff, 0xf18d1bff, 0xf28d1aff, 0xf38d1aff, 
+    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
+    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
+    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xf88315ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcb62aff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
+    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
+    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
+    0xd69023ff, 0x482d1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 
+    0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 
+    0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 
+    0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 
+    0x2c211bff, 0x2b211bff, 0x29211bff, 0x81511bff, 0xef8c1bff, 0xf28d1aff, 
+    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
+    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
+    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
+    0xfa8414ff, 0xf88315ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcb62aff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
+    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
+    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xa96f1fff, 0x452b1aff, 0x442b1aff, 
+    0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 
+    0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 
+    0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 
+    0x2d221bff, 0x2c211bff, 0x2b211bff, 0x3f2d1bff, 0xac671bff, 0xf28e1bff, 
+    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
+    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
+    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
+    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xf98215ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb529ff, 0xffb72aff, 
+    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
+    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
+    0xb47620ff, 0x52341bff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 
+    0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 
+    0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 
+    0x2e221bff, 0x2d221bff, 0x2c211bff, 0x4a321bff, 0x935c1bff, 0xeb891bff, 
+    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
+    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
+    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
+    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xf88114ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcb429ff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
+    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
+    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
+    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xec9a22ff, 0xb1731eff, 0x8e5b1cff, 
+    0x83541cff, 0x83531cff, 0x81521cff, 0x81521cff, 0x80521cff, 0x80521cff, 
+    0x80521cff, 0x7f511cff, 0x7e501cff, 0x7e501cff, 0x7d501cff, 0x7d4f1bff, 
+    0x7c4f1bff, 0x7f501cff, 0x8f5a1bff, 0xa4641bff, 0xd37e1cff, 0xf28f1bff, 
+    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
+    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
+    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
+    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
+    0xfb8314ff, 0xf98014ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcb329ff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
+    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
+    0xf49e21ff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 
+    0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 
+    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
+    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
+    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
+    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
+    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
+    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfa8014ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb328ff, 0xffb529ff, 
+    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
+    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
+    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
+    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xf49c21ff, 0xeb941eff, 0xeb941eff, 
+    0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 
+    0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 
+    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
+    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
+    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
+    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 
+    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfa7f13ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcb228ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
+    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
+    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
+    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
+    0xf59c20ff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 
+    0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
+    0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
+    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
+    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
+    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
+    0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
+    0xfd8113ff, 0xfb7f13ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcb128ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
+    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
+    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
+    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
+    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xf59a1fff, 0xed931eff, 0xee931eff, 
+    0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 
+    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 
+    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
+    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
+    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
+    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 
+    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfb7e13ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb027ff, 0xffb328ff, 
+    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
+    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
+    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 
+    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 
+    0xf69a1fff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 
+    0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 
+    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
+    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
+    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
+    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 
+    0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfb7f12ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcb027ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
+    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
+    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
+    0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
+    0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xf6971eff, 0xee911dff, 0xef921cff, 
+    0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
+    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
+    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
+    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
+    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
+    0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 
+    0xfe8012ff, 0xfb7e12ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcb027ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
+    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
+    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 
+    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 
+    0xf7971eff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
+    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
+    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
+    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
+    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
+    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 
+    0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xfc7e12ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcaf26ff, 0xffb027ff, 
+    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
+    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
+    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 
+    0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 
+    0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xf7951eff, 0xf0901cff, 0xf08f1cff, 
+    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
+    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
+    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
+    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 
+    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 
+    0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xfc7d11ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcae26ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
+    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
+    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
+    0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 
+    0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 
+    0xf7941dff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
+    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
+    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
+    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
+    0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
+    0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 
+    0xff7e11ff, 0xfc7d11ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcae26ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
+    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
+    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
+    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 
+    0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 
+    0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xf8931bff, 0xf28e1bff, 0xf28e1bff, 
+    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
+    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
+    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
+    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 
+    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 
+    0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xfc7c11ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcad25ff, 0xffae26ff, 
+    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
+    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 
+    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 
+    0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 
+    0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 
+    0xf8921bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
+    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
+    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
+    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 
+    0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 
+    0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xfc7b10ff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcac25ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
+    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
+    0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
+    0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 
+    0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 
+    0xff971cff, 0xff971cff, 0xff961bff, 0xf9911aff, 0xf38c1aff, 0xf48d1aff, 
+    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
+    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
+    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
+    0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 
+    0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 
+    0xff7c10ff, 0xfc7a10ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfcab25ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
+    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
+    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 
+    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 
+    0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 
+    0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 
+    0xfa901aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
+    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
+    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
+    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 
+    0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 
+    0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xfc7a10ff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcab24ff, 0xffac25ff, 
+    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
+    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 
+    0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 
+    0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 
+    0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 
+    0xff941bff, 0xff941bff, 0xff931aff, 0xf98e19ff, 0xf58b1aff, 0xf58b19ff, 
+    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
+    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 
+    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 
+    0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 
+    0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xfc790fff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfcaa24ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
+    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
+    0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 
+    0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 
+    0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 
+    0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 
+    0xfa8e18ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
+    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
+    0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
+    0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 
+    0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 
+    0xff7a0fff, 0xfc780fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfca924ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
+    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
+    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 
+    0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 
+    0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 
+    0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 
+    0xff911aff, 0xff9119ff, 0xff9019ff, 0xfa8c18ff, 0xf78818ff, 0xf78918ff, 
+    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
+    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 
+    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 
+    0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 
+    0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xfc770fff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfca823ff, 0xffaa24ff, 
+    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 
+    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 
+    0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 
+    0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 
+    0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 
+    0xff921aff, 0xff911aff, 0xff9119ff, 0xff9019ff, 0xff8f19ff, 0xff8e18ff, 
+    0xfb8c17ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
+    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 
+    0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 
+    0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 
+    0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xff780fff, 0xfc770eff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xfca823ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
+    0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
+    0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 
+    0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 
+    0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 
+    0xff931aff, 0xff921aff, 0xff911aff, 0xff9119ff, 0xff9019ff, 0xff8f19ff, 
+    0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 0xfc8a17ff, 0xf98716ff, 0xf98616ff, 
+    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
+    0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 
+    0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 
+    0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xff780fff, 
+    0xff780eff, 0xfc760eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xfca723ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
+    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 
+    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 
+    0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 
+    0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 
+    0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 0xff9119ff, 0xff9019ff, 
+    0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 0xff8c17ff, 0xff8b17ff, 
+    0xfb8817ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
+    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 
+    0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 
+    0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 0xff790fff, 
+    0xff780fff, 0xff780eff, 0xff770eff, 0xfc750eff, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xec9921ff, 0xffa723ff, 
+    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 
+    0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 
+    0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 
+    0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 
+    0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 0xff9119ff, 
+    0xff9019ff, 0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 0xff8c17ff, 
+    0xff8b17ff, 0xff8a17ff, 0xff8a16ff, 0xfc8716ff, 0xfa8515ff, 0xfa8414ff, 
+    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 
+    0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 
+    0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 
+    0xff790fff, 0xff780fff, 0xff780eff, 0xff770eff, 0xff760eff, 0xeb6b0dff, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xc9791dea, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
+    0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 
+    0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 
+    0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 
+    0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 
+    0xff9119ff, 0xff9019ff, 0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 
+    0xff8c17ff, 0xff8b17ff, 0xff8a17ff, 0xff8a16ff, 0xff8916ff, 0xff8816ff, 
+    0xfc8515ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
+    0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 
+    0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 
+    0xff7a0fff, 0xff790fff, 0xff780fff, 0xff780eff, 0xff770eff, 0xff760eff, 
+    0xff750dff, 0xc85b10e9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0xb4622622, 0xd3821df7, 0xffa522ff, 0xffa422ff, 
+    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 
+    0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 
+    0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 
+    0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 
+    0xff911aff, 0xff9119ff, 0xff9019ff, 0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 
+    0xff8d18ff, 0xff8c17ff, 0xff8b17ff, 0xff8a17ff, 0xff8a16ff, 0xff8916ff, 
+    0xff8816ff, 0xff8715ff, 0xff8715ff, 0xfd8415ff, 0xfb8314ff, 0xfc8214ff, 
+    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 
+    0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 
+    0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xff780fff, 0xff780eff, 0xff770eff, 
+    0xff760eff, 0xff750dff, 0xd25f10f6, 0xaf502020, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0xb4631b4b, 0xba671d97, 0xb7661c9b, 0xb7661c9b, 0xb7661c9b, 0xb7661c9b, 
+    0xb7661c9b, 0xb7641a9b, 0xb7641a9b, 0xb7641a9b, 0xb7641a9b, 0xb7641a9b, 
+    0xb7631a9b, 0xb7631a9b, 0xb7631a9b, 0xb7631a9b, 0xb763199b, 0xb761199b, 
+    0xb761199b, 0xb761199b, 0xb761199b, 0xb75f199b, 0xb75f199b, 0xb75f199b, 
+    0xb75f199b, 0xb75f199b, 0xb75f199b, 0xb75e199b, 0xb75e199b, 0xb75e179b, 
+    0xb75e179b, 0xb75e179b, 0xb75c179b, 0xb75c179b, 0xb75c179b, 0xb75c179b, 
+    0xb75c179b, 0xb75a179b, 0xb75a179b, 0xb75a179b, 0xb75a179b, 0xb759159b, 
+    0xb759159b, 0xb759159b, 0xb759159b, 0xb759159b, 0xb757159b, 0xb757159b, 
+    0xb757159b, 0xb757159b, 0xb757159b, 0xb757159b, 0xb756159b, 0xb756149b, 
+    0xb756149b, 0xb756149b, 0xb756149b, 0xb754149b, 0xb754149b, 0xb754149b, 
+    0xb754149b, 0xb752149b, 0xba531397, 0xb452114b, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+};
diff --git a/games/NXDoom/src/strife/wi_stuff.c b/games/NXDoom/src/strife/wi_stuff.c
new file mode 100644
index 000000000..f8193b19b
--- /dev/null
+++ b/games/NXDoom/src/strife/wi_stuff.c
@@ -0,0 +1,1836 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Intermission screens.
+//
+
+// haleyjd 08/23/2010: There is no intermission in Strife
+#if 0
+#include <stdio.h>
+
+#include "z_zone.h"
+
+#include "m_random.h"
+
+#include "deh_main.h"
+#include "i_swap.h"
+#include "i_system.h"
+
+#include "w_wad.h"
+
+#include "g_game.h"
+
+#include "r_local.h"
+#include "s_sound.h"
+
+#include "doomstat.h"
+
+// Data.
+#include "sounds.h"
+
+// Needs access to LFB.
+#include "v_video.h"
+
+#include "wi_stuff.h"
+
+//
+// Data needed to add patches to full screen intermission pics.
+// Patches are statistics messages, and animations.
+// Loads of by-pixel layout and placement, offsets etc.
+//
+
+
+//
+// Different vetween registered DOOM (1994) and
+//  Ultimate DOOM - Final edition (retail, 1995?).
+// This is supposedly ignored for commercial
+//  release (aka DOOM II), which had 34 maps
+//  in one episode. So there.
+#define NUMEPISODES	4
+#define NUMMAPS		9
+
+
+// in tics
+//U #define PAUSELEN		(TICRATE*2) 
+//U #define SCORESTEP		100
+//U #define ANIMPERIOD		32
+// pixel distance from "(YOU)" to "PLAYER N"
+//U #define STARDIST		10 
+//U #define WK 1
+
+
+// GLOBAL LOCATIONS
+#define WI_TITLEY		2
+#define WI_SPACINGY    		33
+
+// SINGPLE-PLAYER STUFF
+#define SP_STATSX		50
+#define SP_STATSY		50
+
+#define SP_TIMEX		16
+#define SP_TIMEY		(SCREENHEIGHT-32)
+
+
+// NET GAME STUFF
+#define NG_STATSY		50
+#define NG_STATSX		(32 + SHORT(star->width)/2 + 32*!dofrags)
+
+#define NG_SPACINGX    		64
+
+
+// DEATHMATCH STUFF
+#define DM_MATRIXX		42
+#define DM_MATRIXY		68
+
+#define DM_SPACINGX		40
+
+#define DM_TOTALSX		269
+
+#define DM_KILLERSX		10
+#define DM_KILLERSY		100
+#define DM_VICTIMSX    		5
+#define DM_VICTIMSY		50
+
+
+
+
+typedef enum
+{
+    ANIM_ALWAYS,
+    ANIM_RANDOM,
+    ANIM_LEVEL
+
+} animenum_t;
+
+typedef struct
+{
+    int		x;
+    int		y;
+    
+} point_t;
+
+
+//
+// Animation.
+// There is another anim_t used in p_spec.
+//
+typedef struct
+{
+    animenum_t	type;
+
+    // period in tics between animations
+    int		period;
+
+    // number of animation frames
+    int		nanims;
+
+    // location of animation
+    point_t	loc;
+
+    // ALWAYS: n/a,
+    // RANDOM: period deviation (<256),
+    // LEVEL: level
+    int		data1;
+
+    // ALWAYS: n/a,
+    // RANDOM: random base period,
+    // LEVEL: n/a
+    int		data2; 
+
+    // actual graphics for frames of animations
+    patch_t*	p[3]; 
+
+    // following must be initialized to zero before use!
+
+    // next value of bcnt (used in conjunction with period)
+    int		nexttic;
+
+    // last drawn animation frame
+    int		lastdrawn;
+
+    // next frame number to animate
+    int		ctr;
+    
+    // used by RANDOM and LEVEL when animating
+    int		state;  
+
+} anim_t;
+
+
+static point_t lnodes[NUMEPISODES][NUMMAPS] =
+{
+    // Episode 0 World Map
+    {
+	{ 185, 164 },	// location of level 0 (CJ)
+	{ 148, 143 },	// location of level 1 (CJ)
+	{ 69, 122 },	// location of level 2 (CJ)
+	{ 209, 102 },	// location of level 3 (CJ)
+	{ 116, 89 },	// location of level 4 (CJ)
+	{ 166, 55 },	// location of level 5 (CJ)
+	{ 71, 56 },	// location of level 6 (CJ)
+	{ 135, 29 },	// location of level 7 (CJ)
+	{ 71, 24 }	// location of level 8 (CJ)
+    },
+
+    // Episode 1 World Map should go here
+    {
+	{ 254, 25 },	// location of level 0 (CJ)
+	{ 97, 50 },	// location of level 1 (CJ)
+	{ 188, 64 },	// location of level 2 (CJ)
+	{ 128, 78 },	// location of level 3 (CJ)
+	{ 214, 92 },	// location of level 4 (CJ)
+	{ 133, 130 },	// location of level 5 (CJ)
+	{ 208, 136 },	// location of level 6 (CJ)
+	{ 148, 140 },	// location of level 7 (CJ)
+	{ 235, 158 }	// location of level 8 (CJ)
+    },
+
+    // Episode 2 World Map should go here
+    {
+	{ 156, 168 },	// location of level 0 (CJ)
+	{ 48, 154 },	// location of level 1 (CJ)
+	{ 174, 95 },	// location of level 2 (CJ)
+	{ 265, 75 },	// location of level 3 (CJ)
+	{ 130, 48 },	// location of level 4 (CJ)
+	{ 279, 23 },	// location of level 5 (CJ)
+	{ 198, 48 },	// location of level 6 (CJ)
+	{ 140, 25 },	// location of level 7 (CJ)
+	{ 281, 136 }	// location of level 8 (CJ)
+    }
+
+};
+
+
+//
+// Animation locations for episode 0 (1).
+// Using patches saves a lot of space,
+//  as they replace 320x200 full screen frames.
+//
+
+#define ANIM(type, period, nanims, x, y, nexttic)            \
+   { (type), (period), (nanims), { (x), (y) }, (nexttic),    \
+     0, { NULL, NULL, NULL }, 0, 0, 0, 0 }
+
+
+static anim_t epsd0animinfo[] =
+{
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 224, 104, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 184, 160, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 112, 136, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 72, 112, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 88, 96, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 48, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 192, 40, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 136, 16, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 80, 16, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 24, 0),
+};
+
+static anim_t epsd1animinfo[] =
+{
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 1),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 2),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 3),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 4),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 5),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 6),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 7),
+    ANIM(ANIM_LEVEL, TICRATE/3, 3, 192, 144, 8),
+    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 8),
+};
+
+static anim_t epsd2animinfo[] =
+{
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 168, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 40, 136, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 160, 96, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 80, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 120, 32, 0),
+    ANIM(ANIM_ALWAYS, TICRATE/4, 3, 40, 0, 0),
+};
+
+static int NUMANIMS[NUMEPISODES] =
+{
+    arrlen(epsd0animinfo),
+    arrlen(epsd1animinfo),
+    arrlen(epsd2animinfo),
+};
+
+static anim_t *anims[NUMEPISODES] =
+{
+    epsd0animinfo,
+    epsd1animinfo,
+    epsd2animinfo
+};
+
+
+//
+// GENERAL DATA
+//
+
+//
+// Locally used stuff.
+//
+
+// States for single-player
+#define SP_KILLS		0
+#define SP_ITEMS		2
+#define SP_SECRET		4
+#define SP_FRAGS		6 
+#define SP_TIME			8 
+#define SP_PAR			ST_TIME
+
+#define SP_PAUSE		1
+
+// in seconds
+#define SHOWNEXTLOCDELAY	4
+//#define SHOWLASTLOCDELAY	SHOWNEXTLOCDELAY
+
+
+// used to accelerate or skip a stage
+static int		acceleratestage;
+
+// wbs->pnum
+static int		me;
+
+ // specifies current state
+static stateenum_t	state;
+
+// contains information passed into intermission
+static wbstartstruct_t*	wbs;
+
+static wbplayerstruct_t* plrs;  // wbs->plyr[]
+
+// used for general timing
+static int 		cnt;  
+
+// used for timing of background animation
+static int 		bcnt;
+
+// signals to refresh everything for one frame
+static int 		firstrefresh; 
+
+static int		cnt_kills[MAXPLAYERS];
+static int		cnt_items[MAXPLAYERS];
+static int		cnt_secret[MAXPLAYERS];
+static int		cnt_time;
+static int		cnt_par;
+static int		cnt_pause;
+
+// # of commercial levels
+static int		NUMCMAPS; 
+
+
+//
+//	GRAPHICS
+//
+
+// You Are Here graphic
+static patch_t*		yah[3] = { NULL, NULL, NULL }; 
+
+// splat
+static patch_t*		splat[2] = { NULL, NULL };
+
+// %, : graphics
+static patch_t*		percent;
+static patch_t*		colon;
+
+// 0-9 graphic
+static patch_t*		num[10];
+
+// minus sign
+static patch_t*		wiminus;
+
+// "Finished!" graphics
+static patch_t*		finished;
+
+// "Entering" graphic
+static patch_t*		entering; 
+
+// "secret"
+static patch_t*		sp_secret;
+
+ // "Kills", "Scrt", "Items", "Frags"
+static patch_t*		kills;
+static patch_t*		secret;
+static patch_t*		items;
+static patch_t*		frags;
+
+// Time sucks.
+static patch_t*		timepatch;
+static patch_t*		par;
+static patch_t*		sucks;
+
+// "killers", "victims"
+static patch_t*		killers;
+static patch_t*		victims; 
+
+// "Total", your face, your dead face
+static patch_t*		total;
+static patch_t*		star;
+static patch_t*		bstar;
+
+// "red P[1..MAXPLAYERS]"
+static patch_t*		p[MAXPLAYERS];
+
+// "gray P[1..MAXPLAYERS]"
+static patch_t*		bp[MAXPLAYERS];
+
+ // Name graphics of each level (centered)
+static patch_t**	lnames;
+
+// Buffer storing the backdrop
+static patch_t *background;
+
+//
+// CODE
+//
+
+// slam background
+void WI_slamBackground(void)
+{
+    V_DrawPatch(0, 0, background);
+}
+
+// The ticker is used to detect keys
+//  because of timing issues in netgames.
+boolean WI_Responder(event_t* ev)
+{
+    return false;
+}
+
+
+// Draws "<Levelname> Finished!"
+void WI_drawLF(void)
+{
+    int y = WI_TITLEY;
+
+    if (gamemode != commercial || wbs->last < NUMCMAPS)
+    {
+        // draw <LevelName> 
+        V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2,
+                    y, lnames[wbs->last]);
+
+        // draw "Finished!"
+        y += (5*SHORT(lnames[wbs->last]->height))/4;
+
+        V_DrawPatch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
+    }
+    else if (wbs->last == NUMCMAPS)
+    {
+        // MAP33 - nothing is displayed!
+    }
+    else if (wbs->last > NUMCMAPS)
+    {
+        // > MAP33.  Doom bombs out here with a Bad V_DrawPatch error.
+        // I'm pretty sure that doom2.exe is just reading into random
+        // bits of memory at this point, but let's try to be accurate
+        // anyway.  This deliberately triggers a V_DrawPatch error.
+
+        patch_t tmp = { SCREENWIDTH, SCREENHEIGHT, 1, 1, 
+                        { 0, 0, 0, 0, 0, 0, 0, 0 } };
+
+        V_DrawPatch(0, y, &tmp);
+    }
+}
+
+
+
+// Draws "Entering <LevelName>"
+void WI_drawEL(void)
+{
+    int y = WI_TITLEY;
+
+    // draw "Entering"
+    V_DrawPatch((SCREENWIDTH - SHORT(entering->width))/2,
+		y,
+                entering);
+
+    // draw level
+    y += (5*SHORT(lnames[wbs->next]->height))/4;
+
+    V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->next]->width))/2,
+		y, 
+                lnames[wbs->next]);
+
+}
+
+void
+WI_drawOnLnode
+( int		n,
+  patch_t*	c[] )
+{
+
+    int		i;
+    int		left;
+    int		top;
+    int		right;
+    int		bottom;
+    boolean	fits = false;
+
+    i = 0;
+    do
+    {
+	left = lnodes[wbs->epsd][n].x - SHORT(c[i]->leftoffset);
+	top = lnodes[wbs->epsd][n].y - SHORT(c[i]->topoffset);
+	right = left + SHORT(c[i]->width);
+	bottom = top + SHORT(c[i]->height);
+
+	if (left >= 0
+	    && right < SCREENWIDTH
+	    && top >= 0
+	    && bottom < SCREENHEIGHT)
+	{
+	    fits = true;
+	}
+	else
+	{
+	    i++;
+	}
+    } while (!fits && i!=2 && c[i] != NULL);
+
+    if (fits && i<2)
+    {
+	V_DrawPatch(lnodes[wbs->epsd][n].x,
+                    lnodes[wbs->epsd][n].y,
+		    c[i]);
+    }
+    else
+    {
+	// DEBUG
+	printf("Could not place patch on level %d", n+1); 
+    }
+}
+
+
+
+void WI_initAnimatedBack(void)
+{
+    int		i;
+    anim_t*	a;
+
+    if (gamemode == commercial)
+	return;
+
+    if (wbs->epsd > 2)
+	return;
+
+    for (i=0;i<NUMANIMS[wbs->epsd];i++)
+    {
+	a = &anims[wbs->epsd][i];
+
+	// init variables
+	a->ctr = -1;
+
+	// specify the next time to draw it
+	if (a->type == ANIM_ALWAYS)
+	    a->nexttic = bcnt + 1 + (M_Random()%a->period);
+	else if (a->type == ANIM_RANDOM)
+	    a->nexttic = bcnt + 1 + a->data2+(M_Random()%a->data1);
+	else if (a->type == ANIM_LEVEL)
+	    a->nexttic = bcnt + 1;
+    }
+
+}
+
+void WI_updateAnimatedBack(void)
+{
+    int		i;
+    anim_t*	a;
+
+    if (gamemode == commercial)
+	return;
+
+    if (wbs->epsd > 2)
+	return;
+
+    for (i=0;i<NUMANIMS[wbs->epsd];i++)
+    {
+	a = &anims[wbs->epsd][i];
+
+	if (bcnt == a->nexttic)
+	{
+	    switch (a->type)
+	    {
+	      case ANIM_ALWAYS:
+		if (++a->ctr >= a->nanims) a->ctr = 0;
+		a->nexttic = bcnt + a->period;
+		break;
+
+	      case ANIM_RANDOM:
+		a->ctr++;
+		if (a->ctr == a->nanims)
+		{
+		    a->ctr = -1;
+		    a->nexttic = bcnt+a->data2+(M_Random()%a->data1);
+		}
+		else a->nexttic = bcnt + a->period;
+		break;
+		
+	      case ANIM_LEVEL:
+		// gawd-awful hack for level anims
+		if (!(state == StatCount && i == 7)
+		    && wbs->next == a->data1)
+		{
+		    a->ctr++;
+		    if (a->ctr == a->nanims) a->ctr--;
+		    a->nexttic = bcnt + a->period;
+		}
+		break;
+	    }
+	}
+
+    }
+
+}
+
+void WI_drawAnimatedBack(void)
+{
+    int			i;
+    anim_t*		a;
+
+    if (gamemode == commercial)
+	return;
+
+    if (wbs->epsd > 2)
+	return;
+
+    for (i=0 ; i<NUMANIMS[wbs->epsd] ; i++)
+    {
+	a = &anims[wbs->epsd][i];
+
+	if (a->ctr >= 0)
+	    V_DrawPatch(a->loc.x, a->loc.y, a->p[a->ctr]);
+    }
+
+}
+
+//
+// Draws a number.
+// If digits > 0, then use that many digits minimum,
+//  otherwise only use as many as necessary.
+// Returns new x position.
+//
+
+int
+WI_drawNum
+( int		x,
+  int		y,
+  int		n,
+  int		digits )
+{
+
+    int		fontwidth = SHORT(num[0]->width);
+    int		neg;
+    int		temp;
+
+    if (digits < 0)
+    {
+	if (!n)
+	{
+	    // make variable-length zeros 1 digit long
+	    digits = 1;
+	}
+	else
+	{
+	    // figure out # of digits in #
+	    digits = 0;
+	    temp = n;
+
+	    while (temp)
+	    {
+		temp /= 10;
+		digits++;
+	    }
+	}
+    }
+
+    neg = n < 0;
+    if (neg)
+	n = -n;
+
+    // if non-number, do not draw it
+    if (n == 1994)
+	return 0;
+
+    // draw the new number
+    while (digits--)
+    {
+	x -= fontwidth;
+	V_DrawPatch(x, y, num[ n % 10 ]);
+	n /= 10;
+    }
+
+    // draw a minus sign if necessary
+    if (neg)
+	V_DrawPatch(x-=8, y, wiminus);
+
+    return x;
+
+}
+
+void
+WI_drawPercent
+( int		x,
+  int		y,
+  int		p )
+{
+    if (p < 0)
+	return;
+
+    V_DrawPatch(x, y, percent);
+    WI_drawNum(x, y, p, -1);
+}
+
+
+
+//
+// Display level completion time and par,
+//  or "sucks" message if overflow.
+//
+void
+WI_drawTime
+( int		x,
+  int		y,
+  int		t )
+{
+
+    int		div;
+    int		n;
+
+    if (t<0)
+	return;
+
+    if (t <= 61*59)
+    {
+	div = 1;
+
+	do
+	{
+	    n = (t / div) % 60;
+	    x = WI_drawNum(x, y, n, 2) - SHORT(colon->width);
+	    div *= 60;
+
+	    // draw
+	    if (div==60 || t / div)
+		V_DrawPatch(x, y, colon);
+	    
+	} while (t / div);
+    }
+    else
+    {
+	// "sucks"
+	V_DrawPatch(x - SHORT(sucks->width), y, sucks); 
+    }
+}
+
+
+void WI_End(void)
+{
+    void WI_unloadData(void);
+    WI_unloadData();
+}
+
+void WI_initNoState(void)
+{
+    state = NoState;
+    acceleratestage = 0;
+    cnt = 10;
+}
+
+void WI_updateNoState(void) {
+
+    WI_updateAnimatedBack();
+
+    if (!--cnt)
+    {
+        // Don't call WI_End yet.  G_WorldDone doesnt immediately 
+        // change gamestate, so WI_Drawer is still going to get
+        // run until that happens.  If we do that after WI_End
+        // (which unloads all the graphics), we're in trouble.
+	//WI_End();
+	G_WorldDone();
+    }
+
+}
+
+static boolean		snl_pointeron = false;
+
+
+void WI_initShowNextLoc(void)
+{
+    state = ShowNextLoc;
+    acceleratestage = 0;
+    cnt = SHOWNEXTLOCDELAY * TICRATE;
+
+    WI_initAnimatedBack();
+}
+
+void WI_updateShowNextLoc(void)
+{
+    WI_updateAnimatedBack();
+
+    if (!--cnt || acceleratestage)
+	WI_initNoState();
+    else
+	snl_pointeron = (cnt & 31) < 20;
+}
+
+void WI_drawShowNextLoc(void)
+{
+
+    int		i;
+    int		last;
+
+    WI_slamBackground();
+
+    // draw animated background
+    WI_drawAnimatedBack(); 
+
+    if ( gamemode != commercial)
+    {
+  	if (wbs->epsd > 2)
+	{
+	    WI_drawEL();
+	    return;
+	}
+	
+	last = (wbs->last == 8) ? wbs->next - 1 : wbs->last;
+
+	// draw a splat on taken cities.
+	for (i=0 ; i<=last ; i++)
+	    WI_drawOnLnode(i, splat);
+
+	// splat the secret level?
+	if (wbs->didsecret)
+	    WI_drawOnLnode(8, splat);
+
+	// draw flashing ptr
+	if (snl_pointeron)
+	    WI_drawOnLnode(wbs->next, yah); 
+    }
+
+    // draws which level you are entering..
+    if ( (gamemode != commercial)
+	 || wbs->next != 30)
+	WI_drawEL();  
+
+}
+
+void WI_drawNoState(void)
+{
+    snl_pointeron = true;
+    WI_drawShowNextLoc();
+}
+
+int WI_fragSum(int playernum)
+{
+    int		i;
+    int		frags = 0;
+    
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i]
+	    && i!=playernum)
+	{
+	    frags += plrs[playernum].frags[i];
+	}
+    }
+
+	
+    // JDC hack - negative frags.
+    frags -= plrs[playernum].frags[playernum];
+    // UNUSED if (frags < 0)
+    // 	frags = 0;
+
+    return frags;
+}
+
+
+
+static int		dm_state;
+static int		dm_frags[MAXPLAYERS][MAXPLAYERS];
+static int		dm_totals[MAXPLAYERS];
+
+
+
+void WI_initDeathmatchStats(void)
+{
+
+    int		i;
+    int		j;
+
+    state = StatCount;
+    acceleratestage = 0;
+    dm_state = 1;
+
+    cnt_pause = TICRATE;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i])
+	{
+	    for (j=0 ; j<MAXPLAYERS ; j++)
+		if (playeringame[j])
+		    dm_frags[i][j] = 0;
+
+	    dm_totals[i] = 0;
+	}
+    }
+    
+    WI_initAnimatedBack();
+}
+
+
+
+void WI_updateDeathmatchStats(void)
+{
+
+    int		i;
+    int		j;
+    
+    boolean	stillticking;
+
+    WI_updateAnimatedBack();
+
+    if (acceleratestage && dm_state != 4)
+    {
+	acceleratestage = 0;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (playeringame[i])
+	    {
+		for (j=0 ; j<MAXPLAYERS ; j++)
+		    if (playeringame[j])
+			dm_frags[i][j] = plrs[i].frags[j];
+
+		dm_totals[i] = WI_fragSum(i);
+	    }
+	}
+	
+
+	S_StartSound(0, sfx_barexp);
+	dm_state = 4;
+    }
+
+    
+    if (dm_state == 2)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+	
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (playeringame[i])
+	    {
+		for (j=0 ; j<MAXPLAYERS ; j++)
+		{
+		    if (playeringame[j]
+			&& dm_frags[i][j] != plrs[i].frags[j])
+		    {
+			if (plrs[i].frags[j] < 0)
+			    dm_frags[i][j]--;
+			else
+			    dm_frags[i][j]++;
+
+			if (dm_frags[i][j] > 99)
+			    dm_frags[i][j] = 99;
+
+			if (dm_frags[i][j] < -99)
+			    dm_frags[i][j] = -99;
+			
+			stillticking = true;
+		    }
+		}
+		dm_totals[i] = WI_fragSum(i);
+
+		if (dm_totals[i] > 99)
+		    dm_totals[i] = 99;
+		
+		if (dm_totals[i] < -99)
+		    dm_totals[i] = -99;
+	    }
+	    
+	}
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    dm_state++;
+	}
+
+    }
+    else if (dm_state == 4)
+    {
+	if (acceleratestage)
+	{
+	    S_StartSound(0, sfx_slop);
+
+	    if ( gamemode == commercial)
+		WI_initNoState();
+	    else
+		WI_initShowNextLoc();
+	}
+    }
+    else if (dm_state & 1)
+    {
+	if (!--cnt_pause)
+	{
+	    dm_state++;
+	    cnt_pause = TICRATE;
+	}
+    }
+}
+
+
+
+void WI_drawDeathmatchStats(void)
+{
+
+    int		i;
+    int		j;
+    int		x;
+    int		y;
+    int		w;
+    
+    int		lh;	// line height
+
+    lh = WI_SPACINGY;
+
+    WI_slamBackground();
+    
+    // draw animated background
+    WI_drawAnimatedBack(); 
+    WI_drawLF();
+
+    // draw stat titles (top line)
+    V_DrawPatch(DM_TOTALSX-SHORT(total->width)/2,
+		DM_MATRIXY-WI_SPACINGY+10,
+		total);
+    
+    V_DrawPatch(DM_KILLERSX, DM_KILLERSY, killers);
+    V_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, victims);
+
+    // draw P?
+    x = DM_MATRIXX + DM_SPACINGX;
+    y = DM_MATRIXY;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (playeringame[i])
+	{
+	    V_DrawPatch(x-SHORT(p[i]->width)/2,
+			DM_MATRIXY - WI_SPACINGY,
+			p[i]);
+	    
+	    V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
+			y,
+			p[i]);
+
+	    if (i == me)
+	    {
+		V_DrawPatch(x-SHORT(p[i]->width)/2,
+			    DM_MATRIXY - WI_SPACINGY,
+			    bstar);
+
+		V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
+			    y,
+			    star);
+	    }
+	}
+	else
+	{
+	    // V_DrawPatch(x-SHORT(bp[i]->width)/2,
+	    //   DM_MATRIXY - WI_SPACINGY, bp[i]);
+	    // V_DrawPatch(DM_MATRIXX-SHORT(bp[i]->width)/2,
+	    //   y, bp[i]);
+	}
+	x += DM_SPACINGX;
+	y += WI_SPACINGY;
+    }
+
+    // draw stats
+    y = DM_MATRIXY+10;
+    w = SHORT(num[0]->width);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	x = DM_MATRIXX + DM_SPACINGX;
+
+	if (playeringame[i])
+	{
+	    for (j=0 ; j<MAXPLAYERS ; j++)
+	    {
+		if (playeringame[j])
+		    WI_drawNum(x+w, y, dm_frags[i][j], 2);
+
+		x += DM_SPACINGX;
+	    }
+	    WI_drawNum(DM_TOTALSX+w, y, dm_totals[i], 2);
+	}
+	y += WI_SPACINGY;
+    }
+}
+
+static int	cnt_frags[MAXPLAYERS];
+static int	dofrags;
+static int	ng_state;
+
+void WI_initNetgameStats(void)
+{
+
+    int i;
+
+    state = StatCount;
+    acceleratestage = 0;
+    ng_state = 1;
+
+    cnt_pause = TICRATE;
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (!playeringame[i])
+	    continue;
+
+	cnt_kills[i] = cnt_items[i] = cnt_secret[i] = cnt_frags[i] = 0;
+
+	dofrags += WI_fragSum(i);
+    }
+
+    dofrags = !!dofrags;
+
+    WI_initAnimatedBack();
+}
+
+
+
+void WI_updateNetgameStats(void)
+{
+
+    int		i;
+    int		fsum;
+    
+    boolean	stillticking;
+
+    WI_updateAnimatedBack();
+
+    if (acceleratestage && ng_state != 10)
+    {
+	acceleratestage = 0;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
+	    cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
+	    cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
+
+	    if (dofrags)
+		cnt_frags[i] = WI_fragSum(i);
+	}
+	S_StartSound(0, sfx_barexp);
+	ng_state = 10;
+    }
+
+    if (ng_state == 2)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_kills[i] += 2;
+
+	    if (cnt_kills[i] >= (plrs[i].skills * 100) / wbs->maxkills)
+		cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
+	    else
+		stillticking = true;
+	}
+	
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    ng_state++;
+	}
+    }
+    else if (ng_state == 4)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_items[i] += 2;
+	    if (cnt_items[i] >= (plrs[i].sitems * 100) / wbs->maxitems)
+		cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
+	    else
+		stillticking = true;
+	}
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    ng_state++;
+	}
+    }
+    else if (ng_state == 6)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_secret[i] += 2;
+
+	    if (cnt_secret[i] >= (plrs[i].ssecret * 100) / wbs->maxsecret)
+		cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
+	    else
+		stillticking = true;
+	}
+	
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_barexp);
+	    ng_state += 1 + 2*!dofrags;
+	}
+    }
+    else if (ng_state == 8)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	stillticking = false;
+
+	for (i=0 ; i<MAXPLAYERS ; i++)
+	{
+	    if (!playeringame[i])
+		continue;
+
+	    cnt_frags[i] += 1;
+
+	    if (cnt_frags[i] >= (fsum = WI_fragSum(i)))
+		cnt_frags[i] = fsum;
+	    else
+		stillticking = true;
+	}
+	
+	if (!stillticking)
+	{
+	    S_StartSound(0, sfx_pldeth);
+	    ng_state++;
+	}
+    }
+    else if (ng_state == 10)
+    {
+	if (acceleratestage)
+	{
+	    S_StartSound(0, sfx_sgcock);
+	    if ( gamemode == commercial )
+		WI_initNoState();
+	    else
+		WI_initShowNextLoc();
+	}
+    }
+    else if (ng_state & 1)
+    {
+	if (!--cnt_pause)
+	{
+	    ng_state++;
+	    cnt_pause = TICRATE;
+	}
+    }
+}
+
+
+
+void WI_drawNetgameStats(void)
+{
+    int		i;
+    int		x;
+    int		y;
+    int		pwidth = SHORT(percent->width);
+
+    WI_slamBackground();
+    
+    // draw animated background
+    WI_drawAnimatedBack(); 
+
+    WI_drawLF();
+
+    // draw stat titles (top line)
+    V_DrawPatch(NG_STATSX+NG_SPACINGX-SHORT(kills->width),
+		NG_STATSY, kills);
+
+    V_DrawPatch(NG_STATSX+2*NG_SPACINGX-SHORT(items->width),
+		NG_STATSY, items);
+
+    V_DrawPatch(NG_STATSX+3*NG_SPACINGX-SHORT(secret->width),
+		NG_STATSY, secret);
+    
+    if (dofrags)
+	V_DrawPatch(NG_STATSX+4*NG_SPACINGX-SHORT(frags->width),
+		    NG_STATSY, frags);
+
+    // draw stats
+    y = NG_STATSY + SHORT(kills->height);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	if (!playeringame[i])
+	    continue;
+
+	x = NG_STATSX;
+	V_DrawPatch(x-SHORT(p[i]->width), y, p[i]);
+
+	if (i == me)
+	    V_DrawPatch(x-SHORT(p[i]->width), y, star);
+
+	x += NG_SPACINGX;
+	WI_drawPercent(x-pwidth, y+10, cnt_kills[i]);	x += NG_SPACINGX;
+	WI_drawPercent(x-pwidth, y+10, cnt_items[i]);	x += NG_SPACINGX;
+	WI_drawPercent(x-pwidth, y+10, cnt_secret[i]);	x += NG_SPACINGX;
+
+	if (dofrags)
+	    WI_drawNum(x, y+10, cnt_frags[i], -1);
+
+	y += WI_SPACINGY;
+    }
+
+}
+
+static int	sp_state;
+
+void WI_initStats(void)
+{
+    state = StatCount;
+    acceleratestage = 0;
+    sp_state = 1;
+    cnt_kills[0] = cnt_items[0] = cnt_secret[0] = -1;
+    cnt_time = cnt_par = -1;
+    cnt_pause = TICRATE;
+
+    WI_initAnimatedBack();
+}
+
+void WI_updateStats(void)
+{
+
+    WI_updateAnimatedBack();
+
+    if (acceleratestage && sp_state != 10)
+    {
+	acceleratestage = 0;
+	cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
+	cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
+	cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
+	cnt_time = plrs[me].stime / TICRATE;
+	cnt_par = wbs->partime / TICRATE;
+	S_StartSound(0, sfx_barexp);
+	sp_state = 10;
+    }
+
+    if (sp_state == 2)
+    {
+	cnt_kills[0] += 2;
+
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	if (cnt_kills[0] >= (plrs[me].skills * 100) / wbs->maxkills)
+	{
+	    cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
+	    S_StartSound(0, sfx_barexp);
+	    sp_state++;
+	}
+    }
+    else if (sp_state == 4)
+    {
+	cnt_items[0] += 2;
+
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	if (cnt_items[0] >= (plrs[me].sitems * 100) / wbs->maxitems)
+	{
+	    cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
+	    S_StartSound(0, sfx_barexp);
+	    sp_state++;
+	}
+    }
+    else if (sp_state == 6)
+    {
+	cnt_secret[0] += 2;
+
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	if (cnt_secret[0] >= (plrs[me].ssecret * 100) / wbs->maxsecret)
+	{
+	    cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
+	    S_StartSound(0, sfx_barexp);
+	    sp_state++;
+	}
+    }
+
+    else if (sp_state == 8)
+    {
+	if (!(bcnt&3))
+	    S_StartSound(0, sfx_pistol);
+
+	cnt_time += 3;
+
+	if (cnt_time >= plrs[me].stime / TICRATE)
+	    cnt_time = plrs[me].stime / TICRATE;
+
+	cnt_par += 3;
+
+	if (cnt_par >= wbs->partime / TICRATE)
+	{
+	    cnt_par = wbs->partime / TICRATE;
+
+	    if (cnt_time >= plrs[me].stime / TICRATE)
+	    {
+		S_StartSound(0, sfx_barexp);
+		sp_state++;
+	    }
+	}
+    }
+    else if (sp_state == 10)
+    {
+	if (acceleratestage)
+	{
+	    S_StartSound(0, sfx_sgcock);
+
+	    if (gamemode == commercial)
+		WI_initNoState();
+	    else
+		WI_initShowNextLoc();
+	}
+    }
+    else if (sp_state & 1)
+    {
+	if (!--cnt_pause)
+	{
+	    sp_state++;
+	    cnt_pause = TICRATE;
+	}
+    }
+
+}
+
+void WI_drawStats(void)
+{
+    // line height
+    int lh;	
+
+    lh = (3*SHORT(num[0]->height))/2;
+
+    WI_slamBackground();
+
+    // draw animated background
+    WI_drawAnimatedBack();
+    
+    WI_drawLF();
+
+    V_DrawPatch(SP_STATSX, SP_STATSY, kills);
+    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY, cnt_kills[0]);
+
+    V_DrawPatch(SP_STATSX, SP_STATSY+lh, items);
+    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+lh, cnt_items[0]);
+
+    V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, sp_secret);
+    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
+
+    V_DrawPatch(SP_TIMEX, SP_TIMEY, timepatch);
+    WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time);
+
+    if (wbs->epsd < 3)
+    {
+	V_DrawPatch(SCREENWIDTH/2 + SP_TIMEX, SP_TIMEY, par);
+	WI_drawTime(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cnt_par);
+    }
+
+}
+
+void WI_checkForAccelerate(void)
+{
+    int   i;
+    player_t  *player;
+
+    // check for button presses to skip delays
+    for (i=0, player = players ; i<MAXPLAYERS ; i++, player++)
+    {
+	if (playeringame[i])
+	{
+	    if (player->cmd.buttons & BT_ATTACK)
+	    {
+		if (!player->attackdown)
+		    acceleratestage = 1;
+		player->attackdown = true;
+	    }
+	    else
+		player->attackdown = false;
+	    if (player->cmd.buttons & BT_USE)
+	    {
+		if (!player->usedown)
+		    acceleratestage = 1;
+		player->usedown = true;
+	    }
+	    else
+		player->usedown = false;
+	}
+    }
+}
+
+
+
+// Updates stuff each tick
+void WI_Ticker(void)
+{
+    // counter for general background animation
+    bcnt++;  
+
+    if (bcnt == 1)
+    {
+	// intermission music
+  	if ( gamemode == commercial )
+	  S_ChangeMusic(mus_dm2int, true);
+	else
+	  S_ChangeMusic(mus_inter, true); 
+    }
+
+    WI_checkForAccelerate();
+
+    switch (state)
+    {
+      case StatCount:
+	if (deathmatch) WI_updateDeathmatchStats();
+	else if (netgame) WI_updateNetgameStats();
+	else WI_updateStats();
+	break;
+	
+      case ShowNextLoc:
+	WI_updateShowNextLoc();
+	break;
+	
+      case NoState:
+	WI_updateNoState();
+	break;
+    }
+
+}
+
+typedef void (*load_callback_t)(char *lumpname, patch_t **variable);
+
+// Common load/unload function.  Iterates over all the graphics
+// lumps to be loaded/unloaded into memory.
+
+static void WI_loadUnloadData(load_callback_t callback)
+{
+    int i, j;
+    char name[9];
+    anim_t *a;
+
+    if (gamemode == commercial)
+    {
+	for (i=0 ; i<NUMCMAPS ; i++)
+	{
+	    DEH_snprintf(name, 9, "CWILV%2.2d", i);
+            callback(name, &lnames[i]);
+	}
+    }
+    else
+    {
+	for (i=0 ; i<NUMMAPS ; i++)
+	{
+	    DEH_snprintf(name, 9, "WILV%d%d", wbs->epsd, i);
+            callback(name, &lnames[i]);
+	}
+
+	// you are here
+        callback(DEH_String("WIURH0"), &yah[0]);
+
+	// you are here (alt.)
+        callback(DEH_String("WIURH1"), &yah[1]);
+
+	// splat
+        callback(DEH_String("WISPLAT"), &splat[0]);
+
+	if (wbs->epsd < 3)
+	{
+	    for (j=0;j<NUMANIMS[wbs->epsd];j++)
+	    {
+		a = &anims[wbs->epsd][j];
+		for (i=0;i<a->nanims;i++)
+		{
+		    // MONDO HACK!
+		    if (wbs->epsd != 1 || j != 8)
+		    {
+			// animations
+			DEH_snprintf(name, 9, "WIA%d%.2d%.2d", wbs->epsd, j, i);
+                        callback(name, &a->p[i]);
+		    }
+		    else
+		    {
+			// HACK ALERT!
+			a->p[i] = anims[1][4].p[i];
+		    }
+		}
+	    }
+	}
+    }
+
+    // More hacks on minus sign.
+    callback(DEH_String("WIMINUS"), &wiminus);
+
+    for (i=0;i<10;i++)
+    {
+	 // numbers 0-9
+	DEH_snprintf(name, 9, "WINUM%d", i);
+        callback(name, &num[i]);
+    }
+
+    // percent sign
+    callback(DEH_String("WIPCNT"), &percent);
+
+    // "finished"
+    callback(DEH_String("WIF"), &finished);
+
+    // "entering"
+    callback(DEH_String("WIENTER"), &entering);
+
+    // "kills"
+    callback(DEH_String("WIOSTK"), &kills);
+
+    // "scrt"
+    callback(DEH_String("WIOSTS"), &secret);
+
+     // "secret"
+    callback(DEH_String("WISCRT2"), &sp_secret);
+
+    // french wad uses WIOBJ (?)
+    if (W_CheckNumForName(DEH_String("WIOBJ")) >= 0)
+    {
+    	// "items"
+    	if (netgame && !deathmatch)
+            callback(DEH_String("WIOBJ"), &items);
+    	else
+            callback(DEH_String("WIOSTI"), &items);
+    } else {
+        callback(DEH_String("WIOSTI"), &items);
+    }
+
+    // "frgs"
+    callback(DEH_String("WIFRGS"), &frags);
+
+    // ":"
+    callback(DEH_String("WICOLON"), &colon);
+
+    // "time"
+    callback(DEH_String("WITIME"), &timepatch);
+
+    // "sucks"
+    callback(DEH_String("WISUCKS"), &sucks);
+
+    // "par"
+    callback(DEH_String("WIPAR"), &par);
+
+    // "killers" (vertical)
+    callback(DEH_String("WIKILRS"), &killers);
+
+    // "victims" (horiz)
+    callback(DEH_String("WIVCTMS"), &victims);
+
+    // "total"
+    callback(DEH_String("WIMSTT"), &total);
+
+    for (i=0 ; i<MAXPLAYERS ; i++)
+    {
+	// "1,2,3,4"
+	DEH_snprintf(name, 9, "STPB%d", i);
+        callback(name, &p[i]);
+
+	// "1,2,3,4"
+	DEH_snprintf(name, 9, "WIBP%d", i+1);
+        callback(name, &bp[i]);
+    }
+
+    // Background image
+
+    if (gamemode == commercial)
+    {
+	M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
+        name[8] = '\0';
+    }
+    else if (gamemode == retail && wbs->epsd == 3)
+    {
+	M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
+        name[8] = '\0';
+    }
+    else
+    {
+	DEH_snprintf(name, 9, "WIMAP%d", wbs->epsd);
+    }
+
+    // Draw backdrop and save to a temporary buffer
+
+    callback(name, &background);
+}
+
+static void WI_loadCallback(char *name, patch_t **variable)
+{
+    *variable = W_CacheLumpName(name, PU_STATIC);
+}
+
+void WI_loadData(void)
+{
+    if (gamemode == commercial)
+    {
+	NUMCMAPS = 32;
+	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMCMAPS,
+				       PU_STATIC, NULL);
+    }
+    else
+    {
+	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMMAPS,
+				       PU_STATIC, NULL);
+    }
+
+    WI_loadUnloadData(WI_loadCallback);
+
+    // These two graphics are special cased because we're sharing
+    // them with the status bar code
+
+    // your face
+    star = W_CacheLumpName(DEH_String("STFST01"), PU_STATIC);
+
+    // dead face
+    bstar = W_CacheLumpName(DEH_String("STFDEAD0"), PU_STATIC);
+}
+
+static void WI_unloadCallback(char *name, patch_t **variable)
+{
+    W_ReleaseLumpName(name);
+    *variable = NULL;
+}
+
+void WI_unloadData(void)
+{
+    WI_loadUnloadData(WI_unloadCallback);
+
+    // We do not free these lumps as they are shared with the status
+    // bar code.
+   
+    // W_ReleaseLumpName("STFST01");
+    // W_ReleaseLumpName("STFDEAD0");
+}
+
+void WI_Drawer (void)
+{
+    switch (state)
+    {
+      case StatCount:
+	if (deathmatch)
+	    WI_drawDeathmatchStats();
+	else if (netgame)
+	    WI_drawNetgameStats();
+	else
+	    WI_drawStats();
+	break;
+	
+      case ShowNextLoc:
+	WI_drawShowNextLoc();
+	break;
+	
+      case NoState:
+	WI_drawNoState();
+	break;
+    }
+}
+
+
+void WI_initVariables(wbstartstruct_t* wbstartstruct)
+{
+
+    wbs = wbstartstruct;
+
+#ifdef RANGECHECKING
+    if (gamemode != commercial)
+    {
+      if ( gamemode == retail )
+	RNGCHECK(wbs->epsd, 0, 3);
+      else
+	RNGCHECK(wbs->epsd, 0, 2);
+    }
+    else
+    {
+	RNGCHECK(wbs->last, 0, 8);
+	RNGCHECK(wbs->next, 0, 8);
+    }
+    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
+    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
+#endif
+
+    acceleratestage = 0;
+    cnt = bcnt = 0;
+    firstrefresh = 1;
+    me = wbs->pnum;
+    plrs = wbs->plyr;
+
+    if (!wbs->maxkills)
+	wbs->maxkills = 1;
+
+    if (!wbs->maxitems)
+	wbs->maxitems = 1;
+
+    if (!wbs->maxsecret)
+	wbs->maxsecret = 1;
+
+    if ( gamemode != retail )
+      if (wbs->epsd > 2)
+	wbs->epsd -= 3;
+}
+
+void WI_Start(wbstartstruct_t* wbstartstruct)
+{
+    WI_initVariables(wbstartstruct);
+    WI_loadData();
+
+    if (deathmatch)
+	WI_initDeathmatchStats();
+    else if (netgame)
+	WI_initNetgameStats();
+    else
+	WI_initStats();
+}
+#endif
diff --git a/games/NXDoom/src/strife/wi_stuff.h b/games/NXDoom/src/strife/wi_stuff.h
new file mode 100644
index 000000000..88ed1c636
--- /dev/null
+++ b/games/NXDoom/src/strife/wi_stuff.h
@@ -0,0 +1,51 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//  Intermission.
+//
+
+#ifndef __WI_STUFF__
+#define __WI_STUFF__
+
+// haleyjd 08/23/2010: Strife does not have an intermission
+#if 0
+//#include "v_video.h"
+
+#include "doomdef.h"
+
+// States for the intermission
+
+typedef enum
+{
+    NoState = -1,
+    StatCount,
+    ShowNextLoc,
+} stateenum_t;
+
+// Called by main loop, animate the intermission.
+void WI_Ticker (void);
+
+// Called by main loop,
+// draws the intermission directly into the screen buffer.
+void WI_Drawer (void);
+
+// Setup for an intermission screen.
+void WI_Start(wbstartstruct_t*	 wbstartstruct);
+
+// Shut down the intermission screen
+void WI_End(void);
+
+#endif
+#endif
diff --git a/games/NXDoom/src/tables.c b/games/NXDoom/src/tables.c
new file mode 100644
index 000000000..698ae98f5
--- /dev/null
+++ b/games/NXDoom/src/tables.c
@@ -0,0 +1,2227 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Lookup tables.
+//	Do not try to look them up :-).
+//	In the order of appearance: 
+//
+//	int finetangent[4096]	- Tangens LUT.
+//	 Should work with BAM fairly well (12 of 16bit,
+//      effectively, by shifting).
+//
+//	int finesine[10240]		- Sine lookup.
+//	 Guess what, serves as cosine, too.
+//	 Remarkable thing is, how to use BAMs with this? 
+//
+//	int tantoangle[2049]	- ArcTan LUT,
+//	  maps tan(angle) to angle fast. Gotta search.
+//	
+//    
+
+#include "tables.h"
+
+// to get a global angle from cartesian coordinates, the coordinates are
+// flipped until they are in the first octant of the coordinate system, then
+// the y (<=x) is scaled and divided by x to get a tangent (slope) value
+// which is looked up in the tantoangle[] table.  The +1 size is to handle
+// the case when x==y without additional checking.
+
+int SlopeDiv(unsigned int num, unsigned int den)
+{
+    unsigned ans;
+    
+    if (den < 512)
+    {
+        return SLOPERANGE;
+    }
+    else
+    {
+        ans = (num << 3) / (den >> 8);
+
+        if (ans <= SLOPERANGE)
+        {
+            return ans;
+        }
+        else
+        {
+            return SLOPERANGE;
+        }
+    }
+}
+
+const fixed_t finetangent[4096] =
+{
+    -170910304,-56965752,-34178904,-24413316,-18988036,-15535599,-13145455,-11392683,
+    -10052327,-8994149,-8137527,-7429880,-6835455,-6329090,-5892567,-5512368,
+    -5178251,-4882318,-4618375,-4381502,-4167737,-3973855,-3797206,-3635590,
+    -3487165,-3350381,-3223918,-3106651,-2997613,-2895966,-2800983,-2712030,
+    -2628549,-2550052,-2476104,-2406322,-2340362,-2277919,-2218719,-2162516,
+    -2109087,-2058233,-2009771,-1963536,-1919378,-1877161,-1836758,-1798063,
+    -1760956,-1725348,-1691149,-1658278,-1626658,-1596220,-1566898,-1538632,
+    -1511367,-1485049,-1459630,-1435065,-1411312,-1388330,-1366084,-1344537,
+    -1323658,-1303416,-1283783,-1264730,-1246234,-1228269,-1210813,-1193846,
+    -1177345,-1161294,-1145673,-1130465,-1115654,-1101225,-1087164,-1073455,
+    -1060087,-1047046,-1034322,-1021901,-1009774,-997931,-986361,-975054,
+    -964003,-953199,-942633,-932298,-922186,-912289,-902602,-893117,
+    -883829,-874730,-865817,-857081,-848520,-840127,-831898,-823827,
+    -815910,-808143,-800521,-793041,-785699,-778490,-771411,-764460,
+    -757631,-750922,-744331,-737853,-731486,-725227,-719074,-713023,
+    -707072,-701219,-695462,-689797,-684223,-678737,-673338,-668024,
+    -662792,-657640,-652568,-647572,-642651,-637803,-633028,-628323,
+    -623686,-619117,-614613,-610174,-605798,-601483,-597229,-593033,
+    -588896,-584815,-580789,-576818,-572901,-569035,-565221,-561456,
+    -557741,-554074,-550455,-546881,-543354,-539870,-536431,-533034,
+    -529680,-526366,-523094,-519861,-516667,-513512,-510394,-507313,
+    -504269,-501261,-498287,-495348,-492443,-489571,-486732,-483925,
+    -481150,-478406,-475692,-473009,-470355,-467730,-465133,-462565,
+    -460024,-457511,-455024,-452564,-450129,-447720,-445337,-442978,
+    -440643,-438332,-436045,-433781,-431540,-429321,-427125,-424951,
+    -422798,-420666,-418555,-416465,-414395,-412344,-410314,-408303,
+    -406311,-404338,-402384,-400448,-398530,-396630,-394747,-392882,
+    -391034,-389202,-387387,-385589,-383807,-382040,-380290,-378555,
+    -376835,-375130,-373440,-371765,-370105,-368459,-366826,-365208,
+    -363604,-362013,-360436,-358872,-357321,-355783,-354257,-352744,
+    -351244,-349756,-348280,-346816,-345364,-343924,-342495,-341078,
+    -339671,-338276,-336892,-335519,-334157,-332805,-331464,-330133,
+    -328812,-327502,-326201,-324910,-323629,-322358,-321097,-319844,
+    -318601,-317368,-316143,-314928,-313721,-312524,-311335,-310154,
+    -308983,-307819,-306664,-305517,-304379,-303248,-302126,-301011,
+    -299904,-298805,-297714,-296630,-295554,-294485,-293423,-292369,
+    -291322,-290282,-289249,-288223,-287204,-286192,-285186,-284188,
+    -283195,-282210,-281231,-280258,-279292,-278332,-277378,-276430,
+    -275489,-274553,-273624,-272700,-271782,-270871,-269965,-269064,
+    -268169,-267280,-266397,-265519,-264646,-263779,-262917,-262060,
+    -261209,-260363,-259522,-258686,-257855,-257029,-256208,-255392,
+    -254581,-253774,-252973,-252176,-251384,-250596,-249813,-249035,
+    -248261,-247492,-246727,-245966,-245210,-244458,-243711,-242967,
+    -242228,-241493,-240763,-240036,-239314,-238595,-237881,-237170,
+    -236463,-235761,-235062,-234367,-233676,-232988,-232304,-231624,
+    -230948,-230275,-229606,-228941,-228279,-227621,-226966,-226314,
+    -225666,-225022,-224381,-223743,-223108,-222477,-221849,-221225,
+    -220603,-219985,-219370,-218758,-218149,-217544,-216941,-216341,
+    -215745,-215151,-214561,-213973,-213389,-212807,-212228,-211652,
+    -211079,-210509,-209941,-209376,-208815,-208255,-207699,-207145,
+    -206594,-206045,-205500,-204956,-204416,-203878,-203342,-202809,
+    -202279,-201751,-201226,-200703,-200182,-199664,-199149,-198636,
+    -198125,-197616,-197110,-196606,-196105,-195606,-195109,-194614,
+    -194122,-193631,-193143,-192658,-192174,-191693,-191213,-190736,
+    -190261,-189789,-189318,-188849,-188382,-187918,-187455,-186995,
+    -186536,-186080,-185625,-185173,-184722,-184274,-183827,-183382,
+    -182939,-182498,-182059,-181622,-181186,-180753,-180321,-179891,
+    -179463,-179037,-178612,-178190,-177769,-177349,-176932,-176516,
+    -176102,-175690,-175279,-174870,-174463,-174057,-173653,-173251,
+    -172850,-172451,-172053,-171657,-171263,-170870,-170479,-170089,
+    -169701,-169315,-168930,-168546,-168164,-167784,-167405,-167027,
+    -166651,-166277,-165904,-165532,-165162,-164793,-164426,-164060,
+    -163695,-163332,-162970,-162610,-162251,-161893,-161537,-161182,
+    -160828,-160476,-160125,-159775,-159427,-159079,-158734,-158389,
+    -158046,-157704,-157363,-157024,-156686,-156349,-156013,-155678,
+    -155345,-155013,-154682,-154352,-154024,-153697,-153370,-153045,
+    -152722,-152399,-152077,-151757,-151438,-151120,-150803,-150487,
+    -150172,-149859,-149546,-149235,-148924,-148615,-148307,-148000,
+    -147693,-147388,-147084,-146782,-146480,-146179,-145879,-145580,
+    -145282,-144986,-144690,-144395,-144101,-143808,-143517,-143226,
+    -142936,-142647,-142359,-142072,-141786,-141501,-141217,-140934,
+    -140651,-140370,-140090,-139810,-139532,-139254,-138977,-138701,
+    -138426,-138152,-137879,-137607,-137335,-137065,-136795,-136526,
+    -136258,-135991,-135725,-135459,-135195,-134931,-134668,-134406,
+    -134145,-133884,-133625,-133366,-133108,-132851,-132594,-132339,
+    -132084,-131830,-131576,-131324,-131072,-130821,-130571,-130322,
+    -130073,-129825,-129578,-129332,-129086,-128841,-128597,-128353,
+    -128111,-127869,-127627,-127387,-127147,-126908,-126669,-126432,
+    -126195,-125959,-125723,-125488,-125254,-125020,-124787,-124555,
+    -124324,-124093,-123863,-123633,-123404,-123176,-122949,-122722,
+    -122496,-122270,-122045,-121821,-121597,-121374,-121152,-120930,
+    -120709,-120489,-120269,-120050,-119831,-119613,-119396,-119179,
+    -118963,-118747,-118532,-118318,-118104,-117891,-117678,-117466,
+    -117254,-117044,-116833,-116623,-116414,-116206,-115998,-115790,
+    -115583,-115377,-115171,-114966,-114761,-114557,-114354,-114151,
+    -113948,-113746,-113545,-113344,-113143,-112944,-112744,-112546,
+    -112347,-112150,-111952,-111756,-111560,-111364,-111169,-110974,
+    -110780,-110586,-110393,-110200,-110008,-109817,-109626,-109435,
+    -109245,-109055,-108866,-108677,-108489,-108301,-108114,-107927,
+    -107741,-107555,-107369,-107184,-107000,-106816,-106632,-106449,
+    -106266,-106084,-105902,-105721,-105540,-105360,-105180,-105000,
+    -104821,-104643,-104465,-104287,-104109,-103933,-103756,-103580,
+    -103404,-103229,-103054,-102880,-102706,-102533,-102360,-102187,
+    -102015,-101843,-101671,-101500,-101330,-101159,-100990,-100820,
+    -100651,-100482,-100314,-100146,-99979,-99812,-99645,-99479,
+    -99313,-99148,-98982,-98818,-98653,-98489,-98326,-98163,
+    -98000,-97837,-97675,-97513,-97352,-97191,-97030,-96870,
+    -96710,-96551,-96391,-96233,-96074,-95916,-95758,-95601,
+    -95444,-95287,-95131,-94975,-94819,-94664,-94509,-94354,
+    -94200,-94046,-93892,-93739,-93586,-93434,-93281,-93129,
+    -92978,-92826,-92675,-92525,-92375,-92225,-92075,-91926,
+    -91777,-91628,-91480,-91332,-91184,-91036,-90889,-90742,
+    -90596,-90450,-90304,-90158,-90013,-89868,-89724,-89579,
+    -89435,-89292,-89148,-89005,-88862,-88720,-88577,-88435,
+    -88294,-88152,-88011,-87871,-87730,-87590,-87450,-87310,
+    -87171,-87032,-86893,-86755,-86616,-86479,-86341,-86204,
+    -86066,-85930,-85793,-85657,-85521,-85385,-85250,-85114,
+    -84980,-84845,-84710,-84576,-84443,-84309,-84176,-84043,
+    -83910,-83777,-83645,-83513,-83381,-83250,-83118,-82987,
+    -82857,-82726,-82596,-82466,-82336,-82207,-82078,-81949,
+    -81820,-81691,-81563,-81435,-81307,-81180,-81053,-80925,
+    -80799,-80672,-80546,-80420,-80294,-80168,-80043,-79918,
+    -79793,-79668,-79544,-79420,-79296,-79172,-79048,-78925,
+    -78802,-78679,-78557,-78434,-78312,-78190,-78068,-77947,
+    -77826,-77705,-77584,-77463,-77343,-77223,-77103,-76983,
+    -76864,-76744,-76625,-76506,-76388,-76269,-76151,-76033,
+    -75915,-75797,-75680,-75563,-75446,-75329,-75213,-75096,
+    -74980,-74864,-74748,-74633,-74517,-74402,-74287,-74172,
+    -74058,-73944,-73829,-73715,-73602,-73488,-73375,-73262,
+    -73149,-73036,-72923,-72811,-72699,-72587,-72475,-72363,
+    -72252,-72140,-72029,-71918,-71808,-71697,-71587,-71477,
+    -71367,-71257,-71147,-71038,-70929,-70820,-70711,-70602,
+    -70494,-70385,-70277,-70169,-70061,-69954,-69846,-69739,
+    -69632,-69525,-69418,-69312,-69205,-69099,-68993,-68887,
+    -68781,-68676,-68570,-68465,-68360,-68255,-68151,-68046,
+    -67942,-67837,-67733,-67629,-67526,-67422,-67319,-67216,
+    -67113,-67010,-66907,-66804,-66702,-66600,-66498,-66396,
+    -66294,-66192,-66091,-65989,-65888,-65787,-65686,-65586,
+    -65485,-65385,-65285,-65185,-65085,-64985,-64885,-64786,
+    -64687,-64587,-64488,-64389,-64291,-64192,-64094,-63996,
+    -63897,-63799,-63702,-63604,-63506,-63409,-63312,-63215,
+    -63118,-63021,-62924,-62828,-62731,-62635,-62539,-62443,
+    -62347,-62251,-62156,-62060,-61965,-61870,-61775,-61680,
+    -61585,-61491,-61396,-61302,-61208,-61114,-61020,-60926,
+    -60833,-60739,-60646,-60552,-60459,-60366,-60273,-60181,
+    -60088,-59996,-59903,-59811,-59719,-59627,-59535,-59444,
+    -59352,-59261,-59169,-59078,-58987,-58896,-58805,-58715,
+    -58624,-58534,-58443,-58353,-58263,-58173,-58083,-57994,
+    -57904,-57815,-57725,-57636,-57547,-57458,-57369,-57281,
+    -57192,-57104,-57015,-56927,-56839,-56751,-56663,-56575,
+    -56487,-56400,-56312,-56225,-56138,-56051,-55964,-55877,
+    -55790,-55704,-55617,-55531,-55444,-55358,-55272,-55186,
+    -55100,-55015,-54929,-54843,-54758,-54673,-54587,-54502,
+    -54417,-54333,-54248,-54163,-54079,-53994,-53910,-53826,
+    -53741,-53657,-53574,-53490,-53406,-53322,-53239,-53156,
+    -53072,-52989,-52906,-52823,-52740,-52657,-52575,-52492,
+    -52410,-52327,-52245,-52163,-52081,-51999,-51917,-51835,
+    -51754,-51672,-51591,-51509,-51428,-51347,-51266,-51185,
+    -51104,-51023,-50942,-50862,-50781,-50701,-50621,-50540,
+    -50460,-50380,-50300,-50221,-50141,-50061,-49982,-49902,
+    -49823,-49744,-49664,-49585,-49506,-49427,-49349,-49270,
+    -49191,-49113,-49034,-48956,-48878,-48799,-48721,-48643,
+    -48565,-48488,-48410,-48332,-48255,-48177,-48100,-48022,
+    -47945,-47868,-47791,-47714,-47637,-47560,-47484,-47407,
+    -47331,-47254,-47178,-47102,-47025,-46949,-46873,-46797,
+    -46721,-46646,-46570,-46494,-46419,-46343,-46268,-46193,
+    -46118,-46042,-45967,-45892,-45818,-45743,-45668,-45593,
+    -45519,-45444,-45370,-45296,-45221,-45147,-45073,-44999,
+    -44925,-44851,-44778,-44704,-44630,-44557,-44483,-44410,
+    -44337,-44263,-44190,-44117,-44044,-43971,-43898,-43826,
+    -43753,-43680,-43608,-43535,-43463,-43390,-43318,-43246,
+    -43174,-43102,-43030,-42958,-42886,-42814,-42743,-42671,
+    -42600,-42528,-42457,-42385,-42314,-42243,-42172,-42101,
+    -42030,-41959,-41888,-41817,-41747,-41676,-41605,-41535,
+    -41465,-41394,-41324,-41254,-41184,-41113,-41043,-40973,
+    -40904,-40834,-40764,-40694,-40625,-40555,-40486,-40416,
+    -40347,-40278,-40208,-40139,-40070,-40001,-39932,-39863,
+    -39794,-39726,-39657,-39588,-39520,-39451,-39383,-39314,
+    -39246,-39178,-39110,-39042,-38973,-38905,-38837,-38770,
+    -38702,-38634,-38566,-38499,-38431,-38364,-38296,-38229,
+    -38161,-38094,-38027,-37960,-37893,-37826,-37759,-37692,
+    -37625,-37558,-37491,-37425,-37358,-37291,-37225,-37158,
+    -37092,-37026,-36959,-36893,-36827,-36761,-36695,-36629,
+    -36563,-36497,-36431,-36365,-36300,-36234,-36168,-36103,
+    -36037,-35972,-35907,-35841,-35776,-35711,-35646,-35580,
+    -35515,-35450,-35385,-35321,-35256,-35191,-35126,-35062,
+    -34997,-34932,-34868,-34803,-34739,-34675,-34610,-34546,
+    -34482,-34418,-34354,-34289,-34225,-34162,-34098,-34034,
+    -33970,-33906,-33843,-33779,-33715,-33652,-33588,-33525,
+    -33461,-33398,-33335,-33272,-33208,-33145,-33082,-33019,
+    -32956,-32893,-32830,-32767,-32705,-32642,-32579,-32516,
+    -32454,-32391,-32329,-32266,-32204,-32141,-32079,-32017,
+    -31955,-31892,-31830,-31768,-31706,-31644,-31582,-31520,
+    -31458,-31396,-31335,-31273,-31211,-31150,-31088,-31026,
+    -30965,-30904,-30842,-30781,-30719,-30658,-30597,-30536,
+    -30474,-30413,-30352,-30291,-30230,-30169,-30108,-30048,
+    -29987,-29926,-29865,-29805,-29744,-29683,-29623,-29562,
+    -29502,-29441,-29381,-29321,-29260,-29200,-29140,-29080,
+    -29020,-28959,-28899,-28839,-28779,-28719,-28660,-28600,
+    -28540,-28480,-28420,-28361,-28301,-28241,-28182,-28122,
+    -28063,-28003,-27944,-27884,-27825,-27766,-27707,-27647,
+    -27588,-27529,-27470,-27411,-27352,-27293,-27234,-27175,
+    -27116,-27057,-26998,-26940,-26881,-26822,-26763,-26705,
+    -26646,-26588,-26529,-26471,-26412,-26354,-26295,-26237,
+    -26179,-26120,-26062,-26004,-25946,-25888,-25830,-25772,
+    -25714,-25656,-25598,-25540,-25482,-25424,-25366,-25308,
+    -25251,-25193,-25135,-25078,-25020,-24962,-24905,-24847,
+    -24790,-24732,-24675,-24618,-24560,-24503,-24446,-24389,
+    -24331,-24274,-24217,-24160,-24103,-24046,-23989,-23932,
+    -23875,-23818,-23761,-23704,-23647,-23591,-23534,-23477,
+    -23420,-23364,-23307,-23250,-23194,-23137,-23081,-23024,
+    -22968,-22911,-22855,-22799,-22742,-22686,-22630,-22573,
+    -22517,-22461,-22405,-22349,-22293,-22237,-22181,-22125,
+    -22069,-22013,-21957,-21901,-21845,-21789,-21733,-21678,
+    -21622,-21566,-21510,-21455,-21399,-21343,-21288,-21232,
+    -21177,-21121,-21066,-21010,-20955,-20900,-20844,-20789,
+    -20734,-20678,-20623,-20568,-20513,-20457,-20402,-20347,
+    -20292,-20237,-20182,-20127,-20072,-20017,-19962,-19907,
+    -19852,-19797,-19742,-19688,-19633,-19578,-19523,-19469,
+    -19414,-19359,-19305,-19250,-19195,-19141,-19086,-19032,
+    -18977,-18923,-18868,-18814,-18760,-18705,-18651,-18597,
+    -18542,-18488,-18434,-18380,-18325,-18271,-18217,-18163,
+    -18109,-18055,-18001,-17946,-17892,-17838,-17784,-17731,
+    -17677,-17623,-17569,-17515,-17461,-17407,-17353,-17300,
+    -17246,-17192,-17138,-17085,-17031,-16977,-16924,-16870,
+    -16817,-16763,-16710,-16656,-16603,-16549,-16496,-16442,
+    -16389,-16335,-16282,-16229,-16175,-16122,-16069,-16015,
+    -15962,-15909,-15856,-15802,-15749,-15696,-15643,-15590,
+    -15537,-15484,-15431,-15378,-15325,-15272,-15219,-15166,
+    -15113,-15060,-15007,-14954,-14901,-14848,-14795,-14743,
+    -14690,-14637,-14584,-14531,-14479,-14426,-14373,-14321,
+    -14268,-14215,-14163,-14110,-14057,-14005,-13952,-13900,
+    -13847,-13795,-13742,-13690,-13637,-13585,-13533,-13480,
+    -13428,-13375,-13323,-13271,-13218,-13166,-13114,-13062,
+    -13009,-12957,-12905,-12853,-12800,-12748,-12696,-12644,
+    -12592,-12540,-12488,-12436,-12383,-12331,-12279,-12227,
+    -12175,-12123,-12071,-12019,-11967,-11916,-11864,-11812,
+    -11760,-11708,-11656,-11604,-11552,-11501,-11449,-11397,
+    -11345,-11293,-11242,-11190,-11138,-11086,-11035,-10983,
+    -10931,-10880,-10828,-10777,-10725,-10673,-10622,-10570,
+    -10519,-10467,-10415,-10364,-10312,-10261,-10209,-10158,
+    -10106,-10055,-10004,-9952,-9901,-9849,-9798,-9747,
+    -9695,-9644,-9592,-9541,-9490,-9438,-9387,-9336,
+    -9285,-9233,-9182,-9131,-9080,-9028,-8977,-8926,
+    -8875,-8824,-8772,-8721,-8670,-8619,-8568,-8517,
+    -8466,-8414,-8363,-8312,-8261,-8210,-8159,-8108,
+    -8057,-8006,-7955,-7904,-7853,-7802,-7751,-7700,
+    -7649,-7598,-7547,-7496,-7445,-7395,-7344,-7293,
+    -7242,-7191,-7140,-7089,-7038,-6988,-6937,-6886,
+    -6835,-6784,-6733,-6683,-6632,-6581,-6530,-6480,
+    -6429,-6378,-6327,-6277,-6226,-6175,-6124,-6074,
+    -6023,-5972,-5922,-5871,-5820,-5770,-5719,-5668,
+    -5618,-5567,-5517,-5466,-5415,-5365,-5314,-5264,
+    -5213,-5162,-5112,-5061,-5011,-4960,-4910,-4859,
+    -4808,-4758,-4707,-4657,-4606,-4556,-4505,-4455,
+    -4404,-4354,-4303,-4253,-4202,-4152,-4101,-4051,
+    -4001,-3950,-3900,-3849,-3799,-3748,-3698,-3648,
+    -3597,-3547,-3496,-3446,-3395,-3345,-3295,-3244,
+    -3194,-3144,-3093,-3043,-2992,-2942,-2892,-2841,
+    -2791,-2741,-2690,-2640,-2590,-2539,-2489,-2439,
+    -2388,-2338,-2288,-2237,-2187,-2137,-2086,-2036,
+    -1986,-1935,-1885,-1835,-1784,-1734,-1684,-1633,
+    -1583,-1533,-1483,-1432,-1382,-1332,-1281,-1231,
+    -1181,-1131,-1080,-1030,-980,-929,-879,-829,
+    -779,-728,-678,-628,-578,-527,-477,-427,
+    -376,-326,-276,-226,-175,-125,-75,-25,
+    25,75,125,175,226,276,326,376,
+    427,477,527,578,628,678,728,779,
+    829,879,929,980,1030,1080,1131,1181,
+    1231,1281,1332,1382,1432,1483,1533,1583,
+    1633,1684,1734,1784,1835,1885,1935,1986,
+    2036,2086,2137,2187,2237,2288,2338,2388,
+    2439,2489,2539,2590,2640,2690,2741,2791,
+    2841,2892,2942,2992,3043,3093,3144,3194,
+    3244,3295,3345,3395,3446,3496,3547,3597,
+    3648,3698,3748,3799,3849,3900,3950,4001,
+    4051,4101,4152,4202,4253,4303,4354,4404,
+    4455,4505,4556,4606,4657,4707,4758,4808,
+    4859,4910,4960,5011,5061,5112,5162,5213,
+    5264,5314,5365,5415,5466,5517,5567,5618,
+    5668,5719,5770,5820,5871,5922,5972,6023,
+    6074,6124,6175,6226,6277,6327,6378,6429,
+    6480,6530,6581,6632,6683,6733,6784,6835,
+    6886,6937,6988,7038,7089,7140,7191,7242,
+    7293,7344,7395,7445,7496,7547,7598,7649,
+    7700,7751,7802,7853,7904,7955,8006,8057,
+    8108,8159,8210,8261,8312,8363,8414,8466,
+    8517,8568,8619,8670,8721,8772,8824,8875,
+    8926,8977,9028,9080,9131,9182,9233,9285,
+    9336,9387,9438,9490,9541,9592,9644,9695,
+    9747,9798,9849,9901,9952,10004,10055,10106,
+    10158,10209,10261,10312,10364,10415,10467,10519,
+    10570,10622,10673,10725,10777,10828,10880,10931,
+    10983,11035,11086,11138,11190,11242,11293,11345,
+    11397,11449,11501,11552,11604,11656,11708,11760,
+    11812,11864,11916,11967,12019,12071,12123,12175,
+    12227,12279,12331,12383,12436,12488,12540,12592,
+    12644,12696,12748,12800,12853,12905,12957,13009,
+    13062,13114,13166,13218,13271,13323,13375,13428,
+    13480,13533,13585,13637,13690,13742,13795,13847,
+    13900,13952,14005,14057,14110,14163,14215,14268,
+    14321,14373,14426,14479,14531,14584,14637,14690,
+    14743,14795,14848,14901,14954,15007,15060,15113,
+    15166,15219,15272,15325,15378,15431,15484,15537,
+    15590,15643,15696,15749,15802,15856,15909,15962,
+    16015,16069,16122,16175,16229,16282,16335,16389,
+    16442,16496,16549,16603,16656,16710,16763,16817,
+    16870,16924,16977,17031,17085,17138,17192,17246,
+    17300,17353,17407,17461,17515,17569,17623,17677,
+    17731,17784,17838,17892,17946,18001,18055,18109,
+    18163,18217,18271,18325,18380,18434,18488,18542,
+    18597,18651,18705,18760,18814,18868,18923,18977,
+    19032,19086,19141,19195,19250,19305,19359,19414,
+    19469,19523,19578,19633,19688,19742,19797,19852,
+    19907,19962,20017,20072,20127,20182,20237,20292,
+    20347,20402,20457,20513,20568,20623,20678,20734,
+    20789,20844,20900,20955,21010,21066,21121,21177,
+    21232,21288,21343,21399,21455,21510,21566,21622,
+    21678,21733,21789,21845,21901,21957,22013,22069,
+    22125,22181,22237,22293,22349,22405,22461,22517,
+    22573,22630,22686,22742,22799,22855,22911,22968,
+    23024,23081,23137,23194,23250,23307,23364,23420,
+    23477,23534,23591,23647,23704,23761,23818,23875,
+    23932,23989,24046,24103,24160,24217,24274,24331,
+    24389,24446,24503,24560,24618,24675,24732,24790,
+    24847,24905,24962,25020,25078,25135,25193,25251,
+    25308,25366,25424,25482,25540,25598,25656,25714,
+    25772,25830,25888,25946,26004,26062,26120,26179,
+    26237,26295,26354,26412,26471,26529,26588,26646,
+    26705,26763,26822,26881,26940,26998,27057,27116,
+    27175,27234,27293,27352,27411,27470,27529,27588,
+    27647,27707,27766,27825,27884,27944,28003,28063,
+    28122,28182,28241,28301,28361,28420,28480,28540,
+    28600,28660,28719,28779,28839,28899,28959,29020,
+    29080,29140,29200,29260,29321,29381,29441,29502,
+    29562,29623,29683,29744,29805,29865,29926,29987,
+    30048,30108,30169,30230,30291,30352,30413,30474,
+    30536,30597,30658,30719,30781,30842,30904,30965,
+    31026,31088,31150,31211,31273,31335,31396,31458,
+    31520,31582,31644,31706,31768,31830,31892,31955,
+    32017,32079,32141,32204,32266,32329,32391,32454,
+    32516,32579,32642,32705,32767,32830,32893,32956,
+    33019,33082,33145,33208,33272,33335,33398,33461,
+    33525,33588,33652,33715,33779,33843,33906,33970,
+    34034,34098,34162,34225,34289,34354,34418,34482,
+    34546,34610,34675,34739,34803,34868,34932,34997,
+    35062,35126,35191,35256,35321,35385,35450,35515,
+    35580,35646,35711,35776,35841,35907,35972,36037,
+    36103,36168,36234,36300,36365,36431,36497,36563,
+    36629,36695,36761,36827,36893,36959,37026,37092,
+    37158,37225,37291,37358,37425,37491,37558,37625,
+    37692,37759,37826,37893,37960,38027,38094,38161,
+    38229,38296,38364,38431,38499,38566,38634,38702,
+    38770,38837,38905,38973,39042,39110,39178,39246,
+    39314,39383,39451,39520,39588,39657,39726,39794,
+    39863,39932,40001,40070,40139,40208,40278,40347,
+    40416,40486,40555,40625,40694,40764,40834,40904,
+    40973,41043,41113,41184,41254,41324,41394,41465,
+    41535,41605,41676,41747,41817,41888,41959,42030,
+    42101,42172,42243,42314,42385,42457,42528,42600,
+    42671,42743,42814,42886,42958,43030,43102,43174,
+    43246,43318,43390,43463,43535,43608,43680,43753,
+    43826,43898,43971,44044,44117,44190,44263,44337,
+    44410,44483,44557,44630,44704,44778,44851,44925,
+    44999,45073,45147,45221,45296,45370,45444,45519,
+    45593,45668,45743,45818,45892,45967,46042,46118,
+    46193,46268,46343,46419,46494,46570,46646,46721,
+    46797,46873,46949,47025,47102,47178,47254,47331,
+    47407,47484,47560,47637,47714,47791,47868,47945,
+    48022,48100,48177,48255,48332,48410,48488,48565,
+    48643,48721,48799,48878,48956,49034,49113,49191,
+    49270,49349,49427,49506,49585,49664,49744,49823,
+    49902,49982,50061,50141,50221,50300,50380,50460,
+    50540,50621,50701,50781,50862,50942,51023,51104,
+    51185,51266,51347,51428,51509,51591,51672,51754,
+    51835,51917,51999,52081,52163,52245,52327,52410,
+    52492,52575,52657,52740,52823,52906,52989,53072,
+    53156,53239,53322,53406,53490,53574,53657,53741,
+    53826,53910,53994,54079,54163,54248,54333,54417,
+    54502,54587,54673,54758,54843,54929,55015,55100,
+    55186,55272,55358,55444,55531,55617,55704,55790,
+    55877,55964,56051,56138,56225,56312,56400,56487,
+    56575,56663,56751,56839,56927,57015,57104,57192,
+    57281,57369,57458,57547,57636,57725,57815,57904,
+    57994,58083,58173,58263,58353,58443,58534,58624,
+    58715,58805,58896,58987,59078,59169,59261,59352,
+    59444,59535,59627,59719,59811,59903,59996,60088,
+    60181,60273,60366,60459,60552,60646,60739,60833,
+    60926,61020,61114,61208,61302,61396,61491,61585,
+    61680,61775,61870,61965,62060,62156,62251,62347,
+    62443,62539,62635,62731,62828,62924,63021,63118,
+    63215,63312,63409,63506,63604,63702,63799,63897,
+    63996,64094,64192,64291,64389,64488,64587,64687,
+    64786,64885,64985,65085,65185,65285,65385,65485,
+    65586,65686,65787,65888,65989,66091,66192,66294,
+    66396,66498,66600,66702,66804,66907,67010,67113,
+    67216,67319,67422,67526,67629,67733,67837,67942,
+    68046,68151,68255,68360,68465,68570,68676,68781,
+    68887,68993,69099,69205,69312,69418,69525,69632,
+    69739,69846,69954,70061,70169,70277,70385,70494,
+    70602,70711,70820,70929,71038,71147,71257,71367,
+    71477,71587,71697,71808,71918,72029,72140,72252,
+    72363,72475,72587,72699,72811,72923,73036,73149,
+    73262,73375,73488,73602,73715,73829,73944,74058,
+    74172,74287,74402,74517,74633,74748,74864,74980,
+    75096,75213,75329,75446,75563,75680,75797,75915,
+    76033,76151,76269,76388,76506,76625,76744,76864,
+    76983,77103,77223,77343,77463,77584,77705,77826,
+    77947,78068,78190,78312,78434,78557,78679,78802,
+    78925,79048,79172,79296,79420,79544,79668,79793,
+    79918,80043,80168,80294,80420,80546,80672,80799,
+    80925,81053,81180,81307,81435,81563,81691,81820,
+    81949,82078,82207,82336,82466,82596,82726,82857,
+    82987,83118,83250,83381,83513,83645,83777,83910,
+    84043,84176,84309,84443,84576,84710,84845,84980,
+    85114,85250,85385,85521,85657,85793,85930,86066,
+    86204,86341,86479,86616,86755,86893,87032,87171,
+    87310,87450,87590,87730,87871,88011,88152,88294,
+    88435,88577,88720,88862,89005,89148,89292,89435,
+    89579,89724,89868,90013,90158,90304,90450,90596,
+    90742,90889,91036,91184,91332,91480,91628,91777,
+    91926,92075,92225,92375,92525,92675,92826,92978,
+    93129,93281,93434,93586,93739,93892,94046,94200,
+    94354,94509,94664,94819,94975,95131,95287,95444,
+    95601,95758,95916,96074,96233,96391,96551,96710,
+    96870,97030,97191,97352,97513,97675,97837,98000,
+    98163,98326,98489,98653,98818,98982,99148,99313,
+    99479,99645,99812,99979,100146,100314,100482,100651,
+    100820,100990,101159,101330,101500,101671,101843,102015,
+    102187,102360,102533,102706,102880,103054,103229,103404,
+    103580,103756,103933,104109,104287,104465,104643,104821,
+    105000,105180,105360,105540,105721,105902,106084,106266,
+    106449,106632,106816,107000,107184,107369,107555,107741,
+    107927,108114,108301,108489,108677,108866,109055,109245,
+    109435,109626,109817,110008,110200,110393,110586,110780,
+    110974,111169,111364,111560,111756,111952,112150,112347,
+    112546,112744,112944,113143,113344,113545,113746,113948,
+    114151,114354,114557,114761,114966,115171,115377,115583,
+    115790,115998,116206,116414,116623,116833,117044,117254,
+    117466,117678,117891,118104,118318,118532,118747,118963,
+    119179,119396,119613,119831,120050,120269,120489,120709,
+    120930,121152,121374,121597,121821,122045,122270,122496,
+    122722,122949,123176,123404,123633,123863,124093,124324,
+    124555,124787,125020,125254,125488,125723,125959,126195,
+    126432,126669,126908,127147,127387,127627,127869,128111,
+    128353,128597,128841,129086,129332,129578,129825,130073,
+    130322,130571,130821,131072,131324,131576,131830,132084,
+    132339,132594,132851,133108,133366,133625,133884,134145,
+    134406,134668,134931,135195,135459,135725,135991,136258,
+    136526,136795,137065,137335,137607,137879,138152,138426,
+    138701,138977,139254,139532,139810,140090,140370,140651,
+    140934,141217,141501,141786,142072,142359,142647,142936,
+    143226,143517,143808,144101,144395,144690,144986,145282,
+    145580,145879,146179,146480,146782,147084,147388,147693,
+    148000,148307,148615,148924,149235,149546,149859,150172,
+    150487,150803,151120,151438,151757,152077,152399,152722,
+    153045,153370,153697,154024,154352,154682,155013,155345,
+    155678,156013,156349,156686,157024,157363,157704,158046,
+    158389,158734,159079,159427,159775,160125,160476,160828,
+    161182,161537,161893,162251,162610,162970,163332,163695,
+    164060,164426,164793,165162,165532,165904,166277,166651,
+    167027,167405,167784,168164,168546,168930,169315,169701,
+    170089,170479,170870,171263,171657,172053,172451,172850,
+    173251,173653,174057,174463,174870,175279,175690,176102,
+    176516,176932,177349,177769,178190,178612,179037,179463,
+    179891,180321,180753,181186,181622,182059,182498,182939,
+    183382,183827,184274,184722,185173,185625,186080,186536,
+    186995,187455,187918,188382,188849,189318,189789,190261,
+    190736,191213,191693,192174,192658,193143,193631,194122,
+    194614,195109,195606,196105,196606,197110,197616,198125,
+    198636,199149,199664,200182,200703,201226,201751,202279,
+    202809,203342,203878,204416,204956,205500,206045,206594,
+    207145,207699,208255,208815,209376,209941,210509,211079,
+    211652,212228,212807,213389,213973,214561,215151,215745,
+    216341,216941,217544,218149,218758,219370,219985,220603,
+    221225,221849,222477,223108,223743,224381,225022,225666,
+    226314,226966,227621,228279,228941,229606,230275,230948,
+    231624,232304,232988,233676,234367,235062,235761,236463,
+    237170,237881,238595,239314,240036,240763,241493,242228,
+    242967,243711,244458,245210,245966,246727,247492,248261,
+    249035,249813,250596,251384,252176,252973,253774,254581,
+    255392,256208,257029,257855,258686,259522,260363,261209,
+    262060,262917,263779,264646,265519,266397,267280,268169,
+    269064,269965,270871,271782,272700,273624,274553,275489,
+    276430,277378,278332,279292,280258,281231,282210,283195,
+    284188,285186,286192,287204,288223,289249,290282,291322,
+    292369,293423,294485,295554,296630,297714,298805,299904,
+    301011,302126,303248,304379,305517,306664,307819,308983,
+    310154,311335,312524,313721,314928,316143,317368,318601,
+    319844,321097,322358,323629,324910,326201,327502,328812,
+    330133,331464,332805,334157,335519,336892,338276,339671,
+    341078,342495,343924,345364,346816,348280,349756,351244,
+    352744,354257,355783,357321,358872,360436,362013,363604,
+    365208,366826,368459,370105,371765,373440,375130,376835,
+    378555,380290,382040,383807,385589,387387,389202,391034,
+    392882,394747,396630,398530,400448,402384,404338,406311,
+    408303,410314,412344,414395,416465,418555,420666,422798,
+    424951,427125,429321,431540,433781,436045,438332,440643,
+    442978,445337,447720,450129,452564,455024,457511,460024,
+    462565,465133,467730,470355,473009,475692,478406,481150,
+    483925,486732,489571,492443,495348,498287,501261,504269,
+    507313,510394,513512,516667,519861,523094,526366,529680,
+    533034,536431,539870,543354,546881,550455,554074,557741,
+    561456,565221,569035,572901,576818,580789,584815,588896,
+    593033,597229,601483,605798,610174,614613,619117,623686,
+    628323,633028,637803,642651,647572,652568,657640,662792,
+    668024,673338,678737,684223,689797,695462,701219,707072,
+    713023,719074,725227,731486,737853,744331,750922,757631,
+    764460,771411,778490,785699,793041,800521,808143,815910,
+    823827,831898,840127,848520,857081,865817,874730,883829,
+    893117,902602,912289,922186,932298,942633,953199,964003,
+    975054,986361,997931,1009774,1021901,1034322,1047046,1060087,
+    1073455,1087164,1101225,1115654,1130465,1145673,1161294,1177345,
+    1193846,1210813,1228269,1246234,1264730,1283783,1303416,1323658,
+    1344537,1366084,1388330,1411312,1435065,1459630,1485049,1511367,
+    1538632,1566898,1596220,1626658,1658278,1691149,1725348,1760956,
+    1798063,1836758,1877161,1919378,1963536,2009771,2058233,2109087,
+    2162516,2218719,2277919,2340362,2406322,2476104,2550052,2628549,
+    2712030,2800983,2895966,2997613,3106651,3223918,3350381,3487165,
+    3635590,3797206,3973855,4167737,4381502,4618375,4882318,5178251,
+    5512368,5892567,6329090,6835455,7429880,8137527,8994149,10052327,
+    11392683,13145455,15535599,18988036,24413316,34178904,56965752,170910304
+};
+
+
+const fixed_t finesine[10240] =
+{
+    25,75,125,175,226,276,326,376,
+    427,477,527,578,628,678,728,779,
+    829,879,929,980,1030,1080,1130,1181,
+    1231,1281,1331,1382,1432,1482,1532,1583,
+    1633,1683,1733,1784,1834,1884,1934,1985,
+    2035,2085,2135,2186,2236,2286,2336,2387,
+    2437,2487,2537,2587,2638,2688,2738,2788,
+    2839,2889,2939,2989,3039,3090,3140,3190,
+    3240,3291,3341,3391,3441,3491,3541,3592,
+    3642,3692,3742,3792,3843,3893,3943,3993,
+    4043,4093,4144,4194,4244,4294,4344,4394,
+    4445,4495,4545,4595,4645,4695,4745,4796,
+    4846,4896,4946,4996,5046,5096,5146,5197,
+    5247,5297,5347,5397,5447,5497,5547,5597,
+    5647,5697,5748,5798,5848,5898,5948,5998,
+    6048,6098,6148,6198,6248,6298,6348,6398,
+    6448,6498,6548,6598,6648,6698,6748,6798,
+    6848,6898,6948,6998,7048,7098,7148,7198,
+    7248,7298,7348,7398,7448,7498,7548,7598,
+    7648,7697,7747,7797,7847,7897,7947,7997,
+    8047,8097,8147,8196,8246,8296,8346,8396,
+    8446,8496,8545,8595,8645,8695,8745,8794,
+    8844,8894,8944,8994,9043,9093,9143,9193,
+    9243,9292,9342,9392,9442,9491,9541,9591,
+    9640,9690,9740,9790,9839,9889,9939,9988,
+    10038,10088,10137,10187,10237,10286,10336,10386,
+    10435,10485,10534,10584,10634,10683,10733,10782,
+    10832,10882,10931,10981,11030,11080,11129,11179,
+    11228,11278,11327,11377,11426,11476,11525,11575,
+    11624,11674,11723,11773,11822,11872,11921,11970,
+    12020,12069,12119,12168,12218,12267,12316,12366,
+    12415,12464,12514,12563,12612,12662,12711,12760,
+    12810,12859,12908,12957,13007,13056,13105,13154,
+    13204,13253,13302,13351,13401,13450,13499,13548,
+    13597,13647,13696,13745,13794,13843,13892,13941,
+    13990,14040,14089,14138,14187,14236,14285,14334,
+    14383,14432,14481,14530,14579,14628,14677,14726,
+    14775,14824,14873,14922,14971,15020,15069,15118,
+    15167,15215,15264,15313,15362,15411,15460,15509,
+    15557,15606,15655,15704,15753,15802,15850,15899,
+    15948,15997,16045,16094,16143,16191,16240,16289,
+    16338,16386,16435,16484,16532,16581,16629,16678,
+    16727,16775,16824,16872,16921,16970,17018,17067,
+    17115,17164,17212,17261,17309,17358,17406,17455,
+    17503,17551,17600,17648,17697,17745,17793,17842,
+    17890,17939,17987,18035,18084,18132,18180,18228,
+    18277,18325,18373,18421,18470,18518,18566,18614,
+    18663,18711,18759,18807,18855,18903,18951,19000,
+    19048,19096,19144,19192,19240,19288,19336,19384,
+    19432,19480,19528,19576,19624,19672,19720,19768,
+    19816,19864,19912,19959,20007,20055,20103,20151,
+    20199,20246,20294,20342,20390,20438,20485,20533,
+    20581,20629,20676,20724,20772,20819,20867,20915,
+    20962,21010,21057,21105,21153,21200,21248,21295,
+    21343,21390,21438,21485,21533,21580,21628,21675,
+    21723,21770,21817,21865,21912,21960,22007,22054,
+    22102,22149,22196,22243,22291,22338,22385,22433,
+    22480,22527,22574,22621,22668,22716,22763,22810,
+    22857,22904,22951,22998,23045,23092,23139,23186,
+    23233,23280,23327,23374,23421,23468,23515,23562,
+    23609,23656,23703,23750,23796,23843,23890,23937,
+    23984,24030,24077,24124,24171,24217,24264,24311,
+    24357,24404,24451,24497,24544,24591,24637,24684,
+    24730,24777,24823,24870,24916,24963,25009,25056,
+    25102,25149,25195,25241,25288,25334,25381,25427,
+    25473,25520,25566,25612,25658,25705,25751,25797,
+    25843,25889,25936,25982,26028,26074,26120,26166,
+    26212,26258,26304,26350,26396,26442,26488,26534,
+    26580,26626,26672,26718,26764,26810,26856,26902,
+    26947,26993,27039,27085,27131,27176,27222,27268,
+    27313,27359,27405,27450,27496,27542,27587,27633,
+    27678,27724,27770,27815,27861,27906,27952,27997,
+    28042,28088,28133,28179,28224,28269,28315,28360,
+    28405,28451,28496,28541,28586,28632,28677,28722,
+    28767,28812,28858,28903,28948,28993,29038,29083,
+    29128,29173,29218,29263,29308,29353,29398,29443,
+    29488,29533,29577,29622,29667,29712,29757,29801,
+    29846,29891,29936,29980,30025,30070,30114,30159,
+    30204,30248,30293,30337,30382,30426,30471,30515,
+    30560,30604,30649,30693,30738,30782,30826,30871,
+    30915,30959,31004,31048,31092,31136,31181,31225,
+    31269,31313,31357,31402,31446,31490,31534,31578,
+    31622,31666,31710,31754,31798,31842,31886,31930,
+    31974,32017,32061,32105,32149,32193,32236,32280,
+    32324,32368,32411,32455,32499,32542,32586,32630,
+    32673,32717,32760,32804,32847,32891,32934,32978,
+    33021,33065,33108,33151,33195,33238,33281,33325,
+    33368,33411,33454,33498,33541,33584,33627,33670,
+    33713,33756,33799,33843,33886,33929,33972,34015,
+    34057,34100,34143,34186,34229,34272,34315,34358,
+    34400,34443,34486,34529,34571,34614,34657,34699,
+    34742,34785,34827,34870,34912,34955,34997,35040,
+    35082,35125,35167,35210,35252,35294,35337,35379,
+    35421,35464,35506,35548,35590,35633,35675,35717,
+    35759,35801,35843,35885,35927,35969,36011,36053,
+    36095,36137,36179,36221,36263,36305,36347,36388,
+    36430,36472,36514,36555,36597,36639,36681,36722,
+    36764,36805,36847,36889,36930,36972,37013,37055,
+    37096,37137,37179,37220,37262,37303,37344,37386,
+    37427,37468,37509,37551,37592,37633,37674,37715,
+    37756,37797,37838,37879,37920,37961,38002,38043,
+    38084,38125,38166,38207,38248,38288,38329,38370,
+    38411,38451,38492,38533,38573,38614,38655,38695,
+    38736,38776,38817,38857,38898,38938,38979,39019,
+    39059,39100,39140,39180,39221,39261,39301,39341,
+    39382,39422,39462,39502,39542,39582,39622,39662,
+    39702,39742,39782,39822,39862,39902,39942,39982,
+    40021,40061,40101,40141,40180,40220,40260,40300,
+    40339,40379,40418,40458,40497,40537,40576,40616,
+    40655,40695,40734,40773,40813,40852,40891,40931,
+    40970,41009,41048,41087,41127,41166,41205,41244,
+    41283,41322,41361,41400,41439,41478,41517,41556,
+    41595,41633,41672,41711,41750,41788,41827,41866,
+    41904,41943,41982,42020,42059,42097,42136,42174,
+    42213,42251,42290,42328,42366,42405,42443,42481,
+    42520,42558,42596,42634,42672,42711,42749,42787,
+    42825,42863,42901,42939,42977,43015,43053,43091,
+    43128,43166,43204,43242,43280,43317,43355,43393,
+    43430,43468,43506,43543,43581,43618,43656,43693,
+    43731,43768,43806,43843,43880,43918,43955,43992,
+    44029,44067,44104,44141,44178,44215,44252,44289,
+    44326,44363,44400,44437,44474,44511,44548,44585,
+    44622,44659,44695,44732,44769,44806,44842,44879,
+    44915,44952,44989,45025,45062,45098,45135,45171,
+    45207,45244,45280,45316,45353,45389,45425,45462,
+    45498,45534,45570,45606,45642,45678,45714,45750,
+    45786,45822,45858,45894,45930,45966,46002,46037,
+    46073,46109,46145,46180,46216,46252,46287,46323,
+    46358,46394,46429,46465,46500,46536,46571,46606,
+    46642,46677,46712,46747,46783,46818,46853,46888,
+    46923,46958,46993,47028,47063,47098,47133,47168,
+    47203,47238,47273,47308,47342,47377,47412,47446,
+    47481,47516,47550,47585,47619,47654,47688,47723,
+    47757,47792,47826,47860,47895,47929,47963,47998,
+    48032,48066,48100,48134,48168,48202,48237,48271,
+    48305,48338,48372,48406,48440,48474,48508,48542,
+    48575,48609,48643,48676,48710,48744,48777,48811,
+    48844,48878,48911,48945,48978,49012,49045,49078,
+    49112,49145,49178,49211,49244,49278,49311,49344,
+    49377,49410,49443,49476,49509,49542,49575,49608,
+    49640,49673,49706,49739,49771,49804,49837,49869,
+    49902,49935,49967,50000,50032,50065,50097,50129,
+    50162,50194,50226,50259,50291,50323,50355,50387,
+    50420,50452,50484,50516,50548,50580,50612,50644,
+    50675,50707,50739,50771,50803,50834,50866,50898,
+    50929,50961,50993,51024,51056,51087,51119,51150,
+    51182,51213,51244,51276,51307,51338,51369,51401,
+    51432,51463,51494,51525,51556,51587,51618,51649,
+    51680,51711,51742,51773,51803,51834,51865,51896,
+    51926,51957,51988,52018,52049,52079,52110,52140,
+    52171,52201,52231,52262,52292,52322,52353,52383,
+    52413,52443,52473,52503,52534,52564,52594,52624,
+    52653,52683,52713,52743,52773,52803,52832,52862,
+    52892,52922,52951,52981,53010,53040,53069,53099,
+    53128,53158,53187,53216,53246,53275,53304,53334,
+    53363,53392,53421,53450,53479,53508,53537,53566,
+    53595,53624,53653,53682,53711,53739,53768,53797,
+    53826,53854,53883,53911,53940,53969,53997,54026,
+    54054,54082,54111,54139,54167,54196,54224,54252,
+    54280,54308,54337,54365,54393,54421,54449,54477,
+    54505,54533,54560,54588,54616,54644,54672,54699,
+    54727,54755,54782,54810,54837,54865,54892,54920,
+    54947,54974,55002,55029,55056,55084,55111,55138,
+    55165,55192,55219,55246,55274,55300,55327,55354,
+    55381,55408,55435,55462,55489,55515,55542,55569,
+    55595,55622,55648,55675,55701,55728,55754,55781,
+    55807,55833,55860,55886,55912,55938,55965,55991,
+    56017,56043,56069,56095,56121,56147,56173,56199,
+    56225,56250,56276,56302,56328,56353,56379,56404,
+    56430,56456,56481,56507,56532,56557,56583,56608,
+    56633,56659,56684,56709,56734,56760,56785,56810,
+    56835,56860,56885,56910,56935,56959,56984,57009,
+    57034,57059,57083,57108,57133,57157,57182,57206,
+    57231,57255,57280,57304,57329,57353,57377,57402,
+    57426,57450,57474,57498,57522,57546,57570,57594,
+    57618,57642,57666,57690,57714,57738,57762,57785,
+    57809,57833,57856,57880,57903,57927,57950,57974,
+    57997,58021,58044,58067,58091,58114,58137,58160,
+    58183,58207,58230,58253,58276,58299,58322,58345,
+    58367,58390,58413,58436,58459,58481,58504,58527,
+    58549,58572,58594,58617,58639,58662,58684,58706,
+    58729,58751,58773,58795,58818,58840,58862,58884,
+    58906,58928,58950,58972,58994,59016,59038,59059,
+    59081,59103,59125,59146,59168,59190,59211,59233,
+    59254,59276,59297,59318,59340,59361,59382,59404,
+    59425,59446,59467,59488,59509,59530,59551,59572,
+    59593,59614,59635,59656,59677,59697,59718,59739,
+    59759,59780,59801,59821,59842,59862,59883,59903,
+    59923,59944,59964,59984,60004,60025,60045,60065,
+    60085,60105,60125,60145,60165,60185,60205,60225,
+    60244,60264,60284,60304,60323,60343,60363,60382,
+    60402,60421,60441,60460,60479,60499,60518,60537,
+    60556,60576,60595,60614,60633,60652,60671,60690,
+    60709,60728,60747,60766,60785,60803,60822,60841,
+    60859,60878,60897,60915,60934,60952,60971,60989,
+    61007,61026,61044,61062,61081,61099,61117,61135,
+    61153,61171,61189,61207,61225,61243,61261,61279,
+    61297,61314,61332,61350,61367,61385,61403,61420,
+    61438,61455,61473,61490,61507,61525,61542,61559,
+    61577,61594,61611,61628,61645,61662,61679,61696,
+    61713,61730,61747,61764,61780,61797,61814,61831,
+    61847,61864,61880,61897,61913,61930,61946,61963,
+    61979,61995,62012,62028,62044,62060,62076,62092,
+    62108,62125,62141,62156,62172,62188,62204,62220,
+    62236,62251,62267,62283,62298,62314,62329,62345,
+    62360,62376,62391,62407,62422,62437,62453,62468,
+    62483,62498,62513,62528,62543,62558,62573,62588,
+    62603,62618,62633,62648,62662,62677,62692,62706,
+    62721,62735,62750,62764,62779,62793,62808,62822,
+    62836,62850,62865,62879,62893,62907,62921,62935,
+    62949,62963,62977,62991,63005,63019,63032,63046,
+    63060,63074,63087,63101,63114,63128,63141,63155,
+    63168,63182,63195,63208,63221,63235,63248,63261,
+    63274,63287,63300,63313,63326,63339,63352,63365,
+    63378,63390,63403,63416,63429,63441,63454,63466,
+    63479,63491,63504,63516,63528,63541,63553,63565,
+    63578,63590,63602,63614,63626,63638,63650,63662,
+    63674,63686,63698,63709,63721,63733,63745,63756,
+    63768,63779,63791,63803,63814,63825,63837,63848,
+    63859,63871,63882,63893,63904,63915,63927,63938,
+    63949,63960,63971,63981,63992,64003,64014,64025,
+    64035,64046,64057,64067,64078,64088,64099,64109,
+    64120,64130,64140,64151,64161,64171,64181,64192,
+    64202,64212,64222,64232,64242,64252,64261,64271,
+    64281,64291,64301,64310,64320,64330,64339,64349,
+    64358,64368,64377,64387,64396,64405,64414,64424,
+    64433,64442,64451,64460,64469,64478,64487,64496,
+    64505,64514,64523,64532,64540,64549,64558,64566,
+    64575,64584,64592,64601,64609,64617,64626,64634,
+    64642,64651,64659,64667,64675,64683,64691,64699,
+    64707,64715,64723,64731,64739,64747,64754,64762,
+    64770,64777,64785,64793,64800,64808,64815,64822,
+    64830,64837,64844,64852,64859,64866,64873,64880,
+    64887,64895,64902,64908,64915,64922,64929,64936,
+    64943,64949,64956,64963,64969,64976,64982,64989,
+    64995,65002,65008,65015,65021,65027,65033,65040,
+    65046,65052,65058,65064,65070,65076,65082,65088,
+    65094,65099,65105,65111,65117,65122,65128,65133,
+    65139,65144,65150,65155,65161,65166,65171,65177,
+    65182,65187,65192,65197,65202,65207,65212,65217,
+    65222,65227,65232,65237,65242,65246,65251,65256,
+    65260,65265,65270,65274,65279,65283,65287,65292,
+    65296,65300,65305,65309,65313,65317,65321,65325,
+    65329,65333,65337,65341,65345,65349,65352,65356,
+    65360,65363,65367,65371,65374,65378,65381,65385,
+    65388,65391,65395,65398,65401,65404,65408,65411,
+    65414,65417,65420,65423,65426,65429,65431,65434,
+    65437,65440,65442,65445,65448,65450,65453,65455,
+    65458,65460,65463,65465,65467,65470,65472,65474,
+    65476,65478,65480,65482,65484,65486,65488,65490,
+    65492,65494,65496,65497,65499,65501,65502,65504,
+    65505,65507,65508,65510,65511,65513,65514,65515,
+    65516,65518,65519,65520,65521,65522,65523,65524,
+    65525,65526,65527,65527,65528,65529,65530,65530,
+    65531,65531,65532,65532,65533,65533,65534,65534,
+    65534,65535,65535,65535,65535,65535,65535,65535,
+    65535,65535,65535,65535,65535,65535,65535,65534,
+    65534,65534,65533,65533,65532,65532,65531,65531,
+    65530,65530,65529,65528,65527,65527,65526,65525,
+    65524,65523,65522,65521,65520,65519,65518,65516,
+    65515,65514,65513,65511,65510,65508,65507,65505,
+    65504,65502,65501,65499,65497,65496,65494,65492,
+    65490,65488,65486,65484,65482,65480,65478,65476,
+    65474,65472,65470,65467,65465,65463,65460,65458,
+    65455,65453,65450,65448,65445,65442,65440,65437,
+    65434,65431,65429,65426,65423,65420,65417,65414,
+    65411,65408,65404,65401,65398,65395,65391,65388,
+    65385,65381,65378,65374,65371,65367,65363,65360,
+    65356,65352,65349,65345,65341,65337,65333,65329,
+    65325,65321,65317,65313,65309,65305,65300,65296,
+    65292,65287,65283,65279,65274,65270,65265,65260,
+    65256,65251,65246,65242,65237,65232,65227,65222,
+    65217,65212,65207,65202,65197,65192,65187,65182,
+    65177,65171,65166,65161,65155,65150,65144,65139,
+    65133,65128,65122,65117,65111,65105,65099,65094,
+    65088,65082,65076,65070,65064,65058,65052,65046,
+    65040,65033,65027,65021,65015,65008,65002,64995,
+    64989,64982,64976,64969,64963,64956,64949,64943,
+    64936,64929,64922,64915,64908,64902,64895,64887,
+    64880,64873,64866,64859,64852,64844,64837,64830,
+    64822,64815,64808,64800,64793,64785,64777,64770,
+    64762,64754,64747,64739,64731,64723,64715,64707,
+    64699,64691,64683,64675,64667,64659,64651,64642,
+    64634,64626,64617,64609,64600,64592,64584,64575,
+    64566,64558,64549,64540,64532,64523,64514,64505,
+    64496,64487,64478,64469,64460,64451,64442,64433,
+    64424,64414,64405,64396,64387,64377,64368,64358,
+    64349,64339,64330,64320,64310,64301,64291,64281,
+    64271,64261,64252,64242,64232,64222,64212,64202,
+    64192,64181,64171,64161,64151,64140,64130,64120,
+    64109,64099,64088,64078,64067,64057,64046,64035,
+    64025,64014,64003,63992,63981,63971,63960,63949,
+    63938,63927,63915,63904,63893,63882,63871,63859,
+    63848,63837,63825,63814,63803,63791,63779,63768,
+    63756,63745,63733,63721,63709,63698,63686,63674,
+    63662,63650,63638,63626,63614,63602,63590,63578,
+    63565,63553,63541,63528,63516,63504,63491,63479,
+    63466,63454,63441,63429,63416,63403,63390,63378,
+    63365,63352,63339,63326,63313,63300,63287,63274,
+    63261,63248,63235,63221,63208,63195,63182,63168,
+    63155,63141,63128,63114,63101,63087,63074,63060,
+    63046,63032,63019,63005,62991,62977,62963,62949,
+    62935,62921,62907,62893,62879,62865,62850,62836,
+    62822,62808,62793,62779,62764,62750,62735,62721,
+    62706,62692,62677,62662,62648,62633,62618,62603,
+    62588,62573,62558,62543,62528,62513,62498,62483,
+    62468,62453,62437,62422,62407,62391,62376,62360,
+    62345,62329,62314,62298,62283,62267,62251,62236,
+    62220,62204,62188,62172,62156,62141,62125,62108,
+    62092,62076,62060,62044,62028,62012,61995,61979,
+    61963,61946,61930,61913,61897,61880,61864,61847,
+    61831,61814,61797,61780,61764,61747,61730,61713,
+    61696,61679,61662,61645,61628,61611,61594,61577,
+    61559,61542,61525,61507,61490,61473,61455,61438,
+    61420,61403,61385,61367,61350,61332,61314,61297,
+    61279,61261,61243,61225,61207,61189,61171,61153,
+    61135,61117,61099,61081,61062,61044,61026,61007,
+    60989,60971,60952,60934,60915,60897,60878,60859,
+    60841,60822,60803,60785,60766,60747,60728,60709,
+    60690,60671,60652,60633,60614,60595,60576,60556,
+    60537,60518,60499,60479,60460,60441,60421,60402,
+    60382,60363,60343,60323,60304,60284,60264,60244,
+    60225,60205,60185,60165,60145,60125,60105,60085,
+    60065,60045,60025,60004,59984,59964,59944,59923,
+    59903,59883,59862,59842,59821,59801,59780,59759,
+    59739,59718,59697,59677,59656,59635,59614,59593,
+    59572,59551,59530,59509,59488,59467,59446,59425,
+    59404,59382,59361,59340,59318,59297,59276,59254,
+    59233,59211,59190,59168,59146,59125,59103,59081,
+    59059,59038,59016,58994,58972,58950,58928,58906,
+    58884,58862,58840,58818,58795,58773,58751,58729,
+    58706,58684,58662,58639,58617,58594,58572,58549,
+    58527,58504,58481,58459,58436,58413,58390,58367,
+    58345,58322,58299,58276,58253,58230,58207,58183,
+    58160,58137,58114,58091,58067,58044,58021,57997,
+    57974,57950,57927,57903,57880,57856,57833,57809,
+    57785,57762,57738,57714,57690,57666,57642,57618,
+    57594,57570,57546,57522,57498,57474,57450,57426,
+    57402,57377,57353,57329,57304,57280,57255,57231,
+    57206,57182,57157,57133,57108,57083,57059,57034,
+    57009,56984,56959,56935,56910,56885,56860,56835,
+    56810,56785,56760,56734,56709,56684,56659,56633,
+    56608,56583,56557,56532,56507,56481,56456,56430,
+    56404,56379,56353,56328,56302,56276,56250,56225,
+    56199,56173,56147,56121,56095,56069,56043,56017,
+    55991,55965,55938,55912,55886,55860,55833,55807,
+    55781,55754,55728,55701,55675,55648,55622,55595,
+    55569,55542,55515,55489,55462,55435,55408,55381,
+    55354,55327,55300,55274,55246,55219,55192,55165,
+    55138,55111,55084,55056,55029,55002,54974,54947,
+    54920,54892,54865,54837,54810,54782,54755,54727,
+    54699,54672,54644,54616,54588,54560,54533,54505,
+    54477,54449,54421,54393,54365,54337,54308,54280,
+    54252,54224,54196,54167,54139,54111,54082,54054,
+    54026,53997,53969,53940,53911,53883,53854,53826,
+    53797,53768,53739,53711,53682,53653,53624,53595,
+    53566,53537,53508,53479,53450,53421,53392,53363,
+    53334,53304,53275,53246,53216,53187,53158,53128,
+    53099,53069,53040,53010,52981,52951,52922,52892,
+    52862,52832,52803,52773,52743,52713,52683,52653,
+    52624,52594,52564,52534,52503,52473,52443,52413,
+    52383,52353,52322,52292,52262,52231,52201,52171,
+    52140,52110,52079,52049,52018,51988,51957,51926,
+    51896,51865,51834,51803,51773,51742,51711,51680,
+    51649,51618,51587,51556,51525,51494,51463,51432,
+    51401,51369,51338,51307,51276,51244,51213,51182,
+    51150,51119,51087,51056,51024,50993,50961,50929,
+    50898,50866,50834,50803,50771,50739,50707,50675,
+    50644,50612,50580,50548,50516,50484,50452,50420,
+    50387,50355,50323,50291,50259,50226,50194,50162,
+    50129,50097,50065,50032,50000,49967,49935,49902,
+    49869,49837,49804,49771,49739,49706,49673,49640,
+    49608,49575,49542,49509,49476,49443,49410,49377,
+    49344,49311,49278,49244,49211,49178,49145,49112,
+    49078,49045,49012,48978,48945,48911,48878,48844,
+    48811,48777,48744,48710,48676,48643,48609,48575,
+    48542,48508,48474,48440,48406,48372,48338,48304,
+    48271,48237,48202,48168,48134,48100,48066,48032,
+    47998,47963,47929,47895,47860,47826,47792,47757,
+    47723,47688,47654,47619,47585,47550,47516,47481,
+    47446,47412,47377,47342,47308,47273,47238,47203,
+    47168,47133,47098,47063,47028,46993,46958,46923,
+    46888,46853,46818,46783,46747,46712,46677,46642,
+    46606,46571,46536,46500,46465,46429,46394,46358,
+    46323,46287,46252,46216,46180,46145,46109,46073,
+    46037,46002,45966,45930,45894,45858,45822,45786,
+    45750,45714,45678,45642,45606,45570,45534,45498,
+    45462,45425,45389,45353,45316,45280,45244,45207,
+    45171,45135,45098,45062,45025,44989,44952,44915,
+    44879,44842,44806,44769,44732,44695,44659,44622,
+    44585,44548,44511,44474,44437,44400,44363,44326,
+    44289,44252,44215,44178,44141,44104,44067,44029,
+    43992,43955,43918,43880,43843,43806,43768,43731,
+    43693,43656,43618,43581,43543,43506,43468,43430,
+    43393,43355,43317,43280,43242,43204,43166,43128,
+    43091,43053,43015,42977,42939,42901,42863,42825,
+    42787,42749,42711,42672,42634,42596,42558,42520,
+    42481,42443,42405,42366,42328,42290,42251,42213,
+    42174,42136,42097,42059,42020,41982,41943,41904,
+    41866,41827,41788,41750,41711,41672,41633,41595,
+    41556,41517,41478,41439,41400,41361,41322,41283,
+    41244,41205,41166,41127,41088,41048,41009,40970,
+    40931,40891,40852,40813,40773,40734,40695,40655,
+    40616,40576,40537,40497,40458,40418,40379,40339,
+    40300,40260,40220,40180,40141,40101,40061,40021,
+    39982,39942,39902,39862,39822,39782,39742,39702,
+    39662,39622,39582,39542,39502,39462,39422,39382,
+    39341,39301,39261,39221,39180,39140,39100,39059,
+    39019,38979,38938,38898,38857,38817,38776,38736,
+    38695,38655,38614,38573,38533,38492,38451,38411,
+    38370,38329,38288,38248,38207,38166,38125,38084,
+    38043,38002,37961,37920,37879,37838,37797,37756,
+    37715,37674,37633,37592,37551,37509,37468,37427,
+    37386,37344,37303,37262,37220,37179,37137,37096,
+    37055,37013,36972,36930,36889,36847,36805,36764,
+    36722,36681,36639,36597,36556,36514,36472,36430,
+    36388,36347,36305,36263,36221,36179,36137,36095,
+    36053,36011,35969,35927,35885,35843,35801,35759,
+    35717,35675,35633,35590,35548,35506,35464,35421,
+    35379,35337,35294,35252,35210,35167,35125,35082,
+    35040,34997,34955,34912,34870,34827,34785,34742,
+    34699,34657,34614,34571,34529,34486,34443,34400,
+    34358,34315,34272,34229,34186,34143,34100,34057,
+    34015,33972,33929,33886,33843,33799,33756,33713,
+    33670,33627,33584,33541,33498,33454,33411,33368,
+    33325,33281,33238,33195,33151,33108,33065,33021,
+    32978,32934,32891,32847,32804,32760,32717,32673,
+    32630,32586,32542,32499,32455,32411,32368,32324,
+    32280,32236,32193,32149,32105,32061,32017,31974,
+    31930,31886,31842,31798,31754,31710,31666,31622,
+    31578,31534,31490,31446,31402,31357,31313,31269,
+    31225,31181,31136,31092,31048,31004,30959,30915,
+    30871,30826,30782,30738,30693,30649,30604,30560,
+    30515,30471,30426,30382,30337,30293,30248,30204,
+    30159,30114,30070,30025,29980,29936,29891,29846,
+    29801,29757,29712,29667,29622,29577,29533,29488,
+    29443,29398,29353,29308,29263,29218,29173,29128,
+    29083,29038,28993,28948,28903,28858,28812,28767,
+    28722,28677,28632,28586,28541,28496,28451,28405,
+    28360,28315,28269,28224,28179,28133,28088,28042,
+    27997,27952,27906,27861,27815,27770,27724,27678,
+    27633,27587,27542,27496,27450,27405,27359,27313,
+    27268,27222,27176,27131,27085,27039,26993,26947,
+    26902,26856,26810,26764,26718,26672,26626,26580,
+    26534,26488,26442,26396,26350,26304,26258,26212,
+    26166,26120,26074,26028,25982,25936,25889,25843,
+    25797,25751,25705,25658,25612,25566,25520,25473,
+    25427,25381,25334,25288,25241,25195,25149,25102,
+    25056,25009,24963,24916,24870,24823,24777,24730,
+    24684,24637,24591,24544,24497,24451,24404,24357,
+    24311,24264,24217,24171,24124,24077,24030,23984,
+    23937,23890,23843,23796,23750,23703,23656,23609,
+    23562,23515,23468,23421,23374,23327,23280,23233,
+    23186,23139,23092,23045,22998,22951,22904,22857,
+    22810,22763,22716,22668,22621,22574,22527,22480,
+    22433,22385,22338,22291,22243,22196,22149,22102,
+    22054,22007,21960,21912,21865,21817,21770,21723,
+    21675,21628,21580,21533,21485,21438,21390,21343,
+    21295,21248,21200,21153,21105,21057,21010,20962,
+    20915,20867,20819,20772,20724,20676,20629,20581,
+    20533,20485,20438,20390,20342,20294,20246,20199,
+    20151,20103,20055,20007,19959,19912,19864,19816,
+    19768,19720,19672,19624,19576,19528,19480,19432,
+    19384,19336,19288,19240,19192,19144,19096,19048,
+    19000,18951,18903,18855,18807,18759,18711,18663,
+    18614,18566,18518,18470,18421,18373,18325,18277,
+    18228,18180,18132,18084,18035,17987,17939,17890,
+    17842,17793,17745,17697,17648,17600,17551,17503,
+    17455,17406,17358,17309,17261,17212,17164,17115,
+    17067,17018,16970,16921,16872,16824,16775,16727,
+    16678,16629,16581,16532,16484,16435,16386,16338,
+    16289,16240,16191,16143,16094,16045,15997,15948,
+    15899,15850,15802,15753,15704,15655,15606,15557,
+    15509,15460,15411,15362,15313,15264,15215,15167,
+    15118,15069,15020,14971,14922,14873,14824,14775,
+    14726,14677,14628,14579,14530,14481,14432,14383,
+    14334,14285,14236,14187,14138,14089,14040,13990,
+    13941,13892,13843,13794,13745,13696,13646,13597,
+    13548,13499,13450,13401,13351,13302,13253,13204,
+    13154,13105,13056,13007,12957,12908,12859,12810,
+    12760,12711,12662,12612,12563,12514,12464,12415,
+    12366,12316,12267,12218,12168,12119,12069,12020,
+    11970,11921,11872,11822,11773,11723,11674,11624,
+    11575,11525,11476,11426,11377,11327,11278,11228,
+    11179,11129,11080,11030,10981,10931,10882,10832,
+    10782,10733,10683,10634,10584,10534,10485,10435,
+    10386,10336,10286,10237,10187,10137,10088,10038,
+    9988,9939,9889,9839,9790,9740,9690,9640,
+    9591,9541,9491,9442,9392,9342,9292,9243,
+    9193,9143,9093,9043,8994,8944,8894,8844,
+    8794,8745,8695,8645,8595,8545,8496,8446,
+    8396,8346,8296,8246,8196,8147,8097,8047,
+    7997,7947,7897,7847,7797,7747,7697,7648,
+    7598,7548,7498,7448,7398,7348,7298,7248,
+    7198,7148,7098,7048,6998,6948,6898,6848,
+    6798,6748,6698,6648,6598,6548,6498,6448,
+    6398,6348,6298,6248,6198,6148,6098,6048,
+    5998,5948,5898,5848,5798,5748,5697,5647,
+    5597,5547,5497,5447,5397,5347,5297,5247,
+    5197,5146,5096,5046,4996,4946,4896,4846,
+    4796,4745,4695,4645,4595,4545,4495,4445,
+    4394,4344,4294,4244,4194,4144,4093,4043,
+    3993,3943,3893,3843,3792,3742,3692,3642,
+    3592,3541,3491,3441,3391,3341,3291,3240,
+    3190,3140,3090,3039,2989,2939,2889,2839,
+    2788,2738,2688,2638,2587,2537,2487,2437,
+    2387,2336,2286,2236,2186,2135,2085,2035,
+    1985,1934,1884,1834,1784,1733,1683,1633,
+    1583,1532,1482,1432,1382,1331,1281,1231,
+    1181,1130,1080,1030,980,929,879,829,
+    779,728,678,628,578,527,477,427,
+    376,326,276,226,175,125,75,25,
+    -25,-75,-125,-175,-226,-276,-326,-376,
+    -427,-477,-527,-578,-628,-678,-728,-779,
+    -829,-879,-929,-980,-1030,-1080,-1130,-1181,
+    -1231,-1281,-1331,-1382,-1432,-1482,-1532,-1583,
+    -1633,-1683,-1733,-1784,-1834,-1884,-1934,-1985,
+    -2035,-2085,-2135,-2186,-2236,-2286,-2336,-2387,
+    -2437,-2487,-2537,-2588,-2638,-2688,-2738,-2788,
+    -2839,-2889,-2939,-2989,-3039,-3090,-3140,-3190,
+    -3240,-3291,-3341,-3391,-3441,-3491,-3541,-3592,
+    -3642,-3692,-3742,-3792,-3843,-3893,-3943,-3993,
+    -4043,-4093,-4144,-4194,-4244,-4294,-4344,-4394,
+    -4445,-4495,-4545,-4595,-4645,-4695,-4745,-4796,
+    -4846,-4896,-4946,-4996,-5046,-5096,-5146,-5197,
+    -5247,-5297,-5347,-5397,-5447,-5497,-5547,-5597,
+    -5647,-5697,-5748,-5798,-5848,-5898,-5948,-5998,
+    -6048,-6098,-6148,-6198,-6248,-6298,-6348,-6398,
+    -6448,-6498,-6548,-6598,-6648,-6698,-6748,-6798,
+    -6848,-6898,-6948,-6998,-7048,-7098,-7148,-7198,
+    -7248,-7298,-7348,-7398,-7448,-7498,-7548,-7598,
+    -7648,-7697,-7747,-7797,-7847,-7897,-7947,-7997,
+    -8047,-8097,-8147,-8196,-8246,-8296,-8346,-8396,
+    -8446,-8496,-8545,-8595,-8645,-8695,-8745,-8794,
+    -8844,-8894,-8944,-8994,-9043,-9093,-9143,-9193,
+    -9243,-9292,-9342,-9392,-9442,-9491,-9541,-9591,
+    -9640,-9690,-9740,-9790,-9839,-9889,-9939,-9988,
+    -10038,-10088,-10137,-10187,-10237,-10286,-10336,-10386,
+    -10435,-10485,-10534,-10584,-10634,-10683,-10733,-10782,
+    -10832,-10882,-10931,-10981,-11030,-11080,-11129,-11179,
+    -11228,-11278,-11327,-11377,-11426,-11476,-11525,-11575,
+    -11624,-11674,-11723,-11773,-11822,-11872,-11921,-11970,
+    -12020,-12069,-12119,-12168,-12218,-12267,-12316,-12366,
+    -12415,-12464,-12514,-12563,-12612,-12662,-12711,-12760,
+    -12810,-12859,-12908,-12957,-13007,-13056,-13105,-13154,
+    -13204,-13253,-13302,-13351,-13401,-13450,-13499,-13548,
+    -13597,-13647,-13696,-13745,-13794,-13843,-13892,-13941,
+    -13990,-14040,-14089,-14138,-14187,-14236,-14285,-14334,
+    -14383,-14432,-14481,-14530,-14579,-14628,-14677,-14726,
+    -14775,-14824,-14873,-14922,-14971,-15020,-15069,-15118,
+    -15167,-15215,-15264,-15313,-15362,-15411,-15460,-15509,
+    -15557,-15606,-15655,-15704,-15753,-15802,-15850,-15899,
+    -15948,-15997,-16045,-16094,-16143,-16191,-16240,-16289,
+    -16338,-16386,-16435,-16484,-16532,-16581,-16629,-16678,
+    -16727,-16775,-16824,-16872,-16921,-16970,-17018,-17067,
+    -17115,-17164,-17212,-17261,-17309,-17358,-17406,-17455,
+    -17503,-17551,-17600,-17648,-17697,-17745,-17793,-17842,
+    -17890,-17939,-17987,-18035,-18084,-18132,-18180,-18228,
+    -18277,-18325,-18373,-18421,-18470,-18518,-18566,-18614,
+    -18663,-18711,-18759,-18807,-18855,-18903,-18951,-19000,
+    -19048,-19096,-19144,-19192,-19240,-19288,-19336,-19384,
+    -19432,-19480,-19528,-19576,-19624,-19672,-19720,-19768,
+    -19816,-19864,-19912,-19959,-20007,-20055,-20103,-20151,
+    -20199,-20246,-20294,-20342,-20390,-20438,-20485,-20533,
+    -20581,-20629,-20676,-20724,-20772,-20819,-20867,-20915,
+    -20962,-21010,-21057,-21105,-21153,-21200,-21248,-21295,
+    -21343,-21390,-21438,-21485,-21533,-21580,-21628,-21675,
+    -21723,-21770,-21817,-21865,-21912,-21960,-22007,-22054,
+    -22102,-22149,-22196,-22243,-22291,-22338,-22385,-22433,
+    -22480,-22527,-22574,-22621,-22668,-22716,-22763,-22810,
+    -22857,-22904,-22951,-22998,-23045,-23092,-23139,-23186,
+    -23233,-23280,-23327,-23374,-23421,-23468,-23515,-23562,
+    -23609,-23656,-23703,-23750,-23796,-23843,-23890,-23937,
+    -23984,-24030,-24077,-24124,-24171,-24217,-24264,-24311,
+    -24357,-24404,-24451,-24497,-24544,-24591,-24637,-24684,
+    -24730,-24777,-24823,-24870,-24916,-24963,-25009,-25056,
+    -25102,-25149,-25195,-25241,-25288,-25334,-25381,-25427,
+    -25473,-25520,-25566,-25612,-25658,-25705,-25751,-25797,
+    -25843,-25889,-25936,-25982,-26028,-26074,-26120,-26166,
+    -26212,-26258,-26304,-26350,-26396,-26442,-26488,-26534,
+    -26580,-26626,-26672,-26718,-26764,-26810,-26856,-26902,
+    -26947,-26993,-27039,-27085,-27131,-27176,-27222,-27268,
+    -27313,-27359,-27405,-27450,-27496,-27542,-27587,-27633,
+    -27678,-27724,-27770,-27815,-27861,-27906,-27952,-27997,
+    -28042,-28088,-28133,-28179,-28224,-28269,-28315,-28360,
+    -28405,-28451,-28496,-28541,-28586,-28632,-28677,-28722,
+    -28767,-28812,-28858,-28903,-28948,-28993,-29038,-29083,
+    -29128,-29173,-29218,-29263,-29308,-29353,-29398,-29443,
+    -29488,-29533,-29577,-29622,-29667,-29712,-29757,-29801,
+    -29846,-29891,-29936,-29980,-30025,-30070,-30114,-30159,
+    -30204,-30248,-30293,-30337,-30382,-30426,-30471,-30515,
+    -30560,-30604,-30649,-30693,-30738,-30782,-30826,-30871,
+    -30915,-30959,-31004,-31048,-31092,-31136,-31181,-31225,
+    -31269,-31313,-31357,-31402,-31446,-31490,-31534,-31578,
+    -31622,-31666,-31710,-31754,-31798,-31842,-31886,-31930,
+    -31974,-32017,-32061,-32105,-32149,-32193,-32236,-32280,
+    -32324,-32368,-32411,-32455,-32499,-32542,-32586,-32630,
+    -32673,-32717,-32760,-32804,-32847,-32891,-32934,-32978,
+    -33021,-33065,-33108,-33151,-33195,-33238,-33281,-33325,
+    -33368,-33411,-33454,-33498,-33541,-33584,-33627,-33670,
+    -33713,-33756,-33799,-33843,-33886,-33929,-33972,-34015,
+    -34057,-34100,-34143,-34186,-34229,-34272,-34315,-34358,
+    -34400,-34443,-34486,-34529,-34571,-34614,-34657,-34699,
+    -34742,-34785,-34827,-34870,-34912,-34955,-34997,-35040,
+    -35082,-35125,-35167,-35210,-35252,-35294,-35337,-35379,
+    -35421,-35464,-35506,-35548,-35590,-35633,-35675,-35717,
+    -35759,-35801,-35843,-35885,-35927,-35969,-36011,-36053,
+    -36095,-36137,-36179,-36221,-36263,-36305,-36347,-36388,
+    -36430,-36472,-36514,-36555,-36597,-36639,-36681,-36722,
+    -36764,-36805,-36847,-36889,-36930,-36972,-37013,-37055,
+    -37096,-37137,-37179,-37220,-37262,-37303,-37344,-37386,
+    -37427,-37468,-37509,-37551,-37592,-37633,-37674,-37715,
+    -37756,-37797,-37838,-37879,-37920,-37961,-38002,-38043,
+    -38084,-38125,-38166,-38207,-38248,-38288,-38329,-38370,
+    -38411,-38451,-38492,-38533,-38573,-38614,-38655,-38695,
+    -38736,-38776,-38817,-38857,-38898,-38938,-38979,-39019,
+    -39059,-39100,-39140,-39180,-39221,-39261,-39301,-39341,
+    -39382,-39422,-39462,-39502,-39542,-39582,-39622,-39662,
+    -39702,-39742,-39782,-39822,-39862,-39902,-39942,-39982,
+    -40021,-40061,-40101,-40141,-40180,-40220,-40260,-40299,
+    -40339,-40379,-40418,-40458,-40497,-40537,-40576,-40616,
+    -40655,-40695,-40734,-40773,-40813,-40852,-40891,-40931,
+    -40970,-41009,-41048,-41087,-41127,-41166,-41205,-41244,
+    -41283,-41322,-41361,-41400,-41439,-41478,-41517,-41556,
+    -41595,-41633,-41672,-41711,-41750,-41788,-41827,-41866,
+    -41904,-41943,-41982,-42020,-42059,-42097,-42136,-42174,
+    -42213,-42251,-42290,-42328,-42366,-42405,-42443,-42481,
+    -42520,-42558,-42596,-42634,-42672,-42711,-42749,-42787,
+    -42825,-42863,-42901,-42939,-42977,-43015,-43053,-43091,
+    -43128,-43166,-43204,-43242,-43280,-43317,-43355,-43393,
+    -43430,-43468,-43506,-43543,-43581,-43618,-43656,-43693,
+    -43731,-43768,-43806,-43843,-43880,-43918,-43955,-43992,
+    -44029,-44067,-44104,-44141,-44178,-44215,-44252,-44289,
+    -44326,-44363,-44400,-44437,-44474,-44511,-44548,-44585,
+    -44622,-44659,-44695,-44732,-44769,-44806,-44842,-44879,
+    -44915,-44952,-44989,-45025,-45062,-45098,-45135,-45171,
+    -45207,-45244,-45280,-45316,-45353,-45389,-45425,-45462,
+    -45498,-45534,-45570,-45606,-45642,-45678,-45714,-45750,
+    -45786,-45822,-45858,-45894,-45930,-45966,-46002,-46037,
+    -46073,-46109,-46145,-46180,-46216,-46252,-46287,-46323,
+    -46358,-46394,-46429,-46465,-46500,-46536,-46571,-46606,
+    -46642,-46677,-46712,-46747,-46783,-46818,-46853,-46888,
+    -46923,-46958,-46993,-47028,-47063,-47098,-47133,-47168,
+    -47203,-47238,-47273,-47308,-47342,-47377,-47412,-47446,
+    -47481,-47516,-47550,-47585,-47619,-47654,-47688,-47723,
+    -47757,-47792,-47826,-47860,-47895,-47929,-47963,-47998,
+    -48032,-48066,-48100,-48134,-48168,-48202,-48236,-48271,
+    -48304,-48338,-48372,-48406,-48440,-48474,-48508,-48542,
+    -48575,-48609,-48643,-48676,-48710,-48744,-48777,-48811,
+    -48844,-48878,-48911,-48945,-48978,-49012,-49045,-49078,
+    -49112,-49145,-49178,-49211,-49244,-49278,-49311,-49344,
+    -49377,-49410,-49443,-49476,-49509,-49542,-49575,-49608,
+    -49640,-49673,-49706,-49739,-49771,-49804,-49837,-49869,
+    -49902,-49935,-49967,-50000,-50032,-50065,-50097,-50129,
+    -50162,-50194,-50226,-50259,-50291,-50323,-50355,-50387,
+    -50420,-50452,-50484,-50516,-50548,-50580,-50612,-50644,
+    -50675,-50707,-50739,-50771,-50803,-50834,-50866,-50898,
+    -50929,-50961,-50993,-51024,-51056,-51087,-51119,-51150,
+    -51182,-51213,-51244,-51276,-51307,-51338,-51369,-51401,
+    -51432,-51463,-51494,-51525,-51556,-51587,-51618,-51649,
+    -51680,-51711,-51742,-51773,-51803,-51834,-51865,-51896,
+    -51926,-51957,-51988,-52018,-52049,-52079,-52110,-52140,
+    -52171,-52201,-52231,-52262,-52292,-52322,-52353,-52383,
+    -52413,-52443,-52473,-52503,-52534,-52564,-52594,-52624,
+    -52653,-52683,-52713,-52743,-52773,-52803,-52832,-52862,
+    -52892,-52922,-52951,-52981,-53010,-53040,-53069,-53099,
+    -53128,-53158,-53187,-53216,-53246,-53275,-53304,-53334,
+    -53363,-53392,-53421,-53450,-53479,-53508,-53537,-53566,
+    -53595,-53624,-53653,-53682,-53711,-53739,-53768,-53797,
+    -53826,-53854,-53883,-53911,-53940,-53969,-53997,-54026,
+    -54054,-54082,-54111,-54139,-54167,-54196,-54224,-54252,
+    -54280,-54308,-54337,-54365,-54393,-54421,-54449,-54477,
+    -54505,-54533,-54560,-54588,-54616,-54644,-54672,-54699,
+    -54727,-54755,-54782,-54810,-54837,-54865,-54892,-54920,
+    -54947,-54974,-55002,-55029,-55056,-55084,-55111,-55138,
+    -55165,-55192,-55219,-55246,-55274,-55300,-55327,-55354,
+    -55381,-55408,-55435,-55462,-55489,-55515,-55542,-55569,
+    -55595,-55622,-55648,-55675,-55701,-55728,-55754,-55781,
+    -55807,-55833,-55860,-55886,-55912,-55938,-55965,-55991,
+    -56017,-56043,-56069,-56095,-56121,-56147,-56173,-56199,
+    -56225,-56250,-56276,-56302,-56328,-56353,-56379,-56404,
+    -56430,-56456,-56481,-56507,-56532,-56557,-56583,-56608,
+    -56633,-56659,-56684,-56709,-56734,-56760,-56785,-56810,
+    -56835,-56860,-56885,-56910,-56935,-56959,-56984,-57009,
+    -57034,-57059,-57083,-57108,-57133,-57157,-57182,-57206,
+    -57231,-57255,-57280,-57304,-57329,-57353,-57377,-57402,
+    -57426,-57450,-57474,-57498,-57522,-57546,-57570,-57594,
+    -57618,-57642,-57666,-57690,-57714,-57738,-57762,-57785,
+    -57809,-57833,-57856,-57880,-57903,-57927,-57950,-57974,
+    -57997,-58021,-58044,-58067,-58091,-58114,-58137,-58160,
+    -58183,-58207,-58230,-58253,-58276,-58299,-58322,-58345,
+    -58367,-58390,-58413,-58436,-58459,-58481,-58504,-58527,
+    -58549,-58572,-58594,-58617,-58639,-58662,-58684,-58706,
+    -58729,-58751,-58773,-58795,-58818,-58840,-58862,-58884,
+    -58906,-58928,-58950,-58972,-58994,-59016,-59038,-59059,
+    -59081,-59103,-59125,-59146,-59168,-59190,-59211,-59233,
+    -59254,-59276,-59297,-59318,-59340,-59361,-59382,-59404,
+    -59425,-59446,-59467,-59488,-59509,-59530,-59551,-59572,
+    -59593,-59614,-59635,-59656,-59677,-59697,-59718,-59739,
+    -59759,-59780,-59801,-59821,-59842,-59862,-59883,-59903,
+    -59923,-59944,-59964,-59984,-60004,-60025,-60045,-60065,
+    -60085,-60105,-60125,-60145,-60165,-60185,-60205,-60225,
+    -60244,-60264,-60284,-60304,-60323,-60343,-60363,-60382,
+    -60402,-60421,-60441,-60460,-60479,-60499,-60518,-60537,
+    -60556,-60576,-60595,-60614,-60633,-60652,-60671,-60690,
+    -60709,-60728,-60747,-60766,-60785,-60803,-60822,-60841,
+    -60859,-60878,-60897,-60915,-60934,-60952,-60971,-60989,
+    -61007,-61026,-61044,-61062,-61081,-61099,-61117,-61135,
+    -61153,-61171,-61189,-61207,-61225,-61243,-61261,-61279,
+    -61297,-61314,-61332,-61350,-61367,-61385,-61403,-61420,
+    -61438,-61455,-61473,-61490,-61507,-61525,-61542,-61559,
+    -61577,-61594,-61611,-61628,-61645,-61662,-61679,-61696,
+    -61713,-61730,-61747,-61764,-61780,-61797,-61814,-61831,
+    -61847,-61864,-61880,-61897,-61913,-61930,-61946,-61963,
+    -61979,-61995,-62012,-62028,-62044,-62060,-62076,-62092,
+    -62108,-62125,-62141,-62156,-62172,-62188,-62204,-62220,
+    -62236,-62251,-62267,-62283,-62298,-62314,-62329,-62345,
+    -62360,-62376,-62391,-62407,-62422,-62437,-62453,-62468,
+    -62483,-62498,-62513,-62528,-62543,-62558,-62573,-62588,
+    -62603,-62618,-62633,-62648,-62662,-62677,-62692,-62706,
+    -62721,-62735,-62750,-62764,-62779,-62793,-62808,-62822,
+    -62836,-62850,-62865,-62879,-62893,-62907,-62921,-62935,
+    -62949,-62963,-62977,-62991,-63005,-63019,-63032,-63046,
+    -63060,-63074,-63087,-63101,-63114,-63128,-63141,-63155,
+    -63168,-63182,-63195,-63208,-63221,-63235,-63248,-63261,
+    -63274,-63287,-63300,-63313,-63326,-63339,-63352,-63365,
+    -63378,-63390,-63403,-63416,-63429,-63441,-63454,-63466,
+    -63479,-63491,-63504,-63516,-63528,-63541,-63553,-63565,
+    -63578,-63590,-63602,-63614,-63626,-63638,-63650,-63662,
+    -63674,-63686,-63698,-63709,-63721,-63733,-63745,-63756,
+    -63768,-63779,-63791,-63803,-63814,-63825,-63837,-63848,
+    -63859,-63871,-63882,-63893,-63904,-63915,-63927,-63938,
+    -63949,-63960,-63971,-63981,-63992,-64003,-64014,-64025,
+    -64035,-64046,-64057,-64067,-64078,-64088,-64099,-64109,
+    -64120,-64130,-64140,-64151,-64161,-64171,-64181,-64192,
+    -64202,-64212,-64222,-64232,-64242,-64252,-64261,-64271,
+    -64281,-64291,-64301,-64310,-64320,-64330,-64339,-64349,
+    -64358,-64368,-64377,-64387,-64396,-64405,-64414,-64424,
+    -64433,-64442,-64451,-64460,-64469,-64478,-64487,-64496,
+    -64505,-64514,-64523,-64532,-64540,-64549,-64558,-64566,
+    -64575,-64584,-64592,-64601,-64609,-64617,-64626,-64634,
+    -64642,-64651,-64659,-64667,-64675,-64683,-64691,-64699,
+    -64707,-64715,-64723,-64731,-64739,-64747,-64754,-64762,
+    -64770,-64777,-64785,-64793,-64800,-64808,-64815,-64822,
+    -64830,-64837,-64844,-64852,-64859,-64866,-64873,-64880,
+    -64887,-64895,-64902,-64908,-64915,-64922,-64929,-64936,
+    -64943,-64949,-64956,-64963,-64969,-64976,-64982,-64989,
+    -64995,-65002,-65008,-65015,-65021,-65027,-65033,-65040,
+    -65046,-65052,-65058,-65064,-65070,-65076,-65082,-65088,
+    -65094,-65099,-65105,-65111,-65117,-65122,-65128,-65133,
+    -65139,-65144,-65150,-65155,-65161,-65166,-65171,-65177,
+    -65182,-65187,-65192,-65197,-65202,-65207,-65212,-65217,
+    -65222,-65227,-65232,-65237,-65242,-65246,-65251,-65256,
+    -65260,-65265,-65270,-65274,-65279,-65283,-65287,-65292,
+    -65296,-65300,-65305,-65309,-65313,-65317,-65321,-65325,
+    -65329,-65333,-65337,-65341,-65345,-65349,-65352,-65356,
+    -65360,-65363,-65367,-65371,-65374,-65378,-65381,-65385,
+    -65388,-65391,-65395,-65398,-65401,-65404,-65408,-65411,
+    -65414,-65417,-65420,-65423,-65426,-65429,-65431,-65434,
+    -65437,-65440,-65442,-65445,-65448,-65450,-65453,-65455,
+    -65458,-65460,-65463,-65465,-65467,-65470,-65472,-65474,
+    -65476,-65478,-65480,-65482,-65484,-65486,-65488,-65490,
+    -65492,-65494,-65496,-65497,-65499,-65501,-65502,-65504,
+    -65505,-65507,-65508,-65510,-65511,-65513,-65514,-65515,
+    -65516,-65518,-65519,-65520,-65521,-65522,-65523,-65524,
+    -65525,-65526,-65527,-65527,-65528,-65529,-65530,-65530,
+    -65531,-65531,-65532,-65532,-65533,-65533,-65534,-65534,
+    -65534,-65535,-65535,-65535,-65535,-65535,-65535,-65535,
+    -65535,-65535,-65535,-65535,-65535,-65535,-65535,-65534,
+    -65534,-65534,-65533,-65533,-65532,-65532,-65531,-65531,
+    -65530,-65530,-65529,-65528,-65527,-65527,-65526,-65525,
+    -65524,-65523,-65522,-65521,-65520,-65519,-65518,-65516,
+    -65515,-65514,-65513,-65511,-65510,-65508,-65507,-65505,
+    -65504,-65502,-65501,-65499,-65497,-65496,-65494,-65492,
+    -65490,-65488,-65486,-65484,-65482,-65480,-65478,-65476,
+    -65474,-65472,-65470,-65467,-65465,-65463,-65460,-65458,
+    -65455,-65453,-65450,-65448,-65445,-65442,-65440,-65437,
+    -65434,-65431,-65429,-65426,-65423,-65420,-65417,-65414,
+    -65411,-65408,-65404,-65401,-65398,-65395,-65391,-65388,
+    -65385,-65381,-65378,-65374,-65371,-65367,-65363,-65360,
+    -65356,-65352,-65349,-65345,-65341,-65337,-65333,-65329,
+    -65325,-65321,-65317,-65313,-65309,-65305,-65300,-65296,
+    -65292,-65287,-65283,-65279,-65274,-65270,-65265,-65260,
+    -65256,-65251,-65246,-65242,-65237,-65232,-65227,-65222,
+    -65217,-65212,-65207,-65202,-65197,-65192,-65187,-65182,
+    -65177,-65171,-65166,-65161,-65155,-65150,-65144,-65139,
+    -65133,-65128,-65122,-65117,-65111,-65105,-65099,-65094,
+    -65088,-65082,-65076,-65070,-65064,-65058,-65052,-65046,
+    -65040,-65033,-65027,-65021,-65015,-65008,-65002,-64995,
+    -64989,-64982,-64976,-64969,-64963,-64956,-64949,-64943,
+    -64936,-64929,-64922,-64915,-64908,-64902,-64895,-64887,
+    -64880,-64873,-64866,-64859,-64852,-64844,-64837,-64830,
+    -64822,-64815,-64808,-64800,-64793,-64785,-64777,-64770,
+    -64762,-64754,-64747,-64739,-64731,-64723,-64715,-64707,
+    -64699,-64691,-64683,-64675,-64667,-64659,-64651,-64642,
+    -64634,-64626,-64617,-64609,-64601,-64592,-64584,-64575,
+    -64566,-64558,-64549,-64540,-64532,-64523,-64514,-64505,
+    -64496,-64487,-64478,-64469,-64460,-64451,-64442,-64433,
+    -64424,-64414,-64405,-64396,-64387,-64377,-64368,-64358,
+    -64349,-64339,-64330,-64320,-64310,-64301,-64291,-64281,
+    -64271,-64261,-64252,-64242,-64232,-64222,-64212,-64202,
+    -64192,-64181,-64171,-64161,-64151,-64140,-64130,-64120,
+    -64109,-64099,-64088,-64078,-64067,-64057,-64046,-64035,
+    -64025,-64014,-64003,-63992,-63981,-63971,-63960,-63949,
+    -63938,-63927,-63915,-63904,-63893,-63882,-63871,-63859,
+    -63848,-63837,-63825,-63814,-63803,-63791,-63779,-63768,
+    -63756,-63745,-63733,-63721,-63709,-63698,-63686,-63674,
+    -63662,-63650,-63638,-63626,-63614,-63602,-63590,-63578,
+    -63565,-63553,-63541,-63528,-63516,-63504,-63491,-63479,
+    -63466,-63454,-63441,-63429,-63416,-63403,-63390,-63378,
+    -63365,-63352,-63339,-63326,-63313,-63300,-63287,-63274,
+    -63261,-63248,-63235,-63221,-63208,-63195,-63182,-63168,
+    -63155,-63141,-63128,-63114,-63101,-63087,-63074,-63060,
+    -63046,-63032,-63019,-63005,-62991,-62977,-62963,-62949,
+    -62935,-62921,-62907,-62893,-62879,-62865,-62850,-62836,
+    -62822,-62808,-62793,-62779,-62764,-62750,-62735,-62721,
+    -62706,-62692,-62677,-62662,-62648,-62633,-62618,-62603,
+    -62588,-62573,-62558,-62543,-62528,-62513,-62498,-62483,
+    -62468,-62453,-62437,-62422,-62407,-62391,-62376,-62360,
+    -62345,-62329,-62314,-62298,-62283,-62267,-62251,-62236,
+    -62220,-62204,-62188,-62172,-62156,-62141,-62125,-62108,
+    -62092,-62076,-62060,-62044,-62028,-62012,-61995,-61979,
+    -61963,-61946,-61930,-61913,-61897,-61880,-61864,-61847,
+    -61831,-61814,-61797,-61780,-61764,-61747,-61730,-61713,
+    -61696,-61679,-61662,-61645,-61628,-61611,-61594,-61577,
+    -61559,-61542,-61525,-61507,-61490,-61473,-61455,-61438,
+    -61420,-61403,-61385,-61367,-61350,-61332,-61314,-61297,
+    -61279,-61261,-61243,-61225,-61207,-61189,-61171,-61153,
+    -61135,-61117,-61099,-61081,-61062,-61044,-61026,-61007,
+    -60989,-60971,-60952,-60934,-60915,-60897,-60878,-60859,
+    -60841,-60822,-60803,-60785,-60766,-60747,-60728,-60709,
+    -60690,-60671,-60652,-60633,-60614,-60595,-60576,-60556,
+    -60537,-60518,-60499,-60479,-60460,-60441,-60421,-60402,
+    -60382,-60363,-60343,-60323,-60304,-60284,-60264,-60244,
+    -60225,-60205,-60185,-60165,-60145,-60125,-60105,-60085,
+    -60065,-60045,-60025,-60004,-59984,-59964,-59944,-59923,
+    -59903,-59883,-59862,-59842,-59821,-59801,-59780,-59759,
+    -59739,-59718,-59697,-59677,-59656,-59635,-59614,-59593,
+    -59572,-59551,-59530,-59509,-59488,-59467,-59446,-59425,
+    -59404,-59382,-59361,-59340,-59318,-59297,-59276,-59254,
+    -59233,-59211,-59189,-59168,-59146,-59125,-59103,-59081,
+    -59059,-59038,-59016,-58994,-58972,-58950,-58928,-58906,
+    -58884,-58862,-58840,-58818,-58795,-58773,-58751,-58729,
+    -58706,-58684,-58662,-58639,-58617,-58594,-58572,-58549,
+    -58527,-58504,-58481,-58459,-58436,-58413,-58390,-58367,
+    -58345,-58322,-58299,-58276,-58253,-58230,-58207,-58183,
+    -58160,-58137,-58114,-58091,-58067,-58044,-58021,-57997,
+    -57974,-57950,-57927,-57903,-57880,-57856,-57833,-57809,
+    -57785,-57762,-57738,-57714,-57690,-57666,-57642,-57618,
+    -57594,-57570,-57546,-57522,-57498,-57474,-57450,-57426,
+    -57402,-57377,-57353,-57329,-57304,-57280,-57255,-57231,
+    -57206,-57182,-57157,-57133,-57108,-57083,-57059,-57034,
+    -57009,-56984,-56959,-56935,-56910,-56885,-56860,-56835,
+    -56810,-56785,-56760,-56734,-56709,-56684,-56659,-56633,
+    -56608,-56583,-56557,-56532,-56507,-56481,-56456,-56430,
+    -56404,-56379,-56353,-56328,-56302,-56276,-56250,-56225,
+    -56199,-56173,-56147,-56121,-56095,-56069,-56043,-56017,
+    -55991,-55965,-55938,-55912,-55886,-55860,-55833,-55807,
+    -55781,-55754,-55728,-55701,-55675,-55648,-55622,-55595,
+    -55569,-55542,-55515,-55489,-55462,-55435,-55408,-55381,
+    -55354,-55327,-55300,-55274,-55246,-55219,-55192,-55165,
+    -55138,-55111,-55084,-55056,-55029,-55002,-54974,-54947,
+    -54920,-54892,-54865,-54837,-54810,-54782,-54755,-54727,
+    -54699,-54672,-54644,-54616,-54588,-54560,-54533,-54505,
+    -54477,-54449,-54421,-54393,-54365,-54337,-54308,-54280,
+    -54252,-54224,-54196,-54167,-54139,-54111,-54082,-54054,
+    -54026,-53997,-53969,-53940,-53911,-53883,-53854,-53826,
+    -53797,-53768,-53739,-53711,-53682,-53653,-53624,-53595,
+    -53566,-53537,-53508,-53479,-53450,-53421,-53392,-53363,
+    -53334,-53304,-53275,-53246,-53216,-53187,-53158,-53128,
+    -53099,-53069,-53040,-53010,-52981,-52951,-52922,-52892,
+    -52862,-52832,-52803,-52773,-52743,-52713,-52683,-52653,
+    -52624,-52594,-52564,-52534,-52503,-52473,-52443,-52413,
+    -52383,-52353,-52322,-52292,-52262,-52231,-52201,-52171,
+    -52140,-52110,-52079,-52049,-52018,-51988,-51957,-51926,
+    -51896,-51865,-51834,-51803,-51773,-51742,-51711,-51680,
+    -51649,-51618,-51587,-51556,-51525,-51494,-51463,-51432,
+    -51401,-51369,-51338,-51307,-51276,-51244,-51213,-51182,
+    -51150,-51119,-51087,-51056,-51024,-50993,-50961,-50929,
+    -50898,-50866,-50834,-50803,-50771,-50739,-50707,-50675,
+    -50644,-50612,-50580,-50548,-50516,-50484,-50452,-50420,
+    -50387,-50355,-50323,-50291,-50259,-50226,-50194,-50162,
+    -50129,-50097,-50065,-50032,-50000,-49967,-49935,-49902,
+    -49869,-49837,-49804,-49771,-49739,-49706,-49673,-49640,
+    -49608,-49575,-49542,-49509,-49476,-49443,-49410,-49377,
+    -49344,-49311,-49278,-49244,-49211,-49178,-49145,-49112,
+    -49078,-49045,-49012,-48978,-48945,-48911,-48878,-48844,
+    -48811,-48777,-48744,-48710,-48676,-48643,-48609,-48575,
+    -48542,-48508,-48474,-48440,-48406,-48372,-48338,-48305,
+    -48271,-48237,-48202,-48168,-48134,-48100,-48066,-48032,
+    -47998,-47963,-47929,-47895,-47860,-47826,-47792,-47757,
+    -47723,-47688,-47654,-47619,-47585,-47550,-47516,-47481,
+    -47446,-47412,-47377,-47342,-47307,-47273,-47238,-47203,
+    -47168,-47133,-47098,-47063,-47028,-46993,-46958,-46923,
+    -46888,-46853,-46818,-46783,-46747,-46712,-46677,-46642,
+    -46606,-46571,-46536,-46500,-46465,-46429,-46394,-46358,
+    -46323,-46287,-46251,-46216,-46180,-46145,-46109,-46073,
+    -46037,-46002,-45966,-45930,-45894,-45858,-45822,-45786,
+    -45750,-45714,-45678,-45642,-45606,-45570,-45534,-45498,
+    -45462,-45425,-45389,-45353,-45316,-45280,-45244,-45207,
+    -45171,-45135,-45098,-45062,-45025,-44989,-44952,-44915,
+    -44879,-44842,-44806,-44769,-44732,-44695,-44659,-44622,
+    -44585,-44548,-44511,-44474,-44437,-44400,-44363,-44326,
+    -44289,-44252,-44215,-44178,-44141,-44104,-44067,-44029,
+    -43992,-43955,-43918,-43880,-43843,-43806,-43768,-43731,
+    -43693,-43656,-43618,-43581,-43543,-43506,-43468,-43430,
+    -43393,-43355,-43317,-43280,-43242,-43204,-43166,-43128,
+    -43091,-43053,-43015,-42977,-42939,-42901,-42863,-42825,
+    -42787,-42749,-42711,-42672,-42634,-42596,-42558,-42520,
+    -42481,-42443,-42405,-42366,-42328,-42290,-42251,-42213,
+    -42174,-42136,-42097,-42059,-42020,-41982,-41943,-41904,
+    -41866,-41827,-41788,-41750,-41711,-41672,-41633,-41595,
+    -41556,-41517,-41478,-41439,-41400,-41361,-41322,-41283,
+    -41244,-41205,-41166,-41127,-41087,-41048,-41009,-40970,
+    -40931,-40891,-40852,-40813,-40773,-40734,-40695,-40655,
+    -40616,-40576,-40537,-40497,-40458,-40418,-40379,-40339,
+    -40299,-40260,-40220,-40180,-40141,-40101,-40061,-40021,
+    -39982,-39942,-39902,-39862,-39822,-39782,-39742,-39702,
+    -39662,-39622,-39582,-39542,-39502,-39462,-39422,-39382,
+    -39341,-39301,-39261,-39221,-39180,-39140,-39100,-39059,
+    -39019,-38979,-38938,-38898,-38857,-38817,-38776,-38736,
+    -38695,-38655,-38614,-38573,-38533,-38492,-38451,-38411,
+    -38370,-38329,-38288,-38248,-38207,-38166,-38125,-38084,
+    -38043,-38002,-37961,-37920,-37879,-37838,-37797,-37756,
+    -37715,-37674,-37633,-37592,-37550,-37509,-37468,-37427,
+    -37386,-37344,-37303,-37262,-37220,-37179,-37137,-37096,
+    -37055,-37013,-36972,-36930,-36889,-36847,-36805,-36764,
+    -36722,-36681,-36639,-36597,-36556,-36514,-36472,-36430,
+    -36388,-36347,-36305,-36263,-36221,-36179,-36137,-36095,
+    -36053,-36011,-35969,-35927,-35885,-35843,-35801,-35759,
+    -35717,-35675,-35633,-35590,-35548,-35506,-35464,-35421,
+    -35379,-35337,-35294,-35252,-35210,-35167,-35125,-35082,
+    -35040,-34997,-34955,-34912,-34870,-34827,-34785,-34742,
+    -34699,-34657,-34614,-34571,-34529,-34486,-34443,-34400,
+    -34358,-34315,-34272,-34229,-34186,-34143,-34100,-34057,
+    -34015,-33972,-33929,-33886,-33843,-33799,-33756,-33713,
+    -33670,-33627,-33584,-33541,-33498,-33454,-33411,-33368,
+    -33325,-33281,-33238,-33195,-33151,-33108,-33065,-33021,
+    -32978,-32934,-32891,-32847,-32804,-32760,-32717,-32673,
+    -32630,-32586,-32542,-32499,-32455,-32411,-32368,-32324,
+    -32280,-32236,-32193,-32149,-32105,-32061,-32017,-31974,
+    -31930,-31886,-31842,-31798,-31754,-31710,-31666,-31622,
+    -31578,-31534,-31490,-31446,-31402,-31357,-31313,-31269,
+    -31225,-31181,-31136,-31092,-31048,-31004,-30959,-30915,
+    -30871,-30826,-30782,-30738,-30693,-30649,-30604,-30560,
+    -30515,-30471,-30426,-30382,-30337,-30293,-30248,-30204,
+    -30159,-30114,-30070,-30025,-29980,-29936,-29891,-29846,
+    -29801,-29757,-29712,-29667,-29622,-29577,-29533,-29488,
+    -29443,-29398,-29353,-29308,-29263,-29218,-29173,-29128,
+    -29083,-29038,-28993,-28948,-28903,-28858,-28812,-28767,
+    -28722,-28677,-28632,-28586,-28541,-28496,-28451,-28405,
+    -28360,-28315,-28269,-28224,-28179,-28133,-28088,-28042,
+    -27997,-27952,-27906,-27861,-27815,-27770,-27724,-27678,
+    -27633,-27587,-27542,-27496,-27450,-27405,-27359,-27313,
+    -27268,-27222,-27176,-27131,-27085,-27039,-26993,-26947,
+    -26902,-26856,-26810,-26764,-26718,-26672,-26626,-26580,
+    -26534,-26488,-26442,-26396,-26350,-26304,-26258,-26212,
+    -26166,-26120,-26074,-26028,-25982,-25936,-25889,-25843,
+    -25797,-25751,-25705,-25658,-25612,-25566,-25520,-25473,
+    -25427,-25381,-25334,-25288,-25241,-25195,-25149,-25102,
+    -25056,-25009,-24963,-24916,-24870,-24823,-24777,-24730,
+    -24684,-24637,-24591,-24544,-24497,-24451,-24404,-24357,
+    -24311,-24264,-24217,-24171,-24124,-24077,-24030,-23984,
+    -23937,-23890,-23843,-23796,-23750,-23703,-23656,-23609,
+    -23562,-23515,-23468,-23421,-23374,-23327,-23280,-23233,
+    -23186,-23139,-23092,-23045,-22998,-22951,-22904,-22857,
+    -22810,-22763,-22716,-22668,-22621,-22574,-22527,-22480,
+    -22432,-22385,-22338,-22291,-22243,-22196,-22149,-22102,
+    -22054,-22007,-21960,-21912,-21865,-21817,-21770,-21723,
+    -21675,-21628,-21580,-21533,-21485,-21438,-21390,-21343,
+    -21295,-21248,-21200,-21153,-21105,-21057,-21010,-20962,
+    -20915,-20867,-20819,-20772,-20724,-20676,-20629,-20581,
+    -20533,-20485,-20438,-20390,-20342,-20294,-20246,-20199,
+    -20151,-20103,-20055,-20007,-19959,-19912,-19864,-19816,
+    -19768,-19720,-19672,-19624,-19576,-19528,-19480,-19432,
+    -19384,-19336,-19288,-19240,-19192,-19144,-19096,-19048,
+    -19000,-18951,-18903,-18855,-18807,-18759,-18711,-18663,
+    -18614,-18566,-18518,-18470,-18421,-18373,-18325,-18277,
+    -18228,-18180,-18132,-18084,-18035,-17987,-17939,-17890,
+    -17842,-17793,-17745,-17697,-17648,-17600,-17551,-17503,
+    -17455,-17406,-17358,-17309,-17261,-17212,-17164,-17115,
+    -17067,-17018,-16970,-16921,-16872,-16824,-16775,-16727,
+    -16678,-16629,-16581,-16532,-16484,-16435,-16386,-16338,
+    -16289,-16240,-16191,-16143,-16094,-16045,-15997,-15948,
+    -15899,-15850,-15802,-15753,-15704,-15655,-15606,-15557,
+    -15509,-15460,-15411,-15362,-15313,-15264,-15215,-15167,
+    -15118,-15069,-15020,-14971,-14922,-14873,-14824,-14775,
+    -14726,-14677,-14628,-14579,-14530,-14481,-14432,-14383,
+    -14334,-14285,-14236,-14187,-14138,-14089,-14040,-13990,
+    -13941,-13892,-13843,-13794,-13745,-13696,-13647,-13597,
+    -13548,-13499,-13450,-13401,-13351,-13302,-13253,-13204,
+    -13154,-13105,-13056,-13007,-12957,-12908,-12859,-12810,
+    -12760,-12711,-12662,-12612,-12563,-12514,-12464,-12415,
+    -12366,-12316,-12267,-12217,-12168,-12119,-12069,-12020,
+    -11970,-11921,-11872,-11822,-11773,-11723,-11674,-11624,
+    -11575,-11525,-11476,-11426,-11377,-11327,-11278,-11228,
+    -11179,-11129,-11080,-11030,-10981,-10931,-10882,-10832,
+    -10782,-10733,-10683,-10634,-10584,-10534,-10485,-10435,
+    -10386,-10336,-10286,-10237,-10187,-10137,-10088,-10038,
+    -9988,-9939,-9889,-9839,-9790,-9740,-9690,-9640,
+    -9591,-9541,-9491,-9442,-9392,-9342,-9292,-9243,
+    -9193,-9143,-9093,-9043,-8994,-8944,-8894,-8844,
+    -8794,-8745,-8695,-8645,-8595,-8545,-8496,-8446,
+    -8396,-8346,-8296,-8246,-8196,-8147,-8097,-8047,
+    -7997,-7947,-7897,-7847,-7797,-7747,-7697,-7648,
+    -7598,-7548,-7498,-7448,-7398,-7348,-7298,-7248,
+    -7198,-7148,-7098,-7048,-6998,-6948,-6898,-6848,
+    -6798,-6748,-6698,-6648,-6598,-6548,-6498,-6448,
+    -6398,-6348,-6298,-6248,-6198,-6148,-6098,-6048,
+    -5998,-5948,-5898,-5848,-5798,-5747,-5697,-5647,
+    -5597,-5547,-5497,-5447,-5397,-5347,-5297,-5247,
+    -5197,-5146,-5096,-5046,-4996,-4946,-4896,-4846,
+    -4796,-4745,-4695,-4645,-4595,-4545,-4495,-4445,
+    -4394,-4344,-4294,-4244,-4194,-4144,-4093,-4043,
+    -3993,-3943,-3893,-3843,-3792,-3742,-3692,-3642,
+    -3592,-3541,-3491,-3441,-3391,-3341,-3291,-3240,
+    -3190,-3140,-3090,-3039,-2989,-2939,-2889,-2839,
+    -2788,-2738,-2688,-2638,-2588,-2537,-2487,-2437,
+    -2387,-2336,-2286,-2236,-2186,-2135,-2085,-2035,
+    -1985,-1934,-1884,-1834,-1784,-1733,-1683,-1633,
+    -1583,-1532,-1482,-1432,-1382,-1331,-1281,-1231,
+    -1181,-1130,-1080,-1030,-980,-929,-879,-829,
+    -779,-728,-678,-628,-578,-527,-477,-427,
+    -376,-326,-276,-226,-175,-125,-75,-25,
+    25,75,125,175,226,276,326,376,
+    427,477,527,578,628,678,728,779,
+    829,879,929,980,1030,1080,1130,1181,
+    1231,1281,1331,1382,1432,1482,1532,1583,
+    1633,1683,1733,1784,1834,1884,1934,1985,
+    2035,2085,2135,2186,2236,2286,2336,2387,
+    2437,2487,2537,2587,2638,2688,2738,2788,
+    2839,2889,2939,2989,3039,3090,3140,3190,
+    3240,3291,3341,3391,3441,3491,3542,3592,
+    3642,3692,3742,3792,3843,3893,3943,3993,
+    4043,4093,4144,4194,4244,4294,4344,4394,
+    4445,4495,4545,4595,4645,4695,4745,4796,
+    4846,4896,4946,4996,5046,5096,5146,5197,
+    5247,5297,5347,5397,5447,5497,5547,5597,
+    5647,5697,5747,5798,5848,5898,5948,5998,
+    6048,6098,6148,6198,6248,6298,6348,6398,
+    6448,6498,6548,6598,6648,6698,6748,6798,
+    6848,6898,6948,6998,7048,7098,7148,7198,
+    7248,7298,7348,7398,7448,7498,7548,7598,
+    7648,7697,7747,7797,7847,7897,7947,7997,
+    8047,8097,8147,8196,8246,8296,8346,8396,
+    8446,8496,8545,8595,8645,8695,8745,8794,
+    8844,8894,8944,8994,9043,9093,9143,9193,
+    9243,9292,9342,9392,9442,9491,9541,9591,
+    9640,9690,9740,9790,9839,9889,9939,9988,
+    10038,10088,10137,10187,10237,10286,10336,10386,
+    10435,10485,10534,10584,10634,10683,10733,10782,
+    10832,10882,10931,10981,11030,11080,11129,11179,
+    11228,11278,11327,11377,11426,11476,11525,11575,
+    11624,11674,11723,11773,11822,11872,11921,11970,
+    12020,12069,12119,12168,12218,12267,12316,12366,
+    12415,12464,12514,12563,12612,12662,12711,12760,
+    12810,12859,12908,12957,13007,13056,13105,13154,
+    13204,13253,13302,13351,13401,13450,13499,13548,
+    13597,13647,13696,13745,13794,13843,13892,13941,
+    13990,14040,14089,14138,14187,14236,14285,14334,
+    14383,14432,14481,14530,14579,14628,14677,14726,
+    14775,14824,14873,14922,14971,15020,15069,15118,
+    15167,15215,15264,15313,15362,15411,15460,15509,
+    15557,15606,15655,15704,15753,15802,15850,15899,
+    15948,15997,16045,16094,16143,16191,16240,16289,
+    16338,16386,16435,16484,16532,16581,16629,16678,
+    16727,16775,16824,16872,16921,16970,17018,17067,
+    17115,17164,17212,17261,17309,17358,17406,17455,
+    17503,17551,17600,17648,17697,17745,17793,17842,
+    17890,17939,17987,18035,18084,18132,18180,18228,
+    18277,18325,18373,18421,18470,18518,18566,18614,
+    18663,18711,18759,18807,18855,18903,18951,19000,
+    19048,19096,19144,19192,19240,19288,19336,19384,
+    19432,19480,19528,19576,19624,19672,19720,19768,
+    19816,19864,19912,19959,20007,20055,20103,20151,
+    20199,20246,20294,20342,20390,20438,20485,20533,
+    20581,20629,20676,20724,20772,20819,20867,20915,
+    20962,21010,21057,21105,21153,21200,21248,21295,
+    21343,21390,21438,21485,21533,21580,21628,21675,
+    21723,21770,21817,21865,21912,21960,22007,22054,
+    22102,22149,22196,22243,22291,22338,22385,22432,
+    22480,22527,22574,22621,22668,22716,22763,22810,
+    22857,22904,22951,22998,23045,23092,23139,23186,
+    23233,23280,23327,23374,23421,23468,23515,23562,
+    23609,23656,23703,23750,23796,23843,23890,23937,
+    23984,24030,24077,24124,24171,24217,24264,24311,
+    24357,24404,24451,24497,24544,24591,24637,24684,
+    24730,24777,24823,24870,24916,24963,25009,25056,
+    25102,25149,25195,25241,25288,25334,25381,25427,
+    25473,25520,25566,25612,25658,25705,25751,25797,
+    25843,25889,25936,25982,26028,26074,26120,26166,
+    26212,26258,26304,26350,26396,26442,26488,26534,
+    26580,26626,26672,26718,26764,26810,26856,26902,
+    26947,26993,27039,27085,27131,27176,27222,27268,
+    27313,27359,27405,27450,27496,27542,27587,27633,
+    27678,27724,27770,27815,27861,27906,27952,27997,
+    28042,28088,28133,28179,28224,28269,28315,28360,
+    28405,28451,28496,28541,28586,28632,28677,28722,
+    28767,28812,28858,28903,28948,28993,29038,29083,
+    29128,29173,29218,29263,29308,29353,29398,29443,
+    29488,29533,29577,29622,29667,29712,29757,29801,
+    29846,29891,29936,29980,30025,30070,30114,30159,
+    30204,30248,30293,30337,30382,30427,30471,30516,
+    30560,30604,30649,30693,30738,30782,30826,30871,
+    30915,30959,31004,31048,31092,31136,31181,31225,
+    31269,31313,31357,31402,31446,31490,31534,31578,
+    31622,31666,31710,31754,31798,31842,31886,31930,
+    31974,32017,32061,32105,32149,32193,32236,32280,
+    32324,32368,32411,32455,32499,32542,32586,32630,
+    32673,32717,32760,32804,32847,32891,32934,32978,
+    33021,33065,33108,33151,33195,33238,33281,33325,
+    33368,33411,33454,33498,33541,33584,33627,33670,
+    33713,33756,33799,33843,33886,33929,33972,34015,
+    34057,34100,34143,34186,34229,34272,34315,34358,
+    34400,34443,34486,34529,34571,34614,34657,34699,
+    34742,34785,34827,34870,34912,34955,34997,35040,
+    35082,35125,35167,35210,35252,35294,35337,35379,
+    35421,35464,35506,35548,35590,35633,35675,35717,
+    35759,35801,35843,35885,35927,35969,36011,36053,
+    36095,36137,36179,36221,36263,36305,36347,36388,
+    36430,36472,36514,36556,36597,36639,36681,36722,
+    36764,36805,36847,36889,36930,36972,37013,37055,
+    37096,37137,37179,37220,37262,37303,37344,37386,
+    37427,37468,37509,37551,37592,37633,37674,37715,
+    37756,37797,37838,37879,37920,37961,38002,38043,
+    38084,38125,38166,38207,38248,38288,38329,38370,
+    38411,38451,38492,38533,38573,38614,38655,38695,
+    38736,38776,38817,38857,38898,38938,38979,39019,
+    39059,39100,39140,39180,39221,39261,39301,39341,
+    39382,39422,39462,39502,39542,39582,39622,39662,
+    39702,39742,39782,39822,39862,39902,39942,39982,
+    40021,40061,40101,40141,40180,40220,40260,40299,
+    40339,40379,40418,40458,40497,40537,40576,40616,
+    40655,40695,40734,40773,40813,40852,40891,40931,
+    40970,41009,41048,41087,41127,41166,41205,41244,
+    41283,41322,41361,41400,41439,41478,41517,41556,
+    41595,41633,41672,41711,41750,41788,41827,41866,
+    41904,41943,41982,42020,42059,42097,42136,42174,
+    42213,42251,42290,42328,42366,42405,42443,42481,
+    42520,42558,42596,42634,42672,42711,42749,42787,
+    42825,42863,42901,42939,42977,43015,43053,43091,
+    43128,43166,43204,43242,43280,43317,43355,43393,
+    43430,43468,43506,43543,43581,43618,43656,43693,
+    43731,43768,43806,43843,43880,43918,43955,43992,
+    44029,44067,44104,44141,44178,44215,44252,44289,
+    44326,44363,44400,44437,44474,44511,44548,44585,
+    44622,44659,44695,44732,44769,44806,44842,44879,
+    44915,44952,44989,45025,45062,45098,45135,45171,
+    45207,45244,45280,45316,45353,45389,45425,45462,
+    45498,45534,45570,45606,45642,45678,45714,45750,
+    45786,45822,45858,45894,45930,45966,46002,46037,
+    46073,46109,46145,46180,46216,46252,46287,46323,
+    46358,46394,46429,46465,46500,46536,46571,46606,
+    46642,46677,46712,46747,46783,46818,46853,46888,
+    46923,46958,46993,47028,47063,47098,47133,47168,
+    47203,47238,47273,47308,47342,47377,47412,47446,
+    47481,47516,47550,47585,47619,47654,47688,47723,
+    47757,47792,47826,47861,47895,47929,47963,47998,
+    48032,48066,48100,48134,48168,48202,48237,48271,
+    48305,48338,48372,48406,48440,48474,48508,48542,
+    48575,48609,48643,48676,48710,48744,48777,48811,
+    48844,48878,48911,48945,48978,49012,49045,49078,
+    49112,49145,49178,49211,49244,49278,49311,49344,
+    49377,49410,49443,49476,49509,49542,49575,49608,
+    49640,49673,49706,49739,49771,49804,49837,49869,
+    49902,49935,49967,50000,50032,50064,50097,50129,
+    50162,50194,50226,50259,50291,50323,50355,50387,
+    50420,50452,50484,50516,50548,50580,50612,50644,
+    50675,50707,50739,50771,50803,50834,50866,50898,
+    50929,50961,50993,51024,51056,51087,51119,51150,
+    51182,51213,51244,51276,51307,51338,51369,51401,
+    51432,51463,51494,51525,51556,51587,51618,51649,
+    51680,51711,51742,51773,51803,51834,51865,51896,
+    51926,51957,51988,52018,52049,52079,52110,52140,
+    52171,52201,52231,52262,52292,52322,52353,52383,
+    52413,52443,52473,52503,52534,52564,52594,52624,
+    52653,52683,52713,52743,52773,52803,52832,52862,
+    52892,52922,52951,52981,53010,53040,53069,53099,
+    53128,53158,53187,53216,53246,53275,53304,53334,
+    53363,53392,53421,53450,53479,53508,53537,53566,
+    53595,53624,53653,53682,53711,53739,53768,53797,
+    53826,53854,53883,53912,53940,53969,53997,54026,
+    54054,54082,54111,54139,54167,54196,54224,54252,
+    54280,54309,54337,54365,54393,54421,54449,54477,
+    54505,54533,54560,54588,54616,54644,54672,54699,
+    54727,54755,54782,54810,54837,54865,54892,54920,
+    54947,54974,55002,55029,55056,55084,55111,55138,
+    55165,55192,55219,55246,55274,55300,55327,55354,
+    55381,55408,55435,55462,55489,55515,55542,55569,
+    55595,55622,55648,55675,55701,55728,55754,55781,
+    55807,55833,55860,55886,55912,55938,55965,55991,
+    56017,56043,56069,56095,56121,56147,56173,56199,
+    56225,56250,56276,56302,56328,56353,56379,56404,
+    56430,56456,56481,56507,56532,56557,56583,56608,
+    56633,56659,56684,56709,56734,56760,56785,56810,
+    56835,56860,56885,56910,56935,56959,56984,57009,
+    57034,57059,57083,57108,57133,57157,57182,57206,
+    57231,57255,57280,57304,57329,57353,57377,57402,
+    57426,57450,57474,57498,57522,57546,57570,57594,
+    57618,57642,57666,57690,57714,57738,57762,57785,
+    57809,57833,57856,57880,57903,57927,57950,57974,
+    57997,58021,58044,58067,58091,58114,58137,58160,
+    58183,58207,58230,58253,58276,58299,58322,58345,
+    58367,58390,58413,58436,58459,58481,58504,58527,
+    58549,58572,58594,58617,58639,58662,58684,58706,
+    58729,58751,58773,58795,58818,58840,58862,58884,
+    58906,58928,58950,58972,58994,59016,59038,59059,
+    59081,59103,59125,59146,59168,59190,59211,59233,
+    59254,59276,59297,59318,59340,59361,59382,59404,
+    59425,59446,59467,59488,59509,59530,59551,59572,
+    59593,59614,59635,59656,59677,59697,59718,59739,
+    59759,59780,59801,59821,59842,59862,59883,59903,
+    59923,59944,59964,59984,60004,60025,60045,60065,
+    60085,60105,60125,60145,60165,60185,60205,60225,
+    60244,60264,60284,60304,60323,60343,60363,60382,
+    60402,60421,60441,60460,60479,60499,60518,60537,
+    60556,60576,60595,60614,60633,60652,60671,60690,
+    60709,60728,60747,60766,60785,60803,60822,60841,
+    60859,60878,60897,60915,60934,60952,60971,60989,
+    61007,61026,61044,61062,61081,61099,61117,61135,
+    61153,61171,61189,61207,61225,61243,61261,61279,
+    61297,61314,61332,61350,61367,61385,61403,61420,
+    61438,61455,61473,61490,61507,61525,61542,61559,
+    61577,61594,61611,61628,61645,61662,61679,61696,
+    61713,61730,61747,61764,61780,61797,61814,61831,
+    61847,61864,61880,61897,61913,61930,61946,61963,
+    61979,61995,62012,62028,62044,62060,62076,62092,
+    62108,62125,62141,62156,62172,62188,62204,62220,
+    62236,62251,62267,62283,62298,62314,62329,62345,
+    62360,62376,62391,62407,62422,62437,62453,62468,
+    62483,62498,62513,62528,62543,62558,62573,62588,
+    62603,62618,62633,62648,62662,62677,62692,62706,
+    62721,62735,62750,62764,62779,62793,62808,62822,
+    62836,62850,62865,62879,62893,62907,62921,62935,
+    62949,62963,62977,62991,63005,63019,63032,63046,
+    63060,63074,63087,63101,63114,63128,63141,63155,
+    63168,63182,63195,63208,63221,63235,63248,63261,
+    63274,63287,63300,63313,63326,63339,63352,63365,
+    63378,63390,63403,63416,63429,63441,63454,63466,
+    63479,63491,63504,63516,63528,63541,63553,63565,
+    63578,63590,63602,63614,63626,63638,63650,63662,
+    63674,63686,63698,63709,63721,63733,63745,63756,
+    63768,63779,63791,63803,63814,63825,63837,63848,
+    63859,63871,63882,63893,63904,63915,63927,63938,
+    63949,63960,63971,63981,63992,64003,64014,64025,
+    64035,64046,64057,64067,64078,64088,64099,64109,
+    64120,64130,64140,64151,64161,64171,64181,64192,
+    64202,64212,64222,64232,64242,64252,64261,64271,
+    64281,64291,64301,64310,64320,64330,64339,64349,
+    64358,64368,64377,64387,64396,64405,64414,64424,
+    64433,64442,64451,64460,64469,64478,64487,64496,
+    64505,64514,64523,64532,64540,64549,64558,64566,
+    64575,64584,64592,64600,64609,64617,64626,64634,
+    64642,64651,64659,64667,64675,64683,64691,64699,
+    64707,64715,64723,64731,64739,64747,64754,64762,
+    64770,64777,64785,64793,64800,64808,64815,64822,
+    64830,64837,64844,64852,64859,64866,64873,64880,
+    64887,64895,64902,64908,64915,64922,64929,64936,
+    64943,64949,64956,64963,64969,64976,64982,64989,
+    64995,65002,65008,65015,65021,65027,65033,65040,
+    65046,65052,65058,65064,65070,65076,65082,65088,
+    65094,65099,65105,65111,65117,65122,65128,65133,
+    65139,65144,65150,65155,65161,65166,65171,65177,
+    65182,65187,65192,65197,65202,65207,65212,65217,
+    65222,65227,65232,65237,65242,65246,65251,65256,
+    65260,65265,65270,65274,65279,65283,65287,65292,
+    65296,65300,65305,65309,65313,65317,65321,65325,
+    65329,65333,65337,65341,65345,65349,65352,65356,
+    65360,65363,65367,65371,65374,65378,65381,65385,
+    65388,65391,65395,65398,65401,65404,65408,65411,
+    65414,65417,65420,65423,65426,65429,65431,65434,
+    65437,65440,65442,65445,65448,65450,65453,65455,
+    65458,65460,65463,65465,65467,65470,65472,65474,
+    65476,65478,65480,65482,65484,65486,65488,65490,
+    65492,65494,65496,65497,65499,65501,65502,65504,
+    65505,65507,65508,65510,65511,65513,65514,65515,
+    65516,65518,65519,65520,65521,65522,65523,65524,
+    65525,65526,65527,65527,65528,65529,65530,65530,
+    65531,65531,65532,65532,65533,65533,65534,65534,
+    65534,65535,65535,65535,65535,65535,65535,65535
+};
+
+const fixed_t *finecosine = &finesine[FINEANGLES/4];
+
+const angle_t tantoangle[2049] =
+{
+    0,333772,667544,1001315,1335086,1668857,2002626,2336395,
+    2670163,3003929,3337694,3671457,4005219,4338979,4672736,5006492,
+    5340245,5673995,6007743,6341488,6675230,7008968,7342704,7676435,
+    8010164,8343888,8677609,9011325,9345037,9678744,10012447,10346145,
+    10679838,11013526,11347209,11680887,12014558,12348225,12681885,13015539,
+    13349187,13682829,14016464,14350092,14683714,15017328,15350936,15684536,
+    16018129,16351714,16685291,17018860,17352422,17685974,18019518,18353054,
+    18686582,19020100,19353610,19687110,20020600,20354080,20687552,21021014,
+    21354466,21687906,22021338,22354758,22688168,23021568,23354956,23688332,
+    24021698,24355052,24688396,25021726,25355046,25688352,26021648,26354930,
+    26688200,27021456,27354702,27687932,28021150,28354356,28687548,29020724,
+    29353888,29687038,30020174,30353296,30686404,31019496,31352574,31685636,
+    32018684,32351718,32684734,33017736,33350722,33683692,34016648,34349584,
+    34682508,35015412,35348300,35681172,36014028,36346868,36679688,37012492,
+    37345276,37678044,38010792,38343524,38676240,39008936,39341612,39674272,
+    40006912,40339532,40672132,41004716,41337276,41669820,42002344,42334848,
+    42667332,42999796,43332236,43664660,43997060,44329444,44661800,44994140,
+    45326456,45658752,45991028,46323280,46655512,46987720,47319908,47652072,
+    47984212,48316332,48648428,48980500,49312548,49644576,49976580,50308556,
+    50640512,50972444,51304352,51636236,51968096,52299928,52631740,52963524,
+    53295284,53627020,53958728,54290412,54622068,54953704,55285308,55616888,
+    55948444,56279972,56611472,56942948,57274396,57605816,57937212,58268576,
+    58599916,58931228,59262512,59593768,59924992,60256192,60587364,60918508,
+    61249620,61580704,61911760,62242788,62573788,62904756,63235692,63566604,
+    63897480,64228332,64559148,64889940,65220696,65551424,65882120,66212788,
+    66543420,66874024,67204600,67535136,67865648,68196120,68526568,68856984,
+    69187360,69517712,69848024,70178304,70508560,70838776,71168960,71499112,
+    71829224,72159312,72489360,72819376,73149360,73479304,73809216,74139096,
+    74468936,74798744,75128520,75458264,75787968,76117632,76447264,76776864,
+    77106424,77435952,77765440,78094888,78424304,78753688,79083032,79412336,
+    79741608,80070840,80400032,80729192,81058312,81387392,81716432,82045440,
+    82374408,82703336,83032224,83361080,83689896,84018664,84347400,84676096,
+    85004760,85333376,85661952,85990488,86318984,86647448,86975864,87304240,
+    87632576,87960872,88289128,88617344,88945520,89273648,89601736,89929792,
+    90257792,90585760,90913688,91241568,91569408,91897200,92224960,92552672,
+    92880336,93207968,93535552,93863088,94190584,94518040,94845448,95172816,
+    95500136,95827416,96154648,96481832,96808976,97136080,97463136,97790144,
+    98117112,98444032,98770904,99097736,99424520,99751256,100077944,100404592,
+    100731192,101057744,101384248,101710712,102037128,102363488,102689808,103016080,
+    103342312,103668488,103994616,104320696,104646736,104972720,105298656,105624552,
+    105950392,106276184,106601928,106927624,107253272,107578872,107904416,108229920,
+    108555368,108880768,109206120,109531416,109856664,110181872,110507016,110832120,
+    111157168,111482168,111807112,112132008,112456856,112781648,113106392,113431080,
+    113755720,114080312,114404848,114729328,115053760,115378136,115702464,116026744,
+    116350960,116675128,116999248,117323312,117647320,117971272,118295176,118619024,
+    118942816,119266560,119590248,119913880,120237456,120560984,120884456,121207864,
+    121531224,121854528,122177784,122500976,122824112,123147200,123470224,123793200,
+    124116120,124438976,124761784,125084528,125407224,125729856,126052432,126374960,
+    126697424,127019832,127342184,127664472,127986712,128308888,128631008,128953072,
+    129275080,129597024,129918912,130240744,130562520,130884232,131205888,131527480,
+    131849016,132170496,132491912,132813272,133134576,133455816,133776992,134098120,
+    134419184,134740176,135061120,135382000,135702816,136023584,136344272,136664912,
+    136985488,137306016,137626464,137946864,138267184,138587456,138907664,139227808,
+    139547904,139867920,140187888,140507776,140827616,141147392,141467104,141786752,
+    142106336,142425856,142745312,143064720,143384048,143703312,144022512,144341664,
+    144660736,144979744,145298704,145617584,145936400,146255168,146573856,146892480,
+    147211040,147529536,147847968,148166336,148484640,148802880,149121056,149439152,
+    149757200,150075168,150393072,150710912,151028688,151346400,151664048,151981616,
+    152299136,152616576,152933952,153251264,153568496,153885680,154202784,154519824,
+    154836784,155153696,155470528,155787296,156104000,156420624,156737200,157053696,
+    157370112,157686480,158002768,158318976,158635136,158951216,159267232,159583168,
+    159899040,160214848,160530592,160846256,161161840,161477376,161792832,162108208,
+    162423520,162738768,163053952,163369040,163684080,163999040,164313936,164628752,
+    164943504,165258176,165572784,165887312,166201776,166516160,166830480,167144736,
+    167458912,167773008,168087040,168400992,168714880,169028688,169342432,169656096,
+    169969696,170283216,170596672,170910032,171223344,171536576,171849728,172162800,
+    172475808,172788736,173101600,173414384,173727104,174039728,174352288,174664784,
+    174977200,175289536,175601792,175913984,176226096,176538144,176850096,177161984,
+    177473792,177785536,178097200,178408784,178720288,179031728,179343088,179654368,
+    179965568,180276704,180587744,180898720,181209616,181520448,181831184,182141856,
+    182452448,182762960,183073408,183383760,183694048,184004240,184314368,184624416,
+    184934400,185244288,185554096,185863840,186173504,186483072,186792576,187102000,
+    187411344,187720608,188029808,188338912,188647936,188956896,189265760,189574560,
+    189883264,190191904,190500448,190808928,191117312,191425632,191733872,192042016,
+    192350096,192658096,192966000,193273840,193581584,193889264,194196848,194504352,
+    194811792,195119136,195426400,195733584,196040688,196347712,196654656,196961520,
+    197268304,197574992,197881616,198188144,198494592,198800960,199107248,199413456,
+    199719584,200025616,200331584,200637456,200943248,201248960,201554576,201860128,
+    202165584,202470960,202776256,203081456,203386592,203691632,203996592,204301472,
+    204606256,204910976,205215600,205520144,205824592,206128960,206433248,206737456,
+    207041584,207345616,207649568,207953424,208257216,208560912,208864512,209168048,
+    209471488,209774832,210078112,210381296,210684384,210987408,211290336,211593184,
+    211895936,212198608,212501184,212803680,213106096,213408432,213710672,214012816,
+    214314880,214616864,214918768,215220576,215522288,215823920,216125472,216426928,
+    216728304,217029584,217330784,217631904,217932928,218233856,218534704,218835472,
+    219136144,219436720,219737216,220037632,220337952,220638192,220938336,221238384,
+    221538352,221838240,222138032,222437728,222737344,223036880,223336304,223635664,
+    223934912,224234096,224533168,224832160,225131072,225429872,225728608,226027232,
+    226325776,226624240,226922608,227220880,227519056,227817152,228115168,228413088,
+    228710912,229008640,229306288,229603840,229901312,230198688,230495968,230793152,
+    231090256,231387280,231684192,231981024,232277760,232574416,232870960,233167440,
+    233463808,233760096,234056288,234352384,234648384,234944304,235240128,235535872,
+    235831504,236127056,236422512,236717888,237013152,237308336,237603424,237898416,
+    238193328,238488144,238782864,239077488,239372016,239666464,239960816,240255072,
+    240549232,240843312,241137280,241431168,241724960,242018656,242312256,242605776,
+    242899200,243192512,243485744,243778896,244071936,244364880,244657744,244950496,
+    245243168,245535744,245828224,246120608,246412912,246705104,246997216,247289216,
+    247581136,247872960,248164688,248456320,248747856,249039296,249330640,249621904,
+    249913056,250204128,250495088,250785968,251076736,251367424,251658016,251948512,
+    252238912,252529200,252819408,253109520,253399536,253689456,253979280,254269008,
+    254558640,254848176,255137632,255426976,255716224,256005376,256294432,256583392,
+    256872256,257161024,257449696,257738272,258026752,258315136,258603424,258891600,
+    259179696,259467696,259755600,260043392,260331104,260618704,260906224,261193632,
+    261480960,261768176,262055296,262342320,262629248,262916080,263202816,263489456,
+    263776000,264062432,264348784,264635024,264921168,265207216,265493168,265779024,
+    266064784,266350448,266636000,266921472,267206832,267492096,267777264,268062336,
+    268347312,268632192,268916960,269201632,269486208,269770688,270055072,270339360,
+    270623552,270907616,271191616,271475488,271759296,272042976,272326560,272610048,
+    272893440,273176736,273459936,273743040,274026048,274308928,274591744,274874432,
+    275157024,275439520,275721920,276004224,276286432,276568512,276850528,277132416,
+    277414240,277695936,277977536,278259040,278540448,278821728,279102944,279384032,
+    279665056,279945952,280226752,280507456,280788064,281068544,281348960,281629248,
+    281909472,282189568,282469568,282749440,283029248,283308960,283588544,283868032,
+    284147424,284426720,284705920,284985024,285264000,285542912,285821696,286100384,
+    286378976,286657440,286935840,287214112,287492320,287770400,288048384,288326240,
+    288604032,288881696,289159264,289436768,289714112,289991392,290268576,290545632,
+    290822592,291099456,291376224,291652896,291929440,292205888,292482272,292758528,
+    293034656,293310720,293586656,293862496,294138240,294413888,294689440,294964864,
+    295240192,295515424,295790560,296065600,296340512,296615360,296890080,297164704,
+    297439200,297713632,297987936,298262144,298536256,298810240,299084160,299357952,
+    299631648,299905248,300178720,300452128,300725408,300998592,301271680,301544640,
+    301817536,302090304,302362976,302635520,302908000,303180352,303452608,303724768,
+    303996800,304268768,304540608,304812320,305083968,305355520,305626944,305898272,
+    306169472,306440608,306711616,306982528,307253344,307524064,307794656,308065152,
+    308335552,308605856,308876032,309146112,309416096,309685984,309955744,310225408,
+    310494976,310764448,311033824,311303072,311572224,311841280,312110208,312379040,
+    312647776,312916416,313184960,313453376,313721696,313989920,314258016,314526016,
+    314793920,315061728,315329408,315597024,315864512,316131872,316399168,316666336,
+    316933408,317200384,317467232,317733984,318000640,318267200,318533632,318799968,
+    319066208,319332352,319598368,319864288,320130112,320395808,320661408,320926912,
+    321192320,321457632,321722816,321987904,322252864,322517760,322782528,323047200,
+    323311744,323576192,323840544,324104800,324368928,324632992,324896928,325160736,
+    325424448,325688096,325951584,326215008,326478304,326741504,327004608,327267584,
+    327530464,327793248,328055904,328318496,328580960,328843296,329105568,329367712,
+    329629760,329891680,330153536,330415264,330676864,330938400,331199808,331461120,
+    331722304,331983392,332244384,332505280,332766048,333026752,333287296,333547776,
+    333808128,334068384,334328544,334588576,334848512,335108352,335368064,335627712,
+    335887200,336146624,336405920,336665120,336924224,337183200,337442112,337700864,
+    337959552,338218112,338476576,338734944,338993184,339251328,339509376,339767296,
+    340025120,340282848,340540480,340797984,341055392,341312704,341569888,341826976,
+    342083968,342340832,342597600,342854272,343110848,343367296,343623648,343879904,
+    344136032,344392064,344648000,344903808,345159520,345415136,345670656,345926048,
+    346181344,346436512,346691616,346946592,347201440,347456224,347710880,347965440,
+    348219872,348474208,348728448,348982592,349236608,349490528,349744320,349998048,
+    350251648,350505152,350758528,351011808,351264992,351518048,351771040,352023872,
+    352276640,352529280,352781824,353034272,353286592,353538816,353790944,354042944,
+    354294880,354546656,354798368,355049952,355301440,355552800,355804096,356055264,
+    356306304,356557280,356808128,357058848,357309504,357560032,357810464,358060768,
+    358311008,358561088,358811104,359060992,359310784,359560480,359810048,360059520,
+    360308896,360558144,360807296,361056352,361305312,361554144,361802880,362051488,
+    362300032,362548448,362796736,363044960,363293056,363541024,363788928,364036704,
+    364284384,364531936,364779392,365026752,365274016,365521152,365768192,366015136,
+    366261952,366508672,366755296,367001792,367248192,367494496,367740704,367986784,
+    368232768,368478656,368724416,368970080,369215648,369461088,369706432,369951680,
+    370196800,370441824,370686752,370931584,371176288,371420896,371665408,371909792,
+    372154080,372398272,372642336,372886304,373130176,373373952,373617600,373861152,
+    374104608,374347936,374591168,374834304,375077312,375320224,375563040,375805760,
+    376048352,376290848,376533248,376775520,377017696,377259776,377501728,377743584,
+    377985344,378227008,378468544,378709984,378951328,379192544,379433664,379674688,
+    379915584,380156416,380397088,380637696,380878176,381118560,381358848,381599040,
+    381839104,382079072,382318912,382558656,382798304,383037856,383277280,383516640,
+    383755840,383994976,384233984,384472896,384711712,384950400,385188992,385427488,
+    385665888,385904160,386142336,386380384,386618368,386856224,387093984,387331616,
+    387569152,387806592,388043936,388281152,388518272,388755296,388992224,389229024,
+    389465728,389702336,389938816,390175200,390411488,390647680,390883744,391119712,
+    391355584,391591328,391826976,392062528,392297984,392533312,392768544,393003680,
+    393238720,393473632,393708448,393943168,394177760,394412256,394646656,394880960,
+    395115136,395349216,395583200,395817088,396050848,396284512,396518080,396751520,
+    396984864,397218112,397451264,397684288,397917248,398150080,398382784,398615424,
+    398847936,399080320,399312640,399544832,399776928,400008928,400240832,400472608,
+    400704288,400935872,401167328,401398720,401629984,401861120,402092192,402323136,
+    402553984,402784736,403015360,403245888,403476320,403706656,403936896,404167008,
+    404397024,404626944,404856736,405086432,405316032,405545536,405774912,406004224,
+    406233408,406462464,406691456,406920320,407149088,407377760,407606336,407834784,
+    408063136,408291392,408519520,408747584,408975520,409203360,409431072,409658720,
+    409886240,410113664,410340992,410568192,410795296,411022304,411249216,411476032,
+    411702720,411929312,412155808,412382176,412608480,412834656,413060736,413286720,
+    413512576,413738336,413964000,414189568,414415040,414640384,414865632,415090784,
+    415315840,415540800,415765632,415990368,416215008,416439552,416663968,416888288,
+    417112512,417336640,417560672,417784576,418008384,418232096,418455712,418679200,
+    418902624,419125920,419349120,419572192,419795200,420018080,420240864,420463552,
+    420686144,420908608,421130976,421353280,421575424,421797504,422019488,422241344,
+    422463104,422684768,422906336,423127776,423349120,423570400,423791520,424012576,
+    424233536,424454368,424675104,424895744,425116288,425336736,425557056,425777280,
+    425997408,426217440,426437376,426657184,426876928,427096544,427316064,427535488,
+    427754784,427974016,428193120,428412128,428631040,428849856,429068544,429287168,
+    429505664,429724064,429942368,430160576,430378656,430596672,430814560,431032352,
+    431250048,431467616,431685120,431902496,432119808,432336992,432554080,432771040,
+    432987936,433204736,433421408,433637984,433854464,434070848,434287104,434503296,
+    434719360,434935360,435151232,435367008,435582656,435798240,436013696,436229088,
+    436444352,436659520,436874592,437089568,437304416,437519200,437733856,437948416,
+    438162880,438377248,438591520,438805696,439019744,439233728,439447584,439661344,
+    439875008,440088576,440302048,440515392,440728672,440941824,441154880,441367872,
+    441580736,441793472,442006144,442218720,442431168,442643552,442855808,443067968,
+    443280032,443492000,443703872,443915648,444127296,444338880,444550336,444761696,
+    444972992,445184160,445395232,445606176,445817056,446027840,446238496,446449088,
+    446659552,446869920,447080192,447290400,447500448,447710432,447920320,448130112,
+    448339776,448549376,448758848,448968224,449177536,449386720,449595808,449804800,
+    450013664,450222464,450431168,450639776,450848256,451056640,451264960,451473152,
+    451681248,451889248,452097152,452304960,452512672,452720288,452927808,453135232,
+    453342528,453549760,453756864,453963904,454170816,454377632,454584384,454791008,
+    454997536,455203968,455410304,455616544,455822688,456028704,456234656,456440512,
+    456646240,456851904,457057472,457262912,457468256,457673536,457878688,458083744,
+    458288736,458493600,458698368,458903040,459107616,459312096,459516480,459720768,
+    459924960,460129056,460333056,460536960,460740736,460944448,461148064,461351584,
+    461554976,461758304,461961536,462164640,462367680,462570592,462773440,462976160,
+    463178816,463381344,463583776,463786144,463988384,464190560,464392608,464594560,
+    464796448,464998208,465199872,465401472,465602944,465804320,466005600,466206816,
+    466407904,466608896,466809824,467010624,467211328,467411936,467612480,467812896,
+    468013216,468213440,468413600,468613632,468813568,469013440,469213184,469412832,
+    469612416,469811872,470011232,470210528,470409696,470608800,470807776,471006688,
+    471205472,471404192,471602784,471801312,471999712,472198048,472396288,472594400,
+    472792448,472990400,473188256,473385984,473583648,473781216,473978688,474176064,
+    474373344,474570528,474767616,474964608,475161504,475358336,475555040,475751648,
+    475948192,476144608,476340928,476537184,476733312,476929376,477125344,477321184,
+    477516960,477712640,477908224,478103712,478299104,478494400,478689600,478884704,
+    479079744,479274656,479469504,479664224,479858880,480053408,480247872,480442240,
+    480636512,480830656,481024736,481218752,481412640,481606432,481800128,481993760,
+    482187264,482380704,482574016,482767264,482960416,483153472,483346432,483539296,
+    483732064,483924768,484117344,484309856,484502240,484694560,484886784,485078912,
+    485270944,485462880,485654720,485846464,486038144,486229696,486421184,486612576,
+    486803840,486995040,487186176,487377184,487568096,487758912,487949664,488140320,
+    488330880,488521312,488711712,488901984,489092160,489282240,489472256,489662176,
+    489851968,490041696,490231328,490420896,490610336,490799712,490988960,491178144,
+    491367232,491556224,491745120,491933920,492122656,492311264,492499808,492688256,
+    492876608,493064864,493253056,493441120,493629120,493817024,494004832,494192544,
+    494380160,494567712,494755136,494942496,495129760,495316928,495504000,495691008,
+    495877888,496064704,496251424,496438048,496624608,496811040,496997408,497183680,
+    497369856,497555936,497741920,497927840,498113632,498299360,498484992,498670560,
+    498856000,499041376,499226656,499411840,499596928,499781920,499966848,500151680,
+    500336416,500521056,500705600,500890080,501074464,501258752,501442944,501627040,
+    501811072,501995008,502178848,502362592,502546240,502729824,502913312,503096704,
+    503280000,503463232,503646368,503829408,504012352,504195200,504377984,504560672,
+    504743264,504925760,505108192,505290496,505472736,505654912,505836960,506018944,
+    506200832,506382624,506564320,506745952,506927488,507108928,507290272,507471552,
+    507652736,507833824,508014816,508195744,508376576,508557312,508737952,508918528,
+    509099008,509279392,509459680,509639904,509820032,510000064,510180000,510359872,
+    510539648,510719328,510898944,511078432,511257856,511437216,511616448,511795616,
+    511974688,512153664,512332576,512511392,512690112,512868768,513047296,513225792,
+    513404160,513582432,513760640,513938784,514116800,514294752,514472608,514650368,
+    514828064,515005664,515183168,515360608,515537952,515715200,515892352,516069440,
+    516246432,516423328,516600160,516776896,516953536,517130112,517306592,517482976,
+    517659264,517835488,518011616,518187680,518363648,518539520,518715296,518891008,
+    519066624,519242144,519417600,519592960,519768256,519943424,520118528,520293568,
+    520468480,520643328,520818112,520992800,521167392,521341888,521516320,521690656,
+    521864896,522039072,522213152,522387168,522561056,522734912,522908640,523082304,
+    523255872,523429376,523602784,523776096,523949312,524122464,524295552,524468512,
+    524641440,524814240,524986976,525159616,525332192,525504640,525677056,525849344,
+    526021568,526193728,526365792,526537760,526709632,526881440,527053152,527224800,
+    527396352,527567840,527739200,527910528,528081728,528252864,528423936,528594880,
+    528765760,528936576,529107296,529277920,529448480,529618944,529789344,529959648,
+    530129856,530300000,530470048,530640000,530809888,530979712,531149440,531319072,
+    531488608,531658080,531827488,531996800,532166016,532335168,532504224,532673184,
+    532842080,533010912,533179616,533348288,533516832,533685312,533853728,534022048,
+    534190272,534358432,534526496,534694496,534862400,535030240,535197984,535365632,
+    535533216,535700704,535868128,536035456,536202720,536369888,536536992,536704000,
+    536870912
+};
+
+// Now where did these came from?
+const byte gammatable[5][256] =
+{
+    {
+        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,
+        65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
+        81,82,83,84,85,86,87,88,89,90,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,
+        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,
+        192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+        208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,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
+    },
+
+    {
+        2,4,5,7,8,10,11,12,14,15,16,18,19,20,21,23,
+        24,25,26,27,29,30,31,32,33,34,36,37,38,39,40,41,
+        42,44,45,46,47,48,49,50,51,52,54,55,56,57,58,59,
+        60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,76,
+        77,78,79,80,81,82,83,84,85,86,87,88,89,90,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,129,130,131,132,133,134,135,136,137,138,139,
+        140,141,142,143,144,145,146,147,148,148,149,150,151,152,153,154,
+        155,156,157,158,159,160,161,162,163,163,164,165,166,167,168,169,
+        170,171,172,173,174,175,175,176,177,178,179,180,181,182,183,184,
+        185,186,186,187,188,189,190,191,192,193,194,195,196,196,197,198,
+        199,200,201,202,203,204,205,205,206,207,208,209,210,211,212,213,
+        214,214,215,216,217,218,219,220,221,222,222,223,224,225,226,227,
+        228,229,230,230,231,232,233,234,235,236,237,237,238,239,240,241,
+        242,243,244,245,245,246,247,248,249,250,251,252,252,253,254,255
+    },
+
+    {
+        4,7,9,11,13,15,17,19,21,22,24,26,27,29,30,32,
+        33,35,36,38,39,40,42,43,45,46,47,48,50,51,52,54,
+        55,56,57,59,60,61,62,63,65,66,67,68,69,70,72,73,
+        74,75,76,77,78,79,80,82,83,84,85,86,87,88,89,90,
+        91,92,93,94,95,96,97,98,100,101,102,103,104,105,106,107,
+        108,109,110,111,112,113,114,114,115,116,117,118,119,120,121,122,
+        123,124,125,126,127,128,129,130,131,132,133,133,134,135,136,137,
+        138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,152,
+        153,153,154,155,156,157,158,159,160,160,161,162,163,164,165,166,
+        166,167,168,169,170,171,172,172,173,174,175,176,177,178,178,179,
+        180,181,182,183,183,184,185,186,187,188,188,189,190,191,192,193,
+        193,194,195,196,197,197,198,199,200,201,201,202,203,204,205,206,
+        206,207,208,209,210,210,211,212,213,213,214,215,216,217,217,218,
+        219,220,221,221,222,223,224,224,225,226,227,228,228,229,230,231,
+        231,232,233,234,235,235,236,237,238,238,239,240,241,241,242,243,
+        244,244,245,246,247,247,248,249,250,251,251,252,253,254,254,255
+    },
+
+    {
+        8,12,16,19,22,24,27,29,31,34,36,38,40,41,43,45,
+        47,49,50,52,53,55,57,58,60,61,63,64,65,67,68,70,
+        71,72,74,75,76,77,79,80,81,82,84,85,86,87,88,90,
+        91,92,93,94,95,96,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,135,136,137,138,
+        139,140,141,142,143,143,144,145,146,147,148,149,150,150,151,152,
+        153,154,155,155,156,157,158,159,160,160,161,162,163,164,165,165,
+        166,167,168,169,169,170,171,172,173,173,174,175,176,176,177,178,
+        179,180,180,181,182,183,183,184,185,186,186,187,188,189,189,190,
+        191,192,192,193,194,195,195,196,197,197,198,199,200,200,201,202,
+        202,203,204,205,205,206,207,207,208,209,210,210,211,212,212,213,
+        214,214,215,216,216,217,218,219,219,220,221,221,222,223,223,224,
+        225,225,226,227,227,228,229,229,230,231,231,232,233,233,234,235,
+        235,236,237,237,238,238,239,240,240,241,242,242,243,244,244,245,
+        246,246,247,247,248,249,249,250,251,251,252,253,253,254,254,255
+    },
+
+
+    {
+        16,23,28,32,36,39,42,45,48,50,53,55,57,60,62,64,
+        66,68,69,71,73,75,76,78,80,81,83,84,86,87,89,90,
+        92,93,94,96,97,98,100,101,102,103,105,106,107,108,109,110,
+        112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,128,
+        128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+        143,144,145,146,147,148,149,150,150,151,152,153,154,155,155,156,
+        157,158,159,159,160,161,162,163,163,164,165,166,166,167,168,169,
+        169,170,171,172,172,173,174,175,175,176,177,177,178,179,180,180,
+        181,182,182,183,184,184,185,186,187,187,188,189,189,190,191,191,
+        192,193,193,194,195,195,196,196,197,198,198,199,200,200,201,202,
+        202,203,203,204,205,205,206,207,207,208,208,209,210,210,211,211,
+        212,213,213,214,214,215,216,216,217,217,218,219,219,220,220,221,
+        221,222,223,223,224,224,225,225,226,227,227,228,228,229,229,230,
+        230,231,232,232,233,233,234,234,235,235,236,236,237,237,238,239,
+        239,240,240,241,241,242,242,243,243,244,244,245,245,246,246,247,
+        247,248,248,249,249,250,250,251,251,252,252,253,254,254,255,255
+    }
+};
+
diff --git a/games/NXDoom/src/tables.h b/games/NXDoom/src/tables.h
new file mode 100644
index 000000000..f72406da4
--- /dev/null
+++ b/games/NXDoom/src/tables.h
@@ -0,0 +1,96 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Lookup tables.
+//	Do not try to look them up :-).
+//	In the order of appearance: 
+//
+//	int finetangent[4096]	- Tangens LUT.
+//	 Should work with BAM fairly well (12 of 16bit,
+//      effectively, by shifting).
+//
+//	int finesine[10240]		- Sine lookup.
+//	 Guess what, serves as cosine, too.
+//	 Remarkable thing is, how to use BAMs with this? 
+//
+//	int tantoangle[2049]	- ArcTan LUT,
+//	  maps tan(angle) to angle fast. Gotta search.	
+//    
+
+
+#ifndef __TABLES__
+#define __TABLES__
+
+#include "doomtype.h"
+
+#include "m_fixed.h"
+	
+#define FINEANGLES		8192
+#define FINEMASK		(FINEANGLES-1)
+
+
+// 0x100000000 to 0x2000
+#define ANGLETOFINESHIFT	19		
+
+// Effective size is 10240.
+extern const fixed_t finesine[5*FINEANGLES/4];
+
+// Re-use data, is just PI/2 pahse shift.
+extern const fixed_t *finecosine;
+
+
+// Effective size is 4096.
+extern const fixed_t finetangent[FINEANGLES/2];
+
+// Gamma correction tables.
+extern const byte gammatable[5][256];
+
+// Binary Angle Measument, BAM.
+
+#define ANG45           0x20000000
+#define ANG90           0x40000000
+#define ANG180          0x80000000
+#define ANG270          0xc0000000
+#define ANG_MAX         0xffffffff
+
+#define ANG1            (ANG45 / 45)
+#define ANG60           (ANG180 / 3)
+
+// Heretic code uses this definition as though it represents one 
+// degree, but it is not!  This is actually ~1.40 degrees.
+
+#define ANG1_X          0x01000000
+
+#define SLOPERANGE		2048
+#define SLOPEBITS		11
+#define DBITS			(FRACBITS-SLOPEBITS)
+
+typedef unsigned int angle_t;
+
+
+// Effective size is 2049;
+// The +1 size is to handle the case when x==y
+//  without additional checking.
+extern const angle_t tantoangle[SLOPERANGE+1];
+
+
+// Utility function,
+//  called by R_PointToAngle.
+int SlopeDiv(unsigned int num, unsigned int den);
+
+
+#endif
+
diff --git a/games/NXDoom/src/v_diskicon.c b/games/NXDoom/src/v_diskicon.c
new file mode 100644
index 000000000..1631ba7b9
--- /dev/null
+++ b/games/NXDoom/src/v_diskicon.c
@@ -0,0 +1,160 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Disk load indicator.
+//
+
+#include "doomtype.h"
+#include "deh_str.h"
+#include "i_swap.h"
+#include "i_video.h"
+#include "m_argv.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "v_diskicon.h"
+
+#include <string.h>
+
+// Only display the disk icon if more then this much bytes have been read
+// during the previous tic.
+
+static const int diskicon_threshold = 20*1024;
+
+// Two buffers: disk_data contains the data representing the disk icon
+// (raw, not a patch_t) while saved_background is an equivalently-sized
+// buffer where we save the background data while the disk is on screen.
+static pixel_t *disk_data;
+static pixel_t *saved_background;
+
+static int loading_disk_xoffs = 0;
+static int loading_disk_yoffs = 0;
+
+// Number of bytes read since the last call to V_DrawDiskIcon().
+static size_t recent_bytes_read = 0;
+static boolean disk_drawn;
+
+static void CopyRegion(pixel_t *dest, int dest_pitch,
+                       pixel_t *src, int src_pitch,
+                       int w, int h)
+{
+    pixel_t *s, *d;
+    int y;
+
+    s = src; d = dest;
+    for (y = 0; y < h; ++y)
+    {
+        memcpy(d, s, w * sizeof(*d));
+        s += src_pitch;
+        d += dest_pitch;
+    }
+}
+
+static void SaveDiskData(const char *disk_lump, int xoffs, int yoffs)
+{
+    pixel_t *tmpscreen;
+    patch_t *disk;
+
+    // Allocate a complete temporary screen where we'll draw the patch.
+    tmpscreen = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*tmpscreen),
+                         PU_STATIC, NULL);
+    memset(tmpscreen, 0, SCREENWIDTH * SCREENHEIGHT * sizeof(*tmpscreen));
+    V_UseBuffer(tmpscreen);
+
+    // Buffer where we'll save the disk data.
+
+    if (disk_data != NULL)
+    {
+        Z_Free(disk_data);
+        disk_data = NULL;
+    }
+
+    disk_data = Z_Malloc(LOADING_DISK_W * LOADING_DISK_H * sizeof(*disk_data),
+                         PU_STATIC, NULL);
+
+    // Draw the patch and save the result to disk_data.
+    disk = W_CacheLumpName(disk_lump, PU_STATIC);
+    V_DrawPatch(loading_disk_xoffs, loading_disk_yoffs, disk);
+    CopyRegion(disk_data, LOADING_DISK_W,
+               tmpscreen + yoffs * SCREENWIDTH + xoffs, SCREENWIDTH,
+               LOADING_DISK_W, LOADING_DISK_H);
+    W_ReleaseLumpName(disk_lump);
+
+    V_RestoreBuffer();
+    Z_Free(tmpscreen);
+}
+
+void V_EnableLoadingDisk(const char *lump_name, int xoffs, int yoffs)
+{
+    loading_disk_xoffs = xoffs;
+    loading_disk_yoffs = yoffs;
+
+    if (saved_background != NULL)
+    {
+        Z_Free(saved_background);
+        saved_background = NULL;
+    }
+
+    saved_background = Z_Malloc(LOADING_DISK_W * LOADING_DISK_H
+                                 * sizeof(*saved_background),
+                                PU_STATIC, NULL);
+    SaveDiskData(lump_name, xoffs, yoffs);
+}
+
+void V_BeginRead(size_t nbytes)
+{
+    recent_bytes_read += nbytes;
+}
+
+static pixel_t *DiskRegionPointer(void)
+{
+    return I_VideoBuffer
+         + loading_disk_yoffs * SCREENWIDTH
+         + loading_disk_xoffs;
+}
+
+void V_DrawDiskIcon(void)
+{
+    if (disk_data != NULL && recent_bytes_read > diskicon_threshold)
+    {
+        // Save the background behind the disk before we draw it.
+        CopyRegion(saved_background, LOADING_DISK_W,
+                   DiskRegionPointer(), SCREENWIDTH,
+                   LOADING_DISK_W, LOADING_DISK_H);
+
+        // Write the disk to the screen buffer.
+        CopyRegion(DiskRegionPointer(), SCREENWIDTH,
+                   disk_data, LOADING_DISK_W,
+                   LOADING_DISK_W, LOADING_DISK_H);
+        disk_drawn = true;
+    }
+
+    recent_bytes_read = 0;
+}
+
+void V_RestoreDiskBackground(void)
+{
+    if (disk_drawn)
+    {
+        // Restore the background.
+        CopyRegion(DiskRegionPointer(), SCREENWIDTH,
+                   saved_background, LOADING_DISK_W,
+                   LOADING_DISK_W, LOADING_DISK_H);
+
+        disk_drawn = false;
+    }
+}
+
diff --git a/games/NXDoom/src/v_diskicon.h b/games/NXDoom/src/v_diskicon.h
new file mode 100644
index 000000000..0dee04d19
--- /dev/null
+++ b/games/NXDoom/src/v_diskicon.h
@@ -0,0 +1,32 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Disk load indicator.
+//
+
+#ifndef __V_DISKICON__
+#define __V_DISKICON__
+
+// Dimensions of the flashing "loading" disk icon
+
+#define LOADING_DISK_W 16
+#define LOADING_DISK_H 16
+
+extern void V_EnableLoadingDisk(const char *lump_name, int xoffs, int yoffs);
+extern void V_BeginRead(size_t nbytes);
+extern void V_DrawDiskIcon(void);
+extern void V_RestoreDiskBackground(void);
+
+#endif
diff --git a/games/NXDoom/src/v_patch.h b/games/NXDoom/src/v_patch.h
new file mode 100644
index 000000000..767f9e3a2
--- /dev/null
+++ b/games/NXDoom/src/v_patch.h
@@ -0,0 +1,50 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Refresh/rendering module, shared data struct definitions.
+//
+
+
+#ifndef V_PATCH_H
+#define V_PATCH_H
+
+// Patches.
+// A patch holds one or more columns.
+// Patches are used for sprites and all masked pictures,
+// and we compose textures from the TEXTURE1/2 lists
+// of patches.
+
+typedef PACKED_STRUCT (
+{
+    short		width;		// bounding box size
+    short		height;
+    short		leftoffset;	// pixels to the left of origin
+    short		topoffset;	// pixels below the origin
+    int			columnofs[8];	// only [width] used
+    // the [0] is &columnofs[width]
+}) patch_t;
+
+// posts are runs of non masked source pixels
+typedef PACKED_STRUCT (
+{
+    byte		topdelta;	// -1 is the last post in a column
+    byte		length; 	// length data bytes follows
+}) post_t;
+
+// column_t is a list of 0 or more post_t, (byte)-1 terminated
+typedef post_t	column_t;
+
+#endif 
+
diff --git a/games/NXDoom/src/v_video.c b/games/NXDoom/src/v_video.c
new file mode 100644
index 000000000..c35f259f4
--- /dev/null
+++ b/games/NXDoom/src/v_video.c
@@ -0,0 +1,1023 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Gamma correction LUT stuff.
+//	Functions to draw patches (by post) directly to screen.
+//	Functions to blit a block to the screen.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "i_system.h"
+
+#include "doomtype.h"
+
+#include "deh_str.h"
+#include "i_input.h"
+#include "i_swap.h"
+#include "i_video.h"
+#include "m_bbox.h"
+#include "m_misc.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "config.h"
+#ifdef HAVE_LIBPNG
+#include <png.h>
+#endif
+
+// TODO: There are separate RANGECHECK defines for different games, but this
+// is common code. Fix this.
+#define RANGECHECK
+
+// Blending table used for fuzzpatch, etc.
+// Only used in Heretic/Hexen
+
+byte *tinttable = NULL;
+
+// villsa [STRIFE] Blending table used for Strife
+byte *xlatab = NULL;
+
+// The screen buffer that the v_video.c code draws to.
+
+static pixel_t *dest_screen = NULL;
+
+int dirtybox[4]; 
+
+// haleyjd 08/28/10: clipping callback function for patches.
+// This is needed for Chocolate Strife, which clips patches to the screen.
+static vpatchclipfunc_t patchclip_callback = NULL;
+
+//
+// V_MarkRect 
+// 
+void V_MarkRect(int x, int y, int width, int height) 
+{ 
+    // If we are temporarily using an alternate screen, do not 
+    // affect the update box.
+
+    if (dest_screen == I_VideoBuffer)
+    {
+        M_AddToBox (dirtybox, x, y); 
+        M_AddToBox (dirtybox, x + width-1, y + height-1); 
+    }
+} 
+ 
+
+//
+// V_CopyRect 
+// 
+void V_CopyRect(int srcx, int srcy, pixel_t *source,
+                int width, int height,
+                int destx, int desty)
+{ 
+    pixel_t *src;
+    pixel_t *dest;
+ 
+#ifdef RANGECHECK 
+    if (srcx < 0
+     || srcx + width > SCREENWIDTH
+     || srcy < 0
+     || srcy + height > SCREENHEIGHT 
+     || destx < 0
+     || destx + width > SCREENWIDTH
+     || desty < 0
+     || desty + height > SCREENHEIGHT)
+    {
+        I_Error ("Bad V_CopyRect");
+    }
+#endif 
+
+    V_MarkRect(destx, desty, width, height); 
+ 
+    src = source + SCREENWIDTH * srcy + srcx; 
+    dest = dest_screen + SCREENWIDTH * desty + destx; 
+
+    for ( ; height>0 ; height--) 
+    { 
+        memcpy(dest, src, width * sizeof(*dest));
+        src += SCREENWIDTH; 
+        dest += SCREENWIDTH; 
+    } 
+} 
+ 
+//
+// V_SetPatchClipCallback
+//
+// haleyjd 08/28/10: Added for Strife support.
+// By calling this function, you can setup runtime error checking for patch 
+// clipping. Strife never caused errors by drawing patches partway off-screen.
+// Some versions of vanilla DOOM also behaved differently than the default
+// implementation, so this could possibly be extended to those as well for
+// accurate emulation.
+//
+void V_SetPatchClipCallback(vpatchclipfunc_t func)
+{
+    patchclip_callback = func;
+}
+
+//
+// V_DrawPatch
+// Masks a column based masked pic to the screen. 
+//
+
+void V_DrawPatch(int x, int y, patch_t *patch)
+{ 
+    int count;
+    int col;
+    column_t *column;
+    pixel_t *desttop;
+    pixel_t *dest;
+    byte *source;
+    int w;
+
+    y -= SHORT(patch->topoffset);
+    x -= SHORT(patch->leftoffset);
+
+    // haleyjd 08/28/10: Strife needs silent error checking here.
+    if(patchclip_callback)
+    {
+        if(!patchclip_callback(patch, x, y))
+            return;
+    }
+
+#ifdef RANGECHECK
+    if (x < 0
+     || x + SHORT(patch->width) > SCREENWIDTH
+     || y < 0
+     || y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+        I_Error("Bad V_DrawPatch");
+    }
+#endif
+
+    V_MarkRect(x, y, SHORT(patch->width), SHORT(patch->height));
+
+    col = 0;
+    desttop = dest_screen + y * SCREENWIDTH + x;
+
+    w = SHORT(patch->width);
+
+    for ( ; col<w ; x++, col++, desttop++)
+    {
+        column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+
+        // step through the posts in a column
+        while (column->topdelta != 0xff)
+        {
+            source = (byte *)column + 3;
+            dest = desttop + column->topdelta*SCREENWIDTH;
+            count = column->length;
+
+            while (count--)
+            {
+                *dest = *source++;
+                dest += SCREENWIDTH;
+            }
+            column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+//
+// V_DrawPatchFlipped
+// Masks a column based masked pic to the screen.
+// Flips horizontally, e.g. to mirror face.
+//
+
+void V_DrawPatchFlipped(int x, int y, patch_t *patch)
+{
+    int count;
+    int col; 
+    column_t *column; 
+    pixel_t *desttop;
+    pixel_t *dest;
+    byte *source; 
+    int w; 
+ 
+    y -= SHORT(patch->topoffset); 
+    x -= SHORT(patch->leftoffset); 
+
+    // haleyjd 08/28/10: Strife needs silent error checking here.
+    if(patchclip_callback)
+    {
+        if(!patchclip_callback(patch, x, y))
+            return;
+    }
+
+#ifdef RANGECHECK 
+    if (x < 0
+     || x + SHORT(patch->width) > SCREENWIDTH
+     || y < 0
+     || y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+        I_Error("Bad V_DrawPatchFlipped");
+    }
+#endif
+
+    V_MarkRect (x, y, SHORT(patch->width), SHORT(patch->height));
+
+    col = 0;
+    desttop = dest_screen + y * SCREENWIDTH + x;
+
+    w = SHORT(patch->width);
+
+    for ( ; col<w ; x++, col++, desttop++)
+    {
+        column = (column_t *)((byte *)patch + LONG(patch->columnofs[w-1-col]));
+
+        // step through the posts in a column
+        while (column->topdelta != 0xff )
+        {
+            source = (byte *)column + 3;
+            dest = desttop + column->topdelta*SCREENWIDTH;
+            count = column->length;
+
+            while (count--)
+            {
+                *dest = *source++;
+                dest += SCREENWIDTH;
+            }
+            column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+
+
+//
+// V_DrawPatchDirect
+// Draws directly to the screen on the pc. 
+//
+
+void V_DrawPatchDirect(int x, int y, patch_t *patch)
+{
+    V_DrawPatch(x, y, patch); 
+} 
+
+//
+// V_DrawTLPatch
+//
+// Masks a column based translucent masked pic to the screen.
+//
+
+void V_DrawTLPatch(int x, int y, patch_t * patch)
+{
+    int count, col;
+    column_t *column;
+    pixel_t *desttop, *dest;
+    byte *source;
+    int w;
+
+    y -= SHORT(patch->topoffset);
+    x -= SHORT(patch->leftoffset);
+
+    if (x < 0
+     || x + SHORT(patch->width) > SCREENWIDTH 
+     || y < 0
+     || y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+        I_Error("Bad V_DrawTLPatch");
+    }
+
+    col = 0;
+    desttop = dest_screen + y * SCREENWIDTH + x;
+
+    w = SHORT(patch->width);
+    for (; col < w; x++, col++, desttop++)
+    {
+        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
+
+        // step through the posts in a column
+
+        while (column->topdelta != 0xff)
+        {
+            source = (byte *) column + 3;
+            dest = desttop + column->topdelta * SCREENWIDTH;
+            count = column->length;
+
+            while (count--)
+            {
+                *dest = tinttable[*dest + ((*source++) << 8)];
+                dest += SCREENWIDTH;
+            }
+            column = (column_t *) ((byte *) column + column->length + 4);
+        }
+    }
+}
+
+//
+// V_DrawXlaPatch
+//
+// villsa [STRIFE] Masks a column based translucent masked pic to the screen.
+//
+
+void V_DrawXlaPatch(int x, int y, patch_t * patch)
+{
+    int count, col;
+    column_t *column;
+    pixel_t *desttop, *dest;
+    byte *source;
+    int w;
+
+    y -= SHORT(patch->topoffset);
+    x -= SHORT(patch->leftoffset);
+
+    if(patchclip_callback)
+    {
+        if(!patchclip_callback(patch, x, y))
+            return;
+    }
+
+    col = 0;
+    desttop = dest_screen + y * SCREENWIDTH + x;
+
+    w = SHORT(patch->width);
+    for(; col < w; x++, col++, desttop++)
+    {
+        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
+
+        // step through the posts in a column
+
+        while(column->topdelta != 0xff)
+        {
+            source = (byte *) column + 3;
+            dest = desttop + column->topdelta * SCREENWIDTH;
+            count = column->length;
+
+            while(count--)
+            {
+                *dest = xlatab[*dest + ((*source) << 8)];
+                source++;
+                dest += SCREENWIDTH;
+            }
+            column = (column_t *) ((byte *) column + column->length + 4);
+        }
+    }
+}
+
+//
+// V_DrawAltTLPatch
+//
+// Masks a column based translucent masked pic to the screen.
+//
+
+void V_DrawAltTLPatch(int x, int y, patch_t * patch)
+{
+    int count, col;
+    column_t *column;
+    pixel_t *desttop, *dest;
+    byte *source;
+    int w;
+
+    y -= SHORT(patch->topoffset);
+    x -= SHORT(patch->leftoffset);
+
+    if (x < 0
+     || x + SHORT(patch->width) > SCREENWIDTH
+     || y < 0
+     || y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+        I_Error("Bad V_DrawAltTLPatch");
+    }
+
+    col = 0;
+    desttop = dest_screen + y * SCREENWIDTH + x;
+
+    w = SHORT(patch->width);
+    for (; col < w; x++, col++, desttop++)
+    {
+        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
+
+        // step through the posts in a column
+
+        while (column->topdelta != 0xff)
+        {
+            source = (byte *) column + 3;
+            dest = desttop + column->topdelta * SCREENWIDTH;
+            count = column->length;
+
+            while (count--)
+            {
+                *dest = tinttable[((*dest) << 8) + *source++];
+                dest += SCREENWIDTH;
+            }
+            column = (column_t *) ((byte *) column + column->length + 4);
+        }
+    }
+}
+
+//
+// V_DrawShadowedPatch
+//
+// Masks a column based masked pic to the screen.
+//
+
+void V_DrawShadowedPatch(int x, int y, patch_t *patch)
+{
+    int count, col;
+    column_t *column;
+    pixel_t *desttop, *dest;
+    byte *source;
+    pixel_t *desttop2, *dest2;
+    int w;
+
+    y -= SHORT(patch->topoffset);
+    x -= SHORT(patch->leftoffset);
+
+    if (x < 0
+     || x + SHORT(patch->width) > SCREENWIDTH
+     || y < 0
+     || y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+        I_Error("Bad V_DrawShadowedPatch");
+    }
+
+    col = 0;
+    desttop = dest_screen + y * SCREENWIDTH + x;
+    desttop2 = dest_screen + (y + 2) * SCREENWIDTH + x + 2;
+
+    w = SHORT(patch->width);
+    for (; col < w; x++, col++, desttop++, desttop2++)
+    {
+        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
+
+        // step through the posts in a column
+
+        while (column->topdelta != 0xff)
+        {
+            source = (byte *) column + 3;
+            dest = desttop + column->topdelta * SCREENWIDTH;
+            dest2 = desttop2 + column->topdelta * SCREENWIDTH;
+            count = column->length;
+
+            while (count--)
+            {
+                *dest2 = tinttable[((*dest2) << 8)];
+                dest2 += SCREENWIDTH;
+                *dest = *source++;
+                dest += SCREENWIDTH;
+
+            }
+            column = (column_t *) ((byte *) column + column->length + 4);
+        }
+    }
+}
+
+//
+// Load tint table from TINTTAB lump.
+//
+
+void V_LoadTintTable(void)
+{
+    tinttable = W_CacheLumpName("TINTTAB", PU_STATIC);
+}
+
+//
+// V_LoadXlaTable
+//
+// villsa [STRIFE] Load xla table from XLATAB lump.
+//
+
+void V_LoadXlaTable(void)
+{
+    xlatab = W_CacheLumpName("XLATAB", PU_STATIC);
+}
+
+//
+// V_DrawBlock
+// Draw a linear block of pixels into the view buffer.
+//
+
+void V_DrawBlock(int x, int y, int width, int height, pixel_t *src)
+{ 
+    pixel_t *dest;
+ 
+#ifdef RANGECHECK 
+    if (x < 0
+     || x + width >SCREENWIDTH
+     || y < 0
+     || y + height > SCREENHEIGHT)
+    {
+	I_Error ("Bad V_DrawBlock");
+    }
+#endif 
+ 
+    V_MarkRect (x, y, width, height); 
+ 
+    dest = dest_screen + y * SCREENWIDTH + x; 
+
+    while (height--) 
+    { 
+	memcpy (dest, src, width * sizeof(*dest));
+	src += width; 
+	dest += SCREENWIDTH; 
+    } 
+} 
+
+void V_DrawFilledBox(int x, int y, int w, int h, int c)
+{
+    pixel_t *buf, *buf1;
+    int x1, y1;
+
+    buf = I_VideoBuffer + SCREENWIDTH * y + x;
+
+    for (y1 = 0; y1 < h; ++y1)
+    {
+        buf1 = buf;
+
+        for (x1 = 0; x1 < w; ++x1)
+        {
+            *buf1++ = c;
+        }
+
+        buf += SCREENWIDTH;
+    }
+}
+
+void V_DrawHorizLine(int x, int y, int w, int c)
+{
+    pixel_t *buf;
+    int x1;
+
+    buf = I_VideoBuffer + SCREENWIDTH * y + x;
+
+    for (x1 = 0; x1 < w; ++x1)
+    {
+        *buf++ = c;
+    }
+}
+
+void V_DrawVertLine(int x, int y, int h, int c)
+{
+    pixel_t *buf;
+    int y1;
+
+    buf = I_VideoBuffer + SCREENWIDTH * y + x;
+
+    for (y1 = 0; y1 < h; ++y1)
+    {
+        *buf = c;
+        buf += SCREENWIDTH;
+    }
+}
+
+void V_DrawBox(int x, int y, int w, int h, int c)
+{
+    V_DrawHorizLine(x, y, w, c);
+    V_DrawHorizLine(x, y+h-1, w, c);
+    V_DrawVertLine(x, y, h, c);
+    V_DrawVertLine(x+w-1, y, h, c);
+}
+
+//
+// Draw a "raw" screen (lump containing raw data to blit directly
+// to the screen)
+//
+ 
+void V_DrawRawScreen(pixel_t *raw)
+{
+    memcpy(dest_screen, raw, SCREENWIDTH * SCREENHEIGHT * sizeof(*dest_screen));
+}
+
+//
+// V_Init
+// 
+void V_Init (void) 
+{ 
+    // no-op!
+    // There used to be separate screens that could be drawn to; these are
+    // now handled in the upper layers.
+}
+
+// Set the buffer that the code draws to.
+
+void V_UseBuffer(pixel_t *buffer)
+{
+    dest_screen = buffer;
+}
+
+// Restore screen buffer to the i_video screen buffer.
+
+void V_RestoreBuffer(void)
+{
+    dest_screen = I_VideoBuffer;
+}
+
+//
+// SCREEN SHOTS
+//
+
+typedef PACKED_STRUCT (
+{
+    char		manufacturer;
+    char		version;
+    char		encoding;
+    char		bits_per_pixel;
+
+    unsigned short	xmin;
+    unsigned short	ymin;
+    unsigned short	xmax;
+    unsigned short	ymax;
+    
+    unsigned short	hres;
+    unsigned short	vres;
+
+    unsigned char	palette[48];
+    
+    char		reserved;
+    char		color_planes;
+    unsigned short	bytes_per_line;
+    unsigned short	palette_type;
+    
+    char		filler[58];
+    unsigned char	data;		// unbounded
+}) pcx_t;
+
+
+//
+// WritePCXfile
+//
+
+void WritePCXfile(char *filename, pixel_t *data,
+                  int width, int height,
+                  byte *palette)
+{
+    int		i;
+    int		length;
+    pcx_t*	pcx;
+    byte*	pack;
+	
+    pcx = Z_Malloc (width*height*2+1000, PU_STATIC, NULL);
+
+    pcx->manufacturer = 0x0a;		// PCX id
+    pcx->version = 5;			// 256 color
+    pcx->encoding = 1;			// uncompressed
+    pcx->bits_per_pixel = 8;		// 256 color
+    pcx->xmin = 0;
+    pcx->ymin = 0;
+    pcx->xmax = SHORT(width-1);
+    pcx->ymax = SHORT(height-1);
+    pcx->hres = SHORT(1);
+    pcx->vres = SHORT(1);
+    memset (pcx->palette,0,sizeof(pcx->palette));
+    pcx->reserved = 0;                  // PCX spec: reserved byte must be zero
+    pcx->color_planes = 1;		// chunky image
+    pcx->bytes_per_line = SHORT(width);
+    pcx->palette_type = SHORT(2);	// not a grey scale
+    memset (pcx->filler,0,sizeof(pcx->filler));
+
+    // pack the image
+    pack = &pcx->data;
+	
+    for (i=0 ; i<width*height ; i++)
+    {
+	if ( (*data & 0xc0) != 0xc0)
+	    *pack++ = *data++;
+	else
+	{
+	    *pack++ = 0xc1;
+	    *pack++ = *data++;
+	}
+    }
+    
+    // write the palette
+    *pack++ = 0x0c;	// palette ID byte
+    for (i=0 ; i<768 ; i++)
+	*pack++ = *palette++;
+    
+    // write output file
+    length = pack - (byte *)pcx;
+    M_WriteFile (filename, pcx, length);
+
+    Z_Free (pcx);
+}
+
+#ifdef HAVE_LIBPNG
+//
+// WritePNGfile
+//
+
+static void error_fn(png_structp p, png_const_charp s)
+{
+    printf("libpng error: %s\n", s);
+}
+
+static void warning_fn(png_structp p, png_const_charp s)
+{
+    printf("libpng warning: %s\n", s);
+}
+
+void WritePNGfile(char *filename, pixel_t *data,
+                  int width, int height,
+                  byte *palette)
+{
+    png_structp ppng;
+    png_infop pinfo;
+    png_colorp pcolor;
+    FILE *handle;
+    int i, j;
+    int w_factor, h_factor;
+    byte *rowbuf;
+
+    if (aspect_ratio_correct == 1)
+    {
+        // scale up to accommodate aspect ratio correction
+        w_factor = 5;
+        h_factor = 6;
+
+        width *= w_factor;
+        height *= h_factor;
+    }
+    else
+    {
+        w_factor = 1;
+        h_factor = 1;
+    }
+
+    handle = M_fopen(filename, "wb");
+    if (!handle)
+    {
+        return;
+    }
+
+    ppng = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+                                   error_fn, warning_fn);
+    if (!ppng)
+    {
+        fclose(handle);
+        return;
+    }
+
+    pinfo = png_create_info_struct(ppng);
+    if (!pinfo)
+    {
+        fclose(handle);
+        png_destroy_write_struct(&ppng, NULL);
+        return;
+    }
+
+    png_init_io(ppng, handle);
+
+    png_set_IHDR(ppng, pinfo, width, height,
+                 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
+                 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+    pcolor = malloc(sizeof(*pcolor) * 256);
+    if (!pcolor)
+    {
+        fclose(handle);
+        png_destroy_write_struct(&ppng, &pinfo);
+        return;
+    }
+
+    for (i = 0; i < 256; i++)
+    {
+        pcolor[i].red   = *(palette + 3 * i);
+        pcolor[i].green = *(palette + 3 * i + 1);
+        pcolor[i].blue  = *(palette + 3 * i + 2);
+    }
+
+    png_set_PLTE(ppng, pinfo, pcolor, 256);
+    free(pcolor);
+
+    png_write_info(ppng, pinfo);
+
+    rowbuf = malloc(width);
+
+    if (rowbuf)
+    {
+        for (i = 0; i < SCREENHEIGHT; i++)
+        {
+            // expand the row 5x
+            for (j = 0; j < SCREENWIDTH; j++)
+            {
+                memset(rowbuf + j * w_factor, *(data + i*SCREENWIDTH + j), w_factor);
+            }
+
+            // write the row 6 times
+            for (j = 0; j < h_factor; j++)
+            {
+                png_write_row(ppng, rowbuf);
+            }
+        }
+
+        free(rowbuf);
+    }
+
+    png_write_end(ppng, pinfo);
+    png_destroy_write_struct(&ppng, &pinfo);
+    fclose(handle);
+}
+#endif
+
+//
+// V_ScreenShot
+//
+
+void V_ScreenShot(const char *format)
+{
+    int i;
+    char lbmname[16]; // haleyjd 20110213: BUG FIX - 12 is too small!
+    const char *ext;
+    
+    // find a file name to save it to
+
+#ifdef HAVE_LIBPNG
+    if (png_screenshots)
+    {
+        ext = "png";
+    }
+    else
+#endif
+    {
+        ext = "pcx";
+    }
+
+    for (i=0; i<=99; i++)
+    {
+        M_snprintf(lbmname, sizeof(lbmname), format, i, ext);
+
+        if (!M_FileExists(lbmname))
+        {
+            break;      // file doesn't exist
+        }
+    }
+
+    if (i == 100)
+    {
+#ifdef HAVE_LIBPNG
+        if (png_screenshots)
+        {
+            I_Error ("V_ScreenShot: Couldn't create a PNG");
+        }
+        else
+#endif
+        {
+            I_Error ("V_ScreenShot: Couldn't create a PCX");
+        }
+    }
+
+#ifdef HAVE_LIBPNG
+    if (png_screenshots)
+    {
+    WritePNGfile(lbmname, I_VideoBuffer,
+                 SCREENWIDTH, SCREENHEIGHT,
+                 W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE));
+    }
+    else
+#endif
+    {
+    // save the pcx file
+    WritePCXfile(lbmname, I_VideoBuffer,
+                 SCREENWIDTH, SCREENHEIGHT,
+                 W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE));
+    }
+}
+
+#define MOUSE_SPEED_BOX_WIDTH  120
+#define MOUSE_SPEED_BOX_HEIGHT 9
+#define MOUSE_SPEED_BOX_X (SCREENWIDTH - MOUSE_SPEED_BOX_WIDTH - 10)
+#define MOUSE_SPEED_BOX_Y 15
+
+//
+// V_DrawMouseSpeedBox
+//
+
+static void DrawAcceleratingBox(int speed)
+{
+    int red, white, yellow;
+    int original_speed;
+    int redline_x;
+    int linelen;
+
+    red = I_GetPaletteIndex(0xff, 0x00, 0x00);
+    white = I_GetPaletteIndex(0xff, 0xff, 0xff);
+    yellow = I_GetPaletteIndex(0xff, 0xff, 0x00);
+
+    // Calculate the position of the red threshold line when calibrating
+    // acceleration.  This is 1/3 of the way along the box.
+
+    redline_x = MOUSE_SPEED_BOX_WIDTH / 3;
+
+    if (speed >= mouse_threshold)
+    {
+        // Undo acceleration and get back the original mouse speed
+        original_speed = speed - mouse_threshold;
+        original_speed = (int) (original_speed / mouse_acceleration);
+        original_speed += mouse_threshold;
+
+        linelen = (original_speed * redline_x) / mouse_threshold;
+    }
+    else
+    {
+        linelen = (speed * redline_x) / mouse_threshold;
+    }
+
+    // Horizontal "thermometer"
+    if (linelen > MOUSE_SPEED_BOX_WIDTH - 1)
+    {
+        linelen = MOUSE_SPEED_BOX_WIDTH - 1;
+    }
+
+    if (linelen < redline_x)
+    {
+        V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1,
+                        MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
+                        linelen, white);
+    }
+    else
+    {
+        V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1,
+                        MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
+                        redline_x, white);
+        V_DrawHorizLine(MOUSE_SPEED_BOX_X + redline_x,
+                        MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
+                        linelen - redline_x, yellow);
+    }
+
+    // Draw acceleration threshold line
+    V_DrawVertLine(MOUSE_SPEED_BOX_X + redline_x, MOUSE_SPEED_BOX_Y + 1,
+                   MOUSE_SPEED_BOX_HEIGHT - 2, red);
+}
+
+// Highest seen mouse turn speed. We scale the range of the thermometer
+// according to this value, so that it never exceeds the range. Initially
+// this is set to a 1:1 setting where 1 pixel = 1 unit of speed.
+static int max_seen_speed = MOUSE_SPEED_BOX_WIDTH - 1;
+
+static void DrawNonAcceleratingBox(int speed)
+{
+    int white;
+    int linelen;
+
+    white = I_GetPaletteIndex(0xff, 0xff, 0xff);
+
+    if (speed > max_seen_speed)
+    {
+        max_seen_speed = speed;
+    }
+
+    // Draw horizontal "thermometer":
+    linelen = speed * (MOUSE_SPEED_BOX_WIDTH - 1) / max_seen_speed;
+
+    V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1,
+                    MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
+                    linelen, white);
+}
+
+void V_DrawMouseSpeedBox(int speed)
+{
+    int bgcolor, bordercolor, black;
+
+    // If the mouse is turned off, don't draw the box at all.
+    if (!usemouse)
+    {
+        return;
+    }
+
+    // Get palette indices for colors for widget. These depend on the
+    // palette of the game being played.
+
+    bgcolor = I_GetPaletteIndex(0x77, 0x77, 0x77);
+    bordercolor = I_GetPaletteIndex(0x55, 0x55, 0x55);
+    black = I_GetPaletteIndex(0x00, 0x00, 0x00);
+
+    // Calculate box position
+
+    V_DrawFilledBox(MOUSE_SPEED_BOX_X, MOUSE_SPEED_BOX_Y,
+                    MOUSE_SPEED_BOX_WIDTH, MOUSE_SPEED_BOX_HEIGHT, bgcolor);
+    V_DrawBox(MOUSE_SPEED_BOX_X, MOUSE_SPEED_BOX_Y,
+              MOUSE_SPEED_BOX_WIDTH, MOUSE_SPEED_BOX_HEIGHT, bordercolor);
+    V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1, MOUSE_SPEED_BOX_Y + 4,
+                    MOUSE_SPEED_BOX_WIDTH - 2, black);
+
+    // If acceleration is used, draw a box that helps to calibrate the
+    // threshold point.
+    if (mouse_threshold > 0 && fabs(mouse_acceleration - 1) > 0.01)
+    {
+        DrawAcceleratingBox(speed);
+    }
+    else
+    {
+        DrawNonAcceleratingBox(speed);
+    }
+}
+
diff --git a/games/NXDoom/src/v_video.h b/games/NXDoom/src/v_video.h
new file mode 100644
index 000000000..f9c18f9a7
--- /dev/null
+++ b/games/NXDoom/src/v_video.h
@@ -0,0 +1,108 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Gamma correction LUT.
+//	Functions to draw patches (by post) directly to screen.
+//	Functions to blit a block to the screen.
+//
+
+
+#ifndef __V_VIDEO__
+#define __V_VIDEO__
+
+#include "doomtype.h"
+
+// Needed because we are refering to patches.
+#include "v_patch.h"
+
+//
+// VIDEO
+//
+
+#define CENTERY			(SCREENHEIGHT/2)
+
+
+extern int dirtybox[4];
+
+extern byte *tinttable;
+
+// haleyjd 08/28/10: implemented for Strife support
+// haleyjd 08/28/10: Patch clipping callback, implemented to support Choco
+// Strife.
+typedef boolean (*vpatchclipfunc_t)(patch_t *, int, int);
+void V_SetPatchClipCallback(vpatchclipfunc_t func);
+
+
+// Allocates buffer screens, call before R_Init.
+void V_Init (void);
+
+// Draw a block from the specified source screen to the screen.
+
+void V_CopyRect(int srcx, int srcy, pixel_t *source,
+                int width, int height,
+                int destx, int desty);
+
+void V_DrawPatch(int x, int y, patch_t *patch);
+void V_DrawPatchFlipped(int x, int y, patch_t *patch);
+void V_DrawTLPatch(int x, int y, patch_t *patch);
+void V_DrawAltTLPatch(int x, int y, patch_t * patch);
+void V_DrawShadowedPatch(int x, int y, patch_t *patch);
+void V_DrawXlaPatch(int x, int y, patch_t * patch);     // villsa [STRIFE]
+void V_DrawPatchDirect(int x, int y, patch_t *patch);
+
+// Draw a linear block of pixels into the view buffer.
+
+void V_DrawBlock(int x, int y, int width, int height, pixel_t *src);
+
+void V_MarkRect(int x, int y, int width, int height);
+
+void V_DrawFilledBox(int x, int y, int w, int h, int c);
+void V_DrawHorizLine(int x, int y, int w, int c);
+void V_DrawVertLine(int x, int y, int h, int c);
+void V_DrawBox(int x, int y, int w, int h, int c);
+
+// Draw a raw screen lump
+
+void V_DrawRawScreen(pixel_t *raw);
+
+// Temporarily switch to using a different buffer to draw graphics, etc.
+
+void V_UseBuffer(pixel_t *buffer);
+
+// Return to using the normal screen buffer to draw graphics.
+
+void V_RestoreBuffer(void);
+
+// Save a screenshot of the current screen to a file, named in the 
+// format described in the string passed to the function, eg.
+// "DOOM%02i.pcx"
+
+void V_ScreenShot(const char *format);
+
+// Load the lookup table for translucency calculations from the TINTTAB
+// lump.
+
+void V_LoadTintTable(void);
+
+// villsa [STRIFE]
+// Load the lookup table for translucency calculations from the XLATAB
+// lump.
+
+void V_LoadXlaTable(void);
+
+void V_DrawMouseSpeedBox(int speed);
+
+#endif
+
diff --git a/games/NXDoom/src/w_checksum.c b/games/NXDoom/src/w_checksum.c
new file mode 100644
index 000000000..09d8d2a6c
--- /dev/null
+++ b/games/NXDoom/src/w_checksum.c
@@ -0,0 +1,88 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//       Generate a checksum of the WAD directory.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "i_system.h"
+#include "m_misc.h"
+#include "sha1.h"
+#include "w_checksum.h"
+#include "w_wad.h"
+
+static wad_file_t **open_wadfiles = NULL;
+static int num_open_wadfiles = 0;
+
+static int GetFileNumber(wad_file_t *handle)
+{
+    int i;
+    int result;
+
+    for (i = 0; i < num_open_wadfiles; ++i)
+    {
+        if (open_wadfiles[i] == handle)
+        {
+            return i;
+        }
+    }
+
+    // Not found in list.  This is a new file we haven't seen yet.
+    // Allocate another slot for this file.
+
+    open_wadfiles = I_Realloc(open_wadfiles,
+                            sizeof(wad_file_t *) * (num_open_wadfiles + 1));
+    open_wadfiles[num_open_wadfiles] = handle;
+
+    result = num_open_wadfiles;
+    ++num_open_wadfiles;
+
+    return result;
+}
+
+static void ChecksumAddLump(sha1_context_t *sha1_context, lumpinfo_t *lump)
+{
+    char buf[9];
+
+    M_StringCopy(buf, lump->name, sizeof(buf));
+    SHA1_UpdateString(sha1_context, buf);
+    SHA1_UpdateInt32(sha1_context, GetFileNumber(lump->wad_file));
+    SHA1_UpdateInt32(sha1_context, lump->position);
+    SHA1_UpdateInt32(sha1_context, lump->size);
+}
+
+void W_Checksum(sha1_digest_t digest)
+{
+    sha1_context_t sha1_context;
+    unsigned int i;
+
+    SHA1_Init(&sha1_context);
+
+    num_open_wadfiles = 0;
+
+    // Go through each entry in the WAD directory, adding information
+    // about each entry to the SHA1 hash.
+
+    for (i = 0; i < numlumps; ++i)
+    {
+        ChecksumAddLump(&sha1_context, lumpinfo[i]);
+    }
+
+    SHA1_Final(digest, &sha1_context);
+}
+
diff --git a/games/NXDoom/src/w_checksum.h b/games/NXDoom/src/w_checksum.h
new file mode 100644
index 000000000..e1ce5b89e
--- /dev/null
+++ b/games/NXDoom/src/w_checksum.h
@@ -0,0 +1,27 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//       Generate a checksum of the WAD directory.
+//
+
+#ifndef W_CHECKSUM_H
+#define W_CHECKSUM_H
+
+#include "doomtype.h"
+
+extern void W_Checksum(sha1_digest_t digest);
+
+#endif /* #ifndef W_CHECKSUM_H */
+
diff --git a/games/NXDoom/src/w_file.c b/games/NXDoom/src/w_file.c
new file mode 100644
index 000000000..87fc2c95a
--- /dev/null
+++ b/games/NXDoom/src/w_file.c
@@ -0,0 +1,84 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+
+#include <stdio.h>
+
+#include "config.h"
+
+#include "doomtype.h"
+#include "m_argv.h"
+
+#include "w_file.h"
+
+
+static wad_file_class_t *wad_file_classes[] = 
+{
+#ifdef _WIN32
+    &win32_wad_file,
+#endif
+#ifdef HAVE_MMAP
+    &posix_wad_file,
+#endif
+    &stdc_wad_file,
+};
+
+wad_file_t *W_OpenFile(const char *path)
+{
+    wad_file_t *result;
+    int i;
+
+    //!
+    // @category obscure
+    //
+    // Use the OS's virtual memory subsystem to map WAD files
+    // directly into memory.
+    //
+
+    if (!M_CheckParm("-mmap"))
+    {
+        return stdc_wad_file.OpenFile(path);
+    }
+
+    // Try all classes in order until we find one that works
+
+    result = NULL;
+
+    for (i=0; i<arrlen(wad_file_classes); ++i)
+    {
+        result = wad_file_classes[i]->OpenFile(path);
+
+        if (result != NULL)
+        {
+            break;
+        }
+    }
+
+    return result;
+}
+
+void W_CloseFile(wad_file_t *wad)
+{
+    wad->file_class->CloseFile(wad);
+}
+
+size_t W_Read(wad_file_t *wad, unsigned int offset,
+              void *buffer, size_t buffer_len)
+{
+    return wad->file_class->Read(wad, offset, buffer, buffer_len);
+}
+
diff --git a/games/NXDoom/src/w_file.h b/games/NXDoom/src/w_file.h
new file mode 100644
index 000000000..be8065cc3
--- /dev/null
+++ b/games/NXDoom/src/w_file.h
@@ -0,0 +1,86 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+
+
+#ifndef __W_FILE__
+#define __W_FILE__
+
+#include <stdio.h>
+#include "doomtype.h"
+
+typedef struct _wad_file_s wad_file_t;
+
+typedef struct
+{
+    // Open a file for reading.
+    wad_file_t *(*OpenFile)(const char *path);
+
+    // Close the specified file.
+    void (*CloseFile)(wad_file_t *file);
+
+    // Read data from the specified position in the file into the 
+    // provided buffer.  Returns the number of bytes read.
+    size_t (*Read)(wad_file_t *file, unsigned int offset,
+                   void *buffer, size_t buffer_len);
+} wad_file_class_t;
+
+
+extern wad_file_class_t stdc_wad_file;
+
+#ifdef _WIN32
+extern wad_file_class_t win32_wad_file;
+#endif
+
+#ifdef HAVE_MMAP
+extern wad_file_class_t posix_wad_file;
+#endif
+
+
+struct _wad_file_s
+{
+    // Class of this file.
+    wad_file_class_t *file_class;
+
+    // If this is NULL, the file cannot be mapped into memory.  If this
+    // is non-NULL, it is a pointer to the mapped file.
+    byte *mapped;
+
+    // Length of the file, in bytes.
+    unsigned int length;
+
+    // File's location on disk.
+    const char *path;
+};
+
+// Open the specified file. Returns a pointer to a new wad_file_t 
+// handle for the WAD file, or NULL if it could not be opened.
+
+wad_file_t *W_OpenFile(const char *path);
+
+// Close the specified WAD file.
+
+void W_CloseFile(wad_file_t *wad);
+
+// Read data from the specified file into the provided buffer.  The
+// data is read from the specified offset from the start of the file.
+// Returns the number of bytes read.
+
+size_t W_Read(wad_file_t *wad, unsigned int offset,
+              void *buffer, size_t buffer_len);
+
+#endif /* #ifndef __W_FILE__ */
diff --git a/games/NXDoom/src/w_file_posix.c b/games/NXDoom/src/w_file_posix.c
new file mode 100644
index 000000000..d4fdc22f9
--- /dev/null
+++ b/games/NXDoom/src/w_file_posix.c
@@ -0,0 +1,176 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+
+#include "config.h"
+
+#ifdef HAVE_MMAP
+
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <string.h>
+
+#include "m_misc.h"
+#include "w_file.h"
+#include "z_zone.h"
+
+typedef struct
+{
+    wad_file_t wad;
+    int handle;
+} posix_wad_file_t;
+
+
+static void MapFile(posix_wad_file_t *wad, const char *filename)
+{
+    void *result;
+    int protection;
+    int flags;
+
+    // Mapped area can be read and written to.  Ideally
+    // this should be read-only, as none of the Doom code should 
+    // change the WAD files after being read.  However, there may
+    // be code lurking in the source that does.
+
+    protection = PROT_READ|PROT_WRITE;
+
+    // Writes to the mapped area result in private changes that are
+    // *not* written to disk.
+
+    flags = MAP_PRIVATE;
+
+    result = mmap(NULL, wad->wad.length,
+                  protection, flags, 
+                  wad->handle, 0);
+
+    if (result == NULL || result == (void *)-1)
+    {
+        fprintf(stderr, "W_POSIX_OpenFile: Unable to mmap() %s - %s\n",
+                        filename, strerror(errno));
+    }
+    else
+    {
+        wad->wad.mapped = result;
+    }
+}
+
+unsigned int GetFileLength(int handle)
+{
+    return lseek(handle, 0, SEEK_END);
+}
+   
+static wad_file_t *W_POSIX_OpenFile(const char *path)
+{
+    posix_wad_file_t *result;
+    int handle;
+
+    handle = open(path, 0);
+
+    if (handle < 0)
+    {
+        return NULL;
+    }
+
+    // Create a new posix_wad_file_t to hold the file handle.
+
+    result = Z_Malloc(sizeof(posix_wad_file_t), PU_STATIC, 0);
+    result->wad.file_class = &posix_wad_file;
+    result->wad.length = GetFileLength(handle);
+    result->wad.path = M_StringDuplicate(path);
+    result->wad.mapped = NULL;
+    result->handle = handle;
+
+    // Try to map the file into memory with mmap:
+
+    MapFile(result, path);
+
+    return &result->wad;
+}
+
+static void W_POSIX_CloseFile(wad_file_t *wad)
+{
+    posix_wad_file_t *posix_wad;
+
+    posix_wad = (posix_wad_file_t *) wad;
+
+    // If mapped, unmap it.
+
+    // Close the file
+
+    if (posix_wad->wad.mapped)
+    {
+        munmap(posix_wad->wad.mapped, posix_wad->wad.length);
+    }
+    close(posix_wad->handle);
+    Z_Free(posix_wad);
+}
+
+// Read data from the specified position in the file into the 
+// provided buffer.  Returns the number of bytes read.
+
+size_t W_POSIX_Read(wad_file_t *wad, unsigned int offset,
+                   void *buffer, size_t buffer_len)
+{
+    posix_wad_file_t *posix_wad;
+    byte *byte_buffer;
+    size_t bytes_read;
+    int result;
+
+    posix_wad = (posix_wad_file_t *) wad;
+
+    // Jump to the specified position in the file.
+
+    lseek(posix_wad->handle, offset, SEEK_SET);
+
+    // Read into the buffer.
+
+    bytes_read = 0;
+    byte_buffer = buffer;
+
+    while (buffer_len > 0) {
+        result = read(posix_wad->handle, byte_buffer, buffer_len);
+
+        if (result < 0) {
+            perror("W_POSIX_Read");
+            break;
+        } else if (result == 0) {
+            break;
+        }
+
+        // Successfully read some bytes
+
+        byte_buffer += result;
+        buffer_len -= result;
+        bytes_read += result;
+    }
+
+    return bytes_read;
+}
+
+
+wad_file_class_t posix_wad_file = 
+{
+    W_POSIX_OpenFile,
+    W_POSIX_CloseFile,
+    W_POSIX_Read,
+};
+
+
+#endif /* #ifdef HAVE_MMAP */
+
diff --git a/games/NXDoom/src/w_file_stdc.c b/games/NXDoom/src/w_file_stdc.c
new file mode 100644
index 000000000..90846a4e1
--- /dev/null
+++ b/games/NXDoom/src/w_file_stdc.c
@@ -0,0 +1,96 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+
+#include <stdio.h>
+
+#include "m_misc.h"
+#include "w_file.h"
+#include "z_zone.h"
+
+typedef struct
+{
+    wad_file_t wad;
+    FILE *fstream;
+} stdc_wad_file_t;
+
+
+static wad_file_t *W_StdC_OpenFile(const char *path)
+{
+    stdc_wad_file_t *result;
+    FILE *fstream;
+
+    fstream = M_fopen(path, "rb");
+
+    if (fstream == NULL)
+    {
+        return NULL;
+    }
+
+    // Create a new stdc_wad_file_t to hold the file handle.
+
+    result = Z_Malloc(sizeof(stdc_wad_file_t), PU_STATIC, 0);
+    result->wad.file_class = &stdc_wad_file;
+    result->wad.mapped = NULL;
+    result->wad.length = M_FileLength(fstream);
+    result->wad.path = M_StringDuplicate(path);
+    result->fstream = fstream;
+
+    return &result->wad;
+}
+
+static void W_StdC_CloseFile(wad_file_t *wad)
+{
+    stdc_wad_file_t *stdc_wad;
+
+    stdc_wad = (stdc_wad_file_t *) wad;
+
+    fclose(stdc_wad->fstream);
+    Z_Free(stdc_wad);
+}
+
+// Read data from the specified position in the file into the 
+// provided buffer.  Returns the number of bytes read.
+
+size_t W_StdC_Read(wad_file_t *wad, unsigned int offset,
+                   void *buffer, size_t buffer_len)
+{
+    stdc_wad_file_t *stdc_wad;
+    size_t result;
+
+    stdc_wad = (stdc_wad_file_t *) wad;
+
+    // Jump to the specified position in the file.
+
+    fseek(stdc_wad->fstream, offset, SEEK_SET);
+
+    // Read into the buffer.
+
+    result = fread(buffer, 1, buffer_len, stdc_wad->fstream);
+
+    return result;
+}
+
+
+wad_file_class_t stdc_wad_file = 
+{
+    W_StdC_OpenFile,
+    W_StdC_CloseFile,
+    W_StdC_Read,
+};
+
+
diff --git a/games/NXDoom/src/w_file_win32.c b/games/NXDoom/src/w_file_win32.c
new file mode 100644
index 000000000..dba576be3
--- /dev/null
+++ b/games/NXDoom/src/w_file_win32.c
@@ -0,0 +1,204 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+
+#include "config.h"
+
+#ifdef _WIN32
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include "i_system.h"
+#include "m_misc.h"
+#include "w_file.h"
+#include "z_zone.h"
+
+// This constant doesn't exist in VC6:
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER 0xffffffff
+#endif
+
+typedef struct
+{
+    wad_file_t wad;
+    HANDLE handle;
+    HANDLE handle_map;
+} win32_wad_file_t;
+
+
+static void MapFile(win32_wad_file_t *wad, const char *filename)
+{
+    wad->handle_map = CreateFileMapping(wad->handle,
+                                        NULL,
+                                        PAGE_WRITECOPY,
+                                        0,
+                                        0,
+                                        NULL);
+
+    if (wad->handle_map == NULL)
+    {
+        fprintf(stderr, "W_Win32_OpenFile: Unable to CreateFileMapping() "
+                        "for %s\n", filename);
+        return;
+    }
+
+    wad->wad.mapped = MapViewOfFile(wad->handle_map,
+                                    FILE_MAP_COPY,
+                                    0, 0, 0);
+
+    if (wad->wad.mapped == NULL)
+    {
+        fprintf(stderr, "W_Win32_OpenFile: Unable to MapViewOfFile() for %s\n",
+                        filename);
+    }
+}
+
+unsigned int GetFileLength(HANDLE handle)
+{
+    DWORD result;
+
+    result = SetFilePointer(handle, 0, NULL, FILE_END);
+
+    if (result == INVALID_SET_FILE_POINTER)
+    {
+        I_Error("W_Win32_OpenFile: Failed to read file length");
+    }
+
+    return result;
+}
+   
+static wad_file_t *W_Win32_OpenFile(const char *path)
+{
+    win32_wad_file_t *result;
+    wchar_t *wpath = NULL;
+    HANDLE handle;
+
+    // Open the file:
+
+    wpath = M_ConvertUtf8ToWide(path);
+
+    if (wpath == NULL)
+    {
+       return NULL;
+    }
+
+    handle = CreateFileW(wpath,
+                         GENERIC_READ,
+                         FILE_SHARE_READ,
+                         NULL,
+                         OPEN_EXISTING,
+                         FILE_ATTRIBUTE_NORMAL,
+                         NULL);
+
+    free(wpath);
+
+    if (handle == INVALID_HANDLE_VALUE)
+    {
+        return NULL;
+    }
+
+    // Create a new win32_wad_file_t to hold the file handle.
+
+    result = Z_Malloc(sizeof(win32_wad_file_t), PU_STATIC, 0);
+    result->wad.file_class = &win32_wad_file;
+    result->wad.length = GetFileLength(handle);
+    result->wad.path = M_StringDuplicate(path);
+    result->handle = handle;
+
+    // Try to map the file into memory with mmap:
+
+    MapFile(result, path);
+
+    return &result->wad;
+}
+
+static void W_Win32_CloseFile(wad_file_t *wad)
+{
+    win32_wad_file_t *win32_wad;
+
+    win32_wad = (win32_wad_file_t *) wad;
+
+    // If mapped, unmap it.
+
+    if (win32_wad->wad.mapped != NULL)
+    {
+        UnmapViewOfFile(win32_wad->wad.mapped);
+    }
+
+    if (win32_wad->handle_map != NULL)
+    {
+        CloseHandle(win32_wad->handle_map);
+    }
+
+    // Close the file
+  
+    if (win32_wad->handle != NULL)
+    {
+        CloseHandle(win32_wad->handle);
+    }
+
+    Z_Free(win32_wad);
+}
+
+// Read data from the specified position in the file into the 
+// provided buffer.  Returns the number of bytes read.
+
+size_t W_Win32_Read(wad_file_t *wad, unsigned int offset,
+                   void *buffer, size_t buffer_len)
+{
+    win32_wad_file_t *win32_wad;
+    DWORD bytes_read;
+    DWORD result;
+
+    win32_wad = (win32_wad_file_t *) wad;
+
+    // Jump to the specified position in the file.
+
+    result = SetFilePointer(win32_wad->handle, offset, NULL, FILE_BEGIN);
+
+    if (result == INVALID_SET_FILE_POINTER)
+    {
+        I_Error("W_Win32_Read: Failed to set file pointer to %i",
+                offset);
+    }
+
+    // Read into the buffer.
+
+    if (!ReadFile(win32_wad->handle, buffer, buffer_len, &bytes_read, NULL))
+    {
+        I_Error("W_Win32_Read: Error reading from file");
+    }
+
+    return bytes_read;
+}
+
+
+wad_file_class_t win32_wad_file = 
+{
+    W_Win32_OpenFile,
+    W_Win32_CloseFile,
+    W_Win32_Read,
+};
+
+
+#endif /* #ifdef _WIN32 */
+
diff --git a/games/NXDoom/src/w_main.c b/games/NXDoom/src/w_main.c
new file mode 100644
index 000000000..3496fd1dd
--- /dev/null
+++ b/games/NXDoom/src/w_main.c
@@ -0,0 +1,268 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Common code to parse command line, identifying WAD files to load.
+//
+
+#include <stdlib.h>
+
+#include "config.h"
+#include "d_iwad.h"
+#include "i_glob.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "w_main.h"
+#include "w_merge.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+// Parse the command line, merging WAD files that are sppecified.
+// Returns true if at least one file was added.
+boolean W_ParseCommandLine(void)
+{
+    boolean modifiedgame = false;
+    int p;
+
+    // Merged PWADs are loaded first, because they are supposed to be 
+    // modified IWADs.
+
+    //!
+    // @arg <files>
+    // @category mod
+    //
+    // Simulates the behavior of deutex's -merge option, merging a PWAD
+    // into the main IWAD.  Multiple files may be specified.
+    //
+
+    p = M_CheckParmWithArgs("-merge", 1);
+
+    if (p > 0)
+    {
+        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
+        {
+            char *filename;
+
+            modifiedgame = true;
+
+            filename = D_TryFindWADByName(myargv[p]);
+
+            printf(" merging %s\n", filename);
+            W_MergeFile(filename);
+            free(filename);
+        }
+    }
+
+    // NWT-style merging:
+
+    // NWT's -merge option:
+
+    //!
+    // @arg <files>
+    // @category mod
+    //
+    // Simulates the behavior of NWT's -merge option.  Multiple files
+    // may be specified.
+
+    p = M_CheckParmWithArgs("-nwtmerge", 1);
+
+    if (p > 0)
+    {
+        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
+        {
+            char *filename;
+
+            modifiedgame = true;
+
+            filename = D_TryFindWADByName(myargv[p]);
+
+            printf(" performing NWT-style merge of %s\n", filename);
+            W_NWTDashMerge(filename);
+            free(filename);
+        }
+    }
+    
+    // Add flats
+
+    //!
+    // @arg <files>
+    // @category mod
+    //
+    // Simulates the behavior of NWT's -af option, merging flats into
+    // the main IWAD directory.  Multiple files may be specified.
+    //
+
+    p = M_CheckParmWithArgs("-af", 1);
+
+    if (p > 0)
+    {
+        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
+        {
+            char *filename;
+
+            modifiedgame = true;
+
+            filename = D_TryFindWADByName(myargv[p]);
+
+            printf(" merging flats from %s\n", filename);
+            W_NWTMergeFile(filename, W_NWT_MERGE_FLATS);
+            free(filename);
+        }
+    }
+
+    //!
+    // @arg <files>
+    // @category mod
+    //
+    // Simulates the behavior of NWT's -as option, merging sprites
+    // into the main IWAD directory.  Multiple files may be specified.
+    //
+
+    p = M_CheckParmWithArgs("-as", 1);
+
+    if (p > 0)
+    {
+        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
+        {
+            char *filename;
+
+            modifiedgame = true;
+            filename = D_TryFindWADByName(myargv[p]);
+
+            printf(" merging sprites from %s\n", filename);
+            W_NWTMergeFile(filename, W_NWT_MERGE_SPRITES);
+            free(filename);
+        }
+    }
+
+    //!
+    // @arg <files>
+    // @category mod
+    //
+    // Equivalent to "-af <files> -as <files>".
+    //
+
+    p = M_CheckParmWithArgs("-aa", 1);
+
+    if (p > 0)
+    {
+        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
+        {
+            char *filename;
+
+            modifiedgame = true;
+
+            filename = D_TryFindWADByName(myargv[p]);
+
+            printf(" merging sprites and flats from %s\n", filename);
+            W_NWTMergeFile(filename, W_NWT_MERGE_SPRITES | W_NWT_MERGE_FLATS);
+            free(filename);
+        }
+    }
+
+    //!
+    // @arg <files>
+    // @vanilla
+    //
+    // Load the specified PWAD files.  Each succeeding argument is
+    // treated as a PWAD file name until one starts with a dash or the
+    // argument list is exhausted.
+    //
+
+    p = M_CheckParmWithArgs ("-file", 1);
+    if (p)
+    {
+	// the parms after p are wadfile/lump names,
+	// until end of parms or another - preceded parm
+	modifiedgame = true;            // homebrew levels
+	while (++p != myargc && myargv[p][0] != '-')
+        {
+            char *filename;
+
+            filename = D_TryFindWADByName(myargv[p]);
+
+            printf(" adding %s\n", filename);
+	    W_AddFile(filename);
+            free(filename);
+        }
+    }
+
+//    W_PrintDirectory();
+
+    return modifiedgame;
+}
+
+// Load all WAD files from the given directory.
+void W_AutoLoadWADs(const char *path)
+{
+    glob_t *glob;
+    const char *filename;
+
+    glob = I_StartMultiGlob(path, GLOB_FLAG_NOCASE|GLOB_FLAG_SORTED,
+                            "*.wad", "*.lmp", NULL);
+    for (;;)
+    {
+        filename = I_NextGlob(glob);
+        if (filename == NULL)
+        {
+            break;
+        }
+        printf(" [autoload] merging %s\n", filename);
+        W_MergeFile(filename);
+    }
+
+    I_EndGlob(glob);
+}
+
+// Lump names that are unique to particular game types. This lets us check
+// the user is not trying to play with the wrong executable, eg.
+// chocolate-doom -iwad hexen.wad.
+static const struct
+{
+    GameMission_t mission;
+    const char *lumpname;
+} unique_lumps[] = {
+    { doom,    "POSSA1" },
+    { heretic, "IMPXA1" },
+    { hexen,   "ETTNA1" },
+    { strife,  "AGRDA1" },
+};
+
+void W_CheckCorrectIWAD(GameMission_t mission)
+{
+    int i;
+    lumpindex_t lumpnum;
+
+    for (i = 0; i < arrlen(unique_lumps); ++i)
+    {
+        if (mission != unique_lumps[i].mission)
+        {
+            lumpnum = W_CheckNumForName(unique_lumps[i].lumpname);
+
+            if (lumpnum >= 0)
+            {
+                I_Error("\nYou are trying to use a %s IWAD file with "
+                        "the %s%s binary.\nThis isn't going to work.\n"
+                        "You probably want to use the %s%s binary.",
+                        D_SuggestGameName(unique_lumps[i].mission,
+                                          indetermined),
+                        PROGRAM_PREFIX,
+                        D_GameMissionString(mission),
+                        PROGRAM_PREFIX,
+                        D_GameMissionString(unique_lumps[i].mission));
+            }
+        }
+    }
+}
+
diff --git a/games/NXDoom/src/w_main.h b/games/NXDoom/src/w_main.h
new file mode 100644
index 000000000..4565c657f
--- /dev/null
+++ b/games/NXDoom/src/w_main.h
@@ -0,0 +1,30 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//     Common code to parse command line, identifying WAD files to load.
+//
+
+#ifndef W_MAIN_H
+#define W_MAIN_H
+
+#include "d_mode.h"
+
+boolean W_ParseCommandLine(void);
+void W_CheckCorrectIWAD(GameMission_t mission);
+
+// Autoload all .wad files from the given directory:
+void W_AutoLoadWADs(const char *path);
+
+#endif /* #ifndef W_MAIN_H */
+
diff --git a/games/NXDoom/src/w_merge.c b/games/NXDoom/src/w_merge.c
new file mode 100644
index 000000000..3d71a9aee
--- /dev/null
+++ b/games/NXDoom/src/w_merge.c
@@ -0,0 +1,722 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+// Handles merging of PWADs, similar to deutex's -merge option
+//
+// Ideally this should work exactly the same as in deutex, but trying to
+// read the deutex source code made my brain hurt.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_misc.h"
+#include "w_merge.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+typedef enum 
+{ 
+    SECTION_NORMAL, 
+    SECTION_FLATS, 
+    SECTION_SPRITES,
+} section_t;
+
+typedef struct
+{
+    lumpinfo_t **lumps;
+    int numlumps;
+} searchlist_t;
+
+typedef struct
+{
+    char sprname[4];
+    char frame;
+    lumpinfo_t *angle_lumps[8];
+} sprite_frame_t;
+
+static searchlist_t iwad;
+static searchlist_t iwad_sprites;
+static searchlist_t pwad;
+
+static searchlist_t iwad_flats;
+static searchlist_t pwad_sprites;
+static searchlist_t pwad_flats;
+
+// lumps with these sprites must be replaced in the IWAD
+static sprite_frame_t *sprite_frames;
+static int num_sprite_frames;
+static int sprite_frames_alloced;
+
+// Search in a list to find a lump with a particular name
+// Linear search (slow!)
+//
+// Returns -1 if not found
+
+static int FindInList(searchlist_t *list, const char *name)
+{
+    int i;
+
+    for (i=0; i<list->numlumps; ++i)
+    {
+        if (!strncasecmp(list->lumps[i]->name, name, 8))
+            return i;
+    }
+
+    return -1;
+}
+
+static boolean SetupList(searchlist_t *list, searchlist_t *src_list,
+                         const char *startname, const char *endname,
+                         const char *startname2, const char *endname2)
+{
+    int startlump, endlump;
+
+    list->numlumps = 0;
+    startlump = FindInList(src_list, startname);
+
+    if (startname2 != NULL && startlump < 0)
+    {
+        startlump = FindInList(src_list, startname2);
+    }
+
+    if (startlump >= 0)
+    {
+        endlump = FindInList(src_list, endname);
+
+        if (endname2 != NULL && endlump < 0)
+        {
+            endlump = FindInList(src_list, endname2);
+        }
+
+        if (endlump > startlump)
+        {
+            list->lumps = src_list->lumps + startlump + 1;
+            list->numlumps = endlump - startlump - 1;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Sets up the sprite/flat search lists
+
+static void SetupLists(void)
+{
+    // IWAD
+
+    if (!SetupList(&iwad_flats, &iwad, "F_START", "F_END", NULL, NULL))
+    {
+        I_Error("Flats section not found in IWAD");
+    }
+
+    if (!SetupList(&iwad_sprites, &iwad, "S_START", "S_END", NULL, NULL))
+
+    {
+        I_Error("Sprites section not found in IWAD");
+    }
+    
+    // PWAD
+
+    SetupList(&pwad_flats, &pwad, "F_START", "F_END", "FF_START", "FF_END");
+    SetupList(&pwad_sprites, &pwad, "S_START", "S_END", "SS_START", "SS_END");
+}
+
+// Initialize the replace list
+
+static void InitSpriteList(void)
+{
+    if (sprite_frames == NULL)
+    {
+        sprite_frames_alloced = 128;
+        sprite_frames = Z_Malloc(sizeof(*sprite_frames) * sprite_frames_alloced,
+                                 PU_STATIC, NULL);
+    }
+
+    num_sprite_frames = 0;
+}
+
+static boolean ValidSpriteLumpName(char *name)
+{
+    if (name[0] == '\0' || name[1] == '\0'
+     || name[2] == '\0' || name[3] == '\0')
+    {
+        return false;
+    }
+
+    // First frame:
+
+    if (name[4] == '\0' || !isdigit(name[5]))
+    {
+        return false;
+    }
+
+    // Second frame (optional):
+
+    if (name[6] != '\0' && !isdigit(name[7]))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+// Find a sprite frame
+
+static sprite_frame_t *FindSpriteFrame(char *name, int frame)
+{
+    sprite_frame_t *result;
+    int i;
+
+    // Search the list and try to find the frame
+
+    for (i=0; i<num_sprite_frames; ++i)
+    {
+        sprite_frame_t *cur = &sprite_frames[i];
+
+        if (!strncasecmp(cur->sprname, name, 4) && cur->frame == frame)
+        {
+            return cur;
+        }
+    }
+
+    // Not found in list; Need to add to the list
+
+    // Grow list?
+
+    if (num_sprite_frames >= sprite_frames_alloced)
+    {
+        sprite_frame_t *newframes;
+
+        newframes = Z_Malloc(sprite_frames_alloced * 2 * sizeof(*sprite_frames),
+                             PU_STATIC, NULL);
+        memcpy(newframes, sprite_frames,
+               sprite_frames_alloced * sizeof(*sprite_frames));
+        Z_Free(sprite_frames);
+        sprite_frames_alloced *= 2;
+        sprite_frames = newframes;
+    }
+
+    // Add to end of list
+    
+    result = &sprite_frames[num_sprite_frames];
+    memcpy(result->sprname, name, 4);
+    result->frame = frame;
+
+    for (i=0; i<8; ++i)
+        result->angle_lumps[i] = NULL;
+
+    ++num_sprite_frames;
+
+    return result;
+}
+
+// Check if sprite lump is needed in the new wad
+
+static boolean SpriteLumpNeeded(lumpinfo_t *lump)
+{
+    sprite_frame_t *sprite;
+    int angle_num;
+    int i;
+
+    if (!ValidSpriteLumpName(lump->name))
+    {
+        return true;
+    }
+
+    // check the first frame
+
+    sprite = FindSpriteFrame(lump->name, lump->name[4]);
+    angle_num = lump->name[5] - '0';
+
+    if (angle_num == 0)
+    {
+        // must check all frames
+
+        for (i=0; i<8; ++i)
+        {
+            if (sprite->angle_lumps[i] == lump)
+                return true;
+        }
+    }
+    else 
+    {
+        // check if this lump is being used for this frame
+
+        if (sprite->angle_lumps[angle_num - 1] == lump)
+            return true;
+    }
+            
+    // second frame if any
+    
+    // no second frame?
+    if (lump->name[6] == '\0')
+        return false;
+
+    sprite = FindSpriteFrame(lump->name, lump->name[6]);
+    angle_num = lump->name[7] - '0';
+
+    if (angle_num == 0)
+    {
+        // must check all frames
+
+        for (i=0; i<8; ++i)
+        {
+            if (sprite->angle_lumps[i] == lump)
+                return true;
+        }
+    }
+    else 
+    {
+        // check if this lump is being used for this frame
+
+        if (sprite->angle_lumps[angle_num - 1] == lump)
+            return true;
+    }
+
+    return false;
+}
+
+static void AddSpriteLump(lumpinfo_t *lump)
+{
+    sprite_frame_t *sprite;
+    int angle_num;
+    int i;
+
+    if (!ValidSpriteLumpName(lump->name))
+    {
+        return;
+    }
+    
+    // first angle
+
+    sprite = FindSpriteFrame(lump->name, lump->name[4]);
+    angle_num = lump->name[5] - '0';
+    
+    if (angle_num == 0) 
+    {
+        for (i=0; i<8; ++i)
+            sprite->angle_lumps[i] = lump;
+    }
+    else
+    {
+        sprite->angle_lumps[angle_num - 1] = lump;
+    }
+    
+    // second angle
+
+    // no second angle?
+  
+    if (lump->name[6] == '\0')
+        return;
+    
+    sprite = FindSpriteFrame(lump->name, lump->name[6]);
+    angle_num = lump->name[7] - '0';
+    
+    if (angle_num == 0) 
+    {
+        for (i=0; i<8; ++i)
+            sprite->angle_lumps[i] = lump;
+    }
+    else
+    {
+        sprite->angle_lumps[angle_num - 1] = lump;
+    }
+}
+
+// Generate the list.  Run at the start, before merging
+
+static void GenerateSpriteList(void)
+{
+    int i;
+
+    InitSpriteList();
+    
+    // Add all sprites from the IWAD
+    
+    for (i=0; i<iwad_sprites.numlumps; ++i)
+    {
+        AddSpriteLump(iwad_sprites.lumps[i]);
+    }
+    
+    // Add all sprites from the PWAD
+    // (replaces IWAD sprites)
+
+    for (i=0; i<pwad_sprites.numlumps; ++i)
+    {
+        AddSpriteLump(pwad_sprites.lumps[i]);
+    }
+}
+
+// Perform the merge.
+//
+// The merge code creates a new lumpinfo list, adding entries from the
+// IWAD first followed by the PWAD.
+//
+// For the IWAD:
+//  * Flats are added.  If a flat with the same name is in the PWAD, 
+//    it is ignored(deleted).  At the end of the section, all flats in the 
+//    PWAD are inserted.  This is consistent with the behavior of 
+//    deutex/deusf.
+//  * Sprites are added.  The "replace list" is generated before the merge
+//    from the list of sprites in the PWAD.  Any sprites in the IWAD found
+//    to match the replace list are removed.  At the end of the section,
+//    the sprites from the PWAD are inserted.
+// 
+// For the PWAD:
+//  * All Sprites and Flats are ignored, with the assumption they have 
+//    already been merged into the IWAD's sections.
+
+static void DoMerge(void)
+{
+    section_t current_section;
+    lumpinfo_t **newlumps;
+    int num_newlumps;
+    int lumpindex;
+    int i, n;
+
+    // Can't ever have more lumps than we already have
+    newlumps = calloc(numlumps, sizeof(lumpinfo_t *));
+    num_newlumps = 0;
+
+    // Add IWAD lumps
+    current_section = SECTION_NORMAL;
+
+    for (i=0; i<iwad.numlumps; ++i)
+    {
+        lumpinfo_t *lump = iwad.lumps[i];
+
+        switch (current_section)
+        {
+            case SECTION_NORMAL:
+                if (!strncasecmp(lump->name, "F_START", 8))
+                {
+                    current_section = SECTION_FLATS;
+                }
+                else if (!strncasecmp(lump->name, "S_START", 8))
+                {
+                    current_section = SECTION_SPRITES;
+                }
+
+                newlumps[num_newlumps++] = lump;
+
+                break;
+
+            case SECTION_FLATS:
+
+                // Have we reached the end of the section?
+
+                if (!strncasecmp(lump->name, "F_END", 8))
+                {
+                    // Add all new flats from the PWAD to the end
+                    // of the section
+
+                    for (n=0; n<pwad_flats.numlumps; ++n)
+                    {
+                        newlumps[num_newlumps++] = pwad_flats.lumps[n];
+                    }
+
+                    newlumps[num_newlumps++] = lump;
+
+                    // back to normal reading
+                    current_section = SECTION_NORMAL;
+                }
+                else
+                {
+                    // If there is a flat in the PWAD with the same name,
+                    // do not add it now.  All PWAD flats are added to the
+                    // end of the section. Otherwise, if it is only in the
+                    // IWAD, add it now
+
+                    lumpindex = FindInList(&pwad_flats, lump->name);
+
+                    if (lumpindex < 0)
+                    {
+                        newlumps[num_newlumps++] = lump;
+                    }
+                }
+
+                break;
+
+            case SECTION_SPRITES:
+
+                // Have we reached the end of the section?
+
+                if (!strncasecmp(lump->name, "S_END", 8))
+                {
+                    // add all the PWAD sprites
+
+                    for (n=0; n<pwad_sprites.numlumps; ++n)
+                    {
+                        if (SpriteLumpNeeded(pwad_sprites.lumps[n]))
+                        {
+                            newlumps[num_newlumps++] = pwad_sprites.lumps[n];
+                        }
+                    }
+
+                    // copy the ending
+                    newlumps[num_newlumps++] = lump;
+
+                    // back to normal reading
+                    current_section = SECTION_NORMAL;
+                }
+                else
+                {
+                    // Is this lump holding a sprite to be replaced in the
+                    // PWAD? If so, wait until the end to add it.
+
+                    if (SpriteLumpNeeded(lump))
+                    {
+                        newlumps[num_newlumps++] = lump;
+                    }
+                }
+
+                break;
+        }
+    }
+   
+    // Add PWAD lumps
+    current_section = SECTION_NORMAL;
+
+    for (i=0; i<pwad.numlumps; ++i)
+    {
+        lumpinfo_t *lump = pwad.lumps[i];
+
+        switch (current_section)
+        {
+            case SECTION_NORMAL:
+                if (!strncasecmp(lump->name, "F_START", 8)
+                 || !strncasecmp(lump->name, "FF_START", 8))
+                {
+                    current_section = SECTION_FLATS;
+                }
+                else if (!strncasecmp(lump->name, "S_START", 8)
+                      || !strncasecmp(lump->name, "SS_START", 8))
+                {
+                    current_section = SECTION_SPRITES;
+                }
+                else
+                {
+                    // Don't include the headers of sections
+       
+                    newlumps[num_newlumps++] = lump;
+                }
+                break;
+
+            case SECTION_FLATS:
+
+                // PWAD flats are ignored (already merged)
+  
+                if (!strncasecmp(lump->name, "FF_END", 8)
+                 || !strncasecmp(lump->name, "F_END", 8))
+                {
+                    // end of section
+                    current_section = SECTION_NORMAL;
+                }
+                break;
+
+            case SECTION_SPRITES:
+
+                // PWAD sprites are ignored (already merged)
+
+                if (!strncasecmp(lump->name, "SS_END", 8)
+                 || !strncasecmp(lump->name, "S_END", 8))
+                {
+                    // end of section
+                    current_section = SECTION_NORMAL;
+                }
+                break;
+        }
+    }
+
+    // Switch to the new lumpinfo, and free the old one
+
+    free(lumpinfo);
+    lumpinfo = newlumps;
+    numlumps = num_newlumps;
+}
+
+void W_PrintDirectory(void)
+{
+    unsigned int i, n;
+
+    // debug
+    for (i=0; i<numlumps; ++i)
+    {
+        for (n=0; n<8 && lumpinfo[i]->name[n] != '\0'; ++n)
+            putchar(lumpinfo[i]->name[n]);
+        putchar('\n');
+    }
+}
+
+// Merge in a file by name
+
+void W_MergeFile(const char *filename)
+{
+    int old_numlumps;
+
+    old_numlumps = numlumps;
+
+    // Load PWAD
+
+    if (W_AddFile(filename) == NULL)
+        return;
+
+    // IWAD is at the start, PWAD was appended to the end
+
+    iwad.lumps = lumpinfo;
+    iwad.numlumps = old_numlumps;
+
+    pwad.lumps = lumpinfo + old_numlumps;
+    pwad.numlumps = numlumps - old_numlumps;
+    
+    // Setup sprite/flat lists
+
+    SetupLists();
+
+    // Generate list of sprites to be replaced by the PWAD
+
+    GenerateSpriteList();
+
+    // Perform the merge
+
+    DoMerge();
+}
+
+// Replace lumps in the given list with lumps from the PWAD
+
+static void W_NWTAddLumps(searchlist_t *list)
+{
+    int i;
+
+    // Go through the IWAD list given, replacing lumps with lumps of
+    // the same name from the PWAD
+    for (i=0; i<list->numlumps; ++i)
+    {
+        int index;
+
+        index = FindInList(&pwad, list->lumps[i]->name);
+
+        if (index > 0)
+        {
+            memcpy(list->lumps[i], pwad.lumps[index],
+                   sizeof(lumpinfo_t));
+        }
+    }
+}
+
+// Merge sprites and flats in the way NWT does with its -af and -as
+// command-line options.
+
+void W_NWTMergeFile(const char *filename, int flags)
+{
+    int old_numlumps;
+
+    old_numlumps = numlumps;
+
+    // Load PWAD
+
+    if (W_AddFile(filename) == NULL)
+        return;
+
+    // IWAD is at the start, PWAD was appended to the end
+
+    iwad.lumps = lumpinfo;
+    iwad.numlumps = old_numlumps;
+
+    pwad.lumps = lumpinfo + old_numlumps;
+    pwad.numlumps = numlumps - old_numlumps;
+
+    // Setup sprite/flat lists
+
+    SetupLists();
+
+    // Merge in flats?
+
+    if (flags & W_NWT_MERGE_FLATS)
+    {
+        W_NWTAddLumps(&iwad_flats);
+    }
+
+    // Sprites?
+
+    if (flags & W_NWT_MERGE_SPRITES)
+    {
+        W_NWTAddLumps(&iwad_sprites);
+    }
+    
+    // Discard the PWAD
+
+    numlumps = old_numlumps;
+}
+
+// Simulates the NWT -merge command line parameter.  What this does is load
+// a PWAD, then search the IWAD sprites, removing any sprite lumps that also
+// exist in the PWAD.
+
+void W_NWTDashMerge(const char *filename)
+{
+    wad_file_t *wad_file;
+    int old_numlumps;
+    int i;
+
+    old_numlumps = numlumps;
+
+    // Load PWAD
+
+    wad_file = W_AddFile(filename);
+
+    if (wad_file == NULL)
+    {
+        return;
+    }
+
+    // IWAD is at the start, PWAD was appended to the end
+
+    iwad.lumps = lumpinfo;
+    iwad.numlumps = old_numlumps;
+
+    pwad.lumps = lumpinfo + old_numlumps;
+    pwad.numlumps = numlumps - old_numlumps;
+
+    // Setup sprite/flat lists
+
+    SetupLists();
+
+    // Search through the IWAD sprites list.
+
+    for (i=0; i<iwad_sprites.numlumps; ++i)
+    {
+        if (FindInList(&pwad, iwad_sprites.lumps[i]->name) >= 0)
+        {
+            // Replace this entry with an empty string.  This is what
+            // nwt -merge does.
+
+            M_StringCopy(iwad_sprites.lumps[i]->name, "", 8);
+        }
+    }
+
+    // Discard PWAD
+    // The PWAD must now be added in again with -file.
+
+    numlumps = old_numlumps;
+
+    W_CloseFile(wad_file);
+}
+
diff --git a/games/NXDoom/src/w_merge.h b/games/NXDoom/src/w_merge.h
new file mode 100644
index 000000000..b88c9a3a1
--- /dev/null
+++ b/games/NXDoom/src/w_merge.h
@@ -0,0 +1,44 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+// Handles merging of PWADs, similar to deutex's -merge option
+//
+// Ideally this should work exactly the same as in deutex, but trying to
+// read the deutex source code made my brain hurt.
+//
+
+#ifndef W_MERGE_H
+#define W_MERGE_H
+
+#define W_NWT_MERGE_SPRITES   0x1
+#define W_NWT_MERGE_FLATS     0x2
+
+// Add a new WAD and merge it into the main directory
+
+void W_MergeFile(const char *filename);
+
+// NWT-style merging
+
+void W_NWTMergeFile(const char *filename, int flags);
+
+// Acts the same as NWT's "-merge" option.
+
+void W_NWTDashMerge(const char *filename);
+
+// Debug function that prints the WAD directory.
+
+void W_PrintDirectory(void);
+
+#endif /* #ifndef W_MERGE_H */
+
diff --git a/games/NXDoom/src/w_wad.c b/games/NXDoom/src/w_wad.c
new file mode 100644
index 000000000..1b091834f
--- /dev/null
+++ b/games/NXDoom/src/w_wad.c
@@ -0,0 +1,629 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Handles WAD file header, directory, lump I/O.
+//
+
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "i_swap.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "m_misc.h"
+#include "v_diskicon.h"
+#include "z_zone.h"
+
+#include "w_wad.h"
+
+typedef PACKED_STRUCT (
+{
+    // Should be "IWAD" or "PWAD".
+    char		identification[4];
+    int			numlumps;
+    int			infotableofs;
+}) wadinfo_t;
+
+
+typedef PACKED_STRUCT (
+{
+    int			filepos;
+    int			size;
+    char		name[8];
+}) filelump_t;
+
+//
+// GLOBALS
+//
+
+// Location of each lump on disk.
+lumpinfo_t **lumpinfo;
+unsigned int numlumps = 0;
+
+// Hash table for fast lookups
+static lumpindex_t *lumphash;
+
+// Variables for the reload hack: filename of the PWAD to reload, and the
+// lumps from WADs before the reload file, so we can resent numlumps and
+// load the file again.
+static wad_file_t *reloadhandle = NULL;
+static lumpinfo_t *reloadlumps = NULL;
+static char *reloadname = NULL;
+static int reloadlump = -1;
+
+// Hash function used for lump names.
+unsigned int W_LumpNameHash(const char *s)
+{
+    // This is the djb2 string hash function, modded to work on strings
+    // that have a maximum length of 8.
+
+    unsigned int result = 5381;
+    unsigned int i;
+
+    for (i=0; i < 8 && s[i] != '\0'; ++i)
+    {
+        result = ((result << 5) ^ result ) ^ toupper(s[i]);
+    }
+
+    return result;
+}
+
+//
+// LUMP BASED ROUTINES.
+//
+
+//
+// W_AddFile
+// All files are optional, but at least one file must be
+//  found (PWAD, if all required lumps are present).
+// Files with a .wad extension are wadlink files
+//  with multiple lumps.
+// Other files are single lumps with the base filename
+//  for the lump name.
+
+wad_file_t *W_AddFile (const char *filename)
+{
+    wadinfo_t header;
+    lumpindex_t i;
+    wad_file_t *wad_file;
+    int length;
+    int startlump;
+    filelump_t *fileinfo;
+    filelump_t *filerover;
+    lumpinfo_t *filelumps;
+    int numfilelumps;
+
+    // If the filename begins with a ~, it indicates that we should use the
+    // reload hack.
+    if (filename[0] == '~')
+    {
+        if (reloadname != NULL)
+        {
+            I_Error("Prefixing a WAD filename with '~' indicates that the "
+                    "WAD should be reloaded\n"
+                    "on each level restart, for use by level authors for "
+                    "rapid development. You\n"
+                    "can only reload one WAD file, and it must be the last "
+                    "file in the -file list.");
+        }
+
+        reloadname = strdup(filename);
+        reloadlump = numlumps;
+        ++filename;
+    }
+
+    // Open the file and add to directory
+    wad_file = W_OpenFile(filename);
+
+    if (wad_file == NULL)
+    {
+	printf (" couldn't open %s\n", filename);
+	return NULL;
+    }
+
+    if (strcasecmp(filename+strlen(filename)-3 , "wad" ) )
+    {
+	// single lump file
+
+        // fraggle: Swap the filepos and size here.  The WAD directory
+        // parsing code expects a little-endian directory, so will swap
+        // them back.  Effectively we're constructing a "fake WAD directory"
+        // here, as it would appear on disk.
+
+	fileinfo = Z_Malloc(sizeof(filelump_t), PU_STATIC, 0);
+	fileinfo->filepos = LONG(0);
+	fileinfo->size = LONG(wad_file->length);
+
+        // Name the lump after the base of the filename (without the
+        // extension).
+
+	M_ExtractFileBase (filename, fileinfo->name);
+	numfilelumps = 1;
+    }
+    else
+    {
+	// WAD file
+        W_Read(wad_file, 0, &header, sizeof(header));
+
+	if (strncmp(header.identification,"IWAD",4))
+	{
+	    // Homebrew levels?
+	    if (strncmp(header.identification,"PWAD",4))
+	    {
+		W_CloseFile(wad_file);
+		I_Error ("Wad file %s doesn't have IWAD "
+			 "or PWAD id\n", filename);
+	    }
+
+	    // ???modifiedgame = true;
+	}
+
+	header.numlumps = LONG(header.numlumps);
+
+         // Vanilla Doom doesn't like WADs with more than 4046 lumps
+         // https://www.doomworld.com/vb/post/1010985
+         if (!strncmp(header.identification,"PWAD",4) && header.numlumps > 4046)
+         {
+                 W_CloseFile(wad_file);
+                 I_Error ("Error: Vanilla limit for lumps in a WAD is 4046, "
+                          "PWAD %s has %d", filename, header.numlumps);
+         }
+
+	header.infotableofs = LONG(header.infotableofs);
+	length = header.numlumps*sizeof(filelump_t);
+	fileinfo = Z_Malloc(length, PU_STATIC, 0);
+
+        W_Read(wad_file, header.infotableofs, fileinfo, length);
+	numfilelumps = header.numlumps;
+    }
+
+    // Increase size of numlumps array to accomodate the new file.
+    filelumps = calloc(numfilelumps, sizeof(lumpinfo_t));
+    if (filelumps == NULL)
+    {
+        W_CloseFile(wad_file);
+        I_Error("Failed to allocate array for lumps from new file.");
+    }
+
+    startlump = numlumps;
+    numlumps += numfilelumps;
+    lumpinfo = I_Realloc(lumpinfo, numlumps * sizeof(lumpinfo_t *));
+    filerover = fileinfo;
+
+    for (i = startlump; i < numlumps; ++i)
+    {
+        lumpinfo_t *lump_p = &filelumps[i - startlump];
+        lump_p->wad_file = wad_file;
+        lump_p->position = LONG(filerover->filepos);
+        lump_p->size = LONG(filerover->size);
+        lump_p->cache = NULL;
+        strncpy(lump_p->name, filerover->name, 8);
+        lumpinfo[i] = lump_p;
+
+        ++filerover;
+    }
+
+    Z_Free(fileinfo);
+
+    if (lumphash != NULL)
+    {
+        Z_Free(lumphash);
+        lumphash = NULL;
+    }
+
+    // If this is the reload file, we need to save some details about the
+    // file so that we can close it later on when we do a reload.
+    if (reloadname)
+    {
+        reloadhandle = wad_file;
+        reloadlumps = filelumps;
+    }
+
+    return wad_file;
+}
+
+
+
+//
+// W_NumLumps
+//
+int W_NumLumps (void)
+{
+    return numlumps;
+}
+
+
+
+//
+// W_CheckNumForName
+// Returns -1 if name not found.
+//
+
+lumpindex_t W_CheckNumForName(const char *name)
+{
+    lumpindex_t i;
+
+    // Do we have a hash table yet?
+
+    if (lumphash != NULL)
+    {
+        int hash;
+
+        // We do! Excellent.
+
+        hash = W_LumpNameHash(name) % numlumps;
+
+        for (i = lumphash[hash]; i != -1; i = lumpinfo[i]->next)
+        {
+            if (!strncasecmp(lumpinfo[i]->name, name, 8))
+            {
+                return i;
+            }
+        }
+    }
+    else
+    {
+        // We don't have a hash table generate yet. Linear search :-(
+        //
+        // scan backwards so patch lump files take precedence
+
+        for (i = numlumps - 1; i >= 0; --i)
+        {
+            if (!strncasecmp(lumpinfo[i]->name, name, 8))
+            {
+                return i;
+            }
+        }
+    }
+
+    // TFB. Not found.
+
+    return -1;
+}
+
+
+
+
+//
+// W_GetNumForName
+// Calls W_CheckNumForName, but bombs out if not found.
+//
+lumpindex_t W_GetNumForName(const char *name)
+{
+    lumpindex_t i;
+
+    i = W_CheckNumForName (name);
+
+    if (i < 0)
+    {
+        I_Error ("W_GetNumForName: %s not found!", name);
+    }
+ 
+    return i;
+}
+
+
+//
+// W_LumpLength
+// Returns the buffer size needed to load the given lump.
+//
+int W_LumpLength(lumpindex_t lump)
+{
+    if (lump >= numlumps)
+    {
+	I_Error ("W_LumpLength: %i >= numlumps", lump);
+    }
+
+    return lumpinfo[lump]->size;
+}
+
+
+
+//
+// W_ReadLump
+// Loads the lump into the given buffer,
+//  which must be >= W_LumpLength().
+//
+void W_ReadLump(lumpindex_t lump, void *dest)
+{
+    int c;
+    lumpinfo_t *l;
+
+    if (lump >= numlumps)
+    {
+        I_Error ("W_ReadLump: %i >= numlumps", lump);
+    }
+
+    l = lumpinfo[lump];
+
+    V_BeginRead(l->size);
+
+    c = W_Read(l->wad_file, l->position, dest, l->size);
+
+    if (c < l->size)
+    {
+        I_Error("W_ReadLump: only read %i of %i on lump %i",
+                c, l->size, lump);
+    }
+}
+
+
+
+
+//
+// W_CacheLumpNum
+//
+// Load a lump into memory and return a pointer to a buffer containing
+// the lump data.
+//
+// 'tag' is the type of zone memory buffer to allocate for the lump
+// (usually PU_STATIC or PU_CACHE).  If the lump is loaded as 
+// PU_STATIC, it should be released back using W_ReleaseLumpNum
+// when no longer needed (do not use Z_ChangeTag).
+//
+
+void *W_CacheLumpNum(lumpindex_t lumpnum, int tag)
+{
+    byte *result;
+    lumpinfo_t *lump;
+
+    if ((unsigned)lumpnum >= numlumps)
+    {
+	I_Error ("W_CacheLumpNum: %i >= numlumps", lumpnum);
+    }
+
+    lump = lumpinfo[lumpnum];
+
+    // Get the pointer to return.  If the lump is in a memory-mapped
+    // file, we can just return a pointer to within the memory-mapped
+    // region.  If the lump is in an ordinary file, we may already
+    // have it cached; otherwise, load it into memory.
+
+    if (lump->wad_file->mapped != NULL)
+    {
+        // Memory mapped file, return from the mmapped region.
+
+        result = lump->wad_file->mapped + lump->position;
+    }
+    else if (lump->cache != NULL)
+    {
+        // Already cached, so just switch the zone tag.
+
+        result = lump->cache;
+        Z_ChangeTag(lump->cache, tag);
+    }
+    else
+    {
+        // Not yet loaded, so load it now
+
+        lump->cache = Z_Malloc(W_LumpLength(lumpnum), tag, &lump->cache);
+	W_ReadLump (lumpnum, lump->cache);
+        result = lump->cache;
+    }
+	
+    return result;
+}
+
+
+
+//
+// W_CacheLumpName
+//
+void *W_CacheLumpName(const char *name, int tag)
+{
+    return W_CacheLumpNum(W_GetNumForName(name), tag);
+}
+
+// 
+// Release a lump back to the cache, so that it can be reused later 
+// without having to read from disk again, or alternatively, discarded
+// if we run out of memory.
+//
+// Back in Vanilla Doom, this was just done using Z_ChangeTag 
+// directly, but now that we have WAD mmap, things are a bit more
+// complicated ...
+//
+
+void W_ReleaseLumpNum(lumpindex_t lumpnum)
+{
+    lumpinfo_t *lump;
+
+    if ((unsigned)lumpnum >= numlumps)
+    {
+	I_Error ("W_ReleaseLumpNum: %i >= numlumps", lumpnum);
+    }
+
+    lump = lumpinfo[lumpnum];
+
+    if (lump->wad_file->mapped != NULL)
+    {
+        // Memory-mapped file, so nothing needs to be done here.
+    }
+    else
+    {
+        Z_ChangeTag(lump->cache, PU_CACHE);
+    }
+}
+
+void W_ReleaseLumpName(const char *name)
+{
+    W_ReleaseLumpNum(W_GetNumForName(name));
+}
+
+#if 0
+
+//
+// W_Profile
+//
+int		info[2500][10];
+int		profilecount;
+
+void W_Profile (void)
+{
+    int		i;
+    memblock_t*	block;
+    void*	ptr;
+    char	ch;
+    FILE*	f;
+    int		j;
+    char	name[9];
+	
+	
+    for (i=0 ; i<numlumps ; i++)
+    {	
+	ptr = lumpinfo[i].cache;
+	if (!ptr)
+	{
+	    ch = ' ';
+	    continue;
+	}
+	else
+	{
+	    block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
+	    if (block->tag < PU_PURGELEVEL)
+		ch = 'S';
+	    else
+		ch = 'P';
+	}
+	info[i][profilecount] = ch;
+    }
+    profilecount++;
+	
+    f = M_fopen ("waddump.txt","w");
+    name[8] = 0;
+
+    for (i=0 ; i<numlumps ; i++)
+    {
+	memcpy (name,lumpinfo[i].name,8);
+
+	for (j=0 ; j<8 ; j++)
+	    if (!name[j])
+		break;
+
+	for ( ; j<8 ; j++)
+	    name[j] = ' ';
+
+	fprintf (f,"%s ",name);
+
+	for (j=0 ; j<profilecount ; j++)
+	    fprintf (f,"    %c",info[i][j]);
+
+	fprintf (f,"\n");
+    }
+    fclose (f);
+}
+
+
+#endif
+
+// Generate a hash table for fast lookups
+
+void W_GenerateHashTable(void)
+{
+    lumpindex_t i;
+
+    // Free the old hash table, if there is one:
+    if (lumphash != NULL)
+    {
+        Z_Free(lumphash);
+    }
+
+    // Generate hash table
+    if (numlumps > 0)
+    {
+        lumphash = Z_Malloc(sizeof(lumpindex_t) * numlumps, PU_STATIC, NULL);
+
+        for (i = 0; i < numlumps; ++i)
+        {
+            lumphash[i] = -1;
+        }
+
+        for (i = 0; i < numlumps; ++i)
+        {
+            unsigned int hash;
+
+            hash = W_LumpNameHash(lumpinfo[i]->name) % numlumps;
+
+            // Hook into the hash table
+
+            lumpinfo[i]->next = lumphash[hash];
+            lumphash[hash] = i;
+        }
+    }
+
+    // All done!
+}
+
+// The Doom reload hack. The idea here is that if you give a WAD file to -file
+// prefixed with the ~ hack, that WAD file will be reloaded each time a new
+// level is loaded. This lets you use a level editor in parallel and make
+// incremental changes to the level you're working on without having to restart
+// the game after every change.
+// But: the reload feature is a fragile hack...
+void W_Reload(void)
+{
+    char *filename;
+    lumpindex_t i;
+
+    if (reloadname == NULL)
+    {
+        return;
+    }
+
+    // We must free any lumps being cached from the PWAD we're about to reload:
+    for (i = reloadlump; i < numlumps; ++i)
+    {
+        if (lumpinfo[i]->cache != NULL)
+        {
+            Z_Free(lumpinfo[i]->cache);
+        }
+    }
+
+    // Reset numlumps to remove the reload WAD file:
+    numlumps = reloadlump;
+
+    // Now reload the WAD file.
+    filename = reloadname;
+
+    W_CloseFile(reloadhandle);
+    free(reloadlumps);
+
+    reloadname = NULL;
+    reloadlump = -1;
+    reloadhandle = NULL;
+    W_AddFile(filename);
+    free(filename);
+
+    // The WAD directory has changed, so we have to regenerate the
+    // fast lookup hashtable:
+    W_GenerateHashTable();
+}
+
+const char *W_WadNameForLump(const lumpinfo_t *lump)
+{
+	return M_BaseName(lump->wad_file->path);
+}
+
+boolean W_IsIWADLump(const lumpinfo_t *lump)
+{
+	return lump->wad_file == lumpinfo[0]->wad_file;
+}
diff --git a/games/NXDoom/src/w_wad.h b/games/NXDoom/src/w_wad.h
new file mode 100644
index 000000000..ae5977a27
--- /dev/null
+++ b/games/NXDoom/src/w_wad.h
@@ -0,0 +1,78 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+
+
+#ifndef __W_WAD__
+#define __W_WAD__
+
+#include <stdio.h>
+
+#include "doomtype.h"
+#include "w_file.h"
+
+
+//
+// TYPES
+//
+
+//
+// WADFILE I/O related stuff.
+//
+
+typedef struct lumpinfo_s lumpinfo_t;
+typedef int lumpindex_t;
+
+struct lumpinfo_s
+{
+    char	name[8];
+    wad_file_t *wad_file;
+    int		position;
+    int		size;
+    void       *cache;
+
+    // Used for hash table lookups
+    lumpindex_t next;
+};
+
+
+extern lumpinfo_t **lumpinfo;
+extern unsigned int numlumps;
+
+wad_file_t *W_AddFile(const char *filename);
+void W_Reload(void);
+
+lumpindex_t W_CheckNumForName(const char *name);
+lumpindex_t W_GetNumForName(const char *name);
+
+int W_LumpLength(lumpindex_t lump);
+void W_ReadLump(lumpindex_t lump, void *dest);
+
+void *W_CacheLumpNum(lumpindex_t lump, int tag);
+void *W_CacheLumpName(const char *name, int tag);
+
+void W_GenerateHashTable(void);
+
+extern unsigned int W_LumpNameHash(const char *s);
+
+void W_ReleaseLumpNum(lumpindex_t lump);
+void W_ReleaseLumpName(const char *name);
+
+const char *W_WadNameForLump(const lumpinfo_t *lump);
+boolean W_IsIWADLump(const lumpinfo_t *lump);
+
+#endif
diff --git a/games/NXDoom/src/z_native.c b/games/NXDoom/src/z_native.c
new file mode 100644
index 000000000..c7f8f3cd5
--- /dev/null
+++ b/games/NXDoom/src/z_native.c
@@ -0,0 +1,506 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Zone Memory Allocation. Neat.
+//
+//	This is an implementation of the zone memory API which
+//	uses native calls to malloc() and free().
+//
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "z_zone.h"
+#include "i_system.h"
+#include "doomtype.h"
+
+#define ZONEID	0x1d4a11
+
+typedef struct memblock_s memblock_t;
+
+struct memblock_s
+{
+    int id; // = ZONEID
+    int tag;
+    int size;
+    void **user;
+    memblock_t *prev;
+    memblock_t *next;
+};
+
+// Linked list of allocated blocks for each tag type
+ 
+static memblock_t *allocated_blocks[PU_NUM_TAGS];
+
+#ifdef TESTING
+
+static int test_malloced = 0;
+
+void *test_malloc(size_t size)
+{
+    int *result;
+
+    if (test_malloced + size > 2 * 1024 * 1024)
+    {
+        return NULL;
+    }
+
+    test_malloced += size;
+
+    result = malloc(size + sizeof(int));
+
+    *result = size;
+
+    return result + 1;
+}
+
+void test_free(void *data)
+{
+    int *i;
+
+    i = ((int *) data) - 1;
+
+    test_malloced -= *i;
+
+    free(i);
+}
+
+#define malloc test_malloc
+#define free test_free
+
+#endif /* #ifdef TESTING */
+
+
+// Add a block into the linked list for its type.
+
+static void Z_InsertBlock(memblock_t *block)
+{
+    block->prev = NULL;
+    block->next = allocated_blocks[block->tag];
+    allocated_blocks[block->tag] = block;
+    
+    if (block->next != NULL)
+    {
+        block->next->prev = block;
+    }
+}
+
+// Remove a block from its linked list.
+
+static void Z_RemoveBlock(memblock_t *block)
+{
+    // Unlink from list
+
+    if (block->prev == NULL)
+    {
+        // Start of list
+
+        allocated_blocks[block->tag] = block->next;
+    }
+    else
+    {
+        if (block->prev->next != block)
+        {
+            I_Error("Z_RemoveBlock: Doubly-linked list corrupted!");
+        }
+        block->prev->next = block->next;
+    }
+
+    if (block->next != NULL)
+    {
+        if (block->next->prev != block)
+        {
+            I_Error("Z_RemoveBlock: Doubly-linked list corrupted!");
+        }
+        block->next->prev = block->prev;
+    }
+}
+
+//
+// Z_Init
+//
+void Z_Init (void)
+{
+    memset(allocated_blocks, 0, sizeof(allocated_blocks));
+    printf("zone memory: Using native C allocator.\n");
+}
+
+
+//
+// Z_Free
+//
+void Z_Free (void* ptr)
+{
+    memblock_t*		block;
+
+    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+
+    if (block->id != ZONEID)
+    {
+        I_Error ("Z_Free: freed a pointer without ZONEID");
+    }
+		
+    if (block->tag != PU_FREE && block->user != NULL)
+    {
+        // clear the user's mark
+
+        *block->user = NULL;
+    }
+
+    Z_RemoveBlock(block);
+
+    // Free back to system
+
+    free(block);
+}
+
+// Empty data from the cache list to allocate enough data of the size
+// required.
+//
+// Returns true if any blocks were freed.
+
+static boolean ClearCache(int size)
+{
+    memblock_t *block;
+    memblock_t *next_block;
+    int remaining;
+
+    block = allocated_blocks[PU_CACHE];
+
+    if (block == NULL)
+    {
+        // Cache is already empty.
+
+        return false;
+    }
+
+    // Search to the end of the PU_CACHE list.  The blocks at the end
+    // of the list are the ones that have been free for longer and
+    // are more likely to be unneeded now.
+
+    while (block->next != NULL)
+    {
+        block = block->next;
+    }
+
+    //printf("out of memory; cleaning out the cache: %i\n", test_malloced);
+
+    // Search backwards through the list freeing blocks until we have
+    // freed the amount of memory required.
+
+    remaining = size;
+
+    while (remaining > 0)
+    {
+        if (block == NULL)
+        {
+            // No blocks left to free; we've done our best.
+  
+            break;
+        }
+
+        next_block = block->prev;
+
+        Z_RemoveBlock(block);
+
+        remaining -= block->size;
+
+        if (block->user)
+        {
+            *block->user = NULL;
+        }
+
+        free(block);
+
+        block = next_block;
+    }
+
+    return true;
+}
+
+//
+// Z_Malloc
+// You can pass a NULL user if the tag is < PU_PURGELEVEL.
+//
+
+void *Z_Malloc(int size, int tag, void *user)
+{
+    memblock_t *newblock;
+    unsigned char *data;
+    void *result;
+
+    if (tag < 0 || tag >= PU_NUM_TAGS || tag == PU_FREE)
+    {
+        I_Error("Z_Malloc: attempted to allocate a block with an invalid "
+                "tag: %i", tag);
+    }
+
+    if (user == NULL && tag >= PU_PURGELEVEL)
+    {
+        I_Error ("Z_Malloc: an owner is required for purgable blocks");
+    }
+
+    // Malloc a block of the required size
+    
+    newblock = NULL;
+
+    while (newblock == NULL)
+    {
+        newblock = (memblock_t *) malloc(sizeof(memblock_t) + size);
+
+        if (newblock == NULL)
+        {
+            if (!ClearCache(sizeof(memblock_t) + size))
+            {
+                I_Error("Z_Malloc: failed on allocation of %i bytes", size);
+            }
+        }
+    }
+
+    newblock->tag = tag;
+    
+    // Hook into the linked list for this tag type
+
+    newblock->id = ZONEID;
+    newblock->user = user;
+    newblock->size = size;
+
+    Z_InsertBlock(newblock);
+
+    data = (unsigned char *) newblock;
+    result = data + sizeof(memblock_t);
+
+    if (user != NULL)
+    {
+        *newblock->user = result;
+    }
+    
+    return result;
+}
+
+
+
+//
+// Z_FreeTags
+//
+
+void Z_FreeTags(int lowtag, int hightag)
+{
+    int i;
+
+    for (i=lowtag; i<= hightag; ++i)
+    {
+        memblock_t *block;
+        memblock_t *next;
+
+        // Free all in this chain
+
+        for (block=allocated_blocks[i]; block != NULL; )
+        {
+            next = block->next;
+
+            // Free this block
+
+            if (block->user != NULL)
+            {
+                *block->user = NULL;
+            }
+            
+            free(block);
+
+            // Jump to the next in the chain
+
+            block = next;
+        }
+
+	// This chain is empty now
+
+	allocated_blocks[i] = NULL;
+    }
+}
+
+
+
+//
+// Z_DumpHeap
+//
+void Z_DumpHeap(int lowtag, int	hightag)
+{
+    // broken
+
+#if 0
+    memblock_t*	block;
+	
+    printf ("zone size: %i  location: %p\n",
+	    mainzone->size,mainzone);
+    
+    printf ("tag range: %i to %i\n",
+	    lowtag, hightag);
+	
+    for (block = mainzone->blocklist.next ; ; block = block->next)
+    {
+	if (block->tag >= lowtag && block->tag <= hightag)
+	    printf ("block:%p    size:%7i    user:%p    tag:%3i\n",
+		    block, block->size, block->user, block->tag);
+		
+	if (block->next == &mainzone->blocklist)
+	{
+	    // all blocks have been hit
+	    break;
+	}
+	
+	if ( (byte *)block + block->size != (byte *)block->next)
+	    printf ("ERROR: block size does not touch the next block\n");
+
+	if ( block->next->prev != block)
+	    printf ("ERROR: next block doesn't have proper back link\n");
+
+	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+	    printf ("ERROR: two consecutive free blocks\n");
+    }
+#endif
+}
+
+
+//
+// Z_FileDumpHeap
+//
+void Z_FileDumpHeap(FILE *f)
+{
+    // broken
+#if 0
+    memblock_t*	block;
+	
+    fprintf (f,"zone size: %i  location: %p\n",mainzone->size,mainzone);
+	
+    for (block = mainzone->blocklist.next ; ; block = block->next)
+    {
+	fprintf (f,"block:%p    size:%7i    user:%p    tag:%3i\n",
+		 block, block->size, block->user, block->tag);
+		
+	if (block->next == &mainzone->blocklist)
+	{
+	    // all blocks have been hit
+	    break;
+	}
+	
+	if ( (byte *)block + block->size != (byte *)block->next)
+	    fprintf (f,"ERROR: block size does not touch the next block\n");
+
+	if ( block->next->prev != block)
+	    fprintf (f,"ERROR: next block doesn't have proper back link\n");
+
+	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+	    fprintf (f,"ERROR: two consecutive free blocks\n");
+    }
+#endif
+}
+
+
+
+//
+// Z_CheckHeap
+//
+void Z_CheckHeap (void)
+{
+    memblock_t *block;
+    memblock_t *prev;
+    int i;
+
+    // Check all chains
+
+    for (i=0; i<PU_NUM_TAGS; ++i)
+    {
+        prev = NULL;
+
+        for (block=allocated_blocks[i]; block != NULL; block = block->next)
+        {
+            if (block->id != ZONEID)
+            {
+                I_Error("Z_CheckHeap: Block without a ZONEID!");
+            }
+            
+            if (block->prev != prev)
+            {
+                I_Error("Z_CheckHeap: Doubly-linked list corrupted!");
+            }
+            
+            prev = block;
+        }
+    }
+}
+
+
+
+
+//
+// Z_ChangeTag
+//
+
+void Z_ChangeTag2(void *ptr, int tag, const char *file, int line)
+{
+    memblock_t*	block;
+	
+    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+
+    if (block->id != ZONEID)
+        I_Error("%s:%i: Z_ChangeTag: block without a ZONEID!",
+                file, line);
+
+    if (tag >= PU_PURGELEVEL && block->user == NULL)
+        I_Error("%s:%i: Z_ChangeTag: an owner is required "
+                "for purgable blocks", file, line);
+
+    // Remove the block from its current list, and rehook it into
+    // its new list.
+
+    Z_RemoveBlock(block);
+    block->tag = tag;
+    Z_InsertBlock(block);
+}
+
+void Z_ChangeUser(void *ptr, void **user)
+{
+    memblock_t*	block;
+
+    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+
+    if (block->id != ZONEID)
+    {
+        I_Error("Z_ChangeUser: Tried to change user for invalid block!");
+    }
+
+    block->user = user;
+    *user = ptr;
+}
+
+
+//
+// Z_FreeMemory
+//
+
+int Z_FreeMemory(void)
+{
+    // Limited by the system??
+
+    return -1;
+}
+
+unsigned int Z_ZoneSize(void)
+{
+    return 0;
+}
+
diff --git a/games/NXDoom/src/z_zone.c b/games/NXDoom/src/z_zone.c
new file mode 100644
index 000000000..c5c2dbf7c
--- /dev/null
+++ b/games/NXDoom/src/z_zone.c
@@ -0,0 +1,552 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//	Zone Memory Allocation. Neat.
+//
+
+#include <string.h>
+
+#include "doomtype.h"
+#include "i_system.h"
+#include "m_argv.h"
+
+#include "z_zone.h"
+
+
+//
+// ZONE MEMORY ALLOCATION
+//
+// There is never any space between memblocks,
+//  and there will never be two contiguous free memblocks.
+// The rover can be left pointing at a non-empty block.
+//
+// It is of no value to free a cachable block,
+//  because it will get overwritten automatically if needed.
+// 
+ 
+#define MEM_ALIGN sizeof(void *)
+#define ZONEID	0x1d4a11
+
+typedef struct memblock_s
+{
+    int			size;	// including the header and possibly tiny fragments
+    void**		user;
+    int			tag;	// PU_FREE if this is free
+    int			id;	// should be ZONEID
+    struct memblock_s*	next;
+    struct memblock_s*	prev;
+} memblock_t;
+
+
+typedef struct
+{
+    // total bytes malloced, including header
+    int		size;
+
+    // start / end cap for linked list
+    memblock_t	blocklist;
+    
+    memblock_t*	rover;
+    
+} memzone_t;
+
+
+
+static memzone_t *mainzone;
+static boolean zero_on_free;
+static boolean scan_on_free;
+
+
+//
+// Z_ClearZone
+//
+void Z_ClearZone (memzone_t* zone)
+{
+    memblock_t*		block;
+	
+    // set the entire zone to one free block
+    zone->blocklist.next =
+	zone->blocklist.prev =
+	block = (memblock_t *)( (byte *)zone + sizeof(memzone_t) );
+    
+    zone->blocklist.user = (void *)zone;
+    zone->blocklist.tag = PU_STATIC;
+    zone->rover = block;
+	
+    block->prev = block->next = &zone->blocklist;
+    
+    // a free block.
+    block->tag = PU_FREE;
+
+    block->size = zone->size - sizeof(memzone_t);
+}
+
+
+
+//
+// Z_Init
+//
+void Z_Init (void)
+{
+    memblock_t*	block;
+    int		size;
+
+    mainzone = (memzone_t *)I_ZoneBase (&size);
+    mainzone->size = size;
+
+    // set the entire zone to one free block
+    mainzone->blocklist.next =
+	mainzone->blocklist.prev =
+	block = (memblock_t *)( (byte *)mainzone + sizeof(memzone_t) );
+
+    mainzone->blocklist.user = (void *)mainzone;
+    mainzone->blocklist.tag = PU_STATIC;
+    mainzone->rover = block;
+
+    block->prev = block->next = &mainzone->blocklist;
+
+    // free block
+    block->tag = PU_FREE;
+
+    block->size = mainzone->size - sizeof(memzone_t);
+
+    // [Deliberately undocumented]
+    // Zone memory debugging flag. If set, memory is zeroed after it is freed
+    // to deliberately break any code that attempts to use it after free.
+    //
+    zero_on_free = M_ParmExists("-zonezero");
+
+    // [Deliberately undocumented]
+    // Zone memory debugging flag. If set, each time memory is freed, the zone
+    // heap is scanned to look for remaining pointers to the freed block.
+    //
+    scan_on_free = M_ParmExists("-zonescan");
+}
+
+// Scan the zone heap for pointers within the specified range, and warn about
+// any remaining pointers.
+static void ScanForBlock(void *start, void *end)
+{
+    memblock_t *block;
+    void **mem;
+    int i, len, tag;
+
+    block = mainzone->blocklist.next;
+
+    while (block->next != &mainzone->blocklist)
+    {
+        tag = block->tag;
+
+        if (tag == PU_STATIC || tag == PU_LEVEL || tag == PU_LEVSPEC)
+        {
+            // Scan for pointers on the assumption that pointers are aligned
+            // on word boundaries (word size depending on pointer size):
+            mem = (void **) ((byte *) block + sizeof(memblock_t));
+            len = (block->size - sizeof(memblock_t)) / sizeof(void *);
+
+            for (i = 0; i < len; ++i)
+            {
+                if (start <= mem[i] && mem[i] <= end)
+                {
+                    fprintf(stderr,
+                            "%p has dangling pointer into freed block "
+                            "%p (%p -> %p)\n",
+                            mem, start, &mem[i], mem[i]);
+                }
+            }
+        }
+
+        block = block->next;
+    }
+}
+
+//
+// Z_Free
+//
+void Z_Free (void* ptr)
+{
+    memblock_t*		block;
+    memblock_t*		other;
+
+    block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
+
+    if (block->id != ZONEID)
+	I_Error ("Z_Free: freed a pointer without ZONEID");
+
+    if (block->tag != PU_FREE && block->user != NULL)
+    {
+    	// clear the user's mark
+	    *block->user = 0;
+    }
+
+    // mark as free
+    block->tag = PU_FREE;
+    block->user = NULL;
+    block->id = 0;
+
+    // If the -zonezero flag is provided, we zero out the block on free
+    // to break code that depends on reading freed memory.
+    if (zero_on_free)
+    {
+        memset(ptr, 0, block->size - sizeof(memblock_t));
+    }
+    if (scan_on_free)
+    {
+        ScanForBlock(ptr,
+                     (byte *) ptr + block->size - sizeof(memblock_t));
+    }
+
+    other = block->prev;
+
+    if (other->tag == PU_FREE)
+    {
+        // merge with previous free block
+        other->size += block->size;
+        other->next = block->next;
+        other->next->prev = other;
+
+        if (block == mainzone->rover)
+            mainzone->rover = other;
+
+        block = other;
+    }
+
+    other = block->next;
+    if (other->tag == PU_FREE)
+    {
+        // merge the next free block onto the end
+        block->size += other->size;
+        block->next = other->next;
+        block->next->prev = block;
+
+        if (other == mainzone->rover)
+            mainzone->rover = block;
+    }
+}
+
+
+
+//
+// Z_Malloc
+// You can pass a NULL user if the tag is < PU_PURGELEVEL.
+//
+#define MINFRAGMENT		64
+
+
+void*
+Z_Malloc
+( int		size,
+  int		tag,
+  void*		user )
+{
+    int		extra;
+    memblock_t*	start;
+    memblock_t* rover;
+    memblock_t* newblock;
+    memblock_t*	base;
+    void *result;
+
+    size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
+    
+    // scan through the block list,
+    // looking for the first free block
+    // of sufficient size,
+    // throwing out any purgable blocks along the way.
+
+    // account for size of block header
+    size += sizeof(memblock_t);
+    
+    // if there is a free block behind the rover,
+    //  back up over them
+    base = mainzone->rover;
+    
+    if (base->prev->tag == PU_FREE)
+        base = base->prev;
+	
+    rover = base;
+    start = base->prev;
+	
+    do
+    {
+        if (rover == start)
+        {
+            // scanned all the way around the list
+            I_Error ("Z_Malloc: failed on allocation of %i bytes", size);
+        }
+	
+        if (rover->tag != PU_FREE)
+        {
+            if (rover->tag < PU_PURGELEVEL)
+            {
+                // hit a block that can't be purged,
+                // so move base past it
+                base = rover = rover->next;
+            }
+            else
+            {
+                // free the rover block (adding the size to base)
+
+                // the rover can be the base block
+                base = base->prev;
+                Z_Free ((byte *)rover+sizeof(memblock_t));
+                base = base->next;
+                rover = base->next;
+            }
+        }
+        else
+        {
+            rover = rover->next;
+        }
+
+    } while (base->tag != PU_FREE || base->size < size);
+
+    
+    // found a block big enough
+    extra = base->size - size;
+    
+    if (extra >  MINFRAGMENT)
+    {
+        // there will be a free fragment after the allocated block
+        newblock = (memblock_t *) ((byte *)base + size );
+        newblock->size = extra;
+	
+        newblock->tag = PU_FREE;
+        newblock->user = NULL;	
+        newblock->prev = base;
+        newblock->next = base->next;
+        newblock->next->prev = newblock;
+
+        base->next = newblock;
+        base->size = size;
+    }
+	
+	if (user == NULL && tag >= PU_PURGELEVEL)
+	    I_Error ("Z_Malloc: an owner is required for purgable blocks");
+
+    base->user = user;
+    base->tag = tag;
+
+    result  = (void *) ((byte *)base + sizeof(memblock_t));
+
+    if (base->user)
+    {
+        *base->user = result;
+    }
+
+    // next allocation will start looking here
+    mainzone->rover = base->next;	
+	
+    base->id = ZONEID;
+   
+    return result;
+}
+
+
+
+//
+// Z_FreeTags
+//
+void
+Z_FreeTags
+( int		lowtag,
+  int		hightag )
+{
+    memblock_t*	block;
+    memblock_t*	next;
+	
+    for (block = mainzone->blocklist.next ;
+	 block != &mainzone->blocklist ;
+	 block = next)
+    {
+	// get link before freeing
+	next = block->next;
+
+	// free block?
+	if (block->tag == PU_FREE)
+	    continue;
+	
+	if (block->tag >= lowtag && block->tag <= hightag)
+	    Z_Free ( (byte *)block+sizeof(memblock_t));
+    }
+}
+
+
+
+//
+// Z_DumpHeap
+// Note: TFileDumpHeap( stdout ) ?
+//
+void
+Z_DumpHeap
+( int		lowtag,
+  int		hightag )
+{
+    memblock_t*	block;
+	
+    printf ("zone size: %i  location: %p\n",
+	    mainzone->size,mainzone);
+    
+    printf ("tag range: %i to %i\n",
+	    lowtag, hightag);
+	
+    for (block = mainzone->blocklist.next ; ; block = block->next)
+    {
+	if (block->tag >= lowtag && block->tag <= hightag)
+	    printf ("block:%p    size:%7i    user:%p    tag:%3i\n",
+		    block, block->size, block->user, block->tag);
+		
+	if (block->next == &mainzone->blocklist)
+	{
+	    // all blocks have been hit
+	    break;
+	}
+	
+	if ( (byte *)block + block->size != (byte *)block->next)
+	    printf ("ERROR: block size does not touch the next block\n");
+
+	if ( block->next->prev != block)
+	    printf ("ERROR: next block doesn't have proper back link\n");
+
+	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+	    printf ("ERROR: two consecutive free blocks\n");
+    }
+}
+
+
+//
+// Z_FileDumpHeap
+//
+void Z_FileDumpHeap (FILE* f)
+{
+    memblock_t*	block;
+	
+    fprintf (f,"zone size: %i  location: %p\n",mainzone->size,mainzone);
+	
+    for (block = mainzone->blocklist.next ; ; block = block->next)
+    {
+	fprintf (f,"block:%p    size:%7i    user:%p    tag:%3i\n",
+		 block, block->size, block->user, block->tag);
+		
+	if (block->next == &mainzone->blocklist)
+	{
+	    // all blocks have been hit
+	    break;
+	}
+	
+	if ( (byte *)block + block->size != (byte *)block->next)
+	    fprintf (f,"ERROR: block size does not touch the next block\n");
+
+	if ( block->next->prev != block)
+	    fprintf (f,"ERROR: next block doesn't have proper back link\n");
+
+	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+	    fprintf (f,"ERROR: two consecutive free blocks\n");
+    }
+}
+
+
+
+//
+// Z_CheckHeap
+//
+void Z_CheckHeap (void)
+{
+    memblock_t*	block;
+	
+    for (block = mainzone->blocklist.next ; ; block = block->next)
+    {
+	if (block->next == &mainzone->blocklist)
+	{
+	    // all blocks have been hit
+	    break;
+	}
+	
+	if ( (byte *)block + block->size != (byte *)block->next)
+	    I_Error ("Z_CheckHeap: block size does not touch the next block\n");
+
+	if ( block->next->prev != block)
+	    I_Error ("Z_CheckHeap: next block doesn't have proper back link\n");
+
+	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+	    I_Error ("Z_CheckHeap: two consecutive free blocks\n");
+    }
+}
+
+
+
+
+//
+// Z_ChangeTag
+//
+void Z_ChangeTag2(void *ptr, int tag, const char *file, int line)
+{
+    memblock_t*	block;
+	
+    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+
+    if (block->id != ZONEID)
+        I_Error("%s:%i: Z_ChangeTag: block without a ZONEID!",
+                file, line);
+
+    if (tag >= PU_PURGELEVEL && block->user == NULL)
+        I_Error("%s:%i: Z_ChangeTag: an owner is required "
+                "for purgable blocks", file, line);
+
+    block->tag = tag;
+}
+
+void Z_ChangeUser(void *ptr, void **user)
+{
+    memblock_t*	block;
+
+    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+
+    if (block->id != ZONEID)
+    {
+        I_Error("Z_ChangeUser: Tried to change user for invalid block!");
+    }
+
+    block->user = user;
+    *user = ptr;
+}
+
+
+
+//
+// Z_FreeMemory
+//
+int Z_FreeMemory (void)
+{
+    memblock_t*		block;
+    int			free;
+	
+    free = 0;
+    
+    for (block = mainzone->blocklist.next ;
+         block != &mainzone->blocklist;
+         block = block->next)
+    {
+        if (block->tag == PU_FREE || block->tag >= PU_PURGELEVEL)
+            free += block->size;
+    }
+
+    return free;
+}
+
+unsigned int Z_ZoneSize(void)
+{
+    return mainzone->size;
+}
+
diff --git a/games/NXDoom/src/z_zone.h b/games/NXDoom/src/z_zone.h
new file mode 100644
index 000000000..22bd62643
--- /dev/null
+++ b/games/NXDoom/src/z_zone.h
@@ -0,0 +1,73 @@
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+// DESCRIPTION:
+//      Zone Memory Allocation, perhaps NeXT ObjectiveC inspired.
+//	Remark: this was the only stuff that, according
+//	 to John Carmack, might have been useful for
+//	 Quake.
+//
+
+
+
+#ifndef __Z_ZONE__
+#define __Z_ZONE__
+
+#include <stdio.h>
+
+//
+// ZONE MEMORY
+// PU - purge tags.
+
+enum
+{
+    PU_STATIC = 1,                  // static entire execution time
+    PU_SOUND,                       // static while playing
+    PU_MUSIC,                       // static while playing
+    PU_FREE,                        // a free block
+    PU_LEVEL,                       // static until level exited
+    PU_LEVSPEC,                     // a special thinker in a level
+    
+    // Tags >= PU_PURGELEVEL are purgable whenever needed.
+
+    PU_PURGELEVEL,
+    PU_CACHE,
+
+    // Total number of different tag types
+
+    PU_NUM_TAGS
+};
+        
+
+void	Z_Init (void);
+void*	Z_Malloc (int size, int tag, void *ptr);
+void    Z_Free (void *ptr);
+void    Z_FreeTags (int lowtag, int hightag);
+void    Z_DumpHeap (int lowtag, int hightag);
+void    Z_FileDumpHeap (FILE *f);
+void    Z_CheckHeap (void);
+void    Z_ChangeTag2 (void *ptr, int tag, const char *file, int line);
+void    Z_ChangeUser(void *ptr, void **user);
+int     Z_FreeMemory (void);
+unsigned int Z_ZoneSize(void);
+
+//
+// This is used to get the local FILE:LINE info from CPP
+// prior to really call the function in question.
+//
+#define Z_ChangeTag(p,t)                                       \
+    Z_ChangeTag2((p), (t), __FILE__, __LINE__)
+
+
+#endif
diff --git a/games/NXDoom/textscreen/.gitignore b/games/NXDoom/textscreen/.gitignore
new file mode 100644
index 000000000..3be8ec0c7
--- /dev/null
+++ b/games/NXDoom/textscreen/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+*.a
+tags
+TAGS
diff --git a/games/NXDoom/textscreen/CMakeLists.txt b/games/NXDoom/textscreen/CMakeLists.txt
new file mode 100644
index 000000000..7e33826d6
--- /dev/null
+++ b/games/NXDoom/textscreen/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_library(textscreen STATIC
+            textscreen.h
+            txt_conditional.c   txt_conditional.h
+            txt_checkbox.c      txt_checkbox.h
+            txt_desktop.c       txt_desktop.h
+            txt_dropdown.c      txt_dropdown.h
+            txt_fileselect.c    txt_fileselect.h
+            txt_gui.c           txt_gui.h
+            txt_inputbox.c      txt_inputbox.h
+            txt_io.c            txt_io.h
+                                txt_main.h
+            txt_button.c        txt_button.h
+            txt_label.c         txt_label.h
+            txt_radiobutton.c   txt_radiobutton.h
+            txt_scrollpane.c    txt_scrollpane.h
+            txt_separator.c     txt_separator.h
+            txt_spinctrl.c      txt_spinctrl.h
+            txt_sdl.c           txt_sdl.h
+            txt_strut.c         txt_strut.h
+            txt_table.c         txt_table.h
+            txt_utf8.c          txt_utf8.h
+            txt_widget.c        txt_widget.h
+            txt_window.c        txt_window.h
+            txt_window_action.c txt_window_action.h)
+target_include_directories(textscreen
+                           INTERFACE "."
+                           PRIVATE "../src/")
+if (DEFINED EMSCRIPTEN)
+    set_target_properties(textscreen PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
+    set_target_properties(textscreen PROPERTIES LINK_FLAGS "-s USE_SDL=2")
+else()
+    target_link_libraries(textscreen m SDL2::SDL2)
+endif()
diff --git a/games/NXDoom/textscreen/Doxyfile b/games/NXDoom/textscreen/Doxyfile
new file mode 100644
index 000000000..84b607a04
--- /dev/null
+++ b/games/NXDoom/textscreen/Doxyfile
@@ -0,0 +1,2451 @@
+# Doxyfile 1.8.13
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "libtextscreen"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = .
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          = *.h
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = DOXYGEN
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/games/NXDoom/textscreen/Makefile.am b/games/NXDoom/textscreen/Makefile.am
new file mode 100644
index 000000000..f55236f65
--- /dev/null
+++ b/games/NXDoom/textscreen/Makefile.am
@@ -0,0 +1,41 @@
+
+AM_CFLAGS = -I$(top_srcdir)/src
+
+CTAGS_ARGS=-I TXT_UNCAST_ARG+
+
+# build this directory before the examples directory.
+
+SUBDIRS = fonts . examples
+
+noinst_LIBRARIES=libtextscreen.a
+
+EXTRA_DIST=CMakeLists.txt Doxyfile
+
+libtextscreen_a_SOURCES =                                 \
+	textscreen.h                                      \
+	txt_conditional.c        txt_conditional.h        \
+	txt_checkbox.c           txt_checkbox.h           \
+	txt_desktop.c            txt_desktop.h            \
+	txt_dropdown.c           txt_dropdown.h           \
+	txt_fileselect.c         txt_fileselect.h         \
+	txt_gui.c                txt_gui.h                \
+	txt_inputbox.c           txt_inputbox.h           \
+	txt_io.c                 txt_io.h                 \
+	                         txt_main.h               \
+	txt_button.c             txt_button.h             \
+	txt_label.c              txt_label.h              \
+	txt_radiobutton.c        txt_radiobutton.h        \
+	txt_scrollpane.c         txt_scrollpane.h         \
+	txt_separator.c          txt_separator.h          \
+	txt_spinctrl.c           txt_spinctrl.h           \
+	txt_sdl.c                txt_sdl.h                \
+	txt_strut.c              txt_strut.h              \
+	txt_table.c              txt_table.h              \
+	txt_utf8.c               txt_utf8.h               \
+	txt_widget.c             txt_widget.h             \
+	txt_window.c             txt_window.h             \
+	txt_window_action.c      txt_window_action.h
+
+doc:
+	doxygen
+
diff --git a/games/NXDoom/textscreen/examples/.gitignore b/games/NXDoom/textscreen/examples/.gitignore
new file mode 100644
index 000000000..cb0fd52cf
--- /dev/null
+++ b/games/NXDoom/textscreen/examples/.gitignore
@@ -0,0 +1,8 @@
+Makefile.in
+Makefile
+.deps
+guitest
+calculator
+*.exe
+tags
+TAGS
diff --git a/games/NXDoom/textscreen/examples/Makefile.am b/games/NXDoom/textscreen/examples/Makefile.am
new file mode 100644
index 000000000..4632d921d
--- /dev/null
+++ b/games/NXDoom/textscreen/examples/Makefile.am
@@ -0,0 +1,11 @@
+
+AM_CFLAGS =  -I$(top_srcdir)/src -I$(top_srcdir)/textscreen
+
+noinst_PROGRAMS=guitest calculator
+
+guitest_LDADD = ../libtextscreen.a @LDFLAGS@ @SDL_LIBS@
+guitest_SOURCES = guitest.c
+
+calculator_LDADD = ../libtextscreen.a @LDFLAGS@ @SDL_LIBS@
+calculator_SOURCES = calculator.c
+
diff --git a/games/NXDoom/textscreen/examples/calculator.c b/games/NXDoom/textscreen/examples/calculator.c
new file mode 100644
index 000000000..c50af2eaf
--- /dev/null
+++ b/games/NXDoom/textscreen/examples/calculator.c
@@ -0,0 +1,180 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Example program: desktop calculator
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "textscreen.h"
+
+typedef enum
+{
+    OP_NONE,
+    OP_PLUS,
+    OP_MINUS,
+    OP_MULT,
+    OP_DIV,
+} operator_t;
+
+int starting_input = 0;
+int input_value = 0;
+txt_label_t *input_box;
+int first_operand;
+operator_t operator = OP_NONE;
+
+void UpdateInputBox(void)
+{
+    char buf[20];
+
+    TXT_snprintf(buf, sizeof(buf), "  %i", input_value);
+    TXT_SetLabel(input_box, buf);
+}
+
+void InsertNumber(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(value))
+{
+    TXT_CAST_ARG(int, value);
+
+    if (starting_input)
+    {
+        input_value = 0;
+        starting_input = 0;
+    }
+    
+    input_value *= 10;
+    input_value += *value;
+    UpdateInputBox();
+}
+
+void AddNumberButton(txt_table_t *table, int value)
+{
+    char buf[10];
+    int *val_copy;
+
+    val_copy = malloc(sizeof(int));
+    *val_copy = value;
+
+    TXT_snprintf(buf, sizeof(buf), "  %i  ", value);
+
+    TXT_AddWidget(table, TXT_NewButton2(buf, InsertNumber, val_copy));
+}
+
+void Operator(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(op))
+{
+    TXT_CAST_ARG(operator_t, op);
+
+    first_operand = input_value;
+    operator = *op;
+    starting_input = 1;
+}
+
+void AddOperatorButton(txt_table_t *table, const char *label, operator_t op)
+{
+    char buf[10];
+    operator_t *op_copy;
+
+    op_copy = malloc(sizeof(operator_t));
+    *op_copy = op;
+
+    TXT_snprintf(buf, sizeof(buf), "  %s  ", label);
+
+    TXT_AddWidget(table, TXT_NewButton2(buf, Operator, op_copy));
+}
+
+void Calculate(TXT_UNCAST_ARG(button), void *unused)
+{
+    switch (operator)
+    {
+        case OP_PLUS:
+            input_value = first_operand + input_value;
+            break;
+        case OP_MINUS:
+            input_value = first_operand - input_value;
+            break;
+        case OP_MULT:
+            input_value = first_operand * input_value;
+            break;
+        case OP_DIV:
+            input_value = first_operand / input_value;
+            break;
+        case OP_NONE:
+            break;
+    }
+
+    UpdateInputBox();
+
+    operator = OP_NONE;
+    starting_input = 1;
+}
+
+void BuildGUI()
+{
+    txt_window_t *window;
+    txt_table_t *table;
+    
+    window = TXT_NewWindow("Calculator");
+
+    input_box = TXT_NewLabel("asdf");
+    TXT_SetBGColor(input_box, TXT_COLOR_BLACK);
+    TXT_AddWidget(window, input_box);
+    TXT_AddWidget(window, TXT_NewSeparator(NULL));
+    TXT_AddWidget(window, TXT_NewStrut(0, 1));
+
+    table = TXT_NewTable(4);
+    TXT_AddWidget(window, table);
+    TXT_SetWidgetAlign(table, TXT_HORIZ_CENTER);
+
+    AddNumberButton(table, 7);
+    AddNumberButton(table, 8);
+    AddNumberButton(table, 9);
+    AddOperatorButton(table, "*", OP_MULT);
+    AddNumberButton(table, 4);
+    AddNumberButton(table, 5);
+    AddNumberButton(table, 6);
+    AddOperatorButton(table, "-", OP_MINUS);
+    AddNumberButton(table, 1);
+    AddNumberButton(table, 2);
+    AddNumberButton(table, 3);
+    AddOperatorButton(table, "+", OP_PLUS);
+    AddNumberButton(table, 0);
+    TXT_AddWidget(table, NULL);
+
+    TXT_AddWidget(table, TXT_NewButton2("  =  ", Calculate, NULL));
+    AddOperatorButton(table, "/", OP_DIV);
+    
+    TXT_AddWidget(window, TXT_NewStrut(0, 1));
+    UpdateInputBox();
+}
+
+int main(int argc, char *argv[])
+{
+    if (!TXT_Init())
+    {
+        fprintf(stderr, "Failed to initialise GUI\n");
+        exit(-1);
+    }
+    
+    TXT_SetDesktopTitle("Calculator demo");
+
+    BuildGUI();
+
+    TXT_GUIMainLoop();
+
+    TXT_Shutdown();
+
+    return 0;
+}
+
diff --git a/games/NXDoom/textscreen/examples/guitest.c b/games/NXDoom/textscreen/examples/guitest.c
new file mode 100644
index 000000000..1df95ce4c
--- /dev/null
+++ b/games/NXDoom/textscreen/examples/guitest.c
@@ -0,0 +1,308 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Example program: GUI test program
+//
+// Demonstrates all the main textscreen widgets in use and shows how
+// a simple textscreen program can be written.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "textscreen.h"
+
+enum 
+{
+    RADIO_VALUE_BADGER,
+    RADIO_VALUE_MUSHROOM,
+    RADIO_VALUE_SNAKE,
+};
+
+// also put some crazy extensions to test the escape function. a"b"c"""dd
+const char *extensions[] = { "wad", "lmp", "txt", "a\"b\"c\"\"\"dd", "",
+     "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"", NULL };
+const char *radio_values[] = { "Badger", "Mushroom", "Snake" };
+char *textbox_value = NULL;
+int numbox_value = 0;
+int radiobutton_value;
+char *file_path = NULL;
+char *dir_path = NULL;
+txt_label_t *value_label;
+txt_window_t *firstwin;
+int cheesy;
+
+void ClosePwnBox(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+{
+    TXT_CAST_ARG(txt_window_t, window);
+
+    TXT_CloseWindow(window);
+}
+
+void PwnBox(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    txt_window_t *window;
+    txt_window_action_t *close_button;
+    
+    window = TXT_NewWindow("Pwned!");
+    TXT_AddWidget(window, TXT_NewLabel(" BOOM! HEADSHOT! "));
+
+    close_button = TXT_NewWindowAction(KEY_ENTER, "Close");
+    TXT_SignalConnect(close_button, "pressed", ClosePwnBox, window);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, close_button);
+}
+
+void UpdateLabel(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    char buf[40];
+    
+    TXT_StringCopy(buf, " Current value: ", sizeof(buf));
+    if (cheesy)
+    {
+        TXT_StringConcat(buf, "Cheesy ", sizeof(buf));
+    }
+    TXT_StringConcat(buf, radio_values[radiobutton_value], sizeof(buf));
+    TXT_StringConcat(buf, "\n", sizeof(buf));
+
+    TXT_SetLabel(value_label, buf);
+}
+
+void CloseWindow(TXT_UNCAST_ARG(button), void *user_data)
+{
+    TXT_CloseWindow(firstwin);
+}
+
+void UnicodeWindow(TXT_UNCAST_ARG(widget), void *user_data)
+{
+    static const char *strings[] = {
+        "lunedì", "martedì", "mercoledì", "giovedì",
+        "venerdì", "sabato", "domenica",
+    };
+    static int var1, var2;
+    txt_window_t *window;
+
+    window = TXT_NewWindow("Questo è in Italiano");
+
+    TXT_AddWidgets(window,
+                   TXT_NewButton("Questo è un tasto"),
+                   TXT_NewCheckBox("Questo è un checkbox", &var1),
+                   TXT_NewDropdownList(&var2, strings, 7),
+                   TXT_NewSeparator("Questo è un separatore"),
+                   TXT_NewLabel("Leggi questo, è pieno di\n"
+                                "informazioni interessanti"),
+                   TXT_NewRadioButton("Ma questo non è un radio??",
+                                      &var1, 0),
+                   NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT,
+                        TXT_NewWindowAction(KEY_ENTER, "Nullità"));
+
+}
+
+void SetupWindow(void)
+{
+    txt_window_t *window;
+    txt_table_t *table;
+    txt_table_t *rightpane;
+    txt_checkbox_t *cheesy_checkbox;
+    txt_window_action_t *pwn;
+    txt_label_t *toplabel;
+    char buf[100];
+    int i;
+
+    window = TXT_NewWindow("Window test");
+
+    TXT_SetWindowHelpURL(window, "https://www.youtube.com/watch?v=dQw4w9WgXcQ");
+
+    TXT_AddWidget(window, TXT_NewSeparator("Main section"));
+    table = TXT_NewTable(3);
+
+    toplabel = TXT_NewLabel("This is a multiline label.\n"
+                            "A single label object contains \n"
+                            "all three of these lines.");
+    TXT_AddWidget(window, toplabel);
+    TXT_SetWidgetAlign(toplabel, TXT_HORIZ_CENTER);
+
+    //TXT_AddWidget(window, TXT_NewScrollPane(15, 4, table));
+    TXT_AddWidget(window, table);
+
+    for (i=0; i<3; ++i)
+    {
+        TXT_snprintf(buf, sizeof(buf), "Option %i in a table:", i + 1);
+        TXT_AddWidget(table, TXT_NewLabel(buf));
+        TXT_snprintf(buf, sizeof(buf), " Button %i-1 ", i + 1);
+        TXT_AddWidget(table, TXT_NewButton(buf));
+        TXT_snprintf(buf, sizeof(buf), " Button %i-2 ", i + 1);
+        TXT_AddWidget(table, TXT_NewButton(buf));
+    }
+
+    TXT_AddWidgets(table,
+                   TXT_NewLabel("Still the same table, but:\n"
+                                "This label magically overflows\n"
+                                "across multiple cells! Cool, huh? "),
+                   TXT_TABLE_OVERFLOW_RIGHT,
+                   TXT_NewButton("Do nothing"),
+                   TXT_TABLE_OVERFLOW_DOWN,
+                   TXT_TABLE_OVERFLOW_DOWN,
+                   TXT_NewButton2("Qualcosa?", UnicodeWindow, NULL),
+                   NULL);
+
+    TXT_AddWidget(window, TXT_NewStrut(0, 1));
+    value_label = TXT_NewLabel("");
+    TXT_AddWidget(window, value_label);
+
+    table = TXT_NewTable(2);
+    TXT_AddWidget(window, table);
+    TXT_SetWidgetAlign(table, TXT_HORIZ_CENTER);
+
+    cheesy_checkbox = TXT_NewCheckBox("Cheesy", &cheesy);
+    TXT_AddWidget(table, cheesy_checkbox);
+    TXT_SignalConnect(cheesy_checkbox, "changed", UpdateLabel, NULL);
+
+    rightpane = TXT_NewTable(1);
+    TXT_AddWidget(table, rightpane);
+
+    for (i=0; i<3; ++i)
+    {
+        txt_radiobutton_t *rbut;
+
+        rbut = TXT_NewRadioButton(radio_values[i], &radiobutton_value, i);
+        TXT_AddWidget(rightpane, rbut);
+        TXT_SignalConnect(rbut, "selected", UpdateLabel, NULL);
+    }
+
+    UpdateLabel(NULL, NULL);
+
+    TXT_AddWidget(window, TXT_NewButton2("Close Window", CloseWindow, NULL));
+
+    pwn = TXT_NewWindowAction(KEY_F1, "PWN!");
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, pwn);
+    TXT_SignalConnect(pwn, "pressed", PwnBox, NULL);
+
+    firstwin = window;
+}
+
+void Window2(void)
+{
+    txt_window_t *window;
+    txt_table_t *table;
+    txt_table_t *unselectable_table;
+    txt_scrollpane_t *scrollpane;
+
+    window = TXT_NewWindow("Another test");
+    TXT_SetWindowPosition(window, 
+                          TXT_HORIZ_RIGHT, 
+                          TXT_VERT_TOP, 
+                          TXT_SCREEN_W - 1, 1);
+
+    TXT_AddWidgets(window,
+                   TXT_NewScrollPane(40, 1,
+                        TXT_NewLabel("* Unselectable scroll pane *")),
+                   unselectable_table = TXT_NewTable(1),
+                   NULL);
+
+    TXT_AddWidget(unselectable_table, TXT_NewLabel("* Unselectable table *"));
+    TXT_AddWidget(unselectable_table, TXT_NewLabel(
+        "This is a UTF-8 string:\n"
+        "\xc3\x80 bient\xc3\xb4t na\xc3\xaet "
+        "\xc3\xa9v\xc3\xaaque \xc3\xa0 l'\xc5\x93uvre p\xc3\xa8re."));
+
+    TXT_AddWidget(window, TXT_NewSeparator("Input boxes"));
+    table = TXT_NewTable(2);
+    TXT_AddWidget(window, table);
+    TXT_AddWidgets(table,
+                   TXT_NewLabel("String: "),
+                   TXT_NewInputBox(&textbox_value, 20),
+                   TXT_NewLabel("Int: "),
+                   TXT_NewIntInputBox(&numbox_value, 10),
+                   TXT_NewLabel("Spin control:"),
+                   TXT_NewSpinControl(&numbox_value, 0, 15),
+                   TXT_NewLabel("File:"),
+                   TXT_NewFileSelector(&file_path, 28, "Select file:",
+                                       extensions),
+                   TXT_NewLabel("Directory:"),
+                   TXT_NewFileSelector(&dir_path, 28, "Select directory:",
+                                       TXT_DIRECTORY),
+                   NULL);
+
+    TXT_AddWidget(window, TXT_NewSeparator("Scroll pane test"));
+    scrollpane = TXT_NewScrollPane(40, 5, TXT_NewLabel(
+        "This is a scrollable pane. The contents\n"
+        "of this box are larger than the box\n"
+        "itself, but it can be scrolled around\n"
+        "to explore the full contents.\n"
+        "\n"
+        "Scrollable panes can be scrolled both\n"
+        "vertically and horizontally. They\n"
+        "can contain any widget. The scroll bars\n"
+        "appear automatically as needed.\n"
+        "\n"
+        "This is a very long line of text that forces a horizontal scrollbar"
+    ));
+    TXT_AddWidget(window, scrollpane);
+}
+
+void ScrollingMenu(void)
+{
+    txt_window_t *window;
+    txt_button_t *button;
+    txt_table_t *table;
+
+    window = TXT_NewWindow("Scrollable menu");
+
+    table = TXT_NewTable(1);
+
+    TXT_AddWidgets(table,
+                   TXT_NewButton("Configure display"),
+                   TXT_NewButton("Configure joystick"),
+                   TXT_NewButton("Configure keyboard"),
+                   TXT_NewButton("Configure mouse"),
+                   TXT_NewButton("Configure sound"),
+                   TXT_NewStrut(0, 1),
+                   button = TXT_NewButton("Save Parameters and launch DOOM"),
+                   TXT_NewStrut(0, 1),
+                   TXT_NewButton("Start a network game"),
+                   TXT_NewButton("Join a network game"),
+                   TXT_NewButton("Multiplayer configuration"),
+                   NULL);
+
+    TXT_SignalConnect(button, "pressed", PwnBox, NULL);
+
+    TXT_AddWidget(window, TXT_NewScrollPane(0, 6, table));
+}
+
+int main(int argc, char *argv[])
+{
+    if (!TXT_Init())
+    {
+        fprintf(stderr, "Failed to initialise GUI\n");
+        exit(-1);
+    }
+
+    TXT_SetDesktopTitle("Not Chocolate Doom Setup");
+
+    ScrollingMenu();
+    Window2();
+    SetupWindow();
+
+    TXT_GUIMainLoop();
+
+    TXT_Shutdown();
+
+    return 0;
+}
+
+
diff --git a/games/NXDoom/textscreen/fonts/Makefile.am b/games/NXDoom/textscreen/fonts/Makefile.am
new file mode 100644
index 000000000..130486b71
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/Makefile.am
@@ -0,0 +1,18 @@
+FONT_HDRS = small.h normal.h large.h codepage.h
+EXTRA_DIST = small.png normal.png large.png convert-font $(FONT_HDRS)
+
+noinst_DATA = $(FONT_HDRS)
+
+if HAVE_FONTS
+
+small.h: small.png convert-font
+	$(srcdir)/convert-font small small.png small.h
+
+normal.h: normal.png convert-font
+	$(srcdir)/convert-font normal normal.png normal.h
+
+large.h: large.png convert-font
+	$(srcdir)/convert-font large large.png large.h
+
+endif
+
diff --git a/games/NXDoom/textscreen/fonts/README b/games/NXDoom/textscreen/fonts/README
new file mode 100644
index 000000000..a9b9b1b24
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/README
@@ -0,0 +1,38 @@
+
+This directory contains the fonts used by libtextscreen:
+
+ * normal.png is the standard DOS font, from the DOSbox project.
+   Copyright (C) 2002-2004  The DOSBox Team
+
+ * small.png contains a miniature, half-size font for low-resolution
+   displays. This is based on the Atari-Small font by Tom Fine. The
+   original font was standard ASCII only; this has been extended to the
+   full Extended ASCII range with scaled-down versions of the full-size
+   DOS font. Original copyright notice:
+
+     Copyright (c) 1999, Thomas A. Fine
+
+     License to copy, modify, and distribute for both commercial and
+     non-commercial use is herby granted, provided this notice
+     is preserved.
+
+     Email to my last name at head.cfa.harvard.edu
+     http://hea-www.harvard.edu/~fine/
+
+ * large.png is a scaled-up version of normal.png with extra detail
+   added; this is for use on modern high-resolution ("retina") displays.
+
+All modifications and enhancements to the above fonts are:
+
+  Copyright (C) 2005-2016 Simon Howard
+
+  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.
+
diff --git a/games/NXDoom/textscreen/fonts/codepage.h b/games/NXDoom/textscreen/fonts/codepage.h
new file mode 100644
index 000000000..666149323
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/codepage.h
@@ -0,0 +1,113 @@
+//
+// Copyright(C) 2017 Simon Howard
+//
+// 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.
+//
+
+// This file contains a #define macro mapping from the characters
+// in the CP437 code page to the equivalent Unicode characters. It
+// therefore defines which Unicode characters can be represented on
+// a text screen using such a code page.
+//
+// If you're changing the textscreen font to show a different code
+// page, you should update the mapping in this file to match. The
+// Wikipedia pages for DOS code pages are a good place to look for
+// this information.
+
+#define CODE_PAGE_TO_UNICODE {                      \
+                                                    \
+       /* CP437 control codes: */                   \
+                                                    \
+    0x0000, 0x263a, 0x263b, 0x2665,  /* 00 - 0f */  \
+    0x2666, 0x2663, 0x2660, 0x2022,                 \
+    0x25d8, 0x25cb, 0x25d9, 0x2642,                 \
+    0x2640, 0x266a, 0x266b, 0x263c,                 \
+                                                    \
+    0x25ba, 0x25c4, 0x2195, 0x203c,  /* 10 - 1f */  \
+    0x00b6, 0x00a7, 0x25ac, 0x21a8,                 \
+    0x2191, 0x2193, 0x2192, 0x2190,                 \
+    0x221f, 0x2194, 0x25b2, 0x25bc,                 \
+                                                    \
+       /* Standard ASCII range: */                  \
+                                                    \
+    0x0020, 0x0021, 0x0022, 0x0023,  /* 20 - 2f */  \
+    0x0024, 0x0025, 0x0026, 0x0027,                 \
+    0x0028, 0x0029, 0x002a, 0x002b,                 \
+    0x002c, 0x002d, 0x002e, 0x002f,                 \
+                                                    \
+    0x0030, 0x0031, 0x0032, 0x0033,  /* 30 - 3f */  \
+    0x0034, 0x0035, 0x0036, 0x0037,                 \
+    0x0038, 0x0039, 0x003a, 0x003b,                 \
+    0x003c, 0x003d, 0x003e, 0x003f,                 \
+                                                    \
+    0x0040, 0x0041, 0x0042, 0x0043,  /* 40 - 4f */  \
+    0x0044, 0x0045, 0x0046, 0x0047,                 \
+    0x0048, 0x0049, 0x004a, 0x004b,                 \
+    0x004c, 0x004d, 0x004e, 0x004f,                 \
+                                                    \
+    0x0050, 0x0051, 0x0052, 0x0053,  /* 50 - 5f */  \
+    0x0054, 0x0055, 0x0056, 0x0057,                 \
+    0x0058, 0x0059, 0x005a, 0x005b,                 \
+    0x005c, 0x005d, 0x005e, 0x005f,                 \
+                                                    \
+    0x0060, 0x0061, 0x0062, 0x0063,  /* 60 - 6f */  \
+    0x0064, 0x0065, 0x0066, 0x0067,                 \
+    0x0068, 0x0069, 0x006a, 0x006b,                 \
+    0x006c, 0x006d, 0x006e, 0x006f,                 \
+                                                    \
+    0x0070, 0x0071, 0x0072, 0x0073,  /* 70 - 7f */  \
+    0x0074, 0x0075, 0x0076, 0x0077,                 \
+    0x0078, 0x0079, 0x007a, 0x007b,                 \
+    0x007c, 0x007d, 0x007e, 0x2302,                 \
+                                                    \
+       /* CP437 Extended ASCII range: */            \
+                                                    \
+    0x00c7, 0x00fc, 0x00e9, 0x00e2,  /*  80-8f */   \
+    0x00e4, 0x00e0, 0x00e5, 0x00e7,                 \
+    0x00ea, 0x00eb, 0x00e8, 0x00ef,                 \
+    0x00ee, 0x00ec, 0x00c4, 0x00c5,                 \
+                                                    \
+    0x00c9, 0x00e6, 0x00c6, 0x00f4,  /*  90-9f */   \
+    0x00f6, 0x00f2, 0x00fb, 0x00f9,                 \
+    0x00ff, 0x00d6, 0x00dc, 0x00a2,                 \
+    0x00a3, 0x00a5, 0x20a7, 0x0192,                 \
+                                                    \
+    0x00e1, 0x00ed, 0x00f3, 0x00fa,  /*  a0-af */   \
+    0x00f1, 0x00d1, 0x00aa, 0x00ba,                 \
+    0x00bf, 0x2310, 0x00ac, 0x00bd,                 \
+    0x00bc, 0x00a1, 0x00ab, 0x00bb,                 \
+                                                    \
+    0x2591, 0x2592, 0x2593, 0x2502,  /*  b0-bf */   \
+    0x2524, 0x2561, 0x2562, 0x2556,                 \
+    0x2555, 0x2563, 0x2551, 0x2557,                 \
+    0x255d, 0x255c, 0x255b, 0x2510,                 \
+                                                    \
+    0x2514, 0x2534, 0x252c, 0x251c,  /*  c0-cf */   \
+    0x2500, 0x253c, 0x255e, 0x255f,                 \
+    0x255a, 0x2554, 0x2569, 0x2566,                 \
+    0x2560, 0x2550, 0x256c, 0x2567,                 \
+                                                    \
+    0x2568, 0x2564, 0x2565, 0x2559,  /*  d0-df */   \
+    0x2558, 0x2552, 0x2553, 0x256b,                 \
+    0x256a, 0x2518, 0x250c, 0x2588,                 \
+    0x2584, 0x258c, 0x2590, 0x2580,                 \
+                                                    \
+    0x03b1, 0x00df, 0x0393, 0x03c0,  /*  e0-ef */   \
+    0x03a3, 0x03c3, 0x00b5, 0x03c4,                 \
+    0x03a6, 0x0398, 0x03a9, 0x03b4,                 \
+    0x221e, 0x03c6, 0x03b5, 0x2229,                 \
+                                                    \
+    0x2261, 0x00b1, 0x2265, 0x2264,  /*  f0-ff */   \
+    0x2320, 0x2321, 0x00f7, 0x2248,                 \
+    0x00b0, 0x2219, 0x00b7, 0x221a,                 \
+    0x207f, 0x00b2, 0x25a0, 0x00a0,                 \
+}
+
diff --git a/games/NXDoom/textscreen/fonts/convert-font b/games/NXDoom/textscreen/fonts/convert-font
new file mode 100755
index 000000000..b3d828cc5
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/convert-font
@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+#
+# Copyright(C) 2016 Simon Howard
+#
+# 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.
+#
+#
+# Converts images into libtextscreen fonts.
+#
+
+import sys
+import os
+import re
+
+GRID_COLUMNS = 16
+GRID_ROWS = 16
+
+try:
+    import Image
+except ImportError:
+    try:
+        from PIL import Image
+    except ImportError:
+        print("WARNING: Could not update %s. "
+              "Please install the Python Imaging library or Pillow."
+              % sys.argv[3])
+        sys.exit(0)
+
+
+def generate_font_data(filename):
+    """Read font data from the given file.
+
+    Args:
+      filename: Image file to read.
+    Returns:
+      Tuple containing:
+          (width, height) dimensions of each font character.
+          Array of byte data for font.
+    """
+    im = Image.open(filename)
+    width, height = im.size
+    assert (width % GRID_COLUMNS) == 0
+    assert (height % GRID_ROWS) == 0
+
+    char_w, char_h = width // GRID_COLUMNS, height // GRID_ROWS
+    font_data_len = (width * height) // 8
+    font_data = [0] * font_data_len
+
+    for y in range(height):
+        for x in range(width):
+            px = im.getpixel((x, y))
+            if px > (127, 127, 127):
+                char_x, char_y = x // char_w, y // char_h
+                x1, y1 = x % char_w, y % char_h
+                bit_index = (
+                    (char_y * GRID_COLUMNS + char_x) * (char_w * char_h) +
+                    (y1 * char_w) + x1)
+                font_data[bit_index // 8] |= 1 << (bit_index % 8)
+
+    return (char_w, char_h), font_data
+
+def convert_image(font_prefix, filename, output_filename):
+    """Convert the given image to a text output file.
+
+    Args:
+      font_prefix: Prefix string to attach to constants.
+      filename: Input image file to read.
+      output_filename: Header file to write.
+    """
+    dimensions, data = generate_font_data(filename)
+
+    with open(output_filename, "w") as outfile:
+        outfile.write("/* Font data generated from %s; do not edit.\n"
+                      "   Please see textscreen/fonts/README for copyright\n"
+                      "   information. */\n\n" % filename)
+        outfile.write("static const uint8_t %s_font_data[] =\n{\n" %
+                      font_prefix)
+        for index, b in enumerate(data):
+            if (index % 8) == 0:
+                outfile.write("    ")
+            outfile.write("0x%02x," % b)
+            if ((index + 1) % 8) == 0:
+                outfile.write("\n")
+            else:
+                outfile.write(" ")
+        outfile.write("};\n")
+
+        outfile.write("\n")
+        outfile.write("static const txt_font_t %s_font =\n{\n" % font_prefix)
+        outfile.write("    \"%s\", %s_font_data, %d, %d,\n" % (
+                          font_prefix, font_prefix,
+                          dimensions[0], dimensions[1]))
+        outfile.write("};\n")
+
+convert_image(sys.argv[1], sys.argv[2], sys.argv[3])
+
diff --git a/games/NXDoom/textscreen/fonts/large.h b/games/NXDoom/textscreen/fonts/large.h
new file mode 100644
index 000000000..5dac05ed4
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/large.h
@@ -0,0 +1,2060 @@
+/* Font data generated from large.png; do not edit.
+   Please see textscreen/fonts/README for copyright
+   information. */
+
+static const uint8_t large_font_data[] =
+{
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x3f, 0xfe, 0x7f, 0x07, 0xe0, 0x03, 0xc0,
+    0x33, 0xcc, 0x33, 0xcc, 0x03, 0xc0, 0x03, 0xc0,
+    0x03, 0xc0, 0x03, 0xc0, 0xf3, 0xcf, 0xf3, 0xcf,
+    0xe3, 0xc7, 0xc3, 0xc3, 0x03, 0xc0, 0x03, 0xc0,
+    0x03, 0xc0, 0x07, 0xe0, 0xfe, 0x7f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x3f, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff,
+    0xcf, 0xf3, 0xcf, 0xf3, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x1f, 0xf8, 0x3f, 0xfc, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x1c, 0x0e, 0x3e, 0x1f, 0xff, 0x3f, 0xff, 0x3f,
+    0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xfe, 0x1f,
+    0xfe, 0x1f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf8, 0x07,
+    0xf0, 0x03, 0xe0, 0x01, 0xc0, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0xf8, 0x07,
+    0xfc, 0x0f, 0xfe, 0x1f, 0xff, 0x3f, 0xff, 0x3f,
+    0xfe, 0x1f, 0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03,
+    0xe0, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x3e, 0x7c, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc,
+    0x3f, 0xfc, 0x3e, 0x7c, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07,
+    0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xfe, 0x7f, 0xdc, 0x3b, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x3f, 0xfc, 0x1f, 0xf8, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x1f,
+    0x3c, 0x3c, 0x1c, 0x38, 0x0c, 0x30, 0x0c, 0x30,
+    0x0c, 0x30, 0x0c, 0x30, 0x1c, 0x38, 0x3c, 0x3c,
+    0xf8, 0x1f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0xe0,
+    0xc3, 0xc3, 0xe3, 0xc7, 0xf3, 0xcf, 0xf3, 0xcf,
+    0xf3, 0xcf, 0xf3, 0xcf, 0xe3, 0xc7, 0xc3, 0xc3,
+    0x07, 0xe0, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x3f, 0x00, 0x3f,
+    0x80, 0x37, 0xc0, 0x33, 0xe0, 0x31, 0xf0, 0x30,
+    0xfc, 0x03, 0xfe, 0x07, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0x07, 0xfc, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x0f, 0xf8, 0x1f, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f,
+    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xf0, 0xf0, 0xf0,
+    0xf0, 0xff, 0xf0, 0xff, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfe, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0x7f, 0x00, 0x3e, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0xff, 0xfc, 0xff, 0x3c, 0xf0, 0x3c, 0xf0,
+    0xfc, 0xff, 0xfc, 0xff, 0x3c, 0xf0, 0x3c, 0xf0,
+    0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0,
+    0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf8, 0x3c, 0xfc,
+    0x3e, 0xfc, 0x3f, 0xfc, 0x3f, 0x7c, 0x3f, 0x38,
+    0x1f, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc3, 0xc3, 0xcf, 0xf3,
+    0xfc, 0x3f, 0xf0, 0x0f, 0x3f, 0xfc, 0x3f, 0xfc,
+    0xf0, 0x0f, 0xfc, 0x3f, 0xcf, 0xf3, 0xc3, 0xc3,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00,
+    0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00,
+    0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03,
+    0xff, 0x07, 0xff, 0x07, 0xff, 0x03, 0xff, 0x01,
+    0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00,
+    0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30,
+    0x00, 0x38, 0x00, 0x3c, 0x00, 0x3e, 0x00, 0x3f,
+    0x80, 0x3f, 0xc0, 0x3f, 0xe0, 0x3f, 0xf0, 0x3f,
+    0xf8, 0x3f, 0xf8, 0x3f, 0xf0, 0x3f, 0xe0, 0x3f,
+    0xc0, 0x3f, 0x80, 0x3f, 0x00, 0x3f, 0x00, 0x3e,
+    0x00, 0x3c, 0x00, 0x38, 0x00, 0x30, 0x00, 0x20,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
+    0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xe0, 0x07,
+    0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x3c, 0x18, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0xff, 0xfe, 0xff, 0xc7, 0xf3, 0xc7, 0xf3,
+    0xc7, 0xf3, 0xc7, 0xf3, 0xc7, 0xf3, 0xc7, 0xf3,
+    0xfe, 0xf3, 0xfc, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
+    0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
+    0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x38, 0x3e, 0x00, 0xfc, 0x00,
+    0xf8, 0x03, 0xf0, 0x07, 0x38, 0x0f, 0x1c, 0x1e,
+    0x0e, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x1c,
+    0x1e, 0x0e, 0x3c, 0x07, 0xf8, 0x03, 0xf0, 0x03,
+    0xc0, 0x0f, 0x00, 0x1f, 0x07, 0x3e, 0x0f, 0x3c,
+    0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f,
+    0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
+    0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xe0, 0x07,
+    0xc0, 0x03, 0x80, 0x01, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
+    0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xf8, 0x1f,
+    0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x00, 0x07, 0x00, 0x0e, 0xff, 0x1f, 0xff, 0x1f,
+    0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x70, 0x00,
+    0x38, 0x00, 0x1c, 0x00, 0xfe, 0x3f, 0xfe, 0x3f,
+    0x1c, 0x00, 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x30, 0x0c,
+    0x38, 0x1c, 0x3c, 0x3c, 0xfe, 0x7f, 0xfe, 0x7f,
+    0x3c, 0x3c, 0x38, 0x1c, 0x30, 0x0c, 0x20, 0x04,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xe0, 0x01,
+    0xf0, 0x03, 0xf0, 0x03, 0xf8, 0x07, 0xf8, 0x07,
+    0xfc, 0x0f, 0xfc, 0x0f, 0xfe, 0x1f, 0xfe, 0x1f,
+    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0xfe, 0x1f, 0xfe, 0x1f,
+    0xfc, 0x0f, 0xfc, 0x0f, 0xf8, 0x07, 0xf8, 0x07,
+    0xf0, 0x03, 0xf0, 0x03, 0xe0, 0x01, 0xe0, 0x01,
+    0xc0, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+    0xe0, 0x07, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x38, 0x1c, 0x30, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0x38, 0x07,
+    0x38, 0x07, 0x38, 0x07, 0xff, 0x3f, 0xff, 0x3f,
+    0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07,
+    0x38, 0x07, 0x38, 0x07, 0xff, 0x3f, 0xff, 0x3f,
+    0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x38,
+    0x0f, 0x30, 0x0f, 0x30, 0x0f, 0x00, 0x0f, 0x00,
+    0xfe, 0x0f, 0xfc, 0x1f, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x03, 0x3c, 0x03, 0x3c,
+    0x07, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x06, 0x30, 0x0f, 0x38, 0x0f, 0x3c, 0x06, 0x1e,
+    0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
+    0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00,
+    0x0f, 0x18, 0x07, 0x3c, 0x03, 0x3c, 0x01, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x03, 0xf8, 0x07, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x3c, 0x0f, 0x38, 0x07, 0xf0, 0x03, 0xf0, 0x03,
+    0xfc, 0x30, 0xfe, 0x38, 0xcf, 0x1f, 0xcf, 0x1f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3f, 0xfc, 0x1c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0x78, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x03, 0xe0, 0x01,
+    0xe0, 0x00, 0xe0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xe0, 0x00, 0xe0, 0x00,
+    0xe0, 0x01, 0xc0, 0x03, 0x80, 0x0f, 0x00, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x00, 0xf0, 0x01, 0xc0, 0x03, 0x80, 0x07,
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x07,
+    0x80, 0x07, 0xc0, 0x03, 0xf0, 0x01, 0xf0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1c, 0x38, 0x3c, 0x3c, 0x78, 0x1e,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff,
+    0xf0, 0x0f, 0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c,
+    0x1c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xe0, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x20, 0x00, 0x30, 0x00, 0x38, 0x00, 0x3c,
+    0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
+    0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
+    0x1e, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x03, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x0f, 0xf8, 0x1f, 0x3c, 0x3c, 0x1e, 0x78,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x8f, 0xf1, 0xcf, 0xf3, 0xcf, 0xf3, 0x8f, 0xf1,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x1e, 0x78, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x03, 0xc0, 0x03, 0xe0, 0x03, 0xf0, 0x03,
+    0xf8, 0x03, 0xfc, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x07, 0xfc, 0x0f, 0x0e, 0x1c, 0x07, 0x3c,
+    0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07,
+    0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00,
+    0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x0e, 0x00,
+    0x0f, 0x30, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f,
+    0xe0, 0x0f, 0xf0, 0x0f, 0x78, 0x0f, 0x3c, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0xc0, 0x3f, 0xc0, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0xff, 0x0f, 0xff, 0x1f, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x03, 0xf8, 0x03, 0x3c, 0x00, 0x1e, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0xff, 0x0f, 0xff, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
+    0xe0, 0x01, 0xe0, 0x01, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e,
+    0xfc, 0x0f, 0xfc, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0xfe, 0x3f, 0xfc, 0x3f, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x1e, 0x00, 0x0f, 0xfc, 0x07, 0xfc, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+    0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e,
+    0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
+    0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x78, 0x00, 0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03,
+    0x80, 0x07, 0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x78, 0x00,
+    0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07,
+    0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
+    0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3e, 0x00, 0x1f, 0x80, 0x0f,
+    0xc0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x8f, 0x3f, 0xcf, 0x3f, 0xcf, 0x3f, 0xcf, 0x3f,
+    0xcf, 0x3f, 0xcf, 0x3f, 0xcf, 0x1f, 0x8f, 0x0f,
+    0x0f, 0x00, 0x0f, 0x00, 0xfe, 0x0f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0xf8, 0x07,
+    0x3c, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c,
+    0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x1c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x1c, 0xff, 0x0f, 0xff, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c,
+    0x1e, 0x38, 0x1e, 0x30, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x1e, 0x30, 0x1e, 0x38,
+    0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x01, 0xff, 0x03, 0xbc, 0x07, 0x3c, 0x0f,
+    0x3c, 0x1e, 0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c, 0x3c, 0x1e,
+    0x3c, 0x0f, 0xbc, 0x07, 0xff, 0x03, 0xff, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x3c, 0x3c, 0x38,
+    0x3c, 0x30, 0x3c, 0x20, 0x3c, 0x03, 0x3c, 0x03,
+    0xfc, 0x03, 0xfc, 0x03, 0x3c, 0x03, 0x3c, 0x03,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x20, 0x3c, 0x30,
+    0x3c, 0x38, 0x3c, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x3c, 0x3c, 0x38,
+    0x3c, 0x30, 0x3c, 0x20, 0x3c, 0x03, 0x3c, 0x03,
+    0xfc, 0x03, 0xfc, 0x03, 0x3c, 0x03, 0x3c, 0x03,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x07, 0xf0, 0x0f, 0x78, 0x1c, 0x3c, 0x38,
+    0x1e, 0x30, 0x0e, 0x30, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0xcf, 0x3f, 0xcf, 0x3f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0e, 0x3c, 0x1e, 0x3c,
+    0x3c, 0x3c, 0x78, 0x3e, 0xf0, 0x37, 0xe0, 0x33,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0x07, 0xfc, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x3c, 0x3f, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e, 0x3c, 0x0f,
+    0xfc, 0x07, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x07,
+    0x3c, 0x0f, 0x3c, 0x1e, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3f, 0x3c, 0x3f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x20, 0x3c, 0x30,
+    0x3c, 0x38, 0x3c, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0xe0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xcf, 0xf3, 0x8f, 0xf1, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0x3c, 0x0f, 0x3c, 0x1f, 0x3c, 0x3f, 0x3c,
+    0x7f, 0x3c, 0xff, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0xcf, 0x3f, 0x8f, 0x3f, 0x0f, 0x3f, 0x0f, 0x3e,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf8, 0x07, 0xfc, 0x0f, 0x1e, 0x1e, 0x1e, 0x1e,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x1e, 0x1e, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1e, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e,
+    0xfc, 0x0f, 0xfc, 0x07, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xcf, 0x3c, 0xcf, 0x3c,
+    0xcf, 0x3f, 0xcf, 0x3f, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1c, 0x3c, 0x38,
+    0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x3c, 0x3c, 0x1c,
+    0xfc, 0x0f, 0xfc, 0x07, 0x3c, 0x07, 0x3c, 0x0e,
+    0x3c, 0x1c, 0x3c, 0x1c, 0x3c, 0x38, 0x3c, 0x38,
+    0x3c, 0x38, 0x3c, 0x38, 0x3f, 0x38, 0x3f, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x00, 0x3c, 0x00,
+    0xf8, 0x00, 0xf0, 0x03, 0xc0, 0x0f, 0x00, 0x1f,
+    0x00, 0x3c, 0x00, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xc7, 0xe3,
+    0xc3, 0xc3, 0xc1, 0x83, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
+    0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x8f, 0xf1, 0x8f, 0xf1,
+    0xcf, 0xf3, 0xcf, 0xf3, 0xef, 0xf7, 0xef, 0xf7,
+    0x7e, 0x7e, 0x7e, 0x7e, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x1e, 0x78, 0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f,
+    0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07,
+    0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c, 0x1e, 0x78,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c, 0x78, 0x1e,
+    0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0x78,
+    0x03, 0x3c, 0x01, 0x1e, 0x00, 0x0f, 0x80, 0x07,
+    0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00,
+    0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x0f, 0xc0,
+    0x0f, 0xe0, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0x3f, 0x00,
+    0xfc, 0x00, 0xfc, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+    0xc0, 0x0f, 0xc0, 0x0f, 0x00, 0x3f, 0x00, 0x3f,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x30, 0x00, 0x30,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x07, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0xe0, 0x00,
+    0xc0, 0x03, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x3c, 0x07, 0x3c, 0x0e, 0x3c, 0x1c, 0x3c, 0x1c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x1c, 0x3c, 0x1c, 0xfc, 0x0f, 0xfc, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x1e, 0x1c, 0x0f, 0x3c, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x38, 0x1e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x0f, 0xc0, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0xf0, 0x0f, 0xf8, 0x0f,
+    0x3c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x1f, 0x0f, 0xfe, 0x3d, 0xfc, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x3c, 0x0e,
+    0x3c, 0x0c, 0x3c, 0x0c, 0x3c, 0x00, 0x3c, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xfc, 0x3d,
+    0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0e, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x07, 0x0f, 0x0e, 0x0f,
+    0xfc, 0x03, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x0f, 0xbc, 0x1f,
+    0xfc, 0x3c, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3f, 0x3c, 0x3f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x18, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x1c,
+    0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x38, 0x3c, 0x1c,
+    0x3c, 0x0e, 0x3c, 0x07, 0xbc, 0x03, 0xfc, 0x01,
+    0xfc, 0x01, 0xfc, 0x03, 0x3c, 0x07, 0x3c, 0x0e,
+    0x3c, 0x1c, 0x3c, 0x38, 0x3f, 0x38, 0x3f, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x3f, 0x3c, 0x7f, 0x7e,
+    0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xcf, 0xf3,
+    0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
+    0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f,
+    0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f,
+    0x7c, 0x1e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x1e, 0xfc, 0x0f, 0xfc, 0x07,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xfc, 0x3d,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x1e, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x87, 0x07, 0xcf, 0x0f,
+    0xfc, 0x1c, 0x7c, 0x38, 0x3c, 0x38, 0x3c, 0x38,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x3e, 0x00, 0xfc, 0x00,
+    0xf0, 0x03, 0xc0, 0x07, 0x00, 0x0f, 0x00, 0x1e,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xff, 0x0f, 0xff, 0x0f,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x38, 0xe0, 0x3c, 0xc0, 0x0f, 0x80, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
+    0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0,
+    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+    0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
+    0xff, 0xff, 0xff, 0xff, 0x7e, 0x7e, 0x3c, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8,
+    0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07,
+    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0x78, 0x1e,
+    0x3c, 0x3c, 0x1e, 0x78, 0x0f, 0xf0, 0x07, 0xe0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0e, 0x3c, 0xfc, 0x3f, 0xf8, 0x3f,
+    0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x07,
+    0xff, 0x03, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x1f,
+    0x07, 0x0e, 0x03, 0x07, 0x80, 0x03, 0xc0, 0x01,
+    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+    0x0e, 0x30, 0x07, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3e, 0x00, 0x3f, 0x80, 0x03, 0xc0, 0x01,
+    0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
+    0xfc, 0x00, 0xfc, 0x00, 0xc0, 0x01, 0xc0, 0x01,
+    0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
+    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x3f, 0x00, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x7c, 0x00, 0xfc, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03,
+    0x00, 0x3f, 0x00, 0x3f, 0x80, 0x03, 0x80, 0x03,
+    0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03,
+    0xc0, 0x03, 0xc0, 0x01, 0xfc, 0x00, 0x7c, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x38, 0xfc, 0x3c, 0xce, 0x0f, 0x87, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x07, 0x38,
+    0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38,
+    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x1c, 0x38,
+    0x0e, 0x30, 0x0f, 0x30, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x30, 0x0e, 0x30, 0x1c, 0x38, 0x38, 0x1c,
+    0xf0, 0x0f, 0xe0, 0x0f, 0x00, 0x0f, 0x00, 0x0e,
+    0x00, 0x1c, 0x00, 0x1c, 0xfc, 0x0f, 0xfc, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x07,
+    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
+    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x1c, 0x0e, 0x1c, 0x0e, 0xf0, 0x03, 0xe0, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x3c, 0x38,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x0f,
+    0x00, 0x0f, 0x00, 0x0e, 0x00, 0x1c, 0x00, 0x1c,
+    0xf0, 0x0f, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
+    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+    0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c, 0x1c, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
+    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
+    0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x01, 0xf0, 0x03, 0x1c, 0x0e, 0x1c, 0x0e,
+    0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x00,
+    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
+    0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+    0x38, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x38, 0x3c, 0x30,
+    0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x0f, 0xfc, 0x0f,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x30, 0x3c, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1c, 0x1e, 0x38, 0x3f,
+    0xf0, 0x73, 0xe0, 0xf3, 0xc0, 0xf3, 0xc0, 0x73,
+    0xf8, 0x3f, 0xfc, 0x1f, 0xce, 0x03, 0xc7, 0x03,
+    0xc7, 0x07, 0xce, 0x1e, 0xfc, 0xfc, 0x78, 0xf0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x3f, 0xf0, 0x3f, 0x38, 0x0f, 0x1c, 0x0f,
+    0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x3f, 0x0f, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01,
+    0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
+    0xf8, 0x01, 0x9c, 0x03, 0x0e, 0x07, 0x07, 0x0e,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0e, 0x3c, 0xfc, 0x3f, 0xf8, 0x3f,
+    0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x07,
+    0xfc, 0x03, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf8, 0x1f, 0xfc, 0x3f,
+    0x0e, 0x70, 0x07, 0xe0, 0x07, 0x00, 0x07, 0x00,
+    0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00,
+    0x07, 0xe0, 0x0e, 0x70, 0xfc, 0x3f, 0xf8, 0x1f,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x38, 0x07, 0x3c, 0x0e, 0x3c, 0x0c, 0x3c, 0x0c,
+    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0x3f, 0x38, 0x3f, 0x1c, 0xff, 0x0f, 0xff, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0xe0, 0x0e, 0x70, 0x1c, 0x38, 0x38, 0x1c,
+    0x70, 0x0e, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
+    0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+    0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, 0xff, 0x1f,
+    0x3c, 0x3c, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x3c,
+    0xfc, 0x1f, 0xfc, 0x0f, 0x3c, 0x30, 0x3c, 0x38,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0xff, 0x3c, 0xff,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0xff, 0xf8, 0xff, 0xf0,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x3f,
+    0x80, 0x77, 0xc0, 0xe3, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc7, 0x03, 0xee, 0x01, 0xfc, 0x00, 0x78, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
+    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x07,
+    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
+    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
+    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x07, 0x3c, 0x0f, 0x3c,
+    0x1f, 0x3c, 0x3f, 0x3c, 0x7f, 0x3c, 0xff, 0x3c,
+    0xff, 0x3d, 0xef, 0x3f, 0xcf, 0x3f, 0x8f, 0x3f,
+    0x0f, 0x3f, 0x0f, 0x3e, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0xf0, 0x0f,
+    0x38, 0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x38, 0x0f,
+    0xf0, 0x3f, 0xe0, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x38, 0x07, 0x1c, 0x0e, 0x1c, 0x0e, 0x38, 0x07,
+    0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x60, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0x60, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+    0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00,
+    0x0f, 0x00, 0x07, 0x00, 0x07, 0x38, 0x07, 0x38,
+    0x07, 0x38, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x20, 0x0f, 0x30,
+    0x0f, 0x38, 0x0f, 0x1c, 0x0f, 0x0e, 0x0f, 0x07,
+    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+    0x38, 0x00, 0x1c, 0x00, 0x0e, 0x3e, 0x07, 0x7f,
+    0x83, 0xf3, 0xc1, 0xf1, 0x00, 0x38, 0x00, 0x1c,
+    0x00, 0x0e, 0x00, 0x07, 0x80, 0xff, 0xc0, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x20, 0x0f, 0x30,
+    0x0f, 0x38, 0x0f, 0x1c, 0x0f, 0x0e, 0x0f, 0x07,
+    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+    0x38, 0x3c, 0x1c, 0x3e, 0x0e, 0x3f, 0x87, 0x3d,
+    0xc3, 0x3c, 0x61, 0x3c, 0xf0, 0x3f, 0xf0, 0x3f,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0xe0, 0x07,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+    0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0x78, 0x1e,
+    0x3c, 0x0f, 0x9e, 0x07, 0xcf, 0x03, 0xcf, 0x03,
+    0x9e, 0x07, 0x3c, 0x0f, 0x78, 0x1e, 0xf0, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xcf, 0x03, 0x9e, 0x07,
+    0x3c, 0x0f, 0x78, 0x1e, 0xf0, 0x3c, 0xf0, 0x3c,
+    0x78, 0x1e, 0x3c, 0x0f, 0x9e, 0x07, 0xcf, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xff, 0xf0, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf0, 0xff,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xfc, 0xf0, 0xfc,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xfc, 0xff, 0xfc,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0xff, 0xfc,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
+    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xfc, 0xf0, 0xfc,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xfc, 0xff, 0xfc,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0xff, 0xfc,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xff, 0xf0, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf0, 0xff,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xff, 0xff, 0xff,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x7c, 0x3c, 0xfe, 0x3e,
+    0xcf, 0x1f, 0x87, 0x0f, 0x87, 0x03, 0x87, 0x03,
+    0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
+    0x87, 0x0f, 0xcf, 0x1f, 0xfe, 0x3d, 0xfc, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf8, 0x01, 0xfc, 0x03, 0x0e, 0x07, 0x0e, 0x07,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x8f, 0x07,
+    0xcf, 0x03, 0xcf, 0x03, 0x8f, 0x07, 0x0f, 0x0f,
+    0x0f, 0x0e, 0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x1c,
+    0x0f, 0x1c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+    0x0f, 0x38, 0x1e, 0x30, 0x3c, 0x00, 0x78, 0x00,
+    0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03,
+    0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
+    0x1e, 0x30, 0x0f, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x3f, 0xfc, 0x3f,
+    0xce, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
+    0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
+    0x87, 0x03, 0xce, 0x01, 0xfc, 0x00, 0x78, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+    0x3c, 0x1c, 0x3c, 0x1e, 0xfc, 0x0f, 0xfc, 0x07,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1c, 0x00,
+    0x0f, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0xc7, 0x07,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
+    0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
+    0x38, 0x1c, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38,
+    0x1c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x07,
+    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x0e, 0x1c,
+    0x07, 0x38, 0x07, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+    0x07, 0x38, 0x07, 0x38, 0x0e, 0x1c, 0x0e, 0x1c,
+    0x1c, 0x0e, 0x38, 0x07, 0xf0, 0x03, 0xe0, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0x03, 0xf8, 0x07, 0x3c, 0x0f, 0x1e, 0x1e,
+    0x0f, 0x3c, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38,
+    0x07, 0x38, 0x07, 0x38, 0x0e, 0x1c, 0x1e, 0x1e,
+    0x1c, 0x0e, 0x3c, 0x0f, 0x38, 0x07, 0x38, 0x07,
+    0x38, 0x07, 0x38, 0x07, 0x3f, 0x3f, 0x3f, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3f, 0xc0, 0x3f, 0xe0, 0x00, 0xe0, 0x00,
+    0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0f,
+    0xe0, 0x1f, 0xf0, 0x3f, 0x38, 0x3c, 0x1c, 0x38,
+    0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38,
+    0x1c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0xfc, 0x3f,
+    0xce, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
+    0xcf, 0xf3, 0xce, 0xf3, 0xfc, 0x3f, 0xf8, 0x1f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x70,
+    0x00, 0x38, 0x00, 0x1c, 0xf8, 0x1f, 0xfc, 0x3f,
+    0x0e, 0x77, 0x8f, 0xf3, 0xcf, 0xf3, 0xef, 0xf1,
+    0xff, 0xf0, 0xff, 0x70, 0xfc, 0x3f, 0xfc, 0x1f,
+    0x1c, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x07, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0f, 0xc0, 0x0f, 0xe0, 0x01, 0xf0, 0x00,
+    0x78, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+    0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x00, 0x3c, 0x00,
+    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x78, 0x00,
+    0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x0f, 0x00, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0xf0, 0x00,
+    0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f,
+    0x00, 0x1e, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07,
+    0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x70, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x0f,
+    0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
+    0x78, 0x00, 0x78, 0x00, 0xf0, 0x00, 0xe0, 0x01,
+    0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x0e,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3f, 0x80, 0x7f, 0xc0, 0xf3, 0xc0, 0xf3,
+    0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+    0xcf, 0x03, 0xcf, 0x03, 0xcf, 0x03, 0xcf, 0x03,
+    0xcf, 0x03, 0xcf, 0x03, 0xfe, 0x01, 0xfc, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+    0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x78, 0x38, 0xfc, 0x3c,
+    0xcf, 0x0f, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+    0x38, 0x07, 0x1c, 0x0e, 0x1c, 0x0e, 0x38, 0x07,
+    0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+    0x00, 0x0f, 0x00, 0x0f, 0x07, 0x0f, 0x0f, 0x0f,
+    0x1e, 0x0f, 0x3c, 0x0f, 0x78, 0x0f, 0xf0, 0x0f,
+    0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f, 0x00, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xcf, 0x03, 0xef, 0x07,
+    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+    0x3c, 0x0f, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0xfc, 0x00,
+    0xce, 0x01, 0xc7, 0x03, 0xe0, 0x00, 0x70, 0x00,
+    0x38, 0x00, 0x1c, 0x00, 0x0e, 0x03, 0x07, 0x03,
+    0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
+    0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
+    0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
+    0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const txt_font_t large_font =
+{
+    "large", large_font_data, 16, 32,
+};
diff --git a/games/NXDoom/textscreen/fonts/large.png b/games/NXDoom/textscreen/fonts/large.png
new file mode 100644
index 0000000000000000000000000000000000000000..3827ab599f1cd1674646783cbb79b5f17f0c263f
GIT binary patch
literal 7837
zcmZvB2T)UOw{;*=rAZSB1d!%SRgqo=lqS6d5+tC4w9tDAK?DWqAgGj}i1gm1gD6cp
zLg)bjsUegQYT)O+|NGth&As0_duHu<o|(PZIeX2TQ=*LwwCHI$X#oHLy^gk~2>?KL
znUVvj$uHsekzmOs(0FKDd0*n+J7i>XHwkK&36+nI{sXE7ASF-?9LOKi2mpYUbTsdq
z1x(|zrjnO$(LIpjKEHsM1+KmRP*OvmoT%2`U???iknuqD=lCf_)bG_*t%I{ulEK0G
zlqc^C+vhm|00qDnlIfYW`TSmCD0q3uq-<X>%tVxJ@6kii2U>}QFqJQ%V6n7;=h;(Z
zvqM!yq~J$0`)D-!9Jx@Plw9tDMsqWR&h81JA66(?>;>H44iwn;t)c59-|fdtnoC=p
zDp^WV9c7*uZ>#8BjHfACrNdNny;PtuiCy*S)pR=ddA$G2>7Us3(*yov53CS#vd36x
zvQV7o>8sbEK-8v(wyXCkJbP<fT4ndcZ5_vZGQmmxFYKhhWDtJBZL<AKFW}F47IX|7
z16K!;YMV*4clnHC8(c4jh71EkkQWEmmM3V}eM~3j-jdXmQMB*4q|SHkD)6VrzJWoj
zcx+qH$?~fUWwg}|mFhmPd%O7Fr-*gP3gfkhkDHtcg0SiFx{dv0qF5rX8H=y#J|$tK
z)c3fa8g(BD=)~GM_TsQtZM09DKP%U<k%khSffZ|aBm<6O!D@0QnHldKf8RB<*c36c
zTBOsHl|Xo80?j!q8lWn;{n*jY{6`D>?>iy*$4`t7+YkTZW+j&Gc<*O)C={!W_@{E>
ze0;0bpH#Y@D^F`UqcL^)p$5e_B2V*wuF{pcXzD=1>BtXLuYK8g{pQtHL*Fk1qCND+
zmu?ZGnl;CPag1T|cY$kQlctTmby2sOvFvCX<)TH6BDAA_Y67pI--uU4gNUJb*qe-Q
z9fQV3p1HcQ+uM89=QvCtQWfK6p(*{9C5v)k0T$)+eOFm)_IXX$SEkwO_GBe8m%zZE
ziZhT!rjlOkGq+~7$OxDOijDlyQvA)-{b#Q`n)z;k0RYy2i%a3=yzn13PFoIff)aHq
zycmX4G{xHpZMJ8#1HhvX%Dq>Msgwj|qo>_DYQ2vNx-^3yjeC3oVeNMT@eYQ2%>E|^
zS`pl=^hMJ*wA^WRX@^yQi>x1hSTcO&tt=OMnm&Y`w^8s`LeY~>9?=fp{Y|;fBi)VJ
zd~qM)vG`bnO5JllKH&RDZ}F!4H4L-U(8I6rd92w|N*H}^mVJef@MM;n)Z#b2?{hm}
zji^+Ihkyko@g7f>OUSb5dpEs2r+&;jpU!xPm~A4r-@LTHQ_O(${ZR8LyxZDA(SZ7e
zV+Ql@`ux4)xRmonb>EsRRa0L~-wmn^h$`47o}(G%{%DJP=EjKZTRJJU+)d*)nh58s
z3+uU;<uFBC#J&dd27c5F;cUM<R-l(cOKeprje4}Od7S&BN}^e&yJ|^D4kW0yMpd)b
z@iCcHlWZhmu=P7KihxPH8X2WVK?~`$l6=dOXb~fuxF)MIHuhV^{M^%32f1psT^^F>
zNZj@0k4<mx&aBITnG{&v6litjlc_y`{1)VV^ScKUuv~sOVQ3uuwm7Ir0mj|msmDHm
zv}Jd&DmSD%yzK>-{mw{GVO;{fbuLX`97HWjgr`-uDpNT|pRNoY?iT2%*LLlOonUgS
z?SpzPbJ2s}wKCtffssV%0BG7)gV@^5Vzu~OA*<_s-dENNr{aWP2xOeuus_Fv?5@4s
z!h&-W?7b>K#82ESu%1=B)<J|lbnjGoHNi%CtDT^LA^<OS^UqPi%x;a35M}APAIVW6
ztuRhAF%N+Db1%N$0VtAZuZk<FQHt8MMu0RAxTfLV8Em}6z-Kx8+ZuPrQo8zgpqc#u
z#+*;iciPT2Eg*|~x{Gz`OULKb62=*i6WnOPwn2}CnW73PO)6+uZF%XtN@2II#_09N
zb^+$H-c!yF8mKZFIaqCBz4?H}rMpw3W8`6_anpYE>tVh#Q~}HsG+Lde+2Ys55P@C!
z>1U@9actPCW?d$YHnnVuXf>X^)9(}z397kTE|S)}L!|lS#$H9ja+tb*wLN;QeQUZQ
z;-o^P_Dm+e&~2U~N_+!YAVXV2+x6{d^C&(MD6p7UINhxNOf3D}5YBpkZ>)P=?;&se
zTw~Vy0Hzkq5jFSQ_RA5Autx4%Bn{Sak5KRIvShI32Nso9yf?~N_u&Z@Ba=V#AEIP^
zvBotQA&nB>U|n%T-%klraom=RtUMf1h$b$d*S9*wsgGInn;1RB`;6wOjHW7_T~cNj
zO|0zqM|HhK@M$+#WsuyAIkmDYm7rRpdqv;3+#8s?)Z<~(9W91!v;^}5W4B{2EPnG|
z8Ju-{E4dH!@adZ@+Xe!*tDB<phCs+jcYf0O1zMn+LXlCWgvr)r%=<3F)^<6H>R)62
z7xI!PJo*_1X5NqQx#7?!DT%%^0VdVYoeft3Yn$OS@bq0Pj=f!Zfi@>qF1RhaWIp^}
zSmo-ws8%c3OFQqPo80uj2GI9n0m=O9%qI1l4=Re@i%Hq)+B|9U8vmASVZTsFgq)r$
zRjt9$9WG}Hd+vR1Q2XeaT>j3yZnNqF`bLL@XI$OlWt88n5GxppJYiEDTY^mdFOPM!
zx^pdLk`6LITiTVvCG(r(*7NPBSM>9pQ)~R=S2{t<QXo=0&Tx=VKROM0{RKDEbBsWB
zZj4q9oU5OKTb#rat=EyNIb)2VukuSfHb&-DjCu^=&e-;k%akVXp1erA-e?P|N?S#6
zLrOQP?BU+;`KnpRr#@=DZ~0O|nvVCExR*Ni!`JVdO-9D^KX-!mWDMUhGtYxR)&@YI
z2XG!b+e<`T6~FgIu+B#9gc}nXPvr1CzD+8el6V&TN1tQiMRh_-TnZ94mtL#C#59(3
zw@c#v+n<wQk``@obrA!B0I^BS(_*kK*lMC2{cw?UIX@ncSv-dMDFYF}n*e>db;W-N
z*y^xS;*3~2T-JLT>g+Dgl`6ar9sbDe&GS=L-iBX>Ull9a_Ud+spg^OtI6i&IY*++N
zrOLz?*QKZ9<?cB7+0puD!8VWo3>~|{yG7ETE;Z185MndnUL1_t&{I4e>#FG@k*20u
zFwAfoKLXHb{@<+NUmCf@J`aAOJNvBnY)HSd-~7rpKzy7HpwXqR@sOC>kWURWck_5V
z*EmfnWmQFNF0HV8^@h;K8Grf~5429`nc)z5wNOX4qp1C-#dCI9@;Y}?I?P{OE8??H
zyPk(ti5gu|6_-s|*!a-~m(}4-5wKjm#)I?e80<S8vI~!hX_5G&53;@b_h9;b<|)lR
zv*<r+dJ=6JJZtc?KSv*mB&jKW9nxkdit0*y$nwo`WoQ`k1g-T&zydoYXhtR%1#{*c
z?G&sN_V$21K^JHDabz$0tM$apm`c)43zJ{Ms$|UR)vnS?<+^=tOfP^k?3$q#{kVBa
z@p7l1IqPb3GtYf&TYk|kE!h-lG}SLC>UN8b0W5rf{fUtd2lM`V^4OHZ|GeU%;__*8
zNO?`(_L)V{iX~7&j{!CFUV_E4^Lkcm+&f78(#DO1Qty%MW@KP<<@WR(V><)AkkOJH
zSJXKpk7Fli#c6BDPWT5ss?m*pJH5d#)EfK@1<8|QG7Q}*W!P+LPB$mlQFkF0A?Q1U
zlUnNw9sd{TqDWf%pd7;0nFNAxhkqo;;aB2`!J>i3M>~6#;+6-3s*jJ3uOm9du(ekM
zXNvY+L^a&OLn>Wn^D9pSUc<}uJPzn`d-fhT%6!%d6j2?v|F?nvlgjSg)I6rDi|lwd
zdeOEO#O16;)}A_w&jY%H!rJ&{5rk87w1u$=WF`?8h<m4*$slvM`Nk4v`8+44b66Kn
zi(Na6c<XxcR<ppEWAH^*lOQ=$cHIR@XDZ$%FuVre24#>Rn{;#B<ygVi?dY4$>^$2F
z8zR*+nR9X9r0*3Dk-SOSu(gt>x~TS6Bg^ktej<DBOu?x3t^_%!IH^@H1uia$ec{~P
zfZXCG?QgW3tI^X+72@y_9kjgVI!Afi(1+tUd~=}Bb&79~jPk5fb=^`kyvmokp#Oy6
zTpMp(a$|Gx7j(t3_~Pw?Y?;)feBfTk^(qHVy$jzgMA@;zOXV$|4*0r)-wtKbC)7&h
zHP^NgAR#H>czVBiB2S}Q@IjKI_C>Rlv=~iV`GU>$26jIR2NCV@j7riH+rqeomFG?F
zL{t8g2{2xgRR2Zf_>nOWZ!Yd|+|M<vguKS_7}vmWKDU!?RcM!Q!7=)M9E@RCogZLa
zAp79c{^RRI47fgzCjf;++L~}DX5b8SEp21UBwP&4J_TsoM~^G1eNTQpm09fPysEES
z=Z%kosTM6Qjh7B=2153CeFEXjvV%pcC3VX>E3UGGHL`Wkn8Lt0>fmXX*R7uHD`cOB
z!2WVGuB}Qr(}ff)0VrzO7)ul`*%q(^=)5TpaFtKUpn7LNb@d-Hw6_+x_K{b}Oi}@E
z0RS)6H17i_j&gw#&ck7^<OpxJwX&_DGwK~X2Qz8J{s7Jep)22rSB2$z?*tv^1!J*g
z;rsKFN9$@~QRg|5^A@+9?7r|wt9atxS8@V%Jc_+}RIoDH3q)+$78%MYh}i@}IKz>*
z15u@R1VDY7p`+eQ(bD_rZv_qe;yyLs!6X)Db$j>3=r5@^G~fJgDy_}OR%e7%Qbx&u
z6MsEOxkyPTG`&19%#)0CA8eQ<#7qeVL8BW<a65hDhO_2Vx;V{h!7ltd#H)@%J_#16
zukqv*fqhF*-xRGuezBIW`QblhDN=+>r8~f36Xf{$=)kVlE)bz@fxog814q8qseTHC
zerWMtcm&#LE}D(hyS|(z*O@$MJ&OKVwtq+Wq(jW|G+=V-7Rl!HJ`PsoG6@~Nap{W@
zrPdu2v;e<OmRf0A0MR5u(08Fnrj=QX3;KrFJe1RiH;dd%?}41Ny4{T7g9Hgi=f@L%
zBjEyRW>r6YrdvJPNadz`<xwnRk(_Io)wcL&^Aqr6SHs1?#Yd2Gcxb4sMD@KIL?bbv
zcQxgVOTuq(MZ0l0KFy_ma(=<>hZT<=$T;kcM8r7N)AR&{aIPPqSk2bOgI}y~f|+8G
ztS(-~v^2#>JJ=yhQd36Z&mjMEc~~Ts<rL$xJKIOj|1k(lu!}@EeS=-I5?!k6H<pg%
zUK3+rucw%*A@4<jbHfRj<fmpxmatNLf$@0u?b6mW;$ZYdxa%TW1xac;b#J|J6LU4h
zozjDob=klqBEj8*ow@|yLHn^|{YTsRcRtq~U8K{|si5n+!^T4T+x)O!`{GI&dJg*N
z^*sbtLb=w!+2***f;#6B<ofw}wAVY8tjDmEtNd0~Co+3S>CqSSJ7AEhj|^iDx3hO>
z#JA49<Bh_zIC!e&&2q1-1rdtGhG>kTYb%OH_7~+kyq5?O#BnK3)nA+llEKB)u5PxQ
zrmopssS+VUB2(SVK!gbh2tDryOZeUM7ww)H(p;4(f4^z!e9vUyec(hntDDr|`@WmV
zYZyM#h;|F(j!u7zP7xE7hj|_Sh|Fy~r<%b`73Wx?k$ykv+=@-@)@uzFZUNG^LIOdR
zZ_X;m>;2D-E}P+5EONR6T{>M~cYwJ~{_RX;E$u;~JWDHaxbL@`o@-A&;_Z|ml6R1p
zo|VwRTH<$Ive!%dNJ}s`hfORxnfi?_h_bjb-_kL;qhO}5wRj@LRX8MMh`iU|84<ji
z`=q*4M&jcDLZGT7`?@4S`_!p-fts<ZK3((ObzswenoH?aLIm9n)_1{d)csFPjRChO
z&-h8V0Hci0%Br%Yz!S&D#wt(asQ}ulmpZWZ%%CHi6tHi^);^1EXBfTs4E!sGouMSt
zO$8<c8J!9&C|)Hl<0^MisZ#|i7Xi!Y<kyNFGBPp4n^2n58M*36_Z2&!G0V4_oz<@(
zR5}Yfp|s<g!}u(GyzRrQxs@7M*){>Eeq(8;Z3X9ysMl%Fo(g_wX+uki9$WYXYiju`
zg5;}5;;PvlBI&9~fhRNP(BAqk@b3T!XmPUjCEu%H?Fp-(<TbV2GY(o0$Ak?f6I9FD
zcI=BmgQu6?_!q?6$UHBf(01$T*c~nAN{!&c)HLo!S62K?QS(Ekoj`;ci@)#;v3Vdg
zQl)$#X=`gZl<s54Eoa1P`)aY)_wtg2EOD&0fzBYYBvfS<SR-{ZvsYI+1Ufkwg@i;0
zv}#P2hT3G<6=$RID(#v`fKP@SVrAjZ*0A_0gCCQRPpxWv;Q@GrEKY7^4BLvDGkK!<
z&eI`aK2yn2OYY>DyZ?6*!YC@=I&SDHi*8*fb0BJFS|{Mb&;QU&fqnfjhIjf<Bfjc+
z_Y+_0W3?DA+teRWShu=&6yK0!ROf@?0a$~*z3H5|?q0|n*~II=*7ncXZKe~?oQ@CZ
zLoS$ONM39&Du;^uOFt@Ut?egATTFGNt>*f-GDiFu-P;5moky~sI-w7J8TNF^C5D#B
zsF||HKv&%2xd0XSY6_`P-W&^LiO7HXfnJ1Z6M#bPgp4-P;)Fk7opTc?Hww>yo$L0}
zE*fw<sq_fA&fJM4v^5Wj%S=!eoQr_)KC8VOv;MuWz><wVX~@NnrTkX|u}9?&^YBh-
z8aBzT;yBsDq10NbdYbODb%dm;c}#h?3LGhrbiT)Q<%Zd@3nFf+n~}AoQ<fzoDzbfr
zYtvjuWoBnv^<mLu4e;^TG<%bocWVym_TRSb%(^@K*r6-I#Sozyi999pZl?8mWu@<o
zHL^mVrYNB%aQNI2Te;#IE-UmWd<1DXYHdpQZXmw{$YK2nA+z#w$V)V35a_Y#(-ROi
z-*LF-gvLA3u)^rptm1lB!o$mrhdlTWR=T6O2eRjGP;eXJW|ZdmA<@A<4U%?M+G{Ub
zUD~HPWKRNbH|d2C01nr^fASO74a=0g4H2Z#g`&!{AaBBcjtHnOh&nl}wncyMkXH1i
z-j@CF;5Q?Szk+UNQ@Jd;{`ywVVNiCvgdDeZXL>)=Ynv~<CfD1YtY@1HO60BBY|6{7
zTdKjyqvGD<V{$7mCeO_^SktQ&OoITW#HR<Cv2fw+9Y0VyqI}6Q6<MKE)L8V&zwBBU
z?a6dy;$o_S*PB4<yf#k$`Rq-{8s*5j6&Ui*>s7>GiD$<->i*F44c_&B9!a^9->NIX
zI$3Q2u}>Cei-F}q)REqjt*IBdCI0%WIDbC`zMS*P;%Qv58b#}wV_yh@<^^%}@dh7j
z_Td3gVrhv(>%q)<*C9)JKBcHD?mi?2WM^BFH6!C+4rPk+6?#h9U(AruAsi7&z;h|z
z{i-9*K8mGU27D)7img4~Ev@2oJTi<S5xA_c5FuC4Q37svpjcYF%U$aA{(jrZTNwSF
zv1I*aj`VfgIiQ#rson&(5S6Ii)-i-ql1ooQ+C3^)79|qEIQb*tvd=Sc#9O35<F&dd
zg4TBeP8>2<`vXF^14z*g3r`=c=;>V7J8pJa5jcpep!khMJSwlMf~qW&`xh-cBE9Ck
zo0-ym*c?+{?~fZ9K1kN)=!;oN=&8-*9mCSh>+-zxn<Ji)-!V^SQ@Y?%YidSRc#MRc
z?dg3IUvwJgCjNCd(akDT20M2CV1rDk$jLY3v=2K}q=%f5Ox^N|ZUv>_-Yqz%TNI_z
z;@+AGoVKDFW1k=rXVk^tywaopYP4Q&UX1DM9NX8b@$K*LE*GIwP&)li{3+$$z#}Ki
z2z+@!udWeRO_&jJF7#1>o|G%T8_zTf!t6eExM(4sq+@(}Yz?`4s+l8k_}C={GVY$(
z;c)%W7pp+^3scMQDFU@njAz9$`ZHcnx9zlt+P7Vb<{?$o&nNuYigd!o*#n++*)^01
zLX8Y%cH)i}(+(RZ#Z@slru<3yi^}}@k<WR420=Bt948s3q-GvB%Z5q3z*T7Hl{%{G
zp48UKHx;SU*Z8%SmUw>*Ig{Kp@JJ3azXrOdvG=s|{BQ?Y-Hn6HF@AZqw=0PbG2|mj
zgyONL63XFf>qBilgCa~EPft@&=Dayl%hQ|ez2Q^<26=^l{HQ;?d!Qjdv~`GN)*A+g
z(DjA6W3%Fd=R*_=HG(#RO=Y};LuUF#m?k+_#~W3%5Tn!Qo52D~*#N>7Fkpeq*+TUu
zmC+p{07V5raRC5I0KhWfavi`+WyF_(b}Cnpat=8;!mS-HkpaNA`CK_|`UeO@LNvd)
zs{RG>Xz=>qRU8J%KI!>&DZB3ndr1gkcYO+FU;#F#{^gmpjF%7CQmcS#<00s5_d-?+
zaLQL=P3-fiX?fgGdhq3?1ONuf!yo^Xko{NxO9qSpfc)jz4g{z%s4-mD03-qvf&ZW0
ze{Hun%C{fjF>O6VUsba<;=dYm`s*ER)P}U>t^7<+sK#i=m!g?=kxBsGE993yBmQsL
z>SWU0zZz5}sG3y~v-#%A-nm18fJZ3h--O#^DqTr9@!qj>V|@2zR}_490=()Zni?Co
z4)a3o1)9LPQD1kH&}ZB;;7iH~Ft37}i+m^dNS!fmJ?ul<98X=dDlGVtcFuoj{eQ_^
zuGl)C$*Xe@;L9RQm7mVcwvjx!&Tf*KAV>VhN?Wo5005)^2^9J5EB{@@R<vO1W3E4K
zDBogL>;h<?b13_O>az0!nHP+(HbKNcp5nK|?*agtoH>qNB=$GAoM6F^B*Ro@ET@z#
z2W?^%%wwnk!K;8);hvQPb%E8TQ%uX~#Ii`e>P0AJsj9%`hqV861OM~lKeD83N3NJ@
zLxtL&(oz}Rg9iMm^86Jzm#NYmwO5M`-I&UQ%h{`{suns-)GOoDJ~prPADd{2yTAC^
zY_MwQN~gU?b`NtA@?pXa_=#C~F#vg<7>e?ZJsB&((&{^WD>qudKqf%8@<>hJ@9Ky>
z@inq`efQCS9DQ$(JhVl45a{nm9zQC%jwgU~oO`1*RSfH<eoolrEg!0yWrinr6t>DI
z5I`RDL|om_H^$=W!|#;&F;-aoVg5^+8-I$%rm|B)>Sq76x;O0$2(~SGoEAS6H4Uwn
z6m*g0s@HEAd=C*)=wl?f@1*27Mqp~l8s)cSlz3j5KB<I$D$7<dA_B+Prt(NDvW^&7
znO{9uQj=o1u&3lRY5VAt%rE)rsZ9$_{GO>8s;D=$O+2?WhiEX$L0wo8Dc3>gK8DXs
zCt86hqMW5$km+&w6d!AR)qU}!l&Y+4Y!a_`NI>-C>33`#<hw;$F^;25F1|r6YhwhV
z_e<Hp4<El;@@ax$G*aHg0L@3exAfPPa<YX@z)^#tEPbI`H+?b{AN@XtQp|l;U9(<(
zUSSi^CjLcIjx0U0JU>m(Z&*XCwwP-2_TDZjGqBoEt|-p61OiHbmd)Iut3vf{NzJC^
zwcpA3wvv3fv9K&mrAVZYy|UF``;*4UL3(&`+E#{jF0RsR>8;ce@spv!=x_Gsm$)+%
zvFbtlo;7;CC7qk}<2nxJlFP3c1n~YhirJ@H*f0}W3+ii50SB>nit7|MwpuverPS!*
zPD#Z6CL3OtAbJH9$WAX%<{x4G4ee}VxXRHs>C2aM*wQm<53T7a<tP@RiIGa>AHe2O
z+Ns$3VtSvvr@@WaoYeWRKd+}uZ&2}W6k<z(7iEJpw8Ok2oEJ_qL!FZo1+#S&@JIVE
zq@fvqInt)KbVz{Pb2eSZ=u15fORMh_b^$mxi{(2t$I$0>wMnmwM``edD@o^aHo5cQ
zc8^l2e1eu--Wtee@*Ko?`{iiKzWLIk^xfrIdd1JTC?-bE=Xg?p)Fib*TQzl2?#FzT
zGx$GbA=Q@MA-vwVTnoB;qH{BgIk&DH`mt(<l{sxR(0(SF&t|}&$s%JOhvKB4ziOM_
zytfE9%hj18Q%~LDvMrI((>4!1^hBif?>zR-TBuxVGmOr<1J0@3-Vk$e+Az;4<-)Hk
z+T0&;mZ>(gtl4g({newS@&i@AMApxo_?+S8pAe#Xj{X^{(<;YJUCF)hwT`%Ba-;jz
zAXH&eQM-paT-k~WG^V&n?Ti_LP0ZB_N)g|?mS-aK!ly@ouEDhQstXHbf9^tFOJBM(
giu`{Cs&tpf!#FwTdmZ@B-?P$rV4zv1Zu{c@0R}M>M*si-

literal 0
HcmV?d00001

diff --git a/games/NXDoom/textscreen/fonts/normal.h b/games/NXDoom/textscreen/fonts/normal.h
new file mode 100644
index 000000000..8b6d20ed5
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/normal.h
@@ -0,0 +1,524 @@
+/* Font data generated from normal.png; do not edit.
+   Please see textscreen/fonts/README for copyright
+   information. */
+
+static const uint8_t normal_font_data[] =
+{
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
+    0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xc3,
+    0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x36, 0x7f, 0x7f, 0x7f,
+    0x7f, 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x3e, 0x7f,
+    0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0xe7, 0xe7,
+    0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff,
+    0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
+    0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3,
+    0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42,
+    0x42, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
+    0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x78, 0x70, 0x58, 0x4c, 0x1e, 0x33,
+    0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c,
+    0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfc, 0xcc, 0xfc, 0x0c, 0x0c, 0x0c,
+    0x0c, 0x0e, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfe, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6,
+    0xc6, 0xe6, 0xe7, 0x67, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7,
+    0x3c, 0xdb, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x7f, 0x1f,
+    0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7f, 0x7c,
+    0x78, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+    0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+    0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfe, 0xdb, 0xdb, 0xdb, 0xde, 0xd8,
+    0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3e, 0x63, 0x06, 0x1c, 0x36, 0x63, 0x63,
+    0x36, 0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+    0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x7f,
+    0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0x7f,
+    0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
+    0x03, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xff,
+    0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x1c, 0x3e,
+    0x3e, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x3e, 0x3e,
+    0x1c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18,
+    0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x36, 0x36, 0x7f, 0x36, 0x36,
+    0x36, 0x7f, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x3e, 0x63, 0x43, 0x03, 0x3e, 0x60,
+    0x60, 0x61, 0x63, 0x3e, 0x18, 0x18, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x43, 0x63, 0x30, 0x18,
+    0x0c, 0x06, 0x63, 0x61, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x6e, 0x3b,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0c, 0x0c, 0x0c, 0x06, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c,
+    0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30,
+    0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff,
+    0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
+    0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x30, 0x18,
+    0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x66, 0xc3, 0xc3, 0xdb, 0xdb,
+    0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x1c, 0x1e, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x60, 0x30, 0x18, 0x0c,
+    0x06, 0x03, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x60, 0x60, 0x3c, 0x60,
+    0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x30, 0x38, 0x3c, 0x36, 0x33, 0x7f,
+    0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7f, 0x03, 0x03, 0x03, 0x3f, 0x60,
+    0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1c, 0x06, 0x03, 0x03, 0x3f, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7f, 0x63, 0x60, 0x60, 0x30, 0x18,
+    0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x3e, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x7e, 0x60,
+    0x60, 0x60, 0x30, 0x1e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+    0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+    0x00, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06,
+    0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
+    0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60,
+    0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x63, 0x30, 0x18, 0x18,
+    0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x7b, 0x7b,
+    0x7b, 0x3b, 0x03, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63, 0x7f,
+    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x66,
+    0x66, 0x66, 0x66, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
+    0x03, 0x43, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1f, 0x36, 0x66, 0x66, 0x66, 0x66,
+    0x66, 0x66, 0x36, 0x1f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
+    0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
+    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x7b,
+    0x63, 0x63, 0x66, 0x5c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x7f, 0x63,
+    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x78, 0x30, 0x30, 0x30, 0x30, 0x30,
+    0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x67, 0x66, 0x66, 0x36, 0x1e, 0x1e,
+    0x36, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x06,
+    0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xc3,
+    0xc3, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b, 0x73,
+    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x06,
+    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
+    0x63, 0x6b, 0x7b, 0x3e, 0x30, 0x70, 0x00, 0x00,
+    0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x36,
+    0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3e, 0x63, 0x63, 0x06, 0x1c, 0x30,
+    0x60, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0xdb, 0x99, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3,
+    0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb,
+    0xdb, 0xff, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18,
+    0x3c, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0xc3, 0x61, 0x30, 0x18, 0x0c,
+    0x06, 0x83, 0xc3, 0xff, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+    0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0x1c,
+    0x38, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
+    0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x08, 0x1c, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
+    0x0c, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x3e,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x07, 0x06, 0x06, 0x1e, 0x36, 0x66,
+    0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x03,
+    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x38, 0x30, 0x30, 0x3c, 0x36, 0x33,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x7f,
+    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06,
+    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x3e, 0x30, 0x33, 0x1e, 0x00,
+    0x00, 0x00, 0x07, 0x06, 0x06, 0x36, 0x6e, 0x66,
+    0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x18, 0x00, 0x1c, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x70, 0x60, 0x60,
+    0x60, 0x60, 0x60, 0x60, 0x66, 0x66, 0x3c, 0x00,
+    0x00, 0x00, 0x07, 0x06, 0x06, 0x66, 0x36, 0x1e,
+    0x1e, 0x36, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0xff, 0xdb,
+    0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
+    0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
+    0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x0f, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x3e, 0x30, 0x30, 0x78, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x6e, 0x66,
+    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x06,
+    0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x08, 0x0c, 0x0c, 0x3f, 0x0c, 0x0c,
+    0x0c, 0x0c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
+    0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
+    0xdb, 0xdb, 0xff, 0x66, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c,
+    0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1f, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x33, 0x18,
+    0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18,
+    0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18,
+    0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36, 0x63,
+    0x63, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
+    0x43, 0x66, 0x3c, 0x30, 0x60, 0x3e, 0x00, 0x00,
+    0x00, 0x00, 0x33, 0x00, 0x00, 0x33, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x30, 0x18, 0x0c, 0x00, 0x3e, 0x63, 0x7f,
+    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x1c, 0x36, 0x00, 0x1e, 0x30, 0x3e,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x33, 0x00, 0x00, 0x1e, 0x30, 0x3e,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x06, 0x0c, 0x18, 0x00, 0x1e, 0x30, 0x3e,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1c, 0x36, 0x1c, 0x00, 0x1e, 0x30, 0x3e,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x06, 0x06,
+    0x66, 0x3c, 0x30, 0x60, 0x3c, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x7f,
+    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x7f,
+    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x7f,
+    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x66, 0x00, 0x00, 0x1c, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x18, 0x3c, 0x66, 0x00, 0x1c, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x06, 0x0c, 0x18, 0x00, 0x1c, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x63, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63,
+    0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x1c, 0x36, 0x1c, 0x00, 0x1c, 0x36, 0x63, 0x63,
+    0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x0c, 0x06, 0x00, 0x7f, 0x66, 0x06, 0x3e,
+    0x06, 0x06, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0xd8,
+    0x7e, 0x1b, 0x3b, 0xee, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7c, 0x36, 0x33, 0x33, 0x7f, 0x33,
+    0x33, 0x33, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0c, 0x1e, 0x33, 0x00, 0x33, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x06, 0x0c, 0x18, 0x00, 0x33, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x63, 0x00, 0x00, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1e, 0x00,
+    0x00, 0x63, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x63, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x18, 0x18, 0x7e, 0xc3, 0x03, 0x03, 0x03,
+    0xc3, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06, 0x06,
+    0x06, 0x06, 0x67, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0xff, 0x18,
+    0xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3f, 0x66, 0x66, 0x3e, 0x46, 0x66, 0xf6,
+    0x66, 0x66, 0x66, 0xcf, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x7e, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00, 0x00,
+    0x00, 0x18, 0x0c, 0x06, 0x00, 0x1e, 0x30, 0x3e,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x30, 0x18, 0x0c, 0x00, 0x1c, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x18, 0x0c, 0x06, 0x00, 0x3e, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x18, 0x0c, 0x06, 0x00, 0x33, 0x33, 0x33,
+    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x6e, 0x3b, 0x00, 0x3b, 0x66, 0x66,
+    0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+    0x6e, 0x3b, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b,
+    0x73, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x7e, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1c, 0x36, 0x36, 0x1c, 0x00, 0x3e, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x06,
+    0x03, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x03,
+    0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60,
+    0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
+    0x06, 0x73, 0xd9, 0x60, 0x30, 0xf8, 0x00, 0x00,
+    0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
+    0x66, 0x73, 0x69, 0x7c, 0x60, 0x60, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18,
+    0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0x1b,
+    0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x36, 0x6c,
+    0x36, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
+    0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
+    0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
+    0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
+    0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
+    0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f, 0x60, 0x6f,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60, 0x6f,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f, 0x60, 0x7f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x7f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xfc,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0xec,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xef,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xec,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xef,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfc,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x1b,
+    0x1b, 0x1b, 0x3b, 0x6e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x1b, 0x33,
+    0x63, 0x63, 0x63, 0x33, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7f, 0x63, 0x63, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x7f, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x7f, 0x63, 0x06, 0x0c, 0x18,
+    0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x1b, 0x1b,
+    0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66,
+    0x66, 0x3e, 0x06, 0x06, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
+    0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x7f,
+    0x63, 0x63, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x63, 0x36,
+    0x36, 0x36, 0x36, 0x77, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x78, 0x0c, 0x18, 0x30, 0x7c, 0x66,
+    0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb,
+    0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xc0, 0x60, 0x7e, 0xdb, 0xdb,
+    0xcf, 0x7e, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x38, 0x0c, 0x06, 0x06, 0x3e, 0x06,
+    0x06, 0x06, 0x0c, 0x38, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63,
+    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x7f,
+    0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
+    0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30,
+    0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c,
+    0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x70, 0xd8, 0xd8, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+    0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e,
+    0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x00,
+    0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1c, 0x36, 0x36, 0x1c, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xf0, 0x30, 0x30, 0x30, 0x30, 0x30, 0x37,
+    0x36, 0x36, 0x3c, 0x38, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1b, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0e, 0x1b, 0x0c, 0x06, 0x13, 0x1f, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e,
+    0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const txt_font_t normal_font =
+{
+    "normal", normal_font_data, 8, 16,
+};
diff --git a/games/NXDoom/textscreen/fonts/normal.png b/games/NXDoom/textscreen/fonts/normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..884bb98d419f29e6315e58a56df77b467c74f40e
GIT binary patch
literal 3783
zcmV;&4mk0NP)<h;3K|Lk000e1NJLTq004jh009690ssI2^qcAM00009a7bBm00001
z000010XQP`KmY&$2XskIMF-#m1_LYw^G3B+000hVNkl<Zc-rk<+j8V645cal|Ch55
zsqJw<mm?uC?v@^=GLC}*A)&io<>B!2^Fuy=y<Q>juZCI@ZiQw#T))SJd;S@4UEO<K
z<U?*NNFw95s0s5J|AwPq@@3P4xo_=9?YM*2nf(0xjEg1DC5gOoT@^eI-00nL_<imD
zgNi(EeD3)+3NRs_TQB+Cz=F7qCO3%up*sa2p^V6wB(HG^92@bG9r^yacJjM*GgrN$
z=RKz@b<2dp9k=T^<8F2=;`%v~SFGTEztiYW=j-*V2yu;TeqF#SCeCmb6H9bZ@Q5t|
zVb+<G2d+l3Ae=nq1<2%l7jXMvrGOC=&Bx%#Gbo(Oj{HZ$9~m@x+}=Zt2Z9tuxaZtB
zAPeQhag}7R-~Iie#U7J!qp!aTImoz*`}@&xN^kyaB4X~saBJGXPZ}-`BZ`=?(d0u?
zWD=h5$CmpO;5(1kU{A9JSug5V64qSTX^eXYBmxq?oMqu+MwA>WXcAwF0A%r;Es1*q
zDlCFJW)(9|Gi%%K09hFk>^Z6y)2+Yz;VO5Vl+ts|*I}11uG(>n_epGs(cHA@hu~nG
z)d;;51X?byrxiT8DsdpY#(mc}AHj>_*k$q%AVXDd2G*${h7@l1aU6teOsY3V*as8k
zp|&87N3X!aA*PF8>5e?h0x^;AcS9kfV^gst^Ch>8@iu;SmSG{JAnLmu6`IB*r>(j=
zMq^)9v8{Sk+`Jf{y8K;)%a5Ey_Ct_Eb<RN~HbQ4j8}xwgx5yuY$5xg1L4LB7#f|g7
z{<q<$FII6K$zNrc4i;o(EKwJpfsW6)55LnCk&uv(@D&iHT7MYS$*tVHt)GX*hOBu~
zL@}x6-Je*altHE8F%)33vy+CrYZxAA6tY@Lg}pw?3>C(LtR?~SWzII>qebCY$Kqfr
zJe>>iM2JQXkrRv=Grk9tjc5b5{_)trJAkwHs2VT#K5j^mU*qluay}cbjq4|NM8=J2
zOu{{R#o~&+5L`nhTazghPe5=xfe&)Ldj%`t@-K?fJnl}@=>E1MGxo(RsD9DAWJDnu
zW~mB7uD3>gm<v29Vt%9`6iuFMVcD|dXvI}8oVMk$p<@D`obEHG<AR9cGGxwC#BQF(
zqpb+*CZG8MPdK~@2?+@apLx4DY$IS@7TM+_tMX)WFDQEA^SMO<?B+u!Q>Yt3nr@1i
za52`(C>GnY^}FhP!fhwM`Bzdo608WEq9`knlYW&z1yvR8)o^H2$mNtCpbliU6+haY
ztFq!UR1CP<ec7O3u84$6ykIOQo;ZdVqyzm8fwk>?91P(_Ep|ekagE%Iu2u&5J~xiQ
zOvm@-)4F>13l{U*9H+w?M;~Y!yT!Q1?W0Oz$ZXpqwqOrW7oL+iaL7XAliG1!>;AfP
z%61w@Lk^AAdm{+he{M=a5wlh$l@%ZEel{sk>djw(YO6D-a_a$~$3hYk5)u*;5)!7Q
zTSPJgEl@MECL-n*Acj{k6UkyRXDydI2dMF;g8A$BVJ%D=`1S9(Kt4{1Be#aEpj`$#
zvk)@nh-edHkh))~g#y&Nr?QoT%af==0);72!W48Rn~a3BKVQRng_^Bad>5c18|uq(
zn78i9O5-{l#JbO9XjY7k?}yYZaGxOG<fC?f^rOg^nS=oA!i1hGRzfjd$U<a!xg!-x
zAW%=mtZ|fZXRPA_7^f7@vXP4_YF!EfV#`?H!bU<iE`&E45HNYzNeK#PucjjY_sTr6
z1GcVie!-00oJ2nsl;T`HNCi;NEroN~aWtW;1GwIqt8RY*sf2`tgoK3e12nfVcWUYG
z>yf;IeV?>n&%ZDHtx#2TT+hsNM9;AHcth4gC}Ny_pEFZi-{*`rx9hrs;)%C;6Py;{
z5v+SwyTa6gsC(*s@IWgQY6T3fLIBqhV?%RJvfHWbt;2VJwVmou2Mv=coGU$WOGZ4&
z;^a28)~YCr7Ueg_$=q`t4onD^+woc>>{l$R2C^NK{If{x!!2~~Qg^!%u&ta9a;b8C
zD{$gN;;VP!pqkFtPKHiis%5D5BL~04u5N`4UF9zAYM>RlYl1R0dJD++qx1&B>p;dq
zsnm?O__^)gOR$l9tYstN5H_BW@HhfV8o33sqxLbEu&MG!@fJ=fM&sA~e88kpd7O1(
zNFB{Mi<A*xurwI36{Y>{RKb4X=(3d|6>jd@*#HE{{yDsqSrH=@<-Oo)Zh;nNH)Fx8
zr;{m7Bu`^gl!VhEShxg_2jZpT-j_obe_!SXwEA^JstI)MAl`ETUA9#n8c7l0kcZrX
zT*Rc6Im8BaTU`b2ueXq!a1nz}J>V+^^S$1rRR}n_e9%!isOluRI{sV~g7BOy-PgUZ
z`X@}yuW(mo)Huj~KE7noB)Qz!it)jBz^9rEU(Y)DQQ}jk3MC{YBy7C{CMz1;a@l|d
zg19g*Bt@WZUeZ%`AMuWmmP(-+0}0v2YKazIMEm3QR}HaWlf~^pdpB}A<Wm!pq9o_n
zZ{v+`)Aaj`6|rA)i4R~(lTd{$+-`$M{d1-Ai?K=zo)tk_T<ScnksGn0$PKpzsuM=-
z*lh|J1@8>*5ZC#|Z_bb*$G190&M}A8@WVK1%k{C8)d?C8K!8xF1|ejSrGzJFY_{<c
zF4$tM;}4cXmDLkOVUeGxiQS~Y14==YidYO+wI18^)vGg?@D)DclRZ!`)iVB2)A?zQ
zBoj_GUE~(rLYMzc5#cwRsc)xHtI!eHvh+eG12V|vcOtS}3>~V=kJnm|+utIxW-->=
zLB6a0SDh-}MZh{w0!yGWDIni;#Dt-&N&55ORo?{Z0H;V=kvUdoc#24dILlZBnCKCw
z)2QcaXIyKWTdS85*O{Si-$=T?K!eCd6!qM6=~<sInxy*OHqQ!Ft{3&(Ap-5GfIb6_
zoE%<9O5hK%&t>a^wav-u`vXUOMas^fqBL4OU$;+{^pTCv>*T^VTNx40U&!@yk12wa
zcDjpOl`gpVC!Zr6FG>n>KZhirs}o7)t*Hm>pn$a8CL|=Bz+SUt&}~vs;N6Sc^3<+Y
zGv#ir(g^bDVu?^vmDYb!kWc(qB~f`JkkuBr9EUuhL(o!<Yhka=Oc6X~zN0!%2SQvE
z(r~#jmREJECLfeJT-%y}aIeOIvmo$9BYFuEp!R;)1T7aV=Y{hn<hk`&g|i@XKHS|V
zpyxUzVLnYb`(x`sE;N%oS-$57n$?hc->S!kJKRkkLJp>Ue9ePt`Y2e3(lP(#9}7aH
zrJ|+ye5ztpw5nR*@inj@(-rh#Cwf#xg;hu0Iu+E1zv1AM>1?3K*#A+L#gm+8e4)hI
z<=y@RZhA9fqN>@dAzbU^w6th>CPrk)e95(W$n^S)`eXJTG?pbK{Jl{QA<3`R>7Yn!
zlU34`*~=N4)F^~-R820&4Q<2jlP6sWYU8x-&MGw%r+?1PU-#@jS26Tt@o`UF>Ff68
z`6A#~vmo4s8Nh;&<af1CfNHN747P$X9ef_UFK!YSENL7@U)B#GCk62`A|?>fv`~O<
z5}Zv18Or+H<b7-R8rryu4pGNnr7iBBcT<>PMZSs;?;k2&qi!7z4lzG~fxx7bYrN7_
z7q8yJ<S94^F~)H<-5rfANE~pKkyR5}X=1Fak2?fMEr-*4lz4no*oADbm+Sn@aFP|#
z-Jn=pzS}XrP)Ct#C<J~hd&sc#l+nrw33u6^u98#tZ|B?W+TWF+JVjsq4PkIFfjw{>
zaO5gTDdfLusfGmeCCmk3lm9*?I{HZnND4>__+Dsbh~0gctSA31e~TJS+FoL1hayI_
zIp*UCMz+4+x>K)Gz;$LbA=B=i0>_!`hU<2{S=Y6k0+tpL5^!&g)<UX5$Wps${(r2Y
zODSL`QHgu*YoLOh+<EVi`n>x@N<k?FB?6KHk^+(fk^+(fk^+(fZZbuX$NAlIj3{^f
zH`vIhYN{`ra_8B=KVyF}?tN?0F8+S{gb!dr35kG2K*Eie@X6pa3zM<2$X7twVctpb
zesVejCe8ZlAR*(=yx&0Ff*m;L&xpw}LZ<4?&qvPZ@r|P+z=~U0!nHOQ@{Qvb^FdzW
zULEe9%S$+=phQ4IA|MfvkO)WwB;28CcEb3ilM5-uJa3sWjc>Bx<03y2_=V;NBqR$;
z1SBK^z7ty1rDVEAOI%nvSVsPN2w1d$@b;!pF9{r0j$RG#o(xY9M||KXW<=G7hqxf}
zxZC%{d9oZWUuFm>FX5De5)uK4fP_RqA|N3VkdTn@@qjkxlr_f3SzrX4T~tRJ&@5<f
zTWhWNxdCB_0SfF>J72z3?S$M-vaQ>NLfMGG0&N2B$Gt;(S9byH*9^F8gs(L>&AR(z
z_t;kEn(1^?CwJ$%B)Jd?(nz{XmF<QCH(Fj%_cB;c-zkO$wh)(*Bo~TT%eQwgkSBe9
zU&fxvq`7xI1Z1srq?%P#&tM3)@5(41cY&;EP9kzvy!jsj6tR$#b&IeB?!t}hYI}}h
znQ->1f7li7irsFqm;2am-u-DJMQMeM=<wV+GV4d7fb3uI<Dd9%O?Q4pYCp^qn#_ym
zBQ401=SYLBLUkWOW`$%{J+l6K7L89xNJ#i1_;RM-J_d_{N&sp65e!f>AFcZjd-!=@
zR6p&iMUT}#qCQ$z@C~jjN%^2MbMFe<v!)1NcTqvvi!%F|bY@U{+GAod1>Cn81>M(L
zd@=*D7=wa0?EZ}XraDx7(wtDDO`e?<^UQjs^H-X`!Eq72fL4Nad&;6%*^FE89u{Q1
z8}NNm^BqENKhk=-pN6WH6@c3}zZkN0vV#S24w)N!Slgr^$3?ngVH@t-nVv-ckK)>(
xK&nXpk42i~;YxMdd`^dqj!pz50upY7{{X_SBT2P&BG~`{002ovPDHLkV1kWrFmM0>

literal 0
HcmV?d00001

diff --git a/games/NXDoom/textscreen/fonts/small.h b/games/NXDoom/textscreen/fonts/small.h
new file mode 100644
index 000000000..06a479bfb
--- /dev/null
+++ b/games/NXDoom/textscreen/fonts/small.h
@@ -0,0 +1,140 @@
+/* Font data generated from small.png; do not edit.
+   Please see textscreen/fonts/README for copyright
+   information. */
+
+static const uint8_t small_font_data[] =
+{
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x4e, 0x00,
+    0xf6, 0xf5, 0xb1, 0x6f, 0x00, 0xea, 0x04, 0x00,
+    0x00, 0xe4, 0x04, 0x00, 0x40, 0xaa, 0xe4, 0x00,
+    0x40, 0xee, 0xe4, 0x00, 0x00, 0x60, 0x06, 0x00,
+    0xff, 0x9f, 0xf9, 0xff, 0x00, 0x96, 0x69, 0x00,
+    0xff, 0x69, 0x96, 0xff, 0xe0, 0x74, 0x75, 0x00,
+    0x60, 0x69, 0x6f, 0x06, 0xc0, 0x44, 0x74, 0x03,
+    0xe0, 0xaa, 0xba, 0x03, 0x22, 0x27, 0x27, 0x22,
+    0x10, 0x73, 0x13, 0x00, 0x80, 0xec, 0x8c, 0x00,
+    0x40, 0x4e, 0xe4, 0x04, 0xa0, 0xaa, 0xa0, 0x00,
+    0xf0, 0xb9, 0xaa, 0x00, 0x16, 0x96, 0x86, 0x06,
+    0x00, 0x00, 0xff, 0x00, 0x40, 0x4e, 0xe4, 0xf4,
+    0x40, 0x4e, 0x44, 0x04, 0x40, 0x44, 0xe4, 0x04,
+    0x20, 0xf4, 0x24, 0x00, 0x40, 0xf2, 0x42, 0x00,
+    0x00, 0x10, 0x07, 0x00, 0x00, 0xf5, 0x05, 0x00,
+    0x00, 0x72, 0x0f, 0x00, 0x00, 0x7f, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x20, 0x22, 0x02, 0x02,
+    0x50, 0x05, 0x00, 0x00, 0x50, 0x57, 0x75, 0x05,
+    0x22, 0x25, 0x54, 0x22, 0x50, 0x24, 0x12, 0x05,
+    0x52, 0x52, 0x35, 0x06, 0x20, 0x02, 0x00, 0x00,
+    0x40, 0x22, 0x22, 0x04, 0x10, 0x22, 0x22, 0x01,
+    0x50, 0x72, 0x52, 0x00, 0x20, 0x72, 0x22, 0x00,
+    0x00, 0x00, 0x20, 0x12, 0x00, 0x70, 0x00, 0x00,
+    0x00, 0x00, 0x20, 0x02, 0x40, 0x24, 0x12, 0x01,
+    0x20, 0x75, 0x55, 0x02, 0x20, 0x23, 0x22, 0x07,
+    0x20, 0x45, 0x12, 0x07, 0x70, 0x24, 0x54, 0x02,
+    0x40, 0x56, 0x47, 0x04, 0x70, 0x31, 0x54, 0x02,
+    0x60, 0x31, 0x55, 0x02, 0x70, 0x44, 0x22, 0x02,
+    0x20, 0x25, 0x55, 0x02, 0x20, 0x55, 0x46, 0x03,
+    0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x20, 0x01,
+    0x00, 0x24, 0x21, 0x04, 0x00, 0x07, 0x07, 0x00,
+    0x00, 0x21, 0x24, 0x01, 0x20, 0x45, 0x02, 0x02,
+    0x20, 0x55, 0x11, 0x06, 0x20, 0x55, 0x57, 0x05,
+    0x30, 0x35, 0x55, 0x03, 0x20, 0x15, 0x51, 0x02,
+    0x30, 0x55, 0x55, 0x03, 0x70, 0x71, 0x11, 0x07,
+    0x70, 0x71, 0x11, 0x01, 0x20, 0x15, 0x55, 0x02,
+    0x50, 0x75, 0x55, 0x05, 0x70, 0x22, 0x22, 0x07,
+    0x40, 0x44, 0x54, 0x02, 0x50, 0x35, 0x55, 0x05,
+    0x10, 0x11, 0x11, 0x07, 0x50, 0x57, 0x55, 0x05,
+    0x40, 0x75, 0x57, 0x01, 0x20, 0x55, 0x55, 0x02,
+    0x30, 0x55, 0x13, 0x01, 0x20, 0x55, 0x35, 0x06,
+    0x30, 0x55, 0x53, 0x05, 0x20, 0x25, 0x54, 0x02,
+    0x70, 0x22, 0x22, 0x02, 0x50, 0x55, 0x55, 0x07,
+    0x50, 0x55, 0x55, 0x02, 0x50, 0x55, 0x75, 0x05,
+    0x50, 0x25, 0x55, 0x05, 0x50, 0x25, 0x22, 0x02,
+    0x70, 0x24, 0x12, 0x07, 0x60, 0x22, 0x22, 0x06,
+    0x10, 0x21, 0x42, 0x04, 0x30, 0x22, 0x22, 0x03,
+    0x20, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
+    0x10, 0x02, 0x00, 0x00, 0x00, 0x43, 0x56, 0x06,
+    0x10, 0x31, 0x55, 0x03, 0x00, 0x16, 0x11, 0x06,
+    0x40, 0x64, 0x55, 0x06, 0x00, 0x52, 0x17, 0x06,
+    0x40, 0x72, 0x22, 0x02, 0x00, 0x56, 0x65, 0x34,
+    0x10, 0x31, 0x55, 0x05, 0x20, 0x30, 0x22, 0x07,
+    0x40, 0x60, 0x44, 0x34, 0x10, 0x51, 0x53, 0x05,
+    0x20, 0x22, 0x22, 0x02, 0x00, 0x75, 0x55, 0x05,
+    0x00, 0x53, 0x55, 0x05, 0x00, 0x52, 0x55, 0x02,
+    0x00, 0x53, 0x35, 0x11, 0x00, 0x56, 0x65, 0x44,
+    0x00, 0x16, 0x11, 0x01, 0x00, 0x16, 0x42, 0x03,
+    0x20, 0x72, 0x22, 0x02, 0x00, 0x55, 0x55, 0x07,
+    0x00, 0x55, 0x55, 0x02, 0x00, 0x55, 0x75, 0x05,
+    0x00, 0x55, 0x52, 0x05, 0x00, 0x55, 0x65, 0x34,
+    0x00, 0x47, 0x12, 0x07, 0x24, 0x12, 0x22, 0x04,
+    0x22, 0x02, 0x22, 0x02, 0x21, 0x42, 0x22, 0x01,
+    0xa0, 0x05, 0x00, 0x00, 0x20, 0x55, 0x75, 0x00,
+    0x20, 0x15, 0x51, 0x32, 0x05, 0x55, 0x55, 0x07,
+    0x12, 0x52, 0x17, 0x06, 0xa4, 0x43, 0x56, 0x06,
+    0x05, 0x43, 0x56, 0x06, 0x42, 0x43, 0x56, 0x06,
+    0x52, 0x42, 0x56, 0x06, 0x00, 0x16, 0x11, 0x36,
+    0x52, 0x52, 0x17, 0x06, 0x05, 0x52, 0x17, 0x06,
+    0x42, 0x52, 0x17, 0x06, 0x50, 0x30, 0x22, 0x07,
+    0x52, 0x30, 0x22, 0x07, 0x42, 0x30, 0x22, 0x07,
+    0x05, 0x52, 0x57, 0x05, 0x52, 0x52, 0x57, 0x05,
+    0x24, 0x17, 0x13, 0x07, 0x00, 0xad, 0x5e, 0x0e,
+    0xe0, 0xf5, 0x55, 0x0d, 0x52, 0x20, 0x55, 0x02,
+    0x05, 0x52, 0x55, 0x02, 0x42, 0x52, 0x55, 0x02,
+    0x52, 0x50, 0x55, 0x07, 0x42, 0x50, 0x55, 0x07,
+    0x05, 0x55, 0x65, 0x34, 0x05, 0x52, 0x55, 0x02,
+    0x05, 0x55, 0x55, 0x07, 0x20, 0x16, 0x61, 0x02,
+    0x2c, 0x72, 0x22, 0x0f, 0x50, 0x25, 0x27, 0x02,
+    0x30, 0x35, 0xd5, 0x05, 0x48, 0xe4, 0x54, 0x02,
+    0x24, 0x43, 0x56, 0x06, 0x24, 0x30, 0x22, 0x07,
+    0x12, 0x52, 0x55, 0x02, 0x24, 0x50, 0x55, 0x07,
+    0x5a, 0x30, 0x55, 0x05, 0x5a, 0x90, 0xdb, 0x09,
+    0x56, 0x0e, 0x0f, 0x00, 0x52, 0x02, 0x07, 0x00,
+    0x20, 0x20, 0x51, 0x02, 0x00, 0x70, 0x11, 0x00,
+    0x00, 0xe0, 0x88, 0x00, 0x11, 0x25, 0x8d, 0xc4,
+    0x11, 0x25, 0xa1, 0x8e, 0x20, 0x20, 0x22, 0x02,
+    0x00, 0xa0, 0xa5, 0x00, 0x00, 0x50, 0x5a, 0x00,
+    0x28, 0x28, 0x28, 0x28, 0x5a, 0x5a, 0x5a, 0x5a,
+    0xeb, 0xeb, 0xeb, 0xeb, 0x44, 0x44, 0x44, 0x44,
+    0x44, 0x74, 0x44, 0x44, 0x44, 0x47, 0x47, 0x44,
+    0xaa, 0xba, 0xaa, 0xaa, 0x00, 0xf0, 0xaa, 0xaa,
+    0x00, 0x47, 0x47, 0x44, 0xaa, 0x8b, 0xab, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x8f, 0xab, 0xaa,
+    0xaa, 0x8b, 0x0f, 0x00, 0xaa, 0xfa, 0x00, 0x00,
+    0x44, 0x47, 0x07, 0x00, 0x00, 0x70, 0x44, 0x44,
+    0x44, 0xc4, 0x00, 0x00, 0x44, 0xf4, 0x00, 0x00,
+    0x00, 0xf0, 0x44, 0x44, 0x44, 0xc4, 0x44, 0x44,
+    0x00, 0xf0, 0x00, 0x00, 0x44, 0xf4, 0x44, 0x44,
+    0x44, 0x4c, 0x4c, 0x44, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0x2a, 0x0e, 0x00, 0x00, 0x2e, 0xaa, 0xaa,
+    0xaa, 0x0b, 0x0f, 0x00, 0x00, 0x0f, 0xab, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x0f, 0x0f, 0x00,
+    0xaa, 0x0b, 0xab, 0xaa, 0x44, 0x0f, 0x0f, 0x00,
+    0xaa, 0xfa, 0x00, 0x00, 0x00, 0x0f, 0x4f, 0x44,
+    0x00, 0xf0, 0xaa, 0xaa, 0xaa, 0xea, 0x00, 0x00,
+    0x44, 0x4c, 0x0c, 0x00, 0x00, 0x4c, 0x4c, 0x44,
+    0x00, 0xe0, 0xaa, 0xaa, 0xaa, 0xfa, 0xaa, 0xaa,
+    0x44, 0x4f, 0x4f, 0x44, 0x44, 0x74, 0x00, 0x00,
+    0x00, 0xc0, 0x44, 0x44, 0xff, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0xff, 0xff, 0x33, 0x33, 0x33, 0x33,
+    0xcc, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0x00, 0x00,
+    0x00, 0xa0, 0x55, 0x0a, 0x30, 0x35, 0x95, 0x05,
+    0xf0, 0x19, 0x11, 0x01, 0x00, 0x5f, 0x55, 0x05,
+    0x00, 0x17, 0x12, 0x07, 0x00, 0x5e, 0x55, 0x02,
+    0x00, 0xaa, 0x2e, 0x01, 0x00, 0x5a, 0x44, 0x04,
+    0x70, 0x52, 0x25, 0x07, 0x20, 0x75, 0x55, 0x02,
+    0x60, 0x99, 0x66, 0x0f, 0x60, 0x21, 0x55, 0x02,
+    0x00, 0xd6, 0x6b, 0x00, 0x80, 0x9f, 0xf9, 0x01,
+    0x60, 0x71, 0x11, 0x06, 0x20, 0x55, 0x55, 0x05,
+    0x70, 0x70, 0x70, 0x00, 0x20, 0x27, 0x70, 0x00,
+    0x10, 0x42, 0x12, 0x07, 0x40, 0x12, 0x42, 0x07,
+    0x80, 0x44, 0x44, 0x44, 0x44, 0x44, 0x25, 0x00,
+    0x00, 0x02, 0x07, 0x02, 0xa0, 0x05, 0x5a, 0x00,
+    0x52, 0x02, 0x00, 0x00, 0x00, 0x60, 0x06, 0x00,
+    0x00, 0x00, 0x02, 0x00, 0x4c, 0x54, 0x46, 0x00,
+    0x57, 0x55, 0x00, 0x00, 0x43, 0x72, 0x00, 0x00,
+    0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const txt_font_t small_font =
+{
+    "small", small_font_data, 4, 8,
+};
diff --git a/games/NXDoom/textscreen/fonts/small.png b/games/NXDoom/textscreen/fonts/small.png
new file mode 100644
index 0000000000000000000000000000000000000000..155797fe630c2bdd0a23bccaa362ff6814fd8666
GIT binary patch
literal 1750
zcmV;{1}XW8P)<h;3K|Lk000e1NJLTq002M$004jp0ssI2G~@U^00009a7bBm00001
z000010XQP`KmY&$2XskIMF-#m1_LY*o|{p<000JcNkl<Zc-rk;$(Exq3^acH|1W0_
znIVprQb{%>^t2CoG>vzuwAx$q%j5BAt!>-ZCd#vsXBnIF-t)~qYxS_>v8Ql|;m4qn
zXE~n5zr;63>E>w0wSWGO@5RHmZR3CO9L5oB+jgw|(bu!VqfN0zdN6VV<e+N<9S8UP
z9UqR5kM~~V;~+cO%I#kfb;R${+4!3+M=geQ-^j${k7EvaF~rJ+%&ME!q%wZvRXnQi
zU@;h`96x5(-fSFK6#o@}?x5Nd7@Z-f?CR9vuYItX-2>zir63<XHmxm02Mu{}IYN^+
z4J{eWc7!|ujfjV%bg(KOEQ(%*(9w0xcC_3zcU6BQdg*{~%mE3;62gdQiE$gngOF<)
zyWU=60uWR8NJ2A)n2g^2RXk8(aT0|>CSHTNXCvG7Vx+z;9~KAzLm9Qy`^H0L{5?O^
zUYMAvWdOBr#0{aJttYThDq*pT<vM^P6AS<@A1`}_@h!<!)7Y>fF&ZRDl>o{rR$v4T
zq)1{U#Vkmmj#4C~-{Zc?ePbqYu5|m_#=o^Nio5pJm<kV8gcdIFs~sVR04$mV1tSZ!
zKv3P&CXKOy)ncSC;NY4=iC0x#6DY5Wx6(DFG6!JxMG3MIYlU`czR!9byu}jghUm^V
zycqEwk_Qh449$dZ{!6sInH&JzlOj2dS{ML;&0sUJaPXThRqws_@sDnF>}#nRSXvS6
zp~8q2RUisdVC5;8p{Kcn&KSMl+<}zydD6yU?SbXUH7P@06TtpW9fr{|&U1QVUnjPq
zz3G|b`7Iw80tGpMRb}$mvn9f@NhVIoftgUG2VWkKYL9`QLnk{cGmVJDdSDRZskd+)
z2oa&a)?gI4PnMM4obZ7lq2(|Swlp>2uD6NDb!~`*ksby=Qo?S#DRTZ$V}PF}UkjUp
z^TDz%g0)~|jO!fhNG(cyz@8<OVct+k1buZp*nDqFSyQj}Qn5n6G7zktsQ};)1ax&f
zVEGw?CWg_1xHSV11<AF>pb@PI6~N0wVrV_(T0B*?sc5+6Z|(}{%OWvX3PRpRDd?~R
zXv5y~wFV8Z)sDZmL8Gx>Jg;Iz&oI#O^S~ZRVO-WC%SP}UjO5xd>NPZj(_U%<73<Bk
z-y4zL2y%h5_JEMSroWXD&o2tBnGxs7hXq*1q|Bs3s32a(Ln^Avgnhzf6z>C!T4X{V
zYLiTCVuS;bC!vt43%hK*gcp`6VaF_%`P-L>_X15fCx8GT(Y46DzJ(+<?MCco(?S;n
zL>QT<pSyPVX<Z)#$iVYh7e6z<mtyk=bbUSngOmdy^M&wAh6Y>MikIpf%7L2h)QHR&
zIeJZtc+ja)7P45F#9DXx&665glBoTPZD)K+e-A)-o;?wjxP~vmNj%dmc~ht5*@8s_
zVxr|<xVHI6Ki&))f%j%&f_Ze$%Zu_(LVDlpRR^ZkrE%hmWJ2ng6seQV`&6zTedEp&
zq$Uv0hdczsQ%k|`lGcAf6E!*^!#QSjK5KZ0D!T`?q^rj~RSTR#`guHwhCL&?-^b&z
zPYNmW&?|XDTl)|7S{T_nh0|*(Hq9OzDD%?i-Ro0$8Y-kI)qe(XQd|8}<^=Hp*8Hln
zk7%G3Pt4y5qX{;ZYR8y>zV1OEiv?O526Ayx0d_Z-G2F4PR<P4M;0@Y5rDyV`m(A$i
z(tsBwy#wB4m~TKfR+uI0z3<)*eCkeyY`HxO6<wTJk4Vb%PQK3_$Ng$KuzWMK8RQJ|
zcv{oWP*HdiAQj%@bDo$4oE^79o`DE6e*~tH#sj_#<SY`x8N^KRBK&52e|sjr{RAp{
z{ESoD19<Od81s#ByUh=g1F0)Tgg=70P2dd8YS%h9R$sA$1SrW~I>#*NfgLd28=eMl
zIz_;og|~;qWxde5sk?`Jot38NdBcC@z;8LrH<rEh3%BV>H1e_lHh|(e!_30CO~Vi^
z5Vy^W_Ud+egQ@?`xkpD}i&h&wJPo}PT0Y`K72OO%VgL>Inz2#D9d%4brkS483q!=?
z(;Ju)0y=I&g~^%<-GH<)GRj289LS^$Ji;57Z3+0!#Fv04f$|P!Ny77CF=WZxK*dlE
zf3Xpcjn^*0V{%uGi?hW&%^K-=8ql|3oBA+s70fa#bJq|?8_)d3Y6Yea`I&b=3SK9Y
s0m|!@m;l2M;HIUu_Tkl@m~SY50JX(`1a1LRUH||907*qoM6N<$f>O{qg#Z8m

literal 0
HcmV?d00001

diff --git a/games/NXDoom/textscreen/textscreen.h b/games/NXDoom/textscreen/textscreen.h
new file mode 100644
index 000000000..c778994ab
--- /dev/null
+++ b/games/NXDoom/textscreen/textscreen.h
@@ -0,0 +1,48 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TEXTSCREEN_H
+#define TEXTSCREEN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../src/doomkeys.h"
+#include "txt_main.h"
+
+#include "txt_button.h"
+#include "txt_checkbox.h"
+#include "txt_conditional.h"
+#include "txt_desktop.h"
+#include "txt_dropdown.h"
+#include "txt_fileselect.h"
+#include "txt_inputbox.h"
+#include "txt_label.h"
+#include "txt_radiobutton.h"
+#include "txt_scrollpane.h"
+#include "txt_separator.h"
+#include "txt_spinctrl.h"
+#include "txt_strut.h"
+#include "txt_table.h"
+#include "txt_widget.h"
+#include "txt_window_action.h"
+#include "txt_window.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef TEXTSCREEN_H */
+
diff --git a/games/NXDoom/textscreen/txt_button.c b/games/NXDoom/textscreen/txt_button.c
new file mode 100644
index 000000000..aaf711d7a
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_button.c
@@ -0,0 +1,127 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_button.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+static void TXT_ButtonSizeCalc(TXT_UNCAST_ARG(button))
+{
+    TXT_CAST_ARG(txt_button_t, button);
+
+    button->widget.w = TXT_UTF8_Strlen(button->label);
+    button->widget.h = 1;
+}
+
+static void TXT_ButtonDrawer(TXT_UNCAST_ARG(button))
+{
+    TXT_CAST_ARG(txt_button_t, button);
+    int i;
+    int w;
+
+    w = button->widget.w;
+
+    TXT_SetWidgetBG(button);
+
+    TXT_DrawString(button->label);
+
+    for (i = TXT_UTF8_Strlen(button->label); i < w; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_ButtonDestructor(TXT_UNCAST_ARG(button))
+{
+    TXT_CAST_ARG(txt_button_t, button);
+
+    free(button->label);
+}
+
+static int TXT_ButtonKeyPress(TXT_UNCAST_ARG(button), int key)
+{
+    TXT_CAST_ARG(txt_button_t, button);
+
+    if (key == KEY_ENTER)
+    {
+        TXT_EmitSignal(button, "pressed");
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void TXT_ButtonMousePress(TXT_UNCAST_ARG(button), int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_button_t, button);
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        // Equivalent to pressing enter
+
+        TXT_ButtonKeyPress(button, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_button_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_ButtonSizeCalc,
+    TXT_ButtonDrawer,
+    TXT_ButtonKeyPress,
+    TXT_ButtonDestructor,
+    TXT_ButtonMousePress,
+    NULL,
+};
+
+void TXT_SetButtonLabel(txt_button_t *button, const char *label)
+{
+    free(button->label);
+    button->label = strdup(label);
+}
+
+txt_button_t *TXT_NewButton(const char *label)
+{
+    txt_button_t *button;
+
+    button = malloc(sizeof(txt_button_t));
+
+    TXT_InitWidget(button, &txt_button_class);
+    button->label = strdup(label);
+
+    return button;
+}
+
+// Button with a callback set automatically
+
+txt_button_t *TXT_NewButton2(const char *label, TxtWidgetSignalFunc func,
+                             void *user_data)
+{
+    txt_button_t *button;
+
+    button = TXT_NewButton(label);
+
+    TXT_SignalConnect(button, "pressed", func, user_data);
+
+    return button;
+}
+
diff --git a/games/NXDoom/textscreen/txt_button.h b/games/NXDoom/textscreen/txt_button.h
new file mode 100644
index 000000000..e04554414
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_button.h
@@ -0,0 +1,74 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_BUTTON_H
+#define TXT_BUTTON_H
+
+/**
+ * @file txt_button.h
+ *
+ * Button widget.
+ */
+
+/**
+ * Button widget.
+ *
+ * A button is a widget that can be selected to perform some action.
+ * When a button is pressed, it emits the "pressed" signal.
+ */
+
+typedef struct txt_button_s txt_button_t;
+
+#include "txt_widget.h"
+
+struct txt_button_s
+{
+    txt_widget_t widget;
+    char *label;
+};
+
+/**
+ * Create a new button widget.
+ *
+ * @param label        The label to use on the new button (UTF-8 format).
+ * @return             Pointer to the new button widget.
+ */
+
+txt_button_t *TXT_NewButton(const char *label);
+
+/**
+ * Create a new button widget, binding the "pressed" signal to a
+ * specified callback function.
+ *
+ * @param label        The label to use on the new button (UTF-8 format).
+ * @param func         The callback function to invoke.
+ * @param user_data    User-specified pointer to pass to the callback.
+ * @return             Pointer to the new button widget.
+ */
+
+txt_button_t *TXT_NewButton2(const char *label, TxtWidgetSignalFunc func,
+                             void *user_data);
+
+/**
+ * Change the label used on a button.
+ *
+ * @param button       The button.
+ * @param label        The new label (UTF-8 format).
+ */
+
+void TXT_SetButtonLabel(txt_button_t *button, const char *label);
+
+#endif /* #ifndef TXT_BUTTON_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_checkbox.c b/games/NXDoom/textscreen/txt_checkbox.c
new file mode 100644
index 000000000..a5984dc50
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_checkbox.c
@@ -0,0 +1,142 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_checkbox.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+static void TXT_CheckBoxSizeCalc(TXT_UNCAST_ARG(checkbox))
+{
+    TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+    // Minimum width is the string length + right-side space for padding
+
+    checkbox->widget.w = TXT_UTF8_Strlen(checkbox->label) + 5;
+    checkbox->widget.h = 1;
+}
+
+static void TXT_CheckBoxDrawer(TXT_UNCAST_ARG(checkbox))
+{
+    TXT_CAST_ARG(txt_checkbox_t, checkbox);
+    txt_saved_colors_t colors;
+    int i;
+    int w;
+
+    w = checkbox->widget.w;
+
+    TXT_SaveColors(&colors);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+    TXT_DrawString("(");
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    if ((*checkbox->variable != 0) ^ checkbox->inverted)
+    {
+        TXT_DrawCodePageString("\x07");
+    }
+    else
+    {
+        TXT_DrawString(" ");
+    }
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+
+    TXT_DrawString(") ");
+
+    TXT_RestoreColors(&colors);
+    TXT_SetWidgetBG(checkbox);
+    TXT_DrawString(checkbox->label);
+
+    for (i = TXT_UTF8_Strlen(checkbox->label); i < w-4; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_CheckBoxDestructor(TXT_UNCAST_ARG(checkbox))
+{
+    TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+    free(checkbox->label);
+}
+
+static int TXT_CheckBoxKeyPress(TXT_UNCAST_ARG(checkbox), int key)
+{
+    TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+    if (key == KEY_ENTER || key == ' ')
+    {
+        *checkbox->variable = !*checkbox->variable;
+        TXT_EmitSignal(checkbox, "changed");
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void TXT_CheckBoxMousePress(TXT_UNCAST_ARG(checkbox), int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        // Equivalent to pressing enter
+
+        TXT_CheckBoxKeyPress(checkbox, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_checkbox_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_CheckBoxSizeCalc,
+    TXT_CheckBoxDrawer,
+    TXT_CheckBoxKeyPress,
+    TXT_CheckBoxDestructor,
+    TXT_CheckBoxMousePress,
+    NULL,
+};
+
+txt_checkbox_t *TXT_NewCheckBox(const char *label, int *variable)
+{
+    txt_checkbox_t *checkbox;
+
+    checkbox = malloc(sizeof(txt_checkbox_t));
+
+    TXT_InitWidget(checkbox, &txt_checkbox_class);
+    checkbox->label = strdup(label);
+    checkbox->variable = variable;
+    checkbox->inverted = 0;
+
+    return checkbox;
+}
+
+txt_checkbox_t *TXT_NewInvertedCheckBox(const char *label, int *variable)
+{
+    txt_checkbox_t *result;
+
+    result = TXT_NewCheckBox(label, variable);
+    result->inverted = 1;
+
+    return result;
+}
+
diff --git a/games/NXDoom/textscreen/txt_checkbox.h b/games/NXDoom/textscreen/txt_checkbox.h
new file mode 100644
index 000000000..039c06435
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_checkbox.h
@@ -0,0 +1,76 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_CHECKBOX_H
+#define TXT_CHECKBOX_H
+
+/**
+ * @file txt_checkbox.h
+ *
+ * Checkbox widget.
+ */
+
+/**
+ * Checkbox widget.
+ *
+ * A checkbox is used to control boolean values that may be either on
+ * or off.  The widget has a label that is displayed to the right of
+ * the checkbox indicator.  The widget tracks an integer variable;
+ * if the variable is non-zero, the checkbox is checked, while if it
+ * is zero, the checkbox is unchecked.  It is also possible to
+ * create "inverted" checkboxes where this logic is reversed.
+ *
+ * When a checkbox is changed, it emits the "changed" signal.
+ */
+
+typedef struct txt_checkbox_s txt_checkbox_t;
+
+#include "txt_widget.h"
+
+struct txt_checkbox_s
+{
+    txt_widget_t widget;
+    char *label;
+    int *variable;
+    int inverted;
+};
+
+/**
+ * Create a new checkbox.
+ *
+ * @param label         The label for the new checkbox (UTF-8 format).
+ * @param variable      Pointer to the variable containing this checkbox's
+ *                      value.
+ * @return              Pointer to the new checkbox.
+ */
+
+txt_checkbox_t *TXT_NewCheckBox(const char *label, int *variable);
+
+/**
+ * Create a new inverted checkbox.
+ *
+ * An inverted checkbox displays the opposite of a normal checkbox;
+ * where it would be checked, it appears unchecked, and vice-versa.
+ *
+ * @param label         The label for the new checkbox (UTF-8 format).
+ * @param variable      Pointer to the variable containing this checkbox's
+ *                      value.
+ * @return              Pointer to the new checkbox.
+ */
+
+txt_checkbox_t *TXT_NewInvertedCheckBox(const char *label, int *variable);
+
+#endif /* #ifndef TXT_CHECKBOX_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_conditional.c b/games/NXDoom/textscreen/txt_conditional.c
new file mode 100644
index 000000000..8a23618c0
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_conditional.c
@@ -0,0 +1,168 @@
+//
+// Copyright(C) 2016 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_conditional.h"
+#include "txt_strut.h"
+
+struct txt_conditional_s
+{
+    txt_widget_t widget;
+    int *var;
+    int expected_value;
+    txt_widget_t *child;
+};
+
+static int ConditionTrue(txt_conditional_t *conditional)
+{
+    return *conditional->var == conditional->expected_value;
+}
+
+static int TXT_CondSelectable(TXT_UNCAST_ARG(conditional))
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+    return ConditionTrue(conditional)
+        && TXT_SelectableWidget(conditional->child);
+}
+
+static void TXT_CondSizeCalc(TXT_UNCAST_ARG(conditional))
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+
+    if (!ConditionTrue(conditional))
+    {
+        conditional->widget.w = 0;
+        conditional->widget.h = 0;
+    }
+    else
+    {
+        TXT_CalcWidgetSize(conditional->child);
+        conditional->widget.w = conditional->child->w;
+        conditional->widget.h = conditional->child->h;
+    }
+}
+
+static void TXT_CondLayout(TXT_UNCAST_ARG(conditional))
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+
+    if (ConditionTrue(conditional))
+    {
+        conditional->child->x = conditional->widget.x;
+        conditional->child->y = conditional->widget.y;
+        TXT_LayoutWidget(conditional->child);
+    }
+}
+
+static void TXT_CondDrawer(TXT_UNCAST_ARG(conditional))
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+
+    if (ConditionTrue(conditional))
+    {
+        TXT_DrawWidget(conditional->child);
+    }
+}
+
+static void TXT_CondDestructor(TXT_UNCAST_ARG(conditional))
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+    TXT_DestroyWidget(conditional->child);
+}
+
+static void TXT_CondFocused(TXT_UNCAST_ARG(conditional), int focused)
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+
+    if (ConditionTrue(conditional))
+    {
+        TXT_SetWidgetFocus(conditional->child, focused);
+    }
+}
+
+static int TXT_CondKeyPress(TXT_UNCAST_ARG(conditional), int key)
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+
+    if (ConditionTrue(conditional))
+    {
+        return TXT_WidgetKeyPress(conditional->child, key);
+    }
+
+    return 0;
+}
+
+static void TXT_CondMousePress(TXT_UNCAST_ARG(conditional),
+                               int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_conditional_t, conditional);
+
+    if (ConditionTrue(conditional))
+    {
+        TXT_WidgetMousePress(conditional->child, x, y, b);
+    }
+}
+
+txt_widget_class_t txt_conditional_class =
+{
+    TXT_CondSelectable,
+    TXT_CondSizeCalc,
+    TXT_CondDrawer,
+    TXT_CondKeyPress,
+    TXT_CondDestructor,
+    TXT_CondMousePress,
+    TXT_CondLayout,
+    TXT_CondFocused,
+};
+
+txt_conditional_t *TXT_NewConditional(int *var, int expected_value,
+                                      TXT_UNCAST_ARG(child))
+{
+    TXT_CAST_ARG(txt_widget_t, child);
+    txt_conditional_t *conditional;
+
+    conditional = malloc(sizeof(txt_conditional_t));
+
+    TXT_InitWidget(conditional, &txt_conditional_class);
+    conditional->var = var;
+    conditional->expected_value = expected_value;
+    conditional->child = child;
+
+    child->parent = &conditional->widget;
+
+    return conditional;
+}
+
+// "Static" conditional that returns an empty strut if the given static
+// value is false. Kind of like a conditional but we only evaluate it at
+// creation time.
+txt_widget_t *TXT_If(int conditional, TXT_UNCAST_ARG(child))
+{
+    TXT_CAST_ARG(txt_widget_t, child);
+
+    if (conditional)
+    {
+        return child;
+    }
+    else
+    {
+        txt_strut_t *nullwidget;
+        TXT_DestroyWidget(child);
+        nullwidget = TXT_NewStrut(0, 0);
+        return &nullwidget->widget;
+    }
+}
+
diff --git a/games/NXDoom/textscreen/txt_conditional.h b/games/NXDoom/textscreen/txt_conditional.h
new file mode 100644
index 000000000..e30d81ba9
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_conditional.h
@@ -0,0 +1,63 @@
+//
+// Copyright(C) 2016 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_CONDITIONAL_H
+#define TXT_CONDITIONAL_H
+
+/**
+ * @file txt_conditional.h
+ *
+ * Conditional widget.
+ */
+
+/**
+ * Conditional widget.
+ *
+ * A conditional widget contains another widget, and conditionally
+ * shows or hides it based on the value of a variable.
+ */
+
+typedef struct txt_conditional_s txt_conditional_t;
+
+#include "txt_widget.h"
+
+/**
+ * Create a new conditional widget.
+ *
+ * @param var             The variable to check.
+ * @param expected_value  If the variable has this value, the widget is shown.
+ * @param child           The inner widget to show or hide.
+ * @return                Pointer to the new conditional widget.
+ */
+
+txt_conditional_t *TXT_NewConditional(int *var, int expected_value,
+                                      TXT_UNCAST_ARG(child));
+
+/**
+ * Return the given child widget if the given boolean condition is true.
+ *
+ * If the condition is not true, the child widget is destroyed and a dummy
+ * "null" widget is returned that shows nothing.
+ *
+ * @param condition        Boolean condition - true or false value.
+ * @param child            Widget to conditionally return.
+ * @return                 Either child (if condition is true) or a null
+ *                         widget.
+ */
+
+txt_widget_t *TXT_If(int condition, TXT_UNCAST_ARG(child));
+
+#endif /* #ifndef TXT_CONDITIONAL_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_desktop.c b/games/NXDoom/textscreen/txt_desktop.c
new file mode 100644
index 000000000..d84282948
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_desktop.c
@@ -0,0 +1,386 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_desktop.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_separator.h"
+#include "txt_window.h"
+
+#define HELP_KEY KEY_F1
+#define MAXWINDOWS 128
+
+static char *desktop_title;
+static txt_window_t *all_windows[MAXWINDOWS];
+static int num_windows = 0;
+static int main_loop_running = 0;
+
+static TxtIdleCallback periodic_callback = NULL;
+static void *periodic_callback_data;
+static unsigned int periodic_callback_period;
+
+void TXT_AddDesktopWindow(txt_window_t *win)
+{
+    // Previously-top window loses focus:
+
+    if (num_windows > 0)
+    {
+        TXT_SetWindowFocus(all_windows[num_windows - 1], 0);
+    }
+
+    all_windows[num_windows] = win;
+    ++num_windows;
+
+    // New window gains focus:
+
+    TXT_SetWindowFocus(win, 1);
+}
+
+void TXT_RemoveDesktopWindow(txt_window_t *win)
+{
+    int from, to;
+
+    // Window must lose focus if it's being removed:
+
+    TXT_SetWindowFocus(win, 0);
+
+    for (from=0, to=0; from<num_windows; ++from)
+    {
+        if (all_windows[from] != win)
+        {
+            all_windows[to] = all_windows[from];
+            ++to;
+        }
+    }
+
+    num_windows = to;
+
+    // Top window gains focus:
+
+    if (num_windows > 0)
+    {
+        TXT_SetWindowFocus(all_windows[num_windows - 1], 1);
+    }
+}
+
+txt_window_t *TXT_GetActiveWindow(void)
+{
+    if (num_windows == 0)
+    {
+        return NULL;
+    }
+
+    return all_windows[num_windows - 1];
+}
+
+int TXT_RaiseWindow(txt_window_t *window)
+{
+    int i;
+
+    for (i = 0; i < num_windows - 1; ++i)
+    {
+        if (all_windows[i] == window)
+        {
+            all_windows[i] = all_windows[i + 1];
+            all_windows[i + 1] = window;
+
+            if (i == num_windows - 2)
+            {
+                TXT_SetWindowFocus(all_windows[i], 0);
+                TXT_SetWindowFocus(window, 1);
+            }
+
+            return 1;
+        }
+    }
+
+    // Window not in the list, or at the end of the list (top) already.
+
+    return 0;
+}
+
+int TXT_LowerWindow(txt_window_t *window)
+{
+    int i;
+
+    for (i = 0; i < num_windows - 1; ++i)
+    {
+        if (all_windows[i + 1] == window)
+        {
+            all_windows[i + 1] = all_windows[i];
+            all_windows[i] = window;
+
+            if (i == num_windows - 2)
+            {
+                TXT_SetWindowFocus(window, 0);
+                TXT_SetWindowFocus(all_windows[i + 1], 1);
+            }
+
+            return 1;
+        }
+    }
+
+    // Window not in the list, or at the start of the list (bottom) already.
+
+    return 0;
+}
+
+static void DrawDesktopBackground(const char *title)
+{
+    int i;
+    unsigned char *screendata;
+    unsigned char *p;
+
+    screendata = TXT_GetScreenData();
+    
+    // Fill the screen with gradient characters
+
+    p = screendata;
+    
+    for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
+    {
+        *p++ = 0xb1;
+        *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
+    }
+
+    // Draw the top and bottom banners
+
+    p = screendata;
+
+    for (i=0; i<TXT_SCREEN_W; ++i)
+    {
+        *p++ = ' ';
+        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+    }
+
+    p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
+
+    for (i=0; i<TXT_SCREEN_W; ++i)
+    {
+        *p++ = ' ';
+        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+    }
+
+    // Print the title
+
+    TXT_GotoXY(0, 0);
+    TXT_FGColor(TXT_COLOR_BLACK);
+    TXT_BGColor(TXT_COLOR_GREY, 0);
+
+    TXT_PutChar(' ');
+    TXT_Puts(title);
+}
+
+static void DrawHelpIndicator(void)
+{
+    char keybuf[10];
+    int fgcolor;
+    int x, y;
+
+    TXT_GetKeyDescription(HELP_KEY, keybuf, sizeof(keybuf));
+
+    TXT_GetMousePosition(&x, &y);
+
+    if (y == 0 && x >= TXT_SCREEN_W - 9)
+    {
+        fgcolor = TXT_COLOR_GREY;
+        TXT_BGColor(TXT_COLOR_BLACK, 0);
+    }
+    else
+    {
+        fgcolor = TXT_COLOR_BLACK;
+        TXT_BGColor(TXT_COLOR_GREY, 0);
+    }
+
+    TXT_GotoXY(TXT_SCREEN_W - 9, 0);
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+    TXT_DrawString(" ");
+    TXT_DrawString(keybuf);
+
+    TXT_FGColor(fgcolor);
+    TXT_DrawString("=Help ");
+}
+
+void TXT_SetDesktopTitle(const char *title)
+{
+    free(desktop_title);
+    desktop_title = strdup(title);
+    TXT_SetWindowTitle(title);
+}
+
+void TXT_DrawDesktop(void)
+{
+    txt_window_t *active_window;
+    const char *title;
+    int i;
+
+    TXT_InitClipArea();
+
+    if (desktop_title == NULL)
+        title = "";
+    else
+        title = desktop_title;
+
+    DrawDesktopBackground(title);
+
+    active_window = TXT_GetActiveWindow();
+    if (active_window != NULL && active_window->help_url != NULL)
+    {
+        DrawHelpIndicator();
+    }
+
+    for (i=0; i<num_windows; ++i)
+    {
+        TXT_DrawWindow(all_windows[i]);
+    }
+
+    TXT_UpdateScreen();
+}
+
+// Fallback function to handle key/mouse events that are not handled by
+// the active window.
+static void DesktopInputEvent(int c)
+{
+    txt_window_t *active_window;
+    int x, y;
+
+    switch (c)
+    {
+        case TXT_MOUSE_LEFT:
+            TXT_GetMousePosition(&x, &y);
+
+            // Clicking the top-right of the screen is equivalent
+            // to pressing the help key.
+            if (y == 0 && x >= TXT_SCREEN_W - 9)
+            {
+                DesktopInputEvent(HELP_KEY);
+            }
+            break;
+
+        case HELP_KEY:
+            active_window = TXT_GetActiveWindow();
+            if (active_window != NULL)
+            {
+                TXT_OpenWindowHelpURL(active_window);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+
+}
+
+void TXT_DispatchEvents(void)
+{
+    txt_window_t *active_window;
+    int c;
+
+    while ((c = TXT_GetChar()) > 0)
+    {
+        active_window = TXT_GetActiveWindow();
+
+        if (active_window != NULL && !TXT_WindowKeyPress(active_window, c))
+        {
+            DesktopInputEvent(c);
+        }
+    }
+}
+
+void TXT_ExitMainLoop(void)
+{
+    main_loop_running = 0;
+}
+
+void TXT_DrawASCIITable(void)
+{
+    unsigned char *screendata;
+    char buf[10];
+    int x, y;
+    int n;
+
+    screendata = TXT_GetScreenData();
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+    TXT_BGColor(TXT_COLOR_BLACK, 0);
+
+    for (y=0; y<16; ++y)
+    {
+        for (x=0; x<16; ++x)
+        {
+            n = y * 16 + x;
+
+            TXT_GotoXY(x * 5, y);
+            TXT_snprintf(buf, sizeof(buf), "%02x   ", n);
+            TXT_Puts(buf);
+
+            // Write the character directly to the screen memory buffer:
+
+            screendata[(y * TXT_SCREEN_W + x * 5 + 3) * 2] = n;
+        }
+    }
+
+    TXT_UpdateScreen();
+}
+
+void TXT_SetPeriodicCallback(TxtIdleCallback callback,
+                             void *user_data,
+                             unsigned int period)
+{
+    periodic_callback = callback;
+    periodic_callback_data = user_data;
+    periodic_callback_period = period;
+}
+
+void TXT_GUIMainLoop(void)
+{
+    main_loop_running = 1;
+
+    while (main_loop_running)
+    {
+        TXT_DispatchEvents();
+
+        // After the last window is closed, exit the loop
+
+        if (num_windows <= 0)
+        {
+            TXT_ExitMainLoop();
+            continue;
+        }
+
+        TXT_DrawDesktop();
+//        TXT_DrawASCIITable();
+
+        if (periodic_callback == NULL)
+        {
+            TXT_Sleep(0);
+        }
+        else
+        {
+            TXT_Sleep(periodic_callback_period);
+
+            periodic_callback(periodic_callback_data);
+        }
+    }
+}
+
diff --git a/games/NXDoom/textscreen/txt_desktop.h b/games/NXDoom/textscreen/txt_desktop.h
new file mode 100644
index 000000000..8883c39da
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_desktop.h
@@ -0,0 +1,108 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_DESKTOP_H
+#define TXT_DESKTOP_H
+
+/**
+ * @file txt_desktop.h
+ *
+ * Textscreen desktop.
+ */
+
+#include "txt_window.h"
+
+typedef void (*TxtIdleCallback)(void *user_data);
+
+void TXT_AddDesktopWindow(txt_window_t *win);
+void TXT_RemoveDesktopWindow(txt_window_t *win);
+void TXT_DrawDesktop(void);
+void TXT_DispatchEvents(void);
+void TXT_DrawWindow(txt_window_t *window);
+void TXT_SetWindowFocus(txt_window_t *window, int focused);
+int TXT_WindowKeyPress(txt_window_t *window, int c);
+
+/**
+ * Set the title displayed at the top of the screen.
+ *
+ * @param title         The title to display (UTF-8 format).
+ */
+
+void TXT_SetDesktopTitle(const char *title);
+
+/**
+ * Exit the currently-running main loop and return from the
+ * @ref TXT_GUIMainLoop function.
+ */
+
+void TXT_ExitMainLoop(void);
+
+/**
+ * Start the main event loop.  At least one window must have been
+ * opened prior to running this function.  When no windows are left
+ * open, the event loop exits.
+ *
+ * It is possible to trigger an exit from this function using the
+ * @ref TXT_ExitMainLoop function.
+ */
+
+void TXT_GUIMainLoop(void);
+
+/**
+ * Get the top window on the desktop that is currently receiving
+ * inputs.
+ *
+ * @return    The active window, or NULL if no windows are present.
+ */
+
+txt_window_t *TXT_GetActiveWindow(void);
+
+/**
+ * Set a callback function to be invoked periodically by the main
+ * loop code.
+ *
+ * @param callback      The callback to invoke, or NULL to cancel
+ *                      an existing callback.
+ * @param user_data     Extra data to pass to the callback.
+ * @param period        Maximum time between invoking each callback.
+ *                      eg. a value of 200 will cause the callback
+ *                      to be invoked at least once every 200ms.
+ */
+
+void TXT_SetPeriodicCallback(TxtIdleCallback callback,
+                             void *user_data,
+                             unsigned int period);
+
+/**
+ * Raise the z-position of the given window relative to other windows.
+ *
+ * @param window        The window to raise.
+ * @return              Non-zero if the window was raised successfully,
+ *                      or zero if the window could not be raised further.
+ */
+
+int TXT_RaiseWindow(txt_window_t *window);
+
+/**
+ * Lower the z-position of the given window relative to other windows.
+ *
+ * @param window        The window to make inactive.
+ * @return              Non-zero if the window was lowered successfully,
+ *                      or zero if the window could not be lowered further.
+ */
+
+int TXT_LowerWindow(txt_window_t *window);
+
+#endif /* #ifndef TXT_DESKTOP_H */
+
diff --git a/games/NXDoom/textscreen/txt_dropdown.c b/games/NXDoom/textscreen/txt_dropdown.c
new file mode 100644
index 000000000..2439015b7
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_dropdown.c
@@ -0,0 +1,305 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_button.h"
+#include "txt_dropdown.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+typedef struct
+{
+    txt_window_t *window;
+    txt_dropdown_list_t *list;
+    int item;
+} callback_data_t;
+
+// Check if the selected value for a list is valid
+
+static int ValidSelection(txt_dropdown_list_t *list)
+{
+    return *list->variable >= 0 && *list->variable < list->num_values;
+}
+
+// Calculate the Y position for the selector window
+
+static int SelectorWindowY(txt_dropdown_list_t *list)
+{
+    int result;
+
+    if (ValidSelection(list))
+    {
+        result = list->widget.y - 1 - *list->variable;
+    }
+    else
+    {
+        result = list->widget.y - 1 - (list->num_values / 2);
+    }
+
+    // Keep dropdown inside the screen.
+
+    if (result < 1)
+    {
+        result = 1;
+    }
+    else if (result + list->num_values > (TXT_SCREEN_H - 3))
+    {
+        result = TXT_SCREEN_H - list->num_values - 3;
+    }
+
+    return result;
+}
+
+// Called when a button in the selector window is pressed
+
+static void ItemSelected(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(callback_data))
+{
+    TXT_CAST_ARG(callback_data_t, callback_data);
+
+    // Set the variable
+
+    *callback_data->list->variable = callback_data->item;
+
+    TXT_EmitSignal(callback_data->list, "changed");
+
+    // Close the window
+
+    TXT_CloseWindow(callback_data->window);
+}
+
+// Free callback data when the window is closed
+
+static void FreeCallbackData(TXT_UNCAST_ARG(list), 
+                             TXT_UNCAST_ARG(callback_data))
+{
+    TXT_CAST_ARG(callback_data_t, callback_data);
+
+    free(callback_data);
+}
+
+// Catch presses of escape and close the window.
+
+static int SelectorWindowListener(txt_window_t *window, int key, void *user_data)
+{
+    if (key == KEY_ESCAPE)
+    {
+        TXT_CloseWindow(window);
+        return 1;
+    }
+
+    return 0;
+}
+
+static int SelectorMouseListener(txt_window_t *window, int x, int y, int b,
+                                 void *unused)
+{
+    txt_widget_t *win;
+
+    win = (txt_widget_t *) window;
+
+    if (x < win->x || x > win->x + win->w || y < win->y || y > win->y + win->h)
+    {
+        TXT_CloseWindow(window);
+        return 1;
+    }
+
+    return 0;
+}
+
+// Open the dropdown list window to select an item
+
+static void OpenSelectorWindow(txt_dropdown_list_t *list)
+{
+    txt_window_t *window;
+    int i;
+
+    // Open a simple window with no title bar or action buttons.
+
+    window = TXT_NewWindow(NULL);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+
+    // Position the window so that the currently selected item appears
+    // over the top of the list widget.
+
+    TXT_SetWindowPosition(window, TXT_HORIZ_LEFT, TXT_VERT_TOP,
+                          list->widget.x - 2, SelectorWindowY(list));
+
+    // Add a button to the window for each option in the list.
+
+    for (i=0; i<list->num_values; ++i)
+    {
+        txt_button_t *button;
+        callback_data_t *data;
+
+        button = TXT_NewButton(list->values[i]);
+
+        TXT_AddWidget(window, button);
+
+        // Callback struct
+
+        data = malloc(sizeof(callback_data_t));
+        data->list = list;
+        data->window = window;
+        data->item = i;
+        
+        // When the button is pressed, invoke the button press callback
+       
+        TXT_SignalConnect(button, "pressed", ItemSelected, data);
+        
+        // When the window is closed, free back the callback struct
+
+        TXT_SignalConnect(window, "closed", FreeCallbackData, data);
+
+        // Is this the currently-selected value?  If so, select the button
+        // in the window as the default.
+        
+        if (i == *list->variable)
+        {
+            TXT_SelectWidget(window, button);
+        }
+    }
+
+    // Catch presses of escape in this window and close it.
+
+    TXT_SetKeyListener(window, SelectorWindowListener, NULL);
+    TXT_SetMouseListener(window, SelectorMouseListener, NULL);
+}
+
+static int DropdownListWidth(txt_dropdown_list_t *list)
+{
+    int i;
+    int result;
+
+    // Find the maximum string width
+ 
+    result = 0;
+
+    for (i=0; i<list->num_values; ++i)
+    {
+        int w = TXT_UTF8_Strlen(list->values[i]);
+        if (w > result) 
+        {
+            result = w;
+        }
+    }
+
+    return result;
+}
+
+static void TXT_DropdownListSizeCalc(TXT_UNCAST_ARG(list))
+{
+    TXT_CAST_ARG(txt_dropdown_list_t, list);
+
+    list->widget.w = DropdownListWidth(list);
+    list->widget.h = 1;
+}
+
+static void TXT_DropdownListDrawer(TXT_UNCAST_ARG(list))
+{
+    TXT_CAST_ARG(txt_dropdown_list_t, list);
+    unsigned int i;
+    const char *str;
+
+    // Set bg/fg text colors.
+
+    TXT_SetWidgetBG(list);
+
+    // Select a string to draw from the list, if the current value is
+    // in range.  Otherwise fall back to a default.
+
+    if (ValidSelection(list))
+    {
+        str = list->values[*list->variable];
+    }
+    else
+    {
+        str = "???";
+    }
+
+    // Draw the string and fill to the end with spaces
+
+    TXT_DrawString(str);
+
+    for (i = TXT_UTF8_Strlen(str); i < list->widget.w; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_DropdownListDestructor(TXT_UNCAST_ARG(list))
+{
+}
+
+static int TXT_DropdownListKeyPress(TXT_UNCAST_ARG(list), int key)
+{
+    TXT_CAST_ARG(txt_dropdown_list_t, list);
+
+    if (key == KEY_ENTER)
+    {
+        OpenSelectorWindow(list);
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void TXT_DropdownListMousePress(TXT_UNCAST_ARG(list), 
+                                       int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_dropdown_list_t, list);
+
+    // Left mouse click does the same as selecting and pressing enter
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_DropdownListKeyPress(list, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_dropdown_list_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_DropdownListSizeCalc,
+    TXT_DropdownListDrawer,
+    TXT_DropdownListKeyPress,
+    TXT_DropdownListDestructor,
+    TXT_DropdownListMousePress,
+    NULL,
+};
+
+txt_dropdown_list_t *TXT_NewDropdownList(int *variable, const char **values,
+                                         int num_values)
+{
+    txt_dropdown_list_t *list;
+
+    list = malloc(sizeof(txt_dropdown_list_t));
+
+    TXT_InitWidget(list, &txt_dropdown_list_class);
+    list->variable = variable;
+    list->values = values;
+    list->num_values = num_values;
+
+    return list;
+}
+
diff --git a/games/NXDoom/textscreen/txt_dropdown.h b/games/NXDoom/textscreen/txt_dropdown.h
new file mode 100644
index 000000000..69bc7d506
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_dropdown.h
@@ -0,0 +1,69 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_DROPDOWN_H
+#define TXT_DROPDOWN_H
+
+/**
+ * @file txt_dropdown.h
+ *
+ * Dropdown list widget.
+ */
+
+/**
+ * Dropdown list widget.
+ *
+ * A dropdown list allows the user to select from a list of values,
+ * which appears when the list is selected.
+ *
+ * When the value of a dropdown list is changed, the "changed" signal
+ * is emitted.
+ */
+
+typedef struct txt_dropdown_list_s txt_dropdown_list_t;
+
+#include "txt_widget.h"
+
+//
+// Drop-down list box.
+// 
+
+struct txt_dropdown_list_s
+{
+    txt_widget_t widget;
+    int *variable;
+    const char **values;
+    int num_values;
+};
+
+/**
+ * Create a new dropdown list widget.
+ *
+ * The parameters specify a list of string labels, and a pointer to an
+ * integer variable.  The variable contains the current "value" of the
+ * list, as an index within the list of labels.
+ *
+ * @param variable        Pointer to the variable containing the
+ *                        list's value.
+ * @param values          Pointer to an array of strings containing
+ *                        the labels to use for the list (UTF-8 format).
+ * @param num_values      The number of variables in the list.
+ */
+
+txt_dropdown_list_t *TXT_NewDropdownList(int *variable, 
+                                         const char **values, int num_values);
+
+#endif /* #ifndef TXT_DROPDOWN_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_fileselect.c b/games/NXDoom/textscreen/txt_fileselect.c
new file mode 100644
index 000000000..08c0c8f7b
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_fileselect.c
@@ -0,0 +1,836 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Routines for selecting files.
+//
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_fileselect.h"
+#include "txt_inputbox.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_widget.h"
+
+struct txt_fileselect_s {
+    txt_widget_t widget;
+    txt_inputbox_t *inputbox;
+    int size;
+    const char *prompt;
+    const char **extensions;
+};
+
+// Dummy value to select a directory.
+
+const char *TXT_DIRECTORY[] = { "__directory__", NULL };
+
+#ifndef _WIN32
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/wait.h>
+
+static char *ExecReadOutput(char **argv)
+{
+    char *result;
+    int completed;
+    int pid, status, result_len;
+    int pipefd[2];
+
+    if (pipe(pipefd) != 0)
+    {
+        return NULL;
+    }
+
+    pid = fork();
+
+    if (pid == 0)
+    {
+        dup2(pipefd[1], fileno(stdout));
+        execv(argv[0], argv);
+        exit(-1);
+    }
+
+    fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
+
+    // Read program output into 'result' string.
+    // Wait until the program has completed and (if it was successful)
+    // a full line has been read.
+
+    result = NULL;
+    result_len = 0;
+    completed = 0;
+
+    while (!completed
+        || (status == 0 && (result == NULL || strchr(result, '\n') == NULL)))
+    {
+        char buf[64];
+        int bytes;
+
+        if (!completed && waitpid(pid, &status, WNOHANG) != 0)
+        {
+            completed = 1;
+        }
+
+        bytes = read(pipefd[0], buf, sizeof(buf));
+
+        if (bytes < 0)
+        {
+            if (errno != EAGAIN && errno != EWOULDBLOCK)
+            {
+                status = -1;
+                break;
+            }
+        }
+        else
+        {
+            char *new_result = realloc(result, result_len + bytes + 1);
+            if (new_result == NULL)
+            {
+                break;
+            }
+            result = new_result;
+            memcpy(result + result_len, buf, bytes);
+            result_len += bytes;
+            result[result_len] = '\0';
+        }
+
+        usleep(100 * 1000);
+        TXT_Sleep(1);
+        TXT_UpdateScreen();
+    }
+
+    close(pipefd[0]);
+    close(pipefd[1]);
+
+    // Must have a success exit code.
+
+    if (WEXITSTATUS(status) != 0)
+    {
+        free(result);
+        result = NULL;
+    }
+
+    // Strip off newline from the end.
+
+    if (result != NULL && result[result_len - 1] == '\n')
+    {
+        result[result_len - 1] = '\0';
+    }
+
+    return result;
+}
+
+#endif
+
+// This is currently disabled on Windows because it doesn't work.
+// Current issues:
+//   * On Windows Vista+ the mouse cursor freezes when the dialog is
+//     opened. This is probably some conflict with SDL (might be
+//     resolved by opening the dialog in a separate thread so that
+//     TXT_UpdateScreen can be run in the background).
+//   * On Windows XP the program exits/crashes when the dialog is
+//     closed.
+#if defined(_WIN32)
+
+int TXT_CanSelectFiles(void)
+{
+    return 0;
+}
+
+char *TXT_SelectFile(const char *window_title, const char **extensions)
+{
+    return NULL;
+}
+
+#elif defined(xxxdisabled_WIN32)
+
+// Windows code. Use comdlg32 to pop up a dialog box.
+
+#include <windows.h>
+#include <shlobj.h>
+
+static BOOL (*MyGetOpenFileName)(LPOPENFILENAME) = NULL;
+static LPITEMIDLIST (*MySHBrowseForFolder)(LPBROWSEINFO) = NULL;
+static BOOL (*MySHGetPathFromIDList)(LPITEMIDLIST, LPTSTR) = NULL;
+
+// Load library functions from DLL files.
+
+static int LoadDLLs(void)
+{
+    HMODULE comdlg32, shell32
+
+    comdlg32 = LoadLibraryW(L"comdlg32.dll");
+    if (comdlg32 == NULL)
+    {
+        return 0;
+    }
+
+    shell32 = LoadLibraryW(L"shell32.dll");
+    if (shell32 == NULL)
+    {
+        FreeLibrary(comdlg32);
+        return 0;
+    }
+
+    MyGetOpenFileName =
+        (void *) GetProcAddress(comdlg32, "GetOpenFileNameA");
+    MySHBrowseForFolder =
+        (void *) GetProcAddress(shell32, "SHBrowseForFolder");
+    MySHGetPathFromIDList =
+        (void *) GetProcAddress(shell32, "SHGetPathFromIDList");
+
+    return MyGetOpenFileName != NULL
+        && MySHBrowseForFolder != NULL
+        && MySHGetPathFromIDList != NULL;
+}
+
+static int InitLibraries(void)
+{
+    static int initted = 0, success = 0;
+
+    if (!initted)
+    {
+        success = LoadDLLs();
+        initted = 1;
+    }
+
+    return success;
+}
+
+// Generate the "filter" string from the list of extensions.
+
+static char *GenerateFilterString(const char **extensions)
+{
+    unsigned int result_len = 1;
+    unsigned int i;
+    char *result, *out;
+    size_t out_len, offset;
+
+    if (extensions == NULL)
+    {
+        return NULL;
+    }
+
+    for (i = 0; extensions[i] != NULL; ++i)
+    {
+        result_len += 16 + strlen(extensions[i]) * 3;
+    }
+
+    result = malloc(result_len);
+    out = result; out_len = result_len;
+
+    for (i = 0; extensions[i] != NULL; ++i)
+    {
+        // .wad files (*.wad)\0
+        offset = TXT_snprintf(out, out_len, "%s files (*.%s)",
+                              extensions[i], extensions[i]);
+        out += offset + 1; out_len -= offset + 1;
+
+        // *.wad\0
+        offset = TXT_snprintf(out, out_len, "*.%s", extensions[i]);
+        out_len += offset + 1; out_len -= offset + 1;
+    }
+
+    *out = '\0';
+
+    return result;
+}
+
+int TXT_CanSelectFiles(void)
+{
+    return InitLibraries();
+}
+
+static char *SelectDirectory(char *window_title)
+{
+    LPITEMIDLIST pidl;
+    BROWSEINFO bi;
+    char selected[MAX_PATH] = "";
+    char *result;
+
+    ZeroMemory(&bi, sizeof(bi));
+    bi.hwndOwner = NULL;
+    bi.lpszTitle = window_title;
+    bi.pszDisplayName = selected;
+    bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE;
+
+    pidl = MySHBrowseForFolder(&bi);
+
+    result = NULL;
+
+    if (pidl != NULL)
+    {
+        if (MySHGetPathFromIDList(pidl, selected))
+        {
+            result = strdup(selected);
+        }
+
+        // TODO: Free pidl
+    }
+
+    return result;
+}
+
+char *TXT_SelectFile(const char *window_title, const char **extensions)
+{
+    OPENFILENAME fm;
+    char selected[MAX_PATH] = "";
+    char *filter_string, *result;
+
+    if (!InitLibraries())
+    {
+        return NULL;
+    }
+
+    if (extensions == TXT_DIRECTORY)
+    {
+        return SelectDirectory(window_title);
+    }
+
+    filter_string = GenerateFilterString(extensions);
+
+    ZeroMemory(&fm, sizeof(fm));
+    fm.lStructSize = sizeof(OPENFILENAME);
+    fm.hwndOwner = NULL;
+    fm.lpstrTitle = window_title;
+    fm.lpstrFilter = filter_string;
+    fm.lpstrFile = selected;
+    fm.nMaxFile = MAX_PATH;
+    fm.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
+    fm.lpstrDefExt = "";
+
+    if (!MyGetOpenFileName(&fm))
+    {
+        result = NULL;
+    }
+    else
+    {
+        result = strdup(selected);
+    }
+
+    free(filter_string);
+
+    return result;
+}
+
+#elif defined(__MACOSX__)
+
+// Mac OS X code. Popping up a dialog requires Objective C/Cocoa
+// but we can get away with using AppleScript which avoids adding
+// an Objective C dependency. This is rather silly.
+
+// Printf format string for the "wrapper" portion of the AppleScript:
+#define APPLESCRIPT_WRAPPER "copy POSIX path of (%s) to stdout"
+
+static char *CreateEscapedString(const char *original)
+{
+    char *result;
+    const char *in;
+    char *out;
+
+    // We need to take care not to overflow the buffer, so count exactly.
+#define ESCAPED_CHARS "\"\\"
+    size_t count_extras = 2;    // start counting the two quotes
+    for (in = original; *in; ++in)
+    {
+        if (strchr(ESCAPED_CHARS, *in))
+        {
+            ++count_extras;
+        }
+    }
+
+    result = malloc(strlen(original) + count_extras + 1);
+    if (!result)
+    {
+        return NULL;
+    }
+    out = result;
+    *out++ = '"';
+    for (in = original; *in; ++in)
+    {
+        if (strchr(ESCAPED_CHARS, *in))
+        {
+            *out++ = '\\';
+        }
+        *out++ = *in;
+    }
+    *out++ = '"';
+    *out = 0;
+
+    return result;
+#undef ESCAPED_CHARS
+}
+
+// Build list of extensions, like: {"wad","lmp","txt"}
+
+static char *CreateExtensionsList(const char **extensions)
+{
+    char *result, *escaped;
+    unsigned int result_len;
+    unsigned int i;
+
+    if (extensions == NULL)
+    {
+        return NULL;
+    }
+
+    result_len = 3;
+    for (i = 0; extensions[i] != NULL; ++i)
+    {
+        result_len += 5 + strlen(extensions[i]) * 2;
+    }
+
+    result = malloc(result_len);
+    if (!result)
+    {
+        return NULL;
+    }
+    TXT_StringCopy(result, "{", result_len);
+
+    for (i = 0; extensions[i] != NULL; ++i)
+    {
+        escaped = CreateEscapedString(extensions[i]);
+        if (!escaped)
+        {
+            free(result);
+            return NULL;
+        }
+        TXT_StringConcat(result, escaped, result_len);
+        free(escaped);
+
+        if (extensions[i + 1] != NULL)
+        {
+            TXT_StringConcat(result, ",", result_len);
+        }
+    }
+
+    TXT_StringConcat(result, "}", result_len);
+
+    return result;
+}
+
+static char *GenerateSelector(const char *const window_title, const char **extensions)
+{
+    const char *chooser;
+    char *ext_list = NULL;
+    char *window_title_escaped = NULL;
+    char *result = NULL;
+    unsigned int result_len = 64;
+
+    if (extensions == TXT_DIRECTORY)
+    {
+        chooser = "choose folder";
+    }
+    else
+    {
+        chooser = "choose file";
+        ext_list = CreateExtensionsList(extensions);
+        if (!ext_list)
+        {
+            return NULL;
+        }
+    }
+
+    // Calculate size.
+
+    if (window_title != NULL)
+    {
+        window_title_escaped = CreateEscapedString(window_title);
+        if (!window_title_escaped)
+        {
+            free(ext_list);
+            return NULL;
+        }
+        result_len += strlen(window_title_escaped);
+    }
+    if (ext_list != NULL)
+    {
+        result_len += strlen(ext_list);
+    }
+
+    result = malloc(result_len);
+    if (!result)
+    {
+        free(window_title_escaped);
+        free(ext_list);
+        return NULL;
+    }
+
+    TXT_StringCopy(result, chooser, result_len);
+
+    if (window_title_escaped != NULL)
+    {
+        TXT_StringConcat(result, " with prompt ", result_len);
+        TXT_StringConcat(result, window_title_escaped, result_len);
+    }
+
+    if (ext_list != NULL)
+    {
+        TXT_StringConcat(result, " of type ", result_len);
+        TXT_StringConcat(result, ext_list, result_len);
+    }
+
+    free(window_title_escaped);
+    free(ext_list);
+    return result;
+}
+
+static char *GenerateAppleScript(const char *window_title, const char **extensions)
+{
+    char *selector, *result;
+    size_t result_len;
+
+    selector = GenerateSelector(window_title, extensions);
+    if (!selector)
+    {
+        return NULL;
+    }
+
+    result_len = strlen(APPLESCRIPT_WRAPPER) + strlen(selector);
+    result = malloc(result_len);
+    if (!result)
+    {
+        free(selector);
+        return NULL;
+    }
+
+    TXT_snprintf(result, result_len, APPLESCRIPT_WRAPPER, selector);
+    free(selector);
+
+    return result;
+}
+
+int TXT_CanSelectFiles(void)
+{
+    return 1;
+}
+
+char *TXT_SelectFile(const char *window_title, const char **extensions)
+{
+    char *argv[4];
+    char *result, *applescript;
+
+    applescript = GenerateAppleScript(window_title, extensions);
+    if (!applescript)
+    {
+        return NULL;
+    }
+
+    argv[0] = "/usr/bin/osascript";
+    argv[1] = "-e";
+    argv[2] = applescript;
+    argv[3] = NULL;
+
+    result = ExecReadOutput(argv);
+
+    free(applescript);
+
+    return result;
+}
+
+#else
+
+// Linux version: invoke the Zenity command line program to pop up a
+// dialog box. This avoids adding Gtk+ as a compile dependency.
+
+#define ZENITY_BINARY "/usr/bin/zenity"
+
+static unsigned int NumExtensions(const char **extensions)
+{
+    unsigned int result = 0;
+
+    if (extensions != NULL)
+    {
+        for (result = 0; extensions[result] != NULL; ++result);
+    }
+
+    return result;
+}
+
+static int ZenityAvailable(void)
+{
+    return system(ZENITY_BINARY " --help >/dev/null 2>&1") == 0;
+}
+
+int TXT_CanSelectFiles(void)
+{
+    return ZenityAvailable();
+}
+
+//
+// ExpandExtension
+// given an extension (like wad)
+// return a pointer to a string that is a case-insensitive
+// pattern representation (like [Ww][Aa][Dd])
+//
+static char *ExpandExtension(const char *orig)
+{
+    int oldlen, newlen, i;
+    char *c, *newext = NULL;
+
+    oldlen = strlen(orig);
+    newlen = oldlen * 4; // pathological case: 'w' => '[Ww]'
+    newext = malloc(newlen+1);
+
+    if (newext == NULL)
+    {
+        return NULL;
+    }
+
+    c = newext;
+    for (i = 0; i < oldlen; ++i)
+    {
+        if (isalpha(orig[i]))
+        {
+            *c++ = '[';
+            *c++ = tolower(orig[i]);
+            *c++ = toupper(orig[i]);
+            *c++ = ']';
+        }
+        else
+        {
+            *c++ = orig[i];
+        }
+    }
+    *c = '\0';
+    return newext;
+}
+
+char *TXT_SelectFile(const char *window_title, const char **extensions)
+{
+    unsigned int i;
+    size_t len;
+    char *result;
+    char **argv;
+    int argc;
+
+    if (!ZenityAvailable())
+    {
+        return NULL;
+    }
+
+    argv = calloc(5 + NumExtensions(extensions), sizeof(char *));
+    argv[0] = strdup(ZENITY_BINARY);
+    argv[1] = strdup("--file-selection");
+    argc = 2;
+
+    if (window_title != NULL)
+    {
+        len = 10 + strlen(window_title);
+        argv[argc] = malloc(len);
+        TXT_snprintf(argv[argc], len, "--title=%s", window_title);
+        ++argc;
+    }
+
+    if (extensions == TXT_DIRECTORY)
+    {
+        argv[argc] = strdup("--directory");
+        ++argc;
+    }
+    else if (extensions != NULL)
+    {
+        for (i = 0; extensions[i] != NULL; ++i)
+        {
+            char * newext = ExpandExtension(extensions[i]);
+            if (newext)
+            {
+                len = 30 + strlen(extensions[i]) + strlen(newext);
+                argv[argc] = malloc(len);
+                TXT_snprintf(argv[argc], len, "--file-filter=.%s | *.%s",
+                             extensions[i], newext);
+                ++argc;
+                free(newext);
+            }
+        }
+
+        argv[argc] = strdup("--file-filter=*.* | *.*");
+        ++argc;
+    }
+
+    argv[argc] = NULL;
+
+    result = ExecReadOutput(argv);
+
+    for (i = 0; i < argc; ++i)
+    {
+        free(argv[i]);
+    }
+
+    free(argv);
+
+    return result;
+}
+
+#endif
+
+static void TXT_FileSelectSizeCalc(TXT_UNCAST_ARG(fileselect))
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    // Calculate widget size, but override the width to always
+    // be the configured size.
+
+    TXT_CalcWidgetSize(fileselect->inputbox);
+    fileselect->widget.w = fileselect->size;
+    fileselect->widget.h = fileselect->inputbox->widget.h;
+}
+
+static void TXT_FileSelectDrawer(TXT_UNCAST_ARG(fileselect))
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    // Input box widget inherits all the properties of the
+    // file selector.
+
+    fileselect->inputbox->widget.x = fileselect->widget.x + 2;
+    fileselect->inputbox->widget.y = fileselect->widget.y;
+    fileselect->inputbox->widget.w = fileselect->widget.w - 2;
+    fileselect->inputbox->widget.h = fileselect->widget.h;
+
+    // Triple bar symbol gives a distinguishing look to the file selector.
+    TXT_DrawCodePageString("\xf0 ");
+    TXT_BGColor(TXT_COLOR_BLACK, 0);
+    TXT_DrawWidget(fileselect->inputbox);
+}
+
+static void TXT_FileSelectDestructor(TXT_UNCAST_ARG(fileselect))
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    TXT_DestroyWidget(fileselect->inputbox);
+}
+
+static int DoSelectFile(txt_fileselect_t *fileselect)
+{
+    char *path;
+    char **var;
+
+    if (TXT_CanSelectFiles())
+    {
+        path = TXT_SelectFile(fileselect->prompt,
+                              fileselect->extensions);
+
+        // Update inputbox variable.
+        // If cancel was pressed (ie. NULL was returned by TXT_SelectFile)
+        // then reset to empty string, not NULL).
+
+        if (path == NULL)
+        {
+            path = strdup("");
+        }
+
+        var = fileselect->inputbox->value;
+        free(*var);
+        *var = path;
+        return 1;
+    }
+
+    return 0;
+}
+
+static int TXT_FileSelectKeyPress(TXT_UNCAST_ARG(fileselect), int key)
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    // When the enter key is pressed, pop up a file selection dialog,
+    // if file selectors work. Allow holding down 'alt' to override
+    // use of the native file selector, so the user can just type a path.
+
+    if (!fileselect->inputbox->editing
+     && !TXT_GetModifierState(TXT_MOD_ALT)
+     && key == KEY_ENTER)
+    {
+        if (DoSelectFile(fileselect))
+        {
+            return 1;
+        }
+    }
+
+    return TXT_WidgetKeyPress(fileselect->inputbox, key);
+}
+
+static void TXT_FileSelectMousePress(TXT_UNCAST_ARG(fileselect),
+                                     int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    if (!fileselect->inputbox->editing
+     && !TXT_GetModifierState(TXT_MOD_ALT)
+     && b == TXT_MOUSE_LEFT)
+    {
+        if (DoSelectFile(fileselect))
+        {
+            return;
+        }
+    }
+
+    TXT_WidgetMousePress(fileselect->inputbox, x, y, b);
+}
+
+static void TXT_FileSelectFocused(TXT_UNCAST_ARG(fileselect), int focused)
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    TXT_SetWidgetFocus(fileselect->inputbox, focused);
+}
+
+txt_widget_class_t txt_fileselect_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_FileSelectSizeCalc,
+    TXT_FileSelectDrawer,
+    TXT_FileSelectKeyPress,
+    TXT_FileSelectDestructor,
+    TXT_FileSelectMousePress,
+    NULL,
+    TXT_FileSelectFocused,
+};
+
+// If the (inner) inputbox widget is changed, emit a change to the
+// outer (fileselect) widget.
+
+static void InputBoxChanged(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(fileselect))
+{
+    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+    TXT_EmitSignal(&fileselect->widget, "changed");
+}
+
+txt_fileselect_t *TXT_NewFileSelector(char **variable, int size,
+                                      const char *prompt, const char **extensions)
+{
+    txt_fileselect_t *fileselect;
+
+    fileselect = malloc(sizeof(txt_fileselect_t));
+    TXT_InitWidget(fileselect, &txt_fileselect_class);
+    fileselect->inputbox = TXT_NewInputBox(variable, 1024);
+    fileselect->inputbox->widget.parent = &fileselect->widget;
+    fileselect->size = size;
+    fileselect->prompt = prompt;
+    fileselect->extensions = extensions;
+
+    TXT_SignalConnect(fileselect->inputbox, "changed",
+                      InputBoxChanged, fileselect);
+
+    return fileselect;
+}
+
diff --git a/games/NXDoom/textscreen/txt_fileselect.h b/games/NXDoom/textscreen/txt_fileselect.h
new file mode 100644
index 000000000..fe5fac79b
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_fileselect.h
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Routines for selecting files, and the txt_fileselect_t widget.
+//
+
+#ifndef TXT_FILESELECT_H
+#define TXT_FILESELECT_H
+
+/**
+ * @file txt_fileselect.h
+ *
+ * File selection widget.
+ */
+
+/**
+ * File selection widget.
+ *
+ * A file selection widget resembles an input box (@ref txt_inputbox_t)
+ * but opens a file selector dialog box when clicked.
+ */
+
+typedef struct txt_fileselect_s txt_fileselect_t;
+
+/**
+ * Returns non-zero if a native file selector is available on this
+ * platform.
+ */
+
+int TXT_CanSelectFiles(void);
+
+/**
+ * Open a native file selector to select a file.
+ *
+ * @param prompt      Pointer to a string containing a prompt to display
+ *                    in the window.
+ * @param extensions  NULL-terminated list of filename extensions for
+ *                    files that can be selected, or @ref TXT_DIRECTORY
+ *                    to select directories.
+ */
+
+char *TXT_SelectFile(const char *prompt, const char **extensions);
+
+/**
+ * Create a new txt_fileselect_t widget.
+ *
+ * @param variable    Pointer to a char * variable in which the selected
+ *                    file should be stored (UTF-8 format).
+ * @param size        Width of the file selector widget in characters.
+ * @param prompt      Pointer to a string containing a prompt to display
+ *                    in the file selection window.
+ * @param extensions  NULL-terminated list of filename extensions that
+ *                    can be used for this widget, or @ref TXT_DIRECTORY
+ *                    to select directories.
+ */
+
+txt_fileselect_t *TXT_NewFileSelector(char **variable, int size,
+                                      const char *prompt, const char **extensions);
+
+/**
+ * Special value to use for 'extensions' that selects a directory
+ * instead of a file.
+ */
+
+extern const char *TXT_DIRECTORY[];
+
+#endif /* #ifndef TXT_FILESELECT_H */
+
diff --git a/games/NXDoom/textscreen/txt_gui.c b/games/NXDoom/textscreen/txt_gui.c
new file mode 100644
index 000000000..a80bd8503
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_gui.c
@@ -0,0 +1,480 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+
+typedef struct txt_cliparea_s txt_cliparea_t;
+
+struct txt_cliparea_s
+{
+    int x1, x2;
+    int y1, y2;
+    txt_cliparea_t *next;
+};
+
+// Array of border characters for drawing windows. The array looks like this:
+//
+// +-++
+// | ||
+// +-++
+// +-++
+
+static const int borders[4][4] = 
+{
+    {0xda, 0xc4, 0xc2, 0xbf},
+    {0xb3, ' ',  0xb3, 0xb3},
+    {0xc3, 0xc4, 0xc5, 0xb4},
+    {0xc0, 0xc4, 0xc1, 0xd9},
+};
+
+static txt_cliparea_t *cliparea = NULL;
+
+#define VALID_X(x) ((x) >= cliparea->x1 && (x) < cliparea->x2)
+#define VALID_Y(y) ((y) >= cliparea->y1 && (y) < cliparea->y2)
+
+void TXT_DrawDesktopBackground(const char *title)
+{
+    int i;
+    unsigned char *screendata;
+    unsigned char *p;
+
+    screendata = TXT_GetScreenData();
+    
+    // Fill the screen with gradient characters
+
+    p = screendata;
+    
+    for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
+    {
+        *p++ = 0xb1;
+        *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
+    }
+
+    // Draw the top and bottom banners
+
+    p = screendata;
+
+    for (i=0; i<TXT_SCREEN_W; ++i)
+    {
+        *p++ = ' ';
+        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+    }
+
+    p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
+
+    for (i=0; i<TXT_SCREEN_W; ++i)
+    {
+        *p++ = ' ';
+        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+    }
+
+    // Print the title
+
+    TXT_GotoXY(0, 0);
+    TXT_FGColor(TXT_COLOR_BLACK);
+    TXT_BGColor(TXT_COLOR_GREY, 0);
+
+    TXT_DrawString(" ");
+    TXT_DrawString(title);
+}
+
+void TXT_DrawShadow(int x, int y, int w, int h)
+{
+    unsigned char *screendata;
+    unsigned char *p;
+    int x1, y1;
+
+    screendata = TXT_GetScreenData();
+
+    for (y1=y; y1<y+h; ++y1)
+    {
+        p = screendata + (y1 * TXT_SCREEN_W + x) * 2;
+
+        for (x1=x; x1<x+w; ++x1)
+        {
+            if (VALID_X(x1) && VALID_Y(y1))
+            {
+                p[1] = TXT_COLOR_DARK_GREY;
+            }
+
+            p += 2;
+        }
+    }
+}
+
+void TXT_DrawWindowFrame(const char *title, int x, int y, int w, int h)
+{
+    txt_saved_colors_t colors;
+    int x1, y1;
+    int bx, by;
+
+    TXT_SaveColors(&colors);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+
+    for (y1=y; y1<y+h; ++y1)
+    {
+        // Select the appropriate row and column in the borders
+        // array to pick the appropriate character to draw at
+        // this location.
+        //
+        // Draw a horizontal line on the third line down, so we
+        // draw a box around the title.
+
+        by = y1 == y ? 0 :
+             y1 == y + 2 && title != NULL ? 2 :
+             y1 == y + h - 1 ? 3 : 1;
+
+        for (x1=x; x1<x+w; ++x1)
+        {
+            bx = x1 == x ? 0 :
+                 x1 == x + w - 1 ? 3 : 1;
+                 
+            if (VALID_X(x1) && VALID_Y(y1))
+            {
+                TXT_GotoXY(x1, y1);
+                TXT_PutChar(borders[by][bx]);
+            }
+        }
+    }
+
+    // Draw the title
+
+    if (title != NULL)
+    {
+        TXT_GotoXY(x + 1, y + 1);
+        TXT_BGColor(TXT_COLOR_GREY, 0);
+        TXT_FGColor(TXT_COLOR_BLUE);
+
+        for (x1=0; x1<w-2; ++x1)
+        {
+            TXT_DrawString(" ");
+        }
+    
+        TXT_GotoXY(x + (w - TXT_UTF8_Strlen(title)) / 2, y + 1);
+        TXT_DrawString(title);
+    }
+
+    // Draw the window's shadow.
+
+    TXT_DrawShadow(x + 2, y + h, w, 1);
+    TXT_DrawShadow(x + w, y + 1, 2, h);
+
+    TXT_RestoreColors(&colors);
+}
+
+void TXT_DrawSeparator(int x, int y, int w)
+{
+    txt_saved_colors_t colors;
+    unsigned char *data;
+    int x1;
+    int b;
+
+    data = TXT_GetScreenData();
+
+    TXT_SaveColors(&colors);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+
+    if (!VALID_Y(y))
+    {
+        return;
+    }
+
+    data += (y * TXT_SCREEN_W + x) * 2;
+
+    for (x1=x; x1<x+w; ++x1)
+    {
+        TXT_GotoXY(x1, y);
+
+        b = x1 == x ? 0 :
+            x1 == x + w - 1 ? 3 :
+            1;
+
+        if (VALID_X(x1))
+        {
+            // Read the current value from the screen
+            // Check that it matches what the window should look like if
+            // there is no separator, then apply the separator
+
+            if (*data == borders[1][b])
+            {
+                TXT_PutChar(borders[2][b]);
+            }
+        }
+
+        data += 2;
+    }
+
+    TXT_RestoreColors(&colors);
+}
+
+// Alternative to TXT_DrawString() where the argument is a "code page
+// string" - characters are in native code page format and not UTF-8.
+void TXT_DrawCodePageString(const char *s)
+{
+    int x, y;
+    int x1;
+    const char *p;
+
+    TXT_GetXY(&x, &y);
+
+    if (VALID_Y(y))
+    {
+        x1 = x;
+
+        for (p = s; *p != '\0'; ++p)
+        {
+            if (VALID_X(x1))
+            {
+                TXT_GotoXY(x1, y);
+                TXT_PutChar(*p);
+            }
+
+            x1 += 1;
+        }
+    }
+
+    TXT_GotoXY(x + strlen(s), y);
+}
+
+static void PutUnicodeChar(unsigned int c)
+{
+    int d;
+
+    // Treat control characters specially.
+    if (c == '\n' || c == '\b')
+    {
+        TXT_PutChar(c);
+        return;
+    }
+
+    // Map Unicode character into the symbol used to represent it in this
+    // code page. For unrepresentable characters, print a fallback instead.
+    // Note that we use TXT_PutSymbol() here because we just want to do a
+    // raw write into the screen buffer.
+    d = TXT_UnicodeCharacter(c);
+
+    if (d >= 0)
+    {
+        TXT_PutSymbol(d);
+    }
+    else
+    {
+        TXT_PutSymbol('\xa8');
+    }
+}
+
+void TXT_DrawString(const char *s)
+{
+    int x, y;
+    int x1;
+    const char *p;
+    unsigned int c;
+
+    TXT_GetXY(&x, &y);
+
+    if (VALID_Y(y))
+    {
+        x1 = x;
+
+        for (p = s; *p != '\0'; )
+        {
+            c = TXT_DecodeUTF8(&p);
+
+            if (c == 0)
+            {
+                break;
+            }
+
+            if (VALID_X(x1))
+            {
+                TXT_GotoXY(x1, y);
+                PutUnicodeChar(c);
+            }
+
+            x1 += 1;
+        }
+    }
+
+    TXT_GotoXY(x + TXT_UTF8_Strlen(s), y);
+}
+
+void TXT_DrawHorizScrollbar(int x, int y, int w, int cursor, int range)
+{
+    txt_saved_colors_t colors;
+    int x1;
+    int cursor_x;
+
+    if (!VALID_Y(y))
+    {
+        return;
+    }
+
+    TXT_SaveColors(&colors);
+    TXT_FGColor(TXT_COLOR_BLACK);
+    TXT_BGColor(TXT_COLOR_GREY, 0);
+
+    TXT_GotoXY(x, y);
+    TXT_PutChar('\x1b');
+
+    cursor_x = x + 1;
+
+    if (range > 0)
+    {
+        cursor_x += (cursor * (w - 3)) / range;
+    }
+
+    if (cursor_x > x + w - 2)
+    {
+        cursor_x = x + w - 2;
+    }
+
+    for (x1=x+1; x1<x+w-1; ++x1)
+    {
+        if (VALID_X(x1))
+        {
+            if (x1 == cursor_x)
+            {
+                TXT_PutChar('\xdb');
+            }
+            else
+            {
+                TXT_PutChar('\xb1');
+            }
+        }
+    }
+
+    TXT_PutChar('\x1a');
+    TXT_RestoreColors(&colors);
+}
+
+void TXT_DrawVertScrollbar(int x, int y, int h, int cursor, int range)
+{
+    txt_saved_colors_t colors;
+    int y1;
+    int cursor_y;
+
+    if (!VALID_X(x))
+    {
+        return;
+    }
+
+    TXT_SaveColors(&colors);
+    TXT_FGColor(TXT_COLOR_BLACK);
+    TXT_BGColor(TXT_COLOR_GREY, 0);
+
+    TXT_GotoXY(x, y);
+    TXT_PutChar('\x18');
+
+    cursor_y = y + 1;
+
+    if (cursor_y > y + h - 2)
+    {
+        cursor_y = y + h - 2;
+    }
+
+    if (range > 0)
+    {
+        cursor_y += (cursor * (h - 3)) / range;
+    }
+
+    for (y1=y+1; y1<y+h-1; ++y1)
+    {
+        if (VALID_Y(y1))
+        {
+            TXT_GotoXY(x, y1);
+
+            if (y1 == cursor_y)
+            {
+                TXT_PutChar('\xdb');
+            }
+            else
+            {
+                TXT_PutChar('\xb1');
+            }
+        }
+    }
+
+    TXT_GotoXY(x, y + h - 1);
+    TXT_PutChar('\x19');
+    TXT_RestoreColors(&colors);
+}
+
+void TXT_InitClipArea(void)
+{
+    if (cliparea == NULL)
+    {
+        cliparea = malloc(sizeof(txt_cliparea_t));
+        cliparea->x1 = 0;
+        cliparea->x2 = TXT_SCREEN_W;
+        cliparea->y1 = 0;
+        cliparea->y2 = TXT_SCREEN_H;
+        cliparea->next = NULL;
+    }
+}
+
+void TXT_PushClipArea(int x1, int x2, int y1, int y2)
+{
+    txt_cliparea_t *newarea;
+
+    newarea = malloc(sizeof(txt_cliparea_t));
+
+    // Set the new clip area to the intersection of the old
+    // area and the new one.
+
+    newarea->x1 = cliparea->x1;
+    newarea->x2 = cliparea->x2;
+    newarea->y1 = cliparea->y1;
+    newarea->y2 = cliparea->y2;
+
+    if (x1 > newarea->x1)
+        newarea->x1 = x1;
+    if (x2 < newarea->x2)
+        newarea->x2 = x2;
+    if (y1 > newarea->y1)
+        newarea->y1 = y1;
+    if (y2 < newarea->y2)
+        newarea->y2 = y2;
+
+#if 0
+    printf("New scrollable area: %i,%i-%i,%i\n", x1, y1, x2, y2);
+#endif
+
+    // Hook into the list
+
+    newarea->next = cliparea;
+    cliparea = newarea;
+}
+
+void TXT_PopClipArea(void)
+{
+    txt_cliparea_t *next_cliparea;
+
+    // Never pop the last entry
+
+    if (cliparea->next == NULL)
+        return;
+
+    // Unlink the last entry and delete
+   
+    next_cliparea = cliparea->next;
+    free(cliparea);
+    cliparea = next_cliparea;
+}
+
diff --git a/games/NXDoom/textscreen/txt_gui.h b/games/NXDoom/textscreen/txt_gui.h
new file mode 100644
index 000000000..85920922a
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_gui.h
@@ -0,0 +1,40 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Text mode emulation in SDL
+//
+
+#ifndef TXT_GUI_H
+#define TXT_GUI_H
+
+#define TXT_INACTIVE_WINDOW_BACKGROUND   TXT_COLOR_BLACK
+#define TXT_ACTIVE_WINDOW_BACKGROUND     TXT_COLOR_BLUE
+#define TXT_HOVER_BACKGROUND             TXT_COLOR_CYAN
+
+void TXT_DrawDesktopBackground(const char *title);
+void TXT_DrawWindowFrame(const char *title, int x, int y, int w, int h);
+void TXT_DrawSeparator(int x, int y, int w);
+void TXT_DrawCodePageString(const char *s);
+void TXT_DrawString(const char *s);
+int TXT_CanDrawCharacter(unsigned int c);
+
+void TXT_DrawHorizScrollbar(int x, int y, int w, int cursor, int range);
+void TXT_DrawVertScrollbar(int x, int y, int h, int cursor, int range);
+
+void TXT_InitClipArea(void);
+void TXT_PushClipArea(int x1, int x2, int y1, int y2);
+void TXT_PopClipArea(void);
+
+#endif /* #ifndef TXT_GUI_H */
+
diff --git a/games/NXDoom/textscreen/txt_inputbox.c b/games/NXDoom/textscreen/txt_inputbox.c
new file mode 100644
index 000000000..68d4347db
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_inputbox.c
@@ -0,0 +1,347 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_inputbox.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+txt_widget_class_t txt_inputbox_class;
+txt_widget_class_t txt_int_inputbox_class;
+
+static void SetBufferFromValue(txt_inputbox_t *inputbox)
+{
+    if (inputbox->widget.widget_class == &txt_inputbox_class)
+    {
+        char **value = (char **) inputbox->value;
+
+        if (*value != NULL)
+        {
+            TXT_StringCopy(inputbox->buffer, *value, strnlen(*value, inputbox->buffer_len) + 1);
+        }
+        else
+        {
+            TXT_StringCopy(inputbox->buffer, "", inputbox->buffer_len);
+        }
+    }
+    else if (inputbox->widget.widget_class == &txt_int_inputbox_class)
+    {
+        int *value = (int *) inputbox->value;
+        TXT_snprintf(inputbox->buffer, inputbox->buffer_len, "%i", *value);
+    }
+}
+
+static void StartEditing(txt_inputbox_t *inputbox)
+{
+    // Integer input boxes start from an empty buffer:
+
+    if (inputbox->widget.widget_class == &txt_int_inputbox_class)
+    {
+        TXT_StringCopy(inputbox->buffer, "", inputbox->buffer_len);
+    }
+    else
+    {
+        SetBufferFromValue(inputbox);
+    }
+
+    // Switch to text input mode so we get shifted input.
+    TXT_SetInputMode(TXT_INPUT_TEXT);
+    inputbox->editing = 1;
+}
+
+static void StopEditing(txt_inputbox_t *inputbox)
+{
+    if (inputbox->editing)
+    {
+        // Switch back to normal input mode.
+        TXT_SetInputMode(TXT_INPUT_NORMAL);
+        inputbox->editing = 0;
+    }
+}
+
+static void FinishEditing(txt_inputbox_t *inputbox)
+{
+    if (!inputbox->editing)
+    {
+        return;
+    }
+
+    // Save the new value back to the variable.
+
+    if (inputbox->widget.widget_class == &txt_inputbox_class)
+    {
+        free(*((char **)inputbox->value));
+        *((char **) inputbox->value) = strdup(inputbox->buffer);
+    }
+    else if (inputbox->widget.widget_class == &txt_int_inputbox_class)
+    {
+        *((int *) inputbox->value) = atoi(inputbox->buffer);
+    }
+
+    TXT_EmitSignal(&inputbox->widget, "changed");
+
+    StopEditing(inputbox);
+}
+
+static void TXT_InputBoxSizeCalc(TXT_UNCAST_ARG(inputbox))
+{
+    TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+    // Enough space for the box + cursor
+
+    inputbox->widget.w = inputbox->size + 1;
+    inputbox->widget.h = 1;
+}
+
+static void TXT_InputBoxDrawer(TXT_UNCAST_ARG(inputbox))
+{
+    TXT_CAST_ARG(txt_inputbox_t, inputbox);
+    int focused;
+    int i;
+    int chars;
+    int w;
+
+    focused = inputbox->widget.focused;
+    w = inputbox->widget.w;
+
+    // Select the background color based on whether we are currently
+    // editing, and if not, whether the widget is focused.
+
+    if (inputbox->editing && focused)
+    {
+        TXT_BGColor(TXT_COLOR_BLACK, 0);
+    }
+    else
+    {
+        TXT_SetWidgetBG(inputbox);
+    }
+
+    if (!inputbox->editing)
+    {
+        // If not editing, use the current value from inputbox->value.
+
+        SetBufferFromValue(inputbox);
+    }
+
+    // If string size exceeds the widget's width, show only the end.
+
+    if (TXT_UTF8_Strlen(inputbox->buffer) > w - 1)
+    {
+        TXT_DrawCodePageString("\xae");
+        TXT_DrawString(
+            TXT_UTF8_SkipChars(inputbox->buffer,
+                               TXT_UTF8_Strlen(inputbox->buffer) - w + 2));
+        chars = w - 1;
+    }
+    else
+    {
+        TXT_DrawString(inputbox->buffer);
+        chars = TXT_UTF8_Strlen(inputbox->buffer);
+    }
+
+    if (chars < w && inputbox->editing && focused)
+    {
+        TXT_BGColor(TXT_COLOR_BLACK, 1);
+        TXT_DrawString("_");
+        ++chars;
+    }
+
+    for (i=chars; i < w; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_InputBoxDestructor(TXT_UNCAST_ARG(inputbox))
+{
+    TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+    StopEditing(inputbox);
+    free(inputbox->buffer);
+}
+
+static void Backspace(txt_inputbox_t *inputbox)
+{
+    unsigned int len;
+    char *p;
+
+    len = TXT_UTF8_Strlen(inputbox->buffer);
+
+    if (len > 0)
+    {
+        p = TXT_UTF8_SkipChars(inputbox->buffer, len - 1);
+        *p = '\0';
+    }
+}
+
+static void AddCharacter(txt_inputbox_t *inputbox, int key)
+{
+    char *end, *p;
+
+    if (TXT_UTF8_Strlen(inputbox->buffer) < inputbox->size)
+    {
+        // Add character to the buffer
+
+        end = inputbox->buffer + strlen(inputbox->buffer);
+        p = TXT_EncodeUTF8(end, key);
+        *p = '\0';
+    }
+}
+
+static int TXT_InputBoxKeyPress(TXT_UNCAST_ARG(inputbox), int key)
+{
+    TXT_CAST_ARG(txt_inputbox_t, inputbox);
+    unsigned int c;
+
+    if (!inputbox->editing)
+    {
+        if (key == KEY_ENTER)
+        {
+            StartEditing(inputbox);
+            return 1;
+        }
+
+        // Backspace or delete erases the contents of the box.
+
+        if ((key == KEY_DEL || key == KEY_BACKSPACE)
+         && inputbox->widget.widget_class == &txt_inputbox_class)
+        {
+            free(*((char **)inputbox->value));
+            *((char **) inputbox->value) = strdup("");
+        }
+
+        return 0;
+    }
+
+    if (key == KEY_ENTER)
+    {
+        FinishEditing(inputbox);
+    }
+
+    if (key == KEY_ESCAPE)
+    {
+        StopEditing(inputbox);
+    }
+
+    if (key == KEY_BACKSPACE)
+    {
+        Backspace(inputbox);
+    }
+
+    c = TXT_KEY_TO_UNICODE(key);
+
+    // Add character to the buffer, but only if it's a printable character
+    // that we can represent on the screen.
+    if (isprint(c)
+     || (c >= 128 && TXT_UnicodeCharacter(c) >= 0))
+    {
+        AddCharacter(inputbox, c);
+    }
+
+    return 1;
+}
+
+static void TXT_InputBoxMousePress(TXT_UNCAST_ARG(inputbox),
+                                   int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        // Make mouse clicks start editing the box
+
+        if (!inputbox->editing)
+        {
+            // Send a simulated keypress to start editing
+
+            TXT_WidgetKeyPress(inputbox, KEY_ENTER);
+        }
+    }
+}
+
+static void TXT_InputBoxFocused(TXT_UNCAST_ARG(inputbox), int focused)
+{
+    TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+    // Stop editing when we lose focus.
+
+    if (inputbox->editing && !focused)
+    {
+        FinishEditing(inputbox);
+    }
+}
+
+txt_widget_class_t txt_inputbox_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_InputBoxSizeCalc,
+    TXT_InputBoxDrawer,
+    TXT_InputBoxKeyPress,
+    TXT_InputBoxDestructor,
+    TXT_InputBoxMousePress,
+    NULL,
+    TXT_InputBoxFocused,
+};
+
+txt_widget_class_t txt_int_inputbox_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_InputBoxSizeCalc,
+    TXT_InputBoxDrawer,
+    TXT_InputBoxKeyPress,
+    TXT_InputBoxDestructor,
+    TXT_InputBoxMousePress,
+    NULL,
+    TXT_InputBoxFocused,
+};
+
+static txt_inputbox_t *NewInputBox(txt_widget_class_t *widget_class,
+                                   void *value, int size)
+{
+    txt_inputbox_t *inputbox;
+
+    inputbox = malloc(sizeof(txt_inputbox_t));
+
+    TXT_InitWidget(inputbox, widget_class);
+    inputbox->value = value;
+    inputbox->size = size;
+    // 'size' is the maximum number of characters that can be entered,
+    // but for a UTF-8 string, each character can take up to four
+    // characters.
+    inputbox->buffer_len = size * 4 + 1;
+    inputbox->buffer = malloc(inputbox->buffer_len);
+    inputbox->editing = 0;
+
+    return inputbox;
+}
+
+txt_inputbox_t *TXT_NewInputBox(char **value, int size)
+{
+    return NewInputBox(&txt_inputbox_class, value, size);
+}
+
+txt_inputbox_t *TXT_NewIntInputBox(int *value, int size)
+{
+    return NewInputBox(&txt_int_inputbox_class, value, size);
+}
+
diff --git a/games/NXDoom/textscreen/txt_inputbox.h b/games/NXDoom/textscreen/txt_inputbox.h
new file mode 100644
index 000000000..7396eebd9
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_inputbox.h
@@ -0,0 +1,76 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_INPUTBOX_H
+#define TXT_INPUTBOX_H
+
+/**
+ * @file txt_inputbox.h
+ *
+ * Input box widget.
+ */
+
+/**
+ * Input box widget.
+ *
+ * An input box is a widget that displays a value, which can be
+ * selected to enter a new value.
+ *
+ * Input box widgets can be of an integer or string type.
+ */
+
+typedef struct txt_inputbox_s txt_inputbox_t;
+
+#include "txt_widget.h"
+
+struct txt_inputbox_s
+{
+    txt_widget_t widget;
+    char *buffer;
+    size_t buffer_len;
+    unsigned int size;
+    int editing;
+    void *value;
+};
+
+/**
+ * Create a new input box widget for controlling a string value.
+ *
+ * @param value         Pointer to a string variable that contains
+ *                      a pointer to the current value of the
+ *                      input box. The value should be allocated
+ *                      dynamically; when the string is changed it
+ *                      will be freed and the variable set to point
+ *                      to the new string value. String will be in
+ *                      UTF-8 format.
+ * @param size          Width of the input box, in characters.
+ * @return              Pointer to the new input box widget.
+ */
+
+txt_inputbox_t *TXT_NewInputBox(char **value, int size);
+
+/**
+ * Create a new input box widget for controlling an integer value.
+ *
+ * @param value         Pointer to an integer variable containing
+ *                      the value of the input box.
+ * @param size          Width of the input box, in characters.
+ * @return              Pointer to the new input box widget.
+ */
+
+txt_inputbox_t *TXT_NewIntInputBox(int *value, int size);
+
+#endif /* #ifndef TXT_INPUTBOX_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_io.c b/games/NXDoom/textscreen/txt_io.c
new file mode 100644
index 000000000..44ffa3829
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_io.c
@@ -0,0 +1,176 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Text mode I/O functions, similar to C stdio
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_io.h"
+#include "txt_main.h"
+
+static int cur_x = 0, cur_y = 0;
+static txt_color_t fgcolor = TXT_COLOR_GREY;
+static txt_color_t bgcolor = TXT_COLOR_BLACK;
+
+static void NewLine(unsigned char *screendata)
+{
+    int i;
+    unsigned char *p;
+
+    cur_x = 0;
+    ++cur_y;
+
+    if (cur_y >= TXT_SCREEN_H)
+    {
+        // Scroll the screen up
+
+        cur_y = TXT_SCREEN_H - 1;
+
+        memmove(screendata, screendata + TXT_SCREEN_W * 2,
+                TXT_SCREEN_W * 2 * (TXT_SCREEN_H -1));
+
+        // Clear the bottom line
+
+        p = screendata + (TXT_SCREEN_H - 1) * 2 * TXT_SCREEN_W;
+
+        for (i=0; i<TXT_SCREEN_W; ++i) 
+        {
+            *p++ = ' ';
+            *p++ = fgcolor | (bgcolor << 4);
+        }
+    }
+}
+
+static void PutSymbol(unsigned char *screendata, int c)
+{
+    unsigned char *p;
+
+    p = screendata + cur_y * TXT_SCREEN_W * 2 +  cur_x * 2;
+
+    // Add a new character to the buffer
+
+    p[0] = c;
+    p[1] = fgcolor | (bgcolor << 4);
+
+    ++cur_x;
+
+    if (cur_x >= TXT_SCREEN_W)
+    {
+        NewLine(screendata);
+    }
+}
+
+// "Blind" version of TXT_PutChar() below which doesn't do any interpretation
+// of control signals. Just write a particular symbol to the screen buffer.
+void TXT_PutSymbol(int c)
+{
+    PutSymbol(TXT_GetScreenData(), c);
+}
+
+static void PutChar(unsigned char *screendata, int c)
+{
+    switch (c)
+    {
+        case '\n':
+            NewLine(screendata);
+            break;
+
+        case '\b':
+            // backspace
+            --cur_x;
+            if (cur_x < 0)
+                cur_x = 0;
+            break;
+
+        default:
+            PutSymbol(screendata, c);
+            break;
+    }
+}
+
+void TXT_PutChar(int c)
+{
+    PutChar(TXT_GetScreenData(), c);
+}
+
+void TXT_Puts(const char *s)
+{
+    unsigned char *screen;
+    const char *p;
+
+    screen = TXT_GetScreenData();
+
+    for (p=s; *p != '\0'; ++p)
+    {
+        PutChar(screen, *p);
+    }
+
+    PutChar(screen, '\n');
+}
+
+void TXT_GotoXY(int x, int y)
+{
+    cur_x = x;
+    cur_y = y;
+}
+
+void TXT_GetXY(int *x, int *y)
+{
+    *x = cur_x;
+    *y = cur_y;
+}
+
+void TXT_FGColor(txt_color_t color)
+{
+    fgcolor = color;
+}
+
+void TXT_BGColor(int color, int blinking)
+{
+    bgcolor = color;
+    if (blinking)
+        bgcolor |= TXT_COLOR_BLINKING;
+}
+
+void TXT_SaveColors(txt_saved_colors_t *save)
+{
+    save->bgcolor = bgcolor;
+    save->fgcolor = fgcolor;
+}
+
+void TXT_RestoreColors(txt_saved_colors_t *save)
+{
+    bgcolor = save->bgcolor;
+    fgcolor = save->fgcolor;
+}
+
+void TXT_ClearScreen(void)
+{
+    unsigned char *screen;
+    int i;
+
+    screen = TXT_GetScreenData();
+
+    for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
+    {
+        screen[i * 2] = ' ';
+        screen[i * 2 +  1] = (bgcolor << 4) | fgcolor;
+    }
+
+    cur_x = 0;
+    cur_y = 0;
+}
+
diff --git a/games/NXDoom/textscreen/txt_io.h b/games/NXDoom/textscreen/txt_io.h
new file mode 100644
index 000000000..54a5e0e60
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_io.h
@@ -0,0 +1,41 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Text mode emulation in SDL
+//
+
+#ifndef TXT_IO_H
+#define TXT_IO_H
+
+#include "txt_main.h"
+
+typedef struct
+{
+    int bgcolor;
+    int fgcolor;
+} txt_saved_colors_t;
+
+void TXT_PutSymbol(int c);
+void TXT_PutChar(int c);
+void TXT_Puts(const char *s);
+void TXT_GotoXY(int x, int y);
+void TXT_GetXY(int *x, int *y);
+void TXT_FGColor(txt_color_t color);
+void TXT_BGColor(int color, int blinking);
+void TXT_SaveColors(txt_saved_colors_t *save);
+void TXT_RestoreColors(txt_saved_colors_t *save);
+void TXT_ClearScreen(void);
+
+#endif /* #ifndef TXT_IO_H */
+
diff --git a/games/NXDoom/textscreen/txt_label.c b/games/NXDoom/textscreen/txt_label.c
new file mode 100644
index 000000000..07834f460
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_label.c
@@ -0,0 +1,200 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_label.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+static void TXT_LabelSizeCalc(TXT_UNCAST_ARG(label))
+{
+    TXT_CAST_ARG(txt_label_t, label);
+
+    label->widget.w = label->w;
+    label->widget.h = label->h;
+}
+
+static void TXT_LabelDrawer(TXT_UNCAST_ARG(label))
+{
+    TXT_CAST_ARG(txt_label_t, label);
+    unsigned int x, y;
+    int origin_x, origin_y;
+    unsigned int align_indent = 0;
+    unsigned int w, sw;
+
+    w = label->widget.w;
+
+    if (label->bgcolor >= 0)
+    {
+        TXT_BGColor(label->bgcolor, 0);
+    }
+    if (label->fgcolor >= 0)
+    {
+        TXT_FGColor(label->fgcolor);
+    }
+
+    TXT_GetXY(&origin_x, &origin_y);
+
+    for (y=0; y<label->h; ++y)
+    {
+        // Calculate the amount to indent this line due to the align
+        // setting
+        sw = TXT_UTF8_Strlen(label->lines[y]);
+        switch (label->widget.align)
+        {
+            case TXT_HORIZ_LEFT:
+                align_indent = 0;
+                break;
+            case TXT_HORIZ_CENTER:
+                align_indent = (label->w - sw) / 2;
+                break;
+            case TXT_HORIZ_RIGHT:
+                align_indent = label->w - sw;
+                break;
+        }
+
+        // Draw this line
+
+        TXT_GotoXY(origin_x, origin_y + y);
+
+        // Gap at the start
+
+        for (x=0; x<align_indent; ++x)
+        {
+            TXT_DrawString(" ");
+        }
+
+        // The string itself
+
+        TXT_DrawString(label->lines[y]);
+        x += sw;
+
+        // Gap at the end
+
+        for (; x<w; ++x)
+        {
+            TXT_DrawString(" ");
+        }
+    }
+}
+
+static void TXT_LabelDestructor(TXT_UNCAST_ARG(label))
+{
+    TXT_CAST_ARG(txt_label_t, label);
+
+    free(label->label);
+    free(label->lines);
+}
+
+txt_widget_class_t txt_label_class =
+{
+    TXT_NeverSelectable,
+    TXT_LabelSizeCalc,
+    TXT_LabelDrawer,
+    NULL,
+    TXT_LabelDestructor,
+    NULL,
+    NULL,
+};
+
+void TXT_SetLabel(txt_label_t *label, const char *value)
+{
+    char *p;
+    unsigned int y;
+
+    // Free back the old label
+
+    free(label->label);
+    free(label->lines);
+
+    // Set the new value
+
+    label->label = strdup(value);
+
+    // Work out how many lines in this label
+
+    label->h = 1;
+
+    for (p = label->label; *p != '\0'; ++p)
+    {
+        if (*p == '\n')
+        {
+            ++label->h;
+        }
+    }
+
+    // Split into lines
+
+    label->lines = malloc(sizeof(char *) * label->h);
+    label->lines[0] = label->label;
+    y = 1;
+
+    for (p = label->label; *p != '\0'; ++p)
+    {
+        if (*p == '\n')
+        {
+            label->lines[y] = p + 1;
+            *p = '\0';
+            ++y;
+        }
+    }
+
+    label->w = 0;
+
+    for (y=0; y<label->h; ++y)
+    {
+        unsigned int line_len;
+
+        line_len = TXT_UTF8_Strlen(label->lines[y]);
+
+        if (line_len > label->w)
+            label->w = line_len;
+    }
+}
+
+txt_label_t *TXT_NewLabel(const char *text)
+{
+    txt_label_t *label;
+
+    label = malloc(sizeof(txt_label_t));
+
+    TXT_InitWidget(label, &txt_label_class);
+    label->label = NULL;
+    label->lines = NULL;
+
+    // Default colors
+
+    label->bgcolor = -1;
+    label->fgcolor = -1;
+
+    TXT_SetLabel(label, text);
+
+    return label;
+}
+
+void TXT_SetFGColor(txt_label_t *label, txt_color_t color)
+{
+    label->fgcolor = color;
+}
+
+void TXT_SetBGColor(txt_label_t *label, txt_color_t color)
+{
+    label->bgcolor = color;
+}
+
diff --git a/games/NXDoom/textscreen/txt_label.h b/games/NXDoom/textscreen/txt_label.h
new file mode 100644
index 000000000..8700c326b
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_label.h
@@ -0,0 +1,83 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_LABEL_H
+#define TXT_LABEL_H
+
+/**
+ * @file txt_label.h
+ *
+ * Text label widget.
+ */
+
+/**
+ * Label widget.
+ *
+ * A label widget does nothing except show a text label.
+ */
+
+typedef struct txt_label_s txt_label_t;
+
+#include "txt_main.h"
+#include "txt_widget.h"
+
+struct txt_label_s
+{
+    txt_widget_t widget;
+    char *label;
+    char **lines;
+    unsigned int w, h;
+    int fgcolor;
+    int bgcolor;
+};
+
+/**
+ * Create a new label widget.
+ *
+ * @param label         String to display in the widget (UTF-8 format).
+ * @return              Pointer to the new label widget.
+ */
+
+txt_label_t *TXT_NewLabel(const char *label);
+
+/**
+ * Set the string displayed in a label widget.
+ *
+ * @param label         The widget.
+ * @param value         The string to display (UTF-8 format).
+ */
+
+void TXT_SetLabel(txt_label_t *label, const char *value);
+
+/**
+ * Set the background color of a label widget.
+ *
+ * @param label         The widget.
+ * @param color         The background color to use.
+ */
+
+void TXT_SetBGColor(txt_label_t *label, txt_color_t color);
+
+/**
+ * Set the foreground color of a label widget.
+ *
+ * @param label         The widget.
+ * @param color         The foreground color to use.
+ */
+
+void TXT_SetFGColor(txt_label_t *label, txt_color_t color);
+
+#endif /* #ifndef TXT_LABEL_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_main.h b/games/NXDoom/textscreen/txt_main.h
new file mode 100644
index 000000000..183cc9a92
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_main.h
@@ -0,0 +1,203 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Base interface that abstracts the text mode screen.
+//
+
+#ifndef TXT_MAIN_H
+#define TXT_MAIN_H
+
+// For the moment, txt_sdl.c is the only implementation of the base 
+// text mode screen API:
+
+#include "txt_sdl.h"
+
+// textscreen key values:
+// Key values are difficult because we have to support multiple conflicting
+// address spaces.
+// First, Doom's key constants use 0-127 as ASCII and extra values from
+// 128-255 to represent special keys. Second, mouse buttons are represented
+// as buttons. Finally, we want to be able to support Unicode.
+//
+// So we define different ranges:
+// 0-255:    Doom key constants, including ASCII.
+// 256-511:  Mouse buttons and other reserved.
+// >=512:    Unicode values greater than 127 are offset up into this range.
+
+// Special keypress values that correspond to mouse button clicks
+
+#define TXT_MOUSE_BASE         256
+#define TXT_MOUSE_LEFT         (TXT_MOUSE_BASE + 0)
+#define TXT_MOUSE_RIGHT        (TXT_MOUSE_BASE + 1)
+#define TXT_MOUSE_MIDDLE       (TXT_MOUSE_BASE + 2)
+#define TXT_MOUSE_SCROLLUP     (TXT_MOUSE_BASE + 3)
+#define TXT_MOUSE_SCROLLDOWN   (TXT_MOUSE_BASE + 4)
+#define TXT_MOUSE_X1           (TXT_MOUSE_BASE + 5)
+#define TXT_MOUSE_X2           (TXT_MOUSE_BASE + 6)
+#define TXT_MAX_MOUSE_BUTTONS  16
+
+#define TXT_KEY_TO_MOUSE_BUTTON(x)                                        \
+        ( (x) >= TXT_MOUSE_BASE                                           \
+       && (x) < TXT_MOUSE_BASE + TXT_MAX_MOUSE_BUTTONS ?                  \
+          (x) - TXT_MOUSE_BASE : -1 )
+
+// Unicode offset. Unicode values from 128 onwards are offset up into
+// this range, so TXT_UNICODE_BASE = Unicode character #128, and so on.
+
+#define TXT_UNICODE_BASE       512
+
+// Convert a key value to a Unicode character:
+
+#define TXT_KEY_TO_UNICODE(x)                                             \
+        ( (x) < 128 ? (x) :                                               \
+          (x) >= TXT_UNICODE_BASE ? ((x) - TXT_UNICODE_BASE + 128) : 0 )
+
+// Convert a Unicode character to a key value:
+
+#define TXT_UNICODE_TO_KEY(u)                                            \
+        ( (u) < 128 ? (u) : ((u) - 128 + TXT_UNICODE_BASE) )
+
+// Screen size
+
+#define TXT_SCREEN_W 80
+#define TXT_SCREEN_H 25
+
+#define TXT_COLOR_BLINKING (1 << 3)
+
+typedef enum
+{
+    TXT_COLOR_BLACK,
+    TXT_COLOR_BLUE,
+    TXT_COLOR_GREEN,
+    TXT_COLOR_CYAN,
+    TXT_COLOR_RED,
+    TXT_COLOR_MAGENTA,
+    TXT_COLOR_BROWN,
+    TXT_COLOR_GREY,
+    TXT_COLOR_DARK_GREY,
+    TXT_COLOR_BRIGHT_BLUE,
+    TXT_COLOR_BRIGHT_GREEN,
+    TXT_COLOR_BRIGHT_CYAN,
+    TXT_COLOR_BRIGHT_RED,
+    TXT_COLOR_BRIGHT_MAGENTA,
+    TXT_COLOR_YELLOW,
+    TXT_COLOR_BRIGHT_WHITE,
+} txt_color_t;
+
+// Modifier keys.
+
+typedef enum
+{
+    TXT_MOD_SHIFT,
+    TXT_MOD_CTRL,
+    TXT_MOD_ALT,
+    TXT_NUM_MODIFIERS
+} txt_modifier_t;
+
+// Due to the way the SDL API works, we provide different ways of configuring
+// how we read input events, each of which is useful in different scenarios.
+typedef enum
+{
+    // "Localized" output that takes software keyboard layout into account,
+    // but key shifting has no effect.
+    TXT_INPUT_NORMAL,
+
+    // "Raw" input; the keys correspond to physical keyboard layout and
+    // software keyboard layout has no effect.
+    TXT_INPUT_RAW,
+
+    // Used for full text input. Events are fully shifted and localized.
+    // However, not all keyboard keys will generate input.
+    // Setting this mode may activate the on-screen keyboard, depending on
+    // device and OS.
+    TXT_INPUT_TEXT,
+} txt_input_mode_t;
+
+
+#ifdef __GNUC__
+
+#define PRINTF_ATTR(fmt, first) __attribute__((format(printf, fmt, first)))
+
+#else  // __GNUC__
+
+#define PRINTF_ATTR(fmt, first)
+
+#endif  // __GNUC__
+
+// Initialize the screen
+// Returns 1 if successful, 0 if failed.
+int TXT_Init(void);
+
+// Shut down text mode emulation
+void TXT_Shutdown(void);
+
+// Get a pointer to the buffer containing the raw screen data.
+unsigned char *TXT_GetScreenData(void);
+
+// Update an area of the screen
+void TXT_UpdateScreenArea(int x, int y, int w, int h);
+
+// Update the whole screen
+void TXT_UpdateScreen(void);
+
+// Set the RGB value for a particular entry in the color palette:
+void TXT_SetColor(txt_color_t color, int r, int g, int b);
+
+// Read a character from the keyboard
+int TXT_GetChar(void);
+
+// Given a Unicode character, get a character that can be used to represent
+// it on the code page being displayed on the screen. If the character cannot
+// be represented, this returns -1.
+int TXT_UnicodeCharacter(unsigned int c);
+
+// Read the current state of modifier keys that are held down.
+int TXT_GetModifierState(txt_modifier_t mod);
+
+// Provides a short description of a key code, placing into the provided
+// buffer. Note that the key is assumed to represent a physical key on the
+// keyboard (like that returned by TXT_INPUT_RAW), and the resulting string
+// takes keyboard layout into consideration. For example,
+// TXT_GetKeyDescription('q') on a French keyboard returns "A".
+// The contents of the filled buffer will be in UTF-8 format, but will never
+// contain characters which can't be shown on the screen.
+void TXT_GetKeyDescription(int key, char *buf, size_t buf_len);
+
+// Retrieve the current position of the mouse
+void TXT_GetMousePosition(int *x, int *y);
+
+// Sleep until an event is received or the screen needs updating
+// Optional timeout in ms (timeout == 0 : sleep forever)
+void TXT_Sleep(int timeout);
+
+// Change mode for text input.
+void TXT_SetInputMode(txt_input_mode_t mode);
+
+// Set the window title of the window containing the text mode screen
+void TXT_SetWindowTitle(const char *title);
+
+// Safe string copy.
+void TXT_StringCopy(char *dest, const char *src, size_t dest_len);
+
+// Safe string concatenate.
+void TXT_StringConcat(char *dest, const char *src, size_t dest_len);
+
+// Safe version of vsnprintf().
+int TXT_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args);
+
+// Safe version of snprintf().
+int TXT_snprintf(char *buf, size_t buf_len, const char *s, ...) PRINTF_ATTR(3, 4);
+
+#endif /* #ifndef TXT_MAIN_H */
+
diff --git a/games/NXDoom/textscreen/txt_radiobutton.c b/games/NXDoom/textscreen/txt_radiobutton.c
new file mode 100644
index 000000000..1319bd69c
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_radiobutton.c
@@ -0,0 +1,143 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_radiobutton.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+static void TXT_RadioButtonSizeCalc(TXT_UNCAST_ARG(radiobutton))
+{
+    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+    // Minimum width is the string length + right-side spaces for padding
+
+    radiobutton->widget.w = TXT_UTF8_Strlen(radiobutton->label) + 5;
+    radiobutton->widget.h = 1;
+}
+
+static void TXT_RadioButtonDrawer(TXT_UNCAST_ARG(radiobutton))
+{
+    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+    txt_saved_colors_t colors;
+    int i;
+    int w;
+
+    w = radiobutton->widget.w;
+
+    TXT_SaveColors(&colors);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+    TXT_DrawString("(");
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    if (*radiobutton->variable == radiobutton->value)
+    {
+        TXT_DrawCodePageString("\x07");
+    }
+    else
+    {
+        TXT_DrawString(" ");
+    }
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+
+    TXT_DrawString(") ");
+
+    TXT_RestoreColors(&colors);
+    TXT_SetWidgetBG(radiobutton);
+
+    TXT_DrawString(radiobutton->label);
+
+    for (i=TXT_UTF8_Strlen(radiobutton->label); i < w-5; ++i)
+    {
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_RadioButtonDestructor(TXT_UNCAST_ARG(radiobutton))
+{
+    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+    free(radiobutton->label);
+}
+
+static int TXT_RadioButtonKeyPress(TXT_UNCAST_ARG(radiobutton), int key)
+{
+    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+    if (key == KEY_ENTER || key == ' ')
+    {
+        if (*radiobutton->variable != radiobutton->value)
+        {
+            *radiobutton->variable = radiobutton->value;
+            TXT_EmitSignal(radiobutton, "selected");
+        }
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void TXT_RadioButtonMousePress(TXT_UNCAST_ARG(radiobutton), 
+                                      int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        // Equivalent to pressing enter
+
+        TXT_RadioButtonKeyPress(radiobutton, KEY_ENTER);
+    }
+}
+
+txt_widget_class_t txt_radiobutton_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_RadioButtonSizeCalc,
+    TXT_RadioButtonDrawer,
+    TXT_RadioButtonKeyPress,
+    TXT_RadioButtonDestructor,
+    TXT_RadioButtonMousePress,
+    NULL,
+};
+
+txt_radiobutton_t *TXT_NewRadioButton(const char *label, int *variable, int value)
+{
+    txt_radiobutton_t *radiobutton;
+
+    radiobutton = malloc(sizeof(txt_radiobutton_t));
+
+    TXT_InitWidget(radiobutton, &txt_radiobutton_class);
+    radiobutton->label = strdup(label);
+    radiobutton->variable = variable;
+    radiobutton->value = value;
+
+    return radiobutton;
+}
+
+void TXT_SetRadioButtonLabel(txt_radiobutton_t *radiobutton, const char *value)
+{
+    free(radiobutton->label);
+    radiobutton->label = strdup(value);
+}
+
diff --git a/games/NXDoom/textscreen/txt_radiobutton.h b/games/NXDoom/textscreen/txt_radiobutton.h
new file mode 100644
index 000000000..6ba25a5fc
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_radiobutton.h
@@ -0,0 +1,79 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_RADIOBUTTON_H
+#define TXT_RADIOBUTTON_H
+
+/**
+ * @file txt_radiobutton.h
+ *
+ * Radio button widget.
+ */
+
+/**
+ * A radio button widget.
+ *
+ * Radio buttons are typically used in groups, to allow a value to be
+ * selected from a range of options.  Each radio button corresponds
+ * to a particular option that may be selected.  A radio button
+ * has an indicator to indicate whether it is the currently-selected
+ * value, and a text label.
+ *
+ * Internally, a radio button tracks an integer variable that may take
+ * a range of different values.  Each radio button has a particular
+ * value associated with it; if the variable is equal to that value,
+ * the radio button appears selected.  If a radio button is pressed
+ * by the user through the GUI, the variable is set to its value.
+ *
+ * When a radio button is selected, the "selected" signal is emitted.
+ */
+
+typedef struct txt_radiobutton_s txt_radiobutton_t;
+
+#include "txt_widget.h"
+
+struct txt_radiobutton_s
+{
+    txt_widget_t widget;
+    char *label;
+    int *variable;
+    int value;
+};
+
+/**
+ * Create a new radio button widget.
+ *
+ * @param label          The label to display next to the radio button
+ *                       (UTF-8 format).
+ * @param variable       Pointer to the variable tracking whether this
+ *                       radio button is selected.
+ * @param value          If the variable is equal to this value, the
+ *                       radio button appears selected.
+ * @return               Pointer to the new radio button widget.
+ */
+
+txt_radiobutton_t *TXT_NewRadioButton(const char *label, int *variable, int value);
+
+/**
+ * Set the label on a radio button.
+ *
+ * @param radiobutton    The radio button.
+ * @param value          The new label (UTF-8 format).
+ */
+
+void TXT_SetRadioButtonLabel(txt_radiobutton_t *radiobutton, const char *value);
+
+#endif /* #ifndef TXT_RADIOBUTTON_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_scrollpane.c b/games/NXDoom/textscreen/txt_scrollpane.c
new file mode 100644
index 000000000..7c4508a81
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_scrollpane.c
@@ -0,0 +1,586 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "txt_scrollpane.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_table.h"
+
+#include "doomkeys.h"
+
+#define SCROLLBAR_VERTICAL   (1 << 0)
+#define SCROLLBAR_HORIZONTAL (1 << 1)
+
+static int FullWidth(txt_scrollpane_t *scrollpane)
+{
+    if (scrollpane->child != NULL)
+    {
+        return scrollpane->child->w;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+static int FullHeight(txt_scrollpane_t *scrollpane)
+{
+    if (scrollpane->child != NULL)
+    {
+        return scrollpane->child->h;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// Calculate which scroll bars the pane needs.
+
+static int NeedsScrollbars(txt_scrollpane_t *scrollpane)
+{
+    int result;
+
+    result = 0;
+
+    if (FullWidth(scrollpane) > scrollpane->w)
+    {
+        result |= SCROLLBAR_HORIZONTAL;
+    }
+    if (FullHeight(scrollpane) > scrollpane->h)
+    {
+        result |= SCROLLBAR_VERTICAL;
+    }
+
+    return result;
+}
+
+// If a scrollbar isn't needed, the scroll position is reset.
+
+static void SanityCheckScrollbars(txt_scrollpane_t *scrollpane)
+{
+    int scrollbars;
+    int max_x, max_y;
+
+    scrollbars = NeedsScrollbars(scrollpane);
+
+    if ((scrollbars & SCROLLBAR_HORIZONTAL) == 0)
+    {
+        scrollpane->x = 0;
+    }
+    if ((scrollbars & SCROLLBAR_VERTICAL) == 0)
+    {
+        scrollpane->y = 0;
+    }
+
+    max_x = FullWidth(scrollpane) - scrollpane->w;
+    max_y = FullHeight(scrollpane) - scrollpane->h;
+
+    if (scrollpane->x < 0)
+    {
+        scrollpane->x = 0;
+    }
+    else if (scrollpane->x > max_x)
+    {
+        scrollpane->x = max_x;
+    }
+
+    if (scrollpane->y < 0)
+    {
+        scrollpane->y = 0;
+    }
+    else if (scrollpane->y > max_y)
+    {
+        scrollpane->y = max_y;
+    }
+}
+
+static void TXT_ScrollPaneSizeCalc(TXT_UNCAST_ARG(scrollpane))
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+    int scrollbars;
+
+    if (scrollpane->child != NULL)
+    {
+        TXT_CalcWidgetSize(scrollpane->child);
+    }
+
+    // Expand as necessary (to ensure that no scrollbars are needed)?
+
+    if (scrollpane->expand_w)
+    {
+        scrollpane->w = FullWidth(scrollpane);
+    }
+    if (scrollpane->expand_h)
+    {
+        scrollpane->h = FullHeight(scrollpane);
+    }
+
+    scrollpane->widget.w = scrollpane->w;
+    scrollpane->widget.h = scrollpane->h;
+
+    // If we have scroll bars, we need to expand slightly to
+    // accomodate them. Eg. if we have a vertical scrollbar, we
+    // need to be an extra character wide.
+
+    scrollbars = NeedsScrollbars(scrollpane);
+
+    if (scrollbars & SCROLLBAR_HORIZONTAL)
+    {
+        ++scrollpane->widget.h;
+    }
+    if (scrollbars & SCROLLBAR_VERTICAL)
+    {
+        ++scrollpane->widget.w;
+    }
+
+    if (scrollpane->child != NULL)
+    {
+        if (scrollpane->child->w < scrollpane->w)
+        {
+            scrollpane->child->w = scrollpane->w;
+        }
+        if (scrollpane->child->h < scrollpane->h)
+        {
+            scrollpane->child->h = scrollpane->h;
+        }
+    }
+}
+
+static void TXT_ScrollPaneDrawer(TXT_UNCAST_ARG(scrollpane))
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+    int x1, y1, x2, y2;
+    int scrollbars;
+
+    // We set a clipping area of the scroll pane.
+
+    x1 = scrollpane->widget.x;
+    y1 = scrollpane->widget.y;
+    x2 = x1 + scrollpane->w;
+    y2 = y1 + scrollpane->h;
+
+    scrollbars = NeedsScrollbars(scrollpane);
+
+    if (scrollbars & SCROLLBAR_HORIZONTAL)
+    {
+        TXT_DrawHorizScrollbar(x1,
+                               y1 + scrollpane->h,
+                               scrollpane->w,
+                               scrollpane->x,
+                               FullWidth(scrollpane) - scrollpane->w);
+    }
+
+    if (scrollbars & SCROLLBAR_VERTICAL)
+    {
+        TXT_DrawVertScrollbar(x1 + scrollpane->w,
+                              y1,
+                              scrollpane->h,
+                              scrollpane->y,
+                              FullHeight(scrollpane) - scrollpane->h);
+    }
+
+    TXT_PushClipArea(x1, x2, y1, y2);
+
+    // Draw the child widget
+
+    if (scrollpane->child != NULL)
+    {
+        TXT_DrawWidget(scrollpane->child);
+    }
+
+    // Restore old clipping area.
+
+    TXT_PopClipArea();
+}
+
+static void TXT_ScrollPaneDestructor(TXT_UNCAST_ARG(scrollpane))
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+    if (scrollpane->child != NULL)
+    {
+        TXT_DestroyWidget(scrollpane->child);
+    }
+}
+
+static void TXT_ScrollPaneFocused(TXT_UNCAST_ARG(scrollpane), int focused)
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+    // Whether the child is focused depends only on whether the scroll pane
+    // itself is focused. Pass through focus to the child.
+
+    if (scrollpane->child != NULL)
+    {
+        TXT_SetWidgetFocus(scrollpane->child, focused);
+    }
+}
+
+// Hack for tables - when browsing a table inside a scroll pane,
+// automatically scroll the window to show the newly-selected
+// item.
+
+static void ShowSelectedWidget(txt_scrollpane_t *scrollpane)
+{
+    txt_widget_t *selected;
+
+    selected = TXT_GetSelectedWidget(scrollpane->child);
+
+    // Scroll up or down?
+
+    if (selected->y <= scrollpane->widget.y)
+    {
+        scrollpane->y -= scrollpane->widget.y - selected->y;
+    }
+    else if ((signed) (selected->y + selected->h) >
+             (signed) (scrollpane->widget.y + scrollpane->h))
+    {
+        scrollpane->y += (selected->y + selected->h)
+                       - (scrollpane->widget.y + scrollpane->h);
+    }
+
+    // Scroll left or right?
+
+    if (selected->x <= scrollpane->widget.x)
+    {
+        scrollpane->x -= scrollpane->widget.x - selected->x;
+    }
+    else if ((signed) (selected->x + selected->w) >
+             (signed) (scrollpane->widget.x + scrollpane->w))
+    {
+        scrollpane->x += (selected->x + selected->w)
+                       - (scrollpane->widget.x + scrollpane->w);
+    }
+}
+
+// Another hack for tables - when scrolling in 'pages', the normal key press
+// event does not provide children with enough information to know how far
+// to move their selection to reach a new page. This function does so.
+// Note that it *only* affects scrolling in pages, not with arrows!
+// A side-effect of this, rather than 'pulling' the selection to fit within
+// the new page, is that we will jump straight over ranges of unselectable
+// items longer than a page, but that is also true of arrow-key scrolling.
+// The other unfortunate effect of doing things this way is that page keys
+// have no effect on tables _not_ in scrollpanes: not even home/end.
+
+static int PageSelectedWidget(txt_scrollpane_t *scrollpane, int key)
+{
+    int pagex = 0; // No page left/right yet, but some keyboards have them
+    int pagey = 0;
+
+    // Subtract one from the absolute page distance as this is slightly more
+    // intuitive: a page down first jumps to the bottom of the current page,
+    // then proceeds to scroll onwards.
+
+    switch (key)
+    {
+        case KEY_PGUP:
+            pagey = 1 - scrollpane->h;
+            break;
+
+        case KEY_PGDN:
+            pagey = scrollpane->h - 1;
+            break;
+
+        default: // We shouldn't even be in this function
+            return 0;
+    }
+
+    if (scrollpane->child->widget_class == &txt_table_class)
+    {
+        return TXT_PageTable(scrollpane->child, pagex, pagey);
+    }
+
+    return 0;
+}
+
+// Interpret arrow key presses as scroll commands
+
+static int InterpretScrollKey(txt_scrollpane_t *scrollpane, int key)
+{
+    int maxy;
+
+    switch (key)
+    {
+        case KEY_UPARROW:
+            if (scrollpane->y > 0)
+            {
+                --scrollpane->y;
+                return 1;
+            }
+            break;
+
+        case KEY_DOWNARROW:
+            if (scrollpane->y < FullHeight(scrollpane) - scrollpane->h)
+            {
+                ++scrollpane->y;
+                return 1;
+            }
+            break;
+
+        case KEY_LEFTARROW:
+            if (scrollpane->x > 0)
+            {
+                --scrollpane->x;
+                return 1;
+            }
+            break;
+
+        case KEY_RIGHTARROW:
+            if (scrollpane->x < FullWidth(scrollpane) - scrollpane->w)
+            {
+                ++scrollpane->x;
+                return 1;
+            }
+            break;
+
+        case KEY_PGUP:
+            if (scrollpane->y > 0)
+            {
+                scrollpane->y -= scrollpane->h;
+                if (scrollpane->y < 0)
+                {
+                    scrollpane->y = 0;
+                }
+                return 1;
+            }
+            break;
+
+        case KEY_PGDN:
+            maxy = FullHeight(scrollpane) - scrollpane->h;
+            if (scrollpane->y < maxy)
+            {
+                scrollpane->y += scrollpane->h;
+                if (scrollpane->y > maxy)
+                {
+                    scrollpane->y = maxy;
+                }
+                return 1;
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return 0;
+}
+
+static int TXT_ScrollPaneKeyPress(TXT_UNCAST_ARG(scrollpane), int key)
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+    int result;
+
+    result = 0;
+
+    if (scrollpane->child != NULL)
+    {
+        result = TXT_WidgetKeyPress(scrollpane->child, key);
+
+        // Gross hack - if we're scrolling in a menu with the keyboard,
+        // automatically move the scroll pane to show the new
+        // selected item.
+
+        if ((key == KEY_UPARROW || key == KEY_DOWNARROW
+          || key == KEY_LEFTARROW || key == KEY_RIGHTARROW
+          || key == KEY_PGUP || key == KEY_PGDN
+          || key == KEY_TAB)
+         && scrollpane->child->widget_class == &txt_table_class)
+        {
+            if (PageSelectedWidget(scrollpane, key))
+            {
+                result = 1;
+            }
+
+            ShowSelectedWidget(scrollpane);
+        }
+
+        // If the child widget didn't use the keypress, we can see 
+        // if it can be interpreted as a scrolling command.
+
+        if (result == 0)
+        {
+            result = InterpretScrollKey(scrollpane, key);
+        }
+    }
+
+    return result;
+}
+
+static void TXT_ScrollPaneMousePress(TXT_UNCAST_ARG(scrollpane),
+                                     int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+    int scrollbars;
+    int rel_x, rel_y;
+
+    scrollbars = NeedsScrollbars(scrollpane);
+
+    if (b == TXT_MOUSE_SCROLLUP)
+    {
+        if (scrollbars & SCROLLBAR_VERTICAL)
+        {
+            scrollpane->y -= 3;
+        }
+        else if (scrollbars & SCROLLBAR_HORIZONTAL)
+        {
+            scrollpane->x -= 3;
+        }
+
+        return;
+    }
+    else if (b == TXT_MOUSE_SCROLLDOWN)
+    {
+        if (scrollbars & SCROLLBAR_VERTICAL)
+        {
+            scrollpane->y += 3;
+        }
+        else if (scrollbars & SCROLLBAR_HORIZONTAL)
+        {
+            scrollpane->x += 3;
+        }
+
+        return;
+    }
+
+    rel_x = x - scrollpane->widget.x;
+    rel_y = y - scrollpane->widget.y;
+
+    // Click on the horizontal scrollbar?
+    if ((scrollbars & SCROLLBAR_HORIZONTAL) && rel_y == scrollpane->h)
+    {
+        if (rel_x == 0)
+        {
+            --scrollpane->x;
+        }
+        else if (rel_x == scrollpane->w - 1)
+        {
+            ++scrollpane->x;
+        }
+        else
+        {
+            int range = FullWidth(scrollpane) - scrollpane->w;
+            int bar_max = scrollpane->w - 3;
+
+            scrollpane->x = ((rel_x - 1) * range + bar_max - 1) / bar_max;
+        }
+
+        return;
+    }
+
+    // Click on the vertical scrollbar?
+    if ((scrollbars & SCROLLBAR_VERTICAL) && rel_x == scrollpane->w)
+    {
+        if (rel_y == 0)
+        {
+            --scrollpane->y;
+        }
+        else if (rel_y == scrollpane->h - 1)
+        {
+            ++scrollpane->y;
+        }
+        else
+        {
+            int range = FullHeight(scrollpane) - scrollpane->h;
+            int bar_max = scrollpane->h - 3;
+
+            scrollpane->y = ((rel_y - 1) * range + bar_max - 1) / bar_max;
+        }
+
+        return;
+    }
+
+    if (scrollpane->child != NULL)
+    {
+        TXT_WidgetMousePress(scrollpane->child, x, y, b);
+    }
+}
+
+static void TXT_ScrollPaneLayout(TXT_UNCAST_ARG(scrollpane))
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+    SanityCheckScrollbars(scrollpane);
+
+    // The child widget takes the same position as the scroll pane
+    // itself, but is offset by the scroll position.
+
+    if (scrollpane->child != NULL)
+    {
+        scrollpane->child->x = scrollpane->widget.x - scrollpane->x;
+        scrollpane->child->y = scrollpane->widget.y - scrollpane->y;
+
+        TXT_LayoutWidget(scrollpane->child);
+    }
+}
+
+static int TXT_ScrollPaneSelectable(TXT_UNCAST_ARG(scrollpane))
+{
+    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+    // If scroll bars are displayed, the scroll pane must be selectable
+    // so that we can use the arrow keys to scroll around.
+
+    if (NeedsScrollbars(scrollpane))
+    {
+        return 1;
+    }
+
+    // Otherwise, whether this is selectable depends on the child widget.
+
+    return TXT_SelectableWidget(scrollpane->child);
+}
+
+txt_widget_class_t txt_scrollpane_class =
+{
+    TXT_ScrollPaneSelectable,
+    TXT_ScrollPaneSizeCalc,
+    TXT_ScrollPaneDrawer,
+    TXT_ScrollPaneKeyPress,
+    TXT_ScrollPaneDestructor,
+    TXT_ScrollPaneMousePress,
+    TXT_ScrollPaneLayout,
+    TXT_ScrollPaneFocused,
+};
+
+txt_scrollpane_t *TXT_NewScrollPane(int w, int h, TXT_UNCAST_ARG(target))
+{
+    TXT_CAST_ARG(txt_widget_t, target);
+    txt_scrollpane_t *scrollpane;
+
+    scrollpane = malloc(sizeof(txt_scrollpane_t));
+    TXT_InitWidget(scrollpane, &txt_scrollpane_class);
+    scrollpane->w = w;
+    scrollpane->h = h;
+    scrollpane->x = 0;
+    scrollpane->y = 0;
+    scrollpane->child = target;
+    scrollpane->expand_w = w <= 0;
+    scrollpane->expand_h = h <= 0;
+
+    // Set parent pointer for inner widget.
+
+    target->parent = &scrollpane->widget;
+
+    return scrollpane;
+}
+
diff --git a/games/NXDoom/textscreen/txt_scrollpane.h b/games/NXDoom/textscreen/txt_scrollpane.h
new file mode 100644
index 000000000..8ae95e47e
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_scrollpane.h
@@ -0,0 +1,59 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_SCROLLPANE_H
+#define TXT_SCROLLPANE_H
+
+/**
+ * @file txt_scrollpane.h
+ *
+ * Scrollable pane widget.
+ */
+
+/**
+ * Scrollable pane widget.
+ *
+ * A scrollable pane widget is a widget that contains another widget
+ * that is larger than it.  Scroll bars appear on the side to allow
+ * different areas of the contained widget to be seen.
+ */
+
+typedef struct txt_scrollpane_s txt_scrollpane_t;
+
+#include "txt_widget.h"
+
+struct txt_scrollpane_s
+{
+    txt_widget_t widget;
+    int w, h;
+    int x, y;
+    int expand_w, expand_h;
+    txt_widget_t *child;
+};
+
+/**
+ * Create a new scroll pane widget.
+ *
+ * @param w               Width of the scroll pane, in characters.
+ * @param h               Height of the scroll pane, in lines.
+ * @param target          The target widget that the scroll pane will
+ *                        contain.
+ * @return                Pointer to the new scroll pane widget.
+ */
+
+txt_scrollpane_t *TXT_NewScrollPane(int w, int h, TXT_UNCAST_ARG(target));
+
+#endif /* #ifndef TXT_SCROLLPANE_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_sdl.c b/games/NXDoom/textscreen/txt_sdl.c
new file mode 100644
index 000000000..807a1954e
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_sdl.c
@@ -0,0 +1,990 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Text mode emulation in SDL
+//
+
+#include "SDL.h"
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_main.h"
+#include "txt_sdl.h"
+#include "txt_utf8.h"
+
+#if defined(_MSC_VER) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
+typedef struct
+{
+    const char *name;
+    const uint8_t *data;
+    unsigned int w;
+    unsigned int h;
+} txt_font_t;
+
+// Fonts:
+
+#include "fonts/small.h"
+#include "fonts/normal.h"
+#include "fonts/large.h"
+#include "fonts/codepage.h"
+
+// Time between character blinks in ms
+
+#define BLINK_PERIOD 250
+
+SDL_Window *TXT_SDLWindow;
+static SDL_Surface *screenbuffer;
+static unsigned char *screendata;
+static SDL_Renderer *renderer;
+
+// Current input mode.
+static txt_input_mode_t input_mode = TXT_INPUT_NORMAL;
+
+// Dimensions of the screen image in screen coordinates (not pixels); this
+// is the value that was passed to SDL_CreateWindow().
+static int screen_image_w, screen_image_h;
+
+static TxtSDLEventCallbackFunc event_callback;
+static void *event_callback_data;
+
+// Font we are using:
+static const txt_font_t *font;
+
+// Dummy "font" that means to try highdpi rendering, or fallback to
+// normal_font otherwise.
+static const txt_font_t highdpi_font = { "normal-highdpi", NULL, 8, 16 };
+
+// Mapping from SDL keyboard scancode to internal key code.
+static const int scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
+
+// String names of keys. This is a fallback; we usually use the SDL API.
+static const struct {
+    int key;
+    const char *name;
+} key_names[] = KEY_NAMES_ARRAY;
+
+// Unicode key mapping; see codepage.h.
+static const short code_page_to_unicode[] = CODE_PAGE_TO_UNICODE;
+
+static const SDL_Color ega_colors[] =
+{
+    {0x00, 0x00, 0x00, 0xff},          // 0: Black
+    {0x00, 0x00, 0xaa, 0xff},          // 1: Blue
+    {0x00, 0xaa, 0x00, 0xff},          // 2: Green
+    {0x00, 0xaa, 0xaa, 0xff},          // 3: Cyan
+    {0xaa, 0x00, 0x00, 0xff},          // 4: Red
+    {0xaa, 0x00, 0xaa, 0xff},          // 5: Magenta
+    {0xaa, 0x55, 0x00, 0xff},          // 6: Brown
+    {0xaa, 0xaa, 0xaa, 0xff},          // 7: Grey
+    {0x55, 0x55, 0x55, 0xff},          // 8: Dark grey
+    {0x55, 0x55, 0xff, 0xff},          // 9: Bright blue
+    {0x55, 0xff, 0x55, 0xff},          // 10: Bright green
+    {0x55, 0xff, 0xff, 0xff},          // 11: Bright cyan
+    {0xff, 0x55, 0x55, 0xff},          // 12: Bright red
+    {0xff, 0x55, 0xff, 0xff},          // 13: Bright magenta
+    {0xff, 0xff, 0x55, 0xff},          // 14: Yellow
+    {0xff, 0xff, 0xff, 0xff},          // 15: Bright white
+};
+
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+// Examine system DPI settings to determine whether to use the large font.
+
+static int Win32_UseLargeFont(void)
+{
+    HDC hdc = GetDC(NULL);
+    int dpix;
+
+    if (!hdc)
+    {
+        return 0;
+    }
+
+    dpix = GetDeviceCaps(hdc, LOGPIXELSX);
+    ReleaseDC(NULL, hdc);
+
+    // 144 is the DPI when using "150%" scaling. If the user has this set
+    // then consider this an appropriate threshold for using the large font.
+
+    return dpix >= 144;
+}
+
+#endif
+
+static const txt_font_t *FontForName(const char *name)
+{
+    int i;
+    const txt_font_t *fonts[] =
+    {
+        &small_font,
+        &normal_font,
+        &large_font,
+        &highdpi_font,
+        NULL,
+    };
+
+    for (i = 0; fonts[i]->name != NULL; ++i)
+    {
+        if (!strcmp(fonts[i]->name, name))
+        {
+            return fonts[i];
+        }
+    }
+    return NULL;
+}
+
+//
+// Select the font to use, based on screen resolution
+//
+// If the highest screen resolution available is less than
+// 640x480, use the small font.
+//
+
+static void ChooseFont(void)
+{
+    SDL_DisplayMode desktop_info;
+    char *env;
+
+    // Allow normal selection to be overridden from an environment variable:
+    env = getenv("TEXTSCREEN_FONT");
+    if (env != NULL)
+    {
+        font = FontForName(env);
+
+        if (font != NULL)
+        {
+            return;
+        }
+    }
+
+    // Get desktop resolution.
+    // If in doubt and we can't get a list, always prefer to
+    // fall back to the normal font:
+    if (SDL_GetCurrentDisplayMode(0, &desktop_info))
+    {
+        font = &highdpi_font;
+        return;
+    }
+
+    // On tiny low-res screens (eg. palmtops) use the small font.
+    // If the screen resolution is at least 1920x1080, this is
+    // a modern high-resolution display, and we can use the
+    // large font.
+
+    if (desktop_info.w < 640 || desktop_info.h < 480)
+    {
+        font = &small_font;
+    }
+#ifdef _WIN32
+    // On Windows we can use the system DPI settings to make a
+    // more educated guess about whether to use the large font.
+
+    else if (Win32_UseLargeFont())
+    {
+        font = &large_font;
+    }
+#endif
+    // TODO: Detect high DPI on Linux by inquiring about Gtk+ scale
+    // settings. This looks like it should just be a case of shelling
+    // out to invoke the 'gsettings' command, eg.
+    //   gsettings get org.gnome.desktop.interface text-scaling-factor
+    // and using large_font if the result is >= 2.
+    else
+    {
+        // highdpi_font usually means normal_font (the normal resolution
+        // version), but actually means "set the HIGHDPI flag and try
+        // to use large_font if we initialize successfully".
+        font = &highdpi_font;
+    }
+}
+
+//
+// Initialize text mode screen
+//
+// Returns 1 if successful, 0 if an error occurred
+//
+
+int TXT_Init(void)
+{
+    int flags = 0;
+
+    if (SDL_Init(SDL_INIT_VIDEO) < 0)
+    {
+        return 0;
+    }
+
+    ChooseFont();
+
+    screen_image_w = TXT_SCREEN_W * font->w;
+    screen_image_h = TXT_SCREEN_H * font->h;
+
+    // If highdpi_font is selected, try to initialize high dpi rendering.
+    if (font == &highdpi_font)
+    {
+        flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+    }
+
+    TXT_SDLWindow =
+        SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
+                         screen_image_w, screen_image_h, flags);
+
+    if (TXT_SDLWindow == NULL)
+        return 0;
+
+    renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_PRESENTVSYNC);
+
+    if (renderer == NULL)
+        renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_SOFTWARE);
+
+    if (renderer == NULL)
+        return 0;
+
+    // Special handling for OS X retina display. If we successfully set the
+    // highdpi flag, check the output size for the screen renderer. If we get
+    // the 2x doubled size we expect from a retina display, use the large font
+    // for drawing the screen.
+    if ((SDL_GetWindowFlags(TXT_SDLWindow) & SDL_WINDOW_ALLOW_HIGHDPI) != 0)
+    {
+        int render_w, render_h;
+
+        if (SDL_GetRendererOutputSize(renderer, &render_w, &render_h) == 0
+         && render_w >= TXT_SCREEN_W * large_font.w
+         && render_h >= TXT_SCREEN_H * large_font.h)
+        {
+            font = &large_font;
+            // Note that we deliberately do not update screen_image_{w,h}
+            // since these are the dimensions of textscreen image in screen
+            // coordinates, not pixels.
+        }
+    }
+
+    // Failed to initialize for high dpi (retina display) rendering? If so
+    // then use the normal resolution font instead.
+    if (font == &highdpi_font)
+    {
+        font = &normal_font;
+    }
+
+    // Instead, we draw everything into an intermediate 8-bit surface
+    // the same dimensions as the screen. SDL then takes care of all the
+    // 8->32 bit (or whatever depth) color conversions for us.
+    screenbuffer = SDL_CreateRGBSurface(0,
+                                        TXT_SCREEN_W * font->w,
+                                        TXT_SCREEN_H * font->h,
+                                        8, 0, 0, 0, 0);
+
+    SDL_LockSurface(screenbuffer);
+    SDL_SetPaletteColors(screenbuffer->format->palette, ega_colors, 0, 16);
+    SDL_UnlockSurface(screenbuffer);
+
+    screendata = malloc(TXT_SCREEN_W * TXT_SCREEN_H * 2);
+    memset(screendata, 0, TXT_SCREEN_W * TXT_SCREEN_H * 2);
+
+    return 1;
+}
+
+void TXT_Shutdown(void)
+{
+    free(screendata);
+    screendata = NULL;
+    SDL_FreeSurface(screenbuffer);
+    screenbuffer = NULL;
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(TXT_SDLWindow);
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+}
+
+void TXT_SetColor(txt_color_t color, int r, int g, int b)
+{
+    SDL_Color c = {r, g, b, 0xff};
+
+    SDL_LockSurface(screenbuffer);
+    SDL_SetPaletteColors(screenbuffer->format->palette, &c, color, 1);
+    SDL_UnlockSurface(screenbuffer);
+}
+
+unsigned char *TXT_GetScreenData(void)
+{
+    return screendata;
+}
+
+static inline void UpdateCharacter(int x, int y)
+{
+    unsigned char character;
+    const uint8_t *p;
+    unsigned char *s, *s1;
+    unsigned int bit;
+    int bg, fg;
+    unsigned int x1, y1;
+
+    p = &screendata[(y * TXT_SCREEN_W + x) * 2];
+    character = p[0];
+
+    fg = p[1] & 0xf;
+    bg = (p[1] >> 4) & 0xf;
+
+    if (bg & 0x8)
+    {
+        // blinking
+
+        bg &= ~0x8;
+
+        if (((SDL_GetTicks() / BLINK_PERIOD) % 2) == 0)
+        {
+            fg = bg;
+        }
+    }
+
+    // How many bytes per line?
+    p = &font->data[(character * font->w * font->h) / 8];
+    bit = 0;
+
+    s = ((unsigned char *) screenbuffer->pixels)
+      + (y * font->h * screenbuffer->pitch)
+      + (x * font->w);
+
+    for (y1=0; y1<font->h; ++y1)
+    {
+        s1 = s;
+
+        for (x1=0; x1<font->w; ++x1)
+        {
+            if (*p & (1 << bit))
+            {
+                *s1++ = fg;
+            }
+            else
+            {
+                *s1++ = bg;
+            }
+
+            ++bit;
+            if (bit == 8)
+            {
+                ++p;
+                bit = 0;
+            }
+        }
+
+        s += screenbuffer->pitch;
+    }
+}
+
+static int LimitToRange(int val, int min, int max)
+{
+    if (val < min)
+    {
+        return min;
+    }
+    else if (val > max)
+    {
+        return max;
+    }
+    else
+    {
+        return val;
+    }
+}
+
+static void GetDestRect(SDL_Rect *rect)
+{
+    int w, h;
+
+    SDL_GetRendererOutputSize(renderer, &w, &h);
+    rect->x = (w - screenbuffer->w) / 2;
+    rect->y = (h - screenbuffer->h) / 2;
+    rect->w = screenbuffer->w;
+    rect->h = screenbuffer->h;
+}
+
+void TXT_UpdateScreenArea(int x, int y, int w, int h)
+{
+    SDL_Texture *screentx;
+    SDL_Rect rect;
+    int x1, y1;
+    int x_end;
+    int y_end;
+
+    SDL_LockSurface(screenbuffer);
+
+    x_end = LimitToRange(x + w, 0, TXT_SCREEN_W);
+    y_end = LimitToRange(y + h, 0, TXT_SCREEN_H);
+    x = LimitToRange(x, 0, TXT_SCREEN_W);
+    y = LimitToRange(y, 0, TXT_SCREEN_H);
+
+    for (y1=y; y1<y_end; ++y1)
+    {
+        for (x1=x; x1<x_end; ++x1)
+        {
+            UpdateCharacter(x1, y1);
+        }
+    }
+
+    SDL_UnlockSurface(screenbuffer);
+
+    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
+
+    // TODO: This is currently creating a new texture every time we render
+    // the screen; find a more efficient way to do it.
+    screentx = SDL_CreateTextureFromSurface(renderer, screenbuffer);
+
+    SDL_RenderClear(renderer);
+    GetDestRect(&rect);
+    SDL_RenderCopy(renderer, screentx, NULL, &rect);
+    SDL_RenderPresent(renderer);
+
+    SDL_DestroyTexture(screentx);
+}
+
+void TXT_UpdateScreen(void)
+{
+    TXT_UpdateScreenArea(0, 0, TXT_SCREEN_W, TXT_SCREEN_H);
+}
+
+void TXT_GetMousePosition(int *x, int *y)
+{
+    int window_w, window_h;
+    int origin_x, origin_y;
+
+    SDL_GetMouseState(x, y);
+
+    // Translate mouse position from 'pixel' position into character position.
+    // We are working here in screen coordinates and not pixels, since this is
+    // what SDL_GetWindowSize() returns; we must calculate and subtract the
+    // origin position since we center the image within the window.
+    SDL_GetWindowSize(TXT_SDLWindow, &window_w, &window_h);
+    origin_x = (window_w - screen_image_w) / 2;
+    origin_y = (window_h - screen_image_h) / 2;
+    *x = ((*x - origin_x) * TXT_SCREEN_W) / screen_image_w;
+    *y = ((*y - origin_y) * TXT_SCREEN_H) / screen_image_h;
+
+    if (*x < 0)
+    {
+        *x = 0;
+    }
+    else if (*x >= TXT_SCREEN_W)
+    {
+        *x = TXT_SCREEN_W - 1;
+    }
+    if (*y < 0)
+    {
+        *y = 0;
+    }
+    else if (*y >= TXT_SCREEN_H)
+    {
+        *y = TXT_SCREEN_H - 1;
+    }
+}
+
+//
+// Translates the SDL key
+//
+
+// XXX: duplicate from doomtype.h
+#define arrlen(array) (sizeof(array) / sizeof(*array))
+
+static int TranslateScancode(SDL_Scancode scancode)
+{
+    switch (scancode)
+    {
+        case SDL_SCANCODE_LCTRL:
+        case SDL_SCANCODE_RCTRL:
+            return KEY_RCTRL;
+
+        case SDL_SCANCODE_LSHIFT:
+        case SDL_SCANCODE_RSHIFT:
+            return KEY_RSHIFT;
+
+        case SDL_SCANCODE_LALT:
+            return KEY_LALT;
+
+        case SDL_SCANCODE_RALT:
+            return KEY_RALT;
+
+        default:
+            if (scancode < arrlen(scancode_translate_table))
+            {
+                return scancode_translate_table[scancode];
+            }
+            else
+            {
+                return 0;
+            }
+    }
+}
+
+static int TranslateKeysym(const SDL_Keysym *sym)
+{
+    int translated;
+
+    // We cheat here and make use of TranslateScancode. The range of keys
+    // associated with printable characters is pretty contiguous, so if it's
+    // inside that range we want the localized version of the key instead.
+    translated = TranslateScancode(sym->scancode);
+
+    if (translated >= 0x20 && translated < 0x7f)
+    {
+        return sym->sym;
+    }
+    else
+    {
+        return translated;
+    }
+}
+
+// Convert an SDL button index to textscreen button index.
+//
+// Note special cases because 2 == mid in SDL, 3 == mid in textscreen/setup
+
+static int SDLButtonToTXTButton(int button)
+{
+    switch (button)
+    {
+        case SDL_BUTTON_LEFT:
+            return TXT_MOUSE_LEFT;
+        case SDL_BUTTON_RIGHT:
+            return TXT_MOUSE_RIGHT;
+        case SDL_BUTTON_MIDDLE:
+            return TXT_MOUSE_MIDDLE;
+        default:
+            return TXT_MOUSE_BASE + button + 1;
+    }
+}
+
+// Convert an SDL wheel motion to a textscreen button index.
+
+static int SDLWheelToTXTButton(const SDL_MouseWheelEvent *wheel)
+{
+    if (wheel->y <= 0)
+    {
+        return TXT_MOUSE_SCROLLDOWN;
+    }
+    else
+    {
+        return TXT_MOUSE_SCROLLUP;
+    }
+}
+
+static int MouseHasMoved(void)
+{
+    static int last_x = 0, last_y = 0;
+    int x, y;
+
+    TXT_GetMousePosition(&x, &y);
+
+    if (x != last_x || y != last_y)
+    {
+        last_x = x; last_y = y;
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+signed int TXT_GetChar(void)
+{
+    SDL_Event ev;
+
+    while (SDL_PollEvent(&ev))
+    {
+        // If there is an event callback, allow it to intercept this
+        // event.
+
+        if (event_callback != NULL)
+        {
+            if (event_callback(&ev, event_callback_data))
+            {
+                continue;
+            }
+        }
+
+        // Process the event.
+
+        switch (ev.type)
+        {
+            case SDL_MOUSEBUTTONDOWN:
+                if (ev.button.button < TXT_MAX_MOUSE_BUTTONS)
+                {
+                    return SDLButtonToTXTButton(ev.button.button);
+                }
+                break;
+
+            case SDL_MOUSEWHEEL:
+                return SDLWheelToTXTButton(&ev.wheel);
+
+            case SDL_KEYDOWN:
+                switch (input_mode)
+                {
+                    case TXT_INPUT_RAW:
+                        return TranslateScancode(ev.key.keysym.scancode);
+                    case TXT_INPUT_NORMAL:
+                        return TranslateKeysym(&ev.key.keysym);
+                    case TXT_INPUT_TEXT:
+                        // We ignore key inputs in this mode, except for a
+                        // few special cases needed during text input:
+                        if (ev.key.keysym.sym == SDLK_ESCAPE
+                         || ev.key.keysym.sym == SDLK_BACKSPACE
+                         || ev.key.keysym.sym == SDLK_RETURN)
+                        {
+                            return TranslateKeysym(&ev.key.keysym);
+                        }
+                        break;
+                }
+                break;
+
+            case SDL_TEXTINPUT:
+                if (input_mode == TXT_INPUT_TEXT)
+                {
+                    // TODO: Support input of more than just the first char?
+                    const char *p = ev.text.text;
+                    int result = TXT_DecodeUTF8(&p);
+                    // 0-127 is ASCII, but we map non-ASCII Unicode chars into
+                    // a higher range to avoid conflicts with special keys.
+                    return TXT_UNICODE_TO_KEY(result);
+                }
+                break;
+
+            case SDL_QUIT:
+                // Quit = escape
+                return 27;
+
+            case SDL_MOUSEMOTION:
+                if (MouseHasMoved())
+                {
+                    return 0;
+                }
+
+            default:
+                break;
+        }
+    }
+
+    return -1;
+}
+
+int TXT_GetModifierState(txt_modifier_t mod)
+{
+    SDL_Keymod state;
+
+    state = SDL_GetModState();
+
+    switch (mod)
+    {
+        case TXT_MOD_SHIFT:
+            return (state & KMOD_SHIFT) != 0;
+        case TXT_MOD_CTRL:
+            return (state & KMOD_CTRL) != 0;
+        case TXT_MOD_ALT:
+            return (state & KMOD_ALT) != 0;
+        default:
+            return 0;
+    }
+}
+
+int TXT_UnicodeCharacter(unsigned int c)
+{
+    unsigned int i;
+
+    // Check the code page mapping to see if this character maps
+    // to anything.
+
+    for (i = 0; i < arrlen(code_page_to_unicode); ++i)
+    {
+        if (code_page_to_unicode[i] == c)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+// Returns true if the given UTF8 key name is printable to the screen.
+static int PrintableName(const char *s)
+{
+    const char *p;
+    unsigned int c;
+
+    p = s;
+    while (*p != '\0')
+    {
+        c = TXT_DecodeUTF8(&p);
+        if (TXT_UnicodeCharacter(c) < 0)
+        {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+static const char *NameForKey(int key)
+{
+    const char *result;
+    int i;
+
+    // Overrides purely for aesthetical reasons, so that default
+    // window accelerator keys match those of setup.exe.
+    switch (key)
+    {
+        case KEY_ESCAPE: return "ESC";
+        case KEY_ENTER:  return "ENTER";
+        default:
+            break;
+    }
+
+    // This key presumably maps to a scan code that is listed in the
+    // translation table. Find which mapping and once we have a scancode,
+    // we can convert it into a virtual key, then a string via SDL.
+    for (i = 0; i < arrlen(scancode_translate_table); ++i)
+    {
+        if (scancode_translate_table[i] == key)
+        {
+            result = SDL_GetKeyName(SDL_GetKeyFromScancode(i));
+            if (TXT_UTF8_Strlen(result) > 6 || !PrintableName(result))
+            {
+                break;
+            }
+            return result;
+        }
+    }
+
+    // Use US English fallback names, if the localized name is too long,
+    // not found in the scancode table, or contains unprintable chars
+    // (non-extended ASCII character set):
+    for (i = 0; i < arrlen(key_names); ++i)
+    {
+        if (key_names[i].key == key)
+        {
+            return key_names[i].name;
+        }
+    }
+
+    return NULL;
+}
+
+void TXT_GetKeyDescription(int key, char *buf, size_t buf_len)
+{
+    const char *keyname;
+    int i;
+
+    keyname = NameForKey(key);
+
+    if (keyname != NULL)
+    {
+        TXT_StringCopy(buf, keyname, buf_len);
+
+        // Key description should be all-uppercase to match setup.exe.
+        for (i = 0; buf[i] != '\0'; ++i)
+        {
+            buf[i] = toupper(buf[i]);
+        }
+    }
+    else
+    {
+        TXT_snprintf(buf, buf_len, "??%i", key);
+    }
+}
+
+// Searches the desktop screen buffer to determine whether there are any
+// blinking characters.
+
+int TXT_ScreenHasBlinkingChars(void)
+{
+    int x, y;
+    unsigned char *p;
+
+    // Check all characters in screen buffer
+
+    for (y=0; y<TXT_SCREEN_H; ++y)
+    {
+        for (x=0; x<TXT_SCREEN_W; ++x) 
+        {
+            p = &screendata[(y * TXT_SCREEN_W + x) * 2];
+
+            if (p[1] & 0x80)
+            {
+                // This character is blinking
+
+                return 1;
+            }
+        }
+    }
+
+    // None found
+
+    return 0;
+}
+
+// Sleeps until an event is received, the screen needs to be redrawn, 
+// or until timeout expires (if timeout != 0)
+
+void TXT_Sleep(int timeout)
+{
+    unsigned int start_time;
+
+    if (TXT_ScreenHasBlinkingChars())
+    {
+        int time_to_next_blink;
+
+        time_to_next_blink = BLINK_PERIOD - (SDL_GetTicks() % BLINK_PERIOD);
+
+        // There are blinking characters on the screen, so we 
+        // must time out after a while
+       
+        if (timeout == 0 || timeout > time_to_next_blink)
+        {
+            // Add one so it is always positive
+
+            timeout = time_to_next_blink + 1;
+        }
+    }
+
+    if (timeout == 0)
+    {
+        // We can just wait forever until an event occurs
+
+        SDL_WaitEvent(NULL);
+    }
+    else
+    {
+        // Sit in a busy loop until the timeout expires or we have to
+        // redraw the blinking screen
+
+        start_time = SDL_GetTicks();
+
+        while (SDL_GetTicks() < start_time + timeout)
+        {
+            if (SDL_PollEvent(NULL) != 0)
+            {
+                // Received an event, so stop waiting
+
+                break;
+            }
+
+            // Don't hog the CPU
+
+            SDL_Delay(1);
+        }
+    }
+}
+
+void TXT_SetInputMode(txt_input_mode_t mode)
+{
+    if (mode == TXT_INPUT_TEXT && !SDL_IsTextInputActive())
+    {
+        SDL_StartTextInput();
+    }
+    else if (SDL_IsTextInputActive() && mode != TXT_INPUT_TEXT)
+    {
+        SDL_StopTextInput();
+    }
+
+    input_mode = mode;
+}
+
+void TXT_SetWindowTitle(const char *title)
+{
+    SDL_SetWindowTitle(TXT_SDLWindow, title);
+}
+
+void TXT_SDL_SetEventCallback(TxtSDLEventCallbackFunc callback, void *user_data)
+{
+    event_callback = callback;
+    event_callback_data = user_data;
+}
+
+// Safe string functions.
+
+void TXT_StringCopy(char *dest, const char *src, size_t dest_len)
+{
+    if (dest_len < 1)
+    {
+        return;
+    }
+
+    dest[dest_len - 1] = '\0';
+    strncpy(dest, src, dest_len - 1);
+}
+
+void TXT_StringConcat(char *dest, const char *src, size_t dest_len)
+{
+    size_t offset;
+
+    offset = strlen(dest);
+    if (offset > dest_len)
+    {
+        offset = dest_len;
+    }
+
+    TXT_StringCopy(dest + offset, src, dest_len - offset);
+}
+
+// On Windows, vsnprintf() is _vsnprintf().
+#ifdef _WIN32
+#if _MSC_VER < 1400 /* not needed for Visual Studio 2008 */
+#define vsnprintf _vsnprintf
+#endif
+#endif
+
+// Safe, portable vsnprintf().
+int TXT_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args)
+{
+    int result;
+
+    if (buf_len < 1)
+    {
+        return 0;
+    }
+
+    // Windows (and other OSes?) has a vsnprintf() that doesn't always
+    // append a trailing \0. So we must do it, and write into a buffer
+    // that is one byte shorter; otherwise this function is unsafe.
+    result = vsnprintf(buf, buf_len, s, args);
+
+    // If truncated, change the final char in the buffer to a \0.
+    // A negative result indicates a truncated buffer on Windows.
+    if (result < 0 || result >= buf_len)
+    {
+        buf[buf_len - 1] = '\0';
+        result = buf_len - 1;
+    }
+
+    return result;
+}
+
+// Safe, portable snprintf().
+int TXT_snprintf(char *buf, size_t buf_len, const char *s, ...)
+{
+    va_list args;
+    int result;
+    va_start(args, s);
+    result = TXT_vsnprintf(buf, buf_len, s, args);
+    va_end(args);
+    return result;
+}
+
diff --git a/games/NXDoom/textscreen/txt_sdl.h b/games/NXDoom/textscreen/txt_sdl.h
new file mode 100644
index 000000000..579905510
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_sdl.h
@@ -0,0 +1,45 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+//
+// Text mode emulation in SDL
+//
+
+#ifndef TXT_SDL_H
+#define TXT_SDL_H
+
+// The textscreen API itself doesn't need SDL; however, SDL needs its
+// headers included where main() is defined.
+
+#include "SDL.h"
+
+// Event callback function type: a function of this type can be used
+// to intercept events in the textscreen event processing loop.  
+// Returning 1 will cause the event to be eaten; the textscreen code
+// will not see it.
+
+typedef int (*TxtSDLEventCallbackFunc)(SDL_Event *event, void *user_data);
+
+// Set a callback function to call in the SDL event loop.  Useful for
+// intercepting events.  Pass callback=NULL to clear an existing
+// callback function.
+// user_data is a void pointer to be passed to the callback function.
+
+void TXT_SDL_SetEventCallback(TxtSDLEventCallbackFunc callback, void *user_data);
+
+
+extern SDL_Window *TXT_SDLWindow;
+
+
+#endif /* #ifndef TXT_SDL_H */
+
diff --git a/games/NXDoom/textscreen/txt_separator.c b/games/NXDoom/textscreen/txt_separator.c
new file mode 100644
index 000000000..1f30fc648
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_separator.c
@@ -0,0 +1,114 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_separator.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+static void TXT_SeparatorSizeCalc(TXT_UNCAST_ARG(separator))
+{
+    TXT_CAST_ARG(txt_separator_t, separator);
+
+    if (separator->label != NULL)
+    {
+        // Minimum width is the string length + two spaces for padding
+
+        separator->widget.w = TXT_UTF8_Strlen(separator->label) + 2;
+    }
+    else
+    {
+        separator->widget.w = 0;
+    }
+
+    separator->widget.h = 1;
+}
+
+static void TXT_SeparatorDrawer(TXT_UNCAST_ARG(separator))
+{
+    TXT_CAST_ARG(txt_separator_t, separator);
+    int x, y;
+    int w;
+
+    w = separator->widget.w;
+
+    TXT_GetXY(&x, &y);
+
+    // Draw separator.  Go back one character and draw two extra
+    // to overlap the window borders.
+
+    TXT_DrawSeparator(x-2, y, w + 4);
+
+    if (separator->label != NULL)
+    {
+        TXT_GotoXY(x, y);
+
+        TXT_FGColor(TXT_COLOR_BRIGHT_GREEN);
+        TXT_DrawString(" ");
+        TXT_DrawString(separator->label);
+        TXT_DrawString(" ");
+    }
+}
+
+static void TXT_SeparatorDestructor(TXT_UNCAST_ARG(separator))
+{
+    TXT_CAST_ARG(txt_separator_t, separator);
+
+    free(separator->label);
+}
+
+void TXT_SetSeparatorLabel(txt_separator_t *separator, const char *label)
+{
+    free(separator->label);
+
+    if (label != NULL)
+    {
+        separator->label = strdup(label);
+    }
+    else
+    {
+        separator->label = NULL;
+    }
+}
+
+txt_widget_class_t txt_separator_class =
+{
+    TXT_NeverSelectable,
+    TXT_SeparatorSizeCalc,
+    TXT_SeparatorDrawer,
+    NULL,
+    TXT_SeparatorDestructor,
+    NULL,
+    NULL,
+};
+
+txt_separator_t *TXT_NewSeparator(const char *label)
+{
+    txt_separator_t *separator;
+
+    separator = malloc(sizeof(txt_separator_t));
+
+    TXT_InitWidget(separator, &txt_separator_class);
+
+    separator->label = NULL;
+    TXT_SetSeparatorLabel(separator, label);
+
+    return separator;
+}
+
diff --git a/games/NXDoom/textscreen/txt_separator.h b/games/NXDoom/textscreen/txt_separator.h
new file mode 100644
index 000000000..665c5a346
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_separator.h
@@ -0,0 +1,65 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_SEPARATOR_H
+#define TXT_SEPARATOR_H
+
+/**
+ * @file txt_separator.h
+ *
+ * Horizontal separator widget.
+ */
+
+/**
+ * Horizontal separator.
+ *
+ * A horizontal separator appears as a horizontal line divider across
+ * the length of the window in which it is added.  An optional label
+ * allows the separator to be used as a section divider for grouping
+ * related controls.
+ */
+
+typedef struct txt_separator_s txt_separator_t;
+
+#include "txt_widget.h"
+
+struct txt_separator_s
+{
+    txt_widget_t widget;
+    char *label;
+};
+
+extern txt_widget_class_t txt_separator_class;
+
+/**
+ * Create a new horizontal separator widget.
+ *
+ * @param label         Label to display on the separator (UTF-8 format).
+ *                      If this is set to NULL, no label is displayed.
+ * @return              The new separator widget.
+ */
+
+txt_separator_t *TXT_NewSeparator(const char *label);
+
+/**
+ * Change the label on a separator.
+ *
+ * @param separator     The separator.
+ * @param label         The new label (UTF-8 format).
+ */
+
+void TXT_SetSeparatorLabel(txt_separator_t *separator, const char *label);
+
+#endif /* #ifndef TXT_SEPARATOR_H */
+
diff --git a/games/NXDoom/textscreen/txt_spinctrl.c b/games/NXDoom/textscreen/txt_spinctrl.c
new file mode 100644
index 000000000..2a93e96ee
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_spinctrl.c
@@ -0,0 +1,426 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "doomkeys.h"
+
+#include "txt_spinctrl.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+// Generate the format string to be used for displaying floats
+
+static void FloatFormatString(float step, char *buf, size_t buf_len)
+{
+    int precision;
+
+    precision = (int) ceil(-log(step) / log(10));
+
+    if (precision > 0)
+    {
+        TXT_snprintf(buf, buf_len, "%%.%if", precision);
+    }
+    else
+    {
+        TXT_StringCopy(buf, "%.1f", buf_len);
+    }
+}
+
+// Number of characters needed to represent a character 
+
+static unsigned int IntWidth(int val)
+{
+    char buf[25];
+
+    TXT_snprintf(buf, sizeof(buf), "%i", val);
+
+    return strlen(buf);
+}
+
+static unsigned int FloatWidth(float val, float step)
+{
+    unsigned int precision;
+    unsigned int result;
+
+    // Calculate the width of the int value
+
+    result = IntWidth((int) val);
+
+    // Add a decimal part if the precision specifies it
+
+    precision = (unsigned int) ceil(-log(step) / log(10));
+
+    if (precision > 0)
+    {
+        result += precision + 1;
+    }    
+
+    return result;
+}
+
+// Returns the minimum width of the input box
+
+static unsigned int SpinControlWidth(txt_spincontrol_t *spincontrol)
+{
+    unsigned int minw, maxw;
+
+    switch (spincontrol->type)
+    {
+        case TXT_SPINCONTROL_FLOAT:
+            minw = FloatWidth(spincontrol->min.f, spincontrol->step.f);
+            maxw = FloatWidth(spincontrol->max.f, spincontrol->step.f);
+            break;
+
+        default:
+        case TXT_SPINCONTROL_INT:
+            minw = IntWidth(spincontrol->min.i);
+            maxw = IntWidth(spincontrol->max.i);
+            break;
+
+    }
+    
+    // Choose the wider of the two values.  Add one so that there is always
+    // space for the cursor when editing.
+
+    if (minw > maxw)
+    {
+        return minw;
+    }
+    else
+    {
+        return maxw;
+    }
+}
+
+static void TXT_SpinControlSizeCalc(TXT_UNCAST_ARG(spincontrol))
+{
+    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+    spincontrol->widget.w = SpinControlWidth(spincontrol) + 5;
+    spincontrol->widget.h = 1;
+}
+
+static void SetBuffer(txt_spincontrol_t *spincontrol)
+{
+    char format[25];
+
+    switch (spincontrol->type)
+    {
+        case TXT_SPINCONTROL_INT:
+            TXT_snprintf(spincontrol->buffer, spincontrol->buffer_len,
+                         "%i", spincontrol->value->i);
+            break;
+
+        case TXT_SPINCONTROL_FLOAT:
+            FloatFormatString(spincontrol->step.f, format, sizeof(format));
+            TXT_snprintf(spincontrol->buffer, spincontrol->buffer_len,
+                         format, spincontrol->value->f);
+            break;
+    }
+}
+
+static void TXT_SpinControlDrawer(TXT_UNCAST_ARG(spincontrol))
+{
+    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+    unsigned int i;
+    unsigned int padding;
+    txt_saved_colors_t colors;
+    int bw;
+    int focused;
+
+    focused = spincontrol->widget.focused;
+
+    TXT_SaveColors(&colors);
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+    TXT_DrawCodePageString("\x1b ");
+
+    TXT_RestoreColors(&colors);
+
+    // Choose background color
+
+    if (focused && spincontrol->editing)
+    {
+        TXT_BGColor(TXT_COLOR_BLACK, 0);
+    }
+    else
+    {
+        TXT_SetWidgetBG(spincontrol);
+    }
+
+    if (!spincontrol->editing)
+    {
+        SetBuffer(spincontrol);
+    }
+
+    i = 0;
+
+    bw = TXT_UTF8_Strlen(spincontrol->buffer);
+    padding = spincontrol->widget.w - bw - 4;
+
+    while (i < padding)
+    {
+        TXT_DrawString(" ");
+        ++i;
+    }
+
+    TXT_DrawString(spincontrol->buffer);
+    i += bw;
+
+    while (i < spincontrol->widget.w - 4)
+    {
+        TXT_DrawString(" ");
+        ++i;
+    }
+
+    TXT_RestoreColors(&colors);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+    TXT_DrawCodePageString(" \x1a");
+}
+
+static void TXT_SpinControlDestructor(TXT_UNCAST_ARG(spincontrol))
+{
+    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+    free(spincontrol->buffer);
+}
+
+static void AddCharacter(txt_spincontrol_t *spincontrol, int key)
+{
+    if (TXT_UTF8_Strlen(spincontrol->buffer) < SpinControlWidth(spincontrol)
+     && strlen(spincontrol->buffer) < spincontrol->buffer_len - 2)
+    {
+        spincontrol->buffer[strlen(spincontrol->buffer) + 1] = '\0';
+        spincontrol->buffer[strlen(spincontrol->buffer)] = key;
+    }
+}
+
+static void Backspace(txt_spincontrol_t *spincontrol)
+{
+    if (TXT_UTF8_Strlen(spincontrol->buffer) > 0)
+    {
+        spincontrol->buffer[strlen(spincontrol->buffer) - 1] = '\0';
+    }
+}
+
+static void EnforceLimits(txt_spincontrol_t *spincontrol)
+{
+    switch (spincontrol->type)
+    {
+        case TXT_SPINCONTROL_INT:
+            if (spincontrol->value->i > spincontrol->max.i)
+                spincontrol->value->i = spincontrol->max.i;
+            else if (spincontrol->value->i < spincontrol->min.i)
+                spincontrol->value->i = spincontrol->min.i;
+            break;
+
+        case TXT_SPINCONTROL_FLOAT:
+            if (spincontrol->value->f > spincontrol->max.f)
+                spincontrol->value->f = spincontrol->max.f;
+            else if (spincontrol->value->f < spincontrol->min.f)
+                spincontrol->value->f = spincontrol->min.f;
+            break;
+    }
+}
+
+static void FinishEditing(txt_spincontrol_t *spincontrol)
+{
+    switch (spincontrol->type)
+    {
+        case TXT_SPINCONTROL_INT:
+            spincontrol->value->i = atoi(spincontrol->buffer);
+            break;
+
+        case TXT_SPINCONTROL_FLOAT:
+            spincontrol->value->f = (float) atof(spincontrol->buffer);
+            break;
+    }
+
+    spincontrol->editing = 0;
+    EnforceLimits(spincontrol);
+}
+
+static int TXT_SpinControlKeyPress(TXT_UNCAST_ARG(spincontrol), int key)
+{
+    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+    // Enter to enter edit mode
+
+    if (spincontrol->editing)
+    {
+        if (key == KEY_ENTER)
+        {
+            FinishEditing(spincontrol);
+            return 1;
+        }
+
+        if (key == KEY_ESCAPE)
+        {
+            // Abort without saving value
+            spincontrol->editing = 0;
+            return 1;
+        }
+
+        if (isdigit(key) || key == '-' || key == '.')
+        {
+            AddCharacter(spincontrol, key);
+            return 1;
+        }
+
+        if (key == KEY_BACKSPACE)
+        {
+            Backspace(spincontrol);
+            return 1;
+        }
+    }
+    else
+    {
+        // Non-editing mode
+
+        if (key == KEY_ENTER)
+        {
+            spincontrol->editing = 1;
+            TXT_StringCopy(spincontrol->buffer, "", spincontrol->buffer_len);
+            return 1;
+        }
+        if (key == KEY_LEFTARROW)
+        {
+            switch (spincontrol->type)
+            {
+                case TXT_SPINCONTROL_INT:
+                    spincontrol->value->i -= spincontrol->step.i;
+                    break;
+
+                case TXT_SPINCONTROL_FLOAT:
+                    spincontrol->value->f -= spincontrol->step.f;
+                    break;
+            }
+
+            EnforceLimits(spincontrol);
+
+            return 1;
+        }
+        
+        if (key == KEY_RIGHTARROW)
+        {
+            switch (spincontrol->type)
+            {
+                case TXT_SPINCONTROL_INT:
+                    spincontrol->value->i += spincontrol->step.i;
+                    break;
+
+                case TXT_SPINCONTROL_FLOAT:
+                    spincontrol->value->f += spincontrol->step.f;
+                    break;
+            }
+
+            EnforceLimits(spincontrol);
+
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static void TXT_SpinControlMousePress(TXT_UNCAST_ARG(spincontrol),
+                                   int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+    unsigned int rel_x;
+
+    rel_x = x - spincontrol->widget.x;
+
+    if (rel_x < 2)
+    {
+        TXT_SpinControlKeyPress(spincontrol, KEY_LEFTARROW);
+    }
+    else if (rel_x >= spincontrol->widget.w - 2)
+    {
+        TXT_SpinControlKeyPress(spincontrol, KEY_RIGHTARROW);
+    }
+}
+
+static void TXT_SpinControlFocused(TXT_UNCAST_ARG(spincontrol), int focused)
+{
+    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+    FinishEditing(spincontrol);
+}
+
+txt_widget_class_t txt_spincontrol_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_SpinControlSizeCalc,
+    TXT_SpinControlDrawer,
+    TXT_SpinControlKeyPress,
+    TXT_SpinControlDestructor,
+    TXT_SpinControlMousePress,
+    NULL,
+    TXT_SpinControlFocused,
+};
+
+static txt_spincontrol_t *TXT_BaseSpinControl(void)
+{
+    txt_spincontrol_t *spincontrol;
+
+    spincontrol = malloc(sizeof(txt_spincontrol_t));
+
+    TXT_InitWidget(spincontrol, &txt_spincontrol_class);
+    spincontrol->buffer_len = 25;
+    spincontrol->buffer = malloc(spincontrol->buffer_len);
+    TXT_StringCopy(spincontrol->buffer, "", spincontrol->buffer_len);
+    spincontrol->editing = 0;
+
+    return spincontrol;
+}
+
+txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max)
+{
+    txt_spincontrol_t *spincontrol;
+
+    spincontrol = TXT_BaseSpinControl();
+    spincontrol->type = TXT_SPINCONTROL_INT;
+    spincontrol->value = (void *) value;
+    spincontrol->min.i = min;
+    spincontrol->max.i = max;
+    spincontrol->step.i = 1;
+    SetBuffer(spincontrol);
+
+    return spincontrol;
+}
+
+txt_spincontrol_t *TXT_NewFloatSpinControl(float *value, float min, float max)
+{
+    txt_spincontrol_t *spincontrol;
+
+    spincontrol = TXT_BaseSpinControl();
+    spincontrol->type = TXT_SPINCONTROL_FLOAT;
+    spincontrol->value = (void *) value;
+    spincontrol->min.f = min;
+    spincontrol->max.f = max;
+    spincontrol->step.f = 0.1f;
+    SetBuffer(spincontrol);
+
+    return spincontrol;
+}
+
diff --git a/games/NXDoom/textscreen/txt_spinctrl.h b/games/NXDoom/textscreen/txt_spinctrl.h
new file mode 100644
index 000000000..855527bb5
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_spinctrl.h
@@ -0,0 +1,78 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_SPINCONTROL_H
+#define TXT_SPINCONTROL_H
+
+/**
+ * @file txt_spinctrl.h
+ *
+ * Spin control widget.
+ */
+
+/**
+ * Spin control widget.
+ *
+ * A spin control widget works as an input box that can be used to
+ * set numeric values, but also has buttons that allow its value
+ * to be increased or decreased.
+ */
+
+typedef struct txt_spincontrol_s txt_spincontrol_t;
+
+typedef enum
+{
+    TXT_SPINCONTROL_INT,
+    TXT_SPINCONTROL_FLOAT,
+} txt_spincontrol_type_t;
+
+#include "txt_widget.h"
+
+struct txt_spincontrol_s
+{
+    txt_widget_t widget;
+    txt_spincontrol_type_t type;
+    union { float f; int i; } min, max, *value, step; 
+    int editing;
+    char *buffer;
+    size_t buffer_len;
+};
+
+/**
+ * Create a new spin control widget tracking an integer value.
+ *
+ * @param value        Pointer to the variable containing the value
+ *                     displayed in the widget.
+ * @param min          Minimum value that may be set.
+ * @param max          Maximum value that may be set.
+ * @return             Pointer to the new spin control widget.
+ */
+
+txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max);
+
+/**
+ * Create a new spin control widget tracking a float value.
+ *
+ * @param value        Pointer to the variable containing the value
+ *                     displayed in the widget.
+ * @param min          Minimum value that may be set.
+ * @param max          Maximum value that may be set.
+ * @return             Pointer to the new spin control widget.
+ */
+
+txt_spincontrol_t *TXT_NewFloatSpinControl(float *value, float min, float max);
+
+#endif /* #ifndef TXT_SPINCONTROL_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_strut.c b/games/NXDoom/textscreen/txt_strut.c
new file mode 100644
index 000000000..4c0c76580
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_strut.c
@@ -0,0 +1,72 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_strut.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_window.h"
+
+static void TXT_StrutSizeCalc(TXT_UNCAST_ARG(strut))
+{
+    TXT_CAST_ARG(txt_strut_t, strut);
+
+    // Minimum width is the string length + two spaces for padding
+
+    strut->widget.w = strut->width;
+    strut->widget.h = strut->height;
+}
+
+static void TXT_StrutDrawer(TXT_UNCAST_ARG(strut))
+{
+    // Nothing is drawn for a strut.
+}
+
+static void TXT_StrutDestructor(TXT_UNCAST_ARG(strut))
+{
+}
+
+static int TXT_StrutKeyPress(TXT_UNCAST_ARG(strut), int key)
+{
+    return 0;
+}
+
+txt_widget_class_t txt_strut_class =
+{
+    TXT_NeverSelectable,
+    TXT_StrutSizeCalc,
+    TXT_StrutDrawer,
+    TXT_StrutKeyPress,
+    TXT_StrutDestructor,
+    NULL,
+    NULL,
+};
+
+txt_strut_t *TXT_NewStrut(int width, int height)
+{
+    txt_strut_t *strut;
+
+    strut = malloc(sizeof(txt_strut_t));
+
+    TXT_InitWidget(strut, &txt_strut_class);
+    strut->width = width;
+    strut->height = height;
+
+    return strut;
+}
+
diff --git a/games/NXDoom/textscreen/txt_strut.h b/games/NXDoom/textscreen/txt_strut.h
new file mode 100644
index 000000000..f93923552
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_strut.h
@@ -0,0 +1,54 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_STRUT_H
+#define TXT_STRUT_H
+
+/**
+ * @file txt_strut.h
+ *
+ * Strut widget.
+ */
+
+/**
+ * Strut widget.
+ *
+ * A strut is a widget that takes up a fixed amount of space.  It can
+ * be visualised as a transparent box.  Struts are used to provide
+ * spacing between widgets.
+ */
+
+typedef struct txt_strut_s txt_strut_t;
+
+#include "txt_widget.h"
+
+struct txt_strut_s
+{
+    txt_widget_t widget;
+    int width;
+    int height;
+};
+
+/**
+ * Create a new strut.
+ *
+ * @param width      Width of the strut, in characters.
+ * @param height     Height of the strut, in characters.
+ */
+
+txt_strut_t *TXT_NewStrut(int width, int height);
+
+#endif /* #ifndef TXT_STRUT_H */
+
+
diff --git a/games/NXDoom/textscreen/txt_table.c b/games/NXDoom/textscreen/txt_table.c
new file mode 100644
index 000000000..c14da47eb
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_table.c
@@ -0,0 +1,1244 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_desktop.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_separator.h"
+#include "txt_strut.h"
+#include "txt_table.h"
+
+txt_widget_t txt_table_overflow_right;
+txt_widget_t txt_table_overflow_down;
+txt_widget_t txt_table_eol;
+txt_widget_t txt_table_empty;
+
+// Returns true if the given widget in the table's widgets[] array refers
+// to an actual widget - not NULL, or one of the special overflow pointers.
+static int IsActualWidget(txt_widget_t *widget)
+{
+    return widget != NULL
+        && widget != &txt_table_overflow_right
+        && widget != &txt_table_overflow_down;
+}
+
+// Remove all entries from a table
+
+void TXT_ClearTable(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    int i;
+
+    // Free all widgets
+    // Skip over the first (num_columns) widgets in the array, as these
+    // are the column struts used to control column width
+
+    for (i=table->columns; i<table->num_widgets; ++i)
+    {
+        if (IsActualWidget(table->widgets[i]))
+        {
+            TXT_DestroyWidget(table->widgets[i]);
+        }
+    }
+
+    // Shrink the table to just the column strut widgets
+
+    table->num_widgets = table->columns;
+}
+
+static void TXT_TableDestructor(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+
+    TXT_ClearTable(table);
+}
+
+static int TableRows(txt_table_t *table)
+{
+    return (table->num_widgets + table->columns - 1) / table->columns;
+}
+
+// Most widgets occupy just one cell of a table, but if the special
+// overflow constants are used, they can occupy multiple cells.
+// This function figures out for a widget in a given cell, which
+// cells it should actually occupy (always a rectangle).
+static void CellOverflowedSize(txt_table_t *table, int x, int y,
+                               int *w, int *h)
+{
+    txt_widget_t *widget;
+    int x1, y1;
+
+    if (!IsActualWidget(table->widgets[y * table->columns + x]))
+    {
+        *w = 0; *h = 0;
+        return;
+    }
+
+    *w = table->columns - x;
+    *h = 0;
+    for (y1 = y; y1 < TableRows(table); ++y1)
+    {
+        // Every overflow cell must point to either (x, y) or another
+        // overflow cell. This means the first in every row must be
+        // txt_table_overflow_down.
+
+        if (y1 * table->columns + x >= table->num_widgets)
+        {
+            break;
+        }
+
+        widget = table->widgets[y1 * table->columns + x];
+
+        if (y1 != y && widget != &txt_table_overflow_down)
+        {
+            break;
+        }
+
+        for (x1 = x + 1; x1 < x + *w; ++x1)
+        {
+            if (y1 * table->columns + x1 >= table->num_widgets)
+            {
+                break;
+            }
+
+            // Can be either type of overflow, except on the first row.
+            // Otherwise we impose a limit on the width.
+            widget = table->widgets[y1 * table->columns + x1];
+            if (widget != &txt_table_overflow_right
+             && (widget != &txt_table_overflow_down || y1 == y))
+            {
+                *w = x1 - x;
+                break;
+            }
+        }
+
+        ++*h;
+    }
+}
+
+static int IsOverflowingCell(txt_table_t *table, int x, int y)
+{
+    int w, h;
+    CellOverflowedSize(table, x, y, &w, &h);
+    return w > 1 || h > 1;
+}
+
+// Using the given column/row size tables, calculate the size of the given
+// widget, storing the result in (w, h).
+static void CalculateWidgetDimensions(txt_table_t *table,
+                                      int x, int y,
+                                      unsigned int *column_widths,
+                                      unsigned int *row_heights,
+                                      unsigned int *w, unsigned int *h)
+{
+    int cell_w, cell_h;
+    int x1, y1;
+
+    // Find which cells this widget occupies.
+    CellOverflowedSize(table, x, y, &cell_w, &cell_h);
+
+    // Add up column / row widths / heights to get the actual dimensions.
+    *w = 0;
+    for (x1 = x; x1 < x + cell_w; ++x1)
+    {
+        *w += column_widths[x1];
+    }
+
+    *h = 0;
+    for (y1 = y; y1 < y + cell_h; ++y1)
+    {
+        *h += row_heights[y1];
+    }
+}
+
+static void CalcRowColSizes(txt_table_t *table,
+                            unsigned int *row_heights,
+                            unsigned int *col_widths)
+{
+    int x, y;
+    int rows;
+    txt_widget_t *widget;
+
+    rows = TableRows(table);
+
+    memset(col_widths, 0, sizeof(int) * table->columns);
+
+    for (y = 0; y < rows; ++y)
+    {
+        row_heights[y] = 0;
+
+        for (x = 0; x < table->columns; ++x)
+        {
+            if (y * table->columns + x >= table->num_widgets)
+                break;
+
+            widget = table->widgets[y * table->columns + x];
+
+            if (IsActualWidget(widget))
+            {
+                TXT_CalcWidgetSize(widget);
+            }
+
+            // In the first pass we ignore overflowing cells.
+            if (IsOverflowingCell(table, x, y))
+            {
+                continue;
+            }
+
+            // NULL represents an empty spacer
+            if (IsActualWidget(widget))
+            {
+                if (widget->h > row_heights[y])
+                    row_heights[y] = widget->h;
+                if (widget->w > col_widths[x])
+                    col_widths[x] = widget->w;
+            }
+        }
+    }
+
+    // In the second pass, we go through again and process overflowing
+    // widgets, to ensure that they will fit.
+    for (y = 0; y < rows; ++y)
+    {
+        for (x = 0; x < table->columns; ++x)
+        {
+            unsigned int w, h;
+
+            if (y * table->columns + x >= table->num_widgets)
+                break;
+
+            widget = table->widgets[y * table->columns + x];
+            if (!IsActualWidget(widget))
+            {
+                continue;
+            }
+
+            // Expand column width and row heights as needed.
+            CalculateWidgetDimensions(table, x, y, col_widths, row_heights,
+                                      &w, &h);
+            if (w < widget->w)
+            {
+                col_widths[x] += widget->w - w;
+            }
+            if (h < widget->h)
+            {
+                row_heights[y] += widget->h - h;
+            }
+        }
+    }
+}
+
+static void TXT_CalcTableSize(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    unsigned int *column_widths;
+    unsigned int *row_heights;
+    int x, y;
+    int rows;
+
+    rows = TableRows(table);
+
+    row_heights = malloc(sizeof(int) * rows);
+    column_widths = malloc(sizeof(int) * table->columns);
+
+    CalcRowColSizes(table, row_heights, column_widths);
+
+    table->widget.w = 0;
+
+    for (x=0; x<table->columns; ++x)
+    {
+        table->widget.w += column_widths[x];
+    }
+
+    table->widget.h = 0;
+
+    for (y=0; y<rows; ++y)
+    {
+        table->widget.h += row_heights[y];
+    }
+
+    free(row_heights);
+    free(column_widths);
+}
+
+static void FillRowToEnd(txt_table_t *table)
+{
+    while ((table->num_widgets % table->columns) != 0)
+    {
+        TXT_AddWidget(table, &txt_table_overflow_right);
+    }
+}
+
+void TXT_AddWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    TXT_CAST_ARG(txt_widget_t, widget);
+    int is_separator;
+    int i;
+
+    // Convenience alias for NULL:
+    if (widget == &txt_table_empty)
+    {
+        widget = NULL;
+    }
+    else if (widget == &txt_table_eol)
+    {
+        FillRowToEnd(table);
+        return;
+    }
+
+    // We have special handling for the separator widget:
+    is_separator = IsActualWidget(widget)
+                && widget->widget_class == &txt_separator_class;
+
+    // If we add two separators consecutively, the new separator replaces the
+    // first. This allows us to override the "implicit" separator that is
+    // added at the top of a window when it is created.
+    if (is_separator)
+    {
+        for (i = table->num_widgets - 1; i >= 0; --i)
+        {
+            txt_widget_t *last_widget;
+            last_widget = table->widgets[i];
+
+            if (IsActualWidget(last_widget)
+             && widget->widget_class == &txt_separator_class
+             && last_widget->widget_class == &txt_separator_class)
+            {
+                table->widgets[i] = widget;
+                TXT_DestroyWidget(last_widget);
+                return;
+            }
+            else if (last_widget != &txt_table_overflow_right)
+            {
+                break;
+            }
+        }
+    }
+
+    // Separators begin on a new line.
+    if (is_separator)
+    {
+        FillRowToEnd(table);
+    }
+
+    table->widgets = realloc(table->widgets,
+                             sizeof(txt_widget_t *) * (table->num_widgets + 1));
+    table->widgets[table->num_widgets] = widget;
+    ++table->num_widgets;
+
+    // Maintain parent pointer.
+    if (IsActualWidget(widget))
+    {
+        widget->parent = &table->widget;
+    }
+
+    // Separators always take up the entire line.
+    if (is_separator)
+    {
+        FillRowToEnd(table);
+    }
+}
+
+// Add multiple widgets to a table.
+
+void TXT_AddWidgets(TXT_UNCAST_ARG(table), ...)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    va_list args;
+    txt_widget_t *widget;
+
+    va_start(args, TXT_UNCAST_ARG_NAME(table));
+
+    // Keep adding widgets until a NULL is reached.
+   
+    for (;;) 
+    {
+        widget = va_arg(args, txt_widget_t *);
+
+        if (widget == NULL)
+        {
+            break;
+        }
+
+        TXT_AddWidget(table, widget);
+    }
+
+    va_end(args);
+}
+
+static int SelectableCell(txt_table_t *table, int x, int y)
+{
+    txt_widget_t *widget;
+    int i;
+
+    if (x < 0 || x >= table->columns)
+    {
+        return 0;
+    }
+
+    i = y * table->columns + x;
+
+    if (i >= 0 && i < table->num_widgets)
+    {
+        widget = table->widgets[i];
+        return IsActualWidget(widget)
+            && TXT_SelectableWidget(widget)
+            && widget->visible;
+    }
+
+    return 0;
+}
+
+// Tries to locate a selectable widget in the given row, returning
+// the column number of the first column available or -1 if none are 
+// available in the given row.
+//
+// Starts from start_col, then searches nearby columns.
+
+static int FindSelectableColumn(txt_table_t *table, int row, int start_col)
+{
+    int x;
+
+    for (x=0; x<table->columns; ++x)
+    {
+        // Search to the right
+
+        if (SelectableCell(table, start_col + x, row))
+        {
+            return start_col + x;
+        }
+
+        // Search to the left
+
+        if (SelectableCell(table, start_col - x, row))
+        {
+            return start_col - x;
+        }
+    }
+
+    // None available
+
+    return -1;
+}
+
+// Change the selected widget.
+
+static void ChangeSelection(txt_table_t *table, int x, int y)
+{
+    txt_widget_t *cur_widget;
+    txt_widget_t *new_widget;
+    int i;
+
+    // No change?
+
+    if (x == table->selected_x && y == table->selected_y)
+    {
+        return;
+    }
+
+    // Unfocus current widget:
+
+    i = table->selected_y * table->columns + table->selected_x;
+
+    if (i < table->num_widgets)
+    {
+        cur_widget = table->widgets[i];
+
+        if (table->widget.focused && IsActualWidget(cur_widget))
+        {
+            TXT_SetWidgetFocus(cur_widget, 0);
+        }
+    }
+
+    // Focus new widget.
+
+    new_widget = table->widgets[y * table->columns + x];
+
+    table->selected_x = x;
+    table->selected_y = y;
+
+    if (table->widget.focused && new_widget != NULL)
+    {
+        TXT_SetWidgetFocus(new_widget, 1);
+    }
+}
+
+static int TXT_TableKeyPress(TXT_UNCAST_ARG(table), int key)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    int selected;
+    int rows;
+
+    rows = TableRows(table);
+
+    // Send to the currently selected widget first
+
+    selected = table->selected_y * table->columns + table->selected_x;
+
+    if (selected >= 0 && selected < table->num_widgets)
+    {
+        if (IsActualWidget(table->widgets[selected])
+         && TXT_SelectableWidget(table->widgets[selected])
+         && TXT_WidgetKeyPress(table->widgets[selected], key))
+        {
+            return 1;
+        }
+    }
+
+    if (key == KEY_TAB)
+    {
+        int dir;
+        int i;
+
+        dir = TXT_GetModifierState(TXT_MOD_SHIFT) ? -1 : 1;
+
+        // Cycle through all widgets until we find one that can be selected.
+        for (i = table->selected_y * table->columns + table->selected_x + dir;
+             i >= 0 && i < table->num_widgets;
+             i += dir)
+        {
+            if (IsActualWidget(table->widgets[i])
+             && TXT_SelectableWidget(table->widgets[i]))
+            {
+                ChangeSelection(table, i % table->columns, i / table->columns);
+                return 1;
+            }
+        }
+
+        return 0;
+    }
+
+    if (key == KEY_DOWNARROW)
+    {
+        int new_x, new_y;
+
+        // Move cursor down to the next selectable widget
+
+        for (new_y = table->selected_y + 1; new_y < rows; ++new_y)
+        {
+            new_x = FindSelectableColumn(table, new_y, table->selected_x);
+
+            if (new_x >= 0)
+            {
+                // Found a selectable widget in this column!
+
+                ChangeSelection(table, new_x, new_y);
+
+                return 1;
+            }
+        }
+    }
+
+    if (key == KEY_UPARROW)
+    {
+        int new_x, new_y;
+
+        // Move cursor up to the next selectable widget
+
+        for (new_y = table->selected_y - 1; new_y >= 0; --new_y)
+        {
+            new_x = FindSelectableColumn(table, new_y, table->selected_x);
+
+            if (new_x >= 0)
+            {
+                // Found a selectable widget in this column!
+
+                ChangeSelection(table, new_x, new_y);
+
+                return 1;
+            }
+        }
+    }
+
+    if (key == KEY_LEFTARROW)
+    {
+        int new_x;
+
+        // Move cursor left
+
+        for (new_x = table->selected_x - 1; new_x >= 0; --new_x)
+        {
+            if (SelectableCell(table, new_x, table->selected_y))
+            {
+                // Found a selectable widget!
+
+                ChangeSelection(table, new_x, table->selected_y);
+
+                return 1;
+            }
+        }
+    }
+
+    if (key == KEY_RIGHTARROW)
+    {
+        int new_x;
+
+        // Move cursor left
+
+        for (new_x = table->selected_x + 1; new_x < table->columns; ++new_x)
+        {
+            if (SelectableCell(table, new_x, table->selected_y))
+            {
+                // Found a selectable widget!
+
+                ChangeSelection(table, new_x, table->selected_y);
+
+                return 1;
+            }
+        }
+    }
+
+    return 0;
+}
+
+// Check the currently selected widget in the table is valid.
+
+static void CheckValidSelection(txt_table_t *table)
+{
+    int rows;
+    int new_x, new_y;
+
+    rows = TableRows(table);
+
+    for (new_y = table->selected_y; new_y < rows; ++new_y)
+    {
+        new_x = FindSelectableColumn(table, new_y, table->selected_x);
+
+        if (new_x >= 0)
+        {
+            // Found a selectable column.
+
+            ChangeSelection(table, new_x, new_y);
+
+            break;
+        }
+    }
+}
+
+static void LayoutCell(txt_table_t *table, int x, int y,
+                       int draw_x, int draw_y)
+{
+    txt_widget_t *widget;
+    int col_width;
+
+    widget = table->widgets[y * table->columns + x];
+
+    col_width = widget->w;
+
+    // Adjust x position based on alignment property
+
+    switch (widget->align)
+    {
+        case TXT_HORIZ_LEFT:
+            widget->w = col_width;
+            break;
+
+        case TXT_HORIZ_CENTER:
+            TXT_CalcWidgetSize(widget);
+
+            // Separators are always drawn left-aligned.
+
+            if (widget->widget_class != &txt_separator_class)
+            {
+                draw_x += (col_width - widget->w) / 2;
+            }
+
+            break;
+
+        case TXT_HORIZ_RIGHT:
+            TXT_CalcWidgetSize(widget);
+
+            if (widget->widget_class != &txt_separator_class)
+            {
+                draw_x += col_width - widget->w;
+            }
+            break;
+    }
+
+    // Set the position for this widget
+
+    widget->x = draw_x;
+    widget->y = draw_y;
+
+    // Recursively lay out any widgets contained in the widget
+
+    TXT_LayoutWidget(widget);
+}
+
+static void TXT_TableLayout(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    unsigned int *column_widths;
+    unsigned int *row_heights;
+    txt_widget_t *widget;
+    int draw_x, draw_y;
+    int x, y;
+    int i;
+    int rows;
+
+    // Work out the column widths and row heights
+
+    rows = TableRows(table);
+
+    column_widths = malloc(sizeof(int) * table->columns);
+    row_heights = malloc(sizeof(int) * rows);
+
+    CalcRowColSizes(table, row_heights, column_widths);
+
+    // If this table only has one column, expand column size to fit
+    // the display width.  Ensures that separators reach the window edges 
+    // when drawing windows.
+
+    if (table->columns == 1)
+    {
+        column_widths[0] = table->widget.w;
+    }
+
+    // Draw all cells
+
+    draw_y = table->widget.y;
+
+    for (y=0; y<rows; ++y)
+    {
+        draw_x = table->widget.x;
+
+        for (x=0; x<table->columns; ++x)
+        {
+            i = y * table->columns + x;
+
+            if (i >= table->num_widgets)
+                break;
+
+            widget = table->widgets[i];
+
+            if (IsActualWidget(widget))
+            {
+                CalculateWidgetDimensions(table, x, y,
+                                          column_widths, row_heights,
+                                          &widget->w, &widget->h);
+                LayoutCell(table, x, y, draw_x, draw_y);
+            }
+
+            draw_x += column_widths[x];
+        }
+
+        draw_y += row_heights[y];
+    }
+
+    free(row_heights);
+    free(column_widths);
+}
+
+static void TXT_TableDrawer(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_widget_t *widget;
+    int i;
+
+    // Check the table's current selection points at something valid before
+    // drawing.
+
+    CheckValidSelection(table);
+
+    // Draw all cells
+
+    for (i=0; i<table->num_widgets; ++i)
+    {
+        widget = table->widgets[i];
+
+        if (IsActualWidget(widget))
+        {
+            TXT_GotoXY(widget->x, widget->y);
+            TXT_DrawWidget(widget);
+        }
+    }
+}
+
+// Responds to mouse presses
+
+static void TXT_TableMousePress(TXT_UNCAST_ARG(table), int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_widget_t *widget;
+    int i;
+
+    for (i=0; i<table->num_widgets; ++i)
+    {
+        widget = table->widgets[i];
+
+        // NULL widgets are spacers
+
+        if (IsActualWidget(widget))
+        {
+            if (x >= widget->x && x < (signed) (widget->x + widget->w)
+             && y >= widget->y && y < (signed) (widget->y + widget->h))
+            {
+                // This is the widget that was clicked!
+
+                // Select the cell if the widget is selectable
+
+                if (TXT_SelectableWidget(widget))
+                {
+                    ChangeSelection(table, i % table->columns,
+                                           i / table->columns);
+                }
+
+                // Propagate click
+
+                TXT_WidgetMousePress(widget, x, y, b);
+
+                break;
+            }
+        }
+    }
+}
+
+// Determine whether the table is selectable.
+
+static int TXT_TableSelectable(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    int i;
+
+    // Is the currently-selected cell selectable?
+
+    if (SelectableCell(table, table->selected_x, table->selected_y))
+    {
+        return 1;
+    }
+
+    // Find the first selectable cell and set selected_x, selected_y.
+
+    for (i = 0; i < table->num_widgets; ++i)
+    {
+        if (IsActualWidget(table->widgets[i])
+         && TXT_SelectableWidget(table->widgets[i]))
+        {
+            ChangeSelection(table, i % table->columns, i / table->columns);
+            return 1;
+        }
+    }
+
+    // No selectable widgets exist within the table.
+
+    return 0;
+}
+
+// Need to pass through focus changes to the selected child widget.
+
+static void TXT_TableFocused(TXT_UNCAST_ARG(table), int focused)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    int i;
+
+    i = table->selected_y * table->columns + table->selected_x;
+
+    if (i < table->num_widgets)
+    {
+        if (IsActualWidget(table->widgets[i]))
+        {
+            TXT_SetWidgetFocus(table->widgets[i], focused);
+        }
+    }
+}
+
+txt_widget_class_t txt_table_class =
+{
+    TXT_TableSelectable,
+    TXT_CalcTableSize,
+    TXT_TableDrawer,
+    TXT_TableKeyPress,
+    TXT_TableDestructor,
+    TXT_TableMousePress,
+    TXT_TableLayout,
+    TXT_TableFocused,
+};
+
+void TXT_InitTable(txt_table_t *table, int columns)
+{
+    int i;
+
+    TXT_InitWidget(table, &txt_table_class);
+    table->columns = columns;
+    table->widgets = NULL;
+    table->num_widgets = 0;
+    table->selected_x = 0;
+    table->selected_y = 0;
+
+    // Add a strut for each column at the start of the table. 
+    // These are used by the TXT_SetColumnWidths function below:
+    // the struts are created with widths of 0 each, but this
+    // function changes them.
+
+    for (i=0; i<columns; ++i)
+    {
+        TXT_AddWidget(table, TXT_NewStrut(0, 0));
+    }
+}
+
+txt_table_t *TXT_NewTable(int columns)
+{
+    txt_table_t *table;
+
+    table = malloc(sizeof(txt_table_t));
+
+    TXT_InitTable(table, columns);
+
+    return table;
+}
+
+// Alternative to TXT_NewTable() that allows a list of widgets to be
+// provided in its arguments.
+txt_table_t *TXT_MakeTable(int columns, ...)
+{
+    txt_table_t *table;
+    va_list args;
+
+    table = TXT_NewTable(columns);
+    va_start(args, columns);
+
+    for (;;)
+    {
+        txt_widget_t *widget;
+        widget = va_arg(args, txt_widget_t *);
+
+        if (widget == NULL)
+        {
+            break;
+        }
+
+        TXT_AddWidget(table, widget);
+    }
+
+    va_end(args);
+
+    return table;
+}
+
+// Create a horizontal table from a list of widgets.
+
+txt_table_t *TXT_NewHorizBox(TXT_UNCAST_ARG(first_widget), ...)
+{
+    TXT_CAST_ARG(txt_widget_t, first_widget);
+    txt_table_t *result;
+    va_list args;
+    int num_args;
+
+    // First, find the number of arguments to determine the width of
+    // the box.
+
+    va_start(args, TXT_UNCAST_ARG_NAME(first_widget));
+
+    num_args = 1;
+
+    for (;;)
+    {
+        txt_widget_t *widget;
+
+        widget = va_arg(args, txt_widget_t *);
+
+        if (widget == NULL)
+        {
+            // End of list
+
+            break;
+        }
+        else
+        {
+            ++num_args;
+        }
+    }
+    
+    va_end(args);
+
+    // Create the table.
+
+    result = TXT_NewTable(num_args);
+    TXT_AddWidget(result, first_widget);
+
+    // Go through the list again and add each widget.
+
+    va_start(args, TXT_UNCAST_ARG_NAME(first_widget));
+
+    for (;;)
+    {
+        txt_widget_t *widget;
+
+        widget = va_arg(args, txt_widget_t *);
+
+        if (widget == NULL)
+        {
+            // End of list
+
+            break;
+        }
+        else
+        {
+            TXT_AddWidget(result, widget);
+        }
+    }
+    
+    va_end(args);
+
+    return result;
+}
+
+// Get the currently-selected widget in a table, recursively searching
+// through sub-tables if necessary.
+
+txt_widget_t *TXT_GetSelectedWidget(TXT_UNCAST_ARG(table))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_widget_t *result;
+    int index;
+
+    index = table->selected_y * table->columns + table->selected_x;
+
+    result = NULL;
+
+    if (index >= 0 && index < table->num_widgets)
+    {
+        result = table->widgets[index];
+
+        if (!IsActualWidget(result))
+        {
+            result = NULL;
+        }
+    }
+
+    if (result != NULL && result->widget_class == &txt_table_class)
+    {
+        result = TXT_GetSelectedWidget(result);
+    }
+
+    return result;
+}
+
+// Selects a given widget in a table, recursively searching any tables
+// within this table.  Returns 1 if successful, 0 if unsuccessful.
+
+int TXT_SelectWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    TXT_CAST_ARG(txt_widget_t, widget);
+    int i;
+
+    for (i=0; i<table->num_widgets; ++i)
+    {
+        if (!IsActualWidget(table->widgets[i]))
+        {
+            continue;
+        }
+
+        if (table->widgets[i] == widget)
+        {
+            // Found the item!  Select it and return.
+
+            ChangeSelection(table, i % table->columns, i / table->columns);
+
+            return 1;
+        }
+
+        if (table->widgets[i]->widget_class == &txt_table_class)
+        {
+            // This item is a subtable.  Recursively search this table.
+
+            if (TXT_SelectWidget(table->widgets[i], widget))
+            {
+                // Found it in the subtable.  Select this subtable and return.
+
+                ChangeSelection(table, i % table->columns, i / table->columns);
+
+                return 1;
+            }
+        }
+    }
+
+    // Not found.
+
+    return 0;
+}
+
+void TXT_SetTableColumns(TXT_UNCAST_ARG(table), int new_columns)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    txt_widget_t **new_widgets;
+    txt_widget_t *widget;
+    int new_num_widgets;
+    int i, j, x;
+
+    // We need as many full rows as are in the current list, plus the
+    // remainder from the last row.
+    new_num_widgets = (table->num_widgets / table->columns) * new_columns
+                    + (table->num_widgets % table->columns);
+    new_widgets = calloc(new_num_widgets, sizeof(txt_widget_t *));
+
+    // Reset and add one by one from the old table.
+    new_num_widgets = 0;
+
+    for (i = 0; i < table->num_widgets; ++i)
+    {
+        widget = table->widgets[i];
+        x = i % table->columns;
+
+        if (x < new_columns)
+        {
+            new_widgets[new_num_widgets] = widget;
+            ++new_num_widgets;
+        }
+        else if (IsActualWidget(widget))
+        {
+            TXT_DestroyWidget(widget);
+        }
+
+        // When we reach the last column of a row, we must pad it out with
+        // extra widgets to reach the next row.
+        if (x == table->columns - 1)
+        {
+            for (j = table->columns; j < new_columns; ++j)
+            {
+                // First row? We need to add struts that are used to apply
+                // the column widths.
+                if (i < table->columns)
+                {
+                    widget = &TXT_NewStrut(0, 0)->widget;
+                }
+                else
+                {
+                    widget = &txt_table_overflow_right;
+                }
+                new_widgets[new_num_widgets] = widget;
+                ++new_num_widgets;
+            }
+        }
+    }
+
+    free(table->widgets);
+    table->widgets = new_widgets;
+    table->num_widgets = new_num_widgets;
+    table->columns = new_columns;
+}
+
+// Sets the widths of columns in a table.
+
+void TXT_SetColumnWidths(TXT_UNCAST_ARG(table), ...)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    va_list args;
+    txt_strut_t *strut;
+    int i;
+    int width;
+
+    va_start(args, TXT_UNCAST_ARG_NAME(table));
+
+    for (i=0; i<table->columns; ++i)
+    {
+        width = va_arg(args, int);
+
+        strut = (txt_strut_t *) table->widgets[i];
+        strut->width = width;
+    }
+
+    va_end(args);
+}
+
+// Moves the select by at least the given number of characters.
+// Currently quietly ignores pagex, as we don't use it.
+
+int TXT_PageTable(TXT_UNCAST_ARG(table), int pagex, int pagey)
+{
+    TXT_CAST_ARG(txt_table_t, table);
+    unsigned int *column_widths;
+    unsigned int *row_heights;
+    int rows;
+    int changed = 0;
+
+    rows = TableRows(table);
+
+    row_heights = malloc(sizeof(int) * rows);
+    column_widths = malloc(sizeof(int) * table->columns);
+
+    CalcRowColSizes(table, row_heights, column_widths);
+
+    if (pagex)
+    {
+        // @todo Jump selection to the left or right as needed
+    }
+
+    if (pagey)
+    {
+        int new_x, new_y;
+        int distance = 0;
+        int dir;
+
+        // What direction are we moving?
+
+        if (pagey > 0)
+        {
+            dir = 1;
+        }
+        else
+        {
+            dir = -1;
+        }
+
+        // Move the cursor until the desired distance is reached.
+
+        new_y = table->selected_y;
+
+        while (new_y >= 0 && new_y < rows)
+        {
+            // We are about to travel a distance equal to the height of the row
+            // we are about to leave.
+
+            distance += row_heights[new_y];
+
+            // *Now* increment the loop.
+
+            new_y += dir;
+
+            new_x = FindSelectableColumn(table, new_y, table->selected_x);
+
+            if (new_x >= 0)
+            {
+                // Found a selectable widget in this column!
+                // Select it anyway in case we don't find something better.
+
+                ChangeSelection(table, new_x, new_y);
+                changed = 1;
+
+                // ...but is it far enough away?
+
+                if (distance >= abs(pagey))
+                {
+                    break;
+                }
+            }
+        }
+    }
+
+    free(row_heights);
+    free(column_widths);
+
+    return changed;
+}
+
diff --git a/games/NXDoom/textscreen/txt_table.h b/games/NXDoom/textscreen/txt_table.h
new file mode 100644
index 000000000..ff7509bac
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_table.h
@@ -0,0 +1,245 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_TABLE_H
+#define TXT_TABLE_H
+
+/**
+ * @file txt_table.h
+ *
+ * Table widget.
+ */
+
+/**
+ * Magic value that if used in a table, will indicate that the cell is
+ * empty and the widget in the cell to the left can overflow into it.
+ */
+
+#define TXT_TABLE_OVERFLOW_RIGHT (&txt_table_overflow_right)
+
+/**
+ * Magic value that if used in a table, will indicate that the cell is
+ * empty and the widget in the cell above it can overflow down into it.
+ */
+
+#define TXT_TABLE_OVERFLOW_DOWN (&txt_table_overflow_down)
+
+/**
+ * Magic value that if given to @ref TXT_AddWidget(), will pad out all
+ * columns until the end of line.
+ */
+#define TXT_TABLE_EOL (&txt_table_eol)
+
+/**
+ * Indicates an empty space to @ref TXT_AddWidgets(). Equivalent to
+ * TXT_AddWidget(table, NULL), except that NULL is used by TXT_AddWidgets()
+ * to indicate the end of input.
+ */
+#define TXT_TABLE_EMPTY (&txt_table_empty)
+
+/**
+ * Table widget.
+ *
+ * A table is a widget that contains other widgets.  It may have
+ * multiple columns, in which case the child widgets are laid out
+ * in a grid.  Columns automatically grow as necessary, although
+ * minimum column widths can be set using @ref TXT_SetColumnWidths.
+ *
+ * To create a new table, use @ref TXT_NewTable.  It is also
+ * possible to use @ref TXT_NewHorizBox to create a table, specifying
+ * widgets to place inside a horizontal list.  A vertical list is
+ * possible simply by creating a table containing a single column.
+ */
+
+typedef struct txt_table_s txt_table_t;
+
+#include "txt_widget.h"
+
+struct txt_table_s
+{
+    txt_widget_t widget;
+
+    // Widgets in this table
+    // The widget at (x,y) in the table is widgets[columns * y + x]
+    txt_widget_t **widgets;
+    int num_widgets;
+
+    // Number of columns
+    int columns;
+
+    // Currently selected:
+    int selected_x;
+    int selected_y;
+};
+
+extern txt_widget_class_t txt_table_class;
+extern txt_widget_t txt_table_overflow_right;
+extern txt_widget_t txt_table_overflow_down;
+extern txt_widget_t txt_table_eol;
+extern txt_widget_t txt_table_empty;
+
+void TXT_InitTable(txt_table_t *table, int columns);
+
+/**
+ * Create a new table.
+ *
+ * @param columns       The number of columns in the new table.
+ * @return              Pointer to the new table structure.
+ */
+
+txt_table_t *TXT_NewTable(int columns);
+
+/**
+ * Create a new table and populate it with provided widgets.
+ *
+ * The arguments to this function are variable. Each argument must be a
+ * pointer to a widget, and the list is terminated with a NULL.
+ *
+ * @param columns       The number of columns in the new table.
+ * @return              Pointer to the new table structure.
+ */
+
+txt_table_t *TXT_MakeTable(int columns, ...);
+
+/**
+ * Create a table containing the specified widgets packed horizontally,
+ * from left to right.
+ *
+ * The arguments to this function are variable.  Each argument must
+ * be a pointer to a widget, and the list is terminated with a
+ * NULL.
+ *
+ * @return             Pointer to the new table structure.
+ */
+
+txt_table_t *TXT_NewHorizBox(TXT_UNCAST_ARG(first_widget), ...);
+
+/**
+ * Get the currently selected widget within a table.
+ *
+ * This function will recurse through subtables if necessary.
+ *
+ * @param table        The table.
+ * @return             Pointer to the widget that is currently selected.
+ */
+
+txt_widget_t *TXT_GetSelectedWidget(TXT_UNCAST_ARG(table));
+
+/**
+ * Add a widget to a table.
+ *
+ * Widgets are added to tables horizontally, from left to right.
+ * For example, for a table with three columns, the first call
+ * to this function will add a widget to the first column, the second
+ * call to the second column, the third call to the third column,
+ * and the fourth will return to the first column, starting a new
+ * row.
+ *
+ * For adding many widgets, it may be easier to use
+ * @ref TXT_AddWidgets.
+ *
+ * @param table        The table.
+ * @param widget       The widget to add.
+ */
+
+void TXT_AddWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
+
+/**
+ * Add multiple widgets to a table.
+ *
+ * Widgets are added as described in the documentation for the
+ * @ref TXT_AddWidget function.  This function adds multiple
+ * widgets.  The number of arguments is variable, and the argument
+ * list must be terminated by a NULL pointer.
+ *
+ * @param table        The table.
+ */
+
+void TXT_AddWidgets(TXT_UNCAST_ARG(table), ...);
+
+/**
+ * Select the given widget that is contained within the specified
+ * table.
+ *
+ * This function will recursively search through subtables if
+ * necessary.
+ *
+ * @param table       The table.
+ * @param widget      The widget to select.
+ * @return            Non-zero (true) if it has been selected,
+ *                    or zero (false) if it was not found within
+ *                    this table.
+ */
+
+int TXT_SelectWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
+
+/**
+ * Change the number of columns in the table.
+ *
+ * Existing widgets in the table will be preserved, unless the change
+ * reduces the number of columns, in which case the widgets from the
+ * 'deleted' columns will be freed.
+ *
+ * This function can be useful for changing the number of columns in
+ * a window, which by default are tables containing a single column.
+ *
+ * @param table         The table.
+ * @param new_columns   The new number of columns.
+ */
+
+void TXT_SetTableColumns(TXT_UNCAST_ARG(table), int new_columns);
+
+/**
+ * Set the widths of the columns of the table.
+ *
+ * The arguments to this function are variable, and correspond
+ * to the number of columns in the table.  For example, if a table
+ * has five columns, the width of each of the five columns must be
+ * specified.
+ *
+ * The width values are in number of characters.
+ *
+ * Note that this function only sets the minimum widths for columns;
+ * if the columns contain widgets that are wider than the widths
+ * specified, they will be larger.
+ *
+ * @param table     The table.
+ */
+
+void TXT_SetColumnWidths(TXT_UNCAST_ARG(table), ...);
+
+/**
+ * Remove all widgets from a table.
+ *
+ * @param table    The table.
+ */
+
+void TXT_ClearTable(TXT_UNCAST_ARG(table));
+
+/**
+ * Hack to move the selection in a table by a 'page', triggered by the
+ * scrollpane. This acts as per the keyboard events for the arrows, but moves
+ * the selection by at least the specified number of characters.
+ *
+ * @param table    The table.
+ * @param pagex    Minimum distance to move the selection horizontally.
+ * @param pagey    Minimum distance to move the selection vertically.
+ * @return         Non-zero if the selection has been changed.
+ */
+
+int TXT_PageTable(TXT_UNCAST_ARG(table), int pagex, int pagey);
+
+#endif /* #ifndef TXT_TABLE_T */
+
+
diff --git a/games/NXDoom/textscreen/txt_utf8.c b/games/NXDoom/textscreen/txt_utf8.c
new file mode 100644
index 000000000..4d5337b2f
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_utf8.c
@@ -0,0 +1,154 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_utf8.h"
+
+// Encode a Unicode character as UTF-8, storing it in the buffer 'p'
+// and returning the new, incremented position.
+
+char *TXT_EncodeUTF8(char *p, unsigned int c)
+{
+    if (c < 0x80)                             // 1 character (ASCII):
+    {
+        p[0] = c;
+        return p + 1;
+    }
+    else if (c < 0x800)                       // 2 character:
+    {
+        p[0] = 0xc0 | (c >> 6);
+        p[1] = 0x80 | (c & 0x3f);
+        return p + 2;
+    }
+    else if (c < 0x10000)                     // 3 chacater:
+    {
+        p[0] = 0xe0 | (c >> 12);
+        p[1] = 0x80 | ((c >> 6) & 0x3f);
+        p[2] = 0x80 | (c & 0x3f);
+        return p + 3;
+    }
+    else if (c < 0x200000)                    // 4 character:
+    {
+        p[0] = 0xf0 | (c >> 18);
+        p[1] = 0x80 | ((c >> 12) & 0x3f);
+        p[2] = 0x80 | ((c >> 6) & 0x3f);
+        p[3] = 0x80 | (c & 0x3f);
+        return p + 4;
+    }
+    else
+    {
+        // Too big!
+
+        return p;
+    }
+}
+
+// Decode UTF-8 character, incrementing *ptr over the decoded bytes.
+
+unsigned int TXT_DecodeUTF8(const char **ptr)
+{
+    const char *p = *ptr;
+    unsigned int c;
+
+    // UTF-8 decode.
+
+    if ((*p & 0x80) == 0)                     // 1 character (ASCII):
+    {
+        c = *p;
+        *ptr += 1;
+    }
+    else if ((p[0] & 0xe0) == 0xc0            // 2 character:
+          && (p[1] & 0xc0) == 0x80)
+    {
+        c = ((p[0] & 0x1f) << 6)
+          |  (p[1] & 0x3f);
+        *ptr += 2;
+    }
+    else if ((p[0] & 0xf0) == 0xe0            // 3 character:
+          && (p[1] & 0xc0) == 0x80
+          && (p[2] & 0xc0) == 0x80)
+    {
+        c = ((p[0] & 0x0f) << 12)
+          | ((p[1] & 0x3f) << 6)
+          |  (p[2] & 0x3f);
+        *ptr += 3;
+    }
+    else if ((p[0] & 0xf8) == 0xf0            // 4 character:
+          && (p[1] & 0xc0) == 0x80
+          && (p[2] & 0xc0) == 0x80
+          && (p[3] & 0xc0) == 0x80)
+    {
+        c = ((p[0] & 0x07) << 18)
+          | ((p[1] & 0x3f) << 12)
+          | ((p[2] & 0x3f) << 6)
+          |  (p[3] & 0x3f);
+        *ptr += 4;
+    }
+    else
+    {
+        // Decode failure.
+        // Don't bother with 5/6 byte sequences.
+
+        c = 0;
+    }
+
+    return c;
+}
+
+// Count the number of characters in a UTF-8 string.
+
+unsigned int TXT_UTF8_Strlen(const char *s)
+{
+    const char *p;
+    unsigned int result = 0;
+    unsigned int c;
+
+    for (p = s; *p != '\0';)
+    {
+        c = TXT_DecodeUTF8(&p);
+
+        if (c == 0)
+        {
+            break;
+        }
+
+        ++result;
+    }
+
+    return result;
+}
+
+// Skip past the first n characters in a UTF-8 string.
+
+char *TXT_UTF8_SkipChars(const char *s, unsigned int n)
+{
+    unsigned int i;
+    const char *p;
+
+    p = s;
+
+    for (i = 0; i < n; ++i)
+    {
+        if (TXT_DecodeUTF8(&p) == 0)
+        {
+            break;
+        }
+    }
+
+    return (char *) p;
+}
+
diff --git a/games/NXDoom/textscreen/txt_utf8.h b/games/NXDoom/textscreen/txt_utf8.h
new file mode 100644
index 000000000..a2ee96dc2
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_utf8.h
@@ -0,0 +1,26 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_UTF8_H
+#define TXT_UTF8_H
+
+#include <stdarg.h>
+
+char *TXT_EncodeUTF8(char *p, unsigned int c);
+unsigned int TXT_DecodeUTF8(const char **ptr);
+unsigned int TXT_UTF8_Strlen(const char *s);
+char *TXT_UTF8_SkipChars(const char *s, unsigned int n);
+
+#endif /* #ifndef TXT_UTF8_H */
+
diff --git a/games/NXDoom/textscreen/txt_widget.c b/games/NXDoom/textscreen/txt_widget.c
new file mode 100644
index 000000000..24deda0ee
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_widget.c
@@ -0,0 +1,326 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "txt_io.h"
+#include "txt_widget.h"
+#include "txt_gui.h"
+#include "txt_desktop.h"
+
+typedef struct
+{
+    char *signal_name;
+    TxtWidgetSignalFunc func;
+    void *user_data;
+} txt_callback_t;
+
+struct txt_callback_table_s
+{
+    int refcount;
+    txt_callback_t *callbacks;
+    int num_callbacks;
+};
+
+txt_callback_table_t *TXT_NewCallbackTable(void)
+{
+    txt_callback_table_t *table;
+
+    table = malloc(sizeof(txt_callback_table_t));
+    table->callbacks = NULL;
+    table->num_callbacks = 0;
+    table->refcount = 1;
+
+    return table;
+}
+
+void TXT_RefCallbackTable(txt_callback_table_t *table)
+{
+    ++table->refcount;
+}
+
+void TXT_UnrefCallbackTable(txt_callback_table_t *table)
+{
+    int i;
+
+    --table->refcount;
+
+    if (table->refcount == 0)
+    {
+        // No more references to this table
+
+        for (i=0; i<table->num_callbacks; ++i)
+        {
+            free(table->callbacks[i].signal_name);
+        }
+    
+        free(table->callbacks);
+        free(table);
+    }
+}
+
+void TXT_InitWidget(TXT_UNCAST_ARG(widget), txt_widget_class_t *widget_class)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    widget->widget_class = widget_class;
+    widget->callback_table = TXT_NewCallbackTable();
+    widget->parent = NULL;
+
+    // Not focused until we hear otherwise.
+
+    widget->focused = 0;
+
+    // Visible by default.
+
+    widget->visible = 1;
+
+    // Align left by default
+
+    widget->align = TXT_HORIZ_LEFT;
+}
+
+void TXT_SignalConnect(TXT_UNCAST_ARG(widget),
+                       const char *signal_name,
+                       TxtWidgetSignalFunc func, 
+                       void *user_data)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+    txt_callback_table_t *table;
+    txt_callback_t *callback;
+
+    table = widget->callback_table;
+
+    // Add a new callback to the table
+
+    table->callbacks 
+            = realloc(table->callbacks,
+                      sizeof(txt_callback_t) * (table->num_callbacks + 1));
+    callback = &table->callbacks[table->num_callbacks];
+    ++table->num_callbacks;
+
+    callback->signal_name = strdup(signal_name);
+    callback->func = func;
+    callback->user_data = user_data;
+}
+
+void TXT_EmitSignal(TXT_UNCAST_ARG(widget), const char *signal_name)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+    txt_callback_table_t *table;
+    int i;
+
+    table = widget->callback_table;
+
+    // Don't destroy the table while we're searching through it
+    // (one of the callbacks may destroy this window)
+
+    TXT_RefCallbackTable(table);
+
+    // Search the table for all callbacks with this name and invoke
+    // the functions.
+
+    for (i=0; i<table->num_callbacks; ++i)
+    {
+        if (!strcmp(table->callbacks[i].signal_name, signal_name))
+        {
+            table->callbacks[i].func(widget, table->callbacks[i].user_data);
+        }
+    }
+
+    // Finished using the table
+
+    TXT_UnrefCallbackTable(table);
+}
+
+void TXT_CalcWidgetSize(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    widget->widget_class->size_calc(widget);
+}
+
+void TXT_DrawWidget(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+    txt_saved_colors_t colors;
+
+    // The drawing function might change the fg/bg colors,
+    // so make sure we restore them after it's done.
+
+    TXT_SaveColors(&colors);
+
+    // For convenience...
+
+    TXT_GotoXY(widget->x, widget->y);
+
+    // Call drawer method
+
+    widget->widget_class->drawer(widget);
+
+    TXT_RestoreColors(&colors);
+}
+
+void TXT_DestroyWidget(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    widget->widget_class->destructor(widget);
+    TXT_UnrefCallbackTable(widget->callback_table);
+    free(widget);
+}
+
+int TXT_WidgetKeyPress(TXT_UNCAST_ARG(widget), int key)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    if (widget->widget_class->key_press != NULL)
+    {
+        return widget->widget_class->key_press(widget, key);
+    }
+
+    return 0;
+}
+
+void TXT_SetWidgetFocus(TXT_UNCAST_ARG(widget), int focused)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    if (widget == NULL)
+    {
+        return;
+    }
+
+    if (widget->focused != focused)
+    {
+        widget->focused = focused;
+
+        if (widget->widget_class->focus_change != NULL)
+        {
+            widget->widget_class->focus_change(widget, focused);
+        }
+    }
+}
+
+void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    widget->align = horiz_align;
+}
+
+void TXT_WidgetMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    if (widget->widget_class->mouse_press != NULL)
+    {
+        widget->widget_class->mouse_press(widget, x, y, b);
+    }
+}
+
+void TXT_LayoutWidget(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    if (widget->widget_class->layout != NULL)
+    {
+        widget->widget_class->layout(widget);
+    }
+}
+
+int TXT_AlwaysSelectable(TXT_UNCAST_ARG(widget))
+{
+    return 1;
+}
+
+int TXT_NeverSelectable(TXT_UNCAST_ARG(widget))
+{
+    return 0;
+}
+
+int TXT_SelectableWidget(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    if (widget->widget_class->selectable != NULL)
+    {
+        return widget->widget_class->selectable(widget);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+int TXT_ContainsWidget(TXT_UNCAST_ARG(haystack), TXT_UNCAST_ARG(needle))
+{
+    TXT_CAST_ARG(txt_widget_t, haystack);
+    TXT_CAST_ARG(txt_widget_t, needle);
+
+    while (needle != NULL)
+    {
+        if (needle == haystack)
+        {
+            return 1;
+        }
+
+        needle = needle->parent;
+    }
+
+    return 0;
+}
+
+int TXT_HoveringOverWidget(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+    txt_window_t *active_window;
+    int x, y;
+
+    // We can only be hovering over widgets in the active window.
+
+    active_window = TXT_GetActiveWindow();
+
+    if (active_window == NULL || !TXT_ContainsWidget(active_window, widget))
+    {
+        return 0;
+    }
+
+    // Is the mouse cursor within the bounds of the widget?
+
+    TXT_GetMousePosition(&x, &y);
+
+    return (x >= widget->x && x < widget->x + widget->w
+         && y >= widget->y && y < widget->y + widget->h);
+}
+
+void TXT_SetWidgetBG(TXT_UNCAST_ARG(widget))
+{
+    TXT_CAST_ARG(txt_widget_t, widget);
+
+    if (widget->focused)
+    {
+        TXT_BGColor(TXT_COLOR_GREY, 0);
+    }
+    else if (TXT_HoveringOverWidget(widget))
+    {
+        TXT_BGColor(TXT_HOVER_BACKGROUND, 0);
+    }
+    else
+    {
+        // Use normal window background.
+    }
+}
+
diff --git a/games/NXDoom/textscreen/txt_widget.h b/games/NXDoom/textscreen/txt_widget.h
new file mode 100644
index 000000000..1857d7329
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_widget.h
@@ -0,0 +1,179 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_WIDGET_H
+#define TXT_WIDGET_H
+
+/**
+ * @file txt_widget.h
+ *
+ * Base "widget" GUI component class.
+ */
+
+#ifndef DOXYGEN
+
+#define TXT_UNCAST_ARG_NAME(name) uncast_ ## name
+#define TXT_UNCAST_ARG(name)   void * TXT_UNCAST_ARG_NAME(name)
+#define TXT_CAST_ARG(type, name)  type *name = (type *) uncast_ ## name
+
+#else
+
+#define TXT_UNCAST_ARG(name) txt_widget_t *name
+
+#endif
+
+typedef enum
+{
+    TXT_VERT_TOP,
+    TXT_VERT_CENTER,
+    TXT_VERT_BOTTOM,
+} txt_vert_align_t;
+
+typedef enum
+{
+    TXT_HORIZ_LEFT,
+    TXT_HORIZ_CENTER,
+    TXT_HORIZ_RIGHT,
+} txt_horiz_align_t;
+
+/**
+ * A GUI widget.
+ *
+ * A widget is an individual component of a GUI.  Various different widget
+ * types exist.
+ *
+ * Widgets may emit signals.  The types of signal emitted by a widget
+ * depend on the type of the widget.  It is possible to be notified
+ * when a signal occurs using the @ref TXT_SignalConnect function.
+ */
+
+typedef struct txt_widget_s txt_widget_t;
+
+typedef struct txt_widget_class_s txt_widget_class_t;
+typedef struct txt_callback_table_s txt_callback_table_t;
+
+typedef void (*TxtWidgetSizeCalc)(TXT_UNCAST_ARG(widget));
+typedef void (*TxtWidgetDrawer)(TXT_UNCAST_ARG(widget));
+typedef void (*TxtWidgetDestroy)(TXT_UNCAST_ARG(widget));
+typedef int (*TxtWidgetKeyPress)(TXT_UNCAST_ARG(widget), int key);
+typedef void (*TxtWidgetSignalFunc)(TXT_UNCAST_ARG(widget), void *user_data);
+typedef void (*TxtMousePressFunc)(TXT_UNCAST_ARG(widget), int x, int y, int b);
+typedef void (*TxtWidgetLayoutFunc)(TXT_UNCAST_ARG(widget));
+typedef int (*TxtWidgetSelectableFunc)(TXT_UNCAST_ARG(widget));
+typedef void (*TxtWidgetFocusFunc)(TXT_UNCAST_ARG(widget), int focused);
+
+struct txt_widget_class_s
+{
+    TxtWidgetSelectableFunc selectable;
+    TxtWidgetSizeCalc size_calc;
+    TxtWidgetDrawer drawer;
+    TxtWidgetKeyPress key_press;
+    TxtWidgetDestroy destructor;
+    TxtMousePressFunc mouse_press;
+    TxtWidgetLayoutFunc layout;
+    TxtWidgetFocusFunc focus_change;
+};
+
+struct txt_widget_s
+{
+    txt_widget_class_t *widget_class;
+    txt_callback_table_t *callback_table;
+    int visible;
+    txt_horiz_align_t align;
+    int focused;
+
+    // These are set automatically when the window is drawn and should
+    // not be set manually.
+
+    int x, y;
+    unsigned int w, h;
+
+    // Pointer up to parent widget that contains this widget.
+
+    txt_widget_t *parent;
+};
+
+void TXT_InitWidget(TXT_UNCAST_ARG(widget), txt_widget_class_t *widget_class);
+void TXT_CalcWidgetSize(TXT_UNCAST_ARG(widget));
+void TXT_DrawWidget(TXT_UNCAST_ARG(widget));
+void TXT_EmitSignal(TXT_UNCAST_ARG(widget), const char *signal_name);
+int TXT_WidgetKeyPress(TXT_UNCAST_ARG(widget), int key);
+void TXT_WidgetMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b);
+void TXT_DestroyWidget(TXT_UNCAST_ARG(widget));
+void TXT_LayoutWidget(TXT_UNCAST_ARG(widget));
+int TXT_AlwaysSelectable(TXT_UNCAST_ARG(widget));
+int TXT_NeverSelectable(TXT_UNCAST_ARG(widget));
+void TXT_SetWidgetFocus(TXT_UNCAST_ARG(widget), int focused);
+
+/**
+ * Set a callback function to be invoked when a signal occurs.
+ *
+ * @param widget       The widget to watch.
+ * @param signal_name  The signal to watch.
+ * @param func         The callback function to invoke.
+ * @param user_data    User-specified pointer to pass to the callback function.
+ */
+
+void TXT_SignalConnect(TXT_UNCAST_ARG(widget), const char *signal_name,
+                       TxtWidgetSignalFunc func, void *user_data);
+
+/**
+ * Set the policy for how a widget should be aligned within a table.
+ * By default, widgets are aligned to the left of the column.
+ *
+ * @param widget       The widget.
+ * @param horiz_align  The alignment to use.
+ */
+
+void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align);
+
+/**
+ * Query whether a widget is selectable with the cursor.
+ *
+ * @param widget       The widget.
+ * @return             Non-zero if the widget is selectable.
+ */
+
+int TXT_SelectableWidget(TXT_UNCAST_ARG(widget));
+
+/**
+ * Query whether the mouse is hovering over the specified widget.
+ *
+ * @param widget       The widget.
+ * @return             Non-zero if the mouse cursor is over the widget.
+ */
+
+int TXT_HoveringOverWidget(TXT_UNCAST_ARG(widget));
+
+/**
+ * Set the background to draw the specified widget, depending on
+ * whether it is selected and the mouse is hovering over it.
+ *
+ * @param widget       The widget.
+ */
+
+void TXT_SetWidgetBG(TXT_UNCAST_ARG(widget));
+
+/**
+ * Query whether the specified widget is contained within another
+ * widget.
+ *
+ * @param haystack     The widget that might contain needle.
+ * @param needle       The widget being queried.
+ */
+
+int TXT_ContainsWidget(TXT_UNCAST_ARG(haystack), TXT_UNCAST_ARG(needle));
+
+#endif /* #ifndef TXT_WIDGET_H */
+
diff --git a/games/NXDoom/textscreen/txt_window.c b/games/NXDoom/textscreen/txt_window.c
new file mode 100644
index 000000000..141a44128
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_window.c
@@ -0,0 +1,596 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "doomkeys.h"
+
+#include "txt_label.h"
+#include "txt_desktop.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_separator.h"
+#include "txt_window.h"
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <shellapi.h>
+#endif
+
+void TXT_SetWindowAction(txt_window_t *window,
+                         txt_horiz_align_t position, 
+                         TXT_UNCAST_ARG(action))
+{
+    TXT_CAST_ARG(txt_widget_t, action);
+
+    if (window->actions[position] != NULL)
+    {
+        TXT_DestroyWidget(window->actions[position]);
+    }
+
+    window->actions[position] = action;
+
+    // Maintain parent pointer.
+
+    if (action != NULL)
+    {
+        action->parent = &window->table.widget;
+    }
+}
+
+txt_window_t *TXT_NewWindow(const char *title)
+{
+    int i;
+
+    txt_window_t *win;
+
+    win = malloc(sizeof(txt_window_t));
+
+    TXT_InitTable(&win->table, 1);
+
+    if (title == NULL)
+    {
+        win->title = NULL;
+    }
+    else
+    {
+        win->title = strdup(title);
+    }
+
+    win->x = TXT_SCREEN_W / 2;
+    win->y = TXT_SCREEN_H / 2;
+    win->horiz_align = TXT_HORIZ_CENTER;
+    win->vert_align = TXT_VERT_CENTER;
+    win->key_listener = NULL;
+    win->mouse_listener = NULL;
+    win->help_url = NULL;
+
+    TXT_AddWidget(win, TXT_NewSeparator(NULL));
+
+    for (i=0; i<3; ++i)
+    {
+        win->actions[i] = NULL;
+    }
+
+    TXT_AddDesktopWindow(win);
+
+    // Default actions
+
+    TXT_SetWindowAction(win, TXT_HORIZ_LEFT, TXT_NewWindowEscapeAction(win));
+    TXT_SetWindowAction(win, TXT_HORIZ_RIGHT, TXT_NewWindowSelectAction(win));
+
+    return win;
+}
+
+void TXT_CloseWindow(txt_window_t *window)
+{
+    int i;
+
+    TXT_EmitSignal(window, "closed");
+    TXT_RemoveDesktopWindow(window);
+
+    free(window->title);
+
+    // Destroy all actions
+
+    for (i=0; i<3; ++i)
+    {
+        if (window->actions[i] != NULL)
+        {
+            TXT_DestroyWidget(window->actions[i]);
+        }
+    }
+
+    // Destroy table and window
+
+    TXT_DestroyWidget(window);
+}
+
+static void CalcWindowPosition(txt_window_t *window)
+{
+    switch (window->horiz_align)
+    {
+        case TXT_HORIZ_LEFT:
+            window->window_x = window->x;
+            break;
+        case TXT_HORIZ_CENTER:
+            window->window_x = window->x - (window->window_w / 2);
+            break;
+        case TXT_HORIZ_RIGHT:
+            window->window_x = window->x - (window->window_w - 1);
+            break;
+    }
+
+    switch (window->vert_align)
+    {
+        case TXT_VERT_TOP:
+            window->window_y = window->y;
+            break;
+        case TXT_VERT_CENTER:
+            window->window_y = window->y - (window->window_h / 2);
+            break;
+        case TXT_VERT_BOTTOM:
+            window->window_y = window->y - (window->window_h - 1);
+            break;
+    }
+}
+
+static void LayoutActionArea(txt_window_t *window)
+{
+    txt_widget_t *widget;
+    int space_available;
+    int space_left_offset;
+
+    // We need to calculate the available horizontal space for the center
+    // action widget, so that we can center it within it.
+    // To start with, we have the entire action area available.
+
+    space_available = window->window_w;
+    space_left_offset = 0;
+
+    // Left action
+
+    if (window->actions[TXT_HORIZ_LEFT] != NULL)
+    {
+        widget = window->actions[TXT_HORIZ_LEFT];
+
+        TXT_CalcWidgetSize(widget);
+
+        widget->x = window->window_x + 1;
+        widget->y = window->window_y + window->window_h - widget->h - 1;
+
+        // Adjust available space:
+        space_available -= widget->w;
+        space_left_offset += widget->w;
+
+        TXT_LayoutWidget(widget);
+    }
+
+    // Draw the right action
+
+    if (window->actions[TXT_HORIZ_RIGHT] != NULL)
+    {
+        widget = window->actions[TXT_HORIZ_RIGHT];
+
+        TXT_CalcWidgetSize(widget);
+
+        widget->x = window->window_x + window->window_w - 1 - widget->w;
+        widget->y = window->window_y + window->window_h - widget->h - 1;
+
+        // Adjust available space:
+        space_available -= widget->w;
+
+        TXT_LayoutWidget(widget);
+    }
+
+    // Draw the center action
+
+    if (window->actions[TXT_HORIZ_CENTER] != NULL)
+    {
+        widget = window->actions[TXT_HORIZ_CENTER];
+
+        TXT_CalcWidgetSize(widget);
+
+        // The left and right widgets have left a space sandwiched between
+        // them.  Center this widget within that space.
+        widget->x = window->window_x
+                  + space_left_offset
+                  + (space_available - widget->w) / 2;
+        widget->y = window->window_y + window->window_h - widget->h - 1;
+
+        TXT_LayoutWidget(widget);
+    }
+}
+
+static void DrawActionArea(txt_window_t *window)
+{
+    int i;
+
+    for (i=0; i<3; ++i)
+    {
+        if (window->actions[i] != NULL)
+        {
+            TXT_DrawWidget(window->actions[i]);
+        }
+    }
+}
+
+static void CalcActionAreaSize(txt_window_t *window, 
+                               unsigned int *w, unsigned int *h)
+{
+    txt_widget_t *widget;
+    int i;
+
+    *w = 0;
+    *h = 0;
+
+    // Calculate the width of all the action widgets and use this
+    // to create an overall min. width of the action area
+
+    for (i=0; i<3; ++i)
+    {
+        widget = (txt_widget_t *) window->actions[i];
+
+        if (widget != NULL)
+        {
+            TXT_CalcWidgetSize(widget);
+            *w += widget->w;
+
+            if (widget->h > *h)
+            {
+                *h = widget->h;
+            }
+        }
+    }
+}
+
+// Sets size and position of all widgets in a window
+
+void TXT_LayoutWindow(txt_window_t *window)
+{
+    txt_widget_t *widgets = (txt_widget_t *) window;
+    unsigned int widgets_w;
+    unsigned int actionarea_w, actionarea_h;
+
+    // Calculate size of table
+    
+    TXT_CalcWidgetSize(window);
+
+    // Widgets area: add one character of padding on each side
+    widgets_w = widgets->w + 2;
+
+    // Calculate the size of the action area
+    // Make window wide enough to action area
+  
+    CalcActionAreaSize(window, &actionarea_w, &actionarea_h);
+    
+    if (actionarea_w > widgets_w)
+        widgets_w = actionarea_w;
+
+    // Set the window size based on widgets_w
+   
+    window->window_w = widgets_w + 2;
+    window->window_h = widgets->h + 1;
+
+    // If the window has a title, add an extra two lines
+
+    if (window->title != NULL)
+    {
+        window->window_h += 2;
+    }
+
+    // If the window has an action area, add extra lines
+
+    if (actionarea_h > 0)
+    {
+        window->window_h += actionarea_h + 1;
+    }
+
+    // Use the x,y position as the centerpoint and find the location to 
+    // draw the window.
+
+    CalcWindowPosition(window);
+
+    // Set the table size and position
+
+    widgets->w = widgets_w - 2;
+    // widgets->h        (already set)
+    widgets->x = window->window_x + 2;
+    widgets->y = window->window_y;
+
+    if (window->title != NULL)
+    {
+        widgets->y += 2;
+    }
+
+    // Layout the table and action area
+
+    LayoutActionArea(window);
+    TXT_LayoutWidget(widgets);
+}
+
+void TXT_DrawWindow(txt_window_t *window)
+{
+    txt_widget_t *widgets;
+
+    TXT_LayoutWindow(window);
+
+    if (window->table.widget.focused)
+    {
+        TXT_BGColor(TXT_ACTIVE_WINDOW_BACKGROUND, 0);
+    }
+    else
+    {
+        TXT_BGColor(TXT_INACTIVE_WINDOW_BACKGROUND, 0);
+    }
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+
+    // Draw the window
+
+    TXT_DrawWindowFrame(window->title, 
+                        window->window_x, window->window_y,
+                        window->window_w, window->window_h);
+
+    // Draw all widgets
+
+    TXT_DrawWidget(window);
+
+    // Draw an action area, if we have one
+
+    widgets = (txt_widget_t *) window;
+
+    if (widgets->y + widgets->h < window->window_y + window->window_h - 1)
+    {
+        // Separator for action area
+
+        TXT_DrawSeparator(window->window_x, widgets->y + widgets->h, 
+                          window->window_w);
+
+        // Action area at the window bottom
+
+        DrawActionArea(window);
+    }
+}
+
+void TXT_SetWindowPosition(txt_window_t *window,
+                           txt_horiz_align_t horiz_align,
+                           txt_vert_align_t vert_align,
+                           int x, int y)
+{
+    window->vert_align = vert_align;
+    window->horiz_align = horiz_align;
+    window->x = x;
+    window->y = y;
+}
+
+static int MouseButtonPress(txt_window_t *window, int b)
+{
+    int x, y;
+    int i;
+    txt_widget_t *widgets;
+    txt_widget_t *widget;
+
+    // Lay out the window, set positions and sizes of all widgets
+
+    TXT_LayoutWindow(window);
+
+    // Get the current mouse position
+
+    TXT_GetMousePosition(&x, &y);
+
+    // Try the mouse button listener
+    // This happens whether it is in the window range or not
+
+    if (window->mouse_listener != NULL)
+    {
+        // Mouse listener can eat button presses
+
+        if (window->mouse_listener(window, x, y, b, 
+                                   window->mouse_listener_data))
+        {
+            return 1;
+        }
+    }
+
+    // Is it within the table range?
+
+    widgets = (txt_widget_t *) window;
+
+    if (x >= widgets->x && x < (signed) (widgets->x + widgets->w)
+     && y >= widgets->y && y < (signed) (widgets->y + widgets->h))
+    {
+        TXT_WidgetMousePress(window, x, y, b);
+        return 1;
+    }
+
+    // Was one of the action area buttons pressed?
+
+    for (i=0; i<3; ++i)
+    {
+        widget = window->actions[i];
+
+        if (widget != NULL
+         && x >= widget->x && x < (signed) (widget->x + widget->w)
+         && y >= widget->y && y < (signed) (widget->y + widget->h))
+        {
+            int was_focused;
+
+            // Main table temporarily loses focus when action area button
+            // is clicked. This way, any active input boxes that depend
+            // on having focus will save their values before the
+            // action is performed.
+
+            was_focused = window->table.widget.focused;
+            TXT_SetWidgetFocus(window, 0);
+            TXT_SetWidgetFocus(window, was_focused);
+
+            // Pass through mouse press.
+
+            TXT_WidgetMousePress(widget, x, y, b);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+int TXT_WindowKeyPress(txt_window_t *window, int c)
+{
+    int i;
+
+    // Is this a mouse button ?
+
+    if (c >= TXT_MOUSE_BASE && c < TXT_MOUSE_BASE + TXT_MAX_MOUSE_BUTTONS)
+    {
+        return MouseButtonPress(window, c);
+    }
+
+    // Try the window key spy
+
+    if (window->key_listener != NULL)
+    {
+        // key listener can eat keys
+
+        if (window->key_listener(window, c, window->key_listener_data))
+        {
+            return 1;
+        }
+    }
+
+    // Send to the currently selected widget:
+
+    if (TXT_WidgetKeyPress(window, c))
+    {
+        return 1;
+    }
+
+    // Try all of the action buttons
+
+    for (i=0; i<3; ++i)
+    {
+        if (window->actions[i] != NULL
+         && TXT_WidgetKeyPress(window->actions[i], c))
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+void TXT_SetKeyListener(txt_window_t *window, TxtWindowKeyPress key_listener, 
+                        void *user_data)
+{
+    window->key_listener = key_listener;
+    window->key_listener_data = user_data;
+}
+
+void TXT_SetMouseListener(txt_window_t *window, 
+                          TxtWindowMousePress mouse_listener,
+                          void *user_data)
+{
+    window->mouse_listener = mouse_listener;
+    window->mouse_listener_data = user_data;
+}
+
+void TXT_SetWindowFocus(txt_window_t *window, int focused)
+{
+    TXT_SetWidgetFocus(window, focused);
+}
+
+void TXT_SetWindowHelpURL(txt_window_t *window, const char *help_url)
+{
+    window->help_url = help_url;
+}
+
+#ifdef _WIN32
+
+void TXT_OpenURL(const char *url)
+{
+    ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+}
+
+#else
+
+void TXT_OpenURL(const char *url)
+{
+    char *cmd;
+    size_t cmd_len;
+    int retval;
+
+    cmd_len = strlen(url) + 30;
+    cmd = malloc(cmd_len);
+
+#if defined(__MACOSX__)
+    TXT_snprintf(cmd, cmd_len, "open \"%s\"", url);
+#else
+    // The Unix situation sucks as usual, but the closest thing to a
+    // standard that exists is the xdg-utils package.
+    if (system("xdg-open --version 2>/dev/null") != 0)
+    {
+        fprintf(stderr,
+                "xdg-utils is not installed. Can't open this URL:\n%s\n", url);
+        free(cmd);
+        return;
+    }
+
+    TXT_snprintf(cmd, cmd_len, "xdg-open \"%s\"", url);
+#endif
+
+    retval = system(cmd);
+    if (retval != 0)
+    {
+        fprintf(stderr, "TXT_OpenURL: error executing '%s'; return code %d\n",
+            cmd, retval);
+    }
+    free(cmd);
+}
+
+#endif /* #ifndef _WIN32 */
+
+void TXT_OpenWindowHelpURL(txt_window_t *window)
+{
+    if (window->help_url != NULL)
+    {
+        TXT_OpenURL(window->help_url);
+    }
+}
+
+txt_window_t *TXT_MessageBox(const char *title, const char *message, ...)
+{
+    txt_window_t *window;
+    char buf[256];
+    va_list args;
+
+    va_start(args, message);
+    TXT_vsnprintf(buf, sizeof(buf), message, args);
+    va_end(args);
+
+    window = TXT_NewWindow(title);
+    TXT_AddWidget(window, TXT_NewLabel(buf));
+
+    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, 
+                        TXT_NewWindowEscapeAction(window));
+    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+
+    return window;
+}
+
diff --git a/games/NXDoom/textscreen/txt_window.h b/games/NXDoom/textscreen/txt_window.h
new file mode 100644
index 000000000..edd0de689
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_window.h
@@ -0,0 +1,221 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_WINDOW_H
+#define TXT_WINDOW_H
+
+/**
+ * @file txt_window.h
+ *
+ * Windows.
+ */
+
+/**
+ * A window.
+ *
+ * A window contains widgets, and may also be treated as a table
+ * (@ref txt_table_t) containing a single column.
+ *
+ * Windows can be created using @ref TXT_NewWindow and closed using
+ * @ref TXT_CloseWindow.  When a window is closed, it emits the
+ * "closed" signal.
+ *
+ * In addition to the widgets within a window, windows also have
+ * a "tray" area at their bottom containing window action widgets.
+ * These widgets allow keyboard shortcuts to trigger common actions.
+ * Each window has three slots for keyboard shortcuts. By default,
+ * the left slot contains an action to close the window when the
+ * escape button is pressed, while the right slot contains an
+ * action to activate the currently-selected widget.
+ */
+
+typedef struct txt_window_s txt_window_t;
+
+#include "txt_widget.h"
+#include "txt_table.h"
+#include "txt_window_action.h"
+
+// Callback function for window key presses
+
+typedef int (*TxtWindowKeyPress)(txt_window_t *window, int key,
+                                 void *user_data);
+typedef int (*TxtWindowMousePress)(txt_window_t *window,
+                                   int x, int y, int b,
+                                   void *user_data);
+
+struct txt_window_s
+{
+    // Base class: all windows are tables with one column.
+
+    txt_table_t table;
+
+    // Window title
+
+    char *title;
+
+    // Screen coordinates of the window
+
+    txt_vert_align_t vert_align;
+    txt_horiz_align_t horiz_align;
+    int x, y;
+
+    // Actions that appear in the box at the bottom of the window
+
+    txt_widget_t *actions[3];
+
+    // Callback functions to invoke when keys/mouse buttons are pressed
+
+    TxtWindowKeyPress key_listener;
+    void *key_listener_data;
+    TxtWindowMousePress mouse_listener;
+    void *mouse_listener_data;
+
+    // These are set automatically when the window is drawn
+
+    int window_x, window_y;
+    unsigned int window_w, window_h;
+
+    // URL of a webpage with help about this window. If set, a help key
+    // indicator is shown while this window is active.
+    const char *help_url;
+};
+
+/**
+ * Open a new window.
+ *
+ * @param title        Title to display in the titlebar of the new window
+ *                     (UTF-8 format).
+ * @return             Pointer to a new @ref txt_window_t structure
+ *                     representing the new window.
+ */
+
+txt_window_t *TXT_NewWindow(const char *title);
+
+/**
+ * Close a window.
+ *
+ * @param window       Tine window to close.
+ */
+
+void TXT_CloseWindow(txt_window_t *window);
+
+/**
+ * Set the position of a window on the screen.
+ *
+ * The position is specified as a pair of x, y, coordinates on the
+ * screen. These specify the position of a particular point on the
+ * window. The following are some examples:
+ *
+ * <code>
+ *   // Centered on the screen:
+ *
+ *   TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_CENTER,
+ *                                 TXT_SCREEN_W / 2, TXT_SCREEN_H / 2);
+ *
+ *   // Horizontally centered, with top of the window on line 6:
+ *
+ *   TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
+ *                                 TXT_SCREEN_W / 2, 6);
+ *
+ *   // Top-left of window at 20, 6:
+ *
+ *   TXT_SetWindowPosition(window, TXT_HORIZ_LEFT, TXT_VERT_TOP, 20, 6);
+ * </code>
+ *
+ * @param window       The window.
+ * @param horiz_align  Horizontal location on the window for the X
+ *                     position.
+ * @param vert_align   Vertical location on the window for the Y position.
+ * @param x            X coordinate (horizontal axis) for window position.
+ * @param y            Y coordinate (vertical axis) for window position.
+ */
+
+void TXT_SetWindowPosition(txt_window_t *window,
+                           txt_horiz_align_t horiz_align,
+                           txt_vert_align_t vert_align,
+                           int x, int y);
+
+/**
+ * Set a window action for a given window.
+ *
+ * Each window can have up to three window actions, which provide
+ * keyboard shortcuts that can be used within a given window.
+ *
+ * @param window      The window.
+ * @param position    The window action slot to set (left, center or right).
+ * @param action      The window action widget.  If this is NULL, any
+ *                    current window action in the given slot is removed.
+ */
+
+void TXT_SetWindowAction(txt_window_t *window, txt_horiz_align_t position,
+                         TXT_UNCAST_ARG(action));
+
+/**
+ * Set a callback function to be invoked whenever a key is pressed within
+ * a window.
+ *
+ * @param window        The window.
+ * @param key_listener  Callback function.
+ * @param user_data     User-specified pointer to pass to the callback
+ *                      function.
+ */
+
+void TXT_SetKeyListener(txt_window_t *window,
+                        TxtWindowKeyPress key_listener,
+                        void *user_data);
+
+/**
+ * Set a callback function to be invoked whenever a mouse button is pressed
+ * within a window.
+ *
+ * @param window          The window.
+ * @param mouse_listener  Callback function.
+ * @param user_data       User-specified pointer to pass to the callback
+ *                        function.
+ */
+
+void TXT_SetMouseListener(txt_window_t *window,
+                          TxtWindowMousePress mouse_listener,
+                          void *user_data);
+
+/**
+ * Open a window displaying a message.
+ *
+ * @param title           Title of the window (UTF-8 format).
+ * @param message         The message to display in the window (UTF-8 format).
+ * @return                The new window.
+ */
+
+txt_window_t *TXT_MessageBox(const char *title, const char *message, ...);
+
+/**
+ * Set the help URL for the given window.
+ *
+ * @param window          The window.
+ * @param help_url        String containing URL of the help page for this
+ *                        window, or NULL to set no help for this window.
+ */
+
+void TXT_SetWindowHelpURL(txt_window_t *window, const char *help_url);
+
+/**
+ * Open the help URL for the given window, if one is set.
+ *
+ * @param window          The window.
+ */
+
+void TXT_OpenWindowHelpURL(txt_window_t *window);
+
+#endif /* #ifndef TXT_WINDOW_H */
+
diff --git a/games/NXDoom/textscreen/txt_window_action.c b/games/NXDoom/textscreen/txt_window_action.c
new file mode 100644
index 000000000..80c3ced44
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_window_action.c
@@ -0,0 +1,169 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "doomkeys.h"
+
+#include "txt_window_action.h"
+#include "txt_gui.h"
+#include "txt_io.h"
+#include "txt_main.h"
+#include "txt_utf8.h"
+#include "txt_window.h"
+
+static void TXT_WindowActionSizeCalc(TXT_UNCAST_ARG(action))
+{
+    TXT_CAST_ARG(txt_window_action_t, action);
+    char buf[10];
+
+    TXT_GetKeyDescription(action->key, buf, sizeof(buf));
+
+    // Width is label length, plus key description length, plus '='
+    // and two surrounding spaces.
+
+    action->widget.w = TXT_UTF8_Strlen(action->label)
+                     + TXT_UTF8_Strlen(buf) + 3;
+    action->widget.h = 1;
+}
+
+static void TXT_WindowActionDrawer(TXT_UNCAST_ARG(action))
+{
+    TXT_CAST_ARG(txt_window_action_t, action);
+    int hovering;
+    char buf[10];
+
+    TXT_GetKeyDescription(action->key, buf, sizeof(buf));
+
+    hovering = TXT_HoveringOverWidget(action);
+    TXT_SetWidgetBG(action);
+
+    TXT_DrawString(" ");
+    TXT_FGColor(hovering ? TXT_COLOR_BRIGHT_WHITE : TXT_COLOR_BRIGHT_GREEN);
+    TXT_DrawString(buf);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+    TXT_DrawString("=");
+
+    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+    TXT_DrawString(action->label);
+    TXT_DrawString(" ");
+}
+
+static void TXT_WindowActionDestructor(TXT_UNCAST_ARG(action))
+{
+    TXT_CAST_ARG(txt_window_action_t, action);
+
+    free(action->label);
+}
+
+static int TXT_WindowActionKeyPress(TXT_UNCAST_ARG(action), int key)
+{
+    TXT_CAST_ARG(txt_window_action_t, action);
+
+    if (tolower(key) == tolower(action->key))
+    {
+        TXT_EmitSignal(action, "pressed");
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void TXT_WindowActionMousePress(TXT_UNCAST_ARG(action), 
+                                       int x, int y, int b)
+{
+    TXT_CAST_ARG(txt_window_action_t, action);
+
+    // Simulate a press of the key
+
+    if (b == TXT_MOUSE_LEFT)
+    {
+        TXT_WindowActionKeyPress(action, action->key);
+    }
+}
+
+txt_widget_class_t txt_window_action_class =
+{
+    TXT_AlwaysSelectable,
+    TXT_WindowActionSizeCalc,
+    TXT_WindowActionDrawer,
+    TXT_WindowActionKeyPress,
+    TXT_WindowActionDestructor,
+    TXT_WindowActionMousePress,
+    NULL,
+};
+
+txt_window_action_t *TXT_NewWindowAction(int key, const char *label)
+{
+    txt_window_action_t *action;
+
+    action = malloc(sizeof(txt_window_action_t));
+
+    TXT_InitWidget(action, &txt_window_action_class);
+    action->key = key;
+    action->label = strdup(label);
+
+    return action;
+}
+
+static void WindowCloseCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+{
+    TXT_CAST_ARG(txt_window_t, window);
+
+    TXT_CloseWindow(window);
+}
+
+static void WindowSelectCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+{
+    TXT_CAST_ARG(txt_window_t, window);
+
+    TXT_WidgetKeyPress(window, KEY_ENTER);
+}
+
+// An action with the name "close" the closes the window
+
+txt_window_action_t *TXT_NewWindowEscapeAction(txt_window_t *window)
+{
+    txt_window_action_t *action;
+
+    action = TXT_NewWindowAction(KEY_ESCAPE, "Close");
+    TXT_SignalConnect(action, "pressed", WindowCloseCallback, window);
+
+    return action;
+}
+
+// Exactly the same as the above, but the button is named "abort"
+
+txt_window_action_t *TXT_NewWindowAbortAction(txt_window_t *window)
+{
+    txt_window_action_t *action;
+
+    action = TXT_NewWindowAction(KEY_ESCAPE, "Abort");
+    TXT_SignalConnect(action, "pressed", WindowCloseCallback, window);
+
+    return action;
+}
+
+txt_window_action_t *TXT_NewWindowSelectAction(txt_window_t *window)
+{
+    txt_window_action_t *action;
+
+    action = TXT_NewWindowAction(KEY_ENTER, "Select");
+    TXT_SignalConnect(action, "pressed", WindowSelectCallback, window);
+
+    return action;
+}
+
diff --git a/games/NXDoom/textscreen/txt_window_action.h b/games/NXDoom/textscreen/txt_window_action.h
new file mode 100644
index 000000000..5a2f6b028
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_window_action.h
@@ -0,0 +1,89 @@
+//
+// Copyright(C) 2005-2014 Simon Howard
+//
+// 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.
+//
+
+#ifndef TXT_WINDOW_ACTION_H
+#define TXT_WINDOW_ACTION_H
+
+/**
+ * @file txt_window_action.h
+ *
+ * Window action widget.
+ */
+
+/**
+ * Window action widget.
+ *
+ * A window action is attached to a window and corresponds to a
+ * keyboard shortcut that is active within that window.  When the
+ * key is pressed, the action is triggered.
+ *
+ * When a window action is triggered, the "pressed" signal is emitted.
+ */
+
+typedef struct txt_window_action_s txt_window_action_t;
+
+#include "txt_widget.h"
+#include "txt_window.h"
+
+struct txt_window_action_s
+{
+    txt_widget_t widget;
+    char *label;
+    int key;
+};
+
+/**
+ * Create a new window action.
+ *
+ * @param key           The keyboard key that triggers this action.
+ * @param label         Label to display for this action in the tray
+ *                      at the bottom of the window (UTF-8 format).
+ * @return              Pointer to the new window action widget.
+ */
+
+txt_window_action_t *TXT_NewWindowAction(int key, const char *label);
+
+/**
+ * Create a new window action that closes the window when the
+ * escape key is pressed.  The label "Close" is used.
+ *
+ * @param window        The window to close.
+ * @return              Pointer to the new window action widget.
+ */
+
+txt_window_action_t *TXT_NewWindowEscapeAction(txt_window_t *window);
+
+/**
+ * Create a new window action that closes the window when the
+ * escape key is pressed.  The label "Abort" is used.
+ *
+ * @param window        The window to close.
+ * @return              Pointer to the new window action widget.
+ */
+
+txt_window_action_t *TXT_NewWindowAbortAction(txt_window_t *window);
+
+/**
+ * Create a new "select" window action.  This does not really do
+ * anything, but reminds the user that "enter" can be pressed to
+ * activate the currently-selected widget.
+ *
+ * @param window        The window.
+ * @return              Pointer to the new window action widget.
+ */
+
+txt_window_action_t *TXT_NewWindowSelectAction(txt_window_t *window);
+
+#endif /* #ifndef TXT_WINDOW_ACTION_H */
+
diff --git a/games/NXDoom/vcpkg.json b/games/NXDoom/vcpkg.json
new file mode 100644
index 000000000..05c856dd1
--- /dev/null
+++ b/games/NXDoom/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "dependencies": [
+    "sdl2",
+    "sdl2-mixer",
+    "sdl2-net",
+    "libpng",
+    "libsamplerate",
+    "fluidsynth"
+  ]
+}
diff --git a/games/NXDoom/win32/win_opendir.c b/games/NXDoom/win32/win_opendir.c
new file mode 100644
index 000000000..3ec6227c8
--- /dev/null
+++ b/games/NXDoom/win32/win_opendir.c
@@ -0,0 +1,360 @@
+/*
+MIT License
+Copyright (c) 2019 win32ports
+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.
+*/
+
+#ifdef _WIN32
+
+#include "win_opendir.h"
+
+#include <stdint.h>
+#include <errno.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <shlwapi.h>
+
+#ifdef _MSC_VER
+#pragma comment(lib, "Shlwapi.lib")
+#endif
+
+#ifndef NTFS_MAX_PATH
+#define NTFS_MAX_PATH 32768
+#endif /* NTFS_MAX_PATH */
+
+#ifndef FSCTL_GET_REPARSE_POINT
+#define FSCTL_GET_REPARSE_POINT 0x900a8
+#endif /* FSCTL_GET_REPARSE_POINT */
+
+#ifndef FILE_NAME_NORMALIZED
+#define FILE_NAME_NORMALIZED 0
+#endif /* FILE_NAME_NORMALIZED */
+
+struct __dir
+{
+    struct dirent *entries;
+    intptr_t fd;
+    long int count;
+    long int index;
+};
+
+int closedir(DIR *dirp)
+{
+    struct __dir *data = NULL;
+    if (!dirp)
+    {
+        errno = EBADF;
+        return -1;
+    }
+    data = (struct __dir *) dirp;
+    CloseHandle((HANDLE) data->fd);
+    free(data->entries);
+    free(data);
+    return 0;
+}
+
+static void __seterrno(int value)
+{
+#ifdef _MSC_VER
+    _set_errno(value);
+#else  /* _MSC_VER */
+    errno = value;
+#endif /* _MSC_VER */
+}
+
+static int __islink(const wchar_t *name, char *buffer)
+{
+    DWORD io_result = 0;
+    DWORD bytes_returned = 0;
+    HANDLE hFile = CreateFileW(
+        name, 0, 0, NULL, OPEN_EXISTING,
+        FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0);
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        return 0;
+    }
+
+    io_result = DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, NULL, 0, buffer,
+                                MAXIMUM_REPARSE_DATA_BUFFER_SIZE,
+                                &bytes_returned, NULL);
+
+    CloseHandle(hFile);
+
+    if (io_result == 0)
+    {
+        return 0;
+    }
+
+    return ((REPARSE_GUID_DATA_BUFFER *) buffer)->ReparseTag ==
+           IO_REPARSE_TAG_SYMLINK;
+}
+
+#pragma pack(push, 1)
+
+typedef struct dirent_FILE_ID_128
+{
+    BYTE Identifier[16];
+} dirent_FILE_ID_128;
+
+typedef struct _dirent_FILE_ID_INFO
+{
+    ULONGLONG VolumeSerialNumber;
+    dirent_FILE_ID_128 FileId;
+} dirent_FILE_ID_INFO;
+
+#pragma pack(pop)
+
+typedef enum dirent_FILE_INFO_BY_HANDLE_CLASS
+{
+    dirent_FileIdInfo = 18
+} dirent_FILE_INFO_BY_HANDLE_CLASS;
+
+static __ino_t __inode(const wchar_t *name)
+{
+    __ino_t value = {0};
+    BOOL result;
+    dirent_FILE_ID_INFO fileid;
+    BY_HANDLE_FILE_INFORMATION info;
+    typedef BOOL(__stdcall * pfnGetFileInformationByHandleEx)(
+        HANDLE hFile, dirent_FILE_INFO_BY_HANDLE_CLASS FileInformationClass,
+        LPVOID lpFileInformation, DWORD dwBufferSize);
+    pfnGetFileInformationByHandleEx fnGetFileInformationByHandleEx;
+    HANDLE hFile;
+
+    HANDLE hKernel32 = GetModuleHandleW(L"kernel32.dll");
+    if (!hKernel32)
+    {
+        return value;
+    }
+
+    fnGetFileInformationByHandleEx =
+        (pfnGetFileInformationByHandleEx) GetProcAddress(
+            hKernel32, "GetFileInformationByHandleEx");
+    if (!fnGetFileInformationByHandleEx)
+    {
+        return value;
+    }
+
+    hFile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL,
+                        OPEN_EXISTING, 0, 0);
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        return value;
+    }
+
+    result = fnGetFileInformationByHandleEx(hFile, dirent_FileIdInfo, &fileid,
+                                            sizeof(fileid));
+    if (result)
+    {
+        value.serial = fileid.VolumeSerialNumber;
+        memcpy(value.fileid, fileid.FileId.Identifier, 16);
+    }
+    else
+    {
+        result = GetFileInformationByHandle(hFile, &info);
+        if (result)
+        {
+            value.serial = info.dwVolumeSerialNumber;
+            memcpy(value.fileid + 8, &info.nFileIndexHigh, 4);
+            memcpy(value.fileid + 12, &info.nFileIndexLow, 4);
+        }
+    }
+    CloseHandle(hFile);
+    return value;
+}
+
+static DIR *__internal_opendir(wchar_t *wname, int size)
+{
+    struct __dir *data = NULL;
+    struct dirent *tmp_entries = NULL;
+    static wchar_t *suffix = L"\\*.*";
+    static int extra_prefix = 4; /* use prefix "\\?\" to handle long file names */
+    static int extra_suffix = 4; /* use suffix "\*.*" to find everything */
+    WIN32_FIND_DATAW w32fd = {0};
+    HANDLE hFindFile = INVALID_HANDLE_VALUE;
+    static int grow_factor = 2;
+    char *buffer = NULL;
+
+    BOOL relative = PathIsRelativeW(wname + extra_prefix);
+
+    memcpy(wname + size - 1, suffix, sizeof(wchar_t) * extra_suffix);
+    wname[size + extra_suffix - 1] = 0;
+
+    if (relative)
+    {
+        wname += extra_prefix;
+        size -= extra_prefix;
+    }
+    hFindFile = FindFirstFileW(wname, &w32fd);
+    if (INVALID_HANDLE_VALUE == hFindFile)
+    {
+        __seterrno(ENOENT);
+        return NULL;
+    }
+
+    data = (struct __dir *) malloc(sizeof(struct __dir));
+    if (!data)
+    {
+        goto out_of_memory;
+    }
+    wname[size - 1] = 0;
+    data->fd = (intptr_t) CreateFileW(wname, 0, 0, NULL, OPEN_EXISTING,
+                                      FILE_FLAG_BACKUP_SEMANTICS, 0);
+    wname[size - 1] = L'\\';
+    data->count = 16;
+    data->index = 0;
+    data->entries = (struct dirent *) malloc(sizeof(struct dirent) * data->count);
+    if (!data->entries)
+    {
+        goto out_of_memory;
+    }
+    buffer = malloc(MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
+    if (!buffer)
+    {
+        goto out_of_memory;
+    }
+
+    do
+    {
+        WideCharToMultiByte(CP_UTF8, 0, w32fd.cFileName, -1,
+                            data->entries[data->index].d_name, NAME_MAX,
+                            NULL, NULL);
+
+        memcpy(wname + size, w32fd.cFileName, sizeof(wchar_t) * NAME_MAX);
+
+        if (((w32fd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ==
+             FILE_ATTRIBUTE_REPARSE_POINT)
+            && __islink(wname, buffer))
+        {
+            data->entries[data->index].d_type = DT_LNK;
+        }
+        else if ((w32fd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE) ==
+                 FILE_ATTRIBUTE_DEVICE)
+        {
+            data->entries[data->index].d_type = DT_CHR;
+        }
+        else if ((w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ==
+                 FILE_ATTRIBUTE_DIRECTORY)
+        {
+            data->entries[data->index].d_type = DT_DIR;
+        }
+        else
+        {
+            data->entries[data->index].d_type = DT_REG;
+        }
+
+        data->entries[data->index].d_ino = __inode(wname);
+        data->entries[data->index].d_reclen = sizeof(struct dirent);
+        data->entries[data->index].d_namelen =
+            (unsigned char) wcslen(w32fd.cFileName);
+        data->entries[data->index].d_off = 0;
+
+        if (++data->index == data->count)
+        {
+            tmp_entries = (struct dirent *) realloc(
+                data->entries,
+                sizeof(struct dirent) * data->count * grow_factor);
+            if (!tmp_entries)
+            {
+                goto out_of_memory;
+            }
+            data->entries = tmp_entries;
+            data->count *= grow_factor;
+        }
+    } while (FindNextFileW(hFindFile, &w32fd) != 0);
+
+    free(buffer);
+    FindClose(hFindFile);
+
+    data->count = data->index;
+    data->index = 0;
+    return (DIR *) data;
+
+out_of_memory:
+    if (data)
+    {
+        if (INVALID_HANDLE_VALUE != (HANDLE) data->fd)
+        {
+            CloseHandle((HANDLE) data->fd);
+        }
+        free(data->entries);
+    }
+    free(buffer);
+    free(data);
+    if (INVALID_HANDLE_VALUE != hFindFile)
+    {
+        FindClose(hFindFile);
+    }
+    __seterrno(ENOMEM);
+    return NULL;
+}
+
+static wchar_t *__get_buffer()
+{
+    wchar_t *name = malloc(sizeof(wchar_t) * (NTFS_MAX_PATH + NAME_MAX + 8));
+    if (name)
+    {
+        memcpy(name, L"\\\\?\\", sizeof(wchar_t) * 4);
+    }
+    return name;
+}
+
+DIR *opendir(const char *name)
+{
+    DIR *dirp = NULL;
+    wchar_t *wname = __get_buffer();
+    int size = 0;
+    if (!wname)
+    {
+        errno = ENOMEM;
+        return NULL;
+    }
+    size = MultiByteToWideChar(CP_UTF8, 0, name, -1, wname + 4, NTFS_MAX_PATH);
+    if (0 == size)
+    {
+        free(wname);
+        return NULL;
+    }
+    /* Ensure path has no trailing backslash before __internal_opendir. */
+    /* Mind that size includes NULL, thus -2 for last character. */
+    if (wname[size+4-2] == L'\\')
+    {
+        wname[size+4-2] = 0;
+        size--;
+    }
+    dirp = __internal_opendir(wname, size + 4);
+    free(wname);
+    return dirp;
+}
+
+struct dirent *readdir(DIR *dirp)
+{
+    struct __dir *data = (struct __dir *) dirp;
+    if (!data)
+    {
+        errno = EBADF;
+        return NULL;
+    }
+    if (data->index < data->count)
+    {
+        return &data->entries[data->index++];
+    }
+    return NULL;
+}
+
+#endif /* _WIN32 */
diff --git a/games/NXDoom/win32/win_opendir.h b/games/NXDoom/win32/win_opendir.h
new file mode 100644
index 000000000..bfc626224
--- /dev/null
+++ b/games/NXDoom/win32/win_opendir.h
@@ -0,0 +1,110 @@
+/*
+MIT License
+Copyright (c) 2019 win32ports
+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.
+*/
+
+#ifdef _WIN32
+
+#ifndef WIN_OPENDIR_H
+#define WIN_OPENDIR_H
+
+#include <sys/types.h>
+
+#ifndef NAME_MAX
+#define NAME_MAX 260
+#endif /* NAME_MAX */
+
+#ifndef DT_UNKNOWN
+#define DT_UNKNOWN 0
+#endif /* DT_UNKNOWN */
+
+#ifndef DT_FIFO
+#define DT_FIFO 1
+#endif /* DT_FIFO */
+
+#ifndef DT_CHR
+#define DT_CHR 2
+#endif /* DT_CHR */
+
+#ifndef DT_DIR
+#define DT_DIR 4
+#endif /* DT_DIR */
+
+#ifndef DT_BLK
+#define DT_BLK 6
+#endif /* DT_BLK */
+
+#ifndef DT_REG
+#define DT_REG 8
+#endif /* DT_REF */
+
+#ifndef DT_LNK
+#define DT_LNK 10
+#endif /* DT_LNK */
+
+#ifndef DT_SOCK
+#define DT_SOCK 12
+#endif /* DT_SOCK */
+
+#ifndef DT_WHT
+#define DT_WHT 14
+#endif /* DT_WHT */
+
+#ifndef _DIRENT_HAVE_D_NAMLEN
+#define _DIRENT_HAVE_D_NAMLEN 1
+#endif /* _DIRENT_HAVE_D_NAMLEN */
+
+#ifndef _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_RECLEN 1
+#endif /* _DIRENT_HAVE_D_RECLEN */
+
+#ifndef _DIRENT_HAVE_D_OFF
+#define _DIRENT_HAVE_D_OFF 1
+#endif /* _DIRENT_HAVE_D_OFF */
+
+#ifndef _DIRENT_HAVE_D_TYPE 
+#define _DIRENT_HAVE_D_TYPE 1
+#endif /* _DIRENT_HAVE_D_TYPE  */
+
+typedef void *DIR;
+
+typedef struct ino_t
+{
+    unsigned long long serial;
+    unsigned char fileid[16];
+} __ino_t;
+
+struct dirent
+{
+    __ino_t d_ino;
+    off_t d_off;
+    unsigned short d_reclen;
+    unsigned char d_namelen;
+    unsigned char d_type;
+    char d_name[NAME_MAX];
+};
+
+int closedir(DIR *dirp);
+
+DIR *opendir(const char *name);
+
+struct dirent *readdir(DIR *dirp);
+
+#endif /* WIN_OPENDIR_H */
+
+#endif /* _WIN32 */

From 073188b50dd8958b82e69ccbb76ec67be6d69b6c Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 30 Jun 2026 10:24:29 -0400
Subject: [PATCH 459/568] games/NXDoom: Initial port of Chocolate DOOM to
 NuttX.

This commit includes a (highly) modified version of Chocolate DOOM which
can run on NuttX. The majority of the modifications were made to pass
the NuttX style check. Some small modifications have been added to
support keyboard input, render graphics to frame buffers and directly
use the POSIX interfaces NuttX supplies, stripping out Windows/Mac stuff
and any references to SDL.

NOTE: Sound is currently not supported in any capacity, nor is the
networking stuff. A lot of Chocolate DOOM code was stripped out since it
was unused. If there is a need/desire to add it back later, the original
Chocolate DOOM source can be used as a reference.

WARNING: The NuttX keyboard codec is incredibly non-standard and so
there are problems translating from X11 keys to NuttX ones to play DOOM.
Right now, the CTRL key for firing doesn't work because the NuttX codec
has no concept of it. The NuttX codec should be modified (and other
input devices supported), but at the time of this port I am not
sufficiently comfortable doing so since I am afraid of breaking other
things in the kernel.

NOTE: This port (and likely the original DOOM) seems to be written with
32-bit computers in mind. As such, most things are given the type of
natural `int`, even when a single byte might do. There are significant
size optimizations that could be made to make this more suited to
embedded devices that NuttX typically runs on.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/.devcontainer/.gitignore         |     4 -
 games/NXDoom/.devcontainer/Dockerfile         |    39 -
 games/NXDoom/.devcontainer/devcontainer.json  |    45 -
 .../NXDoom/.devcontainer/initialize-linux.sh  |     9 -
 games/NXDoom/.github/CONTRIBUTING.md          |   101 -
 games/NXDoom/.github/ISSUE_TEMPLATE.md        |    28 -
 games/NXDoom/.github/workflows/cpp-linter.yml |    54 -
 games/NXDoom/.github/workflows/cppcheck.yml   |    23 -
 games/NXDoom/.github/workflows/main.yml       |   152 -
 games/NXDoom/.gitignore                       |     7 +-
 games/NXDoom/.gitmodules                      |     3 -
 games/NXDoom/.lvimrc                          |    32 -
 games/NXDoom/.travis.sh                       |    19 -
 games/NXDoom/CMakeLists.txt                   |   105 -
 games/NXDoom/CODE_OF_CONDUCT.md               |    74 -
 games/NXDoom/ChangeLog                        |     5 -
 games/NXDoom/HACKING.md                       |   256 -
 games/NXDoom/Kconfig                          |   187 +
 games/NXDoom/Make.defs                        |     3 +
 games/NXDoom/Makefile                         |   203 +
 games/NXDoom/Makefile.am                      |    62 -
 games/NXDoom/NEWS.md                          |  1492 --
 games/NXDoom/NOT-BUGS.md                      |   149 -
 games/NXDoom/PHILOSOPHY.md                    |   214 -
 games/NXDoom/README.Music.md                  |   173 -
 games/NXDoom/README.Strife.md                 |   124 -
 games/NXDoom/README.md                        |   102 -
 games/NXDoom/RELEASE_NOTES.md                 |    35 -
 games/NXDoom/TODO.md                          |    36 -
 games/NXDoom/autogen.sh                       |     4 -
 games/NXDoom/check-extern.sh                  |     6 -
 games/NXDoom/cmake/FindFluidSynth.cmake       |   106 -
 games/NXDoom/cmake/FindSDL2.cmake             |   114 -
 games/NXDoom/cmake/FindSDL2_mixer.cmake       |    88 -
 games/NXDoom/cmake/FindSDL2_net.cmake         |    88 -
 games/NXDoom/cmake/FindSampleRate.cmake       |    67 -
 games/NXDoom/cmake/Findm.cmake                |    36 -
 games/NXDoom/cmake/config.h.cin               |    12 -
 games/NXDoom/configure.ac                     |   335 -
 games/NXDoom/data/.gitignore                  |     7 -
 games/NXDoom/data/Makefile.am                 |    39 -
 games/NXDoom/data/README                      |    16 -
 games/NXDoom/data/convert-icon                |    72 -
 games/NXDoom/data/doom.ico                    |   Bin 43344 -> 0 bytes
 games/NXDoom/data/doom.png                    |   Bin 4551 -> 0 bytes
 games/NXDoom/data/heretic.ico                 |   Bin 44563 -> 0 bytes
 games/NXDoom/data/heretic.png                 |   Bin 5090 -> 0 bytes
 games/NXDoom/data/hexen.ico                   |   Bin 44747 -> 0 bytes
 games/NXDoom/data/hexen.png                   |   Bin 5033 -> 0 bytes
 games/NXDoom/data/setup.ico                   |   Bin 45885 -> 0 bytes
 games/NXDoom/data/setup.png                   |   Bin 5654 -> 0 bytes
 games/NXDoom/data/strife.ico                  |   Bin 44131 -> 0 bytes
 games/NXDoom/data/strife.png                  |   Bin 4966 -> 0 bytes
 games/NXDoom/data/wadfile.png                 |   Bin 8681 -> 0 bytes
 games/NXDoom/man/.gitignore                   |    16 -
 games/NXDoom/man/CMDLINE.template             |     8 -
 games/NXDoom/man/CMDLINE.template.md          |     8 -
 games/NXDoom/man/INSTALL.template             |   316 -
 games/NXDoom/man/Makefile.am                  |   226 -
 games/NXDoom/man/bash-completion/.gitignore   |     5 -
 games/NXDoom/man/bash-completion/Makefile.am  |    52 -
 .../man/bash-completion/doom.template.in      |    51 -
 .../man/bash-completion/heretic.template.in   |    48 -
 .../man/bash-completion/hexen.template.in     |    45 -
 .../man/bash-completion/strife.template.in    |    48 -
 games/NXDoom/man/default.cfg.template         |    50 -
 games/NXDoom/man/docgen                       |   624 -
 games/NXDoom/man/doom.template                |    45 -
 games/NXDoom/man/environ.man                  |    34 -
 games/NXDoom/man/extra.cfg.template           |    28 -
 games/NXDoom/man/heretic.template             |    47 -
 games/NXDoom/man/hexen.template               |    47 -
 games/NXDoom/man/iwad_paths.man               |    73 -
 games/NXDoom/man/server.template              |    55 -
 games/NXDoom/man/setup.template               |    46 -
 games/NXDoom/man/simplecpp                    |   228 -
 games/NXDoom/man/strife.template              |    91 -
 games/NXDoom/man/wikipages                    |     7 -
 games/NXDoom/opl/.gitignore                   |     7 -
 games/NXDoom/opl/CMakeLists.txt               |    28 -
 games/NXDoom/opl/Makefile.am                  |    21 -
 games/NXDoom/opl/examples/.gitignore          |     7 -
 games/NXDoom/opl/examples/Makefile.am         |     8 -
 games/NXDoom/opl/examples/droplay.c           |   210 -
 games/NXDoom/opl/ioperm_sys.c                 |   355 -
 games/NXDoom/opl/ioperm_sys.h                 |    28 -
 games/NXDoom/opl/opl.c                        |   530 -
 games/NXDoom/opl/opl.h                        |   153 -
 games/NXDoom/opl/opl3.c                       |  1377 --
 games/NXDoom/opl/opl3.h                       |   150 -
 games/NXDoom/opl/opl_internal.h               |    71 -
 games/NXDoom/opl/opl_linux.c                  |   103 -
 games/NXDoom/opl/opl_obsd.c                   |   118 -
 games/NXDoom/opl/opl_queue.c                  |   285 -
 games/NXDoom/opl/opl_queue.h                  |    39 -
 games/NXDoom/opl/opl_sdl.c                    |   521 -
 games/NXDoom/opl/opl_timer.c                  |   250 -
 games/NXDoom/opl/opl_timer.h                  |    33 -
 games/NXDoom/opl/opl_win32.c                  |   192 -
 games/NXDoom/pcsound/CMakeLists.txt           |    24 -
 games/NXDoom/pcsound/Makefile.am              |    15 -
 games/NXDoom/pcsound/pcsound.c                |   140 +-
 games/NXDoom/pcsound/pcsound.h                |    64 +-
 games/NXDoom/pcsound/pcsound_bsd.c            |   321 -
 games/NXDoom/pcsound/pcsound_internal.h       |    79 +-
 games/NXDoom/pcsound/pcsound_linux.c          |   171 -
 games/NXDoom/pcsound/pcsound_sdl.c            |   254 -
 games/NXDoom/pcsound/pcsound_win32.c          |   106 -
 games/NXDoom/pkg/.gitignore                   |     3 -
 games/NXDoom/pkg/Makefile.am                  |    25 -
 games/NXDoom/pkg/config.make.in               |    30 -
 games/NXDoom/pkg/osx/.gitignore               |    10 -
 games/NXDoom/pkg/osx/AppController.h          |    45 -
 games/NXDoom/pkg/osx/AppController.m          |   146 -
 games/NXDoom/pkg/osx/Execute.h                |    24 -
 games/NXDoom/pkg/osx/Execute.m                |   226 -
 games/NXDoom/pkg/osx/GNUmakefile              |   132 -
 games/NXDoom/pkg/osx/IWADController.h         |    57 -
 games/NXDoom/pkg/osx/IWADController.m         |   482 -
 games/NXDoom/pkg/osx/Info.plist.in            |   104 -
 games/NXDoom/pkg/osx/LauncherManager.h        |    51 -
 games/NXDoom/pkg/osx/LauncherManager.m        |   410 -
 games/NXDoom/pkg/osx/PkgInfo                  |     1 -
 games/NXDoom/pkg/osx/Resources/app.png        |   Bin 4597 -> 0 bytes
 .../osx/Resources/launcher.nib/designable.nib |   607 -
 .../Resources/launcher.nib/keyedobjects.nib   |   Bin 31078 -> 0 bytes
 games/NXDoom/pkg/osx/cp-with-libs             |   107 -
 games/NXDoom/pkg/osx/disk/background.png      |   Bin 227363 -> 0 bytes
 games/NXDoom/pkg/osx/disk/dir.DS_Store        |   Bin 28196 -> 0 bytes
 games/NXDoom/pkg/osx/dmgfix                   |    67 -
 games/NXDoom/pkg/osx/main.m                   |    24 -
 games/NXDoom/pkg/style.html                   |    48 -
 games/NXDoom/pkg/win32/.gitignore             |     2 -
 games/NXDoom/pkg/win32/GNUmakefile            |    65 -
 games/NXDoom/pkg/win32/README                 |     2 -
 games/NXDoom/pkg/win32/cp-with-libs           |   200 -
 games/NXDoom/rpm.spec.in                      |   121 -
 games/NXDoom/src/CMakeLists.txt               |   287 -
 games/NXDoom/src/Doom.desktop.in              |     8 -
 games/NXDoom/src/Doom.metainfo.xml.in         |    74 -
 games/NXDoom/src/Doom_Screensaver.desktop.in  |    10 -
 games/NXDoom/src/Heretic.desktop.in           |     8 -
 games/NXDoom/src/Heretic.metainfo.xml.in      |    47 -
 games/NXDoom/src/Hexen.desktop.in             |     8 -
 games/NXDoom/src/Hexen.metainfo.xml.in        |    47 -
 games/NXDoom/src/Makefile.am                  |   299 -
 games/NXDoom/src/Strife.desktop.in            |     8 -
 games/NXDoom/src/Strife.metainfo.xml.in       |    48 -
 games/NXDoom/src/aes_prng.c                   |  1702 +-
 games/NXDoom/src/aes_prng.h                   |    54 +-
 games/NXDoom/src/config.h                     |    25 +
 games/NXDoom/src/d_dedicated.c                |    67 +-
 games/NXDoom/src/d_event.c                    |   100 +-
 games/NXDoom/src/d_event.h                    |   265 +-
 games/NXDoom/src/d_iwad.c                     |  1384 +-
 games/NXDoom/src/d_iwad.h                     |    93 +-
 games/NXDoom/src/d_loop.c                     |  1502 +-
 games/NXDoom/src/d_loop.h                     |   158 +-
 games/NXDoom/src/d_mode.c                     |   412 +-
 games/NXDoom/src/d_mode.h                     |   180 +-
 games/NXDoom/src/d_ticcmd.h                   |    95 +-
 games/NXDoom/src/deh_defs.h                   |   125 +-
 games/NXDoom/src/deh_io.c                     |   457 +-
 games/NXDoom/src/deh_io.h                     |    63 +-
 games/NXDoom/src/deh_main.c                   |   661 +-
 games/NXDoom/src/deh_main.h                   |    81 +-
 games/NXDoom/src/deh_mapping.c                |   238 +-
 games/NXDoom/src/deh_mapping.h                |   133 +-
 games/NXDoom/src/deh_str.c                    |   495 +-
 games/NXDoom/src/deh_str.h                    |    64 +-
 games/NXDoom/src/deh_text.c                   |   213 +-
 games/NXDoom/src/doom-res.rc.in               |    30 -
 games/NXDoom/src/doom/CMakeLists.txt          |    91 -
 games/NXDoom/src/doom/Makefile.am             |    83 -
 games/NXDoom/src/doom/am_map.c                |  2699 +--
 games/NXDoom/src/doom/am_map.h                |   116 +-
 games/NXDoom/src/doom/d_englsh.h              |  1380 +-
 games/NXDoom/src/doom/d_french.h              |   698 +
 games/NXDoom/src/doom/d_items.c               |   225 +-
 games/NXDoom/src/doom/d_items.h               |    70 +-
 games/NXDoom/src/doom/d_main.c                |  3544 ++--
 games/NXDoom/src/doom/d_main.h                |    85 +-
 games/NXDoom/src/doom/d_net.c                 |   544 +-
 games/NXDoom/src/doom/d_player.h              |   329 +-
 games/NXDoom/src/doom/d_textur.h              |    69 +-
 games/NXDoom/src/doom/d_think.h               |    96 +-
 games/NXDoom/src/doom/deh_ammo.c              |   197 +-
 games/NXDoom/src/doom/deh_bexstr.c            |   184 +-
 games/NXDoom/src/doom/deh_cheat.c             |   281 +-
 games/NXDoom/src/doom/deh_doom.c              |    67 +-
 games/NXDoom/src/doom/deh_frame.c             |   315 +-
 games/NXDoom/src/doom/deh_misc.c              |   387 +-
 games/NXDoom/src/doom/deh_misc.h              |    81 +-
 games/NXDoom/src/doom/deh_ptr.c               |   276 +-
 games/NXDoom/src/doom/deh_sound.c             |   197 +-
 games/NXDoom/src/doom/deh_thing.c             |   248 +-
 games/NXDoom/src/doom/deh_weapon.c            |   186 +-
 games/NXDoom/src/doom/doom_icon.c             |  2736 ----
 games/NXDoom/src/doom/doomdata.h              |   363 +-
 games/NXDoom/src/doom/doomdef.c               |    53 +-
 games/NXDoom/src/doom/doomdef.h               |   235 +-
 games/NXDoom/src/doom/doomstat.c              |    64 +-
 games/NXDoom/src/doom/doomstat.h              |   380 +-
 games/NXDoom/src/doom/dstrings.c              |    92 +-
 games/NXDoom/src/doom/dstrings.h              |    75 +-
 games/NXDoom/src/doom/f_finale.c              |  1371 +-
 games/NXDoom/src/doom/f_finale.h              |    64 +-
 games/NXDoom/src/doom/f_wipe.c                |   484 +-
 games/NXDoom/src/doom/f_wipe.h                |    88 +-
 games/NXDoom/src/doom/g_game.c                |  4634 +++---
 games/NXDoom/src/doom/g_game.h                |   155 +-
 games/NXDoom/src/doom/hu_lib.c                |   519 +-
 games/NXDoom/src/doom/hu_lib.h                |   250 +-
 games/NXDoom/src/doom/hu_stuff.c              |  1160 +-
 games/NXDoom/src/doom/hu_stuff.h              |    98 +-
 games/NXDoom/src/doom/info.c                  |  9980 +++++------
 games/NXDoom/src/doom/info.h                  |  2661 +--
 games/NXDoom/src/doom/m_menu.c                |  3898 ++---
 games/NXDoom/src/doom/m_menu.h                |   112 +-
 games/NXDoom/src/doom/m_random.c              |   130 +-
 games/NXDoom/src/doom/m_random.h              |    66 +-
 games/NXDoom/src/doom/p_ceilng.c              |   547 +-
 games/NXDoom/src/doom/p_doors.c               |  1535 +-
 games/NXDoom/src/doom/p_enemy.c               |  3744 +++--
 games/NXDoom/src/doom/p_floor.c               |  1012 +-
 games/NXDoom/src/doom/p_inter.c               |  1619 +-
 games/NXDoom/src/doom/p_inter.h               |    48 +-
 games/NXDoom/src/doom/p_lights.c              |   552 +-
 games/NXDoom/src/doom/p_local.h               |   427 +-
 games/NXDoom/src/doom/p_map.c                 |  2725 +--
 games/NXDoom/src/doom/p_maputl.c              |  1801 +-
 games/NXDoom/src/doom/p_mobj.c                |  1984 +--
 games/NXDoom/src/doom/p_mobj.h                |   547 +-
 games/NXDoom/src/doom/p_plats.c               |   526 +-
 games/NXDoom/src/doom/p_pspr.c                |  1431 +-
 games/NXDoom/src/doom/p_pspr.h                |   111 +-
 games/NXDoom/src/doom/p_saveg.c               |  2795 ++--
 games/NXDoom/src/doom/p_saveg.h               |   117 +-
 games/NXDoom/src/doom/p_setup.c               |  1531 +-
 games/NXDoom/src/doom/p_setup.h               |    68 +-
 games/NXDoom/src/doom/p_sight.c               |   617 +-
 games/NXDoom/src/doom/p_spec.c                |  2761 ++--
 games/NXDoom/src/doom/p_spec.h                |   926 +-
 games/NXDoom/src/doom/p_switch.c              |  1175 +-
 games/NXDoom/src/doom/p_telept.c              |   215 +-
 games/NXDoom/src/doom/p_tick.c                |   226 +-
 games/NXDoom/src/doom/p_tick.h                |    53 +-
 games/NXDoom/src/doom/p_user.c                |   640 +-
 games/NXDoom/src/doom/r_bsp.c                 |  1119 +-
 games/NXDoom/src/doom/r_bsp.h                 |    96 +-
 games/NXDoom/src/doom/r_data.c                |  1572 +-
 games/NXDoom/src/doom/r_data.h                |   101 +-
 games/NXDoom/src/doom/r_defs.h                |   656 +-
 games/NXDoom/src/doom/r_draw.c                |  1722 +-
 games/NXDoom/src/doom/r_draw.h                |   147 +-
 games/NXDoom/src/doom/r_local.h               |    69 +-
 games/NXDoom/src/doom/r_main.c                |  1499 +-
 games/NXDoom/src/doom/r_main.h                |   217 +-
 games/NXDoom/src/doom/r_plane.c               |   726 +-
 games/NXDoom/src/doom/r_plane.h               |   105 +-
 games/NXDoom/src/doom/r_segs.c                |  1410 +-
 games/NXDoom/src/doom/r_segs.h                |    55 +-
 games/NXDoom/src/doom/r_sky.c                 |    92 +-
 games/NXDoom/src/doom/r_sky.h                 |    69 +-
 games/NXDoom/src/doom/r_state.h               |   171 +-
 games/NXDoom/src/doom/r_things.c              |  1654 +-
 games/NXDoom/src/doom/r_things.h              |    98 +-
 games/NXDoom/src/doom/s_sound.c               |   997 +-
 games/NXDoom/src/doom/s_sound.h               |   153 +-
 games/NXDoom/src/doom/sounds.c                |   226 +-
 games/NXDoom/src/doom/sounds.h                |   434 +-
 games/NXDoom/src/doom/st_lib.c                |   379 +-
 games/NXDoom/src/doom/st_lib.h                |   278 +-
 games/NXDoom/src/doom/st_stuff.c              |  2477 +--
 games/NXDoom/src/doom/st_stuff.h              |   112 +-
 games/NXDoom/src/doom/statdump.c              |   389 +-
 games/NXDoom/src/doom/statdump.h              |    43 +-
 games/NXDoom/src/doom/wi_stuff.c              |  3348 ++--
 games/NXDoom/src/doom/wi_stuff.h              |   100 +-
 games/NXDoom/src/doomkeys.h                   |   420 +-
 games/NXDoom/src/doomtype.h                   |   166 +-
 games/NXDoom/src/gusconf.c                    |   362 +-
 games/NXDoom/src/gusconf.h                    |    52 +-
 games/NXDoom/src/heretic-res.rc.in            |    30 -
 games/NXDoom/src/heretic/.gitignore           |     6 -
 games/NXDoom/src/heretic/CMakeLists.txt       |    77 -
 games/NXDoom/src/heretic/Makefile.am          |    72 -
 games/NXDoom/src/heretic/am_data.h            |   103 -
 games/NXDoom/src/heretic/am_map.c             |  1535 --
 games/NXDoom/src/heretic/am_map.h             |   124 -
 games/NXDoom/src/heretic/ct_chat.c            |   477 -
 games/NXDoom/src/heretic/ct_chat.h            |    38 -
 games/NXDoom/src/heretic/d_main.c             |  1171 --
 games/NXDoom/src/heretic/d_net.c              |   218 -
 games/NXDoom/src/heretic/deh_ammo.c           |   113 -
 games/NXDoom/src/heretic/deh_frame.c          |   335 -
 games/NXDoom/src/heretic/deh_htext.c          |   845 -
 games/NXDoom/src/heretic/deh_htic.c           |   182 -
 games/NXDoom/src/heretic/deh_htic.h           |    56 -
 games/NXDoom/src/heretic/deh_sound.c          |   108 -
 games/NXDoom/src/heretic/deh_thing.c          |   144 -
 games/NXDoom/src/heretic/deh_weapon.c         |   122 -
 games/NXDoom/src/heretic/doomdata.h           |   192 -
 games/NXDoom/src/heretic/doomdef.h            |   858 -
 games/NXDoom/src/heretic/dstrings.h           |   244 -
 games/NXDoom/src/heretic/f_finale.c           |   436 -
 games/NXDoom/src/heretic/g_game.c             |  2284 ---
 games/NXDoom/src/heretic/heretic_icon.c       |  2736 ----
 games/NXDoom/src/heretic/in_lude.c            |  1075 --
 games/NXDoom/src/heretic/info.c               |  5600 -------
 games/NXDoom/src/heretic/info.h               |  1584 --
 games/NXDoom/src/heretic/m_random.c           |    76 -
 games/NXDoom/src/heretic/m_random.h           |    37 -
 games/NXDoom/src/heretic/mn_menu.c            |  1824 ---
 games/NXDoom/src/heretic/p_action.h           |   151 -
 games/NXDoom/src/heretic/p_ceilng.c           |   256 -
 games/NXDoom/src/heretic/p_doors.c            |   380 -
 games/NXDoom/src/heretic/p_enemy.c            |  2711 ---
 games/NXDoom/src/heretic/p_floor.c            |   461 -
 games/NXDoom/src/heretic/p_inter.c            |  1488 --
 games/NXDoom/src/heretic/p_lights.c           |   280 -
 games/NXDoom/src/heretic/p_local.h            |   292 -
 games/NXDoom/src/heretic/p_map.c              |  1696 --
 games/NXDoom/src/heretic/p_maputl.c           |   779 -
 games/NXDoom/src/heretic/p_mobj.c             |  1626 --
 games/NXDoom/src/heretic/p_plats.c            |   259 -
 games/NXDoom/src/heretic/p_pspr.c             |  1907 ---
 games/NXDoom/src/heretic/p_saveg.c            |  1925 ---
 games/NXDoom/src/heretic/p_setup.c            |   709 -
 games/NXDoom/src/heretic/p_sight.c            |   355 -
 games/NXDoom/src/heretic/p_spec.c             |  1306 --
 games/NXDoom/src/heretic/p_spec.h             |   390 -
 games/NXDoom/src/heretic/p_switch.c           |   409 -
 games/NXDoom/src/heretic/p_telept.c           |   164 -
 games/NXDoom/src/heretic/p_tick.c             |   167 -
 games/NXDoom/src/heretic/p_user.c             |  1017 --
 games/NXDoom/src/heretic/r_bsp.c              |   489 -
 games/NXDoom/src/heretic/r_data.c             |   732 -
 games/NXDoom/src/heretic/r_draw.c             |   490 -
 games/NXDoom/src/heretic/r_local.h            |   487 -
 games/NXDoom/src/heretic/r_main.c             |   818 -
 games/NXDoom/src/heretic/r_plane.c            |   511 -
 games/NXDoom/src/heretic/r_segs.c             |   661 -
 games/NXDoom/src/heretic/r_things.c           |  1017 --
 games/NXDoom/src/heretic/s_sound.c            |   607 -
 games/NXDoom/src/heretic/s_sound.h            |    40 -
 games/NXDoom/src/heretic/sb_bar.c             |  1283 --
 games/NXDoom/src/heretic/sounds.c             |   249 -
 games/NXDoom/src/heretic/sounds.h             |   291 -
 games/NXDoom/src/hexen-res.rc.in              |    30 -
 games/NXDoom/src/hexen/.gitignore             |     5 -
 games/NXDoom/src/hexen/CMakeLists.txt         |    78 -
 games/NXDoom/src/hexen/Makefile.am            |    71 -
 games/NXDoom/src/hexen/a_action.c             |  1341 --
 games/NXDoom/src/hexen/am_data.h              |   109 -
 games/NXDoom/src/hexen/am_map.c               |  1544 --
 games/NXDoom/src/hexen/am_map.h               |   128 -
 games/NXDoom/src/hexen/ct_chat.c              |   497 -
 games/NXDoom/src/hexen/ct_chat.h              |    38 -
 games/NXDoom/src/hexen/d_net.c                |   283 -
 games/NXDoom/src/hexen/f_finale.c             |   387 -
 games/NXDoom/src/hexen/g_game.c               |  2347 ---
 games/NXDoom/src/hexen/h2_main.c              |  1227 --
 games/NXDoom/src/hexen/h2def.h                |  1121 --
 games/NXDoom/src/hexen/hexen_icon.c           |  2736 ----
 games/NXDoom/src/hexen/in_lude.c              |   607 -
 games/NXDoom/src/hexen/info.c                 | 13654 ----------------
 games/NXDoom/src/hexen/info.h                 |  3626 ----
 games/NXDoom/src/hexen/m_random.c             |    80 -
 games/NXDoom/src/hexen/m_random.h             |    37 -
 games/NXDoom/src/hexen/mn_menu.c              |  1952 ---
 games/NXDoom/src/hexen/p_acs.c                |  1996 ---
 games/NXDoom/src/hexen/p_action.h             |   240 -
 games/NXDoom/src/hexen/p_anim.c               |   477 -
 games/NXDoom/src/hexen/p_ceilng.c             |   303 -
 games/NXDoom/src/hexen/p_doors.c              |   319 -
 games/NXDoom/src/hexen/p_enemy.c              |  5428 ------
 games/NXDoom/src/hexen/p_floor.c              |   946 --
 games/NXDoom/src/hexen/p_inter.c              |  2231 ---
 games/NXDoom/src/hexen/p_lights.c             |   369 -
 games/NXDoom/src/hexen/p_local.h              |   429 -
 games/NXDoom/src/hexen/p_map.c                |  2338 ---
 games/NXDoom/src/hexen/p_maputl.c             |  1072 --
 games/NXDoom/src/hexen/p_mobj.c               |  2469 ---
 games/NXDoom/src/hexen/p_plats.c              |   277 -
 games/NXDoom/src/hexen/p_pspr.c               |  2476 ---
 games/NXDoom/src/hexen/p_setup.c              |  1273 --
 games/NXDoom/src/hexen/p_sight.c              |   398 -
 games/NXDoom/src/hexen/p_spec.c               |  1202 --
 games/NXDoom/src/hexen/p_spec.h               |   586 -
 games/NXDoom/src/hexen/p_switch.c             |   172 -
 games/NXDoom/src/hexen/p_telept.c             |   190 -
 games/NXDoom/src/hexen/p_things.c             |   537 -
 games/NXDoom/src/hexen/p_tick.c               |   151 -
 games/NXDoom/src/hexen/p_user.c               |  1643 --
 games/NXDoom/src/hexen/po_man.c               |  1505 --
 games/NXDoom/src/hexen/r_bsp.c                |   508 -
 games/NXDoom/src/hexen/r_data.c               |   689 -
 games/NXDoom/src/hexen/r_draw.c               |   558 -
 games/NXDoom/src/hexen/r_local.h              |   554 -
 games/NXDoom/src/hexen/r_main.c               |   830 -
 games/NXDoom/src/hexen/r_plane.c              |   579 -
 games/NXDoom/src/hexen/r_segs.c               |   654 -
 games/NXDoom/src/hexen/r_things.c             |  1044 --
 games/NXDoom/src/hexen/s_sound.c              |  1014 --
 games/NXDoom/src/hexen/s_sound.h              |    94 -
 games/NXDoom/src/hexen/sb_bar.c               |  2000 ---
 games/NXDoom/src/hexen/sc_man.c               |   465 -
 games/NXDoom/src/hexen/sn_sonix.c             |   535 -
 games/NXDoom/src/hexen/sounds.c               |   313 -
 games/NXDoom/src/hexen/sounds.h               |   321 -
 games/NXDoom/src/hexen/st_start.c             |   310 -
 games/NXDoom/src/hexen/st_start.h             |    41 -
 games/NXDoom/src/hexen/sv_save.c              |  3508 ----
 games/NXDoom/src/hexen/textdefs.h             |   172 -
 games/NXDoom/src/hexen/xddefs.h               |   189 -
 games/NXDoom/src/i_cdmus.c                    |    79 -
 games/NXDoom/src/i_cdmus.h                    |    41 -
 games/NXDoom/src/i_endoom.c                   |   108 +-
 games/NXDoom/src/i_endoom.h                   |    53 +-
 games/NXDoom/src/i_flmusic.c                  |   332 -
 games/NXDoom/src/i_glob.c                     |   576 +-
 games/NXDoom/src/i_glob.h                     |   107 +-
 games/NXDoom/src/i_input.c                    |   695 +-
 games/NXDoom/src/i_input.h                    |    88 +-
 games/NXDoom/src/i_joystick.c                 |   867 +-
 games/NXDoom/src/i_joystick.h                 |   167 +-
 games/NXDoom/src/i_main.c                     |   110 +-
 games/NXDoom/src/i_musicpack.c                |  1518 +-
 games/NXDoom/src/i_oplmusic.c                 |  1898 ---
 games/NXDoom/src/i_pcsound.c                  |   522 +-
 games/NXDoom/src/i_sdlmusic.c                 |   518 +-
 games/NXDoom/src/i_sdlsound.c                 |  1146 --
 games/NXDoom/src/i_sound.c                    |   637 +-
 games/NXDoom/src/i_sound.h                    |   398 +-
 games/NXDoom/src/i_swap.h                     |    71 +-
 games/NXDoom/src/i_system.c                   |   828 +-
 games/NXDoom/src/i_system.h                   |   155 +-
 games/NXDoom/src/i_timer.c                    |   139 +-
 games/NXDoom/src/i_timer.h                    |    94 +-
 games/NXDoom/src/i_video.c                    |  2181 +--
 games/NXDoom/src/i_video.h                    |   184 +-
 games/NXDoom/src/i_videohr.c                  |   257 -
 games/NXDoom/src/i_videohr.h                  |    35 -
 games/NXDoom/src/i_winmusic.c                 |  1920 ---
 games/NXDoom/src/m_argv.c                     |   867 +-
 games/NXDoom/src/m_argv.h                     |   111 +-
 games/NXDoom/src/m_bbox.c                     |    87 +-
 games/NXDoom/src/m_bbox.h                     |    76 +-
 games/NXDoom/src/m_cheat.c                    |   142 +-
 games/NXDoom/src/m_cheat.h                    |    90 +-
 games/NXDoom/src/m_config.c                   |  3969 +++--
 games/NXDoom/src/m_config.h                   |    83 +-
 games/NXDoom/src/m_controls.c                 |   560 +-
 games/NXDoom/src/m_controls.h                 |    71 +-
 games/NXDoom/src/m_fixed.c                    |    78 +-
 games/NXDoom/src/m_fixed.h                    |    64 +-
 games/NXDoom/src/m_misc.c                     |  1378 +-
 games/NXDoom/src/m_misc.h                     |   180 +-
 games/NXDoom/src/memio.c                      |   276 +-
 games/NXDoom/src/memio.h                      |    55 +-
 games/NXDoom/src/midifallback.c               |   370 -
 games/NXDoom/src/midifallback.h               |    47 -
 games/NXDoom/src/midifile.c                   |  1038 +-
 games/NXDoom/src/midifile.h                   |   301 +-
 games/NXDoom/src/mus2mid.c                    |   916 +-
 games/NXDoom/src/mus2mid.h                    |    52 +-
 games/NXDoom/src/net_client.c                 |  1580 +-
 games/NXDoom/src/net_client.h                 |    74 +-
 games/NXDoom/src/net_common.c                 |   747 +-
 games/NXDoom/src/net_common.h                 |   203 +-
 games/NXDoom/src/net_dedicated.c              |   115 +-
 games/NXDoom/src/net_dedicated.h              |    45 +-
 games/NXDoom/src/net_defs.h                   |   407 +-
 games/NXDoom/src/net_gui.c                    |   521 +-
 games/NXDoom/src/net_gui.h                    |    53 +-
 games/NXDoom/src/net_io.c                     |   185 +-
 games/NXDoom/src/net_io.h                     |   115 +-
 games/NXDoom/src/net_loop.c                   |   433 +-
 games/NXDoom/src/net_loop.h                   |    48 +-
 games/NXDoom/src/net_packet.c                 |   499 +-
 games/NXDoom/src/net_packet.h                 |    75 +-
 games/NXDoom/src/net_petname.c                |   118 -
 games/NXDoom/src/net_petname.h                |    18 -
 games/NXDoom/src/net_query.c                  |  1409 +-
 games/NXDoom/src/net_query.h                  |    74 +-
 games/NXDoom/src/net_sdl.c                    |   467 +-
 games/NXDoom/src/net_sdl.h                    |    49 +-
 games/NXDoom/src/net_server.c                 |  2669 +--
 games/NXDoom/src/net_server.h                 |    63 +-
 games/NXDoom/src/net_structrw.c               |   972 +-
 games/NXDoom/src/net_structrw.h               |   101 +-
 games/NXDoom/src/p_rejectpad.c                |   123 +-
 games/NXDoom/src/p_rejectpad.h                |    55 +-
 games/NXDoom/src/setup-res.rc.in              |    28 -
 games/NXDoom/src/setup/.gitignore             |     7 -
 games/NXDoom/src/setup/CMakeLists.txt         |    32 -
 games/NXDoom/src/setup/Makefile.am            |    42 -
 games/NXDoom/src/setup/Setup.desktop.in       |     8 -
 games/NXDoom/src/setup/compatibility.c        |    51 -
 games/NXDoom/src/setup/compatibility.h        |    24 -
 games/NXDoom/src/setup/display.c              |   289 -
 games/NXDoom/src/setup/display.h              |    26 -
 games/NXDoom/src/setup/execute.c              |   429 -
 games/NXDoom/src/setup/execute.h              |    40 -
 games/NXDoom/src/setup/joystick.c             |  1365 --
 games/NXDoom/src/setup/joystick.h             |    32 -
 games/NXDoom/src/setup/keyboard.c             |   448 -
 games/NXDoom/src/setup/keyboard.h             |    23 -
 games/NXDoom/src/setup/mainmenu.c             |   346 -
 games/NXDoom/src/setup/mode.c                 |   384 -
 games/NXDoom/src/setup/mode.h                 |    31 -
 games/NXDoom/src/setup/mouse.c                |   176 -
 games/NXDoom/src/setup/mouse.h                |    23 -
 games/NXDoom/src/setup/multiplayer.c          |  1191 --
 games/NXDoom/src/setup/multiplayer.h          |    29 -
 games/NXDoom/src/setup/setup-manifest.xml.in  |    48 -
 games/NXDoom/src/setup/setup_icon.c           |  2736 ----
 games/NXDoom/src/setup/sound.c                |   410 -
 games/NXDoom/src/setup/sound.h                |    24 -
 games/NXDoom/src/setup/txt_joyaxis.c          |   654 -
 games/NXDoom/src/setup/txt_joyaxis.h          |    90 -
 games/NXDoom/src/setup/txt_joybinput.c        |   780 -
 games/NXDoom/src/setup/txt_joybinput.h        |    40 -
 games/NXDoom/src/setup/txt_keyinput.c         |   185 -
 games/NXDoom/src/setup/txt_keyinput.h         |    38 -
 games/NXDoom/src/setup/txt_mouseinput.c       |   184 -
 games/NXDoom/src/setup/txt_mouseinput.h       |    38 -
 games/NXDoom/src/sha1.c                       |   321 -
 games/NXDoom/src/sha1.h                       |    79 +-
 games/NXDoom/src/strife-res.rc.in             |    30 -
 games/NXDoom/src/strife/.gitignore            |     5 -
 games/NXDoom/src/strife/CMakeLists.txt        |    92 -
 games/NXDoom/src/strife/Makefile.am           |    85 -
 games/NXDoom/src/strife/am_map.c              |  1415 --
 games/NXDoom/src/strife/am_map.h              |    49 -
 games/NXDoom/src/strife/d_englsh.h            |   593 -
 games/NXDoom/src/strife/d_items.c             |   159 -
 games/NXDoom/src/strife/d_items.h             |    42 -
 games/NXDoom/src/strife/d_main.c              |  2191 ---
 games/NXDoom/src/strife/d_main.h              |    64 -
 games/NXDoom/src/strife/d_net.c               |   290 -
 games/NXDoom/src/strife/d_player.h            |   249 -
 games/NXDoom/src/strife/d_textur.h            |    43 -
 games/NXDoom/src/strife/d_think.h             |    68 -
 games/NXDoom/src/strife/deh_ammo.c            |   103 -
 games/NXDoom/src/strife/deh_cheat.c           |   148 -
 games/NXDoom/src/strife/deh_frame.c           |   159 -
 games/NXDoom/src/strife/deh_misc.c            |   228 -
 games/NXDoom/src/strife/deh_misc.h            |    79 -
 games/NXDoom/src/strife/deh_ptr.c             |   142 -
 games/NXDoom/src/strife/deh_sound.c           |   102 -
 games/NXDoom/src/strife/deh_strife.c          |    47 -
 games/NXDoom/src/strife/deh_thing.c           |   132 -
 games/NXDoom/src/strife/deh_weapon.c          |   102 -
 games/NXDoom/src/strife/doomdata.h            |   225 -
 games/NXDoom/src/strife/doomdef.c             |    28 -
 games/NXDoom/src/strife/doomdef.h             |   291 -
 games/NXDoom/src/strife/doomstat.c            |    35 -
 games/NXDoom/src/strife/doomstat.h            |   281 -
 games/NXDoom/src/strife/dstrings.c            |    73 -
 games/NXDoom/src/strife/dstrings.h            |    41 -
 games/NXDoom/src/strife/f_finale.c            |  1047 --
 games/NXDoom/src/strife/f_finale.h            |    48 -
 games/NXDoom/src/strife/f_wipe.c              |   292 -
 games/NXDoom/src/strife/f_wipe.h              |    63 -
 games/NXDoom/src/strife/g_game.c              |  2534 ---
 games/NXDoom/src/strife/g_game.h              |    89 -
 games/NXDoom/src/strife/hu_lib.c              |   474 -
 games/NXDoom/src/strife/hu_lib.h              |   185 -
 games/NXDoom/src/strife/hu_stuff.c            |   687 -
 games/NXDoom/src/strife/hu_stuff.h            |    75 -
 games/NXDoom/src/strife/info.c                | 11041 -------------
 games/NXDoom/src/strife/info.h                |  2219 ---
 games/NXDoom/src/strife/m_menu.c              |  2466 ---
 games/NXDoom/src/strife/m_menu.h              |   104 -
 games/NXDoom/src/strife/m_random.c            |    80 -
 games/NXDoom/src/strife/m_random.h            |    39 -
 games/NXDoom/src/strife/m_saves.c             |   482 -
 games/NXDoom/src/strife/m_saves.h             |    55 -
 games/NXDoom/src/strife/p_ceilng.c            |   343 -
 games/NXDoom/src/strife/p_dialog.c            |  1413 --
 games/NXDoom/src/strife/p_dialog.h            |   102 -
 games/NXDoom/src/strife/p_doors.c             |  1370 --
 games/NXDoom/src/strife/p_enemy.c             |  3388 ----
 games/NXDoom/src/strife/p_floor.c             |   597 -
 games/NXDoom/src/strife/p_inter.c             |  1411 --
 games/NXDoom/src/strife/p_inter.h             |    32 -
 games/NXDoom/src/strife/p_lights.c            |   372 -
 games/NXDoom/src/strife/p_local.h             |   311 -
 games/NXDoom/src/strife/p_map.c               |  1643 --
 games/NXDoom/src/strife/p_maputl.c            |  1056 --
 games/NXDoom/src/strife/p_mobj.c              |  1360 --
 games/NXDoom/src/strife/p_mobj.h              |   330 -
 games/NXDoom/src/strife/p_plats.c             |   358 -
 games/NXDoom/src/strife/p_pspr.c              |  1003 --
 games/NXDoom/src/strife/p_pspr.h              |    86 -
 games/NXDoom/src/strife/p_saveg.c             |  2208 ---
 games/NXDoom/src/strife/p_saveg.h             |    62 -
 games/NXDoom/src/strife/p_setup.c             |   808 -
 games/NXDoom/src/strife/p_setup.h             |    37 -
 games/NXDoom/src/strife/p_sight.c             |   360 -
 games/NXDoom/src/strife/p_spec.c              |  1984 ---
 games/NXDoom/src/strife/p_spec.h              |   678 -
 games/NXDoom/src/strife/p_switch.c            |  1078 --
 games/NXDoom/src/strife/p_telept.c            |   151 -
 games/NXDoom/src/strife/p_tick.c              |   160 -
 games/NXDoom/src/strife/p_tick.h              |    33 -
 games/NXDoom/src/strife/p_user.c              |   920 --
 games/NXDoom/src/strife/r_bsp.c               |   583 -
 games/NXDoom/src/strife/r_bsp.h               |    61 -
 games/NXDoom/src/strife/r_data.c              |  1010 --
 games/NXDoom/src/strife/r_data.h              |    56 -
 games/NXDoom/src/strife/r_defs.h              |   448 -
 games/NXDoom/src/strife/r_draw.c              |   968 --
 games/NXDoom/src/strife/r_draw.h              |   111 -
 games/NXDoom/src/strife/r_local.h             |    45 -
 games/NXDoom/src/strife/r_main.c              |   944 --
 games/NXDoom/src/strife/r_main.h              |   164 -
 games/NXDoom/src/strife/r_plane.c             |   447 -
 games/NXDoom/src/strife/r_plane.h             |    76 -
 games/NXDoom/src/strife/r_segs.c              |   754 -
 games/NXDoom/src/strife/r_segs.h              |    34 -
 games/NXDoom/src/strife/r_sky.c               |    54 -
 games/NXDoom/src/strife/r_sky.h               |    37 -
 games/NXDoom/src/strife/r_state.h             |   127 -
 games/NXDoom/src/strife/r_things.c            |  1067 --
 games/NXDoom/src/strife/r_things.h            |    66 -
 games/NXDoom/src/strife/s_sound.c             |   825 -
 games/NXDoom/src/strife/s_sound.h             |    95 -
 games/NXDoom/src/strife/sounds.c              |   227 -
 games/NXDoom/src/strife/sounds.h              |   222 -
 games/NXDoom/src/strife/st_lib.c              |   326 -
 games/NXDoom/src/strife/st_lib.h              |   221 -
 games/NXDoom/src/strife/st_stuff.c            |  1605 --
 games/NXDoom/src/strife/st_stuff.h            |    80 -
 games/NXDoom/src/strife/strife_icon.c         |  2736 ----
 games/NXDoom/src/strife/wi_stuff.c            |  1836 ---
 games/NXDoom/src/strife/wi_stuff.h            |    51 -
 games/NXDoom/src/tables.c                     |  4532 ++---
 games/NXDoom/src/tables.h                     |   167 +-
 games/NXDoom/src/v_diskicon.c                 |   221 +-
 games/NXDoom/src/v_diskicon.h                 |    60 +-
 games/NXDoom/src/v_patch.h                    |    98 +-
 games/NXDoom/src/v_video.c                    |  1744 +-
 games/NXDoom/src/v_video.h                    |   209 +-
 games/NXDoom/src/w_checksum.c                 |   127 +-
 games/NXDoom/src/w_checksum.h                 |    50 +-
 games/NXDoom/src/w_file.c                     |   106 +-
 games/NXDoom/src/w_file.h                     |   141 +-
 games/NXDoom/src/w_file_posix.c               |   176 -
 games/NXDoom/src/w_file_stdc.c                |   187 +-
 games/NXDoom/src/w_file_win32.c               |   204 -
 games/NXDoom/src/w_main.c                     |   510 +-
 games/NXDoom/src/w_main.h                     |    55 +-
 games/NXDoom/src/w_merge.c                    |  1000 +-
 games/NXDoom/src/w_merge.h                    |    72 +-
 games/NXDoom/src/w_wad.c                      |   900 +-
 games/NXDoom/src/w_wad.h                      |   107 +-
 games/NXDoom/src/z_native.c                   |   754 +-
 games/NXDoom/src/z_zone.c                     |   871 +-
 games/NXDoom/src/z_zone.h                     |   130 +-
 games/NXDoom/textscreen/CMakeLists.txt        |    33 -
 games/NXDoom/textscreen/Doxyfile              |  2451 ---
 games/NXDoom/textscreen/Makefile.am           |    41 -
 games/NXDoom/textscreen/examples/.gitignore   |     8 -
 games/NXDoom/textscreen/examples/Makefile.am  |    11 -
 games/NXDoom/textscreen/examples/calculator.c |   180 -
 games/NXDoom/textscreen/examples/guitest.c    |   308 -
 games/NXDoom/textscreen/fonts/Makefile.am     |    18 -
 games/NXDoom/textscreen/fonts/codepage.h      |   214 +-
 games/NXDoom/textscreen/fonts/large.h         |  3435 ++--
 games/NXDoom/textscreen/fonts/normal.h        |   875 +-
 games/NXDoom/textscreen/fonts/small.h         |   235 +-
 games/NXDoom/textscreen/textscreen.h          |    43 +-
 games/NXDoom/textscreen/txt_button.c          |   220 +-
 games/NXDoom/textscreen/txt_button.h          |    72 +-
 games/NXDoom/textscreen/txt_checkbox.c        |   256 +-
 games/NXDoom/textscreen/txt_checkbox.h        |    72 +-
 games/NXDoom/textscreen/txt_conditional.c     |   205 +-
 games/NXDoom/textscreen/txt_conditional.h     |    56 +-
 games/NXDoom/textscreen/txt_desktop.c         |   626 +-
 games/NXDoom/textscreen/txt_desktop.h         |    95 +-
 games/NXDoom/textscreen/txt_dropdown.c        |   594 +-
 games/NXDoom/textscreen/txt_dropdown.h        |    76 +-
 games/NXDoom/textscreen/txt_fileselect.c      |  1119 +-
 games/NXDoom/textscreen/txt_fileselect.h      |    83 +-
 games/NXDoom/textscreen/txt_font.h            |    29 +
 games/NXDoom/textscreen/txt_gui.c             |   595 +-
 games/NXDoom/textscreen/txt_gui.h             |    72 +-
 games/NXDoom/textscreen/txt_inputbox.c        |   660 +-
 games/NXDoom/textscreen/txt_inputbox.h        |    76 +-
 games/NXDoom/textscreen/txt_io.c              |   239 +-
 games/NXDoom/textscreen/txt_io.h              |    72 +-
 games/NXDoom/textscreen/txt_label.c           |   330 +-
 games/NXDoom/textscreen/txt_label.h           |    85 +-
 games/NXDoom/textscreen/txt_main.h            |   328 +-
 games/NXDoom/textscreen/txt_radiobutton.c     |   268 +-
 games/NXDoom/textscreen/txt_radiobutton.h     |    80 +-
 games/NXDoom/textscreen/txt_scrollpane.c      |  1178 +-
 games/NXDoom/textscreen/txt_scrollpane.h      |    76 +-
 games/NXDoom/textscreen/txt_sdl.c             |  1120 +-
 games/NXDoom/textscreen/txt_sdl.h             |    70 +-
 games/NXDoom/textscreen/txt_separator.c       |   213 +-
 games/NXDoom/textscreen/txt_separator.h       |    78 +-
 games/NXDoom/textscreen/txt_spinctrl.c        |   818 +-
 games/NXDoom/textscreen/txt_spinctrl.h        |    98 +-
 games/NXDoom/textscreen/txt_strut.c           |   129 +-
 games/NXDoom/textscreen/txt_strut.h           |    68 +-
 games/NXDoom/textscreen/txt_table.c           |  2392 +--
 games/NXDoom/textscreen/txt_table.h           |   132 +-
 games/NXDoom/textscreen/txt_utf8.c            |   191 +-
 games/NXDoom/textscreen/txt_utf8.h            |    48 +-
 games/NXDoom/textscreen/txt_widget.c          |   402 +-
 games/NXDoom/textscreen/txt_widget.h          |   197 +-
 games/NXDoom/textscreen/txt_window.c          |   873 +-
 games/NXDoom/textscreen/txt_window.h          |   172 +-
 games/NXDoom/textscreen/txt_window_action.c   |   278 +-
 games/NXDoom/textscreen/txt_window_action.h   |    86 +-
 games/NXDoom/vcpkg.json                       |    10 -
 games/NXDoom/win32/win_opendir.c              |   360 -
 games/NXDoom/win32/win_opendir.h              |   110 -
 722 files changed, 81215 insertions(+), 314155 deletions(-)
 delete mode 100644 games/NXDoom/.devcontainer/.gitignore
 delete mode 100644 games/NXDoom/.devcontainer/Dockerfile
 delete mode 100644 games/NXDoom/.devcontainer/devcontainer.json
 delete mode 100755 games/NXDoom/.devcontainer/initialize-linux.sh
 delete mode 100644 games/NXDoom/.github/CONTRIBUTING.md
 delete mode 100644 games/NXDoom/.github/ISSUE_TEMPLATE.md
 delete mode 100644 games/NXDoom/.github/workflows/cpp-linter.yml
 delete mode 100644 games/NXDoom/.github/workflows/cppcheck.yml
 delete mode 100644 games/NXDoom/.github/workflows/main.yml
 delete mode 100644 games/NXDoom/.gitmodules
 delete mode 100644 games/NXDoom/.lvimrc
 delete mode 100755 games/NXDoom/.travis.sh
 delete mode 100644 games/NXDoom/CMakeLists.txt
 delete mode 100644 games/NXDoom/CODE_OF_CONDUCT.md
 delete mode 100644 games/NXDoom/ChangeLog
 delete mode 100644 games/NXDoom/HACKING.md
 create mode 100644 games/NXDoom/Kconfig
 create mode 100644 games/NXDoom/Make.defs
 create mode 100644 games/NXDoom/Makefile
 delete mode 100644 games/NXDoom/Makefile.am
 delete mode 100644 games/NXDoom/NEWS.md
 delete mode 100644 games/NXDoom/NOT-BUGS.md
 delete mode 100644 games/NXDoom/PHILOSOPHY.md
 delete mode 100644 games/NXDoom/README.Music.md
 delete mode 100644 games/NXDoom/README.Strife.md
 delete mode 100644 games/NXDoom/README.md
 delete mode 100644 games/NXDoom/RELEASE_NOTES.md
 delete mode 100644 games/NXDoom/TODO.md
 delete mode 100755 games/NXDoom/autogen.sh
 delete mode 100755 games/NXDoom/check-extern.sh
 delete mode 100644 games/NXDoom/cmake/FindFluidSynth.cmake
 delete mode 100644 games/NXDoom/cmake/FindSDL2.cmake
 delete mode 100644 games/NXDoom/cmake/FindSDL2_mixer.cmake
 delete mode 100644 games/NXDoom/cmake/FindSDL2_net.cmake
 delete mode 100644 games/NXDoom/cmake/FindSampleRate.cmake
 delete mode 100644 games/NXDoom/cmake/Findm.cmake
 delete mode 100644 games/NXDoom/cmake/config.h.cin
 delete mode 100644 games/NXDoom/configure.ac
 delete mode 100644 games/NXDoom/data/.gitignore
 delete mode 100644 games/NXDoom/data/Makefile.am
 delete mode 100644 games/NXDoom/data/README
 delete mode 100755 games/NXDoom/data/convert-icon
 delete mode 100644 games/NXDoom/data/doom.ico
 delete mode 100644 games/NXDoom/data/doom.png
 delete mode 100644 games/NXDoom/data/heretic.ico
 delete mode 100644 games/NXDoom/data/heretic.png
 delete mode 100644 games/NXDoom/data/hexen.ico
 delete mode 100644 games/NXDoom/data/hexen.png
 delete mode 100644 games/NXDoom/data/setup.ico
 delete mode 100644 games/NXDoom/data/setup.png
 delete mode 100644 games/NXDoom/data/strife.ico
 delete mode 100644 games/NXDoom/data/strife.png
 delete mode 100644 games/NXDoom/data/wadfile.png
 delete mode 100644 games/NXDoom/man/.gitignore
 delete mode 100644 games/NXDoom/man/CMDLINE.template
 delete mode 100644 games/NXDoom/man/CMDLINE.template.md
 delete mode 100644 games/NXDoom/man/INSTALL.template
 delete mode 100644 games/NXDoom/man/Makefile.am
 delete mode 100644 games/NXDoom/man/bash-completion/.gitignore
 delete mode 100644 games/NXDoom/man/bash-completion/Makefile.am
 delete mode 100644 games/NXDoom/man/bash-completion/doom.template.in
 delete mode 100644 games/NXDoom/man/bash-completion/heretic.template.in
 delete mode 100644 games/NXDoom/man/bash-completion/hexen.template.in
 delete mode 100644 games/NXDoom/man/bash-completion/strife.template.in
 delete mode 100644 games/NXDoom/man/default.cfg.template
 delete mode 100755 games/NXDoom/man/docgen
 delete mode 100644 games/NXDoom/man/doom.template
 delete mode 100644 games/NXDoom/man/environ.man
 delete mode 100644 games/NXDoom/man/extra.cfg.template
 delete mode 100644 games/NXDoom/man/heretic.template
 delete mode 100644 games/NXDoom/man/hexen.template
 delete mode 100644 games/NXDoom/man/iwad_paths.man
 delete mode 100644 games/NXDoom/man/server.template
 delete mode 100644 games/NXDoom/man/setup.template
 delete mode 100755 games/NXDoom/man/simplecpp
 delete mode 100644 games/NXDoom/man/strife.template
 delete mode 100644 games/NXDoom/man/wikipages
 delete mode 100644 games/NXDoom/opl/.gitignore
 delete mode 100644 games/NXDoom/opl/CMakeLists.txt
 delete mode 100644 games/NXDoom/opl/Makefile.am
 delete mode 100644 games/NXDoom/opl/examples/.gitignore
 delete mode 100644 games/NXDoom/opl/examples/Makefile.am
 delete mode 100644 games/NXDoom/opl/examples/droplay.c
 delete mode 100644 games/NXDoom/opl/ioperm_sys.c
 delete mode 100644 games/NXDoom/opl/ioperm_sys.h
 delete mode 100644 games/NXDoom/opl/opl.c
 delete mode 100644 games/NXDoom/opl/opl.h
 delete mode 100644 games/NXDoom/opl/opl3.c
 delete mode 100644 games/NXDoom/opl/opl3.h
 delete mode 100644 games/NXDoom/opl/opl_internal.h
 delete mode 100644 games/NXDoom/opl/opl_linux.c
 delete mode 100644 games/NXDoom/opl/opl_obsd.c
 delete mode 100644 games/NXDoom/opl/opl_queue.c
 delete mode 100644 games/NXDoom/opl/opl_queue.h
 delete mode 100644 games/NXDoom/opl/opl_sdl.c
 delete mode 100644 games/NXDoom/opl/opl_timer.c
 delete mode 100644 games/NXDoom/opl/opl_timer.h
 delete mode 100644 games/NXDoom/opl/opl_win32.c
 delete mode 100644 games/NXDoom/pcsound/CMakeLists.txt
 delete mode 100644 games/NXDoom/pcsound/Makefile.am
 delete mode 100644 games/NXDoom/pcsound/pcsound_bsd.c
 delete mode 100644 games/NXDoom/pcsound/pcsound_linux.c
 delete mode 100644 games/NXDoom/pcsound/pcsound_sdl.c
 delete mode 100644 games/NXDoom/pcsound/pcsound_win32.c
 delete mode 100644 games/NXDoom/pkg/.gitignore
 delete mode 100644 games/NXDoom/pkg/Makefile.am
 delete mode 100644 games/NXDoom/pkg/config.make.in
 delete mode 100644 games/NXDoom/pkg/osx/.gitignore
 delete mode 100644 games/NXDoom/pkg/osx/AppController.h
 delete mode 100644 games/NXDoom/pkg/osx/AppController.m
 delete mode 100644 games/NXDoom/pkg/osx/Execute.h
 delete mode 100644 games/NXDoom/pkg/osx/Execute.m
 delete mode 100644 games/NXDoom/pkg/osx/GNUmakefile
 delete mode 100644 games/NXDoom/pkg/osx/IWADController.h
 delete mode 100644 games/NXDoom/pkg/osx/IWADController.m
 delete mode 100644 games/NXDoom/pkg/osx/Info.plist.in
 delete mode 100644 games/NXDoom/pkg/osx/LauncherManager.h
 delete mode 100644 games/NXDoom/pkg/osx/LauncherManager.m
 delete mode 100644 games/NXDoom/pkg/osx/PkgInfo
 delete mode 100644 games/NXDoom/pkg/osx/Resources/app.png
 delete mode 100644 games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib
 delete mode 100644 games/NXDoom/pkg/osx/Resources/launcher.nib/keyedobjects.nib
 delete mode 100755 games/NXDoom/pkg/osx/cp-with-libs
 delete mode 100644 games/NXDoom/pkg/osx/disk/background.png
 delete mode 100644 games/NXDoom/pkg/osx/disk/dir.DS_Store
 delete mode 100755 games/NXDoom/pkg/osx/dmgfix
 delete mode 100644 games/NXDoom/pkg/osx/main.m
 delete mode 100644 games/NXDoom/pkg/style.html
 delete mode 100644 games/NXDoom/pkg/win32/.gitignore
 delete mode 100644 games/NXDoom/pkg/win32/GNUmakefile
 delete mode 100644 games/NXDoom/pkg/win32/README
 delete mode 100755 games/NXDoom/pkg/win32/cp-with-libs
 delete mode 100644 games/NXDoom/rpm.spec.in
 delete mode 100644 games/NXDoom/src/CMakeLists.txt
 delete mode 100644 games/NXDoom/src/Doom.desktop.in
 delete mode 100644 games/NXDoom/src/Doom.metainfo.xml.in
 delete mode 100644 games/NXDoom/src/Doom_Screensaver.desktop.in
 delete mode 100644 games/NXDoom/src/Heretic.desktop.in
 delete mode 100644 games/NXDoom/src/Heretic.metainfo.xml.in
 delete mode 100644 games/NXDoom/src/Hexen.desktop.in
 delete mode 100644 games/NXDoom/src/Hexen.metainfo.xml.in
 delete mode 100644 games/NXDoom/src/Makefile.am
 delete mode 100644 games/NXDoom/src/Strife.desktop.in
 delete mode 100644 games/NXDoom/src/Strife.metainfo.xml.in
 create mode 100644 games/NXDoom/src/config.h
 delete mode 100644 games/NXDoom/src/doom-res.rc.in
 delete mode 100644 games/NXDoom/src/doom/CMakeLists.txt
 delete mode 100644 games/NXDoom/src/doom/Makefile.am
 create mode 100644 games/NXDoom/src/doom/d_french.h
 delete mode 100644 games/NXDoom/src/doom/doom_icon.c
 delete mode 100644 games/NXDoom/src/heretic-res.rc.in
 delete mode 100644 games/NXDoom/src/heretic/.gitignore
 delete mode 100644 games/NXDoom/src/heretic/CMakeLists.txt
 delete mode 100644 games/NXDoom/src/heretic/Makefile.am
 delete mode 100644 games/NXDoom/src/heretic/am_data.h
 delete mode 100644 games/NXDoom/src/heretic/am_map.c
 delete mode 100644 games/NXDoom/src/heretic/am_map.h
 delete mode 100644 games/NXDoom/src/heretic/ct_chat.c
 delete mode 100644 games/NXDoom/src/heretic/ct_chat.h
 delete mode 100644 games/NXDoom/src/heretic/d_main.c
 delete mode 100644 games/NXDoom/src/heretic/d_net.c
 delete mode 100644 games/NXDoom/src/heretic/deh_ammo.c
 delete mode 100644 games/NXDoom/src/heretic/deh_frame.c
 delete mode 100644 games/NXDoom/src/heretic/deh_htext.c
 delete mode 100644 games/NXDoom/src/heretic/deh_htic.c
 delete mode 100644 games/NXDoom/src/heretic/deh_htic.h
 delete mode 100644 games/NXDoom/src/heretic/deh_sound.c
 delete mode 100644 games/NXDoom/src/heretic/deh_thing.c
 delete mode 100644 games/NXDoom/src/heretic/deh_weapon.c
 delete mode 100644 games/NXDoom/src/heretic/doomdata.h
 delete mode 100644 games/NXDoom/src/heretic/doomdef.h
 delete mode 100644 games/NXDoom/src/heretic/dstrings.h
 delete mode 100644 games/NXDoom/src/heretic/f_finale.c
 delete mode 100644 games/NXDoom/src/heretic/g_game.c
 delete mode 100644 games/NXDoom/src/heretic/heretic_icon.c
 delete mode 100644 games/NXDoom/src/heretic/in_lude.c
 delete mode 100644 games/NXDoom/src/heretic/info.c
 delete mode 100644 games/NXDoom/src/heretic/info.h
 delete mode 100644 games/NXDoom/src/heretic/m_random.c
 delete mode 100644 games/NXDoom/src/heretic/m_random.h
 delete mode 100644 games/NXDoom/src/heretic/mn_menu.c
 delete mode 100644 games/NXDoom/src/heretic/p_action.h
 delete mode 100644 games/NXDoom/src/heretic/p_ceilng.c
 delete mode 100644 games/NXDoom/src/heretic/p_doors.c
 delete mode 100644 games/NXDoom/src/heretic/p_enemy.c
 delete mode 100644 games/NXDoom/src/heretic/p_floor.c
 delete mode 100644 games/NXDoom/src/heretic/p_inter.c
 delete mode 100644 games/NXDoom/src/heretic/p_lights.c
 delete mode 100644 games/NXDoom/src/heretic/p_local.h
 delete mode 100644 games/NXDoom/src/heretic/p_map.c
 delete mode 100644 games/NXDoom/src/heretic/p_maputl.c
 delete mode 100644 games/NXDoom/src/heretic/p_mobj.c
 delete mode 100644 games/NXDoom/src/heretic/p_plats.c
 delete mode 100644 games/NXDoom/src/heretic/p_pspr.c
 delete mode 100644 games/NXDoom/src/heretic/p_saveg.c
 delete mode 100644 games/NXDoom/src/heretic/p_setup.c
 delete mode 100644 games/NXDoom/src/heretic/p_sight.c
 delete mode 100644 games/NXDoom/src/heretic/p_spec.c
 delete mode 100644 games/NXDoom/src/heretic/p_spec.h
 delete mode 100644 games/NXDoom/src/heretic/p_switch.c
 delete mode 100644 games/NXDoom/src/heretic/p_telept.c
 delete mode 100644 games/NXDoom/src/heretic/p_tick.c
 delete mode 100644 games/NXDoom/src/heretic/p_user.c
 delete mode 100644 games/NXDoom/src/heretic/r_bsp.c
 delete mode 100644 games/NXDoom/src/heretic/r_data.c
 delete mode 100644 games/NXDoom/src/heretic/r_draw.c
 delete mode 100644 games/NXDoom/src/heretic/r_local.h
 delete mode 100644 games/NXDoom/src/heretic/r_main.c
 delete mode 100644 games/NXDoom/src/heretic/r_plane.c
 delete mode 100644 games/NXDoom/src/heretic/r_segs.c
 delete mode 100644 games/NXDoom/src/heretic/r_things.c
 delete mode 100644 games/NXDoom/src/heretic/s_sound.c
 delete mode 100644 games/NXDoom/src/heretic/s_sound.h
 delete mode 100644 games/NXDoom/src/heretic/sb_bar.c
 delete mode 100644 games/NXDoom/src/heretic/sounds.c
 delete mode 100644 games/NXDoom/src/heretic/sounds.h
 delete mode 100644 games/NXDoom/src/hexen-res.rc.in
 delete mode 100644 games/NXDoom/src/hexen/.gitignore
 delete mode 100644 games/NXDoom/src/hexen/CMakeLists.txt
 delete mode 100644 games/NXDoom/src/hexen/Makefile.am
 delete mode 100644 games/NXDoom/src/hexen/a_action.c
 delete mode 100644 games/NXDoom/src/hexen/am_data.h
 delete mode 100644 games/NXDoom/src/hexen/am_map.c
 delete mode 100644 games/NXDoom/src/hexen/am_map.h
 delete mode 100644 games/NXDoom/src/hexen/ct_chat.c
 delete mode 100644 games/NXDoom/src/hexen/ct_chat.h
 delete mode 100644 games/NXDoom/src/hexen/d_net.c
 delete mode 100644 games/NXDoom/src/hexen/f_finale.c
 delete mode 100644 games/NXDoom/src/hexen/g_game.c
 delete mode 100644 games/NXDoom/src/hexen/h2_main.c
 delete mode 100644 games/NXDoom/src/hexen/h2def.h
 delete mode 100644 games/NXDoom/src/hexen/hexen_icon.c
 delete mode 100644 games/NXDoom/src/hexen/in_lude.c
 delete mode 100644 games/NXDoom/src/hexen/info.c
 delete mode 100644 games/NXDoom/src/hexen/info.h
 delete mode 100644 games/NXDoom/src/hexen/m_random.c
 delete mode 100644 games/NXDoom/src/hexen/m_random.h
 delete mode 100644 games/NXDoom/src/hexen/mn_menu.c
 delete mode 100644 games/NXDoom/src/hexen/p_acs.c
 delete mode 100644 games/NXDoom/src/hexen/p_action.h
 delete mode 100644 games/NXDoom/src/hexen/p_anim.c
 delete mode 100644 games/NXDoom/src/hexen/p_ceilng.c
 delete mode 100644 games/NXDoom/src/hexen/p_doors.c
 delete mode 100644 games/NXDoom/src/hexen/p_enemy.c
 delete mode 100644 games/NXDoom/src/hexen/p_floor.c
 delete mode 100644 games/NXDoom/src/hexen/p_inter.c
 delete mode 100644 games/NXDoom/src/hexen/p_lights.c
 delete mode 100644 games/NXDoom/src/hexen/p_local.h
 delete mode 100644 games/NXDoom/src/hexen/p_map.c
 delete mode 100644 games/NXDoom/src/hexen/p_maputl.c
 delete mode 100644 games/NXDoom/src/hexen/p_mobj.c
 delete mode 100644 games/NXDoom/src/hexen/p_plats.c
 delete mode 100644 games/NXDoom/src/hexen/p_pspr.c
 delete mode 100644 games/NXDoom/src/hexen/p_setup.c
 delete mode 100644 games/NXDoom/src/hexen/p_sight.c
 delete mode 100644 games/NXDoom/src/hexen/p_spec.c
 delete mode 100644 games/NXDoom/src/hexen/p_spec.h
 delete mode 100644 games/NXDoom/src/hexen/p_switch.c
 delete mode 100644 games/NXDoom/src/hexen/p_telept.c
 delete mode 100644 games/NXDoom/src/hexen/p_things.c
 delete mode 100644 games/NXDoom/src/hexen/p_tick.c
 delete mode 100644 games/NXDoom/src/hexen/p_user.c
 delete mode 100644 games/NXDoom/src/hexen/po_man.c
 delete mode 100644 games/NXDoom/src/hexen/r_bsp.c
 delete mode 100644 games/NXDoom/src/hexen/r_data.c
 delete mode 100644 games/NXDoom/src/hexen/r_draw.c
 delete mode 100644 games/NXDoom/src/hexen/r_local.h
 delete mode 100644 games/NXDoom/src/hexen/r_main.c
 delete mode 100644 games/NXDoom/src/hexen/r_plane.c
 delete mode 100644 games/NXDoom/src/hexen/r_segs.c
 delete mode 100644 games/NXDoom/src/hexen/r_things.c
 delete mode 100644 games/NXDoom/src/hexen/s_sound.c
 delete mode 100644 games/NXDoom/src/hexen/s_sound.h
 delete mode 100644 games/NXDoom/src/hexen/sb_bar.c
 delete mode 100644 games/NXDoom/src/hexen/sc_man.c
 delete mode 100644 games/NXDoom/src/hexen/sn_sonix.c
 delete mode 100644 games/NXDoom/src/hexen/sounds.c
 delete mode 100644 games/NXDoom/src/hexen/sounds.h
 delete mode 100644 games/NXDoom/src/hexen/st_start.c
 delete mode 100644 games/NXDoom/src/hexen/st_start.h
 delete mode 100644 games/NXDoom/src/hexen/sv_save.c
 delete mode 100644 games/NXDoom/src/hexen/textdefs.h
 delete mode 100644 games/NXDoom/src/hexen/xddefs.h
 delete mode 100644 games/NXDoom/src/i_cdmus.c
 delete mode 100644 games/NXDoom/src/i_cdmus.h
 delete mode 100644 games/NXDoom/src/i_flmusic.c
 delete mode 100644 games/NXDoom/src/i_oplmusic.c
 delete mode 100644 games/NXDoom/src/i_sdlsound.c
 delete mode 100644 games/NXDoom/src/i_videohr.c
 delete mode 100644 games/NXDoom/src/i_videohr.h
 delete mode 100644 games/NXDoom/src/i_winmusic.c
 delete mode 100644 games/NXDoom/src/midifallback.c
 delete mode 100644 games/NXDoom/src/midifallback.h
 delete mode 100644 games/NXDoom/src/net_petname.c
 delete mode 100644 games/NXDoom/src/net_petname.h
 delete mode 100644 games/NXDoom/src/setup-res.rc.in
 delete mode 100644 games/NXDoom/src/setup/.gitignore
 delete mode 100644 games/NXDoom/src/setup/CMakeLists.txt
 delete mode 100644 games/NXDoom/src/setup/Makefile.am
 delete mode 100644 games/NXDoom/src/setup/Setup.desktop.in
 delete mode 100644 games/NXDoom/src/setup/compatibility.c
 delete mode 100644 games/NXDoom/src/setup/compatibility.h
 delete mode 100644 games/NXDoom/src/setup/display.c
 delete mode 100644 games/NXDoom/src/setup/display.h
 delete mode 100644 games/NXDoom/src/setup/execute.c
 delete mode 100644 games/NXDoom/src/setup/execute.h
 delete mode 100644 games/NXDoom/src/setup/joystick.c
 delete mode 100644 games/NXDoom/src/setup/joystick.h
 delete mode 100644 games/NXDoom/src/setup/keyboard.c
 delete mode 100644 games/NXDoom/src/setup/keyboard.h
 delete mode 100644 games/NXDoom/src/setup/mainmenu.c
 delete mode 100644 games/NXDoom/src/setup/mode.c
 delete mode 100644 games/NXDoom/src/setup/mode.h
 delete mode 100644 games/NXDoom/src/setup/mouse.c
 delete mode 100644 games/NXDoom/src/setup/mouse.h
 delete mode 100644 games/NXDoom/src/setup/multiplayer.c
 delete mode 100644 games/NXDoom/src/setup/multiplayer.h
 delete mode 100644 games/NXDoom/src/setup/setup-manifest.xml.in
 delete mode 100644 games/NXDoom/src/setup/setup_icon.c
 delete mode 100644 games/NXDoom/src/setup/sound.c
 delete mode 100644 games/NXDoom/src/setup/sound.h
 delete mode 100644 games/NXDoom/src/setup/txt_joyaxis.c
 delete mode 100644 games/NXDoom/src/setup/txt_joyaxis.h
 delete mode 100644 games/NXDoom/src/setup/txt_joybinput.c
 delete mode 100644 games/NXDoom/src/setup/txt_joybinput.h
 delete mode 100644 games/NXDoom/src/setup/txt_keyinput.c
 delete mode 100644 games/NXDoom/src/setup/txt_keyinput.h
 delete mode 100644 games/NXDoom/src/setup/txt_mouseinput.c
 delete mode 100644 games/NXDoom/src/setup/txt_mouseinput.h
 delete mode 100644 games/NXDoom/src/sha1.c
 delete mode 100644 games/NXDoom/src/strife-res.rc.in
 delete mode 100644 games/NXDoom/src/strife/.gitignore
 delete mode 100644 games/NXDoom/src/strife/CMakeLists.txt
 delete mode 100644 games/NXDoom/src/strife/Makefile.am
 delete mode 100644 games/NXDoom/src/strife/am_map.c
 delete mode 100644 games/NXDoom/src/strife/am_map.h
 delete mode 100644 games/NXDoom/src/strife/d_englsh.h
 delete mode 100644 games/NXDoom/src/strife/d_items.c
 delete mode 100644 games/NXDoom/src/strife/d_items.h
 delete mode 100644 games/NXDoom/src/strife/d_main.c
 delete mode 100644 games/NXDoom/src/strife/d_main.h
 delete mode 100644 games/NXDoom/src/strife/d_net.c
 delete mode 100644 games/NXDoom/src/strife/d_player.h
 delete mode 100644 games/NXDoom/src/strife/d_textur.h
 delete mode 100644 games/NXDoom/src/strife/d_think.h
 delete mode 100644 games/NXDoom/src/strife/deh_ammo.c
 delete mode 100644 games/NXDoom/src/strife/deh_cheat.c
 delete mode 100644 games/NXDoom/src/strife/deh_frame.c
 delete mode 100644 games/NXDoom/src/strife/deh_misc.c
 delete mode 100644 games/NXDoom/src/strife/deh_misc.h
 delete mode 100644 games/NXDoom/src/strife/deh_ptr.c
 delete mode 100644 games/NXDoom/src/strife/deh_sound.c
 delete mode 100644 games/NXDoom/src/strife/deh_strife.c
 delete mode 100644 games/NXDoom/src/strife/deh_thing.c
 delete mode 100644 games/NXDoom/src/strife/deh_weapon.c
 delete mode 100644 games/NXDoom/src/strife/doomdata.h
 delete mode 100644 games/NXDoom/src/strife/doomdef.c
 delete mode 100644 games/NXDoom/src/strife/doomdef.h
 delete mode 100644 games/NXDoom/src/strife/doomstat.c
 delete mode 100644 games/NXDoom/src/strife/doomstat.h
 delete mode 100644 games/NXDoom/src/strife/dstrings.c
 delete mode 100644 games/NXDoom/src/strife/dstrings.h
 delete mode 100644 games/NXDoom/src/strife/f_finale.c
 delete mode 100644 games/NXDoom/src/strife/f_finale.h
 delete mode 100644 games/NXDoom/src/strife/f_wipe.c
 delete mode 100644 games/NXDoom/src/strife/f_wipe.h
 delete mode 100644 games/NXDoom/src/strife/g_game.c
 delete mode 100644 games/NXDoom/src/strife/g_game.h
 delete mode 100644 games/NXDoom/src/strife/hu_lib.c
 delete mode 100644 games/NXDoom/src/strife/hu_lib.h
 delete mode 100644 games/NXDoom/src/strife/hu_stuff.c
 delete mode 100644 games/NXDoom/src/strife/hu_stuff.h
 delete mode 100644 games/NXDoom/src/strife/info.c
 delete mode 100644 games/NXDoom/src/strife/info.h
 delete mode 100644 games/NXDoom/src/strife/m_menu.c
 delete mode 100644 games/NXDoom/src/strife/m_menu.h
 delete mode 100644 games/NXDoom/src/strife/m_random.c
 delete mode 100644 games/NXDoom/src/strife/m_random.h
 delete mode 100644 games/NXDoom/src/strife/m_saves.c
 delete mode 100644 games/NXDoom/src/strife/m_saves.h
 delete mode 100644 games/NXDoom/src/strife/p_ceilng.c
 delete mode 100644 games/NXDoom/src/strife/p_dialog.c
 delete mode 100644 games/NXDoom/src/strife/p_dialog.h
 delete mode 100644 games/NXDoom/src/strife/p_doors.c
 delete mode 100644 games/NXDoom/src/strife/p_enemy.c
 delete mode 100644 games/NXDoom/src/strife/p_floor.c
 delete mode 100644 games/NXDoom/src/strife/p_inter.c
 delete mode 100644 games/NXDoom/src/strife/p_inter.h
 delete mode 100644 games/NXDoom/src/strife/p_lights.c
 delete mode 100644 games/NXDoom/src/strife/p_local.h
 delete mode 100644 games/NXDoom/src/strife/p_map.c
 delete mode 100644 games/NXDoom/src/strife/p_maputl.c
 delete mode 100644 games/NXDoom/src/strife/p_mobj.c
 delete mode 100644 games/NXDoom/src/strife/p_mobj.h
 delete mode 100644 games/NXDoom/src/strife/p_plats.c
 delete mode 100644 games/NXDoom/src/strife/p_pspr.c
 delete mode 100644 games/NXDoom/src/strife/p_pspr.h
 delete mode 100644 games/NXDoom/src/strife/p_saveg.c
 delete mode 100644 games/NXDoom/src/strife/p_saveg.h
 delete mode 100644 games/NXDoom/src/strife/p_setup.c
 delete mode 100644 games/NXDoom/src/strife/p_setup.h
 delete mode 100644 games/NXDoom/src/strife/p_sight.c
 delete mode 100644 games/NXDoom/src/strife/p_spec.c
 delete mode 100644 games/NXDoom/src/strife/p_spec.h
 delete mode 100644 games/NXDoom/src/strife/p_switch.c
 delete mode 100644 games/NXDoom/src/strife/p_telept.c
 delete mode 100644 games/NXDoom/src/strife/p_tick.c
 delete mode 100644 games/NXDoom/src/strife/p_tick.h
 delete mode 100644 games/NXDoom/src/strife/p_user.c
 delete mode 100644 games/NXDoom/src/strife/r_bsp.c
 delete mode 100644 games/NXDoom/src/strife/r_bsp.h
 delete mode 100644 games/NXDoom/src/strife/r_data.c
 delete mode 100644 games/NXDoom/src/strife/r_data.h
 delete mode 100644 games/NXDoom/src/strife/r_defs.h
 delete mode 100644 games/NXDoom/src/strife/r_draw.c
 delete mode 100644 games/NXDoom/src/strife/r_draw.h
 delete mode 100644 games/NXDoom/src/strife/r_local.h
 delete mode 100644 games/NXDoom/src/strife/r_main.c
 delete mode 100644 games/NXDoom/src/strife/r_main.h
 delete mode 100644 games/NXDoom/src/strife/r_plane.c
 delete mode 100644 games/NXDoom/src/strife/r_plane.h
 delete mode 100644 games/NXDoom/src/strife/r_segs.c
 delete mode 100644 games/NXDoom/src/strife/r_segs.h
 delete mode 100644 games/NXDoom/src/strife/r_sky.c
 delete mode 100644 games/NXDoom/src/strife/r_sky.h
 delete mode 100644 games/NXDoom/src/strife/r_state.h
 delete mode 100644 games/NXDoom/src/strife/r_things.c
 delete mode 100644 games/NXDoom/src/strife/r_things.h
 delete mode 100644 games/NXDoom/src/strife/s_sound.c
 delete mode 100644 games/NXDoom/src/strife/s_sound.h
 delete mode 100644 games/NXDoom/src/strife/sounds.c
 delete mode 100644 games/NXDoom/src/strife/sounds.h
 delete mode 100644 games/NXDoom/src/strife/st_lib.c
 delete mode 100644 games/NXDoom/src/strife/st_lib.h
 delete mode 100644 games/NXDoom/src/strife/st_stuff.c
 delete mode 100644 games/NXDoom/src/strife/st_stuff.h
 delete mode 100644 games/NXDoom/src/strife/strife_icon.c
 delete mode 100644 games/NXDoom/src/strife/wi_stuff.c
 delete mode 100644 games/NXDoom/src/strife/wi_stuff.h
 delete mode 100644 games/NXDoom/src/w_file_posix.c
 delete mode 100644 games/NXDoom/src/w_file_win32.c
 delete mode 100644 games/NXDoom/textscreen/CMakeLists.txt
 delete mode 100644 games/NXDoom/textscreen/Doxyfile
 delete mode 100644 games/NXDoom/textscreen/Makefile.am
 delete mode 100644 games/NXDoom/textscreen/examples/.gitignore
 delete mode 100644 games/NXDoom/textscreen/examples/Makefile.am
 delete mode 100644 games/NXDoom/textscreen/examples/calculator.c
 delete mode 100644 games/NXDoom/textscreen/examples/guitest.c
 delete mode 100644 games/NXDoom/textscreen/fonts/Makefile.am
 create mode 100644 games/NXDoom/textscreen/txt_font.h
 delete mode 100644 games/NXDoom/vcpkg.json
 delete mode 100644 games/NXDoom/win32/win_opendir.c
 delete mode 100644 games/NXDoom/win32/win_opendir.h

diff --git a/games/NXDoom/.devcontainer/.gitignore b/games/NXDoom/.devcontainer/.gitignore
deleted file mode 100644
index 70fdefc76..000000000
--- a/games/NXDoom/.devcontainer/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.xauth
-wads/
-prefs/
-share/
\ No newline at end of file
diff --git a/games/NXDoom/.devcontainer/Dockerfile b/games/NXDoom/.devcontainer/Dockerfile
deleted file mode 100644
index 589a6cede..000000000
--- a/games/NXDoom/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM ubuntu
-
-######### Apt dependencies
-
-ARG system_apt_dependencies="build-essential gdb automake autoconf libtool git pkg-config python3 python3-pip sudo"
-ARG choco_apt_dependencies="gcc make libsdl2-dev libsdl2-net-dev libsdl2-mixer-dev"
-ARG choco_apt_dependencies_optional="libflac-dev libfluidsynth-dev libpng-dev libsamplerate-dev libvorbis-dev"
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -qq $system_apt_dependencies $choco_apt_dependencies $choco_apt_dependencies_optional
-
-########## Install Pillow (PIL) via pip, not apt
-
-ARG choco_pip_dependencies="pillow"
-RUN pip install $choco_pip_dependencies
-
-########## Container user setup
-
-ARG USERNAME=chocodev
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
-
-# Add sudo support
-RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME
-
-# Add the user to the audio group, to have ALSA sound access
-# TODO: pulseaudio, so this isn't necessary?
-RUN addgroup $USERNAME audio
-
-# Use bash, not sh. Yuck.
-RUN chsh $USERNAME -s /bin/bash
-
-USER $USERNAME
-
-# Make sure we actually own our own local share stuff
-RUN mkdir -p /home/$USERNAME/.local/share && \
-    chown -R $USERNAME:$USERNAME /home/$USERNAME/.local
diff --git a/games/NXDoom/.devcontainer/devcontainer.json b/games/NXDoom/.devcontainer/devcontainer.json
deleted file mode 100644
index cca038698..000000000
--- a/games/NXDoom/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/docker-existing-dockerfile
-{
-	"name": "Doom Dev Container",
-	"context": "..",
-	"dockerFile": "./Dockerfile",
-	
-	"extensions": [
-		"yzhang.markdown-all-in-one",
-		"bierner.markdown-preview-github-styles",
-		"dotjoshjohnson.xml",
-
-		"eamodio.gitlens",
-		"npxms.hide-gitignored",  // Note: need to run its command manually
-
-		// Build tooling
-		"ms-vscode.cpptools",
-		"cschlosser.doxdocgen",
-		"austin.code-gnu-global",
-		"jeff-hykin.better-cpp-syntax", // Note: runs locally
-		"ms-vscode.cpptools-themes", // Note: runs locally
-	],
-
-	// Required to not bleed "root" permission files into the host volume
-	"containerUser": "chocodev",
-
-	// VSCode on Linux specific, for creating X11 and sound forwarding
-	// Comment out manually if working on non-Linux
-	"initializeCommand": "${localWorkspaceFolder}/.devcontainer/initialize-linux.sh",
-	"mounts": [
-		"source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind",
-		"source=${localWorkspaceFolder}/.devcontainer/prefs,target=/home/chocodev/.local/share/chocolate-doom,type=bind",
-	],
-	"containerEnv": {
-		"DISPLAY": "${localEnv:DISPLAY}",
-		"XAUTHORITY": "${containerWorkspaceFolder}/.devcontainer/share/devcontainer.xauth",
-	},
-	"runArgs": [
-		// "--gpus", "all",  // Uncomment for GPU support
-		"--device", "/dev/snd",  
-		// TODO: pulseaudio? https://github.com/mviereck/x11docker/wiki/Container-sound:-ALSA-or-Pulseaudio
-	]
-
-	// TODO: X11/sound forwarding configs for MacOS (XQuartz) and Windows (Xming)
-}
diff --git a/games/NXDoom/.devcontainer/initialize-linux.sh b/games/NXDoom/.devcontainer/initialize-linux.sh
deleted file mode 100755
index 7a4275d36..000000000
--- a/games/NXDoom/.devcontainer/initialize-linux.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-HERE=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
-
-### Create the xauth file allowing the container to interact with a forwarded X11
-XAUTH="$HERE/share/devcontainer.xauth";
-touch "$XAUTH"
-xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
-
-### TODO: pulseaudio pasthrough
\ No newline at end of file
diff --git a/games/NXDoom/.github/CONTRIBUTING.md b/games/NXDoom/.github/CONTRIBUTING.md
deleted file mode 100644
index ad3a1c110..000000000
--- a/games/NXDoom/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,101 +0,0 @@
-Thanks for contributing to Chocolate Doom! Whatever your contribution,
-whether it's code or just a bug report, it's greatly appreciated.
-
-The project is governed by the
-[Contributor Covenant](http://contributor-covenant.org/version/1/4/)
-version 1.4. By contributing to the project you agree to abide by its
-terms. To report violations, please send an email to fraggle@gmail.com.
-
-### Reporting bugs
-
-Before reporting a bug, it's worth checking if this really is a bug.
-Chocolate Doom's mission is to reproduce the Vanilla (DOS) versions of
-the Doom engine games, bugs and all. Check out the
-[NOT-BUGS](../NOT-BUGS.md) file for a list of common issues which aren't
-really bugs at all. You might also try searching [the GitHub issues
-list](https://github.com/chocolate-doom/chocolate-doom/issues) to see
-if your bug has already been reported.
-
-If you're confident that you've found a real bug (or even if you're
-not sure!) please go ahead and [file an issue on
-GitHub](https://github.com/chocolate-doom/chocolate-doom/issues/new).
-You'll need a GitHub account, but it's pretty easy to sign up.
-
-Please try to give as much information as possible:
-
-* What version of Chocolate Doom are you using? Check the title bar of
-  the window for the version number.
-
-* Chocolate Doom runs on many different operating systems (not just
-  Windows!). Please say which operating system and what version of it
-  you're using.
-
-* Please say which game you're playing (Doom 1, Doom 2, Heretic,
-  Hexen, Strife, etc.) and if you're using any fan-made WADs or mods,
-  please say which mods (and where they can be downloaded!). It helps
-  to give the full command line you're using to start the game.
-
-* Please mention if you have any special configuration you think may be
-  relevant, too.
-
-### Feature requests
-
-Chocolate Doom is always open to new feature requests; however, please
-be aware that the project is designed around a deliberately limited
-[philosophy](../PHILOSOPHY.md), and many features common in other source
-ports will not be accepted. Here are a few common requests which are
-often rejected:
-
-* "High resolution" rendering (greater than 320x200 display).
-
-* An option to disable Vanilla limits, such as the visplane rendering
-  limit.
-
-* Ability to play "No Rest For The Living", the expansion pack which
-  comes with the XBLA / BFG Edition of Doom.
-
-If you're not sure whether your feature is in line with the project
-philosophy, don't worry - just ask anyway!
-To make a feature request, [file an issue on
-GitHub](https://github.com/chocolate-doom/chocolate-doom/issues/new).
-
-### Bug fixes / code submission
-
-Thank you for contributing code to Chocolate Doom! Please check the
-following guidelines before opening a pull request:
-
-* All code must be licensed under [the GNU General Public License,
-  version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).
-  Please don't reuse code that isn't GPL, or that is GPLv3 licensed.
-  Be aware that by submitting your code to the project, you're agreeing
-  to license it under the GPL.
-
-* Please follow the coding style guidelines described in the
-  [HACKING](../HACKING.md) file.
-
-* Please don't make unnecessary changes which just change formatting
-  without any actual change to program logic. While being consistent
-  is nice, such changes destroy the ability to use the `git blame`
-  command to see when code was last changed.
-
-* The guidelines given above in the "feature requests" section also
-  apply here. New features which aren't in line with the project
-  philosophy are likely to be rejected. If you're not sure, open a
-  feature request first and ask before you start implementing your
-  feature.
-
-* Follow the guidelines for [how to write a Git commit
-  message](http://chris.beams.io/posts/git-commit/). In short: the
-  first line should be a short summary; keep to an 80 column limit;
-  use the imperative mood ("fix bug X", rather than "fixed bug X" or
-  "fixing bug X"). If your change fixes a particular subsystem,
-  prefix the summary with that subsystem: eg. "doom: Fix bug X" or
-  "textscreen: Change size of X".
-
-* If you're making a change related to a bug, reference the GitHub
-  issue number in the commit message, eg. "This is a partial fix
-  for #646". This will link your commit into the issue comments. If
-  your change is a fix for the bug, put the word "fixes" before the
-  issue number to automatically close the issue once your change
-  is merged.
-
diff --git a/games/NXDoom/.github/ISSUE_TEMPLATE.md b/games/NXDoom/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 101a5b337..000000000
--- a/games/NXDoom/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-  Thank you for reporting a bug in Chocolate Doom. Please complete
-  the following template so that we can better diagnose the source
-  of your problem.
-
-  To save yourself some time, you may want to check the FAQ and the
-  NOT-BUGS list for solutions to some common problems:
-
-     https://www.chocolate-doom.org/wiki/index.php/FAQ
-     https://www.chocolate-doom.org/not-bugs
--->
-
-### Background
-
-Version of Chocolate Doom:
-
-Operating System and version:
-
-Game: (Doom/Heretic/Hexen/Strife/other)
-
-Any loaded WADs and mods (please include full command line):
-
-### Bug description
-
-Observed behavior:
-
-Expected behavior:
-
diff --git a/games/NXDoom/.github/workflows/cpp-linter.yml b/games/NXDoom/.github/workflows/cpp-linter.yml
deleted file mode 100644
index 931e0421a..000000000
--- a/games/NXDoom/.github/workflows/cpp-linter.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Workflow syntax:
-# https://help.github.com/en/articles/workflow-syntax-for-github-actions
-name: cpp-linter
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches:
-      - master
-
-jobs:
-  cpp-linter:
-    strategy:
-      matrix:
-        compiler: [clang]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install libfluidsynth-dev libpng-dev libsamplerate0-dev libsdl2-dev libsdl2-mixer-dev libsdl2-net-dev ninja-build
-      - name: Run cmake to generate compilation database
-        run: cmake -S . -B . -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-      - uses: cpp-linter/cpp-linter-action@v2
-        id: linter
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          style: file
-          lines-changed-only: true
-          version: 16
-          tidy-checks: >-
-            boost-*
-            ,bugprone-*
-            ,performance-*
-            ,readability-*
-            ,portability-*
-            ,modernize-*
-            ,clang-analyzer-*
-            ,cppcoreguidelines-*
-            ,-cppcoreguidelines-avoid-magic-numbers
-            ,-cppcoreguidelines-init-variables
-            ,-readability-identifier-length
-            ,-readability-isolate-declaration
-            ,-readability-magic-numbers
-
-      - name: Fail fast?!
-        if: steps.linter.outputs.checks-failed > 0
-        run: |
-          echo "Some files failed the linting checks! Fail fast disabled until false positive issue is fixed"
-
-      - name: Check no extern used in .c files
-        run: |
-          ./check-extern.sh
diff --git a/games/NXDoom/.github/workflows/cppcheck.yml b/games/NXDoom/.github/workflows/cppcheck.yml
deleted file mode 100644
index 213afba01..000000000
--- a/games/NXDoom/.github/workflows/cppcheck.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: cppcheck
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches:
-      - master
-
-jobs:
-  cppcheck:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install cppcheck
-
-      - uses: actions/checkout@v6
-
-      - name: Run cppcheck
-        env:
-          ANALYZE: true
-        run: $GITHUB_WORKSPACE/.travis.sh
diff --git a/games/NXDoom/.github/workflows/main.yml b/games/NXDoom/.github/workflows/main.yml
deleted file mode 100644
index b9a1a51c5..000000000
--- a/games/NXDoom/.github/workflows/main.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-    branches:
-      - "master"
-    tags:
-      - "*"
-    paths-ignore:
-      - "**.md"
-  pull_request:
-    branches:
-      - "master"
-    paths-ignore:
-      - "**.md"
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    defaults:
-      run:
-        shell: ${{ matrix.config.shell }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - name: Linux GCC
-            os: ubuntu-latest
-            compiler: gcc
-            shell: bash
-
-          - name: macOS Clang
-            os: macos-latest
-            compiler: clang
-            shell: bash
-
-          - name: macOS x86 Clang
-            os: macos-15-intel
-            compiler: clang
-            shell: bash
-
-          - name: MSYS2 UCRT64
-            os: windows-latest
-            compiler: gcc
-            shell: 'msys2 {0}'
-            msystem: ucrt64
-            msys-env: mingw-w64-ucrt-x86_64
-            artifacts: true
-            pkg-path: pkg/win32/*.zip
-            pkg-dir: pkg/win32
-
-    steps:
-      - name: Install pandoc
-        if: runner.os == 'Windows'
-        shell: cmd
-        run: choco install pandoc
-
-      - name: Install dependencies (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install \
-            libsdl2-dev \
-            libsdl2-mixer-dev \
-            libsdl2-net-dev \
-            libpng-dev \
-            libsamplerate0-dev \
-            libfluidsynth-dev
-
-      - name: Install dependencies (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          brew install \
-            automake \
-            sdl2 \
-            sdl2_mixer \
-            sdl2_net \
-            libpng \
-            libsamplerate \
-            fluid-synth
-
-      - name: Install dependencies (MSYS2)
-        if: runner.os == 'Windows'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.config.msystem }}
-          update: true
-          path-type: inherit
-          install: >-
-            autotools
-            zip
-            ${{ matrix.config.msys-env }}-python-pip
-            ${{ matrix.config.msys-env }}-gcc
-            ${{ matrix.config.msys-env }}-SDL2
-            ${{ matrix.config.msys-env }}-SDL2_mixer
-            ${{ matrix.config.msys-env }}-SDL2_net
-            ${{ matrix.config.msys-env }}-libpng
-            ${{ matrix.config.msys-env }}-libsamplerate
-            ${{ matrix.config.msys-env }}-fluidsynth
-
-      - uses: actions/checkout@v6
-        with:
-          submodules: true
-
-      - name: Configure
-        env:
-          CC: ${{ matrix.config.compiler }}
-        run: |
-          ./autogen.sh
-
-      - name: Build
-        run: make -j4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Test
-        run: |
-          pip install pyyaml
-          PREFIX=`sed -n '/PROGRAM_PREFIX/p' ${PWD}/config.h | cut -d '"' -f 2`
-          make -j4 -C quickcheck check SOURCE_PORT=$PWD/src/${PREFIX}doom
-
-      - name: Package
-        if: ${{ matrix.config.artifacts }}
-        run: |
-          cd ${{ matrix.config.pkg-dir }}
-          make
-
-      - name: Upload artifacts
-        if: ${{ matrix.config.artifacts }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.config.name }}
-          path: ${{ matrix.config.pkg-path }}
-
-      - name: Extract Package String
-        if: ${{ contains(github.ref, 'tags') }}
-        run: |
-          PACKAGE_STRING=`sed -n '/PACKAGE_STRING/p' ${PWD}/config.h | cut -d '"' -f 2`
-          echo "PACKAGE_STRING=${PACKAGE_STRING}" >> $GITHUB_ENV
-
-      - name: Release
-        if: ${{ contains(github.ref, 'tags') && matrix.config.artifacts }}
-        uses: ncipollo/release-action@v1
-        with:
-          name: ${{ env.PACKAGE_STRING }}
-          bodyFile: RELEASE_NOTES.md
-          allowUpdates: true
-          artifacts: ${{ matrix.config.pkg-path }}
diff --git a/games/NXDoom/.gitignore b/games/NXDoom/.gitignore
index c41a75396..58cf415e6 100644
--- a/games/NXDoom/.gitignore
+++ b/games/NXDoom/.gitignore
@@ -1,13 +1,12 @@
 CMDLINE
 INSTALL
-Makefile
 Makefile.in
+Make.dep
 TAGS
 aclocal.m4
 autom4te.cache
 autotools
 bin
-config.h
 config.hin
 config.log
 config.status
@@ -36,7 +35,11 @@ STRIFE*.pcx
 /out
 
 # These are the default patterns globally ignored by Subversion:
+.depend
+.built
 *.o
+*.gcno
+*.gcda
 *.lo
 *.la
 *.al
diff --git a/games/NXDoom/.gitmodules b/games/NXDoom/.gitmodules
deleted file mode 100644
index 7a381cfd4..000000000
--- a/games/NXDoom/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "quickcheck"]
-	path = quickcheck
-	url = https://github.com/chocolate-doom/quickcheck.git
diff --git a/games/NXDoom/.lvimrc b/games/NXDoom/.lvimrc
deleted file mode 100644
index 63e461335..000000000
--- a/games/NXDoom/.lvimrc
+++ /dev/null
@@ -1,32 +0,0 @@
-" Local vimrc configuration file.  Install the localvimrc.vim vim script.
-set expandtab
-set tabstop=8
-set softtabstop=4
-set shiftwidth=4
-
-" Add all tag files to tags path.
-
-let topdir = findfile("configure.ac", ".;")
-let topdir = substitute(topdir, "configure.ac", "", "")
-
-" Check tags file in current dir:
-set tags+=tags
-
-" Add tag files in parent directories:
-let tagfiles = findfile("tags", ".;", -1)
-
-" Add tag files for libraries:
-call add(tagfiles, topdir . "opl/tags")
-call add(tagfiles, topdir . "pcsound/tags")
-call add(tagfiles, topdir . "textscreen/tags")
-
-for tagfile in tagfiles
-    " Don't go beyond the project top level when adding parent dirs:
-    if stridx(tagfile, topdir) >= 0
-        exec "set tags+=" . tagfile
-    endif
-endfor
-
-unlet topdir
-unlet tagfiles
-
diff --git a/games/NXDoom/.travis.sh b/games/NXDoom/.travis.sh
deleted file mode 100755
index 683d9bea6..000000000
--- a/games/NXDoom/.travis.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-if [ "$ANALYZE" = "true" ] ; then
-	# -D__GNUC__ is required for cppcheck to know about noreturn functions
-	cppcheck --error-exitcode=1 -j2 -UTESTING -D__GNUC__ -Iopl -Isrc -Isrc/setup opl pcsound src textscreen 2> stderr.txt
-	RET=$?
-	if [ -s stderr.txt ]
-	then
-		cat stderr.txt
-	fi
-	exit $RET
-else
-	set -e
-	./autogen.sh --enable-werror
-	make -j4
-	make install DESTDIR=/tmp/whatever
-	make dist
-	PREFIX=`sed -n '/PROGRAM_PREFIX/p' ${PWD}/config.h | cut -d '"' -f 2`
-	make -j4 -C quickcheck check SOURCE_PORT=$PWD/src/${PREFIX}doom
-fi
diff --git a/games/NXDoom/CMakeLists.txt b/games/NXDoom/CMakeLists.txt
deleted file mode 100644
index da58daca2..000000000
--- a/games/NXDoom/CMakeLists.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-cmake_minimum_required(VERSION 3.7.2)
-project("Chocolate Doom" VERSION 3.1.1 LANGUAGES C)
-
-set(CMAKE_C_STANDARD 99)
-
-# Autotools variables
-set(top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-set(top_builddir ${CMAKE_CURRENT_BINARY_DIR})
-
-# AC_INIT variables
-set(PACKAGE_NAME "${PROJECT_NAME}")
-set(PACKAGE_TARNAME "chocolate-doom")
-set(PACKAGE_VERSION "${PROJECT_VERSION}")
-set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
-set(PACKAGE_BUGREPORT "chocolate-doom-dev-list@chocolate-doom.org")
-
-string(REGEX REPLACE " Doom$" "" PACKAGE_SHORTNAME "${PACKAGE_NAME}")
-set(PACKAGE_COPYRIGHT "Copyright (C) 1993-2025")
-set(PACKAGE_LICENSE "GNU General Public License, version 2")
-
-# Any settings that should apply to all targets in this directory and all
-# subdirectories should go here.  Use judiciously.
-if(MSVC)
-    add_definitions("/D_CRT_SECURE_NO_WARNINGS" "/D_CRT_SECURE_NO_DEPRECATE"
-                    "/D_CRT_NONSTDC_NO_DEPRECATE")
-else()
-    add_compile_options("-Wall" "-Wdeclaration-after-statement"
-                        "-Wredundant-decls")
-endif()
-
-option(CMAKE_FIND_PACKAGE_PREFER_CONFIG
-       "Lookup package config files before using find modules" On)
-
-option(ENABLE_SDL2_NET "Enable SDL2_net" On)
-option(ENABLE_SDL2_MIXER "Enable SDL2_mixer" On)
-
-if (NOT DEFINED EMSCRIPTEN)
-    find_package(SDL2 2.0.14)
-endif()
-if(ENABLE_SDL2_MIXER)
-    if (NOT DEFINED EMSCRIPTEN)
-        find_package(SDL2_mixer 2.0.2)
-    endif()
-else()
-    add_compile_definitions(DISABLE_SDL2MIXER=1)
-endif()
-
-if(ENABLE_SDL2_NET)
-    if (NOT DEFINED EMSCRIPTEN)
-        find_package(SDL2_net 2.0.0)
-    endif()
-else()
-    add_compile_definitions(DISABLE_SDL2NET=1)
-endif()
-
-
-# Check for libsamplerate.
-find_package(SampleRate)
-if(SampleRate_FOUND)
-    set(HAVE_LIBSAMPLERATE TRUE)
-endif()
-
-# Check for libpng.
-find_package(PNG)
-if(PNG_FOUND)
-    set(HAVE_LIBPNG TRUE)
-endif()
-
-# Check for FluidSynth.
-find_package(FluidSynth 2.2.0)
-if(FluidSynth_FOUND AND ENABLE_SDL2_MIXER)
-    set(HAVE_FLUIDSYNTH TRUE)
-endif()
-
-find_package(m)
-
-include(CheckSymbolExists)
-include(CheckIncludeFile)
-check_symbol_exists(strcasecmp "strings.h" HAVE_DECL_STRCASECMP)
-check_symbol_exists(strncasecmp "strings.h" HAVE_DECL_STRNCASECMP)
-check_include_file("dirent.h" HAVE_DIRENT_H)
-
-string(CONCAT WINDOWS_RC_VERSION "${PROJECT_VERSION_MAJOR}, "
-    "${PROJECT_VERSION_MINOR}, ${PROJECT_VERSION_PATCH}, 0")
-
-# Without a hyphen. This is used for the bash-completion scripts.
-string(TOLOWER "${PACKAGE_SHORTNAME}" PROGRAM_SPREFIX)
-
-# With a hyphen, used almost everywhere else.
-set(PROGRAM_PREFIX "${PROGRAM_SPREFIX}-")
-
-configure_file(cmake/config.h.cin config.h)
-
-configure_file(src/doom-res.rc.in src/doom-res.rc)
-configure_file(src/heretic-res.rc.in src/heretic-res.rc)
-configure_file(src/hexen-res.rc.in src/hexen-res.rc)
-configure_file(src/setup-res.rc.in src/setup-res.rc)
-configure_file(src/setup/setup-manifest.xml.in src/setup/setup-manifest.xml)
-configure_file(src/strife-res.rc.in src/strife-res.rc)
-
-foreach(SUBDIR textscreen opl pcsound src)
-    add_subdirectory("${SUBDIR}")
-endforeach()
diff --git a/games/NXDoom/CODE_OF_CONDUCT.md b/games/NXDoom/CODE_OF_CONDUCT.md
deleted file mode 100644
index 895dcfd49..000000000
--- a/games/NXDoom/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at fraggle@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/games/NXDoom/ChangeLog b/games/NXDoom/ChangeLog
deleted file mode 100644
index 59a73a4b6..000000000
--- a/games/NXDoom/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-Chocolate Doom's version history is stored in Git. For a full
-change log, clone the repository on Github:
-
-    https://github.com/chocolate-doom/chocolate-doom
-
diff --git a/games/NXDoom/HACKING.md b/games/NXDoom/HACKING.md
deleted file mode 100644
index 792136e82..000000000
--- a/games/NXDoom/HACKING.md
+++ /dev/null
@@ -1,256 +0,0 @@
-# Coding style guidelines
-
-The coding style guidelines for Chocolate Doom are designed to keep the
-style of the original source code.  This maintains consistency throughout
-the program, and does not require the original code to be changed. Some
-of these guidelines are stricter than what was done in the original
-source; follow these when writing new code only: there is no need to
-change existing code to fit them.
-
-You should set tabs to *display* as eight spaces, not four.  However,
-*indentation* should be four spaces.  If possible, do not use tab
-characters at all.  There is a utility called “expand” which will remove
-tab characters.  For the reasoning behind this, see:
-http://www.jwz.org/doc/tabs-vs-spaces.html
-
-Please write code to an 80 column limit so that it fits within a standard
-80 column terminal. Do not leave trailing whitespace at the end of lines.
-
-Functions should be named like this: `AB_FunctionName`.  The `AB` prefix
-denotes the subsystem (`AM_` for automap, `G_` for game, etc).  If a
-function is static, you can omit the prefix and just name it like
-`FunctionName`.  Functions and global variables should always be made
-static if possible.
-
-Put `_t` on the end of types created with typedef.  Type names like this
-should be all lowercase and have the subsystem name at the start. An
-example of this is `txt_window_t`.  When creating structures, always
-typedef them.
-
-Do not use Hungarian notation.
-
-Do not use the goto statement.
-
-Use C++-style comments, ie. `//` comments, not `/* ... */` comments.
-I don’t care that this isn’t standard ANSI C.
-
-Variables should be named like this: `my_variable_name`, not like this:
-`MyVariableName`.  In pointer variable declarations, place the `*` next
-to the variable name, not the type.
-
-When casting variables from one type to another, put a space after the
-last closing brace.
-
-When using an if, do, while, or for statement, always use the { } braces
-even when they are not necessary.  For example, do this:
-
-```c
-if (condition)
-{
-    body;
-}
-```
-
-Not this:
-
-```c
-if (condition)   // NO
-    body;
-```
-
-Write code like this:
-
-```c
-typedef struct
-{
-    int member1;
-    char *member2;
-} my_structure_t;
-
-void FunctionName(int argument, int arg2, int arg3, int arg4, int arg5,
-                  int arg6, int arg7)
-{
-    int assign_var;
-
-    assign_var = arg2 + arg3 * arg4 * (arg5 + arg6);
-
-    if (foo && !bar || baz && qux || !(foo && bar && baz))
-    {
-        body;
-    }
-    else if (xyz + 4 < abc * 4 + 3)
-    {
-        body;
-    }
-    else
-    {
-        body;
-    }
-
-    if (very_long_condition_like_this_one_that_forces_a_line_break
-     && other_condition)
-    {
-        body;
-    }
-
-    switch (argument)
-    {
-        case FIRST:
-            code;
-            break;
-
-        case SECOND:
-            code;
-            break;
-
-        default:
-            break;
-    }
-
-    for (a = 0; a < 10; ++a)
-    {
-        FunctionCall(arg1, arg2, arg3, arg4,
-                     arg_split_onto_second_line);
-    }
-
-    while (a < 10)
-    {
-        loop_body;
-    }
-
-    do
-    {
-
-    } while (condition);
-}
-```
-
-## Editor-specific default settings
-
-If you use vim, you can put this into your `.vimrc` (or install the
-`localvimrc` script):
-
-```
-set expandtab
-set tabstop=8
-set softtabstop=4
-set shiftwidth=4
-```
-
-Or, if you use Emacs, put this in your `.emacs`:
-
-```lisp
-(add-hook 'c-mode-hook (lambda ()
-  (when (and buffer-file-name
-             (string-match "chocolate-doom" buffer-file-name))
-    (c-set-style "bsd")
-    (setq indent-tabs-mode nil)
-    (setq tab-width 8)
-    (setq c-basic-offset 4))))
-```
-
-## Security
-
-The C standard library has a number of unsafe functions that should be
-avoided when writing code for Chocolate Doom. These are:
-
-Unsafe function   |   Safer alternative
-------------------|------------------------
-`gets()`          |  `fgets(.., stdin)`
-`sprintf`         |  `M_snprintf()`
-`snprintf`        |  `M_snprintf()`
-`vsprintf`        |  `M_vsnprintf()`
-`vsnprintf`       |  `M_vsnprintf()`
-`strcpy()`        |  `M_StringCopy()`
-`strncpy()`       |  `M_StringCopy()`
-`strcat()`        |  `M_StringConcat()`
-`strncat()`       |  `M_StringConcat()`
-`strdup()`        |  `M_StringDuplicate()`
-`realloc()`       |  `I_Realloc()`
-
-Lots of the code includes calls to DEH_String() to simulate string
-replacement by the Dehacked tool. Be careful when using Dehacked
-replacements of printf format strings. For example, do not do this:
-
-```c
-printf(DEH_String("foo %s"), s);
-sprintf(mybuf, DEH_String("bar %s"), t);
-```
-
-Instead do this:
-
-```c
-DEH_printf("foo %s", s);
-DEH_snprintf(mybuf, sizeof(mybuf), "bar %s", t);
-```
-
-This does the format string replacement safely in a way that checks
-the arguments securely.
-
-## Portability
-
-Chocolate Doom is designed to be cross-platform and work on different
-Operating Systems and processors.  Bear this in mind when writing code.
-
-Do not use the `long` type (its size differs across platforms; use
-`int` or `int64_t` depending on which you want).
-
-Use Doom’s byte data type for byte data. `int` is assumed to be a
-32-bit integer, and `short` is a 16-bit integer. You can also use the
-ISO C99 data types: `intN_t` and `uintN_t` where N is 8, 16, 32, 64.
-
-Be careful with platform dependencies: do not use Windows API
-functions, for example.  Use SDL where possible.
-
-Preprocessor `#defines` are set that can be used to identify the OS
-if necessary: `_WIN32` for Windows and `__MACOSX__` for Mac OS X. Others
-are set through SDL.  Try to avoid this if possible.
-
-Be careful of endianness!  Doom has `SHORT()` and `LONG()` macros that
-do endianness conversion.  Never assume that integer types have a
-particular byte ordering.  Similarly, never assume that fields
-inside a structure are aligned in a particular way.  This is most
-relevant when reading or writing data to a file or a network pipe.
-
-For signed integers, you shouldn’t assume that `(i >> n)` is the same as
-`(i / (1 << n))`.  However, most processors handle bitshifts of signed
-integers properly, so it’s not a huge problem.
-
-Due to Microsoft implementation of the Unicode support in C standard
-library you should use these wrappers to support non-latin paths and
-filenames on Windows.
-
-C library function |   Wrapper
--------------------|-------------------
-`fopen()`          |  `M_fopen()`
-`remove()`         |  `M_remove()`
-`rename()`         |  `M_rename()`
-`stat()`           |  `M_stat()`
-`mkdir()`          |  `M_MakeDirectory()`
-`getenv()`         |  `M_getenv()`
-
-## GNU GPL and licensing
-
-All code submitted to the project must be licensed under the GNU GPLv2 or a
-compatible license.  If you use code that you haven’t 100% written
-yourself, say so. Add a copyright header to the start of every file.  Use
-this template:
-
-```
-//
-// Copyright(C) YEAR Author's name
-//
-// 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.
-//
-//
-// *File description goes here*
-//
-```
diff --git a/games/NXDoom/Kconfig b/games/NXDoom/Kconfig
new file mode 100644
index 000000000..a30b6d8e6
--- /dev/null
+++ b/games/NXDoom/Kconfig
@@ -0,0 +1,187 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config GAMES_NXDOOM
+	bool "NXDoom"
+	default n
+	depends on ALLOW_GPL_COMPONENTS
+	depends on VIDEO_FB
+	depends on CRYPTO
+	---help---
+		Play DOOM on NuttX!
+
+if GAMES_NXDOOM
+
+comment "Program options"
+
+config GAMES_NXDOOM_PRIORITY
+	int "Priority"
+	default 100
+	---help---
+		The task priority for the NXDoom application.
+
+config GAMES_NXDOOM_STACKSIZE
+	int "Stack size"
+	default 4096
+	---help---
+		The stack size for the NXDoom application.
+
+comment "General game options"
+
+choice # Language
+	prompt "Game language"
+	default GAMES_NXDOOM_LANG_EN
+
+	config GAMES_NXDOOM_LANG_EN
+		bool "English"
+		---help---
+			English language support (original).
+
+	config GAMES_NXDOOM_LANG_FR
+		bool "French"
+		---help---
+			French language support.
+endchoice # Language
+
+config GAMES_NXDOOM_PREFDIR
+	string "DOOM data directory"
+	default "/data"
+	---help---
+		Directory where DOOM WAD files are stored.
+
+config GAMES_NXDOOM_ENDOOM
+	bool "Show ENDOOM"
+	default n
+	---help---
+		Show the ENDOOM screen (https://www.doomwiki.org/wiki/ENDOOM).
+
+comment "Networking options"
+
+config GAMES_NXDOOM_NET
+	bool "Enable network features"
+	default n
+	---help---
+		Not ported! Will not work.
+
+if GAMES_NXDOOM_NET
+
+config GAMES_NXDOOM_NET_LOGS
+	bool "Enable network logging"
+	default n
+	---help---
+		Enables log information from the network features.
+
+config GAMES_NXDOOM_NET_MAXPLAYERS
+	int "Maximum number of players"
+	default 6
+	---help---
+        The maximum number of players, multiplayer/networking.
+		This is the maximum supported by the networking code; individual games
+		have their own values for MAXPLAYERS that can be smaller.
+		ChocolateDOOM default was 8.
+
+config GAMES_NXDOOM_NET_BACKUPTICS
+	int "Maximum number of backup tics"
+	default 32
+	---help---
+		The maximum number of backup tics to store locally during a net game.
+		ChocalateDOOM default was 128.
+
+config GAMES_NXDOOM_NET_MAXPLAYERNAME
+	int "Maximum player name length"
+	default 16
+	---help---
+		The maximum number of characters in a player name for netgames.
+		ChocalateDOOM default was 30.
+
+endif # GAMES_NXDOOM_NET
+
+comment "Sound options"
+
+config GAMES_NXDOOM_SOUND
+	bool "Enable sound features"
+	default n
+	---help---
+		Not ported! Will not work.
+
+comment "Graphics options"
+
+config GAMES_NXDOOM_FBPATH
+	string "Framebuffer path"
+	default "/dev/fb0"
+	---help---
+		Path to the framebuffer character driver to use for rendering.
+
+comment "Input options"
+
+choice # Input method
+	prompt "NXDoom input method"
+	default GAMES_NXDOOM_KEYBOARD
+
+	config GAMES_NXDOOM_KEYBOARD
+		bool "Keyboard"
+		---help---
+			Use a NuttX keyboard character driver.
+
+endchoice # Input method
+
+if GAMES_NXDOOM_KEYBOARD
+
+config GAMES_NXDOOM_KBDPATH
+	string "Keyboard device path"
+	default "/dev/kbd0"
+	---help---
+		Path to the keyboard device to use as input.
+
+endif # GAMES_NXDOOM_KEYBOARD
+
+comment "Optimizations"
+
+config GAMES_NXDOOM_MAXVISPLANES
+	int "Maximum number of visplanes"
+	default 96
+	---help---
+		DOOM allocates a static number of 'visplanes' to use for gameplay. The
+		original ChocolateDOOM source uses 128 of these. They take a significant
+		amount of memory, so you may reduce the number. However, too few planes
+		may cause 'visplane overflow' errors, which is more common in complex
+		levels.
+
+config GAMES_NXDOOM_MAXOPENINGS
+	int "Maximum number of openings"
+	default 32
+	---help---
+		DOOM allocates a static number of 'openings' to use for gameplay. These
+		are defined as multiples of the SCREENWIDTH (320). The original
+		ChocolateDOOM source uses 64 as the multiplier. They take a significant
+		amount of memory, so you may reduce the number. However, too few
+		openings will cause 'opening overflow' errors.
+
+config GAMES_NXDOOM_MAXVISSPRITES
+	int "Maximum number of visible sprites"
+	default 96
+	---help---
+		DOOM allocates a static number of 'vissprites' to use for gameplay. The
+		original ChocolateDOOM source uses 128. They take a significant amount
+		of memory, so you may reduce the number. However, too few will cause
+		overflow errors.
+
+config GAMES_NXDOOM_MAXDRAWSEGS
+	int "Maximum number of drawsegs"
+	default 192
+	---help---
+		DOOM allocates a static number of 'drawsegs' to use for gameplay. The
+		original ChocolateDOOM source uses 256. They take a significant amount of
+		memory, so you may reduce the number. However, too few will cause
+		rendering issues (overflow is checked to avoid crashes).
+
+config GAMES_NXDOOM_RANGECHECK
+	bool "Perform range checks"
+	default y
+	---help---
+		The ChocolateDOOM source includes the ability to optionally exclude
+		range checking on some array operations.
+
+endif # GAMES_NXDOOM
diff --git a/games/NXDoom/Make.defs b/games/NXDoom/Make.defs
new file mode 100644
index 000000000..b0fa11c3f
--- /dev/null
+++ b/games/NXDoom/Make.defs
@@ -0,0 +1,3 @@
+ifneq ($(CONFIG_GAMES_NXDOOM),)
+CONFIGURED_APPS += $(APPDIR)/games/NXDoom
+endif
diff --git a/games/NXDoom/Makefile b/games/NXDoom/Makefile
new file mode 100644
index 000000000..45df1a6de
--- /dev/null
+++ b/games/NXDoom/Makefile
@@ -0,0 +1,203 @@
+include $(APPDIR)/Make.defs
+
+# Program options
+
+MODULE    = $(CONFIG_GAMES_NXDOOM)
+PRIORITY  = $(CONFIG_GAMES_NXDOOM_PRIORITY)
+STACKSIZE = $(CONFIG_GAMES_NXDOOM_STACKSIZE)
+PROGNAME  = nxdoom
+
+# Source files
+
+COMMONSRCDIR = src
+TEXTSCREENSRCDIR = textscreen
+DOOMSRCDIR = $(COMMONSRCDIR)/doom
+PCSOUNDSRCDIR = pcsound
+
+# Includes
+
+CFLAGS += -I$(COMMONSRCDIR) -I$(DOOMSRCDIR) -I$(TEXTSCREENSRCDIR)
+CFLAGS += -I$(PCSOUNDSRCDIR)
+
+# Source files
+
+COMMONSRCS = i_system.c m_argv.c m_misc.c # Excluding i_main.c
+COMMONSRCS += z_native.c # Native memory allocation
+
+DEHACKEDSRCS = deh_io.c deh_main.c deh_mapping.c deh_text.c
+
+BASESRCS =        \
+  aes_prng.c      \
+  d_event.c       \
+  d_iwad.c        \
+  d_loop.c        \
+  d_mode.c        \
+  deh_str.c       \
+  gusconf.c       \
+  i_glob.c        \
+  i_input.c       \
+  i_joystick.c    \
+  i_timer.c       \
+  i_video.c       \
+  m_bbox.c        \
+  m_cheat.c       \
+  m_config.c      \
+  m_controls.c    \
+  m_fixed.c       \
+  p_rejectpad.c   \
+  memio.c         \
+  tables.c        \
+  v_diskicon.c    \
+  v_video.c       \
+  w_checksum.c    \
+  w_main.c        \
+  w_wad.c         \
+  w_file.c        \
+  w_file_stdc.c   \
+  w_merge.c       \
+
+# Only add ENDOOM stuff if the user wants it
+
+ifeq ($(CONFIG_GAMES_NXDOOM_ENDOOM),y)
+BASESRCS += i_endoom.c
+endif
+
+NETSRCS =         \
+  net_client.c    \
+  net_common.c    \
+  net_dedicated.c \
+  net_gui.c       \
+  net_io.c        \
+  net_loop.c      \
+  net_packet.c    \
+  net_query.c     \
+  net_sdl.c       \
+  net_server.c    \
+  net_structrw.c  \
+
+DOOMSRCS =     \
+  am_map.c     \
+  deh_ammo.c   \
+  deh_bexstr.c \
+  deh_cheat.c  \
+  deh_doom.c   \
+  deh_frame.c  \
+  deh_misc.c   \
+  deh_ptr.c    \
+  deh_thing.c  \
+  deh_weapon.c \
+  d_items.c    \
+  d_main.c     \
+  d_net.c      \
+  doomdef.c    \
+  doomstat.c   \
+  dstrings.c   \
+  f_finale.c   \
+  f_wipe.c     \
+  g_game.c     \
+  hu_lib.c     \
+  hu_stuff.c   \
+  info.c       \
+  m_menu.c     \
+  m_random.c   \
+  p_ceilng.c   \
+  p_doors.c    \
+  p_enemy.c    \
+  p_floor.c    \
+  p_inter.c    \
+  p_lights.c   \
+  p_map.c      \
+  p_maputl.c   \
+  p_mobj.c     \
+  p_plats.c    \
+  p_pspr.c     \
+  p_saveg.c    \
+  p_setup.c    \
+  p_sight.c    \
+  p_spec.c     \
+  p_switch.c   \
+  p_telept.c   \
+  p_tick.c     \
+  p_user.c     \
+  r_bsp.c      \
+  r_data.c     \
+  r_draw.c     \
+  r_main.c     \
+  r_plane.c    \
+  r_segs.c     \
+  r_sky.c      \
+  r_things.c   \
+  statdump.c   \
+  st_lib.c     \
+  st_stuff.c   \
+  wi_stuff.c   
+
+TXTSCREENSRCS =       \
+  txt_conditional.c   \
+  txt_checkbox.c      \
+  txt_desktop.c       \
+  txt_dropdown.c      \
+  txt_fileselect.c    \
+  txt_gui.c           \
+  txt_inputbox.c      \
+  txt_io.c            \
+  txt_button.c        \
+  txt_label.c         \
+  txt_radiobutton.c   \
+  txt_scrollpane.c    \
+  txt_separator.c     \
+  txt_spinctrl.c      \
+  txt_sdl.c           \
+  txt_strut.c         \
+  txt_table.c         \
+  txt_utf8.c          \
+  txt_widget.c        \
+  txt_window.c        \
+  txt_window_action.c 
+
+CSRCS += $(patsubst %,$(COMMONSRCDIR)/%,$(COMMONSRCS))
+CSRCS += $(patsubst %,$(COMMONSRCDIR)/%,$(DEHACKEDSRCS))
+CSRCS += $(patsubst %,$(COMMONSRCDIR)/%,$(BASESRCS))
+CSRCS += $(patsubst %,$(DOOMSRCDIR)/%,$(DOOMSRCS))
+
+# Textscreen stuff only needs to be included for networking stuff
+# or if the user wants to see ENDOOM
+
+ifeq ($(CONFIG_GAMES_NXDOOM_ENDOOM),y)
+ADDTXTSCREEN = y
+endif
+
+ifeq ($(CONFIG_GAMES_NXDOOM_NET),y)
+ADDTXTSCREEN = y
+endif
+
+# Only include textscreen code if needed
+
+ifeq ($(ADDTXTSCREEN),y)
+CSRCS += $(patsubst %,$(TEXTSCREENSRCDIR)/%,$(TXTSCREENSRCS))
+endif
+
+# Only include networking logic if enabled
+
+ifeq ($(CONFIG_GAMES_NXDOOM_NET),y)
+CSRCS += $(patsubst %,$(COMMONSRCDIR)/%,$(NETSRCS))
+endif
+
+# Only include sound logic if enabled
+
+ifeq ($(CONFIG_GAMES_NXDOOM_SOUND),y)
+CSRCS += $(COMMONSRCDIR)/i_musicpack.c
+CSRCS += $(COMMONSRCDIR)/i_pcsound.c
+CSRCS += $(COMMONSRCDIR)/i_sdlmusic.c
+CSRCS += $(COMMONSRCDIR)/i_sound.c
+CSRCS += $(COMMONSRCDIR)/midifile.c
+CSRCS += $(COMMONSRCDIR)/mus2mid.c
+
+CSRCS += $(DOOMSRCDIR)/sounds.c
+CSRCS += $(DOOMSRCDIR)/s_sound.c
+CSRCS += $(DOOMSRCDIR)/deh_sound.c
+endif
+
+MAINSRC  = $(COMMONSRCDIR)/i_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/games/NXDoom/Makefile.am b/games/NXDoom/Makefile.am
deleted file mode 100644
index 4cad870c5..000000000
--- a/games/NXDoom/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-AUX_DIST_GEN =                          \
-        $(ac_aux_dir)/install-sh        \
-        $(ac_aux_dir)/missing
-
-CMAKE_FILES=                                   \
-        CMakeLists.txt                         \
-        cmake/FindSDL2.cmake                   \
-        cmake/FindSDL2_mixer.cmake             \
-        cmake/FindSDL2_net.cmake               \
-        cmake/FindFluidSynth.cmake             \
-        cmake/Findm.cmake                      \
-        cmake/FindSampleRate.cmake             \
-        cmake/config.h.cin
-
-DOC_FILES=                              \
-        COPYING.md                      \
-        README.md                       \
-        README.Music.md                 \
-        NEWS.md                         \
-        PHILOSOPHY.md                   \
-        ChangeLog
-
-EXTRA_DIST=                             \
-        $(AUX_DIST_GEN)                 \
-        $(CMAKE_FILES)                  \
-        $(DOC_FILES)                    \
-        NOT-BUGS.md                     \
-        README.Strife.md                \
-        .lvimrc                         \
-        HACKING.md                      \
-        TODO.md                         \
-        rpm.spec                        \
-        win32/win_opendir.c             \
-        win32/win_opendir.h
-
-doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
-doomdocs_DATA = $(DOC_FILES) NOT-BUGS.md
-
-hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
-hereticdocs_DATA = $(DOC_FILES)
-
-hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
-hexendocs_DATA = $(DOC_FILES)
-
-strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
-strifedocs_DATA = $(DOC_FILES) README.Strife.md
-
-MAINTAINERCLEANFILES =  $(AUX_DIST_GEN)
-
-SUBDIRS=textscreen opl pcsound data src man
-
-DIST_SUBDIRS=pkg $(SUBDIRS)
-
-if HAVE_DOC
-
-INSTALL : man/INSTALL.template man/simplecpp
-	$(srcdir)/man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
-            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
-            -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
-	                < $(srcdir)/man/INSTALL.template > $@
-
-endif
diff --git a/games/NXDoom/NEWS.md b/games/NXDoom/NEWS.md
deleted file mode 100644
index 9fa55a749..000000000
--- a/games/NXDoom/NEWS.md
+++ /dev/null
@@ -1,1492 +0,0 @@
-## 3.1.1 (2025-08-14)
-
-### General
-  * Fix compilation on GCC 15 (thanks Fabian).
-  * Hide public IP addresses for privacy.
-  * Use native OpenGL texture format for better performance (thanks Fabian).
-  * Improved directory handling on Windows (thank Roman Fomin):
-      * Fixes problems with postfix "." for non-relative paths.
-      * Support for long NTFS paths (up to 32768 characters).
-  * Fixed metainfo files for latest AppStream spec compliance (thanks Fabian).
-  * Add option to enable or disable smooth pixel scaling (thanks StevenSYS).
-  * Allow spaces in GUS patch folder path (thanks Michael Day).
-  * Add support for non-US backslash key (thanks Michael Day).
-  * Never let SDL Mixer use native midi on Windows (thanks Michael Day).
-  * Use $TMPDIR to find tempdir on Unix (thanks Mr. Myth).
-  * Improve man page formatting (thanks g-branden-robinson).
-
-### Build systems
-  * Can now be built with Emscripten (thanks James Baicoianu).
-  * Misc. improvements (thanks suve, Emmanuel Ferdman, Gabriele Simoni, et al.)
-
-### Setup
-  * Use correct EGA palette colors (thanks Henrique Jorge).
-
-### Doom
-  * Initial support for Doom version 1.5 (thanks Michael Francis).
-
-### Heretic
-  * Fix crash after loading too many saved games (thanks Noseey).
-
-### Hexen
-  * Fix crash with Heresiarch fireballs if player has never touched a wall (thank Noseey).
-
-### Strife
-  * Initialize floor->type and floor->crush fields in EV_BuildStairs() (thanks Fabian).
-
-## 3.1.0 (2024-08-01)
-
-### General
-  * Drag and drop loading of WAD, Dehacked and demo files is now supported on
-    Windows - simply drag the files onto chocolate-doom.exe (thanks Fabian).
-  * WAD file autoloading was added - WAD and DEH files can be copied into
-    an autoload folder to be automatically included on every game start.
-  * Music pack configuration has been significantly simplified. By simply
-    copying .flac/.ogg music files into a folder they will be automatically
-    detected by filename and used.
-  * Music packs can now be used with OPL as a fallback, and music pack
-    config files can have any name ending in '.cfg'.
-  * MP3 music packs are now supported.
-  * Network synchronization now uses a PID controller by default, which
-    makes games more smooth and more stable, especially for Internet play.
-  * UDP hole punching is now used to make servers behind NAT gateways
-    automatically accessible to the Internet.
-  * OPL emulation now uses Nuked OPL3 v1.8 (thanks nukeykt)
-  * Allow simultaneous PC speaker emulation and OPL emulation
-    (thanks Michael Day).
-  * The setup tool now uses "Romero Blue" as a background (see the wiki:
-    <https://doomwiki.org/wiki/Romero_Blue> for more info).
-  * The 0 and 5 keys on the number pad can now be bound independently
-    of any other keyboard key (thanks BlooD2ool).
-  * With aspect ratio correction disabled, the game can scale to any
-    arbitrary size and remove all black borders in full screen mode.
-    (thanks chungy)
-  * The executable's location is now checked when looking for IWADs.
-  * The IWAD files installed by Steam-on-Linux are now detected (thanks
-    chungy).
-  * It's now possible to use `-response` to load response files.
-  * Default savegame name now includes the WAD filename (thanks Fabian).
-  * Mouse movement is no longer read when the game window is inactive
-    (thanks Julia Nechaevskaya).
-  * Chocolate Doom now by default generates a "pet name" for the user
-    to respect privacy (thanks Jon!)
-  * The Freedoom single-player IWAD files are now officially supported,
-    since recent versions changed all levels to be vanilla compatible.
-  * Add native support for the FluidSynth midi synthesizer.
-  * Add a fsynth_gain config key to fine tune the FluidSynth output level
-    (thanks Fabian).
-  * Redesign of native MIDI support in Windows (thanks ceski and Roman Fomin):
-    - Emulates DMX MPU-401 feature set by default, change with
-      `winmm_complevel`.
-    - MIDI device reset between songs using "GM System On", change with
-      `winmm_reset_type`.
-    - Configurable delay after reset for legacy MIDI hardware (e.g. Roland
-      SC-55), change with `winmm_reset_delay`.
-  * Add improved gamepad support via the SDL\_GameController interface. This
-    includes support for analog triggers, modern dual-stick default bindings
-    (based on Unity Doom), descriptive button names for common controller types
-    and configurable dead zones for stick axes. (Michael Day).
-  * All games now have shiny new icons!
-  * The -display parameter was added to specify the display number on which to show the screen (thanks Robin Emeršič).
-
-### Build systems
-  * SDL2_mixer and SDL2_net can now be optionally disabled to increase
-    portability to systems that might not support audio or networking
-    (thanks turol).
-  * Travis CI was replaced with GitHub Actions (thanks Michael Francis).
-  * mingw CI was added for automatic Windows-building (thanks turol).
-  * A cpp-linter CI was added to improve the quality and formatting of code
-    (thanks turol).
-  * The `--disable-zpool` autoconf argument for disabling memory pooling was
-    added to make debugging easier (thanks turol).
-  * Python 2 has been deprecated and Python 3 is now used exclusively
-  (thanks Fabian).
-
-### Refactorings
-  * CMake project files have been added, replacing the Microsoft Visual
-    Studio and Code::Blocks files. CMake maintains support for multiple
-    IDEs and versions thereof, and reduces developer overhead when updating
-    Chocolate Doom (huge thanks to AlexMax for this work).
-  * Source code has been retrofitted to fix many compiler warnings and
-    add const annotations to many variables (thanks turol).
-  * Several functions have been hardened against incomplete reads and
-    error conditions, and made safer (thanks turol).
-  * Man page generation has been reworked to use autoconf macro
-    substitution, making it eaiser for downstream forks to change the
-    project name (thanks Jon).
-  * We now print a meaningful error message when a savegame cannot be
-    loaded (thanks Zodomaniac, chungy).
-  * There's now a log file feature for the network code to aid in tracking
-    down multiplayer bugs.
-  * AppData files were updated to the AppStream standard (thanks Mike).
-  * Many abuses of the extern keyword have been cleaned up to prevent
-    undefined behavior (thanks turol).
-  * Install of bash completion scripts was fixed (thanks Mike Swanson).
-
-### Bug fixes
-  * Fixed an exception thrown by the Windows kernel when debugging with
-    GDB (thanks AXDOOMER).
-  * Loop metadata now works properly with music packs on Windows.
-  * Mouse movement is ignored when the game window isn't active (thanks
-    Julia Nechaevskaya).
-  * A bug was fixed where music would not play after pausing on an
-    intermission screen (thanks Julia Nechaevskaya).
-  * Timeouts when connecting to a network server were fixed (thanks
-    @bradc6).
-  * A long-standing bug where some visplane overflows caused crashes was
-    fixed (thanks Michael Francis).
-  * A multiplayer deadlock bug where clients would stop sending tics after
-    missing tics from the server was fixed. There are both client- and
-    server- side fixes to fix the problem when playing with older versions
-    (thanks MadDog and Mortrixs for help tracking this down).
-  * The macOS launcher now quits automatically when all windows are closed.
-  * The mouse speed calibration thermometer was fixed.
-  * Some improvements have been made to PC speaker emulation to better match
-    Vanilla (thanks NY00123).
-  * Filenames and paths with non-latin characters now work on Windows
-    (thanks Roman Fomin).
-  * Properly handle orphan carriage returns when parsing deh files
-    (thanks Michael Day).
-
-### Doom
-  * Doom 1.2 demo support was added (thanks James Canete!)
-  * Map33 intermission screen and map33-map35 automap names are
-    emulated (thanks CapnClever).
-  * We now exit gracefully when player starts are missing (thanks Michael
-    Francis).
-  * We now exit gracefully on levels with a boss brain and no boss spitter
-    things (thanks Jason Benaim).
-  * It's now possible to play multiplayer with gameversion=1.2.
-  * When the game hits the limit for the number of wall scrollers, a count
-    of the number of scrollers is now displayed (thanks Jon).
-  * Sector special 17 (random light flicker) is now accurately emulated to
-    only appear in gameversion > 1.2 (thanks tpoppins).
-  * Fixed mouse events causing unwanted key presses (thanks Michael Day).
-  * French Doom II files doom2f.wad and french.deh are now automatically
-    detected (thanks Acts19quiz).
-  * Mouse buttons are now bindable to run (thanks Archenoth).
-  * The "Sky never changes in Doom II" bug is now accurately emulated
-    (thanks Michael Francis).
-  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
-  * Fix possible undefined behavior and accurately emulate vanilla when -skill
-    parameter is given a negative value (thanks Henrique Jorge).
-
-### Heretic
-  * P\_FindNextHighestFloor was changed to match vanilla behavior (thanks
-    AXDOOMER).
-  * WAD hash table is now generated for speed (thanks Michael Francis).
-  * HHE level name replacements now apply on the intermission screen
-    (thanks ETTiNGRiNDER).
-  * Mouse buttons are now bindable to scroll through inventory and
-    "use artifact" (thanks Michael Day).
-  * Mouse buttons are now bindable to run (thanks Archenoth).
-  * Multiplayer demo playback was fixed (thanks Ryan Krafnick).
-  * The GOG.com release is now detected (thanks Mike Swanson).
-  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
-  * Fix NULL backsector crash (thanks kitchen-ace and Julia Nechaevskaya).
-
-### Hexen
-  * ACS code has been hardened against potential security vulnerabilities.
-  * WAD hash table is now generated for speed (thanks AXDOOMER).
-  * Mouse buttons are now bindable to scroll through inventory and
-    "use artifact" (thanks Michael Day).
-  * Mouse buttons are now bindable to run (thanks Archenoth).
-  * Multiplayer demo playback was fixed (thanks Ryan Krafnick).
-  * The GOG.com release is now detected (thanks Mike Swanson).
-  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
-  * Fixed demo desyncs in P_LookForPlayers (thanks Michael Day)
-  * Add support for two different v1.1 variants through -gameversion
-    argument (thank NY00123).
-
-### Strife
-  * Sehacked replacements of the "empty slot" string now work.
-  * VOICES.WAD is now found in a case-insensitive way (thanks Michael Francis).
-  * PC speaker sound effects are now supported (thanks ceski).
-  * Mouse buttons are now bindable to turn left/right (thanks Fabian).
-  * Fixed demo desyncs in P_LookForPlayers (thanks Michael Day)
-  * Fix possible undefined behavior and accurately emulate vanilla when -skill
-    parameter is given a negative value (thanks Henrique Jorge).
-
-## 3.0.1 (2020-06-24)
-
-This is a point release that includes two security fixes related to Chocolate
-Doom server logic.
-
-Thanks to Michał Dardas from LogicalTrust for discovering the vulnerability.
-
-### Bug fixes
-  * ([CVE-2020-14983](https://nvd.nist.gov/vuln/detail/CVE-2020-14983)) Fixed a vulnerability where
-    an unchecked `num_players` field in the server logic could allow a malicious attacker to trigger
-    arbitrary code execution against Chocolate Doom servers.
-  * Fixed an issue where a client could crash if the server sent an invalid `ticdup` setting.
-
-## 3.0.0 (2017-12-30)
-
-  Chocolate Doom 3.0 is a new major revision. The main change is that
-  the codebase has been ported to SDL 2.0. This brings a number of
-  benefits, although there have also been some other minor changes (all
-  listed below).
-
-  Huge thanks go to the entire Chocolate Doom team for working on the
-  port to SDL2, and to all the testers who have found and reported bugs
-  during its development.
-
-### General
-  * All screen scaling is now performed in hardware, meaning that the
-    game can run in arbitrary window sizes in high quality. It can also
-    scale to very large resolutions sizes without using large amounts of
-    CPU or suffering degraded performance (thanks Fabian).
-  * It is now possible to switch between windowed and full screen modes
-    while the game is running by pressing alt + enter (thanks Jon)
-  * Windows binaries now ship with several previously-optional DLLs.
-    This means it is now possible to take PNG screenshots and to use
-    digital music packs (FLAC/Ogg Vorbis formats).
-  * The game now remembers your preferred monitor and will start on the
-    same monitor you were using the last time you played. Windows appear
-    centered on the screen.
-  * The OS X launcher was tweaked somewhat, and now uses proper path
-    controls for choosing files. FreeDM was added as an IWAD.
-  * Configuration files on Mac OS X and Unix are now stored in locations
-    compliant with the XDG standard (thanks chungy):
-    - On Unix: `~/.local/share/chocolate-doom/`
-    - On OS X: `~/Library/Application Support/chocolate-doom/`
-  * Icons when the game is running are now a higher resolution.
-  * Keyboard input is improved and uses the new SDL input API; on
-    systems with on-screen keyboards, this should activate the on-screen
-    keyboard when it is appropriate.
-  * Menu navigation with the joystick is now much more practical, and
-    it’s possible to bind a joystick axis to look up/down in games which
-    support it (thanks Jon, Wintermute0110).
-  * Several command line options were removed that were judged to be
-    useless: `-grabmouse`, `-novert` and `-nonovert`. The mouse grabbing
-    and novert settings can still be configured in the setup tool.
-  * There is no longer any option in the setup tool to specify a screen
-    resolution, since in full screen mode the game just runs at the
-    desktop resolution without changing screen modes. If necessary, the
-    config file options `fullscreen_width` and `fullscreen_height` can
-    be used to explicitly set a screen resolution.
-  * There is no longer a soft dependency on Zenity on Unix systems; the
-    SDL API is now used to display error dialogs.
-  * Joysticks are identified more precisely using GUID now.
-  * A new parameter, `-savedir` allows users to specify a directory from
-    which to load and save games. (thanks CapnClever)
-  * The midiproc code from Eternity Engine has been imported, improving
-    native MIDI playback on Windows and fixing a long-standing bug with
-    music volume adjustment (thanks AlexMax, Quasar).
-  * VGA “porch” emulation was added (thanks Jon).
-  * The codebase now compiles with OpenWatcom (thanks Stephen Finniss).
-
-### Doom
-  * The GOG install of Doom 3: BFG Edition is now detected (thanks chungy)
-  * A `-shorttics` command line parameter was added that simulates
-    recording a vanilla demo without actually recording a demo.
-
-### Hexen
-  * The CD audio option for music playback has been removed; the CD
-    playback API has been removed from SDL 2.0. However, it is possible
-    to use digital music packs as an alternative.
-
-### Strife
-  * `voices.wad` is now correctly loaded before PWADs (thanks
-    @Catoptromancy)
-
-### libtextscreen
-  * On OS X on machines with retina displays, text screens are rendered
-    using a high detail font.
-  * File selector widgets now look more visually distinctive.
-  * There is now a convenience widget for conditionally hiding widgets.
-  * Font handling was restructured to be based around PNG format fonts
-    which are converted during the build and can be more easily edited.
-  * Handling of code pages was cleaned up, so it is easier to change the
-    code to work with a different code page now.
-  * Lots of the UI code was changed to use UTF-8 strings.
-  * File extensions when using the Zenity file selector are now case
-    insensitive (thanks Jon).
-
-## 2.3.0 (2016-12-29)
-
-### General
-  * Bash completion scripts are included (thanks Fabian)
-  * The OS X launcher now supports the .lmp file format (thanks Jon)
-  * Pitch-shifting from early versions of Doom, Heretic, and Hexen.
-    is now supported (thanks Jon)
-  * Aspect ratio-corrected 1600×1200 PNGs are now written (thanks Jon)
-  * OPL emulation is more accurate (thanks Nuke.YKT)
-  * DMX bugs with GUS cards are now better emulated (thanks Nuke.YKT)
-  * The disk activity floppy disk icon is now shown (thanks Fabian, Jon)
-  * Checksum calculations are fixed on big endian systems, allowing
-    multiplayer games to be played in mixed little/big-endian
-    environments (thanks GhostlyDeath, njankowski)
-  * The NES30, SNES30, and SFC30 gamepads are detected and configured
-    automatically by the Setup tool. The automap can also be configured
-    to a joystick button (thanks Jon)
-  * The vanilla limit of 4046 lumps per WAD is now enforced (thanks
-    Jon, Quasar, Edward-san)
-  * Solidsegs overflow is emulated like in vanilla (thanks Quasar)
-  * Multiple capitalizations are now tried when searching for WAD files,
-    for convenience when running on case sensitive filesystems (thanks
-    Fabian).
-  * A new command line argument, `-strictdemos`, was added, to allow
-    more careful control over demo format extensions. Such extensions
-    are now forbidden in WAD files and warning messages are shown.
-
-### Build systems
-  * There is better compatibility with BSD Make (thanks R.Rebello)
-  * `./configure --with-PACKAGE` checks were repaired to behave
-    logically, rather than disabling the feature (thanks R.Rebello)
-  * Games are now installed to ${bindir} by default, eg.
-    /usr/local/bin, rather than /usr/local/games (thanks chungy)
-  * Visual Studio 2015 is now supported (thanks Azarien)
-  * SDL headers and libraries can now exist in the Microsoft Visual
-    Studio project directory (thanks Quasar)
-  * CodeBlocks projects were repaired by removing non-existent files
-    from the project files (thanks krystalgamer)
-
-### Doom
-  * Chex Quest’s level warp cheat (LEESNYDER##) now behaves more like
-    like the original EXE (thanks Nuke.YKT)
-  * It’s now possible to start multiplayer Chex Quest games.
-  * Freedoom: Phase 1 <= 0.10.1 can now be loaded with mods, with
-    -gameversion older than ultimate (thanks Fabian, chungy)
-  * The IWAD order preference for GOG.com installs matches vanilla
-    Final Doom: doom2, plutonia, tnt, doom (thanks chungy)
-  * There are better safety checks against write failures when saving
-    a game, such as when the directory is read-only (thanks
-    terrorcide)
-  * Versions 1.666, 1.7, and 1.8 are emulated (thanks Nuke.YKT)
-  * Crashes are now handled more gracefully when a linedef references
-    nonexistent sidedefs (thanks Fabian)
-
-### Heretic
-  * Map names were added for Episode 6, fixing a crash after completing
-    a level in this episode (thanks J.Benaim)
-  * Support for unlimited demo/savegames was added (thanks CapnClever)
-  * Demo support is expanded: `-demoextend` allows demos to last longer
-    than a single level; `-shortticfix` adjusts low-resolution turning
-    to match Doom’s handling, and there is now `-maxdemo` and `-longtics`
-    support (thanks CapnClever)
-
-### Hexen
-  * The MRJONES cheat code returns an identical string to vanilla, and
-    enables fully reproducible builds (thanks Fabian)
-  * An issue was fixed where the game crashed while killing the
-    Wraithverge in 64-bit builds (thanks J.Benaim)
-  * Support for unlimited demo/savegames was added (thanks CapnClever)
-  * Mouse buttons for strafe left/right and move backward were added,
-    as well as a “Double click acts as use” mouse option (thanks
-    CapnClever)
-  * Demo support is expanded: `-demoextend` allows demos to last longer
-    than a single level; `-shortticfix` adjusts low-resolution turning
-    to match Doom’s handling, and there is now `-maxdemo` and `-longtics`
-    support (thanks CapnClever)
-
-### Strife
-  * Support was added for automatic loading of the IWAD from the GOG.com
-    release of Strife: Veteran Edition on Windows (thanks chungy)
-  * Jumping can now be bound to a mouse button (thanks Gez)
-  * Gibbing logic was changed to match vanilla behavior (thanks Quasar)
-  * Several constants differences from vanilla were fixed (thanks
-    Nuke.YKT, Quasar)
-  * When using -iwad, voices.wad from the IWAD’s directory is prefered
-    over auto-detected DOS/Steam/GOG.com installs (thanks Quasar)
-
-### libtextscreen
-  * The API for creating and managing tables and columns was simplified.
-  * It’s now possible to cycle through tables with the tab key.
-  * Windows can now have multiple columns.
-
-## 2.2.1 (2015-09-10)
-
-  Chocolate Doom has not seen a great deal of “stable” patch releases
-  in its history. While the development tree sees major new features
-  and changes, the purpose of this release, and hopefully others to
-  follow like it, is to repair some deficiencies that existed
-  in 2.2.0.
-
-### General
-  * Preferences for the OS X launcher are now stored with a unique
-    name to not conflict with other applications. (thanks
-    Xeriphas1994)
-  * Unix desktop entry files are now brought up to full desktop entry
-    specification compliance. (thanks chungy, Fabian)
-  * Unix AppData entries are now included, allowing software centers
-    to display detailed information about the engines. (thanks chungy)
-  * Partial XDG base directory specification compliance on Unix
-    systems now exist to search for IWAD paths.  One benefit is that
-    $HOME/.local/share/games/doom is now a valid location to store and
-    automatically find IWADs. (thanks chungy)
-
-### Build systems
-  * The Microsoft Visual Studio build system was not fully functional
-    in 2.2.0 and has been fixed. (thanks Linguica)
-  * The autoconf build system checks for windres only for Windows
-    toolchains.  Some Linux distributions mistakingly include the
-    program in their native toolchains. (thanks Fabian)
-  * A compiler hint for packed structs has been added, which otherwise
-    broke the games when built under recent GCC releases for
-    Windows. (thanks Fabian)
-
-### Doom
-  * The GOG.com releases of The Ultimate Doom, Doom II, and Final Doom
-    are now detected and supported on Windows. (thanks chungy)
-  * An integer overflow was used in spawn angle calculation, undefined
-    C behavior which broke with Clang optimization.  (thanks David
-    Majnemer for insight)
-
-### Setup tool
-  * The help URL for the level warp menu now points to the proper wiki
-    page, rather than the multiplayer page.
-  * The manifest has been updated for Windows 10 compatibility.
-    (thanks chungy)
-
-## 2.2.0 (2015-06-09)
-
-  * The Hexen four level demo IWAD is now supported. Thanks to Fabian
-    Greffrath for his careful investigation and emulation of the demo
-    game’s behavior in developing this.
-  * OPL music playback has been improved in a number of ways to match
-    the behavior of Vanilla Doom’s DMX library much more closely. OPL3
-    playback is also now supported. Thanks go to Alexey Khokholov for
-    his excellent research into the Vanilla DMX library that enabled
-    these improvements.
-  * New gamepad configurations:
-      - PS4 DualShock 4 (thanks Matt “3nT” Davis).
-      - Xbox One controller on Linux (thanks chungy).
-      - “Super Joy Box 7” USB/PC gameport adapter.
-  * The Doom reload hack has been added back. See the wiki for more
-    context on this: http://doomwiki.org/wiki/Reload_hack
-  * The IWAD file from Strife: Veteran Edition is now detected
-    automatically (thanks chungy).
-  * It’s now possible to build outside of the source directory (thanks
-    Dave Murphy).
-  * MSVC project files were brought up to date (thanks dbrackett16).
-  * M_StringDuplicate() has been added as a safer replacement for
-    strdup() (thanks Quasar). M_StringCopy() now handles short buffers
-    more gracefully.
-  * The netgame discrepancy window is now dismissed by pressing enter
-    to proceed, not escape (thanks AXDOOMER).
-  * A couple of source files that were in the previous release and
-    were GPL3 have been replaced by GPL2 equivalents. Previous
-    releases that included these files should be retroactively
-    considered GPL3.
-
-### Bug fixes
-  * A long-standing bug that could cause every display frame to be
-    rendered twice was fixed (thanks Linguica, Harha, AXDOOMER).
-  * Lots of endianness fixes were integrated that were found by Ronald
-    Lasmanowicz during development of his Wii port of Chocolate Doom,
-    including a fix for a bug that could cause monsters to become
-    partially invisible.
-  * DeHackEd files without a newline character at the EOF are now
-    correctly parsed (thanks Fabian).
-  * An infinite loop that could occur in the weapon cycling code was
-    fixed (thanks raithe, Fabian).
-  * Mouse input triggered by cursor warp was fixed (thanks Super6-4).
-  * Loop tags in substitute music files are ignored if both of the
-    loop tags are equal to zero. This makes us consistent with other
-    source ports that support the tags.
-  * It’s now possible to more conveniently play back demo .lmp files
-    with names that end in the all-caps “.LMP” (thanks Ioan Chera).
-  * Some code that accessed memory after freeing it was fixed. Two new
-    parameters, -zonezero and -zonescan, were added to try to help
-    detect these cases.
-  * Mistaken assumptions about representations of booleans that
-    affected some ARM systems were fixed (thanks floppes).
-  * memcpy() uses on overlapping memory were changed to use memmove(),
-    fixing abort traps on OpenBSD (thanks ryan-sg).
-  * Hyphens in manpages were fixed (thanks chungy, Fabian).
-  * Lots of compiler build warnings were fixed (thanks Fabian).
-
-### Setup tool
-  * The setup tool now has help buttons for its various different
-    screens, which link to articles on the wiki that give more
-    information (thanks to chungy for helping to put the wiki pages
-    together).
-  * A fix was applied for a buffer overrun that could occur if the
-    user had lots of IWAD files installed (thanks Fabian).
-  * A crash related to username lookup was fixed.
-  * It’s now possible to connect via the setup tool to multiplayer
-    servers that are not listening on the default port (thanks
-    AXDOOMER).
-
-### Doom
-  * Sky transitions when emulating the id anthology version of the
-    Final Doom executable were fixed (thanks AXDOOMER, Fabian,
-    chungy).
-  * Structure fields in the stair-building functions were fixed to be
-    deterministic, fixing a desync in mm09-512.lmp (thanks Fabian).
-
-### Hexen
-  * A bug with texture names that had long names was fixed (thanks
-    ETTiNGRiNDER).
-  * Minotaur spawn time is now stored in little endian format, fixing
-    a bug that affected compatibility with Vanilla savegames on big
-    endian systems.
-  * Code that starts ACS scripts is no longer compiler-dependent.
-
-### Strife (all these are thanks to Quasar)
-  * Sound priority was changed, so that the ticking sound that Stalker
-    enemies make while active matches Vanilla behavior (thanks
-    GeoffLedak).
-  * Minor fixes to game behavior to match Vanilla, discovered during
-    development of Strife: Veteran edition.
-  * Behavior of descending stairs was fixed to match Vanilla.
-  * Inventory items beyond the 8-bit range are now allowed in
-    netgames.
-  * Automap behavior better matches Vanilla now.
-  * Multiplayer name changes were fixed.
-  * Sound origin behavior for switches was fixed.
-  * Teleport beacon behavior was fixed.
-  * Default Strife skill level and screen size were changed to match
-    Vanilla.
-  * Bug was fixed where Rowan would not always take Beldin’s ring.
-  * Totally-invisible objects are now displayed correctly, and a
-    Vanilla glitch with Shadow Acolytes is correctly emulated.
-  * The level name for MAP29 (Entity’s Lair) was fixed (thanks
-    chungy).
-
-### libtextscreen
-  * The main loop now exits immediately once all windows are closed
-    (thanks AXDOOMER).
-  * The large font is no longer selected based entirely on screen
-    size.
-
-## 2.1.0 (2014-10-22)
-
-  Chocolate Doom now supports high-quality substitute music packs that
-  are used in place of the original MIDI music tracks. I’m hoping to
-  put together high-quality recordings of the music for all supported
-  games using the Roland SC-55 synthesizer originally used to compose
-  Doom’s music (thanks twipley and MusicallyInspired).
-
-  Support for joysticks and gamepads has been significantly improved
-  in this version. Most gamepads should now work; if they don’t,
-  please report a bug. A number of gamepads are now automatically
-  detected and configured automatically; if yours is not, you can help
-  by sending in details. See the following page:
-
-  http://www.chocolate-doom.org/wiki/index.php/Adding_your_gamepad
-
-  OPL MIDI playback has been significantly improved, and problems with
-  most tracks should now be resolved. Multi-track MIDI files now play
-  back properly, MIDI tempo meta events are now supported and problems
-  with stuttering when playing certain tracks have been fixed. If you
-  still have problems with OPL playback, let me know.
-
-  Also of note is that Chocolate Doom now has a document that
-  describes the philosophy of the project and the reasoning behind its
-  design (see PHILOSOPHY distributed with the source).
-
-### Other new features
-  * There is now a -dehlump command line parameter to load Dehacked
-    files contained inside WAD files (thanks Fabian Greffrath).
-  * PNG format screenshots are now supported, and there is a dedicated
-    key binding for taking screenshots without needing to always use
-    -devparm (thanks Fabian Greffrath). The PrintScreen key can be
-    used as a key binding (thanks AXDOOMER).
-  * There is now a config file variable (snd_maxslicetime_ms) to
-    control the sound buffer size, and the default is more precise to
-    reduce sound latency (thanks Holering).
-  * You can now use an external command for music playback (thanks
-    Holering).
-  * All games now detect if you’re tring to play using the wrong type
-    of IWAD (doom.wad with Hexen, etc.) and exit with a helpful error
-    message. A couple of users made this mistake after the 2.0 release
-    introduced support for the new games.
-  * The OS X app now associates with .hhe and .seh files.
-  * There is now a -nodes parameter that automatically starts a
-    netgame when a desired number of players have joined the game.
-  * There is now more extensive documentation about music
-    configuration (README.Music).
-  * On Linux, a GUI pop-up is used when the game quits with an error
-    to show the error message (thanks Willy Barro).
-  * There are now Linux .desktop files for all supported games (thanks
-    Mike Swanson).
-  * The -geometry command line parameter can now be used to specify
-    fullscreen or windowed modes, eg. -geometry 640x480w or -geometry
-    1024x768f. (thanks Mike Swanson)
-
-### Doom
-  * Minor workarounds were added to allow the BFG Edition IWADs to be
-    used without crashing the game (thanks Fabian Greffrath).
-  * GUS patch files included with the BFG Edition are now
-    automatically detected.
-  * The “no fog on spawn west” Vanilla bug is now correctly emulated
-    (thanks xttl).
-  * Behavior of older versions of Doom back to v1.666 can now be
-    emulated.
-  * The new Freedoom IWAD names are now recognized and supported.
-  * Freedoom’s DEHACKED lump can now be parsed and is automatically
-    loaded when a Freedoom IWAD file is used (thanks Fabian
-    Greffrath). A new command line parameter, -nodeh, can be used to
-    prevent this from being loaded.
-  * Behavior of the M_EPI4 menu item is now correctly emulated based
-    on game version (thanks AXDOOMER).
-  * IDCLEV up to MAP40 is now supported, to match Vanilla (thanks
-    AXDOOMER).
-  * Level warping on the command line (-warp) to episodes higher than
-    4 is possible, matching Vanilla behavior (thanks plumsinus).
-  * The -cdrom command line parameter writes savegames to the correct
-    directory now, matching Vanilla Doom behavior (thanks AXDOOMER).
-  * The Doom II mission pack to use can now be specified manually on
-    the command line with the -pack parameter (thanks chungy)
-
-### Heretic
-  * Weapon cycling keys for mouse and joystick were fixed (thanks
-    Sander van Dijk).
-  * The -timedemo parameter has been fixed, and -playdemo now handles
-    full paths correctly.
-  * A bug when panning the map was fixed (thanks Chris Fielder).
-  * A savegame bug where plat_t structures were not restored correctly
-    was fixed (thanks romeroyakovlev).
-  * Rebinding of the pause key was fixed (thanks Fabian Greffrath).
-
-### Hexen
-  * Music workarounds have been added so that it is possible to play
-    using the Mac version of the Hexen IWAD file.
-  * Weapon cycling keys for mouse and joystick were fixed (thanks
-    Sander van Dijk).
-  * The -timedemo parameter has been fixed, and -playdemo now handles
-    full paths correctly.
-  * There are now key bindings to allow the artifact keys to be
-    rebound (thanks Fabian Greffrath).
-  * Rebinding of the pause key was fixed (thanks Fabian Greffrath).
-  * Maximum level number was extended to MAP60, allowing multiplayer
-    games using the Deathkings add-on.
-  * The startup screen can now be aborted by pressing escape, like in
-    Vanilla.
-  * Desync when playing back DEMO1 was fixed (thanks alexey.lysiuk).
-
-### Strife
-  * “Show mission” key is configured properly in setup (thanks Sander
-    van Dijk).
-  * Default music volume level now matches Vanilla (thanks AXDOOMER).
-  * Teleport beacon allegiance was fixed to match Vanilla (thanks
-    Quasar).
-  * The stair building code now more closely matches Vanilla (thanks
-    Quasar).
-  * Torpedo weapon changing behavior now matches Vanilla (thanks
-    Quasar).
-
-### Cleanups
-  * The copyright headers at the top of all source files have been
-    vastly simplified.
-  * Unsafe string functions have been eliminated from the codebase.
-    Thanks to Theo de Raadt for calling out Chocolate Doom by name
-    (alongside many other packages) for still using unsafe functions
-    like strcpy: http://marc.info/?l=openbsd-tech&m=138733933417096
-  * vldoor_e enum values are now namespaced to avoid potential
-    conflicts with POSIX standard functions.
-
-### Bug fixes
-  * WAD and Dehacked checksums are now sent to clients and checked
-    correctly when setting up netgames.
-  * A bug was fixed that caused sound not to work in multiplayer games
-    (thanks to everyone who reported this, and for AXDOOMER and Quasar
-    for help in fixing it).
-  * The “D_DDTBLU disease” bug affecting certain MIDI files has been
-    fixed (thanks plumsinus, Brad Harding and Quasar).
-  * Calculation of the -devparm “ticker” dots was fixed to match
-    Vanilla behavior (thanks _bruce_ and AXDOOMER).
-  * The PC speaker code now supports the full range of sound
-    frequencies (thanks Gez).
-  * Annoying “jumping” behavior when grabbing the mouse cursor was
-    fixed.
-  * The screen is now initialized at the native bit depth by default,
-    to avoid problems with systems that don’t handle 8-bit
-    screenbuffers very well any more.
-  * The --docdir argument to the configure script is now honored
-    (thanks Jan Engelhardt).
-  * Various issues with the build were fixed (thanks Jan Engelhardt
-    and Fabian Greffrath).
-  * Backwards parameters were fixed in the sound code (thanks
-    proteal).
-  * A crash was fixed when running fullscreen with the -2 parameter
-    (thanks Fabian Greffrath).
-  * A crash when using large values of snd_channels was fixed (thanks
-    AXDOOMER).
-  * A resource leak in the BSD PC speaker code was fixed (thanks
-    Edward-san).
-  * Windows resource files were fixed for Windows 7 (thanks Brad
-    Harding).
-  * A hard to trigger crash caused by a realloc() in the WAD code was
-    fixed (thanks Fabian Greffrath for debugging).
-  * A bug has been fixed where Chocolate Doom would stay running in
-    the background on Windows after quitting. SDL_Quit() is called now
-    (thanks johnsirett, Brad Harding, Quasar).
-  * String replacements in dehacked lumps can now be overridden if a
-    subsequent dehacked patch replaces the same string.
-
-### libtextscreen
-  * Clicking on scrollbars now jumps to the correct position (thanks
-    AXDOOMER).
-  * A use-after-free bug has been fixed where a click in a window that
-    causes the window to close could lead to a crash (thanks DuClare).
-  * Characters that are unprintable in the Extended ASCII chart are
-    just ignored when they’re typed, rather than appearing as an
-    upside-down question mark (thanks AXDOOMER).
-
-## 2.0.0 (2013-12-09)
-
-  This is version 2.0 of Chocolate Doom! This new major version is
-  released to celeberate the 20th anniversary of the first release of
-  Doom in 1993. Happy Birthday Doom!
-
-  This new version has some major changes compared to the 1.0 series:
-
-  * The codebase now includes Chocolate Heretic and Chocolate
-    Hexen. These are based on the GPL source code released by Raven
-    Software.
-  * Also included is Chocolate Strife. This was developed through a
-    mammoth four year reverse engineering project conducted by James
-    “Quasar” Haley and Samuel “Kaiser” Villareal. The result is the
-    most accurate reproduction of Strife to date, including full demo
-    and savegame compatibility. See README.Strife for more
-    information.
-
-### Minor features that are nonetheless worth mentioning
-  * Chocolate Doom now includes a -statdump command line option, which
-    emulates the output of the statdump.exe tool. This is used to
-    implement a form of regression testing (statcheck) that directly
-    compares against the Vanilla behavior.
-  * Chocolate Heretic includes HHE patch file support, and I believe
-    is the first Heretic port to include this feature.
-  * GUS “pseudo-emulation” is now supported. This does not fully
-    emulate a GUS, but Doom’s DMXGUS lump can be used to generate a
-    Timidity configuration file that plays music using the GUS patch
-    set.
-  * The setup tool now includes a built-in server browser, for use
-    when selecting a server to join.
-
-  Version 2.0 of Chocolate Doom has been in development for a long
-  time, and there have been many bugs fixed over this time, too many
-  to list here. Thanks to all the people who have tested it and
-  diligently reported bugs over this time, and to all the people who
-  have tested the beta releases over the past couple of months.  Your
-  contributions have been essential and invaluable.
-
-## 1.7.0 (2012-06-09)
-
-  * Fixed gnome-screensaver desktop file (thanks Rahul Sundaram).
-  * Updated COPYING to current version of GPL2 (thanks Rahul
-    Sundaram).
-  * Running servers now re-resolve the address of the master server
-    occasionally, to adapt to DNS address changes.
-  * Error dialog is no longer shown on OS X when running from the
-    console.
-  * The Makefiles no longer use GNU make extensions, so the package
-    builds on OpenBSD.
-  * There is now an OPL MIDI debug option (-opldev), useful for when
-    developing GENMIDI lumps.
-  * A workaround for SDL mouse lag is now only used on Windows (where
-    it is needed), and not on other systems. This fixes Chocolate Doom
-    on AmigaOS (thanks Timo Sievänen).
-  * UTF-8 usernames are supported, and Windows usernames with
-    non-ASCII characters are now supported (thanks AXDOOMER).
-
-### Compatibility
-  * Palette accuracy is reduced to 6 bits per channel, to more
-    accurately emulate the PC VGA hardware (thanks GhostlyDeath).
-  * Fixed teleport behavior when emulating the alternate Final Doom
-    executable (-gameversion final2) (thanks xttl).
-
-### Bugs fixed
-  * Fixed weapon cycling keys when playing in Shareware Doom and using
-    the IDKFA cheat (thanks AXDOOMER).
-  * Fixed the default mouse buttons in the setup tool (thanks
-    AXDOOMER).
-  * Chat macros now work when vanilla_keyboard_mapping is turned off.
-  * Default chat macros were fixed in the setup tool.
-  * Ping time calculation was fixed for LAN search, and made more
-    accurate for all searches.
-  * Fixed bug with detection of IWAD type by filename (thanks mether).
-
-### libtextscreen
-  * There is now limited UTF-8 text support in the textscreen library,
-    used in the label and input box widgets.
-  * Scroll bar behavior was fixed (thanks AXDOOMER).
-  * Input boxes stop editing and save when they lose their focus,
-    correcting a previous counterintuitive behavior (thanks Twelve).
-  * The numeric keypad now works properly when entering text values
-    (thanks Twelve).
-
-## 1.6.0 (2011-05-17)
-
-  * The instructions in the INSTALL file are now customized for
-    different platforms, and each binary package contains a version
-    with instructions specific to the platform that it is targetting.
-    This should help to avoid confusion that some users have reported
-    experiencing.
-  * The display settings window in the setup tool has been reorganised
-    to a better arrangement.
-  * It is now possible to load .lmp files (and play back demos) with
-    long filenames (thanks blzut3).
-  * In the setup tool, it is now possible to hold down shift when
-    changing key/mouse/joystick bindings to prevent other bindings to
-    the same key from being cleared (thanks myk).
-  * The joystick menu in the setup tool now has a test button (thanks
-    AXDOOMER).
-  * Specifying the -privateserver option implies -server (thanks
-    Porsche Monty).
-  * The Mac OS X .dmg package now has a background and looks generally
-    more polished.
-  * In Mac OS X, it is now possible to simply double click an IWAD
-    file in the Finder to configure its location within the launcher.
-  * Freedesktop.org desktop files are now installed for Doom and the
-    setup tool, which will appear in the main menu on desktop
-    environments such as Gnome and KDE (thanks Adrián Chaves
-    Fernández).
-  * The Chex Quest dehacked patch (chex.deh) will now be detected if
-    it is in the same directory as the IWAD file.
-
-### Compatibility
-  * Added support for the alternate version of the Final Doom
-    executable included in some later versions of the Id Anthology.
-    This version fixed the demo loop crash that occurred with the
-    “original” Final Doom executable.
-
-    This executable can be selected on the command line with
-    -gameversion final2. It has been made the default when playing
-    with the Final Doom IWADs (the original behavior can be selected
-    with -gameversion final).  (thanks Porsche Monty, Enjay).
-  * Very short sound effects are not played, to better emulate the
-    behavior of DMX in Vanilla Doom (thanks to Quasar for help in
-    investigating this).
-  * The null sector dereference emulation code has been imported from
-    Prboom+ - this fixes a desync with CLNJ-506.LMP (thanks entryway).
-  * The IDMUS cheat doesn’t work when emulating the v1.9 executable
-    (thanks AXDOOMER).
-
-### Bugs fixed
-  * Menu navigation when using joystick/joypad (thanks AXDOOMER).
-  * For configuration file value for shift keys, use scan code for
-    right shift, not left shift (thanks AXDOOMER).
-  * Default joystick buttons for the setup tool now match Vanilla
-    (thanks twipley).
-  * Visual Studio project files work again (thanks GhostlyDeath).
-  * The default sfx/music volume set by the setup tool is now 8
-    instead of 15, matching the game itself. (thanks AXDOOMER).
-  * Weapon cycling from the shotgun to the chaingun in Doom 1 now
-    works properly (thanks AXDOOMER).
-  * MIDI playback that locked up when using an empty MUS / MIDI file
-    (thanks AXDOOMER).
-  * Default sampling rate used by setup tool changed to 44100Hz, to
-    match the game default (thanks AXDOOMER).
-  * Cheat codes and menu hot keys now work when shift is held down or
-    capslock turned on (thanks AXDOOMER).
-
-### libtextscreen
-  * The background on GUI controls now lights up when hovering over
-    them, so that it is more obvious what you are selecting.
-  * It is now possible to type a “+” in input boxes (thanks AXDOOMER).
-  * It is possible to use the mouse wheel to scroll through scroll
-    panes.
-  * Clicking on scroll bars now moves the scroll handle to a matching
-    location.
-  * Clicking outside a dropdown list popup window now dismisses the
-    window.
-  * Window hotkeys that are an alphabetical letter now work when shift
-    is held down or capslock turned on (thanks AXDOOMER).
-
-## 1.5.0 (2011-01-02)
-
-  Big changes in this version:
-
-  * The DOSbox OPL emulator (DBOPL) has been imported to replace the
-    older FMOPL code.  The quality of OPL emulation is now therefore
-    much better.
-  * The game can now run in screen modes at any color depth (not just
-    8-bit modes).  This is mainly to work around problems with Windows
-    Vista/7, where 8-bit color modes don’t always work properly.
-  * Multiplayer servers now register themselves with an Internet
-    master server.  Use the -search command line parameter to find
-    servers on the Internet to play on.  You can also use DoomSeeker
-    (http://skulltag.net/doomseeker/) which supports this
-    functionality.
-  * When running in windowed mode, it is now possible to dynamically
-    resize the window by dragging the window borders.
-  * Names can be specified for servers with the -servername command
-    line parameter.
-  * There are now keyboard, mouse and joystick bindings to cycle
-    through available weapons, making play with joypads or mobile
-    devices (ie. without a proper keyboard) much more practical.
-  * There is now a key binding to change the multiplayer spy key
-    (usually F12).
-  * The setup tool now has a “warp” button on the main menu, like
-    Vanilla setup.exe (thanks Proteh).
-  * Up to 8 mouse buttons are now supported (including the
-    mousewheel).
-  * A new command line parameter has been added (-solo-net) which can
-    be used to simulate being in a single player netgame.
-  * There is now a configuration file parameter to set the OPL I/O
-    port, for cards that don’t use port 0x388.
-  * The Python scripts used for building Chocolate Doom now work with
-    Python 3 (but also continue to work with Python 2) (thanks arin).
-  * There is now a NOT-BUGS file included that lists some common
-    Vanilla Doom bugs/limitations that you might encounter (thanks to
-    Sander van Dijk for feedback).
-
-### Compatibility
-  * The -timer and -avg options now work the same as Vanilla when
-    playing back demos (thanks xttl)
-  * A texture lookup bug was fixed that caused the wrong sky to be
-    displayed in Spooky01.wad (thanks Porsche Monty).
-  * The HacX v1.2 IWAD file is now supported, and can be used
-    standalone without the need for the Doom II IWAD (thanks atyth).
-  * The I_Error function doesn’t display “Error:” before the error
-    message, matching the Vanilla behavior.  “Error” has also been
-    removed from the title of the dialog box that appears on Windows
-    when this happens.  This is desirable as not all such messages are
-    actually errors (thanks Proteh).
-  * The setup tool now passes through all command line arguments when
-    launching the game (thanks AXDOOMER).
-  * Demo loop behavior (ie. whether to play DEMO4) now depends on the
-    version being emulated.  When playing Final Doom the game will
-    exit unexpectedly as it tries to play the fourth demo - this is
-    Vanilla behaviour (thanks AXDOOMER).
-
-### Bugs fixed
-  * A workaround has been a bug in old versions of SDL_mixer (v1.2.8
-    and earlier) that could cause the game to lock up.  Please upgrade
-    to a newer version if you haven’t already.
-  * It is now possible to use OPL emulation at 11025Hz sound sampling
-    rate, due to the new OPL emulator (thanks Porsche Monty).
-  * The span renderer function (used for drawing floors and ceilings)
-    now behaves the same as Vanilla Doom, so screenshots are
-    pixel-perfect identical to Vanilla Doom (thanks Porsche Monty).
-  * The zone memory system now aligns allocated memory to 8-byte
-    boundaries on 64-bit systems, which may fix crashes on systems
-    such as sparc64 (thanks Ryan Freeman and Edd Barrett).
-  * The configure script now checks for libm, fixing compile problems
-    on Fedora Linux (thanks Sander van Dijk).
-  * Sound distortion with certain music files when played back using
-    OPL (eg. Heretic title screen).
-  * Error in Windows when reading response files (thanks Porsche
-    Monty, xttl, Janizdreg).
-  * Windows Vista/7 8-bit color mode issues (the default is now to run
-    in 32-bit color depth on these versions) (thanks to everybody who
-    reported this and helped test the fix).
-  * Screen borders no longer flash when running on widescreen
-    monitors, if you choose a true-color screen mode (thanks exp(x)).
-  * The controller player in a netgame is the first player to join,
-    instead of just being someone who gets lucky.
-  * Command line arguments that take an option now check that an
-    option is provided (thanks Sander van Dijk).
-  * Skill level names in the setup tool are now written the same as
-    they are on the in-game “new game” menu (thanks AXDOOMER).
-  * There is no longer a limit on the lengths of filenames provided to
-    the -record command line parameter (thanks AXDOOMER).
-  * Window title is not lost in setup tool when changing video driver
-    (thanks AXDOOMER).
-
-### libtextscreen
-  * The font used for the textscreen library can be forced by setting
-    the TEXTSCREEN_FONT environment variable to “small” or “normal”.
-  * Tables or scroll panes that don’t contain any selectable widgets
-    are now themselves not selectable (thanks Proteh).
-  * The actions displayed at the bottom of windows are now laid out in
-    a more aesthetically pleasing way.
-
-## 1.4.0 (2010-07-10)
-
-  The biggest change in this version is the addition of OPL emulation.
-  This emulates Vanilla Doom’s MIDI playback when using a Yamaha OPL
-  synthesizer chip, as was found on SoundBlaster compatible cards.
-
-  A software OPL emulator is included as most modern computers do not
-  have a hardware OPL chip any more.  If you do have one, you can
-  configure Chocolate Doom to use it; see README.OPL.
-
-  The OPL playback feature is not yet perfect or 100% complete, but is
-  judged to be good enough for general use.  If you find music that
-  does not play back properly, please report it as a bug.
-
-### Other changes
-  * The REJECT overflow emulation code from PrBoom+ has been
-    imported.  This fixes demo desync on some demos, although
-    others will still desync.
-  * Warnings are now generated for invalid dehacked replacements of
-    printf format strings.  Some potential buffer overflows are also
-    checked.
-  * The installation instructions (INSTALL file) have been clarified
-    and made more platform-agnostic.
-  * The mouse is no longer warped to the center of the screen when the
-    demo sequence advances.
-  * Key bindings can now be changed for the demo recording quit key
-    (normally ‘q’) and the multiplayer messaging keys (normally ‘t’,
-    ‘g’, ‘i’, ‘b’ and ‘r’).
-
-## 1.3.0 (2010-02-10)
-
-  * Chocolate Doom now runs on Windows Mobile/Windows CE!
-  * It is possible to rebind most/all of the keys that control the
-    menu, shortcuts, automap and weapon switching.  The main reason
-    for this is to support the Windows CE port and other platforms
-    where a full keyboard may not be present.
-  * Chocolate Doom now includes a proper Mac OS X package; it is no
-    longer necessary to compile binaries for this system by hand.  The
-    package includes a simple graphical launcher program and can be
-    installed simply by dragging the “Chocolate Doom” icon to the
-    Applications folder. (thanks to Rikard Lang for extensive testing
-    and feedback)
-  * The video mode auto-adjust code will automatically choose windowed
-    mode if no fullscreen video modes are available.
-  * The zone memory size is automatically reduced on systems with a
-    small amount of memory.
-  * The “join game” window in the setup tool now has an option to
-    automatically join a game on the local network.
-  * Chocolate Doom includes some initial hacks for compiling under
-    SDL 1.3.
-  * Recent versions of SDL_mixer include rewritten MIDI code on Mac OS
-    X.  If you are using a version of SDL_mixer with the new code,
-    music will now be enabled by default.
-  * Windows Vista and Windows 7 no longer prompt for elevated
-    privileges when running the setup tool (thanks hobbs and MikeRS).
-  * The Windows binaries now have better looking icons (thanks
-    MikeRS).
-  * Magic values specified using the -spechit command line parameter
-    can now be hexadecimal.
-  * DOOMWADDIR/DOOMWADPATH can now specify the complete path to IWAD
-    files, rather than the path to the directory that contains them.
-  * When recording shorttics demos, errors caused by the reduced
-    turning resolution are carried forward, possibly making turning
-    smoother.
-  * The source tarball can now be used to build an RPM package:
-    rpmbuild -tb chocolate-doom-VER.tar.gz
-
-### Compatibility
-  * The A_BossDeath behavior in v1.9 emulation mode was fixed (thanks
-    entryway)
-  * The “loading” disk icon is drawn more like how it is drawn in
-    Vanilla Doom, also fixing a bug with chook3.wad.
-  * Desync on 64-bit systems with ep1-0500.lmp has (at long last) been
-    fixed (thanks exp(x)).
-  * Donut overrun emulation code imported from Prboom+ (thanks
-    entryway).
-  * The correct level name should now be shown in the automap for
-    pl2.wad MAP33 (thanks Janizdreg).
-  * In Chex Quest, the green radiation suit colormap is now used
-    instead of the red colormaps normally used when taking damage or
-    using the berserk pack.  This matches Vanilla chex.exe behavior
-    (thanks Fuzztooth).
-  * Impassible glass now displays and works the same as in Vanilla,
-    fixing wads such as OTTAWAU.WAD (thanks Never_Again).
-
-### Bugs fixed
-  * Memory-mapped WAD I/O is disabled by default, as it caused various
-    issues, including a slowdown/crash with Plutonia 2 MAP23.  It can
-    be explicitly re-enabled using the “-mmap” command line parameter.
-  * Crash when saving games due to the ~/.chocolate-doom/savegames
-    directory not being created (thanks to everyone who reported
-    this).
-  * Chocolate Doom will now run under Win95/98, as the
-    SetProcessAffinityMask function is looked up dynamically.
-  * Compilation under Linux with older versions of libc will now work
-    (the semantics for sched_setaffinity were different in older
-    versions)
-  * Sound clipping when using libsamplerate was improved (thanks David
-    Flater)
-  * The audio buffer size is now calculated based on the sample rate,
-    so there is not a noticeable delay when using a lower sample rate.
-  * The manpage documentation for the DOOMWADPATH variable was fixed
-    (thanks MikeRS).
-  * Compilation with FEATURE_MULTIPLAYER and FEATURE_SOUND disabled
-    was fixed.
-  * Fixed crash when using the donut special type and the joining
-    linedef is one sided (thanks Alexander Waldmann).
-  * Key settings in a configuration file that are out of range do not
-    cause a crash (thanks entryway).
-  * Fix ear-piercing whistle when playing the MAP05 MIDI music using
-    timidity with EAWPATS (thanks entryway / HackNeyed).
-
-### libtextscreen
-  * There is now a second, small textscreen font, so that the ENDOOM
-    screen and setup tool can be used on low resolution devices
-    (eg. PDAs/embedded devices)
-  * The textscreen library now has a scrollable pane widget. Thanks to
-    LionsPhil for contributing code to scroll up and down using the
-    keyboard.
-  * Doxygen documentation was added for the textscreen library.
-
-## 1.2.1 (2008-12-10)
-
-  This version just fixes a crash at the intermission screen when
-  playing Doom 1 levels.
-
-## 1.2.0 (2008-12-10)
-
-  Happy 15th Birthday, Doom!
-
-  * Chocolate Doom now has an icon that is not based on the
-    proprietary Doom artwork.
-  * There is now memory-mapped WAD I/O support, which should be useful
-    on some embedded systems.
-  * Chex quest emulation support is now included, although an
-    auxiliary dehacked patch is needed (chexdeh.zip in the idgames
-    archive).
-
-### Compatibility
-  * The armor class is always set to 2 when picking up a megasphere
-    (thanks entryway).
-  * The quit screen prompts to quit “to dos” instead of just to quit
-    (thanks MikeRS)
-  * The “dimensional shambler” quit message was fixed.
-  * Fix crash related to A_BFGSpray with NULL target when using
-    dehacked patches - discovered with insaned2.deh (thanks CSonicGo)
-  * NUL characters are stripped from dehacked files, to ensure correct
-    behavior with some dehacked patches (eg. the one with portal.wad).
-
-### Bugs fixed
-  * “Python Image Library” should have been “Python Imaging Library”
-    (thanks exp(x)).
-  * The setup tool should no longer ask for elevated permissions on
-    Windows Vista (this fix possibly may not work).
-  * The application icon is set properly when running under Windows XP
-    with the “Luna” theme.
-  * Fix compilation under Cygwin to detect libraries and headers from
-    the correct environment.
-  * The video code does not try to read SDL events before SDL has been
-    properly initialised - this was causing problems with some older
-    versions of SDL.
-
-## 1.1.1 (2008-04-20)
-
-  The previous release (v1.1.0) included a bug that broke compilation
-  when libsamplerate support was enabled.  The only change in this
-  version is to fix this bug.
-
-## 1.1.0 (2008-04-19)
-
-  * The video mode code has been radically restructured.  The video
-    mode is now chosen by directly specifying the mode to use; the
-    scale factor is then chosen to fit the screen.  This is helpful
-    when using widescreen monitors (thanks Linguica)
-  * MSVC build project files (thanks GhostlyDeath and entryway).
-  * Unix manpage improvements; the manpage now lists the environment
-    variables that Chocolate Doom uses.  Manpages have been added for
-    chocolate-setup and chocolate-server, from the versions for the
-    Debian Chocolate Doom package (thanks Jon Dowland).
-  * INSTALL file with installation instructions for installing
-    Chocolate Doom on Unix systems.
-  * Support for high quality resampling of sound effects using
-    libsamplerate (thanks David Flater).
-  * A low pass filter is applied when doing sound resampling in an
-    attempt to filter out high frequency noise from the resampling
-    process.
-  * R_Main progress box is not displayed if stdout is a file (produces
-    cleaner output).
-  * Client/server version checking can be disabled to allow different
-    versions of Chocolate Doom to play together, or Chocolate Doom
-    clients to play with Strawberry Doom clients.
-  * Unix manpages are now generated for the Chocolate Doom
-    configuration files.
-  * The BSD PC speaker driver now works on FreeBSD.
-
-### Compatibility
-  * Use the same spechits compatibility value as PrBoom+, for
-    consistency (thanks Lemonzest).
-  * The intercepts overrun code has been refactored to work on big
-    endian machines.
-  * The default startup delay has been set to one second, to allow
-    time for the screen to settle before starting the game (some
-    monitors have a delay before they come back on after changing
-    modes).
-  * If a savegame buffer overrun occurs, the savegame does not get
-    saved and existing savegames are not overwritten (same behaviour
-    as Vanilla).
-
-### Bugs fixed
-  * Desync with STRAIN demos and dehacked Misc values not being set
-    properly (thanks Lemonzest)
-  * Don’t grab the mouse if the mouse is disabled via -nomouse or
-    use_mouse in the configuration file (thanks MikeRS).
-  * Don’t center the mouse on startup if the mouse is disabled (thanks
-    Siggi).
-  * Reset the palette when the window is restored to clear any screen
-    corruption (thanks Catoptromancy).
-  * mus2mid.c should use `MEM_SEEK_SET`, not `SEEK_SET` (thanks
-    Russell)
-  * Fast/Respawn options were not being exchanged when starting
-    netgames (thanks GhostlyDeath).
-  * Letterbox mode is more accurately described as “pillarboxed” or
-    “windowboxed” where appropriate (thanks MikeRS)
-  * Process affinity mask is set to 1 on Windows, to work around a bug
-    in SDL_mixer that can cause crashes on multi-core machines (thanks
-    entryway).
-  * Bugs in the joystick configuration dialog in the setup tool have
-    been fixed.
-
-## 1.0.0 (2007-12-10)
-
-  This release is dedicated to Dylan “Toke” McIntosh, who was
-  tragically killed in a car crash in 2006.  I knew Dylan from IRC and
-  the Doomworld forums for several years, and he had a deep passion
-  for this game.  He was also a huge help for me while developing
-  Chocolate Doom, as he helped point out a lot of small quirks in
-  Vanilla Doom that I didn’t know about. His death is a great loss.
-  RIP Toke.
-
-  This is the first release to reach full feature parity with Vanilla
-  Doom.  As a result, I have made this version 1.0.0, so Chocolate
-  Doom is no longer beta!
-
-### Big new features
-  * Multiplayer!  This version includes an entirely new multiplayer
-    engine, based on a packet server architecture.  I’d like to thank
-    joe, pritch, Meph and myk, and everyone else who has helped test
-    the new code for their support, feedback and help in testing this.
-    The new code still needs more testing, and I’m eager to hear any
-    feedback on this.
-  * A working setup tool.  This has the same look and feel as the
-    original setup.exe.  I hope people like it!  Note that it has some
-    advantages over the original setup.exe - for example, you can use
-    the mouse.
-
-### Other new features
-  * New mus conversion code thanks to Ben Ryves.  This converts the
-    Doom .mus format to .mid a lot better.  As one example, tnt.wad
-    Map02 is now a lot closer to how Vanilla says.  Also, the music on
-    the deca.wad titlescreen now plays!
-  * x3, x4 and x5 display scale (thanks to MikeRS for x5 scale).
-  * Fullscreen “letterbox” mode allows Chocolate Doom to run on
-    machines where 1.6:1 aspect ratio modes are unavailable
-    (320x200/640x400).  The game runs in 320x240/640x480 instead, with
-    black borders.  The system automatically adjusts to this if closer
-    modes are unavailable.
-  * Aspect ratio correction: you can (also) run at 640x480 without
-    black borders at the top and bottom of the screen.
-  * PC speaker sound effect support.  Chocolate Doom can output real
-    PC speaker sounds on Linux, or emulate a PC speaker through the
-    sound card.
-  * Working three-screen mode, as seen in early versions of Doom!  To
-    test this out, put three computers on a LAN and type:
-
-        chocolate-doom -server
-        chocolate-doom -autojoin -left
-        chocolate-doom -autojoin -right
-
-  * Allow a delay to be specified on startup, to allow the display to
-    settle after changing modes before starting the game.
-  * Allow the full path and filename to be specified when loading
-    demos: It is now possible to type “chocolate-doom -playdemo
-    /tmp/foo.lmp” for example.
-  * Savegames are now stored in separate directories depending on the
-    IWAD: eg. the savegames for Doom II are stored in a different
-    place to those for Doom I, Final Doom, etc. (this does not affect
-    Windows).
-  * New mouse acceleration code works based on a threshold and
-    acceleration.  Hopefully this should be closer to what the DOS
-    drivers do.  There is a ‘test’ feature in the setup tool to help
-    in configuring this.
-  * New “-nwtmerge” command line option that emulates NWT’s “-merge”
-    option.  This allows TiC’s Obituary TC to be played.
-  * The ENDOOM screen no longer closes automatically, you have to
-    click the window to make it go away.
-  * Spechit overrun fixes and improvements.  Thanks to entryway for
-    his continued research on this topic (and because I stole your
-    improvements :-).  Thanks to Quasar for reporting a bug as well.
-  * Multiple dehacked patches can be specified on the command line, in
-    the same way as with WADs - eg. -deh foo.deh bar.deh baz.deh.
-  * Default zone memory size increased to 16MB; this can be controlled
-    using the -mb command-line option.
-  * It is now possible to record demos of unlimited length (by
-    default, the Vanilla limit still applies, but it can now be
-    disabled).
-  * Autoadjusting the screen mode can now be disabled.
-  * On Windows, the registry is queried to detect installed versions
-    of Doom and automatically locate IWAD files.  IWADs installed
-    through Steam are also autodetected.
-  * Added DOOMWADPATH that can be used like PATH to specify multiple
-    locations in which to search for IWAD files.  Also, “-iwad” is now
-    enhanced, so that eg. “-iwad doom.wad” will now search all IWAD
-    search paths for “doom.wad”.
-  * Improved mouse tracking that should no longer lag.  Thanks to
-    entryway for research into this.
-  * The SDL driver can now be specified in the configuration file.
-    The setup tool has an option on Windows to select between DirectX
-    and windib.
-  * Joystick support.
-  * Configuration file option to change the sound sample rate.
-  * More than three mouse buttons are now supported.
-
-### Portability improvements
-  * Chocolate Doom now compiles and runs cleanly on MacOS X.  Huge
-    thanks go to Insomniak who kindly gave me an account on his
-    machine so that I could debug this remotely.  Big thanks also go
-    to athanatos on the Doomworld forums for his patience in testing
-    various ideas as I tried to get Chocolate Doom up and running on
-    MacOS.
-  * Chocolate Doom now compiles and runs natively on AMD64.
-  * Chocolate Doom now compiles and runs on Solaris/SPARC, including
-    the Sun compiler.  Thanks to Mike Spooner for some portability
-    fixes.
-  * Improved audio rate conversion, so that sound should play properly
-    on machines that don’t support low bitrate output.
-
-### Compatibility fixes
-  * Check for IWADs in the same order as Vanilla Doom.
-  * Dehacked code will now not allow string replacements to be longer
-    than those possible through DOS dehacked.
-  * Fix sound effects playing too loud on level 8 (thanks to myk for
-    his continued persistence in getting me to fix this)
-  * Save demos when quitting normally - it is no longer necessary to
-    press ‘q’ to quit and save a demo.
-  * Fix spacing of -devparm mode dots.
-  * Fix sky behavior to be the same as Vanilla Doom - when playing in
-    Doom II, the skies never change from the sky on the first level
-    unless the player loads from a savegame.
-  * Make -nomouse and config file use_mouse work again.
-  * Fix the -nomusic command-line parameter.  Make the snd_sfxdevice
-    snd_musicdevice values in the configuration file work, so that it
-    is possible to disable sound, as with Vanilla.
-  * Repeat key presses when the key is held down (this is the Vanilla
-    behavior) - thanks to Mad_Mac for pointing this out.
-  * Don’t print a list of all arguments read from response files -
-    Vanilla doesn’t do this.
-  * Autorun only when joyb_speed >= 10, not >= 4.  Thanks to Janizdreg
-    for this.
-  * Emulate a bug in DOS dehacked that can overflow the dehacked frame
-    table and corrupt the weaponinfo table.  Note that this means
-    Batman Doom will no longer play properly (identical behavior to
-    Vanilla); vbatman.deh needs to also be applied to fix it.  (Thanks
-    grazza)
-  * Allow dehacked 2.3 patches to be loaded.
-  * Add more dehacked string replacements.
-  * Compatibility option to enable or disable native key mappings.
-    This means that people with non-US keyboards can decide whether to
-    use their correct native mapping or behave like Vanilla mapping
-    (which assumes all keyboards are US).
-  * Emulate overflow bug in P_FindNextHighestFloor.  Thanks to
-    entryway for the fix for this.
-  * Add -netdemo command line parameter, for playing back netgame
-    demos recorded with a single player.
-  * The numeric keypad now behaves like Vanilla Doom does.
-  * Fix some crashes when loading from savegames.
-  * Add intercepts overrun emulation from PrBoom-plus.  Thanks again
-    to entryway for his research on this subject.
-  * Add playeringame overrun emulation.
-
-### Bugs fixed
-  * Fix crash when starting new levels due to the intermission screen
-    being drawn after the WI_ subsystem is shut down (thanks pritch
-    and joe)
-  * Catch failures to initialise sound properly, and fail gracefully.
-  * Fix crasher in 1427uv01.lmp (thanks ultdoomer)
-  * Fix crash in udm1.wad.
-  * Fix crash when loading a savegame with revenant tracer missiles.
-  * Fix crash when loading a savegame when a mancubus was in the
-    middle of firing.
-  * Fix Doom 1 E1-3 intermission screen animations.
-  * Fix loading of dehacked “sound” sections.
-  * Make sure that modified copyright banners always end in a newline
-    - this fixes a bug with av.wad (thanks myk)
-  * Added missing quit message (“are you sure you want to quit this
-    great game?”).
-  * Fix when playing long sound effects - the death sound in
-    marina.wad now plays properly, for example.
-  * Fix buffer overrun on the quicksave prompt screen that caused a
-    mysterious cycling character to appear.
-  * IDCLEV should not work in net games (thanks Janizdreg)
-  * Stop music playing at the ENDOOM screen.
-  * Fix sound sample rate conversion crash.
-  * Fix “pop” heard at the end of sound effects.
-  * Fix crash when playing long sounds.
-  * Fix bug with -timedemo accuracy over multi-level demos.
-  * Fix bug with the automap always following player 1 in multiplayer
-    mode (thanks Janizdreg).
-
-## 0.1.4 (2006-02-13)
-
-  * NWT-style merging command line options (allows Mordeth to be played)
-  * Unix manpage (thanks Jon Dowland)
-  * Dehacked improvements/fixes:
-     * Allow changing the names of graphic lumps used in menu, status bar
-       intermission screen, etc.
-     * Allow changing skies, animated flats + textures
-     * Allow changing more startup strings.
-     * Allow text replacements on music + sfx lump names
-  * Fix for plutonia map12 crash.
-  * Fix bug with playing long sfx at odd sample rates.
-  * Big Endian fixes (for MacOS X).  Thanks to athanatos for helping
-    find some of these.
-  * Install into /usr/games, rather than /usr/bin (thanks Jon Dowland)
-
-## 0.1.3 (2006-01-20)
-
-  * Imported the spechit overrun emulation code from prboom-plus.  Thanks to
-    Andrey Budko for this.
-  * New show_endoom option in the chocolate-doom.cfg config file allows
-    the ENDOOM screen to be disabled.
-  * Chocolate Doom is now savegame-compatible with Vanilla Doom.
-
-  * Fixes for big endian machines (thanks locust)
-  * Fixed the behavior of the dehacked maximum health setting.
-  * Fix the “-skill 0” hack to play without any items (thanks to Janizdreg
-    for pointing out that this was nonfunctional)
-  * Fix playing of sounds at odd sample rates (again).  Sound effects
-    at any sample rate now play, but only sounds with valid headers.
-    This is the *real* way Vanilla Doom behaves.  Thanks to myk for
-    pointing out the incorrect behavior.
-
-## 0.1.2 (2005-10-29)
-
-  * Silence sounds at odd sample rates (rather than bombing out); this
-    is the way Vanilla Doom behaves.
-  * Handle multiple replacements of the same sprite in a PWAD.
-  * Support specifying a specific version to emulate via the command line
-    (-gameversion)
-  * Fix help screen orderings and skull positions.  Behave exactly as
-    the original executables do.
-
-## 0.1.1 (2005-10-18)
-
-  * Display startup “banners” if they have been modified through
-    dehacked.
-  * Dehacked “Misc” section support.
-
-### Bugs fixed
-  * Doom 1 skies always using Episode 1 sky
-  * Crash when switching applications while running fullscreen
-  * Lost soul bounce logic (do not bounce in Registered/Shareware)
-  * Mouse buttons mapped incorrectly (button 1 is right, 2 is middle)
-  * Music not pausing when game is paused, when using SDL_mixer’s
-    native MIDI playback.
-  * Pink icon on startup (palette should be fully set before anything is
-    loaded)
-
-## 0.1.0 (2005-10-09)
-
-  * Dehacked support
-  * WAD merging for TCs
-  * ENDOOM display
-  * Fix bug with invalid MUS files causing crashes
-  * Final Doom fixes
-
-## 0.0.4 (2005-09-27)
-
-  * Application icon and version info included in Windows .exe files
-  * Fixes for non-x86 architectures
-  * Fix uac_dead.wad (platform drop on e1m8 should occur when all
-    bosses die, not just barons)
-  * Fix “loading” icon to work for all graphics modes
-
-## 0.0.3 (2005-09-17)
-
-  * Mouse acceleration code to emulate the behaviour of old DOS mouse
-    drivers (thanks to Toke for information about this and
-    suggestions)
-  * Lock surfaces properly when we have to (fixes crash under
-    Windows 98)
-
-## 0.0.2 (2005-09-13)
-
-  * Remove temporary MIDI files generated by sound code.
-  * Fix sound not playing at the right volume
-  * Allow alt-tab away while running in fullscreen under Windows
-  * Add second configuration file (chocolate-doom.cfg) to allow
-    chocolate-doom specific settings.
-  * Fix switches not changing in Ultimate Doom
-
-## 0.0.1 (2005-09-07)
-
-  First beta release
diff --git a/games/NXDoom/NOT-BUGS.md b/games/NXDoom/NOT-BUGS.md
deleted file mode 100644
index 1ef97e3df..000000000
--- a/games/NXDoom/NOT-BUGS.md
+++ /dev/null
@@ -1,149 +0,0 @@
-The aim of Chocolate Doom is to behave as closely to Vanilla Doom as
-possible.  As a result, you may experience problems that you would
-also experience when using Vanilla Doom.  These are not “bugs” as
-Chocolate Doom is behaving as intended.
-
-This is not intended to be a comprehensive list of Vanilla Doom bugs.
-For more information, consult the “engine bugs” page of the Doom Wiki.
-
-## Game exits after title screen with message about game version
-
-The game may exit after the title screen is shown, with a message like
-the following:
-
-    Demo is from a different game version!
-    (read 2, should be 109)
-
-    *** You may need to upgrade your version of Doom to v1.9. ***
-        See: https://www.doomworld.com/classicdoom/info/patches.php
-        This appears to be v1.0/v1.1/v1.2.
-
-This usually indicates that your IWAD file that you are using to play
-the game (usually named doom.wad or doom2.wad) is out of date.
-Chocolate Doom only supports versions 1.666 through 1.9.
-
-To fix the problem, you must upgrade your IWAD file, preferably
-to 1.9.  The URL in the message has downloadable upgrade patches that
-you can use to upgrade.
-
-## Game exits in demo loop when playing Final Doom
-
-When playing with the Final Doom IWAD files (tnt.wad, plutonia.wad),
-if you leave the game at the title screen to play through the demo
-loop, it will eventually exit with the following error message:
-
-    W_GetNumForName: demo4 not found!
-
-This is the same behavior as the Vanilla executables that were
-bundled with Final Doom.  When Ultimate Doom was developed, a fourth
-demo was added to the demo loop, and this change was retained in the
-Final Doom version of the executable.  However, the Final Doom IWADs
-do not include a fourth demo, so the game crashes.
-
-An alternate version of Final Doom was included in the Id Anthology
-boxed set, and this version of the game fixed this bug. However, this
-version also changes the teleport behavior, so the default is to
-emulate the most commonly distributed version of the game. To use
-the alternate version, run with:
-
-    chocolate-doom -gameversion final2
-
-## Game exits when accessing the options menu
-
-The game may exit with the message “Bad V_DrawPatch” when accessing
-the options menu, if you have your mouse sensitivity set high.
-
-The Doom options menu has a slider that allows the mouse sensitivity
-to be controlled; however, it has only a very limited range. It is
-common for experienced players to set a mouse sensitivity that is much
-higher than what can be set via the options menu. The setup program
-allows a larger range of values to be set.
-
-However, setting very high sensitivity values causes the game to exit
-when accessing the options menu under Vanilla Doom. Because Chocolate
-Doom aims to emulate Vanilla Doom as closely as possible, it does the
-same thing.
-
-One solution to the problem is to set a lower mouse sensitivity.
-Alternatively, all of the settings in the options menu can be
-controlled through Doom’s key bindings anyway:
-
-Option                     | Key
----------------------------|-----
-End game                   | F7
-Messages on/off            | F8
-Graphic detail high/low    | F5
-Screen size smaller/larger | -/+
-Sound volume menu          | F4
-
-## Game exits with “Savegame buffer overrun” when saving the game
-
-If you are playing on a particularly large level, it is possible that
-when you save the game, the game will quit with the message “Savegame
-buffer overrun”.
-
-Vanilla Doom has a limited size memory buffer that it uses for saving
-games.  If you are playing on a large level, the buffer may be too
-small for the entire savegame to fit.  Chocolate Doom allows the limit
-to be disabled: in the setup tool, go to the “compatibility” menu and
-disable the “Vanilla savegame limit” option.
-
-If this error happens to you, your game has not been lost!  A file
-named temp.dsg is saved; rename this to doomsav0.dsg to make it appear
-in the first slot in the “load game” menu.  (On Unix systems, you will
-need to look in the .chocolate-doom/savegames directory in your home
-directory)
-
-## Game ends suddenly when recording a demo
-
-If you are recording a very long demo, the game may exit suddenly.
-Vanilla Doom has a limited size memory buffer that it uses to save the
-demo into.  When the buffer is full, the game exits.  You can tell if
-this happens, as the demo file will be around 131,072 bytes in size.
-
-You can work around this by using the -maxdemo command line parameter
-to specify a larger buffer size.  Alternatively, the limit can be
-disabled: in the setup tool, go to the compatibility menu and disable
-the “Vanilla demo limit” option.
-
-## Game exits with a message about “visplanes”
-
-The game may exit with one of these messages:
-
-    R_FindPlane: no more visplanes
-    R_DrawPlanes: visplane overflow (129)
-
-This is known as the “visplane overflow” limit and is one of the most
-well-known Vanilla Doom engine limits.  You should only ever experience
-this when trying to play an add-on level.  The level you are trying to
-play is too complex; it was most likely designed to work with a limit
-removing source port.
-
-More information can be found here (archived link): https://archive.is/s6h7V
-
-## IDMUS## cheat doesn’t work with shareware/registered Doom IWADs
-
-The IDMUS cheat allows the in-game music to be changed.  However, in
-the original v1.9 this cheat didn’t work properly when playing with
-the Doom 1 (shareware and registered) IWADs.  This bug was fixed in
-the Ultimate Doom and Final Doom executables.
-
-Chocolate Doom emulates this bug.  When playing with the shareware or
-registered Doom IWADs, the IDMUS cheat therefore does not work
-properly.  If you are playing with the Ultimate Doom IWAD, the
-Ultimate Doom executable is emulated by default, so the cheat works
-properly.
-
-## Some graphics are wrong when playing with BFG Edition IWADs
-
-If you are playing using the IWAD files from Doom 3: BFG Edition, you
-may notice that certain graphics appear strange or wrong. This
-includes the title screen, and parts of the options menu.
-
-The IWAD files in the new BFG Edition have had some significant
-changes from the IWAD files in older releases. Some of the graphics
-lumps have been removed or changed, and the Doom 2 secret levels are
-also censored. Chocolate Doom includes some small workarounds that
-allow the game to run, but for the best experience, it’s best to get a
-copy of the classic versions of the IWADs. These are still available
-to buy from Steam or GOG.com.
diff --git a/games/NXDoom/PHILOSOPHY.md b/games/NXDoom/PHILOSOPHY.md
deleted file mode 100644
index afd1e68d1..000000000
--- a/games/NXDoom/PHILOSOPHY.md
+++ /dev/null
@@ -1,214 +0,0 @@
-Chocolate Doom has been designed around a careful and deliberate
-philosophy that attempts to recreate the original (“Vanilla”) DOS
-executables for Doom, Heretic, Hexen and Strife. This document
-describes some of that philosophy and the reasoning behind it.
-
-This document is descriptive, not proscriptive.
-
-# Vanilla behavior
-
-Ideally Chocolate Doom aims to recreate the behavior of the Vanilla
-binaries, but different aspects of Vanilla behavior are held to
-varying degrees of importance. It can be imagined as different “tiers”
-of compatibility:
-
- * The game and gameplay itself is of central importance. Here, the
-   Vanilla behavior ought to be maintained as accurately as possible.
-   This includes the look, feel and sound, and things like demo
-   compatibility.
- * The surrounding aspects of the game that aren’t part of the central
-   gameplay experience can be extended as long as there’s a good
-   reason and Vanilla behavior is respected.
- * The setup tool is not required to reproduce the behavior of the
-   Vanilla setup tool, even though it reproduces its look and feel.
-
-“Vanilla” is defined as:
-
- * DOS Doom 1.9 (although there are actually multiple “1.9”s).
- * DOS Heretic 1.3.
- * DOS Hexen 1.1 (although there are actually two known “1.1”s).
- * DOS Strife 1.31.
- * DOS Chex Quest.
-
-Compatibility with older versions of the DOS binaries is also a
-secondary goal (though not pre-release versions). Other ports (either
-official or unofficial) are out of scope: this includes console ports,
-non-DOS ports, Doom 95 and Doom 3: BFG Edition.
-
-# Compatibility
-
-Chocolate Doom aims to be compatible with Vanilla Doom in several
-different ways. Examples are:
-
- * Bug compatibility: the aim is to emulate compatibility of the
-   original game down to bugs that were present in the DOS
-   executables. This includes maintaining the limitations of the
-   original engine: for example, the infamous “visplane overflow” bug
-   is intentionally still present, where other source ports have
-   removed it; this allows mappers targeting Vanilla Doom to use
-   Chocolate Doom as a faithful substitute.
- * Demo compatibility: Doom was one of the first games to develop a
-   ‘speedrunning’ community, and thousands of recordings of Doom
-   gameplay (`.lmp` demo files) exist in the Compet-N archive. Chocolate
-   Doom aims for the highest standard of demo compatibility with
-   Vanilla Doom, a goal that is often complicated by obscure behavior
-   that can be difficult to reproduce.
- * Configuration file compatibility: Chocolate Doom uses the same
-   configuration file format as Vanilla Doom, such that a user should
-   be able to reuse their existing Vanilla configuration file without
-   making any changes. Extra non-Vanilla options are stored in a
-   separate configuration file.
- * Savegame file compatibility: Chocolate Doom uses the same savegame
-   file format as Vanilla, such that it should be possible to import
-   and use existing savegame files.
-
-# DOS tools
-
-Chocolate Doom includes some features that aren’t part of Vanilla Doom
-but exist for compatibility with DOS tools that interact with it.
-These are considered part of the Vanilla experience and ought to be
-treated as such. Some examples are:
-
- * The novert setting, which reproduces the functionality of
-   `novert.exe`.
- * The `-deh` parameter, which loads Dehacked patches like dehacked.exe
-   does under DOS. Chocolate Doom imposes the same limitations that
-   Vanilla Dehacked does.
-
-# Exceptions
-
-Chocolate Doom differs from Vanilla Doom in a number of ways. In most
-cases these are subtle, minor differences. Nonetheless they deserve
-some explanation and justification. Here are some examples of
-situations where changes are considered acceptable:
-
- 1. Vanilla behavior can be broken that is harmful, eg. can damage the
-    player’s computer, or is just outright misleading. For example:
-
-    - Vanilla uses unbounded sprintf and strcpy (security issue).
-    - Vanilla has crashes that force the user to reboot the machine.
-    - Vanilla has an out of memory message that recommends tweaking
-      CONFIG.SYS. As Chocolate Doom doesn’t run under DOS, reproducing
-      this message would not be helpful.
-
- 2. Subtly extending behavior is okay where it’s not clear what the
-    Vanilla behavior is anyway. For example:
-
-    - Opening the menu releases mouse grab in Chocolate Doom.
-    - Chocolate Hexen’s graphical startup screen runs in a window.
-
- 3. Supporting obsolete technology is not a goal: it’s considered
-    acceptable that Chocolate Doom does not support every type of
-    hardware from 1993. However, Chocolate Doom should aim to recreate
-    the functionality in a modern way. Examples of technologies that
-    aren’t supported are:
-
-    - No support for IPX networks, but TCP/IP is supported instead.
-    - No support for dial-up/serial connections; modern operating
-      systems have features that do that for you.
-    - No MS-DOS version.
-
- 4. Changes are acceptable that allow the player to be able play the
-    game. For example:
-
-    - There are new key bindings for actions that can’t be rebound with
-      Vanilla Doom, because it’s useful for portability to machines
-      that don’t have a full keyboard.
-    - There are additional mouse and joystick button bindings that let
-      you perform actions with them that can only be done with the
-      keyboard in Vanilla Doom.
-    - Chocolate Doom includes some hacks to support the Doom 3: BFG
-      Edition IWAD files. The assumption is that being able to at least
-      play is better than nothing, even if it’s not Vanilla behavior.
-    - Chocolate Strife does not emulate the save bug from
-      Vanilla 1.31, which could corrupt saves when overwriting a slot,
-      if the old slot was not part of the current game’s progression.
-      Vanilla behavior is unexpected and potentially devastating.
-
- 5. Adding extra options to Vanilla functionality is acceptable as long
-    as the defaults match Vanilla, it doesn’t change gameplay and
-    there’s a good reason for it. For example:
-
-    - PNG screenshots are supported because PCX is an obsolete format.
-    - Chocolate Doom has the vanilla_keyboard_mapping option that
-      allows the user to use the native keyboard mapping for their
-      computer, rather than always assuming a US layout.
-
- 6. Changing configuration file defaults is acceptable where there’s a
-    very good reason. For example:
-
-    - Vanilla Doom defaults to no sound or music if a configuration
-      file is not found. Chocolate Doom defaults to having sound
-      effects and music turned on by default, because modern computers
-      support these; there’s no need to configure hardware IRQ settings
-      to get sound working.
-
- 7. Things can be changed if they’re really just inconsequential. For
-    example:
-
-    - The startup messages in Chocolate Doom are not identical to
-      Vanilla Doom and are not necessarily in the same order.
-    - Vanilla Doom has command line options named `-comdev`, `-shdev`
-      and `-regdev` used by id internally for development; these have
-      been removed.
-
- 8. Expansions to the vanilla demo formats are allowed, to make
-    recording and playback of vanilla gameplay more convenient, with
-    the following restrictions:
-
-    - Such expansions are not supported in WAD files (they are not
-      an editing feature for WAD authors to use).
-    - Support for these features can be completely disabled using the
-      `-strictdemos` command line argument.
-    - A warning is shown to the user on the console (stdout) when a
-      demo using one of these features is recorded or played back.
-
-A good litmus test of when it’s acceptable to break from Vanilla
-behavior is to ask the question: “Although this is Vanilla behavior,
-is there anyone who would want this?”
-
-For example, emulating Vanilla bugs like the visplane overflow bug is
-something that is useful for people making Vanilla format maps. On the
-other hand, painstakingly emulating Vanilla Doom by starting with no
-sound or music by default is not helpful to anyone.
-
-# Minimalism
-
-Chocolate Doom aims to be minimalist and straightforward to configure;
-in particular, the setup tool should have a sane interface. Part of
-the inspiration for Chocolate Doom came from Boom’s complicated maze
-of options menus (and a desire to avoid them). Too many preferences
-lead to a bad user interface; see Havoc Pennington’s essay on Free
-Software UI:
-
-  http://ometer.com/free-software-ui.html
-
-Chocolate Doom has some options that are quite obscure and only really
-of interest to a small number of people. In these cases, the options
-are hidden away in configuration files and deliberately not exposed in
-the setup tool. The assumption is that if you care enough about those
-obscure features, editing a configuration file by hand should not be a
-huge problem for you.
-
-Also inspirational was the README file from Havoc’s Metacity window
-manager, where the list of features begins:
-
-  > Boring window manager for the adult in you. Many window managers
-  > are like Marshmallow Froot Loops; Metacity is like Cheerios.
-
-I’d like to think that Chocolate Doom’s philosophy towards features is
-similar. The idea is for a source port that is boring. I find the best
-software - both proprietary and open source - is software that is
-“egoless”: it does a job well without pretentions about its importance
-or delusions of grandeur. A couple of other notable examples of
-software that I feel embody this spirit of design in a beautiful way
-are Marco Pesenti Gritti’s Epiphany web browser and Evince PDF viewer.
-
-# Other philosophical aspects
-
-Chocolate Doom aims for maximal portability. That includes running on
-many different CPUs, different operating systems and different devices
-(ie. not just a desktop machine with a keyboard and mouse).
-
-Chocolate Doom is and will always remain Free Software. It will never
-include code that is not compatible with the GNU GPL.
diff --git a/games/NXDoom/README.Music.md b/games/NXDoom/README.Music.md
deleted file mode 100644
index 7c1b2925c..000000000
--- a/games/NXDoom/README.Music.md
+++ /dev/null
@@ -1,173 +0,0 @@
-Doom has a memorable and atmospheric soundtrack. Like many games of
-the era, it is MIDI-based. Chocolate Doom includes a number of
-different options for music playback, detailed below.
-
-# Native MIDI playback
-
-Most modern operating systems have some kind of built-in support for
-MIDI playback; some have very good quality MIDI playback (Mac OS X for
-example). To use this, choose “Native MIDI” in the sound configuration
-dialog in the setup tool.
-
-# Timidity
-
-Timidity is a software-based MIDI synthesizer, and a version of it is
-included in the SDL2_mixer library used by Chocolate Doom. To use
-Timidity for MIDI playback, first download a sound font. An example of
-a good quality sound font is the eawpats font, which can be downloaded
-from the idgames archive as sounds/eawpats.zip:
-
-  https://www.doomworld.com/idgames/sounds/eawpats
-
-Having installed a sound font, select “Native MIDI” in the sound
-configuration dialog in the setup tool, and use the “Timidity
-configuration file” widget below to enter the path to the Timidity
-configuration file (normally named timidity.cfg).
-
-# Gravis Ultrasound (GUS)
-
-The Gravis Ultrasound (GUS) was a PC sound card popular in the ’90s,
-notable for having wavetable synthesis that provided MIDI playback
-that was superior to most other cards of the era. Chocolate Doom
-includes a “pseudo-GUS emulation” feature that simulates the GUS
-(using Timidity, under the hood).
-
-To use this feature you need a copy of the GUS patch files that were
-distributed with the original GUS patches. If you have Doom 3: BFG
-Edition, these patches are included with its version of classic Doom,
-and are automatically detected. Otherwise, they can be downloaded
-from the idgames archive as music/dgguspat.zip:
-
-  https://www.doomworld.com/idgames/music/dgguspat
-
-Having downloaded the patches, select “GUS (emulated)” in the sound
-configuration dialog in the setup tool, and use the “GUS patch path”
-widget to enter the path to the directory containing the patch files.
-
-For the music not to sound weird, you will almost certainly want to
-load gusgonna.wad (sounds/gusgonna.zip in the idgames archive) when
-you run the game, to work around a bug in vanilla Doom's instrument
-mappings parser:
-
-  https://www.doomworld.com/idgames/sounds/gusgonna
-
-By default a GUS card with 1024KB is simulated; to simulate a 256KB,
-512KB or 768KB card instead, change the gus_ram_kb option in
-chocolate-doom.cfg.
-
-# OPL (Soundblaster / Adlib)
-
-Most people playing Doom in the ’90s had Soundblaster-compatible sound
-cards, which used the Yamaha OPL series of chips for FM-based MIDI
-synthesis. Chocolate Doom includes the ability to emulate these chips
-for a retro experience. OPL emulation is the default MIDI playback,
-but can be selected in the setup tool as “OPL (Adlib/SB)”.
-
-Most modern computers do not include an OPL chip any more, as CPUs are
-fast enough to do decent software MIDI synthesis. However, no software
-emulator sounds exactly like a real (hardware) OPL chip, and a few
-cards do have real hardware OPL. If you have such a card, here’s how
-to configure Chocolate Doom to use it.
-
-## Sound cards with OPL chips
-
-If you have an ISA sound card, it almost certainly includes an OPL
-chip. Modern computers don’t have slots for ISA cards though, so you
-must be running a pretty old machine.
-
-If you have a PCI sound card, you probably don’t have an OPL chip.
-However, there are some exceptions to this. The following cards are
-known to include “legacy” OPL support:
-
-  * C-Media CMI8738 (*)
-  * Forte Media FM801
-  * Cards based on the Yamaha YMF724 (*)
-
-Other cards that apparently have OPL support but have not been tested:
-
-  * S3 SonicVibes
-  * AZTech PCI 168 (AZT 3328 chipset)
-  * ESS Solo-1 sound cards (ES1938, ES1946, ES1969 chipset)
-  * Conexant Riptide Audio/Modem combo cards
-  * Cards based on the Crystal Semiconductors CS4281
-  * Cards based on the Avance Logic ALS300
-  * Cards based on the Avance Logic ALS4000
-
-If you desperately want hardware OPL music, you may be able to find
-one of these cards for sale cheap on eBay.
-
-For the cards listed above with (\*) next to them, OPL support is
-disabled by default and must be explictly enabled in software. See
-sections below for operating system-specific instructions on how you
-may be able to do this.
-
-If your machine is not a PC, you don’t have an OPL chip, and you will
-have to use the software OPL.
-
-## Operating System support
-
-If you’re certain that you have a sound card with hardware OPL, you
-may need to take extra steps to configure your operating system to
-allow access to it. To do hardware OPL, Chocolate Doom must access
-the chip directly, which is usually not possible in modern operating
-systems unless you are running as the superuser (root/Administrator).
-
-### Microsoft Windows
-
-On modern Windows systems it is not possible to directly access the
-OPL chip, even when running as Administrator. Fortunately, it is
-possible to use the “ioperm.sys” driver developed for Cygwin (look for
-iopermsys-0.2.1.tar.bz2):
-
-  http://openwince.sourceforge.net/ioperm/
-
-It is not necessary to have Cygwin installed to use this. Copy the
-ioperm.sys file into the same directory as the Chocolate Doom
-executable and it should be automatically loaded.
-
-You can confirm that hardware OPL is working by checking for this
-message in stdout.txt:
-
-    OPL_Init: Using driver 'Win32'.
-
-If you have a C-Media CMI8738, you may need to enable the `FM_EN`
-flag in Windows Device Manager to access hardware OPL output. See
-[this](http://www.vogons.org/viewtopic.php?f=46&t=36445) thread on
-vogons.org for some more information.
-
-### Linux
-
-If you are using a system based on the Linux kernel, you can access
-the OPL chip directly, but you must be running as root. You can
-confirm that hardware OPL is working, by checking for this message on
-startup:
-
-    OPL_Init: Using driver 'Linux'.
-
-If you are using one of the PCI cards in the list above with a (*)
-next to it, you may need to manually enable FM legacy support. Add
-the following to your /etc/modprobe.conf file to do this:
-
-    options snd-ymfpci fm_port=0x388
-    options snd-cmipci fm_port=0x388
-
-### OpenBSD/NetBSD
-
-You must be running as root to access the hardware OPL directly. You
-can confirm that hardware OPL is working by checking for this message
-on startup:
-
-    OPL_Init: Using driver 'OpenBSD'.
-
-There is no native OPL backend for FreeBSD yet. Sorry!
-
-# Other options
-
-If you have some other favorite MIDI playback option that isn’t
-listed above, you can set a hook to invoke an external command for
-MIDI playback using the ‘snd_musiccmd’ configuration file option. For
-example, set:
-
-    snd_musiccmd    "aplaymidi -p 128:0"
-
-in your chocolate-doom.cfg file.
diff --git a/games/NXDoom/README.Strife.md b/games/NXDoom/README.Strife.md
deleted file mode 100644
index c770449b9..000000000
--- a/games/NXDoom/README.Strife.md
+++ /dev/null
@@ -1,124 +0,0 @@
-````````````````````````````````````````````````````````````````````````
-
-          Samuel ‘Kaiser’ Villarreal and James ‘Quasar’ Haley Present
-
-           C      H      O      C      O      L      A      T      E
-            ______________________________._________________________
-           /   _____/\__    ___/\______   \   \_   _____/\_   _____/
-           \_____  \   |    |    |       _/   ||    __)   |    __)_
-           /        \  |    |    |    |   \   ||     \    |        \
-          /_______  /  |____|    |____|_  /___|\___  /   /_______  /
-                  \/                    \/         \/            \/
-
-````````````````````````````````````````````````````````````````````````
-
-## What is it?
-
-Chocolate Strife is the most accurate and complete recreation of Rogue
-Entertainment’s “Strife: Quest for the Sigil.”  It was created through more
-than four years of reverse engineering effort with the blessings of the
-original programmers of the game.
-
-
-## Why?
-
-The source code for Strife was lost, which means, unlike the code for all the
-other commercial DOOM-engine games, it cannot be released. The only access we
-have to the code is the binary executable file. Tools such as IDA Pro have
-been employed to disassemble and decompile the executable, which was cross-
-referenced against the Linux DOOM and DOS Heretic sources and painstakingly
-combed over multiple times, instruction-by-instruction, to ensure that the
-resulting Chocolate Doom-based executable is as close as possible to the
-original.
-
-
-## Is it Legal?
-
-Chocolate Strife was originally reverse-engineered from the DOS Strife
-binaries. Although reverse engineering is legally a protected activity, this
-nonetheless left some open questions about its legal status.
-
-In 2014, a new commercial release of Strife was published (Strife: Veteran
-Edition) based on the Chocolate Strife code, and developed by the authors of
-Chocolate Strife under commercial license. The release of Strife: Veteran
-Edition, along with its GPL-licensed source code, constitutes tacit approval
-for the legal status of Chocolate Strife by its current copyright holder.
-
-
-## Is it Perfect?
-
-Almost, but not entirely! That’s where you come in. Help us by reporting any
-discrepancies you may notice between this executable and the vanilla DOS
-program!
-
-However, do *not* report any glitch that you can replicate in the vanilla EXE
-as a bug. The point of Chocolate Strife, like Chocolate Doom before it, is to
-be as bug-compatible with the original game as possible. Also be aware that
-some glitches are impossible to compatibly recreate, and wherever this is the
-case, Chocolate Strife has erred on the side of not crashing the program,
-for example by initializing pointers to NULL rather than using them without
-setting a value first.
-
-
-## What are some known problems?
-
-The demo version is *not* supported, and there are not any current plans to
-support it in the future, due to the vast number of differences (the demo
-version of Strife is based on an earlier version of Rogue’s
-codebase).
-
-The commercial Strife IWAD version 1.1 may run, but also exhibit issues.  Like
-the demo version, there are no current plans to fully support it.  Make sure
-your copy is updated to at least 1.2.  Strife: Veteran Edition already
-includes the required version.
-
-
-## How do I use it?
-
-From the Run box or a command line, issue a command to Chocolate Strife just
-like you would run Chocolate Doom. Most of the same command line parameters
-are supported.
-
-voices.wad will be read from the same directory as the IWAD, if it can be
-found. If it is not found, then voices will be disabled just as would happen
-with the vanilla executable. Do not add voices.wad using -file, as that is
-redundant and unnecessary.
-
-Some new command-line parameters in Chocolate Strife include the following:
-
-  - -nograph
-    - Disables the graphical introduction sequence. -devparm implies this.
-
-  - -novoice
-    - Disables voices even if voices.wad can be found.
-
-  - -work
-    - Enables Rogue’s playtesting mode. Automatic godmode, and pressing the
-      inventory drop key will toggle noclipping.
-
-  - -flip
-    - Flips player gun graphics. This is buggy, however, because it does not
-      reverse the graphics’ x offsets (this is an accurate emulation of the
-      vanilla engine’s behavior).
-
-  - -random
-    - Randomizes the timing and location of item respawns in deathmatch, when
-      item respawning is enabled.
-
-
-## Copyright
-
-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.
-
-See the “COPYING” file for the full license text. The source code for this
-program is available from the same location where you downloaded this package.
-
-Aside from Chocolate Doom, portions of the code are derived from the Eternity
-Engine, Copyright 2011 Team Eternity, as published under the GNU GPL.
diff --git a/games/NXDoom/README.md b/games/NXDoom/README.md
deleted file mode 100644
index 59dfc8263..000000000
--- a/games/NXDoom/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Chocolate Doom
-
-Chocolate Doom aims to accurately reproduce the original DOS version of
-Doom and other games based on the Doom engine in a form that can be
-run on modern computers.
-
-Originally, Chocolate Doom was only a Doom source port. The project
-now includes ports of Heretic and Hexen, and Strife.
-
-Chocolate Doom’s aims are:
-
- * To always be 100% Free and Open Source software.
- * Portability to as many different operating systems as possible.
- * Accurate reproduction of the original DOS versions of the games,
-   including bugs.
- * Compatibility with the DOS demo, configuration and savegame files.
- * To provide an accurate retro “feel” (display and input should
-   behave the same).
-
-More information about the philosophy and design behind Chocolate Doom
-can be found in the PHILOSOPHY file distributed with the source code.
-
-## Setting up gameplay
-
-For instructions on how to set up Chocolate Doom for play, see the
-INSTALL file.
-
-## Configuration File
-
-Chocolate Doom is compatible with the DOS Doom configuration file
-(normally named `default.cfg`). Existing configuration files for DOS
-Doom should therefore simply work out of the box. However, Chocolate
-Doom also provides some extra settings. These are stored in a
-separate file named `chocolate-doom.cfg`.
-
-The configuration can be edited using the chocolate-setup tool.
-
-## Command line options
-
-Chocolate Doom supports a number of command line parameters, including
-some extras that were not originally suported by the DOS versions. For
-binary distributions, see the CMDLINE file included with your
-download; more information is also available on the Chocolate Doom
-website.
-
-## Playing TCs
-
-With Vanilla Doom there is no way to include sprites in PWAD files.
-Chocolate Doom’s ‘-file’ command line option behaves exactly the same
-as Vanilla Doom, and trying to play TCs by adding the WAD files using
-‘-file’ will not work.
-
-Many Total Conversions (TCs) are distributed as a PWAD file which must
-be merged into the main IWAD. Typically a copy of DEUSF.EXE is
-included which performs this merge. Chocolate Doom includes a new
-option, ‘-merge’, which will simulate this merge. Essentially, the
-WAD directory is merged in memory, removing the need to modify the
-IWAD on disk.
-
-To play TCs using Chocolate Doom, run like this:
-
-```
-chocolate-doom -merge thetc.wad
-```
-
-Here are some examples:
-
-```
-chocolate-doom -merge batman.wad -deh batman.deh vbatman.deh  (Batman Doom)
-chocolate-doom -merge aoddoom1.wad -deh aoddoom1.deh  (Army of Darkness Doom)
-```
-
-## Other information
-
- * Chocolate Doom includes a number of different options for music
-   playback. See the README.Music file for more details.
-
- * More information, including information about how to play various
-   classic TCs, is available on the Chocolate Doom website:
-
-     https://www.chocolate-doom.org/
-
-   You are encouraged to sign up and contribute any useful information
-   you may have regarding the port!
-
- * Chocolate Doom is not perfect. Although it aims to accurately
-   emulate and reproduce the DOS executables, some behavior can be very
-   difficult to reproduce. Because of the nature of the project, you
-   may also encounter Vanilla Doom bugs; these are intentionally
-   present; see the NOT-BUGS file for more information.
-
-   New bug reports, feedback, questions or suggestions can be submitted
-   to the issue tracker on Github:
-
-     https://github.com/chocolate-doom/chocolate-doom/issues
-
- * Source code patches are welcome, but please follow the style
-   guidelines - see the file named HACKING included with the source
-   distribution.
-
- * Chocolate Doom is distributed under the GNU GPL. See the COPYING
-   file for more information.
diff --git a/games/NXDoom/RELEASE_NOTES.md b/games/NXDoom/RELEASE_NOTES.md
deleted file mode 100644
index a366537f9..000000000
--- a/games/NXDoom/RELEASE_NOTES.md
+++ /dev/null
@@ -1,35 +0,0 @@
-## 3.1.1 (2025-08-14)
-
-### General
-  * Fix compilation on GCC 15 (thanks Fabian).
-  * Hide public IP addresses for privacy.
-  * Use native OpenGL texture format for better performance (thanks Fabian).
-  * Improved directory handling on Windows (thank Roman Fomin):
-      * Fixes problems with postfix "." for non-relative paths.
-      * Support for long NTFS paths (up to 32768 characters).
-  * Fixed metainfo files for latest AppStream spec compliance (thanks Fabian).
-  * Add option to enable or disable smooth pixel scaling (thanks StevenSYS).
-  * Allow spaces in GUS patch folder path (thanks Michael Day).
-  * Add support for non-US backslash key (thanks Michael Day).
-  * Never let SDL Mixer use native midi on Windows (thanks Michael Day).
-  * Use $TMPDIR to find tempdir on Unix (thanks Mr. Myth).
-  * Improve man page formatting (thanks g-branden-robinson).
-
-### Build systems
-  * Can now be built with Emscripten (thanks James Baicoianu).
-  * Misc. improvements (thanks suve, Emmanuel Ferdman, Gabriele Simoni, et al.)
-
-### Setup
-  * Use correct EGA palette colors (thanks Henrique Jorge).
-
-### Doom
-  * Initial support for Doom version 1.5 (thanks Michael Francis).
-
-### Heretic
-  * Fix crash after loading too many saved games (thanks Noseey).
-
-### Hexen
-  * Fix crash with Heresiarch fireballs if player has never touched a wall (thank Noseey).
-
-### Strife
-  * Initialize floor->type and floor->crush fields in EV_BuildStairs() (thanks Fabian).
diff --git a/games/NXDoom/TODO.md b/games/NXDoom/TODO.md
deleted file mode 100644
index 3f40d4735..000000000
--- a/games/NXDoom/TODO.md
+++ /dev/null
@@ -1,36 +0,0 @@
-This is Chocolate Doom’s “to do” list. Note that this is kind of an arbitrary
-and unstructured wish list of features and improvements. The bug tracker
-(http://chocolate-doom.org/bugs) has more feature requests.
-
-* Multiplayer:
-  - Use UPnP to automatically configure port forwarding for NATed
-    networks.
-  - Multiplayer options and configuration file (server name, etc)
-* Improve multiplayer startup:
-  - Select an IWAD automatically from the server’s game type rather than
-    all players having to specify -iwad.
-  - Send list of WADs to load instead of all clients having to specify -file.
-  - Same applies to dehacked patches and wad merging parameters.
-* Portability improvements:
-  - Test on and fix for architectures where `((-2) >> 1) != -1`
-  - Use size-specific types (eg. `int32_t` instead of int)
-  - Don’t make structure packing assumptions when loading levels.
-  - Port to every OS and architecture under the sun
-  - Port to Emscripten and release a web-based version.
-* Video capture mode
-  - Real-time recording of gameplay
-  - Batch conversion of demos into videos
-* Heretic/Hexen/Strife:
-  - Merge r_draw.c to common version and delete duplicates
-  - Heretic v1.2 emulation (if possible)
-  - Hexen v1.0 emulation (if possible/necessary)
-  - Strife v1.1 emulation (for demo IWAD support)
-  - Screensaver mode
-
-Crazy pie in the sky ideas:
-
-* Automatic WAD installer - download and run TCs from a list automatically
-  (automating the current “instructions on wiki” system).
-* Textscreen interface to the Compet-N database: menu driven system to
-  automatically download and play speedruns.
-* DWANGO-like interface for finding players and setting up games.
diff --git a/games/NXDoom/autogen.sh b/games/NXDoom/autogen.sh
deleted file mode 100755
index b0763a5c1..000000000
--- a/games/NXDoom/autogen.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-autoreconf -fi
-./configure "$@"
diff --git a/games/NXDoom/check-extern.sh b/games/NXDoom/check-extern.sh
deleted file mode 100755
index b5ad848da..000000000
--- a/games/NXDoom/check-extern.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-EXTERN="$(grep -e 'extern[^A-Za-z0-9_]' $(find . -name *.c))"
-if [ -n "$EXTERN" ] ; then
-	echo "extern found in .c files:\n${EXTERN}"
-	exit 1
-fi
diff --git a/games/NXDoom/cmake/FindFluidSynth.cmake b/games/NXDoom/cmake/FindFluidSynth.cmake
deleted file mode 100644
index 6702af983..000000000
--- a/games/NXDoom/cmake/FindFluidSynth.cmake
+++ /dev/null
@@ -1,106 +0,0 @@
-# FindFluidSynth
-# ---------
-#
-# Try to find the FluidSynth library.
-#
-# This will define the following variables:
-#
-# ``FluidSynth_FOUND``
-#     System has FluidSynth.
-#
-# ``FluidSynth_VERSION``
-#     The version of FluidSynth.
-#
-# ``FluidSynth_INCLUDE_DIRS``
-#     This should be passed to target_include_directories() if
-#     the target is not used for linking.
-#
-# ``FluidSynth_LIBRARIES``
-#     The FluidSynth library.
-#     This can be passed to target_link_libraries() instead of
-#     the ``FluidSynth::libfluidsynth`` target
-#
-# If ``FluidSynth_FOUND`` is TRUE, the following imported target
-# will be available:
-#
-# ``FluidSynth::libfluidsynth``
-#     The FluidSynth library
-#
-#=============================================================================
-# Copyright 2018 Christophe Giboudeaux <christophe@krop.fr>
-#
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR 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.
-#=============================================================================
-
-# Cache variable that allows you to point CMake at a directory containing
-# an extracted development library.
-set(FluidSynth_DIR "${FluidSynth_DIR}"
-        CACHE PATH "Location of FluidSynth library directory")
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_FluidSynth QUIET fluidsynth>=${FluidSynth_FIND_VERSION})
-
-find_library(FluidSynth_LIBRARIES
-  NAMES fluidsynth
-  HINTS
-  "${FluidSynth_DIR}/lib"
-  ${PC_FluidSynth_LIBDIR}
-)
-
-find_path(FluidSynth_INCLUDE_DIRS
-  NAMES fluidsynth.h
-  HINTS
-  "${FluidSynth_DIR}/include"
-  ${PC_FluidSynth_INCLUDEDIR}
-)
-
-if(NOT FluidSynth_VERSION)
-  if(EXISTS "${FluidSynth_INCLUDE_DIRS}/fluidsynth/version.h")
-    file(STRINGS "${FluidSynth_INCLUDE_DIRS}/fluidsynth/version.h" _FLUIDSYNTH_VERSION_H
-         REGEX "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"[0-9].[0-9].[0-9]\"")
-    string(REGEX REPLACE "^#define[ ]+FLUIDSYNTH_VERSION[ ]+\"([0-9].[0-9].[0-9])\".*" "\\1" FluidSynth_VERSION "${_FLUIDSYNTH_VERSION_H}")
-    unset(_FLUIDSYNTH_VERSION_H)
-  endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FluidSynth
-  FOUND_VAR FluidSynth_FOUND
-  REQUIRED_VARS FluidSynth_LIBRARIES FluidSynth_INCLUDE_DIRS
-  VERSION_VAR FluidSynth_VERSION
-)
-
-if(FluidSynth_FOUND AND NOT TARGET FluidSynth::libfluidsynth)
-  add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED)
-  set_target_properties(FluidSynth::libfluidsynth PROPERTIES
-    IMPORTED_LOCATION "${FluidSynth_LIBRARIES}"
-    INTERFACE_INCLUDE_DIRECTORIES "${FluidSynth_INCLUDE_DIRS}"
-  )
-  if(WIN32 AND FluidSynth_DIR)
-    # On Windows, we need to figure out the location of our library files
-    # so we can copy and package them.
-    set(FluidSynth_DLL_DIR "${FluidSynth_DIR}/bin" CACHE INTERNAL "")
-  endif()
-endif()
diff --git a/games/NXDoom/cmake/FindSDL2.cmake b/games/NXDoom/cmake/FindSDL2.cmake
deleted file mode 100644
index 25006950a..000000000
--- a/games/NXDoom/cmake/FindSDL2.cmake
+++ /dev/null
@@ -1,114 +0,0 @@
-# FindSDL2.cmake
-#
-# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
-# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
-#
-# Currently works with the following generators:
-# - Unix Makefiles (Linux, MSYS2)
-# - Ninja (Linux, MSYS2)
-# - Visual Studio
-
-# Cache variable that allows you to point CMake at a directory containing
-# an extracted development library.
-set(SDL2_DIR "${SDL2_DIR}" CACHE PATH "Location of SDL2 library directory")
-
-# Use pkg-config to find library locations in *NIX environments.
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-    pkg_search_module(PC_SDL2 QUIET sdl2)
-endif()
-
-# Find the include directory.
-find_path(SDL2_INCLUDE_DIR "SDL_version.h"
-    HINTS "${SDL2_DIR}/include" ${PC_SDL2_INCLUDE_DIRS})
-
-# Find the version.  Taken and modified from CMake's FindSDL.cmake.
-if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
-    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
-    string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
-    set(SDL2_VERSION "${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}")
-    unset(SDL2_VERSION_MAJOR_LINE)
-    unset(SDL2_VERSION_MINOR_LINE)
-    unset(SDL2_VERSION_PATCH_LINE)
-    unset(SDL2_VERSION_MAJOR)
-    unset(SDL2_VERSION_MINOR)
-    unset(SDL2_VERSION_PATCH)
-endif()
-
-# Find the SDL2 and SDL2main libraries
-if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
-    find_library(SDL2_LIBRARY "SDL2"
-        HINTS "${SDL2_DIR}/lib/x64" ${PC_SDL2_LIBRARY_DIRS})
-    find_library(SDL2_MAIN_LIBRARY "SDL2main"
-        HINTS "${SDL2_DIR}/lib/x64" ${PC_SDL2_LIBRARY_DIRS})
-else()
-    find_library(SDL2_LIBRARY "SDL2"
-        HINTS "${SDL2_DIR}/lib/x86" ${PC_SDL2_LIBRARY_DIRS})
-    find_library(SDL2_MAIN_LIBRARY "SDL2main"
-        HINTS "${SDL2_DIR}/lib/x86" ${PC_SDL2_LIBRARY_DIRS})
-endif()
-set(SDL2_LIBRARIES "${SDL2_MAIN_LIBRARY}" "${SDL2_LIBRARY}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SDL2
-    FOUND_VAR SDL2_FOUND
-    REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARIES
-    VERSION_VAR SDL2_VERSION
-)
-
-if(SDL2_FOUND)
-    # SDL2 imported target.
-    add_library(SDL2::SDL2 UNKNOWN IMPORTED)
-    set_target_properties(SDL2::SDL2 PROPERTIES
-                          INTERFACE_COMPILE_OPTIONS "${PC_SDL2_CFLAGS_OTHER}"
-                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
-                          IMPORTED_LOCATION "${SDL2_LIBRARY}")
-
-    # SDL2main imported target.
-    if(MINGW)
-        # Gross hack to get mingw32 first in the linker order.
-        add_library(SDL2::_SDL2main_detail UNKNOWN IMPORTED)
-        set_target_properties(SDL2::_SDL2main_detail PROPERTIES
-                              IMPORTED_LOCATION "${SDL2_MAIN_LIBRARY}")
-
-        # Ensure that SDL2main comes before SDL2 in the linker order.  CMake
-        # isn't smart enough to keep proper ordering for indirect dependencies
-        # so we have to spell it out here.
-        target_link_libraries(SDL2::_SDL2main_detail INTERFACE SDL2::SDL2)
-
-        add_library(SDL2::SDL2main INTERFACE IMPORTED)
-        set_target_properties(SDL2::SDL2main PROPERTIES
-                              IMPORTED_LIBNAME mingw32)
-        target_link_libraries(SDL2::SDL2main INTERFACE SDL2::_SDL2main_detail)
-    else()
-        add_library(SDL2::SDL2main UNKNOWN IMPORTED)
-        set_target_properties(SDL2::SDL2main PROPERTIES
-                              IMPORTED_LOCATION "${SDL2_MAIN_LIBRARY}")
-    endif()
-endif()
diff --git a/games/NXDoom/cmake/FindSDL2_mixer.cmake b/games/NXDoom/cmake/FindSDL2_mixer.cmake
deleted file mode 100644
index 3328c6c38..000000000
--- a/games/NXDoom/cmake/FindSDL2_mixer.cmake
+++ /dev/null
@@ -1,88 +0,0 @@
-# FindSDL2_mixer.cmake
-#
-# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
-# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
-#
-# Currently works with the following generators:
-# - Unix Makefiles (Linux, MSYS2)
-# - Ninja (Linux, MSYS2)
-# - Visual Studio
-
-# Cache variable that allows you to point CMake at a directory containing
-# an extracted development library.
-set(SDL2_MIXER_DIR "${SDL2_MIXER_DIR}" CACHE PATH "Location of SDL2_mixer library directory")
-
-# Use pkg-config to find library locations in *NIX environments.
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-    pkg_search_module(PC_SDL2_MIXER QUIET SDL2_mixer)
-endif()
-
-# Find the include directory.
-find_path(SDL2_MIXER_INCLUDE_DIR "SDL_mixer.h"
-    HINTS "${SDL2_MIXER_DIR}/include" ${PC_SDL2_MIXER_INCLUDE_DIRS})
-
-# Find the version.  Taken and modified from CMake's FindSDL.cmake.
-if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")
-    file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+[0-9]+$")
-    string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MAJOR "${SDL2_MIXER_VERSION_MAJOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MINOR "${SDL2_MIXER_VERSION_MINOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_PATCH "${SDL2_MIXER_VERSION_PATCH_LINE}")
-    set(SDL2_MIXER_VERSION "${SDL2_MIXER_VERSION_MAJOR}.${SDL2_MIXER_VERSION_MINOR}.${SDL2_MIXER_VERSION_PATCH}")
-    unset(SDL2_MIXER_VERSION_MAJOR_LINE)
-    unset(SDL2_MIXER_VERSION_MINOR_LINE)
-    unset(SDL2_MIXER_VERSION_PATCH_LINE)
-    unset(SDL2_MIXER_VERSION_MAJOR)
-    unset(SDL2_MIXER_VERSION_MINOR)
-    unset(SDL2_MIXER_VERSION_PATCH)
-endif()
-
-# Find the library.
-if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
-    find_library(SDL2_MIXER_LIBRARY "SDL2_mixer"
-        HINTS "${SDL2_MIXER_DIR}/lib/x64" ${PC_SDL2_MIXER_LIBRARY_DIRS})
-else()
-    find_library(SDL2_MIXER_LIBRARY "SDL2_mixer"
-        HINTS "${SDL2_MIXER_DIR}/lib/x86" ${PC_SDL2_MIXER_LIBRARY_DIRS})
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SDL2_mixer
-    FOUND_VAR SDL2_MIXER_FOUND
-    REQUIRED_VARS SDL2_MIXER_INCLUDE_DIR SDL2_MIXER_LIBRARY
-    VERSION_VAR SDL2_MIXER_VERSION
-)
-
-if(SDL2_MIXER_FOUND)
-    # Imported target.
-    add_library(SDL2_mixer::SDL2_mixer UNKNOWN IMPORTED)
-    set_target_properties(SDL2_mixer::SDL2_mixer PROPERTIES
-                          INTERFACE_COMPILE_OPTIONS "${PC_SDL2_MIXER_CFLAGS_OTHER}"
-                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_MIXER_INCLUDE_DIR}"
-                          INTERFACE_LINK_LIBRARIES SDL2::SDL2
-                          IMPORTED_LOCATION "${SDL2_MIXER_LIBRARY}")
-endif()
diff --git a/games/NXDoom/cmake/FindSDL2_net.cmake b/games/NXDoom/cmake/FindSDL2_net.cmake
deleted file mode 100644
index 96b6cd722..000000000
--- a/games/NXDoom/cmake/FindSDL2_net.cmake
+++ /dev/null
@@ -1,88 +0,0 @@
-# FindSDL2_net.cmake
-#
-# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
-# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
-#
-# Currently works with the following generators:
-# - Unix Makefiles (Linux, MSYS2)
-# - Ninja (Linux, MSYS2)
-# - Visual Studio
-
-# Cache variable that allows you to point CMake at a directory containing
-# an extracted development library.
-set(SDL2_NET_DIR "${SDL2_NET_DIR}" CACHE PATH "Location of SDL2_net library directory")
-
-# Use pkg-config to find library locations in *NIX environments.
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-    pkg_search_module(PC_SDL2_NET QUIET SDL2_net)
-endif()
-
-# Find the include directory.
-find_path(SDL2_NET_INCLUDE_DIR "SDL_net.h"
-    HINTS "${SDL2_NET_DIR}/include" ${PC_SDL2_NET_INCLUDE_DIRS})
-
-# Find the version.  Taken and modified from CMake's FindSDL.cmake.
-if(SDL2_NET_INCLUDE_DIR AND EXISTS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h")
-    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL2_NET_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+[0-9]+$")
-    string(REGEX REPLACE "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_MAJOR "${SDL2_NET_VERSION_MAJOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_MINOR "${SDL2_NET_VERSION_MINOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_NET_VERSION_PATCH "${SDL2_NET_VERSION_PATCH_LINE}")
-    set(SDL2_NET_VERSION "${SDL2_NET_VERSION_MAJOR}.${SDL2_NET_VERSION_MINOR}.${SDL2_NET_VERSION_PATCH}")
-    unset(SDL2_NET_VERSION_MAJOR_LINE)
-    unset(SDL2_NET_VERSION_MINOR_LINE)
-    unset(SDL2_NET_VERSION_PATCH_LINE)
-    unset(SDL2_NET_VERSION_MAJOR)
-    unset(SDL2_NET_VERSION_MINOR)
-    unset(SDL2_NET_VERSION_PATCH)
-endif()
-
-# Find the library.
-if(CMAKE_SIZEOF_VOID_P STREQUAL 8)
-    find_library(SDL2_NET_LIBRARY "SDL2_net"
-        HINTS "${SDL2_NET_DIR}/lib/x64" ${PC_SDL2_NET_LIBRARY_DIRS})
-else()
-    find_library(SDL2_NET_LIBRARY "SDL2_net"
-        HINTS "${SDL2_NET_DIR}/lib/x86" ${PC_SDL2_NET_LIBRARY_DIRS})
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SDL2_net
-    FOUND_VAR SDL2_NET_FOUND
-    REQUIRED_VARS SDL2_NET_INCLUDE_DIR SDL2_NET_LIBRARY
-    VERSION_VAR SDL2_NET_VERSION
-)
-
-if(SDL2_NET_FOUND)
-    # Imported target.
-    add_library(SDL2_net::SDL2_net UNKNOWN IMPORTED)
-    set_target_properties(SDL2_net::SDL2_net PROPERTIES
-                          INTERFACE_COMPILE_OPTIONS "${PC_SDL2_NET_CFLAGS_OTHER}"
-                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_NET_INCLUDE_DIR}"
-                          INTERFACE_LINK_LIBRARIES SDL2::SDL2
-                          IMPORTED_LOCATION "${SDL2_NET_LIBRARY}")
-endif()
diff --git a/games/NXDoom/cmake/FindSampleRate.cmake b/games/NXDoom/cmake/FindSampleRate.cmake
deleted file mode 100644
index bd72802a0..000000000
--- a/games/NXDoom/cmake/FindSampleRate.cmake
+++ /dev/null
@@ -1,67 +0,0 @@
-# Findsamplerate.cmake
-#
-# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
-# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
-#
-# Currently works with the following generators:
-# - Unix Makefiles (Linux, MSYS2)
-# - Ninja (Linux, MSYS2)
-# - Visual Studio
-
-# Use pkg-config to find library locations in *NIX environments.
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-    pkg_search_module(PC_SAMPLERATE QUIET samplerate)
-endif()
-
-# Find the include directory.
-find_path(SAMPLERATE_INCLUDE_DIR "samplerate.h"
-    HINTS ${PC_SAMPLERATE_INCLUDE_DIRS})
-
-# Find the version.  I don't know if there is a correct way to find this on
-# Windows - the config.h in the tarball is wrong for 0.1.19.
-if(PC_SAMPLERATE_VERSION)
-    set(SAMPLERATE_VERSION "${PC_SAMPLERATE_VERSION}")
-endif()
-
-# Find the library.
-find_library(SAMPLERATE_LIBRARY "samplerate"
-    HINTS ${PC_SAMPLERATE_LIBRARY_DIRS})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SampleRate
-    FOUND_VAR SampleRate_FOUND
-    REQUIRED_VARS SAMPLERATE_INCLUDE_DIR SAMPLERATE_LIBRARY
-    VERSION_VAR SAMPLERATE_VERSION
-)
-
-if(SampleRate_FOUND)
-    # Imported target.
-    add_library(SampleRate::samplerate UNKNOWN IMPORTED)
-    set_target_properties(SampleRate::samplerate PROPERTIES
-        INTERFACE_COMPILE_OPTIONS "${PC_SAMPLERATE_CFLAGS_OTHER}"
-        INTERFACE_INCLUDE_DIRECTORIES "${SAMPLERATE_INCLUDE_DIR}"
-        IMPORTED_LOCATION "${SAMPLERATE_LIBRARY}")
-endif()
diff --git a/games/NXDoom/cmake/Findm.cmake b/games/NXDoom/cmake/Findm.cmake
deleted file mode 100644
index f7a1cfa57..000000000
--- a/games/NXDoom/cmake/Findm.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# Findm.cmake
-#
-# Copyright (c) 2018, Alex Mayfield <alexmax2742@gmail.com>
-# 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 <organization> 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 <COPYRIGHT HOLDER> 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.
-#
-# Finds libm, so we can link against it for math functions.  If libm doesn't
-# exist, linking against the m target will have no effect.
-
-find_library(M_LIBRARY m)
-
-add_library(m INTERFACE)
-if(M_LIBRARY)
-    target_link_libraries(m INTERFACE "${M_LIBRARY}")
-endif()
diff --git a/games/NXDoom/cmake/config.h.cin b/games/NXDoom/cmake/config.h.cin
deleted file mode 100644
index 6c67239fd..000000000
--- a/games/NXDoom/cmake/config.h.cin
+++ /dev/null
@@ -1,12 +0,0 @@
-#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
-#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
-#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
-#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
-#cmakedefine PROGRAM_PREFIX "@PROGRAM_PREFIX@"
-
-#cmakedefine HAVE_FLUIDSYNTH
-#cmakedefine HAVE_LIBSAMPLERATE
-#cmakedefine HAVE_LIBPNG
-#cmakedefine HAVE_DIRENT_H
-#cmakedefine01 HAVE_DECL_STRCASECMP
-#cmakedefine01 HAVE_DECL_STRNCASECMP
diff --git a/games/NXDoom/configure.ac b/games/NXDoom/configure.ac
deleted file mode 100644
index 26e6958d5..000000000
--- a/games/NXDoom/configure.ac
+++ /dev/null
@@ -1,335 +0,0 @@
-AC_INIT(Chocolate Doom, 3.1.1,
-        chocolate-doom-dev-list@chocolate-doom.org, chocolate-doom)
-
-PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
-PACKAGE_SHORTDESC="Conservative source port"
-PACKAGE_COPYRIGHT="Copyright (C) 1993-2025"
-PACKAGE_LICENSE="GNU General Public License, version 2"
-PACKAGE_MAINTAINER="Simon Howard"
-PACKAGE_URL="https://www.chocolate-doom.org/"
-PACKAGE_RDNS="org.chocolate_doom"
-PACKAGE_BUGREPORT="https://github.com/chocolate-doom/chocolate-doom/issues"
-
-dnl Check for Emscripten environment so we can set necessary environment variables
-AC_ARG_ENABLE(
-  [emscripten],
-  [AS_HELP_STRING([--enable-emscripten=@<:@no/yes@:>@],[compile to JavaScript using Emscripten])],,
-  [AS_CASE([$CC],
-           [*emcc.py], [enable_emscripten="yes"],
-           [*emcc], [enable_emscripten="yes"],
-           [enable_emscripten="no"]
-	  )
- ]
-)
-
-AS_IF([test "x$enable_emscripten" = "xyes"],
-  AC_MSG_NOTICE([auto-detected use of Emscripten])
-  SDL_CFLAGS="-s USE_SDL=2"
-  SDL_LIBS="-s USE_SDL=2"
-  SDLMIXER_CFLAGS="-s USE_SDL=2 -s USE_SDL_MIXER=2"
-  SDLMIXER_LIBS="-s USE_SDL=2 -s USE_SDL_MIXER=2"
-  SDLNET_CFLAGS="-s USE_SDL=2 -s USE_SDL_NET=2"
-  SDLNET_LIBS="-s USE_SDL=2 -s USE_SDL_NET=2"
-  EM_LDFLAGS="-s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_RUNTIME_METHODS=[ccall,cwrap,FS,ENV,PATH,ERRNO_CODES] -s FORCE_FILESYSTEM"
-)
-
-AC_CONFIG_AUX_DIR(autotools)
-AC_CANONICAL_HOST
-
-orig_CFLAGS="$CFLAGS"
-
-AM_PROG_AR
-AC_PROG_CC_C99
-AC_PROG_RANLIB
-AC_CHECK_PROG(HAVE_PYTHON, python3, true, false)
-
-OPT_LEVEL=2
-
-# If this is gcc, we have some options we'd like to turn on.  Turn on 
-# optimisation and debugging symbols.
-
-if test "$GCC" = "yes"
-then
-        WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
-        CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
-fi
-
-AC_CANONICAL_TARGET
-TARGET_OS=""
-AS_CASE([$target_cpu],
-        [x86_64],
-        [
-            TARGET_OS="x64"
-        ],
-        [aarch64*|arm*],
-        [
-            TARGET_OS="arm"
-        ],
-        [i?86|arm*],
-        [
-            TARGET_OS="32"
-        ])
-AC_SUBST([TARGET_OS])
-
-PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.14])
-# Check for SDL2_mixer
-AC_ARG_ENABLE([sdl2mixer],
-AS_HELP_STRING([--disable-sdl2mixer], [Disable SDL2_mixer support])
-)
-AS_IF([test "x$enable_sdl2mixer" != xno], [
-    PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.2])], [
-    AC_DEFINE([DISABLE_SDL2MIXER], [1], [SDL2_mixer disabled])
-])
-
-# Check for networking
-AC_ARG_ENABLE([sdl2net],
-AS_HELP_STRING([--disable-sdl2net], [Disable SDL2_net support])
-)
-AS_IF([test "x$enable_sdl2net" != xno], [
-    PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0])], [
-    AC_DEFINE([DISABLE_SDL2NET], [1], [SDL2_net disabled])
-])
-
-# Check for bash-completion.
-AC_ARG_ENABLE([bash-completion],
-AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion])
-)
-AS_IF([test "x$enable_bash_completion" != xno], [
-    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
-        AC_MSG_WARN([Building bash-completion requires Python, but Python not found])
-        enable_bash_completion=no
-    ])
-])
-
-# Check for doc.
-AC_ARG_ENABLE([doc],
-AS_HELP_STRING([--disable-doc], [Disable documentation])
-)
-AS_IF([test "x$enable_doc" != xno], [
-    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
-        AC_MSG_WARN([Building documentation requires Python, but Python not found])
-        enable_doc=no
-    ])
-])
-
-# Check for fonts.
-AC_ARG_ENABLE([fonts],
-AS_HELP_STRING([--disable-fonts], [Disable fonts])
-)
-AS_IF([test "x$enable_fonts" != xno], [
-    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
-        AC_MSG_WARN([Building fonts require Python, but Python not found])
-        enable_fonts=no
-    ])
-])
-
-# Check for icons.
-AC_ARG_ENABLE([icons],
-AS_HELP_STRING([--disable-icons], [Disable icons])
-)
-AS_IF([test "x$enable_icons" != xno], [
-    AS_IF([test "x$HAVE_PYTHON" = xfalse], [
-        AC_MSG_WARN([Building icons require Python, but Python not found])
-        enable_icons=no
-    ])
-])
-
-# Check for memory pool debugging.
-AC_ARG_ENABLE([zpool],
-AS_HELP_STRING([--disable-zpool], [Disable memory pools for debugging])
-)
-AS_IF([test "x$enable_zpool" != xno], [], [
-    AC_DEFINE([DISABLE_ZPOOL], [1], [Memory pooling disabled])
-])
-
-# Check for libsamplerate.
-AC_ARG_WITH([libsamplerate],
-AS_HELP_STRING([--without-libsamplerate],
-    [Build without libsamplerate @<:@default=check@:>@]),
-[],
-[
-    [with_libsamplerate=check]
-])
-AS_IF([test "x$with_libsamplerate" != xno], [
-    PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.8, [
-        AC_DEFINE([HAVE_LIBSAMPLERATE], [1], [libsamplerate installed])
-    ], [
-        AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE(
-            [--with-libsamplerate was given, but test for libsamplerate failed])
-        ])
-    ])
-])
-
-# Check for libpng.
-AC_ARG_WITH([libpng],
-AS_HELP_STRING([--without-libpng],
-    [Build without libpng @<:@default=check@:>@]),
-[],
-[
-    [with_libpng=check]
-])
-AS_IF([test "x$with_libpng" != xno], [
-    PKG_CHECK_MODULES(PNG, libpng >= 1.2.50, [
-        AC_DEFINE([HAVE_LIBPNG], [1], [libpng installed])
-    ], [
-        AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE(
-            [--with-libpng was given, but test for libpng failed])
-        ])
-    ])
-])
-
-# Check for fluidsynth.
-AC_ARG_WITH([fluidsynth],
-AS_HELP_STRING([--without-fluidsynth],
-    [Build without fluidsynth @<:@default=check@:>@]),
-[],
-[
-    [with_fluidsynth=check]
-])
-AS_IF([test "x$with_fluidsynth" != xno] && [test "x$enable_sdl2mixer" != xno], [
-    PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth >= 2.2.0, [
-        AC_DEFINE([HAVE_FLUIDSYNTH], [1], [fluidsynth installed])
-    ], [
-        AS_IF([test "x$with_fluidsynth" != xcheck], [AC_MSG_FAILURE(
-            [--with-fluidsynth was given, but test for fluidsynth failed])
-        ])
-    ])
-])
-
-# TODO: We currently link everything against libraries that don't need it.
-# Use the specific library CFLAGS/LIBS variables instead of setting them here.
-CFLAGS="$CFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${FLUIDSYNTH_CFLAGS:-}"
-LDFLAGS="$LDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${FLUIDSYNTH_LIBS:-}"
-case "$host" in
-  *-*-mingw* | *-*-cygwin* | *-*-msvc* )
-    LDFLAGS="$LDFLAGS -lwinmm -lshlwapi"
-    ;;
-  *)
-esac
-
-AC_CHECK_LIB(m, log)
-
-AC_CHECK_HEADERS([dirent.h linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
-AC_CHECK_FUNCS(mmap ioperm)
-AC_CHECK_DECLS([strcasecmp, strncasecmp], [], [], [[#include <strings.h>]])
-
-# OpenBSD I/O i386 library for I/O port access.
-# (64 bit has the same thing with a different name!)
-
-AC_CHECK_LIB(i386, i386_iopl)
-AC_CHECK_LIB(amd64, amd64_iopl)
-
-case "$host" in
-  *-*-mingw* | *-*-cygwin* | *-*-msvc* )
-    AC_CHECK_TOOL(WINDRES, windres, )
-    ;;
-  *)
-    WINDRES=
-    ;;
-esac
-
-AC_CHECK_TOOL(OBJDUMP, objdump, )
-AC_CHECK_TOOL(STRIP, strip, )
-
-AC_ARG_ENABLE([werror], AS_HELP_STRING([--enable-werror], [Treat warnings as errors]))
-
-AS_IF([test "x$enable_werror" = "xyes"], [
-        CFLAGS="$CFLAGS -Werror"
-])
-
-AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
-AM_CONDITIONAL(HAVE_BASH_COMPLETION, [test "x$enable_bash_completion" != xno])
-AM_CONDITIONAL(HAVE_DOC, [test "x$enable_doc" != xno])
-AM_CONDITIONAL(HAVE_FONTS, [test "x$enable_fonts" != xno])
-AM_CONDITIONAL(HAVE_ICONS, [test "x$enable_icons" != xno])
-AM_CONDITIONAL(HAVE_ZPOOL, [test "x$enable_zpool" != xno])
-
-dnl Automake v1.8.0 is required, please upgrade!
-
-AM_INIT_AUTOMAKE([1.8.0 foreign])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION | sed 's/-.*//; s/\./, /g; s/$/, 0/'`
-
-dnl Without a hyphen. This is used for the bash-completion scripts.
-PROGRAM_SPREFIX=$(echo $PACKAGE_SHORTNAME | tr A-Z a-z)
-
-dnl With a hyphen, used almost everywhere else.
-PROGRAM_PREFIX=${PROGRAM_SPREFIX}-
-
-AC_SUBST(PROGRAM_PREFIX)
-AC_DEFINE_UNQUOTED(PROGRAM_PREFIX, "$PROGRAM_PREFIX",
-                   Change this when you create your awesome forked version)
-AC_SUBST(PROGRAM_SPREFIX)
-
-AC_CONFIG_HEADERS(config.h:config.hin)
-
-AC_SUBST(WINDOWS_RC_VERSION)
-AC_SUBST(SDLMIXER_CFLAGS)
-AC_SUBST(SDLMIXER_LIBS)
-AC_SUBST(EM_LDFLAGS)
-
-AC_SUBST(SDLNET_CFLAGS)
-AC_SUBST(SDLNET_LIBS)
-
-AC_SUBST(ac_aux_dir)
-
-AC_SUBST(PACKAGE_SHORTNAME)
-AC_SUBST(PACKAGE_SHORTDESC)
-AC_SUBST(PACKAGE_COPYRIGHT)
-AC_SUBST(PACKAGE_LICENSE)
-AC_SUBST(PACKAGE_MAINTAINER)
-AC_SUBST(PACKAGE_URL)
-AC_SUBST(PACKAGE_RDNS)
-AC_SUBST(PACKAGE_BUGREPORT)
-
-dnl Shut up the datarootdir warnings.
-AC_DEFUN([AC_DATAROOTDIR_CHECKED])
-
-AS_IF([test "x$enable_emscripten" = "xyes"],
-  EXEEXT=".html"
-)
-
-AC_CONFIG_FILES([
-Makefile
-man/Makefile
-man/bash-completion/Makefile
-man/bash-completion/doom.template
-man/bash-completion/heretic.template
-man/bash-completion/hexen.template
-man/bash-completion/strife.template
-opl/Makefile
-opl/examples/Makefile
-pcsound/Makefile
-pkg/Makefile
-pkg/config.make
-pkg/osx/Info.plist
-rpm.spec
-data/Makefile
-src/Makefile
-src/doom-res.rc
-src/Doom.metainfo.xml
-src/Doom.desktop
-src/Doom_Screensaver.desktop
-src/doom/Makefile
-src/heretic-res.rc
-src/Heretic.metainfo.xml
-src/Heretic.desktop
-src/heretic/Makefile
-src/hexen-res.rc
-src/Hexen.metainfo.xml
-src/Hexen.desktop
-src/hexen/Makefile
-src/setup-res.rc
-src/setup/Makefile
-src/setup/Setup.desktop
-src/setup/setup-manifest.xml
-src/strife-res.rc
-src/Strife.metainfo.xml
-src/Strife.desktop
-src/strife/Makefile
-textscreen/Makefile
-textscreen/examples/Makefile
-textscreen/fonts/Makefile
-])
-AC_OUTPUT
diff --git a/games/NXDoom/data/.gitignore b/games/NXDoom/data/.gitignore
deleted file mode 100644
index f1bc7677a..000000000
--- a/games/NXDoom/data/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.in
-Makefile
-*-doom.png
-*-heretic.png
-*-hexen.png
-*-setup.png
-*-strife.png
diff --git a/games/NXDoom/data/Makefile.am b/games/NXDoom/data/Makefile.am
deleted file mode 100644
index 1b6a44c0c..000000000
--- a/games/NXDoom/data/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-
-EXTRA_DIST=              \
-        README           \
-        doom.ico         \
-        doom.png         \
-        heretic.ico      \
-        heretic.png      \
-        hexen.ico        \
-        hexen.png        \
-        setup.ico        \
-        setup.png        \
-        strife.ico       \
-        strife.png       \
-        wadfile.png      \
-        convert-icon
-
-iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
-icons_DATA = @PROGRAM_PREFIX@doom.png    \
-             @PROGRAM_PREFIX@heretic.png \
-             @PROGRAM_PREFIX@hexen.png   \
-             @PROGRAM_PREFIX@setup.png   \
-             @PROGRAM_PREFIX@strife.png
-
-@PROGRAM_PREFIX@doom.png : doom.png
-	cp $(top_srcdir)/data/doom.png $@
-
-@PROGRAM_PREFIX@heretic.png : heretic.png
-	cp $(top_srcdir)/data/heretic.png $@
-
-@PROGRAM_PREFIX@hexen.png : hexen.png
-	cp $(top_srcdir)/data/hexen.png $@
-
-@PROGRAM_PREFIX@setup.png : setup.png
-	cp $(top_srcdir)/data/setup.png $@
-
-@PROGRAM_PREFIX@strife.png : strife.png
-	cp $(top_srcdir)/data/strife.png $@
-
-CLEANFILES = $(icons_DATA)
diff --git a/games/NXDoom/data/README b/games/NXDoom/data/README
deleted file mode 100644
index c3be61a62..000000000
--- a/games/NXDoom/data/README
+++ /dev/null
@@ -1,16 +0,0 @@
-The Chocolate Doom icon is based on an image by Chris Metcalf
-(http://www.chrismetcalf.org/) which is copyrighted to him:
-
-    http://www.flickr.com/photos/laffy4k/448920776/
-
-Chris has kindly agreed that the Chocolate Doom icon may be used under
-the GNU GPL, so the copyright status of the icon is the same as that of
-the rest of the project.
-
-The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files
-contain full 32-bit versions, scaled to different sizes and with proper
-alpha masks (as well as the 8-bit versions).  The 8-bit versions are
-used when setting the icon within SDL, as SDL under Windows displays
-full color icons in a very poor quality.  The full-color versions are
-used in the resource files.
-
diff --git a/games/NXDoom/data/convert-icon b/games/NXDoom/data/convert-icon
deleted file mode 100755
index 4ecb1955e..000000000
--- a/games/NXDoom/data/convert-icon
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright(C) 2005-2014 Simon Howard
-#
-# 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.
-#
-#
-# Converts images into C structures to be inserted in programs
-#
-
-import sys
-import os
-import re
-
-try:
-        import Image
-except ImportError:
-        try:
-                from PIL import Image
-        except ImportError:
-                print("WARNING: Could not update %s.  "
-                      "Please install the Python Imaging library or Pillow."
-                      % sys.argv[2])
-                sys.exit(0)
-
-
-def convert_image(filename, output_filename):
-
-    im = Image.open(filename)
-
-    outfile = open(output_filename, "w")
-
-    size = im.size
-
-    struct_name = os.path.basename(output_filename)
-    struct_name = re.sub(re.compile("\\..*$"), "", struct_name)
-    struct_name = re.sub(re.compile("\W"), "_", struct_name)
-
-    outfile.write("static int %s_w = %i;\n" % (struct_name, size[0]))
-    outfile.write("static int %s_h = %i;\n" % (struct_name, size[1]))
-
-    outfile.write("\n")
-    outfile.write("static const unsigned int %s_data[] = {\n" % (struct_name))
-
-    elements_on_line = 0
-
-    outfile.write("    ")
-
-    for y in range(size[1]):
-        for x in range(size[0]):
-            val = im.getpixel((x, y))
-            outfile.write("0x%02x%02x%02x%02x, " % val)
-            elements_on_line += 1
-
-            if elements_on_line >= 6:
-                elements_on_line = 0
-                outfile.write("\n")
-                outfile.write("    ")
-
-    outfile.write("\n")
-    outfile.write("};\n")
-
-convert_image(sys.argv[1], sys.argv[2])
-
diff --git a/games/NXDoom/data/doom.ico b/games/NXDoom/data/doom.ico
deleted file mode 100644
index 9d89a959ae3aaf4f752f47f3a8585c1c5416db35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43344
zcmeIb2|SeD`#(PRHdL}EW8Zh#vW%?|(klCsLS(C~Wh^O62^EDbEz+hWk;IIplosu_
zG=r!f+eB$(n)5sN?cq~BdGz%8`u6+%|IfTSnfpHXea`iMpZ#3dbq0fBz_4PF4+BOR
z6C;Yjc);)T=Z{}|F=H@q;XOXS@$2~67|d!Z3`SUZ{Q4|>u2~s_QHB9||EvTC6J?0O
z7#NISOB-P@(w-Ph!s=C~>~jR>z@*vD%}mxJu}GMOWbL^9EX-5X+}y-)eQ0ZccGv;&
zrU(+@^7+AcIW6uZ<n1Bmisj<ID(PFEB=*gk7qo`wv~cMG!JYHP=WH`M#ARX_!`y(~
z7u8&}L!@|{@%Bz>ePNyA`4;=w#Z*Q2t{2Q;G&k1`KKjyW`=I;7oQ#~S7ykG%WcvKV
zrGa-j?{Y3(I-f%t)ZyFNv}?m)<@rmEpO$R+IA?x>iD;^s_`<*c<1U>R%<$xyXHK~6
zr|SAbYs)5C>o?ni4lL?E!M$}kvlVlcLFQ8VNbOloCd|@|8G|OmqVvss<{R#r#XNsh
z#qj1CVc+Ef!ujf{jH#w3b52{fN;<KKa+**KPA}ccP6W@~8VswLMTcriuJtZREx0Sz
zsMJMIvuGI7^(|+<C(#%@JN-rLcJ&tf+95N$oEPa9Me1AU7C9dEDy@2_J0_>}a5sO{
zs$JM83muq3-?>x*_X2Any5kkci=SutNV9ukopYt<=gpqg8DTNYHu?4*gI1S%muJ-)
zg+UC|0SrdJ(9k}$WKV!<$0LK3OXio;2v}<YgVh|OF)utSgsq=EY7LR>Temnso$SpX
zH|t<;<P9OR*OJ@indDGrQ#N1{;KUwt<H|sJ?&oe^4<OzD#mv~ImBq}MG^S}C`MD#`
znpU<pf4x<Oyt$cS^;-GJKb*Q3WEbbr>kCLheQ%y9S_o_kv7x;y$e~56eZqp}`SQ+%
zSQhD9K1auRL^#=UznF4jbq)uwImDyGM3pn;q@BsW+R|U<<+*ir_cOzf*e8mnPd2d`
z1$lQSl-x@>e|o{AbymrE-F{W^LPscv{od^-p7EbaP_8Ip=zn+6&|n*u`2#Ply8NxM
zaKG{_zIj!?@J4<2$vsi=92`b*VP&igk2TE9mc2|M8`X{&8Za~MU34Ufz|MMu`FbXK
zVf9C8LFNx79Gy#bt>^}MBWx>&NBdVbe|YQKI(Dd}nLlca9X&{uk=}T(iNdSoQs3P+
z*Gr?aWWVIf)#;4q!xkUT*X2064HLzBr7OCfgNfLhzDH^IN0ytE&xIxXMOT_<Mx~vJ
zga5i82(Gg1d8)Wpc9SM-JfJ(-Wf67x2>~nKGMmh;ykgu})S~=zD-s5e6EcETO!%LA
zKdpUorrt09NHznFu<=rX6Z4uC*Iq1QYW{R%dqqz00u%lXPoMV9i)t4p|8d)<QOkh=
z_bJEp{iAbRxA|@BczH|5>!Lq<N_dF69_LYBO^Qu~ds7f8VniC>`JQd{{WpRAJ%X2B
z*$Xa<w2E!{C|MQh$$jb7X!%j5G+p}pF>LK);|=l(mpiV_EhE3}$W62Jy`iO9wy*qJ
z`&et_Cnrw|wWTY-G0DQez1lG%;w{aoFfbyFi?`=RxHHSgkxy#toNhgQuOIG_nCbV)
z0#Bg7|I~RW;axzB&yDLt?M;szNe3hb-&}hBzAx>SLP{j%wcYNw5&m(ipZd9!hkLB#
z9SMsq=)=8Mv=<g-SGt4PKARQBgAaEL)*P3PbIVE!a{MyD;^iNz<!D8%-Jy29<k8}{
zE}t{7wZ_RgbB<nnah*OSaj|Lf6~R4C9yafBO80}4)~)QYzNBueQhjOequ!<X9w*My
zYEDeBNSr%o_5p=KDQj%qiS2_cn%G`_DdnMI@}f?0zS{37l4G&{X&NJ*_F;V^)%r_P
zNC|u?-=2kSP>;ugu5HmF=2@`oHZBl|=zj1TdtWL)_ml2!7x_^pqI>;$tsO-#)emxy
zMpO9>l09CD6>tQxD_O6qOD|hXeD8h5=Vi+&_16}A72Bj2`E<7*8gTgZEK#rPprv&%
zyVCPc9oED7f|5hQP1mJ_bQAsfc;qB(RrIR@Pu8oDsTUXNFd1+%d0pH&n5(I|56cwq
zz4d9oP*oL6`zfDJzq*j58&w@62ihEaUp)`h?9ySiN-i1*9*mLy@V2+&AXEP>O;6Lx
zdVgX{<UZC%#+My$CKW#C;1YHn_@lph==$}dgKbFz%3(PJnN36YMN2mc?C}bZedDkA
z@c`k&=a0UUugevA{O;EU&!Z1syOmQ|WTDCX=vbR`Rk_^zFRW@8tZwR;@i>HcDF$z3
z2*3M&sbb_CbwS*&IcZGl*Bv<Eo36frEEW#6dQwF_q1Q`_4*HX9TLUXwH2tevb_P)D
zmLBmvp;8umt5?m|C)|reW!9U89e(a}8=VRVn;C7LTZs9D-R$*^IVOQ84-`HRy6;rJ
zCn-tcqDI_>=-w<2=c<atjUK^5_bcdM_G=B1XRqhPV#)<Rwhh~6IMofM`{eky9xm18
z+}N8HI$)pO?G>q%z+iIPiL*?}(Rc0+-I_O5JH)Q2KJ$NY5`Q7$$md4Ihg~!p<!H_4
zH9I1hnp~=$@dR(#$`l#kr<h8+_TpIiPA;{ht%EOUg-89|o~N>vcBb!SFcH1IkZFDb
zpT#@_@lEn7nAG?yb(k5uIqUSUn@jIodChs3{c2aLEr0myE{Uc5gR9hX@2!7zDwWS5
zujToGKPlr~mv3pHSN^+ASMM#}F^hgrexWw2-pI#+aMjVq4|hDv-)*W*8hl`IGQAGN
zSh<Eo{FpXUHWF$QI?}pUbd-yMbp1w2;gX@wY}WL+-74mUaJmgs?~)yZm$#LNb_DDC
z_q1DG_2F>t5B1?>p!Ph^HyL^(9emk%?CzM)>ygk~mJip4zDW>R^*qsQsou@dvgj6d
zsmDWlp+yJk53WxsTcr3xlk$h<;HQ>kqiZoqA=zg;R_8~R2eCDh>~G&V?AU){5#=D6
zy~=81S9gZGqeH@*=Ux>uo-(`pWiL1Fx!P*y>d7?!J&!3<iei*mo$V%!=mPfyhIo?$
z60E`tRnqy8n-^E;GLUI=Ns>F(WvnG`ZZXPt74hc`mYy}|;0B|0+=dv-lP1qb^yWQv
zsuAsN6}Ehn?Z<!3+=snT-Rv+hXKoxeFmZEyDz?pQuFqyBlSd}P{iI&LFV9TecJI`~
zVHvBH%DnwV%Suc1aMooFTz7G_fp@-bd8=b(tqiQz8!~%6>A0doI#qxB^p=r!T(E%s
z*cRv9T;r}6Nu|ZoTWX8v7WM1O%dxd7))WuZi=Cp1=L*XupGm9DOxsgDr>IXiQKCkP
zK7@0>Wun;6C|-yS?X2IoYEQhfre@ss@&ku_-QC<obRR#!VnCL5YQ^5=^MrF7Plb>4
zSM(HK+xI4{<L;~So8{#R<%>0yBen^6`^+649>(W1`1hr9zxG+PQBBlm*D={6QRix%
zhI>C&Ivn3(ckKA_x|$ls#3JQ2*-_kg>rV=8X%*Ra?j6}LqFe!&zpc4^VV~oI;7jq2
zmzdiWS?}fB*j|cXd1+RgqKK!zk-E~Eh;T{8cZ~C-MQdm@-ApS``g~=6Ol=&e@wpFj
z9QA<#u(#JbNIG;ZGqdJ|aoiI{9t^S6*V4+$P=+Ockw6mbix)5US!=P{c@eiOGLS<m
zuJ92tqN4Kh^0Ab~8)UgHt*r~Z887vA-cDL9LR)e8@L{b`imP`wV{1pUcUYKq5LeN2
zfuWu3f*ovin9nv!)Fj!oIR^!`4<*jNerdl?)1{B{4w;g!c0A{wdpC9!mz2b=5X<mn
zUzT=NV|DRBlpHOJ&%mXX9e--6B{5LYu`)cUsrb3KIuuaCMv-`VG$e-PwRP+43l}aV
zq$~LQyPYh;h<`r4d_<hJXn*{y{rmT~Wxl9fs-hBo$~0MW6XU@yazmP2MUDUZLK_ur
zZSA4$4EP5wibu!vIpDJi*O(K-IIj)Oxn9c|&(J3=YE<bwxEOy*9Lf9U#}^I}wf;w9
zXY)}Ne2Si4aK4=Ul6fUdP4pkE%y^eg7(EjcTYGx}KK!YKgxP{R!P~?o$yywWE>#B#
z3k&spaZm{RLY`ga7%YA5xsrk}8ij>vX=$lP3LV#L?Ii9ck`D11@Ge-8e)Q<4d4$K(
zmU%7PI-lfQFg4NI8*B<~+~s&N()p{U7wv0x*^v<hxqVT*K~`HZqja==v~+(RX4xWM
z+KT7i-1W)W<Xg<0F{HC=&$({eB${5*8AX!z<2rVBQ2@=%oIEJ15*6RMk95|)urp`Z
z0RNnW9#<3g^C}ILw~#ElxAUj1+;Vp5k+pZaw_hpUdA~jVV|c{bo#(kEj%zs^vkp9M
zI1M|e1q*C!Y{)kT%${IxGp}GFtSNU~QSSKaY3Zpbl9w&l+2^ua5!>y_B*RS@ign3~
zQ!1*|q>)XGXIgNw)TEX9PjW1YrTwYt`{R{$baaYlTduNsPmK69i&ha|$uNI`&Bl$U
z9E3H6Hnj;{QlC|$-Au>WHe9haIk*0gU0+W7g^G&4tlY&53oN2Al1yAA6i%tK)Xhx|
zx}p(vx<eDzr0btv?F!K~JPbkF%Ad5Am(29UsY({XPggh_haj=#D(7rkL}DS#3)b(2
zaU?G(F0;A#Q${DEj7~gKSNtsP_XK8AzN4UEwxCu3CRumr4pCD$kmsIQn#Oo74;$K?
z1#3drjb~*WyNAPG50CnGc&t5GVq$VVVoamw&6~EGf-`3VM*8fcBMq)(&5w;Qs;c5p
zI>-B}U(}sZO-(I8kj=kp)Z-7zV)**}1&&SZo*(bV9GHD9{m!#ziyj`=7JER~i_d0Q
z>R&nMf^x!c({-i2>z%{LmbyIde%aqEtU0vEp=8U;mX&Ajn3_7KVJx_nBk@8K&C)@y
z_dK-Q7h|_~>DDNka$#G+7um{>s&ii1w0&^v+12*JNw4$fouL&c4kWGRF5NQLdw8T^
z{!@I*{SS_h&(&M%rn0i=6z;jX>Q&X8*4CI2`=@cs3$)apCVWhsdrwz~$<n%ul6oqy
z#V*oY4d>(15EH{VYjs1+S{~`^OUz{E&hjv4lo4K7Z{9Z&I=oRRf78RE>i3N#o|M$?
z{=jE?m)zT$J4HuF4)$JIaxL-ZC#^pOtlwT~R}L$M6}{U$)qTOGx!iv4d46+E=fApw
z=MwnjQbkOh9jt)CFh)M146+9D9TlRvX{o(mtg?W57`Fdr4GT)v;PJXkEW(t*MfGJp
zZ)V|$CGa9-KNmIO^xPsKL77WS4R}al5@g5Br?Sv5QL?tI>hy#OimxL3$K|@nMHMp4
zqA^BF(Vj4pg`-`_aYX;RhZtsjG=Z14U2HzvY#4djmp`$90mDcj64>cS&S;x$pv^;*
z6QT_Juu#-6@V#U|pOLh82ExWnQN(1Sw%N44x+fTBy58w~82mw|=)QRdWRmd>Mo`7A
z!!)1DW_ff0%_HM*^8>b&4b<5@&Jp!vl*)QsY(+gb%7^!aS=j>%FN0GLcVi61#1EeA
zU9fleidy@q(xYjX%nS`r&uXLxgwizzD#Q3Wop<wpa*9||Ix-?dquDb+?)zPE3m?ut
z#!X#(Z7c0zBi+<dZ}{M>w+tVeS?FGPCvx0q^8!5Aid5CLO{&jq{s^V*^(Wu;BqX}4
zX@26SIh=l9Do66X#e5-~g^{U9VctCIsz75R!R}&b6TN%Tt%sU%zZT2B=S|1^qdB$K
zUmo)Yc)5A>bx1Lm=Dp`rV{+ADO<|!L5}R;C!?SCxjcct<gtv6usweGfq}BL$MG^-6
zuel1Yqdo}n+q4w}TgV05>fu59yV#EUM-<cA%+ZBaLr-&wmm`Oc7TH}qpic8xvTBnj
zd=QJdq)##SYTeuapf^>0tZOeW^R|!w*ahmR+|L{2tps_f^=5tZgykq)3`u`<TuQmd
z@G{*xJc6E0*4#>37Q_lhb7?vkxh3lt;omX#MQ&ln&sV;3<0VsZ-^bCAJ*3!n?FgJc
zxZ)CJJUY@fOZXn;UXp?1kp&RSy9<|%!u;emiK~ORnP0LgSw))oxBb-Cb&=Sdhe_PD
zjzCXwJS%21BYytst@2%QE}w_{^UAsp_j^QMF7l_nHhq8l8D~wt;B7WMz7T_FO<6#F
z08Fbs+pRy!JHkyfVJ=$@>H1uz(k1xb%5@&uvl&B1sKH_+d#_SkNYn!9LiJ@s{4P|h
zj)%DS%mYGt2^l?0U%FZvkQ>wCI(ciN2LqlfWax7*weF36^iXSqEjzWJnPA?t_tQ-_
zj&7AM%d!x*6g{do2XnDn)WvFly0vpfR5JKON=%aMnevf=;7rMC93G^t@oI}P*1n%P
z0PF6>_{$6?RR!#XQC!d$M*Y#2<Wt2r4g~s+gm8FV+Hm1|#AiH4RyjIPC&iHZKvnAf
zQp|9M2-WIkrRFPQePsWeR3E>jEmsL`u07XGg=TXSV7eL=A#6|3W|zx=$=FLeUS4pi
z@?b;jP_xFEPOXRaOD>_{`Q#Mt5@!4MXn7(wJv$XH;BI$t-Yc-GqrRZ^><Ikqb?>6V
z>eT^vY7Xq+Q|xA@FS_*vQ_K-rMh(0;`rz|ou5Jx#P*m>XV^OBTlH@m9^Y8erEc(I#
zT-8B>#nHgeHG9o$i(CW(5?SO0anZfWy7QVI-r~R+c=05*k((&HUS=-x$TmLq@VT2D
z=ewH5%lyQLnA;5a#Ja&b;aGJL@usosu2N)qP<UDV>|w{t&nbn3(RI{;U8K3#W1-{%
zMRh_nsV;Q0+e5v0v2qF9hPj&#T^=3nXe^nV5=1>kse97bR3b)W&b#@9$QC&m^8SPp
zeu40k#Wcx_a3{r?D7N_O00TiMWg$(l0<)VPb4QWZW?;H_GgGy71#EU>9dD}kVn=Ul
zy6?rtF6q!z;7FFguN^&m7A+wjc2ODou&EzA`T9B4NG$ka@OmTQEA6_?Odt&TQ5KgM
zDK{OD;jLVjGN1N@g?#dUElEh9<`oGjOa@_FSPGmY#Wbi1pZAbTcIw(53z2NAVDk8~
zrp6lfDztg7+sN3eo&ss=+e1>}N4SX{Iw8vrHqB3#W8?q8gv&EXB+GKEM7w@jP^+YX
zVHIGbItZ7QCUq@~BvAH5)qM8QRVTclQl0>TS$MIHGWRQ<2f)gk?9w;SRh~T9tg)3^
zVU%>|69YN&44s>nEtOlFN68A(v$YL4A8@zkYzI<~ZJ3zu2u_@6*hy17v9xO;8?90I
zi=$62TP(@irF!q)<z=kN7lob4$riiWg{e7KRED>qWdHU@Pp<%-YLd2jPYT6&Z0i6E
z9&5$IJ7@m@vu?52mi@f=gYB3c*7>_Vc<9Hx>2KS28zj>n33=ota?;K0PU5ODl(<F?
zV$Dg1=nK1cvRRIPnujCUU~o(rRnEw{uWiBub(^0m(eOoy?D!=fr6JTkbFhl?&ngpK
zErp$_`7A_3cSfA(yCgMQN5m|*g}dTNFRjT&Zg=Hs)!P}?(cL;c-(nyO+sLNO!s7EH
zU%TF7j0_dr7w5v3ALIrfyLO4A4uh+YHV9@_=7FPNcv+DUrR-znSS*fNRFdkDu)JfV
zNYtJhf5}Bb=58%=Ebfeqz*(F%s;_!bYB3k>v2w{#xBBRk05>ygt)hVx4d3kCp_$BA
z(OPq8<F;OoK5qOzJxmX4)V3Ouy^;|1V-%%~r!xvmmw2#%I5?IF`iO}eV@<uysH4{y
zsR9_)d6CQmw%+uEsvp$k6mPNOPCTc@W9hE5IihZC+^6wqkO9AyA>a`ok;Eg!MoaxN
zz=@A#5fZ{*{qmOFWH_om%i_kYLWO98^?Nl8C5G@NfvDfXS*Ff{<-n_Mf$NA_Pd=5@
z98zRfh^|IkFKm6R_$6F4H-^t~xr~lo(YZA=Q+7g&lU0NN?A5(1jd2vyfsLEQf>|-b
z!;~`HgKT(#`FL#Ub+W%i4l~UItIlw58K+e`k+6r#Pi!V)?SxqAUSXeOaj|MVR2kb<
z9QdnoLUy)~wY}O;=|lxnwZk#~Oa>Yq{tiL{^gK!IB77Z7q}*Zg4k>A{P(+5r{OIu#
zNF(htz<4qlq<3gO80_dsKFBaKm%vfu9*w&`?-(mhQjBvByAoT{$OWcs%8qRel-(-v
z4O%pn=d{8KV1M<!38%3Vl{<>lI)W=%uRWdtk0X?jHFpgdx-D-zYv<ftxz)F#U9ddf
zWiF;Aj=-J6LBn*cR*<A7V6qiy9u8Ip#&5_UqjKHnMrAV;?a7ULyR+#F5jzss6@}Y&
zS9k;UOYN5Grv}Dt6lOeT9=od`+5byDLuBu>0WAID;)H#%xIBGdsug3V{6%jaOG3~c
zWU{2rN?Df@AV^tfijSyHHWLaYTDL@#w)HL$l_YZEqbeALFHpohsI%8J2k#|CE#jhi
zprb7&pLT)iLTij<)kX$bKZ@rPIIVOkWd?kU=m)oRFyP`<*$A^gnz>myr0xz&C}0ro
zqSUV+W-2U-CY#DV&?5WiA6K9zELw!&B!-{XA)3n%GTm85d)%tYLEXwpS?5SGZAe*8
z{qk~=BgU$8BeuBBJ(qn2h0EYH+a6NiHcN`BgSuTTNs#wJfN)AS!vQv0JUgB+N?@a!
z-<pNnB7~2LN%VMVGLId@6g}%SGp;k5bR<%k$}Xx>%~^Ad*m#+RxP6{5?Y=TCegXb!
zEmP%5ofTB`bv+#g0S?Zad@(J1v2G0eE{$Hhz4g-zR|;Ei9SiO@3;oVqi|g^eyuwc@
zAw=DIw8m$In1WS=*y@gC1HDDG>QAt9ZOA%oD?s$a6tG8Lm{(g1?mumGTTQJE+7v^=
z#^2XRI(XRd%Q6X`jxm%h0WBUXdl6GLwgj^&22124HeR87>a#vlI&EHy?eOrTMyzIw
z#WFv693j9+k7wAzkH3`6eAS0xb7c=_83TNUj}Pzd#45-`r|b|UBb|x^#_q!Cmu@p&
z*ZI_=yB>7#S`l#6wEX#tY4+sC^R{Ie)wz)=eMEIIw#$;tFZmctJDj}mAc*B!Ok33M
zKZ|C!ki-);nzNj`z>a{W9;MHR-EH9jCGOn^PQZ!x;0jLI6qEZ%U&1cE<4p*6R6fHo
zML!SN9J=+%Anu+^jVX?DRIkHyma9E1!sB7oQGN_T5t9-@6=P}Vrhgh_jVy}Dq{NLK
z+d^F+!-j?Zfgh#!t$8*FZB1t}JD~(KLb#2gQwr4siP)UJt<~1bWeDs|@r=aBm?$_2
z)o6p&J>G&Hf6^6S+gEGt`(C$h`+Q~EeQBD=Cl#Xgvlw9oYJ~k&c7n`eO}Ie3STpFt
z63<32+IFrQ+oCZHXYY(f>QR=p{;=JW_{{AoS*j5BB7#cP#U`4ht|E0dg|sh&gVwVm
zFEGkQh|MGKN)&d^%5}OFwxbMB_h2blg%6+BAak%_hT?fR2I{e~vCu&_rFon<hHF;^
zKJ9KcpN(fMDZi)KMUlfx3bVqQ5(D`%c&i<C(boB~-pAmwB@HGWQd$>yR<J~t_^8aI
zoeq69=l&~9@hn`1_NaSQ<l-Z<YdINTc<vCpF#0&~rGtPVJwPCM1+17Ed$C>*UaR#`
z_RI=#zPOpt;|W(k&6whOk;h)>M@4q*p1tFZq^i^KseTU`XE@a^tdFiBk{Ci|DOo+z
z43!ux8+D_9ci@19sjACx)^2U**{-|!i%cJIZkuZ@h{tp}4_|)O(6x&YCirll_mViv
z+QxPA4j7SCJD(9#>$(U`<PLRxs_FAS|2P+W%$Q3%W^h3c56xrk>S)4-;Sixu>7CKI
zWoCEHEgdj-G-#4W<Yb!bskmG${XV<!IR=7nZyzJ>TH0PEn)!#(Hg9}q6N{@4W|5On
z-~$|Ni>u~{!nNBeE(<2JIdr|}wA2fj!t^M(Q9{HPG_x~GhGj=KQkd2b7ck;<1o;M3
zQp_IU?nIF^sA5i-XsnxUN@qOzO_&lKr|)dPid(2iF^w$QOn&2qk*~+pG#;qIG73|S
z$=E{M#ReW7ao!Kk$Wf%2agB-?2c|pEqFg+k3uBq-%pGq+6=20){d(66Z+vYoF;|y1
zv{aaBOL>d+;}0zKx{fz-IAbQHPFsaB(@i@3<>qi*>0>O>SDk}nroUiV$$>wpG^@L;
zo{x$8AjyCc-h7<c?wrg*iy|sfq(swq<pfb>E`AZA)X&EC&%>$gmWIpz11z*N+`^Qx
z+`#8FZ%?ZBt2s!u?xh^I<6B3SDX!0m#_H5^?xQfl@^HsQ+BU1~#cft$qI`PZS74KQ
zzs^57HG+ETaLgRqDc_MD`>?KF7<Y!qqANrtb#V4pK;u<ToFUn|pa*HSP=%#M<UE^m
zl%XpMRJdqyc>3nnSnrA>6gFGd6|q2M4xI8yXL@+4yNHdC7@GMpA=FR4S8=S=?m$-#
z0VZmN)f`!*q~_}|@y(@L#S*dd;!HSGE>}-X7bbF68pN4w3;Q`ivZf~EY}(zL#(;S#
z1q_>o@R--LX^%e~jz(7DC}_;feG(MYAxlO$gHV11#ai2Z^8_=!xnrYFjrF`G@F6%D
z=3<@!QBo$i89Dh}&*1y4C@C7on2C>#%HaC(fo@N(!W>${bDA#fTXR@2#hirMgyCxo
z`xraOI-0v`2p?<~T&8_GwSAXTa15c|pYaui2@a2rWGPI5f+P4c`&namAoZM;WlrlH
z2PU78?bk>9W&QMUv$vlj&!+8BAFI$!d;nLOaJrU!yiSg!w5em)mWyo~LmSvVt*U*`
zYosvK9~N`k4DX0VSnpyb%x;uPDlT|*wk;}pH97fO&zoj;SIt?o4q##bQn2)VIvbO%
zk3)3iWhOk_ZBR>+qj`KeE@~;gq{W7eEo~u<Rs=58VZz+z#m{*HQ<`mIECV+iu&ba5
zFFQ0zI}%r~5lAOu7t;jU7+d&>_$boF!|M#}wqga~W28OJ@K!W(D^_)uO_4k#x21OQ
zwpHIeOf!x$);(OoB#{p{1@w2tj2A+mCe<o*6@$cbMj#Zad8v%)sv5=>RFhsTp|CMC
z(;4uZmr%k8HU2Nk45j55kEAW5E%l(R%L;rCD?oE2MXXuLLFP!_iM9I(!`EliTDaid
zIjcIq%puG!TeSL*I~DnlHOF+4+sG6-adv`F*q&_5F$0KZjdnPp*1yVOj`W_q+r=#;
zQee_tJY&(;!mB$l!K?x8tvBv6;IAHxnPbmLKSXd!&-!w=iPrOJ+oCsq^YAN@${^BQ
z&5iU|a~ydnS-xqEiK`i?c5%4T%-p=9t-j<9FX<U>4+{g2WCt@Gdf{`gw`nl<VXm%m
z8up6J+BVn78vmL!MtSM$j6j3x)J=Ynu#w(-)X(WNZM9SrUm~n{L`~j}^v$1((r{5V
zE?FiI8Ami}ZXpITwkxZ-sI{aW5(ILkdLW&Ir{5lpROt&-KiC=8e@bHPDd%xo-xr%v
zCYH0tr`tTup7=^FuqU-);$@e0Ub<0Nw(5RP+sRvYo}pvGdQS$gAI}$ickJUA?d4zg
z$M(E3TyoJpHF2B!p|aMsCzaJNTwA-}$He-AnZ0kvvjs20@=p$T9Dj@7*{(5^zoTu{
z)gsKswp9_V`&~figZ)4dQ&EkZ-XH_oY%G288F1cAeiE>{;4`!>!I&>!Wpc^LHAWhK
zhsG+<MrGVG1^&Tcpmj?T(|ACyzxz)_^9-+~+^Gy1`J5~{xvVTjxwPXdGO5Q^q>{7L
zr4D3iN+e{+%kSm=?zPEFQRRy%OGTQ2Hue$F7rq0Q3tR){e1*V@=NwqS=rpifm<=?g
z5>qB$`0fi<>GB~(u?~Qwp%(rYsJXX-75v5Dq_I>o>CkttO<oGA6&;e1cn6R)G!h4Z
z;`K40`du1o(y3FvkJTzZBq=`#kTmpC`+?@|&uALzw$CQzP?0@+crwH9zF=|1hoqLh
z2S^%8yVHPc7!fSX=?Ch&x`2^D8JdQI%#kDCy*7D?H7PkHWi||uG_n#>L3Y?4u>3$5
z(24H`hKp|kLxFOjAeT9H{^lizq&JKJB#oT(bdVR52#)OB4_rbCz)-Lb=m<Rk((<`e
z<6m8RNZOqWkTi-erGkfL0pL;5W{?%U52%X1Ld!)`;pEis+ms!W3H%I@G>)G?1M*H}
zfn&)TKwq~N<rFCw357FLzP~JxnCX*03ak>wfLr1aSiNHqn7j7?OZyg}zN{52H@pSZ
z_0D8X687Dfpp3@zP%{Sx1_nTXe?NHo^eHGWF9#=1oB&Yk0Kx(TfX}A%%I{vAycE`p
z4OpVN14!y@1wxuT0anc&2*Yb083!P&9sm}K+X5k-n1IO_zWXAe730UJfd})1EWuy@
zMxytTXTE!F@>0p}EMCIw2w1EY0YsM{2K?%~frwEmOe+G27^lGNaKNJ;v2*f;@4gsB
zk>;C5k+<P?HoIy1K3*^Ha%Y8%eZ9#<5Hr8LdZBp~$Jeis*)W*@CLsL`G?v3agE-V8
z4ow?c%_Xpm2lV<k{U@ey_K=$JeV~E81C}kR1$u&2z+mxpV8VY1nDP|>bDmSMZ#oIq
zaOZ&aTp3^^*I}R~89!zH{2qpw{3W8QNE^@)eu4IRdO{7r5L<<|b5p(|u#)#8+V`#D
zE&w)*PNDtZGO<MB_vuV^Eh2w~h_soBJk;$;KrVY2=*ttP%tK3j|4*kctZ<bmC*Fhh
zmq;G!o^R0p?(g!@5KsQ;^s&m<h*FY$U?LB7-#@_8TQoEe*_>gZr$qb<4h@OapH5#`
z{TdPJYbWy1*f9W>J^nJ82Z}@P+wxGAJX}2$-{0RC)-EMVsZ-GY9LdAUl>jX7{sHuk
zKpe#Ju|d=B88GI*Hi<)3;>gdZuU|%#(jNj7c?5f&1BARSz}op9!1=eMIJBLcfHCa%
zC-P8|NU!-`&Z(}2jbQr7c=Bf+p}vLSRmB<*Wp@-9dbguo>27I7#}+gXfl{C-nf3GX
zo0Su#*L+0B8zhhL;LD(^)&@j59tYmGMZgMjh4XF$MuJ3Ow73%Bmec`x>0IJe@_v6`
z*b=61{|QXwu{-iAcyr$##B9n#^Qg^p18X+lgX!0TW!Ofv4a&)!{Q2}(-yovn-Jf~j
z6Rv^2=g#0l>RwQu8H{ojV}BH=!}-WW8<dvI|M~PcR1jshjgN;i4kO@MV+5eQa!2z(
zaF7W0z*6_#Wcxt!kdiz1^Xc2c^n=I1L>|8T?}G58n;<0i1_%m+^9`$}$+|ny1|{S!
z{B-&v&Xq)&$S>gQJiacEiF);Q8$|j<%ujwovY$UEy?GCwkVnA%_Rru!Q!l7*cm}TA
z>;U<N4Iul(HIRDvEb#I<2E2U|K}^Jc;OTPg)lVjm*?Z>s)3LEJ@c#XK@aokofXod#
zIy%6kM~~2X0kl2=+1c43H8mCB@p!OjXCMgjIn?p9=?m*dWeaNu0Lf)uKn~{v#C3N9
zAys!EsqG0Q^>zS$c_$zs=LkeJwgEmFd%!JW1BA6BvVS&xUiDpBSfgX;yaAb02pJun
z_B-;<|1IfDSsW=+buIxSCdUBZ(h#8Ha0UI2%wtp>ipIagxs9^JW%Rp%Rute?-f`|{
z<u?g^8ieyLr)g~|9#eC?I4Zy4ELC#VsS)87*&nbbe+~Rv(Ifmi`=EXP|NaL6fT3cr
zGZK)rk$IRf3<fYDo(bp&E&$!&{0<5KFMP17C)Y|#6?Vx;o$r>DJlm}xai&{I;#9Y?
zcwV=Pcux0Hk&GU7k+dES;ln*z!iT$;38!}JV3WIbu?M>Kg%Z0Bm&A7|%kH=SRjd*+
zMK6)Hr-tw|bS%*ox)1c1+<|MSTDX?I0ZjRe(6y)~-vxADw|dbTbX~iV>m)k2b6k)C
zaM<{lzn*_FNktTn``^i+CtVLr;94443!Cy^{#zMv*aXtA<}W6DjfBiMzm`E$y9vk^
zjsjKBmr#b1X=Tt8KJd%=i^!Id<i)$u`RIfU>MPpO`J&9_&p_2{dKq+tlYcpXVYzY=
zviAR42KAL>pjI<JXGLY0hKFS$slT4T(hZWNWIwuAo{&M!svBtDqkSvG-|(O%dg#~l
zSG`F>#`3RaP+k2N=sx@MR~e?@K~v-~`B&?ouqMo3ZG65xA%p(Pm%zA*ipro}_VF7Y
z^fYh%rA}&!ru};U%PL9e{>@i1tT(Fz=Z}Vi<<Cce;mRjK`}E+X40`%^(S4n-+r?7R
z^k2^(2lF?C>j7jB=}#HfuDk<YmRf_tqrt!wcMljEHcpm>uHij&ZGh}8O~{}op7G21
zix^dr(DlMsGOSyD50EO?p)$B>Ujasjk0<Mcp7DdpwZnuAYGPTxp8pC0NqW_v>xn;Q
zSikW;x~4#6*rZbeR^eb@*z^gN0k@(N=3g}_gMlCcC`q39<@ztO66O#0zND@HBZH0e
z1JKi8hsxlpTZYPTIejNu9}LVN!?i~>DuX^;+aTkGqGbNB=f8?bl6Hjaov&orxVaI$
zd*q19;AU735E+pAfXHBK_5c{ceGOf>?=UfDDM%Ikdj4x+{>c8{S2Aqe_89axxu7!a
zb~^(y!VXT>2T$AuxbAxL&3GXzb?(>mx2Yz{c#op{hZ8dFKXw^iGfl`aQ5NkL>w%fl
z{crkeWZaaIzWD3;+r#|f{^f)WGEO6)w<8b?zxMb>hSzr;z}|op-}I9c<EFIqrC-nA
zxrQVY3fFUA$zbf?4O}7~0q2lL;1qBl*m>Ru%gj0_`-h2sa$>xYlqve<{6#m_k<j(t
zcQQ<r#n<iP>ptph86;$ie>s2GlxJ@;YpLMK%@GigPXhsYG_bc|2qd5D1u<D~fqOLE
zg9&*Jd?TI!zwkT2$+I39TQ&d#lWMSfbrEo}y#!XRJpB&yi=WIJU4zIP@y(kza7qo(
zJ!E7bxw*L+Jbd^Nw6wH<s;VkbQc?oWpFa<dA3qKvBO^g#Vj}SH@BoSNaR9#~_0unA
zkIA_DvKPshLZP4m$#-yY5YT8e(A3lf?%ur%u3x{7=6~|!NsyVD37{(iIC}IbaB^}2
z`-8Uwd|>kMujVhIkFODjYguIfTXlH=P%-fbGWxziLfZ=lPav=F4P^DafrzRb5L9#q
zLP{<`Ol=duDmnokNn5}#wGoJFhyL{b)c11osss^)SL6atal6TNF4ia$%$IVRyk25(
z7%Y_8Jb5jscMxzX_)K0SX?&mV&t4<%imW&Z=8HQ_riV2-4i-qeO<oHbrh$cWo|D&t
zxD>ER!FTfd|K<Ee3}PE`fe(S~`fEUH%@w$24+VODcYxf+>*Lp&yMc~(4N$PJK(7U~
zV}Pc|O`z;pg<db#*@tk^@Uwh>|D2w0WrL_eIKb)#1EFO>KoII)1k|?!KD7YAqwEhB
zDf&(sxa7COa&iScszDXsr~9+l%VRoptmArWEMmK=%pytGjKkY6>TPd2t>yDHOJ&oe
zR2kcQ@iMk|e;6dJ%TuvN87HxNM^t|{zu)m3(!bC#n8@D|ki3z73Pe}r3d7_+g*XPo
zHFrF~+y8$4A7emLA-_mjq?WEKTt`<EuBNMF33N@Nn{+Lq8+7d@*XcTf*XVkJSLryx
zBD%riLb{Q_8M?8+Df)8$6Z92)dGr;$IdpRvEO?I7t#~r&R@}$v*4%0IHQa~k>lUTb
z*K!@8YfHpknkiaj#j8G#@437Hn%Jl4-VdTH*IUwn?*AAF-h%pz8ejs~8Y}p(Lfzr`
zJ`kecv*aD$3$lhfK19!l*f}7&zKvXY=$??n!Ytsl;25yrO+@W8W&(qZIB^Wo9sE6p
zI=Du>j_%*Afcseg6vIm1{bMsBJCdf9M9r8ov@e(vgGd9=RlSYsz)bkZ_n`hM1~cBI
z8Ixa9qHYYC|4)TMC8ifhUmOK0TifA!{TkFi|8oqcya#7YehJB2V+vxg(S5fcVNg2p
z5y%xoJr;t&@6|71Sk9L^WAckh-WfymTT@|BJu@<{*ZwasEayKwWAckiHH;zqj#FV+
zS~vn!s>Z&>0QI;3q%IlpADJ=vMWpYIA^P#DFlb&KL3P=G!SE02l953A%*ii*e@s$p
z0JS6d5eDt+RCLb`v0eC83<mr&D8JH!F?8Q{3Jf}xqo}SQ*+>3W3^;+KGseHDDwJR4
z&wbw?V9>Am4D_1le~UrQz2$Gm2YrEznUi1R;TUSeF$D(q<9C5UI~~QKbK@h>D*f=6
za*$7_pnJ)PoyU*H2ff8vGbg_`lppRnPlbV)y%_|bEJZQsUw#jaRPO@ql5a669e+Q$
z7yTm)x{Hs`ocwx?W2h~{6c}nwc!1_Bt3cR^VqkD}2=1BIK@1H*^X8|?a!@`o1m(Xm
zB?cYAoSBo~0LpLtr=89ZFw~v#ME87~iy(%$bHI4XZ4`sfdCFwJq;_Wb&wcP8W6%-I
zo;mrAAB~}UgDEiFI_HDh(jfcRHx79M6R1-~Fd%gavDZTSC5?-S{1bcmf5o7^<iw20
zFJ}69Ov>`ZxE<3EFx)Bh1!Tf{6vNFlZ?JsHT@(XSmnQlp?c!n7&gq93pngVk$@!U+
zf92yb)JAFw3=PG8sQv=Ma5G~YSPu0R2nP4GJCpsAZrKM^mx0)7eT(4+z`^y;Qf%SO
z$-nB!7^?F?Y{`Cr;a+I~=)Pl%VyMdY2gX7VQ4H5pw}M?KE|2$1H$MVn!J6+dQ~_Ox
z6IsWpVK2{|{A-~6hz%K{xA_5v2RF8(c54U*;)wuY1Z~w23`kvSf&EhWi6UTFJ%YCB
z|6r&F+Ct+tZOB?w6?<jo<X``EOxgv?KLv(IgdM2<2eDbJ$=?o)#2%p-kh+AlX{28Y
zPrfkOFBvSkh3caayV!~Kw2H{pnUml4*%+#~ngYY)x**i%4$-64p4$nGq#lEnvJK$L
z6_?3=sqVN7+NKSK?f^BBmcOh;l|--2ocs>Y#$>$y)O-B^!?U{~V4%en#n5@z4cxx4
z9lW^VKG~)bo6hR2EwE1A2Pz_@AFksRMayPReitY|v~&CshRBrb;C;uq{%isRQVvL6
znrPEVzjQo&AC&v`lxrXbu^Tfdzx(qsROj{`21S=)@Zqfw_|W4ChB~*PI=~-ccwD?0
zXe+;(a{YkpYsiaL%$)olFUC+CO+;__9fp&|`Jk<7H)wtm4w@c@f#(gu;OVU$;7N5L
zs4fl%hZC~EQr&LUPW12AK(b<$Gbg`y)0j*+ZQRcE2N<U6m;P?f_x(B!*&~~&{VQ=l
zC_iE+JA)XIJ+c{-Kd@;`HWtc1gBXxKvYC=Uqw*cSuH_@BX&MGM9=``iD(T=z#TRho
z`WJAjatK_lc@2uHI>3eNZ6NW)TM(Jn1HzI>VAp|XASt~D95_?~;trI8Z9A@m^$z7=
z)w-*|YV~>G=9Ufow`GDL-%Q}^ejKVyX6AG6)d+oPXb8N0`*u?IjOa=b-7|9U-Me?7
zp`iiXzI_|KeEAZ<v(M1)Wo2ccxVRV~cFbqbo<;S*(b3T$BqRhRB_)9^Teg7seS1Md
zLIOyPP5?6_JqFXzK0-(2MRe5@x^v_^qO(TiM?T%%-IMYo_SZLV+yJGerKtR8&YS@S
z1qG=5d-m)B@H9e@o}Lc*cLM=iHiH8Y!%WJ5w`Jf9A|stnM=>Dw;%#kh-^h>Hkt5tc
zfBqa02n5uAd_w;G{Cw0F;MlQaAR{9KWMySd%J1jy29AX807(&vGgf~TjDjg@D?@;q
zML5t{wHvH-i3jG+acIz69|cs+p}n<P7*Jjj3iQ|F0d5T*=vnUuS}Vh#t(iZN(DDUh
z8a_Zy#}B9&_yHxT^Os-d4Fu)fz!KR_Kup06NNH@P%vAkZD7$5VOWqsssO+57qa*h2
zNI-P`yi3FXav!k?;L{xUshfBf`8!|29tdc~{^fZjkC~Jou|p7Ek@uH;1(xjtq88`=
za-UB<0*J3F{>y!Y1F3Ztf4Tp!{8N`6!p*<@kGGfKQGa-qy@%B|RRE)qCe#iDu^o|G
zeHko(ZB*I*GFToC{hE+_==~zVCAS60tUUqDBH^6*&-;?AuK;dn-yv?A3M^teChsHh
zJgPeo+m82B*MR>nMno@kR7iI>kX@4p__ZR(gC-uZi>w6#8asgehWu~tbBfsjJ{2FJ
zu<_h~?!))yOV~kdZa~@Y;<xuD9idH=<H!F_%BkNr4ZBB?wTK52%VU7JaTE|Wj07S$
zJizKjfF(M+fuQy-AfOor{f9#VuUZJ?Gx(<h^u+;-<bBXSm`5$RYibGpyBLc-uMgOy
z_I_M<@ZCr2xb9(#*iMQWo-|;x>t(P0j@EZN{x5now?2NY>i(cp!Kr~HYj>ypXM*$w
z0!hrgpnHkIp&lXqq>%qk%75Sf-(&!pk3qL4%;aA(2E&G2|ND1lc=(QQ#7@fqhA0>&
z?X=*HT6lT@68`=C%fSBx1JWudaT1EB?4;3<2mk&j$SLO7{U>DE!82*lpa}me${n*)
zkW05$hCxB@FdCHM-|>)YuOfHI4hc)qkZiY9dLkTv-w)Vnz@ROii2I+w@T+M^OI_(z
zhkN9R?}iriqd?BhSqAk2h#$$<wr7a{q0!=MXn#h4eu$M|g+K)`<1dANfR}(dZy`YZ
z5iNPoqdtk&+-Cvem$-&|+&6IpYKwLf*nVY?hWIHuEjS8X=BGh@$-X~+RsR3>J!O&S
zsLk3x=77Hf+Ob^$W_;tmkUztL4fN6c5eJU*56{@X$aMTDi?%^ML+d}|K%fdNhc<{S
zpbaA83pzCi=YFalI4(&4ZTOX-uPfr``Li4tB5eS*pM&_JFYNyW2M*9SbGmYxsdxo3
z60{j4{S*f}N)Ldp=51&j0_{VfAFc^f2Y!)*uiJwC!pz@>Umn^_j@wQCJqMb)O+e-x
z6-Zrx_J`Zr$Lqj9<pB1FU-yX<9M~>A{@d`&iFZMp#ja^NSnBy2$d^Ff4)lRWIq-e;
zYaDzxE+8Ci<jVbR_+_E5H{!Q89S2Lj;Tc8O$G+h}*`EY$bxQy1wy=Tg#BakdBk=~v
ziocnbgQb3NfpX=z{pZ*9;Fmf0sx7Qvbn>_1mxea4h@Ng*4g%hxKG#3uK;>84!k-+h
zgY%=A>ffhJS5gw%g-i5K%Ypj#KY;q}@iPE^#KDj1fhn9HO*=n;9IWQf|9$wS`%oX+
z={V5X*^AnU%>)P5zZ1V)Kai9jn3e<0kUp@iaokSsf1ZQ0zpwliA$H`viD@{{3>!fG
z{bzy$OP=3|Ulrn4`qS?DZ#dB0JqYxh=|9cEkNU)^`U4BzbHA<prPN{BBj;R9!+|EA
zGH&Dd4>-_T`S34u<sWfi0oTsc_0uyIFQpC7F4Xw*tdGCpVC$9=u;%XDZ#dA4>j7Fd
zqf?Fx8ZJ%aXOn!lUih8^Gw8!MQ~0J!S4x+Ho^>)E2l%bo;MPeOu)e-~k^=*1?{8r8
zXi5$=H#I~2*Qe#cjPEz%H-Px{#?O2CI}Y&Pd7$;`DwG48`Yx0MBX@YNB0T$JDh@O^
zxBh9%{`VZ1!abzv%4w$JrHrA^0dmgEG#o^3JBiwvA{^A8bOJVa;CagM{2^n+FB5Wr
z^J@Fc{6Nd26_$O)v>dE}XTi=CzUk7HGKKg}pxys897Ot^2Cr_cndG1@54Hs-c=iRf
zp+`7C+QRo^qc-FOIWu}X4iG=e>ExWLc&U}J?2+?Hr{N$f@HBen%-0-5*c^lS$NdNl
zH@E#|Y+UB^5<PQtIu4e@dGbu*n=W1HRS>(ypMD2_!$I`UGoXXG{u>VP8#Dj(qqu{%
zh41GFI)3e_9Y1pJ>fdo-4ExCG<eaH^={3XSXDv;`L3C&VYU}(p2a&eNA^wJO4xnEx
z;$QVO2f6{T;NCVo_Z<3^OvQl_Y##>DXJDrAO_#3p`VT;Q?Z;_3h}nG>ysqE)4F{2S
z*{BZ$!hyF<Ay{{}=Nk_6w<Gwgr{utJF%k7`$H8;qr;~H0;-zgNe#B>D8V>g0&!gvG
zea%6nLoP6Zei4W-ON31p92XpcO?~Gi2e_Rih<(Bz<lB0n5ARRtSoD_E|33T<u<Y$1
z{%JVa6LTKCec<p72a(RXzzF(>ARHiVVSH@-4+n<99q8EjJqP;GH{)wP6XG8;Q{_8d
zy3#HXKXTUCG#te4y@2|ke9b|W+X-MK+=z03x6hdz8|zPub6^zKF*!e&;6M+K7vJmJ
zbcF8xKKz?t*}Fpg({Qji;R5J==KKu@(e5Y5{cs=$c!#`i<_9PT+wM-z55~`kyASnD
zP2hW7n>MUJ)0NXq#Y=lY?8td@({QkFe<6AX-PasMd!7PD67c*z=!<k@N6I&2BhnW3
zyC0aGALzh#q9Xe8hk7P0=!-Q|_@+x&W-G++`KRB{-*6C@atREyx_!gJg_M0DcIyd{
z7J3-8SK9w&ez4y?1sxl8;CUvBV&p0HOq$rozYo7Jb^NToX*kHrJ2~!q^Bo6Y_Xo(i
z^Iy*oB5ZQt*@VyG-ummm)i0<EKmC3910a6CKhGPSf&=6{_n|K6f7G%0r#WaV-w4d1
zzEDQu?X-LAOQG$-boF$m;$?P@j-Pcn1qaH`@4@>wzTo2<PxK7NpXDGiAOr5H_Wjh}
zx|+y~--ka0;t%@syvHAKAm{uMbiN7$pL)0c6bBu*oWZ`ZlR!%0=k}Em-Mb1rGjpcO
zce-?C!eQMHh4}x510%m4us5p=#AlU&xMNqrz9TTCUIBX#7J=Br%OEzc5bTL91peD^
z0Bw`5pW09STHlD+U`!|HOvTIKA@*I+?`;|mrkfv3w|{_~&pDNj1+l@HDSXqVD;ovz
zBR*%pkpsjAV>&r!Dqc3024rLY^t<~_93VCrGlg%ubY<fp{(bb{$^l}7F`b+<75}*F
z6L{G(3|e2m2hAOW;BosPD1Sx=<xgRF0>h&(fbeJt+-~dyw;!~F+J;t8RreeeSH1)%
zi+jNF3uKUfx)r2kKLN+`YQc&8>mWPtD#*yX4APEX072mwz~-%IfHVBP99#QL;OLYF
ze0)+sSZET6faf^JgeQZz-O0ZVKjLqP_}cyP#~-NQ;DqnsxXt&t|09`91|uUQ;PK<f
zlRl8h@46ws=Ysg+-Me>h(ig9&s0duVcoCdCcMc#vg@+Cu0x>Z$AS^5l1O)|wl#~?o
zoL+pyZgAkh0n{&Y-@bjn4L^c&!sigd{x$vy|49Tt@<BL2&LBp7Kqv4&d-e=Hj~MYo
zL;`{z!Tvq|h=>Sq<j4`!ClT=pb#-(A`=TQMufUIBLpbQ`>zl-noPXTf+KT#LPT)tL
zL+&GIAWz`0tE-zV`w9GrA1QJ+@<jRX-Mbg{D@FV=5uZ{7zl(!Ch}h-@l4GO6?=F7?
z7xF<kK>U4?_R!wm{zLquqob%lEmH0X50#abKg6GtlY{!BB4v)8QH_M}@$dHW1ev>n
zz|pwa-&X&1ECPW3##mtBupbS}T@C`*;N!q$XBHZqw`YP4-f6(V4#wN=2RNHVptn9A
zn8N4RZ%F~`HYbDCZU?|B=LDc{9SzT`-UXBl!+?T*2$0tc20ANu0RyXDKo9!4>Y0at
zWy^O0aaA86qOcW6DQ^REs$M`z-S)TPpNF+V{X7wWvafwuzyJQ<#&e+QkLUG$+K3D@
zHNH)kE|NF5av+ekt4DnW{~{ao=jD>!0^{$XerP|6N6zY&wXFv{(68-B@$4dNfXv1^
z=#RJOhw;A~KkriLcL?zz{?9*>pIgx%jYoX;eiXk@#vP64*NpyQJg1l~8ZW4O;D_=5
z;{Uz%|KIZexBmbCwf(ch{$FhQ5wL3SYaqMf8j!F$HyMOYkl#AAg1*amG+x2(#$+7w
zoQP>QU>9Buea5|k6?|XCh4@Xpn0X%H5ZeI#uI+)vo=&jT{q{HU;ww)<e{J|X55IBz
zV;5cpB+XL5#zTET#kC&D+t*A6DfoLP?ATRciFP=!J=_PDZfTf|L!OgfUj{ft*F*eU
z(D$``8o!B`-B1n|NH~J|@R<$C?|^Q=({JN9-h^W-{2h(oh+k0sKfl}Yqp|IO;~s~|
z`rkJH*#OTV(r`Knl%Xw);<}?iVQo5)vpxc3RviY?7KebOc?vuaAsPM_coO{m?*jm9
zxE~1N5`myz0$8jQ2avNx{%PQcXQS{g-38}e+tJ@G;a1*Bn{J*qQ}Ju}zkTeK@gCTv
z4FH>zUa&6d9k7mvzxN*71<!`)0Lynl8<yZU0Dpr6Ec1O1G`2nkYFi!wWw!@F-k|}V
z*C2i8KM67$YT&smML>9YHdqYjL;^bT6*GnJXVNtbf2FuQqC>|xf~;*2+@@t5+Nr)G
zv_s7(piR{v;JLD%f3u>2*9&<apGR_9-VbD!ZoMa^?Aj=yV1G~aSAyJz+u~9i%A{mg
wT#^?vI1Yb#<KNG}4E#C+<GUAM|Bs}FY-k{VBme#T{}mq4QS$3@9{>J-0O7AToB#j-

diff --git a/games/NXDoom/data/doom.png b/games/NXDoom/data/doom.png
deleted file mode 100644
index 3f6b37b1d80a722b4dd5189b4b730be48cf27dca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4551
zcmV;&5jgINP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm0013_
z0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H15mZS;
zK~#90?Va0?B-dTXzvonS_jJ#6&+Odx5+@rwHntb+4KbD-C4dxJ!3!u^%Xlp!Tb7(i
zLA>xn1SUMhFNA*}hzB4-<^g0xVksfnjlqGCcw@9)j5j#D%+BoW?#%AY^z`&?`c`$$
zkB7Q+_jGmjWvb`YQ2mu!UAJ?px<0=;=lp)>)M;R>vBnx}tg*%#YplqLsXRFm*!ruV
z{iG?`;}Q~rG~yshAPG|vfu!V&n2=IPNgO1FDT!-L5^)KVMD{+WF)0j598#K65}8tR
zjY&vJ(qz&Uf(TNIhG8D$Z)5~kHl-#^rdLcuZwS&1l6u1gH|qS#m;ZhF{e!%oj_Xr(
z;-7!*b0_9z;{TbLOr9V~5JG~a^^uYQAt9v%NrIFTQnc)I)-4mU_ft!H2@=hHB&nHR
zSRa56<abICDuzVOl&BigUKXgDgsLe3;Jw-S)Kg#n;kE36T+kkI6(<FNnRM*?6Y0ql
z2YzD4z_`+auT2$Gp5CsP|6bMkl^H-Xojj%L+~L7*snifps5-Z<>cm`+Y5)9_tN7ke
zmyj(~R9%KrB{Yutl#X;vOR2gBWd?Bmoh7_>;lEX#J`}18iM3J#i<2>Bg_5!=;KDmg
zs!km`<!h!g15j21Z0_v3%b$K=5igzjWi;vyT)BK5rVw4zNdkVhRmR0z1$W!Yxhee7
zxhJ4$93Q;5jNMAj_uRJ%HJrbm1CiwkBy=5r_TrP6nV!PZ2dl_ti@xc1ss_IMzgbib
z>2CYeXCK48Cy!!nc^$WIZTY6J7y{>)a>!O1005)=&mFmx8346-VK034QDo+)0RRt{
zD%e@~zkwghB=A35yC~Kym;Osn{UYX$&jA1)I`t9Uxw`6`{zN)~m3$RfvsT;V3!l0V
z_uOkaB){-W_ac7j=RMPJ?Hc&E)g1u9BljG^Bd0$G0C?c^{g8!X+wb#|c^}~)u518M
z+bC651+?CwTFVn#ulhf|08ld|YAugVsa$oJ8-1iFBIIk$cu=8GaWBWH)_bN0fLzsZ
zmn*dfgdJZps`Z}mt@O?FGldqQtORJ)<#(50mMSnC4P3syiKU%t*JFu*<((=TqIs9!
z``{MlVgTnHS8r_K^4+rU`PPdKY?K@B`tte?mVbH$@u?*4-p=B!8#&+f`I^A>T+?$Y
zR}Cy(d>>P@Gbm<r_})?$LUy-;nj!H)HXNQ$C=7rkA%DjTgsl~8xU^mxIFHg+9srQr
zHHJ!GDU_{G%^WIyqf$q%VioC^@04JOgNZcmSL&*Ou|lD-0YqG51BkfB1`u(L4Ittg
z8$iT0Hh_q0Yyc70*Z?A~P#8dK?A#}U+E@Bv!s@am(NOWby@@DnV~)Bj6b5j+WOcw0
z0k@0&b;fw52Y{PHq+c&JAZ#nTRT@0~PTjz+-8pr4w*f=S9x1{jWv2T1lWB5pI%B~7
zGZQE_BsO*%JyLq>o^%2+&ahJG-5cno`BV(ENgda7HP;vh(NtW+htmnH6l$oMgBgIv
z7~WVdDPa)`1Bkj*8bBzjfU(p`S$FVL=U#*a;b<m?%!Icc#wRnFJbKa{y5)XLYTH)J
zZNMm5qjNykhsb`R#CeH?F~nw%1A5$gfrJP`2<ycWYQB78HtML{UT%LWrR7BwDI|oH
z(9_e<XBHr(Xgkh1##yec-9)2Yf)oTzkAZ7(Xe<t{#Zciow!txxOaZH}kNlo{Nm&&@
z<X`?b8V!`oWyIrgWV2ZpQY%<z`Pi{zn46nxOD}|gVHob`=FOW(r_<Qn+(f-zZ%f~r
zCtwXMF$@EyX|{bk%ZxE_&S9D+QmK^ZH96ncu3bYmn}ul#BqlP5PfR18m_}k^8u5t?
z;)y9t@Z0$6D}OMq0vt6O4P>)fNGUNjHPr!k5D^j9*4D7Qy9-^{vADPhT_3*Si^XC{
zr_%s{QmKSeY4E`#jyNME*iAtCk6;?5LT3PmVIY@lj@Si&bUKas`T2qKA|l+nbqnQk
z^9DOcplRB``Nd)}OioU=Z7UXwC=?1^Qgj#Rz+_?@9NmY%9fU$<0ABDNrPFCFEG+b$
z7ZG7~b=C6;)ie$B^Ya54fu?Dgn3(X~m(S;s&*%Hji*ttAOdUEmdLKMug~k9((?mX>
z_k`~#lgVIlaj|D!M1<w#WfY6u$M<WRh9gIg^koE`b0iW8-(zyQ9Cmhgdgi5R9LE=8
zi0R=77KOq9Ow&Z6Q1FHCD3i(H=+UEH_Y)DWU%%d0vCKI~CX)f@-ERY946#_OXI=oX
zy}ga??d`7nHBG~ZKXe4~cz8m^$_>CYO%#j8zTi8Wo}R|BW5+tS6A@NcRtBn*HBH0R
z)Kpg^7__ahwY7z8w)0hgUDt5`$3BAOM1RI~P*Q3DLI{-0<$>Tknwgow@#Dwc^<m&U
z;+!LuN`bY!p+Q7#>w{=>a}%4Jo9?=%X*hN26jCYgHiSwk3j_%vu)DiE6nsZBGc#^L
zXLWVex6bb+&N-6FB&yY_>&Nd$ckkYX5CWWYJpAy(NG6l}&T|w}W&rZ-zeG|`K#FE`
z&xzoHtaVl|Ll)NT?Qo-fAOQ9(FBt-A$vN;u25Gx5nFO^(@|-DRrY_zF8iqYxj593_
zL7H~p#uPAl45jG>m=gAsGUQH8)0$VTR6rt^v!i|lDTJGsBs<Ta5lXXjFxJ+rAQRWY
zpn(_%=Q_YNFldlWT|umFf{34d102kSNfI_xYFj62-M9BxYdL0rK-94hUDk>A?jv`7
zzIC7Hv3vKC=dmOKY;0M-0SrXUwqItiTgwVx4p!F&AWxv=3D^%lTG9pqpZws<0pZ&v
zmmhrVqfYAH4Rktf4ikLZyBrLBQaFN0odHODB-I#xG)n-I&O+4TGmt_PP}lq%Kl#mN
zg>!@`Yy%KLYz*JtuSyE1h#5cmt;eg9+BSf77a|WonpJ?bzV-`WFdc9G#>=?$_-~?=
znzaK*WJeasnR^^W?b~3FE41>lmYHcHozLO;+I2koUq8m9@BRp}Mt$V)Rh9tCOt1dR
zL&S;g`^o?IbFbh>zxuoli28z09`IYYJ9*7)Z{Ty^`YSy7_Jt9`XE2HI(8}d#jR_2*
z*ssS^_>WINHxl?H3AyP7eDkG0#^3(#AHrn%NZ?CSTLma~1F^3<zce`uB0duM&25Aq
zf9edr`RrF9B^wF+Xc|BO4Zhi}b!2jPM+)D`>z!Zw3@&`)ETjW9K={#g0|RL7Ga+&A
z?_LEn%#p%(w*TOn=W&OQLlO@Zek4nPpj^ENue^;H{^n1>40ELLL4^Fw4Bq|tC$ZI-
zg9Hx@ek2VbNI(DMm)^vSfBjX!eobo>@U8v8wMR~)N=eHIT-f`AuhI<+M<j3`@L~J?
zr!T#USgkrz_#_D%Cr*F>RAmBLW7aMS_6I+b-N9}oFaY@NM&u7azFWrer4<mY{X28>
z*jZTU3qDCgIg_!D0Z@?%NMi=Gx-}4WSokVS0JV`o>kb40zZH_-lfSTf8|VJ~>vjSw
z?VXb!#kYR%_mNv%^o0*1m|U~r0t|$jjAPrF#*vscAa!u~45ZKmly?UQ8QUk(U$Nf`
zp9na%asy|-@fUzSNVFS#Ymh0q@Ey=qieuZzba)5-!H=jH5H$Q|osNOvJIlvbZeV(2
z(-*$8y%j#$%QYEC&YW_+gF)b{Yy*VQ4IB=BGp^91!6&E#zO$U($@heRX6ySM@Ie4E
zLX~3JF{dC}y@NjBN7D-k8a|=#*1i{f5Uk?e2ma?b-oVRGo%e+AK&(m~d2`Y#3HpQ|
z(JCNl_?@6Vw{?N<K=6bAr8DO(BkKa+$-YK9@<y^5EP_A$NE*N>26Ob~=L>kkC$Qe|
zoj<4sy27`2p#~iVk%V+%cZW|3>j1S?K!EUF1LzUt0mvIZ?Ca<O-)`Oc!grQylA~Zw
zfWUp>N3sM696q5Z{AND^I^bhZ6+i@>^@1;`FZfn<!%!y;1rfK5z^4aMl|s`7*e`rH
zU0>ndPWS}4FMm4lzvuxUvVZu*00N;-90fDpa?WvIK=APUc=G+=J28Tu@THZiU-;HG
zh6ZsIWXvuJ+OI)IF%A$s{Jo7pFZfO*uM@uY-3NTfRkVLbKk%L78d5`1=xyGC)1#<L
z;dnPN0QheGtapd+KD_`s-~)J;zJt%4x#kNWf`)=`K_)bafuxQU7cC`$x=KJ@6%gQ)
z?~L2;w@cRxJ_F(L2YbVZJ)7t-@EyZz5Kt1D<s!QK)kt|25EOjt(;Gh7CC^^?R%z55
zK1tdad;)=p!61%Z$=x`CDuv+1kYM0jfP2Ar0CmDAFl!o@9`M_}fZ^af#l8U!l0clP
zn<GT&1QCwk9t8ZoUVtZjvgi3hCw#Il$REDlkp%1?KA7bS8UTdCf>_~*AnOJO1s~Eb
z0es-Q-|+6z?G3-Btq}lx*vA@?bOYU|76%63uRq`M1O4IKp8(+l49wY}Kx*B<0O7X+
z^n?Fc`LZW`VgzSAfggMl6exTUDV-)R9ByC$@LlLW@Xv0%f#*K)mN$IoqI}^?INib4
z;roYAjJu6W6;kg81_j^k(d!QXi@o~u`+)EKv0-rVNvQ#-bpwNhPu=_TpV|60UOsaH
z5Y15VUif^1keKZQz6csVvvX3T(6#{vh7Wkc|DDZ$!b?xT*^KZJJmH^uwT{Gs=mFnu
zCm=xh1nZ9z6-k{N7&Lt6=C;6pe(QC-@bp`I!n@w^(+~6mpR98uK=@!FC%B+M%Bz5&
z;I|IxA_C5B{-X!{CO}{a_--UHNcaSmO)=#L5Ey(y8~hia{?{%YJ63T!9DE6DX6NAG
zJL3aXN$vaqLBhAc{oz}g3=f~&&Y+;+TmLj3!A4-<@WJqf!s~eE>5INyx>}rY>TAQp
zx2o%4;YW5rNRaRez}a7a+iK+b^y*E1v>#Wm8+?LM<iW#N=mmtJ3J3;15ktTI`NP78
zAgo`U3=}>wYmzHfQXC2n4!-3Dj28aZdlR_vFPZ;0@ByV&00FYIJ9t0y@Hu||sNlc<
z+5)5u8a`9n22kD?5EOg@vt#)qgfB(`pF^b|7@AOU5HoOE@No#?N3aA48a@Gs^T{U$
zl?Ac-Dj+EMV22bwQ`i%r+6@d4K7k!t`082!A($pEDEN|K!^a_m&y-q#+P8xPgm1+G
z4%?G&=c%p@sJ1U4Q20(8!0`eO3w*%ZuSn{=fPmpQy^6yJKbq6T1q|OR0WdQ7(uKWG
z_~Zp&T_ZqY2@ouNrwSMqe2aSk@L4DP=vDy%!Y2S^h8RBl;773v2pT@IaKrZ~_8s_<
z91<2ZeAf#I8~iSHek**6YzYt`d;-D=->2AbYriOxy4FX)@CgjkIGpe!X#hdPCt|29
z^Fs+=MzakNEPMj6{`v%rJZpo$aVZ%x_^boI$`U|bDA;Wn1p}YJP~X&X_3JZ8{z?OS
zQlfApj?MQ|_VHnX@AW&?NudD%{x@YX_|EZWnWON-6pE6=l+J{VVTNyCpCW~-FJQm$
zn++<$BqMM}hXB5vUXeo67Z4PD0^rQOJIN(<i?wymkiw6y7ce6D&3cs~$p{(?H++?C
z0Of(8QNeeP2Y@6aaE8#rk7x-ndic$o%a8(rvHiiP5y6jS8=yeqK;X9?Kf&xDJS2R#
z!4@$5I;$P%y>FE=1Gp2fZyh9jr<hHEgNFz{0jQ^THV^dXw@8@*lrr?>ind!jDEO`J
zR-6Hhg#&&mxm9KJ<tGmE-nU9!<zwr$$L{+r-Ozs9l*|oEwZAA~-KeIxwV(DL+d1K)
zw9|X$D>($LDLS3)44n2JM=k4`eOBonz&l>*XdT_t+~*ihGgHR6$zsNLzH;T#cQMvj
lV~sV|SYwSf)>sFr{{x~w9vdc(ZGHd%002ovPDHLkV1m}tje-CG

diff --git a/games/NXDoom/data/heretic.ico b/games/NXDoom/data/heretic.ico
deleted file mode 100644
index 90ddf8582bcb7e4c222b130d63d23a1117105256..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44563
zcmeHw2|U!__xGT(M=7F2$-ZVC>x^~AzVCa;mYs?idqkF^R1}fYN~;zz(Y_MVA~O>0
z8EKg^&3*1?#8<xc&9C3%>G?m;*Xwo7+|P3FIq$ojd+s@BP$(wUEEMv`gc3y=OQKLK
z;dfr%(R|Ph6zU+nwqU_%KARnd;*&$6L`6sQHSoDoH55uo>04eLg)%fjp|IG|yp#b7
z^(qvF+F)aa<K__JfJJkg;*IQ(yGUX~s`iMkfpto9nHuRktbO=qr|Y3*T}kCl_V*rt
z`uI2yy)etr?nxw`y*TWCC7<h2LAOowuN+G!T5lLGM5pjwQMBciOerc^wz>k9%48Vz
zMDDgZS@aa@(b4&={3{-8mXqCVYP(cCr-Ms#Wc9P#JI|5c9_gnI+c-YH_v%e`!v1x)
zdA6N-e6lR&r9*O)R-9Aau_^yu-`#P7Ps#G@jS_DK+C3gEK<Rkbe1+qPmaJJ$kht51
z3S*T1iJ-FQ>l!?B*`)M0-&vZ?mKK!9CNyV;QKjw>K|bofnQHc3H=`wUbFvK_=B}Q5
z#9*0G2Jf6|<51Br2VX6@GQ_cTZf8rUzSPp)TWy-9@~$|iN=b5^<YTiE-Mx@4zw;sc
ziPLU<8I@%=p_05F@(-CL*^Cyia{PJ+JaX<z=4@?mTpxVRg@yVMGxFRT6W4px`qq|b
zTbE|2nWg8G^Rf-FoEJyL%(Gps2XVZ@!hA{hhBWj1Qm+c5mb&%T+4)|1B>o_OJ-T~Y
zg9)vT(1tCWJxBl5(+0FvTad6O-<6J8%-pG+)TLDY_Zn;$y3RH#wx)@2H0Fa1yfcLK
zA8T=?TPMET!rG+r=GC_KWx<j@LSMdMz<ouXPu-t^dXrL<>YEc51{|4H8yoK7Wah=+
z)&Dx6nE3ql9Sd#w_QI&99Po8RNe{TW?)KNscKNQ=A~Vgl$6ZS@mwGZRn>={tIDAgJ
zXlv9gif3Ra{kVH%-nsCDJ$J7*7fE(Bm9Ey3knh8~xOpZ<Jq+G<VAYa}gAF!%I&V}h
z+%h34cV)Ji4<CMXf{o{t>~ouX2j;t8><f}M$UM8dCFO3_T%{w4p|vwMzU+tDJ+iEA
zA5JgalA`K3H|L1AQFm*r7dzg=Rw~M^z&*f6ls9Mz?-I6Z_<o4+V0(sJWe!%@v6w&i
zjn(ta=oJsUl!FBWQTcsFZ~U2)-+ke3eE-F==ghec&obMscHEoMFXbY0_Rvj%_*FeK
zv0|5pe7a|{Eb2(4w+}Wp%SMp4ueLk1cbR<MtIXF4OSJDXKXcA$x4P@#?;(sLCVxKf
zEKhTadlS#JX7%}CNk19o+o(p`Kv?6KH;>w_*5BJ0OyYcSWc_8wO+taF<d2tc1xsEC
zF^MC)vY<bnUA-psp=sR?+xXq;w^17p&gib~IQuqcKJ6w?Q$b+4j`2ymzFRjw-Pb<E
z&6^My?|W6dK*r<ofkpAJdAzh*3J8?*H|OVepFV%#gLZ*QzIQH#+}gMB(?|B$!6?O0
zPGkB79EP~P$b8k{BFf?Vx8zrCSFXQa#}pC1s4gn<{ke}MTB}MT<*p_T8`J+%SN+s%
zTt23CN2#`B&qMU{ha5tS2bbFm2bA@FeX4Ts$;_RlG{T2KO!JH3eJ@FdisXl(5q-i=
zDjP;PHBM1!C*O(}HVxkur$6-myx8GxgtyPv$B$O^G?bgtczARPUqjdI&)k`+cV6d;
zBIv%d&0Vgm-tp7yGxUe<&m&{e%<_p}Zp9s0wVL${iPphGc|Ef0P;!@B%<u=<Md5D(
zHnWo4NYCm?39V7(b~$&t@2ljn_jxg${kjo!W+|v&;3042C`<ZiurjLYeFwYM)^h@9
z2~SzQgNQs8<eQfyrHYRQS8AQKdD3Eic=cnjp`6+yL1h{!5kL=Jd|>fJ5uGE_6no$m
zU4Rs`Igr#<M#}G_P-CnE=VFMgw-ttNZiv2;WU@)*h7QYfyPNCi*NTMeOPu*ta^0oT
z^{QP_q-vEL^PZUt-?qIeUsAwvHbS>irz?*1!d_Om{*Gc`39IbzO#a;PD@lr8I);*5
z&-e$TlovHdHJUHphIYD+W~s<!di`cK0rN?ws*7pQNl$LA2+X0~=Nfj**z)>eO}&hM
zSJJ)o+qGKyYUgw)2E9tpX&lEM^m}3`NwM1=mkGOjzD-S~Eet|=zQ5dmuH&P-1=gqU
z%j26*PB+9~eSH45Qs(Zr3%YK95epH#r@wYLWy_;So}awqM^=`yXX+CN4u81$j%*#F
z^U{suT=cr4^LZcNhk4w1yZF%Hx`y*ng|2JkOQH^=9zV_6v8M5h{B6&K&6y_y(stY#
zI2<>7@tb3w3&YBYsUpz<!-a~Zhi~J%)7K1=os+D}FqzT9AJtFA$HwerQM|Zt_gn?u
zUb<JFq6g`vEA#yaha>wzQf^F%f>OQ9-c!j}FP~iJAfxv2eA_OfyJLCR;NbA(gu&|#
zrKHn0U*tY>O<2XvuIj!<<k$##j`m4WL6T~5i0{=8hh@A^9}VyiOV)5@!JD!!SwlM8
zbK(|HrghSX&Wm^J;+`?Nuh|j0AKdBBN*w8ZZt45=s`jBs*sClb9SL)$mPdqJEF&CN
zd*vK{oKStHexNq_&Fqmz;kqp+U(2R!*>d67ET4dYx<gDZu7Yx*C?}^`H-x7DGOzg>
zS5>)ft@G}l?>xWFMd<8BKC2+*9xs*hNBbMDh=rn#E`GhnD=F}N!M#<-TaO6Xys2A}
z&nv%j`6iv`(T6|rNb-S%lC`TFQp^e;U&lIeyRu||*m;;kV@;{^8+KzVE$_{Si;B$U
z=Ncb7&5r-jvshb9!QyUhV{~9a%hofW)`T+EcHdeV&{OrEOng=<fAAw4<w{q*<lLqW
z%Hf(Pnuc}-u%DG%ZXY=>xtFGFt#Ie)v&@Es<N{V!x>5U@A*1a)WnLA}r4%9@sRIe0
zKD@rNyMObItlNq)(Yr5R-hIdU?d!<r)^A@NoR=8UkX9=Y<mHVaUk+C{uM)0KtD<^$
z-Ev#pU6Y&H1Cc*vp^6&e_=gtQcwlG-^`or!)`We^)sfEzqH@HG`zmJLoP9-}d|Clz
zTH&^berCvd&3%av$tbf5m+a<{uuta6_uQ)D=6Su-;A;7@=CIoC*==sEm2)<<@2P6c
zuZ+_zixt|Oe74aW$_?a^#aXOb`>APrsV6$Kx1Kt24^-cEk>lU4SR$=hJZHl@lQow1
zujpvYYbRL>7KcZJp7SOiyG^87ugLeFHC|Mo{p$9m<Xm((d;iu*M<$%~BBrhl`K6@-
zgcn8Ns+0sryA^TI2f9GA&r>C%jJ!PV>;1|{UL8Ag#uW@5n0@8cmsNdNguk*#&CAsp
z>5jo&K73Mwt3`r%mvr!+Onvy{C$AsacZ8@d)=ONlvu4G*m@=uI`7BWh?XA+1GV`?d
zhh^Grs@}3Ce<*IGJGi_Ledy33qtD{aPoAv6@l}djo<HSy(6QTYPIX*I;DdWo{ZIG@
zUILEHcn^)wdZhbX7xmq?k31+f_)e9u*?vpX%mp?}n_IGYh8k)fy=-n~F3|nBz|0a{
z=pE6kk04$CRCU|@;K74sI`PpDuQ3zjJe{1KZOwKUuZV~!NKa31W4Vo;y$(&EPi%O5
zxf3<3FuM*inT2VCCGE4?x#Ix)41MBZ_xhI<NjF#5-isUf?9ByKTgp3c-@e^pNpxhL
z*FQ_5nWq!=#Yuz8Cod-#`Q`nK{oAm-GrCVlRfRs>8_b;FS9jt>hnn}P`uYctN^iQP
zJIycS7{0A*ktuSB>3ww-*;<vGkCIgWs;gFH`>Fo^07#+aR)y?cwDV-^6X(z0qSImj
zb&3s@+p6wcDJH+tx)YUOm`!=!R&}Z}PD5TnA$s8E_6^%o21h*3t$u@tWXQ`OJ$6j_
zW32xBr-~&vlAg6x;R+<2=5CW+FITc=xiFz_R;&He=FUzh5=C-H20OL!&b@=qBkM73
z%Pd4wNl~*#;={ti@*d9^FmHZnH<L4YSt!bL+0s=J5j<SUm6t9V-`=IG&5zK$rYAnj
z?XY^s=iJ;}IYq_5T?*Oc^73+#muHLacD{Z4*5$6#F8eYM&N_;QKX*mCQO3@lJ9qb5
ztIp=5=oH90AK{`s9V|XoU0r?i?#znfN(Y&|*z=|;uWsMA+8gZdA{F_iIMnM-y%>Dg
z*!4nrP;l^um}j>GRxl$OU*FVAmo8Z}UuUKpxt0>27;K2y_e`E9?9VM)eW=&^#EBCZ
z`wB36a~JJ;7WMgE|L)wcj~x_BTwPoiNOM)s%QRThzS-*Tqv+7k&^?h``JZVfhi?~r
zzE7>_*eqUiqx+8^i?gL2&A{ZaZ{(yK^+#`yKBLodrY{B4RwGf@&_J{ouyUoYyDEfg
z;|Yt1h*(9D6uLZP^9pbpHYWyyDP})C<Wm!6YP6O@zCe_K+lGtl$_d@g$r&3pP;-2f
zlapV=9_8gVK>IwLw4GRU@@slXczFKj&z~C$${n&K=k(IQj_4%3uc__p>U4_#_@rHB
zxt?EVzzHS`A-d6x8#i=@F7oLnR}{fU>+W6@6BEOicU(kV0`}eq!>3Q4R8#Ow=xiqK
z+o*<`(@Q4%JfTRw3}9|g!`SY3fH22(mn_cF4&K1_>FwiJA<Pg19Y7mqS%Xz}H5uqQ
z0ns~ltT~fYU<d3En1g#8eI4carTKHi9u-~F+$%n(_wD0zdGWJX96oX+`o&#wPLQG;
zZooUImqICwwBzg%-hFXKXIIw{>>s40HE`(2@aJZ;>GO63F5WRyT%xep2zK%Kf$f2-
zjwZ7SmiToY@hpOzpQ>E->ZZzvrnz75g<S~=IVsfG^<1U(sE^z&kv)BSHdcNH%E3AN
z+TX9pdvTmsAK&=ui>h0y$lMvekLG#i?Qb%OU0~UDud#Odt&(gqzvsY!8QM&3uK?eU
zC%JnU=ib?%%zd~jakEtKhv4g-gAwF=4O{o$5^B#9w_jJiPdD`J>^ZSIm+n7&C?mO8
zdrtoj-YeV&szcco*vdOKr(;Dqs>^}|mp(~0OC>hZoiP#f_%3fj(OdTEWy)MEk(ZV$
zx-*oVcjv?cW4|m_eAtr)`r*YZIq1u1^Ju~?B`4OL*duxJxHQdSsn&YZ;D@~}cU~qG
zT)$)0RXV%r#)r3h3B+3mU)}05*E)9M&T6IJ*o611iX$bY`@FV2Bpl+WcQ=!U5=?RG
zDB5}`l%eEkkB@XkQY}v~4|5TlBYGoDtv^-eH*HiwaVBTII!RfBzRm^r6#N9v<QuiS
zTWkle>af&N+^Odl1yph`fH&x~d)=v}cf&VtR7t@jk4aK*#h_TYk;3XJlFF^9I!a*t
zd0c;BK3SuU`6ev5DYL0xOKWFD4$R2W`00DW#!L||)s&Tm$V(comj$s)IYA+02yDBc
z80HSiQALejAT=k;`Ij-dP_r6(VyXOeKe4`1vh^C}qpSQY;2qYp@XnP*1eVVl5oSu8
z)-Js$m?4rO;N3&cY@%l0Yj->$rCO1>x5*A1dHC@KddK@SjkRlIkKfb)WYtIY1M9p7
z-xWFT`rKy8uh?N@ypzLO?MZmf@fabuJNv`t-Cq}%`dCqZ&f`?q43Z9~(rr}A_6+YC
zUSBq>OQc?TYm7RH?U-{!jA-7d%^c``zwhX?PoKLb6_1_sdcF2M=QABI+C}-uY62m)
z?10E2KNd%3j?B5HN!B3jHDBrz`^BNw33XDh>AlA?lTG}4WQiM_Ydv~LFlTpZ(q2#^
zdvz5fR-f;Y^nMtU)+FDczl$dPNt)lgr^Wp66`$VnBd`TrGemrRmt1^f^Yk_c-Je8r
zYyFV$%qjh7bM4GMQq*dpT_QIZ(Ig(GM9o6MFQ}1o3hq4Sewp5!I%nP9CY*nyF>r;W
zX;uSwN#vc~10!o2Nr^l{(#I&)_yIv8S95s=ctBda!|j%^2u)+)%$Lu6J8K0_f0hh=
z-LpevAx+=$C>_K9GM@ZdZ<l}zb)Qt94AaaF?o2B=2{Vo~oxhn3E`1uh`RO&~D~3>R
zAboQNJ#P*F>7i=1w~0xD?016??n56SAJk0zT2fB#`1B@bpyixgWBm?xn!e=_<<pJV
z$yG*mFZQV9?iduq?ti}d`sMu3r2Ck~RLj@A{$A{;m2>IK#I<?M8$O<Ce;py9yzX6X
z)0wMpoShSz%lF_;tmwNJpic6*`uf^ngyyQ`@J4R>GFcr`%W%t!mWah*mJpGvg@j+&
zallG~5=yK^d**%(rnYx2blPb_?wULQtG#CX(9S0QQtUoj#G-)SJ8rO>E+(_?c9ZsJ
zZrXYu^<0F&+niIxPID90ad@BBba)wTlWnj~bcl-BH?6m35SVB=+Pt)jdpFIb39-qX
z@Q4v(I{X?=9h<Q?Z2K}uMj}c_=JKu-p<k9IKBt7*QXK<DshQOIDQ&%7%v$+Cidyt^
z*{$?Tl{fr*HSREPlx2F#L`Vs7XZJx<PhxGN7R(@|)Kw~{dfQ~ozo$XlphLPc?4H2o
zMpY?^npMb3oq6Hl>Fq=jN9F^mWZbfZnLe@9lPP+uj?B>Epg(oNP=?Zo%@`9wDu>bt
zMT~qemt1wBb|&orB-x-tQk0Ln!Hh4x+4{BME|E0s(bnp6?0QOR5X)u36jg$|3MU5g
zcx?v3^1U9W^#k)4O3g|lom}t|Wf$KWt*F(#`wREnc|nx(&mAjxOR+NbrB=r&JPLhW
zqHS_5gQuGx^4(iS?xLiYpHJ_U(Ua&A+2{H4nYqlO)>MPsbQ6<wkx0c1JQLg9&+S7;
zPFyJOSiCl>;DU*%4;LjjUfpL8(@kZX6t%bf-0khpW}B?{=FCppV!q|*`!|EE1bLe;
zOUnCIc6<e=Q-ai#XqA;sjUsvea`SfXZI`39+&FDUbY1T~Lm{!tY9*y0#=*OZBKZtm
zV$dzn45f?N6y|bKwnxLK=h(d*_JIsD!Dg?7!z|<8mGgeA$;T{rhQ?A%``w`QbBUnH
z#{SZeRgPA570<HGk;-&xa7(^8><}IiU(ayQ#>i;h9%e~9wLSCU@TsGBnn|XY1&MMk
zip=#S7vH{+&-X8gc*L=jr1lP8Y^C5dMX3Zl?+kwW9Dg5i^6O?E(cP5HWS}bGO}IFM
zq4OU0Uq=19W5u8o6DfDchwfu_loO;m^z?-@Y3a`s9n+rhEh&aiwAl21y|CzlK<*0*
z5kb0tlSoiTp}~b)D8le-q7KV8Uux0&8M|86=&j2M)H}Apee3StCi(;8p07ItnkzQZ
z`_1(fY3+yet?7@-y`GZIj<$)~@-7~Em34@4LhF5zcNY;<*$s1FWurf}=FMO;xDeNV
zREdrDVZ#cpqWD_W2cF~X$znC9wUt^f0CJw@k;Jota2*T3MBhu(Z`E5x`^Y>J!Jm~b
z(wZfIrhGZ=+R;>z4tLh|sU!!u=3o`bS*Nurg@d$LwYN2v*c6z3B0L+6J<nRZWqrCg
zwyXPcW*$3T>S&HAn;+kTxdfIZBGEY|kyw!89OdG3nxpAiazcrD@|raj98LR@2^vKl
zO?#8FhAwRsq#Nn;rpS=b-X>BOUTumOPiY`38u7(HJ$$Mu%zMj*3+0OzQkUr0v<s3X
zX#=isvMdy!&e`9@{FI-7ec8Urau)rmJ()FwaMr4#pSHJQFt%7w`3~wTD-D~q{PX8D
zZ%%yNJJ^X>eXCZ~y?_r`KSr|zlrcS>NnmO))aaswGI?&FO>2`h<_&31c!iCC%P$ig
z3W^jlUI&N9Ue=le`!AGBDW_JvP=)gHup1LBS`<zPK~xQTVt$MJr7zpSQ}5nAD?e0+
z;9S-;p>cJBw?q%UddBwlbKw)#^wi$2%E&%7roA(hH-FL>J#E&jWyM3ibsScLMQvfB
zX2uE=$=39j38^E=F5#w<aykp^XomOld*3wKHLu&(I?L#DpPC2zto7b3RsmlqlD_K+
zs>?ULI<U9U4YPe2i#O9dCJeLwJ>j$WlV6I>&)L^J;Jgd{9yV)7b;li>eQMQBueoP7
z@fW(y?TPKRuDqv@U7#`Nl-I!x{5~G+DEM+p@^dcufK5Q}-KP5ky&@%=r){xa^U`b*
zmcIUS+dEMUn-j&HlQ!Zoqv<BMvb;;o`OE{&hlu5gt@^4ZDX+9Fmq@b+6VWU|793iS
zD7kF<j@&chP~4Jvh48wNFUg52|J6V1UP@NtyRLKm&T#!f*>bQ~x#cGm=(F^)vT%#u
zeci&tdm?Vej>iw_`6>%o4!nfR;Wc&PCJuCdd_?mGu7-DsL>}Hf-b~SK$sKco)O)R)
zxmogNSI=qkRX#GKHOezZ5U%^pPv?v7gHttn*A7>zIDNsaC27rJ?007fx-e&}zM`ay
zrY?Pd+`W3uT}p1PXjvGw>Z`$mkQ1GKp!e3cjjC{EC@*^zc-m}mS#MX0!?l^TwigHJ
zGCrHR5@%*78)&A8RPH4{S+Px!b|Jr|SA(OYN4jFo(wHbG)wh>;pPgfIY1>Y$ommzV
zz56&%^6>V7t5BYcX2C3-;mBIj*2^Q4v-3`|Ce`j}qmi@NYJo;CBZ2^j$VaKfhV{Gr
zmQmFzUgo9^FcI_xgO~;cvH4_yN+$hFb9z5%EK(<gZ6Y_C3mx9OYK~|MIaj=Sa9$*x
zFjI4X7Mxq>g}~u(E0Mm?g|$$Ux;sFJsANq~x^%f#L6|%F%g9+nYUuFuBsEo<P@!2P
zS)*<aGSP6*UWkxUu!DD$ZR+`4PdI2%*Vf&CQd&bxk2*tL_~|Dz!<Jg(-3P3~$%Dlj
z5>U$AcDbmD@WqG1X|VP=7kBcTQ|A3A=d!evN4|GsKhrmRX0qQRtX4#z070c3F5cM1
zIbT0eX2xED%g&B3vzzQftemw(@>9HRc+-ZTW$q>mFgcn(JDi!!j|@b1Ld9~?><f=R
zhn9HST?;Zb%-Z-uX<hBvm#|k#D5ubfit_zxD*n5ep0W{`nsZd<!3A4HOY8zq#bUJK
zg<A3OSvT2fZ9|5%vS_%5`Mjp=OHL7ME?_(RXl+Urxi<BP8mMH=^e)Dt9xhx&kgqtP
znO45_@p{-m+xj`0oT#Zab0f3gp7*_!x%YkSwT%S+H#G;~piObVAwZkOkK$5Ay&HOJ
zP0u(S!~CA9$z+ZbBypX>`<a*uo}H<^1v{A9D{iUNYQjIqHX!WuU-K5Jbr6O%84VAq
zXwlLtLeg7mO$%mjOQKrJ(bH3B6$W*d)2?-jzF>vZGqbO805c}V;T{prMD<%msFtgk
zP=?&1_S9GV0(qL)Z0uQDYJ-bWZbuSNXKEb`@u6m#2xG%xQ_h8B?yBKYOqhb!z4>b^
zhG=24l$OziYPe=&gce!%v(mR7x7Y-y%d8d2G1r)zU#3v_?g^`U4%bn{YG8)*w3=kV
zDSo=^7D!S03e0{#-q=gRYy^2*fhP%4Vnm*~=b2kEw2DaC{lnKdX{*iZ{AwF6@C-ez
z;6h<IOi_#G6XtbvU@2lR_)}gqdz0F)6p@HBs9`SD)%i5G=Q%38G&k%4nT1rQed-Hn
zZL(OIw_6)(ak{CJ$zS_yFA)L;LQ~>r6{=7(JLh7P`PNFrp{kk-m>mVV2-#++`1p4k
zRw}hzKHbGWAIeu-k+W*VQ<%uLB`D<-5#s*+P--H6csKks;*7M(HDsvG#IV`fvOpoJ
zMyrO4oE2nqN0gG@Y#L|0>wQtv;*JW+!qZwcskNxjX(D#AGd{34&Fb(~r*NjVD=&C1
zMcq`>(Hh%!e0K6Hf+5n=xCl%&v$f>6rBT^+WN6vsJ(tDavtY2hCC<ovEM>zi_{xFR
zBeTZp95~`lt$MK5L4uN=!{vjb&WSv*U+GOz^2z`&cF{lzOPfy_6S-?ib~!f<m2cgB
zf>&hi3|e;c{!Q9cM=d@sq<J)`OnYjBFW3z}{}6?$YAIipr}gnYE9PQu8XOsqc!<3H
z+=NX*Rw;VD1z%7XEmQniFf}!Hwbs-s=ahk0X^V)8r)2BqT<4=<y9JU{GPPdqOgWY+
zQeoqm)WTyscp>pZ#FJqXmgTB2E#-jb*A^Zd+wIMYtwCLbECi$81kDT*mIv;f-p#@o
z9Y%d^COw~tUr9+Puf3~5LxtOMT;rytsn^bKg#`%Gm}^euW6yWJw0Bg_6v;3UKjQqH
zg)n20VjyMVeP$FK_dR6RRNfP{U(%Yq*tadA@qUnfzL1U*Drnca5YeNJtld%?6iHI(
zSEQYmaZ?@;6>GjwdaB5*c5wP*Bd}ayO4&WDP@BrM|9z8LZOHcgbq>@ei%BF_+R|(2
z6rJXXo=~I|9CeP{%7HhtoA@hcxi<4eb@k|xaq}{Znfh4?DsT`kyAHdc!$>+@GQ}GY
z3&O)1r*=VoXE@X^5u3|71%pv%(nSh)yyPUv%g8YKvtgFzIisGlV}@k0bh7gaQgxpq
z6ah*oEOv2U(!7h_Hy_*=>rY)0(wW=%X}!o3J@`7wh{g>Ujb<KO6^|zKSnU@_h=Rld
z=6#irdA+%XI&iQ2>C(LIfhf%kkrXpv9((Y>^?8J4iyxOXb}LW}Pe}MQk|Vgg7eU$T
zOom9M8ndPloSQ-(H1q5^%M2?qm0^mR)%0@Pt1DjXZ?hFEQfCG?Ft;uw91h<2I3mY)
zEmdFW(ibr}EUwiF4kZ#J7Sm^KMZIIgT<l{)GZUDYZM58}sX^;~3&eWiNVywaZcKf_
z)}-9ZjBJ9MdG<5u$7W%KI9{K)h}NQ^Djh=hlD=HtI@qS(RT@CGpHHx~CJd9|>WqRN
zhppye8>I`!+-Z1oHX$gy=hZCC#W-FS&Sb4srv2IR^HY2(nV#|zmZ+!bZG9dt%vv~~
zCJHNf+>5JpN?HGorD;O|3gTHnF>FAyp6~6t>%p{5oK|STad#mBA18EOkk*N^u$kS<
z8X0<f6NQu9c^UTc%N{_N9AUw_RfSruCZXc*uj11K*`3vR4fVXisodVtFV#C^>kuk7
zLxkzd9a-AIJ(dN|%vZ%|AM8h5s=E$%G5K>Q`z!2!VqY?V-Peh?fy>{}=ZFfXR_fOd
zjhi~OqYfuEX!zmSZrFp!U*2bkq#Ec5;@^@r277t71)-ku(M=+VJqO=Q^nE<O-rJ!;
z%ceFTJ2#Hy6y+HX?mN7CaoFnhGuEVuRGJZ^h$5MfqeD1pylT#!_5B<KZIKlH>msz)
z1#`Q(3Cnh!uh%>}bZz5|CWGFD1ClgTMWRl#;w_Dy1%g4S&lw_iYBW!Bfecf-JyQTH
zCgs2jf822J{xB=YX!fRK!%W+DH#93=oS&#m#tE@R9b51Hymd~EVQ>Yx$eYUj9)Y&)
zb+e*yZ<aqkd<}KUTXys;s=m}(`F+N$8Z!qShB=ePyl-yWG)w6mMPp_=zw_<_@w2av
ze_F|f+4GQkj#wa7+~u-D+nM6G7j}*ZnN1@_m`&{u`D$m<za%F5rC@TrKV*p9jbYkT
z%u3x7HdD#yI0r_zS0KoN5|`@zVy$Q6av~3hWVXbt7n;H@mU1-B&8f498!uRUQw(3u
zuVA4SHh}soh5a(;btPwRTH9H1s{I{P6O=!9G2NU;!wHNm)PV=_658%tpN8iy=@UQu
zxZ`QXPPZ8^5A*WVJ&<);m^zaDu1nw<dc}sf2GwVzO4Vqs0jY(>OVGPqs4>eR0C!LH
zioCv7o){6nK2$MB<1m}*ENamjnpYB&N0a8`!=F_jQAz`6LcM|<@eYw<sPh0PKwYxF
zXy`&ghz0sCJN>zu5yaYn>mmuya#fN>+*CEhp{C|Ut(u$imIIU0UM)gA)Ka_Lp3(5E
zHf}pgKfB$k*g9K!9kuE$@p0dpL>u3AdhXOfXZVC$d>UrM!8Wcgu5z|{J65s?-I@FN
z+A(k8SE5?6%*QBqPHj{}#^AMv#5WWT)FKfYZ#{EtDQ8_ZpG^<BJ`S~Bs+J-qza>(Y
zoaL`aAG)9zyM5lW4;(f;Y9){hWYfC~qHl3pUxn7jx3+;|I4pA^n7XOs01>JbAzpad
z2uk|J<MdN4Jh##_FEe3IbTF}n4Y^Z?#r?REVd%j8d<LdcXh2DVYD@ldcMf4rW}o?y
zUX8X{P!Mit<{2tW*41Lp<0AwKMi!@uY>r~)r|ZCF_Noevd0xWJn+It_P{6w0Wyy-a
zVMBg;+M_vw+>pYcE34B~e}_49co-xrRNOyQ5qp&K%mS_rdmzWn-K(GFW5bQ59IkL;
zjI879Wx^<8Id{W@dhcu>t+_67Va~e4lnW0_Ur;WyB)<#p-&r9}Fplz8NmhKzT4qSK
zJc;!8I~2|~S>h#<b8%Odu1rc%EoUIGu!cI9cJG5nKW@#s%UroFc|kP2V0L68QvZNF
zk3vWCp7?ak0~Z3@ov(YzXU^)O0_`ZWGiNlPQFKO+Y~eVI_0z2DZi(16ADKs96*YaH
zr!Q?R9c$wz!O^tm<3XGJ`Lu!Fh&@bCMd(Im(q(Dp!wLLFshGi&U-{{Hs6B{E#XP8<
zhd#n*7|<(1Yuv_(SrCK@?iZ#n6Rn<ifLyq7#xV*HdsC{F&mpEo0@R{GGwJTl?WpEv
zj1q0uyNJC^@0pLC(UKRTXyiN0%NdeCN%?eI@i7@uFR7$drL59chKr}&X=B!-Q0F^R
z7&XhL>uAEe`it@$^)+s{^8$JY<Gn44w$F-`E2q6!W;`Di-WKdN+|x{Ymb4rPb%t}W
zi+QL;V)Mc;=u01^)R(R5Er9CVMWhwUpH468%4<1F`4r=Au{mm1WJB&(&nI?dw89>;
zg@11Z@ZSuz!|ZubCc9Kkl&-ma5UQFxt<6g7EwUjMYzOwATg67(KfI-{qByfjzIMjI
zC7$IL5D|~Ck=5_7=}?($HnBhNh;yY@MMyTcxG#|C<0ALA<TbsS;i%GUeM%~Fk)tBi
z7VoZMk$I$z$@Gohw=>1`)j;R%TZ3LP3LOJh1QD5c7<iyYcW#?e8As+?Pnv(rKI;?x
zRe58~V3!iC3q^eNNdq&SI$zqZ44CiMezt%$d2V&itT`vE0%y~1_=-2!#8Yy?r^AoH
z43=sWo~2#U7<%(1Z)tfskX_3msW#VgQ|Bzdr7wmKCl#PhIBPDBaw^$Y{mB(~&%3^v
zbk_b#K-!mCoA!F+Sd&9S9Ewk!c5A9hn9XLiv*?RyXqLtEow>TV3;MA(OS|vhYq>+{
zefKz-Yk~9Uz<??LZ3+FFJap7-gnhM+Jv5I)nHpOe9Wn4plY-x&y&W{u8#S(jA1D+w
z(5qt^O^p1ce{zNq0*YGx+ZD8ZOXak^OJ%jZN@X<McS@sO$|TXwr4nk++m{&n3ru=#
zJgcl1QfOmj2rLaSz)W8o7;CEm15IUs(NX|<Xj!1GAqgZk+zQ8EnDj*j6S~>n7!Qy#
z%-vN0&Q>0nSjhroYiWSd94$i%?Y?=^YvWl}{Z*Tta25b5!y-@(;N9f`&Q%8BT%<<n
zfMrObJ&ML(nDj;6Abhi%xeY+dFpt6j{7OZD^OFJi6_UV6Q<YJMtme<(M;k?M_Of*X
zNEsH%RsbKR1@Pf=0KZBSm}sdp%8=LaE}m5FcvcG^vw4NHJ3z`X&+`E$xn{s56Aet_
zr2$?`lTn5o+H1@B3zNQRo5pQk>FEQIGR$|b2D*150p^N5Fv-vaW;)u8B(LrFQ~q@=
z*K7{)TM3Xda7PP)J~0Cr)CU9O5=&r(!2%mY1E8oK@KgLT)(M-#gF^vQhFxhsu-!}m
zHo4)zGQ$%%nV2)$Ww~zPPv3V5%-vD8qZF)9%K!yAc_1Y|5v+#R3NayJz}wCl__??N
zL$mPGNo<d2vx@2t3=a<jc+?Euym<rK+uOmJGiSi=-Maxik_Pcnksu~$-TCnsCVdgr
z&4^s0z6!`{`2aEXP#~u42E;T%fsnK<%m)E}aci(xJ1uh3YvWlVbXxcVbpqg8YytlM
znasG3JTv~nq%VrDH3V^dF<6LB0!xjHfS_6;SYogVmX!pS7#6~O0^nCmik<Y@cov&N
z;>D$qS7BoB`)Y)>ImmfmHIa6^Vl<Y-OlxiCnx@Pie*u0Wv;KDpnP;HAFACc9LK9t4
z_#gg3!`}@vN7LwqKl2~yYi9aJz!a+wa2O0Q*3$uoI+_3r$09~U1?XxlhjWr5&{CHJ
zXf+w2t|kQ})SZ9YKPPjcrn`b@Yh(<p;kZENJac_rfY(Pe#<?M!_w;oXN9Qd~IiQP{
zVa$J0YBt2l<@_wKuIo=k=CX-(m}V>j#^2@=^R+@iUsLJ3I;7R?re3~Y0MXIJj4>|9
z>cEvO04CaKMjaL#<^u*F6Y7vvcbIbdn%I>@XS^ktScmb!xubI#ti!Bq&R<x4t3yu1
z?!wRTn0#GRKZuCTwc~Y|;DKSIC@|C3X4GMNh?}tnA#?W_A9CtWQ!Zc2D46JB?ZBAN
zkvi<H&4B(DRbZwE=TeL&z@6j*I0Lou_CV^8*Kll}Oy|$?y2h)B-uBL5tPTfPYk;|B
z3e0i3z!awijLvZZys64~dmwx${wL+*!-&XQFjj{{fD_Pb_X6gQSYT$S3k)xa08=~V
z@%BLam4b$2%g^YYd|l5plIZX5#aM5UIvk>WfzE>%U~tq07#=cVV1;*A8*dM!UoF>k
znKC|Dizs5C_X;pphXY|1&?036Oj9V(KkLT83hxiwLR*JXhnb!(Sgz$soJ{A>^7@w1
zL}aZRtHWkX3efD|39wD;fWg@i23ELuLtvq;2dv;6f{b%zovD{^U=v4N6&TD|50N^o
z%QgaySI2-&UJS6>5X`^|pK1;4;2bqJ&Xsk1rcA$)?P_8~Xc!o)!!<h{*p_4i=cFj$
zv^E%6Wd{MfXxG2S2b@b(b$q8>zOlnvVsu0#m{`XcRulWx#4(7>i9f@8^7XuugZBpd
z2S86x4|w$O5$Njd0ynPT08Qr`LEVvBu&1&Llx*D!;-X_fbYv9BOil(-fvbBam-DlH
z2~--4jEsPxp&>>ch-}c?+Y4G-TN!czv;+ju1PyH3v<VOh1dtvZ1rj0>dw*8m<m;k3
zDLci`!9Z5i2Po<J0V$nOuvFO<$Y^>28QoAIEaw1|Jy@m@02a#Hf&~)RKvXkn=j3vJ
zmKRW4S1Mw#jUhK6GR0zpl3#vD-uYR1ldn&A`I6?vb;@2Rz!IZvV1eoyu-yG9<2xe9
zEO)OP{SIXtCHGp!cOi5Nn6DJGe=?mv%Nwn2kHdtWp`ingji`7W`Yh*ILzS?q`Y39$
z^Sy}C-;*FZ^`oHn`oN!+H=Wl304OR-WLgqZHX?_K!i0rsTn>X9Kwl`|A?bg@pPXKZ
zoraE6pPIH~znZo~zlxSEOg8<>n%4cxHLd!UG%fp;)XfGI)lCQF)l3HzRPp`tYPfzG
zRTG$uk<=%u;cNZ7yrOkHx{<x7wV^&kp0j}RoEcUdn8LN*L{9_CDk_XU;F!#XfpQ(P
zuhm6MGh{n04RIi?itqm2`ZaakNp?mijQ#IK8cYqKtf8y+O;&<5=qv~N+M}}NWEy1E
zaHQX@UrW!Egsel8X)ukH1h|#r<9k@V_cCDWCps>BPNYFr4gcHqYwLND#$?5bG?*ob
z1AOE%M*YY>8XvqAn5`1|VOz+noBnqFx)^T~viF}%gK4H1z{f8IcqqRh^_xbE0@GMw
zC{zBuKPagEe*Jn_ACe2+ilKj)NCPfk0^rg`8FCsz1Ag6NU`kl@SARhE8sFq+MRjxX
z@3ue2z?X!q<&$Z^ZC3y$d16q;g8B@ohrq)<h-sGKcz>9P!+%ph*3ggSVP(&dw<pqI
zvIp)*N@PcM7?1{Bz7W7~5*Y6fqw@V|TPSH*{5JpkCIKWw_cECV!&+ltRHY8(KqzNI
zJ&MWp1pr?<f4o18>2?qtmj4&^8{k%wd>mXD`k#q37@V~OhDS!_P=p4fDq&!<mv6j3
zAoY*Ypsa2=W%*@tKQS~7A|Z0!WEwD+eW1K;3oLc?7_zWotrRdkD)?7__%<#O8kE(o
ze!G5SvtW|H+vt8`A`QCjQ9!S41u%0r0_JWQpnnnS;u^)r`vap-expI<zo_5DGK7Ta
zzP_Wu!5L^jP6s+&F#yxz4fh7N0DHrTvA40%9qkX};{wv4s%7`v{SRjqMhf!rW9Z+;
zXz=v*1e#BZVEw5;?@AcJG<yTg4SRsS39&HI9q*H7I$FR&Uk|8jIsW$ihqnnQA^V|;
zG$4Bk^gt!hdQ=FoXIBILQ$axQmM_q2bpU3*SVn)a(9s3f2FU(MAE;|P{dWDPwh^RN
zD}xyOr7;@Z5@Hy8CWHq2<X~X8ZUtlCq}$=g=nq!97+_~;JicaWXgmLQ{bu%2Bt(BX
zkp@JMsXo}upuu)SG_YO2YP3JVeXd!eEpRk8`)<8J>$?1Q{pOC*q{vm_U?L4GqN9Op
zCIL97#RIRE{=mb}2RN)*3G8EifRl&g-{xvfUANz^-_kjTgzWbw(=gT+V|{Ys*qppx
zATrG4d1b2k<n?9G&Ye96PMtgnDt7JyyGqMIP4!-IX#WAQduKV=xIP<X5>i1<W){eX
zI^u+wI1uRN3s$(egJ54j5Ciwxo=zbzrdr?R=Z+jF4kCNRXV0ENks2^`$cP^K{{8y^
zdU$~c4<3NV#zp|0iNJva2S8a_8AyhE(wv+euyW-}kdvJSGS()3nq2Nw^EI`^S4h1S
z3Wbr7dItvw0gXljU0q$^+O=!o^y$-#`YS6d!Hyj}z?LmrKuJjn@bvTqxvQf=`s$?N
zsn$37IdMHgvn1LV$Y}WjHKSmlY8V9Mb^YO)i8muD>aBqJ6%4(&h=L<nqT~d`RbAny
zBUm754Hin-fTfyir>x(ZT))8bxF%7Pa=^39b$p*IVz2}7N_vmyg|S6ouC)JnevxiI
z;FAv>&m(0_E_bSV<lQAEm4J7d`*?XGMrB}*l<#<cvHlh?S2l1wzX($Z=E;YR=l>_y
zzXY3c2NQK0$T*w?lD0?To_#IQ4ZjLxollSEH4=e#NHdUkJIBZiX{G^<l?_12qmhwc
zsJ$M+;`&tap8T9{*!k;Au?av#XEj)?6$ch+!~h|+Xs|#f67VZUfO!gGKTUjc!LXft
z0KanFxyj{DHE*2Ot8JY%&}^R3*N9Ihoit2%d`LICYY#fKy>$7C)=knbH?pN&uKh5H
zTc6n^Vz9kZM7LOZs`dSe=aBh@jzT5>iG<XR=qZr1A|IH>^%Tospcu~41TX*l_dg5)
z6<yytV?7hPiJlSNSkI7dq-#Jo)YYdO=wRsjI(l@hjxHUmtwYCXYt!|#H0ipU8gy+9
zb-I?i8eLOe6($urT3wlrR$ETjP*bF<t1Hsg)D-BdYVvdyRav^SiX2@+-R{VA!J@Bc
z^<`A=V*sq69E+UgA+j`bp2yJtVBx+OIq!iwAQN46V5s%izF!~xO%H>X2YTcBAQ_;8
zmind>k^q|O%YdSa+L!5~-$2iD1UbL^B@cR<z(@<xBdIXX!w}mHL~k$^9u!qnN2ZH@
zLp`ezJ7W{ZIp<G#z@Y&S``2097!QWJO27c4@Jk+)RMn=BevI`9LvQvEJeXz*1Jn4$
zjI+YA^IL=mvnXL;v0Ct#?XX-`ecI?Z!q|*Bn3yuopnld4_(G_2fqEZgkB`tl#)J7f
zAz+azFs_UHSzlVNrZH{w8)I!p5PjJ{@qphU0PuN2jI-2<Jea3102bNvemNeL)zH&O
zzum}~-tlKVm{iRNxUCBS4zUCJrt3i3z<eV=uqd4S%Q3B@syS`+o9Nq*Am`)%#Dnpn
zxxlyr>dYYh6L~Nz<^vWxM(qH`#`KToB~>-8X`>%+=rH19YQ;Dw{TUBNrxpO?{m^#d
zn+|l02h&}1fO*yI@$v989#mAPk$xkm5yn3JXFQmg07IfEFg(71aZWyw2mIdI!0Zqg
zw3GO2O#g@nHFfQ2!{5}zdBok)ZdC9410L+malqiB3@|(|@=fOl?K{SF(Y4&bw3ZW?
zU{t@GmnQR|uBJ0>^qb>cM-Us1pYdSlfM@6n5gyDiqjq?RjS3C}*EDEDf<MLuOmNW7
zW76C@kq31(-RYy>)OCcR_x_Ft>+$hm>tP14*P-4Ov3)W9W^V!Y;4laUFg^`!U=SXx
zl)syo#@2^19yHXakA4d?_YuVY<nKI;j%nKfD~7EI!h^YuE-=?Y>_v2dsWp^^pp6Z}
z1KttZdQO^KC-R`7rZ;W)TbX-|_&B;U>~#LlgEg>;uw&?35!)a$w^1ED!h@+Zltmlo
zGkCyx$^UI`Md%;n0j)8O^jmt3FwPBr!h`i%XND~eLub4~A6V#)@?h$t!LUI>c)$n9
zj*sadwS%TQX4>$#w(=hFbM<7{G5x3=tkb=KZfEeQJy0}m^c)28fDhLmotK~;6)r;V
zZ*%L!by`ycJ8ksa+W3wjHc~(1!7^{<sLmYnpnuvGm^niGYI`iS(;6Mq$h?GGqxiSE
zbz(bcsZS&QwtgdwbC;j+V74s+Xm=CFc|dH~kiLYBhp~CdBn8US-_GY4_J5PsX>AR|
zX~W;n-hTwKi~1Q4rd4Yhc54U^MrA(0;5a-_t8)g1TP?<UFwQ}b&r1wjZN!H08xM%R
zp{};cw9)V2uyQ2G*Pmer_ah!~N75K)P>Ai_&)UJL2=1Aoo!r>mI>v(qMvt+d*44&M
zAN@`%M;PZ;KjOjF0~lP|!m#T@&e04j!vXemB+x$@1dK}E#^)u212}-tI>v)J>`PYq
zScc6Xq7%^5!A~3gj?O_Np#g!T=U$U|@bUA9ediEBKd)i%p#7i#U@s&A{iZl*-ybzT
zFJUg*0}Er=2H(zTt@RDQ+fQS3Os9>0XV>5n#0K$aJYeqZA3ei^JQ$tJ8DFQ3PDGE7
zX@e6kz)}~>m|JbX*+Wj;i(+-nrjLHN&=JO&+YfkH5fluxdK-ZHoAV4F^x8^+r@K4w
zaCHUPt108-0eg8RurxIU_69h{dEn%I99GwS+UR%jST%y!X#R)?*9{p!r>7axc?M!#
z2m4Dka9$G%oMHpv+>-<JZl(gvwY5P1QaG@Va2%KUChw>9buFfiepk=1k;t%chMnn;
zc=)He^+)p3kM^R7j%>R0S8m?nBaCy?Y2*RXkxdu<?!J*DF;UTAI(aaJI<o1a|JaFh
z^m`rmz}>rd!L6IO!0A)<p#J13P=DeiIDf7IG+$^2#KtCY_VgLBuc{jC+FlAuHWz~}
zn~Ff$_8nmR))G*>X){PoB!GyZP=Kt30q|To5{{{a*f@|97YE{3MZzPK>G`|=@G<?}
zyLaIE^XKDd&&XK`a`uc|d-380xPJXQxP19C=<e<Yot>SG@AdWd00y83h#hlHO%3B5
zI5jmDtXZ=L<mKf7=tKyz*Jpwa8#aKAX=z}3s7Il?9(2<YdXcm0v9ojJJ91`?(2xA}
z_xF#}kJw+IJ$n|MI(3Rc|K7cO!M=U_81%y^te~i<2yBIR-@d-E4Fde(xqs%g(%;_M
z{S~1RhE`?pfY^&adIas!C(w`Bkt5jOyLS&XH8nBp$H(Z05lb1i0Nb{01KYQ62c@N@
z<MfC7`GVrLF`zIdW!n0WyuoUU7A_cQn}z~Ci!fm8xei#n$1{?#T{O_bhX75JV1PCb
z1je=zz{Dm37+Hq_tXVMh=ko&cXb&Kx?gp0YcmfT5AE1Wu0?NAXV5x!)5Q9ld$qq=W
z2UDi2|IC#Mc*`dj0{EB5j-R6=_U=eR&iVyZ6aID`u?bk9G3rw{_AK(rEA9q_&>4Sw
z9;stG=|}7kL`^FGR<DrOda%@d|KF}JP)h>Ktd9NdI)Z_u{kgwg|Cj!sw;qDczxa=i
zmp{>e1e8LC)mEGX25Y()b|8rDh@?#|m;=YCl3Oh>PIxrodL7`C4FJ-1y8%AAXZ*T^
z%~3EP+IK9&Z35<Lz2n!BviOx_5ZjKSpZ9?O?#>e3wVxO3Bmx=R3LuD19!(kqz`eu{
z2&u;aImhbnuJedFfd$J$fxPqnzplggc*R{IZ@xgu_0ad%B|M-_lgEeuj>@0Ejf=lQ
zkulE(;>KxUnPCc8s-Fy&U<g1&Hwg%9CxS(q>wu6(JoF!43j|cwKs;AZDM4QxFi$R&
zF$eRjtnT|c1^?Y0^Yo`1oi@GtV4wfugLPK_uzAK43Z6iEYqYNWm0rxl7upe>0~*0?
zPnG>{J(2gkPLgrG`gkfy%CU(gX1cFm7`u63v0mPq|BlLk-~K;|03we;w<gs1CmDre
zMe_fCP7e-~@J8&kurQ^-G;XH_FSNku0Z97y?_UJ|cObA_Hw>eo6XvR*6Y}Gv39oAg
zy2}1Et#p&s^!qMJ!Tfkq_jQ%}K@vx<Y5HRRckuALWuSE(Um-D75Wfj41E~9ic4wB*
z?hNreG}nh`l+gFk4BDO{{)c$vtQgv#;q;)d5A+2z)>Q>YI*1(_wBMRw!-a)*Xrumk
zqrQoHFzy86pEzcZrmZ0X5I;r4CJn7F24q#RFMpT*|MopA=(mB`d;Jau#t?%sJ3IsQ
z?_;2@CO&O?kze6sYxtMV+kb)q;)`kwZ4eQEGbH8&VlVT%7@+?k|8_<=hTqPZ?c!80
z!0REgNk)BPM{NuKI}9|{CH`3Z+Zo}Z&E0>1fteaGF&eWI`8x(i`ij8FK<+=9546-J
z{}})F#-lceQ^mk^`#fN}5yq#1b`7JpGT&ohks<(NUd;WE#)6i*)F0#D0s4-OofAz3
z1N=T7V7h~Eod3xfSZ$mOtc!X6qxnEvL;8>L?+9apO+07%6$bda*#KWT2jC|7n@+^Q
zvX~cGmvR3`bE1xh%pc_60@_SY5d&krQ9G*xJkTxx$^t*Yz-lKqu-?rHV_Ydu83SDn
z*+0g=lgX&f=u|MUvd{%4h^^UiZpc5BhbChH?H4WgZ~?15oWR&XY07KkpXA>e2kp~v
zQ^Ua85yn$I3+)6ETQw*Pj`=)~^#dHVf3&FK1eSZDEhHYU0}R>V*K4D$hTI=(e;2$p
z!+&)u7+8A1cvuZEo)^Tx6sJ1MKeX2y>jyZK<-q&^Cj$c$8+k@-gehTw{&W1hn%MwX
z)2U%#>8~|v>jyC~wN?S9$QVHQ|AqnHYB?}F%*nt2=LlnFPEkg}!2QCn<kac9?`A$~
z^E(v`ELUkmTfs#P3{0INuh2H?I}98Z7<Rx21~^ZtAIb+ml$D|X&UEqjt8(2f?SZ?+
z)G)A!)ddDE%NQ8oy%GKqJKPBvc*p_#QBDR1xB!W98R1v`0Q(2|_powc#M+n&1{O)s
zR`HS?0|R^z<R97}e}@4Qr}a3T8zBbxRim+LekLb=*AL*{@mK9MUH3h0oPZ~^xkh4r
z{0alJ^@a@lYXk#)gbG0H(<WkoTO~CrA0QaSF8!f=fW%3eJSXb^LH@mLM{TyJf`M5+
z4q&h8FfhQaRfBeVI^SV{kA-bMW{bWK#>$y2A24j8zuzw){XieB{Kwkg+unr{*A}s1
z`V|KFZ5E7}9|#7xR845-HyZn6tRLVKmyOE@xb(&2>%y3P@UyXi=nkf<fB&jn9|t!^
ztQjP>@2@a0*=-9jw?{EB$<<-lX->odmnktWAK>y9eYZCL69xuol|RP6uai6Qb(|Uo
z#s^$RZJr?p#>EEXHuPf{;PPQi9>f;_$_FM}guY)Je=!z*)lSoOe}%IL!{&Y}7#N;_
zHs5zW7#JAt!jIeFBlfxo21tCUG5Nr_9Px9Sur^MR6UWBE*uK#at@_8>-_I4=?7K`2
z1O28zfW*8(FfiC}4Q*wit{AcP{pL$yQ~~{9zsUzi`xbt`HcpTeCyxaqO|?J9zrUL|
zBi7PXFu-072fAIM3=A-rU7@ZV`e~100CnaD4Qk`^fzeSI19-B0@DmJ-HP!zZ{{bF8
zAi#ZU80g-OAGMYKhJj(FJ@nx~{5bT1(N2T$wUHqsos;-(ZTzRP@F)3S={4#z@hc2G
zY#e}2cRJ91wC+0$#^!^ubzw|C&~K50<Klby;Aa>h<6*kyw_lYT=<PS|bMa3YAhzaO
zq+CYaDFg%Ewn*6K?m+LV4~*{*W8x#S!DaJt`2g|LvoJ!|$bZJb6vjd~!|MDo{t-J{
zB(~I;efQ5WaP#y2=6^DZf!?K9h98aI4H%0IVqmlt#$;>wOFlsQftfj!k0!}T6ZZ?I
zaDG6}+RU-Ke~ka&6)QpTieF>k8Xf>NpO$`y!LP=Gnd7K0%a1THhjH*N_2K$~#JRxg
z{W1PS{6~FWeuaT^d^jTp-53U#W&*GXum^e<qhUO}P++mb9Qw6+j>`wgd|>7cW7B<G
z8z*950b_)Z#i~QjTrD6DzZ$30bw4y9XxwM!pD@7QsDS=I2fo8#;(UO_TpwE-$L2(X
zBc|WU2M7k1dKh@tYV_Tit0nYtnlAo+Rqm?55Js%MF~6aoVPL%@^PB(BUl^F}UIVPN
zLx6SGN?=wx8cTg51||f^|CoFL`+=37KCp+eb&<HT6VDqF->zTLIbHX|pszt#(62GD
zD_IZykIsIFfjx|cKelJGOIY!@wGkh0G3rkRF|ffH00$V?7l~0a`HaQdz~GPZA0D!b
z;j{EB46Ld)Gh#4K#K3lA?D*c<It$vq!x)_t=R{nVJ+RW%2R2wk_}eq1F&ck#)@E&J
z_{aE<2t|CJ{uu-BwX1>pyEdRUbp1OFH2e1hPaiMf;q3u5Nt?fu50LpluQL=_x|soI
z6XcBP=jTi|&<10=`uDHOjSP!m#G3pk3|9KX-xAtY46LiRz_YDQz^Wn-SnbLNcAJs_
zvVTVWwQX{vfn{+Fu-puPYiLt2uq+4wR_ncii^XUx<9|9|Kx{C6Mdx(gj|z_jQQ^PF
zU@9`wRCFjm>IaAo#&q%bt8$|wM}5xzBnF5L#;@p{uKO`jF<{K^?oVNW*kDW-f4?d>
zHYOIt!r%7zlNca27{8)(y6%&DNZ{$yr{KwxCxA>MGknfk@3ex}J9j|q?K|KOj5*8r
zg!$XIZZUiSFI~I@nqUlC#JBM%{Ed_Y`)a_R-Ibsk{#Hs2^r5SQabe4M?E<CHuQ4Mf
z6|9DR44Gep;XE3$G7!W<KTpECM39!02(k!CAUB!t$M{G5?GRtPmoHy3{07H-2S;tb
zNBtkkWHR{p@grz!Ya920M1I!|`OO%_7w^W68{@usb#-;%(4j+M|Ni{|@hRNAc{50Z
zevk3-@gNTRa26I8GUD_SAnzMDZe;jHu3x|YkMWQ2Ip%YS@II0MG5<+~f8-Cr0Et12
z_<)Y_-_g;*h)0b0AtDLkAK`s6|4B(npt!i0;gg8?g!*{6gY_xN|5xyj@P=UU`t|E^
z{*m~{4<9~c_+O6kk35H5M`9q4@qh8+#qqWu;~()OMPeh5wSQ)2Cd023@ykSfN)i6O
z-Q7UasvuC1kqZ8F`y+fIe+UMMzb`T#9zTBkL;gR1{><>FMcN&~;r#jYKjeQG9REmc
zYNXAPPb5v|KQS~A>{u5EO0qKkSpU~Hi-2*LVu6LrYDTj4hzB7txga<?hmnG!HURIS
zG+^Nr3(R3MbBF<WyGUT`wi<W_BmsB-MBw7P7C3pW1~{8gpl$32(1yN19qY~TVKp=l
z0642aU}O;h49)!k7ViV()a-%uavPusKbNaHz)zPy#y^*cCBx4X@h6+;!#er<e|vv6
zqx{jjCYO!SFkS20ugXR0p05-IWL&Q>d<FkT8}#SplL>(LuQL45esmv+)h*+41@J?^
zwjbT+USbQRoi9Rvy!0R5|I_>ns6xL($RFbW{3H73D?~8vBR+dSx<6Oik8xj6BlU;(
zdBj{8_ZR7G{Neq7`Tw*1|KIlixBvhDI{vxg{4Zu)46HJr0vX4XK-_ZwcoH>2e(TT@
z`Ysa~_vKyBj^9I`TY}pOxJ7NC&v*#1gzqo+CVqEc%(Mc`7ITDt*KWW({RvR@yZqh#
zWoA{-UmO0;!yjD#xJ9ji1ilbBZ+;Dy`&<EXZq4IK(xwh@i&z0+%>>|5^ctuJTpz!O
zJSXK)4`wfQfcytA-baVt`R=}q;~6kV+yn5!XB-P&0G-J8@9#S|z_k_rj>aG4f05c>
zzuWPnweA1Jwb@G?{+RsZm`4KYo|Qn!X&X?mF9Gs)TY;=~F_5+@0#fFifrM!xjE7JF
ze+xVh{{HtyAflfO7GrY2BHayOp>`HPVvGEzNf5?H5l~$R<*sPP@0QG0ilzNZPMfa#
zcDc{nJhu-4*DY^>Q{gLMpZ5Zu=?nmij6N6}q8AvidkpkfKLYSKIDl5zJ)j=k4pahK
zfs*enAm@IaA=e;t=YNu<9h+g?l{z45yb~;hGLevW_POceZz|>D6M7VklX|rclgOIb
z)sN7IYoDl@tnF1Xh<v1sjl8F%8*yI&8`LSM9oj034!I?*8hk@i$>)x^yxWbXzmsGg
zFE5jHte2EFIU*;9ErY+j@$cWi2>d<*quPs!|B<o~g$DAO{O{-gD>yJ#$%*Ye`u%?a
DT6H_(

diff --git a/games/NXDoom/data/heretic.png b/games/NXDoom/data/heretic.png
deleted file mode 100644
index 2b51d2a0561feaca626dd1bd87c6be276b4df77d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5090
zcmZWtcQ_l~*N+vksxfOdwzkx$)+Q*54zp_1E}9zA#ugFOYK_{XW>qP*wTOy{S*`Jl
z8nqH%vu0346TH5^_x<m^&vVXs?s?8V=YH<J&*wSMO*DUShl5p+6#xKmm>3&ao?G<4
z0s@}vZXMU}=Y|oXZ(<EPA4t%Xg!4Izzp)(x01%1)SLjlgcRkLX0s)4$0akF&fMC}b
z9)RHBV0oCIH^SZ3-$Ne$!t3p}mLLGY?QCM8XB|?oRXCF>IqBFBUA1;z(P?U5JlGC%
z|DM8OCzIkXmZ^rb(wEExF&c;J8W^Jo81xflc%m5T63^&ZKwQS?5dAldLK1%Xp2T#i
zM3Mesr^fdAnR_D<n2n%yT1aIT_D8@`z=-t-><d+P=+DPmjaBRM)kmv)nyc2`)>ij#
zjsLIWmRY`m0RQYzK&^YYkEc4wC5F5M%O>>Nf_v<145TKcCtex(xP5wRW(W2K%cgHx
z6*Zdp7`oRq*!0*|YkM@<e6pC3Oax6xTlhTK7tAU-Og`W$Gv(mUd1vs|*5~StHMO5`
z)F~8>Ji0luI(pnTNTEhjnsSC~tg#k_#T}A1#$2zb{*2g1^|;j-esZblmG-6XZT&Q8
zJR$HA#ZA16ZDGA;1n3*9wg<0A6Rt-!P#T8tELboy1AwIZcr0WTpB)8zSG>??e((5%
zwZ75zbTzN{_-;i}gXNX2X3~av_Y}V>{-iT7t5caF*RddC{^9&$40PNn6Z!MuywoFs
z4a;BD!HpgAxN5D%46IdyqoOJ-f4q(BwFi87TwP5W{RoRn?hHH7tZjs_#U?IqJM|nN
zH#X^iv*RVNPu8^!hHW;BT=D{vJ~7(PRH=4Dk7q+s%U(|6tP=BI!$dM9wHNK8S|*N;
zrwa>Lg3SsYNWoC5g_ha=VGG<G&KR+eZQ>>m9^5w|6zP7p{>Mz`NXaIfzxD9&`m@h-
z*xeRduEJSK9AsuCxby5av~SEzdw5Rhs1@PW0jC)ikOx2Cf0hhFw;nC0JRWA(oep#D
zq<!RUYR0hRQnznSVJ6RjIt|v#;TwTLG0k_+Hi~JYtMWw*B!&^_x07JMgXBn9!{Cr_
zaqu(P%wi7e9|3u2VURIu>9(2G@ybzZQm0euajJs@;H&>JyTVrr3Q!cjYqvS<*MAV0
z5o$zfSB22~36&35p$|2Anzb8BiD$o=KyG(O52rS_s6+lYb&+6K&8NpPK|z8;V~Ho^
z0Se$PYL;C!Ize(@p%)b*NxO-Xja(k3FUSIHVgA;5=XL<4U$ursBzrrcM%)caec5K2
z&D(n|L~M84ji)uCtMQy|e_cA^sG}f>%iDK`wuFwpwC?u3wdV5-B|9ZYQWrdllo>tz
z!H~^}2Qjtn@bgZie^Bh)w6t@FjYLC7jcCGk_+($%sxlu?)Mg4>tbyO&1|s+8=SN|i
zHE@P{yVO+P&W5JqQ>GQ$-7=#APl@Y<x_P3+g9rU%A(m~`^dAJ-?sK@{Z{0$(O#TE&
zKel4X_5Xj4<XF09>M%9LocUFxa0|xwb%5O2T$k|;KSWBHw;VgEqay%d#5g}A;-mP%
z0g0aJPl$voh=2REHat(>ZNcY;si+;4Tn0OY8zk+fDO;ViRq#o5{x<Dul2zU`%8ox+
zOURuI3~eyAll9vc))t()Uybk>9?ovX3fxR~y>#7LYre&HdF6qwOPn&m?CR;lL=iWi
zyDK0=J_o4C_Yh~jz2u`t$tXS%=DRYYu<)?TF*UEynKauglV76+qyFf&c{!IHC>Y)@
zlB|^GqnG$uQiZPER)cy8V{O#qW>{~MetGN*PBKM&g4kZz>sy|7d6IQxSfSB>#i#!?
zMXRY-=5u)P?gn+rfNbi~{77%(#<Xmi#afS|vNBuCDJrw2y`tbDo%qT3vn#Krh{OuZ
zkLK0m`Km1^(yI$>{PO<Wvu!C9lk|)I&-Zr@w`Szz<r}|zF}f5dvO6>OGQiD5xc`#7
zhR%MyC2P&CzDp}BE0`jy)8p;-9n0!*Md?zFCIb)8Jk!9u^&dB~@}#bfGkN|Ar_J-D
z!tI%sUcF1OuZjDd9UB{a+dn=n!T)I6as5D}+%j>0b;RnLNGC})=lgj@`udiZ{`q-w
z#+?^1DeH0H`V%k3WJ`B1z;ofIwqN-TZ1t_J1MBPSqp(C!@b;{0WM^OuLV~OXU;8t-
zd}DuqUxc`|z1`T<G$vsLhjHwWbKLBx=q!xu8w6mwMn0b}c2Ct-@wXSp*EqCbbV`d>
z8!#A+OmIk1|BoN{CL?BMW_;jq&VuZTS50@tq(mSQ<b+!)K$j%f@bGq7+T*)-?-oEK
zPY0R}UJ9xD)wj=tqdHeZ3)B&wq7tL_Ry9HJ%9ZKa*(cuK8w1T+W{BN}8_R?cwby-k
zK$6nt=H{Q+Vs98Mu^$robrl6(_<OLy!28|aJ3Bjj6m#TjZfYT)lX{QM#oaw7IXStA
zsy(t8VOCITDFAuYfM8JUt8Z`DyhwZe{rmUFt^Nz6N8<RQx2o|~8QLT6uCApOVD=ds
zTW9AA8_lmjJFWLZ4o}Q(Xe#F_6=oL*>ZVI>?(A?fK_>?XS@{*5eEcBHDEXRO2n3??
z3$LI!p+P%oVq(J9!NJ=vyr_SF1UfSN_(<jDU3CPbl!<<a6O@nkSXNdx0c4WyzcEpR
z4Lr3V*eh#lzTTk@p=c(5NL>u+l6u}lS+b9E3k$WM=a;=vW}r+?I+a<=SJWZ(2&xQe
z;Z(wwBKxoD=?5anUr^ZDkL}f2n%ww0d%F4ypLX{?)3KPNWYyYqNtOxek2wk^`TZa2
zKAMacdAdHw9y}A2wKd7F%QG3{T0a0%+o_VjykY5wlfRzKy!BSKdz{}-?0o$>njlEl
zg*BT(vkp@n2|Qw6K=QQrS#*h>Wo|Tj$<Jv(?DZ3(YH3S^*~~7%Q#VvY_&M$Qo^}Wg
zeEj#IIeaQ<a{5_OD&8>_x4TZdBZN{W>X0=%)g#m$MYLjf_;l26qOZ~>RR0+T&I;go
zP+toD+S1#X7q(Qx@eA#r7=>-<tSGe$F^eiV9v$WstqAo1CbNZ>euPv73O#XOQ-HRN
z5QClxP3A$lT^W;f#a#>n=bYM=zMs*4dE9${k*=<QjIW#bIyHf6I;Gj>FKBT{urj<9
zy6o+2FI8L4U?>y2)5z%m6hL38Uqs{Ve7rcz&5=}@84Y;Xcye5<&-Rq9`q8>pkVkR&
zSvyF);6yiOne(TToz|zDiwVLPHtt3r5ib0v+KXV9CG!$mT9+tWJJlKCTcoB=ey`H)
zJEOu8kM*Pu-%~D})8y56uIN7q+necT`59^c?()karKAk4;|tz^78Ls3I!y?EeYae}
zsf+VZ8d;TCy*CZfzFlVX%;xr~QC{8IZpP;P$IC3xLtfQ0m)O1|(}d4IV?f|=aSHb@
zkQ}C~<)GfQ!)cw32-@_u1_gKA=D<E}dD;2<AaaihA7S{lHoq5ZtS^z!h)|bC#v7uk
z4QP4?Dt6}}7S5>eeB`rrXYL<}vFx4$8Ifrtmn`~YI532gVaLS74x#H@IEXDy5P!B-
zOOEC7gHnueH?4CtAfI>zU4NP)u28to!`Pe+$U+zeq{KxaMivR~qA<@~EF^PVTyjQS
zMDgkO{6l4)W@Nwx+tI5<JoHH;k37C$i{bfmUR@rEe4CZJ=_)75$7MZcCaO$;V9}V|
z5_$V2>^3@;z5!M|%IWS|wfsfiEs|1|HTv=UiLEXj*^m@#27Uk4=PzEB{s(KhavZ@f
zCRkpt_|{qzFi@pycp6JiMmvJ5idiuDN1%6vK9`F|cKo{uGS0KvfbDR)0%0A{+u-Uu
zct~q8kpYEOz~-3oLfN6ges*knJgRjt;f0v71sA={Ym8VBauqUC<|&s0#g22Ip2n@j
z*Zts*%^%N+SSd<WdN<W(^WiXzw+g=}LvP!ty}*3t*o7=Ng;IWNM$5VJ>OHNr)+UrS
z?hn-|ck*5s!WGKqx)sq@cKN>SJZc?X{T8{QU^7K=V$#cv(D<;|+y%P19qw~Fd2jm7
z*Nuk1Z^IoIgy;|oC%$84q!`oGF0NSpHcNevqV*WEBPMz-m5GNAIs^HOfj69W5r3_-
z2JSA3jdTbfUO(KgXM6^t)F57$<yw|!wy=Gx6>Xoe>NpU2p~+`1iUcPJg-HgY!fj~_
zq}4|H=a<~~y@eSlBn<x>AZt`A=y|u$Rit~D%AZm4SV=Fv^o@k6P5Y(|^(@VK#|JY2
zLp*=f74wJ%BJC}c;L(^~NmlV;UK^LY+-Ao^&z;W#T)1|Z%2WNRZeyNuw0qZxcbKd`
zkI-PbWsug;N-10Nsx3~5#O7P{^|IM1;V$??E$CVP6kH^S@~ZMf0|(jZruI4R#1u|Q
z+E4W-Vk#e+9+8Z<y%;Unk&OQsow;@Xef-19c}m@SGspRr`hHrg*}>>v?6mM*HEG()
z!IgVY$k#3pmNF$x+TvJ9Ey&~EiDTwf{>p@m?nl4lL~}>gt}_&1AtlBXaToUlH|-k~
zlTV`ZKpphdpMjnQc)!L01E@-o@}%QcWvQ#!Z#HPFv)j@5wf}H%%96A*ND<<a>I&x@
zw3sq#ARDr<#%BFqC+U-3gVO3o_d6CQiSky|vCstj&Gf)zjJ?r`J;VN{-Xg4A4`kSF
z28l8GM9+%a+h1HPYKq1&<_~oiY@my88NM+#J`DqM2R)beaNXeNEdIgx`1jf5I!S`G
zDy3Ve(Rn&|Bgjl7np2?OG5PCwxP30G^#U0tB>h4xK1EclupKH&^XmX=EU;aq3XYd`
z@oTSfK!bPo>Z#53k_vRJam8~iUSUf%%>7uS;3zm_dfXrZrkTjVpsAvzbzSZo!8@|r
zJB=*!!gavBS0|>6KdNU^yFJWgG(zxEJe-(QOHRH5%2&F&_bq3_q!7~=9!LfRqBLng
z1>R%ua0R+B{2g=O;rBrlBVFe8v}n#ntVW121z=JVrV%PRK>8yz!ukH39Y)2H=uejp
z=~*lHHB;^ou9dJMC0I8QOHVHF2E?ac`KoIKfIPkcY%K;`iy|dOepxw^gy^DA$$F*u
zZ8CT?YS;{`OIbQ7<<{n^j(O|Lgo~@H5SsdX$82Sw8XZFhXW7uDUPOlQ*f6(rF?ap#
zn8mSf{hM8(L>9^T^%Lt=LF`>_|4#W5T?)N%NjqLu$(R7qp}%J1qQ(fRCW{*}5KAR+
z=PVONrt8_!dH<I2m7dq$n$L-gCQ@?eU$VRZOvpu&Y$&QgccGSRPXL4kIN`)7Lr%I~
z<bChJ^4)weqf88^F{8<g5G^7wOqAlX8{JKADEV=Pbhp1Qr}#^sm(fKg+(=N65aF{9
zyGGva_y9b=c_=43dZEQW>%kIA?)+iGZl=p?)9sF_;6xXXrz;q+pv=AJ=ywa%T3DgB
z9VT-*<V7F<5aX7%_ZuKe!u$FelEgI;=1VNdmKQT@B_S00JUU^gF;x)KT4QbO0>mU7
zP!_GQB@;OKVhtq7fix~YjJb_j>J4)^?EnS^OtC;LLd43V6l$8Di?wv1EpT_<e1W+h
z<5F0s_ke$s*UROJ!$u{CcNmG!Z;`P7azsq(k`!)N2Js#U5OKo!-y}Qoo&A?RUd5*B
z=7`O?N+UwHq;$8Ll3aMmV}W!s*uwtob2!E%hL@P{Pf~ue+#Co&H3?0vusy{@aTapR
z#6#0kO2A$GXc9RDb@dWbIyGhKjl=-kor9(J8pb|%x$`@VF2S(>uJTu;ykk_*P~^Ju
z{<Xg5aH1Qj+Vk0e56*?6z8N#udS1M8Gzd4+9#w``XeRs@6Bx(8=F{U*T#k;CL1gB4
zply&MDL^b2?BV?jOQ*pM4i2!jmt;Kx&^estO{I@xWHugr8*@!uMD>}1p11%9vNTj)
zektUEi{KS5tZuvlq<R#5<?R;aNlg*x+6NZM+xtKPCgd_#=i;?<#Ncmney}e~+R%+o
zPNlrE%tsP-CME8nOQe{MSh3JbT?$M{H}G&lBChCLnZ8C9oyfH3ykU3nFL1yH=v@c}
za19(V)AL{izO1(P#*f;p=u5b^WD&zz8%`&IE{+e#JySH$$wT;4U^K1nW;S)x^IiaW
zNeY=3;8xMhApGJ+{4fzHU7|0bL}U3x?-D>RMHo-A{T$6u|7yOMG^Wx6S}^luQPijC
z>wFe^6VO4d&rlD@T+TZN7_mmWX-7#!bK>tMpGUM8?Fg{z=z4UE+tKp!MXn-qq|nsK
zp5+-PJU@xB!3ytx7ty;n!_tl8cUcZAz|dWLRlajaB6i3B=G1asTzQKECoc<xj<-9u
zn$_J07&h=t*v2+gMk`B(=pjIw=TxMp48b$;vRBQSBR6(HlrleZG7Hjw4)`>tcycth
z3*KiHB9*_qsfG`p0t(0fNB8%hBVywvdH;mfanIfe;0}zWuSTcwQbl$(UPo-fGHu+M
zi5^ntnQ^~yBS*4zhR={BGdC8Of2`s;uPQoPCI~_(%RR!Y7x=`zfb~9KCLPbiycN!V
z^S7M$74%)x<ly>C>dNTvJ&?DYD)jv1{Wk<bi|MPh{Vxm9hYxf#X6Ixd$QPOeXcJ};
zYh&PfFZT6%tHBRvVJAg#zEt9U0$A<w$cmCw+NR#<khZC;lCQ;|s9AfO<~|guQW(E%
zlHHtZS4bNx?nEtq*H&<;`uHLL+5ah{(ldq)-z4jr4bQmq|2Tk&;RAzOeV6F}0UVY3
AOaK4?

diff --git a/games/NXDoom/data/hexen.ico b/games/NXDoom/data/hexen.ico
deleted file mode 100644
index b1fe9862ae5a35dc814b90a0303daeba6871d9b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44747
zcmeJG2|SeB|2TjTEsB`U7~9y_?7Qqqq(sRsQ4*1C*%`Z5t(GLws!g;=t3he8L>o$(
zQPDz~QjAQ_|2!jZxw*H?$M^n!|NouW>+qcCdCocS_xo(`^WGj5iVZa#h5Xo1VyJJj
zDAXEwjlm4%eWs#No^mJ@KmSmE(@YeqMiGS)6C27Ohwm-ZMxj(yzvrb<r~z{n%EV+S
zFK3EE9bSh*ZC+w+!Obbi39II|TwrF4JVnwBr0M0s$6=eYH!aQP+C@BlpBq^$WfA+@
z*x4eSGEnEEoMs*`Z9YSY<HgRMx~qAD226#xRut*X5>iNVUiYe;V_n4cR;PgGtG(vU
z+n+l{zn9J|UqOmb=8-C&QL|NP$qa#;(gsO8I}Ye*beCPZdh%0goSk>LqiA>6%P%!d
z^J|Xw+0NO{kH7RgtZAHP{rkTua*w+?KQE&Ud~M<gh)wCM8Mu{7#WCLH%gwyM@B(h`
zR#c+T{fM{0(#yBbkege3ZH7dmn2Thh`Bb)Dn#XWOM|YRvxDQ?6Te?X~;t<B`lXm}X
zGo0B1%u<&N(;u8T)3IFM5wq*azS8Y@tmOr%-A6*7UEeZ4((=%CC;BQ&rW5@_<BHQ&
zO@b=ec4?RBvoyc^A`wA~!7DHF8-C?*&%46a@U1nKeAi`4#3!AANNUga<-G;{2bn%w
zip|$H$X}CRI>RSnVT|ugLSyGktXaX@2lL&W3o`i@JZBR-TC&^Gtu-T1t<C57E5A>t
zGV*S1oj&^u275uf)4rNFt?`7$*+u?hjTpbhQl`8G4|Nk3bowqoog#;oaO=m5Z`VrH
zE7^Us6b#~tAKvzbeV(_1qR@bjeM!CE?%A|Fgb_zf<vRTB%p#Q|OCqYP^P=3OB^;xU
z>l=r?tZ4b_mPNjE<?xG&mH_fcdllW!(F-HPO31u&UQIFqPNoZPih@o*o)wR~Pkwf3
z6e!;zx|bPZOfPI%Ur=&%SDQlLapSIV!ziUr6aHNONH0ofgX3j$6W0uUWGKA$oA&LD
zNl}JSH9_#kg&D*Shx?n?^G`hziBWZ1!14MW2b)*g-12IgYmb<Rp0cCyj0N9lVpm+k
z{4qOg#SXrCXKtsgsflK{6_86`=oa4M;h~7}6Xz4RKB6~cuaDd2hf*#N5=?S=(o<KS
z$7kZ7JnZ&=TXI?hRp0ZVb2WS1z@wRigD3VdX<eG_!4JAm&iS(BK;r!d?`xP~=L!xJ
z$;OW!&!<mO%#s-FYL$(6G2s2xjZk1@$)%W%=c}ICQx$*X<x0w_M?`0x=_oqo!@!j!
z>WPz8!L`{b!IV??iO$}r9kG3yJL0-GP)@a7xN*VGdar^^Blj*BZxo;x?)i2m@gdLS
z;3op*XPVA?dk?rxD<GW=K2)fI>YUD&<*>;AWz4kF>uoM8BHE3%oRTh!?h@XraCGsj
zR+o0EHV%zb%)qeF=NF0$qvA`izp%KoQC!yA{ncd+jTUA1t${0#*6P$NVLMCmqO*m0
zB7u@hTY2l!j*hJUdk?)geeTW6aGrfTrtgJ1F{`QD4?IhA{J7=t#!aj0K8hZA`J$`(
zV$F_{j#n|e3RIL!uXFC}`rv)crCRUy)h{P!%HJ+j>HpS;zP9Vz#y<P3J;Al-0VB3r
zp=x{jw{Y1tk)NORD(!T?)-M+j_i)kDj<VQ<6W-Puv7cfrswo$2J5=%v7Rj&W{yccr
z0K88M5I0u0<5o~ULw{y$lxBSqZE-r~Dn-BQ<J(>n@H&sOnYbd_E7aMq?ry>M^XgZd
zcg50kPe>c}d``&>S|~4~d)9}5ZwzI7O1cGJ+&ZN}pTf8tpQK{&;Ow~oa;r!$Pf5Ur
z>-{Ch4oRXW6$z(`#O{Q4;2xK?2^W!D%~}{OaqqkY7;K!LH@Ysr@UW;x8&uhdJa5t-
z%us2r;VP>85K!N9iMj7}_>q|SEMejHlZNw@UY?eqNDR!%U#!tR-|>ULfRUyVY%L>k
z-r@etAPe+1EMKrv<I-2RQyXidZd{2`q-w7RWgj!!QqJCcpY+kRe8HR2ZPD$IIeb!9
zk}t(KRovF$DSg7BZKU9p%hqrU#Yc4MtFJlLB0A-G({i=-q%vF6(zp9=p31#yZg^F&
zG)+Od^uxQGRj{sLiPJX=uZlhN|N1qE_u!s;*Ux)itPAiE2YiAiLb09A&I=cD%ZLSj
zynLRd@Ur<cr#I2{M!M7$FXx_R8tHnP)0bK&7v&!C6N+OF$mUqdZT387vp95}XiWP}
zs}_gmj}IRzu2^@5TIH?ZCuF6R(LY$#zP(-N&AAV=P4wq)?%>!Fw{f0D(dvlcZI^h}
zVtu!?XHV-`*b;5+F=wH!(e+Btf{sS3@V0CXv#L#o8~YB%?5NrrQoDcus>}PAwB8b1
zu2|V$g^TNZ*0oP5zCXo&d)ya&VZEqi<{iw@qXcE6=<Sam;}*5Q&rR^&inYmgf8n~!
z58aW=>`?1<kKKE}MrN0jMszQZi@0X5N>xYyF{KmfQU*G%uez;kUFJNcTHiyxJMuF5
zyp3_z%&oXK8&TuO=k;n2TrTg*?vnd5@3!*C>x)__yce+<jt+DBAAPiHJ|A-G*~jNw
z4dvba>K=W3Xho`TE$q*-Ij~Yb7`-mk<qQ|?)#|hR*>vYPD|(}>t@&yM;`i*S3Z6ds
zx9yI!#AqshxUX=e>FbC2_3s*v?LT6n^3tud?)3-z*5|u4;<qR(mJEKq_h@?AnwFVL
z>7HAZ%Jxbg5k3Fru946A!q<*b%LeUof;(!|P6fR#oAt_W4=ggcHY{Tg*OQ`NDG7t9
zRcB<|x0XxR*J+i^D<iMp)$dQ<yZZ3gr`huz1Y56DmTZZ9vCg}!_UZv;MT?lLZKn*`
zWBM;&K9C-8`1FAA)A}+Gs~6gNduJL{ac{hRDOj<7)tt7@*Tl=k!e1_s9lHfyNDpkB
zX;^jkiG7*j<H6|O=M7HxUf;Um*+se+6eRt^&%48Ub5wY*J?9FC{=|SejRsmJwVPA!
z#R&QvPCM}8eEpLzk%6bQ`5LuRvRAzhvt3gD3(}wSy@{tq+Zf1v(aA_Dv&c6vII3N$
zk)F7mEjSWobxdM+b^!61!pb$yn~&u;U4A8(Ut$f+8eAkLq%0HdGD{kzByLvAE)`+l
z<a6PSip}gAL9F^Rx67u7O3qlnwB7Z9xvu5Y$+pm*#X*+aHep_Iz1nCYw{5#)=Q8)q
zNAI(aMcjXDgqgb`s=K2rMgEv|UTu0o`i|Ed8DyvI4!@ceJcL*DYr+Ra6NxVzJ9?(I
z^^w612Q}>HtL)bsx4K6@yx4=mDzCV9r=bB;)~#V^m@BfAdx?(7ox)112!6hZ3azHo
zt`{5kNm;6M#C!`r>-6f;iDg~X(jB%ZZXR8fh53k)KK5yC_JQ~XzESeu#1b8~j%eoM
z#N}qGoeOub`Si4|bW4xHj*lOMjujMGrr*BvW<krhv-gW12T$$Uny<B6YExr=%nVM<
ztEF>ARODy_kxa22qP+AZgSlSsI3i;xCN$#GcF%7{2GPn*)0&T%B`?ZSUaDMBTF8S&
zhdlAhI%o%MgqQLLef_-lket7zm6cU-cy}w=kqbrb%ig=!L_WoKOI6kU%&e@^ydaKO
zXEzZ^99>tRHw%=@NJ&`P*f_T72#ScTp_awQY9;7ypA-7djzB&P!R_sO@~|{&F5h5O
zU44Du^Qkc<R&uh%SaRU>;*}*yRG)~5z264<`l_bB(CxUn8SmfOXoII4?6`mb{>1^W
z_3O7+Rka%UH5@N@Jxa^H;lQX6C{Mj0!ZiP;njp6&;=|?FjfE}E&HQ*g-tZLhi1%O#
zO=n+Dj_2C7CkjHjzTqS<uYL1&51+oxJyheaO{y9i4<B7vU$AQzmPc5(0gvBwXp?td
zY?vD(&D_F5Kvc9l>bjU=51O0XKf<`Sw)XRB>78i&tyI2Z5(4irv*agFo^am?c*KR2
z6dj~*6iTHYC(3xx`mWWHR-8Y7-c2XL)OxS5TUA9~wSbAx<{2R&Avvj3pVh0AlQ_^}
zRZ|biz2GorupPBsyQp)=wr#4~+KnHh=5odzT+;j?ET^%tveMM?op!ooSMIhTdef^}
z`6*_}{r&w)uu*QjTvm;+F*)X;_n<?l5Q+5O={hRi_Eqp@fB&M(wR*<J)caSs(HvdW
z*Dc|%Tl9jbH{@Ga1Ze8%RUe$UQEwG{ZX%1^yLRo`{_62eMw*^KyX1{IJnvO>8LoE(
zOmg+ODfi#Jk;`%?_g|zTZRv-ttEn3d6BHC&6%i5P8Yy>lMq>V9B~nOfdskQ2#ZLkx
z`9MYkzdp^VkR<PoB5a<)#l>|q=vfA{)RX-=Y|Y1K)4_uWl?q$98EF^&*gZXO7<At;
z;sAod(@moCm6VmkxXFhL_r|a74d)^sHa%D@ji<*_PJO{)m6u;CUW?}!6>YaT5O+B#
zj^rGGlBj&}z_tkvG$Emv^tKy9>Iv_+_Xarh#~gqq+df~v(q?I<8#id6p`jtP(0I<A
z3a%pZ;Pwb3&w?7?DQ~ox=ANFO%Y&*2ej@qTQ>k)!^?T}HN4s>GueS1tii)b+uxHO6
zVZ*Pc9ALUvA={=IH8nMc8>v1@_%}qR`Q_!?mn%1^pBY^GY{eoo-S7{~UGaPO?|(I4
zCF=gM0F!gh4j)dCZv<!>8Qt3@X`v2>ME9ekWree6&8t*h$El<8`c0Nu@_Fz2;I|Ks
zS}|_koNBQ{B$OUt+jt#gX6EGVEdKT}M|a~cwS*HV<lz{}_CD}dpJ~35Uqa$$(DGP(
zgY`}|wud-46KN+;oe8cRRJx-#MR(wH>0Ntw3w!+>t?QAgR~)0>t~=j!Bv&sw@qEpb
z=%yUO+vm)eyB$xC99-KW@uL6n8s{3v%_R}BnJ1&GvQA!m+SyeKu<}{zMd(xR1s@-;
za*-{$bc9b<A|hpF<^7=aZpqNL!WGZ$-CsM@xFlEM>oFNyvYR#@E#j>y^F1wC@USWE
zalvDk5Z`yaF9&#v`^v>Tl=lZTJ964bN(&w`i6kT~nQ`*ds@*OzdI5O}PTr{SINEbY
z^&<B)`<bV#>)7nFjJSOl__dx%SzY<A>0avN_67;7eO9I?S3bG2x>GhILu2hpFU@s}
zwyK`kx^C8~`jVi5bCDNYGi%Fyn)yz+o>e;?>AEkj;H!W33Fc<a%%|6sgucCBw>y_4
z!vW638@qPDucThO{eEZcbQ&$3UdqTl=em9eJVJ29DLts57ON<3Ky}VS2{U;H8|kih
zC_}I5GyKloLzP#!i+0cgKDIbZb<QfU=!WH+R_C(CCm9R9pb=e|{F#vcfpmRF(*SHS
zbh^hY_(ltlv6C-~hs+VzNxf(E#G7^L%6NYsH83mQoK|}+i5kWj_<UebS+(AjH#*G3
zBx(gE1XgPjSI^XCG(F+th*N=_<fS!~B+BFNM-0~|60mixfzF<F*Ohq4(W~>=X#2h)
z;P!R;-~N^!S~L|uHRT;AGoifm+TO#n#it*5U}WP%QBF&uM7sK}j7(@Eq-14k4dBGh
zgKljs>Sz<1gMLrzz66QzrZpSn^?R)_vrW@Iq-kMLcU{lwDqBVdiCIT?Cvk}`U$D2~
ziCNa|N`<ZTZ%cZNZ^iJ%2v)xrW@@{{hq}eDub_zDEf2s^()Wg+kc*|BPNJOI=F+^w
zyt1fXt1_?fbBWibSZ(o!Cxvj7+cXN8=+HR$9n;buWx6k{y?SJS<l75Ll<A<TRyO&G
zsn1+h$F)^CuT#v9T$JV+^uG(qGo8u4pE&;+J6Yqpwe+)v$yxGE6_llnhvB^ntpf6V
z4q9jLOebIM>P|0Qq`}nYnF5E`^LSAYY?Y+mx|x*h6&96+xVAZr(y0`bq}+;~5w(1l
zi}T+HWPQs$7rJ&DCFQf{QML^t<SCV&FM5tAE4Ar7?A&xYBe+l+WwnW}zWK6)W`|!4
z4_V_xML^lR^A=+FRUJ=eo5<2i@3Wu2$|<&!Y;@|%GXX{&GfUbeUI$aMa7KCPZXQ0e
zOUgAn-1^5@vUHS7h5M<U8icKZbni9}r_;$dUG}O}m|3@-XrwH=sLV5H4o{gg7JTt|
ztH@mQ)$8NjnE^X58LgC|c1oqt1as}$INH>?OR*n`<U4Px*}7>(74CLhyqOmi=Rd{m
zRhjuR(vzKMu<p(kWs}l-%r7h14J6p&7B%3==PP%-jpFwu2;kZ->b~H_a>S9Ci7&A3
zPSOJc^=2Mr`&W>fd6?RQ38B+b&o@%vESef4V4M?BvsPp3JPD?)aFE%}3ip|meBQhn
zdyWM#IP<j>)02+`xoS_Lr0{s;vVG<xhnO6d!CbhLd=aC$ubl9u-I){YPo&<pP&}!4
zl>K<MCbnu-_P&|xILQM>+&p}Os0Izj;y2U_S_!@MoV9Z`yLU)z_c08lyW_b;U7C%U
zJ)B0FHo9+1Hs)2wNF0&LCozR~2~9l`LVt~2FW%u|DK~{${#xOP<Fqm})QkYBC#uYj
zcoM`;uA{zkr^c3qc*-8{!5tkhxhn!X@JfpFRdKdg^=PyJ`A!$qbG;q~njtP^&&{s6
zx?+{C(j8wc?WT1E*p*9a8q}TRVXldEO76?7K7Oh9T7`8AMbvxH<=cbHW*+kFN<tf{
zmEv&nqOLsbGL8@A4$^i{$g$KdwL5vHPiIBBq;H{G!Wu^129-d2wPXBmNn8LK|8>%@
zlKm@;3uvXE)MO2w(_0GB6anc+hn!|RTIH`D5N3KDWZQ76-dIL2C%|jpltXeIwYHZ9
z!TiUqQ=e7@9LrkU_R2PU)#-34<~QG7ok}#PSp$2`S<|L~XnlrK7Y`ih4Ur72Zj#02
zX%`B#YS-?SuiEdd=qOo6>yNoxv#&ggE?F5ab-gt<_=K5!BhTPh?)CB11%6JOuYZ0A
z7cj}rS^2Jqztxm~n|*vmqN#@^%_b`}H1Z;ENZ1Lxx|dwluNP%xmYdVSDhUH;fq7O_
ztraunr6FYOb=x$HM7I_TMn29o2@|ppdm`~9oRELWx-uX$Pl~4Rr7LWaZWeJ(v9_@<
zB_Z23aY@IgUBalmK0{5B0PEdaZE-F)^3tcdaY?XQD`(D87qp#Wz!4|Jn4f@~&wl#W
zmV+is){wTgad5e!8c2*fE4A*PBck+vTMg!#u#4$|VJDWmfvx0nq9J9zm+zOzvx!tr
zLuRU{0k-Y4?M>e!LJr+VO#PJ?;ttcBdWom^s<G9;y14Um=sCrAP0I<Amow=?b(x;`
zvJ>XcmVs=d$;I6|(R5d`FZ&nlSw3qOi_^DmO^uoY-uJYKzRz={-;X(0cz-ahGT_Lx
zEoYlHgyt*H^Mi}^1|c$DI~%RLd~JtLrOJ#s9_sgNRkBXi##HomTIGM)TV7`rBef)g
zJ9hAhFS}(^8`U!Ft2P(KSr#iNb8@}?<GpEwbL(fBOih2M%<M3Ex{QuBy{Bvu+CQUo
z>K61X!n}<3jgE^9^muWH88Nh^a@QA^F6%GJjyqhiv;5_bcON+7A5FcdIDfesZa4ax
zZ{)?^epiJSlAO$zL`p@HH?g{s&m@4RqZZA{mWAH<c;{h}m`gh=(Qj)kTiYs(-P7m_
zg?lzm$x~r)_sz7cS;Q5&hlBDV`mtz()S{`71SJDgg_)tYix;`@RyE%{Z|vlQx}Ho;
zelI^&_~hR5#R-*rI;xi!(Ox@NKbCoN<6zds>FVu|2@-S}Q6s_QwL9dF$ONvLQ~gY>
z*>@mpAl}{KWR)!^`6;e^A-?zw7wUQnHF@uc_?uq>W>&AEt55sro2|dm6!#z#Ro+r<
ziHEBoejzq;i}8b}F&QWfj@vua^9(=toq^U=8bt=zx&(J-yC(ihV&S6#Pgi>Q*IIW<
zt3w;dLutEo%|^IqU`)R7lMfrF#J@bX^NkegZh&>|ml>ziFMG;aup8J3;3NDl=LVH4
ziNxO)_01(4EwWl<qI;e<q<?`)g`<C4-!$@i`yTxK=XQB6dSOaT^QV<p*$O+^KYy*I
z?tQ&noTd@M+9eY5T$MaiKZ<Y~8i{^I?zpDYg|<{H-1b{&rh8R*snxl@nU8LO!J|?s
z?))<toe#q}$#cEJ_e-CvN4=TCG$m<NHgU3rx0NK<y_ufi?j(=5n?7BXGgf51AG@s@
zTh;A!3H{?r1pKB`G7U38=+Y_eq~ti+-u{CEWG``K?fBeYYr{=G&x|mlt#2<$rmFS^
zV_PrsIvy6S?l;)q(>V3hmxUjN7Pe`n6XAkmcUf;|0;P<dWYp8wsTbGt;458WAPUth
zfco5B>z?NjU(_-0L+`ardd{qXxeI3ZVP{mnu8hL_Ovfd-E@8@?+>)^Qfgl{9H_zTX
z(9dz?NkC(FV>b1cd3;Gy{5QQG?>uu}ks6LWzO~V2Iu$#PaL`xp4_xQ0>vTDt;i2sR
zigJDLh1s*P5%?`?OAVG??mQ8dzxBn_`E{YDnZY$}0VQSJklVt{eYZXNOm4rkC>h`D
zBp&~GZ}{Pyd$%M4O+Cs^&z0cWc0`75a&HQEfQt0uw{^ALa_f&988!R9qXnG5qIK>J
zSHqq)#&E4Z@@=Ddp1whb(Fa$KX9X7m51un1u0571SxX}Ky*3o79#Cp45YOv4kz{-|
zF?UKrZwYGlQ%iadaIfPqShnr5@`G1c5gQtK>~>Lj%9(BW%*>Sh2c!tGyzLy1u1w(>
zEG&1YT-Lt3a7y!LxTKsgEq9Z$Dr_`1ncD5JrB8mwk_EHSDz^+Y`7l%ZUK0d&grB)6
zf)At@p(%yu&T};suu;0ch616z`{g2p`8iLnRB_zWVpmnDFeRzGp;ATh7DKPDKjGSK
zdG{~E<Ru2YZ`{}^u~XO}=j3>g`CtxXF(9jVpQo&1FIvy0Tz(4I=B`x5V86ls@=EBH
z^_42+R}aT$NtMi7tJ+qIjpMqCdh31E{xz+j2U-1MzG8P>YG#(1oX|+{do5`??Z&<X
zH_)8uD*vT-Hhz0hUKwzz%a5)2{8#3Cn$Al6oV<cya>qN9mp&l*Gn$MiXY@uK=$+0#
z`1E2kWQRR=(sU|_Tt?wjXS<r`nGZB^QWi!};i42Ou|sy6UyhMhrY>x^*h98b#pKME
zqe*c~Am2JmjA`rKe}843KD(f!kJ@`fX1;Fs+k_Nqr6U`PPp~|{GN4j~H1m?AU7CXS
znfoD(EM9}c&#AN`l_=SY0MB{ldQ;*nQYgOcH`suV&q{W;h?4<_+xn8ds#D8FD0d4q
zyvdL4jv<3-I*I%+rN4Sp{oUG+PmLLrx6;q>W=}{OfppLI^QcAv)GQ-rS-Famv_a9}
zyo4uK(bK_0a%DHs;URH1k1BI*d@RD`bn!9V*R;NR=*@`Jp;Y_E8VWO~NO#T>%YZz4
zUJBKLtGI!6atNbeom=jv!T~vUzMUylBc_rjDv%yP7@RN7yzRyb`@SB&=b9+$VP|0E
zBv?sJqc6%i9d@}(1Kw_#8Rw7t<k#Nz`Qe%j&8uu=S0UKp@kwz5ZAF%!o~;n9pnB0;
z-XQmOCB?m`2Si<ojY?>`8EIrET;UmB?%v{Xb@frU=BdEjl<_!`u4JP<3xK;B{kfI1
z!;`UvG@Z8r)}LaIYo^xIZn(EtUxnKjeAzvPPCOV`ix-)dl2#dKgAp$$t=z1iC^7Ut
zCwzbVQ*OHJ8-!TRY`}dZ-EpNL78S7h`r?X!cR}7xFYXmL<H&pJJ9o2FZ1?+wsLo-8
zpMz%#AsR(L-lnkv+z&3V!S5)cfz|w474Dni`*(6L<NQj*R%G!q0wX0z{HJ}3X{BfJ
zkkZX4a681A5wK-(Of<uokm*_(u;v4&!zG2~&Kh|+FT}}5ec6+yQ3@Bs!&-R-C6ckY
zIk(NXYU<N)4qN=*+6z;svytudS|uPeO`}mcnW+b_RuVo`7Zy8&({4p<Lfcz;ETLsx
z^!l(KzM;=H*oT&5npQt~UcnijQsdVV=V?$&QR=R^EhNTp<0=>Yf*<Uh&QA_G(Y>rq
zJ$z%0Qjbo1D?hrY;?sc((#0>4*|mrp!ePirGa@M4Tjj@w)9gR0if-$5xIHyYoypgW
zf_=*o=S|c3y5Z8zg32nbnpk^-N{;I2kMuBAruG5A8Y15B&T=#As<rS=r}R~;RkHfL
zy7A3H^cHV+WCY~NFua85LeKHapRxltJJ56bVdH3YiDX+TI*yAQj-3p-+HLO|B(LZ3
z@G&-AGErbG&RxI2yx(L43LRik;ZE^Gj-@nO!C~*gTb<0lRIX=uWjjyT(3$HuSwzIG
zjeCmosV#J`BXc245<KqKP?in7ncM^4yg))@cy**auTf(1?@j%Rrlg6$oky2(btdI5
zX!SS{eWM@l7*|&0ZTq;WJt_NxNnBfL056=Rf%I@ugm|qU+v`(9{5xmMow2!fsW1kE
zZl`r8CBFAoix8a30D7klA8^rk?XF*Z_bI(J>Hr0olKqyzH1A6dnIU3~e}B*|oc49~
zett&8dQP{x)1vg2rkTY>)0X7&@Gy%k4c4!C9Xa@g)_p6UY97%2ZJlaOY}>Pa&l809
z%xrZmGaw-%o8FHBd2Hn#73jd{+V#xq>w3K%k0&smc%%+gKGC{5MMvi4wbGb5E8IvV
z=JSlu>BW26isJUz#KvaDmwaXFlgNh$5(Pe>y<I8;K3!4Ercuo{F3r%)-qJ*9ATX4K
zrx)Kt>9J8P!tXKHlovTH-}hpd*uf+FsP6_gFOR%Ei{a(y6St8XJ2<P4L&GnOW5q5j
z`quk|j1MS7{hk(vL454=@?ILprO^2WbS^i)-bK&bBA((0=P7px*er<GI6!y*ByFT2
z<~``UTAEoFxNqRbTL^Q}7FkBsC&KZsrm!E*^*DHRo?(CF(JaW^h`V(3`1$nk8D!B*
zTD=jTUAypAFU#n6m*1RC_cv|}GoH(~Pq4x6-K<$tna3Cx2(*vO?i=m9GG%vW&^-0c
zW?O8M3m$&eVanxhq#AKS%se{jT!G6hUxv;Yyk!KUCG%VlKlK4Nw*!y%GWt?%xmQgW
zB`>R-GN`%fg{-G1yB6bAJ<rWOj6;lw51JCTj$7~DP~kJ0<>5y3(5FwiCdQ{XEiN|C
z7)3r;wb-a>ZQg6YqJ59oCs3Eai&njKXG+CUIF@2Rep<b|FQe%6Gwo+e3=PUPt#d`w
z#J+I6?4S`7iWkKWViWd9C=FEY3FUtDd@AL{%cKfvOqKr2DVm`iv*q0nbcs(l5;$NL
z!1s=w+1nQ2#g)I3jHf55zC5x0hRTedg}U#x3RDh8n7?)7qRfng%_db;Wzw4tkeX}i
zZ&_TKPD#5F4`<$e2O5#)x-wQzkDW57Yfx&NlWoaowJji9;rx-+jyD2k4_>CT=W!_)
zH$G0t+thc~!jvO!<7#(eeBli=eRb<gH-&xIXSO7QDwm*=RIY^|j}%$PclYmeSLThh
zf3XK&wTE0OVB^Y0x&OLy>kN_ZP3Q+F_4DbviZ^Ocrlc}EWqAhEpl}Fd;*TZA?=H{V
z@ik_(vbf{oYjYTJC0#v@m$aY8)jni~9jsMXJ(avMiNE=J?BJIV^nvB7)8txLXeGF8
zHCeL1Zwq&Slg&jQN(zxpv5S4(6mm$sFq%fOj*=?L&=5E?4Ww<ZE=LF24P2Au)F^M^
zq}+WSQZYw_^H>A-^MoP>G5grIB#Oql^V7;3+jL6VDM8a>p2Xw<=_~!VqH<(|kGoXa
zg_&z|HzxKNoXWhs!rfd>gxdQ$vNETlf;tB-v&DuCw$`i1BSS3%1P3=<5Ov`WuCw26
z!4cQ12OhRcQ2Y3<YSXe(sAXqSomWsTDL`v}TS--6MNzy;^ggeQ#VT?lGbA|TrZCsk
zt@ytCqb|;(po*To$fgR1Jv>0aZ@Rg_V5LBW!_2syDxbKGgXk}5-6dU}>@zk!6=crP
zTH;bp{SY~5ZWebunX1hDJf3QuL^UNApP5$tSc76oH(ODX99Q_d|NKg48VO1O$<<|i
zDA$edn8C9A=4B2{E35(Usq)()fpLiJ5PjgZM*M6m*Lcwf-XFV#dM@cdvbt3%kbgw5
zCXkMnV17t5$@Doz&rxLyp0*=o4&(;nilHEn|H8#7l+6P5@|<&HTcKPKcp#E3UZza#
zUbw_pK<NU+e^&k;$fKPV&d!W?uCJ&!sR$4Uy#nz|3uroPZ_k@=lz-(wQXX3}wd_oM
z#`K1@aQkyQerFm|8x6`J-|#WlTtABmCcobq48@VGZTO7{Q*2YY&+$70Vb^Y*GTJeB
zBQ=f9DStf_Ps0NSlz!eOp%GEe^W6A`SVmn};Ldwlc>D*5XSbqrGkd-)J*TL47RSyW
z5>vC|hBa)O1!fjKr~M!*_yA;|L1*dx3aZKzZ`5bLK~3Y8x)^q91zMj-7K&zr8tm>i
zot_&Bn6C(s_jaXBZxCgqaVG3s#>(#uo!(%>co<l<MC=vw*1kE60Zz(MWkjwdL_VCD
z7sg==xe0crwh`Yt$c9a2EOx3On$|-RY<C{)1iNn=^A<+<vcEk988ND#vkyw2gM5B}
z(Z2X3%D!6_R6MfDL#4tsbi&%1x{RF82gNt8uv1c|BtZKXh)Vg+p5*c((W8O%J{*~=
zzqB3|Hk)Z4iH@-mX2vE^%Ra<IsTf4$@cx1sf^WkiNw11Qmbc(WKzxn83wy>9T?X7Q
zAP%Um2u7MI+MvkvR1)Rjrh7NKZ=u#T#Fq!G2{}+15b2}G@Eb6``pq?!YRUmu)af(H
zQzB^zS$FSNxVL~O@2Mip-q2}~XX006)CIpuDmeEX_Dt9SiJ6lXI$d=WT`1+i$&2tX
z{^Wi4)FGxKer^i&6+Ysa^b$)~r6x!a>NQA^xlog#Ap?b7#|x6;G$8-GZ90K`-kK(F
zfE8wL;30G6mM@&bzk$(N#KVB}_~fLM7e;T<!T7Lv+%y9lx-fIGzOMq^wHZ}hkMig%
z52%bmZVKJGT|t$DxR+K0@IA;haT9sMsSlA?f&;t!LlV_2a`t;3U4~Fk5WRFy=ybSL
z-%w7ZzB*`kRDVfn30%i20uGa)u&T_o+ksIxH}B$9$QQGdv3I8FRj9*WO6bmOt)mMa
z4d;sD89YX65hO3MnsvLN*a~)3mHihLKb?C=p87*3BVyqaf*py;{iWuSJC?Cengk3o
z;XI1?+yymVra-0c)A|(Zk-qfRowix66?v)A2Lc0E^{a?n4QxB*BojB_JnKN2j%yUH
zY9Q5gS`oHTUFK2_O=r(%t(UX+P?C(fMekYMO}Lu@KGU<gL@P|6gm-&74B8mSF?aNo
zMTJOorIk#5zvp5qC5X7NCFM%YQ^I|o!7$4lb(h1+@jj3DYj+YC_{r8(QVxENK3$Ty
z;&7`>u%zgFpX9h)UpAUN;dRU!$t~`TPyKJ*r<@jIh6MliPtfOET(DJB+mU6*9ze4`
zl;wPDvooe1iO_x!1?>c(dEt;zApD0yLBqo0DMN{sAN7YzCxFO1+dG?}usVkz@0mlC
z_1G^U>z*Shvm!@OYDJE)`0{K%#nr@7#YVCO<@GyfiC6)&&;o$vp9gpehJYVu00gmm
zfW)H>M7cD8u;hxJBLzlX5L5zpqs5m2Zqh=4AsPc5pAjI8szX@XWA~_HBUz$a$Znj3
z7cA=rc=${KhR^VaIt*EG2>wNRevR<m1lb_KgL?t6ggC%MoX@I*NLUJFagi)s_+?g&
z**?EU<ZgZiAHXZQ9oEqf@VFvak1HVIHbOXzhj5YeNFM=s)P<mC%x*#D0D#nim)HY%
zFbqIIw?jBAMsR`cXN)Q~k`>mD-%U~r0|H7R055(NU<7UgG^PjOATHcQBUT-JvYweE
z1x8(n=qBwJ(~JfDirWA|_BJ5OuLcAeKY-?a2=NF5+=8ZnptyES{6+Lqc1!9c0};(b
zKv*pf4C8{-ffdXKXmMMBSM(dRyxy{`eZJv^V1aWsSnit(7C3DKCN}ZFbV(GD(e?t`
zCaZyhen`$Jut&0?sTWW7^z?uaA3lKh@85%m4<CZdmoEdTUItsYZUvD+fxu@~?DdfX
zqb|e@lLJW_>tS1~fQW`a5K&nUM77pIS}cSA*8;565+I_V7&xlfNLElcaXr5_86b1u
z&;R3C_mOu-3XHl?aXwC#UXTuibYp?U{5?QGD+Y+0?t*p20`Yk}VLl4*X~k|BRcs_{
z5>Lfg#M9OpZ)jer<A2{y(fy9OyvuE~;UsBUv;=1v&ofd0UeGuumXLJ@+9{);EiyDM
z7K4A`4;n0Qo;H+*Zu~oc@k)NXxmoLxB^-Yi0LMQc@Dfb{k=Gay@rFPEu1!LiIY5|4
z2Z+pq>(eX^AR_5D=J*_q1+RinIk%_{T(1@lt$Bj;0si|u=Y#e0<Mdf;jxbsWkhrym
z);}?a^3nB-mFHFTEoZHVtTq<HHPr;*;5_F2zApZ%4Ph~-->#paw5}X0=>*VXwt!o}
z6s|LdL+i|6v>_z!{M+>tmDiW!rI!OVF&!ocxF#?9WgA4i@yI?QAo=_C^Q#7x6XaIH
z^}Ye1vGo8$h=l8$`A=;S2=jm%`T!8Z!8r;0LqKx*Z^O^88eC4Cy$0|~Cjc~_4%?^&
zyjTiA^DP}}gJ23|F-L(AuPbY9XZ44aOT}3IIr_eUT4=d|qA&Qljfdaca0DdGDL~*|
z{!^dxOSo2!u4k;gfO<qZvIhU$MmIq7^Z`DeZh+^F{)twsaV7ct^$Tf6l?$teu-18`
z4L&&^xaTwjH0~>Gg8}g<XYD&bjw^z+%Z;(%9erO|GqzkrJpv$Y2q;FtJ?$L8iQWJh
zxR+q?T>y>lhJEhyQyT;+*PEm387oiHB9|lkorqcj;FFF81i2P~7Yl{`;RUZ(0<6$k
zh{q3Y2$%p~Igj7&Uy^o0xrBBC5Y<cp{A!N@zfu(tP!1aDk00CM5pV?DqSgQ}zq))Z
zct_tC)lDpy(oF^8I$PoXv>Oc5>c>7u+Q5l!1sHKS4<T=bSMd7n`o-p?l*{OE0Z1DN
z9xPgY?~l=KAoCnqOOQ2jG@N7QLsKt2rnbES4;o*9nuaz|TmKZ?x>F0zoWBVU7n}n*
z2abXryY_<BKH<RIHw47T#)DPvk*#CZH~N0cp6d?>1_r>#j~_v6Yb!u_gSNId(9qDp
z;tNilIt6lba{)AV17tE8By9)+L4M@6(e;d#7c+>@71Q!#@e2z2UO;M&KOm{N0%>gz
zAg#9!@XOl+0eL$hrsV~Qa!UcPlnoG@6Pr6$eWULawW4!GP4}|+285>&G0pnhYoyHR
zddA96cKx!8(u>tsTma%`djY>@I8bvv%eqGR7&X`8p=-$7sJa%ht_5}D0YNq7#8~i-
zzHb)sFx1%pGE>*<+<?aN)BTF}#~Cu#hkM1$b3cok{W%HfCiDvEr+SaB=l>!P06;NN
zqLY%4x)DB13?>tpM))uc3bhjQcS!nw;fGQ8x5Y{?e~FcHZpR@>(y1LU?%2*N?$AyU
zvu`Je*me*_m$nl{U?MGP=NGnV7ZkQ`7ZO_BE-Yx(P7<_wDJZ+zX1us!Wmi5!<{5JS
zM9#1n$TMOEAWuh}2lsblz{hJabOyu@@pVFIUDml)gj<uv+lh0k0bwDVXX9-jC%2Ny
zBesM!$A5x>Xu{$zkhAdL!9WtSrjECLyu2qB*&}|00R#C$EaW$b&*FavgOHHTxZ5Yp
zUPHx5I<odD1O{%wc_aME@4_HNS~C9j6}+i9DHnjiz#|O#NPZ*8TNwT$7z9O@j=Oz6
zrL|PNj2pm^Hp4SF<Z<{`K;G8=Z($I?LH_ysm=qAP9e4XgB|j>QClSqnvWI?v!JP(J
z-ZaR&TaF2X0%j9X#z6iCo}~~N1VopOyM2D;^;ABV%pn-^*l&kmz#oEgl;e;V9)E&C
z8kYv!J^=U#Mt{r;v1PRJj(>iY04gGTL15sO34t)YX2F2Pp9KWWeK-$Rjldv++X-Z_
z$KiSJ=ebD~9e?`*szFo%ML(AOX9$L{Kj?tF0C+KvSacxb(&5?Q1cb-<Pjizv0sIA3
zL#RW1-LGN5@_dH!s4gIYLHK&(U(O3Yv1Px_KaK7uLA5ZduuAav^TZ!8;Ka7W`S5k9
zFW}jQfc^mS_8jR8M9w$7KJbazjk|pz^>8X8Kl>2|KDhvZ6^67Hc<~bq$XRn}eK7io
z4!q*aUW~@;ck?8TNUEqtBp8N)I6EHTC7%Ia321^ZbO~TZW8ix5VrX7qUc<2f<(#ZF
z>JJ$36KG#VE1HV%_y`O_Dp7zSu@;_#s-P^g91tX(S@VK*o)AxkFnj_S^p7yWb&?;-
zY$cs(zl-na_e8YFR0-{P);U91?I;jXDFXzBZ-7sBFFZ5-F&;+4faY@rJOXpUEVyrD
zW!%QS{)lSFQ4#qi0)wzt2@uq%1463VKaGds_2EYtu)HUr3}p#x-^9wU7<c<(Itf&%
zIU4~2gSd7Yq(dC5FNVj%=()*)L25m~NqMmLEM)J-$$5;wecfa#>%8|JhT*>WaZLUS
z2E5D)2*c36iSRI^`}KG8?m-2wvk%<{dvYs)e{>O87gY!nx19r9(=Pz>#*@HxZ5FU!
zxgD$t+68<9w*h<iI520vKhQE=11y&K0ei;)FwZjJ?eDfX`n~KUce;@?;_KJ1AxjNd
zGGs)K+}zv@?%lfwpko&(D=PyRE?fX7Po4z(_wNUBadBYFmMvh-nl)g{ri~ybgxoi}
z-rvn<AGzI$v`eScSqW*kySp1OnM}~s)CBI{y$dc~y2NV#(4j+M-@bhyBO?Q3Wn}?3
zH)!}A77Sv7;(C6!z0vPU8<8uev{tdsv+5?kK+V_($m_v#t(FHXDd>9w`8l3I44!d?
z6rg-c$q7iPxd2fm2SAWs0{CT?0Esyfzb&5{-9Aw*lp<!H2hdW^Bj;RE(|rIV>pqev
znd|{LxIZI&I+BD9w*x5W9mykgjIQ^0^GI27^Fsh5<vLQIsM&sig))@k_C)4p0GxvN
zNM6`@C*W1`AIbl}+`hO;a=mfTJuus@1jsHu3(xEkz;OK?px}6ED6bO(^nELVlFL<A
zUT{t#&{=a0s4g#K<%RT95n5FLF1<&;XXt;uTEZj>h#G_e5xr0#tOI3>TET!{BM|VZ
z1^`}V|1lF@5$b2;JOH11=+)8n{%(GLVw=9r#*WHG$uG+m#8FG;MLj=l7~FJ3*Y9DD
z+Ny?K@=i6I<el#RGD+K9-X&_9eMr<WUHy04`#0W0)|WvPD(>G%NZW{<0?`$Dz%(MK
zkV2vGTtf-o{_pqy7zOYOtBZL=tOt2WR)c8ag@YKFu)>yuSfK@jI6;d+oWT4+Jipl>
zFLB-=AD`(UAFuHs)WHo35Mbgp8Wg}A4hrH728FQtgF+a+L1FZqK@wVbPz0?#D9SUG
zND|IxCW|aQlJ;MR<UUY8CH!6XBLrnXg61sw502jq%79FvJ%b7BoH?X-Lu5hly!&0p
z$I>GrdOm39fav-}W(~=N#JJReIHxKQ#TkB`MEC~~J>*~F0A*N+J;t#7=AYsqj5QpX
zEcnrqjsrYmOQHT_3>*Z^SoRZ$ermip2;(LXevFjUz>wVR7dSwjFc#`l5xp%ULmMv+
zLOA0|qd!*KWdI{#|6T6(0}fCIiiU8r&eu>5HW3^I@g|c8zs&LhMECR)4p1l04bR4i
z?h*Z6uZ^7m4g$QB2R}~6Z2&nxjo<+FfWzndVfo`kaS-60J8AUC%efCA`ajkgkhBiU
zDBxKb$^!nEI0z6-Ck=jH`BekF@Qi`rfDwQ?Uo@2UK)EZHHx=4W1w%R0A9CQ|=?8w?
zJh(3m*?$c05Bz-dCJ}zm0Ynyn;D8lA$&wEtIA92|Fopah90Yl7fH5}($YaBXWV+w?
zI3m$((%^@3{{cRE&mo<=@MV_$03v@L!XXCs!)CY!A+p!M?gxHor#FY^2GHO+3T=Gg
zUd^(>8QP~O6MjAg?*YVygN1{vH{=^0{(wUpgx!xNv&8dm9TNvWK3ky9a|g<^PryBT
z?w|H)zDcA%QE}}6BG>vEhX+64@Dla`v<XDNhc+XB#sLrMuE0|b<T1r?e};V0FZOA|
zq{8nzfY_gm2L}wa<&oy82U6(saDSdV<{n4jH=nfePgGhrAfU94Wf$^i97c^L{0?Zl
z^NH0DXg)h2%F_r$Fc;t$oBNmhG=YEqq`?pMHUliV;P2po*d6hFVc{SE*C+w(C6=x3
z-|f@9lL)_nO2B}SO3;wrVN4u;m=DmlX$XfNz=th?Jcj9rE@G_x0iJ;-js5~EK?8`5
z)L-F%CFR4t0NQ0i+bq`F`U4KU_{=farD2|LGU11Mrva9Xdkh@#68>;a?SuOG$G^k@
z%L{F#zw1H9<d*~|Z~h9YZ5TjouYQFCK@!RjNe2L4DjMK~p}vF&_XEPKpZWoZX@FyB
z;SV_cf^QWxXHM4nOISU8KvW}&Wk2>K4t%ovAl%RfUFsmTi+clki%NhIwuHLT)v!Nm
zArAc`W9e^k5SmQ*BL;@_R)65YFSiQd#N(h%Vm`Frd<$&{s{oE<1@o(h_GuQs<N@)x
z_!~GF12oBM(&jHoBWgfgD~_f2Li#~SEeG11?*{@3k$`u0C*<px04E0h0w9m^)Bf-~
zI3V*vcmd!MT{3C#i)h9SAohX7IEZL$0Yd7B08yn2`U`vm1o>Cc_Awm#CH!KK8w&@1
zOV$|zv8_hr8a$#)Ck=j4t=NGfz26WHqMF;F?E3@DW>ZkL4C(;m|8i{|;=O+!OBmiA
z0F9jEzRNYZ#U~Md?YIHNMspYk5uE}kH@^pUhtRfljCJWx{L*kg2o(Y}p%Gw2*8g;#
z=8>?QH2RC{#1Ba8ZDQG(4&yL9mVUJ^jmc}Ua2Ptr{dAs2Y?>tPCk=iHoumOoZ#t<s
zKpEL&t^bm`$pf+mX<$-ufHJblf`9L!n}av*w1A3R&EN{<5!ju36YSo91MJGF1P4!4
zfwLEHvuuh_oGAmTJBmPL(lHPcdjN#R<$x_a^1-IG{UCW$7Fgq-0<0W10CSslV7|2v
zSiUkC_^yipf&P(T&8iTnGMSuTb;HZSPoF-4H*emI=$;W>38H&O?!A5c7F1VPgIl+5
zfoIR2fyTy0)^%xVDL8lT96;=tj~_qI(gP<XB!KYnaFCXk2E4qyz^2p`uzB-lusI<S
zOb+xY)ZO|Qg9yBcu6kH^j$9);YXpAe*WTVf0zYDZedWp(aPi_r7W~JK9Rmdg1uXcJ
zl9B+7u?aFWGr`K0D?y;wYOoE#At7lJ;ir8=U>qDAWZ{6=i?_72`~*K@M~=|`@#DvU
zLZPti$A{rRdh{sE7GUq*y&yX~8|38VjKII%b0tWR2m#w-6DDo^D4B-QHB9}1y6Jl8
zBp(PY9b>@)hZt5ewAujg`vWzTbwJhF4;U>921Zsvz;Iz8&^1SF*P(7-a|P7nyMo!e
z?m)$GB~a3L2MW5&fuOuC5Q0fU(GJLJucc4c_`%Kg`hZ9LN7Ocq=+TGu?TD_Qs2TOA
z`-n{dzs`_P-SE4}e~h#X5Y$cn)B8vplL<d!hahI2|EG2Z^`P&>q7#3*&#x5=q^!^V
z={`aO*=1M%bpJp2$L>9ZHviFo$R6h37(YZ+-yW@1SAl7G6Uz<+u^o|J0)3z1994BG
z0`sF<ez;$Z_#gp!+k;?1T<gevnI+K17TR}6S?mIf65B@ZBX#kqhak2cAIBa66MG_V
z7|}0c5Cdi}%?ARyaYIRm47j1cvY>VdP_&1(h(Fv%OFF=_fgezEJn_eU_#7kc3~^ft
zRGm-%d|w9oUP&$gGBGH}E^QH6L!Z596Of*t2&Cr41BtnDK-`!NL=9sBNk0Y%&xr<t
zI+4(SI06tg!XZ7wek(y=9KZ|hE|E2uPb2K**bq$Y$)coJ+Z=Xvep$Bt?H8Mk?LCW<
zU(gqjsUOUupLH6AJbkMl(Ac4~_Wmn%&$<^%Zq?M;&Uc>wPLi{yP$ex3+DRt6J4B4q
z!Y2mhf2IE~DS+@}(5(qI@}Gu6aUl8s{!b1aM$sFw(=vf69;OjHEqLPwj2?ib|9<~b
z;D12@ezhQDqH>_~NK){3CjO8F;q}kS7v_i4S{Fe%B*FamM3VD%{$-Me_eaudXEAA*
z<h+dk7dVW!4z#pOCnDcOeEoQ!TpjT_{KN0?N82-Ky9ISjyimtSKy1*UFCr4Z0`a**
z><fl{zmPaPf-s&1;+M#ZIWcUDhWIDK*cM3q9WgF-XpaVM(q^gxiJ2;Z#J}L(c;TOD
zImF)`IkWv!8u0NB`9Tu#L;jc(p#fr>H&HysTb||P_)lp7eceWE_@F=P|AGeNg@2;u
z5ZU<e(*W9F!f}t_KAaF=SR_r91{1|&yyb^&2LGN0=Flzy#(sfz6?o|DHjMxOY8;Fg
z{)v|R(Oz$C8dv}f|J)J(zR94$MDZAJdBo57uW11H1Q_!NvA@JX+oxe4$Nx1A#tZ*M
z%VDLU&E}XifVS8$-pY@5A(KUeiQ+Nd@+=+IFKGZ{O2Jrb!?p~QO@r~mKhbi-Hlsg}
z16#l&Xf|XEf#|NG%`SrfWYS=wc#O9^;_Lr24ICi<H=m{VM(kNwHZA`LG#D@Z6D^0>
ztNus>G@%&Ab=n2jJj8Z*$bR_$f(8@CW4z^uZFYxgfZ@9hcz9sk1$+*R21u+iUi`lQ
z$v6<gS&n&L7%%)2Ek}?WviThz2Ux*UmMzXO4Y0gPaPJF*u_pr|J>Ysc&bgq3Nd*?O
z>VX7q`7dcOQ9Q<5o)zoj2O6OH-i_E)4buQagg%WtJ#g>$9@jXSjol39&Uy&#qEACU
z+2ohJ@_6B&Xt^PKV;E!fI}LCm(Dnqzc^I}U`-29MPk`|j2)JX=E`Q!{j{_OpR$##0
z1T@h_&>no=knh$n&I=R8W4z`0XAj$4|44%izoY?{W%rBNn_mAd8c5={10C)bpo%#M
z<poImq91&}M$urr@K3ZHzrv3;+kemiD^mPR8sKnwthvAk*TugY2O_vFK#iLU6w#NU
z%mj(a`PXNriQ+Nd@&XDlro~To>l3Ge5N;b#<bDZc(O2PlaX#zJ_;=@p@xnjRa)OHf
zLvcO+M>ODvV_t^)HIPJKhwCMb-Ta$pritP)-tvM<0YDJO4q(ML8G{BmkzcO|INYi4
zbD@ki7YNXXTb#QSh+@hhuWSbI4aIW(9U6=m{)v_og0V0WTfTA80LGr-W%&{G03x~>
z#_;WiafvG7c>$gs{^5CHqIitAys&cch+XM;Xn=*WkcMd>z(a>)9>zo(2ahyf_$OM9
zq_Tk(TW8pB;csa`D*4mC@FNZQ(TJ~=^FOA+MDZAJd6H@vAgTTy4S40&Ksng0A^(R_
zJkpOe;DdAEk2BMdAHm<9oyQCRM9Yb&g|mDn{+<S2(08H$`r?0u3GttRJmMHMz+>V1
z_tV+=?`bemJjPpIR6P>fXa6+~pe_vHMN<Gq2-;zY?1p|AXW_o~bxa!Iu+X0Y%1i$V
z4aN)qM9Yb)N3-HvjZK3<7<;T5`f&^ZUhxPRKldz*gEjztbZa4go8efv^viL8!=3*}
zG?*wJ<1H@+?ej%7#-M?6AoN=)hw>pNi~$F2qhz6fqUZqhC4zo80x*`nxE;%1cIeFX
z`KL1zvL5^s8jKhIiIx-BB!BmL8BK!_7<<kh;thRaWsbw|P?W%HCcui-K_4*ae+2EX
zMxUK=QvPsG&_?73zfA)eTVkSkjJLc5^!X9j`k4kKb@+`3nG}E*Sp<mEu7Id`k>&q`
zmuiP&e<6&s<?@3M&>!aoM27N@X#nG!AbRKV!avb+h|drbW9~;9kkqrF9q>26FBc8t
z|6OLq|KpWsLK=L9^zi;mUio)vz}g>Se3xOp^F;9&Z+S`WBp{)a_$L~OXlw<7>Q?}t
z$~Qnzf=Pi1{ija;7Oy-O4e+>ga7`SNsiL91!H>H4@xnjRa#AqPA<N%q6b*zlt^uO@
zAmCSj2KZH;K)g@<BR+8~8ej<P5I;VaPu7q6#);xF-tvggmXvPFPc#tK-Uo=<gFry@
zIoun_f6E_?B|rEx4SJ#PCj36b4{=_GX)s>+Ct6N=4)pngu_k|}K?)GjJ_GlK#Ig6r
z@4ni9cV0kffS2}xduA@&JIL_+J-^mBP85&vmY31n41LBn|AGcTuZc+f&9Ql;zm^}c
zXaM7L{;X&ES?@ev_$OLUR&VQfpR<3L1{1|&yya!}(}1l0wtt-l<Ar~s<>U-@09k|W
z|2hpOipO}%-+%NHw6wkkPoA}drYA2z!^2ikTGk9x6DYloq(*SP@-e8o^8kJqr2$ml
ztOeI8w?T2q4Ul*A8pzJO2=-(bfo;2wgUsyXApg(_kdu1^WM$`rJsJB!P*^H(_lg8g
z?!my;X&rD}z7F{Kg@Uk%SP&ga260hwAUP)fU*rD}e>=q2?%lh0EWg2F-@zf9?;-z3
z8jS{edwaqC`}aqDAd&C7A>VUBeDP{(YDRqVii?ZE>C>mdi4!LP;#0VL_im7wm<S>x
zBSC0rDA>7kCo4`bIW`7t+qRA67nz!x`mf=S;5qDbh~WMs{=@#02>!?qp#c(u81Vre
z#{bcyN33|nh#w-75d0C`N8=wG8w=9Y(^)==h)<};a#xTVANT(i_#?O>H0bK;8o?il
zfBf|6Q<nebF#gDU$bBRR@-Y54Z{8f~`(gYMKT;$%@^JsBq@=L?N)f+I#HSR&-`&*(
z#IExJJCYN?zuo@`UdRuj0pjnA%!lXCpZ^m7{{DWJKP}Sl2pz6pzy3@74;(na@<&Db
z9Enklq|x}t_<4hU(V-w~WAeW?{`H{`s?p+bU}7D`O7oY+0uR3(z}<H{Ole@nS{UPd
zWhyYXjsV7sBcR`EI51cU{j--v0z3D3VCzN(HZIY?$}ticSO!4fRd49K>ID?$tb)F*
zD}nC(wZLehFVMH}272aRK-bI@h^smP5d~WysbUZ0)f|C}meaq6|18nPEc<7~pX^5;
z*3s7!ea^$Gf2gg|bt5p0cmJAbIiziZY7m(1e4FJf_$Sz)Z8#o&iw*jEvHZ|}^&E-S
zJ=^Iv;Ddf`zj_YiZUA}5o6sLG>6g#{ZTyLv(C-l9hxkAL3Vs6Ak0H+ypS@o_$HBOH
z$a4XmgkL^K!?>8pb76yRzkL25{{Qay|F8f58~^|RI{&%h`Y$;@9ayKl0<-N)fb`-M
zBT38*`PSiL=(|j2Jy&wRGV%<0PuwCGaKmq|5R`qvVpv|yz5J)=l9u^M%pd4??E)4h
zy#Sh?w|;sqweT?X*M{GD_!sv-ZZT^hvtTE1+}#D#JZ=L;m&%bOyQG*Uqb1FW0#19n
zfTmaV$TQ?UIXh@8DFJmr%3iGUx_<RPJ)doV8NhGpL3y7Yu;1|(7z952`MKjYxVOUZ
zX#9)#3&U?`{%TMAzr4o-^=K32W5!$FK8*^r-3|d&hrK{~Sr$;T%>)WI=|J9k50G25
z8^~Dhgz*q|z;A)4!S8=>1EO=c0ukda@S7)_fsp=2fW#L0r%3?DMj>iOL%u7R_1zMJ
z>V`>+EBJSGvEBOSzFYQ3;GFRRIPB~M%hKKgn@t_SD)}Xh4bcYXM?VL1!&(6R1_#jd
ze+;zOJ_H(G4M25e9Z+<wX7M%1+WAkCynQ8%yHX6q=H~(-$P)?bZ@T(-a8Bm)1yQZa
z^JCle=f%?In1r?H&Wm`VWggL{VH((?ZW8!d)i9u0*~F(&QQxmYLD#oVUUO}Ytg1)7
zw317W#CVc|{Vge3`%+nX^D~N)Ci~%+H~#zmM}hHEU`TrL<6opMM4*BEkNfZc|F6)2
MwM+ik&qLS$AH2!zi~s-t

diff --git a/games/NXDoom/data/hexen.png b/games/NXDoom/data/hexen.png
deleted file mode 100644
index 1b94be2e5160fb079034020b86766a3a714907af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5033
zcmZWtcTf{fuukY8y(M%AQkBp|dXe5Fg7l7bsi6xoB#3knlp>0tB1O9NPUuP%kq(l8
zfb>wr00ADqdH=kbcXRvg-R|7(&D}Tq$0j~7(W9f`qyYc`bO!p`X4e|^pHNX;W3QUa
z@U<cf)-*7ux*iBBw}k6Gb)ddYFaW?4|DOO~tR1*t8#zLBtV13Kc!Y$z1i1sk!^5H8
z{yxF3E`jdQfFRGedn%j&0E@7J_C526yxn(EDL3_=4ys!$smit~*S%<4iaHyc1wXsb
zt;I-^tjBN9n8uQzsU1U|Xd1(4$SM*;mEcN#%j_nE#4O=uf<C_sw-i;)!Gbd_5uGAf
z<I9~gsyZ80_3z{)Y(w>;)amliX6{_a(~+G$-_fNJt0s9l2L}t)zo!-#Wsl3EoZq7<
zIKBQCI$zb=G*fLI^8|DW+}UcN(7KuC)kpP+DwXO{iseU$E5ub>P?#pwOOJ!ek5SO<
z#ltiiQ)g{gW3Lo_uavONZm{$R85h<>XXD?LxG<!yQ0XJDJW+FhMOu4xW)a5KGXbU2
zO;7dX-a_?-vF#S@nJ*hL8P*xRJa+K&s#q`XB$4UkSAOA3SzUe^uq&e=*j38Z$o^36
zZboE#{U>?-pD8SYqsOL1%36tnN&ZYyEx9}9Bo7(%%r!qS>jGf=`tA%*|C~#X_zjaw
zylONR#YBunDZJvEYuY8h_56pWa;K1Z{Q6mN!-|z(R=_AAE=X%;Uc4<FKPXO^*!IoZ
zofo%m%Rj=t$lv(D$LHby#dlk#LVVXtINl*BU)Fb<vw{O72;*HJ(<}I5fq<2=bC|Fp
z!crrqm4tkt*a;Da1@YF6`UiBC9H<6f=M%(dCgkdH*ny{fCui6C(au9XszR@+5MAum
z82gizzDKLGYsz(q9o6by_?>apr<rCgtsZkC?Byy!ZoC;0!s%fSm!}uio`~DSxQ*i6
zx5L%Bmk1#&+G)&`+IV$Vz5QIy9)9X?!lOEx$l^I;>_iXYRa6<bpQGfrzE}-&n5NaR
z^>B$kJaO_238F>ifQItaJHp8K`0gJa)d?L=MHpUz;vK(@btnTP`Wq+}kBG-_Hvg^t
z;I=Ep6YW(_nosGhg67x`Vt;QrwZ;5|A;0*a)fJ)mj0-5St;532duKT$_}cC2p4;m=
zh|VllN3q3=on+L~z0Y!>@3vY~+3a@Z6-$x8GW3V}AHFpGhJrgy8IIc4rFUnZv4e(F
zhpELILMKT_tYUPV?f)ijZ5!PyYJ?IMp4K7UCrB#(0xBc7O5&++xN9zNd={+ZR&%oX
zYtN(**%`wp=X1KbVNx?mS}8YvwWX8)My$%_*Jk^8vQF2*HQA52FAnNH)oP98<*gn#
zjaKI(KXAg`Iu(P(EJ^6q4`geV2fmGu9(~6tLh4%C%t?ELgFB>;HmOM&1#jmif_hBW
z%89>2KCG(Hc!B`0CCRxAog8luL{9~3ZC(VWo(3%zsfQM8F#3%fu6nqSlhgiW;RI_G
z_&5WeR-u8%Eff^rH~ybti<;ESLD|WbyrJ@#%f?b(BJplLvPmW5cs{>yYKny-u$D0z
zC`cl5wEL8!&MXqO%B3IOie;Iq{G<Kh=y<~iSag>2P*$h_^E%Y*IISXgs|`ACV76)4
zZL!L6*oo_Z*<~`66>0-bEnypEpSijlD0H7bY6l#oDC6V@))E;i=BEFB{k0Wlbjq>-
zJ+ZxaP-~Y77K-otwcY?#90^6Oh>sH`U*!0?G{jBiMZM!3y=;rA@QG8}Pd%G&>`*2f
zX6VS+1DiZ28Ftwp?H~HUq=p$w4Gg<QQq0TdFZ(#We?3?^mm9m!=e_uVSx7z~{7hdq
zkAufEV$l33!c7X20RH&9n4M`I##>@P;+leOhRz${{;=9cVLxfKxW&b}oNYT)?oYXm
zk|$IwU7dHrzF6PPGL)8=2a%RrJ!aA8{#ED6pd7wu|57ap62tFB<WWcF*+U0+c5XM=
z`Wc)}s|ftEW+nr=fT2(B_ZW)RPsh4^#pCfwGnwt3_?{ahqoYi5Oq(O3pGUx-kHMSQ
zc)bqEPEq^jSI``aC1F189A8}I9st+Q?T`m5XCwq}{S-4SVy@b*^_hX%hp+M!Y&`iL
zqzIsSPV!uH<E<XEx6r34xRlSn^Hy=>7$An<8QIz53gXWhmR3}pgF8Zc5?Mq<+269|
zfzhi9JR2KNcm)LojndYRp0I;JRt8^M>*F$x74MV>L@&_)%>-7EshdJ`TpvF!+ilm5
z-Q3({vnyRyFg7s>b0bSzP5<U*nPO*c?d;<6VYj{BatB<A+j72m)mD)&jgq3Zv9`8m
zLVlc>Fb&(CZ}7iPK2fOmZNqALd0&B^g@whB13mpFM5$w4@#yF%PdysB)XuF}7e3S*
z9Oe3@RD_nFR_ppwGqD9;At9MdZQ<3Nk`Qjipih<lHa??&{)k3q*-)X(XvUAGM{i&k
zTY~eH!~Lfs2H^@d(J|&_;n_)*TpHlG-$$p7SP@PxF4ysVRS-9bDUC;YIs+EQ9q)U$
zt&Ax|$x<Qe<aTf{=-1YME4@|6F~3&sNs4!y+Z5oV=tt|@VPxtP1cE};zdgV9Wh$b!
ztxsHhys1RESHjnq|K53pg=Npp%?(5i!kbU#eK>d>pU}EIoMw-?K5H)SM}_=&Z~)hi
z6-|1bpYJ%iQ7uv_r=_K3E}k`@f|Pxen=6n6sh_qF9+jh|qw`Z5_y76^sB&6#)nib!
zYN49Ix35_{F9K$YF-z<jF<?x0Q?22xq6F%{fUT_SW}IoJ>9@zs*uQ5=0Xr(l-3ODU
zPPK_9mUrn2YetF135UDBRN3-=b@VbMi%7B-?76D4Rh|TIF?D4-{3K1gyVyVSSs+DP
zbQfSk%w%3`Y@gpw*yX^0)G13TjtPG?zgG^v47_kMLdY^?|F(+uOLY=Z_m(TOSY7QK
z9yVIBDQfT85wk98|2-R~TJ0q?*QTuSq$3t55;*fLU{ZEg4h1A;%j|r8bHq_k%tlDO
zL9OvR1G?nYxoU~A=|JLTD3Fw3G*ly$Oo0KYh2fq}d6Lm#<r^D9D__p!^xu1rDs9B>
z3$HM67ktOa8z<SA!@8rN@VD3b&hqrYB^KXV<OP~9;Lj(?L%tt6l|zcPXOnU47Opgt
zviN{fYCfBk=6TQnq&Kt^pZG*;I;ZHg3b^dS;QW+v)}$%gJ|qZY!=%Qq_D~;&xzZ5O
zl#``EyG$%Th_RjJC0_0Ty%;(HFpkmH6*+N*TRjCvsbaBKMtxEDF&3}$QIcL{{q&}{
z37QgH4utQd+koxv65h*vIAiScOGZXrGBr`TIPy%YYFZq0?I7jHH10-{XUL+~nop8F
zjeUm<;sdOJb>3vy(?&-%ZrD{pnhKqvgdnTOoPR`Z8zWv7-zTU~CGEEzgo0z+CCNP8
z3GgQ;#+YBvAj+s})V5HMUIZ<ODdKIc5#UY=KP}_ns&{1#@QS07P-2WZ<SP;*NUcy;
zbuuCgP5`@2M0uvectX1sNmbb?!b%YV@}x%GRCBt~E{{KWoWVx8dQDyWBevT1@D_Oz
ze{0QJ6X#Ia@ZRnBbOcS6KSr%j<r5Sf4o}m9u4fJg){`%4xQ2@1`%8w<)|g7=H;?t;
zAR<G6w=9T;c%9fmIMqdZt@NT5%aAbdfx6O;fFZ$e@^t_jqlL!hKpq^=$-jiWHJiqX
zKpD_x?>XS)l>&~mbt1!)n7_Ci4;cGZ{gcM6*w)URx9sJ98-Lp{9mJU~ZPCYa-Qlk2
zQne_{sLrM9j;;)7cIP3CEAe0g`ZUGNv@;wC&ZqxK=FzaF7j3q1sT|?m0XBsXvCBCL
zR@ttC5q)sZ^Z`@E&?L9H^q)!h0))g?^IEi2!1wKX;=<&+-WNBl%pp2ISLl7e9`dJO
z*9%&EI?6h4v$U07@6k5ZehJ$MJvl7XAkL*^jwMA9F=WbZ4xg7@Lm{3TW5m}&3l{<m
zE5TK|oNr;-`x&a}?OvE|RUyt9`n>FnPAa}nqh;ViOH3QfgH#cIt#Kg9srEQ_6*7`Z
zdO{yX+x9pS*jXgZT?Q_OJY(i09jio1rdr#MRTMyIiZCzEYA9!^h;Afn;{Cm1IUJJ;
zXf4cr_kwuUQ7!*Ek?UyQ*!O*;-IGPAm;lZie<+tfRClMAjPGoY+!ugkhAO<d!rOZo
zv-}iba<rg{kXpmPFX7@Bd4RC(UhDJr6c^~X?HhIP4X`veD`g`z7KnMlIYs{_?Q$cT
z3&L5i@(&5+k1>0ZXAT)IjjVV~VEdzphjK}SWFHAu=w8uGwC}gT25;8KAf)=G*H2x$
z%R@qY;i>(=n!_3+EVi0cfKTUlU*J^@B?YpC6HVnxQk{|A6Geekhmw7HLilTaXnXYB
z<pm3QK_&)N|0sZpfn95l3l6@U)MWlPP#GO<7Ru3Cs<sQ<f;!jXU)2;kM^C$kPk09K
z{7(HKWlQzCEN4;-aj#B~)k^zKf$~9WiQo9q!t(%|jxV=fk9NZ%ne}>mY6f#D>~VAg
z_B{3Vm-N^hG|yKmO&3jCDZ2PPfp&E2i45HRp1Rx~Ug*wy1OtWVTjGfB{74TN))G^K
zyuB}~_AWFx5w^^VxOd<xvcrpbKDC^-o2ZJmqgKb+eGeS5cpG>1n(I(dWQ!MJ9^H!a
z@6n4@hw3ao@Okiyk;tdSRA4mKO21sp@&`>Pu!O#v-de{+3p-rxqM*Gwo%WP}n2G<g
z=mLJ-BmxL;K)zfEKRBybxRsRM^5ODg_x$B!7s`0$$GzOFCFc@O74*OzHIcw_JEZc`
zB@2C~B`R9CyQ!lFju=r`H04>7d8Hy+tBm)PBwyeotChnqc%Ozx;=k1g8V3W33o>k%
z3*`rFO>z1NggN(KX=-q;_tVym>0X#x4&C2bB@NZ$8%vi<(8V=sz7w7*X%o`RikJmi
zHjnMMz|J>iheFl!Qt77fQ#ZdD(t*M#{H~1#LnUdSUYqoM*TQqj;ztDe=SH}zr^P+S
zwJe|1u;;~AIFstdK+3|Ez$iZv%9I5m!o?0rBrWm>d)Jx;q1MVbPhFh8X-asGuc(n1
z8QltqWJmsh>>ms*u4UOSq6hsh%~gbF%?M8yNHwZ^U_JjLbuI^Q-C4Y6Vz1`7(2HF4
z6Cfh*pw6y3Xw^@z7W^}+BTjYI6yc|@yIx$F4p%4mUX!gAl}wJ5!L}_A2RAh}_fcJr
zEe|4J&EG*J6L;HCVc6xxb;$TTUW9-UaZQHc$%;U*;8&B)7WdarEqke06%Pmr(Ws7>
zkAm^%KgsKFbiJ!wxPDZ3So7T<i_Nr`eiBE-)E*dQ4-RS`w6m5GCX_}iM&0*V#Y<F?
z%|%-uv-ePniVJKp6K^7_mB%~w5WQb(R}Pu308uxCO}i-<+G4EGl92Wf(`v*v6<lh@
z01E-l1&<ooD9Y${_5a$#-U~}x-X3+$?A<4SMU_<XiLfwlMDUG#Bl}b7SpZxweTq`2
zioyvcZ?O<?8o(gebOw!i#N0o#m|hZkbW&XzS3pbH3m!v@`qP99eEhls_t`a6d#f~*
zQuYH%ylj{Ar6WMn?-QCPcJ~=MmkwelsQ0USU=)adEy0T$d46z8-soMYe)ARjd6cAt
zRnt-}F%&<9C&zKXDsNn&OjBqO3&|0Ea)|L%LhChwiEfyGsPOFbrIzfudr3{t+q^-Y
z9VY=71L;{fQiP9waFL|_L`3Jj86lcgiTHW{fiB!<U}M?rvayl4R(L_V2x7tx1oFkK
zge2dv=IZQO?}bFI|H4=jAW|N*%7s&H7t0AN)7kfqXbKfO=+vS+o?JfLOI9gKj#$CR
zKpUx-x4<>>dvx~nPK^HFxOBHEYPi*?mP6=rIC35i;Xkq1#23_`xR!CV_^}}KTCa<M
z4<<)=gAGTjg40%!Hvcle8?H2EN7uP!2dbe#+#`%L^>gVQw8ss;E5g4D&mkdt<cIyV
zTj+UZ<veDAaQzurB_67fBTBsKYtT_A(N2yu>$VjW{vk2`<8w*JZ|uSmpm7Fh8DC(0
z(GYjQnpzOl#ftmq$?%<mc+=4bY(#BKhYe_mT=|7*zz)Kti4*3}28GC%*FiBSQGn@q
zzQGvHuSK6WDNshF|52G9Cm-#o13u7@Z;jCgNg|SYP`f<$;H3_PZ{?OfHRW5n0FWvX
z84Bb=^Oab53DLH^mjn`?D&Cl-z0OC<As<FbO5l2R;n2+$`=T^X`RgC{@IdLFeIpQN
z9VarF#VkXA2N}H$dA6JbbuPy?iB~2rVF1X5+I^Bn08+4m3^s)m+HfMnp9c#hR6Z}r
zE6l`tliC~O&nL)3fXJXUO<Y+d+qGXJ43OPL=eGS{P!cOR9JB8U`c6ln3)di$!QYqQ
z{%zcTKa5|k(WF)=+w-TuOQ!39-nY`L1Ir(Hy?nf{N=QV{r^}Io4L;W`0M$27*xqMq
z8pzz=xhAVrR@R)!c0jq?D1hE$z)^jtY%2@{OS=U$r){*t?t>G>C3C@%OB7{+Ms71e
zVDwR0;#)*v^o;h9+;)DYS6<z~H|cWs#-$)6S*l5s4Um)khk{?KV+-&}s*lvIhRSRe
v9`n~Gx##Lvi=Qbi$KC%=Lkivc{)+Moog1wmS#`^GTMb~KW1?N9=^XPvetxLW

diff --git a/games/NXDoom/data/setup.ico b/games/NXDoom/data/setup.ico
deleted file mode 100644
index 0e1cb849953db335cbccdf99b67e1774a67ab049..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45885
zcmeFa2Rzm7`#63`(LxbIX7=8DWS3b8SxG_?Wp7DTWUq{nN~I9Vc8oI1EJU1SwTw_Y
z8TbEwpB{c5)$?h5`}Y03{?B>2o%g!$`?{|8J+6IFC_L0U6!O7CF`yi{QK%#En3VMM
zxeWmd^#op{qWXM(c0CFuBY;9NFnm704xf7<i9+%7|8>rSLfNaMQ1bGh&)F4FsBI@u
zsB=16s+%`ZZ-7m2-mRvz54npJBBX1Rlh<LN+@iaccImnIjHS3GJbRp8Xl~m$-rW4Q
zWY)|Uk2d+>p30(AuLy{E<gc%1Ob_%XP$SxTD#4_lMQnY1AWAHKmbi-ayg=W&(|0)T
zoiO$q8!LaLCW)aJN=zw{%9pZoYxYRB9&3wKkyI6$&~A@Z!9SyruES2g;h(<*h}x!1
zPkEmloX0jZleF?}ADHGoA$hk=fsB`1(=d_LPyvN+v3{eBI4x&kAZgnAz=Z=ufuux%
zR*VD`3JmgRpC`1ss|SwUUcWK$h>?N~k;Mi^;lLv;y_a%=NLdvQG6f!4--I6kj0Yrw
z<G4r_5(YesgE#{Dc`P;v8P-)lAWb};7<Zh=SuufFG0iycDovcDAw>y?aNk|-K2mXR
zi&tqhL8MPMr<@XVFfx75esH*SGghGo_3`Cv<x$N<{`nSV7Ull5YKp|Q`*r%$_7de1
z1lAHVGY)wUxf4`x&?2L~t1$8E5(Uw<HS(>Utz}FjJ2)v_B`5+%>{@cXuvPD>@fF^a
zDjYQWFsIN&P7$|FgLQ-Ox=kB5H8C*|;4yzhTPRfKRS#}bC*@y@$2G%75M;sF%Gski
zc-|`OW@@9G)YPd<6B~w3i*)f6yLR3>F-z`sz8ssa&fD7BD#9W6+Dza~!u1T9lVfFV
zl*6UGSoso%2OAA&?~UH&usq%_Y?@t8zgbu_n>91EQrTZFMb2*KuD1b8ml`DsLnSga
zL7b^r;>zV&tKiN`{N(r}H<^<coSEF4)JI23i9M9Z2zEYjIDdNDG}vVDq1)P%7fSD&
z(i$IGzstpvFwXXYGyYc0dMa8X*Jfo`{PT2@c#0_w?^67$e2eR~<e8)h?^HL9j}z>?
z8LeYDpc1GheBTX!>uYxM^b(2#)@h8DxdcI^RM&{y@Dt;<QCnLaVCvptvsP-4Y4*pR
zGf9VRDte>ru53h^cAXw=ASiqHO0<8`St^P1&E(u8Zv)LpMd!_Byo6Q{c!MaVP`RY-
zSO(M6cs(Wf^JA~{Z+$vxU6FOUo-EG)2zqxu=E{wZh9W_OimVvQD{t1IirzeZvd33B
zfdXCCe8jIJE0XfcMt`@iiRY(V+=fc2&*Q0NVXoZih{+DoD?zzikA3hq*d-uuJDr7M
zcfY46I#jyhJl=WCT?pJONjzhzlBh5z8^^XSUi_9Xh$N*-4AB;pJY%M|4`l>=I}Ypm
z5GK(`dZv76y_g~X+W!W5vB|OCy)~UF?-$G}SO}hs`N}?ha^B+od}%x*9i^PfU6PC-
z58Go$E&C{?)*CK>+ZtJzgFc!xBKGC<cB!%s)PxUd6)SVQi##YrHjlwJER2phydDZk
zym!TV*Q4siM|uiZ)XOHcxF~&@-*KSPi#B-7br*<8l6+6|(EFW3mkTjBncca4N~~}v
zW{t#b?nQ3XBKkz1z6$@FIc_?IK5i;;=Dp*i<KdjI1j#nav>V)~_bUs$+#cm<WUVe`
zEVqc?^cGDU#NvL;XB*9%sEt0;7YPL{!_N&^H05<KzEbI-IUtxv+^JtMHAMMjeVuJ$
z?R4*fD<>676#WmI4+@QFhDXs?4!8<>)&_?1%;oM@+`d1`JJar6x|drMNm|wQSA!=?
zgq+SF4Xk@q72OyehJH~bv3F_>`JD8o9deS)O>VEL>zZjJo#&r%)Fj+do%z)1l5!`X
z)%q|NH5d9p(B5Wu^@)8K=@lwaYI#XwUN3S3hgqzyZa2Pnt%}NFZ}kZwRjlK-QnE7D
zjCzCi-dnmyZsoAQDvD%o+!{wYCs;__cs?bjgm!)1qZHZmO4Jk{=i7unPG2~&yYo~i
zIyQ<IrM4Bt^XOc7%fgO@i8W{8Fi|t<?>`ee)O!DA{WFQzLB!0jikk1;50+H19_c)V
zA-_v=j%3&CDB3qPr%-Vhi@jWhcVai~oH4IPsa5xEj&&}m4fOX<ydAsUxHhQ7mD6}@
z)8WMZ)m9?<PdZ}LWr@%n?tZG4?eA#N&*&%>u36|9?2WzSl6%tFr@cJ)g4Ao98|QM&
zAH_ZNS*L&7x8jy<Q}_HjsrHn$YATg?yJxB-Yab?`wLVLd!6k31yv_doBVpI~6K?qS
zc+nSJ#>$M_x(A(~m{06%-G1<8(H0xxl(<Bd*M$acBVzAnGsv1r1NwMOZ*}*y4${f%
zIuX)fjO!9ElCg90q-PbRB=VHLeEIV76AYTiQPJ98+pRF~-p$eGva!@-2Zv@(xCfK$
zqN3OwTOe%E)$!P>8}0C#%=B7AXOPzZV|EdFg>u_DQB1j;q8s_{sl=|;s7jT)UT?I6
z+I4?Nu24z*r>mO_yv=%nuEmY#4ig9GGHEgz?+Lq3PJT*E=Emf4-xM8BJ8C)eB+<?9
zZgi*rr>gze_6DOioVkA;rNh2cWv#ygqW~w0e8aiDcxgInp&L+V6b|X3*vYqM;LE2+
zP;L94dDNeDe^hYLc8QWR&e|>I5d0|ax`%C#+`USsi%VkNTy^kBFPDhC>u|fd&ppwe
z)#d|@GpqZdFouu(A<4H+@3imhyOcC+z+$8ojY+Gie-?d;yze@S=$*bIVQ*4KYLDfH
zs-#|Or#x@Q=LNSfoS0+Gaw}+k+(H<ArEyNm*e1Mq*4HV%>Sp6Z>5GM8H+%8DDW)IO
z;gwYs2(UH9Z+S%*?D~Q{l|M@QQ0)ynZ?EL=a}`Vn=2^4c3U&G@>TMUUk?>fgM$(y-
z)CL6+%VzCal%6~G+({}ythtUqJSp)5YGUHpWtoW5+d0>&l3U5V7lIyS>f0Z)Ykru~
z=2>&YPC8#dyY9656T_DhDDsocmZ<BB-zM`-I&J?JgL1C7A&msoc)>L4Zj5(l@^m`V
z>c=kEkKyBe&^SZ7H^+-BgjSThL>tQ@vDd<gBF>62kO(*=9&r~pJd(bKcn1OG6u7q}
zdklf<tyS+_P2avkS**>uKpvNtpA`~R+j*ra<d*h~9a&STulC-^r1ti$-u?UJ4;tY!
zmc+;2x-?*G*`up(s;I1NrDrPq=+wC5pkq<%4qn=@%dLRdIhdwzp!#a5qm;{eT52sB
z!~J^PMYd0e_el&Oo8O~LP9(2qr2|PHKYpyUZ(l&oKw5S-@BD-CSjmr+Wvy(6DtZ@9
z$4?et6tUZ%({zt}V~21?#bjhnN=k~Jo*w_9`$Q!rCD(7?R<=poD0A1F2mV=5v2b$n
zx(a!BM+7#he~@ewH|^r!;>yU*CN>Rj-{<fwPxp4TDFu;pTl+K80%=XB=Z+MEjuZp%
z&lw(&p9u;nZBiKA5q2m!OiLI9dHcyYg-H^qkuee!6cl`1sA}3TLq}2*OrqK`g&rUx
zz<=9)=d?V7`@4M}9uhS{o15GUP>$lXG4b&kw$zE&+S=O{jE#+fbuymwfz~xNcvxPs
z{df`U6o_8GeqBA)>n=^F5=s@>MasYF^!fAWbLT~^tgJTekQ8=!A7F!Jwmo{Z(Thm@
zuBgc&8o@>qPSifui}Rv%;lYv2sv|4}n`#dB-m~BRCa#6F)n!LcSCVtNu&8KzdsGsJ
z`u>Z@QtX{>j9K$(_zWzb(HK^GMp7bz?h+Tf9G7XVH-vEXmKo`@so9-qO-oDW+qZ8^
z+)iq0Q@&A3eDafe$f@8B{$`{KI_Bo|g?1^S?d|(iE>Oot!zS>LJ<YpnfVD3(<AcB&
z<xmn7&a<$vaO4Dk`t&JzY(06ghBwQjdS1EfsFzz92{v!u%+cf!9fGUbUnXINwLiH9
z|K5DbrT(t0^mN8Ij5=>AHobFA8zQ-k&#+#Bh?<6`BMx)z?%kNS3{`6u0{l~`BvJdz
zSy@@y6MQ^84@Rf0%FIY(&_zW>+GF=-?<FQB<?kzuV!B|VxG82HPIonb(tvB%uF1k)
zFOW{oEgXARBrwL~ce%u)yg&5GM)?lmXUE;pJ$9)_>>+(^`lRXDm{rAxN~dm9>Y?sO
zaNtn0tPO2YBRagtmnOVU(bm>hWh8bz)?RQ2{#80LOBD((EE%M0fJT$U;Cs*QQm)6)
zLr72Ex#=yX3k~cX994twX6)z^uMId$3YBD9n%h5x>}3wtT|H#GSZy7uNXt$hq8msW
zFfwvvQ%!y2{2Uqn(<scfD^~)eqM~HW#b~B_XT%7+Wl5r0Lv^NR{WqWj%<sm<#ocOf
z=!hrHb(_m)L2I5kaUxZra=`I$ftdo)&8(~r;!}Boe7bDm`ctz3Gk6SvX$1u$Z>D-b
zddt>cpo!l{G*eh8X9`CeJ1?)6$0rlh$(?}*XUF><cXee7FGMg7KTMGIke`>eOk;LI
z4IS{MNo}e7_-@c^K49d4Z_?$<Ot9+7l81V^ig2c8*S!kbw7vS_MWL8^4kmjP5u=Tr
zT~qPAsLUDpilM?2rF}(x<AH-re&>_y0!iQY6mZ!RZQ3pv_%z=-(+4l=p<3~^DIT<@
zk<oTCR*kb8@QfEVQeMB|;*H-J-?Yu(xDj??Ae1zqv2o8)JG+d=rlzKg5>D5m<TS68
zGM*(3`0&B?p^407HsxE=>o;#QkrGY5?=l}X^`(K8%XA|x0w-Pzk>)B^_LFh&@mcrW
zwLMyhCQ&P_l{G@|{aALX$kd4OR$$>+9-!Pmbhm1@v+!=mGm1M&both_=nU?t3u)bB
zY4@)VI@%1_Mm^b0bc%(5>8=QIe}H;mCZ$4aYrAqL=4Azo!Tqt4Lk{#u9)t;H1goo?
z#CWMYir>9%9Qj~DxqqLA5~hU9or`ayI+5t{8&@(qFg|nqLZ2wC<E(1?K5+XcJ}*-V
zr)?~1s|mmiwWh=cG!bfc;BDSDS#a%D`nv-!Yj=9S%xKMZ3j%Lu4b+DN^)9SUaPNLv
z-A*eo+y90_R|$QVJv`PxNt?pMgjT}mp`g;kxl&Aj?@ZqsrXz{t;LsZ$CRMf^%SQV>
zcaJN1zS$a?tJ%jl_-5xJ*$~G^WVh5K)B4wEYU`*HvYHlfT|KE#z2=%QI(LsR$58yX
zSNQS`IYS0hZp@}A)Skt=Jux<Y?AVQKv433;j^snZ7k`hVtz_>MCH2;Is6D<cXr@4K
zyfj#gs~QSK$c4)^NJFW|J}JFXX)u3T|M@CYs5joh4CJ|;n^7$2D094es?YU9oj=zv
ziR4A$?redKr_K}?cALe}MwEO5M&?44`SG2b;63Ds(HzB&jh#Qw-@evA%Df@xrAi43
zg0=qjm7#dDzd#LykRFSf-{X7c%ICIG>*+TKq0$?e!LtSH{H|LKFB7$xJO=k`U$4K*
zEelR=%#y`&UN&hkw}D9H9mDP@sg*lECy`0(Wr*(VV%A1CDjW2L*&aCIvTusScSxGR
zKOl~tQT)x2@<JT_^O<N0r`i+KhvL$Q_{fJg`Qyi%qu6+4ge|k)JSL;GaD9A+^V$&K
zPKeF=A;JV{U%lG>Ph)lulB%#Bv9_;v$rz$9gH&SNVC1{`!umm#BgafNY2_$PyWj)+
ztxfOe#m=AJ!LcSSVpz2@AySc@_oTIr>H25KDKk_r5D_P(818WKzdFQ+f)bcQJUszi
zKAKxgwho{h$m(3XYTj19y%lmjHOeoS$rMGvVS>eD4WIBsDK(Ptd$fOKzj)^9xhLD6
zk?Bm4nC;x;UmZt}7tK18vxa}aFC#%TTPXA8k*bsVWLfzYr6vt>FC+L+8%%uhG~U*2
z_g9+Q$e6(I>s*$_M1_CEK!%9xxG5)=P<Cpq{8@!qdZkotJl1G)qN*$B1`n}@x!XG*
zba|qxr_dm07$Jy)$P#FbE3zHbo+6aOW5#FLRl1&@*l^F{u0UrzotIN~2R?P7W?1Da
z1K(M;y2#v_7u|2|sLe3-R$kkF-_VX%_zW6&5QQU;TkmG$sVOf`7ND4e>I$S>V>je)
z93UBAKhw?nz+b)@#jb;8)24dV;_JTWbrz#Cb_|`xD;3TWUB?zHXCjhMHsEmfdTEqj
z+U4O={Nf{zlXU~Hu64>G9qJOfFc>Z!INc(C9!oe8o}Kw2@){Rf=9m!$7sm9F4~cAz
z5MNo4ZQ{9bEZz*0@T?B$=|Q`Z$}3r}!_TiD3yQdT2bD3B%+38M(h2Kxm5x~QARkKB
zWP0sp&D&c#RLhB4^4YK=o5Rdc@}o<pxIZLINZfX5HNaX1qkD2M%02TXX(|6G8E2&|
zD*lXBlZ!Y=p3l5sDsSJ2x1}U1OYW(>ow2ow?1Zxp9s?fIj|OeuT8Rk1{$!bA(9*?!
z(p>_zBgItu!@TkQU=^j&+yjdCSkUWq#A(jK_o1(swsz^l#VENchlNoZES3+1JfY7C
zvGH_E5|;5GdMjbKbu{_j*}*W$voDw^6^M?$rY@ct1vQB-#`!Zmh%B(4s@Ttw1XX`-
z-pY(5%dF&d8*>ortrjnOpJq8a_ekq_w0b4KR}5y5V<af6c|>)THgzi7cjwax46l%8
zwAZ*-6bAFjt*57VFbvDASozA?@o_+LveTzS#N7@@s<EAqMRR8!+u7QZ9G=~{<rM6X
zh)_N(4D09i-eZ2IjLh?P*LdQ(#fixH;@N@tr>45}2AK=97poTh%Huf5=3G<!M2Ev^
z`ztIdDNR3d$r{aBne0#rr)x5@PJXzZjlQaWV7R<_wtw!@2zv3;rkB~9{5B$D4Zg~_
zUtX>Pn_M0bc)Z)v17PKJhqM+p9!sRi$^Lj2EOh0Uy=!J;cpfuIJQ`*dKfuB9S~tmw
z1-(#`)zl(_UStlJezz4hH!c(+gm&X*OU)%H?2VoBURXr2CA&%(bM-oH#pgurJUHZw
z+3bq1(CIZtUp{R>E8=%N_06ZJl*WeO$$l-lcV}f=n7gJ_<7D2y&4L^Bx$@cMwoz=w
zyG~Bt@{`+(8uRIvTG@7Oq`qW+nxrS(dSXG-tT#~`D}=qI&WpYnJK>9;op&q9KNOFl
z?~HtL_mtEQ;^W2R0rU6r<%cL0Ca0TPs)ir8;Xh(H*~P)WrhTnEFYi?G$6FasoocVl
zi`?;t5AnM+x@$>c)#TIG9?&B?O!|s$Q<Ob6nB?8N5OwV)^EaLmH!9N4T`+gBs=0Ri
zai?f&XD6|Loo@A{g<^uN3zLwwMta#pse?m>O}rJ)51SoW6y1E`k<BTJz$U^2$D4`C
z1>q)Q6iv_gaoEaQ@XEua)FThhS{hMI<a~-@OZB)YhB13EYJPk}xccMcM2m@z;ZHln
z-$oQCJ3dqx@pVcqYvK#69DP5Tu~FONsXZW6xK3J6y3fTO75cGucX~eRV!YqPQ(Z&s
z<1umCV!6EY<e3@y(Q|a3LFoB0yo&xZo<%qD-9zEjJ2)?iT1m^5J$KfU8@4%r{+WkN
zGQVbsP)ljpg`|7I6~zZs6y;s;_b7-C5f%;iY@FgmTNz1zeChO7W|k_u=+i9R1PGD}
z$DdPnVQLFU{leKU8HHIHdAw0?6)u`$vsSjhC!C@Ge*MfExNI3u@kz|1h?5E(#(T-4
zt{kf44U>L{&pY3c(_K&+bT(17fbCx2i45iW`}p0a`ZZS#7UQB@N<te=pX_aFwo-jj
zNZcKwI5I|Plg>bzPRj38F}@KGX;$u)%=_*dCrnHPd6T(UlE=o1x<)sHV4mhH^N|;P
zCr)b{dOyRKVLO98q(XAttICQ_8*Ib(QLI4aHl)oHIToMnO+Bjqu9CUs<dl(IdUk~X
z<RXQIMV-b;at0c#&CcCa&(>m;Oxc1SQQEk0L*`TkgEi`~p)X$9$JALT!-X^=;5li_
z`{~tts-TNPSo=*iLydOF2i|4IkIsKOwQa(i_U0KLKeyW=x@Y7i;cjOXK~E4aQy4&)
z>MlX}gk;a;i>YlUo=+SC0)`A1>x~v)e3F~`bbdDDb(|*F++<NSr(zNB-ISZb9-&@6
zqAO?hGNn;L6Fv%)g{TMtEVHu2Sc1pA$5Z_n^4YO?FBuE<-15s&Yr@52gK9_08tAc4
zIHo;37SBl~@E>>X9GZAN<y2=HKK)WRCrWSetfy^akYfy!FyRfRL0kD7)EoJaO^{t4
zCqy0A@Kti;ook_MS^!>abXhO77?#^_fl}CFd%jWm5!0Tj(mq~dSx4e&5~+xHmZ}1t
zkBI_v;cIIOYvk-V#4=9!ObXzk+tlq}phcZN^hK*Ky4X#24jkUUm=gPBeyY%I>Vbi=
z+U~`(e(me=wxPBn9aqn;K?(ArWg3mipHCE;K6<B4IaAskdFYwPY|Z@J9xK}hIcK%)
z@unw<M}2{kcYizG8M~v$2P%Ru4d?iI`Cl99Bq(T$im`p>-p7*c(j%}v*6%?t{ku}R
zXNu}}Qm+~?rhEgFSIBWINVi#?>a(rfQd7a1uaAzjPlt_Odz15W+9*IxfSNk#sonTK
zY8qoT{Y9Y)H*PVEBa2l<`(4+Tq(tN5ff4lNN8QK;>W1Mif5u@mGoOLu-e%h9VG@E(
z<3(=-=zL$q>UfwBP57qlA%d*llnZ{(VYuf%=N;smm93f2K(};`Np<8L3Z-)EUvO-k
zlA<L(UNp`&|317clSfYeVonS&`>^picC1Aqv(Gcmyd&*KaV#OdM>=N8K)>rmLu`}#
z%Xh=uBjk!s3g@rUblFtPXpI_@_x1AZGi^?6adVt}(P6aM(|f}}KqWMrSI)0=&SGER
z6yMyVmZG;&`Ez|-ej~GC!$Ed@nmRQ$So?9mk8APqGFqn43;k@~pxQj&weQ;X;hn78
zuvLqRS)^xGD^T_6^RAI*dRmrQ57uXbgf|YK=rx31?Cm*sGeJId7#Qu=v^U)|1)k4g
zh69|m8@f4)^IOC(!L2~!e!$iy66*JxHOt;NtJ*d>P_Y89u0a!*zEq}9bb@St?i;q@
z?}fZ)aU6y&y|}5(ME3aHbh$Hjq2W!uQjBV<CkG3*?!t}-n&=AY!O=lKm-pdRGDpQ_
z8XTr44EnXanlL?`&2sdwWxeZz<_9=#YYDeG5j6!k<DrI3e7D?T<F{>emS%ZyE-O}v
zyeZG!X*hUy52@)yR!&jGix-zeQ^WaqU7en?U^2z9y9O6Xx`Hl|$9OuRTi#f7x8|M2
zTB-WB%KIO2xlSryi>i;F|1f9W(l2zPz>{=%non$P&iimXMd$Kh5}N8)nRL-7uwz}B
z$wh(b!xePHgx4KxET-dj*iM|$xF{TVtBL*&u|6^)pvXv=ARw~%BCY?vAsD_^|Frf|
z$C0)zgaeK*jUvs7PG#HCp6D)Qio4F@zT=r<cag1E&n{t$d7G0=eo7bL2Cvz=PJVGH
z__-o~#x;#yp_=9nA%?C2p23Fh_p6MeF}zYU5e`9daVEb0w|m{Ln#NCEDcsi-Fu$c#
zKrq<f8!ti?dj^%-MJAA(NTvV8rM!{P|3-9OrU<5jmQy3~;Ka4w`%NS|nAR9qQ|U`l
z1oVck!z7fusqx$U$c0m<PFETn*h;Ns8rs=;FK{~acF*<5ntV<)X~32mX8MzfhQ9vy
z?uFfbv+wn}G1^BL<_Cri8(NylIj6?(<okyRtLt9AI=iLfcp4!VFIh`<|1hP3l1Y2A
zi7(NmF6~0zwprbWx99Vi%uz#oeF=m`3a|30*xtxA!0yt~*H6;N;@!-8^HS5db<+KO
zN4C11vFgW#0Y4{Bw6_I=IjVbTm#=?Z=ZCuw*k_g9XlwUB^4(ipDtR0G!OFqH&BfH_
zV#6?D^$yQhkFVzEZ!8#Y;W@cZ{?ZWPE=yfI8}HYLG?D}b?tMBjwWe%(G4WO-U*N$f
zsz`7C>jzaK6+1h_#*5jpP607^5q#J){<pW4c2HQ3gf{HFdEoFFg2|~Y2P=IjI^^US
z_GQi6KpCU^ZhU#xP1*3NrtKRblOa1y`0?c6hr29&ZmCbJn!GGWw)bAk5i^)vys4ef
z3SNiHWnMmH5KutP<F_|5<f#x_X8GG4Qdu$c5>U{q&zwi~y6JVaJ&ldK^5B88w-YFb
zTqbV`mc&op_^sZxJKQ0?U`jsV{f!6Z&)g=AicFgC#@SP`#+KR*j&5fqoKjC%1LYGs
zC`v8PX|R#<D@^P*t+b494u|R)$!xRyu)0)Fi3}*&xPLe!hCQ}Wn-F_ZjqU<7aca_s
zyfr~pGdBkJ8ZSPB?*<Zjkv_$X8~DzUxT~wTQ%qhNq!@6OVz!P?3)_`l{tnt27nrVM
zuL(ZtaiPI3+@8J9&2nd+w=jBbaEqqb)8p~cz44~C=jwdfjz|>8m{-V02%%1L`(5m+
z@o_V$;XzkWx!H7y_wmf+rVl5(zrB3+!Ol4PwEX;#jl5VEyDs~eh4bd#1!uT&Dq^#<
z>$8ToHifTK<xN)gxLBxNHRvq)@!c7=6AMp9gR(d1O<B`m@fqr-CQ7@U_e;;Rg~`2s
z-s<(q_t;{GdPVrPH#1NvsA<ofdC6xj-~8Mov(cnuPx;VO#BxP1J&(SjW*&iq)3i%`
zZYE={yz9ivU2{|M#yJN+JwCDiKpYEpcqa96YN8GUIZ2X7hJ4GpdF$l6{)FRYVUaaW
ziW9HQ>z+Y|5aDKeS}I;&jjeLXw@4_PY233v$EfAjc3mooLpFPw7CoKTieWs({LrJj
zH+6(2Im|R2_t28HU{vLiyly_#TVv+1K4gSm-b<Cu-2T>Cb6@v&7o*Kp4?4e{*POsy
zuHIGhj4SnyUPARQ(c#&+xJfxN5U3j_#eJL4hqD9WWL{nt%5Wgvs{DelI9n<~%9@X2
z#|ehuhe<UF0?h227d~ZQEx6FwNZs$@w;7J!2bp$affFyI9V^xk(Tm;<4IVG&U@jyG
z=kc-}riMG5grsEYp_?&JdC+S@!ak8e^W4o^{1|O>PK~*GwvAI0B6fnaeJ6N?GB30g
z&40kyIh55&P@0p`b!ko%j)!p<(wld-y&{RfdNNY`<C*f|$1cZ9u_uX>OWkUR3(XDQ
z-Wnk(lxw_q{$}e7A#^XFB}&bmh@aV;D8d%2EoX~If^m__P`!39Yll?wYhm3?jmim<
z$${4eTefLx`x4PHQ3Y+|eG@W|k`sSp7$)~g$_NVLyWpO>Hh4l?)1J(j>!w$>b<Xg)
zFsz7k<;!lyCyf5yDgF`Luq53M6mIhaf_u*Q8O36F=ll$kTimn_X>Y22no>oNm(HtG
z(pRsA;+#Hq%%ZTV;VR{hmWQ^3(OvmnQ}?Hu&clWEDlvMx#qfN`0F(|tyy-n&kw_M9
z9FrDV9O>6k?O`&V@5I!p`(daMBx@0dge62@(VW?rJru6oE`@Kk$dt-Bd{rVEL+2{)
zd>lPY8A>Y<Qwp$$uS?HO*(KIq%%p2zp}a(U=TaUYTIMYe&$%4yyicle9N57K2NH&j
zQ>UL_aFbnM&L%dcT2V1RO6fG3nw|M@l%;nn9=pfLb@1x^$IH5~|8YbFdisfn9V>Ji
z!n_u{))8dn<lVl^nK`9O%xC7v-;`P&5*=pjpUt*acFF}aBsY_`P&|=MgKe&w8y!lJ
zYjd<WC3CoCva$S0>c>yB(x%$OXF{B<@y-VYHRB)F@g<<T){uSkfR>@BnhjlXG-h!+
zhCJWBYM1wD#G323?GE>Ts81dLpy{jG^|86ispwr#h{WJy7N3$Q2CTjAqcVJXPh__x
z+**vZvaQdt-0emoUsBJN<avd^O^DO4NT+g|r2k<RreA7wijA}PUU}50nP+soxlcTg
zv0GHwyl!Tw^}xJ?(@^!Ai%><Q^}4rrvV`y6i9w$7`JEDZ+_!nqM5ct36?$4~PYnI@
zZm0(`GP!ySvddM<dT9+8WFFr*5j3j4*gbIbwWO@s^jdR=8wb6Vw{5<ldAGo2oz#;u
zx}cc31Zi7tUDj|bw8O(AA9M4{I>lVOg?W5W43;13qbq&i5<2f6gU5g|^5?e4j$Lk%
z#XMXHM>iH{@@(ga3oMn$Nh(!dS@A)a1{EK&^3j4q*@m0QuE&<9NikH2$$k5Q5E}7!
z@K0IWRTSS;_fn+{mnjz<Spyd{e2Fy-AyaD}cZxXm?g%F)+MO?e8Fz_KDv|y$(>U1|
zbNaBNFHgh7#tq1-*EH2j*1u4RetOr#+D5{MjG2_b+sG)k(`#LO9J=Hh<9uLRMW@wh
z_5m|rdzbr!Q7l*%<q8y0q$YMP=_HNGTxsdtP7_Ug8OWy+1=G6_Zw!-2h0>{ud_AUo
z+|#e+jf2laWx4VTPQFE<z-!X#=$ph(dhvd;GpXaM85~%lFz4H|nr5_;8zW?}%$a`A
z9lGv3mzpCC_S|xOtYowFO!r3V_s{$kv>WcUi7&)t6c6;!E6V@}20AUOpawa5&x>`b
zzCuUKrBbxu@<6D{Gfx2(3_Mqdz2{%C9>;bJ4!DqNj|_DQx8}aQ<)zKZcI7Cyzgzo@
z>vMSBe0hv=l`-cm-KUE|?eHG%;|B4m24-HtUK3tX`t&*4I)meObF)28)M)g;$qxxK
zF7l0N4?C7Z%sX)!(J{5wpySuHchp6lagvyiaM)R{df6gje*Tl!^=GE4yhD`!+4yOb
z@3ao=)S#7!#Q63qk3wF@AeHPrOHTKlq&a%uxL|s}$WKA6`xbWRGz|~EnARG8F|GZ|
z#UZV5KtpqogbE7LS<>&`ZrD_#(Hhi!`JmComYV9C(cGc44uXf=jod5Ztls6Qnhj!d
zvRMtLdJXVhJIlFZ$@Ym*DBzJ+kh0HB_41AQIB}{|(xEDQCww0I^}CY@d85l`{95FE
zpV{yhPwIu4db(GKgn805-xogRU&WP^^CG>@JmcCuf!#ERLS8gEn_7=28@<i1I~+*r
zJ=qrTy{NyoIEEf7*4Ff&OPBGdZKS8OyUP?hl0f}_;s{+dYuMmr`sDjjX9)M|4K<#d
zAKQ^qR`J4;&gZp@tAWT)qmJSdFNY&TgxgU2NH?KmMxktVe#5DUeGPS^?{jDB6(wF3
zF(*8!al(FL1_m^R(=VpnJe-E9d!$P0u|9M8?9hxBfj@Eoi~xEq(PH#QY>h6>ZK4d8
zs)R+%L(3O|ccd5U?TwyJrB2r*L5%_L-7D2ma@|Z&^Ih@=HB~SiuH@v|mR!-jPw<3L
zc%Od3K*br2OQT|%Trb4YlQ=CugT|$y!gItBq*^Xgez+99?TABX&cewQ<oR)<zORJh
zu4Yty{=8@vDLZpV;kzCqqv$(4=!L@4l1tU`<`tw+3B2y?yl7%R`J>@SFJ<Ok$Fd)F
zL%}8cCU0{8;?VTiV6gaEsDfV?0UydBADHP;jI^u<nNBo0DWx}sJkO*;uLyk?89q6a
zD?{`eQ0!Tw>6`SD)W4!JT*a_+ar}cSu|bzGtGREHO+*u)#X2=N)wEOW=nEt4%BaM)
z<MCH`<do>~55E>$Qzh$9&_qJH*%do1wMe*r78S5b8f#xNOYmv&{v}g=m+i4~o+N4h
z!}0uUpmzHd7t#ivwe4kr^=7q=8GH5nA|?;`JBEC6^yGKnERWZuJyp+hcxa<P9<Lvj
z>Ut(lf_>5S!uWWnOFmr-WSSkmS=m!^?QABIDsQ&qP<*Qol!gwH);o|9pL#r8cq3F|
z8`ZIs7~b{$DKE*>qR<Qxyr^{-=0(G{26m8nr(B*#*~#{`PC!zA%734f@kTFVs_7zr
z``XI1C=9D0!M+Ik=jW`=tm~Rz>qO7-g675pm%yyomJr=3%B}4MWrrWmpOwPjjE`j&
zkZQa2;cUSDsoudx@2knq&nzA$3T!FNnhSNf`|?~Pf$1U&PT%Jbh9^3DI=3fUSu{;l
zUd|Y|zmW{p(xe;wTQzqP#?FflkiIlpoJ7kUAKtLg<Ev)fgs>T&jI9i@^p$&Q%M9yZ
zYY3i-LemuVVrZt`<83;EwWobRR4!gc#NsFRs!6U@?!z$#Q`9C;to;iGXsFRNABuMh
zmv2|}KTCOfuW!=ifczvQ(;i=)smx$!FVwCL^1d{x0t$T47irJpOe8;QgPJc5^kd*#
zznL97sG7+H4uY*So7b=Lua3gh4%D{q*$OS8YzhtZN);$}CD{9TLf9@AKc=lse52|9
z&ME$DxzK&GeVhG{V52qChr+$kSEf#fdZE^G`xTujk)kDNgYEXyzgJhs2FSxE9I-Wz
z9`_NIvtL$fpr7?US2!=)z5~BLu+>yPss@k6@2EbX<52IKh)wCG3?Ce!5$oWVL~g0z
zy>LdNxC9BHm5CzV#f?}!Xaj0@?$)vO(17JJj7)TkSG=tzTUhq^wsi<^O~aQL3}Ae&
z(!e(xhk<@HfrceQN3<*9ISthPvd9t~hLfnz4=ykweT->vN^V0%k!?EF{iZ5rJ`Yyj
z;v^2Qu7?gbDDJ*3oA6lBde9{&@QyQKn;Z$Wyh%c@oV^6I1j+2!VfnTGOvLI=48p1b
z0(%w}6yYf&6EB4H%-Irpe<qG9RBLPCxhORMUN6*nx-E&9o<p?E*<pJ#d-w_7rYN)c
zF{b0oM{aF{knoX1f4typzIdGmZ);8|#A0q38JYU6+42g%^3BVr3EgG}g^oK!uEeZI
z92-e=Zq7a8&Mv__=ZweS{Nx@p#)axFk*4;P&Z8<Wxyqu;o#&5b7oIxnjK}b>Hh+(>
zAF$pjq2R=DxkC1|@#0n)|0ANQ7eidcA{=M@C{BmmjEft?P`^snvHDnH+Ys+}k;OT9
zz~=qB)Op@VhtW~z{ciQ_Jz<@_zfXP_H1}P%IqJRG%PeA$=}6yhQLMjVCiprjmG@M*
z<GqV>o~{eyWA?q-jqh*L5Y_u;-xqLrF(kKExaEawhrmOH>s-upXGv|C6q;Z1?Vs<`
z2oaNzHku_m6?Z1*de{+n=lrVl0&d_q7siG6N)r4h&s?1I?t`=uu%?@Mlcb*#%Ni8?
z>{ixN%2qfSzz&Z|VPSv;acjnXpeu7Od<rRF`!I?bQF5~GzR1C*mh|_cl7gHg_mF44
zRu{R(#i0=)Pfh?<7U`|)fHc`UAPb8eyoWsVt@@no>QO7}if>s9#I~#hk}KLkp7~aN
zZf?ye1&Xz}{)I^iK!DS6;B(C8Z*6d}tHpe)J`ay}lnM<I2y=4)7sJkj(t8Eq&aEsE
z?CuPX8|mWU;9ymY{Z@TGKJBR8j2l7fd4JGQT?uRqbbz(4Cdj&)0o<$(;^5$5QH}dn
zeE}hzC{5PQz}-v-+`D}Pq{T*p_|UW9QcM&uQI-WFkRJa8zmV|0sJ&dIpuVgCOuw51
zm!d*J-1#%0^Kl2boDd7&0Ri|Y`U#8fi_+&O14hEsK!;-scvMpkYD$ZM9MyWDx`P-;
z*MF)nDy|o0B(e=4Z6I)1$g%?y308p6bm_hPQ~kZVM-#)`4gwbgX>iI~7dYz5f+M>{
zft8vB(Bh&6`^7kcl(=5fx9E2|_~Om!>1i-NJ`Tpl#z03$2PiHs2I=YPAS5INc${zq
z4i=8(->T0b6X?hwWD7V%O#q{i4PfHa2TUT?fQn5MFp5|Ka%K%cCl%oMt@_mB0mrFC
zeZeL=4e;f+AMQHx%(v?E8C~~fQHudI;y!>$IT~yi@dk_vk+3Zvz^E7j&piQ!h>!EP
z>dX6MNLBrxACq(Lwh*&#)8jU;SK&BNr?ga<cjxGA-R)1jvi@^I6zW$Bvd+NB2oygo
z%j*mbkvO;Zb6MHf|MoF5)}*&>1Txz;e6>iCZv>KL8-X<ZmWIzD&;HZ+Tn#_>PWj4}
z>($C*DY#}Wty?niSdMHhZv8{*tZwI9=ih37X<d}~N*_PcJ`dZjFW?s?T?=$XdBI*`
zZrpmcx)08svQ^)LclC8%c7;kss&&izfglM1;3ZxM9@Nx;veFVDx`ptIKDd}<t5>)4
zt#f`ZrAlONLHfAhegYgb)&ohA7eHHE8)#@~02faA04psuaKh98EaCAZ?F(=#RjSc%
z02b2R;N81-0Qyma;{05&f0raMkdpw{(^ElZWhE#qECjpR>2ZB<GD+8b3*Ob&1$mS!
z)tNQ|q>uE_(_nI90?4s5fWkZ3;LgqKK!KGW)YsJkucKB#gmfK_R-BB|_gA;`t#e^s
zl}cnkLHh8u)CX^0zXHm9P|*$Xc>er3P~>C+br0?XbG2PS5Vnu>@gwvR5m2er;UEE~
zk~_iko-TlV9L@Fv>;2l`kj`#kt*-^1K79)A-N^-Vj8u>hSPOn+e2NOHRqo^20uG4o
z026OsfwwP*!Q9*@P<}5D6y@FqBg4bsQDXyWsC@twcaY-7*^jg@F059G>{Un~2W41+
z7CQ+zt|^7X1NxVOeNuuzcH26j#kPHU4F5>`5+b`R4TZ>Y`ytW?LM!BbJgh1K4d@b}
zu$>S$c2}+&KhnOW_@2rGVie$OeJqWurTMYc#}BnHp;2inNd<nSj~{72C@AvD&_F-v
zebNfLTI<2%mPXK6_W+dU-2%6-ri1j9L=YPh1{{wZ1P(S<Akf<b95b=%|JHb4eLXTd
zy<=`}4mWrE`}+aH8w?B#0O%cy;|rjhFM$5tATlx%`1<;S)6OS=yUmG#)$M%ioI%<@
zg-P@X<QI$quap^Jm9PPfe0qRG#0YRmS_2vmZ9vPR1(-!F05zKipxmhr7$kgBzSZ99
z>y#p1N%RT{IKBblDd-g9|Kl-IXLUQ@I{)46v#H1A3Yy&oj7kZBO4tnu7~jDiBYcd2
zaqj11$lLH6=irX1#r?rHey1DXf_L?GCHD>&Is4*yajU#JA(LBJZvE>YS+z1gFsP)=
z&?|jewu_(ouw5$1dUZSh8|QFQL48Eg|CWNZjqqU%u*k!*%!fe%&;s&zNcnI0uyF6)
z$4f6X$jcxw{GSRpJ^u&~y#TH(KMU)!aq4OREUr9EqR*Dr$$$D@l4+OZTG_vNJERWM
z#?SW8$0&mNr+$%pl28Uj_{t^Tay1M{8^5D}M0Q`|JH`K!$-f4}uk_E)^mY7^z7f7u
z_%9v>(FuGD23`iC=Rb?T0JA7&NlsmQ4@loaBx`{p>kg0z_oBGa^FWz}7RQTy4F*02
z;h*kbkVOomw0+&Otc>){PqGGZZ(a*5G*oarZFO}uFjtjd<_A~9@GJNWvWa03egT0&
zk#Zdfa<&H=Vtl}Kw<0LMn-5xAT5vGjg!&9)$OCH&Z~%t`dXVoWTpp7=^n%~Lf3AK{
zLhRxgRl4;!eZgrP6Pz4BIy#Emvzs3_fw+*fAUZe@RFsthgbrn8W#Hbud*IL>#pUtv
zEB%XbNMI2C4FW?-un(A-nZd#Eu)Y?E(Nln39E?DLjR8nAP=UKS*~>6E9W-7Z4?J`N
zFIMCAz2~A_5*T&nO<)NIL?%FBIBv2Z$4_H07|`9_4G!*60ycVDxOd@w%=&Nhf_sPH
zPxmjzBZ<Mu3xB~7<8uNaeDHn+38;q(221Y(k*oGe3ggDZ2{S_=0O#e>+~od+_b<*X
zh0%sQI0D07ZVFIQkc;ERLw($Ux(GLDeb@*Z9@GF8J~rTU+!j1}@&w9z;XsU%7zcyY
z*0tbQ)*lHzDGZ{wLSQJoo{H-m`S)RF8rVQth6Bp4?3>qsgPJPfX?GXs?d`?E5EkGI
z$KPkY=dbiHDIkN<g>nJ{gOi>-SX@}Z$vhKpU*ljI8F~R;VES=m64B{3L)izBuM8x3
zm*taR>0e4v7K6w`OE5U<NaOT?#$rsMD*qM^24p<sT)PZpn5n=nN+Kxx@hta^teL;k
zzl@M9#^5h`X$gj<@!)5vi|ZfxXREIPc0rkc^;-R_{mY8VVG#Z0*I+OZqz2Jm_8`jB
z9%yq=;?}5@YxUB8@hkYtiOFM(#VNtJU|2afm)6PEF#JmY^5XIsMBe)q7=ERH*ORWJ
zc^T2*R>}oP=ffbv-4djn_XHVHXFz<QEAX|_1#YGq!2j4m;Ct*4+<UZukt{#Zm*4?r
zdv<}Ndv^nUCGA(=yWXyT?)sJM6Nrq6taHc*(IF!RS#z74n{jikqM`!ay?Ynjym=EO
zCnp0xKR*Bi6~U1sN5J{B!64wI)9mVYzxVvgm7F(7zmt=bxPtUM0d+$2^Yfsqs|&Z@
z!$?$I|CcXc28oGKK8}qA@$vD%)YKG&xSj;39G$1Xx4+fTvB>&XvqIfBJCtXI<Sl`q
z+#$dvX%5&#4!~jrcqL5$w}c7Qi|c_MTsnZBXD?tD&<6}WI#9OV187*)0h5ILckAy~
z_fIL{f@V-j1tdF-mgQV}g+xHgX1;vBLp~a8<v6^2PAd}z$aw6Q&yhA(xBI>4NL@yi
z%YbyJ@p60gO37dgyT$T3-L6=$mCJhhoK`LZkn`9tpZ_=a&nO?*B6p%0aOxERw!L?t
z%<c|kj@JV&gQCypV%|XNXf@zDP>MUJmIwf1N6G-dNd@klMk)xQMdSC<d-ZcN_T`OC
z@}7WR+7-}Ax&T@+CqON75>N>_0t$WyK+bFb%|ga)3*Xa0Kq2T-y1L!(Jy#AGkkSqw
zsa6jhtWfjA6exQ3-I6)kbw%8+BT3*;Yb1wZ(^(F~hOZVD?czv!g^QQzWnu)sx4%E}
z9J0PFqELQ+q9A=EdJ4o=bP$$hJ;hEGifrTO0x$pj`7fgY7pr2fIOWzw2?~;*Dq`fM
zi(=bI7sa=c{8ixbinfrpxmcC6e-~LqXy`sI@ozu!jmYOx(60f}!N?#5>Sb_#4v0Qz
zg-!@*6Y1l3!7sd>X6{GeMxMpN4&^08hlAKE{}T>KAOBb2M_`wLurJy4z6Xc@EAS(*
zi$mC#bXebugV6s0`XjK5Lj5CRClrM`xF5kmn2P$hjUQ2J+W$EI5!i(x?1-InNmubB
zI0#YwzVR<cOFQ>9S$1hoBd`lX{U<-vL)t>UPq2pz2y$}*N3?f;_j?fjo$&A2F^AaT
zzlMV>gq;uSO?aRVlNZ8YRB#vEzkeTRH@|)3`gf0|-${Q7I=VR}>d&^=l{g@<^Aba!
zsm%m99jw6C4FINw!O39=4u~u$M!w;@a1f;Yed9-xo_-Few_Sn5ZiX$ueD^NE3CBCf
zrZqTQKcYWHd?Ow`dbEr~h_5G5<6ywyAWps>7)lER+3h4>tgXKlekS@k)g7PpzDw`n
zR#FVkPoV|seWT9?LLaurIQbjV`K`vGq__wKx;TOxSFhk?<5MT?ar)quYpVd|?^}PQ
zm>K5~AC4s)td&K<J1D~=erSlV#W3_!K<v()5cY_`Q^0DkIyemHZm6FZ&KG8BJ|OyR
zM840@&j(ukY=6T+fa3STFSC<z4$(O;;Slfd0zQ2B0H&s<mT~B4Z2>C$?6|SCG#`*T
zy&LLcON$DZ=kyW|h`;2@{o%L5&&o81_&Y4&phmX=B%XE$(-8h89LzP90qZ7wa7bGX
z6hVKKyV<wEL3L%^x?~3ZUl4yG+?*~i2Pe&qaK1?^_XmCo>iOTr|H!g2&uQ%3g!9u`
z!T}jechVAY@1d{vDd2$XkTRt83pkFDvDDYshZ|2S+$=bss)~|g91iEa+`hWU@o(Gy
z+u)aHXP!fJldEw+=ib2C59+GXfE~i`Y-#$p`GDYX4BC$n`_?UJQ$p6In6qbq0Nf{5
z@6&w06Ml}JbJ}dgIJ?729B!vw1dEG{V4%Mba6o@zEpdME_U+qc91wfVZfFBT=0i2y
z3y^gQSx=FDdL<6XI1>7e{Ld~fmN~??XeACoC#}K9*$;@wjl;ogj{*({*CXbjz2y;T
zfwq+6&@YY+&ItnrspYlxVPhjW2IuY)4v5b&vJd`F{#k*Wbq=w4Ea4F6e-a1x%6~)8
z`+*`i6AlMtEFpFnWIoHX(SxSCTHJg<Y#~eggCn#{Av_b}^NjFOzY~5%9@aU;ziSBx
zcOw-X%~!&Y98Zpqf#@KAV6LeIOrg#4f}bbod)B+WKOpk~!2zbI1o~2NAN~vW-wnSK
zAKRQB?^c{2+!7Aece8NdPft!j+fNqG?+&?u%m>5<v~qty{O~do<H3`TcHDbNi3<B0
z?7tg+Wq$TK#BQ|`2Qx_~5PH%A=<!kD)+NNR5Alm%jYGlhn?OfW5YE>%K!tWQa5LTu
z_Aqbzn@#I?!>=O1KDS@+v!CEf9G2$8(%P!Sz7=N^T*3j1#R7iHO+X0BlPmdF1m4x<
zcaDEmL5?}Z2l0Dw7<)N_dk4tBm%~FqgnS)X;`#mwhu;amnlQ&4VsrZ*9FhXvKurO(
z{lgOL=e*4G{U;oLC;YobIOh-_&F{rw<sP@h^R1R2{x`?Z9#O726A4P3pXu+y;djzs
zU5tAUv77!*9DXbO65MlU(%Yde|M%hWJK@jDNM3BMuLRAt<)9vY4`e5YfZItS;8x;!
za4$0%`jKRVlDsS!Q*{ko3iSuk{!ZY6$1!lh>ja3u5CmdEf<QRjmpzVJ04p68V76Nh
zn5fBvqmVyxu|16Qzjrc&k*&Y!^Q86BA|j{2gzU?<XJmauY|qHGSFc`yM#z`d*4Bb&
z&z^zK&Q9Dh5_gc7mj@6(=Iht5<LtnvPMrd7Zf@Yhg$n?tOa^Cz&VY00&VdkrKk%Et
zM?G$NxQM`u*s7Oo=g2W)vqs=YK8Osw1V7?`4YO(Ee76wzVFG24nVE@$|Mcn8AUZl4
z!0f}o!omVLS{(+V5QpChe_Ko20s<q#+aPcwu^xzT&r0|aKXQcj2!Dx2qjCP@i0>H!
z|JAEkalQZv2?^lh#fu;*DQOx0<CYd6#@z{odwc!1@x!CwIw`JT0VEVHfV7Gw&^9~?
zwDvpVilT-M5LbY)hw|n?RL%@2s#^m^4QrsV#|p?OTL5kmJ-{in53md906uX&AS?s<
zW~u#vUwj{6U{?i<u&{Ee12$3H$=@}8wsKmHlW`vf6avo6c67ww9Vv*dpHkTKi|dF_
z0F~J1n7XBBk#AC#1AtmQ@Qde>K7J?sh#vxjO4=9wQcDH_CiNR%T&EK80XwzwzPOIi
zfK9jbi|hZw|LwPj(B@zIf1WRYV*F6@ADtFCR0<T_x^R9Vi0=rSP7c@t=P3Vy9H8vk
zyW)B-Amg$E9Q)FNnqU9&byl4_U>o%B*r^%`)B^^VuOn?y2s$CY9q+z90)Fidql`P2
zPTCuA?o9*R#r-}PF<-EmaUY--bpqV_SO0dMgn2)p60ie21~>lSby$y-#R%eN0r-t>
z{rx(t3G`_)dH-ure!I4+N7E#y`dPrD8~}DI`U9q2et=QV7tqW2fE`lafL6i_P>XrM
z_+fWIDdYy}>H1v-#^L~SZadr>Od;et_-zP&?T-5Cq0s%2Z{F*My?U=5JUp!)_+nDc
z7c;Kp_3VwTQ_m|Yht3f(+qNM=%SSJGOdBzrM)iH)Q`q&<80OuX!#m`oM(AWOxcwTG
z|JMHBqyWN?!LTOO^7nHTiV!*f_xtzIVHLd*KP`D!{9#%4(}EXjVD<o{{QLQr0{;^f
z;Nj7i<Ko(H^gmbh4{&jPt$f)B()a%a4nNxlA06+T)q1vHIY<0N5I?RZU#=xzG+cb*
zDu1-4e)#BlU;ixpzgkb0obU@h^%7h^`n?+W@1+3(!>{7;v-Rc3Kj$j?QCwF)kKm5P
zKH>b}$OxC;|M$=Uf#GN2|J8c`6Zj*xNd)gDAHW}_!GAOU2=3w#cO(XM$=78m?~K%U
zj)VVJ{1MwI;$O1lWAd{!ko_+l{|N41^TYfZ8X$Ybug>G2tuMdr$Jajuci|PW;H!O6
zf1Cz?4*y*g>%gvUU)pL{ukTCe2<}1<cO>3+rGLz?(BMzLe+5cHoZb3+XdnY|7l61U
zekl@EBrpb48ywxQ1CGLP8|Y6b1+T62*ZSUZAOqLQpB=xyT2B$l{{!Rf5xe(4(E!1n
z5Bj|D5P$Zebva}T9z1w}i$6zf5s1&7Ba9LMxpDC4@K>V#f4K&}MFRwP9*8^QBZl}J
zA~ZPf<AL*aTS<e{&W<?zf1Cz?5PzEWKpFb%F6CQTO#=jXZs_O40sYIk{_;UaXpj~k
z10Ftn_%|BFg`QjXYyS}%NdLj{ue@UeE{^(ZG*I3_0z|fx;{4M%pr02)0|D|)z{$b{
zm$MAXMX{0wMfVE8F+*J-L9zL7<3N_06v$8!f0IW-;&*;^9{+5873im`@|WN9N*bup
zYygjHYru0%Ke!kk0(J{=0ev}fP*+opi$z9kknQd5xcmz%X@KO!$jQ11<DmtCCiE3W
z=0x`GTOcty5=cVd?r*J$KMVh_)>EbboNHq>4Z>ZI;rx!@ym^DOCl3t`0SxrD?1wqL
z5W6fA7yVB(K>YHNH4(}EiP&fnf9hi}7b}AQmo)fu^Iwf|(`TP+B<Ben2g)$_iZ0i7
z@M>fTXM;xk$5+x|$?x}4Oe8p<BnxC1sevpk$Z`CI^Ps-I{)>HKi3VBMGr=x8@-Jv0
z33Ipn>U;dz`n#Dv=Q_dpApJ#yGqxsRc6Jt*_XM%SucW~<`0mZrm7ov$=k;LanuzQR
zh#&WTI7e3Q3oFNg#cqW!<OL*m&CkOBtM&FUZw7l-_^l&39riGhfUJuVU!{S)>3*Eg
zE8?@e3;Mmf95%=KRPTa$BA50?gfBvT*;mq_w6qlXIoJVl7_0InkM!s8SKmntkbF0*
zX@JZHf6M(~?DebVaZq1f1%1dr`}`i%QUyJ54Om(a+S^)jIdKpg@RF<pIX5zwX;1=V
z6Ar@nz7+HI<=*(`@Yi4^hQ6sVKj$}S&{kKoJPyu#yWxDExygvY)2>c{tcl2autbB#
z`Z~b3Wj$^j_}JSn?~PYelKxR%5Q8~be{~%HY<*3(&$)iSMS~HT8xrv~M%IIqhm3JC
z1RA0|U#y8sG(ddu5kApYPkVW9yq9+e=ZpU>nF+~3`?K)>YCSD>QkYwGDemCQanRS*
z0Ty5mAcO`!$E|Vsha_Mg)s<`F%5fmJV;hc7M0lhn{vhY(^<`iFuh9U}7yT+8KU-g$
z^K-7HuhBrAg97wD{hU)4p+RnD2F~{%$-#8}QsNghNRA3$-WQUg|M?PsfaK{Cg|gvN
zJi|&FAUe}OssGa9ggIe3VcZ5g$=}9-rK%{vz?h$vpV<%Zfx=($4~WlqbZ`J@d(;G4
zni@a|j3eMCTaV+F<yq-)aX~A2Bqaat9vHi|k_M6xcSNu7C-L9Qwe@q%#0nZX>FrvM
zTUm)ea@<`100=>T9*M=l<>LA)4uowpK5k#+-L?srpLuCLSV@CM$Qx<HTy{A9!C$!l
zY5ezb!<Y;1zv4#zqJbNX9r>qEXIl#}Qj-3H2D<P!=kBA+zt|U6(m)r+lq}^bThb~0
z$@j0z`#IOxY8up*<oy!~aBE^u=VOp}<0@`lXm5V>#d@%EZ$xO28XNru?tl9I>+zAp
z_>`@<d}}Lda7398U_Z{{Xn=(=T*WujaWMxgiL$gWe2rJmyp#lURfdAzo~Jne;0cT;
z(&T3Ns;%u$zJGoGzhYj#LWAIA#vtj88#o|Bx6C7*ceDU6db^j&u$l&~Fjm+B`fRhq
z^+0^f8pv0XgCP6Ez(H@%S8@N-?|;AGHn3lS43{7LYvW+`zJTzFNa<>B_<{zF52|6T
zH~f7NxF$+Kz0p7E6PM=xpT^%nhys^u??-7+o_%c@f8+oe2e+@JLHwaD5ZV;JN2j_(
zgFiX`4TWLucHz(Y27iPGnbBwehCgx=doBP-Lw)*6J<@7@;u6j)zyBouMxvi{9sVc{
zT=px07tgxE=!<?Z3T1==xF#Iclv~!J{0I&HB>o4)KIhiQ#XSAQIQW*_h{SSzFAe@A
z{>I{;b4@PCuKfWT{7L*xB(~#X#*loQe~Jcw5`R-E>gAZT-$esNr}|HG;ZNdkCQS`i
z#@+oc8vN6G@F(#%m!SdXGTZ+s4gMtly-%9Ki~b&ffqPkBPbcW^Xa)@x`Jka3DS0qn
zJr6Wimw-q0_hF8M`=I`Q6{ta%fzteJkeiVNZl=V5jQB8+5^)x!B}9X(>6buyaw14c
zhyw}mH{*Qa@83CC8~`@(caaXk{MCn{ee8s-74UX-2LA3Y;EabWIOpm1$Mio)yxr38
zDj{)$OR<AX%ncI%i2P0wl4}6Tt+5mXiTth`BI6@E9wZ;rl8qxbHy7Nxbqn0MaRV1q
z7!?%-0s;bnhldAnad80=5fQjNy}mx)AT%@-7Z({66!gdNNAO&VIb4nZQv4)>Kk`9n
zfaD-XVknpJNAg4<wl2iRg%kvT1ozeW`}p{Pn3xz`Od=8!deFoe1i^SvBrfz%<B#Bm
z&;ZG+vh@Cu{Kq{#J-GPGCH#@+kn4zTV+nsGU(eFJU&0@WBSmr}BQd4O`#*CA=8lH>
zk&(DeB&HO>-`w~B?sp->VJ@cs3-~Y502%Mdd_eMmd<}mj-vbg)i@bM)4&^Xc(bw?5
zbm<Z<9u;}#NRDcxtj6El&Ke|oxqx{1dkR0Rzx~yEQhOYLl9nw{(>{VLntDfp^)Wwi
z<ft#MSlRjj6AM?MrU~!EqN-s9l=oNyt$jzq0W&9HXmSGVKi~j#4UPe&-R3|{2KvBA
z=>Z`ayDBKQ7sx9c!|P^X7yRC(Yy@N#3;+kODq!JI0$e<*fR|4l@QE1yG5j~tYvSTO
zk$AF|F|4bPfAu~wuKmw_t!^8E;aA_|&(=r!-o}3da2nO&Vg<i|4aW15aazIq^|&~+
zuiZy-b#ofl0SXw`_O<()8TSGXgZnTZ@AOyi|7rXwg<;$w#1Dyo{u=z-cpY%}k(j-&
z-QUV#iMzjD?9^B9lQ0|N?$b(#e)ayp`2X4Q|L^<%cl`hVb^dRL>p!z{4A43=1UU5z
z0E_00<-(wZ{MMl+j9vD{-RChXS-yun$EcbDHZ$nJnDL`P6V?|nul(D6=G|$4m{}jj
zT^|7Ir(XbJ%i6!)-?=9P#%sghdH93--)06az^WDj45HowfrE8``#|+_Vbl5lw&6do
zyx)IW%c}noli&O|Nj(LZ1F6#p+5VqTDFo>MRIq-F?DHt{TA@4t3#!Ka7XYdW?SJ{-
zrr<KFeE1$<-3q)%V*vdxV~V)916$oj4>3N)kO6D|g!bP5Zx*}gzd_iH|9ZjG|LX=#
z`>*Xk<-exi<p02{tN*KcP5_>V&=0%|ycc-?ch7%$$L{}f_FeyFY&-u;TetrQoh?Et
zmIR)SB5qO*Y<Crb?=2BED52T8poH3mLESGd#?JisKXU53|6vne{}1kc`QN|e*?*sw
z$H2289{zW&zWd*??Dl`)9UT9ya<Be3%e?&GIQ7DRgT%A{b)rv!+cluFlN78OdI)&#
z%7*_6u5<rO1KUJW)*WQu7edH?#K?P8-P3ceeQ51m`@qtn?6!q-#UoR<iigHd1-FeH
z3a%R1=HJkB$hf9soqa*uBI~TCN#<#FgM{;{x>2W<$idp7$5hlqx2tQqt<zC<m;=0d
kV-$>r0Qn&R8oNLRAhUoX;M1<^N9o}b4&Yi6HKsv40PEYb!vFvP

diff --git a/games/NXDoom/data/setup.png b/games/NXDoom/data/setup.png
deleted file mode 100644
index 3a775d24ba96063062dd1ab5ac2ef813a6a64423..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5654
zcmV+x7U}7UP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm0013_
z0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H16{AT+
zK~#90?VWj;996l--*c+hnd#YjwycvtLP$c`qJkL2C1P-4kr)scxI!*F;#D3VB7$)P
zK|ums(JQzlh%qi85(yXC#Ds{Dn-B>}X31psnVzk?XL_qT-~FSydb($Nt4XF$lkWF<
zW~#dCELHXU>MUQKIt3I}R8d70Ra8+$6;*IzGBYOv>so*A`&Gf-D<GheLL4LrB%lf+
zkPw^^(}d83APy3mDu^pg5ODz#MA3arVM2=t;t)a=f=CsDD@;HL5-Jm_rV&91EgVsE
zd5(<0{Hjnim08Brh$XC%5+Pv;tKg9k-+T2dEpO%WcqSd6tc>6J*7-BtmA2RIrOufo
z2%089LjMzj08Ky$0TKiu1cVm1&-ksINOV8N#TOuLd>;uKkFV)}0OjO71qfpifuJf7
zh=}OAhJZ>4s2Tw5uC|q}y!xdBo}3)e1aTRe0zjq9`mDoMIy2`PGX}<`7JLaBQ^hF*
zA^&e><uA<uoG#}QS$XFVeqFw>c809HEwVD^7OS##`+od&XA?XlW3moIs_Y6!O^F3A
zt5PEC7^E4%wtqHZ<8ymtWuF%cX#$<TFzQOJ(h4PMRlsxqY?76A-f1|fN;3dyB|zWM
zXl#AO!a7`j-f0Mj!q~g38LFnGj3)^AcfTL6wU5NMHM+}i>zXs5C>;BCw_tQEm^SbB
zks!7;4}wVV3D_+beE*AQqOzh4P5av5@p#k59|}b9%s~$V5fR&V`^C#Kzp);jEnR4D
z?@t?lETUms(;z%!VE{lR_32K#q!|Fk^}@bz?#U>xsQ>^h@{M7rEBytWRc^=I{iE;(
z^)CHYE0@AO!wmp9amieC?{7;Rf2PZh*5Ls5d-S%)Wgj>Wv*+s_k`qpv58E5>WQ^ZG
z8o|qLLjZtfv#YS|l;Z&a3r|@9G2%@)zhqL6BW&K=3qWq8R9Y1fe}#f^cWfw-{_X{U
zU_>AociZ^<f!KODi}*x@;o!JGXk=t8b~uqhC}Vs87z{*W>tn$%w5We65(s64ug4$H
zpGmX;X(d3scD>mI)i(w;9LBEZJ~RylQidf0T807$YvWgW_r7+xtpMj7`w#VESC2n!
zeqG)$di~+p@0PA1wCvmqTbUC*9Ui=RXfSR3;h=`*!SSApKM+CFYj2^fx)NT`ApY9q
zfhJO0K`<h)&yycLpS&;t5`^Jy-4WL54dRV1pXoGw{lfr&!O_T+;*X8^^}nDxrTF2o
z5C+HeB7Il44-qXlp2j1Uyegomyim~q3S314C~y@Gpukl$fC5+1018}111NA64WPhP
zG=KtEUKl{U?>vnMHLLhjajT2CNK^9PO^ihOHs&a`^1=W*eEI_zBA~;Y-NTq<@d4oQ
z6ykUJ!qB2t)b2AMe<&2eX!PM!&uADCAu`0sA4xOS3mRQyTy(~O1(gnX!vejd;S4d8
zYqrY{D`#jO$^0}hnQBU`sCHV=JQ$1_gBg|C6wGni(K-@DP&H=&3S)Sx%_oILUKl{3
zOQr$jMHNt#JV|>TymHMKp#g|kN}zIk(lDhi7iP?w6>DP=5eNX0hz;i=K^W}shi_yA
zvDO&rVTJM1h!9|mp}MXP7OOS7k068wE&4JE5kV6I;ZO)&ZEboy(qAYs(jX!TO@j~u
zW##3la978@yrMzGy{Mu^Uq0#S=!D<rgU|?y#R{(2pl}<wVu3^9C{YMbrxR$~GR;>!
zxujJAMCr@_a5xOV-w&J329L)R0~!z3SZ`=(fZOd(h_7iHB9Tb!@9^QnaJgLQ>+3@(
z6iSF6pC+IWEQv%SP*pWyX{<BGz&VGiswgQbNqS7i^1y)u@OV5>RSkAWIc$y!*z6Us
zJ1Ssvl*48(gM)YA8@GL>SOpjghr{rAJo=qhRyGN)84(dWJ3BEtItq)$g1WjoSS(X7
z_^ehdTrL*?z~}S9=QBTe#1Ll$J39=B^dp$2Q+a0qkw^rCgX1H10l?*Qp{AzBbXr7&
z_V#x8{o@zdFakwUOs8kHT2WeBny}65^<rdXBt?wW;v6Wo4}c@}@V8tjuM8j=d_yjm
z3$?YiS*JxrXlrXrdWR~Cf|{BdQ%0aD3LFkc(tX3j!x$bO&N?m58LG=eu<%Icz|*X}
zF#uInF+4n+6uzPI@^aMG)n!bJh|to~0<Smq_<luEP*qixl@V~xVYer5s2Um^9K_Jj
zP{y<rg=0po6;?}rIE(Va08~}Q$jC@q_=d{M%TZrnpK?DDp}Dy^t74gRj`H$yaGv@y
zFveiDS~I2v00RR97#J8xxnEHf%$ZdMn=OA_#nKHxRaJPs-mKsos;H<yLqo%)?L>su
z)>cz>vZ5#`D=SNB1ZLX`{r&y$cqYH<Z?Py?aQs|29oZREt|Zj}G);rw?>7bCP-SH$
zX3Uro`#lx-hB)UaDJcPqdqabW5`LReUtb^k`ubwO6-B|4B}-6JlDrKeQ_>tknx<iN
zbaYDa4OLcF>JA)DLt9&0+B!dzIOlLWod^U1v3~rKsHdj~nx=tsj>U@?!|8M$ahlU1
zX$G)i<DX%(SwYd~zeE)C;1LK!1pjCNZQTQLk6R5-A0<2juB|FVMcMcTCL)lgPbVWt
z0}0*Bcc}9fgu`kSaCEvD8lP@P69P61$IRLa-P>qPPZK{CO*H(_$SC?eUI?MZj4(dD
zo@O^1YRchk^+J#UV-_%Q5aZxX0b?92x|Ahpt&v&he2IuSfGA8#G=!wv^_A$Raf3<R
zo*_(hsqc#BWp;bUV>XutXM}M7%LV2M%<4iO`|xE;Vk58!KOZEw1SrCnF6r|F6yeL2
zR6jrwzI;hDfFk_-Q2zA-^pzs~94Wtg0s2Z2ehwwE3IK}m<tsmW0ny(@__>$-UVy$*
zgfB@FCyFEhET`}nFPMW{Z}=RlD#|7v4FF(p$cOL$cq8^5Y%d7-fb41Fa(w4M_`MtP
zzSB-jdq}hDEAZiqz6!>z$2@#MavLDm#s1Po^D-XRvZW_L1o|Pg@G%b`klhQ&A^e)E
za+GE<BFE{l!(Ckg5%55W&@l}kkn9J@6?_n(aaQKh#KuUVxwB`0NP`G?Kw9XSg%3#f
z1m?1}KWBD&1Bic}t8s4hQ${2pLIZ#nIws)*vY!R$D>>=vHO@*slzig*fpcchh=K+n
zG>G5;NQ93$_<-zT;W>iuu-UNu<b_EOA=wM3r=PMEPKP4~nGh`rMEID34@evnSa<qr
z(kN<wCgImrSAYQYd4|%$uW?u4=Cv2&@-^q8a#G(vIecR|H0;I3-#m#8k8DDJ{~+{S
zIJmVM;E7}V-Bm6y#^4#8+NfliV*;faK<#O(Nr0P%zv`Uj*!bXWP&mhPFaHZa-SiAz
zcy*Wlj(;?~!a1(J;(XkG^XE}o;!K)<I{5L+(XjyT{^8H?(_j1!nyTs}d2MbmZo`T*
zm*NYbU5O8`I0cbN1lQkkKVI6t&-Aq@Tmv9x3ck~B!|Pig!t5D|FNrp_cH(~?--=Ct
zcpeU$6&oMA4QIV~Y0A8_g&)7%zH=A;^M*SR42H1!qE-0PWfx-J+=hfO9bLWn<eJ+M
zjF`Kug=qk%UL36gvaj=Rz5Y_%cEhD9(;OWOVstEsx|+(AVWtA#2;0{`0Efel5~m|&
z*oS`lTRi;ORxl;|w}1+ASh(2+-;4$~zH;S-Y11q%aZDS0B7(cRGA(=|1g`k}`IuGX
z1cdqN=443Xvj75!W!>8U&etzTiF4}j))|oAInaWw+g`%k`<v0%r@zTt<F3Mq3+H3y
zN6x~6<K`Zbq1f$K+<5IJSa;{cfEAz=^B?7lq*VbmCx3=CV@Ayk@XtK$L_GWWT~mHp
zQwV`=e|r^oes=?Q?Rh(zCt`WWeiE>3=|Zf#<!YR>;=NNUC5-heul+W5?>z`u%0S$f
z_V^043dp{nzwXA*O&Pw|=f@>i+>8s>T$>R-K-lx|1Gx0^|H75m-46fgm}&S#1R}!P
zFJGkJUYZ|FOl|VZTu8nnD7sA7pSM`d&*uXGJ-r@$_!D2mQ&0a5WKd57pW?P}-S#pr
zyySZHdj?IxH<sh`4RAmk%UdIm`#3nd%;d?t>GlV4pgH~5Kqo2~4B^r%ZpK@C5158;
zXy5);TyxWUgu@Y2@DH_h;RpBs3JI523*@B{$g2W?tl)!ygDqY7;6-1>mM6Dmm9`K9
z>+gC9+h5x?3BJ{$;Id0TjVFG2A6|QLGj_cATRi^Qy}0Bv=fP@?ZxicP&g*aP#eEO{
zI&1jbp5K8hu33+^!@UV<F#t>i!G!#Yq2eX25m>$S0usbc`SwXu@#Qri#J%77I_$RO
z4J#o8+B>?j?0ug`AQYWAItu@|d9$(U=l5dag2tpk_w8@NRoC5)Lx;QKQsi(tZ20S+
z9zjFBJ0<*3D2)3b{tf={)C)+wuXOlv|3KUcigPCyWFs(}JAdMKa0QQUegz-;#1&{c
z)IKT6ac9h?N$_Vj)Z)*-`$<apM1&I-G-C6w??Zi^F)<|vXFw<v#>OX}P6@xGvlmz0
z@ZGH70~}0*@}?w^SOu7aZ)|6rW6!~XN!39-kf)!0(a0paB;57wuc5xqov|pdtF6X2
zZ@mTvd|eFBzqm7HvA^}X?Re+FA!GwTwpWC~gbLY`{(86>_(1f*5#w02Xi+Swcpz=<
zU1)AOoB)5;j5?h6v9q(T$3MRE1DM%hlmZL@LwiRrdU`xb<224`fEoD4Hb(M|;9b!R
zNPr)0sn=BNF5ihjJG*)&wf4_?|LIA?rs~=O!26ajg8|<F+TA;O(rO|?MZ%-z?BK_K
zNj8FaMK53?d?G@L)1DM)zb86dXIxjWrn<_sd$+o}67lc>U}(sjG_2EMxO+{&k2$s&
z7!{xa90`1o{^Tzi(8>zeq<;SJh}RT+eL#p0@$dnL(o$#Auz_F@Q-v>E`P~ah0Usa?
zM(@UnFzRcojpSqhcK&OR=?6QzcJEJs4*<0_l}W?;d}HrQ_&`4Q0@A=I0`@nxCxtP0
z&P>$T*Nle+(A3<9f9!ZOYxp~M?m>Hdcl1bgP<3_HXsDmuiy$Jjck~_sd<L1uke|JP
z4De^xyRqVolaj(9BCJ|@HVpVi8tcAwKfFGFM)+QzAK$<C=h1^?vBiqBP6dFZaZXxt
z9BSNE(Ku$|%a!CR0H)!uJbO9*{`3Pl{p5uyLH@@VE&^ASSQ-Fupy?1UUwa$+J%cIX
z_j`tL{mpmbP+J$`;d6y!^#vbI`8;6J!nt_(M_<MA(-y~_VE)4gfT=xZI|{N_pYSam
zbawDL=lI6WpT~XQxo%PqVB*s4u0(rBH}<}LFfK=iuI@hk?vKwR98uw}Do0saDTEMc
zJ=B5Czu$&+cWgjgdpF|YgE4&a<16r~^H!wwBiQX$d}zffP!x{6Zyy@By-e^K17i$o
zpkw_}zQkEcni-ZK{|S9iXcq8m-Boz(fm>1*`^lEWBVK&!;%m^{+CJel$31+UD*zaT
zph*or1AgP&8Ti?Tbto-yq=Y|lxo2++?%A*zBi^yZG$*b{je|2FIIyFDp9N$n_8+?Y
zCR6Z*5O9^1;?bXc4|TQiADl{b@9Lk9OAWuqU4b90zrhrIBEr(ejkx}*^AppYxSl7y
z0r|av4DdlfRYj>O_{RGD##wl3^Fvs+bRj0fpXlV72!HXSd3f~UZ({bWI@3-hB0_1Y
z1KGnb)LuXq@Ck(bANjp$_{Orn&W$Y_@5lG<xB;~_RmcRtveJd?)~?2X-*>D2n)npp
z3nB32Gdto=HvjH?L(-1IHGh>pC^Q3nqr3RWU#-X4XD%}Zf8sJ23}O4u-FWHm|3YhP
zN7QZ1P~)z|{CP9+f%l(^<)@wqi$$4I`o?ni-WGiOp5H{zG;?o&GeU4+yA&4E44`b@
zD&t!b8Q~LvMaR#^i%<Rtio%Zwj+wAiiKD6-Zn@*<INZ^XY~TYFZ3N0Ofc%&yE(3fJ
zVgJE){A%-aY2g@m`E<b#g(LcxLDGbM?u9o@!Iv%h)5K)~-`IZlkDq{NaAXo3ug{Oi
zH~$46zhEuSyXa~hXlgs^@H;yDapTt?z}lOBh%JA589sktQdplqfGtnG3UlyTT$tQT
zTF#|&&m}?ng~$fJVJMfa{wVIbb1j4rIM8$mzufdE{Nc&}g@4rOb91;#o%q^Km*bMv
zt4u?m2w&4Q{CVp?@QY2)A`lG0xMWU;4IeuDRIFP09?Wd01`*+r$DY9pe}8NIB(s3e
zqHWTU=O2aD1}L3#E(yRCe51#3^5Pj#D2O+AzirecQ6+Zu7M(C3*Iu;-=d92NgqVS^
zX#%hA*o{q_pGRw3;)5Z5l|>gE3y+%#RnyRNsCUx-Oz;T|j8P#Pz{jG!0CVsSk?IGj
z@!thb-Oq2Rufd(`uEu*#Uz`>EH~()x?s?z|cn0Dpd@$kLHv!)W9`d|eSdGA`-1+fh
zmNGDlEBY(Flc%S50I$EXH|t{m&D{rb24A-1y&Zf6@C`9b82|>R8J~ww?d0j~?$5fx
z*V7yS5$NfLFSj=!-xWMX_=cFJ6cjatbRNF$-hr&UhrNA+iSdDHgfCZ8OMoMVZ-^<S
zdSgl*OX=J1N>KtN+t$-JgxtX=Fp2H}xnB$cju^fnrj!7dQsdY7A_`|<(1%bck`aC=
z9KrC&Xk5b63m+uc50GEO!lwv7CdCOdj35p^pu3OT+PgD4hB`X?bq5uYBluH0)uSbe
zRe*j0jv9PJiW3BYi9mG2xQ%c4$rfC5<%K9Mae#<of8!p-F+BR~t$N^`!I#?zlxBa9
zhL4aI?Ft?>`0>($U?Lc|;Yi2rPZ#{?h#=1^1?C4h+IRj$DGm@fCY8!x_<+p&KhFk)
z9CaxU5O?M|e7TK)y!me6v`Mi;a3_lJlS|@9qcHvO4JkH|z=Sz^@&&%k3Lp;#gybwc
zZi}0*FQ4ESY!#4u=|&JYb7#K5m*@zR``I`NB5u_$I~jBI$cIl5Q#zNUp@J#_3<+)p
zm<{;>Uv4!}kOlw%f?EJ)Ow}e6zFZZo0RR(?0FvMr8-Y?4GlBwy4-^dm03f&my**r5
z@PVQM#3Z-^V#ag{g#jNZ8bE@GDIjJ+p}+@<1~5s)c+?1vefWSx18^|;^W>(IZUjos
z;5(VTiKC?%z&xkFUsm4Ph!~H9I=y#(qjRk9s2ubZB+UR$Di>!qI=sQmA>~Og1&m8H
zP4Ml$z>+GQarBPboTOJupFL^eCj*-GQ>vi6eJ&vY4gr1a)@1J;0SR|fR_;9uXR1?)
w{AJ7DgU=kDqb#bZqKYc2sG^E0s;DgW|5Y=g%lS4jEC2ui07*qoM6N<$f{5&*2LJ#7

diff --git a/games/NXDoom/data/strife.ico b/games/NXDoom/data/strife.ico
deleted file mode 100644
index 85ef389ec584dae829ec91c5ae28f299c8280ebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44131
zcmeIb2|QKX8$WzBcN-`fG99xrOGP1)QVB)KJX8vmDf1jM4;eCrhARz<Mha2MSV<)!
zoyt^%Ix-yRIM2KGQEpeMZujT!{lD+^`7CFzJ*@S7pS^}>J;T~K935^34*R3SapU3z
za5zhJ%)l^`-#ZP5BcpSytRwm0**M%zVH}Q|dnA7b-Pb9N!%0eh&ZB!{Rd6^ZrIGv+
zWgJe<8ixzns-ZgX54Jy0(epNKRMEn&VrdpuwUNUaRHuN^CY80@T^qVmJ>vNFya<Z9
z=Lo$oQd661Z(VJu-E43*hG8K$-BD(Ke$V1!KUPUu{#Rx~*BzB-$qJT9t(m{_`l`s;
zQnzIVSsmWs?3L<y891U{H*#N{a^cVTl8gOP<YNOK?(R3wcT4yj)GIpeVd<QSuXXHc
zKi1TJtJbkouXdQ^T-((loU=oeIqaUrr62!r23xz(b+ru4$49>KN$Hii{^`%|usrLO
zB_Su{_X-?hrkhrC(w-PKr^`S^Y4*YwENfL5RBTip1#@%9q-!N!%y^W$aNfzQ%-ezo
zc~3Ghed7Fdp5fzy+o~#7HEiXC4vXqQ(jUBUSjf-PBzSKzn^HU@*jY5=n#m0xr<E}h
z`lhMcbh#QBU9k7u7MXpmdG<x-F5hN1-c#C1FYfvr+|{DydthMM)j2z-z6v4S98mCZ
zp69tNE!?G@>DiKbt0in-E}3>!$=rR-!apu1XsR-#`e;y3h*Q+x-B4P?i6dTT9un@%
ze<Z$Ej_r@(8N=~y>FMHZOP=!Z?&YKyo2Q+uS)IOR-y_x!%Uum(8F|`UZ58ki1}vFw
z2IVAW4Hjz1D>t^ascPhxWX1l$w|WhQ99_j$h*z&Nq5BrSsY_F2wV+l=w{zX&KNkI=
zx|pPu9V&6Tajn<KyDs}YO!IB5W|kI;aCw69%z>^Z>b4AyE7!djE!q8yH+wP9=19$g
zft&lu4aS?#ONrwSG&I0snKx{?FOJ67Y_uK_?EC0kS7RN{cp^W$v){Syk?#8qO2(IO
z6`X8ZaW#2k{+zulF6|QC)^vJ3YpRI~`KC2PbgREFX(s9R4dPlQeRGB!$-(QM43diC
zdTVBFB)#IkDckdyo14i$;AGgGZG$JxN!;9le#%Rq-mIB1Re?@(PTH(AiF<36Ogrx^
zkH{8KWH{41HKXP&k^lbC<+DvykFCS!;L7ZYgxJ~g2M-40ITWhqun3h~4m&4UTJc04
z>OP}p%Uh{*XSxz!Daq``l&PYkt%G6NYaTXNo9=a4dUWN9>6Ta4T+vTY+7iH7SmT`V
zlsTMzDsHeUoAVOUF!cUz1@Zfqjm8@cCB<=E3eIU|X$pkyWuiPg*K|s!evDw}U4hQK
zb?nPm%L#}J%$nyrulik>c9;0=g<6+ytrW+Fvrju_YIIKSfzF3pdW7O@`MJ^hMsMmr
zs@=~>5I;50u*)l*MUZ9Hifeftj;2m#BH8&}Y;S6otZOfmbu@Qq>aF7qKYc~s&5BDi
zo06YE-5zI}Kfqup<07qarC7S!m^-r$43kJ%WtT2ZFJ;yx)OnY2lJmNXogLEJO3tc<
zt7p_H_-NWZe7MW?z`hgRxyPxc)Cb$u!_^9M-*?7l>5)Z>6rnxa+^+2Co1KcC_CrF|
zvFdx+mi6?^SO56o-H;(Sv|OA@p(x}YKh)emeS=2Yo;UC9*0m|7JtXRB8ttmc7W-tT
zc}#J*j~whG5Vk+*#_~PhM2-g2B91iXTb}y@7#aHlss1i6E3V1B7hm(tz_I`B?8n-U
z^Ymv{hu`llN@u^YN`2`)0{w%<tpWD=xW1RAMF-2Me~{>2><HLj*KJ*2(9>`w<Uz#{
zyK%NxZG-@cZqdG`qS%dDQl{JXZ@TAtFYVUNCj^+2t6NSV{dUtOtM==M?<>Ap^3u*s
zt?6BEPt*NtGTSfOmf7cZ+&s^|%*S_K<IU%}OZ6R-x3#fIO5i&7wHX(AI6mm#Wvh3$
z?ZTpcJ&|?CoXu?LYgDpI2}|B6RMg%yk=E-g>C|9<@!0T+Ld}yrr$;HlkC>cnH1fSb
z*V>9zQ^1aGus4F!>6u?hQT#G-+!;ok<CSXz)mOqg@l%)VS>0TFKvUvG=lf*Wun2Ob
zyLHWZIk78SJ@m?|mLK5U<;Bxg`*M2HnJd{ntqyyO?AzZbp6g{}eOu&5w>2m;(sY;A
zE#Ya?N*@~StCx?|{PTvao}nP2ZbkbF>17pK{-xZPZ+$q``@|_T-Ie<OG6PW|D#Vd*
zp5aUaJ~=C&$@vXsn&Zx@PIkGbygIX8YpQy8&Y9Pl{Y0wU(AT}i^TC`bg}ePz^EdSk
zyb^0ol$E)2r$zLMS|>TRSovXliAu6+wR-koK}{@6`EG}O4VR|3uD&0kF74(V5SXRu
z%;|5JHtVjVn&-g%r=f;8=__H!2473>Q_Kl-)r-j>E#H|baVama#M9X;y;wVmLp7+~
z&3aes?Sd<sTzl+b{>_;~3pAyj?2kRK*<^XN;MIV-UP(-kqowd&m!Q+(99`K#^L&?G
zZFl^5Lz-#-D$~K1o$Us?cb^7sJ1xFFQVY_Xo8{$hQM2znQ(jqE{`{1XaD#@X1W_?6
z;@U2%fz1YuV|!XuT5FPh`bws^Irh&qj417%vO{#n&Z)%~QmpJa=CIrKxSSnxOK14r
zvyfbg6J_?lL}zx1HGCc}?4H>^-2dj*Ki;lpnb&J@@Q-)#7d>h&vvu4rv#qIc)mz<r
zLm}S9F^6ue*}+@=wJsZ;*{x{YAequv{xr`bGP)>nz1p+2sk=EfaxJNRPHob$eLFs}
zx$Ndvo6U}!?!EF_`Sa(M=lchF<>i+*#gM{^bE~&VG|pe;U=^9<WRke+0_E);j(6uA
zd#c6V<h?IR>9rY0)C6*9>KR{C_3b&9bfAKwUXoXJqR`DY%GF6+iqU?NL}Sg}?lf6P
z{dB&&j^W}h1_lJG`lk8wP6w|JZPpHxSI`3Y{s+f}+8oLvxmIRcgl9OSO6I;Z>RjU$
zf5>o--iHV7$*1_{%zd!3?eX683+xxsACu}NzS<xrn#F-*z9J=sdoMmdtDgo76<>)`
z6u!N7cjdNE2R27{L@tO}op5cn3U~YZa(8iF?vr!6lqLO%jqdwz@2p#J{gYn%N20CB
z)n|JNsw$5R_;?3*M_qfi%W+MZT2AzA>IQ~X#b?{D&X{KGx+d_t+2X55-yG!kIsa+l
zHcPeM-a{nPJ-4IPrYeuTTdyA9U~h3|Ba853<M%}ckwnsr+>D0lCvsk1-N3-Srz|mD
zUhi1KGqwyP4w=K98|+^!xyUZ@0{yZ^GOkmL%gCytSWL^XkUbFRsyz6%j2gd9L#4r3
z>HI2Ja%yMyIu%xScD|%7F?Pm+f`X3>#A0uLlEt%<Rth&9>fgJ3!$7gq`G<x!5vGEA
zea%}0@7CXN-1q$QbS6U!PtO8Le5NE2SErs^onfi8RA_$p>Bp2f(^a-Qc@lx-lQo;0
zn@?3J_TMYB=WzG%NJ>oP=F&Up<aA2KuClH5X<|{<qm>E?&2K1M?zwNRycfZ5$7lay
z<FSqWex0Rrq8Kx-Z$Gx(mZMIc!Cv~z`;X2=3WkwQ)AP2d1bqBxfB8AZ{QTMNp?-dJ
zan>+XRXm}YLh5aCAo(W@4Gq;7xH;xmO(}LVMwzXfPsCXqI1m{a7})3X0>{y2=OBdZ
zoiB5p&Tet=EJjAg^`xm<XSY)sb0c_OxpB2WOcklbKWc2OI<214pv$to()8i|`&$~<
z73<7V**%M~btXH`=5!i`4%L49_U-EdzU^*v=gq6Va3PiFmF)bcrY5Jls!yMmJ33w<
zU0Azf!JZ=lj<dCCPg$%WO>I~(<%UtD^qz-V28NoN^j=<GV&~@&(<veqcu56?2Na5@
znoZbEwS)Hrk7pEJorPbC(_O2Qc<h+bbt~hjix<VOA82ZbVJL5PIJU;iU57OFW`6#=
zuCD#=#?jECDHv;GLLVC&E7rI$Sk=ot=1QWtVm)rhf(7Q**47V*Gq3VabGX5gsgY`M
zg+g~>mY<S$*^PqSx~EUKKUv4UfN?0F<r1;|65ZCB3(Vc!hc36$zwPL-XuQ5(eYT&G
zc-b6@g5t-IA2SVm>FKd3C@9R!o<k%GEesJc=r*&lady7G^qN3(=!0P{UFyP>IBRa+
z`}gk~U82xEnB})`WmO2HkT^NENOwQt(7f|=l$Nd+Wj3rM&M>`#*t`7d_3grUUNP4d
z@DX%x&ro8Dh*3PApP$mzm@C6SjZMHuNjU!G`Sa&_yjCbveK!Ot=?Rzi-wuc`nz0gB
zx%VoC4i#$TRIAe&!<X{Ffin0}<mLNp)n!Ti@tZH4r_We)WaFPF3|HT-IjXI#-Pw_u
zFLFDwOCjKu?1ilsQ;+)wOUlWGwY#am^HJb=BubhZQ^8-cix^71zL+>OOJ<t8yVm>X
z*X~soO<9R6FRE#4YfBdNDUJ_N%6U#ecP|VnVG8u^ys3UcO@)<{v+zB`+pey*<n!5=
ziP?uf(jhifSIZbvebdsooZr`9I?b@7XD_raj4Ip2ztG0p`}};@g$oV`1tp<({G^vm
zCg(Xr?TJCJ4fRs1aRy>ON~o2{xpW(SoY!DYn)>FW>_^vvj9#NTYiDiQvL$P<fJ*hA
z&yn}6vS<UE7#5hDo1bV!R4<y+6{E<_9JV0rp0$PuEIn|3!2)sPo7-ik4Ux$=s6(9+
zWE_92l!N*;L#pq~mnP0#4LS>^_)#K;&h=~#*>FnbRL$<L+ZA#Rfx&hk->fe!D-&rT
z4-LuMz4DERWm4S%+`P)GQ%h}Yr}yac%<?;OWC3beLYis&@+ovRdlxOZ-COWR-|LPN
z!<5@cH=3H_$^BhdQik<>?dhV8IqvYReJVzXGxlyv>SzpY@1QiF*|P5RKIuY>Cp&}>
z2+vo%&=An=6j<(CRg#gpX#>yV-OoLHbG78fjy_|n$*?jw_%2T0Aog)JV|CjfnJtg^
znzHn;Xc7bhtxneLRk13m7|2My(;N`}P+&*7(*h@stHP;~=a&~LtH0GMtc|MDFu$HV
zAUdeFJCk1I>9)?N7J;o<u0~lti$ZM8?FP7GIK{Gb>F5H5ryZKI?f9b2Ob>knlviok
z-#ormb^{mpKBHZh8(vC$RQZ$Jyw>eTWux!`y<}bci`hd@gxjuF%2%};+NO!98(y>Q
zc&eRA*u7$=jrN(G(}_ne7hEXtdQN!yF0-IeSCOgL$VXjGU;WK~p>T&g#hj-NY!75n
z4p-R<w@vqrCsY<$s9Tzw;IKo}Ou=3x31(6HG8c>a=qMgGv&1d3y+F~WvJJBaxY6Ns
zy+wS6ljq(oz~vAPNqQG5IPTBEiNGIyJ4otZPM)if967lnA^TLNj;_J!bJvOe8VLk>
zm^T+EQWT%AGbA&scS>=kZL6u8`e8E@+z!%tYjHy<UGHYJu+Ku(F<CF0i``*rG%urX
z+YR^4RoiQIU*1~KD$zq=z)JVYQ@KLSWuo14ol96x%_`|!LuKOy3i}_}IeK#jv2Y@L
z;?&YqM!Qp$62)(o71v2m4L|L{s_AkiI^xK~4dw3h)3O<Af}e3`IL-{+`zWSJEMMZ@
z^*hZ(tH5{V#5IQ;=WFeo8K|krTh^Z@DnXDbQyVzFjp?KTsWH%vF2}Eh#ZOzh(aqr#
zo5mKCd!8$G7wL!cCTz-@^Ca|*@FR`24VTFVOhelO+vx&VE?~IuNAD6!s_Z>7uf|$$
z9oIDOlZoo8vWl-ATDBjv$+a9z7zlroPUP7_WM`eyHXV1cfU=74TIkeF*OohLPcN&e
z)O@p|%9M0g{W)QgBFU*xliE-%0xc2;cowA_COdn|R;m_VPl_sV3r{189Jyxf-Mg^3
z0Qc66G+lP}&2%4G4-v=buA4qQsxV#E6KWMmzAG*6)9b$o-q-f#UA#=poh?1}_|(?)
z`=34(SLjJDm)o&ae`Y0qi^r#3p>>4iRXS5Oc&0Uo7WpkkFYDlON}1pQ(M70-yLtV}
za0;*TLq-$UkcEy{=6+&QKA!V7BcZC2u;u<7-}$lddQR?#4>wYJ7us@@{MYPZ;dEGK
zZc(~N&1agbPLb{oQcAE}8QsBf%7;E_3Bn^{*sQd4Q^F07a80*CZ_-faHN=l;ZPS%h
z%OyNJ->bQL4&Iz6rWjb1k@NNj$CmqpgK6T|<4t6azayq3;1J&eOsMz>j+UA*iG~lv
zu)XIp<~z^y%r-C)@sURDT3H+d1L>&dZ*}=vs_P6szQOG_oO0``hPU*vj3iE36k_nN
ztIB#xdpXy&NbIAVmaX<&{b5y*?=xMhrG*JDV7oU1*J_tJPm;Emw<eTUNZh=-=D4!T
zbk{V=HC-qCF9cXt*_tu14z4hJT@+oRc==KF&bu<pjj4&14tpD?Uu=}Wtz_XB{5Zbz
z)YgW9YNLC6>-<-=)Xj@ERf!F)J*v1v^HyeJV&CGo_Vye(L>cDZDck`>zB_kW4wTkC
z-cHJX$JyLhC$FX_YG}mNr(zdRD0o1<d?E5Sm$4pdQ7ufR(`F1Edu%`DLA2?8H9Bb*
zy3pL$(LSD+67~o=uh5|y8^;#37HiwY6m5)cCA@6EQkcE`j~!}M9DzkJ(@Xg9yh_t*
z;?M<(O=$tncWVXxo#wlBC%mjW)_{UXB%^(0k*Vog?-Shx>;j4>-I^ZgZ@=9e-=f#z
zGjy!i+@Vy0oiT@)&4Os&MI<-8ep{b*y0WOyCb_H0F|akLwuQcXxi;0~z<pv&p<8Sn
zug?eh>YxgJMSNoIifldasgA|3q<s6UqKcEAUl3j7-O!j-L+z@lic{>_tKFh`&y!lC
z=J?`P^-OV1Dz2JQaF5r@ftxxzr|43v?iJu>9iea^OKy1fDSOD`qKiIp>Jm1&hV<~g
z^YQoX2M=?E?2wGoQn!i6FNj;{IZyk_niTg#3^_#8*{EFwx2OihKJizNH&v0&U)1W*
zGV^U{D;uv5Z-?XH5J!+{9N&Va56l#ZGkrR2mInC7La1FKkzJM<b%TJ7-V0bw-tIp~
z;Y~hq)<i{{!_H9Mo8jWiIFkfQ#hL1+Itlwhvq+VzS|uCGv$s>9F`B!-%q$X-)j$L0
zZZxn4D0wqj9@T1*&wQsk_&{vEtkjK=&Kakl@hcYV6sj3DrMKNzd4IV@Q^j+>Y5MDK
zb_f2GRX(+K8%co_uWBLul&0PJQ}uYUKKU{i$8!X~;54(gm|Vd?qmavMlEyvjGkF)h
zxj(d}YzVnQO-99dnYipsjw-N<B->VA-$Fg^qj~p!!9{4K6Y)_;oi(~Vs+_3px#D9z
z^-|z8!r=36i`f}Yw}~?Y^BdhA3ff!m9=zx1)QZaKR*Y+N@i9M2wl%1<?XF{uwmD6~
zZ7%Lz@ub(CWIHp9;v{9u!p%?g&uO_KHf&za$RZOP-j?SA_jFq6J6_7=lmvAzZks8T
zFYC-xS|0A-Y<=C?t-#gga6*^iIo20836$F^U2~-8B;VRDDe1Zx8v-n6D9vi2pFw9R
z;FA+Y9o9CqyVv~TR?VH`W?m$Ja>$vsm+WnM14Cx+oM#(EeI5n%%$BxNH`UUaH&?f|
zXbWvLG)4&N8FakWTIu`iihA#GL+9Dl7Ehf^2Agw5JXaq!qEZ-d4=lf8WemAfb-jyA
zaI-=vvr3xwrFd6oyLDK|qz~7KpJqA5u0cKSSj}R|@`*^8|1_3RJQo{TcomgQ<(n)>
zRrFQ0$5KOkD}tOqwvf8#3HjXe3Cymrojs^aHArN^-c!JXkmZkFN|Qv}UWIAydtIft
zn7eru`(~^owlO<V2j($l=+)Yq%|bfxKxhzEoU)*7kE7?s)^y6X$PXSCODfX6ZA7Z+
z%S3Ft>`1-C{ylf!pA;vvJ*}h{oT0R_g}%N~W^uCPpn4|f8nVB-=ex2(QOneMd_Iq&
z`punB<h*F@ODI}-7|r;o1yAd@WwY%R^0~lA@%CK(u&k)2tT*ALPG5q;TS=0C=8!?6
zdP3Lyryl#~-lp|4T+oal`#6@HR|YgPUrW=w^wtqHFC|_WV%io|Nl$XVV1D2dC3%`9
zjTEeJ?OI+oZ))?2!Itd4^S6Y8jHoT0vm@!{bgG^v5odOh{MIfN^+_Sb?k}O0PM6&v
zy(n3eY9Q2`n5ga9VJLNLaBqNsgsG!Y75=_qnB^MdbG0Sh7{3J-r_|Xd?NaU8=ig#`
zU&yC#73FF+>2~jYpTXK$nTOTdoX=6#0-HIHwpYk9$B`#m2+_7~HFHkHE4royTY7Hj
z-9vxJUlsRmAIYEb&q0I4>W$uR^N<uXD~Ym}>?fxE;^xk)U1YRe(tLfZ-G)p4B<ZP)
z0`oG``nTIjy-%17=Db5n&Irv}t@I5qy{k64H>>R@w3}|C65BZyE|7*LB<#JnxLl<y
znlVNF#XO7zVZ|2B5|W4nEEe}(qDVTQE_5;}vDWjwh<;>R4W}4ft}8{tjc;@%{slo%
zvP#a>;pP$pRz=cO(t@?VTXY9|v)c!|rHb<Qr3w}aQ}-}q6P_;hc)Hv`WN(<nn*2~o
z*KiAc3q5la<7-FyR@YZ$CVMJP`y7%ExzRB=kfxeAnuWVGIbXN)i?rL{uUBPyYx;0)
znLM>Sm|#z2VJSy)oA3N+#XO%nzuDf+7p4E?z42&&e_f2?UNVv1>sDVJVH;6IK(Lz*
zHBC-lpGV%k4_B=r4r#w<-^kdeN$t2U;aS}-S4N3E;`7{Q=PWe7&aA+{;Cx&8u`ye&
ztn<JzTvw0@)vVU5-#k4tXfxr0KIv|d8{H#w;>^6wz1JIs22*8>cJ;JvInzpin#8u|
zqk2@$;@O21!2?wPv)FA314TY|Aq0<J$s+dw{w67jtHha4+ND2)*bcd_enFgLdDs^f
zcbmvUDCaHcD3<pj_Al_Jo?gX!aefBn_EnY*%YDd+cxzHuF7EWB*TjUPZ60ruT?#GI
zU{H;bV@+Q0sXIbGkNS%lldmu?JV1KTODM+Ga}yI3U5*>}p3gRURqgGT>@k0Lu<Yv?
zyx+0I)$%PYTtS-Nj52V$1h-@5j7QIj33XSm>Gj^K+chZBliJSGQyvpcIuWh7*P}n?
zL$mg7!XE)!ymy=ZfyROyo>mFlPPN&#`Fv%WFH>6gyR^Lxy=LmYl=1)uPi#;_y~ZTs
zG@5Gm*^#R7p9BMQi<EocnLa5Pj!)ixwU9V<uKFLU8VPkA^GWJ2U?$^Kvr|>32Mk}I
z77;IKj{oqSu)TmR`KLwK5mfnyGvdz7%;-J}b{}6=^=2PF{!<^G$#Je3?%ZbL6+88+
ziT46mVu79gYER<%(7wGhEN2vNh$}j}-^scmPRsL^x)gOVz4V6r`6pT=|Nb6)-H8}N
zIUR1xT;B*`#RStQ5&6bzKHlOVXkxQM{ikt2qs3+F9p0itm3_NVOYn^^I;qfhhfH8?
zpK2T0d^2OygE;)FPqJI?2dR3mlfliMi&hkMXWrd1H1cl0V9%kt!kBuztHLo^vcmR_
z>~S|bv({|GC#f=dluCt~-C>P$Npxv9HoCUxRd!EF^p7txQMWDRyQA*$;?0v}fg)U{
z(DK(Ygo0_b<%CG>pT4Hl8ylars=m4(And(#XR9qeMv_l0)wZzI{J7o<9dA13%aXB2
zAC=oiO_iK2;?qQBvTN4JJWHIJtRa3>gL5CUJ6X=4Ju=fn=cD<R78Wz>wLu%a8Kse+
zjYOZbK6O^ND6{U1o!wfF|7696`sNN&-6QZkO(M=Y?nGj26f1ITL^3KWLw&e<_rWKv
zEX5KBERht@OF`1-lq`x!zhcUPTNHsTO4ptHSeXq_v2E!}88z<(8#gHP7A@;NHu8Ke
zRYHA^_MFEDNpxD5?8=Mwr7p&LIAT#FII<j6L$q=0L|@6`67lJjltv3Gk$y<s<D}N2
zH~;;6?Gr~#b+TqjkFcgsaixg7!wXYg=TogLW_l7OO<F>_NLE26wEa9KL^50Ho??~<
zX1Tm<XNOV*E9pPn=y7YIv>{1NOinFz2dU8?Rjfr)J^flOs+d0g$)5?t%<jmW$&LND
zJ8h%vs#a)BwK-RKUs2(d+lNg>0>n9XWbr!!MSiPLvz`{Pk(!=%I7$)s?p|eY{~pI=
z)pSNKx0PiP`J6AEWGlt$^3;#On?KuJiejqpiR*e>qi%d4DhMwpid-_Cn!GN!MNw|P
z52d!1sF$7#Nmth3sh)@Fy~OX<JQ?}}t5ssIjd$}LeL<E#>-S5y&dhU^_#}9T4=(rZ
zp4GOW4o!c)(7(TY*E8>XX_-Nu)Gik0RaeVe@%TuGDwFom)`8`euAN*yq@1!CJ>mT4
z#5o^I*JaE!KVmv}3$Awxj&2(hy;@i8{^dH<kX5qo9hKsBeV?MMgVyvozO_zpA#k?d
z)04~6p$3M3fJiH9+qS4V+FGUullj1JZJs0ji5Szx?#iejZvJ!%PDo<5L3WRUmnJ>Q
z^F!|%8PhIecRpVr_Zd&(9o}PXwUqZUZRJ)E7&BLd-DusNtL#np($V8(RZfMi#SAo*
z(Ct5p_uF^To~1*6bxW_G#2`m~+oRY+pR}liw*{8wmo_Wwn>e3uDe@93aQ7K(k@=*g
zv~DW*G@}0_!g{pUVd);sF?oi@hf{y7ab-RBN6-aIS4n{_9TID%q}<$lhEjVcaFh2m
z?_Ql8TSwW}+=Lm@q5W0#IXkbMR191|BoyLb+N<TY=9ba1u9a;GqOkX5%zSz{0bZ>f
z944Qs|45%gsm+d9N|S%k^inO>efX$PkL94I?ID$`PxrRcqwa_c*x+4mdXk(`cavR<
z%Cg_Tx`1hDVMb|AW%iaA)G{QF9iiMF9(chnLhZ0URSpfEuO(hi8LrUU`L<QYP6YMB
zS(w1~zNzDbpG;{Oxja?WM}A7tFx#L%ndc>4%CKM+eJR&W1}@Un`FMxLX`#d$K@I{n
ztG7_|FZ$8Hm@emDrKi59+_uAs4k;Lxddv(|p&kbpicy@paVSt8h$iiOXJwuM*Ns1<
zCA3Bn=X5UcK3^eGdyNh2dko9aph&ij$ng>JeC@#%mA2$qibMc$K;U)S)KD3YMe`4w
z+VbaPpH%)LKRng<EY@fI8*N<jD9_kAy`5{CYnqe!G6SzPKh`D9%s1Cmd{Hp<K;yii
z>q}1_csDy$yhzKpR2CBrs_^n}HH0tb3*YIcdmz{Cdn`dw51vlBN9ax%h;>oXxqANc
z+Iukv<GV6Kwg<C01?<{V!{o0%d*g<?jvWU?e43FM!u^RjQ$}Iw^f%EJLn_Ag&(7CB
zQ;V-5$@DppbS|ZDCh6Rh*D>1^cm}6&&(eQ3F-3NU*~>a#G~e452~Dp^)aEe@-1HP$
zf*R5(YZd!i^-3#>JX=%z(8RlzICJ=*5K~Cr&Q|)PH)az>*7-2*Gs8XFMx1$22wQXM
z)$M96a=@gFIK@0ds_!m&h|wppOB97<PLr0vO+hc?c>2Wv-o=i>L%GB&-XtkTq?lNT
z1gx72LshouldN(mGY-%t4y-T>s=_~Fnz>a}Z2BEE&WaWJk+JnZ(wp3C^4npOvrjjR
z(n)QR(e#$IXEF0H$6s~2$8>2gRSfBzGAT1Gk(|JgLx+~7F87v(&yH)zqM%ZIlQ6vw
zJ)4%)diitc`Dj8h4{mB1Zsl>xZFON*#t&EHi|X6iTFa1f16LnSWLd|ZrnqrQXS`-E
zF<afccO~8Z#_9FNhzmkHLle(uQR4cx?P<~}w@rf?Gm2*<C>~#gmaOib4-b-Vm*dRt
zR^eZ0mU44d6g|LHY}oSPFq%7Jm&`#+vf8URvkO-xu9`J#10r6)!gq<oE%EF6qze?Y
zH_SLz0Ux`R;Mp~IijT+p%<FuJ>BOeC(sS{jWN?bd6nRLX#__e%A6O`bRw+A35efJ$
zb8-Hy^xb8rl<!~IcZH~TL1-On3{&RDE4~%t(or$aqFgg!_eayk+yq5#uB8D=CnQ9Q
z+z?H=)X;Yy&+vBaASGO5M{OO=Ya%wG>lYolBX_&fmU#x66^nG$F9lc9&rSZUBHBUf
ze74AmX@QV!T0CJcq76-ETeU?`25%oWDXuKCm%?<6=by#l85w$8WF%*y7J(MUp)1xK
z2X<QDZIO|nyN@)5kZc{g`j5K!(4t(Tttcu5t($A(@T|*Kyr*Kb?krU5jnl!}f6(O+
zZTauZ^90AkWt&i0H?M1^$=6?_f~VbYoPt*R_Ua2V>^OI~5|j`evsP18^@~%=&K@hU
zM>S0kpMykeR8sco;HjaPugtS$AW56tTdEaaoQGpg`9!o`CjvLELuD7a%v^bhGAmsC
z)lSyZ>BWwFD80JW(x)v`0x#W;Ou)aoF}t1Pu(=UV-j1Jqu_8(Nks+zhIQD$;a~v^B
zLim>RV=tk@uP+vbJ$#eN@_3KSy_5L|8t@*QmLG~QqFb?Q_eqzNly@AIzHRMA-tWtv
zq?byD&%ycH$|q3CT$~~E`)_2wc&x|z<T^3?ykLgXpS>+U-pV8xP9)>k3>GH&`1>Ww
zyw?vQ2W8_aCAU*+>IC0dUkQ$zA1>@8UAyo^X-nu~gX#-T&ytwPPZOjxg$bYN+^-d7
z^VJ$8T=1-o3psr*ZL6)6aC-jZo971x`kq-0*KIjbaF0W~OppTP9()qinZ10K{!>RK
z%$MoiUaBHzgT@nbq^JmTx58~&uc2~L+3e5~bd3DBklWXYvljZn;gG{u&eV}a%a8fT
zyz3GR`>xz1ww<{ti%oM=SWHkd$W39=&rMmRi;`Au(j5IuEMp!U&2m}iMe}6>a32TY
zOa@?&17Ha!15@A-F#1t}!4rT{J1=_lfiVa8eYr6L7XU`fh#LU5@LpgI9vCfyNjEoU
z%wwZj9=qI_C078jGPpg8fWs^i*wK1}&Hwdi87z7~c-|p5M&t$nRtA?*1mNv10NXM(
zV3*l8N(YO<)!5Mr#~koE<;I8=0emR~qk}`k71)I3fg`GCqzr@W<37K{EjLE;9spK`
z)Y%qTX5<NMVw-_eKLog9yMQD51F#uii5pYxXjZ~AH%8$h09M9s7Z1=h*a@O`slc1q
z2HXknfGZw7Z!tdp<-WNwYIOiu8D8OmVBixDYY)bNgxMkBO?d}=8N<M_d;I5D`{%~!
z69BL>H1D>9d3p|Lh5reP-p64{4u$q!xb}?y{Emd;<oNewaB2Z?ZyW&gM}4sMZVznB
zZH84B+d<{TQ;>4FoH7b{%t6ql>T|ulz0lp=4P9Mb@Z`x8xN+kKoH%g;!otG9&E5`d
zJdz8?JT{u;RtT`;k#_`<wN}6@e-L<A?*v{2M_`dO0&Y2bU=+~@F1bT?qYsQZV3R#`
zfOVxe%;nkw-~Rg0&SUqCd2BQ*p?}6(U}GGx%X$It`dC=J!V`FukD#)=fM;Da%DV&e
z3a^8s4~#ib@+B~+`o7wyc(C4FW`E6gQPc7bOAX3Yz9ha)*;^NG@}2+nW3Oi7aQ`M@
z;|%g2#Yv)sIhoS_kRxfx^pP}jVsid-S>?uXCldjm@Ci8MKB4~e3H8BGXe{^y%z-HR
ze1t_FA7P<eFEBWN0(u7`Flvq8KF6ZK+Z7h`p9SFkb7aipI)=u*#F252HDU;ug9mBj
z)}licSm-k{{w>liEFN3VczJGz!eVR;8CwTO>>zC{Ssd2?O&yDN{Dblj78VO#8W}IY
z)PYax2aY2>z!CZJyLB)b{CfF3&V|KGuK|3i1Ap)`uy1hz_RR-@W0O6wn<N5TXg7R~
zgUKlWm-)lvT3C#YwX`~NsKCBV3pi1^9NLF~ZK*u4^GO27W~aa5U^cpWdpv%RJ<sP}
zSS(sNGM-~~EIIdyHilum;@Wi#*aT&OU1%k6M2w8>7!FpGUoW5Ev#?nFHo(_)(0G+a
zMe|QMuq{zQ<Nvz9y$@E48^28d65qmNY%ch^4)Me%AiN#%1kEdK!l-P$;E}oI^E+Q`
z@$2-99V#qdRW&l-V0EY@<il2db6B%kA4KG~p}Ef;xZ_#?AJ;ir$KqXicgFI0yu4Ik
zVX<-z09J?8Ju29FxPryry`W*Z8zel=0$*}7@Fukbcj7x*9r&a^VBh=e?Q=y?VKFvW
zVRfvoqJnRTFC28S1C_(4K{~t;<hEOb;K8%BI(XAQ()u}v^{<z|I<&BO`-_qJ5UXR?
z<x*r5bp=}wH!!qy8R3<h0q~#b9Bo&e`+mLrH4%lyCT{?~u0y@J1+=m%VDq1)ur~P)
ztUOvi(my`;bIt?5UcSna!s0z|0mjzx^*bNicCj&Wy!Scwd_+NQZR>}R@PgP6^?hV`
z+WsCY9@j!{eKVZ7Qw3=`xp3svIj{;p1~!Kx;81V`So)^F99zzK`Gox1C&=*zK7RZN
zFJHa{Og4D^`ZYXy^oS-GAjcy}O-+R(M~;BEw>S77v<D}jxYy&AH}*WYyl*O>f*q0<
z_JYKE8xT@H2t2EH!cwI@uw<Phut}Q$yR<Rz$n6JKNkd=~(F5*PUa4ct886SW!XpK*
zoJf-!Fqwi&IpL?r*fZmmH}?EQmoKCim$S^|D)6Wz0_$=YkTSePJI3S~DZ`wRV<g*1
z8fMdu*<^izNz(D`SUShctGGUKQrv%oBD?!CS=uOzB&u^}P*CGkKlg^zPk5DY(_&e_
z{>5^K_l#HGM4kr#+#n7=AqguRlf$@CQbK7|4nqq-b0ptk>Hmhm#k($PaU3jdW_K)Y
zWp^lTWwk}=Kxr$>K9sCWTbZp&TbV3T+FjbZ$fC5B(fnR3qgiR|LX*<g1x6?tlr}SL
zyQcZOSUH{UzQER=Jf}wFIehBKI+i10M5bdq0>B!H*0dobYuZKrWZJrRp%2j3w)AcQ
z3wGRn@w@foT}uf3=SJ4Q<I%7<a)`E;Wey^Z$d+ShSZGi}_}%)s-Af2Gd2<{Z*keZI
zPPVYVacN*Q{{8xSJW2>cIiKaxu{0zM(AK}~kwlt2Hy#a4CjX*-?-ByG_8&_F_pv^j
z{K9#p`=>N8ncewq{`2~j5SCsa(La2l0q>X%>?^keo46`X7GxJ)3mozWz;1c&yL@0a
z`+fX;ekBB&JpF}+Y$~uxZ3Q-w^}wOD3(=u9BJ=Vu19o09q+2=h4Gk<7#jk$1{qY?t
zA&3@ymbbsq5O524BOU{-U!0}_r(xtM4IGl|VQhQ&H}wkymJl%A%QrN9)h2mD9|N0^
z+z1T<%aLBE>+dw|{(by{hf4?&cSiI--=zVq3-IRgXl<i3LIcuGjct>xmPNnK|E0kt
z1Z=(VJsLz}9)ggj{m8ljwFis_4#TK#`UUIW->+XRyo9i_Vq`t>g$D85epv5(1e7%l
zVZ}Nf5R%oT(ZH^}2e@OKf$Q_y;tL-ZTm63hQjsMDO!p=86%E_NPk`|*OPZ|yg$4lw
zf8dEDpmoRF5xv?M8e)22@xI@G|0|+P2r7?9^lumqQYBPy@^S+k+kG?|G>ol4BH$YE
zA8SEtpO(*SpTB6p9~%O8+u!g1t71wB*m~#-4YCzf@C)$)H+Kgb4XdJVfJn-7P|`*6
zu0;^=h29^bA?Y3PoEV_Zo1FH)U%x_p2|=rIWWDr-2K&<&;c%b}jRtN1qp;5Z)L-vH
z)e!g+-T?pUfsye6&E1?1zhD2_#1aCgzx<kpbyWl4dh*Xv8os;>Y@NGS%N&Hx_5N+X
z;Bxx?`qw9y5X_M7b1V&5n^Y<x!iH-vKsoz4tT|T?t1_N}#Dz}yX1;Lw{rWehmJqP@
z-gq>8-7m%)Covi3cgKJ48&BKwK9b;4*8s$K0YrBIq`c{av=`kFRr?<7YlyI?tP>pa
z>%rm5LomyF2&$P+K_%@zY&&`bOcU~8i_gV(zgz#sr_DXs8nL~-9f{OH(;;Je<of!0
zc=+%kJb(TiZr!>CSFc`$bLY;%v17-;$HxakLqoyR(h@?0gTOm5cHnpGKU4mq6RY>b
zhYz%b)!Wn40~87c>gwvCqM`!w^73f)pFDXIl9Q7mK0Y225)#1J*cif`9l-lgOz-d3
zFR;e@j?kLDAdK|iE7a^jdb2HvuG<enihEJo17a%HAfjvyysIpLbA>73SDFDI(vjm=
zngFx7J}eg7fv&m!vVLbQoh(vLMcf<Gfu3J~be)S=P6h@c)6qPqQY<W7x@$Dgp%4j-
zVm70Btc<bc{%Rh3mS@9BVBj|#Ef2493>GXgAI)>EjfaIIdq(pdiqWu0Z2xHf|K|F6
zlme<1?H?lj;5881b_uQ7T|wbMIf&@xjpSuKLC*RPh#BP5@@%UPfsADVNE+Ru<=N#9
zW4x&RReq1XPho#yC9je@;N_ixYqb+_$RHic3I|}7wgYBKTUaE%f84|<YK7jD889z%
z${$<qujbbudM&3J)OJTLp!wEDAHubD?oC+=4t0OZ+B`{-vUqf4>5i)4r8_FVn*=m(
z9KkCmoy04|E&J8_CgVPAe4*lSK9iBKx-mTkW-Bs7X;e?akHay}8A<5$e}Dg%ae&h%
zF9#ppO2x-?P`QqDP&uPIs2mX;RQ52GLOZBz!5!4ahfxabptAaRP+9yssLb9SR3<N!
zJUXb0T;Ea|o!?RyI=!PVJot{fz@dZ6VAnyVw?%0`N>;5@#_cyRP83_XL+Xbxy$>(4
z<MEvQtounrHXh8Lhx`~Yn;yr}&pMzOfW^_D^+4eO%pnw-9)>A^449n{^K-y#eG9xl
z>xA3^=v`6TSwA#U^y9<o$(T**pJKp#GiWx-!y~$+A7a>DPo6OP!x8=GN9>%xieYgi
ziDoy%d_#T-gXP50&l6csrs>Uo5d(V+>9bAp)30OLJ8|^$M%9xAvp?(Ieue@0<Y2a8
z_J|QZ+~Tlb#9%dX^z$95Cu4TgpJGTvv}1No<VW*QF)XmDo3QrJ7gJBB=^cN7fji~1
z4l)MmAb$hH!U?3GKdzokvyWrC)9+y5iFgiNc9&7g0Z!W-;Mk9)Y?Lkohu7m@YD<j!
zpG_G51>)<;!nq@U1Y_R=kMm_<6CKfa(d_X;t7*DFHhyWEe*sMoDsKerKJ`EB(~BmM
ze!+x#GN!lv2E#?<6R{lWjzy8~7}@%1dPB^o;CmQE6@lHKFfN8gcC{16f5F6hvS|K@
z-uG`9vMIp3#+at><5WZbSRvKG8~YmYuKCC(PxssRu*GfMwltyiCnNfipU8JHWORW*
zB7tV#7x-#y<%w)U{vGmv$FOwOxZ~0y`zI5|f1#9mGEJW|9)_>_^w$_TR_T4ymN>%N
zzKem$VdCgtl3Gv3{7?Q7hBH*)Sgk+eWAmjy2(CbL!~5^f56q4eNB`2ada}gb5kH+@
z!hqQU_8|YGF@2g{&Hy;anIBjVKAy1lBYL8qOtTyO48vtAEQzcHJ~i7BJHnW8iPI`$
z#GddS46IHQN590Wdh+t}&vu7#Ff2=}gViSPG#dow+r+zE<8K%^<c$Fz-G=;--hUUv
zV&|F(<NvbL^<>N^XFLpRqp!nO0}D{qGN$=vVRn?SF|f<%0Y0pjX3M~QwZ4a8vFoD=
zqkrX@dNQWt{vHOE6BRU{FMYFJG`;^f7*Jc{jjTgH&Le(cn4k0aFf4YPIR39bS5L<L
zyS|6P%0HN9JHh<c{)S<TA<Z|NFZng_Cby3Gn2m#hE4~-ld?!wRR>-O+t3Dm^gZmo8
zvb$vP@;*rOiNow3UofayIDpuZ3J^$Z8L>sBAY0Tp7`PLOz@3id5Wk6|U+H2!8M9lB
z#UN8gruo}_jltCB0Eng3g3yT;SmBWY3Yz91ZW#gmQIEdCz;mnzcu!GjIsp#<iKBmA
zPCa?+^AWq(SPVXiu{7J$7Yr6Io*<Ob0z#)+Ky|P8UwwML9tc?{j$+_T>jr)_$9-8(
za|BEr{i>Ji$(Rq~_b?ddK8C0WkH29s@D2wx-z3;>Y5Vs+t)dHjM_&NnaU?ULIqqv&
zgY)pj(XV!`o{ZVt#>24h!p(0meBB=~Ti};*Nf7l3A>@nvWi9#z16T0G(XWwPPsV&S
ze}qA+unFu=WP(d{Bsc^GfsLO(>~!-5Lq|{0ws8fu-A=IDH3gPlMRW9+bsUBPA2M<D
zZ@W=XwrCykGyM^U@68XtBrhQ!dQ3+)QTi*L{CYBGH=Rffc%&nnDEfC4)|2;j0!$<Z
zOh-0R^k07Yj{5XtAJlaBLgjlRTp|Kwe+0<t0l3=!2@0B8A@BJcxcsCEj@ETT$m0(1
zt84+k+w~B2{T@W*+=7tvH{d`<A?T$S!?whmpn2pHScIPh+lVx9ib{ulVW*JEWMcm6
zKlD?HL?XO>`*zg!jM+*s+cS3V-Me>CSy>6CrKRxV#S3`$>>2GiH#Zk9U%m{OAM=?r
zXJ~d{KR-WkadCl&hzQuddp86h4up`95C{zlg^8gahpR*MWAtLS>Myo)>=?6IWAtNx
zt*x!2^ke?lH*emA>({T-=s$h>G-PIG(&+d1_Xo7oB^*6^6ws!JV7Gf0gd+?SN&l0!
z?qQ5ZDwRsZfcc9zHa7l^e$0;?<9%&yEff_M(fr51(4Uc!LGuMjOiYBNq$Eg5Ng1X8
zz)o|Bb9ID>!=V$_e#DfWKdj#F0&;rpu*Sd>wpj&(=H4J$T5swLt90E#cDoy_)OH1B
zBX3w|><w!Tku6u(4TLw^g3$W?Ah6B`#5Nv)Wm{}Pa`S!=Q?&uk)fUJOyA$|P5?X2X
zVWQg4LgC%rjH1@SEOl_yj*j`eV+phMvn+T2<~-&Tz$!BmQ}^Xw?3Y2n0N7*$zPTT(
zV<PFt{1CV|9RH?Xw$+D$SMBUK=UG>H0l&uOZ_Z;p5Yo>7=KO#3kN@^C-u%b^k^V9n
z?T1Cux_5;|J}A4?(fmL#-w~m$*{}fhQAvYrSnuBW)%hG0N4p!AYMp?MJ}*bl3vRsx
zOvt~3U-by69eO=_9xID^nIq=g@p1eX@b9khD7cci<UK)n+i_Sd>obyMykQ;>@^@b8
z2%<U}e>+dlrwgo7XuQ-r``3B&9D{&9!e$PV`dNQJFKC2(nvDAX9hKuht?E|wL0Byq
z1lAt{{&l{<yVeJI6ukkj;02s=p1`rn1K4ETQ2ekfut>WgemehBLa{ioNYsWl1~W@L
zH;+%jzq_L5-x98Sq_a;u@?D>1P;0MRz?%;ny$Rha9xpoAI5xbKvwhYkV^!0#Z0CbF
zV#bvOVg2%^Ur9@JiU@q0GFv&7V%oUYM7aDrD*t=>|0D-6c?^X$;YNR7;czpt{C~d_
z!-p~a#{9IDQ1V4-)K3eYxQliVz|wzz|8d}d!2xdb%Zi-l*Yr6}zmts6xvvr%I%d=V
zPSQo^#wP7+`YdD9R&?&G#JcUW;{O7}@0P*oUeU>$F%oY$>UWlobXBQe`JN>q-!m-!
z@QeRhEC3dV_{9f}H3G#Wh9N(+P?UlJ`JxR27MD2ci{^{@qoKIO&;Do(9>^EX4Pd@2
zO3vumprYe<>HoLS@tz`$=%@czJow^^7l`oxDi0h<6Q&pW8GrcC3<KYp&whLVmIq-J
zpv8m+4UPCC{wfb#h9?cbz}exExSfB=18lDq%ny(SrGLx=*Ga^Get5*jfyKK1CJz=z
zAzwlikGnV&?LG24JaC^p{DN5sKhn+9Y$U(I1GX=Il;M59&jXLi!!LAk7z8hl_+9=}
z9&p4Bj>MgQ@x%OG9(YY6{_J5|?A$-*!O@XeaE>VChl<66{~I27Paggymk@sBTZP4X
z|0)l-68lGDeq)diE9S@gZ+YNDnY8hL>E+>3TjQ_r;4dH8uKyhmCKLbFVPtRp9Pj^=
zcEFSRi5Bbpmv7GhhzGtyllK0FuOa-`k>Bl4c);yd3>@mtz`n*D*cH&8I>^_GUCt0C
zedNQp1L?PPfnC`W*mpz$yYKUVHXis*p8O}AJ3QjE`vV^Ec;2M#zwno@-<r?+53CyT
z9YuQ(uw(l%@JWp9$-plK>;|#OkN5NbZ9khA{3j8A-Y{*iOq$Q{I6PoqZ8YM)jO{rv
z>hJgy9`J|&`}Uw;YX|;=lh*!4ZX*0Qzw&z?%Y$<Rz`acUFF!-X1J2F%fZv}9oF*~A
zf%*WO;5hAoR}|QtN`B6Rz{$fenm;_U*T#={us0sKmv5!*qskXn^UZpJ%O-PN9&n&|
z<)6w2fdiBF{zVIiK@9V`E<kPIM?66Lu>43qU{~G$eI5uQf9A*!KjuMD|D@p;yM^!<
zA;0Zk;lU4NB(B}5<Bo|O!OcIGktPwpc=0fZ7mxU@{~I3Q9dnQ$`}fC0jtJzB|06jO
z?S=X?J;g*_7r#AB+iT|E@_<v@?{jR+7#^UQ7S3q2Z}N|1<&fS<!!L0c;Ya@F*j_ik
z!vp^F6u|FF99KSIUvG`#0e&JUh7u<Y|FV0-w7shTF%OV`rBGNo@T|A`+uS%-KH%J+
z_1PEy2RsOyJp3!mhC#aQuegI>X$KO>?^;^V5yTa=XnP@zl@CUFAZLWIzx~RWe;ghl
zIdP);_s_~*RWVH4Yw1^bAer?J*4iAV?E@vZaR)69V_Y6cX#oCkHQ?jXzO#ReXZQ{e
zCK12<{b984?8tsoKjMMxnHQk_*;jg#w#koqfMNG6La`hp`$GMc2Wao&pS`Dvx~}wa
zm=-hfBOa`{-VNrq4z&HR^h|cr{Kd!Rfub4k1Xg~I1;OzD0uQ1-Od9@mkA`9Gqmj6g
z@pzycdzKbIvdh})hddBA4gkK`=fIcL_Ejv&Pk4alMXsdDTmP#*9;WRz_9GrR`g((d
zlkK=XP}*(@V!ogEL_={X*uH4L#DlnQWM@P3XUgR1|297zhK(rh2HWfGdpuZiXApdR
zooIWXeUAsKR^G5QsU8H<TR<T7uUMRsz2Ux&Df)Xmz@yEzxQ|n4-|4`oP9A=ZXT!8_
zMU2M-nGzB$ZsdDB(6UF^(~$odisM;wtO?{SJYlt_1&G_kfk4c&&->$jhX;wBD4vH*
z+pCUdb4{B({M+h>LGyFm&v-ltI1>C_9w>)rgV3KS*5qUhtPH*mUyq5)RSjUNWejaR
z;7$6A2Rvw>KHd!S-)*kPCl9|)!!T{Hy&v&l|JiF05$66454InQgQXeGG#;!9zVh99
zK~!VkXglCZc?<lRL*M8Rcuq_n{v9udLAPmSzrpc%pmL80k@11w<-sl|ci8S83fpZx
zV7$4JKei6V=(T~sxuNgd+D=U#ej~y#EoSLwJkTk40nxFCzRLqF4(msAqtMakAb4SD
zd>ae;rp-jjH$N-a^z|?pe~#Pw84uKNw}Vew@;~B%qMkJ@$sYW%jpg*@;kRfWrtLNP
zt31GDq>V-IKqu!u=w}wg_CJeY+wnrsNG*WP$u~h2?E$GAn+Hl!*Fioq55&)n?2q|F
z`vUU8_}P1!sOy%k!?3e$WWUXS!UJp{&L6E8eyUIWT9<}=FeVD$&&suWJ4}l?n^Ybk
zAB>;TIZ@a5cMOB|=eWB`;{o!)m?(TdE7$J*FdRVpyiO_)kPpVs=$xqQFZ%|d`6K!!
zNzX?hboIdV_dRfb0HCTLpt293{1f`^?1lR;o1v=VC6qmDggZ6QAg}f%oNIUor=B#!
zvHMLBUs4MxH%sB<l^c+H@hT*p%YpceEO1H72Fv*KU>cPH`oZa79GC<)fwABg6a`)(
z(QqjA2pkTJnKb-Zyd4&6*U`~IiyQnBJ4kayM*pz*$5*djL4SWg)YR0B#z11<b;G{r
zg2m!hRaK3~;^pMzKvq^3oIQIMu$aP_m>4*8=n%NMxq*|D6GTTx)As50_VR@A@NimO
z<l)1ICk;P_^GnPjhW%^&U*ab*{MaAH18fgsEC%!o{-;l$()J_9;t;Wf;m5F##qZ_i
z1#xk4w3tLJCe+Nx5DxqL{J#P}h7IGv`}glh@nicRH#9WR;xE78$L_<<V|yTf!Cz8R
zGWzbn;K$-fvAvPMy#K(!Kw4ZW7MF>|lw$Zz4Gq9+-(H9c@Po;I{}?Xp590yW-m(7B
z)YSA{{3H^I7Eg=4cZ?5(g@xb6pO%(Ji$}%YIkrbNmd4`uwAlm69!`)D6fkM+Uk>dt
zy>Vv%Y_SQWrERv6VC{bltPZ8XUcVIdt*2x#af^pd)?u&_CDpy5u--Bl)Y1L=2cuz!
zLlj#3gu}Ldp|BQxqjH6wCoI!(2T2s?D!$DH<PAMwt+6L47`TCgz8kF8bq4+o`_Z=)
z(YKmZ4}i!zw4eTp9g~KCE?%7$=ZVFWeI3I(_W0jkpHC})q^_}LV>C?E{PweQvAUTg
z?Lk<-j20{S4Q(i%mr-~(x?WC;L;K!!Y_D$N9c93b;@ZA<eICy?SgKco;_>{ydwsI;
zvn)q(hX@}Q|NK4rnZ#{r*Rhzr?_FQGbSLflVi~{hUZ>~VLA%Z&AO79z|KXq9_W$4e
z|F8Z3|F!?mL*qZ+`Z&-CYyn}NYapP0b~JITVBb1aN4}ljwCiH}H%G5w_wlHv!aVM+
zC}!Lm)Y0=&rp14|&bR3}%;(cVan}Z*=Kltk?=1b>b^gt#P`oz!&ch_mfAhFCKyYI;
z=*7GTDYG&VHMldHgtq3uJiG>Qu5yPRvF~B|?#j_?*nLa3=fZs6?Fj#F+ViqD)qlG#
ztaAev2p9nax<@DK9mv}~`TKRf0yMXx?`TXSevTD?eYfL#bKC!kbMtw&Pn!Ir6G4EL
z#wS5iHxb0O6F^MsD2QkxyM{(AEK!RA!A;R<KZGdsE$|2=vxWnHZ5VJVh60B|2=aYK
z{;g<lk$;*NqrFjBmU|$%%YpXY5+=!ml%L6I6LnoH>}`#4(nrvb?*`rIPSB2c2b#fc
zuqB`w?G5o7)_XL;TIWVU-{64N`)gsP)f153{Rkw@AAqP~B~7lu#?F6|mg?L=`>x~w
z_xe=iM~=R+EEk+VQTTqP+>P!p#n*eimRslbYL$|6qwG4@H!C){zLr+DYh0#eS1YMt
zTQ9D(_nD}i%_9+6>jz7hTU7~3npF#k8C3E9P7={6<rmV)6<WICq9~uzG4$n)|Nj2t
j!0&TlM0@e|f2=G_p@IGS{P+9+6+X~r$*<q@$npOJgiQD?

diff --git a/games/NXDoom/data/strife.png b/games/NXDoom/data/strife.png
deleted file mode 100644
index 7fe40676a3e7763702d65eb60814d4f8a9f5c51d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4966
zcmV-s6PfIZP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H165~lkK~#90?VWjS9M^rvKW}FCBDqUaqz=o6Y|Bo3M3Lhhc5~TI
zd?0WR6a~_tjZ>tT(FR2kv_M<50U8uZ|7we(%^xYyB1O`oL7KP);wCbhv`t&bjuWf4
z<w&wbNt9$A<cdq~a<4hwuYb%AcPTC@?m@mWcE7-K-^{%CW;mbUyyN%Yn}wl<8fvJa
zh8k+9p$1OM<jF-)7e4>!&-hxsQ=<vQ77NjWXnZY#Xl*G`f!2Z6Vj(*4wOF>&B9=z9
zNaL8Yl@2^D7FzpSi}+eww$f-V+E>~S0ui(hT+iRm|4|8Q+1Ga9E2rXnjvI*WiFRBc
z%d1;Qp8Ub7SGMzd)?A;d6CeBIkM5nCNWPF7&FmE|1c63$_|aM*&}gj@EoiOLLCdjd
zJ2a8TacN1fk)U}@v^3KP;Rj?}{!fii@iaAGQ}uKs98mRzsviKnv?Dq8@RR@fT7FwD
z=qgzzP6{xQO?)?<9o@U_Csqn&87=r$sp9K{SL)0EWa|9J3?P%u+-2(A@xdRe<OcVd
zI=5r$#Fmq=|Lxi1eCPR-<d-U@F2kr&w#D>_LpEWLn7RgI25{&{C;93#FPl1jEL0CP
zua{hQjV6p0O2(>yXMS|j)Tv{q#hP!-0F0FYbA|Fs_`SF9;+H=3Hr%?)k;60iL9lK*
zE%566GS8h`TG_X6YK-6e_<h*6#nG2eQLfZBJomY!8i!^U5D9w%DaYZ9Pu$PM_!uXT
z&XUg;H%wosdOUq1Pu0^a`~K+X-p(!icJunF3!FPQzhU}{7jWq00{MyyfVcj?yX7)w
z0MgP6`{bi<B{w||z?(}I3KurMf!F6!{B*udu@-jefA!(JnYwNYfIIHGiHpZ)H%z}b
zo8t6hmE-xa?ePomxs@Ak2|FZjddn>&e{$@a>F3KH|210x;J^)&95}cifZGq=hF&VJ
z`v2O=zg779k;{PDMyatXp!E*bTAtW?b>pWOpyp|6EssrUxw;Z|H<4aMSgbYuK}$=O
zmCNy}^=qaFSg3j{;Y!UVX!w`BYW<q<!}QJbD}xqbtORJ);TKQhmn!(K%i)<hP8O=`
z#ub56g(_~)yvr{gJ;zi6EX(5fnado$w7lW@E)-oZFS{$-r!EvY_52Z%V;L@;&+{K=
z7B)=3SPPh0X!cx|s~#txdxfzb6BP3ceCK4IK(B8FHBWOiACI0-EDS)juy`?aguPy@
z@skUsj`JwZF9NVo_PR=6Sy~Q1HNUI$Zl%sbB`nepUo7DT+v92MRpzRIp<<z-0Svf?
z1~A|n8o+>SXaEDQp#coIh6XU;8XCZWYiIxiu2>jAtM7aR59+4UcjH#qEs47F-(8(Z
z;x^}KeZ|56&X>Xg7!f#M+}vPHyYv8OyGVbb<PtQj=v=Au^o6=dxiL6(sqErueT@|H
zkug*K*uJbpH(e>XZ6Zz4)m$#S*GSo3H)K;JEXC=iYmWxD)AUG!9T|t2h1!ZSbfU4O
z&5hX<r<ZEf{LT!(R*HX}Eg4}E3j-K*nKXb{Q~^Vold<98hd=%VTEXtUIdT)JwsDf_
zF-CV>zcO`88ZAT-jfif9g?cHES6ysrj7eibNf0g?(HcRK7~2U}GTfHNf)X7x;tDzl
z2>d#g{OLxVMjp{36=~*ar*b%B(~SixjRhwnE8#$gZGy^`vv`#fS_`(5z_OFrDv4z$
zC|4ck7ZvIB2+V$COYir3GFAnMY+U}kuFLZBGRb6;d_Lc}`FiEMHN0of9;T+IR;3Su
z0MGMQK4;IKC7aDMH#bMUUSE~IHBSg9mUy0r@B6F1qp(s6%d+r&pOKM~w$~JWzxLW|
z<nwuaKOmLPkxY-1OpTLDkCRO2NT$X}Tj%-1Kltro6%fgFUGn)nT5HC}#@4{?L?XiL
zufI;YT*h%6cJ11Q<8)u}B@zj;*(?C1Qi)Qj^T{KTEG4AWS<oBLVA@K>&Hy~mV_~5=
zV;3Ns%`!bb-Em$b!nt$jSYB@4;K&GU+wM5OL?XfH=;*3_#bS}ArKNRJtS`%g(bN?z
z)}Q{i9g39!w1Xcho6WLw=gv*%B_hnu&bEC*ZQEvgdb%Scux*=kI^Fiz;^HEUi;J7i
z%d!+Za&;WbyLRL)R%{Hw_k9)@7u&**l*{GVwQJWk^AZtGojOIaxc>Zp+qRjUoZOTV
zSe8X9)xMz`X<=c3LZNWYylmUzx}6CUPCT4Nu`mGN_gPw6+7N!ETrS7%-MiO4E+Wj#
z%xtPywk(TWE{A2Ue;briBoc{h<^^!&$`!6$xw7tY+qSv!`bm<>__&IV8-VZo6pO`8
z!H+aPKF*#!d)Dk15l){z-BF!v+cslkW9u40r)`D#`FZmBwM+dS$L6;EH<3wi&X~4K
zMhzec0+yGTJAxl+Vq${puDfn!yBqkCEX!hKWCYc+LPJDWZFi!%xjE+M=2o_C+vcvj
z?qX!5eH+50j5&gWAfQ|>cLhJv#KZ(5LJ$PZ&dzRF=U+>fWs%8bs8*{h{rFyV>Cz>F
zAi%OL?!5C(GMP-zd2WS_8Gx?*I~mJCRKugE1CY?mhX^7Pc99BKXdGya`$pj~-lPaM
ze~g66Ffkr^2Q@kfny-jyY-cOq#lmel*7#OFVhcLy<2epRcLzbD;m~P)&5Sf(S(8i^
z$xJP@yt=00{0W+IL|$ddo1(5SB04}>4q&0Mu#^MJLMa<DxH{0>3nJV@*fuRN8y|hu
z_NwEJuwK2LZhTh7ZI_RG)plz>Xs|RW&EB+xZsq8Sjl$6b9ECR(Cm$Z%ApS<n$hKMr
z7l&RAw>$W4<8GKw8~AJD(kJ+hgPVzONaofCMn(D%elu)91`R+rZpIM)U>m>?J{YtB
zvu%JO{APSZGFJj<0o4ZhAi^I=188jn3_AS5>;>qS8#IJ(N`?(UZ8`kQ<q3{n*~^*5
z9V}Io6sw8w#neF%dIEz0(SEoc1W03_);<zwbkKUthd`4})p^&xA|E-pgl+Z7SPaSF
zJA$MIT>s&pT-?Jmv-fbZINk!$Zvghgw~Gf2mu+B$F5EyNfeJ4pP>ndC0}vgBHN|C%
zZ_a1Ayb$o~50yekZm%VUA;qT(=o9>!>+safyE%GgZxi|&_^nTQGfumGdQ}PGx0D<{
z|9w2oM-MEqXNL-3_10@OVL<Vy0{R4hp)$rl9)FOz^4ONckMcR6hm;dAnYB^8vEV}-
zT)};UUv-mw?brv%S4Or8eq*0NwJJ#9vm<9WN`fvLh=yd?5!4^}qJ^)&_WtdMuY<;N
zW}#LW7M8+ACSCOo49TD)NQdUvhX&u_x&544obCwzm|bT7<UC2+CHkqEBNrzqxb~*u
zOW<Q!O@MV*Q&^I)I#8YV4$LSXZGax&dx7HnXAg7)|1CSt^PyXgVnsa>0D-gl6bm}N
zY50x`m>SgpEA@Zfg+j?^a?IX*?_e;ifZm^cM00H629~O+O~X&%^6<^a*T4@qgH6NN
zLBL}NYNVVde1$?G)a$TV3TFm2^N$~VFkS-C6MRHCn%~<|oj;jbCZ&Qk@DWx!el~zV
zHRAF3J$3HAS+9XF5-zx`*ELHh#z(C6dj|vU2)f!2&;@)%b7Em<M-9Hks@)boz>Z9f
zQ-QrM{OJ*wNA9li_FH^xwf4!6;3I-kg6j%J5po%8ZSP>{2)e2b&;@+gw<y<~j#~R=
z&*IqpBzH^~u4;e@_uo|D$EVY4;7^QrJbXu$ckQnetrAcOs_`zMcJL$Kbyrvt&3HyN
zj<bHdz<|vA0lI{bXiD{TS6#iQkKM@bdn-()qxS)Y5ccNkeER;2eCOpXmkO{m=kng$
ztK7S<j;)%YHVZ$R>+89iVxY)H)j{Kwrs0F}5`dmY^}@~0`}sxJ;wvxQ%rD+^hF#fO
zOGzNyK3(JXhiX^V&)vgUA}9gR6H4WP?1<Iu9kjL!49RRSpvNKIQK#0mlV_o9@#SZ4
z;PAQZYRGFEXT8IZ@^O7(xgt$xQFI>+mICGspbz8uY1_rY?b^dvtqWiO$rN9Gev0Lq
zbxruK;ZEU)=@hP~DObbvac~3~UKh|kd?dW-w~o*E?B0F(T#`RKw1Xq(8w)qrfxljB
zf3xtTYxaDhT-AtP9mj-XU;y305A%RGPhIYdZ@*X;{`Lo>eC^pZRhKP;AI6u^2x{RH
zxB)H!dV`M$@4W6jX}j8&fgK5aessd(3r{8a>3Owf@T2aaA80By2}=S)ikB<6i#dGh
zM8F4co$U+!XkTGD;7i|yZ~jn+lb5#uew2qF2vygd1;n5V=pKH!EqrkQId0pr&=>g8
zJVEXI9C|U}&;P|`xw<v*qXwYg{0+%%R}2iGH~2{SPyF(`POy7)xi9cn_UV9Q=QUsW
zW}PcVy(REz$;*Vyw*mSzbvu{#_??GNaN~HnZ}3Gx0~ZRypFZVLC~pz`!F2@n2YwVM
zoAUVmM^Ew4?F&sK=n;N&ipxdei{J8yep<L+@I&X)R^I51WzZ4SU-;4fgsu7HeV6&%
z<LBAGv)UK<(f9d+@Ym1yp!)|O!Dt;|z6$6g{MI<PPP=^WBbRyd!2**RuV?tW@%`h|
zn(rOa{evG}vmwQ+8`vlK5gY})?@cxS@`(k0<B>9Za$ZmHqwRlqPE)S;5B>l*0=Eu+
zYkbFo2k!9ri%(Vg%wsOQa^1rhV6h@R^<vOJ_ygGn*e3X`@ofbkc#H6*UlV@wG03KL
z$MB<pyk}kwojCn~Kfoox_Q7wBZ!380Z5ChtOp1pOIvv9ofkH)iaaMYVubP)?LWbJ_
zY&-nc_+x4K?8j0(`B<VO_)!)w%<7)utHEspU=)69{GYuq!AIWVbOc`u9J@r%@MYzi
z%*bpB0LI}*@t=6W!Ll|FUx3r|f*<q-U(r}uY)EF`79JD$h%k{+?3q-XhA#rHR#d&-
z;6tO>F(mU<Kn&nV@kdjehc75ZpyIaX+c|tC45%wOX7CZARP7AD25PSA1AKE9V73H+
z*uby5;iz9H@I@e(q&N5``+yj41H=P90<WCYxIt&|l?4+cJ;GOww1#B93g{EeK!?k)
zx;2(>Jnwe|Ux4d#;Hci<hnbl(0D~)o*fgAtV3uo&zj;P@_SFE_^Eq&%@bm9;IIyqH
zJpXm_KlHNC|D4br!54w|+@gAhZ+bp}VFT#>$^WaTg&!Vm4(uGB33&0O$KCsEo_HX^
zTW_}3&0lNy=jVOC^gX|0_yRn*zd!IzdIHTZ4n?gCXEX4ZYw+B$_M>_)&j$SN-v=Dn
zXY;8C91h+T)^>g%%v{v`-&x^XFZi4<NLTRRej^;%)4b-cpL_u^*ak58qDXpz4^S*?
zw7>C??n`F^K6@r$dQ4Gqg;K2@=+5Ay;J4o0yyjluD<vp{jv(_@K$q|lVQNfa5fE%*
zNO!K(eA0V?uYo7;gE#M@FYsmMe>NlYy@1wm2k;R{IdJf1bxruI0QLy~kvGAo-$CEt
zn{ETd%MsK8{3!k>-k%6xGy+=={}cDX=O1az<ZWDAukcNF0U=I~pf2DeaOd?FpZ-91
z<N2F~KRpJ2@+f@vePFBp!dFTSYBx|=d33vkAI16jdlHPM6o2=9k3vQI2LGl>_|RSO
zi35;I(AQ$W6~4(|6gBS%>Jfev|M7cm?!V3Ae~<gjT+)>5;r`ZF_0gJL>wXD4VzyFD
zj0ihN;NV`xzRA_suvPE}v;=7U=>z;I&Qw<M!MknVeQQg}LIaX)G=WpK<g0r2?RN@)
zFdKn=h9AWrO(`-dD@wEp__XBP`@l|DPyRqx0eyrY#TiY3!lGJ}*ux)A3T+Md0e%!`
zB&o<Gd1JsgR{+F(QfQa(qwq*lkx8le!#CIpjPIn-9^prEG6~2eRD9vLp4)&74+d>5
z{3x7BhWP4UYnu4LAJ8_y_P~$wOeY{^Tf`E+!Ct@{dn};Cc0@WMq@3;V=R-W<gYh=N
z_Q8+hrxTEJVg}!!4VbS2wh?|5PC1ICLww*5Y!zSteiT3Dgr8WzAIuV<@y7uCD4eua
z_@hq)3LoA`V*!1JA8jXWa4f^{4ORh$M*}emzqKS#XnbFpfp4%Bi2qo?7Q>IyCoF|y
zi5d8VX#nwoAB7VZIF1;AZ_WbZI~K6b@T2sOQY0+47rwy~ARaS<AQteWu&qFpLeSd-
z-=F~)D*+aZy8TTt3_sfMSb~Mx7WjpVISVjm05fO&c_5bXqd2w-Z_t)L`6A3L+H+mr
z#-3%&0Ol`e?mu$Et;H4oN_Aj?wT19snX{`G%M<r?eIt96$)RWfzWpoLKb~}~4+kP^
z+atQos>wB_rL29+)_RLArA>r(aj)Lj?pK{QJjYcR+2;CeCB7^A+aLZ`;pug98fvJa
kh8k+9p@tf2sIAfe16Om4l7&%U(*OVf07*qoM6N<$g6ECEtpET3

diff --git a/games/NXDoom/data/wadfile.png b/games/NXDoom/data/wadfile.png
deleted file mode 100644
index a5888438812c0b270fb26bf1ed949b896b37ba8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8681
zcmZu%cQoA3*Z$aL5xo-xLDcA?vuYyId$+Pml<3jR5;X`SqD4#8=q*~XLZY`Qs|2gF
zI>G8c-}mo#&XjZJ%$b>c=FT(sK6heuw4RdOyMGS=021|QDtdP<;=e)wxvRV6Z3gZd
zLicB;UI4&l^<Tjm=`?wN*U8|mYT~W$X7BB5<7o%@`uYkux;lHoZQShy+&mq!_GIth
z4Wj#Rkm4KfS8kqwhK;)$tFn!Y&1)N1TTeU3#pL_E0Kf{Ut0)@yeclarF6Vq2ys^I+
zoOAYO&-noM!2UOV3f_}ie5ze1njc2xvh}k;u@CWLOm*t5?CN09Sn3KRPs-irFKB;8
zb0<d9+nSToKW&W(iaB~1j*R{xA&Hwz9M1wD5rU6khyV6S6}R4;>+EAN^7Ci^7_8m)
zZZUuLE$@<H$8Fh-;XJ-%5nTHJ$)N%&uZ>QpsS?{VOoGS<&p>{Up}~kaJa$uYEt(gD
z+<%QM>$W|f&-}au1VDZd;uW4Mh5mU#c7yE+y}C(rGW300A`bD}IZnJ`626f^GViOH
z!x~ME&ExgoicTv`!@rD(EEz9eQte-F&ln5lnAspk<ZpUML=JQT0Bk<T<$he|rq(!@
zYTC)I(#O+{_S~6ya6akjt`6ue1r>-hm1f{{f@Z|tB9iP3%rh9m@k|H^*jUrqBA{HF
z$+1i*pGq5FUpoJs$k#6+A&mYP$7l1ti{mv*O}b(dVA<1dxLc9ztu#U_bhJm#cQI~k
zHh@So&@PD_WSYY^B5G?I#Xo}NPkO{$;P{R|YZ)_aXwh`QloPye%EZLfl(rB0x0D-n
z7K&XIG``%hM=aj_{n{~%zQqL;j+Afra%r%c5#%3mm>%^W6AwbG=9H^Y%Af3}=N5mR
zZ;Y(WIowiQUOr$CVq4k^-uE8~^l|l`+du)ifvYSye_PsuL1zocZvlYKb7yxy%(PcY
zHQ|A70|j2?O-(LiX$ts6(_Ir`UT3sOJ+U*Jez2et5z#BEY;&2xz>n+6#;QVU51}Xx
z<eZ+JjUorF^wGDr%3z0^z5Ld<99Sh$lUJ6{v1j`sXO|rbjL))XRP8A`XaQIGbElNL
z#*XN>hl*pBt;YU{I{kVAL?Trntgq!t$#vf1Pn1%7;O%A`eAjaZ>7YdWM*%<_`o(Xz
zqTDegZYm!*Sb@fzb{gkx_Mq*o#cnK&7;x)junxv9Y0n2P1}mI!xRP^vp^%$z!?cQ>
z>mmRo(3hV{A}{rHl~}q|;RQ8^NpaT-+F}gnBNs=~chHm6W)=wrqu*6vR&vf~AE=?>
zV!P;zg*TrAG5i5-@{qS|QC)T}uU(cZ+=3a6o;t&37E(TQgdS}@RR}iDZzlS3&Hzxn
z(R$7q<&;g7X+`pRh+`coR3rM`MbWMT^IA^pvDP~=K{KP5_|lWyv{Dh|Xbb2n!;x%s
zuUB=iX2NPZ*-Ia^8e4^eqtY{OMWu)`LCem`GQls4jIdD_m}65!>Ke`8o1(dzwzi6_
zAF0*Ym1vfb%?E#h%q$#9EJUn#mF}gWjh0YkPY8t%6pqJcDli&k^9N#J`331Al&M~=
zqu<P=RQlTTbEMvi5=?q1NmF!H2~fFb`7X#np7pZu{>K7BZgr@N-)VDkG6&&Ba35~h
z5+&p<j#jpOB-Pwp%PybB)vu=y{5P$Q6M`8h!XY|&w7+L+YN&<51e0<AxoimVf^+Di
z9PZFJCKFISRD;{CIcJ{yN2^lpVPR~2U+qOW!*gYVRnzxdw)c_=i+{Pyx`^XsC<ui;
z3#GhMJ$Ps+nd65qD8{_1^t`#P<%x=7kE2!10F^XPw6DVTX7Qqt+|98rqdWqaQzTah
zPA8|17no;I<J;gij#ImiAk3jOdW595TXYI^T9k5=d>%{z5cK)|ECJ8avU%E$^ZZ^B
zK9VI1aPF{p{>)L}B>1F|4?wsU$5}NdhG=JkLGA;L3y2ghZH%-;%&&d9s{<}=8t2#1
zX6bm;m*ov|G^-D2ZM7%)O4*H5lI(C&B_K<DTa@jJaz7$)rNHEWP_SzCx2g9ePUp2>
zSdBYwWHE5i4|JP^As?+ZJsxs5C!>c-#&caJYl`H}DgIH{?3tP7DD-?*#G?+4y~?rI
z7iGG(VljQ9I<*a#H2Hbc`M|Y#?Ic}`%Wvt32ym|hu5aLp*XtbtsMfuXpjS!HOT<|a
zAji{Gd1V=QjaAE%NfD1%YSROATtD4T)UZw>-82RA*uSJ$exMVnMJg-785I0^+1Do!
zyGaBNvT2OYE*-ZiofXQ^5Xz2c7A4OW<lz03bO&%5Tbva6sO_&QKBK!Qqgy_T>fsU#
zK8#Z+O`Y9@mGa}}9+ps9Ib4<0iA*x`v7lj7ke9~pfUH1C$PoYczbpj<P2Ht9?i6VD
z676Cy`>QppciKNBk*L%9KO6*;n=ZU}D=uB!4z4nD^%LS2V0_gx!yiaH;<vf7WQ(aP
zMM$)rYtjn{I%@ijEOZWszK$AlaT>yp$xYEKZ%}4M)7p-xR*y?PHk3kem7diis+iRX
zej5md?3=w?Y|ec7t*ES}V%#xm%X@hczhb--CQg)87j}2T*KdO@nlBy-Sl$Q-Shh#Z
z&s$c*I6fk{RWp6=aQAP>W!9Lw%xwOJTkiQF*T`U)QP}J;jx3Q*JPvh#%9}x@9_?0;
zncxn4=f^EOyv2(BsxwO4FK=1QbHnM$`Llm-*@la$Cl!<~f!A4GR3eIVuAkKI+osz)
z?ZTv0KW+5Z61Q2AZGU~^l0B_9t1isc&$Fx$v~3Q{1OIfB$D-fv`yF)R?;6;W-pR^s
z47PDx{2tg6R#;js-e<!YK4u8HSc6y>-}*>&rd1Wf#OKG`2eB|rgWT0K(Y*24j0gRt
z@bK%lVA<=zaqL{jd1%vjFOqDrUu9NrK#W<8W-~ed*QKZ*+vGZ`rE)B+?-b_9WW4s3
zq@=824)Xg}x#5SOf`V+3DAdi8;m<-IfPlQOop4w<TgyN;CjYP~0uiyQf$%odB%xyF
z()p@LSTs(oEr0GiJ=6UD4kjnI%(H)SUM;`14ydNto&Q3HjFg?C91=F)x7tzp_oJm=
z8Sn2v;57QG7a{mH0=aK(sL0iJ(1*1B%o8?>!+Gvt55lZuMydz{oKJ@M4~9B!0})}V
zsdk@#Y!$ekm7?U{948JZFq>Hr9asS2AJ!l0`<Zp(OruzxD1Y%^1E8pGKbA@x@Od&|
zy%D@3?QSy|avO>CmR5b1)52AHRLGzsiYq~aNP@}cptl@yRJpd$pUkcHCn9s@nat!H
zHo>?V!b1QO-;%^uWtZ`UkiNAB^7}Hy(#1W51Bu#l+xcL4{%zO)lm7s&V`kpmZr<X)
zO_Lb%=ntilQCdxHOL$=++r_nfOZNK-8qC8Xf{k2%hzjASG~?=qw!%laO_%x652S?!
zLn@||De<AnsrDrGb@mSh#p7Qt|G?R&*Fy5r@9*y|>#wj`QU9xbOJ*PBMb{K)`CWfF
zgwj?&3{jU{<k=*n$b{r%i}<VHel6|e<Kw>8PqSmS_-kQLzzAh@2b5(V=YNQRB!d1B
z0wg=lTZNQ$2Lu7O{049^+W{Upq|qO=fC4FS=)(@BZT-Sz1ZA-Nh&cG91e+r2dZdoY
zvDoxLK%J5}TKO)2mSn@bDopcn7s`Rj?V=62TtNqKOlg}K1!cf_8hrx>hO$uW3Oj4-
zZHNi%GfyB_m)TPwNC?hPzw&uZ+n}53?yB2+_o6_BUw;=m2;Hx+acqhg(-dYR6{aV4
zcXtPHZs<fIzK@260E=hPId1A!%7O7YF-bGJ{^1&c$O-o*hJI0E@S{>PnuxYZk~0XN
zC`|i`xV`=Cgm}|&NK3kd*GRcATK5xMUWyMCFhWgLhq?oZ_Tpto!yPQL3T&;lDCSCx
zszJ%BCJ6grLr4ev@*>c_1+9HXnrR8oXJjf3dTb!#cx4^^mLZ_-UW#Rb5mh>63M!r;
zLM(ONR)~J{`P1X6IVGmNdwvr49v!zStO1$WL^^__s>d4qN&u!LxbUdLH>U*tQ!V<i
zohm*bqtAXIu1w)#Fq#1xE!X}x!Xouh=}V6Ivk%?O3C$(HB%#ykfQ#X%DZ8+)$kdZX
zj=yHiJ)_f~lo3^m21F!E)$f-0Gyzx!y>A5*D9DD{N{+NHm?ip)E<88v1BW74YMcro
zr+vhF;b{<pH6_77W~TjAuwuyTUPI)87<iS0bmgGNdl+i_sW|rJkHE^C`E~R_d%w|~
z++ZcYae}oReQY^l9)}}dP~MOvV&Kr8!5~+#ZL}E~(s~(4)Y|v?Qta&1#z4O7`;3c*
zotmH`{GcQBT2{*^F#V6Z43n9i;R@Li<lDE;7IwI-;?NgNqhH9-?*a}EMJ#K>a&^`&
z)11^BP)ttW@FA4`biREV368q{B%Qat>(Po%+iArY4hU=dD2Ch!4l0hDpM4e+W=wh0
z)W*r|&%E*rUQpX+?q*>kvM;$3HqJerS;9=YFWr1^pI0C*(1{#av_(UP;xpts(^!Wr
z#B|B8r>c5io}@A{Q0Xk7vA8j9l<)h`v~j=X4y7G7F+>v`Ns_*!HL_oE!emW+3UVhc
z!Ou_PCPACkn_}^mRgw+-R3_f-ljf!BxF3*|nOWAt$|#Bb$|CXfOU68k!pkSig`8SF
zBDCl1zHbv0;b7Y9IzzR>1wEsA)D0`727Ey;IG-5!rmlU?cT~r#KXflSUZgxP4z8x~
z*sG^|{Z2Q6ZRay1PVWg4g<+A$W^$!>Hm4KbL`ysXB93bbB+w3G)PYJm6$JewYR-A5
zl6k)xfa221Co!j*FJb~2&f|A;48Rqfn)Et4EJ60}u2<@TWbojL_FG)hPA(%fpLKT~
z%xWk1eikChsgi>!la>;{`jAQHPdmsR`F<wAQa$gY5JLV=qJ#l!R>7xZBIP*C-%F6g
zPY1ru-X2*}z8_R)4|EY&{TP46=zQ_Kr|L*7tsqP4li|eOiOS%3W~xTMRGrHcnIWa6
ztMr_ZEuXl21c-K~SxJ}H{;VHKKr?VvlVYth!wkx9E(}m&1UAmQKCMqj@CjO9;*gp3
z2aLuI>)LF3k80z&^DECNRy{uF)g~?Ya}r?I2RsWrpvG6IKF^0#lYM<8MC`mgUl--}
zB=d%!RlZA_`0;u(fXYnUY!az%+XA}OH=E@67{{4{s_)AVfiEB&+nl{EvIi(m?C%+P
zw>YB3N?Vj_A`9<lY??&azut3T&+BIDp>#Z257%YCS*OZAYYI*EOl~gGK1<4?Jpymg
zx``0EL4XxjLj;@6T!0qF;*&pj@*4yQ(LL_Q&m;HyTGQL{yX?^u=q%v`kt=Q~EV7<I
z!S`rd+KwAp0(!$TbB`<tHSRl}&%;_$@pmV9&cTK~Z)i2vFO1e9EG`b*3n%jHW+smL
zfzD^rcP6r}A7xNs4|~(;i+K6{KH_?R?$Y6~Yn!FUNkQkt?mje&173s{ePdwHhbzU@
zp{g2Adm4h6F&c6pWPTx-Ga31h-K4gj++X=1^&B>Ycc1&HJ?#|=9Qp||>PWhL<AX6X
zw!DPXI9(lJ?_?MFReZWiAoSK=Jz64t){N-QARrFTee>f1hqdX~^r1bYsS!4;V$qj6
zI){jEVH}{Wr~MljPR{liveJvq!|%@UaF^-2n5F>EA_Y|6WgiB=8-1Fj+x7^}$HICz
zxAdFNmOhDh{lY`7`jBvv&I>F@$Gv4tGPv7xvA%z|d?c-*nxf@N6-Ut#ZP?e}n2-dd
z@fLJ#?)!8Jn!ic`LyUnY$-pzl&YX_Ksc9xK$;UV@M9KpjB=vfAs~=BFyICc38rq##
z=3Bo#&N;?Ee{O7F`W?pvX-SxCbMJ3)n4L@?lQFT`jLnwh$20||2CM}j<4>#&l<+>Z
zB5jg$??N7BD!-n80^QmwoWkYRPAwJRC!<$1T63o2jZyM%>}t?fPIft)k3H54^Z*h|
zz7q;br5<z83E?;WZuRA4ZJ%$%;R`jRGd{5^f_89yNCg)-h<incJ^c0oV`vgby9}m2
zZ|6bR%t`XfjAbchBC5(oTW_M?-#R-+64LY(g{Brk2dXd03q(n{yA^qX_*`D!M;rNg
zdxYiS3u5M_=}Voq%o7BJQPPd29T=?zS?<k?l6gta{sQEc!PFp?qSqE<;z#ZMFRCR<
z;=)38_wn8B;(wkCNwM7CtK!$qFE^Uk!+WQOzMVTc_PfROfJMJdmVT`jug-@M1cR1}
z)%Q4(-Bj5-)@nvvzPLl*ffqq^{Hx*~Z=e!VG>9y7?xa4CM+tRCR99r>@-R5X&dwCP
znBrpzeH8nWD7~U6C*xCSh$OBMP>0d24j}$RdS@6#Pz&R%#rBuQ5@;CRIdc+#bx9<1
zn^mF^>nhl~6vHlxt51lxp0_YcEfOa<M7kAo4j8V^9ZPOnxo+~8aQQWKkV5x19YO6!
zjP>>X_=vyh2!kk&+VF^;^=mfvBt!z&rUN*MRUT*k-PcWo%3~;FeYyj9479nRX@L}r
zF(AB|-`+S3OI@}nt#A$I(L}<$Yl%!cuF4WX&_}Pm8;@O}8S-RL`V7>4U4oi-y4hX{
zdjJkXFN=2+nW<R$#-B_PSAxD1Uy)U+OdU^t9GS?+IM{pF#!ZK;vp?e+K^<Kv*Re8u
z_^7OonEioqtk`5#iMd`twQjoCv$C-6tqrJHj?Tx&?BXw@-9Go=rv)EWH16%+>EL00
zRxq8pcIb4tb;IFT4RF(IgIU#9pSpZ_M_LULw?;cC2v`ISihxyR=sv-xB-q`k)ClBN
zT>GN}&l;?YG@)FrF%`uM9Gz7)hhGQzdlxBm@V~MAlF0o;@@e1`TjX}0oqzP#$RF&z
zW{CTFmkfs@E@ApbEKu~p>$`n?dLWeOtjcLveex$ZNlTFaVB7VI+YT2X{4A$YzW9(y
zx?U6=Hyx*w$P~;19SMtT9zNeRjQr@Vx%zo-3{u(H@ejxgji@out1#0lqN_fch)#N+
zTeY#HS`?ZC86_qhf~_eV*-=aWRU@m1_{7uF<0lzd&l0H#G?83_dq}YZ_pUOWu}7J<
z0XXIx50XA8y!gqiR>DtY!X;iaJ{0f>xf@`sMGk)_ojRF!ssYs<pE00v6#O_Ah;vd~
z@q<saXEKC4yK~{1qt%2oBq4#NFg|bYMf*i!2IA-RmH}bTFS9QlzrDGgwrGU8vA`s9
z1TtS{<$rB-23Dv(HE!BQ)1l?Q$iYc+9~oC)XWxd~de)pfEfUwEAsOCT4!RjWwi}^5
z!%t`NV{oDNVC(!x6SlL#g{$T%RrFcb#(Lv@UJXB6H0c$e(yRJ*{rGEoo?hEVO?579
zKQ0n!d&ACxALHvJfIjgjX=k?q?gIu@F3f5%soC-Ebbn358>yaqgt1_GeMUE8zX`{W
zT{-2oJ?*+@)PF;ka#Vc}+iNPfp^YBI#o!q96BrI#&DU;GR?gql_5Z4Fvkwo*hl~Gu
z$yt~F@cWC4>WLgOoxCQLHC~Y2U_8*UqDNY7mTCFX0A+()BwzVsEtHk9{YjEHBz<iE
zEZ!7I>vJZCN!WxY_F8m~4Unqdy*QHABK`zu=F+4yPuD3OJxg~onSI}Vp3$z!#%pa2
ziM@lYq9PYU&dt-$i+C}Y-3W<R4{18$u5b&)ogEooaqPz`Pm_uFBNg`uiNeW$6ek`n
zjAy68UJ{*lv-ULkbxzp($I~@;F7#Te9f$f(Bj_QebqtMPReyZq*r3<RE1Q8%C@$LU
ze!eYU_9QxdSM-MSLx4$XrKs{KTDx)BZ(QGVHlu(?ZQEJC+CJ|kBl0biwt2T0?)yA4
zolRx^Qo%ET<MjPCnai0?v3o=MZ*?M!%|>7-!+3%W4fjRGyeGN$!uopDxj(&E`yh)E
z(<+%Y4D@pSEAtiI3Rp+oZJ?l?DPZO}VpW<{**SdXgS4@U1VlcdsR)Uhf9VqvZnfs>
zS_$`e?CX1M=j;~L+eiAOOf|ajv6%}~-g6A!M4Rk>E?kaef>e#9)TcAsp+Q@R47G=~
z(|EEcrpPl+U6`GY_oVSjb!`i!Plu40$M0%l3Wq56`vkm^x1(tNPM%t1*G{W4k)CA_
zwa|&j?)zIiqy#DVPEc+}O>^^B7z-m2*#$^ng+6@Q&dx~Y2~2Sus-9pNQp%ENwYTF+
zn5F-1dyrfVJG0KP6;gX{LtlIwUon*6dC>MJ-_d*6-6UrxS+q<9?|nR(j?xga_=A5f
zGw$UPo(YZYi=P|mY(f`JJ{vtruUi)6O`{Fiba>8z`W3U@(+m7WwwM?F{0Os`KrZK3
z%}SsHBc*t|^Z}}2M!Fq<&aFYW`YgV=Q2R<@#C-5oiD8>5t=WIpbwN_?RVO~|#8NRD
z=%B~_=qnPg_oe+moqBz9BFds%87`}KT<wx--!=9sqG8Nz6mz6|Fzm+{A#BerqBN%L
zhld3K9q1n^UAmx*iqIAO-we)t<<9kZCmz?siEML0t&XjKC*d2H#J^t!M>I5uQ}g_@
znipjn_&$il8z4)huyT|K5Ke9#IM_c6b<LGNF%q^B_v%<XZzXGYMKL+U@3KS}St_dF
zuU|LR&OsQfSZuXaGT43+h{ikd-5Ibt>m5BJa19DImGGc_+E|=wQue`kictWyc*EEG
zWMAj(<;sSzd4>gJMcT8F@?Y&SwJ3=p;$*sKlJPo{jlh5Gi%u#=u(WLF8fR65!bC1u
zzYxRtn1Tyzcf6mZ*F)UaJYK#}RV{trMl6%0J^$y5^=w3wWmYFan5jE&s2vtaFbplo
zqgE038*VdkzXo(>h}pK_XM;USZrNdFVPaITU{h+&q*z1DwC*n6h}Id`PlETK4h=#H
zsjA^x>xIAWW+>>;IJuncrAN$?iWS#6{GaTNS)Cs{S=QWZARV!*`bm1Qz-49|T(1QY
z%XmUsMWR?Rpjptt3#{tt(Z|f%%<F)4aD%F^2yvzw+17TeXfq8SOe+cz<4ohJ5g^sn
zZ@&1vg(b^FsWQhD^eB1UN+9~z2;~*ac6G8q-|Ks|6{7N3%!ApzL^Ws1AZ^7|iHQqe
zCL72A0qH3>!g4iA@1;ARJ&a9(5jAlhr>lG2H3kq1O<EI;ZWTn&x5_VtxlLAy2*U_(
zUXe_lxlDOh+(?05WprOg3-9VYfTu^(GUBJJd#J_gy~59`Jmn1D;qCLqHyXKf@AF8p
z)FrD;V!yj*`kYyJ;|fkg!ac*NAumirXm)>a7iG*K6y|Fc9~|#?TN7gqsoxm!y<`<n
z?O84l5^p%jl)OgKsycme^N;eUqJvrA=hPv%@N>NXtf8agXDbdiAh?4T`^|q{4rnpt
zv}&=L=sIbs6*K<ZNccG9F_Mq|$e+Jz$H~-apSZu3YxME)zmtFv5#)kQ!7M84*&y>t
z5KF|^E5oq;`ll@n{ci<ltt)qA(-16P<XLZf1#XAbi9~Q{D8~w-Mt91HK}qxfz%ULx
z5_H&YaIOxTD6|Vt)Wk8hL7Y%t#@8cdNBye&f#hs8EjC$s<E4P$<b7sB7TBjp?6m`2
zX1jKLjW)OcuG@>NI<<{!F5hdzTKtRM_9q*25}glry{lDf#o4Q!j~<2=2I)cMQMjQV
z_34s88u!_3#`Ae)h`n?+Y0>zgOYbP`z4ju0%|GdXw@Zys83!B;+gv*lzMDUAe&p<;
z`N#)2o<ll2JGalG=2?jp=~1FIQ(p*@WVbEU*YF4(dv3r)ap2APht(F#qFD!l5iRoq
zr>CcH%70q{FwgP%^uOMTHHUi;QngoSYZsjt7Z9T<Bc?&3%>ncD(?P6iN*?Nsh|`N3
zP!|#zz5={<46~|=*81>}u2~jt7{<#EQk-(zsR#2;1ce5R{p`nhsw`Wo5om1&VB8g{
zt4gAED<}Z6E7h7#S$QZZF)SkVyFsA`k3QY;E|R~B-+W_85@TCn8R$Pq>5^e|A1XYE
z!Q3|*v?sMIXU^Kqau-;ou6>!Cm*;cuYq4fVlJGRK+C<?2&o3sMh^|+Fo`fb2M`|F5
z!HL&UR#yz~c_vX2blvw-?v4Vx3rHx6Cfn1)SJ+@vOMef9amx70Ow6tM>L;JI@hy){
z8daDti|H#hCvh{>1?cT#0Xd-g*il830Wl%Y%nd0SKQ5VffYA9s3`IMSF!!Lyy*&X9
zena7mg}Ra7G{!U>5ho-kO`n$NkDQ`-hC=LZ39CQxzTZB7x83~8m3J5)Px{-Ni<C*n
zFM%GG_c~EqCSTEO`f(c7wc&Rmi)~aDTsm9&&?p>st>@@JqSY98azgU&!jk0`YAOjo
zcy#Hxfs^i<-O`cI4kn2!ZX$97fPx>D3;=fMr&WoWM^ov*CdtJ#(?8(_1>}ui{2hNS
zn>H)Bb;tR8*VK!3!$wgt>`5NuJh=>m9exVyg)ztanfkeBVi0>v{a~kzw=Kj;CE5fx
zd8fR{{B*$mYz;3pUx6u4fk}ndl7IRMs8=gP#Gb%wK856}{9WnXplBiG{sn~T0&r!E
zB8(e?6qAC<`N2)O4-lNRvTR=#{6uQ#lCG0C9=g(KAg1d;le0(?`iv>ahDNKCi1PHg
z-tTn9N#kzSAA{UYFGlfKz;|>k2u48E!dC(kuZL1m<tYSQpzucrYIpP+=Yofti`(Ds
z-%9M`0{nuHUuc^d_zfG*edY~)RjWbksK(~x8Bimp-*(xI`!i2LtY=X^kQPX?J6C<C
zICvLB4=p!YnYagTO2ydx8AtxZOqPXuEO*DEEZV&Z>Dn)4wc0V0cQL}U0g~@JEc&lo
z+?V_<T7n3H>bm1Uxt-a`>Yg5%>Ry77;B!9f;P6f<(Un*(`9vbR+}y@~IB$L&U2cy9
zODHjb9GpSj{ByqR9+v*Bl%${V{$fw*TejVa>BWeG*KMG7w){2A3Ete?oa9N=_~soL
zJzi4G=$MT87gf1VZC=_mX0Y)-<q&5$N6wjp1sKkjIdkqfbk4mZM#!DaM2h2Oq*NBP
z5a+esRHi%tXl?u-0|3s`|Na7)gn27PDO`)5E&5_6O3x^CVMhH^J!Hy{QInJluPX*8
ze;A)mG<)S<C0O51bOEO}3@~D%ACS-@GV;J=%Xo_(rQ(_EtMlCJwUky=Rj@zY`Rm-4
z59$L4gII}z(o?D(pY3n{PuI6>McS~-M1nzEi8tuPkgeOBT)_}RS}fS4`h-h)ND^u}
zZ%RY(oUNe~_#^h}ac7b!-jG;4do9iy4OD6;eM>5s6!t|PzG40%h}0Tff1lvx$7s4Y
z;GTmaTmv&vr0^t{PrK-JZ%)~QxPBAmqMvRFkI=7QtPXbM?Xl#Yhr;6Qr0qD2^Ii=~
zSjT#LZ+h5|H5eA%Lyu0MWgh~}*t_ZTDTdfHT&H!x`w;f^ire&{W%Nq8HQye~*C)U|
z2Yhw+z4Y~BUeP;(=w2QiJy*=gQYc+?d%KkjtTb%$i-(W4-~GS<)K#@qDwSa2{{x5e
Bj!^&r

diff --git a/games/NXDoom/man/.gitignore b/games/NXDoom/man/.gitignore
deleted file mode 100644
index d974b54eb..000000000
--- a/games/NXDoom/man/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-CMDLINE.doom
-CMDLINE.doom.md
-CMDLINE.heretic
-CMDLINE.heretic.md
-CMDLINE.hexen
-CMDLINE.hexen.md
-CMDLINE.strife
-CMDLINE.strife.md
-INSTALL.doom
-INSTALL.heretic
-INSTALL.hexen
-INSTALL.strife
-Makefile.in
-Makefile
-*.6
-*.5
diff --git a/games/NXDoom/man/CMDLINE.template b/games/NXDoom/man/CMDLINE.template
deleted file mode 100644
index 2c5993836..000000000
--- a/games/NXDoom/man/CMDLINE.template
+++ /dev/null
@@ -1,8 +0,0 @@
-== Command line parameters ==
-
-This is a full list of the supported command line parameters. A number of
-additional parameters are supported in addition to those present in the DOS
-version.
-
-@content
-
diff --git a/games/NXDoom/man/CMDLINE.template.md b/games/NXDoom/man/CMDLINE.template.md
deleted file mode 100644
index b7c800a70..000000000
--- a/games/NXDoom/man/CMDLINE.template.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Command line parameters
-
-This is a full list of the supported command line parameters. A number of
-additional parameters are supported in addition to those present in the DOS
-version.
-
-@content
-
diff --git a/games/NXDoom/man/INSTALL.template b/games/NXDoom/man/INSTALL.template
deleted file mode 100644
index c889cbdbe..000000000
--- a/games/NXDoom/man/INSTALL.template
+++ /dev/null
@@ -1,316 +0,0 @@
-#ifdef DOOM
-#define DEFAULT_IWAD   doom2.wad
-#elif HERETIC
-#define DEFAULT_IWAD   heretic.wad
-#elif HEXEN
-#define DEFAULT_IWAD   hexen.wad
-#elif STRIFE
-#define DEFAULT_IWAD   strife1.wad
-#endif
-# LONG_GAME_NAME installation
-
-These are instructions for how to install and set up LONG_GAME_NAME
-for play.
-
-#if !PRECOMPILED
-# Building LONG_GAME_NAME
-
-Before you can play LONG_GAME_NAME, you need to compile a binary that
-you can run.  For compilation, LONG_GAME_NAME requires the following
-to be installed:
-
- * A C compiler (gcc is recommended)
- * make (GNU make is recommended)
- * SDL2 (see https://www.libsdl.org/)
- * SDL2_mixer (see https://www.libsdl.org/projects/SDL_mixer/)
- * SDL2_net (see https://www.libsdl.org/projects/SDL_net/)
- * Python (optional)
-
-Follow the standard instructions for installing an autotools-based
-package:
-
- 1. Run `./configure` to initialize the package.
- 2. Run `make` to compile the package.
- 3. Run `make install` to install the package.
-
-An automated build script is available that installs the necessary
-dependencies and builds the source code automatically.  See the build
-instructions on the website.
-
-Advanced topics such as cross-compilation are beyond the scope of this
-document.  Please see the GNU autoconf / automake documentation for more
-information.
-
-#endif
-# Obtaining an IWAD file
-
-To play, you need an IWAD file.  This file contains the game data
-(graphics, sounds, etc). The full versions of the games are
-proprietary and need to be bought.  The IWAD file has one of the
-following names:
-
-|  IWAD                      | Game                            |
-| -------------------------- | ------------------------------- |
-#if DOOM
-|  doom1.wad                 | Shareware Doom                  |
-|  doom.wad                  | Registered / Ultimate Doom      |
-|  doom2.wad                 | Doom 2                          |
-|  tnt.wad                   | Final Doom: TNT: Evilution      |
-|  plutonia.wad              | Final Doom: Plutonia Experiment |
-|  chex.wad                  | Chex Quest                      |
-|  freedoom1.wad             | Freedoom: Phase 1               |
-|  freedoom2.wad             | Freedoom: Phase 2               |
-|  freedm.wad                | FreeDM                          |
-#endif
-#if HERETIC
-|  heretic1.wad              | Shareware Heretic               |
-|  heretic.wad               | Registered / Commercial Heretic |
-#endif
-#if HEXEN
-|  hexen.wad                 | Hexen                           |
-#endif
-#if STRIFE
-|  strife1.wad (+voices.wad) | Strife                          |
-#endif
-
-#if DOOM
-If you don’t have a copy of a commercial version, you can download
-the shareware version of Doom (extract the file named doom1.wad):
-
- * https://www.doomworld.com/idgames/idstuff/doom/win95/doom95
-   (idstuff/doom/win95/doom95.zip in your nearest /idgames mirror)
-
-#endif
-If you have a commercial version on a CD-ROM, obtaining the IWAD
-file is usually straightforward. Simply locate the IWAD file on the
-disc and copy it off.
-
-#if !__MACOSX__
-#if DOOM
-The Doom games are available to purchase for download on Steam
-(https://store.steampowered.com/), all releases containing the classic
-games including Doom 3: BFG Edition are supported.
-#endif
-#if HERETIC
-Heretic is available to purchase for download on Steam
-(https://store.steampowered.com/).
-#endif
-#if HEXEN
-Hexen and its expansion pack are available to purchase for download on
-Steam (https://store.steampowered.com/).
-#endif
-#if STRIFE
-Strife: Veteran Edition is available to purchase for download on Steam
-(https://store.steampowered.com/).
-#endif
-#if !_WIN32
-For Steam on Linux, you need to enable “Steam Play” for all titles in
-order to install the games.  You may do this from the Steam menu,
-Setup, and the Steam Play tab.
-#endif
-LONG_GAME_NAME will autodetect IWADs installed by Steam and you do not
-need to do anything.
-#else
-The Doom, Heretic, Hexen, and Strife games are available to purchase
-for download on Steam (https://store.steampowered.com/), but are only
-available for Windows.  To find the IWAD files on a Windows or Wine
-system, look in the Steam directory (usually within “Program Files”),
-under the “steamapps/common” path.
-#endif
-
-#if DOOM || STRIFE
-The Doom and Strife: Veteran Edition games are available for purchase
-on GOG.com (https://www.gog.com/).
-#if _WIN32
-LONG_GAME_NAME will autodetect IWADs from the standalone or GOG Galaxy
-installers and you do not need to do anything.
-#else
-The games are only available for Windows, but you may find the IWAD
-files on a Windows or Wine system, typically within the “C:\GOG Games”
-or “C:\Program Files\GOG Galaxy” directories.
-#endif
-
-#endif
-#if DOOM || HERETIC
-Older floppy disk versions are harder to deal with. The easiest way
-to install from floppies is to run the original installer program
-inside an emulator such as DOSbox (https://www.dosbox.com/).
-As an alternative to using an emulator, it is possible to extract the
-files manually. On the install disk(s), you will find several files
-with numbered extensions (eg. “doom_se.1”).
-
-From the command line it is possible to combine these files into a
-single large file, using a command similar to the following:
-
-#if _WIN32
-   copy doom_se.1+doom_se.2+doom_se.3+doom_se.4+doom_se.5 doom_se.lzh
-#else
-   cat doom_se.1 doom_se.2 doom_se.3 doom_se.4 doom_se.5 > doom_se.lzh
-#endif
-
-The resulting file is an LHA archive file, and it can be extracted
-using an LHA archive tool (there is one available for almost every
-operating system).
-
-#endif
-# Running the game
-
-#if __MACOSX__
-Once you have an IWAD file, you can specify its location within the
-graphical launcher program.  Click the “Configure...” button, and then
-click “Set...” for each IWAD to choose its location.  From the main
-launcher dialog you can then choose which game you want to play and
-click the “Launch” button to start the game.
-
-If you are an advanced user and like to run Doom from the command
-line, you can use the “Command Prompt...” menu item to open a Terminal
-window.  The DOOMWADPATH environment variable is preconfigured
-to point to the locations of the IWAD files set within the launcher.
-You can launch the game with a specific IWAD file by typing, for
-example:
-
-    LONG_EXE_NAME -iwad tnt.wad
-#else
-LONG_GAME_NAME needs to know where to find your IWAD file. To do this,
-do one of the following:
-
-#if _WIN32
- * Within Explorer, simply place the IWAD file in the same folder as
-   the LONG_GAME_NAME files, and double-click `LONG_EXE_NAME.exe`.
-
- * Run LONG_GAME_NAME from the command prompt with the `-iwad` command
-   line parameter to specify the IWAD file to use, eg.
-
-       LONG_EXE_NAME -iwad c:\games\DEFAULT_IWAD
-
- * Set the environment variable DOOMWADDIR to the location of a
-   directory containing your IWAD files.
-
- * If you have multiple IWADs in different directories, set the
-   environment variable DOOMWADPATH to be a semicolon-separated list
-   of directories to search (similar to the PATH environment
-   variable).
-#else
- * Run LONG_GAME_NAME from the Unix console with the `-iwad` command
-   line parameter to specify the IWAD file to use, eg.
-
-       LONG_EXE_NAME -iwad /root/DEFAULT_IWAD
-
- * Put the file into one of the following directories:
-
-     $HOME/.local/share/games/doom
-     /usr/share/doom
-     /usr/share/games/doom
-     /usr/local/share/doom
-     /usr/local/share/games/doom
-
- * Set the environment variable DOOMWADDIR to specify the path to a
-   directory containing your IWAD files.
-
- * If you have multiple IWADs in different directories, set the
-   environment variable DOOMWADPATH to be a colon-separated list of
-   directories to search (similar to the Unix PATH environment
-   variable).
-#endif
-#endif
-
-#if DOOM
-# Playing with Freedoom
-
-Freedoom is an open content project to create a Doom engine-based game
-that is entirely free software. The website can be found here:
-
-  https://freedoom.github.io/
-
-Check out the [Chocolate Doom wiki’s page on
-Freedoom](https://www.chocolate-doom.org/wiki/index.php/Freedoom)
-for more information.
-
-# Playing with Chex Quest
-
-Chex Quest is a game based on Doom with some minor modifications that
-was distributed with boxes of Chex cereal in 1997.  It is possible to
-play Chex Quest using LONG_GAME_NAME.  To do this, the following files
-are needed:
-
- * The IWAD file “chex.wad”, from the Chex Quest CD.
-
- * The dehacked patch “chex.deh”, which can be found here:
-   https://www.doomworld.com/idgames/themes/chex/chexdeh
-   (themes/chex/chexdeh.zip in your nearest /idgames mirror)
-
-Copy these files into a directory together and use the `-iwad` command
-line parameter to specify the Chex Quest IWAD file:
-
-   LONG_EXE_NAME -iwad chex.wad
-
-#endif
-# Installing upgrades
-
-#if DOOM
-LONG_GAME_NAME requires a version 1.9 IWAD file.  Generally, if you
-install a recent version of Doom you should have a version 1.9 IWAD.
-#elif HERETIC
-LONG_GAME_NAME requires a version 1.2 (Shareware) or version 1.3
-(Shadow of the Serpent Riders) IWAD file.  Generally, if you install a
-recent version of Heretic you should have a version 1.2 or 1.3 IWAD.
-#elif HEXEN
-LONG_GAME_NAME requires a version 1.1 IWAD file.  Generally, if you
-install a recent version of Hexen you should have a version 1.1 IWAD.
-#elif STRIFE
-LONG_GAME_NAME requires a version 1.2 IWAD file.  Generally, if you
-install a recent version of Strife you should have a version 1.2 IWAD.
-Please note that Strife version 1.3 does not update the IWAD, if your
-version.txt file says “STRIFE(TM) VERSION 1.3”, you are still good.
-#endif
-However, if you are installing from a very old CD version or from
-floppy disks, you might find you have an older version.
-
-The most obvious symptom of an out of date IWAD file is that the game
-will exit at the title screen before the demo starts, with the message
-“Demo is from a different game version!”.  If this happens, your IWAD
-file is out of date and you need to upgrade.
-
-Upgrade patches are available that will update your game to the latest
-version, the following sites have the patches:
-
-#if DOOM
-  * http://www.doom2.net/doom2/utils.html
-  * http://www.gamers.org/pub/idgames/idstuff/doom
-  * http://www.gamers.org/pub/idgames/idstuff/doom2
-#elif HERETIC
-  * http://www.gamers.org/pub/idgames/idstuff/heretic
-#elif HEXEN
-  * http://www.gamers.org/pub/idgames/idstuff/hexen
-#elif STRIFE
-  * http://www.gamers.org/pub/idgames/roguestuff
-#endif
-
-Please see the
-[Doom Wiki’s page on game patches](https://doomwiki.org/wiki/Game_patch)
-for more information.
-
-#if _WIN32
-As the patches are binary patches that run as DOS executables, on
-recent 64-bit versions of Windows you will need to use a DOS emulator
-(such as DOSBox) to run them.
-#else
-As the patches are binary patches that run as DOS executables, you
-will need to use a DOS emulator (such as DOSBox) to run them.
-#endif
-
-# Music support
-
-LONG_GAME_NAME includes OPL emulation code that accurately reproduces
-the way that the in-game music sounded under DOS when using an
-Adlib/Soundblaster card. This is, however, not to everyone’s taste.
-
-LONG_GAME_NAME includes a number of different options for better
-quality MIDI playback; see the file README.Music for more details of
-how to set these up.
-
-#if !PRECOMPILED
-When compiling from source, be sure to compile and install Timidity
-before installing SDL2_mixer.
-
-#endif
diff --git a/games/NXDoom/man/Makefile.am b/games/NXDoom/man/Makefile.am
deleted file mode 100644
index 2e1e04745..000000000
--- a/games/NXDoom/man/Makefile.am
+++ /dev/null
@@ -1,226 +0,0 @@
-SUBDIRS = bash-completion
-
-MANPAGE_GEN_FILES = environ.man           \
-                    iwad_paths.man        \
-                    doom.template         \
-                    heretic.template      \
-                    hexen.template        \
-                    strife.template       \
-                    docgen                \
-                    default.cfg.template  \
-                    extra.cfg.template    \
-                    server.template       \
-                    setup.template
-
-doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
-hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
-hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen
-strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife
-
-if HAVE_DOC
-
-GENERATED_MAN_PAGES =               \
-           @PROGRAM_PREFIX@doom.6         \
-           default.cfg.5            \
-           @PROGRAM_PREFIX@doom.cfg.5     \
-           @PROGRAM_PREFIX@heretic.6      \
-           heretic.cfg.5            \
-           @PROGRAM_PREFIX@heretic.cfg.5  \
-           @PROGRAM_PREFIX@hexen.6        \
-           hexen.cfg.5              \
-           @PROGRAM_PREFIX@hexen.cfg.5    \
-           @PROGRAM_PREFIX@strife.6       \
-           strife.cfg.5             \
-           @PROGRAM_PREFIX@strife.cfg.5   \
-           @PROGRAM_PREFIX@server.6
-
-SETUP_MAN_PAGES =                          \
-           @PROGRAM_PREFIX@doom-setup.6    \
-           @PROGRAM_PREFIX@heretic-setup.6 \
-           @PROGRAM_PREFIX@hexen-setup.6   \
-           @PROGRAM_PREFIX@strife-setup.6
-
-man_MANS = $(GENERATED_MAN_PAGES)         \
-           $(SETUP_MAN_PAGES)
-
-doomdocs_DATA    = INSTALL.doom    CMDLINE.doom
-hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic
-hexendocs_DATA   = INSTALL.hexen   CMDLINE.hexen
-strifedocs_DATA  = INSTALL.strife  CMDLINE.strife
-
-if HAVE_WINDRES
-
-WIN32=-D_WIN32
-
-doomdocs_DATA += CMDLINE.doom.md
-hereticdocs_DATA += CMDLINE.heretic.md
-hexendocs_DATA += CMDLINE.hexen.md
-strifedocs_DATA += CMDLINE.strife.md
-
-endif
-
-CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
-             $(doomdocs_DATA) $(hereticdocs_DATA) \
-             $(hexendocs_DATA) $(strifedocs_DATA)
-DOCGEN = $(srcdir)/docgen
-DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" \
-		     -s "@PACKAGE_NAME@" \
-		     -z "@PACKAGE_SHORTNAME@" \
-		     -v "@VERSION@"
-
-@PROGRAM_PREFIX@doom.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g doom -m $(srcdir)/doom.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/doom > $@
-
-default.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g doom -m $(srcdir)/default.cfg.template \
-                  -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@doom.cfg.5: $(top_srcdir)/src extra.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g doom -m $(srcdir)/extra.cfg.template \
-                  -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.doom : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/doom
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -p $(srcdir)/CMDLINE.template \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
-
-CMDLINE.doom.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/doom
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -M $(srcdir)/CMDLINE.template.md \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
-
-CMDLINE.doom.wikitext : $(top_srcdir)/src $(top_srcdir)/src/doom
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -w $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
-
-INSTALL.doom: INSTALL.template
-	$(srcdir)/simplecpp -DDOOM $(WIN32) \
-            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
-            -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
-            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-@PROGRAM_PREFIX@heretic.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) heretic.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -g heretic -m $(srcdir)/heretic.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
-
-heretic.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -g heretic -m $(srcdir)/default.cfg.template \
-                  -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@heretic.cfg.5: $(top_srcdir)/src extra.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -g heretic -m $(srcdir)/extra.cfg.template \
-                 -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.heretic : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/heretic
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -p $(srcdir)/CMDLINE.template \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
-
-CMDLINE.heretic.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/heretic
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -M $(srcdir)/CMDLINE.template.md \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
-
-INSTALL.heretic: INSTALL.template
-	$(srcdir)/simplecpp -DHERETIC $(WIN32) \
-            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Heretic" \
-            -DLONG_EXE_NAME="@PROGRAM_PREFIX@heretic" \
-            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-
-@PROGRAM_PREFIX@hexen.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -g hexen -m $(srcdir)/hexen.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
-
-hexen.cfg.5: $(top_srcdir)/src default.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -g hexen -m $(srcdir)/default.cfg.template \
-                 -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@hexen.cfg.5: $(top_srcdir)/src extra.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                 -g hexen -m $(srcdir)/extra.cfg.template \
-                 -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.hexen : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/hexen
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -p $(srcdir)/CMDLINE.template \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
-
-CMDLINE.hexen.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/hexen
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -M $(srcdir)/CMDLINE.template.md \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
-
-INSTALL.hexen: INSTALL.template
-	$(srcdir)/simplecpp -DHEXEN $(WIN32) \
-            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Hexen" \
-            -DLONG_EXE_NAME="@PROGRAM_PREFIX@hexen" \
-            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-@PROGRAM_PREFIX@strife.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g strife -m $(srcdir)/strife.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/strife > $@
-
-@PROGRAM_PREFIX@server.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g server -m $(srcdir)/server.template \
-                  $(top_srcdir)/src > $@
-
-$(SETUP_MAN_PAGES): $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g $(patsubst @PROGRAM_PREFIX@%-setup.6,%,$@) \
-                  -m $(srcdir)/setup.template \
-                  $(top_srcdir)/src > $@
-
-strife.cfg.5: $(top_srcdir)/src default.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g strife -m $(srcdir)/default.cfg.template \
-                  -c default $(top_srcdir)/src/m_config.c > $@
-
-@PROGRAM_PREFIX@strife.cfg.5: $(top_srcdir)/src extra.cfg.template
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g strife -m $(srcdir)/extra.cfg.template \
-                  -c extended $(top_srcdir)/src/m_config.c > $@
-
-CMDLINE.strife : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/strife
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -p $(srcdir)/CMDLINE.template \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
-
-CMDLINE.strife.md : CMDLINE.template.md $(top_srcdir)/src $(top_srcdir)/src/strife
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -M $(srcdir)/CMDLINE.template.md \
-                  $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
-
-INSTALL.strife: INSTALL.template
-	$(srcdir)/simplecpp -DSTRIFE $(WIN32) \
-            -DLONG_EXE_NAME="@PROGRAM_PREFIX@strife" \
-            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Strife" \
-            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-
-INSTALL: INSTALL.template
-	$(srcdir)//simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
-            -DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
-            -DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
-            -DPRECOMPILED < $(srcdir)/INSTALL.template > $@
-
-endif
-
-EXTRA_DIST = $(man_MANS) $(MANPAGE_GEN_FILES)        \
-             wikipages                               \
-             CMDLINE.template                        \
-             CMDLINE.template.md                     \
-             INSTALL.template                        \
-             simplecpp
-
diff --git a/games/NXDoom/man/bash-completion/.gitignore b/games/NXDoom/man/bash-completion/.gitignore
deleted file mode 100644
index 488df26aa..000000000
--- a/games/NXDoom/man/bash-completion/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*doom
-*heretic
-*hexen
-*strife
-*.template
diff --git a/games/NXDoom/man/bash-completion/Makefile.am b/games/NXDoom/man/bash-completion/Makefile.am
deleted file mode 100644
index a79fe6239..000000000
--- a/games/NXDoom/man/bash-completion/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-bashcompletiondir=@datadir@/bash-completion/completions
-
-BASH_COMPLETION_TEMPLATES = \
-    doom.template \
-    heretic.template \
-    hexen.template \
-    strife.template
-
-if HAVE_BASH_COMPLETION
-
-BASH_COMPLETION_SCRIPTLETS = \
-    @PROGRAM_PREFIX@doom \
-    @PROGRAM_PREFIX@heretic \
-    @PROGRAM_PREFIX@hexen \
-    @PROGRAM_PREFIX@strife
-
-bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS)
-CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS)
-
-DOCGEN = $(top_srcdir)/man/docgen
-DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@"
-
-@PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g doom -b doom.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/doom > $@
-
-@PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g heretic -b heretic.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
-
-@PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g hexen -b hexen.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
-
-@PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
-	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-                  -g strife -b strife.template \
-                  $(top_srcdir)/src $(top_srcdir)/src/strife > $@
-
-EXTRA_DIST = \
-    $(BASH_COMPLETION_TEMPLATES) \
-    $(BASH_COMPLETION_SCRIPTLETS)
-
-else
-
-EXTRA_DIST = \
-    $(BASH_COMPLETION_TEMPLATES)
-
-endif
diff --git a/games/NXDoom/man/bash-completion/doom.template.in b/games/NXDoom/man/bash-completion/doom.template.in
deleted file mode 100644
index 6db3baf05..000000000
--- a/games/NXDoom/man/bash-completion/doom.template.in
+++ /dev/null
@@ -1,51 +0,0 @@
-# bash completion for @PACKAGE_SHORTNAME@ Doom               -*- shell-script -*-
-
-_@PROGRAM_SPREFIX@_doom()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    # Save the previous switch on the command line in the prevsw variable
-    local i prevsw=""
-    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
-        if [[ ${words[i]} == -* ]]; then
-            prevsw=${words[i]}
-        fi
-    done
-
-    # Allow adding more than one file with the same extension to the same switch
-    case $prevsw in
-        -config|-extraconfig)
-            _filedir cfg
-            ;;
-        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
-            _filedir wad
-            ;;
-        -playdemo|-timedemo)
-            _filedir lmp
-            ;;
-        -deh)
-            _filedir '@(bex|deh)'
-            ;;
-    esac
-
-    case $prev in
-        -pack)
-            COMPREPLY=(doom2 tnt plutonia)
-            ;;
-        -gameversion)
-            COMPREPLY=(1.666 1.7 1.8 1.9 ultimate final final2 hacx chex)
-            ;;
-        -setmem)
-            COMPREPLY=(dos622 dos71 dosbox)
-            ;;
-    esac
-
-    if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
-    fi
-} &&
-
-complete -F _@PROGRAM_SPREFIX@_doom @PROGRAM_PREFIX@doom
-
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/bash-completion/heretic.template.in b/games/NXDoom/man/bash-completion/heretic.template.in
deleted file mode 100644
index a46b19cc3..000000000
--- a/games/NXDoom/man/bash-completion/heretic.template.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# bash completion for @PACKAGE_SHORTNAME@ Heretic            -*- shell-script -*-
-
-_@PROGRAM_SPREFIX@_heretic()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    # Save the previous switch on the command line in the prevsw variable
-    local i prevsw=""
-    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
-        if [[ ${words[i]} == -* ]]; then
-            prevsw=${words[i]}
-        fi
-    done
-
-    # Allow adding more than one file with the same extension to the same switch
-    case $prevsw in
-        -config|-extraconfig)
-            _filedir cfg
-            ;;
-        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
-            _filedir wad
-            ;;
-        -playdemo|-timedemo)
-            _filedir lmp
-            ;;
-        -deh)
-            _filedir hhe
-            ;;
-    esac
-
-    case $prev in
-        -hhever)
-            COMPREPLY=(1.0 1.2 1.3)
-            ;;
-        -setmem)
-            COMPREPLY=(dos622 dos71 dosbox)
-            ;;
-    esac
-
-    if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
-    fi
-} &&
-
-complete -F _@PROGRAM_SPREFIX@_heretic @PROGRAM_PREFIX@heretic
-
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/bash-completion/hexen.template.in b/games/NXDoom/man/bash-completion/hexen.template.in
deleted file mode 100644
index e93fc71cb..000000000
--- a/games/NXDoom/man/bash-completion/hexen.template.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# bash completion for @PACKAGE_SHORTNAME@ Hexen              -*- shell-script -*-
-
-_@PROGRAM_SPREFIX@_hexen()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    # Save the previous switch on the command line in the prevsw variable
-    local i prevsw=""
-    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
-        if [[ ${words[i]} == -* ]]; then
-            prevsw=${words[i]}
-        fi
-    done
-
-    # Allow adding more than one file with the same extension to the same switch
-    case $prevsw in
-        -config|-extraconfig)
-            _filedir cfg
-            ;;
-        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
-            _filedir wad
-            ;;
-        -playdemo|-timedemo)
-            _filedir lmp
-            ;;
-    esac
-
-    case $prev in
-        -gameversion)
-            COMPREPLY=(1.1 1.1r2)
-            ;;
-        -setmem)
-            COMPREPLY=(dos622 dos71 dosbox)
-            ;;
-    esac
-
-    if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
-    fi
-} &&
-
-complete -F _@PROGRAM_SPREFIX@_hexen @PROGRAM_PREFIX@hexen
-
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/bash-completion/strife.template.in b/games/NXDoom/man/bash-completion/strife.template.in
deleted file mode 100644
index a044ef0b7..000000000
--- a/games/NXDoom/man/bash-completion/strife.template.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# bash completion for @PACKAGE_SHORTNAME@ Strife             -*- shell-script -*-
-
-_@PROGRAM_SPREFIX@_strife()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    # Save the previous switch on the command line in the prevsw variable
-    local i prevsw=""
-    for (( i=1; $cword > 1 && i <= $cword; i++ )); do
-        if [[ ${words[i]} == -* ]]; then
-            prevsw=${words[i]}
-        fi
-    done
-
-    # Allow adding more than one file with the same extension to the same switch
-    case $prevsw in
-        -config|-extraconfig)
-            _filedir cfg
-            ;;
-        -file|-iwad|-aa|-af|-as|-merge|-nwtmerge)
-            _filedir wad
-            ;;
-        -playdemo|-timedemo)
-            _filedir lmp
-            ;;
-        -deh)
-            _filedir seh
-            ;;
-    esac
-
-    case $prev in
-        -gameversion)
-            COMPREPLY=(1.2 1.31)
-            ;;
-        -setmem)
-            COMPREPLY=(dos622 dos71 dosbox)
-            ;;
-    esac
-
-    if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '@content' -- "$cur" ) )
-    fi
-} &&
-
-complete -F _@PROGRAM_SPREFIX@_strife @PROGRAM_PREFIX@strife
-
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/games/NXDoom/man/default.cfg.template b/games/NXDoom/man/default.cfg.template
deleted file mode 100644
index 5d07322a6..000000000
--- a/games/NXDoom/man/default.cfg.template
+++ /dev/null
@@ -1,50 +0,0 @@
-.TH @CFGFILE@ 5 2017-11-30 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@CFGFILE@ \- @PACKAGE_SHORTNAME@ @GAME_UPPER@ configuration file
-.SH DESCRIPTION
-.PP
-\fI@CFGFILE@\fR
-is the configuration file for \fB@PROGRAM_SPREFIX@\-@GAME@\fR(6).  The configuration
-options stored in the file are the same as those stored in the
-original DOS Vanilla @GAME_UPPER@. 
-Extra @PACKAGE_SHORTNAME@ @GAME_UPPER@-specific options are stored in a separate 
-configuration file, \fB@PROGRAM_SPREFIX@\-@GAME@.cfg\fR.
-.PP
-\fI@CFGFILE@\fR is normally stored in the user's home directory,
-as \fI~/.local/share/@PROGRAM_SPREFIX@\-@GAME@/@CFGFILE@\fR.  The path can be
-overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
-Base Directory Specification).
-.PP
-The \fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6) tool provides a simple to use front-end
-for editing \fI@CFGFILE@\fR.
-.SH FILE FORMAT
-The file is a plain-text file, consisting of a list of configuration
-options and their values, separated by whitespace.  Each option is stored
-on a separate line.  Options have different types; an option may have 
-either an integer, floating point or string value.  If the option is
-of a string type, the value is surrounded by quotes (").
-.PP
-For example:
-.RS
-.PP
-.EX
-integer_value                1
-integer_value2               1
-floating_point_value         4.2
-string_value                 "hello world"
-.EE
-.RE
-.PP
-Invalid lines or comments in the file will be ignored, but it is advisable
-not to put them in the file; the file is rewritten from scratch every time
-the game exits, so any invalid lines or comments will be lost.
-.PP
-Some options are used for keyboard key bindings; these are stored as 
-integer values containing the keyboard scan code of the key to be bound to.
-Boolean values are also stored as integers, with a value of zero usually
-indicating "false" and a non-zero value indicating "true".
-@content
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-@GAME@\fR(6),
-\fB@PROGRAM_SPREFIX@\-@GAME@.cfg\fR(5),
-\fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6)
diff --git a/games/NXDoom/man/docgen b/games/NXDoom/man/docgen
deleted file mode 100755
index 8760e8f72..000000000
--- a/games/NXDoom/man/docgen
+++ /dev/null
@@ -1,624 +0,0 @@
-#!/usr/bin/env python3
-# 
-# Chocolate Doom self-documentation tool.  This works similar to javadoc
-# or doxygen, but documents command line parameters and configuration
-# file values, generating documentation in Unix manpage, wikitext and
-# plain text forms.
-#
-# Comments are read from the source code in the following form:
-#
-#   //!
-#   // @arg <extra arguments>
-#   // @category Category
-#   // @platform <some platform that the parameter is specific to>
-#   //
-#   // Long description of the parameter
-#   //
-#
-#   something_involving = M_CheckParm("-param");
-#
-# For configuration file values:
-#
-#   //! @begin_config_file myconfig
-#
-#   //!
-#   // Description of the configuration file value.
-#   //
-#
-#   CONFIG_VARIABLE_INT(my_variable,       c_variable),
-#
-
-import io
-import sys
-import os
-import re
-import glob
-import getopt
-
-TEXT_WRAP_WIDTH = 78
-INCLUDE_STATEMENT_RE = re.compile(r"@include\s+(\S+)")
-
-# Use appropriate stdout function for Python 2 or 3
-
-def stdout(buf):
-    if sys.version_info.major < 3:
-        sys.stdout.write(buf)
-    else:
-        sys.stdout.buffer.write(buf)
-
-# Find the maximum width of a list of parameters (for plain text output)
-
-def parameter_list_width(params):
-    w = 0
-
-    for p in params:
-        pw = len(p.name) + 5
-
-        if p.args:
-            pw += len(p.args)
-
-        if pw > w:
-            w = pw
-
-    return w
-
-class ConfigFile:
-    def __init__(self, filename):
-        self.filename = filename
-        self.variables = []
-
-    def add_variable(self, variable):
-        self.variables.append(variable)
-
-    def manpage_output(self):
-        result = ".SH CONFIGURATION VARIABLES\n"
-
-        for v in self.variables:
-            result += ".TP\n"
-            result += v.manpage_output()
-
-        return result
-
-    def plaintext_output(self):
-        result = ""
-
-        w = parameter_list_width(self.variables)
-
-        for p in self.variables:
-            result += p.plaintext_output(w)
-
-        result = result.rstrip() + "\n"
-
-        return result
-
-class Category:
-    def __init__(self, description):
-        self.description = description
-        self.params = []
-
-    def add_param(self, param):
-        self.params.append(param)
-
-    # Plain text output
-
-    def plaintext_output(self):
-        result = "=== %s ===\n\n" % self.description
-
-        self.params.sort()
-
-        w = parameter_list_width(self.params)
-
-        for p in self.params:
-            if p.should_show():
-                result += p.plaintext_output(w)
-
-        result = result.rstrip() + "\n"
-
-        return result
-
-    def markdown_output(self):
-        result = "## %s\n\n| Parameter | Description |\n| - | - |\n" % self.description
-
-        self.params.sort()
-
-        for p in self.params:
-            if p.should_show():
-                result += p.markdown_output()
-
-        result = result.rstrip() + "\n"
-
-        return result
-
-    def completion_output(self):
-        result = ""
-
-        self.params.sort()
-
-        for p in self.params:
-            if p.should_show():
-                result += p.completion_output(0)
-
-        result = result.rstrip()
-
-        return result
-
-    def manpage_output(self):
-        result = ".SH " + self.description.upper() + "\n"
-
-        self.params.sort()
-
-        for p in self.params:
-            if p.should_show():
-                result += ".TP\n"
-                result += p.manpage_output()
-
-        return result
-
-    def wiki_output(self):
-        result = "=== %s ===\n" % self.description
-
-        self.params.sort()
-
-        for p in self.params:
-            if p.should_show():
-                result += "; " + p.wiki_output() + "\n"
-
-        # Escape special HTML characters
-
-        result = result.replace("&", "&amp;")
-        result = result.replace("<", "&lt;")
-        result = result.replace(">", "&gt;")
-
-        return result
-
-categories = (
-    (None,      Category("General options")),
-    ("game",    Category("Game start options")),
-    ("video",   Category("Display options")),
-    ("net",     Category("Networking options")),
-    ("mod",     Category("Dehacked and WAD merging")),
-    ("demo",    Category("Demo options")),
-    ("compat",  Category("Compatibility")),
-    ("obscure", Category("Obscure and less-used options")),
-)
-
-wikipages = []
-config_files = {}
-
-# Show options that are in Vanilla Doom? Or only new options?
-
-show_vanilla_options = True
-
-class Parameter:
-    def __lt__(self, other):
-        return self.name < other.name
-
-    def __init__(self):
-        self.text = ""
-        self.name = ""
-        self.args = None
-        self.platform = None
-        self.category = None
-        self.vanilla_option = False
-        self.games = None
-
-    def should_show(self):
-        return not self.vanilla_option or show_vanilla_options
-
-    def add_text(self, text):
-        if len(text) <= 0:
-            pass
-        elif text[0] == "@":
-            match = re.match(r'@(\S+)\s*(.*)', text)
-
-            if not match:
-                raise "Malformed option line: %s" % text
-
-            option_type = match.group(1)
-            data = match.group(2)
-            
-            if option_type == "arg":
-                self.args = data
-            elif option_type == "platform":
-                self.platform = data
-            elif option_type == "category":
-                self.category = data
-            elif option_type == "vanilla":
-                self.vanilla_option = True
-            elif option_type == "game":
-                self.games = re.split(r'\s+', data.strip())
-            else:
-                raise "Unknown option type '%s'" % option_type
-
-        else:
-            self.text += text + " "
-
-    def _games_only_text(self, pattern="(%s only)"):
-        if not match_game and self.games:
-            games_list = ", ".join(map(str.capitalize, self.games))
-            return " " + (pattern % games_list)
-        else:
-            return ""
-
-    def manpage_output(self):
-        if self.args:
-            # Special cases -- GBR is not proud.
-            if self.args == "[<x> <y> | <xy>]":
-                result = ".BR " + self.name + " \\~\\c\n" \
-                    + ".RI [ x\\~y | xy ]\n"
-            elif self.args == "<WxH>":
-                result = ".BI " + self.name + "\\~ W x H\n"
-            elif self.args == "<x> <y>":
-                result = ".BI " + self.name + "\\~ \"x y\"\n"
-            elif self.args == "<files>":
-                result = ".BI " + self.name + "\\~ \"file\\~\\c\n" \
-                    + "\\&.\\|.\\|.\n"
-            elif self.args == "<save-num> <demo-name>":
-                result = ".BI " + self.name \
-                    + "\\~ \"save-num demo-name\"\n"
-            else:
-                self.args = re.sub(r'[<>]', '', self.args)
-                result = ".BI " + self.name + "\\~ " + self.args + "\n"
-        else:
-            result = ".B " + self.name + "\n"
-
-        if self.platform:
-            result += "[%s only] " % self.platform
-
-        escaped = re.sub(r'\\', r'\\\\', self.text)
-
-        result += escaped + self._games_only_text() + "\n"
-
-        return result
-
-    def wiki_output(self):
-        result = self.name
-
-        if self.args:
-            result += " " + self.args
-
-        result += ": "
-
-        result += add_wiki_links(self.text)
-
-        if self.platform:
-            result += "'''(%s only)'''" % self.platform
-        result += self._games_only_text("'''(%s only)'''")
-
-        return result
-
-    def markdown_output(self):
-        if self.args:
-            name = "%s %s" % (self.name, self.args)
-        else:
-            name = "%s" % self.name
-
-        name = name.replace("|", "\\|")
-
-        text = self.text
-        if self.platform:
-            text += " (%s only)" % self.platform
-
-        text = text.replace("|", "\\|")
-
-        result = "| %s | %s |\n" % (name, text)
-
-        # html escape
-        result = result.replace("<", "&lt;")
-        result = result.replace(">", "&gt;")
-
-        return result
-
-    def plaintext_output(self, indent):
-        # Build the first line, with the argument on
-        start = "  " + self.name
-        if self.args:
-            start += " " + self.args
-
-        # pad up to the plaintext width
-        start += " " * (indent - len(start))
-
-        # Build the description text
-        description = self.text
-        if self.platform:
-            description += " (%s only)" % self.platform
-        description += self._games_only_text()
-
-        # Build the complete text for the argument
-        # Split the description into words and add a word at a time
-        result = ""
-        words = [word for word in re.split(r'\s+', description) if word]
-        maxlen = TEXT_WRAP_WIDTH - indent
-        outlines = [[]]
-        for word in words:
-            linelen = sum(len(w) + 1 for w in outlines[-1])
-            if linelen + len(word) > maxlen:
-                outlines.append([])
-            outlines[-1].append(word)
-
-        linesep = "\n" + " " * indent
-
-        return (start +
-                linesep.join(" ".join(line) for line in outlines) +
-                "\n\n")
-
-    def completion_output(self, w):
-
-        result = self.name + " "
-
-        return result
-
-# Read list of wiki pages
-
-def read_wikipages():
-    f = io.open("wikipages", encoding='UTF-8')
-
-    try:
-        for line in f:
-            line = line.rstrip()
-
-            line = re.sub(r'\#.*$', '', line)
-
-            if not re.match(r'^\s*$', line):
-                wikipages.append(line)
-    finally:
-        f.close()
-
-# Add wiki page links
-
-def add_wiki_links(text):
-    def replace_name(m):
-        linktext = m.group(1)
-        if linktext == pagename:
-            return '[[%s]]' % pagename
-        else:
-            return '[[%s|%s]]' % (pagename, linktext)
-
-    for pagename in wikipages:
-        text = re.sub(r'\b(%s)\b' % re.escape(pagename), replace_name,
-                      text, count=0, flags=re.IGNORECASE)
-
-    return text
-
-def add_parameter(param, line, config_file):
-
-    # If we're only targeting a particular game, check this is one of
-    # the ones we're targeting.
-
-    if match_game and param.games and match_game not in param.games:
-        return
-
-    # Is this documenting a command line parameter?
-
-    match = re.search(r'(M_CheckParm(WithArgs)|M_ParmExists)?\s*\(\s*"(.*?)"',
-                      line)
-
-    if match:
-        param.name = match.group(3)
-        category = dict(categories)[param.category]
-        category.add_param(param)
-        return
-
-    # Documenting a configuration file variable?
-
-    match = re.search(r'CONFIG_VARIABLE_\S+\s*\(\s*(\S+?)\),', line)
-
-    if match:
-        param.name = match.group(1)
-        config_file.add_variable(param)
-        return
-
-    raise Exception(param.text)
-
-def process_file(filename):
-
-    current_config_file = None
-
-    f = io.open(filename, encoding='UTF-8')
-
-    try:
-        param = None
-        waiting_for_checkparm = False
-
-        for line in f:
-            line = line.rstrip()
-
-            # Ignore empty lines
-
-            if re.match(r'\s*$', line):
-                continue
-
-            # Currently reading a doc comment?
-
-            if param:
-                # End of doc comment
-
-                if not re.match(r'\s*//', line):
-                    waiting_for_checkparm = True
-
-                # The first non-empty line after the documentation comment
-                # ends must contain the thing being documented.
-
-                if waiting_for_checkparm:
-                    add_parameter(param, line, current_config_file)
-                    param = None
-                else:
-                    # More documentation text
-
-                    munged_line = re.sub(r'\s*\/\/\s*', '', line, count=1)
-                    munged_line = re.sub(r'\s*$', '', munged_line)
-                    param.add_text(munged_line)
-
-            # Check for start of a doc comment
-
-            if re.search("//!", line):
-                match = re.search(r"@begin_config_file\s*(\S+)", line)
-
-                if match:
-                    # Beginning a configuration file
-                    tagname = match.group(1)
-                    current_config_file = ConfigFile(tagname)
-                    config_files[tagname] = current_config_file
-                else:
-                    # Start of a normal comment
-                    param = Parameter()
-                    waiting_for_checkparm = False
-    finally:
-        f.close()
-
-def process_files(path):
-    # Process all C source files.
-
-    if os.path.isdir(path):
-        files = glob.glob(path + "/*.c")
-
-        for filename in files:
-            process_file(filename)
-    else:
-        # Special case to allow a single file to be specified as a target
-
-        process_file(path)
-
-def print_template(template_file, substs, content):
-    f = io.open(template_file, encoding='UTF-8')
-
-    try:
-        for line in f:
-            match = INCLUDE_STATEMENT_RE.search(line)
-            if match:
-                filename = match.group(1)
-                filename = os.path.join(os.path.dirname(template_file),
-                                        filename)
-                print_template(filename, substs, content)
-            else:
-                line = line.replace("@content", content)
-                for k,v in substs.items():
-                    line = line.replace(k,v)
-                stdout(line.rstrip().encode('UTF-8') + b'\n')
-    finally:
-        f.close()
-
-def manpage_output(targets, substs, template_file):
-
-    content = ""
-
-    for t in targets:
-        content += t.manpage_output()
-
-    content = content.replace("-", "\\-")
-
-    print_template(template_file, substs, content)
-
-def wiki_output(targets, _, template):
-    read_wikipages()
-
-    for t in targets:
-        stdout(t.wiki_output().encode('UTF-8') + b'\n')
-
-def markdown_output(targets, substs, template_file):
-    content = ""
-
-    for t in targets:
-        content += t.markdown_output() + "\n"
-
-    print_template(template_file, substs, content)
-
-def plaintext_output(targets, substs, template_file):
-
-    content = ""
-
-    for t in targets:
-        content += t.plaintext_output() + "\n"
-
-    print_template(template_file, substs, content)
-
-def completion_output(targets, substs, template_file):
-
-    content = ""
-
-    for t in targets:
-        content += t.completion_output() + "\n"
-
-    print_template(template_file, substs, content)
-
-def usage():
-    print("Usage: %s [-V] [-c tag] [-g game] -n program_name -s package_name [ -z shortname ] ( -M | -m | -w | -p ) <dir>..." \
-            % sys.argv[0])
-    print("   -c :  Provide documentation for the specified configuration file")
-    print("         (matches the given tag name in the source file)")
-    print("   -s :  Package name, e.g. Chocolate Doom (for substitution)")
-    print("   -z :  Package short-name, e.g. Chocolate (for substitution)")
-    print("   -v :  Package version, e.g. 7.0 (for substitution)")
-    print("   -n :  Program name, e.g. chocolate (for substitution)")
-    print("   -M :  Markdown output")
-    print("   -m :  Manpage output")
-    print("   -w :  Wikitext output")
-    print("   -p :  Plaintext output")
-    print("   -b :  Bash-Completion output")
-    print("   -V :  Don't show Vanilla Doom options")
-    print("   -g :  Only document options for specified game.")
-    sys.exit(0)
-
-# Parse command line
-
-opts, args = getopt.getopt(sys.argv[1:], "n:s:z:v:M:m:wp:b:c:g:V")
-
-output_function = None
-template = None
-doc_config_file = None
-match_game = None
-substs = {}
-
-for opt in opts:
-    if opt[0] == "-n":
-        substs["@PROGRAM_SPREFIX@"] = opt[1]
-    if opt[0] == "-s":
-        substs["@PACKAGE_NAME@"] = opt[1]
-    if opt[0] == "-z":
-        substs["@PACKAGE_SHORTNAME@"] = opt[1]
-    if opt[0] == "-v":
-        substs["@VERSION@"] = opt[1]
-    if opt[0] == "-m":
-        output_function = manpage_output
-        template = opt[1]
-    elif opt[0] == "-M":
-        output_function = markdown_output
-        template = opt[1]
-    elif opt[0] == "-w":
-        output_function = wiki_output
-    elif opt[0] == "-p":
-        output_function = plaintext_output
-        template = opt[1]
-    elif opt[0] == "-b":
-        output_function = completion_output
-        template = opt[1]
-    elif opt[0] == "-V":
-        show_vanilla_options = False
-    elif opt[0] == "-c":
-        doc_config_file = opt[1]
-    elif opt[0] == "-g":
-        match_game = opt[1]
-        substs["@GAME@"] = opt[1]
-        substs["@GAME_UPPER@"] = opt[1].title()
-        if "doom" == opt[1]:
-            substs["@CFGFILE@"] = "default.cfg"
-        else:
-            substs["@CFGFILE@"] = opt[1] + ".cfg"
-
-if output_function == None or len(args) < 1:
-    usage()
-else:
-    # Process specified files
-
-    for path in args:
-        process_files(path)
-
-    # Build a list of things to document
-    if doc_config_file:
-        documentation_targets = [config_files[doc_config_file]]
-    else:
-        documentation_targets = [c for _, c in categories]
-
-    # Generate the output
-    output_function(documentation_targets, substs, template)
-
diff --git a/games/NXDoom/man/doom.template b/games/NXDoom/man/doom.template
deleted file mode 100644
index bbf1c62aa..000000000
--- a/games/NXDoom/man/doom.template
+++ /dev/null
@@ -1,45 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-doom 6 2018-01-09 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-doom \- historically compatible Doom engine
-.SH SYNOPSIS
-.B @PROGRAM_SPREFIX@\-doom
-.RI [ options ]
-.SH DESCRIPTION
-.PP
-@PACKAGE_SHORTNAME@ Doom is a port of Id Software's 1993 game
-.I Doom
-that is designed to behave as similarly to the original DOS version of
-Doom as is possible.
-@content
-.SH IWAD SEARCH PATHS
-@include iwad_paths.man
-.SH ENVIRONMENT
-This section describes environment variables that control
-@PACKAGE_SHORTNAME@ Doom's behavior.
-@include environ.man
-.SH FILES
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/default.cfg
-The main configuration file for @PACKAGE_NAME@.
-See \fBdefault.cfg\fR(5).
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-doom.cfg
-Extra configuration values that are specific to @PACKAGE_NAME@ and not
-present in Vanilla Doom.
-See \fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5).
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-server\fR(6),
-\fB@PROGRAM_SPREFIX@\-setup\fR(6),
-\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
-\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
-\fB@PROGRAM_SPREFIX@\-strife\fR(6)
-.SH AUTHOR
-Chocolate Doom is written and maintained by Simon Howard.
-It is based on the LinuxDoom source code, released by Id Software.
-.SH COPYRIGHT
-Copyright \(co id Software Inc.
-Copyright \(co 2005-2016 Simon Howard.
-.PP
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/environ.man b/games/NXDoom/man/environ.man
deleted file mode 100644
index 414f5037e..000000000
--- a/games/NXDoom/man/environ.man
+++ /dev/null
@@ -1,34 +0,0 @@
-.TP
-.I DOOMWADDIR
-.TQ
-.I DOOMWADPATH
-See section \(lqIWAD SEARCH PATHS\(rq above.
-.TP
-.I PCSOUND_DRIVER
-When running in PC speaker sound effect mode, this environment variable
-specifies a PC speaker driver to use for sound effect playback.
-Valid options are
-.RB \(lq Linux \(rq
-for the Linux console mode driver,
-.RB \(lq BSD \(rq
-for the NetBSD/OpenBSD PC speaker driver,
-and
-.RB \(lq SDL \(rq
-for SDL-based emulated PC speaker playback (using the digital output).
-.TP
-.I OPL_DRIVER
-When using OPL MIDI playback, this environment variable specifies an
-OPL backend driver to use.
-Valid options are
-.RB \(lq SDL \(rq
-for an SDL-based software emulated OPL chip,
-.RB \(lq Linux \(rq
-for the Linux hardware OPL driver,
-and
-.RB \(lq OpenBSD \(rq
-for the OpenBSD/NetBSD hardware OPL driver.
-.IP
-Generally speaking, a real hardware OPL chip sounds better than software
-emulation; however, modern machines do not often include one.
-If present, it may still require extra work to set up and elevated
-security privileges to access.
diff --git a/games/NXDoom/man/extra.cfg.template b/games/NXDoom/man/extra.cfg.template
deleted file mode 100644
index de6f40666..000000000
--- a/games/NXDoom/man/extra.cfg.template
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-@GAME@.cfg 5 2024-01-23 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-@GAME@.cfg \- @PACKAGE_SHORTNAME@ @GAME_UPPER@ configuration file
-.SH DESCRIPTION
-.PP
-\fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR
-is a configuration file for \fB@PROGRAM_SPREFIX@\-@GAME@\fR(6).  This file acts
-as an auxiliary configuration file; the main configuration options
-are stored in \fB@CFGFILE@\fR, which contains the same configuration
-options as Vanilla @GAME_UPPER@ (for compatibility).  \fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR
-contains configuration options that are specific to @PACKAGE_SHORTNAME@\-@GAME_UPPER@
-only.
-.PP
-\fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR is normally stored in the user's home directory,
-as \fI~/.local/share/@PROGRAM_SPREFIX@\-@GAME@/@PROGRAM_SPREFIX@\-@GAME@.cfg\fR.  The path can be
-overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
-Base Directory Specification).
-.PP
-The \fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6) tool provides a simple to use front-end
-for editing \fI@PROGRAM_SPREFIX@\-@GAME@.cfg\fR.
-.SH FILE FORMAT
-.PP
-The file format is the same as that used for \fB@CFGFILE@\fR(5).
-@content
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-@GAME@\fR(6),
-\fB@CFGFILE@\fR(5),
-\fB@PROGRAM_SPREFIX@\-@GAME@\-setup\fR(6)
diff --git a/games/NXDoom/man/heretic.template b/games/NXDoom/man/heretic.template
deleted file mode 100644
index 394af6104..000000000
--- a/games/NXDoom/man/heretic.template
+++ /dev/null
@@ -1,47 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-heretic 6 2017-11-27 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-heretic \- historically compatible Heretic engine
-.SH SYNOPSIS
-.B @PROGRAM_SPREFIX@\-heretic
-.RI [ options ]
-.SH DESCRIPTION
-.PP
-@PACKAGE_SHORTNAME@ Heretic is a port of Raven Software's 1994 game
-.I Heretic
-that aims to behave as similar to the original DOS version of Heretic as
-possible.
-@content
-.SH IWAD SEARCH PATHS
-@include iwad_paths.man
-.SH ENVIRONMENT
-This section describes environment variables that control
-@PACKAGE_SHORTNAME@ Heretic's behavior.
-@include environ.man
-.SH FILES
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/heretic.cfg
-The main configuration file for @PACKAGE_SHORTNAME@ Heretic.
-See \fBheretic.cfg\fR(5).
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-heretic.cfg
-Extra configuration values that are specific to @PACKAGE_SHORTNAME@ Heretic and not
-present in Vanilla Heretic.
-See \fB@PROGRAM_SPREFIX@\-heretic.cfg\fR(5).
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
-\fB@PROGRAM_SPREFIX@\-server\fR(6),
-\fB@PROGRAM_SPREFIX@\-setup\fR(6)
-.SH AUTHOR
-Chocolate Heretic is part of the Chocolate Doom project, written and
-maintained by Simon Howard.
-It is based on the Heretic source code,
-released by Raven Software.
-.SH COPYRIGHT
-Copyright \(co id Software Inc.
-Copyright \(co Raven Software Inc.
-Copyright \(co 2005-2013 Simon Howard.
-.PP
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/hexen.template b/games/NXDoom/man/hexen.template
deleted file mode 100644
index 22e900f01..000000000
--- a/games/NXDoom/man/hexen.template
+++ /dev/null
@@ -1,47 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-hexen 6 2017-11-27 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-hexen \- historically compatible Hexen engine
-.SH SYNOPSIS
-.B @PROGRAM_SPREFIX@\-hexen
-.RI [ options ]
-.SH DESCRIPTION
-.PP
-@PACKAGE_SHORTNAME@ Hexen is a port of Raven Software's 1995 game
-.I Hexen
-that aims to behave as similar to the original DOS version of Hexen as
-possible.
-@content
-.SH IWAD SEARCH PATHS
-@include iwad_paths.man
-.SH ENVIRONMENT
-This section describes environment variables that control
-@PACKAGE_SHORTNAME@ Hexen's behavior.
-@include environ.man
-.SH FILES
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/hexen.cfg
-The main configuration file for @PACKAGE_SHORTNAME@ Hexen.
-See \fBhexen.cfg\fR(5).
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-hexen.cfg
-Extra configuration values that are specific to @PACKAGE_SHORTNAME@
-Hexen and not present in Vanilla Hexen.
-See \fB@PROGRAM_SPREFIX@\-hexen.cfg\fR(5).
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
-\fB@PROGRAM_SPREFIX@\-server\fR(6),
-\fB@PROGRAM_SPREFIX@\-setup\fR(6)
-.SH AUTHOR
-Chocolate Hexen is part of the Chocolate Doom project, written and
-maintained by Simon Howard.
-It is based on the Hexen source code,
-released by Raven Software.
-.SH COPYRIGHT
-Copyright \(co id Software Inc.
-Copyright \(co Raven Software Inc.
-Copyright \(co 2005-2013 Simon Howard.
-.PP
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/iwad_paths.man b/games/NXDoom/man/iwad_paths.man
deleted file mode 100644
index 5b4268094..000000000
--- a/games/NXDoom/man/iwad_paths.man
+++ /dev/null
@@ -1,73 +0,0 @@
-To play, an IWAD file is needed.
-This is a large file containing all of the levels, graphics,
-sound effects, music and other material that make up the game.
-IWAD files are named according to the game; the standard names are:
-.TP
-.IR doom.wad ,\~\c
-.IR doom1.wad ,\~\c
-.IR doom2.wad ,\~\c
-.IR tnt.wad ,\~\c
-.I plutonia.wad
-Doom, Doom II, Final Doom
-.TP
-.IR heretic.wad ,\~\c
-.IR hexen.wad ,\~\c
-.I strife.wad
-Heretic, Hexen and Strife (commercial Doom engine games).
-.TP
-.IR hacx.wad ,\~\c
-.I chex.wad
-Hacx and Chex Quest - more obscure games based on the Doom engine.
-.TP
-.IR freedm.wad ,\~\c
-.IR freedoom1.wad ,\~\c
-.I freedoom2.wad
-The Freedoom open content IWAD files.
-.LP
-The following directory paths are searched in order to find an IWAD:
-.TP
-Current working directory
-Any IWAD files found in the current working directory will be used in
-preference to IWADs found in any other directories.
-.TP
-.I DOOMWADDIR
-This environment variable can be set to contain a path to a single
-directory in which to look for IWAD files.
-This environment variable is supported by most Doom source ports.
-.TP
-.I DOOMWADPATH
-This environment variable, if set, can contain a colon-separated list of
-directories in which to look for IWAD files, or alternatively full paths to
-specific IWAD files.
-.TP
-.I $HOME/.local/share/games/doom
-Writeable directory in the user's home directory.
-The path can be overridden using the
-.I \%XDG_DATA_HOME
-environment variable (see the XDG Base Directory Specification).
-.TP
-.I /usr/local/share/doom
-.TQ
-.I /usr/local/share/games/doom
-.TQ
-.I /usr/share/doom
-.TQ
-.I /usr/share/games/doom
-System-wide locations that can be accessed by all users.
-The path
-.I /usr/share/games/doom
-is a standard path that is supported by most Doom source ports.
-These paths can be overridden using the
-.I \%XDG_DATA_DIRS
-environment variable (see the XDG Base Directory Specification).
-.LP
-The above can be overridden on a one-time basis by using the
-.B \-iwad
-command line parameter to provide the path to an IWAD file to use.This
-parameter can also be used to specify the name of a particular IWAD to use
-from one of the above paths.
-For example,
-.RB \(lq "\-iwad doom.wad" \(rq
-will search the above paths for the file
-.I doom.wad
-to use.
diff --git a/games/NXDoom/man/server.template b/games/NXDoom/man/server.template
deleted file mode 100644
index 7ce2a3b37..000000000
--- a/games/NXDoom/man/server.template
+++ /dev/null
@@ -1,55 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-server 6 2018-01-15 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-server \- dedicated server for @PROGRAM_SPREFIX@\-doom
-.SH SYNOPSIS
-.B @PROGRAM_SPREFIX@\-server
-.RI [ options ]
-.SH DESCRIPTION
-.PP
-@PACKAGE_NAME@ is a modern Doom engine designed to behave
-as similarly to the original Doom game as is possible.
-.PP
-.I \%@PROGRAM_SPREFIX@\-server
-is a dedicated server for @PACKAGE_SHORTNAME@.
-It is equivalent to running
-\fB@PROGRAM_SPREFIX@-doom\fR(6)
-with the
-.B \%\-dedicated
-option.
-.PP
-Game options are not specified to the server, which merely acts to
-retransmit data between players in the game; parameters for the
-game should be specified by the first player to connect to the server,
-who is designated the controlling player.
-.SH OPTIONS
-.TP
-.B \-ignoreversion
-Ignore version mismatches between the server and the client.
-Using this option may cause game desyncs to occur,
-or differences in protocol may mean the netgame will simply not function
-at all.
-.TP
-.BI \-port\~ n
-Use UDP port
-.I n
-for communications instead of the default (2342).
-.TP
-.B \-privateserver
-Don't register with the global master server.
-.TP
-.BI \-servername\~ name
-Specify a name for the server.
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@-doom\fR(6),
-\fB@PROGRAM_SPREFIX@-setup\fR(6)
-.SH AUTHOR
-Chocolate Doom is written and maintained by Simon Howard.
-.PP
-This manual was written by Jonathan Dowland.
-.SH COPYRIGHT
-Copyright \(co id Software Inc.
-Copyright \(co 2005-8 Simon Howard.
-.PP
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/setup.template b/games/NXDoom/man/setup.template
deleted file mode 100644
index 1fd057c66..000000000
--- a/games/NXDoom/man/setup.template
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-@GAME@-setup 6 2017-11-30 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-@GAME@-setup \- configuration tool for @PROGRAM_SPREFIX@\-@GAME@
-.SH SYNOPSIS
-.B @PROGRAM_SPREFIX@\-@GAME@-setup
-.RI [ options ]
-.SH DESCRIPTION
-.PP
-@PACKAGE_SHORTNAME@ @GAME_UPPER@ is a modern @GAME_UPPER@ engine
-designed to behave as similarly to the original @GAME_UPPER@ game as is
-possible.
-.PP
-.I @PROGRAM_SPREFIX@\-@GAME@-setup
-is a tool for configuring @PACKAGE_SHORTNAME@ @GAME_UPPER@.
-It provides a menu-based interface for the display, joystick, keyboard,
-mouse, sound and compatibility settings.
-.PP
-.I @PROGRAM_SPREFIX@\-@GAME@-setup
-can also be used to start and join network games.
-.PP
-.SH OPTIONS
-.TP
-.BI \-config\~ file
-Load configuration from the specified file,
-instead of
-.IR @CFGFILE@ .
-.TP
-.BI \-extraconfig\~ file
-Load extra configuration from the specified file,
-instead of
-.IR @PROGRAM_SPREFIX@\-@GAME@.cfg .
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-@GAME@\fR(6),
-\fBdefault.cfg\fR(5),
-\fB@PROGRAM_SPREFIX@\-@GAME@.cfg\fR(5)
-.SH AUTHOR
-Chocolate Doom is written and maintained by Simon Howard.
-.PP
-This manual was written by Jonathan Dowland.
-.SH COPYRIGHT
-Copyright \(co id Software Inc.
-Copyright \(co 2005-8 Simon Howard.
-.PP
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/simplecpp b/games/NXDoom/man/simplecpp
deleted file mode 100755
index 7749c269a..000000000
--- a/games/NXDoom/man/simplecpp
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Contributors to the Freedoom project.  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 freedoom project 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.
-#
-#
-# simple cpp-style preprocessor
-#
-# Understands most features of the C preprocessor, including:
-#    #if .. #elif .. #else .. #endif
-#        - with expressions
-#    #ifdef
-#    #define
-#    #include
-#
-
-import collections
-import io
-import sys
-import re
-
-debug = False
-defines = collections.defaultdict(lambda: False)
-
-command_re = re.compile(r"\#(\w+)(\s+(.*))?")
-include_re = re.compile(r"\s*\"(.*)\"\s*")
-define_re = re.compile(r"\s*(\S+)\s*(.*?)\s*$")
-
-def debug_msg(message):
-	if debug:
-		sys.stderr.write(message)
-
-# Parse command line options
-
-def parse_cmdline():
-	for arg in sys.argv[1:]:
-		if not arg.startswith("-D"):
-			continue
-
-		name = arg[2:]
-		if '=' in name:
-			name, value = name.split('=', 1)
-		else:
-			value = True
-
-		defines[name] = value
-
-def parse_stream(stream):
-	result = read_block(stream, False)
-
-	if result is not None:
-		raise Exception("Mismatched #if in '%s'" % stream.name)
-
-def parse_file(filename):
-	f = io.open(filename, encoding='UTF-8')
-
-	try:
-		parse_stream(f)
-	finally:
-		f.close()
-
-# Evaluate an expression using Python's eval() function.
-
-def eval_expr(expr):
-	expr = expr.replace("||", " or ")   \
-	           .replace("&&", " and ")  \
-	           .replace("!", "not ")
-
-	code = compile(expr, "", "eval")
-	result = eval(code, {}, defines)
-	return result
-
-# #include
-
-def cmd_include(arg):
-	# Extract the filename
-
-	match = include_re.match(arg)
-
-	if not match:
-		raise Exception("Invalid 'include' command")
-
-	filename = match.group(1)
-
-	# Open the file and process it
-
-	parse_file(filename)
-
-# #define
-
-def cmd_define(arg):
-	match = define_re.match(arg)
-	name = match.group(1)
-	value = match.group(2)
-	if value == '':
-		value = True
-
-	defines[name] = value
-
-# #undef
-
-def cmd_undef(arg):
-	if arg in defines:
-		del defines[arg]
-
-# #ifdef/#ifndef
-
-def cmd_ifdef(arg, command, stream, ignore):
-
-	# Get the define name
-
-	debug_msg("%s %s >\n" % (command, arg))
-
-	# Should we ignore the contents of this block?
-
-	sub_ignore = not eval_expr(arg)
-
-	if "n" in command:
-		sub_ignore = not sub_ignore
-
-	# Parse the block
-
-	result, newarg = read_block(stream, ignore or sub_ignore)
-
-	debug_msg("%s %s < (%s)\n" % (command, arg, result))
-
-	# There may be a second "else" block to parse:
-
-	if result == "else":
-		debug_msg("%s %s else >\n" % (command, arg))
-		result, arg = read_block(stream, ignore or (not sub_ignore))
-		debug_msg("%s %s else < (%s)\n" % (command, arg, result))
-
-	if result == "elif":
-		debug_msg("%s %s elif %s>\n" % (command, arg, newarg))
-		cmd_ifdef(newarg, "if", stream, ignore or (not sub_ignore))
-		result = "endif"
-
-	# Should end in an endif:
-
-	if result != "endif":
-		raise Exception("'if' block did not end in an 'endif'")
-
-commands = {
-	"include" : cmd_include,
-	"define"  : cmd_define,
-	"undef"   : cmd_undef,
-	"if"      : cmd_ifdef,
-	"ifdef"   : cmd_ifdef,
-	"ifn"     : cmd_ifdef,
-	"ifndef"  : cmd_ifdef,
-}
-
-# Recursive block reading function
-# if 'ignore' argument is 1, contents are ignored
-
-def read_block(stream, ignore):
-
-	for line in stream:
-
-		# Remove newline
-
-		line = line[0:-1]
-
-		# Check if this line has a command
-
-		match = command_re.match(line)
-
-		if match:
-			command = match.group(1)
-			arg = match.group(3)
-
-			if command in ("else", "elif", "endif"):
-				return (command, arg)
-			elif command not in commands:
-				raise Exception("Unknown command: '%s'" % \
-						command)
-
-			# Get the callback function.
-
-			func = commands[command]
-
-			# Invoke the callback function. #ifdef commands
-			# are a special case and need extra arguments.
-			# Other commands are only executed if we are not
-			# ignoring this block.
-
-			if func == cmd_ifdef:
-				cmd_ifdef(arg, command=command,
-					       stream=stream,
-					       ignore=ignore)
-			elif not ignore:
-				func(arg)
-		else:
-			if not ignore:
-				for key, value in defines.items():
-					if isinstance(value, str):
-						line = line.replace(key, value)
-				print(line)
-
-parse_cmdline()
-parse_stream(sys.stdin)
-
diff --git a/games/NXDoom/man/strife.template b/games/NXDoom/man/strife.template
deleted file mode 100644
index 51defaecb..000000000
--- a/games/NXDoom/man/strife.template
+++ /dev/null
@@ -1,91 +0,0 @@
-.TH @PROGRAM_SPREFIX@\-strife 6 2018-01-15 "@PACKAGE_NAME@ @VERSION@"
-.SH NAME
-@PROGRAM_SPREFIX@\-strife \- historically compatible Strife engine
-.SH SYNOPSIS
-.B @PROGRAM_SPREFIX@\-strife
-.RI [ options ]
-.SH DESCRIPTION
-.PP
-@PACKAGE_SHORTNAME@ Strife is an accurate and complete recreation of
-Rogue Entertainment's
-.IR "Strife: Quest for the Sigil" .
-It was created through
-more than two years of reverse engineering effort with the blessings
-of the original programmers of the game;
-see section \(lqHISTORY\(rq below.
-@content
-.SH IWAD SEARCH PATHS
-@include iwad_paths.man
-.SH ENVIRONMENT
-This section describes environment variables that control
-@PACKAGE_SHORTNAME@ Strife's behavior.
-@include environ.man
-.SH FILES
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/strife.cfg
-The main configuration file for @PACKAGE_SHORTNAME@ Strife.
-See \fBstrife.cfg\fR(5).
-.TP
-.I $HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-strife.cfg
-Extra configuration values that are specific to @PACKAGE_SHORTNAME@
-Strife and not present in Vanilla Strife.
-See \fB@PROGRAM_SPREFIX@\-strife.cfg\fR(5).
-.SH SEE ALSO
-\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-\fB@PROGRAM_SPREFIX@\-server\fR(6),
-\fB@PROGRAM_SPREFIX@\-setup\fR(6)
-.SH HISTORY
-The source code for Strife was lost, which means, unlike the code for
-all the other commercial games using the Doom engine, it cannot be
-released.
-The only access we have to the code is the binary executable file.
-Reverse engineering tools were employed to disassemble and decompile the
-executables, which were cross-referenced against the Linux Doom and
-DOS Heretic sources and painstakingly combed over multiple times,
-instruction by instruction, to ensure that the resulting
-Chocolate-Doom-based executable is as close as possible to the original.
-.SH LEGALITY
-Reverse engineering is a protected activity so long as the original code
-is not used directly in the product.
-Due to the vast amount of information lost through the process of
-compilation, and the need to refactor large portions of code in order to
-eliminate non-portable idioms or to adapt them properly to Chocolate
-Doom's framework, the resulting code behaves the same, but is not the
-.I same
-code.
-.PP
-In addition, James Monroe and John Carmack have both stated that they
-have no objections to the project.
-Because they are the original authors of the code, and neither Rogue nor
-their publisher, Velocity, Inc., exist any longer as legal entities,
-this is effectively legal permission.
-.SH BUGS
-@PACKAGE_SHORTNAME@ Strife is almost, but not entirely perfect, in
-recreating the behavior of Vanilla Strife.
-Help us by reporting any discrepancies you might notice between this
-executable and the vanilla DOS program.
-.PP
-However, do
-.I not
-report any glitch that you can replicate in the vanilla EXE as a bug.
-The point of @PACKAGE_SHORTNAME@ Strife, like Chocolate Doom before it,
-is to be as bug-compatible with the original game as possible.
-Also be aware that some glitches are impossible to compatibly recreate,
-and wherever this is the case, @PACKAGE_SHORTNAME@ Strife has erred on
-the side of not crashing the program, for example by initializing
-pointers to
-.I NULL
-rather than using them without setting a value first.
-.SH AUTHORS
-Chocolate Strife is part of the Chocolate Doom project.
-It was reverse engineered from the DOS versions of Strife by James Haley
-and Samuel Villarreal.
-Chocolate Doom was written and maintained by Simon Howard, and is based
-on the LinuxDoom source code released by Id Software.
-.SH COPYRIGHT
-Copyright \(co id Software Inc.
-Copyright \(co 2005-2013 Simon Howard, James Haley, Samuel Villarreal.
-.PP
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
diff --git a/games/NXDoom/man/wikipages b/games/NXDoom/man/wikipages
deleted file mode 100644
index 429c47dde..000000000
--- a/games/NXDoom/man/wikipages
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is a list of wiki pages to automatically link to when generating
-# wikitext output.
-Dehacked
-Doom 1.91
-Merging
-Multiplayer
-Three screen mode
diff --git a/games/NXDoom/opl/.gitignore b/games/NXDoom/opl/.gitignore
deleted file mode 100644
index 8aac4e778..000000000
--- a/games/NXDoom/opl/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.in
-Makefile
-.deps
-libopl.a
-*.rc
-tags
-TAGS
diff --git a/games/NXDoom/opl/CMakeLists.txt b/games/NXDoom/opl/CMakeLists.txt
deleted file mode 100644
index 289ca279d..000000000
--- a/games/NXDoom/opl/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-add_library(opl STATIC
-            opl_internal.h
-            opl.c           opl.h
-            opl_linux.c
-            opl_obsd.c
-            opl_queue.c     opl_queue.h
-            opl_sdl.c
-            opl_timer.c     opl_timer.h
-            opl_win32.c
-            ioperm_sys.c    ioperm_sys.h
-            opl3.c          opl3.h)
-target_include_directories(opl
-                           INTERFACE "."
-                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-if (DEFINED EMSCRIPTEN)
-    if(ENABLE_SDL2_MIXER)
-        set_target_properties(opl PROPERTIES COMPILE_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
-        set_target_properties(opl PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
-    else()
-        set_target_properties(opl PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-        set_target_properties(opl PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-    endif()
-else()
-    target_link_libraries(opl SDL2::SDL2)
-    if(ENABLE_SDL2_MIXER)
-        target_link_libraries(opl SDL2_mixer::SDL2_mixer)
-    endif()
-endif()
diff --git a/games/NXDoom/opl/Makefile.am b/games/NXDoom/opl/Makefile.am
deleted file mode 100644
index 430953e33..000000000
--- a/games/NXDoom/opl/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-AM_CFLAGS=@SDLMIXER_CFLAGS@
-
-EXTRA_DIST=CMakeLists.txt
-
-SUBDIRS = . examples
-
-noinst_LIBRARIES=libopl.a
-
-libopl_a_SOURCES =                                \
-                            opl_internal.h        \
-        opl.c               opl.h                 \
-        opl_linux.c                               \
-        opl_obsd.c                                \
-        opl_queue.c         opl_queue.h           \
-        opl_sdl.c                                 \
-        opl_timer.c         opl_timer.h           \
-        opl_win32.c                               \
-        ioperm_sys.c        ioperm_sys.h          \
-        opl3.c              opl3.h
-
diff --git a/games/NXDoom/opl/examples/.gitignore b/games/NXDoom/opl/examples/.gitignore
deleted file mode 100644
index 4d589c738..000000000
--- a/games/NXDoom/opl/examples/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.in
-Makefile
-.deps
-droplay
-*.exe
-tags
-TAGS
diff --git a/games/NXDoom/opl/examples/Makefile.am b/games/NXDoom/opl/examples/Makefile.am
deleted file mode 100644
index 9afcd513c..000000000
--- a/games/NXDoom/opl/examples/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-AM_CFLAGS = -I$(top_srcdir)/opl
-
-noinst_PROGRAMS=droplay
-
-droplay_LDADD = ../libopl.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@
-droplay_SOURCES = droplay.c
-
diff --git a/games/NXDoom/opl/examples/droplay.c b/games/NXDoom/opl/examples/droplay.c
deleted file mode 100644
index 16e10c3c9..000000000
--- a/games/NXDoom/opl/examples/droplay.c
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Demonstration program for OPL library to play back DRO
-//     format files.
-//
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "SDL.h"
-
-#include "opl.h"
-
-#define HEADER_STRING "DBRAWOPL"
-#define ADLIB_PORT 0x388
-
-void WriteReg(unsigned int reg, unsigned int val)
-{
-    int i;
-
-    // This was recorded from an OPL2, but we are probably playing
-    // back on an OPL3, so we need to enable the original OPL2
-    // channels.  Doom does this already, but other games don't.
-
-    if ((reg & 0xf0) == OPL_REGS_FEEDBACK)
-    {
-        val |= 0x30;
-    }
-
-    OPL_WritePort(OPL_REGISTER_PORT, reg);
-
-    for (i=0; i<6; ++i)
-    {
-        OPL_ReadPort(OPL_REGISTER_PORT);
-    }
-
-    OPL_WritePort(OPL_DATA_PORT, val);
-
-    for (i=0; i<35; ++i)
-    {
-        OPL_ReadPort(OPL_REGISTER_PORT);
-    }
-}
-
-void ClearAllRegs(void)
-{
-    int i;
-
-    for (i=0; i<=0xff; ++i)
-    {
-	WriteReg(i, 0x00);
-    }
-}
-
-void Init(void)
-{
-    if (SDL_Init(SDL_INIT_TIMER) < 0)
-    {
-        fprintf(stderr, "Unable to initialise SDL timer\n");
-        exit(-1);
-    }
-
-    if (!OPL_Init(ADLIB_PORT))
-    {
-        fprintf(stderr, "Unable to initialise OPL layer\n");
-        exit(-1);
-    }
-}
-
-void Shutdown(void)
-{
-    OPL_Shutdown();
-}
-
-struct timer_data
-{
-    int running;
-    FILE *fstream;
-};
-
-void TimerCallback(void *data)
-{
-    struct timer_data *timer_data = data;
-    int delay;
-
-    if (!timer_data->running)
-    {
-        return;
-    }
-
-    // Read data until we must make a delay.
-
-    for (;;)
-    {
-        int reg, val;
-
-        // End of file?
-
-        if (feof(timer_data->fstream))
-        {
-            timer_data->running = 0;
-            return;
-        }
-
-        reg = fgetc(timer_data->fstream);
-        val = fgetc(timer_data->fstream);
-
-        // Register value of 0 or 1 indicates a delay.
-
-        if (reg == 0x00)
-        {
-            delay = val;
-            break;
-        }
-        else if (reg == 0x01)
-        {
-            val |= (fgetc(timer_data->fstream) << 8);
-            delay = val;
-            break;
-        }
-        else
-        {
-            WriteReg(reg, val);
-        }
-    }
-
-    // Schedule the next timer callback.
-
-    OPL_SetCallback(delay * OPL_MS, TimerCallback, timer_data);
-}
-
-void PlayFile(char *filename)
-{
-    struct timer_data timer_data;
-    int running;
-    char buf[8];
-
-    timer_data.fstream = fopen(filename, "rb");
-
-    if (timer_data.fstream == NULL)
-    {
-        fprintf(stderr, "Failed to open %s\n", filename);
-        exit(-1);
-    }
-
-    if (fread(buf, 1, 8, timer_data.fstream) < 8)
-    {
-        fprintf(stderr, "failed to read raw OPL header\n");
-        exit(-1);
-    }
-
-    if (strncmp(buf, HEADER_STRING, 8) != 0)
-    {
-        fprintf(stderr, "Raw OPL header not found\n");
-        exit(-1);
-    }
-
-    fseek(timer_data.fstream, 28, SEEK_SET);
-    timer_data.running = 1;
-
-    // Start callback loop sequence.
-
-    OPL_SetCallback(0, TimerCallback, &timer_data);
-
-    // Sleep until the playback finishes.
-
-    do
-    {
-        OPL_Lock();
-        running = timer_data.running;
-        OPL_Unlock();
-
-        SDL_Delay(100 * OPL_MS);
-    } while (running);
-
-    fclose(timer_data.fstream);
-}
-
-int main(int argc, char *argv[])
-{
-    if (argc < 2)
-    {
-        printf("Usage: %s <filename>\n", argv[0]);
-        exit(-1);
-    }
-
-    Init();
-
-    PlayFile(argv[1]);
-
-    ClearAllRegs();
-    Shutdown();
-
-    return 0;
-}
-
diff --git a/games/NXDoom/opl/ioperm_sys.c b/games/NXDoom/opl/ioperm_sys.c
deleted file mode 100644
index 6d0c63a5c..000000000
--- a/games/NXDoom/opl/ioperm_sys.c
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// Copyright(C) 2002, 2003 Marcel Telka
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Interface to the ioperm.sys driver, based on code from the
-//     Cygwin ioperm library.
-//
-
-#ifdef _WIN32
-
-#include <stdio.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winioctl.h>
-
-#include <errno.h>
-
-#include "ioperm_sys.h"
-
-#define IOPERM_FILE L"\\\\.\\ioperm"
-
-#define IOCTL_IOPERM               \
-    CTL_CODE(FILE_DEVICE_UNKNOWN, 0xA00, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-struct ioperm_data
-{
-    unsigned long from;
-    unsigned long num;
-    int turn_on;
-};
-
-// Function pointers for advapi32.dll.  This DLL does not exist on
-// Windows 9x, so they are dynamically loaded from the DLL at runtime.
-
-// haleyjd 09/09/10: Moved calling conventions into ()'s
-
-static SC_HANDLE (WINAPI *MyOpenSCManagerW)(wchar_t *lpMachineName,
-                                            wchar_t *lpDatabaseName,
-                                            DWORD dwDesiredAccess) = NULL;
-static SC_HANDLE (WINAPI *MyCreateServiceW)(SC_HANDLE hSCManager,
-                                            wchar_t *lpServiceName,
-                                            wchar_t *lpDisplayName,
-                                            DWORD dwDesiredAccess,
-                                            DWORD dwServiceType,
-                                            DWORD dwStartType,
-                                            DWORD dwErrorControl,
-                                            wchar_t *lpBinaryPathName,
-                                            wchar_t *lpLoadOrderGroup,
-                                            LPDWORD lpdwTagId,
-                                            wchar_t *lpDependencies,
-                                            wchar_t *lpServiceStartName,
-                                            wchar_t *lpPassword);
-static SC_HANDLE (WINAPI *MyOpenServiceW)(SC_HANDLE hSCManager,
-                                          wchar_t *lpServiceName,
-                                          DWORD dwDesiredAccess);
-static BOOL (WINAPI *MyStartServiceW)(SC_HANDLE hService,
-                                      DWORD dwNumServiceArgs,
-                                      wchar_t **lpServiceArgVectors);
-static BOOL (WINAPI *MyControlService)(SC_HANDLE hService,
-                                       DWORD dwControl,
-                                       LPSERVICE_STATUS lpServiceStatus);
-static BOOL (WINAPI *MyCloseServiceHandle)(SC_HANDLE hSCObject);
-static BOOL (WINAPI *MyDeleteService)(SC_HANDLE hService);
-
-static struct
-{
-    char *name;
-    void **fn;
-} dll_functions[] = {
-    { "OpenSCManagerW",     (void **) &MyOpenSCManagerW },
-    { "CreateServiceW",     (void **) &MyCreateServiceW },
-    { "OpenServiceW",       (void **) &MyOpenServiceW },
-    { "StartServiceW",      (void **) &MyStartServiceW },
-    { "ControlService",     (void **) &MyControlService },
-    { "CloseServiceHandle", (void **) &MyCloseServiceHandle },
-    { "DeleteService",      (void **) &MyDeleteService },
-};
-
-// Globals
-
-static SC_HANDLE scm = NULL;
-static SC_HANDLE svc = NULL;
-static int service_was_created = 0;
-static int service_was_started = 0;
-
-static int LoadLibraryPointers(void)
-{
-    HMODULE dll;
-    int i;
-
-    // Already loaded?
-
-    if (MyOpenSCManagerW != NULL)
-    {
-        return 1;
-    }
-
-    dll = LoadLibraryW(L"advapi32.dll");
-
-    if (dll == NULL)
-    {
-        fprintf(stderr, "LoadLibraryPointers: Failed to open advapi32.dll\n");
-        return 0;
-    }
-
-    for (i = 0; i < sizeof(dll_functions) / sizeof(*dll_functions); ++i)
-    {
-        *dll_functions[i].fn = GetProcAddress(dll, dll_functions[i].name);
-
-        if (*dll_functions[i].fn == NULL)
-        {
-            fprintf(stderr, "LoadLibraryPointers: Failed to get address "
-                            "for '%s'\n", dll_functions[i].name);
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-int IOperm_EnablePortRange(unsigned int from, unsigned int num, int turn_on)
-{
-    HANDLE h;
-    struct ioperm_data ioperm_data;
-    DWORD BytesReturned;
-    BOOL r;
-
-    h = CreateFileW(IOPERM_FILE, GENERIC_READ, 0, NULL,
-                    OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    if (h == INVALID_HANDLE_VALUE)
-    {
-        errno = ENODEV;
-        return -1;
-    }
-
-    ioperm_data.from = from;
-    ioperm_data.num = num;
-    ioperm_data.turn_on = turn_on;
-
-    r = DeviceIoControl(h, IOCTL_IOPERM,
-                        &ioperm_data, sizeof ioperm_data,
-                        NULL, 0,
-                        &BytesReturned, NULL);
-
-    if (!r)
-    {
-        errno = EPERM;
-    }
-
-    CloseHandle(h);
-
-    return r != 0;
-}
-
-// Load ioperm.sys driver.
-// Returns 1 for success, 0 for failure.
-// Remember to call IOperm_UninstallDriver to uninstall the driver later.
-
-int IOperm_InstallDriver(void)
-{
-    wchar_t driver_path[MAX_PATH];
-    int error;
-    int result = 1;
-
-    if (!LoadLibraryPointers())
-    {
-        return 0;
-    }
-
-    scm = MyOpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
-
-    if (scm == NULL)
-    {
-        error = GetLastError();
-        fprintf(stderr, "IOperm_InstallDriver: OpenSCManager failed (%i).\n",
-                        error);
-        return 0;
-    }
-
-    // Get the full path to the driver file.
-
-    GetFullPathNameW(L"ioperm.sys", MAX_PATH, driver_path, NULL);
-
-    // Create the service.
-
-    svc = MyCreateServiceW(scm,
-                           L"ioperm",
-                           L"ioperm support for Cygwin driver",
-                           SERVICE_ALL_ACCESS,
-                           SERVICE_KERNEL_DRIVER,
-                           SERVICE_AUTO_START,
-                           SERVICE_ERROR_NORMAL,
-                           driver_path,
-                           NULL,
-                           NULL,
-                           NULL,
-                           NULL,
-                           NULL);
-
-    if (svc == NULL)
-    {
-        error = GetLastError();
-
-        if (error != ERROR_SERVICE_EXISTS)
-        {
-            fprintf(stderr,
-                    "IOperm_InstallDriver: Failed to create service (%i).\n",
-                    error);
-        }
-        else
-        {
-            svc = MyOpenServiceW(scm, L"ioperm", SERVICE_ALL_ACCESS);
-
-            if (svc == NULL)
-            {
-                error = GetLastError();
-
-                fprintf(stderr,
-                        "IOperm_InstallDriver: Failed to open service (%i).\n",
-                        error);
-            }
-        }
-
-        if (svc == NULL)
-        {
-            MyCloseServiceHandle(scm);
-            return 0;
-        }
-    }
-    else
-    {
-        service_was_created = 1;
-    }
-
-    // Start the service.  If the service already existed, it might have
-    // already been running as well.
-
-    if (!MyStartServiceW(svc, 0, NULL))
-    {
-        error = GetLastError();
-
-        if (error != ERROR_SERVICE_ALREADY_RUNNING)
-        {
-            fprintf(stderr, "IOperm_InstallDriver: Failed to start service (%i).\n",
-                            error);
-
-            result = 0;
-        }
-        else
-        {
-            printf("IOperm_InstallDriver: ioperm driver already running.\n");
-        }
-    }
-    else
-    {
-        printf("IOperm_InstallDriver: ioperm driver installed.\n");
-        service_was_started = 1;
-    }
-
-    // If we failed to start the driver running, we need to clean up
-    // before finishing.
-
-    if (result == 0)
-    {
-        IOperm_UninstallDriver();
-    }
-
-    return result;
-}
-
-int IOperm_UninstallDriver(void)
-{
-    SERVICE_STATUS stat;
-    int result = 1;
-    int error;
-
-    // If we started the service, stop it.
-
-    if (service_was_started)
-    {
-        if (!MyControlService(svc, SERVICE_CONTROL_STOP, &stat))
-        {
-            error = GetLastError();
-
-            if (error == ERROR_SERVICE_NOT_ACTIVE)
-            {
-                fprintf(stderr,
-                        "IOperm_UninstallDriver: Service not active? (%i)\n",
-                        error);
-            }
-            else
-            {
-                fprintf(stderr,
-                        "IOperm_UninstallDriver: Failed to stop service (%i).\n",
-                        error);
-                result = 0;
-            }
-        }
-    }
-
-    // If we created the service, delete it.
-
-    if (service_was_created)
-    {
-        if (!MyDeleteService(svc))
-        {
-            error = GetLastError();
-
-            fprintf(stderr,
-                    "IOperm_UninstallDriver: DeleteService failed (%i).\n",
-                    error);
-
-            result = 0;
-        }
-        else if (service_was_started)
-        {
-            printf("IOperm_UnInstallDriver: ioperm driver uninstalled.\n");
-        }
-    }
-
-    // Close handles.
-
-    if (svc != NULL)
-    {
-        MyCloseServiceHandle(svc);
-        svc = NULL;
-    }
-
-    if (scm != NULL)
-    {
-        MyCloseServiceHandle(scm);
-        scm = NULL;
-    }
-
-    service_was_created = 0;
-    service_was_started = 0;
-
-    return result;
-}
-
-#endif /* #ifndef _WIN32 */
-
diff --git a/games/NXDoom/opl/ioperm_sys.h b/games/NXDoom/opl/ioperm_sys.h
deleted file mode 100644
index 1a27c3f12..000000000
--- a/games/NXDoom/opl/ioperm_sys.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Copyright(C) 2002, 2003 Marcel Telka
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Interface to the ioperm.sys driver, based on code from the
-//     Cygwin ioperm library.
-//
-
-#ifndef IOPERM_SYS_H
-#define IOPERM_SYS_H
-
-int IOperm_EnablePortRange(unsigned int from, unsigned int num, int turn_on);
-int IOperm_InstallDriver(void);
-int IOperm_UninstallDriver(void);
-
-#endif /* #ifndef IOPERM_SYS_H */
-
diff --git a/games/NXDoom/opl/opl.c b/games/NXDoom/opl/opl.c
deleted file mode 100644
index e99821cbb..000000000
--- a/games/NXDoom/opl/opl.c
+++ /dev/null
@@ -1,530 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL interface.
-//
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "SDL.h"
-
-#include "opl.h"
-#include "opl_internal.h"
-
-//#define OPL_DEBUG_TRACE
-
-#ifdef EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-
-static opl_driver_t *drivers[] =
-{
-#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
-    &opl_linux_driver,
-#endif
-#if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64)
-    &opl_openbsd_driver,
-#endif
-#ifdef _WIN32
-    &opl_win32_driver,
-#endif
-#ifndef DISABLE_SDL2MIXER
-    &opl_sdl_driver,
-#endif // DISABLE_SDL2MIXER
-    NULL
-};
-
-static opl_driver_t *driver = NULL;
-static int init_stage_reg_writes = 1;
-
-unsigned int opl_sample_rate = 22050;
-
-//
-// Init/shutdown code.
-//
-
-// Initialize the specified driver and detect an OPL chip.  Returns
-// true if an OPL is detected.
-
-static opl_init_result_t InitDriver(opl_driver_t *_driver,
-                                    unsigned int port_base)
-{
-    opl_init_result_t result1, result2;
-
-    // Initialize the driver.
-
-    if (!_driver->init_func(port_base))
-    {
-        return OPL_INIT_NONE;
-    }
-
-    // The driver was initialized okay, so we now have somewhere
-    // to write to.  It doesn't mean there's an OPL chip there,
-    // though.  Perform the detection sequence to make sure.
-    // (it's done twice, like how Doom does it).
-
-    driver = _driver;
-    init_stage_reg_writes = 1;
-
-    result1 = OPL_Detect();
-    result2 = OPL_Detect();
-    if (result1 == OPL_INIT_NONE || result2 == OPL_INIT_NONE)
-    {
-        printf("OPL_Init: No OPL detected using '%s' driver.\n", _driver->name);
-        _driver->shutdown_func();
-        driver = NULL;
-        return OPL_INIT_NONE;
-    }
-
-    init_stage_reg_writes = 0;
-
-    printf("OPL_Init: Using driver '%s'.\n", driver->name);
-
-    return result2;
-}
-
-// Find a driver automatically by trying each in the list.
-
-static opl_init_result_t AutoSelectDriver(unsigned int port_base)
-{
-    int i;
-    opl_init_result_t result;
-
-    for (i = 0; drivers[i] != NULL; ++i)
-    {
-        result = InitDriver(drivers[i], port_base);
-        if (result != OPL_INIT_NONE)
-        {
-            return result;
-        }
-    }
-
-    printf("OPL_Init: Failed to find a working driver.\n");
-
-    return OPL_INIT_NONE;
-}
-
-// Initialize the OPL library. Return value indicates type of OPL chip
-// detected, if any.
-
-opl_init_result_t OPL_Init(unsigned int port_base)
-{
-    char *driver_name;
-    int i;
-    int result;
-
-    driver_name = getenv("OPL_DRIVER");
-
-    if (driver_name != NULL)
-    {
-        // Search the list until we find the driver with this name.
-
-        for (i=0; drivers[i] != NULL; ++i)
-        {
-            if (!strcmp(driver_name, drivers[i]->name))
-            {
-                result = InitDriver(drivers[i], port_base);
-                if (result)
-                {
-                    return result;
-                }
-                else
-                {
-                    printf("OPL_Init: Failed to initialize "
-                           "driver: '%s'.\n", driver_name);
-                    return OPL_INIT_NONE;
-                }
-            }
-        }
-
-        printf("OPL_Init: unknown driver: '%s'.\n", driver_name);
-
-        return OPL_INIT_NONE;
-    }
-    else
-    {
-        return AutoSelectDriver(port_base);
-    }
-}
-
-// Shut down the OPL library.
-
-void OPL_Shutdown(void)
-{
-    if (driver != NULL)
-    {
-        driver->shutdown_func();
-        driver = NULL;
-    }
-}
-
-// Set the sample rate used for software OPL emulation.
-
-void OPL_SetSampleRate(unsigned int rate)
-{
-    opl_sample_rate = rate;
-}
-
-void OPL_WritePort(opl_port_t port, unsigned int value)
-{
-    if (driver != NULL)
-    {
-#ifdef OPL_DEBUG_TRACE
-        printf("OPL_write: %i, %x\n", port, value);
-        fflush(stdout);
-#endif
-        driver->write_port_func(port, value);
-    }
-}
-
-unsigned int OPL_ReadPort(opl_port_t port)
-{
-    if (driver != NULL)
-    {
-        unsigned int result;
-
-#ifdef OPL_DEBUG_TRACE
-        printf("OPL_read: %i...\n", port);
-        fflush(stdout);
-#endif
-
-        result = driver->read_port_func(port);
-
-#ifdef OPL_DEBUG_TRACE
-        printf("OPL_read: %i -> %x\n", port, result);
-        fflush(stdout);
-#endif
-
-        return result;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-//
-// Higher-level functions, based on the lower-level functions above
-// (register write, etc).
-//
-
-unsigned int OPL_ReadStatus(void)
-{
-    return OPL_ReadPort(OPL_REGISTER_PORT);
-}
-
-// Write an OPL register value
-
-void OPL_WriteRegister(int reg, int value)
-{
-    int i;
-
-    if (reg & 0x100)
-    {
-        OPL_WritePort(OPL_REGISTER_PORT_OPL3, reg);
-    }
-    else
-    {
-        OPL_WritePort(OPL_REGISTER_PORT, reg);
-    }
-
-    // For timing, read the register port six times after writing the
-    // register number to cause the appropriate delay
-
-    for (i=0; i<6; ++i)
-    {
-        // An oddity of the Doom OPL code: at startup initialization,
-        // the spacing here is performed by reading from the register
-        // port; after initialization, the data port is read, instead.
-
-        if (init_stage_reg_writes)
-        {
-            OPL_ReadPort(OPL_REGISTER_PORT);
-        }
-        else
-        {
-            OPL_ReadPort(OPL_DATA_PORT);
-        }
-    }
-
-    OPL_WritePort(OPL_DATA_PORT, value);
-
-    // Read the register port 24 times after writing the value to
-    // cause the appropriate delay
-
-    for (i=0; i<24; ++i)
-    {
-        OPL_ReadStatus();
-    }
-}
-
-// Detect the presence of an OPL chip
-
-opl_init_result_t OPL_Detect(void)
-{
-    int result1, result2;
-    int i;
-
-    // Reset both timers:
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x60);
-
-    // Enable interrupts:
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x80);
-
-    // Read status
-    result1 = OPL_ReadStatus();
-
-    // Set timer:
-    OPL_WriteRegister(OPL_REG_TIMER1, 0xff);
-
-    // Start timer 1:
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x21);
-
-    // Wait for 80 microseconds
-    // This is how Doom does it:
-
-    for (i=0; i<200; ++i)
-    {
-        OPL_ReadStatus();
-    }
-
-    OPL_Delay(1 * OPL_MS);
-
-    // Read status
-    result2 = OPL_ReadStatus();
-
-    // Reset both timers:
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x60);
-
-    // Enable interrupts:
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL, 0x80);
-
-    if ((result1 & 0xe0) == 0x00 && (result2 & 0xe0) == 0xc0)
-    {
-        result1 = OPL_ReadPort(OPL_REGISTER_PORT);
-        result2 = OPL_ReadPort(OPL_REGISTER_PORT_OPL3);
-        if (result1 == 0x00)
-        {
-            return OPL_INIT_OPL3;
-        }
-        else
-        {
-            return OPL_INIT_OPL2;
-        }
-    }
-    else
-    {
-        return OPL_INIT_NONE;
-    }
-}
-
-// Initialize registers on startup
-
-void OPL_InitRegisters(int opl3)
-{
-    int r;
-
-    // Initialize level registers
-
-    for (r=OPL_REGS_LEVEL; r <= OPL_REGS_LEVEL + OPL_NUM_OPERATORS; ++r)
-    {
-        OPL_WriteRegister(r, 0x3f);
-    }
-
-    // Initialize other registers
-    // These two loops write to registers that actually don't exist,
-    // but this is what Doom does ...
-    // Similarly, the <= is also intenational.
-
-    for (r=OPL_REGS_ATTACK; r <= OPL_REGS_WAVEFORM + OPL_NUM_OPERATORS; ++r)
-    {
-        OPL_WriteRegister(r, 0x00);
-    }
-
-    // More registers ...
-
-    for (r=1; r < OPL_REGS_LEVEL; ++r)
-    {
-        OPL_WriteRegister(r, 0x00);
-    }
-
-    // Re-initialize the low registers:
-
-    // Reset both timers and enable interrupts:
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL,      0x60);
-    OPL_WriteRegister(OPL_REG_TIMER_CTRL,      0x80);
-
-    // "Allow FM chips to control the waveform of each operator":
-    OPL_WriteRegister(OPL_REG_WAVEFORM_ENABLE, 0x20);
-
-    if (opl3)
-    {
-        OPL_WriteRegister(OPL_REG_NEW, 0x01);
-
-        // Initialize level registers
-
-        for (r=OPL_REGS_LEVEL; r <= OPL_REGS_LEVEL + OPL_NUM_OPERATORS; ++r)
-        {
-            OPL_WriteRegister(r | 0x100, 0x3f);
-        }
-
-        // Initialize other registers
-        // These two loops write to registers that actually don't exist,
-        // but this is what Doom does ...
-        // Similarly, the <= is also intenational.
-
-        for (r=OPL_REGS_ATTACK; r <= OPL_REGS_WAVEFORM + OPL_NUM_OPERATORS; ++r)
-        {
-            OPL_WriteRegister(r | 0x100, 0x00);
-        }
-
-        // More registers ...
-
-        for (r=1; r < OPL_REGS_LEVEL; ++r)
-        {
-            OPL_WriteRegister(r | 0x100, 0x00);
-        }
-    }
-
-    // Keyboard split point on (?)
-    OPL_WriteRegister(OPL_REG_FM_MODE,         0x40);
-
-    if (opl3)
-    {
-        OPL_WriteRegister(OPL_REG_NEW, 0x01);
-    }
-}
-
-//
-// Timer functions.
-//
-
-void OPL_SetCallback(uint64_t us, opl_callback_t callback, void *data)
-{
-    if (driver != NULL)
-    {
-        driver->set_callback_func(us, callback, data);
-    }
-}
-
-void OPL_ClearCallbacks(void)
-{
-    if (driver != NULL)
-    {
-        driver->clear_callbacks_func();
-    }
-}
-
-void OPL_Lock(void)
-{
-    if (driver != NULL)
-    {
-        driver->lock_func();
-    }
-}
-
-void OPL_Unlock(void)
-{
-    if (driver != NULL)
-    {
-        driver->unlock_func();
-    }
-}
-
-typedef struct
-{
-    int finished;
-
-    SDL_mutex *mutex;
-    SDL_cond *cond;
-} delay_data_t;
-
-static void DelayCallback(void *_delay_data)
-{
-    delay_data_t *delay_data = _delay_data;
-
-    SDL_LockMutex(delay_data->mutex);
-    delay_data->finished = 1;
-
-    SDL_CondSignal(delay_data->cond);
-
-    SDL_UnlockMutex(delay_data->mutex);
-}
-
-// Delay for specified number of microseconds after OPL subsystem is initialized
-
-void OPL_Delay(uint64_t us)
-{
-    delay_data_t delay_data;
-
-    if (driver == NULL)
-    {
-        return;
-    }
-
-    // Create a callback that will signal this thread after the
-    // specified time.
-
-    // Note that this is not just a simple time-based delay, it will ensure
-    // that the OPL system is initialized and the queue has begun processing
-    // before releasing the mutex lock
-
-    delay_data.finished = 0;
-    delay_data.mutex = SDL_CreateMutex();
-    delay_data.cond = SDL_CreateCond();
-
-    OPL_SetCallback(us, DelayCallback, &delay_data);
-
-    // Wait until the callback is invoked.
-
-    SDL_LockMutex(delay_data.mutex);
-
-    while (!delay_data.finished)
-    {
-        SDL_CondWait(delay_data.cond, delay_data.mutex);
-#ifdef EMSCRIPTEN
-        // Use async sleep to avoid locking browser main thread
-        emscripten_sleep(us / 1000);
-#endif
-    }
-
-    SDL_UnlockMutex(delay_data.mutex);
-
-    // Clean up.
-
-    SDL_DestroyMutex(delay_data.mutex);
-    SDL_DestroyCond(delay_data.cond);
-}
-
-void OPL_SetPaused(int paused)
-{
-    if (driver != NULL)
-    {
-        driver->set_paused_func(paused);
-    }
-}
-
-void OPL_AdjustCallbacks(float value)
-{
-    if (driver != NULL)
-    {
-        driver->adjust_callbacks_func(value);
-    }
-}
-
diff --git a/games/NXDoom/opl/opl.h b/games/NXDoom/opl/opl.h
deleted file mode 100644
index deaa442dd..000000000
--- a/games/NXDoom/opl/opl.h
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL interface.
-//
-
-
-#ifndef OPL_OPL_H
-#define OPL_OPL_H
-
-#include <inttypes.h>
-
-typedef void (*opl_callback_t)(void *data);
-
-// Result from OPL_Init(), indicating what type of OPL chip was detected,
-// if any.
-typedef enum
-{
-    OPL_INIT_NONE,
-    OPL_INIT_OPL2,
-    OPL_INIT_OPL3,
-} opl_init_result_t;
-
-typedef enum
-{
-    OPL_REGISTER_PORT = 0,
-    OPL_DATA_PORT = 1,
-    OPL_REGISTER_PORT_OPL3 = 2
-} opl_port_t;
-
-#define OPL_NUM_OPERATORS   21
-#define OPL_NUM_VOICES      9
-
-#define OPL_REG_WAVEFORM_ENABLE   0x01
-#define OPL_REG_TIMER1            0x02
-#define OPL_REG_TIMER2            0x03
-#define OPL_REG_TIMER_CTRL        0x04
-#define OPL_REG_FM_MODE           0x08
-#define OPL_REG_NEW               0x105
-
-// Operator registers (21 of each):
-
-#define OPL_REGS_TREMOLO          0x20
-#define OPL_REGS_LEVEL            0x40
-#define OPL_REGS_ATTACK           0x60
-#define OPL_REGS_SUSTAIN          0x80
-#define OPL_REGS_WAVEFORM         0xE0
-
-// Voice registers (9 of each):
-
-#define OPL_REGS_FREQ_1           0xA0
-#define OPL_REGS_FREQ_2           0xB0
-#define OPL_REGS_FEEDBACK         0xC0
-
-// Times
-
-#define OPL_SECOND ((uint64_t) 1000 * 1000)
-#define OPL_MS     ((uint64_t) 1000)
-#define OPL_US     ((uint64_t) 1)
-
-//
-// Low-level functions.
-//
-
-// Initialize the OPL subsystem.
-
-opl_init_result_t OPL_Init(unsigned int port_base);
-
-// Shut down the OPL subsystem.
-
-void OPL_Shutdown(void);
-
-// Set the sample rate used for software emulation.
-
-void OPL_SetSampleRate(unsigned int rate);
-
-// Write to one of the OPL I/O ports:
-
-void OPL_WritePort(opl_port_t port, unsigned int value);
-
-// Read from one of the OPL I/O ports:
-
-unsigned int OPL_ReadPort(opl_port_t port);
-
-//
-// Higher-level functions.
-//
-
-// Read the cuurrent status byte of the OPL chip.
-
-unsigned int OPL_ReadStatus(void);
-
-// Write to an OPL register.
-
-void OPL_WriteRegister(int reg, int value);
-
-// Perform a detection sequence to determine that an
-// OPL chip is present.
-
-opl_init_result_t OPL_Detect(void);
-
-// Initialize all registers, performed on startup.
-
-void OPL_InitRegisters(int opl3);
-
-//
-// Timer callback functions.
-//
-
-// Set a timer callback.  After the specified number of microseconds
-// have elapsed, the callback will be invoked.
-
-void OPL_SetCallback(uint64_t us, opl_callback_t callback, void *data);
-
-// Adjust callback times by the specified factor. For example, a value of
-// 0.5 will halve all remaining times.
-
-void OPL_AdjustCallbacks(float factor);
-
-// Clear all OPL callbacks that have been set.
-
-void OPL_ClearCallbacks(void);
-
-// Begin critical section, during which, OPL callbacks will not be
-// invoked.
-
-void OPL_Lock(void);
-
-// End critical section.
-
-void OPL_Unlock(void);
-
-// Block until the specified number of microseconds have elapsed.
-
-void OPL_Delay(uint64_t us);
-
-// Pause the OPL callbacks.
-
-void OPL_SetPaused(int paused);
-
-#endif
-
diff --git a/games/NXDoom/opl/opl3.c b/games/NXDoom/opl/opl3.c
deleted file mode 100644
index f5bca4c4e..000000000
--- a/games/NXDoom/opl/opl3.c
+++ /dev/null
@@ -1,1377 +0,0 @@
-//
-// Copyright (C) 2013-2018 Alexey Khokholov (Nuke.YKT)
-//
-// 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.
-//
-//
-//  Nuked OPL3 emulator.
-//  Thanks:
-//      MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
-//          Feedback and Rhythm part calculation information.
-//      forums.submarine.org.uk(carbon14, opl3):
-//          Tremolo and phase generator calculation information.
-//      OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
-//          OPL2 ROMs.
-//      siliconpr0n.org(John McMaster, digshadow):
-//          YMF262 and VRC VII decaps and die shots.
-//
-// version: 1.8
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "opl3.h"
-
-#define RSM_FRAC    10
-
-// Channel types
-
-enum {
-    ch_2op = 0,
-    ch_4op = 1,
-    ch_4op2 = 2,
-    ch_drum = 3
-};
-
-// Envelope key types
-
-enum {
-    egk_norm = 0x01,
-    egk_drum = 0x02
-};
-
-
-//
-// logsin table
-//
-
-static const Bit16u logsinrom[256] = {
-    0x859, 0x6c3, 0x607, 0x58b, 0x52e, 0x4e4, 0x4a6, 0x471,
-    0x443, 0x41a, 0x3f5, 0x3d3, 0x3b5, 0x398, 0x37e, 0x365,
-    0x34e, 0x339, 0x324, 0x311, 0x2ff, 0x2ed, 0x2dc, 0x2cd,
-    0x2bd, 0x2af, 0x2a0, 0x293, 0x286, 0x279, 0x26d, 0x261,
-    0x256, 0x24b, 0x240, 0x236, 0x22c, 0x222, 0x218, 0x20f,
-    0x206, 0x1fd, 0x1f5, 0x1ec, 0x1e4, 0x1dc, 0x1d4, 0x1cd,
-    0x1c5, 0x1be, 0x1b7, 0x1b0, 0x1a9, 0x1a2, 0x19b, 0x195,
-    0x18f, 0x188, 0x182, 0x17c, 0x177, 0x171, 0x16b, 0x166,
-    0x160, 0x15b, 0x155, 0x150, 0x14b, 0x146, 0x141, 0x13c,
-    0x137, 0x133, 0x12e, 0x129, 0x125, 0x121, 0x11c, 0x118,
-    0x114, 0x10f, 0x10b, 0x107, 0x103, 0x0ff, 0x0fb, 0x0f8,
-    0x0f4, 0x0f0, 0x0ec, 0x0e9, 0x0e5, 0x0e2, 0x0de, 0x0db,
-    0x0d7, 0x0d4, 0x0d1, 0x0cd, 0x0ca, 0x0c7, 0x0c4, 0x0c1,
-    0x0be, 0x0bb, 0x0b8, 0x0b5, 0x0b2, 0x0af, 0x0ac, 0x0a9,
-    0x0a7, 0x0a4, 0x0a1, 0x09f, 0x09c, 0x099, 0x097, 0x094,
-    0x092, 0x08f, 0x08d, 0x08a, 0x088, 0x086, 0x083, 0x081,
-    0x07f, 0x07d, 0x07a, 0x078, 0x076, 0x074, 0x072, 0x070,
-    0x06e, 0x06c, 0x06a, 0x068, 0x066, 0x064, 0x062, 0x060,
-    0x05e, 0x05c, 0x05b, 0x059, 0x057, 0x055, 0x053, 0x052,
-    0x050, 0x04e, 0x04d, 0x04b, 0x04a, 0x048, 0x046, 0x045,
-    0x043, 0x042, 0x040, 0x03f, 0x03e, 0x03c, 0x03b, 0x039,
-    0x038, 0x037, 0x035, 0x034, 0x033, 0x031, 0x030, 0x02f,
-    0x02e, 0x02d, 0x02b, 0x02a, 0x029, 0x028, 0x027, 0x026,
-    0x025, 0x024, 0x023, 0x022, 0x021, 0x020, 0x01f, 0x01e,
-    0x01d, 0x01c, 0x01b, 0x01a, 0x019, 0x018, 0x017, 0x017,
-    0x016, 0x015, 0x014, 0x014, 0x013, 0x012, 0x011, 0x011,
-    0x010, 0x00f, 0x00f, 0x00e, 0x00d, 0x00d, 0x00c, 0x00c,
-    0x00b, 0x00a, 0x00a, 0x009, 0x009, 0x008, 0x008, 0x007,
-    0x007, 0x007, 0x006, 0x006, 0x005, 0x005, 0x005, 0x004,
-    0x004, 0x004, 0x003, 0x003, 0x003, 0x002, 0x002, 0x002,
-    0x002, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001,
-    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000
-};
-
-//
-// exp table
-//
-
-static const Bit16u exprom[256] = {
-    0x7fa, 0x7f5, 0x7ef, 0x7ea, 0x7e4, 0x7df, 0x7da, 0x7d4,
-    0x7cf, 0x7c9, 0x7c4, 0x7bf, 0x7b9, 0x7b4, 0x7ae, 0x7a9,
-    0x7a4, 0x79f, 0x799, 0x794, 0x78f, 0x78a, 0x784, 0x77f,
-    0x77a, 0x775, 0x770, 0x76a, 0x765, 0x760, 0x75b, 0x756,
-    0x751, 0x74c, 0x747, 0x742, 0x73d, 0x738, 0x733, 0x72e,
-    0x729, 0x724, 0x71f, 0x71a, 0x715, 0x710, 0x70b, 0x706,
-    0x702, 0x6fd, 0x6f8, 0x6f3, 0x6ee, 0x6e9, 0x6e5, 0x6e0,
-    0x6db, 0x6d6, 0x6d2, 0x6cd, 0x6c8, 0x6c4, 0x6bf, 0x6ba,
-    0x6b5, 0x6b1, 0x6ac, 0x6a8, 0x6a3, 0x69e, 0x69a, 0x695,
-    0x691, 0x68c, 0x688, 0x683, 0x67f, 0x67a, 0x676, 0x671,
-    0x66d, 0x668, 0x664, 0x65f, 0x65b, 0x657, 0x652, 0x64e,
-    0x649, 0x645, 0x641, 0x63c, 0x638, 0x634, 0x630, 0x62b,
-    0x627, 0x623, 0x61e, 0x61a, 0x616, 0x612, 0x60e, 0x609,
-    0x605, 0x601, 0x5fd, 0x5f9, 0x5f5, 0x5f0, 0x5ec, 0x5e8,
-    0x5e4, 0x5e0, 0x5dc, 0x5d8, 0x5d4, 0x5d0, 0x5cc, 0x5c8,
-    0x5c4, 0x5c0, 0x5bc, 0x5b8, 0x5b4, 0x5b0, 0x5ac, 0x5a8,
-    0x5a4, 0x5a0, 0x59c, 0x599, 0x595, 0x591, 0x58d, 0x589,
-    0x585, 0x581, 0x57e, 0x57a, 0x576, 0x572, 0x56f, 0x56b,
-    0x567, 0x563, 0x560, 0x55c, 0x558, 0x554, 0x551, 0x54d,
-    0x549, 0x546, 0x542, 0x53e, 0x53b, 0x537, 0x534, 0x530,
-    0x52c, 0x529, 0x525, 0x522, 0x51e, 0x51b, 0x517, 0x514,
-    0x510, 0x50c, 0x509, 0x506, 0x502, 0x4ff, 0x4fb, 0x4f8,
-    0x4f4, 0x4f1, 0x4ed, 0x4ea, 0x4e7, 0x4e3, 0x4e0, 0x4dc,
-    0x4d9, 0x4d6, 0x4d2, 0x4cf, 0x4cc, 0x4c8, 0x4c5, 0x4c2,
-    0x4be, 0x4bb, 0x4b8, 0x4b5, 0x4b1, 0x4ae, 0x4ab, 0x4a8,
-    0x4a4, 0x4a1, 0x49e, 0x49b, 0x498, 0x494, 0x491, 0x48e,
-    0x48b, 0x488, 0x485, 0x482, 0x47e, 0x47b, 0x478, 0x475,
-    0x472, 0x46f, 0x46c, 0x469, 0x466, 0x463, 0x460, 0x45d,
-    0x45a, 0x457, 0x454, 0x451, 0x44e, 0x44b, 0x448, 0x445,
-    0x442, 0x43f, 0x43c, 0x439, 0x436, 0x433, 0x430, 0x42d,
-    0x42a, 0x428, 0x425, 0x422, 0x41f, 0x41c, 0x419, 0x416,
-    0x414, 0x411, 0x40e, 0x40b, 0x408, 0x406, 0x403, 0x400
-};
-
-//
-// freq mult table multiplied by 2
-//
-// 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 12, 12, 15, 15
-//
-
-static const Bit8u mt[16] = {
-    1, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 20, 24, 24, 30, 30
-};
-
-//
-// ksl table
-//
-
-static const Bit8u kslrom[16] = {
-    0, 32, 40, 45, 48, 51, 53, 55, 56, 58, 59, 60, 61, 62, 63, 64
-};
-
-static const Bit8u kslshift[4] = {
-    8, 1, 2, 0
-};
-
-//
-// envelope generator constants
-//
-
-static const Bit8u eg_incstep[4][4] = {
-    { 0, 0, 0, 0 },
-    { 1, 0, 0, 0 },
-    { 1, 0, 1, 0 },
-    { 1, 1, 1, 0 }
-};
-
-//
-// address decoding
-//
-
-static const Bit8s ad_slot[0x20] = {
-    0, 1, 2, 3, 4, 5, -1, -1, 6, 7, 8, 9, 10, 11, -1, -1,
-    12, 13, 14, 15, 16, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-};
-
-static const Bit8u ch_slot[18] = {
-    0, 1, 2, 6, 7, 8, 12, 13, 14, 18, 19, 20, 24, 25, 26, 30, 31, 32
-};
-
-//
-// Envelope generator
-//
-
-typedef Bit16s(*envelope_sinfunc)(Bit16u phase, Bit16u envelope);
-typedef void(*envelope_genfunc)(opl3_slot *slott);
-
-static Bit16s OPL3_EnvelopeCalcExp(Bit32u level)
-{
-    if (level > 0x1fff)
-    {
-        level = 0x1fff;
-    }
-    return (exprom[level & 0xff] << 1) >> (level >> 8);
-}
-
-static Bit16s OPL3_EnvelopeCalcSin0(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    Bit16u neg = 0;
-    phase &= 0x3ff;
-    if (phase & 0x200)
-    {
-        neg = 0xffff;
-    }
-    if (phase & 0x100)
-    {
-        out = logsinrom[(phase & 0xff) ^ 0xff];
-    }
-    else
-    {
-        out = logsinrom[phase & 0xff];
-    }
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
-}
-
-static Bit16s OPL3_EnvelopeCalcSin1(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    phase &= 0x3ff;
-    if (phase & 0x200)
-    {
-        out = 0x1000;
-    }
-    else if (phase & 0x100)
-    {
-        out = logsinrom[(phase & 0xff) ^ 0xff];
-    }
-    else
-    {
-        out = logsinrom[phase & 0xff];
-    }
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
-}
-
-static Bit16s OPL3_EnvelopeCalcSin2(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    phase &= 0x3ff;
-    if (phase & 0x100)
-    {
-        out = logsinrom[(phase & 0xff) ^ 0xff];
-    }
-    else
-    {
-        out = logsinrom[phase & 0xff];
-    }
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
-}
-
-static Bit16s OPL3_EnvelopeCalcSin3(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    phase &= 0x3ff;
-    if (phase & 0x100)
-    {
-        out = 0x1000;
-    }
-    else
-    {
-        out = logsinrom[phase & 0xff];
-    }
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
-}
-
-static Bit16s OPL3_EnvelopeCalcSin4(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    Bit16u neg = 0;
-    phase &= 0x3ff;
-    if ((phase & 0x300) == 0x100)
-    {
-        neg = 0xffff;
-    }
-    if (phase & 0x200)
-    {
-        out = 0x1000;
-    }
-    else if (phase & 0x80)
-    {
-        out = logsinrom[((phase ^ 0xff) << 1) & 0xff];
-    }
-    else
-    {
-        out = logsinrom[(phase << 1) & 0xff];
-    }
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
-}
-
-static Bit16s OPL3_EnvelopeCalcSin5(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    phase &= 0x3ff;
-    if (phase & 0x200)
-    {
-        out = 0x1000;
-    }
-    else if (phase & 0x80)
-    {
-        out = logsinrom[((phase ^ 0xff) << 1) & 0xff];
-    }
-    else
-    {
-        out = logsinrom[(phase << 1) & 0xff];
-    }
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3));
-}
-
-static Bit16s OPL3_EnvelopeCalcSin6(Bit16u phase, Bit16u envelope)
-{
-    Bit16u neg = 0;
-    phase &= 0x3ff;
-    if (phase & 0x200)
-    {
-        neg = 0xffff;
-    }
-    return OPL3_EnvelopeCalcExp(envelope << 3) ^ neg;
-}
-
-static Bit16s OPL3_EnvelopeCalcSin7(Bit16u phase, Bit16u envelope)
-{
-    Bit16u out = 0;
-    Bit16u neg = 0;
-    phase &= 0x3ff;
-    if (phase & 0x200)
-    {
-        neg = 0xffff;
-        phase = (phase & 0x1ff) ^ 0x1ff;
-    }
-    out = phase << 3;
-    return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
-}
-
-static const envelope_sinfunc envelope_sin[8] = {
-    OPL3_EnvelopeCalcSin0,
-    OPL3_EnvelopeCalcSin1,
-    OPL3_EnvelopeCalcSin2,
-    OPL3_EnvelopeCalcSin3,
-    OPL3_EnvelopeCalcSin4,
-    OPL3_EnvelopeCalcSin5,
-    OPL3_EnvelopeCalcSin6,
-    OPL3_EnvelopeCalcSin7
-};
-
-enum envelope_gen_num
-{
-    envelope_gen_num_attack = 0,
-    envelope_gen_num_decay = 1,
-    envelope_gen_num_sustain = 2,
-    envelope_gen_num_release = 3
-};
-
-static void OPL3_EnvelopeUpdateKSL(opl3_slot *slot)
-{
-    Bit16s ksl = (kslrom[slot->channel->f_num >> 6] << 2)
-               - ((0x08 - slot->channel->block) << 5);
-    if (ksl < 0)
-    {
-        ksl = 0;
-    }
-    slot->eg_ksl = (Bit8u)ksl;
-}
-
-static void OPL3_EnvelopeCalc(opl3_slot *slot)
-{
-    Bit8u nonzero;
-    Bit8u rate;
-    Bit8u rate_hi;
-    Bit8u rate_lo;
-    Bit8u reg_rate = 0;
-    Bit8u ks;
-    Bit8u eg_shift, shift;
-    Bit16u eg_rout;
-    Bit16s eg_inc;
-    Bit8u eg_off;
-    Bit8u reset = 0;
-    slot->eg_out = slot->eg_rout + (slot->reg_tl << 2)
-                 + (slot->eg_ksl >> kslshift[slot->reg_ksl]) + *slot->trem;
-    if (slot->key && slot->eg_gen == envelope_gen_num_release)
-    {
-        reset = 1;
-        reg_rate = slot->reg_ar;
-    }
-    else
-    {
-        switch (slot->eg_gen)
-        {
-        case envelope_gen_num_attack:
-            reg_rate = slot->reg_ar;
-            break;
-        case envelope_gen_num_decay:
-            reg_rate = slot->reg_dr;
-            break;
-        case envelope_gen_num_sustain:
-            if (!slot->reg_type)
-            {
-                reg_rate = slot->reg_rr;
-            }
-            break;
-        case envelope_gen_num_release:
-            reg_rate = slot->reg_rr;
-            break;
-        }
-    }
-    slot->pg_reset = reset;
-    ks = slot->channel->ksv >> ((slot->reg_ksr ^ 1) << 1);
-    nonzero = (reg_rate != 0);
-    rate = ks + (reg_rate << 2);
-    rate_hi = rate >> 2;
-    rate_lo = rate & 0x03;
-    if (rate_hi & 0x10)
-    {
-        rate_hi = 0x0f;
-    }
-    eg_shift = rate_hi + slot->chip->eg_add;
-    shift = 0;
-    if (nonzero)
-    {
-        if (rate_hi < 12)
-        {
-            if (slot->chip->eg_state)
-            {
-                switch (eg_shift)
-                {
-                case 12:
-                    shift = 1;
-                    break;
-                case 13:
-                    shift = (rate_lo >> 1) & 0x01;
-                    break;
-                case 14:
-                    shift = rate_lo & 0x01;
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-        else
-        {
-            shift = (rate_hi & 0x03) + eg_incstep[rate_lo][slot->chip->timer & 0x03];
-            if (shift & 0x04)
-            {
-                shift = 0x03;
-            }
-            if (!shift)
-            {
-                shift = slot->chip->eg_state;
-            }
-        }
-    }
-    eg_rout = slot->eg_rout;
-    eg_inc = 0;
-    eg_off = 0;
-    // Instant attack
-    if (reset && rate_hi == 0x0f)
-    {
-        eg_rout = 0x00;
-    }
-    // Envelope off
-    if ((slot->eg_rout & 0x1f8) == 0x1f8)
-    {
-        eg_off = 1;
-    }
-    if (slot->eg_gen != envelope_gen_num_attack && !reset && eg_off)
-    {
-        eg_rout = 0x1ff;
-    }
-    switch (slot->eg_gen)
-    {
-    case envelope_gen_num_attack:
-        if (!slot->eg_rout)
-        {
-            slot->eg_gen = envelope_gen_num_decay;
-        }
-        else if (slot->key && shift > 0 && rate_hi != 0x0f)
-        {
-            eg_inc = ((~slot->eg_rout) << shift) >> 4;
-        }
-        break;
-    case envelope_gen_num_decay:
-        if ((slot->eg_rout >> 4) == slot->reg_sl)
-        {
-            slot->eg_gen = envelope_gen_num_sustain;
-        }
-        else if (!eg_off && !reset && shift > 0)
-        {
-            eg_inc = 1 << (shift - 1);
-        }
-        break;
-    case envelope_gen_num_sustain:
-    case envelope_gen_num_release:
-        if (!eg_off && !reset && shift > 0)
-        {
-            eg_inc = 1 << (shift - 1);
-        }
-        break;
-    }
-    slot->eg_rout = (eg_rout + eg_inc) & 0x1ff;
-    // Key off
-    if (reset)
-    {
-        slot->eg_gen = envelope_gen_num_attack;
-    }
-    if (!slot->key)
-    {
-        slot->eg_gen = envelope_gen_num_release;
-    }
-}
-
-static void OPL3_EnvelopeKeyOn(opl3_slot *slot, Bit8u type)
-{
-    slot->key |= type;
-}
-
-static void OPL3_EnvelopeKeyOff(opl3_slot *slot, Bit8u type)
-{
-    slot->key &= ~type;
-}
-
-//
-// Phase Generator
-//
-
-static void OPL3_PhaseGenerate(opl3_slot *slot)
-{
-    opl3_chip *chip;
-    Bit16u f_num;
-    Bit32u basefreq;
-    Bit8u rm_xor, n_bit;
-    Bit32u noise;
-    Bit16u phase;
-
-    chip = slot->chip;
-    f_num = slot->channel->f_num;
-    if (slot->reg_vib)
-    {
-        Bit8s range;
-        Bit8u vibpos;
-
-        range = (f_num >> 7) & 7;
-        vibpos = slot->chip->vibpos;
-
-        if (!(vibpos & 3))
-        {
-            range = 0;
-        }
-        else if (vibpos & 1)
-        {
-            range >>= 1;
-        }
-        range >>= slot->chip->vibshift;
-
-        if (vibpos & 4)
-        {
-            range = -range;
-        }
-        f_num += range;
-    }
-    basefreq = (f_num << slot->channel->block) >> 1;
-    phase = (Bit16u)(slot->pg_phase >> 9);
-    if (slot->pg_reset)
-    {
-        slot->pg_phase = 0;
-    }
-    slot->pg_phase += (basefreq * mt[slot->reg_mult]) >> 1;
-    // Rhythm mode
-    noise = chip->noise;
-    slot->pg_phase_out = phase;
-    if (slot->slot_num == 13) // hh
-    {
-        chip->rm_hh_bit2 = (phase >> 2) & 1;
-        chip->rm_hh_bit3 = (phase >> 3) & 1;
-        chip->rm_hh_bit7 = (phase >> 7) & 1;
-        chip->rm_hh_bit8 = (phase >> 8) & 1;
-    }
-    if (slot->slot_num == 17 && (chip->rhy & 0x20)) // tc
-    {
-        chip->rm_tc_bit3 = (phase >> 3) & 1;
-        chip->rm_tc_bit5 = (phase >> 5) & 1;
-    }
-    if (chip->rhy & 0x20)
-    {
-        rm_xor = (chip->rm_hh_bit2 ^ chip->rm_hh_bit7)
-               | (chip->rm_hh_bit3 ^ chip->rm_tc_bit5)
-               | (chip->rm_tc_bit3 ^ chip->rm_tc_bit5);
-        switch (slot->slot_num)
-        {
-        case 13: // hh
-            slot->pg_phase_out = rm_xor << 9;
-            if (rm_xor ^ (noise & 1))
-            {
-                slot->pg_phase_out |= 0xd0;
-            }
-            else
-            {
-                slot->pg_phase_out |= 0x34;
-            }
-            break;
-        case 16: // sd
-            slot->pg_phase_out = (chip->rm_hh_bit8 << 9)
-                               | ((chip->rm_hh_bit8 ^ (noise & 1)) << 8);
-            break;
-        case 17: // tc
-            slot->pg_phase_out = (rm_xor << 9) | 0x80;
-            break;
-        default:
-            break;
-        }
-    }
-    n_bit = ((noise >> 14) ^ noise) & 0x01;
-    chip->noise = (noise >> 1) | (n_bit << 22);
-}
-
-//
-// Slot
-//
-
-static void OPL3_SlotWrite20(opl3_slot *slot, Bit8u data)
-{
-    if ((data >> 7) & 0x01)
-    {
-        slot->trem = &slot->chip->tremolo;
-    }
-    else
-    {
-        slot->trem = (Bit8u*)&slot->chip->zeromod;
-    }
-    slot->reg_vib = (data >> 6) & 0x01;
-    slot->reg_type = (data >> 5) & 0x01;
-    slot->reg_ksr = (data >> 4) & 0x01;
-    slot->reg_mult = data & 0x0f;
-}
-
-static void OPL3_SlotWrite40(opl3_slot *slot, Bit8u data)
-{
-    slot->reg_ksl = (data >> 6) & 0x03;
-    slot->reg_tl = data & 0x3f;
-    OPL3_EnvelopeUpdateKSL(slot);
-}
-
-static void OPL3_SlotWrite60(opl3_slot *slot, Bit8u data)
-{
-    slot->reg_ar = (data >> 4) & 0x0f;
-    slot->reg_dr = data & 0x0f;
-}
-
-static void OPL3_SlotWrite80(opl3_slot *slot, Bit8u data)
-{
-    slot->reg_sl = (data >> 4) & 0x0f;
-    if (slot->reg_sl == 0x0f)
-    {
-        slot->reg_sl = 0x1f;
-    }
-    slot->reg_rr = data & 0x0f;
-}
-
-static void OPL3_SlotWriteE0(opl3_slot *slot, Bit8u data)
-{
-    slot->reg_wf = data & 0x07;
-    if (slot->chip->newm == 0x00)
-    {
-        slot->reg_wf &= 0x03;
-    }
-}
-
-static void OPL3_SlotGenerate(opl3_slot *slot)
-{
-    slot->out = envelope_sin[slot->reg_wf](slot->pg_phase_out + *slot->mod, slot->eg_out);
-}
-
-static void OPL3_SlotCalcFB(opl3_slot *slot)
-{
-    if (slot->channel->fb != 0x00)
-    {
-        slot->fbmod = (slot->prout + slot->out) >> (0x09 - slot->channel->fb);
-    }
-    else
-    {
-        slot->fbmod = 0;
-    }
-    slot->prout = slot->out;
-}
-
-//
-// Channel
-//
-
-static void OPL3_ChannelSetupAlg(opl3_channel *channel);
-
-static void OPL3_ChannelUpdateRhythm(opl3_chip *chip, Bit8u data)
-{
-    opl3_channel *channel6;
-    opl3_channel *channel7;
-    opl3_channel *channel8;
-    Bit8u chnum;
-
-    chip->rhy = data & 0x3f;
-    if (chip->rhy & 0x20)
-    {
-        channel6 = &chip->channel[6];
-        channel7 = &chip->channel[7];
-        channel8 = &chip->channel[8];
-        channel6->out[0] = &channel6->slots[1]->out;
-        channel6->out[1] = &channel6->slots[1]->out;
-        channel6->out[2] = &chip->zeromod;
-        channel6->out[3] = &chip->zeromod;
-        channel7->out[0] = &channel7->slots[0]->out;
-        channel7->out[1] = &channel7->slots[0]->out;
-        channel7->out[2] = &channel7->slots[1]->out;
-        channel7->out[3] = &channel7->slots[1]->out;
-        channel8->out[0] = &channel8->slots[0]->out;
-        channel8->out[1] = &channel8->slots[0]->out;
-        channel8->out[2] = &channel8->slots[1]->out;
-        channel8->out[3] = &channel8->slots[1]->out;
-        for (chnum = 6; chnum < 9; chnum++)
-        {
-            chip->channel[chnum].chtype = ch_drum;
-        }
-        OPL3_ChannelSetupAlg(channel6);
-        OPL3_ChannelSetupAlg(channel7);
-        OPL3_ChannelSetupAlg(channel8);
-        //hh
-        if (chip->rhy & 0x01)
-        {
-            OPL3_EnvelopeKeyOn(channel7->slots[0], egk_drum);
-        }
-        else
-        {
-            OPL3_EnvelopeKeyOff(channel7->slots[0], egk_drum);
-        }
-        //tc
-        if (chip->rhy & 0x02)
-        {
-            OPL3_EnvelopeKeyOn(channel8->slots[1], egk_drum);
-        }
-        else
-        {
-            OPL3_EnvelopeKeyOff(channel8->slots[1], egk_drum);
-        }
-        //tom
-        if (chip->rhy & 0x04)
-        {
-            OPL3_EnvelopeKeyOn(channel8->slots[0], egk_drum);
-        }
-        else
-        {
-            OPL3_EnvelopeKeyOff(channel8->slots[0], egk_drum);
-        }
-        //sd
-        if (chip->rhy & 0x08)
-        {
-            OPL3_EnvelopeKeyOn(channel7->slots[1], egk_drum);
-        }
-        else
-        {
-            OPL3_EnvelopeKeyOff(channel7->slots[1], egk_drum);
-        }
-        //bd
-        if (chip->rhy & 0x10)
-        {
-            OPL3_EnvelopeKeyOn(channel6->slots[0], egk_drum);
-            OPL3_EnvelopeKeyOn(channel6->slots[1], egk_drum);
-        }
-        else
-        {
-            OPL3_EnvelopeKeyOff(channel6->slots[0], egk_drum);
-            OPL3_EnvelopeKeyOff(channel6->slots[1], egk_drum);
-        }
-    }
-    else
-    {
-        for (chnum = 6; chnum < 9; chnum++)
-        {
-            chip->channel[chnum].chtype = ch_2op;
-            OPL3_ChannelSetupAlg(&chip->channel[chnum]);
-            OPL3_EnvelopeKeyOff(chip->channel[chnum].slots[0], egk_drum);
-            OPL3_EnvelopeKeyOff(chip->channel[chnum].slots[1], egk_drum);
-        }
-    }
-}
-
-static void OPL3_ChannelWriteA0(opl3_channel *channel, Bit8u data)
-{
-    if (channel->chip->newm && channel->chtype == ch_4op2)
-    {
-        return;
-    }
-    channel->f_num = (channel->f_num & 0x300) | data;
-    channel->ksv = (channel->block << 1)
-                 | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
-    OPL3_EnvelopeUpdateKSL(channel->slots[0]);
-    OPL3_EnvelopeUpdateKSL(channel->slots[1]);
-    if (channel->chip->newm && channel->chtype == ch_4op)
-    {
-        channel->pair->f_num = channel->f_num;
-        channel->pair->ksv = channel->ksv;
-        OPL3_EnvelopeUpdateKSL(channel->pair->slots[0]);
-        OPL3_EnvelopeUpdateKSL(channel->pair->slots[1]);
-    }
-}
-
-static void OPL3_ChannelWriteB0(opl3_channel *channel, Bit8u data)
-{
-    if (channel->chip->newm && channel->chtype == ch_4op2)
-    {
-        return;
-    }
-    channel->f_num = (channel->f_num & 0xff) | ((data & 0x03) << 8);
-    channel->block = (data >> 2) & 0x07;
-    channel->ksv = (channel->block << 1)
-                 | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
-    OPL3_EnvelopeUpdateKSL(channel->slots[0]);
-    OPL3_EnvelopeUpdateKSL(channel->slots[1]);
-    if (channel->chip->newm && channel->chtype == ch_4op)
-    {
-        channel->pair->f_num = channel->f_num;
-        channel->pair->block = channel->block;
-        channel->pair->ksv = channel->ksv;
-        OPL3_EnvelopeUpdateKSL(channel->pair->slots[0]);
-        OPL3_EnvelopeUpdateKSL(channel->pair->slots[1]);
-    }
-}
-
-static void OPL3_ChannelSetupAlg(opl3_channel *channel)
-{
-    if (channel->chtype == ch_drum)
-    {
-        if (channel->ch_num == 7 || channel->ch_num == 8)
-        {
-            channel->slots[0]->mod = &channel->chip->zeromod;
-            channel->slots[1]->mod = &channel->chip->zeromod;
-            return;
-        }
-        switch (channel->alg & 0x01)
-        {
-        case 0x00:
-            channel->slots[0]->mod = &channel->slots[0]->fbmod;
-            channel->slots[1]->mod = &channel->slots[0]->out;
-            break;
-        case 0x01:
-            channel->slots[0]->mod = &channel->slots[0]->fbmod;
-            channel->slots[1]->mod = &channel->chip->zeromod;
-            break;
-        }
-        return;
-    }
-    if (channel->alg & 0x08)
-    {
-        return;
-    }
-    if (channel->alg & 0x04)
-    {
-        channel->pair->out[0] = &channel->chip->zeromod;
-        channel->pair->out[1] = &channel->chip->zeromod;
-        channel->pair->out[2] = &channel->chip->zeromod;
-        channel->pair->out[3] = &channel->chip->zeromod;
-        switch (channel->alg & 0x03)
-        {
-        case 0x00:
-            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
-            channel->pair->slots[1]->mod = &channel->pair->slots[0]->out;
-            channel->slots[0]->mod = &channel->pair->slots[1]->out;
-            channel->slots[1]->mod = &channel->slots[0]->out;
-            channel->out[0] = &channel->slots[1]->out;
-            channel->out[1] = &channel->chip->zeromod;
-            channel->out[2] = &channel->chip->zeromod;
-            channel->out[3] = &channel->chip->zeromod;
-            break;
-        case 0x01:
-            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
-            channel->pair->slots[1]->mod = &channel->pair->slots[0]->out;
-            channel->slots[0]->mod = &channel->chip->zeromod;
-            channel->slots[1]->mod = &channel->slots[0]->out;
-            channel->out[0] = &channel->pair->slots[1]->out;
-            channel->out[1] = &channel->slots[1]->out;
-            channel->out[2] = &channel->chip->zeromod;
-            channel->out[3] = &channel->chip->zeromod;
-            break;
-        case 0x02:
-            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
-            channel->pair->slots[1]->mod = &channel->chip->zeromod;
-            channel->slots[0]->mod = &channel->pair->slots[1]->out;
-            channel->slots[1]->mod = &channel->slots[0]->out;
-            channel->out[0] = &channel->pair->slots[0]->out;
-            channel->out[1] = &channel->slots[1]->out;
-            channel->out[2] = &channel->chip->zeromod;
-            channel->out[3] = &channel->chip->zeromod;
-            break;
-        case 0x03:
-            channel->pair->slots[0]->mod = &channel->pair->slots[0]->fbmod;
-            channel->pair->slots[1]->mod = &channel->chip->zeromod;
-            channel->slots[0]->mod = &channel->pair->slots[1]->out;
-            channel->slots[1]->mod = &channel->chip->zeromod;
-            channel->out[0] = &channel->pair->slots[0]->out;
-            channel->out[1] = &channel->slots[0]->out;
-            channel->out[2] = &channel->slots[1]->out;
-            channel->out[3] = &channel->chip->zeromod;
-            break;
-        }
-    }
-    else
-    {
-        switch (channel->alg & 0x01)
-        {
-        case 0x00:
-            channel->slots[0]->mod = &channel->slots[0]->fbmod;
-            channel->slots[1]->mod = &channel->slots[0]->out;
-            channel->out[0] = &channel->slots[1]->out;
-            channel->out[1] = &channel->chip->zeromod;
-            channel->out[2] = &channel->chip->zeromod;
-            channel->out[3] = &channel->chip->zeromod;
-            break;
-        case 0x01:
-            channel->slots[0]->mod = &channel->slots[0]->fbmod;
-            channel->slots[1]->mod = &channel->chip->zeromod;
-            channel->out[0] = &channel->slots[0]->out;
-            channel->out[1] = &channel->slots[1]->out;
-            channel->out[2] = &channel->chip->zeromod;
-            channel->out[3] = &channel->chip->zeromod;
-            break;
-        }
-    }
-}
-
-static void OPL3_ChannelWriteC0(opl3_channel *channel, Bit8u data)
-{
-    channel->fb = (data & 0x0e) >> 1;
-    channel->con = data & 0x01;
-    channel->alg = channel->con;
-    if (channel->chip->newm)
-    {
-        if (channel->chtype == ch_4op)
-        {
-            channel->pair->alg = 0x04 | (channel->con << 1) | (channel->pair->con);
-            channel->alg = 0x08;
-            OPL3_ChannelSetupAlg(channel->pair);
-        }
-        else if (channel->chtype == ch_4op2)
-        {
-            channel->alg = 0x04 | (channel->pair->con << 1) | (channel->con);
-            channel->pair->alg = 0x08;
-            OPL3_ChannelSetupAlg(channel);
-        }
-        else
-        {
-            OPL3_ChannelSetupAlg(channel);
-        }
-    }
-    else
-    {
-        OPL3_ChannelSetupAlg(channel);
-    }
-    if (channel->chip->newm)
-    {
-        channel->cha = ((data >> 4) & 0x01) ? ~0 : 0;
-        channel->chb = ((data >> 5) & 0x01) ? ~0 : 0;
-    }
-    else
-    {
-        channel->cha = channel->chb = (Bit16u)~0;
-    }
-}
-
-static void OPL3_ChannelKeyOn(opl3_channel *channel)
-{
-    if (channel->chip->newm)
-    {
-        if (channel->chtype == ch_4op)
-        {
-            OPL3_EnvelopeKeyOn(channel->slots[0], egk_norm);
-            OPL3_EnvelopeKeyOn(channel->slots[1], egk_norm);
-            OPL3_EnvelopeKeyOn(channel->pair->slots[0], egk_norm);
-            OPL3_EnvelopeKeyOn(channel->pair->slots[1], egk_norm);
-        }
-        else if (channel->chtype == ch_2op || channel->chtype == ch_drum)
-        {
-            OPL3_EnvelopeKeyOn(channel->slots[0], egk_norm);
-            OPL3_EnvelopeKeyOn(channel->slots[1], egk_norm);
-        }
-    }
-    else
-    {
-        OPL3_EnvelopeKeyOn(channel->slots[0], egk_norm);
-        OPL3_EnvelopeKeyOn(channel->slots[1], egk_norm);
-    }
-}
-
-static void OPL3_ChannelKeyOff(opl3_channel *channel)
-{
-    if (channel->chip->newm)
-    {
-        if (channel->chtype == ch_4op)
-        {
-            OPL3_EnvelopeKeyOff(channel->slots[0], egk_norm);
-            OPL3_EnvelopeKeyOff(channel->slots[1], egk_norm);
-            OPL3_EnvelopeKeyOff(channel->pair->slots[0], egk_norm);
-            OPL3_EnvelopeKeyOff(channel->pair->slots[1], egk_norm);
-        }
-        else if (channel->chtype == ch_2op || channel->chtype == ch_drum)
-        {
-            OPL3_EnvelopeKeyOff(channel->slots[0], egk_norm);
-            OPL3_EnvelopeKeyOff(channel->slots[1], egk_norm);
-        }
-    }
-    else
-    {
-        OPL3_EnvelopeKeyOff(channel->slots[0], egk_norm);
-        OPL3_EnvelopeKeyOff(channel->slots[1], egk_norm);
-    }
-}
-
-static void OPL3_ChannelSet4Op(opl3_chip *chip, Bit8u data)
-{
-    Bit8u bit;
-    Bit8u chnum;
-    for (bit = 0; bit < 6; bit++)
-    {
-        chnum = bit;
-        if (bit >= 3)
-        {
-            chnum += 9 - 3;
-        }
-        if ((data >> bit) & 0x01)
-        {
-            chip->channel[chnum].chtype = ch_4op;
-            chip->channel[chnum + 3].chtype = ch_4op2;
-        }
-        else
-        {
-            chip->channel[chnum].chtype = ch_2op;
-            chip->channel[chnum + 3].chtype = ch_2op;
-        }
-    }
-}
-
-static Bit16s OPL3_ClipSample(Bit32s sample)
-{
-    if (sample > 32767)
-    {
-        sample = 32767;
-    }
-    else if (sample < -32768)
-    {
-        sample = -32768;
-    }
-    return (Bit16s)sample;
-}
-
-void OPL3_Generate(opl3_chip *chip, Bit16s *buf)
-{
-    Bit8u ii;
-    Bit8u jj;
-    Bit16s accm;
-    Bit8u shift = 0;
-
-    buf[1] = OPL3_ClipSample(chip->mixbuff[1]);
-
-    for (ii = 0; ii < 15; ii++)
-    {
-        OPL3_SlotCalcFB(&chip->slot[ii]);
-        OPL3_EnvelopeCalc(&chip->slot[ii]);
-        OPL3_PhaseGenerate(&chip->slot[ii]);
-        OPL3_SlotGenerate(&chip->slot[ii]);
-    }
-
-    chip->mixbuff[0] = 0;
-    for (ii = 0; ii < 18; ii++)
-    {
-        accm = 0;
-        for (jj = 0; jj < 4; jj++)
-        {
-            accm += *chip->channel[ii].out[jj];
-        }
-        chip->mixbuff[0] += (Bit16s)(accm & chip->channel[ii].cha);
-    }
-
-    for (ii = 15; ii < 18; ii++)
-    {
-        OPL3_SlotCalcFB(&chip->slot[ii]);
-        OPL3_EnvelopeCalc(&chip->slot[ii]);
-        OPL3_PhaseGenerate(&chip->slot[ii]);
-        OPL3_SlotGenerate(&chip->slot[ii]);
-    }
-
-    buf[0] = OPL3_ClipSample(chip->mixbuff[0]);
-
-    for (ii = 18; ii < 33; ii++)
-    {
-        OPL3_SlotCalcFB(&chip->slot[ii]);
-        OPL3_EnvelopeCalc(&chip->slot[ii]);
-        OPL3_PhaseGenerate(&chip->slot[ii]);
-        OPL3_SlotGenerate(&chip->slot[ii]);
-    }
-
-    chip->mixbuff[1] = 0;
-    for (ii = 0; ii < 18; ii++)
-    {
-        accm = 0;
-        for (jj = 0; jj < 4; jj++)
-        {
-            accm += *chip->channel[ii].out[jj];
-        }
-        chip->mixbuff[1] += (Bit16s)(accm & chip->channel[ii].chb);
-    }
-
-    for (ii = 33; ii < 36; ii++)
-    {
-        OPL3_SlotCalcFB(&chip->slot[ii]);
-        OPL3_EnvelopeCalc(&chip->slot[ii]);
-        OPL3_PhaseGenerate(&chip->slot[ii]);
-        OPL3_SlotGenerate(&chip->slot[ii]);
-    }
-
-    if ((chip->timer & 0x3f) == 0x3f)
-    {
-        chip->tremolopos = (chip->tremolopos + 1) % 210;
-    }
-    if (chip->tremolopos < 105)
-    {
-        chip->tremolo = chip->tremolopos >> chip->tremoloshift;
-    }
-    else
-    {
-        chip->tremolo = (210 - chip->tremolopos) >> chip->tremoloshift;
-    }
-
-    if ((chip->timer & 0x3ff) == 0x3ff)
-    {
-        chip->vibpos = (chip->vibpos + 1) & 7;
-    }
-
-    chip->timer++;
-
-    chip->eg_add = 0;
-    if (chip->eg_timer)
-    {
-        while (shift < 36 && ((chip->eg_timer >> shift) & 1) == 0)
-        {
-            shift++;
-        }
-        if (shift > 12)
-        {
-            chip->eg_add = 0;
-        }
-        else
-        {
-            chip->eg_add = shift + 1;
-        }
-    }
-
-    if (chip->eg_timerrem || chip->eg_state)
-    {
-        if (chip->eg_timer == 0xfffffffff)
-        {
-            chip->eg_timer = 0;
-            chip->eg_timerrem = 1;
-        }
-        else
-        {
-            chip->eg_timer++;
-            chip->eg_timerrem = 0;
-        }
-    }
-
-    chip->eg_state ^= 1;
-
-    while (chip->writebuf[chip->writebuf_cur].time <= chip->writebuf_samplecnt)
-    {
-        if (!(chip->writebuf[chip->writebuf_cur].reg & 0x200))
-        {
-            break;
-        }
-        chip->writebuf[chip->writebuf_cur].reg &= 0x1ff;
-        OPL3_WriteReg(chip, chip->writebuf[chip->writebuf_cur].reg,
-                      chip->writebuf[chip->writebuf_cur].data);
-        chip->writebuf_cur = (chip->writebuf_cur + 1) % OPL_WRITEBUF_SIZE;
-    }
-    chip->writebuf_samplecnt++;
-}
-
-void OPL3_GenerateResampled(opl3_chip *chip, Bit16s *buf)
-{
-    while (chip->samplecnt >= chip->rateratio)
-    {
-        chip->oldsamples[0] = chip->samples[0];
-        chip->oldsamples[1] = chip->samples[1];
-        OPL3_Generate(chip, chip->samples);
-        chip->samplecnt -= chip->rateratio;
-    }
-    buf[0] = (Bit16s)((chip->oldsamples[0] * (chip->rateratio - chip->samplecnt)
-                     + chip->samples[0] * chip->samplecnt) / chip->rateratio);
-    buf[1] = (Bit16s)((chip->oldsamples[1] * (chip->rateratio - chip->samplecnt)
-                     + chip->samples[1] * chip->samplecnt) / chip->rateratio);
-    chip->samplecnt += 1 << RSM_FRAC;
-}
-
-void OPL3_Reset(opl3_chip *chip, Bit32u samplerate)
-{
-    Bit8u slotnum;
-    Bit8u channum;
-
-    memset(chip, 0, sizeof(opl3_chip));
-    for (slotnum = 0; slotnum < 36; slotnum++)
-    {
-        chip->slot[slotnum].chip = chip;
-        chip->slot[slotnum].mod = &chip->zeromod;
-        chip->slot[slotnum].eg_rout = 0x1ff;
-        chip->slot[slotnum].eg_out = 0x1ff;
-        chip->slot[slotnum].eg_gen = envelope_gen_num_release;
-        chip->slot[slotnum].trem = (Bit8u*)&chip->zeromod;
-        chip->slot[slotnum].slot_num = slotnum;
-    }
-    for (channum = 0; channum < 18; channum++)
-    {
-        chip->channel[channum].slots[0] = &chip->slot[ch_slot[channum]];
-        chip->channel[channum].slots[1] = &chip->slot[ch_slot[channum] + 3];
-        chip->slot[ch_slot[channum]].channel = &chip->channel[channum];
-        chip->slot[ch_slot[channum] + 3].channel = &chip->channel[channum];
-        if ((channum % 9) < 3)
-        {
-            chip->channel[channum].pair = &chip->channel[channum + 3];
-        }
-        else if ((channum % 9) < 6)
-        {
-            chip->channel[channum].pair = &chip->channel[channum - 3];
-        }
-        chip->channel[channum].chip = chip;
-        chip->channel[channum].out[0] = &chip->zeromod;
-        chip->channel[channum].out[1] = &chip->zeromod;
-        chip->channel[channum].out[2] = &chip->zeromod;
-        chip->channel[channum].out[3] = &chip->zeromod;
-        chip->channel[channum].chtype = ch_2op;
-        chip->channel[channum].cha = 0xffff;
-        chip->channel[channum].chb = 0xffff;
-        chip->channel[channum].ch_num = channum;
-        OPL3_ChannelSetupAlg(&chip->channel[channum]);
-    }
-    chip->noise = 1;
-    chip->rateratio = (samplerate << RSM_FRAC) / 49716;
-    chip->tremoloshift = 4;
-    chip->vibshift = 1;
-}
-
-void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v)
-{
-    Bit8u high = (reg >> 8) & 0x01;
-    Bit8u regm = reg & 0xff;
-    switch (regm & 0xf0)
-    {
-    case 0x00:
-        if (high)
-        {
-            switch (regm & 0x0f)
-            {
-            case 0x04:
-                OPL3_ChannelSet4Op(chip, v);
-                break;
-            case 0x05:
-                chip->newm = v & 0x01;
-                break;
-            }
-        }
-        else
-        {
-            switch (regm & 0x0f)
-            {
-            case 0x08:
-                chip->nts = (v >> 6) & 0x01;
-                break;
-            }
-        }
-        break;
-    case 0x20:
-    case 0x30:
-        if (ad_slot[regm & 0x1f] >= 0)
-        {
-            OPL3_SlotWrite20(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
-        }
-        break;
-    case 0x40:
-    case 0x50:
-        if (ad_slot[regm & 0x1f] >= 0)
-        {
-            OPL3_SlotWrite40(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
-        }
-        break;
-    case 0x60:
-    case 0x70:
-        if (ad_slot[regm & 0x1f] >= 0)
-        {
-            OPL3_SlotWrite60(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
-        }
-        break;
-    case 0x80:
-    case 0x90:
-        if (ad_slot[regm & 0x1f] >= 0)
-        {
-            OPL3_SlotWrite80(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
-        }
-        break;
-    case 0xe0:
-    case 0xf0:
-        if (ad_slot[regm & 0x1f] >= 0)
-        {
-            OPL3_SlotWriteE0(&chip->slot[18 * high + ad_slot[regm & 0x1f]], v);
-        }
-        break;
-    case 0xa0:
-        if ((regm & 0x0f) < 9)
-        {
-            OPL3_ChannelWriteA0(&chip->channel[9 * high + (regm & 0x0f)], v);
-        }
-        break;
-    case 0xb0:
-        if (regm == 0xbd && !high)
-        {
-            chip->tremoloshift = (((v >> 7) ^ 1) << 1) + 2;
-            chip->vibshift = ((v >> 6) & 0x01) ^ 1;
-            OPL3_ChannelUpdateRhythm(chip, v);
-        }
-        else if ((regm & 0x0f) < 9)
-        {
-            OPL3_ChannelWriteB0(&chip->channel[9 * high + (regm & 0x0f)], v);
-            if (v & 0x20)
-            {
-                OPL3_ChannelKeyOn(&chip->channel[9 * high + (regm & 0x0f)]);
-            }
-            else
-            {
-                OPL3_ChannelKeyOff(&chip->channel[9 * high + (regm & 0x0f)]);
-            }
-        }
-        break;
-    case 0xc0:
-        if ((regm & 0x0f) < 9)
-        {
-            OPL3_ChannelWriteC0(&chip->channel[9 * high + (regm & 0x0f)], v);
-        }
-        break;
-    }
-}
-
-void OPL3_WriteRegBuffered(opl3_chip *chip, Bit16u reg, Bit8u v)
-{
-    Bit64u time1, time2;
-
-    if (chip->writebuf[chip->writebuf_last].reg & 0x200)
-    {
-        OPL3_WriteReg(chip, chip->writebuf[chip->writebuf_last].reg & 0x1ff,
-                      chip->writebuf[chip->writebuf_last].data);
-
-        chip->writebuf_cur = (chip->writebuf_last + 1) % OPL_WRITEBUF_SIZE;
-        chip->writebuf_samplecnt = chip->writebuf[chip->writebuf_last].time;
-    }
-
-    chip->writebuf[chip->writebuf_last].reg = reg | 0x200;
-    chip->writebuf[chip->writebuf_last].data = v;
-    time1 = chip->writebuf_lasttime + OPL_WRITEBUF_DELAY;
-    time2 = chip->writebuf_samplecnt;
-
-    if (time1 < time2)
-    {
-        time1 = time2;
-    }
-
-    chip->writebuf[chip->writebuf_last].time = time1;
-    chip->writebuf_lasttime = time1;
-    chip->writebuf_last = (chip->writebuf_last + 1) % OPL_WRITEBUF_SIZE;
-}
-
-void OPL3_GenerateStream(opl3_chip *chip, Bit16s *sndptr, Bit32u numsamples)
-{
-    Bit32u i;
-
-    for(i = 0; i < numsamples; i++)
-    {
-        OPL3_GenerateResampled(chip, sndptr);
-        sndptr += 2;
-    }
-}
diff --git a/games/NXDoom/opl/opl3.h b/games/NXDoom/opl/opl3.h
deleted file mode 100644
index 2a64037a5..000000000
--- a/games/NXDoom/opl/opl3.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Copyright (C) 2013-2018 Alexey Khokholov (Nuke.YKT)
-//
-// 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.
-//
-//
-//  Nuked OPL3 emulator.
-//  Thanks:
-//      MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
-//          Feedback and Rhythm part calculation information.
-//      forums.submarine.org.uk(carbon14, opl3):
-//          Tremolo and phase generator calculation information.
-//      OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
-//          OPL2 ROMs.
-//      siliconpr0n.org(John McMaster, digshadow):
-//          YMF262 and VRC VII decaps and die shots.
-//
-// version: 1.8
-//
-
-#ifndef OPL_OPL3_H
-#define OPL_OPL3_H
-
-#include <inttypes.h>
-
-#define OPL_WRITEBUF_SIZE   1024
-#define OPL_WRITEBUF_DELAY  2
-
-typedef uintptr_t       Bitu;
-typedef intptr_t        Bits;
-typedef uint64_t        Bit64u;
-typedef int64_t         Bit64s;
-typedef uint32_t        Bit32u;
-typedef int32_t         Bit32s;
-typedef uint16_t        Bit16u;
-typedef int16_t         Bit16s;
-typedef uint8_t         Bit8u;
-typedef int8_t          Bit8s;
-
-typedef struct _opl3_slot opl3_slot;
-typedef struct _opl3_channel opl3_channel;
-typedef struct _opl3_chip opl3_chip;
-
-struct _opl3_slot {
-    opl3_channel *channel;
-    opl3_chip *chip;
-    Bit16s out;
-    Bit16s fbmod;
-    Bit16s *mod;
-    Bit16s prout;
-    Bit16s eg_rout;
-    Bit16s eg_out;
-    Bit8u eg_inc;
-    Bit8u eg_gen;
-    Bit8u eg_rate;
-    Bit8u eg_ksl;
-    Bit8u *trem;
-    Bit8u reg_vib;
-    Bit8u reg_type;
-    Bit8u reg_ksr;
-    Bit8u reg_mult;
-    Bit8u reg_ksl;
-    Bit8u reg_tl;
-    Bit8u reg_ar;
-    Bit8u reg_dr;
-    Bit8u reg_sl;
-    Bit8u reg_rr;
-    Bit8u reg_wf;
-    Bit8u key;
-    Bit32u pg_reset;
-    Bit32u pg_phase;
-    Bit16u pg_phase_out;
-    Bit8u slot_num;
-};
-
-struct _opl3_channel {
-    opl3_slot *slots[2];
-    opl3_channel *pair;
-    opl3_chip *chip;
-    Bit16s *out[4];
-    Bit8u chtype;
-    Bit16u f_num;
-    Bit8u block;
-    Bit8u fb;
-    Bit8u con;
-    Bit8u alg;
-    Bit8u ksv;
-    Bit16u cha, chb;
-    Bit8u ch_num;
-};
-
-typedef struct _opl3_writebuf {
-    Bit64u time;
-    Bit16u reg;
-    Bit8u data;
-} opl3_writebuf;
-
-struct _opl3_chip {
-    opl3_channel channel[18];
-    opl3_slot slot[36];
-    Bit16u timer;
-    Bit64u eg_timer;
-    Bit8u eg_timerrem;
-    Bit8u eg_state;
-    Bit8u eg_add;
-    Bit8u newm;
-    Bit8u nts;
-    Bit8u rhy;
-    Bit8u vibpos;
-    Bit8u vibshift;
-    Bit8u tremolo;
-    Bit8u tremolopos;
-    Bit8u tremoloshift;
-    Bit32u noise;
-    Bit16s zeromod;
-    Bit32s mixbuff[2];
-    Bit8u rm_hh_bit2;
-    Bit8u rm_hh_bit3;
-    Bit8u rm_hh_bit7;
-    Bit8u rm_hh_bit8;
-    Bit8u rm_tc_bit3;
-    Bit8u rm_tc_bit5;
-    //OPL3L
-    Bit32s rateratio;
-    Bit32s samplecnt;
-    Bit16s oldsamples[2];
-    Bit16s samples[2];
-
-    Bit64u writebuf_samplecnt;
-    Bit32u writebuf_cur;
-    Bit32u writebuf_last;
-    Bit64u writebuf_lasttime;
-    opl3_writebuf writebuf[OPL_WRITEBUF_SIZE];
-};
-
-void OPL3_Generate(opl3_chip *chip, Bit16s *buf);
-void OPL3_GenerateResampled(opl3_chip *chip, Bit16s *buf);
-void OPL3_Reset(opl3_chip *chip, Bit32u samplerate);
-void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v);
-void OPL3_WriteRegBuffered(opl3_chip *chip, Bit16u reg, Bit8u v);
-void OPL3_GenerateStream(opl3_chip *chip, Bit16s *sndptr, Bit32u numsamples);
-#endif
diff --git a/games/NXDoom/opl/opl_internal.h b/games/NXDoom/opl/opl_internal.h
deleted file mode 100644
index 68fd0b82f..000000000
--- a/games/NXDoom/opl/opl_internal.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL internal interface.
-//
-
-
-#ifndef OPL_INTERNAL_H
-#define OPL_INTERNAL_H
-
-#include "opl.h"
-
-typedef int (*opl_init_func)(unsigned int port_base);
-typedef void (*opl_shutdown_func)(void);
-typedef unsigned int (*opl_read_port_func)(opl_port_t port);
-typedef void (*opl_write_port_func)(opl_port_t port, unsigned int value);
-typedef void (*opl_set_callback_func)(uint64_t us,
-                                      opl_callback_t callback,
-                                      void *data);
-typedef void (*opl_clear_callbacks_func)(void);
-typedef void (*opl_lock_func)(void);
-typedef void (*opl_unlock_func)(void);
-typedef void (*opl_set_paused_func)(int paused);
-typedef void (*opl_adjust_callbacks_func)(float value);
-
-typedef struct
-{
-    const char *name;
-
-    opl_init_func init_func;
-    opl_shutdown_func shutdown_func;
-    opl_read_port_func read_port_func;
-    opl_write_port_func write_port_func;
-    opl_set_callback_func set_callback_func;
-    opl_clear_callbacks_func clear_callbacks_func;
-    opl_lock_func lock_func;
-    opl_unlock_func unlock_func;
-    opl_set_paused_func set_paused_func;
-    opl_adjust_callbacks_func adjust_callbacks_func;
-} opl_driver_t;
-
-// Sample rate to use when doing software emulation.
-
-extern unsigned int opl_sample_rate;
-
-
-#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
-extern opl_driver_t opl_linux_driver;
-#endif
-#if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64)
-extern opl_driver_t opl_openbsd_driver;
-#endif
-#ifdef _WIN32
-extern opl_driver_t opl_win32_driver;
-#endif
-extern opl_driver_t opl_sdl_driver;
-
-
-#endif /* #ifndef OPL_INTERNAL_H */
-
diff --git a/games/NXDoom/opl/opl_linux.c b/games/NXDoom/opl/opl_linux.c
deleted file mode 100644
index 03160fa1b..000000000
--- a/games/NXDoom/opl/opl_linux.c
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL Linux interface.
-//
-
-#include "config.h"
-
-#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/io.h>
-
-#include "opl.h"
-#include "opl_internal.h"
-#include "opl_timer.h"
-
-static unsigned int opl_port_base;
-
-static int OPL_Linux_Init(unsigned int port_base)
-{
-    // Try to get permissions:
-
-    if (ioperm(port_base, 3, 1) < 0)
-    {
-        fprintf(stderr, "Failed to get I/O port permissions for 0x%x: %s\n",
-                        port_base, strerror(errno));
-
-        if (errno == EPERM)
-        {
-            fprintf(stderr,
-                    "\tYou may need to run the program as root in order\n"
-                    "\tto acquire I/O port permissions for OPL MIDI playback.\n");
-        }
-
-        return 0;
-    }
-
-    opl_port_base = port_base;
-
-    // Start callback thread
-
-    if (!OPL_Timer_StartThread())
-    {
-        ioperm(port_base, 2, 0);
-        return 0;
-    }
-
-    return 1;
-}
-
-static void OPL_Linux_Shutdown(void)
-{
-    // Stop callback thread
-
-    OPL_Timer_StopThread();
-
-    // Release permissions
-
-    ioperm(opl_port_base, 2, 0);
-}
-
-static unsigned int OPL_Linux_PortRead(opl_port_t port)
-{
-    return inb(opl_port_base + port);
-}
-
-static void OPL_Linux_PortWrite(opl_port_t port, unsigned int value)
-{
-    outb(value, opl_port_base + port);
-}
-
-opl_driver_t opl_linux_driver =
-{
-    "Linux",
-    OPL_Linux_Init,
-    OPL_Linux_Shutdown,
-    OPL_Linux_PortRead,
-    OPL_Linux_PortWrite,
-    OPL_Timer_SetCallback,
-    OPL_Timer_ClearCallbacks,
-    OPL_Timer_Lock,
-    OPL_Timer_Unlock,
-    OPL_Timer_SetPaused,
-    OPL_Timer_AdjustCallbacks,
-};
-
-#endif /* #if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) */
-
diff --git a/games/NXDoom/opl/opl_obsd.c b/games/NXDoom/opl/opl_obsd.c
deleted file mode 100644
index 39e0c1560..000000000
--- a/games/NXDoom/opl/opl_obsd.c
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL OpenBSD interface (also NetBSD)
-//
-
-#include "config.h"
-
-// OpenBSD has a i386_iopl on i386 and amd64_iopl on x86_64,
-// even though they do the same thing.  Take care of this
-// here, and map set_iopl to point to the appropriate name.
-
-#if defined(HAVE_LIBI386)
-
-#include <sys/types.h>
-#include <machine/sysarch.h>
-#include <i386/pio.h>
-#define set_iopl i386_iopl
-
-#elif defined(HAVE_LIBAMD64)
-
-#include <sys/types.h>
-#include <machine/sysarch.h>
-#include <amd64/pio.h>
-#define set_iopl amd64_iopl
-
-#else
-#define NO_OBSD_DRIVER
-#endif
-
-// If the above succeeded, proceed with the rest.
-
-#ifndef NO_OBSD_DRIVER
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "opl.h"
-#include "opl_internal.h"
-#include "opl_timer.h"
-
-static unsigned int opl_port_base;
-
-static int OPL_OpenBSD_Init(unsigned int port_base)
-{
-    // Try to get permissions:
-
-    if (set_iopl(3) < 0)
-    {
-        fprintf(stderr, "Failed to get raise I/O privilege level: "
-                        "check that you are running as root.\n");
-        return 0;
-    }
-
-    opl_port_base = port_base;
-
-    // Start callback thread
-
-    if (!OPL_Timer_StartThread())
-    {
-        set_iopl(0);
-        return 0;
-    }
-
-    return 1;
-}
-
-static void OPL_OpenBSD_Shutdown(void)
-{
-    // Stop callback thread
-
-    OPL_Timer_StopThread();
-
-    // Release I/O port permissions:
-
-    set_iopl(0);
-}
-
-static unsigned int OPL_OpenBSD_PortRead(opl_port_t port)
-{
-    return inb(opl_port_base + port);
-}
-
-static void OPL_OpenBSD_PortWrite(opl_port_t port, unsigned int value)
-{
-    outb(opl_port_base + port, value);
-}
-
-opl_driver_t opl_openbsd_driver =
-{
-    "OpenBSD",
-    OPL_OpenBSD_Init,
-    OPL_OpenBSD_Shutdown,
-    OPL_OpenBSD_PortRead,
-    OPL_OpenBSD_PortWrite,
-    OPL_Timer_SetCallback,
-    OPL_Timer_ClearCallbacks,
-    OPL_Timer_Lock,
-    OPL_Timer_Unlock,
-    OPL_Timer_SetPaused,
-    OPL_Timer_AdjustCallbacks,
-};
-
-#endif /* #ifndef NO_OBSD_DRIVER */
-
diff --git a/games/NXDoom/opl/opl_queue.c b/games/NXDoom/opl/opl_queue.c
deleted file mode 100644
index e948b6413..000000000
--- a/games/NXDoom/opl/opl_queue.c
+++ /dev/null
@@ -1,285 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Queue of waiting callbacks, stored in a binary min heap, so that we
-//     can always get the first callback.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "opl_queue.h"
-
-#define MAX_OPL_QUEUE 64
-
-typedef struct
-{
-    opl_callback_t callback;
-    void *data;
-    uint64_t time;
-} opl_queue_entry_t;
-
-struct opl_callback_queue_s
-{
-    opl_queue_entry_t entries[MAX_OPL_QUEUE];
-    unsigned int num_entries;
-};
-
-opl_callback_queue_t *OPL_Queue_Create(void)
-{
-    opl_callback_queue_t *queue;
-
-    queue = malloc(sizeof(opl_callback_queue_t));
-    queue->num_entries = 0;
-
-    return queue;
-}
-
-void OPL_Queue_Destroy(opl_callback_queue_t *queue)
-{
-    free(queue);
-}
-
-int OPL_Queue_IsEmpty(opl_callback_queue_t *queue)
-{
-    return queue->num_entries == 0;
-}
-
-void OPL_Queue_Clear(opl_callback_queue_t *queue)
-{
-    queue->num_entries = 0;
-}
-
-void OPL_Queue_Push(opl_callback_queue_t *queue,
-                    opl_callback_t callback, void *data,
-                    uint64_t time)
-{
-    int entry_id;
-    int parent_id;
-
-    if (queue->num_entries >= MAX_OPL_QUEUE)
-    {
-        fprintf(stderr, "OPL_Queue_Push: Exceeded maximum callbacks\n");
-        return;
-    }
-
-    // Add to last queue entry.
-
-    entry_id = queue->num_entries;
-    ++queue->num_entries;
-
-    // Shift existing entries down in the heap.
-
-    while (entry_id > 0)
-    {
-        parent_id = (entry_id - 1) / 2;
-
-        // Is the heap condition satisfied?
-
-        if (time >= queue->entries[parent_id].time)
-        {
-            break;
-        }
-
-        // Move the existing entry down in the heap.
-
-        memcpy(&queue->entries[entry_id],
-               &queue->entries[parent_id],
-               sizeof(opl_queue_entry_t));
-
-        // Advance to the parent.
-
-        entry_id = parent_id;
-    }
-
-    // Insert new callback data.
-
-    queue->entries[entry_id].callback = callback;
-    queue->entries[entry_id].data = data;
-    queue->entries[entry_id].time = time;
-}
-
-int OPL_Queue_Pop(opl_callback_queue_t *queue,
-                  opl_callback_t *callback, void **data)
-{
-    opl_queue_entry_t *entry;
-    int child1, child2;
-    int i, next_i;
-
-    // Empty?
-
-    if (queue->num_entries <= 0)
-    {
-        return 0;
-    }
-
-    // Store the result:
-
-    *callback = queue->entries[0].callback;
-    *data = queue->entries[0].data;
-
-    // Decrease the heap size, and keep pointer to the last entry in
-    // the heap, which must now be percolated down from the top.
-
-    --queue->num_entries;
-    entry = &queue->entries[queue->num_entries];
-
-    // Percolate down.
-
-    i = 0;
-
-    for (;;)
-    {
-        child1 = i * 2 + 1;
-        child2 = i * 2 + 2;
-
-        if (child1 < queue->num_entries
-         && queue->entries[child1].time < entry->time)
-        {
-            // Left child is less than entry.
-            // Use the minimum of left and right children.
-
-            if (child2 < queue->num_entries
-             && queue->entries[child2].time < queue->entries[child1].time)
-            {
-                next_i = child2;
-            }
-            else
-            {
-                next_i = child1;
-            }
-        }
-        else if (child2 < queue->num_entries
-              && queue->entries[child2].time < entry->time)
-        {
-            // Right child is less than entry.  Go down the right side.
-
-            next_i = child2;
-        }
-        else
-        {
-            // Finished percolating.
-            break;
-        }
-
-        // Percolate the next value up and advance.
-
-        memcpy(&queue->entries[i],
-               &queue->entries[next_i],
-               sizeof(opl_queue_entry_t));
-        i = next_i;
-    }
-
-    // Store the old last-entry at its new position.
-
-    memcpy(&queue->entries[i], entry, sizeof(opl_queue_entry_t));
-
-    return 1;
-}
-
-uint64_t OPL_Queue_Peek(opl_callback_queue_t *queue)
-{
-    if (queue->num_entries > 0)
-    {
-        return queue->entries[0].time;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-void OPL_Queue_AdjustCallbacks(opl_callback_queue_t *queue,
-                               uint64_t time, float factor)
-{
-    int64_t offset;
-    int i;
-
-    for (i = 0; i < queue->num_entries; ++i)
-    {
-        offset = queue->entries[i].time - time;
-        queue->entries[i].time = time + (uint64_t) (offset / factor);
-    }
-}
-
-#ifdef TEST
-
-#include <assert.h>
-
-static void PrintQueueNode(opl_callback_queue_t *queue, int node, int depth)
-{
-    int i;
-
-    if (node >= queue->num_entries)
-    {
-        return;
-    }
-
-    for (i=0; i<depth * 3; ++i)
-    {
-        printf(" ");
-    }
-
-    printf("%i\n", queue->entries[node].time);
-
-    PrintQueueNode(queue, node * 2 + 1, depth + 1);
-    PrintQueueNode(queue, node * 2 + 2, depth + 1);
-}
-
-static void PrintQueue(opl_callback_queue_t *queue)
-{
-    PrintQueueNode(queue, 0, 0);
-}
-
-int main()
-{
-    opl_callback_queue_t *queue;
-    int iteration;
-
-    queue = OPL_Queue_Create();
-
-    for (iteration=0; iteration<5000; ++iteration)
-    {
-        opl_callback_t callback;
-        void *data;
-        unsigned int time;
-        unsigned int newtime;
-        int i;
-
-        for (i=0; i<MAX_OPL_QUEUE; ++i)
-        {
-            time = rand() % 0x10000;
-            OPL_Queue_Push(queue, NULL, NULL, time);
-        }
-
-        time = 0;
-
-        for (i=0; i<MAX_OPL_QUEUE; ++i)
-        {
-            assert(!OPL_Queue_IsEmpty(queue));
-            newtime = OPL_Queue_Peek(queue);
-            assert(OPL_Queue_Pop(queue, &callback, &data));
-
-            assert(newtime >= time);
-            time = newtime;
-        }
-
-        assert(OPL_Queue_IsEmpty(queue));
-        assert(!OPL_Queue_Pop(queue, &callback, &data));
-    }
-}
-
-#endif
-
diff --git a/games/NXDoom/opl/opl_queue.h b/games/NXDoom/opl/opl_queue.h
deleted file mode 100644
index 8b4f0dbee..000000000
--- a/games/NXDoom/opl/opl_queue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL callback queue.
-//
-
-#ifndef OPL_QUEUE_H
-#define OPL_QUEUE_H
-
-#include "opl.h"
-
-typedef struct opl_callback_queue_s opl_callback_queue_t;
-
-opl_callback_queue_t *OPL_Queue_Create(void);
-int OPL_Queue_IsEmpty(opl_callback_queue_t *queue);
-void OPL_Queue_Clear(opl_callback_queue_t *queue);
-void OPL_Queue_Destroy(opl_callback_queue_t *queue);
-void OPL_Queue_Push(opl_callback_queue_t *queue,
-                    opl_callback_t callback, void *data,
-                    uint64_t time);
-int OPL_Queue_Pop(opl_callback_queue_t *queue,
-                  opl_callback_t *callback, void **data);
-uint64_t OPL_Queue_Peek(opl_callback_queue_t *queue);
-void OPL_Queue_AdjustCallbacks(opl_callback_queue_t *queue,
-                               uint64_t time, float factor);
-
-#endif /* #ifndef OPL_QUEUE_H */
-
diff --git a/games/NXDoom/opl/opl_sdl.c b/games/NXDoom/opl/opl_sdl.c
deleted file mode 100644
index 2517de15c..000000000
--- a/games/NXDoom/opl/opl_sdl.c
+++ /dev/null
@@ -1,521 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL SDL interface.
-//
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "SDL.h"
-#ifndef DISABLE_SDL2MIXER
-#include "SDL_mixer.h"
-#endif  // DISABLE_SDL2MIXER
-
-#include "opl3.h"
-
-#include "opl.h"
-#include "opl_internal.h"
-
-#include "opl_queue.h"
-
-
-#ifndef DISABLE_SDL2MIXER
-
-
-#define MAX_SOUND_SLICE_TIME 100 /* ms */
-
-typedef struct
-{
-    unsigned int rate;        // Number of times the timer is advanced per sec.
-    unsigned int enabled;     // Non-zero if timer is enabled.
-    unsigned int value;       // Last value that was set.
-    uint64_t expire_time;     // Calculated time that timer will expire.
-} opl_timer_t;
-
-// When the callback mutex is locked using OPL_Lock, callback functions
-// are not invoked.
-
-static SDL_mutex *callback_mutex = NULL;
-
-// Queue of callbacks waiting to be invoked.
-
-static opl_callback_queue_t *callback_queue;
-
-// Mutex used to control access to the callback queue.
-
-static SDL_mutex *callback_queue_mutex = NULL;
-
-// Current time, in us since startup:
-
-static uint64_t current_time;
-
-// If non-zero, playback is currently paused.
-
-static int opl_sdl_paused;
-
-// Time offset (in us) due to the fact that callbacks
-// were previously paused.
-
-static uint64_t pause_offset;
-
-// OPL software emulator structure.
-
-static opl3_chip opl_chip;
-static int opl_opl3mode;
-
-// Temporary mixing buffer used by the mixing callback.
-
-static uint8_t *mix_buffer = NULL;
-
-// Register number that was written.
-
-static int register_num = 0;
-
-// Timers; DBOPL does not do timer stuff itself.
-
-static opl_timer_t timer1 = { 12500, 0, 0, 0 };
-static opl_timer_t timer2 = { 3125, 0, 0, 0 };
-
-// SDL parameters.
-
-static int sdl_was_initialized = 0;
-static int mixing_freq, mixing_channels;
-static Uint16 mixing_format;
-
-static int SDLIsInitialized(void)
-{
-    int freq, channels;
-    Uint16 format;
-
-    return Mix_QuerySpec(&freq, &format, &channels);
-}
-
-// Advance time by the specified number of samples, invoking any
-// callback functions as appropriate.
-
-static void AdvanceTime(unsigned int nsamples)
-{
-    opl_callback_t callback;
-    void *callback_data;
-    uint64_t us;
-
-    SDL_LockMutex(callback_queue_mutex);
-
-    // Advance time.
-
-    us = ((uint64_t) nsamples * OPL_SECOND) / mixing_freq;
-    current_time += us;
-
-    if (opl_sdl_paused)
-    {
-        pause_offset += us;
-    }
-
-    // Are there callbacks to invoke now?  Keep invoking them
-    // until there are no more left.
-
-    while (!OPL_Queue_IsEmpty(callback_queue)
-        && current_time >= OPL_Queue_Peek(callback_queue) + pause_offset)
-    {
-        // Pop the callback from the queue to invoke it.
-
-        if (!OPL_Queue_Pop(callback_queue, &callback, &callback_data))
-        {
-            break;
-        }
-
-        // The mutex stuff here is a bit complicated.  We must
-        // hold callback_mutex when we invoke the callback (so that
-        // the control thread can use OPL_Lock() to prevent callbacks
-        // from being invoked), but we must not be holding
-        // callback_queue_mutex, as the callback must be able to
-        // call OPL_SetCallback to schedule new callbacks.
-
-        SDL_UnlockMutex(callback_queue_mutex);
-
-        SDL_LockMutex(callback_mutex);
-        callback(callback_data);
-        SDL_UnlockMutex(callback_mutex);
-
-        SDL_LockMutex(callback_queue_mutex);
-    }
-
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-// Call the OPL emulator code to fill the specified buffer.
-
-static void FillBuffer(uint8_t *buffer, unsigned int nsamples)
-{
-    // This seems like a reasonable assumption.  mix_buffer is
-    // 1 second long, which should always be much longer than the
-    // SDL mix buffer.
-    assert(nsamples < mixing_freq);
-
-    // OPL output is generated into temporary buffer and then mixed
-    // (to avoid overflows etc.)
-    OPL3_GenerateStream(&opl_chip, (Bit16s *) mix_buffer, nsamples);
-    SDL_MixAudioFormat(buffer, mix_buffer, AUDIO_S16SYS, nsamples * 4,
-                       SDL_MIX_MAXVOLUME);
-}
-
-// Callback function to fill a new sound buffer:
-
-static void OPL_Mix_Callback(int chan, void *stream, int len, void *udata)
-{
-    unsigned int filled, buffer_samples;
-    Uint8 *buffer = (Uint8*)stream;
-
-    // Repeatedly call the OPL emulator update function until the buffer is
-    // full.
-    filled = 0;
-    buffer_samples = len / 4;
-
-    while (filled < buffer_samples)
-    {
-        uint64_t next_callback_time;
-        uint64_t nsamples;
-
-        SDL_LockMutex(callback_queue_mutex);
-
-        // Work out the time until the next callback waiting in
-        // the callback queue must be invoked.  We can then fill the
-        // buffer with this many samples.
-
-        if (opl_sdl_paused || OPL_Queue_IsEmpty(callback_queue))
-        {
-            nsamples = buffer_samples - filled;
-        }
-        else
-        {
-            next_callback_time = OPL_Queue_Peek(callback_queue) + pause_offset;
-
-            nsamples = (next_callback_time - current_time) * mixing_freq;
-            nsamples = (nsamples + OPL_SECOND - 1) / OPL_SECOND;
-
-            if (nsamples > buffer_samples - filled)
-            {
-                nsamples = buffer_samples - filled;
-            }
-        }
-
-        SDL_UnlockMutex(callback_queue_mutex);
-
-        // Add emulator output to buffer.
-
-        FillBuffer(buffer + filled * 4, nsamples);
-        filled += nsamples;
-
-        // Invoke callbacks for this point in time.
-
-        AdvanceTime(nsamples);
-    }
-}
-
-static void OPL_SDL_Shutdown(void)
-{
-    Mix_HookMusic(NULL, NULL);
-
-    if (sdl_was_initialized)
-    {
-        Mix_CloseAudio();
-        SDL_QuitSubSystem(SDL_INIT_AUDIO);
-        OPL_Queue_Destroy(callback_queue);
-        free(mix_buffer);
-        sdl_was_initialized = 0;
-    }
-
-/*
-    if (opl_chip != NULL)
-    {
-        OPLDestroy(opl_chip);
-        opl_chip = NULL;
-    }
-    */
-
-    if (callback_mutex != NULL)
-    {
-        SDL_DestroyMutex(callback_mutex);
-        callback_mutex = NULL;
-    }
-
-    if (callback_queue_mutex != NULL)
-    {
-        SDL_DestroyMutex(callback_queue_mutex);
-        callback_queue_mutex = NULL;
-    }
-}
-
-static unsigned int GetSliceSize(void)
-{
-    int limit;
-    int n;
-
-    limit = (opl_sample_rate * MAX_SOUND_SLICE_TIME) / 1000;
-
-    // Try all powers of two, not exceeding the limit.
-
-    for (n=0;; ++n)
-    {
-        // 2^n <= limit < 2^n+1 ?
-
-        if ((1 << (n + 1)) > limit)
-        {
-            return (1 << n);
-        }
-    }
-
-    // Should never happen?
-
-    return 1024;
-}
-
-static int OPL_SDL_Init(unsigned int port_base)
-{
-    // Check if SDL_mixer has been opened already
-    // If not, we must initialize it now
-
-    if (!SDLIsInitialized())
-    {
-        if (SDL_Init(SDL_INIT_AUDIO) < 0)
-        {
-            fprintf(stderr, "Unable to set up sound.\n");
-            return 0;
-        }
-
-        if (Mix_OpenAudioDevice(opl_sample_rate, AUDIO_S16SYS, 2, GetSliceSize(), NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
-        {
-            fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
-
-            SDL_QuitSubSystem(SDL_INIT_AUDIO);
-            return 0;
-        }
-
-        SDL_PauseAudio(0);
-
-        // When this module shuts down, it has the responsibility to 
-        // shut down SDL.
-
-        sdl_was_initialized = 1;
-    }
-    else
-    {
-        sdl_was_initialized = 0;
-    }
-
-    opl_sdl_paused = 0;
-    pause_offset = 0;
-
-    // Queue structure of callbacks to invoke.
-
-    callback_queue = OPL_Queue_Create();
-    current_time = 0;
-
-    // Get the mixer frequency, format and number of channels.
-
-    Mix_QuerySpec(&mixing_freq, &mixing_format, &mixing_channels);
-
-    // Only supports AUDIO_S16SYS
-
-    if (mixing_format != AUDIO_S16SYS || mixing_channels != 2)
-    {
-        fprintf(stderr, 
-                "OPL_SDL only supports native signed 16-bit LSB, "
-                "stereo format!\n");
-
-        OPL_SDL_Shutdown();
-        return 0;
-    }
-
-    // Mix buffer: four bytes per sample (16 bits * 2 channels):
-    mix_buffer = malloc(mixing_freq * 4);
-
-    // Create the emulator structure:
-
-    OPL3_Reset(&opl_chip, mixing_freq);
-    opl_opl3mode = 0;
-
-    callback_mutex = SDL_CreateMutex();
-    callback_queue_mutex = SDL_CreateMutex();
-
-    // Set postmix that adds the OPL music. This is deliberately done
-    // as a postmix and not using Mix_HookMusic() as the latter disables
-    // normal SDL_mixer music mixing.
-    Mix_RegisterEffect(MIX_CHANNEL_POST, OPL_Mix_Callback, NULL, NULL);
-
-    return 1;
-}
-
-static unsigned int OPL_SDL_PortRead(opl_port_t port)
-{
-    unsigned int result = 0;
-
-    if (port == OPL_REGISTER_PORT_OPL3)
-    {
-        return 0xff;
-    }
-
-    if (timer1.enabled && current_time > timer1.expire_time)
-    {
-        result |= 0x80;   // Either have expired
-        result |= 0x40;   // Timer 1 has expired
-    }
-
-    if (timer2.enabled && current_time > timer2.expire_time)
-    {
-        result |= 0x80;   // Either have expired
-        result |= 0x20;   // Timer 2 has expired
-    }
-
-    return result;
-}
-
-static void OPLTimer_CalculateEndTime(opl_timer_t *timer)
-{
-    int tics;
-
-    // If the timer is enabled, calculate the time when the timer
-    // will expire.
-
-    if (timer->enabled)
-    {
-        tics = 0x100 - timer->value;
-        timer->expire_time = current_time
-                           + ((uint64_t) tics * OPL_SECOND) / timer->rate;
-    }
-}
-
-static void WriteRegister(unsigned int reg_num, unsigned int value)
-{
-    switch (reg_num)
-    {
-        case OPL_REG_TIMER1:
-            timer1.value = value;
-            OPLTimer_CalculateEndTime(&timer1);
-            break;
-
-        case OPL_REG_TIMER2:
-            timer2.value = value;
-            OPLTimer_CalculateEndTime(&timer2);
-            break;
-
-        case OPL_REG_TIMER_CTRL:
-            if (value & 0x80)
-            {
-                timer1.enabled = 0;
-                timer2.enabled = 0;
-            }
-            else
-            {
-                if ((value & 0x40) == 0)
-                {
-                    timer1.enabled = (value & 0x01) != 0;
-                    OPLTimer_CalculateEndTime(&timer1);
-                }
-
-                if ((value & 0x20) == 0)
-                {
-                    timer2.enabled = (value & 0x02) != 0;
-                    OPLTimer_CalculateEndTime(&timer2);
-                }
-            }
-
-            break;
-
-        case OPL_REG_NEW:
-            opl_opl3mode = value & 0x01;
-
-        default:
-            OPL3_WriteRegBuffered(&opl_chip, reg_num, value);
-            break;
-    }
-}
-
-static void OPL_SDL_PortWrite(opl_port_t port, unsigned int value)
-{
-    if (port == OPL_REGISTER_PORT)
-    {
-        register_num = value;
-    }
-    else if (port == OPL_REGISTER_PORT_OPL3)
-    {
-        register_num = value | 0x100;
-    }
-    else if (port == OPL_DATA_PORT)
-    {
-        WriteRegister(register_num, value);
-    }
-}
-
-static void OPL_SDL_SetCallback(uint64_t us, opl_callback_t callback,
-                                void *data)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    OPL_Queue_Push(callback_queue, callback, data,
-                   current_time - pause_offset + us);
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-static void OPL_SDL_ClearCallbacks(void)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    OPL_Queue_Clear(callback_queue);
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-static void OPL_SDL_Lock(void)
-{
-    SDL_LockMutex(callback_mutex);
-}
-
-static void OPL_SDL_Unlock(void)
-{
-    SDL_UnlockMutex(callback_mutex);
-}
-
-static void OPL_SDL_SetPaused(int paused)
-{
-    opl_sdl_paused = paused;
-}
-
-static void OPL_SDL_AdjustCallbacks(float factor)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    OPL_Queue_AdjustCallbacks(callback_queue, current_time, factor);
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-opl_driver_t opl_sdl_driver =
-{
-    "SDL",
-    OPL_SDL_Init,
-    OPL_SDL_Shutdown,
-    OPL_SDL_PortRead,
-    OPL_SDL_PortWrite,
-    OPL_SDL_SetCallback,
-    OPL_SDL_ClearCallbacks,
-    OPL_SDL_Lock,
-    OPL_SDL_Unlock,
-    OPL_SDL_SetPaused,
-    OPL_SDL_AdjustCallbacks,
-};
-
-
-#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/opl/opl_timer.c b/games/NXDoom/opl/opl_timer.c
deleted file mode 100644
index 2c4ce273e..000000000
--- a/games/NXDoom/opl/opl_timer.c
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL timer thread.
-//     Once started using OPL_Timer_StartThread, the thread sleeps,
-//     waking up to invoke callbacks set using OPL_Timer_SetCallback.
-//
-
-#include "SDL.h"
-
-#include "opl_timer.h"
-#include "opl_queue.h"
-
-typedef enum
-{
-    THREAD_STATE_STOPPED,
-    THREAD_STATE_RUNNING,
-    THREAD_STATE_STOPPING,
-} thread_state_t;
-
-static SDL_Thread *timer_thread = NULL;
-static thread_state_t timer_thread_state;
-static uint64_t current_time;
-
-// If non-zero, callbacks are currently paused.
-
-static int opl_timer_paused;
-
-// Offset in microseconds to adjust time due to the fact that playback
-// was paused.
-
-static uint64_t pause_offset = 0;
-
-// Queue of callbacks waiting to be invoked.
-// The callback queue mutex is held while the callback queue structure
-// or current_time is being accessed.
-
-static opl_callback_queue_t *callback_queue;
-static SDL_mutex *callback_queue_mutex;
-
-// The timer mutex is held while timer callback functions are being
-// invoked, so that the calling code can prevent clashes.
-
-static SDL_mutex *timer_mutex;
-
-// Returns true if there is a callback at the head of the queue ready
-// to be invoked.  Otherwise, next_time is set to the time when the
-// timer thread must wake up again to check.
-
-static int CallbackWaiting(uint64_t *next_time)
-{
-    // If paused, just wait in 50ms increments until unpaused.
-    // Update pause_offset so after we unpause, the callback 
-    // times will be right.
-
-    if (opl_timer_paused)
-    {
-        *next_time = current_time + 50 * OPL_MS;
-        pause_offset += 50 * OPL_MS;
-        return 0;
-    }
-
-    // If there are no queued callbacks, sleep for 50ms at a time
-    // until a callback is added.
-
-    if (OPL_Queue_IsEmpty(callback_queue))
-    {
-        *next_time = current_time + 50 * OPL_MS;
-        return 0;
-    }
-
-    // Read the time of the first callback in the queue.
-    // If the time for the callback has not yet arrived,
-    // we must sleep until the callback time.
-
-    *next_time = OPL_Queue_Peek(callback_queue) + pause_offset;
-
-    return *next_time <= current_time;
-}
-
-static uint64_t GetNextTime(void)
-{
-    opl_callback_t callback;
-    void *callback_data;
-    uint64_t next_time;
-    int have_callback;
-
-    // Keep running through callbacks until there are none ready to
-    // run. When we run out of callbacks, next_time will be set.
-
-    do
-    {
-        SDL_LockMutex(callback_queue_mutex);
-
-        // Check if the callback at the head of the list is ready to
-        // be invoked.  If so, pop from the head of the queue.
-
-        have_callback = CallbackWaiting(&next_time);
-
-        if (have_callback)
-        {
-            OPL_Queue_Pop(callback_queue, &callback, &callback_data);
-        }
-
-        SDL_UnlockMutex(callback_queue_mutex);
-
-        // Now invoke the callback, if we have one.
-        // The timer mutex is held while the callback is invoked.
-
-        if (have_callback)
-        {
-            SDL_LockMutex(timer_mutex);
-            callback(callback_data);
-            SDL_UnlockMutex(timer_mutex);
-        }
-    } while (have_callback);
-
-    return next_time;
-}
-
-static int ThreadFunction(void *unused)
-{
-    uint64_t next_time;
-    uint64_t now;
-
-    // Keep running until OPL_Timer_StopThread is called.
-
-    while (timer_thread_state == THREAD_STATE_RUNNING)
-    {
-        // Get the next time that we must sleep until, and
-        // wait until that time.
-
-        next_time = GetNextTime();
-        now = SDL_GetTicks() * OPL_MS;
-
-        if (next_time > now)
-        {
-            SDL_Delay((next_time - now) / OPL_MS);
-        }
-
-        // Update the current time.
-
-        SDL_LockMutex(callback_queue_mutex);
-        current_time = next_time;
-        SDL_UnlockMutex(callback_queue_mutex);
-    }
-
-    timer_thread_state = THREAD_STATE_STOPPED;
-
-    return 0;
-}
-
-static void InitResources(void)
-{
-    callback_queue = OPL_Queue_Create();
-    timer_mutex = SDL_CreateMutex();
-    callback_queue_mutex = SDL_CreateMutex();
-}
-
-static void FreeResources(void)
-{
-    OPL_Queue_Destroy(callback_queue);
-    SDL_DestroyMutex(callback_queue_mutex);
-    SDL_DestroyMutex(timer_mutex);
-}
-
-int OPL_Timer_StartThread(void)
-{
-    InitResources();
-
-    timer_thread_state = THREAD_STATE_RUNNING;
-    current_time = SDL_GetTicks();
-    opl_timer_paused = 0;
-    pause_offset = 0;
-
-    timer_thread = SDL_CreateThread(ThreadFunction, "OPL timer thread", NULL);
-
-    if (timer_thread == NULL)
-    {
-        timer_thread_state = THREAD_STATE_STOPPED;
-        FreeResources();
-
-        return 0;
-    }
-
-    return 1;
-}
-
-void OPL_Timer_StopThread(void)
-{
-    timer_thread_state = THREAD_STATE_STOPPING;
-
-    while (timer_thread_state != THREAD_STATE_STOPPED)
-    {
-        SDL_Delay(1);
-    }
-
-    FreeResources();
-}
-
-void OPL_Timer_SetCallback(uint64_t us, opl_callback_t callback, void *data)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    OPL_Queue_Push(callback_queue, callback, data,
-                   current_time + us - pause_offset);
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-void OPL_Timer_ClearCallbacks(void)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    OPL_Queue_Clear(callback_queue);
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-void OPL_Timer_AdjustCallbacks(float factor)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    OPL_Queue_AdjustCallbacks(callback_queue, current_time, factor);
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
-void OPL_Timer_Lock(void)
-{
-    SDL_LockMutex(timer_mutex);
-}
-
-void OPL_Timer_Unlock(void)
-{
-    SDL_UnlockMutex(timer_mutex);
-}
-
-void OPL_Timer_SetPaused(int paused)
-{
-    SDL_LockMutex(callback_queue_mutex);
-    opl_timer_paused = paused;
-    SDL_UnlockMutex(callback_queue_mutex);
-}
-
diff --git a/games/NXDoom/opl/opl_timer.h b/games/NXDoom/opl/opl_timer.h
deleted file mode 100644
index adf815038..000000000
--- a/games/NXDoom/opl/opl_timer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL timer thread.
-//
-
-#ifndef OPL_TIMER_H
-#define OPL_TIMER_H
-
-#include "opl.h"
-
-int OPL_Timer_StartThread(void);
-void OPL_Timer_StopThread(void);
-void OPL_Timer_SetCallback(uint64_t us, opl_callback_t callback, void *data);
-void OPL_Timer_ClearCallbacks(void);
-void OPL_Timer_Lock(void);
-void OPL_Timer_Unlock(void);
-void OPL_Timer_SetPaused(int paused);
-void OPL_Timer_AdjustCallbacks(float factor);
-
-#endif /* #ifndef OPL_TIMER_H */
-
diff --git a/games/NXDoom/opl/opl_win32.c b/games/NXDoom/opl/opl_win32.c
deleted file mode 100644
index f0fd31c36..000000000
--- a/games/NXDoom/opl/opl_win32.c
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     OPL Win32 native interface.
-//
-
-#include "config.h"
-
-#ifdef _WIN32
-
-#include <stdio.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "opl.h"
-#include "opl_internal.h"
-#include "opl_timer.h"
-
-#include "ioperm_sys.h"
-
-static unsigned int opl_port_base;
-
-// MingW?
-
-#if defined(__GNUC__) && defined(__i386__)
-
-static unsigned int OPL_Win32_PortRead(opl_port_t port)
-{
-    unsigned char result;
-
-    __asm__ volatile (
-       "movl %1, %%edx\n"
-       "inb  %%dx, %%al\n"
-       "movb %%al, %0"
-       :   "=m" (result)
-       :   "r" (opl_port_base + port)
-       :   "edx", "al", "memory"
-    );
-
-    return result;
-}
-
-static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
-{
-    __asm__ volatile (
-       "movl %0, %%edx\n"
-       "movb %1, %%al\n"
-       "outb %%al, %%dx"
-       :
-       :   "r" (opl_port_base + port), "r" ((unsigned char) value)
-       :   "edx", "al"
-    );
-}
-
-// haleyjd 20110417: MSVC version
-#elif defined(_MSC_VER) && defined(_M_IX86)
-
-static unsigned int OPL_Win32_PortRead(opl_port_t port)
-{
-    unsigned char result;
-    opl_port_t dst_port = opl_port_base + port;
-    
-    __asm    
-    {
-        mov edx, dword ptr [dst_port]
-        in al, dx
-        mov byte ptr [result], al
-    }
-    
-    return result;
-}
-
-static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
-{
-    opl_port_t dst_port = opl_port_base + port;
-    
-    __asm    
-    {
-        mov edx, dword ptr [dst_port]
-        mov al, byte ptr [value]
-        out dx, al
-    }
-}
-
-#else
-
-// Not x86, or don't know how to do port R/W on this compiler.
-
-#define NO_PORT_RW
-
-static unsigned int OPL_Win32_PortRead(opl_port_t port)
-{
-    return 0;
-}
-
-static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
-{
-}
-
-#endif
-
-static int OPL_Win32_Init(unsigned int port_base)
-{
-
-    OSVERSIONINFO version_info;
-
-    opl_port_base = port_base;
-
-    // Check the OS version.
-
-    memset(&version_info, 0, sizeof(version_info));
-    version_info.dwOSVersionInfoSize = sizeof(version_info);
-
-    GetVersionEx(&version_info);
-
-#ifndef NO_PORT_RW
-    // On NT-based systems, we must acquire I/O port permissions
-    // using the ioperm.sys driver.
-
-    if (version_info.dwPlatformId == VER_PLATFORM_WIN32_NT)
-    {
-        // Install driver.
-
-        if (!IOperm_InstallDriver())
-        {
-            return 0;
-        }
-
-        // Open port range.
-
-        if (!IOperm_EnablePortRange(opl_port_base, 2, 1))
-        {
-            IOperm_UninstallDriver();
-            return 0;
-        }
-    }
-
-    // Start callback thread
-
-    if (!OPL_Timer_StartThread())
-    {
-        IOperm_UninstallDriver();
-        return 0;
-    }
-
-    return 1;
-
-#endif
-
-    return 0;
-}
-
-static void OPL_Win32_Shutdown(void)
-{
-    // Stop callback thread
-
-    OPL_Timer_StopThread();
-
-    // Unload IOperm library.
-
-    IOperm_UninstallDriver();
-}
-
-opl_driver_t opl_win32_driver =
-{
-    "Win32",
-    OPL_Win32_Init,
-    OPL_Win32_Shutdown,
-    OPL_Win32_PortRead,
-    OPL_Win32_PortWrite,
-    OPL_Timer_SetCallback,
-    OPL_Timer_ClearCallbacks,
-    OPL_Timer_Lock,
-    OPL_Timer_Unlock,
-    OPL_Timer_SetPaused,
-    OPL_Timer_AdjustCallbacks,
-};
-
-#endif /* #ifdef _WIN32 */
-
diff --git a/games/NXDoom/pcsound/CMakeLists.txt b/games/NXDoom/pcsound/CMakeLists.txt
deleted file mode 100644
index 6f1990181..000000000
--- a/games/NXDoom/pcsound/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-add_library(pcsound STATIC
-            pcsound.c       pcsound.h
-            pcsound_bsd.c
-            pcsound_sdl.c
-            pcsound_linux.c
-            pcsound_win32.c
-                            pcsound_internal.h)
-target_include_directories(pcsound
-                           INTERFACE "."
-                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-if (DEFINED EMSCRIPTEN)
-    if(ENABLE_SDL2_MIXER)
-        set_target_properties(pcsound PROPERTIES COMPILE_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
-        set_target_properties(pcsound PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s USE_SDL_MIXER=2")
-    else()
-        set_target_properties(pcsound PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-        set_target_properties(pcsound PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-    endif()
-else()
-    target_link_libraries(pcsound SDL2::SDL2)
-    if(ENABLE_SDL2_MIXER)
-        target_link_libraries(pcsound SDL2_mixer::SDL2_mixer)
-    endif()
-endif()
diff --git a/games/NXDoom/pcsound/Makefile.am b/games/NXDoom/pcsound/Makefile.am
deleted file mode 100644
index 12b2ae49d..000000000
--- a/games/NXDoom/pcsound/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-AM_CFLAGS=@SDLMIXER_CFLAGS@
-
-EXTRA_DIST=CMakeLists.txt
-
-noinst_LIBRARIES=libpcsound.a
-
-libpcsound_a_SOURCES =                            \
-        pcsound.c           pcsound.h             \
-        pcsound_bsd.c                             \
-        pcsound_sdl.c                             \
-        pcsound_linux.c                           \
-        pcsound_win32.c                           \
-                            pcsound_internal.h
-
diff --git a/games/NXDoom/pcsound/pcsound.c b/games/NXDoom/pcsound/pcsound.c
index b57fe73a6..8e7b73bd6 100644
--- a/games/NXDoom/pcsound/pcsound.c
+++ b/games/NXDoom/pcsound/pcsound.c
@@ -1,19 +1,28 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker interface.
-//
+/****************************************************************************
+ * apps/games/NXDoom/pcsound/pcsound.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *    PC speaker interface.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,97 +32,98 @@
 #include "pcsound.h"
 #include "pcsound_internal.h"
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static pcsound_driver_t *drivers[] = 
+static pcsound_driver_t *g_drivers[] =
 {
 #ifdef HAVE_LINUX_KD_H
-    &pcsound_linux_driver,
+  &pcsound_linux_driver,
 #endif
-#ifdef HAVE_BSD_SPEAKER
-    &pcsound_bsd_driver,
-#endif
-#ifdef _WIN32
-    &pcsound_win32_driver,
-#endif
-#ifndef DISABLE_SDL2MIXER
-    &pcsound_sdl_driver,
-#endif // DISABLE_SDL2MIXER
-    NULL,
+  NULL,
 };
 
-static pcsound_driver_t *pcsound_driver = NULL;
+static pcsound_driver_t *g_pcsound_driver = NULL;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 int pcsound_sample_rate;
 
-void PCSound_SetSampleRate(int rate)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void pc_sound_set_sample_rate(int rate)
 {
-    pcsound_sample_rate = rate;
+  pcsound_sample_rate = rate;
 }
 
-int PCSound_Init(pcsound_callback_func callback_func)
+int pc_sound_init(pcsound_callback_func callback_func)
 {
-    char *driver_name;
-    int i;
+  char *driver_name;
+  int i;
 
-    if (pcsound_driver != NULL)
+  if (g_pcsound_driver != NULL)
     {
-        return 1;
+      return 1;
     }
 
-    // Check if the environment variable is set
+  /* Check if the environment variable is set */
 
-    driver_name = getenv("PCSOUND_DRIVER");
+  driver_name = getenv("PCSOUND_DRIVER");
 
-    if (driver_name != NULL)
+  if (driver_name != NULL)
     {
-        for (i=0; drivers[i] != NULL; ++i)
+      for (i = 0; g_drivers[i] != NULL; ++i)
         {
-            if (!strcmp(drivers[i]->name, driver_name))
+          if (!strcmp(g_drivers[i]->name, driver_name))
             {
-                // Found the driver!
+              /* Found the driver! */
 
-                if (drivers[i]->init_func(callback_func))
+              if (g_drivers[i]->init_func(callback_func))
                 {
-                    pcsound_driver = drivers[i];
+                  g_pcsound_driver = g_drivers[i];
                 }
-                else
+              else
                 {
-                    printf("Failed to initialize PC sound driver: %s\n",
-                           drivers[i]->name);
-                    break;
+                  printf("Failed to initialize PC sound driver: %s\n",
+                         g_drivers[i]->name);
+                  break;
                 }
             }
         }
     }
-    else
+  else
     {
-        // Try all drivers until we find a working one
+      /* Try all drivers until we find a working one */
 
-        for (i=0; drivers[i] != NULL; ++i)
+      for (i = 0; g_drivers[i] != NULL; ++i)
         {
-            if (drivers[i]->init_func(callback_func)) 
+          if (g_drivers[i]->init_func(callback_func))
             {
-                pcsound_driver = drivers[i];
-                break;
+              g_pcsound_driver = g_drivers[i];
+              break;
             }
         }
     }
-    
-    if (pcsound_driver != NULL)
+
+  if (g_pcsound_driver != NULL)
     {
-        printf("Using PC sound driver: %s\n", pcsound_driver->name);
-        return 1;
+      printf("Using PC sound driver: %s\n", g_pcsound_driver->name);
+      return 1;
     }
-    else
+  else
     {
-        printf("Failed to find a working PC sound driver.\n");
-        return 0;
+      printf("Failed to find a working PC sound driver.\n");
+      return 0;
     }
 }
 
-void PCSound_Shutdown(void)
+void pc_sound_shutdown(void)
 {
-    pcsound_driver->shutdown_func();
-    pcsound_driver = NULL;
+  g_pcsound_driver->shutdown_func();
+  g_pcsound_driver = NULL;
 }
-
diff --git a/games/NXDoom/pcsound/pcsound.h b/games/NXDoom/pcsound/pcsound.h
index 4d567f240..0d1e0f3ba 100644
--- a/games/NXDoom/pcsound/pcsound.h
+++ b/games/NXDoom/pcsound/pcsound.h
@@ -1,38 +1,52 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker interface.
-//
+/****************************************************************************
+ * apps/games/NXDoom/pcsound/pcsound.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   PC speaker interface.
+ *
+ ****************************************************************************/
 
 #ifndef PCSOUND_H
 #define PCSOUND_H
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef void (*pcsound_callback_func)(int *duration, int *frequency);
 
-// Initialise the PC speaker subsystem.  The given function is called
-// periodically to request more sound data to play.
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-int PCSound_Init(pcsound_callback_func callback_func);
+/* Initialise the PC speaker subsystem.  The given function is called
+ * periodically to request more sound data to play.
+ */
 
-// Shut down the PC speaker subsystem.
+int pc_sound_init(pcsound_callback_func callback_func);
 
-void PCSound_Shutdown(void);
+/* Shut down the PC speaker subsystem. */
 
-// Set the preferred output sample rate when emulating a PC speaker. 
-// This must be called before PCSound_Init.
+void pc_sound_shutdown(void);
 
-void PCSound_SetSampleRate(int rate);
+/* Set the preferred output sample rate when emulating a PC speaker.
+ * This must be called before pc_sound_init.
+ */
 
-#endif /* #ifndef PCSOUND_H */
+void pc_sound_set_sample_rate(int rate);
 
+#endif /* PCSOUND_H */
diff --git a/games/NXDoom/pcsound/pcsound_bsd.c b/games/NXDoom/pcsound/pcsound_bsd.c
deleted file mode 100644
index a3055e7db..000000000
--- a/games/NXDoom/pcsound/pcsound_bsd.c
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker driver for [Open]BSD 
-//    (Should be NetBSD as well, but untested).
-//
-
-#include "config.h"
-
-// OpenBSD/NetBSD:
-
-#ifdef HAVE_DEV_ISA_SPKRIO_H
-#define HAVE_BSD_SPEAKER
-#include <dev/isa/spkrio.h>
-#endif
-
-// FreeBSD
-
-#ifdef HAVE_DEV_SPEAKER_SPEAKER_H
-#define HAVE_BSD_SPEAKER
-#include <dev/speaker/speaker.h>
-#endif
-
-#ifdef HAVE_BSD_SPEAKER
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "SDL.h"
-#include "SDL_thread.h"
-
-#include "pcsound.h"
-#include "pcsound_internal.h"
-
-#define SPEAKER_DEVICE "/dev/speaker"
-
-//
-// This driver is far more complicated than it should be, because 
-// OpenBSD has sucky support for threads.  Because multithreading
-// is done in userspace, invoking the ioctl to make the speaker
-// beep will lock all threads until the beep has completed.  
-// 
-// Thus, to get the beeping to occur in real-time, we must invoke
-// the ioctl in a separate process.  To do this, a separate 
-// sound server is forked that listens on a socket for tones to
-// play.  When a tone is received, a reply is sent back to the
-// main process and the tone played.
-//
-// Meanwhile, back in the main process, there is a sound thread
-// that runs, invoking the pcsound callback function to get 
-// more tones.  This blocks on the sound server socket, waiting
-// for replies.  In this way, when the sound server finishes 
-// playing a tone, the next one is sent.
-//
-// This driver is a bit less accurate than the others, because
-// we can only specify sound durations in 1/100ths of a second,
-// as opposed to the normal millisecond durations.
-
-static pcsound_callback_func callback;
-static int sound_server_pid;
-static int sleep_adjust = 0;
-static int sound_thread_running;
-static SDL_Thread *sound_thread_handle;
-static int sound_server_pipe[2];
-
-// Play a sound, checking how long the system call takes to complete
-// and autoadjusting for drift.
-
-static void AdjustedBeep(int speaker_handle, int ms, int freq)
-{
-    unsigned int start_time;
-    unsigned int end_time;
-    unsigned int actual_time;
-    tone_t tone;
-
-    // Adjust based on previous error to keep the tempo right
-
-    if (sleep_adjust > ms)
-    {
-        sleep_adjust -= ms;
-        return;
-    }
-    else
-    {
-        ms -= sleep_adjust;
-    }
-
-    // Invoke the system call and time how long it takes
-
-    start_time = SDL_GetTicks();
-
-    tone.duration = ms / 10;        // in 100ths of a second
-    tone.frequency = freq;
-
-    // Always a positive duration
-
-    if (tone.duration < 1)
-    {
-        tone.duration = 1;
-    }
-
-    if (ioctl(speaker_handle, SPKRTONE, &tone) != 0)
-    {
-        perror("ioctl");
-        return;
-    }
-    
-    end_time = SDL_GetTicks();
-
-    if (end_time > start_time)
-    {
-        actual_time = end_time - start_time;
-    }
-    else
-    {
-        actual_time = ms;
-    }
-
-    if (actual_time < ms)
-    {
-        actual_time = ms;
-    }
-
-    // Save sleep_adjust for next time
-
-    sleep_adjust = actual_time - ms;
-}
-
-static void SoundServer(int speaker_handle)
-{
-    tone_t tone;
-    int result;
-
-    // Run in a loop, invoking the callback
-
-    for (;;)
-    {
-        result = read(sound_server_pipe[1], &tone, sizeof(tone_t));
-
-        if (result < 0)
-        {
-            perror("read");
-            return;
-        }
-
-        // Send back a response, so the main process knows to send another
-
-        write(sound_server_pipe[1], &tone, sizeof(tone_t));
-
-        // Beep! (blocks until complete)
-
-        AdjustedBeep(speaker_handle, tone.duration, tone.frequency);
-    }
-}
-
-// Start up the sound server.  Returns non-zero if successful.
-
-static int StartSoundServer(void)
-{
-    int result;
-    int speaker_handle;
-
-    // Try to open the speaker device
-
-    speaker_handle = open(SPEAKER_DEVICE, O_WRONLY);
-
-    if (speaker_handle == -1)
-    {
-        // Don't have permissions for the console device?
-
-	fprintf(stderr, "StartSoundServer: Failed to open '%s': %s\n",
-                        SPEAKER_DEVICE, strerror(errno));
-        return 0;
-    }
-
-    // Create a pipe for communications
-
-    if (socketpair(AF_UNIX, SOCK_STREAM, 0, sound_server_pipe) < 0)
-    {
-        perror("socketpair");
-        close(speaker_handle);
-        return 0;
-    }
-
-    // Start a separate process to generate PC speaker output
-    // We can't use the SDL threading functions because OpenBSD's
-    // threading sucks :-(
-    
-    result = fork();
-
-    if (result < 0)
-    {
-        fprintf(stderr, "Failed to fork sound server!\n");
-        close(speaker_handle);
-        return 0;
-    }
-    else if (result == 0)
-    {
-        // This is the child (sound server)
-
-        SoundServer(speaker_handle);
-        close(speaker_handle);
-
-        exit(0);
-    }
-    else
-    {
-        // This is the parent
-
-        sound_server_pid = result;
-        close(speaker_handle);
-    }
-
-    return 1;
-}
-
-static void StopSoundServer(void)
-{
-    int status;
-
-    kill(sound_server_pid, SIGINT);
-    waitpid(sound_server_pid, &status, 0);
-}
-
-static int SoundThread(void *unused)
-{
-    tone_t tone;
-    int duration;
-    int frequency;
-
-    while (sound_thread_running)
-    {
-        // Get the next frequency to play
-
-        callback(&duration, &frequency);
-
-//printf("dur: %i, freq: %i\n", duration, frequency);
-
-        // Build up a tone structure and send to the sound server
-
-        tone.frequency = frequency;
-        tone.duration = duration;
-
-        if (write(sound_server_pipe[0], &tone, sizeof(tone_t)) < 0) 
-        {
-            perror("write");
-            break;
-        }
-
-        // Wait until the sound server responds before sending another
-
-        if (read(sound_server_pipe[0], &tone, sizeof(tone_t)) < 0)
-        {
-            perror("read");
-            break;
-        }
-    }
-
-    return 0;
-}
-
-static int PCSound_BSD_Init(pcsound_callback_func callback_func)
-{
-    callback = callback_func;
-
-    if (!StartSoundServer())
-    {
-        fprintf(stderr, "PCSound_BSD_Init: Failed to start sound server.\n");
-        return 0;
-    }
-
-    sound_thread_running = 1;
-    sound_thread_handle =
-        SDL_CreateThread(SoundThread, "PC speaker thread", NULL);
-
-    return 1;
-}
-
-static void PCSound_BSD_Shutdown(void)
-{
-    // Stop the sound thread
-
-    sound_thread_running = 0;
-
-    SDL_WaitThread(sound_thread_handle, NULL);
-
-    // Stop the sound server
-
-    StopSoundServer();
-}
-
-pcsound_driver_t pcsound_bsd_driver =
-{
-    "BSD",
-    PCSound_BSD_Init,
-    PCSound_BSD_Shutdown,
-};
-
-#endif /* #ifdef HAVE_BSD_SPEAKER */
-
diff --git a/games/NXDoom/pcsound/pcsound_internal.h b/games/NXDoom/pcsound/pcsound_internal.h
index 7611c595f..295ad6266 100644
--- a/games/NXDoom/pcsound/pcsound_internal.h
+++ b/games/NXDoom/pcsound/pcsound_internal.h
@@ -1,33 +1,43 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker interface.
-//
+/****************************************************************************
+ * apps/games/NXDoom/pcsound/pcsound_internal.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *    PC speaker interface.
+ *
+ ****************************************************************************/
 
 #ifndef PCSOUND_INTERNAL_H
 #define PCSOUND_INTERNAL_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "pcsound.h"
 
-#ifdef HAVE_DEV_ISA_SPKRIO_H
-#define HAVE_BSD_SPEAKER
-#endif
-#ifdef HAVE_DEV_SPEAKER_SPEAKER_H
-#define HAVE_BSD_SPEAKER
-#endif
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define PCSOUND_8253_FREQUENCY 1193280
+#define PCSOUND_8253_FREQUENCY (1193280)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef struct pcsound_driver_s pcsound_driver_t;
 typedef int (*pcsound_init_func)(pcsound_callback_func callback);
@@ -35,28 +45,21 @@ typedef void (*pcsound_shutdown_func)(void);
 
 struct pcsound_driver_s
 {
-    const char *name;
-    pcsound_init_func init_func;
-    pcsound_shutdown_func shutdown_func;
+  const char *name;
+  pcsound_init_func init_func;
+  pcsound_shutdown_func shutdown_func;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern int pcsound_sample_rate;
 
-
-#ifdef _WIN32
-extern pcsound_driver_t pcsound_win32_driver;
-#endif
-
-#ifdef HAVE_BSD_SPEAKER
-extern pcsound_driver_t pcsound_bsd_driver;
-#endif
-
 #ifdef HAVE_LINUX_KD_H
 extern pcsound_driver_t pcsound_linux_driver;
 #endif
 
 extern pcsound_driver_t pcsound_sdl_driver;
 
-
-#endif /* #ifndef PCSOUND_INTERNAL_H */
-
+#endif /* PCSOUND_INTERNAL_H */
diff --git a/games/NXDoom/pcsound/pcsound_linux.c b/games/NXDoom/pcsound/pcsound_linux.c
deleted file mode 100644
index 7cb59c9b9..000000000
--- a/games/NXDoom/pcsound/pcsound_linux.c
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker driver for Linux.
-//
-
-#include "config.h"
-
-#ifdef HAVE_LINUX_KD_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <linux/kd.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "SDL.h"
-#include "SDL_thread.h"
-
-#include "pcsound.h"
-#include "pcsound_internal.h"
-
-#define CONSOLE_DEVICE "/dev/console"
-
-static int console_handle;
-static pcsound_callback_func callback;
-static int sound_thread_running = 0;
-static SDL_Thread *sound_thread_handle;
-static int sleep_adjust = 0;
-
-static void AdjustedSleep(unsigned int ms)
-{
-    unsigned int start_time;
-    unsigned int end_time;
-    unsigned int actual_time;
-
-    // Adjust based on previous error to keep the tempo right
-
-    if (sleep_adjust > ms)
-    {
-        sleep_adjust -= ms;
-        return;
-    }
-    else
-    {
-        ms -= sleep_adjust;
-    }
-
-    // Do the sleep and record how long it takes
-
-    start_time = SDL_GetTicks();
-
-    SDL_Delay(ms);
-    
-    end_time = SDL_GetTicks();
-
-    if (end_time > start_time)
-    {
-        actual_time = end_time - start_time;
-    }
-    else
-    {
-        actual_time = ms;
-    }
-
-    if (actual_time < ms)
-    {
-        actual_time = ms;
-    }
-
-    // Save sleep_adjust for next time
-
-    sleep_adjust = actual_time - ms;
-}
-
-static int SoundThread(void *unused)
-{
-    int current_freq = 0;
-    int frequency;
-    int duration;
-    int cycles;
-    
-    while (sound_thread_running)
-    {
-        callback(&duration, &frequency);
-
-        if (current_freq != frequency)
-        {
-            current_freq = frequency;
-            if (frequency != 0)
-            {
-                cycles = PCSOUND_8253_FREQUENCY / frequency;
-            }
-            else
-            {
-                cycles = 0;
-            }
-
-            ioctl(console_handle, KIOCSOUND, cycles);
-        }
-
-        AdjustedSleep(duration);
-    }
-
-    return 0;
-}
-
-static int PCSound_Linux_Init(pcsound_callback_func callback_func)
-{
-    // Try to open the console
-
-    console_handle = open(CONSOLE_DEVICE, O_WRONLY);
-
-    if (console_handle == -1)
-    {
-        // Don't have permissions for the console device?
-
-	fprintf(stderr, "PCSound_Linux_Init: Failed to open '%s': %s\n",
-			CONSOLE_DEVICE, strerror(errno));
-        return 0;
-    }
-
-    if (ioctl(console_handle, KIOCSOUND, 0) < 0)
-    {
-        // KIOCSOUND not supported: non-PC linux?
-
-        close(console_handle);
-        return 0;
-    }
-
-    // Start a thread up to generate PC speaker output
-    
-    callback = callback_func;
-    sound_thread_running = 1;
-
-    sound_thread_handle =
-        SDL_CreateThread(SoundThread, "PC speaker thread", NULL);
-
-    return 1;
-}
-
-static void PCSound_Linux_Shutdown(void)
-{
-    sound_thread_running = 0;
-    SDL_WaitThread(sound_thread_handle, NULL);
-    close(console_handle);
-}
-
-pcsound_driver_t pcsound_linux_driver =
-{
-    "Linux",
-    PCSound_Linux_Init,
-    PCSound_Linux_Shutdown,
-};
-
-#endif /* #ifdef HAVE_LINUX_KD_H */
-
diff --git a/games/NXDoom/pcsound/pcsound_sdl.c b/games/NXDoom/pcsound/pcsound_sdl.c
deleted file mode 100644
index d38a97b82..000000000
--- a/games/NXDoom/pcsound/pcsound_sdl.c
+++ /dev/null
@@ -1,254 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker interface.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "config.h"
-
-#include "SDL.h"
-
-#include "pcsound.h"
-#include "pcsound_internal.h"
-
-
-#ifndef DISABLE_SDL2MIXER
-
-#include "SDL_mixer.h"
-
-
-#define MAX_SOUND_SLICE_TIME 70 /* ms */
-#define SQUARE_WAVE_AMP 0x2000
-
-// If true, we initialized SDL and have the responsibility to shut it 
-// down
-
-static int sdl_was_initialized = 0;
-
-// Callback function to invoke when we want new sound data
-
-static pcsound_callback_func callback;
-
-// Output sound format
-
-static int mixing_freq;
-static Uint16 mixing_format;
-static int mixing_channels;
-
-// Currently playing sound
-// current_remaining is the number of remaining samples that must be played
-// before we invoke the callback to get the next frequency.
-
-static int current_remaining;
-static int current_freq;
-
-static int phase_offset = 0;
-
-// Mixer function that does the PC speaker emulation
-
-static void PCSound_Mix_Callback(int chan, void *stream, int len, void *udata)
-{
-    Sint16 *leftptr;
-    Sint16 *rightptr;
-    Sint16 this_value;
-    int frequency;
-    int i;
-    int nsamples;
-
-    // Number of samples is quadrupled, because of 16-bit and stereo
-
-    nsamples = len / 4;
-
-    leftptr = (Sint16 *) stream;
-    rightptr = ((Sint16 *) stream) + 1;
-    
-    // Fill the output buffer
-
-    for (i=0; i<nsamples; ++i)
-    {
-        // Has this sound expired? If so, invoke the callback to get 
-        // the next frequency.
-
-        while (current_remaining == 0) 
-        {
-            // Get the next frequency to play
-
-            callback(&current_remaining, &frequency);
-
-            if (current_freq != frequency)
-            {
-                current_freq = frequency;
-                phase_offset = 0;
-            }
-
-            current_remaining = (current_remaining * mixing_freq) / 1000;
-        }
-
-        // Set the value for this sample.
-        
-        if (current_freq == 0)
-        {
-            // Silence
-
-            this_value = 0;
-        }
-        else 
-        {
-            int frac;
-
-            // Determine whether we are at a peak or trough in the current
-            // sound.  Multiply by 2 so that frac % 2 will give 0 or 1 
-            // depending on whether we are at a peak or trough.
-
-            frac = (phase_offset * current_freq * 2) / mixing_freq;
-
-            if ((frac % 2) == 0) 
-            {
-                this_value = SQUARE_WAVE_AMP;
-            }
-            else
-            {
-                this_value = -SQUARE_WAVE_AMP;
-            }
-
-            ++phase_offset;
-        }
-
-        --current_remaining;
-
-        // Use the same value for the left and right channels.
-
-        *leftptr += this_value;
-        *rightptr += this_value;
-
-        leftptr += 2;
-        rightptr += 2;
-    }
-}
-
-static int SDLIsInitialized(void)
-{
-    int freq, channels;
-    Uint16 format;
-
-    return Mix_QuerySpec(&freq, &format, &channels);
-}
-
-static void PCSound_SDL_Shutdown(void)
-{
-    if (sdl_was_initialized)
-    {
-        Mix_CloseAudio();
-        SDL_QuitSubSystem(SDL_INIT_AUDIO);
-        sdl_was_initialized = 0;
-    }
-}
-
-// Calculate slice size, based on MAX_SOUND_SLICE_TIME.
-// The result must be a power of two.
-
-static int GetSliceSize(void)
-{
-    int limit;
-    int n;
-
-    limit = (pcsound_sample_rate * MAX_SOUND_SLICE_TIME) / 1000;
-
-    // Try all powers of two, not exceeding the limit.
-
-    for (n=0;; ++n)
-    {
-        // 2^n <= limit < 2^n+1 ?
-
-        if ((1 << (n + 1)) > limit)
-        {
-            return (1 << n);
-        }
-    }
-
-    // Should never happen?
-
-    return 1024;
-}
-
-static int PCSound_SDL_Init(pcsound_callback_func callback_func)
-{
-    int slicesize;
-
-    // Check if SDL_mixer has been opened already
-    // If not, we must initialize it now
-
-    if (!SDLIsInitialized())
-    {
-        if (SDL_Init(SDL_INIT_AUDIO) < 0)
-        {
-            fprintf(stderr, "Unable to set up sound.\n");
-            return 0;
-        }
-
-        slicesize = GetSliceSize();
-
-        if (Mix_OpenAudioDevice(pcsound_sample_rate, AUDIO_S16SYS, 2, slicesize, NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
-        {
-            fprintf(stderr, "Error initializing SDL_mixer: %s\n", Mix_GetError());
-
-            SDL_QuitSubSystem(SDL_INIT_AUDIO);
-            return 0;
-        }
-
-        SDL_PauseAudio(0);
-
-        // When this module shuts down, it has the responsibility to 
-        // shut down SDL.
-
-        sdl_was_initialized = 1;
-    }
-
-    // Get the mixer frequency, format and number of channels.
-
-    Mix_QuerySpec(&mixing_freq, &mixing_format, &mixing_channels);
-
-    // Only supports AUDIO_S16SYS
-
-    if (mixing_format != AUDIO_S16SYS || mixing_channels != 2)
-    {
-        fprintf(stderr, 
-                "PCSound_SDL only supports native signed 16-bit LSB, "
-                "stereo format!\n");
-
-        PCSound_SDL_Shutdown();
-        return 0;
-    }
-
-    callback = callback_func;
-    current_freq = 0;
-    current_remaining = 0;
-
-    Mix_RegisterEffect(MIX_CHANNEL_POST, PCSound_Mix_Callback, NULL, NULL);
-
-    return 1;
-}
-
-pcsound_driver_t pcsound_sdl_driver = 
-{
-    "SDL",
-    PCSound_SDL_Init,
-    PCSound_SDL_Shutdown,
-};
-
-
-#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/pcsound/pcsound_win32.c b/games/NXDoom/pcsound/pcsound_win32.c
deleted file mode 100644
index 91885f685..000000000
--- a/games/NXDoom/pcsound/pcsound_win32.c
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    PC speaker interface.
-//
-
-#ifdef _WIN32
-
-#include "SDL.h"
-#include "SDL_thread.h"
-#include <windows.h>
-
-#include "pcsound.h"
-#include "pcsound_internal.h"
-
-static SDL_Thread *sound_thread_handle;
-static int sound_thread_running;
-static pcsound_callback_func callback;
-
-static int SoundThread(void *unused)
-{
-    int frequency;
-    int duration;
-    
-    while (sound_thread_running)
-    {
-        callback(&duration, &frequency);
-
-        if (frequency != 0) 
-        {
-            Beep(frequency, duration);
-        }
-        else
-        {
-            Sleep(duration);
-        }
-    }
-    
-    return 0;    
-}
-
-static int PCSound_Win32_Init(pcsound_callback_func callback_func)
-{
-    OSVERSIONINFO osvi;
-    BOOL result;
-
-    // Temporarily disabled - the Windows scheduler is strange and 
-    // stupid.
-   
-    return 0;
-
-    // Find the OS version
-
-    osvi.dwOSVersionInfoSize = sizeof(osvi);
-
-    result = GetVersionEx(&osvi);
-
-    if (!result)
-    {
-        return 0;
-    }
-
-    // Beep() ignores its arguments on win9x, so this driver will
-    // not work there.
-    if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT)
-    {
-        return 0;
-    }
-
-    // Start a thread to play sound.
-
-    callback = callback_func;
-    sound_thread_running = 1;
-
-    sound_thread_handle =
-        SDL_CreateThread(SoundThread, "PC speaker thread", NULL);
-
-    return 1;
-}
-
-static void PCSound_Win32_Shutdown(void)
-{
-    sound_thread_running = 0;
-    SDL_WaitThread(sound_thread_handle, NULL);
-}
-
-pcsound_driver_t pcsound_win32_driver = 
-{
-    "Windows",
-    PCSound_Win32_Init,
-    PCSound_Win32_Shutdown,
-};
-
-#endif /* #ifdef _WIN32 */
-
diff --git a/games/NXDoom/pkg/.gitignore b/games/NXDoom/pkg/.gitignore
deleted file mode 100644
index a1dd1cde4..000000000
--- a/games/NXDoom/pkg/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-config.make
diff --git a/games/NXDoom/pkg/Makefile.am b/games/NXDoom/pkg/Makefile.am
deleted file mode 100644
index 3a287b246..000000000
--- a/games/NXDoom/pkg/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-OSX_FILES=                                                              \
-osx/Resources/app.png                                                   \
-osx/Resources/launcher.nib/designable.nib                               \
-osx/Resources/launcher.nib/keyedobjects.nib                             \
-osx/disk/dir.DS_Store                                                   \
-osx/disk/background.png                                                 \
-osx/GNUmakefile                                                         \
-osx/Info.plist.in                                                       \
-osx/PkgInfo                                                             \
-osx/cp-with-libs                                                        \
-osx/dmgfix                                                              \
-osx/main.m                                                              \
-osx/AppController.m     osx/AppController.h                             \
-osx/Execute.m           osx/Execute.h                                   \
-osx/IWADController.m    osx/IWADController.h                            \
-osx/LauncherManager.m   osx/LauncherManager.h
-
-WIN32_FILES=                                                            \
-win32/GNUmakefile                                                       \
-win32/cp-with-libs                                                      \
-win32/README
-
-EXTRA_DIST=style.html $(OSX_FILES) $(WIN32_FILES)
-
diff --git a/games/NXDoom/pkg/config.make.in b/games/NXDoom/pkg/config.make.in
deleted file mode 100644
index 972be10e4..000000000
--- a/games/NXDoom/pkg/config.make.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# Shared file included by the makefiles used to build packages.
-# This contains various information needed by the makefiles,
-# and is autogenerated by configure to include various
-# necessary details.
-
-# Tools needed:
-
-CC = @CC@
-OBJDUMP = @OBJDUMP@
-STRIP = @STRIP@
-LDFLAGS = @LDFLAGS@
-
-# Package name and version number:
-
-PROGRAM_PREFIX = @PROGRAM_PREFIX@
-PACKAGE = @PACKAGE@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-
-TARGET_OS = @TARGET_OS@
-
-# Documentation files to distribute with packages.
-
-DOC_FILES = README.md        \
-            README.Music.md  \
-            COPYING.md       \
-            NEWS.md
-
diff --git a/games/NXDoom/pkg/osx/.gitignore b/games/NXDoom/pkg/osx/.gitignore
deleted file mode 100644
index a2b2f72de..000000000
--- a/games/NXDoom/pkg/osx/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Info.plist
-app.iconset
-app.icns
-wadfile.iconset
-wadfile.icns
-launcher
-*.o
-*.d
-*.dmg
-staging
diff --git a/games/NXDoom/pkg/osx/AppController.h b/games/NXDoom/pkg/osx/AppController.h
deleted file mode 100644
index 37340ca2c..000000000
--- a/games/NXDoom/pkg/osx/AppController.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef LAUNCHER_APPCONTROLLER_H
-#define LAUNCHER_APPCONTROLLER_H
-
-#include <AppKit/AppKit.h>
-
-#include "LauncherManager.h"
-
-@interface AppController : NSObject
-{
-    LauncherManager *launcherManager;
-    BOOL filesAdded;
-}
-
-+ (void)initialize;
-
-- (id)init;
-- (void)dealloc;
-
-- (void)awakeFromNib;
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotif;
-- (BOOL)applicationShouldTerminate:(id)sender;
-- (void)applicationWillTerminate:(NSNotification *)aNotif;
-- (BOOL)application:(NSApplication *)application openFile:(NSString *)fileName;
-
-- (void)showPrefPanel:(id)sender;
-
-@end
-
-#endif
-
diff --git a/games/NXDoom/pkg/osx/AppController.m b/games/NXDoom/pkg/osx/AppController.m
deleted file mode 100644
index 428eb9d07..000000000
--- a/games/NXDoom/pkg/osx/AppController.m
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include "AppController.h"
-
-#include "config.h"
-
-@implementation AppController
-
-+ (void)initialize
-{
-    NSMutableDictionary *defaults = [NSMutableDictionary dictionary];
-
-    /*
-     * Register your app's defaults here by adding objects to the
-     * dictionary, eg
-     *
-     * [defaults setObject:anObject forKey:keyForThatObject];
-     *
-     */
-
-    [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-- (id)init
-{
-    if ((self = [super init]))
-    {
-    }
-
-    self->filesAdded = NO;
-
-    return self;
-}
-
-- (void)dealloc
-{
-    [super dealloc];
-}
-
-- (void)awakeFromNib
-{
-    [[NSApp mainMenu] setTitle:@PACKAGE_NAME];
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotif
-{
-// Uncomment if your application is Renaissance-based
-//  [NSBundle loadGSMarkupNamed:@"Main" owner:self];
-}
-
-- (BOOL)applicationShouldTerminate:(id)sender
-{
-    return YES;
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotif
-{
-}
-
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)_ {
-    return YES;
-}
-
-- (BOOL) application:(NSApplication *) application
-         openFile:(NSString *) fileName
-{
-    NSString *extension;
-
-    // This may be an IWAD.  If so, add it to the IWAD configuration;
-    // don't add it like a PWAD.
-
-    if ([self->launcherManager addIWADPath: fileName])
-    {
-        return YES;
-    }
-
-    // If this is the first file added, clear out the existing
-    // command line.  This allows us to select multiple files
-    // in the finder and open them all together (for TCs, etc).
-
-    if (!self->filesAdded)
-    {
-        [self->launcherManager clearCommandLine];
-    }
-
-    // Add file with appropriate command line option based on extension:
-
-    extension = [fileName pathExtension];
-
-    if (![extension caseInsensitiveCompare: @"wad"])
-    {
-        [self->launcherManager addFileToCommandLine: fileName
-                               forArgument: @"-merge"];
-    }
-    else if (![extension caseInsensitiveCompare: @"lmp"])
-    {
-        [self->launcherManager addFileToCommandLine: fileName
-                               forArgument: @"-playdemo"];
-    }
-    else if (![extension caseInsensitiveCompare: @"deh"])
-    {
-        [self->launcherManager addFileToCommandLine: fileName
-                               forArgument: @"-deh"];
-        [self->launcherManager selectGameByName: "doom"];
-    }
-    else if (![extension caseInsensitiveCompare: @"hhe"])
-    {
-        [self->launcherManager addFileToCommandLine: fileName
-                               forArgument: @"-deh"];
-        [self->launcherManager selectGameByName: "heretic"];
-    }
-    else if (![extension caseInsensitiveCompare: @"seh"])
-    {
-        [self->launcherManager addFileToCommandLine: fileName
-                               forArgument: @"-deh"];
-        [self->launcherManager selectGameByName: "strife"];
-    }
-    else
-    {
-        return NO;
-    }
-
-    self->filesAdded = YES;
-
-    return YES;
-}
-
-- (void)showPrefPanel:(id)sender
-{
-}
-
-@end
-
diff --git a/games/NXDoom/pkg/osx/Execute.h b/games/NXDoom/pkg/osx/Execute.h
deleted file mode 100644
index fbb19c6f8..000000000
--- a/games/NXDoom/pkg/osx/Execute.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef LAUNCHER_EXECUTE_H
-#define LAUNCHER_EXECUTE_H
-
-void SetProgramLocation(const char *path);
-void ExecuteProgram(const char *executable, const char *iwad, const char *args);
-void OpenTerminalWindow(const char *doomwadpath);
-void OpenDocumentation(const char *filename);
-
-#endif /* #ifndef LAUNCHER_EXECUTE_H */
-
diff --git a/games/NXDoom/pkg/osx/Execute.m b/games/NXDoom/pkg/osx/Execute.m
deleted file mode 100644
index 2d5d59310..000000000
--- a/games/NXDoom/pkg/osx/Execute.m
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <AppKit/AppKit.h>
-
-#include "config.h"
-
-#define RESPONSE_FILE "/tmp/launcher.rsp"
-#define TEMP_SCRIPT "/tmp/tempscript.sh"
-#define WINDOW_TITLE PACKAGE_STRING " command prompt"
-
-static char *executable_path;
-
-// Called on startup to save the location of the launcher program
-// (within a package, other executables should be in the same directory)
-
-void SetProgramLocation(const char *path)
-{
-    char *p;
-
-    executable_path = strdup(path);
-
-    p = strrchr(executable_path, '/');
-    *p = '\0';
-}
-
-// Write out the response file containing command line arguments.
-
-static void WriteResponseFile(const char *iwad, const char *args)
-{
-    FILE *fstream;
-
-    fstream = fopen(RESPONSE_FILE, "w");
-
-    if (iwad != NULL)
-    {
-        fprintf(fstream, "-iwad \"%s\"", iwad);
-    }
-
-    if (args != NULL)
-    {
-        fprintf(fstream, "%s", args);
-    }
-
-    fclose(fstream);
-}
-
-static void DoExec(const char *executable, const char *iwad, const char *args)
-{
-    char *argv[3];
-
-    asprintf(&argv[0], "%s/%s", executable_path, executable);
-
-    if (iwad != NULL || args != NULL)
-    {
-        WriteResponseFile(iwad, args);
-
-        argv[1] = "@" RESPONSE_FILE;
-        argv[2] = NULL;
-    }
-    else
-    {
-        argv[1] = NULL;
-    }
-
-    execv(argv[0], argv);
-    exit(-1);
-}
-
-// Execute the specified executable contained in the same directory
-// as the launcher, with the specified arguments.
-
-void ExecuteProgram(const char *executable, const char *iwad, const char *args)
-{
-    pid_t childpid;
-    char *homedir;
-
-    childpid = fork();
-
-    if (childpid == 0)
-    {
-        signal(SIGCHLD, SIG_DFL);
-
-        // Change directory to home dir before launch, so that any demos
-        // are saved somewhere sensible.
-
-        homedir = getenv("HOME");
-
-        if (homedir != NULL)
-        {
-            chdir(homedir);
-        }
-
-        DoExec(executable, iwad, args);
-    }
-    else
-    {
-        signal(SIGCHLD, SIG_IGN);
-    }
-}
-
-// Write a sequence of commands that will display the specified message
-// via shell commands.
-
-static void WriteMessage(FILE *script, char *msg)
-{
-    char *p;
-
-    fprintf(script, "echo \"");
-
-    for (p=msg; *p != '\0'; ++p)
-    {
-        // Start new line?
-
-        if (*p == '\n')
-        {
-            fprintf(script, "\"\necho \"");
-            continue;
-        }
-
-        // Escaped character?
-
-        if (*p == '\\' || *p == '\"')
-        {
-            fprintf(script, "\\");
-        }
-
-        fprintf(script, "%c", *p);
-    }
-
-    fprintf(script, "\"\n");
-}
-
-// Open a terminal window with the PATH set appropriately, and DOOMWADPATH
-// set to the specified value.
-
-void OpenTerminalWindow(const char *doomwadpath)
-{
-    FILE *stream;
-
-    // Generate a shell script that sets the PATH to include the location
-    // where the Doom binaries are, and DOOMWADPATH to include the
-    // IWAD files that have been configured in the launcher interface.
-    // The script then deletes itself and starts a shell.
-
-    stream = fopen(TEMP_SCRIPT, "w");
-
-    fprintf(stream, "#!/bin/sh\n");
-    //fprintf(stream, "set -x\n");
-    fprintf(stream, "PATH=\"%s:$PATH\"\n", executable_path);
-
-    // MANPATH is set to point to the directory within the bundle that
-    // contains the Unix manpages.  However, the bundle name or path to
-    // it can contain a space, and OS X doesn't like this!  As a
-    // workaround, create a symlink in /tmp to point to the real directory,
-    // and put *this* in MANPATH.
-
-    fprintf(stream, "rm -f \"/tmp/%s.man\"\n", PACKAGE_TARNAME);
-    fprintf(stream, "ln -s \"%s/man\" \"/tmp/%s.man\"\n",
-                    executable_path, PACKAGE_TARNAME);
-    fprintf(stream, "MANPATH=\"/tmp/%s.man:$(manpath)\"\n", PACKAGE_TARNAME);
-    fprintf(stream, "export MANPATH\n");
-
-    fprintf(stream, "DOOMWADPATH=\"%s\"\n", doomwadpath);
-    fprintf(stream, "export DOOMWADPATH\n");
-    fprintf(stream, "rm -f \"%s\"\n", TEMP_SCRIPT);
-
-    // Window title to something more interesting than "tempscript":
-    fprintf(stream, "echo -en \"\\033]0;%s\\a\"\n", WINDOW_TITLE);
-
-    // Display a useful message:
-
-    fprintf(stream, "clear\n");
-    WriteMessage(stream,
-        "\n"
-        "This command line has the PATH variable configured so that you may\n"
-        "launch the game with whatever parameters you desire.\n"
-        "\n"
-        "For example:\n"
-        "\n"
-        "   " PACKAGE_TARNAME " -iwad doom2.wad -file sid.wad -warp 1\n"
-        "\n"
-        "Type 'exit' to exit.\n");
-
-    fprintf(stream, "exec $SHELL\n");
-    fprintf(stream, "\n");
-
-    fclose(stream);
-
-    chmod(TEMP_SCRIPT, 0755);
-
-    // Tell the terminal to open a window to run the script.
-
-    [[NSWorkspace sharedWorkspace] openFile: @TEMP_SCRIPT
-                                   withApplication: @"Terminal"];
-}
-
-void OpenDocumentation(const char *filename)
-{
-    NSString *path;
-
-    path = [NSString stringWithFormat: @"%s/Documentation/%s",
-                     executable_path, filename];
-
-    [[NSWorkspace sharedWorkspace] openFile: path];
-}
-
diff --git a/games/NXDoom/pkg/osx/GNUmakefile b/games/NXDoom/pkg/osx/GNUmakefile
deleted file mode 100644
index 55d7ac810..000000000
--- a/games/NXDoom/pkg/osx/GNUmakefile
+++ /dev/null
@@ -1,132 +0,0 @@
-# Makefile for building the OS X launcher program and DMG package.
-
-include ../config.make
-
-DOC_FILES += README.Strife.md NOT-BUGS.md
-
-export MACOSX_DEPLOYMENT_TARGET=10.7
-
-ifeq ($(TARGET_OS),arm)
-    POSTFIX=arm64
-else
-    POSTFIX=x86
-endif
-
-STAGING_DIR=staging
-DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-$(POSTFIX).dmg
-
-TOPLEVEL=../..
-TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES))
-
-# DMG file containing package:
-
-$(DMG) : tmp.dmg
-	rm -f $@
-	sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
-	./dmgfix "$(realpath tmp.dmg)" "$(PACKAGE_STRING)" "$(PACKAGE_NAME).app"
-	hdiutil convert -format UDBZ -o $@ tmp.dmg
-	rm -f tmp.dmg
-
-tmp.dmg : $(STAGING_DIR)
-	rm -f $@
-	hdiutil makehybrid -hfs -hfs-volume-name "$(PACKAGE_STRING)"     \
-	                   -hfs-openfolder $(STAGING_DIR) $(STAGING_DIR) \
-			   -o tmp.dmg
-
-# Staging dir build for package:
-
-APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app
-
-APP_TOP_DIR=$(APP_DIR)/Contents
-APP_BIN_DIR=$(APP_DIR)/Contents/MacOS
-SRC_INFO_PLIST=Info.plist
-
-APP_DOC_DIR=$(APP_BIN_DIR)/Documentation
-APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR))
-
-$(STAGING_DIR): launcher $(TOPLEVEL_DOCS) app.icns wadfile.icns
-	rm -rf $(STAGING_DIR)
-	mkdir $(STAGING_DIR)
-
-	mkdir -p "$(APP_TOP_DIR)"
-	cp -R Resources "$(APP_TOP_DIR)"
-	cp app.icns wadfile.icns "$(APP_TOP_DIR)/Resources"
-	cp $(TOPLEVEL)/data/doom.png "$(APP_TOP_DIR)/Resources/128x128.png"
-	cp PkgInfo "$(APP_TOP_DIR)"
-	cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)"
-
-	mkdir -p "$(APP_BIN_DIR)"
-
-	mkdir -p "$(APP_DOC_DIR)"
-	cp $(TOPLEVEL_DOCS) "$(APP_DOC_DIR)"
-
-	mv "$(APP_DOC_DIR)/README.md" "$(APP_DOC_DIR)/README"
-	mv "$(APP_DOC_DIR)/COPYING.md" "$(APP_DOC_DIR)/COPYING"
-	ln -s "$(APP_DOC_RELDIR)/COPYING" "$(STAGING_DIR)/Software License"
-	ln -s "$(APP_DOC_RELDIR)/README" "$(STAGING_DIR)/README"
-	ln -s /Applications "$(STAGING_DIR)"
-
-	cp launcher "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/launcher"
-
-	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom"
-	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic"
-	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen"
-	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)strife "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)strife"
-	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"
-
-	$(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__  \
-	                -DDOOM -DHERETIC -DHEXEN -DSTRIFE     \
-	             < $(TOPLEVEL)/man/INSTALL.template       \
-	             > "$(APP_DOC_DIR)/INSTALL"
-
-	mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6"
-	cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5"
-	cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6"
-	for game in doom heretic hexen strife; do       \
-		cp $(TOPLEVEL)/man/CMDLINE.$$game       \
-		   "$(APP_DOC_DIR)/CMDLINE-$$game";     \
-	done
-	cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store
-	cp disk/background.png $(STAGING_DIR)/background.png
-
-app.icns: $(TOPLEVEL)/data/doom.png
-	mkdir -p app.iconset
-	sips -z 64 64 $< --out app.iconset/icon_32x32@2x.png
-	iconutil -c icns app.iconset
-
-wadfile.icns: $(TOPLEVEL)/data/wadfile.png
-	mkdir -p wadfile.iconset
-	sips -z 64 64 $< --out wadfile.iconset/icon_32x32@2x.png
-	iconutil -c icns wadfile.iconset
-
-clean : launcher_clean
-	rm -f $(DMG)
-	rm -rf $(STAGING_DIR)
-	rm -rf app.icns app.iconset wadfile.icns wadfile.iconset
-
-# Launcher build:
-CFLAGS = -Wall -I$(TOPLEVEL)
-LDFLAGS = -framework Cocoa
-
-LAUNCHER_OBJS= \
-        AppController.o \
-        Execute.o \
-        IWADController.o \
-        LauncherManager.o \
-        main.o
-
-launcher : $(LAUNCHER_OBJS)
-	$(CC) $(LDFLAGS) $(LAUNCHER_OBJS) -o $@
-
-%.o : %.m
-	$(CC) -c $(CFLAGS) $^ -o $@
-
-launcher_clean :
-	rm -f $(LAUNCHER_OBJS) launcher
-
diff --git a/games/NXDoom/pkg/osx/IWADController.h b/games/NXDoom/pkg/osx/IWADController.h
deleted file mode 100644
index 404bffad0..000000000
--- a/games/NXDoom/pkg/osx/IWADController.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef LAUNCHER_IWADCONTROLLER_H
-#define LAUNCHER_IWADCONTROLLER_H
-
-#include <AppKit/AppKit.h>
-#include <AppKit/NSNibLoading.h>
-
-@interface IWADController : NSObject
-{
-    id iwadSelector;
-    id configWindow;
-
-    id chex;
-    id doom1;
-    id doom2;
-    id plutonia;
-    id tnt;
-    id freedoom1;
-    id freedoom2;
-    id freedm;
-
-    id heretic;
-    id hexen;
-    id strife;
-}
-
-- (void) closeConfigWindow: (id)sender;
-- (void) openConfigWindow: (id)sender;
-- (NSString *) getIWADLocation;
-- (NSString *) autoloadPath;
-- (void) awakeFromNib;
-- (BOOL) setDropdownList;
-- (void) setDropdownSelection;
-- (void) saveConfig;
-- (char *) doomWadPath;
-- (void) setEnvironment;
-- (const char *) getGameName;
-- (BOOL) addIWADPath: (NSString *) path;
-- (BOOL) selectGameByName: (const char *) name;
-
-@end
-
-#endif /* #ifndef LAUNCHER_IWADCONTROLLER_H */
-
diff --git a/games/NXDoom/pkg/osx/IWADController.m b/games/NXDoom/pkg/osx/IWADController.m
deleted file mode 100644
index c131105c3..000000000
--- a/games/NXDoom/pkg/osx/IWADController.m
+++ /dev/null
@@ -1,482 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdlib.h>
-#include <string.h>
-#include <AppKit/AppKit.h>
-
-#include "config.h"
-#include "IWADController.h"
-
-typedef enum
-{
-    IWAD_DOOM1,
-    IWAD_DOOM2,
-    IWAD_TNT,
-    IWAD_PLUTONIA,
-    IWAD_CHEX,
-    IWAD_HERETIC,
-    IWAD_HEXEN,
-    IWAD_STRIFE,
-    IWAD_FREEDOOM1,
-    IWAD_FREEDOOM2,
-    IWAD_FREEDM,
-    NUM_IWAD_TYPES
-} IWAD;
-
-static NSString *IWADLabels[NUM_IWAD_TYPES] =
-{
-    @"Doom",
-    @"Doom II: Hell on Earth",
-    @"Final Doom: TNT: Evilution",
-    @"Final Doom: Plutonia Experiment",
-    @"Chex Quest",
-    @"Heretic",
-    @"Hexen",
-    @"Strife",
-    @"Freedoom: Phase 1",
-    @"Freedoom: Phase 2",
-    @"FreeDM",
-};
-
-static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] =
-{
-    @"doom.wad",
-    @"doom2.wad",
-    @"tnt.wad",
-    @"plutonia.wad",
-    @"chex.wad",
-    @"heretic.wad",
-    @"hexen.wad",
-    @"strife.wad",
-    @"freedoom1.wad",
-    @"freedoom2.wad",
-    @"freedm.wad",
-    @"undefined"
-};
-
-@implementation IWADController
-
-- (void) getIWADList: (NSPathControl **) iwadList
-{
-    iwadList[IWAD_DOOM1] = self->doom1;
-    iwadList[IWAD_DOOM2] = self->doom2;
-    iwadList[IWAD_TNT] = self->tnt;
-    iwadList[IWAD_PLUTONIA] = self->plutonia;
-    iwadList[IWAD_CHEX] = self->chex;
-    iwadList[IWAD_HERETIC] = self->heretic;
-    iwadList[IWAD_HEXEN] = self->hexen;
-    iwadList[IWAD_STRIFE] = self->strife;
-    iwadList[IWAD_FREEDOOM1] = self->freedoom1;
-    iwadList[IWAD_FREEDOOM2] = self->freedoom2;
-    iwadList[IWAD_FREEDM] = self->freedm;
-}
-
-- (IWAD) getSelectedIWAD
-{
-    unsigned int i;
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        if ([self->iwadSelector titleOfSelectedItem] == IWADLabels[i])
-        {
-            return i;
-        }
-    }
-
-    return NUM_IWAD_TYPES;
-}
-
-// Get the location of the selected IWAD.
-
-- (NSString *) getIWADLocation
-{
-    IWAD selectedIWAD;
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-
-    selectedIWAD = [self getSelectedIWAD];
-
-    if (selectedIWAD == NUM_IWAD_TYPES)
-    {
-        return nil;
-    }
-    else
-    {
-        [self getIWADList: iwadList];
-
-	return [[iwadList[selectedIWAD] URL] path];
-    }
-}
-
-static const char *NameForIWAD(IWAD iwad)
-{
-    switch (iwad)
-    {
-        case IWAD_HERETIC:
-            return "heretic";
-
-        case IWAD_HEXEN:
-            return "hexen";
-
-        case IWAD_STRIFE:
-            return "strife";
-
-        default:
-            return "doom";
-    }
-}
-
-// Get the name used for the executable for the selected IWAD.
-
-- (const char *) getGameName
-{
-    return NameForIWAD([self getSelectedIWAD]);
-}
-
-- (void) setIWADConfig
-{
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-    NSUserDefaults *defaults;
-    NSString *key;
-    NSString *value;
-    unsigned int i;
-
-    [self getIWADList: iwadList];
-
-    // Load IWAD filename paths
-
-    defaults = [NSUserDefaults standardUserDefaults];
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        key = IWADFilenames[i];
-        value = [defaults stringForKey:key];
-
-        if (value != nil)
-        {
-            [iwadList[i] setURL: [NSURL fileURLWithPath: value]];
-        }
-    }
-}
-
-// On startup, set the selected item in the IWAD dropdown
-
-- (void) setDropdownSelection
-{
-    NSUserDefaults *defaults;
-    NSString *selected;
-    unsigned int i;
-
-    defaults = [NSUserDefaults standardUserDefaults];
-    selected = [defaults stringForKey: @"selected_iwad"];
-
-    if (selected == nil)
-    {
-        return;
-    }
-
-    // Find this IWAD in the filenames list, and select it.
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        if ([selected isEqualToString:IWADFilenames[i]])
-        {
-            [self->iwadSelector selectItemWithTitle:IWADLabels[i]];
-            break;
-        }
-    }
-}
-
-// Set the dropdown list to include an entry for each IWAD that has
-// been configured.  Returns true if at least one IWAD is configured.
-
-- (BOOL) setDropdownList
-{
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-    BOOL have_wads;
-    id location;
-    unsigned int i;
-    unsigned int enabled_wads;
-
-    // Build the new list.
-
-    [self getIWADList: iwadList];
-    [self->iwadSelector removeAllItems];
-
-    enabled_wads = 0;
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        location = [[iwadList[i] URL] path];
-
-        if (location != nil && [location length] > 0)
-        {
-            [self->iwadSelector addItemWithTitle: IWADLabels[i]];
-            ++enabled_wads;
-        }
-    }
-
-    // Enable/disable the dropdown depending on whether there
-    // were any configured IWADs.
-
-    have_wads = enabled_wads > 0;
-    [self->iwadSelector setEnabled: have_wads];
-
-    // Restore the old selection.
-
-    [self setDropdownSelection];
-
-    return have_wads;
-}
-
-- (void) saveConfig
-{
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-    IWAD selectedIWAD;
-    NSUserDefaults *defaults;
-    NSString *key;
-    NSString *value;
-    unsigned int i;
-
-    [self getIWADList: iwadList];
-
-    // Store all IWAD locations to user defaults.
-
-    defaults = [NSUserDefaults standardUserDefaults];
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        key = IWADFilenames[i];
-        value = [[iwadList[i] URL] path];
-
-        [defaults setObject:value forKey:key];
-    }
-
-    // Save currently selected IWAD.
-
-    selectedIWAD = [self getSelectedIWAD];
-    [defaults setObject:IWADFilenames[selectedIWAD]
-              forKey:@"selected_iwad"];
-}
-
-// Callback method invoked when the configuration button in the main
-// window is clicked.
-
-- (void) openConfigWindow: (id)sender
-{
-    if (![self->configWindow isVisible])
-    {
-        [self->configWindow makeKeyAndOrderFront: sender];
-    }
-}
-
-// Callback method invoked when the close button is clicked.
-
-- (void) closeConfigWindow: (id)sender
-{
-    [self->configWindow orderOut: sender];
-    [self saveConfig];
-    [self setDropdownList];
-}
-
-- (void) awakeFromNib
-{
-    [self->configWindow center];
-
-    // Set configuration for all IWADs from configuration file.
-
-    [self setIWADConfig];
-
-    // Populate the dropdown IWAD list.
-
-    if ([self setDropdownList])
-    {
-        [self setDropdownSelection];
-    }
-}
-
-// Generate a value to set for the DOOMWADPATH environment variable
-// that contains each of the configured IWAD files.
-
-- (char *) doomWadPath
-{
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-    NSString *location;
-    unsigned int i;
-    BOOL first;
-    char *env;
-    size_t env_len;
-
-    [self getIWADList: iwadList];
-
-    // Calculate length of environment string.
-
-    env_len = 0;
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        location = [[iwadList[i] URL] path];
-
-        if (location != nil && [location length] > 0)
-        {
-            env_len += [location length] + 1;
-        }
-    }
-
-    // Build string.
-
-    env = malloc(env_len);
-    strlcpy(env, "", env_len);
-
-    first = YES;
-
-    for (i=0; i<NUM_IWAD_TYPES; ++i)
-    {
-        location = [[iwadList[i] URL] path];
-
-        if (location != nil && [location length] > 0)
-        {
-            if (!first)
-            {
-                strlcat(env, ":", env_len);
-            }
-
-            strlcat(env, [location UTF8String], env_len);
-            first = NO;
-        }
-    }
-
-    return env;
-}
-
-- (NSString *) autoloadPath
-{
-    NSArray *array = NSSearchPathForDirectoriesInDomains(
-        NSApplicationSupportDirectory, NSUserDomainMask, YES);
-    if ([array count] == 0)
-    {
-        return nil;
-    }
-
-    IWAD selectedIWAD = [self getSelectedIWAD];
-    if (selectedIWAD == NUM_IWAD_TYPES)
-    {
-        return nil;
-    }
-
-    NSString *base = [array objectAtIndex:0];
-    return [NSString pathWithComponents:
-        [NSArray arrayWithObjects: base, @PACKAGE_TARNAME, @"autoload",
-                                   IWADFilenames[selectedIWAD], nil]];
-}
-
-// Set the DOOMWADPATH environment variable to contain the path to each
-// of the configured IWAD files.
-
-- (void) setEnvironment
-{
-    char *doomwadpath;
-    char *env;
-
-    // Get the value for the path.
-
-    doomwadpath = [self doomWadPath];
-
-    asprintf(&env, "DOOMWADPATH=%s", doomwadpath);
-
-    free(doomwadpath);
-
-    // Load into environment:
-
-    putenv(env);
-
-    //free(env);
-}
-
-// Examine a path to a WAD and determine whether it is an IWAD file.
-// If so, it is added to the IWAD configuration, and true is returned.
-
-- (BOOL) addIWADPath: (NSString *) path
-{
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-    NSArray *pathComponents;
-    NSString *filename;
-    unsigned int i;
-
-    [self getIWADList: iwadList];
-
-    // Find an IWAD file that matches the filename in the path that we
-    // have been given.
-
-    pathComponents = [path pathComponents];
-    filename = [pathComponents objectAtIndex: [pathComponents count] - 1];
-
-    for (i = 0; i < NUM_IWAD_TYPES; ++i)
-    {
-        if ([filename caseInsensitiveCompare: IWADFilenames[i]] == 0)
-        {
-            // Configure this IWAD.
-
-            [iwadList[i] setURL: [NSURL fileURLWithPath: path]];
-
-            // Rebuild dropdown list and select the new IWAD.
-
-            [self setDropdownList];
-            [self->iwadSelector selectItemWithTitle:IWADLabels[i]];
-            return YES;
-        }
-    }
-
-    // No IWAD found with this name.
-
-    return NO;
-}
-
-- (BOOL) selectGameByName: (const char *) name
-{
-    NSPathControl *iwadList[NUM_IWAD_TYPES];
-    NSString *location;
-    const char *name2;
-    int i;
-
-    // Already selected an IWAD of the desired type? Just return
-    // success.
-    if (!strcmp(name, [self getGameName]))
-    {
-        return YES;
-    }
-
-    // Search through the configured IWADs and try to select the
-    // desired game.
-    [self getIWADList: iwadList];
-
-    for (i = 0; i < NUM_IWAD_TYPES; ++i)
-    {
-        location = [[iwadList[i] URL] path];
-        name2 = NameForIWAD(i);
-
-        if (!strcmp(name, name2)
-         && location != nil && [location length] > 0)
-        {
-            [self->iwadSelector selectItemWithTitle:IWADLabels[i]];
-            return YES;
-        }
-    }
-
-    // User hasn't configured any WAD(s) for the desired game type.
-    return NO;
-}
-
-@end
-
diff --git a/games/NXDoom/pkg/osx/Info.plist.in b/games/NXDoom/pkg/osx/Info.plist.in
deleted file mode 100644
index 13da040dd..000000000
--- a/games/NXDoom/pkg/osx/Info.plist.in
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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>CFBundleIdentifier</key>
-        <string>org.chocolate-doom.launcher</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>@PACKAGE_NAME@</string>
-	<key>CFBundleExecutable</key>
-	<string>launcher</string>
-	<key>CFBundleGetInfoString</key>
-	<string>@PACKAGE_STRING@</string>
-	<key>CFBundleIconFile</key>
-	<string>app.icns</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>@PACKAGE_NAME@</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@PACKAGE_VERSION@</string>
-	<key>CFBundleVersion</key>
-	<string>@PACKAGE_VERSION@</string>
-        <key>NSHighResolutionCapable</key>
-        <string>true</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSMainNibFile</key>
-	<string>launcher</string>
-        <key>NSHumanReadableCopyright</key>
-        <string>Copyright (C) 1993-2015, id Software and Raven Software, Simon Howard, James Haley, Samuel Villarreal and other contributors.
-
-Licensed under the GNU GPL v2.</string>
-
-        <!-- file associations: -->
-
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Doom WAD file</string>
-                        <key>CFBundleTypeIconFile</key>
-                        <string>wadfile.icns</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>CFBundleTypeExtensions</key>
-                        <array>
-                                <string>wad</string>
-                        </array>
-                </dict>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Doom demo recording</string>
-                        <key>CFBundleTypeIconFile</key>
-                        <string>wadfile.icns</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>CFBundleTypeExtensions</key>
-                        <array>
-                                <string>lmp</string>
-                        </array>
-                </dict>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Doom Dehacked patch</string>
-                        <key>CFBundleTypeIconFile</key>
-                        <string>wadfile.icns</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>CFBundleTypeExtensions</key>
-                        <array>
-                                <string>deh</string>
-                        </array>
-                </dict>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Heretic HHE patch</string>
-                        <key>CFBundleTypeIconFile</key>
-                        <string>wadfile.icns</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>CFBundleTypeExtensions</key>
-                        <array>
-                                <string>hhe</string>
-                        </array>
-                </dict>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Strife Sehacked patch</string>
-                        <key>CFBundleTypeIconFile</key>
-                        <string>wadfile.icns</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>CFBundleTypeExtensions</key>
-                        <array>
-                                <string>seh</string>
-                        </array>
-                </dict>
-        </array>
-</dict>
-</plist>
diff --git a/games/NXDoom/pkg/osx/LauncherManager.h b/games/NXDoom/pkg/osx/LauncherManager.h
deleted file mode 100644
index fb8a5cf5d..000000000
--- a/games/NXDoom/pkg/osx/LauncherManager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef LAUNCHER_LAUNCHERMANAGER_H
-#define LAUNCHER_LAUNCHERMANAGER_H
-
-#include <AppKit/AppKit.h>
-#include <AppKit/NSNibLoading.h>
-#include "IWADController.h"
-
-@interface LauncherManager : NSObject
-{
-    IWADController *iwadController;
-
-    id launcherWindow;
-    id launchButton;
-
-    id commandLineArguments;
-}
-
-- (void) launch: (id)sender;
-- (void) runSetup: (id)sender;
-- (void) awakeFromNib;
-- (void) clearCommandLine;
-- (BOOL) addIWADPath: (NSString *) path;
-- (void) addFileToCommandLine: (NSString *) fileName
-         forArgument: (NSString *) args;
-- (BOOL) selectGameByName: (const char *) name;
-- (void) openTerminal: (id) sender;
-
-- (void) openREADME: (id) sender;
-- (void) openINSTALL: (id) sender;
-- (void) openCMDLINE: (id) sender;
-- (void) openCOPYING: (id) sender;
-- (void) openDocumentation: (id) sender;
-
-@end
-
-#endif /* #ifndef LAUNCHER_LAUNCHERMANAGER_H */
-
diff --git a/games/NXDoom/pkg/osx/LauncherManager.m b/games/NXDoom/pkg/osx/LauncherManager.m
deleted file mode 100644
index 4e6e33e52..000000000
--- a/games/NXDoom/pkg/osx/LauncherManager.m
+++ /dev/null
@@ -1,410 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <AppKit/AppKit.h>
-#include "Execute.h"
-#include "LauncherManager.h"
-#include "config.h"
-
-@implementation LauncherManager
-
-// Save configuration.  Invoked when we launch the game or quit.
-
-- (void) saveConfig
-{
-    NSUserDefaults *defaults;
-
-    // Save IWAD configuration and selected IWAD.
-
-    [self->iwadController saveConfig];
-
-    // Save command line arguments.
-
-    defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:[self->commandLineArguments stringValue]
-              forKey:@"command_line_args"];
-}
-
-// Load configuration, invoked on startup.
-
-- (void) setConfig
-{
-    NSUserDefaults *defaults;
-    NSString *args;
-
-    defaults = [NSUserDefaults standardUserDefaults];
-
-    args = [defaults stringForKey:@"command_line_args"];
-
-    if (args != nil)
-    {
-        [self->commandLineArguments setStringValue:args];
-    }
-}
-
-// Get the next command line argument from the command line.
-// The position counter used to iterate over arguments is in 'pos'.
-// The index of the argument that was found is saved in arg_pos.
-
-static NSString *GetNextArgument(NSString *commandLine, int *pos, int *arg_pos)
-{
-    NSRange arg_range;
-
-    // Skip past any whitespace
-
-    while (*pos < [commandLine length]
-        && isspace([commandLine characterAtIndex: *pos]))
-    {
-        ++*pos;
-    }
-
-    if (*pos >= [commandLine length])
-    {
-        *arg_pos = *pos;
-        return nil;
-    }
-
-    // We are at the start of the argument.  This may be a quoted
-    // string argument, or a "normal" one.
-
-    if ([commandLine characterAtIndex: *pos] == '\"')
-    {
-        // Quoted string, skip past first quote
-
-        ++*pos;
-
-        // Save start position:
-
-        *arg_pos = *pos;
-
-        while (*pos < [commandLine length]
-            && [commandLine characterAtIndex: *pos] != '\"')
-        {
-            ++*pos;
-        }
-
-        // Unexpected end of string?
-
-        if (*pos >= [commandLine length])
-        {
-            return nil;
-        }
-
-        arg_range = NSMakeRange(*arg_pos, *pos - *arg_pos);
-
-        // Skip past last quote
-
-        ++*pos;
-    }
-    else
-    {
-        // Normal argument
-
-        // Save position:
-
-        *arg_pos = *pos;
-
-        // Read until end:
-
-        while (*pos < [commandLine length]
-            && !isspace([commandLine characterAtIndex: *pos]))
-        {
-            ++*pos;
-        }
-
-        arg_range = NSMakeRange(*arg_pos, *pos - *arg_pos);
-    }
-
-    return [commandLine substringWithRange: arg_range];
-}
-
-// Given the specified command line argument, find the index
-// to insert the new file within the command line.  Returns -1 if the 
-// argument is not already within the arguments string.
-
-static int GetFileInsertIndex(NSString *commandLine, NSString *needle)
-{
-    NSString *arg;
-    int arg_pos;
-    int pos;
-
-    pos = 0;
-
-    // Find the command line parameter we are searching
-    // for (-merge, -deh, etc)
-
-    for (;;)
-    {
-        arg = GetNextArgument(commandLine, &pos, &arg_pos);
-
-        // Searched to end of string and never found?
-
-        if (arg == nil)
-        {
-            return -1;
-        }
-
-        if (![arg caseInsensitiveCompare: needle])
-        {
-            break;
-        }
-    }
-
-    // Now skip over existing files.  For example, if we
-    // have -file foo.wad bar.wad, the new file should be appended
-    // to the end of the list.
-
-    for (;;)
-    {
-        arg = GetNextArgument(commandLine, &pos, &arg_pos);
-
-        // If we search to the end of the string now, it is fine;
-        // the new string should be added to the end of the command
-        // line.  Otherwise, if we find an argument that begins
-        // with '-', it is a new command line parameter and the end
-        // of the list.
-
-        if (arg == nil || [arg characterAtIndex: 0] == '-')
-        {
-            break;
-        }
-    }
-
-    // arg_pos should now contain the offset to insert the new filename.
-
-    return arg_pos;
-}
-
-// Given the specified string, append a filename, quoted if necessary.
-
-static NSString *AppendQuotedFilename(NSString *str, NSString *fileName)
-{
-    int i;
-
-    // Search the filename for spaces, and quote if necessary.
-
-    for (i=0; i<[fileName length]; ++i)
-    {
-        if (isspace([fileName characterAtIndex: i]))
-        {
-            str = [str stringByAppendingString: @" \""];
-            str = [str stringByAppendingString: fileName];
-            str = [str stringByAppendingString: @"\" "];
-
-            return str;
-        }
-    }
-
-    str = [str stringByAppendingString: @" "];
-    str = [str stringByAppendingString: fileName];
-
-    return str;
-}
-
-// Clear out the existing command line options.
-// Invoked before the first file is added.
-
-- (void) clearCommandLine
-{
-    [self->commandLineArguments setStringValue: @""];
-}
-
-// Add a file to the command line to load with the game.
-
-- (void) addFileToCommandLine: (NSString *) fileName
-         forArgument: (NSString *) arg
-{
-    NSString *commandLine;
-    int insert_pos;
-
-    // Get the current command line
-
-    commandLine = [self->commandLineArguments stringValue];
-
-    // Find the location to insert the new filename:
-
-    insert_pos = GetFileInsertIndex(commandLine, arg);
-
-    // If position < 0, we should add the new argument and filename
-    // to the end.  Otherwise, append the new filename to the existing
-    // list of files.
-
-    if (insert_pos < 0)
-    {
-        commandLine = [commandLine stringByAppendingString: @" "];
-        commandLine = [commandLine stringByAppendingString: arg];
-        commandLine = AppendQuotedFilename(commandLine, fileName);
-    }
-    else
-    {
-        NSString *start;
-        NSString *end;
-
-        // Divide existing command line in half:
-
-        start = [commandLine substringToIndex: insert_pos];
-        end = [commandLine substringFromIndex: insert_pos];
-
-        // Construct new command line:
-
-        commandLine = AppendQuotedFilename(start, fileName);
-        commandLine = [commandLine stringByAppendingString: @" "];
-        commandLine = [commandLine stringByAppendingString: end];
-    }
-
-    [self->commandLineArguments setStringValue: commandLine];
-}
-
-- (void) launch: (id)sender
-{
-    NSString *iwad;
-    NSString *args;
-    char *executable_name;
-    const char *game_name;
-
-    [self saveConfig];
-
-    iwad = [self->iwadController getIWADLocation];
-    args = [self->commandLineArguments stringValue];
-
-    if (iwad == nil)
-    {
-        NSRunAlertPanel(@"No IWAD selected",
-                        @"You have not selected an IWAD (game) file.\n\n"
-                         "You must configure and select a valid IWAD file "
-                         "in order to launch the game.",
-                        @"OK", nil, nil);
-        return;
-    }
-
-    game_name = [self->iwadController getGameName];
-    asprintf(&executable_name, "%s%s", PROGRAM_PREFIX, game_name);
-
-    ExecuteProgram(executable_name, [iwad UTF8String],
-                                    [args UTF8String]);
-    [NSApp terminate:sender];
-}
-
-// Invoked when the "Setup Tool" button is clicked, to run the setup tool:
-
-- (void) runSetup: (id)sender
-{
-    const char *game_name;
-    char *arg;
-
-    [self saveConfig];
-    [self->iwadController setEnvironment];
-
-    // Provide the -game command line parameter to select the game
-    // to configure, based on the game selected in the dropdown.
-
-    game_name = [self->iwadController getGameName];
-    asprintf(&arg, "-game %s", game_name);
-
-    ExecuteProgram(PROGRAM_PREFIX "setup", NULL, arg);
-
-    free(arg);
-}
-
-// Invoked when the "Terminal" option is selected from the menu, to open
-// a terminal window.
-
-- (void) openTerminal: (id) sender
-{
-    char *doomwadpath;
-
-    [self saveConfig];
-
-    doomwadpath = [self->iwadController doomWadPath];
-
-    OpenTerminalWindow(doomwadpath);
-
-    free(doomwadpath);
-}
-
-- (void) openREADME: (id) sender
-{
-    OpenDocumentation("README");
-}
-
-- (void) openINSTALL: (id) sender
-{
-    OpenDocumentation("INSTALL");
-}
-
-- (void) openCMDLINE: (id) sender
-{
-    const char *game_name;
-    char filename[32];
-
-    // We need to open the appropriate doc file for the currently
-    // selected game.
-
-    game_name = [self->iwadController getGameName];
-    snprintf(filename, sizeof(filename), "CMDLINE-%s", game_name);
-
-    OpenDocumentation(filename);
-}
-
-- (void) openCOPYING: (id) sender
-{
-    OpenDocumentation("COPYING");
-}
-
-- (void) openDocumentation: (id) sender
-{
-    OpenDocumentation("");
-}
-
-- (void) openAutoload: (id) sender
-{
-    NSFileManager *fm = [NSFileManager defaultManager];
-    NSString *path = [self->iwadController autoloadPath];
-
-    if (path == nil)
-    {
-        return;
-    }
-
-    if (![fm fileExistsAtPath:path])
-    {
-        [fm createDirectoryAtPath:path
-            withIntermediateDirectories:YES
-            attributes:nil
-            error:nil];
-    }
-
-    [[NSWorkspace sharedWorkspace] openFile:path withApplication:@"Finder"];
-}
-
-- (void) awakeFromNib
-{
-    [self->launcherWindow setTitle: @PACKAGE_NAME " Launcher"];
-    [self->launcherWindow center];
-    [self->launcherWindow setDefaultButtonCell: [self->launchButton cell]];
-    [self setConfig];
-}
-
-- (BOOL) addIWADPath: (NSString *) path
-{
-    return [self->iwadController addIWADPath: path];
-}
-
-- (BOOL) selectGameByName: (const char *) name
-{
-    return [self->iwadController selectGameByName: name];
-}
-
-@end
-
diff --git a/games/NXDoom/pkg/osx/PkgInfo b/games/NXDoom/pkg/osx/PkgInfo
deleted file mode 100644
index 6f749b0f3..000000000
--- a/games/NXDoom/pkg/osx/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
diff --git a/games/NXDoom/pkg/osx/Resources/app.png b/games/NXDoom/pkg/osx/Resources/app.png
deleted file mode 100644
index 5b932e8cf86ca68c79b71a41458df6c1809011f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4597
zcmV<R5en{!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L009O7009O8&C@fy00007bV*G`2iXY`
z5H$-ml?{Rb01<UbL_t(&-qo6UkQ`@u#(#Zx&porVv!`}-u5QVeg(YEQY*984LnsO=
z*aby^N(c~aY?DB$C{i3Qhz%IZR0s|+n8V1}#5RX79LuL{OO~`=t*$*K?P{;tnVp?`
zx_i1ie`r>kT^*L4B9(Mi*Z$G7)9>>>&-=XZ_k9EZ&oALE{*MeOwZAT4*KV)&8Snop
z01?oD2oM7TfCH3(GEl7nsnl+}2Jp`YNP3gO>p%indCSc={naD)eD~f&Q`6G_dj6#{
z(Dd%>uDxVvXxIS4HK0Nb;GYe|n_)l!8i6%G|H18dH06(OGA)~}AGrxx_v5*z;_L0{
zv4+Nzuk6};V9(EfdH-X;F<`pJh*x{3P$xC-e*=IBgn$)y|MSh?+_oh8?w|kqL9D7v
z)UOc@Xb@~f^K4eET*dNrm*Q3mOqIN2*L?H~p9PKrQ#DD+HFl&LJ7%5K{wxxj(|rrD
z_LfiG@bP2)M}nK)^#MM4>sQ!(#deCWN=4B4=x1&t5b!fRFvt@R@4zTdM#Ei~SGo`M
zj@RnM0eqkCNL;2%Qrl?R)N9PTZ&hZ}MYxT>7W|qYe)G$>Y+18-?dmPp(9yM)^uT_K
zQzuxlVKaWwBH7nXw7HE$>mt@%eicq7&*f{DZd!HOw$`VgeWACO?ZCB(h7Voc)b!oU
zB7xQ2*=*W$J)su-n+76XAb6!#j2*!Gf4}S7w_d$=(UpnSTbOwL1*VU_h9l{;ZM+ge
z5E$9FlcNXrG2QnX@#c1fs>O-%NnU#9Dc-Yb=~A`1EBo5M?oq&47xr!beJ*&_fwH>v
z=FZsmC5D{XH(N;6*!F5nT~vKY7bw^Wu<VwbK6k^HKJ}rmE)l0!$_?!dAL+#^WXNj`
zB*F$-xDmx4rm=GsAq}3}ca&&jD~4bZZ;0}(`~E=O5ZSmmzV5-Ddv^ii>VSXEj1b)1
zQxb%yvyu_je5?Pyv*BF|4g<w<v6jG#0wSG9^Fd(A7jC}k#*c4q`eIYmXC$XnWYg1(
zkB*QX?q=7nUHtq%pX7#5{vCEHk7Ji9Cr?tEI?ivOc%GHbA^f2zf?cAJNzoFN)$Q;5
zVDyjAywtxcpm*kl&}ApBQywyG3gWXlDX=9H*nDGa^vbDnC6l!5YAqhO?tVi6Vomdl
zfJ=V;ty}KU{2`ur{4s)}Ng-e4<=wjx1%Z)tfxEu{ePqLrU7Tfj*W>Kk`4me!+nLSH
za(r~0<sD5d?`$X1+<{%rlb$#kdurdnt1J9Qvnhoy9kGPdF6aV1B~jj6Qero>gx|3}
z9=zmWwlGz8T`p7~(m8@}1vc#b%{_Nir;mjM)u26UFnD}~!O;m63EJ8haqZhTQ<@wk
zIoQMVk3YiR*Lw))Dy~(=b{w8NGR5+sjo#3PS4@#uaVgehpZ@TkW6v-1=`lwMUvk_O
z&a&}}3%d%UI%=zJH+4q0uMFz#`!l&|@06_Eg^f|F3*M-?&HAT*@%_7+b-UfnB*~?d
zy!!fK%9$kZxpq72H*ThD{U*}0Ssr_OCwmU`V@NIqvr5UTV%jc>BJo)FNj5BMK=mw^
zZQMpWm87YCDfj;V`IkEVdRW#YmkgB!@qF5zbp)QtNxG^UT{kUnd{;;jIGimeYa@$Q
z1A<t`L>O55>QfKj)uKD?f*>LY(Ad_=+NEu5yZTyQ=@}%MO7X%oPt$*>hmbB|RvmnP
z1J`vqJT}9L={&tBGU$p3qKIYN%nbFgc=aVzig|#5g(oS}#r4o#SwZ~Lu-vHlTR#82
zE$i+EnreM%o`f`@<<77E!&lZf2yaUdA7El^4A*se`GuWKjF0nbcQ10az|`mod~S(U
zW|ore5Y$!Ns>5J1M>1=YGcBfb72dug!Czi?6_c4F5)M_{WbDu$-uZ!#X|M0zlZl4o
zYx~QRC`uxtC~|$&p(;w`JPA=0=iP`Rhf1P!MO;*#Jvs45AYE&W$o1Ve9t*3EW1$#+
zD$~a~a(IF#d&gPa=%+IlM3*G8WsAe(84@9#235wVYaBf}L)5R4&Rdwa!#mfs(cqUk
zI(UMJP@-f<P|_158sh|lZo7#)WEiTa8uIB(uQe*PGfgBG<Do*B@#-0M%~h?SRV2Vy
zU%PUh30PE3duDhTNi%r9dkEKa=^LMA&(Jit{l!{r$HDVFLWWAAQe{OV#50E{7?{ek
zED>TuN0?1Znh1pg?Cc&UnH{7h;$!#lAYDyiwqCl1-V@1*swY%6LqRq4GeOE(em^mR
zAx&|8Ya6qnCVp3r&a)gzbA(#(V!iWFo8xCc^^dpzWV9%Z{r2Sn)~#BBu1d&~$i|K+
z9qYF6wsl=-ibVfJ7EL!usx7Qo+Cf)KlnpDF@{#vk&9bhQcnG+z$Nm!;9@#s>k+BS!
zqDeM6jx5Q=HbW8OeqB}#gSlJMC47dApo%=6nxILuQR<$nhC#&8{I!^cg$y`A4jA7#
zRCp{s*!Ss?VMxRxeDQ-@x&9-cAlSB?N-mAw*~|5Yj%1g}O^uMAEV4Sbi2lhL9)9{o
zuHUwikfCwi)-|k7<`D2GI3maLV&;(4-h2CZ@7eM0j>e6$CZih0nd~a30Gu8LGyzpK
z<~J#=D4h?0TN|_rKfV9K?%n@(8-vp&-gfy``d<7U-~9U5dGDr9Y)|6kRGQhcO=rwc
zAQ;4ROoDzN%NBRg7H_~GZ=p0ZftAY<mQ12SAED+B%#rHYSAXyy_XAU+$P(Q*AAl%}
z_;k50SOHaD06<q*u%19((9{$_+xhw+o$c*d`5FH3@*!UAn`Am)LKG!dG>2*MtDHy|
zX{@?5_!S(pLTgJ5&#@>bM@UVLGg~NgB3-1@lb9$R<I2uO>uUa8sX|HBmH7;a@;nA4
zO+fV)GN7EbhN%aj0)c0Lx8qiIrk`*y$YYQEmV#Nuth#iyM#1&yK9)jLMcQKlI^upN
zvlTjG63NMNvLy>e6e-ybBk2PBkEO_$ZS1N`xsc}*AG>kGeZSf<ZM&YM8w(g<zJz2|
zK$VPngM)mE0nP_N0yM=lJFSU+{<J%b<T<#WhptGh?MN^(HN*BbE#%EA9x#;55!7VH
zXG`dci0gu;NSL<6#B7O0@el)(Ibs0~yXvrQRZG`>u(RyC&O!!6cL4xRKvj%+J}T+z
zSvwx}034vwbKuZ(ZTXq2qmsq0iCN-}&3u0ICVu&+muQdq=x7WQ@hMbn2T_pF6&Xzt
zaXknc3ga^+_8d#m)f}QN=3`Y`lqb56(;U|EQl;HM(ej*%W=Qh@$W;lyz5sx>um<FX
ztzjMj3z$7Rmfl;%yZZ3JNw%$ON5#cxjBxwkypJ7E?IN8snH5diV?F}9icb@9T!De9
z9Q%e+qzWc)?}{^>tB}rDSds{`e9N`39h^)({Mg+;ei9HY&#R;-CaX@*;nSLMm*nQx
zfStiP^yoYQnai8b+NN0uAoIg}e)`PqxBcxE*Q~X+P0ki6TNaVZ5t6P)wqzjy)A<VB
zBQr<>1T=-|e1#1wL+D|Tu2!8HuSh7O(AF9Py~sUx|KeWYHDDBoih@wJr$?&R;E^)`
zTH^Qu(KFfhir9k#^98?ZlYJoxxj+#}$%>LYIFu$=u_=^ox)#HM{tWGLKk2;1rp0kI
zMIu+W7%Zjms~%(dBI$y~(ujef3FOQQ!4k;YmAj$;1TbFfHGW5+DrwTZKm-YV`kCoo
za?c+21XUCy2^{APi28BXtL@#S|LKk&{W#*+m<g>o?!-zQ&u8!_H1?jz67(qy6lZuP
znc}6fDO_N~>JUrY4K7_B#HUF##dX>eK3Wq7i3Yt=3%oqHM05qg71jBZv@3e}jZ;?Y
zGh`I~Yyh4tVyKdMzCJKl$a!GY*Vfgq9-q-Rt&bwhBFS`_v8>5Jd792v9|_kbHLFlE
z9mXar1pP9i0HL5v#d1+(fw5$T=74C`5>q|>5*JT36m+dF<0|+J`E+U(TbTF!R38vg
z6-A=#%=H6rApjRB0HdG#&aeI&*tqg5@Bc=NHkz1Bnq0G`fqlI>UfDlGYm<&F3oL3f
zNM$TmE(uUE9pVv%P*5Wp)+m&!Jk^~&v;ctTfvbl!B4O>!=%9=E3<<B6TuqVYJqJ+z
zD#{x$Fjvf3U<3#_Qe)q2emHU2`VjjM<ygHUNOPl#B!M6bv?X*J!ZH)nCO$)?T=DR*
zaH>@nwFS9<$AkOp0C)hF>v%>`AskZY1JLEu0K}?DB&_1qRf^&h1x**_Hv%v>7tH{Z
zgCnK=*KhK@<M2=x5s`AmCR?xx`4w85R1Ws%0a)J^B9nJmzcNBN6hu)3W->);jGFbk
z3NC`H`!ph<Ga1%&sm6c^PKI=@LO3{|0Y#C}WJRi*hdlWLt2rAe{`9^F_I&t?ZL~N0
za9qgdZMJWTb8@nRED3B_-Ha?&nMmeoZ#I~jEi*k+A>fzj8*dq_t(>g7ja|>S9Z%Cl
zFA_e(fTn>@cPSOe>FckON=rn-^J_p;M08CO&u63OVxkOWN0VA5pUvtazeKTAMbi{S
zv5bd6-_R86SBB_p3(?xzjx1UD4GGV)87;OQUs%9%->qsA;W`Fn$tIJYVCa~F>&k>f
zX9pz9B8Db8a|`-60^rpE%$B9Kd%6}Eu6q3WB#Ya9j80aF#bPwa6%50NuDC#zTxNu7
z6&yjqtW;36#db|TPW|`Vw(DxLM5L|;3I&CHULX`WcQC4^(A*L!7fffmj?oJOp!V`?
zZ(q8*bCY+~`>tuiaTTVsRa`62%lj&1^EO*IwK8-f$HvtW6i*`LSFo%iN0Qj}TOg-x
z)Nwpj6VGy)^Id^Rzzw%FPuzOvuCE>Ln;x25&|eGy8_3`Lvj<*%|K_b<P!*RWgIRLL
zD%-DINi>=w;8)4zN-S=bDU}MuV?IVsrdiZt(0w>_mW2XXmgB05<kh>-`L1wd+#H?t
zdOrNghyTU0oTEVU%`o8B0>}<dwT@?}ds{cGin1aQW?#=BmgUjZ=%ZMcNi@btrOQZ4
zki{J$k`m<CJ09A9jvDYB@Dx>?=R#-gdCC$>G?9DY$>HC8=O?fI1{kiL^pr2Q2Iewm
z0(pO=eejZ{>DI#oDJmm5x|YR>H8fJGm{_KTNQsfLG#$+XimGw&@bPn6XdMHn;d3(}
zD7u?>gHxaV+H-gA>797FHUwsBnRhSNh3Xqy(YBq6B17k*78*iT_8v?!natrhE}=-2
zXsm^mU49gwK{i*WBCj8VL-iIq-_vCY|2Y^a34Zh7aOJ>9Z+q~L@+rwo)W)0YxxVLO
z0N6nB<}d&2gZut?<8=r74pJ)0MB|;bGzch)PPvq!FngS!5x^?tn9Wp>)g|Y%&{GnT
z1pI2<>jjZy#h<(H(Se7){o~y`YLZFS9Zj9{x)=a+2XUoRK1+LR7(ozla#NUPl|MW^
z$u(OWFufRxS0-=8Ni>$3O=4XDz`R3?swcanv)a^WzV^(WdwNbwX7*h2dn*9uPU6ds
zV`7>%g+hf`Q#*!kbIlb|{A!M4qbF%x9-&%HGE=ab$vWo)-~m-ZI2BmdHq4&ka_<c{
zKYB;ma*n)_WZnvZxt%-nc+$u>hpNFq(1+k==^MykS3Q<?MCe@9Ov&<)6_=K1f{%as
z-iPW=?-w#!P!z>WS3@)RJ=*`s?LXT6K%L86P%>{7fDM%LcH4nQ@6Z)T2d3$0^|NAG
zCqci=#AFgfE#lZN2ohF#hT7`RJV!7#kg9s}<mbNe-0gpQ@mN1_@?s_PKVhJ3Ru!{Y
zEYr2DnN(_qzTqL3v>AwM3_+|ik#=YZ!RVyTg5OHaJA?s}tKa*R_nIcv8qmVUO6FV#
zdR$~7+k0Lg?`vs_<5mk8{s^m<H=<}EEVIb*kraxMBkXtaltmMDM?vSZ<(z3US?j8~
f1;2E8Q`dh3au&TP<1S&o00000NkvXXu0mjfxvk%a

diff --git a/games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib b/games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib
deleted file mode 100644
index 226678bd2..000000000
--- a/games/NXDoom/pkg/osx/Resources/launcher.nib/designable.nib
+++ /dev/null
@@ -1,607 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
-    <dependencies>
-        <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
-            <connections>
-                <outlet property="delegate" destination="270" id="271"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="(Package Name) Launcher" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="21" userLabel="Launcher Window">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="350" y="488" width="532" height="195"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
-            <value key="minSize" type="size" width="243.529" height="107"/>
-            <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="532" height="195"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="209">
-                        <rect key="frame" x="18" y="173" width="360" height="11"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="325">
-                            <font key="font" metaFont="miniSystem"/>
-                            <string key="title">Select a game:
-</string>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <popUpButton verticalHuggingPriority="750" id="211">
-                        <rect key="frame" x="18" y="141" width="250" height="26"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <popUpButtonCell key="cell" type="push" title="Game name" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="213" id="326">
-                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
-                            <menu key="menu" title="OtherViews" id="212">
-                                <items>
-                                    <menuItem title="Game name" state="on" id="213"/>
-                                </items>
-                            </menu>
-                        </popUpButtonCell>
-                    </popUpButton>
-                    <imageView id="216">
-                        <rect key="frame" x="384" y="47" width="128" height="128"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="128x128" id="327"/>
-                    </imageView>
-                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="218">
-                        <rect key="frame" x="18" y="125" width="350" height="11"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="329">
-                            <font key="font" metaFont="miniSystem"/>
-                            <string key="title">Command line arguments:
-</string>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="219">
-                        <rect key="frame" x="20" y="49" width="346" height="68"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="border" drawsBackground="YES" id="330">
-                            <font key="font" metaFont="fixedUser" size="11"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="5zZ-CS-NR1">
-                        <rect key="frame" x="372" y="46" width="25" height="25"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Eln-B1-5BH">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="openCMDLINE:" target="206" id="abcde-98765"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="217">
-                        <rect key="frame" x="273" y="143" width="93" height="23"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="squareTextured" title="Configure..." bezelStyle="texturedSquare" alignment="center" borderStyle="border" inset="2" id="328">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="openConfigWindow:" target="225" id="226"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="221">
-                        <rect key="frame" x="14" y="13" width="149" height="32"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Run Setup Tool..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="332">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="runSetup:" target="206" id="223"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="220">
-                        <rect key="frame" x="389" y="13" width="129" height="32"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Launch Game" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="331">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="launch:" target="206" id="224"/>
-                        </connections>
-                    </button>
-                </subviews>
-            </view>
-            <point key="canvasLocation" x="481" y="360.5"/>
-        </window>
-        <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
-            <items>
-                <menuItem title="Launcher" id="56">
-                    <menu key="submenu" title="Launcher" systemMenu="apple" id="57">
-                        <items>
-                            <menuItem title="About..." id="58">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Command Prompt..." keyEquivalent="t" id="320">
-                                <connections>
-                                    <action selector="openTerminal:" target="206" id="321"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="196">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="IWAD configuration..." keyEquivalent="," id="129">
-                                <connections>
-                                    <action selector="openConfigWindow:" target="225" id="268"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Autoload..." id="N6e-BR-aby">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="openAutoload:" target="206" id="340"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="143">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Services" id="131">
-                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="144">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Hide" keyEquivalent="h" id="134">
-                                <connections>
-                                    <action selector="hide:" target="-2" id="152"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-2" id="146"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="150">
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-2" id="153"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="149">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Quit" keyEquivalent="q" id="136">
-                                <connections>
-                                    <action selector="terminate:" target="-2" id="139"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Edit" id="274">
-                    <menu key="submenu" title="Edit" id="275">
-                        <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="290">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="313"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Redo" keyEquivalent="Z" id="293">
-                                <connections>
-                                    <action selector="redo:" target="-1" id="318"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="301">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Cut" keyEquivalent="x" id="281">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="310"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="282">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="315"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="287">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="306"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="289">
-                                <connections>
-                                    <action selector="delete:" target="-1" id="307"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="291">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="317"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Window" id="19">
-                    <menu key="submenu" title="Window" systemMenu="window" id="24">
-                        <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="23">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="37"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="197">
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="198"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="92">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Bring All to Front" id="5">
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="39"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Help" id="369">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Help" systemMenu="help" id="370">
-                        <items>
-                            <menuItem title="Introduction" keyEquivalent="?" id="371">
-                                <connections>
-                                    <action selector="openREADME:" target="206" id="382"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Set up guide" id="373">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="openINSTALL:" target="206" id="374"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Command line reference" id="375">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="openCMDLINE:" target="206" id="376"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="More documentation..." id="377">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="openDocumentation:" target="206" id="378"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="379"/>
-                            <menuItem title="Software license" id="380">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="openCOPYING:" target="206" id="381"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
-        <customObject id="206" userLabel="LauncherManager" customClass="LauncherManager">
-            <connections>
-                <outlet property="commandLineArguments" destination="219" id="222"/>
-                <outlet property="iwadController" destination="225" id="269"/>
-                <outlet property="launchButton" destination="220" id="322"/>
-                <outlet property="launcherWindow" destination="21" id="207"/>
-            </connections>
-        </customObject>
-        <customObject id="225" userLabel="IWADController" customClass="IWADController">
-            <connections>
-                <outlet property="chex" destination="Lk6-np-Wql" id="xyzzy-12345"/>
-                <outlet property="configWindow" destination="227" id="265"/>
-                <outlet property="doom1" destination="AlQ-U8-wym" id="XjI-7B-upb"/>
-                <outlet property="doom2" destination="BpX-4L-Bf7" id="9tZ-Ld-Ave"/>
-                <outlet property="freedm" destination="A8Y-Bc-ep0" id="foobar-9901"/>
-                <outlet property="freedoom1" destination="ui6-B4-dSB" id="iwad-freedoom1"/>
-                <outlet property="freedoom2" destination="zrE-cJ-E5z" id="iwad-freedoom2"/>
-                <outlet property="heretic" destination="7O9-NO-XLA" id="VqX-Pb-Fsq"/>
-                <outlet property="hexen" destination="ngU-dW-hTF" id="AYw-fH-1fY"/>
-                <outlet property="iwadSelector" destination="211" id="266"/>
-                <outlet property="plutonia" destination="BBS-Yh-DIl" id="0I3-ji-w4t"/>
-                <outlet property="strife" destination="wCO-QO-xIA" id="wfl-pn-GoX"/>
-                <outlet property="tnt" destination="4yg-SA-mta" id="u31-8P-PXf"/>
-            </connections>
-        </customObject>
-        <window title="IWAD configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="227" userLabel="Configuration Window">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="377" y="417" width="470" height="376"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
-            <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="228">
-                <rect key="frame" x="0.0" y="0.0" width="470" height="376"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="BpX-4L-Bf7">
-                        <rect key="frame" x="225" y="304" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select doom2.wad" pathStyle="popUp" id="7IJ-Hw-vbF">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="4yg-SA-mta">
-                        <rect key="frame" x="225" y="276" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select tnt.wad" pathStyle="popUp" id="Eos-nO-gEh">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="BBS-Yh-DIl">
-                        <rect key="frame" x="225" y="248" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select plutonia.wad" pathStyle="popUp" id="BPR-GP-htf">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="7O9-NO-XLA">
-                        <rect key="frame" x="225" y="220" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select heretic.wad" pathStyle="popUp" id="JMx-XN-a9Y">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="ngU-dW-hTF">
-                        <rect key="frame" x="225" y="192" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select hexen.wad" pathStyle="popUp" id="gzx-DJ-3f1">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="wCO-QO-xIA">
-                        <rect key="frame" x="225" y="164" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select strife1.wad" pathStyle="popUp" id="OXq-d6-Zdl">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="Lk6-np-Wql">
-                        <rect key="frame" x="225" y="136" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select chex.wad" pathStyle="popUp" id="HVV-Yk-Awv">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="Wgq-Ur-mWw">
-                        <rect key="frame" x="18" y="252" width="204" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Final Doom: Plutonia Experiment:" id="LaP-df-7lY">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="0w5-iR-7C5">
-                        <rect key="frame" x="178" y="336" width="44" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Doom:" id="wiP-4D-kso">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="kTD-c1-mVC">
-                        <rect key="frame" x="168" y="308" width="54" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Doom II:" id="ucj-hk-PmE">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="s5l-jK-qkw">
-                        <rect key="frame" x="55" y="280" width="167" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Final Doom: TNT: Evilution:" id="LZC-z3-CHF">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="2kB-0c-PG2">
-                        <rect key="frame" x="170" y="224" width="52" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Heretic:" id="qPW-Co-8Wz">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="lI6-dr-25E">
-                        <rect key="frame" x="176" y="196" width="46" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Hexen:" id="4hb-dZ-XUu">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="iDb-XT-j0E">
-                        <rect key="frame" x="181" y="168" width="41" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Strife:" id="ecs-y3-DUG">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="g5t-SY-4aL">
-                        <rect key="frame" x="143" y="140" width="79" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Chex Quest:" id="MK2-8j-Xab">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <button verticalHuggingPriority="750" id="250">
-                        <rect key="frame" x="374" y="13" width="82" height="32"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="348">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="closeConfigWindow:" target="225" id="259"/>
-                        </connections>
-                    </button>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="AlQ-U8-wym">
-                        <rect key="frame" x="225" y="332" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select doom.wad" pathStyle="popUp" id="IgE-nz-OsF">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="A8Y-Bc-ep0">
-                        <rect key="frame" x="225" y="52" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedm.wad" pathStyle="popUp" id="3z7-y0-giQ">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="zrE-cJ-E5z">
-                        <rect key="frame" x="225" y="80" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedoom2.wad" pathStyle="popUp" id="QsB-AM-ggZ">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="ui6-B4-dSB">
-                        <rect key="frame" x="225" y="108" width="228" height="26"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedoom1.wad" pathStyle="popUp" id="6Xt-KL-S0L">
-                            <font key="font" metaFont="system"/>
-                            <allowedTypes>
-                                <string>WAD</string>
-                                <string>wad</string>
-                            </allowedTypes>
-                        </pathCell>
-                    </pathControl>
-                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="383">
-                        <rect key="frame" x="18" y="16" width="25" height="25"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="384">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="openINSTALL:" target="206" id="385"/>
-                        </connections>
-                    </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="2Lv-nA-R1p">
-                        <rect key="frame" x="164" y="56" width="56" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="FreeDM:" id="Tjv-BA-EVD">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="F1P-c6-eGn">
-                        <rect key="frame" x="99" y="112" width="123" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Freedoom: Phase 1:" id="t6G-N3-giu">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="d6S-OS-s0a">
-                        <rect key="frame" x="97" y="84" width="125" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Freedoom: Phase 2:" id="dUG-Vr-seO">
-                            <font key="font" metaFont="system"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
-                </subviews>
-            </view>
-            <point key="canvasLocation" x="481" y="-38"/>
-        </window>
-        <customObject id="270" userLabel="AppController" customClass="AppController">
-            <connections>
-                <outlet property="launcherManager" destination="206" id="272"/>
-            </connections>
-        </customObject>
-        <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="hvy-aL-lDB">
-            <rect key="frame" x="0.0" y="0.0" width="200" height="20"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <pathCell key="cell" controlSize="small" selectable="YES" editable="YES" alignment="left" id="rhB-xt-2yE">
-                <font key="font" metaFont="smallSystem"/>
-                <url key="url" string="file://localhost/Applications/"/>
-                <color key="backgroundColor" red="0.89803921568627454" green="0.92549019607843142" blue="0.97254901960784312" alpha="1" colorSpace="deviceRGB"/>
-            </pathCell>
-        </pathControl>
-        <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" id="oIL-Qy-yZu">
-            <rect key="frame" x="0.0" y="0.0" width="228" height="26"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <pathCell key="cell" selectable="YES" editable="YES" alignment="left" placeholderString="Click to select freedm.wad" pathStyle="popUp" id="Zlj-9z-QQX">
-                <font key="font" metaFont="system"/>
-                <allowedTypes>
-                    <string>WAD</string>
-                    <string>wad</string>
-                </allowedTypes>
-            </pathCell>
-            <point key="canvasLocation" x="647" y="54"/>
-        </pathControl>
-    </objects>
-    <resources>
-        <image name="128x128" width="128" height="128"/>
-    </resources>
-</document>
diff --git a/games/NXDoom/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/games/NXDoom/pkg/osx/Resources/launcher.nib/keyedobjects.nib
deleted file mode 100644
index 7e7859ae3ed051b76c381ded90e1a05bbd97aa25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31078
zcmeEv2Xqrh5a{hnI>{$v4%3@0+qm1ZCHLNC%T2cBf=w|l!WOQ$P(pw^LJ7S?D4~WH
z2qc8wA@mx02@nV&5JCt6k`O}R&z@XFOY;AJ|God-|28L|?)G-d&d$!x%ngOr<;L1N
zZ|`#yqA(?*#FT`h<$dG@-MbAi)YKZQD!X^9D(q({s;kZIR!~z^YJ|&~-Ri2Uttm8m
z(YjW61|_9rlr7~zb)(!UFDjkNp!8HGl|>a$71aCGP--$Yh5Cq^L(Qj_Q!A*I)ECrN
zYA3aqIzSz!PEaSQv(zQ(I(3)&iTZ_lh+3g`s1xdpx*%`lhx}0}3Pa&23dJD}ibshk
z3F%M<%0WF)8LC9@p&{sfG!zX(!x4vgGy;8q#-I<;G&Bp%Msv}}XgOMe)}hbQR<sQr
zKu6Ir^ffw-E}&cJ2XqJBMUT-R=uh+)rm+QPupGC+ZLtD7;BMFhd*VPGf<ti}*5G)o
z#fdlxC*u^HhCjgL@gzJMPr)<r96TR?j2GagcsX8ySK`m`TKpy6fVbiU_!#~gpT=kK
zb^I;<9^b}4;Jf%feu#g?zl$UyS|k<8L=GaQ$VcQW3K4~hqD0A}bWw&VSCl8p7xfcW
ziK;~dMT0~`MIVYLiYAF>ie`!CiI$62i`Iy~6m1Y~73~)t5giqs7M&4Y6x|ekC%Ps2
zS@b~kSoB2nLiAEB70bld;@0BM;x1w*v9s7q>@5x!hlpduvEo#*PMjm|E-n-oiOa<0
z;sN4;;^AUWJYGCWJXt(j{E>L6c%^ui_;c|W;!Wbc;)CKt;*;W2;&b9}#ovo>i|>nn
z7C#dIEx{6zgptT4tfaHVMq(>*mZ&6ZNw6eD5+~6}QYAV`t|U)VC@GQ@OAL~}k}^rT
zq`#y_GEg!|GE_25@_}TeWUOSIWU^$6WTs@6WS(TcWU*w4WQAm<<TJ@y$$H6F$!^IW
z$zI6;$q~udlGBnilCzRal5Zv7OKwYkko+WhBzY`(BKb}7j7Bu3MYNc<pjo;VZB4hP
zJJ1T+j<%<rX(jDNd(*yj2pvj?(b04aoj_~pR9Z)8(phva-G?rw4Rl|+gf63N=vumt
zuBQjn9L>`s=nv>I^dx#RJ%ye@&!gwlAJYryCG;x#Q+hSMhW?!1OmCsL(%b0W^g;R%
zeV9H%pQO*zSLko(tMoPcJNifZ9{m&jkp6>yO8-f}kV>SqR4TQUwwAV$wv~30c9trn
zc2Xy)r&KBRlCGAnm9CR+kZzRjkRFmAmL8E_mVPh&S^9_csq}9dB||bs)>_s^W+Ste
zxygKFVX|;poGewQljX|tWJR)aS%s`pHb^#9Hca-RY?5rUY?^GAY_4pfY?bU&*;?5;
z*_X0yvhA|nvOTh+vQx6JWfx_aWY;Wm85&tp$<$irOJ)PLluBbZGMkvq%ob)VvyIu#
z>|k~>yO`a~9%e7IkNJw(&m3S5GKZMM%n{}&bBsC8oM28er<kvq)65y>EOU-I&s<<G
zGMAXk%oXMv<|=cIxz2pc++c1p-!ZqC@0r`o56m6rF7qREkNJtY&-~0hV18j9GQTp9
zn8(Z$<~Qbd<`3#6^OX6MdB*(3JZJu9UNA4^lpM*iTqGCEC30FWmCNK7az-wfTgqF=
zt>i7`th|-nTHadTM&4H5PTpSLLEcf`N#0rBMc!3zBe#_+<aTm<xr4l$+)?f%cb2=z
zUFB|ace#h$Q?8VI$-U(&xmxZc_m%s}{pA7jKzWcnSRNt|m50g0<q`5od6Ya_9wU#H
z$H_JFczJ?cD^HXs$&=+N@>ID_o+eM1XUO&POnH_(Tb?7&llRK%R#{(O{tab8F_fIL
zq*_o`R7;AbT2a<iYpM;^mTE_}r#es_sZMZop}JBw*{S-Bs;atPsrs0z%1TheppR>N
zrs{RZ;@a$j@_IvUKHCz$niRC@3N&u`o@5vd_dBNQql$_QwYA1VW4W<zu=%rWsy^EY
zH_8n;#>(QVfzZ7DTbjSUqXv|!YHG8)6_pp%*5;WIBds~i4d&4gJo=tTD|tMPlfVa$
zr}B6@k8Yo#6hN~bW#0n`BTuFlR2VoBCkEW3s$oScDj<}ep&ThE%9(P>Gxc8yt-6~|
z4Yj@D(fZoDstOaaOQ4-=_eRpsQ0@T0gHi%Y$|@6g7E_)a&BcGqwxYZ#6{V(pC|}Bt
z@}~l*Kq?5D2U8(bC>2J9QxQ}o6-7l;F;pxSM`@^d_|;O0R1!>$6e<<&rNJPWSe5~!
zlFxQc)o0ZjYP6MghMK+wMFwr1p+Z}1sH`*gH5zJwEK}o5V_mr+H&vffFi3BF&(PFK
zw$U(<TsBsc%lT}Z#s{>u83rJ-rT~U0pY0?x(SQ``i)svpN*IAUfMI%u+$<RM)|&vw
z^neN3c8$F^Jl_NsM9G9_bU{&>v9bhE%E{D}7nIaCQ6LN#3>(2%IL~KWH9n=U8(eNk
zDX1;uq#VV`xB;A;tGD0=!fzcnh+|l6-DeO*aTXlKO7qzcLx%YHd3z{)0|SS8D2Dj?
zs67;_AitqQK?q&a0E2=OgMvtgt0K9ezOty)Py+*OLa_G`wXcuTPaOo0cn1u<KxI=o
zRCg*DhA|I@rzh15KJ%$Q!t_Wr45|Y*R##OP8)`rz^!0@U0R37ZLsJ9&6aE2#sm8+0
zs`{eR=mG*~fIv6UVae6NXKgD)nWU<aDqlqvQN@&j>PwYSrIeBCN0o6cID0OHOXV`S
zJg$%{<tn&tSEx#=imC>jvZ?-nS1wgU)lzj-JvD$D2%;5B^#LrCDGf~X7(;n^P6Iyq
ztPRYA@^YAu$yFsV8OoCj23OVB#Tsi&DgY4I*H;^A2o?FPW2!zADAX7Y<;79u#*)ek
zkO?x<+R9o(U2V3>jDxX^t0ZDn%(djKWSkugj+~<`^4WGnhNuF8j{!bp7<~L;NK~q!
zLoZXqsNsM+NAc7M>H}&dHHsPygnvklrN+Uem_SXWCXopYm^aD@5vZD~@&<7R9ILBp
zV0M6n5Q!?Osj9Cmj;SiIs)5mmCrb-z3W{LHq#29K3^fhtL6?Lap&1NTgNzcb*91vz
zEv7(@T5t-k71zds>&mg#Y$Qd&XzLB-K)IqoQ33-S%$%d9Qq!pEK*kJeCN+zi4Xh@^
z4FlX)KpMUi5p#&NhaTalm6Z)=&9%;Ft(8O*8T5l|VJc^7H9(n3AI+ua!9(Qx5^65x
zdLH`zm|8$Bq!v+&sU@&zenKrHY$0Tlt_kAgTwe`(0mLk(pst|2s)XEv0T*s@UAT5E
z&9&v)XPe;lEHW`txO<*jMSThoRs*Cp)MwOMY8|y09?dB=)|q;*0MUjq2kmVQJqlW}
z8Dz4z(%)Mhpz`wx@S#%SOXE*~LdA->4qTUW)OzYmY6En?k=jIUrnY3J>b0?1@DURO
za8jy@4dtu_*O8^T&S$7?&~7`m18yjbffQY<R;9qU(gNTX1_oAu1jJ`V<#x}_Q%JAE
z&Y(Rka!RUYK~ZgWR9adxVR9v)Oa8w4^ZNzZgTT*OPtw<`_x|;pq}Whf1g-YKF}S$4
zsDh$UC`C!{7FE~OQIthDxb85pu9}=Dz<Hap%#0W~?@3WI%Z6v+GG!ZYs5I0VixlxS
z1%nmw1r-$q3bj(LNUN#pYb<{Y*5sl8ou7*GdV)9kv4z93woIP{f0cm$$l`)navlih
z>x&BF^bP0t1{kwb;XIO}uzhu1bOxL!!g*nRSymLBd%*dczBQUGI1h*OOQrP*<lL8{
zMD5-y&CG#w8#qs_EKJqGc`%%p7S+b&!MO{ZFDW%>$v6SeL`RKv+DteHc%lb2RT-qc
z8%2pjiw&`Hrt9LqWmQQ82be<Q4YdRG<hp?Kd!;c1Pk<%9(61md4bGk5{E4AFp0tO4
zB%P}3(nz21T@qVao=V_G!uc#itw1k)mt3eT%_L){rYPFJt|pT_3%JpleT^C|oNM5G
zP-#s9xeoNwyQ<3tIRl>1&ui*42<<?lRAZ>jB0MB=!4=fR#lt!9O1gu}Mg^eGtEfWw
zECQ{46AYAEQ0xPQvl3w^TL9P8&|VG3fC1VVK${z(RT*3_f%Dr<_sMs%_pN}>YPeGc
z3x$y?hvyovDum_3^c?A<3J&s(^m|w6w+Px2cuF{8Y?i^Ap@604KHM*bvlQxvaAgqS
zR{`H+;A%bGD}i%!D5mGr1YAuxkoyG6j}1_&;E7@ZmgzYHl`L(fPb0K@5AG4%1j@zj
zVfW|*M~FCC947XL>+#S}0X3NN6t0H~*BYTVQ%-36u?cE_z?DECTqD$zvu4hic)S<*
zRR>qgfkLv1l2)~V&2xCBtl??%XMj&rI@P;WSI?T1uI;@XTAQ#?jHt;s7M+^>uz~Kk
zjoO>gJzp6&ow-~Hl2ZJJTmXF7m3}R`E;&aj;P3a6^OC!8_KoB!{9bOtCk^m#ln26l
z6Awy&52kO;l2s&JA!AVvzhqqA#It$KO#P5HW<4O00GG&Yl+X*gTLA|dS%bh+)A-fH
zIk8Ln3Qv1d=2*TiQPA6=_jh!l6c;A!IYKGcuv-r|QKvXB-qQ1|<)QccR!-?uUEO>6
z`+pg#o9~iwFpNq4J(U{a;r+SyeeX}a*LXknzTVuz`=a;H-sim+!=0Z*(?uIaJHf-T
zO>~@6z_)Fpy`rtc*&5Lf`2C{kxmP9J#DiBQoXA^IgG3V!)iubJx$Kkq+BnAvzZ$tk
z+Bc3=KY?p+j)b|ykP-WD7@7BDnstqH!ZbR<T(EMmQdvo@+^qbpqO6dW9sH`TBH_%z
z%HAs3sy*CIuyVGFwd&l&k9c7m2_B{yY83vG`O-{bF5GRD1VUda+^Z2<6g1FlKEH?z
zDJXL)iAFP;&nnacW~K>}NhiE6IYgH!UYS{00LcipFqxIL0KXi*4}PtUY2Fjus!$JM
z4Bs*n#5Q7;SPPm-M=8WnVn1<Y!#UAbq3}y|l}WRBiX-4|IQYK;i5@ej0D5oMXm7{f
zd}bKvVDKu%(au8O0(EpO_>?r1f>x31;BQKV^B~fy4s2RjZ>X56>cKU}lF~YbU|%Y<
zl|@Pqh1y#Ms~fSINE?cJoG#cxsNM0R`kDczYsBUS?<@oMR2y&**nr2?1x7>-8`uz7
zGvmMp(1G7Im+B34l)^~X0B7F^>wPpe9z3u!!CGAi#_1|BAlHMHw*x$|2dQJ!*VK9H
z8(2?nga7p*^*i+!LP&~Qpw_4(vPF)_9jQ?ucwpmDGWcC{Q6E$Se%E^Nx_*GhgP(OS
zT8vhqFTlUL7aal5>Sc5j{fHi+XIO+S!JFC@J7F*Iqeg-6G!ys2CAdF+503=z=|^}8
zUV}H`z2GH1k8j|g@NXhYBp0<4*@-+wfub0Z4!od!MKz*fqH*B&Tq0TvI^dA#tmua5
zzUWUe4Sr39*b_!EL7W9X%>LqG;tArp;IrH$-Y-5YzA1hvej#Zg=^}9lZ=_bzT~Y!*
z$I;+nTrSxNzQpt3J^Y=f>2@$a0Wfa4bU%6sJpp`s>*zi7Y5ErZ8~ErtO5LSlQk}Fw
zS|=SXog-Z%-7P&My)AtzlY{q7Ez^L<tx`4u{A-`ecFE4j?#TYKU@aUif-Q6w#TJ7t
zCR==BvCZO?#chkfm{yE46UJmR{TQD4h*=BXv#ZQw@LJh}cPU+NgdN#O^3Uam<u~Pj
zT3TDWS;koQw5+$BWVym}kL6{{$1Pg4aB30RBCkbVi%Bh3wfL&V^%hU9T3actv{uDd
z!>#67ZL&IJ^`NCiOUIT`Eqk|oujQ<kU$#8e@;+<9I<YZq0XvMH$8KdWvcI)z-AdI;
z*Q%n`gjS!nI@0Q{wba_lI?lS-dZhJI>#wYDwHCE@XdTnKsPzY}KWTlS_3buv8|OCK
zHvQU+Z}VB3lWiWhwQlR%HoNVhw)5KVY<r`fsGU<gZM*VzliRItccI<0_FdaYwKudM
z+kS2PGwuKA(78io2SbN(9oBU?-{DzDMaQ^~WgVw>+}!b6CvhjYPU)Qnc3RNsK&Shi
z+jI`;T-147=k=YhbirNRx@2@2(q(Cv<6VC1YST5oYjxK-UBBvj-=>{Sq)k7Y88*9Y
zeza|E8*Xc~ongD%_MW1xB1%!N_(-u|@zAb|U4mV`-D10wc7NGB+h^I2uwQ3?&4F<U
zbm;3a!(pGp!)~_SQo6n0ZFRRRjuwuAj-`&X9S=GF;pFU;<21%;v(sJY4$fNV_ncQd
zUv+8W65-O{Wr@o<SK2kuwaoQn*RS2Mo1a^$+dQ{Z?%3Vm-RS<Y`)Ln}N03LQ#}bc=
zo|c|bo&!8rd)`#GQzk1%C^st~cy;s2^P1{)$m@l-pLaQ|Zr`Y^Rf(z*s%@%AYBzO}
zdY<~6PYWN7&v2hDKEL|9`x<-~_+IjB?U&*=#&4hB-~IvqHU4Y;e+=jr&?jJiz{S8e
zfoXvg0uKjCf}(?l2ki*@GuS`4E_i+LFCm^GWg(x2+zoXOHH3Z=dMnI6tRQT0*o|;S
zc%Se^;Wr}eA_^jwM0^+N5Lq0#Jn~MIYgE6eHBk?uy`yWQH%9*v6C5)%W>2grHa>P-
z?8!LmxU9Ijao08Wni9=w&BJ)V_#yFo5+n&p2~!g;YP)KSw5zla69W>5ChkwNOwuRK
zP5Lg`Ex9InTMAA|Oqrf?HPtb-GIg_#(rI<mb=T6I)B2}vPp8w<(&wfBkfF+WKjV<T
zwLV|}ss8uO=*-EP-(<OD)o1O?ZkgRPdsX%yIk7p@a&C0@>OQplvD{9%#@sD=(!A`v
z<$1sLi0d)4$L*eeJxBMv(95~kpk7CMcj{f<duM*j{DS;1`$+oa^!c>U^8#JLl7im~
zwT1Hw9~Q+F%`W<>II?&~@sEZu!!*O4zF~c*^}SmXRx-Wh$I^(>S*7=lF~+&ZU;8EW
zTiEZ9GF{n<vX|vK<?AYB6@4nUR$5n<Rqn5{sTx#uy4t;ZboGt?!To3Ue^`@Lv%D77
z_Nv`d*9JD2$Ln3{N7dgP5I$hufTshq2YxxI)u75j#|OI&9y|EXdz$x_4G|A18nW+w
zyZ8C`Zw`$bx_B5GRyb_maEIX|hu`Mnxs^P_m+>b?c#oJi;>ia&A8Z@hbtE_P)~NVV
zt4CXnt{HuCOvsppABsOTet2@M&)7L*UyLgrcXYh>_*vthPbivjbfRkFM-yL8>O1M=
zWdF$vrqEL=r(BpCF?Hp%R@2^_c58ad^i4AqGsew$GBbbXky*a87S3j7*U!H3QSwJy
z=5(7gWzO@trE|~Ei=MY`ewX=U=l}6>@yBNtL@rpnu<OF{3!g1AF1oZhe(|OyPD^Gj
zrI!v^`okyLpB!2ixNOz(PRqwH|9eH{iW@64R_<RFuxiz(T|S+>8n3Qj{o|URYrg(0
z_OmT(J=ZQ?*KXbT&#BMrKfm`ypD!+~Pg=k4%fK(!ZgAW%e`D*7<2Ip9gEu|gT)O$j
zmfS6;w<d1gw=HDb#_h`OD|XoJn76a-&dIx&T_bnB-2L9}-}Y4Rxxcq$@2!3L`@Z?A
z`&Z}or|&;`AnCy2gPMb19f~@%`*7Id9Y=zXY&{xybn`L)W1Eiq9p8Au@5IKF{wFt`
z3OKdp>!7c<oen*{>rBL%y=P<39z3T#ckF!X`O_D&E?m0U^Wu$5#h310F2DTil>t}&
z`i27|e%v+o+N|qct}pr4_1kqf{BP{M8GG~iclz(Xxm9%Qr|)aOe|~%94=sL}b;tJ3
zs=MmDJATys`1QRW_iq1G{nKCfNB`XF=lKs@9&Gp}@|WWeyFa}BYt64OA5D1N@$rf$
zzEAf3miF8A-z$Fq>yL3yJ3d|cXW*ZQp5;8d^Vh)V(&r!j?fUn&7fCO!zN~oplIvu0
zLG7Y;gCi-WzK;0wV!;Wsl-dQJ4_EL@k#D9(`>3y8aXl@e_EWB}TrssfNF8eQLoES=
z;5CQVQNf{g96VGu;GeS1XW0hVRFjX++&y&)tO>zA741#Mcq>%IyJUiLjyf;+Vw*gb
z#F_UAb&k3~T@=uY5`r7#Do{cGn4Y^#U1@L#3jWPy)MYSMu2R=1S8!-Hx*JXIXlU2u
z<!yGo<}^89YpHL+%o#v^N8M_2zG^rp&QZn%a}EveP?L}MN2+`g*Uf~%ed=e3H8e0g
zss`LbOJN`WfN}+{316E%sJ<%VK~)o{w%UK_&~Mq+)UVVd@S{Gao>0GmZS@CuR7X)y
zsXr->dPe;PyV<|NoA!cwNv%Z`*j*TjkQhm*VkD(B$O17)4&Dt7vO+BpD|q+Pz&TY_
zY%CHY4Fd|w1*WFe82TD&Y7E73#U%#tnWh*j>q!J6pKVPX$>3qFET}UydQw4jqU-DG
zswxEssL%m~Y~uRY8=*gNBf=P)J*BMxH@qqI(9kPkGWb}VT+J|E1fU6%2J~VL<pqNU
zgdr?aOK{QDR8^2>0A0YSR$m7=2@e4ms|Kc3)f!3A2Y79UotjN*{StmgMpBWSJLhUm
zkBFo=H_nB#ZzZEFI1kRb6`EpU!6Gh*MNQsbWQ|%AZ?8in_?XB~D@j}8)-`X?o-|-t
zayc#S8`PEh6WM^l3y~>ghwPC9>ITNI6AXe2az$=n24m`5q=cdHB6F|OP*GKBEK05_
z65QL33<O^(34nlm*(A>(q`FFhg)l6Qjo@x(K~0IF4kSp32*F>08!$UljDrlt!UNXB
zfo{&j8X|-g=gTQMKh71T)ss`71>{tKrW*MmUy%C7;jZQUxd1LO7rd4RMJ0TkMFG$(
z5Cx%N6heH`jj=XhGK^wXeNB;p_@Oy3PQ`fx77c?9aUjxXOsS!$tfHW%Oqd8L0!0d<
zVRA4xKEDJ-P_E{HVujv(gr=kyfue@NZk1nMRh?B$<iW(BU{lu#NNXmxOHcykny0IS
zfDefz)CzMFB~#^#5dtAF%}bPq(i<di2}+|}O&#e`rZ6691dK_Jh%Q-<^e78uo0JWi
z&43p{g4_e9H#ao((jDc(7@PI69Cb%|jfw|`&-B1G*t3%OP9=%%pq`*;tWhs22la+M
zm<IKs2B1PA#-pKPQC}(wl_Db*1$4$08wJg6n$YDC7AUPMhtQP3eHf<Lnu3zd!PSOZ
z3ob#%X*szCD5n$%LWOc+oGA*0z$YYVD2Q{SDoVKuRipl>2GycE*qRMM1JNKZoQvQh
zxhO80i{WCqI8MXG=d)f#RTWC&UpFYL3m~*nSXEF{tgME~X{<FAdlDbFC(-br2R!Ql
z2Z$e=_Ni&H8b$LH3e!D@=H4JA0?&e*oODEZn_{RdAgdARj)oqzF_~|6p-MG$&s4-!
z78O+2)|Z1yC{}<fsDpT=vARw%Kn1?{H^6F(2UjW!O8wQvzBL1UOX>p$7x@>%K6&84
z0-r$@@K;q*R$O0Oq4M_itsc~WaD8ckx_VIUfPvlyKfl7-ih)H10mVMGg#$rp*$D76
zwHl3LfUnZ~O<;}mr^df|udRt{GS_O;1Xhx9GYQd1G>Xh;(;}@m)Gb9L(P+vQ!Yc3u
zLYxr&4D^NQX8>6<RB94|QwI(mdI^>bYcv*(gU$5>A?UUlO+=H>Bw-ntf~JyXheY`V
zr2zp~5U8k1V+C-omRy2pp@B<gK{qB^W6*r&Q*)*;HIs4x&>%QWcz%TDfXoT9N2bG4
z^buK+P50)Z`HlC;Ok9TMHBN%&1=cLKi58%Ru)w|&+vL(X-P@v#YCj>`NY=`CM;rS#
zM;p;vY7&H3n<9Sc5JHTpg78dbv7+2qX;6Sht*;<auwdrx$bEs<zkysPr#DBg?T{gA
z5|IuPaP#%|Q24`;TxpDiqU}N~bR<MWN1+|yAN&yQhGE$Y2Zng)BtiAS>>XI!9PSjB
zuNjLd1d(9{mu11_Sb!ey+Po4SM2FB}vQ$B6g#5I^)?7B%x)<oE@+!{^LkY}^npdKX
z=mas!&?zv=x`R=c3(Gw5E;Yk^J#2{1ptB8jnTm>0ne4J}KyQKeLKndTF*B0TC3G1y
z*Ei@Yx<<?-bOU_H8iBHe`jQgJ3P=MBqy`d6xZYe(8P|&|;Cc|_sTHz>aI#5Pe=lgK
zd=~iW698d-Uw@Nf1a=X`_w$AXkYR_9q1V7b8V07(6EKcO3FgsAK!+Gd#3&jKjwB2Q
z(S0z9O5yAw`W4C1BY~x(M}Q&V%DGv~fM;M2<iVFdTt2(FnX}gD30dP?iQAAx-Xzi4
z=;<eo3xVlM9(uN{S-HQ9E6>s2z?GNiDn^7W6p7qxxV~Jmj57cSip<SNENvhkBJ1h^
z9}sX~A+#O@r)nQUzhEN%&(UwhtciZynve|?7jh*6#fqL_+4VJ+)Yll4O65BU!0mAR
z1_C;p5m3hUGZA2Xg#f$e@l%10QVHm*d?DMyM?Lg^V$k|w*M>o38;~yL$_dgSPZ{-<
z3ebf0)r!ojs`7upT#3CJF!wRTyqc>rVP5$P=0VM@_X#A~AtuyGqR79Zj>F94tqeyu
zqHeN4iI|xfU%~Y!H1sfKrH~-8A+I@oMUX1$Do$8x+NTJ!0L0x}(DS~&a2gm8Fm$MS
z3X3`jl3rjH@HYPe<juc&56vDTbRz)3saPkNSPh9qhKg#kcrL-IM0bN#fYYh+b*wke
zz<O}IX5nm{gS+EgoQHehp5TV<jq`CIT!0I45iZ6C+!q|PrPzr3;WAu~D{v*Q!qwoa
zt--ap4%g!Wcpx5x2ZQT&2!0<A#l!G$%we8;j~mW?z>VR?a^tzVJZjIQjy&qjqpm!%
z<&hna9C+l&BWE7D^2nV>o;>p6ksptOc@)8;SRQG4l**$F9%b_=k4HUu)SE|rcvQ%v
zQXW<CsD?)acr=7Z9FIovXdI8G@Ms2)KH|}Q9xdY05*~fRbvp-6<xzMv=#Mt|Lp&Cb
z14B(O*tlTK#X=gD5q3ea!+=#XxuDQc4moN=xS`xIAsY=(pzOK#Ap;F;m4<C)IpiBb
z=7XUG_-f+$R6I?{&4NrJT|H!SL6VA)l~+}>6i>y|DOWHp;a=0#CXDb*sszu*<2Vjh
zff0=$=K@Hc6T=>;F~2FLpb~alkR8(o3@fs<CBw=V)wr;kb%z(>#X@%@xzUZ?eFEK$
z;>5kRIZ?6AB=j~8EP$LFAuk6gGV6mX!>ffpD!321VLi)*94nJ$Yu?Hee<8G@xpCaE
z-lkTD8k5*Hw_5~${LRpABsYPZ!wqZDLNFF!9w1^6=TWtI8{Uq0Py_HTyc>S^f=PUX
zY;QsIoA&aiw5Pa1)diI#`JAYROk;H|H<g<r<38dh!tW$lW-MOI_`-+qVbI8s@dak`
zLLRk&Kc;;HK29l@ph5T~*uRsB1>9iIWo0D4Y0rUCrdInAtzlZQh*d^*@(sCA_$<ZY
za}cYzK#jr|f#S<}6Z(}(##iw*YBLyOu<aGZ1&pS&g1S;6Ax_wYr!`yo`nnoeL_tyn
zQVqp|rElFv0T#jpZZ;hG+%#@Fv2Gv_vP@A|rKmOKG(iH~ASDc@X?owlx0c|W_&aU}
zH<O#ChcVX+_ejd*1AJ!*@lcqg_D6gVP$T#d`|cC`lW7}dcFol8XZ(QddPqByxGclJ
zG@5&_-pC}Vn2-Hq{6rZ0c|2;z4g2=Lq*&rVs3`m=6$66s9E6}D#ZrWuQ!KgpFo+*>
z1GtGiYTKMfxPasjnz9E20>HFT2?n%p0O&@a02nLSRgoE>C~8;~g*gvPu8J(gkSi##
zPh>%~V+Rof;U-H_3z3zmCEg@zC9)Q^7PS$zg%DJGQ3p{+Q72JnQ5R8Hk&Vb!q!8J0
zi@4?78g4zeh1&%qwVyl2o#M`N7rAe^Z@F9C9qvB&h<nPt;E|X|G9Fp-h~>JyV={=k
zi5wdzgUGFMGH^?|C5@84m`J(_U$57sxKUDlynO}J>K`Rl#Nf*!hDfR?NEA$M1~O*D
zk<Wd?ErSX1x}X(TRaK~)Buy0diln`Zm}pT<6EO)*#H`|0HWIU<nV6J!5Tl0iBM!8G
zCPog#$OU3@MBRay<v`4GAm&qUHEgS1C#J5lu9=h`|A~}7qJkz;$i7`rQrtRjZ6hh4
zHIq{IE>e7jq}G2S#S%!d6iBHT4FFQs04ZyLl+U>@^4Tu0lTuw?4_-TCK{Gvr{}VmK
zM8lit8QDb7Ms7nRJzqA{GxlBds0I7wU+8H8^t2G@nJ$_E^sEPZ)&o78xXt-&=hx{0
z|Bj)~Skz3;?Egg0e9^~E<Sc0-XFIp8k({l~<g9oHIjSJ_e~>gQAje7|=L->p%wg8g
zh9jTb!R>s@v;m!HsB9)?<9{M%n`nCzF?*Vb*~{%|BxZLrF$dm7jQ@Yp0WE=;mI5)S
zL|+3jyMUNoK+HbwtGA3zEv!;~4XS2x&c2NtVe@F_01#ag!RAr)4K<Lg@WR#+(wn(M
z+yNPPkh2q(Z?lwRwV!DeyvZH|Ok%PzQkgb}Z^=FueJ^SSJMLd8$UYX`6a6H*Z!Ko2
zNYKIxAOq5Xk8p<}4Ok3|gF*wgUb!L`6j`t$tzp_Iz^VZEH1QDxzp|eeJ!}ec93?@H
zymDe53Y%#2-IO_<zlnZ-3!Nvp<8RU#05*h=$)50Sp!4m-SvM0WrbYK*ZE2$GWR^h6
zJFpR3h?%!wbDI15O>F!LHr}R$`+vlywHY>@0Gm_I*qrH3uu*8W!S6z-tJvl(2%YE7
zy@8M)SX=5q)85D*mUAKoZ)Z;%GlZ0Y(Aj2$E`R`=k9cNkX0Re|fDr~BY{++FsS>N-
zg5_oI(i>Q+h;^Y>3)9Sxyr%F@EZdr484XxoY{v3R_XLx|dnZD1V$E9+y2f373qs(V
zQUwXiC2>=|8=-b)2xS98-!vn1Jv)J@taqZ5E6#fhIybo+Z=w?j(^dt(GFZKR$>}@!
z)7}i7et^!m&FFlWLrmkohIisqA+CH2KDW8=-^9mP@VW?M6+pZI@5HBr89u`RpIgoN
z{LljeAcGX?@Rn8GD>#{X%f!5RgvmJ}9!*qUgJ0+#_oK-<akoL`2}YcFLbF@NCxFa8
z!8s8K0`;%H33FeVsH1pBqi>?YC2@!QiMS-PV#=#(4ev0~#B;=R8`m1~!lt$67w$ph
zTJv+$S|k4C9czsbVEXSSS|?a*I+3+TyjHvp)|&gU*4zgr{gC_hEgKtRZ#FG7;`MJ^
zXkOn)iZ_e5G|{rNiI(5ECylf`Zl-15YqSuz9NFbHtUmv2ZFUAyIt!#67oPx99swzj
zfRx|4KOnO4x=GU)Udt*rBj)S>M9g{dg(hOYX(Hw??pY%-e>M|y;~m79bm+g>XI+4p
zE&?(4#6JNsPl1@HK+JRQZ+M68t;D>t7Z5-APxL$%KWU=p&qjK91g~dPjTF6Xrs&0M
z6g6&bRHkL>Ur6c-By}YuNn{cWAn65=^n%Oh5$2KTABbu;Z6ua&BkFa(xTKZD8fH59
z#U<^Uj2jJ)q&%VpFF21R=9690rD3wSX?VTr6&Lt__IrzLn*H9Uxej|vIDyIjj>T8v
zB5{3FP4bB0k;SWu61?*&e^5hy0&0H$xQy5~>q$wF=sxUjn-nFF<T)CU``DCMw4|B2
zBng#-y$vNR9<_KCC77B)L|>}}Eu&HsHU3WBtuVtWh2UgqhEq%M0}!l;aseB#w4m0Y
zP`wkuG)el~5VYn|t5*>Oo&|xK5-6AgD#2IuPW<f5@GBtrv1a(SehYr;;JhJCj*Lc^
z1^9-^>tNvEf5Yb{>Lf7=ei!Jw12-&-(5f=?%ZM0Bm2e+?q@5b>tIh9smedRPAMvOQ
zH!Rzvz04bQl?)LYfJeiI8<s0HcpXR=2`{vH$|HqYn^yp}kc<)9tmlzEH!P=N=VuPd
zN-|Msv4uz7099c#Wp<w`mP{A!+w;f?yp_bOX?oYM%FL&^NMtFQBQ#sXBNuL1_r@)=
zSx=&tl7&K(T|9CFqD?y;^9FLsGNHk89(i!X^x#2gzWX7bDIs3dAsjfPmE16J-Zr{K
z8=SXi!3_;gXvsRs=aMgY<jo@=9{FA}C73{HSApyxe*;oWBws>mi94j0V993U6IVfo
zhmr#?xtdd-gN7>PAlZg|B|9WLCA%QiLCDky<k3DJ?d8#ake_JcNmPIzk$4Fq!G`4S
zv@C!WrOFb6wo<rYO0baZlfWhqqSYqvG<io8e0=1Ea&TS4O~?#;&2`;K#X-p-LWMt%
zg8rEb$qC8HCMtLYcm{Cl?(k}{u>#(=OeeWWu>0y;RZ~H(71Y(&z~$g3#=>heZ6p^6
zs1S%Mpl|?20+WBDu1yScmt28-9Kx<^$cuvrLa2#dVXw05rsO-xEe_yAU+Z|Zy?az4
zygLi=C0GoqY9P%*;0q+AR2D<(gK#sgpwduohRYqiNb)1WC6XJ-qnLLPe#JC=l3yeb
z3E`n+_;?h}qbN=d%zo1e2{@#CK;)~cT6lH4X-1nt{vEjRlt7LnTuAsA$S))>%^=6~
zNW-Z!6O6@%^wO+S_|x1mEuq@bQqplE={V(|JEmLER%RV1^C$^APOmrCrT5Q+Y_bXx
zNipxe4fNiQ^sXblr@yOrx)TC<m%N~Dgx;;G4ishL8sMJBse2II6++@qEo9XZ5`-@#
zf25%%K&=@~4gl4WK-CkdS?_|{ILl~{CYs1B%LMV%msSlV^9O*{R}ye={tB>$X#lTt
zs0pAP9_79ROw(khg9w<W$=n?{mj^1dXM^;U^JW?-BVI&DO1^+#E=XDr==&e#141@4
zX$>^5AnK<VG|w?<AG03&L6c-?Qc9YD9psx^Q(q|rTALe*Is(`XXmp2wEfBz37m>XK
zsD);^Y@|M$&LPwn@u&ovzD1SMc_t>)z3ASA`eM_l_T`bGDP4^&pbL>Nk9P8C7Z(Vx
zDc7YB$}Fm{3vPr`N*f6jBah1e1xgiNZ3d-`NBw}w<i(owqO2nL)70evdLZetl1Kgj
zrOTo8FtaYJc~r%zv(iY0RQiByApxnW(~<Nj(rGP^>i@Y@gy{)Qof46&<J8$CL{w+U
zA%R7hLXEUfrKgcT2lD8>f9{k1h@R8bCy$`W#vq_Q3yOE7zn2AX*H<-lxsYB&x_qBU
z!~dnr<@5@(E{E}GD5uVAc#$3^M0!D<DFOxOO}&3cuO+?nJOTmwN0Hb-Z#3)u10Ib4
zgfqY{OV7)Kl+~(csie1q=<X!ljwZ4@_U#?RDj+PI^jGwL(s6^{{g6jvh~910m=r`(
z(W;5wPp|7mG;XFzZ<*<N`Y6CVPT-9v@Fu?<9(}3--WmEVfj7Y<+mm=S@s)*#zDQr9
zFO!Am5RVS>=txh<(XFW}t``!U(<6EiBr@WnVpHPGNWKmz+#o1SB`82~lsA_>KtNdb
z=sTumZ-Qyro5rbo!n9UE0!2wZsIH!*e=TH`MkObk0k{tU9uNRC34q!E2;jF@0L&un
zY}d$6A;(I{Gd5HfnSjNl#3pM~&8c|?z@8Iea|keq2ELmbspu78bA>fCrK-lDD6T3J
z61jxHov?0O6VhVMFE<k?mEoCEhQR!oz=YWEKfrAD3d{urCabUNTQ{%(;KCAPfQlIc
zA7gZBx!TnDW-uZf0Mmhh5fd<r0nFPOPL)DK8&Iuzq}|fSc5m=XY7gzYkq(!UhAZBN
zccZ~0bvNPNVDK!5l`;xKLFH8i#lRmyx*NZPy$8u3Qg3`~9XnX6qC6pGrU>44Er#S}
z3xp^GDx~_N1yl+80#d3jQAYHf>WACG!lINWNVSqHl5_NSX^P~I)Lxn<O_yd!_3(~d
z8`?pdLrbK&bRIpG{!H47&ZbN00rW_Ep|nWyrQ{&3l9ou;NsaU=`Y3&!zE3}sR*{i`
zJcY-2H-uTcL7+7nLaluu*g6ctt@A}KMcW{Pz8!+Dmmuu=o2a$eLexgwRn%6j615Y@
ziQ0>EMIFQy;Oyc>oy2oQoyD6)UBu@_UB!<@Hj-8%TZxNEAqf@PNz(9#(&f?>(v{Lx
zJX*!kkPy^@YsuL|wzLQ23x_}oZ7QT8W^kD>D7|5+?F)-z8LXk8=2!D*E$9$1J3;I4
z2=*tDFd{tql1CeOw24Ps!4?C%28;|IZ3FX(M>}AB6I3-Qzum&B2ul_$F|Z(jvfTq~
zzhEzet?-p#{vQCH0V)QjI7~vA8az5I2rJ}D%ma_XB8d1d=T<@7Zym(SHbQ`DJH%!7
zauXouVLyaUj&Ucz`F<Mw-RHrZd>I_L*T8Ff6Fil-VfnrXezjk~A@v*hasDEKXC%a)
zr9$`_w)~bnvVx5#kF2>NJUYgslRUc4qnq3;A?-!FhO+0;r>|FDGTVMgzmTq%eo55Y
zXFOWNqodtZ3XGK`f!ZW#o2c?nq*`gNv`7kU0A2!nfCmR4?ET7?$6mS<wmsy9QYUFb
zqe%whc17}?^Z@dLM0qI71F;!cQ&$rWOV&#m7WlW0N1ubOmfTPSsCTWYT~h)%k@uri
z`Dd?5u9@7vV{~61TBz95h_dtw*>*_3Y1pX=OAcgtx*;)qiiKAIw6%IeH59OcEfnPW
zYHMSSwL*CvVMVe40^BShO;7!wyL|1rcXF?B{X-ZgXNL3%;hylUiDw|P@Nc7uXL?d2
z2x@<skLNRZ<T)A7%|f#+reS>1;H_$zPx6yZPmw|XUq%0a^|_t^Uq}}xz~9M(W(fj?
zlt&ksc+ey_Fg@WP7@8nAnIzj@pi!ov%2&RwzTP#F-zf_wQ`cM;1ar4}!2bi%pfSIc
z?0gMr&>HY>uYh#6$<<>*I|61{qlPutEbm0o<XCtWMc9utqu3jmY=TfLj4|0}H+UwR
zrYW%42?^c_(CMe>ORr%I8V&w|nL}8dU?{IP;o5^LUv9nvyhZPIyG$k-0SA+;X^Mf7
z1Hj1SGEJ}sI}4_eFpGKs#smsMmz+21Ad=}_jY&zO?1n6}?o_RG1>|{a@GdG!R!2el
zh77)e;*(iG0vW}l<K*LnDX&I0_!Z}KE~I~xNS}9e3=*HEc-e50h>tHym*dN_5z^(d
zk+M;;(Xuf@GN378s-XlE$*_WT;1~yn))_(Hp5@Uw9-XqLAQ}IxY%FCh8wYqzkWGX%
zL}ej(B_UT#Sp%<2)j?%dg4t;veGRWAkT)@cy}Zh+Afdk$UWo8A-<Ns`8C$X`vZ?So
z0c5f*kxijon-iZ8%BBm6&z4<C;`3SAY^WY(E&B*ks}@81jQD6B>+G!z3<~u22~w;4
z0u<iLAhn-wkT*mWRpd)R<2Q=DzXu9dHjgS_BAYM!m`CS%bcO3Cyrv*qL;=Q-4G-Lr
zEtV~jEtQRcZ1@SX6|$8k#7Lp8NFH70(M4bgm&0}C(FJQ3i>aO|1x3cnx~kezMMA7O
zV<5RkV8SJ^<=<d}iSEy3kRAiCw!OjnWwP~+uN1z$!Q0W^*nsv{*-8P|t4+9m)6<;o
z=4kF}K=T^7mEJ(p{Gqpt=&B|WJt&CiVIrb88%6Y6()o=B5k2<0h&BYQ-kOvsU5PJC
zSCV*$?7Zv(1v>sZk;UsIBJv%NZvA`AN_P2`aENL6uM74h)SYP4U{S`JEK0C04RG{@
zqXdppIE--ggQJXU(_m4OMZV!zn%;Ou{=$7?QNHpE*N8<a{K7f0D4Tu-_-#xUC0Lbm
zI4t340f!YFEg>$m3I4W%!y1m(aI}G=EgTTD5w(Y-0~{UU=mbY+IJ&^m6%HFXY~fJA
zVMpLdm&36Va)fb%K`C!ADCJ;K%E6$NgFz_=gHjF#r5p@OIT)1ShH5e>O~#A)Cm59G
zUrp!GeuuDJnHH_rKH=^jVO=n-4)6(AOa`S%12=pMc;W_oaw6E16TzOG2=?SeuqP*i
zJvkBV$%$Z3P6T^$BG{7?!JeE5_T)scCnthEIT7s1iC|Ao1bcEK*pm~%o}37QG|0Ua
zlMfmBup}QWfkjjtd|W4HB&Y|AJR%>T0>}QJ+j0CKPp}6z|NlJ=$*2AIJ<b0$?;@CH
z1tS$^1tViD7>1EEmP`xAifPHPPzT1EY0b1@+A{5!_Dlz+Bh!iL%yeP8GB%7YqhRb9
zd&Yt3#yB!gP%*}Zab?^XcgBP9WR#2-<ISiTHRHqhGJcFd6Tk#AK};|c!h}L?nQ$h8
ziDaUfXeNe<W#SkO6VD_tS|*W6Vv?B@CY8}KX-qnk!RVn5O%{{Q<S^ZtTqcj{!SrN$
zF}<05rVmrV6f#9jF=Jr*G9^qYV}yz|WlT9!!BjF;Of}P=sbOlFI;Nf(zzk#tF@u@+
zm?6yj%ur?+Go0a|y3GjY17;*MiW$v}VLoKWGUJ%>%mij4Gl`kZOkt)n)0pYZ3}z-X
zi<u3TaON;`nR(27=3{07vyfTDEM}H4OPNoYWz2GB1+$V_#eB-FX4WvDLCu_X%;(G(
zJi5c9yFB`lNB4O26OZom=w}{1;L$HUddQ<+c?2=d$2@w%qu+S+JCFY0(NiA%$)jgH
z`in=;dGt4rV88s5#}tndk1>x$JQnj9!kILWr977L*n-ClkL5hJ<Z%lgTk*Ihk69kK
z;;}W4Tl2ULkK6LN9go}dxC4(n^0*U^JM*{;kGt~NhR3!%R`A%4$M!sS;Bhw|JM!3x
z$Id)<;jt@^-FWQIV-FsC@>t1ZFCKgISjA&Ck9~OT%VR$t`|~(}$ALT!;&CvKLwFp@
z<1ikF^EiUXkvxv#aWs!(cpS^)I38<w9M9tf9&34=$m1j)C-XRk$EiHl@i>jg={(Nh
zv7X17JkH{AHji_7+?~g{JkH~B4<7gAaW5YC=5aoc`|!Ac$AvsD;&CyL4Lt74;}Ra1
z^4Q4ZempMYaXF7GcwEWjDjrw!xId3;cwEclIv&^acmR(F@^}!B2lMzn9uML1`#c`X
z<6%4=&SQ?pJda24_yZn~<nbsTkLK|h9)HN=u@GA3@pv9j;PFHrPvY@p9#7$Bv0_%j
z%Al?h!^&Apwgqd&wq#kh71V)k&9-6NvhCRRYzMX@+llSWc451+HmohHVC`6Y)`9KD
zIzl}pXV!&vW!+eJ)`RtAm8=)*&8k>6>%;o8eyl$mzy`8GY%m+bhO%L7I2*x6vQca_
z)KQ9M<5&$F&nB>1HjzzcQ`l5i$ELCAYzC`mGubRQo6TXnv$<>@+k@@N_F{WO@rFK7
zf2oiyVvAV=+m|h2OIah^k1b=%*$TFjtzxU${%j3f%hs{=>;QHkJBS_3zQ+z>-)DzH
z-KOCz$MWn5_5*e#JBl66j$uD!$Fk$t@$3Y4B0Gtl%uZpaveVe<><o4$JByvoe#FjU
z=R&=w`RvE+0(K$0h+WJsVVAO>u*=xx><V@zyNdl(SiR-lh0VX|98%;LkyRbuBa!!(
z=R;Un8*M7FO<v|+BJWMP3Pl^Bn1P`<s^LF`I3q8V7a=QoF_@RyXl1QXG?$df&8jYj
zNMS<>;$CpeRE!%g7I2UZ1ZB+Z!G7?A@|+Ry-vacPERZY%({B%yQoJE~PPe38p^REG
zodc!0deFTgf>aE}`HgfrT?GaD>*-<iI4IXO3Ci&=gA)8(q3r$%`U3qel-mE9{)PTk
z8YqpE8l<(-q0({E8BkRJFqG|j1ZBIr%A93>vM5=WEC&ka_mK6H<;x0Wg|cE<Us<WF
zAC%9pl-0`WWdmh{Wiy~${$|-h*|)M^WzQ{S7VRu-E$l2Dpum^2g{y^!g`Y)&MWRKr
zMXE)bMTSMDMYctEi#&^-7NaaCSj@24XtCGgM~lZ6zghfY@zmm(#dC`n48<T&_Yt6w
zb3w@t1XZ{I6x=2#ufG#Y>+coH>K}xX`X``J{zK*uD0MG|a`vsEkbQe7PwxjM=%b*d
ze4)HbK2$zRK1M!PK3+aiK3P6XzEr+NzDIsS{+;|6`3p<R5?hKb+gf(AR9Lz|F)<HI
zrKPuJkY!ZY&$_Pbx~1#Et|z*l>w2y0y{^A>eQqPMX<=h+<80$<<8I?=<7E?VlVg)-
z)7z$xO`%Ph%}|@sHq&k9+AOtMXS2;_zs)h5i?)<4wiVk-Y^AmqwsPARwk>U0+m5!K
zY`fSx+WOjt*v8oQv|Vkx$M%fvHQUDuq-d>hQp6|{6+IRG6~h%%6^j&06sr}VDb^`A
zC^jj!D7GnfDt0OMDE281C=MzPDUK+PDNZP^EAA-nDefyCC|=qjJMi|}(RNZhU%P0#
zY`c6rqg|cdP`gof6Yb{OErfz!%k5U$eQLMHZmr$tcI)jn*zL7DVRy>zwB1>|Yj*eS
zez%v{OYJS}<@T-Z9qpC&QT7^pJ(LH_vCp+Hx99A~+Rw0`WB-Z$XZD}lueaY|zteud
z{So^!_CMG^cEAoT9XdETIrun)I`nsV-(jl5#|{e|7C9_-Sn9CMVY$Ofhff{WIIMN}
z++n@Lc847fyBrQVTyePSaNXgC!*>qfJN)2q*WsSSeTN6#6x~9*6?Plm?aOX29TkqD
zj+u_V9Q!%;cO2+A)p5P!HphLACmhc^UUa<dc*XIm<4wm0jt?ClIX-cG?j&()<<!B+
z&dJj$(5b+w$jRW;*QwO0pHsP0rBjvDhfbe4t#kUq=}V`LPMe&zIBjz}@ASf%a>mXg
zXNj}a*}_@wZ0X$1ImNlaxu0{nbER{&bARVr=Q`&B&V!uCI!|++={(zcj`IrV9nQO)
z_c-r!-tT<H`4{I$&c8c9b$;gJ>=NP<2F1`KU7}rLT{JEUE{QHFE;^Sqmt2=Tm!2+l
zF2h|mxa@S<?XuV9pvz&Gqb|o?PP%;Ua>nJB%MUJhUGBL&c6sh9ab;b@Tq9hgT%%oM
zT{W%=u8FS6uBom%*Y2*lu034qT!*`EaNXp(#dVwO4%c0-dtCRq?sq-y`ofKZvTGtY
ziJR2T!cFeh!mXtn>(<e&lUo-zUpJ#$nOlWhm0N$eTDN+)fo|j7wzzF`+u^p;ZMWNA
zx3Am|xE*pk;&#;StlK%a3vR!-cXRi2_i|Uc`?&kL2e=2hhq%YPXSnxpFLZy;eXRQ$
z_b=UdxSw)A=YGv2(j(d<)<ffw;F0K&?2+n`?vd${<B{jl%cGA+kw;$-qer<%l}C+7
zy~iMrAs)j#c#n}DV?4%rO!S!IG2LU9#~hFO9t)u?+%k`q9;-dpdVJxr!DF+>HjkYi
zdpy4KIOuW2<Cw=)kJ}!PJ^u3e+vBAt@)SV<IV(@r)5g=;)7vxNGu5+~XQgMgXN_ka
zl$9Iq$$Ng_In#5E=T6Vvo_jsN@;u;q((`N2GoCj+A1aYjq?9P7N((4G=d5&9x+^`E
zUdnK#PMNOME3=e2%8|+y%2mqM$~DTh%FmVSl^c|spg`Rg<!R+v<$2{L<rU>s<!$9X
z<$dJ?<wGw^FDI`guWYYEuR&g8ye4=}@|xl`&1;6&EU%BezVzDRwb$z_uLDrl?wHpp
zuS;InyngWd)$5tJ#M{cdi?=hBx(oJB@=o#Ad1rWMde8Iz*n1(Ac3tYd%zLHxD(}_a
zpLwtI{=)l9?~UG@z0Y{x@qXm}mrALEQkW`VmA@)b6|4$Xg{vY}(W+RLMwI{s^O9Am
zsx(!GDpQrM%2oAL<*N!+#j2^Q>8hEkS*njzb5-+I3sj3#i&aZht5u(?)~hzCHmSZ=
z{igau^{47D)!(X@YNYO}c2c{mJ=I=nmAbdOkGfD@q&BEa)JAogx<Xy4u2K(D4^<CW
z^Xd=OAFKDN_p1-8537%=kE>6r@2Y=Q|E_+jex`oz<Lcw?<LRUH@%B;s`1<(!1o{N|
z1pCDJB={uyB>SZLl=@8cnd~#wXS&Z!pV>ZhptRp!pMyS!eUADZ_xaQ3FQ31CUiebJ
z*jMaJ`^tPRd>P-?z8!o!`F8QO@eTCt<(uzY;9CTx084z0zGHl+_|Ej5?K{VJp6_Ab
zqrS&|PxzklJ?(qe_q^{#-%GxieZTX)<NKrUPrg6<N&P(hlz!fR;KlRv_Y3sP^y}qU
z=vVC5*RRxXrr&J8Iev5f=KC%1TjaOI?-Rdee#`yV`EBsq<hR9do8LLVKmGpl``hoO
zKk^s(OZ*-DJ^WSvKK_1Cg0R@XuYak((Z9^U!oSMDzkjWNo&QAtkNkJ~@AKd9f6)K1
z|55*A{wMrT`JeOuBfv7iDu4~J4rmi#8;~538ju!{9-t4%3djk_4d@ZjGoU_TE|fA{
z5U?m<Nx;&8WdSP!J`1=Ka5dn1z_$T618xP}4!9HWW5B&YQJ_npTcAgvGSE9v73dS_
z7Z@H`7FZEj6<8fu6Id5GAaGFNdx1j&X9R8y+#a|yaChL|z<q)H0}lp%AJi(Sbx_-&
zc0nD2It6tJvI$ZI*#!j$<p&i66$KfBN`gv*`URB-)dwvJ`Xp$1(2Af{L92s43tAWS
zMbP@7V?hst9tAxK`aS4r(4Rqn1^pc?4ps&G1p7g$#lYa;;Lzak;K<;p;Jo1B!F=!s
z!J~r51b-MjE_g!ljNrY&Uj-isJ{WvB_-OF);FG~$2cHhU7t%7MRY>cQwju39I)roz
z=@Q}+k`<B@k{gm2(lexYNS~0xkm8WOAtfQzA^k&YL&k^f3E3C2KjdJ@;gF*t$3sqr
zoC`&vqEJaF9V!cDLM=nBLfOz(q1K_DLlvR+q1{5ALL;H*V@aqnv@EnDv?{cJ=!DRj
zp>sp$hb{<R6nY}`ROso@Goj}~FN9tSy%Ksg^jhfk&^w{`Lmz}b41E+P5AzOFhxvy2
zhXsZOhlPgah82dDgc-xi!Yab%hRqLK5VjBsNiGdr7Pca6RoJIttHU;gZ4KKVwli#Z
z*rl+)!(N7?a8bA<TpDf>?i#KR4+swm4+#$o?-yPXULD>)yf(Z(d|>$C@FC&vhYt-O
z9X>vMV)*3nso|@`zYaeWelGk%_@(e~!mo$Fh>%8DMp#9#5!MkA5z!HG5t@jEh{TAL
z2wg;aggzoOqE|%kh&~YmBi2N$jrcrbeZ<Cy%@JE8wnyBJ_$lH+#4i!QMm&!AE#i-e
zKO>$+T1N&%21kZQhDSz5Mn%R%Y9do3heQsG<ReE!j*J`~`C;U^$O(}XBbP@Wi#!?m
zb>x}IbCKsGFGgO8{3WVOlx>uKltYwblyj78lzWtClrl;aRTfnlRUK6mRTotsH8ASE
zsL4@tqn1UjkNPU=K-8hAqfy7B&P3gcx*c^V>R#0Ss7KMFXi2m*nu)fIZXMk%+9}#4
z+CADcIv_eBIx#vqS{I!j-6Og@x-z;tx;DB#dT8{d=qb_DqGv|Wj{Z1$ZS?2S>!B>?
z=IH&==c6x1Uyi;SeLeb4^wa2P(a)n_#-JEkOvjkcF<oO6G4?S|F#$0_F(EPGF_AGD
zG5IltF@~7Zn6WVvVkX5*iJ2BNGiG+o%9wRAU&L&P*&MSi=2Xnhn0v7})*`k;tYfT8
ztb437Ru`KQn;DxOn;Y9Rws&kvtTA?Y?3CE)u`^>oik%m`C3aiv&e+|tdt>*<9*n&h
zdpY)M?6<Ms#r_m0kLwa=8)p~SEzUVEAucH{B~BNY0mVae;;Q2M$Bl}c6*nhtUfhDX
z#c})M4#XXbI}&$1?o{0AxC?QY;;zU2689+XN!%ZC&orGiHW~$#8+FvUXxubj8kHtg
zlcGt}WN5N9-8F+X?`wF?2bxiu4>jX86E$-*>os3#4r&f-j%iM6e$hPAJkk8Fd8+wK
z^LIQQZyWCs?-j3xqNUmKx$!;Xd&TF+7seOI8{-GWkBJ`}KR$j^{M7hm@tfke#BYn=
z8NVm~aQx-?Z{n}T--y2z|8x9{1S$bTu~S(>*95l&&jjxTpM=bWoP^wj9tph@3KEJE
zsuOAx1|$qhct2rS!UqXc5~e52N|=+dEn#QE?u5Mw`x6c&97#Bt@O8q4gj)$eB>b3g
zU)w^<YOS?xwC%N>v|Y6J+HP8RZJ;(p8?KGg7HSRJ60K2NrmfUgYX@qFYbR(YYo}>v
zYBy=OYPV~5YWHZr(jL$r)gITL(SED_PJ3H>H_;-|GSMoLO>CXmF0n(RL!x7%cVbv#
zWMWLBCb1;3Ut)P;Wn%xty2JsAL!eCS2Z=KhXD7}{oS(QbaZln`i3bu7B_2&Yk$5Wc
zR^si%$4TNOX_5t$a&4L9o#d0`mlTi`oD`N6k(8E{k(8CxJ*h`hX;QzW0ZC($#wATi
znw&H(X<gD6NgI+jC2dLCp0qRRXwt=`yGcJK{hahL>2WffY@OUTxqWiS<SxlJ$pOi+
z$yv$Wlk<{$CHF}lnmjytMDobw(aB?z$0sjM-jaMI`FQfl<kQLLl7CHpocw$8)8uE#
ze<#08u}-l~@lNqc@k<Fz2}wyv$xZ2z(krD;N>NI63ZF7EWpv8elnE)TQdXy|P5C@!
zeagm^%_(1{oKCrtdMfoy>bcYlsh3i(q+U(Eo_ZtoyVUPfe@MNXdN1{U>VwpWsgF{h
zKtcMasn1fMr@qi3omeN;F}fByR@YkBPS;V_MQ5wC*E#B3bnZH(PNnnJ1?YlxVY*0N
zj7|eZZIg96U4|}8*Im~`*IQShE7q0h`spfk)w){U0Nr5S5ZzGSa2>DvKsQP^MmJVB
zUN=!USvM7m;m*{}*3Hq)(|xR4s9UUCs#~U8p<AU}t@}*3PWOfGOWj7@X5CiZcHK_h
zZrxtpSGohbL%JinW4aT%Q@S&{^SVpAZ*<pnH+A3Z?&$96?(2ThJ<|QAd#ZbuCQ75z
zWNGc7*sg1uN19ifIxQqEHZ3JBElr=6otB%{BkjYqX=yXlW~a?bo0qmAZE@NsX)DrJ
zrL9lfn|3tqcG}&vpVA(r{hIb9?T@r)X@93v=^`lEYmsi5Zj~O89+#exo|T@H-aS1p
zy=Qu_^!)UK^l|AE(<i4-NuQQJBYkH2?DRS52h)$FA4@-xek%P;`uX%r>EEPZOaCGL
zkMuv&pQpdfz!~xk%M7awMTRybIU_Ygmyw>K&&bTk&gh=OXN=4koiQe3Y{vME2^o_z
zreu7aaWvyZ#;J_c8D}#tWL(a;n(=MM&5R#1e$i8Uk)GCD=q>dv_15~f`VRU|`WU@N
zpP<+3lk_Qih!N^D^uzTd^dt47^&jfT>nG`_>SyR@=|9#l*RRvB*KgEs(Qnu9)c>IW
zQU8<vzW#y!q5fC>WBqTL;!Mv>?@V>3Z>E1{P-bXm1QaNa&D3UQWaeiUW*Ra}Gs`k7
zGy7-OW`2}8FZ1Kfg_(;omt-!@T$Z^a^UKWLnRhdP%DkWXbLKCZzh*wk{5|u}%x77m
zELj$lWtnA_)gdb^D>Ex6D>tiWR(@7tmLaP&t0L>YtPxq0vZiEB&zhCBIcrbW!K`Ch
zSF^s&x|ww=>tWXK*@|rYZ1-&MY@clZ?7-~Y?ELKF?2_z$*%jGU+5NNYvIl36&Yqq<
zGy9|LdD-i-w`Bj1n(q9!=R1xAcwBKbb);yDrj9wfqH{EL)45VdI;7rxecrG4=k<Di
z5yK2I#1%sf=`ce&tV6ohT&rWwy6?_?bdIKIimqsirfAB#F3X-jyq^EWE05>Z(f39d
zoBAfiG&W(TsR=jDO$XD%^fG<TrzT*M%}TS%d{>DquQe%Vz4_6knsl?n>@pc<kI6KT
zOul(y{xZ)@k$IUEoYXj}X;OGnL{f{Sk12v$P%COpZ7GtXr~^e)C+b2m6ieNyC-tVj
z6i5AOAPuH?8cM?{fkskd<t~sVpFm@2JWZs@G?k{)OqxyeXaOyvCA5r^X(g?uwUj~|
zD3vx-8l}@V+DRF-m-f>k%B16Tiq6sn%A!kjg|5*Jx<%P^hwf1h<<djSqkMWo1yo4S
zsfdc{6_rpay`?fLrw>%&Rq?8MH7X(L+Fp<s?A7xccp+XRFVqY3ntI`0gxA9R$ZO+8
zdQo0S?-Q?!7vsfxJ-l9CUoXxZVz<~dn{I!#+wD&Ko84{q+TZN~d&nNKN9}QY(w??w
z?Rk6A{$VfMtM<CRX|wHJn`0l?Jp0%d*k`uLzO*IwjV-h9Z3S258eEHmxGp!~h8)UG
zIGmevD{jM)+@7Pkb0u=!jeBw*j^hD5n1}FiPT&zdiWAu|v1P}?;4wUo$MXc9#FKdn
zPvhx4gJ<z<p3C!j0Wajmyo8tXa!%$Iyoy)z8eYdKyq-65DsSQ~oW|+AjdyYe@8$h`
zh%@;(pX4)qp0oHeU*+q3lW+5%e3$QYE<fUYe#(XXf{Xbzm-0I<=f7PQSKZZgbzHEk
z??PN-7v`F|2-niJcI{l0>*zYUt}fQ~aJ^kW*WV3t@otz)a3fu!Gfw@3{t^F}f6_nW
zpZBx;%l<Y0rl0NK^>h3OexCo>FYurFMgB{_#DC+L`S1M-sVX(3mIO&%X&?<HRGLV*
zG?!M=Mk1xXL`!Fhk#5pc`beA%kijxUhRbI%N=6F_i%3Am$>%ajzLaV5mCTYkGGD%y
z#qy0Tmv3d2d@t+d2iYh;$rkxpw#s(dCA(#x9FW6uR8GigIVTt8l3bM=a$D}meaV$a
zk}prCP+mx}yp~dVC*|_DR?+HOQ|oB3*4GeitYO+rBebQq)^-}D9kr8o)mZJJy|thA
z*FhSu!!$uhYN95oRbQcFb-Yg0$vRc1>r9=k^K^kO(j~e~lXa!8*0q|V8#GlnYnrC(
zHr=Tix>xt>K|QRQdQ4B~DLtd-^nzyTCB358^oHKjY`vrRG)Hswq2_76KG6a#)aP2H
z#rjH1v{c_}nU?DZtw0r2Lk-kKZ3H10_0RwzXoOINp((-<ffi_m)@X}JM4<zs(Ft7;
zgIIJ&PxMA##GyY1Vld({6vHcN_7NC`L>Le(90b4^jKg?Lz$8q@6imZ(%)l(n#$3$D
z0xZO0EWuJNM>1Am6;@*n)*%J!u@R}*ge^$JFW8E0*nwThz#i<wejLPMWa1c3;1tf_
z94;UWmv9Bwa09oHjXSu99OU95@{o@wC_o{eqX@-#g%XtFEy_@i52y&#3e*k+1sVn#
m1wsSO1JQx5fkA<Uz!!lzl{Q>us#d=E{F|V0|MmYjFz+8?l+_ym

diff --git a/games/NXDoom/pkg/osx/cp-with-libs b/games/NXDoom/pkg/osx/cp-with-libs
deleted file mode 100755
index f4869063f..000000000
--- a/games/NXDoom/pkg/osx/cp-with-libs
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-#
-# Copy a program to the specified destination, along
-# with libraries it depends upon.
-
-src_bin=$1
-dest_dir=$2
-
-# Returns true if the specified file is a dylib.
-
-is_dylib() {
-	case "$1" in
-		*.dylib)
-			true
-			;;
-		*)
-			false
-			;;
-	esac
-}
-
-# Returns true if the specified file is in a system location
-# (/System or /usr):
-
-is_sys_lib() {
-	case "$1" in
-		/System/*)
-			true
-			;;
-		/usr/local/*)  # homebrew/manual install
-			false
-			;;
-		/usr/*)
-			true
-			;;
-		*)
-			false
-			;;
-	esac
-}
-
-# Install the specified file to the location in dest_dir, along with
-# any libraries it depends upon (recursively):
-
-install_with_deps() {
-	local src_file
-	local bin_name
-	local dest_file
-	local lib_name
-
-	src_file=$1
-	bin_name=$(basename "$src_file")
-	dest_file="$dest_dir/$bin_name"
-
-	# Already copied into the package? Don't copy again.
-	# Prevents endless recursion.
-
-	if [ -e "$dest_file" ]; then
-		return
-	fi
-
-	echo "Installing $bin_name..."
-
-	# Copy file into package.
-
-	cp "$src_file" "$dest_file"
-
-	# Copy libraries that this file depends on:
-
-	otool -L "$src_file" | tail -n +2 | sed 's/^.//; s/ (.*//' | while read; do
-		# Don't copy system libraries
-
-		if is_sys_lib "$REPLY"; then
-			continue
-		fi
-
-		#echo "    - $bin_name depends on $REPLY"
-
-		# Copy this library into the package, and:
-		# recursively install any libraries that _this_ library depends on:
-
-		install_with_deps "$REPLY"
-
-		# Change destination binary to depend on the
-		# copy inside the package:
-
-		lib_name=$(basename "$REPLY")
-		install_name_tool -change "$REPLY" "@executable_path/$lib_name" \
-		                  "$dest_file"
-	done
-
-	# If this is a library that we have installed, change its id:
-
-	if is_dylib "$dest_file"; then
-		install_name_tool -id "@executable_path/$bin_name" "$dest_file"
-	fi
-
-	# The install_name_tool calls above break signatures. Recent versions
-	# of macOS make signatures mandatory, even if just ad-hoc ones.
-	codesign --remove-signature "$dest_file"
-	codesign --force -s - "$dest_file"  # ad-hoc signature
-}
-
-# Install the file, and recursively install any libraries:
-
-install_with_deps "$src_bin"
-
diff --git a/games/NXDoom/pkg/osx/disk/background.png b/games/NXDoom/pkg/osx/disk/background.png
deleted file mode 100644
index c7063aee73d9cf2f67ed6ea05ad8f9ea910fe7c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 227363
zcmV)&K#aeMP)<h;3K|Lk000e1NJLTq00LM500F`X0ssI2yb&NX00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-#p3l$hIvGxZT001BWNkl<Zc-ri}XRs{Wbso0X+PlNd
zNjJWP@DK<FL`E<fgcu}~lnl|N#3DsnMU{$D6)l%7L*+mfT`m_bIj}6MTqTRNf>{zQ
zmT57lM8bfCKrjf26o`xm;Nb<leDAyWoHL=j_g-uH$L{Xw?&(SA%sJ=Yhu4L0?#!O<
z-8-%LeG5POu3v$3zmN!#!rvkcs$}fepR(l6Dxxa$-8hSv74~|!-MPMs>FAk9J}trs
zkQHt`nO?nq-<9k4=F^cc@_aG^&^X;O*4}*fDI&6#0MHmqWRQrxV|L+I##jIp@v3S}
zgotD;BHDNWpa7sMpn7z4G#ZVrU%zgQF~$O-s;UaRqBFTFVx!pDsK_SuI2apw?+=fT
ziRixjAMoC>D?&Gj3?kV$MSvooh_Epc64@vTgNcas{mDkwMo&NWq=+2s?^$aBz<VB#
zM^Tc#={tXry<2k(>lHY^>X!YA3=*B^u4M1Rq^$b`Rb~%>#@h4krw<F}EH)GXkTC!_
z|M?kRDk8%0m3M{Rz3Avxk!nZV&UCCC#@;(O8_aJmdqIPM7d#0Vwi3dN*Md_xNFb<>
zYy?mh5mg1mFmwu9YY(alpsHG}K&?KmKdDDs>yuOwd*=cXv3kn34xIi^s_sL0FU0Uh
z2mladutM3HdUK(%5hwt*cI=kVM^L<gEs4$T(b+BSmOA@aHE8G3O*|thcyVXZi>J{1
zT14HtuxO6++?ZST9udiy^L$Sg)~+tbXQt&Xyz_iF?v_i~tHN20nD8@?d@7q9?_IuE
z*pV?v<Xy3|e{kjAmjXyOIts?<VCSGd6Vo&`#@ZwWg(4dRlCcpP8zsu#340L_0Eh<B
z7#krX*%$!CJ5Uv21wa510YFz|LdHfhl!hbOC{a*$IU*q$RaFoX0q?ZdB2|oyTcacr
zJP-yVRb_S-5<nud02n1{HH2uBfp@vf#$+O6toM$+yK?0UsE)_u36DJsAzDMg#b-bC
zP8Ma)*Ix3fYcF|KzZgIyqUJV6B81h_9g)b;3HE=b^Ww?Qo?zqo!T}%}6C}NgfC>@;
zQfarVXmGStst$X1(v_&eE3n?HN#iGFr`Na3*S6hNgSNL-gRg7WgaxmQRJ5;%i<xV!
zw-!LE+Ofac*Z)*wqqa*TG{(*_)^}c{3O9Z=vk32yY0$gy&KEaWdbaPy-g%b^J7Euq
z2#NrNWTHsC3nC2wkT94<3P6a6NMy8OQ6T~VA$R}`_9M~E><C}0LTPxl4K)Q-P^{N0
zA}W9aQ0qWx{c!&Lntg%*jROvYQb?8RS^hh?XKM@BSQEM@A}j)ghy<WTJ{3{#S=b|>
zE}RQIfiL9Lrm&voN5Qg3rRqafRZvA}nEu)x>eGmg(!sFWKCZhMjPtXzM)X{cAl0u>
z`L|-Bs&25J%f@=5EubAi2&!=5PHH04yH-?%knSAsfr>OwJp>HC<|PBT=7QhQ!=~Mb
zh@5_BA>wp&OV~SC2$$!-%X3l5^8%xEPzx?$VUI|N2%rc!$#QF$RS^IYnZ2*{vfw{-
z-m7Y40TD%%j4?I}-o@}XL69O6Ab9ph$wmp0nR#D9kxUpXM4~bhiQW|eYN7-IjkVQ4
zs4%yW8zKVs1we4+p|A@U7$Abm{Qgl<08NtET9Y8Dh%54NBSeZ5J00DA`q9tsU%7X<
zcd7ZTW&}b-O6RJos+QWrGSMI)>#qY<k)VW})=!H~aVVulI8zIxHUVc1=0$k$sE1!6
zEQyAO#>>q?5e{n%k&rMLqauQ*5QM5yPCBTHo_xnH*uwSHYpLQ107_$CmTFGhIior&
z@QgjXgjl{&*e{)fJ*cx`?iQVp;rv9v`8LfLX&$q^joYr5a(ArLXIrg}i&jti1)->j
z65<^r2u0e*B_cxDQL^PbZ>U;rC!S9<Il9Td@I}F*D#FY~k&DPQE8>AK*OrP1D|;oQ
zh(v^l(=4~vGkYRT)6{$KT+3~h7iDS>Ap&?~qc{ar(8`;KNJJ(~HhZr`DIyXzUk!;=
z%ajwsD1;JK1wd^S6Inzg761&pt0kNe5sh~RRGB-o^bl<v-*bm%9LE4)Y*ZA*bUFn9
z%MwL4Nz&=)_U-4MisEFre;HcOqUKEysfsuXC@o*ls;bKCAL~IaKnhOFQ>;UsQ_GrW
zVta5FEcj9}D!ZY8W}(zaq*aHtsxT4&njkenK$TVGR2FEE6Nbv^*q)ar_@&KE5K28t
z&EY!Rqjs(vXD<j5sr1r_`t~xJeHG?z$tqqnGR^ox(-XdA7;D=JRT*TRKHH6kc(G+x
z<sBfd?ex$&XOZ6V9!`W4`Z)9?cV1gR-HL)K?A3?!4omkO5)n0%=v0G`O2gOX>SPuX
zYppS443)N;DzTI{JsBjj(pexHmcK}uO(P=O9!?QK5oWG4Rmzl{VE&>88LYvPDxx4r
zRJqY+?L!zs8nK@;Gp5oULvS)|A}Eu1aDJW<z!(FdRJs8K0LU0-@3N_?0HTfJmKju8
zRBPKXdUC(t*}EwF?Z-u{c)7fX;BLi5J0-Z-RiWjTJ*}8HD?hVt;jo%JMf)d3SFE1p
zr}P;egUb#fJ<S=V3RuT4HrPT<$-3z0vrgF!PDv3H#l7x}N`F*iquKfB9TN4U7nns$
zJ0PUGE(v;zFx;u>#ad>NuNt}&Z(vn+`6)fa<#|1)Axh~|E3L6x&pvkhxi9Zsz88_K
zA&4j%>{|9wGGOnI$BzgzyUaT$-cc0AY0S*3a`VQGJkMVK;491MAeo(mtG>vJY%(1m
zkB<-cE??W(zXS@ZeDmoq7kLH%!aN<_1_0+cNYE^IS?)^RA3#+{N4F7RoE3&BiCYWF
zd3K(Y$Qn}`SSrVWnxwnFimtPF;TjBg2fO>XpMU;%bi9+sh#1EP0Cx7TD6@09isaeE
zkV(>^cSVs;Y?PQ9_MjT>MugX{T?<Eio=wN2qc}--_x5i*{`oI|{u6O*jEx@rx^Erq
zUG5m@s;bo|L16dTM`QqWK8(MvUC1XlZkFus#U32f{CN`-f=Fmqn<Fa1!bG;V3ww8p
zs<4-nZJi~KuC+WUYwYfxv+YFrJM*V#@1(56TGRj-?+QZ(>m-!Mk$cLkld-b&eAd%v
zGo8TKRsW=sdZUE1(U|Y^Cg$^k7=AOIp>bs6vg3Qpnei{&3-R3Iqm^f};kXMPF)2Mf
z*wm_2OWm{dLX=2@%KKOUDW$)z%!n!DzLlZYwwW5cy_r5!12fu+edCVdDYImm^5HNG
z(v)}%Y`IAhOWU{p7na6j`7fOLzsqb-EKOo5P3N%qiHwaRV<TfM8G8y)>|MAo=5uFG
zYg?S9|K^U}=)I?C&pC<fpB!_50o=}sboUG_wgz}vxA6~u>;LFDWU((?cgEOlon^hN
zGP@IuH4^n^+-&#SZn}1@H8Fb|C4ea2Z6$8e&cj@5eUENElZ|d4AKns?C^7(g^}bgs
z2mpESAA9(rz5V_D{R1L{#)vDJ{pjensvcavYNOZ{89*8JDNRE}GKP$G+0?t-<r4rH
z>|QoeR7}TYjIl|`AZdymVHRO(SYx{fSD4uqnToi48YP2dup6d3{E)p1-cdxH9N$ur
zBA+1QVE3|(;&?E;@ywGqo_Q*XqsUSim8|eAGE7>!ZEcw5g^wd^2zPdNk<b-+9o|p{
zA{y)*1l@c(orb6(AV!7|F-cNT`Py&$fip#6FR-zgnQg->bK(PJ9XwS7eSc2azLoY+
zBVtO;5Z%fBF{hYB5!TA&J&SYWZoHaE_FASiX&jbL@fO6yqRZYHY81})(n&QAJcph)
z0M}d91zTusxVQ;ubs>arv}H+^f2juhv9uUVq1&>zW;ZGE=!8V2={Ga@%9vw4^9{37
z>$_;vaIAzpsEC9ZA6B+tjpSDq0i^Kw%67#-2vDsw1?`;QrDcO{i?J~pVV3GuT5B5`
zyn<K(NC3)>jfnHOsIwFl=YJzTHz_#t1T5d_8-!!e+{n{lh@8o}ao4)IE>ujcD+omx
z`qikjokeDM$|o%D`D_Z>dWW>WA_LVa-@v-gO~mQ)5rm!gZ(U?xbUcJhU$z_elTDQ0
zX0Av5ZllrY#xqY}yLJy5QuZq1i$cWvA{XY8=q2!asAQ9IHXU8N|3M;?PmYUx+A+t2
z6f5$HE2e}75Q!`R1ka(3Q&9CqrV7Fi$q*5<XYYc8v2eMnI_Fembaac1P16B@W|L#@
z3-1eKV;d#DnEE0w1unCK5E(6LnTWk(=km!&+%%2t?!o1BxaW(hs<Lw;93_J`CJhk*
zMkCK7krLvMNKu@CLQzbRjI}WUOh>oLSYx8Wa5&uA9gRlQ>6AqgF;2u<`|zK9K$!D9
zvr+u&H+~0uuG}rOIqY2n99uXr21E^4f^VwWf!c1(v!)T%QxTabBdl=!3nd^Tof{E{
z1a>-O%z|i+DhPWbi#8VaA#6GCqYi9+>z~>cdmNsa2u;|7oJ0x=I~6fe(rfycol!M5
z21H?Z0*@Ucl8NfWNxUaxaJgSim3>iyaA{TJ-qBb$JMv7##QGK?TugrEcGRV%`Bb_*
zKdrS}&Pd~4wpcG(VH6Se99)hf0#wKJL`rY%j66+Mg}ID}Ezu9cuPJ~`T2VIzow2f2
z5yb$62=-ohvWNuzrfyuuEGw%}q}*D8#k4xyvBV0N5lRiVnlV-aD-Chbe&(bGLKP*|
zhDd0btpS)J;WI)aV}j+^yo)a~VR89Xb&<`a+gRRR*w%?O?nUs1rAl}C<@p<53wjH|
zG>7HT6vR!({S<)3P89qkv#pB_<2IIDPxch-JWh2TV!!guPHKCfF1Pt?t{O)eP{_K7
z5m<%wY^br%RoK?Bp1C-jsGuUOm*%S_Ky8C%fOy*EZ*8oD`Q46fT*8tMp%KGtb}t<a
z_Agz+GSuXR{b0{>gM`j|H=T^)WDqBVbhvAxSeR8<ychOltimieGPnsl<E$YO2Bo>M
zopZ*hwKf<T0Xl7?L{&rnr}M0>H5sI^g94hSRS=u89k#rYh**J&yvy_HaX?awcwr9D
zGBys@Rlr9QYMQ3O(#rB26e3$TtE^(RHm;(fqLscMM-~yBbKd(XG9i6O*x!2kktiJw
z_O1k^{E1`0h&2yRN$h}RU~adr##2}MLF>xAxo!l(f1c>x@=#ie#xmuiBQ**QRCVVF
zH%LL9+UVd2cV6lR?cNiSfMy{ZEzxr89s)?zLpNK&1hJ&JEAbUoV{Ce#Hnk41O+_8<
zfNh#UKt!6+#mNFPvv9YD38+iB<^$vxXLzTLPV{gB=**=z*J8P7YY4&y92)_^^a?^z
zWw^Tq;ZpvWO;EZaP4T?6pr%_#o4(CnL8x6sD=rd*&6^-%nhxOLlJ`zU%5n`RnrVoL
z>|HitV`H*$Vxtr>B(N}hVJ?X&>xD!V>PGY|%+@TF(k{STgR=#Z$XZp!Yzn~63zD?G
zTO#V)v!J4Z)G-p_YJX}ax)2fB6$SfvxC?;HKG4dLF~&p+Anchv``p+#P18`<;_0WJ
z6z1U|HU{Hlw+1BD{>cD-5APYrh7hy7U>1W(NMjZD&p-Xh{?!MDdskIueWZN9Gqb(_
zd&@oqW(Ko3-#CbiIT5>&U;Vr(E&>_C3frb~)0xHmrP%N)Z?N-N0w`qJ^XIVJojzj^
z-hBCV8|*y;gpq7F647a_%9}cJ=L(O6f;<M}&f2J(3A2h{)O#cYswy*I=weWf>WO%<
znvQP8KAws-L|Y{Yt9*s}yhdG0oVdYEw%d1lx#;udU)2U%uUn>zKh++L|C+sh!Cmw2
zyWV95EyiJ;Wr=9ukg+9`O9hE&i1-%V0Ym`nbP}wet{O1XIP<PxPd7@l28oOza@7*Y
z3f(cU>tmI^Q}s$`OQJ+<C;+00*8HO3R@zzuSovQCg@dj@#t=~r!{~Jpw)=tFU_L#)
z&}d+a`;@BoAg-q3Z22-82}v!#q4sY76TV7!?>C;fzK0NT6JOa%W^?R}oG!tGH}kd@
zr4L}~Hed24eJl;DJeQpoxXFUTRar$V9*%(_7?&KmRl~*i#45`SH(Ks%dv@#cHGRxb
z>xwq8WsXL}9A2VIu*=tf855^vWECKU;<3(EVISC>0U!i>Te?gMAy=d>Bul)TW!%~p
z)Ku6jd$Lg-zZLIP#Kh^`oqMj(jnkvoPipBYEpWWluy@3@sOILI)tNQRf6nY&o)!6|
zT8O2=M>bX@0FBf1^5rYcTuetk&z#HB;eN=*4EAF1Nvf)d6H#B`plvjWlGNoBRb^iY
zfQjN@cY<mZ+3@rLWOPMVRtiKM?(G>9ncL488`~%XK*aq;26j5wLo!7+E*&z6R4Ieb
z`7C$F*a&SlISiO(W1=`6)=DLrD2O^{&m1U4^<aOGh?3#HiQ=aoeaJ@9V6d}XrAT6n
zh<WZ+HFutfc6U!pcC{q$R7FHQlBrFEjp7%<rVO)YOti>z5fq>k_uoWGll@$k#XB+<
zX(j3Z(#D8fWc{|yDn!4rF{m(yY$G#EKk01@aeX{4N$y`Gfwpa3=}NpgcFt!+T8sAp
zu{X<R<<PYz-A3UQl}ZKd9Jy69i)g}&chO%fyV0|rS-ivbz_^XkKxM~%+3CGpw4Il$
zb5@bAWbj(p<Jnie=RPjt%Rxjff7@u&Ok7?GPCrNV`W<RDLbKkRVm+7@<e{<~v{V<d
zYjQSjfHO53XR-_1Q#{A@->5Kvoscaq^Dzf3eCTt9&<{Oo`v|n9A8J!^?7U1xF0IY7
zi;L6|T;d2{Q-e9lY$2XvGtS!wx~3JmEe&u(oQ7^{)2tC_D08*e<ab;~Bc}76T*m3u
z7;{|S%l0I1X%+(iJFWposTV)uT;s|CgF2g|vaz0c&7A0Gx^!VLw`c(X>;@9MsYC=(
zA0}V8)>ylDn`s27!tAE=UFoPiT}8O93(w5QVBXFD#5;hNlC@ItS=o)#s`KlG<(D+u
z7#+Xr{?s7I4_Oa&o@A2j04TFpk$ikeCQ5fNf$GcSD4$NBd-{pNa5o+9*f_Pxph+n*
zt00e*40c^nFlVJ!TjT}%C>a1^2t2SWpu!Org}2s5QDmdU#z|-p@+~LFw*ln#aTZ5D
z;PXm+g^ij4!k|`%A`Ae4WRhf{s`=!&`~YN_#&HypjdphS0iejn;(cfwB?DER9^aCN
zGHavQn0P!oQdRE@BC~&R**W*zjhg^4NTM(!0fW!%>SgV{h-i`+RY+4S0?$47tlGiB
z^&YB(l3&mjWv;)f_s*F0veH%A<wT}N8LtVbuSr=EOQ5$g_DsY7OZH%sO=8w~LI39)
zpDtKH#>DkOWoG<a4WKvKwq<OVf+(<S+$=U9g&7cyjaOT)&D)FcmSCwSisutk=TRb2
zx>Fsw<$r4{)<y}Y!=^f7Y|_wIPj+NQ<-t<h#O&75c+glgw}wlEPsL@tWaw;_1G|p1
zzMWjF?fPU@R{a9yw+`EAS2*jEXn|Jh!Haxs=jW;IZ0w*omo(Sd6AuV-R77fxu>?af
zm(z-XL@?*wt%wAg=yj~jxH_&diw?FL69#xzwVo7b0fuIULTp%>SUYm(w`n`&u13n2
zQ3%9N5kvtf>jU+A78<m1+Vy4h`ysI51X+Kz<GdlewvfODH(B3`+=5BlWs_Lwm08gE
zy!XZig#oryYpFx|u)QRPzFTQC(pIrX;G9y9_3l#LY=k!M*l7s-nsNtp>3wXJ4yz=z
z)ej@H+uXm^hqmooTht}1mA$An!z=<(NxI$RZz2lr`&nLcV-KuUrsn5Z&Wq^i1U6hB
z$o;IY&Qr=X%!X!D6a{;KFx(57iUF-$C9qUUDXK&yBFB?Sk>&T^|3D2aQiWu=f91ZR
zuoL0i&)>Xt`*4tESUNCanmZzltx?r!?jjauhCD|Yg>{$}4iwTfGK9k<0>sI9RCYJd
z5z(=D&pSJVG$~`i%nYFE&c3iOvM~TA!~Gzd-Ds5MQ&BK^wzEeex7%1OIS#UM5c1;H
zIZo0vPSTL+?tI7~H^xTO@gW&|?b<a&N{73n<HK9e-%MlMVFPb&XJ$df%a<+>27})1
z#mp$oE=Mw|AuAml)DUF>_uz5qO%QMMNGJd<&WF?{`d)<_ZfIQvO;Er!Bb~ZtKvCF(
zaEnc1ON~!?(JUB=r@M~<BH`W)^KOdfnu+L0WC*u+Of`}!Lt>g*h#F%KK*n|w5Sygi
z=b(z560<iGNea3+yxLr{>m*{V`(ba7nzn#88I2bOQEDpWQ$4t9u5dP?ju)a;s9IvD
z%A_w{6wyIM6=jho$_-S=kc}cnKt=#$5vg34S_&-^C73aBx71w`sW8HIA^R5mLztO6
z<poM&wvZ-@ph#3#h!t&M{$_>+cImvUnoWSBb&wEeS+9l&$&j^Jrl>9rtf>YP+$EK9
zw3YCtT{}P(kaUHkNtga}9R*xht_Q?TdDk}4{nsjGb~=3e=I3Yc8MY}Ne^n|etZ*2d
zrFGuS5=NXkX_|e)&J*#x574d2+NC|WNCXOID^z%hodWI)7Za9b9Z=(5?IJly&Bp7V
z;C-*GpazoGDv;90wf>Z>&l|Z?Db~g4_{FMCKUi?n#=UraW-jt9K+57|fay?#5yWK^
z07W!5N`||}7$fWe36QesL{+Rc!!%J9&{@@pBAa-Z2fK<uhJ(~vgCVX!L^ekN1QAup
zosHtba2V!0n4V-J1+~@?A+r#fC`nbp=TkD4tWD7XS%U%<XJ{y16H-s3I1NTm<)sxw
zU{*oR^Q<fu4@!PkuEja8Dl94@D#GkUI7#B*=@elR#Q-){b=eezlQ@JnBXj~#-YSYB
z095r2mtHN)MMav1U0`Ow#U_-hLglRy6;KG-p}na2y87edB_|-ItEets3Za<BeAV>I
zlUycj$TD9`vuKH`0?77@uxklnEGvyvAJ(u)5kAc!jlmXgmoM)gTq?^Cnf@_{5^c0h
zB3%e@3o%rX4+n9tk7^@9R02}9*Oo;@QW3o)A!;^s9br4=j0Jcd4x{<UnPsdE8}w}n
zB_P5Ka=Wte!oCFm%=V<<2C}eWH?LkyOB?qILSpZWJVzo#+`F_N#c`31Rf8uAO%z8q
zifPC`XIGGk$Y4Gli%1;D6s0N>^3hADU*UttFZgl>X%e2B40nu;tevQ;ce${rs<qK@
zcRx@ca*?rjQB+quL1PMI?O?d4pc8gBPNF!Cl0lpfv++@pO|TTyap-)=z1EV;RO&KP
zETRfU5QKBnG0hzrGKeA~!h!fSPKH&nLt&Q6DiW7ZP&rK^Ya?r8!lI6=*eD`0c{ZcQ
zuj8sJqQXt&Z{VpgQM%+9of$&G1xjXN6>=37h7J`-S5j60WNNOEo?{x3s_I%I0?RGJ
zP)B~g&)arXl+ox;Bs;JLtq?YAn6Y*0P_GM0TjMMnJ!%D!&Bcj^8B0UoSDW7r7g=7x
zEw6Y&%GNU%gxho#;<*z}bk@=;0JF~JHm}*?2L1w1wUVnFbu%0)i+pK+mT*Egq#a_z
zn}Pk4(yR_qr7w}OHu%sHRYjPasb3Y|F3@`l8HI|eJe-)#(bb9!aprlfvZ!ii8EoJR
z%32cji)hQ~SQWgJu6MK~x@%5Cn+jk~+n|bHwCWO7@2iO35E)~jl!aAoMJVMK5g}nc
z5tS>m^dXxH%wH9_s4{;lue^5q)^<Lv<qFePn$uP(`CC+y7m`i0kuU%BvIXm9j4N1+
zPvH$-`!K8h^l-Oa%X5`m3;m9JDcj4^bn?qY7q%5bva&H|ak@^|v1#l&>r8o;22D2V
z-5G1u8>@)hE96PzfD2fDRU0S$)snGdA!vFn!W71-s<3lm{{-TK(73|7F4}1gw6d|6
z?|JF|m3#8Zk+460{+a1<mX^sTpep&~IDlP6l)da6TplEY{ma(?)O)8Tb3!S}ihL4M
zMF0c<3eV2@{oMf(X5%AJ80=kA)i{co8Ezl?BA*^TA9ACD0BMe=b1dTW=@=?ErLZri
z<06|NqOp-Lawyp&%lt47xc-W?A@pizI7ng}5B37xnh3{(9Yi!X7G`<s(VhKE`<Jgh
zfAhwTo6iMFlR6>7!C*+n?CkDUqOA;R0swpGU6H2A-rnwWH*ShZ5;;VSV~YsZQjLoU
z^9v;?s9u0E7+P{_Q-dvRRugoN4Xak+4bj#%l&Z2vq&tUUScCz1zMq}6cxk5Bo!}`a
zDT%&KE2oj}q?@J$p0yu!etfVh3%b%KW?>?0Yy@}Swe=-_VMe~rCmO7w$gSh&Y()!t
zwLzW7y)M3w&Syr<K3tfUp#AB;+Q{{v-9Z~A+Hq-;Mb#3k@((TJ7h7o5z@!VxWqKQy
zA(N`}xJXg2jiWN0Qzvq1=W$eFBxZzgHJ+fsvW6AQ8qRE>MlHlD9j1r9ZDy`kWcx6y
zXAi0%?Lls!Cz{y&ZgRA09Uj#h;ZX`LJ>8b+Fan%+d`0j4jo<5;x|^92o5c(9T+2P4
ze39S=uXaaX%LL(E8Z<K3iOaZzkm)=xW>@vrz)BeMiQp5VhTMvAT#J_=Fp%}18gV)V
zMDc!67PVOfln#4l#v~UM$!NV=pe1}2k;aG5jt`$7A3i4{)<o9EuE>MQg^1B$N7;K<
z>|cFg@6tVoH=jJd`OI+dQm}Xwnt9lm4tANHcSRJZHcGSUILb5cgMsKP%5M`TgQl;<
z`=Y@~jZlKqB}uF*6#2Mbgn2fO;xvj=S4>@zh3p1Q24rj?dGbZBs^VR!uNGOelg4>o
z9FHcK4#XgevWSq05QD`p2<Y8(a(E-Qc;CJEcvrA5BY)X+ETVC22`P%xFbl$36h2AQ
zG)V(H>b0v^Ky^BuFR<3-001BWNkl<ZF!N}f8AC}DAt-x?h&D=lYMywf!ZQ}Yr570s
zo0tE?1?FS>&Sw5BBQj`A(;d=Yjqypge}7?dH70_PC$&9EuPVw+wiEr)V7)a<lb*O9
z$aan0-b1E|6$v~N9Y(#5x1gNv^$NJJvo=}-+Gi^Veunk$fw(oN1rcpp5b@kB!t+-~
zHrN>((7ARWqN}{yYiRzuFyB7J#Y!6B{%7e5gFxp1;xoH*HTP~wPhOg3+A^>Z5r7c6
z4&XtjgE&X1UOl^f9c?l#;5>SIS&HF&_W1&uJ*-pJ%VJ42P(2uIrB)MIu}cP5nDOwH
zb}O~0!y9&Yh5E-u5xUwApWQ%3fe>+VNy0mu<z00<Td!qe<M|m13(HG2Yn|T_7T0Pk
zwyty!xH@5V+XdXW`J#8^-Rx2&#V<McYg256#zA#1nN~M!L2gA@Rg7uW-L9$_6H%yX
zSC-%k*%>E(c|>EQmA{?`nbv0_0-TQDXjwtWFdm`6dZj!`DI%6u(pqGEs+2TZYq2GS
z1a$TtktED{mZ@r1_%uy-hJzv--+uNn02u5Y2(zlsCS%V&O%g<^&DM}wBkWy1CB!sM
zi=t4~!Z8c)A6yoZA{z?}02piHbRf(%(qGtzJicmeV3>%am_|`zOA|_?co-);$49qR
zSjUG57$?I@^a8U31OpUBaTLWxo?BBKk0x3f3`x493c`*>rny(hvC6n<<{s_rUkW9e
zB5MXB6=9PiB72uB8ykfsjR4k?hz^FAh|okas7^+=276bGjk=bHLZ}bkEPx<oSdO-}
z)m7_~LoGo4IyMTZtSPBOM0WoE!n}@=SNCw4d3U0)--3XjRtxNW&Aw_h0;5B7=z1Lh
z*bJ73M1-=kOOr*RrI$3Od!x0nbqyrEV7PysYeq8~hb<ZXsAj!sT(S69T7+9v3AO#d
zxb!~SH)~tb5LfCLbGdmf1K>0Y<QhR`?2HRmAu8N(iC{y8Tz#J6f_bP(XPCJp^K2Y>
z5|EfG<qpR=itEZmnz5UfD02+u3oF@BTB42kXpMxdX}YmNl}0mSZ=y2RDO#c6wQYj8
zxZFf_hLoRKt#z`h^m<^7F(F&F2A<X-z}C8~$RR?CDUm6`8)Xa?7tM9`W@VZ6Z7a@t
z;*;joE!Sk$K7XU^Ld?JosKar^AaCnr*1LPCx8zc>YwB585`b~Nd9g*@ETKko$8#M@
z4~N5it}v`LY5iv)*;WRLK)afJNV0FjY1dI~I|oh&|68euqM+Eu6$b$F)+e<W@+?(7
zXso<>jZ)ehAB&Yc6YH6(U%5W+iA-Ip8%y?+8h~Puu*fqq(cYzNs-m}_x7KhKiin~V
zjcF^eGh;mj4sDc%hdJ-PF9D{Oh!DNY0l-8tiogsDQ5F0PEN-A6SmML#ir6B|o_rCE
z-SB>%SwxJXmcoKyZH$5Bp<G>J3|T`uEAt-8+eQjqqgho&)EElkPmh=;k+n8XcK|e-
zjA4PM<~=hDVosGEA0-15ML}Q(P`0X;1@5~g%dxlU{5sPed?z!O2BPj_Uc%~L1L_eP
zz6VuNY><Ce6GZiXsW3lO=@za1(oqtcKd%pt5_wiPSWxWm;!)Uvmk5{DGV5hIXdW+3
zZk!54w6LU?sGzQujoCWc0O!x@wdIvAf5DB!Qzx|CBy(6}J+IY`AV-!n71Zmkxj3tx
zQq}DSv}?i}L&56?jC2O()h4{O3+C0TjLqDl(jGA||DK(S-Y3B7_CsF@I=F(mbnEgC
zY{zZTYoUt(XwCO=vQpZeqp^M-RD}*oA4@3LXCf65@MW7uT~;C@W1RDeiT5sFRS}ns
z5J{LtScQ#=3`8C2uFW?z7LkNKd*?i7Sw2W2L^OsBfGaXGHjM{d3PMrlroo3~5R}n@
zf(Rp#0R>QIMPx!p#u`fsN(i1sgk$Zv&9O=@;9ANOVPtDT2*ONc$QXrr4o_fKqLT4n
z9i)jhHjdLBRT&>2^*XCn)p=%SfZUKFV-P8d2gb%krX(vCQ1yW%WxixNohbN^NJs<%
z^>PghshMxOq!?R60%5~X+k#Qf4ti4&qRuCtEZZ-Y%4J##bO83x&b9v3Zn*HPR2k>a
zjrRNXu^dzi9CRu$$tvEw^)UP0J0l`c=*>xnZOIF6t~i|hEM2o3t0|p3>zU_0?P2?`
zn=G>+<D$1#_NL>1Q9)hZ>Q37fQLDX!&;aw|!m+|t4uNjIXji-HR0^Cq=_;tXsDNNe
z1`!;X<@+fjmhz!;U6z?XWUyM75{$44m)=Y-nI+AZDw0<Eug<U*0H9JX*Wg)|Rw9as
zBB_WFqN)-hD7D=rtubt8B9zbu4S@Pe{NoJv5MFauqe4{?rOXow_8d}!P!Q{CR&!&m
zL9?GvWl{y)-T_}$*=WCitKPhZhbnfKJ>sS-xlTCK4Kvj)+DEq$kM>++#Gb&#!rtq;
zN1W>E&c8-~w9kBAaZt?ltzoxr+e42hnXe_30_$cz_O0jk2qA)96FoXtU#TBLegZ72
zSr65If@?`OcHoXY**&2r-CV_cG}O^z7ByaizHfpM$k@`X>0}~=5V|fZCSFRf+Q{y5
zCNy%U13IE~W|Bcf??r@*VyvoH?|A?~v&l$RO1c^G)+Ui1SQ|me=T<E|XIb&GEB6-p
zbad-k5zeNql5&VROrp@;!g&@6p*>UNfxOE*HyIr}mQd|MRrhyOL>x~G4%sw@b}Gkd
zUbw<dBWtX|!El$-!T#=!isVJ%9H#?NDG}Bk=q|G|a~xX$@Lp6kPKT;N%*!B&k~oQz
z)cb<HBSK?LQH1_vi0GV%cw;7ru)B9K&8El4qcn+(A@<H|5hp_cu!ay!aBUU&6cI#Z
zP+aZ=mxZ^Pq%gmp`!n5D*f)Kb+QsCkcCg{9qTH@kGMDeL(YtgSZ<Kt0`lDbSz(8-~
zdZ$2O*ic?n2bR~zXodWjZJd7MUEODes8m{oWhsbazUVyrLfHrDVWMP<Okv@K*?2wA
zFVSk~ymy97CqUD;;(67xSl5S7oEZ)hdsLg{iqB?W=^1obdtK4}dEr~>!0D<BtYxig
z4PzG-sWU%=JFz`Y8d}$Nqp+()ceCNOgSaRS);d44$~);4ysT1Bv|DozDtZ^F3{aMe
zEW74>nV*LyLte;0ZzSXNSlK~UY*uG$0P3~VZb?ED!kwDSj(9gQc->Lsrg(>qKejgD
zvO{T^m4;QRAA~LQWuCBV#iAj?jY@B>zSb3l+vO1I$ZSLu?`D}6-AY}oBISA2q4Oze
zw8F@AvSU?5&IqQ}I~t30+galhOcKmTvm6njbF^(D3~K~**K9T$Bk@SaS~EI2eD=x5
z9(d)~7-O^Xk@qh65M4eEbJQ%CaqH&I$#fe2PLpVNkc<wW7iI-T#KB+?VsB)kV2=i>
zQdNEa)-9i9m#$t1q(BY_%Erbvipf}Gqq2m(cOse<w>%d+gUFa@XaACl9NxMS?zVU7
zo-5bx@$AI=-OKkNl86U|Y;s&G^#BNvXVd9)6xNLM>^u)N0>EIH!p-N9(3mor$ho2@
z@=$cXx#OaEV2mk>!}$S>;&iyXH=T@%Y&x0VR@KOwnwvC9hX9&QM<Bw^Eu>0_;w@Gl
z-{|5~ROoCPOpAct%U509xYLc3pu&TRU<{I3Lb0a0fyK5_<KCU9XH#BO*z1Blt}5*E
z_0QfVjTe1o)*=tt;9QzpNZiq)7cuK@bk;3*NnSjleg<l8m<*lpFEkYSh57=X(j|R<
zZ+z}*_)6@=jHPU5zO<@DH8B{aN-_(HDJW=(Qm;XLHEmgw#;lVKfe14`IIW=?4d#Ky
z&FTU!4K8lz)UxiD2ye2gg&#nZ46m84ASJ}UQ^$VI1G6+kv8jXW-LM$9xs7pMt-sS4
zv7ZHLBUE@zk8sCOtesgm5b@$(aM5I)_JC@nDfG?jSzmUYq(rRh46t`KuB+G8UQviO
zMSTZ1ign%XhQTCl3veOUb%|km7Qu!^FyWR?C9TA{RSKA2v$vs&dKgkX0ieF6^)D+~
zZfvX~-WPF_9$dNh<l~R1N*Y^4*t>L1gk7GgO3k0(y<_&_pZj||RJjE6@v(vmJ471n
zUh=N+MOG59wb9UsI2|7XAWcWro0iPZA}rpqcQ#HDG>I*tCP`v!6c2_0kY@}HC=!>A
zo_`hy5h$M=hlx;;C`m=cyBq=I!44UWA```fC{FWy;_~Tm_YxpYMn~Qim#*HUp>z@A
zezN1T@pOFXS@J>*QB~Ggz027*^L^A6(|{CK5oVvHX*w8YlVedS3NNg~K@0${n6Bd#
zV((6Y^sBd3&zHtV<;XPdUqPEoo{CM6!MdJe8;-pQ=)K5S-)KDNmOd#e95*5XSbvN=
zsPN8-q{}drYd=FODmztUV?Y#k3-5e^V3I%|-*`o`wmzMf^?6S8k*UZxgq_PvWH6Zy
zYufVTYlh;JHt)*X;**(!YjhoMusJ<jadFG#lUGrNAue7qcMR>6u0@=777G7XZ@NzT
z?~(?H*^98)s!mxsq1xzC%}@<gMGBz|C<fMPtq^|8h(dxC=^5~u)rghtfE8Q!%t#G<
zLkI*I)T6-TS{BY#(Pq*c2HXZA5r$0?<TnuoqHRPn#(JWFrL3vQ8&f>nz}k#!f`Td%
zg);Od2DHhtwxwmZ>bJUTiNfg*>%N}q>2A1$m;9ut@Us#Ur(_J+d~okr0>1fv;>LZ}
zo&zE5uhXt5JxK}$*nqp7sW|~R8qo2L8rE~@PMt4Ck8`;pi*Tc=3UUTDtXHdDGCLVp
z0g&rHFM@(L+V_mcD$RNoVzh#~LmzImsg{NSYS(1!AZ+FvltI)Ia|D3G&KH>>Bs8iZ
zEh&X@vQxMspH7oBO_G#l!Ym6&z=6G!77qXd60{>^VQqx)KwbP+RXjUpM{L7ehH#w-
zXOklpHP!&Y3?ikfASxUR0jdhSqISs!p6)14$runpK*Ca0^o<Nv6;V`nxdz?PT4N(Z
zM8fGb(~1cPW)*+5vW@D}^I8{KwAK)bjbdiW^Bh1UOLd5JfuF+%HRJ>d1@#i`BVN!-
zQcI_jBMJsmpc7bx95Vhl21)h5VCXp-bCP$j7(C`Rs`~g^6s1F=`m9^|l-W#)2Zq{1
zqkYHjVgr5Is5bi<*3yZOM_pXmw58H*$>pfZAkE;zx>wl#onEOZ09Wi$3&$1_kW2?7
zzx>Q!;TjDof^`-6@?0n_Pi&Rao_mco1b07f^z3R_ub8nKoIpfmRA%Is^JS^EB~y60
zQnP8<<z_|irDju~R0F_9&BAb;_0V2xi{vBVpu6|i$~#5K>|K#rgP|x>bHWiRN{5B#
ztnl%`#OcsG&)(reSCVT6^Q+}PzbiEq(F;0<2nPT@d&edU!H6ITRX7_T0e~?i(jrj{
zrGA5uYG*fSkximFjp9K~PlIGaB#A|w=Ma4i9u@Bj5f1=1vZkZ}#pBULM8a_yS))3m
z*hR!ZWm9FZmcqdr0)y7ZsxB`)0>sv+21unWaE<1OhHP}=J)t7K*%Q4WdObyc!711U
zsrLm#;Y<UGp6pyEQ->$!9A~}d?91+yg_Ji$oeQ%HlZk3>_CEb}V?n6fo1hC2geQ$j
z_41AexDJv*Lra#fBAP&qwH&0sU~TjW!kK>FtP<BdO&x6GX`!I!E(e#I_)E)DpMmGI
zgQwoK6t(si+rtfhq1u{64Mt-bg`eZYt037kFC{M0`&+qATA3YHCQP?+%Y`}vA=K3i
zYi7|vQO3-=?pq_Zc;jG}ZrziY(ctrG2f6F~m!R{CXhr@mz5cPFw1li5!jdYs2Hh`M
zTe!&W_<~BZSy0&>5EK+wF@((DM`vU-+D}g0sMFaQbZt4|PjHs>8$Wu{lcuUK*wuo#
z&WdU=3N+WooUPEjt%Y`p=LQB-Riz!bY?Mph9u)Lq26;UIa?^a=_AIZ0Hm~w3%-wD+
z+-T2P!M?O_Oq3)$flah1iV#B<4gNih(}6)4BsNV4@o;xK9rr5QL>3y^@ZJ@!$c?dN
zXgnH;2y>aBfkaW1hBh`%5b=0Y{FR^kC%tE28pl^J?Y#EY4}8nl-234Dmm_Obq&Kyl
z*&$-61u@vURF)eK))=C(ac{X?3}pX}uzV1KX>3J=SwwZ3yUKY$*RJkqmgTt%kw#zS
z-WQ1YJAd%m(IgkquX*tL8@}qk-C>MGHcAP}<x}WYoE69zRcTh9t9*u9aloGUC9NO=
zZfU_6i*}f-Kq)Aat@F{E_mPme(bq$+YK!$-;YD_0>J(uQe5z4}1`Yi>jpx<P&ZNvY
zmQ^mn(4f<ern*K%7k550%L-F(8Sq2%uJ}|XW3dKlun+MF2$ePG;1f*@X8pG|$6uGo
z=NIUO=b++UJhU01RquXg-v!#d;Ia?s23(cbUbaDOWL5PP!C2E#qYBf!`0_Kwm!G-y
zo)3QJFMi(}zyI66x<?UT<OL{uf_1@)1|SmpC>>^<(#Gk~#OYx3mpbeJJOA*rw~nR&
z;91`In)^i+8_()bF~f^ocX!Jc?AEYstMexrz!#YWUeN1h!2yd<QOkGQ*d=mRyaRAu
zHEOnd&uS%g0GrCbu8bI@cULbcYb=-!hG9whZ(*<O$wuoGI6ft8v&$jZK>oJIc7ak{
zGe@^fa}#ZSCkuO*XT$x=h<JQ>i<v{6_r3jnRT&@Mj0eN(_q`;WjGle$A!*Qph7$I{
z_HsprM7#Ufvgv4ie3YcabTBM|4Uth*SD|HyOuDlV0KUjnw3v?9sc^|6zxwWvrLld>
zH@p&211(&f3;{9E#>(E9xGpH@UBT?UD}sMC@PM-`0(&<ix_ny09E)tsjWh@6a$yH5
zh`4`nV6DAz;|3ry3yVDc%(LNmW|mpul!jPyo^vM$`}+u*O^@Tj?h=}zCCd9Ehw7U4
zM9uya{%+oFk*T-R7Cfb;vg9YdHcG<?+YaHt5=&_Q(VfOMsqCgBbIQhRu8LC{sVl#_
zKpSx@=UeX*3J!)10rhxZwvlR|k-E%~>aPRd5C6o9N$4W9Lc|RU&LQ?0i}S|%HVncB
zsuk*reKoor8#Wvw&e1)TCE){vpixJ#cjX{plcKr?Nz@I#`^{hX=fC%x*cGahW%-lO
z-Tt>9`s_oGJ{P|If8YCwZ+`7d)5Kzxsa6H|bl%eHvL%;j`L1C)3sz#AB789pB&5h}
zt8&eY*NfMS*F{}+O*QcRu6gHgLyRpk8iYN}Mb2OmQP4Stl({E*hZ~GWAHTNCGXStr
zT;eEZplNNAZU<yShvlGO4iW}xmC5L~f+9*}DM|(+?28Okjfp|gyTaILxOe6F_;4~A
z$8mxP%pL)<EK`NtIRy0n*-*f}$g`rzBWsN@-gE6)JsM?XiaaY2F^=Ov=k4;DzBY*A
zo?Sp1AYhi6mtGrw%h%rb_x{E2fBf@L0l;XIf8dWF{_byn_0G=D@BRCS|Ic6l0{}SK
z9sI+e{fi&_++)A-zE3{(%<Z4~3*YgUH@^WLsp!WZdg6T_{lXU?zi~Xt<H%guAHL@0
z*WUcvm)&#y8W|g>!+^#1#q^11ZvN)`KmDmMK7BOFFYOK9^7XI$^WXKl|KXS4`Kd2H
z4FKQz`j`LJw|xsDq!ouavp+n%9Yyp%{nPh-=8<RX{=erVUwF?)zVOD^-2Y$y)c2%=
zU1MyK=kNU8kG%hbfAa8SPaTh@!$I=W`>%b+H@@zNfAB3kgLI3E{Gw)^pRBYhPGELy
z<tMULTC!lotof8hkKT0XUZ|Id+&P_D)5EcuAiT4#C5vqN`s*)dcHv7_w>}!pI_yoe
zrsuavs%!K?Yxfk-JFT!LzN^6F&;*7CoTG?_0!g5?>~C<bwLnG^P=xG>0-95rn9f?X
z6ChwIp#ktmzWWV95CXu*9(wAn-}tJ|;C%GckN<D)cz^l0s><lE{Ogar>)(BLrbBoh
zPm9N&x&7XceBsBx|M*A#^fw_<uoFN1@Y6s4%l}{D%Ff@sJ^s!2fAWzhpPw6BBr0Qn
ztiUYR;=-9%MWn;=^zHxa|NhXIzFdEEG@5++^N)S{^N;=dyMF%{{`Oyg^@9(*sFk1P
ziJ~tK!i(23L8z*C!iu>NGqeE(Ek7V*OLTlFN;k)Crd1vJi%pWQ^xP6p+A2gI;Qv}y
zeh1+-C9yC&=Z1Ti5HXt^i+81P(yDS3Vz5wIb77B&Sy2$;a5yy9I_Ho~GTcJ|)WCIw
z!d`^Q7$maRs;V(o6^xCLFtQOKghHkYn(=h@f;LKr`(=gq!Csh@*B)Fs*c%)kPXXY|
z&mCUAdfghTL#=t?f9co%usNO6$>@`x|8i3b?(HPrOP&AutMB^gx4q%z_gxo2m}bQ<
z{K~s)DOg`0d+13+*cf?4MCL$js>YasjS%%)-|+GW@4x)MKl)-`cmR0C16RKG!Rz;5
z+jCy5m7o9R-+bsxPxcP`^S6)R{`0@|fBnMWI@sH32vB{|<NCrDfh&RDxL!bRE4<!!
z<9gFRVDi=k;YBT-ixGtLP*7t*8$|&DppEMcwGj-)7n{+CGlviN`I;JqnAe<41Qv0H
zONV<%lugDg73u&K%BqTG5<Ghs1Yw>Rh`6(N5XDJkrzVOAyO#i<$VP|;5ZM*p<wORN
zjJ2Q|QitMn7{ClLBU3fweAZWE;$*lN{!WLxqQc&T!prWzc6j_a08FMuvU3oT)B*gg
za8ST7jo<LqFB`^qWq&vwkKX&?&y^x@n7sWbzU%tsoivI5@Z*pE<KOylFj7DH`6u=V
z765+x4?c4=Ds#bJ^WeQd{{7#)H;g~_*+>7MfAc4SgQn~l5dd&iqA!kZlqBr(?|buW
zrkVTTCm#!f@M|Bu{-fXbCeQ3Wzwe`;|Lnu16nx!RKlnHP^4nhVl6#+f{_vmt+PmKW
z!H)yLt;6Gg^sB$~H~;Dnx0Ri3)e3)65Z;O1S_$+v>t&KJU<^3Hk+PcN<4&I0Q%<yf
zajVQLM@`QbcB&=R3e;Tw%_2AEqFL;Mx0lGMB`s%2sYOMxH=w%=Rb;8Ir_gZ0HyokC
zFfzsxsA5GwB&wu!c59tl)1rWZDxp(^1I1na6@tuB+Ll(A2&)9bIUOdmI---wbbn}@
zbS*Et@ABV$`(N5k%<<t36;Yro2g7fE?aKh*4X?iMrT1QPo(-ATzVhDsC*!OjV-Voq
zef+WT$?h=uxxe-UX=GL9{wsq)V*k-^et1rAgBjPTlof;9sll_M`!^pdP0~Rc|DC_}
zQ+vBZKz!-_*M9Cl`%4c$_S9ofJ_i8r{=Gl`nV)=Hl0=R9yWmhg;E5K}oqpkp-M{Y7
z^>l~KT5WKH{%mE!^$dpeE^&?CA^kXg7<MaZKAp^(MYzs+{I7{p6)$U)PYa8Vj8$E0
z@cZBst$P_8H`(KAlaa_QEv4NZJwlD+C?DNcfN7Q&&S&EzK(sbe)jS)A>`P{4mV>MJ
z?Cf7IrlX4C46-aU&arohX0Us}?6}B-+2?)E-dP&~V6e8wM>ma$lHnczYOn~&NCPOX
zs=^#f433K&stDzHGO61X<J)70#dP+`k9_YpT-qDvSvDGHMCN6$eC1#Nv3p%H1;DIu
z4?p(w6VKjy_V)Dm|M&~_PogNfeC@tzRy=v5EI0V(*FT7yO`S3eB7WQJU;fX3=Z~|Z
ziM59)G9v1|uy?umC{E%i^}eoA44x%(9s!EnKm6qz;lsCn>l^oWhh!`g1%kRC{O&jZ
z!*~2P0OW=H+#^qX!|T544pFvix{OU1(w!~_msY4>S@PmMM?=oHK4q8UW9@5Mah?|i
z;aAo*t9OnYv|n4iuRsmYu<9+w@CJ~4J+)5D$Rf^e+6#Es5IgLcjGcyU@I<9@HmX5X
zMd?5nzhJ27)~r!~IGR?zQ`#A(!Y#6rSHARmgAO8ihV?_A_|k8^?_&==`iw3FLCEum
zqx#ziuI<kX7OEP=s|PzzJlCwsi#0h{0|zqaoKXOT!%<d${=mIg%YmqVUw#4r0MFjI
zeJ8DFY#FB8s>yzb8;h$d?R_PU##fj{c$yN-J=V!$pm)=(ISVD?1Ub!H!-}ZRs0L2(
z>m`f<BH8$;JZa|`11dGPP?e668u+EwWDE$sNQQfRm+vKGRTak*EsD$cyv(^gA0Mem
zQFv=@6h(ubVVn-9qr>OE{E)RVA|-=eW9@J_M5GW(EV6NPx)IRY*w_dFoXb?$n1qb6
zHc|jLnc65daZEO9Ef?<s5%$i(brEKlAC0poo-GB^{nz%DizrH>bT~8bkhAe2vmYdu
zh}gS-_1=&E<KOuGy1_kH_Fnz6Yj6Cj2Y%^a{z0_{$mdy}&GK|2YvW|c7+VKo<ER`%
zL+CssVidJjZ=PjiKi=KjuUB;v+r6D+Jk6UmH;gf+ddKhwEna@}Nb|G4*cbDM+E$8y
z*X|W)RPGEB=u_6(Ji#e(%A)gI8jTmuCE`Ku`nTAwMYz;<X@2!$Ivlk5eikzZ;Bv-*
zrlLCk*;=^!%7m&3vg^QJ&DMxGD@9o4)K*3PW<~oDb?wUTx>~Em3YcHL-UmMVxmwqG
z{j2T+z#eN9XXbWZ_;>uyhr-{ldD*r9{3pKW{(G*ncjIYZ3&K!|ad$W)GkW^wF*Jjk
zsy7cOGaGL<8zBU$4X*GOrX?t5`#Xc0)a{9<Z+2es$!DLh|Gs|p;0{=j=eF$Y|HlOj
z@<qVIi`U&M2$wtA8)dx~m+V4ZuiE=rX*Y5{lmadI|A`p`RzAghK)=$C21G&%)rhk3
zZ4n8|yUVAp$j75&5t$ZlHy#Z4FL%x;EvxYf2BS4j0DxT&z4CN2hEVN~B4Z;gp9t2*
zsPyq+001BWNkl<Zs*+ERWsa1Yj3EHWKsdiL)1zBR^z_Zquf6-D^;h5e`j^98`5_Un
z>^=Le@I?6JBTr-%QsRfd=Z#nP;%stgqx8v!pOcIwW3OJ`uYnmK`ox$1lRx+7*o4A|
z{K+poc{DD~{Sf9<)ycH5mg0DswM~R+5)IS%6%Snf(i1lT;CDaxC;#bRe%tQOpdR~o
zzW*bo85-HwzUIMGdN?*T(ApL1*XMZXE36m{yQ(bW@?ZOwy3pZ*M-(m)agGLgbCFBt
zV(|dY(Kzv$CUdd>UIV(G6hy3@K%ole+QW6Orum(AZT-!4@qgB8dEwd4=huVYLNN7*
zYks?;nv5>{NmYm)8t{CTuzRbTL!w&ZD8k`B2R715l4I=?=(X-b#X*_*16rJC-C@6d
zJpICB&wlao8()0<xsQMT%fI&SkN!8m_%Dwuf%Mu}-uqQAyVlVmW|LRFmT$lwf>kFX
z<7x4Kzw;yW2JxF;|Elos=Z_}8_>T8J`}}d?{6|0e=r6wGz4L}^pvYNZ$^Zalxv!by
z{`9whUHEW3&HnZ;{L?Qz{<Nq*bK}<E{RjWzOOHPtzWToZ;2YCMLhO02_bNeG*Z;w(
zpSWUEY-taE1=*C^|IRO3)oWXXOEfs73t{8bW|!(p(-$cAv~l3xQJB+3)f<A5hwWzb
zJ#SINsIqsy$c&9i6)^{ZWVlB*_uet{B)cWTE}tS<6GfuREOBg+DBOBF&26MnI#|?I
zV@%x*6#-R7SL(c>=1^naKk!Enec+EC>b=$OF!|{pdUKVc(pnp2B2Y!dB({k7^85D<
zQK+}|EC2c<pZLO4Eb{4xpP6Jc)6;vWB7pEi-~08y`_az^K>de5`RIo~`DoKiQPpIW
zG)+qdUs=VM_3aUjA?J!gT!sLD?_*zj^2X8EJb2HK{+Vxh>o>gOJs<kq7axBX06zAq
zFZ|To|Ci1i?e7kM`p16o+>8_~%PY#Zm!d4%O)9+EL86=g1On_*!)$^AfGA+VV%Bij
zkT+T?Eg=>VfaGmbqi*9$&rwxSDOcU9fJ3|Rx-988hE%KikXf8R5yp90ZB?z#Puz@D
zYvG+&o02mz5o&$kT`EM8O+>t1wjcDOYN7F5FYs)Rg>^A@diMyzk{}-%sK-@;u*CMU
z_eGZO9+X*~s_|ftOeEfU@8H%gW?y8JC>hu&5>a76V=EgGCt02@jWbzmn^TO4z}N(S
ztTP?=T-p1ZKk?S<S9U3|y-@3@Dl<?B<Jcl#I*8x)-EaJj_k0WhoaYaH^3gCVZ+q+O
zfA8NveCuce0M8$eR2dZSyR!E;e(bG({~hn+cG2>$d*!{;+&}W<&2XNjX^Mz8PF<em
z*>SLzjX`UvD2lIp<vk(4)Or5wBhMyrY;9Cz<DdO&f9~gh`FCpjuX!Ep?flRG?N495
zynj9mX49JNo7`F#f61^h1?i?gK{QrX>K_JH2{HhHA{AjTB2iTNN?3&v4YU)=dKx#x
zvnnH*)m#T%SH+T&9aPnAt_Yu(IO^6gm&^O;HfM0@52<<hz+J^=rz-jMh+Tdc!6(kI
zeEi*V)ma$Z5YJ_i1*zcSWJsBtycJjm66(?tCDKep5X%HeVGgMLwf0q@Os(9Ri;ieS
z*xwo4dv*Uizy4K!>YKhQj;JopS~+rCj=oTfR}mE8$N$4`x_&Tt_Xj`s#IuKSWM1`>
ztAF+_uY1#L9(d%*n?Vr1>kmKkXTR%B_gvWnfNy)lE3W^{5B#eSeC9J>dU`x9u3p;t
z_BTBEAHC(ZKl=~f8SWlgqbdL-A_@vfM8UO)!7lvK?|aiAO+NCe$8Ovnd6p7t0&w|Y
z=a>J^fAP-uf8=*R{P8b7`qXGVP1E?L_g(*vZ+h*I{J>l4sNq>`^v3?!&?xI~uWPv7
zaP@uW*b`>ng0l1@Zu*+40xH_5`lx-ZybHoKn;tv5;AJ=4adUH2e}boQ`Qp+UJpUv5
zZa7Q-?LYe;*J($_+?gWBG;{9HK+^QqS0j3XM3w9MYDDJdQx6|K|CILvfWw_#V~mNC
z5PN6#PdxtE{=vbe%U3`Fkn-tKJ{=ABt^nZp=(hI-5vg{K)Fn0o5yf!~09lr?XyLpy
z6j|e0oaamXyNFm6g{q9Fg)x*w77>GIvfl3FX*S97VHy)+9LHf^JoE8rLPS@uTy{l~
zWz%#pOwvK9sZ@GmnN>O6xm4N1>hfu@Zk@}$E21bh)+#{Z{9pO+{#jsI`=LMey1($f
zZzx$tZ5%}j5*cF;4-bz=ql3MHA+k||Xo`Fkf|NnjA6&ct`b%G}=T6?=i-=ffT`Wmw
zD>nk?izFqItqrD`b=7wHbnYLPjg4YNbVW`?>+kCsBBGQiI4{vd$;`7DVKPxIc!b^h
zCriuL++f49%F?MR@2uhrH0Ja<M=$J4RYuQ0?e8j!aDlO~-LiZyUS$BOQ;EKzy*6t9
z;S8&Q^Y)xpg0ZdO>)Z{?2X?H5E^}P1CfDa(5VSLIjMltoO+BW8KdB!)1Krop`FsET
zeUCl;eDJpZmp}QIm)w&gqKN+bdp=fkjlSw7S1UM28CODWc%HRc+7N3aM?&RZy^yKI
z(=3A%-5FaLiQWc_@j|D{+3x=#-qky?J&d^aoYpl#UpyX{yVT0@><YqW5^Xd6SLTZ9
zb%3!KV>qgEJLi78Q2j+I>>JhH?)~{GK^jX8)A=IWiyGH&p{gQmY@81Ef^r>deZ}dH
zh%d4!Gb5rfyCNrJjg65^6sONT{gf(Py>@*sj>Ccpz=?p40K|B(lMHsU(NR7f85;qh
ziDDv?jSmB@8mOi_JX?EYCZnT#GDbu|+Pidx$nLWvGA4=vz&jT#3hy#kWY@0WJJ`E4
zJw8+wL{tT1t#<_rtH|-;Z7*6lo@9mUVG<ilq>VY6PG>m!`>qT>_=zutzyGVh|J$#4
z;7S_Xr*0h8Ai{gE?7rzW_cx3!&)yjm8yf{G_Ba_3(R4Cl_VwTs(ZS`b>2UW<&m$4u
zs<}DiA)7};^cs0>bJ8oclKy>>FVA-i!^OU={h_M94}o(E%eZT+*=RdCx*J%59ZQ6l
zzo4@BA`->PN$-p*tiTO3-3sTc4lc7c1;<%RsD>C4UaNji>nFl1LzRdDD#oGc(1|U=
zd0_0Fp?|#y)jyrwpP6hSXxPX<MGUnFDI}^iGQ`@bg=Szz8%6IM#%2@p(M(>&Muu)(
z89pRt(#&?8smWzH5SonOsHJkIb&E<ZXt`>e&jo-V{LZia{Np!1_3$$Q;90)#_>Jb!
zTs_!%`%iwCX_q1?mp?YM=4KtMt<7_&;);NGuG+s|6@_!Q1nT(uooo)4OoUtLXFn0+
z-C#fC8MLfU3M9nR&twCoR*k#tsZ6v;?P~*LE9vdK3+{aNi@Df_o@o$qQ&V#N1}C!-
zYjM@Kl4(ifiW?M-iENZiT@ETWvM?BVq3F_dI?eOk8nVWugJCk*yQi!a$n0_?Qx$Zq
zQ?c>Zji)EmX=I2HtTl*eqa^5V!p!+J#M`WmY@E7c>WV}50)Qf31euQjbg+B5URuIl
zL6sQ*jEUI0>G;SOS)C%0Pew?zcW|Y24XKK7k!N|H4TrmNl9oP7DFJIl#wIDKdYAwA
zKl2}d?6Z%)|Bt@#=#w{Z9v*wo!!&;2`u;b+_Q5~%ov%aAYPsn>M^O}~3434UlX}%5
zVmcUvUFN+%9*q!b$WHkzc)66l-wF>)fMa(+-}7*65eK^2vzYz1*14{s<2M^G@wfzw
zvy-l)pm@GDKQK`0tFZ6Gil_nrclx=8j5mGYeHE{;+O$&P>ipLb{tOtQ>M%d2P+CI_
zt?SzDGBd29J5EQ3B0k_~EWm0=%wn0khSa?X%jQMn?qvFBAi-|ra^h@9hO7i;1T7&_
zNTFh_FKhqyB;zrQD+-D&5UHX9hPuIMs0kP?18XIHn+7EqQ5&Jk#>_UMETu^}%hFL5
zR3xH0poj>;hD9PWrfi6TH(ZIxkWm0)52)Yx+6UkKrmwbfGC97LPe;e&8~_gX_oB$=
z+&PpHkSe%X2ggzh#hH10XRmf$^JCroaa+o#*Nq`@o3{zE=W{$f0^NM5MYeDbwz+!r
z1kJSC+Ap-j94ohfun4;l$P(ST;FpbP0TP{KwX9Pq7p*?urGlzk$w8MlXf~Vws=u+Y
zuty}M64k`)gt?Z2agwBI8by(fVpLFJ(K;oB!Z?@pD~Loyg$X51B11%kMd1~|c?E!j
zgUcd7WE7OW17C#WGERm?o^fSAArd06_kax~ev_+D1iTNw752fx3;hot5*e~qv)r>3
zd9EVH8mI!>ga&N+e!j>d)IL-Zk>Kzc3{n6P=0c>@iODJiiX35IXoWU0gv?$A8{13=
zgOre>WMHCrxq-5_nyd|1^Onzu)=|(0#|~S*fj6(+FpLdAXJAJNLPfW?{+qaneg|y3
z@m;X1Rb@*SbE*01He*A9nqY?0-SEyAPuLb#U>|}L!&W8(pmDlOWV*~Up~WHr*7TY#
zX?90l4R}79yHgO(XV$DK2p9Q?7D!DI_JpLMB3?wqJCPZ#IgaD~{R11PQ8LKJN5yok
z^?mUFXYakE?l_J+(W>sAnVY_d97q66V9ul@Qh}DJoTXz~vV!Hc*0xr**U$Eo9M`+6
zwY~C_?Df;JpVyWwhhs^USILq|1xh4M5+K0<Mi3-&1`)n=)68^t)%&Ao=FUxD1_)5R
zhv)Fa+`0G8^mKPs{i^EsLnfPc$D>r9C1Z7r0D<pN2W&KBVg@ioG(5T#fl&xxX13Ol
zHQEn~exYQH0f=*;E|S%N=w@xlv}UsD=FOH2TPq8dq@^smFr~bJv9663QD}7(6kIu|
zVJ0d4M2(c$=+qDrk+s$uW+)a4h!{2-)>zM%fGCy6%p^5HOUD2agg~;I^V_iyrD73<
z@PeXJ{xr>=vo(ZFr!?KzwiR&Cc_<Tam^*iK0TR;$s&gbxwJ*4cC(rvMi?BN_7&A|t
z-BUoU>Zl1se?g%cM)OSAY?0aay*v~`fC@?jQUz+>v+^Z4@yxfME!PNVc{1l)4_v!C
zk#%LR3A;8CrKKpx$E*M8kG`CJ<^ylO{++MBEc3=N0XLJ95fms0*s;O1C`of=FU&-i
zn3?<8hE9F(N1r+HnSZ#`{r#C=ee0U#1HkmalY9T{pAv%5|K~T~xAFXQ9Q%dCe$#Ru
zXz|dc7s-rCFMfK1?qBF4K12YtWb?$F-`ljk85?V9{i@;XFFnT{-178+|M#nj_S2vI
z=XYJcad5tTX1s_H(JUI(XN3&57v?Y^fDm2UGP6#$^|S0*tISKUnIm1Cr3bu#X_NmU
zo*m-HX9OhJyV?lzejJfebD~9m0d*nH-q)$<zMt_sg;crB_N<DJnZd-d^W%h&0J2e=
zwANPZO#mnt17zE*O-esBQIm)O@xI4)=jYh{kL`Z<Yp-^NHbN*FcyScPaio+G0xKmS
z0E{7P$qNcb$5B{ka-}hB3=uVS+-!y>)+US%A`TA)j+hN|1^q<U>R!ruOaK^1jeM=V
z(P3B}2OAfHq-H9P<7|Z&iXI?Z9Wj7ZzR_B1YeF4s8~92|p>-V*%L7A7c}7RZnDOyR
z04S#4cKfDh9Yf9QZn)sOOV8<E_a+J(Q)7stG&o9gsgPRSjtFKpaa~AXDu3G5O*6(Q
zC=|8=at$DYLWS6JS|}%k6tgXnLn71ti-_oI+!nWq;%v8q%JYeAhr&<4oQTn}kWwyq
z$7V8FPCjYXw{e;U@84^|o$`|})UfrPifK`KZQ?ip|3v9-@Qd({n0p>fD>!(zcby8Z
zcP}tzN(xd^lr~dI{P&03c(L~%8QXtkEWa8VTJB^bVv$^1+U|>eo=&P@-(#ImXG^-@
zYf~tMc2+j0DA>KNWD#p7G|2NQ6v>6g^FZoOfj5matd2SJfwun7Jg?!&luvqmobyx(
z^ZW8yeX1u1TR;7rekV`!%{)6zo*5P_w~&&TqU1&JDl+62PiHyo3-XduogxVLG*hgl
z;a%sREu})l4zF1ViBirLQ*wwo07g;dHaH?$zIq)BT)D1djXtzzyAZ-!El2^NG10Dl
zM-Lnw>-e6#AA05kZ@i{Z8te#Yn7K4CiikRDk~Q^-<J{`6W2Kbm`O@>1@=?@O6grS@
za&pRAyJGn=W-@UIh<;EcCmf&1>9t;-7x+P0D({Mo-lu*(VPadgbPxcvv5hbeJS7lT
zoO`|ya_sqoQP}VcWk8V1XC@OT&Gnv=z9+5aNE=TnM4+@D$5U$A(k1RR9qTA+_8jMp
z>z4iIhhFXeUb$pYc|JH1j28~*Lqsna=(mSD03ewNb8z9AtaN)fqC`2XD6pfE-049I
z=_kPlQ(Fw=2Ph;8#pI~P=5otY36$2x(+@ieg+el!q*nw{2-T@ihrn#vn%*a)AQSce
z<{7xTTW$5NlM$%zHS;W^ZA4Kh4d%o2bhH;vBY;8%XSH2G#M=1L#?+WsC}*?%C8+a7
z8T!tB!*#hHY;(q4Z&eP@Yhx0<|M7%}r4V@Mty#Kl_YnZt{N(-*yz$yr;0Oo+-@Wgd
zul?|G09d(n=r4Zjy_+82bH}FbhmK7Mfft^;?5#I%yzKndS%CPRd!G904;}@8<s+5<
z{>yK8_?biZ-?r)C^Akddi`FfF?;CEobi>N&Z~d7)M?RM(4*%rW-g*AorI18<5XI)U
zf7`U_u^oqwp47$;4U{&nU-_n2Uw!q(=XQL_<2#Pr``GTihsUdpDDc&i;mT#_ue#;B
z3pcDu4B@B0@V#gDJfD5!M-T1%(L+10yl~a0e(sj%_8<R?uOvCbPk;PPqobpc=HINP
zJMP|c*XGA|?K@JfHA<zz+LcRhy6&>~y!n;oVv9!g2lqbmN1y*^_xF##{Fw)~ZvX0c
z?%uuss5a)@)yv-S>g(S9hMPLPvB$RU`sVjHZQHSLvf8MWi_4Y_U4Qw7Z@=~BE0>L&
zN<@U`em?i215N1adY?bN;%4tymou7&nHNhdD#ct3+Hn<Ka-La6HT!4xH_yOxkQ<Hc
zWbU|Tp6?#Oonbo9Nay{N6B3G4KOlLEFB!u5ycS5YHs_z~qfJjb0szsT^&zq_$J~+-
z0+ncn(b#0Q;QK;gd0<E?FK$#BpfNSZOo&1%KPVJk^(La&^u%8G@#`*Kcjbj^oFP0p
zQQx}#;1w6FN|8hcXbI#p)0e)z>3f^Ex3=$R4?Xtmq4)gM<?nd)W%WkW5{Ge=t>pjn
zqbKj&vLicr>-Ga%w;y=ltyjJCmdg-31+|ID8V!i~NK{JC3ko9Ez;N_r^?!Zkz7rGm
z?A?<SwM~!h-1OMaTVH<Ze|+~V($T<w{@&IfJkUaYO*5`H$Mzo?yW_s6Kk&xu-gE0U
z{Zf6_QlqJ($aFkDcS#ddwNL)>-#okfVD{EjwZ5%d-?n4lH@<i8XMgXP&R@668q?wO
zf9FRJ{`nWbk^OVW-orcg9)9%6o&V#velDA1|M2x6{=?Vr%+8sZs!dGQcI-LyFSp<O
z$zOc$t*^Rn#>lQ;LwzT6Ra(kBP579Xu+OR))AoGq6O<qTh~5AdCg0O7PQ)OjV(6#C
zj%io;%z!bX%0;x;4aopVa956)$u@D)bHd6m_1g&g;+&nM(Jrf*yTN$}J^&Kf@4nZU
zHgGo<CJxhwi{hp6IBSBue){r#J<Zww2M9pK)+Q}tBJDkABC<(2gKNEU``XjH4v(cI
zoHt!{{*6~`5b2tK;HiC-<O4gET2GAE@>Vc=edDgDwmy5vwJl_yI62kGTfyx0wL2ew
z<e7tgk|hl7X+K0j6bKk=`}y1M&s)L#>&^$Z-JRw;x9>Tgw}OM^AS;alfUo}Gkz-?3
z0J!O@4R5*m;)0*-Qx}}O{0%SPc-_To`aBaRqTl_~zsp;}{A+BY`kVjbe@|BH-C3f~
z|HHSTt0rRe)@L4k>{<8smdBsXtl(g!bj8N?>((q!Ot`h5`{FmpCu{Qx>$vm1S$4;_
zwe<Bk*6Y6+-|F>lD_uR;@0|Yo``F8jD-QEN4f!LT|IK2Adi`kI4bJnw{57`@zGMa4
z-H|kIelbUc!~_iD1>%sM6C>1ueu!+>PjTLnpT(sTSsMhw(9n=0G1oe>RtppfBR8?J
z#8G4{`M&S_{ynML2z<5i+$Dm|#T!;^+kF%Owmy5fP#SbCf@Cd|$q0@uv8Ut*-gNCX
zmu_e_<L}(_*yc2>{Pw>;bHf$q8ErD5C2}Xf`TC324qFy?KD7JZN0P1on|E(})s0sQ
zA-%$6b{Aey2#N!Z+LX?f)kRU*Y}B-l?|XdD^J9rUxaQ(>KK!;D2TH+~C-;2mUmrA<
z0N{@MpMKe8YXRV%t-IZ6l~VA@58tw8`JhsA)8l*p_ctDJw&3Yqhi<xZ!!6gHN7inB
za(@^b0Jvnsiuc`m6*I?ioZoGPkVZ#D_Kv%^JpEj9vzKpN|7#z8_qw$!j*m@#@vC>-
zwfQjs7@w?u;j4H2U%&944);__@!KE&nOEO%c@*ov`O59z`O$;!_#;p5c=<IK1Hc`3
zKje;VSi9n{KK&~}-~+(sN1yq<&;C6CM6tf_;iupJx|hu~6?-+CVw*H~T3?Vd8(_bt
z>6{9D&LGW_f`ey<TSV6ZaSAI)5av2`vx?VF={27*uYTJvgH!5EiH!x$sXB~vyj1g!
zD}?g0zWEokAxuW<g)oGt%?d&nziaC!<m?S06WJgL28V_w$4(Mi2O1Pg13*AT#H5Wi
zmcl45GcognPbPc%RTr)@It-ikmDgV63}L+)Z`(h1!xbCYTB~EDBj0O9R3CoZ%is8l
zjpd;wWbH-kSNz6j|HT!W?mc|68N*Py5ENP}wI6xMO>cY6Rkg_zeo(yr+A9zK_b=@^
zcnkpc96Hf3a@mp*ztGCkDZl8KDibG<nOysXj>51}H^x4^EeXXcMgN!Hbwl7w0CUq7
z=RCLX`FkGS4FLO&jMwVTa?u|dDBf_{Ib`YL^~;wImz+@I#T%CA@XUseqmF3G8tvp2
zO?!2_5Yp(Fto`;6H@hRnLhvV_`q*Hl1OVr(TJ~Rl{lmNVAKriH7yx|#o`*m2k#`n?
zwi)~Wx83sES6l@EO39CZ=xul0{jjkX08WfgCDCLW@YS2q^Cu_IUA+tdUUBUuzy2TI
zt+fGw^=ntmY+A7AVeDstn5o|^#y-K&EGal<<T~!|)P4cUJ?8z>XA2?8f`>=+^Dc-@
zCb%}&a0P+w0t}%me-Kh-Gx#SYM>sF#=obN++6RtlozU3_ExPP^i`X**p&s70uMsBI
zZZEs+TnD3Gf9bh@o0b~f_2APtT(%B!ogCShyym(K^PukQZru2#ZzmRF@8J_yoWCMZ
zCHk7{FJz*mF`wv-ue|cFznWlxyZ0YmGBQB9B10x(YaPvK`$`lHbl}*8J8;?gD~rWK
zB4v)^gKxS1r(b^!F;}Z~&sS2a_rK{{DX<YnleKX7p|RuRwG)$#El=&AVS-G<pa$HG
z;^%f9aR0pJ6<0Ycm{>~0x4rh|fAvrQ>Y}%2cJ9CCvJ3JbfB7{RXN}B-z#kr}oEV$T
zTio?)S3J3W4*(oHIq}io`s_KYmR)`6d6!?b{-$d$Svop2$7O;GSSQnbd>Xy`7n3!3
z33#04n&=oVJS_vxZkHg=bOT${@5OHjyQRoxjMYv<6X<NzCl=DA!DMZF1%Xt4+r(rx
zI+9YM(~AI5Uf`E1IDP^Ej3H)LDt4(j1S|%gltM~jjlFA2lIJV<-m71J6`P339y>X{
zVfE<lLt_B2<%wO@YPD1>kTGO*RuexmQ1XO{W9`QkM{T-hd26Shn5;JH<tR*2k3*G$
zq$p}=DLuA!{Mi1{V$19uKX$A-HW)Rk*^y>#ygJU6fx$wlWo8P+(!kJ&o~UKI!E08n
zSh8YG)Tmmc{bE@N>3H4tJh!b>9$2z$h0*cmt<V0;_qOahaJ=UeQeMIH1Tz@Zx*nwh
z6oQGA6sj$dVy*4uc#YD>y=KMIjxSuja!L00u@e&=?=Be`c5-Qsm$I8C@I&u<?Y&!`
zoR~_|p9hW{KXBx@Lr|}|?EGK)*|%P_Va;rzg@k}{7LZqGWeqVAqUad`^!#R*MefG%
z&r;To)3a~9s8Cb65UdX8Dl5dyWKFX+)|fm2C=dl(%Sb;_5#dX(KHzLxK#cw0cOB&^
zf=ab!^yJQ??wl~zKm8kj)&1SEHV;0z=cjJGBxxs4k9(d>`{a|K%-7#4B_Y>H?kNc%
zGF^E@kuOpAltdJHmk@haIxsV{$#IuB&EcGaVynsD1;F3Ed+XnP?XK+nWy9t3)-JjH
z{FPt)_Lg=x2HQOu#@=B!aC<>~_bJn7M}(Nc?OirH^u^Eo#%=$0&yVigdUB$ge{1X0
zyMFb*{?%uH_di~-as5kE{-xJX^oz56WJ0^&=H1TnOQcjFg#8I%JYwdKAQFXmK`L%$
zY|@xh$mptII&2+T11`mg7&WHqQ)3++&DK&J8%WeAN~Oxs=50^9>XPYS|Nh91pStl9
z_ji`Go2WJ{F#r%V3RxT&9k1_g*)~Cln6=4I)|ycq`JRx{N0ffxpPXv7Ee}<S9W5%t
z3yK57W5<p(>b2YuNdPGLt@BQt9FH1R6Guc=D(}e2>d~=%z*L=@xT0J<ynn|(e(PR$
z=7r}h{q+yMZrMnsTCG;=VJ?*6LUF)aEkvA;Z=$flOtCg?<0Hh-@W`NF5r{4*JaqJA
z$5<Uc);h9c=}5o)aT0J~Yg%Sb@zNzDpZLhTKK{YC@7j0h@n?2F`qa)xp1F4|7XSbt
z07*naRN5IvuI|Zv;kNJn#eezbS$ODP|3yJ;tx&2T7=<XN$w~M8W)vdph;VssA>{&4
zGA3hC%F`@*aOzk)UV1IE=P!hmQb?KbKPcyvCs5f-5#cOG@FyXuor?l9hoA*v0V5;<
z&^-@7JDV?j;<*D8)kdYz=0HTTdGwhB*KS;umY>6&o1e}uVD0kZ_OQ}E_Uxe>FF!X4
ztN?zz<=HH#I(PLb<jq3*q<U3qU@`Dlj8<IL=o32*Sz<^T)V_Sjmir#v0RRJ~;4eS*
z?p;U6T@@$*yz`dJmW`Ad01=-btIj-25V&XUC2%S5&tJcK$DTs~aL)sef8rzWsFaJ@
zIN$!`2h)gIU3$^FIX$@JCnx^&ufOL0e$N|ky7B6Z&O3M2yWe<o7{$N!$6wgCV;=zQ
zJ^1{>{ll}xk9}#sdg(P?P}q}y8&SFR!;G_wh)#{l_F3@CwWzb~?-ZZTS3VZ(88|Mm
zqhBe3h+!D|L2=cFO8}rgag2!$96Y>j*CBV#l^3r0@LR8E24gi7pkQFQZ|k1hH*E(1
zBEI*L=ic;+jfvNszW(+b5B&T)uD|h$LNn4|zw^-@`x2D(@(b52Upj0}oWJV7``3pU
z;Mz;pMcRJr?x%JhIG&t*!J0~`0MI5jW}-%;da~oL<2WL#iR|^4p7U?_Jp%w^ll8y+
z%8!5cP1hC!?}3N5Z+>i7ayu8SjA9eTt(woHC#K@434pam^o_fo%EdRbR-KZvEnC-&
zv|Ce3N|j4~gv~}27K75@J6?a&=l<qj0HEFsfB&;z`t@IU@A`9A9zQwpg|FPc=Rh(D
zuYcurg}?^@k-LlO<Nkq4Y3sI~t~#_@Z(M%Kc?0Dl0Qj6h%>XbuGys57scv4n+4@N+
zQHg#tpRAcvyH4L=H~Th3oHGW4;)Ph7IqghbSkmjI*Xa#z(j{i1keOyTbr9yud;8+?
zC4S;&N@`-2@);O~1m^o5+m&UzUUlsSYgY^da~#J+<av@AZoYcGGlT$;8p1X?m|8RX
z{B8HcZTGkDv+y%-yj}=F?Pjdjj6Z+d{Q#XOzwZs#b(?wa=@TT$KzQ>_8}E8}mn(Mt
z_eXdB`=dMaXB7kQ%{O1d%xjko34yM%=Bqz={JH%ni23PV&pSJp?9|Lm1VR8{G4RHr
z2>|yzyyM`}v5VF%d(SPGxBq@ZEb#VQU-6wgH$S)gAOLKAdgssm#%DUNbg)wT#h-oa
zT%S`R@Na$PwRhaL1puDex&Ph2_+QtpS)rsnaO7CMk-)jPzVhnDLk&*TV#7203SWvr
z&&o}$SF@s9o?_ZKGSMk@^<XblXZo2ie2(iDg*Zbhq&fGR`HZet_flr&H0OkXAf-~u
zE0oI0^TPT>RG(zB#B~2-Nwc{W;>Ih^%a27A8*S|BrGv{yD(=XR{l}gkt17Pmx%!v4
zz3P(g-RlEyyzY|oR;8mYvZ(Z}uk1P*;pg7|@{7)0nkojjE<x)gp36^mW35Y$E*T#D
zjSs&z@Ot1M#lZW&Kl+Ac!zC$1x#+*;ri;_h(w3(WJiP5-80)v(eDUZ|*&QFBtowxm
z2oc5RlC-~28@qk)v3-ZfIT3_vU9wWXkjnFeKmFa0pLg!+o{wv2u=3g8|K%kkgY%dS
zzxvU4U3Ss>Y!G(tJ+yt-{>%#Abls)zfBS1)SefW@yUDzGnXQhhrG<YRo`qRA=0#S{
zdg-;eySR><wee$dSkKQ@W_A^%)8e8`oK~GDIbr%qL`Sota6E%n9nb8h_CKd{qe;4>
zg;X9OAfr%93hDa=APVaVd&|B<Ck{NH6!%|o(b|E5a@?q89&s2MDKYTW)f-o56lM2q
z-Sz&r+?4;h_rKwq<)f7!KeYSEiAhh%i`K1p&DG~#x$)c_!i5=n@xeFWuzK0>4<6Wl
z^hDM3<i>R?-f_zn7q46HYAaB+xpA?!VPwh$FMn^AtTkFnPb%-4OE-M}_doRQJ0E%c
zxq~OhYs9={xP0v;=f3N8*NqMqC&x~>>wNEPuUI}>xpT{o!^furPpw-$^46O#x$2@-
zhmP0AChGuj$9+$|@f8;jl)Ny~?|#kYzLJk@KQuPkFqQxXGi0qA?mndQq*6kt<;zCD
z^yk0x-8(nkwQ1|ly$5TxW})DpvwHc>H(c?)xBgTyn5UyzE*3uj-+twL_dImh=ErvJ
zJ6x?boMpXe!<t)PdEIMox;oDUCNez)f<Efqb6+5fD#mg~D4Wl3Q4%wt6ff~so`HKf
zm^iFWJl{?V!D*O?c+c1VtiK&}83jx_{}HXx-74WTff9U{4Oo}(TpA0`<Pe@cZfr-|
z$pwkc>bQ>T6UUDdQBVkk5MEGXBBP^39DvChqx`^8rZIzwn#|;&(PkJ6DSRanQA#0%
z5JD=?mtOGoA8h&O+aGcf;g|mKXNYX6GVGca$kOo>CrYJKrBX3EGCIC}({o?_{-f^X
zfBf`^5P-;0eyikCiL5os^QH0;0fjhm{J3L7WdKM1i3r5d4CBC8g}`%$P%2Ld>5^n_
zJus6?M-kbHlgEV+nVdBd6O+sKd7c6U-!DQ-)1JaGs?{5wl3toTD-=tJSg+T$)*~Y$
z)|w~`0iakaRYq2fuH4Y3Q=gG)BrB4sf5R)Cf;eN|`NDZ2nmrXKPU(7ip<4A(DmCri
z$X$TQi)2?h!%@9Pb*y^wh!d=LT=03S4>i4O*5Tdcdl<7GgX!!9v$f_d8ZW6lAe!?v
zGaI9&n5`t+3;yc4u?EG8ACycSS)=2yt|MJ259>Ir*J=Rlc?r*?j>yIl05EW|GK`2q
z)XB*g2$WI)KpY#Tlw%h&I?{2g&7j_lwK3L=A)-{m(YrL8&1N%^1I#PPOXVrgpEz+$
zdA=7E0JvG7(%LpcJvcZxP$)&snvR?0q5{YS=nWz&C78JhK*U;G6uu`tB4c&j+F6)Y
zP)aQkG$LILykfz#maQe<mqK`28vs;ZAaW9q%p8Rca=r6PC?%EWE9KX!Q$%Em0Wgjl
zNwXnB95%XpSKJX-x@~ndolL>0Q89GY<ksj#QAwOrLw){aX3J>+ook<1kiL1pR{hfx
z7j`sX<+n#iiO_FH?H)8HlAaGQy%xhQl0tbwG4KC5U`hD}oPYZSx0JNFS3CCEI$S-4
z17>-HFN#rUEz~ycc<%UjPHzyo)tN4!jnh3VRcRZfM3)Cz0bbvn5U2X*nGyn1UiF?6
z_Fc+xz_ooe?V$y9v;p~TIuT7wFNw1YOmO9v4eC-|z#N@4_Clrer_IdE{NnfevHvmb
z4;tZ%_TF319jC+0W<24g*CK%j^B234%Aeh7-uy3+h{y_|P@KjkF^_9TRA;&4hKSAD
zcvzo|n{^kZDd`g#Ddp(0mCV$vPP+X%C=C?LgC~w1otPLaH5vlZ4+0@@Xk;0aH97*s
z!I42COV;{@l2<5|2KMEUBgtBiu2>BW((?gvr5{+MO&mEhR@`<ZyCkVRK(S=`Dp%%#
zC<d0StWS+io_O9<l9>mFmwSFe>xe8JJ9;P#8<m33%vxJSv2w+79miqVjKXHvY~=4Z
z(#BdY7rbnb87K#2xmFLQYylyjCo}P>c3&QeNE;&JIJQa}#Co|hh=@*WqEM_DW5Q~c
znZt+*+H`Da(hFw!ToCcpK%>?rJ{D>Ih#5%UnLF6wnW%$bn>rh`m}Y~`Aa=)^9ib$V
z&9LaxT=Yj|`m%^K_n^7xg&ZvWHLLv2i`o&hWa6+cgv!Rj?elKiIinlu8Mu$6^&(?L
znNQ9+KNSI;%5^>|+MXcgq=P#b`s7dGv#YiUQ}rBXz~o*y7kMG%NZB$BD+35}+kDoy
z%8>tG?o>+RMc1dF0|0w8q^CLU3@ZdmInmNfgG|Rf7X{|4WU&vd(fU!MwlnkGa?Tue
z=WDP{GY)gtlkvAD!SQtP<_i`ME}}Z!nG?0(izkv??A86!7)(QsGF`FE83NUv(np9w
zoIJG4T5WYiM1D|WwnoQ9Tx*2ILa|&fSrZ$hmFEkgble00<@tz0`30@xiSY>pE|&r!
zrIfz4+8XWo1tH|f%JpXp4=*CtCXYw8Npj4XM9eHbpR9?SH9+)(l8&P&Y`Dmb$XaWM
zMwSX8$ZBRX#xPMF$A}md3PMP!JZA}n5YEanbA4(;>v+lXRm{Z1%w*!orE{1pGc}q~
z7)6y*kV2hY9$b=fgSzaI(Xr<T$}d<QTdSR|wPcyt^E_fQaf}FFP%=8wanlvcI3wlS
zuHA(d$^%5!#vw4ER3?t1sP2%`C^oUSN(w{>e9sYnB1+E>m^qFbv9@8_TqvbL;K9Km
zAyDgx$@+y#irE4)4UDc_vg*8iu?!jAV!7xE$S-nskgYN8CSsmno)@4`BRP#iAgbQq
ziAW|w6ett`lhuo7sko2c{la3~Gp0-GRD!g;5UlQOM7$bPW0NNiC4EG>_92&<R%iYl
zoN5n&tR|z4iJ2@ZkH{Jm6Hy#To)ly~V`6JGB7kITVrCa12$aeit>X{@tPe~I7_8CO
z#zF{AT2qoh1`%^D4cN<><}+l*03ahHWQj5YPJ%@uMkD}oPew=~gd{S+m={-KB2I%#
zCd)4D#unDs0<xIN8UYFf5R(&0vE($8+KoZ_&A=>@ItVAvl;C>;5hS7zg3|OK=C#CK
z_yz(KB5!6AQXv2d2@JxOx~4&|V;CpI^fHntv!@lwm!G9*fWxC)(zKg68yOh*^gnSv
z1z*7cG+j`bzy<k4`x%_{;ump3?k73dI789$i;Zivn=P|<AqF!8#?7jUL!%?I))-4f
z7)8Vs$2vho(@nI~xwZxYr1D(<ECXn5m8X=Dh$b87>ex}&zl=iE>kTQTlV3MFa@XbH
zIHi;jqBOV!PgnM$yX}_|t&ZZTq5NWYzs{Ig%K)t7CL$Kg1MWR*w6(_Q7!lc87u*OT
zd_TyHTvk5k*cigF$waX>##j?aneqcMArpc?6ev&$;YkscDnbah)-`9f#UDg*9Hp9{
zEQGST=t_`eCij4K90IVEzEny`<+>DHj2?weYqb}YiHze8B*WGkYuRaME2Wh3g+N49
zN(v$B^%^3@h7d9E0%K!lEhWlS&ca&bXbAwN5F!=PW^1%HhR9^)k%$f)<{tbw%nRI+
z-NSW>5F(3dMccHSKlOeelg<uA0f-LjPfl)25;*wUPQM8=*`yqF(E>tXZl%x`%5cVz
z>JqSXR2E?`I)eepS@!<F2r`RIwl;N4hYhkCz;ld`Oo_kj9`}oobUPPt^fiQTAxF(>
zV`|Lkh>4A{L<}4ebDnTAWzA@%1HskZCbT=&{gO6TNESlaG?#?{)$yauth_)<_588p
zzVD9=4+B8hth%#YrGBAUR8kfyBl7eZLgwxUGDI{wj>5X~3Xn5|nDkn((V-U<i^U2v
z1ELO_Mn@fLB#7wwo->n7WQh{t4uL3S95$>aZH%>KboAYOpKeAPfG=1(dez2rM7nWE
zDU}q3;((CS;nf|UthF|dB19piL`0O5b(GnUO^@&Vvw!-r`}@<s^oH}-t#HIHi6LYw
zq+$TAV;zU3il(Gy1b{4AOT?DQS}K>zK@em+ETYg8lK|FIEQBbRMuo8e{NsmqMcOj+
zhSj6jU%HkFJ-^@@1CZGQF@rUltl?bgJf|$Fn;+fwsXzH!ckmzn>{I8RyNa1NJ+ke0
zKJx{4@b5qO$qnbMoYUiVBPJ06k=uLw`_G6z;VC;H)S{4ximYip3+_g8?My#nx!2rV
z&?~XcjEIN}g-H<{%s`72JDt%KIkS8a^2|2pvs@9?v7^jvtwtds0eJ{fGBW@Hzo_*H
zyDI$>?;vdxL;w&%Ivh)&0Kq~CAeK^cGExZ18cT)rgh*;E5}y&J5DefN$lHD!1qz9r
zc>S)$+)XJV9RCP8i6^(KSQBSRV2g7ZVOG_-bHPJ+8cZmyI&nEdq68ge1|lHhgkT}r
z_$Vo^!30Zei)fPm3XxU0pb&zSiW^|Q{l0BuQw;!k%gq;Geet=uq8N7~F=5(@hiMqa
zttdUQB_gj1*!j4#XuhQ%m=r)k|GYV(vtmhxFDsLAPm0(&=fGLAA3V5YqS^$2*T3w-
z>n>RfT}f?pdP9p=2hTHa<~^aGnLfkQy_a5mn{p-33SdN>2A?{EfK5y>ZREKiY}q)R
z9#ioGummswp8fqTu1zY}SDK%n2ynJVgmY5h>sDYu6xGS2#}DrGgOcY5Dkv2PN9y$&
z5tYhiXa6z_8ih5bB#~8K;1|j+!&mZ00Ki%U%+_e7<ml)KA_^}^c3UBs!SjoLsiJ}s
z1M9HCWCtq+l+wYi#maD_UZ0wptdvXTN=fS|j+#gIJju+BW~>d33>MvkQl5X##v5tA
zqy%g&@oY=v$&%LAT8l`Hdes^Oz(U9%2#9%nVk(HWjYGds3W^nNOtTpli$z3~QVAh+
z9C406K`PG=in*jA6^mtN(sl~0O)6Yk@QYM_!9`A<@B2XzH>#Z4KEF@~1Supi8?p{z
zX0l<UDy7Q0^oWe}EpoF(Iz};LVv3qxP?VnUP+2Je{m%GXNc24ER);aVUW?phaD5TO
z!^6gyTCK*+<KyGp4mL<3!bk(4RDLo`lSWHXEDtHa&_!1?XT+(y9eetd=de<Q#6BNE
zY|%srk(E~<*{I*QS!>wZRP4=bTZ4$o3z)4nrgvc4KgZEG&5<70QHWxGrLZid5<(K`
znYI+!k-s1^z$9eQ6M11vv)-)4OdzBaToj0>xBa94M0%lwTIc8I2%)6%AgL+<0M2Vk
z{$%M9CXB;Ux-!L7{2W?Q0|VyDJ~|3DT5xM_S4+wnDJ_ubVEIg!FaslZ_^r(O{&f_N
z%1%m@Qn}wpA%&3Ler`8l*!TI*iR}Qped_iG0PO7)cWltPUI=a*s#aS?TO8M;_9Wf&
z5E;_WjrLHhmCDTD?#1g@{`P-(qbpclv1A|@n<fxXE54jIu4s8tn6%uxjAoyGyLAEC
zg`ZWm3AmV~*@!&-@XiF`%o9<>c{haMY+KhmryQq|@`4|CkCnxJF0%6)UIdfo6klh{
zmuUT~ExJZ!jb6ksT1xMf0?G^NEVf1;+qcycX-$673(7-rSkujVBaE2Y3&=wmg*7Rp
z7Zf1duM@%g7==U>&MOa_4P(sE@CaEO$4x{Giqg$UDOI63NG5Jfo{Xag0DFG1!-=y-
z2fnvr`7*bgdS2jpf$|H?5b5KV;_<15=Xpbeg8;ni@w+>Ql&xKT{?&`ly(E?JJXstZ
z5kmTf5|Ndj&(`Xw0f6h)FR^5;Hoz2z4Jn~iDnXJLEC}i8v?Cr7gJQ+#usZR)=NGe_
zSsXPTJ^%mu%6&TyoXCFn_D#>;zUkSkE?V<@AA3_WK4kBGZ14SBckMlVqSlB?1%K7D
zp=&p;ee=zi4GffxG0kSv^E{XQLm~1!VcYi}{j-1ik^B3PKJnI4K~dbi|A~G7-~ZX{
z4u0j2Km6$SL*KgliG$BiTH-a!hhKBu1#i0P(vHH;XZ9TX!2{3jI&`wyh$=;Y$x!90
zi_f|BWfzq_iHPOOz#shOzdp04C3yS2&Ch;s^Rri+zw(nmcZ<<bDB`2f9Qe_e?K=+~
zpQ?ui-&?+P^qR{qc=IhcUbtaRZa%l+y4};;HH$3D+N8dEqD*9fNT?ufZ<u%VU^_BT
zv$^;l`HMb*@625D^MXbZk&GdjIfiy_bQ<!4V^l|+E<T?1_S9k05QXZdh;u9iOqMw*
z$`jI`-<G@Z&MqQ*R>&~8DJ_)}%I9>7GP7}1k<5z@jh^XgRUs9z>4J`1&OsJ7bm=d;
z2q7(;=>fWShi$G48{5JU?6qiJ8mc`=Ovwb2HkT~=NvO=E6jEl*<c?@;p*y9M*~^D&
zltjgt5~AfYA_&kKF6U#lq{Ae63703E#?#N<ovbzg_zU0PeW+zAtM#y251-rn{P#9(
z`@>&;`^qKdd@wlUgzI=LKiab63*UMm`{$lRC-xjV@#K!fpZw_SvopW(<0tb<ypy$X
zvKH<>bmCv{e*72Sal=hluAk|*_)Fh@;P(4k-%vAAZU2$o`;UD6j(b1${<nPiJ-5!o
zon0)qxc6JQSYgfCh7#c%A(L5zyo)k?(_L7Wti_i)<!8p60mXDpxy;Oqog?fC{m<WS
z39*>PyUbBoLzJE;*~DRO0;QC$NHVR$(Ar7~N)aFyN<#p|#92TSM^UMq+l7S`fPPTQ
zTQy^}HIY=FlrEvdMn@SsN;y623<!$DQ0v(9nt)L7Mc@_upqN97&{)#i5;GB%%cWvz
zaPM<ZGQdEkETt4uDK97wFIx!3FardIG7l|9L?&CSPUt8c8ePt8UAy1d@#kIkj;v*}
zT5DrW5CnOfL_}I^0EoiSSc<jrBIBv1v7{{pDq$kM?&38Y*RQzq!DqwR0KkUTqZhAV
zzH;fn<m6;*?4N)6-n<pezb2~9|Mu74{hz<~4l=rkLMe!%&|2&Je!pEq2-Qm30RX_?
ze`ia#<MPNe`ybnJ`05K+T7V~Z9LcO;r4+1LHdt%wL&qinz*_qI?>>CprR$+Ob>n5{
zY*;<=<A-*-yI8+!<njwvuUS4)C=G1ebu@1U2g?Ox$!P)uz!z`3<JMPRyK4Dp_u6sG
zCm&QzU)o0tV6<n>i{~)_kd3GD{mBww9zkc!kr6VJHC9NWrft*aUNK_Fv*X#zhxJM;
z&NV2U6BtX@x;nDfQ|tc-L@tHq?ph=%?bdG_qlJ_`Gi}p8T<!>WdJmVFE}=-)&dKj_
zIxT0H6|_b-t78CM9$9X5q?-*lce5fsL{S-CAw7T5bA)GfUWAzuIbAS>AbT!CPPw6(
zbM5ZLWNmldR(F?SpM+WOxy4!UHc{39E`;plC36jT#IABx>zJ9X@m;J&i@{%$o9M{}
zwc5{^i43!9(U|pdu{dKFBO-ENgVtJWEX$;B;#JpdSTZtn|Kod{3E8-A+52w25&*QZ
z_dm90$NuB)t1jNK^5@@m^V;RZC&ngj`@z;tkM9P6iE86(KivA>TQ13dXnM4~)k>cs
zz(Rcdr(b#Xg)74-{^mW~?tCzjPJH6ogI8a;5&-UgWS2X#cE!-AfBB7`Qodh!Wc$I-
zeCY=O5NrGJGY4LA*_zkgaDfoG`N@6RU3~a$FLS}~j~{wAHG#qJ{lcvq)~+a4mTZ3d
z&>#Qhm)$i#xqWxHA<Tggr)LpycMrr2C+AuxI*999sKB%q1<(F=_0DNOyF2Qy56TPP
zOZoKd)qGY4{H`>Hg(xD#0MuPGA*2-2Q%uxeS9)gM1k42Z%|2vgU~36cN-2p6Ol*t+
zz(NoJfK*-rnj^}DK`kI1>o`QGtXC)s<q72hup!pQdW8~MOGX2N@`5mIHtRJaL)ID#
zQd+Hz6DM-Cr2?5ba)2x`+l03SfXT&m2uNgdTfA|LM@c0Le$wbIB{M52m^qHMF~;{j
z296q4AyuI~#A#*!+!22wt6j{B0%bmDCPblBaa7b&c}fJ@)QpY8C`KWaUlg36xW)2-
zdnncz6-81CDW$a5w}e0d?0bqNNv{>dDL*Jxh5*56v+2qG?qDJC{@_2oXP^`SK)F)>
z<j2<j${+pH!J}gUaNpKlA9~x%N`*j4fkFzYtxX!e(}Zs3585b>h`^XuT=nLgFS&N(
zDqt=Z{P({0%DW!kX)OW3iHWK)8UUv1Nxr8Unz5;9_3{EBUVrJiAA9#ru{PG)6(bd=
zHf7su0<CdOV`5~Wc;n^kfZ_7<m#<nf&}@dP5MO!8h8EUZttZjgOizlZYkX#=`8TJ#
zY1TX9%u&mB?*4fh#awrMt2lTrdoMG0bIZ<n-91ijWfSHc5hhehE(w4L045IIuE;r}
za93w%t+mE@ejt@{&qaAb(o)rRqeRqEQ<w1@WW$`aQE}VY<D!(IFaQyv?PtiHz~?j{
zPv`}hpv9|n=9<FZ1;egym03p(Yc-(Al3|Wm3J~M4E_9?4aq=_r26^T#-MQ&OlO>km
zs4@+cwQQ{|R|ZfBr`igMP`fXL@PncTFmWh^6jJ$8L4afpGg)G7j31P&(Hao}{6eYO
z3~RMo+BHZ*pf(l&l$2@tA!QqdwG?S91qy+_FO`&1dWcBcW+7;{r%R~<FUZH5N=YWt
zIwm54#6(fECY34;j?%m+Dlv)r43Tk@O60@@5V26IFj+EMD5bmr>J4qIv4n`FvX!g=
zKnPhVRX_+Sm5C$eZV!dW1k6sNPf7q5$_ui!?s<M`U<d$e_1fOUWA5N9ue*43WH^6?
zZ+i7LU-;UO03g=p$ar|gg-ac3Ev2m2YMJdfx&<g%GI10~+Ugu)fAP8{POw)ZlC=Y+
zz%>HKu{PRBiECF3Z{K?i08UQUfAi13y?WWuW#_NDc>T)jFI_iS_UrXJ04OCKNR}TW
zYYh@gAwT$*8-(<%)njAh&+IvN`1s^R<CzDa+S{7gsVExF?6Poww}zSR0;5N2&kFa8
zdpc3amak?z7p%3jU)?>T66SeCW62QlJnaRxcUYS!bnQLNq~p;2fKZ-NejG<}6qU+@
zez8bK1EP?g=%*z~WZND2o`chU+Ns-)a|6g?CP|-^UchF=kWOdqOpX0|(-*kFz(xj=
z%6vz(L|{oM9}wfH0l6F@_cW(%J7qt2Ajg;S0$J4Ap%V;wnhjSXpP=*1-AE*-edS5r
ze6sj0Q&K@fWSJ@9-*j{yPOk^i(N-EuNko{IQ@Y8=Oema;yX)aV*T2q;X~Bvk+Z3ts
z<BT>8Qz<;x#gB-N#?x8@fJR4<^xw^E=#me*N*zWNjMayIQUCxT07*naRIQ1@#MW96
z7SI5qQeIXK!zl`xDA^OWs(8`{jI8gzB{JB)K*uK<*+N~pbSQDrlB>a0OIvpF_*m6Z
ze`U#-EVRgr0STdmREpc0_J%4YDWy{)R7z%nZzi|&o}apE%TxQO>Y+P+`1s`E<C8yp
zU^@U@cK)jO+;Z8vRl_q5>y{^XfAhy%ckDm5P%MzSKZoZWOh~_I=#0V}ahgqL`kkHU
zjPhmf1)>1qC=wC|2TGF=Ef*x$Ns|D?Ks&$4jI?w`EEBd#v9vo2?VbbxxOM%4Q<q_n
zZNI(ki#boOJIzizJ(D{wcvoN0ENw;nt?XD*XXI)P-Cn9vh^42iVp8m-cP(#vT2jl)
z49YK^UR%hsFD|!6HzO^i=lf2$+>|RrL9wKxM(W!p@Q%@us~ItI7)1?bwN%=e$eM&W
zpR7g1`owWgt3q|u6u?WCjApvnD8%t&$B3w0u6Uku)ILH;CaPD*f`YG<@1E0CwN|S)
zi`pWBwM5L;SRqxhR07~QYFKNm(SX1V$_te8lo9~K_lqb53K_@ov7?6ppgMMFV06`z
zRp-wV9nFJ3?(&R|m|1J1wGB!GMn_~~w_L&~oERT>pIW|Z&GJ=i9bH*io3uuILD4Bl
z5VJK6L=;k4qn+an%$`>O0IfqHYvPbwVY)FoVj`OhFRYHkdez}hI%=X2Ou0}`hdOKk
zvqP;1hDWo#raV~9P8%Fqx^($cOSZgkEIYVl$>@^dN)*<}n2}|xWZEt6d46SRl*tAK
z`?=qI&o}OTbkh@iCu?DTxSrm1<hgy%|ISBWd(paO)9eg)-2e37eQR^}&*h^78#k=J
z@!HEj_qSiqffJ@9L}0SL4jQuYjC(<M-@=0OUb8--_i>&kiUkz1`vjw72iDCsN2B9t
zKIW5bvpNna09Yztd7g=5YmK!Un5|`I)|R9YL7?(Gs+7X>B!jg&s@JNn1Ybzu1tliy
z7zc$^E<<ij?3OJs`#}j1bsRF;pimLYD^!O2ZIyF^bmp|*=1+D+!CAQzCDX6PPpLY-
zoO`y`Fbb8G<Yd{LTn27FU0#mZFA4OdKbz;<EpO@kaKBg~vSEG7fnGVTD|GD>$`8b}
ztt4sX#;k_hO~x}_sy-tJOY?9<DG{=B9P-u3*%8PUTqM<om>(18%nAld+Yb^R;&!*5
z(|D*=5RoaM=ju7Kp7tbmauV<@qOx?^Cyf@Zwtu%!l}tD?X4g=WYujk+^Jq^}U`t3L
zD>ZTo6IpoIw%9TUy2U$;*>6C~Nzm>yB90D~vr5|MPfles(7leHm}(ibp$g`eAlxJA
z?s-XAz1wKJDG9n0x%<4FMCRuYRf<3JhHKvWnoIT{o!oig#ID2RPwhP77-+Sj+kW`?
zAAIcAUicv(LZr=??|9f9x$xYjpZMvU*Q{Jts0@QYkT-<0?p2swlQ=GLT_B&HGL~#U
z@M7G?v<*33p-+CyF%#lRWl8ebMqVI`(*om+ez1)V0y~6GAl*gMuAu}LNe?onghL|b
zHSM3QnEP7`2oT$A%5YX=n==zG*zII1$7#_io;Fo8m-*j!b_mFmMECz`HBHTQyUW?>
z3uLAqg+$0af_b{7r%AVu*$ay0;Uzk3#9_lP7X3nrt!1`RSYx6_q<zNHfI@({S+`^X
z(Hd=ZTqqBghnB_7Dp_jAQvjBk0fiS7fjMs0ELo!?KPdTyAPQ?q${je48b)JKD1%ev
zV?tLeueDUZ@_Z?TlA=->NcGK4X~2az!diRm_*kLf6$4KxUwOWcqcE;^R6=^5TDEiv
z5gj{mvJvi|IB{@z={ZBo&Y5w+ph(o%5rxrlqdHa@TILoiAV!TTYqX9dB07BJ=*W^~
z7hZBj($NuzakJX2O#*XJ8W2*EHN@6NaVrgG4NBP|dnSb^u&pN6DL6{y6@9gS^^!e@
zP5{8>CwBk*yTb|s0K{PfQGEZt$CH~?^1^eMleNs`ls!xwI#h$0bkxWtz^v6#OS7=u
zr9;GKbv#pqU~6m~ot&)y^}pQfcC@#?>Wb^H+<5(!8<`=}`VT(;&0Pmi0>HszlUf_k
z3kC)&`6Z^c1%SOrj%7N9Z@c-@;Yz{b4f_usZOhEf63_2iP$rHR2x-p7=JnK+PQ@8$
z_8YM^nuwf;V+!81Nmn>-Gv)dDlUpfJ9nbq_U75Aj5da9~Aqo?RLP{?v67z|%3Fq4l
z3=9qgMKp$)OO+8oVNIN&?hesce!*e<LiwIgQc4t}g2I)Q0Dz5~0K#=gD8FD$?4k_-
z_WY9ceB}iI;B%RorBp`8&mY)@LM&UouDcj&n)sN=k}*Q6OlqSCyOFcL?N2Zl3AKmr
zy6^sP^sGz+=&0M3aj_;dMUAO`ym+$&0A^{Sx`&}YagxYH^(g>Qe!(qOS0hR$wxHeC
z<U+}L<J5S1i)nFDe$i$8Fb&b%Jj%Cxw|pUiDOYlOEKQRlwz}_g{vaTN=qlFFMWQ%O
zZYB*<bKGu8?1d>GStqw|7Qwba&b07BphO{r5GWiqBF=vHq<7SLaYBfs$b-n0cy!!5
zbW<+jOikPX01!qx3x;3+ic8#|%`pDV7w_1A<Rk!`n5g~bZTB2Fn%2==eO?fF`H`58
z$zeL~{2rRmm15!PT}K|<e&Dg~2fp_GhpUayJr^lNmQ5Ti7npn8MY4V5N=e764R=nx
z8GZ4#?=K>(@q#Cp=ANhN^#$CylVAr5HCNoPm5dkp87<Ip;%9kl=+Qco<{PtShgNM+
zixZIhq-`;0mh!6-+V}+1b&W|zT6EuIE)>I_>l1Lgn$l?~D;5Z=&SG=Mp4&<L3HdYe
z)EbO5OEnwYHSai#=V_?3AhP`u`*(LDvvB|d0-#U;Vt&W~0xw^-3<cJw#vDw?L`-&a
za@^?=GB6@qZN^WY$Z$x3K*YpMG^L_?7-}N6#v<b6<Rkz9P6!m0N;%eXy&eXJf;d#3
zUn~vPn<toh&__+xn#E$FTq;>(TnaFo`pOFc0^?+iOcel@EnVWKR2)auTD@GZlq$m$
z<72KQMTn%MUr32UE?qL}1ZJZ~_1OMrPzYccT((vSm7kscl-m$-YH|!1hzXeeLYbKS
z(ttH)d@{+sk<nzeHQE{-lm`*OnphjHb=)dG>Voenk<aC%!U(Y#B$47hkL)~reCm?(
zSAXy=FMIvVFa5#&Pwzc41^`d(JoKOc=U2K6Rq(#oUt^+XqO6ouG_b?^0WmMu(X-jn
z{kjke0KK5l0)wSw0OaWAt2W&I$W8#*vH#e|{_r2yEFV@<96mmob;RFt!^XkkktmEN
zCdPxb6Zifn_8mD{-MD`FJ6?086v7e#z(3#d=(gR@qYzK+I@)MP`G}B6rxJawtf9kQ
z_|(u=Ww3UKPMLc`%sgYjH{*r5zI&-!t6M510d=n^RtPDiAR?pV6u)EuusY`X>_=3u
zo>YFp4@$LKtyZrM3=9+tMYohDCa1L4YuBCUBxO7ySFT!POr*nx?+LO-dA{@lwwjp3
zX2V+R=-1t<@DqPorpyBd30)Pm=Ld<-jH>_uh?`YQ#^_iI<p(81Bx`h72SA}bA;hsG
z2OTIXglJ5Tp;XHA^OYg)x%6(;cWoHf_G?t>%|OZ^6(P#5!!v}8^G;GS^NazdwdNF=
zKp_>Ph?_M;;TOwpdbmDmhfJ`gT*o*7z(OjQcme;-9xqOEH!a@h1>oaS3It5KAuuhD
zaZyfE4bR}D^sGCWrQw*Jb~<rt+>#GkOJp(4*D{ey^P&(v>#3NX9<Q5ueG+W!`p3wj
zf3BJ_Rc>-cl4(IJQ%gP_QMyu86iye{nk4@}i}6o>KPkK5L}A@&>SE$e=QhwpAW1m2
zjrMHi^eKTP0eZy+s}p3!*loLy>^gAVJ)mFz;4Q0{4)*-~K)LYSKmWSnfkKys!?|QN
zayb#`ct*fXA9>pi7p+^KUEAKnCwCq=o>{@`FJ1Sp*IpxpL_{LGWJBxBXZIc7dw6W1
zTzJPVS7g!QL)#8)d1_xXjNbqD*DM`L?rVIqmZY58Q<}4QK&L2WFuTmne2`b{$VPWO
zwEP0k&#qZaryge5dCWv)jY%xJTO`(6Yef<wB(j%M<oPrZQ847`B3kfF&z&cIw{uFh
zt{>Zcj>Ka_wAK>YtT4S*l-~AR0Qqs~9*~~zwqJJcQ@wjtPH`G)rbezlx3IwfxUH#%
z9k|yPEcbevicUXkD!W3G-n>fP@k%?Pk#1$XQOqf}X0nv3!x&?=G14z0ibA1CWQ~rA
zD2j~`qEIM0?1IT!6Qe-Eth~VUJY(v_<ZM#0SWLWZL_ndGS1y&5r#w%&R>eHFlBCKI
zCF0=Fu;(cu6>F`vb(Nx8#{z}&JVZ<-*RzHcY%LlhvNi|;W)?`mER|=iZ8RDHP%H#V
zldiR74Y9VCiuEa>lwT-|q(e4o?B!&Zv{~z*SONg6BWvAEbx^4FloY^ZjkP9q6fBcv
z7X=Do;s}Ir`nSf!h{Ev^BPQWd%kc!3%KPx!UtTN~A9#G%@v$jm$+f;B;!vgVsgJzo
ziQOk2d}`nRqhs}ET=2bB%Z9GI<eWF(d|AP7+2*W~IccYp=*m{}F;;gFLq;1NxfCN=
z-L5pt08lFWpZ>%<?tbXmO^@&1cVw*Ah#VZcZq>-mS8cfYnhSt55eR|BV(~+7xuH}j
zY<YU`*kr?4BH}oX-}~AtmXDObzj^z?=O+SRoxgV3yI+69O*dY>W6!}8<5K|etsicF
z%Pm)}TsoZZBP8z8T$ml~4(y<#AssQ_rqbI7X?2-kx-~=EpaRzDZfC+Z5#`ea9ie{5
zzailznoSy#$jQMka62K=aY$sN*r2eUXQY6@SDxod&sWS$q+*@YH(4^8IUzpugOb~A
z$Qoj1GS0;$;wUx<fC2>yKR~Uu)<#O9q;P12)ASKip^!RmppXiK#LXkHmH;g<xO|=)
znK%j|l_qs7os*U+n=Xw-jEp)xyy+ea17PB0BMP3I$;@XdvSKK1aW72Y8`_IwZ-JOC
zlckgqq9X;HWuQ8lU2p%}-+?pWl{bW{zpjEcI^zbE)3O@&O1he{Bl}z?xfw>yFdALD
zd|+res#lq995$Hk#8lJw{o&zZM<%1AFbb<~$oxXt^NWqz7!yUYv6e<hM;*?aPtFUe
zg!IV9OmuQ=oS8}mUkDr+Ue>xtsep)?>a|*<UL|I0xfm#CgN0OaRLi0qzfg8=PNUJR
zHyQ&2m0}@q-=uX&)>ej=#&I-u@+2ZIT{7xSrZw7Ht+kD{S+aDwRH{6@+-2<B;VFSB
zjlkH^JyT;x%7aS~F>F+=iI=S0KxD1aWbN4TBgOJSWpLQ&n5;>l(NYCbxPY}jH7=#{
z3Pom!8da&h>^ZuR<e#=*tT=FtnN8eGZ&nB?r>3UrjmBWPAfyOV<DJbAvc{#m^KPe(
z8VukEMHI@!4QAFlLIBS%C0G`<cs28dGg5jegc}w_v?h+DhUXWR7dVf@HI3;w%3C8u
z%)Z&l5ll@@)$4V)dIMhxM9-7VV2l+)3=EA(&-a4TBCeF)yqc~QYnFtNy?PkBmz6^Z
zgjC%EiXA*YFVxE#9o8qTrKwt2E)@p`Dn`dfN5z4WpjffiFi~~lq>jU-E6*jXb<}jg
zo$><Z7l4VGvMI{UVH8<Q+E_$XQV1c2hK3r=MzvZm1YY1P&o4+7Fc|=po+pH?P8^p~
z`9TQ~$XcUy6oo>dl*021(hHpRjhao@BP69P6ifLvI14?(Ij5iI@hLZ-7v)D2>pr{7
z=$4;cpe;ni>e%!7FL5cujChNgrBazWJX7@ud$L`0=RBr`d9aVIb@I7VN=!2%?3&O)
zWHh8i0M<J6FTq8VLK{rWYmk|M5d>x8cud5C0g|eGDFmgR5RL}SokqrB3WB*$3X%2f
zCSg;?t<~~qa$0v;Vhj?s^w!_)^HNADEfMq)2z9Aa2M8w_zLqzL3~hKz4tBsiho{T`
zCA<Qb(jI!U)@B0n(4rxQlmHMJ1>{^aPSD`A&&0*Q;8+M+k|0T;QxYgsf)Tse0&NmK
z6LU*Vfm@C$U`kT}0E~HXjMFw4=R6Y;k(9EFav&+k=1le@9eg1KB8XOyo!qar7A2n+
zg~AN;!P%bNB_-cyS+#MEE)s~kX!x6(0*Jk~52AGOCdacxX`&;YMaGDL!hu!pG?8*F
zxQUVG9WaxiNxHIIuu!faBUeq<Ix3|=u*NXw;~ret6URlKLJMf5VeX_X>25JvSc^T*
zX(h})bXJSfKhz`r-sQCR<CyP0KAW=L{@!RS?Ctnwvc>`QaU2)Rm66e<*2K-~c;XQ#
zA5kb73goC+W9DWvE|$vW%21<GZ#L^FVgzu}gAft3jhb~x8D0vdK^^O6qvrbsKS%<v
z;o%`>uGQ+snDE$9rBu06VW#o%3Ex+NrvR~3^itcFsXK8{C>vv@rm6rO$Hw=3zgQHA
zN}waJF*;1S@vu=Hvkqh;o|u>jg1{*S0&uZZ^8LcmqelU-I5^rJ5i*lCiH-Dv;=u4S
ztz#f7g+!S|awck8YnzdgzAh#t`m)8b!Car3Fh(~bEd>T%!;QRYhEc3NB|RlQ&+|Ml
ziXtM4w6#R#C=yZ@if!}@aTLZ;<Y?P!jTjN4SR=r|;1Hsap6^<EnXDn>B#WDkdK@<0
zmSc4c$c5s7C92jVA+S&=6A_V-%2!^&Rf$@ooRwy>rNI%lR>u)D#ZgmA85GJ<7&hwT
zZgk3(0Tiv)C=|l;3Wz9_=PIq-2)dnkWOyjmrpM~!gv${!o9fY{LnBKHrOHeh6P^a@
zaj<$W<JOU{YB8nt<0i#cY~4E9v@fE5%ZjWeyEr)%CW9#R2^(gMxneHoB(=gLXQ&bp
zwAN@Ob0%yUYpV6I&)}hs8f0x4#c`}n9J-ny1n>|Wjpo#e6V9g@9vLZ@2b5o6=6dt6
z*3rmd354*x0003+sZ=hN%AAtpvo&6!42ULfvax<pb{LXdNtT#HR$dSkiZ0QPWC3wt
zXjCe-Z_h5@heEM)CC*;XKL0r(RZsIUyOOKUakfkg(R>AnyCBmx9#x@K?|Qm?>coj)
z_X2V|<I8EN8`2g4_j6=T#&YEXA(58TI}Kg6h*t2-cuiZfpT#r`S^S-Pz<G&zx9$YC
zIWU=UQYsqQdKdE`d52$`N*rd;M<Ub*E!HJyr>DpE>WTK&{ajIUt4Ibg?F~<3FGnuR
zvu3Hl)VFmx+)RQ4TEtR49&{S<rI~7MH6SzRE)|l*OG`wf!|~*-F5M+T(>`2@$=Ya@
z=p^A+${g4#nipw{OIt&K))A6>knXv=aZ3j?-}~RDP2Wl%Vk?Ty)q1oSL?rWUAs*`K
zT`mZxTM+_hJksk7?7n7f>&@qmP&fIaw1GVz`g5+>xD}~)_!iKDKt#sGk)SvtT_6ly
z^7Ng3P6;OQ|Fie*F_vv<ec1O{Ywvv?RbBnKckax<Fc=&Y8<P-BgkuPgkQgM!CIQK@
zBEZ3kArVeU6bq272-z`7EbM=*D8wNITR4u0qsSr&mTYWrBoqb6!w_T3FkxV3?%dnA
zySnN;_TFo)@B8w{+Rt;Us;jH}US^Ds`bxK|&e>-_*5iBp9`nEA%!uvfZYI9cCxP$c
z!^K<LUg8lkf3{3Le?lF$x~Bj%JLs(EvvMzw)wW5nc0+`FdzGeFC310i9E56pmQsWD
zPExbI*q4j7FPHnvr)FAID`K}?cp~R~sj3&78mUHzBIX^dgr*K<wL+v$?d7n%jz!^k
z)Vj<7>lxS~V@V3nZc>QP+TY$gM2n%xbC8%H+`kW90VlTg*3=5`>ivGZ-HI9jtQJN7
zI`94a-Z%p!B9{li<>lq&Wqoo&i1^0)-;cz_Q95`qS|x?h?8f%n0K@Aqm5|sMxtP4$
zZ<~6TMfo3n;KSu&wLO1}$gwXV>-U?PO54=+ez!V(usXeOV3^}C!W4t1RBxZ<XXJe0
zifY*<rWHFcDVl1tyHrW%PaYR#b?@ORA{C1@5wmlf^LL&-eS3=e-tJmaT}Dyu_W#Z0
zMYcuEgP|<kAkm%^)4HywH-VX$F-DC^L`_5%t2H5Id&sug4g)Kb^ivGZ7e3!u#L(75
zcwH3E42T4Y-}vBX6FtB5a+7QEk=(>l#fg4%jRCSCJ9Yr$=T1yLw4pcv1cAXJL}>g-
z3hfZ^RjX4~$u^mf-+7{@F|^K?)$-KLLcL3&)hxbchU^HCeUa~VwYK|@G{sh8Kq6HM
z^+t765=TH{r)rPiervH<EEWq%Q6z|1O6mTisu#A!w%M|CB|Ah=5lJbELR(8}tHs)v
z%evW{iS0LtfJiB&^Ye2=TrRxxr7sp!)0phVJ=U?Nt4E*okC~9!ogM0LzRy?nlm%W)
z{KN*?HY6r?nv%kESrgZnKu7ZaA(TWVbsR0T6dF}wS4@P29GICVU#*L36`Ng(SuztO
zwqUQKM~H9@TlUi~3dVV#qvOpFSx?Tf3?`~!*0-g4JoNA<oCSB#eKt$Bk@b>uIymzU
zSOd$-ZbpMIeV=Si&ELlyWUL@#|2xDiPcx|nPoU>x@H@w&->z1EQ`;a%JUyn&)Oz|y
zcTIpsgCAkvRXtSlog{x(T)-5+4u^<woP6E!elUe=s~Jv2(>k%G=}pbl=7YjbpVao6
z;7HTZ(vE{poVVHF2n(I<nAOn6#P_AzB%j8w_u!gxZbxIOW7Itx)VC*QnbTxlr&z>n
zObR0jsTWt6w~Xg%i-#wX*N<`8#!-)PmXUNFYO_w1{)$Qg;yg{l>yy9v>H{w!u<(M#
zfIb<+cfZ^Hd?Ajbe0m}gheJkqrM1a1j|2h1r4$j7pSQ_p@YR)g&M}BUlo*F^a^r^l
zY4I{siLIm<qZCD1R>f{tKY4P#T6jbZ?QRsuB*&<W(pSsXa(z0gc_HP!ZNINmjEl-A
z)w+p9RFtVGtHsG#o(mE}O6}R}pM^+jhDaa#m4ATbveV&%_br?KZhQHRn3yOgi7DM*
zoDpG4!BmQBsiOPc766>1d=o`ACh?w2_P#g;07*erR;LeR3{RdsMZ^d9&ti%x21oqp
z;e$LIB}ODsNqFe@J6~bUklet&f=>4UedS0Jz|*$gpFjR&Od3;q_}UxyU;kikCxm7f
z_FFJDiK$0qb$(XPSBpicx3S%;BmnFE+w$gVh`_!CFbR!F(v$)-634a%Gm&Vfr)LiU
ztleKCAp3&YnN#Qd`t*J-v}W|ziJ2j$wnoI&dJTYC*-KSI+q6x+zIVS`o}^G80Yql8
zK&5J?``xZ->htqw!?ZbB6@!k>q{B_fZkh&(sH%;0Y%rC??42(F36aebn5L9orY3ne
zH}-dPhobA6Rd>uVdzmEcd9h}eLL(_OZ32Mx={@J1rUYG3h>*Q4Paou9P-2^6V&}-<
z?4AdJXHVYtzC5}A2mn&s<dr=OC}z2@E{DkI-)hzMlFb|w^QgEKqJ)@smrsZ~%eKzO
zOvKDWvkg&V67P$mtN<aeIcBz4uGsmDP0j32)+-|NWo4>5@5@fIKs?H>?5KTvD_Z&t
z7uF@#4PH~syG4>`HynBXwQgcxbC>GlmAKOkB{_EcxZ#|MT~RJfq}e{pf%i1Eb+?_3
zw|QHRtY$jKpH8nnR{_XeS2EQkV&=zGW6T^gij+F;onnu^?Me4Th;Kc^9y=D@*cBw#
zY3ugXoKajUZ;&Ia7N&y|kuvyk2I4cA9|1FupNJ4>3ehxELZ0B=pU>2`gOnMEz_0HP
zj=W@%lsfxjk(~2&Oar@GA0Pt(vXBI^;2{@&q#<`W(N2E8YbX+tnW{(!;qC3HD0BHc
zLGUgpmqB3*5sA?hvGc1UVrHkrHxrepYy2SsB-O*z^XP-W_>VsE;Wtjfo;y)+(%k*W
zF(Z7nDd9CPiJ1&Ic@}n<TMg{ezQ{H-<Wxl6uoi3g6l`8!oZAf8D0X;MCd|%jGmk&(
zlh1idIvG5}p{RSY*zHZ~?d6s~JT9-_DWA04Rx;nsLcxngft^hdfytHl8ketQaGJih
zHr6+dZa;iqfU0lsGUSyPdZ}7W>WYkqCeOrfX03@tUC{s`H|Mf0u!?}C9QrvTaKx@q
zNC2_R*iz74>bR+rL{ez$tOA2XOq}}%2ofc#gu*jB&&&ovM6*O$j7e3K?oBNvK?LWr
za44&SWZy#3rfCq7nVc&^vri(92@&^ojn<Ja#3Fmo?04HOATCZ5-QY=WIIXX?ZIqO%
z6tbO+0lfD94}nIL;6+nP2o~xc%r`#+v%K5oAP!MfQc8KoAND8AG(|%|iO|vbqNGU9
z<xLFGG=ZvZw_9enT&=Q#IVVRPY&Oyq0CM8)%4)LZ46G7MqA@f~)RES8%<|cJ0F#t*
zLl-kwpU`_Q$OD4&B_cTzRom}t>lKMa(qH-OKlgWj{#U-?D}LwK{oa3SXcf;f<QChS
z*a3o#=`zq=Nn;1-%@<o{umdOeaSt-PS$WCq1~T<cz)_s4@ZNIL-%zpd(Tu%ONeH2B
z8t>Q_l}K&S>H6l$<*TJrU9Vg3I5c}=CUV&bEXB|l_Mt2*V$PWm07^<RwkDz~1v_Gw
zoe1;$dr^o&QDaKJTx6p$L@Epcp!4G-BBU6Voq7NSbiOi(s#=tVFBjP<EIm6nRbuao
za>C=v#ArRfcmTMiliJH9@kgpkHr=XwRteo=N77sD!gx1WrHy`%hvNs~Icl`lt6m|q
zsHA$^i7;n|3=z(Fgl1}The`Mf-~3)}glGmaNvWAiNZzq?e)fbW#eGRB*v=OVDi<b6
zH4!^7V9vA5>!i<>Qk2wAb;x47@4N{SnTcbl<zWB-AOJ~3K~yl;F|65d5Yc<*oOiwu
z(HLV45fDO5ss<tT*$HBm_v}L1SOg5jEQSUV*Xy-&uC2EQ;FtiQ-tWC*?^#s<68nOk
zubalq&Qdh*ZwlPZhT?w+v5oOG1{DdRX6N7cIiKIwn|61hDk_4Yq1p3feebK!X~<gh
z78PSGibF>+Vs9$RT2MgjE;b_(fO2)3pr?rK_uH~soSr=}uz2xAokQeK+M}<d0a!|{
zid4%JJL(|js&Z&sG|lH6V{0nR1u-)_1IV$9q?Wk==a~Q;`?4aUa(TkeH@nLi<G$Vu
zhyC%t_4j`I7k(80{^$Sg@4s`t{f=+?GIHFr9>>WTL*vRtM~>_#8WF$zMtE1i_9QPk
zhT&Wvzg}l&KV80GWGcc9n{F?Q)%_Sk*lxF{r>A9AxfrHkT_h^1rJ1c$FxA-XxhS1S
z07Q1yHpBQV$_l_FwgBjgQY1C|UEWQ7xgd7g7qgQ*O@SzL<TXTD0J);-JM>1NSvV=j
zQZWhiI$q9Kh=?FXQM#fccI=#pY2FBDm^I64K1ans>U!|+X6gF?)?}SA&WJwCJRIcb
z08?)XL6{!-#Zy1KKK!~lW$d6&<h+EYt@pkteNh4ubjs|XhJ^Z;0(1;5@GFcR4$ux`
zqt%AMhmJ$+OhO>yyw+#&%^Ws&%3)LK+mVh9LqXBZ0Ceao9pHX3x9dAI`h&f=ce<b+
z+26weMk<AYs)|T%x#e#dIKMq~Kvk8P!JfBhBB-f|<{BtF=X1o=i%6*?m86|40AXKE
zzP7{PpX$WH<FN5Qx4AGF&<BG;f0k2oj)`&tfrK!yCgx*47r<;1%np7YM~TREKfpQc
z0B7QoxmVSR(Pq>u4+s3h&wKyh{XajNc`N_>Fa7$yjeq<P{l2R3FtV8DG>lgl%wI8F
zUrFuKCehFpZArWu>T$>7n&A<)=(?{aBxags`J<KsVz)!vG&(Rdz$x;oZw+)Bzp4np
zxkh4rGTiMDNQ7#gUW2J3cD`a+BXp(^(S_GtivT*zUDi3&PRnqTV|7OZP}QkR#+482
zH=(zLw_R*MZQ5PO^mMyovRKXld$C!V*TVtaA$|2X>2*u*D?Z5H=8>{WIwow6mS$$I
zs0y`3>6t(!<*5@xGh3s{mBePYZ^CK0T%SE^_Luw3({i!)<w8;d0AH?%@Drc-MBa4}
zplx@=z9^R|1xe94&s?<4F2h5ZT@=M6LuZ?vbFNG=w9O6;avBE!A&HqSD~|}y5hD3w
z(W#56Md`qz+3V-o#igo#@Pi+el(5|a;$nH4Wl<!CltOIwZM}W%^*4x|FN&MT|8~1Q
zf9LVCDwz3wAN+7xt=f8rgaBlw7w>#LG|hguIXQc{K6@DIU2N+<leE6tsUWF~a|zKH
z5xmdcO3Q{12$=Ozi5zj3SZl1Oy%*&ov~>)-YI%xC)pBL3_Z}>>HJzCi<qESb+*E-!
zB>-@)92`YLv(KX?A9)~&BVr5<05CgX&Y46H3io;Yj3G4AILE|T@AtWmN}as`K6>=1
zn>oJx?9cuD1pGrk{xkVEfA1f?`Dgx{pZe}U{1vCGswlXBg6NBd<Kk5<Y6pNdBt~+k
zVwzsXx?*rWiU&&`n`fHIc$!HDFR*6kNT<s?XVFYX<X!op<!V`#zUTX!nbo_?A-DGJ
z9s!XZ0(I7gF^D8nX`0r|+9)FO=suD2)%w&-H&5Rxm+MDoAIe4Y6lw`g4vm&oVWr#c
zTP6}oSzfAb_80GbVk#LEV-0}pPT9Gb1R%8aHV3dNS%@j6i?+V>zI3k0J7`;PG&YVI
zOfN4liRkR?>^gC^O#FX!S%zwg<lGSeM}`FPpgeHrqQ!M5aG)44Wr^IqP1u)M5DAD<
zy9YC3M$Uw#flwcr*{x0h2l+5F73)ufVC044#M<pMu$hk|cYPKPOf2W^sNFl*WgQB&
z&mCNQi^9RRe#p%_z}g_JH3@QU;;)VfQ@eFIY^}|M;fZ{_&1zYb_;yy)03B8sv%^q2
z+q6GF$*@rcEhnl|E5zQh5ocl7)YTpjbCpTRGDkEZ9;|^qgv4y_yg293172M`xIQVu
zBb&5IduIH)D{4E~=cv%<r8GUs9>`-~`6a*o8^7vz4IlfpH_w0INB{QYXWJ>!|6PuV
z?_$(&Q&r{$uadc;0nF~+t^e5po^Jl9Ys_kF<|@#+TMrJP6FTXE!@!UYOa@+djPC~6
zkV=jseElp!z^TU};G9h}r8Er-(0l^qk5Co~?7m}4tC&iB{FB$apXyFEl@8-emDC5t
zgG7@dGZ7JcBz`{T^*TcR?Q+fB;JKwX>vKhZZy;=%nS?sD?XC%aak4ypP(OZqS8q;F
z7KF4sdC>KovUh_d0BGyoJD;laCGPf5LrnKhDk5@4Nyzt4m!h_-TU9&1+;i^2<^UEQ
zGt^BoQ*L7)LZ-*>Ji%<mhvpESFW41%e(W|IGi5|{R1{9tvg5hgPSsM9vZ@|Fe3*~_
z<jGStd-(97_r6%1v`ziw$umTFSS(TsSv?s5vgmeEb?$w~4Wa3@e)#D1hmT&%W%b>~
zJC~0?Q7qQb$4!W+GoSa~dfqIBRwOw|mi5NWMB=m_O3Xxl@N!et*w(6&LTjo`+c@XF
z_e4z2I}tEQp#cC_l;n%2kKc6Ouhyrza=^~BqoE8SDHi1d5LE?Koi9v{*r{r}-{cGQ
zj<G5V@5vWMXIN+e;LAl0z0IuNoM+nyW?}~C3+IYw&z`A@YDcAa&Mnuc8T1q+Hv26|
z`lhe>q9*9y_}O31?|J*__CNWNpZczE{ue&y1NTLZi5`~K3p8%{E~FzQMtC*xJG+Bg
z)6Kai-nuS3?bAz6;*Wp=#nF`QH>4J0P8Q7`yzw~zRBz8U#i!@z-Z^#!BAO&qRY}Ei
zT`o?V{YBXC9=!H`Ky3FLm9*dQo$I~b5hccUzlouap<(vJBIbOBgfUzY({V-0xgw=@
zcK&9Cciig^meq-*;9Q%M?CY>ZHw7dCK;fAv+lF$nI_<RjZq**Xd(w|c=;*3};|^Bi
zD|!7_Cy_5F6n;w($t@E{GX>Gyf|VG|WZ-p}X<KiLYFRGUQ~mvXKXZIf^N=2UfvJh;
z)bkR=8yX;Z%bohYiwf|79NTvg5sp%iS&P<2-|FEHnv;T?WXvW+-z!YQu+K=w&cR_y
za&(_;?yhY%3z;X1&oC!~-@+EBYl!uIk}k^b%LV<Ay7GxnjqOKGE24?o+0pxl!8R(T
z4RN|n67d{VA7tfMtipIr^K6<g;+Ta@)5@_VGP$dV8Te%2;80A;=liYS@TI@^i#~Vw
zrp>PX!N2l%fBx@({4+D&KhDyg`{oxdXkBNscYP8$Gpx__^8<VPe$3FwXCHm#?NExJ
zCWEVMaP&S_d3tNlw(rk(Vs|%JVHipmz5IQz1U||Nc0{1=Dr{cCu-o3Y_eu=Uj+VcJ
z2mZ3YurGWvcPo>;$Z_0YJ~Ca=ay>W4DZ{FCNd6*6*%L0e3a)E8+%DL8d8M~29F|QF
zlt)qw8AOy~Q*WPDg)3iswA*eCw5SA;cblg~ob{dWom9>j-e((FU9$tE++9~mU{)<p
zRE4R|_zUN}E2?Y(Q<RmjmM3avd51&h9kDN~6#z&I`6g%VH8B(OX0s6yQ8TlB9hiB!
zTmx8&O@{KDrncGjE3)N;H8HX;5cJWbhpKx1>}gSyi^VFmA%vEh7VMWN_lTT<&2Mrx
zT<iltL`_ju>g`2`S4K1uVlLMYOy%;OPx@;4;PnpxK<JT^nH-XDduaFAxp)Hr#3W6d
z@`+ZZ7Csi$Dlbn&mQozb&~+QVsEBY3M0<A5`J&$M%naHV0qT%gRP-5`)oolX7AGes
zIkIEteNlyWKU8%yq9?R_FmT=j5+SKIkdjE$CRU3RL{t@nF7NDH>8QzK6kil&QHaE*
z-kzMC4Et_q_sld@s3oPgZG2JWXZl_L`d4oD?JxbxCx^@b;lKWWeDl}-v)}YDeer>O
zaE9GF=iy3+KMB_bak<Gle{;MslC+~7>$b1l@ikQ>MtH>l0wQnj;IiWlhBJt`-(Frk
zeX>|AilVr9{0ReN_8roM$Q2bLNDOToHoIN1Z=5@?s^wyRuianf5{0RGpU2BeMBje<
z?ZSKSI3|fn3ZDq!?9uy)Ikk<coIQL!6J&Fjpr{tr@+1qa#~5OiT=`s=OJ6P)mGi~o
z<o;`5u-`l_s^#MJL1zhTYGAMX%1n2c7j<2WC<71^nuh(BoMU&Z$Hc@rUIpxN|9Gv&
z`dy!m0r+`*cs!`wv_^ecnZQ@=hH<-GsngbA2iO^_rQWj-0IStK1dO2}Vq%wR$~o6G
zRRg8xL~hqu9$x{@`Sc8J4`Zrf!L*!&F|$qNbX7%7rn+26!;6`jh>5sQeR2aJN0pG-
zemOQk>KaQKr_`~H2#I-O<}&zLW;4w3r0q}`4CXCD?cb#tFNZxpSLBfTgF}1o=DX8B
zR@F37j<CM{NotyDX9r5bQ`XTz*pZ=@+WFw<&?V`l(#Bxjh7j6Ra`SckRUcEUi1t6u
ztMUXxz}`!4^>ICR-a0tZRUegq=bgf#vkM3vk;{f>pT+p5_)nYI_aLHo{3pKcYd`#f
z2h*GS*Z$W3{TKfGp9xW3B(%RND|&(Vzsl)}ulOGxzQ%zu|2O7#W4;Bd8NF;r1qQHe
zPcI$$6_K-<R~{R^_BtVAZ?x49DYfBocj{8a{c}g6(KT?^#fKhan!)(&GrcOS{xUmu
zjyP-9IL_SJ&bzo*`k&95=Qr|)92nmnFvs-%U#Ijo@tnHi1mA_;-V3bwcmxd@(xjsz
z(DdLgv@H_3o@$->aXH-11H$@B?g2R=M@wiOd&au#XJpZ3)PDY@E2?ZO@NVvUhKG_n
z2WvgV7>RJTT2|G<6;;lG%Bq4snaFc4Bh$L-FtMZ{DR?3TmK1Umv9t2)_9SHIi6{f@
zV^kNDa1aT-=uF>)*QAyyO5BOwnx@#ss8v<<Ija&O_puebLPTQh`g7iUb`CIP*L!AC
z6%|b}m}zc54C8>=vE$g*o$biM;22^WoK}fvxeFwSp)phM%Uo*DF5l2w7y^LAXeLFq
z#Ln#xh{cz*Jau`oAxmbG`N(;TB4SmEZ7m|1#dUh`UZ#s=pNhrmB-@Ca>d9$E#8tIW
zmHk_vN-1r(TS7ntN(qs2ekr1AhP2CO!T`{=k(eBF2qEie0~k_+n8QG$zSCo7F(xw=
zwU}a;x2eU@0-|$%m`J8Noj)ofDdZ(`QTp%u_TT>}|BIh^e7+st@U#EVM?dw>#rOTO
zk9_#_zD+Bt*_l!my2$i)Rg>uxw8K7q#sZ9PO?J1HkVffDq$%xvO7zb0$Jn09JC@yX
ztwZCRPuKgRsw(e`Ub0I=2mt6kJ0erDzBKL~13*k#ikPO9l9{HI)XX~;RZUS<y<_Lt
zIfq0n;+PRJ!&Y+^7}{NjV8~qzRf)k=GET=awNX$lw0kfCM3q!;p8)_lpJAvu0L>QJ
zgbZLsQ8?!^OkG3~ky0e**m<*C-l(2Kg_vtGrgR)689-)kyt|nOb<5<HyCA;6K7E%C
zLT@ZO6+5KdyB(SGh}039W$0*juo%-^zRCmMh0rpybA6<bl>G-p2M;j4@<dHFgCFu2
zm`Y~Gz|3OUR0N6Gd65L~=0*rNielu2JH=R3)v~O(s9d>-W+17m7Wqy|ig~x{Ow4nf
zN|fgSyMi60IH}=`W<$VSAZEEijY)ipF0qWcd3ORT$qZ78&S6*QFiSC{)Gk){5V38#
z7A_Iz@YVSuNfTnq4=95;x>5-{=Uf*6#}>f6&-NFYN@&F17iH!-_;PWCNIJ??j=I@q
zhM@)k=S!8;)*F%T$sgSN^}XfvM_(?g<yulyNo~Cg^{$wl0Q*8yG*!T4W<^<@K6pLH
zUTwXL&AwVzVAkwSQ>@mf#BQ-ZO)<UwsW)ScF-FIfm%QOogqTDOC;B*b+ZiIpBuNxR
z&494Jl5ASHG0Xp?G=lg;2#CnUz0bhF73*f7s-$G>k&yu4>}2sh-}==*@ZbK_)64yE
z@Q;4t$$#*l|JCpP&TsnXzv#F3Gj`nD?DiYs_09l@gxJ;1a1@-o%QiTHKV*4poe=Cs
zqW4sn#6)}O=AHA9=Wm3I#e$sAyk0N}A&BT|S>&)L&s;+Ej$_i8L?r7PB{j`sgF2nH
zWTxJ+V|LE5sWN6I8cop<b6Fxb`>EWTs>on{fWVHVi3Sjw+EPS>yb&VO^5niqify+M
z#!#miigJmFMOh#cSTMts1koe~XB9ht=U%d1nT5S4&1u9Vf=6~(>uO!}0-=z}9lm}l
zpq=Rx8X7ZWcGe@di8*sevNcNPL(j{(Sq_s%So~zF_oV3w{rp9W(KBR6wjPIBQERA2
z&1$W9R~eqWR7`saM5kV8mTlJicnj4Au1S~tN!|pmiNE?9pdCO+j$tL!l3@Qf>Lc%w
zz|cW*G(#D=e^9y2hJ!3z?#WNSE0^qyhzv|}LVx?adVnJ_5K)og(va9WS1>#33&n$i
z+LT(LA}PicV~jDM-V{5KJ9$INH1{t}HT&gug{uBRiAWYXRh9nRaQfAmD9hPGd_1eJ
z3Oz9yN1lJM`+v^$D`e_QSmTig%8|{W5A#P%)6o0%2kY<owy(N>GV@*C?%O~4=l{DO
z{_($=l3cq;+10KZw|;8<5@hhwqLkPCbY(;2R;Oyu`G34sDa=$wB!4I?$4-n_x|u>*
z!)e^syUqmDKtbwFUyrBf*alLdDei3Id^y%~p=VDV^ngd}%@KVz>p#F?a6c`#zRKbu
zUQvI(^9x?&-(5a3LB_!qR-(5%NdQniey06Oa;-i=e&X)r-u+><%@XRN*%#Gvu{;gU
zF1B@1EzDqhaUMc@@9h2*P&Xh6O%#p<pK^IBqeAwZ^SnXlGP<NBDQ0%OYRWq$IbW?h
zi2Mu8T9s?TGS|a!GR&HYv0OZP{FbR^xw6Y`QxwI$(^CW6KD&^l653pJ*=@ElJ@bwc
zaj{rVqj(j4eDSn!u5c7ZW0Kr}@WlcEVraB;7^kc>h|Mm>Sl3NiRz+E|^Tb{|nP~%n
z7=;;}H&ESfH)U1bzkff*HpP(Bp!Kpev+P#?^vM(N{d&F5Qk+>$-}_>Ha&NcWUS3?B
zot+V}nf8i+H*s205>+jVt}q)@+&p^*0E@!2bKd*a*=y^w*W3MNZ1=eqmlNL%Ad;@X
zh|O->H2ah^BsqKVV7)qNb{EiL(<#(D1CtnX6+vRGx0gA6lo%w%a(RNC;wxS}eeBp}
zw(^6sdtFW6m+VV0HPbxOm|d>y594#yhw!%FhqzxY7iHm!#YvY#fDwBnWLKz&zWK4$
z>DkHsNBIQuW?b(sOto!mGut<jIj&3)sjQayE1WN@#WE-5<6d}w{XO6I)&JR#{+(yr
zncv}$|F1v$i~sP~zxR**!AJK`oG<3lXJ-xXe5sl=C1Q7b-9a-MS{SMk0EqovQbMyE
zK<(3OyaCE@CIdbw;}KL6bo%wCDIpUgXP{QrvY&FduRby&67P4rdcRvPOCmbGcaMGX
z^sP@ik5+=2J$v?SeR}V~Yah6H_OuP>$c|jOTtQZNFtd~bfaU^bhI%<)h$NJ5I>b<e
zftsjlwOFf43@sv7%Tqu=WHT{U^d-2$x5-Q;29q!e{dK>2ns=gXY*~2cdftMm078sH
zM9vWr53H@bCji&XWna7!)i8q>>SEsAhHt?Bh@_O&VsDWQQ@(rzXm^{??22mHF{yI6
zp_Zh9o+4$vV#5^FBQcmM*>jU<dx2Rr|I8dxG1AZbp6@kG?6D;aczX+GgBMX~J2sP>
z8JNwf^+zgV(;oiBM;>5IAg0;hh&D2tTb;u+ghHYt@4G3Zz^2{3!-v-4YX;x+o5Jwt
zk4T*36b2H=X#UnGes;+5#~JZqNURQc5Ol;$?tuwo&^?J1d-+nF;%cTc|5swWCWxF_
zwmY$|(<A%C19aGUQ8WC_?EYMF6W{k>{k?zWtM9E38HB(5s~`WaKlLL&_lv)JaQU-Q
z+1-Tq7-;Znku{V5pPTv3eB)j?RUK8KbLC_h9YZf>#4%>VIvhS+JTM*vJa`K8;WUMM
zO-4}fgV9$?4tx+{LixdYdPX?YGlq8!b!e~R--}W<?u^wM?_odho_}tWEc=>e4sTob
z!2j{jf9LR1iZOeIcRm1py(<SZ(Cev8!?)oSa$1vt^&N}3T&U_;SfBL{bF}EXFmtFE
znDqji&`F^KAdl69qFNDi4DB7pg@}Ce<G;RMtxitXlA=iR<&s^I`NG7Gh<@YOKUS9I
z+1VK)nkFQdyPKLKF(a}{RI`hVi?$7){h`kh5ltaqeu`~q>)gX*SF$f2f9eyea(a5k
zj(xf8!K!lp_|4_&bai@vb9uhKyihYy^Gt|Pm7WO8YCV8QW2n1EjF^ZyM|}*0MNws8
zBt#<T^98O}%aipw-%oa)oR<{AfW5!D2$R#h%kw9y(u5?ctEwof#p@sVFaT^Xo|vkn
z(8F*%&T2>4?6*TBS|l<vk&7{kq!6VIy%vElvtD_2uoFq2dh?Tus$5njd(W;&G34YD
z0MumQX*ge+L1_2BsEV?aokJobx4V2|rbV?P$~6D%45#((BA=m(sadv>JG*y6nLc5%
zSlveiB39Llr;m%OEXxXP3}|Aghi&uZ{`*pFHy7us8j~29h^<!3)pD7;yhXVJfVQb~
zIhvWDY{K{d(EoC=ZI18uN51Au{^&P<P2pcb*lwo8?!Z!1G9;uZ-;>SHkQgze($isD
zU_kC=Pa}mU#U{3UiQ%0mPgQlf@Q&$X(>SK(qUajxMOl>V?dEc`xm+z5rOyta5JMv(
z>$BH1rP%I8^!#E|cy^q*OC+Kx$-M`!5s{=|syVlCzBB-dK_#ZPVPCQ@oG;n=e3hD#
z0o0dIh?t8--t#t_%kw8soFgU@(WJU4JR-C)iCW>ZYz6^>s+`<=bpQ1ah{P9iDY$M?
zJzkkV17CNMSyf4rQeMpSo+2qsTT#rOT%i&VR9RfPzys+7JjDDQR=00RFAfEBujVu2
z^-m7x|Bc1sqf;8?iY5fxYZ1NkRC+jpE;PGRJbi?8!(7OB>T!m%z)mN6T{g;+^*nLJ
zx!P9m@Cv<l!Lj=Am7-r)sT|uOYkx-W>0*o9Mc)~D*h?7O(0b{$#d|5Lx$N~2ljBtd
zf-X7kJsBoK!_%;_PZXwd0Fy)7wUOy0f4x2kwA{t-P6Ycbm3j`#kb&VuNp6<2+Ci0I
z(B(SHg2$U}@WI#5{^RfX`jgca+rUr!?O*ugfBHv0`WtV(8q@+@iDk$4N;i4nMI7J%
zSAy~%>qE2P-{#-m3%L)4r}0r{BKw5iK3T2oh?{@K2!m0PVbo~@JAkH4Sv*%QlQxl0
z9HF`J89+sQPhWSs8&@>25Br5zbPxM)bMs}8R8nkqFtOnt1rhq?kBDuqb~a$AksS8>
zO%^`Rv(fn~g*LR?YIUz#-P>P2t+$ueay=B6Lc3?@s^vWZOQD8=s7FM^NF=dU1C`An
zDv{NfxM%+6D=Nw*`=aM-UlBdAFRJyuX19rT<8i^hkhnE7)0D4HQo49{ZU8B!YEiA0
zs}R}@qlez@D5F32o2P0fNf2?dTu<?YDF#U~rlhKy%L_zIqTUzx&dzeiyx(mvFE>o!
zJUcTpSguxxC@I(kK$Xe$-m`b?i=tvL5)Yavx!DO|#Pr&u2fkbs)vB#G?SAXc9AH~-
z0iaslL#7+n(q^}7_S=W=`z&G(O|2?nzj1}ndwU9vnMz9RJh5w=oup7M)&SVlyOh#u
zwa&H`nb)D3Bn2WW%aSNDCFdLfwoRiV_a44Jt*H{TFBhgd;A~ZMX4$#DBO*KBrHPV4
zvnTfKT!u1j_pPa}fS7qob1cebej=G69NN}#*lhQ`Gl!Mc$_!MZsMc*VXc0Qd4m%>8
z2~F%SpCHm=xylrywrO^|Ei)6l5ZV~EX)ggFiKyD?y2?GLH|{UK?~i=-fBK_8z1bb+
zg}?FUlkfh4zw~eZYhU$^U;CvmgAvP^Mm>;|&0azWF5bt1_f>KkcUZWHg-AOUJrxzr
z+hRr`U8@ps>wU1<J=<SC&0LPsGk`m}|EMUcUH$(#9y$tWDiT{0LBxIC?CWN|DiN@5
zLQLuGwWX@KqEHc$=zZyYfyBfd+I<RbX!qCy-!j8zzc~j0?<*woMWrgS*-G-vzTRD!
zsq;l|#-b^<85&NQPS+JqD5qt)M4}UNfGDvQk^O#;0A=a;<+Qc08#!0|@XXuN2XFg~
zOCk?K)q}ww+C7oWMG+(?s?zMcNSr+qIbQ)nsJ9jycXh5kGhFFH`q}qSZ`m|a!)ft$
zywPJS)>l?DTA>f|u!DwUSJ$8O9kJKTp6MH9!$qURUeL^v_3FDfE|+*T1~Mnt%%sbN
zW|eCroPz?goeB*>puu6sD&s+t2(b(&X{Jd8fw-ghS?;6>!U4po(|LlKh5dDx*75y2
zQ&S!2`PVBZ&7Ql8kjq5iK#F1J(m4rwJ3?Jow^Y$dRi__1{X>|_Pv_gN^ZE9%H_xL!
zTP&BI%uRN_(F6b@24?Jth+R>FLEG#(ix)8G(mDcOTwa*kqAGF)b>hc6t2L#VB*l<)
z@ZY-kc-KdJcDdOWK3h4OsS(rh3e&szBD0I3-Pd(hRb^R)woWl-JNx{+R?A}Aeg1}j
z@pu2#pZvKip-KPskN?!q|KhLyhu{7U56@0svO;=Y-R!2e%qv^_Y%Z;SU^ZwkdF<?&
zJXvqD*EJvGGln%{=<!}?wU+<@AOJ~3K~w=|R=rJH*ETk;iSmK~eLu!bGiNMAhqC+w
zf&mhMOr~`*HDetM8NIp@0!$Sw5IaFjW(GtP8btQreOdP3BCo^AYBK=G2-NS(a5#|}
zF*9?WkxK6>iAQ~G>|0WH{Rwn51Jj}Sm8BLC##NA=E2<@$g=R}c<#L@V-r1kCsFsM-
z$vSt#lTwN)w%!+P4i3<&2!zz{pkswiQpni-VO}u%;q*>V?>R@!?jnRnwPOPu;9rQS
zsulo7ZNr2q1p_5QW>3r^G{e5jTp;SC{Z7n9=7{A<lIw3}RWY;ecCN>Fi7F9Qg#!ao
zrOEbYY9bcf77z&00G7)I5i*mh1!<T$N2bGL+U@tw`6V%ci9}9LB_SZYA|(lNhi1>u
zH_V*#)pB+D>>LpY6u^pdLChK3DJcMes<JC`AC8!F9e^EU@0Hj^Ii?H_eP4M*$vxU(
zY0knQ`OQE1v;XjyKKj;g<w^ViuRu`0fBo{W{kz})!~fp5eEskH=YGd9ji(_9zWRmY
zIr+p3Z&hlVX{iR?Fu)tW_Rf2~sTv{WyegP27K_{k1^^KyMq*d^LQBbQ?6NArtO=Kh
z(AL|meUW1<L_v(u5pN2tNJlAc%-Ho@;gA$m3A5k^p!JFplYk}=68rMHjeLw^bJYi+
zEK5XS$Apx5S?@}b(G2Iq>E@^Z8MG(cv>l#ec8kPGx55`y&#%q8E<}#IB}i4xBsLwX
z%Av~zJsfEGlj%1^!PniRsS8QZ5I_K+&i|LEip#{VAkL*%az(jZYf7Ccj#*JwW+FXt
zf{@4;A+&8%<6(PmjLzW*Y@J~~)7zDq0~zIUdhcEgO|!cYH4*KI1oKUvh^oZ`01y)N
z6<}uag?B|&*R^Vw(y;TWq9)jRJW_T=FtbeN&0gzOSvl`RQ|Gd3X67+d>0L+?qaxW5
zP-YHN2rVLJH@n4RnXfuX8`^fUT>GM$)_!;Uy7Z|me0TZmIHg=mj7`%t&7$(R;VL=r
zn3s<qKUUS%q9DT4`>*FRud1XJI*E2dVu!hMBniNndFZxv04PbBl-E0vA|j@VV1G8U
zhgWKN_8I-!?3zFGL;ut7|MGw4JOA*%oDnqBLYBRX74cnV=$hHU-yn9x?~1>vDu|f(
zl$!`Dsj4b7jiJqjbZ<cHy!Qy|i;A4jTy@;;05H^BB$rjtR8&v^6p7gZJMXY)WjplO
zQwm6wrG{g>A24Fs<T9%ijq!I3#*STaHG>OABrpP`6p6X2s-cm2pcwZqZ5T%lGklk#
zqW35V9M}91n|(j_Mym?v%W(!t%;q+Oa!@8-0RX!K(7B_VhDQ~ZD_wwZtjSEkCgY<R
zK`GeJOz7hkfVorDfQ=rsI)^&j!MAtSHtn@7jsdht1Mb5n$QUzFl^g?3{m?rlakJ6E
zyz8zbBC>NRY9KHexD)5?Giw}X|0-fe0Ok%}F$fHrsrKgSdcaHQ^R@$!(81kR%beoT
zBHJ+&b3W$@{I<KFy+$HV4cw0(+3>t*j<CowPT0jmIPwiL32b0;caH$*AbshpscJ@j
zKiB|7BrgEZH%k01^IDX}7ku6ay>p*-E6&lRJ4`gMK*o)J@i%v>ZeRD+tdMsV1AfNy
z87U3De}GPDF#Q<Ju!g?M3BA*OuW4$|xxtALvY>Deq*CkHbvd=j@QCg>*rlzigSLqo
zfQka;%*-b8wy3JV<@^Y*k;1v{P@I2ckeNN$!Dc__?pt3YJUET4&FKID2S-*FID#1F
zGGi7n>~@_AQ{Geu4L9p`@W^>)m*rR_g`Uuw?JUNF57`4`AAr8sNbK@Qyf6H{B6ILl
z4`fF`o!H&^#k$#Vcbm&<xhfY+6H%2(UJJflND3*oW-76j7-N)_Y47Jxx6hv5d-!^m
zBSFMR5AU-ps`XhmbVg<(ZkxKP_tmN>s@3bOGXQIM7ZO9YIvb+|gw4gXciwsY@U{2d
zKYK0TpU~`8Wpn<{ez!?#7Gu4AW@e%$AvJBx`;VxanRj(3%zaIsq-sgDy}V3G9zA-<
zgekVF>5cb)5E0pzs_F9LoH%gc>`GV`)pEHcS0Iurie4+y4gkc&%$>ljltmT@?ImgY
z`gmEbVvJ3_Cu$KuBxy>ElY0PI@3tw$U42;;#r^yD5iz^Hn~JKaq!44>#%1XdF~lTh
zO?%EvtA#fMz<<&sfq(k*KKLJf`$yh*?d<j)zE@K>d*02@)aG92`rxzVoQER?3>6vP
zoJBLHpGq<0@%BP%X9($X+bkDFS@2ZYC$u~2ng#moatGKDL02VX_SLf4oM*Wr0O-x@
zTT?3vR)v%_#x3l&*@I$Q5Bt#Pex9b3QUJ4}#G+glt5XS$q_Epww)I}r%pmO=Ra-3z
zGuiDM0Pv2IScoah`(;0w&GyOgL=n+@?|lWP+s)+)uw0(Z3IG#y#c|yK+<`H?=Rn!&
zmY;f86GV3ISWfSFMY{Imz8JR56xs}EkQjPHjLtJP=R52R0P9T$872VFtkoAo1O0a9
z<{2M8KM{RS7JlH;e$`RzfCGS?7x*-soaBXe2%fjuDckr?IP8wXK+x_X%QSny6Dj;Y
zEjuLUPyOgRZ~D%O&|p*<HW)=Nq2qlY1Ud7(8gp=Khd}E&!l>)F9$6mt7Vp@FF|$D2
zW^vE$kuoqw%j3i9nGq9I_`nX%$@)};Z!StOBO0p?QnU!5rbFuZEnok|qGJR2^z>x8
zT!m(DW+^2z+c&{ET2_UbZFUWI@LhIH)nZwei_PUTGxgphVzoN8UUd8L8b#DpG<6Ey
zqWA7U?9As>Hy7tcQ5I#DRg&3xX20L<0IaMQ%)H%PI_Ju20cJ7OAxYDw<zlf|bTzL1
zZmVjdVrGT+h`>yM=zaAI|KOAV)&KC*SI=#tf8!5)`8R*vmod?2=q~=EN#0%7SA-)0
z4C^6uS7#eIP<_az;eY2&qP<B893~XA4A`c#5^iD6dc2EtIjarijvlTt9P~wZof~rW
zm)yN>%Kl%?P=UK6l#dovm}qAlLL_f<AEs~rYk%%LCZSv;azlD|93u>-^N8qtp^{Pz
z9m&CYB2F1gqGD#9gL(J4gvedvkXd6;Nk|Nx*p+6b@57~eSW{K6RRuF6=PC0FQk;&z
zw%&;(LUcuS^5A`Duz&VArr6fC^WJ+`RO@1~{P@RyO;sK|d{ma@_Tn+IE6Syrwe`lA
zi?UjWb|2e%BJP5|sEAx!Z+b)kFHasI0ufzYJiB=IY*`gW!Ff`Z)ry?2x99ANYI&-v
z@4Wq{%U$xWh6-j-lnX?1z9i-+Z@*~<ZOkg^wp=bw*6ZDFzuWImPS&gCa&viMX1R$N
zLS%N;Vvzw#MY$|iC+&V4>TTckWI$wBTz3z1)F0bj3T-AZgb+mJ;p^|0l-ha=h}H5m
zhB`F6{E@neAr5X$sH$J^yT3Rz_2%hYX5h=pmy2?-R!O2#lvO4_sOrZ*_N)8N<?r~y
zFHSKu`z;_8<pP<RT)w@{_M)w~zFeBw)2B~D8>TDZ%zeS2@a!0yHW@(a9Z`o$Z9_uD
zMLB92BR~+1QI?elzz~zDE=!Mu%me@_b>-_^Em%~(@Gd1WgM6Q36vV9VKxMhAn|ia^
zu2-w&YMDZtQpVV#D=H@b)LW0e<K?0t!e9F6lRx{H{$_T_I(U878xQ})AN|PZf6g0s
zUbf!L4eXlu35&A4!|JKIkM7)10yz)?$mt_9v-3|Lf9lEGpITH!;j?1^F4p(i`PkN`
z(l$F)+w7XEDwkC`T{oMyHM5XJl6>&9KZHodV%2|_NDL}s63G`xom<Y+C-1avd+($|
z<f5o@pts-G7nhfd%9n-rMaf)*b`M~_sED|!H$*PK835|Kx!i23(wBwvzH;8T&2BKY
zKEJGqI%nYJqNtW9i_?ej=~p0qNlFjTs|7v4(BHj(jF{S?a0tFAd*q#{N@(_}tvi1S
z6|gMw(9y2iX5R^s3?3A!zO1_buBkiPA?>*v`fZ}O8|^};3Dzt}x;ApW;Y)if>gz`m
zPIJb2{n!R5$JGBCM`|$6#|4gbdK`7yru^~_E=xqjHc`=@OL)QPel!L;LvIi#71!C7
zPx%;wMtKi$8WYwRF0R?EJv?(Z8TH?0ssLR`JI&LzC-NWh>N^xWj8x*WO=5kDja^^I
zdQ#1hRBP`DHXEJY5h#0!n$5TXQ#gB<t-|0(X<buij`8o?%s5ELO==1_<mg0KE5na+
zYjfR+|M#PB{or5z=__}^Z}{pj`Sx%6s*G~_$E@RX+r)4L6WA@H_6gj;@F0l;>~!~V
z;zuxDat0N|>A{9UW@;IFYSTe<2z%&23oy3zvr6+U-8`0R>peBEYK7%NKZ-P7b<sC2
zlAn2_C2I)3+-S@BbieNDtrNea(bK<ruVGa{U|(cXbHAt)%tST8mkTo!NjX@XF0-1V
zz>LPOlCTp&9-Bsnm<_Lovms^x?uZirQwg{0mhpV#f!Zi3fh3%ixic%VsFr;v5<{~C
zz;bayp#ift#O;22MnzFBog)<s^)|J;qFiC`9Gf#)iEWB0M#*V`_X|Lf6r;9fxzvtD
zYbiEO)9&{B!qL5T)rNGjsqdfN%U~ayOdSMRE(!q5hD~iSCL)5Awg8B@1;C>4YKGLE
z1|x)aUli_P`M{T@FRIJSjjF^n$SRK3IVsdBwmA`WMMchMA9nUW^E3=hQpz@a-SZ+s
zBvnZ<ba7lth`7CYr#I?@XP4W&kvm6@Ia_m_o~(KZjMdu<)im^dV_RqMMgU8pK_pXA
zQ<a2Bo2PF<=iFx7^S515xT4A_x2h03Uz7$=mIZ;{d+<g|vEE)z$3s~yi)x`Uh=gjf
z9QJ5-UR7gk5wKjYQ*1)B_eEzvDUzJ`08oXXlFnZLpr#a>9Uz>RtJv)7-NowUVYyt#
zw$>DO^`)v}3kFaXPDJZA0)VT7sP^2S8HFyzHpO;Pc_RFk-+1TG{n*dMbSRy5vZ}uO
zTfXl1eBp=5p<UxmcAbd)E#sVNqv+txQ%RsJTTstU9}g5e(~Y$KF-2epW+}yKl~Ymz
z6zCmuroF>lcACap&Xr|VW|1ICK~u=GM_I=DL!bNkv8`jXC33xb5v<nE42saI%5L+7
z*k!GTQ194z_ET$k%m>UTR+LKsKxQ**>MgT-^zcE`G?&|Ewc-V5rEFkdF#EQzl)wSm
z8H~O6<tl_441Bp{b{CtP*`KUed2wZOsxmY(4ZyjpW1|!!F%h|${Bd3_pC^rdo8ffJ
z(RG8I+jNAad3&PsE`13zzJruNVo0HF>+QH=XSwYz?dt;e93nHjoc8##^wm;g*7uJC
z2GdQVqg&KW4qC5v5XacT4s16S)a^Ef;M=99U1X1QsAUE^4hWIF>E_g?57WjdvFrLB
zIJwWQk%lbLzyK79P;Fu!-+9wf=ecTQsyX+WAw)gUMC$_CZbUINj*zv^(VY;otxzv6
z3|As)%?wPi4`TBBdyNFVwx@!fKJhf>91JncOj5%Bx{SK}LW5pfCr@l+xHt9fQZ?)f
z=Dl!?45rbYgVh8+*Jas#%FE2AdN3e~h@CS@D7m)TFYZL0A0u|o@-XPS5dknE0Rj<%
z5wp*S${hJb*;SaF^Adw0%@BT>Wvylair20?*58?5`{enb{mVbyhC?rfFZgXA_}+i}
z51gG;qd&~m)5G2^W7X^HI=3m7+SOUj-J3lVdB$U7@tI6VU;ohKZ_WFMq_(@II1%H>
zj~mcb4Lg+#RUvZ|-G_;%(yY~uLlq&@;SbC>pDXXzRZ{=~ZK5v-!$j_{ZYmvp)dR}r
zP@h3bp}o`!|NO+RGd@Z%wH)sxh_BkY1}6k!zyy61+hGo-@$BG4cu;~GN=Add1#|)m
z*e#%--7-oY)hrLY*=mTR!*yT&($UoG`WcwB;HkU8prV-XMW>}Q0c%WDUPk5vnC>?h
zfI!Se;i1z@n{5lRZHG9b4Jlu`nKGlOhN#)VGkX=K{XXx0h{!H$=HgJRaZGL74(<z0
zNY2m~DR(S7_jw|wuG-d>3Fo#F1~9a#ET+tT?1&sh&ikRRtI{QTc@o7Kl8B_lE-SDQ
zjFevMonOdcCbNV9Ng^1;B$8x(ateq@-pqVcONyaw7R%LQx!P|xR_~|#Xbg>+NeT!!
z=%w}gFW8SOb<E~iQbZzSX8<$GN_Kses1oxyVn)qQs=hF@IJO)_Qv}lyHKl4`48CuR
zf~16izNpxFA{K}$l9PZCQjFmwwklCo0I-wh0!X2);UbS)$D~~$7eu?Ln~2sYr)}Hr
z_xlu6UDw$SD)$<*sMtq8{^SRL>}PWNIDP%AU;BH$^$&hIbEb|#u95U4^p^t5TnBUL
zks8<hX^fh$O$QI0*Y1X=upWPYc-oneFufaBwy_Dy!e#K$^!K~{o{+pRh)6YMJe0-=
zkbF_F^D#>UikMkU;v5uZCyAbA(ei_Cn<gb;9K8%A#k{1cY8z4#aL!bOnPQBpnll^S
z*F<d_5>Ymz145KED34=oTS?lq(M+T4>DJuYE;q$l33wDP7;kH4F&zd~2VbPmvw+5-
zw{pZFzhN^Q(vMM*^~SOE3h`O7-l+-@85pPyYR1FL-|=HqY*tOw%vL9M5E?McZGUHj
ztporJT!>@g=5Do>gSaxwG=mP_5j5OE>uT<!3107T-HVrIk+eQvx)PoPlc;QR>uI?A
zri#Es+1~7G>p?_Ba%#HUUY1o=mJ9D8JGUOZIrP33c_W10?Td&)jBQATkJN317E;|+
zcM;1XY9^m_zaeG|ApigqB4Qgv4Hs21vlxY$nUI<0DJZ6-2ioPiu-40GSa#$kMBpsr
zN!eX5ga#3eeZEyO#-?f12Vz{V?<0>A%m_G$jvnS5h@EqrNKC0*tN<xvyNms%t@oNj
zwOFpt9*U$Co9TyBXaP(lAyMUu6dQ>FvBF+t01yGlF@bSPftZ~ZdB!4UgAvV{x}@wP
zoi{?t5KvzfW}VbPUMBJeIkkf8<lC^5LsE%E?2C%nAv1uf=DZd|j7`&~(B!IARuWN7
zfS6*NV&i?q&U?qIn52{38`_5JlT)+Je!ovCsS5X7c`g9H`OfACf9z*=^^8=oUY7s<
zxBM$#`h~wOSKP<NZb*GzVj~<1m3Ec2?@jyGH6J`Ks2(f@cUZdgs_BVH#GDs>y<S~~
z39B-1gajbNne6s;>HXr~DG_OwrZo{U5oKR^_L4Sc*;(3}HWmsCNm(rxdhQk?woS9E
z>t*QyQB46*B&b?SnwJ75%Zd<86k}?d);os?G3@~$CP7pul7lBv9qv#Jt!mwdXa*3{
z?KcVQB@7Q6?zb_iz(W?6si+9upu;|_y=FJ$w^y&vN2A5wWdR2;ZR<@o-sz+njjsI0
zgF%%c<;0Ge`&^%qC`+szxG8oNa=Za6Jf)jV5&X|D^BxL>4`qP4xdhx;UhN^JS1~2~
zlJTrRo8N)6a$r}A%mjt5e$mqfw4d-u)DI3E%;<;+z?k}sv-@4=YmP)jMmDX1%rg7l
zqOU8%bU}vd+*9wkHjamW0#}U4p%BPK4Ad7xZxO<Gz6{{Z3^5H-n_2cEcRsq1QRIgH
z0Rnb4)vFuT<6majr70JsQw7Y|L!&R`5&M3yg22%`ZLH7^MdzV1fp9<o$4R*Y=9HfC
z><Q62cr)}?*aDzE@3V_$GM?yDPcHw|U;N3--OMTM^FRBw@A<br^4f!wYuBLnl1%xE
zkovD`NxKERXM%0X0P=qD(BL97YD@O1P1X>ZJZ*N4m|+3}=woc{>io<INTg;mNRpZv
zK<o`HI)Ii9a~Kf;W0GNQAtE(E)V?*57q~RYW97na56*)5N;Qi4zWRs$Jae9xS6IX6
zRTrK=CXcX6I9WJ`anLI~Pj?lZuLyWkI%}HsK!+=K+wF!OFBYo_6-*_?l!EgG_pAoY
zT`R=ig?zZTc~s3-kx?<I4@^{Ij>0m@y4UgMzM`e<iXkf>F)ylSnl+Yl>^2%+!+_YF
zGbPy}(R3tnmn7Lx1|)W!)Qf70?aBINxX(q|owKUO_)bw&)nXk(onp&G-ceC5h^S)D
z$Wn>v^6~<as^v+cvRY|2O|GiGX9j@GgtXniIqZUGXJ;ZQ#a6{)Ox0ppmgV{RxrmCY
z86;5z9E`2S43bn;wOA}}T$K>XxuPtWYhQ26dY4k0VpQ!#;BE}qtJP_>JON}gwa1?f
zO%2GZY4_~0fq^NAc<&^&yUQmM+T&@1$i67RY<KxiuC$0Srbxs{EGd{-6Jm@pZ~Xvu
zUXj>&W+!F_YN{eJg$5Csy>mrVZwGY67<;M?4_zhYUzllZ5s`dZnOSJ|-~fqI4A$29
z{I1-eJD-HC`3Hw>s`Yxs&TTHAL9Z6Fy?6%zPS+K4!Oo`?B!+5n^5kOor~l&LczUs)
z9^uQr@I(L3ANtCB_fM}|-Q0vGe1}BvmS~roKRz?ndWmDcC>BFf5=aLCA2{N7=inyA
zCbavrN1ug6v8`3*bX^f~-l1Z%>uZt*i1mJ3@3+%r<&F1$U}!}T7^N7R6dER|3U~JK
zbwsMS=P8DAaS8}TEF#<eCz)|k`4}Z8DNFAh7Uc?&Tv;)@H$VQdL2&rw-h&jI*w(J7
zoG+1x*)?x|QbkJ7h*%U(R5zPT09;lcnG1w2as@!dyZNo&{2Gpb)8jCC$>Ddm(K2u?
z0MKl3sONr3F94v~J`)MK^qol*MYYQ2f{26}V}%%F3)U%D9})j@2%8|8L>p2aH9^Vr
z3A+VO$IOncBwirCxXP1ywl>@K2_#OFxaXK#+m#2wu~0t8WWWgg8_#G$V4r%6*|44V
z4poy}W$5pr;dJ92t<A4EQJXnIX9Mm-?2%1K{!>i<kV;M(rt_eu+lv+KMs(5@Md(@I
z6f&j1+mU<V2wr>lk5CW8ITFBOnZfMJBFtDDxGFQgVXWf8Sj$=b)RJ+U;v66|=6UNR
zU73sFVQ1XfJ(+<KbFtZf|9|-t?>yU05Bia>_?_SQRlmzSzREAHzXR_nhs<tqGk=p`
zS1zUl&b%YE%tqm0O9>-8>8My|{USEiGa506HZ3J695?O9S>E9va=};0u1GmXrqryh
z)BR{O2Twcz7`}8Cj_*Y(|1L#GGqBR+dG*LA>-}AaR1xjS2@{`FjGT<H{6FsO!K1N|
zsy*6}h@H<_VE$BR4d2$1;&!t^gw^^)Rj$Os`m!S8Or`7zUZx@{^%(A%xw88I$$OKS
z$+j&$XsxxIbE5g1%-hv_#jC~?wuLRr$TFSiEFp^lk{N<6gn%&&5Ms!L0V5_zj6Cs#
z0V5=Ym?8!YKnxhzGDa?{jO*2Vb#LCx{Qo~9PP6w~i^1CGoP8qV&-`zb)ljMTuI|l@
zKQiK+efC~!eH|bQClwJ+X0=_dH<_d9K$Hq!8Rxdo*w|_4W{*xp63HMdC+<m@fkf^%
z|LMOnbcg=<q^dcOE(BNpI`i%2c`=IWm?Q*N&dzzFeba(jI_0Dxwg?#7EsK~llW+;r
zE86PiUSMo@&ei!6@^pCe-Z@9@W*g#W98Ra>!`<B-02~g7obztm%opnR?!I2oL*J!w
z?8hts$8MNf3V(llhX}%HJdMNYiHOMg{r*10wm&_BY8@zlb?Z62|E4=Uw40p*o=)93
zjz%O=&Z;u>M<3el{vOFW=L)N+Oq>D{72{*`EAnyvvZ+6^^GI|$9z=wh0d%w3kn_#<
z20(}76Nn6_M?^P;fvAryBAM28yT2FaVK^4TJ<E{trbR#5ax$kgRM^xqAvQUu;qc!3
z=zLIN5wVCqi>%|EChJ!n`y+D(K<}gT5gidyhz?B0GHt=ZJLB5GJSuVEee6g0&;OhM
z;TPXL%pW5L_aFT`f9+rROTQ^1q1ncEt1lGGy`Zu-3})68+fUR+XlLGL)AZXRc@?%G
z@0U?F_=U;ommK;Ro_1Fct@AA<wy?W5#`W+0zrQQOyKUp0d;i$Q818%ofN?l_-)y!w
zNRFHr&S%n;?&-amduY`p<(zXa*1?DOe}IS~ZkqOnb1FgAOOy?mYnqM9<}fD6I;QNL
z^Nv*Yba-0}7A238i)`33>+1o|?)Ehx{pc;As-~fzqsnY*!ptT|`7pNl^2zxR<i%WF
zqC}3OPh-~~pHu}zOom~-_0&E_5&rg<KW}%t-Tux5^{OH)A+`m%C`OxxZAsrf`p|^9
zMLb`Dc7MHIG0erqCVPc$;Tewj%vgCHAEPUc#hD7bu3%nJ$zFrUDwO9VeQm8^Sa{ip
zfI87}$cRE`^48^I=(?3W`(Epfp!ii^Nu#+AzG|J8v=)xf{S9KdIcs2csg@Khcilb@
zLM;ZL&BW`$JIvw`<9QqD7H57FNPUA!507}M^sndgHN8-u*&J1ChpVZ+M?hH9(Y3m}
z2y;<?R?-!j{JMQqUDJ(qx+%*jV&TbED}Cb7<Hyle`@E-a{4f6Y|Mc_f6nu5F`A`4d
zzxHQ;^QTMG_ffZsYe(Hjis!Y0;Os8Ihnx04X}?O_Haq-H!J}*chgvSJDl$>&6&BA6
ztRhd(Je;ZGKhA&C+0eMwP}X(}%UM!y1zNd6&z~9ahnbCi2T*Ww=Rm|izH@-fV2mm7
zpmHiX$CayR^&?29u6OZ^e+AI<^a-TkLa>A<qbM2UcIci!0i6SY{mmU9h8Qi(yFOqh
z2kk*scXyxLP){Vk|AXH%+pV02oW|H}ToHPg0RlM>CeHvMa+7_W*}bplgtIm?r^)5}
zqDYyh?aK}!EX;3y{{N^NwxocloH-3?JgGu#_s;uY{^A!ghTGd)6@^1@h+<BIrSZ-0
zpVMF-a#L95t^D!;03ZNKL_t)j4*k)E#=O~>NADZw!#JE&jjuJ6SR4RY<hs32PNVa_
zX?NC9<(xCG_`2h85&>p5im7*@x!v%?gNp8UTgzk@;r?_40PkJOxgYX=zu)a|-oJfw
zI-M-SJH|i=?e<nAr=bUg*zQ8JX}34FCcFzoJ~UeZ#KQ>@`{Uz;%g)!4$G#WNT|W+E
zjt$JFqs|9W;XESJW`95Qr|x)Y+D+4La!xsoF-BF*+%pJsA_JRMIcFtB=TL}9PW^B?
z_RWTgG>?NwKAn!%=poYn=C<qmF&#x%B-`oIZ1yulr-r>uH9_Pphs*g8Vq-3V^RxiT
zwfj2&6yZE}oW_^zFy1>6WftbtKlcCS-}#?^=jY$fFZj)0{p>&aTmRCl{q}S`AY!}O
ze(!nU$1s(3iS7K7Y;|?ID6Al#=pg*woxz7y{Pr*7&>tV)HEkP0yuZ6u)ie&{n7;h-
zO8_83W_f(-c6-`4o^wt^=R@OS+aDiP)hzXy6OoI}1^{wO-bWW396JE1`Tu?2sVwD}
zD#YML^y$z~pLm=<`R&a<gkX(9&J2jqgLmXT<vf~cTrrkWFe0%%kKQ>%I33=HxQUya
zPjOR>MhjQ={SQ=E0%tnOkCB;Q;^lqymvK!HK!o$q+jvEpne$v~%u9U=$|WQ;CDpB2
zc$cQ2yugLV0wbYFrwN?{)yP}ZHCatc&b!cX9?hE@0sXb^iSPp6vtkp~WP$|6*yZ}g
zEo?pOKM+u9ib5$d(B&LDLroB1Emnm!Z|FPSfb&|iB(P^A*{?A;J3A4{naUoKbhhoe
z28dRW(QNmv<!WFBi_IT<MTI)!wa?oBNxQA9i25q(UZ--{NQy9v6m_AVqXkD86fD9y
zCj^Ix!l-C`E3u_!K*wTMG<m7b{kf_sBi*XDD%teKk6;A_+MEE@1}wU^2gUP(WpU-6
z9@I(rscTERiU55jGP87_24u?W37qP6P`v0P>wzJaHFA}={K4I09QnWcZ~vEn_>bSr
zzw;OW$)EgZ|NdVm9j1&P`a?Z+@FkO#?+z*cF~E-I#3CY^nU&7DrL57}pLnL-krq-Y
zO&z&T`(^=CRuhO)F4V;40#k{o)PnbF4zz{<Ydl%ixT{k004BNxS&u9FNiXpag$Y0T
zXR|9JDxg3}Vj)G76~@(tZM!ATuff%P1`ri%HaO04P0IzTIJEX7em&VkRS{0AQuehf
z+2CySC!8;R0Ihr=L{-RXEKr|FjIDD45y*KT4I0cBY<P4&n#_&!Xlf5~r8Y3mq4Vb%
zv*rae*{YQ|gvlA8uu@G}hN?==B6)p?-UlC|^YQ8FNmYDggk(LILFH}qF`5YzlJmB8
zllL%7d=Q=YyWI`|LKBGm9DGPF_}FTt%W0zb-r04xLAI*oWC+Com~g`9&3z3K%?!*O
z?~I_&EJVhT)GF<PoTu&09jL10hQ#?8yyu*P_q*-Zd53_G&~7i5N(uoW=dn9HSXaks
zw6w};G^ow?&Mt+BFbg6hj+wLVNC?o6BOwMBM2t-XYIA=g=R;^V+g)t8&1Q>zm&d_6
z%e`-eWwULOD8yD+j*sui4vb2xsv_pLK;&Ri5bHSh#tbx0G1~`oy`AeeIaAdvf`B2U
z=^0a1O<5FxK<1&WsS=q55C|cs#G;ZCq#R@Pp~S^8W+A>jds62A`oH^M|NifOJ^#)>
z_ZNTtKmMElS`1<6hw3vA<U-MPT+=Ck2)n&Rc59-?Crvgs4OQ_f2GEJ-t@1Gn@`v_S
z`Hl`-WvowVO7?Ng+wGQ!d<f)R8hb>vN6*<-V1-`JfP)A#TeT+u5SlF^`PiyR-yM-W
zsMu;Ha)4x6Zy|)4u_BypGzAKxWUDT=n-H6vMg;I7l5<V;a}yInBt&xNCW9{6%>8K5
z!6ItxigD;c!NbR6uzpOMRJE3b`9(GkD*B9_%}b}P7wY>f+#+GKWwAotmK-{F>D*e&
zDyDp0sYpoHw^`Xzb^`!xHv4H)DKrA+!M+r80)>^cU!k=WktwZ#H$9t73SVpuwqhoc
z1E)d3<ewUv*3L-hymPB~vuXrS#rhAC^O*DK5r{~E0MV>X$@xjlvw*8Q?Q{TYvdYp!
zl)glaDFX=Pl!cikHa;{PI|#?j!o1-u2)pfex-;4|A%^HfL*$)AJJCaI0gGX|s(O#x
z?e<K*ssQA@k1dcZbRLnm@kGv^l@MDM70JfNX3fH~X+kk?LyNF?rd{DQBBFC7tRj|7
z#8MkQAv$txyH(Zk^yCqn25bTxf)ByhZiH4MI2UZea2oT_VPOpnsyyjR6#&}ZEpz5H
zBIh~LyQr2G5OEkrgQgLn-E37693T-n=VL=eu{Dy&91jM~)&Zc84FZyLoKs4PNUDJe
zLy5YywL$Aa@nC9Yn@n1a9AQ^4#VLIPS`KIDR?56-Lg`i!$3pq(ZC-6gZ=6RfM4WTX
zCaBF<eSQDV|M-9W-QWJ@{GWgQpa1j!!N2t{E*#tHGyBj~!PL*rQLdpS^!!$ZR_cAK
za}Wen%;Rp_lmh^Yr0?HnOz_8dZG7z!=!et~X|vrDQ3z21#_oX5g@CH+oMD8*%sFRO
zVH$;bZWCj(1w<bjVNNMocs&uJkK_Z9&#4CmA3`x=6iI4!MKg6sbLQP{zuDgo$0t=W
z*Ty!^DZUt+b{aAfBH6<wJgUerW&qjW+>XQ0cil^_0DZDrr{uQ2X!5DgAFSWs4)<(X
zs4A*hsIdSLfvP(XS6YMiXXB#f#Fc5T1OUQFwAs88PIDASPJ^V;g#dt(ldAgfQkk8h
z_g7&_J&Od>TH9WcAFk?_iXGZC_nSK32^hy`|LQUr)CrlMskbx3#Dw5>xohlD1y^cL
ztr#j52YRABhzhFt6$zF|V+GX(n^|c0v%99il^pg-)JOz2@+89Il&Qt1q#Dglq;Q)N
zp{}N;qDoUWAd7pzVwf&hN6Y2fki&%=K=pdcc{DFznQV$og-H%YlZaTqG7GtiI{{J^
z9KoEk^=kInih`3F5CuU*%!gnWJs>M+MkM<mpq4+KMqa3ZC{%u_bA=@_u@?wL5E%fR
z_x4EGpEw7iV4`V93LwsTyR}#xM+>vvDkqc5Yvl?Hi$8$^z`y*LfAfF)d;i#yCH}_0
z`WOD~f8(#7%~r8;vV8g0U(=aZMfc^y_d|^QU)+y<iYeJSx&M07{nektH8aS%Oye22
zdR8_Wd&-LNr!c9L9RPw#g^<YQSJd-Uc~U*Cj|W{jE>9-LC1}O0G7NJfB@pImO}?zD
z`V_Yq*OW&1J~1Lcq8IM$0}4opGLcvHJYrB3aNY}7RwIifrmTwUtN~mTu5?a=fZ6)d
zJSvNpbK1@44OE4J{M6(*7ozQL0II@3=X0Kde=hT!rB#}?NKp|N;{1bFeC4qRkUVq%
zK+Y4=W_M?Y5jpdcznKMpmSAAaU{y`y*qw@at8F(vgyNqhtRl^3r=rY>nZNnwP20rn
zCRlIAISFU;le7ys4krM}nE@~aCz8`p7j85hA62FAx}5Xf{k<@cV~>c<=5`);BLMT5
zM|XO9Tbl8;%4Jq}m`47xhO%1K#xekynTMeO$U~CJ&Kq(XR7O>B-W#K`@16_-iS0JF
zJL}PpkKd|FY<JVWC@xKslW#W7W}k*r8ai^maeg9V0TKP9-~I>Ax!ooLKsV$Kx)}Y<
z{TDZ{zIy!j_fHRRHaD-3NJSK&dwS<Xv$=T%pu_2r&;e2R^!{o51Lr(W?wXtiVUF!~
zUf_4HJ}c`Ukr3a%d)E&`v%7W9a~@Tt-QFOP^HEj1r*|UUros6*q3BQu*0BM=&HjGq
zyWy8VC!)`P^6RNT4c);l@(B*j1^`lj63*MZ&&|^fX8d?6Fnw$-SU`jy-oH<2tSh!L
z<q+Io`m;az5C6tr{oDWj|Nig&n}6kB|7ZUx&OHOhxS5jAV6sF|=LyNd2jjm>oMDJl
zKjAGQZ+@O_&@!=J*yP?ndLLMgY6#sY06102`?J)0%Udw|+XsHs5e4ro#w4Xdg#nS7
zPu(Mt`|_)w7$8R}tM(zbO}kZiuOd0i<e|aCsRPxU+dB~+`jd0sMyzLkN$U^^aNc|0
z^nIT>NoLMTpJ{+>4*>;RbvX|v`Ub@9en;pIk8cog(|90ink_m1fg&TnfW7rYhTp}N
zLKWB1A0ImZzRRjx_c?3FtST+p^gP}qMibFh(#YdL-UFcXj>z>xheRZ-3d$KAAv*Kx
zK*?6M7Y|McmUV>WjB!cM2j}z9jYAjPt>2ZN-Zw2E`H!FaXI)_(4SyXfxZ;R*;WrPp
zDC6qlKj)`>n8`jXJr*H6!s6Sd&uFyIZ`o8~UkOT_gXw1TwOaLYQJPmwjSpU%OIH0H
zU3OM3t$Nwz&*zUvc*c`{HXh-FG!VOt#s^;5Ksv=f7JnnHT2vd;7M9IiwwJG8T*#JM
z-UtfS0I_n$I{VHQ#Xz)5D6BX()!=4kB2;oTsf`ipputI|TIWNqBMs|DaQUlX&0vCm
z<)8U8zx7Xi_R}x!s<R9)6Y2D2{nVL!8_x3;boK9lG&B}{b{h1uAD)9Dt8b$(wx(Rn
zFs%I-UAbXsHR`an3CsPJx>dhgj^L`5zj&hSl7)yW0o6)AVWcmt^%u0P!7^9F#T@dF
z!><<vLoU~7HRStoST;6p(b;8W^#-#JWYyWNXD=T-71nq3Vn;@_JVMkftjM$PV!zX$
z4yM!wq_Ejlso^9%7B^U{?8(7m=Z)lpst9MBOQ4FG?G~ylfaC=BQx``dry+?rALcLR
ze5~(ayWMYZUU42d4L(G2KIb&$Ymn(cgfpss@!7qqa3!}##FUwt!*H@pLvplhcK|x{
zr@4U>&O_giV}EmVhZR+UkXq;T>@y>BP8S;)D5#mk&0A*9V@{(F%~XqN8V3<>H(2eq
zx@p^+o5o%oW9xi4JUtq`p{jSE{WOik!`p8FG=x=U!#QzI&1OFz)S=mki1CJnGpFG=
z_C$_+NW&?QLwb5ZbU*tuf4<r5tb!i<Q%d9GZ~tGR+3a3@rXq)TzZkkFmTW|uX0vxb
zoK7d_TpkBgysC`C*|2Qpq^i!%`dO5m3M8zW#-1FR?>0H76<v1d4xGmA%_~vn?l3uj
zl&@ww93R>=c3Ny4LVtLla<=Q1hc2a_)5v*LHC{s)PEWHd&++{mL~_n40OwR^Sf{Z|
z<H@RlyVtJ}$Rsp&#)sH4=R6L5-{0-pVaUd2QiaFETV}O3+6E!Fcb~Zs@%ibKkIkxC
zG#Bzq;@qkz_n&A-{OCKAi+~`jv^i8|m297Ujaej6CD#Cm`7F)>^yJ(b6Xa48a@G$y
zM`03-_Cro7ef5)H73NJIRps&RFGFlYvmH}9_G4(bNUmvj06;z>QXWcPiijMZ9?jGO
ziHuB7<bL^!-xuK~BqB&z98uGFRqgr&FajKnJNo9$H~P)j_6XnK-NhKjk%`EAQq@zR
zh{zE#3+M4nzdWy#oEd;so<iKjPfB`vSz{;sQs;!19CC={y#Mf7zZB#O?e5m5ASxn~
zt%5-!=NeNqiG`aM5I6$>`2Z#OaD*gt@=vu;%W_iY$2Y%UOy&@gD35&}I@`DVhc_bZ
z;k%>;;)gWrxH^VkR5erw{D<bvA1@YlYF0kfiLO{SSU9+oz~4$na>hZG`9onH1CNA@
z({90YW;gDoC7AGu1?km!q>i;s-5mVBKqfeMvU;ToKlhH(#m#NDiJI3rkxZK7x;0t)
zEv;0>b)SeZWy%}+A{TJZ;_Nn;lJ#|(>o`=@y5f8}zEF9zEyEIoXIJBrEqP&^hKmQl
z1ct7v+x6APv(kUM)}?FFQaCO?zZ1#jvh11gY5a)G>y>r;$NHCE!<#4XY`pj)leg5h
zuXfgg;AMY&mddF`;G~yr^1>yko<Xk4{<Cgd>x`XRtYle`_0u&6<5V7C^>?5Bv)1DS
zte)FB@l&Uepm}Ztf6}7o@kf0bO!h1bV7dqvmWb0y)QRu`7nkS3%qp>9IiZ%QdSBNC
z!r3?i29_YwJUgAe%@&DSPEc*DFhkG?dF;V}t_h4K=L^LE5z&FFR3=aQ+&7sC+!WS?
z)g__6MDYn5_8=lGW3i754FVc~gorBI_r1x|hyK)`O2fBpJyN{6{~|W+@BYJo&~7%L
z-Q9`E!^2}_;5??xmc|0AZ{NM2AEM^;$fC2`mMRz-2UMNQM3|=Bmg(5bZcOE*5oHk*
z0K~wKaJ$>tW1+YTLqUYhnR^qD<1h?e-&?j+h^@u25yE!61H{;Ft$*#h{_VSm-EPyw
zh|W*4cjR%HA$n`F=iR~iNaS5k05BZi=l(Fymo1eyk3;wP)`jRplQXBpL;*l^8j*8>
z95@wmJ!IxY=nQ6?cbvjALgTx*f)B0DBM>2vgF5F!Tlkjq70!v7Q)2JE_Z}3OlMgKb
zNY27c>-Aid%F;Nfo_uIcq@gO!_GTtQIPdc~4#Uy=;9Nj*L^KSYs@ioPhi*P(hv8`Z
zTa0nD{o;5yoVsqmZHREQ-4xh6=cmH~AjA8&oBi#Lv1iXfuSv&p4XhId!HLTB!#6MI
zt=wiK0bRa;b9(vPRe)vrD&XQ}c|zo;-&D}Bez?V+Zp&`d;*6~4-6sGdJUu=>Jaw->
z|LU{byFB(PisXb@auVio=u931l)caPbUZyiK0Q9&?l*||{^2pD^c%nR=L*$cq1oSA
zg`&(N%xN6@@%8K1cIjuvixqd<n^#bz-{k@#lH}34c_O;Gdo>?tP0N=A8W)<mu8zXY
z(htW9MgF5GXTEPzeBJiV<;nCLH1FK`<;zLu`=6CF=Uf(#B`7chsPoa>^i|jr->QR&
zERfHf69A_u$7+^oK%=Vq5M5|;>NzF*`OW^mPN-iOSTD2TzVh!gO|e#$ev}#Y9Gdm~
z=Q#ICsGY;6Kf{Z_>*YhqBtTH`!JJVXxnS}WM8cBEC?Y5#vq1w-wl9W2s4O9BcB+-j
zAOe8)FcGc_PAG0WMQJNVYKfplDNwsG;}yWPW(=b#oF>kZiAfYq{Wd8z=N8TaWUfLY
zH3(X+4>B0}l&F~Mfr<!;uDeUKz16D?jg{7G#miJM<Luv!7rj`~DSwPpS8g|6X1HAc
zB~>_?uEH!969EBTH{gqhv()Zg)x2&BF2~Y{<5Z%Rluu?A{dnj5>?ZLkjIr>?eh0ix
z7r^IVpg1FGaD`#M!tww>MG?vSz-a^$OE{V+ExMX_fK}!)_g^B+%tTHmt3D@_38yL;
zyIW*R_XJg?YEPpgXP(@ii4YwqPiwDI;~@~}1-^q+d3Yigcv1CF$_(H;;m7c@hY_A9
zhMXA}XcdA-fO2V|y_k^TM~yaZ7FexIB3#HavoqNxEHN*yI(niWZK$Yfed<g;DKbwE
z1X3aX&k27;e|9~{V@{d4E>&4VW@o&O%Ev%Lf|Ao@40vV$Wnl$KnM2cV_cuAExnOZ*
zI>kXn961C{V-En^?XCo;0|I2{qjNr|B&x$OFthiONbMRTlBfs^%=1CQ!{G=b-XRj2
z54AloIStOafK;AOyODN3V&gQr5IJ*qI+`fT5qVFhoU_jyLPSJW&Y4Z@Z%zVM3L%mA
zu8H1<=wov{9zmhqY|MrOXWjn#UR%3hGB2Z0#&)YBIgiZ6`YyzVT!0e3h|YOa4I+~F
z-Z|$(oJP=C^bY_4ga|4|dI7j}axxQt0tBj;trpiboVSm;i#6XIoHW!hnK>A1*96XT
zo||Y|m5E?s{V}3*ev+K5G)cm2`U+b}XGfA<14NSIt}x>fc_v*q(E(tHu^6CK5iWC8
zewN8@r3?TgEaf)-pz!(<wK=mqo`W7uz;p5R%O?sku*&Qr3JRa4av-MRbb10L4{FGL
zA{Q(;*W~J60m%jLo9IH^kdHAq0KjfATv<#js>*pVZ*I<s)0lJ0IR}wBn|e%{h+>SO
zY6;I+4qib;1uipCW<@dA4!d4CkD$OJB`eVeq2x?@gr;6aXxr9MPa^*T`=Q!(WPX{x
zEMfEyVMKn;FR2+xFMpHi>@d5J*}bGXv5b<Z<g!lP-Xs<;1M70Kn0*SMBKXiuhMM4G
zE1Wr}l2R$G!sG*j8F5TyQHiF!hLe{&fex-E$ZKV|yadOa^H9}#D^J9k$sVi-dY%il
zst(k%d>mN&Y|ZQj5Kv{)|4L4__{e#3CC6L=Qp)JU_U3gOIy>zaUdcEz45rDoFucun
zR|F&g2ol>i#5Rw;h@_O5+4)GS#^FbD_TqV?A)@2)qzKNDbJVo0l^UudJbLe)Z<x)E
zP;<5*Pzo;CyRnR?uCt1^i7t3D{kS7Sgb*VlrqnAlyD$l03iAk&ymxKmLkK>!r{mWm
z;=Mx%(+olYz{v5lk%D=zS<fV#LD2bNbes7gG*_T0_ZP|gLV7|9-jnm8*??+J1J=qJ
zL_}w*n|VM=mGyDKewOW^fR`*hA96l;m>ug&w{DZPl4<M^0Z~N|HAasB^N-gbqyC+o
z2DDgRJ=d|>mS<0d$vV$-#gNSLKus1_&12`+#Ndq{;=I4Qah+$f+kI43WwRx*5dy*w
z39qkI7RD=oZrXX3vLT?#@QF^s3-^F$naqd)Fb*f+VSDr1QfqQfu?3NG5UOfaAm@GX
z4g2l>CT@1jSw)Z@%R$Io9B$J<AtE~AoYRm~$~mhr5He>G?)%YuA3`YLi&e}}l)N*h
zV1?r>wNO>gqllS6VTqklB^S_wf04$q_daa4Tbq28tl*b)S#zhMe`KWLiw5qJW%->y
zm?98TX^n`e?4?p0p)LDT#R;D#J9a3zl0Kw><WRxK#%?zPhGv_`-t5VQvkmzi5*Cj$
z6VzWmqn`x3#S2ahuKqGSpL;$ZaG|TQ7U*h@x_lj(Nb-d%VJ5A@Y1x1lj)}q<fqtI1
zR4RLYmdT?4*O<5Uf31CbtSd6Y&3OQg*|`;o0Z!(wrQRS~*ePo2Oi*UFCvCQQo4M*{
z%>9A+A=dhmwIQg2p6P%J>1{=02LxbIAieUf7iLfmPFE(!)psx56`;A*RBgg?V9sg>
zxF$ZC$7q&Ob{RpY)&HlSbyZZALSg!BlZaYZoTk;+d+{hyKSDgi=l)|s0>0Oz^jSwV
z<U+=qM@)4Kf)=E%!qX7O&5X11o3<1ew@*>g+A;Y@!#H&wYZ2Qdsd(;`E>~oU3S4nl
zL{tQ-aXzj>A6A96sG<~k{=5Ln8bGl`DrUClspbQ+wK7C23e+@AU-lywT{u?X)ob*R
zb%f-PaHK9<?8JP;GyGz@AJ#!x$p|I?^>SY>3I!X5udg$f0+A+6M7_=x4b)!7cvUrd
zHS_oK1!c=P=LI<Dqh&``c>6`nuWHK4kwfRoH$ho2&ua<wGsnw-G2p@sHZ8p5j6^Op
z4)7;G-Ht=|<`=&c+g)t7Ce=?vCn9O=RoFVSxwL0axhScTa|Z1%PGj=T22_XcaBeES
zpiNg+v~ZT3oR6{D=F=(VLK86aHj|j{w+$j%q6GjXK4l&^+s&qJeQd2$QIWXW4@3X$
z*S|!>FFyaQEEUc+w&t8Z`}|9r^y$Prp2ERLLWk2`m_pk8oP3(oID5+2Hpe+l(2R``
zW-kwX_wd-X?d#ZJX(WU>F)Opg7@c#p7Ok2LR#nIDk;s#CLw6d-A+sRSyKmnR(cP=p
zJ~T);Q}MdPL)m<%Mab)mOx~wao{j?%w(YL^y9k{lBx?waN7L+XW-Krb9T7F{Zs_~&
z^whSS5aT#>02%?1C^kD)P7_dXqq%ZFmA!NLVcyzmA}XP2UcR-}wq)N`I8h#oXIj8t
z{?6acd359fAZ~V?^Xc$ZeE7VNA&9W3gwT-l+uP498XiQR-hb^v-0bcUAg5%*tK;c(
zI3Ane9pQF=<D9?y;%DYy@T2^4J~r*<n{U2R)z829a<jVya!9n_wZi;(=yMuQhqtz#
zna4B`r$I$jcyjFk7aCQ~c3E>G=bLSi<5N!QbUXmSkXS@w@XY-9_=o`B6N`$7IThdB
z>^E&YyLKSJn{VI7818RxCxlyAWX!@WmNF5e0>HQ5zDX(VH_g1IkHaYf`mnj;{3K#y
ztsii@ECvxDRO5VX?M?OUr}BH72AH<(&SfYtsH*90Y+jv)j)l9^iJbfDXTO!lJ`J7G
z1FJ&>U5H4oKRqEKkq1C~nVlVFY({=_bB{=;$9J4Z|6CIe_~Tpqyy)%lLlN}PB-G=x
zSpCEmSvM#&gN$0wXe!!&g-c=GD&Yc6&faZj2^#qEZ0PGXGOlR_I8DNzV=yh`Y@E!;
zXEpKMM<L?*{OuVo!+C7{Y|>U`MpLm*oJAzdl{2e-Ew)lM>lNW@UiK_4C~sHW6u_b@
zq4|m<kXAPYmXfPj>n+-qTFg?1*TJ%W7UnuuZ?(F5vr9oWJD3`6{BA}1_m~*zr|khs
zCq<5^==q4el7+_LT&WNsC>t7Tbq^6KVEIAo$%v;nEH)oR(^5hFv9}P#%II#wl6BTA
zREejPFv$e$MRyCc*khh{=wz^fxJuisXG2S@DB^5_Uq67)&kNyl<wLz5@kJAaKb^mx
zF(lEmA>jFzs27m)?3Pl`5tql=f_V{VyD}>xIFC6e3u2xR>Key@>waw6m?OF-T$S!B
zXExRRM09+v%k-fE!`n>1QK2<g6Y50^#j%2$6aYfIC30i;q$+9X%umQUx7prs&i&z`
z+3Z5Q?Yl>_zO-d7%!j8(Rp^E>1RuRina9j`w_&%7Uw{3z4IvTn?c2BBhnrhKL>D5b
z!5H?c5SxwJb6>7y5q<Y?+U+(s`+ZL1&>wh8OIM=hlFk-@giG`X;?Vbb96~r{`5RXN
z03ZNKL_t)Td;*b%(?iM(sz|Qc-X5PGAKt&6j)GprG%aRCUZ|LE(xSo=+@Y(P7!e|k
z{SnE<&7PS7-X4#~<MHSn1@96|&irureFV7K?;PQu`wM@0K?o3s)6?nkooW`zDW#Os
zWv6mHJgI6o<PcnRR9n7!hlu#*o3EK=*G5(yicDp-=fvQ>qqBvC0B!UD@bvILi;gKz
zh@JC9wd|~`jE@mORHraVMC??@$3w4*cXuHYJw3d41==wiEi}y1`#9!f%AG<u8)xRs
zNVM6-GaD@=$|=DIa^%r}(rpkC5AS|?dVE_<@R?QR;oUdhhnu@sw!As#oQ4A85c$}A
z^Yh;k(am<}oI?Z=9=emgIHj@gI`8QIcFQa|GnT>W_wEt+vi(JLNa1$hs;bJ6hGd&v
z)9yt0@i2(!IF=C?xe)=(tY1Nh==Xl__u6*z<*)qIdDnh^D`K0{$Z6Q!+~2(VJdeGK
zynXkMhhe*kh!kQ|Oa@d{#UchzegE+A_{Ha+Ip;&OC30VV39}e(d-LjaJdWLC+k~54
z<9y>>QK^0Y`R7FR^Pm5mh`PQ<#O-9f@Z13Dhlm`06q7vq!w~zI14wdmA^O;+p_{xd
zH5bcu4~VKEAZ_;d0C0MIM>N|ht17EzGY{c3Y90`2R^LM&$$Q^y3jtm-sE+*r=0F+0
zsW>}2@9XAZ<)F6mbHeArh62}>VfuyX_PJX5Md!bMyqR1j)W7I?!?_fjT9|dIt~G+S
zBn{d>MfAgD=an^=K40EV@mmYvxXMz;m6Bl&w7&d{v9e`Ggvs3-p3B>tpqxrXU!5GN
zFl$bho_KmKo<{%{w|H6lDg-HzXH{>_Dw+#;^4z_Bh4|I#R0K0ESo^6}jodkITUt+D
z*^-yqP(fEvvesVDinxORW`#KD%KM;tMi4%v4)`HW&!=t%wA846g|aVh#sCv^t(BLR
zDHclPn*st5t*(LAEJsBAF>RR_M0TD~z-$vgPXd*$yIGcHK#LR~=NpJCnNq!YKt+m?
zO`Qw65^GhP#k`o$mys$>Puy%2d^w!aKgAtj!GoZZ!c6e$6<5kdQ;wGo4$r%;O@Q4j
zP^+{{-qJ>f@d+k}Yv)2}cdffOlj6k)P1VNh!U<HFGx=bdCMvnv>|Kay=v7rY*{DH;
z^KdGZ4Ig}H&7qBRQl3C~W4#NjN*V`1h;cJ5`Z<<?RL^su=7f5C*?AR%C^;+U$wr_U
z1NQyU^^Z5VcQ>!Tv~9lG?3ZEsQ|HL<ZtjTijy$Jv9FCjaeJG^_+~41+NY`~K=llD6
zm>BRxj+~FpmYgH!g}HVRR@KmKOi@V=e)VU+HZ|(XoZ5D?-MZLp6yWLcz4ZzTYGFV(
z3h113fe5|BwrOJ1<kYL`RImdgefHUBh%lTU9nq`TpXD@i9zu+v*}VDYYgN6yz4hLO
zW}9<5JiZ6O&2}a6&UN2544}}qEi)gxZ|p4D?sm7gcg}fJrvhLaI}piZ&z$??lL|{t
zfW<$d+1_#*+}b6}804H2ku&t@hVv}(M!?hQFmzoA4iTFss_M<_uT<FFw#fM@T6p9%
zhS)kEa+(FUIK?+QBx-hd!YQXT_Fdl{_jj+_?Y=I{#{Pgtg|&;Rpvo3l;d~(HUF=jO
zjbj>ze#n4)>IXz@f-|j2@Dc(GX9P%D2+@egFa_BoVonK*{Jb`C4%bZA&?Mv^!fcr5
zw)=Zm>j*IP{qgWPBteAxSFeK)+uP4n#4aYM(NeT>8gdemESdT-t7>e7l$v(Oncu#9
zAfhk6{7L~r9-R-~hpy`~%hS^nk=x#Xb>W-#9a@BWdyCQE?pyEB2;ord%IN+3_Y+ru
zzWVAbJG>UUgsS&J0q*Yt034p4Vko`r;qBMt9Fogv<TRwA2Y}FSuoC<cl0}Ek51MnH
z$cF}R3;kVr>=|$zPR@te?yRk;H4lX3e0Y3#ud3Va)_M=;{LOxc04eqV|32YljZa@C
zPdOjAx35+8`2HItlAN9Q<o2Zp$q7K2E1Lr2O8KB-+pJ-JM2NQk%=7c5+C$7^e|mZs
z+ihsJ^MJudWy0CdL<p_2)Ta<KHB->3LbN%Z%m`wMvqvcf=JX}&Ajb)<tp`^tSw5`N
zZDfj4{5VYVAsi0zjEhvqw=lB;qH}Y&IRGdwaU>S-<Gi<MM$6Z;Ez((Zo@t<pu1G5w
z38(xZt}Uf-m8=F-=DjAP)Co|T5+#fIg^DPl)k;(kyNND_fe6l#)hjqz0?P!F7+1LP
zp@^PC4W~qPtXe4%70!9$(UA9^oF`|58d4q=G2>j1o1_6PNM-G~Ht!2lzez}rijcYz
zp;HCe5~11R3xX482@G~GRY>i+IfqPeh6@oPk#i0}-6WJIa?T`5(<_Mx$vNj#fjCbz
zSy3@gA~_-jNX3Am@Y4_hl(cRUW>(_GGMt>bt^vaMeZy_fh7jMk!7><RLPLqXS7yws
zYdPDuYn{D5^?SCEDjdD2m9>Nq{b>ClR*-ys<>nPj0ItyMu1uNE0BB2QMM6+oF%>Uv
z$_44q1oaM)%m=3qZbL-StNRiz>i+3ZSLQx{itxZIdpaT_c~n^-z$$MG@NCRBTi~I>
z*~5ibp0&yib0(!<PH_sPXO<{L$Ra$Bm^1VPf`CYDTL5HEDgsC<Jh=}ObDHJDIrYLh
zTfMeCEfivjsdORw*jPCaL=K}!wp4l({ED!d6}r%<u+E$EM@mP+iJmd<;IjyGH6cOt
zp-~_aA?2|<l=w}Z=#(l=^h9_%odCdlPY5Bl!rUF73|$h=px_A5JL^$Q5bC^VmNX9D
zs|VnmMe?R?RDmU@%yBr)p;Y~FBx?x^k%@IGL_+Y+m9r}6WauL(Fpr?(%=2C~#En`K
zmO|Hc<W&3KV&aXLE0O`xDyB`_DyVY~0F*PR#-@cL+nQVs5Sz`m+3b#o2T*Oddvcx-
zJV0n~MEL3bx1c=qM<3eIU{NJA7mXA-n;A?&6XhXKIrsfw3)DpJI0=)Hh;z1k!#RmX
ztElFDPH~)KkS#_B7cD8R1X!j*vom$>JI&F}mc%%8BJ2wsUSvt+%424}O_MB4z-~>>
z0N_LP0mw&~1pD4O5~iF(3?W2xv1y_2PhiAuu)3sVY;YcZY{<Df6>oYz3Ghb@b<^n<
zyrkzsBHV5^PznnfPX|>QZK$K-$T{yp!MW(jPpOkY&KtC;3c))hav^%r1|X$$Je^WX
zqT0sjoc}S%GR0EBhiGcEoJ9eeP4J<y6D7ttPy2=0{4C7)sXlDl?T*NC>L>IOZRjP!
z6O4y-n}SHpSyhk6Q;ab-(TEPBAZm_L*fb3}WL5=ELswj>rn!{&0g+VMyku}q9!3Q3
z1EB+vPdyi1;v3gT(hIfxKLGus`ft3t9z=NT4s(d>e80+PK8s<WthMI4XmVzt%86w;
zGlesNreOe3BURW$(|jD~R?Sz!3?*{H%$&^niwF_GIfsNf4a#g%$28iWyUm<<EXi<r
z8~}z|<WQ7HRCpPNg7P@zl*tA3PLtX$gGA(lNVYU77ow>Pp6mQB6Y5p2_+O~#DohyB
zg$5B31VF~_NY2d>eZpCU+a@r}>3CFt;HYUgyZyfJPD6k2-py1oN9f4qJTB)wfG}I)
zIT11^&Z%v;0Pyhmlu}Op35Y^yMD+Od;E2ri)HxDi0A@}AV7IEIV<!Lr@1rFxsEVDD
z_A<kS0W>`wNJLnWsA;#VDW`sd9))w-Y+3-Y_RA&}(?N(}G4Mo)6q`20O?P|}kal+)
zn>Gy{ITza<=iEKLMUk;TnMo<<B%CI~h@aoN$nvIZo-_BuXt&IJENsFlYNNQwyC9s?
z*fGzEPOHsg9!vp%09XCo`XHn!P<NV#a8A?O5I`LJZs<;J+ajVl+&dR%e9T6IvrvIq
z=XS@G0LFReX)@^~XVeg)4^3#CbMACHGP9`6HZJCSlXHry#a!lM0{EkHLoI0fMF$}f
z5@EC1nE#20jNL(0$FZzxv6&E&^TG5jQ=9Ir&Ty*U*|?-pKyq#vACAY9!L&`&IPZz*
zhkqp%AtXO#&SVx<ARj~1f+`U;O=EG;R`nA&bk@bMtb#WCI~B>}0Dvww$}F5jvMM76
za;|R7ypOZ^`gl44V!PRlJdER*GN;VJyXg!jW>JL%Wn-MTCd<j0YRyaF3Z0Kc^rIX(
zFIgLxG|LZ3`Q=CWRI3s9Gk=!|kNsh3%`1|@*=Il^RAqC3nk^wsp}hFxL#>%sWfkd<
zkFnjv&8{R7Ap#URjlI}cWCJ{F)z9x;tuUwzWiF2>6}7PmB1$!kker!WgpnKy>J*g;
z00K#c3l3=cingIl<F&Fwl{AIgAxtf19SVKp{3g%fVx4S+ctL-!+4F?;<f^XYF1>Z|
z8umTSh_ps1u_9Vyr9U{=Xse)e3ShYUJdc{bx;@}xV;HP?|I384m`{i(;*@`;AMQO+
zYqJJn6Wj=*a2Cn+U}}1-im#il%sGu_K{FGn5KN}25sN5rt%0$Qd}0XAd<|XRxnA7$
zD9UIHOOn9qGCpHbf-^5?k?Kx_9#yQOAkWi3&bYM|M@&FbmCV46Y;rnDLTVah6)-ZH
zB>XVyCwv@2(C4$-%nDbhwV_CkRF;AN3?+yliYnof0Y0Zx+JKa;5=8_%@0VXcEWdC?
zCb0)<<<+UP^k!N8vrW?KTYxS$UB2SV)O`i%+TP(>;X*`&q=-U>2IKMwEYX7t2dpry
z3iqnoNn|=5Kh_I=LK)3Rxr;wkL5KJOYD|^odcM!<ieIVMX_HmbhZYF$ivKMF0xg5X
z6}N3BJt6oso&eBH(8rN+!u`mh_w=0mpQ?_-@xuHJ)7S%)FKIkxn_cYoH{Ic}?~8wb
z)0kTMWI!~L>$@lCd~EjsdU|>XQ{Ur5Y<D-!_U7@;FGSc1s5G3&g=TvLs@>sTXtr^)
z8%~F@I~W*SU;`fzaqN$(W*>?zVoF2b_aOxDeSLU`&?16}dS&NGRZrbzHnhgL1;jM=
zQdF4~LVM{R;C&3C8TzA$5JK?o)TI!7Y@I_5-dTTX<ole5$#5O|?j$TXclXTP^$Bq)
zk%-VaH;nyw$lFaMLLWDTZqo(;NXfKZkTO3Wd%H24hGTHe_6E^%<i#?&rVx)b)%c!#
zRF;uXwyI7K-`XLEh=cd48e^F2M9yg(PH8x8Z$Cq%)SsBMMXMJxDj&>?fDmu@t^MFQ
z=A7Z__$Fum*{}V&Ss$p#)8m6B!`T<?`qYnkTRtQg|5&8ZG@xKCA@dU#VK3}lFxfki
zM*tV1s&GZ0IUDlK9gnKEn*fNM1_f|F=9E(6%#t$K!VH_P4E>=xj=}j5n{7^GcYHLV
z(f!>m0Ho9lbGx~z>1~qp!<(Pm*65p-$nWpJe8~*+qs}Z<Pz+tt<%KgK&77LK#74xf
zA0H2WY<G@SIjidS?zM0ZLodRIr$_sduIo=-e{-|nZZ=Kysw#QR%2wIhzHxl_wQXzB
z)90VPJ|2&K->1}zIHMNJGm8F~|MH=2_m;1jZ*C1a(wxToyE`ODJ^-ktQUJiI>rP$Y
z#NZv-PB|nt&)yI>_h0=QfF9p}qvXJ>ViUL+W4jwqPa*;$05J4N8<Wgr9CE&Cw@tI@
zyW@b}&D}i}AtrT0iVf{<ZV(rG2<J5P5@H)dG!wY(O>m(xL)yp3M?~Ci0w_4&)I0n%
zDKYbqA0VF~Jd20?s2hVW?S#&Gen0Z*i+Fl^Uu0bXKDJX*Ao<uD_acpb9($rdfl9XP
zbV=)>r=cD>4QcF}cIQH4b41fx*uc+)Xufw;B`J~jL@tlLs@gH(KTsBwIuYS4hy6Up
z9T)7s*l6L|G`!CBEAr<FpHrOK9W$|FRZ3$m6TqdA!}_hEb_iQ_dpN1R6)%wXwQ{z^
zt?QJ)4psdtB1B*m-#M3B>-@Xw^)RI^&x{ihT^KG!dq7nki`BKQA_^xZg|6ulOFZH_
z*kLVFnIYyfa5!@~yH*h{hptt=Gkmyq9fCPp@%hpcS6O})(2cNm9YR>YKb*}c5OGx(
zA{Jk|6+x-aDML6*uhtJ_n4I&CXHR)t-1jQx$fdZbvR_znE?^}^FiF>BB|KXQeDomH
zPu>jF(2-v6genoj@{G-n!Zreibt9!K6TTnk)7B%iX^A?mMiCcIh+6dx3U&Lp_5rLI
z7I-n~sXCH{_*7q_bECaFmY}wAnBV1GL$pNWEswX(e{glGu@IO(9M+28=Su5$_}Q!G
zA+;Srky6ijg7cnyHb_GR{7&7kE~Y3`J`B!Onw7L(C%Xj2>#Q>Xi(#7LlA&o_365EU
z4)Az50DyIeLw`_(oCN?vaPuk6d8{veN$;x))1f;6K#WuLiKM<89XUj6A{79c^V7py
zBaGO~hQ2!;k3)9~;Z05hs0xUEVI&&+BPfjH$qh$;h?$dcvacSS4FKj-FCqxwWBdA7
zegjlb4{s(C7c=YOc<RS=w{MB4-Q5!TO}n!XlXH6b-QNze0o9xPFFyat*5Iqt(_3L4
z#+*{xZDUIL{o}Vp{#SqYYdK5G((c;r-D}H6|Lj+O!-TX%^nd@o{}agj*do!FySwAz
z@!{RK0K?gmWfc_|)3=0Z<omN_W?Y)5V-En^4Lic^{*`dH23=KSaQ8PG8w0eP8y}mv
z*@432+h3-!Z#Vl{vNF3Uh_H@bXm_FA;Jdc~@bGkG=AZubr<2z$zk4|D_xs!1J9FH2
z6x6XWBZ~8$oO7`?D+YT+2^_eXb51Gk_P24f%|ov$eb?0`9stg(!un%?KDe<Pk}5RO
zBY+RljAAX2P=Gm)q20!2$9bFza3t@M9FGG!XEX}Q$v2zW?)2$h8ZY~Mi0uv#oR6xK
z$0Fd}?Y6I*_VMX(ICXb7EfJjw!x6D*_snCz_SJJfsOs_YFbv~;VTv`XFr1$35o?+@
zHVvnd)9~%-aef@h2bc)Av-IBBxtsl~xY@((@2qlGr+-*9ef7mQ<K493{&ut3-y%9t
z0nq;VP~2e<Vl41^@DAG;V<aDJWRk`**FkdT|M&RtzG<4K-E>`dI-U0W{pX*5E;cz=
zm7Ii!Yg|F|*fYzkkL-VGIQFN5)%Zqw`u5vzGt2$$mYnxKB2lxu1r=f0-3RAme|#9a
z<L>r#v4vAP9UqzV+u#3fKrB`UNTJ!qb|;+r!$X0KyaUkVX>^1}mN9#_<NI%%56(wI
zXqqr|j{w+iZ(VQ*Ak6*g!74EVe094`iBH`avxIEq3GI&WQ%^B?B5a$0NU_-n^Xcim
zb8c?eiWQuXb5PIJ7RRCQy5k`>ZH#eq^Qzh2oSxnm2I5)ple^-{@SR%ox-os`rgUjI
zHJg2CHfiRXDGdFA$obG(n@-L<A32XXk3KZc1rw!orxSC&iLI(+;~6=xDwZlrE~tv6
ze0lcT%FJo7s$qBgI<&jg9me6bzyH$QJcJXHM@v{jZFaY+GV@L(CziqBi9DV_)t?Pr
zzi)BzolB2Z5}elE8(bsTy17cKKsEx@%0UYkUB{GAefC3VuGp|-7vmZd((|J6(l-g}
zpT<fTk2Ch53-w8_w<B1$+Ot#~W>jx2!!NT76Zy{9Yl(H9{$p~ShD8mHYqsLE(|o)F
z7q1~wgmc#e)pKxpLI+p%-rSom#rdRF23Sn9s_y!#7ySGpSc{kS$|}6pvTE&K|6CgM
zg^501ONM;57)KyPn1vu$pq8o~#6rop`%OfX$M@`JM^i&nIw3d*P}Uvr8FZ-6(EoH{
z-_0!+7D_r!6?7#b*Ry63>-JIWKV4!0KlEHr6D0ij?t%44iE8=#Y|~dGO;9~ERr91c
zQ4YW&u2v4PxK`g^{P~KVasDIAU<_xyw(S@zo&_%ci__*%G5qTx$u;Yes()OrYyCuC
z?{;1`8_;KfS(rQ{mtADF$<5P0Bn3s#^37nT2H<RIS%1{&-a)l_RgV?E{F7ffyB1fH
z54=$|Q&d17;#O4<hnbgP{Tz!r=Nvf*OBzIMwj$>*Hgso=kj<%<YVG6I7t1-f#cHwT
zmvdwZ?BkHn&Jq<#W2Xu!34l5W!kQ9?;JowQ=``c{A-J4|hc`b*#CCgY7<z2?o82Ct
z9te;1#p<5knWV~GcTGl?$HBr}3LXOxgZB=`F;A%#GIUR%X}gJ>j*oA;vgt3`^caHo
z1cqH5yCXSwe}8X(I*!9Q47>de06sn)QcBxRoCqQqo7TR%3(@;v1}@)x{RcC9=-u0I
zRUuD079`g++cAx492JgZe@a7#NIpa#qB&a-qWN)~@VwNaX%H#bIR+ns8~aW{jODT0
zG@R4dUw^&bZnm2Zfcg;0d2=RHHH1cT8qA|$9EPFqi6{g=^vCY>w7-3Y4u@d?fZ_DC
zKJ<)(Kv&Bk&dIiBMD)#uI1_oBB@lTZ19JwIoJSRn&1NoUIcI<#K!?8XhZKS*gqyop
zSaMcz>`z3bawX)15QC><Hv+)66_aU_^+2FQcevbrIA;Kj-Z_j9hn^6f8xWz1J_O%x
zcD5krWIMy`=3~rxFQShR@0zBKO)EKZ9+h+N-xo$Mk*SPkj=pd<GPdMYe1`!z4XQ9{
zG{O03xkYD}HN?$!|LXMgZr(#451sdJx7i@!W`9TM&{4?QoT*ji_Wm;f$aw^jaXigl
zeYf|oi|W#a&34y!r+4q(-Q3(bM=D8$avCo$7eadBo{hyu08WQPKlDv-MD)e4{M7mQ
z^!68koQAIO0CO6KzBG2u5mA450JMBfO-Y<*uYf42KTU&577_2`lmP%u^uc3FqM(P<
zpjGwAIon%(puUgIb|T%3Dg&O=3Bl;5b7_i14wsZou!QcCw50Wqb54j7g7e;!58czd
z<NG(Z4>X(o+JZoZ(}#_=g|mW6&NfXUBqW+qWCf6%Vbb2kW~(ZkM+9`CVM&}4IUi!1
z#(wCJwI5W|Y)d%>Dxi{+QQ`?*z1gy87CjxG$hpmSf96WB&-p9Ou4zRrlZAQcj)a6r
zr>A!l9He7+AQ#+(A6HhOvNSEAIS(r0E1ToxVAVxkifd4f5N#~2AMPNhcU#Id<H4@<
zj4vP=U63>{+O*0MYM!y5;~YkrrG?pF%tvauH<}fNDf-t;PUBzJR_=HnPz<wFLsgU~
z+Bd^wM^M8^7Q5x9IKUYttqh<S;1DL`XEF);I>;3Pm<1LuC_yE_lCY{GO2$vqV%7(8
z1$J4t2<7ixVyUD+5h~2G7#z>wZ0P`XV&}n}g*1oD%9Jj)s=DVUwKTK%LBK=n%T<=w
zWJRZ?yq0zUHS3V(kZ3c8E+s0b2|!Z4QU)V33u4vlOi`=Puu@CgVQK^*M1fjsezBCX
z>ItT5o4F_^C;m7vmmw86HR6fUq(O!A9MUoe<8jGsThtDE)urAxzKI-x2vbJ1pf1fQ
z5$UvR6A>UH<7A49wF@;Aq#qQ3XNpH{SoVE;mL>m0M3^BE06FKp54AyJasHDc9@HtQ
z8MKNQt|Bm}EmyQCn5UBo7q|KHW_meLxcG$gY-4t6Uv_<cPO?x|z@@eHGdo^|nioqH
zQNd^S&6ix+CHD<4*RquBqg-${E29^|p8`_7Z_H;q*0v9&zddiy?4c5oXHM%EERa%5
z3n(bT<Z@77E<GQ=ol{T?r0u6_G?;6e0r}4RfP^Y3=WOn`hyc)ao$+;Gp87$F@3LoL
zRUq?1G-tN457Kw>;Vtee7w>$|`&Z#S5@Ki?1Q8JvGV4V;UP<6&5nZMGs%jnwq$D{T
zQQOQ|Y(&mE3lCP0+XL@>bfBm1aelHgk7xWYEGI#^%`D<%k@D1=zWH()akT!#MciqL
zaZ6D!uX}VpIOp1yV1g1=nVB>9Ddn8mdGEZpmy3!y)>Ym;6$M5W-BRx~?S{xHr^#kj
z0l*Qp4T|vT)Y--nLk5JLvxo%eL}eTkA|jobGa%YEw14KYM+AFrXD>HZ9aHjN9g%7l
z01!F5+ox_ILhl^{=FIb^4*--iBITSwHRmj<h=ZzT5dd%qESi~fN^^xV_NRHg#yJs@
z6IRu(8!Ra}rIeUcN+RmrqJl_?onl}yR<Jo95S<_1BAP{ZyRDft1H#o!w3KV}=(5Bo
zYHS+s1CbL;#5D(^;ucFbXqqO0h(#_r3MbClsCTwajl-a-v1vG`;rIY(5swIH({+}T
z)-9^#q%$(J^8x3SR4wy>l8VC_RMR-xZv%+100QTvVE0;0DCM0qsx5Q2oUac*=BsJ$
zWpL*7J0W<4P0AyHG&v(B+lDwNK=eL{YRX&^=0bGNkK>@z+F%w@pkV~iaU9!ryV>6u
zn;HaEjmM}dj{wlL8&P#WgKEwx#^^&7$-+#|JLmhZQ&2NmxVgP0L{DIupq7IeV&hz}
zdle%CKy0_(`@Vligv<bdDW5_JP17t#^<+9z5Ue!J&4fj+m&Q~&E!<t5J<4@H7;NIF
z3Mdn#ATu>gR3=j`s2Rm}5#}?a+3b;MbMxBA=Iej-_ZJ1Qf|X~03@|b?mz>2?4>awf
zO>&d^6LH?F%efF^@Zuez!Qq8Orc>&kuD!`>F45%BU2&kWtXL#KAQuoR4M!EpV?S#w
zrU@-c&dkYG?tdlH!MUKS%n1>lBj>&Map?P$#+2FS42Up}Jt6uvI6sZl^>Rn34@C=V
z|4ulfloCWg&?s1TDCgvSh%V+l2xs#G&RNb7P)<X(lh6z}s&}nb+l4M9YIBPueHu<K
zHvb=KZ?h}OvZM={nY+hNX0BCL`{#6@?%RO62Z#X^o&t#%fGHABa)rc@M__OzB%S~y
z227DaNDS_kxPsfi=bS!!*WX&184>PoW(>^3!y_|S?cKLa-AB8s@oQcE001BWNkl<Z
zvT|icgu9!4_Wd~WrdGB|d&*o}6VCC@+sU3SM27$<qAc=IqiWZjIkl5WRj_tsV+?OV
zVmZm2^UnLBJVQ=Zm+6IBVu~!nECZ71f>*TR4gPcqye+^50`$W%bp83uPpXwR1<p|*
zTw<Q)rIaas0>GFvvmAy_RF{}rgkM#y213LXCoCZtQ0-$>b%|L-gLf%&%F=hPeZUal
zIxo&)CmsPBdeLq57*l3e!lizUVU>Is7tG#onWvkJ?>UL+^*RUdf_E_`%b-wzZp}1C
zgqX5d=zB&)=Q~Z&p75I>Lc8+s-W`~Ep00cD?mgqK0zqZt==#Aqk3?v&sR{_J(JNE|
zQbQWhksSlY-yrlvre4*wESYoHb)3_DeNk1($s{qHlhGEu56q^)D!dq14nkZh)Upm_
z6#>mYH^<1P9l}zP<TNwu64|Ylu5(l+F26<qpl@_Pu*VO42;Te4r!`5Y^n7LGg7qM@
z&p!f^_xXAim6&p=$%;dsUgy}2r}6k~n^&5r9A~527ejzyG~x!R#zkESz8i9!g|l<s
zcSAm3Dn<6`=~-1dMMOaIpbP+k0`_DrXWvBt?T68Yo`3#X!6B-uT$lNDJdTHha23>+
z!^w=3);v@|q^>^*W&p@Ji9{PSnUx)LF5MfbG6SFw;ep?q9T+*OiVuC|&8^pXcc;4X
z<b3%4&;M$C`tT3`_W$x-AHuNh7ow1}>0?D|Y|E}~t>F2#&2H?rVjg1Obn{>VB{CHU
zR~TULi&BgdRc5GuiY5;eCLaLFhn}2^^F>uwBVujACsD~ckqevYwh4W1Pnxy!Ee7+e
zDx5Y_|Gm(n<@eW_XG5&G!^#1^#k;Mb+x<J=Xv53T(QkPI6`}VHCeY?qHwzM1>V+7)
z)P%>P0;0eTKzA?Dh9(IewFISC)}dCb3quR{%zK0#!TR?2zu!z%+bC_>;ufh$gICgx
ztg!Z~N^Z2MP_vuW9=<|Q<l?=#O|XcNP|cgut`#|lfX)gAlarHqF}hj{R1C^K3^hc!
z#<-H4b1X_^wk$}5pt#D?HzK)tEWz%fMFmAwM-EWQIS_Ro&<Jm(VgOMja@N)FqyU8E
z9IQMP=e!wct+~tgg+LX&4<<0JVt=bLYq{3=C#-t^9g*T&@??CI!&KEFcuN|(eHpEb
zXNB68ZWd#utrrYal?aQH2lt3l)1`?Bt;=D1AXZON07WDKsU93}vBUnEzlzP?+G=Ry
zpzEB2ZRho>b{MSr7-BcRq(Bg29h29ApT$<MU#AEdHgAW03XHa3;1(yd=CMGPaR^9N
z=B<yE?BH^@ewS(lxRIPxakEOjkqpsl=exZC_IuY`MMd2<9_E8?oG2BM42+y&j&mu$
z_7WKYs+=d<9jN*%ln}QWj@ZcKcmAO@;bgUpF6^xbeiEpnfMO;PtM|1f>rlgI+%Q$u
z0^<71`Rtq@#&M5oX66KdKDdCc?i(S{w?~6kdVB8>^>}(}4D!)rkL&xZh@`wr7k3W(
zK7c|>Mc40$sz{@GXGn>OOz#hU7tH)Hr<j)OLvXw#!y(qxDb6uYXUPc>Z5|#xA!1CK
z5Y4Qa5U<zE<#O(V58f^DDxzzDOo(_GdJ!?H>~%`PQwYxc;6rEM>+9DqBH~=}-^`gm
zeg1-oV;^FiGhc>b7{`%WQnE6(JQ4O=Q!8&|<rrt4y?3r8wrh$rXE?q44Rf3?FScEF
zoj)9U)3k)458d$P(@!e;{Qf)Vz3&F$JYQe!F6O-C6n*Ht@8WXJ=1HdT`sL%g!I?0?
z|M_43Cvm<k*UND=%4s}Z*Ti<=ZaO2<@%cNGIj3dH%T!1G0N}fRwF;6PXBN3kOFtey
zeD}lk{PlW%F`>>d90AaGJ&_anxsJQueg9)xuFG@|-RMJa&ZRld7L8)3Y~9FK&f~7m
z_1yrge<`^@&UM2f=luEeza9=BzW?!0;&e^R)spATE-R&3IRDvy@RxC!KL7N4)8u5)
zn2IBQ7qTa;)4t$+T&}B!(JIVz-W+t_It9y~9y)9CZ1;4&_x%vBuPW-WKyQXXl=6ZI
z(Yertel(1foC9!&Q@Gb%8BfPKA7G5jw9Mzj=^Y~FxQIvyiU?_$Y)^7NxX{hl%XGaG
zp(8X+%g_e|I6Xh*lwMz75$U@hez=^^={h?{A-E;xl)0|le*%I0?LXuk=j*GTb$xKE
zdOg1&z-39pF#hI;KSk8*%ja=CJUzdEeR+9#`HIey?+?dqx;$N99XW6A$08iBAAkSX
ztIotDQjaGrwr3@PFvSTF`{4-NNr*YkIn8$LagGQwPp>sBwfW3bUf~=&uF^7bid`^c
zIx<C>s$4H$vH2M58$<wbE|^`s{VWxAE`;F7xz*J+RUi}}QLQ=WoTE{Kt;J^+5ruhn
z-i_nYs(EX3IYrKKo~N|LWxf(oj<XN_Fg|UwjOEI#nUx3#37rzbp+DAJ7Uyfh!+^Rq
zx91zcIEYAE)Yw34*H?mUMTX-u0OmLevk#pxr}<iUrz+k>BJbSg<+G~xX+)&wAO0+-
zIG;ZQ;PCVzFH>4BIVWqf5plX+0n}7#9^WJ=;5{$(mvh&5b<;XV#5zg-6?|B13D9>Q
zs?DFQH(pyV!%f%N$p7o(SUt!=YnVW*sc-D|_tcwvFH_N7s0K8OaNVm4+DHwB2lMx)
zQdxi2wvB3|&#eURonU$6A#XzdR$GdXcbt2FINg7xCcL*^Gh8c5S)uuxOi|t3a`$Fk
zm3zH{vA5xE?PJs4+kLK_Ze)EGXtEzf1c`PUiCubGL-$_~Nh3ySy$8Dg*L!Klozfh3
z28CK17XWbWL%Pp9$6uWPS625gkp^(5JkdAxIge=<EB4Sb^a@vTFM8M>yH)k9+f7%{
zy{p>eC+na4Yt=%*&3fOVtBo5*^K~A(rZru3O{c*s+o?zdHsH#`z43wc{!Wrn{nhTM
ze7ciQ>^v9ie;eGS?LBFCux~s?&Bxt!S-VH~R-IA6F3G7R<9JgJ7%rgSBHc7MUU!(_
z&bzL$OTis2^WoxXgeDK%K%3U^w)5S6HEk6z_s860#~o&2R`2Q8b6c2|S-ivcBopB@
zUjV?;%VNwnDRd5<b6s#Z-zb$58(Nix`B(Kr3yNNd$cF(D$$3%Hbq*0zPKh@xYB%<i
zKmPpb```TbKmCvYvt>TVWg_Q>Vfgy>tE!$(C+|y;v@NLl`r^aT^(7pUd?4q|jH=34
zML5nEy9GXUp&L`2r|au*eC~$h`vwLK;o^K44o?7(R))8s+sCI4)_BDsFT&gp$L3*H
zlkr~8FX!{CwWOPr5b^xwC!_TP=u$}G^{8ga$$O_N)A_T4_QMI*Nnr)+4Idm1&q$7Q
z0#N5X5KXV2o$va?699bv$G=sPoT4g=a0o+TRUi$Aqx0SG{`&vHl6FL9XggnCR7IJ6
z*OLp*cL2IfXU^&A!*58v?*`5pzP>Kg<?GK2iy99l^!?@aMHP-Npu?^!1W0o*As71L
zXaja~o}7FA@=1ip@!-7w!$1DfJ7-B3L*Kiu3;iL^msqZhj)!-EnByYC{diR2ML~s6
zhe6Zy@elvb)^bcaCO!xdVb_n;A6`HI5fM*M&$i^Id5*8=)A4vXjP2Gp9G;yIm#;q;
zk2sOfpFWKT3O%lF6&b`FFAXoj#*d;N@?|$?P7t-)l!Gd#2rF$tIN1`Y(-T7EmGurQ
zJAlZo%t>6eeIP6`=Fp|;3ln4RhVi>U`4^yidHKXSUe8~A=stY-V03|@4~RI72O{dn
zql$#CGjaOU^Yig|v`d#?zUKMz^>rqq@mYRN9^qS1YAs*pC4GLGo}W+SFbv~XqJ?k)
zfUiIQz3CQ^oDW3^p`5BoLRw}P9uH3<Y{rL|IgJAy552X>%vm^dTB^?Pdj7JKqRIIn
z!eR+LWk>1|ua==!oZ?rvMI?)CllI#Uhi61m$*TJF{9c4pTvX+JiNi1)k4Mf)IOmu$
zb9;C^zk82Jt{VU}&DShxo+fi<uow8S?H*<39lGswNA#g{KG@*7OnK8RBK>gGrt;0p
zvRp4^8i{}q|MUO)zYYE2|M*}2hcAEpySQ8{wlR!PDMr<aXqCXNpEspNg@qLmOoaCN
z^C$beVHk#C2%#@|M5<;+*bgTFwHVRia4JJ6PQuxsqviTqiyltJufx>$<UBgBoP|^9
z556Bw&e)Gn<iqRF|6ne2pt@XMI7g04<2$a$(+L1mnpMPC#xOLcH{R!P?XlRm)UkK<
z@<#T(|F<pGzHN-Y&7m(P{4LoS@72?9dH={Rfb7<(c}u6(mG@uAU1D)bTcdN+U+k&y
ztEQl+5z2(Qg%dZ)J=Sck`}r9@ygYTp*-(+!$u2&)8tt^9vbJxFxH`-zA|P#|tQ-{9
zk_}lJ9|M~m6K;vLn*^iw8VyUk8lg3LihELfX~m(j3%48pkQiPH&y`cKejLPgB#4`O
zp$gbxo4p_^QhOZ`+jniv-teyKY@Zp$M#+tEr!msIPHrn#>mabTh|{~_;@vXS`y2hJ
ziM+8WswTEKjaxf9LVR4NuW9e)eyBduO+odtsD=RF)NViCRLB75eX9G;N_*Yzu@T+Z
zkG~p-!_A+YP|C~?X=Mh%jcH_IIqKaH6x}KnyA--UoMqN^*PK~PSF~{|=ClW!@5LKs
zK|>w*hMnQBoUq<JG8KSoSsVy^Fb=Wxwr<rRx_4%OQ~Xhx6Z-*oAs9c{>hH0)$FUN3
zGtZhvxLt5+rm<vn>rH02#~OW^y2S|q`{8K$LHF0uhn|SyG8vl@R?{^?5|xKplySLM
z^R|>;i68{uiY7xC0U_t8B@NMyhY?h-*UNtHm^ddB=J&%$M5gYn-fZoL<A}hQWN;rk
zL}#wz>p&Lc_59@ze~r$WuN44hE=$5WH(y`slVKBJ=R;bi6sK-Dg$_9_6+kmJu9Xp8
zHv*zE=bWcGA<YDsmZ^!?s;8sI<?4Osd{7n1vOOINISVr*UJ=QMUR5vW*RJpTesH9R
zv1>{a3|(*Y14MG6L%{L$VY;5be*Nq{c}J=uoLU#s%lXy3tt+^jGv|B-xE@aLhQl#V
zmpb!5y!&1_&*!hI${bsYQ_eBxNE86!dVW#RIWnREfOCon<Q&qd!XmO|@mMIa!?awj
z&@S{>ABMwIii?T*<7|<qkmD>lTBw`3rlmN62y;dxa3DD;r#U7O@gafAI0R5wVzvz_
zgvzNiGM>2@vn^20NdY(|7M_<BM8i6lWfm66SrAoqMugCfb>StOSU9)L%RDa@A~_z8
z0C4{Lvx@jI)J1U^yWpKLm#=U2MTv7lb2mmr1E9=atA#N%ryCntQ#!RmH5<^9^GHtP
zvSW>{FLut=gfHP7LI@#TE*Aheo=(AgRYAhb*Pm7OdVZ}>h;W``T4Ek7QPMf@!|(p#
z??MQt;{g%lJmq9c_JUzPKMnTr;`JrZmx4~@1c)K@c1BeR<68q4Rhh1r5W24GP5;h0
z#zhPYD$K_IV9Y>OP0KaTSANlyG9sSOm-FR%Jah;+%`r23--~ccOhkY2AN`euZ|7ys
zX%P|7TXris*A1r<_@zz(e1E`=2Z*X#;#BPkR|Q1h4V)9pQg*rF;DgP@fixINGN(A5
zFQD3a=bckkyLZ0Bn~};gpAm`TvO+xkFz^RdLB)52io|6Cgb+rPU6Larr^+TIT2KAL
z0Ty9<F%r1~!Xanq`osVBKmGSe?)m)>-~ZWPeg5O$U?FhYaS)Eq-P*y_cmP)u8R`A|
zcg&e{bl%y%!8x17n(cM1)*{8|{Kn30oP9711Cm>=FD>9KoPpVQeSdgL^VI_Gi&BeX
zD;AwDm#W8Glg|NQHeM_G-q+(6Tl?ULV0WqPu!6kncnTjTiR`&aCN+F8p=v9MN-4Y@
zIhAH*gYRpx_DHO{Nz}2?Ag+aih-9O}YAft4b<SO^_Dbuz^%}S-OG-PWO(>A)!xCYW
z_u@^zv?o#NP346*Kzd_3RqGuC+}1Sp$E<V_Ad>yuPAfZZGeT1(A{7)BxcegOZv_-f
z3Qs#|tvww+K;(<rI_x_XtctyDBD;PtEY8lLkRMWK>ul9j?1in{%u2PLjR4*ZT68Vb
z+evOS7gfDexXCKru?7KEuo7->=s68_x^-Z_85I|ks^;U}KW}%wcDNrcC;&a`2RHBU
z+wpL7g^MDxY!z!Pw%(;&**=joH$*{M|8JdZY*(s)XR2a3aN+_I7RlP?@$vW|<eZ%a
zj;?W0kD}JFl^qM07(yw(S2K(=y<Pn#J_JLR@BNH6<3B*E$;oABA=o)2)c>`~G~>;#
zR`klQ#Y$@4n5w!)OO6lx(y-Y5-|*q_TP%w;z^=G_?8vTqx2@I}??U1L5$E$)AbNiP
z19@Kq6Sm7vzcTicR8cm2HeF?ow_1zs`NoGH{>DqccY)M(9HT0{RV2GP@or;p*La<Y
zdS)p?Ms1rjy!m|08HMf7jPInPLP9{_$kQq>R#4FU=S?`30fuFTATTEjQn6x<nK@_U
zuiL5<$qLx+P0st`IlEo@a(FeL8HqeOcz*7PAg9FxnoSov-==A#B;=?Iox#?|!!EI|
zafvB`uoXmm82~Ux3ll*!V>MJ&asgDUZ&~}@nRCiwx+`nx>~ay|-n0arBT&gHw%@U=
zYTs<>A^?#1iU^0}$<nthy4H6C6os{{ce6bGEiuLjmgYb$IoFuL5PDt9`O4I<L>yJk
zEX>?_Xa5bVX_?V^W6vtcI(yF*mLPIQxLA7v;ha|MOG3m|oTnmeiL3@x5IJ)J7tRW1
z=ZW5t;LbcSc&7>}Gh%kRu<z_TuM;&~1=P0gC3tepGiuO+ZCcKGB;*`zo>c$2`AU00
z0A$hj2qQ-Zg(HFwog;r^pHWCXvH{wrK!-Jkr99PGUtC-@ImO*v&@^Y|d#Q3>@k9WC
zWxf(Q-<5b+kYcY&<d_p@?)w3(eMb}#awb23zVCIVgJqV`b)g#^0RrX}b529=O)QA3
zWY&Zx)fLQ~j6}F}T39C2IWOd#qac!*vl%>@49+=k`MUKYb$w5WIY$$dS>}83&tnnQ
z)6+Xyl@FK8CHT<wz4M$iI~S0sA39K-;|l=$(34{`E}qX{OMb<=C@jw&0nAU)haM18
zoK324m)K-*K6K7^Ye$s<&^ce%2&KpzIVV7Hp;O_sTuq&6Kblhn;b9n5RV5>BC&YRM
zr21v~(3v&I%HuLYJx5q<DM_jSO5Kb^-Eaf|LQ;q2$tf(Ng3XlOiJYpMwJoo%9k#l2
z=9JR$`2#tZ)2tWHaaj%9HbSB_ENDyTcI36VJef2Fa#?*{EjSQM033^`!aUCwtqe%M
z>j8k{Qj*1*!ZXJiR!lp_h-<pIg4(>_&>h<(V~ipa_J*CtPBlHZbL5DuhGoo1=#6$^
zQQF*)eQ#vKt!=p-lfnXK$?yvm0lrnk7-Capm4<d!Eu8b6@FHS|c4@aoa{B`j!TXLm
z)kDI(j&DEnYBoO}hZN^Hosm2hv;W=2N}2t-SLX7dmu4s~bIR<U<p|!8jFfW(*O_v~
zQR!=J)0D*bAbRG!EZhYbg0pc}Z7khBVcc@FbB;HNS>xHeP99V_&gA^z_*ACNM2Hl+
zPF3R)4byItZ|^%*F#&8c@{tN6_^wxxc{<~!VWM^>%OWYuaSSZVEDDh0?E8^?SWRF|
z?;mRukIofJ$l4QdPU}lcURbGnRFIqjYX*1QULe9CtmMcnajB&^f_J2<(~^nMXLK%D
z%sLXT;&jx8OM=3|?~?zBR^<;`UZacCnVeryWl#lH?U1}9bCYQ+P$H)y3<7}OcTFcz
z-`@d%Xtq>!MFhyJ3e+KyK*qHXpmGorAnG!K^UnFU-9#b;lANl!hW*vDEZ&FE4~W1e
zs+NfylG7Y>UW~+HC4vZ(BMYqP`ax7A+b<dWL)Z7r8ARrJ%9)2gK#8=h4=T0jt>L}K
zM5tU612CNi^u#$cM+m(qC!AElk-zC#yRH|>IYn!-$vNk{xLj3qNtrXh`~Ek`*(%F<
zNzR47ADDCS9J+ygF!&wM7uD#xo<y8yRhced9XTXtOtb<Lt{5(J9uH5#9OGmS9+6Wd
zPBAW5#Ag@!%$A#B!In=dl5;|Y>^$eh9KG+I?{ZpljvX8j(FFu>oEHG>`(9P!!mS6U
zx}8s$DtL=V;aHC9LZQmMZf>Sz?>kRqNyV<~M*!s%O@mh6Swxv#=l~JGtsDharTxxN
zL@sAumiU|J56=7f{58#&looO>gnmcx7BLf1FlZMyzmDQX0BT0He)X5BZ2;J@q&m;D
z_uj0mLN}}`JG|-Cb6Qlz`A%3<TmZnfH2}!6z-otLrQ3A9<eWcz_;3@}ZKt4!dXLUw
zN~{8i83nwxmHTpaMU0v__&X?n7dh52-77H{ABZa+P*<?U!CD@46?)?@u+8tWvfIJx
zT1k;Go6m6#QLBjUKJAdK{9Lo@S0$Kh^l2hUWXOjRCh!KUBx2?@p3xLwWW!pmQW-L%
zTUe2(lI6%ORLzrQBO*1Z9`4E0HzHaoH{&ho$y-oV3B=K2GO0DBQCetZ{SU1HAY@*$
zx+QsR&GapTxxtwC_=f^CT%JlQ(RHuK8%k1rgj7LHtqhHhW(($Mx%3rd-%)Q?+Qq%G
z7ZeFU{t^el+VWq=1=-)7YJ+&og}KRttRH!uWzhCy=mXA0wKA^@qIqC+rN#&|tW2ne
zTBY|Fu!{BZPVI+x+9HANE|^q9cDjmHzM$KPNgqELwmmzyG4BwFoH|hRHBo^!RHV6u
z#&ByXaEMs*X`n{dY?o){CrO=OY{QP#NdPRWvp#1A-eOIx$Kvx)zw+u`A*MmEnDgzp
z;XdZD{s^e+i>inP0UX?-clCJQ;!&G164oEIefS$j7#IOggpsjzVJ$9tjb5u99H{qR
zK&`oMi#!!xE&?F|Y2z7LyN;EmQ#YCQpNhyD)qro13OCq#JCNGp06sQy^~cl6RJ!X&
z6k#dZQ9d}=#pO~XDcbLuGTTQqe2-aK7|g_5?$;!kYNGwK(2Xm5l~>t&d2X0<To?eq
zEz4C^%i(KUB@k7~TGjW^MpeYGcKe587?1Dbe9dY3@ctbDxMDxAh!lnc67`2?RTgGD
zGLNTI=nvPIPa?d`S7!O{$KR@o_nj7<6QOg1^Ig|DKe*8S^oM^C;pgY~&b!bb)&rDd
z%>6K&P9r%_KD>VYayfrFj6D&CZg9^3;UE9#oa;lfCN%`t1>b5~tYPB3WYr#zhy+y0
zt->kh9CM0YKUS|lv;Hc0^*z3i80Tx6FNde^kf<9Eh{(*sdA_~?z%V|EWX{?7Kt4#0
zIi=xvLPXA-9bTsB9GPx`ImygvnL^k5e&iG-&6U<~mUxZX!tGGOxnTC8L=M1NQ8}L8
z1L%AyRsi02)~X`H5}AdkIV!+u=%Dc;Se?y@T(G+drHMgM_5GoqBiAL3eHe#Ogg|~n
zW;idLf1!#%#OZpm1eG>)r%rs!NuY{E<N~KyPX%(p%zO|r^e5)TxpdFY_r4o)NqMwR
z%ZwHyA`PeaYX1Il$#F*K$Qg2I@(Fo<|DAzUfY|k;7M_tAtx3uP(-{CR*Cl2Cv)}${
zJ-0$XsxW63ol=U%8nZ2JI2=KBna@ZrgrV?#$eG9Hx)$({fBd6}ynpu`x<QNXV>WU6
zW)SFtArW0S0zg_O79I{yEq9v8Qy01(PU{{Tx)A{mp(FCIpZ@@>u-YEHWxgOf>w3NK
zmg!ZQRTvRDEr1yM1F6s)ocBbIoJVv-W{;Xzq#Bp`0);pVDP9fK_n{lcqpGCo?0sKJ
z#nbiGId9seHlaSJ7`na>r)9Z-N?ZUy`{Bv1hN`B-h#mswoa3^L<eV>QDz;Mk;e<%O
z8vrz?NUj)+)ve#2hqTPab)9)$zCz<|Rz~>3ENp)$hW&Outd+ilZWCMyhv1#V>zAKu
zT$*{ZU#Az)G6P10emIOr(_p}S{kpSKA{V*=K;v@FDb3Stin!4AT^QnWQGmngNa&XN
z?3}mZ^!4SV^PLMF=fpXi-N)0rA8U-pPk;P95&5+wV$L}&R=oPqSD3^Rf_HJbAiB`?
z0Gbjz=R$DAN{Ei`a$XDHx9On}e^K(QZ;Wm6SLh$0O_aVBY3%gLzm{YD?Y{FyWN}YJ
zH~5{P;bmZ@zO)tbMkA`!4&8n2GM}#0O2p<tYFmv5-w<y|#`^~Mj(G}qnSeJ+;YWJr
z%?S@4c+KBbRrd<n2lfegkFLT#CW6*!G}YSkhU~6e2Lh<K1or(0+vE*R2&LA*h?}og
znIQFraMSd(ItslZf8Ts*d`RiQEqg<EjpyS>@DZ)-UgWchPww;v_jYSdrF|z(*di_Q
zhF6Ar(m}mKxcgMM(e%Z$d%dcAo%kc^#!aVypqk=r<~9#J7B^iw-UWi*O0ZWOCfr%(
zwKDb^D7dl)R$od4pq7VUHb9X!)X<0~xcLm+i&nIa6RiE;+IO~&VcOUgnDlVBruOll
z?X7Rg<~PO^dQbRzv<YGbTH4S?c;uvU3-~qWh7a8!^xh~_+Yiu)8tSdPVS%mY9IM7+
zyLH?0YWAc$IK+m$TTvu@fTqAci}cNt0{_*&{4Wt*2)%;FWwPc^R7Ic*&imU_(Uj}}
z8kebEc}B!Po}LiV1e>sVn?VS!Fv@&zuDj#Ft<gx^0LJ|Bmz<)VIaO=_@A1p*%8=;z
z^nHrgWxCh~-5*Y&Kg8*5=ra=i!{7g1Yq~Iw!}IC1#3jWT6UUU_J&lNXonmG_^g-8a
zay&id9CKQH=)Ldkt9|_RMMR847gO%K?)&e5M|WbT001BWNkl<ZP|%mpA6ayXdFcJn
zc@`Bhryt0fMYQh&5_#XZlEkzuahdyJ3|$|Wiz;;eU}9TB@?Ebg)9dFL)Af2KLP8vd
z(TCteuK;m+70EF&5n7*AFKO5HUEi1b>-}$#T$N+T7(f2}ld6urUv2h+_dcamjk9B7
z7CDZ6B~sPr!8vk-HaoO(-d=ndy2fk2oG~eL$~+FC@BGVoR)s!zBHW+KkXd6YNgcfj
z7Z3qpNts2D>rFwV)6-L2mU-{8U05V3GwX2(+6)DSHL*SX>KxKed#7FS<lHzO03a^c
zn0Q_iSy~HG<(G|zL#^5M4WMr&xfB{soGw6Q{c&NtkTbH33tg>qIVTYb!vU&qoT|N8
zI16X;!8xCnsd4V#LJ2HWu+R{QmifBOvniUK3q<tO$Io2|@83Nmk?)4f<^1LI=hN|c
zJRWR`p3kqUIv$SR`;Q+#bzOLRey6IRKK`r<nR)2L(0eNc%=q4v11key8K2(&7yr$F
z_iz69|M~y?U;oF@b&k-5-utl3R{+^8CCP=Z2L&^FG+^AgDx8yDKOcJ2!`N>{_@|#g
z9>(D?4k@LSl0B&NJgaKVTy3C=#1rv2j!#cVAWuZY;kg?R%k{#XKmGKFWuE@zw|~AS
zG?mmqB8tm3&X?o!_ru|Nx_oV;;l1z1=MMnDIiFv?{`}J)-o5|u{O$wiC}o<6<I{WJ
z_5b!?|KHBpU<3|hhv*FYCFfFFI7jb00CX-Op|MoRdGj`NKJ4dhx6T7MBn-<3tsW`n
zk!fKOH!tqGZWs?KEu5n7dLrKqM?f?i0b~5ORq5*0mPJG)_x;hHVMMfm7jjNjF0bcq
z=!ao6c**AUQfx`Ghz#S2Gf&e65s#;*hM~Q3i*hpj0Ey0DKdNHPj0iTRzWJ3BuS!oa
z?|y>{y3QHW^VS*RcVWZ0rgK=D#9Q4QJQe`bKrO#DK77rCs<*WV+vgzudkIBv3Ai^c
zsg~+YQK5-1ETd6{H7RTD1Fc8FMtge`q>MEf9_t|WP9+U*n3)wBEo}LFmNT#ulEZGC
z))tesE?*lQ*!@2?<A+KL-DHo|`0S=Zyb&=sy7Fr0y)_kDGBmVi6zFOe0ECZj5AI|Y
zcxyl1uF0DMQ+I`LYcaKZhW0t+?Kn)oX#}CIw6^ujd(?BUVO3RcWcCOS9)<lq21VMT
z#l1;H>ke@9UOVT3J1c>=mgjxXxNjD9XCPj}ZtjxAO*2k}w}$)e9KM}yZf5k&JbN=^
z+pWzzoaj#I+)Sg^@nl`#tC)Rr`feZT9g?AU8`sXI4cn&;8&`eN#&4}`1$fhj@3RNX
zGPyxz)~iunvYRonwkj!Y7N$PTa74sk?P-1^(b1b3p5AH<-e&*bvoT7ai}$FL-51zh
z7TDZ1ko1>3m+A_q4cJifPU{k{rjIxOdUHEyC1?1pvjhLtzx=P-f<mNNvWn_Bj$PNK
zINez+qAH}64fZvxKXc@q>Bi}C?FgIbdAyG;6j5s#SE;_Ud&VqvTJr`lg`pdSSvc7Y
ztm}Fog5mGXA|l7rQ+-0oxs>8OO-6M5@ZArmckf?6{$5s<#pkc*5W@5GGXPv(zk2Vz
zr<6G*9>+sJ46iR=L?mZnksp8fPFQkY0I*v}fK8?@e*E-VRo^{7hpv11@+pMw`21c)
zKK}g25G?VBV`A%S){anA)h461_(B-V)yT<+tg0|CNkI=o@0_JukPm}`#`)rWSLcGp
z1~mEVbp9+k<w8BT8kU$PCbkb_SG(&%wO{CmBNF*;RF%uupF=l>VGP}&8;@Up`rYf7
zpWc1=k%&y%;hY!Y6lc?J6L~YGbIyruv9Vu1e~vN!>2Lq6nu;#hvspkfXU@qvPtKWF
z+;Dg@kbs=;$CIjFUp}T7r|b1_dLB<triL~WZ=A2pc|5)o&gPYDPQfcXlv*{Ut?J?U
zB*GkLP(bH%T$bfxJDDlc4#%VU&mjQ$z&X9Xd_~05>11y;&-1b@wIhTk9Zf}J&Hy-c
z)=cZ+>HXp9U79aB&h51S@a_lUl;#OkilTtXx{V@q)1Au7sIID-<LpD{LN9jdLg$=c
zrt?Yx!-fM@c@}F5rt?THFIQEy6p<JgL-*^L2g%v_kYda^O-ls8=ckkRUR9a-e7Pdx
z`}gl{5G9;N@)C1QdFTQndhY<C>(<plG#=ljILG<goD_J&KWMiJlVjU&=Ox)Y6VdaB
zAAQ%QWh!}u0L;9^c)d=2=Yw~yQOiuzm6?ZOAm@j}Gk}_Lmx_>cM9zhP<V;cU@uz=W
zmc=>ey|=9(&gYb6j=2l2^W?kUyDlzQ1@*o|baA<ob4Gyop|fV%*gePNaU4hMfzFp}
z&aA@TyTjpt04dF(>wOrA96Db@q(uN!s`wpS4g}{MoeR$SwhJ^GV3T=NbY;BRD6S;~
zDCb-+vI&{2<wZncHo2Dwcm2Ws#NN3oB5H|<WZpd{JX-+3JWPx_nbM-FF(w~E7eWn!
zmYvGBM*A`%x-gjD)KFCC9g$m>D`;_anWr<6GpCUpC-T9$Ae?y1tlw5j*B?|QXA7hh
zs?`jk?RAIa2@&Uc5@!DhAbvbFx|c9-5IIs~5&LUexK;_UX_rN0ZJBnG;(PzLO)NpA
zDkz(I?oE*Ijo`0_2}@C}HKnmu>4<}kLs*Is<E@o1UWEjtO*8$5k3JDK1@(Ff8U;S+
z8)id_yP=hl*$VA=&5kEf6|yk16$INPJG61znj%J3c9&GQrb>hxe`-M>?|os75)oN=
zYcMXNnO2Zk_LAjwturZmIT1F}hGHhCS_6`dGe&D{kgh5^J6C803@wgaRj9ZJ06FqL
zNKTls2AQH*%RsHW?sfnuw)1>dA?Fc5$bka62H*q$1OXsRX?J9|QIKkQ)<)-hgZn3{
z!eXg?JJrP9Y{t}Vh@khK>wTfVcNx~Z(4E_Vf^RCF$vL(JCBzbDwB|=bNjC5*EXu2n
zXzMD>Ns^h@dt^_fDdlyKL+XZ|s7~iEP%bROTh;O1)W5#lx?QX~6C_<vZsTwm^RT|3
zS#{UwB}e4E2T(^Oo7sYK$puW8T@K*t7+~LCIA?VTg-);;2&_y4RAEJJHW|6;qB!T2
zQt+<LEh>})YL@EO=qTKgA>Rlv&_^@low3}_puG-F;dVNQ)ie^?e7DWTrv4CW26Y?K
z1Z{`DX0bIxp8W@1qpx<@V2dF&y>dwdH0QiKM+IoL#Gu83<DrY4rP(xdMgLZ7>WEY&
z=X8IxnTtr@_qNzogdy4%<BGEh18AFu>U}4|`&s~QMnvs|=~v^TMX*WEdvfHY)diY9
zGH(g*K;#g>d(UFR&FTCV!f>bxIe48!WS%C|ux1t#%*>*?EQ?XEWaVei^SsJsKy<cM
zY7--AZfA;7g+-N_Q=II%VwQ+tHq*>1QZk-x?R1^9tV;wW7j4Zm%Mx=4p$nnpX3#BB
z$a_=z3uk7|)=Zco6*Dulou<VSK@01r#B2gM2gBjHfcRqCAWU%<;c1SnSU7d6k`n;t
z7>No2#FB%A?J=nGQ!c^iu-UgDBF9CI7_F+xq7Dm9jzv^6R2L}WJe=MmKwKtJbzM((
z!E;W_RLn}GL~`5xC8X*^T-HB<WzQCto$4}A%qjFok*wtnl{qsj(Y7zg7!fgaJs}BX
z5w^3Eb29YV5sl;6*14gxbX;KOoW)$KE&PRZit{DMCFfKwIFU8$Dk7Xf!7c)>yni8X
z&ssETjq}6dgsTfV=fyNZ$~g-oBBBEY1tD^(CB#uhkbuaEu&Ts)64jg{0GysbxX{J<
z0t!e@!D@d=aa#Qi9AckxQ3S5Lc9nv&o$)y*D-?ovq3aM)g;gLe3#<ZPUT>D27mf%C
zoC}5DsAB)U$-){6y2ZpBX)wiW&NJt<<q04<qM;8&$SmgPk~x7w%FN6@X9W~as+x1O
z7H|!qU}dT1KC1fk^wc7&A$aFIP+?~0)^HKHL01t}({iy6wF@D1o%i1QT2&c_q3efb
zx@-$JbO4az<a}^0lqrTty&5H?w=7ay#DXY<qH8Bt_AcB4I80i;=4KRs2J6V*nv1-Z
z;<SH>tZ=2(91O~JLj!=M5lYmf);fSiFlX=4J7-=!wNhS3*Q%0B(}D%<DBm5)LgQ0P
zs!7-s@NuW;A#xamv#>N<B39}(A~-@&Flz`O0$?(21DZREb8j7lU=J~8xj%cD1(C)>
z&zy?m$*M&)6)mhv^rlY_!0^^VSijV-54&iT?8)*7>24lrl%t(>ssjM<-e;ELk+@9X
z|LI>8{EbNU_aaj170ki_rooIc=A3vfm=STF=T?bts_Nh<c(+Y#0a98xqbjg)T4wtj
z7SU9WAKM!C5zn|%tI_8~&J+2ZWnNO~`mXC?4YR(vZw890NX{`ua|cy(lVZ*yV!j0J
zb+-Rz76ZD6;}elHHnwfYX_=U1nio|;%{CykGsZ^oW>z4aMZ`!kP0f^5q+oqbb)3^u
z*MNwiFo`okm@V}X9HQEz{L~Gc(=uHEq3aL!y_i#4lMYu)ni710RBT$)GCAjv9Bu1E
ziJStY6jPiJr?k~)!dB+2CI*0rDMmBbL<f>tnH}x?4V({MKQ8lJ;m58oH13@9JkN+U
zjE8xiQjDBqoG#{0Voas33xqhGKO;~bE9?@O?^aBVIrRO(y)y$aRgsjfr7(9lS`QVd
zpbjE}GPCVIs3I(JSyEauD-yj6eLo(=07fEE&1Nr@7Uw$WgY(`a&dZ{zYg1nB7@-ny
z0FYS;5gm11j|g#|MJ2|?2y4}R*lIpj?Spg9Y@UEQDYJ839d6lSP``WMb!3VQfV5m?
z^(YQqZ+nP$)OX(IJ6dX~sH&McX9+ngAm<FKIY;k%7rN#VQWaObt<&kWGX7Kne7Vun
zJf$5&drNLAQ>(aKIST-Wt}_T-*K~+}I5-#P>C$uvy>LpFZg@inwY0dBE^C%IY~Co+
z6kd)@`CP-li++Q}Tzi~VfvO_HjzVq19;6`LM|tggPFZ!brn#`YW8t!O!@TKIP2HP|
z6v~3Rag{cCKy+a!KD3({x-i8GIOKzhO!Fl(2S=)cnA+~oL{`G0lCe=_wL8Ca#4MS$
zLuc_9)wRI;P~;PDHCu1|VH*mjkATnn&V9=&Yv4h+Aq4)DSfDrmaQ|p-N)Wv>v@`{A
z0S^q=TemPpFtX*kC7EWHN_kayOjIA&f(Wf>q*08Ju!?eR`y~TwMQT&uc!lboZc`Em
z8f|{XLj;O>8?>nr72qfsS@8`L&^GGp7C?9?v@pLuC`B9#v-iF&j2ba-_4j*xYi=aL
z-}Xdkzbf3so>*#j*$t~4UK@klU0~z(d?K!aLmRiHge7dO9sI`AwJY}VhLMd8grhaG
z10RST5V7PnHZ*_TeR5bs9O{FGcXF2-3q}RA@U9SCxpg8UiYQR^;3!p!0ZmwO!;Ate
z?Tef9n)0Z{L={98S02qazYsBp9s7bTLa4M(8CLHFsl+Z^t&`fE5Gvdm+6n#3Jfh{?
zS0@L(r<!l#gc1+4LuFeXH{k|z)_F%A$~f<cJURyo&N&-`lxIXs&{9DXoinv=;noom
zk;Pit>LBvYvG+n|UuMs6F}PSgkXMY|Ts`bQz-`n;vu!rM!#9xe4Mocw4Q=+a5#JDZ
zqOB4}kJX*(E@pH0&~NvGTB)5CRj`W;)m^XynpmV^9Nrw0M$>|_y0=lA?v+0J3+a|S
z9m^Zb*)9XyD%n<VWsNofW|6&jol8klX6Fz94eX+oa9<CyxLoglXiC#Vn~AtwMKot|
z4xJ-rWiDEaYQpsEyTGnLTA)|4Ip*A2J*h(99{`c3D~nW^4iUTYkmC~Piz66%e|&y_
zI6eRT`@dJ=!|B<1|9l#q^WAVz)%o%ghOr+`m-FlOa_)k64sC#JNm_@~d*&SH3nCq#
zzc(EG<>l+k*RSKy4ZSx~ZZ{ms`RV-G`EEEoi^%0Nb)D~mxAa7B8TJaM1V@0-jZ`oY
z?D`{fT$ZaRd_E4L>zxm<Agu0mp+7LE>HHNDhQqr#UeD*(uJc`R%$hSJ`7)}5+oQ_|
zKa4%Dqd1%TXwIL0{&}9KfAJUpVde3SedvdA7!RtNQw&|#^+Q^&Z3#lO86XH}$;oxS
z?*>>sMIT}h&IRu}-wnkMKsKMh&>x)h=dVB4woiqXQwScE<8t+(cP>~tS*7~5BUC6Y
zW6n{QDfFWYU5<;YIs)u&<^1G!1`etag2QGJ6Vc&#5|PXK71vN=;l!-<#h@ab&2h>*
z0?_I5rC38K$9Odwch`AaiL9KG7;4yBPqh9Cwn)8qgpgTvSzbT=0m>O>%W9LU41EUx
zF%|Tc5S=G`kk*w_3|aw7=R3WAnqNO1-~X6%jMG^~=4B~8@qA60+dbvw<pn^$`|djs
z9y%|gKmYu(@BBD~dC5!6<Iwe;&uIq0&<*RO#VIa`V5`2Jpd-5J@<ml0IWURg#_~{d
zK6FD)v3B8w!UKQ+*ExBwJ}6lFMB-^lrsBw1QksfCfOnmD3c#FSzI-fSEiW+7DRWHu
zw}0`MAAbC;VG><G3a6YRAtE_u{`z`-@5iUZlMlmiI4$#enJ$Ot?}=PD9=z{<_q*SZ
zhvU<C&qOqyKB$TofPv9DNB*aue^SxI^U#gs`*%xbetmrfQ14vV_5E-V=A6?Cj2GZd
zL;>deO`XWykY$`JuEHvkBdMxWC30AX@yH@&1dSN_5fO8WmQ13m%*m=HquQyp1Bigd
zPSOhhet5E=R<pqDyf+Uy&dJK+oRf<9(6t{~ggNIMGt07;0eCvsGK+IE83|N(mz2o|
z`ew7lIdhJHNOzO98WKq^q&PFP<hV?U*=FHWeG>1<G9~b@%|HgN)%VV&`O%q&Zxz|C
z=5e1nfp0Ru@!>I#-<H)Q>MmHUp%7Gg<`zjV1}j_XRN%W}Y2Ap~8*|Rqj=xrD8xy@P
zX12&etwM$-482XiP~2$*Zpi{047DkR8`e7R6{d#u@4E1}%PGBef`>McyrEz0vKih;
zy}L16__i`;i(l7USmrilq3sXgUTX}yE*T$q73^Bh2g>g^KA`@R{CzWeyMZ<yrC<Zx
z>zE&;c)oS7u!?pHHEF&3js3^I$-e*1?pZ2@yw<CF>-4bo^o=Z~8WENrabr5P?Xo^{
zX1GC>DmO!S5{rtKv>Kuv4@lQwK+!i?{ss8a2T3uwH)?1YRj4~3hC9%rRn+Wt<=AM@
zv{~kx5*!eUXWix?(SmEOKf_}VQ6mj{0ASt=@86hseG8u1NoH<`i1_CIu_Ly$4H~q2
z<2SV#H|SLRDA!e{-)3FDtsdE;cvLIF2XN=T;X`mW?Y)Y5EDpXJ+bDqfMvli&(N%Ju
zbINgUM;bN>6_5&5Wwtuk*$B;vI3i|ck<0nDP(@UU5D?scNNDhks1n||16;nnfnCn$
z7KXLDKt%rj@Bi*F4#&f&DYbC6nq}0w(48-W=p5&?Oo(_Ki;vpc2P0ykhu9@c%k?@<
zudnBE2p^sg(;Pp2z5Mw7cg9831~Er~)3H~D7@6-{;hfpNAdAG5RrU4qQwXkG^(P`1
zS}rLG06Hg*=x_h#uY>o;Lx+f$*UyM}7(3q$A@nMWsGmRnq#}JERxG;AX+m(EGv{Pa
zX$ZaZA<dHl97aEMqe+{)@dT?Qt8#Xs^P!(FFUx#3<?n7t>B8eeh&;!6^=|~u(P~On
z&C3NH0SrVAd~l&d01LC^xG<*UyB}1Tb5s#?;j*F_k-QH!p;T35BGN*zwzxh-=EQNb
zV2~82v|R0Yi!qDvK^XoiXvCU=30>!nlg(^osT*Tb<rK?bv})hXDRJNVz7H|x2EcG4
z&|)(-)o>2H@5p(?$x_;x6%m+qnv*S6B6PGnXt@k`ja}j%k1qgx=t9>o^TpOOk;`!c
z)&BSdB1o^!cg}}po|gG~czQREr!OD>QN-j-uuQM$oGGB0zxG`}j0c5@S?n?E`U3#1
z%AY8rF=j*zowALUghklW-pk8`0brRfCDj43?+?P9;}T<9Vtn`A^Wo`zoG$=yc>dsA
zc>VMTqXb(8dwPEN<8R+_j-0a#!MU(Zuk~mk=S6s#&X&DumVu|P58ZHi{rLa>;jf=R
zd{0Pmxp2<o>4W)LFf$^~*VoVgIBoDP()INdBIf*Lrs^>+zx&(&&pG$~kAE8DHBRRc
z2Hy?9SxO5bFQ5M492zcaw8nSuKiJ`xW#Jrs*N1Mj(?obTA4Q}vj5#f7nO3sfM(mH%
zMTA3{v{h@s#LHy*kj%;Elm=R;s_%yC#1<^cLB#faB|`B=q_Rm~>FMXoYSzj*Eji7q
zMe1%ZzFR2<p^@`lK~Oj|a|j)*6fm|%f1Sv9-+AY(nTB=CHSTe6)OF5A<A_M1FNDv~
zg|6qEI49YznD)b|5?`<9&u^uAhptC#$TF%Ac>A!0-tItp{6>lJV4&Fk5w>;27OQ)I
z;=?~nXb-n8-n+TNU6FX>g0{A>us817$r-UtvTn*@ggYrIHYPwfrO|y|v-v}<iR)O?
z-u03DS5rnd+3;Je;4e2mxQU2&A&IMyMfWr_ZTZ#@73*6r_0H5z_k%gz^#Hqnt9z~N
z_DvoXwYW2qZg1=(L2@&tx|NyhBNfD>vbnMN+83{NXnSK=wYEN6&$ROu|AmqkZ+hgN
zAKW%0#rlzMuJA+mKD-HixA;j_qcW>Bm`4fLwCP)kx@>H;Zhx)FhYcm$Wxk7he9#l?
zL*tF@OX3b1S<Tt8#g<fSo4AI4?KYx~(J$>SF5WJMnSy{ft`9Akur_&h!K|u!8~)jX
zz4uSwlsu0UO`$O}(?@;-x;bL#V|wH5^VFId-mnS)9(cTMoCJKl9hXO6+9B@kU+$)F
z)oSj6ea9+YYXcu2wx64o&F)RAuC9IXw&jM+=v42Q+s%gMb7n+Qom%BtwOThqiDeTj
zsLM$Ul?!r~m3zE$z*s`l57@XRgze{dg>+m!kr4nwpqqz3XE7VF$HoD_!joV;9NW8G
z0-iwMJ&oQ6A37v*j%?u1tiqC60d(ktaDM&rNmZw1>4NXOQY*|c$CyvY9uZ?=W*J7z
z8Rn(Tv<T$+X;9IWvM3-ziZc=U&=I+5&fbG_v#MUFWSX_$osrx`)UHX4%)-ahQ_gvb
z7ju6Um6Wv~`o15SQyYn;sz3hlJ&5ES5h3)4d6_Tg>*>_>W00Ig<oVruRbA$*nW7b$
z^ZL(omR0t%U|Po0dqSKiO)-BsJPGF<=Np^^0hT4dp67Q@!8!EZ=zK`=V}&)saL6g9
zIFWNC-q<eDq$6VbiU35;2LSDc11K!l*HVp&uy8+~jGF|2IZnD+B7_+8>v<mfe(1Xt
zm$+QJ;aKsmu^-k$*OU_CM1(VQ>V{+JhUNNN_uDvM%}#73>20*;uJ4Jw)x3{HI~+nd
zo(`Oo(Q(aE4p!s3YU2Pv{cz%(a*kRuIk-yDOynCAQ@JUcvozu|mr~?;w#jjQ6gS9(
zrIGPzrC;t|qZ*ftNL@d!={c;zmpRQboeqJBd_RV+|NFoBcOitQrxPLe$LFf%bk2F_
zIH$wmSh4C#5kSOo2;I<ye$1J3iXrqN1Uou>H<0t6fBL=i{`B-75Y)QBF%$zcS+^R*
zZa5N=<SaG53qXLGlXEbR;d=h^`t|es@4iE%FF*Z`b9N5Qj8IjlIVnZ&mz3rlXLHlG
zhQs8W#jJ~rtk{#VAWhfl<EPKT5fRPPE24#Vb(}LI;3HpnlRBh0-A=oS5cTr%k;tuT
z^o->8b*uKnG3OlPMOByS>|Ai6gH3vvjOk`>7|VPia@J8<dJ(NE-rDx9S_O+$5!;{F
zs(`aFWCcJ+&Qd&$QoF>waqmS}W38>w8^+PP?Si<F>&KIs+ci-ZrCo4Es{jCML{J}k
zRavI9_nq^>sw0a+ZUOJEA4S+MW<MOurxs>TR053^0LSr&L~*%@K;ndmhtM-8&WT)b
z&Ks&>5BM_A%#3)wFRPeE1Pqe&eiIz~8~O}_?qO>MMcpP{QvXs!5D6SU>I81IjrRvV
zz6Cz3;?DjX@Sola)+XwvY0%=DzV#J&Gs~;$*;W+1iD>F;WIr5S12YMctFKuT#|--{
zc)f8{t99zi$!aY|8yfCo=9DYYtJbd6q|X~YZ?zP7;L59TQ^c)v4ujp?%42#EURdQZ
z_YU8<pJ_H^Nxhl6SiZDL3>(m1SAzb|sAwhHLZi&7)a^Q5aBV1+nxYzEW#iJm)Za|M
z?){(Fe6G9xx%PraGM2l%vbOkaJ*n?9=UdXNu_d*2(km7Ry4Jq<2I01`C&LG2`hEPQ
zu5=ECP%|)c&aQ;omA+;rN}3sAkuBa3WA_1Mby7`R2ZvPBh=>YuTQbQ&PywZ}-a|wO
z$Ow2}0h<^u=VX7w%;v&V*P3k37^~+W*6&X3l*&Gru1WFC><Iu#E&bH5F+PvyX}X))
z<JPd3{zL@u8+HLDrfoO)Yi$p=zG`iEpb1pEn}WBQq`SUa+l8$yi@vpUD~dQNxyqmo
z72?h;u&hdQHh<lbQFjw+f?Y(K?jeu|Q*m8s{QE#L-Oc`qVE@_n><zdT_P+s!l^u2e
zw<V<1@=%OH1pCRRp|0B%T$$p|-9#sX);PMi4U-CHLTiTgx>@Yhevf{wQvIx|)$iv%
zq24T$T>!MS5!J?as2q~yJR+fUfGEt)l}K*|uopXzB63|4Ip6gMQ_#DtMC?OHM4>+z
z`B)JxI@tTJglsvJ?rA6DgD;jVL@Yw9+-)335y?4OU@Snc7=o72FR*@5LHoYP(#CnK
zZ3%H+va0m!<U>gVf~ro_1OUgwfs!!Q$N&H!07*naR6wWeIp@rokEbI58YSL<f|Luq
zRi*R*;2a?0GF|PVb>4mc_(udN^9W&Pi7639a#LI)BF-@qq5u)O%vlv}>ZyPxPPY#C
zo=cK*0w9sAg2pA<dFGvS&Seu4>XuDm6E9`~P)C@HpO)mDZJEVosSBQRwuNn~G8W;?
zmXH|Z%*^w=lsF{B>$D)DOAH8}(1hWJZJ<-<ASM=(lyw!Ts1-q(1#`w_v3PW5VG&cu
zTm57P*(-f&eNV#R*9;rofa87`HhIE&FlS+N5i%KE&D&rR#8N6tA-0+StKcsFqB<y*
zUBg-jShouAXy}8AGKgemYI)Z>Pv>%4r~pWekp-ZbW*`DCk%?4w0fn4J=g9n;Q!Fe&
zj?Q_|lJ*XODw5aqR0IZ0mVaw#q-~v?lVCPwi1Xn-@k5HgjUp%!Dxn1cFeg>*f(Mm(
zy5^ix${~Pvuo_5-c@b=K%-0tJKvd?88!15$k(?*zC1<;wMD+f<?+Fx@(U}IH5U?Mg
z6f~!lVl=e6<SSd`S&XZwhKi{JQp%Dt`w)2(Q;OBG%@M`U2W<SuY0ZUSA)F#kUu6J~
zw|lcIQYmJ82HUb^v&<8*{J8ROz3BE>!shBw_ieMq$d=)Sq{21#dj;!Da;a6ZE17BY
z)_GuFCKlpIg=v8x%tZsFoAYhW$3_5VU73x$_hCq|hC0;N!uhar@pM@htkDjHi0TMM
z6j9N6XVh4e3@ZS0x<4vaZx6*f%zrpPK|pQO9BuP;n|!dwZWQ%BfazYp+58o$z9a?}
z=R0F3-zU_IC^PqE_MVm5?abOu>gSP^)*I|S)wa#K&hQWx0evCoLqD1}ImJvEedwKY
zp+Asw^X04Yl1)_pR+5p?I%GSCa2&^FS(asij-2b-r@0z8A)*fs%`tB$QE-Sp^QAsv
zCNVZ5z}GKd$8kI!4{@32YoUgZhXWCAmQea2FtW<>=ILroeed1pk3R+PPsgzg<YT&A
zr`DfoS)yG-TKDB8X2h~%0)R+@luWAM)_^Hx07xmS>a-+#PwyyrXBiZrdtv_i&SMu$
zRU#H1SH|h{4H#HooLQE{!Bg-qE(^di$D|5<=N;m8Ud+Q15zN8TbPF+M9|SvGVipn0
zjxRUGkt(Dt0I7aW7G+T)%i&TH<s8L4I25Zxw{t{+?yq}4jK!j;)Io-zN`*-+U(-24
z(9A-J<cl|u81yejwZFZs%-fyb<OhZYd2$YOW@TZ{n5ku{&DYDSE=A{PUeXdR$PoI@
zTPfz;%6DMNye!LNq<ayD%m&g*PP%SPb`Uxj1hQte821nc^ubI%S1XXhZhJ5%GbajN
zRmg;)>zQ+$|9{fnZb_0PSrgJ9Gk1@O%&h9_o;hcB54*?$B5;9l$sNzb)9@xd3)~<e
z$Rg~*a(;TIyQ?xYBHZ0fRk=_zbMuJE>e;g`M~?JVXGMCro13YA`u$u0EJjw<Wxl2?
zDJvo}c_mQ_^hQTAv+Ht+fn(sFqvR(UapX8OO&1Y={^4_8=XHMPIC2=x#6;qFFo18r
z{!?C8?`gCs1-)C{RrUm6gei-v9`Y(uh?F8${K7V1$q>i3o6{ayRn?SI4f0g|km`j<
z1PX}eCpS?*A`k*IH9@pEjyK^|+fB}^n<BMow;x&_W{Jd-ljOx6>*~%K0ZXhz_fgu0
z%@3((rEzcmj*`u8%t-r$FA!h+yM7y*qsvX(Q<{@<(=HyP=(b3{9px<Uvq;{ubaUnZ
z)PL*&!Tk3rEeNGa{0_6DOzErR#LhVXZt(t5tRW(~i`535Rgw6HVb*-I9Th+e@(B%g
zQGAG1-gm?I2#c5bmBXoa$1U0b6Svy3$BgO<y=r@Q^$OK1DPmx?2UGM92+U^10@1H5
z#vufD+hVtp2{G<qD+B~&CP#z_O55r=M1C0+6RTx`14GRI%*`N3^^+)`tgc%Py=^?I
zxwxO035fwapKH8bZ)%7F034&Duo{;*Q@`z8y$v@nc#i<1V)|%Y;f|V$ZeY7`cJ=W0
z3LX|4mrBK<qI<HczsK(jg1xlwQp7iC^rOFZ6Ay=XM!!A!T`3dP@tn{p*;u*_12F3F
z9I8fhJ>b>IMTqFdO_jBgw*$QufSG#j4iAhjdzt;tard5R20KGw@L$@ZDEjKNvl=!)
zt)H)L&V;*6_FO-M$f_$Z6hjPerQ21gWN-bg1Tz)CcsCm(qRndu-RQ0PYVGpV2@%R7
z)55c9H*t$`{+>2$$4|B!Mit)vZNyuhL)G<LHw0?~G<?X?xjmD1A%KlyQ%?}QrBr?d
z4c-Z*zR!6yQ`O#SgdWLEDtYS8?xWhFFz!@F+ld-{FQ|jxee@s}O#iPYs(@GeEgBxG
z0kmdCMno)OZ=C^kPK&Bcho@d6fB)In%LTwg`*2+@?ftn)s4r64b-tf3BH}nbt?T^y
z>z_FkM=LNpzWj)Y^X1i5`2{Ylc7J)DC9gRrL_8b@$7YuEtAUM&C%v;gc3MO?9>rlg
z^-6YAeSd!ofscnV=X`!&L*OEsHef^y+?WU+Le_)NA&#L`J(km=Qar0UjtF=-L;zdn
z%Q&4*FF$BrC1>9+m=TOVfSrli=Yn=Tod7Vcv*h$&{MY}jNX|Lsl>Xhn{ojB1@sI!d
z@BWRMfSLPDdi}M|7gK%z`ZI@Na*_qdyw1z@-K$YQC)VWxU{9wb0*p_eh<H4lDi{C&
zkk=)r_4W1JysSU`;crWEXAp<cA4J*gJen@8k`{E^Wz%i132|MP<>!AS=D+<{|J8DS
zyS{&o(=m?6`TT92&!?xszo1I~;SYc6CYNsSDXyw^!>}KJ{IT+AtTp}qyK-8V`4U3p
zFua}5c}+1G08V2-#AV4uB?Xf?&`2RhkJGz<ZRX2s?-x{G91Kh$a9yV$x%pn3?t6M7
zBw`0(>oeWn!2tj|vW&l~*Z24H`TB>SzA!VG=5;<y0}=UBKRrD=@U_g>WxgWf5IBhd
z00&~CpPs*zuo1-L>GLvQu9tIbLjfSAGa{azUpT~RngBo~A>uHdij(9JA|9;F<FlEy
zSxKw;J)xe*cs^g=FW2KVe0rKVL?jxf6PP)Y6o&(VF7ss=rZ^qn-`>`@w-APLI+&f!
zG-p+n<MD{Z!*o<t{q@iO-c5%ohA~T0kq`$&)V!{FUFLIREW0HFBCN|5z{bN<h=-gO
zFdN4ah9U5|9twPT{-QalB;Pj*b1*cIBbbh#R5Rf_AdcfnHA`BF1CN7A5!6G?k>@z}
zV<mrjs?y{N?mWO80QhEgHT%PIkYw>6@T$)%<{B3hZ%|9zaxJo{@-Tv`A1EAxnF1{J
z2#LgTzI-#YI7~#tmZ7L7YA8b0E1=Jj2P=aHf9(K^wc)PS1M!GK|C4bHh!o-kUESyW
zM}ISx`2t|$I6219@wvh<p2pLQq*c=DHN)W)eOP8H;X936JAD7+UC_Qq4Bs;aa8EO~
z?}|e4QSE?_es?b)zER}5O>NJj?FOKah|;}WwF^?-8?o=5kvFXfJ}?E?gts45e)ZFC
zZ{r7YSnNg!TftU|?^>!S`+coTrRtP<o0dGTZE#iKdox#vQO5~tt+Q<ji_P8t#<2l9
zbNY?#vK!!6erfBE3nB&xH%$F%o_kA2ss+66Nc~`HP$?<pL$y#jtOcvo=s~MF64lDM
zV<z;FPseZm00r9P77x@bkNEP|nJs(}^ZD1jn)R;Tcanv}R9*bkZh`%safEY8_J$I$
zNp<#30PgJQtPhpzy(w;5oSqeOqq;)aH%vRNNJkJ+-JVKkW&zDBq^{v+>RW8|H~a?s
zx46>wc3P?Jg)DLggYtvh@4D5a*|x}g`8kxoR)|vduG;1sco(pG_tcwMWiLGGMjm(T
z?)&cAdxUV?Lw9enq20&h-RyMzuK2)c&35vT?`Q#PYc5F8n)S+Gv>to&hg>+c`<Jyo
z<$7mTxAciV`8~#6QJFf&-`3>ya_o;TIt~YBUgmeR;tmxDF2hXTtah3>9RQd4-H9xK
zfDaOwi+@#!qsIuCeW!iw5hrlTaQ}?VY#2||(H*C<?{LHTgi{FtPwT9z0O&J9;>emM
zFOqZDs{wHoNq$@B>suJ6ae6W^pL}o_migTbOht3U--64Wi=Jd0Lm2Amby2f5OU}Bk
znTe<4san~!jA<o`Az+n)9zqBY`Gg_~m#h0vbBJKZOkgOFrh_7yvz?wlO^4I<{hOJF
zaf)zQ=Zl$0&XO|#s^q*}tgc8ieZ9Pa*?4>+4#RXpB**JDyT$`e)j*MmLrm-3*md*!
zHwvMs-#mWIxe}7y;x(t)v{Y%AZ@&<8h@%0d<?2|JZ)ZdSiG4&g98N^6IT6|qpPmu%
z{Owndr&zA<*Y~f?F~os502rnf5wCB*A+b9``S5?+Q&n5O&t?MPPtZ)#3W($M)Qnxs
z>~wk}BDV~5C3{MOWQXoPrzGOj;?8!XkhR<kzmDFS$YZtpH}s}ByVuK``Ran4Rn>-p
zKZ2W{pPrtdp8SJ6?Cr@6-Qmpi^7?BWr#KwPaT<nUndfy~KK=BiL5Qzke<h|6xYzk{
zAR_cV#7*Sa`65JN7&S{uE252K-X#-BHW8vwa-jOCGP9OYzqu12<aI_L=VI)oME+k(
zf+GNO<Ty<`%T^<1jsvO2AutC-VvcU>45-U|Zq?`Iy2covUp_$zQAs(iB_TB$4&XCt
zgI)G2fT;f2OM;X&C3$*!9;bsxUZgaGN=|F7>+JRGZ*d%kVe%`a5C}q?jsPVZJ`9t&
zC$(Ftg)ofcPJS>Q_i?S({MPqMn=B%67;oqc<Mec|HV!x<LaKb9TkTL<0m|a{>&)vy
z6aXNnMO6>SXE!?pz)zpQs3gf{piY29l-8wmu_5}mKE@aKZmivEAxI)o2+6Eu9{k;Z
z^WUqup&Ep6xSoGIfBiG;y=)L+7!Mqxe;SocJwn9w`qsP25QjF`47YuZ7sz;rN?R|?
z-_Yfj(7boxYCcFkXZ(YXu501C3^VBd@TSPIjTd(}k942l?!Q|%0Ns_SRVS>30dBmA
zoe{dN4{ZYDevF5$D)|uHwmww4FI1tsj?LDtG%yM`5d`p9W4k$QQQ@T_Zpnx{H7z3k
zRh`4ulvh`M+$9=zpWakNxF?G@tL5EQ-gugowwqd)4Ig*MojadxeMWKB-oEmE3%^s&
zmrPph?xJ=5`V9ly`a-zdXz)&bf`7#%96NioO0w^(?ME1jeV9_Ydk5~@`kUKe4?+$%
z0Hcjk>I@XxsH{v3`$?g7Hvs#uv;EMGHx^WB+T&EX54wY!X7)~P-D{<9@RF_X@Dw)b
zKBWz8fwo~+CyL)M+PxO&?*A8Q{NB^KiU-j4s8p|E$2z3k73XdI`un}w2idXRV)|&n
zhdq;}wovvVh|n8Tly~6)DdM}!|E7DjM^IK%Dm?mLH&%7q4vAZrzqhl$|1}-#fgfE<
zc>eT5&9F8fv2YkPr{bfE<RasmUz`DOGy|kK9V917OAFL)gA0cv52sHX&4hy%o+o}3
z_KTH6p_+Tdqs*DAX%+w=F&Wdyk0gWyfTp?P2~|)>Y^ras-`p5_oTlmY$!mdM{^{>k
z<@EH-oh>X8etMdQX+Yu-CyT&2sib%~Arcb<(Q<hor^Da;>0g?etXCq+X|d+Gg>-!R
z5zLnBTTaW%)1jKl(&6;UV;ngIs_1-(qk&B)*=$`4st2BhI}j04&WqQrW_EsmN5m}3
zL@_cLTuWLy>6}#G1A8Q!0zeFOV@DH00RV`Qh$OGq_pe+6(q@%Bo?cu~?=Dkq2&%aR
zJWWq80FdU3N)E$hCV5R;T`IYh8pMc16dVZk%sEqCukYTDbcEQ#mR8Bdp%KhuQ(V{Y
zw!Fw(rYRBCN}uhxEpZUhZ?Eq}^oQf~J{EP=BGvbc!8lHh%@D>zPD`54u4(aEZ}C`P
z7gtswQLqsaomHqR*{4C0d@@bcV?mCipvTAOyrd*43llL>h=e7IQezBvpyh{_kcTO@
zeM+-p$0cV*=HOgYW(<MWRh-mHghM3>rnIJYoesxgoZer*nc3-?LLC0`%dbs<tE$7Q
zhbb*<Ue;VH$G5lky9iOt(vlG%rC+nini64SFj*G!_l`sO_U&5;;dpuifV7q!W0OU3
z$hG6S*}FLoo=~qU?Z&8N9}FYnUw-+umuA5wA-<^@BEG%8zP-M^JRK16e4TTa!x+^p
z<zK4Ga0Ni;D*IDg)@)!*gb0UeFtcx8e>13bQ!5&S%jIppo^uN^*gI{uJhi}hnBuz3
z*Xt#VHc<2vk%%s90)T0Z#8gt!#Oa`DoqdsSzi#D%6ig+jwQaeo!eysJK#;VyLyYzj
zd#-5-!|2I$s?rFS{&Kl!q#=;1;>PiX)t{Un?uxb8E7_5li6v(M3vmS4!pmw3ii!#$
zF-KL^b)}M1wy5eb9{O_tk&AbBjas~|4G=jDs`~cpKRAoke`Gj5hw;GgU(M7cC&{jK
zFADDp_TWa}qn@4`h)UpcEt-fZ0I89bpWZ%b3sdn8%Sg0X4-n8TxbK;-x|!P&7AhBh
zT(S@#pwZ353m<tEBYrg3BvFr~#;u-2GIZ4r7xJG+nHTE0!d?4S)%TkN86Xh_L?RAN
zaLmM32y+PgKrcdSX4<a3-V%T-s}1+GJnUX70o|)`37H{d`z0=WDgrz8=mzhS3ZGs8
zh)_iQwM4wv;qFGM&c?@XyaIN|e(s#co8Y~m2;EQKOzdtP_1XvR46yrYSs~5#h(yKr
z!Fsd-?al$*>;qbPujsE?K)4%Ow@jtJgWnHz{Hkw4;tl#BncJCea}(&jmCInR$<Y6L
zN?L0}KbWhOW^X^v+||NbJr_0^I)Hd8aYy@X|3H=Yw+4ckHqb-G3fy~x3Y8AXKg7SN
z{zuZ&ca~Z`Zec~SM~LufS@!|)Zfsf&fN~ElDS|3Cd6*e^kQxz)lpD1bf(GnC&}b?O
z-z7m<Y5v4RUHWOUPb%*`wcS=3p&Qm(=XQY`58be}TODH7z&!iTl)AV)?zo+|b4Q<%
z?|MCJ&1m}u_j_jbrc)>YOwT_6+(UxRp=EQ}EF`>J2Tywh_^3+LFFF5~ob0WjCbz5Q
z!Nhdm5mwviuKCQXlelo}v0M&lJ<8<coO*V$mXlPsO;EKXhG>Nmc0L8LA*%u(062(*
z#LxrZAInI6H{XT!)o?*mO<9mA1Xhu}%xa1NqFTbh%_OIyjtBFYl5*u0Y>_kr;5B76
zjZBs$>kI(s-Ch@#jl}D6^>^@I3R3mX(!ezjJ%`PRVWSB9$L5@LT|9<<7{ts%h=e#1
zW0icUS%^c7Lr!bXDaL_A^aK{rWL6VW%6MOx*?DDHYn>e(VSlc>yB<{4X*2KO5SfFd
z^?rpBF<==F`v&AG!KEtWP#%3FM|WH`bP&HHus)nqQ*=dhIktU~2p9-t0OL3!Q4H?Q
zw(R4dh{#QT(Px~VNmQoRHFWfWy5}B)RH-7)K+J2hrZs%HBx_Xc*79j*+0!f(ic*Rm
z7kU2YE~DIXSp9t3O$W9jiJ80}a^;D8tb2C3_v}Py1}Z77`gA%qfX_?=a|kSoA{ygB
z98A{c49rAkM##QB1`Z((y;t&aI3N`kdsA*%`Qk$LD8svm64!3mZKotm#27im7y>hS
zUlQVoL@%E{qx*=NUM|;R7{+N*5tST<kvI;K0RXQHSUx_zsM=T#NcB!V#uy5<5-F^(
z<)jKC#=w9u9Zx<SDL!Oi2o?->`&$JwiW{dYf&v&b0m3*P>NW^wLPUpy3nhh!ISw2L
z#HW%YUsFG!CXD)gnnNrpMI~Hn0D~GT&VaySsO+<n9AKtyo}SYpc_rimKAHIh&TS5x
zT8YEpQDu@BB;EqZLL?#%BNC2>=jHl7zkhZ2xM4blVY<Hk>Ym*IFdm)^TJEC}2j)P`
z#K9lUbo%7HYk$^Ts;h4Zs?H2|Jc&5~J6~g%FRz_WUwcW0k0({c!?!(W3X$BtPV)u!
z94IxZCM{y7;U){v!>czAR*@e;IU2F(qzbLpO4zKgcLgwMdsEpo%i^fvw|6im^kpO>
z-VHer2yZ-WJ_@&cNU3rtUq#g1)*&KtVSWR+6TGKBo2ulMI0VPy(rQrcCu=X~X?E}L
z?>Xl$U%sfwx?T}+I=*ZJTPwxEynK6jsT&_s)zp>anAYoVN=XzeW>}HEye#uH9l|h-
zLk55tCnVxwGF2%P_#DS^oKEX<NsA8C!Er?Zn=fxFX&k3kldj8!xll!Jp!Rm5y~D5X
z9*Bq`c2yxb>3n_tjfidlnI6OOqIj5&%<Sk^UH7sDQWta@RWg{i{1d1w71H8o;c`Q)
z&Rb>%DrPpFh=`nW;$E-KF47&mdYgO?FZ8YCuEO1hDE5GdB@NjlW|~*~9a64CMAlh#
z^n{UewwZy5)w1gTAS6Wa@WPV9RP{)Ym}2G{^HyLp2iLHx7F%=E?I2Xir>7H^v_J3%
z1THtsX_}^CoO~O)nd6#4N;$?bPSd(9>$>>&JsuA|j!KP!tAe;?e%Qme0}+Axg!&<R
z%m^XTe0ejlI7~?V^69gw$U2M2`Fx4P@cjIe*CnTUJUtKN(XDNeUd`<I^s;5C=bY2L
z&hK#;LmUwah++zDZ*|{M7r-2!Uev_4uCBed<#w4061jIrIc0Nlbe#wh>G<@7b<A{m
z|H@o)(wF&+L>$HtBgaA3rP+HG|36|=b<z+y>#e?u<TnJd@{CAhGBX!c5CzvI4AW_t
zPI<ZJy!d>9LTuc<@o+LTq~O;)98TlmdAYu&Ww!(aF^70~`i#Vf)2H+6FY3P2BGc*R
z@cbpOSD#*)+41EERY}Y2{$E_q<47Uqb;)V*&yh5n>2f{${tSQ=f=ZUOa)`u1C8+?1
zO{uk9UaO~A2`t=3Hfhc4QtrmUNQ`+!BJXO}`GR}X08<6e#E=YT;luI%9&7r}aNF!7
z?*PQ_^K`qMfg7&vKZhj#JK6xis>W?QlfQ1Y%4@u6yV0=s1fUx_Z=;GB-0cq!Y4n?I
zREM?^;Z0C|ff2AHnpf6Ft@!$#!%@Wgq<#D7H6e|GP4<9zZO}~d`|K)g9zgh*v$1yy
zuq__qW1Gf~gbw%dAb3OIz6A_7eqIj}?Gr<KtZ$2Y*fcurn*xCC43WznCbJ!?_F>|t
zZ+M8PXb%}FcT!>^1T)%D+3j0Z{d#Ghdix%tKHLBieNsgLP?HSw_AXVl7&p;4S{-~C
z7`W+(?c6tA9`Tr+gH7@M*Qlg#q&!H>uK29gdS}nrF1K?Ys8~pWD*A-cP5@pkk3l=&
z!W#vL*nDlcCU~DJS{N1R&a@jzu=D10sfh0w_%MoOqr5d!lJ-V-;T^Sy+{NoOK~Nha
zm9qFD!{q_!T8$Bk`)kQxv>q&N*JSqb7HwN=QIYJ%E4;TDGjk5%Rx&o=|MujtM>3D{
z7^|r;)>ybk$J#CfDmUlWC!*B8-=(Hi6}TZfAZOk&@2F@SL)@SR^J1523EPcO6TKI6
z6eu$%U(J$JPAgZ|^7aCA^cigrs5W(HZxHG&IXFxBE;-X{gj-|N{Y!ZB?_NGQ7p51P
zzC0bgLrv?v%<tpjDbn%jIGQOlwZWTfBoNWm8b8}iT1C%<#^g4D<HUEh0!q$c*9XEd
z%~rG!S<>Q>;vo<sj^hz_b_v@&NhC{7fEXj^w9eP-)ALJ1$MQNmKn}pufh8wTN(1!E
znB96m#xcgRAD;Oq=bXmlvzLK+UA(<>J66{!#OX*PW=2RHqIv@-StN%zww-gH=QxbR
z;e<|buTf{c00sakFmceF%v7rRWRC#*8d=tbh=%dNanSYztMJPzEN@y1XvFG!_m(Bk
zYeK~5m%-DkISe6A&JvXz%uGd0<@oZ0iKKNg({;Hr^EjQ}&*%5wzA+O5juY&{RGZtf
zS<ZQ$ukJ;VbH<NP!DT*kh@MB`h)vGRIGw70>8@^^I^`UgaTq8BNeRHbB^uMxbT}T?
zp_=!|LH`l~B22Zh9S%>2=P!;p&F62+^<1n_;=ml1>zO%l9NU0#%NZqNj&V5b)o~s=
zZ!xmB;LPL_timoq91l;#(c|va3=D?p2t-tux@%^f$ZnF&ERKhQCz&~Q3oCu24p7Vt
zB&|lGdFiVY$$7cFaU7@PvzevkDrs>$7-(**n<Q+E&y)W_UavVVA-Zf}Hq&`dA%v%=
zCqz_9RUs|~%m{J5yqekJ^oc?gGXTp)AcP_*r!{9yS&qlkI1XlF;?5?Vk`P%F&U1{@
z=_SpV<?`mQYVmZ9W2F%!TnZqMZT4ms#=|&0y?^`JRI|=?rrt&~XxVqItg_}br*-Zn
zlBOAmkRqDOx`a5!>Eu$YFpM1H{QlKUJA|Nmn9NsahasTRZsdj@gyQ?VNEa5sJ~c#U
zHg~7O>G(n%uIFzE<mTyVnb}<}bIR)+#)-${dVOy=gy+c=rkLahWdkvQUC*zol9CW&
zyu48epa1x;IxqtzEh=f5FZI(Pe3#1ny)0wfqNP6!FaD2d<m~$$9sc$0-`=k2z9VT>
zrxQ?a^uJ{UQ23_(@n0D((B*o;Z9?E?s#V-EY~#Xjv4vamSG|(^{4%_$g1XDZ=5$p!
zD_ez8Ujk^QRUNn7ayf1p6gx6`cP{N*wmiv#D#ru2mIHSoXM1AK&IGBk+i?>qKo=F*
z5v%>ySWn59P48@b^RkEbOZ!-a{=_XdYrPHHM)^nDnWJ^RIo<_oBW_l255pfGgi}09
zi^MyHaVr^H>Wlk|0<{ygNPr&1%I{itr<=Fmty_-4E}stXWhVgr-F+-{wk_syOVe!K
zOwXk%XS1p8-M(4d@c;lI07*naRM>ix$6X*p$A<4z;n=8f{kp2`B<kML!jkhVBBC4T
zvnIMABrKFyw@bxG&$@BkdZEcpu6m;!Vi%zUEs&wNDZ^f^^w@q3_qLT*1^;L_APb=N
zth-LnQWYKd&#%2l*ypI$*XJ%8vMzSwE<K}e3;VXOz7{uoPJ5GDC}@W<e9*4iqj*vK
zm?mPqkqLA<AKRT>cS?@``G5K!?_VDGA=PyeS)JeS1zKe{7$C+tIDx#Uv-h1@H!iZg
z%*gBo?CyBKnGQHoyq}Ozh(saH?;dA$vp_jSzl_=o1|m*rt?@dj)%{jf|MHiTndg4H
zYm$_U<)Cw>Q+AqfVe!O3F;YsJsxxo>7X+|R&j(dq*4z}>Epa|D6GD=bfq*q<#KXkf
zhxF!2F?cv)v(bX;Y=A_-M53muZXH`f#+eae7(y1kTowcH4{2D<5IIJAeVYy7)2Ejh
z!rsFZ%~Yk3MBd)cm+R#)4v4TM5z)^thb9SqJFor5Jq{t1_$OG_EUHMvh{MM=3vk<H
zpetun5@vE|=XuHg1|Noii1V6!e%9Wj!#MO<=!O`ZEh&rW=`gC=nld0xL&&0QDr;jL
zs$Utvl0;OGW4xEv^;0*0Qp|(^Lky}mugRaOfr*rWcxjV+1g4#T1|meJVVcIn3A+iC
zFMfZm?jq}UiyzS$4Um?rX(k?=*wI%>W@4(yOh_d^vKuy+S6H%}@u_4}IiKI>>(#mb
zW8}7<Gn1Kpd!L8ELtr&i10o>6>zd8XS6#n`U6#;{I7C$yVjv{?@eh9+htaPv%@+XV
zIP~%fH?_FgeCk%P-LC89a=D!Q)ie%)34eRNY$IXO*l8g`sL4VGm$?`jG>hEBSb|dB
z<o*8spAJK-9rNz1m65}78URs5%wSF8mUx@$T*NmS|KGWDvPfBxfRPX(Fda`XPoKXy
z(9&Okv)G8EsiftCNXM5i%Y2^CZ+^@ImLhl?3`<tY^W_y0pFaJhg?a<U+CqgL!YSDf
zHB-rKozFx}>|s^LVL)PU=_D<x8pk6PJ8V-?WFiX1oyozW;m}vHBI)w>8zMe^{^JIv
znt?}Q_~Lhq?X)71;}Fil)U;BF#KCEC>H6+Y2(8F)oIrB&x#k8ni^TEZ^N~i=u3WKw
zA>j4}9HAO0hJR+CwsS2re2hNdFkkM|>L2!P-}UUVTTP@rPyp~i55I%o&nmW36A>Sd
zIX7G0&2$aAU^wig@x{oeYh7*`y0)20wK<60HP2hwa62Eo$@K;-oc;SiqlePs{cy`3
zYm|4fWZ3zMdre|3D8zQbinV4jMTIWU-p$o)v!vR-<30h<Y-<N?n<aGf!W#G3Tk^NO
zdu#pmj;X)-_qQ1JZ9r1WdGlBdw2mNdca7A8X-au^Z4|Z3J#QM5ZAEs;itQ_YAGEOV
z7!uy%1l=m$)^@#)TSc|?S~oPj2{5;vIb7HL*I7=Dqq%J<>RoNx7TZl)@vfh+k5nM`
zT@0xYmU`T5V@H25x)~|$?LJ!E-Tu{l*eaR9$FC$-r-H}k{%}7C?|c(#p=5U#@MsnE
zL6)_9u2g31!!Nt2cI(vWo+DWa{oVW@n!3MNZ{e-!<sRiB07HU1&uiLUKM^Y3G<;o0
z*l-8*bp<!@KyStIp~*lmXSzE%HVej$eEWU>`f$^c)s%3_tAH7DqfyZYK67wk?Eb|N
zmF(xXw;evKaCDxWqfcz8X5z%$enxl?_-?pRVVrI-W-nH9^P$T4KodzK#r036j2r;K
zj3fN*pGM6&r`aFw@#)2J|N2(r&p-bhLiqIQ6C!xb695vYz$t{0Ls;gEXJKcNaXP68
z;*1E}_@vp;BmVNsFJ?LnfeGVyER;Oc`TFi5*RG;XSyGbY>4Zo*Eg~{bCsRpj0f0F8
z*a)uke7Rf?hr={Z-Jl)-kX2L-k)CU5nbRtH32|TwKYlsDKF^^$Kem7W;m4nT{F@l!
z2ncDuipVgIr6x5!yngjM)CB`^IB*zpUchX<o?WIz<YZ-#v^ak{4pSJXyv~x6za_&|
zCV3u00RWn_KaRuZa4JQOYXD}4r%zgqsbpQkFb>l(Epu9DBJNj(8H5;3bX~59I6b|1
z4ElUIU(au!fBc)%%MZ(ZF>{jbV^5nx&Q@vjRKIna6B2vrs<KK>>vE056yoR;EbrUg
z;XbuwD8#_Qz)Z5gwH(JG2FdAzvh8;0;&a(nD|iX7c?G2L`0UI;AO?s&!RkNC9Rr-x
zGaXJM*&_p;4X>(Se)vo-zye&COQrJKXO1BRW~T?M<fNLHH3Q=5=@ghL#GKN%Z{LXM
zhoAl?XLlgWDrsKxvgW6!CuT-45zmVA$-RN8X3@1$2fXn2WgH?PNm{(_H`BaaIRp;z
za5xSzA`&32^ShbFVI<;d$sxw$)3Y;;D@oV@&{V8ia}47V0N&r;LX3yga}5Y&WRkSz
zw6=!B%+Bv`Ip-J|k>Yp&v-$cShbfN7v|iIXtC)zKo}P#ZyJ@-yo2W=i>3Y4!z#&i^
zCJw`LeK)Xidg2iO@gM#^g!ue)@&`RkBNSr+w@QG#&b0)mysljeu7zPbd5)j~$D!D9
znB}yX2_YHS)90UxprUY+ljbZeAX3~CB%7HoS0oO@<crqKG-uy(BOni>ZB-PS38<-N
zD;Yjc(Lz89Lx6TD%oi8unAs2~Ky<xX7g(sK!lzG2=nMl{=fZtMWDZSRWoEiAxuT2>
zA)xYn3);aLT@>U}kmBIql7SHr!v4fiQ|&Przfs|LsFokWT)Wu@ZZ+v`*JHQbsycy#
zzuNPwMwH=Sd!4niwWeyVwF)z%sY<C|n20#&zAkGMuZ|goPFVNAm1Y#VcQGR`ts3LM
z`jwZ_k=v+xU=21$0u|drVk#>Tftak0;o5`8ZTxUc{&aV>YRlp=I%S#xxMhvQ_XfX4
z#395GBLHeh{%MZOnJSmu9pn&*LkI)M!J|?+1e7usWe#9w%I-Wz%pt^L=;|`85SRlI
zLD@I}*mgs*at9j3Y9U5dDg-M^#O%&5<j<p<Pk73brwAeWdnH!yEOX!(IR!I?4x+!k
z5w6GRK`M`E_lSqUU;xHOQkMj|i2*YeU>~VVfpPRn`lxOoy0x79j-33~Hw$Y|V70Nv
zoza{1IwIWc3W!j#2ULA*=KlcDHYD~G6r`fpH0Z-2eVE2XTE8PPlL`@;Vm0uF?a`P$
zU{tr4tKT#3;&ocBMnvXs7VV;)s-BCB9~|}LD^;WYkgw1+DnXY^=9Y5%i@g_@-vaYF
zvX4xV2+_7NGBPnBxl1Y$70pBIuJ#jjuQ{5zoo_N5-{7`U+*3q1Iax`pbBCg`IY<Jv
z!Z6+f;$4bFw?SamIc99`Zq2k(VV@|_^<EDR)e7ID&U*Xsxy{tA9;>~n1-6+{PvHRU
zeKqX&Fv^EC=8r`X_85W*H`4XqigWW$djN-Sd1Icw=-e|^@i!ldOYK<)fra3!Hyn){
zRs%I5Q9Y4d4WsuzPi5ii{U4h){XQWDFjY-pmUAkWZ^X##%}rV^C7zL}5vhBMK=}%Y
zX2u+e44ZlyF&2v;dvrX1FJ4h(^+`amt<f)*!Fwh9P9G*BdA-?NtOQJ#A%RG8CZUR$
zT8LvgBdfz~6_k|rPHXm%<h;%o0~5bdc5<bv|CJ)rAEr2rW<YuI<IRbGfCQ?NR)AuJ
zMjUcl(>nXQ_FPsXR)-l>M8v?<$FxKq)IvyrC}}k?k&^$8Env*NIb8Ow&n9vwW;dm4
zQv_2Lkt{M_&q!Fg#7ngqDw<-+B@~p9+|o}Zd(q?cVAq(cM5wm+9S`0B&^t&^8<w01
zDZ~h1X}!AGwg@~_rCRYdjzbSb_wRA1Dr*gE1~9i0ESc|J2)3D(L`e=%V#>`>4N!7+
z#}q%|?%*%vI8-Z6h#dS|bX)mAoZR@zw*@c@%x+y&;;}dY0%v6wkqo9VOf5>KB$DrQ
zSCG)9(-j-Y9ec}&XbY6M%U&_Fah#|N?=cn8RG*;i2903Hrx$9nQLls){Ko<_adbX`
znt6ab5>W{5C1Pfp6EP3tF{K4ekpq=<^(JX01Cu<9h^it6=13fgqr)4jf__UIq0CjU
zA?BPUuU;<u!ADF)LDEwGqQY`{?~^CZlsSuJFi=S~JFMTR(UH04U0%CzMk6=8^k%&}
z_IlA40LerOfXa+Ujd$1enzm_b+bS(2K{8b|^`5O2`bg+BR8>J!RP{tC1a#QXh|M<v
zKYH%Az+#iF3I-|}uvkL31<{bp9qP5E>eMr$$1+t7x*6e)D&`XuBH|#L5bQw@rwWYi
z{U;90tc$;;?7jx=6j8}Lv#xE%Q_bIejvu0#<$Nuq7!Jh2H0vYsCouz<WW7C4nX|60
zY6moAHt{_|WnG{Wc{mP4frxWnO(j;Wyk?5Fs?$%9O_;IOIA(|x;s9pZ5r7-jzkMvy
zR25a`=n3^yf0P>?>4U%8C$sO>)`*CvStYfLQ5CZshS4iwCrT85dZ@kKIJx-O%v93l
z?YG8JBnnVSiGUn(TCbP0Z?#&ostF7vCsQE~W*{nHra56G4sp4>E!X#9JcKx=^=ie6
z#d|Un$qsJ2&dlZB97m?;VdW_$Rb8%U=6E<gp}WZCoMHBYrbBQ1)E6uGWH|`S4wiGu
zI$zHwtAnm7EvCXekZ1N5d;TnW;V^_Sh-8tJk|1J?BQocl7%WIGLZzbR(49Sk*?PTt
zgeNomd7RdnL&PxD%CZMt8LL#Gn-p~Phnx%@C@xj4N^U+CE-Tt(7`CO1x$%lQrm97;
zQ<^8DmU~`Pe-NtN#g})8gUiy9n24PzSlwg@k=*ehhGszwM2zMA6Q-<^z^DV?iwl80
zqP)9IOC&W$o_7xgJTJqG2WgtaIAZ7KrCwxEAZC@^?z3uEl}|tZ)I7bUNJT{po;+~~
zs@czLQFWY_I2gK6M^!S1NW<iwM8yL+r}~*53a^q^5fwFeL-Dt)_=a@0Y$a}jn20?p
z!LQuw;0mt<Rc%rMy}r|CIsvAtoSYcg_%HobxLJUyWa5ZhGtB^qv^H9M<tboi_#m~7
z<T~na6kFO&g&W<err#E&gnxp=SFHkr;y+LuH+12I_^P(*ZSnyCSnUfG%pCW&%A5By
zukX8hgR_>{RjR<70o)x~#<tGX8rt~*tL2tu+Yik31GC59mp(kOv$DTJoUtEQVsDCG
z_AG09PN>E=h}dynKKd2KqmWA1qFW|~S2P_nrDR`_-s$7_CB){{1l4lH`b6)JUXOLi
z-Nm&dxi=f_xHBy;&^A6uvEWifATz{ANoJ)Tw2gdWdn!0??j+Dz!gd@6+r<q+FNy6J
zrI(m@O8kvT<eY0P9Z$!<*a@cL&KI$Zb%%~YV5WG7<uom|RjJFaenx67OH-t5>)Cc>
zihB;s-iBhkLBE^-vE82g<*cftHH~+F9`w2Pws8kG=F>)c0yFi71AKV`GIKHAMJA$@
z*Ro$D=A1=T)d);M`%4m4&_0jFOJOT+Rdp>DC%hX=#g1ci_w>3vnJr1M{-?Sy3dUQU
z7mHVmcYeNysv4l8k={^vtk`2!YF8l>78`h#B9PtAP6ae^TXY4gwrn8el6_HW>4s`X
zXdnW%<=Q)zFCu`s#bP#gl6&A8h|kyi_)>qrth3DZTX)xuSkK~Xi{WveJ#;U4dBws#
zOQ@%D?WuViQ>5@~T3!h=6$OPao+3`VV<PP)-&kX3+(PfpX>Tvwx}kSjA7=DB|J19s
z4-yf}?+)ENZ<;fQNE{VWLEOWy=yRF-dI1rK=^#1fb-{|DiWc?ddVRN&Yr46nmD<_;
zuZvXQZVobst*px0oag<4I?9@Gm^dH@FHBU$B$fV>8Hm>T+&HpcgENO^o|o6J<KZw2
zBiw+i+j!3;r<|5$&GV8zefo4doqqoLXQ>$)-@bhdAwIvbvkxRK>vHvPJB)`oOb=60
zRPEc_^>jKuKb@9kzFyywXv%U(N`!~QkvO=bKbL0rLL5UF%Um-I<8=7TFTbkl=`e&q
zmuqrYNd#EeSC=B>EGc=B2=nq45uaaPLWnm=a!$)SUv?dpdUgT(vL+7W@fiS?%bQnH
z9ES1uoR+KP#my`vC6UZ=0M(M09R|l_a?U9Uz}oglNvmQ$Jbh9T$NfYSAP{hf1C0k&
zF_B?%R5q*XbxBe2c!FXJ7X}OJ`=C06yB|!OsXO6GP8?zw#{S_}e<ot4VLDnh_$Lk=
z;xHc4Ixq7%4&ykSuJcz_d4GHJlgvzq8V#(fDG8EtnQ^*Fo;JS_HRtRUYc~qfL>k!G
z&*~(v)e-?rGjpV2^sAlEuj_K|y^p8EGZJGMz)bQ2ikm6`sqxNSYvdAdck**xe~5!0
zn$t8sJwF=|B94a>$Kl`oAOB0a2D9sus&_;SlqfIh*RNky^>i4`Ow<7Mw_kth)dkFi
zX2<6*%)CuTiDMicHgBx=YKc%Nb#9}KN~XFl*Wx^-A~}txm+|=IApGI<2>`<|GKXLO
z;r}*(dC33}nX>AdB!(jJ??+H(@b=r!W|p(|m3_{#iXN6_95^Lu7Tca{QS?rtW0b=r
zDdjau2t-J4KmTl19JOX4#6XCI$HNGqh;X@HFV`y*5kVFMfTL<)0zi@c?b|m4NGU%*
zzkIHGi82%)53ZKcV%JPzm~I92-u}wG1%VN*=Wp&@>VL>gM8QyM*e{A~W(%Kw{M($@
z<^1YP#p|K8T+(t4<HQ`|bV5Yuzo=xQFdR;Wejzz0b0f5IdJ4m|%x`Y=s4B#4o*L+>
z1c8`?NLF!I;r#s5-%+txv-$E?0@12>8gbwdf)CmR>K`%~aEL0BmWvZGRkC(|Dfg#1
z5)n_X4+(J`rc++$y!Y|&#Eh_4s{W3Qen)7w@1DXR%ro(KKYbq#2mhRZu;(2YVZa7^
z?lc39$Nw<Ms+CtaVT2!XcFM)?6S5!4V;>BGH!(MUM4Gs5KCH`m#JgGYoxvU6I}7;z
zX%lAKQRJ=LvK@SAcH!3dUtK$Vr@_9Hq~rEHtW&8sJ=`tz+`d0;y(=3#WlNW$_mT5L
zC(`&x_4v>`@Zs`oLVx>E>1!YGx<0lj>qh<F#XczZZ?!kLalCwaH;zLkaX?i}mO9=k
z9<Wn|-+#l7LxeY$4>t;Z>vRKK?&HHJ(S+6Q*;j1PdL4Ho4s~IERulwfP4)Fqp8#t6
z$J(!uJ3Qf$*YW1`U{xwm_3BL&yGcp#k=A?be>#AznL2#H{-`}e6<^@?Ot*KP+6~9e
zm$Cl@Y!Q+TmT2}~_j#^6gNobj^kEbs{HGdVK3*3evc~{F{#y@-lYfmIuv)Bb3@#38
zrt8x8#nsHoJGKN!X3{Q{<FE&0<>t*v%hiM5ydr3ob(^dpbEAiq)VHcYuuToKGa7F;
z%B2p?t1VZc!dz-qxmjof46hCjPoKQNoQ_Y&=g$sn98NC{$r%EN;Cyapd4&*$moHDl
z;mJo1KmDXC^6m9?UDHp0_+vwdI0Wao4~OUR@FZ!LoL-)$;wb2@Z-^X*fcT&Pn`g->
zuk$!g<2dEKYED*Kv^lMII6kWitup|Q(@FBWT;HXN`c?H0KmFKl`*e5`k?ZA*NS}ZD
z(>h<4>l+gRgPXT`s9qt<^vV;TFcG`4jid!YQxY>91|p($J{Om2)9dARIzIp5U;JxR
zOUw24K?C^ol*3@A^Z6CP3fZLo$S@uoZpk6!tj=9R#6o~ZCSnJvoN4v+=`(YD`}$8D
zh7ckk9!@{pFX&F34(og_OxL};UVokKe>%|#iOuZ#_M2)^7XUy`Yg(7jpFgz;+%mrt
zkx8}+4trQ8$H8jqf&ru~A~r-OqH#I`*iw6LB8GnHB61jr$T=GImZDm=wa$z~nDBJ^
z{0Bg~zW*l44KCcx3*&f@yvi~ob8+k6Or=*8^!Imq`C?}D_M6{-?|suc=j(Z0E`a#M
zAODUyeE#tdIp<%0{S^`a#h?CmS?2kA9ma7OMyHa6@#xrqs?6tC075WCh>?k72*deu
zIbW`UnF-hV>|zGT28cNf2LRBtK<9*@Ihn2glDbXfU;gp`qe8i$>2MO!oKk-K?ehMc
zZve0F3jloi@uy)J0gwZKI-YzFPidX6*APMoA&v(QvGXF3v@S?A9fOCNP>5le@^baa
zdmnt7+1GEcBI}?2=8yiei0GgH@|Q52PM>~A^Cc}8QOjBW@Z%Ts;0Wgb=imRkaU6g6
z;fG=g3A4@V>FIPj9{p?n<(FSn?Qr@$j??+_ADC$xBO(psAr6OOI*QNfC9CATTpN_>
za}Y;3Izj*!?ik{_TmUS@$ysJ*n%5%TN%KV{5d~uQ)#Zsg4p$tWzi9V<YR;;2POGHV
zkAm}S!Yzq5sbonrAckQoQ%O?*xW50U^5>3?X_8r0+!Ye@DjAZQFHy%BU;q3cn#!=?
zD|`8zN=oyCN^?1XtBD!C$#509a_JDZNvDa-tN)3lWzK2GMDzW@3=qR#)zRHnq4>|~
z(CUB(zw=}E{Xh8lZ+@?`x~&*)(B~~Ut?yb8J5%Rf0Cdag+k@auhrem_i<%qUBy1l+
zweKD5A*z3O<E>K3?>n118QSN}*O-BhVEUmQwmm4Ru#N<1^A~8v=|}aNb*keo#%wQ@
z?PKqI<*@B!1AV{tu&emkkbT##Jd~r`?vHV2BWCbD*YF2b=C)uys6ICjfx7~>xQIV`
z^{l!`<DIP(?r&!I4DF%WTMJCs6#dOlyUg3P&X{2f&C@z-)bggdg+~qk+NDm`Ds&f_
z-fJUz-a7s+-m@vgi=H2#?+<ZfRBSE{wwv$nb1{28f?5CX)>@mEif+5#54|L1NBA?f
zE<d$%OW3KuZp7X<GhWztZ8ysU?+i2U-2Cc|y>;zqiKjO}f}vq$uR!OF(E7&>x5vE)
zAvO)Z0U;5w5u2KMn_3uxI}1A7qJ#baDrwm-tRykr#_s|?YSZtLF*CUFiFj~=;6wDN
zf1md$#*!QP)lBal>Uwfoy$*FY!OpvjxNpV4KyoI+VLIMxAsWTGt>+qxv#<J{yV=ce
zT_dsCEBNg|MC6Y`z7gSao!?$x#~}<c1W#F01F&^Dy8tie{O#*+h&T=$;xtUh^ZVN`
zKmSvVMTKYvOfbYSUtarbWDeu>1OV&xobxI<xy<1G{XOMO^a@BJj;8kZ_R2L7pkbvU
zaJzrYd^W4O*l_kA8e$kCFY9u-TzxWeJRaH8$Pi;B09=<#rAph~Y*GM(<6s>Y@2PAx
z-E5@8Y5nyt0LmdShn!YZU9Rtl`1JBq&g<K6{}jR);y}zT^x2<FTCUA2xuHhPL}Vel
zb}#^fsv^Mk?YBm@NJ*GE#=v3VIQld<rv=RB^D6+notGGuIeHNn!ob7mzz&7MgSp#k
ziQ_><(mI2A_93ZiU^<ME(6Xdym=Mv~My+=CeN?lhBykvqIAlpG`Eow{x4^qGWHt6s
z)11?q^Xk?Isxx7Bhw-#teOHjYUUTx`Mh=5V1G;}z1{lVJ$7zAt_5CYS<PdyhJB&vP
zak;#imJyLk@<a!-Vt>`xvxp32)A1P)*UOu;96|N+`YR%i$L9{w#z-d^0WV}`*SBxi
z_iu-nFQcRof|-d(jAQ&f`Ofdm#`Cv7gTe9TOBlxU|NDQ1Fg!oK0Q$bcMEvyhd^$Z#
znsZt_<WEh()K^_zE^Y!KX)T(Z?%gSD7s)T5zifD%vnoBEr|c&d1DU~keb4K;N@W9p
z&DVD#o~CJ8)BEM^bj-sLdv>l!B4cI-uywgm=Df~1t&-OeMhZof$4o=y`Fcj8I2@du
z<ZW5)T#+cG^$Lh1Jt1-oOlZseMo4j(2q^|O&C7faaSCzpH$w87(1sWgF=s)fIHIIw
zK8rtY-{mUEG$5g*6%a!ltjl}p<g+-^Ga?L!XLfFZI)fbmAZuQi#r+cEaNrO_6=?y$
z+h6{^F$b*?dd)aQSEgxR4M6H9rDmEFAV^NWQ@y`^Tju3(JPgC&oEOhZG)t{laHnrX
zHWd_H=j*!8hvQR!SQP3aU>qk^@vKn)zy{+>&TaTt*nb?tFb;>4cd`3Jp#eoT$JCin
zroCB(TWS~+!Ur9peMbQIpeDBcNaOwh@)F4fr1*PHo_((ueTY$id}R--Oc8N`Hguuq
z-3eX7qs_>xC1>n2nKRutDez8qZDzb>Yg8*_L{J0Oopo7_tH$qKWHHRbO(<FRVlxq?
zI~L+?n&8K#1^AuuEK#jkTlHjS3QpS2U?Rra@l<VRBI@?aj|8F{BhGKPD(tiDH(4$j
zsNtqnb*e|R$7>#5HJ|;4RgVPNUE!{(?K5Ani_X583L_GsG-@>v-B#Z>$Vf+vec++D
z&2$UL9eSO6jVmG|Hr3A8p}2|@k&A!&Tx!I=McFO>!r$AS+EU7Jvs>XVlDi_9i}s9}
z*-RyiU(}}Ib1SGClx<C<k6_ZpQ4?+@e%Fkb-1Xhy`Tp(pLznK?<v#AbJ{tWn6RL%b
zHuT(8$6KG!mh0nDF@kB;*WKlGRzwf)-afmD#M&cuJ%F)`Y;Vl*&OOf!4;rM=*2B%j
zZWDUCne%3RSQy83CTctU0HJEW=~lPCH;3!ll)k4mb(xCfoKyzbXy<f$uQn2MdupCB
zNzgNT&3e!MjaO`Upj9KM79@}#x@LZ`<+VV%h8Ns)gbrF(L4DErwwdbYp5CuWy*ux$
zxijqI>|1KG3tQ{edOl=1!}q;r!D`xZ0xpBaZZu`xYY(7?olilpAlWMgGJ?gx%-nw$
z0A!9p7NfJ*3;<FV;udEGM1cd>F9<|Z_o?8?U}m;13o|=06%n1TO$f}Ck`iMa2+7>3
zxdlo9y&V7mAOJ~3K~z6^<<UP)4$;&llDE&5iDD>i_;sF%obIo#5>uPqHYKa&EM|U8
ztVkG#k-XRMkV1FQ;t<?IS8_T&e+IC$%(Behth@OA?e!ah5wVJ_I(zC%2m}D@vWUpx
zu)EV)B&C{Q1sH?P%TkjNAO>z3)>#x#5HX3uybvKFEXx7_fsqJeU?xauEelB(5fK#;
z9mg@oSVWM%kGNlt$L@fEfEljqnz8_bAujWbh&g9fBVGw{7@|)!MY5<Z>zYLTHoEdk
zL<~UHh}7R4Q5BJt)gXx&Gln?0!Z(gnL_iY&+;ksU`<{9*d&}#|N**BW-yo+25QqoK
zDXnw)5FaQIf}vY3xRqT_i;K96)Q=j3Q!ueG9!wR|>U`Z>oohuHy%9;vwUT>lZcf<(
z3Cu*&bbKkj(Q=&*$7azIr(?fkvgh1xbrLof%wEgy@_%+}C;)_ELL|v+wV3hBSpjTa
zZCUd$3^9fgxV7o)vLLcIOeu>R5R%(}6A^P**Tu}%EMSnc5E&vFz&tO^90KQ@bIvIn
z(mKWf2+W8`q6RAIe5nL@mAvMh{k1Z43k#%W(crUiUDk|<%*j+rX0oWSy%LVSENe<x
znoL=**K3S}dl>?fGZjJz?ii<<+^HZ85x~>U2mmMq=IA8(-Z3ht#jT`#y>N)*R20Tx
zm_i(LS{mvvrp-~W_|$lUyk=ixWzTo}z4?sbmJ7v^2a$%+5HXGu#Rxe==fu*{PHJA5
z8GsGbF-}L5+~sL#1N>ZiNgO04$!kpqd#~!!o^A~sM=;In?8a4|)mr!G5@GN1SnufZ
zfqx-kv3JwZzZDw^r5m~Vae|C>DdT2ivBUbUr9+tNHaV$r_Mm&T(~LOQX}R9SJGv;s
zR8&d{PZR)AI%lkcqx$PwW3g~2*Hh@k?*;qygRuB};SQWZjCnD`Yyu?}K};3Rn2?#7
zW3|T5q>b+o{dup;vMiTj90z717ipYL4H1|qWeGJEmdTMt{Gd-W4ufU^T<?n;Pi&ai
zY-aPk-27J&bqkZ6B}?gM%vM4SaRkEMP#WE*Wkn(m<SBipmoI?u>(76mmZh(wuIJZj
z98bq7rIhpHp8bb00^pjnh>imRpnE>4O3pH`xeW^m;e4K3jd`4g_Q{@OfHenTj3F@1
zYXXDgVL&9e@K0;I8yR4!p#jE(BFSm-s>(#0N=!x7L^Nf|qC^Np>oS|cnhTL9FcTh1
z=%b3N<($-3PcAqfA|lR9QZ@gCVzMJeKBl^+v>uPgVHjQXG98Z;V&OaNb%CY!LIfno
z28ja_=4Ey-8#BvkCT2vCoY(nEoq)^>c{k=C4=0DU&5V37K};b~HM??K&NxgeV)gji
z*T!P1#Ie9fNNKrjeMaYGR&=)_$Cn=vak;#wv`mL%`)YAKsBE!_A&$mTC7VI-^ihJ(
zuq0iWS`A-iwTu8^m^j4i>ryx9`u9vlZC=taOd$+J4I{zp<w^lLj-Eef22`?Gea{H_
za#7PYmB-CQfzb@E^AZEAu&)h(Y-V(tN|8#OlBn6T&IN!_%{k>PIjhHr#=wX`IIEzj
zsaX~!#BoT4Ii)55Dy!B&llvD|^$LLFGyxD$VU&d7fB^I5twpiNaWb=9V_BIa52Gyx
z<(rmjL()ps-^a|D1J~Oa;^ZIFz>*TI=$?ou9ELDXvMxDQH3cyshBy-Oa(zc4A5Rph
znZke=LhuDyoJ8GXhPc)~Kp|GpLQQp;p29f2|Mq7v=||Vd+^kN#DA&A(Fobbh&abN4
z8v=M+7vh-Lt7olj7AQVelj4B@#BTbi<)y&eaa)B|!d;Pwzo-1QjyC+z3T~6RAYq#%
z@3G5zYkc-@PG8zG8>~vTTy~0^QH$*XlRXDvqj6JX=ijp!8YtwyqR)W1x09>N_M&e!
z5Qoc4apAgJAl_)oTc$X1Ffvv|vYgiTTZZvK)UK;h4z$fjnIi&uNG1_h2{{4+nl|i+
zi0^n+HIST)44B!y${%LQm2Id*x|Ca2Hjx&7?VhM+l*Eq#cf3$Q_2h8?QZfUg#x5=w
zz|@;J0#}zsGh=46t(rn4W>!E$B6bH)z1fc4#ilJ$W;8eR>ufW9s8rKLJ*eDJfyhwZ
zbF=_ttnBxnnd|$I-0um=P}Ngzb}aO|k%MR4nR-3$4wQ|sAfg7jLQ)S1Xcf~T+~;04
z=Znr5;f6G}g(-MMPNlJ^dFY-SI_M^GQHP<bnfcyaYNG`eGS2Sxw41O|Eb<8i+gT!5
zxmwYxuiaD-H^_52Q*}ptz`~6z(3>h!wb$>o3!Tx#o<Q!JY{_Oyn;V<~6q|A)1SKzz
z{9!Q%wJk@`t$R07MAt4jQru=Gh=i!6GpEWMae6CNN(*&)h1B9Z0ZGwrjVAi9wo`YR
z-XMamxX0g_`PA5z8%A1VF}aMp`h@JXcV&y!dzTWI^>155#g(@-(FXZiQ;2msoF2XR
zRBhEhV0D+KX|~0ydZxSqZXLre)TN~UA%1_9*Ym=@Gjt0*@o-(vAq;K`zIoT)4k4`Z
z_(gI~ONc`VLwyak?S1FBR}Nu19J`)uhgGKeVgNbKX1cE80d<Hpj0ggfmUUUzWu6Yl
zFbvDvJAlRUShNj9R2A!HqB#)<q+ps|9RY~*`PFiY(@9m*as^c<$B*L}hB3tH>(^h;
z@9%zjEoF_6LLf6pS%PHKEFz+IzFeRN)cFsejziA*{B|Y^|MEZkS82^z^bp3w(+_#M
zrZj*4!{7P#O+^3a|MtHkM~-70rvLK4`yb}>+x7faau!+hvPfRjaz?;UfB4VBFoig%
z=5>Bok;~gR)123tn2FeJ$*#+<i1_1AKMliB*h(s<I$yrILs%^X2jbw`<i<Agchot`
zL^O;iVkQcjS1^71<sS`T91qjsxX$M|PA@<HNmYLPhkuWRW^j7?G@V`~uT7k=T+fo%
zmmmLys^nThAJm>T=d|QB69q8%!ymsOp^2E8Lw0#xMDqFa^LRM^@a0FJljU@klun(;
zrrCRl<KgKC0K0tqH4IZ2CO3^NQ5!jdng3xJ4z*QsDXzLZspOU8=n3qI=)>BkX%Uh0
z-~aokmmi+L{3K~r$;<V9U9Nrs;}FUWj5vhR9mp=1%h#`8$7wtrk0oGlK~wqlmp^CG
z(_tuQB!U@mh#?Hs^f_=CrsH#)PK7wsaBUdzNmZ_IzpZOp)*MEQ^+4rXHH)P5?d%n}
z<ebtx9-apdd2hiA0Pny3jObgxzW(;>csL%8Pg_`Y?GIY0Taz%^en{bO+~xI`CVcD<
zjU|6w*LA*Lr^9hN9El?_$I*#n@6Ex$M<Hpx03yfHPeD^Lk?Hi}|7p$X`1vO&4lh=6
z50H_r0Fd*t%$|FWahL!&#sDU7zx^Ws9u7ks#yB3|-`>`gL?x}u;dpA78it98hr>xk
z*7@K5|D3(ql59(orlqQ8wgz{Ph`rC0Q&mwtNwomoB5=WV-|+%G0tj649w2?iTR@BS
zW55+6%ndY6W@VkqJj32Gx%*mXrm9@1nJrr$v9qK}sXCPs6~`lD4Q8gQ|Ns4A7(yr>
z_F+B^<Kg+!A4)N&diU_L$w0f;YE@aicSM*H1HgQ^cOi)6hT0Fqfm|d)OD3@|TAY0t
zCabQXrM<`Oy?0^EX%)$k0g0Ei_WD>AUS1vnOMYJKm{plLs%nZ0l3Ool7s6y24u}>y
zpVn)R*Suci^*rByM5OidB01S~kc|NB0&})Nq3v?{008UtRXC4_I}uBiEajw-Bj^1v
zDJM?rW_yPcHc5!aPcXI|g~1I|PHS9Voga$o7cs5ZHepS18Rz3L%{~mne6qKDJbqA>
zv|bGq*ZLXf#~;iYg6Q;CD9{NU@@h)~IcM@f73t?<&JU)x>TK-#ciZ0e9hpq8kH=o^
z0eb6O#Tz5A>X&~48U$HY3EzOwv@6`|IT3qKd$0Q0yC86v4c4Q}diT8cL+N)t(#?#q
z`7v}0qA!OXt%Ff4LrUhv2EpMhl1(jU9=MjFXVj(6@m=%wtV@(L=cE9fGdmJy3!t=t
zU+GSFvUb>|pm#X<+8<XzMb^fz+746FB=ybtqPvXsa*Qvd$EH5%5}{iI-IN5n*V^|6
z65K?{+Uwx8Biid$7T|`v>xf)6K5_R8+#CqoMYZ~)>hZQeP4qT0u-t2{@sPd#zF<3g
z!8+7`VkZ`Zas_+B!21%g&1a48paTl5xm-}d4t<9=0mxfz^1ez6|1GUhU+NZZ84GXZ
zSo#GAR_BI6+{v}Hy`xneg>P9I*f*$J9-iv0`l)|&#X3-`U~SnB*U<l`FF$(=kZNbI
z(CwLR5B|F~S_kTDU8S8)tJ*bosSN%4a?332r5-mClKAe@t=;p3f5N2o9u2Ldj_8-*
z9B*PZ`)tuZpwx^#Z<)*$E!qB8d#l^d{q)YGtM3HOLg&}or(^2dj86anFPw$>dc6?2
zkKg`AI9c*Qvr?FQ(FT$(3<#*MGAR8JhC>*qFdjHZ<}7Iifbnoo&L1DX70K~>1^_oq
zb`Um%Pk-J0Fe1QVXACp=AOHFv{QKYi`Ct9(|K)%9{@?uXzx=bmByybAH|aSVro(Ce
zHeSzhxkygJdAYol1JO9g<>Guee)v{Zug^a(%lh>E^zh;1!{IaygXVa;yF<hjR}ntU
zfn1mlcg*sKzx`e~t;;!tFwY<RgqJFx!<6!6Nh<vG)87EV@i=mP`TWOcA4ccGa(*to
zcmM#L?>_wF|L8wPaxb6$;K%XczcK%;X+3`U?f=F(J^t`p1pLL{`zIW)FQ5LX%qgwT
z4}P4_uP-l8pa1GV{AYjukN)Z9`DYcryguf*{_-#Xy||nofBZcno<4r}^Y{Py_y5=b
zXn9Yf62chQv#Jim+``J+12mmJ96x*)#%Y+2pa1yV^W%@p@~SF6t)Tkw?Qc}nAWUJL
z#EP%woa172B|8Dkrw2e<UZ0@Ll}s_NYpD*+q;JlBVV2Um1ajUU$+TY2k3Uw`1^{61
zh4+3y!1esBpv;LJsd!dFDIO`a&lgu$P9_IemFxM*Rt9Dj(ew2sru^~Yj?6xxJRd(I
zf?8GpU{2S|(@%Eb5ayfLJw|p8Y({*3{**Ge-N#^jrt~wZ#rYZ?;SfAIy8rN1O)wDQ
ze17~Xb5sFDOChJ6BROBV2PK~`2Qdk*WdRBRFh=`pq2?qbc^8PB1J(8NEG!~COoz53
zIzNc;_528c_YWU8WF<h(Yg(82^niWXeaUZY$4f@qHrJj-u=jUUN;#(N2Wj=C<;*!3
zTo`g(Raw(UCl}6{6XzJh<a}5-13->z8Sd_Lzg3uxgZgHvGxS7UmzqInm&>5%J`AJn
zjcHw2cmj}&w!R^l8-6s<N4&nS=a>2T0Eo-wS#q*s`}Oq|0Ol!JMeBt@*@wZoA-}#@
zMWvFv?xwEGOWh6xgkLY0WmyjMU{g2ee0<47<UJw6Ft}kD#`z@UY`D2%C$qdWq!ib-
zRvLATb0+5zVVIA@d`#=2pw4-6jvN&zT*-vt9GBKUR_5jPv284Fm_Ur6spiSqeCRdg
z6)OwW+Se`&+w2KZIH&b$7=$n#?Ozn(!~I9$v|e5S@p%7rj@PtYsOBhmAJ*%uX=GIN
z?wemJb55&>#OrIkUUH0B6JV;jOFIyzS`&UcK8R$=DU5R%4{13!cAEVxH%ylF0yPlV
zo?&#8aF(1+`y)B3ir+nOEnMau*4VpkSiJ#tcGW;TSnt!s-^!i41a{b(sPzP8R)o^L
z{$g1My@Pkt>)#xG_Gwrp!9zrpunCO-NqT4SE=7GSG6Y0{sIMLOb!7AS_UB6#5eqIe
z&F$NCFKZVNb@^T!&kEZJqDhHcq;Q#--qh;Mj3rruT_B|mpH#DDHt6;~+o>^Po9w<n
zOzw)0@}9JUTzl8^uHdf!=cXA@2QUPkX}YTj6?WQc+_Z@G(|Xx;wfr~xL}xSK3Mbs=
z8M|VOzT`aV{kZ!dhhL%;yrn#B&Sl)s<n*o4UiW{j?k+%kDD>|jG4%CG@4<(^n^vLl
zZvi)c(@DC`zr?o}qAzEmA4k4JmhO{A`hr7hh1dB`c7-(77qMLYI)8>;+QOSss&|CH
zA$WB)TTvVAeDDQb2(1XiFFi;t<N)80mvQeL-__0iBJd^ywp}*r9}0!deW9>TslG%l
z=}~K1Us&z%=+IYsEnH7`iGRB3J(^RY?63Pxp>8`SZ|s)5)(h+zCjWo_qqi8!n;5cx
z@z4MBYFQ(j{g@7CD|795HH?Uk(=L_XMB5fiZO>^KXM5HZAPkd=m`vPa*enC6%8_+C
z-Xmg8QACF6Ae`fJMu0FKtJ1;Q8H!wZef(pwLm`^8n0x?4Bcc(xxL(tG<+O5&hKp^J
z;p&&toFX8q0y*c1TCBv5TB6P5QDaJ_OJ_8nxJ7BlML{hU$$5|Ds-`)czSLr6nt5@Y
zPv8B;Ujg9x>5m9#(Ld%M1=aJ@&nj#!#OZJ%=cnU?s-B;IPH9=suQmzv!|44W!iaQy
z_}UNS;}3s>ShxfwD7Gf9{rVsM2jBeWA6{P`RmD={*Yk@i$Lm>`U!Q(F+<$%d)h{_k
z=6wGA$Ls6ooNE3N^H<;fnmH|(7aK9!$vlknFdoc_JRR>Efy@g1lJ+N=(BQ(HbIvR&
z^WAYGD$1tA=>q_g56t|xfAiPVIM|`Pm>;SlnORgd1lK#~Y?bg~^uw6rl5@<70q}6T
zH?6iYomFLBF3yK0b&Km7Q*>2oq#|Ga;x~3`7UA>ji`fq>eU(|5&3=pHG&|>BU!J}9
z<22i2wXX4UxeP-Xf_v+`N{L&zO$eTx^M0^oI3GrGp=Z>E@n8}5eWi81UaptRJdGg)
zI|-O4hnyGTxL!cPIlskPH6fDsn_!JI)U4gx<W8cd38yk}vTIim<n~(Gc(tgVEe(#@
z02(%(w_j|zUSD3GkH^z|DA0^85T`<er2Z_G;!092STzf94}NTEP*skQH{xB2J`7C;
zX*qU&n95cp{POrm=K_(tF6(7kr{KMJeE`Zl&mxj?R?*9{TA=b_p5}S7U83ZIaaNUr
zcogeYLm1{^I$qAN*UPJ=)|gD%j?0JRQAEtmG9MpOS`01Oq$;+QOow~t!}q`cYwz7W
z4FLLbUJr-)bUKw2u=7Z6u^!AYAiDiv1DP|Y=zJjWC1>XBytnIs&OQJ9x6X%gJXB!|
z-t-L1%`Hw-ghs&V62-O83RaElg*hLNA6jmV^Mm~ttJuOgyD);Xjp9^fd$epuK+bv3
zIhR45O-aoWfux*~(4sJGqzX07KF5`F#qSLxq7w_CFX}IDZX6RK+g*EW7z98U1}%A8
zWx!M)QEaTyK4ZPlNZt<{0B<i-BmGnxbvwCtcIF#^GVjAUsKRS3TBT^kN&>s#$W!)y
z2*U^^A@8kGvNokvJMq$O`=&WGOeR)?h_NX!JHwMnozeMbCJ}uvMGb1|G}PdDB!?=f
z1Vlgt+}j=;b*V9R3@-ISEG`jyZ8#@HBJ!rvgf1S83k=Z0m@?=PudiFemZ~4e!s0_U
z;JWpK5>c_;h$FYQ2@;XxGRM>kDc6n<RRV7jU3(IsVPN0X<+X;E8@-ikA6uk1ht4MM
z!hMGIF1coRS9L@36i3ZlGT9rsCL-;yc4|7n)@&#eaKIL>Rm|@149Do5pR{vIbXaE<
zRcd3=+F9CKJ?I?D9^TqbAKx&#whPwkcr129xaDazFE18N`Tpxp^wz7|CAak@t-c-m
z6<LA)UBHI!6mv7?+0X%dG}^nxCRNqWzG@;wAm`);ZlJpuqn)slOB#bI)unT`_l=(}
z>m1=WmaB!PRi!IZD;$wrYe9E|uI+E`Cfi`iQOc}jXU&EyQnf(0+b2R)S%gr?LLnTH
zBB?5>?gy#;7!}_XwcV)v3nSG{#cIN(UdD{QnwpSES<4k@uUMm1mutekq(aMMNumN$
zO>k9MZo>RMc>ucrGTZp1eC5qMsC)2UEt%iD2=#k?F#TRy71YAS{V>}CZ6~`hPPH_&
z_)RivNLm*FAh4S4SR>C^x4e5$QHw0Mn8`5S*}1?r<Q&%mx)sTBX<=Y-xuE@+aSr30
z<8pcVRL*F+=?<)Yteg$EZIzjbX6CRx!XV6AXUHb;R}rhyEi}B2B@h5|j`pkeeF+1|
zVz5xZIt9UOM;;=lpgFCW38{D_ns^cbQcNs7O;ZWHZ3h~A0Yp-~a*oDQI(_)g57W!f
z->d5D(~qE<mNSt%efY-KlN^^qvjw=mzFaStFi!1{B_GTfJ50x6I;!yV&)-{#Z}P1i
zV{KF5INu@BdVMixu5e~%LQ+J4)Sft-z?D*ug_&IqBNZ0JlCN7e^G-os%^pT`8j<r}
z?2@L$EHX|>?ZUDhQGFPu!ev!s?u)8A2bLq>EHPYW2A1<4iy9ULjJ>WLhN<Cf&5E(P
z2tbIi!vSGVtE!N5BA7CJ??MILdG7#%x%mG?)6o#XQsb*`)_)d3#AzxPC?W?in6<+X
z69D9O5n-zZ%fy09oau}%j586MeWuC8&9lX9Cx*--#N2nbkrDv-5X@7kDmFW*!Qvn-
z1RNQO5a?E}(p)rB;ae&yVuD+&;_#Xj0Xapx*CIKmE0OQcK+;Z8hB6`N`i+n|<=jIa
zs&Sd9czen!XgX(ZQFO)cWSR1unR$&lcnrZ?y)_Jjm7A)1y_{1@_a6=-;=-sZqA$)l
zBxgu*>&=uCWE55Qe%ML^L?kE7&iiSet$I_A02+p&!n)A=p;Q~yBu?aN1C>l`#hj1F
zgCp|Zsp>T5;9Xm-Rav<Hf#k?JP7yXW5IAx;Ol385u0rh8Oq?Qu%$$>5XGCYXZ56TX
z>uN&lTI56}92-1ZWE7(0ERvlMHICILNY>KBX1`Nm6)k$##>-TDNlRafa}wvx-=d<K
zQ&z}17Mlc7iVHbEIIp0Wmrq2NW2{i?%ZhRokZdHj#)K|i@h$6-eVE#=U*T#Q6m9dm
zjTCNjKTz+7NrWvBJg<u%r!XEQC&)=9vxpz&mP%zMgb$;Ntk*Ll2!P4i?R>GEU)qjk
zR)5LSumwI0)8Q_z*R(EKSZl(79XE1Zp(5|nk|+#5pbz8W{;Q`Set&uSM4MH=bsV^E
zhi=R0Qpwez-D4rOU=BigObZXF8hh(Pp5o%X_u<$c?z$01=RMSK<`$g+h|YnEA@z#a
z)dypZ4&wm;mgSmrp2o4+gS6-cEDKcAdReb$TPTkY-^_O(KmYN!#JpZ!s-)%N`0%y;
zKFj$jEob}nUSD5w&R>1?RXa`l>1cn-eEM+r)h|=LKL7N6gHG9Vsa0(@&L>rg*B5&u
zN~0r;y04;~AIx_z0wOBR!r4d-_DFD!D(w8QiB8FhWaUicEZ5h}HpckKnakL+{#N9i
zS-(ZtICcyf3!aKv*GN@!PDIZ7u_mY?asWw-Iv@|@T&0;x<Qmw>lGvOhRc<FjPHSnK
z0H@47<-mFGTu3S1#*5w*hUA<ZRM#7}mYvm7W+HOc%|gy08SnsXBTVbnuBW{q0FWVB
z`zVYvk;`ed6P_KvR0YW+H9EF@X;w#;nCiSLq_`qN7!HWr!A?mKFieLxtiD3Pkd6i*
z%*;HPl|rP|!^X8SeF`En=M-fa4}DO06Gz$}e^VrJPMjh->ioxSy4Zg6Zf_#gj1EWM
z^c1F^V3B2I1EF~5g7;yV$Ok*doiCS^d6*6b%_@@PCHT>Wq1di+X3pa{8=nPKn=qu2
zMnu><=jVepjW4gCR3Qu_krz&g<b3gf+P`Rk*8UUhSG7or@@fysaKWv8+(1G|4xO*L
zIt>-)9a$~NL=K!!%f+?;1uz0qPN^KcoFf-RRWtzxbRIar$(bSrWo9V(G=$_>Q%=c*
zb;8OlMp{pCK_rtPm9kis)5^(=69vMT(~9H*j;fH>t2oEmTj7{flmbHrB1hm-T)ZE2
zJb=jM`LiF!FwAwhE7pXsS4K*+Zfm-j$bn7!#>^HjSg%!3Va>^&DH|H8i0ZESVkZe-
zvRIK2R8ef4)liUSqrzP{Ru>{s*smrY(H+jNnm|ntZJT2K<X-Mw1H4pgJfi^&?POs>
zvO3i+!;URc?ba?~yNT~W9<XQL>&}|J&nH8Ks#3AFgeo^~%U|w=D$Rjl4MiIwQUzx;
zH93(Z(syGA%ps3d7*|M6IOnw54qE4_R_`XQrsfuBMum^FOIqu-M(xUOYtja^+tQNl
zlIn(UF2Adt0?RE!hor!Qgcg>x$HKjpWp{|tE=YZAGqyYW1s%73LEEjWRcV5_$MAnK
zu4Koz+(!m>_|ltv%664Rg_&C;tJm^ap|gp?IuK=z(u1l}p>nm6K(P`Ei>I>y=c;*I
z5kWw-<iK|(_wuDC*L=sOur;P|`?l=`0zwjN<HIJi+9};{UDen$uUP-y=C|6~-sSIg
zH;~0!3COKxtzi>-eLud{IFvwd)muUQ&GU!2J;EjNt+}YA9nhQ4rrNHw2b2KpvLkT!
zd}%KUdDAz>PA#GvZd9qut870-$=j6I5qWgZR#7C^jA77t7d^vM-^h-z+~{&}++<&(
zTTX_2Nk7sSD+R^Uz28zG%brwDrMS!S*!r$`qxdVCUqn3(xR6ZVnB2<zr782@Mt$l{
z=fCgM+WYu+9Vqi%ZP?BCGC@tb<6j?tbbdJ8f2FF+%jX=|_4-QW$q~8159R^T>3Hw_
zaC!L*fSjUXQ~WrM^C>Rp>&s(zLCLuQMAw&3<idRS6#%T4XO8h@`D3%<I_HP^gox|q
zMJ01ufQZN;p&w?E%z1tM;dej%^}iYqcYc_{IGgF%;_Cn;=iC!+>|@RU<-Py_AOJ~3
zK~xW?hvS3eoDg7`k3@dGzBXT{wWPv)OzSmQ7e@zkg7I)~ZxJHScVC(C*N4%E(L(aZ
z`D6{5Mq#if(l8#z!`<=W>*f5sUS0+l%4!I3|1bbx3p%hy1eVDn0^m5`4dc=NpN~KM
zF30ts{ImaLIX`{+{$H!=;r{E#AAbMiU;m$Wb{odINe1p8KGe}^@kONdYJwDHMgUG}
zT`rY#od7hh>-L}siwfr~IhsLUB*!(|VvC5cPd}CBI=SQh*D+oYUdQ<`pFUikKCR1n
zb`MClNte-A?eAslc3M{@E=!C>W)-{(-cHI$&WQ-X^S;^W5D7ehswC^QB<I60pG4&4
z`N?~Aj%t!aa6YWd+D>`h2DZsA>^m(rFa$6jn;Gis!B*xmjKesLlU4KfKlbW8Jw1yk
zAVN&%>jD7Yk<mvl*Xyz@-nl(653XxMLQjN<aXtGm4&!0DUY6@+nr0tDyq*!jdGABW
zaRtO|LixP{)lfH54)O>9vYu-{nT~h&Wo6mWgSakd0QKIZ^Bh-n{_yaPo!rU!ofZYa
zG9v7nuh&-_V1UZ<`nVylT!=4eUDtK}vHcpu;DmLF+3u-r;@*$*@f6pyMKB`bFdb`W
z8!bt(K>+L_48s_PV_D8Cpr<s}RMUEe+Gz1%Jiop!%hfxFh~5j`9;1|qoD0ItoPZAA
z59{?snGOCKudjd<#u*e+V%6w!3gf}~kWyZj1<T&aP!4Za1L1fm*V(!z1XOBb1r?TJ
zJw%{ZOiL3w<{UZ4VLVvSJdwM+elAC37ry@0-?z5Mbowx#J}$3MalKrge->fMNjQ!3
zscCjNEjClp&BE-$Flp7l+&z4(Pmpo%QeGEZ`r~?$oQHYC3$)lDM4a!xQqG){<jl$d
z=)+*03?DqAF4waoH;l8*AZ)wJIp!3{>EOcHAD)KkpjCh~pFRkuoT92I3pww@z&SN7
zOG?bFoPS2dX+A-hM2kr1$c523tIBye+?iXtfTIoT;~XN!^~#09p;b<?mh}XHQ$#Yb
zgTtLJ1Pn&%>uExJz4ivkuVQos=-EiPKlSWw@=e)Jbu-Ya|E4ca)e*Ot_#%O;pdG+!
zlx>?!^H=Mh{f4RnQgKoJ0ZKd9>z709wu9LIlRMqQKKrT{iFE($Pu0E4*X(^;-eLW;
z9!gn|{{={II!xJ1ysO1Ww}il2yf$cSEBIKq3alewmGTxh>%xt?NVn5FsMKR8_6~$j
zlzwCAzO`0=skOMHac<Nr)Kd2%;4Po5_7Qdp^8ORx#@f*(z3=QC-PsX$;;Y`=yXCdr
zdU1Li@17oko%;Y$|Fku|Wjkz9<A`r+*>|kOb_!FXy5x4=9_S!gH?9Ny6F{mh815Yx
z`}TX{mT}S%wxsho;d|b4(1y+HkPjk)V(&!<7*MQ6^6G!+T}gWDj;Np1(*4>KLP$al
zheKcm6KNN&w`m0{Sanx~bkF=g+fVnhuTB6VLEgS6h`U;)Z#T5Nx#7>c#jo{o8m<g=
z2X253Gf?dcwbCK18E5v$Z@R~>Aq0JJOuxiQbBr0H58+LeV;9zdyNdUX21nnjQM$NP
z)pvXlt;>R4M$K*A)>M3Yt9fbp?O$~J^gfoYUEd`p{mcL6zih)fG|qMBWi~A=A|38N
zx?y<w@%!eAvl-ZMxD!sotZIYPr2>D8d+~Vxm8v{{`XlXQ<xLz32+ogyB%H|k@o-l*
z^PF;uCU~8X55wX3{PQ1FWS9;}E-sfEPoZf!JLkz4b?h*o{5UNykE%k3_Fu2g`(ZjZ
zi9dAuy>`D{7?FtMLgd19F!wz=Pvoo~wKv%!`i%GE!q93UJAH_77!SjAjLSK%SEMbA
zBaDagsDZW|0PJqNA0{9QVYEXl=d_%k$oXIX<-faLUaqf?#@Wen<(x{w82|z<ua8Ks
zD460h9**<z!+5wG4|j+AZ^pyD<W+M1+kf*vFP9e^25YS_R7513^4O5amWucC`HyM6
z-hcHAA~zoHa!UXA|M5S$sy1%V>oj;oSQDE9g$T#s5g`P>#(Z7kG=^ym%v%)pnliH-
zra<JT`5>x4fBHOl7aXO`iA(SO{xl)t`5G-rz&Sch0TFW6%o0-$-g!qM1n>R2uKfU9
zR4oT!9z78`N6VVlnC&Gx7$`jDEb`5Vdvm2T>(8G)JBK~P2oZ9pv<!{}fLWY#zxwr`
z#pSYGU&1hjVKxq5(GNR^NSBw-ZDv1Chk`JSYg*TFo<kVzZMMmZsT(TA&4X@ad2?7B
zgU!C#zIb_kLBzX<uX2t#u09M~`5VS^B2?fUZ%&F^@#F%M=d`p|>gDCL4Qs7>vo$fN
znDaVLM;|8PWHc|~eE;>YQ(Rvje@2A+4`20*rsTvq4fC<}>JJ~jQ4xDXKmYjqaXw9l
zhcHgVIOm*1czJzP(ZY~Jmvemi{FBy5OXrYTnPr;hFbuus{POyloFAtnlADhYm)ED~
z&p)*_3IVQhD?aAYw_S6I*_spfQ_SHrje!trGU(3enX{}h&+|ObGr54|tUj|n`wu_-
z7`!vC-Z&lCb-i3JA-LdaJ4Yz2F*D2QIOZ(pYb57>_3J+q&Ya^opT_yLu9qBFTPit4
z6&{ZFHsS_A^8OY$R8RcOSw(Ej42a77{PQ2i!>PE=naBAUhAF4G5fxIhF^4J$$1og*
z!<})u<8ro8Lsea`XA6TYU36P=!{CRhwZw{Y4YaJHDK=JL;di6kX6=Z1y&4l7i5@@w
zRPh2dAMfAl&g^%#goZwwzE4xI{}+<C#kK}Hl%Z@ju;rZA!`;XE^l`mB$K^cCcc#PN
z8S2}?_GTlkT1VY!tKsH|tsAI!oBZnL$J8&<PInDo-4s@EL+IMF<)~7wU_Tdl)At2@
zzY?iatM{oqUlM|EY0~&5!Etki<1KQi{ux9FHXXtp5^p=hl|`ye2b*ZBdBxsWsn=BP
z_c2<18qVf7?`81XB>DE=JE{1d(N>SS+9{+}q}=G;m;_sW-#YaB5J~MZaQX&ihpqnD
zRKU7Nm+jl3x=RYIE?wO=@0Rii-N2w)Jyn}kv?pM_Kl0N4Xxh({^u~nnMs@xkc&x3w
z_GfApI^%7{hC7_smsyBkV5;rknQp?`7}B>t7Q2#gBjZVDVnN*(0a}IrCBGANKb6A0
zJLDZd6n^=o)Lm{n_Wwo79IN}bJ#elY^1a3Q=}vizg_?YGC7Z0Fe>&bBR^mnsxV_<9
z6HYtBcuxWWc%MC4L;Ln72e@rwbs>nY{#V!^{p*bP=A+sz>ELkHK|$3)*S)HJ52<%t
z^ff<}p?>#cD@m~c8nI(#Rt=8Uf~wSc^ahn!NNMc}+^4a=b9-uM?gsH-o5g?kU;k(1
z{4n1EKu)WQm;wq*oQ<3wzC$9;u~yAm20z!cT^APy9|k*;sMv&w4a%jubE%gkYv(v6
z;nWl&Rsxdq<8)Af_3~n0Y=BftYF0ZzE8KtcXPo1Dc~%k5t7Oh;bs<>xH=?uYPCsF;
zPkcF;n9?;Zmx6>g*SuMVL2W`7rUU0_^BV*R<G~H%dU>(4ZM7k~FdtQQeSIo+WMR%J
z3==tTC8_fR60PSa*pfANN1iawVVsuNXEkSxsijSBjyOywJGiB|<X9#v7Cu0wZ!F~e
zIG+@By}X+A;O^ru@4x<Kyk1gVRFbN!*Ru$(=a-iAIZQ`RspMI!qH~DO4hgT%pL2{K
zzWGHnvWZAq*X8<Jj%h3@^TXZAId}Z<jSJ)D>1WFU0Dv$~!a2ogf0_ZS$T?Mbeg2%{
z`tb2<L<-|1BCn4>c^_ODh#WdsF*l+rkB?6=rFjU>`{U_eRbQSyiRzm8bUYnTCqq$K
zcDap&Q@pB3T(1Z?&PS-~dqCp2<{W(pMt~E}AAj*@l5<>)0ywATay>s*R<a`C%gYm}
zj^j+;Jv~0QKG*R$F-uN%Oh)Gj5JH#`G3VIY+RTE8hvP}?xyUJ}G|qDfn~oHK;&L{}
zi>h2+KKD|gFiceD&A=&&iVuS_$7u0A2iPSWBO=7OR96XvaV}1F)tsXBHga52Tx`<Z
ztS^YTTwcigVLWd6(nVTj4<nDqdqe_dFaclA*UJk6&d1Y@_@xx4bz_s9ZMhNQ=f_Xu
zG>zkI8Zl9BL$4A_XJ7$ShA}%IoFC$Pj>{#4$$4*TixjUa9Ks|j%n6ZB58uANJUxE?
zbU4h1dA1eF6adR|73N{^#;E`WyXNFPr)WTSa#oA$`TUYo`uf{n)M($<QU=2djE7Sg
z59#`9;6MX3w#KLP;c~gYyu6Hq9|vzQm+2v_HvQ?xAARtr<B`Z6?!PkdX&B}(9@2U#
zoG{g#qcXc;#G?B*@fw$)K0g#Ctuf8XA!1yvwaC-;{2Zn^j7Otp`Y^f>(sI=Td8cAl
zcFw9U%Q&=MpL1?rXXd0L!#InI1;I;BMUE>{d^ki!!tFdFAo)IzR!!sTJ-J}-br`04
z9>DAQrOJKK4};}jj)%MHcz=C;jMrCk20~j!1p!4kE*C%?%<sTl(g^B(M1Y(YVRm8E
z((KgI?=@3Ojho)$>{We{fWAM<C<#wQ&RS}=JEAH8)q_{3FWt=#8)v#E9qO)7fQ@5+
zd+-qvw@(08?oQpR<eUiYWPidIDOEM)dfP-UsfyI8OR3KcF(7o$fh8i@9WS9J^Ym<6
ztY5}vI^^tCV6%Z*(#w}pRIKuIb<AUCj|M0J&e1uq=%5u|75AgK3##r5H2cFuGUq6g
z8lBRjuilkX_RaRbNH;Z*_rad^y*t>N5<Y~1oU<E&HMz+miitcpDP+-#*f1@b;S5TS
zjWscyR}y2b7t^{z%e&cleyXjjqgBRf>l$Te+5vO6VAn=d=bR8BnL8Vlh`hRrs_}sx
z)!Rjz0pB8C_b3N*P<4|+AnIGQa$`>Kb;e(sOc#Ho^5)iW`%0-|dtOA-qhjA9Qowdf
zEA?^XJ=ZB*F>>n;QLRm9`Q9|sW=ORja-a%(lhRuYe{JDx7N%`pZcn3tY}@TtW@`!m
zvcPR2i>pQ2f$%E03y4rkz0yCuM5IcVPpJT8Lfk4V2LMMU@JopV(GijJD!D<l5gido
zyMqV_AXwmJxXq6XF5_m|yeW}4Vo5dBll=nN9&l<!;l|RgfS8t7^|nQ0cfHcow3%q(
z7Sq;HXKy+)+mw}SdC8l!)t(<B<Q*vGz0E@LhJa}M0uo@003)cUhtkrlnJVQHRlv0m
zlXJnSH1=MQ&F|VAvAh?u$pz|!cq{I)UuF@Idi88yka%()(Q&ckm=n{N)F>h%7q2fy
zjxLst;;j}D_QU9hqcw<So3fTtI*fBIawRU;5;$qKW+f;9pf%icTopN|SXIrXuL1yJ
znB6cgua7Dvy>5AZv`|w;;k+U_H;i`l^L}t)jLW6<673H$+g39V*qUCjWEMpRtewf!
z5N?>0N}=K8ysC<gNo)}sk9Vrd^(!V|HUcamsX5ApV~PqIhN)$;D`#`Ik@L<4OD{5T
zQ8lV(MB0F1!kX8d)|^&yj*y%mdYdgGrnnR>kAi|O=Vy~?iE@rhlUkK6#ryu~Q^Kju
znQQT|nKO%N_RLwF<Ep|I=SI$hjpYy(biKTkES36N+0R09R<heNT0WUAP?r?caBfZ8
zttd*8)5<CNVMIXhoO<@&o4Qg(93cV*@4%pOO%Sh|tHMxKZMTzby$wVyNq8dcXas;5
zb4u|pt-{7=Moz0qZOhW!-fIPs40%_?8=RzWmgOtK{B14(Y2Jo&$~jpY91)G<<h-w*
zq9Tzs41#&EEELA1(K)9WBh}P1sdJ!uW<qm<GbiUfk+*jT(IJ+ZirtrD5F=7mNzpm)
z4tH<by=J>Cov54>b(DE@&XcndyKRQ%%9k4cQ1S?=N-GOzi`pOpZ_tirVX73az6V=%
z{|bOEjDV=p^kRr5T3MM{MQsRbPWGIl_jGr6PYCO>nEEAi0)>=0=X|<<C>}6X7DjQU
z^CB$5D8=+`O10(siiq9^RgLRnYj4hpS!i8V?MD~IKNk>(H@}%~U`4SrVv2D`1}%Y<
zCKcWe87AH~C4mK&31<ZWNYD!Nl9^R-VwOQB-Xl^@E0F^n?AIgbTn?&Y`a1(mmSas}
zDU=Islx^@Wh;(z5lJn|-jk{Tz&rUn;!QYWzD}`oke~6t0xW#_elbLWb47wyMMhOw)
za?WY3Lp~{qiB_gpW{V-#Opii!PxZspngLqrJVXv1aawbXSc1h|<!P!X=dtW_D#kT;
z9_+~ghve4FYdb!;Fo8V*sv<(<r^DTPd0ktegehWFt^O_ZMd9W3nMUu2xfc=HLrg9>
z?-vyj$Z56v0@^df=IL<1US8TEYdJp=xnVvjkuHElo<{p-7lvUzSbIu}d0Y_4M8>uy
z*m7UFb2T@du`lP17?O!v5ymN6{*lS?6=0n2I7i!Z+5yK8lON~2E@m@V)wEuj(}(Z=
zq7Z6SRalf$T!!(0fmAqi_Ty|VVpRpsi0Fq=Rdc)wD=_4==D4_F1ae`Rai?IEwn*7=
zalJe*=ch2vJ`C~tsue0|?`mQCRY4j#@4~2Q70ET>k5lHfUJQf)peZf@>KyqHi~^&=
zw(YE!S5-aSeUNf!P|m5?S5-L0#;Uh1Hf07RP_|A>tE2%D#c_&py@X)`LhlKbyb)jg
zpd#cD6~O~mV2YXF0Whss6){jPRv|kP0XQwWuO&(s0AotavKnR7ln6ORk!(%!@@+QR
z08=9LsBL9#Z<krj?JH_q1|a4w4u0Ddy&s$pl`IGab%f-6FoG_qdOz4Vh^R=E7;gr_
zQzyJ5a>B{3u=8Yvn<+3Yj^O<A**Q;xQCgh6ykVT%BYFb|z&h|Vo3n2%TyjM2dVW?F
zM;<DoK}7A)Xe$PRLkFC5&e8gBy=bxNVi5t!DYMN2kmwx<swyD3FetORl^Vbz#<d;l
zIVY2|nPAO3H{9PZm-F@VYGj#$3Smx}r^B5v8%k7|g@nrA%PL$SXWJNcxtyKz?&wu@
zU9Q#9ucAu02*+|l@B<O#oSgIJ<SN`Gy&{6-!#KS>eeMe1;sORlGw-W*0L7g8P)W{Z
zQ{38R!ez`<D6AGA;Sq_`s^qO7!<>k{Ikkvf=})@Q3iKApV8EuWQKq%nC2KMfAjb3a
zHcqa1fr`%gQ~!~|^cP`3RVe+%RJp|B`~WJP5+ZmRImNhMZG$fCXoy9FR_ifU!7_{A
zFgFxJ`Q$nm=({rHoO7PMU(cG>rLa_p5I{7mg0D|#$0gUjhj)vq!~HxN3n#30L172G
zLy@e7m({wOytk=#W&qreFmY3Ps4#Ov*c|<Pded%@ZO5>;28lfwv%Y>`(34kvRAqFO
zfH~^&((E2*X)UIvVyIo|jgh!(o3y@$F-Gjrt#y=*n*^gASnL~Xq@+o$kiswmQi1ZM
z*kT`UnlaFcWAVmwUBC_6a<8iVg@AyZb9SgVYN9s#yTEOJdiikKCxmD}neGww2!yCw
z0vB7iv))H(HwAaXD-g+VF=jj7e`yEFEd;fPe7>hd*hXTvs*Em5ZOf7e*c<Ab#$82$
z3i@ehR4NNS_BwBC{fSD8Tf7}llm;>)v{ZLAQ!}BXGCR=Pz`%|RvzZ!*HpPEA(peH#
z&X#%kCH-2}Z8RGY_8TU?p*i<@naZl)#Q!bWugw0SH4omI7i{6Cn}xiS1Pc?A5-7Zl
z9uyH$;0Cw4c}m#`fy~{<YTsGuyL^TK>PG;8<&<=zSiAizx_g1-%<Ry~<Io3hZ}C<u
z<86CzFRoD`wMAb=P;yI41^_C&3v+)s8=%_hb`Sfl(9~W)RKeUgl0bVlkhy7@6}tIP
zcUQMgEa;8U7WRPP(j7p&QUAcsv$r+mc9KcN{-bf9-_es%P3zHi?AxG{ZQ;T_N=ZC(
zCg(z!tabt6EV-z#I73Z@IzD{mhw0Pz|F5NLSt+W_mzPIGbi*id&76Y8e}f{rryu@?
ze3(uTw$bFYrnuO!)cK(({>%J1^*MRAeH03!57*bnmrs8<e)tBFjPzy)jrIHth~$H^
zh-4oI(+981rAPZ)$!lFc=R;br>*Zy>`#7IIT9LF~o?DyC_~>Ce+5SY%hv_hkbC_mM
zStO@*u_^~to`3#B+f;_>$ebmo9It7;n$bH&M!@@Te(l4!E*AjIwL{{3aA63;<cE2^
zKIe7ioa<Cv$%kP)eE7w`qbi^O_}hoCfAjHIe=o-?$2BhJxV(P*=YNIdUmt%E&cFR%
z|9i8PHkD>o7*S433nVjRY2UKAnl1w|$AwEShfaq(Kn!85QQf71Jj_S?V^ds~%X7aP
z*weI}p9zV)Z+$$D2Ad~G<jBSAA|k<&n}*Btr#9&-lYn88oYK0m<jNmFA_$=j^PhhD
zTbrl84N2}#&}qF|lWO;CkSoa&VQ6Z<R)pCh<9dGVXB#O;&dIs$E1AVP8iPl~5J*IG
zE(AvVLoSyyB6#mw8j$ydMDyXnk|5XXOT50aXwH29;VVL1UO#ir<9uqnrmKj{ahj)T
z4#Vt*VLiW?{T~pG?ckTu7A@z44}&fG&Koey)lr<x$A?<F$>sc7myegW0v?a2wxn*_
zbXDg9ktg!KTgHCLaXvXe#OsR)V~iz4MYv?z8B@;O7p$Cf>wh}$Rn<{35{g($z_;@|
zIR{9F8ZeGSQ_R^h@p`$e@#&lIe(9Vu)%$vVwWEd!{Z%1n6J=x0Ii=KsossC%58sRE
znld6hoMz6+ww<AZ32iE5H~jA5qgX>vH3Vk~_2<iFS)=z3+|E#cn`CRufpI#Wj@AeA
zo&d;)5s|+8_-zYiTh32@JPgy3bByaUjMFe3%Y?|TNps<lfB5z{oKw!ZaUv1%dVW-4
zBXG^rQAN^vL8Oo0{dtZtr&V%RVRQAgq(&fGFE7|m+ro+{jID{4^V*u?#-#2Y3)Z4_
zu2h6--(c-1-Mx>E3+<hE-fwg?RpBI@rAVs=JG+qggFA-t;D<v_QKR*Htg_Tf?HHRs
zbMsA!ut;2%atHtj^U-jER;K5in9nNQ6I1}ej}x?n`WsBq+pl%GObGATC*UR^092Yi
zT6<?jr3mhL^N2Sk(`FF<(@gsJoDpw@KiZTCdx!9slDMEZUF%-1ev4Crk}TMa2kkIi
zYg_F|_B(vlrWNin>pKI$cIgpBI5z|gGi`xh`VLnfJNW&Vj4RD<)!hQ!#=QDg(9v;Q
zHUe31Tj(u5n+d-Au-i}Gq&@wYq@e`0vvVk5o%YK+zv2EvcUNztEcLa8?9P%~bKuqv
zyw`SHsY|L~^vK^lLFGBx1T(si;kfxA>CfHGuCT?TtAI*x$+>BI=)Q#7`v`k!xxUSV
z=w#-q@2L1UtIMu$)3W#Qjgo9n-Fx?SeaAn&Aq_Tp8dl{Q^u`P9lp)Pr4?Ct-eaf`Q
zE$Dm5!*+if#`)%*0DWVIs4?iUAs0KFNhfaVK3w!R!LncFcA*e`eomJgT9F#i`;Qu6
z5qoUuo8}2>X<9URx%QmA_KyznuvNX<V##~>gzAlVq&@6-6TN}Bs~m4Rx48Xl)B!s1
zmY%W6GjC%}p^x3X6@I>}2{kk5zxe0>#rD=ot{Eb=)xbPV$2Q<8+ne=>E8)g6*2m*r
z7!PT=7>E|ht(WJjr$-ki=e-YOS}$q2%%=}wKG^lYJb&UGO(|yP^c<Jzct78LW$$T<
z7fx|GKecgP@hwaTRkd?XT`t6jiF~N9dMkugm;up+QFF>^B_Et0tQ~KIke18U9v4>z
zB!xz;%32ZRA`Bw){nv=-Lr{ej7sH6RW=5g@mxH{uK}tTH_klS}iqq*~I^M6#C9TWp
z!*_^ye*7V)qC;`c1JXF3*30wt`O~ld!9V@w-~T5_o?LkP@pqiopTGZq*5z!TldeU{
zoUNwUVLlAw;pxZU3$q_)axPw8pmZJp0K+ha>6q3_TCd~-lH<7SfD4xU2*7b6ACSCr
zj=V2J&=PquSl|XZZ+iXp^4bqJhUw_X>H6~7@au@^!qhszJ`5aViWhrW!#MjeUS2-6
zakou?+Bb`^WUDnjvjORE4?WHY+?9-M$!+BPTDkC*PFEhJ<@K|{lpFG-o<PA5vl*z{
z+4FLK`hr6heHe+{%kz^etSQ?Pb2uFC@9*tj8RwH9=gafYsyfbh&WFp>PYr!C9`88D
z6t8{9Z#sQM#O3vob3A?gg~1k}1Ruuba+yzehvS`9X8nF6oUFB8(ncjq&dv`m1VhL!
zm*+1uoa@rRd0n-PHdPVv^Uput2v*HT;+@NxQ_iQmdm`!^X-2?WmSvo#>2R`nn0>?0
zv%e8lIIUL%80J&XiBr5T>vdTz*7O&@{1p+c*JsIji&0d#E@?i@r@MPj(P)TaoY(71
zd#^3+T_hvoFdkrwgQgy0VD;88-`SqRIe-8A-<?jU`}_M87f!1SgL6Y%&j2tU?z|s<
z|JT18hT-GKk3{5$nK^P?ogc^#CSm>lZ+<5tA3uBuA&kd+<y?mP<Sf3;W@%<cs9=Nv
z$z_Y;vC;l8#pSY|pIn&yFbK1VSVUiAnAm%VNW<Zz)ts&t9mzZ$?f}Weu|ABP<MR55
zNDtrr#vWePZ1O-vT(4(ylo?<_B**KST=?!U{_)G_KRo{7xAmcQHz%C5UJW9z0BOCD
z3(gNJT(s_`OK0LQ9**}~dILqnXp5LFl>q2N06^xXqG1^OBZ3LVu_2cMQd~e`m=1dt
zkLHw|b4Z@kx&_&HrJ=t$2z9~A`vZm@(535==sWSqjkkk4(?R3?bch_iK}PM1jN9|$
zdkyF}+0Xa|w=%pr)$fa4ZN^dTm`XcuEFviC?)0r+fCB&^H^asN03ZNKL_t*C2+<p7
zsk65BWUzP3Q)?#GyvFj+!u2jvZ^qJ^xWOdXS(x5H5*iu0R0ieTyZPwhef@kVzD8&$
zrdpt2^PqegT!+2IU3(rG>K?*yJG0$luB*qt17bJpHhv+?`}WFWyE474p&hvGKy~X2
zw-KG<J|(fl(cM-S+GdBXa)mC)UhDB&y0I2-wCgW$&+yg&T&q~Tfo|iUaM5dTqR{<K
zf9Hs;``WH75V*C4Zv52v9?-ZOMD05Q*xjr>oUh|h)X`jz;JTeeVx=)QD}61S_DPo7
z8HB`cQ)L6T`m^1;n-USavIO<rilU>a0p2tvwwu_#LrZt4Z>(X<m+B}YZ%ip<$sz?U
z(&Mb*4a`D!Mvg5dpd&&wN`nEGTga8R#@u@=X%CxJ_#)P<wI`&cZTCoZ?Ckq`JMG_>
z<NLp?%T~l5t+4R{_thsrCvo_4EAhYmul`dPhQr-QL_!xhuQ@I`t~oAYI{IOX*B6tb
zm1(UibFw;M(_U5({&2WML~B@wVHB1WuLjx;!x*MRj%!Y<^8-3>2~ExR<b0S;4=VEd
z_>)D2RnRT7<Z(VBVq7jN*@dZMhqeZn?H0zGip#kiU`;yc{4gI2L|?dBR&B6sCyo-t
z#aV^p^$bY!-AB%;X!NZ*!8)LJ&NN!J1!3K?%@4GtA=j7B`A~U3=z?9kWd0?)wP8FU
zLR>D}zldlek;C0rcVGQ7F6X#j4aI9kdGST0RQX%2Yf?^L!*uk+nAQbU{V-xR!<hJI
zIz1>03v*7AlPXJ*J{BYb6}*60rDCq|GX7jIIj$y&#_o7kLa$7MoD-3e_3henCk(_r
z=m+Y3RObRZs*v=86gTjKJxJKLUVO)!heZ-yRh_sUx2<5ZNm$NNm`@+R?MXwhXFhO_
zlUc|S5%K!+8Ohmv!h+&#7}Hda)A1e<({dHg!*n#Dc}Luks&NfSKBol%4-en?Fszqn
z5sAyWg^<D?+tErfQ1#=%M(C=toS#c>pCM|EDn1^tv~Xm<NZGuN3-zjTf2u8YHD7-L
zE3=tUjW}-)zxM$Um@~*e^A@38-W<)ljWq$r`G80{F3{0Ks)R>DVOcI|UF{lX7F7-2
zwMMQF-WJ{^re#gX<6#=dVLAZ7^V8>?qCHDPaH@J;(&2czd-#~vYg#X6yXyN8IY)AS
z7-pMTN=`YgnVB<Z=9uy~-+Y6J*UKyCd{?<~!u-PzKa4{dg0}_Qdq+emWk5Wh9{ezT
z|NGzB92yZ%$5B{v=3$!0aS|0&`03}LMPvvb06u*9sQor%52_EYuBc%;AfV|GotfEG
z5P)2;iK9t^4G`hN0M$HdGCg5I#9=<ZGu<eOI%WYFB&EyiX9S$@J|bar;8^+~r?op)
z+6_Y_9On~r;*?sBxiraJb>LJp2_U&)oX7cYy}qoMS7?nffG~{a>u-&mFpT!#kB9s5
zaF>=#PVxNoqX?I6qMJH6=Zl%7PEkOGTxi>P5u1>+G4^(tAyQKVbv2!@V`+y(&gu*k
zOI30TbgtV*$k7T~zLAZUBbL4PU23x#P<BLTE#d6_-6AAu1H{sL)lL0@Jsu2i_$<3a
znYP~j_Q{)}$!wLdh3^zKGn9#DEt}{~2fNpU6&6>E7Pq98?x6IJV0B;0nzPNUNR=e?
zCPG@7%}NoMbB>Fo$T?CNaif<B0IJgd)L&IuX0zMC*j<zydC?5kOtWmscV-}^D8fyG
zwMG2Aq33pHRRGv0zkfl)3$Q=>nbo@A2`aiw+xT#IqJ5|I?|zL!fRMr;=d8}#sNOW|
zTgZD4L#scc<-(MDu0Am2yjJ>Ry`)Oy5z$ob<ULA<Xb=&WU6G^>%4~^9tt%q<){$M6
z5rE|z&^5Ccww&(P%zSq&S1v+})!kQMb{0XB9t+qjX*Vi5px$bsL2VpRuN4t(kTawn
zozauo3vNagMVhF`5q3(0-8)XrXb;`Y^d>vKPX*G37NfmD5qsT-NYRrPPpT9a&;B87
zXSG(--*y9-nb7#Xazo*-I&-;|yXzYanAW-w+LKwdkS*J*GC-j04TyRx8h`KQxak}<
z3^#(Pkm8oISGzuab*$B5$T_#+!i{hOx44C}uA1WA`9S1r*SAH^Q*!~9H_Lf@37roX
zP+Ccos(1tHwC75oUnWGr)vcjc)oooZ?KmWSPo?b12S7^e1%SvUBea?tQ-srcX~8<?
z^eYjA&4anWz9wHpB2bc?TCO3OnK!4ZMPy)YO0A0OFbx=n@u<SW2~-uNr~?pob9F>N
zjG&rx!WMcbBErCgM5wgA4kB^6Kym&Sf^B;da*7CO%bG9)8kh>wdZ{T8y)dNEURr>k
zeM(MCm=5D~;1qMaGOgpJYT>I^n4)vSp0l&KOY(tgIEV`)nJU$mKcrzkAyT}a<9bQ!
z)t=MC-3LUvzCKD$?Q~z2J6MC5fjMb}0-RGtqPU!qobv%yE%?{i8O{eKA}Ov0hc#xh
zriACXnzs@v4!BAjjYDDDOLd0G5k^z`SxlqxS++eG)Rfs)OEK5UQxlGtXN=I*Z|<bk
zZ%~wem`cTInR!SqxMGC2rMWB?AfST}NMww1B!`y82#5$GWVJgv@0<siCFf?jC309<
z2L*7gK*9Sk)@V>|WEo*@C14FvGE1*3WI-4J!EB>#Tx2VURaZqsXVfu+`-BlnK(XYw
z0O&9s$}?Y0ZJxaGLAG#=8k<1QGbfI*7suA5YeK>>OszlR!hj|1Xh3p4jO0C$v)EN(
zZfuPz+7zg<*e>Yi;kfB&S#g8ThF*v?9x#lv;UETbMzYct15g7*$?Gt|Fa+nlEp0;>
zymL86N6w;ReP#my<;>S*Wl@(CXA>52*@v+7Z=Ro@JmJ1EfjLDxlsZQxr*mUgfOFI`
z+G-E%3y_tPpu#z=W|JypzPktS!*o0f=eS;r_P&_J)j$MhcW(Zic2?5@JgGasQ!~uP
z_0o=!Y{Fe6s4)Poin1-I#hWXrgJC}qE(RM!G`Z{>H(pr~00G4ElPxRJ@D)v(j_nd5
znl?Da^=ir3J<!UIyqwlLk0Y0pFc-!rVp^{zptYwL!IrWP76Vw)XOV21<eWfZn2tm~
z$BR9>Mi1>(rqYF4m-(y7wc~Q#4-e6%P$|Xv?gIj@*H=}M%=SA0DCgX(dZ1%jLCuow
zE$X0P(1dy?Hp4$4v9JiQ*E1r`cOP?HjNwwTKzch4MDii1^~%V#uBNa6<l^fux+zfQ
zxWrx{Zb0<PFiZXYCg;b)NmZBEr#-x?z}yOwW?$5#b+O!uRYY6#VE1B}xqFx@$WbIa
z&pEQHbDmrg&ATvI-XQ=e0|JKmh=_4{P0J;(S8`rK=hH`WE-vSr=e2Zbk&GB8IhR0r
z01yG9b-6h22}x1b>kE-b=g9?f9>}Q*n4=#608JiJvd7}$$H|A;G!AyeDZgz=PIqlL
z=F;mgt5{oz+x1{wiVUX)#v?+J{!2kil>3Fmy7Z>+w^OJv9S|wSMMX48`((&^b7)l+
z=R-LPG$nUeC0h^N`9R(~=U+elU~~K8{IxD3Ze@yd!H+Y?6*3fFt@)^#w`kYuM<VB|
z0t=uh&XRC8ae*0}eHb{!vcVXM*Evpt0B#s<HX)o-T&$zTX_d%LVUNyn@n~-YD0|hz
zIAbKqxgV8?h;_*jDRiPF7e*2`t^|^EVX$*&DWP(*cnW*RH?xXpW)7l#h|yk8iz<TP
zt^Z8q>_=Z-KB;OL=T_Y^Crj?Mx%l9G4S7e4xEY235Y{CZU508%i*p13Dd+353bS+6
zX>rSwXMgp}^Yc7S$HUk^OF6C9wRH}qxIVU8r}p!)vs1o1byC|kRXHbiVIbEw!Vlv#
zxiD~wX<Y!+htX_T2KgwzMqDa~b~mEswAxzNFn&lB&zD9yV2(&Ggwe>fy^e`oKq4Tj
z9dfy`e5k4@*M(7pa~P)Hbf_wlvQ<=KO&0<zIpnSzknP5CDw1=A^=1z%d<!Mu6rtK8
zg+n#eqdBD8h{QPuNStGjfVXoYm4FMx0w{oSI{IO{zA*VPOh?eIfnflR`g(42F5gq+
zyDE53>D=vhH+jUpR@&q?W$V(`bL;g2b{e&o9XY_gdKjB)zCT4a>5cSls{$h0GU~eP
zf2)r!5jG_bSNE~z{Q!JNOvf!o5j%af)ev~A+%0Ao1Go0``8Tc6owT}iBDjY%?l)Nh
za(2I=(hzJB!NN7!Qk&};4Y#;BB8Oo&dsldK?~MIe>hDgLg*R3NE8NRKV$-!K?7CE&
z;$VBawDTQfGhoOjb}<&YQj=Hoe)E1pzB6hx@eX#s1NNVc@5$Y}7OP_8=I(xwA>TI3
zZTFlM8f4M(LF-0tJ1f@KS!ZC`I*s~9*R-{>c509|nX&J&@cOMNDU+cs!l{0<R^v~3
z9&{INUT#E*KEIVaw4l5lIzvT`^<@(WL?im*-cMyc1A9bUcYX_$L;_G0x8?6`LQQEA
z2j!XX@?i>0r1W?ccOjH}=e6z<E{Vu$EZn;!3~_0s+d`Lh;M7yQCVQ=$_n}&Kx0{A7
zGNP*ep;#YX-=!>Ab~2xPZP803By>{5o}y`=RUdeRfsy(GOrX*`G3BJq#t>1=Yu`Z?
zy2fSAf7tRFq}}hD<hM(F+y@p`VkK-{U)-IyO47<cWO0{y(DS7gZncCrJd>{Bzw?;f
zq~GqF|8>PtDShmcd<Pw+xtC;aKiTKy+(dn19E2k3b#@ci^D`j0FnS+!6M&QnVr}x0
z?NTNRx7)m2Uz{K2(?>+)xR7&hn21?a%)x#7>brK3cRmm~H%tH!mkT0VFfjnCWWl_i
zpNkLO2T)PbHI^tf^kJ9|IVGeBpdjqW2>{cQjFsj5aJc_yA>h{ait9D4SLH06U3U;R
z^FUq~Ky+bJWyvXwQy33%Ij8mF!vsinF3ans&5XwRgbJ6JN9X)_xXbI3(`tW07mihK
z&3Zk9s&%1NSgz-GTaNc%xnaCKr;4Z2xLi&jzWwmsUjX2GeLb8$_+k9;?Vl65v|i(K
zUM?@25wLn)B`4<9PqPox>BDyb`25q~<g}!eRcUD1p!Ec*oDH*x&<-jx9Uqu;tXDoR
zlH;0^WfzRjg|e%N0w|=_;u38P&YV+Xq-?EGP$l8on$WU{=d^p<IDwW`z+y(4-@Fu*
zs)mfRexu|h22|x-gQ`h50V7-5`z?@KjVUTj2y0urE%Yj0Uxw*q{8+<Fa=me8x$WP{
z6xU%o-hKRKPKyCxtF1`Mc|cq*FJS%|q{Hb!m_@SGruWUfSS1UTzFV$sXYU6;jFv}e
zt=PDnMc5BB0QlhmDwpR^E{s+wI_LUtmYhI&JlqNAxSSCYWVGX*G5e?E{V*M0AAeM3
zD8Wif&Y8P>sjeh)ewYsH<@K_DGUk>KV;JXXvVK2QG%f<b@$SQiZw@J5IYl)sTTY<r
z#@RVH)`*)N*JR61!DQj{^Rud+PU5{Y*NWY{;cyqP=jHqqhS^YmT4(C$ysFN}2itzN
zOc`^Ii`CP^I316NPoF+DS%k5!ksKj>`_0z|P6{$wb}5mwf06uvWm;rKzyFKB_YYIN
zu9sKaK#T`6Ofw?d9OV8q)zcEqcOSK*_84FO<HrxG%5lA>=$zLgp|GKqvxc?^8=tS_
zjQ}9v<@u*D98Mp9VaIV*Zi_H;7MA&VkBDxVh{8|5|5wf%$r3BSv=B>53h7n@V7y+`
zyh*C-<<*7Y!^Almj7=rySmFlFe$Wu9)+`iG(m7#GMCP2Tb(oRJmx@-C2pedPZBkge
zM~I;6hY1v{aau~hFuE}L;gDlw?i(1|LN|8}NISUZEGjuA1zj%B<gP>{!t3Q(L35S%
zh_Du82DlK4cpkFv<okGQTG)q1-(>ZvQTJ|j3T3dlQ)V~)w7$uQdK32k#y+pzQN550
zI^i*POg6pEDZJ6o-|BJS2=4Vg?eAVAealM2ZkS%xecFYd-6W!I?Kl7c0^m1t@HYzh
z(jMmjkFj^zkt|ux^~}uO*Ciq{v#NV{@7v)4MF=<o^j4Zs1K~i>6KE_z98iGfnhGLB
zXsXB1L?aH4fCG|y_oXT`Bi35(W~PDpZLNr`%^ncln^{>A>*DTa_W$26964>w5t*7>
zyNm%45An~PRb$Uq+nW;_$_{tHgi>jDDw5Jg#GPZjHQp;F=@?hvS*LqV3f>Ly5qeuc
z>OM&k4*IN$+wX?+_a<)WFMIobRMHA+|Epg7s_7s?25l{kgPj2Mfy!p@Eb5XnbES$8
zjOD7vlf#2u;-lZ$@$0J1xEGxj<vjNCe{ARdk7F<%*^gROUah_K2+Qip1YNR0t(Ch_
z@|OAzyD0aa@x0~YVo%@NNot$-NnsbIx1%5QL4(~NtMf4E9OQjgh<4`gW9Ygb6IQW(
zBJ4>H<-w~xo`!0}hnKt*g_12@z3(XF7kB2)_CkvSw&2fRuU4gVdBv(K!mO((KuU%7
zFE$r<yGQTQliLL=_G+cJj$zwDFqg-bmsV=&GE>ApU!>DC{RNr|HtUeRp}Ma!5m7&I
zPITIH{D;5$Z|zVF0BOCE_v8l<DcN|~8gxc)Q#I83{QO<oZrjzkO=??x(~AQbVmqI&
zZ?D62p3cv4xyJQIF62a{^5$64z#L6n>-^BBDVDCVyaT}b(+@t3=3ZZ~uiBX?#`$SH
zU4&UwxS!IY>+%TE0=;|~U6||?W?#)taOSlbPfws4*Z0g{wsChUmV2_7ouE~9dHuz%
z1Cl==eDaDw4n#PvT4Z3%X}-M7mrrb-jpb&tAXT-Pa!wnOyL|p(e*XUX`#+BJWjsA^
z%Nxh-pa1FqNpXGu@~5;d=TASTwBEk{f{3T*@0p{?ltkE^>~BB+izSDY4TI2m>naH+
zi5t2=&KohH1+bx^@gXA-8Xk#&2t*EW&OXNT{q?INvgkaY=J^ELez^Eg+9fj5Rh!Y0
zM@Ld73bol{GX|p{RDrkIX|V#j0F7xtdyezAuIriw2$$zigt)Hn!s+t-y#iQ8nAUeY
zN87WP;=(cJJSK8zqtF~B0RS3?DU2s8>%%zbv#M%bZz60{t6X6?Z@<&J5u747`452V
zFwGpd>(`&}39jfok}L3QM8w<MuQpIr)wH~$BSh!I;KP)*h11&RAF5%#sEQQdx({O*
zCtL30x}>-sVT2iymjj{1>H`t0w)>A~RbYP~E6K$qqtoRRBCgk0;b>K?{QyTp_9yI+
z&32(o4TR3;HnQ;T>n}i{3O<ZB!W5C|{EUc|w%CTvX(Q*6yrhlO){G^H<LQa~@XLSx
zC-OcFvn|uiF>PzMBCt)SvpfP3-@bmaIpz*d1)vJ!d=A6u{p(Ml62_Uxt;<{IOBNr-
zFr3!qx-K{Gi85h`&QG7o1#?er*H-`t^TkXr)kIHSm>(c+*RM$4!dU7nCL&foB9SSr
zd>D*jQsp6iSJNIywDAg{O0w?VFkim^{oeq<?d=zG9?^5!EcXo^S>wuj-OKwcsHW`(
zXp`wJ#hg$ZhS`N7ZMU42AwoVBo`xFT+xgI<=T(tV6_)oe%(0v~J!XUmwv%2>0JjM@
zxo$?7bw<L;g&}K>RIabTfa-X9s-bVr2Mc%1#V8^oZtIP=)tH5yp<espNjpvLe7snl
z;19f}odI;O`R;4A?sVCo1Q9sfkc$!jF)~X(wt8n<Y&$(2L!4nRss?-@_c~~cTOpz!
zpG4X*Sc>W$3;n29%7N~$T_2`=2xi|8wW`O1oOPkIZIqlR;d)ZR?!sa#SGA~=2?RRB
zgErxI361Uq$NI?C&>(q=iv85E%Z~5)X1PONMrC({(mGzOXB6l?^8L~Zy>p{d*}5TX
zeFzVUKQ*$TWOAY28*BQqtigYAM+WN#&!$hyUmHyaB-kUM4r<8{jm90MtTTXDgI)KU
z^w8?=8fV~l&Asdj-paMG;={mGJv!q!9aq@lF|ePv;i0QhngI9m-Ohcpw-06Vm4)x&
zE+)JeC3Zz@xwCLcQ9ts!YG`|Fmzl3Xto~3DMHCSf5fK#KRYf0^2zLbp-uJWm1*0(o
zYF%}}W-E05`Q3bMKkvdjI!28|z&#Qj+j9Ex;s{+1J=WK1_ocK>un~8N^Y%<OyyD*3
zqi`s@@8}(M`YHWL7!)7FH|j&&zkk>jnsDa}LOg;7^MjA&B`pO^`wfV96cqf&zyI${
zS*EISc^}5pFrPIa)mKT$bU4-mo}WGmr}g%3SZzr$#U+fVFrCtRGjv&wb`u`vClxm6
z^DtlXP)E3g<Lq98m*4zBgyXi_?u{jPLOA(haz5C{D0*j9RgPOX=+CdxFkSpOEw8_t
zcK--HP<3JO!)$6jJBwMipPglz#ub#4LAf0H!TEvXT7^%U<7X1n`GQ0~Oros9wig-w
zC~b=!!?6avI%n$H;*Mxsmi6{lN6MKhYwiN6A+%~dZs)@C{w0^}g*a?#X++HQxVUlJ
zvT#Gh9J|$^W&-8u@{;13)+J1*VLGkX*SK6M3^neA{GcilH)B0lPn^vgnA80934r4I
zF3diR_M6Mu#KgnRjA>{E`-0Qu6B1bvd|Yp$YU9${zQ32um0&g)#(6wl*4z8GT(QH}
z*cY_>Vq)6o-~2IK>4jBN+?KSh84#E@JGxd)x${9%Oxt1(2XjOm7DN%=mUjRg#@Xt;
z6qmTI&gbl#`bMtHHMfNbr}?RG{Q5AG51i9;k_exkzN;p`xZaE&C&Fej0Z>28rX3d*
z5FzKxE`9xy=XRQN(?C^yu6Urx%~gaE(2sL*pb(Ku+gf9oN_gS5$!?r;F1TQi{bq06
z`Q>{=T$gKRBiQXm%u$*-*wTq4<KWvs5s9|jTb;$G^;!@ULoTDy80)=9*M-rzcfaPm
zDi@p&_6}OF$RyL#`9+z{LO|r1Ii(cFaTo>*I`wvooi_?#kuqt#y_fCW)<2I#Vzabt
zPL~|uei#-(hMQaO#LUns=F}}DIz4?Sk~k%E$Jh3Kr@A67umxeZ6q>r_0caRcb&l}<
z<tG=0>HJcZ=MITDZYi#Q7|9Lx#`!QJxwl{bg`5xLbT?j6Xq}kclDvNT$q(cC<p)IA
zTFw+_r<^1sGuX$lHQ(gi^V6pkH$y5~yb+fCqjIW-lFlvHFF&1LzJLDicPZ86JLI^i
z%6feh=4_uRIn0Ozgr;>jf?EAkRZoOwv+>?uZF40loApaFx1_;T0aUm3M$Q?)gq$k@
z?>odA9*;gm*u^CE9d^roE<krFL7-+*Y3|Oxp0GGTBC;I7>e<}iCP8wTSuoP4hm<~f
zvAS2XRHyuDcu%9jB5Gfj>0S9qguEwK10HPQB^I%UOB3wFo(~gKavr2VmbMh3c2=jn
z=H^a_wwNTX5P-c!1i%>n*@CGeei+rWc}tuh0C(9~Du)oFPW#tRlv+LV*x0RvU3Jmx
z7E7&3Wf+5{rqUvw&YD2%EHV8YyFJJCid%}Eb82Qj5kygd<6nJW)SD90`TImrZ1bd&
zW90|nq{v99g3O61L2K~tPokY-@O~V*uNkygf|h6=Y!-40nzsi~s44NZM?)38t8@Wa
zR=$;yr|zeo+NN$~$<IC6AnW1^wCn(iYg{zd$1_x-ZuX`o(L4;TZAM^4@Po5_BU+GV
zSY25h?i2&CtGfFcp*F$uu0+6Y>SdB(5fOV8%><G+7*1Y7rzNjF#lDfN2RQ;}1zc)~
zGNO7Iy{j3UwiAzbLo|aEBHNLp_NcmbPoR<Oxh-;i_4eo$e%zMYUnqDm$-4(YHUW91
z0Cs3VQzY=NMArs1gHBR`RW#6UQyB*4MpSkIx~}P^Oe&Dqd_p57*kcC|%f3A+?g&Q&
zEe!Fh5|<u9UxG;UtNRej?Q=SWYS!eaCOea6oX<9$o-I>Yg|~GnitP-op)e>Q#|;$7
z`TRuMTIjuM?%f$9pp09nJ>}&!-qxELl<YX~eDK4_DN1r??6qNDW-CyanNlYAilRiK
zoYut_moT1)oEcZMKbM>-*$mcf?`QUJnN^&VnX(PQp=CN%W09@qXvcp<t6w=KazxHa
zO2Sc!1JY!2^|eX3)+N+%U(N?3oE>-Unr2c~F<ZMW7pcguj%(2{Uu;nq!b6YRii7F$
zsg|wgj7B11-qxF_VdQF-6X*6{UOslTn*4c+>kLUn5>}sIYo=u?P)XHMOQPXz6+)4e
zXN1t__T@uYeHVIIogMlRz&Y>3Sas6%-LMzfj8M1NpNPB*As0-DE(}(tYa^d23uhOd
z3x0rn91autkYio9MMZ373}MVCYXcxS55r_sYctMU)00_=C=3JGqYGG_(abSFRFJ#J
z+wI-{J+DPc)%<P%B1xI8KIXJ3iwWO34GLi1K4ErY$XA2ed7rUxfJUVNV6~E$qrJ$6
zM9`cg4<d{z)(pt^m{YyW=)78$kdh)w+L%)qPkAXQFG4-~7=_>dxQHOInM#ZM-c?*&
zcEKVPqc`Wn95QpND^i}*JLfcDQPYHBc3#HQS%k?45aARtb4<K773}3wP>2u4DK=pu
z=a8H#Ys%9BJ54gDJh>{itKvT<y8|L@SIU?x)lk97uq4U0-W1mqw_%(S$%SAE@dmRo
zBt=#s5fM@!y6eI~<ScmIJOG@cAS0pV@OoC=jO<@aYU7oco{IG(s7lbSqO!VB#3*_Z
zy99+cEq2b@0M;Dx<D?=<S46Z2xW+S>a9hja-j>JaxByg<6yvsD<9fBsHQ}vFL(r}<
zV2N(cgFzK>-dQK0HsSKHTzk)YYkr`GdqWN$H^r$HruoS<KC|=96t1-*G?h{Yg#?SU
z^23a_5yox&?itBlzy2heiRlF>l+b%WSY-eJ03ZNKL_t*NhU!Tt7dWjYiin&Ks+#*D
z+hVF{LIP?hw5CVzezR~2VI0OekxRJQ7q&d>LfguwX)}ftZ6n#T8+kFnisiG%xFG-w
z*EnMfoygXH09!b0CTwwo8aEV?e6&|dk#)<C)aD_on*YuEs9~JKc#hjr9!hmC03xT=
zo|}q8b753Tk|H_h!@y}1PWNs@Ye3bq43W%3CBpb97#fkr(~~6(^wn5amMg2uFwT+#
zx`g9mk6lSEs2Ucn9vHy=IXau+r0IsxIIYg0f9;10H$a6mxy7FPadytXfB6X!p?DaG
z9GaHLQBxc4KY#gGw!fX6_roZhpkuf|!7UoG;rjLGaXOQKE`3gNp5k)tnb(k)JcmSt
zNZzMyNpW@OX`G+7<xPb-uA+iKh}O<+S-94{F$YoMc`*Pm3zD;C&aj1A|GE?fcPQFz
zdAD8}BH9KcW?^z(m^p6N_2sy!IRQ*Mgy_R$@z>4=azWC@7_HA~@|Lt-wX~|74=PE8
z*|xyEf>7o<0n|tkRgG~o<OLFuI$<{ZJR+JLe>y#J1E^x{cH{>)ZU)yaEefm%+%hJ}
zKdBvTLCVu5f>ItQ6+sn3B68pX%~h=$h8Y0H`642Im{s`p`m6Kp1V-eXAMAG9G5QdC
zs>&Q!fYFh&&smZML`AaIiku=jqDD4y-k1-)L!1g*wbTqrg^@fuFY7hMWf)ID<cE>S
z3rFOXwnY_P$?r690Wb(>A(9_va^CxZ<ZS5^j{9hl1f0@(Q}bepjMGI$48iI{sNJgi
zR@QrJ6fGgn8=)`(VBrs-^R6HyZM8hVT$qz(`<eEN$l0K(sbK0^KBvY@@w5o1ZM(fK
z?_W$-)}s^q6~oofDI%0I+QOa<W>ua}PnypVX0-_9M@!5=M0=6#yA#p2E=0Bsi7E)k
zw5>$0pg&M-x5^t~=g7?`_ZAd@fF#27FuJd6f$9z+*g-1_&aRuo-}kz9wZG=%Ig<rS
z)e+SBX{QDjt1_%^$vWWLAH!;^Y$NT~;ZfIY-W6ggnoltz3QFYbe6=$B`&LO?pi2s2
z*&%S>fxyfRQw7l-bV|Xh&zwup1QOap=R0>t#s{0>$xKoE(RCl=zLRfcsRD|yR8OgP
zAFzO@Tb9IL`m~prXt@^x@@Vee(W22oQK_^MBi@Mt4jTNOs-v{~ii`{^k)ZGD6#7~l
z##ptX2Z3uvI_wd(U08wUBR|I?R%&O@2dSLpc_$>rT*-PLTv4<tVrQGae^ape5fJa}
z_T|ySJMS=n+U+j;hjm&@q?%;IbBmjhG9m;izqUWu_3ro*F<8V_*uQ$ckm+&5u0s$M
z3DVsa+szmDI<-2C&|*l}F7^alqqwjs%GO?DN9%pin)=Z77^)!wO?7+_#pG_P{l6ZX
zL~`s3KCsl(b*9AEib!T4WOFy)M@hEVtGt%^7K#*r&E8s5K0p=AU``FNrHFbl4?YTW
z?^qMo)o+MV>mmxcVoQ<SB<t9@j~lQb$552n9`yn+tX;~-eje-^TG@eP@w`@r7s3wL
z6rH--btwEAcT%NoggcCQ`OE&{@BS9a*?87DFPuuKUVb^#b~E|%(Mpl;RI<NpoG&?Z
zuD7pNj>AFGt0K%MgEoQno=@QlJ}z4gvi+bpr<dNv<<pNy=$v1#Z|n7y{D9;Dq(%eT
zFt&b}aXwGy7yEXcl1SQ?8>lD<Dx?(c(-FCsAOBs7Yg`x217v1S^V4Um#t`uR%b(kf
zAs>R&lny!GtkmNmVm8|pR~6aT8#$_6BHMZ`quGx$Isg9apNPDP!c$zG^XR;A;<P<~
z|A+I-4}bdq{$JrV03bo%zMP(%^QObjhc)If&cl3B+weGvo#R@BkRUqeg91og%~R}r
zARi0@K!gBjwQR2+ODQ_TeWh3%DVbDBy8%h9S4<Q$Up`;oe%`KcwUV={qOW32Tu>O|
zIf`0Ux8;pfnodvI(*ls<W=B!UghsZ010bHBK06=Q+k4%Dhv~#|i`#nOpY#t>7DRMw
zu@wX&Nm9Ce{?ST#0I(iAWZWX|i5nu!Pv8I6<mnlzS1d7{l35YRd34?u=k4~UsunqE
zvZiwKjff6*e$)20)d`=0<JaXqgvpOq$zfWT6qotwGa@lZ5HY)V_B%a&axS=G?1oQP
zJ($#@j~bS^E|t0Jd|2MUY|FK5v8*D)=}Cmsx*$TBF65BNOLYR2RoG_R^W~G?ZSWRE
zW0IDd^#}lNn4ELtd@;6$U52<Vysbv$9Ht8(ru8P0PS4*9vzgyrn8=Z9jjs$)tVjK{
zEq%VGAEq#$<9bV_9hC_f996`RbN<Z=wQkFoj+xDnfEcC|IlsLAdgx(@@V2howul0=
ze){y1LFB5#=}AR8j+!kXo}5c@mAK`inFs*p%jddi$8{;8yGb~OVRplC{rZcFn7gT<
z0}%RTT{viuOYM<ow>w^RjBB!cp<t1X$}B1&4E6r`VX}UVi46_Rv#mGC&oj1JsmSf^
zmvO#KmrwmdWKUhi99BbpMe|s9-J}M+bUBs4A4_MnDQxf9_8}m;%jX|`n124}e?mZ8
z7_HgKxqq9#@pgN!%^}~QHIFvrR=IpUtKCILJ&x_h`^Y?m$GHqmMV$G|^(J*RuO5n4
z?Q1n<{NUDj^y}?~ZuJtN9U*%cZKn^G2S!!QhpDcBuIhxW6~+bwJ2>+ddbUy<NB1IN
zsd9sRmwg}J+#J?LE{wS6Q0=N8vhy|6tiOXpy(i|0)N@md3_n`hAD0BsrQSU>o!q-q
zFuRelSuj4-2oS=~b#W()(kju$j{>U?NgKF}v#g0)MRu$E+{4bso9ikp0&#?voNySd
zHqJsf`OmQ}{SWLp44R=?d+3CAK?=3-ffh4@TJCjYHS}Ncz^<wi4Xk+`dQjkZQY-Cj
zby)g1-S6)*Zt%{WaO@oH?KcOgUy;+-T!|fn19zTlJ$Q4v=d<=e_9CJ~J4#z0#3J;L
zlDd7ZQq&jvm+anqZ4N&0Wi>!#2kpc5Y*M539jRm5TTJRx`t6X*DkkrZ=dBX}caDE-
zdeD2VRpTI3J4gNZJUekYK)V&_ANbZDTGaYap=~{^&Jw*dy6EnYV`aVd&(3b~`9J>W
zzpWSHShsQF6wjZ3K&0jMS5BKBPpTQC)iS=FCm%FL=IDnB0PPs~^!@K8MT;{`(M+1Y
z{br6&pMQ&l%k^D^n*~1C6Rov4o}SFPT)#%HSrI{Gy}eH7=hM^YxGr&9`t8-me)ehG
z6_Lbg8|SC#{ItA%S#R$-yI>DOv(tzDW<-bN<N6+p;(R(k5jp24RpGSlE@&REdnA8*
z`&mVezh#w*^|FWgY?<sxft)M5yJdQ8!s)v|{Ffq0ISTXZFaK)ynp{BgMftL2M}aC4
zk_*%2lZ{$cxCVdM4tsgAfw!9<=BMv}2Y~DC)%eZzrc`6EX*7QG@BV`bb6Q0t;|q$R
zm3*j7#R}cdP(;<ZyiKR)`T6s<T({+Fy&4;IvrT8qWEViwwpxK-H(OPC`u_JwPU5Ed
zAiV2CaFJH;Ul_HMeto6GbTLtb74-MjRs9X7GcxFY7Wg<v7NiGoe*VsdVOtjw-mY&&
zpO*b0#(3nIKL75o$$688lN&j$@4x=5s#aK_aFi6u57``27qyPZn_WXzF{_?lelwn4
zzWnJw3CFmtmg`w9A68rElDE_iVVn`Lq+tLvzrDQ^(QkhD2i~?6Z%B?x_skxZ>HJL2
z$89w!86r-X&;9FQ`Z6Dex^Tw)S|K8aaS~4DMU!E^4CCqj^%ui)=k25jztfh>8XrbC
zjB3Am7;W896=$lSxFNac?|--6-fnNdk_+U6Y%B9-GmBw5lXG!htgr<{=SP*qDej+*
z!{A-a6&|Lu*+}AgOJ&`dp9})<#&P@Z_kSJZdj0Y<Ak0tSrS%rqs|Di`d7Im1wF^<&
zmJ$t*!+bHuVQ%W0P>cMYCXp2Yhq}#b&2hfe70HUrb$PdunDgF<B5}J-r{^%8b86rt
zxj=5T?6XnrGXvr{Uqm=<i->HuH<v|2V*M}$m@l6Ial5@4hf+ms*)eR$fp%t63FDk)
znna4Kx@|Wbz7sjy4u#ndWA1*DOL4QLaVX|@>+z)Z=Elhtv5Zyr_lH_jFqtC8l6;V8
zoS&T!?_d7ZTVU_%V~ER}_A^4*yEPvjoI7IEAy-ZWsH?#Aa01Lz7kro{pOIbP)Cc#2
z!^Udr4gJ^`Z#%Ni!;F-wr><vY?0x^z0j#n2612X2`R&C>DtGm7hao_H<dg3T+<P3{
z0gBxl#_#GI+>yzk|7<nm8yelNQ>f#yp|5>Ws=I2tc-VDU{u+L~r$ZeMs#;ATj}CgO
z$6kXT4{DX2bztn`u^X|=qwC>kjqCP^1_poeA8hDgJsPDCc))B&K_U?Cl<;@8GM1h1
zVaX0%gnfk)=sm2vIi8QtRnMi{10?eJ<bgE=cS$mc$Jy6Dc@%c`jQ(e8s7%YXs|kzc
zcH<o(Tboe7!tTk^*t-h1ZzXgyGu+$6TV?z)Ne=g4`v?KBj}6+}l<PBNGqr4ixN8yU
zF%uN5h3{y`HHUj9AL8Rt+y2|%KTO{SH#{2JA^at7nI1pJU1MY4-l`P!zN=HI+t97I
zM|T$PVhwkK^R~D(Q1^q6t#!uVwu6Q<{R<bS3$*{g{@4G(BvOFj{HV&3vZUCiWjUO0
zxiY8A=O2aBwp>+(<2KHh>HK0e>i&aT+_@i5HJXysYV@OWz}z@RYdwwg6M0_{Wo3@)
z92#m!)jS3!F*ikAKEV}P<2aqi%d;|zYP`M2?bb6$OPp1x!;&15=bVjyO<y1!h56-&
zKb8POS>L}xR=8QBw<-W{YqrNKJbm}uetk-Di|fsn92Hh(%u$O;MX5VLwLI7?tz_Y3
z&&71Hv&_%!U3E6Kh71++9?@}JtwsbyF-NL>FXwX#IXWT|Lus2(I|M{xW^yhJld5jF
zH=9fpsaNp;WQh}S+MEyb(`WnJ)3$84SNkJYBGji%RnMP(5J_=eY#njVlM6ZCvg?6Z
zan|=9$a$#k`!X@jaSO~Ue0up!5kzQQul8^X*Q?Q+E+8&f7lzZ*XH~s^{Tc5dx5al4
z$GKs_YL^pq6MD=~pPdg#K{(#tel4hR6W@Czr<_DmQKctk`TV>8LL^DrRApNik;L29
zw_)w3R5=Eb^TVVn%iEV>J{wEgWc{G9ynj&<gMee}!Dhc^2^KGIlav5tTW;n~QB`Ik
zr1Q&Xjxoj6htY*0?>hMrHT7()=PvT$&dyV0NG@2R(|4$ZQ;Mr|fy&@#oG(a-=n-*w
z|Dw4DszlGMbhT@e;#PO@ZF#TVcqBrg%mxz4>VeK+=f}BmDvI4mI0;9afA3)$qb&k`
zn=&Vx`%vrqVVaQ~$4!K{+Z7OenCu|vhtUrs$7t8KZl<@_pKbL;=PsXqNO9w|ag0WN
z1Ek&`Rb~CPZR3Z@2pDBkq<SDKK6lIE${)kpwsxkmn%)f)5n0#Aj8BHf=92B#-^y)W
zgwuR}(H2RPC*!KwmM+Zm`MG2PWnHizCICojGuT4)&Swd$YTRyx0#R>~w3&)YRfY3(
z(8$+D?Z_(VG3ODILvo<3B1T!k90>79oKz?T#;&Uyui2KMM7*gACniTk&ZL+oxV4LB
zmLqK^M^oBs7rmu=jA+R-s5}vEva7uoZkH~t_o710<PN->;vA0(HHt;Mpy{?2?C?BY
z*{b)={T^LbbGoI?W{8{tnF<R^RTapXwg{cjR1ZM1KEXuuV(N0LY8@Tv&Kr85nX3W<
zArbkC^9Mu+zMDyCw%B2js%D{YW=a)KF1AzizGm%+pdum;1;E`6bn`K;Mm;peSAOnM
z6+pxsoh7H#)xXGQTD?tY_ciZo5#4#TQA-r9fi8;_(B^2Jp0-sIt#Q!os(Tdbo$nq#
zQo8nDk$qejm4V#Dvo_k6Ux+X{O)yXB4(~v_DXpL}S+9zqrG_CPdb6~3C*vw0Yn%k!
ziH8v|fk2MS=_~bW;@*b@nf<?n>;OE9hTn}6sh@{8z-%YTQdLDlqlsGTuemF`4i1(D
zx*zkP%{#P=>Xn&DEjl!_zB-F4h%}KfDsa7``SaXWUi(R8FP!KW93<zQPutpmBdFjB
z@=B~q`*UqKq$MIE>9(I^Q$!D9Y%Fs9uCP9U<*>*mq(Zl;ZwWL)0oHgjX+4acDjQT;
zaz2Lc^OMVcEF$ECsuhW9uoPzSVHX{xmQRQK#fI){SUfZ^I>w$B?RvqsWYCX8EYs-w
zx=>rpUyp6v2|Do6cF?v7Z<gUI@gnEP;VHY;h!9=cZYl~y1U_zSb}1krqNt>}bSE_w
zN&PUheM;M1B$i=h2;&sjn*~TpUN{W+3&IS=!K%WLKsbfzRE_y2(R7%-+oBTJTekT(
z<2>%)_RJqc08xQP0#TPK!+>JiC$W@vsSq4iffR<>g;2^GR+VkN^{ZQH`e*kH6p>gN
zq;367+_oYgMn6nxz187diW`eq^x)z2lTjlo%H@7>)C@PzZ<JLPnGQv?2}|0-I0KRo
z10rq9dwDI*!-NL0Gul}-y_lzKzPuok8Hbspm917W`!LcpZ_CXh)<AVzuPUtBWo+kn
zv<){56M1h}BXTN-R;XPELpK<#APf@?=IYV3E-Y+kTf3@ZoSQ-<C)*WclXCztUtRzp
zF7M@aBGW@wAG06Edd}UJYuD+m#ZCUZRCPQ*S(PlDhS|g2_8`n4>|F3Z*vQr)Df#vG
zmX*V0l-n6e!M+Hz7_3z-vq{wuW$X1VgAs&P#XNHxTx+%Je5m=F*%(@FP^t>xT(H3m
zB3b=yHH6{8$__*o42D3QTE4k??M?VsmsE5P0huExxDcQa^^mAI#u!pAE^e=YgnpQj
zTwIqfbjkH4T@L>uZ|{{_+H>jm<osUOU|N9ChDIVpq@Wx(%>b|*WoNXF8f;_>w2=iZ
zcqqliIz4p-whN00X<M11Ej8p^LtB8EFcS+)rX1uiGM%5zObh_)^);(!Rgs(pJUQ=+
zs}hWOSNju|Q%2;3oMFH$c{r<xQ>-U9-d3Xo*aK;6h{fj`^{^gBbLdhb=44BLsqLH#
z2o#2~L@U?r-x0G2t2o5kPKYYv!yuAHn|9?*Iu4~L#Br^SiUOa@!C2%59|n8)(RoMS
zn{?R}q-pJ#W)57jPDxgeTiYOqf@NL@SoofaOU)Z2lHz6;Emw{yu60l0xH88SH#?SD
zapL_@G9ShF0co6~4};~i1As9$Uw^uq85tezk$|KHr`bl+(xZ3!Z9l87?V$|QJWOZP
zO>l|;o1MsPIZn_aJw;eVRp#?E5-rzv<#d>Ys}?;4fOVYmMsoL0CIseO**u0JTU+z*
zxoKz0E?s_BVVq7rjMhLi7es>q?5FW&psuT}Ewh}qs&UYQZlQ4=#!0L%glMWFNRga_
zhm0|#^6{VwPv*-f`yUZ;7$+&#V6quLvn@u&WO}PDcXEbr-<<Qqd=cJ+nd}8)vDaJd
z`6_gkauQcRpNILJw$;uIpc<EJ&jL{3d_uRByK!dbjKGkbAczGxXB^tR_sr*UKG!G%
zNYObb01OE+$ET?ZkSk@a2uIb7ESb*F9JlN1FNJuB-LybKGz=q>vo_uG{uMEwVC*ob
zjferN5~dRoE!Q_rX_!tmKY8~}g)O45p2h%RyS?>4RJ`G=oYyHo&WL1A_Ovb{qL!QC
zyfClbA6Jp-hfn5+-~?ddi>1@9BEs=7=r!aGWz0&L&M&I^{^id|WU$3McA9H=w!FDU
z0+&reY@%5v@PH^Ws<0czBFj?iJJpRsI7zk#;CM>pd|Gc{>9>fE+-?-diJ9$ulcLxt
z1XLN4QB0j_@$&Hw>tV=pOx2vyv9z6Q1H*Yqk(o2Pg&YEMyrJ_xoD?)}iyabj7f-UB
zN&(WgLRTH4DyIyDG7mr|VK$ec&X*VFv|is-WPN`v3^r%79U>RP0Ej6@08KVXDzu6c
zxb4V!7Y64%$2Id=h<IBdGhZ~tEzsn`V5cjSjrr4rgxhizPPS(hlZ$~#U7K@pTLuZq
z52G+wO9MGV@=A=HR0M@g(adpUPR<2I22;c^3q;$+ozJ-_Wg~DUq0i!CG^IF9j(ku~
z%3=`^eweUyeb(DsvHhWQjmc02KIUC9(P`(@qA;G)ws6|aASle5(s&BhM#;D6oF^O<
zG{%Kf+?H$KQ3x+Tl;bJ-#)AN`xDYO%067Vewn!^=F4W$jaVD#~pm-IjqjYL>MK|6(
z0uZQnzHiV&yW&Bs3Pl9V?46u%?)77Qc^1pogaiZXSTCvSclSC^z^?6pSR?56KtKD;
z1-IR$EmNgKJv5foW?JKDt0Iv3!tLPMnF;hT{NK&E$yrCcZ<uHSeB^MV(io6TLCh^m
z6_RQPY110b{&cqU*RIE9F4|lTpaTNn&ham~tJ5%{y=h(BAiLJkot1bWELSmIS@FM9
zrc{=0LDx3ROTX3C(~s_Hh=<0EsFE2Fdyd4;nn7so0s$2+JxFNRwsysf*vd9!?Ili+
zT8q05orra7@>79$r-|>}KAeDDEde{ZY1i$++8;9;rePeMG2XO)0kM;|_dTQ|9ya&h
z$$9HNXzfMk#(;cayu#+w&!-k@sTxgxm6J=$$*HAq^j&n_HIoarLU&^YYrVGEf#!my
z`cPFZHxOZ_5bV2hEdZr+v+Vls*o%s~CDn%6k^#2G*WcVzmQJGxcW$ENYS%4{8KH@X
zRwEw#7Wqiu_#1nPR8G6hv^?#`M!A5~{x{dih_WqUy^Ouh+hsXXb;|Glc<&WK=R9Jc
z+Ljj}MYMOhEaOn|F<oo3trEpAMCHE=?E0YUQMGEUwrHyXscyF|>awS-{NMlE|JXml
z>-FvW<<EImX^D%3RkrY(zxuB@ZQJb?0Q@+|<+{9oG3mj4c^Rg&y>iztKXFc?Xw)?F
z9w`tJI%g{fHf2o}-&28pv82u3%+_p#3@QHZ_kW$zX6LWoZ?2rk59l0kYbitJH-GgX
zIIcFXw-9Oz0j~|Er_VoDG4!@v%hbJviRa-^#v*8ekqVM`-p`j$s`C2Nzx0R-^5KA-
z=5294n;e$+FZMen#nKYoWo^1)hHT7eFUoZJG+jR5-hSS0@3!x{FaQ#m(8e&TqQ-+4
zPRwizwUu<uBcT%4n~99b9M&dp@xj#0U58*ZIRQHN^!c~jcH3^(3PsCuXUlwVp1CsT
zQ<fBc82vED^_I5P4I=<5CslF71VxR_oD47E$2km><-;wv_v)AL@^6*5Wth(6`6*i>
z`@tW11md)a@Opjwz@&<HqlKeN)^pjrVeuURFrF^s=_xL^7*`voyD(%US8fKXijwmb
z1~H9;s;Y+hVwq}4w7h?<H?%{SNd>`Jq{GwaAN?@eQ<rQ=Q7+wq;etr#=kMJxynp$*
zDLz2WeQ$gN3&F74Z4H?7=N~yP@4x=pa!b4){5Z7<w@EE_$Cv!rONxG)$N9<mF$~lD
zuYbC||60`l4w07YE0HrLUHxi$XWUFFDzgcxQf6R!Gr;t}ZCkFY8pg>!f3>uQ=|Yr=
zoxH7(!_Wsr^23Paw%a>7=fh+%Ce}w4ZW66wIvHNh_<nhUpVH6&{7*iN1|#JZ{Wy6)
zn%B#k=LgD%siML-4dc8n*SIdFid|JCtv4Tr)64g&dVT%XhoS!F-H_3)d3n<Ml9!E9
zY=IRYOFCT`!*r4qIVH2zKcuK1DL4gq5|^9WAW4!R=F&-`>GI6mYRdws&X-Ta>GJy1
zKbzY@Rh%CRE#EzT|GVw>zFc1o@iCoV!hE{D{-VO`@-Cdl>B;mdNHm?E<91uGZ~3js
zkLaoj-UlT5_2)mkn)|34hB1t%wu+K7e~1eM09rdYrBr5liPKufA6$CuNA?*Kjpt{M
zTPA3VkZb#*HJSbXAW%{g+8q0lR$TWarc4CFZwL>%QF~6eI>ylNkWyIlsJe<1AM$$+
zVfOoU?7c!lcc-Mi*P=Q|4@r2~PKaQ_LVm2C$8UMIp)+}^-e*|fM<MP_zVML4-b@ai
z0HIopO@7h=^y*aoFm2XK5yJ`_>xTRl!-ac0PSc&&*#I7F>8+W7JHfpkrBf;jq>UM0
zT+&)d_B+9IPwMYvGM(_^Tgvbn8s1&@UMS!9?WDKi;9lUa6_ub50<iITx%N`6LvgmV
zk!vp^$ayi;%s|Z;quN5P|AG>}bmMbS#$yQ^G$E1{;c#!fdGM4!vS*3uJRiK8)kFci
zOo{gB0v=No+IoOh3Z9?UW-P!e_4v?UqV0B-N?_+-siubxa{v!s!>*FRW{}#)3U&#7
z`^Vw%Mt@`^zrW79ZxHPL9(T$S)!qRw?VTvyyp~0}Gb*+3tq-IqdK8lNMO*G}HG1PN
z(o(D4UU%$(M>5H7*~DGTqb@<aQPIwL@fh@h*oSl$RtbVtUv>5W-~Xro#)s+Y`#-44
z*Ps5gMOo&<+I~YuB-5tbQ0o2Hf9)ge?ZlLSc$ko=WXqw=DoyHb{|kBV$gS5`tyCVQ
ze9pBJfe6Ws^Th_1s%EGZj$6$i=>BR)WFg(ddV7!SGK>@C{5IX*zgQ<NcXz|!!{o!@
z!?@nw(t4vXnAusG$IDAmqPDqX4*{4ipD~+EqYE?CyeFiR=q;)S^~YhpSj?L;yK$~&
zG>IEEya3wCu0Kszoi~!ZeEMNqubWj!%FYkyeD9*|^sD5@N%H`?JsEb!JiYwJh2i$~
z=lY6pisT$pEvC!uE|%NEH`wg|hUq+>p1N~x{%1Nr87;StNlKX>ENjgwfYZ|_L|krf
z!p!Tf2Bf|G@K?f7C8fBfo}D^I001BWNkl<ZxTUyo%z>2cW85JTrt_!i{K<H`*0kJ~
z_fiL_>_1`89fqD5UcaEt$qFCRXb<z#cW=M^OVu&)wwU$-5q%g$*u)WlXehh>)5hDI
zAI9^iAF7LE_fDEV+cGFj)I(L$vRiSizRaAka;mX}0dnrskAJnT*X?#K#DJ=)(<0XJ
zK8%;ozb(;~i0GE<m-YG;9;XuvN8_=*2q%uQoO0Udve^3J^juSGsz-j9FXQPF*ISBP
zTHaM53?mY$MG$Pu{oZQ<qU-flGtEGcLwyxfrqBU2uL=k$#=575`2yKu6r2y}92QH=
zZf6t*K<5Wl7UuFgbcZAx+U?BJY_FB=Z$6C9`=S&(oO@_IT}&NQppU^yNdPM!d6+Jl
zwpgdRRuQIcIGu-ae*NiRN=|ClW1E1e;xcUXsFEZlH%z-L=KVBZtVcDTF4N^@y}qv3
zH*;|e<7^&zPVv(Ze@t<`e*IYitT1(9;1o-38hiFtHq;lwnIFetJQ*a<5MWQ=|DMR(
z{N~qx{ZCm`WjUsMM}OTxoikBAx9iL)jPo!*rMPljE6NU3Z|`3?#naR0KJ~CR3v2j^
zu?XUFmBXy6G1x{wjApi7uU|{NhWf7UT@|s_2B5n$6ZSwOZDXE}GS%i5sz<mH=+OrL
zFvS}mvwO-y@XaIey-7nem%Gf~aze4Tlyhl@<0>O*Zd`<WCwDtLccpFhrh%GZa+j*r
zF+@84bj@y-k_y%z3AK@c>aS5erg1$u*zZYcyPdMfPt^l*iN3?0kaR!sq=!J=-J$;e
zB-@Wj_i~P$5`M7gYS;E}WMbVvHF)4wA7Iw~o^f}59-*Hf3}frVjNRx69<v7b2I}rW
zdK_Kf4}~6m!jGTm{`oAPqP;x^@5I`7fbTmFa0jQLBU!7N?RM59Z3sZ<Jm%&0^*QC)
zaY5~D-)IbQSDWHT-y1*3*uxzT0JV!U$HtDYZ<PV6b@vK&W-IL=a62$|hy3gQyBbvT
zW?Gs%3g37b4qrjF4dFg&Z}tHCF8^}}rug8ADK|`dzQhp&a#uz5K8*VYU*@5g8oGP5
zZHy~_!Qy}DRqS?({R|Z!tu8yi$G#`=t>8wyYh~;W_5bJJ|3@rf&$QiYV||#;al54$
zGgha_3OYJ)s<DO2Y{#o%zL>ntjt}Hq7-vvemn#ujxhYo9m1)hf_yDxv469>IK`zYa
zPd^}0TzBc%_Ilc2plJ+r*9+`hkvX&-a6COtr)QC<!YL(HiMMwX$JX(<>rSIc&gwSj
z$8MLz{4p#tt@Pr@(`8$iJnB$$bm%SuCRZM5n9sv>+BNwA5b*Z)CHKCJ!VG9*RB}$U
zblbNTY(I>&zf#IsNmb7;-yza^edAm=6xFC7x&%%@bU>(?QG2*40IKB8BQGj!8q1!Y
zn3k&v?jeVuIdaZy!r65$2^1{nEa%LXfI4&jj`PznUqq5-#=LH~S5DD|v7SaPaKrrC
z!|7t*@%H+Qh*15_2#&mkT=uw%Z0_vpHcN!bgBGJ<6|#X{Bzqu@`fbS`X<M{A+EAXR
z_v?}Q`ri?qO+-%5-^Jy+TwnX{ne&60-wi7E4RSvsnmqto=zPYzzx?Kp3X0&?+t>B_
zH7A920)nhnZig5IfMGfh(?vC@iUAOS93o!7{JDnGHB~|r@1W(;&zDc+gDac|b0yi^
z!6|Wy#-`{kw&h*M%5m)8O3|$Q)wr!DZ6xQ1>1=1yzMd#wP&#-J)dPX3P%izCpwlc;
z>#Bsq_F>Jf{s+Q1i;ARFj7H6R7{-(HgZ<TUeV6<a<%<!<S%h=wDJPrf+1xQdhn#Xk
zJ%S%5EAon6tvbQmJBUOUHo3lk-DlV6?p1Be9Gj3Kr+E0_!kD(3)%u7yo}Zix%k>pZ
zrjFqJ2+Bo6mj}1~e#$ZShiMnaFrKPBRZ_Cl*kL+5=ik5nT<Im_`8mZkbprbiftl%a
z`y6Sii7`D2z>GG-e69#dFy`Da#C1vAQo_K$39&A_ZJ1^s#<e5?0BDZUDiIqEA7Pf>
z<J1qEJ{wy{9~BX#1y=&^UgHA`d1qyPI9VeCuEt1Kw&m%;rrv+K&H;@dwdd>k*CM&i
ze~!pj?Uo}=g-B_ES@&W0qKbWaRKAUrPI!h4SOVwcLIklxLeqhjP~u&xJ|w#;yWgX@
z1C2d6ETh)To+C6%)^0m3+zDv)TPL}kGu3G(`%9n})SNqzeIcTyI5UT$BWL{+0Ld;u
zVa;bLMRexu5)jlKg)Yy-6yfdwm@{H5@wIr&ABYGZVb$>Au^rJuF!Gq72#W!`(cp(i
z&N2r_i`^-r(0ex31M1)h1!rlo=-o?>NQl-0+!ck`RWowu`pA(QiWS~nX-8Q343C5t
z2pR3zJm84ryr7l%si62|-#$@oL;^a@-m0Fk%SqP{p^pzQyH>TV?$?I)62OBPDZG;~
z=s~)xt(sTp{K#fi%rBQ}#X<B{mmOVl2Tv8irl(jS{?hacB0zwaoAs?CO8e;gj|wg6
znvJSV5UN_TMAs2HXSABm(hmF90)DI820bG@gXtAJ!Z>!%=QqUD$4N65bcz%-J@#jn
zBOK0*F^G>gg>USGeBVU#W;Y4rWJeD>%cQu$^(_bPKxGe>hea3=hw*F&4x=%}^~#(i
zr6#QgP}LM;5g9@eHy-HY?OzP`YA2@B&z(3$=GbG^4h&fp1z@cV1+C{qR?*Y*cb3d)
zvnzA|aN5@E*B<X=zd08)Wev?daVh1g^8f^R92z6y{PexamdJ$^H%YOYaPu;j1&~tD
zGG&5zyMN)$t82E)D!#o7PWz}ooWsLJ*oV<Xbfp`-Ya`U_+*YVP;=f&Ivv}HZ)!d@0
z1{Evfni^1^7h(|xPUdyN&W@4;;)U~4f*8W2l9(eBrFfGR&9ZGn_DtH#UtjyM5ddV4
zlF~4qYR870t2W_bnhzFFlPg<VdVvdToupcI;)lr(V@jK(JhI}rl_Y0lXMk~}ups<x
z^)3$&fb!|-J5lCs1;p+4p5oRHH#>`Mc1@WKQUT14X}Pjl%v@98$(f+q4yuN07iN*D
zs(zSk$IXBnL*<E(bAFtm_#@3awk>a_QEWk4HPNo9g6)TEIv^sMMLKOOr|5Rbz|GqG
z9HVgZVF+&CZtpwQ6}BN{Z~wPV!3tUD2g+Gp&PdH+oQzyp@H7pSlYzQKpnwilRg*dV
zq<ZjG#fW<Otrsr1A6;+nCLM&rIYac4Gfe>i(t0z;1%Sr&n!A{pAHAvyCbIcx&hRT2
zF4XiKXEdaNoExUIRh+daXSlK)$DSSNT*cT34WtLGk+0Q*QMG$Ef2km`dc-H^cRRjF
zT5oE&0CHx*OmRcJOXbWQl43*b?AixJN!DE}Ac84f%^JvYvu7hu@0#vUGrmAXHP2<u
zLuuJqhmze+OZ_%sAEq<1*Y6gYBc~0+h(Q0AlM{l=0cFAp>cfawXkLDp?9y`FOw(Vr
z`_}oP{6X_RMC69)l$TL*L|)Ps?e#;f&y$Ll@cM@NNB2<yYZiqJXaE2|Ow;)#ZVPi<
z-@arO@4kakj=cK=EZJ1wfFKtG5UB79U+toEiYadPSaaOE%wE@T&E!1!A#FE_3;E#z
z(q6%m3g)NpM50a9Q{4C%caRq*^JpS~_roxs<9aI_;cizeo?_`Q-C^|hv0yqQRFs)U
zAI8}v^7?>^lA3d_k?MAC@p?YAhL4Jn?Sqoc+;*rt`=CB!2G-Pj`*3Mnq->C*4<?CX
zi7rLql(r>pt3^m!^MsrS6@)w4umYfYsh88!r@oUT%-gyk;OXh*u71Mx_HJZZl_cUj
zMFiVw?z|u8Gc1_YB0F+(*!l!S4i!Whv3Q5`v!`H0JyjK%pT6U?-uP!#U2E)F12$3V
z7TB7SoC`jTs=D&m40G_{$bm>b;1fAOLW+pw!cf-^TS|=9VO~;D=>j)=7*7VJ6k&i(
zIBlFbZjv_g9!lU;dj_&&Rf_}^5gj^bum#h+NSN-QJyTt|`8>?$xZJ9RyFbJ2bQ8PI
zBzPKH89@$-hWTvARx@IoPN%0f_gid1@+A+G;R}Ql`JvPe#IRcWrU<9FIPnIc$y+bl
z5xgCY$ay~x#@VRB5#)S|8<pltid+9?VL`9i4o!eS&Z*kWC~h~+n=zUBo#O_GuJBQn
z93dG5AjQ=jp;7{WpvPe&f)d^>hSo^M!%ZoRxoxzTvAS2;<W?3`yntC(J1yklUf2Gl
zDaEXtn&PU=VLoR#;=!IvE;n`ZV(*>z*yorUaB3G;1?`g)ZSP+*nIWHq#I$>dli6R`
z2hE;mVTy<b_whM#t#eZ!meo$^no*?L1J_PZD8LGjk)hvq81(Xuh8XXT@V29<$UP1p
z57}H@0zmDpqf)kVgSpG;zCG2Nx4p3ed;csEc@se1yCdxAs^xR$Blewr!t#lzY}|RM
z{(<uc$$<(gSuI&;`nro*uOf~*!$&}LfM#(eMX^0`H@!cGSCsE(IVP%DfWHT!P=OF?
zqdVsoZbmEc5rx0AMOPse5}`Wh1C~yv3WG>jJ;079sX)$wDheJ$9i^!J3#7Z$=rv4=
zdxuHkt84Er-yylNlW5=dQTGY*2uB6{?!t;BF^6?c;YQsBlT>3b?s2}>)W!THYcr?U
z@ItW-7!~)or_)pc?Wme&S3kl95Q=TLQFYoNK>G{Qt-jb>JMJ~T<qX8yNy)nR3#&-8
zGVwp|2wV7u3AM0A3KUH1eZQ{8YjoBW?UEsyma4aEG`mBmAZ?kNaHl&}v1U#E&pvov
zq{!c-Sz<Cjp}w%9n%zwwrl43wS=qV0y2qp%crY7ac@d6`T<q30MeWxCEnU+?yA_dK
zk0q&!f!)6son3B?6ue)haO87glczLafBv|4r}F|9)}~xKG9NlsV}4^?^=-GAu~}^4
zuGws}ydJ@-qDuIW|I2^h`w08dwCP{YpMI!y(t3MGBGbypUCtl$cg6Nd@*$h1O={8Q
z5$=|ZwB^7;AI8&@s>a(J>>_OuKrQL8KVR6#XmNTfDl(m(!gNa8s;U-Y7`Fw9ybHE)
zs~PIm;^@MDZ!4#axFO<jdh&iK?oKqNe*Q5R5J-5n-mj``xA!JvD<_(2a!}PzKm4&S
zVb`y}n2e$&dUsbtm_PsiZ&X+%s_Jrm3&ZHcxUDyH!g5OE>B-Lcs<7Q&4Zx4+=BLlb
zkLPX8Y0ldC=up6YO%X7R!*oU>B)`0W-Ill0(`O>GqWt>x=k~NYcYnCzZAFC3r{B6^
zx_<q0Ef;bhSfn;R>Yp(o_@^KLJ;&|#_H&!RmRDEAC|xUvY|E9?_Pf9NuT$Li9(int
z3QlH#vH#T=l7_}NXgH!9#wkpv<?YLMd$$+KS_@$q#UOvGhJZlwVI0FauWw)1<-I@K
zg>jau*~xyPEE1{1{}ybC=zKUmeKu3Mq?F?NP;ILKyxp81=BLjH5K~lUPMftx`}huf
zt(Nz%mfz-_fBxYQ9Jjcw*%cl}=e^x%i;=U>CL%<1`TScO$C|h!J2gcSVLUxK=Kzp7
znW?EJ0F?87Kq5PIn~1-*aQbpVm{n2>6GjXrbFSKWhUsiMdE~rvjydJ4s=Ka?RZd|#
z7l}>qKG<LR`t#0RaInEtiF{g@ls1!4?RyohcDtP?AL<lCRjq-^X;Tp+nPu2;d6jC7
zC7h=73m}?lCk!o3#fMQFawTsWVVLRxeOs<o%2P9Ta#<4w%OOFcaegA_*X!3>Mq4*n
zREO~t##3D1Ypal)N2KNb*Q$^>`a7+EyE_gkIX}!#^`2(Sgld@1ew>%rUn;%J4O6|s
zE=(#(QuO0&4JS^C<I=!hszgMYzSi;5@^8+*eo32jik{jGb3Rx|<j%imx4X+RuU~B#
z=V3nGUcaoj*ZJu?L|oo}O>sNF{6;u!>$N{>^v_0LiTMYScrA*0pThlt@e>h0vM=ae
zI0HUlGGU*GjD7LgcJC}k>GkpVz133DYK<naZdSH7bQ*BuJ6Cqvw<fuJmu%fFJ4w0r
z6~aLyaCc>P^~eWBvetNyPI0bXoQCdQu-X#m?rzXdTYT@m?fosfb5I}jFb^)2*~`lD
zt<jYl?Md%A0Ge~#`;&0XmTTI^o$&ozwt^Dx-eiJ30t-950PfSwKN_v;V;Q?1A_1F_
zs%tLQl2nL7pV$5^8B&eYe)N(bpU5n=$i9;nr-^s+`!3QX|Nju+Ljgnw9NRwuosV!|
zEShpApY1vcXw6SnDM|OJozC;2@4YFoc0W=pHfgYhQbj4~F0dXSr246fs>4U95AC)3
zxwvVmh}}mjrScKaL3b})Q5_Yb7IqE}Q_pokvOCF7?*{3;MmybZedrpCu8RXLH|Rn8
zM;pAi`z}XG(YHlOe>pX_4{gQcp7LND+l9&IqikIu>x%Rtce8s)<$ej$-mY`ldh8{w
z@dJQ>|L}Kz>-=zf{?3X#bF`F5sw5)3EdWY>K%^Z1t(tw%l2p>R-r~9_C+1|5iZbCF
zt+xpxn?;sCeNJ(;IV~dE+4HXTgycj2g@^eR!ia7F)%RcjHLkapAOEN#oRTWv-oDlx
zkUIMA#nZekewfameo%$w?H4hKRObJgyv5f7v>kj9O(9K0_ED&&OJ_{8#?4~lBa-{{
z<G)YalHzjjH@EMW)+?f;e5%ErF*au_dsF`-((?981#q}9TKU_`M?~Hh06f2Z=lrl-
zUk#gNMM?jg`@+=u0f@NM=2Rj3Fiv5dg_(s@AxGP>u5Mu5k%%prVwlfqGwOd-+3CJg
z+;XobWAa5(dimjxxvWHd{pC;21rxJyip+_(Rl1X-Eh(4JKZbF7{rOK7nd8I2!jh7~
zu5yX+>z}mPCw4xZFdCVG<C5aq%lFIiaL9Dv4qE2?V1^A*=})767?pWjuK?iuNREiS
zRcx8qB8-Tq=kHt?miO13@P~AI{=6;Mj>Sy(Va2LqbD$E^%}Bnhv{IGVe*W!WDGPH_
zmF4<cv}}lvxAv|{ud>@GtX|A+q6;~1nQ&Pu5;ql*w2h~y@$^(>W!dB)Z0z!3e!|uf
zOwI-K<f!ay#Lfo`a98Eq>n|*c*Tt6g+$1;qj`N6U;<YlDmFe_6KYd@G$z&H90CFd0
zdAHz90CdAxuzaE-!*uq;WNo3$2@8X*8+Nc$VM!ag;Cx8i!f|s}w{<tA&m=hf<MQ;8
zss$*mi<Mqh)^Lhag3L@gVwvpQ?TrdQ!EP?cZQHhOTTYjkaXOg_CKH33^8`wrO=QAd
z=MbH60?4%MgBOrvjN8?R$q%E^DlVUXB%-+8tcqoh%lqs7rpIX$j$xQ<b1N=a=fiY<
z27ucAYV~o7Pv8HR$fXoPVZFUo`^5b8*^VrxhcG8q>3&6{EgAtFRM+L|eDK-VAK~Bp
zkE(`YbYWO;?_hG=Zs$g%VLqj8sR^tW$+_LG_1xyabx^%OHuo;$$6oI4k9;T>$2($M
zKI}Y7GcN&^y8%@_qdbhDr=AI<jki%LKS$eUUGCc%e@C{?%~&lyHlx>mOZk2<bSvP|
z2ELz9RLQa$FP8Q<a$m|k1Uk3&J$`W9K9uJ5xZ0OfA0W!~&Tm_J2)Q78RI7;=rTCH3
zbO;N@u9~hO@Opmi=>&CD32peJc31c8x;;an`?FTW6v<q7vd%+}Ix&*sDcaA3^&!LW
z*g7~Kz7=*8m&e84zxAEh{o@T4+4WKB{0K+cUFU}7Yf!BHt%Up8_#+j3{ifPG<Z<7>
zz;1+qyB1V`hTZA-+cw`O$8`?3qbeSq`415rdU!8d2k9^A?z<JNRWMyypK%|R?*M(M
z>Ta@iEC;d7z7ALCuxPZ_Q*LsUb#1q3<DsIgfW0nDRr~j%Edbrq)g>M7o+X8yLkEx7
zT8~S=HdD@hE%%{G<3R`OTM`&cQLLYRryjxbP%7a4f^FaEAOHS8c9L$JtR-~L_|%-@
z)92r1C%f==d#yLg53?OjtdJ;bqX>ZW<%N8(AbYb?q6^kE$TTk(kf<c<`fRza`2xj)
zoh!m=_QPaa_PAb|+4+_}(d;-<3MSRjvXzDFTdk7)JpFyLk%ovM;OY6Z(X)hky}bj#
zIG<FkrZu5?w#}BuK|lTQM^4dx7|9VKVjk**aq?l@mYaqBBGK*b3l_ao6;%$?d6>^B
zZk%G;ZZ=p&Bu*Qm^I-r0&Uq_&j4_>_!Z@$XwKj-2MMAPecU-Q{4=xO*+A=Uzsui$;
zN^&ktmuCf7-d{_u%@oFYy}p@SyoiJ!4`8zN5kRd^aKGNDrfnIf(|CH4oV2wuCo1A>
z8>iPdTx!sSr4BnsL>yyH`H(K}cRIh==sE{p3zwz^PM4SbU_eHfrFAhSy%l-6xs)fz
zt4KOszH1h}>Vh?wh}uBzi`8m{*@(v9GQ^s&Sm1Tq*34<MIQuZH*Eb^P!=Ruk=BULI
zh|DcvphSvi^n_6+L|B-}ks~hQh&k6#Op+%S!*+W9&g$fCy~g#r7jQ-u$?XI`<f&Vh
zIU9G_RZE{GQFC0JALi%pL3O!)&BO!qEp+Rw!45IoHS;{r`QXBsb;Zur*|3>M?PZsg
zv>uOaTFGg?yoBk@MJQkoPtLyu6^lruT<(n1$q%CoQx6uA6tAy8TYWFWl2QfgX17TW
z0u*ynaY_|RE|My~^guxEl=>>7<9wbjpH)(Ji3qRPS5P4rpokt#j-UMii1*dG4ga!$
zJVihV<7{@dbzPTbIh{_!Fqp<QOf!+Yz5Y_~pmn5b9$`O9G6ZI}5vJ7kZeiyGIq!$b
z`N5J7%dm;DtQ(w?O%Z(<eVF2QO>v!0FMw!?v&JkGVRKS(T({+BD};qQW$jzfFi{1>
zaXwplr>b{*TlOX)Ip+f)2CI?_LCqFk$x&b7+xy}$%|48Mz(BtuMH@m_e6$H0K{4-E
z-uFiGykV%IQnjd~bJ<|jn&_YaB22j^YZ8Wxp~^WDt%Xg+wqGg)t-`U|^@4h~Ju0bc
zf=h{6k$&WGEG}CkKFb<03uo?K)P>$=YR0U}C9UZ^IkT{sUbPE7H=t<sN~^E}p`+Tt
zAfiT4dT<N1%x{XwZFgA9!!GSi$E90>6`+vgbyOA2P}T7Nio4(#?I)y|Q`YWI^;)by
zAB_O;=u0hO;*Z8@S+#4`bWU&B+m`pmHx|Y+Avqw%Ozr8)UrQ$L$U&7Noweje@`~tk
z8d2#+QuZUFsF<)8s_(v%30l(<N$vMgD;#rDS(jn-DDb+kgmOGkPOi=gWxX=GoAPEc
zHb_xfl$T>SNzKN)4EG@-$cB3SXkv5JqwBrE4M3a8HK)CIZ(i5u><#h?nr-AN3B{2C
z2!ykSMjHgq0?s;Jn6}ax(em8)aK|ck%xAsw827WcA~Pp0JTTmY9ve%nnrN$ZO!qCU
zqq%vfRj|ehIp+mIg@qVFkBY>)LMnW$39nPfEa1d@8G;&XqkL0++<e+|6Z?_a5$oTq
zY2;u(RRmNdLRG<x4o4z%&K}oHx<RrZ>$BtStOa#sOjr}0cHgrbroe-0c!w!BtZFx!
z-DwN{VxQ!$dfvYZwzBQO=+c^C)kj#&f=)nzP5)}_q_ExIjG6|jCi~2lmN2U*W_xcI
z-vinREx`sIFg{Ph>Oojp*_v|ZN73>0tRj|H>_dR!_Tv~+Tx&hljpDO3u@}cf36tZL
zuoyf_N;m^zm`>UYHHi?=AsIu+N<-VL0kOo{h{d?b4uA=&v|e9T!MU8h-XRn)#Z^)?
zaWF#y26I5$slRTe&fpY?NHk1m03bggk)%{ncKJA8+CeqH+sIV8O{zIv)`!uk2xg5^
zVdiB28N!G}8HWv^h$h1m6&1BF+bj)5*wRj;m<K`RT$zn!v%lR4a!w@!=N@j3U3@x}
zU|#BqOf%c&l8Fkp%)CAwD|v*pC0;9ZH+zf#Qi@p9wMsg%WvGg9+SZ(aicOv#3scZ|
z9CjEIW*aQ!pi%R!i<I<D1ywGXX<=4oEwkGUV^a0QY_%GqhG7;-bu@mj_qTV)rkFmA
zcI3g{Ytj1Td4aaUcH9=*l2Y92cy*XBh!8=AQB{C7>5`u}AAA_?EWDE|kwXBEAe`3g
zS47LZG5lOQ@GHnURWhfInff^aAoP`Pwy#xH%bj=IVh)i=ShjUBS*8yoqKid&XbVt2
zbXxdoN)eX0t#$hf<4J}6kb|!9ZdTGc?#blhoZ>MDW^bIW7X=$d3pvH*{fia8pj!@0
zB2wrtBcVc=PUV3iA}S#Poxh?5l7lYq*=?ed32Ok(k4UH@tdWHY06As$BzF5{r-cz_
zL@9CYpa7DR?PMZiJp6JN(avdrmDpGBTH0=AIW>=?&0O<6v)o<tj<}Eo*mv6d-p<6F
zELlEp5cZLn?}b9DV3zJ`<s)*=2g*}es_vKL14#~vL}XiUyWd<LijTZ0gjm-K5%ww!
zIV&8|IaIDPEp&mL-<Ed(K<5y4w#PicH`jCU2Gh5N!1NLQY1TQ%46VQt0T3XUxtPjN
z(}g*TG6D?KsTA*$bTtt{lR{MRc-bA12y(#z#xJPig4(Z8W+d`{VA!PN7oY=xyo^G5
zjB<ak%*id`uUKTN#~iHvHO!ZLk3Vl~<m5~`WG+!6az2dbPTJ#yH{pncq~ymL5S<?p
zU7tB#f7r-1s+=op5oL=-bZTh>fG)G%Gp#?RWZ~MjwAm(#L^dmRVNg+!q$(+HMhNYd
z`YMbF77s#1q5>&drv(#&nrJ%*ixW8oP8&l8);-(|>#LFgUE2r=iJSl^=O|!5&UU!5
zUIMBb7R2-p0IPK8Dm%v6{mOc-Y}K%<5$y#d7pw_WopZJQl?^=3<><S(T9@+j`9~s$
zggJ&(D?>{S001BWNkl<ZByKCHq_|Q|!R#NW@>cs{t}Ch^LtL(sA~}zH7fNq_vX<a5
zo$7gOr-R=guI($wb;(BT&NJwT!3GvNYYjjP5WtZyt^ly)@wzNnH6z07^(zuReg17Z
zbS{T=$97Fyh>Nr*4;prY3yvSF5>1mw*)6jg1{229vk#-H+4k+0c~t?)#X56hPSwGZ
z7gm5Ui~yQqtf({CTlI^zX4{30+<mH^EK?A&TsFdu(>k7B!gx}!gLOvT?8<9G?<Wz)
zl<XbsNu-cPh_R4H+QdOcoN;tjeHiS_`u}tGE<chaNt&OCsM^C{5s_J$)!oxQJ$wwX
z1bE>eMsThKPdxF!8#zbvLVy5|oD+E<f&E{I;qK0KS5;<4xVxFDst6Av`Y>~gtO6U2
z-JYzh2zN6zH5HNX`+dy9DM4*<4FwUkd8+gt#rclpT-WQlN;Ny`dW>PA0z`GW9RdbC
zL2@}7H|l>Sr5KmoezPMofh*G}<-%yMWrI;`7mQ9Z$T?<^q&z9d&Gfx-w&+BI4NS(|
zA5P8>+rbO-ie#%+I^V}IZz3e~uIu)7Bzb3MW=P5BV{(mW%YCQS*pra*X_pOz*1DKm
z!AFy=TmlP)8TApeEU5Z)WZ!7Aq6clRkP`r@-7=c@DCk>RPhQ1GseRU5r%V3%)>3SH
zn-3j7*-Ao6m;W6!s;+}96Bpdbf@<VN?)2nnX1hdag9^QPR&#I?luB$eT{Pt<T&h|`
z<gwA(Hl0dKp^Uz=fCq~YJs&OMk-OOZiw{C5*;P`Nj9UOi#h8_6_+ey%Rot(A7&G?U
zm(gWINK9CLsJ3|tv}qsjD$#MR|3M?bHO<>1oWT{#!9u}w-LjcS(9i^Hr}+k@YqM%V
zz*yg53^~mG;kAIfX>!dpC3lVFJsT4u0O{gFL_lY85U@5RRA~wq(~Nz6*e-iS(wew2
zrP0PFTL>?*ciKS&YWnlo_JQRw*agU0ph4z8KvruDa6Lemtw2nr1*Msv4F%FzcOC-~
zcN8%tcqe0%8*NeZLrT9@>p2l2W6#!{Q5$eDL;e<pSJ3`4A}`3!<z3V^6VT*vgWa&9
z^{9y9i}f2Hguz%|!}T`pG8i9o2(nX<YJU>fY8jQF2;o+9RG_;0saAfhJ)2zB{SlHB
zFC3?J2qh_Y73__(MPjL$XMKN_X#jct@+-0$C|KRPr3wCD|I2@?3UXndr<-#gos*Q9
zSyC_<KhpW-M`h%z`BOMuU%!wg{HjXWwU8bVQRb7PN9XI;@$`In`ZV8Pm-}0jBSoj@
zPre)8zWi(9r^GCr?Z-oJ5!e{RT!K<=-~QV5httcC0I*DNHr$ROg+)WUi!nolUq1gS
z57^T6>o3lGvT1V?Ns?H73#=~Mj2+r$&J_#!+9MyseEs@Uu_83PVf8`l^VtnYk)&$u
z{FiMvXoJNc{CkqZtdF)Pr>7K!WqSLvheZaffnqQOg9vlFeEgkqZSw6%iv?9r`fDhk
z9BaphS%l9YJ{NaR3=3MhpR(*8uynDChTaaCUO1+(jOXX^{H%M2rjT33oDcO#?(*?>
zI{0$FC)X<>meVW%MBQ34r;UI)%=gtn`}^x&k1Woq88U+)1OVeQk@LF7;!3VvLn2j^
z;=BIs>rcD3ha5Ved^ZAOn68`>c~8y{#|sE7)6E9qO7Ll@Y1;V-%iNlFtoccfoYTlR
zvWLsPgJ(jHOA7OFdMY#tb%i(8DymLBAKo#BSzYZG;7&BZeI@6+@hBqm^(&Io;VKf1
z$LDT5w&aoN_7&FPz*0{Phm-3D-}UPLK|pfFKEccMX01FuM{*M8emq)?TuLzp@B72$
z10YITLYSBPZ4bl|^jzzGcX;{;BDdEs`gEsdii_eATubfP9%P+E^3M0Z>-3RZ%;+6N
z*mdKI4CS12J}gsQCY3(vV`YYc5-p-FZcv)&!S`d=AId$|h=w>{Ri7fv)AbtyXdsVh
zH2mT8^{@X<ua$`O<I(yMAXpyN9L@k)z2&?oq_E6|H4&$)5(C;ANS`}Z1zO8(nE;?0
zPb+^RYpcm40H?sriW1ed7UPtzU$4IF5kbF{zStDMfaGnYZMwXpx7`nYKM=XsU;YCk
zauzi@=biUR9?6C28pAx@URMyi{MKx@T(eL3ewnT-mjhAP4<Znz8`uXp^uuAEt^oBw
z3cn>p)81Bl_TH?ZweWdSKACkpcWsT2v1)|@#thc<&6D%Tu;W7d!A477w^u-vef4eo
z-e|slg}Y~Yd_hC6DQ>vRN_{VlFOz=qmM85|cuyV%J8_0(`i+}p<w`8WM>|F~DhZS%
zEPR($S40Ge^~&a>a)UC_uZg%FK0V5LN-eu~F0Wrs<q9Aa6dbp<k2O?mb=JoA%4}>a
zuu`knOtm&|8h)$5x`4CtSH?#YP$T0oO4fT?n8!6(nRG}<QXT9l>u}0<(EuyOU0D_H
zBe=HJb#a2jcO&by*hO4<Hn3LM)=fdew!^TI1(o&xAb-f!I6me(?8%9?9;?=iQ2iM4
zZUm{0MYhwX{g_kv&K<zIZ<u-J@!yczU%;FRvQy3DCLSGYUcu^at!y^MC||(t`h=QB
zPq$D+eAj6p(6ahkJ5>4HWq;eU6?S(;X}}as1m>O~1@UqB+HO|(a3ym}t!(#pEkl9n
zo$~#ir{_H~fOfE3qY1*+@{frB`~Ub~m5;3xa%<eD#4)58o<9BF>IuZ_m!HZzkHeA^
zdM%U$iCX_DIqzI|xO~vRjpWJoVZMg>7MEFPR{&rp)9HrR+r;5`(K26U2;~e5BFlW^
zl>BhO%->T@wsnn#5uJ!Uefk@fLa2^|GdN1mzetWBpxFCcC)(tIQ#^n8aXfwCIE(Of
zf8&@^ob8JvlJ6w(TAK>RCJdP|U+maA@Y5!~S(syJ=M9aSSA2iy$D_96m-!mz86P64
zay?;Fv2Hl{;ozJn=fXUTa9k$NQ3Kw0T6t@!BoCyw=E)Y0i(UzIet+_8W6?=+O6ALs
ze~OC!TILw0ErCeH4F|*T*)cO8y2&Muyhf;V3eI<j^9$rLj|y9m9LFVv;4|P#0K)xR
zdY-DGc;s$tNy^NJ^9!diUB3x)nD4IZoa@H(vl@p1fLt#CVZN!)fjKU>H{HgF*2qAk
z8~`*#J>A-FuV0<_S+)xN@CDN{xvoDxeMF>O6UP{q80M}&_^!Xc{-P3gV<i{ZRX=hJ
zC5){fPp%(0MgR`e{o$Sp0s*1U(aC$4`w$Ad(gkxke-PofFMsh}@4H@`b<_2mx}nOD
zqCcDp1Ym<$(=hbo`56#z-+oSULDMVRL_>2euxX!Z3H<W;&)s;?;pP4H=PW?OW`-9z
zrP59S#OduzHyoZn{SgqRw{NOEQvO^@>%R=(G+F=vK;k@+_o^1mIwQV({C#FV(6^ud
z16Dcx!|l#*FSV)oekA9|<5`$rfBDyq<Pk)CKLSEhxT9$}IsxFk4JxtEaBHeeBqt(I
zKm0DkLwK2P-`}sgVdRulLY2alTR1VL<h$Ngj9CUmXe^>-r#Nyx&QlC?iXnyNaQR@M
zbFl)nVC{61k&JgP^-6!dIM?02{gl;<SOOQxd2-JAo^q09<J7XYS(xwSoO8~12j3r3
zm{JPOs18)HVjlVN&>|P5(P}OCYf7;jj>1tJQ8s>MX>-?9ai-1_j}6MbJr~RRKc%_5
zs-N<4q8d~iI%s=3Fx_qa*QNA$5q6Fk^*ywHbytB=Va{6a5?X9es~m4WIJVB#JwL#H
zfn~!qGcm7S<Hd?@Mq9ym-lme{zw4<I+JO7!&k(X!y^LKO&3hhZ;dhIJBKu?(vZl)}
z@Bm=9&R);{<X5}yrPz|~@3Fdz_D<*RslN{K)NxTzy&G6s-i3Lm3sFkjY(&XqtnXDM
zB`B{P+f9X3TqyEhY4MQe$Xr&!`apxt2gF}5G20pDe$oF<TclnwS@+m0(jE}kfrYDv
z(;6V&g4)|(Ud?uUIE#`#iEWm8wvKF*L2*rTP?mJ&uA^*4vk%2_OQ&nZhm8|yBPn4i
zPNk-P$b&J2$DT}CRJh-E$4w3lZrt~)K{aX+DQ+^=1uK(U(^%^;K0APurSt*5OJR6u
zS0c#wOLCEi$N#~*zxuxsAO6|nzS{gzL*+KoA(6h|3z4wc9}%P$+|@zUZbh{>Ae)V8
z9b8&Ko7J@;^(JPK#)`s@|MZXl&<wUzbtC=ZG8`@}QBqR&|2*B8lV)^nuAPoa4(FF{
zJR&+k6pjFLd;Mx=l*T?m&O7f7-ljE>DTX^e3W<QE;C%1;;c<`FS!T93v4AGSL2g=d
ze>ivjsPS)E9XGc|$*Q?n|8P~hx^Ad84-r3%!+4U+mon;4O|X=b&l%<^XO*pe&;Tk^
zEZkweU^(@^{<V|>0G^&cI^U7&1z1vK=IQpWlI9WiarH$D=RB~8q~Z899G~=2;j|Q$
zhmQK3_ab6+Iz-79i*njHoS(`0@-aksneT1pXAzeoz;L|i59Ao{Z(o%mP!pJQqJ@nd
zBms*KqDnM;olLL_kL7sz0Eo+U<CN5(!YSr=?JCnlDaoMm<%n^a8f4(aaapF@2J8f&
zMj-6^K{zebO~q)3^ULMK?@|oRyxiZya`#;iIn8dq-vFeoFv?hHJYM{8(57MxGc%{C
zW(f!8u+~|=Bj>aPF+f*|#V&$ma!NvvaY<oOFNdU9*0bvdmEnOvN>QN}oD40-DV{(4
z9*L&wSDn||a8aa;NwW0|bzB61c`7y(F<~CzqjD+^rw{${e0%*_I7wmw&U&JU7aLNF
z3&-I5v9v?<@k}Y`$I&Z*<S4_{Qe0H0&78*L6C(QFK<XT043q16owTXXy5Oi%2$(H~
zahZq1c|1RtJkG5B79tM-!|`msevxIqDfQbVuN*nCejc>|<>_fJ!t?D_2UjM^_P!kN
znoDQV@SM_kyo{HRahZ~V{jv-@e}2WLs~{}n9@%0mScD@Yj^}4`-gk#=0+F!Xh#aC9
zNg_$pAEQ1*t<s4ch{U*TWPrF{x7+9yP0v=zC?{t2{h-}GL`-2aLZnEFi*8?>jYA^h
zx*kE(&M_``6OH9+L2r7Bsx6T5_>@(Ucz^rFxvm?J_1uZ*EWS<5)79+KCHHYWKDTj!
zn>Ug+vrG@K#$Zlt6n+~vb;ALXx_&U5PBX0ICOy<u2@d8M<<>5ZtK^#un((IdYFsm7
zf=y;l+Ic`!O&Q9{WNK$Wu9~a8)9=Ql+3LYW^iyn{?~mon{^7bQ(MqjK&f3Bd7FlIr
zwiB}EKnH6d^v>xW0TKvposk)~lH+EOMWtG}G8+GSah5qx<rv<C?G}9|lzSu(SuhCe
zkHHpYzV`waJINCw2yvbZr(M06_2*EkNE0_EeZeg8t$;e~EAu`eUZr9pKzZa~Q2#p4
zStWaeSWsL$QZ-|@cfJ=9=1>SM+C<TXxmyaG!=FeMhZqS_BqbptLTF*ff+Dmt_RF%S
zV%MzcGfjp1;Jc74$|WSba%%ll(0nu0p;ma=lta=gB+3KZ{!M1i3V5&YIY9<_7gb+b
z2YTteIkIJ2Zah4LA}K8?MovMk-;G;}H#W*uYE^m7h{d8wo~YTAD@8L!%yll>_E)g+
zBAZD`CmKYs>Yj*-fFEXFt7v$0-#f=CFXIgGYfx)g@8jy(mX!rQXG;Ny0$dF8z_KC8
zx4!bV%pTuk0q!*-8UVajtMr|HtnIpEZK18P2`&Dj^cwR=ReuG+))6ARVnAH6_354F
z7$RZTPUme<HOyG+TGTuS{V$R4$CC)_iHzCnQqv6UB2+DJL3@ptTBqx~{-9?@a$arA
zO}n$MU46RLRU?5j9fQlpR2@8+3AT&TpMBSp>$>3ph;f;$uU%8hwJ#|IPMl~^qLNcI
zeNG)?NToB`><-QQQayH7xr%<Im_nFuZ~Bhcoc9*n$SFGSRRl%kl{*XuN0vvgg{h4N
zfV}Gl?VdA7B2UiGw^!YKA%+-2mTZ(Ex}_3!{lRsEqLPdrkOGJ%=9+yN1XEb%+t=)x
zNaYonV$fVl^Kxj!mG52GYfY>Ns1Rn1fn2B^Vnx0*2OKS-berRx#Yn!l8D4ErnWv>j
z$$;7}W%F`1elZ|`gk?s;Y=i<}s45I-BiRTLa$x}=a(e!ZsE2xv%Osfsp=r{9q}557
zH5}MUN_mgt6qot_YH)KA%>p$QiNV>ybsdO=`L3Tpm<19ubBwKHNl|%r>?5kKa3Vp(
zNBt-2+RF)i4PX|L&|zB*OEK*sTKru~EDV}+$q7l&IRbIs=c6jQe#pzdyqLu(@I;xm
ziUkr~BH#(Ujz^vAgzV2X;>!Ep_IDz6e3SDjE*xWwOFjp)tPe5h$Wt#5-C6H@LU*`)
z%#Z|0mImbokW*4SHaV(qAKjN6iU@H^Dcs+_mT*302;>+hSf*>1>}j#f%$$Q>i3p8E
z;XSB|P-?Dtd0;KairJQ{bHJKLFAjSU;1p7d)9p2dIprKE?>j(DDP}1daY{x(%10mP
zeBKPBnHnR+5Q-bpITbeqPC+pdRetO`B+~7-c^_|gImju*uyVCaQn>)R9MwWn+Gb*L
zQ5FKMj4c$Ue<Pp(1Mhe2?bkB1q}Enn?S>+%9o4m9m;yj<Qihx_&3psqDUKudv&zwP
ztSN6^rbHyU58-^TXG(OL<56BW&TI75iIp9ok9z)yOGza(Ke(Z1N^-i0ct4D%XXaQ!
z&X(!T%H(E(s`o}|{Tel}IVr5&xQZlA9A>=`<h<*!AJ0fcsMwTAggG%_!BbVM6Q^VY
z*vMi@U8d!ge8e@Zi9!HW%i9eZBgC9o&wW~YTZ5Mf?Y9G>Ggr8H*Nuqi2jsAX<;E$c
z6n9Vt&gEk=AfW5|;c(VV=exmd5Ba}o)z-*|1|&rE{Wu&i(;FL@h6rYTO}Y%H2Ly_7
z3Cm3_<oQwYfCiGVc7}l#!FBz3dXCGKa+ZQVQAkURW<cA)bpQz<X*|7<qv`rJ<xn>p
z$ZPXT)KFEewJMJ`=ubU{OT#zNf{A080BJm)$@#d<l5?PJU7;dL?Zcq+c}~fvmrp4y
z)Ab8;3d^h#0PW$3zR86}I4o02X*it99xeJW+}~F6dMx=Hs<x-DA63pyIlo&aUD~BA
zCsgf+XEsom$vF0N0Wij8JqkoUy{$T33a1mQL)U_x&f&vax0<%lq>o7ih#Vqz!)Rbq
z01rc(&{9Sf<@bl%E23RhUf&cwCFpB4A&Md*k-A~9P6Iha=exo6gC_iGAJrg}>#}3V
zX`V$K<oIy;pdCobswn-CtmRb(oK~1d{@P3~sdUJ7*<_rw{iQqea{X2{+emup2)q;$
z0yBU(*MWt7ilk^VuJXVNFVii}lT)F)h~xnfkW(X#0(v+_;Yh9nq<%c;?vYz|r9wB+
zkgaDeQj=4M38%UhAky*joKj3-iD53XMBN0O@5s40-vy`?Di6C{HqPo+R{dR&!UDc`
zT5gi=rIca~iL~pPf*qJByGxypICs#D%?pnUwh0(=FG>kJ(RYU$z{C;I0V1SA<x7;`
zgo+Ij=D6IEsEfxesm<0M-uO*B1s5QIH}XSOdzIV(twR(K#_xHs5Q$sELmq|ap0l-&
z?7zZoZCmsYxhFuoEI4aL)@EW2v^29nkv-m)X24b&7}!DV)J&AAUAP(HY-;Xm9o0+;
zu2In?>2Ng<C)~(w%Te9bN{VSVcRa8990=`*TUi7Ky=<;qo)m7J6|h4469SO}xC=-g
zGozuAFcjP<ZQ|K*EfGR=Ma0f2v1rF%_SLh}(B;LtKO#wovrsYwq$O>%b8_7G*f#f~
zDb}6UTar_CHm!18hdyT0H|BAa(odZ8b?ZlclQ~r_>Gnj<3vv<Z+pel(dX$aKhm056
zlxsvPRBqb!Rm3K3P~VF5kAQ9Z;!31qU|74YCL(!Pu!OjB0ZGntV>WG0gH|vTG3p4V
zxHY(_2Ue00yXk_3Gh8`;A|h&ulZNy!2%I8D9RViTfmdvx0jp+w4najdwOETNi*6de
zhpd(It1!+sd$M*%VKqYA3=vv{2syIqw)T*u2yiTKOVJ-ijk06Rpez$1$gfyoE_Wl#
z!dz`pHORNsiO1UVt#ogzqf)tkK4Ex!aB6<b-jGQfX%9a4)&I`RbO&WXlwV9x=V;_g
zKHaW~9vcHjo_M?y>!=^EY-?5PsiYL6ZE!KOK{3klV?=JFUfNzdX*4eQfBaAXwes)H
z$zE9layWnJ59j;!OF7vk1;cBN)eX7zW#;ix<S|EKDU#wgj5|!XA_7*fo3l8;l?RdI
z5|?>Ay^QA<=Ad0G$!k#&M9z1@>Gh|7>BeI}9(_0Z;SlDlwP#g)0T7otTS0lgy=KCh
zCvyGq)b|I~rni2H;$(MSuQPu_jLV#K$gi1mzF+1^B!%f}98Kn=vVNqTP>PMH5_~_L
zUw)@|F)q_Qy=r;dA5L92q!>ia_2}Nd{?r=DIfb-L{o&jnPGOl;AfPT<n~*hz9g(D{
z)i%bxIBHuS*l@gP(%~{)m+7h}bZ;qZ?j13s-e@>I{V<%KZ?8WY=?z4WsG0ccv=qx>
zhAD$6w<+Y>WYhDsMum;X=WaZiP388QVnpH6lg?l#XXyGEG(`^)k58YR?_;<**LCB$
zY(Uo2w$m7X`}yAs^YQY5eAf*}5KbvtCp<23x%>Xu^`ky!^ZivVJtFe-@ee75WqJeV
z7=t>jwU7Gf(3oy-tvF5H@ytn5^8G-rYiT91F&!25W2<)$IV5uH%(3K7EN>1G>l}=y
zi*tUS?ll3193i1|oI+Amp6~P@`F_xaRGKt#zN?UbJim<RmpI>33aUicdFJ!yzfCEG
z`DU_yF~TCY@1)=E@?6OctS3oCmmhx5DW;fGT=oO%gmb>RC>ztTTF$9`BG;N8k@Pz2
zX^*pTV>n!f<2l6`V>n(uSl7oyrW}`>3bizarUczciqs9du@I4J<+O6eN{-ICU5H6-
zD%oq{y8iU^N#_M3tSbNce$}IYeP98)VQg=`h8H&aGXC_(zene8-+qo^diwY`d2$4R
zxZGcFufMDk7IP<NWns#-tk#z*1wur{3$$-RZS`vqtlH;9<oxpEaC&ymiO83K{eMhQ
zX_huCHZcGEI>XCxq4l;Z1wz=UpMd0h@;)t7X=BC^2#LIQ2w43Xh0&qKALL{tn|Fku
zI#A}sF?8dp8;@<1%m#3K1J&lhfcr*NX%zi{1pu}=>*1d9xAaRlp>Zo;az3$2m7F61
z2qHsMTu4o&*!+_1n>C-)n>p`pFxbO)v>@(WNN)dmp_Z9S_(5$funua=n@uh{idek-
zJ55kKTAr%Z{CEUx5VyFtJnlGCcfVbMBw!nT0KEQzxNpwTt{N1kS0-s~!wuTgtH3*U
z*H-Oc{LHQV9d~gJW%WH+b&;rAYh=%QTdN@uVc?cp*SPDk%|~fQ^nkLBL6=ffZIwY*
z?38<qD~!Rr*%eJvUn7HCFWc5@zfvf)VJ6#gP1XlB7HHfA)#D>LE!SY>Q^6{|A+KLE
z22dLdvkfy9SbOuUF3lc$QwfS~EKRky5qRt;x<IQ=de<M4)deDtZirl5?A_AZA>bOv
zw|Tg5CsF+!3x@0~K}u6+zqVSpdD__!wp0d$RfPSoBwjvP5hSzV*Eyk$R|i)PF<FZl
zx7HOM<<=Jp?dx?~xJRi-x51_D9mO4(!!AMr8!SMxjLTKS|NDRa?>L6r+b?B~S`PAY
zxu<1z{o!4#LkU;P(SVnae?WB0{gpXxf{e8y(d>f9Ju%F8-wns7AJlyxmTA7dwO0yj
zqt*6KJ(3K^Cr*h|Sm%B=Ua>6jMWV~g=gjTZ17_L8zIRIP$Fq(H0Oa=iCHI}0eDiJD
z#CiY;^BobNfBaL|AGD1e=DP^TWpQ2Sjp1ZBY`(u~`65bl6;XZ1^XEU718K^qFoO&!
z4%>C*daAu7A87^lPUX&bhw}#jnD5^>rl`i-!kdLWP6x7-aJB)pKIF%j&*$gQ)9vdr
zT_Mxg3NTN_7pf7UtV!07Bo8Jq{cF#k|C~F+iaoo>IQwqEEH0SdzCsgK@!o%&_lOvl
zMW+eXyICW3v}@`?L=pQx{@s7hDWo_Hr`zk-X1A2~u}wMKZ}aEn|44B$M?@}jbwH?S
z2t-I>33gJ37T;<cA4h=Z3yO%O@$@pDp7pc%u2VO$a8yKGicwWU#s{d0-l&rO%g5il
zZd4I=iZgS%y?(*k;WRL2VG6d^<}AZ0d_g&!KMaS<_3K~sSgjKZBHxXNk`7i(&HZ@l
z`or6oe-+`w`GfO)O3IK6h;(}SoMMP!AtIf%1LAc3l9v$7_qUey1;QyMwPO#*=YBkL
zTts-fy=`dVAPnCrLq+^BW^XYls4S(VCjH#jQlj1uzU$w<{Iog(mG(H1t>-fIwJEiY
z;x^qBeWB{wNGk5g?ZnKy#?}dHyC}Ih-$eNS_SOEfh-g|Co9c>u=bTsiS_zSMz8lX^
zN@lQFM@hmGrfUdOiVFxh-vLpY@94bmM*xV+)RO=D@!))~1+KFCfSfRAE7~gFtC>a#
z$5=WjQ9qc-c)A=eAL6paxJcTDnXqPA*hNE;q;4)wNw4-!6CfoU!;@2tzVqEO-C7#E
z%5a1^ER+7_={{Yruj4q5<6y6B=aK02^wD*_-!byGy;S_wkl@m4#~pKHD|lV?ogWhF
zGZ4&DX$+HytvS2RfG#%cLW66$K|5z*bH-atbNd}_7k;;&(}-@@=TSQ|)<3s=iuQzF
zz5Vq}P31sdO{Lh(9b1-pKKB1gpx1uow?hnA^SB>%)$-2IE+Q_@v!5)=m+w&o-uB2B
z)Bpe=07*naR5|<BTB;e!Ho5ofbtl{6?tKD6sReUWX8mOdnz2Ti2o^(q6Cu8`NY`w@
z?Vq<79RW6xo$VnuQ~K(04S(f6R@#E>9dW<^JeGNw?37alx%W=XCVP?UN7bv-7VNDN
zBf}S|tsi$F1l!WQom9#0a#h>@9(%C;y}zviyZ>Aif4gn!d7h<E)>@o>ua?^>t#>ah
zKKe{bm02H2D4i(GTOGF3SqnwVdyHx$0qg9sSORj!LN?ZI1Q6{GDJ!eP?!|_OfoN@S
zwbxe4mMF5qAjo5r0k#?jsWtQ_Rk0Y!-YaDHs%P0JS2jTY@<;#Y|NP%nYx7P64b-c!
z`@6__?>ja(Xp)pHWrkVStF1{QTx)ZX4yPyeY3h3li4NzNk|(EDbk$*6eg)EW`vL+Q
zF;m=T=K4~0?dejaK{gl=Km@JKs?nPqAob%B5mN{vGTpuiOKeTkx&2$Th4n0>1(T_Z
zJKvAP;he&fQs5X;ve+{{G5N07EHqi$eaa52g4+~>u=L}BoYTxEbk1UM<B|&QHj8ov
zr0d7B!<F*1`mC#hiG}(2`~x65*NgCU{bCTNCb`M(LrGc?NhxSYzaNjo@kuxV@N&N{
z^S$Uc*HwF-`yv$wn24+vk}x^nk4H^J;}qjEX;<lRdhW*4GGC1Vu5jVHj<G$uKAzU(
zJy1?wrP^apDRPW|^Y{Nnit}{+X1VDpraUIcR%)c*!seQdkI1gG)34zBp}6--`k(^L
z^yuolq01zCW&W*m0M-e;IV-r~DRDb;M)mxN6!zHags$8y-w89v1rW#6Q@e45Wr~>~
z56W{{iK&e9qV{T4NgOXfAQE!`VRC)hZhU{3Z{Kd;ep34c*cANUs(f=Zin`$-DJ71p
z^M2lH*7-2#ytgSYRu?RDLWJ@7Ouk#DH(@DOt5x%f91^vwE?dYU;}}WW({1ZK7GY+s
zt^gp+lj<ajA`j7qTdnk6a)5jDT2z_3`qOH+lZdnwOEDr*<LghHQa6kUpk#TSDPBJQ
z9suJq>)?`8(jUs4I4p&J<*mLK5GYRb@$@_#pK^#?5aDIItM#jK_ljcrEttKbE~^?-
ztE)`pPvr`0Y{*tBDl2ECuvml~vq<8U4wnyQYPigIQW$;BZ?eacki<3<li}zFs5A_0
zJ=PXao5=SC5TU_`%X|ZbzCVOznWlR`41FdtDx0Dk4q7<NJN(?;A;NBZG}{Jqc6@G3
z?Hw-G(j5e@f+7)?0D_24xfhnq(-=fl(Oylk@6|7>(ASb0k0m6?wrp~Uq(qWt1?&t?
zK+<;{sbySB<d_J#XvSL90q+KhHD~5ZR4RMystlC};g?CV<>Ay;4@K=il-&Mm=YTtB
zKwOUmBopnB$axmF_bc<(ZCl1mO%{^0wb8mRFv*Ot(p({<)ewt|S<w=|RdeyKOc5SN
zm6eZ-Ee{>u!xkWZr@F;D-^KQfoFCEbIU}3zmfzdbG&bUGo6zhJYi&XAowXq!ZlZ`F
zE6GB|>(q97^7&h!>P?%qg$*wv-y`D&fJ!SJG|RrG7DE&6lRa(C8ndRNFv|mRP2NMx
zRZ%XRvd^{#XQ^Tjw;T6TuUZlBPVRa6E%o>)8KADiUD<Hr-rE`L+hrZ0+R7x_+t>mw
zRc$EhgXD&X1;{RnAVH-ztr(Edw7Asj0EJs*9u1^~vOCGnTNY(gV2vt!AH?{m18*j)
zRlbKwFKO8Wi>$Xf-!@y7iHNb~dTKyLW+Kt!G1ru+4e_oF|M9(Dp?M|wA_!`o(s={g
zTKClvRhqmO_grGOvLm(iLbUhNcRgnTA)8VkV^}byVzU#G>Gn+@6$>sGwpi3$IEVRO
z2L4??Y5}9KGL__I@hZ1P5^N|l*#(?p00c=UF;yEI>_>OPqfOoqV@U{_?{D=v-(<2k
znV(vCtv`&A??Ax*U*`}pEK^w}YDd*f78dsX0RcslPO!3|3tczp6sOb>k}E2`M=>l)
zxhjN1yZyA^1xM$`@dZSd`M!M!iaM@Yd96$X>j9C4rP!MUWH>yPR2M+(hC@G|m`#+M
z;;du2Qm8>2Pa&Xj#FWj#`g`R8t5KcB`gl+Q$^bb5#J6AmMM>rMm%<_`iD=DXqSLaT
zZH!SGs+nt}B`{f~VsaRzn(6#Q53p(~U{1N!TPzJ3THU;;>>KSJPYpQ7slaG9Mpd?<
zc-@**eY(t(rkd*M#C5~ra!gUxjLDvqOif@;3PaJ)?0oN4uZu*~nJ7twvlSJIe0C3K
z!i(E9(Au`EMWtuHl72#RPJ}SW#g*dB*b#cW&HIQkE^2HqnJ^;kyP@k3wfk*WPH83%
z#;FL?UCqH#n;-epp@jyE$UI%OrXlD2;VI8KSpC`?6mLmIweg46uex)y2NCC#2pBa{
zJ$E>Sp}0a73BtM_%2k`LUsY<ZchGf%)ty;lTCA?+07bsXoaeqwZ~5m(6|Y*}FHt`p
z+PAg2PLbNSM>!`L6~u}bMK}mFn855PTcsxDv~4yQHDWg$k(||ShjU&?ZKKfTGpRIx
zA^<}hL~8w*6eTiwkJ#&@no`KI?W#1y7=uV6(kfQpdZK1u)z$lT*<`N@?RFAaUSwIq
zuInYGVipnR#H^pDb)?qQfLOJwh|z95a*QcOjscS0!Wb-qp!^#3qH+q5mvWBN6ICIn
zxF9;$bx6*4ec}W$3L^-+uJ4CaDpU)RR&Bhmz=mt9PR<&1bie*06eJqP6ClR0<OPSj
z70Q|z;DFO6+*T#^&Urv8V3hWk4TrN{z!<}DI3to?!29dZNT^gyO==FNT`FVOdg#-u
zt=NucH*cKs+c&)*PcJ*<d({Uvc!5^-o3mu45zEvjt%wYVi^g7S72XYp;c$t|6vM<E
zW0<)yVyjLk`?{<>Xl=u67GCd1nBPMQRt`nVU2c`d;p;E|(hY~FPk*#-q(F)bbMath
zHwZdFcsv)DEuP2;Qi_XiWVsV=?|yP#n1utUYBb6<Nl8v_HX~tRey`xL^ac&r&WkEr
z)T6As_t0Pp!hF}z0KGw%kEg@sLzr$N66TxnQK4Qs?Z@lLgL>z>KEvDcUICohuz=`R
zoZcpq;^AqqDw#z^;Gple7Tr(;5qV@I28Uu5>8Rm-NllrkSAzyO94~EimDuH@238-p
zBr`maW91dsG7%bOrY!fXjs;xT566qaLt;>Vf=(l3O>GorBmi`}dl7;#I_E{ebsZ9k
zOzn_GL?mqyzV*fdh{$yPCL$bXVM!?-FCU$CI}J#L%?TTr5zzTwx3a{Mb7+HDCVK*r
zn4<GtTQ+2sO4P@}ZR5ib^ShZjK}?(yq6w7pKJU~-TkZ<kQG-i{A|iFek(>+DjXC=M
zC>(VZQWrVqGfI9zYAZ{>VA;k=t-!*fJ{I4rT8CqZD+Z|=GlVP>boC<CX_Q~<N}$vS
ztS@0Aq{5)e-JEqN1vjaC4U9l35~cPkXMEW+RcyL*c~XK^@@_F{b_@rp^{aJgHRico
z(ENu@>9gg`uBv`)b<${d{wyQbKBSVP#iW&;8RV-1rEN>X`@s$J9jQZ;l#XjNMAi5(
zCrxV7KgG<);$lB<nkL)!n#d*wy=I_i@BB)p#Kl2u0B*>VdD-8r1s=ry@3f7Ia|0XO
z#GYh)+xo_~r}EGq-%koy+1s%;LhN}i6f~4#2ij=Z*IoU_?XxRJZ^Y}lBTv|r(JlVJ
zDVy-oc(7g%Qaee)jY&MeSxZm80UcB~6dI?djC?jtvPVy(AllrR6QVS;v@Dg`lLQ0)
zTC~fy6_3q=gcTC?-HZjO?aKNba<x%_y<@b(%GcGpO*{Iq=C_wKRXx)e0!HBtiq=4n
z9Q<b7S|c80ts-j-B)c)F+J|tiwm{iyn@>rKS=8flS6T~S?EvNN=)q%Pt)Ozr)U@YZ
z<{UdFmnRw<E82cKpdKy>d_6;0oyg@8Lt!ABgGqkVvm{|=jHP63w{56q64OLV+tU_+
zvYE?9(IaZ`Z!21@`&l?^h*nD&MDU;fhyOC;D1c)aPfv%-53TAm%vVL-i12VYarU+s
z7qCf+Q{r62DB$DM-~Jm;A%$62M2gEYPX@GY+T7(aMkLn_AQHmjedqfj2R;Ze0}%jr
z!)Uc|N}5eYzVG^BIGj>OL^5;NE1|zbB=tmxc}9e8IB<%se;JyzbP#d<frxxRAh~`x
z`F<FV=lS-!++XMWHB8s1&woqgQka-iH(rEeTqfakd;8LMuD$Qbxv<QQHZ`qU(7$Ek
z#ajTC>v|muM&-{j3y9h$Wc@sIijtz<St9?CZ!S%1!Cc{+{#!l-7{9+T2l~UQACKDK
zUhY?QaBn}k9x93K&>chGE7A7@A|5XvE9F&jmx#-J3-e9aqGCdo)#rT2oZ>v`W8j=8
z6NvyiM@TG!Mm3|7SZ08T{42<Jny=Y7D^N$jYN$^!jHjp5^XC}n6qh(pDa_i{bj|@$
z3Udb2=l&VC*)-6IkR|hSC%rRz?}p>kczjB6W{z>5L^#Y7b0S4(`W^ttcV?R2@rQJU
z0HRypeEa76u^$d8#*{+?RQ%PxyjxjE=~#1G;xd2!+kZpOhxsa;-oF0)9>o}>(luEV
zU;xPb;rN6(WX<peoFt{hNfYYZ30X!DYPR1_3Z`+r?IpdGzg%v&{`^+uq4W&vcFwnc
zJPpT-uIdycbDG}1+AY(35<M9sW}OjmlK|tpjmd!&Fk9Zt!jV%PPcQv=wtbfah=gS>
z?z9v`tAk517O_v+=(2qRQe239v1Dv+HvoM6{eQ$MDUgp-5=f$y>TC^i-V4BTf8`Xr
z95E=&^K^4=|2j9q0!cBFbI+guR{1S@AH#GF7MTM1*_@hMN`-e;tM!Lt*A1>eB0vgL
z?jD&Vx*HEEhA?L+rj}yP1L|`pVY=rtD0bt?Iq&<S%9BCt7IV^;UO8Sn-&IMrp*D<}
z;Cu&&r>9Q^j4)k)Nh!v8>V{EsH=Xm>uRke?LPUHu=wb;i`xTkC6vb^D^4E9_jAU5l
zAySjfYK)nD_psQ$vN?nH%g^RD$*VowVG}@z8!7vH$JOT4+~(xTgY<dDtkS=m!`|^X
zh&KLz{ipUe^^mBml@LWxP~Nw>G^T8<HfY-MNIb?zKa^hr++J#F?(%AGjx~S{3VnU6
zG+Dj0rJQZCjjNQca(g5Ae)zb?2WWGhBugAt{Jd>lu7`S^7;PX1w(9g;Dr@=m_bQ&&
z7u?dU3M8!dMpt*DUIO_ov4tS8F`4hY!%!YS8)5~8)Pmz(hrcu#2%tF1vY~6o*?M{_
zEu0k9&98fYn#;P?*)?J&SxY;hO0lfnx>}9cwiD_Gv<YOd7wADg+7jJL=~Ltw59P?7
zaOA-PuOFu2wuvAk(7VYpxd5tZ_BFR}RhMToH>_`g?ElE7Wso~SnOC`Oe3Z!0=GNd!
zgD3T2Ynn;f)xWY*KoQdCE59Z<RNq9Yk}F?P9yai{GgR2cje=$s;lf2zW1qWuit(TR
z@gH)U9clz%J*q2oSa~@y2(up!&69`Bk@KNDH_#A~&L4hselY$>3L-M!uhNJ(^vCL0
zt09}1YCnZZdu8MCX*fQ$yPyuwoFCM%U(yl^aSph|Z-DOxM9RdbCC^+Pxvp&lkwvDZ
zW<)R9$&hq#0tkxYJzidlfmGE8nwg$OJ!}ec0LY>9Rw8KQA&)}aBh}-7(lQ}A@*N`f
z<4Kv$R^$<Z<g5%LJ*<JvO|d_mIdSuoC8uLsR>Sq{U!3n%NpELHB0Ut7_f&$ka<j|o
z36Z2x+9Jp2Pp9Y4ioEKEBcd6-^(Z~x-lQDf)6!@VMdR-D^!N1f4<gJdl-X@qrj_cF
zbl8x}*|4C@wFA)}<h2jc4M!rQZRv!Ge1{G4N_9qYzFWs0TA_iYsN-QdTwV_656n?-
zZnMv%vNh;U*D&<QVOUcfs(vquu%y%<&%@!|?m_eY`rrx|B8SekC4yEe+4e9KIkniA
zK7U)&ThKvaMw^0KI7W1Y=)!c>iLWq!{`0>vNEKq3-b7fJ(|1}FD-oF_3kb|g{loc#
zG7;5Z5tqBc$;vZm34BRKwAG-J)omM1pzamw9m)i<m=!nt<DdVt6k}X&NOXGsQK8!+
zNjPagDTR5xuOrm1OjdFt5_xo#ay`-VU9~?!M78rFA|Sm*=z+@jFc+pdja@<T+!AaG
z>B4uz>E%a6N8WP`DK25Thk1H@Wx3|oYiLojUDS@b$ICO4>xLsa|MulCrNO3kAvdmn
zRl-0{s8`(o>E%ZNxWD~O&O7H*44gs?3&)rb57ZR9i*-1<KJ!4@lfR@8^tTX^6912v
z=fsKghtcLxb}#g;NvS<7C^}Iid_Vl|@6fsF?Mq5QKb36=+393(0|Cj4pJQZU=euI)
z^1~tHN~EUpVnrGF$MIhM$E!%<5;?yH?Uc5D^@M^HCsv8isc}$ywN4u_uFa)3!s=av
zYQuVNYmxH5?C8f*NLWPWjIma-ZQA!48>REo>bg+Bs%t*g76DbyGX-yH7l)xTj;T3@
zJ_f0)e^%4c*2*;87Pa}DX!JJOc$0JCR^6ylXL##*#tNGx`{hSDWHkX>xz&ca`!ALQ
zcR82~v<H7FTyA<evi`=h8e11*_O$1#g9swuuhpfxR<QBEV@BF-Dw`Ey{QENcO&N+c
zt36ZGgf}bP(i%$@kZlPiJa3JT<R)vfg)*0cD+7Qw4zlQ4ikG*95*Yriex%<3(pb&m
z*IJn0G7NvjR^&ys{yA6x8o0Sg($;0QM9KMc?d*Q#BYY41xJHFx>nYs$6S4!J8neJ^
z^oQ?O@Y3v(O$QFzxbG%PFb5(wtv9Yc`D{Y6UTYHu*>Gy4W%@NWC9WfREju1DmWREl
zqShXywzsi$+TjWUh=9$Xp-%O3+86H1BOVq9?i9z3qPQs+TLXr14J#jG!&_SuMa3#Y
z%mbvg=mlB=Y&$`29V2Qs;28VkrRxuQNeTkqzWrP_CIOW%1)E_aYI<1~hOr6Fk;r+a
z8*8h*tO=F<q&TZB#saSq`|)J_<q(txRIE$gcqAf~x9E*DLwb9%%jt%?R_c_ZXp{1~
z<rGtjDrY)9e|FuV<f`R<)vKT|=&blpqTV<F*A0Mpe)(*H*UVpk`gaJDVi=B3!{MTU
z*~fl}{-m(n^EO?(5UV+`NJDlfivz6uPb5T(L&&Sp3aQXm$sR%WvO0}gD*(gcQdkG`
z{WZ*Y-}h)cmozOJQ3rQ<A;q|`4Nh!I`t-veSdwOi8@#Pd|H&hf&IlW=Z(YectH=gn
z7D;N1)q*n2R_g$w??>DmAIeUY198ZA<M9~)m_r5^#FV1tugcmVnV(JPy@m{M3LJy$
z26EnP9^?=)s7*K%fwe%<*PibNB!9TPAUaqFSBmg*do2Nwg|ej2n%cU__c<n)#?y0{
zZx$UTa=3gL4rd*`=;Az_KBTzZuV1ZFBqFrL&7AGm0l<9!mSQ+P{UB^=fcgFn>+x5w
zGiS<)w2K1(&~=^CBvO>DTvc>H%q2pt>C1LcIU!3}*%UgFJzib_G+J4d$Q6P;*AFul
z>4sz3i&8X6r#|fC>A4?HAxwq8I^VBZYKzYMltR+ko=86)$@jzItY`}@9SV#v%oC_Y
z)=KAF46}t7k_V8}%kLz`u-tSwM~)C3Ip@fwlsH9gPDpLyk%sfl_pA54>pJIq=X-q{
zy?yzM1|N!ub54XcpcK(5+FN6)G98<WFM^y`oVPhHbc@#5MF3461q6;!Hz~U*BFvFv
zjA1@LeLP%#5Dp?dU0+4Sd0*ZdEVZw$cJ-76w>G%drbSq)4^>-b$%LcF%ZL7W3DZ@C
zl^DQ{V$1p7fCDB<XBIA^#UgqK0U|nFJ~9XW*fA_<arQYI3!onkn(ipg9%478=_hHb
z;?_R#ZX^F8(x{5@EODIBd9>kV(1G{*ty2a$JE!Jsz7YT+@1-#yHV4Mld`?6ZH80yj
zwtZU4H~~<EaTk|V(cU{>9~*lqGoxUw`PK&ww24<a>9>b{y`AJdLn@8^8U&B@ILTy4
zAh_Cr_XfDRR-ipKSCh!B2j{|*lt)bSdnb4);%VnQrKng(A|=5M)~*?Gty8ybS_~z-
zr<P*4VWI8wlws|Ku;HRGw2TE1F8+-M@BSblE#KW<UHX`75f&|us$L@6I@wpV&y6!U
zqr}@m4k99Igf0t{FoF))-1^9ijdtuojPuYS$@VxqeiAuy9b4QI5sLFZbI72qG(G9J
z*@VDGummd8(6Veyl-(fES8YSEqyW-rZWj5i!qMg&uV*N-Z$V};0%2iPXCVUa^w2Py
z>zycSDrePZFoV<mf%4&d>*22_T|I@lHKGsI&_>Qx6+te6v&WS6%CnMA*La@7KWR%P
ztXg#D6qy`}x8J35$2O5bnzlS43a(~*m<?|!skt_@4y4RS1*;%gPd|)|z}jr!6!Xh6
zsgVGQ0GwX&(mLMC>MMF;6Nj}Su0a{j6;CsfM++u|+KE{=s%k={n8egMFRQ_(ni?62
zi~DFbM7C9%xf3lV93Klr^qe9RIq*fatssnCx8=}t-52uzR^ehEV2u6Y>|9q{K<EIV
z>&N^m269eu=GG|JGEunHsN?B_jo*p1w#$`}&E#$3Xffy>1YE`qH-!<Q)00F3fE1Pl
z&<%%;N~R4;MkMEaDQI#;@^;i?;VFkpcCB%Wv!0B6*Mmr0CV)yQWDo@K&O^?FR(E^~
zi_(e#7@)IQ9{~Z=c6R+}+B{BSz5}ynD&hJOZd(7)2BSa7(_42$wMkj7*xI*Lj6OPx
zW#-e<4<f8HBt+-PFVj`QPKNGnK9xGPbE!&gwMs<jJm-Wa1VD5|2p+8t5Z3(h^6q5j
z{g_N03c!lH5$C%mydzSI(Ymoj-Eh<gAkOzN-@C)9>qc#Uq!^4nO-`Q_9s5~YY#Ydh
z4;q6q02Izz#M)-$lmL=7Ey_8Rs2j!<14rk4=UlhUS8Nfo6_U5unXSY~85YjA;qmxX
z$SGmD6@UmLgfPJ^m%W^fOwCcZjxgVI8;y)C<($4oUDpAEK5;t7!fZOKR_KyND%Inx
zs!@Hv#$_sDNn+e{Tc{QhWrJriQ*$FqBvrH{AmDs^1CxBC??=pingj`oPZ66@Wf{X0
zS+~Hp^<}=l>b%^!4hj3=$ZX}lq$HJ(BPj)&I_GGl6a#a*!!JtPP*b1{I9SwNm>0av
z_cuejBc7gq$ZnI!oFs>jwz)B-1*-vA`e6-{hp419PC@cTv$sGF9xsgt74cTx8K)TL
z`?sI6;h+$-JU2H{Z#p?Ir2aV#g72K~5Mj~iF@Utp0?-dfjXe_9#VPvAAaWXMYfLWZ
z%4XiUHo@ZQB<f3sg~M{!evf_@wJB=}UMMz7S=~lf>Vs;pJf5dFNin6sDRGMZcyzwU
z0)5Ps2F(3f3vE{5Wj|_?c{#6pPLaUn!-X9UC<7)6EI_G0C5je6H0MtPy^fcUDHB1<
zLDdfjW{Ybl@(f7{=EXglJBK|09?mc2w436R!W@^o8h5mtn$-;~k`M<#YhgE-n+Amw
zL9O({sSRgPGf_2S8wA9cXO%g$>EKm>o}wcA3P+z~)KGih4I&(t*%pDGK*5*ZZx(di
zTL6Rz5+J9z#GrC>*A2S7tYaKwn64SpLAX|AaE8ri6YH)7Z<7|(oCXNnw!DH7GPc73
zKv*V@(SQC^L93AS9Of`z^`@w+p*46|>tEek>q1aBN=Xq!h`gxaLdX#SfCJ>Th|Hx%
z!4he*3X!PWo{Axalj=%T|Kj_D;wr!r!>Jn%+DH%6eVK3l;q3cE*AJQxx7L)a=!qNY
z3hr3e+F39s=0wir0D3N~x^{`J87MT2-Ebgs5f|rs=e)5-6+nRm@5uc0w;<IV`Qh}G
z1KfGOe&uFd9hZq?XtSy3`)gHvOgHr)5xL?KB0}9V5HT)y1DM$jlI#+U&Gfo?l$;xn
zPg(|Xn8R{2tH72ZQTnL)QME+L+Uv=02n2xn_KM`ldnDJ7XMGKDLVGLc&Jr~`3*9<&
zqfkC7#Gu=V`6hcr!Qt=}<AT#wGHgM)Ga#B*XYMc6l4!nN3UjWdd)M_<e29>>egFW=
z{Z;!VMDF<f1IG}<66V{IZ7}LSbZc?~0Qhbw)KIW&2R=Xlh(swZ1*6&~1aJySS)zrg
z?@Q-<`{F6y!i-46`Pob(nwrbj@hC|4Ea#~=$oI@CF88-QI++2GT&ENp;lvz-g<~M+
z1xYnQ`K*Q;<Ht%F&TJ@SPGP>qtY8wr@$|wehHw|=Fx^&Q?Jf5otAkKvxxbb1lZbdf
z^rt7Mn|Vqlj9xc1L|mpTr$uA5eRoi0Xf?d8+b{S)69=gJ3T<s^MWymWb24yBoC!Lc
zqIfMtZleaYTbP5zHGn>k6Y~(bVZW~$ck-U>p)qn4Q^zU;y%>V3`RM_sS02k2kS)T>
zm1r^WMhcfgt;DL?eN+Z*Z)%G|q5K#(Qg5}&LT-Gob=-ih|6JPsu!v~4s`yMYzFAuY
zlu12pe@|T?sC%w+9on%&Rt|Wi&5(Wjz4E|tUBVKg=B+f?xh8eqmI_-XDN?DhO<SWd
zTo3?A99w_imP$^Tpsb_DyaH7!=yWuwCo@I3*=~{{Ucjvm%am5I6U2grJ3-`$T+%A4
zxC^k_F3U^+OYyTw7n2s;ypFW69#LzNA+d-20gIa7TlOtBA&ynfRP!Dm1TIY?N-O`b
z!P?U1?Nx+CCU;|-O!=5^uDlCj+?*{M;%n_aO6F4KhzYFsSnNRq!aZ5V2KACF)ZD$Z
zNF&)a{%bI3mRL7?;|>^NWi@D|X&htDvX{1iUfKUQo{{x&i*0RTC;$K;07*naR5_t-
ztz5i4MMx#0YVp$TbdViL=$!6I<&za^Ls>t7?Rt~k^j?jU3JwDRm?I}w#3=>KfQ9>C
zyKCFKfO!H}`VeI&X@K^rmEf62h3EmJA?wuw`Q6c|&r(VvsNPV!CN>vfyPlAByec$p
zcCvr^$A2JlRirD8maO?smP&=xpwOo<-=^C)(mv`+S0|98;cH#RiBqsTng{?dAAeUE
z(CW3<{-N)Bbl!J;ld=ZwaXTkD#G))WyhTc`A4rw=AZeMb(`9TRR8@uk98QUxM~g@<
zGD{}s$J3MQ)J@}%J;h}MvdXwwJSBM`#f8J-`;mO7G8}Rake2(kY!m%(&`d;K>%Qxe
z+~NG9!*E#9K6L9|Vwl=g1ikai?Uhq>1vw9xQ`X{mdKyp9_t#(M`<p6ePS2mbAHw|R
zT-P5iBI(=D|Kfe;yhn7HFPgPA5D@9xU;o*4!{PLz2Txskak=ZkS(tU%gk|EC`e9^d
zRqdxRJLhv1E93FGA5Zi22H9HL^@A|S7)tVq%_?#i*Y_g;a!MkSmOB!W?}^;gr$44R
zr?}{))H%7$5|nzQYfeod!bn7xwn(v@@zvqP{P7R}sRq-lSt!LAaxk0vbC>&DDeq3t
zpQOlbQuM=dI9~L~d4Kz5zP%pKACX8n0KnTXe?hhC1Bl3Yyc{kc_1O&bEyXE@%8=7b
zS6PECG?fSem9W*1N3~Tr=f~3v3%~yK@AYINd4?^(DlymkxKR2K(e<OGq@ETLIbMF~
z4`=PdE%!IG+=!$MP;|~a?^B8?CJh(UgnFxDL0mVSo<AcZrv*%@bPx07yk94hH-29c
zwSQy-Od{7g=VDkkFAQx^rxXsSm($CSG0Z6~VY+FdR$h0$<S8Qd!=Z4D4clfI1QXvr
zef)#IoS6CT%fIHAM0sUu^fzj6Mxzj8v{)WTj{FKeq0FqX+&Lw!4l{q1wNarOG>%J-
zb%f1nwcQFzXPi?c@5^@d^!d-iNjLx?xn3j*$CP4<5t`&LNl7G~o<7I8++TmOw!d@E
zS=_wuN9X%?%esF13prn^y?Uxf<Yi7NSOYVkhFg9@*NxqH3d=1n_mmQ+WV8oukOGLX
z?*F=%5|Qq(^ZhMM_x^A;J--Mumx3h4(2u9_^du>Yq<OmO$f*II44aBYvtP_gp>&jD
z|LaF`t{;!esLMPuHn8(r7US!=GCPO!5fwABv?*t{%{D2~bUPC89i1`)a277=Q3AK-
zQ~31|L^~T6d937LiZ$(h<1%h&Vg;yQ%F_ySdO!EBqIjXz<hF&;rWILvMyn$wu4V3(
zj3w2yu`e}mp#)rc1#7L)+LryERvlOJpjKF~#!ItDmytE(vt;|j*1yrBK}&{4Rz+2-
z_9o^spAaqAP>Ye`)|H|UZ{mfqk@#0e+1hSl<zr<l6ly50|D=Sg?@MxIUp!@asz?2|
zz`Cx<)A?et$WQ)z`4(&Y&BkIR4Fqwk8(QDjmF2087g%8rtlvki`(jta)+A~^h_p5V
zkWCN*?j@yQ<7dE?6-8tnoKm01Oj;-kmDTZcL%f5>(>QF3cxci9R(D4iyf*TMf%Cf|
zzxD*Ego(6e@Xp>;><lX<AhvZ<{gOp5rXt~nbcjg$OLrt}vO=3c!)O3m1yW*@$u7Gb
zxRr!#wb^IwSeBk6;VRgseAP9t4mTVAcGrNliRD29B@GV{))BMSe}Z*mukY^_XP{mH
zLKJG|1-c<^0Fd}k|M(B(eiv)-GF_MZ+w<o?9WOtq1}V%}tFH1`Zu5hz&HeaD71S~_
za~w}E<N2jv<H|i-?%zNlrGyCGaExJEraLyfin_v8Y?8^v3^@=(n3as0!kprw{XNr)
zrs(^_<%d7y7i8iTeSh%%n8K1`Z13*v+g~k_TrwXIXy@x}J-=$$Y$Ulkl<v_agG9&k
zvz`LdGRH8hnO6s0w&|~ma?D;@RvecIJpJ$oavq&WMD?gH_t%UeHAAZ^(2BmP9s*Q`
z1D4e;0K?(jkEgC5T-V=Ue-TcxB;7weG!}=Zp#<Gf1i3Fi{+*QAZp0L3bu#E(Q%-u#
z6f`|Y*!SnI8vuoYN93M9{Ykf#u-w9Yw|sW}3+Bn`_n?S`M9NBT|GXcMiU3wa2xK*u
zMWYA<IxvY-^8G>6-XT|<h@fK<wR~v7REoSp^vR66bhvyxUOuK6IHl{izX~Ty?nJ^h
zcYYHBo-%@5m_PmT@0p{r*{)yyC71HLHVx{n3~WFO_t)}XRH#@JkQ6zl)5|9vb0WGJ
zCJ;y|s+2}H1Tw^^L+ebZGphi(mmmLxh)5l$g;NOg6oU!~a6Da{?^3dulpVq5>hQr0
z_FA`{yKqWj(beAdgY*3|-M04P^;2o3SXc_%ENd|e5WM^NhyMft(7EE>&bMIIq$MN)
z3CrAetYer`T(p}NmWdOu#N$XTi9_fQ=l*bBKRW?LQsUCv^WC7!B!)Qv^FR#0hFP^G
zmmmHH5x@QQpTl(PkC#HVtV1~GDz&4509ayNjG#}Ap4yy8a^vx-8;?*_{UXbBQ~QK8
zqDmr9&M`+$?7JQ^le&@5^K!omr(}+M@ZCVpT|WE{iBbx}Lat+u%l&Qb@T|AqHBzbd
zdeGfH>PklQ-494~IDc@yPjNybq)wRcZ@*AJ$(6Q^iLjUfBrLOD2eIf3kIpORkR<_&
z(l_IB7iOOe3$CXm!0N|UY}MvayrcC;*j6EEEmm2{fTbl7*YjyPIFvC-74$d0V=T<>
z_c2tsIakV7;BJG%`oZe<T)qoo^?kp?m0o#qq4le(<EOAX8<(zKmx^a>(Nc}`Z|yx_
zUE?y9G@3Tx#$1v2y#^SDc?4KR)Kovy%5;n?THa2U`pUVE<_chy^fu>zSd(yT%zG0A
z*iISc9p?tZJ2$$(+ptO*@wd9Sw+52xwtm-ZEzsEQt9vF-DYl&qsYlQ6I8uJIWqobY
zX`4lP9Gfw46<{cs`Bw-JQQ#(TZmR93FY^8Pwlcl6L=Mt0cWOtF%>z<a^%f>4jo@q7
zFjMaluB<rOn1sKfc?4@l8nu^H-wBz;MO#02tw9^}`~GElCqvON1r3KyRv$^~U^qYW
z0(;E)hi_UX9eLei?K-R;!@8*;u4l1%=GO`unjxID;q@E#o)l=^&Wk{`2K&o*JzD;5
z!w+#))n`acAt3U`5nqXqlIa0l4=BtG$W*jW%#{PG-l2c{zy0?Q>hvTQLe`P<%28Do
zlt#&CPES{K^GdJb6thP@F{cl||Br>Eo}hg<a*C>h+6)7<E)4UX(6o^n^ORGB_;C55
zKN^@Sg;`j_e6@p*YI)HW!kIpZz8_0LE;?t5i?NcOLv;Ok>c>+`i>W8_jb83o<H<GK
zud2Os8dL%S3oB2tgn5sr=MpbK<nC|3EYnq6|A+H4IZv)Ha+~S;Z50gE^f<7j+2z-D
zmf+j9I$l2Z<4I>Q*KdDKVc`@dABrtzrNpxMj>zkGFL^6wcn2Wg4TsC|>7#y<FyCXG
z%|2h7jVpu1YM8-EYqAf&`@3#DD$*$|HxZ7@LXJx8kz`?d32~jLYe^eWalCp$GM2Xr
z4YRlm2py6;zx>D?Qi^fDFY_I&O$w+vR@%iO(sfwU!O1xy&$(bi#KZZ66700d6Xxmq
zRreGHBNX8o<T&UCumAvz<jcWUgYh(hFNKLy(guceULo?`a2Uq3et(^1-mhQRv2CQ(
zG-hrf1GXKfuz(qCfPC+KH=dpWAkJ52Y06wFa!pfNrzjvCqcrZRxXf{xR89B%`OoA$
zR=5yzT$FUIdipvQLtJie*&WYyf6-LVe(1&{k$2t!Iz*apuNJ<e&mECAZ{jlRuj__m
zHymxp=8~MApaf}Uubvb+6(We7o<HftSA^&MC_M_A6eOYfVmglp;Tk0&G9I4}mk+ws
zQ`8u>Yr*d54fVsQ7#mTxnLSqOgiECi)r8bm<zFxt!+7q7gX$!8rJ?hLWP21+4AXLd
zQ;jqtNv4QsZ#MI-oQBXrBc@Y}k*-ITq_oE+=goHy4SQLecE_iW-uI^L2~(Npm6hBE
zr0C+GZ?ELMTG8@NvG*@Cmz)F1xWckF@*vQPqVag~!=a5m2=m>f@@RQ&T(s8CAvtZ@
z9iM*i-SG9V|8Liir{_;B{Pi#Y?7N;^r&faD_}mXi-Mj8@zof7npFT0ixJ*cRIK4<Q
z<5A_27OmQrlvthKOxdc^;FZ_NB4`iH^;~a~FLI8RhJZlM3kZp0c|f7tqr#1>jaSE4
zB4;EK5b}(yL+KWdUgrgNoM@usNFb|hL4*LnVUtzV96V*~>)fDp07;)Ed!yhsG)jRH
zx^yZ%z+Cf$N=-xILdK#T=C>C<l#A50Sdp?`Kg0Oj>)GU1w<Hw?5ujG>X9YyPwi!aP
zLxO&{#zNsFx@kGD=MvldI0@;Hqt=i0V5{9)Y)-20<iD?~`7$Pw23=NiwAXXCJ>c7_
z=+yH{ZPPXbOjEn9#88A~3~WCcw;@xRIb7D&W&)!lhB^@bPEEK@Mw8mA5e<IR8q`n#
zz{ndpE7v)(a#pdOP@5GK8+mOz_|`?<j9&JqhwCReGIzoP7U!M=N&&e99W=JpMj1f%
zB1E%_@219QF@^Qc%ypi^js_EU3g1=~T8;QIHs&9cjN)uxgywxz@ubvA0gA&Kp0i%J
z8=Rl<9rcqojhsv{H_3pcwvuis#CbJZ>fAbwpk1_U28fErMF6?2sC4mEsIO>VAmB>J
zxgm%aXMLWlnS`}oyVV48=LJ!DZ`zJ(#I(42VAm)VXokZ@ldsKrY`aLPdIr*L>KZSg
z^9!d<@19plPxb%P7Pp`8Z&+XNdMZ!4LFqoLaVowW#C5(O%j4NZCOQiSisq!&^zixm
zO=}<k2+N|sH>q56)wQ#(J(Sd_6x9#p`@#7h5#yo}JP_uaF?`LMQ-6epqgIT1zKQzl
zPS2mps4}GpAaS{~n9sKb{eeZaKt7=)$=qbdpd=wMWT=XqSwuq4pVC{d=Pd6#K<fI@
z`96k4vvx(8j3PnB+l~UT+LEv)tBLr2?8l>?&2^lxOgD8D>9(fQ=_(z`kadnhQqse9
z@wbsPAG98L40OaPg^*InC-JIg)=}azUpGz$03OeZAm`XbS?S^fAbrd<ITM^!D*B+4
z4P)$vm>Wd1Z^-CPElb6b?}wu~KrG)pqaLJDfHbwFedYK1e03aPTm{VvHtUW6Izu~^
zJ?n5eGN&9Ah1w)gmYxkq#VaOC1$)&<UPfOkatn;YT|eY?RTnBCIB)vH6oZ1)L8QNY
zM8p(k&I>Otx4en+hEa)4#w4dCwXn9Y-jAol`K4?|mBzv>z$pe0%a><Pc0DwV6A_U7
zFdE20fLYmTDa9qs$k8X?`F;f7llLai6I|}!fT4izvt2mU<a9}TG|%Vqa^ToH5D;*=
zzh%>2KO9cw?H;BpAZ3qiAw+T>_93Sxu-EyN!u|CZeePV>cf(QlA45xrMbqT%v2MzD
zNilJ9zRMo@{IQ$8y=?R;%ron}%{g!Qcuq3kzNsuDr2v4=d2)_Z<m}}&0brKAY73{B
z%c}3nIjn8i`U<zCT(ziaEok*6Ec2D(tZfF(qwf!A00w3xC!TeT-P#*;&}cS=lq@GX
zUrNe|53QYQT9ckCTs?#Xpr%|k>@Y)5AklbyD&f@z%@J|JAfWC;{UX!#tB3#sbCO`s
zSDfz|aIX$>*05hr0T6GmKkF(eLYlf+>5Fi=zqYzwO(@opskTtgAAdx2>QeCiNeciG
zS#DpO;|Z+cwhjTN+qdezNYOei+9i|h6Ohsj^d;y(Qbh3J$aTYTeBv<2aMx4YGF>?Z
zz#R*@3FRBBem3Pq@`vNo4|@0w^E6LyDTc7zA9WeIEz@*;^+K~i(qZg5KbcZPCJ|%)
zY1$&z-|e~)$@%`^yIx=6A<Sx7BS+=8<e{Ex#p9*NB>=u3j+YNHEHNx1F@@>=_KPqR
zRt%D+ki$xn3X)hvhVG1rAzR3i2G#wml0Gc=ocjnMqURoln7v`ncY|<BZ*z7ImC8&G
z=NCPA#xRi^$}-SxR2`7y9DoBrk-03A(pMLexZKyrSt94S)t~|(Qa7IJ%r$r9tjKS|
zcj^gLgku1reNAKr(-_1Ru|HmflTPVVibP)f+*-l_^Wpp<hFQ}L5TLk;m0M_et&N{2
z<7%Z0!wi9zB5?5ipi+zcF>Fif#?Fy<{TQaJa8d*7@$vzY?$<A+I~V4=B1ks0y#J4~
zcj=WaS<-~e%zZr~V!zHKpZ8W>sIG^Y@t+tXH6uVs3>Y)(W<m=wV2Xsg2Mt1u`4=EH
zl&I>edv9i*v(MfUYb|#-V_^O;UlIG{t!$|)Z)To|6>Ir&H~Z{+bbf4*ZDRU>3mNC9
z)8j|Z0itJhQ4wLq;?(2UkB1uKQA!I2B2+UJB3RBMEI|`y5(5P0<UEB<J3^Ojl?Ft&
zo<9SyM7DCn6t~pHh=b4Cr;cfGJwe)*S42EMe9$VnKG1D>p_b>BV=J@}FM+XW+yH!v
zAuMNf4v|ie-wfkHA6r<FnNjh*bR!~0H!(kqnv0v+9~BG)u$Wd1n{3N4euLz+txa)b
z&Y^v}3>0ql;~dtDq}7vytCS_ZW@Z+MmT8}9G6qcr&ZcYRT7n>Qk}{hQ>lpx5IIjeg
z)6=({f^ejwWT@bLM!$;*v!drj&Y)ccm`yF5Eepz4W+Ns5AjR0~RAW6s;HTrg+QgI^
zVo51GK!x?9*f^)SynfdDx7CrLI+hT&wSlfBnp8yA^NY%XtnpU%j?gHienush1zj<n
zGGxwv@A~yDjFtu6g28SiN~5t<*bynK1!eB)KuEj-hEhBi)S#$T_jEhy;6@%8AtIAg
zsw5z?2y>J&A#cQ9fopuY%8+e<0vJNU-gZD>CwSMkPtiga-lvdD_c?t6Ut^SDK@v(#
zyg+r?Cfae6jYb}83cN5^6jvvm9qri8sCPMVT3Y7X1#AFG$t*<^BrVsbXwtJe%r4Ca
zry@&aSB$o%b6rVVEZe?=k&P)@(@%5;4APYTxfhqztAT26nRJ=~O~vFWl3E&i(}oxZ
zR(9CQzb2b^xLhgcO!-}|LcfZHnUN_)Zf*w1DFL#zM*tH(((%i0TMVIf;MH)k{N?$z
zy1uJoLPac03?K}g=SOCVW>*&=(yk%5xf*J3A68kk73}P>IH`^cMr<J0oxQTqt(&W^
zZFE#PA5@@GD>1T+4=SikxhIuNRvXGjyRfQ_3I+-^G1!jaVjnB1TCP~Zd4QBP@>S0+
ztzbeu2urlR5s68M)tAXpjYw>!n1v}#<XGLfh^Uxc>Kmu-oy@5?Z#4V5j8-~l@k+eX
zMPTPXh+PeKwW01t2|BLJT%z*J^b~9kL~ZxG-ldHdMZXv9Jw`0)t~dJVKJNecpZ*(Q
z4lxLGST9gg;zX3>3Qynt2knFxiDCWn^FP>)jL4BAef%mwR*#}A<1L17DI1NqN@o}+
zL|8Acsz`NyJUxA@%Qvp)<@~JZQ0bQ(s%aV8w2>R9h@vitczpcm{iG3wF)YlyeEEcq
z5J($eP2=0~UA4m11HcXAFwWNj?nTitnUIPyKOj%ekMo@$MpcD}<qLCq{rod|KTZd|
z;uN-Ry{ItXxzTyIt;=q6*BATr_)X%-F{+}!bZ^-$1raq{u3H}!ZHrrqQN<D}J^uLH
zzhRCXH<3&V*AhXk33U2cuV6X907wj>u(8`+Iz4<Cj}MYvKLZGC%S*N3YUo@M23Q|B
zM7+FysVmZHCVNdLvCpw&g}Y%q-hTjqu)M?+!g47ZA%|U57Bmuvi7?E2N={Cnkle$E
zABJ&$eg0#Wy_54XY#J<=c}9Jp#FbuCLC3Z>^4vBCX7=Okhw1+P_t~K^tMCJ-O<gU>
zsgOBlkf%gBTAGrgFXVh&m+UW!txboXa;}mO5wOwlkoi_I6WJvP!f^}_-~9IU_%SSJ
zX1=`qQnNz!33)#-CytT4#?(a}Sky}7aJpyauwHbNB67|--LJy7rnuSOt{I||yMO<k
zDVT7*yu|gQ>@%HB4%4A!!n{4DR?*kT-~LsG3hUqtF@`N_oCN@<O+>=FaEjyMRI3J6
zYUg&A6Q>Zj^_xHY8xvNF$|7M-FQ0y2dH>`+hb`qvZGKcn`hwZEt)JOdX^jYf^V`3U
z+w%JSM~%DD#b38+5q|pS&yieMU-C4B$oWYH1G+D%2B1M%Irf$7NEMN$<D-7#>*qhb
ze)_}xhaZj)AJ*4THbPD~g>BWE;QBHiKKw|<+mBOVPV41MMQBO}JD1n0i_EO|&<~SF
zTafdaJV6xJ3joZ=JLiVAG^Y8B;-<Nb0`l<whvUPC<@`yQm-EYYcTUbJ#X$;v&yp=t
zN|kk0#;d3tj_c**Yi3@q94!sL@LbVSid!_2b%g5_rqvX9KmOl!E{J;_v527bs?FMr
z68t(lUOLmLCh#pBGHPUZG(F$#I{NE8cV+1Gyb=*Xuo96fMwO<Nzbf6Ui+~Lm1fW7v
z;?f~uNBXGB+fIp`loD6!@!Cd|;g=CRTI2=bmhu-fp#~a>re#^0<_1dtiu+;^jj;Dx
zvMx2R<BdCA#B=SMu@P*3U6Am00D?_|L&M<RF|e$2!rM&!U6LAB@LW5|k_4dQW6C#K
z-EE-3AwBQWe4qdjp~%-3KbkV=`sze1Xn`e#01UMr5Wk{0!LKMB^8ZC8qRHNJqR_G$
zY<olK-sJ7g0B+Zw;%*d-6%oNJ--#}yrKUz${kfPVO{w<;uGbZI0ETiqwSB9zj2>1J
zfPF4w;kzh6V}#?9*LIF6)wfig)w1}7Gr6V^bNVf!-4Vf({3$n`LF}I1OA>_bTh;eW
z*o&BUxr}6$`|Vx3`C=N*3%>o@W{lU;w<;iqdnCys2YoWASVsZlmVjU3|KY#>m;c<7
zv$O*Beke5#t{3G@Ct)6@LrqpB=dUA=;(96SPOAAYx%t=wiJ}>VcaI<4Fez-UT-@{X
z&*}?o@!X=BZR}w+ql$4;XK^hz?w-D#@18DSey$IgnVI8uIooYfn-4!s<h<J2s%E+G
zHFuy&?ltXL(Pqy1ahm2MqC@iA`VzObnzv!G`|`u6^cm))&Q&UAP~|To-GBJO53`<F
z+wua4hts28cvvrCI}g*z5A(~X-xsB`R4y`+d-(7p5>+T%55KT28V4`J^YM{WTrOV_
zV4Uwuw5L-l7m@q?^FIiuaXOLn&p-b?0BDNj<F|jVQ-n9r4+z_;6}0~QoG@U{TO9zC
z9{^xFoa!CcKbUz*DUtU?zOrvb_~UQ>N?rApfSyXt*r0{!kgaX5A{B+jaPYF#s#;rV
zpT{XKug{Pp1}(b4P>9UV7&7H$c^zAZs8`4_Fvs`b|An;b4Y%dX<;yQxN9#Q4{{8nz
zE-bGi>E)L{AW@dp4`We1Cv^cNaxreTmh|I<<pPxFQpY*uJ!MaQNHK5;1*}U~dqKU7
z`R;L??qawo(V**V5q<BQtP1O<?Lms$T4gG`7Qt*unM<N?wn_*TLf4Rug2VBL-~P38
z!}ZW4tQXDp)90>cTDq=cScTd7A-9jhDXi3t{Z#1f6%JAD&=o_z6<EcXEp;B~C2s!x
z4}XzIxtus#6w#MYzqh9I))HYi6|(~~0f_5TLZAG*Z~t63_ZXJAUFOr%FrSLsK34I}
z>+??{DTd&@BN{Sp6$5j$jtT{S0})7JQ>QltNF^nfq*GOu{cP)E9Y6Qh-kg-8s1IbA
z4&;Z!-8&?j4krZ|&R>4cp|g;2h!|E*X*%8;QE`)9)hQ#H)uoyctS?$O(O>{jq(pt0
zKK|L?a0*G4GnZF|$Eypm3a3g*OD~`PQ0E}y;f@nqI&M?<4<jP^ma>$UstBENR~ZHX
zOVtm6-0*^emWpiu0ls111jY8cBWepFN+*7JtNAnKY`$eejlSQFrf!r0Ds0GtN`o*d
z*{}R|vF?}6(x*|SS)_V)bJO|eGq|N<DQO(`bo4iJ*!ya>ByJn6y%nSPihCAzT&@wJ
znwUd1D9X%xyg5p$Dsj^r8Bcb+t@6IXmbPqlJ5w{cVR(ZjkJ4<RFk1)IlG#KiHuS$A
zM&Ia~@M{fy>(2#lWTsykI)6pJE#0cm4R}*RV-+I-U_Z7nrX8}wRciHZht_*<ZtHN?
zhpuJNB6s|?a>}Y6+0R`q$gsZ^^0oQO*W~vFv#=nE^-^u$h>fdU00uK8yR}|5ypXxt
zN$bqd?d;iZ{i55?4~@%q8GP**D%N1ajvk1A!pbYp*Y=&exs2F(q|(WYM`2qCMLF0~
z>G$@E8G^El9If8#CZ=-hZb%nGShtA+(<2oA8Wa`M-g)7=73{tjyMJEu$QpgZ-YaP@
zrrCq@n44%9GHCsoOtbz5MD#!ZxBm$_Kg=g0cYJuC!WP4l4K0g@dM%1MMJn?Nl_#gT
zVV8#@+CwlKBiaJ!S8C#PdKjlu440gIhID@UL`diyT(ysS)GMdi7Hid}c{)9u9zJS<
z{5T!lFs_%E5;ccqcExITg(a{Fkfy`^I3Hhr`9~3+@1DG$zWnm<$@yVAfyi?H?1y<6
z4>~?)^&_avY;||z6t)Wj4(g>;aHg=FLs*o>s--KC!-g1XxO33Fd;3Q1b|(b%<CL2N
zrG_ISphogFdn6G~TDtx-ReBU5%9c`8FD2)FMlS(Od#!M8(X(@o;jY%$8q1Pp=7=`{
zYQ)3cBe@}Li;}8EWIMlr$$xNu$YG&ngQ&)Mk_p@hh8?Hf6(T%*{EZ)GjpPpNxw&L1
zk(XJNNTn>qd^f5bTT)CQNdp~=JdQO7d_FyD3nCiG?|%RQAOJ~3K~x3r%I@Tlt?X_Z
zykPEuZtu(rEog!D?)$&s6qHL$Zrm<k&R=rv?3`B*^pXJr=Py4IIp@b5K*g*s#?Jdp
zWVfz8{r*)P1H98|lbVVZ!A~w~oOgcs=Fk56_0u1pfBHKSk(5sFzB}AKrMT&<DZ;~a
zkd%rg!cs_siBnQ?zqQ65#<B9lN}dDTekg7$fDH4I$f<pE;iFE%B9fT7CbEeL65hZ6
zp?W}X%WI~ys*^iNWAtS<b<Uj2jFr~ou{AC(044&6FP6>ftgZcoW$VP&xQHL-D&#a-
zZ>({x065=0B9dYx>*cjJe7CDFJ*zu9C~KH-wZsIX!|8FH@AOV;QrL7jl?e%7UO$x#
z-I!v`24k%r%$}|(Y=AHrJ9153&B{U$^@O{^PBdTu0Yvkpbn2W^gq+r^@`Eb&&WS_E
zhY$1dUX$)qTt(#a@)^6X4#5;;9f;bpZA!>b%b9Y;qmV_^N+tPmuCsqX&eP#;zI)OS
z49jbZ>$WZ#YZM-)L+xl&ic~96fW%2y`{R7~ybUBG=OrZ*meB>8G~`xUNw*3_lU%$j
z0&0Xx<^qxPl&C?x%tC<DDdoRj*jF7GLUj_6QXo;LpV?GJ=-}^?CF06)tKI@R5~-r2
zs>ehm60Fdw+IEm1BxM#{7w%OYr8D&dZ)COS>IwHHk{Cj;7RH<k{N)^p+p$Z#Oq?<h
zt~&axZRaE+ByLCSZq`KkY>t)x&76Q4aIRTYoT5T^H=ekN%~%CsX<{ldj!OHq`rN8^
zyhmt<lO~L}I7u7Sg2>X}*d0pIh}j@4*)vbN0Hnq&a7E(%l_`Rh!OO387g`JvBBR;9
zr4b;@b|8HhQcK2WuZ|9tD}N)L9c~DaZFAa!uClOBJt0l6QwiZhq{X3^>O&^b4asi|
z5lOiwZ{GyD87l`!hzvk>-Ea!XWzM8Q8pQ|8D%r2a30M9PwTVPa8r(J3()HzX8&$yS
z0527P%L6>!!_?3U3c*{7%ge2KHTFcfGB^~?k5rfx#nSJ~JTDj5P76E%hTf(5YLjdh
z-e8RZtK%cwG~n(X0rC!}lglO!sG`z}DvJmqksC4yM}#{%dd~XBUH0M4z1=vsuo*dH
zAs)A+nu>W=KadQ<H{-PIyV4DA&G518zWJZ{!~OfxzRL3YteL;sgy~z6k6(1;oKl$V
zbu%YaGPR-*YNvz*lylFO-8dcYvpP6agW_`jtSy~Uzh;emQ<|54R5kBSC<8#w&v#E+
zH<6<(h6`H^3n9g@3259XF>_J=g2tfN9Ve=a3ju(_dQNd=P7q;R&N<&ItQwQ#hN*ZE
zH+7NfnY7B|7*Yx;<XH}<m^kWfRkaBk@usTB^N_T7K9ns$v+>YG_4P-iu&_{paI>P$
zx%uvi$Y~aFN}*=A?(B(oVpu~JK_o}zT|z`~`ZHxvv0CK^Wzl&J*ubzZF>G3MId?>)
zaXMtLK1`f4liQjWrWlAw>pNM`+S&MFa>Eq2ON!fcxYNE+y}mT&4G@Rvn3t#<Xz*b@
zOIn8MgosG1a2n@ReY-M|lGzeiR1xLJS()XP1mT=#VJ;%4>%VL{pS{_%%*^FZmd^t@
z0K9zpCI1mZa)a~ZFwW!$mwn)JqoMCe)^7GrX(>i6fJ)-AL3)U^bJ7b?+(pr2<<S9P
z)S)Q?5jj60(dR$@eOO-A&zb;J+_uY?ZM|d#A+sN65zwIN6a)0C6is7Ra}NM1+;Tk<
zFz<%ds9i)Ox-2x8CqSh_(LniP3+Vu0IX~m&<?iVlBpilWgn2y^fH<ea^eO?WdfCPa
zRN*<YSniK>lzLTXWu|@%rbf?z$E}Q0Kmawj%Z&e0U4``wh$*fLH4(XSIs%gOKE*9;
zONaE7_^0xX`Trp~t;O_R-Yze3Tc-I=EuV;7F$6$FoDTQOtqALRTh2``S&D<~iB|4&
z*;p76qc9?|a1JcvG#>A3>N1gY<Zzg(gIF=dZ~L=#Ohq8Uio|To`B@P=O$lxkB&5Ur
z2W#KY963cv2@r<qi0FoCt`{2%n?V<pFf(U&9zPyxkK{}Te|h<&_cnzsr7+GXDDD9*
zx3Ws7T8T&K6iqFx(c}GlR$d14`kFQJ;>4lOEvY0{6VX5v5e-${SP*H@K`n9-U9;vB
zH%tdIM76M8(xs#0J3mwbuLg<bgV3e{n1c}AFrS_PAgnI{dB==lRg#`AI6qD*cQYgo
zaEd~x&)&Ag?SkZ$ilUolDrR>g65|GO1-L8XcdQC!5!sfr^P`${q!{D2EazuUEl|_#
z?!DrKh<aCBtX*+D@0gqbDAWuA`lN4RF4jENeHajj`J|Vz2`A>5VyJb~j`e`(d^tyZ
z2%4mB86`bK&y22JV`fY?5GQOGgP)%eahPU}8`NO&@-$mG38#RN6DLwwSp<OHFwV#O
z3#S;?>3FC5jTGZJA1gC`m=1AWVp#n!57QyVO;#DkgHrxD#pC^ZMUUQU*vJ+EMgdLU
zOANO_(dO7-<{c>IFmT0jN=FF}2@o$YzmOXbcTYs*ym!Osr+FBUemrOfHK$E&TtrgA
zB$om+mIgiK`;0kNIMZ|qd=Y^$AUJZl1V-g!&D8-_i=JVeMfmxrzeglcc*{`=+bUe_
zpOU0>_x^iL85Ci+Ej!n%{2T#TVx~UTd%=1|V~QJ;8`uOM`4gzp*7Gi@4j8)rofnby
z^)sh<_wHLn^5dMHm<YjnhLnmAt<swG9ju~Q=tQZVhO!ne=$z(jXN6VakZVKcoV(#4
znW3`oec>2bAZ%yNBh;7I57RK8h-jFO>++JK`YNZs-AUJr%FrfcTV6OO=SLzxPBRkK
zvlEEM!+quW7Y_u^Wj$ABX$|9)dIBM0sZZ+YDjx2iI6>l)Dn^bxYUaCgqq=!I5$-qv
zc~*ic25mxgZ|E9JN5}j3DQ-2@HHIbO7G*_%aXOJ74tI}LSaNy(#d?-;iW+u^AT*4s
z_b6iy3EL${c9<sNaQ~jj>6x{>e$IpEoh%q6!!2g9_~H)L8Rzwc5vVQa4wIBNtCwr`
zN3j=yItDB4SJ6UVQ|fzPj6TvK7lR@ol8~_2OxN@?X%}MyvWfz|+BbtG*f#mWe(qhp
zZ@{E8XGts)5>WQtFXV_yI#tR4jwV|RVX#>RHtL~mIk%D!I&3AETp}W(*_(PJ?DO8U
z8>B@Ih{&(Odsyi+B3IMzek5GR*HUg2W_18LRA)#v;3)3c3TXglXNRT*Vb0;YN-Hmv
z?)EiBFqfrsIf)lU5@^Se?IKyO1sUxiH#XwJ*o-i+bgl-T61fGB;$F*NGp_oawI;wQ
zKe-eTP1m34X}ZC6+3#|5?x26iRd0Ydh+x+S5v7|!t3}4<$|gWkhmlg~PE|5x^aj^g
zR2LO@q#I`I61n%Or~#ZEGD)E3=FGbAnz!{0aR`=xb=gD2B4)Lh#c2>1>9NopN6;_z
zD<P1{fFQy=`YJO>6#{W$P=_`q@(fHjRRUMrTGxzfPJp)iLY%Q8ZTE*hZXV@U7i)um
zs|?64>4LYZeL-`K&^N3>ysfJi!@7E##VEUs$jn|&R^g`^zr~6<V-L_AJu`%p!`-?%
z%x+`G1l9Tspc*_?Yr`s5(V#RWr_Z`bdyN?5U;m5$wD>RF(0`~tx6Yi$`5?@BW?qEY
zxwcM0ozClF`R?1_vFJQpjf>99`B}MMI=RhZ=vn$5?1NM>Z*OYMi1hH`M?W22KmQ@e
zoU+u<)Pw=y$SHy~T}%;;$f088N(OO$EMxg-<r7GByniajp<4=D%Gm`-M2{bT9LB@T
z=S<HP=F7{c41Ad-UYX5^uxZ{xxjW7eq>iTb98rU-6ouK3Q(d=J9g%6!N~Oq5^dyNt
z{@LGfikvom9a9V`Y?(u$QUpW3w|^P7cjr+6h{HG$xouq}OOF-4qdxQ%R4|}_By9_p
z{16bC?;h31tMoCrEiWQMl=(y{#pU&jJ*}0$o=;kGi0Frrh}PxO^tpauPN_JNIzLoN
zT**Rn#jPJ|Pi(*$jN4*et^IU(`sU9;{cI6YiR@uj52vuL^$IQdUPr<roWs^rWM=N?
zyMCDN-hJ2PdWb3j(61h*BLIZ;RXDB7#aM+UEwPOQPM&0IFk6Pp+e5)y^SR8xY`%Rp
z0ifT~bt_3Ruy7Rv5V^aj?{t?>VM}QX>m_aL?$AY2=S8f08XNG&j(1e)l-ei+ixG$0
z`6qzL^74tC_v1`{c>n!>xSXFaUw$d;lQnw2-Q;nSl(zMfMLW)s8`8GKZS~VkZq!bu
zwtB@p4E!*XbL7XcoVVqy|I@YzMioxOba2i&@AJAzsrb^>nNDKnv@Pnoe0u!&`0+Q<
zICh#b5Qgn6%<J+B#rwBLqo^vpz&xbJ4tg`m`FG#_u9}l^iaG&VUZ1rZuC_9Mm;fX!
z7fsqB=bUqD@|>sg22-sv6)f){r|75IxgmF!oJ3@tkHYo|?)4`MjdnhfN^HuB86YX8
z6iyExrV=HjPvr9YtOQH}Szo^tLYXUFc*P#19Y#C81t(5H)iP?X8<w-?Y!Hzq@H~9@
zQIEal{CPb;!<9<hXXgueTX!r{vk=f!!D3B)s*cfeH=uE9(WKm6NrUB9?Tb5~^-KY;
zuWKWbW9?tc;7Wdt*nO=X#=hAF+(jXy4LI&x=nQeIHq9l&1Ds8f{+bg&Uw>eezP9PK
zt5y!u*f3RrYg*ziki}GkJNG+;KS81W#?(JI*K+NcVA)cICxX!FK5FN)+r+iN?#TbU
z9z9Pt1*;cS*O*{7UMTF==0t_E%c5(FQmnSO0`T=z2sBgzt60Wn>h|VhlbuAtXoq-z
zA52y9C&caT@&=_uN#BTZFuiM&C|6vr9RoQ(3(yENt_}Hm1PGxE3V_b70B#AH5O#2a
zVTn5=hv<w4g_Mkljs%YYHrTV6wprJSt{KI>)c{z6o4pvcMgnM-GoX=9h%{-4IbhH}
z5_?h5tUlg;qILC}^o$(+n74<Nr25kVSdocMQN;a^G(@US6D0O}zp^hVG4A&261W9X
zG&Z6j6H;euP+Y^a-ch)*Qupb$wWhjJ_(@4~DaqqXZ{@e&Vl?B=@~i*NfA^n3j_U)p
z!cuXe;Ri~E1Xb8jC-+$qA<QY=fB0d(duN$q>-o7_A*2|xs2mB1IBco7E?GO*w4*5_
z0pi`$H}mOXTP`|*Cvu;D|F_kFGn4Q8`(pozW^I>Ar&E)pRBfh<Mqalh)o#aa72)Ol
zoWd5?S8c23yQgtF<$gbHQds*H79YlWm`*WV;<gOa(T|5OKmEP>v=O<>mrvLP$f&kM
z%t@?okY*Pk#%&p<!_&v#h{(_X__z1(zkB-j&z9Hc_57l@beInasKSgQ)t>+$td|tG
z91U;Vbi{F*iQH0ZE<p6d$T4!<Xc(OzHL4prO97=4Hw*G=mDCmTF=&pwj;Ii6K0V|E
zn^_l$KJL054&$V`+q+H+Y|MHsTCwv=E`OtSbVxC&puV7|vH9MCkQ-EUokv7Sz)90W
zYVf+gjdxGq>aPylC2orr!tz$EF0*P9?5fLrfoup)ew-gZ{E+EdSJb{D%tu80^oPI8
zwKJ$?xkqx&d*=t0kmrO>ZMFoEoSzPeIE+)-*|?ZDLNX!;dwF5K_;FGm6BHs+<>?sd
zEvQe0{?Nny)8X!2w#(SgHL339(@)kU&q|w(V)eG(R8-fW<2xd!=!OXa^tKz-7x{5k
zXhHY&?ffNdmy{w1hjkTBZWsZfI)OPqkRLckjm3CtTPVi*4RhO;*Qhb{h~s?J?OT|2
zaI1}`>rDoBYWiI(sjVl+aJYLK<|DbGZt<5dKSPdF?S_RF@44RTv&tpA5XgM@sDYFf
zRt@XIoW*R)>LNFY6dNfOjKK}Syi&AmW2%nx<#h}qT&gRs?P)bG5Kbv|7Hi}OVWnj>
z|6#>Bjt}pq!yUO%n@AD4ynF%>4x7!9w^!-fCu53hJ@=IY(%U#(&5@c!zVr+!rWEd;
zzMD>uRbLAt9;#pydM9hF3~W;xnbC_F*B{#~6+KHGj&vn400RSSo&y@ot}=v!s&i-7
zOef(SBHRM8Zl*TxZ^E0yFoe!Yt5y_w<8IRUTDnOWsnvQHsf7x3Nz-i%SbGK8=QYB0
z8-clhvH@{#*eJIS2!Ou|++$yW;;x62>w(g*(DiR~<r@G8RM-$&Y8Eh{Q&9Js@cq-X
zb>%H*ujZF^n*=WVn%f5aRRz7lh;od8Qn9ieUgWEdJoaq+t7?qj(1KfwFT~w_klHK?
zbYOz5Ub|;m<~TJm4&_&&hn<QDc2>wJ4VBTkUDb`CNzCpBNoF`H=6xyIb!HOP+@fzx
zznc$47HAaNxB$0^8|ifhfH$7>)hT%OKjp1OeCw&@fokWab=$!qAK_J<f?4KImBDxe
z6tn&VZ-~CJfth$^IbyTtq`V$-`^Vk9V6n~;)~-z3z!t;VBWSxxIsO_NXWzlPTDrmJ
z8<+?7V8$DYms^|wJ5q(*{NnW%iU0Or{g>umus$|5V4V(kemp2~_VV&e3hVv*ABs)8
z0ALL3wp{cf4C73G)c!_IYqUyDVMD~)ERur1g&QFv=jWfow!Hi9cX3-@KmQRCA3prp
zY5tmtrG)h?%;zt^z;%pdt!t37dK~}|!dkqb3fn4f7lmI`4{`tD2O_80DAVyCN?>88
zU8(sQKuRH{I1FRe$m{4ehOHrenGI2Au?YaD<DKU9$gbth;n6(~keiYf>!6EM4g19+
zD=YzxBFx|Z?mtQ?g!PgUt`uX~H0@oPy67ALa*5h0!4aS-Xl~FHa@E+@K$)c3D3U8*
z&5JQE@-1*x!nWk9YMk%ie-D6ReXZ)6+VbjXnViQ$M5><vEulVH=*D7%dV|OLz|3`i
zT*X6x;D?dOg;htDq$=7RZ`@^aqNUG?a=rn8c{<+D_wNaboQvC%(zY#&a(KF(6w!OH
zp~%@jEJfzjq!Ge*Pv1fz<!i3D9jz70yPThYN^y%}&9c^7C>1t*>q_-z3J>FfnPXUT
zf6Sax80X_K9hI2iD#TKBKFmdf)%L7xHxZVzfT$69pQop_a_qc6L;&&r-FJSN*5$Qs
zPTP9cEBC{s9Aglf4tIdCU0#{_<<sw-_saf_A++I1iEgO534kW;y^0-)#`!cI?zF#I
z&d-$(6}P4LPHWx_`S|Ir8FzXZ=Y80gxUH2mkZ}}E5Uhi)l1f-N8J(Wiy)H{_!?tgH
zH3+w?)%*89`04P=zyEj8ByON)2zIViF{-`fx18}MX1z{lXg)paAl6h?n8K#>NY3;S
z8Rv$b<PgdtOS6QX8g1VZ^-KG~%+7hrK#LSpEop#Ft$Wn0-v}J<-hFqtd$Rrz=g)u0
zd9KZ0tlb&xW4X#4ips&yDZ4%71rWEjqQ%2>K+xS!#a95#F@_X3%^57l?f@XZ9p(tY
zg8ia53NTR6hMVb^iT(mCf$0nY)EZSOsl-m-ZAF9|q+c2@a^;^RYNTgLuQpLWMJ2wA
z|GrVZbrn!12$!adg%d+zE=hL9WKJYkWex#BNeb0G$&wUWWB-~jl(YlUxY-(>v<RgA
zb>c2NTe!xC8T&_0k@Xf8d&y9AjR{P#d87I&V}`E9u}%l*G*_{jr|8j9xMIR0CMW!Q
zU<NigFsDMJS=Be1DeMP|bs~7(1>!Z8y-VH8cbh@5dOqbST@(}D4!0SYh?Sz5s-FO=
z^`Jwhy@{RWH`cMZzAVh(EYRi4?tplMdD~{vT&S~zd-wX?>07oALS$Waf-IaQCE?79
z1ZMQNyKKWpE%P*LQr-S;W1R-&&CcHc>^V_sI9zY2dAo)DfCxygLUM#8ovS!YXN#Q6
znw@)*2umtfh`lTNt&#s*Z9KjSWQcX_BSe(c5fQH$#8O<nZh<M+pmZi-R%f}YDt^1I
z*%4x)A39o!ZvN=(jeu7_P?|$qm!YtG7jHOa?@7IHc<l9er?7LcX4rPma~WbSToBwn
zkGG$i*)35diCk;*#mqqs#U0V?8<@l84EM*Qb#NzQ&MBRMnA97rA;q$spFxT*da2)Y
z)ux-cCd$T|*uqL}58GMWmwe#0B(h8vSYAG5=^MlO^B?u557Tj&4&{qbr-;I-<ttW&
zc-iZ#0I`He=K{Q@u!=}_SOplSgY%=RN;TkK`_~fd1I)P$*W#n8o-><tRr6aY?)5gW
zD$BDpk+}tJn-{E{#JkX(CRr;BqcUDNCC=x~P!y?{!ln}uWvoGQ%&L?s{R$!{<UsEX
zKqeW-VoSvxWkZKj-MB)y83qAn<I2nsV&-)J?mNWngcn1|q9S#0%}h~31a<03A=E{#
zr+Z3CKS=GJ#LV+083H{LKrHlVaejcpeM>1KCza}(vzCZRNR>7%7rST&2nB_lfH)7%
z4?ZIYLgd5^ntWR%<T10oZL)m%4G7-M0!0<2*=#H<ewb=s$Z>;gv%oQ|`nn;KnDc<h
z>s__tMRHy!4_)*XAm>H0xp`a{=ETD4NUo(cnt(b_UV-;IP((mC&iw#M>gcqsykb?9
zf7+K{R&v99tT>nR9<$91r?_QKW7q)m7+X`+V+>iqr)GgS2ANzL_E<%SiBk$;IZIME
z4|Ky=@04bcv679;8<Zb9GfT>gK^Os(QPv_6GXf;24Q1JnbSp3<8Z4eunSPvG0G)uP
zgxI;gSc6>Mh_b#-qd-Lt_wOoro>HjE@+yyO117N{j+wlqWq~0i<uS>&ys95o$tI)u
z^r(N&CU6ERk981H;)aDBv@T~GNMb#CEE6%mL1p%@Y4YkC(H@Pi-r5_CbBZB`)en;!
zMrJ;L`T1~qL?Y%S49<@LGGfm6E-{lz0ZG8klFg2$Kw7q!Ff+s&Q*8KXNd!eg74x8R
zpalfWb<mjBDwjkFOZ|cvHVB(dfm+Ych~$SsL}H;+*YZ$r4~Sr@VbGcioAZU0|AItd
z>QDviE-#<dWexydKmSqx=<)HR9}g|FIP2Y$v*!(Sf#3^_jtI;GLO_*CUzS}2<4iG5
z$LaVG)-y}ebnI|>Mc2aKQ2$VB^bM0fftFCN>frrBm|Z}VFki*HU~?Ij-U&*?+Tzvi
z%w9&}q&&G{OmVBi{9qmB%j8vUnfy3WB}}W(UGJu`*r+A;Zljl-uN7pjd^sUmQan9=
zlj4@OC}9&5XNr&~C5016VYyV!j^f5KETu#p$ot+#V9!dZ8%?fR5E~4bf{1I*d07qZ
zs)!<K2aow;^g~dwLO=Ln%!#<<2*B5@8Ne7WDqhrQy6aQXIW-xnZ;DxaGM^s&bkKjR
z1z!xSh#ng$Z$6dC3PjE`L?~Vs^)^<HM$Q>1KQqOsw2u7RLe2!$i2#|@i(X6u#W%Rh
zyr4!fmi|x6KCbeE%gZmE(!1|}SC>TlWDzx0N!z;OOI<I{kNMqEQ(VeVWPcEr6;-cR
zt1NYz4eKkp0TA!s|3LNf^4jeCf?Sp-PKgTDLNYj<cXp@VK-CDMntK%kMV*Q0E8~2A
z1Pl>1_OHB3*CBaod7)cbes`GX(<8ZooD-45-IL<>ARM-H4reeDrXA575z6mHW)zej
zCj<Zp%WH+x$q(d))6++C&X03@+=yvAiwL;^fG7(LkU7P$xQs*ME=|canv$9~Y~rLV
zIlwRzc*S&d7bQ2@iho<roZ>Ja=i|fW<<sT->2P{LL?ylJ+HignVNM$tb_k*qW&ySX
zvQ+=4h=z@1gf`_<pcJz8MX(cfl)CZu%sWu8Q2=B{tV-=)p-4z3wjh2@h;1k#XlMYp
zg41f_Q$66c48!U`Uu76=T5enK5-oO<x_*U~WC(;zs(7W6o3bb)z4e=~BH5(-nKy>-
zNJxTGEr73u6jmc)=|3t9#kU0?`Niglky=26=(zwl-7)&y40(&dZDR8FVr^+p5N(94
z-q701YI>1X@b=J!K(WKv-K{pC?;$}uEjC0Ac>_Wu>|&N}X4#HEgDs5?#DXdvTdHi(
z8X%rc{BHnoVq6)aqipC!b8V@2!F9U;!Zr`ME#BBMA$w9)MrQ<jb|9mmw#9Ya{uYJ*
z3Yj$HiF|`SmB(FQ6gvsA0So*6qzI+)mK8wb>43?%1FNG!0aR~m719uS6AOy=Rmye{
zP`}FpaoF6S%`e=MGw`jK&ul?iDCxXpTQbndr!H$%otPSpr7WVx-J`liAQ0|7MzDu-
z@r}qDY&<eCb}IEHD6u@vr8!fq^t7X9?jg51dewSD?NP-Eh){N{1p_=L3vkufM@4>!
zq{W|bD%A-Z3^@buduxl^nJ5j9Mk}Ovi#t=L__^a$<2?dI{5SvdpXUZ20G-D@4=gj$
zyP>6y{W>Ch9t`;LQ2Gfr^kNCyR#nM67P3lzm20aLS|T@0$NBV_Q)4*h^eGWZNr2xl
z9~KbSU~wyK*p_oGwa59OKYl(wOs5CEZ*jYbfFDP7YAji>>G|h>(EFvj0yTcKU#JeS
zxyvLXa^wfyio74tIV|;{B2faILf8opN`?lg2Ee%i3C~|XUClzkCL@+{It%lM-~1(~
zm{bFf6vDDy&ev4NjwzRy1zjso8WPUzs)2pR^g;|P5oOcDytCsl9|7>g4}YPEx^TLD
z`AK22R7TTC==}(KGdUgZ-U+8p>3@s;l!fHZ>Cu!ss<4LTth@g(9^5dl%NdFQv^qBJ
zF}KXi=sL?5$tDuF<@oUa;lmHxdJgM_oL2>r_CT7SR}=WE%fVX{$h2K*b(K<>j`xSV
zC!^oOuq}{(Q{T)uFOsBC6?9nV#~Bb)*t(IPNQ^<vMU_I8SH2oR=K%+)nPA>v46T4u
z5>Ayf)f#ki01%e5^-WJPNQx4xIyV3SAOJ~3K~y>bc=-4mKOVyJQjOeRKmEZRpW^(8
z<TMH~hM@5y_1|WOf-n`y_U>`l{F7_aqk5t$0C;@(;JlLZQVOcW8AXzCjG=gXAu54I
zsrJsflH<kea(3j<xePcVDp|%lg6_z)^?Xes6qHp-Wbn;z|7tlu|MCC(zYyKGfBrYB
z=GI580+`&ckwa84FfYsP{EW^MdFCXX*-Yn`PZdq6i5cCSSZQTF^HWuDy3Ia)`#T#(
zzg?cU^<3O42rUPycA<Sb<8GIBepCaqVLGG~)rYwzVk-BF+(<;P&ws4#O^Ts9fGaJ_
z`BA+!bO^G%e5wKiH_m>XO5P!)7*jqbCAK+Tlav^uvFOfkb-H8u9Mulx$IVGnI^4gT
zjt{S&elH@Y$B)jBK8M<UO^t9<DG9g8&$-HY!`$jmV&Z2cI(rsW{x0NLgI+*;qwle^
zcdYshO<r!IX5)!aUFxw#c~u?@BK%Wy1YLgFz7e_M8_@DgQT{1kgHXleR4Gf+So{6M
zvcraomA}C&=%g^$a+J<$GY7~)b_~}?BX7}|_iS$gdE1cw);}~t9;uJ5H3ByF@KzUf
ztN-Yj$#`3*Qs)X+o$*&+7TMMDs3yWYI>MVD^>s4;?mt8X>@bkGv>ry=j#Wo}i&7$c
z>5d3%Y&zxnP?ZMl-xMQKvpF`sHU|D_e_d($t1O{8AR35ee~31+2%DTvl`1tMlMOU4
z>^w1S|4uN|auk~*fjLy9q_*rt0_Kvi+sY~+x1*m3lxyxDkz6ZKcGyP=AZ)G$S;A4M
zWVY=?*z54*EAodv;l2zhgp8!ca+;`PeCF9RA(Y(Nitr-#UyfirDB6l@9XvPr8_0FA
zRKIMh6+#9lD~%}Uhy2_B{y(p1jE!Hv79CXwcU3rYiW>jz>QOAL>3v!TUbpVG*2|O@
zW!98&lyK5Y{KIelN|oTkDN|7p&tE>b&#bfMKjAM<(GBD2;iJlToc9|1R((Cx*Zj*b
z|7iVND;?2}_oVT99Uz6}6_9Qkica&<4deBLsU=$zr+d{Dr&g8kOoR)yubGb*)i%c<
zoKy~fdi+LLRod2VeQnH#6z|{vfJm>;e~jzp$G`lK*UQT<|M2e+@b2CB%#k@_nKPx7
zG^Rt@4cVfsygw?;s5_|$-#>ke&LKGjOkph<$$WYJ3?j@iw;)$Q->wxfo2_E~j#H>6
z056|^B6L*fA!RGcL*Fc=Ky+R`SKB@k!<N$+tke3gnJW)PL=JcF?%sc=WR0+1Qe3y?
zEQK0lYx9CICHT5=s}z4{L;;+S57Y4>-#y-Hq{qwWpQtdc>SD_ZA5JCmrFBK-OHnv+
z+^naGzQy{hvs$KPC<-S|IT~J4N}Q@gx8eZS0;aYFBJ%Lzhr|7Q9sMe7_0!+|-?j_1
z$1)lH#`WVCPL_abZMsTIRFNVe4&$6M+EH9*jX+xuHb2hyAASUo%kxie7@Z$DrIcbd
zh(N^S<45mDDX)a(9j}*{ZOQLT3M(SszyHyXb68)<`C+;Pkg(>Fb}}x{&JVQ+STAP*
zQJ+ZXeF|GxFHq*<!u;XKf0iZuh}-2AKvG<_Ac=7c%Q>gw4I??P{&|PHcg_#xnnOOq
zQ;Nl$ljD{`D7&#rYbGQ&9_}&EYeU#BxiQTQrnO>;R@Fmhew?S~c6UWg+hQsL6lRWL
zzI&QakLqovED&A5ug}$NVecEz(pt)2Ia@~ag%DEMqM|7xr>Ae{(__h%P9U(HKa=yr
zcmxDVTS_skiytOG3`o9SGjpi!)|!(#&L_k5gJ^nsas+_Bww7-er;^pW8B^XDEOL7U
zb7Q0>HxLgI8(}WYf|YQUZN!R3*bb%S)|Bzhk!E>+s0QR=J4dmyZ1D}NIT5+>ucVCA
zI(EC5kaxN^o4=Np!alU`&5rvP_}%B173-i}EA2*s&4^m|W6J)4S~9diOAYE0%ZzhE
z_WQo6d60h!ARv3$?OWX{82O5sMMyteDH6@{fQ=DzXV9D}MVaGQ-4Bc~w0414m;2R4
z-)rZw<ybXYI)X@+sEBkOnsoj3TlNC76O+9CF37H{2i#dJ?ya$_v?EIxvp6dAjN~nU
zK)i(>y{SF#nflUG=;duR>Sop<UI_v^V~E^?Az0S|yt;c>Q}MC^h}iu4+bgms01^Nh
zbr}NIp(&btb*y5_-3}u+bx{4nz1k79K2B8Px4=fK89TiSk=<T1c=Z~VO#-{6V=%KK
zeL^t0GV`K#o98X$K<Y%ZjyWybA(k~z|4XRx<F~H3bTUn!)~}T2!dMhR|NH;=U)Og!
zhBaHS)-p}RkF!p_5HW0<68sS9c>lyH#u$lQ6$|Als1aaltx=57+AJLa!n#;|%#ZW^
zyYG;kYOd?=3Ss3C!gdA#=SM_${_@8>-Bme~I=%H6Is*9dKtw4;=ZE?9s4>mC`and0
z7*=h1ifp{&fVI+<9FemL_1z7nqTL1%fE2eBHs!NvhIJ{0sE(;sP}Ny-LS^d_A}z1a
z6^W_dMb$RfAZ#McAAbBx=~=j(l8CAiA}6-PMNNC(mWwKmogXv{$&M`{``$H7R0KF~
zY$&GChURp*f9JAcRc<@ZUw+Pdsa<JVuG$TwFsBqipbtlcZadz^X9$QY3Xpo#N-a=O
zJ;(FLUHP{}IbsDsL<zU~+s@BF5A*Ty<8O$HH)#np-<FrKp8J9Tulm<&smwMluOjSu
z0L;}NfB^7#|86|o75C(%9|Xb`EzmQW5RoXXOAIR&mjk^3{6GW062fK>!70`dxEu5e
zr8ufw)Q=puur0<sJx}P%d&I*y-+%Z)t;zj34b!o4cbJO+84+Q5{Z!q(x68}U29IpI
zkWs|q6&OI|kg&|G9k%@QsMK^fjDDChM3fRsQZ~vsolvbgFc)xPIfD+cQ&e(qHgLe*
zvAU0DH~Tgt;@!LN{Wuq!v@9pj;`FAnsDcD{J;krZH<u~TFwS|O5kB631YoU>4#kXc
zIX^G2pLJ}OvZJ2tO0KvqeNK);!p8CydHVLZ)dZDe)U}(!s%B;gurBA?5&B`25_0SO
zz$JdJK0%iq)o&azDQ;n1h;pizj+PPeaR1KvA#5wu6oI&=7-|Zh)h`ayAwTi1T<0v8
zLMWE~nWv*V6CFPzk{jk2*07#4y5=1fThLTw){s5qkbKwjW@==9RS5vRJuQtD?|$%B
zjDkwn0gN?=9j$3K+(>GXE}Yq<*LRWPs4|qDMIj=_piCl7_95~+SMHl#th5?D4|+^&
zM~g_`Gq2ws#US90E?7Iis@<-RS@~qzG3GRL$I#kx+NULcmE<GD-5l|zCmHH9mZX6U
zg#trLQ&bdQx&A`VLw1#96Yl75N!|sa`$Ft3tvbGYiz(lCgl~?V8*%Sul=mKME>zgg
z={j#Wczc+3(`<8h))pncxGMvTGE5NowO?}G@H7`dn^9$ED&_NZowEQCy0TtPpJDXg
zU5XHZ;Mdzwyq@kiO1_Ao;8pV>Wi+TeP9jHc(7iIFaJKvsY-la<SBU2IRCts7*Refq
z(`r3$ZGcqStEy@XMC!%|up^f1XEuGvuV;{<3A`1N*d{x|*J})+EyIrBh8kEdC5Jmn
zVesibpyn0ioJO$|Iqao-0=q=+65rh}R7z_n1R$toF6X#uo1)b=E4*eZzh&-@Z^1k^
z?_QE|+N10aPEP9!R3mM~ep!}0yv9H3d(u`#Mec$04lbyNKps`15Sr6YIv%s(0kt9~
z|3?e}KB}8no=>=%`@)#)uB9ZmVLGK45H1!hs$%n=$ekC8F%`?^GwqrL5K$F2al4Qo
zbTGh4iAEXt*18~Wi-4pU0EuG|a<)u{mI;zsBw7M%lxwAvs8lg*i;0RgHm3+yI^*0R
zkUukXOo(Jh)-vff`BIBb9cT)!<d%p_CN+R*ETv9Nu{f_Ih=#&*HnWbKUXr5x`a`GV
zeKE1)xGkJwSQld@gHZ3bWMxb$9jD3l22}eoqm-}QqO7wnKaiXUiRl*B%N#Lv8-yRm
zB0VP6>b1S8=tJ_^41h>Y=v|`1tg10P$7Ky@ww*(hR(QoO!D8bF%!$LQjeCaN!=|=p
zMDG6G_ih-o(Ro<0=GqHuGm)}3F=>Q-6-WAE5=}$bYa~ZCchD$U6fLMhqs6|7IVJre
z>R+h8o$#OwB&86ym4?y#QR$$=bgU0W2Wc(jwy+h1)lrWUr;@dnWh{ET#`!L7>y~+v
zN$<0trYg-A5pr&MeJ+bRY|D$@SvQPC-Xe23_$@^c!F{rX*r7ySmL(f26{M2XSFa@w
z%HA_*7-u9*adUncrej!MdA&>r4R9X-(2p~xux?9cEN9~>uAsCUZa~osR-0)zjP~U%
z7eG25*6DH?uY&q1IzQ!rb-Ri6U2OS}^@Pi$3PIA%UH|Oz`WaD+e!RSXCi2b?h;BUG
zrMRWI<rr|p{J85~pAJ@@TcM_U{GXqHt`JG>=7}6+Oa17E5hU-KdN;JI<`}C#FqBk<
z7&mnjQ09DtLyI7|pv;1R!XlW~%NJUmJspscocF`b*-XD=;E1HKF_O}5`|g4iDRgQ<
zkPpW;CRbErnD4=l07!0A;0KZ7w(Pl5MEbr+5uFn{DNth7fB6_zBpRp~ZRiO>j7&`i
zBoenJ#c;U$&{ZhKgsYPkVpjl5ai6L1N=N)fO?5b4UVc$rOGMIkuD+ltZhAa7Gdj(g
z6VBUoJ!rW?RYHD3A`J)}=3}uB1qJuwdPc(|mp)ZF(~A+EpOuZRWaVsP1bo9)2)Z{x
zy%ms<Qv%2=7&|W9jqP+<b#ck#RJGeNtZEgZh8=pt$HN_wQ(;NmE}Y_e`J#s(k=M7k
zix@1VBqg#}f2_O{*>0k^W$N<FLLWpw&RBRudu%Di9W%=LLG3s5Ys2dDz`58eCs}<2
zWw6e*D5-e@mD8l?x*JAOz(n0iuJC|TkmWEli6Ja!H%^|WQVAtQoDO%+`_tn)L~_F@
z!n~v+%nz!DR^vSpVUEH{!EH50q1kZ)q&%*u9p1iOs7`FqB$s*-N=L%xZQ%e0Es{ip
z`8<$w<LpvMDGbxGE)U(ouUm8G<o!U-X@;T#QyM{#!it3R@ge#J9ffUC_Za{g=40n5
z#A$i`T%TYHo9=pt`*-8ve)o;pRpT}vpbZ+U$2vKm&4;z*&!XwnWQfja2Z;dCPcx^O
zwsn{e^YNbJwykGf{CcR2^C50{$v8(AtM!GdiVhus=;F}@FpM*ELId^JYu?s#&Mk4n
zJWPm?I0wAMO%iYBnvq&QlnxGrV<bORnVJR-)xJbHt>@1~Zh$*P4BIk{^DrHeXqZp@
z5@Xm#RU(?|p}ba}g*it1(6Jt|BIhr^RKR(hPo)}j1f)K+s?ky%j>+H1jFK`P$TMJW
zW~wf3OHGh1u141MLoI}4J%6!z5r{Y)P5^)-#Q^2e<nB;+dq2%Pn=~W@W)>zl^kl@m
zM8mq~@Fqm(#}s@l-tOCa-W3X3Z)JfBaAWHr@*3-@>8r{74gAW&CMDE3gKtG&47+&c
zuQFDen`)liu+DE%3d~$Qgm%UXZ7{o=J~q8XM`XYZ+!t>uVOEBr><0wR%Gt6=8eC8Z
z=G`B8)A$@a2+b%Kc4+EX)F<|bmr}aub4fYMh=hVl8<i4*ddn{IHXylYv|oGbcNze(
zXQS-Tn?gEo>es#!%fWI~0x79;m@}g322|T@<c48VtyPH}ivTBmE%El*lRq${PkzWw
zJ>&@5KC1yqh=M9kRmOQn`&$ScWDTgA-?Ft_c!R)H7O=6-+3&XMJ5-W1b4Hk+t3}H%
z%zET&{iuU~r3!cCEYlY<yGF*jA{V3-a_DOp8&Nq{#*a-3n?SY3`fO4XC<0{2zDPtQ
zuv0WO3u3wAMHI8|ya|x=tks+L$Bj6RcJ_e9peGmd#oR~F9#-qMl7)k{SF_l4o@=xb
zs&oV!=;8h9-oXlKW<aQzta39#lRgvhrtqWkM~WK*7=sIeDn~(Z+Uec^+$%j$+N;+i
z<Xx<z0B{kH7S;$6?R3Lp5OLglp>&d=9CqI%5Yp|&w?#@iLQ_$u%B-D-yu7mkXFErF
zh_uC+K%Ytr#euKzjn(Y4WRMY&YeujgjX-V+PFm&szy7QL0*zykQO9EzOP1P4OA--Q
z-_fuw&W|>R>aF8Y^^8<!jfnT}zdzi)yS#qll$MuYYTtdGVV2nkM4UtKHW9X8iik0+
z)v`;O;&)HqYW)rXDQe7EMoOxFR;vj+)!#XfC|n>ZL9wx~14V_W+%SsTBUR>zIw1js
zZLQgUkW--vou3ZJO6V~3ilHK1DpOT3HpPvcfA{@gq`2wCJI2j9@0@>q{@J>N+E=Ea
z1g&&vy{}H1O3E4nxM8XlnWf=y@kg~jVZ}r-aSFq9^5difkoojb46)jXKO5_a_6?Vq
zP3ZIfrA}rx5;BGjGX~O(3seU^9Uf8&%gZMudiv(K%j@UY=bulHAC3<nC54Pf0fcqo
zln{YAh3!(%u+fi)6qXp)VLtg`a&9PF23}r%DoC{e;4sd^e6sHgW<mX@6t{7jt=~VV
zph}D`Bf`jmwB;po4<CP{&pND^uwAe$S`hHlk;p&)^mon=<Kd(mi7J%KJ`yEmANFxR
zk@M#-zYsd|PLt(z*V0gzVLJL@z80mVxT&VaktgqJ1)~_Rx(YM%FdYGynHxVQ!!5`u
z){RvK$fy=&aRmVKV~Shc79>}W#{A{m@@iT%L3GE5Cr&ZNI34ci<Nf*N(|Y;x@csvK
zPBChQPgP@}qwG5J*)A_(yYv>g;)dz&>08~$Q(VJ(hCEm);FFcsh@_Md!3`FX%X^*f
z2Ab`sSL+5<p2#?z=F@|I+Vb*wTVAxG$!~YFAkWrcCRDF-1<?7SMOEk~06>n2+;n)D
zj`x0?oF89){`VbDQ-y6J<i}y0b;l3uYYc1I=UD(^{_Q%KNr&U(>G6G;@<zqX0c2ZV
zR06+aEs?_J<*Ui`n!3L^KNcaJFh}b&qC_fJTj8ckg2VmO-P1Q(QitU=Y>Sow%lSn;
zH;O+h`eC%H<+d@3tYsmQ^V8v^KAOxaC$|6|?%s{_DWw1+DJ&wgUS7Ie=Ui=q6|d5R
ze;B3$K*^q43i1Y19}xt5w*OZ$sIVhO6j_zzxfEL{awo(5Dz#qT@Iki)E>{jp$Bhtd
zF^QF6EjM}am2m%di*<AOuaLPdju1=+VwWwYHziXmOlM?t72K(Wr6@palPovb$oOW*
zDSIogM$s`|MK?JthR<33?z);AK<5Q$wdi6=`pv-Xx^&7vg+&VcrqIc%^nTZx8-2DV
zxOR`Gm?z}!mW5d`8EQS+lD0%w+zb$4xW)T!{*YDEEsa%SGD>m@U2XgjNor+SCLFax
zgvJAE%eBt$73@*oZ|z)b?wyoBeuW5-)gxAA)Sk0qF$wb@)V{pn6VldzfN`gj9tWy|
z_dI>Rt$gT3&-+Jcte<o3Zx^O<42Qxf!ChK}>?RVuie~?gl<omr1Yi*$2pZD=E$7AS
z)&rqq((D5z`pm*A$bXZ8q~xbceX?nSeU7J*t7Bc|O|Nz9_IGltH)UM6$!+o#njr%2
zgj`xf)M~rs@a$wAXal+WE(r;co8tv$DyCK7TQQV&-<@0!i+!f3pgvdq(lA_XBP-$b
zCfeD(V6c-PXi|2HtIo9N<HPasqk>P{<t1#3M(81Vz&DbtO|+2J0GMbe3G1bfwW_Jz
z<2Qe1oW-&HG&TF*w&miS*I~GVWC~#IuD_NKJ7H<%c5{kE<c3LGRUN+qQNu25hBY}W
z<<U~8SYAotd(z{_AN?>_izeap`uX=I#9&LsMphsDG@o?Hr0t_BMufG<sw69{{=bIp
zjfmifDQwGndDWFM9gf2|7qa-uC9gx%+E}?5<eVQ=bm9D<$&_(hxa7H;h_Cj7_;IR2
z_~YF>KTN;;<NxcY`Cbco#O?BWdHp;e@2BIv`YNH-DuOVlu)Nr<M|)F0j^sQi&O|D`
z=Hla}&UwR_g~Q`?azzwh>RjX$F0Y?J`)0`mA20v_A|CGExncVBkN;1WXpp;m`j#b1
zikwo4VLm+$^U<pQw#&J4C@LlqL&)nyOd@0E0ZF-d@Z&VjC(hg`oeNI2VvEIGTP@Z)
zrU!WedHUwJL@vc(3Gu@G^7#+fHiy~5dzg@@1fW}OOr|Pu3_4`03eMBxduv>vpX~hT
zhKbY0G5T=^!1eMa#qjX{hm>O6F1qo=ZCNj`xlSiSLPe#=!;#3Ruyy{WSHut_sFw!L
zBOtlM>GAmZO<XTZtdC*UYeqCfxBA-+1QNrRVi?QBR6__Yyf#e7@o-mmxvfm=6)lL3
z4TR{66oFHe6v+?h{C0T(k?DA!9sfCn^-`Z2I<E)A;r`t?-<ADyQ2~ao5JVit>3Xt5
zZmfwDmzSSKIIOG6uCjn5Zo2A3<l)0_N|FYym(R6a3+vervmYmOqcDW65shy(9@dG?
zJ{nsL#jsVUXb{mL#`_OH5_!d&e);|1UVpf@r|lB}{5T_#q*$9g<-4JCu_Q`@h<5P0
zp&d^5Vrp<AU(D?=Y_D-smj)p35%$?-aveYXRWWSqtZJ}LUBm@UlQQ{hmd#iQDRRZj
zg}qq*YbM~>8Rpeejdvy9E=ZyFTi4ab73O|b*zKea(5T6^f|bIH=<Pi#>MQMlmzsKG
zbmDcIqWtJ0*4ZmVb?Wfz+7G$u4<LeVNYH+MoiyygbOGC$wK81|jY&(?PQBZ;*2O0e
zup2f&Gg#tcBbf)f?dC%7*knY#*<MbgWhBpm%(SMw(NxzSmLjn8`V#AZU0L1K^vKve
zxZ3EdcE61r#*GxC>)s4R5!(|qZ5B#JR@%kmjbZI|Tfg5v-ZnhDS)=dJfg6qvVqG5$
zDukVcb1&$$qo(}|Ea|&gMJ7e&NE+cmM4S^b<xg1E*3heYYFC5b#$ALP(jK|}d*5I@
zG?GOB|Jj?+yxZjJgXN8FtKI>C9Ma;lv=NP~^o`jQ-e~MajQxXQfhr?i7z<Sd?a!<i
zU%D&l0D^sc+KN&5b!v!MVGv{+xz3cF6BwWZ0p2h#6u9~G%Oj}CxW+M{+`($qQhrPJ
zYXK1fQah0U?SJ^Mz9vGdvUi2!t$A(;$^v!6<c2YAYf3@=uAaXAt@@T#wbpWeCPRI^
zcEZd~<T1~CoF9fU&#qF6yRKBqxUXwWi4gH{dK~9dovvrRjX7p<v=m{0L-IPi%A{Vv
zoF>|v{~ESZwm;p6NR<66PtyJ1hC%P88|Lnprnp|dAkyjSo3Oktub=0;cZa*DV!hqJ
zIGkcwh12r-j3$n&(lSeqXgT~-Y~m*XLPDaP{8BhIAb`&AG(FnRmZCmW!fGbFbAFuf
ziWWH4lykK|j$xB><m=ifub;w@DIaVmR8O}&EvPGVXFA>=?%qi)Glkdlb1e}h>jCoP
z+qpDh70H>=z1mr)uz~;!J3qQ%)I(lFeDoGvUOrXefjMdqRJh6=LkI!3T*3n&`eADB
z{spYNd-|s3A}Jh_RuD-sGRG7`m$8Gl7*YU!7?^X2BO*CJRO2zzC}>9uJF1l48SP7^
z<2}(3x7Si`u?|@+sY^tr!<~`j-gy0O+f<p`!u-vj|4qsGY=Zi2dChiZB6`F1t=!h7
z#ong`H@r!?p|54ihzNe13nq{QJ~<_|_~@X|X42-#`RQ;!9q+?-NnzWTmn<FY^CdV1
zYeAkP2oP0WV5oI$rE|l0@Z&)*NyGEj%S(!Jm=0i~E?Y0IihiORORimVmK7COwk$}e
zj8UojUcY{v@0gRij`?8}Nhu~BD|SZ$0;-ey)s%;ITLu8cuwKdv<d47kE1jH)$a?-<
z;%Z}xk-RUNpy<7?uxg4Ck*32vb5QquZV``r`~IDwrfnkIk`}&u`j%4)+gZ<ZPEj2?
zg}Io>Q|EioOkwn<QQX!TR&q|Y=H`cIp$?II`0%5i-{d{HA#9hlt$r9w;1c++$(e7+
z-qF~4an&#tNn=uE3A3iM>MpsCh^3)Vt-fv`u5^W7Eqvvx*lc&X&Z$1e?l5SqZ%c_}
z;+AUQPVtdLxRry$*MlP1_aFI_b#f!RCAAMI5DmEj$pI2MSCb^`!z(H%Fg{OjO<yb8
zUaz)Hsx%R3R|(_wQ?7mpRp&{C(UuP$MN<)g1+Y_9m&-$ZOCsIi`u4|?*<o83PtI}S
zL||tC0dfl^y9LpsZA%nw=$5ESoyBVPP%ROp^q1F%fstC4OG?*6#J$h9u_NrZ)VJuS
z`A-pmayzMb#O*!6ZukrL{BrD=z?nyi*Y`}sj$z&ib=m!-3Y_|!6PXEnxECWaS66sR
zQOxUh^Cq`9QLz89P{z-1x*SL+>x}@Sl1fCUEkbYJo=1t<Cc2<;*f;C@tw*e#H(m?O
z<>p<x;XMsGs=Be&vAJZIz0}%MT$N0>4A_hZ;uXugY3f^KH?x}2XakxV-FYKP!meOV
zrhOAL<&k90zngh{rd#jb?UiO#pO=azE4Q%}_eN>1{3(GyfqUN@#1(?H=<qI=DaxKD
zRXA3roBxX3flFw3_N>xHro(!o`Sg@h<QUvI`C*z4cUffxQ1i7*%mAxiEybW(R79?1
zfLt9Yjnny}>x4Sl;^M`pJ6Uy3nop1Ui6R13Q97>6>o6V=A#4{;X*}Fn@^=<Mqa#Ot
zn2_8!wVS8FwDwggMortT6n6XkI--FTCu~kBM%~sCNgZ$XIE>q>F1Uzze*P)NO*pNW
z7f#9fL0L-zIip$IptvrXSuU_UgOlkXE8ks8{Y7<S%1X{yQ^>I#cUoW;a^^fthpPXr
zTauF8{5Xlo^72`h*N=+;03ZNKL_t)9QwjxFX<WXtTA~L1WS$H;6tCW9CTFgtqhSv^
zr4;pCjA2PJNFF+JeZ)EqRY-?3?KWf4R1(rbpe36_6P4?V9j9ZKQI~+$5S9|BESw^W
z5CNh#oteG}B9JG8zHLQaK_KIN^24NSuu18YsI^s24ytjWS{_Lqba5j$^wufaD7+lx
z1zBp32~Z2=WXteegA$S>1JL$`;XffxrJ%$J&X2{^0xn;ER$l^zpt91ylq{^vxUeC5
zT~}*p%4;RIBSgrLJ5yB~jz{QrKZt7$#GEj*bI({dR&C&vqPZ?FnY2dehEYW|+GPr*
zYEz(f4_+1EIgUzRhjDg(^nTJM$IQ+T%qhy69kLv$|G*9Dl!zauq6raZZ|&4e!uD%%
zW{~;#$msnzYwywes&f1}BhFEgyZ(#1MN~J5V&kC8PuADZNNzsfA%LnX)wm!pR1tKp
z7;a>*K1CG5cGhYhkPy>Ohgw59u*FdngtA%ow0p9gpM{yz28h$)j#6@d<P=g2x{t*e
zED~1ls_vNz<oIFEg8H!N0KOxgFkim>lK+(R<eVR-VLGI+ltB^tx3OKekexEH6M!1i
zk@M5(iQ}5$=7-r0llrEou!=|wxocMUqpXqQEw0NAG8;AJ7CPJ5?i_{`T`an6r}m+k
zVyJ=vB2q8;VVDIlZc7a7bhxuvUtTdHh~$RJ4bwg!(M;o=^W?l*7g~%+mFzp<R9zv|
zB@htFQQR&WBO<q)pDWxNgIe3T?ee;wUk-Oq<KZrIyW?6@D-{oM!z4LLySp~4Uhn3s
zhDRsDz^KZTtm_A^s_;5{AI7-?KK8G1K1!jMDAU2Jl{-!o0H;XgXdJ8fj}SRURn=#f
zSAjUXcn#+OvAEP@4C}U>Yv_DES3C}xxWP%;&&>`O52n8-`&5eKEfLamxSLK7%gb}o
z?P1(5<orOIo13WYG*v8|RZv+wG!)jA@zfU);bEBOl7m<es-%@)l~R<gUv-V;4ULi+
z{$Qok)xtw78H=1ZwV&4bz+k+MlogP_kR0D22Uc41pL`OQd+UZ#7p4GSzWnU`Kt=SX
zPBgYrE;NdC{k~gp8#!_F?W}bR`C(Gw4OoY4M77trfydOwT|@yuH%!hAnz4Yig2?6d
zGZ7(qK=j6Zl2cR|&&l}p@oI`&467Rk@0`m9D?_!7<>K^~b<$aG#Kj0HuMPE-slaK4
zf=Y}lt4)FP9@JD)kjQ~Z43}19<fSTP%ubEpkhB|L0su6zvi2U!`LiFU>2O3OKg^sq
z;RNIy49bln9EvHUHZz%L6xWLz=V6?Y5>b!V#4T@(C}>#a&3ohu6<1VNZ<-$t;#tXh
zk(OMou8Rm~rKul)ImJ!INy14|BImJKh=f%{*wN12f^`T|jvKmv`gS-ztmn_d3EhBz
zUgsqy&bZA^i$9hCh;yDX6a5ui&sY$mWXA-SGD}v*T`sAVs=!>CnO358o1c42&w%6*
zKqx^m(#!UJrDR4#VXO#vl>w+S#wfrt&Z5TL0Kf_1YMX&3S=fP-A_9CB^lGHU1O_$8
zGTutN%I`yyifesr#WRSk>j(?H44IA6norAMvQf^}0$9n@s5Vi}5j!Ix#vwLOTNO~c
z0@=7tp-ft1uSG5P8X$mgI5Svt29Yi?(eRb3*+1@#czZYxn6FY><rXoh4`qawoz|ML
z9A{stBfTkNuFtIA15AnscC!L$#1>;Ri(jFkSI(mmK3g!%+_(BS-4C}cj7GDqi?Ftt
zUk!?q+r)RoUW{C|MzDj3t?>cafQ7yp+SAqQEhj>z8=!qdxzWbK?{<a?E%YAk4Gt+$
z42DhtJ6DXVxHUAQeWI$MA*JZq*-z=D%wDlo529{iZ1ylxQD%-;13}d^XUUfu?jRLc
zkjA&HTKX)wkw4KPxvifoWZXHgVeyEJ<O;E+(A)A@$G!qpF_rzu&EV#0cPf7nEVO-d
z%3}fxnPYWn7hyz~qpSqYiP~m!*Ltu#Q^ex;dj+0XYF>&t<{Fs=5&zHs<zFy!ST9oY
zlogwbVVh5n(|lT&FCZ`;?#a2F=>;Op%j+-x|7Y!8dM#O&G$Av0kBIfyYiI7Andfz@
zZ&g=yH`U@L{uKixga8Q%F@zx!LahcQn7|YPDi92M&QD+h-84{Lx9&YBUwf~$BEsFx
z7??lIBVz5`r@C`+mFMPu#ES56H~Z{+bo*{N%+uLVmwvbt*EnV#&!3~8Pmez`lTcl*
z&!3#@t#e$Q_0g0Ft5SLw{GpV+1*yA#_Y)dBU!EcbYYa(Z8Q`!#&Et7If04)2?GCQn
z$zzjFD9n@civZX6-Eaug)z70f4vh)H7o6SogR!>XohnVx*pks@jGf14A`+RfD`r=i
zoc$IiHQMSo_i&hi8UO$o4)?pmy(X8Y<_}X#Shn1<L(kJS>O?)}<J)&k6oW@&?;pM&
zuTPh!&%5LOZhtb)AzDGGo<IIB%;Wz49fdGmp8#Rlonn|oQWAqtGuq1LqPO4uaZY}x
zd3=&LM4RNvv^jshIJwx3d7;wb`RQ8BCY*?xnY-O#cewZSHTp4lPbv6t1Fw%hNfFSv
zjZi~L4Q%a6ONG8azUg*%)Ab7!-vFIF4oDoy3x~o=yqWw85g^O18s=-G1O;H`<Nf2X
zKgnr3&lif(x`8SB`TCk2D<`M3?)8mz#&zUpqJYK$z%rye%Y@54mq3rZx8E7#x?w=H
zejb@A`iVJSpTDMwh{~L^HH)L6ue)JKAyAwt#u%e@&Y-dV4guy#K44esu;cxEDV6+q
z@zXhV+kWO6EYrlSYxYD^F-dYu{(#DU4;iQ!{94zcapU=m&R#En>4%}fUxh9wc(v_z
z#@Nf(KWI|uDo%u5zsv7n+UI1f5Q{m6f}kJ1|KoCzq9c-vmnMOtz-I~SmmU9b|L9!*
z`RBiM-EcTP0Q33j7wZPs@BDb4$Fs2((JD<UbbZm7n{GI)Ch|CsPx3L>Ck#_8KugS*
zA#03c`0(4m@5js6U;Yvh?;pR9A%x(?P{nmS!6!M(DKAeYVi3Dw7lRLe5|Kl0J)-ol
zB5XiJ>AXutD*Mcu-r>4FAEq>q7hMwVPY=WX&QDh+l6O$kdWE33bQ~1AQ?lGsl)w@c
zlfrpOERl<9*j4qzk~5aff3i3)G5{G$AFGk(G$LOmCs1^1ox8_*tiUyhE5{A%>~tY~
z=oGr<F6O{xlLIi3vot)nJJ~C!TE#0;y~xFkR2&Q&LXO4`01NMbk!-GPu9y7gZC`>#
zZZfaL8CCXLu&gEwyP5@T1f;cbfem}RQOj1TJ7@lS+i)0YcKnU>^F@!cen~fqYyC9y
zVl8uFtUQ*DqBqaa7A&<@BnWR)J~%%pmCWA6K=KWl5O48-xFzEoV~kA2u*fSAUzx<n
zOAkM6N!%}bI^2>q6))DjqVVPqz}u=QgqvcFf^kS7nqr*gasG;+uhbyT6W~pq#db%H
z+XRi;Oe>AYLdR1ZJJ^n_(e;g16|{7W?b}dR6E~zkWNrGeFzJQ0=2m(`(ywkwN-o}g
zn~r8T<Ob!vP5TDxJqR;&l!t0q5_C|*0hNt|wc|Af#$axxbg6j9En4*ET`x@}YO8A0
zrfZc$#0{2GrEa`>Xj|q0*#RC?Hf3HofAJ6hUFH&ACC3lDVek5#PyjT5FppPeieX}+
zX}qM$PEwh`Fe0mQ#p&UP;HUGKpAqry;d>?_b400AV(@nl-y`CDeU4#1y!jCQB-Y!*
z{v_!U6laP)%u@&je6Osz7(zKyC8)YEKBCH+cm1wlQALcborLsE^}FBxOB91rl9st3
zj+ZZfyvU7k{jQw)oWo0t#aj7!$weNLw@@{g&J(7t-*tl!#4-38fYCSvaQ%Tf3W?u!
z`!J8w_&n_I`rR=VR*1knp1)=<G%%^GM%NGB?ob@MlcO8JusaxQujj9&(V-ZOb++q8
zk*X$+$*leTPk$DJpT;v&oX%f_k3bZeqPWwknTJ^@Km=59T_+;eLZ{Y~lH>h*0F2R7
z^f6l{O_!%Rn<NyPwGOrvlRq@hSR4El=V^ccP#D$Y`AdPPij7w8ymJH~NaQycwK4#7
z3m5znc+Kqnn7H6Xex4AM^L0Ur;xq<7-oO8&;u|nszLp%1?D@d!S!|3xOPb(@X1RJ&
zZ)uj1I8qw|UMZnO58wYucI*pZKmOG^8`9-mLjdseBs_vLq?a@psqs@J6SH)L`k{zt
zUjD|k$X%a}!V#}ue=a3s`Z?`kB8y+Xc)p&kb=~g3%+uwov0dptqn{L9q+HFiRzYuf
zuIr7pr-vWW7(YH!47ST#0nsD~M^gY*XMYAb-aizvOAKDVSbX*F-hS8}?q%RIoj;5J
z0~#wH0(D;Ir{E{&dh4w8$1B?%_Gw4rvay$5Q=C2kYE=<~k71g}i?vpwQ7DG48vs!w
zYBhVnSYx|Pz)6yBv1tX6U!5w>`SP^8yFZ*B=J6^rApzlxv7+lw3J<pfrt$na#u)vC
z)sHjnbxZ_6uHTErNA{3&)^&nI80W098ZAgbi=P0X+a2`Ai=|-C#(p8pm=VPB>6g?_
z#SmlccYE6n)ViqaeWR}G;Ei(ztt`3Z{hc;+W3aV*)(spWWRD5cWL)JLA#lklF6VhF
z8HxjM`i^XJmec1=*4h(;4!hS@I@(%i*$v=odb3e%Z_ZcNdZ|`yR2^pP{7;$E0&i4}
zo8@}T%NAY+Hc{!R%dECq+5i{T{a%OMs>-~m^s+46G_FM0aH*TY!J<dSHnppmk@E}n
zC%*FkXKo{?FqM9Jm)F;XH)7DGwp~maVL=vOjF(nM4cqNrt5d+Oren)}+!!rwTm>{L
zF#xXoyuQ&bs+xSm;Dc3zweTE3iHA%6$Z62UONj5K^hjKW$lYi_vK(R=^_kj4M&+2C
zS%?X?F~C%&XkvB+)#;v#5f{`f(~RFY0fbbD)1abonsyU)_@Z)0%PwVrToIb`jH_~H
zxx=7pj@oy&ET5&f!6G@JP4Zi;6ScUJWp}Jn3FWs3jR;M1U6W&Ali#lHncCcv*Mz#_
zGGI2^*&-1hGQ@<uPR>eLA**R|+T7N=<_miTs~uRwL`u_;8eCTE?G<APb*Qx*l>g};
z{5#3Q2f+0^!3?{8=lWgO@2%^MHNY@lo+!q7d_pur;E58hy%1DUgd~9{QH+Z9pX&y3
z`;k!N{qepZj+}T#BN0iRD8-AP&KzS%rnCtqw9Wxwv23nxsugP<YP6N|GnCjDW4ogK
zUEDHb9irKv-ddX^;WFEcVTxh)(^Udvw4$>g4#t`-*bI3kHw=Cjg1Fo|W9<F=Kl0Og
zx;|OgTi5$}q%cb%CcZ&=3RuJs^_6a8kP}_AwhK8tL5j5+>c<st%^5f9nkCVmh>2{!
zGsYa>ytm!p#|!5WwOJW5m4MJHl+15H`G1%w7P0M8MVD^-?)XNw06*m^ug;oSGKVEV
z!X-EA;Kg89uzo;X94+!SvJrH{z8m(|^~QCHLPdVly-$-Km0E@Yz)vF@6y}l4rvV^_
zNlc`O;=7;zPU&6d@wphqNOztb^<39=gRvb&Uw}|?Ge}_?$xJwIot7%8Bh6WxR6+n~
zQAgMx@433e#73=bY;jbN(Tje$ZaUckPA=X$XN(JB22R>@HS-1l9uB9&-GcxIUB9zk
zKVQ$xEFGtC*<@%`Hn#Edbv%DPzInI5d;96H{~x9}9PW*AIc4*Ti2eQ~+kOmQ#@GN5
z!lYk3V_Y{JnCbHLvFmnj*!$_?$II^SO+OqdyCp1K46<M@JA~OzQliQkGF`t~*Y*1o
zFkhZNVh)C*7-SH$JKQB_SAfiO#!VDg@s)T1z?Lj~`OZkOJQ{1AtX|vohtmTB%AhL7
z5au!Zk)g8inyFDbD2<w1<q)@I6+!^5-Dp;_7r8Anm7JrJlq;f+{oMmm;20o>9w#4v
zW|RFg^~^gtb#zTa!{Tg8kR+2a)<}q3wz#7hQiv;)b-n9`ySE<zz|W&xsxi)3Cs}F1
zPmrAdS;s}>!mFJ_R7)0iIc=xL-k^$!$flzu&Yi#jfQ6USmooFGoi@g#UrW}WHfC>l
zo!tdMc{UmOmiPBJdyhsV+~}Iu1qo*Iy0OVTv-ZR(<8Y-J$D8Aot;d`>v<07bo$=13
zds{sx%Mib@rEas8u}v<#@hb`0EM`76Hf#N`k~_Atvo+RQHxXqwZf+*XTiKKAsm04o
zbSU=0C?sCWkQd@IFQ#P(Dyamh83iZ~epXCU_Pr6o`z_uY-YOm2M^3=D)v5~(h*k>|
z6_t{!1K-Ag3UATMU+lJ5H@N~Wiy5`fYEK1z3whwyTeYN<6z_1cEn0T0GR`punGq;+
z+^`1xpoA|v{d-fgSYkEjD>MedNGuTm+I%>%A;JimLdPxj#yZEuLT$6w1;Is(G1iig
zoA+?pz@?j`{#9l%LV91#P`EXnS$3a_k-A{H!eac}4!kiXC`C|aV<zV$2zgQkjjaF*
z1-Dd|B{FVxVYqr#nL@r2s&ZT7u)XLs9W1A#*aR|H1G6Q#xaLNzke2HEzdb~x7?>j(
zOQL8LULL2sbYm?iXaUz4*XGAwyxmUBA3E0=V~=k?$V@^Ok)N+LKD(~RJev{oUwIP7
z8b&Ips1$=r>Yz1eTuwFD4PC#twiAtdf`E+?K$&tdn=t^ne4r2{4JtV{<zcv}??p+S
z>X;aWAE>RLMR=6GMM@qW7TsvFb7iLJi$N3vi{>3b8N)+T<1N&hTxsjL&S*8plGq3u
z*X@qR+O+W*D+5<)xze=5&ou%m3($mDg4P<aD(YSCbK}a+6%?Z66UI<Q?wCLpEMZAd
zVJl-DWG`|CWM<b79HXBuGF^~;s!3hQCf5m=VkT$=cA7M#NuFK5&yj3kt+lq3kR!47
zRtfCcFuj49Imz4GHP0M@fhZI>2#pivY_^$3RSSj{K@oHYn*l__vMlS}&I^esR@1nu
zls5(7MdLE`#1w-y7V`iprZzXd4u}SgYj!2$j3J4+N#TEr{w^p9seLe?XELo<Od!DM
zXGCLNpZ7OPo4ZNtU;fv2op{%2v@^Y2M#?yuIhhLNOUsz<A;jRv%U9P8ZrDji8-s2L
zq@p|LvrWv>g6np{&zGl<^0D(9mt5-*gnCM1%*CAfeiW;Z2s0B+{491KVZIUtYu(}W
z==vQR+wYDAJMq)CoG(cLmK8O|SVSxPkEr;G2!fx+=cEU#>6>Xcph%ePE0Lmy;u4Sz
z9GanE^$^bRCBlM!jDTpJ!2~Invo;1lU7p0lgqcinYeN7)Kc1CU2yYXoa>c_;s7l9@
zf267V$u1*zM#gq%Oz=~d#YDL$66luOM|Ry%+E6hQkXO^vAcIxWoal;K9MobAm@A%0
zDa?SCL`rlf#&y7n*>HXSjK=iC5zv*8NHm72vt0+w;$DKp1;5Oq7caNH8hGV*(8+j1
za@y`6e+Yi^^CW`haDAS}r+%l>v0dL*$kAj`nwARWAgi^y7F;(Bhx-)MO;i#f<9KF4
zoDf~NGu9Mpvga#^BXi<U=M|~cqs4DiHlsilQcGx+BCKj*Mmh-5h<DCBo=e3*wP7{c
zsg`XwV5{d<$3Fntb!m@zGc&Fm_IGGf$}1X2F%bDA59g|~5SKX2@FNp3%RXx<c*@>m
zCR-J+Cva2^T60yNK5z47YAy>Bo~I`nt{Wmuk^z|uL5r%W57V{vodS+@qls6BbIilx
zL_}ep5ZD;&T*t$nVyuD(YuB~E?uR6SFX?S06(N?C@N_)%`@4R3INZNW;v~sW5G`UB
zfk-*29IMmKL~F&ap$v`6f=Nb2Ma3*|6JQEHMI+jf9FRiHS8JU$Mm}Hy8?8fQjO~rJ
zwi~qA1M<iqg3pXpvjiDv>1?pJe3bLaSnF_?S$QF;7fO{TL#7SUOZq`lYiB8f)#V*9
z$28u<7-qTzb9(Ih-8^06Jjt_;dGBM2^LPe?uHRGi(a*Nuxo#i*<fpUTdkQlZDyr$y
zSU~}pG0YTwHLlE`U1IqtMv4)p>+$V}{rw|kvxsUimQ@glXtR~EPWb>L0OBNUkCAJ9
zM-wV8ez}=Hm28R7LVA6SvDR3p*K@gtn=nKzztDoo1E$OnjO?fDS7W>5+Yd>hVQfqi
za^vR_ZUh8vFoVUZUuAJrI}t>;d5+3!J6)yVk^z%JgVvVu0W%*?Z<Hiv(4fLRUBWyO
zMQ9c{TI)m(4roPL7d<c#M_P3J^1>Hr`uhCYSi3vCF{WmT)N+<t<`LpznK)dC<R?Fu
zywzB00ox5mr19lMjoGk6s<3>*<4U2~6l5C|<UB1aez5s+xm50e^)D$zp@uK>3oY$R
z^P4V2S%mTpb_VOhzYyN)O66~|KUT`470W~gNi>6Md4H<UA;&E4F1mQkINl0nLuKc`
z$e_3hH(;_dU{Hx=x4zgEAF@O>$fX4p!*2P2g_prOuVAH~-T*W+Jqjg$D3coM0C54)
zwED0`8v7!Q8`L3IdU3gFynw4zIzdt;OVd+f`Gr?ulO(W+QC#2uWTI<|lWG0-%v@i4
zwG%UzK@nsbbpZo%#Nds$Y_Zib-_lYjGKJAi^vwX1*FoIM@mvMAgQn3dCR(n{m2yB&
zajKig0<JCECv0NVZ)^{UOhh?}jF^y7Kj^d)W6X<pvAtpPC4QaxPEJ)Z3$;LDJY*i6
z=JemRIN$zAc~=yRN~r1A6%Sa#_{$)AMVi2k`NZv^Q`0<R&d#pr7p@ZIlW4D$+9+;q
z;woN`4=fUUWp1oOW;V7I)S)X#6aXwlEOCUz2Pe5QrB1B+e#mealLKPHc+#K${V)E@
zR3lS7fB89$Skt7c+5jd>^l--%qpu=_D6T@8J)w2bg~)EZ{)fN)uL!_3U!UjkS*|8V
zFB(iPaEn#GM|H%wLA5|Mw(B9QU-ee9ATk9%E6NB6UFC3k+~2>8VWtrLbRnYg{5k7h
z<ua<s!6=q+Hyp}+_0x6JF;3FpV(_LS68!eV-y#Zr8k2SXJk8S?Yv3(+!vV6Doo23f
zT~92CX0=3F(%6)Pm$b&#b=LLsbW!SiW`=%$tUG(Y!^7b;?C%wsIQ{VP`6K7fzBI~c
ztT8Fcx*K)?m|Mn;KNKTTkkEOFA3NN?Pp;_9G39<pRX%TgdpT}PXrGi6){^r7(+uOw
zm!FG{g_-tu52wc;+5lh>whJ>!kiB5Y!{IGaVDg&oJ3fCY-|MF<-X2pk^X~4AF?JB^
ziEf}6=JA=C{XAJ~(O79dr0BG@G{ouhoTp#*^zKIrKFpKtdh2?@aIVjvm}66eVs$Pp
zxz-fsxVk6S^@r0VU;+ja(N9;OZ2>l_OGy?~x~U|Q1PJrEE;K7Qoq2cnc7OL4lG)X@
zEY9oGFNLF+@U$4kqgWFw{WLO1A~x3cxs#K`N7?JUt~b`r<5|4mWet~=8N4roE@C>I
z9{Sy#Y|zoqQl>Bylb6cSxt$yK>j!yx{zzdKa;q^0Uaa#l!=c*4w(MXO!?3^WcKhp7
zH385wg4T`N=vtwW%Ce0M`{@G2G5X`%?~ZRia14b@;ipTUE2aAx{VZk+M3G|(qn1@i
zs=PDRj&a+`Js$y>DI*e#NJPw3DJ^PbgTYTaCaK>Y#SRmVjbWnb<#ze$8e`laPZXob
zNVFuTvep$2!3_|SfU$0O?1n=(>|MY6^t*q|MECE1(+!8OKmWh38}_HiBq2>1I1Gr_
z=g-sS>2P{Lw9+j&MYe6+4s+p2Ix7!rwO+>i*l<Y{{Jc<#un6RvnywlW-C&MmsjmQE
zZI8H8b%WNT6LKPsQgOp7e>Ay&qgLVyGazoW$+2Sc)m11@*R>|oG@8@uL$BaO)@AaG
z;n7=62i_RnGp@~}imh`S;DA`X-(q_^v5Hx%*p_cgzY!WSEH(P^tTk?(Ao9PGAUW0K
zNjC)QTdGEeC}MVGYOVSc5usjj9q(s{?l$WKo9KDec3!-SS?7i>WO$2^v;rGyf}jfZ
z#C*<`kET@BOI?OGU~BZx3ynn)s}vsgW_nH;p|`Gh%f`J`{nyvChS&2JGi9+w6k$+#
zMYAWN4yCIxoTdBJt&A28==qbxkQqyvX@X4zAmoTBqYBEJSq==p?$4SjvlhC%Rxty&
zx_^U)4I^7jVF1dg1bE9aCygE%^;*JBYTLK|hzpZ=`SMl>#&Qo-s++~C$Eu`Y6=EYY
zyv0GtO#q8#x@!NHY*?L)K~P2BCxr<WgI!#Z_0m21U;pd>usom`gX?+;A2%*pugZY2
zAMT8G*XLgfXUWe~iH0vLJNU6EBHw)YZ9Ub|1V7E=Gb*I38+HI7d~WOd)*Np6BF*C^
zIY%2K<aKd`p~`exo~e3FxI4ZrBR65G6vTPDiv78GXvN|!yZBLv3vPyF`)LktvrRD3
zyPy87P}0v|KNj$I9-n1vpjg`)J?TkK!Ds;3XQy&?pKq3^3*l0ebciKs)`%8`nfJ%H
zhqoVqi2?k0_S3Z=4h(R8{uG1HDRC&g6QZKsW@E)UT1*Q&IUkwgJdLYVQa(O>x4(Pv
z(*+n@*P}7>ct(@7+kU)A_p|wGp)o)IfB$DU>`#wBFvX95^-tuv4~P3SY!*wWRt_gi
z&`;Owz2IZ;Qk!4Cd}JmW49mbj_zBVM?;qBXV^LUxHabTv;aL=XK@KEOz|R+oQP@CI
zS(agW@Yk9zUk!b*43=cvrNTzI8^qLN;T1`l#e+m4%#(GUXqLt9ppg~zyVK*3f@S&n
zI$xi2Uw8@1cS3D1YwVGwrxzuUwGIvXlFrz?Zp_5h87nX8r%%5VAYsvhtn_&Z!2RyU
zb)|Oz03ZNKL_t)jmp8>2!(@yz30^a`L}9kp62*BOn=G>&^4u7qA!c+0nd9Z_&qePK
z42L)Gve_Zb*Jq0H{PpM6rNS-F_TrwaT&lM6T&1dM0gQ4FUiLtRI>+KZ$V^OkZ@=3e
z-(*|-D8~rJFkZd@Ge~ra+JTpY9sQHV>&_HFPEup*W%R?YkU!^XT5r@{Ka`QpbUnA)
z2+BZ(lC2tZ|M-LJ20_9$OE<ZHp}vDSkLPlH1V73V82udlBpE&eGKu?ndNG*+At^T)
zY}Yy0hcL$wTtAfSacc6+D~}^qtwpZQwaTI}54Fos9t&6cjJW?pgYR=a-kJFuh&<o&
z=|X%lzaCd4V`er8tR$KSVUcssTW|QPoX49qEjeRKrIR>fxWw$muDs1jZy@~?l?Bb{
zv4uuo$mQBR!rSz4reY%i#gtBKV0n{*T<XELA&WIFNIM-bHME&df<^F-Mfr;h&0K{I
z%Ai!YEXCBENX6ah%wcL=@p6eMV~L`JU}!J3dBmwZz~ywON^i=qOXH#q<1EU9)%9R+
z4NV&Li*mEL=uy6@N51tMrRFW^b6;LL8$bEmg5`XRF|&*Fln9s?h5%)3`3;W8hEt*P
zKF`wo_3Kd7Uuh+CGYEv06NN-HR2hK4M~h?c*7e>*L>4d3O>isiqA$yPs>xb%>#v6U
zF_yW0`3U%$r`6nWthiL0-mTt`4V@3Owt~aVIBg&qY`5!#e1KLKHDPnLHmaB_uR8&q
zS%$_SMY%nIfEX(?AQe4DqEiI_`Fj4h|K>kZQXbAE`^ZFMaVtDsSx;Yn{>$}Uh{02s
z<>HQSze__=fNt1PjA6dy`CW`*MpMXs!dp$d?L0o0h3UF(a|Q#z!OtR=eE9*#;L8n@
zY1!faF*RYq2Y<~(c26M%DpA!Vub#AmbH$xVzQFan5)BWnsChWv_rn2=6GeY=3^K;L
zJ|{j%=7Z0%i)>8S8nkL)I8y5#kalnhSrq%F7!a_G0F`_mB#cc~VltmYG{)Y)|BW%u
zcD+zcWu7OcbQw8lc5G^|yFofR1Poy+|NQQ!Kl9_|%g_G|5%1sq6r+#9M?b|diOeH}
zIT`#j_q#hm)P;m5+o#EE1BEVFo~EBFh#P}O;iRxFowv-H@=Hk5^$D|Lfnsp3H_px1
zGXq=K3mvoYnhY9kRk9x8T%JCazKkeBq7+K@Vpj(5hx<qChSK>VqU#5_{nPb%x<1`t
zpx|a{<vK9|SiB2VM!Dipk-(*`>}c!y!~MGjl?)N5^OsUzOYkJ5Jc*c%&`8A@Rtgve
zUuYnk^`bxpr+2?G#)>d^x}J-MYSBt=ao|u_TM`_qa0n-fU~<8(+ld)r7G)P%XL7(7
zj()#CB`XGsGGY{7Xz*e)o!asHcfUbnr^}OsYZ8T7<P#Zgg%u;OdekwCeg8T~nwk4y
zUs?#CDYg2GW0<3#UB9=j>U^ER1<WDL(a+K!%cb7G|H*c{ZrD={^O(}!qo4hB(OS~x
zWZGJRDKE`hG*(1tvZ`fFn<Ef-L7qT_;C=ZOs|{T8hhj{pHDM|DvrE2=PVe9Sre<2@
zC`uXRFB@ozm#2?HC{2%}DiM<a1C`RT8}?QBTfB;r+7+NA)Gr1GX`#rGU7->YdYjdK
z%$|HiD0!fXk8Tht&lhMxSU_ZLvRnp`h_GpewH2xH;*@NKRkrEgX`r;+I1pd+vm46T
z=4{g#v@RFIHOMfV%^@HyvYRvJvqei=nJ;JJ3N&5;xZF>1Q~6%R!p0R}=2Cxs)2T>x
z_G*&EU~Gq??L#36O9;57OkNOU&pPrfB5f7r!@2WX<VQ9}LS^0y1Uf4q-5AQ&%BoY$
zJ0I5UQ)<=-1L=6%6_o%1<%GzuVPwg!%I@tZH@gT+wSy3XU(>FAb4s*@Ql!M6TYM$h
zr0pX%4r*l%$9mb}rVPD|qqZ#HDo3<P?wH9KlfqqrZ++Jia8LjV>hQASUX8ksN!v&Z
zJR}uoZmHAKqk>xqZIw-);*)w&7>&`c6pMJ_#WbSD6}CRn%Bg>i+!R{MH?}xb)fh!_
zy5TY^<C-FHJIVbvU{H5p+^9>IRwSqoj$5%FndVLUi!u8~H6F!jLq*WxQ@Sv1Q8%ns
zI?Hsfjgc)kr`6(yI8(wh7Ja%H{xX;B3|$jJ)+EYfkS@Vk=ei*yFBJS$+)NZqDpkMB
zSDs&8f?<CrnmlHX(Hk^dvkLL7Gm2G()@=|?>rTWx9PSZQ1{fBvCeals5@rzyE7Ec@
zl`v=$`AYq(2=J5qlZ)bj`r*(G2iNZk^Qg=8_af$_7_94@-G%AuiEP(d+l|*}VA$Wi
zv93FR{iT?}ce|s=7&O^i<^;w#1~$epkx*E>VK3p%)^^6a;AaZ+u)ixn6Ak;q(I5&y
z$ixz_D32p0(QtzG%j`-lyz_)Owr~faG0&g=nt}%+M!r6Mglw}=$vD-v5ejQjBSmsl
zWv2TI<kGUyQdk&+w>?>iB4qIs$~-V-<A~!W0b4zcEG0`;zM!7{xUMgNk1-^+WSI#W
zBSmW+BTv^SKVQqSEkd1=(PmvI`-Jv<&}RdsAY+sLOL5adSNsbp1|q<6v@^74c`A*k
z>k}Hgzk6Ux*_=RRoD;D*WUD+eb5D<3x+|_4%HmTY4jB4f5JI@vSBgxnJRpfgkD-(Q
zU}i)YqYv}=QurS(C!$%)OH3j0_|pbm6vJq(Ww1b8%stAF3Vy_3T)zWg=XwAzwxck6
zL>Xa;Rl<1wg2q_eOX9r6uHW4;lU!|q*F<BX&uwEJGN&+MKQ11Zu&g&%sY(S;0o3BU
zTu{5T9?-O?a#1#?G4p&qhk3NFXNoz{5TNV(?0yivCrb0h3QYsI=UH<1<`f60XHYer
z#=0)az?lk>uCmsF75Ou{6I5b5=Q<KtdD;mHmCv95z(Byz4ZAMc(_@&cqh7|(fa|f^
zRCtLxYb=5(8#ty6$joDpL0)g`>W;b<>IN$L7NXbpPEC)6931Dd+a2Ao8xE&_I4FH9
zML$-bA9*nl(O6?#{Z#o)+uc17ktD87*C(*fnoYrwK_p%F00BY%zLh+x7(CR2ux^^-
z6JMaJ7<~+L8{(llDdffen{KNy5~Z!{BdKUw%Tsp!u84W_ujm%<c?{mTuHPLbjoNkl
zes{P$e`cm`cj$M==g)tgxGlztk0La(A{@_8rHn|}CKDib{XWbX!)#sO4SS*(X6ko$
zTUAA3e>4?YvKN42OIQ@CF?a#JqaVwwuI{0E{`A*{N_u_zB()L6q;g+)(kjk~<_jd9
zIJc#%yo3g9J}RnBv(#p{3S6;mV>OXt77k&8xOJyw(NGlc35A5W2cbG*834%m0@QGf
zqD`DGPmKuAn0|LCq0s4vB*D{q_h(572V`T4)ODLfgo0hJ{yD=lk(r~Pk`=A%?jF96
zVFu}miHz-PI!d}Ec`s~6`6`J+`&0<fUEdU??k_XfLc~Dp08nlB&<*=(d=AqUGHG-D
z0d;R7%g4ITpcUqmUd*~uNn4o(2o+JtT7pS3>jf(otSroqfrFpQD|~(aY>YiU{$TrE
zn63cOTPHxY_HWXrmD%vq0kSn9_k8WhNL!ls<m9>Zl1*++h&GjCXpFOqZ!BA!tkrou
zGtuGnPFxt%&R}}$dLdFx*K?Rh?Wm&QBL({rNR~YS2&GPcfrwSCb1_CBVxsJ*z)m@h
zU}f1<HaH^YogbMeU`A{5LY4P1p1=G-zUS`k2N85(>l>~PLf$q;q!c5+5L*|*TJ=w0
zHtHmF3rr(jXo-etm`+&378t}Mm|btIt%!+q_nFPx)_Xb(E7dqnU6qF%n>GFmzNWm2
zfJkxn!oL@DfTmK$EucdYF-otKLA-5S)umk9B-aUsCZ?PhVg&{!rjX^avXdl0oMTYq
zKvd9Q*(q5fH!J-ohVq|8Vu_&KwW}u_s@NG?rgZDP!v-x$-MqXT2AH-yU>A(vJh`N-
zO~%$A^w*NpZ~iel`YJifqw+0+6}M%@;jia8WwQ4M37MCmyD~t>!Yx<GRSCueB%-V$
zSCr!>zne2deKDTUM1$q0c@4)ur`1D&(leI3c;#h%C2*dx$W&A)15+}6NU&;z#pk_=
z<t|eZ#1uX;?`|o<`DM=9I<0=0Wxtq@V3x!c-n;6Dn)8?_Vk5`I;$c*=Xed$(5*$@5
zykvW=#T>659xv%BD4zZpSYnpZ%62c)U$Ng?6tc+Hl<@jY_F-dWbiG{kWDL6^GiW(9
zi-~3nsPa~{OWCV6>!$^?^`ct9zh(8K(m>-nB$-I?wsaPhj~^9PkYUNlYjNEsnsl*F
z%6FAT`H%kF|G3<eLM})$I~2z1rM&t=(T-s@)_wS+zbgv$80P3x$h)7;Io||ox+K)T
zO+HuGA8ps?fq$v(f=~(CFRo!}FHIGaOK<uhr^g?SvC>~w{EBJ1e90@@VKT%M_^Z|D
z<{21M5OHWZ9QE5+(%K-$l;6MqO=1Mh*D%kRt7EP%Q_l#{?G6;Y_fyyJUB8cUrVujL
zk?XJQG9|vJMI{paM8QiQmd>3i*dh=|iu=2_`@6T+^(OfdgX;!N)^}mLJQdKNVvyjD
zs<jY|8X%0%#N@{-*GbKK1b~{EEgv?_qp{Z74vaxW=lYUl9fQwDRCS|Oi8eR=#8t*L
z6&dfF_dgx(-^qW5d6H!i!+iPr3(J=DEe3gNd70<wnoZ!!l$2dxkYt#y=Pec$iZm$t
zIe!WR$&8RQjy)w|z_9PKg4@_$NA|?vFVCNVxor{3{MD&D95zp!axj#f1j*${oEqyM
zfBf4_RLy_@5b^T$V_}!{`@6EG<;09B#VPqYM!!2g6hv;ke6DA9)9#=^a3B8Y@2N%*
zLAi%;j1+^PFMhgG^ko^8LS6$cbrWC)HAfc~Oz^WY)^!r1*)vDEKZqFo6jw=&#=2p5
zmr=)**=dZCiAgrw6!q8NlGq%%f-sHK^*Lh$Lpd6!>r)K#n-9MY)Ai}&KSMMRKmKV9
zv*>DKm}O>^jU!?q)hEYP=C0p$`{ViZAD%z`{>}T}93MXX{-6FI6ywA9e=I-|ZcYsm
z{dn<nGD+B<9$Ytk{{25iTul98*q?^O{pOn+!+d@I#8oI7t?O;qi!$8L)2;TS3=#Ao
zsW|)V+4HbJ7Rp}qvn+$%@j(PUMA3FV5EF&$oI$cY<fSH}?|%E|X(1tAKL1=c^YQ#;
zP1n-dDe^&N&j{-Hs4=2*Ro!T}UsKf)Ow0yq;$X|6E*y}|Grn=KZ`q<NJ0<4VbOu<M
zOD}!BW*8S1hA_74yfCYkUnVW+p;cWyxCtMFauF;PjH2XJDM&2g1;*rzAye*l@iMLH
z=FnR00kh2Q<x9ErK#O#2L<GY~y8h%!qERMoSyK$jucV@p*$W`;S(1v0a5Fh}%`n1B
zL0jB#{??Ozy}WlpF-VJq8;!)T`-2<Hwvlt-O%e)c3o(PaQP4JKSfweNSfTqv?d7&i
z(_STpY`<bv?q9?IRMvSl%F00j<*G`NpT&#JK$OKW*=P>R%g)SM+n$?$(if!@teQ@!
zZn$DGs9w_7s6TL#FSFDgFA%1DrMReDv|WIFfs&-lpbnQyk>ML2cf|w|UzJC*4G34a
z1I~^fh48fwV{ef#X6fnIq(YhOw3>S;F%j8AUo9=J=*p`$N;&zAdhb>9uZ@TSH7<x+
z{Zd&k%3m<smSCH?sL(jxd^NW$$n({zx1)KR@PGWz|LyXn!B4mXfC|N&nU8PY8RLe-
zNqc(D<9WJ1V@ieYlIIph2`(=j2Z|xglfbL{<J&G1{ez!4#%_O<x`2qT&!1E#2P>D2
zre@R(_3{z+cMtvkZW_;}r#yfCxxy0-=-SwnSl1Vj$E1Rhh(x!rT(l)8&-KIU;RmUP
zDEQL0O4~V}KTFOspqS64)3M*55Gyzq{7gyjk#79%cq)rsBGD6NH+Q!>S4`H2RM2JO
zI~-2K{*)C3*9!ZDN!BVePvd#mpZ0fe)kwxXfBIdu5#Mqr*qT>a)ndgpaz!yvn1#eY
zUC*hzZRQ-<P6SJ<K{ZG$izO&V!H$^u_~yfKILRv^2F=pq&zW+aN+=?tDBf(!bFM<#
z%jP3<uhvcEvIml!J=Ym)iHI2}wkCPn37ulPKg`FsAIir!wquTzwJ0%oKaZ{(gh?-i
zdtMpi={w)=?}q)|`22agJe}VCh-fZfe~ErNK75~d7BlSc#`EXr&%Zz1zdPQ)8_%ET
z>si=FySqo_^PW0jiZS?E&5_WL7XTQJ_ttgi&p%t&4afV9@&(JYdubPyOuHzK1PH)9
zU7x6R9^YIW<qj}&X*fjlBXRcHRQmGtxi~K-ram)TdwTp)kdiRhnfGvb({xnKF$QJ|
z^Cde**>cY*&P8o?dH!Nd5}`>7rUYmhL|(X;F(2N%FPj_18I-#fMIj<sL@>6?3G$TU
z;Q*L83WU=Qe!j$PW|jpl2C+<Jk)rq0C^iRoZ$9jf;uwIgAByy79xo{jB=}5WOa2K3
z_fm$;>9VcuOvdf3>x}89Yh^8D^*ta0+Frs|v!_2dWJW+eJ#G0GC^X~Z(Lo%4`m=vs
z))f(r&!1&+___L2BoDb5n921A<|yxbd1^)7Cy&0$U^EU>2Af*gU#)Ix*(4&0YObc5
zCe1)u&00!I{i4Hb1iQR)r-db~UjKFBdd*74Tdv_&e}J!UJ8pq>LRL`JQ^b~4jg3=O
zE5^qSrEtDKmAKemDmK+=R#s>wxD2dx3SFf*BLW-Kh}_%kh~iEJ|3d#1%}7?n<F6hQ
z;?3ulq^PLm7yn}Z@U1@Z#cwEHXbfA<q@^R&#e3F2uu6AluH9JMLlj!MmYOq{_N<vr
zt4RtbuVf>G)xt_uwt1BxrY2a;{HUxn6+d_5xioU1Wlmy|u5%HV@hcYv-hMYX)dDN6
zeeMcV-zz8|mf5+<wrx%0kmMg|iod^ZKt)2+5>FVnys{WH(Fjx+eFb%joLPR|COo#v
z0mil$T<pE3`pHSkT^f|8kj@kUKvY4dEkf_=KI7VDLZAA~GL9~OjK3yd7L-Is?l&=_
z5yGz22M9F^5o;@pYI|H;j58L482uRj(SP@!l+RSK?2I5+gRU68=z$Q8b%O*b%f0jS
z7z!J{2?{_x=3Tou?(W_q8ks6dK`PVcoD&wa^n#dEe6~zbH(vtR@4J34ISMfZ0P@pi
z!IEm1joD^17h;I*h$?kO%K5^iVy64YpBUH}%goa3mP-orDAZX{GT2gDyJ62IvOM*0
zEX-ytwCMT)lyg;T&=Jw#JdWjaWqk|gk-**l?m;@Pl6A$*etf3vTMcN?*we!g(iR6l
zrIHHq`uwRd<2AB`TS+~9BmYHg<~c=Z8ZpSWU7xC-?3i461UDvm#q+&Ut)w;`8Q}Ql
z{qAs5Bwhl*;&!dLR17y=rWRa%mWM*Y6Sb6gG`BiJoiQgwEd|JPF=rR2^7T1^0JiH7
z_wS4`uHS`uoUdmAo4Vbh>v!ibe_*EJ@W#6S{Q0kqb*|sbhEC#Bfd&yNdZJ*AWq>e^
zM4=mwobuVz^d*EO#MTv3H|+BBRmleHbEYIG3j?TCsw|qh7`7DF%puJC<J;rIcM`p+
zO`opMA4~So<~Ujpc%17|+XgM;sL~JcViYd&t+u&5+&`Wke-H#%8dDMb?~eDzxja>3
zW)9QUxXxy)Ha}j2pXTY@CX?XHWI9N$9o+BkO14)FvjRP_9zA(5IP6Yp`~)$C;KwWh
zirUCqWbY+eNwx(d+VaOuKiziXG-6yo$eZG)%RHVb_?W|i(b$53RyRRKHk4z^_5DJ6
zm~cBkDPz3c_)^U@j`O%FtX$0>NY-Xrveup+zE|;Tve+>AD<nzVQm&e!mK57V9I*X#
zB_gNcDdW0kn8!`Cm`_(MUQMN7y-}gvO#jJeUbUUl<HoGlAx(V8Vp6r;pm7Zg)n?yJ
zf0JGy`F?Fym-^0H_322pBZ{fNo^a%zpuIE8z&UIf<QijdlXPT>)PW_76s$3}uE9!`
zNQo>uo(A;5Rf+aZ`SY*5t(9Z?Yrl0xRFP_M*>P>XPW;-z(?9oTOY!X*V!g@zA$@&D
z%qY+p;}9#OQV5nsNtrU11y!#2imClX7OkrMt;B06S;Qj5R+%cz#n5d?GvjG$(Nhh0
zTONceg_TUje1wytwb;tp{?!j7XQk`4v8f+VXXNUi62sG2+17{%O{P*C9aoDfYZ41T
z8C47czXUJc06rR0rDg{6YARW>+*(R<CZ*r#g<JM)`gt*~pDgCsXQ}3M`aCwHv0I-`
zWtu{v;;;V@!40dB`a@nc0nb$q0s>`GyAh_Y5O$0~GV8mzD2&$J)Y{ZDyXpF*0z?cN
zQ*@49KUmkP+=ld96BHh2q8Nkc)$yAM)@>MiCgd12mYFRgQNWZF0D0;|;{Ba)+N!%p
z8LliJKbn4jlq<Bh6HBKkJhXhl39Pqv4PCNYPa;4`(;Z=p2j8BfB3VmAJ|o^S6r-PW
zN_7zX=B(dOWm+ka3w4HqPZm%_k-db%o5pFE(4dIujq9++n<cfdULxXu?Xq{R>w1b2
zk}=X8a>jZguNvou{e3YIh|v>8G)8i3vk_m~9du?}@g$Rfx>;l(TI({DmkM_4Tr=TU
z<n@}iSalr<(bFP&${D$w`l^&!fwJe`nqq3}dSIxYVNeLtCDtGXbD~*p{i}5+wgaHN
zpvo5$6R@(R5vgnWk8BaIW2<Ff7OOcwUyZTd?ob|a^s{w+IznP}{T|Us%$}6PVICE0
zm{Qe4%nTxiD{n63jOfL%JjQ^8m;)@eDHkeh3(Ddsfp8k$ur-JsE1F7@bvGn7lI*@P
zU!On!LDc=j{?3VXnz`E@Z0r+O7iU$`5-N>d9ZVo=)323FexWq8%}m-dk&&RNr%%6g
z{l4pWqS_Lkp~M-M7dF{tRL+I?@fqPHCj=<WP2_@dTNHkG(^5Buto~f7rpcYR5x!%4
zZh^73a{EEKfdjH-XhSv%cMrtlr)Jxw;yJCl>1ti)`kmyW0~$($TObNdv05cml2N)J
z5;2_=NEC~&LIFuB5^~s>_$t2$b^7vhkfhEO@%xm!cK-Yav1hSepUBvVnYLDqmRN~g
z*9sg?5!2wN%M%kNY?IjteO54{H}AWwk!L2x^g4;NK$y=IMX0`>mK()pYPTnYIUw6I
z1%@;e)=J43ruENUPtoO*4EuZadLU7VN+Da8gdmXXr0+^(;J^&okb*#ktyj1b#ZS`g
z4kz2~<n+wM8A0UEDj!ZCgc!qIXnonGB}t-X8EIz&#vFc)C|X?vAs3KH<n)_wth27)
zAKzq`6DA613>p`M57TvVVj1Ih$NQ|EiZSU!EYa1^*Jgu*)uXdjv={m2497Uv#K%|*
zh+&?Xr7)_!X%-HPj}N7@kn^_SlG#5|jM>9INn#XbR31SIn&0eWpjdzDb8*qB0=E7V
zX%}0tA`!9c_sKf~#<Fy8kVG0ed2N!2pcN0z<CE+QySq1cB~>8!7`%0TODm%o1Lyfg
zn6I!R&1Z=IS|-xY><}SGq#EtSl<MHE;5TC(X1GHBPofA!TIM0Ih8V}BVFpFX;*d8^
zK5RPs5&b+${v0!P{Z7)!0iYj_>D8m?Cn;qq=fCC6j7XDNVCx{PMt<UyRyK#$x6{v8
zKV9~x$5MmJeU@62qHl&_tY)+_x+u5{BFrPJp|5rh6N{7l>KWZRvF_fq#!d`ii`|bN
z+z4Ut#vfC3;Rwo-H$5HzfVgZH=kYnwj&?^h4$;_dKs3>$yoh=9tdwx-EUa&Ld21+A
zF$BoDxWF8tO}a=Q5PLbg*0W^Z>fX{$lHcX?mp`~}aQ$v?AG+Zn-M@H8Coo)ocOBns
zcnC{7Yyce8kvA`rte9eqVLeN0?I`gjX6+WUc?&2o?c@))A+_emV$NS(+utQ~9c<o;
zRL<Zg-Iljnem!Z;zgiTp8IXj9I20Q|RS7nWt)mh=RIq(xys8J$Twj$&W1Vap)4m2J
zDV~x8fFz)TW>^Tts{&$5_rEESXqoz%cg_vXi8t6xilfZxa$zgR0&kMDfr-J;q7~37
zhH9+HRZ`uMKKM4@6>m@P(|o>|LM+|*lU*FPuvK+rX8wlYBqwKV1)Jnz8llY&<SI*5
zm^Qr#D4N28(sYJ(9?(l*auYfa$>vaXjnKq+)*ZgCc|>jujm!NpV&=CouutOs#24H;
z=DE!vT<;aD1+2ses|CKucwm{)YRl6mcF`Daj>hUK(Kxua6oK?inVM-!vj=QW4G><G
z?=0RLwTs}^ir+?TnVBin0Ke>EjcAh{J;Npl)HpwsWDnR#LtQO0M!1csev30Dv-#|C
zmelt|fhBq{&DX??5OSNy%Nr{FD<b~)|LMP3&rg8Fi><dN-oN`v9r!`LN}ggUse~(|
zhsGzV8}@odHLYGq_F#oE(GB~k3|3+cHDNi+Cv4Xr@87S*g|fNN<FhpKxKQFVizj%Y
ztu8#$G&4ICiF7V}5b^PcKQ-3*`I^5nfxz?S3sF?^i8WsiwU|WuHpzX&^z)?}4P~_z
z;dvoLr?`W*jClLux7kQqto?~8FfjxBY1E&BDE|1T|5{;)U7tSb7mvc6XU^Ny7-O9=
zUGU>(%MP%?IBh6oEwe_b+laU;`VEzW8$|1>%sik5fCO>xW9Iw!Kke@xyI}{2ah`}0
z(Oha+Oj3mF60k~n3oYZL!c(?vb1H0-8$+_Pwr#NtWY_HgKr{f-q4vX0-zbVPs;m-0
zJIj%o8b{`ScQ+jGWk(gEcQ@=2z)xqQm>eDe7&v2n%`v>n)>)Rr6hjQ&Za(YH001BW
zNkl<Zb-lUWTU5GJz9(g!NTQ@X+R$oI@@o}2lI?e8Ka|u!p`W;ZAN=H}tI7Jd#U`T%
zT@-_#uJiSY;iZbAbl$wmzi!tv0#I`QNNM$PfA_dQJ-DvN<bll7<tYX~?2kmGjV@&k
zSl7vb=$F6x$FfIpayT+wze`gCip7;JHNn$0xh3T2u`E_Z>zs8x=Smh4L-4@WC+ybg
zr#Hq8-d~nCtWB8p+Sa`d1MgDIr>ZRSNF~NF7WMt=k_7!~ED`(+uko7S&Wx+PxkfM4
z&~Rp5*lF_G{ktE<7_xl9booLt%+r{iYN|d&GAP^&6-L&5<3brx!=hiyCx2NB4@yq}
zu#~Th(Kc4(ml2w_WF7sTY|OwI-m(IzIath#+4Ai@oi)6+*kX!|WJ~gazh)(D62q}+
zw%SvWS*40JKQk+i5f^0Lbp5y_t+1}6H&WABEjZll`}yThyLF#I2VX#jE)6nAUeJX=
zD7aP()GAw{>V1mFfSG@-_<<Lbm77mvIn~FdfS1)^rcwL6{1dlc46K$rs*p7r{P-3d
z=vIL9hIIqH_=+}v|HgOWf_9Y^`3%Z{Q7{`s1Y@xs&1$KZ`epo5T;i)fj`ljJ+Nvxp
z!Hvyp<!_)^E?m<Z>QB~_Layy#K51$%vZP9Koh5zqQ+#t*S^6Em!q~95XEYB2YsL#v
z0|vEg3AI1N7PasdOKW?Xev?3lh&n^Kh=Pg$BbELO*h0VT2>3tzXaANSc`u#;Gav5W
zl(3$xgHDDwah~SsIU#E?3g<$~WCRdz`^|SXhOkJMSAh~@W}mFYnTTTuVSfKdf6uzk
zbpsmf$8)J`{B+G`IDsj-;O`D^0rC3uDaN@tcCKFu<2vIym4KW}pj>MhYmM#oDR}qx
zhtkz`!=8wupP1?T{27$|V~qyr=A#)^GTZFfBxc7%)DOFIpDE6{(Wyjexv_VTKe~R9
zif=kU0YX3Q<#@V0eZD?_!kjjjE{6H^{x?OcUk6BA4a9oob^Wf}9k0)y#^=x7aImfy
z6>SkYH2LN$%5Lo*inJNgpgG*XAFof>r;o?`_s2KyFHgT*pFaKgr~j%9Yyk1;<L{HT
zd<-9d_kZ8L{c!*Or{cy?8hQzx2bre&iDG>I{CjL~b#*GY4iJs)$|$>t9NPHF0Eqpt
zGsaGrXUNQvilDg8x<2?RhIw~<E4+hhLQOGMf@okdpRU*gG;<*9c6V>@-hMZaXFp!D
z?qV+C$&<u4E<hJ!l1zn`c4h6SC#7FzsD{X<;CPG9Y~h~=i2d%)7)P-JEd>Z^W7Z7-
zx~|97j?YBW^hi%uJoBvU01W`!ZV<dDZ!+gZg@~beS-gUqj2cJ);IyLh<K{|^qpshZ
zPF@ppeDmIRgPQenm`2-m#`W49N9Hf%^XI$*(`!|%_^j*70(0FC5XG`C&g0SngV}by
zYmx}%LExI_iN;cx>tuSxMwa<2FdNsou1Axi=Miu`f8N}k7PnMf^6L^M`swff8x%qa
zvs}4uKBnuF&%u@%@;8V^ve<+~^1>t2o1p?NYJP|-vMYe#XJbrpTq8gG>5A4F>o|tw
z(+1G*4l*@!{qFwVZzRUpU(eU`=j^#3GQlO)AFfgUzBEnQtTnkE+iiX|*KSXhvM<#F
z8!vDaiUczOAraNsuq{NoQs2@nscJNEISaZ`xQK5jBATcwe%j2!Ziu*l14n7x=riyY
zk3f;rs@rTC$6!G`a_O`l<gCfgI=E50>$S5IZky3+(Js7_1UnPyS!W^*8cY*%NrW_@
z2xiJ0uSrZ-UhjG8$-qsE-*RBGCm6%_R5;J~@Lzxdcq_DNy{DO9F5s6NL@j~W^fvrf
ziJUs(l=k^5Ey64Oz*ez@xVW8sD`N0Q7#_A{C84ySK9AKM&DN)RIn(QW8E>^b$ckE1
zBVy2^vBp?t>4;3CZZ%t7+r8yeU+m&mGtSZh^CtPAnXr~EQSD_f2R6Q{FRba__=;uD
zEf$7(?hXmA&B5-VUbZ}JCOspB+av#%)<zwT$z$Ti<$!ZylnChZ#v)NrhKc2P5CU4U
zJ0M;TY0}Tca?N$b{6GH}|9(}`Vr^dvG4F8qMkt7@%1$Ubp(Ok*u(Cvvl1$FUd}xKP
z+zPyA=EMDCzq=D9`(hHwOxLH+)^*mpEVUq_CM-#OuH{}^H|Ql1!z`+Hq31PD{MNns
z@JF!H$;z-HhM7ym4>M6bOK=h=3O>cKQ0-_}p#tAGgedufe6ZB~Ghm9Lv{NY=E(SzA
zJ^mnbsTk(V)5qj!OeE5BCK~pqZg;qR{kg<kJpS}|%HOX~pY=Vrt~1t+m#@hO0HAfM
zrG9tZ9p5GyZxTEtAF8ysSkn&&X1YFq>H1yK7$_DAef{OH{CN59kN><ZFh5;Hu7c|I
z_2ZeD5G`P($uZMBo>L~L$%2!Ng6{7g3O}>BoJ%tugV$Xb065p7F*Pe(j~O(&rPyvI
z&!g=xtE*Bs?6PH)*wGuC$BH?{w?1+`nQlYdd4GC5J$#>RpktsI=j+#%%@u48aSMHn
zBQfY1=aLOXF>nmFA8^A}veJW%wbt0EtpKp%PBQ8e-D>i_XqWxEF^w@SyjUTt`pQ>Y
z*NY)v#R{`E1OQIw&t)jSE-cC%9SxQ&h?<9LO*ia;A*3;LGKWe}(K^iY(bKyhb9slh
z>xm*O(rHCkjYVUwPoDrFMh`7>L=68*7@-`G{r*1xm4Y8pot)y@As*}f?#`@6_0=GT
zAx2;NLQVCFF>vl#g&tfUO37D3K(v-KmAAZNv7{8`M<cY`RQ85hgRJ|zhyCe6o<+)}
z^P@=kSyFK_Ekkn-5OKOb=TnNU>zQMiM`PT>4}UUWpQp>$ZhzMg$J9*syHY3p@>l;?
zH|+1;ewWDPF%%Ajb)77JW<G!ULzu_MAO4g%X5C%dIkN&QaE$X<ZQ)$f{2?uh30_c^
zwtKjCkhXP_!B({K%b4$~ceX8Ppr5)j5zX6ZA*do&60y44cHpr|Tujop?puC|3(I3}
z>adq*qWI$UKULX$qp~iu5L}czkh<rP?M}@CV5#gF#!aq^%7#Ym36M1#Lho)|zbUsq
zBI}V70gWyG3_A8xG)BgDNg~3W8RJ$CZ$xX1mDpP}1SwszP=5_YiqRWm!E!sbUha&^
z<YhC_0`b+ex|dgPHpZ&952a|X5Gx~Z#C|D8ttu{|vBz6+j=t6NV2)CvTk}C^e(UCF
zjb9-AHS)DY#D2XHel-Bw$ZcQ05hlOah&O~Ht8QsUP-b2*!RuC+=a&M&i7>h#WHQOz
z^ajZ^8C!nJ20e0Nu`MwGNhz<qDbrCyS>$70_JMfWq8<^`C(Qu~>+!R`_1iaJ1=2-7
z!zz0<Sx149nuD2Rad~ARMbTWU%$r_0e{iHqfKL!T>sl&FoDq$6+0LnguGV!DD3r<?
z2ICw>gjka)P5J^hL}Z$s!Bu?*r@DzW(2wBf3DI=JA)lyR6vS!!lj5<-e;_?5mNjKv
z@4B6o=dK^D>!<58Fn7aV;<ii7y6bjw3u5#XyqF|a^$Y?N8)MzDPX>#|Sl0zV1rZ-H
zb^X4??HcQhac<bjjZoBcB#Ob0!~PBsr}Nhs=Kblh)In`q2CAE8V=SZb)3s>Fx_&Rs
z2N9w2sVaN4j{hZ!W|c8k6xL$fR>@KGm_oFTN!xu4yW^XZsU+Xi@9&s+9-mz|;INlh
zPaNa=-GPZ?oSEWud4fb+S41LNiD4GDTZ*Q`q6bYrxfK0$ePUh`(5>xcry$_@`YdiH
z(NB;hgF+b>7d^0DKj3M;d@Xbcsm&7sil}@{$QVc}dvjGN`qw%_rg*r2XRIwWNG7WO
zUMegmZT*7qq+s#9?Av*pEJ)#1LkV#AGa{l*yPg(M7k_|8sDv_9(<5-%1Ss8nehHqG
zEJ>mWG1zWM?;SG<PKb+nn2{YwOc->Js9U9mIF&Lxm-|%F4QD4d35Yh>T2ExZF<}i@
zIR_Atu!yfM-oWI_YlVms9A<JYU%Hy{{6$YvT`!U4006`BjhK^(gI7i=8-OtxR^-~W
zn1rA)`9(|2`{b)4kGra{b$TrrW6?=KV9Q5C@t`rhQ83h|*k<c(v5bm-f+DNOw7C-i
z6Qi*v({?D%Ooo{1<cgwoz3X?G_#G2nGw)8uIwl5))lw(veA=rMn=nMFLB%0b<bbA0
z_blG!h{l5`|Kxo^0OshY@#&K+AxiV(gE3CX=eFxpG(y_w5K$aF!tVG60Q_``A)Fq6
zNO%b#F<ILUhZ7>s<8wanBq)Q#i4f7u*JnspZ83T;>n+AvwuZFl7<>8pi;(jxmWIZ5
zy%0(f!SzF;aRH}x!K4!|*3nL024S914yW|UX+b<O#x7cTWf+*f3>d8Khr?+e&oPE>
z*!R0TKV1cI%jS4qsNprydmcSem`6WdyME9z0P6<Z@5-FWy3S8mVSh05P%_yOjd8Y9
zdh=?dgJHffvjn*N@e-py+&|WjpPKq6yE(s3)*z1OujP{5aES91!^BJ+H`_d&Y!IP(
zIHldE2*x#1Avt+TI1hj}wN1m}-dGp?EIU3LGwe@H(NE9T_1*4J0uY$F8;$}t5{3Et
z1gSDomMcumF@^|$6g+3@wyZ+Ic#Sa>!+d>SbtgFN@6rhrxwy{8Fr_p*7OxKKh6AE;
z-Qc?2bp4uXbSmGx5tvu$NDRJ2RY<a^MME*f5QIq8?~m5?={yD?jO3>bMKsg^O#Nj#
zwXAiVFQEK(sZlbU%m^<Zjiu-jO?fnEZ0U@dqrk9>CW<*~TM1lFPw|D55RE~w7-ot8
z27us4rYP7=6{;)1T*?A1_%muDEnZtR$qs~>HwX*N^<HJUYI+YiFjr}F3bn^-2%XR1
z4giV#+OV{+G!YR9D9_k1@7hc>p1&|NN!mN};m!Mgm*Nt4yL$li<As>y4#xsJBUmN;
zs0nk%X(os+|Ipg<xG97>|5KN2tz~1@@Nwl6!A-Y%u^JG-kSHQ^40B!2`92^s011X6
zWm7Q=Ee|FH-w$lvKr!U~oef$*<mknL0!&o(H#K(04am<><J!Q_qw5D_9U5bkHii_Q
znV-J=Z}5T}rQSo8ZimxDHyjGoFZ!2!nx;#l;P2kN2Q-o>e*gFbr71}~fB9%!H@JQt
zpQr0{KkSX|#E@31K!FA&7}6M1<6Hn@uw_;vE+v<*zbx%fnTO-Oyu#^F%W#WZOxj-r
zT~fuBB#JVM+xGV};?T{&$)bv>XdY4`8pT{hmwBWDva{86MRT%YS7mRAz(vdyleso3
z_FBQD#6TsKMNkG3l&lv6vXPQ12H%*ENP{9RLdj*;3WZcfmaJ;r!oIe!U);)mUQR%n
zvxog+!_4z+BlQmg%E@P}Gt%*-N~*LeVzFVxie)Lj1f2=@ZF%cTsaA4JXazR%7AVcD
z&;W)uZ*1ct>b$)w)**-2AOvHqoMLs3g($e~>gTLd;FtPWUc$~P(pD#;QL$WkIZhp0
zym9L#TjG<vmBo;IP|nlY1*N5|tCdejc^w*mak$ZwZn>nE)H=nV;2KcVBoAQSOw=o*
zRZ(l|1TN!b5Dfqob`UdD^x3MZOlwd!YYUhMqVmv{&9CU<bGg8JB#>wG+1waR#^s8y
z8WVw8@VCl|n%dzUG?5MYZu=XfV)xzp_xcx=@LKE&g^<=*VkK*MF4ek@m`z*f)&njS
z2ieoBoTlCA%38=*QisG0OQ2gQBgr|-I%G_KPnmEdtk-N$Z_v0j1QA(h-9igfuZnJ3
z|72`QL%e)(GU~9%U=))|`43}Ed86@v`LF(i@*{k1KGrDB>G6BPXN<9~ABgDk^<y{e
zhn#Ay=`G{)r|72~yM@d&UC)I%%^Y)_{g_M(Gb=;_jzgG%I8v~#7jQ4rHL>e=#aWv&
z>XkP7W#&<XOj278Qw$V>o~gtzrx{h@I3N(k=)>K^hr74m2|ZVt4KbjhFkhZNDclJw
znv^V^nuy&Z^ZaJo5fjbR6<}j7LKJ`alYiNEy&R9@<%x;r@r=ft9)CzyoG9Yq$V`5^
zGC<c4Xx#bJ@0r=pmzBT9i>Z5Rn-dcNt*N3g6H#svwx_&kjCIAI9;fTq8hz0B6k`Zp
zyBvsY8FFkGEK>bK&<tCl?VTQfu&(cS$KuvuyKcTboxlE~D@Wb^l&r^=iI8Ua<tu}q
ziD=mEiKtMnF(ro-&PXHA5A&$9yY0(`MIsu66tcL#dvm;hU$QFIU<MKK^7IR?);St0
zhlKQn?Fk;|>lqMt`y)V=6NuI4H)|bZtg%)uLvR8?qz|XZ^1jdG6E?}KOI~(?ZKSQy
zKY78UQ5TN@G>_Lx)*^cN{<p`s@8xTR5`rMM<Q-G|`th$_*IU;IKW1qV4~I7ZFrGgL
zKc60dT+-hVD%USBxZUyI*p7*!pPoMb4vl&H;kPl&+C3m!VdHQ(S=U{@eoXLwic`fG
zL;~xYNwfd*9YEVT8IE!c<Mj*-UEkN#@qBy5Tw-^;7a%>Q11SbS#n5UkqybKc2W4<V
z4&4}h@|I(^-Jn@xMT?S{;Q(Q7IzpwN!EQLb{o#)V9w!Phc$3_ZLyXZnn=2V}`T7TI
zyJ3G~;PL#qNKmV9K=4~WLA8cgOfl!D3jpN6MPyEv2!f+h2xx6_6*xWqSa1$^Teh&l
z66ZYifs!m-V#<_QAq!}?=*wxmlI6yjTz#eDVMxI}jP#=27wTZ!8xE}-GYNgPD`x?d
z`Mb$=9t)^#z!(zjH!gP#EOi=aGeq7FJO7*T^tI+h)fq)H!HFl&%Yq22Q8X8tFu$Zx
zS>0rQ>80HW=>9c~i7hTcLpfHIhumPat^(Lr=0(t(0@%fw;hX$&TqZD;x#=<y08tSK
zTG{m4W`gyX|4nHA2?3^+vmn3jcD|^Sz?M<+D-;%~s>K!m0pX@G*ak^IHCz0xi_c>E
zBJRw2id=vPiRH;~PGOp)?HEf)J=~-M<=16>l@d6SerbY*jHbIQM{88=@;|2>hoRX?
z>T3)tf~x%xnh9tCjW&G*Mpz;o+-A$?8Fp)E@Zw&P-7AvWp)Pl_rC+*lSYixV5n}*c
z;(h~_+ncBfnRRjdeZPI*aN*j)3tc}0m`Y(IeJ<c%{KJ0_aty~pVQri<Xq7%ce)#R*
zuV$v1j~@IS{47+3e0rmh3yPJn>vxIj3IGzE7GsW)VFpO{;kW;!DU>XTG!np^1E4-?
zMbFW=UKO^@OhqcM99&*(hhRanSF?n8|Nb|J)1%-XCAFC;`stk8Q_O>C64rZ)yf793
zbi~!VJY?q8Uy`n0qynW=Io!YB9mHpRxl;hMpDuD4*13fx*!B6N1lN^cG>;bvz9^NK
zglkI^v*@Y^N%_cH)R)?bOt>Y<vS>X!vd8-TVrh&Ey>J1Drt8^SYiyVM$(nPvyL)4c
zKwc1z@hVkk47GIKQWU5USkwjNDMp3Lm;4aaB$TS+0PxcYz>8b=GS*CLFubU&yWyBE
zDX_*X%Dc?M24bNF7s-VFMT=m+G;9W7fUe&qLxbw0O^__7({G9MB<VTET5BCzXV3~B
zaeew26OBH7y8dvgRQn8v$Q8;ZN!(q-<~1%kU@RC$Wn>;aGZ#yN+7`wjW(#tklT9Eq
z8q*){gCG5Ph1}efCOgbmN>*V^F(QC<9p@Xh^yp7VNGx4Tw>t<qW!T>jhm&z#iJpjl
z61|o*A2~DN#wM2HBdUn2ya;7%r1NSP(Tu{1Y#Yb)-(k8+J6Mb@cE?j1BAU+Fj%Y5g
zt#yTO!P5U3*JrkQIpPz2FZhWo)GTZ>qZfZv8$uDGiN%_6?z`XqdGtO;kC{q>i1Tz!
z3=G6-+etKDz6jydcD;3-7NKb)1t~sUzgxdMDP3#jzn_jRM7@2L^}tN-MaYKO+$8TR
zgwJ46Tvi#TOt45#l5r^*M_ow2;><@CJzvX(r3=!APuq3@(Sj2E`mq=^^B9DsFEef^
zpI1rKw|URJa8na2?E-b>seoy2oCMz1X%niEtpyaj2Mde3l^M2&mD{#&FB>P70dN5f
zma1QT-4OCc&oI`ag*pU9;Efgy5I23dZ`r*ypH!{#nuxjaCRCcphBMu-0s!*oOVvYi
zYQ{QTf5|BPRW~$omzBmyr5`LjsJLj`Q3ceOrnhComp&2moQD5~Pq=;7xBzm{7F`-I
zTNc)zAm22j=JGPnW04kN7Vc~Y9jIv~h}NE@Bu%X21stLaFxpn^Y%a5n={4WVr^Orb
zhODa+D6}l2=IGzTCwRR%;%YIx9)L)whG1!AB1BY<7l43_&7qL8n^gaIgMjj_=J4h=
z&TYc3BGAcRs%L~@x}vo<Eiyiw-VKLSn5VM7x~?yW2Lr@;oTqc<d67=*fZEQJ1k@1|
z$Cxn5?2na^N$mQe$u4QUks8_$H?u1=&S4pol%K3hJSW#oF^PhzWmGygqMyrUD`_)Y
zm#Tz*ckFjZ`S}{HnlE3N*w15mV{5=d6_((-3v69P^Tnu1k}!2s1`zYGKMu#Y@-tn(
zv#y)YUvu1vFn$$IXq*&Z@*B~ZU;gT!r1bVodF}e4pscaVgc*`rBY{`88|sxK+B6lb
z8us94UB>3XSkU#Orth=<2eIgtp;3*DF$-$n)^-4_+`O3i^zfaq*cU|H;s`&FXBi%-
zW4P`TDde^oYP3_UMC?jA#)*5We8{+BMfvt_mQM?rZ1SZ;1VCAJ(ga)A%cnZNd4ITn
zN5NAJ^23YOyVz)PW_2b8=u(Xn7IaWuTvH6jI5cVRv92$%d6_^?MWL|}--&;RpU%ae
zZMb_A{Z#B1WQpedM=C`8Ha`ekYYSgqp(Gk+X5iqx@Gt7H8PT}T7<>QjCpYZERI(UT
zbf2uW7=yK)vG(%xvDilYY0SVjSl0<_U&Tsboi?TXBP`s<)Lq%mSa*E$ZrGnxkIu&R
zOq6#L4)Zu&#e0%<C~58pd)27;I(oN#8jAa|){*VNOq*pJYmG75^2yJ$Zh~|@DBs!*
z`%+Gcd1QuOn#WOf{aY=9s32s4Ev!*e-zJ9gF$khC>`%MXL#b*Iak_j-ych&OUX8V4
zz9EtrA!;OkVv1X73KNr)es$*E3;Tx5rzIjnvjK|ZU&9(*a2J7P0^b=M7Hw16Lh@5d
zO!1r9)_SmnwU^3;HWqOAn+HE{4oe%t1Fj4HB>LW>>Xj&PJpx~BWTF#aFA3#B%QtAZ
z_>Hn<TWE#(WHq_WwpIzDk_8d-X0M5g;w#H0%XBKYq&7N;uPv<fXb^APC2dC^sJiH-
zUx)BY!fHEA!j*vMH8by~<_CD8o8#@F?XpLG4T!M%saSSfiJ#2xe0tW!9$QLuUJToQ
zO?$OCm6<7Xx)D}J_szU^qoFqXMZt2kFRbSk%k(up2rMlBd8;izOvXt`JBVsxPZi2$
z%3-w1ou4Utv}5(bzS(o=+m&`XqR6F)X$o4E!<689hUJL&o6lz<r>P7i-hS5D2C%nM
zLDGY6-s(j0W^W4ot#$lLKMIb@|5kU+nN%#&qYVrD7qPluhq~~sy&zkQAcBh_=oi{{
z!|wQ|;4^-@Pz+@uQHa^+kz?@btQH0hF_e(*GWn=2f`<8$`c*uW<SzaHt$j(4BuRGO
zduHbD5s^z}t=-cz91h7LC_xa!f2OM-fLHwi-2{Or{QzAA@t_}|e;`r^0Yiy1n4Vs$
zDl-;$H+xTqXUj8l_sFas79_BzDl@{}*0+31P)|k_FrjAhg<loW(V!?M7vp6wO!npU
zPzcEhHpQeB=uUD(d493lkpNH#9tjH7j4V+!R8Rfb<ko4j^kP&wO8st9x-*fz3!LHp
zO)Xn!(IF93{5+1QN7wJVVK4d)!st&L-{nAeT`z!w5auw>DSooxATtZ4t(!?^85tx;
zZ8RJXA(N0Ou%v?=vD!vM3S-L$k;upDYdkoXUEUJAg?VN~h`PhJB#FtaSg#i&SgK8l
z#X{(0=G%u4Ng0cc2t-5|**N3#cy5ZNd77{on+OXH1;$)z8(MX?z_zQ>d~RlB?p@@-
zB=AOdsAmAcP&qXSNgzQ$MJqzEc7R}9ZzL~FC!3CM?9y;RzetT56q-#IdEgKTLbg7y
zPCtV{rZU=;&)OZB$<GrAOc9MSUGSry#^C4ZDJ=yXsaR|U8B7iQs&-LFV+=&-I76!#
zz{c3voKp)!295mer;CDJu&o5DIMd-H^`3Q@o`e_De``^TX*`ACMTkR125AmM=CdQL
zixq?l;SrhdAp;aL<m5_eBy~)Ak<P_b$0o&qlx#3F_<77nkhLU?k-BIhTL-c-=d#S3
z;DnAS6!+a|lgWBZa2jW0Z2kdeDu4;Z>2hKwsSZXtG$xBVVT-C4tks2+mIx7GRJXyU
zC~k8ZA{y&DPz{XagN4lO8dQSob^-|zMYyI}O<~M2*K|2aO(|+&YXoNSX$Q6yo3iLR
zsn#Z&525{MGdZZ;v2}4t$S6t55-ChENL<5k1mQ45B8y$2XGJkRFH$T_B)r<Z1eYlD
zB)?OW%LVTWRFsyuc<IWs<z-i5wDuy5W`V3wLVg~Z$yjGxNAnbd7vgQS-c<(ct{Wn<
zW1Od0oB?B<vDVLXw%ikzt7y_Uxs>Z|>X1iIfJk6+Ju`C%#sDfI%7lM0v2i34A!}%w
z@<oV#yZ~aLfQVgpXee|`T}?#AEM7D`M1@3F(fzw`5~`N1bwmV2)^*8(!_3pAAsAo*
zqu0dNnm|(hRs!xeSRUQgSN#u$D3?PSz8hMYOkO858e^=~d;}+DB^b4?N5pwN<?q$4
zgog1QCBnp((O@$X1uU0rJ>up<1hDn-ZNTudk!I|kzr=~s001BWNkl<ZC<N~j(YoGP
z2R)9bPky?Pp9y9(2G9)32zvd1iXx)Ax)tg(*BWD`HBRI?P-+Or?gNFWGLw~NWzgpF
zJdLMDO;=?qUXI3yY^Zg}L_G?Mj6g>e0OCb8T~5qTwi`_0)O+<pApsy^6%)5`!pTf?
z`FnP5m&F#C=W9ck_4L(F$>evUXboQ?V5J^RHW*{gFyte>P_?;4duZ1%`H0pS@MW@=
zurF0NMPm#x3vrH#vIcMBwh<>_U<z<pHKA=R$fN3IB$e2-(+sTo+E;ZW<4nK6<;4@l
z>9;f1p~0AEU<FU%Ml!Tvp>gF9RQ?86D+64W1#>YIGidlFnJ=#aqo1vVEyUn4*MG7Q
zA!9Tq$Yy1xDdDI~eF3}J@UmEunyh8~c@@-Nbj4guH??JX;oYX@DQO{z#*}qQ=%ymc
zUuv?%?fD*mc!eVl75y4DR_F?pyqV(4&m9+p1YTlER?d+Gt%&JJi<~JkRfwkW;3Mov
zBd;WX!VMrpnWl(VU#)DT_7sl-*4dLUHa6x-DiDb1=P8e$wS7sE7b{9Ydq9*BQJXtJ
z@CcylC|5l}i=|)b2;#GQDj7A1Xk3F_#b{Q*YY2q};_QXqb=kQFDFh0$fRND`Y=}lg
zDG`6RSd1l0SO`575xT`1rr=9%5sXCrT-7;~oM-_MK{;n|OMF9$6HC3+XI^D#R}b2<
zIVUQrpRGzGIjBddgr@O&Wmg&0RF)yd2S=T+TT4#^uSz?xCc>`-6o9a7s8r}bT($((
z0e}GbU;pF3l`5IB-P>>ee7YRR)1yx6#S3koF4_Dj8&WR7@wn-drP$C+1Tk$w0JL4#
z94IMqZW8{osW6ISS8~#tG`%%z${?Pqf+w?|r&zMU0*LSTw};y(ug)Qm5}`)K<EL*m
z8)55P<!DxA8MIE~P^)u_`EpJ!NbS%a?%%w6`;9!tJe~bCi6T3PnVDU`%U0UV?7Gf%
z!*n@Kms2c0<koaTOyt3I{m>0Jx>+`!K4~3WVhY}iPQFY?x4X$=S8FwsC_Kwyj$o*@
zZRG0!FjlVI;JO|8F{o9<y2hUD%~p?8$zr8kPhmE$`|6kfGAPuw0^G*mKYjWR6y-yk
zA(NkiFpDK&BC=i26vS$r0bD<HyBlp#R}Dpi*Bk5JeEny~kAL{|{Xa>|>hAT2!`<s|
zfAjam;oZ;wayZ=o<Nx}fvgB;nfAbfAeR}-<@rU0Z?%wS0UdxC1>8!EiA^6MF$4bda
zl$y~%WhjUgW;C|z_rN?|p0<v(q|6@C<Ta*FF>Wgw%#eEV?B}Q+z{FH6T-MtPT|X?B
zji9c!t|}dWt7-u;g|GhXUvpwFoS!}?Y}C_uep+UtT#I5$VM%wsLsI5z7N_g_;OAny
z7_IMEz)g@4|2MDRl|)cVWpTT~cz$fS5ZOoojYV`sb6o|M_JpLloN9*rd;>ToOkqw0
zm}34AHC^ZFQjSW2q>Jig+ST2#&ki}uRIhTZM2rd^n!@jAU=}Y90O)tOyW0mfYn2k=
z=`jnTp|vJzYbaLIV(sDTg3O1ls(cu&VM0mK6qt>3*1CC`ig=r<)DshBWuM02u4NzB
z0X@E)@LL79T>VFTZ@<988=gzWUK~)VytaaekV-Gsny@eHgjdcr>-uUHFTXCs=7Ms=
zTj!EaF%-Oig)hME+!QN#XOlUlT#(cMDbX`-@}U80ueq!F$J#a8@bX)9l41sL1^Z|$
zGBew#8O<iDtg#lHgWNg8XOJwLWvP^QBqz0`%$K@Np_IqPxQdnYV%GYFT8FF%hbYw~
zT<9{C{GP9lH@}#sz*kbstG@?YH7xf9t^q=DsqpvHwyXgI!U)o33|Q0^uD|&goLI`&
zlQ~O_3ZMxJ8N33Q#WUiWVMSQ<zY%oV=jFq)zQuU8rj<4lSCE@>4rYiJw#c9>93EbR
z$eP9nH%VHhc=*R2<r|4fEc;^~9F0ng8KLWkyVqaGa&7Rz&wjehQ>5QUaQXJ1DEO<c
z`e$9FQFz=;aS2zE8X9YjwI;Ghk;s#>(r6ArC4GyCMt(RaG$@D?73b#WmN8C#xTVvo
zvD_W*4tKAMqzgk1b5v~pBQqP@F^9&sDJo(w>z~YMZH*>}_AyZOZ|(itZ-@vIS;D&B
zIJY!>;kpz#o*$?4W5h`(>13|+>@Z)9aTp(ib#gCY86Bch)mNiocWb*!%D~tTfJimZ
zi3FqXn0@rM*!Yt?%9$Cgb;&(y^#TgS(!|v(&;Wp+lcQu(dteF@4)05L6+dP?JyDqD
z5^GcxM6Qe~w42^oXso?|E1gIV-UmOqZZNJJPagr`_TekZ{=+;yef&KF-n{;5x*W&j
zC)r~CaO3*j<Hv7Pb%aH{H$VAqf494PEjXRX-H!7$G4SQ-2dx&{gxGDsUJzKZhNF>U
zO)w#%5F$XWr6-zZ_>vE>T9t_jlXZYb6^hu;^HN;xg$G;Gd?=7b>pIu(?%#d`h<>_I
z2w@)O-R9{M{CI`Zr|AE{!Bg<4%sQ4=xG^S?#}N^y^Aj`0jIj1llvPKeQ1wNCUOq|I
zTcc`ZyTNvYpDq-p)mvPW$cz{&l7ZHNlK6mx-0O!uQJ}o(qJb!FZNT-5je$ZSrr~f~
z>9!*Pn537v(37)W#J@0$WZ><qcbp0&XuIRb-{+5-r*U~cFV0L%s%a}t)<U94TsZ3-
zqJhF?<9R%bF2vg6M*wiD=@?Z}lVnoD4?P!JB^}!@N(YrkbBTpP8v|W6Qr`;Lc@c5^
zq~Ic2YH@1AQfc62F|g8?`qD2_soN$^Riv?z*$~%NT;L5=YpAU5OKyc5J;)}Dz?Zc)
zOSilU?NdgZeeQ6j{qbxZi%<n_TS8o=6L6Iwk@T_ZEE;oGh08<>7};ca8x(yyR^}nN
zSf8v!>>8CUP>iLh=#^y$3Ys*dfYM!+2f6JLG}_;QYgyon1kd1VR==^WP-_T$@mKI_
z!|e-tU@g5#@_uWvC@tx146kp)rvLcjETgde3Rn><dnq&sA-Als&@mANidgmUO8ISb
z7%Q>|U&;QlY;Im_vR+lIXomy0dggd-(y=W@=uRYZQP5s6L$1#kKR-hyrQ~Pkw&p_N
z|M)NeAwN*^&=ELN_EgFHv!0dWSY1OylZV5ys-U>Wx#}4IXFnXcy@s+1k*DChewQgk
z{q9!$lJ(djN@6N6Fy}*Dr~;Tcm^p%0rgtU2kT!ty!$hGC(d-WQ!{JWMy5twmPoG2^
ziCeSELiC2D70?J?$SV;O1(JWX&SuwXqCgZL-v2V1UZUCG+_wa)QaiCZn>;`Ln4RR9
zqASow)X&0+&Y(p7;S#*dM|E8vA@WKqIiu`|!r|^M8WX}?`ODXZkf;HuELYQ+DSo7>
z-=-Ui4M3c7%K<^WDzBVKqzttq$Sclfbx#~#y}Nn!UQQ)>9SJoqPd}=fKRY*c!=9B}
z>u__QkGA8d?;&}-U5=k(9$-7`I%a|#uappkQ<p{h4s5IuWIv+0oS$le>1eHPohy#s
z%)6WWe%Q<VO8aem`Z2?Hv<x)V{9?)J3r><b1aGZ1){(e10RpgYv}eC96-QXTE63BL
zEK5jEWcl-%$On&`)koIm%xWiAft2e96XAa>v@WiFW#tqSB{LnA8DoueZ@&IjTG#-H
z=f@u|r$=2w(tTFf^(wDQkie*NppfdRGm;6%$|NT_J(bxm-wpu7;eL0xXB8C@1!l@Z
zfXsY3eJ;j<T=_Xz=hUDr@^9uqfr%=Oi#jxxrg+&YI+3c3w19%Qu6JFZ%=3z^SOUR{
zr~Rf9nV+WxtS!Fd;qLX_o3ArCQEb@~cf>sX@VopAbFJ~I&n4IQnCwwQ2m<ZYo#Vtf
zD&sFFzw*~~StCU(GV~XS6Ju=5uI0Jwwn5cxiZAH^U5x`7z?e;;HM!?eNg1I*Aa1_9
zEO_JwNwh}Q=4)R^NmHAcvq(QCXtCsowAAcb1V$Js(iM1-IfE)$cW5$f8H{zQOH_n-
zt_>+l(~8PPc)j_-yb&sKBjNy><)(8griv$9Bz|!{MpLnB9scoZ_Hi{le1S&W>M~Xx
z$iyD2Imyv&9CBzV)%7$HHnoVbfNoM@xtx!oG?k-DOTFbdQfV6-C0XS8!$KMgVud_e
z>;2$MGoB2PgBNvTuu;}-B+<FT=auS6LkCjWlNQWehwYqNZO=SfQ|e@9;2<$28X@7s
zwm{dSZNJt++a5+<!1wA3v~PD=Io42ksh}BUny>+DKJr&Y@TFA`D;gJ9GRp0uUc8nt
zFOg+`^!e?!X*8yx=@Nf8wWYEgUQ{hudz@6LTRTkJb-6HA1*d4jOo7rfsWaMIgf_7d
zC1?tPqR$^1YjZadtwlCE0Kv8Nv?!K|T5Exg7)cn7bz)L1Md$dW0`6+o4FeD(=Ke&`
zVKP(*UBkkkSMJ^{Md}o@80*m3yEk9UiQM)3ZrJN^a@gN7(|CFWG~!O>{U~XKF}*R)
z`ziRT8xGl6V>&;gwOzkU*GTD^NiRVlXYyd<`O#R{?{1{kv7B<(?_?Y#?Gy8qcr?}Q
z#-=rm$(9-lm42lvTvjTeb)B|rjz<g{W1OEafa2vFy5T0eh)EU57=xCP@&m|vKw}V$
zApPW9Oa|HK$6|_1L?Q+tB1EGDSSc<={a=m(s>+P}+7^l(Qz8KFcL&HW_Qn|Fq)krb
zt?P}km#0q}yC6#F%oIt!sf{XFvn-y#>06=<RgxhFX2M{s)s1b)E(6u&!LA#u>y2?$
z3y|6NyFAGe1*gIwSS9|acZdp{fGQ7e?d%ihL1L-g@uf6D@f=V2eNcJcwUQ>bUYla&
zV^SCwMY)hr2NtP^XOf^ju@5mnuF;H$$V#JG=ychOT!u9GlC#Rh8EduBL^dXbB(0#j
zR8bw1V<5qLkI2&|5k5-gr3*a%7#Su)R_k{4rW5Qa0)QbB8(RT9$IoOeu~X!AF=hP+
zL}Q&^_D#mdm<X@w%3Ri0Vl4`RDTG;+9W8S~M;1-1CCW)DHe@QQJgKp6*xxeqczTRM
zq;z@1T(twmBs``s1l!(p6aqjHM!fh+=KCebPno114;EtqI7&#0+Mj%NLfhs3E&x>9
zOoPkwYa4J4WHcRZ2EZppKJIYGh*D?E=#1;_gB*P~P!Y+8n8+Asi~}R=f+yurHLZ=+
zI(NcVauQNQ1tKV<Z$vD-4w)QlU4Q@fYl-fqDnfqFvYh??))+g9N?tcG6Q80(p6hn5
z-@*Bj!Ymh|eByY1w8nPBO>7I1k994?@$@-_^X}$VmU{W&xBtftyWPz_0Q&K~40Bw+
zM?gPMvY$!extH;Hdl8n(mt96irO1}L7qY#L^=%Y`=;slD$$O$O>~C}1BUi!^ipe$c
zMI`4H`XDlY^<!9L0WjbgGx9(r+JpHbOx=>m@=Sjn!u*m(tqd~33=I8nU}ithfbkGv
z<`CvET?`tu-TCRqe2wjHUvuDjzKAO)6LBhKuYL`vvN^|k3*}zIBAUh~@vycNno1kG
zimf&U7KpqA84!wG2~kPy7a#~$qTVe>zSy`k2N5mOg*D3SA>V3O08q;%SFw<Va&9tQ
zl3-0m1+CGCPoPo>=jg><zJ<tZPX<H{ou4HN(Fd!s#u!IX9R*bdVMUs;XdYLW3T3oC
zhr(XJ_~|6_r19kK23rOh5W%`Zfu1A?BOC24%L_6EKt$towbQ!JSnES66r*dk4-<SW
zM}Y+`MWX%_3r;92*;r>PoPpBLWe!ajqnw#hmA70Uw(IwI%p|qnC=La{KKflOv0Vwd
zj2joB2WBxyL1Qo#&(m3CS(Q?3^lY}w1U?rmlA2SBw{5q}59|t%F&F4G9XQoLvTWF*
ztcV+%dD)rd?Oh^G<|yi;%_rl&eb%}G*Rd1Nkci9qyC%M;Ku3^W7||5Cyh!^b_)NUv
zfRo`15C=mMfRQw=eT=v%5CwVnjEIZ(2gOo&%(jhLX}K`Pyf%&4v*pBmOg_WI&Yf-r
z;D9=RQI*w_a7g!25i1)by_%(86){lp@41wbaD6H<<3W_i1#bjgQd>4kbD**H$eM@E
zqL#_3{7Lk|wA6d6x&_=WdqiCR0yd5l)q@d*h-+O7<nw*9CFZ%tux@IAsD`u|0KQsj
z=B5>~Qc`G!Qz6TindmjxPK_hN+y<x%de*tpF;cv*l8-KyQ{GA2!BeFfRe1N$LCMrb
z%0+2pp@&pVcVbu(IT$9H#n*JT7!Yu=r(j@W!d8=0^){9q0<Hna8->iK;7b~PCY??b
zjfRj>5DAo$(YU#dwfVYP0C$_X95w2pk=j@+En2s;Tvfw{mb{@rg)N#0|L$-9hM6eZ
zn^|pdwk(BbIsY70<>agzcGeAzqI}80MC;wp8c*2uLrRSe0t7#u9)Eyb%t5fOw_UG<
zXr#ew8vL>1T7a<*(5AD*>k{ZPHySU;c^qZxtaV^aNazFWy03oquVk(J=^}>X%+T*|
zMSM<#2RT}n$6v9o8_!SU`EhAfE5~S!Za{UiNBz=n*rTyhxD&^N*I)m+LM<ctNvgOE
zJe{9X;vWkIN<=CJb%;gn9&tK9nr(6d0D3>wvO#DxLB*JC=*0l@<ye*=ps`lUxvCD?
z8S6rrIrxM!AF?rK^g^?JI+uNZQz|O$IA4ysfvTL7^&K3aG0Yczog8jo-@g7J%OH3k
zg14^APdHspXiydp`Dk*<6qtjb$1u<FNHR93xso5x<5|~EjO+3Wtmi!F?xTj4YG8#H
zzKU2i@)Ak7u18~T9zNt*kiKIGo+&(i`h!y6HCuhuWnrMft+Z0+ite38*i)doI6qv^
z0yRgz>jxqdVZX=$Kn(Mg{Q{S5$dr6!+*xt6yBt4DVkALKzq@(&^Iywm6r1w6oX9hU
z@qEmh4Ac4Zl?%9OB7}L$MnSIMW&OP1XMvcBdtbCRtEXGdW9;?1t~bWsym~9Lw`h#W
z8qecJxk`(->)git>XE}dX5WtxyntMCl$AAgrEG3mdCOQ!(*wSJ6hv(EG@j(WTsPdl
z{=m$SKm6`+`}*+kK~liSAAWcI^xgYE`4=WZQLM2^eVXTK>W5voJLKnYstDQ1m6<Nb
zA0f*=A&8u08y>|I32S^}Eau4p>s*(R+C}F`L&;=|*$9V35Q#Oc^0_N0)unM)bs;Y<
z>Wqir!ppAOzg#JFCCM<(6y0dX^c?P^)(?9Tmjkg55LEcUnI8>B#wMmQjOv1ktpd%X
zsI7b=)V9QExXEgY?z>T0(U<98a{NoDt_>Su6-mK5AjNu^mJ|8R$Z4m0%@*Kji&4Y<
zF(0#x&AdMc?odea%3ow1eUHVWy8T;@!BFL5uclGU!WDKgCe}kKj_6t<KKuOF5{x>1
zWM1SJs9CkJv1T}82JnxuKwK}YV3Yme7a<vzU<6(@Gx?Gy#G(a=I+%{`Z<W6RtKqq3
zdGhi<mFs6i>$(O3WF3#DinL)48T_Q=)?yQxl@|l>!f!Q2_Lw%~hOGkP3YKcsyoc(8
zJ(@UzlE$t6jR;D$jtitKbB$8zC9R+$K@16VzUU~k0@jhL5p9*Mn!^hja2pA=JScD_
z+suB1fT#_=Q~8ecTs8|@Oy~1WD}hf<lUT0*mj9b2`I*R1BO2V@KKN-AlQxk7%T9Pj
z9XLHzCYdh3DtN!>uMCkyKTqDzu^U`xQNquS>oqBCmF`6ijT7F29Ap%{pGIS?VnB}&
z&EAZk#!UhK;E8-OKO_3)*Z(Gs5;K!HdS_G-QJBXIGl}nZ)lx}8nX%58u1?U$xadW5
zORLj`DN~*`W_r=pR|;fd4q>6Iq?Vg;U6WNvVk+I5mz<vU@})4(ONolA_E5yVVm`sl
zyPH>s`*)y@r1SA(UV+gzue_A^^OWVD5N#tFm=v2-e<G>r=ZtO3bRMFgm-X``!0w1{
zDD=djJru2V##%ug-@X3OR7WWReCEsPa{7F|KetW~cg`e{zo<o^TW;0Yv9a=kyq1MC
zd5_j0+GXES3jR)bIMWCTi)&q{t>Kp^Mn>3+enL#e>I<8Re*Tw#tvgl5mYu>;Tca4g
ze*D8fRe8Kt?TG6c)TCf~X3jfWYlN<}<m+znQuNVS3(W8S<gW_!OvFD^LL*tMZuI0`
zCW&eA(>z_|IJd?b=YIVCZ-iZz(jBG{0I`c%ENWhV^T&4m&HXzj`tkR_k!Iok?)BmB
z&F3F}cl`K=Z+`vP#=6fx{ML`7q*?pBHz4pm2D!1Aq3d_H>rbD*OY)5(pomq7nsA8Z
z=iuizU;io(Db<Q=vGh2e=jl98mynK4y;IgNekB$mH~chSOvESVts1fyqXh2d*xwEp
zaOupq5-2g}LU;wRMtm-~QnhjvzZ+mCppEaX8cz7!(Ft1|N*&(U{gM>X6d6*i$3be|
zxF|hhl{g}<Hr}6!d6flB@>Hiq5X8wp*5G=`!&m<&s=gX5WYwO@pP#XG=aq<bqfPab
zBJwK|-nc269Otx-sZsxbRIy}X=-^c`2dGu<_*(1w3to}8@`;>D=uSw?DHHR5Ls;wD
z)8kfKZtFhXd_OFzW{7RC^tvWJuTZtqucTeYP47=fLXr+@mpiR7rfusn*Jj$z_d<+9
z2_o_ub?7G~lAuaNHQZsrqS2XTGA&3SCWHy?`xvt^t|6ubj7b}^NS>}0m?-~0m6dVy
zz>&0167Ia0#W*+Dy)Z{Dh?TuvP3O=IB{Y?QZOSTjY*Bo~q+0eeG}aoZX?^W$rSJF;
z|NTGz`^8itQ^@99%lbwo?-YVoJnDCcTu^E*D!C^TUAn~M)A<<ueE;s}QEZLE@zZyR
zrAgcG4o=_d*PLJ_3ZtTVUYEjiV&_wT0wQtM-oN{q>vwV)YtMQF2;OHO=V?4PNTH~O
zJ)VuR`Q60}*LHn@_9h#V*vblXm?qh7##a4gW`6kUmzYx3SVK>B!Rd1J)1|IG>Wsx~
zg#yF`O#N`n8TbPT5Qu^X-)|)}H4`X~t<usfh2*lyh+N-i<laKpH2zq2sF&L=)Ah=l
zNw!K1ylAHdN-I#jc=Fd6YwzFw0+N|rh6Ky)IG#U8?m=R1bp4P@I%01I%lbzNbW-`~
zx&2rs#wK!+$W>HUg04$_dJwX3E;Y*z5@J%nyIB>I&T(7tr2!+@&cyCmXb9EL7%NqA
zjP?#mOS4p!<zeP&EYh~Mb9!}X#AD$`!(SUb4FY&S=T6>udNjre82fVkY;9+xW+U!;
z$zbnr|IWHj$}L?#AYwNhIJPIpxP=wYT;nZ)d7e)4LLx69+80D2-`(A?OKm@fE4cm!
z4^f{*OVlnAz5V7dGV8$gJ7}b26A<Wf{1p6j^Xfy~YfR_I@4Noc?QZ7rIFBb8c-!wQ
zdYicJ>4Q<tzNqw7AxxIJU?vJudlNtd5h0)(cE-B%=O2V%Bx+~Vcp8tNWC8TU!S;jJ
zg>Nh%WFh5BlJqroV(naic=c{^*RY>1QdDE$dAuz6xVg|`nyX5D4!U7iODh|QOf#R0
ze}z7=RixV1YFcf!trusn=LBMln-G{53?Tri9)1bJ7U;XHVHmIGop6N=i(sr1mn@<n
z;v-G<ItFC5Z3S1=CoY{{0f@s|f~eC#)<I|$81e#757Ak>==-e_0iWr*8H43k$f8vI
zZ1ZMy9veA}H4pTcb<x_SVa;CxS36Z)QS-A3m#_?-Tbx8(qxoYTiUpXwh7Z(uiff~d
z*OD;AdhsoU)0%&*kJK32<0|#jEL$MgwW@GsMi8zjrX{`#FVj120N87jtNg-NLx<`N
zC1Q*oksJb>3J$7en}lbD$uX|5*BRCrZwk_!yunj{E6LrJmLgZJ?ti8~F#u&{SJx)Q
zm;tB2#6;2JR3NA!2n8aM99ft=I*b;}wygtqOKL;-h$Tod7Qs<C3nNwpV-sF1o~0=<
zWnNPCw@m>dy2Vv0zO=$_#3=b`FnU34L!cRW#aaMpO-4m6HeE`|7okdKnL;qef^|}Y
zYk)=>O%xAev|1B^DX^GI1FmA#V$Om90P{4Za)!wP1v5F<bCGEf%SwMmr8k=?13)d>
zRA4NmoZq3w1QQW5`0)bD0H8?)GB|ciT0$g9qA~*lfD^d@Y=1rl(JbiP?0w_q-~0Vt
z{>9wrYUeXMy%A;Z_OrK_yqBNOlAnk@Z>Fr2yC*d*n&~TDedhS3;)Im~luZA~u?wOR
ztf0(7W19uaSh$dA)<W;fvb_BS>4;FS6Wu<1$hUG7Nk|}k@^gq(vnZvcSq&M&kZt*L
zO)V#>Sk50xmYtllx2;()*5+s_*R_l>Tvu!(UlXnL#dMdY-`}D!&JDR4FS!e3C~s8T
zvH+Sw9^qP1FHUp`j43#xiU<KArRG@blNtD6nne|#L}Lh&hIJz+&A=RjJV4X1cij;D
z9Kw8a|5iAK2F>N^leKPt`x+4X-OW5*#?#|)xEl_45{Amj(Dl1GVshHVmOP>{iR>8r
zzIhyswZ#rDGub0XB`}dJ{@iG;oJXNmZ)rAHwNql<-Jn5=94AD8-Qf;J-y_xNICx1~
zD7{+TkIX`^n$C}<2Zb2?Je{BXe4!BJ$NY3ra4JT?IVxqQ?f~eHqX#I;g^}zV2P$xy
zXi-L#;?Q(C86#O{3FpM$D6wwH&tvdjb>dClJH}dL4Pqx9Q?xFZM&xA~n8JK{`Vr7r
z>*NehY7&+c;=LQh!PhI_T6xCMdh*1^fuZ1eA<_%X`6{tC8_RP-jpkU1m?@y`tW>lR
zbH!<S=NDT}s^kh0%_31$#V#A?U_2eO-He_*+x5DtK+F*Qm9vJK*GbK4>LS=FIlotn
zm<TW$F2Wk5m?$ixf#zH&h#NW5Z7w)eT>-=NVE_OYen~_@RI^M96pMr0)sJN*H2tu*
z-7YC%gk{{G{a-S?0<JrNYb_6EKV8rm)9;xf)3H<Jl?w>KfmU`nRC30MMqV@3<t9Z^
z;#`xAj1lIv<)DGIv>or|D=1vXvd~m;MgYKk^YA_nW|l5YzZAmk8}znrN)*3^rntw(
zIDzvfB!Y}jk?;}Kk*zR1M=H?}F-d{9TO{dAh-0@3=6E>V>2Qacd5$H63{?wRfFc(I
znUX5MJaRCIwLnjuHl>kd05mp5x7^r`$ufwhcR;F*X|<n2o*_=A?ag#&!KUEH!~GlC
z4#v7~|M7nt>-KjKGD^oEzde2W&h_tZUcHmm=%)*}#9{#EFi&U<vcn>R8Y|)A*`&DJ
zoSE$MV}8B_nzW+wvZ~n>K$b~oEe#sc$4F6Y7tjocJ13qk#pWgQy~WqU&trC<Fa`l}
zx;*I(LSdf5tQ$;zzBKkvAyi1N<wLrzhvXZo4lXP|%tS;?o|$R%%zU_eQ>*1!B{Lhs
zJZqp(fj%K3Iz$V`ik-dUFfb)a>fq<|(?<dL<RxZZkEWb2-C&r3g6@nUh1tWj9{M9L
zs24FR&H6jiKJYXHh#w*9dI{&?8d@fMm1F&+KNa5s4FZ{!11^W(&(-VFKRy3E-27N9
z07SLx2u4VK{u=%D90;PI1J=TYt-Dht=0yw-frya2G0&RRtnwVLi4&^VK<4GI^Xh-r
zW+kj~U<<&6fo%l?j@kOP%qclj;_Bg2t)JSVx*TwZAlf%3dkOujs<>Wa{DnZ~iiJ97
zF7k`p1ncq<8~?iL9+wJv$qYS*!-bZfAX=3yJ_A~t<jRyqqFUq|L}QhlCtOEWLsm<g
zwLv+iU^*2RjdduUX^NH;qSZ&i$2h>46#Q5s0?fWbMzVQhqSUH!U2GK>gNZgK2OZED
z%xZ;P+J30))SFqx#R6zLDdw5lehcf<5fy4bpHk3MrO47uL8v4tRxCbNZ)a|b{|ZU5
z!fDIxQo~HfM>03FvZa(oWiSRh*x0h>iioaN*E$j!Nmm453%ZbV;Jc#LEva60D@A5g
zIb`A!u1yWLq`P%8kD!V~B@O@XZ~taV1+Dg~nh60EG@Oc<^H%QFcG+GQBjyBTnn^^1
z(!VOEd2H>d(rBO%hW*VNBbYN1{n}a~62;C=wWgWq{@pkGyEn1|#`BYWqjqvoH}VVO
z{kZECg+Cq*rOYVBobh}FrbcQ=QgCTny#DZ~RVT9YdYq~D_LEtV+C?I#3j^9;j|{H-
zK=jE|UgyTSD2b2@5n`W>3890?6sGY4b+)a-Oa{b$cgTL(EdiMsB>k#;pEVKzDa>KI
z=w|!<yI<r)C#v`-o%AqY#><nYjcfBlQEXa04i{LM_JU+$BCn1O=!SizUzLFDF2&BW
zQ$&d)J&}=8Rc=OmKWV*64uPV+IrjSqma(?m-`*n{+YOZ>&syV9U^vV)o{zfk758AQ
z5%p-yc>avi5K3~R!TUsVU}g|<lxhhZn~+dlx9j#d<MH!&`YcqaH$VGxH1_lNzZFlL
zZa6%A_$5>L_8<TLaR2u9;X||{B`?dSxXt(rmxPS1>ut9ec1Q3N`DwU$$Zsb)ENCM<
zButm_{L~GHZg;pmeVopZ(%jnLyfW6AZh-PFlV&MgPM@dqQL5ryzc<F_8WkeCZXf)l
z|0cIfHMlI6fql^f()l-{$%J|e{(SrdBA6G$w!jojH(1-rU!0#l20!g??qG4`CR@au
zQ?fp06+ErrQ}i(_^2_Pdta0x3SHJSpdA^96BOBw;TJm!a7cZwzy2Kit4zbEAbV*Oj
zXt@+5-GRnGKvda+&&Ocl4#_ci`|y5uxYy!B^4;@1LXpOW5N2871xZ=E;4snU_<8mE
zK*Yn{8|ymvQWOj<RS%!XKs=Kg)-bZR1OI|gU-FjLUqtEA7YuO3UX!*y(e!zEna#no
z1M#B#S+zN@zBM-doW-E>)n@euqIB(Fx%w8~7+A$E;pe6+MaMZLT+U`RrPL67TpIwy
z+{%q^8wE~fq|vUd>~Yg=am9Av<uhLM7I4GwerX)I;MkNbYe`dxBIzct%r@OkKePB6
zE~VANvdGJWYc_YP^~Fe^p#cfEh;!uBd@VBXNft37;N;VYDdv$(B=LcU##c!g0s@9s
zi7gsk0$M~98{}AsK=rVr&XFNWs$$vKQUEOGr;+{@pIqdrQ{q|VK$x`%<(F@*NEPR{
zx~5bDD4|da8whc^6JPk1*VIu8_&IfUYqJhqWKJ);AXZPWnykOrK-{Q!s`X$pYp6;I
zY9rgU87RvoX0XvU1f|MQ<IJwoC$_GcH6vqPRn~r2Y!#on5&H>2$>Xk&9Ab<RAppjq
z!IvCMu%;|ET~4}cA=dEwyEljXH&Fy=JTr5cCqZKp1;tO;gg=zdgy_93b;g@tF@|du
zW}T2R^ZnbOr3Md2i{~WXCX!CUkHJUGy0oTok+Sr=Tkj`7T{f<8R?#9?Vop)T%FNS6
zN4SMTo&^E&VZG)L{Omd*?_<5o*lrj^(o949)~-{fyp_W3+lTkJ4<AJ9Kn`W`40-(i
zpMb&pIm2XH1NSVm#5t|$D{6=8tTbW^GJ}X{yIu?41V4p&w%yPWDsmq%JE!Y^+^Vfb
z{V<hGb55qw+`ayg<!x;@gn67UXPwDrP75L)KY!QtyW5BNdS8cm^7G`n-Uv2<+0P?~
z(C=?Ev}`<o3i8Z=07&F@`p!%bAN~}WM0|I5^NRfJ#Tq`1qw5AtoY&9a{Xf_54zJ!b
z)A8eX@<#n`-|cS3<HzZ86eSTK=6GwW(bmJ?^*if2>9-y3-&oiC;>{w2H=kwO<oNQl
zNKcFcFLJ}~{_QuweEj%rRLSpmuG?wiS&$!IT4oCBGL``_gc)L1%c~U*JzV#1zcGpz
zL?KL<#{_P`TrF^}v(6nKKQd9W`RZf85OS{O^r8v#*n<0{jLBe<aKXaz(=$;ml84>y
zu)legEm}heS`eeDBu|&8^W%@OuI4YrziZ-cdMA>)2%5aD>1Q#~hhP4cv@e^#7ve{T
zl8xubw%k<%ou=_DYMO|+yM3^>bMVvuTouAzX|!k!TjVMa;Ozj1Ur1wJe$KMh2*m@l
z5X<D@5Rt)rc^3GS2X84jS0F85wUSfe_Qtapx57ibA}+Knq;EG;*HGgKSNo=oYxB0E
z0_wKva}wc;za}QJEFzMAeu!ie&h&|l$itVd;r8lfSm$!AynoS@YL=-OxWj@vsk@cD
zevXuAeJPN@(XT1dC1Zvp(9kBmD%uM<vTmw6l5A0a=Zubt5s7fsF_R-$8PHN`0dOq-
zCm3z+RK<5l4;{n&d__S?L`piiOz!FpZE_-22`N-#%-WVmbyAIVvJ)%-Ra#(*oo$&+
z5Q+Vgc2>ss++;ai3CTjkK1}?L{EdZrQYErj+0-*Pe41948kY@aUIQ##(+AI?wuyd(
zDD_O;GHhg~O3eDA6#0veMD16KPzY%Wh`<<S*jj#%o)uoGNOD;loV6Dr<N6W*+kg6Z
zh(@Hj@+~UK!87-{?Q}V2p3X_JI+8TIeyBTnrU47A-doU8HKZ96<lomltW}S$iF_N;
zZD!uzKHR?kfXZ@DYB<MF-}!m05JTw~1!$zR*wkeSE0itf4R1DF6qi{#MtaO|UcJwK
zmu#XY%?A0O)A=}0=Zp?-T4;j*tkkf$wmv|VWHd@PEcNiXmQ7c@8m17UGBsH1&{*9d
zq2P_RuHP58@94(IjjkRucm1%nIVpq?{Oazq*@e8ICB=uM1X!QH|1Bn#!#rNDui<Xk
zr41LyS(~Qvg7UF69!h<n$i<M-0x>Bl4|e^2tFIuqUmd;rc}Br{)Fl=~+~2*iu2&f?
zO_!s(x!5{qjFG)HUQQIeuw0BFff<JVVSn>5o}Z@6QO^AR?VF6pjwiA7+c;t!$J66@
z`mDp&-OVd&oiR4uokn_`(aJG+9hiy=ph%O*&ZSxoO~|Ifk8xSn_73w@K_Vr??shk+
z;RIrRo|z!a_WAMCAM`5CG&^zigGM`+0wC^g9&%~w{PYn3_qVT$H!?s7Gm{Tl1fZ<G
z7;SXjuG<}^%W1wG<=WWYyf!B4J}2==0tTX)g7<#bY7!aTj$&%q+9Owx=6*P+lT#$+
zObsK7Y=|r{mS{y)N1UN(^hhiE)%#y011V^>5>pV~i=>-P`lahA4N}LtZtG@Yj*x8K
z-DC>h`}`^0u(z%|+`R_CT<R0s+Av>|Cm<NxRTUSec{~}{2~-#Xrpwbbo^D@#km(=}
znn%cA()U9EEf<7}%*&gh_ZM~(Yn&Co)Wce>lEvx6h?uP=Rk7YEC!;OR9$2qCzchp7
z)hfH{=my%zXcf!O#Kz1<AjVA5>{KNuOQ~pHLqe_mO@nh&`4X>1qfwtXwmR@i1^a5o
zw%KfCX5)HnFukkl;Yoq)>g;g6hIzeDdi^cxr5d|+T&LCRbn>;Aj6`62r6aCU?8z3p
z>e6M13=@ehB60G&rwZ1wV*8N0A!w8KOjRZkWtogqh)E7+5MW!^DvH?YF{&TPaz9(^
zppNU6{)5oJ65qU1D6G%-nigD9t+1uuGX<=jftW((lIOkv;(GHf%|#^pCy;M#uFIL*
zhvmJQHyS)xyNoSX4Ra+!&$uSS9$zVK$yKV4wA%fm*NW<PsIzlpk-`h=XZ-ThzCp<?
z)wGkPMq~0E5#5C}*(^mctlO2b)PTlXG)8PE9U6n8Eu@r65;4}~TPJmxL3Nle3b-XU
z$3~w_#l3o~zSNplb5q`w3Otk?9K^#~qmP6xoKy!1kvM^ODdlk1b-SB;*%jTe7bBrY
z-5{rNc?6?VE3k}@rs`LP)<!=C3!fCAuJ#nATCVXU*+2^C@$CIH9PSHz!dS?lVIpH(
zKOFpg$xQZ0*G;RHiHRdZJ#ux`L=+F}1hHDGB-fu@ULn=u3ZAH072=Qv*?}=Nqlu)(
zQ^?)vtR@*=W{O$|7%Tp}n+HUk$8)xq+TT7H>jZy6AxI6&7z=3pbV&r>WavVPFTZf_
z5LmwkWhIYqY|ijzwv)7X%0JQwBzU6)!sr}CIf(QaVV;sPV)3SLI>fpXE5z0$lq!9!
zLHGa^W^LzWU7rc&IhGPI-m)x#2qDbl`Iyxq5MjDJWmZOVG>MpA*YCRF#`U}1?SuXp
z+x5oS@}&&qX9_-qS=C^19*@i%>5LVzB)j!7K!{ecoB;}K(8zU#2#K{V>X#ge%fx^}
zkwk8B^9jX`K;DNiiBwxI5#{a3rAEn2lx*}208Y~hXJd?|D7^;L<w-Z2jdjLat?&`s
zX=x8y+lhr1z^!D;^0ne0C?lK|@F9@GiPRV(5SO|px~Hv6hU1+;Tb?ACEQ^zE4wugT
zLgD6e{FKqTMdUI9Wn&S`x?UmtRkt<^ydtguWY!9S%NqfWHHaoNH&|$yG@d@AvAdf)
z5gQ3XBrqA#m8b*sQwf%?m<GyPlDdc#4qbGUr=YzHa^*NHtBNRgT_cKxL{8PAhD#f&
z_yS+j+gmVvlmBhaKdsuZnCwg%v<|S~GV(E+A5TmMT4HrWSyR;GrHXtB7ZzN81Oo<f
zRW}>~sHq9(1ecP8<C&RuhkI7VHx;vyvCg`F8jqD>CZLG!=W9ULkepK?GIG@Io|hW8
z6skpe3bfn?Mp-{obu_D+P<l?J7Y`DOue46#Sgnw(Mu@42+wX4BSU*pYF2dW_9}tby
zqtp^d>x`c+<#a$~CYjvjszY4J*e_;~*Y%vRp}WW?XXdDTz$}K>)>r`aaE?m6z<!>L
zF~}Ctnt071gU<zv))AK*4JzpR0nq>x1u~j);|2;-o-!f=APskFU%}54Kk3|MJU^{&
zQfA)WzUp^3qW`k;Vd|6#ehz+|FDKXU<-|mUX*_A&nUx4wIz1dq+!<UXuri7#QkU^g
z9D<mXNqlTG?X0fuVA{5U=isMo(Fa(~AeQbRRdSR7^LPd(W4rV>JYA03TyS@|x81>F
zk!c<Fx69JEb-i_cD)r|Z0%A#DBs9<=23=ZjBFjcmi;3#uF)y3^$cBLtZF2`|u4wGk
zYT(`i)p0p~%3I{syI<&HLphqP3*um^eQK#Ffi#er<>qQG!fG~+L9n)#g<}er)1$TB
zt9L(_MKYbA#_0lz!jX6^qt;SqqCivr6f`z=7UZVS^*t?$uwpEpFVdzAg<2)Cl~sEQ
z`~FJ}3f6x<DWxy4oi?5Rm4IX`3%r%WGha{czx2@;|GNdfqp=9)YK0k-VHjvlqZPxQ
zrQtZY!hp>=jN1dQkhh>k@oQ{Drhie)nZ)Wgxjdr&Mh0VD62jozZ)0XQvBY6q@>@1e
z@&ITz5^wmbZw_EW$-~09vSCvs*hG2RO)hCYoVnDO^5zU{(1{vv)njx0EhcCp5!;fK
zOUZ;Q@D3LF^X;vtt8Lo@CGvP2rv^7vbL(f10<-)_BhKnGWEDimA~nD%Sd7FE?F?#M
z?r-b3^99_Y&6WXTEF*%Fn-9T572MXXcg2rc{3S<F&Wp#TQPa*Ie(7X*`N(4tEktac
zV!2V+*ic?&0A-B&++qIZOgjW^IiQuGLK3DS3aRR_sg}EFCt<VrBUr|D9Vi3(h6-9b
z`L(H@^nP{!V4lY8N*Et^p0B^@((Yi(Q(lreBI<WH(ihhmo1aHNjpap+efNuB54#&y
zFlf;-2Y}!wKhMb$9aqf@U--<6Oy5Z5R@GXqw5YWg2RGVa(N)>rKD?KD7c58!6%0E1
zEsRpIMT6G%%siex)gs^`GUCcJGb0+~nlMd!(M14Glcu*sg2)QT6mXz%9R)v~9yNN<
z2<l2(QiLF_s&3dneE20%_{0DG2RX=YA3of@{vbZ`va<Jg4@n8#Pv@fqo=fj7(cH?0
zi{c-$y)7A(e5fuU7~|wEa$Cy{`((CG*>XmfSI)4Tos#Wu)WsHkT2yI)yWxO{VIG@t
z&QI0vZo1*7?ze@eaWGw;P>D9k&}Em+27RV^BhM^#=A;lyasl5yyx-lt%Gy^EwXa?|
z_-G(17bsCsWrNKOKo-vx9VJ8ze$HwesmGILPML{Zzq@<;GXT`AA!Z)-H?AM#ZO>1i
zg7<zpmI|uviM*mS5pQySiv48F3)L&70z>6Uv%7t`efW^-l%6Tb!C0yh46?}Q@hJG!
z(A20_>ltyNVoNp}xK~0yfM{Lc$7K5I@nuw(WS&|qOy+gSTfhI4zbu*_M7k=IJWmjS
z{XA|DBLJ}NhU>CfE1bQQFCc=59w?4!xh%V3FK30iEJ`7CJU?02D_OXvd|3GrGCpge
zx4}+px|e@U1n}&)ZIr$jO9x};Db{$6g-z2}_-7QD-~5IZg2y`AWdn2yEk&WqW@F%s
zE8n`3w=F&w`S~b$J2EY~7DKa0ae=;3l$MBhP&7djc6`xrC&Ca<J$#mHfiIg!yuOOo
zj3n_3SI8nqT*6YGgXHj1C~|EM^ylC|7x^cD5Za<nhA)$bh@1`HsDiv;X?;n#s6bwq
z-KNylQ(ij7oqWCi{iW$@A*bWU^5PA^aK`1maFiAcVF5bRGB00lo7iGu>g08e$<zKP
qf62c1DTTDw&ZkAz{DjM-{Q3Wm1glWbNi&210000<MNUMnLSTZ{m0)%N

diff --git a/games/NXDoom/pkg/osx/disk/dir.DS_Store b/games/NXDoom/pkg/osx/disk/dir.DS_Store
deleted file mode 100644
index a2817224966db5891927e1f724ca4753bb17db89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28196
zcmeI$yKWOf6b9fkAwrQb!35DzAU9NCFCZSkaW*0miHL|GQo6mxUS+*w?XK;(ONVF>
z6(vtWnJS_nQg{Qz6Yvi3&+a%EBj_j)|3vojnar7){d~(rL{w)OJ`!1w^IN@!<h4lS
z8lq`)RS?s!MCvwWpa2CZKmiI+;2##aQtf@geBa;0_q+L?XQKcG{x1PF?{2#tTr>X2
z|7|nBYvX3(VHL~axGT>Ii1X+^YsecWL2TQ2SVi=pDSNz7woH|05z}9tGgMWMyluxH
zR<SA<Rj!Khc2#ALGHA*kQ&hub$lGP$9R(=xt3Y+OZ*`tMb^S#97*N{^iVog4yLPaW
z*80k;=f2j7dFvtF8^;gr;JSRqkIa3EgLHIWus6=fiB7v0dq%yyr!!0tR<p#xNZVN&
zc>F}RQk_P=F8a1=8bYjDt~-c>qN=DihkJYo)Hb~!P79s)8f)&f#>V5*-R|0bB$GEE
z7JV<+?`C?KhONQb)@BO+luq8Bo*aGuG#&B-O=P_>&C6IfpJK<S8#~Bun#U(c-#+5;
zqTI#J7f%A&m#$=@WhkkH(vksUS8m81{G(;F91)|Zz=&LW_!L|dSC(YwWgca@6DM94
zdrr{Pflj<4YKB_(9e)@n;Y?>UAEnM<zw7AyzzOrb&{@<x=qJvs!!1#c$Zc3&H&=v)
z=XjJCNii8j_Ia(zGWI!;L}FZlhuy{4Un==}qJy*7f~a?>4vmbRX-QUa4H`8XwWcn@
z6}iZ?^l|N;nf3A<@_1&BtMWotvAzqP)tRyHG4|_)_3E;XnfI{H7;|UkY8&OABePqH
zF4wCEGxbQ>C_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbF
zC_n)UP=Epypa2CZKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6rcbFC_n)UP=Epy
ipa2CZKmiI+fC3bt00k&O0SZun0u-PC1t{<r1bza=3ApP3

diff --git a/games/NXDoom/pkg/osx/dmgfix b/games/NXDoom/pkg/osx/dmgfix
deleted file mode 100755
index e802a6f7d..000000000
--- a/games/NXDoom/pkg/osx/dmgfix
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/osascript
---
--- Copyright(C) 2009-2014 Simon Howard
---
--- 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.
---
---
--- AppleScript script to automatically set the view properties in a
--- .dmg file - ie. the background image, other Finder view options
--- and icon positions.
---
--- Usage: dmgfix <absolute path to dmg> <disk name> <name of app>
---
-
-on run argv
-    set dmgFile to POSIX file (item 1 of argv)
-    set diskName to item 2 of argv
-    set appName to item 3 of argv
-
-    tell application "Finder"
-        --activate
-        open dmgFile
-        delay 1
-        set theDisk to disk diskName
-        open POSIX file "/"
-
-        -- window options:
-
-        set bgfile to file "background.png" of theDisk
-        set win to the front Finder window
-        tell win
-            set target to theDisk
-            set current view to icon view
-            set sidebar width to 0
-            set toolbar visible to false
-            set statusbar visible to false
-            set bounds to {200, 200, 717, 545}
-        end tell
-        tell icon view options of win
-            set icon size to 96
-            set background picture to bgfile
-        end tell
-
-        -- hide background file:
-
-        set bgloc to quoted form of POSIX path of (bgfile as text)
-        do shell script "SetFile -a V " & bgloc
-
-        -- icon positions:
-
-        set position of file "README" of theDisk to {110, 220}
-        set position of file "Software License" of theDisk to {400, 220}
-        set position of file appName of theDisk to {110, 80}
-        set position of file "Applications" of theDisk to {400, 80}
-
-        eject theDisk
-    end tell
-end run
-
diff --git a/games/NXDoom/pkg/osx/main.m b/games/NXDoom/pkg/osx/main.m
deleted file mode 100644
index d9e08032e..000000000
--- a/games/NXDoom/pkg/osx/main.m
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <AppKit/AppKit.h>
-#include "Execute.h"
-
-int main(int argc, const char *argv[])
-{
-    SetProgramLocation(argv[0]);
-
-    return NSApplicationMain (argc, argv);
-}
-
diff --git a/games/NXDoom/pkg/style.html b/games/NXDoom/pkg/style.html
deleted file mode 100644
index 4ae291a3c..000000000
--- a/games/NXDoom/pkg/style.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<!-- Tweaks to the pandoc output style to make the resulting HTML
-     look much nicer. -->
-
-<style>
-body {
-    background-color: white;
-    margin-top: 1.5em;
-    margin-bottom: 4em;
-
-    max-width: 38em;
-    margin-left: auto;
-    margin-right: auto;
-    box-sizing: border-box;
-
-    padding: 0;
-    padding-left: 1.3em;
-    padding-right: 1.3em;
-
-    font-size: large;
-    color: #555;
-    line-height: 1.6;
-
-    text-align: justify;
-    overflow-wrap: break-word;
-}
-
-header {
-      font-family: serif;
-      margin-top: 0;
-      margin-bottom: 0.2em;
-}
-
-h1, h2, h3, h4, h5, h6 {
-      margin-top: 0.5em;
-      margin-bottom: 0.2em;
-}
-
-p {
-      margin-top: 0;
-      margin-bottom: 0.8em;
-}
-
-dl {
-      margin-block-start: 0.5em;
-}
-</style>
-
diff --git a/games/NXDoom/pkg/win32/.gitignore b/games/NXDoom/pkg/win32/.gitignore
deleted file mode 100644
index dec280709..000000000
--- a/games/NXDoom/pkg/win32/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-staging-*
-*.zip
diff --git a/games/NXDoom/pkg/win32/GNUmakefile b/games/NXDoom/pkg/win32/GNUmakefile
deleted file mode 100644
index da5fea005..000000000
--- a/games/NXDoom/pkg/win32/GNUmakefile
+++ /dev/null
@@ -1,65 +0,0 @@
-
-include ../config.make
-
-TOPLEVEL=../..
-
-ifeq ($(TARGET_OS),x64)
-    POSTFIX=win64
-else
-    POSTFIX=win32
-endif
-
-PANDOC_FLAGS = -f gfm -s --template=default.html5 -H ../style.html
-
-DOOM_ZIP=$(PROGRAM_PREFIX)doom-$(PACKAGE_VERSION)-$(POSTFIX).zip
-HERETIC_ZIP=$(PROGRAM_PREFIX)heretic-$(PACKAGE_VERSION)-$(POSTFIX).zip
-HEXEN_ZIP=$(PROGRAM_PREFIX)hexen-$(PACKAGE_VERSION)-$(POSTFIX).zip
-STRIFE_ZIP=$(PROGRAM_PREFIX)strife-$(PACKAGE_VERSION)-$(POSTFIX).zip
-ZIPS=$(DOOM_ZIP) $(HERETIC_ZIP) $(HEXEN_ZIP) $(STRIFE_ZIP)
-
-DLL_FILES=$(TOPLEVEL)/src/SDL.dll                      \
-          $(TOPLEVEL)/src/SDL_mixer.dll                \
-          $(TOPLEVEL)/src/SDL_net.dll
-
-all: $(ZIPS)
-
-$(ZIPS):
-	zip -j -r $@ $</*
-
-$(DOOM_ZIP): staging-doom hook-doom
-$(HERETIC_ZIP): staging-heretic
-$(HEXEN_ZIP): staging-hexen
-$(STRIFE_ZIP): staging-strife hook-strife
-
-# Special hooks to custom modify files for particular games.
-
-hook-doom: staging-doom
-	-pandoc $(PANDOC_FLAGS) -o $</NOT-BUGS.html $(TOPLEVEL)/NOT-BUGS.md
-
-# Chocolate Strife has its own custom README file:
-
-hook-strife: staging-strife
-	-pandoc $(PANDOC_FLAGS) -o $</README.html $(TOPLEVEL)/README.Strife.md
-
-# Build up a staging dir for a particular game.
-
-staging-%:
-	mkdir $@
-	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" --dll_path="$(MSYSTEM_PREFIX)/bin" \
-	               $(TOPLEVEL)/src/$(PROGRAM_PREFIX)$*.exe $@
-	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" --dll_path="$(MSYSTEM_PREFIX)/bin" \
-	               $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup.exe \
-	               $@/$(PROGRAM_PREFIX)$*-setup.exe
-
-	$(STRIP) $@/*.exe $@/*.dll
-
-	-for f in $(DOC_FILES); do                              \
-		pandoc $(PANDOC_FLAGS) $@/$$(basename $$f .md).html  \
-		       $(TOPLEVEL)/$$f;                     \
-	done
-	-pandoc $(PANDOC_FLAGS) -o $@/CMDLINE.html $(TOPLEVEL)/man/CMDLINE.$*.md
-	-pandoc $(PANDOC_FLAGS) -o $@/INSTALL.html $(TOPLEVEL)/man/INSTALL.$*
-
-clean:
-	rm -f $(ZIPS)
-	rm -rf staging-*
diff --git a/games/NXDoom/pkg/win32/README b/games/NXDoom/pkg/win32/README
deleted file mode 100644
index 6b0c145ed..000000000
--- a/games/NXDoom/pkg/win32/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile to build Windows packages.  Requires zip and unix2dos
-packages to be installed.
diff --git a/games/NXDoom/pkg/win32/cp-with-libs b/games/NXDoom/pkg/win32/cp-with-libs
deleted file mode 100755
index fa3be4e51..000000000
--- a/games/NXDoom/pkg/win32/cp-with-libs
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright(C) 2016 Simon Howard
-#
-# 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.
-#
-
-#
-# This script copies a Windows .exe file from a source to a destination
-# (like cp); however, it also uses the binutils objdump command to
-# recursively determine all its DLL dependencies and copy those too.
-#
-
-import argparse
-import os
-import re
-import shlex
-import shutil
-import sys
-import subprocess
-
-DLL_NAME_RE = re.compile('\s+DLL Name: (.*\.dll)')
-
-# DLLs that are bundled with Windows, and we don't need to copy.
-# Thanks to Martin Preisler; this is from mingw-bundledlls.
-WIN32_DLLS = {
-	"advapi32.dll",
-	"comctl32.dll",
-	"comdlg32.dll",
-	"crypt32.dll",
-	"d3d9.dll",
-	"dnsapi.dll",
-	"dsound.dll",
-	"gdi32.dll",
-	"glu32.dll",
-	"imm32.dll",
-	"iphlpapi.dll",
-	"kernel32.dll",
-	"mpr.dll",
-	"msimg32.dll",
-	"msvcrt.dll",
-	"ntdll.dll",
-	"ole32.dll",
-	"oleaut32.dll",
-	"opengl32.dll",
-	"setupapi.dll",
-	"shell32.dll",
-	"shlwapi.dll",
-	"user32.dll",
-	"version.dll",
-	"winmm.dll",
-	"winspool.drv",
-	"wldap32.dll",
-	"ws2_32.dll",
-}
-
-parser = argparse.ArgumentParser(description='Copy EXE with DLLs.')
-parser.add_argument('--objdump', type=str, default='objdump',
-                    help='name of objdump binary to invoke')
-parser.add_argument('--dll_path', type=str, nargs='*', default=(),
-                    help='list of paths to check for DLLs')
-parser.add_argument('--ldflags', type=str, default="",
-                    help='linker flags, which can be used to automatically '
-                         'determine the DLL path')
-parser.add_argument('source', type=str,
-                    help='path to binary to copy')
-parser.add_argument('destination', type=str,
-                    help='destination to copy binary')
-
-def file_dependencies(filename, objdump):
-	"""Get the direct DLL dependencies of the given file.
-
-	The DLLs depended on by the given file are determined by invoking
-	the provided objdump binary. DLLs which are part of the standard
-	Win32 API are excluded from the result.
-
-	Args:
-	  filename: Path to a file to query.
-	  objdump: Name of objdump binary to invoke.
-	Returns:
-	  List of filenames (not fully qualified paths).
-	"""
-	cmd = subprocess.Popen([objdump, '-p', filename],
-	                       stdout=subprocess.PIPE)
-	try:
-		result = []
-		for line in cmd.stdout:
-			m = DLL_NAME_RE.match(line.decode())
-			if m:
-				dll = m.group(1)
-				# APISet forwarder DLLs
-				if dll.lower().startswith("api-ms-win-"):
-					continue
-				if dll.lower() not in WIN32_DLLS:
-					result.append(dll)
-
-		return result
-	finally:
-		cmd.wait()
-		assert cmd.returncode == 0, (
-			'%s invocation for %s exited with %d' % (
-				objdump, filename, cmd.returncode))
-
-def find_dll(filename, dll_paths):
-	"""Search the given list of paths for a DLL with the given name."""
-	for path in dll_paths:
-		full_path = os.path.join(path, filename)
-		if os.path.exists(full_path):
-			return full_path
-
-	raise IOError('DLL file %s not found in path: %s' % (
-		filename, dll_paths))
-
-def all_dependencies(filename, objdump, dll_paths):
-	"""Recursively find all dependencies of the given executable file.
-
-	Args:
-	  filename: Executable file to examine.
-	  objdump: Command to invoke to find dependencies.
-	  dll_paths: List of directories to search for DLL files.
-	Returns:
-	  Tuple containing:
-	    Set containing paths to all DLL dependencies of the file.
-	    Set of filenames of missing DLLs.
-	"""
-	result, missing = set(), set()
-	to_process = {filename}
-	while len(to_process) > 0:
-		filename = to_process.pop()
-		for dll in file_dependencies(filename, objdump):
-			try:
-				dll = find_dll(dll, dll_paths)
-				if dll not in result:
-					result |= {dll}
-					to_process |= {dll}
-			except IOError as e:
-				missing |= {dll}
-
-	return result, missing
-
-def get_dll_path():
-	"""Examine command line arguments and determine the DLL search path.
-
-	If the --path argument is provided, paths from this are added.
-	Furthermore, if --ldflags is provided, this is interpreted as a list of
-	linker flags and the -L paths are used to find associated paths that are
-	likely to contain DLLs, with the assumption that autotools usually
-	installs DLLs to ${prefix}/bin when installing Unix-style libraries into
-	${prefix}/lib.
-
-	Returns:
-	  List of filesystem paths to check for DLLs.
-	"""
-	result = set(args.dll_path)
-
-	if args.ldflags != '':
-		for arg in shlex.split(args.ldflags):
-			if arg.startswith("-L"):
-				prefix, libdir = os.path.split(arg[2:])
-				if libdir != "lib":
-					continue
-				bindir = os.path.join(prefix, "bin")
-				if os.path.exists(bindir):
-					result |= {bindir}
-
-	return list(result)
-
-args = parser.parse_args()
-
-dll_path = get_dll_path()
-dll_files, missing = all_dependencies(args.source, args.objdump, dll_path)
-
-# Exit with failure if DLLs are missing.
-if missing:
-	sys.stderr.write("Missing DLLs not found in path %s:\n" % (dll_path,))
-	for filename in missing:
-		sys.stderr.write("\t%s\n" % filename)
-	sys.exit(1)
-
-# Destination may be a full path (rename) or may be a directory to copy into:
-#   cp foo.exe bar/baz.exe
-#   cp foo.exe bar/
-if os.path.isdir(args.destination):
-	dest_dir = args.destination
-else:
-	dest_dir = os.path.dirname(args.destination)
-
-# Copy .exe and DLLs.
-shutil.copy(args.source, args.destination)
-for filename in dll_files:
-	shutil.copy(filename, dest_dir)
-
diff --git a/games/NXDoom/rpm.spec.in b/games/NXDoom/rpm.spec.in
deleted file mode 100644
index 330523104..000000000
--- a/games/NXDoom/rpm.spec.in
+++ /dev/null
@@ -1,121 +0,0 @@
-
-Name: @PACKAGE@
-Summary: @PACKAGE_SHORTDESC@
-Version: @VERSION@
-Release: 1
-Source: https://www.chocolate-doom.org/downloads/@VERSION@/@PACKAGE@-@VERSION@.tar.gz
-URL: @PACKAGE_URL@
-Group: Amusements/Games
-BuildRoot: /var/tmp/@PACKAGE@-buildroot
-License: @PACKAGE_LICENSE@
-Packager: @PACKAGE_MAINTAINER@ <@PACKAGE_BUGREPORT@>
-Prefix: %{_prefix}
-Autoreq: 0
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup -q
-
-%build
-./configure \
- 	--prefix=/usr \
-	--exec-prefix=/usr \
-	--bindir=/usr/bin \
-	--sbindir=/usr/sbin \
-	--sysconfdir=/etc \
-	--datadir=/usr/share \
-	--includedir=/usr/include \
-	--libdir=/usr/lib \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var/lib \
-	--sharedstatedir=/usr/com \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info
-make
-
-%install
-%makeinstall
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%description
-%(sed -n "/##/ q; p " < README.md)
-
-See @PACKAGE_URL@ for more information.
-
-%package -n @PROGRAM_PREFIX@heretic
-Summary: @PACKAGE_SHORTDESC@ (Heretic binaries)
-Group: Amusements/Games
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
-%files
-%{_mandir}/man5/@PROGRAM_PREFIX@doom.cfg.5*
-%{_mandir}/man5/default.cfg.5*
-%{_mandir}/man6/@PROGRAM_PREFIX@doom.6*
-%{_mandir}/man6/@PROGRAM_PREFIX@setup.6*
-%{_mandir}/man6/@PROGRAM_PREFIX@server.6*
-/usr/share/doc/@PACKAGE@/*
-/usr/games/@PROGRAM_PREFIX@doom
-/usr/games/@PROGRAM_PREFIX@server
-/usr/games/@PROGRAM_PREFIX@doom-setup
-/usr/share/icons/hicolor/128x128/apps/*
-/usr/share/applications/*
-
-%description -n @PROGRAM_PREFIX@heretic
-%(sed -n "/##/ q; p " < README.md)
-
-These are the Heretic binaries.
-
-See @PACKAGE_URL@ for more information.
-
-%files -n @PROGRAM_PREFIX@heretic
-%{_mandir}/man5/@PROGRAM_PREFIX@heretic.cfg.5*
-%{_mandir}/man5/heretic.cfg.5*
-%{_mandir}/man6/@PROGRAM_PREFIX@heretic.6*
-/usr/share/doc/@PROGRAM_PREFIX@heretic/*
-/usr/games/@PROGRAM_PREFIX@heretic
-/usr/games/@PROGRAM_PREFIX@heretic-setup
-
-%package -n @PROGRAM_PREFIX@hexen
-Summary: @PACKAGE_SHORTDESC@ (Hexen binaries)
-Group: Amusements/Games
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
-%description -n @PROGRAM_PREFIX@hexen
-%(sed -n "/##/ q; p " < README.md)
-
-These are the Hexen binaries.
-
-See @PACKAGE_URL@ for more information.
-
-%files -n @PROGRAM_PREFIX@hexen
-%{_mandir}/man5/@PROGRAM_PREFIX@hexen.cfg.5*
-%{_mandir}/man5/hexen.cfg.5*
-%{_mandir}/man6/@PROGRAM_PREFIX@hexen.6*
-/usr/share/doc/@PROGRAM_PREFIX@hexen/*
-/usr/games/@PROGRAM_PREFIX@hexen
-/usr/games/@PROGRAM_PREFIX@hexen-setup
-
-%package -n @PROGRAM_PREFIX@strife
-Summary: @PACKAGE_SHORTDESC@ (Strife binaries)
-Group: Amusements/Games
-Requires: libSDL-1.2.so.0, libSDL_mixer-1.2.so.0, libSDL_net-1.2.so.0
-
-%description -n @PROGRAM_PREFIX@strife
-%(sed -n "/##/ q; p " < README.md)
-
-These are the Strife binaries.
-
-See @PACKAGE_URL@ for more information.
-
-%files -n @PROGRAM_PREFIX@strife
-%{_mandir}/man5/@PROGRAM_PREFIX@strife.cfg.5*
-%{_mandir}/man5/strife.cfg.5*
-%{_mandir}/man6/@PROGRAM_PREFIX@strife.6*
-/usr/share/doc/@PROGRAM_PREFIX@strife/*
-/usr/games/@PROGRAM_PREFIX@strife
-/usr/games/@PROGRAM_PREFIX@strife-setup
-
diff --git a/games/NXDoom/src/CMakeLists.txt b/games/NXDoom/src/CMakeLists.txt
deleted file mode 100644
index 336a5241c..000000000
--- a/games/NXDoom/src/CMakeLists.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-foreach(SUBDIR doom heretic hexen strife setup)
-    add_subdirectory("${SUBDIR}")
-endforeach()
-
-# Common source files used by absolutely everything:
-
-set(COMMON_SOURCE_FILES
-    i_main.c
-    i_system.c           i_system.h
-    m_argv.c             m_argv.h
-    m_misc.c             m_misc.h)
-
-# Dedicated server (chocolate-server):
-
-set(DEDSERV_FILES
-    d_dedicated.c
-    d_iwad.c            d_iwad.h
-    d_mode.c            d_mode.h
-    deh_str.c           deh_str.h
-    i_timer.c           i_timer.h
-    m_config.c          m_config.h
-    net_common.c        net_common.h
-    net_dedicated.c     net_dedicated.h
-    net_io.c            net_io.h
-    net_packet.c        net_packet.h
-    net_sdl.c           net_sdl.h
-    net_query.c         net_query.h
-    net_server.c        net_server.h
-    net_structrw.c      net_structrw.h
-    z_native.c          z_zone.h)
-
-add_executable("${PROGRAM_PREFIX}server" WIN32 ${COMMON_SOURCE_FILES} ${DEDSERV_FILES})
-target_include_directories("${PROGRAM_PREFIX}server"
-                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-
-if (DEFINED EMSCRIPTEN)
-    set(SDL_FLAGS "-s USE_SDL=2")
-    if(ENABLE_SDL2_MIXER)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_SDL_MIXER=2")
-    endif()
-    if(ENABLE_SDL2_NET)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_SDL_NET=2")
-    endif()
-else()
-    set(SDL_LINK_LIBS SDL2::SDL2main SDL2::SDL2)
-    if(ENABLE_SDL2_MIXER)
-        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
-    endif()
-    if(ENABLE_SDL2_NET)
-        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
-    endif()
-endif()
-
-target_link_libraries("${PROGRAM_PREFIX}server" ${SDL_LINK_LIBS})
-set_target_properties("${PROGRAM_PREFIX}server" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-set_target_properties("${PROGRAM_PREFIX}server" PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
-
-# Source files used by the game binaries (chocolate-doom, etc.)
-
-set(GAME_SOURCE_FILES
-    aes_prng.c          aes_prng.h
-    d_event.c           d_event.h
-                        doomkeys.h
-                        doomtype.h
-    d_iwad.c            d_iwad.h
-    d_loop.c            d_loop.h
-    d_mode.c            d_mode.h
-                        d_ticcmd.h
-    deh_str.c           deh_str.h
-    gusconf.c           gusconf.h
-    i_cdmus.c           i_cdmus.h
-    i_endoom.c          i_endoom.h
-    i_flmusic.c
-    i_glob.c            i_glob.h
-    i_input.c           i_input.h
-    i_joystick.c        i_joystick.h
-                        i_swap.h
-    i_musicpack.c
-    i_oplmusic.c
-    i_pcsound.c
-    i_sdlmusic.c
-    i_sdlsound.c
-    i_sound.c           i_sound.h
-    i_timer.c           i_timer.h
-    i_video.c           i_video.h
-    i_videohr.c         i_videohr.h
-    i_winmusic.c
-    midifallback.c      midifallback.h
-    midifile.c          midifile.h
-    mus2mid.c           mus2mid.h
-    m_bbox.c            m_bbox.h
-    m_cheat.c           m_cheat.h
-    m_config.c          m_config.h
-    m_controls.c        m_controls.h
-    m_fixed.c           m_fixed.h
-    net_client.c        net_client.h
-    net_common.c        net_common.h
-    net_dedicated.c     net_dedicated.h
-    net_defs.h
-    net_gui.c           net_gui.h
-    net_io.c            net_io.h
-    net_loop.c          net_loop.h
-    net_packet.c        net_packet.h
-    net_petname.c       net_petname.h
-    net_query.c         net_query.h
-    net_sdl.c           net_sdl.h
-    net_server.c        net_server.h
-    net_structrw.c      net_structrw.h
-    p_rejectpad.c       p_rejectpad.h
-    sha1.c              sha1.h
-    memio.c             memio.h
-    tables.c            tables.h
-    v_diskicon.c        v_diskicon.h
-    v_video.c           v_video.h
-                        v_patch.h
-    w_checksum.c        w_checksum.h
-    w_main.c            w_main.h
-    w_wad.c             w_wad.h
-    w_file.c            w_file.h
-    w_file_stdc.c
-    w_file_posix.c
-    w_file_win32.c
-    w_merge.c           w_merge.h
-    z_zone.c            z_zone.h)
-
-set(GAME_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/../")
-
-if(WIN32)
-    list(APPEND GAME_SOURCE_FILES
-         "../win32/win_opendir.c" "../win32/win_opendir.h")
-
-    list(APPEND GAME_INCLUDE_DIRS
-         "${PROJECT_SOURCE_DIR}/win32/")
-endif()
-
-set(DEHACKED_SOURCE_FILES
-    deh_defs.h
-    deh_io.c            deh_io.h
-    deh_main.c          deh_main.h
-    deh_mapping.c       deh_mapping.h
-    deh_text.c)
-
-# Some games support dehacked patches, some don't:
-
-set(SOURCE_FILES ${COMMON_SOURCE_FILES} ${GAME_SOURCE_FILES})
-set(SOURCE_FILES_WITH_DEH ${SOURCE_FILES} ${DEHACKED_SOURCE_FILES})
-
-set(EXTRA_LIBS ${SDL_LINK_LIBS} textscreen pcsound opl)
-if(SampleRate_FOUND)
-    list(APPEND EXTRA_LIBS SampleRate::samplerate)
-endif()
-if(PNG_FOUND)
-    list(APPEND EXTRA_LIBS PNG::PNG)
-endif()
-if(FluidSynth_FOUND)
-    list(APPEND EXTRA_LIBS FluidSynth::libfluidsynth)
-endif()
-if(WIN32)
-	list(APPEND EXTRA_LIBS winmm shlwapi)
-endif()
-
-if(WIN32)
-    add_executable("${PROGRAM_PREFIX}doom" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/doom-res.rc")
-else()
-    add_executable("${PROGRAM_PREFIX}doom" ${SOURCE_FILES_WITH_DEH})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}doom" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}doom" doom ${EXTRA_LIBS})
-set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-
-if(MSVC)
-    set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES
-                          LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if(WIN32)
-    add_executable("${PROGRAM_PREFIX}heretic" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/heretic-res.rc")
-else()
-    add_executable("${PROGRAM_PREFIX}heretic" ${SOURCE_FILES_WITH_DEH})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}heretic" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}heretic" heretic ${EXTRA_LIBS})
-set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-
-if(MSVC)
-    set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES
-                          LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if(WIN32)
-    add_executable("${PROGRAM_PREFIX}hexen" WIN32 ${SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/hexen-res.rc")
-else()
-    add_executable("${PROGRAM_PREFIX}hexen" ${SOURCE_FILES})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}hexen" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}hexen" hexen ${EXTRA_LIBS})
-set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-
-if(MSVC)
-    set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES
-                          LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if(WIN32)
-    add_executable("${PROGRAM_PREFIX}strife" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/strife-res.rc")
-else()
-    add_executable("${PROGRAM_PREFIX}strife" ${SOURCE_FILES_WITH_DEH})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}strife" PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries("${PROGRAM_PREFIX}strife" strife ${EXTRA_LIBS})
-set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-
-if(MSVC)
-    set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES
-                          LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-# Source files needed for chocolate-setup:
-
-set(SETUP_FILES
-    deh_str.c           deh_str.h
-    d_mode.c            d_mode.h
-    d_iwad.c            d_iwad.h
-    i_timer.c           i_timer.h
-    m_config.c          m_config.h
-    m_controls.c        m_controls.h
-    net_io.c            net_io.h
-    net_packet.c        net_packet.h
-    net_petname.c       net_petname.h
-    net_sdl.c           net_sdl.h
-    net_query.c         net_query.h
-    net_structrw.c      net_structrw.h
-    z_native.c          z_zone.h)
-
-if(WIN32)
-    add_executable("${PROGRAM_PREFIX}setup" WIN32 ${SETUP_FILES} ${COMMON_SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/setup-res.rc")
-else()
-    add_executable("${PROGRAM_PREFIX}setup" ${SETUP_FILES} ${COMMON_SOURCE_FILES})
-endif()
-
-target_include_directories("${PROGRAM_PREFIX}setup"
-                           PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-target_link_libraries("${PROGRAM_PREFIX}setup" ${SDL_LINK_LIBS} setup textscreen)
-set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-
-if(WIN32)
-    target_link_libraries("${PROGRAM_PREFIX}setup" winmm)
-endif()
-
-if(MSVC)
-    set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES
-                          LINK_FLAGS "/MANIFEST:NO")
-endif()
-
-if (DEFINED EMSCRIPTEN)
-    set_target_properties("${PROGRAM_PREFIX}setup" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
-    set_target_properties("${PROGRAM_PREFIX}strife" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
-    set_target_properties("${PROGRAM_PREFIX}doom" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
-    set_target_properties("${PROGRAM_PREFIX}heretic" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
-    set_target_properties("${PROGRAM_PREFIX}hexen" PROPERTIES LINK_FLAGS "${SDL_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1 -s EXPORTED_FUNCTIONS=_main,ccall,cwrap,FS,ENV,PATH,ERRNO_CODES")
-endif()
-
-add_executable(midiread midifile.c z_native.c i_system.c m_argv.c m_misc.c d_iwad.c deh_str.c m_config.c)
-target_compile_definitions(midiread PRIVATE "-DTEST")
-target_include_directories(midiread PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-if (DEFINED EMSCRIPTEN)
-    set_target_properties(midiread PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-    set_target_properties(midiread PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-else()
-    target_link_libraries(midiread SDL2::SDL2)
-endif()
-
-add_executable(mus2mid mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c d_iwad.c deh_str.c m_config.c)
-target_compile_definitions(mus2mid PRIVATE "-DSTANDALONE")
-target_include_directories(mus2mid PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
-if (DEFINED EMSCRIPTEN)
-    set_target_properties(mus2mid PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-    set_target_properties(mus2mid PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-else()
-    target_link_libraries(mus2mid SDL2::SDL2)
-endif()
diff --git a/games/NXDoom/src/Doom.desktop.in b/games/NXDoom/src/Doom.desktop.in
deleted file mode 100644
index 1ec35b371..000000000
--- a/games/NXDoom/src/Doom.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Doom
-Exec=@PROGRAM_PREFIX@doom
-Icon=@PROGRAM_PREFIX@doom
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;vanilla;
diff --git a/games/NXDoom/src/Doom.metainfo.xml.in b/games/NXDoom/src/Doom.metainfo.xml.in
deleted file mode 100644
index 32b9172ea..000000000
--- a/games/NXDoom/src/Doom.metainfo.xml.in
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop">
-  <id>@PACKAGE_RDNS@.Doom</id>
-  <launchable type="desktop-id">@PACKAGE_RDNS@.Doom.desktop</launchable>
-  <name>@PACKAGE_SHORTNAME@ Doom</name>
-  <summary>@PACKAGE_SHORTDESC@</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
-  <url type="homepage">@PACKAGE_URL@</url>
-  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
-  <description>
-    <p>
-      @PACKAGE_SHORTNAME@ Doom is a conservative,
-      historically-accurate Doom source port, which is compatible with
-      the thousands of mods and levels that were made before the Doom
-      source code was released.  Unlike other source ports, the goal
-      is to preserve the original look, feel, limitations, and bugs of
-      the original DOS executable.
-    </p>
-    <p>
-      Full support for single- and multi-player games is provided, for
-      all of the original Doom games, Chex Quest, and Hacx.  Unlike
-      the original executable, network play is implemented on the IP
-      network stack, allowing it to function on modern LANs and the
-      Internet.
-    </p>
-    <p>
-      The easiest way to run @PACKAGE_SHORTNAME@ Doom is to copy a
-      supported game file (known as a "WAD") to the root of your home
-      directory and launch the application.  If you have trouble with
-      the automatic game file detection or need to manage multiple WAD
-      files, you can run the application from the command line with a
-      path to the selected game file:
-    </p>
-    <p>
-      flatpak run @PACKAGE_RDNS@.Doom -iwad ~/PATH/TO/GAME.WAD
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://www.chocolate-doom.org/wiki/images/9/97/GNOME_FreeDM_DEMO4.png</image>
-      <caption>FreeDM, DM05: Metal</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/a/a6/GNOME_Doom_II_DEMO2.png</image>
-      <caption>Doom II, Level 5: The Waste Tunnels</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/4/41/GNOME_Doomsday_of_UAC.png</image>
-      <caption>Doomsday of UAC (uac_dead.wad)</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/2/2a/GNOME_Freedoom_DTWID_DEMO3.png</image>
-      <caption>Doom the Way id Did, on Freedoom. Level 3-2: City of Corpses</caption>
-    </screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1">
-    <content_attribute id="violence-fantasy">intense</content_attribute>
-    <content_attribute id="violence-realistic">intense</content_attribute>
-    <content_attribute id="violence-bloodshed">intense</content_attribute>
-    <content_attribute id="violence-desecration">intense</content_attribute>
-    <content_attribute id="social-chat">intense</content_attribute>
-  </content_rating>
-  <releases>
-    <release version="3.0.1" date="2020-06-25"/> 
-    <release version="3.0.0 " date="2017-12-30"/>
-    <release version="2.3.0" date="2016-12-29"/>
-    <release version="2.2.1" date="2016-04-09"/>
-    <release version="2.2.0" date="2015-06-10"/>
-    <release version="2.1.0" date="2014-10-22"/>
-  </releases>
-</component>
diff --git a/games/NXDoom/src/Doom_Screensaver.desktop.in b/games/NXDoom/src/Doom_Screensaver.desktop.in
deleted file mode 100644
index deb7274aa..000000000
--- a/games/NXDoom/src/Doom_Screensaver.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Doom
-Comment=@PACKAGE_SHORTDESC@
-TryExec=@PROGRAM_PREFIX@doom
-Exec=@PROGRAM_PREFIX@doom
-StartupNotify=false
-Terminal=false
-Type=Application
-OnlyShowIn=GNOME;MATE;
-Categories=Screensaver;
diff --git a/games/NXDoom/src/Heretic.desktop.in b/games/NXDoom/src/Heretic.desktop.in
deleted file mode 100644
index ed841628b..000000000
--- a/games/NXDoom/src/Heretic.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Heretic
-Exec=@PROGRAM_PREFIX@heretic
-Icon=@PROGRAM_PREFIX@heretic
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;doom;vanilla;
diff --git a/games/NXDoom/src/Heretic.metainfo.xml.in b/games/NXDoom/src/Heretic.metainfo.xml.in
deleted file mode 100644
index 9f4bdc316..000000000
--- a/games/NXDoom/src/Heretic.metainfo.xml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop">
-  <id>@PACKAGE_RDNS@.Heretic</id>
-  <launchable type="desktop-id">@PACKAGE_RDNS@.Heretic.desktop</launchable>
-  <name>@PACKAGE_SHORTNAME@ Heretic</name>
-  <summary>@PACKAGE_SHORTDESC@</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
-  <url type="homepage">@PACKAGE_URL@</url>
-  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
-  <description>
-    <p>
-      @PACKAGE_SHORTNAME@ Heretic is a conservative,
-      historically-accurate Heretic source port, which is compatible
-      with mods and levels that were made before the Heretic source
-      code was released.  Unlike other source ports, the goal is to
-      preserve the original look, feel, limitations, and bugs of the
-      original DOS executable.
-    </p>
-    <p>
-      Full support for single- and multi-player games is provided.
-      Unlike the original executable, network play is implemented on
-      the IP network stack, allowing it to function on modern LANs and
-      the Internet.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://www.chocolate-doom.org/wiki/images/9/93/GNOME_Heretic_E5M4.png</image>
-      <caption>Level E5M4: Courtyard</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/1/14/GNOME_Heretic_Shareware_DEMO3.png</image>
-      <caption>Shareware Level E1M9: The Graveyard</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/3/34/GNOME_Heretic_E4M1.png</image>
-      <caption>Level E4M1: Catafalque</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/4/42/GNOME_Heretic_Shareware_DEMO1.png</image>
-      <caption>Shareware Level E1M3: The Gatehouse</caption>
-    </screenshot>
-  </screenshots>
-</component>
diff --git a/games/NXDoom/src/Hexen.desktop.in b/games/NXDoom/src/Hexen.desktop.in
deleted file mode 100644
index 4854efcae..000000000
--- a/games/NXDoom/src/Hexen.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Hexen
-Exec=@PROGRAM_PREFIX@hexen
-Icon=@PROGRAM_PREFIX@hexen
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;doom;vanilla;
diff --git a/games/NXDoom/src/Hexen.metainfo.xml.in b/games/NXDoom/src/Hexen.metainfo.xml.in
deleted file mode 100644
index 933701522..000000000
--- a/games/NXDoom/src/Hexen.metainfo.xml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop">
-  <id>@PACKAGE_RDNS@.Hexen</id>
-  <launchable type="desktop-id">@PACKAGE_RDNS@.Hexen.desktop</launchable>
-  <name>@PACKAGE_SHORTNAME@ Hexen</name>
-  <summary>@PACKAGE_SHORTDESC@</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
-  <url type="homepage">@PACKAGE_URL@</url>
-  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
-  <description>
-    <p>
-      @PACKAGE_SHORTNAME@ Hexen is a conservative,
-      historically-accurate Hexen source port, which is compatible
-      with mods and levels that were made before the Hexen source code
-      was released.  Unlike other source ports, the goal is to
-      preserve the original look, feel, limitations, and bugs of the
-      original DOS executable.
-    </p>
-    <p>
-      Full support for single- and multi-player games is provided.
-      Unlike the original executable, network play is implemented on
-      the IP network stack, allowing it to function on modern LANs and
-      the Internet.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://www.chocolate-doom.org/wiki/images/0/0f/GNOME_Hexen_Guardian_of_Fire.png</image>
-      <caption>Level "Guardian of Fire"</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/5/5c/GNOME_Hexen_Effluvium.png</image>
-      <caption>Level "Effluvium"</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/c/c1/GNOME_Hexen_Dragon_Chapel.png</image>
-      <caption>Level "Dragon Chapel"</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/a/a7/GNOME_Hexen_Darkmere.png</image>
-      <caption>Level "Darkmere"</caption>
-    </screenshot>
-  </screenshots>
-</component>
diff --git a/games/NXDoom/src/Makefile.am b/games/NXDoom/src/Makefile.am
deleted file mode 100644
index 4fbade07b..000000000
--- a/games/NXDoom/src/Makefile.am
+++ /dev/null
@@ -1,299 +0,0 @@
-
-SUBDIRS = doom heretic hexen strife setup
-
-execgamesdir = ${bindir}
-
-execgames_PROGRAMS = @PROGRAM_PREFIX@doom     \
-                     @PROGRAM_PREFIX@heretic  \
-                     @PROGRAM_PREFIX@hexen    \
-                     @PROGRAM_PREFIX@strife   \
-                     @PROGRAM_PREFIX@server
-
-noinst_PROGRAMS = @PROGRAM_PREFIX@setup
-
-SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT)    \
-                 @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \
-                 @PROGRAM_PREFIX@hexen-setup$(EXEEXT)   \
-                 @PROGRAM_PREFIX@strife-setup$(EXEEXT)
-
-execgames_SCRIPTS = $(SETUP_BINARIES)
-
-AM_CFLAGS = -I$(top_srcdir)/textscreen            \
-            -I$(top_srcdir)/opl                   \
-            -I$(top_srcdir)/pcsound               \
-            -I$(top_srcdir)/win32                 \
-            @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
-
-# Common source files used by absolutely everything:
-
-COMMON_SOURCE_FILES=\
-i_main.c                                   \
-i_system.c           i_system.h            \
-m_argv.c             m_argv.h              \
-m_misc.c             m_misc.h
-
-# Dedicated server (chocolate-server):
-
-DEDSERV_FILES=\
-d_dedicated.c                              \
-d_iwad.c             d_iwad.h              \
-d_mode.c             d_mode.h              \
-deh_str.c            deh_str.h             \
-i_timer.c            i_timer.h             \
-m_config.c           m_config.h            \
-net_common.c         net_common.h          \
-net_dedicated.c      net_dedicated.h       \
-net_io.c             net_io.h              \
-net_packet.c         net_packet.h          \
-net_sdl.c            net_sdl.h             \
-net_query.c          net_query.h           \
-net_server.c         net_server.h          \
-net_structrw.c       net_structrw.h        \
-z_native.c           z_zone.h
-
-@PROGRAM_PREFIX@server_SOURCES=$(COMMON_SOURCE_FILES) $(DEDSERV_FILES)
-@PROGRAM_PREFIX@server_LDADD = @LDFLAGS@ @SDLNET_LIBS@
-
-# Source files used by the game binaries (chocolate-doom, etc.)
-
-GAME_BASE_FILES=\
-aes_prng.c           aes_prng.h            \
-d_event.c            d_event.h             \
-                     doomkeys.h            \
-                     doomtype.h            \
-d_iwad.c             d_iwad.h              \
-d_loop.c             d_loop.h              \
-d_mode.c             d_mode.h              \
-                     d_ticcmd.h            \
-deh_str.c            deh_str.h             \
-gusconf.c            gusconf.h             \
-i_cdmus.c            i_cdmus.h             \
-i_endoom.c           i_endoom.h            \
-i_flmusic.c                                \
-i_glob.c             i_glob.h              \
-i_input.c            i_input.h             \
-i_joystick.c         i_joystick.h          \
-                     i_swap.h              \
-i_musicpack.c                              \
-i_oplmusic.c                               \
-i_pcsound.c                                \
-i_sdlmusic.c                               \
-i_sdlsound.c                               \
-i_sound.c            i_sound.h             \
-i_timer.c            i_timer.h             \
-i_video.c            i_video.h             \
-i_videohr.c          i_videohr.h           \
-i_winmusic.c                               \
-midifallback.c       midifallback.h        \
-midifile.c           midifile.h            \
-mus2mid.c            mus2mid.h             \
-m_bbox.c             m_bbox.h              \
-m_cheat.c            m_cheat.h             \
-m_config.c           m_config.h            \
-m_controls.c         m_controls.h          \
-m_fixed.c            m_fixed.h             \
-net_client.c         net_client.h          \
-net_common.c         net_common.h          \
-net_dedicated.c      net_dedicated.h       \
-net_defs.h                                 \
-net_gui.c            net_gui.h             \
-net_io.c             net_io.h              \
-net_loop.c           net_loop.h            \
-net_packet.c         net_packet.h          \
-net_petname.c        net_petname.h         \
-net_query.c          net_query.h           \
-net_sdl.c            net_sdl.h             \
-net_server.c         net_server.h          \
-net_structrw.c       net_structrw.h        \
-p_rejectpad.c        p_rejectpad.h         \
-sha1.c               sha1.h                \
-memio.c              memio.h               \
-tables.c             tables.h              \
-v_diskicon.c         v_diskicon.h          \
-v_video.c            v_video.h             \
-                     v_patch.h             \
-w_checksum.c         w_checksum.h          \
-w_main.c             w_main.h              \
-w_wad.c              w_wad.h               \
-w_file.c             w_file.h              \
-w_file_stdc.c                              \
-w_file_posix.c                             \
-w_file_win32.c                             \
-w_merge.c            w_merge.h             \
-$(top_builddir)/win32/win_opendir.c        \
-$(top_builddir)/win32/win_opendir.h
-
-
-MEMORY_NATIVE_SOURCE_FILES=\
-z_native.c           z_zone.h
-
-MEMORY_ZONE_SOURCE_FILES=\
-z_zone.c             z_zone.h
-
-if HAVE_ZPOOL
-GAME_SOURCE_FILES=$(GAME_BASE_FILES) $(MEMORY_ZONE_SOURCE_FILES)
-else
-GAME_SOURCE_FILES=$(GAME_BASE_FILES) $(MEMORY_NATIVE_SOURCE_FILES)
-endif
-
-DEHACKED_SOURCE_FILES =                    \
-deh_defs.h                                 \
-deh_io.c             deh_io.h              \
-deh_main.c           deh_main.h            \
-deh_mapping.c        deh_mapping.h         \
-deh_text.c
-
-# Some games support dehacked patches, some don't:
-
-SOURCE_FILES = $(COMMON_SOURCE_FILES) $(GAME_SOURCE_FILES)
-SOURCE_FILES_WITH_DEH = $(SOURCE_FILES) $(DEHACKED_SOURCE_FILES)
-
-EXTRA_LIBS =                                               \
-               $(top_builddir)/textscreen/libtextscreen.a  \
-               $(top_builddir)/pcsound/libpcsound.a        \
-               $(top_builddir)/opl/libopl.a                \
-               @LDFLAGS@                                   \
-               @EM_LDFLAGS@                                \
-               @SDL_LIBS@                                  \
-               @SDLMIXER_LIBS@                             \
-               @SDLNET_LIBS@
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) doom-res.rc
-else
-@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH)
-endif
-
-@PROGRAM_PREFIX@doom_LDADD = doom/libdoom.a $(EXTRA_LIBS)
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH) heretic-res.rc
-else
-@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH)
-endif
-
-@PROGRAM_PREFIX@heretic_LDADD = heretic/libheretic.a $(EXTRA_LIBS)
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES) hexen-res.rc
-else
-@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES)
-endif
-
-@PROGRAM_PREFIX@hexen_LDADD = hexen/libhexen.a $(EXTRA_LIBS)
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH) strife-res.rc
-else
-@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH)
-endif
-
-@PROGRAM_PREFIX@strife_LDADD = strife/libstrife.a $(EXTRA_LIBS)
-
-$(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT)
-	cp @PROGRAM_PREFIX@setup$(EXEEXT) $@
-
-# Make "make" aware of convenience libraries in subdirectories
-
-doom/libdoom.a:
-	$(MAKE) -C doom
-
-heretic/libheretic.a:
-	$(MAKE) -C heretic
-
-hexen/libhexen.a:
-	$(MAKE) -C hexen
-
-strife/libstrife.a:
-	$(MAKE) -C strife
-
-# Source files needed for chocolate-setup:
-
-SETUP_FILES=                               \
-deh_str.c            deh_str.h             \
-d_mode.c             d_mode.h              \
-d_iwad.c             d_iwad.h              \
-i_timer.c            i_timer.h             \
-m_config.c           m_config.h            \
-m_controls.c         m_controls.h          \
-net_io.c             net_io.h              \
-net_packet.c         net_packet.h          \
-net_petname.c        net_petname.h         \
-net_sdl.c            net_sdl.h             \
-net_query.c          net_query.h           \
-net_structrw.c       net_structrw.h        \
-z_native.c           z_zone.h
-
-if HAVE_WINDRES
-@PROGRAM_PREFIX@setup_SOURCES=$(SETUP_FILES) $(COMMON_SOURCE_FILES) setup-res.rc
-else
-@PROGRAM_PREFIX@setup_SOURCES=$(SETUP_FILES) $(COMMON_SOURCE_FILES)
-endif
-@PROGRAM_PREFIX@setup_LDADD = setup/libsetup.a                             \
-                        $(top_builddir)/textscreen/libtextscreen.a   \
-                        @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
-
-EXTRA_DIST =                        \
-        CMakeLists.txt              \
-        Doom_Screensaver.desktop.in \
-        manifest.xml
-
-metainfodir = $(prefix)/share/metainfo
-metainfo_DATA =                             \
-        @PACKAGE_RDNS@.Doom.metainfo.xml    \
-        @PACKAGE_RDNS@.Heretic.metainfo.xml \
-        @PACKAGE_RDNS@.Hexen.metainfo.xml   \
-        @PACKAGE_RDNS@.Strife.metainfo.xml
-
-@PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml
-	cp Doom.metainfo.xml $@
-
-@PACKAGE_RDNS@.Heretic.metainfo.xml : Heretic.metainfo.xml
-	cp Heretic.metainfo.xml $@
-
-@PACKAGE_RDNS@.Hexen.metainfo.xml : Hexen.metainfo.xml
-	cp Hexen.metainfo.xml $@
-
-@PACKAGE_RDNS@.Strife.metainfo.xml : Strife.metainfo.xml
-	cp Strife.metainfo.xml $@
-
-appdir = $(prefix)/share/applications
-app_DATA =                                 \
-           @PACKAGE_RDNS@.Doom.desktop    \
-           @PACKAGE_RDNS@.Heretic.desktop \
-           @PACKAGE_RDNS@.Hexen.desktop   \
-           @PACKAGE_RDNS@.Strife.desktop
-
-@PACKAGE_RDNS@.Doom.desktop : Doom.desktop
-	cp Doom.desktop $@
-
-@PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop
-	cp Heretic.desktop $@
-
-@PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop
-	cp Hexen.desktop $@
-
-@PACKAGE_RDNS@.Strife.desktop : Strife.desktop
-	cp Strife.desktop $@
-
-screensaverdir = $(prefix)/share/applications/screensavers
-screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop
-
-@PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop
-	cp Doom_Screensaver.desktop $@
-
-CLEANFILES = $(execgames_SCRIPTS) $(metainfo_DATA) $(app_DATA) $(screensaver_DATA)
-
-.rc.o:
-	$(WINDRES) $< -o $@
-%.o : %.rc
-	$(WINDRES) $< -o $@
-
-midiread : midifile.c
-	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ midifile.c -o $@
-
-MUS2MID_SRC_FILES = mus2mid.c memio.c z_native.c i_system.c m_argv.c m_misc.c
-mus2mid : $(MUS2MID_SRC_FILES)
-	$(CC) -DSTANDALONE -I$(top_builddir) $(CFLAGS) @LDFLAGS@ \
-              $(MUS2MID_SRC_FILES) -o $@
-
diff --git a/games/NXDoom/src/Strife.desktop.in b/games/NXDoom/src/Strife.desktop.in
deleted file mode 100644
index 862d20749..000000000
--- a/games/NXDoom/src/Strife.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Strife
-Exec=@PROGRAM_PREFIX@strife
-Icon=@PROGRAM_PREFIX@strife
-Type=Application
-Comment=@PACKAGE_SHORTDESC@
-Categories=Game;ActionGame;
-Keywords=first;person;shooter;doom;vanilla;
diff --git a/games/NXDoom/src/Strife.metainfo.xml.in b/games/NXDoom/src/Strife.metainfo.xml.in
deleted file mode 100644
index 4fdd16a70..000000000
--- a/games/NXDoom/src/Strife.metainfo.xml.in
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop">
-  <id>@PACKAGE_RDNS@.Strife</id>
-  <launchable type="desktop-id">@PACKAGE_RDNS@.Strife.desktop</launchable>
-  <name>@PACKAGE_SHORTNAME@ Strife</name>
-  <summary>@PACKAGE_SHORTDESC@</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <developer_name>@PACKAGE_MAINTAINER@</developer_name>
-  <url type="homepage">@PACKAGE_URL@</url>
-  <url type="bugtracker">@PACKAGE_BUGREPORT@</url>
-  <description>
-    <p>
-      @PACKAGE_SHORTNAME@ Strife is a conservative,
-      historically-accurate recreation of the Strife engine.  It is
-      completely compatible with the original game and mods created
-      with the original engine in mind.  Made with a great reverse
-      engineering effort, it has the goal of preserving the original
-      look, feel, limitations, and bugs of the original DOS
-      executable.
-    </p>
-    <p>
-      Full support for single- and multi-player games is provided.
-      Unlike the original executable, network play is implemented on
-      the IP network stack, allowing it to function on modern LANs and
-      the Internet.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://www.chocolate-doom.org/wiki/images/b/b2/GNOME_Strife_Rowan.png</image>
-      <caption>Talking to Rowan</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/1/1f/GNOME_Strife_Town.png</image>
-      <caption>The Town</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/8/8a/GNOME_Strife_Opening.png</image>
-      <caption>Opening Cinematic</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://www.chocolate-doom.org/wiki/images/c/c4/GNOME_Strife_Sewage.png</image>
-      <caption>In the sewage</caption>
-    </screenshot>
-  </screenshots>
-</component>
diff --git a/games/NXDoom/src/aes_prng.c b/games/NXDoom/src/aes_prng.c
index aad0a38a1..04de172ef 100644
--- a/games/NXDoom/src/aes_prng.c
+++ b/games/NXDoom/src/aes_prng.c
@@ -1,38 +1,32 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// This implements a cryptographically secure pseudorandom number
-// generator for implementing secure demos. The approach taken is to
-// use the AES (Rijndael) stream cipher in "counter" mode, encrypting
-// an incrementing counter. The cipher key acts as the random seed.
-// Cryptanalysis of AES used in this way has shown it to be an
-// effective PRNG (see: Empirical Evidence concerning AES, Hellekalek
-// & Wegenkittl, 2003).
-//
-// AES implementation is taken from the Linux kernel's AES
-// implementation, found in crypto/aes_generic.c. It has been hacked
-// up to work independently.
-//
-
-#include <stdint.h>
-
-#include "aes_prng.h"
-#include "doomtype.h"
-#include "i_swap.h"
-
-/*
- * Cryptographic API.
+/****************************************************************************
+ * apps/games/NXDoom/src/aes_prng.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * This implements a cryptographically secure pseudorandom number
+ * generator for implementing secure demos. The approach taken is to
+ * use the AES (Rijndael) stream cipher in "counter" mode, encrypting
+ * an incrementing counter. The cipher key acts as the random seed.
+ * Cryptanalysis of AES used in this way has shown it to be an
+ * effective PRNG (see: Empirical Evidence concerning AES, Hellekalek
+ * & Wegenkittl, 2003).
+ *
+ * AES implementation is taken from the Linux kernel's AES
+ * implementation, found in crypto/aes_generic.c. It has been hacked
+ * up to work independently.
  *
  * AES Cipher Algorithm.
  *
@@ -49,7 +43,6 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * ---------------------------------------------------------------------------
  * Copyright (c) 2002, Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK.
  * All rights reserved.
  *
@@ -68,817 +61,192 @@
  *   3. the copyright holder's name is not used to endorse products
  *      built using this software without specific written permission.
  *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ * ALTERNATIVELY, provided that this notice is retained in full, this
+ * product may be distributed under the terms of the GNU General Public
+ * License (GPL), in which case the provisions of the GPL apply INSTEAD OF
+ * those given above.
  *
  * DISCLAIMER
  *
  * This software is provided 'as is' with no explicit or implied warranties
  * in respect of its properties, including, but not limited to, correctness
  * and/or fitness for purpose.
- * ---------------------------------------------------------------------------
- */
-
-#define AES_MIN_KEY_SIZE        16
-#define AES_MAX_KEY_SIZE        32
-#define AES_KEYSIZE_128         16
-#define AES_KEYSIZE_192         24
-#define AES_KEYSIZE_256         32
-#define AES_BLOCK_SIZE          16
-#define AES_MAX_KEYLENGTH       (15 * 16)
-#define AES_MAX_KEYLENGTH_U32   (AES_MAX_KEYLENGTH / sizeof(uint32_t))
-
-/*
- * Please ensure that the first two fields are 16-byte aligned
- * relative to the start of the structure, i.e., don't move them!
- */
-typedef struct
-{
-    uint32_t key_enc[AES_MAX_KEYLENGTH_U32];
-    uint32_t key_dec[AES_MAX_KEYLENGTH_U32];
-    uint32_t key_length;
-} aes_context_t;
-
-static inline uint8_t get_byte(const uint32_t x, const unsigned n)
-{
-    return x >> (n << 3);
-}
-
-static const uint32_t rco_tab[10] = { 1, 2, 4, 8, 16, 32, 64, 128, 27, 54 };
-
-static const uint32_t crypto_ft_tab[4][256] = {
-    {
-        0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
-        0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
-        0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
-        0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
-        0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
-        0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
-        0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
-        0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
-        0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
-        0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
-        0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
-        0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
-        0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
-        0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
-        0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
-        0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
-        0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
-        0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
-        0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
-        0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
-        0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
-        0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
-        0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
-        0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
-        0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
-        0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
-        0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
-        0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
-        0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
-        0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
-        0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
-        0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
-        0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
-        0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
-        0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
-        0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
-        0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
-        0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
-        0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
-        0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
-        0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
-        0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
-        0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
-        0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
-        0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
-        0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
-        0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
-        0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
-        0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
-        0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
-        0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
-        0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
-        0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
-        0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
-        0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
-        0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
-        0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
-        0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
-        0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
-        0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
-        0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
-        0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
-        0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
-        0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c,
-    }, {
-        0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d,
-        0xf2f2ff0d, 0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154,
-        0x30306050, 0x01010203, 0x6767cea9, 0x2b2b567d,
-        0xfefee719, 0xd7d7b562, 0xabab4de6, 0x7676ec9a,
-        0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87,
-        0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b,
-        0xadad41ec, 0xd4d4b367, 0xa2a25ffd, 0xafaf45ea,
-        0x9c9c23bf, 0xa4a453f7, 0x7272e496, 0xc0c09b5b,
-        0xb7b775c2, 0xfdfde11c, 0x93933dae, 0x26264c6a,
-        0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f,
-        0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908,
-        0x7171e293, 0xd8d8ab73, 0x31316253, 0x15152a3f,
-        0x0404080c, 0xc7c79552, 0x23234665, 0xc3c39d5e,
-        0x18183028, 0x969637a1, 0x05050a0f, 0x9a9a2fb5,
-        0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d,
-        0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f,
-        0x0909121b, 0x83831d9e, 0x2c2c5874, 0x1a1a342e,
-        0x1b1b362d, 0x6e6edcb2, 0x5a5ab4ee, 0xa0a05bfb,
-        0x5252a4f6, 0x3b3b764d, 0xd6d6b761, 0xb3b37dce,
-        0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397,
-        0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c,
-        0x20204060, 0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed,
-        0x6a6ad4be, 0xcbcb8d46, 0xbebe67d9, 0x3939724b,
-        0x4a4a94de, 0x4c4c98d4, 0x5858b0e8, 0xcfcf854a,
-        0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16,
-        0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194,
-        0x45458acf, 0xf9f9e910, 0x02020406, 0x7f7ffe81,
-        0x5050a0f0, 0x3c3c7844, 0x9f9f25ba, 0xa8a84be3,
-        0x5151a2f3, 0xa3a35dfe, 0x404080c0, 0x8f8f058a,
-        0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104,
-        0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263,
-        0x10102030, 0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d,
-        0xcdcd814c, 0x0c0c1814, 0x13132635, 0xececc32f,
-        0x5f5fbee1, 0x979735a2, 0x444488cc, 0x17172e39,
-        0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47,
-        0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695,
-        0x6060c0a0, 0x81811998, 0x4f4f9ed1, 0xdcdca37f,
-        0x22224466, 0x2a2a547e, 0x90903bab, 0x88880b83,
-        0x46468cca, 0xeeeec729, 0xb8b86bd3, 0x1414283c,
-        0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76,
-        0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e,
-        0x494992db, 0x06060c0a, 0x2424486c, 0x5c5cb8e4,
-        0xc2c29f5d, 0xd3d3bd6e, 0xacac43ef, 0x6262c4a6,
-        0x919139a8, 0x959531a4, 0xe4e4d337, 0x7979f28b,
-        0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7,
-        0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0,
-        0x6c6cd8b4, 0x5656acfa, 0xf4f4f307, 0xeaeacf25,
-        0x6565caaf, 0x7a7af48e, 0xaeae47e9, 0x08081018,
-        0xbaba6fd5, 0x7878f088, 0x25254a6f, 0x2e2e5c72,
-        0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751,
-        0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21,
-        0x4b4b96dd, 0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85,
-        0x7070e090, 0x3e3e7c42, 0xb5b571c4, 0x6666ccaa,
-        0x484890d8, 0x03030605, 0xf6f6f701, 0x0e0e1c12,
-        0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0,
-        0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9,
-        0xe1e1d938, 0xf8f8eb13, 0x98982bb3, 0x11112233,
-        0x6969d2bb, 0xd9d9a970, 0x8e8e0789, 0x949433a7,
-        0x9b9b2db6, 0x1e1e3c22, 0x87871592, 0xe9e9c920,
-        0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a,
-        0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17,
-        0xbfbf65da, 0xe6e6d731, 0x424284c6, 0x6868d0b8,
-        0x414182c3, 0x999929b0, 0x2d2d5a77, 0x0f0f1e11,
-        0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6, 0x16162c3a,
-    }, {
-        0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b,
-        0xf2ff0df2, 0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5,
-        0x30605030, 0x01020301, 0x67cea967, 0x2b567d2b,
-        0xfee719fe, 0xd7b562d7, 0xab4de6ab, 0x76ec9a76,
-        0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d,
-        0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0,
-        0xad41ecad, 0xd4b367d4, 0xa25ffda2, 0xaf45eaaf,
-        0x9c23bf9c, 0xa453f7a4, 0x72e49672, 0xc09b5bc0,
-        0xb775c2b7, 0xfde11cfd, 0x933dae93, 0x264c6a26,
-        0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc,
-        0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1,
-        0x71e29371, 0xd8ab73d8, 0x31625331, 0x152a3f15,
-        0x04080c04, 0xc79552c7, 0x23466523, 0xc39d5ec3,
-        0x18302818, 0x9637a196, 0x050a0f05, 0x9a2fb59a,
-        0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2,
-        0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75,
-        0x09121b09, 0x831d9e83, 0x2c58742c, 0x1a342e1a,
-        0x1b362d1b, 0x6edcb26e, 0x5ab4ee5a, 0xa05bfba0,
-        0x52a4f652, 0x3b764d3b, 0xd6b761d6, 0xb37dceb3,
-        0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784,
-        0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced,
-        0x20406020, 0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b,
-        0x6ad4be6a, 0xcb8d46cb, 0xbe67d9be, 0x39724b39,
-        0x4a94de4a, 0x4c98d44c, 0x58b0e858, 0xcf854acf,
-        0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb,
-        0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485,
-        0x458acf45, 0xf9e910f9, 0x02040602, 0x7ffe817f,
-        0x50a0f050, 0x3c78443c, 0x9f25ba9f, 0xa84be3a8,
-        0x51a2f351, 0xa35dfea3, 0x4080c040, 0x8f058a8f,
-        0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5,
-        0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321,
-        0x10203010, 0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2,
-        0xcd814ccd, 0x0c18140c, 0x13263513, 0xecc32fec,
-        0x5fbee15f, 0x9735a297, 0x4488cc44, 0x172e3917,
-        0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d,
-        0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573,
-        0x60c0a060, 0x81199881, 0x4f9ed14f, 0xdca37fdc,
-        0x22446622, 0x2a547e2a, 0x903bab90, 0x880b8388,
-        0x468cca46, 0xeec729ee, 0xb86bd3b8, 0x14283c14,
-        0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db,
-        0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a,
-        0x4992db49, 0x060c0a06, 0x24486c24, 0x5cb8e45c,
-        0xc29f5dc2, 0xd3bd6ed3, 0xac43efac, 0x62c4a662,
-        0x9139a891, 0x9531a495, 0xe4d337e4, 0x79f28b79,
-        0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d,
-        0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9,
-        0x6cd8b46c, 0x56acfa56, 0xf4f307f4, 0xeacf25ea,
-        0x65caaf65, 0x7af48e7a, 0xae47e9ae, 0x08101808,
-        0xba6fd5ba, 0x78f08878, 0x254a6f25, 0x2e5c722e,
-        0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6,
-        0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f,
-        0x4b96dd4b, 0xbd61dcbd, 0x8b0d868b, 0x8a0f858a,
-        0x70e09070, 0x3e7c423e, 0xb571c4b5, 0x66ccaa66,
-        0x4890d848, 0x03060503, 0xf6f701f6, 0x0e1c120e,
-        0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9,
-        0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e,
-        0xe1d938e1, 0xf8eb13f8, 0x982bb398, 0x11223311,
-        0x69d2bb69, 0xd9a970d9, 0x8e07898e, 0x9433a794,
-        0x9b2db69b, 0x1e3c221e, 0x87159287, 0xe9c920e9,
-        0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf,
-        0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d,
-        0xbf65dabf, 0xe6d731e6, 0x4284c642, 0x68d0b868,
-        0x4182c341, 0x9929b099, 0x2d5a772d, 0x0f1e110f,
-        0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb, 0x162c3a16,
-    }, {
-        0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b,
-        0xff0df2f2, 0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5,
-        0x60503030, 0x02030101, 0xcea96767, 0x567d2b2b,
-        0xe719fefe, 0xb562d7d7, 0x4de6abab, 0xec9a7676,
-        0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d,
-        0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0,
-        0x41ecadad, 0xb367d4d4, 0x5ffda2a2, 0x45eaafaf,
-        0x23bf9c9c, 0x53f7a4a4, 0xe4967272, 0x9b5bc0c0,
-        0x75c2b7b7, 0xe11cfdfd, 0x3dae9393, 0x4c6a2626,
-        0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc,
-        0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1,
-        0xe2937171, 0xab73d8d8, 0x62533131, 0x2a3f1515,
-        0x080c0404, 0x9552c7c7, 0x46652323, 0x9d5ec3c3,
-        0x30281818, 0x37a19696, 0x0a0f0505, 0x2fb59a9a,
-        0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2,
-        0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575,
-        0x121b0909, 0x1d9e8383, 0x58742c2c, 0x342e1a1a,
-        0x362d1b1b, 0xdcb26e6e, 0xb4ee5a5a, 0x5bfba0a0,
-        0xa4f65252, 0x764d3b3b, 0xb761d6d6, 0x7dceb3b3,
-        0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484,
-        0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded,
-        0x40602020, 0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b,
-        0xd4be6a6a, 0x8d46cbcb, 0x67d9bebe, 0x724b3939,
-        0x94de4a4a, 0x98d44c4c, 0xb0e85858, 0x854acfcf,
-        0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb,
-        0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585,
-        0x8acf4545, 0xe910f9f9, 0x04060202, 0xfe817f7f,
-        0xa0f05050, 0x78443c3c, 0x25ba9f9f, 0x4be3a8a8,
-        0xa2f35151, 0x5dfea3a3, 0x80c04040, 0x058a8f8f,
-        0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5,
-        0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121,
-        0x20301010, 0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2,
-        0x814ccdcd, 0x18140c0c, 0x26351313, 0xc32fecec,
-        0xbee15f5f, 0x35a29797, 0x88cc4444, 0x2e391717,
-        0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d,
-        0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373,
-        0xc0a06060, 0x19988181, 0x9ed14f4f, 0xa37fdcdc,
-        0x44662222, 0x547e2a2a, 0x3bab9090, 0x0b838888,
-        0x8cca4646, 0xc729eeee, 0x6bd3b8b8, 0x283c1414,
-        0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb,
-        0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a,
-        0x92db4949, 0x0c0a0606, 0x486c2424, 0xb8e45c5c,
-        0x9f5dc2c2, 0xbd6ed3d3, 0x43efacac, 0xc4a66262,
-        0x39a89191, 0x31a49595, 0xd337e4e4, 0xf28b7979,
-        0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d,
-        0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9,
-        0xd8b46c6c, 0xacfa5656, 0xf307f4f4, 0xcf25eaea,
-        0xcaaf6565, 0xf48e7a7a, 0x47e9aeae, 0x10180808,
-        0x6fd5baba, 0xf0887878, 0x4a6f2525, 0x5c722e2e,
-        0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6,
-        0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f,
-        0x96dd4b4b, 0x61dcbdbd, 0x0d868b8b, 0x0f858a8a,
-        0xe0907070, 0x7c423e3e, 0x71c4b5b5, 0xccaa6666,
-        0x90d84848, 0x06050303, 0xf701f6f6, 0x1c120e0e,
-        0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9,
-        0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e,
-        0xd938e1e1, 0xeb13f8f8, 0x2bb39898, 0x22331111,
-        0xd2bb6969, 0xa970d9d9, 0x07898e8e, 0x33a79494,
-        0x2db69b9b, 0x3c221e1e, 0x15928787, 0xc920e9e9,
-        0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf,
-        0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d,
-        0x65dabfbf, 0xd731e6e6, 0x84c64242, 0xd0b86868,
-        0x82c34141, 0x29b09999, 0x5a772d2d, 0x1e110f0f,
-        0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb, 0x2c3a1616,
-    }
-};
-
-static const uint32_t crypto_fl_tab[4][256] = {
-    {
-        0x00000063, 0x0000007c, 0x00000077, 0x0000007b,
-        0x000000f2, 0x0000006b, 0x0000006f, 0x000000c5,
-        0x00000030, 0x00000001, 0x00000067, 0x0000002b,
-        0x000000fe, 0x000000d7, 0x000000ab, 0x00000076,
-        0x000000ca, 0x00000082, 0x000000c9, 0x0000007d,
-        0x000000fa, 0x00000059, 0x00000047, 0x000000f0,
-        0x000000ad, 0x000000d4, 0x000000a2, 0x000000af,
-        0x0000009c, 0x000000a4, 0x00000072, 0x000000c0,
-        0x000000b7, 0x000000fd, 0x00000093, 0x00000026,
-        0x00000036, 0x0000003f, 0x000000f7, 0x000000cc,
-        0x00000034, 0x000000a5, 0x000000e5, 0x000000f1,
-        0x00000071, 0x000000d8, 0x00000031, 0x00000015,
-        0x00000004, 0x000000c7, 0x00000023, 0x000000c3,
-        0x00000018, 0x00000096, 0x00000005, 0x0000009a,
-        0x00000007, 0x00000012, 0x00000080, 0x000000e2,
-        0x000000eb, 0x00000027, 0x000000b2, 0x00000075,
-        0x00000009, 0x00000083, 0x0000002c, 0x0000001a,
-        0x0000001b, 0x0000006e, 0x0000005a, 0x000000a0,
-        0x00000052, 0x0000003b, 0x000000d6, 0x000000b3,
-        0x00000029, 0x000000e3, 0x0000002f, 0x00000084,
-        0x00000053, 0x000000d1, 0x00000000, 0x000000ed,
-        0x00000020, 0x000000fc, 0x000000b1, 0x0000005b,
-        0x0000006a, 0x000000cb, 0x000000be, 0x00000039,
-        0x0000004a, 0x0000004c, 0x00000058, 0x000000cf,
-        0x000000d0, 0x000000ef, 0x000000aa, 0x000000fb,
-        0x00000043, 0x0000004d, 0x00000033, 0x00000085,
-        0x00000045, 0x000000f9, 0x00000002, 0x0000007f,
-        0x00000050, 0x0000003c, 0x0000009f, 0x000000a8,
-        0x00000051, 0x000000a3, 0x00000040, 0x0000008f,
-        0x00000092, 0x0000009d, 0x00000038, 0x000000f5,
-        0x000000bc, 0x000000b6, 0x000000da, 0x00000021,
-        0x00000010, 0x000000ff, 0x000000f3, 0x000000d2,
-        0x000000cd, 0x0000000c, 0x00000013, 0x000000ec,
-        0x0000005f, 0x00000097, 0x00000044, 0x00000017,
-        0x000000c4, 0x000000a7, 0x0000007e, 0x0000003d,
-        0x00000064, 0x0000005d, 0x00000019, 0x00000073,
-        0x00000060, 0x00000081, 0x0000004f, 0x000000dc,
-        0x00000022, 0x0000002a, 0x00000090, 0x00000088,
-        0x00000046, 0x000000ee, 0x000000b8, 0x00000014,
-        0x000000de, 0x0000005e, 0x0000000b, 0x000000db,
-        0x000000e0, 0x00000032, 0x0000003a, 0x0000000a,
-        0x00000049, 0x00000006, 0x00000024, 0x0000005c,
-        0x000000c2, 0x000000d3, 0x000000ac, 0x00000062,
-        0x00000091, 0x00000095, 0x000000e4, 0x00000079,
-        0x000000e7, 0x000000c8, 0x00000037, 0x0000006d,
-        0x0000008d, 0x000000d5, 0x0000004e, 0x000000a9,
-        0x0000006c, 0x00000056, 0x000000f4, 0x000000ea,
-        0x00000065, 0x0000007a, 0x000000ae, 0x00000008,
-        0x000000ba, 0x00000078, 0x00000025, 0x0000002e,
-        0x0000001c, 0x000000a6, 0x000000b4, 0x000000c6,
-        0x000000e8, 0x000000dd, 0x00000074, 0x0000001f,
-        0x0000004b, 0x000000bd, 0x0000008b, 0x0000008a,
-        0x00000070, 0x0000003e, 0x000000b5, 0x00000066,
-        0x00000048, 0x00000003, 0x000000f6, 0x0000000e,
-        0x00000061, 0x00000035, 0x00000057, 0x000000b9,
-        0x00000086, 0x000000c1, 0x0000001d, 0x0000009e,
-        0x000000e1, 0x000000f8, 0x00000098, 0x00000011,
-        0x00000069, 0x000000d9, 0x0000008e, 0x00000094,
-        0x0000009b, 0x0000001e, 0x00000087, 0x000000e9,
-        0x000000ce, 0x00000055, 0x00000028, 0x000000df,
-        0x0000008c, 0x000000a1, 0x00000089, 0x0000000d,
-        0x000000bf, 0x000000e6, 0x00000042, 0x00000068,
-        0x00000041, 0x00000099, 0x0000002d, 0x0000000f,
-        0x000000b0, 0x00000054, 0x000000bb, 0x00000016,
-    }, {
-        0x00006300, 0x00007c00, 0x00007700, 0x00007b00,
-        0x0000f200, 0x00006b00, 0x00006f00, 0x0000c500,
-        0x00003000, 0x00000100, 0x00006700, 0x00002b00,
-        0x0000fe00, 0x0000d700, 0x0000ab00, 0x00007600,
-        0x0000ca00, 0x00008200, 0x0000c900, 0x00007d00,
-        0x0000fa00, 0x00005900, 0x00004700, 0x0000f000,
-        0x0000ad00, 0x0000d400, 0x0000a200, 0x0000af00,
-        0x00009c00, 0x0000a400, 0x00007200, 0x0000c000,
-        0x0000b700, 0x0000fd00, 0x00009300, 0x00002600,
-        0x00003600, 0x00003f00, 0x0000f700, 0x0000cc00,
-        0x00003400, 0x0000a500, 0x0000e500, 0x0000f100,
-        0x00007100, 0x0000d800, 0x00003100, 0x00001500,
-        0x00000400, 0x0000c700, 0x00002300, 0x0000c300,
-        0x00001800, 0x00009600, 0x00000500, 0x00009a00,
-        0x00000700, 0x00001200, 0x00008000, 0x0000e200,
-        0x0000eb00, 0x00002700, 0x0000b200, 0x00007500,
-        0x00000900, 0x00008300, 0x00002c00, 0x00001a00,
-        0x00001b00, 0x00006e00, 0x00005a00, 0x0000a000,
-        0x00005200, 0x00003b00, 0x0000d600, 0x0000b300,
-        0x00002900, 0x0000e300, 0x00002f00, 0x00008400,
-        0x00005300, 0x0000d100, 0x00000000, 0x0000ed00,
-        0x00002000, 0x0000fc00, 0x0000b100, 0x00005b00,
-        0x00006a00, 0x0000cb00, 0x0000be00, 0x00003900,
-        0x00004a00, 0x00004c00, 0x00005800, 0x0000cf00,
-        0x0000d000, 0x0000ef00, 0x0000aa00, 0x0000fb00,
-        0x00004300, 0x00004d00, 0x00003300, 0x00008500,
-        0x00004500, 0x0000f900, 0x00000200, 0x00007f00,
-        0x00005000, 0x00003c00, 0x00009f00, 0x0000a800,
-        0x00005100, 0x0000a300, 0x00004000, 0x00008f00,
-        0x00009200, 0x00009d00, 0x00003800, 0x0000f500,
-        0x0000bc00, 0x0000b600, 0x0000da00, 0x00002100,
-        0x00001000, 0x0000ff00, 0x0000f300, 0x0000d200,
-        0x0000cd00, 0x00000c00, 0x00001300, 0x0000ec00,
-        0x00005f00, 0x00009700, 0x00004400, 0x00001700,
-        0x0000c400, 0x0000a700, 0x00007e00, 0x00003d00,
-        0x00006400, 0x00005d00, 0x00001900, 0x00007300,
-        0x00006000, 0x00008100, 0x00004f00, 0x0000dc00,
-        0x00002200, 0x00002a00, 0x00009000, 0x00008800,
-        0x00004600, 0x0000ee00, 0x0000b800, 0x00001400,
-        0x0000de00, 0x00005e00, 0x00000b00, 0x0000db00,
-        0x0000e000, 0x00003200, 0x00003a00, 0x00000a00,
-        0x00004900, 0x00000600, 0x00002400, 0x00005c00,
-        0x0000c200, 0x0000d300, 0x0000ac00, 0x00006200,
-        0x00009100, 0x00009500, 0x0000e400, 0x00007900,
-        0x0000e700, 0x0000c800, 0x00003700, 0x00006d00,
-        0x00008d00, 0x0000d500, 0x00004e00, 0x0000a900,
-        0x00006c00, 0x00005600, 0x0000f400, 0x0000ea00,
-        0x00006500, 0x00007a00, 0x0000ae00, 0x00000800,
-        0x0000ba00, 0x00007800, 0x00002500, 0x00002e00,
-        0x00001c00, 0x0000a600, 0x0000b400, 0x0000c600,
-        0x0000e800, 0x0000dd00, 0x00007400, 0x00001f00,
-        0x00004b00, 0x0000bd00, 0x00008b00, 0x00008a00,
-        0x00007000, 0x00003e00, 0x0000b500, 0x00006600,
-        0x00004800, 0x00000300, 0x0000f600, 0x00000e00,
-        0x00006100, 0x00003500, 0x00005700, 0x0000b900,
-        0x00008600, 0x0000c100, 0x00001d00, 0x00009e00,
-        0x0000e100, 0x0000f800, 0x00009800, 0x00001100,
-        0x00006900, 0x0000d900, 0x00008e00, 0x00009400,
-        0x00009b00, 0x00001e00, 0x00008700, 0x0000e900,
-        0x0000ce00, 0x00005500, 0x00002800, 0x0000df00,
-        0x00008c00, 0x0000a100, 0x00008900, 0x00000d00,
-        0x0000bf00, 0x0000e600, 0x00004200, 0x00006800,
-        0x00004100, 0x00009900, 0x00002d00, 0x00000f00,
-        0x0000b000, 0x00005400, 0x0000bb00, 0x00001600,
-    }, {
-        0x00630000, 0x007c0000, 0x00770000, 0x007b0000,
-        0x00f20000, 0x006b0000, 0x006f0000, 0x00c50000,
-        0x00300000, 0x00010000, 0x00670000, 0x002b0000,
-        0x00fe0000, 0x00d70000, 0x00ab0000, 0x00760000,
-        0x00ca0000, 0x00820000, 0x00c90000, 0x007d0000,
-        0x00fa0000, 0x00590000, 0x00470000, 0x00f00000,
-        0x00ad0000, 0x00d40000, 0x00a20000, 0x00af0000,
-        0x009c0000, 0x00a40000, 0x00720000, 0x00c00000,
-        0x00b70000, 0x00fd0000, 0x00930000, 0x00260000,
-        0x00360000, 0x003f0000, 0x00f70000, 0x00cc0000,
-        0x00340000, 0x00a50000, 0x00e50000, 0x00f10000,
-        0x00710000, 0x00d80000, 0x00310000, 0x00150000,
-        0x00040000, 0x00c70000, 0x00230000, 0x00c30000,
-        0x00180000, 0x00960000, 0x00050000, 0x009a0000,
-        0x00070000, 0x00120000, 0x00800000, 0x00e20000,
-        0x00eb0000, 0x00270000, 0x00b20000, 0x00750000,
-        0x00090000, 0x00830000, 0x002c0000, 0x001a0000,
-        0x001b0000, 0x006e0000, 0x005a0000, 0x00a00000,
-        0x00520000, 0x003b0000, 0x00d60000, 0x00b30000,
-        0x00290000, 0x00e30000, 0x002f0000, 0x00840000,
-        0x00530000, 0x00d10000, 0x00000000, 0x00ed0000,
-        0x00200000, 0x00fc0000, 0x00b10000, 0x005b0000,
-        0x006a0000, 0x00cb0000, 0x00be0000, 0x00390000,
-        0x004a0000, 0x004c0000, 0x00580000, 0x00cf0000,
-        0x00d00000, 0x00ef0000, 0x00aa0000, 0x00fb0000,
-        0x00430000, 0x004d0000, 0x00330000, 0x00850000,
-        0x00450000, 0x00f90000, 0x00020000, 0x007f0000,
-        0x00500000, 0x003c0000, 0x009f0000, 0x00a80000,
-        0x00510000, 0x00a30000, 0x00400000, 0x008f0000,
-        0x00920000, 0x009d0000, 0x00380000, 0x00f50000,
-        0x00bc0000, 0x00b60000, 0x00da0000, 0x00210000,
-        0x00100000, 0x00ff0000, 0x00f30000, 0x00d20000,
-        0x00cd0000, 0x000c0000, 0x00130000, 0x00ec0000,
-        0x005f0000, 0x00970000, 0x00440000, 0x00170000,
-        0x00c40000, 0x00a70000, 0x007e0000, 0x003d0000,
-        0x00640000, 0x005d0000, 0x00190000, 0x00730000,
-        0x00600000, 0x00810000, 0x004f0000, 0x00dc0000,
-        0x00220000, 0x002a0000, 0x00900000, 0x00880000,
-        0x00460000, 0x00ee0000, 0x00b80000, 0x00140000,
-        0x00de0000, 0x005e0000, 0x000b0000, 0x00db0000,
-        0x00e00000, 0x00320000, 0x003a0000, 0x000a0000,
-        0x00490000, 0x00060000, 0x00240000, 0x005c0000,
-        0x00c20000, 0x00d30000, 0x00ac0000, 0x00620000,
-        0x00910000, 0x00950000, 0x00e40000, 0x00790000,
-        0x00e70000, 0x00c80000, 0x00370000, 0x006d0000,
-        0x008d0000, 0x00d50000, 0x004e0000, 0x00a90000,
-        0x006c0000, 0x00560000, 0x00f40000, 0x00ea0000,
-        0x00650000, 0x007a0000, 0x00ae0000, 0x00080000,
-        0x00ba0000, 0x00780000, 0x00250000, 0x002e0000,
-        0x001c0000, 0x00a60000, 0x00b40000, 0x00c60000,
-        0x00e80000, 0x00dd0000, 0x00740000, 0x001f0000,
-        0x004b0000, 0x00bd0000, 0x008b0000, 0x008a0000,
-        0x00700000, 0x003e0000, 0x00b50000, 0x00660000,
-        0x00480000, 0x00030000, 0x00f60000, 0x000e0000,
-        0x00610000, 0x00350000, 0x00570000, 0x00b90000,
-        0x00860000, 0x00c10000, 0x001d0000, 0x009e0000,
-        0x00e10000, 0x00f80000, 0x00980000, 0x00110000,
-        0x00690000, 0x00d90000, 0x008e0000, 0x00940000,
-        0x009b0000, 0x001e0000, 0x00870000, 0x00e90000,
-        0x00ce0000, 0x00550000, 0x00280000, 0x00df0000,
-        0x008c0000, 0x00a10000, 0x00890000, 0x000d0000,
-        0x00bf0000, 0x00e60000, 0x00420000, 0x00680000,
-        0x00410000, 0x00990000, 0x002d0000, 0x000f0000,
-        0x00b00000, 0x00540000, 0x00bb0000, 0x00160000,
-    }, {
-        0x63000000, 0x7c000000, 0x77000000, 0x7b000000,
-        0xf2000000, 0x6b000000, 0x6f000000, 0xc5000000,
-        0x30000000, 0x01000000, 0x67000000, 0x2b000000,
-        0xfe000000, 0xd7000000, 0xab000000, 0x76000000,
-        0xca000000, 0x82000000, 0xc9000000, 0x7d000000,
-        0xfa000000, 0x59000000, 0x47000000, 0xf0000000,
-        0xad000000, 0xd4000000, 0xa2000000, 0xaf000000,
-        0x9c000000, 0xa4000000, 0x72000000, 0xc0000000,
-        0xb7000000, 0xfd000000, 0x93000000, 0x26000000,
-        0x36000000, 0x3f000000, 0xf7000000, 0xcc000000,
-        0x34000000, 0xa5000000, 0xe5000000, 0xf1000000,
-        0x71000000, 0xd8000000, 0x31000000, 0x15000000,
-        0x04000000, 0xc7000000, 0x23000000, 0xc3000000,
-        0x18000000, 0x96000000, 0x05000000, 0x9a000000,
-        0x07000000, 0x12000000, 0x80000000, 0xe2000000,
-        0xeb000000, 0x27000000, 0xb2000000, 0x75000000,
-        0x09000000, 0x83000000, 0x2c000000, 0x1a000000,
-        0x1b000000, 0x6e000000, 0x5a000000, 0xa0000000,
-        0x52000000, 0x3b000000, 0xd6000000, 0xb3000000,
-        0x29000000, 0xe3000000, 0x2f000000, 0x84000000,
-        0x53000000, 0xd1000000, 0x00000000, 0xed000000,
-        0x20000000, 0xfc000000, 0xb1000000, 0x5b000000,
-        0x6a000000, 0xcb000000, 0xbe000000, 0x39000000,
-        0x4a000000, 0x4c000000, 0x58000000, 0xcf000000,
-        0xd0000000, 0xef000000, 0xaa000000, 0xfb000000,
-        0x43000000, 0x4d000000, 0x33000000, 0x85000000,
-        0x45000000, 0xf9000000, 0x02000000, 0x7f000000,
-        0x50000000, 0x3c000000, 0x9f000000, 0xa8000000,
-        0x51000000, 0xa3000000, 0x40000000, 0x8f000000,
-        0x92000000, 0x9d000000, 0x38000000, 0xf5000000,
-        0xbc000000, 0xb6000000, 0xda000000, 0x21000000,
-        0x10000000, 0xff000000, 0xf3000000, 0xd2000000,
-        0xcd000000, 0x0c000000, 0x13000000, 0xec000000,
-        0x5f000000, 0x97000000, 0x44000000, 0x17000000,
-        0xc4000000, 0xa7000000, 0x7e000000, 0x3d000000,
-        0x64000000, 0x5d000000, 0x19000000, 0x73000000,
-        0x60000000, 0x81000000, 0x4f000000, 0xdc000000,
-        0x22000000, 0x2a000000, 0x90000000, 0x88000000,
-        0x46000000, 0xee000000, 0xb8000000, 0x14000000,
-        0xde000000, 0x5e000000, 0x0b000000, 0xdb000000,
-        0xe0000000, 0x32000000, 0x3a000000, 0x0a000000,
-        0x49000000, 0x06000000, 0x24000000, 0x5c000000,
-        0xc2000000, 0xd3000000, 0xac000000, 0x62000000,
-        0x91000000, 0x95000000, 0xe4000000, 0x79000000,
-        0xe7000000, 0xc8000000, 0x37000000, 0x6d000000,
-        0x8d000000, 0xd5000000, 0x4e000000, 0xa9000000,
-        0x6c000000, 0x56000000, 0xf4000000, 0xea000000,
-        0x65000000, 0x7a000000, 0xae000000, 0x08000000,
-        0xba000000, 0x78000000, 0x25000000, 0x2e000000,
-        0x1c000000, 0xa6000000, 0xb4000000, 0xc6000000,
-        0xe8000000, 0xdd000000, 0x74000000, 0x1f000000,
-        0x4b000000, 0xbd000000, 0x8b000000, 0x8a000000,
-        0x70000000, 0x3e000000, 0xb5000000, 0x66000000,
-        0x48000000, 0x03000000, 0xf6000000, 0x0e000000,
-        0x61000000, 0x35000000, 0x57000000, 0xb9000000,
-        0x86000000, 0xc1000000, 0x1d000000, 0x9e000000,
-        0xe1000000, 0xf8000000, 0x98000000, 0x11000000,
-        0x69000000, 0xd9000000, 0x8e000000, 0x94000000,
-        0x9b000000, 0x1e000000, 0x87000000, 0xe9000000,
-        0xce000000, 0x55000000, 0x28000000, 0xdf000000,
-        0x8c000000, 0xa1000000, 0x89000000, 0x0d000000,
-        0xbf000000, 0xe6000000, 0x42000000, 0x68000000,
-        0x41000000, 0x99000000, 0x2d000000, 0x0f000000,
-        0xb0000000, 0x54000000, 0xbb000000, 0x16000000,
-    }
-};
-
-/* initialise the key schedule from the user supplied key */
-
-static uint32_t aes_ror32(uint32_t word, unsigned int shift)
-{
-    return (word >> shift) | (word << (32 - shift));
-}
-
-#define cpu_to_le32(x) SDL_SwapLE32(x)
-#define le32_to_cpu(x) SDL_SwapLE32(x)
-
-#define star_x(x) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b)
-
-#define imix_col(y, x)  do {        \
-    u       = star_x(x);        \
-    v       = star_x(u);        \
-    w       = star_x(v);        \
-    t       = w ^ (x);          \
-    (y)     = u ^ v ^ w;        \
-    (y)     ^= aes_ror32(u ^ t, 8) ^    \
-        aes_ror32(v ^ t, 16) ^      \
-        aes_ror32(t, 24);       \
-} while (0)
-
-#define ls_box(x)           \
-    crypto_fl_tab[0][get_byte(x, 0)] ^  \
-    crypto_fl_tab[1][get_byte(x, 1)] ^  \
-    crypto_fl_tab[2][get_byte(x, 2)] ^  \
-    crypto_fl_tab[3][get_byte(x, 3)]
-
-#define loop4(i)    do {        \
-    t = aes_ror32(t, 8);        \
-    t = ls_box(t) ^ rco_tab[i];     \
-    t ^= ctx->key_enc[4 * i];           \
-    ctx->key_enc[4 * i + 4] = t;        \
-    t ^= ctx->key_enc[4 * i + 1];       \
-    ctx->key_enc[4 * i + 5] = t;        \
-    t ^= ctx->key_enc[4 * i + 2];       \
-    ctx->key_enc[4 * i + 6] = t;        \
-    t ^= ctx->key_enc[4 * i + 3];       \
-    ctx->key_enc[4 * i + 7] = t;        \
-} while (0)
-
-#define loop6(i)    do {        \
-    t = aes_ror32(t, 8);        \
-    t = ls_box(t) ^ rco_tab[i];     \
-    t ^= ctx->key_enc[6 * i];           \
-    ctx->key_enc[6 * i + 6] = t;        \
-    t ^= ctx->key_enc[6 * i + 1];       \
-    ctx->key_enc[6 * i + 7] = t;        \
-    t ^= ctx->key_enc[6 * i + 2];       \
-    ctx->key_enc[6 * i + 8] = t;        \
-    t ^= ctx->key_enc[6 * i + 3];       \
-    ctx->key_enc[6 * i + 9] = t;        \
-    t ^= ctx->key_enc[6 * i + 4];       \
-    ctx->key_enc[6 * i + 10] = t;       \
-    t ^= ctx->key_enc[6 * i + 5];       \
-    ctx->key_enc[6 * i + 11] = t;       \
-} while (0)
-
-#define loop8tophalf(i) do {            \
-    t = aes_ror32(t, 8);            \
-    t = ls_box(t) ^ rco_tab[i];         \
-    t ^= ctx->key_enc[8 * i];               \
-    ctx->key_enc[8 * i + 8] = t;            \
-    t ^= ctx->key_enc[8 * i + 1];           \
-    ctx->key_enc[8 * i + 9] = t;            \
-    t ^= ctx->key_enc[8 * i + 2];           \
-    ctx->key_enc[8 * i + 10] = t;           \
-    t ^= ctx->key_enc[8 * i + 3];           \
-    ctx->key_enc[8 * i + 11] = t;           \
-} while (0)
-
-#define loop8(i)    do {                \
-    loop8tophalf(i);                \
-    t  = ctx->key_enc[8 * i + 4] ^ ls_box(t);       \
-    ctx->key_enc[8 * i + 12] = t;           \
-    t ^= ctx->key_enc[8 * i + 5];           \
-    ctx->key_enc[8 * i + 13] = t;           \
-    t ^= ctx->key_enc[8 * i + 6];           \
-    ctx->key_enc[8 * i + 14] = t;           \
-    t ^= ctx->key_enc[8 * i + 7];           \
-    ctx->key_enc[8 * i + 15] = t;           \
-} while (0)
-
-/**
- * AES_ExpandKey - Expands the AES key as described in FIPS-197
- * @ctx:    The location where the computed key will be stored.
- * @in_key:     The supplied key.
- * @key_len:    The length of the supplied key.
  *
- * Returns 0 on success. The function fails only if an invalid key size (or
- * pointer) is supplied.
- * The expanded key size is 240 bytes (max of 14 rounds with a unique 16 bytes
- * key schedule plus a 16 bytes key which is used before the first round).
- * The decryption key is prepared for the "Equivalent Inverse Cipher" as
- * described in FIPS-197. The first slot (16 bytes) of each key (enc or dec) is
- * for the initial combination, the second slot for the first round and so on.
- */
-static int AES_ExpandKey(aes_context_t *ctx, const uint8_t *in_key,
-                         unsigned int key_len)
-{
-    const uint32_t *key = (const uint32_t *)in_key;
-    uint32_t i, t, u, v, w, j;
+ ****************************************************************************/
 
-    if (key_len != AES_KEYSIZE_128 && key_len != AES_KEYSIZE_192 &&
-        key_len != AES_KEYSIZE_256)
-        return -1;
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-    ctx->key_length = key_len;
+#include <stdint.h>
 
-    ctx->key_dec[key_len + 24] = ctx->key_enc[0] = le32_to_cpu(key[0]);
-    ctx->key_dec[key_len + 25] = ctx->key_enc[1] = le32_to_cpu(key[1]);
-    ctx->key_dec[key_len + 26] = ctx->key_enc[2] = le32_to_cpu(key[2]);
-    ctx->key_dec[key_len + 27] = ctx->key_enc[3] = le32_to_cpu(key[3]);
+#include "aes_prng.h"
+#include "doomtype.h"
+#include "i_swap.h"
 
-    switch (key_len) {
-        case AES_KEYSIZE_128:
-            t = ctx->key_enc[3];
-            for (i = 0; i < 10; ++i)
-                loop4(i);
-            break;
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-        case AES_KEYSIZE_192:
-            ctx->key_enc[4] = le32_to_cpu(key[4]);
-            t = ctx->key_enc[5] = le32_to_cpu(key[5]);
-            for (i = 0; i < 8; ++i)
-                loop6(i);
-            break;
+#define AES_MIN_KEY_SIZE 16
+#define AES_MAX_KEY_SIZE 32
+#define AES_KEYSIZE_128 16
+#define AES_KEYSIZE_192 24
+#define AES_KEYSIZE_256 32
+#define AES_BLOCK_SIZE 16
+#define AES_MAX_KEYLENGTH (15 * 16)
+#define AES_MAX_KEYLENGTH_U32 (AES_MAX_KEYLENGTH / sizeof(uint32_t))
 
-        case AES_KEYSIZE_256:
-            ctx->key_enc[4] = le32_to_cpu(key[4]);
-            ctx->key_enc[5] = le32_to_cpu(key[5]);
-            ctx->key_enc[6] = le32_to_cpu(key[6]);
-            t = ctx->key_enc[7] = le32_to_cpu(key[7]);
-            for (i = 0; i < 6; ++i)
-                loop8(i);
-            loop8tophalf(i);
-            break;
-    }
+#define cpu_to_le32(x) htole32(x)
+#define le32_to_cpu(x) le32toh(x)
 
-    ctx->key_dec[0] = ctx->key_enc[key_len + 24];
-    ctx->key_dec[1] = ctx->key_enc[key_len + 25];
-    ctx->key_dec[2] = ctx->key_enc[key_len + 26];
-    ctx->key_dec[3] = ctx->key_enc[key_len + 27];
+#define star_x(x)                                                            \
+  (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b)
 
-    for (i = 4; i < key_len + 24; ++i) {
-        j = key_len + 24 - (i & ~3) + (i & 3);
-        imix_col(ctx->key_dec[j], ctx->key_enc[i]);
-    }
-    return 0;
-}
+#define imix_col(y, x)                                                       \
+  do                                                                         \
+    {                                                                        \
+      u = star_x(x);                                                         \
+      v = star_x(u);                                                         \
+      w = star_x(v);                                                         \
+      t = w ^ (x);                                                           \
+      (y) = u ^ v ^ w;                                                       \
+      (y) ^= aes_ror32(u ^ t, 8) ^ aes_ror32(v ^ t, 16) ^ aes_ror32(t, 24);  \
+    }                                                                        \
+  while (0)
 
-/**
- * AES_SetKey - Set the AES key.
- * @ctx:        AES context struct.
- * @in_key:     The input key.
- * @key_len:    The size of the key.
- *
- * Returns 0 on success, on failure -1 is returned.
- * The function uses AES_ExpandKey() to expand the key.
- */
-static int AES_SetKey(aes_context_t *ctx, const uint8_t *in_key,
-                      unsigned int key_len)
-{
-    int ret;
+#define ls_box(x)                                                            \
+  crypto_fl_tab[0][get_byte(x, 0)] ^ crypto_fl_tab[1][get_byte(x, 1)] ^      \
+      crypto_fl_tab[2][get_byte(x, 2)] ^ crypto_fl_tab[3][get_byte(x, 3)]
 
-    ret = AES_ExpandKey(ctx, in_key, key_len);
-    if (!ret)
-        return 0;
+#define loop4(i)                                                             \
+  do                                                                         \
+    {                                                                        \
+      t = aes_ror32(t, 8);                                                   \
+      t = ls_box(t) ^ rco_tab[i];                                            \
+      t ^= ctx->key_enc[4 * i];                                              \
+      ctx->key_enc[4 * i + 4] = t;                                           \
+      t ^= ctx->key_enc[4 * i + 1];                                          \
+      ctx->key_enc[4 * i + 5] = t;                                           \
+      t ^= ctx->key_enc[4 * i + 2];                                          \
+      ctx->key_enc[4 * i + 6] = t;                                           \
+      t ^= ctx->key_enc[4 * i + 3];                                          \
+      ctx->key_enc[4 * i + 7] = t;                                           \
+    }                                                                        \
+  while (0)
 
-    return -1;
-}
+#define loop6(i)                                                             \
+  do                                                                         \
+    {                                                                        \
+      t = aes_ror32(t, 8);                                                   \
+      t = ls_box(t) ^ rco_tab[i];                                            \
+      t ^= ctx->key_enc[6 * i];                                              \
+      ctx->key_enc[6 * i + 6] = t;                                           \
+      t ^= ctx->key_enc[6 * i + 1];                                          \
+      ctx->key_enc[6 * i + 7] = t;                                           \
+      t ^= ctx->key_enc[6 * i + 2];                                          \
+      ctx->key_enc[6 * i + 8] = t;                                           \
+      t ^= ctx->key_enc[6 * i + 3];                                          \
+      ctx->key_enc[6 * i + 9] = t;                                           \
+      t ^= ctx->key_enc[6 * i + 4];                                          \
+      ctx->key_enc[6 * i + 10] = t;                                          \
+      t ^= ctx->key_enc[6 * i + 5];                                          \
+      ctx->key_enc[6 * i + 11] = t;                                          \
+    }                                                                        \
+  while (0)
+
+#define loop8tophalf(i)                                                      \
+  do                                                                         \
+    {                                                                        \
+      t = aes_ror32(t, 8);                                                   \
+      t = ls_box(t) ^ rco_tab[i];                                            \
+      t ^= ctx->key_enc[8 * i];                                              \
+      ctx->key_enc[8 * i + 8] = t;                                           \
+      t ^= ctx->key_enc[8 * i + 1];                                          \
+      ctx->key_enc[8 * i + 9] = t;                                           \
+      t ^= ctx->key_enc[8 * i + 2];                                          \
+      ctx->key_enc[8 * i + 10] = t;                                          \
+      t ^= ctx->key_enc[8 * i + 3];                                          \
+      ctx->key_enc[8 * i + 11] = t;                                          \
+    }                                                                        \
+  while (0)
+
+#define loop8(i)                                                             \
+  do                                                                         \
+    {                                                                        \
+      loop8tophalf(i);                                                       \
+      t = ctx->key_enc[8 * i + 4] ^ ls_box(t);                               \
+      ctx->key_enc[8 * i + 12] = t;                                          \
+      t ^= ctx->key_enc[8 * i + 5];                                          \
+      ctx->key_enc[8 * i + 13] = t;                                          \
+      t ^= ctx->key_enc[8 * i + 6];                                          \
+      ctx->key_enc[8 * i + 14] = t;                                          \
+      t ^= ctx->key_enc[8 * i + 7];                                          \
+      ctx->key_enc[8 * i + 15] = t;                                          \
+    }                                                                        \
+  while (0)
 
 /* encrypt a block of text */
 
-#define f_rn(bo, bi, n, k)      do {                \
-    bo[n] = crypto_ft_tab[0][get_byte(bi[n], 0)] ^              \
-        crypto_ft_tab[1][get_byte(bi[(n + 1) & 3], 1)] ^        \
-        crypto_ft_tab[2][get_byte(bi[(n + 2) & 3], 2)] ^        \
-        crypto_ft_tab[3][get_byte(bi[(n + 3) & 3], 3)] ^ *(k + n);  \
-} while (0)
+#define f_rn(bo, bi, n, k)                                                   \
+  do                                                                         \
+    {                                                                        \
+      bo[n] = crypto_ft_tab[0][get_byte(bi[n], 0)] ^                         \
+              crypto_ft_tab[1][get_byte(bi[(n + 1) & 3], 1)] ^               \
+              crypto_ft_tab[2][get_byte(bi[(n + 2) & 3], 2)] ^               \
+              crypto_ft_tab[3][get_byte(bi[(n + 3) & 3], 3)] ^ *(k + n);     \
+    }                                                                        \
+  while (0)
 
-#define f_nround(bo, bi, k)     do {\
-    f_rn(bo, bi, 0, k);     \
-    f_rn(bo, bi, 1, k);     \
-    f_rn(bo, bi, 2, k);     \
-    f_rn(bo, bi, 3, k);     \
-    k += 4;         \
-} while (0)
+#define f_nround(bo, bi, k)                                                  \
+  do                                                                         \
+    {                                                                        \
+      f_rn(bo, bi, 0, k);                                                    \
+      f_rn(bo, bi, 1, k);                                                    \
+      f_rn(bo, bi, 2, k);                                                    \
+      f_rn(bo, bi, 3, k);                                                    \
+      k += 4;                                                                \
+    }                                                                        \
+  while (0)
 
-#define f_rl(bo, bi, n, k)      do {                \
-    bo[n] = crypto_fl_tab[0][get_byte(bi[n], 0)] ^              \
-        crypto_fl_tab[1][get_byte(bi[(n + 1) & 3], 1)] ^        \
-        crypto_fl_tab[2][get_byte(bi[(n + 2) & 3], 2)] ^        \
-        crypto_fl_tab[3][get_byte(bi[(n + 3) & 3], 3)] ^ *(k + n);  \
-} while (0)
+#define f_rl(bo, bi, n, k)                                                   \
+  do                                                                         \
+    {                                                                        \
+      bo[n] = crypto_fl_tab[0][get_byte(bi[n], 0)] ^                         \
+              crypto_fl_tab[1][get_byte(bi[(n + 1) & 3], 1)] ^               \
+              crypto_fl_tab[2][get_byte(bi[(n + 2) & 3], 2)] ^               \
+              crypto_fl_tab[3][get_byte(bi[(n + 3) & 3], 3)] ^ *(k + n);     \
+    }                                                                        \
+  while (0)
 
-#define f_lround(bo, bi, k)     do {\
-    f_rl(bo, bi, 0, k);     \
-    f_rl(bo, bi, 1, k);     \
-    f_rl(bo, bi, 2, k);     \
-    f_rl(bo, bi, 3, k);     \
-} while (0)
+#define f_lround(bo, bi, k)                                                  \
+  do                                                                         \
+    {                                                                        \
+      f_rl(bo, bi, 0, k);                                                    \
+      f_rl(bo, bi, 1, k);                                                    \
+      f_rl(bo, bi, 2, k);                                                    \
+      f_rl(bo, bi, 3, k);                                                    \
+    }                                                                        \
+  while (0)
 
-static void AES_Encrypt(aes_context_t *ctx, uint8_t *out,
-                        const uint8_t *in)
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Please ensure that the first two fields are 16-byte aligned
+ * relative to the start of the structure, i.e., don't move them!
+ */
+
+typedef struct
 {
-    const uint32_t *src = (const uint32_t *)in;
-    uint32_t *dst = (uint32_t *)out;
-    uint32_t b0[4], b1[4];
-    const uint32_t *kp = ctx->key_enc + 4;
-    const int key_len = ctx->key_length;
+  uint32_t key_enc[AES_MAX_KEYLENGTH_U32];
+  uint32_t key_dec[AES_MAX_KEYLENGTH_U32];
+  uint32_t key_length;
+} aes_context_t;
 
-    b0[0] = le32_to_cpu(src[0]) ^ ctx->key_enc[0];
-    b0[1] = le32_to_cpu(src[1]) ^ ctx->key_enc[1];
-    b0[2] = le32_to_cpu(src[2]) ^ ctx->key_enc[2];
-    b0[3] = le32_to_cpu(src[3]) ^ ctx->key_enc[3];
-
-    if (key_len > 24) {
-        f_nround(b1, b0, kp);
-        f_nround(b0, b1, kp);
-    }
-
-    if (key_len > 16) {
-        f_nround(b1, b0, kp);
-        f_nround(b0, b1, kp);
-    }
-
-    f_nround(b1, b0, kp);
-    f_nround(b0, b1, kp);
-    f_nround(b1, b0, kp);
-    f_nround(b0, b1, kp);
-    f_nround(b1, b0, kp);
-    f_nround(b0, b1, kp);
-    f_nround(b1, b0, kp);
-    f_nround(b0, b1, kp);
-    f_nround(b1, b0, kp);
-    f_lround(b0, b1, kp);
-
-    dst[0] = cpu_to_le32(b0[0]);
-    dst[1] = cpu_to_le32(b0[1]);
-    dst[2] = cpu_to_le32(b0[2]);
-    dst[3] = cpu_to_le32(b0[3]);
-}
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
 static boolean prng_enabled = false;
 static aes_context_t prng_context;
@@ -886,71 +254,677 @@ static uint32_t prng_input_counter;
 static uint32_t prng_values[4];
 static unsigned int prng_value_index = 0;
 
-// Initialize Pseudo-RNG using the specified 128-bit key.
-
-void PRNG_Start(prng_seed_t key)
+static const uint32_t rco_tab[10] =
 {
-    AES_SetKey(&prng_context, key, sizeof(prng_seed_t));
-    prng_value_index = 4;
-    prng_input_counter = 0;
-    prng_enabled = true;
+  1, 2, 4, 8, 16, 32, 64, 128, 27, 54,
+};
+
+static const uint32_t crypto_ft_tab[4][256] =
+{
+    {
+        0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, 0x0df2f2ff,
+        0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, 0x50303060, 0x03010102,
+        0xa96767ce, 0x7d2b2b56, 0x19fefee7, 0x62d7d7b5, 0xe6abab4d,
+        0x9a7676ec, 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
+        0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, 0xecadad41,
+        0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, 0xbf9c9c23, 0xf7a4a453,
+        0x967272e4, 0x5bc0c09b, 0xc2b7b775, 0x1cfdfde1, 0xae93933d,
+        0x6a26264c, 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
+        0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, 0x937171e2,
+        0x73d8d8ab, 0x53313162, 0x3f15152a, 0x0c040408, 0x52c7c795,
+        0x65232346, 0x5ec3c39d, 0x28181830, 0xa1969637, 0x0f05050a,
+        0xb59a9a2f, 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
+        0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, 0x1b090912,
+        0x9e83831d, 0x742c2c58, 0x2e1a1a34, 0x2d1b1b36, 0xb26e6edc,
+        0xee5a5ab4, 0xfba0a05b, 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7,
+        0xceb3b37d, 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
+        0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, 0x60202040,
+        0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, 0xbe6a6ad4, 0x46cbcb8d,
+        0xd9bebe67, 0x4b393972, 0xde4a4a94, 0xd44c4c98, 0xe85858b0,
+        0x4acfcf85, 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
+        0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, 0xcf45458a,
+        0x10f9f9e9, 0x06020204, 0x817f7ffe, 0xf05050a0, 0x443c3c78,
+        0xba9f9f25, 0xe3a8a84b, 0xf35151a2, 0xfea3a35d, 0xc0404080,
+        0x8a8f8f05, 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
+        0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, 0x30101020,
+        0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, 0x4ccdcd81, 0x140c0c18,
+        0x35131326, 0x2fececc3, 0xe15f5fbe, 0xa2979735, 0xcc444488,
+        0x3917172e, 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
+        0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, 0xa06060c0,
+        0x98818119, 0xd14f4f9e, 0x7fdcdca3, 0x66222244, 0x7e2a2a54,
+        0xab90903b, 0x8388880b, 0xca46468c, 0x29eeeec7, 0xd3b8b86b,
+        0x3c141428, 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
+        0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, 0xdb494992,
+        0x0a06060c, 0x6c242448, 0xe45c5cb8, 0x5dc2c29f, 0x6ed3d3bd,
+        0xefacac43, 0xa66262c4, 0xa8919139, 0xa4959531, 0x37e4e4d3,
+        0x8b7979f2, 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
+        0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, 0xb46c6cd8,
+        0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, 0xaf6565ca, 0x8e7a7af4,
+        0xe9aeae47, 0x18080810, 0xd5baba6f, 0x887878f0, 0x6f25254a,
+        0x722e2e5c, 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
+        0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, 0xdd4b4b96,
+        0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, 0x907070e0, 0x423e3e7c,
+        0xc4b5b571, 0xaa6666cc, 0xd8484890, 0x05030306, 0x01f6f6f7,
+        0x120e0e1c, 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
+        0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, 0x38e1e1d9,
+        0x13f8f8eb, 0xb398982b, 0x33111122, 0xbb6969d2, 0x70d9d9a9,
+        0x898e8e07, 0xa7949433, 0xb69b9b2d, 0x221e1e3c, 0x92878715,
+        0x20e9e9c9, 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
+        0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, 0xdabfbf65,
+        0x31e6e6d7, 0xc6424284, 0xb86868d0, 0xc3414182, 0xb0999929,
+        0x772d2d5a, 0x110f0f1e, 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d,
+        0x3a16162c,
+    },
+    {
+        0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d, 0xf2f2ff0d,
+        0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154, 0x30306050, 0x01010203,
+        0x6767cea9, 0x2b2b567d, 0xfefee719, 0xd7d7b562, 0xabab4de6,
+        0x7676ec9a, 0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87,
+        0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b, 0xadad41ec,
+        0xd4d4b367, 0xa2a25ffd, 0xafaf45ea, 0x9c9c23bf, 0xa4a453f7,
+        0x7272e496, 0xc0c09b5b, 0xb7b775c2, 0xfdfde11c, 0x93933dae,
+        0x26264c6a, 0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f,
+        0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908, 0x7171e293,
+        0xd8d8ab73, 0x31316253, 0x15152a3f, 0x0404080c, 0xc7c79552,
+        0x23234665, 0xc3c39d5e, 0x18183028, 0x969637a1, 0x05050a0f,
+        0x9a9a2fb5, 0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d,
+        0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f, 0x0909121b,
+        0x83831d9e, 0x2c2c5874, 0x1a1a342e, 0x1b1b362d, 0x6e6edcb2,
+        0x5a5ab4ee, 0xa0a05bfb, 0x5252a4f6, 0x3b3b764d, 0xd6d6b761,
+        0xb3b37dce, 0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397,
+        0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c, 0x20204060,
+        0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed, 0x6a6ad4be, 0xcbcb8d46,
+        0xbebe67d9, 0x3939724b, 0x4a4a94de, 0x4c4c98d4, 0x5858b0e8,
+        0xcfcf854a, 0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16,
+        0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194, 0x45458acf,
+        0xf9f9e910, 0x02020406, 0x7f7ffe81, 0x5050a0f0, 0x3c3c7844,
+        0x9f9f25ba, 0xa8a84be3, 0x5151a2f3, 0xa3a35dfe, 0x404080c0,
+        0x8f8f058a, 0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104,
+        0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263, 0x10102030,
+        0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d, 0xcdcd814c, 0x0c0c1814,
+        0x13132635, 0xececc32f, 0x5f5fbee1, 0x979735a2, 0x444488cc,
+        0x17172e39, 0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47,
+        0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695, 0x6060c0a0,
+        0x81811998, 0x4f4f9ed1, 0xdcdca37f, 0x22224466, 0x2a2a547e,
+        0x90903bab, 0x88880b83, 0x46468cca, 0xeeeec729, 0xb8b86bd3,
+        0x1414283c, 0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76,
+        0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e, 0x494992db,
+        0x06060c0a, 0x2424486c, 0x5c5cb8e4, 0xc2c29f5d, 0xd3d3bd6e,
+        0xacac43ef, 0x6262c4a6, 0x919139a8, 0x959531a4, 0xe4e4d337,
+        0x7979f28b, 0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7,
+        0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0, 0x6c6cd8b4,
+        0x5656acfa, 0xf4f4f307, 0xeaeacf25, 0x6565caaf, 0x7a7af48e,
+        0xaeae47e9, 0x08081018, 0xbaba6fd5, 0x7878f088, 0x25254a6f,
+        0x2e2e5c72, 0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751,
+        0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21, 0x4b4b96dd,
+        0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85, 0x7070e090, 0x3e3e7c42,
+        0xb5b571c4, 0x6666ccaa, 0x484890d8, 0x03030605, 0xf6f6f701,
+        0x0e0e1c12, 0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0,
+        0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9, 0xe1e1d938,
+        0xf8f8eb13, 0x98982bb3, 0x11112233, 0x6969d2bb, 0xd9d9a970,
+        0x8e8e0789, 0x949433a7, 0x9b9b2db6, 0x1e1e3c22, 0x87871592,
+        0xe9e9c920, 0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a,
+        0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17, 0xbfbf65da,
+        0xe6e6d731, 0x424284c6, 0x6868d0b8, 0x414182c3, 0x999929b0,
+        0x2d2d5a77, 0x0f0f1e11, 0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6,
+        0x16162c3a,
+    },
+    {
+        0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b, 0xf2ff0df2,
+        0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5, 0x30605030, 0x01020301,
+        0x67cea967, 0x2b567d2b, 0xfee719fe, 0xd7b562d7, 0xab4de6ab,
+        0x76ec9a76, 0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d,
+        0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0, 0xad41ecad,
+        0xd4b367d4, 0xa25ffda2, 0xaf45eaaf, 0x9c23bf9c, 0xa453f7a4,
+        0x72e49672, 0xc09b5bc0, 0xb775c2b7, 0xfde11cfd, 0x933dae93,
+        0x264c6a26, 0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc,
+        0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1, 0x71e29371,
+        0xd8ab73d8, 0x31625331, 0x152a3f15, 0x04080c04, 0xc79552c7,
+        0x23466523, 0xc39d5ec3, 0x18302818, 0x9637a196, 0x050a0f05,
+        0x9a2fb59a, 0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2,
+        0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75, 0x09121b09,
+        0x831d9e83, 0x2c58742c, 0x1a342e1a, 0x1b362d1b, 0x6edcb26e,
+        0x5ab4ee5a, 0xa05bfba0, 0x52a4f652, 0x3b764d3b, 0xd6b761d6,
+        0xb37dceb3, 0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784,
+        0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced, 0x20406020,
+        0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b, 0x6ad4be6a, 0xcb8d46cb,
+        0xbe67d9be, 0x39724b39, 0x4a94de4a, 0x4c98d44c, 0x58b0e858,
+        0xcf854acf, 0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb,
+        0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485, 0x458acf45,
+        0xf9e910f9, 0x02040602, 0x7ffe817f, 0x50a0f050, 0x3c78443c,
+        0x9f25ba9f, 0xa84be3a8, 0x51a2f351, 0xa35dfea3, 0x4080c040,
+        0x8f058a8f, 0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5,
+        0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321, 0x10203010,
+        0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2, 0xcd814ccd, 0x0c18140c,
+        0x13263513, 0xecc32fec, 0x5fbee15f, 0x9735a297, 0x4488cc44,
+        0x172e3917, 0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d,
+        0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573, 0x60c0a060,
+        0x81199881, 0x4f9ed14f, 0xdca37fdc, 0x22446622, 0x2a547e2a,
+        0x903bab90, 0x880b8388, 0x468cca46, 0xeec729ee, 0xb86bd3b8,
+        0x14283c14, 0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db,
+        0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a, 0x4992db49,
+        0x060c0a06, 0x24486c24, 0x5cb8e45c, 0xc29f5dc2, 0xd3bd6ed3,
+        0xac43efac, 0x62c4a662, 0x9139a891, 0x9531a495, 0xe4d337e4,
+        0x79f28b79, 0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d,
+        0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9, 0x6cd8b46c,
+        0x56acfa56, 0xf4f307f4, 0xeacf25ea, 0x65caaf65, 0x7af48e7a,
+        0xae47e9ae, 0x08101808, 0xba6fd5ba, 0x78f08878, 0x254a6f25,
+        0x2e5c722e, 0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6,
+        0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f, 0x4b96dd4b,
+        0xbd61dcbd, 0x8b0d868b, 0x8a0f858a, 0x70e09070, 0x3e7c423e,
+        0xb571c4b5, 0x66ccaa66, 0x4890d848, 0x03060503, 0xf6f701f6,
+        0x0e1c120e, 0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9,
+        0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e, 0xe1d938e1,
+        0xf8eb13f8, 0x982bb398, 0x11223311, 0x69d2bb69, 0xd9a970d9,
+        0x8e07898e, 0x9433a794, 0x9b2db69b, 0x1e3c221e, 0x87159287,
+        0xe9c920e9, 0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf,
+        0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d, 0xbf65dabf,
+        0xe6d731e6, 0x4284c642, 0x68d0b868, 0x4182c341, 0x9929b099,
+        0x2d5a772d, 0x0f1e110f, 0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb,
+        0x162c3a16,
+    },
+    {
+        0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b, 0xff0df2f2,
+        0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5, 0x60503030, 0x02030101,
+        0xcea96767, 0x567d2b2b, 0xe719fefe, 0xb562d7d7, 0x4de6abab,
+        0xec9a7676, 0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d,
+        0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0, 0x41ecadad,
+        0xb367d4d4, 0x5ffda2a2, 0x45eaafaf, 0x23bf9c9c, 0x53f7a4a4,
+        0xe4967272, 0x9b5bc0c0, 0x75c2b7b7, 0xe11cfdfd, 0x3dae9393,
+        0x4c6a2626, 0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc,
+        0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1, 0xe2937171,
+        0xab73d8d8, 0x62533131, 0x2a3f1515, 0x080c0404, 0x9552c7c7,
+        0x46652323, 0x9d5ec3c3, 0x30281818, 0x37a19696, 0x0a0f0505,
+        0x2fb59a9a, 0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2,
+        0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575, 0x121b0909,
+        0x1d9e8383, 0x58742c2c, 0x342e1a1a, 0x362d1b1b, 0xdcb26e6e,
+        0xb4ee5a5a, 0x5bfba0a0, 0xa4f65252, 0x764d3b3b, 0xb761d6d6,
+        0x7dceb3b3, 0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484,
+        0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded, 0x40602020,
+        0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b, 0xd4be6a6a, 0x8d46cbcb,
+        0x67d9bebe, 0x724b3939, 0x94de4a4a, 0x98d44c4c, 0xb0e85858,
+        0x854acfcf, 0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb,
+        0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585, 0x8acf4545,
+        0xe910f9f9, 0x04060202, 0xfe817f7f, 0xa0f05050, 0x78443c3c,
+        0x25ba9f9f, 0x4be3a8a8, 0xa2f35151, 0x5dfea3a3, 0x80c04040,
+        0x058a8f8f, 0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5,
+        0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121, 0x20301010,
+        0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2, 0x814ccdcd, 0x18140c0c,
+        0x26351313, 0xc32fecec, 0xbee15f5f, 0x35a29797, 0x88cc4444,
+        0x2e391717, 0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d,
+        0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373, 0xc0a06060,
+        0x19988181, 0x9ed14f4f, 0xa37fdcdc, 0x44662222, 0x547e2a2a,
+        0x3bab9090, 0x0b838888, 0x8cca4646, 0xc729eeee, 0x6bd3b8b8,
+        0x283c1414, 0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb,
+        0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a, 0x92db4949,
+        0x0c0a0606, 0x486c2424, 0xb8e45c5c, 0x9f5dc2c2, 0xbd6ed3d3,
+        0x43efacac, 0xc4a66262, 0x39a89191, 0x31a49595, 0xd337e4e4,
+        0xf28b7979, 0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d,
+        0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9, 0xd8b46c6c,
+        0xacfa5656, 0xf307f4f4, 0xcf25eaea, 0xcaaf6565, 0xf48e7a7a,
+        0x47e9aeae, 0x10180808, 0x6fd5baba, 0xf0887878, 0x4a6f2525,
+        0x5c722e2e, 0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6,
+        0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f, 0x96dd4b4b,
+        0x61dcbdbd, 0x0d868b8b, 0x0f858a8a, 0xe0907070, 0x7c423e3e,
+        0x71c4b5b5, 0xccaa6666, 0x90d84848, 0x06050303, 0xf701f6f6,
+        0x1c120e0e, 0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9,
+        0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e, 0xd938e1e1,
+        0xeb13f8f8, 0x2bb39898, 0x22331111, 0xd2bb6969, 0xa970d9d9,
+        0x07898e8e, 0x33a79494, 0x2db69b9b, 0x3c221e1e, 0x15928787,
+        0xc920e9e9, 0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf,
+        0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d, 0x65dabfbf,
+        0xd731e6e6, 0x84c64242, 0xd0b86868, 0x82c34141, 0x29b09999,
+        0x5a772d2d, 0x1e110f0f, 0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb,
+        0x2c3a1616,
+    },
+};
+
+static const uint32_t crypto_fl_tab[4][256] =
+{
+    {
+        0x00000063, 0x0000007c, 0x00000077, 0x0000007b, 0x000000f2,
+        0x0000006b, 0x0000006f, 0x000000c5, 0x00000030, 0x00000001,
+        0x00000067, 0x0000002b, 0x000000fe, 0x000000d7, 0x000000ab,
+        0x00000076, 0x000000ca, 0x00000082, 0x000000c9, 0x0000007d,
+        0x000000fa, 0x00000059, 0x00000047, 0x000000f0, 0x000000ad,
+        0x000000d4, 0x000000a2, 0x000000af, 0x0000009c, 0x000000a4,
+        0x00000072, 0x000000c0, 0x000000b7, 0x000000fd, 0x00000093,
+        0x00000026, 0x00000036, 0x0000003f, 0x000000f7, 0x000000cc,
+        0x00000034, 0x000000a5, 0x000000e5, 0x000000f1, 0x00000071,
+        0x000000d8, 0x00000031, 0x00000015, 0x00000004, 0x000000c7,
+        0x00000023, 0x000000c3, 0x00000018, 0x00000096, 0x00000005,
+        0x0000009a, 0x00000007, 0x00000012, 0x00000080, 0x000000e2,
+        0x000000eb, 0x00000027, 0x000000b2, 0x00000075, 0x00000009,
+        0x00000083, 0x0000002c, 0x0000001a, 0x0000001b, 0x0000006e,
+        0x0000005a, 0x000000a0, 0x00000052, 0x0000003b, 0x000000d6,
+        0x000000b3, 0x00000029, 0x000000e3, 0x0000002f, 0x00000084,
+        0x00000053, 0x000000d1, 0x00000000, 0x000000ed, 0x00000020,
+        0x000000fc, 0x000000b1, 0x0000005b, 0x0000006a, 0x000000cb,
+        0x000000be, 0x00000039, 0x0000004a, 0x0000004c, 0x00000058,
+        0x000000cf, 0x000000d0, 0x000000ef, 0x000000aa, 0x000000fb,
+        0x00000043, 0x0000004d, 0x00000033, 0x00000085, 0x00000045,
+        0x000000f9, 0x00000002, 0x0000007f, 0x00000050, 0x0000003c,
+        0x0000009f, 0x000000a8, 0x00000051, 0x000000a3, 0x00000040,
+        0x0000008f, 0x00000092, 0x0000009d, 0x00000038, 0x000000f5,
+        0x000000bc, 0x000000b6, 0x000000da, 0x00000021, 0x00000010,
+        0x000000ff, 0x000000f3, 0x000000d2, 0x000000cd, 0x0000000c,
+        0x00000013, 0x000000ec, 0x0000005f, 0x00000097, 0x00000044,
+        0x00000017, 0x000000c4, 0x000000a7, 0x0000007e, 0x0000003d,
+        0x00000064, 0x0000005d, 0x00000019, 0x00000073, 0x00000060,
+        0x00000081, 0x0000004f, 0x000000dc, 0x00000022, 0x0000002a,
+        0x00000090, 0x00000088, 0x00000046, 0x000000ee, 0x000000b8,
+        0x00000014, 0x000000de, 0x0000005e, 0x0000000b, 0x000000db,
+        0x000000e0, 0x00000032, 0x0000003a, 0x0000000a, 0x00000049,
+        0x00000006, 0x00000024, 0x0000005c, 0x000000c2, 0x000000d3,
+        0x000000ac, 0x00000062, 0x00000091, 0x00000095, 0x000000e4,
+        0x00000079, 0x000000e7, 0x000000c8, 0x00000037, 0x0000006d,
+        0x0000008d, 0x000000d5, 0x0000004e, 0x000000a9, 0x0000006c,
+        0x00000056, 0x000000f4, 0x000000ea, 0x00000065, 0x0000007a,
+        0x000000ae, 0x00000008, 0x000000ba, 0x00000078, 0x00000025,
+        0x0000002e, 0x0000001c, 0x000000a6, 0x000000b4, 0x000000c6,
+        0x000000e8, 0x000000dd, 0x00000074, 0x0000001f, 0x0000004b,
+        0x000000bd, 0x0000008b, 0x0000008a, 0x00000070, 0x0000003e,
+        0x000000b5, 0x00000066, 0x00000048, 0x00000003, 0x000000f6,
+        0x0000000e, 0x00000061, 0x00000035, 0x00000057, 0x000000b9,
+        0x00000086, 0x000000c1, 0x0000001d, 0x0000009e, 0x000000e1,
+        0x000000f8, 0x00000098, 0x00000011, 0x00000069, 0x000000d9,
+        0x0000008e, 0x00000094, 0x0000009b, 0x0000001e, 0x00000087,
+        0x000000e9, 0x000000ce, 0x00000055, 0x00000028, 0x000000df,
+        0x0000008c, 0x000000a1, 0x00000089, 0x0000000d, 0x000000bf,
+        0x000000e6, 0x00000042, 0x00000068, 0x00000041, 0x00000099,
+        0x0000002d, 0x0000000f, 0x000000b0, 0x00000054, 0x000000bb,
+        0x00000016,
+    },
+    {
+        0x00006300, 0x00007c00, 0x00007700, 0x00007b00, 0x0000f200,
+        0x00006b00, 0x00006f00, 0x0000c500, 0x00003000, 0x00000100,
+        0x00006700, 0x00002b00, 0x0000fe00, 0x0000d700, 0x0000ab00,
+        0x00007600, 0x0000ca00, 0x00008200, 0x0000c900, 0x00007d00,
+        0x0000fa00, 0x00005900, 0x00004700, 0x0000f000, 0x0000ad00,
+        0x0000d400, 0x0000a200, 0x0000af00, 0x00009c00, 0x0000a400,
+        0x00007200, 0x0000c000, 0x0000b700, 0x0000fd00, 0x00009300,
+        0x00002600, 0x00003600, 0x00003f00, 0x0000f700, 0x0000cc00,
+        0x00003400, 0x0000a500, 0x0000e500, 0x0000f100, 0x00007100,
+        0x0000d800, 0x00003100, 0x00001500, 0x00000400, 0x0000c700,
+        0x00002300, 0x0000c300, 0x00001800, 0x00009600, 0x00000500,
+        0x00009a00, 0x00000700, 0x00001200, 0x00008000, 0x0000e200,
+        0x0000eb00, 0x00002700, 0x0000b200, 0x00007500, 0x00000900,
+        0x00008300, 0x00002c00, 0x00001a00, 0x00001b00, 0x00006e00,
+        0x00005a00, 0x0000a000, 0x00005200, 0x00003b00, 0x0000d600,
+        0x0000b300, 0x00002900, 0x0000e300, 0x00002f00, 0x00008400,
+        0x00005300, 0x0000d100, 0x00000000, 0x0000ed00, 0x00002000,
+        0x0000fc00, 0x0000b100, 0x00005b00, 0x00006a00, 0x0000cb00,
+        0x0000be00, 0x00003900, 0x00004a00, 0x00004c00, 0x00005800,
+        0x0000cf00, 0x0000d000, 0x0000ef00, 0x0000aa00, 0x0000fb00,
+        0x00004300, 0x00004d00, 0x00003300, 0x00008500, 0x00004500,
+        0x0000f900, 0x00000200, 0x00007f00, 0x00005000, 0x00003c00,
+        0x00009f00, 0x0000a800, 0x00005100, 0x0000a300, 0x00004000,
+        0x00008f00, 0x00009200, 0x00009d00, 0x00003800, 0x0000f500,
+        0x0000bc00, 0x0000b600, 0x0000da00, 0x00002100, 0x00001000,
+        0x0000ff00, 0x0000f300, 0x0000d200, 0x0000cd00, 0x00000c00,
+        0x00001300, 0x0000ec00, 0x00005f00, 0x00009700, 0x00004400,
+        0x00001700, 0x0000c400, 0x0000a700, 0x00007e00, 0x00003d00,
+        0x00006400, 0x00005d00, 0x00001900, 0x00007300, 0x00006000,
+        0x00008100, 0x00004f00, 0x0000dc00, 0x00002200, 0x00002a00,
+        0x00009000, 0x00008800, 0x00004600, 0x0000ee00, 0x0000b800,
+        0x00001400, 0x0000de00, 0x00005e00, 0x00000b00, 0x0000db00,
+        0x0000e000, 0x00003200, 0x00003a00, 0x00000a00, 0x00004900,
+        0x00000600, 0x00002400, 0x00005c00, 0x0000c200, 0x0000d300,
+        0x0000ac00, 0x00006200, 0x00009100, 0x00009500, 0x0000e400,
+        0x00007900, 0x0000e700, 0x0000c800, 0x00003700, 0x00006d00,
+        0x00008d00, 0x0000d500, 0x00004e00, 0x0000a900, 0x00006c00,
+        0x00005600, 0x0000f400, 0x0000ea00, 0x00006500, 0x00007a00,
+        0x0000ae00, 0x00000800, 0x0000ba00, 0x00007800, 0x00002500,
+        0x00002e00, 0x00001c00, 0x0000a600, 0x0000b400, 0x0000c600,
+        0x0000e800, 0x0000dd00, 0x00007400, 0x00001f00, 0x00004b00,
+        0x0000bd00, 0x00008b00, 0x00008a00, 0x00007000, 0x00003e00,
+        0x0000b500, 0x00006600, 0x00004800, 0x00000300, 0x0000f600,
+        0x00000e00, 0x00006100, 0x00003500, 0x00005700, 0x0000b900,
+        0x00008600, 0x0000c100, 0x00001d00, 0x00009e00, 0x0000e100,
+        0x0000f800, 0x00009800, 0x00001100, 0x00006900, 0x0000d900,
+        0x00008e00, 0x00009400, 0x00009b00, 0x00001e00, 0x00008700,
+        0x0000e900, 0x0000ce00, 0x00005500, 0x00002800, 0x0000df00,
+        0x00008c00, 0x0000a100, 0x00008900, 0x00000d00, 0x0000bf00,
+        0x0000e600, 0x00004200, 0x00006800, 0x00004100, 0x00009900,
+        0x00002d00, 0x00000f00, 0x0000b000, 0x00005400, 0x0000bb00,
+        0x00001600,
+    },
+    {
+        0x00630000, 0x007c0000, 0x00770000, 0x007b0000, 0x00f20000,
+        0x006b0000, 0x006f0000, 0x00c50000, 0x00300000, 0x00010000,
+        0x00670000, 0x002b0000, 0x00fe0000, 0x00d70000, 0x00ab0000,
+        0x00760000, 0x00ca0000, 0x00820000, 0x00c90000, 0x007d0000,
+        0x00fa0000, 0x00590000, 0x00470000, 0x00f00000, 0x00ad0000,
+        0x00d40000, 0x00a20000, 0x00af0000, 0x009c0000, 0x00a40000,
+        0x00720000, 0x00c00000, 0x00b70000, 0x00fd0000, 0x00930000,
+        0x00260000, 0x00360000, 0x003f0000, 0x00f70000, 0x00cc0000,
+        0x00340000, 0x00a50000, 0x00e50000, 0x00f10000, 0x00710000,
+        0x00d80000, 0x00310000, 0x00150000, 0x00040000, 0x00c70000,
+        0x00230000, 0x00c30000, 0x00180000, 0x00960000, 0x00050000,
+        0x009a0000, 0x00070000, 0x00120000, 0x00800000, 0x00e20000,
+        0x00eb0000, 0x00270000, 0x00b20000, 0x00750000, 0x00090000,
+        0x00830000, 0x002c0000, 0x001a0000, 0x001b0000, 0x006e0000,
+        0x005a0000, 0x00a00000, 0x00520000, 0x003b0000, 0x00d60000,
+        0x00b30000, 0x00290000, 0x00e30000, 0x002f0000, 0x00840000,
+        0x00530000, 0x00d10000, 0x00000000, 0x00ed0000, 0x00200000,
+        0x00fc0000, 0x00b10000, 0x005b0000, 0x006a0000, 0x00cb0000,
+        0x00be0000, 0x00390000, 0x004a0000, 0x004c0000, 0x00580000,
+        0x00cf0000, 0x00d00000, 0x00ef0000, 0x00aa0000, 0x00fb0000,
+        0x00430000, 0x004d0000, 0x00330000, 0x00850000, 0x00450000,
+        0x00f90000, 0x00020000, 0x007f0000, 0x00500000, 0x003c0000,
+        0x009f0000, 0x00a80000, 0x00510000, 0x00a30000, 0x00400000,
+        0x008f0000, 0x00920000, 0x009d0000, 0x00380000, 0x00f50000,
+        0x00bc0000, 0x00b60000, 0x00da0000, 0x00210000, 0x00100000,
+        0x00ff0000, 0x00f30000, 0x00d20000, 0x00cd0000, 0x000c0000,
+        0x00130000, 0x00ec0000, 0x005f0000, 0x00970000, 0x00440000,
+        0x00170000, 0x00c40000, 0x00a70000, 0x007e0000, 0x003d0000,
+        0x00640000, 0x005d0000, 0x00190000, 0x00730000, 0x00600000,
+        0x00810000, 0x004f0000, 0x00dc0000, 0x00220000, 0x002a0000,
+        0x00900000, 0x00880000, 0x00460000, 0x00ee0000, 0x00b80000,
+        0x00140000, 0x00de0000, 0x005e0000, 0x000b0000, 0x00db0000,
+        0x00e00000, 0x00320000, 0x003a0000, 0x000a0000, 0x00490000,
+        0x00060000, 0x00240000, 0x005c0000, 0x00c20000, 0x00d30000,
+        0x00ac0000, 0x00620000, 0x00910000, 0x00950000, 0x00e40000,
+        0x00790000, 0x00e70000, 0x00c80000, 0x00370000, 0x006d0000,
+        0x008d0000, 0x00d50000, 0x004e0000, 0x00a90000, 0x006c0000,
+        0x00560000, 0x00f40000, 0x00ea0000, 0x00650000, 0x007a0000,
+        0x00ae0000, 0x00080000, 0x00ba0000, 0x00780000, 0x00250000,
+        0x002e0000, 0x001c0000, 0x00a60000, 0x00b40000, 0x00c60000,
+        0x00e80000, 0x00dd0000, 0x00740000, 0x001f0000, 0x004b0000,
+        0x00bd0000, 0x008b0000, 0x008a0000, 0x00700000, 0x003e0000,
+        0x00b50000, 0x00660000, 0x00480000, 0x00030000, 0x00f60000,
+        0x000e0000, 0x00610000, 0x00350000, 0x00570000, 0x00b90000,
+        0x00860000, 0x00c10000, 0x001d0000, 0x009e0000, 0x00e10000,
+        0x00f80000, 0x00980000, 0x00110000, 0x00690000, 0x00d90000,
+        0x008e0000, 0x00940000, 0x009b0000, 0x001e0000, 0x00870000,
+        0x00e90000, 0x00ce0000, 0x00550000, 0x00280000, 0x00df0000,
+        0x008c0000, 0x00a10000, 0x00890000, 0x000d0000, 0x00bf0000,
+        0x00e60000, 0x00420000, 0x00680000, 0x00410000, 0x00990000,
+        0x002d0000, 0x000f0000, 0x00b00000, 0x00540000, 0x00bb0000,
+        0x00160000,
+    },
+    {
+        0x63000000, 0x7c000000, 0x77000000, 0x7b000000, 0xf2000000,
+        0x6b000000, 0x6f000000, 0xc5000000, 0x30000000, 0x01000000,
+        0x67000000, 0x2b000000, 0xfe000000, 0xd7000000, 0xab000000,
+        0x76000000, 0xca000000, 0x82000000, 0xc9000000, 0x7d000000,
+        0xfa000000, 0x59000000, 0x47000000, 0xf0000000, 0xad000000,
+        0xd4000000, 0xa2000000, 0xaf000000, 0x9c000000, 0xa4000000,
+        0x72000000, 0xc0000000, 0xb7000000, 0xfd000000, 0x93000000,
+        0x26000000, 0x36000000, 0x3f000000, 0xf7000000, 0xcc000000,
+        0x34000000, 0xa5000000, 0xe5000000, 0xf1000000, 0x71000000,
+        0xd8000000, 0x31000000, 0x15000000, 0x04000000, 0xc7000000,
+        0x23000000, 0xc3000000, 0x18000000, 0x96000000, 0x05000000,
+        0x9a000000, 0x07000000, 0x12000000, 0x80000000, 0xe2000000,
+        0xeb000000, 0x27000000, 0xb2000000, 0x75000000, 0x09000000,
+        0x83000000, 0x2c000000, 0x1a000000, 0x1b000000, 0x6e000000,
+        0x5a000000, 0xa0000000, 0x52000000, 0x3b000000, 0xd6000000,
+        0xb3000000, 0x29000000, 0xe3000000, 0x2f000000, 0x84000000,
+        0x53000000, 0xd1000000, 0x00000000, 0xed000000, 0x20000000,
+        0xfc000000, 0xb1000000, 0x5b000000, 0x6a000000, 0xcb000000,
+        0xbe000000, 0x39000000, 0x4a000000, 0x4c000000, 0x58000000,
+        0xcf000000, 0xd0000000, 0xef000000, 0xaa000000, 0xfb000000,
+        0x43000000, 0x4d000000, 0x33000000, 0x85000000, 0x45000000,
+        0xf9000000, 0x02000000, 0x7f000000, 0x50000000, 0x3c000000,
+        0x9f000000, 0xa8000000, 0x51000000, 0xa3000000, 0x40000000,
+        0x8f000000, 0x92000000, 0x9d000000, 0x38000000, 0xf5000000,
+        0xbc000000, 0xb6000000, 0xda000000, 0x21000000, 0x10000000,
+        0xff000000, 0xf3000000, 0xd2000000, 0xcd000000, 0x0c000000,
+        0x13000000, 0xec000000, 0x5f000000, 0x97000000, 0x44000000,
+        0x17000000, 0xc4000000, 0xa7000000, 0x7e000000, 0x3d000000,
+        0x64000000, 0x5d000000, 0x19000000, 0x73000000, 0x60000000,
+        0x81000000, 0x4f000000, 0xdc000000, 0x22000000, 0x2a000000,
+        0x90000000, 0x88000000, 0x46000000, 0xee000000, 0xb8000000,
+        0x14000000, 0xde000000, 0x5e000000, 0x0b000000, 0xdb000000,
+        0xe0000000, 0x32000000, 0x3a000000, 0x0a000000, 0x49000000,
+        0x06000000, 0x24000000, 0x5c000000, 0xc2000000, 0xd3000000,
+        0xac000000, 0x62000000, 0x91000000, 0x95000000, 0xe4000000,
+        0x79000000, 0xe7000000, 0xc8000000, 0x37000000, 0x6d000000,
+        0x8d000000, 0xd5000000, 0x4e000000, 0xa9000000, 0x6c000000,
+        0x56000000, 0xf4000000, 0xea000000, 0x65000000, 0x7a000000,
+        0xae000000, 0x08000000, 0xba000000, 0x78000000, 0x25000000,
+        0x2e000000, 0x1c000000, 0xa6000000, 0xb4000000, 0xc6000000,
+        0xe8000000, 0xdd000000, 0x74000000, 0x1f000000, 0x4b000000,
+        0xbd000000, 0x8b000000, 0x8a000000, 0x70000000, 0x3e000000,
+        0xb5000000, 0x66000000, 0x48000000, 0x03000000, 0xf6000000,
+        0x0e000000, 0x61000000, 0x35000000, 0x57000000, 0xb9000000,
+        0x86000000, 0xc1000000, 0x1d000000, 0x9e000000, 0xe1000000,
+        0xf8000000, 0x98000000, 0x11000000, 0x69000000, 0xd9000000,
+        0x8e000000, 0x94000000, 0x9b000000, 0x1e000000, 0x87000000,
+        0xe9000000, 0xce000000, 0x55000000, 0x28000000, 0xdf000000,
+        0x8c000000, 0xa1000000, 0x89000000, 0x0d000000, 0xbf000000,
+        0xe6000000, 0x42000000, 0x68000000, 0x41000000, 0x99000000,
+        0x2d000000, 0x0f000000, 0xb0000000, 0x54000000, 0xbb000000,
+        0x16000000,
+    },
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static inline uint8_t get_byte(const uint32_t x, const unsigned n)
+{
+  return x >> (n << 3);
 }
 
-void PRNG_Stop(void)
+/* initialise the key schedule from the user supplied key */
+
+static uint32_t aes_ror32(uint32_t word, unsigned int shift)
 {
-    prng_enabled = false;
+  return (word >> shift) | (word << (32 - shift));
 }
 
-// Generate a set of new PRNG values by encrypting a new block.
+/* aes_expand_key - Expands the AES key as described in FIPS-197
+ * @ctx:    The location where the computed key will be stored.
+ * @in_key:     The supplied key.
+ * @key_len:    The length of the supplied key.
+ *
+ * Returns 0 on success. The function fails only if an invalid key size (or
+ * pointer) is supplied.
+ *
+ * The expanded key size is 240 bytes (max of 14 rounds with a unique 16
+ * bytes key schedule plus a 16 bytes key which is used before the first
+ * round). The decryption key is prepared for the "Equivalent Inverse Cipher"
+ * as described in FIPS-197. The first slot (16 bytes) of each key (enc or
+ * dec) is for the initial combination, the second slot for the first round
+ * and so on.
+ */
 
-static void PRNG_Generate(void)
+static int aes_expand_key(aes_context_t *ctx, const uint8_t *in_key,
+                         unsigned int key_len)
 {
-    byte input[16], output[16];
-    unsigned int i;
+  const uint32_t *key = (const uint32_t *)in_key;
+  uint32_t i;
+  uint32_t t;
+  uint32_t u;
+  uint32_t v;
+  uint32_t w;
+  uint32_t j;
 
-    // Input for the cipher is a consecutively increasing 32-bit counter.
-
-    for (i = 0; i < 4; ++i)
+  if (key_len != AES_KEYSIZE_128 && key_len != AES_KEYSIZE_192 &&
+      key_len != AES_KEYSIZE_256)
     {
-        input[4*i] = prng_input_counter & 0xff;
-        input[4*i + 1] = (prng_input_counter >> 8) & 0xff;
-        input[4*i + 2] = (prng_input_counter >> 16) & 0xff;
-        input[4*i + 3] = (prng_input_counter >> 24) & 0xff;
-        ++prng_input_counter;
+      return -1;
     }
 
-    AES_Encrypt(&prng_context, output, input);
+  ctx->key_length = key_len;
 
-    for (i = 0; i < 4; ++i)
+  ctx->key_dec[key_len + 24] = ctx->key_enc[0] = le32_to_cpu(key[0]);
+  ctx->key_dec[key_len + 25] = ctx->key_enc[1] = le32_to_cpu(key[1]);
+  ctx->key_dec[key_len + 26] = ctx->key_enc[2] = le32_to_cpu(key[2]);
+  ctx->key_dec[key_len + 27] = ctx->key_enc[3] = le32_to_cpu(key[3]);
+
+  switch (key_len)
     {
-        prng_values[i] = output[4*i]
-                       | (output[4*i + 1] << 8)
-                       | (output[4*i + 2] << 16)
-                       | (output[4*i + 3] << 24);
+    case AES_KEYSIZE_128:
+      t = ctx->key_enc[3];
+      for (i = 0; i < 10; ++i)
+        loop4(i);
+      break;
+
+    case AES_KEYSIZE_192:
+      ctx->key_enc[4] = le32_to_cpu(key[4]);
+      t = ctx->key_enc[5] = le32_to_cpu(key[5]);
+      for (i = 0; i < 8; ++i)
+        loop6(i);
+      break;
+
+    case AES_KEYSIZE_256:
+      ctx->key_enc[4] = le32_to_cpu(key[4]);
+      ctx->key_enc[5] = le32_to_cpu(key[5]);
+      ctx->key_enc[6] = le32_to_cpu(key[6]);
+      t = ctx->key_enc[7] = le32_to_cpu(key[7]);
+      for (i = 0; i < 6; ++i)
+        loop8(i);
+      loop8tophalf(i);
+      break;
     }
 
-    prng_value_index = 0;
+  ctx->key_dec[0] = ctx->key_enc[key_len + 24];
+  ctx->key_dec[1] = ctx->key_enc[key_len + 25];
+  ctx->key_dec[2] = ctx->key_enc[key_len + 26];
+  ctx->key_dec[3] = ctx->key_enc[key_len + 27];
+
+  for (i = 4; i < key_len + 24; ++i)
+    {
+      j = key_len + 24 - (i & ~3) + (i & 3);
+      imix_col(ctx->key_dec[j], ctx->key_enc[i]);
+    }
+
+  return 0;
 }
 
-// Read a random 32-bit integer from the PRNG.
+/* aes_set_key - Set the AES key.
+ * @ctx:        AES context struct.
+ * @in_key:     The input key.
+ * @key_len:    The size of the key.
+ *
+ * Returns 0 on success, on failure -1 is returned.
+ * The function uses aes_expand_key() to expand the key.
+ */
 
-unsigned int PRNG_Random(void)
+static int aes_set_key(aes_context_t *ctx, const uint8_t *in_key,
+                      unsigned int key_len)
 {
-    unsigned int result;
+  int ret;
 
-    if (!prng_enabled)
-    {
-        return 0;
-    }
+  ret = aes_expand_key(ctx, in_key, key_len);
+  if (!ret) return 0;
 
-    if (prng_value_index >= 4)
-    {
-        PRNG_Generate();
-    }
-
-    result = prng_values[prng_value_index];
-    ++prng_value_index;
-
-    return result;
+  return -1;
 }
 
+static void aes_encrypt(aes_context_t *ctx, uint8_t *out, const uint8_t *in)
+{
+  const uint32_t *src = (const uint32_t *)in;
+  uint32_t *dst = (uint32_t *)out;
+  uint32_t b0[4];
+  uint32_t b1[4];
+  const uint32_t *kp = ctx->key_enc + 4;
+  const int key_len = ctx->key_length;
+
+  b0[0] = le32_to_cpu(src[0]) ^ ctx->key_enc[0];
+  b0[1] = le32_to_cpu(src[1]) ^ ctx->key_enc[1];
+  b0[2] = le32_to_cpu(src[2]) ^ ctx->key_enc[2];
+  b0[3] = le32_to_cpu(src[3]) ^ ctx->key_enc[3];
+
+  if (key_len > 24)
+    {
+      f_nround(b1, b0, kp);
+      f_nround(b0, b1, kp);
+    }
+
+  if (key_len > 16)
+    {
+      f_nround(b1, b0, kp);
+      f_nround(b0, b1, kp);
+    }
+
+  f_nround(b1, b0, kp);
+  f_nround(b0, b1, kp);
+  f_nround(b1, b0, kp);
+  f_nround(b0, b1, kp);
+  f_nround(b1, b0, kp);
+  f_nround(b0, b1, kp);
+  f_nround(b1, b0, kp);
+  f_nround(b0, b1, kp);
+  f_nround(b1, b0, kp);
+  f_lround(b0, b1, kp);
+
+  dst[0] = cpu_to_le32(b0[0]);
+  dst[1] = cpu_to_le32(b0[1]);
+  dst[2] = cpu_to_le32(b0[2]);
+  dst[3] = cpu_to_le32(b0[3]);
+}
+
+/* Generate a set of new PRNG values by encrypting a new block. */
+
+static void prng_generate(void)
+{
+  byte input[16];
+  byte output[16];
+  unsigned int i;
+
+  /* Input for the cipher is a consecutively increasing 32-bit counter. */
+
+  for (i = 0; i < 4; ++i)
+    {
+      input[4 * i] = prng_input_counter & 0xff;
+      input[4 * i + 1] = (prng_input_counter >> 8) & 0xff;
+      input[4 * i + 2] = (prng_input_counter >> 16) & 0xff;
+      input[4 * i + 3] = (prng_input_counter >> 24) & 0xff;
+      ++prng_input_counter;
+    }
+
+  aes_encrypt(&prng_context, output, input);
+
+  for (i = 0; i < 4; ++i)
+    {
+      prng_values[i] = output[4 * i] | (output[4 * i + 1] << 8) |
+                       (output[4 * i + 2] << 16) | (output[4 * i + 3] << 24);
+    }
+
+  prng_value_index = 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Initialize Pseudo-RNG using the specified 128-bit key. */
+
+void prng_start(prng_seed_t key)
+{
+  aes_set_key(&prng_context, key, sizeof(prng_seed_t));
+  prng_value_index = 4;
+  prng_input_counter = 0;
+  prng_enabled = true;
+}
+
+void prng_stop(void)
+{
+  prng_enabled = false;
+}
+
+/* Read a random 32-bit integer from the PRNG. */
+
+unsigned int prng_random(void)
+{
+  unsigned int result;
+
+  if (!prng_enabled)
+    {
+      return 0;
+    }
+
+  if (prng_value_index >= 4)
+    {
+      prng_generate();
+    }
+
+  result = prng_values[prng_value_index];
+  ++prng_value_index;
+
+  return result;
+}
diff --git a/games/NXDoom/src/aes_prng.h b/games/NXDoom/src/aes_prng.h
index f255db175..eed8dd78c 100644
--- a/games/NXDoom/src/aes_prng.h
+++ b/games/NXDoom/src/aes_prng.h
@@ -1,32 +1,44 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Pseudo-random number generator for secure demos.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/aes_prng.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Pseudo-random number generator for secure demos.
+ *
+ ****************************************************************************/
 
 #ifndef __AES_PRNG_H__
 #define __AES_PRNG_H__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-// Nonce value used as random seed for secure demos.
+/* Nonce value used as random seed for secure demos. */
 
 typedef byte prng_seed_t[16];
 
-void PRNG_Start(prng_seed_t seed);
-void PRNG_Stop(void);
-unsigned int PRNG_Random(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef __AES_PRNG_H__ */
+void prng_start(prng_seed_t seed);
+void prng_stop(void);
+unsigned int prng_random(void);
 
+#endif /* __AES_PRNG_H__ */
diff --git a/games/NXDoom/src/config.h b/games/NXDoom/src/config.h
new file mode 100644
index 000000000..b64275300
--- /dev/null
+++ b/games/NXDoom/src/config.h
@@ -0,0 +1,25 @@
+/****************************************************************************
+ * apps/games/NXDoom/src/config.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * NuttX compatible config.h file.
+ *
+ * TODO: can we take a cleaner approach later by baking this into logic?
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define HAVE_DECL_STRCASECMP 1
+#define HAVE_DECL_STRNCASECMP 1
+
+#define PACKAGE_TARNAME "nxdoom"
+#define PACKAGE_NAME "NXDoom"
+#define PACKAGE_STRING "NXDoom v0.0.0"
+#define PROGRAM_PREFIX ""
+
+#define DISABLE_SDL2MIXER
+#define DISABLE_SDL2NET
diff --git a/games/NXDoom/src/d_dedicated.c b/games/NXDoom/src/d_dedicated.c
index 722200499..307010f34 100644
--- a/games/NXDoom/src/d_dedicated.c
+++ b/games/NXDoom/src/d_dedicated.c
@@ -1,22 +1,31 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Code specific to the standalone dedicated server.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_dedicated.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Code specific to the standalone dedicated server.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 
 #include "config.h"
 
@@ -27,21 +36,25 @@
 #include "net_server.h"
 #include "z_zone.h"
 
-void NET_CL_Run(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void net_cl_run(void)
 {
-    // No client present :-)
-    //
-    // This is here because the server code sometimes runs this 
-    // to let the client do some processing if it needs to.
-    // In a standalone dedicated server, we don't have a client.
+  /* No client present :-)
+   *
+   * This is here because the server code sometimes runs this
+   * to let the client do some processing if it needs to.
+   * In a standalone dedicated server, we don't have a client.
+   */
 }
 
-void D_DoomMain(void)
+void d_doom_main(void)
 {
-    printf(PACKAGE_NAME " standalone dedicated server\n");
+  printf(PACKAGE_NAME " standalone dedicated server\n");
 
-    Z_Init();
+  z_init();
 
-    NET_DedicatedServer();
+  net_dedicated_server();
 }
-
diff --git a/games/NXDoom/src/d_event.c b/games/NXDoom/src/d_event.c
index 3eef57282..0b2a29e6c 100644
--- a/games/NXDoom/src/d_event.c
+++ b/games/NXDoom/src/d_event.c
@@ -1,63 +1,81 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION: Event handling.
-//
-// Events are asynchronous inputs generally generated by the game user.
-// Events can be discarded if no responder claims them
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_event.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION: Event handling.
+ *
+ * Events are asynchronous inputs generally generated by the game user.
+ * Events can be discarded if no responder claims them
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdlib.h>
 #include "d_event.h"
+#include <stdlib.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 #define MAXEVENTS 64
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static event_t events[MAXEVENTS];
 static int eventhead;
 static int eventtail;
 
-//
-// D_PostEvent
-// Called by the I/O functions when input is detected
-//
-void D_PostEvent (event_t* ev)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* d_post_event
+ * Called by the I/O functions when input is detected
+ */
+
+void d_post_event(event_t *ev)
 {
-    events[eventhead] = *ev;
-    eventhead = (eventhead + 1) % MAXEVENTS;
+  events[eventhead] = *ev;
+  eventhead = (eventhead + 1) % MAXEVENTS;
 }
 
-// Read an event from the queue.
+/* Read an event from the queue. */
 
-event_t *D_PopEvent(void)
+event_t *d_pop_event(void)
 {
-    event_t *result;
+  event_t *result;
 
-    // No more events waiting.
+  /* No more events waiting. */
 
-    if (eventtail == eventhead)
+  if (eventtail == eventhead)
     {
-        return NULL;
+      return NULL;
     }
-    
-    result = &events[eventtail];
 
-    // Advance to the next event in the queue.
+  result = &events[eventtail];
 
-    eventtail = (eventtail + 1) % MAXEVENTS;
+  /* Advance to the next event in the queue. */
 
-    return result;
+  eventtail = (eventtail + 1) % MAXEVENTS;
+
+  return result;
 }
-
-
diff --git a/games/NXDoom/src/d_event.h b/games/NXDoom/src/d_event.h
index bc1050aeb..f1f43133f 100644
--- a/games/NXDoom/src/d_event.h
+++ b/games/NXDoom/src/d_event.h
@@ -1,147 +1,192 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/d_event.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *
+ ****************************************************************************/
 
 #ifndef __D_EVENT__
 #define __D_EVENT__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomtype.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-//
-// Event handling.
-//
+/* Event handling. */
+
+/* Input event types. */
 
-// Input event types.
 typedef enum
 {
-    // Key press/release events.
-    //    data1: Key code (from doomkeys.h) of the key that was
-    //           pressed or released. This is the key as it appears
-    //           on a US keyboard layout, and does not change with
-    //           layout.
-    // For ev_keydown only:
-    //    data2: ASCII representation of the key that was pressed that
-    //           changes with the keyboard layout; eg. if 'Z' is
-    //           pressed on a German keyboard, data1='y',data2='z'.
-    //           Not affected by modifier keys.
-    //    data3: ASCII input, fully modified according to keyboard
-    //           layout and any modifier keys that are held down.
-    //           Only set if I_StartTextInput() has been called.
-    ev_keydown,
-    ev_keyup,
+  /* Key press/release events.
+   *    data1: Key code (from doomkeys.h) of the key that was
+   *           pressed or released. This is the key as it appears
+   *           on a US keyboard layout, and does not change with
+   *           layout.
+   * For ev_keydown only:
+   *    data2: ASCII representation of the key that was pressed that
+   *           changes with the keyboard layout; eg. if 'Z' is
+   *           pressed on a German keyboard, data1='y',data2='z'.
+   *           Not affected by modifier keys.
+   *    data3: ASCII input, fully modified according to keyboard
+   *           layout and any modifier keys that are held down.
+   *           Only set if i_start_text_input() has been called.
+   */
 
-    // Mouse movement event.
-    //    data1: Bitfield of buttons currently held down.
-    //           (bit 0 = left; bit 1 = right; bit 2 = middle).
-    //    data2: X axis mouse movement (turn).
-    //    data3: Y axis mouse movement (forward/backward).
-    ev_mouse,
+  ev_keydown,
+  ev_keyup,
 
-    // Joystick state.
-    //    data1: Bitfield of buttons currently pressed.
-    //    data2: X axis mouse movement (turn).
-    //    data3: Y axis mouse movement (forward/backward).
-    //    data4: Third axis mouse movement (strafe).
-    //    data5: Fourth axis mouse movement (look)
-    //    data6: Dpad and analog stick direction.
-    ev_joystick,
+  /* Mouse movement event.
+   *    data1: Bitfield of buttons currently held down.
+   *           (bit 0 = left; bit 1 = right; bit 2 = middle).
+   *    data2: X axis mouse movement (turn).
+   *    data3: Y axis mouse movement (forward/backward).
+   */
 
-    // Quit event. Triggered when the user clicks the "close" button
-    // to terminate the application.
-    ev_quit
+  ev_mouse,
+
+  /* Joystick state.
+   *    data1: Bitfield of buttons currently pressed.
+   *    data2: X axis mouse movement (turn).
+   *    data3: Y axis mouse movement (forward/backward).
+   *    data4: Third axis mouse movement (strafe).
+   *    data5: Fourth axis mouse movement (look)
+   *    data6: Dpad and analog stick direction.
+   */
+
+  ev_joystick,
+
+  /* Quit event. Triggered when the user clicks the "close" button
+   * to terminate the application.
+   */
+
+  ev_quit
 } evtype_t;
 
-// Event structure.
+/* Event structure. */
+
 typedef struct
 {
-    evtype_t type;
+  evtype_t type;
 
-    // Event-specific data; see the descriptions given above.
-    int data1, data2, data3, data4, data5, data6;
+  /* Event-specific data; see the descriptions given above. */
+
+  int data1;
+  int data2;
+  int data3;
+  int data4;
+  int data5;
+  int data6;
 } event_t;
 
- 
-//
-// Button/action code definitions.
-//
+/* Button/action code definitions. */
+
 typedef enum
 {
-    // Press "Fire".
-    BT_ATTACK		= 1,
-    // Use button, to open doors, activate switches.
-    BT_USE		= 2,
+  /* Press "Fire". */
 
-    // Flag: game events, not really buttons.
-    BT_SPECIAL		= 128,
-    BT_SPECIALMASK	= 3,
-    
-    // Flag, weapon change pending.
-    // If true, the next 3 bits hold weapon num.
-    BT_CHANGE		= 4,
-    // The 3bit weapon mask and shift, convenience.
-    BT_WEAPONMASK	= (8+16+32),
-    BT_WEAPONSHIFT	= 3,
+  BT_ATTACK = 1,
 
-    // Pause the game.
-    BTS_PAUSE		= 1,
-    // Save the game at each console.
-    BTS_SAVEGAME	= 2,
+  /* Use button, to open doors, activate switches. */
 
-    // Savegame slot numbers
-    //  occupy the second byte of buttons.    
-    BTS_SAVEMASK	= (4+8+16),
-    BTS_SAVESHIFT 	= 2,
-  
+  BT_USE = 2,
+
+  /* Flag: game events, not really buttons. */
+
+  BT_SPECIAL = 128,
+  BT_SPECIALMASK = 3,
+
+  /* Flag, weapon change pending.
+   * If true, the next 3 bits hold weapon num.
+   */
+
+  BT_CHANGE = 4,
+
+  /* The 3bit weapon mask and shift, convenience. */
+
+  BT_WEAPONMASK = (8 + 16 + 32),
+  BT_WEAPONSHIFT = 3,
+
+  /* Pause the game. */
+
+  BTS_PAUSE = 1,
+
+  /* Save the game at each console. */
+
+  BTS_SAVEGAME = 2,
+
+  /* Savegame slot numbers occupy the second byte of buttons. */
+
+  BTS_SAVEMASK = (4 + 8 + 16),
+  BTS_SAVESHIFT = 2,
 } buttoncode_t;
 
-// villsa [STRIFE] Strife specific buttons
-// TODO - not finished
+/* villsa [STRIFE] Strife specific buttons
+ * TODO - not finished
+ */
+
 typedef enum
 {
-    // Player view look up
-    BT2_LOOKUP          = 1,
-    // Player view look down
-    BT2_LOOKDOWN        = 2,
-    // Center player's view
-    BT2_CENTERVIEW      = 4,
-    // Use inventory item
-    BT2_INVUSE          = 8,
-    // Drop inventory item
-    BT2_INVDROP         = 16,
-    // Jump up and down
-    BT2_JUMP            = 32,
-    // Use medkit
-    BT2_HEALTH          = 128,
-  
+  /* Player view look up */
+
+  BT2_LOOKUP = 1,
+
+  /* Player view look down */
+
+  BT2_LOOKDOWN = 2,
+
+  /* Center player's view */
+
+  BT2_CENTERVIEW = 4,
+
+  /* Use inventory item */
+
+  BT2_INVUSE = 8,
+
+  /* Drop inventory item */
+
+  BT2_INVDROP = 16,
+
+  /* Jump up and down */
+
+  BT2_JUMP = 32,
+
+  /* Use medkit */
+
+  BT2_HEALTH = 128,
 } buttoncode2_t;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+/* Called by IO functions when input is detected. */
 
+void d_post_event(event_t *ev);
 
-// Called by IO functions when input is detected.
-void D_PostEvent (event_t *ev);
+/* Read an event from the event queue */
 
-// Read an event from the event queue
-
-event_t *D_PopEvent(void);
-
-
-#endif
+event_t *d_pop_event(void);
 
+#endif /* __D_EVENT__ */
diff --git a/games/NXDoom/src/d_iwad.c b/games/NXDoom/src/d_iwad.c
index e05b75f0f..a6f1cd945 100644
--- a/games/NXDoom/src/d_iwad.c
+++ b/games/NXDoom/src/d_iwad.c
@@ -1,29 +1,38 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Search for and locate an IWAD file, and initialize according
-//     to the IWAD type.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_iwad.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Search for and locate an IWAD file, and initialize according
+ *   to the IWAD type.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
 
+#include "d_iwad.h"
 #include "deh_str.h"
 #include "doomkeys.h"
-#include "d_iwad.h"
 #include "i_system.h"
 #include "m_argv.h"
 #include "m_config.h"
@@ -31,1017 +40,500 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-static const iwad_t iwads[] =
-{
-    { "doom2.wad",    doom2,     commercial, "Doom II" },
-    { "plutonia.wad", pack_plut, commercial, "Final Doom: Plutonia Experiment" },
-    { "tnt.wad",      pack_tnt,  commercial, "Final Doom: TNT: Evilution" },
-    { "doom.wad",     doom,      retail,     "Doom" },
-    { "doom1.wad",    doom,      shareware,  "Doom Shareware" },
-    { "doom2f.wad",   doom2,     commercial, "Doom II: L'Enfer sur Terre" },
-    { "chex.wad",     pack_chex, retail,     "Chex Quest" },
-    { "hacx.wad",     pack_hacx, commercial, "Hacx" },
-    { "freedoom2.wad", doom2,    commercial, "Freedoom: Phase 2" },
-    { "freedoom1.wad", doom,     retail,     "Freedoom: Phase 1" },
-    { "freedm.wad",   doom2,     commercial, "FreeDM" },
-    { "heretic.wad",  heretic,   retail,     "Heretic" },
-    { "heretic1.wad", heretic,   shareware,  "Heretic Shareware" },
-    { "hexen.wad",    hexen,     commercial, "Hexen" },
-    //{ "strife0.wad",  strife,    commercial, "Strife" }, // haleyjd: STRIFE-FIXME
-    { "strife1.wad",  strife,    commercial, "Strife" },
-};
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-boolean D_IsIWADName(const char *name)
-{
-    int i;
-
-    for (i = 0; i < arrlen(iwads); i++)
-    {
-        if (!strcasecmp(name, iwads[i].name))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-// Array of locations to search for IWAD files
-//
-// "128 IWAD search directories should be enough for anybody".
+/* Array of locations to search for IWAD files
+ *
+ * "128 IWAD search directories should be enough for anybody".
+ */
 
 #define MAX_IWAD_DIRS 128
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const iwad_t g_iwads[] =
+{
+  {"doom2.wad", doom2, commercial, "Doom II"},
+  {"plutonia.wad", pack_plut, commercial, "Final Doom: Plutonia Experiment"},
+  {"tnt.wad", pack_tnt, commercial, "Final Doom: TNT: Evilution"},
+  {"doom.wad", doom, retail, "Doom"},
+  {"doom1.wad", doom, shareware, "Doom Shareware"},
+  {"doom2f.wad", doom2, commercial, "Doom II: L'Enfer sur Terre"},
+  {"chex.wad", pack_chex, retail, "Chex Quest"},
+  {"hacx.wad", pack_hacx, commercial, "Hacx"},
+  {"freedoom2.wad", doom2, commercial, "Freedoom: Phase 2"},
+  {"freedoom1.wad", doom, retail, "Freedoom: Phase 1"},
+  {"freedm.wad", doom2, commercial, "FreeDM"},
+  {"heretic.wad", heretic, retail, "Heretic"},
+  {"heretic1.wad", heretic, shareware, "Heretic Shareware"},
+  {"hexen.wad", hexen, commercial, "Hexen"},
+  {"strife1.wad", strife, commercial, "Strife"},
+};
+
 static boolean iwad_dirs_built = false;
 static const char *iwad_dirs[MAX_IWAD_DIRS];
 static int num_iwad_dirs = 0;
 
-static void AddIWADDir(const char *dir)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void add_iwad_dir(const char *dir)
 {
-    if (num_iwad_dirs < MAX_IWAD_DIRS)
+  if (num_iwad_dirs < MAX_IWAD_DIRS)
     {
-        iwad_dirs[num_iwad_dirs] = dir;
-        ++num_iwad_dirs;
+      iwad_dirs[num_iwad_dirs] = dir;
+      ++num_iwad_dirs;
     }
 }
 
-// This is Windows-specific code that automatically finds the location
-// of installed IWAD files.  The registry is inspected to find special
-// keys installed by the Windows installers for various CD versions
-// of Doom.  From these keys we can deduce where to find an IWAD.
+/* Returns true if the specified path is a path to a file
+ * of the specified name.
+ */
 
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-typedef struct 
+static boolean dir_is_file(const char *path, const char *filename)
 {
-    HKEY root;
-    char *path;
-    char *value;
-} registry_value_t;
-
-#define UNINSTALLER_STRING "\\uninstl.exe /S "
-
-// Keys installed by the various CD editions.  These are actually the 
-// commands to invoke the uninstaller and look like this:
-//
-// C:\Program Files\Path\uninstl.exe /S C:\Program Files\Path
-//
-// With some munging we can find where Doom was installed.
-
-// [AlexMax] From the persepctive of a 64-bit executable, 32-bit registry
-// keys are located in a different spot.
-#if _WIN64
-#define SOFTWARE_KEY "Software\\Wow6432Node"
-#else
-#define SOFTWARE_KEY "Software"
-#endif
-
-static registry_value_t uninstall_values[] =
-{
-    // Ultimate Doom, CD version (Depths of Doom trilogy)
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
-            "Uninstall\\Ultimate Doom for Windows 95",
-        "UninstallString",
-    },
-
-    // Doom II, CD version (Depths of Doom trilogy)
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
-            "Uninstall\\Doom II for Windows 95",
-        "UninstallString",
-    },
-
-    // Final Doom
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
-            "Uninstall\\Final Doom for Windows 95",
-        "UninstallString",
-    },
-
-    // Shareware version
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\Microsoft\\Windows\\CurrentVersion\\"
-            "Uninstall\\Doom Shareware for Windows 95",
-        "UninstallString",
-    },
-};
-
-// Values installed by the GOG.com and Collector's Edition versions
-
-static registry_value_t root_path_keys[] =
-{
-    // Doom Collector's Edition
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\Activision\\DOOM Collector's Edition\\v1.0",
-        "INSTALLPATH",
-    },
-
-    // Doom II
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1435848814",
-        "PATH",
-    },
-
-    // Doom 3: BFG Edition
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1135892318",
-        "PATH",
-    },
-
-    // Final Doom
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1435848742",
-        "PATH",
-    },
-
-    // Ultimate Doom
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1435827232",
-        "PATH",
-    },
-
-    // Strife: Veteran Edition
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1432899949",
-        "PATH",
-    },
-
-    // Heretic
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1290366318",
-        "PATH",
-    },
-
-    // Hexen
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1247951670",
-        "PATH",
-    },
-
-    // Hexen: Deathkings of a Dark Citadel
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1983497091",
-        "PATH",
-    },
-
-    // Heretic + Hexen Rerelease
-
-    {
-        HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1776058590",
-        "PATH"
-    },
-};
-
-// Subdirectories of the above install path, where IWADs are installed.
-
-static char *root_path_subdirs[] =
-{
-    "Doom2",
-    "Final Doom",
-    "Ultimate Doom",
-    "Plutonia",
-    "TNT",
-    "base\\wads",
-    "dos\\base\\heretic",
-    "dos\\base\\hexen",
-    ".",
-};
-
-// Location where Steam is installed
-
-static registry_value_t steam_install_location =
-{
-    HKEY_LOCAL_MACHINE,
-    SOFTWARE_KEY "\\Valve\\Steam",
-    "InstallPath",
-};
-
-// Subdirs of the steam install directory where IWADs are found
-
-static char *steam_install_subdirs[] =
-{
-    "steamapps\\common\\doom 2\\base",
-    "steamapps\\common\\doom 2\\finaldoombase",
-    "steamapps\\common\\final doom\\base",
-    "steamapps\\common\\ultimate doom\\base",
-    "steamapps\\common\\heretic shadow of the serpent riders\\base",
-    "steamapps\\common\\hexen\\base",
-    "steamapps\\common\\hexen deathkings of the dark citadel\\base",
-
-    // From Doom 3: BFG Edition:
-
-    "steamapps\\common\\DOOM 3 BFG Edition\\base\\wads",
-
-    // From Heretic + Hexen Rerelease:
-
-    "steamapps\\common\\Heretic + Hexen\\dos\\base\\heretic",
-    "steamapps\\common\\Heretic + Hexen\\dos\\base\\hexen",
-
-    // From Strife: Veteran Edition:
-
-    "steamapps\\common\\Strife",
-};
-
-#define STEAM_BFG_GUS_PATCHES \
-    "steamapps\\common\\DOOM 3 BFG Edition\\base\\classicmusic\\instruments"
-
-static char *GetRegistryString(registry_value_t *reg_val)
-{
-    HKEY key;
-    DWORD len;
-    DWORD valtype;
-    char *result;
-
-    // Open the key (directory where the value is stored)
-
-    if (RegOpenKeyEx(reg_val->root, reg_val->path,
-                     0, KEY_READ, &key) != ERROR_SUCCESS)
-    {
-        return NULL;
-    }
-
-    result = NULL;
-
-    // Find the type and length of the string, and only accept strings.
-
-    if (RegQueryValueEx(key, reg_val->value,
-                        NULL, &valtype, NULL, &len) == ERROR_SUCCESS
-     && valtype == REG_SZ)
-    {
-        // Allocate a buffer for the value and read the value
-
-        result = malloc(len + 1);
-
-        if (RegQueryValueEx(key, reg_val->value, NULL, &valtype,
-                            (unsigned char *) result, &len) != ERROR_SUCCESS)
-        {
-            free(result);
-            result = NULL;
-        }
-        else
-        {
-            // Ensure the value is null-terminated
-            result[len] = '\0';
-        }
-    }
-
-    // Close the key
-
-    RegCloseKey(key);
-
-    return result;
+  return strchr(path, DIR_SEPARATOR) != NULL &&
+         !strcasecmp(m_base_name(path), filename);
 }
 
-// Check for the uninstall strings from the CD versions
+/* Check if the specified directory contains the specified IWAD
+ * file, returning the full path to the IWAD if found, or NULL
+ * if not found.
+ */
 
-static void CheckUninstallStrings(void)
+static char *check_dir_has_iwad(const char *dir, const char *iwadname)
 {
-    unsigned int i;
+  char *filename;
+  char *probe;
 
-    for (i=0; i<arrlen(uninstall_values); ++i)
+  /* As a special case, the "directory" may refer directly to an
+   * IWAD file if the path comes from DOOMWADDIR or DOOMWADPATH.
+   */
+
+  probe = m_file_case_exists(dir);
+  if (dir_is_file(dir, iwadname) && probe != NULL)
     {
-        char *val;
-        char *path;
-        char *unstr;
+      return probe;
+    }
 
-        val = GetRegistryString(&uninstall_values[i]);
+  /* Construct the full path to the IWAD if it is located in
+   * this directory, and check if it exists.
+   */
 
-        if (val == NULL)
+  if (!strcmp(dir, "."))
+    {
+      filename = m_string_duplicate(iwadname);
+    }
+  else
+    {
+      filename = m_string_join(dir, DIR_SEPARATOR_S, iwadname, NULL);
+    }
+
+  free(probe);
+  probe = m_file_case_exists(filename);
+  free(filename);
+
+  if (probe != NULL)
+    {
+      return probe;
+    }
+
+  return NULL;
+}
+
+/* Search a directory to try to find an IWAD
+ * Returns the location of the IWAD if found, otherwise NULL.
+ */
+
+static char *search_dir_for_iwad(const char *dir, int mask,
+                                    gamemission_t *mission)
+{
+  char *filename;
+  size_t i;
+
+  for (i = 0; i < arrlen(g_iwads); ++i)
+    {
+      if (((1 << g_iwads[i].mission) & mask) == 0)
         {
-            continue;
+          continue;
         }
 
-        unstr = strstr(val, UNINSTALLER_STRING);
+      filename = check_dir_has_iwad(dir, (g_iwads[i].name));
 
-        if (unstr == NULL)
+      if (filename != NULL)
         {
-            free(val);
-        }
-        else
-        {
-            path = unstr + strlen(UNINSTALLER_STRING);
+          *mission = g_iwads[i].mission;
 
-            AddIWADDir(path);
+          return filename;
         }
     }
+
+  return NULL;
+}
+
+/* When given an IWAD with the '-iwad' parameter,
+ * attempt to identify it by its name.
+ */
+
+static gamemission_t identify_iwad_by_name(const char *name, int mask)
+{
+  size_t i;
+  gamemission_t mission;
+
+  name = m_base_name(name);
+  mission = none;
+
+  for (i = 0; i < arrlen(g_iwads); ++i)
+    {
+      /* Check if the filename is this IWAD name.
+       * Only use supported missions:
+       */
+
+      if (((1 << g_iwads[i].mission) & mask) == 0) continue;
+
+      /* Check if it ends in this IWAD name. */
+
+      if (!strcasecmp(name, g_iwads[i].name))
+        {
+          mission = g_iwads[i].mission;
+          break;
+        }
+    }
+
+  return mission;
+}
+
+/* Add IWAD directories parsed from splitting a path string containing
+ * paths separated by PATH_SEPARATOR. 'suffix' is a string to concatenate
+ * to the end of the paths before adding them.
+ */
+
+static void add_iwad_path(const char *path, const char *suffix)
+{
+  char *left;
+  char *p;
+  char *dup_path;
+
+  dup_path = m_string_duplicate(path);
+
+  /* Split into individual dirs within the list. */
+
+  left = dup_path;
+
+  for (; ; )
+    {
+      p = strchr(left, PATH_SEPARATOR);
+      if (p != NULL)
+        {
+          /* Break at the separator and use the left hand side
+           * as another iwad dir
+           */
+
+          *p = '\0';
+
+          add_iwad_dir(m_string_join(left, suffix, NULL));
+          left = p + 1;
+        }
+      else
+        {
+          break;
+        }
+    }
+
+  add_iwad_dir(m_string_join(left, suffix, NULL));
+
+  free(dup_path);
+}
+
+/* Build a list of IWAD files */
+
+static void buld_iwad_dir_list(void)
+{
+  char *env;
+
+  if (iwad_dirs_built)
+    {
+      return;
+    }
+
+  /* Look in the current directory.  Doom always does this. */
+
+  add_iwad_dir(".");
+
+  /* Next check the directory where the executable is located. This might
+   * be different from the current directory.
+   */
+
+  add_iwad_dir(m_dir_name(myargv[0]));
+
+  /* Add DOOMWADDIR if it is in the environment */
+
+  env = getenv("DOOMWADDIR");
+  if (env != NULL)
+    {
+      add_iwad_dir(env);
+    }
+
+  /* Add dirs from DOOMWADPATH: */
+
+  env = getenv("DOOMWADPATH");
+  if (env != NULL)
+    {
+      add_iwad_path(env, "");
+    }
+
+  /* Don't run this function again. */
+
+  iwad_dirs_built = true;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Searches WAD search paths for an WAD with a specific filename. */
+
+char *d_find_wad_by_name(const char *name)
+{
+  char *path;
+  char *probe;
+  int i;
+
+  /* Absolute path? */
+
+  probe = m_file_case_exists(name);
+  if (probe != NULL)
+    {
+      return probe;
+    }
+
+  buld_iwad_dir_list();
+
+  /* Search through all IWAD paths for a file with the given name. */
+
+  for (i = 0; i < num_iwad_dirs; ++i)
+    {
+      /* As a special case, if this is in DOOMWADDIR or DOOMWADPATH,
+       * the "directory" may actually refer directly to an IWAD
+       * file.
+       */
+
+      probe = m_file_case_exists(iwad_dirs[i]);
+      if (dir_is_file(iwad_dirs[i], name) && probe != NULL)
+        {
+          return probe;
+        }
+
+      free(probe);
+
+      /* Construct a string for the full path */
+
+      path = m_string_join(iwad_dirs[i], DIR_SEPARATOR_S, name, NULL);
+
+      probe = m_file_case_exists(path);
+      if (probe != NULL)
+        {
+          return probe;
+        }
+
+      free(path);
+    }
+
+  /* File not found */
+
+  return NULL;
+}
+
+/* d_try_find_wad_by_name
+ *
+ * Searches for a WAD by its filename, or returns a copy of the filename
+ * if not found.
+ */
+
+char *d_try_find_wad_by_name(const char *filename)
+{
+  char *result;
+
+  result = d_find_wad_by_name(filename);
+
+  if (result != NULL)
+    {
+      return result;
+    }
+  else
+    {
+      return m_string_duplicate(filename);
+    }
 }
 
-// Check for GOG.com and Doom: Collector's Edition
+/* FindIWAD
+ * Checks availability of IWAD files by name,
+ * to determine whether registered/commercial features
+ * should be executed (notably loading PWADs).
+ */
 
-static void CheckInstallRootPaths(void)
+char *d_find_iwad(int mask, gamemission_t *mission)
 {
-    unsigned int i;
+  char *result;
+  const char *iwadfile;
+  int iwadparm;
+  int i;
 
-    for (i=0; i<arrlen(root_path_keys); ++i)
+  /* Check for the -iwad parameter
+   *
+   * Specify an IWAD file to use.
+   *
+   * @arg <file>
+   *
+   */
+
+  iwadparm = m_check_parm_with_args("-iwad", 1);
+
+  if (iwadparm)
     {
-        char *install_path;
-        char *subpath;
-        unsigned int j;
+      /* Search through IWAD dirs for an IWAD with the given name. */
 
-        install_path = GetRegistryString(&root_path_keys[i]);
+      iwadfile = myargv[iwadparm + 1];
 
-        if (install_path == NULL)
+      result = d_find_wad_by_name(iwadfile);
+
+      if (result == NULL)
         {
-            continue;
+          i_error("IWAD file '%s' not found!", iwadfile);
         }
 
-        for (j=0; j<arrlen(root_path_subdirs); ++j)
+      *mission = identify_iwad_by_name(result, mask);
+    }
+  else
+    {
+      /* Search through the list and look for an IWAD */
+
+      result = NULL;
+
+      buld_iwad_dir_list();
+
+      for (i = 0; result == NULL && i < num_iwad_dirs; ++i)
         {
-            subpath = M_StringJoin(install_path, DIR_SEPARATOR_S,
-                                   root_path_subdirs[j], NULL);
-            AddIWADDir(subpath);
-        }
-
-        free(install_path);
-    }
-}
-
-
-// Check for Doom downloaded via Steam
-
-static void CheckSteamEdition(void)
-{
-    char *install_path;
-    char *subpath;
-    size_t i;
-
-    install_path = GetRegistryString(&steam_install_location);
-
-    if (install_path == NULL)
-    {
-        return;
-    }
-
-    for (i=0; i<arrlen(steam_install_subdirs); ++i)
-    {
-        subpath = M_StringJoin(install_path, DIR_SEPARATOR_S,
-                               steam_install_subdirs[i], NULL);
-
-        AddIWADDir(subpath);
-    }
-
-    free(install_path);
-}
-
-// The BFG edition ships with a full set of GUS patches. If we find them,
-// we can autoconfigure to use them.
-
-static void CheckSteamGUSPatches(void)
-{
-    const char *current_path;
-    char *install_path;
-    char *test_patch_path, *patch_path;
-
-    // Already configured? Don't stomp on the user's choices.
-    current_path = M_GetStringVariable("gus_patch_path");
-    if (current_path != NULL && strlen(current_path) > 0)
-    {
-        return;
-    }
-
-    install_path = GetRegistryString(&steam_install_location);
-
-    if (install_path == NULL)
-    {
-        return;
-    }
-
-    patch_path = M_StringJoin(install_path, "\\", STEAM_BFG_GUS_PATCHES,
-                              NULL);
-    test_patch_path = M_StringJoin(patch_path, "\\ACBASS.PAT", NULL);
-
-    // Does acbass.pat exist? If so, then set gus_patch_path.
-    if (M_FileExists(test_patch_path))
-    {
-        M_SetVariable("gus_patch_path", patch_path);
-    }
-
-    free(test_patch_path);
-    free(patch_path);
-    free(install_path);
-}
-
-// Default install directories for DOS Doom
-
-static void CheckDOSDefaults(void)
-{
-    // These are the default install directories used by the deice
-    // installer program:
-
-    AddIWADDir("\\doom2");              // Doom II
-    AddIWADDir("\\plutonia");           // Final Doom
-    AddIWADDir("\\tnt");
-    AddIWADDir("\\doom_se");            // Ultimate Doom
-    AddIWADDir("\\doom");               // Shareware / Registered Doom
-    AddIWADDir("\\dooms");              // Shareware versions
-    AddIWADDir("\\doomsw");
-
-    AddIWADDir("\\heretic");            // Heretic
-    AddIWADDir("\\hrtic_se");           // Heretic Shareware from Quake disc
-
-    AddIWADDir("\\hexen");              // Hexen
-    AddIWADDir("\\hexendk");            // Hexen Deathkings of the Dark Citadel
-
-    AddIWADDir("\\strife");             // Strife
-}
-
-#endif
-
-// Returns true if the specified path is a path to a file
-// of the specified name.
-
-static boolean DirIsFile(const char *path, const char *filename)
-{
-    return strchr(path, DIR_SEPARATOR) != NULL
-        && !strcasecmp(M_BaseName(path), filename);
-}
-
-// Check if the specified directory contains the specified IWAD
-// file, returning the full path to the IWAD if found, or NULL
-// if not found.
-
-static char *CheckDirectoryHasIWAD(const char *dir, const char *iwadname)
-{
-    char *filename; 
-    char *probe;
-
-    // As a special case, the "directory" may refer directly to an
-    // IWAD file if the path comes from DOOMWADDIR or DOOMWADPATH.
-
-    probe = M_FileCaseExists(dir);
-    if (DirIsFile(dir, iwadname) && probe != NULL)
-    {
-        return probe;
-    }
-
-    // Construct the full path to the IWAD if it is located in
-    // this directory, and check if it exists.
-
-    if (!strcmp(dir, "."))
-    {
-        filename = M_StringDuplicate(iwadname);
-    }
-    else
-    {
-        filename = M_StringJoin(dir, DIR_SEPARATOR_S, iwadname, NULL);
-    }
-
-    free(probe);
-    probe = M_FileCaseExists(filename);
-    free(filename);
-    if (probe != NULL)
-    {
-        return probe;
-    }
-
-    return NULL;
-}
-
-// Search a directory to try to find an IWAD
-// Returns the location of the IWAD if found, otherwise NULL.
-
-static char *SearchDirectoryForIWAD(const char *dir, int mask, GameMission_t *mission)
-{
-    char *filename;
-    size_t i;
-
-    for (i=0; i<arrlen(iwads); ++i) 
-    {
-        if (((1 << iwads[i].mission) & mask) == 0)
-        {
-            continue;
-        }
-
-        filename = CheckDirectoryHasIWAD(dir, DEH_String(iwads[i].name));
-
-        if (filename != NULL)
-        {
-            *mission = iwads[i].mission;
-
-            return filename;
+          result = search_dir_for_iwad(iwad_dirs[i], mask, mission);
         }
     }
 
-    return NULL;
+  return result;
 }
 
-// When given an IWAD with the '-iwad' parameter,
-// attempt to identify it by its name.
+/* Find all IWADs in the IWAD search path matching the given mask. */
 
-static GameMission_t IdentifyIWADByName(const char *name, int mask)
+const iwad_t **d_find_all_iwads(int mask)
 {
-    size_t i;
-    GameMission_t mission;
+  const iwad_t **result;
+  int result_len;
+  char *filename;
+  int i;
 
-    name = M_BaseName(name);
-    mission = none;
+  result = malloc(sizeof(iwad_t *) * (arrlen(g_iwads) + 1));
+  result_len = 0;
 
-    for (i=0; i<arrlen(iwads); ++i)
+  /* Try to find all IWADs */
+
+  for (i = 0; i < arrlen(g_iwads); ++i)
     {
-        // Check if the filename is this IWAD name.
-
-        // Only use supported missions:
-
-        if (((1 << iwads[i].mission) & mask) == 0)
-            continue;
-
-        // Check if it ends in this IWAD name.
-
-        if (!strcasecmp(name, iwads[i].name))
+      if (((1 << g_iwads[i].mission) & mask) == 0)
         {
-            mission = iwads[i].mission;
-            break;
+          continue;
+        }
+
+      filename = d_find_wad_by_name(g_iwads[i].name);
+
+      if (filename != NULL)
+        {
+          result[result_len] = &g_iwads[i];
+          ++result_len;
         }
     }
 
-    return mission;
+  /* End of list */
+
+  result[result_len] = NULL;
+
+  return result;
 }
 
-// Add IWAD directories parsed from splitting a path string containing
-// paths separated by PATH_SEPARATOR. 'suffix' is a string to concatenate
-// to the end of the paths before adding them.
-static void AddIWADPath(const char *path, const char *suffix)
+/* Get the IWAD name used for savegames. */
+
+const char *d_save_game_iwad_name(gamemission_t gamemission,
+                               game_variant_t gamevariant)
 {
-    char *left, *p, *dup_path;
+  size_t i;
 
-    dup_path = M_StringDuplicate(path);
+  /* Determine the IWAD name to use for savegames.
+   * This determines the directory the savegame files get put into.
+   *
+   * Note that we match on gamemission rather than on IWAD name.
+   * This ensures that doom1.wad and doom.wad saves are stored
+   * in the same place.
+   */
 
-    // Split into individual dirs within the list.
-    left = dup_path;
-
-    for (;;)
+  if (gamevariant == freedoom)
     {
-        p = strchr(left, PATH_SEPARATOR);
-        if (p != NULL)
+      if (gamemission == doom)
         {
-            // Break at the separator and use the left hand side
-            // as another iwad dir
-            *p = '\0';
-
-            AddIWADDir(M_StringJoin(left, suffix, NULL));
-            left = p + 1;
+          return "freedoom1.wad";
         }
-        else
+      else if (gamemission == doom2)
         {
-            break;
+          return "freedoom2.wad";
+        }
+    }
+  else if (gamevariant == freedm && gamemission == doom2)
+    {
+      return "freedm.wad";
+    }
+
+  for (i = 0; i < arrlen(g_iwads); ++i)
+    {
+      if (gamemission == g_iwads[i].mission)
+        {
+          return g_iwads[i].name;
         }
     }
 
-    AddIWADDir(M_StringJoin(left, suffix, NULL));
+  /* Default fallback: */
 
-    free(dup_path);
+  return "unknown.wad";
 }
 
-#ifndef _WIN32
-// Add standard directories where IWADs are located on Unix systems.
-// To respect the freedesktop.org specification we support overriding
-// using standard environment variables. See the XDG Base Directory
-// Specification:
-// <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>
-static void AddXdgDirs(void)
+const char *d_suggest_iwad_name(gamemission_t mission, game_mode_t mode)
 {
-    const char *env;
-    char *tmp_env;
+  int i;
 
-    // Quote:
-    // > $XDG_DATA_HOME defines the base directory relative to which
-    // > user specific data files should be stored. If $XDG_DATA_HOME
-    // > is either not set or empty, a default equal to
-    // > $HOME/.local/share should be used.
-    env = getenv("XDG_DATA_HOME");
-    tmp_env = NULL;
-
-    if (env == NULL)
+  for (i = 0; i < arrlen(g_iwads); ++i)
     {
-        const char *homedir = getenv("HOME");
-        if (homedir == NULL)
+      if (g_iwads[i].mission == mission && g_iwads[i].mode == mode)
         {
-            homedir = "/";
+          return g_iwads[i].name;
         }
-
-        tmp_env = M_StringJoin(homedir, "/.local/share", NULL);
-        env = tmp_env;
     }
 
-    // We support $XDG_DATA_HOME/games/doom (which will usually be
-    // ~/.local/share/games/doom) as a user-writeable extension to
-    // the usual /usr/share/games/doom location.
-    AddIWADDir(M_StringJoin(env, "/games/doom", NULL));
-    free(tmp_env);
-
-    // Quote:
-    // > $XDG_DATA_DIRS defines the preference-ordered set of base
-    // > directories to search for data files in addition to the
-    // > $XDG_DATA_HOME base directory. The directories in $XDG_DATA_DIRS
-    // > should be seperated with a colon ':'.
-    // >
-    // > If $XDG_DATA_DIRS is either not set or empty, a value equal to
-    // > /usr/local/share/:/usr/share/ should be used.
-    env = getenv("XDG_DATA_DIRS");
-    if (env == NULL)
-    {
-        // (Trailing / omitted from paths, as it is added below)
-        env = "/usr/local/share:/usr/share";
-    }
-
-    // The "standard" location for IWADs on Unix that is supported by most
-    // source ports is /usr/share/games/doom - we support this through the
-    // XDG_DATA_DIRS mechanism, through which it can be overridden.
-    AddIWADPath(env, "/games/doom");
-    AddIWADPath(env, "/doom");
-
-    // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG
-    // Edition into this directory, under which includes the Doom
-    // Classic WADs.
-    AddIWADPath(env, "/games/doom3bfg/base/wads");
+  return "unknown.wad";
 }
 
-#ifndef __MACOSX__
-// Steam on Linux allows installing some select Windows games,
-// including the classic Doom series (running DOSBox via Wine).  We
-// could parse *.vdf files to more accurately detect installation
-// locations, but the defaults are likely to be good enough for just
-// about everyone.
-static void AddSteamDirs(void)
+const char *d_suggest_game_name(gamemission_t mission, game_mode_t mode)
 {
-    const char *homedir;
-    char *steampath;
+  int i;
 
-    homedir = getenv("HOME");
-    if (homedir == NULL)
+  for (i = 0; i < arrlen(g_iwads); ++i)
     {
-        homedir = "/";
+      if (g_iwads[i].mission == mission &&
+          (mode == indetermined || g_iwads[i].mode == mode))
+        {
+          return g_iwads[i].description;
+        }
     }
-    steampath = M_StringJoin(homedir, "/.steam/root/steamapps/common", NULL);
 
-    AddIWADPath(steampath, "/Doom 2/base");
-    AddIWADPath(steampath, "/Doom 2/finaldoombase");
-    AddIWADPath(steampath, "/Master Levels of Doom/doom2");
-    AddIWADPath(steampath, "/Ultimate Doom/base");
-    AddIWADPath(steampath, "/Final Doom/base");
-    AddIWADPath(steampath, "/DOOM 3 BFG Edition/base/wads");
-    AddIWADPath(steampath, "/Heretic Shadow of the Serpent Riders/base");
-    AddIWADPath(steampath, "/Hexen/base");
-    AddIWADPath(steampath, "/Hexen Deathkings of the Dark Citadel/base");
-    AddIWADPath(steampath, "/Heretic + Hexen/dos/base/heretic");
-    AddIWADPath(steampath, "/Heretic + Hexen/dos/base/hexen");
-    AddIWADPath(steampath, "/Strife");
-    free(steampath);
+  return "Unknown game?";
 }
-#endif // __MACOSX__
-#endif // !_WIN32
-
-//
-// Build a list of IWAD files
-//
-
-static void BuildIWADDirList(void)
-{
-    char *env;
-
-    if (iwad_dirs_built)
-    {
-        return;
-    }
-
-    // Look in the current directory.  Doom always does this.
-    AddIWADDir(".");
-
-    // Next check the directory where the executable is located. This might
-    // be different from the current directory.
-    AddIWADDir(M_DirName(myargv[0]));
-
-    // Add DOOMWADDIR if it is in the environment
-    env = M_getenv("DOOMWADDIR");
-    if (env != NULL)
-    {
-        AddIWADDir(env);
-    }
-
-    // Add dirs from DOOMWADPATH:
-    env = M_getenv("DOOMWADPATH");
-    if (env != NULL)
-    {
-        AddIWADPath(env, "");
-    }
-
-#ifdef _WIN32
-
-    // Search the registry and find where IWADs have been installed.
-
-    CheckUninstallStrings();
-    CheckInstallRootPaths();
-    CheckSteamEdition();
-    CheckDOSDefaults();
-
-    // Check for GUS patches installed with the BFG edition!
-
-    CheckSteamGUSPatches();
-
-#else
-    AddXdgDirs();
-#ifndef __MACOSX__
-    AddSteamDirs();
-#endif
-#endif
-
-    // Don't run this function again.
-
-    iwad_dirs_built = true;
-}
-
-//
-// Searches WAD search paths for an WAD with a specific filename.
-// 
-
-char *D_FindWADByName(const char *name)
-{
-    char *path;
-    char *probe;
-    int i;
-    
-    // Absolute path?
-
-    probe = M_FileCaseExists(name);
-    if (probe != NULL)
-    {
-        return probe;
-    }
-
-    BuildIWADDirList();
-
-    // Search through all IWAD paths for a file with the given name.
-
-    for (i=0; i<num_iwad_dirs; ++i)
-    {
-        // As a special case, if this is in DOOMWADDIR or DOOMWADPATH,
-        // the "directory" may actually refer directly to an IWAD
-        // file.
-
-        probe = M_FileCaseExists(iwad_dirs[i]);
-        if (DirIsFile(iwad_dirs[i], name) && probe != NULL)
-        {
-            return probe;
-        }
-        free(probe);
-
-        // Construct a string for the full path
-
-        path = M_StringJoin(iwad_dirs[i], DIR_SEPARATOR_S, name, NULL);
-
-        probe = M_FileCaseExists(path);
-        if (probe != NULL)
-        {
-            return probe;
-        }
-
-        free(path);
-    }
-
-    // File not found
-
-    return NULL;
-}
-
-//
-// D_TryWADByName
-//
-// Searches for a WAD by its filename, or returns a copy of the filename
-// if not found.
-//
-
-char *D_TryFindWADByName(const char *filename)
-{
-    char *result;
-
-    result = D_FindWADByName(filename);
-
-    if (result != NULL)
-    {
-        return result;
-    }
-    else
-    {
-        return M_StringDuplicate(filename);
-    }
-}
-
-//
-// FindIWAD
-// Checks availability of IWAD files by name,
-// to determine whether registered/commercial features
-// should be executed (notably loading PWADs).
-//
-
-char *D_FindIWAD(int mask, GameMission_t *mission)
-{
-    char *result;
-    const char *iwadfile;
-    int iwadparm;
-    int i;
-
-    // Check for the -iwad parameter
-
-    //!
-    // Specify an IWAD file to use.
-    //
-    // @arg <file>
-    //
-
-    iwadparm = M_CheckParmWithArgs("-iwad", 1);
-
-    if (iwadparm)
-    {
-        // Search through IWAD dirs for an IWAD with the given name.
-
-        iwadfile = myargv[iwadparm + 1];
-
-        result = D_FindWADByName(iwadfile);
-
-        if (result == NULL)
-        {
-            I_Error("IWAD file '%s' not found!", iwadfile);
-        }
-        
-        *mission = IdentifyIWADByName(result, mask);
-    }
-    else
-    {
-        // Search through the list and look for an IWAD
-
-        result = NULL;
-
-        BuildIWADDirList();
-    
-        for (i=0; result == NULL && i<num_iwad_dirs; ++i)
-        {
-            result = SearchDirectoryForIWAD(iwad_dirs[i], mask, mission);
-        }
-    }
-
-    return result;
-}
-
-// Find all IWADs in the IWAD search path matching the given mask.
-
-const iwad_t **D_FindAllIWADs(int mask)
-{
-    const iwad_t **result;
-    int result_len;
-    char *filename;
-    int i;
-
-    result = malloc(sizeof(iwad_t *) * (arrlen(iwads) + 1));
-    result_len = 0;
-
-    // Try to find all IWADs
-
-    for (i=0; i<arrlen(iwads); ++i)
-    {
-        if (((1 << iwads[i].mission) & mask) == 0)
-        {
-            continue;
-        }
-
-        filename = D_FindWADByName(iwads[i].name);
-
-        if (filename != NULL)
-        {
-            result[result_len] = &iwads[i];
-            ++result_len;
-        }
-    }
-
-    // End of list
-
-    result[result_len] = NULL;
-
-    return result;
-}
-
-//
-// Get the IWAD name used for savegames.
-//
-
-const char *D_SaveGameIWADName(GameMission_t gamemission, GameVariant_t gamevariant)
-{
-    size_t i;
-
-    // Determine the IWAD name to use for savegames.
-    // This determines the directory the savegame files get put into.
-    //
-    // Note that we match on gamemission rather than on IWAD name.
-    // This ensures that doom1.wad and doom.wad saves are stored
-    // in the same place.
-
-    if (gamevariant == freedoom)
-    {
-        if (gamemission == doom)
-        {
-            return "freedoom1.wad";
-        }
-        else if (gamemission == doom2)
-        {
-            return "freedoom2.wad";
-        }
-    }
-    else if (gamevariant == freedm && gamemission == doom2)
-    {
-        return "freedm.wad";
-    }
-
-    for (i=0; i<arrlen(iwads); ++i)
-    {
-        if (gamemission == iwads[i].mission)
-        {
-            return iwads[i].name;
-        }
-    }
-
-    // Default fallback:
-
-    return "unknown.wad";
-}
-
-const char *D_SuggestIWADName(GameMission_t mission, GameMode_t mode)
-{
-    int i;
-
-    for (i = 0; i < arrlen(iwads); ++i)
-    {
-        if (iwads[i].mission == mission && iwads[i].mode == mode)
-        {
-            return iwads[i].name;
-        }
-    }
-
-    return "unknown.wad";
-}
-
-const char *D_SuggestGameName(GameMission_t mission, GameMode_t mode)
-{
-    int i;
-
-    for (i = 0; i < arrlen(iwads); ++i)
-    {
-        if (iwads[i].mission == mission
-         && (mode == indetermined || iwads[i].mode == mode))
-        {
-            return iwads[i].description;
-        }
-    }
-
-    return "Unknown game?";
-}
-
diff --git a/games/NXDoom/src/d_iwad.h b/games/NXDoom/src/d_iwad.h
index 7a49e9827..bb2681c8b 100644
--- a/games/NXDoom/src/d_iwad.h
+++ b/games/NXDoom/src/d_iwad.h
@@ -1,53 +1,68 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Find IWAD and initialize according to IWAD type.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/d_iwad.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Find IWAD and initialize according to IWAD type.
+ *
+ ****************************************************************************/
 
 #ifndef __D_IWAD__
 #define __D_IWAD__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_mode.h"
 
-#define IWAD_MASK_DOOM    ((1 << doom)           \
-                         | (1 << doom2)          \
-                         | (1 << pack_tnt)       \
-                         | (1 << pack_plut)      \
-                         | (1 << pack_chex)      \
-                         | (1 << pack_hacx))
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define IWAD_MASK_DOOM                                                       \
+  ((1 << doom) | (1 << doom2) | (1 << pack_tnt) | (1 << pack_plut) |         \
+   (1 << pack_chex) | (1 << pack_hacx))
 #define IWAD_MASK_HERETIC (1 << heretic)
-#define IWAD_MASK_HEXEN   (1 << hexen)
-#define IWAD_MASK_STRIFE  (1 << strife)
+#define IWAD_MASK_HEXEN (1 << hexen)
+#define IWAD_MASK_STRIFE (1 << strife)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef struct
 {
-    const char *name;
-    GameMission_t mission;
-    GameMode_t mode;
-    const char *description;
+  const char *name;
+  gamemission_t mission;
+  game_mode_t mode;
+  const char *description;
 } iwad_t;
 
-boolean D_IsIWADName(const char *name);
-char *D_FindWADByName(const char *filename);
-char *D_TryFindWADByName(const char *filename);
-char *D_FindIWAD(int mask, GameMission_t *mission);
-const iwad_t **D_FindAllIWADs(int mask);
-const char *D_SaveGameIWADName(GameMission_t gamemission, GameVariant_t gamevariant);
-const char *D_SuggestIWADName(GameMission_t mission, GameMode_t mode);
-const char *D_SuggestGameName(GameMission_t mission, GameMode_t mode);
-void D_CheckCorrectIWAD(GameMission_t mission);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+char *d_find_wad_by_name(const char *filename);
+char *d_try_find_wad_by_name(const char *filename);
+char *d_find_iwad(int mask, gamemission_t *mission);
+const iwad_t **d_find_all_iwads(int mask);
+const char *d_save_game_iwad_name(gamemission_t gamemission,
+                               game_variant_t gamevariant);
+const char *d_suggest_iwad_name(gamemission_t mission, game_mode_t mode);
+const char *d_suggest_game_name(gamemission_t mission, game_mode_t mode);
 
+#endif /* __D_IWAD__ */
diff --git a/games/NXDoom/src/d_loop.c b/games/NXDoom/src/d_loop.c
index b963054a4..28b00dfaa 100644
--- a/games/NXDoom/src/d_loop.c
+++ b/games/NXDoom/src/d_loop.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Main loop code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_loop.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Main loop code.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -30,852 +39,917 @@
 #include "m_argv.h"
 #include "m_fixed.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_NET
 #include "net_client.h"
 #include "net_gui.h"
 #include "net_io.h"
-#include "net_query.h"
-#include "net_server.h"
-#include "net_sdl.h"
 #include "net_loop.h"
+#include "net_query.h"
+#include "net_sdl.h"
+#include "net_server.h"
+#endif
 
-// The complete set of data for a particular tic.
+/* TODO: Move nonvanilla demo functions into a dedicated file. */
+
+#include "m_misc.h"
+#include "w_wad.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Maximum time that we wait in try_run_tics() for netgame data to be
+ * received before we bail out and render a frame anyway.
+ * Vanilla Doom used 20 for this value, but we use a smaller value
+ * instead for better responsiveness of the menu when we're stuck.
+ */
+
+#define MAX_NETGAME_STALL_TICS 5
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* The complete set of data for a particular tic. */
 
 typedef struct
 {
-    ticcmd_t cmds[NET_MAXPLAYERS];
-    boolean ingame[NET_MAXPLAYERS];
+  ticcmd_t cmds[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
+  boolean ingame[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 } ticcmd_set_t;
 
-// Maximum time that we wait in TryRunTics() for netgame data to be
-// received before we bail out and render a frame anyway.
-// Vanilla Doom used 20 for this value, but we use a smaller value
-// instead for better responsiveness of the menu when we're stuck.
-#define MAX_NETGAME_STALL_TICS  5
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-//
-// gametic is the tic about to (or currently being) run
-// maketic is the tic that hasn't had control made for it yet
-// recvtic is the latest tic received from the server.
-//
-// a gametic cannot be run until ticcmds are received for it
-// from all players.
-//
+/* gametic is the tic about to (or currently being) run
+ * maketic is the tic that hasn't had control made for it yet
+ * recvtic is the latest tic received from the server.
+ *
+ * a gametic cannot be run until ticcmds are received for it
+ * from all players.
+ */
 
-static ticcmd_set_t ticdata[BACKUPTICS];
+static ticcmd_set_t ticdata[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-// The index of the next tic to be made (with a call to BuildTiccmd).
+/* The index of the next tic to be made (with a call to build_ticcmd). */
 
 static int maketic;
 
-// The number of complete tics received from the server so far.
+/* The number of complete tics received from the server so far. */
 
 static int recvtic;
 
-// The number of tics that have been run (using RunTic) so far.
-
-int gametic;
-
-// When set to true, a single tic is run each time TryRunTics() is called.
-// This is used for -timedemo mode.
-
-boolean singletics = false;
-
-// Index of the local player.
+/* Index of the local player. */
 
 static int localplayer;
 
-// Used for original sync code.
+/* Used for original sync code. */
 
-static int      skiptics = 0;
+static int skiptics = 0;
 
-// Reduce the bandwidth needed by sampling game input less and transmitting
-// less.  If ticdup is 2, sample half normal, 3 = one third normal, etc.
+/* Use new client synchronization code */
 
-int		ticdup;
+static boolean new_sync = true;
 
-// Amount to offset the timer for game sync.
-
-fixed_t         offsetms;
-
-// Use new client syncronisation code
-
-static boolean  new_sync = true;
-
-// Callback functions for loop code.
+/* Callback functions for loop code. */
 
 static loop_interface_t *loop_interface = NULL;
 
-// Current players in the multiplayer game.
-// This is distinct from playeringame[] used by the game code, which may
-// modify playeringame[] when playing back multiplayer demos.
+/* Current players in the multiplayer game.
+ * This is distinct from playeringame[] used by the game code, which may
+ * modify playeringame[] when playing back multiplayer demos.
+ */
 
-static boolean local_playeringame[NET_MAXPLAYERS];
+static boolean local_playeringame[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 
-// Requested player class "sent" to the server on connect.
-// If we are only doing a single player game then this needs to be remembered
-// and saved in the game settings.
+/* Requested player class "sent" to the server on connect.
+ * If we are only doing a single player game then this needs to be remembered
+ * and saved in the game settings.
+ */
 
 static int player_class;
 
-
-// 35 fps clock adjusted by offsetms milliseconds
-
-static int GetAdjustedTime(void)
-{
-    int time_ms;
-
-    time_ms = I_GetTimeMS();
-
-    if (new_sync)
-    {
-	// Use the adjustments from net_client.c only if we are
-	// using the new sync mode.
-
-        time_ms += (offsetms / FRACUNIT);
-    }
-
-    return (time_ms * TICRATE) / 1000;
-}
-
-static boolean BuildNewTic(void)
-{
-    int	gameticdiv;
-    ticcmd_t cmd;
-
-    gameticdiv = gametic/ticdup;
-
-    I_StartTic ();
-    loop_interface->ProcessEvents();
-
-    // Always run the menu
-
-    loop_interface->RunMenu();
-
-    if (drone)
-    {
-        // In drone mode, do not generate any ticcmds.
-
-        return false;
-    }
-
-    if (new_sync)
-    {
-       // If playing single player, do not allow tics to buffer
-       // up very far
-
-       if (!net_client_connected && maketic - gameticdiv > 2)
-           return false;
-
-       // Never go more than ~200ms ahead
-
-       if (maketic - gameticdiv > 8)
-           return false;
-    }
-    else
-    {
-       if (maketic - gameticdiv >= 5)
-           return false;
-    }
-
-    //printf ("mk:%i ",maketic);
-    memset(&cmd, 0, sizeof(ticcmd_t));
-    loop_interface->BuildTiccmd(&cmd, maketic);
-
-    if (net_client_connected)
-    {
-        NET_CL_SendTiccmd(&cmd, maketic);
-    }
-
-    ticdata[maketic % BACKUPTICS].cmds[localplayer] = cmd;
-    ticdata[maketic % BACKUPTICS].ingame[localplayer] = true;
-
-    ++maketic;
-
-    return true;
-}
-
-//
-// NetUpdate
-// Builds ticcmds for console player,
-// sends out a packet
-//
-int      lasttime;
-
-void NetUpdate (void)
-{
-    int nowtime;
-    int newtics;
-    int	i;
-
-    // If we are running with singletics (timing a demo), this
-    // is all done separately.
-
-    if (singletics)
-        return;
-
-    // Run network subsystems
-
-    NET_CL_Run();
-    NET_SV_Run();
-
-    // check time
-    nowtime = GetAdjustedTime() / ticdup;
-    newtics = nowtime - lasttime;
-
-    lasttime = nowtime;
-
-    if (skiptics <= newtics)
-    {
-        newtics -= skiptics;
-        skiptics = 0;
-    }
-    else
-    {
-        skiptics -= newtics;
-        newtics = 0;
-    }
-
-    // build new ticcmds for console player
-
-    for (i=0 ; i<newtics ; i++)
-    {
-        if (!BuildNewTic())
-        {
-            break;
-        }
-    }
-}
-
-static void D_Disconnected(void)
-{
-    // In drone mode, the game cannot continue once disconnected.
-
-    if (drone)
-    {
-        I_Error("Disconnected from server in drone mode.");
-    }
-
-    // disconnected from server
-
-    printf("Disconnected from server.\n");
-}
-
-//
-// Invoked by the network engine when a complete set of ticcmds is
-// available.
-//
-
-void D_ReceiveTic(ticcmd_t *ticcmds, boolean *players_mask)
-{
-    int i;
-
-    // Disconnected from server?
-
-    if (ticcmds == NULL && players_mask == NULL)
-    {
-        D_Disconnected();
-        return;
-    }
-
-    for (i = 0; i < NET_MAXPLAYERS; ++i)
-    {
-        if (!drone && i == localplayer)
-        {
-            // This is us.  Don't overwrite it.
-        }
-        else
-        {
-            ticdata[recvtic % BACKUPTICS].cmds[i] = ticcmds[i];
-            ticdata[recvtic % BACKUPTICS].ingame[i] = players_mask[i];
-        }
-    }
-
-    ++recvtic;
-}
-
-//
-// Start game loop
-//
-// Called after the screen is set but before the game starts running.
-//
-
-void D_StartGameLoop(void)
-{
-    lasttime = GetAdjustedTime() / ticdup;
-}
-
-//
-// Block until the game start message is received from the server.
-//
-
-static void BlockUntilStart(net_gamesettings_t *settings,
-                            netgame_startup_callback_t callback)
-{
-    while (!NET_CL_GetSettings(settings))
-    {
-        NET_CL_Run();
-        NET_SV_Run();
-
-        if (!net_client_connected)
-        {
-            I_Error("Lost connection to server");
-        }
-
-        if (callback != NULL && !callback(net_client_wait_data.ready_players,
-                                          net_client_wait_data.num_players))
-        {
-            I_Error("Netgame startup aborted.");
-        }
-
-        I_Sleep(100);
-    }
-}
-
-void D_StartNetGame(net_gamesettings_t *settings,
-                    netgame_startup_callback_t callback)
-{
-    int i;
-
-    offsetms = 0;
-    recvtic = 0;
-
-    settings->consoleplayer = 0;
-    settings->num_players = 1;
-    settings->player_classes[0] = player_class;
-
-    //!
-    // @category net
-    //
-    // Use original network client sync code rather than the improved
-    // sync code.
-    //
-    settings->new_sync = !M_ParmExists("-oldsync");
-
-    //!
-    // @category net
-    // @arg <n>
-    //
-    // Send n extra tics in every packet as insurance against dropped
-    // packets.
-    //
-
-    i = M_CheckParmWithArgs("-extratics", 1);
-
-    if (i > 0)
-        settings->extratics = atoi(myargv[i+1]);
-    else
-        settings->extratics = 1;
-
-    //!
-    // @category net
-    // @arg <n>
-    //
-    // Reduce the resolution of the game by a factor of n, reducing
-    // the amount of network bandwidth needed.
-    //
-
-    i = M_CheckParmWithArgs("-dup", 1);
-
-    if (i > 0)
-        settings->ticdup = atoi(myargv[i+1]);
-    else
-        settings->ticdup = 1;
-
-    if (net_client_connected)
-    {
-        // Send our game settings and block until game start is received
-        // from the server.
-
-        NET_CL_StartGame(settings);
-        BlockUntilStart(settings, callback);
-
-        // Read the game settings that were received.
-
-        NET_CL_GetSettings(settings);
-    }
-
-    if (drone)
-    {
-        settings->consoleplayer = 0;
-    }
-
-    // Set the local player and playeringame[] values.
-
-    localplayer = settings->consoleplayer;
-
-    for (i = 0; i < NET_MAXPLAYERS; ++i)
-    {
-        local_playeringame[i] = i < settings->num_players;
-    }
-
-    // Copy settings to global variables.
-
-    ticdup = settings->ticdup;
-    new_sync = settings->new_sync;
-
-    if (ticdup < 1)
-    {
-        I_Error("D_StartNetGame: invalid ticdup value (%d)", ticdup);
-    }
-
-    // TODO: Message disabled until we fix new_sync.
-    //if (!new_sync)
-    //{
-    //    printf("Syncing netgames like Vanilla Doom.\n");
-    //}
-}
-
-boolean D_InitNetGame(net_connect_data_t *connect_data)
-{
-    boolean result = false;
-    net_addr_t *addr = NULL;
-    int i;
-
-    // Call D_QuitNetGame on exit:
-
-    I_AtExit(D_QuitNetGame, true);
-
-    player_class = connect_data->player_class;
-
-    //!
-    // @category net
-    //
-    // Start a multiplayer server, listening for connections.
-    //
-
-    if (M_CheckParm("-server") > 0
-     || M_CheckParm("-privateserver") > 0)
-    {
-        NET_SV_Init();
-        NET_SV_AddModule(&net_loop_server_module);
-        NET_SV_AddModule(&net_sdl_module);
-        NET_SV_RegisterWithMaster();
-
-        net_loop_client_module.InitClient();
-        addr = net_loop_client_module.ResolveAddress(NULL);
-        NET_ReferenceAddress(addr);
-    }
-    else
-    {
-        //!
-        // @category net
-        //
-        // Automatically search the local LAN for a multiplayer
-        // server and join it.
-        //
-
-        i = M_CheckParm("-autojoin");
-
-        if (i > 0)
-        {
-            addr = NET_FindLANServer();
-
-            if (addr == NULL)
-            {
-                I_Error("No server found on local LAN");
-            }
-        }
-
-        //!
-        // @arg <address>
-        // @category net
-        //
-        // Connect to a multiplayer server running on the given
-        // address.
-        //
-
-        i = M_CheckParmWithArgs("-connect", 1);
-
-        if (i > 0)
-        {
-            net_sdl_module.InitClient();
-            addr = net_sdl_module.ResolveAddress(myargv[i+1]);
-            NET_ReferenceAddress(addr);
-
-            if (addr == NULL)
-            {
-                I_Error("Unable to resolve '%s'\n", myargv[i+1]);
-            }
-        }
-    }
-
-    if (addr != NULL)
-    {
-        if (M_CheckParm("-drone") > 0)
-        {
-            connect_data->drone = true;
-        }
-
-        if (!NET_CL_Connect(addr, connect_data))
-        {
-            I_Error("D_InitNetGame: Failed to connect to %s:\n%s\n",
-                    NET_AddrToString(addr), net_client_reject_reason);
-        }
-
-        printf("D_InitNetGame: Connected to %s\n", NET_AddrToString(addr));
-        NET_ReleaseAddress(addr);
-
-        // Wait for launch message received from server.
-
-        NET_WaitForLaunch();
-
-        result = true;
-    }
-
-    return result;
-}
-
-
-//
-// D_QuitNetGame
-// Called before quitting to leave a net game
-// without hanging the other players
-//
-void D_QuitNetGame (void)
-{
-    NET_SV_Shutdown();
-    NET_CL_Disconnect();
-}
-
-static int GetLowTic(void)
-{
-    int lowtic;
-
-    lowtic = maketic;
-
-    if (net_client_connected)
-    {
-        if (drone || recvtic < lowtic)
-        {
-            lowtic = recvtic;
-        }
-    }
-
-    return lowtic;
-}
+#ifndef CONFIG_GAMES_NXDOOM_NET
+static boolean net_client_connected = false;
+static boolean drone = false;
+#endif
 
 static int frameon;
 static int frameskip[4];
 static int oldnettics;
 
-static void OldNetSync(void)
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* The number of tics that have been run (using run_tic) so far. */
+
+int gametic;
+
+/* When set to true, a single tic is run each time try_run_tics() is called.
+ * This is used for -timedemo mode.
+ */
+
+boolean singletics = false;
+
+/* Reduce the bandwidth needed by sampling game input less and transmitting
+ * less.  If ticdup is 2, sample half normal, 3 = one third normal, etc.
+ */
+
+int ticdup;
+
+/* Amount to offset the timer for game sync. */
+
+fixed_t offsetms;
+
+int lasttime;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* 35 fps clock adjusted by offsetms milliseconds */
+
+static int get_adjusted_time(void)
 {
-    unsigned int i;
-    int keyplayer = -1;
+  int time_ms;
 
-    frameon++;
+  time_ms = i_get_time_ms();
 
-    // ideally maketic should be 1 - 3 tics above lowtic
-    // if we are consistantly slower, speed up time
-
-    for (i=0 ; i<NET_MAXPLAYERS ; i++)
+  if (new_sync)
     {
-        if (local_playeringame[i])
+      /* Use the adjustments from net_client.c only if we are
+       * using the new sync mode.
+       */
+
+      time_ms += (offsetms / FRACUNIT);
+    }
+
+  return (time_ms * TICRATE) / 1000;
+}
+
+static boolean build_new_tic(void)
+{
+  int gameticdiv;
+  ticcmd_t cmd;
+
+  gameticdiv = gametic / ticdup;
+
+  i_start_tic();
+  loop_interface->process_events();
+
+  /* Always run the menu */
+
+  loop_interface->run_menu();
+
+  if (drone)
+    {
+      /* In drone mode, do not generate any ticcmds. */
+
+      return false;
+    }
+
+  if (new_sync)
+    {
+      /* If playing single player, do not allow tics to buffer
+       * up very far
+       */
+
+      if (!net_client_connected && maketic - gameticdiv > 2) return false;
+
+      /* Never go more than ~200ms ahead */
+
+      if (maketic - gameticdiv > 8) return false;
+    }
+  else
+    {
+      if (maketic - gameticdiv >= 5) return false;
+    }
+
+  /* printf ("mk:%i ",maketic); */
+
+  memset(&cmd, 0, sizeof(ticcmd_t));
+  loop_interface->build_ticcmd(&cmd, maketic);
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  if (net_client_connected)
+    {
+      net_cl_send_ticcmd(&cmd, maketic);
+    }
+#endif
+
+  ticdata[maketic % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].cmds[localplayer] =
+      cmd;
+  ticdata[maketic % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].ingame[localplayer] =
+      true;
+
+  ++maketic;
+
+  return true;
+}
+
+static boolean strict_demos(void)
+{
+  /* @category demo
+   *
+   * When recording or playing back demos, disable any extensions
+   * of the vanilla demo format - record demos as vanilla would do,
+   * and play back demos as vanilla would do.
+   *
+   */
+
+  return m_parm_exists("-strictdemos");
+}
+
+static void d_disconnected(void)
+{
+  /* In drone mode, the game cannot continue once disconnected. */
+
+  if (drone)
+    {
+      i_error("Disconnected from server in drone mode.");
+    }
+
+  /* disconnected from server */
+
+  printf("Disconnected from server.\n");
+}
+
+static int get_low_tic(void)
+{
+  int lowtic;
+
+  lowtic = maketic;
+
+  if (net_client_connected)
+    {
+      if (drone || recvtic < lowtic)
         {
-            keyplayer = i;
-            break;
+          lowtic = recvtic;
         }
     }
 
-    if (keyplayer < 0)
-    {
-        // If there are no players, we can never advance anyway
+  return lowtic;
+}
 
-        return;
-    }
+static void old_net_sync(void)
+{
+  unsigned int i;
+  int keyplayer = -1;
 
-    if (localplayer == keyplayer)
+  frameon++;
+
+  /* ideally maketic should be 1 - 3 tics above lowtic
+   * if we are consistently slower, speed up time
+   */
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; i++)
     {
-        // the key player does not adapt
-    }
-    else
-    {
-        if (maketic <= recvtic)
+      if (local_playeringame[i])
         {
-            lasttime--;
-            // printf ("-");
+          keyplayer = i;
+          break;
+        }
+    }
+
+  if (keyplayer < 0)
+    {
+      /* If there are no players, we can never advance anyway */
+
+      return;
+    }
+
+  if (localplayer == keyplayer)
+    {
+      /* the key player does not adapt */
+    }
+  else
+    {
+      if (maketic <= recvtic)
+        {
+          lasttime--;
         }
 
-        frameskip[frameon & 3] = oldnettics > recvtic;
-        oldnettics = maketic;
+      frameskip[frameon & 3] = oldnettics > recvtic;
+      oldnettics = maketic;
 
-        if (frameskip[0] && frameskip[1] && frameskip[2] && frameskip[3])
+      if (frameskip[0] && frameskip[1] && frameskip[2] && frameskip[3])
         {
-            skiptics = 1;
-            // printf ("+");
+          skiptics = 1;
         }
     }
 }
 
-// Returns true if there are players in the game:
+/* Returns true if there are players in the game: */
 
-static boolean PlayersInGame(void)
+static boolean players_in_game(void)
 {
-    boolean result = false;
-    unsigned int i;
+  boolean result = false;
+  unsigned int i;
 
-    // If we are connected to a server, check if there are any players
-    // in the game.
+  /* If we are connected to a server, check if there are any players
+   * in the game.
+   */
 
-    if (net_client_connected)
+  if (net_client_connected)
     {
-        for (i = 0; i < NET_MAXPLAYERS; ++i)
+      for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
         {
-            result = result || local_playeringame[i];
+          result = result || local_playeringame[i];
         }
     }
 
-    // Whether single or multi-player, unless we are running as a drone,
-    // we are in the game.
+  /* Whether single or multi-player, unless we are running as a drone,
+   * we are in the game.
+   */
 
-    if (!drone)
+  if (!drone)
     {
-        result = true;
+      result = true;
     }
 
-    return result;
+  return result;
 }
 
-// When using ticdup, certain values must be cleared out when running
-// the duplicate ticcmds.
+/* When using ticdup, certain values must be cleared out when running
+ * the duplicate ticcmds.
+ */
 
-static void TicdupSquash(ticcmd_set_t *set)
+static void ticdup_squash(ticcmd_set_t *set)
 {
-    ticcmd_t *cmd;
-    unsigned int i;
+  ticcmd_t *cmd;
+  unsigned int i;
 
-    for (i = 0; i < NET_MAXPLAYERS ; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        cmd = &set->cmds[i];
-        cmd->chatchar = 0;
-        if (cmd->buttons & BT_SPECIAL)
-            cmd->buttons = 0;
+      cmd = &set->cmds[i];
+      cmd->chatchar = 0;
+      if (cmd->buttons & BT_SPECIAL) cmd->buttons = 0;
     }
 }
 
-// When running in single player mode, clear all the ingame[] array
-// except the local player.
+/* When running in single player mode, clear all the ingame[] array
+ * except the local player.
+ */
 
-static void SinglePlayerClear(ticcmd_set_t *set)
+static void single_player_clear(ticcmd_set_t *set)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i = 0; i < NET_MAXPLAYERS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (i != localplayer)
+      if (i != localplayer)
         {
-            set->ingame[i] = false;
+          set->ingame[i] = false;
         }
     }
 }
 
-//
-// TryRunTics
-//
+/* Returns true if the given lump number corresponds to data from a .lmp
+ * file, as opposed to a WAD.
+ */
 
-void TryRunTics (void)
+static boolean is_demo_file(int lumpnum)
 {
-    int	i;
-    int	lowtic;
-    int	entertic;
-    static int oldentertics;
-    int realtics;
-    int	availabletics;
-    int	counts;
+  char *lower;
+  boolean result;
 
-    // get real tics
-    entertic = I_GetTime() / ticdup;
-    realtics = entertic - oldentertics;
-    oldentertics = entertic;
+  lower = m_string_duplicate(lumpinfo[lumpnum]->wad_file->path);
+  m_force_lowercase(lower);
+  result = m_string_ends_with(lower, ".lmp");
+  free(lower);
 
-    // in singletics mode, run a single tic every time this function
-    // is called.
+  return result;
+}
 
-    if (singletics)
+/* Block until the game start message is received from the server. */
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+static void block_until_start(net_gamesettings_t *settings,
+                            netgame_startup_callback_t callback)
+{
+  while (!net_cl_get_settings(settings))
     {
-        BuildNewTic();
-    }
-    else
-    {
-        NetUpdate ();
-    }
+      net_cl_run();
+      net_sv_run();
 
-    lowtic = GetLowTic();
-
-    availabletics = lowtic - gametic/ticdup;
-
-    // decide how many tics to run
-
-    if (new_sync)
-    {
-	counts = availabletics;
-    }
-    else
-    {
-        // decide how many tics to run
-        if (realtics < availabletics-1)
-            counts = realtics+1;
-        else if (realtics < availabletics)
-            counts = realtics;
-        else
-            counts = availabletics;
-
-        if (counts < 1)
-            counts = 1;
-
-        if (net_client_connected)
+      if (!net_client_connected)
         {
-            OldNetSync();
+          i_error("Lost connection to server");
+        }
+
+      if (callback != NULL && !callback(net_client_wait_data.ready_players,
+                                        net_client_wait_data.num_players))
+        {
+          i_error("Netgame startup aborted.");
+        }
+
+      usleep(100000);
+    }
+}
+
+/* d_quit_net_game
+ *
+ * Called before quitting to leave a net game without hanging the other
+ * players
+ *
+ * Broadcasts special packets to other players to notify of game exit
+ */
+
+static void d_quit_net_game(void)
+{
+  net_sv_shutdown();
+  net_cl_disconnect();
+}
+#endif /* CONFIG_GAMES_NXDOOM_NET */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* net_update
+ * Builds ticcmds for console player, sends out a packet
+ */
+
+void net_update(void)
+{
+  int nowtime;
+  int newtics;
+  int i;
+
+  /* If we are running with singletics (timing a demo), this
+   * is all done separately.
+   */
+
+  if (singletics) return;
+
+  /* Run network subsystems */
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  net_cl_run();
+  net_sv_run();
+#endif
+
+  /* check time */
+
+  nowtime = get_adjusted_time() / ticdup;
+  newtics = nowtime - lasttime;
+
+  lasttime = nowtime;
+
+  if (skiptics <= newtics)
+    {
+      newtics -= skiptics;
+      skiptics = 0;
+    }
+  else
+    {
+      skiptics -= newtics;
+      newtics = 0;
+    }
+
+  /* build new ticcmds for console player */
+
+  for (i = 0; i < newtics; i++)
+    {
+      if (!build_new_tic())
+        {
+          break;
+        }
+    }
+}
+
+/* Invoked by the network engine when a complete set of ticcmds is
+ * available.
+ */
+
+void d_receive_tic(ticcmd_t *ticcmds, boolean *players_mask)
+{
+  int i;
+
+  /* Disconnected from server? */
+
+  if (ticcmds == NULL && players_mask == NULL)
+    {
+      d_disconnected();
+      return;
+    }
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
+    {
+      if (!drone && i == localplayer)
+        {
+          /* This is us.  Don't overwrite it. */
+        }
+      else
+        {
+          ticdata[recvtic % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].cmds[i] =
+              ticcmds[i];
+          ticdata[recvtic % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].ingame[i] =
+              players_mask[i];
         }
     }
 
-    if (counts < 1)
-	counts = 1;
+  ++recvtic;
+}
 
-    // wait for new tics if needed
-    while (!PlayersInGame() || lowtic < gametic/ticdup + counts)
+/****************************************************************************
+ * Name: d_start_game_loop
+ *
+ * Description:
+ *   Called after the screen is set but before the game starts running.
+ *
+ ****************************************************************************/
+
+void d_start_game_loop(void)
+{
+  lasttime = get_adjusted_time() / ticdup;
+}
+
+void d_start_net_game(net_gamesettings_t *settings,
+                      netgame_startup_callback_t callback)
+{
+  int i;
+
+  offsetms = 0;
+  recvtic = 0;
+
+  settings->consoleplayer = 0;
+  settings->num_players = 1;
+  settings->player_classes[0] = player_class;
+
+  /* @category net
+   *
+   * Use original network client sync code rather than the improved
+   * sync code.
+   */
+
+  settings->new_sync = !m_parm_exists("-oldsync");
+
+  /* @category net
+   * @arg <n>
+   *
+   * Send n extra tics in every packet as insurance against dropped
+   * packets.
+   */
+
+  i = m_check_parm_with_args("-extratics", 1);
+
+  if (i > 0)
+    settings->extratics = atoi(myargv[i + 1]);
+  else
+    settings->extratics = 1;
+
+  /* @category net
+   * @arg <n>
+   *
+   * Reduce the resolution of the game by a factor of n, reducing
+   * the amount of network bandwidth needed.
+   */
+
+  i = m_check_parm_with_args("-dup", 1);
+
+  if (i > 0)
+    settings->ticdup = atoi(myargv[i + 1]);
+  else
+    settings->ticdup = 1;
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  if (net_client_connected)
     {
-	NetUpdate ();
+      /* Send our game settings and block until game start is received
+       * from the server.
+       */
 
-        lowtic = GetLowTic();
+      net_cl_start_game(settings);
+      block_until_start(settings, callback);
 
-	if (lowtic < gametic/ticdup)
-	    I_Error ("TryRunTics: lowtic < gametic");
+      /* Read the game settings that were received. */
 
-        // Still no tics to run? Sleep until some are available.
-        if (lowtic < gametic/ticdup + counts)
+      net_cl_get_settings(settings);
+    }
+
+  if (drone)
+    {
+      settings->consoleplayer = 0;
+    }
+#endif
+
+  /* Set the local player and playeringame[] values. */
+
+  localplayer = settings->consoleplayer;
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
+    {
+      local_playeringame[i] = i < settings->num_players;
+    }
+
+  /* Copy settings to global variables. */
+
+  ticdup = settings->ticdup;
+  new_sync = settings->new_sync;
+
+  if (ticdup < 1)
+    {
+      i_error("d_start_net_game: invalid ticdup value (%d)", ticdup);
+    }
+
+  /* TODO: Message disabled until we fix new_sync.
+   *
+   * if (!new_sync)
+   * {
+   *     printf("Syncing netgames like Vanilla Doom.\n");
+   * }
+   */
+}
+
+boolean d_init_net_game(net_connect_data_t *connect_data)
+{
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  boolean result = false;
+  net_addr_t *addr = NULL;
+  int i;
+
+  /* Call d_quit_net_game on exit: */
+
+  i_at_exit(d_quit_net_game, true);
+#endif
+
+  player_class = connect_data->player_class;
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  /* @category net
+   *
+   * Start a multiplayer server, listening for connections.
+   */
+
+  if (m_check_parm("-server") > 0 || m_check_parm("-privateserver") > 0)
+    {
+      net_sv_init();
+      net_sv_add_module(&net_loop_server_module);
+      net_sv_add_module(&net_sdl_module);
+      net_sv_register_with_master();
+
+      net_loop_client_module.init_client();
+      addr = net_loop_client_module.resolve_address(NULL);
+      net_reference_address(addr);
+    }
+  else
+    {
+      /* @category net
+       *
+       * Automatically search the local LAN for a multiplayer
+       * server and join it.
+       */
+
+      i = m_check_parm("-autojoin");
+
+      if (i > 0)
         {
-            // If we're in a netgame, we might spin forever waiting for
-            // new network data to be received. So don't stay in here
-            // forever - give the menu a chance to work.
-            if (I_GetTime() / ticdup - entertic >= MAX_NETGAME_STALL_TICS)
+          addr = net_find_lan_server();
+
+          if (addr == NULL)
             {
-                return;
+              i_error("No server found on local LAN");
+            }
+        }
+
+      /* @arg <address>
+       * @category net
+       *
+       * Connect to a multiplayer server running on the given
+       * address.
+       */
+
+      i = m_check_parm_with_args("-connect", 1);
+
+      if (i > 0)
+        {
+          net_sdl_module.init_client();
+          addr = net_sdl_module.resolve_address(myargv[i + 1]);
+          net_reference_address(addr);
+
+          if (addr == NULL)
+            {
+              i_error("Unable to resolve '%s'\n", myargv[i + 1]);
+            }
+        }
+    }
+
+  if (addr != NULL)
+    {
+      if (m_check_parm("-drone") > 0)
+        {
+          connect_data->drone = true;
+        }
+
+      if (!net_cl_connect(addr, connect_data))
+        {
+          i_error("d_init_net_game: Failed to connect to %s:\n%s\n",
+                  net_addr_to_string(addr), net_client_reject_reason);
+        }
+
+      printf("d_init_net_game: Connected to %s\n", net_addr_to_string(addr));
+      net_release_address(addr);
+
+      /* Wait for launch message received from server. */
+
+      net_wait_for_launch();
+
+      result = true;
+    }
+
+  return result;
+#endif
+  return false;
+}
+
+/* try_run_tics */
+
+void try_run_tics(void)
+{
+  int i;
+  int lowtic;
+  int entertic;
+  static int oldentertics;
+  int realtics;
+  int availabletics;
+  int counts;
+
+  /* get real tics */
+
+  entertic = i_get_time() / ticdup;
+  realtics = entertic - oldentertics;
+  oldentertics = entertic;
+
+  /* in singletics mode, run a single tic every time this function
+   * is called.
+   */
+
+  if (singletics)
+    {
+      build_new_tic();
+    }
+  else
+    {
+      net_update();
+    }
+
+  lowtic = get_low_tic();
+
+  availabletics = lowtic - gametic / ticdup;
+
+  /* decide how many tics to run */
+
+  if (new_sync)
+    {
+      counts = availabletics;
+    }
+  else
+    {
+      /* decide how many tics to run */
+
+      if (realtics < availabletics - 1)
+        counts = realtics + 1;
+      else if (realtics < availabletics)
+        counts = realtics;
+      else
+        counts = availabletics;
+
+      if (counts < 1) counts = 1;
+
+      if (net_client_connected)
+        {
+          old_net_sync();
+        }
+    }
+
+  if (counts < 1) counts = 1;
+
+  /* wait for new tics if needed */
+
+  while (!players_in_game() || lowtic < gametic / ticdup + counts)
+    {
+      net_update();
+
+      lowtic = get_low_tic();
+
+      if (lowtic < gametic / ticdup)
+        i_error("try_run_tics: lowtic < gametic");
+
+      /* Still no tics to run? Sleep until some are available. */
+
+      if (lowtic < gametic / ticdup + counts)
+        {
+          /* If we're in a netgame, we might spin forever waiting for
+           * new network data to be received. So don't stay in here
+           * forever - give the menu a chance to work.
+           */
+
+          if (i_get_time() / ticdup - entertic >= MAX_NETGAME_STALL_TICS)
+            {
+              return;
             }
 
-            I_Sleep(1);
+          usleep(1000);
         }
     }
 
-    // run the count * ticdup dics
-    while (counts--)
+  /* run the count * ticdup dics */
+
+  while (counts--)
     {
-        ticcmd_set_t *set;
+      ticcmd_set_t *set;
 
-        if (!PlayersInGame())
+      if (!players_in_game())
         {
-            return;
+          return;
         }
 
-        set = &ticdata[(gametic / ticdup) % BACKUPTICS];
+      set = &ticdata[(gametic / ticdup) %
+                     CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-        if (!net_client_connected)
+      if (!net_client_connected)
         {
-            SinglePlayerClear(set);
+          single_player_clear(set);
         }
 
-	for (i=0 ; i<ticdup ; i++)
-	{
-            if (gametic/ticdup > lowtic)
-                I_Error ("gametic>lowtic");
+      for (i = 0; i < ticdup; i++)
+        {
+          if (gametic / ticdup > lowtic) i_error("gametic>lowtic");
 
-            memcpy(local_playeringame, set->ingame, sizeof(local_playeringame));
+          memcpy(local_playeringame, set->ingame,
+                  sizeof(local_playeringame));
 
-            loop_interface->RunTic(set->cmds, set->ingame);
-	    gametic++;
+          loop_interface->run_tic(set->cmds, set->ingame);
+          gametic++;
 
-	    // modify command for duplicated tics
+          /* modify command for duplicated tics */
 
-            TicdupSquash(set);
-	}
+          ticdup_squash(set);
+        }
 
-	NetUpdate ();	// check for new console commands
+      net_update(); /* check for new console commands */
     }
 }
 
-void D_RegisterLoopCallbacks(loop_interface_t *i)
+void d_register_loop_callbacks(loop_interface_t *i)
 {
-    loop_interface = i;
+  loop_interface = i;
 }
 
-// TODO: Move nonvanilla demo functions into a dedicated file.
-#include "m_misc.h"
-#include "w_wad.h"
+/* If the provided conditional value is true, we're trying to record
+ * a demo file that will include a non-vanilla extension. The function
+ * will return true if the conditional is true and it's allowed to use
+ * this extension (no extensions are allowed if -strictdemos is given
+ * on the command line). A warning is shown on the console using the
+ * provided string describing the non-vanilla expansion.
+ */
 
-static boolean StrictDemos(void)
+boolean d_non_vanilla_record(boolean conditional, const char *feature)
 {
-    //!
-    // @category demo
-    //
-    // When recording or playing back demos, disable any extensions
-    // of the vanilla demo format - record demos as vanilla would do,
-    // and play back demos as vanilla would do.
-    //
-    return M_ParmExists("-strictdemos");
-}
-
-// If the provided conditional value is true, we're trying to record
-// a demo file that will include a non-vanilla extension. The function
-// will return true if the conditional is true and it's allowed to use
-// this extension (no extensions are allowed if -strictdemos is given
-// on the command line). A warning is shown on the console using the
-// provided string describing the non-vanilla expansion.
-boolean D_NonVanillaRecord(boolean conditional, const char *feature)
-{
-    if (!conditional || StrictDemos())
+  if (!conditional || strict_demos())
     {
-        return false;
+      return false;
     }
 
-    printf("Warning: Recording a demo file with a non-vanilla extension "
-           "(%s). Use -strictdemos to disable this extension.\n",
-           feature);
+  printf("Warning: Recording a demo file with a non-vanilla extension "
+         "(%s). Use -strictdemos to disable this extension.\n",
+         feature);
 
-    return true;
+  return true;
 }
 
-// Returns true if the given lump number corresponds to data from a .lmp
-// file, as opposed to a WAD.
-static boolean IsDemoFile(int lumpnum)
-{
-    char *lower;
-    boolean result;
+/* If the provided conditional value is true, we're trying to play back
+ * a demo that includes a non-vanilla extension. We return true if the
+ * conditional is true and it's allowed to use this extension, checking
+ * that:
+ *  - The -strictdemos command line argument is not provided.
+ *  - The given lumpnum identifying the demo to play back identifies a
+ *    demo that comes from a .lmp file, not a .wad file.
+ *  - Before proceeding, a warning is shown to the user on the console.
+ */
 
-    lower = M_StringDuplicate(lumpinfo[lumpnum]->wad_file->path);
-    M_ForceLowercase(lower);
-    result = M_StringEndsWith(lower, ".lmp");
-    free(lower);
-
-    return result;
-}
-
-// If the provided conditional value is true, we're trying to play back
-// a demo that includes a non-vanilla extension. We return true if the
-// conditional is true and it's allowed to use this extension, checking
-// that:
-//  - The -strictdemos command line argument is not provided.
-//  - The given lumpnum identifying the demo to play back identifies a
-//    demo that comes from a .lmp file, not a .wad file.
-//  - Before proceeding, a warning is shown to the user on the console.
-boolean D_NonVanillaPlayback(boolean conditional, int lumpnum,
+boolean d_non_vanilla_playback(boolean conditional, int lumpnum,
                              const char *feature)
 {
-    if (!conditional || StrictDemos())
+  if (!conditional || strict_demos())
     {
-        return false;
+      return false;
     }
 
-    if (!IsDemoFile(lumpnum))
+  if (!is_demo_file(lumpnum))
     {
-        printf("Warning: WAD contains demo with a non-vanilla extension "
-               "(%s)\n", feature);
-        return false;
+      printf("Warning: WAD contains demo with a non-vanilla extension "
+             "(%s)\n",
+             feature);
+      return false;
     }
 
-    printf("Warning: Playing back a demo file with a non-vanilla extension "
-           "(%s). Use -strictdemos to disable this extension.\n",
-           feature);
+  printf("Warning: Playing back a demo file with a non-vanilla extension "
+         "(%s). Use -strictdemos to disable this extension.\n",
+         feature);
 
-    return true;
+  return true;
 }
-
diff --git a/games/NXDoom/src/d_loop.h b/games/NXDoom/src/d_loop.h
index c154be3a6..95c2f7a3c 100644
--- a/games/NXDoom/src/d_loop.h
+++ b/games/NXDoom/src/d_loop.h
@@ -1,96 +1,118 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Main loop stuff.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_loop.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Main loop stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __D_LOOP__
 #define __D_LOOP__
 
-#include "net_defs.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "m_fixed.h"
+#include "net_defs.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-// Callback function invoked while waiting for the netgame to start.
-// The callback is invoked when new players are ready. The callback
-// should return true, or return false to abort startup.
+/* Callback function invoked while waiting for the netgame to start.
+ * The callback is invoked when new players are ready. The callback
+ * should return true, or return false to abort startup.
+ */
 
 typedef boolean (*netgame_startup_callback_t)(int ready_players,
                                               int num_players);
 
 typedef struct
 {
-    // Read events from the event queue, and process them.
+  /* Read events from the event queue, and process them. */
 
-    void (*ProcessEvents)();
+  void (*process_events)(void);
 
-    // Given the current input state, fill in the fields of the specified
-    // ticcmd_t structure with data for a new tic.
+  /* Given the current input state, fill in the fields of the specified
+   * ticcmd_t structure with data for a new tic.
+   */
 
-    void (*BuildTiccmd)(ticcmd_t *cmd, int maketic);
+  void (*build_ticcmd)(ticcmd_t *cmd, int maketic);
 
-    // Advance the game forward one tic, using the specified player input.
+  /* Advance the game forward one tic, using the specified player input. */
 
-    void (*RunTic)(ticcmd_t *cmds, boolean *ingame);
+  void (*run_tic)(ticcmd_t *cmds, boolean *ingame);
 
-    // Run the menu (runs independently of the game).
+  /* Run the menu (runs independently of the game). */
 
-    void (*RunMenu)();
+  void (*run_menu)(void);
 } loop_interface_t;
 
-// Register callback functions for the main loop code to use.
-void D_RegisterLoopCallbacks(loop_interface_t *i);
-
-// Create any new ticcmds and broadcast to other players.
-void NetUpdate (void);
-
-// Broadcasts special packets to other players
-//  to notify of game exit
-void D_QuitNetGame (void);
-
-//? how many ticks to run?
-void TryRunTics (void);
-
-// Called at start of game loop to initialize timers
-void D_StartGameLoop(void);
-
-// Initialize networking code and connect to server.
-
-boolean D_InitNetGame(net_connect_data_t *connect_data);
-
-// Start game with specified settings. The structure will be updated
-// with the actual settings for the game.
-
-void D_StartNetGame(net_gamesettings_t *settings,
-                    netgame_startup_callback_t callback);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern boolean singletics;
-extern int gametic, ticdup;
-
-// Check if it is permitted to record a demo with a non-vanilla feature.
-boolean D_NonVanillaRecord(boolean conditional, const char *feature);
-
-// Check if it is permitted to play back a demo with a non-vanilla feature.
-boolean D_NonVanillaPlayback(boolean conditional, int lumpnum,
-                             const char *feature);
-
-void D_ReceiveTic(ticcmd_t *ticcmds, boolean *playeringame);
-
-
+extern int gametic;
+extern int ticdup;
 extern fixed_t offsetms;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* Register callback functions for the main loop code to use. */
 
+void d_register_loop_callbacks(loop_interface_t *i);
+
+/* Create any new ticcmds and broadcast to other players. */
+
+void net_update(void);
+
+/* ? how many ticks to run? */
+
+void try_run_tics(void);
+
+/* Called at start of game loop to initialize timers */
+
+void d_start_game_loop(void);
+
+/* Initialize networking code and connect to server. */
+
+boolean d_init_net_game(net_connect_data_t *connect_data);
+
+/* Start game with specified settings. The structure will be updated
+ * with the actual settings for the game.
+ */
+
+void d_start_net_game(net_gamesettings_t *settings,
+                    netgame_startup_callback_t callback);
+
+/* Check if it is permitted to record a demo with a non-vanilla feature. */
+
+boolean d_non_vanilla_record(boolean conditional, const char *feature);
+
+/* Check if it is permitted to play back a demo with a non-vanilla feature. */
+
+boolean d_non_vanilla_playback(boolean conditional, int lumpnum,
+                             const char *feature);
+
+void d_receive_tic(ticcmd_t *ticcmds, boolean *playeringame);
+
+#endif /* __D_LOOP__ */
diff --git a/games/NXDoom/src/d_mode.c b/games/NXDoom/src/d_mode.c
index 95f6bb182..6c4891cc1 100644
--- a/games/NXDoom/src/d_mode.c
+++ b/games/NXDoom/src/d_mode.c
@@ -1,233 +1,247 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:
-//   Functions and definitions relating to the game type and operational
-//   mode.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_mode.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Functions and definitions relating to the game type and operational
+ *   mode.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "doomtype.h"
 #include "d_mode.h"
+#include "doomtype.h"
 
-// Valid game mode/mission combinations, with the number of
-// episodes/maps for each.
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-static struct
+/* Valid game mode/mission combinations, with the number of
+ * episodes/maps for each.
+ */
+
+struct modemission
 {
-    GameMission_t mission;
-    GameMode_t mode;
-    int episode;
-    int map;
-} valid_modes[] = {
-    { pack_chex, retail,     1, 5 },
-    { doom,      shareware,  1, 9 },
-    { doom,      registered, 3, 9 },
-    { doom,      retail,     4, 9 },
-    { doom2,     commercial, 1, 32 },
-    { pack_tnt,  commercial, 1, 32 },
-    { pack_plut, commercial, 1, 32 },
-    { pack_hacx, commercial, 1, 32 },
-    { heretic,   shareware,  1, 9 },
-    { heretic,   registered, 3, 9 },
-    { heretic,   retail,     5, 9 },
-    { hexen,     commercial, 1, 60 },
-    { strife,    commercial, 1, 34 },
+  gamemission_t mission;
+  game_mode_t mode;
+  int episode;
+  int map;
 };
 
-// Check that a gamemode+gamemission received over the network is valid.
-
-boolean D_ValidGameMode(GameMission_t mission, GameMode_t mode)
+struct gameversion
 {
-    int i;
-
-    for (i=0; i<arrlen(valid_modes); ++i)
-    {
-        if (valid_modes[i].mode == mode && valid_modes[i].mission == mission)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-boolean D_ValidEpisodeMap(GameMission_t mission, GameMode_t mode,
-                          int episode, int map)
-{
-    int i;
-
-    // Hacks for Heretic secret episodes
-
-    if (mission == heretic)
-    {
-        if (mode == retail && episode == 6)
-        {
-            return map >= 1 && map <= 3;
-        }
-        else if (mode == registered && episode == 4)
-        {
-            return map == 1;
-        }
-    }
-
-    // Find the table entry for this mission/mode combination.
-
-    for (i=0; i<arrlen(valid_modes); ++i) 
-    {
-        if (mission == valid_modes[i].mission
-         && mode == valid_modes[i].mode)
-        {
-            return episode >= 1 && episode <= valid_modes[i].episode
-                && map >= 1 && map <= valid_modes[i].map;
-        }
-    }
-
-    // Unknown mode/mission combination
-
-    return false;
-}
-
-// Get the number of valid episodes for the specified mission/mode.
-
-int D_GetNumEpisodes(GameMission_t mission, GameMode_t mode)
-{
-    int episode;
-
-    episode = 1;
-
-    while (D_ValidEpisodeMap(mission, mode, episode, 1))
-    {
-        ++episode;
-    }
-
-    return episode - 1;
-}
-
-// Table of valid versions
-
-static struct {
-    GameMission_t mission;
-    GameVersion_t version;
-} valid_versions[] = {
-    { doom,     exe_doom_1_2 },
-    { doom,     exe_doom_1_5 },
-    { doom,     exe_doom_1_666 },
-    { doom,     exe_doom_1_7 },
-    { doom,     exe_doom_1_8 },
-    { doom,     exe_doom_1_9 },
-    { doom,     exe_hacx },
-    { doom,     exe_ultimate },
-    { doom,     exe_final },
-    { doom,     exe_final2 },
-    { doom,     exe_chex },
-    { heretic,  exe_heretic_1_3 },
-    { hexen,    exe_hexen_1_1 },
-    { hexen,    exe_hexen_1_1r2 },
-    { strife,   exe_strife_1_2 },
-    { strife,   exe_strife_1_31 },
+  gamemission_t mission;
+  game_version_t version;
 };
 
-boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version)
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct modemission g_valid_modes[] =
 {
-    int i;
+  {.mission = doom, .mode = shareware, .episode = 1, .map = 9},
+  {.mission = doom, .mode = registered, .episode = 3, .map = 9},
+  {.mission = doom, .mode = retail, .episode = 4, .map = 9},
+  {.mission = doom2, .mode = commercial, .episode = 1, .map = 32},
+};
 
-    // All Doom variants can use the Doom versions.
+/* Table of valid versions */
 
-    if (mission == doom2 || mission == pack_plut || mission == pack_tnt
-     || mission == pack_hacx || mission == pack_chex)
+static struct gameversion g_valid_versions[] =
+{
+  {.mission = doom, .version = exe_doom_1_2},
+  {.mission = doom, .version = exe_doom_1_5},
+  {.mission = doom, .version = exe_doom_1_666},
+  {.mission = doom, .version = exe_doom_1_7},
+  {.mission = doom, .version = exe_doom_1_8},
+  {.mission = doom, .version = exe_doom_1_9},
+  {.mission = doom, .version = exe_hacx},
+  {.mission = doom, .version = exe_ultimate},
+  {.mission = doom, .version = exe_final},
+  {.mission = doom, .version = exe_final2},
+  {.mission = doom, .version = exe_chex},
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Check that a gamemode + gamemission received over the network is valid. */
+
+boolean d_valid_game_mode(gamemission_t mission, game_mode_t mode)
+{
+  int i;
+
+  for (i = 0; i < arrlen(g_valid_modes); ++i)
     {
-        mission = doom;
-    }
-
-    for (i=0; i<arrlen(valid_versions); ++i) 
-    {
-        if (valid_versions[i].mission == mission 
-         && valid_versions[i].version == version)
+      if (g_valid_modes[i].mode == mode &&
+          g_valid_modes[i].mission == mission)
         {
-            return true;
+          return true;
         }
     }
 
-    return false;
+  return false;
 }
 
-// Does this mission type use ExMy form, rather than MAPxy form?
-
-boolean D_IsEpisodeMap(GameMission_t mission)
+boolean d_valid_episode_map(gamemission_t mission, game_mode_t mode,
+                            int episode, int map)
 {
-    switch (mission)
-    {
-        case doom:
-        case heretic:
-        case pack_chex:
-            return true;
+  int i;
 
-        case none:
-        case hexen:
-        case doom2:
-        case pack_hacx:
-        case pack_tnt:
-        case pack_plut:
-        case strife:
-        default:
-            return false;
+  /* Hacks for Heretic secret episodes */
+
+  if (mission == heretic)
+    {
+      if (mode == retail && episode == 6)
+        {
+          return map >= 1 && map <= 3;
+        }
+      else if (mode == registered && episode == 4)
+        {
+          return map == 1;
+        }
+    }
+
+  /* Find the table entry for this mission/mode combination. */
+
+  for (i = 0; i < arrlen(g_valid_modes); ++i)
+    {
+      if (mission == g_valid_modes[i].mission &&
+          mode == g_valid_modes[i].mode)
+        {
+          return episode >= 1 && episode <= g_valid_modes[i].episode &&
+                 map >= 1 && map <= g_valid_modes[i].map;
+        }
+    }
+
+  /* Unknown mode/mission combination */
+
+  return false;
+}
+
+/* Get the number of valid episodes for the specified mission/mode. */
+
+int d_get_num_episodes(gamemission_t mission, game_mode_t mode)
+{
+  int episode;
+
+  episode = 1;
+
+  while (d_valid_episode_map(mission, mode, episode, 1))
+    {
+      ++episode;
+    }
+
+  return episode - 1;
+}
+
+boolean d_valid_game_version(gamemission_t mission, game_version_t version)
+{
+  int i;
+
+  /* All Doom variants can use the Doom versions. */
+
+  if (mission == doom2 || mission == pack_plut || mission == pack_tnt ||
+      mission == pack_hacx || mission == pack_chex)
+    {
+      mission = doom;
+    }
+
+  for (i = 0; i < arrlen(g_valid_versions); ++i)
+    {
+      if (g_valid_versions[i].mission == mission &&
+          g_valid_versions[i].version == version)
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
+/* Does this mission type use ExMy form, rather than MAPxy form? */
+
+boolean d_is_episode_map(gamemission_t mission)
+{
+  switch (mission)
+    {
+    case doom:
+    case heretic:
+    case pack_chex:
+      return true;
+
+    case none:
+    case hexen:
+    case doom2:
+    case pack_hacx:
+    case pack_tnt:
+    case pack_plut:
+    case strife:
+    default:
+      return false;
     }
 }
 
-const char *D_GameMissionString(GameMission_t mission)
+const char *d_game_mission_string(gamemission_t mission)
 {
-    switch (mission)
+  switch (mission)
     {
-        case none:
-        default:
-            return "none";
-        case doom:
-            return "doom";
-        case doom2:
-            return "doom2";
-        case pack_tnt:
-            return "tnt";
-        case pack_plut:
-            return "plutonia";
-        case pack_hacx:
-            return "hacx";
-        case pack_chex:
-            return "chex";
-        case heretic:
-            return "heretic";
-        case hexen:
-            return "hexen";
-        case strife:
-            return "strife";
+    case none:
+    default:
+      return "none";
+    case doom:
+      return "doom";
+    case doom2:
+      return "doom2";
+    case pack_tnt:
+      return "tnt";
+    case pack_plut:
+      return "plutonia";
+    case pack_hacx:
+      return "hacx";
+    case pack_chex:
+      return "chex";
+    case heretic:
+      return "heretic";
+    case hexen:
+      return "hexen";
+    case strife:
+      return "strife";
     }
 }
 
-const char *D_GameModeString(GameMode_t mode)
+const char *d_game_mode_string(game_mode_t mode)
 {
-    switch (mode)
+  switch (mode)
     {
-        case shareware:
-            return "shareware";
-        case registered:
-            return "registered";
-        case commercial:
-            return "commercial";
-        case retail:
-            return "retail";
-        case indetermined:
-        default:
-            return "unknown";
+    case shareware:
+      return "shareware";
+    case registered:
+      return "registered";
+    case commercial:
+      return "commercial";
+    case retail:
+      return "retail";
+    case indetermined:
+    default:
+      return "unknown";
     }
 }
-
diff --git a/games/NXDoom/src/d_mode.h b/games/NXDoom/src/d_mode.h
index 138d58835..26c282753 100644
--- a/games/NXDoom/src/d_mode.h
+++ b/games/NXDoom/src/d_mode.h
@@ -1,112 +1,126 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Functions and definitions relating to the game type and operational
-//   mode.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/d_mode.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Functions and definitions relating to the game type and operational
+ *   mode.
+ *
+ ****************************************************************************/
 
 #ifndef __D_MODE__
 #define __D_MODE__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-// The "mission" controls what game we are playing.
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* The "mission" controls what game we are playing. */
 
 typedef enum
 {
-    doom,            // Doom 1
-    doom2,           // Doom 2
-    pack_tnt,        // Final Doom: TNT: Evilution
-    pack_plut,       // Final Doom: The Plutonia Experiment
-    pack_chex,       // Chex Quest (modded doom)
-    pack_hacx,       // Hacx (modded doom2)
-    heretic,         // Heretic
-    hexen,           // Hexen
-    strife,          // Strife
-    doom2f,          // Doom 2: L'Enfer sur Terre
+  doom,      /* Doom 1 */
+  doom2,     /* Doom 2 */
+  pack_tnt,  /* Final Doom: TNT: Evilution */
+  pack_plut, /* Final Doom: The Plutonia Experiment */
+  pack_chex, /* Chex Quest (modded doom) */
+  pack_hacx, /* Hacx (modded doom2) */
+  heretic,   /* Heretic */
+  hexen,     /* Hexen */
+  strife,    /* Strife */
+  doom2f,    /* Doom 2: L'Enfer sur Terre */
+  none
+} gamemission_t;
 
-    none
-} GameMission_t;
-
-// The "mode" allows more accurate specification of the game mode we are
-// in: eg. shareware vs. registered.  So doom1.wad and doom.wad are the
-// same mission, but a different mode.
+/* The "mode" allows more accurate specification of the game mode we are
+ * in: eg. shareware vs. registered.  So doom1.wad and doom.wad are the
+ * same mission, but a different mode.
+ */
 
 typedef enum
 {
-    shareware,       // Doom/Heretic shareware
-    registered,      // Doom/Heretic registered
-    commercial,      // Doom II/Hexen
-    retail,          // Ultimate Doom
-    indetermined     // Unknown.
-} GameMode_t;
+  shareware,   /* Doom/Heretic shareware */
+  registered,  /* Doom/Heretic registered */
+  commercial,  /* Doom II/Hexen */
+  retail,      /* Ultimate Doom */
+  indetermined /* Unknown. */
+} game_mode_t;
 
-// What version are we emulating?
+/* What version are we emulating? */
 
 typedef enum
 {
-    exe_doom_1_2,    // Doom 1.2: shareware and registered
-    exe_doom_1_5,    // Doom 1.5: "
-    exe_doom_1_666,  // Doom 1.666: for shareware, registered and commercial
-    exe_doom_1_7,    // Doom 1.7/1.7a: "
-    exe_doom_1_8,    // Doom 1.8: "
-    exe_doom_1_9,    // Doom 1.9: "
-    exe_hacx,        // Hacx
-    exe_ultimate,    // Ultimate Doom (retail)
-    exe_final,       // Final Doom
-    exe_final2,      // Final Doom (alternate exe)
-    exe_chex,        // Chex Quest executable (based on Final Doom)
+  exe_doom_1_2,    /* Doom 1.2: shareware and registered */
+  exe_doom_1_5,    /* Doom 1.5: " */
+  exe_doom_1_666,  /* Doom 1.666: for shareware, registered and commercial */
+  exe_doom_1_7,    /* Doom 1.7/1.7a: " */
+  exe_doom_1_8,    /* Doom 1.8: " */
+  exe_doom_1_9,    /* Doom 1.9: " */
+  exe_hacx,        /* Hacx */
+  exe_ultimate,    /* Ultimate Doom (retail) */
+  exe_final,       /* Final Doom */
+  exe_final2,      /* Final Doom (alternate exe) */
+  exe_chex,        /* Chex Quest executable (based on Final Doom) */
+  exe_heretic_1_3, /* Heretic 1.3 */
+  exe_hexen_1_1,   /* Hexen 1.1 */
+  exe_hexen_1_1r2, /* Hexen 1.1 (alternate exe) */
+  exe_strife_1_2,  /* Strife v1.2 */
+  exe_strife_1_31  /* Strife v1.31 */
+} game_version_t;
 
-    exe_heretic_1_3, // Heretic 1.3
-
-    exe_hexen_1_1,   // Hexen 1.1
-    exe_hexen_1_1r2, // Hexen 1.1 (alternate exe)
-    exe_strife_1_2,  // Strife v1.2
-    exe_strife_1_31  // Strife v1.31
-} GameVersion_t;
-
-// What IWAD variant are we using?
+/* What IWAD variant are we using? */
 
 typedef enum
 {
-    vanilla,    // Vanilla Doom
-    freedoom,   // FreeDoom: Phase 1 + 2
-    freedm,     // FreeDM
-    bfgedition, // Doom Classic (Doom 3: BFG Edition)
-} GameVariant_t;
+  vanilla,    /* Vanilla Doom */
+  freedoom,   /* FreeDoom: Phase 1 + 2 */
+  freedm,     /* FreeDM */
+  bfgedition, /* Doom Classic (Doom 3: BFG Edition) */
+} game_variant_t;
 
-// Skill level.
+/* Skill level. */
 
 typedef enum
 {
-    sk_noitems = -1,        // the "-skill 0" hack
-    sk_baby = 0,
-    sk_easy,
-    sk_medium,
-    sk_hard,
-    sk_nightmare
+  sk_noitems = -1, /* the "-skill 0" hack */
+  sk_baby = 0,
+  sk_easy,
+  sk_medium,
+  sk_hard,
+  sk_nightmare
 } skill_t;
 
-boolean D_ValidGameMode(GameMission_t mission, GameMode_t mode);
-boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version);
-boolean D_ValidEpisodeMap(GameMission_t mission, GameMode_t mode,
-                          int episode, int map);
-int D_GetNumEpisodes(GameMission_t mission, GameMode_t mode);
-boolean D_IsEpisodeMap(GameMission_t mission);
-const char *D_GameMissionString(GameMission_t mission);
-const char *D_GameModeString(GameMode_t mode);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef __D_MODE__ */
+boolean d_valid_game_mode(gamemission_t mission, game_mode_t mode);
+boolean d_valid_game_version(gamemission_t mission, game_version_t version);
+boolean d_valid_episode_map(gamemission_t mission, game_mode_t mode,
+                            int episode, int map);
+int d_get_num_episodes(gamemission_t mission, game_mode_t mode);
+boolean d_is_episode_map(gamemission_t mission);
+const char *d_game_mission_string(gamemission_t mission);
+const char *d_game_mode_string(game_mode_t mode);
 
+#endif /* __D_MODE__ */
diff --git a/games/NXDoom/src/d_ticcmd.h b/games/NXDoom/src/d_ticcmd.h
index daf0da318..c67340727 100644
--- a/games/NXDoom/src/d_ticcmd.h
+++ b/games/NXDoom/src/d_ticcmd.h
@@ -1,56 +1,69 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/d_ticcmd.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __D_TICCMD__
 #define __D_TICCMD__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-// The data sampled per tick (single player)
-// and transmitted to other peers (multiplayer).
-// Mainly movements/button commands per game tick,
-// plus a checksum for internal state consistency.
+/* The data sampled per tick (single player)
+ * and transmitted to other peers (multiplayer).
+ * Mainly movements/button commands per game tick,
+ * plus a checksum for internal state consistency.
+ */
 
 typedef struct
 {
-    signed char	forwardmove;	// *2048 for move
-    signed char	sidemove;	// *2048 for move
-    short angleturn;            // <<16 for angle delta
-    byte chatchar;
-    byte buttons;
-    // villsa [STRIFE] according to the asm,
-    // consistancy is a short, not a byte
-    byte consistancy;           // checks for net game
+  signed char forwardmove; /* *2048 for move */
+  signed char sidemove;    /* *2048 for move */
+  short angleturn;         /* <<16 for angle delta */
+  byte chatchar;
+  byte buttons;
 
-    // villsa - Strife specific:
+  /* villsa [STRIFE] according to the asm,
+   * consistency is a short, not a byte
+   */
 
-    byte buttons2;
-    int inventory;
-   
-    // Heretic/Hexen specific:
+  byte consistency; /* checks for net game */
 
-    byte lookfly;               // look/fly up/down/centering
-    byte arti;                  // artitype_t to use
+  /* villsa - Strife specific: */
+
+  byte buttons2;
+  int inventory;
+
+  /* Heretic/Hexen specific: */
+
+  byte lookfly; /* look/fly up/down/centering */
+  byte arti;    /* artitype_t to use */
 } ticcmd_t;
 
-
-
-#endif
+#endif /* __D_TICCMD__ */
diff --git a/games/NXDoom/src/deh_defs.h b/games/NXDoom/src/deh_defs.h
index 58b61e7cc..f4f5c1ea4 100644
--- a/games/NXDoom/src/deh_defs.h
+++ b/games/NXDoom/src/deh_defs.h
@@ -1,85 +1,120 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Definitions for use in the dehacked code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_defs.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Definitions for use in the dehacked code
+ *
+ ****************************************************************************/
 
 #ifndef DEH_DEFS_H
 #define DEH_DEFS_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "sha1.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef struct deh_context_s deh_context_t;
 typedef struct deh_section_s deh_section_t;
 typedef void (*deh_section_init_t)(void);
 typedef void *(*deh_section_start_t)(deh_context_t *context, char *line);
 typedef void (*deh_section_end_t)(deh_context_t *context, void *tag);
-typedef void (*deh_line_parser_t)(deh_context_t *context, char *line, void *tag);
-typedef void (*deh_sha1_hash_t)(sha1_context_t *context);
+typedef void (*deh_line_parser_t)(deh_context_t *context, char *line,
+                                  void *tag);
+typedef void (*deh_sha1_hash_t)(SHA1_CTX *context);
 
 struct deh_section_s
 {
-    const char *name;
+  const char *name;
 
-    // Called on startup to initialize code
+  /* Called on startup to initialize code */
 
-    deh_section_init_t init;
-    
-    // This is called when a new section is started.  The pointer
-    // returned is used as a tag for the following calls.
+  deh_section_init_t init;
 
-    deh_section_start_t start;
+  /* This is called when a new section is started.  The pointer
+   * returned is used as a tag for the following calls.
+   */
 
-    // This is called for each line in the section
+  deh_section_start_t start;
 
-    deh_line_parser_t line_parser;
+  /* This is called for each line in the section */
 
-    // This is called at the end of the section for any cleanup
+  deh_line_parser_t line_parser;
 
-    deh_section_end_t end;
+  /* This is called at the end of the section for any cleanup */
 
-    // Called when generating an SHA1 sum of the dehacked state
+  deh_section_end_t end;
 
-    deh_sha1_hash_t sha1_hash;
+  /* Called when generating an SHA1 sum of the dehacked state */
+
+  deh_sha1_hash_t sha1_hash;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern deh_section_t *deh_section_types[];
 extern const char *deh_signatures[];
 
-// deh_ammo.c:
+/* deh_ammo.c: */
+
 extern deh_section_t deh_section_ammo;
-// deh_cheat.c:
+
+/* deh_cheat.c: */
+
 extern deh_section_t deh_section_cheat;
-// deh_frame.c:
+
+/* deh_frame.c: */
+
 extern deh_section_t deh_section_frame;
-// deh_misc.c:
+
+/* deh_misc.c: */
+
 extern deh_section_t deh_section_misc;
-// deh_ptr.c:
+
+/* deh_ptr.c: */
+
 extern deh_section_t deh_section_pointer;
-// deh_sound.c
+
+/* deh_sound.c */
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 extern deh_section_t deh_section_sound;
-// deh_text.c:
+#endif
+
+/* deh_text.c: */
+
 extern deh_section_t deh_section_text;
-// deh_thing.c:
+
+/* deh_thing.c: */
+
 extern deh_section_t deh_section_thing;
-// deh_weapon.c:
+
+/* deh_weapon.c: */
+
 extern deh_section_t deh_section_weapon;
-// deh_bexstr.c:
+
+/* deh_bexstr.c: */
+
 extern deh_section_t deh_section_bexstr;
 
-
-#endif /* #ifndef DEH_DEFS_H */
-
-
+#endif /* DEH_DEFS_H */
diff --git a/games/NXDoom/src/deh_io.c b/games/NXDoom/src/deh_io.c
index b276a28c4..fa1102bb5 100644
--- a/games/NXDoom/src/deh_io.c
+++ b/games/NXDoom/src/deh_io.c
@@ -1,25 +1,34 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dehacked I/O code (does all reads from dehacked files)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_io.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Dehacked I/O code (does all reads from dehacked files)
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "m_misc.h"
 #include "w_wad.h"
@@ -28,330 +37,356 @@
 #include "deh_defs.h"
 #include "deh_io.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef enum
 {
-    DEH_INPUT_FILE,
-    DEH_INPUT_LUMP
+  DEH_INPUT_FILE,
+  DEH_INPUT_LUMP
 } deh_input_type_t;
 
 struct deh_context_s
 {
-    deh_input_type_t type;
-    char *filename;
+  deh_input_type_t type;
+  char *filename;
 
-    // If the input comes from a memory buffer, pointer to the memory
-    // buffer.
-    unsigned char *input_buffer;
-    size_t input_buffer_len;
-    unsigned int input_buffer_pos;
-    int lumpnum;
+  /* If the input comes from a memory buffer, pointer to the memory
+   * buffer.
+   */
 
-    // If the input comes from a file, the file stream for reading
-    // data.
-    FILE *stream;
+  unsigned char *input_buffer;
+  size_t input_buffer_len;
+  unsigned int input_buffer_pos;
+  int lumpnum;
 
-    // Current line number that we have reached:
-    int linenum;
+  /* If the input comes from a file, the file stream for reading
+   * data.
+   */
 
-    // Used by DEH_ReadLine:
-    boolean last_was_newline;
-    char *readbuffer;
-    int readbuffer_size;
+  FILE *stream;
 
-    // Error handling.
-    boolean had_error;
+  /* Current line number that we have reached: */
+
+  int linenum;
+
+  /* Used by deh_read_line: */
+
+  boolean last_was_newline;
+  char *readbuffer;
+  int readbuffer_size;
+
+  /* Error handling. */
+
+  boolean had_error;
 };
 
-static deh_context_t *DEH_NewContext(void)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static deh_context_t *deh_new_context(void)
 {
-    deh_context_t *context;
+  deh_context_t *context;
 
-    context = Z_Malloc(sizeof(*context), PU_STATIC, NULL);
+  context = z_malloc(sizeof(*context), PU_STATIC, NULL);
 
-    // Initial read buffer size of 128 bytes
+  /* Initial read buffer size of 128 bytes */
 
-    context->readbuffer_size = 128;
-    context->readbuffer = Z_Malloc(context->readbuffer_size, PU_STATIC, NULL);
-    context->linenum = 0;
-    context->last_was_newline = true;
+  context->readbuffer_size = 128;
+  context->readbuffer = z_malloc(context->readbuffer_size, PU_STATIC, NULL);
+  context->linenum = 0;
+  context->last_was_newline = true;
 
-    context->had_error = false;
+  context->had_error = false;
 
-    return context;
+  return context;
 }
 
-// Open a dehacked file for reading
-// Returns NULL if open failed
+/* Increase the read buffer size */
 
-deh_context_t *DEH_OpenFile(const char *filename)
+static void increase_read_buffer(deh_context_t *context)
 {
-    FILE *fstream;
-    deh_context_t *context;
+  char *newbuffer;
+  int newbuffer_size;
 
-    fstream = M_fopen(filename, "r");
+  newbuffer_size = context->readbuffer_size * 2;
+  newbuffer = z_malloc(newbuffer_size, PU_STATIC, NULL);
 
-    if (fstream == NULL)
-        return NULL;
+  memcpy(newbuffer, context->readbuffer, context->readbuffer_size);
 
-    context = DEH_NewContext();
+  z_free(context->readbuffer);
 
-    context->type = DEH_INPUT_FILE;
-    context->stream = fstream;
-    context->filename = M_StringDuplicate(filename);
-
-    return context;
+  context->readbuffer = newbuffer;
+  context->readbuffer_size = newbuffer_size;
 }
 
-// Open a WAD lump for reading.
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-deh_context_t *DEH_OpenLump(int lumpnum)
+/* Open a dehacked file for reading
+ * Returns NULL if open failed
+ */
+
+deh_context_t *deh_open_file(const char *filename)
 {
-    deh_context_t *context;
-    void *lump;
+  FILE *fstream;
+  deh_context_t *context;
 
-    lump = W_CacheLumpNum(lumpnum, PU_STATIC);
+  fstream = fopen(filename, "r");
 
-    context = DEH_NewContext();
+  if (fstream == NULL) return NULL;
 
-    context->type = DEH_INPUT_LUMP;
-    context->lumpnum = lumpnum;
-    context->input_buffer = lump;
-    context->input_buffer_len = W_LumpLength(lumpnum);
-    context->input_buffer_pos = 0;
+  context = deh_new_context();
 
-    context->filename = malloc(9);
-    M_StringCopy(context->filename, lumpinfo[lumpnum]->name, 9);
+  context->type = DEH_INPUT_FILE;
+  context->stream = fstream;
+  context->filename = m_string_duplicate(filename);
 
-    return context;
+  return context;
 }
 
-// Close dehacked file
+/* Open a WAD lump for reading. */
 
-void DEH_CloseFile(deh_context_t *context)
+deh_context_t *deh_open_lump(int lumpnum)
 {
-    if (context->type == DEH_INPUT_FILE)
+  deh_context_t *context;
+  void *lump;
+
+  lump = w_cache_lump_num(lumpnum, PU_STATIC);
+
+  context = deh_new_context();
+
+  context->type = DEH_INPUT_LUMP;
+  context->lumpnum = lumpnum;
+  context->input_buffer = lump;
+  context->input_buffer_len = w_lump_length(lumpnum);
+  context->input_buffer_pos = 0;
+
+  context->filename = malloc(9);
+  m_str_copy(context->filename, lumpinfo[lumpnum]->name, 9);
+
+  return context;
+}
+
+/* Close dehacked file */
+
+void deh_close_file(deh_context_t *context)
+{
+  if (context->type == DEH_INPUT_FILE)
     {
-        fclose(context->stream);
+      fclose(context->stream);
     }
-    else if (context->type == DEH_INPUT_LUMP)
+  else if (context->type == DEH_INPUT_LUMP)
     {
-        W_ReleaseLumpNum(context->lumpnum);
+      w_release_lump_num(context->lumpnum);
     }
 
-    free(context->filename);
-    Z_Free(context->readbuffer);
-    Z_Free(context);
+  free(context->filename);
+  z_free(context->readbuffer);
+  z_free(context);
 }
 
-int DEH_GetCharFile(deh_context_t *context)
+int deh_get_char_file(deh_context_t *context)
 {
-    if (feof(context->stream))
+  if (feof(context->stream))
     {
-        // end of file
+      /* end of file */
 
-        return -1;
+      return -1;
     }
 
-    return fgetc(context->stream);
+  return fgetc(context->stream);
 }
 
-int DEH_GetCharLump(deh_context_t *context)
+int deh_get_char_lump(deh_context_t *context)
 {
-    int result;
+  int result;
 
-    if (context->input_buffer_pos >= context->input_buffer_len)
+  if (context->input_buffer_pos >= context->input_buffer_len)
     {
-        return -1;
+      return -1;
     }
 
-    result = context->input_buffer[context->input_buffer_pos];
-    ++context->input_buffer_pos;
+  result = context->input_buffer[context->input_buffer_pos];
+  ++context->input_buffer_pos;
 
-    return result;
+  return result;
 }
 
-// Reads a single character from a dehacked file
+/* Reads a single character from a dehacked file */
 
-int DEH_GetChar(deh_context_t *context)
+int deh_get_char(deh_context_t *context)
 {
-    int result = 0;
-    boolean last_was_cr = false;
+  int result = 0;
+  boolean last_was_cr = false;
 
-    // Track the current line number
+  /* Track the current line number */
 
-    if (context->last_was_newline)
+  if (context->last_was_newline)
     {
-        ++context->linenum;
+      ++context->linenum;
     }
 
-    // Read characters, converting CRLF to LF
+  /* Read characters, converting CRLF to LF */
 
-    do
+  do
     {
-        switch (context->type)
+      switch (context->type)
         {
+        case DEH_INPUT_FILE:
+          result = deh_get_char_file(context);
+          break;
+
+        case DEH_INPUT_LUMP:
+          result = deh_get_char_lump(context);
+          break;
+        }
+
+      /* Handle \r characters not paired with \n */
+
+      if (last_was_cr && result != '\n')
+        {
+          switch (context->type)
+            {
             case DEH_INPUT_FILE:
-                result = DEH_GetCharFile(context);
-                break;
+              ungetc(result, context->stream);
+              break;
 
             case DEH_INPUT_LUMP:
-                result = DEH_GetCharLump(context);
-                break;
-        }
-
-        // Handle \r characters not paired with \n
-        if (last_was_cr && result != '\n')
-        {
-            switch (context->type)
-            {
-                case DEH_INPUT_FILE:
-                    ungetc(result, context->stream);
-                    break;
-
-                case DEH_INPUT_LUMP:
-                    --context->input_buffer_pos;
-                    break;
+              --context->input_buffer_pos;
+              break;
             }
 
-            return '\r';
+          return '\r';
         }
 
-        last_was_cr = result == '\r';
+      last_was_cr = result == '\r';
+    }
+  while (last_was_cr);
 
-    } while (last_was_cr);
+  context->last_was_newline = result == '\n';
 
-    context->last_was_newline = result == '\n';
-
-    return result;
+  return result;
 }
 
-// Increase the read buffer size
+/* Read a whole line */
 
-static void IncreaseReadBuffer(deh_context_t *context)
+char *deh_read_line(deh_context_t *context, boolean extended)
 {
-    char *newbuffer;
-    int newbuffer_size;
+  int c;
+  int pos;
+  boolean escaped = false;
 
-    newbuffer_size = context->readbuffer_size * 2;
-    newbuffer = Z_Malloc(newbuffer_size, PU_STATIC, NULL);
-
-    memcpy(newbuffer, context->readbuffer, context->readbuffer_size);
-
-    Z_Free(context->readbuffer);
-
-    context->readbuffer = newbuffer;
-    context->readbuffer_size = newbuffer_size;
-}
-
-// Read a whole line
-
-char *DEH_ReadLine(deh_context_t *context, boolean extended)
-{
-    int c;
-    int pos;
-    boolean escaped = false;
-
-    for (pos = 0;;)
+  for (pos = 0; ; )
     {
-        c = DEH_GetChar(context);
+      c = deh_get_char(context);
 
-        if (c < 0 && pos == 0)
+      if (c < 0 && pos == 0)
         {
-            // end of file
+          /* end of file */
 
-            return NULL;
+          return NULL;
         }
 
-        // cope with lines of any length: increase the buffer size
+      /* cope with lines of any length: increase the buffer size */
 
-        if (pos >= context->readbuffer_size)
+      if (pos >= context->readbuffer_size)
         {
-            IncreaseReadBuffer(context);
+          increase_read_buffer(context);
         }
 
-        // extended string support
-        if (extended && c == '\\')
-        {
-            c = DEH_GetChar(context);
+      /* extended string support */
 
-            // "\n" in the middle of a string indicates an internal linefeed
-            if (c == 'n')
+      if (extended && c == '\\')
+        {
+          c = deh_get_char(context);
+
+          /* "\n" in the middle of a string indicates an internal linefeed */
+
+          if (c == 'n')
             {
-                context->readbuffer[pos] = '\n';
-                ++pos;
-                continue;
+              context->readbuffer[pos] = '\n';
+              ++pos;
+              continue;
             }
 
-            // values to be assigned may be split onto multiple lines by ending
-            // each line that is to be continued with a backslash
-            if (c == '\n')
+          /* values to be assigned may be split onto multiple lines by ending
+           * each line that is to be continued with a backslash
+           */
+
+          if (c == '\n')
             {
-                escaped = true;
-                continue;
+              escaped = true;
+              continue;
             }
         }
 
-        // blanks before the backslash are included in the string
-        // but indentation after the linefeed is not
-        if (escaped && c >= 0 && isspace(c) && c != '\n')
+      /* blanks before the backslash are included in the string
+       * but indentation after the linefeed is not
+       */
+
+      if (escaped && c >= 0 && isspace(c) && c != '\n')
         {
-            continue;
+          continue;
         }
-        else
+      else
         {
-            escaped = false;
+          escaped = false;
         }
 
-        if (c == '\n' || c < 0)
+      if (c == '\n' || c < 0)
         {
-            // end of line: a full line has been read
+          /* end of line: a full line has been read */
 
-            context->readbuffer[pos] = '\0';
-            break;
+          context->readbuffer[pos] = '\0';
+          break;
         }
-        else if (c != '\0')
+      else if (c != '\0')
         {
-            // normal character; don't allow NUL characters to be
-            // added.
+          /* normal character; don't allow NUL characters to be
+           * added.
+           */
 
-            context->readbuffer[pos] = (char) c;
-            ++pos;
+          context->readbuffer[pos] = (char)c;
+          ++pos;
         }
     }
-    
-    return context->readbuffer;
+
+  return context->readbuffer;
 }
 
-void DEH_Warning(deh_context_t *context, const char *msg, ...)
+void deh_warning(deh_context_t *context, const char *msg, ...)
 {
-    va_list args;
+  va_list args;
 
-    va_start(args, msg);
+  va_start(args, msg);
 
-    fprintf(stderr, "%s:%i: warning: ", context->filename, context->linenum);
-    vfprintf(stderr, msg, args);
-    fprintf(stderr, "\n");
+  fprintf(stderr, "%s:%i: warning: ", context->filename, context->linenum);
+  vfprintf(stderr, msg, args);
+  fprintf(stderr, "\n");
 
-    va_end(args);
+  va_end(args);
 }
 
-void DEH_Error(deh_context_t *context, const char *msg, ...)
+void deh_error(deh_context_t *context, const char *msg, ...)
 {
-    va_list args;
+  va_list args;
 
-    va_start(args, msg);
+  va_start(args, msg);
 
-    fprintf(stderr, "%s:%i: ", context->filename, context->linenum);
-    vfprintf(stderr, msg, args);
-    fprintf(stderr, "\n");
+  fprintf(stderr, "%s:%i: ", context->filename, context->linenum);
+  vfprintf(stderr, msg, args);
+  fprintf(stderr, "\n");
 
-    va_end(args);
+  va_end(args);
 
-    context->had_error = true;
+  context->had_error = true;
 }
 
-boolean DEH_HadError(deh_context_t *context)
+boolean deh_had_error(deh_context_t *context)
 {
-    return context->had_error;
+  return context->had_error;
 }
-
diff --git a/games/NXDoom/src/deh_io.h b/games/NXDoom/src/deh_io.h
index de6720e61..8ee12b5c0 100644
--- a/games/NXDoom/src/deh_io.h
+++ b/games/NXDoom/src/deh_io.h
@@ -1,33 +1,46 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dehacked I/O code (does all reads from dehacked files)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_io.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Dehacked I/O code (does all reads from dehacked files)
+ *
+ ****************************************************************************/
 
 #ifndef DEH_IO_H
 #define DEH_IO_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "deh_defs.h"
 
-deh_context_t *DEH_OpenFile(const char *filename);
-deh_context_t *DEH_OpenLump(int lumpnum);
-void DEH_CloseFile(deh_context_t *context);
-int DEH_GetChar(deh_context_t *context);
-char *DEH_ReadLine(deh_context_t *context, boolean extended);
-void DEH_Error(deh_context_t *context, const char *msg, ...) PRINTF_ATTR(2, 3);
-void DEH_Warning(deh_context_t *context, const char *msg, ...) PRINTF_ATTR(2, 3);
-boolean DEH_HadError(deh_context_t *context);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef DEH_IO_H */
+deh_context_t *deh_open_file(const char *filename);
+deh_context_t *deh_open_lump(int lumpnum);
+void deh_close_file(deh_context_t *context);
+int deh_get_char(deh_context_t *context);
+char *deh_read_line(deh_context_t *context, boolean extended);
+void deh_error(deh_context_t *context, const char *msg, ...)
+    PRINTF_ATTR(2, 3);
+void deh_warning(deh_context_t *context, const char *msg, ...)
+    PRINTF_ATTR(2, 3);
+boolean deh_had_error(deh_context_t *context);
 
+#endif /* DEH_IO_H */
diff --git a/games/NXDoom/src/deh_main.c b/games/NXDoom/src/deh_main.c
index 3ef8a25c3..f6eb667ac 100644
--- a/games/NXDoom/src/deh_main.c
+++ b/games/NXDoom/src/deh_main.c
@@ -1,29 +1,37 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Main dehacked code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_main.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Main dehacked code
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
+#include "d_iwad.h"
 #include "doomtype.h"
 #include "i_glob.h"
 #include "i_system.h"
-#include "d_iwad.h"
 #include "m_argv.h"
 #include "w_wad.h"
 
@@ -31,489 +39,516 @@
 #include "deh_io.h"
 #include "deh_main.h"
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
 static boolean deh_initialized = false;
 
-// If true, we can parse [STRINGS] sections in BEX format.
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* If true, we can parse [STRINGS] sections in BEX format. */
 
 boolean deh_allow_extended_strings = false;
 
-// If true, we can do long string replacements.
+/* If true, we can do long string replacements. */
 
 boolean deh_allow_long_strings = false;
 
-// If true, we can do cheat replacements longer than the originals.
+/* If true, we can do cheat replacements longer than the originals. */
 
 boolean deh_allow_long_cheats = false;
 
-// If false, dehacked cheat replacements are ignored.
+/* If false, dehacked cheat replacements are ignored. */
 
 boolean deh_apply_cheats = true;
 
-void DEH_Checksum(sha1_digest_t digest)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Called on startup to call the Init functions */
+
+static void initialize_sections(void)
 {
-    sha1_context_t sha1_context;
-    unsigned int i;
+  unsigned int i;
 
-    SHA1_Init(&sha1_context);
-
-    for (i=0; deh_section_types[i] != NULL; ++i)
+  for (i = 0; deh_section_types[i] != NULL; ++i)
     {
-        if (deh_section_types[i]->sha1_hash != NULL)
+      if (deh_section_types[i]->init != NULL)
         {
-            deh_section_types[i]->sha1_hash(&sha1_context);
-        }
-    }
-
-    SHA1_Final(digest, &sha1_context);
-}
-
-// Called on startup to call the Init functions
-
-static void InitializeSections(void)
-{
-    unsigned int i;
-
-    for (i=0; deh_section_types[i] != NULL; ++i)
-    {
-        if (deh_section_types[i]->init != NULL)
-        {
-            deh_section_types[i]->init();
+          deh_section_types[i]->init();
         }
     }
 }
 
-static void DEH_Init(void)
+static void deh_init(void)
 {
-    //!
-    // @category mod
-    //
-    // Ignore cheats in dehacked files.
-    //
+  /* @category mod
+   *
+   * Ignore cheats in dehacked files.
+   */
 
-    if (M_CheckParm("-nocheats") > 0) 
+  if (m_check_parm("-nocheats") > 0)
     {
-	deh_apply_cheats = false;
+      deh_apply_cheats = false;
     }
 
-    // Call init functions for all the section definitions.
-    InitializeSections();
+  /* Call init functions for all the section definitions. */
 
-    deh_initialized = true;
+  initialize_sections();
+
+  deh_initialized = true;
 }
 
-// Given a section name, get the section structure which corresponds
+/* Given a section name, get the section structure which corresponds */
 
-static deh_section_t *GetSectionByName(char *name)
+static deh_section_t *get_section_by_name(char *name)
 {
-    unsigned int i;
+  unsigned int i;
 
-    // we explicitely do not recognize [STRINGS] sections at all
-    // if extended strings are not allowed
+  /* we explicitly do not recognize [STRINGS] sections at all
+   * if extended strings are not allowed
+   */
 
-    if (!deh_allow_extended_strings && !strncasecmp("[STRINGS]", name, 9))
+  if (!deh_allow_extended_strings && !strncasecmp("[STRINGS]", name, 9))
     {
-        return NULL;
+      return NULL;
     }
 
-    for (i=0; deh_section_types[i] != NULL; ++i)
+  for (i = 0; deh_section_types[i] != NULL; ++i)
     {
-        if (!strcasecmp(deh_section_types[i]->name, name))
+      if (!strcasecmp(deh_section_types[i]->name, name))
         {
-            return deh_section_types[i];
+          return deh_section_types[i];
         }
     }
 
-    return NULL;
+  return NULL;
 }
 
-// Is the string passed just whitespace?
+/* Is the string passed just whitespace? */
 
-static boolean IsWhitespace(char *s)
+static boolean is_whitespace(char *s)
 {
-    for (; *s; ++s)
+  for (; *s; ++s)
     {
-        if (!isspace(*s))
-            return false;
+      if (!isspace(*s)) return false;
     }
 
-    return true;
+  return true;
 }
 
-// Strip whitespace from the start and end of a string
+/* Strip whitespace from the start and end of a string */
 
-static char *CleanString(char *s)
+static char *clean_string(char *s)
 {
-    char *strending;
+  char *strending;
 
-    // Leading whitespace
+  /* Leading whitespace */
 
-    while (*s && isspace(*s))
-        ++s;
+  while (*s && isspace(*s))
+    ++s;
 
-    // Trailing whitespace
-   
-    strending = s + strlen(s) - 1;
+  /* Trailing whitespace */
 
-    while (strlen(s) > 0 && isspace(*strending))
+  strending = s + strlen(s) - 1;
+
+  while (strlen(s) > 0 && isspace(*strending))
     {
-        *strending = '\0';
-        --strending;
+      *strending = '\0';
+      --strending;
     }
 
-    return s;
+  return s;
 }
 
-// This pattern is used a lot of times in different sections, 
-// an assignment is essentially just a statement of the form:
-//
-// Variable Name = Value
-//
-// The variable name can include spaces or any other characters.
-// The string is split on the '=', essentially.
-//
-// Returns true if read correctly
-
-boolean DEH_ParseAssignment(char *line, char **variable_name, char **value)
+static boolean check_signatures(deh_context_t *context)
 {
-    char *p;
+  size_t i;
+  char *line;
 
-    // find the equals
-    
-    p = strchr(line, '=');
+  /* Read the first line */
 
-    if (p == NULL)
+  line = deh_read_line(context, false);
+
+  if (line == NULL)
     {
-        return false;
+      return false;
     }
 
-    // variable name at the start
-    // turn the '=' into a \0 to terminate the string here
+  /* Check all signatures to see if one matches */
 
-    *p = '\0';
-    *variable_name = CleanString(line);
-    
-    // value immediately follows the '='
-    
-    *value = CleanString(p+1);
-    
-    return true;
-}
-
-static boolean CheckSignatures(deh_context_t *context)
-{
-    size_t i;
-    char *line;
-    
-    // Read the first line
-
-    line = DEH_ReadLine(context, false);
-
-    if (line == NULL)
+  for (i = 0; deh_signatures[i] != NULL; ++i)
     {
-        return false;
-    }
-
-    // Check all signatures to see if one matches
-
-    for (i=0; deh_signatures[i] != NULL; ++i)
-    {
-        if (!strcmp(deh_signatures[i], line))
+      if (!strcmp(deh_signatures[i], line))
         {
-            return true;
+          return true;
         }
     }
 
-    return false;
+  return false;
 }
 
-// Parses a comment string in a dehacked file.
+/* Parses a comment string in a dehacked file. */
 
-static void DEH_ParseComment(char *comment)
+static void deh_parse_comment(char *comment)
 {
-    //
-    // Welcome, to the super-secret Chocolate Doom-specific Dehacked
-    // overrides function.
-    //
-    // Putting these magic comments into your Dehacked lumps will
-    // allow you to go beyond the normal limits of Vanilla Dehacked.
-    // Because of this, these comments are deliberately undocumented,
-    // and if you're using them you should be aware that your mod
-    // is not compatible with Vanilla Doom and you're probably a
-    // very naughty person.
-    //
+  /* Welcome, to the super-secret Chocolate Doom-specific Dehacked
+   * overrides function.
+   *
+   * Putting these magic comments into your Dehacked lumps will
+   * allow you to go beyond the normal limits of Vanilla Dehacked.
+   * Because of this, these comments are deliberately undocumented,
+   * and if you're using them you should be aware that your mod
+   * is not compatible with Vanilla Doom and you're probably a
+   * very naughty person.
+   *
 
-    // Allow comments containing this special value to allow string
-    // replacements longer than those permitted by DOS dehacked.
-    // This allows us to use a dehacked patch for doing string 
-    // replacements for emulating Chex Quest.
-    //
-    // If you use this, your dehacked patch may not work in Vanilla
-    // Doom.
+   * Allow comments containing this special value to allow string
+   * replacements longer than those permitted by DOS dehacked.
+   * This allows us to use a dehacked patch for doing string
+   * replacements for emulating Chex Quest.
+   *
+   * If you use this, your dehacked patch may not work in Vanilla
+   * Doom.
+   */
 
-    if (strstr(comment, "*allow-long-strings*") != NULL)
+  if (strstr(comment, "*allow-long-strings*") != NULL)
     {
-        deh_allow_long_strings = true;
+      deh_allow_long_strings = true;
     }
 
-    // Allow magic comments to allow longer cheat replacements than
-    // those permitted by DOS dehacked.  This is also for Chex
-    // Quest.
+  /* Allow magic comments to allow longer cheat replacements than
+   * those permitted by DOS dehacked.  This is also for Chex
+   * Quest.
+   */
 
-    if (strstr(comment, "*allow-long-cheats*") != NULL)
+  if (strstr(comment, "*allow-long-cheats*") != NULL)
     {
-        deh_allow_long_cheats = true;
+      deh_allow_long_cheats = true;
     }
 
-    // Allow magic comments to allow parsing [STRINGS] section
-    // that are usually only found in BEX format files. This allows
-    // for substitution of map and episode names when loading
-    // Freedoom/FreeDM IWADs.
+  /* Allow magic comments to allow parsing [STRINGS] section
+   * that are usually only found in BEX format files. This allows
+   * for substitution of map and episode names when loading
+   * Freedoom/FreeDM IWADs.
+   */
 
-    if (strstr(comment, "*allow-extended-strings*") != NULL)
+  if (strstr(comment, "*allow-extended-strings*") != NULL)
     {
-        deh_allow_extended_strings = true;
+      deh_allow_extended_strings = true;
     }
 }
 
-// Parses a dehacked file by reading from the context
+/* Parses a dehacked file by reading from the context */
 
-static void DEH_ParseContext(deh_context_t *context)
+static void deh_parse_context(deh_context_t *context)
 {
-    deh_section_t *current_section = NULL;
-    char section_name[20];
-    void *tag = NULL;
-    boolean extended;
-    char *line;
+  deh_section_t *current_section = NULL;
+  char section_name[20];
+  void *tag = NULL;
+  boolean extended;
+  char *line;
 
-    // Read the header and check it matches the signature
+  /* Read the header and check it matches the signature */
 
-    if (!CheckSignatures(context))
+  if (!check_signatures(context))
     {
-        DEH_Error(context, "This is not a valid dehacked patch file!");
+      deh_error(context, "This is not a valid dehacked patch file!");
     }
 
-    // Read the file
+  /* Read the file */
 
-    while (!DEH_HadError(context))
+  while (!deh_had_error(context))
     {
-        // Read the next line. We only allow the special extended parsing
-        // for the BEX [STRINGS] section.
-        extended = current_section != NULL
-                && !strcasecmp(current_section->name, "[STRINGS]");
-        line = DEH_ReadLine(context, extended);
+      /* Read the next line. We only allow the special extended parsing
+       * for the BEX [STRINGS] section.
+       */
 
-        // end of file?
+      extended = current_section != NULL &&
+                 !strcasecmp(current_section->name, "[STRINGS]");
+      line = deh_read_line(context, extended);
 
-        if (line == NULL)
+      /* end of file? */
+
+      if (line == NULL)
         {
-            return;
+          return;
         }
 
-        while (line[0] != '\0' && isspace(line[0]))
-            ++line;
+      while (line[0] != '\0' && isspace(line[0]))
+        ++line;
 
-        if (line[0] == '#')
+      if (line[0] == '#')
         {
-            // comment
+          /* comment */
 
-            DEH_ParseComment(line);
-            continue;
+          deh_parse_comment(line);
+          continue;
         }
 
-        if (IsWhitespace(line))
+      if (is_whitespace(line))
         {
-            if (current_section != NULL)
+          if (current_section != NULL)
             {
-                // end of section
+              /* end of section */
 
-                if (current_section->end != NULL)
+              if (current_section->end != NULL)
                 {
-                    current_section->end(context, tag);
+                  current_section->end(context, tag);
                 }
 
-                //printf("end %s tag\n", current_section->name);
-                current_section = NULL;
+              current_section = NULL;
             }
         }
-        else
+      else
         {
-            if (current_section != NULL)
+          if (current_section != NULL)
             {
-                // parse this line
+              /* parse this line */
 
-                current_section->line_parser(context, line, tag);
+              current_section->line_parser(context, line, tag);
             }
-            else
+          else
             {
-                // possibly the start of a new section
+              /* possibly the start of a new section */
 
-                sscanf(line, "%19s", section_name);
+              sscanf(line, "%19s", section_name);
 
-                current_section = GetSectionByName(section_name);
+              current_section = get_section_by_name(section_name);
 
-                if (current_section != NULL)
+              if (current_section != NULL)
                 {
-                    tag = current_section->start(context, line);
-                    //printf("started %s tag\n", section_name);
+                  tag = current_section->start(context, line);
                 }
-                else
+              else
                 {
-                    //printf("unknown section name %s\n", section_name);
+                  /* printf("unknown section name %s\n", section_name); */
                 }
             }
         }
     }
 }
 
-// Parses a dehacked file
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-int DEH_LoadFile(const char *filename)
+void deh_checksum(sha1_digest_t digest)
 {
-    deh_context_t *context;
-    boolean had_error;
+  SHA1_CTX sha1_context;
+  unsigned int i;
 
-    if (!deh_initialized)
+  sha1init(&sha1_context);
+
+  for (i = 0; deh_section_types[i] != NULL; ++i)
     {
-        DEH_Init();
+      if (deh_section_types[i]->sha1_hash != NULL)
+        {
+          deh_section_types[i]->sha1_hash(&sha1_context);
+        }
     }
 
-    // Before parsing a new file, reset special override flags to false.
-    // Magic comments should only apply to the file in which they were
-    // defined, and shouldn't carry over to subsequent files as well.
-    deh_allow_long_strings = false;
-    deh_allow_long_cheats = false;
-    deh_allow_extended_strings = false;
-
-    printf(" loading %s\n", filename);
-
-    context = DEH_OpenFile(filename);
-
-    if (context == NULL)
-    {
-        fprintf(stderr, "DEH_LoadFile: Unable to open %s\n", filename);
-        return 0;
-    }
-
-    DEH_ParseContext(context);
-
-    had_error = DEH_HadError(context);
-
-    DEH_CloseFile(context);
-
-    if (had_error)
-    {
-        I_Error("Error parsing dehacked file");
-    }
-
-    return 1;
+  sha1final(digest, &sha1_context);
 }
 
-// Load all dehacked patches from the given directory.
-void DEH_AutoLoadPatches(const char *path)
-{
-    const char *filename;
-    glob_t *glob;
+/* This pattern is used a lot of times in different sections,
+ * an assignment is essentially just a statement of the form:
+ *
+ * Variable Name = Value
+ *
+ * The variable name can include spaces or any other characters.
+ * The string is split on the '=', essentially.
+ *
+ * Returns true if read correctly
+ */
 
-    glob = I_StartMultiGlob(path, GLOB_FLAG_NOCASE|GLOB_FLAG_SORTED,
+boolean deh_parse_assignment(char *line, char **variable_name, char **value)
+{
+  char *p;
+
+  /* find the equals */
+
+  p = strchr(line, '=');
+
+  if (p == NULL)
+    {
+      return false;
+    }
+
+  /* variable name at the start
+   * turn the '=' into a \0 to terminate the string here
+   */
+
+  *p = '\0';
+  *variable_name = clean_string(line);
+
+  /* value immediately follows the '=' */
+
+  *value = clean_string(p + 1);
+
+  return true;
+}
+
+/* Parses a dehacked file */
+
+int deh_loadfile(const char *filename)
+{
+  deh_context_t *context;
+  boolean had_error;
+
+  if (!deh_initialized)
+    {
+      deh_init();
+    }
+
+  /* Before parsing a new file, reset special override flags to false.
+   * Magic comments should only apply to the file in which they were
+   * defined, and shouldn't carry over to subsequent files as well.
+   */
+
+  deh_allow_long_strings = false;
+  deh_allow_long_cheats = false;
+  deh_allow_extended_strings = false;
+
+  printf(" loading %s\n", filename);
+
+  context = deh_open_file(filename);
+
+  if (context == NULL)
+    {
+      fprintf(stderr, "deh_loadfile: Unable to open %s\n", filename);
+      return 0;
+    }
+
+  deh_parse_context(context);
+
+  had_error = deh_had_error(context);
+
+  deh_close_file(context);
+
+  if (had_error)
+    {
+      i_error("Error parsing dehacked file");
+    }
+
+  return 1;
+}
+
+/* Load all dehacked patches from the given directory. */
+
+void deh_auto_load_patches(const char *path)
+{
+  const char *filename;
+  glob_t *glob;
+
+  glob = i_start_multi_glob(path, GLOB_FLAG_NOCASE | GLOB_FLAG_SORTED,
                             "*.deh", "*.hhe", "*.seh", NULL);
-    for (;;)
+  for (; ; )
     {
-        filename = I_NextGlob(glob);
-        if (filename == NULL)
+      filename = i_next_glob(glob);
+      if (filename == NULL)
         {
-            break;
+          break;
         }
-        printf(" [autoload]");
-        DEH_LoadFile(filename);
+
+      printf(" [autoload]");
+      deh_loadfile(filename);
     }
 
-    I_EndGlob(glob);
+  i_end_glob(glob);
 }
 
-// Load dehacked file from WAD lump.
-// If allow_long is set, allow long strings and cheats just for this lump.
+/* Load dehacked file from WAD lump.
+ * If allow_long is set, allow long strings and cheats just for this lump.
+ */
 
-int DEH_LoadLump(int lumpnum, boolean allow_long, boolean allow_error)
+int deh_load_lump(int lumpnum, boolean allow_long, boolean allow_error)
 {
-    deh_context_t *context;
-    boolean had_error;
+  deh_context_t *context;
+  boolean had_error;
 
-    if (!deh_initialized)
+  if (!deh_initialized)
     {
-        DEH_Init();
+      deh_init();
     }
 
-    // Reset all special flags to defaults.
-    deh_allow_long_strings = allow_long;
-    deh_allow_long_cheats = allow_long;
-    deh_allow_extended_strings = false;
+  /* Reset all special flags to defaults. */
 
-    context = DEH_OpenLump(lumpnum);
+  deh_allow_long_strings = allow_long;
+  deh_allow_long_cheats = allow_long;
+  deh_allow_extended_strings = false;
 
-    if (context == NULL)
+  context = deh_open_lump(lumpnum);
+
+  if (context == NULL)
     {
-        fprintf(stderr, "DEH_LoadFile: Unable to open lump %i\n", lumpnum);
-        return 0;
+      fprintf(stderr, "deh_loadfile: Unable to open lump %i\n", lumpnum);
+      return 0;
     }
 
-    DEH_ParseContext(context);
+  deh_parse_context(context);
 
-    had_error = DEH_HadError(context);
+  had_error = deh_had_error(context);
 
-    DEH_CloseFile(context);
+  deh_close_file(context);
 
-    // If there was an error while parsing, abort with an error, but allow
-    // errors to just be ignored if allow_error=true.
-    if (!allow_error && had_error)
+  /* If there was an error while parsing, abort with an error, but allow
+   * errors to just be ignored if allow_error=true.
+   */
+
+  if (!allow_error && had_error)
     {
-        I_Error("Error parsing dehacked lump");
+      i_error("Error parsing dehacked lump");
     }
 
-    return 1;
+  return 1;
 }
 
-int DEH_LoadLumpByName(const char *name, boolean allow_long, boolean allow_error)
+int deh_load_lump_by_name(const char *name, boolean allow_long,
+                       boolean allow_error)
 {
-    int lumpnum;
+  int lumpnum;
 
-    lumpnum = W_CheckNumForName(name);
+  lumpnum = w_check_num_for_name(name);
 
-    if (lumpnum == -1)
+  if (lumpnum == -1)
     {
-        fprintf(stderr, "DEH_LoadLumpByName: '%s' lump not found\n", name);
-        return 0;
+      fprintf(stderr, "deh_load_lump_by_name: '%s' lump not found\n", name);
+      return 0;
     }
 
-    return DEH_LoadLump(lumpnum, allow_long, allow_error);
+  return deh_load_lump(lumpnum, allow_long, allow_error);
 }
 
-// Check the command line for -deh argument, and others.
-void DEH_ParseCommandLine(void)
+/* Check the command line for -deh argument, and others. */
+
+void deh_parse_command_line(void)
 {
-    char *filename;
-    int p;
+  char *filename;
+  int p;
 
-    //!
-    // @arg <files>
-    // @category mod
-    //
-    // Load the given dehacked patch(es)
-    //
+  /* @arg <files>
+   * @category mod
+   *
+   * Load the given dehacked patch(es)
+   */
 
-    p = M_CheckParm("-deh");
+  p = m_check_parm("-deh");
 
-    if (p > 0)
+  if (p > 0)
     {
-        ++p;
+      ++p;
 
-        while (p < myargc && myargv[p][0] != '-')
+      while (p < myargc && myargv[p][0] != '-')
         {
-            filename = D_TryFindWADByName(myargv[p]);
-            DEH_LoadFile(filename);
-            free(filename);
-            ++p;
+          filename = d_try_find_wad_by_name(myargv[p]);
+          deh_loadfile(filename);
+          free(filename);
+          ++p;
         }
     }
 }
-
diff --git a/games/NXDoom/src/deh_main.h b/games/NXDoom/src/deh_main.h
index 9ab870402..8ae728243 100644
--- a/games/NXDoom/src/deh_main.h
+++ b/games/NXDoom/src/deh_main.h
@@ -1,48 +1,69 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dehacked entrypoint and common code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_main.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Dehacked entrypoint and common code
+ *
+ ****************************************************************************/
 
 #ifndef DEH_MAIN_H
 #define DEH_MAIN_H
 
-#include "doomtype.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "deh_str.h"
+#include "doomtype.h"
 #include "sha1.h"
 
-// These are the limits that dehacked uses (from dheinit.h in the dehacked
-// source).  If these limits are exceeded, it does not generate an error, but
-// a warning is displayed.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* These are the limits that dehacked uses (from dheinit.h in the dehacked
+ * source). If these limits are exceeded, it does not generate an error, but
+ * a warning is displayed.
+ */
 
 #define DEH_VANILLA_NUMSTATES 966
 #define DEH_VANILLA_NUMSFX 107
 
-void DEH_ParseCommandLine(void);
-int DEH_LoadFile(const char *filename);
-void DEH_AutoLoadPatches(const char *path);
-int DEH_LoadLump(int lumpnum, boolean allow_long, boolean allow_error);
-int DEH_LoadLumpByName(const char *name, boolean allow_long, boolean allow_error);
-
-boolean DEH_ParseAssignment(char *line, char **variable_name, char **value);
-
-void DEH_Checksum(sha1_digest_t digest);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern boolean deh_allow_extended_strings;
 extern boolean deh_allow_long_strings;
 extern boolean deh_allow_long_cheats;
 extern boolean deh_apply_cheats;
 
-#endif /* #ifndef DEH_MAIN_H */
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+void deh_parse_command_line(void);
+int deh_loadfile(const char *filename);
+void deh_auto_load_patches(const char *path);
+int deh_load_lump(int lumpnum, boolean allow_long, boolean allow_error);
+int deh_load_lump_by_name(const char *name, boolean allow_long,
+                          boolean allow_error);
+
+boolean deh_parse_assignment(char *line, char **variable_name, char **value);
+
+void deh_checksum(sha1_digest_t digest);
+
+#endif /* DEH_MAIN_H */
diff --git a/games/NXDoom/src/deh_mapping.c b/games/NXDoom/src/deh_mapping.c
index f96508b9c..17bed2074 100644
--- a/games/NXDoom/src/deh_mapping.c
+++ b/games/NXDoom/src/deh_mapping.c
@@ -1,21 +1,29 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dehacked "mapping" code
-// Allows the fields in structures to be mapped out and accessed by
-// name
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_mapping.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Dehacked "mapping" code
+ * Allows the fields in structures to be mapped out and accessed by
+ * name
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,174 +35,172 @@
 
 #include "deh_mapping.h"
 
-static deh_mapping_entry_t *GetMappingEntryByName(deh_context_t *context,
-                                                  deh_mapping_t *mapping,
-                                                  char *name)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static deh_mapping_entry_t *get_mapping_entry_by_name(deh_context_t *context,
+                                                      deh_mapping_t *mapping,
+                                                      char *name)
 {
-    int i;
+  int i;
 
-    for (i=0; mapping->entries[i].name != NULL; ++i)
+  for (i = 0; mapping->entries[i].name != NULL; ++i)
     {
-        deh_mapping_entry_t *entry = &mapping->entries[i];
+      deh_mapping_entry_t *entry = &mapping->entries[i];
 
-        if (!strcasecmp(entry->name, name))
+      if (!strcasecmp(entry->name, name))
         {
-            if (entry->location == NULL)
+          if (entry->location == NULL)
             {
-                DEH_Warning(context, "Field '%s' is unsupported", name);
-                return NULL;
+              deh_warning(context, "Field '%s' is unsupported", name);
+              return NULL;
             }
 
-            return entry;
+          return entry;
         }
     }
 
-    // Not found.
+  /* Not found. */
 
-    DEH_Warning(context, "Field named '%s' not found", name);
+  deh_warning(context, "Field named '%s' not found", name);
 
-    return NULL;
+  return NULL;
 }
 
-//
-// Get the location of the specified field in the specified structure.
-//
+/* Get the location of the specified field in the specified structure. */
 
-static void *GetStructField(void *structptr,
-                            deh_mapping_t *mapping,
+static void *get_struct_field(void *structptr, deh_mapping_t *mapping,
                             deh_mapping_entry_t *entry)
 {
-    unsigned int offset;
+  unsigned int offset;
 
-    offset = (uint8_t *)entry->location - (uint8_t *)mapping->base;
+  offset = (uint8_t *)entry->location - (uint8_t *)mapping->base;
 
-    return (uint8_t *)structptr + offset;
+  return (uint8_t *)structptr + offset;
 }
 
-//
-// Set the value of a particular field in a structure by name
-//
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-boolean DEH_SetMapping(deh_context_t *context, deh_mapping_t *mapping,
+/* Set the value of a particular field in a structure by name */
+
+boolean deh_set_mapping(deh_context_t *context, deh_mapping_t *mapping,
                        void *structptr, char *name, int value)
 {
-    deh_mapping_entry_t *entry;
-    void *location;
+  deh_mapping_entry_t *entry;
+  void *location;
 
-    entry = GetMappingEntryByName(context, mapping, name);
+  entry = get_mapping_entry_by_name(context, mapping, name);
 
-    if (entry == NULL)
+  if (entry == NULL)
     {
-        return false;
+      return false;
     }
 
-    // Sanity check:
+  /* Sanity check: */
 
-    if (entry->is_string)
+  if (entry->is_string)
     {
-        DEH_Error(context, "Tried to set '%s' as integer (BUG)", name);
-        return false;
+      deh_error(context, "Tried to set '%s' as integer (BUG)", name);
+      return false;
     }
 
-    location = GetStructField(structptr, mapping, entry);
+  location = get_struct_field(structptr, mapping, entry);
 
-    //       printf("Setting %p::%s to %i (%i bytes)\n",
-    //               structptr, name, value, entry->size);
+  /* Set field content based on its type: */
 
-    // Set field content based on its type:
-
-    switch (entry->size)
+  switch (entry->size)
     {
-        case 1:
-            * ((uint8_t *) location) = value;
-            break;
-        case 2:
-            * ((uint16_t *) location) = value;
-            break;
-        case 4:
-            * ((uint32_t *) location) = value;
-            break;
-        default:
-            DEH_Error(context, "Unknown field type for '%s' (BUG)", name);
-            return false;
+    case 1:
+      *((uint8_t *)location) = value;
+      break;
+    case 2:
+      *((uint16_t *)location) = value;
+      break;
+    case 4:
+      *((uint32_t *)location) = value;
+      break;
+    default:
+      deh_error(context, "Unknown field type for '%s' (BUG)", name);
+      return false;
     }
 
-    return true;
+  return true;
 }
 
-//
-// Set the value of a string field in a structure by name
-//
+/* Set the value of a string field in a structure by name */
 
-boolean DEH_SetStringMapping(deh_context_t *context, deh_mapping_t *mapping,
-                             void *structptr, char *name, char *value)
+boolean deh_set_string_mapping(deh_context_t *context,
+        deh_mapping_t *mapping, void *structptr, char *name, char *value)
 {
-    deh_mapping_entry_t *entry;
-    void *location;
+  deh_mapping_entry_t *entry;
+  void *location;
 
-    entry = GetMappingEntryByName(context, mapping, name);
+  entry = get_mapping_entry_by_name(context, mapping, name);
 
-    if (entry == NULL)
+  if (entry == NULL)
     {
-        return false;
+      return false;
     }
 
-    // Sanity check:
+  /* Sanity check: */
 
-    if (!entry->is_string)
+  if (!entry->is_string)
     {
-        DEH_Error(context, "Tried to set '%s' as string (BUG)", name);
-        return false;
+      deh_error(context, "Tried to set '%s' as string (BUG)", name);
+      return false;
     }
 
-    location = GetStructField(structptr, mapping, entry);
+  location = get_struct_field(structptr, mapping, entry);
 
-    // Copy value into field:
+  /* Copy value into field: */
 
-    M_StringCopy(location, value, entry->size);
+  m_str_copy(location, value, entry->size);
 
-    return true;
+  return true;
 }
 
-void DEH_StructSHA1Sum(sha1_context_t *context, deh_mapping_t *mapping,
+void deh_struct_sha1_sum(SHA1_CTX *context, deh_mapping_t *mapping,
                        void *structptr)
 {
-    int i;
+  int i;
 
-    // Go through each mapping
+  /* Go through each mapping */
 
-    for (i=0; mapping->entries[i].name != NULL; ++i)
+  for (i = 0; mapping->entries[i].name != NULL; ++i)
     {
-        deh_mapping_entry_t *entry = &mapping->entries[i];
-        void *location;
+      deh_mapping_entry_t *entry = &mapping->entries[i];
+      void *location;
 
-        if (entry->location == NULL)
+      if (entry->location == NULL)
         {
-            // Unsupported field
+          /* Unsupported field */
 
-            continue;
+          continue;
         }
 
-        // Add in data for this field
+      /* Add in data for this field */
 
-        location = (uint8_t *)structptr + ((uint8_t *)entry->location - (uint8_t *)mapping->base);
+      location = (uint8_t *)structptr +
+                 ((uint8_t *)entry->location - (uint8_t *)mapping->base);
 
-        switch (entry->size)
+      switch (entry->size)
         {
-            case 1:
-                SHA1_UpdateInt32(context, *((uint8_t *) location));
-                break;
-            case 2:
-                SHA1_UpdateInt32(context, *((uint16_t *) location));
-                break;
-            case 4:
-                SHA1_UpdateInt32(context, *((uint32_t *) location));
-                break;
-            default:
-                I_Error("Unknown dehacked mapping field type for '%s' (BUG)", 
-                        entry->name);
-                break;
+        case 1:
+          sha1_updateint32(context, *((uint8_t *)location));
+          break;
+        case 2:
+          sha1_updateint32(context, *((uint16_t *)location));
+          break;
+        case 4:
+          sha1_updateint32(context, *((uint32_t *)location));
+          break;
+        default:
+          i_error("Unknown dehacked mapping field type for '%s' (BUG)",
+                  entry->name);
+          break;
         }
     }
 }
-
diff --git a/games/NXDoom/src/deh_mapping.h b/games/NXDoom/src/deh_mapping.h
index e71468c4f..cd5cf5bf6 100644
--- a/games/NXDoom/src/deh_mapping.h
+++ b/games/NXDoom/src/deh_mapping.h
@@ -1,93 +1,106 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dehacked "mapping" code
-// Allows the fields in structures to be mapped out and accessed by
-// name
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_mapping.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Dehacked "mapping" code
+ * Allows the fields in structures to be mapped out and accessed by
+ * name
+ *
+ ****************************************************************************/
 
 #ifndef DEH_MAPPING_H
 #define DEH_MAPPING_H
 
-#include "doomtype.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "deh_io.h"
+#include "doomtype.h"
 #include "sha1.h"
 
-#define DEH_BEGIN_MAPPING(mapping_name, structname)           \
-    static structname deh_mapping_base;                       \
-    static deh_mapping_t mapping_name =                       \
-    {                                                         \
-        &deh_mapping_base,                                    \
-        {
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define DEH_MAPPING(deh_name, fieldname)                      \
-             {deh_name, &deh_mapping_base.fieldname,          \
-                 sizeof(deh_mapping_base.fieldname),          \
-                 false},
+#define DEH_BEGIN_MAPPING(mapping_name, structname)                          \
+  static structname deh_mapping_base;                                        \
+  static deh_mapping_t mapping_name = {&deh_mapping_base, {
 
-#define DEH_MAPPING_STRING(deh_name, fieldname)               \
-             {deh_name, &deh_mapping_base.fieldname,          \
-                 sizeof(deh_mapping_base.fieldname),          \
-                 true},
+#define DEH_MAPPING(deh_name, fieldname)                                     \
+  {deh_name, &deh_mapping_base.fieldname,                                    \
+   sizeof(deh_mapping_base.fieldname), false},
 
-#define DEH_UNSUPPORTED_MAPPING(deh_name)                     \
-             {deh_name, NULL, -1, false},
+#define DEH_MAPPING_STRING(deh_name, fieldname)                              \
+  {deh_name, &deh_mapping_base.fieldname,                                    \
+   sizeof(deh_mapping_base.fieldname), true},
 
-#define DEH_END_MAPPING                                       \
+#define DEH_UNSUPPORTED_MAPPING(deh_name) {deh_name, NULL, -1, false},
+
+#define DEH_END_MAPPING                                                      \
              {NULL, NULL, -1}                                 \
-        }                                                     \
-    };
-
-
+        }                                                                    \
+  }                                                                          \
+  ;
 
 #define MAX_MAPPING_ENTRIES 32
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef struct deh_mapping_s deh_mapping_t;
 typedef struct deh_mapping_entry_s deh_mapping_entry_t;
 
-struct deh_mapping_entry_s 
+struct deh_mapping_entry_s
 {
-    // field name
-   
-    const char *name;
+  /* field name */
 
-    // location relative to the base in the deh_mapping_t struct
-    // If this is NULL, it is an unsupported mapping
+  const char *name;
 
-    void *location;
+  /* location relative to the base in the deh_mapping_t struct
+   * If this is NULL, it is an unsupported mapping
+   */
 
-    // field size
+  void *location;
 
-    int size;
+  /* field size */
 
-    // if true, this is a string value.
+  int size;
 
-    boolean is_string;
+  /* if true, this is a string value. */
+
+  boolean is_string;
 };
 
 struct deh_mapping_s
 {
-    void *base;
-    deh_mapping_entry_t entries[MAX_MAPPING_ENTRIES];
+  void *base;
+  deh_mapping_entry_t entries[MAX_MAPPING_ENTRIES];
 };
 
-boolean DEH_SetMapping(deh_context_t *context, deh_mapping_t *mapping,
-                       void *structptr, char *name, int value);
-boolean DEH_SetStringMapping(deh_context_t *context, deh_mapping_t *mapping,
-                             void *structptr, char *name, char *value);
-void DEH_StructSHA1Sum(sha1_context_t *context, deh_mapping_t *mapping,
-                       void *structptr);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef DEH_MAPPING_H */
+boolean deh_set_mapping(deh_context_t *context, deh_mapping_t *mapping,
+                        void *structptr, char *name, int value);
+boolean deh_set_string_mapping(deh_context_t *context,
+        deh_mapping_t *mapping, void *structptr, char *name, char *value);
+void deh_struct_sha1_sum(SHA1_CTX *context, deh_mapping_t *mapping,
+                         void *structptr);
 
+#endif /* DEH_MAPPING_H */
diff --git a/games/NXDoom/src/deh_str.c b/games/NXDoom/src/deh_str.c
index 76af188ae..9c3f8b8b4 100644
--- a/games/NXDoom/src/deh_str.c
+++ b/games/NXDoom/src/deh_str.c
@@ -1,433 +1,228 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses Text substitution sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_str.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Parses Text substitution sections in dehacked files
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
-#include "doomtype.h"
 #include "deh_str.h"
+#include "doomtype.h"
 #include "m_misc.h"
 
 #include "z_zone.h"
 
-typedef struct 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef struct
 {
-    char *from_text;
-    char *to_text;
+  char *from_text;
+  char *to_text;
 } deh_substitution_t;
 
+typedef enum
+{
+  FORMAT_ARG_INVALID,
+  FORMAT_ARG_INT,
+  FORMAT_ARG_FLOAT,
+  FORMAT_ARG_CHAR,
+  FORMAT_ARG_STRING,
+  FORMAT_ARG_PTR,
+  FORMAT_ARG_SAVE_POS
+} format_arg_t;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static deh_substitution_t **hash_table = NULL;
 static int hash_table_entries;
 static int hash_table_length = -1;
 
-// This is the algorithm used by glib
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* This is the algorithm used by glib */
 
 static unsigned int strhash(const char *s)
 {
-    const char *p = s;
-    unsigned int h = *p;
-  
-    if (h)
+  const char *p = s;
+  unsigned int h = *p;
+
+  if (h)
     {
-        for (p += 1; *p; p++)
-            h = (h << 5) - h + *p;
+      for (p += 1; *p; p++)
+        h = (h << 5) - h + *p;
     }
 
-    return h;
+  return h;
 }
 
-static deh_substitution_t *SubstitutionForString(const char *s)
+static deh_substitution_t *substitution_for_string(const char *s)
 {
-    int entry;
+  int entry;
 
-    // Fallback if we have not initialized the hash table yet
-    if (hash_table_length < 0)
-	return NULL;
+  /* Fallback if we have not initialized the hash table yet */
 
-    entry = strhash(s) % hash_table_length;
+  if (hash_table_length < 0) return NULL;
 
-    while (hash_table[entry] != NULL)
+  entry = strhash(s) % hash_table_length;
+
+  while (hash_table[entry] != NULL)
     {
-        if (!strcmp(hash_table[entry]->from_text, s))
+      if (!strcmp(hash_table[entry]->from_text, s))
         {
-            // substitution found!
-            return hash_table[entry];
+          return hash_table[entry]; /* substitution found! */
         }
 
-        entry = (entry + 1) % hash_table_length;
+      entry = (entry + 1) % hash_table_length;
     }
 
-    // no substitution found
-    return NULL;
+  /* no substitution found */
+
+  return NULL;
 }
 
-// Look up a string to see if it has been replaced with something else
-// This will be used throughout the program to substitute text
-
-const char *DEH_String(const char *s)
+static void init_hash_table(void)
 {
-    deh_substitution_t *subst;
+  /* init hash table */
 
-    subst = SubstitutionForString(s);
-
-    if (subst != NULL)
-    {
-        return subst->to_text;
-    }
-    else
-    {
-        return s;
-    }
+  hash_table_entries = 0;
+  hash_table_length = 16;
+  hash_table = z_malloc(sizeof(deh_substitution_t *) * hash_table_length,
+                        PU_STATIC, NULL);
+  memset(hash_table, 0, sizeof(deh_substitution_t *) * hash_table_length);
 }
 
-static void InitHashTable(void)
+static void deh_add_to_hashtable(deh_substitution_t *sub);
+
+static void increase_hashtable(void)
 {
-    // init hash table
-    
-    hash_table_entries = 0;
-    hash_table_length = 16;
-    hash_table = Z_Malloc(sizeof(deh_substitution_t *) * hash_table_length,
-                          PU_STATIC, NULL);
-    memset(hash_table, 0, sizeof(deh_substitution_t *) * hash_table_length);
-}
+  deh_substitution_t **old_table;
+  int old_table_length;
+  int i;
 
-static void DEH_AddToHashtable(deh_substitution_t *sub);
+  /* save the old table */
 
-static void IncreaseHashtable(void)
-{
-    deh_substitution_t **old_table;
-    int old_table_length;
-    int i;
-    
-    // save the old table
+  old_table = hash_table;
+  old_table_length = hash_table_length;
 
-    old_table = hash_table;
-    old_table_length = hash_table_length;
-    
-    // double the size 
+  /* double the size */
 
-    hash_table_length *= 2;
-    hash_table = Z_Malloc(sizeof(deh_substitution_t *) * hash_table_length,
-                          PU_STATIC, NULL);
-    memset(hash_table, 0, sizeof(deh_substitution_t *) * hash_table_length);
+  hash_table_length *= 2;
+  hash_table = z_malloc(sizeof(deh_substitution_t *) * hash_table_length,
+                        PU_STATIC, NULL);
+  memset(hash_table, 0, sizeof(deh_substitution_t *) * hash_table_length);
 
-    // go through the old table and insert all the old entries
+  /* go through the old table and insert all the old entries */
 
-    for (i=0; i<old_table_length; ++i)
+  for (i = 0; i < old_table_length; ++i)
     {
-        if (old_table[i] != NULL)
+      if (old_table[i] != NULL)
         {
-            DEH_AddToHashtable(old_table[i]);
+          deh_add_to_hashtable(old_table[i]);
         }
     }
 
-    // free the old table
+  /* free the old table */
 
-    Z_Free(old_table);
+  z_free(old_table);
 }
 
-static void DEH_AddToHashtable(deh_substitution_t *sub)
+static void deh_add_to_hashtable(deh_substitution_t *sub)
 {
-    int entry;
+  int entry;
 
-    // if the hash table is more than 60% full, increase its size
+  /* if the hash table is more than 60% full, increase its size */
 
-    if ((hash_table_entries * 10) / hash_table_length > 6)
+  if ((hash_table_entries * 10) / hash_table_length > 6)
     {
-        IncreaseHashtable();
+      increase_hashtable();
     }
 
-    // find where to insert it
-    entry = strhash(sub->from_text) % hash_table_length;
+  /* find where to insert it */
 
-    while (hash_table[entry] != NULL)
+  entry = strhash(sub->from_text) % hash_table_length;
+
+  while (hash_table[entry] != NULL)
     {
-        entry = (entry + 1) % hash_table_length;
+      entry = (entry + 1) % hash_table_length;
     }
 
-    hash_table[entry] = sub;
-    ++hash_table_entries;
+  hash_table[entry] = sub;
+  ++hash_table_entries;
 }
 
-void DEH_AddStringReplacement(const char *from_text, const char *to_text)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void deh_add_string_replacement(const char *from_text, const char *to_text)
 {
-    deh_substitution_t *sub;
-    size_t len;
+  deh_substitution_t *sub;
+  size_t len;
 
-    // Initialize the hash table if this is the first time
-    if (hash_table_length < 0)
+  /* Initialize the hash table if this is the first time */
+
+  if (hash_table_length < 0)
     {
-        InitHashTable();
+      init_hash_table();
     }
 
-    // Check to see if there is an existing substitution already in place.
-    sub = SubstitutionForString(from_text);
+  /* Check to see if there is an existing substitution already in place. */
 
-    if (sub != NULL)
+  sub = substitution_for_string(from_text);
+
+  if (sub != NULL)
     {
-        Z_Free(sub->to_text);
+      z_free(sub->to_text);
 
-        len = strlen(to_text) + 1;
-        sub->to_text = Z_Malloc(len, PU_STATIC, NULL);
-        memcpy(sub->to_text, to_text, len);
+      len = strlen(to_text) + 1;
+      sub->to_text = z_malloc(len, PU_STATIC, NULL);
+      memcpy(sub->to_text, to_text, len);
     }
-    else
+  else
     {
-        // We need to allocate a new substitution.
-        sub = Z_Malloc(sizeof(*sub), PU_STATIC, 0);
+      /* We need to allocate a new substitution. */
 
-        // We need to create our own duplicates of the provided strings.
-        len = strlen(from_text) + 1;
-        sub->from_text = Z_Malloc(len, PU_STATIC, NULL);
-        memcpy(sub->from_text, from_text, len);
+      sub = z_malloc(sizeof(*sub), PU_STATIC, 0);
 
-        len = strlen(to_text) + 1;
-        sub->to_text = Z_Malloc(len, PU_STATIC, NULL);
-        memcpy(sub->to_text, to_text, len);
+      /* We need to create our own duplicates of the provided strings. */
 
-        DEH_AddToHashtable(sub);
+      len = strlen(from_text) + 1;
+      sub->from_text = z_malloc(len, PU_STATIC, NULL);
+      memcpy(sub->from_text, from_text, len);
+
+      len = strlen(to_text) + 1;
+      sub->to_text = z_malloc(len, PU_STATIC, NULL);
+      memcpy(sub->to_text, to_text, len);
+
+      deh_add_to_hashtable(sub);
     }
 }
-
-typedef enum
-{
-    FORMAT_ARG_INVALID,
-    FORMAT_ARG_INT,
-    FORMAT_ARG_FLOAT,
-    FORMAT_ARG_CHAR,
-    FORMAT_ARG_STRING,
-    FORMAT_ARG_PTR,
-    FORMAT_ARG_SAVE_POS
-} format_arg_t;
-
-// Get the type of a format argument.
-// We can mix-and-match different format arguments as long as they
-// are for the same data type.
-
-static format_arg_t FormatArgumentType(char c)
-{
-    switch (c)
-    {
-        case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
-            return FORMAT_ARG_INT;
-
-        case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
-        case 'a': case 'A':
-            return FORMAT_ARG_FLOAT;
-
-        case 'c': case 'C':
-            return FORMAT_ARG_CHAR;
-
-        case 's': case 'S':
-            return FORMAT_ARG_STRING;
-
-        case 'p':
-            return FORMAT_ARG_PTR;
-
-        case 'n':
-            return FORMAT_ARG_SAVE_POS;
-
-        default:
-            return FORMAT_ARG_INVALID;
-    }
-}
-
-// Given the specified string, get the type of the first format
-// string encountered.
-
-static format_arg_t NextFormatArgument(const char **str)
-{
-    format_arg_t argtype;
-
-    // Search for the '%' starting the next string.
-
-    while (**str != '\0')
-    {
-        if (**str == '%')
-        {
-            ++*str;
-
-            // Don't stop for double-%s.
-
-            if (**str != '%')
-            {
-                break;
-            }
-        }
-
-        ++*str;
-    }
-
-    // Find the type of the format string.
-
-    while (**str != '\0')
-    {
-        argtype = FormatArgumentType(**str);
-
-        if (argtype != FORMAT_ARG_INVALID)
-        {
-            ++*str;
-
-            return argtype;
-        }
-
-        ++*str;
-    }
-
-    // Stop searching, we have reached the end.
-
-    *str = NULL;
-
-    return FORMAT_ARG_INVALID;
-}
-
-// Check if the specified argument type is a valid replacement for
-// the original.
-
-static boolean ValidArgumentReplacement(format_arg_t original,
-                                        format_arg_t replacement)
-{
-    // In general, the original and replacement types should be
-    // identical.  However, there are some cases where the replacement
-    // is valid and the types don't match.
-
-    // Characters can be represented as ints.
-
-    if (original == FORMAT_ARG_CHAR && replacement == FORMAT_ARG_INT)
-    {
-        return true;
-    }
-
-    // Strings are pointers.
-
-    if (original == FORMAT_ARG_STRING && replacement == FORMAT_ARG_PTR)
-    {
-        return true;
-    }
-
-    return original == replacement;
-}
-
-// Return true if the specified string contains no format arguments.
-
-static boolean ValidFormatReplacement(const char *original, const char *replacement)
-{
-    const char *rover1;
-    const char *rover2;
-    int argtype1, argtype2;
-
-    // Check each argument in turn and compare types.
-
-    rover1 = original; rover2 = replacement;
-
-    for (;;)
-    {
-        argtype1 = NextFormatArgument(&rover1);
-        argtype2 = NextFormatArgument(&rover2);
-
-        if (argtype2 == FORMAT_ARG_INVALID)
-        {
-            // No more arguments left to read from the replacement string.
-
-            break;
-        }
-        else if (argtype1 == FORMAT_ARG_INVALID)
-        {
-            // Replacement string has more arguments than the original.
-
-            return false;
-        }
-        else if (!ValidArgumentReplacement(argtype1, argtype2))
-        {
-            // Not a valid replacement argument.
-
-            return false;
-        }
-    }
-
-    return true;
-}
-
-// Get replacement format string, checking arguments.
-
-static const char *FormatStringReplacement(const char *s)
-{
-    const char *repl;
-
-    repl = DEH_String(s);
-
-    if (!ValidFormatReplacement(s, repl))
-    {
-        printf("WARNING: Unsafe dehacked replacement provided for "
-               "printf format string: %s\n", s);
-
-        return s;
-    }
-
-    return repl;
-}
-
-// printf(), performing a replacement on the format string.
-
-void DEH_printf(const char *fmt, ...)
-{
-    va_list args;
-    const char *repl;
-
-    repl = FormatStringReplacement(fmt);
-
-    va_start(args, fmt);
-
-    vprintf(repl, args);
-
-    va_end(args);
-}
-
-// fprintf(), performing a replacement on the format string.
-
-void DEH_fprintf(FILE *fstream, const char *fmt, ...)
-{
-    va_list args;
-    const char *repl;
-
-    repl = FormatStringReplacement(fmt);
-
-    va_start(args, fmt);
-
-    vfprintf(fstream, repl, args);
-
-    va_end(args);
-}
-
-// snprintf(), performing a replacement on the format string.
-
-void DEH_snprintf(char *buffer, size_t len, const char *fmt, ...)
-{
-    va_list args;
-    const char *repl;
-
-    repl = FormatStringReplacement(fmt);
-
-    va_start(args, fmt);
-
-    M_vsnprintf(buffer, len, repl, args);
-
-    va_end(args);
-}
-
diff --git a/games/NXDoom/src/deh_str.h b/games/NXDoom/src/deh_str.h
index d547de6b9..3b2e6fefe 100644
--- a/games/NXDoom/src/deh_str.h
+++ b/games/NXDoom/src/deh_str.h
@@ -1,45 +1,33 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dehacked string replacements
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_str.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Dehacked string replacements
+ *
+ ****************************************************************************/
 
 #ifndef DEH_STR_H
 #define DEH_STR_H
 
-#include <stdio.h>
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#include "doomtype.h"
+/* Used to do dehacked text substitutions throughout the program */
 
-// Used to do dehacked text substitutions throughout the program
-
-const char *DEH_String(const char *s) PRINTF_ARG_ATTR(1);
-void DEH_printf(const char *fmt, ...) PRINTF_ATTR(1, 2);
-void DEH_fprintf(FILE *fstream, const char *fmt, ...) PRINTF_ATTR(2, 3);
-void DEH_snprintf(char *buffer, size_t len, const char *fmt, ...) PRINTF_ATTR(3, 4);
-void DEH_AddStringReplacement(const char *from_text, const char *to_text);
-
-
-#if 0
-// Static macro versions of the functions above
-
-#define DEH_String(x) (x)
-#define DEH_printf printf
-#define DEH_fprintf fprintf
-#define DEH_snprintf snprintf
-
-#endif
-
-#endif /* #ifndef DEH_STR_H */
+void deh_add_string_replacement(const char *from_text, const char *to_text);
 
+#endif /* DEH_STR_H */
diff --git a/games/NXDoom/src/deh_text.c b/games/NXDoom/src/deh_text.c
index 9e621b438..927a3e7c6 100644
--- a/games/NXDoom/src/deh_text.c
+++ b/games/NXDoom/src/deh_text.c
@@ -1,19 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses Text substitution sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/deh_text.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses Text substitution sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,87 +35,106 @@
 #include "deh_io.h"
 #include "deh_main.h"
 
-// Given a string length, find the maximum length of a 
-// string that can replace it.
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-static int TXT_MaxStringLength(int len)
-{
-    // Enough bytes for the string and the NUL terminator
+static void deh_text_parse_line(deh_context_t *context, char *line,
+                                void *tag);
+static void *deh_text_start(deh_context_t *context, char *line);
+static void *deh_text_start(deh_context_t *context, char *line);
 
-    len += 1;
-
-    // All strings in doom.exe are on 4-byte boundaries, so we may be able
-    // to support a slightly longer string.
-    // Extend up to the next 4-byte boundary
-
-    len += (4 - (len % 4)) % 4;
-            
-    // Less one for the NUL terminator.
-
-    return len - 1;
-}
-
-static void *DEH_TextStart(deh_context_t *context, char *line)
-{
-    char *from_text, *to_text;
-    int fromlen, tolen;
-    int i;
-
-    if (sscanf(line, "Text %i %i", &fromlen, &tolen) != 2)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    // Only allow string replacements that are possible in Vanilla Doom.  
-    // Chocolate Doom is unforgiving!
-
-    if (!deh_allow_long_strings && tolen > TXT_MaxStringLength(fromlen))
-    {
-        DEH_Error(context, "Replacement string is longer than the maximum "
-                           "possible in doom.exe");
-        return NULL;
-    }
-
-    from_text = malloc(fromlen + 1);
-    to_text = malloc(tolen + 1);
-
-    // read in the "from" text
-
-    for (i=0; i<fromlen; ++i)
-    {
-        from_text[i] = DEH_GetChar(context);
-    }
-    from_text[fromlen] = '\0';
-
-    // read in the "to" text
-
-    for (i=0; i<tolen; ++i)
-    {
-        to_text[i] = DEH_GetChar(context);
-    }
-    to_text[tolen] = '\0';
-
-    DEH_AddStringReplacement(from_text, to_text);
-
-    free(from_text);
-    free(to_text);
-
-    return NULL;
-}
-
-static void DEH_TextParseLine(deh_context_t *context, char *line, void *tag)
-{
-    // not used
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_text =
 {
-    "Text",
-    NULL,
-    DEH_TextStart,
-    DEH_TextParseLine,
-    NULL,
-    NULL,
+  "Text", NULL, deh_text_start, deh_text_parse_line, NULL, NULL,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Given a string length, find the maximum length of a string that can
+ * replace it.
+ */
+
+static int txt_max_string_length(int len)
+{
+  /* Enough bytes for the string and the NUL terminator */
+
+  len += 1;
+
+  /* All strings in doom.exe are on 4-byte boundaries, so we may be able
+   * to support a slightly longer string.
+   * Extend up to the next 4-byte boundary
+   */
+
+  len += (4 - (len % 4)) % 4;
+
+  /* Less one for the NUL terminator. */
+
+  return len - 1;
+}
+
+static void *deh_text_start(deh_context_t *context, char *line)
+{
+  char *from_text;
+  char *to_text;
+  int fromlen;
+  int to_len;
+  int i;
+
+  if (sscanf(line, "Text %i %i", &fromlen, &to_len) != 2)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  /* Only allow string replacements that are possible in Vanilla Doom.
+   * Chocolate Doom is unforgiving!
+   */
+
+  if (!deh_allow_long_strings && to_len > txt_max_string_length(fromlen))
+    {
+      deh_error(context, "Replacement string is longer than the maximum "
+                         "possible in doom.exe");
+      return NULL;
+    }
+
+  from_text = malloc(fromlen + 1);
+  to_text = malloc(to_len + 1);
+
+  /* read in the "from" text */
+
+  for (i = 0; i < fromlen; ++i)
+    {
+      from_text[i] = deh_get_char(context);
+    }
+
+  from_text[fromlen] = '\0';
+
+  /* read in the "to" text */
+
+  for (i = 0; i < to_len; ++i)
+    {
+      to_text[i] = deh_get_char(context);
+    }
+
+  to_text[to_len] = '\0';
+
+  deh_add_string_replacement(from_text, to_text);
+
+  free(from_text);
+  free(to_text);
+
+  return NULL;
+}
+
+static void deh_text_parse_line(deh_context_t *context, char *line,
+        void *tag)
+{
+  /* not used */
+}
diff --git a/games/NXDoom/src/doom-res.rc.in b/games/NXDoom/src/doom-res.rc.in
deleted file mode 100644
index 52d296609..000000000
--- a/games/NXDoom/src/doom-res.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-1 ICON "@top_srcdir@/data/doom.ico"
-
-#include <winuser.h>
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
-
-1 VERSIONINFO
-PRODUCTVERSION @WINDOWS_RC_VERSION@
-FILEVERSION @WINDOWS_RC_VERSION@
-FILETYPE 1
-{
- BLOCK "StringFileInfo"
- {
-  BLOCK "040904E4"
-  {
-   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
-   VALUE "FileDescription", "@PACKAGE_STRING@"
-   VALUE "InternalName", "@PACKAGE_TARNAME@"
-   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
-   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
-   VALUE "ProductName", "@PACKAGE_NAME@"
-   VALUE "ProductVersion", "@PACKAGE_VERSION@"
-  }
- }
- BLOCK "VarFileInfo"
- {
-  VALUE "Translation", 0x409, 1252
- }
-}
-
diff --git a/games/NXDoom/src/doom/CMakeLists.txt b/games/NXDoom/src/doom/CMakeLists.txt
deleted file mode 100644
index 6e878a0f1..000000000
--- a/games/NXDoom/src/doom/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-add_library(doom STATIC
-            am_map.c        am_map.h
-            deh_ammo.c
-            deh_bexstr.c
-            deh_cheat.c
-            deh_doom.c
-            deh_frame.c
-            deh_misc.c      deh_misc.h
-            deh_ptr.c
-            deh_sound.c
-            deh_thing.c
-            deh_weapon.c
-                            d_englsh.h
-            d_items.c       d_items.h
-            d_main.c        d_main.h
-            d_net.c
-                            doomdata.h
-            doomdef.c       doomdef.h
-            doomstat.c      doomstat.h
-                            d_player.h
-            dstrings.c      dstrings.h
-                            d_textur.h
-                            d_think.h
-            f_finale.c      f_finale.h
-            f_wipe.c        f_wipe.h
-            g_game.c        g_game.h
-            hu_lib.c        hu_lib.h
-            hu_stuff.c      hu_stuff.h
-            info.c          info.h
-            m_menu.c        m_menu.h
-            m_random.c      m_random.h
-            p_ceilng.c
-            p_doors.c
-            p_enemy.c
-            p_floor.c
-            p_inter.c       p_inter.h
-            p_lights.c
-                            p_local.h
-            p_map.c
-            p_maputl.c
-            p_mobj.c        p_mobj.h
-            p_plats.c
-            p_pspr.c        p_pspr.h
-            p_saveg.c       p_saveg.h
-            p_setup.c       p_setup.h
-            p_sight.c
-            p_spec.c        p_spec.h
-            p_switch.c
-            p_telept.c
-            p_tick.c        p_tick.h
-            p_user.c
-            r_bsp.c         r_bsp.h
-            r_data.c        r_data.h
-                            r_defs.h
-            r_draw.c        r_draw.h
-                            r_local.h
-            r_main.c        r_main.h
-            r_plane.c       r_plane.h
-            r_segs.c        r_segs.h
-            r_sky.c         r_sky.h
-                            r_state.h
-            r_things.c      r_things.h
-            s_sound.c       s_sound.h
-            sounds.c        sounds.h
-            statdump.c      statdump.h
-            st_lib.c        st_lib.h
-            st_stuff.c      st_stuff.h
-            wi_stuff.c      wi_stuff.h)
-
-target_include_directories(doom PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-
-if (DEFINED EMSCRIPTEN)
-    set(SDL_FLAGS "-s USE_SDL=2")
-    if(ENABLE_SDL2_MIXER)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
-    endif()
-    if(ENABLE_SDL2_NET)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
-    endif()
-else()
-    set(SDL_LINK_LIBS SDL2::SDL2)
-    if(ENABLE_SDL2_MIXER)
-        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
-    endif()
-    if(ENABLE_SDL2_NET)
-        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
-    endif()
-endif()
-target_link_libraries(doom ${SDL_LINK_LIBS})
-set_target_properties(doom PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-set_target_properties(doom PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/doom/Makefile.am b/games/NXDoom/src/doom/Makefile.am
deleted file mode 100644
index 1f4e8c48e..000000000
--- a/games/NXDoom/src/doom/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
-
-EXTRA_DIST =                    \
-        CMakeLists.txt          \
-        doom_icon.c
-
-noinst_LIBRARIES=libdoom.a
-
-libdoom_a_SOURCES =             \
-am_map.c           am_map.h     \
-deh_ammo.c                      \
-deh_bexstr.c                    \
-deh_cheat.c                     \
-deh_doom.c                      \
-deh_frame.c                     \
-deh_misc.c         deh_misc.h   \
-deh_ptr.c                       \
-deh_sound.c                     \
-deh_thing.c                     \
-deh_weapon.c                    \
-                   d_englsh.h   \
-d_items.c          d_items.h    \
-d_main.c           d_main.h     \
-d_net.c                         \
-                   doomdata.h   \
-doomdef.c          doomdef.h    \
-doomstat.c         doomstat.h   \
-                   d_player.h   \
-dstrings.c         dstrings.h   \
-                   d_textur.h   \
-                   d_think.h    \
-f_finale.c         f_finale.h   \
-f_wipe.c           f_wipe.h     \
-g_game.c           g_game.h     \
-hu_lib.c           hu_lib.h     \
-hu_stuff.c         hu_stuff.h   \
-info.c             info.h       \
-m_menu.c           m_menu.h     \
-m_random.c         m_random.h   \
-p_ceilng.c                      \
-p_doors.c                       \
-p_enemy.c                       \
-p_floor.c                       \
-p_inter.c          p_inter.h    \
-p_lights.c                      \
-                   p_local.h    \
-p_map.c                         \
-p_maputl.c                      \
-p_mobj.c           p_mobj.h     \
-p_plats.c                       \
-p_pspr.c           p_pspr.h     \
-p_saveg.c          p_saveg.h    \
-p_setup.c          p_setup.h    \
-p_sight.c                       \
-p_spec.c           p_spec.h     \
-p_switch.c                      \
-p_telept.c                      \
-p_tick.c           p_tick.h     \
-p_user.c                        \
-r_bsp.c            r_bsp.h      \
-r_data.c           r_data.h     \
-                   r_defs.h     \
-r_draw.c           r_draw.h     \
-                   r_local.h    \
-r_main.c           r_main.h     \
-r_plane.c          r_plane.h    \
-r_segs.c           r_segs.h     \
-r_sky.c            r_sky.h      \
-                   r_state.h    \
-r_things.c         r_things.h   \
-s_sound.c          s_sound.h    \
-sounds.c           sounds.h     \
-statdump.c         statdump.h   \
-st_lib.c           st_lib.h     \
-st_stuff.c         st_stuff.h   \
-wi_stuff.c         wi_stuff.h
-
-if HAVE_ICONS
-
-doom_icon.c : $(top_builddir)/data/doom.png
-	$(top_builddir)/data/convert-icon $(top_builddir)/data/doom.png $@
-
-endif
diff --git a/games/NXDoom/src/doom/am_map.c b/games/NXDoom/src/doom/am_map.c
index 150098eda..02d233df2 100644
--- a/games/NXDoom/src/doom/am_map.c
+++ b/games/NXDoom/src/doom/am_map.c
@@ -1,1374 +1,1813 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:  the automap code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/am_map.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  the automap code
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
 #include "deh_main.h"
 
-#include "z_zone.h"
-#include "doomkeys.h"
 #include "doomdef.h"
-#include "st_stuff.h"
+#include "doomkeys.h"
 #include "p_local.h"
+#include "st_stuff.h"
 #include "w_wad.h"
+#include "z_zone.h"
 
-#include "m_cheat.h"
-#include "m_controls.h"
-#include "m_misc.h"
 #include "i_system.h"
 #include "i_timer.h"
 #include "i_video.h"
+#include "m_cheat.h"
+#include "m_controls.h"
+#include "m_misc.h"
+
+/* Needs access to LFB. */
 
-// Needs access to LFB.
 #include "v_video.h"
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
 
-// Data.
 #include "dstrings.h"
 
 #include "am_map.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// For use if I do walls with outsides/insides
-#define REDS		(256-5*16)
-#define REDRANGE	16
-#define BLUES		(256-4*16+8)
-#define BLUERANGE	8
-#define GREENS		(7*16)
-#define GREENRANGE	16
-#define GRAYS		(6*16)
-#define GRAYSRANGE	16
-#define BROWNS		(4*16)
-#define BROWNRANGE	16
-#define YELLOWS		(256-32+7)
-#define YELLOWRANGE	1
-#define BLACK		0
-#define WHITE		(256-47)
+/* For use if I do walls with outsides/insides */
 
-// Automap colors
-#define BACKGROUND	BLACK
-#define YOURCOLORS	WHITE
-#define YOURRANGE	0
-#define WALLCOLORS	REDS
-#define WALLRANGE	REDRANGE
-#define TSWALLCOLORS	GRAYS
-#define TSWALLRANGE	GRAYSRANGE
-#define FDWALLCOLORS	BROWNS
-#define FDWALLRANGE	BROWNRANGE
-#define CDWALLCOLORS	YELLOWS
-#define CDWALLRANGE	YELLOWRANGE
-#define THINGCOLORS	GREENS
-#define THINGRANGE	GREENRANGE
+#define REDS (256 - 5 * 16)
+#define REDRANGE 16
+#define BLUES (256 - 4 * 16 + 8)
+#define BLUERANGE 8
+#define GREENS (7 * 16)
+#define GREENRANGE 16
+#define GRAYS (6 * 16)
+#define GRAYSRANGE 16
+#define BROWNS (4 * 16)
+#define BROWNRANGE 16
+#define YELLOWS (256 - 32 + 7)
+#define YELLOWRANGE 1
+#define BLACK 0
+#define WHITE (256 - 47)
+
+/* Automap colors */
+
+#define BACKGROUND BLACK
+#define YOURCOLORS WHITE
+#define YOURRANGE 0
+#define WALLCOLORS REDS
+#define WALLRANGE REDRANGE
+#define TSWALLCOLORS GRAYS
+#define TSWALLRANGE GRAYSRANGE
+#define FDWALLCOLORS BROWNS
+#define FDWALLRANGE BROWNRANGE
+#define CDWALLCOLORS YELLOWS
+#define CDWALLRANGE YELLOWRANGE
+#define THINGCOLORS GREENS
+#define THINGRANGE GREENRANGE
 #define SECRETWALLCOLORS WALLCOLORS
 #define SECRETWALLRANGE WALLRANGE
-#define GRIDCOLORS	(GRAYS + GRAYSRANGE/2)
-#define GRIDRANGE	0
-#define XHAIRCOLORS	GRAYS
+#define GRIDCOLORS (GRAYS + GRAYSRANGE / 2)
+#define GRIDRANGE 0
+#define XHAIRCOLORS GRAYS
 
-// drawing stuff
+/* drawing stuff */
 
 #define AM_NUMMARKPOINTS 10
 
-// scale on entry
-#define INITSCALEMTOF (.2*FRACUNIT)
-// how much the automap moves window per tic in frame-buffer coordinates
-// moves 140 pixels in 1 second
-#define F_PANINC	4
-// how much zoom-in per tic
-// goes to 2x in 1 second
-#define M_ZOOMIN        ((int) (1.02*FRACUNIT))
-// how much zoom-out per tic
-// pulls out to 0.5x in 1 second
-#define M_ZOOMOUT       ((int) (FRACUNIT/1.02))
+/* scale on entry */
 
-// translates between frame-buffer and map distances
-#define FTOM(x) FixedMul(((x)<<FRACBITS),scale_ftom)
-#define MTOF(x) (FixedMul((x),scale_mtof)>>FRACBITS)
-// translates between frame-buffer and map coordinates
-#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
-#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
+#define INITSCALEMTOF (.2 * FRACUNIT)
+
+/* how much the automap moves window per tic in frame-buffer coordinates
+ * moves 140 pixels in 1 second
+ */
+
+#define F_PANINC 4
+
+/* how much zoom-in per tic goes to 2x in 1 second */
+
+#define M_ZOOMIN ((int)(1.02 * FRACUNIT))
+
+/* how much zoom-out per tic pulls out to 0.5x in 1 second */
+
+#define M_ZOOMOUT ((int)(FRACUNIT / 1.02))
+
+/* translates between frame-buffer and map distances */
+
+#define FTOM(x) fixed_mul(((x) << FRACBITS), scale_ftom)
+#define MTOF(x) (fixed_mul((x), scale_mtof) >> FRACBITS)
+
+/* translates between frame-buffer and map coordinates */
+
+#define CXMTOF(x) (f_x + MTOF((x) - m_x))
+#define CYMTOF(y) (f_y + (f_h - MTOF((y) - m_y)))
+
+/* the following is crap */
 
-// the following is crap
 #define LINE_NEVERSEE ML_DONTDRAW
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct
 {
-    int x, y;
+  int x;
+  int y;
 } fpoint_t;
 
 typedef struct
 {
-    fpoint_t a, b;
+  fpoint_t a;
+  fpoint_t b;
 } fline_t;
 
 typedef struct
 {
-    fixed_t		x,y;
+  fixed_t x;
+  fixed_t y;
 } mpoint_t;
 
 typedef struct
 {
-    mpoint_t a, b;
+  mpoint_t a;
+  mpoint_t b;
 } mline_t;
 
 typedef struct
 {
-    fixed_t slp, islp;
+  fixed_t slp;
+  fixed_t islp;
 } islope_t;
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+/* The vector graphics for the automap. A line drawing of the player pointing
+ * right, starting from the middle.
+ */
 
-//
-// The vector graphics for the automap.
-//  A line drawing of the player pointing right,
-//   starting from the middle.
-//
-#define R ((8*PLAYERRADIUS)/7)
-mline_t player_arrow[] = {
-    { { -R+R/8, 0 }, { R, 0 } }, // -----
-    { { R, 0 }, { R-R/2, R/4 } },  // ----->
-    { { R, 0 }, { R-R/2, -R/4 } },
-    { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
-    { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
-    { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
-    { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
+#define R ((8 * PLAYERRADIUS) / 7)
+mline_t player_arrow[] =
+{
+    {
+        {
+            -R + R / 8,
+            0,
+        },
+        {
+            R,
+            0,
+        },
+    }, /* ----- */
+    {
+        {
+            R,
+            0,
+        },
+        {
+            R - R / 2,
+            R / 4,
+        },
+    }, /* -----> */
+    {
+        {
+            R,
+            0,
+        },
+        {
+            R - R / 2,
+            -R / 4,
+        },
+    },
+    {
+        {
+            -R + R / 8,
+            0,
+        },
+        {
+            -R - R / 8,
+            R / 4,
+        },
+    }, /* >----> */
+    {
+        {
+            -R + R / 8,
+            0,
+        },
+        {
+            -R - R / 8,
+            -R / 4,
+        },
+    },
+    {
+        {
+            -R + 3 * R / 8,
+            0,
+        },
+        {
+            -R + R / 8,
+            R / 4,
+        },
+    }, /* >>---> */
+    {
+        {
+            -R + 3 * R / 8,
+            0,
+        },
+        {
+            -R + R / 8,
+            -R / 4,
+        },
+    },
 };
 #undef R
 
-#define R ((8*PLAYERRADIUS)/7)
-mline_t cheat_player_arrow[] = {
-    { { -R+R/8, 0 }, { R, 0 } }, // -----
-    { { R, 0 }, { R-R/2, R/6 } },  // ----->
-    { { R, 0 }, { R-R/2, -R/6 } },
-    { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
-    { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
-    { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
-    { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
-    { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
-    { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
-    { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
-    { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
-    { { -R/6, -R/6 }, { 0, -R/6 } },
-    { { 0, -R/6 }, { 0, R/4 } },
-    { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
-    { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
-    { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
+#define R ((8 * PLAYERRADIUS) / 7)
+mline_t cheat_player_arrow[] =
+{
+    {
+        {
+            -R + R / 8,
+            0,
+        },
+        {
+            R,
+            0,
+        },
+    }, /* ----- */
+    {
+        {
+            R,
+            0,
+        },
+        {
+            R - R / 2,
+            R / 6,
+        },
+    }, /* -----> */
+    {
+        {
+            R,
+            0,
+        },
+        {
+            R - R / 2,
+            -R / 6,
+        },
+    },
+    {
+        {
+            -R + R / 8,
+            0,
+        },
+        {
+            -R - R / 8,
+            R / 6,
+        },
+    }, /* >-----> */
+    {
+        {
+            -R + R / 8,
+            0,
+        },
+        {
+            -R - R / 8,
+            -R / 6,
+        },
+    },
+    {
+        {
+            -R + 3 * R / 8,
+            0,
+        },
+        {
+            -R + R / 8,
+            R / 6,
+        },
+    }, /* >>-----> */
+    {
+        {
+            -R + 3 * R / 8,
+            0,
+        },
+        {
+            -R + R / 8,
+            -R / 6,
+        },
+    },
+    {
+        {
+            -R / 2,
+            0,
+        },
+        {
+            -R / 2,
+            -R / 6,
+        },
+    }, /* >>-d---> */
+    {
+        {
+            -R / 2,
+            -R / 6,
+        },
+        {
+            -R / 2 + R / 6,
+            -R / 6,
+        },
+    },
+    {
+        {
+            -R / 2 + R / 6,
+            -R / 6,
+        },
+        {
+            -R / 2 + R / 6,
+            R / 4,
+        },
+    },
+    {
+        {
+            -R / 6,
+            0,
+        },
+        {
+            -R / 6,
+            -R / 6,
+        },
+    }, /* >>-dd--> */
+    {
+        {
+            -R / 6,
+            -R / 6,
+        },
+        {
+            0,
+            -R / 6,
+        },
+    },
+    {
+        {
+            0,
+            -R / 6,
+        },
+        {
+            0,
+            R / 4,
+        },
+    },
+    {
+        {
+            R / 6,
+            R / 4,
+        },
+        {
+            R / 6,
+            -R / 7,
+        },
+    }, /* >>-ddt-> */
+    {
+        {
+            R / 6,
+            -R / 7,
+        },
+        {
+            R / 6 + R / 32,
+            -R / 7 - R / 32,
+        },
+    },
+    {
+        {
+            R / 6 + R / 32,
+            -R / 7 - R / 32,
+        },
+        {
+            R / 6 + R / 10,
+            -R / 7,
+        },
+    },
 };
 #undef R
 
 #define R (FRACUNIT)
-mline_t triangle_guy[] = {
-    { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
-    { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0      ), (fixed_t)(R    ) } },
-    { { (fixed_t)(0      ), (fixed_t)(R    ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
+mline_t triangle_guy[] =
+{
+    {
+        {
+            (fixed_t)(-.867 * R),
+            (fixed_t)(-.5 * R),
+        },
+        {
+            (fixed_t)(.867 * R),
+            (fixed_t)(-.5 * R),
+        },
+    },
+    {
+        {
+            (fixed_t)(.867 * R),
+            (fixed_t)(-.5 * R),
+        },
+        {
+            (fixed_t)(0),
+            (fixed_t)(R),
+        },
+    },
+    {
+        {
+            (fixed_t)(0),
+            (fixed_t)(R),
+        },
+        {
+            (fixed_t)(-.867 * R),
+            (fixed_t)(-.5 * R),
+        },
+    },
 };
 #undef R
 
 #define R (FRACUNIT)
-mline_t thintriangle_guy[] = {
-    { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
-    { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
-    { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
+mline_t thintriangle_guy[] =
+{
+    {
+        {
+            (fixed_t)(-.5 * R),
+            (fixed_t)(-.7 * R),
+        },
+        {
+            (fixed_t)(R),
+            (fixed_t)(0),
+        },
+    },
+    {
+        {
+            (fixed_t)(R),
+            (fixed_t)(0),
+        },
+        {
+            (fixed_t)(-.5 * R),
+            (fixed_t)(.7 * R),
+        },
+    },
+    {
+        {
+            (fixed_t)(-.5 * R),
+            (fixed_t)(.7 * R),
+        },
+        {
+            (fixed_t)(-.5 * R),
+            (fixed_t)(-.7 * R),
+        },
+    },
 };
 #undef R
 
-
-
-
-static int 	cheating = 0;
-static int 	grid = 0;
-
-boolean    	automapactive = false;
-static int 	finit_width = SCREENWIDTH;
-static int 	finit_height = SCREENHEIGHT - ST_HEIGHT;
-
-// location of window on screen
-static int 	f_x;
-static int	f_y;
-
-// size of window on screen
-static int 	f_w;
-static int	f_h;
-
-static int 	lightlev; 		// used for funky strobing effect
-static pixel_t*	fb; 			// pseudo-frame buffer
-static int 	amclock;
-
-static mpoint_t m_paninc; // how far the window pans each tic (map coords)
-static fixed_t 	mtof_zoommul; // how far the window zooms in each tic (map coords)
-static fixed_t 	ftom_zoommul; // how far the window zooms in each tic (fb coords)
-
-static fixed_t 	m_x, m_y;   // LL x,y where the window is on the map (map coords)
-static fixed_t 	m_x2, m_y2; // UR x,y where the window is on the map (map coords)
-
-//
-// width/height of window on map (map coords)
-//
-static fixed_t 	m_w;
-static fixed_t	m_h;
-
-// based on level size
-static fixed_t 	min_x;
-static fixed_t	min_y; 
-static fixed_t 	max_x;
-static fixed_t  max_y;
-
-static fixed_t 	max_w; // max_x-min_x,
-static fixed_t  max_h; // max_y-min_y
-
-// based on player size
-static fixed_t 	min_w;
-static fixed_t  min_h;
-
-
-static fixed_t 	min_scale_mtof; // used to tell when to stop zooming out
-static fixed_t 	max_scale_mtof; // used to tell when to stop zooming in
-
-// old stuff for recovery later
-static fixed_t old_m_w, old_m_h;
-static fixed_t old_m_x, old_m_y;
-
-// old location used by the Follower routine
-static mpoint_t f_oldloc;
-
-// used by MTOF to scale from map-to-frame-buffer coords
-static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
-// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
-static fixed_t scale_ftom;
-
-static player_t *plr; // the player represented by an arrow
-
-static patch_t *marknums[10]; // numbers used for marking by the automap
-static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
-static int markpointnum = 0; // next point to be assigned
-
-static int followplayer = 1; // specifies whether to follow the player around
+boolean automapactive = false;
 
 cheatseq_t cheat_amap = CHEAT("iddt", 0);
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int cheating = 0;
+static int grid = 0;
+
+static int finit_width = SCREENWIDTH;
+static int finit_height = SCREENHEIGHT - ST_HEIGHT;
+
+/* location of window on screen */
+
+static int f_x;
+static int f_y;
+
+/* size of window on screen */
+
+static int f_w;
+static int f_h;
+
+static int lightlev; /* used for funky strobing effect */
+static pixel_t *fb;  /* pseudo-frame buffer */
+static int amclock;
+
+/* how far the window pans each tic (map coords) */
+
+static mpoint_t m_paninc;
+
+/* how far the window zooms in each tic (map coords) */
+
+static fixed_t mtof_zoommul;
+
+/* how far the window zooms in each tic (fb coords) */
+
+static fixed_t ftom_zoommul;
+
+/* LL x,y where the window is on the map (map coords) */
+
+static fixed_t m_x;
+static fixed_t m_y;
+
+/* UR x,y where the window is on the map (map coords) */
+
+static fixed_t m_x2;
+static fixed_t m_y2;
+
+/* width/height of window on map (map coords) */
+
+static fixed_t m_w;
+static fixed_t m_h;
+
+/* based on level size */
+
+static fixed_t min_x;
+static fixed_t min_y;
+static fixed_t max_x;
+static fixed_t max_y;
+
+static fixed_t max_w; /* max_x-min_x, */
+static fixed_t max_h; /* max_y-min_y */
+
+/* based on player size */
+
+static fixed_t min_w;
+static fixed_t min_h;
+
+static fixed_t min_scale_mtof; /* used to tell when to stop zooming out */
+static fixed_t max_scale_mtof; /* used to tell when to stop zooming in */
+
+/* old stuff for recovery later */
+
+static fixed_t old_m_w;
+static fixed_t old_m_h;
+static fixed_t old_m_x;
+static fixed_t old_m_y;
+
+/* old location used by the Follower routine */
+
+static mpoint_t f_oldloc;
+
+/* used by MTOF to scale from map-to-frame-buffer coords */
+
+static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
+
+/* used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof) */
+
+static fixed_t scale_ftom;
+
+static player_t *plr; /* the player represented by an arrow */
+
+static patch_t *marknums[10]; /* numbers used for marking by the automap */
+
+static mpoint_t markpoints[AM_NUMMARKPOINTS]; /* where the points are */
+
+static int markpointnum = 0; /* next point to be assigned */
+
+/* specifies whether to follow the player around */
+
+static int followplayer = 1;
+
 static boolean stopped = true;
 
-// Calculates the slope and slope according to the x-axis of a line
-// segment in map coordinates (with the upright y-axis n' all) so
-// that it can be used with the brain-dead drawing stuff.
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-void
-AM_getIslope
-( mline_t*	ml,
-  islope_t*	is )
+/****************************************************************************
+ * Name: am_get_i_slope
+ *
+ * Description:
+ *  Calculates the slope and slope according to the x-axis of a line
+ *  segment in map coordinates (with the upright y-axis n' all) so
+ *  that it can be used with the brain-dead drawing stuff.
+ *
+ ****************************************************************************/
+
+static void am_get_i_slope(mline_t *ml, islope_t *is)
 {
-    int dx, dy;
-
-    dy = ml->a.y - ml->b.y;
-    dx = ml->b.x - ml->a.x;
-    if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
-    else is->islp = FixedDiv(dx, dy);
-    if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
-    else is->slp = FixedDiv(dy, dx);
+  int dx;
+  int dy;
 
+  dy = ml->a.y - ml->b.y;
+  dx = ml->b.x - ml->a.x;
+  if (!dy)
+    is->islp = (dx < 0 ? -INT_MAX : INT_MAX);
+  else
+    is->islp = fixed_div(dx, dy);
+  if (!dx)
+    is->slp = (dy < 0 ? -INT_MAX : INT_MAX);
+  else
+    is->slp = fixed_div(dy, dx);
 }
 
-//
-//
-//
-void AM_activateNewScale(void)
+/****************************************************************************
+ * Name: am_activate_new_scale
+ ****************************************************************************/
+
+static void am_activate_new_scale(void)
 {
-    m_x += m_w/2;
-    m_y += m_h/2;
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-    m_x -= m_w/2;
-    m_y -= m_h/2;
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
+  m_x += m_w / 2;
+  m_y += m_h / 2;
+  m_w = FTOM(f_w);
+  m_h = FTOM(f_h);
+  m_x -= m_w / 2;
+  m_y -= m_h / 2;
+  m_x2 = m_x + m_w;
+  m_y2 = m_y + m_h;
 }
 
-//
-//
-//
-void AM_saveScaleAndLoc(void)
+/****************************************************************************
+ * Name: am_save_scale_and_loc
+ ****************************************************************************/
+
+static void am_save_scale_and_loc(void)
 {
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
+  old_m_x = m_x;
+  old_m_y = m_y;
+  old_m_w = m_w;
+  old_m_h = m_h;
 }
 
-//
-//
-//
-void AM_restoreScaleAndLoc(void)
-{
+/****************************************************************************
+ * Name: am_restore_scale_and_loc
+ ****************************************************************************/
 
-    m_w = old_m_w;
-    m_h = old_m_h;
-    if (!followplayer)
+static void am_restore_scale_and_loc(void)
+{
+  m_w = old_m_w;
+  m_h = old_m_h;
+
+  if (!followplayer)
     {
-	m_x = old_m_x;
-	m_y = old_m_y;
-    } else {
-	m_x = plr->mo->x - m_w/2;
-	m_y = plr->mo->y - m_h/2;
+      m_x = old_m_x;
+      m_y = old_m_y;
     }
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-
-    // Change the scaling multipliers
-    scale_mtof = FixedDiv(f_w<<FRACBITS, m_w);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-//
-// adds a marker at the current location
-//
-void AM_addMark(void)
-{
-    markpoints[markpointnum].x = m_x + m_w/2;
-    markpoints[markpointnum].y = m_y + m_h/2;
-    markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
-
-}
-
-//
-// Determines bounding box of all vertices,
-// sets global variables controlling zoom range.
-//
-void AM_findMinMaxBoundaries(void)
-{
-    int i;
-    fixed_t a;
-    fixed_t b;
-
-    min_x = min_y =  INT_MAX;
-    max_x = max_y = -INT_MAX;
-  
-    for (i=0;i<numvertexes;i++)
+  else
     {
-	if (vertexes[i].x < min_x)
-	    min_x = vertexes[i].x;
-	else if (vertexes[i].x > max_x)
-	    max_x = vertexes[i].x;
-    
-	if (vertexes[i].y < min_y)
-	    min_y = vertexes[i].y;
-	else if (vertexes[i].y > max_y)
-	    max_y = vertexes[i].y;
-    }
-  
-    max_w = max_x - min_x;
-    max_h = max_y - min_y;
-
-    min_w = 2*PLAYERRADIUS; // const? never changed?
-    min_h = 2*PLAYERRADIUS;
-
-    a = FixedDiv(f_w<<FRACBITS, max_w);
-    b = FixedDiv(f_h<<FRACBITS, max_h);
-  
-    min_scale_mtof = a < b ? a : b;
-    max_scale_mtof = FixedDiv(f_h<<FRACBITS, 2*PLAYERRADIUS);
-
-}
-
-
-//
-//
-//
-void AM_changeWindowLoc(void)
-{
-    if (m_paninc.x || m_paninc.y)
-    {
-	followplayer = 0;
-	f_oldloc.x = INT_MAX;
+      m_x = plr->mo->x - m_w / 2;
+      m_y = plr->mo->y - m_h / 2;
     }
 
-    m_x += m_paninc.x;
-    m_y += m_paninc.y;
+  m_x2 = m_x + m_w;
+  m_y2 = m_y + m_h;
 
-    if (m_x + m_w/2 > max_x)
-	m_x = max_x - m_w/2;
-    else if (m_x + m_w/2 < min_x)
-	m_x = min_x - m_w/2;
-  
-    if (m_y + m_h/2 > max_y)
-	m_y = max_y - m_h/2;
-    else if (m_y + m_h/2 < min_y)
-	m_y = min_y - m_h/2;
+  /* Change the scaling multipliers */
 
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
+  scale_mtof = fixed_div(f_w << FRACBITS, m_w);
+  scale_ftom = fixed_div(FRACUNIT, scale_mtof);
 }
 
+/****************************************************************************
+ * Name: am_add_mark
+ *
+ * Description:
+ *  adds a marker at the current location
+ *
+ ****************************************************************************/
 
-//
-//
-//
-void AM_initVariables(void)
+static void am_add_mark(void)
 {
-    int pnum;
-    static event_t st_notify = { ev_keyup, AM_MSGENTERED, 0, 0 };
+  markpoints[markpointnum].x = m_x + m_w / 2;
+  markpoints[markpointnum].y = m_y + m_h / 2;
+  markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
+}
 
-    automapactive = true;
-    fb = I_VideoBuffer;
+/****************************************************************************
+ * Name: am_find_minmax_boundaries
+ *
+ * Description:
+ *  Determines bounding box of all vertices, sets global variables
+ *  controlling zoom range.
+ *
+ ****************************************************************************/
 
-    f_oldloc.x = INT_MAX;
-    amclock = 0;
-    lightlev = 0;
+static void am_find_minmax_boundaries(void)
+{
+  int i;
+  fixed_t a;
+  fixed_t b;
 
-    m_paninc.x = m_paninc.y = 0;
-    ftom_zoommul = FRACUNIT;
-    mtof_zoommul = FRACUNIT;
+  min_x = min_y = INT_MAX;
+  max_x = max_y = -INT_MAX;
 
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-
-    // find player to center on initially
-    if (playeringame[consoleplayer])
+  for (i = 0; i < numvertices; i++)
     {
-        plr = &players[consoleplayer];
+      if (vertices[i].x < min_x)
+        min_x = vertices[i].x;
+      else if (vertices[i].x > max_x)
+        max_x = vertices[i].x;
+
+      if (vertices[i].y < min_y)
+        min_y = vertices[i].y;
+      else if (vertices[i].y > max_y)
+        max_y = vertices[i].y;
     }
-    else
-    {
-        plr = &players[0];
 
-	for (pnum=0;pnum<MAXPLAYERS;pnum++)
+  max_w = max_x - min_x;
+  max_h = max_y - min_y;
+
+  min_w = 2 * PLAYERRADIUS; /* const? never changed? */
+  min_h = 2 * PLAYERRADIUS;
+
+  a = fixed_div(f_w << FRACBITS, max_w);
+  b = fixed_div(f_h << FRACBITS, max_h);
+
+  min_scale_mtof = a < b ? a : b;
+  max_scale_mtof = fixed_div(f_h << FRACBITS, 2 * PLAYERRADIUS);
+}
+
+/****************************************************************************
+ * Name: am_change_window_loc
+ ****************************************************************************/
+
+static void am_change_window_loc(void)
+{
+  if (m_paninc.x || m_paninc.y)
+    {
+      followplayer = 0;
+      f_oldloc.x = INT_MAX;
+    }
+
+  m_x += m_paninc.x;
+  m_y += m_paninc.y;
+
+  if (m_x + m_w / 2 > max_x)
+    m_x = max_x - m_w / 2;
+  else if (m_x + m_w / 2 < min_x)
+    m_x = min_x - m_w / 2;
+
+  if (m_y + m_h / 2 > max_y)
+    m_y = max_y - m_h / 2;
+  else if (m_y + m_h / 2 < min_y)
+    m_y = min_y - m_h / 2;
+
+  m_x2 = m_x + m_w;
+  m_y2 = m_y + m_h;
+}
+
+/****************************************************************************
+ * Name: am_init_variables
+ ****************************************************************************/
+
+static void am_init_variables(void)
+{
+  int pnum;
+  static event_t st_notify =
+  {
+    ev_keyup, AM_MSGENTERED, 0, 0
+  };
+
+  automapactive = true;
+  fb = i_video_buffer;
+
+  f_oldloc.x = INT_MAX;
+  amclock = 0;
+  lightlev = 0;
+
+  m_paninc.x = m_paninc.y = 0;
+  ftom_zoommul = FRACUNIT;
+  mtof_zoommul = FRACUNIT;
+
+  m_w = FTOM(f_w);
+  m_h = FTOM(f_h);
+
+  /* find player to center on initially */
+
+  if (playeringame[consoleplayer])
+    {
+      plr = &players[consoleplayer];
+    }
+  else
+    {
+      plr = &players[0];
+
+      for (pnum = 0; pnum < MAXPLAYERS; pnum++)
         {
-	    if (playeringame[pnum])
+          if (playeringame[pnum])
             {
-                plr = &players[pnum];
-		break;
+              plr = &players[pnum];
+              break;
             }
         }
     }
 
-    m_x = plr->mo->x - m_w/2;
-    m_y = plr->mo->y - m_h/2;
-    AM_changeWindowLoc();
+  m_x = plr->mo->x - m_w / 2;
+  m_y = plr->mo->y - m_h / 2;
+  am_change_window_loc();
 
-    // for saving & restoring
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
+  /* for saving & restoring */
 
-    // inform the status bar of the change
-    ST_Responder(&st_notify);
+  old_m_x = m_x;
+  old_m_y = m_y;
+  old_m_w = m_w;
+  old_m_h = m_h;
 
+  /* inform the status bar of the change */
+
+  st_responder(&st_notify);
 }
 
-//
-// 
-//
-void AM_loadPics(void)
-{
-    int i;
-    char namebuf[9];
-  
-    for (i=0;i<10;i++)
-    {
-	DEH_snprintf(namebuf, 9, "AMMNUM%d", i);
-	marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
-    }
+/****************************************************************************
+ * Name: am_load_pics
+ ****************************************************************************/
 
-}
-
-void AM_unloadPics(void)
+static void am_load_pics(void)
 {
-    int i;
-    char namebuf[9];
-  
-    for (i=0;i<10;i++)
+  int i;
+  char namebuf[9];
+
+  for (i = 0; i < 10; i++)
     {
-	DEH_snprintf(namebuf, 9, "AMMNUM%d", i);
-	W_ReleaseLumpName(namebuf);
+      snprintf(namebuf, 9, "AMMNUM%d", i);
+      marknums[i] = w_cache_lump_name(namebuf, PU_STATIC);
     }
 }
 
-void AM_clearMarks(void)
+/****************************************************************************
+ * Name: am_unload_pics
+ ****************************************************************************/
+
+static void am_unload_pics(void)
 {
-    int i;
+  int i;
+  char namebuf[9];
 
-    for (i=0;i<AM_NUMMARKPOINTS;i++)
-	markpoints[i].x = -1; // means empty
-    markpointnum = 0;
-}
-
-//
-// should be called at the start of every level
-// right now, i figure it out myself
-//
-void AM_LevelInit(void)
-{
-    f_x = f_y = 0;
-    f_w = finit_width;
-    f_h = finit_height;
-
-    AM_clearMarks();
-
-    AM_findMinMaxBoundaries();
-    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7*FRACUNIT));
-    if (scale_mtof > max_scale_mtof)
-	scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-
-
-
-//
-//
-//
-void AM_Stop (void)
-{
-    static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED, 0 };
-
-    AM_unloadPics();
-    automapactive = false;
-    ST_Responder(&st_notify);
-    stopped = true;
-}
-
-//
-//
-//
-void AM_Start (void)
-{
-    static int lastlevel = -1, lastepisode = -1;
-
-    if (!stopped) AM_Stop();
-    stopped = false;
-    if (lastlevel != gamemap || lastepisode != gameepisode)
+  for (i = 0; i < 10; i++)
     {
-	AM_LevelInit();
-	lastlevel = gamemap;
-	lastepisode = gameepisode;
+      snprintf(namebuf, 9, "AMMNUM%d", i);
+      w_release_lump_name(namebuf);
     }
-    AM_initVariables();
-    AM_loadPics();
 }
 
-//
-// set the window scale to the maximum size
-//
-void AM_minOutWindowScale(void)
+/****************************************************************************
+ * Name: am_clear_marks
+ ****************************************************************************/
+
+static void am_clear_marks(void)
 {
-    scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
+  int i;
 
-//
-// set the window scale to the minimum size
-//
-void AM_maxOutWindowScale(void)
-{
-    scale_mtof = max_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-
-//
-// Handle events (user inputs) in automap mode
-//
-boolean
-AM_Responder
-( event_t*	ev )
-{
-
-    int rc;
-    static int bigstate=0;
-    static char buffer[20];
-    int key;
-
-    rc = false;
-
-    if (ev->type == ev_joystick && joybautomap >= 0
-        && (ev->data1 & (1 << joybautomap)) != 0)
+  for (i = 0; i < AM_NUMMARKPOINTS; i++)
     {
-        joywait = I_GetTime() + 5;
-
-        if (!automapactive)
-        {
-            AM_Start ();
-            viewactive = false;
-        }
-        else
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop ();
-        }
-
-        return true;
+      markpoints[i].x = -1; /* means empty */
     }
 
-    if (!automapactive)
-    {
-	if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
-	{
-	    AM_Start ();
-	    viewactive = false;
-	    rc = true;
-	}
-    }
-    else if (ev->type == ev_keydown)
-    {
-	rc = true;
-        key = ev->data1;
+  markpointnum = 0;
+}
 
-        if (key == key_map_east)          // pan right
-        {
-            if (!followplayer) m_paninc.x = FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_west)     // pan left
-        {
-            if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_north)    // pan up
-        {
-            if (!followplayer) m_paninc.y = FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_south)    // pan down
-        {
-            if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_zoomout)  // zoom out
-        {
-            mtof_zoommul = M_ZOOMOUT;
-            ftom_zoommul = M_ZOOMIN;
-        }
-        else if (key == key_map_zoomin)   // zoom in
-        {
-            mtof_zoommul = M_ZOOMIN;
-            ftom_zoommul = M_ZOOMOUT;
-        }
-        else if (key == key_map_toggle)
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop ();
-        }
-        else if (key == key_map_maxzoom)
-        {
-            bigstate = !bigstate;
-            if (bigstate)
-            {
-                AM_saveScaleAndLoc();
-                AM_minOutWindowScale();
-            }
-            else AM_restoreScaleAndLoc();
-        }
-        else if (key == key_map_follow)
-        {
-            followplayer = !followplayer;
-            f_oldloc.x = INT_MAX;
-            if (followplayer)
-                plr->message = DEH_String(AMSTR_FOLLOWON);
-            else
-                plr->message = DEH_String(AMSTR_FOLLOWOFF);
-        }
-        else if (key == key_map_grid)
-        {
-            grid = !grid;
-            if (grid)
-                plr->message = DEH_String(AMSTR_GRIDON);
-            else
-                plr->message = DEH_String(AMSTR_GRIDOFF);
-        }
-        else if (key == key_map_mark)
-        {
-            M_snprintf(buffer, sizeof(buffer), "%s %d",
-                       DEH_String(AMSTR_MARKEDSPOT), markpointnum);
-            plr->message = buffer;
-            AM_addMark();
-        }
-        else if (key == key_map_clearmark)
-        {
-            AM_clearMarks();
-            plr->message = DEH_String(AMSTR_MARKSCLEARED);
-        }
-        else
-        {
-            rc = false;
-        }
+/****************************************************************************
+ * Name: am_level_init
+ *
+ * Description:
+ *  should be called at the start of every level right now, i figure it out
+ *  myself
+ *
+ ****************************************************************************/
 
-        if ((!deathmatch || gameversion <= exe_doom_1_8)
-         && cht_CheckCheat(&cheat_amap, ev->data2))
-        {
-            rc = false;
-            cheating = (cheating + 1) % 3;
-        }
-    }
-    else if (ev->type == ev_keyup)
+static void am_level_init(void)
+{
+  f_x = f_y = 0;
+  f_w = finit_width;
+  f_h = finit_height;
+
+  am_clear_marks();
+
+  am_find_minmax_boundaries();
+  scale_mtof = fixed_div(min_scale_mtof, (int)(0.7 * FRACUNIT));
+  if (scale_mtof > max_scale_mtof) scale_mtof = min_scale_mtof;
+  scale_ftom = fixed_div(FRACUNIT, scale_mtof);
+}
+
+/****************************************************************************
+ * Name: am_start
+ ****************************************************************************/
+
+static void am_start(void)
+{
+  static int lastlevel = -1;
+  static int lastepisode = -1;
+
+  if (!stopped) am_stop();
+  stopped = false;
+  if (lastlevel != gamemap || lastepisode != gameepisode)
     {
-        rc = false;
-        key = ev->data1;
-
-        if (key == key_map_east)
-        {
-            if (!followplayer) m_paninc.x = 0;
-        }
-        else if (key == key_map_west)
-        {
-            if (!followplayer) m_paninc.x = 0;
-        }
-        else if (key == key_map_north)
-        {
-            if (!followplayer) m_paninc.y = 0;
-        }
-        else if (key == key_map_south)
-        {
-            if (!followplayer) m_paninc.y = 0;
-        }
-        else if (key == key_map_zoomout || key == key_map_zoomin)
-        {
-            mtof_zoommul = FRACUNIT;
-            ftom_zoommul = FRACUNIT;
-        }
+      am_level_init();
+      lastlevel = gamemap;
+      lastepisode = gameepisode;
     }
 
-    return rc;
-
+  am_init_variables();
+  am_load_pics();
 }
 
+/****************************************************************************
+ * Name: am_min_out_window_scale
+ *
+ * Description:
+ *  set the window scale to the maximum size
+ *
+ ****************************************************************************/
 
-//
-// Zooming
-//
-void AM_changeWindowScale(void)
+static void am_min_out_window_scale(void)
 {
-
-    // Change the scaling multipliers
-    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-
-    if (scale_mtof < min_scale_mtof)
-	AM_minOutWindowScale();
-    else if (scale_mtof > max_scale_mtof)
-	AM_maxOutWindowScale();
-    else
-	AM_activateNewScale();
+  scale_mtof = min_scale_mtof;
+  scale_ftom = fixed_div(FRACUNIT, scale_mtof);
+  am_activate_new_scale();
 }
 
+/****************************************************************************
+ * Name: am_max_out_window_scale
+ *
+ * Description:
+ *  set the window scale to the minimum size
+ *
+ ****************************************************************************/
 
-//
-//
-//
-void AM_doFollowPlayer(void)
+static void am_max_out_window_scale(void)
 {
+  scale_mtof = max_scale_mtof;
+  scale_ftom = fixed_div(FRACUNIT, scale_mtof);
+  am_activate_new_scale();
+}
 
-    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
+/****************************************************************************
+ * Name: am_change_window_scale
+ *
+ * Description:
+ *  Zooming
+ *
+ ****************************************************************************/
+
+static void am_change_window_scale(void)
+{
+  /* Change the scaling multipliers */
+
+  scale_mtof = fixed_mul(scale_mtof, mtof_zoommul);
+  scale_ftom = fixed_div(FRACUNIT, scale_mtof);
+
+  if (scale_mtof < min_scale_mtof)
+    am_min_out_window_scale();
+  else if (scale_mtof > max_scale_mtof)
+    am_max_out_window_scale();
+  else
+    am_activate_new_scale();
+}
+
+/****************************************************************************
+ * Name: am_do_follow_player
+ ****************************************************************************/
+
+static void am_do_follow_player(void)
+{
+  if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
     {
-	m_x = FTOM(MTOF(plr->mo->x)) - m_w/2;
-	m_y = FTOM(MTOF(plr->mo->y)) - m_h/2;
-	m_x2 = m_x + m_w;
-	m_y2 = m_y + m_h;
-	f_oldloc.x = plr->mo->x;
-	f_oldloc.y = plr->mo->y;
-
-	//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
-	//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
-	//  m_x = plr->mo->x - m_w/2;
-	//  m_y = plr->mo->y - m_h/2;
+      m_x = FTOM(MTOF(plr->mo->x)) - m_w / 2;
+      m_y = FTOM(MTOF(plr->mo->y)) - m_h / 2;
+      m_x2 = m_x + m_w;
+      m_y2 = m_y + m_h;
+      f_oldloc.x = plr->mo->x;
+      f_oldloc.y = plr->mo->y;
 
+      /*  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
+       *  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
+       *  m_x = plr->mo->x - m_w/2;
+       *  m_y = plr->mo->y - m_h/2;
+       */
     }
-
 }
 
-//
-//
-//
-void AM_updateLightLev(void)
+/****************************************************************************
+ * Name: am_update_light_lev
+ ****************************************************************************/
+
+static void am_update_light_lev(void)
 {
-    static int nexttic = 0;
-    //static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
-    static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
-    static int litelevelscnt = 0;
-   
-    // Change light level
-    if (amclock>nexttic)
+  static int nexttic = 0;
+
+  /* static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 }; */
+
+  static int litelevels[] =
+  {
+    0, 4, 7, 10, 12, 14, 15, 15
+  };
+
+  static int litelevelscnt = 0;
+
+  /* Change light level */
+
+  if (amclock > nexttic)
     {
-	lightlev = litelevels[litelevelscnt++];
-	if (litelevelscnt == arrlen(litelevels)) litelevelscnt = 0;
-	nexttic = amclock + 6 - (amclock % 6);
+      lightlev = litelevels[litelevelscnt++];
+      if (litelevelscnt == arrlen(litelevels)) litelevelscnt = 0;
+      nexttic = amclock + 6 - (amclock % 6);
     }
-
 }
 
+/****************************************************************************
+ * Name: am_clear_fb
+ *
+ * Description:
+ *  Clear automap frame buffer.
+ *
+ ****************************************************************************/
 
-//
-// Updates on Game Tick
-//
-void AM_Ticker (void)
+static void am_clear_fb(int color)
 {
-
-    if (!automapactive)
-	return;
-
-    amclock++;
-
-    if (followplayer)
-	AM_doFollowPlayer();
-
-    // Change the zoom if necessary
-    if (ftom_zoommul != FRACUNIT)
-	AM_changeWindowScale();
-
-    // Change x,y location
-    if (m_paninc.x || m_paninc.y)
-	AM_changeWindowLoc();
-
-    // Update light level
-    // AM_updateLightLev();
-
+  memset(fb, color, f_w * f_h * sizeof(*fb));
 }
 
+/****************************************************************************
+ * Name: am_clip_m_line
+ *
+ * Description:
+ *  Automap clipping of lines.
+ *  Based on Cohen-Sutherland clipping algorithm but with a slightly
+ *  faster reject and precalculated slopes.  If the speed is needed,
+ *  use a hash algorithm to handle  the common cases.
+ *
+ ****************************************************************************/
 
-//
-// Clear automap frame buffer.
-//
-void AM_clearFB(int color)
+static boolean am_clip_m_line(mline_t *ml, fline_t *fl)
 {
-    memset(fb, color, f_w*f_h*sizeof(*fb));
-}
-
-
-//
-// Automap clipping of lines.
-//
-// Based on Cohen-Sutherland clipping algorithm but with a slightly
-// faster reject and precalculated slopes.  If the speed is needed,
-// use a hash algorithm to handle  the common cases.
-//
-boolean
-AM_clipMline
-( mline_t*	ml,
-  fline_t*	fl )
-{
-    enum
+  enum
     {
-	LEFT	=1,
-	RIGHT	=2,
-	BOTTOM	=4,
-	TOP	=8
+      LEFT = 1,
+      RIGHT = 2,
+      BOTTOM = 4,
+      TOP = 8
     };
-    
-    register int	outcode1 = 0;
-    register int	outcode2 = 0;
-    register int	outside;
-    
-    fpoint_t	tmp;
-    int		dx;
-    int		dy;
 
-    
-#define DOOUTCODE(oc, mx, my) \
-    (oc) = 0; \
-    if ((my) < 0) (oc) |= TOP; \
-    else if ((my) >= f_h) (oc) |= BOTTOM; \
-    if ((mx) < 0) (oc) |= LEFT; \
-    else if ((mx) >= f_w) (oc) |= RIGHT;
+  register int outcode1 = 0;
+  register int outcode2 = 0;
+  register int outside;
 
-    
-    // do trivial rejects and outcodes
-    if (ml->a.y > m_y2)
-	outcode1 = TOP;
-    else if (ml->a.y < m_y)
-	outcode1 = BOTTOM;
+  fpoint_t tmp;
+  int dx;
+  int dy;
 
-    if (ml->b.y > m_y2)
-	outcode2 = TOP;
-    else if (ml->b.y < m_y)
-	outcode2 = BOTTOM;
-    
-    if (outcode1 & outcode2)
-	return false; // trivially outside
+#define DOOUTCODE(oc, mx, my)                                                \
+  (oc) = 0;                                                                  \
+  if ((my) < 0)                                                              \
+    (oc) |= TOP;                                                             \
+  else if ((my) >= f_h)                                                      \
+    (oc) |= BOTTOM;                                                          \
+  if ((mx) < 0)                                                              \
+    (oc) |= LEFT;                                                            \
+  else if ((mx) >= f_w)                                                      \
+    (oc) |= RIGHT;
 
-    if (ml->a.x < m_x)
-	outcode1 |= LEFT;
-    else if (ml->a.x > m_x2)
-	outcode1 |= RIGHT;
-    
-    if (ml->b.x < m_x)
-	outcode2 |= LEFT;
-    else if (ml->b.x > m_x2)
-	outcode2 |= RIGHT;
-    
-    if (outcode1 & outcode2)
-	return false; // trivially outside
+  /* do trivial rejects and outcodes */
 
-    // transform to frame-buffer coordinates.
-    fl->a.x = CXMTOF(ml->a.x);
-    fl->a.y = CYMTOF(ml->a.y);
-    fl->b.x = CXMTOF(ml->b.x);
-    fl->b.y = CYMTOF(ml->b.y);
+  if (ml->a.y > m_y2)
+    outcode1 = TOP;
+  else if (ml->a.y < m_y)
+    outcode1 = BOTTOM;
 
-    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+  if (ml->b.y > m_y2)
+    outcode2 = TOP;
+  else if (ml->b.y < m_y)
+    outcode2 = BOTTOM;
 
-    if (outcode1 & outcode2)
-	return false;
+  if (outcode1 & outcode2) return false; /* trivially outside */
 
-    while (outcode1 | outcode2)
+  if (ml->a.x < m_x)
+    outcode1 |= LEFT;
+  else if (ml->a.x > m_x2)
+    outcode1 |= RIGHT;
+
+  if (ml->b.x < m_x)
+    outcode2 |= LEFT;
+  else if (ml->b.x > m_x2)
+    outcode2 |= RIGHT;
+
+  if (outcode1 & outcode2) return false; /* trivially outside */
+
+  /* transform to frame-buffer coordinates. */
+
+  fl->a.x = CXMTOF(ml->a.x);
+  fl->a.y = CYMTOF(ml->a.y);
+  fl->b.x = CXMTOF(ml->b.x);
+  fl->b.y = CYMTOF(ml->b.y);
+
+  DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+  DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+
+  if (outcode1 & outcode2) return false;
+
+  while (outcode1 | outcode2)
     {
-	// may be partially inside box
-	// find an outside point
-	if (outcode1)
-	    outside = outcode1;
-	else
-	    outside = outcode2;
-	
-	// clip to each side
-	if (outside & TOP)
-	{
-	    dy = fl->a.y - fl->b.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.x = fl->a.x + (dx*(fl->a.y))/dy;
-	    tmp.y = 0;
-	}
-	else if (outside & BOTTOM)
-	{
-	    dy = fl->a.y - fl->b.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.x = fl->a.x + (dx*(fl->a.y-f_h))/dy;
-	    tmp.y = f_h-1;
-	}
-	else if (outside & RIGHT)
-	{
-	    dy = fl->b.y - fl->a.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.y = fl->a.y + (dy*(f_w-1 - fl->a.x))/dx;
-	    tmp.x = f_w-1;
-	}
-	else if (outside & LEFT)
-	{
-	    dy = fl->b.y - fl->a.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.y = fl->a.y + (dy*(-fl->a.x))/dx;
-	    tmp.x = 0;
-	}
-        else
+      /* may be partially inside box find an outside point */
+
+      if (outcode1)
+        outside = outcode1;
+      else
+        outside = outcode2;
+
+      /* clip to each side */
+
+      if (outside & TOP)
         {
-            tmp.x = 0;
-            tmp.y = 0;
+          dy = fl->a.y - fl->b.y;
+          dx = fl->b.x - fl->a.x;
+          tmp.x = fl->a.x + (dx * (fl->a.y)) / dy;
+          tmp.y = 0;
+        }
+      else if (outside & BOTTOM)
+        {
+          dy = fl->a.y - fl->b.y;
+          dx = fl->b.x - fl->a.x;
+          tmp.x = fl->a.x + (dx * (fl->a.y - f_h)) / dy;
+          tmp.y = f_h - 1;
+        }
+      else if (outside & RIGHT)
+        {
+          dy = fl->b.y - fl->a.y;
+          dx = fl->b.x - fl->a.x;
+          tmp.y = fl->a.y + (dy * (f_w - 1 - fl->a.x)) / dx;
+          tmp.x = f_w - 1;
+        }
+      else if (outside & LEFT)
+        {
+          dy = fl->b.y - fl->a.y;
+          dx = fl->b.x - fl->a.x;
+          tmp.y = fl->a.y + (dy * (-fl->a.x)) / dx;
+          tmp.x = 0;
+        }
+      else
+        {
+          tmp.x = 0;
+          tmp.y = 0;
         }
 
-	if (outside == outcode1)
-	{
-	    fl->a = tmp;
-	    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-	}
-	else
-	{
-	    fl->b = tmp;
-	    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-	}
-	
-	if (outcode1 & outcode2)
-	    return false; // trivially outside
+      if (outside == outcode1)
+        {
+          fl->a = tmp;
+          DOOUTCODE(outcode1, fl->a.x, fl->a.y);
+        }
+      else
+        {
+          fl->b = tmp;
+          DOOUTCODE(outcode2, fl->b.x, fl->b.y);
+        }
+
+      if (outcode1 & outcode2) return false; /* trivially outside */
     }
 
-    return true;
+  return true;
 }
 #undef DOOUTCODE
 
+/****************************************************************************
+ * Name: am_draw_f_line
+ *
+ * Description:
+ *  Classic Bresenham w/ whatever optimizations needed for speed
+ *
+ ****************************************************************************/
 
-//
-// Classic Bresenham w/ whatever optimizations needed for speed
-//
-void
-AM_drawFline
-( fline_t*	fl,
-  int		color )
+static void am_draw_f_line(fline_t *fl, int color)
 {
-    register int x;
-    register int y;
-    register int dx;
-    register int dy;
-    register int sx;
-    register int sy;
-    register int ax;
-    register int ay;
-    register int d;
-    
-    static int fuck = 0;
+  register int x;
+  register int y;
+  register int dx;
+  register int dy;
+  register int sx;
+  register int sy;
+  register int ax;
+  register int ay;
+  register int d;
 
-    // For debugging only
-    if (      fl->a.x < 0 || fl->a.x >= f_w
-	   || fl->a.y < 0 || fl->a.y >= f_h
-	   || fl->b.x < 0 || fl->b.x >= f_w
-	   || fl->b.y < 0 || fl->b.y >= f_h)
+  static int fuck = 0;
+
+  /* For debugging only */
+
+  if (fl->a.x < 0 || fl->a.x >= f_w || fl->a.y < 0 || fl->a.y >= f_h ||
+      fl->b.x < 0 || fl->b.x >= f_w || fl->b.y < 0 || fl->b.y >= f_h)
     {
-        DEH_fprintf(stderr, "fuck %d \r", fuck++);
-	return;
+      fprintf(stderr, "fuck %d \r", fuck++);
+      return;
     }
 
-#define PUTDOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)
+#define PUTDOT(xx, yy, cc) fb[(yy) * f_w + (xx)] = (cc)
 
-    dx = fl->b.x - fl->a.x;
-    ax = 2 * (dx<0 ? -dx : dx);
-    sx = dx<0 ? -1 : 1;
+  dx = fl->b.x - fl->a.x;
+  ax = 2 * (dx < 0 ? -dx : dx);
+  sx = dx < 0 ? -1 : 1;
 
-    dy = fl->b.y - fl->a.y;
-    ay = 2 * (dy<0 ? -dy : dy);
-    sy = dy<0 ? -1 : 1;
+  dy = fl->b.y - fl->a.y;
+  ay = 2 * (dy < 0 ? -dy : dy);
+  sy = dy < 0 ? -1 : 1;
 
-    x = fl->a.x;
-    y = fl->a.y;
+  x = fl->a.x;
+  y = fl->a.y;
 
-    if (ax > ay)
+  if (ax > ay)
     {
-	d = ay - ax/2;
-	while (1)
-	{
-	    PUTDOT(x,y,color);
-	    if (x == fl->b.x) return;
-	    if (d>=0)
-	    {
-		y += sy;
-		d -= ax;
-	    }
-	    x += sx;
-	    d += ay;
-	}
+      d = ay - ax / 2;
+      while (1)
+        {
+          PUTDOT(x, y, color);
+          if (x == fl->b.x) return;
+          if (d >= 0)
+            {
+              y += sy;
+              d -= ax;
+            }
+
+          x += sx;
+          d += ay;
+        }
     }
-    else
+  else
     {
-	d = ax - ay/2;
-	while (1)
-	{
-	    PUTDOT(x, y, color);
-	    if (y == fl->b.y) return;
-	    if (d >= 0)
-	    {
-		x += sx;
-		d -= ay;
-	    }
-	    y += sy;
-	    d += ax;
-	}
+      d = ax - ay / 2;
+      while (1)
+        {
+          PUTDOT(x, y, color);
+          if (y == fl->b.y) return;
+          if (d >= 0)
+            {
+              x += sx;
+              d -= ay;
+            }
+
+          y += sy;
+          d += ax;
+        }
     }
 }
 
+/****************************************************************************
+ * Name: am_draw_m_line
+ *
+ * Description:
+ *  Clip lines, draw visible part sof lines.
+ *
+ ****************************************************************************/
 
-//
-// Clip lines, draw visible part sof lines.
-//
-void
-AM_drawMline
-( mline_t*	ml,
-  int		color )
+void am_draw_m_line(mline_t *ml, int color)
 {
-    static fline_t fl;
+  static fline_t fl;
 
-    if (AM_clipMline(ml, &fl))
-	AM_drawFline(&fl, color); // draws it on frame buffer using fb coords
-}
-
-
-
-//
-// Draws flat (floor/ceiling tile) aligned grid lines.
-//
-void AM_drawGrid(int color)
-{
-    fixed_t x, y;
-    fixed_t start, end;
-    mline_t ml;
-
-    // Figure out start of vertical gridlines
-    start = m_x;
-    if ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS))
-	start += (MAPBLOCKUNITS<<FRACBITS)
-	    - ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS));
-    end = m_x + m_w;
-
-    // draw vertical gridlines
-    ml.a.y = m_y;
-    ml.b.y = m_y+m_h;
-    for (x=start; x<end; x+=(MAPBLOCKUNITS<<FRACBITS))
+  if (am_clip_m_line(ml, &fl))
     {
-	ml.a.x = x;
-	ml.b.x = x;
-	AM_drawMline(&ml, color);
-    }
+      /* draws it on frame buffer using fb coords */
 
-    // Figure out start of horizontal gridlines
-    start = m_y;
-    if ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS))
-	start += (MAPBLOCKUNITS<<FRACBITS)
-	    - ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS));
-    end = m_y + m_h;
-
-    // draw horizontal gridlines
-    ml.a.x = m_x;
-    ml.b.x = m_x + m_w;
-    for (y=start; y<end; y+=(MAPBLOCKUNITS<<FRACBITS))
-    {
-	ml.a.y = y;
-	ml.b.y = y;
-	AM_drawMline(&ml, color);
-    }
-
-}
-
-//
-// Determines visible lines, draws them.
-// This is LineDef based, not LineSeg based.
-//
-void AM_drawWalls(void)
-{
-    int i;
-    static mline_t l;
-
-    for (i=0;i<numlines;i++)
-    {
-	l.a.x = lines[i].v1->x;
-	l.a.y = lines[i].v1->y;
-	l.b.x = lines[i].v2->x;
-	l.b.y = lines[i].v2->y;
-	if (cheating || (lines[i].flags & ML_MAPPED))
-	{
-	    if ((lines[i].flags & LINE_NEVERSEE) && !cheating)
-		continue;
-	    if (!lines[i].backsector)
-	    {
-		AM_drawMline(&l, WALLCOLORS+lightlev);
-	    }
-	    else
-	    {
-		if (lines[i].special == 39)
-		{ // teleporters
-		    AM_drawMline(&l, WALLCOLORS+WALLRANGE/2);
-		}
-		else if (lines[i].flags & ML_SECRET) // secret door
-		{
-		    if (cheating) AM_drawMline(&l, SECRETWALLCOLORS + lightlev);
-		    else AM_drawMline(&l, WALLCOLORS+lightlev);
-		}
-		else if (lines[i].backsector->floorheight
-			   != lines[i].frontsector->floorheight) {
-		    AM_drawMline(&l, FDWALLCOLORS + lightlev); // floor level change
-		}
-		else if (lines[i].backsector->ceilingheight
-			   != lines[i].frontsector->ceilingheight) {
-		    AM_drawMline(&l, CDWALLCOLORS+lightlev); // ceiling level change
-		}
-		else if (cheating) {
-		    AM_drawMline(&l, TSWALLCOLORS+lightlev);
-		}
-	    }
-	}
-	else if (plr->powers[pw_allmap])
-	{
-	    if (!(lines[i].flags & LINE_NEVERSEE)) AM_drawMline(&l, GRAYS+3);
-	}
+      am_draw_f_line(&fl, color);
     }
 }
 
+/****************************************************************************
+ * Name: am_draw_grid
+ *
+ * Description:
+ *  Draws flat (floor/ceiling tile) aligned grid lines.
+ *
+ ****************************************************************************/
 
-//
-// Rotation in 2D.
-// Used to rotate player arrow line character.
-//
-void
-AM_rotate
-( fixed_t*	x,
-  fixed_t*	y,
-  angle_t	a )
+static void am_draw_grid(int color)
 {
-    fixed_t tmpx;
+  fixed_t x, y;
+  fixed_t start;
+  fixed_t end;
+  mline_t ml;
 
-    tmpx =
-	FixedMul(*x,finecosine[a>>ANGLETOFINESHIFT])
-	- FixedMul(*y,finesine[a>>ANGLETOFINESHIFT]);
-    
-    *y   =
-	FixedMul(*x,finesine[a>>ANGLETOFINESHIFT])
-	+ FixedMul(*y,finecosine[a>>ANGLETOFINESHIFT]);
+  /* Figure out start of vertical gridlines */
 
-    *x = tmpx;
-}
+  start = m_x;
+  if ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS))
+    start += (MAPBLOCKUNITS << FRACBITS) -
+             ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS));
+  end = m_x + m_w;
 
-void
-AM_drawLineCharacter
-( mline_t*	lineguy,
-  int		lineguylines,
-  fixed_t	scale,
-  angle_t	angle,
-  int		color,
-  fixed_t	x,
-  fixed_t	y )
-{
-    int		i;
-    mline_t	l;
+  /* draw vertical gridlines */
 
-    for (i=0;i<lineguylines;i++)
+  ml.a.y = m_y;
+  ml.b.y = m_y + m_h;
+  for (x = start; x < end; x += (MAPBLOCKUNITS << FRACBITS))
     {
-	l.a.x = lineguy[i].a.x;
-	l.a.y = lineguy[i].a.y;
+      ml.a.x = x;
+      ml.b.x = x;
+      am_draw_m_line(&ml, color);
+    }
 
-	if (scale)
-	{
-	    l.a.x = FixedMul(scale, l.a.x);
-	    l.a.y = FixedMul(scale, l.a.y);
-	}
+  /* Figure out start of horizontal gridlines */
 
-	if (angle)
-	    AM_rotate(&l.a.x, &l.a.y, angle);
+  start = m_y;
+  if ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS))
+    start += (MAPBLOCKUNITS << FRACBITS) -
+             ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS));
+  end = m_y + m_h;
 
-	l.a.x += x;
-	l.a.y += y;
+  /* draw horizontal gridlines */
 
-	l.b.x = lineguy[i].b.x;
-	l.b.y = lineguy[i].b.y;
-
-	if (scale)
-	{
-	    l.b.x = FixedMul(scale, l.b.x);
-	    l.b.y = FixedMul(scale, l.b.y);
-	}
-
-	if (angle)
-	    AM_rotate(&l.b.x, &l.b.y, angle);
-	
-	l.b.x += x;
-	l.b.y += y;
-
-	AM_drawMline(&l, color);
+  ml.a.x = m_x;
+  ml.b.x = m_x + m_w;
+  for (y = start; y < end; y += (MAPBLOCKUNITS << FRACBITS))
+    {
+      ml.a.y = y;
+      ml.b.y = y;
+      am_draw_m_line(&ml, color);
     }
 }
 
-void AM_drawPlayers(void)
+/****************************************************************************
+ * Name: am_draw_walls
+ *
+ * Description:
+ *  Determines visible lines, draws them. This is LineDef based, not LineSeg
+ *  based.
+ *
+ ****************************************************************************/
+
+static void am_draw_walls(void)
 {
-    int		i;
-    player_t*	p;
-    static int 	their_colors[] = { GREENS, GRAYS, BROWNS, REDS };
-    int		their_color = -1;
-    int		color;
+  int i;
+  static mline_t l;
 
-    if (!netgame)
+  for (i = 0; i < numlines; i++)
     {
-	if (cheating)
-	    AM_drawLineCharacter
-		(cheat_player_arrow, arrlen(cheat_player_arrow), 0,
-		 plr->mo->angle, WHITE, plr->mo->x, plr->mo->y);
-	else
-	    AM_drawLineCharacter
-		(player_arrow, arrlen(player_arrow), 0, plr->mo->angle,
-		 WHITE, plr->mo->x, plr->mo->y);
-	return;
-    }
+      l.a.x = lines[i].v1->x;
+      l.a.y = lines[i].v1->y;
+      l.b.x = lines[i].v2->x;
+      l.b.y = lines[i].v2->y;
+      if (cheating || (lines[i].flags & ML_MAPPED))
+        {
+          if ((lines[i].flags & LINE_NEVERSEE) && !cheating) continue;
+          if (!lines[i].backsector)
+            {
+              am_draw_m_line(&l, WALLCOLORS + lightlev);
+            }
+          else
+            {
+              if (lines[i].special == 39)
+                {
+                  /* teleporters */
 
-    for (i=0;i<MAXPLAYERS;i++)
-    {
-	their_color++;
-	p = &players[i];
+                  am_draw_m_line(&l, WALLCOLORS + WALLRANGE / 2);
+                }
+              else if (lines[i].flags & ML_SECRET) /* secret door */
+                {
+                  if (cheating)
+                    am_draw_m_line(&l, SECRETWALLCOLORS + lightlev);
+                  else
+                    am_draw_m_line(&l, WALLCOLORS + lightlev);
+                }
+              else if (lines[i].backsector->floorheight !=
+                       lines[i].frontsector->floorheight)
+                {
+                  /* floor level change */
 
-	if ( (deathmatch && !singledemo) && p != plr)
-	    continue;
+                  am_draw_m_line(&l, FDWALLCOLORS + lightlev);
+                }
+              else if (lines[i].backsector->ceilingheight !=
+                       lines[i].frontsector->ceilingheight)
+                {
+                  /* ceiling level change */
 
-	if (!playeringame[i])
-	    continue;
-
-	if (p->powers[pw_invisibility])
-	    color = 246; // *close* to black
-	else
-	    color = their_colors[their_color];
-	
-	AM_drawLineCharacter
-	    (player_arrow, arrlen(player_arrow), 0, p->mo->angle,
-	     color, p->mo->x, p->mo->y);
-    }
-
-}
-
-void
-AM_drawThings
-( int	colors,
-  int 	colorrange)
-{
-    int		i;
-    mobj_t*	t;
-
-    for (i=0;i<numsectors;i++)
-    {
-	t = sectors[i].thinglist;
-	while (t)
-	{
-	    AM_drawLineCharacter
-		(thintriangle_guy, arrlen(thintriangle_guy),
-		 16<<FRACBITS, t->angle, colors+lightlev, t->x, t->y);
-	    t = t->snext;
-	}
+                  am_draw_m_line(&l, CDWALLCOLORS + lightlev);
+                }
+              else if (cheating)
+                {
+                  am_draw_m_line(&l, TSWALLCOLORS + lightlev);
+                }
+            }
+        }
+      else if (plr->powers[pw_allmap])
+        {
+          if (!(lines[i].flags & LINE_NEVERSEE))
+            {
+              am_draw_m_line(&l, GRAYS + 3);
+            }
+        }
     }
 }
 
-void AM_drawMarks(void)
-{
-    int i, fx, fy, w, h;
+/****************************************************************************
+ * Name: am_rotate
+ *
+ * Description:
+ *  Rotation in 2D.
+ *  Used to rotate player arrow line character.
+ *
+ ****************************************************************************/
 
-    for (i=0;i<AM_NUMMARKPOINTS;i++)
+static void am_rotate(fixed_t *x, fixed_t *y, angle_t a)
+{
+  fixed_t tmpx;
+
+  tmpx = fixed_mul(*x, finecosine[a >> ANGLETOFINESHIFT]) -
+         fixed_mul(*y, finesine[a >> ANGLETOFINESHIFT]);
+
+  *y = fixed_mul(*x, finesine[a >> ANGLETOFINESHIFT]) +
+       fixed_mul(*y, finecosine[a >> ANGLETOFINESHIFT]);
+
+  *x = tmpx;
+}
+
+static void am_draw_line_character(mline_t *lineguy, int lineguylines,
+                                   fixed_t scale, angle_t angle, int color,
+                                   fixed_t x, fixed_t y)
+{
+  int i;
+  mline_t l;
+
+  for (i = 0; i < lineguylines; i++)
     {
-	if (markpoints[i].x != -1)
-	{
-	    //      w = SHORT(marknums[i]->width);
-	    //      h = SHORT(marknums[i]->height);
-	    w = 5; // because something's wrong with the wad, i guess
-	    h = 6; // because something's wrong with the wad, i guess
-	    fx = CXMTOF(markpoints[i].x);
-	    fy = CYMTOF(markpoints[i].y);
-	    if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
-		V_DrawPatch(fx, fy, marknums[i]);
-	}
+      l.a.x = lineguy[i].a.x;
+      l.a.y = lineguy[i].a.y;
+
+      if (scale)
+        {
+          l.a.x = fixed_mul(scale, l.a.x);
+          l.a.y = fixed_mul(scale, l.a.y);
+        }
+
+      if (angle) am_rotate(&l.a.x, &l.a.y, angle);
+
+      l.a.x += x;
+      l.a.y += y;
+
+      l.b.x = lineguy[i].b.x;
+      l.b.y = lineguy[i].b.y;
+
+      if (scale)
+        {
+          l.b.x = fixed_mul(scale, l.b.x);
+          l.b.y = fixed_mul(scale, l.b.y);
+        }
+
+      if (angle) am_rotate(&l.b.x, &l.b.y, angle);
+
+      l.b.x += x;
+      l.b.y += y;
+
+      am_draw_m_line(&l, color);
+    }
+}
+
+static void am_draw_players(void)
+{
+  int i;
+  player_t *p;
+  int their_color = -1;
+  int color;
+
+  static int their_colors[] =
+  {
+    GREENS, GRAYS, BROWNS, REDS
+  };
+
+  if (!netgame)
+    {
+      if (cheating)
+        {
+          am_draw_line_character(
+              cheat_player_arrow, arrlen(cheat_player_arrow), 0,
+              plr->mo->angle, WHITE, plr->mo->x, plr->mo->y);
+        }
+      else
+        {
+          am_draw_line_character(player_arrow, arrlen(player_arrow), 0,
+                                 plr->mo->angle, WHITE, plr->mo->x,
+                                 plr->mo->y);
+        }
+
+      return;
     }
 
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      their_color++;
+      p = &players[i];
+
+      if ((deathmatch && !singledemo) && p != plr) continue;
+
+      if (!playeringame[i]) continue;
+
+      if (p->powers[pw_invisibility])
+        color = 246; /* *close* to black */
+      else
+        color = their_colors[their_color];
+
+      am_draw_line_character(player_arrow, arrlen(player_arrow), 0,
+                           p->mo->angle, color, p->mo->x, p->mo->y);
+    }
 }
 
-void AM_drawCrosshair(int color)
+static void am_draw_things(int colors, int colorrange)
 {
-    fb[(f_w*(f_h+1))/2] = color; // single point for now
+  int i;
+  mobj_t *t;
 
+  for (i = 0; i < numsectors; i++)
+    {
+      t = sectors[i].thinglist;
+      while (t)
+        {
+          am_draw_line_character(thintriangle_guy, arrlen(thintriangle_guy),
+                               16 << FRACBITS, t->angle, colors + lightlev,
+                               t->x, t->y);
+          t = t->snext;
+        }
+    }
 }
 
-void AM_Drawer (void)
+static void am_draw_marks(void)
 {
-    if (!automapactive) return;
+  int i;
+  int fx;
+  int fy;
+  int w;
+  int h;
 
-    AM_clearFB(BACKGROUND);
-    if (grid)
-	AM_drawGrid(GRIDCOLORS);
-    AM_drawWalls();
-    AM_drawPlayers();
-    if (cheating==2)
-	AM_drawThings(THINGCOLORS, THINGRANGE);
-    AM_drawCrosshair(XHAIRCOLORS);
-
-    AM_drawMarks();
-
-    V_MarkRect(f_x, f_y, f_w, f_h);
+  for (i = 0; i < AM_NUMMARKPOINTS; i++)
+    {
+      if (markpoints[i].x != -1)
+        {
+          /*      w = SHORT(marknums[i]->width);
+           *      h = SHORT(marknums[i]->height);
+           */
 
+          w = 5; /* because something's wrong with the wad, i guess */
+          h = 6; /* because something's wrong with the wad, i guess */
+          fx = CXMTOF(markpoints[i].x);
+          fy = CYMTOF(markpoints[i].y);
+          if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
+            v_draw_patch(fx, fy, marknums[i]);
+        }
+    }
+}
+
+static void am_draw_crosshair(int color)
+{
+  fb[(f_w * (f_h + 1)) / 2] = color; /* single point for now */
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: am_stop
+ ****************************************************************************/
+
+void am_stop(void)
+{
+  static event_t st_notify =
+  {
+    0, ev_keyup, AM_MSGEXITED, 0
+  };
+
+  am_unload_pics();
+  automapactive = false;
+  st_responder(&st_notify);
+  stopped = true;
+}
+
+/****************************************************************************
+ * Name: am_ticker
+ *
+ * Description:
+ *  Updates on Game Tick
+ *
+ ****************************************************************************/
+
+void am_ticker(void)
+{
+  if (!automapactive) return;
+
+  amclock++;
+
+  if (followplayer) am_do_follow_player();
+
+  /* Change the zoom if necessary */
+
+  if (ftom_zoommul != FRACUNIT) am_change_window_scale();
+
+  /* Change x,y location */
+
+  if (m_paninc.x || m_paninc.y) am_change_window_loc();
+
+  /* Update light level */
+
+  /* am_update_light_lev(); */
+}
+
+/****************************************************************************
+ * Name: am_responder
+ *
+ * Description:
+ *  Handle events (user inputs) in automap mode
+ *
+ ****************************************************************************/
+
+boolean am_responder(event_t *ev)
+{
+  int rc;
+  static int bigstate = 0;
+  static char buffer[20];
+  int key;
+
+  rc = false;
+
+  if (ev->type == ev_joystick && joybautomap >= 0 &&
+      (ev->data1 & (1 << joybautomap)) != 0)
+    {
+      joywait = i_get_time() + 5;
+
+      if (!automapactive)
+        {
+          am_start();
+          viewactive = false;
+        }
+      else
+        {
+          bigstate = 0;
+          viewactive = true;
+          am_stop();
+        }
+
+      return true;
+    }
+
+  if (!automapactive)
+    {
+      if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
+        {
+          am_start();
+          viewactive = false;
+          rc = true;
+        }
+    }
+  else if (ev->type == ev_keydown)
+    {
+      rc = true;
+      key = ev->data1;
+
+      if (key == key_map_east) /* pan right */
+        {
+          if (!followplayer)
+            m_paninc.x = FTOM(F_PANINC);
+          else
+            rc = false;
+        }
+      else if (key == key_map_west) /* pan left */
+        {
+          if (!followplayer)
+            m_paninc.x = -FTOM(F_PANINC);
+          else
+            rc = false;
+        }
+      else if (key == key_map_north) /* pan up */
+        {
+          if (!followplayer)
+            m_paninc.y = FTOM(F_PANINC);
+          else
+            rc = false;
+        }
+      else if (key == key_map_south) /* pan down */
+        {
+          if (!followplayer)
+            m_paninc.y = -FTOM(F_PANINC);
+          else
+            rc = false;
+        }
+      else if (key == key_map_zoomout) /* zoom out */
+        {
+          mtof_zoommul = M_ZOOMOUT;
+          ftom_zoommul = M_ZOOMIN;
+        }
+      else if (key == key_map_zoomin) /* zoom in */
+        {
+          mtof_zoommul = M_ZOOMIN;
+          ftom_zoommul = M_ZOOMOUT;
+        }
+      else if (key == key_map_toggle)
+        {
+          bigstate = 0;
+          viewactive = true;
+          am_stop();
+        }
+      else if (key == key_map_maxzoom)
+        {
+          bigstate = !bigstate;
+          if (bigstate)
+            {
+              am_save_scale_and_loc();
+              am_min_out_window_scale();
+            }
+          else
+            am_restore_scale_and_loc();
+        }
+      else if (key == key_map_follow)
+        {
+          followplayer = !followplayer;
+          f_oldloc.x = INT_MAX;
+          if (followplayer)
+            plr->message = (AMSTR_FOLLOWON);
+          else
+            plr->message = (AMSTR_FOLLOWOFF);
+        }
+      else if (key == key_map_grid)
+        {
+          grid = !grid;
+          if (grid)
+            plr->message = (AMSTR_GRIDON);
+          else
+            plr->message = (AMSTR_GRIDOFF);
+        }
+      else if (key == key_map_mark)
+        {
+          snprintf(buffer, sizeof(buffer), "%s %d", (AMSTR_MARKEDSPOT),
+                   markpointnum);
+          plr->message = buffer;
+          am_add_mark();
+        }
+      else if (key == key_map_clearmark)
+        {
+          am_clear_marks();
+          plr->message = (AMSTR_MARKSCLEARED);
+        }
+      else
+        {
+          rc = false;
+        }
+
+      if ((!deathmatch || gameversion <= exe_doom_1_8) &&
+          cht_check_cheat(&cheat_amap, ev->data2))
+        {
+          rc = false;
+          cheating = (cheating + 1) % 3;
+        }
+    }
+  else if (ev->type == ev_keyup)
+    {
+      rc = false;
+      key = ev->data1;
+
+      if (key == key_map_east)
+        {
+          if (!followplayer) m_paninc.x = 0;
+        }
+      else if (key == key_map_west)
+        {
+          if (!followplayer) m_paninc.x = 0;
+        }
+      else if (key == key_map_north)
+        {
+          if (!followplayer) m_paninc.y = 0;
+        }
+      else if (key == key_map_south)
+        {
+          if (!followplayer) m_paninc.y = 0;
+        }
+      else if (key == key_map_zoomout || key == key_map_zoomin)
+        {
+          mtof_zoommul = FRACUNIT;
+          ftom_zoommul = FRACUNIT;
+        }
+    }
+
+  return rc;
+}
+
+void am_drawer(void)
+{
+  if (!automapactive) return;
+
+  am_clear_fb(BACKGROUND);
+  if (grid) am_draw_grid(GRIDCOLORS);
+  am_draw_walls();
+  am_draw_players();
+  if (cheating == 2) am_draw_things(THINGCOLORS, THINGRANGE);
+  am_draw_crosshair(XHAIRCOLORS);
+
+  am_draw_marks();
+
+  v_mark_rect(f_x, f_y, f_w, f_h);
 }
diff --git a/games/NXDoom/src/doom/am_map.h b/games/NXDoom/src/doom/am_map.h
index 572d2389b..38b8e4ab1 100644
--- a/games/NXDoom/src/doom/am_map.h
+++ b/games/NXDoom/src/doom/am_map.h
@@ -1,49 +1,95 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  AutoMap module.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/am_map.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   AutoMap module.
+ *
+ ****************************************************************************/
 
 #ifndef __AMMAP_H__
 #define __AMMAP_H__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_event.h"
 #include "m_cheat.h"
 
-// Used by ST StatusBar stuff.
-#define AM_MSGHEADER (('a'<<24)+('m'<<16))
-#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
-#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Used by ST StatusBar stuff. */
 
-// Called by main loop.
-boolean AM_Responder (event_t* ev);
-
-// Called by main loop.
-void AM_Ticker (void);
-
-// Called by main loop,
-// called instead of view drawer if automap active.
-void AM_Drawer (void);
-
-// Called to force the automap to quit
-// if the level is completed while it is up.
-void AM_Stop (void);
+#define AM_MSGHEADER (('a' << 24) + ('m' << 16))
+#define AM_MSGENTERED (AM_MSGHEADER | ('e' << 8))
+#define AM_MSGEXITED (AM_MSGHEADER | ('x' << 8))
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern cheatseq_t cheat_amap;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/****************************************************************************
+ * Name: am_responder
+ *
+ * Description:
+ *  Called by main loop.
+ *
+ ****************************************************************************/
+
+boolean am_responder(event_t *ev);
+
+/****************************************************************************
+ * Name: am_ticker
+ *
+ * Description:
+ *  Called by main loop.
+ *
+ ****************************************************************************/
+
+void am_ticker(void);
+
+/****************************************************************************
+ * Name: am_ticker
+ *
+ * Description:
+ *  Called by main loop. Called instead of view drawer if automap active.
+ *
+ ****************************************************************************/
+
+void am_drawer(void);
+
+/****************************************************************************
+ * Name: am_stop
+ *
+ * Description:
+ *  Called to force the automap to quit if the level is completed while it is
+ *  up.
+ *
+ ****************************************************************************/
+
+void am_stop(void);
+
+#endif /* __AMMAP_H__ */
diff --git a/games/NXDoom/src/doom/d_englsh.h b/games/NXDoom/src/doom/d_englsh.h
index cfb05722c..3f0945fc9 100644
--- a/games/NXDoom/src/doom/d_englsh.h
+++ b/games/NXDoom/src/doom/d_englsh.h
@@ -1,693 +1,695 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Printed strings for translation.
-//	English language support (default).
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_englsh.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Printed strings for translation.
+ *  English language support (default).
+ *
+ ****************************************************************************/
 
 #ifndef __D_ENGLSH__
 #define __D_ENGLSH__
 
-//
-//	Printed strings for translation
-//
-
-//
-// D_Main.C
-//
-#define D_DEVSTR	"Development mode ON.\n"
-#define D_CDROM	"CD-ROM Version: default.cfg from c:\\doomdata\n"
-
-//
-//	M_Menu.C
-//
-#define PRESSKEY 	"press a key."
-#define PRESSYN 	"press y or n."
-#define QUITMSG	"are you sure you want to\nquit this great game?"
-#define LOADNET 	"you can't do load while in a net game!\n\n"PRESSKEY
-#define QLOADNET	"you can't quickload during a netgame!\n\n"PRESSKEY
-#define QSAVESPOT	"you haven't picked a quicksave slot yet!\n\n"PRESSKEY
-#define SAVEDEAD 	"you can't save if you aren't playing!\n\n"PRESSKEY
-#define QSPROMPT 	"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
-#define QLPROMPT	"do you want to quickload the game named\n\n'%s'?\n\n"PRESSYN
-
-#define NEWGAME	\
-"you can't start a new game\n"\
-"while in a network game.\n\n"PRESSKEY
-
-#define NIGHTMARE	\
-"are you sure? this skill level\n"\
-"isn't even remotely fair.\n\n"PRESSYN
-
-#define SWSTRING	\
-"this is the shareware version of doom.\n\n"\
-"you need to order the entire trilogy.\n\n"PRESSKEY
-
-#define MSGOFF	"Messages OFF"
-#define MSGON		"Messages ON"
-#define NETEND	"you can't end a netgame!\n\n"PRESSKEY
-#define ENDGAME	"are you sure you want to end the game?\n\n"PRESSYN
-
-#define DOSY		"(press y to quit to dos.)"
-
-#define DETAILHI	"High detail"
-#define DETAILLO	"Low detail"
-#define GAMMALVL0	"Gamma correction OFF"
-#define GAMMALVL1	"Gamma correction level 1"
-#define GAMMALVL2	"Gamma correction level 2"
-#define GAMMALVL3	"Gamma correction level 3"
-#define GAMMALVL4	"Gamma correction level 4"
-#define EMPTYSTRING	"empty slot"
-
-//
-//	P_inter.C
-//
-#define GOTARMOR	"Picked up the armor."
-#define GOTMEGA	"Picked up the MegaArmor!"
-#define GOTHTHBONUS	"Picked up a health bonus."
-#define GOTARMBONUS	"Picked up an armor bonus."
-#define GOTSTIM	"Picked up a stimpack."
-#define GOTMEDINEED	"Picked up a medikit that you REALLY need!"
-#define GOTMEDIKIT	"Picked up a medikit."
-#define GOTSUPER	"Supercharge!"
-
-#define GOTBLUECARD	"Picked up a blue keycard."
-#define GOTYELWCARD	"Picked up a yellow keycard."
-#define GOTREDCARD	"Picked up a red keycard."
-#define GOTBLUESKUL	"Picked up a blue skull key."
-#define GOTYELWSKUL	"Picked up a yellow skull key."
-#define GOTREDSKULL	"Picked up a red skull key."
-
-#define GOTINVUL	"Invulnerability!"
-#define GOTBERSERK	"Berserk!"
-#define GOTINVIS	"Partial Invisibility"
-#define GOTSUIT	"Radiation Shielding Suit"
-#define GOTMAP	"Computer Area Map"
-#define GOTVISOR	"Light Amplification Visor"
-#define GOTMSPHERE	"MegaSphere!"
-
-#define GOTCLIP	"Picked up a clip."
-#define GOTCLIPBOX	"Picked up a box of bullets."
-#define GOTROCKET	"Picked up a rocket."
-#define GOTROCKBOX	"Picked up a box of rockets."
-#define GOTCELL	"Picked up an energy cell."
-#define GOTCELLBOX	"Picked up an energy cell pack."
-#define GOTSHELLS	"Picked up 4 shotgun shells."
-#define GOTSHELLBOX	"Picked up a box of shotgun shells."
-#define GOTBACKPACK	"Picked up a backpack full of ammo!"
-
-#define GOTBFG9000	"You got the BFG9000!  Oh, yes."
-#define GOTCHAINGUN	"You got the chaingun!"
-#define GOTCHAINSAW	"A chainsaw!  Find some meat!"
-#define GOTLAUNCHER	"You got the rocket launcher!"
-#define GOTPLASMA	"You got the plasma gun!"
-#define GOTSHOTGUN	"You got the shotgun!"
-#define GOTSHOTGUN2	"You got the super shotgun!"
-
-//
-// P_Doors.C
-//
-#define PD_BLUEO	"You need a blue key to activate this object"
-#define PD_REDO	"You need a red key to activate this object"
-#define PD_YELLOWO	"You need a yellow key to activate this object"
-#define PD_BLUEK	"You need a blue key to open this door"
-#define PD_REDK	"You need a red key to open this door"
-#define PD_YELLOWK	"You need a yellow key to open this door"
-
-//
-//	G_game.C
-//
-#define GGSAVED	"game saved."
-
-//
-//	HU_stuff.C
-//
-#define HUSTR_MSGU	"[Message unsent]"
-
-#define HUSTR_E1M1	"E1M1: Hangar"
-#define HUSTR_E1M2	"E1M2: Nuclear Plant"
-#define HUSTR_E1M3	"E1M3: Toxin Refinery"
-#define HUSTR_E1M4	"E1M4: Command Control"
-#define HUSTR_E1M5	"E1M5: Phobos Lab"
-#define HUSTR_E1M6	"E1M6: Central Processing"
-#define HUSTR_E1M7	"E1M7: Computer Station"
-#define HUSTR_E1M8	"E1M8: Phobos Anomaly"
-#define HUSTR_E1M9	"E1M9: Military Base"
-
-#define HUSTR_E2M1	"E2M1: Deimos Anomaly"
-#define HUSTR_E2M2	"E2M2: Containment Area"
-#define HUSTR_E2M3	"E2M3: Refinery"
-#define HUSTR_E2M4	"E2M4: Deimos Lab"
-#define HUSTR_E2M5	"E2M5: Command Center"
-#define HUSTR_E2M6	"E2M6: Halls of the Damned"
-#define HUSTR_E2M7	"E2M7: Spawning Vats"
-#define HUSTR_E2M8	"E2M8: Tower of Babel"
-#define HUSTR_E2M9	"E2M9: Fortress of Mystery"
-
-#define HUSTR_E3M1	"E3M1: Hell Keep"
-#define HUSTR_E3M2	"E3M2: Slough of Despair"
-#define HUSTR_E3M3	"E3M3: Pandemonium"
-#define HUSTR_E3M4	"E3M4: House of Pain"
-#define HUSTR_E3M5	"E3M5: Unholy Cathedral"
-#define HUSTR_E3M6	"E3M6: Mt. Erebus"
-#define HUSTR_E3M7	"E3M7: Limbo"
-#define HUSTR_E3M8	"E3M8: Dis"
-#define HUSTR_E3M9	"E3M9: Warrens"
-
-#define HUSTR_E4M1	"E4M1: Hell Beneath"
-#define HUSTR_E4M2	"E4M2: Perfect Hatred"
-#define HUSTR_E4M3	"E4M3: Sever The Wicked"
-#define HUSTR_E4M4	"E4M4: Unruly Evil"
-#define HUSTR_E4M5	"E4M5: They Will Repent"
-#define HUSTR_E4M6	"E4M6: Against Thee Wickedly"
-#define HUSTR_E4M7	"E4M7: And Hell Followed"
-#define HUSTR_E4M8	"E4M8: Unto The Cruel"
-#define HUSTR_E4M9	"E4M9: Fear"
-
-#define HUSTR_1	"level 1: entryway"
-#define HUSTR_2	"level 2: underhalls"
-#define HUSTR_3	"level 3: the gantlet"
-#define HUSTR_4	"level 4: the focus"
-#define HUSTR_5	"level 5: the waste tunnels"
-#define HUSTR_6	"level 6: the crusher"
-#define HUSTR_7	"level 7: dead simple"
-#define HUSTR_8	"level 8: tricks and traps"
-#define HUSTR_9	"level 9: the pit"
-#define HUSTR_10	"level 10: refueling base"
-#define HUSTR_11	"level 11: 'o' of destruction!"
-
-#define HUSTR_12	"level 12: the factory"
-#define HUSTR_13	"level 13: downtown"
-#define HUSTR_14	"level 14: the inmost dens"
-#define HUSTR_15	"level 15: industrial zone"
-#define HUSTR_16	"level 16: suburbs"
-#define HUSTR_17	"level 17: tenements"
-#define HUSTR_18	"level 18: the courtyard"
-#define HUSTR_19	"level 19: the citadel"
-#define HUSTR_20	"level 20: gotcha!"
-
-#define HUSTR_21	"level 21: nirvana"
-#define HUSTR_22	"level 22: the catacombs"
-#define HUSTR_23	"level 23: barrels o' fun"
-#define HUSTR_24	"level 24: the chasm"
-#define HUSTR_25	"level 25: bloodfalls"
-#define HUSTR_26	"level 26: the abandoned mines"
-#define HUSTR_27	"level 27: monster condo"
-#define HUSTR_28	"level 28: the spirit world"
-#define HUSTR_29	"level 29: the living end"
-#define HUSTR_30	"level 30: icon of sin"
-
-#define HUSTR_31	"level 31: wolfenstein"
-#define HUSTR_32	"level 32: grosse"
-
-#define PHUSTR_1	"level 1: congo"
-#define PHUSTR_2	"level 2: well of souls"
-#define PHUSTR_3	"level 3: aztec"
-#define PHUSTR_4	"level 4: caged"
-#define PHUSTR_5	"level 5: ghost town"
-#define PHUSTR_6	"level 6: baron's lair"
-#define PHUSTR_7	"level 7: caughtyard"
-#define PHUSTR_8	"level 8: realm"
-#define PHUSTR_9	"level 9: abattoire"
-#define PHUSTR_10	"level 10: onslaught"
-#define PHUSTR_11	"level 11: hunted"
-
-#define PHUSTR_12	"level 12: speed"
-#define PHUSTR_13	"level 13: the crypt"
-#define PHUSTR_14	"level 14: genesis"
-#define PHUSTR_15	"level 15: the twilight"
-#define PHUSTR_16	"level 16: the omen"
-#define PHUSTR_17	"level 17: compound"
-#define PHUSTR_18	"level 18: neurosphere"
-#define PHUSTR_19	"level 19: nme"
-#define PHUSTR_20	"level 20: the death domain"
-
-#define PHUSTR_21	"level 21: slayer"
-#define PHUSTR_22	"level 22: impossible mission"
-#define PHUSTR_23	"level 23: tombstone"
-#define PHUSTR_24	"level 24: the final frontier"
-#define PHUSTR_25	"level 25: the temple of darkness"
-#define PHUSTR_26	"level 26: bunker"
-#define PHUSTR_27	"level 27: anti-christ"
-#define PHUSTR_28	"level 28: the sewers"
-#define PHUSTR_29	"level 29: odyssey of noises"
-#define PHUSTR_30	"level 30: the gateway of hell"
-
-#define PHUSTR_31	"level 31: cyberden"
-#define PHUSTR_32	"level 32: go 2 it"
-
-#define THUSTR_1	"level 1: system control"
-#define THUSTR_2	"level 2: human bbq"
-#define THUSTR_3	"level 3: power control"
-#define THUSTR_4	"level 4: wormhole"
-#define THUSTR_5	"level 5: hanger"
-#define THUSTR_6	"level 6: open season"
-#define THUSTR_7	"level 7: prison"
-#define THUSTR_8	"level 8: metal"
-#define THUSTR_9	"level 9: stronghold"
-#define THUSTR_10	"level 10: redemption"
-#define THUSTR_11	"level 11: storage facility"
-
-#define THUSTR_12	"level 12: crater"
-#define THUSTR_13	"level 13: nukage processing"
-#define THUSTR_14	"level 14: steel works"
-#define THUSTR_15	"level 15: dead zone"
-#define THUSTR_16	"level 16: deepest reaches"
-#define THUSTR_17	"level 17: processing area"
-#define THUSTR_18	"level 18: mill"
-#define THUSTR_19	"level 19: shipping/respawning"
-#define THUSTR_20	"level 20: central processing"
-
-#define THUSTR_21	"level 21: administration center"
-#define THUSTR_22	"level 22: habitat"
-#define THUSTR_23	"level 23: lunar mining project"
-#define THUSTR_24	"level 24: quarry"
-#define THUSTR_25	"level 25: baron's den"
-#define THUSTR_26	"level 26: ballistyx"
-#define THUSTR_27	"level 27: mount pain"
-#define THUSTR_28	"level 28: heck"
-#define THUSTR_29	"level 29: river styx"
-#define THUSTR_30	"level 30: last call"
-
-#define THUSTR_31	"level 31: pharaoh"
-#define THUSTR_32	"level 32: caribbean"
-
-#define HUSTR_CHATMACRO1	"I'm ready to kick butt!"
-#define HUSTR_CHATMACRO2	"I'm OK."
-#define HUSTR_CHATMACRO3	"I'm not looking too good!"
-#define HUSTR_CHATMACRO4	"Help!"
-#define HUSTR_CHATMACRO5	"You suck!"
-#define HUSTR_CHATMACRO6	"Next time, scumbag..."
-#define HUSTR_CHATMACRO7	"Come here!"
-#define HUSTR_CHATMACRO8	"I'll take care of it."
-#define HUSTR_CHATMACRO9	"Yes"
-#define HUSTR_CHATMACRO0	"No"
-
-#define HUSTR_TALKTOSELF1	"You mumble to yourself"
-#define HUSTR_TALKTOSELF2	"Who's there?"
-#define HUSTR_TALKTOSELF3	"You scare yourself"
-#define HUSTR_TALKTOSELF4	"You start to rave"
-#define HUSTR_TALKTOSELF5	"You've lost it..."
-
-#define HUSTR_MESSAGESENT	"[Message Sent]"
-
-// The following should NOT be changed unless it seems
-// just AWFULLY necessary
-
-#define HUSTR_PLRGREEN	"Green: "
-#define HUSTR_PLRINDIGO	"Indigo: "
-#define HUSTR_PLRBROWN	"Brown: "
-#define HUSTR_PLRRED		"Red: "
-
-#define HUSTR_KEYGREEN	'g'
-#define HUSTR_KEYINDIGO	'i'
-#define HUSTR_KEYBROWN	'b'
-#define HUSTR_KEYRED	'r'
-
-//
-//	AM_map.C
-//
-
-#define AMSTR_FOLLOWON	"Follow Mode ON"
-#define AMSTR_FOLLOWOFF	"Follow Mode OFF"
-
-#define AMSTR_GRIDON	"Grid ON"
-#define AMSTR_GRIDOFF	"Grid OFF"
-
-#define AMSTR_MARKEDSPOT	"Marked Spot"
-#define AMSTR_MARKSCLEARED	"All Marks Cleared"
-
-//
-//	ST_stuff.C
-//
-
-#define STSTR_MUS		"Music Change"
-#define STSTR_NOMUS		"IMPOSSIBLE SELECTION"
-#define STSTR_DQDON		"Degreelessness Mode On"
-#define STSTR_DQDOFF	"Degreelessness Mode Off"
-
-#define STSTR_KFAADDED	"Very Happy Ammo Added"
-#define STSTR_FAADDED	"Ammo (no keys) Added"
-
-#define STSTR_NCON		"No Clipping Mode ON"
-#define STSTR_NCOFF		"No Clipping Mode OFF"
-
-#define STSTR_BEHOLD	"inVuln, Str, Inviso, Rad, Allmap, or Lite-amp"
-#define STSTR_BEHOLDX	"Power-up Toggled"
-
-#define STSTR_CHOPPERS	"... doesn't suck - GM"
-#define STSTR_CLEV		"Changing Level..."
-
-//
-//	F_Finale.C
-//
-#define E1TEXT \
-"Once you beat the big badasses and\n"\
-"clean out the moon base you're supposed\n"\
-"to win, aren't you? Aren't you? Where's\n"\
-"your fat reward and ticket home? What\n"\
-"the hell is this? It's not supposed to\n"\
-"end this way!\n"\
-"\n" \
-"It stinks like rotten meat, but looks\n"\
-"like the lost Deimos base.  Looks like\n"\
-"you're stuck on The Shores of Hell.\n"\
-"The only way out is through.\n"\
-"\n"\
-"To continue the DOOM experience, play\n"\
-"The Shores of Hell and its amazing\n"\
-"sequel, Inferno!\n"
-
-
-#define E2TEXT \
-"You've done it! The hideous cyber-\n"\
-"demon lord that ruled the lost Deimos\n"\
-"moon base has been slain and you\n"\
-"are triumphant! But ... where are\n"\
-"you? You clamber to the edge of the\n"\
-"moon and look down to see the awful\n"\
-"truth.\n" \
-"\n"\
-"Deimos floats above Hell itself!\n"\
-"You've never heard of anyone escaping\n"\
-"from Hell, but you'll make the bastards\n"\
-"sorry they ever heard of you! Quickly,\n"\
-"you rappel down to  the surface of\n"\
-"Hell.\n"\
-"\n" \
-"Now, it's on to the final chapter of\n"\
-"DOOM! -- Inferno."
-
-
-#define E3TEXT \
-"The loathsome spiderdemon that\n"\
-"masterminded the invasion of the moon\n"\
-"bases and caused so much death has had\n"\
-"its ass kicked for all time.\n"\
-"\n"\
-"A hidden doorway opens and you enter.\n"\
-"You've proven too tough for Hell to\n"\
-"contain, and now Hell at last plays\n"\
-"fair -- for you emerge from the door\n"\
-"to see the green fields of Earth!\n"\
-"Home at last.\n" \
-"\n"\
-"You wonder what's been happening on\n"\
-"Earth while you were battling evil\n"\
-"unleashed. It's good that no Hell-\n"\
-"spawn could have come through that\n"\
-"door with you ..."
-
-
-#define E4TEXT \
-"the spider mastermind must have sent forth\n"\
-"its legions of hellspawn before your\n"\
-"final confrontation with that terrible\n"\
-"beast from hell.  but you stepped forward\n"\
-"and brought forth eternal damnation and\n"\
-"suffering upon the horde as a true hero\n"\
-"would in the face of something so evil.\n"\
-"\n"\
-"besides, someone was gonna pay for what\n"\
-"happened to daisy, your pet rabbit.\n"\
-"\n"\
-"but now, you see spread before you more\n"\
-"potential pain and gibbitude as a nation\n"\
-"of demons run amok among our cities.\n"\
-"\n"\
-"next stop, hell on earth!"
-
-
-// after level 6, put this:
-
-#define C1TEXT \
-"YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
-"STARPORT. BUT SOMETHING IS WRONG. THE\n" \
-"MONSTERS HAVE BROUGHT THEIR OWN REALITY\n" \
-"WITH THEM, AND THE STARPORT'S TECHNOLOGY\n" \
-"IS BEING SUBVERTED BY THEIR PRESENCE.\n" \
-"\n"\
-"AHEAD, YOU SEE AN OUTPOST OF HELL, A\n" \
-"FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n" \
-"YOU CAN PENETRATE INTO THE HAUNTED HEART\n" \
-"OF THE STARBASE AND FIND THE CONTROLLING\n" \
-"SWITCH WHICH HOLDS EARTH'S POPULATION\n" \
-"HOSTAGE."
-
-// After level 11, put this:
-
-#define C2TEXT \
-"YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
-"HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"\
-"THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"\
-"HUMAN LEFT ON THE FACE OF THE PLANET.\n"\
-"CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"\
-"AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"\
-"YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"\
-"THAT YOU HAVE SAVED YOUR SPECIES.\n"\
-"\n"\
-"BUT THEN, EARTH CONTROL BEAMS DOWN A\n"\
-"MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"\
-"THE SOURCE OF THE ALIEN INVASION. IF YOU\n"\
-"GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"\
-"ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"\
-"YOUR OWN HOME CITY, NOT FAR FROM THE\n"\
-"STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"\
-"UP AND RETURN TO THE FRAY."
-
-
-// After level 20, put this:
-
-#define C3TEXT \
-"YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
-"SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"\
-"YOU SEE NO WAY TO DESTROY THE CREATURES'\n"\
-"ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"\
-"TEETH AND PLUNGE THROUGH IT.\n"\
-"\n"\
-"THERE MUST BE A WAY TO CLOSE IT ON THE\n"\
-"OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"\
-"GOT TO GO THROUGH HELL TO GET TO IT?"
-
-
-// After level 29, put this:
-
-#define C4TEXT \
-"THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
-"DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"\
-"YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"\
-"HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"\
-"UP AND DIES, ITS THRASHING LIMBS\n"\
-"DEVASTATING UNTOLD MILES OF HELL'S\n"\
-"SURFACE.\n"\
-"\n"\
-"YOU'VE DONE IT. THE INVASION IS OVER.\n"\
-"EARTH IS SAVED. HELL IS A WRECK. YOU\n"\
-"WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"\
-"DIE, NOW. WIPING THE SWEAT FROM YOUR\n"\
-"FOREHEAD YOU BEGIN THE LONG TREK BACK\n"\
-"HOME. REBUILDING EARTH OUGHT TO BE A\n"\
-"LOT MORE FUN THAN RUINING IT WAS.\n"
-
-
-
-// Before level 31, put this:
-
-#define C5TEXT \
-"CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
-"LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"\
-"HUMANS, RATHER THAN DEMONS. YOU WONDER\n"\
-"WHO THE INMATES OF THIS CORNER OF HELL\n"\
-"WILL BE."
-
-
-// Before level 32, put this:
-
-#define C6TEXT \
-"CONGRATULATIONS, YOU'VE FOUND THE\n"\
-"SUPER SECRET LEVEL!  YOU'D BETTER\n"\
-"BLAZE THROUGH THIS ONE!\n"
-
-
-// after map 06	
-
-#define P1TEXT  \
-"You gloat over the steaming carcass of the\n"\
-"Guardian.  With its death, you've wrested\n"\
-"the Accelerator from the stinking claws\n"\
-"of Hell.  You relax and glance around the\n"\
-"room.  Damn!  There was supposed to be at\n"\
-"least one working prototype, but you can't\n"\
-"see it. The demons must have taken it.\n"\
-"\n"\
-"You must find the prototype, or all your\n"\
-"struggles will have been wasted. Keep\n"\
-"moving, keep fighting, keep killing.\n"\
-"Oh yes, keep living, too."
-
-
-// after map 11
-
-#define P2TEXT \
-"Even the deadly Arch-Vile labyrinth could\n"\
-"not stop you, and you've gotten to the\n"\
-"prototype Accelerator which is soon\n"\
-"efficiently and permanently deactivated.\n"\
-"\n"\
-"You're good at that kind of thing."
-
-
-// after map 20
-
-#define P3TEXT \
-"You've bashed and battered your way into\n"\
-"the heart of the devil-hive.  Time for a\n"\
-"Search-and-Destroy mission, aimed at the\n"\
-"Gatekeeper, whose foul offspring is\n"\
-"cascading to Earth.  Yeah, he's bad. But\n"\
-"you know who's worse!\n"\
-"\n"\
-"Grinning evilly, you check your gear, and\n"\
-"get ready to give the bastard a little Hell\n"\
-"of your own making!"
-
-// after map 30
-
-#define P4TEXT \
-"The Gatekeeper's evil face is splattered\n"\
-"all over the place.  As its tattered corpse\n"\
-"collapses, an inverted Gate forms and\n"\
-"sucks down the shards of the last\n"\
-"prototype Accelerator, not to mention the\n"\
-"few remaining demons.  You're done. Hell\n"\
-"has gone back to pounding bad dead folks \n"\
-"instead of good live ones.  Remember to\n"\
-"tell your grandkids to put a rocket\n"\
-"launcher in your coffin. If you go to Hell\n"\
-"when you die, you'll need it for some\n"\
-"final cleaning-up ..."
-
-// before map 31
-
-#define P5TEXT \
-"You've found the second-hardest level we\n"\
-"got. Hope you have a saved game a level or\n"\
-"two previous.  If not, be prepared to die\n"\
-"aplenty. For master marines only."
-
-// before map 32
-
-#define P6TEXT \
-"Betcha wondered just what WAS the hardest\n"\
-"level we had ready for ya?  Now you know.\n"\
-"No one gets out alive."
-
-
-#define T1TEXT \
-"You've fought your way out of the infested\n"\
-"experimental labs.   It seems that UAC has\n"\
-"once again gulped it down.  With their\n"\
-"high turnover, it must be hard for poor\n"\
-"old UAC to buy corporate health insurance\n"\
-"nowadays..\n"\
-"\n"\
-"Ahead lies the military complex, now\n"\
-"swarming with diseased horrors hot to get\n"\
-"their teeth into you. With luck, the\n"\
-"complex still has some warlike ordnance\n"\
-"laying around."
-
-
-#define T2TEXT \
-"You hear the grinding of heavy machinery\n"\
-"ahead.  You sure hope they're not stamping\n"\
-"out new hellspawn, but you're ready to\n"\
-"ream out a whole herd if you have to.\n"\
-"They might be planning a blood feast, but\n"\
-"you feel about as mean as two thousand\n"\
-"maniacs packed into one mad killer.\n"\
-"\n"\
-"You don't plan to go down easy."
-
-
-#define T3TEXT \
-"The vista opening ahead looks real damn\n"\
-"familiar. Smells familiar, too -- like\n"\
-"fried excrement. You didn't like this\n"\
-"place before, and you sure as hell ain't\n"\
-"planning to like it now. The more you\n"\
-"brood on it, the madder you get.\n"\
-"Hefting your gun, an evil grin trickles\n"\
-"onto your face. Time to take some names."
-
-#define T4TEXT \
-"Suddenly, all is silent, from one horizon\n"\
-"to the other. The agonizing echo of Hell\n"\
-"fades away, the nightmare sky turns to\n"\
-"blue, the heaps of monster corpses start \n"\
-"to evaporate along with the evil stench \n"\
-"that filled the air. Jeeze, maybe you've\n"\
-"done it. Have you really won?\n"\
-"\n"\
-"Something rumbles in the distance.\n"\
-"A blue light begins to glow inside the\n"\
-"ruined skull of the demon-spitter."
-
-
-#define T5TEXT \
-"What now? Looks totally different. Kind\n"\
-"of like King Tut's condo. Well,\n"\
-"whatever's here can't be any worse\n"\
-"than usual. Can it?  Or maybe it's best\n"\
-"to let sleeping gods lie.."
-
-
-#define T6TEXT \
-"Time for a vacation. You've burst the\n"\
-"bowels of hell and by golly you're ready\n"\
-"for a break. You mutter to yourself,\n"\
-"Maybe someone else can kick Hell's ass\n"\
-"next time around. Ahead lies a quiet town,\n"\
-"with peaceful flowing water, quaint\n"\
-"buildings, and presumably no Hellspawn.\n"\
-"\n"\
-"As you step off the transport, you hear\n"\
-"the stomp of a cyberdemon's iron shoe."
-
-
-
-//
-// Character cast strings F_FINALE.C
-//
-#define CC_ZOMBIE	"ZOMBIEMAN"
-#define CC_SHOTGUN	"SHOTGUN GUY"
-#define CC_HEAVY	"HEAVY WEAPON DUDE"
-#define CC_IMP	"IMP"
-#define CC_DEMON	"DEMON"
-#define CC_LOST	"LOST SOUL"
-#define CC_CACO	"CACODEMON"
-#define CC_HELL	"HELL KNIGHT"
-#define CC_BARON	"BARON OF HELL"
-#define CC_ARACH	"ARACHNOTRON"
-#define CC_PAIN	"PAIN ELEMENTAL"
-#define CC_REVEN	"REVENANT"
-#define CC_MANCU	"MANCUBUS"
-#define CC_ARCH	"ARCH-VILE"
-#define CC_SPIDER	"THE SPIDER MASTERMIND"
-#define CC_CYBER	"THE CYBERDEMON"
-#define CC_HERO	"OUR HERO"
-
-
-#endif
+/* Printed strings for translation */
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* D_Main.C */
+
+#define D_DEVSTR "Development mode ON.\n"
+#define D_CDROM "CD-ROM Version: default.cfg from c:\\doomdata\n"
+
+/* M_Menu.C */
+
+#define PRESSKEY "press a key."
+#define PRESSYN "press y or n."
+#define QUITMSG "are you sure you want to\nquit this great game?"
+#define LOADNET "you can't do load while in a net game!\n\n" PRESSKEY
+#define QLOADNET "you can't quickload during a netgame!\n\n" PRESSKEY
+#define QSAVESPOT "you haven't picked a quicksave slot yet!\n\n" PRESSKEY
+#define SAVEDEAD "you can't save if you aren't playing!\n\n" PRESSKEY
+#define QSPROMPT "quicksave over your game named\n\n'%s'?\n\n" PRESSYN
+#define QLPROMPT                                                             \
+  "do you want to quickload the game named\n\n'%s'?\n\n" PRESSYN
+
+#define NEWGAME                                                              \
+  "you can't start a new game\n"                                             \
+  "while in a network game.\n\n" PRESSKEY
+
+#define NIGHTMARE                                                            \
+  "are you sure? this skill level\n"                                         \
+  "isn't even remotely fair.\n\n" PRESSYN
+
+#define SWSTRING                                                             \
+  "this is the shareware version of doom.\n\n"                               \
+  "you need to order the entire trilogy.\n\n" PRESSKEY
+
+#define MSGOFF "Messages OFF"
+#define MSGON "Messages ON"
+#define NETEND "you can't end a netgame!\n\n" PRESSKEY
+#define ENDGAME "are you sure you want to end the game?\n\n" PRESSYN
+
+#define DOSY "(press y to quit to dos.)"
+
+#define DETAILHI "High detail"
+#define DETAILLO "Low detail"
+#define GAMMALVL0 "Gamma correction OFF"
+#define GAMMALVL1 "Gamma correction level 1"
+#define GAMMALVL2 "Gamma correction level 2"
+#define GAMMALVL3 "Gamma correction level 3"
+#define GAMMALVL4 "Gamma correction level 4"
+#define EMPTYSTRING "empty slot"
+
+/* P_inter.C */
+
+#define GOTARMOR "Picked up the armor."
+#define GOTMEGA "Picked up the MegaArmor!"
+#define GOTHTHBONUS "Picked up a health bonus."
+#define GOTARMBONUS "Picked up an armor bonus."
+#define GOTSTIM "Picked up a stimpack."
+#define GOTMEDINEED "Picked up a medikit that you REALLY need!"
+#define GOTMEDIKIT "Picked up a medikit."
+#define GOTSUPER "Supercharge!"
+
+#define GOTBLUECARD "Picked up a blue keycard."
+#define GOTYELWCARD "Picked up a yellow keycard."
+#define GOTREDCARD "Picked up a red keycard."
+#define GOTBLUESKUL "Picked up a blue skull key."
+#define GOTYELWSKUL "Picked up a yellow skull key."
+#define GOTREDSKULL "Picked up a red skull key."
+
+#define GOTINVUL "Invulnerability!"
+#define GOTBERSERK "Berserk!"
+#define GOTINVIS "Partial Invisibility"
+#define GOTSUIT "Radiation Shielding Suit"
+#define GOTMAP "Computer Area Map"
+#define GOTVISOR "Light Amplification Visor"
+#define GOTMSPHERE "MegaSphere!"
+
+#define GOTCLIP "Picked up a clip."
+#define GOTCLIPBOX "Picked up a box of bullets."
+#define GOTROCKET "Picked up a rocket."
+#define GOTROCKBOX "Picked up a box of rockets."
+#define GOTCELL "Picked up an energy cell."
+#define GOTCELLBOX "Picked up an energy cell pack."
+#define GOTSHELLS "Picked up 4 shotgun shells."
+#define GOTSHELLBOX "Picked up a box of shotgun shells."
+#define GOTBACKPACK "Picked up a backpack full of ammo!"
+
+#define GOTBFG9000 "You got the BFG9000!  Oh, yes."
+#define GOTCHAINGUN "You got the chaingun!"
+#define GOTCHAINSAW "A chainsaw!  Find some meat!"
+#define GOTLAUNCHER "You got the rocket launcher!"
+#define GOTPLASMA "You got the plasma gun!"
+#define GOTSHOTGUN "You got the shotgun!"
+#define GOTSHOTGUN2 "You got the super shotgun!"
+
+/* P_Doors.C */
+
+#define PD_BLUEO "You need a blue key to activate this object"
+#define PD_REDO "You need a red key to activate this object"
+#define PD_YELLOWO "You need a yellow key to activate this object"
+#define PD_BLUEK "You need a blue key to open this door"
+#define PD_REDK "You need a red key to open this door"
+#define PD_YELLOWK "You need a yellow key to open this door"
+
+/* G_game.C */
+
+#define GGSAVED "game saved."
+
+/* HU_stuff.C */
+
+#define HUSTR_MSGU "[Message unsent]"
+
+#define HUSTR_E1M1 "E1M1: Hangar"
+#define HUSTR_E1M2 "E1M2: Nuclear Plant"
+#define HUSTR_E1M3 "E1M3: Toxin Refinery"
+#define HUSTR_E1M4 "E1M4: Command Control"
+#define HUSTR_E1M5 "E1M5: Phobos Lab"
+#define HUSTR_E1M6 "E1M6: Central Processing"
+#define HUSTR_E1M7 "E1M7: Computer Station"
+#define HUSTR_E1M8 "E1M8: Phobos Anomaly"
+#define HUSTR_E1M9 "E1M9: Military Base"
+
+#define HUSTR_E2M1 "E2M1: Deimos Anomaly"
+#define HUSTR_E2M2 "E2M2: Containment Area"
+#define HUSTR_E2M3 "E2M3: Refinery"
+#define HUSTR_E2M4 "E2M4: Deimos Lab"
+#define HUSTR_E2M5 "E2M5: Command Center"
+#define HUSTR_E2M6 "E2M6: Halls of the Damned"
+#define HUSTR_E2M7 "E2M7: Spawning Vats"
+#define HUSTR_E2M8 "E2M8: Tower of Babel"
+#define HUSTR_E2M9 "E2M9: Fortress of Mystery"
+
+#define HUSTR_E3M1 "E3M1: Hell Keep"
+#define HUSTR_E3M2 "E3M2: Slough of Despair"
+#define HUSTR_E3M3 "E3M3: Pandemonium"
+#define HUSTR_E3M4 "E3M4: House of Pain"
+#define HUSTR_E3M5 "E3M5: Unholy Cathedral"
+#define HUSTR_E3M6 "E3M6: Mt. Erebus"
+#define HUSTR_E3M7 "E3M7: Limbo"
+#define HUSTR_E3M8 "E3M8: Dis"
+#define HUSTR_E3M9 "E3M9: Warrens"
+
+#define HUSTR_E4M1 "E4M1: Hell Beneath"
+#define HUSTR_E4M2 "E4M2: Perfect Hatred"
+#define HUSTR_E4M3 "E4M3: Sever The Wicked"
+#define HUSTR_E4M4 "E4M4: Unruly Evil"
+#define HUSTR_E4M5 "E4M5: They Will Repent"
+#define HUSTR_E4M6 "E4M6: Against Thee Wickedly"
+#define HUSTR_E4M7 "E4M7: And Hell Followed"
+#define HUSTR_E4M8 "E4M8: Unto The Cruel"
+#define HUSTR_E4M9 "E4M9: Fear"
+
+#define HUSTR_1 "level 1: entryway"
+#define HUSTR_2 "level 2: underhalls"
+#define HUSTR_3 "level 3: the gantlet"
+#define HUSTR_4 "level 4: the focus"
+#define HUSTR_5 "level 5: the waste tunnels"
+#define HUSTR_6 "level 6: the crusher"
+#define HUSTR_7 "level 7: dead simple"
+#define HUSTR_8 "level 8: tricks and traps"
+#define HUSTR_9 "level 9: the pit"
+#define HUSTR_10 "level 10: refueling base"
+#define HUSTR_11 "level 11: 'o' of destruction!"
+
+#define HUSTR_12 "level 12: the factory"
+#define HUSTR_13 "level 13: downtown"
+#define HUSTR_14 "level 14: the inmost dens"
+#define HUSTR_15 "level 15: industrial zone"
+#define HUSTR_16 "level 16: suburbs"
+#define HUSTR_17 "level 17: tenements"
+#define HUSTR_18 "level 18: the courtyard"
+#define HUSTR_19 "level 19: the citadel"
+#define HUSTR_20 "level 20: gotcha!"
+
+#define HUSTR_21 "level 21: nirvana"
+#define HUSTR_22 "level 22: the catacombs"
+#define HUSTR_23 "level 23: barrels o' fun"
+#define HUSTR_24 "level 24: the chasm"
+#define HUSTR_25 "level 25: bloodfalls"
+#define HUSTR_26 "level 26: the abandoned mines"
+#define HUSTR_27 "level 27: monster condo"
+#define HUSTR_28 "level 28: the spirit world"
+#define HUSTR_29 "level 29: the living end"
+#define HUSTR_30 "level 30: icon of sin"
+
+#define HUSTR_31 "level 31: wolfenstein"
+#define HUSTR_32 "level 32: grosse"
+
+#define PHUSTR_1 "level 1: congo"
+#define PHUSTR_2 "level 2: well of souls"
+#define PHUSTR_3 "level 3: aztec"
+#define PHUSTR_4 "level 4: caged"
+#define PHUSTR_5 "level 5: ghost town"
+#define PHUSTR_6 "level 6: baron's lair"
+#define PHUSTR_7 "level 7: caughtyard"
+#define PHUSTR_8 "level 8: realm"
+#define PHUSTR_9 "level 9: abattoire"
+#define PHUSTR_10 "level 10: onslaught"
+#define PHUSTR_11 "level 11: hunted"
+
+#define PHUSTR_12 "level 12: speed"
+#define PHUSTR_13 "level 13: the crypt"
+#define PHUSTR_14 "level 14: genesis"
+#define PHUSTR_15 "level 15: the twilight"
+#define PHUSTR_16 "level 16: the omen"
+#define PHUSTR_17 "level 17: compound"
+#define PHUSTR_18 "level 18: neurosphere"
+#define PHUSTR_19 "level 19: nme"
+#define PHUSTR_20 "level 20: the death domain"
+
+#define PHUSTR_21 "level 21: slayer"
+#define PHUSTR_22 "level 22: impossible mission"
+#define PHUSTR_23 "level 23: tombstone"
+#define PHUSTR_24 "level 24: the final frontier"
+#define PHUSTR_25 "level 25: the temple of darkness"
+#define PHUSTR_26 "level 26: bunker"
+#define PHUSTR_27 "level 27: anti-christ"
+#define PHUSTR_28 "level 28: the sewers"
+#define PHUSTR_29 "level 29: odyssey of noises"
+#define PHUSTR_30 "level 30: the gateway of hell"
+
+#define PHUSTR_31 "level 31: cyberden"
+#define PHUSTR_32 "level 32: go 2 it"
+
+#define THUSTR_1 "level 1: system control"
+#define THUSTR_2 "level 2: human bbq"
+#define THUSTR_3 "level 3: power control"
+#define THUSTR_4 "level 4: wormhole"
+#define THUSTR_5 "level 5: hanger"
+#define THUSTR_6 "level 6: open season"
+#define THUSTR_7 "level 7: prison"
+#define THUSTR_8 "level 8: metal"
+#define THUSTR_9 "level 9: stronghold"
+#define THUSTR_10 "level 10: redemption"
+#define THUSTR_11 "level 11: storage facility"
+
+#define THUSTR_12 "level 12: crater"
+#define THUSTR_13 "level 13: nukage processing"
+#define THUSTR_14 "level 14: steel works"
+#define THUSTR_15 "level 15: dead zone"
+#define THUSTR_16 "level 16: deepest reaches"
+#define THUSTR_17 "level 17: processing area"
+#define THUSTR_18 "level 18: mill"
+#define THUSTR_19 "level 19: shipping/respawning"
+#define THUSTR_20 "level 20: central processing"
+
+#define THUSTR_21 "level 21: administration center"
+#define THUSTR_22 "level 22: habitat"
+#define THUSTR_23 "level 23: lunar mining project"
+#define THUSTR_24 "level 24: quarry"
+#define THUSTR_25 "level 25: baron's den"
+#define THUSTR_26 "level 26: ballistyx"
+#define THUSTR_27 "level 27: mount pain"
+#define THUSTR_28 "level 28: heck"
+#define THUSTR_29 "level 29: river styx"
+#define THUSTR_30 "level 30: last call"
+
+#define THUSTR_31 "level 31: pharaoh"
+#define THUSTR_32 "level 32: caribbean"
+
+#define HUSTR_CHATMACRO1 "I'm ready to kick butt!"
+#define HUSTR_CHATMACRO2 "I'm OK."
+#define HUSTR_CHATMACRO3 "I'm not looking too good!"
+#define HUSTR_CHATMACRO4 "Help!"
+#define HUSTR_CHATMACRO5 "You suck!"
+#define HUSTR_CHATMACRO6 "Next time, scumbag..."
+#define HUSTR_CHATMACRO7 "Come here!"
+#define HUSTR_CHATMACRO8 "I'll take care of it."
+#define HUSTR_CHATMACRO9 "Yes"
+#define HUSTR_CHATMACRO0 "No"
+
+#define HUSTR_TALKTOSELF1 "You mumble to yourself"
+#define HUSTR_TALKTOSELF2 "Who's there?"
+#define HUSTR_TALKTOSELF3 "You scare yourself"
+#define HUSTR_TALKTOSELF4 "You start to rave"
+#define HUSTR_TALKTOSELF5 "You've lost it..."
+
+#define HUSTR_MESSAGESENT "[Message Sent]"
+
+/* The following should NOT be changed unless it seems just AWFULLY
+ * necessary
+ */
+
+#define HUSTR_PLRGREEN "Green: "
+#define HUSTR_PLRINDIGO "Indigo: "
+#define HUSTR_PLRBROWN "Brown: "
+#define HUSTR_PLRRED "Red: "
+
+#define HUSTR_KEYGREEN 'g'
+#define HUSTR_KEYINDIGO 'i'
+#define HUSTR_KEYBROWN 'b'
+#define HUSTR_KEYRED 'r'
+
+/* AM_map.C */
+
+#define AMSTR_FOLLOWON "Follow Mode ON"
+#define AMSTR_FOLLOWOFF "Follow Mode OFF"
+
+#define AMSTR_GRIDON "Grid ON"
+#define AMSTR_GRIDOFF "Grid OFF"
+
+#define AMSTR_MARKEDSPOT "Marked Spot"
+#define AMSTR_MARKSCLEARED "All Marks Cleared"
+
+/* ST_stuff.C */
+
+#define STSTR_MUS "Music Change"
+#define STSTR_NOMUS "IMPOSSIBLE SELECTION"
+#define STSTR_DQDON "Degreelessness Mode On"
+#define STSTR_DQDOFF "Degreelessness Mode Off"
+
+#define STSTR_KFAADDED "Very Happy Ammo Added"
+#define STSTR_FAADDED "Ammo (no keys) Added"
+
+#define STSTR_NCON "No Clipping Mode ON"
+#define STSTR_NCOFF "No Clipping Mode OFF"
+
+#define STSTR_BEHOLD "inVuln, Str, Inviso, Rad, Allmap, or Lite-amp"
+#define STSTR_BEHOLDX "Power-up Toggled"
+
+#define STSTR_CHOPPERS "... doesn't suck - GM"
+#define STSTR_CLEV "Changing Level..."
+
+/* F_Finale.C */
+
+#define E1TEXT                                                               \
+  "Once you beat the big badasses and\n"                                     \
+  "clean out the moon base you're supposed\n"                                \
+  "to win, aren't you? Aren't you? Where's\n"                                \
+  "your fat reward and ticket home? What\n"                                  \
+  "the hell is this? It's not supposed to\n"                                 \
+  "end this way!\n"                                                          \
+  "\n"                                                                       \
+  "It stinks like rotten meat, but looks\n"                                  \
+  "like the lost Deimos base.  Looks like\n"                                 \
+  "you're stuck on The Shores of Hell.\n"                                    \
+  "The only way out is through.\n"                                           \
+  "\n"                                                                       \
+  "To continue the DOOM experience, play\n"                                  \
+  "The Shores of Hell and its amazing\n"                                     \
+  "sequel, Inferno!\n"
+
+#define E2TEXT                                                               \
+  "You've done it! The hideous cyber-\n"                                     \
+  "demon lord that ruled the lost Deimos\n"                                  \
+  "moon base has been slain and you\n"                                       \
+  "are triumphant! But ... where are\n"                                      \
+  "you? You clamber to the edge of the\n"                                    \
+  "moon and look down to see the awful\n"                                    \
+  "truth.\n"                                                                 \
+  "\n"                                                                       \
+  "Deimos floats above Hell itself!\n"                                       \
+  "You've never heard of anyone escaping\n"                                  \
+  "from Hell, but you'll make the bastards\n"                                \
+  "sorry they ever heard of you! Quickly,\n"                                 \
+  "you rappel down to  the surface of\n"                                     \
+  "Hell.\n"                                                                  \
+  "\n"                                                                       \
+  "Now, it's on to the final chapter of\n"                                   \
+  "DOOM! -- Inferno."
+
+#define E3TEXT                                                               \
+  "The loathsome spiderdemon that\n"                                         \
+  "masterminded the invasion of the moon\n"                                  \
+  "bases and caused so much death has had\n"                                 \
+  "its ass kicked for all time.\n"                                           \
+  "\n"                                                                       \
+  "A hidden doorway opens and you enter.\n"                                  \
+  "You've proven too tough for Hell to\n"                                    \
+  "contain, and now Hell at last plays\n"                                    \
+  "fair -- for you emerge from the door\n"                                   \
+  "to see the green fields of Earth!\n"                                      \
+  "Home at last.\n"                                                          \
+  "\n"                                                                       \
+  "You wonder what's been happening on\n"                                    \
+  "Earth while you were battling evil\n"                                     \
+  "unleashed. It's good that no Hell-\n"                                     \
+  "spawn could have come through that\n"                                     \
+  "door with you ..."
+
+#define E4TEXT                                                               \
+  "the spider mastermind must have sent forth\n"                             \
+  "its legions of hellspawn before your\n"                                   \
+  "final confrontation with that terrible\n"                                 \
+  "beast from hell.  but you stepped forward\n"                              \
+  "and brought forth eternal damnation and\n"                                \
+  "suffering upon the horde as a true hero\n"                                \
+  "would in the face of something so evil.\n"                                \
+  "\n"                                                                       \
+  "besides, someone was gonna pay for what\n"                                \
+  "happened to daisy, your pet rabbit.\n"                                    \
+  "\n"                                                                       \
+  "but now, you see spread before you more\n"                                \
+  "potential pain and gibbitude as a nation\n"                               \
+  "of demons run amok among our cities.\n"                                   \
+  "\n"                                                                       \
+  "next stop, hell on earth!"
+
+/* after level 6, put this: */
+
+#define C1TEXT                                                               \
+  "YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n"                              \
+  "STARPORT. BUT SOMETHING IS WRONG. THE\n"                                  \
+  "MONSTERS HAVE BROUGHT THEIR OWN REALITY\n"                                \
+  "WITH THEM, AND THE STARPORT'S TECHNOLOGY\n"                               \
+  "IS BEING SUBVERTED BY THEIR PRESENCE.\n"                                  \
+  "\n"                                                                       \
+  "AHEAD, YOU SEE AN OUTPOST OF HELL, A\n"                                   \
+  "FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n"                                \
+  "YOU CAN PENETRATE INTO THE HAUNTED HEART\n"                               \
+  "OF THE STARBASE AND FIND THE CONTROLLING\n"                               \
+  "SWITCH WHICH HOLDS EARTH'S POPULATION\n"                                  \
+  "HOSTAGE."
+
+/* After level 11, put this: */
+
+#define C2TEXT                                                               \
+  "YOU HAVE WON! YOUR VICTORY HAS ENABLED\n"                                 \
+  "HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"                                 \
+  "THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"                                   \
+  "HUMAN LEFT ON THE FACE OF THE PLANET.\n"                                  \
+  "CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"                                \
+  "AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"                              \
+  "YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"                               \
+  "THAT YOU HAVE SAVED YOUR SPECIES.\n"                                      \
+  "\n"                                                                       \
+  "BUT THEN, EARTH CONTROL BEAMS DOWN A\n"                                   \
+  "MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"                             \
+  "THE SOURCE OF THE ALIEN INVASION. IF YOU\n"                               \
+  "GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"                               \
+  "ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"                              \
+  "YOUR OWN HOME CITY, NOT FAR FROM THE\n"                                   \
+  "STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"                               \
+  "UP AND RETURN TO THE FRAY."
+
+/* After level 20, put this: */
+
+#define C3TEXT                                                               \
+  "YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"                              \
+  "SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"                             \
+  "YOU SEE NO WAY TO DESTROY THE CREATURES'\n"                               \
+  "ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"                              \
+  "TEETH AND PLUNGE THROUGH IT.\n"                                           \
+  "\n"                                                                       \
+  "THERE MUST BE A WAY TO CLOSE IT ON THE\n"                                 \
+  "OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"                                 \
+  "GOT TO GO THROUGH HELL TO GET TO IT?"
+
+/* After level 29, put this: */
+
+#define C4TEXT                                                               \
+  "THE HORRENDOUS VISAGE OF THE BIGGEST\n"                                   \
+  "DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"                                 \
+  "YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"                                  \
+  "HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"                                \
+  "UP AND DIES, ITS THRASHING LIMBS\n"                                       \
+  "DEVASTATING UNTOLD MILES OF HELL'S\n"                                     \
+  "SURFACE.\n"                                                               \
+  "\n"                                                                       \
+  "YOU'VE DONE IT. THE INVASION IS OVER.\n"                                  \
+  "EARTH IS SAVED. HELL IS A WRECK. YOU\n"                                   \
+  "WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"                               \
+  "DIE, NOW. WIPING THE SWEAT FROM YOUR\n"                                   \
+  "FOREHEAD YOU BEGIN THE LONG TREK BACK\n"                                  \
+  "HOME. REBUILDING EARTH OUGHT TO BE A\n"                                   \
+  "LOT MORE FUN THAN RUINING IT WAS.\n"
+
+/* Before level 31, put this: */
+
+#define C5TEXT                                                               \
+  "CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"                               \
+  "LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"                                   \
+  "HUMANS, RATHER THAN DEMONS. YOU WONDER\n"                                 \
+  "WHO THE INMATES OF THIS CORNER OF HELL\n"                                 \
+  "WILL BE."
+
+/* Before level 32, put this: */
+
+#define C6TEXT                                                               \
+  "CONGRATULATIONS, YOU'VE FOUND THE\n"                                      \
+  "SUPER SECRET LEVEL!  YOU'D BETTER\n"                                      \
+  "BLAZE THROUGH THIS ONE!\n"
+
+/* after map 06 */
+
+#define P1TEXT                                                               \
+  "You gloat over the steaming carcass of the\n"                             \
+  "Guardian.  With its death, you've wrested\n"                              \
+  "the Accelerator from the stinking claws\n"                                \
+  "of Hell.  You relax and glance around the\n"                              \
+  "room.  Damn!  There was supposed to be at\n"                              \
+  "least one working prototype, but you can't\n"                             \
+  "see it. The demons must have taken it.\n"                                 \
+  "\n"                                                                       \
+  "You must find the prototype, or all your\n"                               \
+  "struggles will have been wasted. Keep\n"                                  \
+  "moving, keep fighting, keep killing.\n"                                   \
+  "Oh yes, keep living, too."
+
+/* after map 11 */
+
+#define P2TEXT                                                               \
+  "Even the deadly Arch-Vile labyrinth could\n"                              \
+  "not stop you, and you've gotten to the\n"                                 \
+  "prototype Accelerator which is soon\n"                                    \
+  "efficiently and permanently deactivated.\n"                               \
+  "\n"                                                                       \
+  "You're good at that kind of thing."
+
+/* after map 20 */
+
+#define P3TEXT                                                               \
+  "You've bashed and battered your way into\n"                               \
+  "the heart of the devil-hive.  Time for a\n"                               \
+  "Search-and-Destroy mission, aimed at the\n"                               \
+  "Gatekeeper, whose foul offspring is\n"                                    \
+  "cascading to Earth.  Yeah, he's bad. But\n"                               \
+  "you know who's worse!\n"                                                  \
+  "\n"                                                                       \
+  "Grinning evilly, you check your gear, and\n"                              \
+  "get ready to give the bastard a little Hell\n"                            \
+  "of your own making!"
+
+/* after map 30 */
+
+#define P4TEXT                                                               \
+  "The Gatekeeper's evil face is splattered\n"                               \
+  "all over the place.  As its tattered corpse\n"                            \
+  "collapses, an inverted Gate forms and\n"                                  \
+  "sucks down the shards of the last\n"                                      \
+  "prototype Accelerator, not to mention the\n"                              \
+  "few remaining demons.  You're done. Hell\n"                               \
+  "has gone back to pounding bad dead folks \n"                              \
+  "instead of good live ones.  Remember to\n"                                \
+  "tell your grandkids to put a rocket\n"                                    \
+  "launcher in your coffin. If you go to Hell\n"                             \
+  "when you die, you'll need it for some\n"                                  \
+  "final cleaning-up ..."
+
+/* before map 31 */
+
+#define P5TEXT                                                               \
+  "You've found the second-hardest level we\n"                               \
+  "got. Hope you have a saved game a level or\n"                             \
+  "two previous.  If not, be prepared to die\n"                              \
+  "aplenty. For master marines only."
+
+/* before map 32 */
+
+#define P6TEXT                                                               \
+  "Betcha wondered just what WAS the hardest\n"                              \
+  "level we had ready for ya?  Now you know.\n"                              \
+  "No one gets out alive."
+
+#define T1TEXT                                                               \
+  "You've fought your way out of the infested\n"                             \
+  "experimental labs.   It seems that UAC has\n"                             \
+  "once again gulped it down.  With their\n"                                 \
+  "high turnover, it must be hard for poor\n"                                \
+  "old UAC to buy corporate health insurance\n"                              \
+  "nowadays..\n"                                                             \
+  "\n"                                                                       \
+  "Ahead lies the military complex, now\n"                                   \
+  "swarming with diseased horrors hot to get\n"                              \
+  "their teeth into you. With luck, the\n"                                   \
+  "complex still has some warlike ordnance\n"                                \
+  "laying around."
+
+#define T2TEXT                                                               \
+  "You hear the grinding of heavy machinery\n"                               \
+  "ahead.  You sure hope they're not stamping\n"                             \
+  "out new hellspawn, but you're ready to\n"                                 \
+  "ream out a whole herd if you have to.\n"                                  \
+  "They might be planning a blood feast, but\n"                              \
+  "you feel about as mean as two thousand\n"                                 \
+  "maniacs packed into one mad killer.\n"                                    \
+  "\n"                                                                       \
+  "You don't plan to go down easy."
+
+#define T3TEXT                                                               \
+  "The vista opening ahead looks real damn\n"                                \
+  "familiar. Smells familiar, too -- like\n"                                 \
+  "fried excrement. You didn't like this\n"                                  \
+  "place before, and you sure as hell ain't\n"                               \
+  "planning to like it now. The more you\n"                                  \
+  "brood on it, the madder you get.\n"                                       \
+  "Hefting your gun, an evil grin trickles\n"                                \
+  "onto your face. Time to take some names."
+
+#define T4TEXT                                                               \
+  "Suddenly, all is silent, from one horizon\n"                              \
+  "to the other. The agonizing echo of Hell\n"                               \
+  "fades away, the nightmare sky turns to\n"                                 \
+  "blue, the heaps of monster corpses start \n"                              \
+  "to evaporate along with the evil stench \n"                               \
+  "that filled the air. Jeeze, maybe you've\n"                               \
+  "done it. Have you really won?\n"                                          \
+  "\n"                                                                       \
+  "Something rumbles in the distance.\n"                                     \
+  "A blue light begins to glow inside the\n"                                 \
+  "ruined skull of the demon-spitter."
+
+#define T5TEXT                                                               \
+  "What now? Looks totally different. Kind\n"                                \
+  "of like King Tut's condo. Well,\n"                                        \
+  "whatever's here can't be any worse\n"                                     \
+  "than usual. Can it?  Or maybe it's best\n"                                \
+  "to let sleeping gods lie.."
+
+#define T6TEXT                                                               \
+  "Time for a vacation. You've burst the\n"                                  \
+  "bowels of hell and by golly you're ready\n"                               \
+  "for a break. You mutter to yourself,\n"                                   \
+  "Maybe someone else can kick Hell's ass\n"                                 \
+  "next time around. Ahead lies a quiet town,\n"                             \
+  "with peaceful flowing water, quaint\n"                                    \
+  "buildings, and presumably no Hellspawn.\n"                                \
+  "\n"                                                                       \
+  "As you step off the transport, you hear\n"                                \
+  "the stomp of a cyberdemon's iron shoe."
+
+/* Character cast strings F_FINALE.C */
+
+#define CC_ZOMBIE "ZOMBIEMAN"
+#define CC_SHOTGUN "SHOTGUN GUY"
+#define CC_HEAVY "HEAVY WEAPON DUDE"
+#define CC_IMP "IMP"
+#define CC_DEMON "DEMON"
+#define CC_LOST "LOST SOUL"
+#define CC_CACO "CACODEMON"
+#define CC_HELL "HELL KNIGHT"
+#define CC_BARON "BARON OF HELL"
+#define CC_ARACH "ARACHNOTRON"
+#define CC_PAIN "PAIN ELEMENTAL"
+#define CC_REVEN "REVENANT"
+#define CC_MANCU "MANCUBUS"
+#define CC_ARCH "ARCH-VILE"
+#define CC_SPIDER "THE SPIDER MASTERMIND"
+#define CC_CYBER "THE CYBERDEMON"
+#define CC_HERO "OUR HERO"
+
+/* DOOM end messages */
+
+#define DOOM1_ENDMSG                                                         \
+  "are you sure you want to\nquit this great game?",                         \
+      "please don't leave, there's more\ndemons to toast!",                  \
+      "let's beat it -- this is turning\ninto a bloodbath!",                 \
+      "i wouldn't leave if i were you.\ndos is much worse.",                 \
+      "you're trying to say you like dos\nbetter than me, right?",           \
+      "don't leave yet -- there's a\ndemon around that corner!",             \
+      "ya know, next time you come in here\ni'm gonna toast ya.",            \
+      "go ahead and leave. see if i care.",
+
+/* QuitDOOM II messages */
+
+#define DOOM2_ENDMSG                                                         \
+  "are you sure you want to\nquit this great game?",                         \
+      "you want to quit?\nthen, thou hast lost an eighth!",                  \
+      "don't go now, there's a \ndimensional shambler waiting\nat the dos "  \
+      "prompt!",                                                             \
+      "get outta here and go back\nto your boring programs.",                \
+      "if i were your boss, i'd \n deathmatch ya in a minute!",              \
+      "look, bud. you leave now\nand you forfeit your body count!",          \
+      "just leave. when you come\nback, i'll be waiting with a bat.",        \
+      "you're lucky i don't smack\nyou for thinking about leaving.",
+
+#endif /* __D_ENGLSH__ */
diff --git a/games/NXDoom/src/doom/d_french.h b/games/NXDoom/src/doom/d_french.h
new file mode 100644
index 000000000..0252aa747
--- /dev/null
+++ b/games/NXDoom/src/doom/d_french.h
@@ -0,0 +1,698 @@
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_french.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Printed strings for translation.
+ *  French language support.
+ *  TODO: finish implementation
+ *  WARN: Non-ascii text does not render properly. Find a solution or cope.
+ *
+ ****************************************************************************/
+
+#ifndef __D_FRENCH__
+#define __D_FRENCH__
+
+/* Printed strings for translation */
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* D_Main.C */
+
+#define D_DEVSTR "Mode développement activé.\n"
+#define D_CDROM "Version CD-ROM: default.cfg de c:\\doomdata\n"
+
+/* M_Menu.C */
+
+#define PRESSKEY "appuie une touche."
+#define PRESSYN "appuie y ou n."
+#define QUITMSG "es-tu certain que tu veux quitter ce super jeu ?"
+#define LOADNET "tu ne peux pas charger pendant un jeu en ligne!\n\n" PRESSKEY
+#define QLOADNET                                                             \
+  "tu ne peux pas charger rapidement pendant un jeu en ligne!\n\n" PRESSKEY
+#define QSAVESPOT "tu n'as pas choisi un slot sauvegarde rapide\n\n" PRESSKEY
+#define SAVEDEAD "tu ne peux pas sauvegarder si tu ne joue pas\n\n" PRESSKEY
+#define QSPROMPT "sauvegarde ton jeu nommé\n\n'%s'?\n\n" PRESSYN
+#define QLPROMPT                                                             \
+  "tu veux charger rapidement le jeu nommé\n\n'%s'?\n\n" PRESSYN
+
+#define NEWGAME                                                              \
+  "tu ne peux pas commencer un nouveau jeu\n"                                \
+  "durant un jeu en ligne.\n\n" PRESSKEY
+
+#define NIGHTMARE                                                            \
+  "es-tu sure? ce niveau\n"                                                  \
+  "n'est absolument pas juste.\n\n" PRESSYN
+
+#define SWSTRING                                                             \
+  "ceci est le version shareware de doom.\n\n"                               \
+  "tu besoin de commander la trilogie entiere.\n\n" PRESSKEY
+
+#define MSGOFF "Messages DÉSACTIVÉS"
+#define MSGON "Messages ACTIVÉS"
+#define NETEND "tu ne peux pas quitter un jeu en ligne!\n\n" PRESSKEY
+#define ENDGAME "es-tu sure que tu veux quitter le jeu?\n\n" PRESSYN
+
+#define DOSY "(appuie y pour quitter vers dos.)"
+
+#define DETAILHI "Haute définition"
+#define DETAILLO "Faible définition"
+#define GAMMALVL0 "Correction gamma DÉSACTIVÉ"
+#define GAMMALVL1 "Correction gamma niveau 1"
+#define GAMMALVL2 "Correction gamma niveau 2"
+#define GAMMALVL3 "Correction gamma niveau 3"
+#define GAMMALVL4 "Correction gamma niveau 4"
+#define EMPTYSTRING "slot vide"
+
+/* P_inter.C */
+
+#define GOTARMOR "Ramassé l'armure."
+#define GOTMEGA "Ramassé le Mega Armure!"
+#define GOTHTHBONUS "Ramassé un bonus de santé."
+#define GOTARMBONUS "Ramassé un bonus d'armure."
+#define GOTSTIM "Ramassé un stimpack."
+#define GOTMEDINEED "Ramassé un medikit que tu as VRAIMENT besoin!"
+#define GOTMEDIKIT "Ramassé un medikit."
+#define GOTSUPER "Superchargé!"
+
+#define GOTBLUECARD "Ramassé une carte d'accès bleue."
+#define GOTYELWCARD "Ramassé une carte d'accès jaune."
+#define GOTREDCARD "Ramassé une carte d'accès rouge."
+#define GOTBLUESKUL "Ramassé une clé crâne bleue."
+#define GOTYELWSKUL "Ramassé une clé crâne jaune."
+#define GOTREDSKULL "Ramassé une clé crâne rouge."
+
+#define GOTINVUL "Invulnérabilité!"
+#define GOTBERSERK "Berserk!"
+#define GOTINVIS "Invisibilité Partielle"
+#define GOTSUIT "Radiation Shielding Suit" // TODO?
+#define GOTMAP "Carte de la Zone Informatique"
+#define GOTVISOR "Light Amplification Visor" // TODO?
+#define GOTMSPHERE "MegaSphere!"
+
+#define GOTCLIP "Ramassé un clip."
+#define GOTCLIPBOX "Ramassé une boîte de balles."
+#define GOTROCKET "Ramassé une fusée."
+#define GOTROCKBOX "Ramassé une boîte de fusées."
+#define GOTCELL "Ramassé une cellule énergétique."
+#define GOTCELLBOX "Ramassé un paquet de cellules énergétiques."
+#define GOTSHELLS "Ramassé 4 cartouches de fusil de chasse."
+#define GOTSHELLBOX "Ramassé une boîte de cartouches de fusil de chasse."
+#define GOTBACKPACK "Ramassé une sac à dos plein d'ammo!"
+
+#define GOTBFG9000 "Tu as eu le BFG9000! Hohoho, oui!"
+#define GOTCHAINGUN "Tu as eu le chaingun!"
+#define GOTCHAINSAW "Un scie à chaîne! Trouve de la viande!"
+#define GOTLAUNCHER "Tu as eu la lance-roquettes!"
+#define GOTPLASMA "Tu as eu le pistolet à plasma!"
+#define GOTSHOTGUN "Tu as eu le fusil de chasse!"
+#define GOTSHOTGUN2 "Tu as eu le super fusil de chasse!"
+
+/* P_Doors.C */
+
+#define PD_BLUEO "You need a blue key to activate this object"
+#define PD_REDO "You need a red key to activate this object"
+#define PD_YELLOWO "You need a yellow key to activate this object"
+#define PD_BLUEK "You need a blue key to open this door"
+#define PD_REDK "You need a red key to open this door"
+#define PD_YELLOWK "You need a yellow key to open this door"
+
+/* G_game.C */
+
+#define GGSAVED "game saved."
+
+/* HU_stuff.C */
+
+#define HUSTR_MSGU "[Message unsent]"
+
+#define HUSTR_E1M1 "E1M1: Hangar"
+#define HUSTR_E1M2 "E1M2: Nuclear Plant"
+#define HUSTR_E1M3 "E1M3: Toxin Refinery"
+#define HUSTR_E1M4 "E1M4: Command Control"
+#define HUSTR_E1M5 "E1M5: Phobos Lab"
+#define HUSTR_E1M6 "E1M6: Central Processing"
+#define HUSTR_E1M7 "E1M7: Computer Station"
+#define HUSTR_E1M8 "E1M8: Phobos Anomaly"
+#define HUSTR_E1M9 "E1M9: Military Base"
+
+#define HUSTR_E2M1 "E2M1: Deimos Anomaly"
+#define HUSTR_E2M2 "E2M2: Containment Area"
+#define HUSTR_E2M3 "E2M3: Refinery"
+#define HUSTR_E2M4 "E2M4: Deimos Lab"
+#define HUSTR_E2M5 "E2M5: Command Center"
+#define HUSTR_E2M6 "E2M6: Halls of the Damned"
+#define HUSTR_E2M7 "E2M7: Spawning Vats"
+#define HUSTR_E2M8 "E2M8: Tower of Babel"
+#define HUSTR_E2M9 "E2M9: Fortress of Mystery"
+
+#define HUSTR_E3M1 "E3M1: Hell Keep"
+#define HUSTR_E3M2 "E3M2: Slough of Despair"
+#define HUSTR_E3M3 "E3M3: Pandemonium"
+#define HUSTR_E3M4 "E3M4: House of Pain"
+#define HUSTR_E3M5 "E3M5: Unholy Cathedral"
+#define HUSTR_E3M6 "E3M6: Mt. Erebus"
+#define HUSTR_E3M7 "E3M7: Limbo"
+#define HUSTR_E3M8 "E3M8: Dis"
+#define HUSTR_E3M9 "E3M9: Warrens"
+
+#define HUSTR_E4M1 "E4M1: Hell Beneath"
+#define HUSTR_E4M2 "E4M2: Perfect Hatred"
+#define HUSTR_E4M3 "E4M3: Sever The Wicked"
+#define HUSTR_E4M4 "E4M4: Unruly Evil"
+#define HUSTR_E4M5 "E4M5: They Will Repent"
+#define HUSTR_E4M6 "E4M6: Against Thee Wickedly"
+#define HUSTR_E4M7 "E4M7: And Hell Followed"
+#define HUSTR_E4M8 "E4M8: Unto The Cruel"
+#define HUSTR_E4M9 "E4M9: Fear"
+
+#define HUSTR_1 "niveau 1: entryway"
+#define HUSTR_2 "niveau 2: underhalls"
+#define HUSTR_3 "niveau 3: the gantlet"
+#define HUSTR_4 "niveau 4: the focus"
+#define HUSTR_5 "niveau 5: the waste tunnels"
+#define HUSTR_6 "niveau 6: the crusher"
+#define HUSTR_7 "niveau 7: dead simple"
+#define HUSTR_8 "niveau 8: tricks and traps"
+#define HUSTR_9 "niveau 9: the pit"
+#define HUSTR_10 "niveau 10: refueling base"
+#define HUSTR_11 "niveau 11: 'o' of destruction!"
+
+#define HUSTR_12 "niveau 12: the factory"
+#define HUSTR_13 "niveau 13: downtown"
+#define HUSTR_14 "niveau 14: the inmost dens"
+#define HUSTR_15 "niveau 15: industrial zone"
+#define HUSTR_16 "niveau 16: suburbs"
+#define HUSTR_17 "niveau 17: tenements"
+#define HUSTR_18 "niveau 18: the courtyard"
+#define HUSTR_19 "niveau 19: the citadel"
+#define HUSTR_20 "niveau 20: gotcha!"
+
+#define HUSTR_21 "niveau 21: nirvana"
+#define HUSTR_22 "niveau 22: the catacombs"
+#define HUSTR_23 "niveau 23: barrels o' fun"
+#define HUSTR_24 "niveau 24: the chasm"
+#define HUSTR_25 "niveau 25: bloodfalls"
+#define HUSTR_26 "niveau 26: the abandoned mines"
+#define HUSTR_27 "niveau 27: monster condo"
+#define HUSTR_28 "niveau 28: the spirit world"
+#define HUSTR_29 "niveau 29: the living end"
+#define HUSTR_30 "niveau 30: icon of sin"
+
+#define HUSTR_31 "niveau 31: wolfenstein"
+#define HUSTR_32 "niveau 32: grosse"
+
+#define PHUSTR_1 "niveau 1: congo"
+#define PHUSTR_2 "niveau 2: well of souls"
+#define PHUSTR_3 "niveau 3: aztec"
+#define PHUSTR_4 "niveau 4: caged"
+#define PHUSTR_5 "niveau 5: ghost town"
+#define PHUSTR_6 "niveau 6: baron's lair"
+#define PHUSTR_7 "niveau 7: caughtyard"
+#define PHUSTR_8 "niveau 8: realm"
+#define PHUSTR_9 "niveau 9: abattoire"
+#define PHUSTR_10 "niveau 10: onslaught"
+#define PHUSTR_11 "niveau 11: hunted"
+
+#define PHUSTR_12 "niveau 12: speed"
+#define PHUSTR_13 "niveau 13: the crypt"
+#define PHUSTR_14 "niveau 14: genesis"
+#define PHUSTR_15 "niveau 15: the twilight"
+#define PHUSTR_16 "niveau 16: the omen"
+#define PHUSTR_17 "niveau 17: compound"
+#define PHUSTR_18 "niveau 18: neurosphere"
+#define PHUSTR_19 "niveau 19: nme"
+#define PHUSTR_20 "niveau 20: the death domain"
+
+#define PHUSTR_21 "niveau 21: slayer"
+#define PHUSTR_22 "niveau 22: impossible mission"
+#define PHUSTR_23 "niveau 23: tombstone"
+#define PHUSTR_24 "niveau 24: the final frontier"
+#define PHUSTR_25 "niveau 25: the temple of darkness"
+#define PHUSTR_26 "niveau 26: bunker"
+#define PHUSTR_27 "niveau 27: anti-christ"
+#define PHUSTR_28 "niveau 28: the sewers"
+#define PHUSTR_29 "niveau 29: odyssey of noises"
+#define PHUSTR_30 "niveau 30: the gateway of hell"
+
+#define PHUSTR_31 "niveau 31: cyberden"
+#define PHUSTR_32 "niveau 32: go 2 it"
+
+#define THUSTR_1 "niveau 1: system control"
+#define THUSTR_2 "niveau 2: human bbq"
+#define THUSTR_3 "niveau 3: power control"
+#define THUSTR_4 "niveau 4: wormhole"
+#define THUSTR_5 "niveau 5: hanger"
+#define THUSTR_6 "niveau 6: open season"
+#define THUSTR_7 "niveau 7: prison"
+#define THUSTR_8 "niveau 8: metal"
+#define THUSTR_9 "niveau 9: stronghold"
+#define THUSTR_10 "niveau 10: redemption"
+#define THUSTR_11 "niveau 11: storage facility"
+
+#define THUSTR_12 "niveau 12: crater"
+#define THUSTR_13 "niveau 13: nukage processing"
+#define THUSTR_14 "niveau 14: steel works"
+#define THUSTR_15 "niveau 15: dead zone"
+#define THUSTR_16 "niveau 16: deepest reaches"
+#define THUSTR_17 "niveau 17: processing area"
+#define THUSTR_18 "niveau 18: mill"
+#define THUSTR_19 "niveau 19: shipping/respawning"
+#define THUSTR_20 "niveau 20: central processing"
+
+#define THUSTR_21 "niveau 21: administration center"
+#define THUSTR_22 "niveau 22: habitat"
+#define THUSTR_23 "niveau 23: lunar mining project"
+#define THUSTR_24 "niveau 24: quarry"
+#define THUSTR_25 "niveau 25: baron's den"
+#define THUSTR_26 "niveau 26: ballistyx"
+#define THUSTR_27 "niveau 27: mount pain"
+#define THUSTR_28 "niveau 28: heck"
+#define THUSTR_29 "niveau 29: river styx"
+#define THUSTR_30 "niveau 30: last call"
+
+#define THUSTR_31 "niveau 31: pharaoh"
+#define THUSTR_32 "niveau 32: caribbean"
+
+#define HUSTR_CHATMACRO1 "I'm ready to kick butt!"
+#define HUSTR_CHATMACRO2 "I'm OK."
+#define HUSTR_CHATMACRO3 "I'm not looking too good!"
+#define HUSTR_CHATMACRO4 "Help!"
+#define HUSTR_CHATMACRO5 "You suck!"
+#define HUSTR_CHATMACRO6 "Next time, scumbag..."
+#define HUSTR_CHATMACRO7 "Come here!"
+#define HUSTR_CHATMACRO8 "I'll take care of it."
+#define HUSTR_CHATMACRO9 "Oui"
+#define HUSTR_CHATMACRO0 "Non"
+
+#define HUSTR_TALKTOSELF1 "You mumble to yourself"
+#define HUSTR_TALKTOSELF2 "Who's there?"
+#define HUSTR_TALKTOSELF3 "You scare yourself"
+#define HUSTR_TALKTOSELF4 "You start to rave"
+#define HUSTR_TALKTOSELF5 "You've lost it..."
+
+#define HUSTR_MESSAGESENT "[Message Sent]"
+
+/* The following should NOT be changed unless it seems just AWFULLY
+ * necessary
+ */
+
+#define HUSTR_PLRGREEN "Vert: "
+#define HUSTR_PLRINDIGO "Indigo: "
+#define HUSTR_PLRBROWN "Brun: "
+#define HUSTR_PLRRED "Rouge: "
+
+#define HUSTR_KEYGREEN 'g'
+#define HUSTR_KEYINDIGO 'i'
+#define HUSTR_KEYBROWN 'b'
+#define HUSTR_KEYRED 'r'
+
+/* AM_map.C */
+
+#define AMSTR_FOLLOWON "Follow Mode ON"
+#define AMSTR_FOLLOWOFF "Follow Mode OFF"
+
+#define AMSTR_GRIDON "Grid ON"
+#define AMSTR_GRIDOFF "Grid OFF"
+
+#define AMSTR_MARKEDSPOT "Marked Spot"
+#define AMSTR_MARKSCLEARED "All Marks Cleared"
+
+/* ST_stuff.C */
+
+#define STSTR_MUS "Music Change"
+#define STSTR_NOMUS "IMPOSSIBLE SELECTION"
+#define STSTR_DQDON "Degreelessness Mode On"
+#define STSTR_DQDOFF "Degreelessness Mode Off"
+
+#define STSTR_KFAADDED "Very Happy Ammo Added"
+#define STSTR_FAADDED "Ammo (no keys) Added"
+
+#define STSTR_NCON "No Clipping Mode ON"
+#define STSTR_NCOFF "No Clipping Mode OFF"
+
+#define STSTR_BEHOLD "inVuln, Str, Inviso, Rad, Allmap, or Lite-amp"
+#define STSTR_BEHOLDX "Power-up Toggled"
+
+#define STSTR_CHOPPERS "... doesn't suck - GM"
+#define STSTR_CLEV "Changing Level..."
+
+/* F_Finale.C */
+
+#define E1TEXT                                                               \
+  "Once you beat the big badasses and\n"                                     \
+  "clean out the moon base you're supposed\n"                                \
+  "to win, aren't you? Aren't you? Where's\n"                                \
+  "your fat reward and ticket home? What\n"                                  \
+  "the hell is this? It's not supposed to\n"                                 \
+  "end this way!\n"                                                          \
+  "\n"                                                                       \
+  "It stinks like rotten meat, but looks\n"                                  \
+  "like the lost Deimos base.  Looks like\n"                                 \
+  "you're stuck on The Shores of Hell.\n"                                    \
+  "The only way out is through.\n"                                           \
+  "\n"                                                                       \
+  "To continue the DOOM experience, play\n"                                  \
+  "The Shores of Hell and its amazing\n"                                     \
+  "sequel, Inferno!\n"
+
+#define E2TEXT                                                               \
+  "You've done it! The hideous cyber-\n"                                     \
+  "demon lord that ruled the lost Deimos\n"                                  \
+  "moon base has been slain and you\n"                                       \
+  "are triumphant! But ... where are\n"                                      \
+  "you? You clamber to the edge of the\n"                                    \
+  "moon and look down to see the awful\n"                                    \
+  "truth.\n"                                                                 \
+  "\n"                                                                       \
+  "Deimos floats above Hell itself!\n"                                       \
+  "You've never heard of anyone escaping\n"                                  \
+  "from Hell, but you'll make the bastards\n"                                \
+  "sorry they ever heard of you! Quickly,\n"                                 \
+  "you rappel down to  the surface of\n"                                     \
+  "Hell.\n"                                                                  \
+  "\n"                                                                       \
+  "Now, it's on to the final chapter of\n"                                   \
+  "DOOM! -- Inferno."
+
+#define E3TEXT                                                               \
+  "The loathsome spiderdemon that\n"                                         \
+  "masterminded the invasion of the moon\n"                                  \
+  "bases and caused so much death has had\n"                                 \
+  "its ass kicked for all time.\n"                                           \
+  "\n"                                                                       \
+  "A hidden doorway opens and you enter.\n"                                  \
+  "You've proven too tough for Hell to\n"                                    \
+  "contain, and now Hell at last plays\n"                                    \
+  "fair -- for you emerge from the door\n"                                   \
+  "to see the green fields of Earth!\n"                                      \
+  "Home at last.\n"                                                          \
+  "\n"                                                                       \
+  "You wonder what's been happening on\n"                                    \
+  "Earth while you were battling evil\n"                                     \
+  "unleashed. It's good that no Hell-\n"                                     \
+  "spawn could have come through that\n"                                     \
+  "door with you ..."
+
+#define E4TEXT                                                               \
+  "the spider mastermind must have sent forth\n"                             \
+  "its legions of hellspawn before your\n"                                   \
+  "final confrontation with that terrible\n"                                 \
+  "beast from hell.  but you stepped forward\n"                              \
+  "and brought forth eternal damnation and\n"                                \
+  "suffering upon the horde as a true hero\n"                                \
+  "would in the face of something so evil.\n"                                \
+  "\n"                                                                       \
+  "besides, someone was gonna pay for what\n"                                \
+  "happened to daisy, your pet rabbit.\n"                                    \
+  "\n"                                                                       \
+  "but now, you see spread before you more\n"                                \
+  "potential pain and gibbitude as a nation\n"                               \
+  "of demons run amok among our cities.\n"                                   \
+  "\n"                                                                       \
+  "next stop, hell on earth!"
+
+/* after niveau 6, put this: */
+
+#define C1TEXT                                                               \
+  "YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n"                              \
+  "STARPORT. BUT SOMETHING IS WRONG. THE\n"                                  \
+  "MONSTERS HAVE BROUGHT THEIR OWN REALITY\n"                                \
+  "WITH THEM, AND THE STARPORT'S TECHNOLOGY\n"                               \
+  "IS BEING SUBVERTED BY THEIR PRESENCE.\n"                                  \
+  "\n"                                                                       \
+  "AHEAD, YOU SEE AN OUTPOST OF HELL, A\n"                                   \
+  "FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n"                                \
+  "YOU CAN PENETRATE INTO THE HAUNTED HEART\n"                               \
+  "OF THE STARBASE AND FIND THE CONTROLLING\n"                               \
+  "SWITCH WHICH HOLDS EARTH'S POPULATION\n"                                  \
+  "HOSTAGE."
+
+/* After niveau 11, put this: */
+
+#define C2TEXT                                                               \
+  "YOU HAVE WON! YOUR VICTORY HAS ENABLED\n"                                 \
+  "HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"                                 \
+  "THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"                                   \
+  "HUMAN LEFT ON THE FACE OF THE PLANET.\n"                                  \
+  "CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"                                \
+  "AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"                              \
+  "YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"                               \
+  "THAT YOU HAVE SAVED YOUR SPECIES.\n"                                      \
+  "\n"                                                                       \
+  "BUT THEN, EARTH CONTROL BEAMS DOWN A\n"                                   \
+  "MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"                             \
+  "THE SOURCE OF THE ALIEN INVASION. IF YOU\n"                               \
+  "GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"                               \
+  "ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"                              \
+  "YOUR OWN HOME CITY, NOT FAR FROM THE\n"                                   \
+  "STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"                               \
+  "UP AND RETURN TO THE FRAY."
+
+/* After niveau 20, put this: */
+
+#define C3TEXT                                                               \
+  "YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"                              \
+  "SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"                             \
+  "YOU SEE NO WAY TO DESTROY THE CREATURES'\n"                               \
+  "ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"                              \
+  "TEETH AND PLUNGE THROUGH IT.\n"                                           \
+  "\n"                                                                       \
+  "THERE MUST BE A WAY TO CLOSE IT ON THE\n"                                 \
+  "OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"                                 \
+  "GOT TO GO THROUGH HELL TO GET TO IT?"
+
+/* After niveau 29, put this: */
+
+#define C4TEXT                                                               \
+  "THE HORRENDOUS VISAGE OF THE BIGGEST\n"                                   \
+  "DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"                                 \
+  "YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"                                  \
+  "HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"                                \
+  "UP AND DIES, ITS THRASHING LIMBS\n"                                       \
+  "DEVASTATING UNTOLD MILES OF HELL'S\n"                                     \
+  "SURFACE.\n"                                                               \
+  "\n"                                                                       \
+  "YOU'VE DONE IT. THE INVASION IS OVER.\n"                                  \
+  "EARTH IS SAVED. HELL IS A WRECK. YOU\n"                                   \
+  "WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"                               \
+  "DIE, NOW. WIPING THE SWEAT FROM YOUR\n"                                   \
+  "FOREHEAD YOU BEGIN THE LONG TREK BACK\n"                                  \
+  "HOME. REBUILDING EARTH OUGHT TO BE A\n"                                   \
+  "LOT MORE FUN THAN RUINING IT WAS.\n"
+
+/* Before niveau 31, put this: */
+
+#define C5TEXT                                                               \
+  "CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"                               \
+  "LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"                                   \
+  "HUMANS, RATHER THAN DEMONS. YOU WONDER\n"                                 \
+  "WHO THE INMATES OF THIS CORNER OF HELL\n"                                 \
+  "WILL BE."
+
+/* Before niveau 32, put this: */
+
+#define C6TEXT                                                               \
+  "CONGRATULATIONS, YOU'VE FOUND THE\n"                                      \
+  "SUPER SECRET LEVEL!  YOU'D BETTER\n"                                      \
+  "BLAZE THROUGH THIS ONE!\n"
+
+/* after map 06 */
+
+#define P1TEXT                                                               \
+  "You gloat over the steaming carcass of the\n"                             \
+  "Guardian.  With its death, you've wrested\n"                              \
+  "the Accelerator from the stinking claws\n"                                \
+  "of Hell.  You relax and glance around the\n"                              \
+  "room.  Damn!  There was supposed to be at\n"                              \
+  "least one working prototype, but you can't\n"                             \
+  "see it. The demons must have taken it.\n"                                 \
+  "\n"                                                                       \
+  "You must find the prototype, or all your\n"                               \
+  "struggles will have been wasted. Keep\n"                                  \
+  "moving, keep fighting, keep killing.\n"                                   \
+  "Oh yes, keep living, too."
+
+/* after map 11 */
+
+#define P2TEXT                                                               \
+  "Even the deadly Arch-Vile labyrinth could\n"                              \
+  "not stop you, and you've gotten to the\n"                                 \
+  "prototype Accelerator which is soon\n"                                    \
+  "efficiently and permanently deactivated.\n"                               \
+  "\n"                                                                       \
+  "You're good at that kind of thing."
+
+/* after map 20 */
+
+#define P3TEXT                                                               \
+  "You've bashed and battered your way into\n"                               \
+  "the heart of the devil-hive.  Time for a\n"                               \
+  "Search-and-Destroy mission, aimed at the\n"                               \
+  "Gatekeeper, whose foul offspring is\n"                                    \
+  "cascading to Earth.  Yeah, he's bad. But\n"                               \
+  "you know who's worse!\n"                                                  \
+  "\n"                                                                       \
+  "Grinning evilly, you check your gear, and\n"                              \
+  "get ready to give the bastard a little Hell\n"                            \
+  "of your own making!"
+
+/* after map 30 */
+
+#define P4TEXT                                                               \
+  "The Gatekeeper's evil face is splattered\n"                               \
+  "all over the place.  As its tattered corpse\n"                            \
+  "collapses, an inverted Gate forms and\n"                                  \
+  "sucks down the shards of the last\n"                                      \
+  "prototype Accelerator, not to mention the\n"                              \
+  "few remaining demons.  You're done. Hell\n"                               \
+  "has gone back to pounding bad dead folks \n"                              \
+  "instead of good live ones.  Remember to\n"                                \
+  "tell your grandkids to put a rocket\n"                                    \
+  "launcher in your coffin. If you go to Hell\n"                             \
+  "when you die, you'll need it for some\n"                                  \
+  "final cleaning-up ..."
+
+/* before map 31 */
+
+#define P5TEXT                                                               \
+  "You've found the second-hardest niveau we\n"                              \
+  "got. Hope you have a saved game a niveau or\n"                            \
+  "two previous.  If not, be prepared to die\n"                              \
+  "aplenty. For master marines only."
+
+/* before map 32 */
+
+#define P6TEXT                                                               \
+  "Betcha wondered just what WAS the hardest\n"                              \
+  "niveau we had ready for ya?  Now you know.\n"                             \
+  "No one gets out alive."
+
+#define T1TEXT                                                               \
+  "You've fought your way out of the infested\n"                             \
+  "experimental labs.   It seems that UAC has\n"                             \
+  "once again gulped it down.  With their\n"                                 \
+  "high turnover, it must be hard for poor\n"                                \
+  "old UAC to buy corporate health insurance\n"                              \
+  "nowadays..\n"                                                             \
+  "\n"                                                                       \
+  "Ahead lies the military complex, now\n"                                   \
+  "swarming with diseased horrors hot to get\n"                              \
+  "their teeth into you. With luck, the\n"                                   \
+  "complex still has some warlike ordnance\n"                                \
+  "laying around."
+
+#define T2TEXT                                                               \
+  "You hear the grinding of heavy machinery\n"                               \
+  "ahead.  You sure hope they're not stamping\n"                             \
+  "out new hellspawn, but you're ready to\n"                                 \
+  "ream out a whole herd if you have to.\n"                                  \
+  "They might be planning a blood feast, but\n"                              \
+  "you feel about as mean as two thousand\n"                                 \
+  "maniacs packed into one mad killer.\n"                                    \
+  "\n"                                                                       \
+  "You don't plan to go down easy."
+
+#define T3TEXT                                                               \
+  "The vista opening ahead looks real damn\n"                                \
+  "familiar. Smells familiar, too -- like\n"                                 \
+  "fried excrement. You didn't like this\n"                                  \
+  "place before, and you sure as hell ain't\n"                               \
+  "planning to like it now. The more you\n"                                  \
+  "brood on it, the madder you get.\n"                                       \
+  "Hefting your gun, an evil grin trickles\n"                                \
+  "onto your face. Time to take some names."
+
+#define T4TEXT                                                               \
+  "Suddenly, all is silent, from one horizon\n"                              \
+  "to the other. The agonizing echo of Hell\n"                               \
+  "fades away, the nightmare sky turns to\n"                                 \
+  "blue, the heaps of monster corpses start \n"                              \
+  "to evaporate along with the evil stench \n"                               \
+  "that filled the air. Jeeze, maybe you've\n"                               \
+  "done it. Have you really won?\n"                                          \
+  "\n"                                                                       \
+  "Something rumbles in the distance.\n"                                     \
+  "A blue light begins to glow inside the\n"                                 \
+  "ruined skull of the demon-spitter."
+
+#define T5TEXT                                                               \
+  "What now? Looks totally different. Kind\n"                                \
+  "of like King Tut's condo. Well,\n"                                        \
+  "whatever's here can't be any worse\n"                                     \
+  "than usual. Can it?  Or maybe it's best\n"                                \
+  "to let sleeping gods lie.."
+
+#define T6TEXT                                                               \
+  "Time for a vacation. You've burst the\n"                                  \
+  "bowels of hell and by golly you're ready\n"                               \
+  "for a break. You mutter to yourself,\n"                                   \
+  "Maybe someone else can kick Hell's ass\n"                                 \
+  "next time around. Ahead lies a quiet town,\n"                             \
+  "with peaceful flowing water, quaint\n"                                    \
+  "buildings, and presumably no Hellspawn.\n"                                \
+  "\n"                                                                       \
+  "As you step off the transport, you hear\n"                                \
+  "the stomp of a cyberdemon's iron shoe."
+
+/* Character cast strings F_FINALE.C */
+
+#define CC_ZOMBIE "ZOMBIEMAN"
+#define CC_SHOTGUN "SHOTGUN GUY"
+#define CC_HEAVY "HEAVY WEAPON DUDE"
+#define CC_IMP "IMP"
+#define CC_DEMON "DEMON"
+#define CC_LOST "LOST SOUL"
+#define CC_CACO "CACODEMON"
+#define CC_HELL "HELL KNIGHT"
+#define CC_BARON "BARON OF HELL"
+#define CC_ARACH "ARACHNOTRON"
+#define CC_PAIN "PAIN ELEMENTAL"
+#define CC_REVEN "REVENANT"
+#define CC_MANCU "MANCUBUS"
+#define CC_ARCH "ARCH-VILE"
+#define CC_SPIDER "THE SPIDER MASTERMIND"
+#define CC_CYBER "THE CYBERDEMON"
+#define CC_HERO "OUR HERO"
+
+/* DOOM end messages */
+
+#define DOOM1_ENDMSG                                                         \
+  "are you sure you want to\nquit this great game?",                         \
+      "please don't leave, there's more\ndemons to toast!",                  \
+      "let's beat it -- this is turning\ninto a bloodbath!",                 \
+      "i wouldn't leave if i were you.\ndos is much worse.",                 \
+      "you're trying to say you like dos\nbetter than me, right?",           \
+      "don't leave yet -- there's a\ndemon around that corner!",             \
+      "ya know, next time you come in here\ni'm gonna toast ya.",            \
+      "go ahead and leave. see if i care.",
+
+/* QuitDOOM II messages */
+
+#define DOOM2_ENDMSG                                                         \
+  "are you sure you want to\nquit this great game?",                         \
+      "you want to quit?\nthen, thou hast lost an eighth!",                  \
+      "don't go now, there's a \ndimensional shambler waiting\nat the dos "  \
+      "prompt!",                                                             \
+      "get outta here and go back\nto your boring programs.",                \
+      "if i were your boss, i'd \n deathmatch ya in a minute!",              \
+      "look, bud. you leave now\nand you forfeit your body count!",          \
+      "just leave. when you come\nback, i'll be waiting with a bat.",        \
+      "you're lucky i don't smack\nyou for thinking about leaving.",
+
+#endif /* __D_FRENCH__ */
diff --git a/games/NXDoom/src/doom/d_items.c b/games/NXDoom/src/doom/d_items.c
index 33f310c63..8fc606b6c 100644
--- a/games/NXDoom/src/doom/d_items.c
+++ b/games/NXDoom/src/doom/d_items.c
@@ -1,128 +1,143 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_items.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* We are referring to sprite numbers. */
 
-// We are referring to sprite numbers.
 #include "info.h"
 
 #include "d_items.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// PSPRITE ACTIONS for waepons.
-// This struct controls the weapon animations.
-//
-// Each entry is:
-//   ammo/amunition type
-//  upstate
-//  downstate
-// readystate
-// atkstate, i.e. attack/fire/hit frame
-// flashstate, muzzle flash
-//
-weaponinfo_t	weaponinfo[NUMWEAPONS] =
+/* PSPRITE ACTIONS for weapons.
+ * This struct controls the weapon animations.
+ *
+ * Each entry is:
+ *   ammo/ammunition type
+ *  upstate
+ *  downstate
+ * readystate
+ * atkstate, i.e. attack/fire/hit frame
+ * flashstate, muzzle flash
+ */
+
+weaponinfo_t weaponinfo[NUMWEAPONS] =
 {
     {
-	// fist
-	am_noammo,
-	S_PUNCHUP,
-	S_PUNCHDOWN,
-	S_PUNCH,
-	S_PUNCH1,
-	S_NULL
-    },	
-    {
-	// pistol
-	am_clip,
-	S_PISTOLUP,
-	S_PISTOLDOWN,
-	S_PISTOL,
-	S_PISTOL1,
-	S_PISTOLFLASH
-    },	
-    {
-	// shotgun
-	am_shell,
-	S_SGUNUP,
-	S_SGUNDOWN,
-	S_SGUN,
-	S_SGUN1,
-	S_SGUNFLASH1
+        /* fist */
+
+        am_noammo,
+        S_PUNCHUP,
+        S_PUNCHDOWN,
+        S_PUNCH,
+        S_PUNCH1,
+        S_NULL,
     },
     {
-	// chaingun
-	am_clip,
-	S_CHAINUP,
-	S_CHAINDOWN,
-	S_CHAIN,
-	S_CHAIN1,
-	S_CHAINFLASH1
+        /* pistol */
+
+        am_clip,
+        S_PISTOLUP,
+        S_PISTOLDOWN,
+        S_PISTOL,
+        S_PISTOL1,
+        S_PISTOLFLASH,
     },
     {
-	// missile launcher
-	am_misl,
-	S_MISSILEUP,
-	S_MISSILEDOWN,
-	S_MISSILE,
-	S_MISSILE1,
-	S_MISSILEFLASH1
+        /* shotgun */
+
+        am_shell,
+        S_SGUNUP,
+        S_SGUNDOWN,
+        S_SGUN,
+        S_SGUN1,
+        S_SGUNFLASH1,
     },
     {
-	// plasma rifle
-	am_cell,
-	S_PLASMAUP,
-	S_PLASMADOWN,
-	S_PLASMA,
-	S_PLASMA1,
-	S_PLASMAFLASH1
+        /* chaingun */
+
+        am_clip,
+        S_CHAINUP,
+        S_CHAINDOWN,
+        S_CHAIN,
+        S_CHAIN1,
+        S_CHAINFLASH1,
     },
     {
-	// bfg 9000
-	am_cell,
-	S_BFGUP,
-	S_BFGDOWN,
-	S_BFG,
-	S_BFG1,
-	S_BFGFLASH1
+        /* missile launcher */
+
+        am_misl,
+        S_MISSILEUP,
+        S_MISSILEDOWN,
+        S_MISSILE,
+        S_MISSILE1,
+        S_MISSILEFLASH1,
     },
     {
-	// chainsaw
-	am_noammo,
-	S_SAWUP,
-	S_SAWDOWN,
-	S_SAW,
-	S_SAW1,
-	S_NULL
+        /* plasma rifle */
+
+        am_cell,
+        S_PLASMAUP,
+        S_PLASMADOWN,
+        S_PLASMA,
+        S_PLASMA1,
+        S_PLASMAFLASH1,
     },
     {
-	// super shotgun
-	am_shell,
-	S_DSGUNUP,
-	S_DSGUNDOWN,
-	S_DSGUN,
-	S_DSGUN1,
-	S_DSGUNFLASH1
-    },	
+        /* bfg 9000 */
+
+        am_cell,
+        S_BFGUP,
+        S_BFGDOWN,
+        S_BFG,
+        S_BFG1,
+        S_BFGFLASH1,
+    },
+    {
+        /* chainsaw */
+
+        am_noammo,
+        S_SAWUP,
+        S_SAWDOWN,
+        S_SAW,
+        S_SAW1,
+        S_NULL,
+    },
+    {
+        /* super shotgun */
+
+        am_shell,
+        S_DSGUNUP,
+        S_DSGUNDOWN,
+        S_DSGUN,
+        S_DSGUN1,
+        S_DSGUNFLASH1,
+    },
 };
 
-
-
-
-
-
-
-
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/d_items.h b/games/NXDoom/src/doom/d_items.h
index 3d22a0630..bcc50b9af 100644
--- a/games/NXDoom/src/doom/d_items.h
+++ b/games/NXDoom/src/doom/d_items.h
@@ -1,41 +1,55 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Items: key cards, artifacts, weapon, ammunition.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_items.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Items: key cards, artifacts, weapon, ammunition.
+ *
+ ****************************************************************************/
 
 #ifndef __D_ITEMS__
 #define __D_ITEMS__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomdef.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* Weapon info: sprite frames, ammunition use. */
 
-// Weapon info: sprite frames, ammunition use.
 typedef struct
 {
-    ammotype_t	ammo;
-    int		upstate;
-    int		downstate;
-    int		readystate;
-    int		atkstate;
-    int		flashstate;
-
+  ammotype_t ammo;
+  int upstate;
+  int downstate;
+  int readystate;
+  int atkstate;
+  int flashstate;
 } weaponinfo_t;
 
-extern  weaponinfo_t    weaponinfo[NUMWEAPONS];
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-#endif
+extern weaponinfo_t weaponinfo[NUMWEAPONS];
+
+#endif /* __D_ITEMS__ */
diff --git a/games/NXDoom/src/doom/d_main.c b/games/NXDoom/src/doom/d_main.c
index 014e48721..52df6eda1 100644
--- a/games/NXDoom/src/doom/d_main.c
+++ b/games/NXDoom/src/doom/d_main.c
@@ -1,24 +1,32 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM main program (D_DoomMain) and game loop (D_DoomLoop),
-//	plus functions to determine game mode (shareware, registered),
-//	parse command line parameters, configure game parameters (turbo),
-//	and call the startup functions.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_main.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  DOOM main program (d_doom_main) and game loop (d_doomloop),
+ *  plus functions to determine game mode (shareware, registered),
+ *  parse command line parameters, configure game parameters (turbo),
+ *  and call the startup functions.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdio.h>
@@ -31,16 +39,19 @@
 #include "doomstat.h"
 
 #include "dstrings.h"
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+#include "s_sound.h"
 #include "sounds.h"
+#endif
 
 #include "d_iwad.h"
 
-#include "z_zone.h"
-#include "w_main.h"
-#include "w_wad.h"
-#include "s_sound.h"
 #include "v_diskicon.h"
 #include "v_video.h"
+#include "w_main.h"
+#include "w_wad.h"
+#include "z_zone.h"
 
 #include "f_finale.h"
 #include "f_wipe.h"
@@ -48,8 +59,8 @@
 #include "m_argv.h"
 #include "m_config.h"
 #include "m_controls.h"
-#include "m_misc.h"
 #include "m_menu.h"
+#include "m_misc.h"
 #include "p_saveg.h"
 
 #include "i_endoom.h"
@@ -61,13 +72,16 @@
 
 #include "g_game.h"
 
-#include "hu_stuff.h"
-#include "wi_stuff.h"
-#include "st_stuff.h"
 #include "am_map.h"
+#include "hu_stuff.h"
+#include "st_stuff.h"
+#include "wi_stuff.h"
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
 #include "net_client.h"
 #include "net_dedicated.h"
 #include "net_query.h"
+#endif
 
 #include "p_setup.h"
 #include "r_local.h"
@@ -75,1928 +89,2096 @@
 
 #include "d_main.h"
 
-#include "doom_icon.c"
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-//
-// D-DoomLoop()
-// Not a globally visible function,
-//  just included for source reference,
-//  called by D_DoomMain, never exits.
-// Manages timing and IO,
-//  calls all ?_Responder, ?_Ticker, and ?_Drawer,
-//  calls I_GetTime, I_StartFrame, and I_StartTic
-//
-void D_DoomLoop (void);
-
-static char *gamedescription;
-
-// Location where savegames are stored
-
-char *          savegamedir;
-
-// location of IWAD and WAD files
-
-char *          iwadfile;
-
-
-boolean		devparm;	// started game with -devparm
-boolean         nomonsters;	// checkparm of -nomonsters
-boolean         respawnparm;	// checkparm of -respawn
-boolean         fastparm;	// checkparm of -fast
-
-
-
-skill_t		startskill;
-int             startepisode;
-int		startmap;
-boolean		autostart;
-int             startloadgame;
-
-boolean		advancedemo;
-
-// Store demo, do not accept any inputs
-boolean         storedemo;
-
-// If true, the main game loop has started.
-boolean         main_loop_started = false;
-
-int             show_endoom = 1;
-int             show_diskicon = 1;
-
-
-void D_ConnectNetGame(void);
-void D_CheckNetGame(void);
-
-
-//
-// D_ProcessEvents
-// Send all the events of the given timestamp down the responder chain
-//
-void D_ProcessEvents (void)
+struct pack
 {
-    event_t*	ev;
-	
-    // IF STORE DEMO, DO NOT ACCEPT INPUT
-    if (storedemo)
-        return;
-	
-    while ((ev = D_PopEvent()) != NULL)
-    {
-	if (M_Responder (ev))
-	    continue;               // menu ate the event
-	G_Responder (ev);
-    }
-}
+  const char *name;
+  int mission;
+};
 
-
-
-
-//
-// D_Display
-//  draw current display, possibly wiping it from the previous
-//
-
-// wipegamestate can be set to -1 to force a wipe on the next draw
-gamestate_t     wipegamestate = GS_DEMOSCREEN;
-
-boolean D_Display (void)
+struct gameversion
 {
-    static  boolean		viewactivestate = false;
-    static  boolean		menuactivestate = false;
-    static  boolean		inhelpscreensstate = false;
-    static  boolean		fullscreen = false;
-    static  gamestate_t		oldgamestate = -1;
-    static  int			borderdrawcount;
-    int				y;
-    boolean			wipe;
-    boolean			redrawsbar;
-		
-    redrawsbar = false;
-    
-    // change the view size if needed
-    if (setsizeneeded)
-    {
-	R_ExecuteSetViewSize ();
-	oldgamestate = -1;                      // force background redraw
-	borderdrawcount = 3;
-    }
+  const char *description;
+  const char *cmdline;
+  game_version_t version;
+};
 
-    // save the current screen if about to wipe
-    if (gamestate != wipegamestate)
-    {
-	wipe = true;
-	wipe_StartScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
-    }
-    else
-	wipe = false;
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-    if (gamestate == GS_LEVEL && gametic)
-	HU_Erase();
-    
-    // do buffered drawing
-    switch (gamestate)
-    {
-      case GS_LEVEL:
-	if (!gametic)
-	    break;
-	if (automapactive)
-	    AM_Drawer ();
-	if (wipe || (viewheight != SCREENHEIGHT && fullscreen))
-	    redrawsbar = true;
-	if (inhelpscreensstate && !inhelpscreens)
-	    redrawsbar = true;              // just put away the help screen
-	ST_Drawer (viewheight == SCREENHEIGHT, redrawsbar );
-	fullscreen = viewheight == SCREENHEIGHT;
-	break;
+/* D-DoomLoop()
+ *
+ * Not a globally visible function, just included for source reference,
+ * called by d_doom_main, never exits.
+ *
+ * Manages timing and IO, calls all ?_Responder, ?_Ticker, and ?_Drawer,
+ * calls i_get_time, i_start_frame, and i_start_tic
+ */
 
-      case GS_INTERMISSION:
-	WI_Drawer ();
-	break;
+void d_doomloop(void);
 
-      case GS_FINALE:
-	F_Drawer ();
-	break;
+void d_connect_net_game(void);
+void d_check_net_game(void);
 
-      case GS_DEMOSCREEN:
-	D_PageDrawer ();
-	break;
-    }
-    
-    // draw buffered stuff to screen
-    I_UpdateNoBlit ();
-    
-    // draw the view directly
-    if (gamestate == GS_LEVEL && !automapactive && gametic)
-	R_RenderPlayerView (&players[displayplayer]);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-    if (gamestate == GS_LEVEL && gametic)
-	HU_Drawer ();
-    
-    // clean up border stuff
-    if (gamestate != oldgamestate && gamestate != GS_LEVEL)
-	I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
+/* Location where savegames are stored */
 
-    // see if the border needs to be initially drawn
-    if (gamestate == GS_LEVEL && oldgamestate != GS_LEVEL)
-    {
-	viewactivestate = false;        // view was not active
-	R_FillBackScreen ();    // draw the pattern into the back screen
-    }
+char *savegamedir;
 
-    // see if the border needs to be updated to the screen
-    if (gamestate == GS_LEVEL && !automapactive && scaledviewwidth != SCREENWIDTH)
-    {
-	if (menuactive || menuactivestate || !viewactivestate)
-	    borderdrawcount = 3;
-	if (borderdrawcount)
-	{
-	    R_DrawViewBorder ();    // erase old menu stuff
-	    borderdrawcount--;
-	}
+/* location of IWAD and WAD files */
 
-    }
+char *iwadfile;
 
-    if (testcontrols)
-    {
-        // Box showing current mouse speed
+boolean devparm;     /* started game with -devparm */
+boolean nomonsters;  /* checkparm of -nomonsters */
+boolean respawnparm; /* checkparm of -respawn */
+boolean fastparm;    /* checkparm of -fast */
 
-        V_DrawMouseSpeedBox(testcontrols_mousespeed);
-    }
+skill_t startskill;
+int startepisode;
+int startmap;
+boolean autostart;
+int startloadgame;
 
-    menuactivestate = menuactive;
-    viewactivestate = viewactive;
-    inhelpscreensstate = inhelpscreens;
-    oldgamestate = wipegamestate = gamestate;
-    
-    // draw pause pic
-    if (paused)
-    {
-	if (automapactive)
-	    y = 4;
-	else
-	    y = viewwindowy+4;
-	V_DrawPatchDirect(viewwindowx + (scaledviewwidth - 68) / 2, y,
-                          W_CacheLumpName (DEH_String("M_PAUSE"), PU_CACHE));
-    }
+boolean advancedemo;
 
+/* Store demo, do not accept any inputs */
 
-    // menus go directly to the screen
-    M_Drawer ();          // menu is drawn even on top of everything
-    NetUpdate ();         // send out any new accumulation
+boolean storedemo;
 
-    return wipe;
-}
+/* If true, the main game loop has started. */
 
-static void EnableLoadingDisk(void)
+boolean main_loop_started = false;
+
+int show_endoom = 1;
+int show_diskicon = 1;
+
+/* wipegamestate can be set to -1 to force a wipe on the next draw */
+
+gamestate_t wipegamestate = GS_DEMOSCREEN;
+
+/* DEMO LOOP */
+
+int demosequence;
+int pagetic;
+const char *pagename;
+
+/*      print title for every printed line */
+
+char title[128];
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Copyright message banners
+ * Some dehacked mods replace these.  These are only displayed if they are
+ * replaced by dehacked.
+ */
+
+static const char *g_copyright_banners[] =
 {
-    const char *disk_lump_name;
+  "========================================================================"
+  "===\n"
+  "ATTENTION:  This version of DOOM has been modified.  If you would like "
+  "to\n"
+  "get a copy of the original game, call 1-800-IDGAMES or see the readme "
+  "file.\n"
+  "        You will not receive technical support for modified games.\n"
+  "                      press enter to continue\n"
+  "========================================================================"
+  "===\n",
 
-    if (show_diskicon)
+  "========================================================================"
+  "===\n"
+  "                 Commercial product - do not distribute!\n"
+  "         Please report software piracy to the SPA: 1-800-388-PIR8\n"
+  "========================================================================"
+  "===\n",
+
+  "========================================================================"
+  "===\n"
+  "                                Shareware!\n"
+  "========================================================================"
+  "===\n",
+};
+
+/* These are the lumps that will be checked in IWAD,
+ * if any one is not present, execution will be aborted.
+ */
+
+static char g_name[23][8] =
+{
+  "e2m1",   "e2m2",   "e2m3",   "e2m4",   "e2m5",     "e2m6",
+  "e2m7",   "e2m8",   "e2m9",   "e3m1",   "e3m3",     "e3m3",
+  "e3m4",   "e3m5",   "e3m6",   "e3m7",   "e3m8",     "e3m9",
+  "dphoof", "bfgga0", "heada1", "cybra1", "spida1d1",
+};
+
+static char *g_gamedescription;
+
+/* Add configuration file variable bindings. */
+
+static const char *const g_chat_macro_defaults[10] =
+{
+  HUSTR_CHATMACRO0, HUSTR_CHATMACRO1, HUSTR_CHATMACRO2, HUSTR_CHATMACRO3,
+  HUSTR_CHATMACRO4, HUSTR_CHATMACRO5, HUSTR_CHATMACRO6, HUSTR_CHATMACRO7,
+  HUSTR_CHATMACRO8, HUSTR_CHATMACRO9,
+};
+
+/* Strings for dehacked replacements of the startup banner
+ *
+ * These are from the original source: some of them are perhaps
+ * not used in any dehacked patches
+ */
+
+static const char *g_banners[] =
+{
+  /* doom2.wad */
+
+  "                         "
+  "DOOM 2: Hell on Earth v%i.%i"
+  "                           ",
+
+  /* doom2.wad v1.666 */
+
+  "                         "
+  "DOOM 2: Hell on Earth v%i.%i66"
+  "                          ",
+
+  /* doom1.wad */
+
+  "                            "
+  "DOOM Shareware Startup v%i.%i"
+  "                           ",
+
+  /* doom.wad */
+
+  "                            "
+  "DOOM Registered Startup v%i.%i"
+  "                           ",
+
+  /* Registered DOOM uses this */
+
+  "                          "
+  "DOOM System Startup v%i.%i"
+  "                          ",
+
+  /* Doom v1.666 */
+
+  "                          "
+  "DOOM System Startup v%i.%i66"
+  "                          "
+
+  /* doom.wad (Ultimate DOOM) */
+
+  "                         "
+  "The Ultimate DOOM Startup v%i.%i"
+  "                        ",
+
+  /* tnt.wad */
+
+  "                     "
+  "DOOM 2: TNT - Evilution v%i.%i"
+  "                           ",
+
+  /* plutonia.wad */
+
+  "                   "
+  "DOOM 2: Plutonia Experiment v%i.%i"
+  "                           ",
+};
+
+static const struct gameversion g_gameversions[] =
+{
+  {"Doom 1.2", "1.2", exe_doom_1_2},
+  {"Doom 1.5", "1.5", exe_doom_1_5},
+  {"Doom 1.666", "1.666", exe_doom_1_666},
+  {"Doom 1.7/1.7a", "1.7", exe_doom_1_7},
+  {"Doom 1.8", "1.8", exe_doom_1_8},
+  {"Doom 1.9", "1.9", exe_doom_1_9},
+  {"Hacx", "hacx", exe_hacx},
+  {"Ultimate Doom", "ultimate", exe_ultimate},
+  {"Final Doom", "final", exe_final},
+  {"Final Doom (alt)", "final2", exe_final2},
+  {"Chex Quest", "chex", exe_chex},
+  {NULL, NULL, 0},
+};
+
+static const struct pack g_packs[] =
+{
+  {"doom2", doom2},
+  {"tnt", pack_tnt},
+  {"plutonia", pack_plut},
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void enable_loading_disk(void)
+{
+  const char *disk_lump_name;
+
+  if (show_diskicon)
     {
-        if (M_CheckParm("-cdrom") > 0)
+      if (m_check_parm("-cdrom") > 0)
         {
-            disk_lump_name = DEH_String("STCDROM");
+          disk_lump_name = ("STCDROM");
         }
-        else
+      else
         {
-            disk_lump_name = DEH_String("STDISK");
+          disk_lump_name = ("STDISK");
         }
 
-        V_EnableLoadingDisk(disk_lump_name,
-                            SCREENWIDTH - LOADING_DISK_W,
+      v_enable_loading_disk(disk_lump_name, SCREENWIDTH - LOADING_DISK_W,
                             SCREENHEIGHT - LOADING_DISK_H);
     }
 }
 
-//
-// Add configuration file variable bindings.
-//
-
-
-static const char * const chat_macro_defaults[10] =
+static void d_bind_variables(void)
 {
-    HUSTR_CHATMACRO0,
-    HUSTR_CHATMACRO1,
-    HUSTR_CHATMACRO2,
-    HUSTR_CHATMACRO3,
-    HUSTR_CHATMACRO4,
-    HUSTR_CHATMACRO5,
-    HUSTR_CHATMACRO6,
-    HUSTR_CHATMACRO7,
-    HUSTR_CHATMACRO8,
-    HUSTR_CHATMACRO9
-};
+  int i;
 
+  m_apply_platform_defaults();
 
-void D_BindVariables(void)
-{
-    int i;
+  i_bind_input_variables();
+  i_bind_video_variables();
+  i_bind_joystick_variables();
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  i_bind_sound_variables();
+#endif
 
-    M_ApplyPlatformDefaults();
+  m_bind_base_controls();
+  m_bind_weapon_controls();
+  m_bind_map_controls();
+  m_bind_menu_controls();
+  m_bind_chat_controls(MAXPLAYERS);
 
-    I_BindInputVariables();
-    I_BindVideoVariables();
-    I_BindJoystickVariables();
-    I_BindSoundVariables();
+  key_multi_msgplayer[0] = HUSTR_KEYGREEN;
+  key_multi_msgplayer[1] = HUSTR_KEYINDIGO;
+  key_multi_msgplayer[2] = HUSTR_KEYBROWN;
+  key_multi_msgplayer[3] = HUSTR_KEYRED;
 
-    M_BindBaseControls();
-    M_BindWeaponControls();
-    M_BindMapControls();
-    M_BindMenuControls();
-    M_BindChatControls(MAXPLAYERS);
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  net_bind_variables();
+#endif
 
-    key_multi_msgplayer[0] = HUSTR_KEYGREEN;
-    key_multi_msgplayer[1] = HUSTR_KEYINDIGO;
-    key_multi_msgplayer[2] = HUSTR_KEYBROWN;
-    key_multi_msgplayer[3] = HUSTR_KEYRED;
+  m_bind_int_variable("mouse_sensitivity", &g_mouse_sensitivity);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  m_bind_int_variable("sfx_volume", &g_sfx_volume);
+  m_bind_int_variable("music_volume", &g_music_volume);
+  m_bind_int_variable("snd_channels", &snd_channels);
+#endif
+  m_bind_int_variable("show_messages", &g_show_messages);
+  m_bind_int_variable("screenblocks", &screenblocks);
+  m_bind_int_variable("detaillevel", &g_detail_level);
+  m_bind_int_variable("vanilla_savegame_limit", &vanilla_savegame_limit);
+  m_bind_int_variable("vanilla_demo_limit", &vanilla_demo_limit);
+  m_bind_int_variable("show_endoom", &show_endoom);
+  m_bind_int_variable("show_diskicon", &show_diskicon);
 
-    NET_BindVariables();
+  /* Multiplayer chat macros */
 
-    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
-    M_BindIntVariable("sfx_volume",             &sfxVolume);
-    M_BindIntVariable("music_volume",           &musicVolume);
-    M_BindIntVariable("show_messages",          &showMessages);
-    M_BindIntVariable("screenblocks",           &screenblocks);
-    M_BindIntVariable("detaillevel",            &detailLevel);
-    M_BindIntVariable("snd_channels",           &snd_channels);
-    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
-    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
-    M_BindIntVariable("show_endoom",            &show_endoom);
-    M_BindIntVariable("show_diskicon",          &show_diskicon);
-
-    // Multiplayer chat macros
-
-    for (i=0; i<10; ++i)
+  for (i = 0; i < 10; ++i)
     {
-        char buf[12];
+      char buf[12];
 
-        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
-        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
-        M_BindStringVariable(buf, &chat_macros[i]);
+      chat_macros[i] = m_string_duplicate(g_chat_macro_defaults[i]);
+      snprintf(buf, sizeof(buf), "chatmacro%i", i);
+      m_bind_string_variable(buf, &chat_macros[i]);
     }
 }
 
-//
-// D_GrabMouseCallback
-//
-// Called to determine whether to grab the mouse pointer
-//
+/* Function called at exit to display the ENDOOM screen */
 
-boolean D_GrabMouseCallback(void)
+static void d_endoom(void)
 {
-    // Drone players don't need mouse focus
+#ifdef CONFIG_GAMES_NXDOOM_ENDOOM
+  byte *endoom;
 
-    if (drone)
-        return false;
+  /* Don't show ENDOOM if we have it disabled, or we're running
+   * in screensaver or control test mode. Only show it once the
+   * game has actually started.
+   */
 
-    // when menu is active or game is paused, release the mouse 
- 
-    if (menuactive || paused)
-        return false;
-
-    // only grab mouse when playing levels (but not demos)
-
-    return (gamestate == GS_LEVEL) && !demoplayback && !advancedemo;
-}
-
-//
-//  D_RunFrame
-//
-void D_RunFrame()
-{
-    int nowtime;
-    int tics;
-    static int wipestart;
-    static boolean wipe;
-
-    if (wipe)
+  if (!show_endoom || !main_loop_started || screensaver_mode ||
+      m_check_parm("-testcontrols") > 0)
     {
-        do
-        {
-            nowtime = I_GetTime ();
-            tics = nowtime - wipestart;
-            I_Sleep(1);
-        } while (tics <= 0);
-
-        wipestart = nowtime;
-        wipe = !wipe_ScreenWipe(wipe_Melt
-                               , 0, 0, SCREENWIDTH, SCREENHEIGHT, tics);
-        I_UpdateNoBlit ();
-        M_Drawer ();                            // menu is drawn even on top of wipes
-        I_FinishUpdate ();                      // page flip or blit buffer
-        return;
+      return;
     }
 
-    // frame syncronous IO operations
-    I_StartFrame ();
+  endoom = w_cache_lump_name(("ENDOOM"), PU_STATIC);
 
-    TryRunTics (); // will run at least one tic
+  i_endoom(endoom);
+#else
+  return;
+#endif
+}
 
-    S_UpdateSounds (players[consoleplayer].mo);// move positional sounds
+static boolean is_french_iwad(void)
+{
+  return (gamemission == doom2 && w_check_num_for_name("M_RDTHIS") < 0 &&
+          w_check_num_for_name("M_EPISOD") < 0 &&
+          w_check_num_for_name("M_EPI1") < 0 &&
+          w_check_num_for_name("M_EPI2") < 0 &&
+          w_check_num_for_name("M_EPI3") < 0 &&
+          w_check_num_for_name("WIOSTF") < 0 &&
+          w_check_num_for_name("WIOBJ") >= 0);
+}
 
-    // Update display, next frame, with current state if no profiling is on
-    if (screenvisible && !nodrawers)
+/* Load dehacked patches needed for certain IWADs. */
+
+static void load_iwad_deh(void)
+{
+  /* The Freedoom IWADs have DEHACKED lumps that must be loaded. */
+
+  if (gamevariant == freedoom || gamevariant == freedm)
     {
-        if ((wipe = D_Display ()))
-        {
-            // start wipe on this frame
-            wipe_EndScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+      /* Old versions of Freedoom (before 2014-09) did not have technically
+       * valid DEHACKED lumps, so ignore errors and just continue if this
+       * is an old IWAD.
+       */
 
-            wipestart = I_GetTime () - 1;
-        } else {
-            // normal update
-            I_FinishUpdate ();              // page flip or blit buffer
+      deh_load_lump_by_name("DEHACKED", false, true);
+    }
+
+  /* If this is the HACX IWAD, we need to load the DEHACKED lump. */
+
+  if (gameversion == exe_hacx)
+    {
+      if (!deh_load_lump_by_name("DEHACKED", true, false))
+        {
+          i_error("DEHACKED lump not found.  Please check that this is the "
+                  "Hacx v1.2 IWAD.");
+        }
+    }
+
+  /* Chex Quest needs a separate Dehacked patch which must be downloaded
+   * and installed next to the IWAD.
+   */
+
+  if (gameversion == exe_chex)
+    {
+      char *chex_deh = NULL;
+      char *dirname;
+
+      /* Look for chex.deh in the same directory as the IWAD file. */
+
+      dirname = m_dir_name(iwadfile);
+      chex_deh = m_string_join(dirname, DIR_SEPARATOR_S, "chex.deh", NULL);
+      free(dirname);
+
+      /* If the dehacked patch isn't found, try searching the WAD
+       * search path instead.  We might find it...
+       */
+
+      if (!m_file_exists(chex_deh))
+        {
+          free(chex_deh);
+          chex_deh = d_find_wad_by_name("chex.deh");
+        }
+
+      /* Still not found? */
+
+      if (chex_deh == NULL)
+        {
+          i_error("Unable to find Chex Quest dehacked file (chex.deh).\n"
+                  "The dehacked file is required in order to emulate\n"
+                  "chex.exe correctly.  It can be found in your nearest\n"
+                  "/idgames repository mirror at:\n\n"
+                  "   themes/chex/chexdeh.zip");
+        }
+
+      if (!deh_loadfile(chex_deh))
+        {
+          i_error("Failed to load chex.deh needed for emulating chex.exe.");
+        }
+    }
+
+  if (is_french_iwad())
+    {
+      char *french_deh = NULL;
+      char *dirname;
+
+      /* Look for french.deh in the same directory as the IWAD file. */
+
+      dirname = m_dir_name(iwadfile);
+      french_deh =
+          m_string_join(dirname, DIR_SEPARATOR_S, "french.deh", NULL);
+      printf("French version\n");
+      free(dirname);
+
+      /* If the dehacked patch isn't found, try searching the WAD
+       * search path instead.  We might find it...
+       */
+
+      if (!m_file_exists(french_deh))
+        {
+          free(french_deh);
+          french_deh = d_find_wad_by_name("french.deh");
+        }
+
+      /* Still not found? */
+
+      if (french_deh == NULL)
+        {
+          i_error(
+            "Unable to find French Doom II dehacked file\n"
+            "(french.deh).  The dehacked file is required in order to\n"
+            "emulate French doom2.exe correctly.  It can be found in\n"
+            "your nearest /idgames repository mirror at:\n\n"
+            "   utils/exe_edit/patches/french.zip"
+          );
+        }
+
+      if (!deh_loadfile(french_deh))
+        {
+          i_error("Failed to load french.deh needed for emulating French\n"
+                  "doom2.exe.");
         }
     }
 }
 
-//
-//  D_DoomLoop
-//
-void D_DoomLoop (void)
+static void g_check_demo_status_at_exit(void)
 {
-    if (gamevariant == bfgedition &&
-        (demorecording || (gameaction == ga_playdemo) || netgame))
+  g_check_demo_status();
+}
+
+/* draw current display, possibly wiping it from the previous */
+
+static boolean d_display(void)
+{
+  static boolean viewactivestate = false;
+  static boolean g_menuactivestate = false;
+  static boolean inhelpscreensstate = false;
+  static boolean d_fullscreen = false;
+  static gamestate_t oldgamestate = -1;
+  static int borderdrawcount;
+  int y;
+  boolean wipe;
+  boolean redrawsbar;
+
+  redrawsbar = false;
+
+  /* change the view size if needed */
+
+  if (setsizeneeded)
     {
-        printf(" WARNING: You are playing using one of the Doom Classic\n"
-               " IWAD files shipped with the Doom 3: BFG Edition. These are\n"
-               " known to be incompatible with the regular IWAD files and\n"
-               " may cause demos and network games to get out of sync.\n");
+      r_execute_set_view_size();
+      oldgamestate = -1; /* force background redraw */
+      borderdrawcount = 3;
     }
 
-    if (demorecording)
-	G_BeginRecording ();
+  /* save the current screen if about to wipe */
 
-    main_loop_started = true;
-
-    I_SetWindowTitle(gamedescription);
-    I_GraphicsCheckCommandLine();
-    I_SetGrabMouseCallback(D_GrabMouseCallback);
-    I_RegisterWindowIcon(doom_icon_data, doom_icon_w, doom_icon_h);
-    I_InitGraphics();
-    EnableLoadingDisk();
-
-    TryRunTics();
-
-    V_RestoreBuffer();
-    R_ExecuteSetViewSize();
-
-    D_StartGameLoop();
-
-    if (testcontrols)
+  if (gamestate != wipegamestate)
     {
-        wipegamestate = gamestate;
+      wipe = true;
+      wipe_start_screen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+    }
+  else
+    {
+      wipe = false;
     }
 
-    while (1)
+  if (gamestate == GS_LEVEL && gametic)
     {
-        D_RunFrame();
-    }
-}
-
-
-
-//
-//  DEMO LOOP
-//
-int             demosequence;
-int             pagetic;
-const char                    *pagename;
-
-
-//
-// D_PageTicker
-// Handles timing for warped projection
-//
-void D_PageTicker (void)
-{
-    if (--pagetic < 0)
-	D_AdvanceDemo ();
-}
-
-
-
-//
-// D_PageDrawer
-//
-void D_PageDrawer (void)
-{
-    V_DrawPatch (0, 0, W_CacheLumpName(pagename, PU_CACHE));
-}
-
-
-//
-// D_AdvanceDemo
-// Called after each demo or intro demosequence finishes
-//
-void D_AdvanceDemo (void)
-{
-    advancedemo = true;
-}
-
-
-//
-// This cycles through the demo sequences.
-// FIXME - version dependend demo numbers?
-//
-void D_DoAdvanceDemo (void)
-{
-    players[consoleplayer].playerstate = PST_LIVE;  // not reborn
-    advancedemo = false;
-    usergame = false;               // no save / end game here
-    paused = false;
-    gameaction = ga_nothing;
-
-    // The Ultimate Doom executable changed the demo sequence to add
-    // a DEMO4 demo.  Final Doom was based on Ultimate, so also
-    // includes this change; however, the Final Doom IWADs do not
-    // include a DEMO4 lump, so the game bombs out with an error
-    // when it reaches this point in the demo sequence.
-
-    // However! There is an alternate version of Final Doom that
-    // includes a fixed executable.
-
-    if (gameversion == exe_ultimate || gameversion == exe_final)
-      demosequence = (demosequence+1)%7;
-    else
-      demosequence = (demosequence+1)%6;
-    
-    switch (demosequence)
-    {
-      case 0:
-	if ( gamemode == commercial )
-	    pagetic = TICRATE * 11;
-	else
-	    pagetic = 170;
-	gamestate = GS_DEMOSCREEN;
-	pagename = DEH_String("TITLEPIC");
-	if ( gamemode == commercial )
-	  S_StartMusic(mus_dm2ttl);
-	else
-	  S_StartMusic (mus_intro);
-	break;
-      case 1:
-	G_DeferedPlayDemo(DEH_String("demo1"));
-	break;
-      case 2:
-	pagetic = 200;
-	gamestate = GS_DEMOSCREEN;
-	pagename = DEH_String("CREDIT");
-	break;
-      case 3:
-	G_DeferedPlayDemo(DEH_String("demo2"));
-	break;
-      case 4:
-	gamestate = GS_DEMOSCREEN;
-	if ( gamemode == commercial)
-	{
-	    pagetic = TICRATE * 11;
-	    pagename = DEH_String("TITLEPIC");
-	    S_StartMusic(mus_dm2ttl);
-	}
-	else
-	{
-	    pagetic = 200;
-
-	    if (gameversion >= exe_ultimate)
-	      pagename = DEH_String("CREDIT");
-	    else
-	      pagename = DEH_String("HELP2");
-	}
-	break;
-      case 5:
-	G_DeferedPlayDemo(DEH_String("demo3"));
-	break;
-        // THE DEFINITIVE DOOM Special Edition demo
-      case 6:
-	G_DeferedPlayDemo(DEH_String("demo4"));
-	break;
+      hu_erase();
     }
 
-    // The Doom 3: BFG Edition version of doom2.wad does not have a
-    // TITLETPIC lump. Use INTERPIC instead as a workaround.
-    if (gamevariant == bfgedition && !strcasecmp(pagename, "TITLEPIC")
-        && W_CheckNumForName("titlepic") < 0)
+  /* do buffered drawing */
+
+  switch (gamestate)
     {
-        pagename = DEH_String("INTERPIC");
-    }
-}
+    case GS_LEVEL:
 
-
-
-//
-// D_StartTitle
-//
-void D_StartTitle (void)
-{
-    gameaction = ga_nothing;
-    demosequence = -1;
-    D_AdvanceDemo ();
-}
-
-// Strings for dehacked replacements of the startup banner
-//
-// These are from the original source: some of them are perhaps
-// not used in any dehacked patches
-
-static const char *banners[] =
-{
-    // doom2.wad
-    "                         "
-    "DOOM 2: Hell on Earth v%i.%i"
-    "                           ",
-    // doom2.wad v1.666
-    "                         "
-    "DOOM 2: Hell on Earth v%i.%i66"
-    "                          ",
-    // doom1.wad
-    "                            "
-    "DOOM Shareware Startup v%i.%i"
-    "                           ",
-    // doom.wad
-    "                            "
-    "DOOM Registered Startup v%i.%i"
-    "                           ",
-    // Registered DOOM uses this
-    "                          "
-    "DOOM System Startup v%i.%i"
-    "                          ",
-    // Doom v1.666
-    "                          "
-    "DOOM System Startup v%i.%i66"
-    "                          "
-    // doom.wad (Ultimate DOOM)
-    "                         "
-    "The Ultimate DOOM Startup v%i.%i"
-    "                        ",
-    // tnt.wad
-    "                     "
-    "DOOM 2: TNT - Evilution v%i.%i"
-    "                           ",
-    // plutonia.wad
-    "                   "
-    "DOOM 2: Plutonia Experiment v%i.%i"
-    "                           ",
-};
-
-//
-// Get game name: if the startup banner has been replaced, use that.
-// Otherwise, use the name given
-// 
-
-static char *GetGameName(const char *gamename)
-{
-    size_t i;
-
-    for (i=0; i<arrlen(banners); ++i)
-    {
-        const char *deh_sub;
-        // Has the banner been replaced?
-
-        deh_sub = DEH_String(banners[i]);
-
-        if (deh_sub != banners[i])
+      if (!gametic)
         {
-            size_t gamename_size;
-            int version;
-            char *deh_gamename;
+          break;
+        }
 
-            // Has been replaced.
-            // We need to expand via printf to include the Doom version number
-            // We also need to cut off spaces to get the basic name
+      if (automapactive)
+        {
+          am_drawer();
+        }
 
-            gamename_size = strlen(deh_sub) + 10;
-            deh_gamename = malloc(gamename_size);
-            if (deh_gamename == NULL)
-            {
-                I_Error("GetGameName: Failed to allocate new string");
-            }
-            version = G_VanillaVersionCode();
-            DEH_snprintf(deh_gamename, gamename_size, banners[i],
-                         version / 100, version % 100);
+      if (wipe || (viewheight != SCREENHEIGHT && d_fullscreen))
+        {
+          redrawsbar = true;
+        }
 
-            while (deh_gamename[0] != '\0' && isspace(deh_gamename[0]))
-            {
-                memmove(deh_gamename, deh_gamename + 1, gamename_size - 1);
-            }
+      if (inhelpscreensstate && !inhelpscreens)
+        {
+          redrawsbar = true; /* just put away the help screen */
+        }
 
-            while (deh_gamename[0] != '\0' && isspace(deh_gamename[strlen(deh_gamename)-1]))
-            {
-                deh_gamename[strlen(deh_gamename) - 1] = '\0';
-            }
+      st_drawer(viewheight == SCREENHEIGHT, redrawsbar);
+      d_fullscreen = viewheight == SCREENHEIGHT;
+      break;
 
-            return deh_gamename;
+    case GS_INTERMISSION:
+      wi_drawer();
+      break;
+
+    case GS_FINALE:
+      f_drawer();
+      break;
+
+    case GS_DEMOSCREEN:
+      d_page_drawer();
+      break;
+    }
+
+  /* draw buffered stuff to screen */
+
+  i_update_no_blit();
+
+  /* draw the view directly */
+
+  if (gamestate == GS_LEVEL && !automapactive && gametic)
+    {
+      r_render_player_view(&players[displayplayer]);
+    }
+
+  if (gamestate == GS_LEVEL && gametic)
+    {
+      hu_drawer();
+    }
+
+  /* clean up border stuff */
+
+  if (gamestate != oldgamestate && gamestate != GS_LEVEL)
+    i_set_palette(w_cache_lump_name(("PLAYPAL"), PU_CACHE));
+
+  /* see if the border needs to be initially drawn */
+
+  if (gamestate == GS_LEVEL && oldgamestate != GS_LEVEL)
+    {
+      viewactivestate = false; /* view was not active */
+      r_fill_back_screen();    /* draw the pattern into the back screen */
+    }
+
+  /* see if the border needs to be updated to the screen */
+
+  if (gamestate == GS_LEVEL && !automapactive &&
+      scaledviewwidth != SCREENWIDTH)
+    {
+      if (g_menuactive || g_menuactivestate || !viewactivestate)
+        borderdrawcount = 3;
+      if (borderdrawcount)
+        {
+          r_draw_view_border(); /* erase old menu stuff */
+          borderdrawcount--;
         }
     }
 
-    return M_StringDuplicate(gamename);
+  if (testcontrols)
+    {
+      /* Box showing current mouse speed */
+
+      v_draw_mouse_speed_box(testcontrols_mousespeed);
+    }
+
+  g_menuactivestate = g_menuactive;
+  viewactivestate = viewactive;
+  inhelpscreensstate = inhelpscreens;
+  oldgamestate = wipegamestate = gamestate;
+
+  /* draw pause pic */
+
+  if (paused)
+    {
+      if (automapactive)
+        y = 4;
+      else
+        y = viewwindowy + 4;
+      v_draw_patch_direct(viewwindowx + (scaledviewwidth - 68) / 2, y,
+                          w_cache_lump_name(("M_PAUSE"), PU_CACHE));
+    }
+
+  /* menus go directly to the screen */
+
+  m_drawer();   /* menu is drawn even on top of everything */
+  net_update(); /* send out any new accumulation */
+
+  return wipe;
 }
 
-static void SetMissionForPackName(const char *pack_name)
-{
-    int i;
-    static const struct
-    {
-        const char *name;
-        int mission;
-    } packs[] = {
-        { "doom2",    doom2 },
-        { "tnt",      pack_tnt },
-        { "plutonia", pack_plut },
-    };
+/****************************************************************************
+ * Name: d_grab_mouse_callback
+ *
+ * Description:
+ *   Called to determine whether to grab the mouse pointer
+ *
+ ****************************************************************************/
 
-    for (i = 0; i < arrlen(packs); ++i)
+static boolean d_grab_mouse_callback(void)
+{
+  /* Drone players don't need mouse focus */
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  if (drone) return false;
+#endif
+
+  /* when menu is active or game is paused, release the mouse */
+
+  if (g_menuactive || paused) return false;
+
+  /* only grab mouse when playing levels (but not demos) */
+
+  return (gamestate == GS_LEVEL) && !demoplayback && !advancedemo;
+}
+
+/****************************************************************************
+ * Name: d_run_frame
+ ****************************************************************************/
+
+static void d_run_frame(void)
+{
+  int nowtime;
+  int tics;
+  static int wipestart;
+  static boolean wipe;
+
+  if (wipe)
     {
-        if (!strcasecmp(pack_name, packs[i].name))
+      do
         {
-            gamemission = packs[i].mission;
-            return;
+          nowtime = i_get_time();
+          tics = nowtime - wipestart;
+          usleep(1000);
+        }
+      while (tics <= 0);
+
+      wipestart = nowtime;
+      wipe = !wipe_screen_wipe(WIPE_MELT, 0, 0,
+                  SCREENWIDTH, SCREENHEIGHT, tics);
+      i_update_no_blit();
+      m_drawer();        /* menu is drawn even on top of wipes */
+      i_finish_update(); /* page flip or blit buffer */
+      return;
+    }
+
+  /* frame synchronous IO operations */
+
+  i_start_frame();
+
+  try_run_tics(); /* will run at least one tic */
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_update_sounds(players[consoleplayer].mo); /* move positional sounds */
+#endif
+
+  /* Update display, next frame, with current state if no profiling is on */
+
+  if (screenvisible && !nodrawers)
+    {
+      if ((wipe = d_display()))
+        {
+          /* start wipe on this frame */
+
+          wipe_endscreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+          wipestart = i_get_time() - 1;
+        }
+      else
+        {
+          /* normal update */
+
+          i_finish_update(); /* page flip or blit buffer */
+        }
+    }
+}
+
+/* Get game name: if the startup banner has been replaced, use that.
+ * Otherwise, use the name given
+ */
+
+static char *get_game_name(const char *gamename)
+{
+  size_t i;
+
+  for (i = 0; i < arrlen(g_banners); ++i)
+    {
+      const char *deh_sub;
+
+      /* Has the banner been replaced? */
+
+      deh_sub = (g_banners[i]);
+
+      if (deh_sub != g_banners[i])
+        {
+          size_t gamename_size;
+          int version;
+          char *deh_gamename;
+
+          /* Has been replaced.
+           * We need to expand via printf to include the Doom version number
+           * We also need to cut off spaces to get the basic name
+           */
+
+          gamename_size = strlen(deh_sub) + 10;
+          deh_gamename = malloc(gamename_size);
+          if (deh_gamename == NULL)
+            {
+              i_error("GetGameName: Failed to allocate new string");
+            }
+
+          version = g_vanilla_version_code();
+          snprintf(deh_gamename, gamename_size, g_banners[i], version / 100,
+                   version % 100);
+
+          while (deh_gamename[0] != '\0' && isspace(deh_gamename[0]))
+            {
+              memmove(deh_gamename, deh_gamename + 1, gamename_size - 1);
+            }
+
+          while (deh_gamename[0] != '\0' &&
+                 isspace(deh_gamename[strlen(deh_gamename) - 1]))
+            {
+              deh_gamename[strlen(deh_gamename) - 1] = '\0';
+            }
+
+          return deh_gamename;
         }
     }
 
-    printf("Valid mission packs are:\n");
-
-    for (i = 0; i < arrlen(packs); ++i)
-    {
-        printf("\t%s\n", packs[i].name);
-    }
-
-    I_Error("Unknown mission pack name: %s", pack_name);
+  return m_string_duplicate(gamename);
 }
 
-//
-// Find out what version of Doom is playing.
-//
-
-void D_IdentifyVersion(void)
+static void set_mission_for_pack_name(const char *pack_name)
 {
-    // gamemission is set up by the D_FindIWAD function.  But if 
-    // we specify '-iwad', we have to identify using 
-    // IdentifyIWADByName.  However, if the iwad does not match
-    // any known IWAD name, we may have a dilemma.  Try to 
-    // identify by its contents.
+  int i;
 
-    if (gamemission == none)
+  for (i = 0; i < arrlen(g_packs); ++i)
     {
-        unsigned int i;
-
-        for (i=0; i<numlumps; ++i)
+      if (!strcasecmp(pack_name, g_packs[i].name))
         {
-            if (!strncasecmp(lumpinfo[i]->name, "MAP01", 8))
+          gamemission = g_packs[i].mission;
+          return;
+        }
+    }
+
+  printf("Valid mission packs are:\n");
+
+  for (i = 0; i < arrlen(g_packs); ++i)
+    {
+      printf("\t%s\n", g_packs[i].name);
+    }
+
+  i_error("Unknown mission pack name: %s", pack_name);
+}
+
+/* Find out what version of Doom is playing. */
+
+static void d_identify_version(void)
+{
+  /* gamemission is set up by the d_find_iwad function.  But if
+   * we specify '-iwad', we have to identify using
+   * IdentifyIWADByName.  However, if the iwad does not match
+   * any known IWAD name, we may have a dilemma.  Try to
+   * identify by its contents.
+   */
+
+  if (gamemission == none)
+    {
+      unsigned int i;
+
+      for (i = 0; i < numlumps; ++i)
+        {
+          if (!strncasecmp(lumpinfo[i]->name, "MAP01", 8))
             {
-                gamemission = doom2;
-                break;
-            } 
-            else if (!strncasecmp(lumpinfo[i]->name, "E1M1", 8))
+              gamemission = doom2;
+              break;
+            }
+          else if (!strncasecmp(lumpinfo[i]->name, "E1M1", 8))
             {
-                gamemission = doom;
-                break;
+              gamemission = doom;
+              break;
             }
         }
 
-        if (gamemission == none)
+      if (gamemission == none)
         {
-            // Still no idea.  I don't think this is going to work.
+          /* Still no idea.  I don't think this is going to work. */
 
-            I_Error("Unknown or invalid IWAD file.");
+          i_error("Unknown or invalid IWAD file.");
         }
     }
 
-    // Make sure gamemode is set up correctly
+  /* Make sure gamemode is set up correctly */
 
-    if (logical_gamemission == doom)
+  if (logical_gamemission == doom)
     {
-        // Doom 1.  But which version?
+      /* Doom 1.  But which version? */
 
-        if (W_CheckNumForName("E4M1") > 0)
+      if (w_check_num_for_name("E4M1") > 0)
         {
-            // Ultimate Doom
+          /* Ultimate Doom */
 
-            gamemode = retail;
-        } 
-        else if (W_CheckNumForName("E3M1") > 0)
-        {
-            gamemode = registered;
+          gamemode = retail;
         }
-        else
+      else if (w_check_num_for_name("E3M1") > 0)
         {
-            gamemode = shareware;
+          gamemode = registered;
+        }
+      else
+        {
+          gamemode = shareware;
         }
     }
-    else
+  else
     {
-        int p;
+      int p;
 
-        // Doom 2 of some kind.
-        gamemode = commercial;
+      /* Doom 2 of some kind. */
 
-        // We can manually override the gamemission that we got from the
-        // IWAD detection code. This allows us to eg. play Plutonia 2
-        // with Freedoom and get the right level names.
+      gamemode = commercial;
 
-        //!
-        // @category compat
-        // @arg <pack>
-        //
-        // Explicitly specify a Doom II "mission pack" to run as, instead of
-        // detecting it based on the filename. Valid values are: "doom2",
-        // "tnt" and "plutonia".
-        //
-        p = M_CheckParmWithArgs("-pack", 1);
-        if (p > 0)
+      /* We can manually override the gamemission that we got from the
+       * IWAD detection code. This allows us to eg. play Plutonia 2
+       * with Freedoom and get the right level names.
+       */
+
+      /* @category compat
+       * @arg <pack>
+       *
+       * Explicitly specify a Doom II "mission pack" to run as, instead of
+       * detecting it based on the filename. Valid values are: "doom2",
+       * "tnt" and "plutonia".
+       *
+       */
+
+      p = m_check_parm_with_args("-pack", 1);
+      if (p > 0)
         {
-            SetMissionForPackName(myargv[p + 1]);
+          set_mission_for_pack_name(myargv[p + 1]);
         }
     }
 }
 
-// Set the gamedescription string
+/* Set the gamedescription string */
 
-static void D_SetGameDescription(void)
+static void d_set_game_description(void)
 {
-    if (logical_gamemission == doom)
+  if (logical_gamemission == doom)
     {
-        // Doom 1.  But which version?
+      /* Doom 1.  But which version? */
 
-        if (gamevariant == freedoom)
+      if (gamevariant == freedoom)
         {
-            gamedescription = GetGameName("Freedoom: Phase 1");
+          g_gamedescription = get_game_name("Freedoom: Phase 1");
         }
-        else if (gamemode == retail)
+      else if (gamemode == retail)
         {
-            // Ultimate Doom
+          /* Ultimate Doom */
 
-            gamedescription = GetGameName("The Ultimate DOOM");
+          g_gamedescription = get_game_name("The Ultimate DOOM");
         }
-        else if (gamemode == registered)
+      else if (gamemode == registered)
         {
-            gamedescription = GetGameName("DOOM Registered");
+          g_gamedescription = get_game_name("DOOM Registered");
         }
-        else if (gamemode == shareware)
+      else if (gamemode == shareware)
         {
-            gamedescription = GetGameName("DOOM Shareware");
+          g_gamedescription = get_game_name("DOOM Shareware");
         }
     }
-    else
+  else
     {
-        // Doom 2 of some kind.  But which mission?
+      /* Doom 2 of some kind.  But which mission? */
 
-        if (gamevariant == freedm)
+      if (gamevariant == freedm)
         {
-            gamedescription = GetGameName("FreeDM");
+          g_gamedescription = get_game_name("FreeDM");
         }
-        else if (gamevariant == freedoom)
+      else if (gamevariant == freedoom)
         {
-            gamedescription = GetGameName("Freedoom: Phase 2");
+          g_gamedescription = get_game_name("Freedoom: Phase 2");
         }
-        else if (logical_gamemission == doom2)
+      else if (logical_gamemission == doom2)
         {
-            gamedescription = GetGameName("DOOM 2: Hell on Earth");
+          g_gamedescription = get_game_name("DOOM 2: Hell on Earth");
         }
-        else if (logical_gamemission == pack_plut)
+      else if (logical_gamemission == pack_plut)
         {
-            gamedescription = GetGameName("DOOM 2: Plutonia Experiment"); 
+          g_gamedescription = get_game_name("DOOM 2: Plutonia Experiment");
         }
-        else if (logical_gamemission == pack_tnt)
+      else if (logical_gamemission == pack_tnt)
         {
-            gamedescription = GetGameName("DOOM 2: TNT - Evilution");
+          g_gamedescription = get_game_name("DOOM 2: TNT - Evilution");
         }
     }
 
-    if (gamedescription == NULL)
+  if (g_gamedescription == NULL)
     {
-        gamedescription = M_StringDuplicate("Unknown");
+      g_gamedescription = m_string_duplicate("Unknown");
     }
 }
 
-//      print title for every printed line
-char            title[128];
-
-static boolean D_AddFile(char *filename)
+static boolean d_addfile(char *filename)
 {
-    wad_file_t *handle;
+  wad_file_t *handle;
 
-    printf(" adding %s\n", filename);
-    handle = W_AddFile(filename);
+  printf(" adding %s\n", filename);
+  handle = w_add_file(filename);
 
-    return handle != NULL;
+  return handle != NULL;
 }
 
-// Copyright message banners
-// Some dehacked mods replace these.  These are only displayed if they are 
-// replaced by dehacked.
+/* Prints a message only if it has been modified by dehacked. */
 
-static const char *copyright_banners[] =
+static void print_dehacked_banners(void)
 {
-    "===========================================================================\n"
-    "ATTENTION:  This version of DOOM has been modified.  If you would like to\n"
-    "get a copy of the original game, call 1-800-IDGAMES or see the readme file.\n"
-    "        You will not receive technical support for modified games.\n"
-    "                      press enter to continue\n"
-    "===========================================================================\n",
+  size_t i;
 
-    "===========================================================================\n"
-    "                 Commercial product - do not distribute!\n"
-    "         Please report software piracy to the SPA: 1-800-388-PIR8\n"
-    "===========================================================================\n",
-
-    "===========================================================================\n"
-    "                                Shareware!\n"
-    "===========================================================================\n"
-};
-
-// Prints a message only if it has been modified by dehacked.
-
-void PrintDehackedBanners(void)
-{
-    size_t i;
-
-    for (i=0; i<arrlen(copyright_banners); ++i)
+  for (i = 0; i < arrlen(g_copyright_banners); ++i)
     {
-        const char *deh_s;
+      const char *deh_s;
 
-        deh_s = DEH_String(copyright_banners[i]);
+      deh_s = (g_copyright_banners[i]);
 
-        if (deh_s != copyright_banners[i])
+      if (deh_s != g_copyright_banners[i])
         {
-            printf("%s", deh_s);
+          printf("%s", deh_s);
 
-            // Make sure the modified banner always ends in a newline character.
-            // If it doesn't, add a newline.  This fixes av.wad.
+          /* Make sure the modified banner always ends in a newline
+           * character. If it doesn't, add a newline. This fixes av.wad.
+           */
 
-            if (deh_s[strlen(deh_s) - 1] != '\n')
+          if (deh_s[strlen(deh_s) - 1] != '\n')
             {
-                printf("\n");
+              printf("\n");
             }
         }
     }
 }
 
-static const struct
+/* Initialize the game version */
+
+static void init_game_version(void)
 {
-    const char *description;
-    const char *cmdline;
-    GameVersion_t version;
-} gameversions[] = {
-    {"Doom 1.2",             "1.2",        exe_doom_1_2},
-    {"Doom 1.5",             "1.5",        exe_doom_1_5},
-    {"Doom 1.666",           "1.666",      exe_doom_1_666},
-    {"Doom 1.7/1.7a",        "1.7",        exe_doom_1_7},
-    {"Doom 1.8",             "1.8",        exe_doom_1_8},
-    {"Doom 1.9",             "1.9",        exe_doom_1_9},
-    {"Hacx",                 "hacx",       exe_hacx},
-    {"Ultimate Doom",        "ultimate",   exe_ultimate},
-    {"Final Doom",           "final",      exe_final},
-    {"Final Doom (alt)",     "final2",     exe_final2},
-    {"Chex Quest",           "chex",       exe_chex},
-    { NULL,                  NULL,         0},
-};
+  byte *demolump;
+  char demolumpname[6];
+  int demoversion;
+  int p;
+  int i;
+  boolean status;
 
-// Initialize the game version
+  /* @arg <version>
+   * @category compat
+   *
+   * Emulate a specific version of Doom. Valid values are "1.2",
+   * "1.5", "1.666", "1.7", "1.8", "1.9", "ultimate", "final",
+   * "final2", "hacx" and "chex".
+   *
+   */
 
-static void InitGameVersion(void)
-{
-    byte *demolump;
-    char demolumpname[6];
-    int demoversion;
-    int p;
-    int i;
-    boolean status;
+  p = m_check_parm_with_args("-gameversion", 1);
 
-    //!
-    // @arg <version>
-    // @category compat
-    //
-    // Emulate a specific version of Doom. Valid values are "1.2", 
-    // "1.5", "1.666", "1.7", "1.8", "1.9", "ultimate", "final", 
-    // "final2", "hacx" and "chex".
-    //
-
-    p = M_CheckParmWithArgs("-gameversion", 1);
-
-    if (p)
+  if (p)
     {
-        for (i=0; gameversions[i].description != NULL; ++i)
+      for (i = 0; g_gameversions[i].description != NULL; ++i)
         {
-            if (!strcmp(myargv[p+1], gameversions[i].cmdline))
+          if (!strcmp(myargv[p + 1], g_gameversions[i].cmdline))
             {
-                gameversion = gameversions[i].version;
-                break;
+              gameversion = g_gameversions[i].version;
+              break;
             }
         }
 
-        if (gameversions[i].description == NULL)
+      if (g_gameversions[i].description == NULL)
         {
-            printf("Supported game versions:\n");
+          printf("Supported game versions:\n");
 
-            for (i=0; gameversions[i].description != NULL; ++i)
+          for (i = 0; g_gameversions[i].description != NULL; ++i)
             {
-                printf("\t%s (%s)\n", gameversions[i].cmdline,
-                        gameversions[i].description);
+              printf("\t%s (%s)\n", g_gameversions[i].cmdline,
+                     g_gameversions[i].description);
             }
 
-            I_Error("Unknown game version '%s'", myargv[p+1]);
+          i_error("Unknown game version '%s'", myargv[p + 1]);
         }
     }
-    else
+  else
     {
-        // Determine automatically
+      /* Determine automatically */
 
-        if (gamemission == pack_chex)
+      if (gamemission == pack_chex)
         {
-            // chex.exe - identified by iwad filename
+          /* chex.exe - identified by iwad filename */
 
-            gameversion = exe_chex;
+          gameversion = exe_chex;
         }
-        else if (gamemission == pack_hacx)
+      else if (gamemission == pack_hacx)
         {
-            // hacx.exe: identified by iwad filename
+          /* hacx.exe: identified by iwad filename */
 
-            gameversion = exe_hacx;
+          gameversion = exe_hacx;
         }
-        else if (gamemode == shareware || gamemode == registered
-              || (gamemode == commercial && gamemission == doom2))
+      else if (gamemode == shareware || gamemode == registered ||
+               (gamemode == commercial && gamemission == doom2))
         {
-            // original
-            gameversion = exe_doom_1_9;
+          /* original */
 
-            // Detect version from demo lump
-            for (i = 1; i <= 3; ++i)
+          gameversion = exe_doom_1_9;
+
+          /* Detect version from demo lump */
+
+          for (i = 1; i <= 3; ++i)
             {
-                M_snprintf(demolumpname, 6, "demo%i", i);
-                if (W_CheckNumForName(demolumpname) > 0)
+              snprintf(demolumpname, 6, "demo%i", i);
+              if (w_check_num_for_name(demolumpname) > 0)
                 {
-                    demolump = W_CacheLumpName(demolumpname, PU_STATIC);
-                    demoversion = demolump[0];
-                    W_ReleaseLumpName(demolumpname);
-                    status = true;
-                    switch (demoversion)
+                  demolump = w_cache_lump_name(demolumpname, PU_STATIC);
+                  demoversion = demolump[0];
+                  w_release_lump_name(demolumpname);
+                  status = true;
+                  switch (demoversion)
                     {
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 3:
-                        case 4:
-                            gameversion = exe_doom_1_2;
-                            break;
-                        case 106:
-                            gameversion = exe_doom_1_666;
-                            break;
-                        case 107:
-                            gameversion = exe_doom_1_7;
-                            break;
-                        case 108:
-                            gameversion = exe_doom_1_8;
-                            break;
-                        case 109:
-                            gameversion = exe_doom_1_9;
-                            break;
-                        default:
-                            status = false;
-                            break;
+                    case 0:
+                    case 1:
+                    case 2:
+                    case 3:
+                    case 4:
+                      gameversion = exe_doom_1_2;
+                      break;
+                    case 106:
+                      gameversion = exe_doom_1_666;
+                      break;
+                    case 107:
+                      gameversion = exe_doom_1_7;
+                      break;
+                    case 108:
+                      gameversion = exe_doom_1_8;
+                      break;
+                    case 109:
+                      gameversion = exe_doom_1_9;
+                      break;
+                    default:
+                      status = false;
+                      break;
                     }
-                    if (status)
+
+                  if (status)
                     {
-                        break;
+                      break;
                     }
                 }
             }
         }
-        else if (gamemode == retail)
+      else if (gamemode == retail)
         {
-            gameversion = exe_ultimate;
+          gameversion = exe_ultimate;
         }
-        else if (gamemode == commercial)
+      else if (gamemode == commercial)
         {
-            // Final Doom: tnt or plutonia
-            // Defaults to emulating the first Final Doom executable,
-            // which has the crash in the demo loop; however, having
-            // this as the default should mean that it plays back
-            // most demos correctly.
+          /* Final Doom: tnt or plutonia
+           * Defaults to emulating the first Final Doom executable,
+           * which has the crash in the demo loop; however, having
+           * this as the default should mean that it plays back
+           * most demos correctly.
+           */
 
-            gameversion = exe_final;
+          gameversion = exe_final;
         }
     }
 
-    // Deathmatch 2.0 did not exist until Doom v1.4
-    if (gameversion <= exe_doom_1_2 && deathmatch == 2)
+  /* Deathmatch 2.0 did not exist until Doom v1.4 */
+
+  if (gameversion <= exe_doom_1_2 && deathmatch == 2)
     {
-        deathmatch = 1;
+      deathmatch = 1;
     }
 
-    // The original exe does not support retail - 4th episode not supported
+  /* The original exe does not support retail - 4th episode not supported */
 
-    if (gameversion < exe_ultimate && gamemode == retail)
+  if (gameversion < exe_ultimate && gamemode == retail)
     {
-        gamemode = registered;
+      gamemode = registered;
     }
 
-    // EXEs prior to the Final Doom exes do not support Final Doom.
+  /* EXEs prior to the Final Doom exes do not support Final Doom. */
 
-    if (gameversion < exe_final && gamemode == commercial
-     && (gamemission == pack_tnt || gamemission == pack_plut))
+  if (gameversion < exe_final && gamemode == commercial &&
+      (gamemission == pack_tnt || gamemission == pack_plut))
     {
-        gamemission = doom2;
+      gamemission = doom2;
     }
 }
 
-void PrintGameVersion(void)
+static void print_game_version(void)
 {
-    int i;
+  int i;
 
-    for (i=0; gameversions[i].description != NULL; ++i)
+  for (i = 0; g_gameversions[i].description != NULL; ++i)
     {
-        if (gameversions[i].version == gameversion)
+      if (g_gameversions[i].version == gameversion)
         {
-            printf("Emulating the behavior of the "
-                   "'%s' executable.\n", gameversions[i].description);
-            break;
+          printf("Emulating the behavior of the "
+                 "'%s' executable.\n",
+                 g_gameversions[i].description);
+          break;
         }
     }
 }
 
-// Function called at exit to display the ENDOOM screen
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-static void D_Endoom(void)
+/* d_process_events
+ * Send all the events of the given timestamp down the responder chain
+ */
+
+void d_process_events(void)
 {
-    byte *endoom;
+  event_t *ev;
 
-    // Don't show ENDOOM if we have it disabled, or we're running
-    // in screensaver or control test mode. Only show it once the
-    // game has actually started.
+  /* IF STORE DEMO, DO NOT ACCEPT INPUT */
 
-    if (!show_endoom || !main_loop_started
-     || screensaver_mode || M_CheckParm("-testcontrols") > 0)
+  if (storedemo) return;
+
+  while ((ev = d_pop_event()) != NULL)
     {
-        return;
-    }
-
-    endoom = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC);
-
-    I_Endoom(endoom);
-}
-
-boolean IsFrenchIWAD(void)
-{
-    return (gamemission == doom2 && W_CheckNumForName("M_RDTHIS") < 0
-          && W_CheckNumForName("M_EPISOD") < 0 && W_CheckNumForName("M_EPI1") < 0
-          && W_CheckNumForName("M_EPI2") < 0 && W_CheckNumForName("M_EPI3") < 0
-          && W_CheckNumForName("WIOSTF") < 0 && W_CheckNumForName("WIOBJ") >= 0);
-}
-
-// Load dehacked patches needed for certain IWADs.
-static void LoadIwadDeh(void)
-{
-    // The Freedoom IWADs have DEHACKED lumps that must be loaded.
-    if (gamevariant == freedoom || gamevariant == freedm)
-    {
-        // Old versions of Freedoom (before 2014-09) did not have technically
-        // valid DEHACKED lumps, so ignore errors and just continue if this
-        // is an old IWAD.
-        DEH_LoadLumpByName("DEHACKED", false, true);
-    }
-
-    // If this is the HACX IWAD, we need to load the DEHACKED lump.
-    if (gameversion == exe_hacx)
-    {
-        if (!DEH_LoadLumpByName("DEHACKED", true, false))
-        {
-            I_Error("DEHACKED lump not found.  Please check that this is the "
-                    "Hacx v1.2 IWAD.");
-        }
-    }
-
-    // Chex Quest needs a separate Dehacked patch which must be downloaded
-    // and installed next to the IWAD.
-    if (gameversion == exe_chex)
-    {
-        char *chex_deh = NULL;
-        char *dirname;
-
-        // Look for chex.deh in the same directory as the IWAD file.
-        dirname = M_DirName(iwadfile);
-        chex_deh = M_StringJoin(dirname, DIR_SEPARATOR_S, "chex.deh", NULL);
-        free(dirname);
-
-        // If the dehacked patch isn't found, try searching the WAD
-        // search path instead.  We might find it...
-        if (!M_FileExists(chex_deh))
-        {
-            free(chex_deh);
-            chex_deh = D_FindWADByName("chex.deh");
-        }
-
-        // Still not found?
-        if (chex_deh == NULL)
-        {
-            I_Error("Unable to find Chex Quest dehacked file (chex.deh).\n"
-                    "The dehacked file is required in order to emulate\n"
-                    "chex.exe correctly.  It can be found in your nearest\n"
-                    "/idgames repository mirror at:\n\n"
-                    "   themes/chex/chexdeh.zip");
-        }
-
-        if (!DEH_LoadFile(chex_deh))
-        {
-            I_Error("Failed to load chex.deh needed for emulating chex.exe.");
-        }
-    }
-
-    if (IsFrenchIWAD())
-    {
-        char *french_deh = NULL;
-        char *dirname;
-
-        // Look for french.deh in the same directory as the IWAD file.
-        dirname = M_DirName(iwadfile);
-        french_deh = M_StringJoin(dirname, DIR_SEPARATOR_S, "french.deh", NULL);
-        printf("French version\n");
-        free(dirname);
-
-        // If the dehacked patch isn't found, try searching the WAD
-        // search path instead.  We might find it...
-        if (!M_FileExists(french_deh))
-        {
-            free(french_deh);
-            french_deh = D_FindWADByName("french.deh");
-        }
-
-        // Still not found?
-        if (french_deh == NULL)
-        {
-            I_Error("Unable to find French Doom II dehacked file\n"
-                    "(french.deh).  The dehacked file is required in order to\n"
-                    "emulate French doom2.exe correctly.  It can be found in\n"
-                    "your nearest /idgames repository mirror at:\n\n"
-                    "   utils/exe_edit/patches/french.zip");
-        }
-
-        if (!DEH_LoadFile(french_deh))
-        {
-            I_Error("Failed to load french.deh needed for emulating French\n"
-                    "doom2.exe.");
-        }
+      if (m_responder(ev)) continue; /* menu ate the event */
+      g_responder(ev);
     }
 }
 
-static void G_CheckDemoStatusAtExit (void)
+/* d_doomloop */
+
+void d_doomloop(void)
 {
-    G_CheckDemoStatus();
+  if (gamevariant == bfgedition &&
+      (demorecording || (gameaction == ga_playdemo) || netgame))
+    {
+      printf(" WARNING: You are playing using one of the Doom Classic\n"
+             " IWAD files shipped with the Doom 3: BFG Edition. These are\n"
+             " known to be incompatible with the regular IWAD files and\n"
+             " may cause demos and network games to get out of sync.\n");
+    }
+
+  if (demorecording)
+    {
+      g_begin_recording();
+    }
+
+  main_loop_started = true;
+
+  i_set_window_title(g_gamedescription);
+  i_graphics_check_commandline();
+  i_set_grab_mouse_callback(d_grab_mouse_callback);
+  i_init_graphics();
+  enable_loading_disk();
+
+  try_run_tics();
+
+  v_restore_buffer();
+  r_execute_set_view_size();
+
+  d_start_game_loop();
+
+  if (testcontrols)
+    {
+      wipegamestate = gamestate;
+    }
+
+  while (1)
+    {
+      d_run_frame();
+    }
 }
 
-//
-// D_DoomMain
-//
-void D_DoomMain (void)
+/* d_page_ticker
+ * Handles timing for warped projection
+ */
+
+void d_page_ticker(void)
 {
-    int p;
-    char file[256];
-    char demolumpname[9];
+  if (--pagetic < 0) d_advance_demo();
+}
 
-    I_AtExit(D_Endoom, false);
+/****************************************************************************
+ * Name: d_page_drawer
+ ****************************************************************************/
 
-    // print banner
+void d_page_drawer(void)
+{
+  v_draw_patch(0, 0, w_cache_lump_name(pagename, PU_CACHE));
+}
 
-    I_PrintBanner(PACKAGE_STRING);
+/****************************************************************************
+ * Name: d_advance_demo
+ *
+ * Description:
+ *   Called after each demo or intro demosequence finishes
+ *
+ ****************************************************************************/
 
-    DEH_printf("Z_Init: Init zone memory allocation daemon. \n");
-    Z_Init ();
+void d_advance_demo(void)
+{
+  advancedemo = true;
+}
 
-    //!
-    // @category net
-    //
-    // Start a dedicated server, routing packets but not participating
-    // in the game itself.
-    //
+/****************************************************************************
+ * Name: d_do_advance_demo
+ *
+ * Description:
+ *   This cycles through the demo sequences.
+ *   FIXME - version dependent demo numbers?
+ *
+ ****************************************************************************/
 
-    if (M_CheckParm("-dedicated") > 0)
+void d_do_advance_demo(void)
+{
+  players[consoleplayer].playerstate = PST_LIVE; /* not reborn */
+  advancedemo = false;
+  usergame = false; /* no save / end game here */
+  paused = false;
+  gameaction = ga_nothing;
+
+  /* The Ultimate Doom executable changed the demo sequence to add
+   * a DEMO4 demo.  Final Doom was based on Ultimate, so also
+   * includes this change; however, the Final Doom IWADs do not
+   * include a DEMO4 lump, so the game bombs out with an error
+   * when it reaches this point in the demo sequence.
+   *
+   * However! There is an alternate version of Final Doom that
+   * includes a fixed executable.
+   */
+
+  if (gameversion == exe_ultimate || gameversion == exe_final)
+    demosequence = (demosequence + 1) % 7;
+  else
+    demosequence = (demosequence + 1) % 6;
+
+  switch (demosequence)
     {
-        printf("Dedicated server mode.\n");
-        NET_DedicatedServer();
+    case 0:
+      if (gamemode == commercial)
+        pagetic = TICRATE * 11;
+      else
+        pagetic = 170;
+      gamestate = GS_DEMOSCREEN;
+      pagename = ("TITLEPIC");
 
-        // Never returns
-    }
-
-    //!
-    // @category net
-    //
-    // Query the Internet master server for a global list of active
-    // servers.
-    //
-
-    if (M_CheckParm("-search"))
-    {
-        NET_MasterQuery();
-        exit(0);
-    }
-
-    //!
-    // @arg <address>
-    // @category net
-    //
-    // Query the status of the server running on the given IP
-    // address.
-    //
-
-    p = M_CheckParmWithArgs("-query", 1);
-
-    if (p)
-    {
-        NET_QueryAddress(myargv[p+1]);
-        exit(0);
-    }
-
-    //!
-    // @category net
-    //
-    // Search the local LAN for running servers.
-    //
-
-    if (M_CheckParm("-localsearch"))
-    {
-        NET_LANQuery();
-        exit(0);
-    }
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Disable monsters.
-    //
-	
-    nomonsters = M_CheckParm ("-nomonsters");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Monsters respawn after being killed.
-    //
-
-    respawnparm = M_CheckParm ("-respawn");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Monsters move faster.
-    //
-
-    fastparm = M_CheckParm ("-fast");
-
-    //!
-    // @vanilla
-    //
-    // Developer mode. F1 saves a screenshot in the current working
-    // directory.
-    //
-
-    devparm = M_CheckParm ("-devparm");
-
-    I_DisplayFPSDots(devparm);
-
-    //!
-    // @category net
-    // @vanilla
-    //
-    // Start a deathmatch game.
-    //
-
-    if (M_CheckParm ("-deathmatch"))
-	deathmatch = 1;
-
-    //!
-    // @category net
-    // @vanilla
-    //
-    // Start a deathmatch 2.0 game.  Weapons do not stay in place and
-    // all items respawn after 30 seconds.
-    //
-
-    if (M_CheckParm ("-altdeath"))
-	deathmatch = 2;
-
-    if (devparm)
-	DEH_printf(D_DEVSTR);
-    
-    // find which dir to use for config files
-
-#ifdef _WIN32
-
-    //!
-    // @category obscure
-    // @platform windows
-    // @vanilla
-    //
-    // Save configuration data and savegames in c:\doomdata,
-    // allowing play from CD.
-    //
-
-    if (M_ParmExists("-cdrom"))
-    {
-        printf(D_CDROM);
-
-        M_SetConfigDir("c:\\doomdata\\");
-    }
-    else
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gamemode == commercial)
+        {
+          s_start_music(MUS_DM2TTL);
+        }
+      else
+        {
+          s_start_music(MUS_INTRO);
+        }
 #endif
-    {
-        // Auto-detect the configuration dir.
 
-        M_SetConfigDir(NULL);
-    }
-
-    //!
-    // @category game
-    // @arg <x>
-    // @vanilla
-    //
-    // Turbo mode.  The player's speed is multiplied by x%.  If unspecified,
-    // x defaults to 200.  Values are rounded up to 10 and down to 400.
-    //
-
-    if ( (p=M_CheckParm ("-turbo")) )
-    {
-	int     scale = 200;
-	
-	if (p<myargc-1)
-	    scale = atoi (myargv[p+1]);
-	if (scale < 10)
-	    scale = 10;
-	if (scale > 400)
-	    scale = 400;
-        DEH_printf("turbo scale: %i%%\n", scale);
-	forwardmove[0] = forwardmove[0]*scale/100;
-	forwardmove[1] = forwardmove[1]*scale/100;
-	sidemove[0] = sidemove[0]*scale/100;
-	sidemove[1] = sidemove[1]*scale/100;
-    }
-    
-    // init subsystems
-    DEH_printf("V_Init: allocate screens.\n");
-    V_Init ();
-
-    // Load configuration files before initialising other subsystems.
-    DEH_printf("M_LoadDefaults: Load system defaults.\n");
-    M_SetConfigFilenames("default.cfg", PROGRAM_PREFIX "doom.cfg");
-    D_BindVariables();
-    M_LoadDefaults();
-
-    // Save configuration at exit.
-    I_AtExit(M_SaveDefaults, false);
-
-    // Find main IWAD file and load it.
-    iwadfile = D_FindIWAD(IWAD_MASK_DOOM, &gamemission);
-
-    // None found?
-
-    if (iwadfile == NULL)
-    {
-        I_Error("Game mode indeterminate.  No IWAD file was found.  Try\n"
-                "specifying one with the '-iwad' command line parameter.\n");
-    }
-
-    modifiedgame = false;
-
-    DEH_printf("W_Init: Init WADfiles.\n");
-    D_AddFile(iwadfile);
-
-    W_CheckCorrectIWAD(doom);
-
-    // Now that we've loaded the IWAD, we can figure out what gamemission
-    // we're playing and which version of Vanilla Doom we need to emulate.
-    D_IdentifyVersion();
-    InitGameVersion();
-
-    // Check which IWAD variant we are using.
-
-    if (W_CheckNumForName("FREEDOOM") >= 0)
-    {
-        if (W_CheckNumForName("FREEDM") >= 0)
+      break;
+    case 1:
+      g_defered_play_demo(("demo1"));
+      break;
+    case 2:
+      pagetic = 200;
+      gamestate = GS_DEMOSCREEN;
+      pagename = ("CREDIT");
+      break;
+    case 3:
+      g_defered_play_demo(("demo2"));
+      break;
+    case 4:
+      gamestate = GS_DEMOSCREEN;
+      if (gamemode == commercial)
         {
-            gamevariant = freedm;
+          pagetic = TICRATE * 11;
+          pagename = ("TITLEPIC");
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_music(MUS_DM2TTL);
+#endif
         }
-        else
+      else
         {
-            gamevariant = freedoom;
+          pagetic = 200;
+
+          if (gameversion >= exe_ultimate)
+            pagename = ("CREDIT");
+          else
+            pagename = ("HELP2");
         }
+      break;
+    case 5:
+      g_defered_play_demo(("demo3"));
+      break;
+
+      /* THE DEFINITIVE DOOM Special Edition demo */
+
+    case 6:
+      g_defered_play_demo(("demo4"));
+      break;
     }
-    else if (W_CheckNumForName("DMENUPIC") >= 0)
+
+  /* The Doom 3: BFG Edition version of doom2.wad does not have a
+   * TITLETPIC lump. Use INTERPIC instead as a workaround.
+   */
+
+  if (gamevariant == bfgedition && !strcasecmp(pagename, "TITLEPIC") &&
+      w_check_num_for_name("titlepic") < 0)
     {
-        gamevariant = bfgedition;
+      pagename = ("INTERPIC");
     }
-
-    //!
-    // @category mod
-    //
-    // Disable automatic loading of Dehacked patches for certain
-    // IWAD files.
-    //
-    if (!M_ParmExists("-nodeh"))
-    {
-        // Some IWADs have dehacked patches that need to be loaded for
-        // them to be played properly.
-        LoadIwadDeh();
-    }
-
-    // Doom 3: BFG Edition includes modified versions of the classic
-    // IWADs which can be identified by an additional DMENUPIC lump.
-    // Furthermore, the M_GDHIGH lumps have been modified in a way that
-    // makes them incompatible to Vanilla Doom and the modified version
-    // of doom2.wad is missing the TITLEPIC lump.
-    // We specifically check for DMENUPIC here, before PWADs have been
-    // loaded which could probably include a lump of that name.
-
-    if (gamevariant == bfgedition)
-    {
-        printf("BFG Edition: Using workarounds as needed.\n");
-
-        // BFG Edition changes the names of the secret levels to
-        // censor the Wolfenstein references. It also has an extra
-        // secret level (MAP33). In Vanilla Doom (meaning the DOS
-        // version), MAP33 overflows into the Plutonia level names
-        // array, so HUSTR_33 is actually PHUSTR_1.
-        DEH_AddStringReplacement(HUSTR_31, "level 31: idkfa");
-        DEH_AddStringReplacement(HUSTR_32, "level 32: keen");
-        DEH_AddStringReplacement(PHUSTR_1, "level 33: betray");
-
-        // The BFG edition doesn't have the "low detail" menu option (fair
-        // enough). But bizarrely, it reuses the M_GDHIGH patch as a label
-        // for the options menu (says "Fullscreen:"). Why the perpetrators
-        // couldn't just add a new graphic lump and had to reuse this one,
-        // I don't know.
-        //
-        // The end result is that M_GDHIGH is too wide and causes the game
-        // to crash. As a workaround to get a minimum level of support for
-        // the BFG edition IWADs, use the "ON"/"OFF" graphics instead.
-        DEH_AddStringReplacement("M_GDHIGH", "M_MSGON");
-        DEH_AddStringReplacement("M_GDLOW", "M_MSGOFF");
-
-        // The BFG edition's "Screen Size:" graphic has also been changed
-        // to say "Gamepad:". Fortunately, it (along with the original
-        // Doom IWADs) has an unused graphic that says "Display". So we
-        // can swap this in instead, and it kind of makes sense.
-        DEH_AddStringReplacement("M_SCRNSZ", "M_DISP");
-    }
-
-    //!
-    // @category mod
-    //
-    // Disable auto-loading of .wad and .deh files.
-    //
-    if (!M_ParmExists("-noautoload") && gamemode != shareware)
-    {
-        char *autoload_dir;
-
-        // common auto-loaded files for all Doom flavors
-
-        if (gamemission < pack_chex)
-        {
-            autoload_dir = M_GetAutoloadDir("doom-all");
-            if (autoload_dir != NULL)
-            {
-                DEH_AutoLoadPatches(autoload_dir);
-                W_AutoLoadWADs(autoload_dir);
-                free(autoload_dir);
-            }
-        }
-
-        // auto-loaded files per IWAD
-        autoload_dir = M_GetAutoloadDir(D_SaveGameIWADName(gamemission, gamevariant));
-        if (autoload_dir != NULL)
-        {
-            DEH_AutoLoadPatches(autoload_dir);
-            W_AutoLoadWADs(autoload_dir);
-            free(autoload_dir);
-        }
-    }
-
-    // Load Dehacked patches specified on the command line with -deh.
-    // Note that there's a very careful and deliberate ordering to how
-    // Dehacked patches are loaded. The order we use is:
-    //  1. IWAD dehacked patches.
-    //  2. Command line dehacked patches specified with -deh.
-    //  3. PWAD dehacked patches in DEHACKED lumps.
-    DEH_ParseCommandLine();
-
-    // Load PWAD files.
-    modifiedgame = W_ParseCommandLine();
-
-    // Debug:
-//    W_PrintDirectory();
-
-    //!
-    // @arg <demo>
-    // @category demo
-    // @vanilla
-    //
-    // Play back the demo named demo.lmp.
-    //
-
-    p = M_CheckParmWithArgs ("-playdemo", 1);
-
-    if (!p)
-    {
-        //!
-        // @arg <demo>
-        // @category demo
-        // @vanilla
-        //
-        // Play back the demo named demo.lmp, determining the framerate
-        // of the screen.
-        //
-	p = M_CheckParmWithArgs("-timedemo", 1);
-
-    }
-
-    if (p)
-    {
-        char *uc_filename = strdup(myargv[p + 1]);
-        M_ForceUppercase(uc_filename);
-
-        // With Vanilla you have to specify the file without extension,
-        // but make that optional.
-        if (M_StringEndsWith(uc_filename, ".LMP"))
-        {
-            M_StringCopy(file, myargv[p + 1], sizeof(file));
-        }
-        else
-        {
-            DEH_snprintf(file, sizeof(file), "%s.lmp", myargv[p+1]);
-        }
-
-        free(uc_filename);
-
-        if (D_AddFile(file))
-        {
-            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
-                         sizeof(demolumpname));
-        }
-        else
-        {
-            // If file failed to load, still continue trying to play
-            // the demo in the same way as Vanilla Doom.  This makes
-            // tricks like "-playdemo demo1" possible.
-
-            M_StringCopy(demolumpname, myargv[p + 1], sizeof(demolumpname));
-        }
-
-        printf("Playing demo %s.\n", file);
-    }
-
-    I_AtExit(G_CheckDemoStatusAtExit, true);
-
-    // Generate the WAD hash table.  Speed things up a bit.
-    W_GenerateHashTable();
-
-    // Load DEHACKED lumps from WAD files - but only if we give the right
-    // command line parameter.
-
-    //!
-    // @category mod
-    //
-    // Load Dehacked patches from DEHACKED lumps contained in one of the
-    // loaded PWAD files.
-    //
-    if (M_ParmExists("-dehlump"))
-    {
-        int i, loaded = 0;
-        int numiwadlumps = numlumps;
-
-        while (!W_IsIWADLump(lumpinfo[numiwadlumps - 1]))
-        {
-            numiwadlumps--;
-        }
-
-        for (i = numiwadlumps; i < numlumps; ++i)
-        {
-            if (!strncmp(lumpinfo[i]->name, "DEHACKED", 8))
-            {
-                DEH_LoadLump(i, false, false);
-                loaded++;
-            }
-        }
-
-        printf("  loaded %i DEHACKED lumps from PWAD files.\n", loaded);
-    }
-
-    // Set the gamedescription string. This is only possible now that
-    // we've finished loading Dehacked patches.
-    D_SetGameDescription();
-
-    savegamedir = M_GetSaveGameDir(D_SaveGameIWADName(gamemission, gamevariant));
-
-    // Check for -file in shareware
-    if (modifiedgame && (gamevariant != freedoom))
-    {
-	// These are the lumps that will be checked in IWAD,
-	// if any one is not present, execution will be aborted.
-	char name[23][8]=
-	{
-	    "e2m1","e2m2","e2m3","e2m4","e2m5","e2m6","e2m7","e2m8","e2m9",
-	    "e3m1","e3m3","e3m3","e3m4","e3m5","e3m6","e3m7","e3m8","e3m9",
-	    "dphoof","bfgga0","heada1","cybra1","spida1d1"
-	};
-	int i;
-	
-	if ( gamemode == shareware)
-	    I_Error(DEH_String("\nYou cannot -file with the shareware "
-			       "version. Register!"));
-
-	// Check for fake IWAD with right name,
-	// but w/o all the lumps of the registered version. 
-	if (gamemode == registered)
-	    for (i = 0;i < 23; i++)
-		if (W_CheckNumForName(name[i])<0)
-		    I_Error(DEH_String("\nThis is not the registered version."));
-    }
-
-    if (W_CheckNumForName("SS_START") >= 0
-     || W_CheckNumForName("FF_END") >= 0)
-    {
-        I_PrintDivider();
-        printf(" WARNING: The loaded WAD file contains modified sprites or\n"
-               " floor textures.  You may want to use the '-merge' command\n"
-               " line option instead of '-file'.\n");
-    }
-
-    I_PrintStartupBanner(gamedescription);
-    PrintDehackedBanners();
-
-    DEH_printf("I_Init: Setting up machine state.\n");
-    I_CheckIsScreensaver();
-    I_InitTimer();
-    I_InitJoystick();
-    I_InitSound(doom);
-    I_InitMusic();
-
-    printf ("NET_Init: Init network subsystem.\n");
-    NET_Init ();
-
-    // Initial netgame startup. Connect to server etc.
-    D_ConnectNetGame();
-
-    // get skill / episode / map from parms
-    startskill = sk_medium;
-    startepisode = 1;
-    startmap = 1;
-    autostart = false;
-
-    //!
-    // @category game
-    // @arg <skill>
-    // @vanilla
-    //
-    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
-    // 0 disables all monsters.
-    //
-
-    p = M_CheckParmWithArgs("-skill", 1);
-
-    if (p)
-    {
-	startskill = myargv[p+1][0]-'1';
-	autostart = true;
-    }
-
-    //!
-    // @category game
-    // @arg <n>
-    // @vanilla
-    //
-    // Start playing episode n (1-4).
-    //
-
-    p = M_CheckParmWithArgs("-episode", 1);
-
-    if (p)
-    {
-	startepisode = myargv[p+1][0]-'0';
-	startmap = 1;
-	autostart = true;
-    }
-	
-    timelimit = 0;
-
-    //! 
-    // @arg <n>
-    // @category net
-    // @vanilla
-    //
-    // For multiplayer games: exit each level after n minutes.
-    //
-
-    p = M_CheckParmWithArgs("-timer", 1);
-
-    if (p)
-    {
-	timelimit = atoi(myargv[p+1]);
-    }
-
-    //!
-    // @category net
-    // @vanilla
-    //
-    // Austin Virtual Gaming: end levels after 20 minutes.
-    //
-
-    p = M_CheckParm ("-avg");
-
-    if (p)
-    {
-	timelimit = 20;
-    }
-
-    //!
-    // @category game
-    // @arg [<x> <y> | <xy>]
-    // @vanilla
-    //
-    // Start a game immediately, warping to ExMy (Doom 1) or MAPxy
-    // (Doom 2).
-    //
-
-    p = M_CheckParmWithArgs("-warp", 1);
-
-    if (p)
-    {
-        if (gamemode == commercial)
-            startmap = atoi (myargv[p+1]);
-        else
-        {
-            startepisode = myargv[p+1][0]-'0';
-
-            if (p + 2 < myargc)
-            {
-                startmap = myargv[p+2][0]-'0';
-            }
-            else
-            {
-                startmap = 1;
-            }
-        }
-        autostart = true;
-    }
-
-    // Undocumented:
-    // Invoked by setup to test the controls.
-
-    p = M_CheckParm("-testcontrols");
-
-    if (p > 0)
-    {
-        startepisode = 1;
-        startmap = 1;
-        autostart = true;
-        testcontrols = true;
-    }
-
-    // Check for load game parameter
-    // We do this here and save the slot number, so that the network code
-    // can override it or send the load slot to other players.
-
-    //!
-    // @category game
-    // @arg <s>
-    // @vanilla
-    //
-    // Load the game in slot s.
-    //
-
-    p = M_CheckParmWithArgs("-loadgame", 1);
-    
-    if (p)
-    {
-        startloadgame = atoi(myargv[p+1]);
-    }
-    else
-    {
-        // Not loading a game
-        startloadgame = -1;
-    }
-
-    DEH_printf("M_Init: Init miscellaneous info.\n");
-    M_Init ();
-
-    DEH_printf("R_Init: Init DOOM refresh daemon - ");
-    R_Init ();
-
-    DEH_printf("\nP_Init: Init Playloop state.\n");
-    P_Init ();
-
-    DEH_printf("S_Init: Setting up sound.\n");
-    S_Init (sfxVolume * 8, musicVolume * 8);
-
-    DEH_printf("D_CheckNetGame: Checking network game status.\n");
-    D_CheckNetGame ();
-
-    PrintGameVersion();
-
-    DEH_printf("HU_Init: Setting up heads up display.\n");
-    HU_Init ();
-
-    DEH_printf("ST_Init: Init status bar.\n");
-    ST_Init ();
-
-    // If Doom II without a MAP01 lump, this is a store demo.
-    // Moved this here so that MAP01 isn't constantly looked up
-    // in the main loop.
-
-    if (gamemode == commercial && W_CheckNumForName("map01") < 0)
-        storedemo = true;
-
-    if (M_CheckParmWithArgs("-statdump", 1))
-    {
-        I_AtExit(StatDump, true);
-        DEH_printf("External statistics registered.\n");
-    }
-
-    //!
-    // @arg <x>
-    // @category demo
-    // @vanilla
-    //
-    // Record a demo named x.lmp.
-    //
-
-    p = M_CheckParmWithArgs("-record", 1);
-
-    if (p)
-    {
-	G_RecordDemo (myargv[p+1]);
-	autostart = true;
-    }
-
-    p = M_CheckParmWithArgs("-playdemo", 1);
-    if (p)
-    {
-	singledemo = true;              // quit after one demo
-	G_DeferedPlayDemo (demolumpname);
-	D_DoomLoop ();  // never returns
-    }
-	
-    p = M_CheckParmWithArgs("-timedemo", 1);
-    if (p)
-    {
-	G_TimeDemo (demolumpname);
-	D_DoomLoop ();  // never returns
-    }
-	
-    if (startloadgame >= 0)
-    {
-        M_StringCopy(file, P_SaveGameFile(startloadgame), sizeof(file));
-	G_LoadGame(file);
-    }
-	
-    if (gameaction != ga_loadgame )
-    {
-	if (autostart || netgame)
-	    G_InitNew (startskill, startepisode, startmap);
-	else
-	    D_StartTitle ();                // start up intro loop
-    }
-
-    D_DoomLoop ();  // never returns
 }
 
+/* d_start_title */
+
+void d_start_title(void)
+{
+  gameaction = ga_nothing;
+  demosequence = -1;
+  d_advance_demo();
+}
+
+/* d_doom_main */
+
+void d_doom_main(void)
+{
+  int p;
+  char file[256];
+  char demolumpname[9];
+
+  i_at_exit(d_endoom, false);
+
+  /* print banner */
+
+  i_print_banner(PACKAGE_STRING);
+
+  printf("z_init: Init zone memory allocation daemon. \n");
+  z_init();
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  /* @category net
+   *
+   * Start a dedicated server, routing packets but not participating
+   * in the game itself.
+   *
+   */
+
+  if (m_check_parm("-dedicated") > 0)
+    {
+      printf("Dedicated server mode.\n");
+      net_dedicated_server();
+
+      /* Never returns */
+    }
+
+  /* @category net
+   *
+   * Query the Internet master server for a global list of active
+   * servers.
+   *
+   */
+
+  if (m_check_parm("-search"))
+    {
+      net_master_query();
+      exit(0);
+    }
+
+  /* @arg <address>
+   * @category net
+   *
+   * Query the status of the server running on the given IP
+   * address.
+   *
+   */
+
+  p = m_check_parm_with_args("-query", 1);
+
+  if (p)
+    {
+      net_query_address(myargv[p + 1]);
+      exit(0);
+    }
+
+  /* @category net
+   *
+   * Search the local LAN for running servers.
+   *
+   */
+
+  if (m_check_parm("-localsearch"))
+    {
+      net_lan_query();
+      exit(0);
+    }
+#endif
+
+  /* @category game
+   * @vanilla
+   *
+   * Disable monsters.
+   *
+   */
+
+  nomonsters = m_check_parm("-nomonsters");
+
+  /* @category game
+   * @vanilla
+   *
+   * Monsters respawn after being killed.
+   *
+   */
+
+  respawnparm = m_check_parm("-respawn");
+
+  /* @category game
+   * @vanilla
+   *
+   * Monsters move faster.
+   *
+   */
+
+  fastparm = m_check_parm("-fast");
+
+  /* @vanilla
+   *
+   * Developer mode. F1 saves a screenshot in the current working
+   * directory.
+   *
+   */
+
+  devparm = m_check_parm("-devparm");
+
+  i_display_fps_dots(devparm);
+
+  /* @category net
+   * @vanilla
+   *
+   * Start a deathmatch game.
+   *
+   */
+
+  if (m_check_parm("-deathmatch")) deathmatch = 1;
+
+  /* @category net
+   * @vanilla
+   *
+   * Start a deathmatch 2.0 game.  Weapons do not stay in place and
+   * all items respawn after 30 seconds.
+   *
+   */
+
+  if (m_check_parm("-altdeath")) deathmatch = 2;
+
+  if (devparm)
+    {
+      printf(D_DEVSTR);
+    }
+
+  /* find which dir to use for config files */
+
+  /* Auto-detect the configuration dir. */
+
+  m_set_config_dir(NULL);
+
+  /* @category game
+   * @arg <x>
+   * @vanilla
+   *
+   * Turbo mode.  The player's speed is multiplied by x%.  If unspecified,
+   * x defaults to 200.  Values are rounded up to 10 and down to 400.
+   *
+   */
+
+  if ((p = m_check_parm("-turbo")))
+    {
+      int scale = 200;
+
+      if (p < myargc - 1) scale = atoi(myargv[p + 1]);
+      if (scale < 10) scale = 10;
+      if (scale > 400) scale = 400;
+      printf("turbo scale: %i%%\n", scale);
+      forwardmove[0] = forwardmove[0] * scale / 100;
+      forwardmove[1] = forwardmove[1] * scale / 100;
+      sidemove[0] = sidemove[0] * scale / 100;
+      sidemove[1] = sidemove[1] * scale / 100;
+    }
+
+  /* init subsystems */
+
+  printf("v_init: allocate screens.\n");
+  v_init();
+
+  /* Load configuration files before initialising other subsystems. */
+
+  printf("m_load_defaults: Load system defaults.\n");
+  m_set_config_filenames("default.cfg", PROGRAM_PREFIX "doom.cfg");
+  d_bind_variables();
+  m_load_defaults();
+
+  /* Save configuration at exit. */
+
+  i_at_exit(m_save_defaults, false);
+
+  /* Find main IWAD file and load it. */
+
+  iwadfile = d_find_iwad(IWAD_MASK_DOOM, &gamemission);
+
+  /* None found? */
+
+  if (iwadfile == NULL)
+    {
+      i_error("Game mode indeterminate.  No IWAD file was found.  Try\n"
+              "specifying one with the '-iwad' command line parameter.\n");
+    }
+
+  modifiedgame = false;
+
+  printf("W_Init: Init WADfiles.\n");
+  d_addfile(iwadfile);
+
+  w_check_correct_iwad(doom);
+
+  /* Now that we've loaded the IWAD, we can figure out what gamemission
+   * we're playing and which version of Vanilla Doom we need to emulate.
+   */
+
+  d_identify_version();
+  init_game_version();
+
+  /* Check which IWAD variant we are using. */
+
+  if (w_check_num_for_name("FREEDOOM") >= 0)
+    {
+      if (w_check_num_for_name("FREEDM") >= 0)
+        {
+          gamevariant = freedm;
+        }
+      else
+        {
+          gamevariant = freedoom;
+        }
+    }
+  else if (w_check_num_for_name("DMENUPIC") >= 0)
+    {
+      gamevariant = bfgedition;
+    }
+
+  /* @category mod
+   *
+   * Disable automatic loading of Dehacked patches for certain
+   * IWAD files.
+   *
+   */
+
+  if (!m_parm_exists("-nodeh"))
+    {
+      /* Some IWADs have dehacked patches that need to be loaded for
+       * them to be played properly.
+       */
+
+      load_iwad_deh();
+    }
+
+  /* Doom 3: BFG Edition includes modified versions of the classic
+   * IWADs which can be identified by an additional DMENUPIC lump.
+   * Furthermore, the M_GDHIGH lumps have been modified in a way that
+   * makes them incompatible to Vanilla Doom and the modified version
+   * of doom2.wad is missing the TITLEPIC lump.
+   * We specifically check for DMENUPIC here, before PWADs have been
+   * loaded which could probably include a lump of that name.
+   */
+
+  if (gamevariant == bfgedition)
+    {
+      printf("BFG Edition: Using workarounds as needed.\n");
+
+      /* BFG Edition changes the names of the secret levels to
+       * censor the Wolfenstein references. It also has an extra
+       * secret level (MAP33). In Vanilla Doom (meaning the DOS
+       * version), MAP33 overflows into the Plutonia level names
+       * array, so HUSTR_33 is actually PHUSTR_1.
+       */
+
+      deh_add_string_replacement(HUSTR_31, "level 31: idkfa");
+      deh_add_string_replacement(HUSTR_32, "level 32: keen");
+      deh_add_string_replacement(PHUSTR_1, "level 33: betray");
+
+      /* The BFG edition doesn't have the "low detail" menu option (fair
+       * enough). But bizarrely, it reuses the M_GDHIGH patch as a label
+       * for the options menu (says "Fullscreen:"). Why the perpetrators
+       * couldn't just add a new graphic lump and had to reuse this one,
+       * I don't know.
+       *
+       * The end result is that M_GDHIGH is too wide and causes the game
+       * to crash. As a workaround to get a minimum level of support for
+       * the BFG edition IWADs, use the "ON"/"OFF" graphics instead.
+       */
+
+      deh_add_string_replacement("M_GDHIGH", "M_MSGON");
+      deh_add_string_replacement("M_GDLOW", "M_MSGOFF");
+
+      /* The BFG edition's "Screen Size:" graphic has also been changed
+       * to say "Gamepad:". Fortunately, it (along with the original
+       * Doom IWADs) has an unused graphic that says "Display". So we
+       * can swap this in instead, and it kind of makes sense.
+       */
+
+      deh_add_string_replacement("M_SCRNSZ", "M_DISP");
+    }
+
+  /* @category mod
+   *
+   * Disable auto-loading of .wad and .deh files.
+   *
+   */
+
+  if (!m_parm_exists("-noautoload") && gamemode != shareware)
+    {
+      char *autoload_dir;
+
+      /* common auto-loaded files for all Doom flavors */
+
+      if (gamemission < pack_chex)
+        {
+          autoload_dir = m_get_autoload_dir("doom-all");
+          if (autoload_dir != NULL)
+            {
+              deh_auto_load_patches(autoload_dir);
+              w_auto_load_wads(autoload_dir);
+              free(autoload_dir);
+            }
+        }
+
+      /* auto-loaded files per IWAD */
+
+      autoload_dir = m_get_autoload_dir(
+                     d_save_game_iwad_name(gamemission, gamevariant));
+
+      if (autoload_dir != NULL)
+        {
+          deh_auto_load_patches(autoload_dir);
+          w_auto_load_wads(autoload_dir);
+          free(autoload_dir);
+        }
+    }
+
+  /* Load Dehacked patches specified on the command line with -deh.
+   * Note that there's a very careful and deliberate ordering to how
+   * Dehacked patches are loaded. The order we use is:
+   *  1. IWAD dehacked patches.
+   *  2. Command line dehacked patches specified with -deh.
+   *  3. PWAD dehacked patches in DEHACKED lumps.
+   */
+
+  deh_parse_command_line();
+
+  /* Load PWAD files. */
+
+  modifiedgame = w_parse_command_line();
+
+  /* Debug:
+   *    w_print_directory();
+   */
+
+  /* @arg <demo>
+   * @category demo
+   * @vanilla
+   *
+   * Play back the demo named demo.lmp.
+   *
+   */
+
+  p = m_check_parm_with_args("-playdemo", 1);
+
+  if (!p)
+    {
+      /* @arg <demo>
+       * @category demo
+       * @vanilla
+       *
+       * Play back the demo named demo.lmp, determining the framerate
+       * of the screen.
+       *
+       */
+
+      p = m_check_parm_with_args("-timedemo", 1);
+    }
+
+  if (p)
+    {
+      char *uc_filename = strdup(myargv[p + 1]);
+      m_force_uppercase(uc_filename);
+
+      /* With Vanilla you have to specify the file without extension,
+       * but make that optional.
+       */
+
+      if (m_string_ends_with(uc_filename, ".LMP"))
+        {
+          m_str_copy(file, myargv[p + 1], sizeof(file));
+        }
+      else
+        {
+          snprintf(file, sizeof(file), "%s.lmp", myargv[p + 1]);
+        }
+
+      free(uc_filename);
+
+      if (d_addfile(file))
+        {
+          m_str_copy(demolumpname, lumpinfo[numlumps - 1]->name,
+                     sizeof(demolumpname));
+        }
+      else
+        {
+          /* If file failed to load, still continue trying to play
+           * the demo in the same way as Vanilla Doom.  This makes
+           * tricks like "-playdemo demo1" possible.
+           */
+
+          m_str_copy(demolumpname, myargv[p + 1], sizeof(demolumpname));
+        }
+
+      printf("Playing demo %s.\n", file);
+    }
+
+  i_at_exit(g_check_demo_status_at_exit, true);
+
+  /* Generate the WAD hash table.  Speed things up a bit. */
+
+  w_generate_hash_table();
+
+  /* Load DEHACKED lumps from WAD files - but only if we give the right
+   * command line parameter.
+   */
+
+  /* @category mod
+   *
+   * Load Dehacked patches from DEHACKED lumps contained in one of the
+   * loaded PWAD files.
+   *
+   */
+
+  if (m_parm_exists("-dehlump"))
+    {
+      int i;
+      int loaded = 0;
+      int numiwadlumps = numlumps;
+
+      while (!w_is_iwad_lump(lumpinfo[numiwadlumps - 1]))
+        {
+          numiwadlumps--;
+        }
+
+      for (i = numiwadlumps; i < numlumps; ++i)
+        {
+          if (!strncmp(lumpinfo[i]->name, "DEHACKED", 8))
+            {
+              deh_load_lump(i, false, false);
+              loaded++;
+            }
+        }
+
+      printf("  loaded %i DEHACKED lumps from PWAD files.\n", loaded);
+    }
+
+  /* Set the gamedescription string. This is only possible now that
+   * we've finished loading Dehacked patches.
+   */
+
+  d_set_game_description();
+
+  savegamedir =
+      m_get_save_game_dir(d_save_game_iwad_name(gamemission, gamevariant));
+
+  /* Check for -file in shareware */
+
+  if (modifiedgame && (gamevariant != freedoom))
+    {
+      int i;
+
+      if (gamemode == shareware)
+        i_error(("\nYou cannot -file with the shareware "
+                 "version. Register!"));
+
+      /* Check for fake IWAD with right name,
+       * but w/o all the lumps of the registered version.
+       */
+
+      if (gamemode == registered)
+        {
+          for (i = 0; i < 23; i++)
+            {
+              if (w_check_num_for_name(g_name[i]) < 0)
+                {
+                  i_error(("\nThis is not the registered version."));
+                }
+            }
+        }
+    }
+
+  if (w_check_num_for_name("SS_START") >= 0 ||
+      w_check_num_for_name("FF_END") >= 0)
+    {
+      i_print_divider();
+      printf(" WARNING: The loaded WAD file contains modified sprites or\n"
+             " floor textures.  You may want to use the '-merge' command\n"
+             " line option instead of '-file'.\n");
+    }
+
+  i_print_startup_banner(g_gamedescription);
+  print_dehacked_banners();
+
+  printf("i_init: Setting up machine state.\n");
+  i_check_is_screensaver();
+  i_init_timer();
+  i_init_joystick();
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  i_init_sound(doom);
+  i_init_music();
+#endif
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  printf("net_init: Init network subsystem.\n");
+  net_init();
+#endif
+
+  /* Initial netgame startup. Connect to server etc. */
+
+  d_connect_net_game();
+
+  /* get skill / episode / map from params */
+
+  startskill = sk_medium;
+  startepisode = 1;
+  startmap = 1;
+  autostart = false;
+
+  /* @category game
+   * @arg <skill>
+   * @vanilla
+   *
+   * Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
+   * 0 disables all monsters.
+   *
+   */
+
+  p = m_check_parm_with_args("-skill", 1);
+
+  if (p)
+    {
+      startskill = myargv[p + 1][0] - '1';
+      autostart = true;
+    }
+
+  /* @category game
+   * @arg <n>
+   * @vanilla
+   *
+   * Start playing episode n (1-4).
+   *
+   */
+
+  p = m_check_parm_with_args("-episode", 1);
+
+  if (p)
+    {
+      startepisode = myargv[p + 1][0] - '0';
+      startmap = 1;
+      autostart = true;
+    }
+
+  timelimit = 0;
+
+  /* @arg <n>
+   * @category net
+   * @vanilla
+   *
+   * For multiplayer games: exit each level after n minutes.
+   *
+   */
+
+  p = m_check_parm_with_args("-timer", 1);
+
+  if (p)
+    {
+      timelimit = atoi(myargv[p + 1]);
+    }
+
+  /* @category net
+   * @vanilla
+   *
+   * Austin Virtual Gaming: end levels after 20 minutes.
+   *
+   */
+
+  p = m_check_parm("-avg");
+
+  if (p)
+    {
+      timelimit = 20;
+    }
+
+  /* @category game
+   * @arg [<x> <y> | <xy>]
+   * @vanilla
+   *
+   * Start a game immediately, warping to ExMy (Doom 1) or MAPxy
+   * (Doom 2).
+   *
+   */
+
+  p = m_check_parm_with_args("-warp", 1);
+
+  if (p)
+    {
+      if (gamemode == commercial)
+        startmap = atoi(myargv[p + 1]);
+      else
+        {
+          startepisode = myargv[p + 1][0] - '0';
+
+          if (p + 2 < myargc)
+            {
+              startmap = myargv[p + 2][0] - '0';
+            }
+          else
+            {
+              startmap = 1;
+            }
+        }
+
+      autostart = true;
+    }
+
+  /* Undocumented:
+   * Invoked by setup to test the controls.
+   */
+
+  p = m_check_parm("-testcontrols");
+
+  if (p > 0)
+    {
+      startepisode = 1;
+      startmap = 1;
+      autostart = true;
+      testcontrols = true;
+    }
+
+  /* Check for load game parameter
+   * We do this here and save the slot number, so that the network code
+   * can override it or send the load slot to other players.
+   */
+
+  /* @category game
+   * @arg <s>
+   * @vanilla
+   *
+   * Load the game in slot s.
+   *
+   */
+
+  p = m_check_parm_with_args("-loadgame", 1);
+
+  if (p)
+    {
+      startloadgame = atoi(myargv[p + 1]);
+    }
+  else
+    {
+      startloadgame = -1; /* Not loading a game */
+    }
+
+  printf("m_init: Init miscellaneous info.\n");
+  m_init();
+
+  printf("r_init: Init DOOM refresh daemon - ");
+  r_init();
+
+  printf("\np_init: Init Playloop state.\n");
+  p_init();
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  printf("s_init: Setting up sound.\n");
+  s_init(g_sfx_volume * 8, g_music_volume * 8);
+#endif
+
+  printf("d_check_net_game: Checking network game status.\n");
+  d_check_net_game();
+
+  print_game_version();
+
+  printf("hu_init: Setting up heads up display.\n");
+  hu_init();
+
+  printf("st_init: Init status bar.\n");
+  st_init();
+
+  /* If Doom II without a MAP01 lump, this is a store demo.
+   * Moved this here so that MAP01 isn't constantly looked up
+   * in the main loop.
+   */
+
+  if (gamemode == commercial && w_check_num_for_name("map01") < 0)
+    storedemo = true;
+
+  if (m_check_parm_with_args("-statdump", 1))
+    {
+      i_at_exit(stat_dump, true);
+      printf("External statistics registered.\n");
+    }
+
+  /* @arg <x>
+   * @category demo
+   * @vanilla
+   *
+   * Record a demo named x.lmp.
+   */
+
+  p = m_check_parm_with_args("-record", 1);
+
+  if (p)
+    {
+      g_record_demo(myargv[p + 1]);
+      autostart = true;
+    }
+
+  p = m_check_parm_with_args("-playdemo", 1);
+  if (p)
+    {
+      singledemo = true; /* quit after one demo */
+      g_defered_play_demo(demolumpname);
+      d_doomloop(); /* never returns */
+    }
+
+  p = m_check_parm_with_args("-timedemo", 1);
+  if (p)
+    {
+      g_time_demo(demolumpname);
+      d_doomloop(); /* never returns */
+    }
+
+  if (startloadgame >= 0)
+    {
+      m_str_copy(file, p_save_game_file(startloadgame), sizeof(file));
+      g_load_game(file);
+    }
+
+  if (gameaction != ga_loadgame)
+    {
+      if (autostart || netgame)
+        g_init_new(startskill, startepisode, startmap);
+      else
+        d_start_title(); /* start up intro loop */
+    }
+
+  d_doomloop(); /* never returns */
+}
diff --git a/games/NXDoom/src/doom/d_main.h b/games/NXDoom/src/doom/d_main.h
index 8e430f85f..f97422597 100644
--- a/games/NXDoom/src/doom/d_main.h
+++ b/games/NXDoom/src/doom/d_main.h
@@ -1,53 +1,58 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_main.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __D_MAIN__
 #define __D_MAIN__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomdef.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-
-
-// Read events from all input devices
-
-void D_ProcessEvents (void); 
-	
-
-//
-// BASE LEVEL
-//
-void D_PageTicker (void);
-void D_PageDrawer (void);
-void D_AdvanceDemo (void);
-void D_DoAdvanceDemo (void);
-void D_StartTitle (void);
- 
-//
-// GLOBAL VARIABLES
-//
-
-extern  gameaction_t    gameaction;
+extern gameaction_t gameaction;
 extern boolean advancedemo;
 
 extern const char *pagename;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* Read events from all input devices */
 
+void d_process_events(void);
+
+/* BASE LEVEL */
+
+void d_page_ticker(void);
+void d_page_drawer(void);
+void d_advance_demo(void);
+void d_do_advance_demo(void);
+void d_start_title(void);
+
+#endif /* __D_MAIN__ */
diff --git a/games/NXDoom/src/doom/d_net.c b/games/NXDoom/src/doom/d_net.c
index f8969fe02..3be74240c 100644
--- a/games/NXDoom/src/doom/d_net.c
+++ b/games/NXDoom/src/doom/d_net.c
@@ -1,34 +1,42 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM Network game communication and protocol,
-//	all OS independend parts.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_net.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  DOOM Network game communication and protocol, all OS independent parts.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 
 #include "d_main.h"
-#include "m_argv.h"
-#include "m_menu.h"
-#include "m_misc.h"
+#include "doomdef.h"
+#include "doomstat.h"
+#include "g_game.h"
 #include "i_system.h"
 #include "i_timer.h"
 #include "i_video.h"
-#include "g_game.h"
-#include "doomdef.h"
-#include "doomstat.h"
+#include "m_argv.h"
+#include "m_menu.h"
+#include "m_misc.h"
 #include "w_checksum.h"
 #include "w_wad.h"
 
@@ -36,252 +44,290 @@
 
 #include "d_loop.h"
 
-ticcmd_t *netcmds;
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-// Called when a player leaves the game
+static void run_tic(ticcmd_t *cmds, boolean *ingame);
 
-static void PlayerQuitGame(player_t *player)
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static loop_interface_t g_doom_loop_interface =
 {
-    static char exitmsg[80];
-    unsigned int player_num;
-
-    player_num = player - players;
-
-    // Do this the same way as Vanilla Doom does, to allow dehacked
-    // replacements of this message
-
-    M_StringCopy(exitmsg, DEH_String("Player 1 left the game"),
-                 sizeof(exitmsg));
-
-    exitmsg[7] += player_num;
-
-    playeringame[player_num] = false;
-    players[consoleplayer].message = exitmsg;
-
-    // TODO: check if it is sensible to do this:
-
-    if (demorecording) 
-    {
-        G_CheckDemoStatus ();
-    }
-}
-
-static void RunTic(ticcmd_t *cmds, boolean *ingame)
-{
-    unsigned int i;
-
-    // Check for player quits.
-
-    for (i = 0; i < MAXPLAYERS; ++i)
-    {
-        if (!demoplayback && playeringame[i] && !ingame[i])
-        {
-            PlayerQuitGame(&players[i]);
-        }
-    }
-
-    netcmds = cmds;
-
-    // check that there are players in the game.  if not, we cannot
-    // run a tic.
-
-    if (advancedemo)
-        D_DoAdvanceDemo ();
-
-    G_Ticker ();
-}
-
-static loop_interface_t doom_loop_interface = {
-    D_ProcessEvents,
-    G_BuildTiccmd,
-    RunTic,
-    M_Ticker
+  d_process_events,
+  g_build_ticcmd,
+  run_tic,
+  m_ticker,
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-// Load game settings from the specified structure and
-// set global variables.
+ticcmd_t *netcmds;
 
-static void LoadGameSettings(net_gamesettings_t *settings)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: player_quit_game
+ *
+ * Description:
+ *  Called when a player leaves the game
+ *
+ ****************************************************************************/
+
+static void player_quit_game(player_t *player)
 {
-    unsigned int i;
+  static char exitmsg[80];
+  unsigned int player_num;
 
-    deathmatch = settings->deathmatch;
-    startepisode = settings->episode;
-    startmap = settings->map;
-    startskill = settings->skill;
-    startloadgame = settings->loadgame;
-    lowres_turn = settings->lowres_turn;
-    nomonsters = settings->nomonsters;
-    fastparm = settings->fast_monsters;
-    respawnparm = settings->respawn_monsters;
-    timelimit = settings->timelimit;
-    consoleplayer = settings->consoleplayer;
+  player_num = player - players;
 
-    if (lowres_turn)
+  /* Do this the same way as Vanilla Doom does, to allow dehacked
+   * replacements of this message
+   */
+
+  m_str_copy(exitmsg, ("Player 1 left the game"), sizeof(exitmsg));
+
+  exitmsg[7] += player_num;
+
+  playeringame[player_num] = false;
+  players[consoleplayer].message = exitmsg;
+
+  /* TODO: check if it is sensible to do this: */
+
+  if (demorecording)
     {
-        printf("NOTE: Turning resolution is reduced; this is probably "
-               "because there is a client recording a Vanilla demo.\n");
-    }
-
-    for (i = 0; i < MAXPLAYERS; ++i)
-    {
-        playeringame[i] = i < settings->num_players;
+      g_check_demo_status();
     }
 }
 
-// Save the game settings from global variables to the specified
-// game settings structure.
-
-static void SaveGameSettings(net_gamesettings_t *settings)
+static void run_tic(ticcmd_t *cmds, boolean *ingame)
 {
-    // Fill in game settings structure with appropriate parameters
-    // for the new game
+  unsigned int i;
 
-    settings->deathmatch = deathmatch;
-    settings->episode = startepisode;
-    settings->map = startmap;
-    settings->skill = startskill;
-    settings->loadgame = startloadgame;
-    settings->gameversion = gameversion;
-    settings->nomonsters = nomonsters;
-    settings->fast_monsters = fastparm;
-    settings->respawn_monsters = respawnparm;
-    settings->timelimit = timelimit;
+  /* Check for player quits. */
 
-    settings->lowres_turn = (M_ParmExists("-record")
-                         && !M_ParmExists("-longtics"))
-                          || M_ParmExists("-shorttics");
-}
-
-static void InitConnectData(net_connect_data_t *connect_data)
-{
-    boolean shorttics;
-
-    connect_data->max_players = MAXPLAYERS;
-    connect_data->drone = false;
-
-    //!
-    // @category net
-    //
-    // Run as the left screen in three screen mode.
-    //
-
-    if (M_CheckParm("-left") > 0)
+  for (i = 0; i < MAXPLAYERS; ++i)
     {
-        viewangleoffset = ANG90;
-        connect_data->drone = true;
-    }
-
-    //! 
-    // @category net
-    //
-    // Run as the right screen in three screen mode.
-    //
-
-    if (M_CheckParm("-right") > 0)
-    {
-        viewangleoffset = ANG270;
-        connect_data->drone = true;
-    }
-
-    //
-    // Connect data
-    //
-
-    // Game type fields:
-
-    connect_data->gamemode = gamemode;
-    connect_data->gamemission = gamemission;
-
-    //!
-    // @category demo
-    //
-    // Play with low turning resolution to emulate demo recording.
-    //
-
-    shorttics = M_ParmExists("-shorttics");
-
-    // Are we recording a demo? Possibly set lowres turn mode
-
-    connect_data->lowres_turn = (M_ParmExists("-record")
-                             && !M_ParmExists("-longtics"))
-                              || shorttics;
-
-    // Read checksums of our WAD directory and dehacked information
-
-    W_Checksum(connect_data->wad_sha1sum);
-    DEH_Checksum(connect_data->deh_sha1sum);
-
-    // Are we playing with the Freedoom IWAD?
-
-    connect_data->is_freedoom = W_CheckNumForName("FREEDOOM") >= 0;
-}
-
-void D_ConnectNetGame(void)
-{
-    net_connect_data_t connect_data;
-
-    InitConnectData(&connect_data);
-    netgame = D_InitNetGame(&connect_data);
-
-    //!
-    // @category net
-    //
-    // Start the game playing as though in a netgame with a single
-    // player.  This can also be used to play back single player netgame
-    // demos.
-    //
-
-    if (M_CheckParm("-solo-net") > 0)
-    {
-        netgame = true;
-    }
-}
-
-//
-// D_CheckNetGame
-// Works out player numbers among the net participants
-//
-void D_CheckNetGame (void)
-{
-    net_gamesettings_t settings;
-
-    if (netgame)
-    {
-        autostart = true;
-    }
-
-    D_RegisterLoopCallbacks(&doom_loop_interface);
-
-    SaveGameSettings(&settings);
-    D_StartNetGame(&settings, NULL);
-    LoadGameSettings(&settings);
-
-    DEH_printf("startskill %i  deathmatch: %i  startmap: %i  startepisode: %i\n",
-               startskill, deathmatch, startmap, startepisode);
-
-    DEH_printf("player %i of %i (%i nodes)\n",
-               consoleplayer+1, settings.num_players, settings.num_players);
-
-    // Show players here; the server might have specified a time limit
-
-    if (timelimit > 0 && deathmatch)
-    {
-        // Gross hack to work like Vanilla:
-
-        if (timelimit == 20 && M_CheckParm("-avg"))
+      if (!demoplayback && playeringame[i] && !ingame[i])
         {
-            DEH_printf("Austin Virtual Gaming: Levels will end "
-                           "after 20 minutes\n");
+          player_quit_game(&players[i]);
         }
-        else
+    }
+
+  netcmds = cmds;
+
+  /* check that there are players in the game.  if not, we cannot
+   * run a tic.
+   */
+
+  if (advancedemo) d_do_advance_demo();
+
+  g_ticker();
+}
+
+/****************************************************************************
+ * Name: Load_Game_Settings
+ *
+ * Description:
+ *  Load game settings from the specified structure and
+ *  set global variables.
+ *
+ ****************************************************************************/
+
+static void load_game_settings(net_gamesettings_t *settings)
+{
+  unsigned int i;
+
+  deathmatch = settings->deathmatch;
+  startepisode = settings->episode;
+  startmap = settings->map;
+  startskill = settings->skill;
+  startloadgame = settings->loadgame;
+  lowres_turn = settings->lowres_turn;
+  nomonsters = settings->nomonsters;
+  fastparm = settings->fast_monsters;
+  respawnparm = settings->respawn_monsters;
+  timelimit = settings->timelimit;
+  consoleplayer = settings->consoleplayer;
+
+  if (lowres_turn)
+    {
+      printf("NOTE: Turning resolution is reduced; this is probably "
+             "because there is a client recording a Vanilla demo.\n");
+    }
+
+  for (i = 0; i < MAXPLAYERS; ++i)
+    {
+      playeringame[i] = i < settings->num_players;
+    }
+}
+
+/****************************************************************************
+ * Name: save_game_settings
+ *
+ * Description:
+ *  Save the game settings from global variables to the specified
+ *  game settings structure.
+ *
+ ****************************************************************************/
+
+static void save_game_settings(net_gamesettings_t *settings)
+{
+  /* Fill in game settings structure with appropriate parameters
+   * for the new game
+   */
+
+  settings->deathmatch = deathmatch;
+  settings->episode = startepisode;
+  settings->map = startmap;
+  settings->skill = startskill;
+  settings->loadgame = startloadgame;
+  settings->gameversion = gameversion;
+  settings->nomonsters = nomonsters;
+  settings->fast_monsters = fastparm;
+  settings->respawn_monsters = respawnparm;
+  settings->timelimit = timelimit;
+
+  settings->lowres_turn =
+      (m_parm_exists("-record") && !m_parm_exists("-longtics")) ||
+      m_parm_exists("-shorttics");
+}
+
+static void init_connect_data(net_connect_data_t *connect_data)
+{
+  boolean shorttics;
+
+  connect_data->max_players = MAXPLAYERS;
+  connect_data->drone = false;
+
+  /* @category net
+   *
+   * Run as the left screen in three screen mode.
+   */
+
+  if (m_check_parm("-left") > 0)
+    {
+      viewangleoffset = ANG90;
+      connect_data->drone = true;
+    }
+
+  /* @category net
+   *
+   * Run as the right screen in three screen mode.
+   */
+
+  if (m_check_parm("-right") > 0)
+    {
+      viewangleoffset = ANG270;
+      connect_data->drone = true;
+    }
+
+  /* Connect data */
+
+  /* Game type fields: */
+
+  connect_data->gamemode = gamemode;
+  connect_data->gamemission = gamemission;
+
+  /* @category demo
+   *
+   * Play with low turning resolution to emulate demo recording.
+   */
+
+  shorttics = m_parm_exists("-shorttics");
+
+  /* Are we recording a demo? Possibly set lowres turn mode */
+
+  connect_data->lowres_turn =
+      (m_parm_exists("-record") && !m_parm_exists("-longtics")) || shorttics;
+
+  /* Read checksums of our WAD directory and dehacked information */
+
+  w_checksum(connect_data->wad_sha1sum);
+  deh_checksum(connect_data->deh_sha1sum);
+
+  /* Are we playing with the Freedoom IWAD? */
+
+  connect_data->is_freedoom = w_check_num_for_name("FREEDOOM") >= 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void d_connect_net_game(void)
+{
+  net_connect_data_t connect_data;
+
+  init_connect_data(&connect_data);
+  netgame = d_init_net_game(&connect_data);
+
+#ifdef CONFIG_GAMES_NXDOOM_NET
+  /* @category net
+   *
+   * Start the game playing as though in a netgame with a single
+   * player. This can also be used to play back single player netgame
+   * demos.
+   */
+
+  if (m_check_parm("-solo-net") > 0)
+    {
+      netgame = true;
+    }
+#endif
+}
+
+/****************************************************************************
+ * Name: d_check_net_game
+ *
+ * Description:
+ *  Works out player numbers among the net participants
+ *
+ ****************************************************************************/
+
+void d_check_net_game(void)
+{
+  net_gamesettings_t settings;
+
+  if (netgame)
+    {
+      autostart = true;
+    }
+
+  d_register_loop_callbacks(&g_doom_loop_interface);
+
+  save_game_settings(&settings);
+  d_start_net_game(&settings, NULL);
+  load_game_settings(&settings);
+
+  printf("startskill %i  deathmatch: %i  startmap: %i  startepisode: %i\n",
+         startskill, deathmatch, startmap, startepisode);
+
+  printf("player %i of %i (%i nodes)\n", consoleplayer + 1,
+         settings.num_players, settings.num_players);
+
+  /* Show players here; the server might have specified a time limit */
+
+  if (timelimit > 0 && deathmatch)
+    {
+      /* Gross hack to work like Vanilla: */
+
+      if (timelimit == 20 && m_check_parm("-avg"))
         {
-            DEH_printf("Levels will end after %d minute", timelimit);
-            if (timelimit > 1)
-                printf("s");
-            printf(".\n");
+          printf("Austin Virtual Gaming: Levels will end "
+                 "after 20 minutes\n");
+        }
+      else
+        {
+          printf("Levels will end after %d minute", timelimit);
+          if (timelimit > 1) printf("s");
+          printf(".\n");
         }
     }
 }
-
diff --git a/games/NXDoom/src/doom/d_player.h b/games/NXDoom/src/doom/d_player.h
index d78482d0e..54defc586 100644
--- a/games/NXDoom/src/doom/d_player.h
+++ b/games/NXDoom/src/doom/d_player.h
@@ -1,209 +1,236 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_player.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *
+ ****************************************************************************/
 
 #ifndef __D_PLAYER__
 #define __D_PLAYER__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* The player data structure depends on a number
+ * of other structs: items (internal inventory),
+ * animation states (closely tied to the sprites
+ * used to represent them, unfortunately).
+ */
 
-// The player data structure depends on a number
-// of other structs: items (internal inventory),
-// animation states (closely tied to the sprites
-// used to represent them, unfortunately).
 #include "d_items.h"
 #include "p_pspr.h"
 
-// In addition, the player is just a special
-// case of the generic moving object/actor.
+/* In addition, the player is just a special
+ * case of the generic moving object/actor.
+ */
+
 #include "p_mobj.h"
 
-// Finally, for odd reasons, the player input
-// is buffered within the player data struct,
-// as commands per game tick.
+/* Finally, for odd reasons, the player input
+ * is buffered within the player data struct,
+ * as commands per game tick.
+ */
+
 #include "d_ticcmd.h"
 
 #include "net_defs.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* Player states. */
 
-
-//
-// Player states.
-//
 typedef enum
 {
-    // Playing or camping.
-    PST_LIVE,
-    // Dead on the ground, view follows killer.
-    PST_DEAD,
-    // Ready to restart/respawn???
-    PST_REBORN		
-
+  PST_LIVE,  /* Playing or camping. */
+  PST_DEAD,  /* Dead on the ground, view follows killer. */
+  PST_REBORN /* Ready to restart/respawn??? */
 } playerstate_t;
 
+/* Player internal flags, for cheats and debug. */
 
-//
-// Player internal flags, for cheats and debug.
-//
 typedef enum
 {
-    // No clipping, walk through barriers.
-    CF_NOCLIP		= 1,
-    // No damage, no health loss.
-    CF_GODMODE		= 2,
-    // Not really a cheat, just a debug aid.
-    CF_NOMOMENTUM	= 4
-
+  CF_NOCLIP = 1,    /* No clipping, walk through barriers. */
+  CF_GODMODE = 2,   /* No damage, no health loss. */
+  CF_NOMOMENTUM = 4 /* Not really a cheat, just a debug aid. */
 } cheat_t;
 
+/* Extended player object info: player_t */
 
-//
-// Extended player object info: player_t
-//
 typedef struct player_s
 {
-    mobj_t*		mo;
-    playerstate_t	playerstate;
-    ticcmd_t		cmd;
+  mobj_t *mo;
+  playerstate_t playerstate;
+  ticcmd_t cmd;
 
-    // Determine POV,
-    //  including viewpoint bobbing during movement.
-    // Focal origin above r.z
-    fixed_t		viewz;
-    // Base height above floor for viewz.
-    fixed_t		viewheight;
-    // Bob/squat speed.
-    fixed_t         	deltaviewheight;
-    // bounded/scaled total momentum.
-    fixed_t         	bob;	
+  /* Determine POV, including viewpoint bobbing during movement.
+   * Focal origin above r.z
+   */
 
-    // This is only used between levels,
-    // mo->health is used during levels.
-    int			health;	
-    int			armorpoints;
-    // Armor type is 0-2.
-    int			armortype;	
+  fixed_t viewz;
 
-    // Power ups. invinc and invis are tic counters.
-    int			powers[NUMPOWERS];
-    boolean		cards[NUMCARDS];
-    boolean		backpack;
-    
-    // Frags, kills of other players.
-    int			frags[MAXPLAYERS];
-    weapontype_t	readyweapon;
-    
-    // Is wp_nochange if not changing.
-    weapontype_t	pendingweapon;
+  /* Base height above floor for viewz. */
 
-    int                 weaponowned[NUMWEAPONS];
-    int			ammo[NUMAMMO];
-    int			maxammo[NUMAMMO];
+  fixed_t viewheight;
 
-    // True if button down last tic.
-    int			attackdown;
-    int			usedown;
+  /* Bob/squat speed. */
 
-    // Bit flags, for cheats and debug.
-    // See cheat_t, above.
-    int			cheats;		
+  fixed_t deltaviewheight;
 
-    // Refired shots are less accurate.
-    int			refire;		
+  /* bounded/scaled total momentum. */
 
-     // For intermission stats.
-    int			killcount;
-    int			itemcount;
-    int			secretcount;
+  fixed_t bob;
 
-    // Hint messages.
-    const char		*message;
-    
-    // For screen flashing (red or bright).
-    int			damagecount;
-    int			bonuscount;
+  /* This is only used between levels,
+   * mo->health is used during levels.
+   */
 
-    // Who did damage (NULL for floors/ceilings).
-    mobj_t*		attacker;
-    
-    // So gun flashes light up areas.
-    int			extralight;
+  int health;
+  int armorpoints;
 
-    // Current PLAYPAL, ???
-    //  can be set to REDCOLORMAP for pain, etc.
-    int			fixedcolormap;
+  /* Armor type is 0-2. */
 
-    // Player skin colorshift,
-    //  0-3 for which color to draw player.
-    int			colormap;	
+  int armortype;
 
-    // Overlay view sprites (gun, etc).
-    pspdef_t		psprites[NUMPSPRITES];
+  /* Power ups. invinc and invis are tic counters. */
 
-    // True if secret level has been done.
-    boolean		didsecret;	
+  int powers[NUMPOWERS];
+  boolean cards[NUMCARDS];
+  boolean backpack;
 
+  /* Frags, kills of other players. */
+
+  int frags[MAXPLAYERS];
+  weapontype_t readyweapon;
+
+  /* Is wp_nochange if not changing. */
+
+  weapontype_t pendingweapon;
+
+  int weaponowned[NUMWEAPONS];
+  int ammo[NUMAMMO];
+  int maxammo[NUMAMMO];
+
+  /* True if button down last tic. */
+
+  int attackdown;
+  int usedown;
+
+  /* Bit flags, for cheats and debug.
+   * See cheat_t, above.
+   */
+
+  int cheats;
+
+  /* Refired shots are less accurate. */
+
+  int refire;
+
+  /* For intermission stats. */
+
+  int killcount;
+  int itemcount;
+  int secretcount;
+
+  /* Hint messages. */
+
+  const char *message;
+
+  /* For screen flashing (red or bright). */
+
+  int damagecount;
+  int bonuscount;
+
+  /* Who did damage (NULL for floors/ceilings). */
+
+  mobj_t *attacker;
+
+  /* So gun flashes light up areas. */
+
+  int extralight;
+
+  /* Current PLAYPAL, ??? can be set to REDCOLORMAP for pain, etc.
+   */
+
+  int fixedcolormap;
+
+  /* Player skin colorshift, 0-3 for which color to draw player.
+   */
+
+  int colormap;
+
+  /* Overlay view sprites (gun, etc). */
+
+  pspdef_t psprites[NUMPSPRITES];
+
+  /* True if secret level has been done. */
+
+  boolean didsecret;
 } player_t;
 
+/* INTERMISSION
+ * Structure passed e.g. to wi_start(wb)
+ */
 
-//
-// INTERMISSION
-// Structure passed e.g. to WI_Start(wb)
-//
 typedef struct
 {
-    boolean	in;	// whether the player is in game
-    
-    // Player stats, kills, collected items etc.
-    int		skills;
-    int		sitems;
-    int		ssecret;
-    int		stime; 
-    int		frags[4];
-    int		score;	// current score on entry, modified on return
-  
+  boolean in; /* whether the player is in game */
+
+  /* Player stats, kills, collected items etc. */
+
+  int skills;
+  int sitems;
+  int ssecret;
+  int stime;
+  int frags[4];
+  int score; /* current score on entry, modified on return */
 } wbplayerstruct_t;
 
 typedef struct
 {
-    int		epsd;	// episode # (0-2)
+  int epsd; /* episode # (0-2) */
 
-    // if true, splash the secret level
-    boolean	didsecret;
-    
-    // previous and next levels, origin 0
-    int		last;
-    int		next;	
-    
-    int		maxkills;
-    int		maxitems;
-    int		maxsecret;
-    int		maxfrags;
+  /* if true, splash the secret level */
 
-    // the par time
-    int		partime;
-    
-    // index of this player in game
-    int		pnum;	
+  boolean didsecret;
 
-    wbplayerstruct_t	plyr[MAXPLAYERS];
+  /* previous and next levels, origin 0 */
 
+  int last;
+  int next;
+
+  int maxkills;
+  int maxitems;
+  int maxsecret;
+  int maxfrags;
+
+  /* the par time */
+
+  int partime;
+
+  /* index of this player in game */
+
+  int pnum;
+
+  wbplayerstruct_t plyr[MAXPLAYERS];
 } wbstartstruct_t;
 
-
-#endif
+#endif /* __D_PLAYER__ */
diff --git a/games/NXDoom/src/doom/d_textur.h b/games/NXDoom/src/doom/d_textur.h
index 1afe040eb..cf77f38b4 100644
--- a/games/NXDoom/src/doom/d_textur.h
+++ b/games/NXDoom/src/doom/d_textur.h
@@ -1,43 +1,50 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Typedefs related to to textures etc.,
-//	 isolated here to make it easier separating modules.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_textur.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Typedefs related to to textures etc.,
+ *  isolated here to make it easier separating modules.
+ *
+ ****************************************************************************/
 
 #ifndef __D_TEXTUR__
 #define __D_TEXTUR__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* Flats?
+ *
+ * a pic is an unmasked block of pixels
+ */
 
-
-//
-// Flats?
-//
-// a pic is an unmasked block of pixels
 typedef struct
 {
-    byte		width;
-    byte		height;
-    byte		data;
+  byte width;
+  byte height;
+  byte data;
 } pic_t;
 
-
-
-
-#endif
+#endif /* __D_TEXTUR__ */
diff --git a/games/NXDoom/src/doom/d_think.h b/games/NXDoom/src/doom/d_think.h
index 0966ad960..197422481 100644
--- a/games/NXDoom/src/doom/d_think.h
+++ b/games/NXDoom/src/doom/d_think.h
@@ -1,68 +1,64 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  MapObj data. Map Objects or mobjs are actors, entities,
-//  thinker, take-your-pick... anything that moves, acts, or
-//  suffers state changes of more or less violent nature.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/d_think.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  MapObj data. Map Objects or mobjs are actors, entities,
+ *  thinker, take-your-pick... anything that moves, acts, or
+ *  suffers state changes of more or less violent nature.
+ *
+ ****************************************************************************/
 
 #ifndef __D_THINK__
 #define __D_THINK__
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* Experimental stuff.
+ * To compile this as "ANSI C with classes" we will need to handle the
+ * various action functions cleanly.
+ */
 
-
-
-//
-// Experimental stuff.
-// To compile this as "ANSI C with classes"
-//  we will need to handle the various
-//  action functions cleanly.
-//
-typedef  void (*actionf_v)();
-typedef  void (*actionf_p1)( void* );
-typedef  void (*actionf_p2)( void*, void* );
+typedef void (*actionf_v)();
+typedef void (*actionf_p1)(void *);
+typedef void (*actionf_p2)(void *, void *);
 
 typedef union
 {
-  actionf_v	acv;
-  actionf_p1	acp1;
-  actionf_p2	acp2;
-
+  actionf_v acv;
+  actionf_p1 acp1;
+  actionf_p2 acp2;
 } actionf_t;
 
+/* Historically, "think_t" is yet another function pointer to a routine to
+ * handle an actor.
+ */
 
+typedef actionf_t think_t;
 
+/* Doubly linked list of actors. */
 
-
-// Historically, "think_t" is yet another
-//  function pointer to a routine to handle
-//  an actor.
-typedef actionf_t  think_t;
-
-
-// Doubly linked list of actors.
 typedef struct thinker_s
 {
-    struct thinker_s*	prev;
-    struct thinker_s*	next;
-    think_t		function;
-    
+  struct thinker_s *prev;
+  struct thinker_s *next;
+  think_t function;
 } thinker_t;
 
-
-
-#endif
+#endif /* __D_THINK__ */
diff --git a/games/NXDoom/src/doom/deh_ammo.c b/games/NXDoom/src/doom/deh_ammo.c
index dd8bee546..83aabf00e 100644
--- a/games/NXDoom/src/doom/deh_ammo.c
+++ b/games/NXDoom/src/doom/deh_ammo.c
@@ -1,103 +1,128 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Ammo" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_ammo.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Ammo" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "doomdef.h"
-#include "doomtype.h"
 #include "deh_defs.h"
 #include "deh_io.h"
 #include "deh_main.h"
+#include "doomdef.h"
+#include "doomtype.h"
 #include "p_local.h"
 
-static void *DEH_AmmoStart(deh_context_t *context, char *line)
-{
-    int ammo_number = 0;
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    if (sscanf(line, "Ammo %i", &ammo_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
+static void *deh_ammo_start(deh_context_t *context, char *line);
+static void deh_ammo_parse_line(deh_context_t *context, char *line,
+                                void *tag);
+static void deh_ammo_sha1_hash(SHA1_CTX *context);
 
-    if (ammo_number < 0 || ammo_number >= NUMAMMO)
-    {
-        DEH_Warning(context, "Invalid ammo number: %i", ammo_number);
-        return NULL;
-    }
-    
-    return &maxammo[ammo_number];
-}
-
-static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    int ivalue;
-    int ammo_number;
-
-    if (tag == NULL)
-        return;
-
-    ammo_number = ((int *) tag) - maxammo;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    // maxammo
-
-    if (!strcasecmp(variable_name, "Per ammo"))
-        clipammo[ammo_number] = ivalue;
-    else if (!strcasecmp(variable_name, "Max ammo"))
-        maxammo[ammo_number] = ivalue;
-    else
-    {
-        DEH_Warning(context, "Field named '%s' not found", variable_name);
-    }
-}
-
-static void DEH_AmmoSHA1Hash(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        SHA1_UpdateInt32(context, clipammo[i]);
-        SHA1_UpdateInt32(context, maxammo[i]);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_ammo =
 {
-    "Ammo",
-    NULL,
-    DEH_AmmoStart,
-    DEH_AmmoParseLine,
-    NULL,
-    DEH_AmmoSHA1Hash,
+  "Ammo",
+  NULL,
+  deh_ammo_start,
+  deh_ammo_parse_line,
+  NULL,
+  deh_ammo_sha1_hash,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_ammo_start(deh_context_t *context, char *line)
+{
+  int ammo_number = 0;
+
+  if (sscanf(line, "Ammo %i", &ammo_number) != 1)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  if (ammo_number < 0 || ammo_number >= NUMAMMO)
+    {
+      deh_warning(context, "Invalid ammo number: %i", ammo_number);
+      return NULL;
+    }
+
+  return &maxammo[ammo_number];
+}
+
+static void deh_ammo_parse_line(deh_context_t *context, char *line,
+        void *tag)
+{
+  char *variable_name;
+  char *value;
+  int ivalue;
+  int ammo_number;
+
+  if (tag == NULL) return;
+
+  ammo_number = ((int *)tag) - maxammo;
+
+  /* Parse the assignment */
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  ivalue = atoi(value);
+
+  /* maxammo */
+
+  if (!strcasecmp(variable_name, "Per ammo"))
+    clipammo[ammo_number] = ivalue;
+  else if (!strcasecmp(variable_name, "Max ammo"))
+    maxammo[ammo_number] = ivalue;
+  else
+    {
+      deh_warning(context, "Field named '%s' not found", variable_name);
+    }
+}
+
+static void deh_ammo_sha1_hash(SHA1_CTX *context)
+{
+  int i;
+
+  for (i = 0; i < NUMAMMO; ++i)
+    {
+      sha1_updateint32(context, clipammo[i]);
+      sha1_updateint32(context, maxammo[i]);
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_bexstr.c b/games/NXDoom/src/doom/deh_bexstr.c
index f9235f205..c1ff9c83d 100644
--- a/games/NXDoom/src/doom/deh_bexstr.c
+++ b/games/NXDoom/src/doom/deh_bexstr.c
@@ -1,20 +1,28 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2014 Fabian Greffrath
-//
-// 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.
-//
-//
-// Parses [STRINGS] sections in BEX files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_bexstr.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ * Copyright(C) 2014 Fabian Greffrath
+ *
+ * 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.
+ *
+ * Parses [STRINGS] sections in BEX files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <string.h>
@@ -25,15 +33,33 @@
 
 #include "dstrings.h"
 
-typedef struct {
-    const char *macro;
-    const char *string;
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef struct
+{
+  const char *macro;
+  const char *string;
 } bex_string_t;
 
-// mnemonic keys table
-static const bex_string_t bex_stringtable[] = {
-    // part 1 - general initialization and prompts
-    {"D_DEVSTR", D_DEVSTR},
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void *deh_bex_str_start(deh_context_t *context, char *line);
+static void deh_bex_str_parse_line(deh_context_t *context, char *line,
+                                   void *tag);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* mnemonic keys table */
+
+static const bex_string_t g_bex_stringtable[] =
+{
+    {"D_DEVSTR", D_DEVSTR}, /* part 1 - general initialization and prompts */
     {"D_CDROM", D_CDROM},
     {"QUITMSG", QUITMSG},
     {"LOADNET", LOADNET},
@@ -59,8 +85,8 @@ static const bex_string_t bex_stringtable[] = {
     {"EMPTYSTRING", EMPTYSTRING},
     {"GGSAVED", GGSAVED},
     {"SAVEGAMENAME", SAVEGAMENAME},
-    // part 2 - messages when the player gets things
-    {"GOTARMOR", GOTARMOR},
+    {"GOTARMOR",
+     GOTARMOR}, /* part 2 - messages when the player gets things */
     {"GOTMEGA", GOTMEGA},
     {"GOTHTHBONUS", GOTHTHBONUS},
     {"GOTARMBONUS", GOTARMBONUS},
@@ -97,15 +123,13 @@ static const bex_string_t bex_stringtable[] = {
     {"GOTPLASMA", GOTPLASMA},
     {"GOTSHOTGUN", GOTSHOTGUN},
     {"GOTSHOTGUN2", GOTSHOTGUN2},
-    // part 3 - messages when keys are needed
-    {"PD_BLUEO", PD_BLUEO},
+    {"PD_BLUEO", PD_BLUEO}, /* part 3 - messages when keys are needed */
     {"PD_REDO", PD_REDO},
     {"PD_YELLOWO", PD_YELLOWO},
     {"PD_BLUEK", PD_BLUEK},
     {"PD_REDK", PD_REDK},
     {"PD_YELLOWK", PD_YELLOWK},
-    // part 4 - multiplayer messaging
-    {"HUSTR_MSGU", HUSTR_MSGU},
+    {"HUSTR_MSGU", HUSTR_MSGU}, /* part 4 - multiplayer messaging */
     {"HUSTR_MESSAGESENT", HUSTR_MESSAGESENT},
     {"HUSTR_CHATMACRO0", HUSTR_CHATMACRO0},
     {"HUSTR_CHATMACRO1", HUSTR_CHATMACRO1},
@@ -126,8 +150,7 @@ static const bex_string_t bex_stringtable[] = {
     {"HUSTR_PLRINDIGO", HUSTR_PLRINDIGO},
     {"HUSTR_PLRBROWN", HUSTR_PLRBROWN},
     {"HUSTR_PLRRED", HUSTR_PLRRED},
-    // part 5 - level names in the automap
-    {"HUSTR_E1M1", HUSTR_E1M1},
+    {"HUSTR_E1M1", HUSTR_E1M1}, /* part 5 - level names in the automap */
     {"HUSTR_E1M2", HUSTR_E1M2},
     {"HUSTR_E1M3", HUSTR_E1M3},
     {"HUSTR_E1M4", HUSTR_E1M4},
@@ -259,8 +282,8 @@ static const bex_string_t bex_stringtable[] = {
     {"THUSTR_30", THUSTR_30},
     {"THUSTR_31", THUSTR_31},
     {"THUSTR_32", THUSTR_32},
-    // part 6 - messages as a result of toggling states
-    {"AMSTR_FOLLOWON", AMSTR_FOLLOWON},
+    {"AMSTR_FOLLOWON",
+     AMSTR_FOLLOWON}, /* part 6 - messages as a result of toggling states */
     {"AMSTR_FOLLOWOFF", AMSTR_FOLLOWOFF},
     {"AMSTR_GRIDON", AMSTR_GRIDON},
     {"AMSTR_GRIDOFF", AMSTR_GRIDOFF},
@@ -278,8 +301,7 @@ static const bex_string_t bex_stringtable[] = {
     {"STSTR_BEHOLDX", STSTR_BEHOLDX},
     {"STSTR_CHOPPERS", STSTR_CHOPPERS},
     {"STSTR_CLEV", STSTR_CLEV},
-    // part 7 - episode intermission texts
-    {"E1TEXT", E1TEXT},
+    {"E1TEXT", E1TEXT}, /* part 7 - episode intermission texts */
     {"E2TEXT", E2TEXT},
     {"E3TEXT", E3TEXT},
     {"E4TEXT", E4TEXT},
@@ -301,8 +323,7 @@ static const bex_string_t bex_stringtable[] = {
     {"T4TEXT", T4TEXT},
     {"T5TEXT", T5TEXT},
     {"T6TEXT", T6TEXT},
-    // part 8 - creature names for the finale
-    {"CC_ZOMBIE", CC_ZOMBIE},
+    {"CC_ZOMBIE", CC_ZOMBIE}, /* part 8 - creature names for the finale */
     {"CC_SHOTGUN", CC_SHOTGUN},
     {"CC_HEAVY", CC_HEAVY},
     {"CC_IMP", CC_IMP},
@@ -319,8 +340,7 @@ static const bex_string_t bex_stringtable[] = {
     {"CC_SPIDER", CC_SPIDER},
     {"CC_CYBER", CC_CYBER},
     {"CC_HERO", CC_HERO},
-    // part 9 - intermission tiled backgrounds
-    {"BGFLATE1", "FLOOR4_8"},
+    {"BGFLATE1", "FLOOR4_8"}, /* part 9 - intermission tiled backgrounds */
     {"BGFLATE2", "SFLR6_1"},
     {"BGFLATE3", "MFLR8_4"},
     {"BGFLATE4", "MFLR8_3"},
@@ -333,44 +353,54 @@ static const bex_string_t bex_stringtable[] = {
     {"BGCASTCALL", "BOSSBACK"},
 };
 
-static void *DEH_BEXStrStart(deh_context_t *context, char *line)
-{
-    char s[10];
-
-    if (sscanf(line, "%9s", s) == 0 || strncmp("[STRINGS]", s, sizeof(s)))
-    {
-	DEH_Warning(context, "Parse error on section start");
-    }
-
-    return NULL;
-}
-
-static void DEH_BEXStrParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    int i;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-	DEH_Warning(context, "Failed to parse assignment");
-	return;
-    }
-
-    for (i = 0; i < arrlen(bex_stringtable); i++)
-    {
-	if (!strcmp(bex_stringtable[i].macro, variable_name))
-	{
-	    DEH_AddStringReplacement(bex_stringtable[i].string, value);
-	}
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_bexstr =
 {
-    "[STRINGS]",
-    NULL,
-    DEH_BEXStrStart,
-    DEH_BEXStrParseLine,
-    NULL,
-    NULL,
+  "[STRINGS]",
+  NULL,
+  deh_bex_str_start,
+  deh_bex_str_parse_line,
+  NULL,
+  NULL,
 };
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_bex_str_start(deh_context_t *context, char *line)
+{
+  char s[10];
+
+  if (sscanf(line, "%9s", s) == 0 || strncmp("[STRINGS]", s, sizeof(s)))
+    {
+      deh_warning(context, "Parse error on section start");
+    }
+
+  return NULL;
+}
+
+static void deh_bex_str_parse_line(deh_context_t *context, char *line,
+                                   void *tag)
+{
+  char *variable_name;
+  char *value;
+  int i;
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  for (i = 0; i < arrlen(g_bex_stringtable); i++)
+    {
+      if (!strcmp(g_bex_stringtable[i].macro, variable_name))
+        {
+          deh_add_string_replacement(g_bex_stringtable[i].string, value);
+        }
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_cheat.c b/games/NXDoom/src/doom/deh_cheat.c
index 8e269c04e..f01c08976 100644
--- a/games/NXDoom/src/doom/deh_cheat.c
+++ b/games/NXDoom/src/doom/deh_cheat.c
@@ -1,146 +1,179 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Cheat" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_cheat.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Cheat" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "doomtype.h"
 
+#include "am_map.h"
 #include "deh_defs.h"
 #include "deh_io.h"
 #include "deh_main.h"
-#include "am_map.h"
 #include "st_stuff.h"
 
-typedef struct 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef struct
 {
-    const char *name;
-    cheatseq_t *seq;
+  const char *name;
+  cheatseq_t *seq;
 } deh_cheat_t;
 
-static deh_cheat_t allcheats[] =
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void *deh_cheat_start(deh_context_t *context, char *line);
+static void deh_cheat_parse_line(deh_context_t *context, char *line,
+                                 void *tag);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static deh_cheat_t g_allcheats[] =
 {
-    {"Change music",        &cheat_mus },
-    {"Chainsaw",            &cheat_choppers },
-    {"God mode",            &cheat_god },
-    {"Ammo & Keys",         &cheat_ammo },
-    {"Ammo",                &cheat_ammonokey },
-    {"No Clipping 1",       &cheat_noclip },
-    {"No Clipping 2",       &cheat_commercial_noclip },
-    {"Invincibility",       &cheat_powerup[0] },
-    {"Berserk",             &cheat_powerup[1] },
-    {"Invisibility",        &cheat_powerup[2] },
-    {"Radiation Suit",      &cheat_powerup[3] },
-    {"Auto-map",            &cheat_powerup[4] },
-    {"Lite-Amp Goggles",    &cheat_powerup[5] },
-    {"BEHOLD menu",         &cheat_powerup[6] },
-    {"Level Warp",          &cheat_clev },
-    {"Player Position",     &cheat_mypos },
-    {"Map cheat",           &cheat_amap },
+  {"Change music", &cheat_mus},
+  {"Chainsaw", &cheat_choppers},
+  {"God mode", &cheat_god},
+  {"Ammo & Keys", &cheat_ammo},
+  {"Ammo", &cheat_ammonokey},
+  {"No Clipping 1", &cheat_noclip},
+  {"No Clipping 2", &cheat_commercial_noclip},
+  {"Invincibility", &cheat_powerup[0]},
+  {"Berserk", &cheat_powerup[1]},
+  {"Invisibility", &cheat_powerup[2]},
+  {"Radiation Suit", &cheat_powerup[3]},
+  {"Auto-map", &cheat_powerup[4]},
+  {"Lite-Amp Goggles", &cheat_powerup[5]},
+  {"BEHOLD menu", &cheat_powerup[6]},
+  {"Level Warp", &cheat_clev},
+  {"Player Position", &cheat_mypos},
+  {"Map cheat", &cheat_amap},
 };
 
-static deh_cheat_t *FindCheatByName(char *name)
-{
-    size_t i;
-    
-    for (i=0; i<arrlen(allcheats); ++i)
-    {
-        if (!strcasecmp(allcheats[i].name, name))
-            return &allcheats[i];
-    }
-
-    return NULL;
-}
-
-static void *DEH_CheatStart(deh_context_t *context, char *line)
-{
-    return NULL;
-}
-
-static void DEH_CheatParseLine(deh_context_t *context, char *line, void *tag)
-{
-    deh_cheat_t *cheat;
-    char *variable_name;
-    char *value;
-    unsigned char *unsvalue;
-    unsigned int i;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    unsvalue = (unsigned char *) value;
-
-    cheat = FindCheatByName(variable_name);
-
-    if (cheat == NULL)
-    {
-        DEH_Warning(context, "Unknown cheat '%s'", variable_name);
-        return;
-    }
-
-    // write the value into the cheat sequence
-
-    i = 0;
-
-    while (unsvalue[i] != 0 && unsvalue[i] != 0xff)
-    {
-        // If the cheat length exceeds the Vanilla limit, stop.  This
-        // does not apply if we have the limit turned off.
-
-        if (!deh_allow_long_cheats && i >= cheat->seq->sequence_len)
-        {
-            DEH_Warning(context, "Cheat sequence longer than supported by "
-                                 "Vanilla dehacked");
-            break;
-        }
-
-	if (deh_apply_cheats)
-	{
-	    cheat->seq->sequence[i] = unsvalue[i];
-	}
-        ++i;
-
-        // Absolute limit - don't exceed
-
-        if (i >= MAX_CHEAT_LEN - cheat->seq->parameter_chars)
-        {
-            DEH_Error(context, "Cheat sequence too long!");
-            return;
-        }
-    }
-
-    if (deh_apply_cheats)
-    {
-        cheat->seq->sequence[i] = '\0';
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_cheat =
 {
-    "Cheat",
-    NULL,
-    DEH_CheatStart,
-    DEH_CheatParseLine,
-    NULL,
-    NULL,
+  "Cheat",
+  NULL,
+  deh_cheat_start,
+  deh_cheat_parse_line,
+  NULL,
+  NULL,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static deh_cheat_t *find_cheat_by_name(char *name)
+{
+  size_t i;
+
+  for (i = 0; i < arrlen(g_allcheats); ++i)
+    {
+      if (!strcasecmp(g_allcheats[i].name, name)) return &g_allcheats[i];
+    }
+
+  return NULL;
+}
+
+static void *deh_cheat_start(deh_context_t *context, char *line)
+{
+  return NULL;
+}
+
+static void deh_cheat_parse_line(deh_context_t *context, char *line,
+                                 void *tag)
+{
+  deh_cheat_t *cheat;
+  char *variable_name;
+  char *value;
+  unsigned char *unsvalue;
+  unsigned int i;
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  unsvalue = (unsigned char *)value;
+
+  cheat = find_cheat_by_name(variable_name);
+
+  if (cheat == NULL)
+    {
+      deh_warning(context, "Unknown cheat '%s'", variable_name);
+      return;
+    }
+
+  /* write the value into the cheat sequence */
+
+  i = 0;
+
+  while (unsvalue[i] != 0 && unsvalue[i] != 0xff)
+    {
+      /* If the cheat length exceeds the Vanilla limit, stop.  This
+       * does not apply if we have the limit turned off.
+       */
+
+      if (!deh_allow_long_cheats && i >= cheat->seq->sequence_len)
+        {
+          deh_warning(context, "Cheat sequence longer than supported by "
+                               "Vanilla dehacked");
+          break;
+        }
+
+      if (deh_apply_cheats)
+        {
+          cheat->seq->sequence[i] = unsvalue[i];
+        }
+
+      ++i;
+
+      /* Absolute limit - don't exceed */
+
+      if (i >= MAX_CHEAT_LEN - cheat->seq->parameter_chars)
+        {
+          deh_error(context, "Cheat sequence too long!");
+          return;
+        }
+    }
+
+  if (deh_apply_cheats)
+    {
+      cheat->seq->sequence[i] = '\0';
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_doom.c b/games/NXDoom/src/doom/deh_doom.c
index b7ff04a73..419caffa8 100644
--- a/games/NXDoom/src/doom/deh_doom.c
+++ b/games/NXDoom/src/doom/deh_doom.c
@@ -1,35 +1,45 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Top-level dehacked definitions for Doom dehacked.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_doom.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Top-level dehacked definitions for Doom dehacked.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdlib.h>
 #include "deh_defs.h"
 #include "deh_main.h"
+#include <stdlib.h>
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 const char *deh_signatures[] =
 {
-    "Patch File for DeHackEd v2.3",
-    "Patch File for DeHackEd v3.0",
-    NULL
+  "Patch File for DeHackEd v2.3",
+  "Patch File for DeHackEd v3.0",
+  NULL,
 };
 
-
-//
-// List of section types:
-//
+/* List of section types: */
 
 deh_section_t *deh_section_types[] =
 {
@@ -38,11 +48,18 @@ deh_section_t *deh_section_types[] =
     &deh_section_frame,
     &deh_section_misc,
     &deh_section_pointer,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
     &deh_section_sound,
+#else
+    NULL,
+#endif
     &deh_section_text,
     &deh_section_thing,
     &deh_section_weapon,
     &deh_section_bexstr,
-    NULL
+    NULL,
 };
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/deh_frame.c b/games/NXDoom/src/doom/deh_frame.c
index e1cd59da7..d5ec55216 100644
--- a/games/NXDoom/src/doom/deh_frame.c
+++ b/games/NXDoom/src/doom/deh_frame.c
@@ -1,25 +1,33 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Frame" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_frame.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Frame" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "doomtype.h"
 #include "d_items.h"
+#include "doomtype.h"
 #include "info.h"
 
 #include "deh_defs.h"
@@ -27,135 +35,164 @@
 #include "deh_main.h"
 #include "deh_mapping.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 DEH_BEGIN_MAPPING(state_mapping, state_t)
-  DEH_MAPPING("Sprite number",    sprite)
-  DEH_MAPPING("Sprite subnumber", frame)
-  DEH_MAPPING("Duration",         tics)
-  DEH_MAPPING("Next frame",       nextstate)
-  DEH_MAPPING("Unknown 1",        misc1)
-  DEH_MAPPING("Unknown 2",        misc2)
-  DEH_UNSUPPORTED_MAPPING("Codep frame")
+DEH_MAPPING("Sprite number", sprite)
+DEH_MAPPING("Sprite subnumber", frame)
+DEH_MAPPING("Duration", tics)
+DEH_MAPPING("Next frame", nextstate)
+#if 0
+DEH_MAPPING("Unknown 1", misc1)
+DEH_MAPPING("Unknown 2", misc2)
+#endif
+DEH_UNSUPPORTED_MAPPING("Codep frame")
 DEH_END_MAPPING
 
-static void *DEH_FrameStart(deh_context_t *context, char *line)
-{
-    int frame_number = 0;
-    state_t *state;
-    
-    if (sscanf(line, "Frame %i", &frame_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-    
-    if (frame_number < 0 || frame_number >= NUMSTATES)
-    {
-        DEH_Warning(context, "Invalid frame number: %i", frame_number);
-        return NULL;
-    }
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    if (frame_number >= DEH_VANILLA_NUMSTATES) 
-    {
-        DEH_Warning(context, "Attempt to modify frame %i: this will cause "
-                             "problems in Vanilla dehacked.", frame_number);
-    }
+static void *deh_frame_start(deh_context_t *context, char *line);
+static void deh_frame_overflow(deh_context_t *context, char *varname,
+                              int value);
+static void deh_frame_parse_line(deh_context_t *context, char *line,
+                                 void *tag);
+static void deh_frame_sha1_sum(SHA1_CTX *context);
 
-    state = &states[frame_number];
-
-    return state;
-}
-
-// Simulate a frame overflow: Doom has 967 frames in the states[] array, but
-// DOS dehacked internally only allocates memory for 966.  As a result, 
-// attempts to set frame 966 (the last frame) will overflow the dehacked
-// array and overwrite the weaponinfo[] array instead.
-//
-// This is noticable in Batman Doom where it is impossible to switch weapons
-// away from the fist once selected.
-
-static void DEH_FrameOverflow(deh_context_t *context, char *varname, int value)
-{
-    if (!strcasecmp(varname, "Duration"))
-    {
-        weaponinfo[0].ammo = value;
-    }
-    else if (!strcasecmp(varname, "Codep frame")) 
-    {
-        weaponinfo[0].upstate = value;
-    }
-    else if (!strcasecmp(varname, "Next frame")) 
-    {
-        weaponinfo[0].downstate = value;
-    }
-    else if (!strcasecmp(varname, "Unknown 1"))
-    {
-        weaponinfo[0].readystate = value;
-    }
-    else if (!strcasecmp(varname, "Unknown 2"))
-    {
-        weaponinfo[0].atkstate = value;
-    }
-    else
-    {
-        DEH_Error(context, "Unable to simulate frame overflow: field '%s'",
-                  varname);
-    }
-}
-
-static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
-{
-    state_t *state;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    state = (state_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    if (state == &states[NUMSTATES - 1])
-    {
-        DEH_FrameOverflow(context, variable_name, ivalue);
-    }
-    else
-    {
-        // set the appropriate field
-
-        DEH_SetMapping(context, &state_mapping, state, variable_name, ivalue);
-    }
-}
-
-static void DEH_FrameSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_frame =
 {
-    "Frame",
-    NULL,
-    DEH_FrameStart,
-    DEH_FrameParseLine,
-    NULL,
-    DEH_FrameSHA1Sum,
+  "Frame",
+  NULL,
+  deh_frame_start,
+  deh_frame_parse_line,
+  NULL,
+  deh_frame_sha1_sum,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_frame_start(deh_context_t *context, char *line)
+{
+  int frame_number = 0;
+  state_t *state;
+
+  if (sscanf(line, "Frame %i", &frame_number) != 1)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  if (frame_number < 0 || frame_number >= NUMSTATES)
+    {
+      deh_warning(context, "Invalid frame number: %i", frame_number);
+      return NULL;
+    }
+
+  if (frame_number >= DEH_VANILLA_NUMSTATES)
+    {
+      deh_warning(context,
+                  "Attempt to modify frame %i: this will cause "
+                  "problems in Vanilla dehacked.",
+                  frame_number);
+    }
+
+  state = &states[frame_number];
+
+  return state;
+}
+
+/* Simulate a frame overflow: Doom has 967 frames in the states[] array, but
+ * DOS dehacked internally only allocates memory for 966.  As a result,
+ * attempts to set frame 966 (the last frame) will overflow the dehacked
+ * array and overwrite the weaponinfo[] array instead.
+ *
+ * This is noticeable in Batman Doom where it is impossible to switch weapons
+ * away from the fist once selected.
+ */
+
+static void deh_frame_overflow(deh_context_t *context, char *varname,
+                              int value)
+{
+  if (!strcasecmp(varname, "Duration"))
+    {
+      weaponinfo[0].ammo = value;
+    }
+  else if (!strcasecmp(varname, "Codep frame"))
+    {
+      weaponinfo[0].upstate = value;
+    }
+  else if (!strcasecmp(varname, "Next frame"))
+    {
+      weaponinfo[0].downstate = value;
+    }
+  else if (!strcasecmp(varname, "Unknown 1"))
+    {
+      weaponinfo[0].readystate = value;
+    }
+  else if (!strcasecmp(varname, "Unknown 2"))
+    {
+      weaponinfo[0].atkstate = value;
+    }
+  else
+    {
+      deh_error(context, "Unable to simulate frame overflow: field '%s'",
+                varname);
+    }
+}
+
+static void deh_frame_parse_line(deh_context_t *context, char *line,
+                                 void *tag)
+{
+  state_t *state;
+  char *variable_name;
+  char *value;
+  int ivalue;
+
+  if (tag == NULL) return;
+
+  state = (state_t *)tag;
+
+  /* Parse the assignment */
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  /* all values are integers */
+
+  ivalue = atoi(value);
+
+  if (state == &states[NUMSTATES - 1])
+    {
+      deh_frame_overflow(context, variable_name, ivalue);
+    }
+  else
+    {
+      /* set the appropriate field */
+
+      deh_set_mapping(context, &state_mapping, state, variable_name, ivalue);
+    }
+}
+
+static void deh_frame_sha1_sum(SHA1_CTX *context)
+{
+  int i;
+
+  for (i = 0; i < NUMSTATES; ++i)
+    {
+      deh_struct_sha1_sum(context, &state_mapping, &states[i]);
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_misc.c b/games/NXDoom/src/doom/deh_misc.c
index 9b76a429c..e932ce3df 100644
--- a/games/NXDoom/src/doom/deh_misc.c
+++ b/games/NXDoom/src/doom/deh_misc.c
@@ -1,228 +1,281 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Misc" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_misc.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Misc" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "doomtype.h"
 #include "deh_defs.h"
 #include "deh_io.h"
 #include "deh_main.h"
 #include "deh_misc.h"
+#include "doomtype.h"
 
-// Dehacked: "Initial Health" 
-// This is the initial health a player has when starting anew.
-// See G_PlayerReborn in g_game.c
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct misc_settings
+{
+  const char *deh_name;
+  int *value;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void *deh_misc_start(deh_context_t *context, char *line);
+static void deh_misc_parse_line(deh_context_t *context, char *line,
+                                void *tag);
+static void deh_misc_sha1_sum(SHA1_CTX *context);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Dehacked: "Initial Health"
+ * This is the initial health a player has when starting anew.
+ * See g_player_reborn in g_game.c
+ */
 
 int deh_initial_health = DEH_DEFAULT_INITIAL_HEALTH;
 
-// Dehacked: "Initial bullets"
-// This is the number of bullets the player has when starting anew.
-// See G_PlayerReborn in g_game.c
+/* Dehacked: "Initial bullets"
+ * This is the number of bullets the player has when starting anew.
+ * See g_player_reborn in g_game.c
+ */
 
 int deh_initial_bullets = DEH_DEFAULT_INITIAL_BULLETS;
 
-// Dehacked: "Max Health"
-// This is the maximum health that can be reached using health
-// potions. See P_TouchSpecialThing in p_inter.c
+/* Dehacked: "Max Health"
+ * This is the maximum health that can be reached using health
+ * potions. See p_touch_special_thing in p_inter.c
+ */
 
 int deh_max_health = DEH_DEFAULT_MAX_HEALTH;
 
-// Dehacked: "Max Armor"
-// This is the maximum armor which can be reached by picking up
-// armor helmets. See P_TouchSpecialThing in p_inter.c
+/* Dehacked: "Max Armor"
+ * This is the maximum armor which can be reached by picking up
+ * armor helmets. See p_touch_special_thing in p_inter.c
+ */
 
 int deh_max_armor = DEH_DEFAULT_MAX_ARMOR;
 
-// Dehacked: "Green Armor Class"
-// This is the armor class that is given when picking up the green 
-// armor or an armor helmet. See P_TouchSpecialThing in p_inter.c
-//
-// DOS dehacked only modifies the behavior of the green armor shirt,
-// the armor class set by armor helmets is not affected.
+/* Dehacked: "Green Armor Class"
+ * This is the armor class that is given when picking up the green
+ * armor or an armor helmet. See p_touch_special_thing in p_inter.c
+ *
+ * DOS dehacked only modifies the behavior of the green armor shirt,
+ * the armor class set by armor helmets is not affected.
+ */
 
 int deh_green_armor_class = DEH_DEFAULT_GREEN_ARMOR_CLASS;
 
-// Dehacked: "Blue Armor Class"
-// This is the armor class that is given when picking up the blue 
-// armor or a megasphere. See P_TouchSpecialThing in p_inter.c
-//
-// DOS dehacked only modifies the MegaArmor behavior and not
-// the MegaSphere, which always gives armor type 2.
+/* Dehacked: "Blue Armor Class"
+ * This is the armor class that is given when picking up the blue
+ * armor or a megasphere. See p_touch_special_thing in p_inter.c
+ *
+ * DOS dehacked only modifies the MegaArmor behavior and not
+ * the MegaSphere, which always gives armor type 2.
+ */
 
 int deh_blue_armor_class = DEH_DEFAULT_BLUE_ARMOR_CLASS;
 
-// Dehacked: "Max soulsphere"
-// The maximum health which can be reached by picking up the
-// soulsphere.  See P_TouchSpecialThing in p_inter.c
+/* Dehacked: "Max soulsphere"
+ * The maximum health which can be reached by picking up the
+ * soulsphere.  See p_touch_special_thing in p_inter.c
+ */
 
 int deh_max_soulsphere = DEH_DEFAULT_MAX_SOULSPHERE;
 
-// Dehacked: "Soulsphere health"
-// The amount of health bonus that picking up a soulsphere
-// gives.  See P_TouchSpecialThing in p_inter.c
+/* Dehacked: "Soulsphere health"
+ * The amount of health bonus that picking up a soulsphere
+ * gives.  See p_touch_special_thing in p_inter.c
+ */
 
 int deh_soulsphere_health = DEH_DEFAULT_SOULSPHERE_HEALTH;
 
-// Dehacked: "Megasphere health"
-// This is what the health is set to after picking up a 
-// megasphere.  See P_TouchSpecialThing in p_inter.c
+/* Dehacked: "Megasphere health"
+ * This is what the health is set to after picking up a
+ * megasphere.  See p_touch_special_thing in p_inter.c
+ */
 
 int deh_megasphere_health = DEH_DEFAULT_MEGASPHERE_HEALTH;
 
-// Dehacked: "God mode health"
-// This is what the health value is set to when cheating using
-// the IDDQD god mode cheat.  See ST_Responder in st_stuff.c
+/* Dehacked: "God mode health"
+ * This is what the health value is set to when cheating using
+ * the IDDQD god mode cheat.  See st_responder in st_stuff.c
+ */
 
 int deh_god_mode_health = DEH_DEFAULT_GOD_MODE_HEALTH;
 
-// Dehacked: "IDFA Armor"
-// This is what the armor is set to when using the IDFA cheat.
-// See ST_Responder in st_stuff.c
+/* Dehacked: "IDFA Armor"
+ * This is what the armor is set to when using the IDFA cheat.
+ * See st_responder in st_stuff.c
+ */
 
 int deh_idfa_armor = DEH_DEFAULT_IDFA_ARMOR;
 
-// Dehacked: "IDFA Armor Class"
-// This is what the armor class is set to when using the IDFA cheat.
-// See ST_Responder in st_stuff.c
+/* Dehacked: "IDFA Armor Class"
+ * This is what the armor class is set to when using the IDFA cheat.
+ * See st_responder in st_stuff.c
+ */
 
 int deh_idfa_armor_class = DEH_DEFAULT_IDFA_ARMOR_CLASS;
 
-// Dehacked: "IDKFA Armor"
-// This is what the armor is set to when using the IDKFA cheat.
-// See ST_Responder in st_stuff.c
+/* Dehacked: "IDKFA Armor"
+ * This is what the armor is set to when using the IDKFA cheat.
+ * See st_responder in st_stuff.c
+ */
 
 int deh_idkfa_armor = DEH_DEFAULT_IDKFA_ARMOR;
 
-// Dehacked: "IDKFA Armor Class"
-// This is what the armor class is set to when using the IDKFA cheat.
-// See ST_Responder in st_stuff.c
+/* Dehacked: "IDKFA Armor Class"
+ * This is what the armor class is set to when using the IDKFA cheat.
+ * See st_responder in st_stuff.c
+ */
 
 int deh_idkfa_armor_class = DEH_DEFAULT_IDKFA_ARMOR_CLASS;
 
-// Dehacked: "BFG Cells/Shot"
-// This is the number of CELLs firing the BFG uses up.
-// See P_CheckAmmo and A_FireBFG in p_pspr.c
+/* Dehacked: "BFG Cells/Shot"
+ * This is the number of CELLs firing the BFG uses up.
+ * See p_check_ammo and a_fire_bfg in p_pspr.c
+ */
 
 int deh_bfg_cells_per_shot = DEH_DEFAULT_BFG_CELLS_PER_SHOT;
 
-// Dehacked: "Monsters infight"
-// This controls whether monsters can harm other monsters of the same 
-// species.  For example, whether an imp fireball will damage other
-// imps.  The value of this in dehacked patches is weird - '202' means
-// off, while '221' means on.
-//
-// See PIT_CheckThing in p_map.c
+/* Dehacked: "Monsters infight"
+ * This controls whether monsters can harm other monsters of the same
+ * species.  For example, whether an imp fireball will damage other
+ * imps.  The value of this in dehacked patches is weird - '202' means
+ * off, while '221' means on.
+ *
+ * See pit_check_thing in p_map.c
+ */
 
 int deh_species_infighting = DEH_DEFAULT_SPECIES_INFIGHTING;
 
-static struct
-{
-    const char *deh_name;
-    int *value;
-} misc_settings[] = {
-    {"Initial Health",      &deh_initial_health},
-    {"Initial Bullets",     &deh_initial_bullets},
-    {"Max Health",          &deh_max_health},
-    {"Max Armor",           &deh_max_armor},
-    {"Green Armor Class",   &deh_green_armor_class},
-    {"Blue Armor Class",    &deh_blue_armor_class},
-    {"Max Soulsphere",      &deh_max_soulsphere},
-    {"Soulsphere Health",   &deh_soulsphere_health},
-    {"Megasphere Health",   &deh_megasphere_health},
-    {"God Mode Health",     &deh_god_mode_health},
-    {"IDFA Armor",          &deh_idfa_armor},
-    {"IDFA Armor Class",    &deh_idfa_armor_class},
-    {"IDKFA Armor",         &deh_idkfa_armor},
-    {"IDKFA Armor Class",   &deh_idkfa_armor_class},
-    {"BFG Cells/Shot",      &deh_bfg_cells_per_shot},
-};
-
-static void *DEH_MiscStart(deh_context_t *context, char *line)
-{
-    return NULL;
-}
-
-static void DEH_MiscParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    int ivalue;
-    size_t i;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    if (!strcasecmp(variable_name, "Monsters Infight"))
-    {
-        // See notes above.
- 
-        if (ivalue == 202)
-        {
-            deh_species_infighting = 0;
-        }
-        else if (ivalue == 221)
-        {
-            deh_species_infighting = 1;
-        }
-        else
-        {
-            DEH_Warning(context, 
-                        "Invalid value for 'Monsters Infight': %i", ivalue);
-        }
-        
-        return;
-    }
-
-    for (i=0; i<arrlen(misc_settings); ++i)
-    {
-        if (!strcasecmp(variable_name, misc_settings[i].deh_name))
-        {
-            *misc_settings[i].value = ivalue;
-            return;
-        }
-    }
-
-    DEH_Warning(context, "Unknown Misc variable '%s'", variable_name);
-}
-
-static void DEH_MiscSHA1Sum(sha1_context_t *context)
-{
-    unsigned int i;
-
-    for (i=0; i<arrlen(misc_settings); ++i)
-    {
-        SHA1_UpdateInt32(context, *misc_settings[i].value);
-    }
-}
-
 deh_section_t deh_section_misc =
 {
-    "Misc",
-    NULL,
-    DEH_MiscStart,
-    DEH_MiscParseLine,
-    NULL,
-    DEH_MiscSHA1Sum,
+  "Misc",
+  NULL,
+  deh_misc_start,
+  deh_misc_parse_line,
+  NULL,
+  deh_misc_sha1_sum,
 };
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct misc_settings misc_settings[] =
+{
+  {"Initial Health", &deh_initial_health},
+  {"Initial Bullets", &deh_initial_bullets},
+  {"Max Health", &deh_max_health},
+  {"Max Armor", &deh_max_armor},
+  {"Green Armor Class", &deh_green_armor_class},
+  {"Blue Armor Class", &deh_blue_armor_class},
+  {"Max Soulsphere", &deh_max_soulsphere},
+  {"Soulsphere Health", &deh_soulsphere_health},
+  {"Megasphere Health", &deh_megasphere_health},
+  {"God Mode Health", &deh_god_mode_health},
+  {"IDFA Armor", &deh_idfa_armor},
+  {"IDFA Armor Class", &deh_idfa_armor_class},
+  {"IDKFA Armor", &deh_idkfa_armor},
+  {"IDKFA Armor Class", &deh_idkfa_armor_class},
+  {"BFG Cells/Shot", &deh_bfg_cells_per_shot},
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_misc_start(deh_context_t *context, char *line)
+{
+  return NULL;
+}
+
+static void deh_misc_parse_line(deh_context_t *context, char *line,
+        void *tag)
+{
+  char *variable_name;
+  char *value;
+  int ivalue;
+  size_t i;
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  ivalue = atoi(value);
+
+  if (!strcasecmp(variable_name, "Monsters Infight"))
+    {
+      /* See notes above. */
+
+      if (ivalue == 202)
+        {
+          deh_species_infighting = 0;
+        }
+      else if (ivalue == 221)
+        {
+          deh_species_infighting = 1;
+        }
+      else
+        {
+          deh_warning(context, "Invalid value for 'Monsters Infight': %i",
+                      ivalue);
+        }
+
+      return;
+    }
+
+  for (i = 0; i < arrlen(misc_settings); ++i)
+    {
+      if (!strcasecmp(variable_name, misc_settings[i].deh_name))
+        {
+          *misc_settings[i].value = ivalue;
+          return;
+        }
+    }
+
+  deh_warning(context, "Unknown Misc variable '%s'", variable_name);
+}
+
+static void deh_misc_sha1_sum(SHA1_CTX *context)
+{
+  unsigned int i;
+
+  for (i = 0; i < arrlen(misc_settings); ++i)
+    {
+      sha1_updateint32(context, *misc_settings[i].value);
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_misc.h b/games/NXDoom/src/doom/deh_misc.h
index f29428f55..a55eb6452 100644
--- a/games/NXDoom/src/doom/deh_misc.h
+++ b/games/NXDoom/src/doom/deh_misc.h
@@ -1,23 +1,31 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Misc" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_misc.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Misc" sections in dehacked files
+ *
+ ****************************************************************************/
 
 #ifndef DEH_MISC_H
 #define DEH_MISC_H
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define DEH_DEFAULT_INITIAL_HEALTH 100
 #define DEH_DEFAULT_INITIAL_BULLETS 50
 #define DEH_DEFAULT_MAX_HEALTH 200
@@ -35,6 +43,10 @@
 #define DEH_DEFAULT_BFG_CELLS_PER_SHOT 40
 #define DEH_DEFAULT_SPECIES_INFIGHTING 0
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern int deh_initial_health;
 extern int deh_initial_bullets;
 extern int deh_max_health;
@@ -54,26 +66,25 @@ extern int deh_species_infighting;
 
 #if 0
 
-// To compile without dehacked, it's possible to use these:
+/* To compile without dehacked, it's possible to use these: */
 
-#define deh_initial_health      DEH_DEFAULT_INITIAL_HEALTH
-#define deh_initial_bullets     DEH_DEFAULT_INITIAL_BULLETS
-#define deh_max_health          DEH_DEFAULT_MAX_HEALTH
-#define deh_max_armor           DEH_DEFAULT_MAX_ARMOR
-#define deh_green_armor_class   DEH_DEFAULT_GREEN_ARMOR_CLASS
-#define deh_blue_armor_class    DEH_DEFAULT_BLUE_ARMOR_CLASS
-#define deh_max_soulsphere      DEH_DEFAULT_MAX_SOULSPHERE
-#define deh_soulsphere_health   DEH_DEFAULT_SOULSPHERE_HEALTH
-#define deh_megasphere_health   DEH_DEFAULT_MEGASPHERE_HEALTH
-#define deh_god_mode_health     DEH_DEFAULT_GOD_MODE_HEALTH
-#define deh_idfa_armor          DEH_DEFAULT_IDFA_ARMOR
-#define deh_idfa_armor_class    DEH_DEFAULT_IDFA_ARMOR_CLASS
-#define deh_idkfa_armor         DEH_DEFAULT_IDKFA_ARMOR
-#define deh_idkfa_armor_class   DEH_DEFAULT_IDKFA_ARMOR_CLASS
-#define deh_bfg_cells_per_shot  DEH_DEFAULT_BFG_CELLS_PER_SHOT
-#define deh_species_infighting  DEH_DEFAULT_SPECIES_INFIGHTING
+#define deh_initial_health DEH_DEFAULT_INITIAL_HEALTH
+#define deh_initial_bullets DEH_DEFAULT_INITIAL_BULLETS
+#define deh_max_health DEH_DEFAULT_MAX_HEALTH
+#define deh_max_armor DEH_DEFAULT_MAX_ARMOR
+#define deh_green_armor_class DEH_DEFAULT_GREEN_ARMOR_CLASS
+#define deh_blue_armor_class DEH_DEFAULT_BLUE_ARMOR_CLASS
+#define deh_max_soulsphere DEH_DEFAULT_MAX_SOULSPHERE
+#define deh_soulsphere_health DEH_DEFAULT_SOULSPHERE_HEALTH
+#define deh_megasphere_health DEH_DEFAULT_MEGASPHERE_HEALTH
+#define deh_god_mode_health DEH_DEFAULT_GOD_MODE_HEALTH
+#define deh_idfa_armor DEH_DEFAULT_IDFA_ARMOR
+#define deh_idfa_armor_class DEH_DEFAULT_IDFA_ARMOR_CLASS
+#define deh_idkfa_armor DEH_DEFAULT_IDKFA_ARMOR
+#define deh_idkfa_armor_class DEH_DEFAULT_IDKFA_ARMOR_CLASS
+#define deh_bfg_cells_per_shot DEH_DEFAULT_BFG_CELLS_PER_SHOT
+#define deh_species_infighting DEH_DEFAULT_SPECIES_INFIGHTING
 
 #endif
 
-#endif /* #ifndef DEH_MISC_H */
-
+#endif /* DEH_MISC_H */
diff --git a/games/NXDoom/src/doom/deh_ptr.c b/games/NXDoom/src/doom/deh_ptr.c
index 5ca3116f2..78c14c75e 100644
--- a/games/NXDoom/src/doom/deh_ptr.c
+++ b/games/NXDoom/src/doom/deh_ptr.c
@@ -1,19 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses Action Pointer entries in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_ptr.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses Action Pointer entries in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,117 +34,139 @@
 #include "deh_io.h"
 #include "deh_main.h"
 
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void deh_pointer_init(void);
+static void *deh_pointer_start(deh_context_t *context, char *line);
+static void deh_pointer_parse_line(deh_context_t *context, char *line,
+                                 void *tag);
+static void deh_pointer_sha1_sum(SHA1_CTX *context);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static actionf_t codeptrs[NUMSTATES];
 
-static int CodePointerIndex(actionf_t *ptr)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        if (!memcmp(&codeptrs[i], ptr, sizeof(actionf_t)))
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-static void DEH_PointerInit(void)
-{
-    int i;
-    
-    // Initialize list of dehacked pointers
-
-    for (i=0; i<NUMSTATES; ++i)
-        codeptrs[i] = states[i].action;
-}
-
-static void *DEH_PointerStart(deh_context_t *context, char *line)
-{
-    int frame_number = 0;
-    
-    // FIXME: can the third argument here be something other than "Frame"
-    // or are we ok?
-
-    if (sscanf(line, "Pointer %*i (%*s %i)", &frame_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (frame_number < 0 || frame_number >= NUMSTATES)
-    {
-        DEH_Warning(context, "Invalid frame number: %i", frame_number);
-        return NULL;
-    }
-
-    return &states[frame_number];
-}
-
-static void DEH_PointerParseLine(deh_context_t *context, char *line, void *tag)
-{
-    state_t *state;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    state = (state_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-//    printf("Set %s to %s for state\n", variable_name, value);
-
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    // set the appropriate field
-
-    if (!strcasecmp(variable_name, "Codep frame"))
-    {
-        if (ivalue < 0 || ivalue >= NUMSTATES)
-        {
-            DEH_Warning(context, "Invalid state '%i'", ivalue);
-        }
-        else
-        {        
-            state->action = codeptrs[ivalue];
-        }
-    }
-    else
-    {
-        DEH_Warning(context, "Unknown variable name '%s'", variable_name);
-    }
-}
-
-static void DEH_PointerSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        SHA1_UpdateInt32(context, CodePointerIndex(&states[i].action));
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_pointer =
 {
-    "Pointer",
-    DEH_PointerInit,
-    DEH_PointerStart,
-    DEH_PointerParseLine,
-    NULL,
-    DEH_PointerSHA1Sum,
+  "Pointer",
+  deh_pointer_init,
+  deh_pointer_start,
+  deh_pointer_parse_line,
+  NULL,
+  deh_pointer_sha1_sum,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int code_pointer_index(actionf_t *ptr)
+{
+  int i;
+
+  for (i = 0; i < NUMSTATES; ++i)
+    {
+      if (!memcmp(&codeptrs[i], ptr, sizeof(actionf_t)))
+        {
+          return i;
+        }
+    }
+
+  return -1;
+}
+
+static void deh_pointer_init(void)
+{
+  int i;
+
+  /* Initialize list of dehacked pointers */
+
+  for (i = 0; i < NUMSTATES; ++i)
+    codeptrs[i] = states[i].action;
+}
+
+static void *deh_pointer_start(deh_context_t *context, char *line)
+{
+  int frame_number = 0;
+
+  /* FIXME: can the third argument here be something other than "Frame"
+   * or are we ok?
+   */
+
+  if (sscanf(line, "Pointer %*i (%*s %i)", &frame_number) != 1)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  if (frame_number < 0 || frame_number >= NUMSTATES)
+    {
+      deh_warning(context, "Invalid frame number: %i", frame_number);
+      return NULL;
+    }
+
+  return &states[frame_number];
+}
+
+static void deh_pointer_parse_line(deh_context_t *context, char *line,
+                                 void *tag)
+{
+  state_t *state;
+  char *variable_name;
+  char *value;
+  int ivalue;
+
+  if (tag == NULL) return;
+
+  state = (state_t *)tag;
+
+  /* Parse the assignment */
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  /* all values are integers */
+
+  ivalue = atoi(value);
+
+  /* set the appropriate field */
+
+  if (!strcasecmp(variable_name, "Codep frame"))
+    {
+      if (ivalue < 0 || ivalue >= NUMSTATES)
+        {
+          deh_warning(context, "Invalid state '%i'", ivalue);
+        }
+      else
+        {
+          state->action = codeptrs[ivalue];
+        }
+    }
+  else
+    {
+      deh_warning(context, "Unknown variable name '%s'", variable_name);
+    }
+}
+
+static void deh_pointer_sha1_sum(SHA1_CTX *context)
+{
+  int i;
+
+  for (i = 0; i < NUMSTATES; ++i)
+    {
+      sha1_updateint32(context, code_pointer_index(&states[i].action));
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_sound.c b/games/NXDoom/src/doom/deh_sound.c
index 8d178c785..e3a8d12c7 100644
--- a/games/NXDoom/src/doom/deh_sound.c
+++ b/games/NXDoom/src/doom/deh_sound.c
@@ -1,102 +1,133 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Sound" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_sound.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Sound" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "doomtype.h"
 #include "deh_defs.h"
 #include "deh_main.h"
 #include "deh_mapping.h"
+#include "doomtype.h"
 #include "sounds.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t)
-    DEH_UNSUPPORTED_MAPPING("Offset")
-    DEH_UNSUPPORTED_MAPPING("Zero/One")
-    DEH_MAPPING("Value", priority)
-    DEH_MAPPING("Zero 1", link)
-    DEH_MAPPING("Zero 2", pitch)
-    DEH_MAPPING("Zero 3", volume)
-    DEH_UNSUPPORTED_MAPPING("Zero 4")
-    DEH_MAPPING("Neg. One 1", usefulness)
-    DEH_MAPPING("Neg. One 2", lumpnum)
+DEH_UNSUPPORTED_MAPPING("Offset")
+DEH_UNSUPPORTED_MAPPING("Zero/One")
+DEH_MAPPING("Value", priority)
+DEH_MAPPING("Zero 1", link)
+DEH_MAPPING("Zero 2", pitch)
+DEH_MAPPING("Zero 3", volume)
+DEH_UNSUPPORTED_MAPPING("Zero 4")
+DEH_MAPPING("Neg. One 1", usefulness)
+DEH_MAPPING("Neg. One 2", lumpnum)
 DEH_END_MAPPING
 
-static void *DEH_SoundStart(deh_context_t *context, char *line)
-{
-    int sound_number = 0;
-    
-    if (sscanf(line, "Sound %i", &sound_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    if (sound_number < 0 || sound_number >= NUMSFX)
-    {
-        DEH_Warning(context, "Invalid sound number: %i", sound_number);
-        return NULL;
-    }
+static void *deh_sound_start(deh_context_t *context, char *line);
+static void deh_sound_parse_line(deh_context_t *context, char *line,
+                                 void *tag);
 
-    if (sound_number >= DEH_VANILLA_NUMSFX)
-    {
-        DEH_Warning(context, "Attempt to modify SFX %i.  This will cause "
-                             "problems in Vanilla dehacked.", sound_number); 
-    }
-
-    return &S_sfx[sound_number];
-}
-
-static void DEH_SoundParseLine(deh_context_t *context, char *line, void *tag)
-{
-    sfxinfo_t *sfx;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    sfx = (sfxinfo_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    // Set the field value
-
-    DEH_SetMapping(context, &sound_mapping, sfx, variable_name, ivalue);
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_sound =
 {
-    "Sound",
-    NULL,
-    DEH_SoundStart,
-    DEH_SoundParseLine,
-    NULL,
-    NULL,
+  "Sound",
+  NULL,
+  deh_sound_start,
+  deh_sound_parse_line,
+  NULL,
+  NULL,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_sound_start(deh_context_t *context, char *line)
+{
+  int sound_number = 0;
+
+  if (sscanf(line, "Sound %i", &sound_number) != 1)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  if (sound_number < 0 || sound_number >= SFX_NUMSFX)
+    {
+      deh_warning(context, "Invalid sound number: %i", sound_number);
+      return NULL;
+    }
+
+  if (sound_number >= DEH_VANILLA_NUMSFX)
+    {
+      deh_warning(context,
+                  "Attempt to modify SFX %i.  This will cause "
+                  "problems in Vanilla dehacked.",
+                  sound_number);
+    }
+
+  return &s_sfx[sound_number];
+}
+
+static void deh_sound_parse_line(deh_context_t *context, char *line,
+                                 void *tag)
+{
+  sfxinfo_t *sfx;
+  char *variable_name;
+  char *value;
+  int ivalue;
+
+  if (tag == NULL) return;
+
+  sfx = (sfxinfo_t *)tag;
+
+  /* Parse the assignment */
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  /* all values are integers */
+
+  ivalue = atoi(value);
+
+  /* Set the field value */
+
+  deh_set_mapping(context, &sound_mapping, sfx, variable_name, ivalue);
+}
diff --git a/games/NXDoom/src/doom/deh_thing.c b/games/NXDoom/src/doom/deh_thing.c
index a6baff1d7..964b423b2 100644
--- a/games/NXDoom/src/doom/deh_thing.c
+++ b/games/NXDoom/src/doom/deh_thing.c
@@ -1,19 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Thing" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_thing.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Thing" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,106 +34,128 @@
 
 #include "info.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
-  DEH_MAPPING("ID #",                doomednum)
-  DEH_MAPPING("Initial frame",       spawnstate)
-  DEH_MAPPING("Hit points",          spawnhealth)
-  DEH_MAPPING("First moving frame",  seestate)
-  DEH_MAPPING("Alert sound",         seesound)
-  DEH_MAPPING("Reaction time",       reactiontime)
-  DEH_MAPPING("Attack sound",        attacksound)
-  DEH_MAPPING("Injury frame",        painstate)
-  DEH_MAPPING("Pain chance",         painchance)
-  DEH_MAPPING("Pain sound",          painsound)
-  DEH_MAPPING("Close attack frame",  meleestate)
-  DEH_MAPPING("Far attack frame",    missilestate)
-  DEH_MAPPING("Death frame",         deathstate)
-  DEH_MAPPING("Exploding frame",     xdeathstate)
-  DEH_MAPPING("Death sound",         deathsound)
-  DEH_MAPPING("Speed",               speed)
-  DEH_MAPPING("Width",               radius)
-  DEH_MAPPING("Height",              height)
-  DEH_MAPPING("Mass",                mass)
-  DEH_MAPPING("Missile damage",      damage)
-  DEH_MAPPING("Action sound",        activesound)
-  DEH_MAPPING("Bits",                flags)
-  DEH_MAPPING("Respawn frame",       raisestate)
+DEH_MAPPING("Bits", flags)
+DEH_MAPPING("Width", radius)
+DEH_MAPPING("Height", height)
+DEH_MAPPING("Mass", mass)
+DEH_MAPPING("Speed", speed)
+DEH_MAPPING("ID #", doomednum)
+DEH_MAPPING("Hit points", spawnhealth)
+DEH_MAPPING("Initial frame", spawnstate)
+DEH_MAPPING("First moving frame", seestate)
+DEH_MAPPING("Injury frame", painstate)
+DEH_MAPPING("Pain chance", painchance)
+DEH_MAPPING("Close attack frame", meleestate)
+DEH_MAPPING("Far attack frame", missilestate)
+DEH_MAPPING("Death frame", deathstate)
+DEH_MAPPING("Exploding frame", xdeathstate)
+DEH_MAPPING("Respawn frame", raisestate)
+DEH_MAPPING("Missile damage", damage)
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+DEH_MAPPING("Reaction time", reactiontime)
+DEH_MAPPING("Alert sound", seesound)
+DEH_MAPPING("Attack sound", attacksound)
+DEH_MAPPING("Pain sound", painsound)
+DEH_MAPPING("Death sound", deathsound)
+DEH_MAPPING("Action sound", activesound)
+#endif
 DEH_END_MAPPING
 
-static void *DEH_ThingStart(deh_context_t *context, char *line)
-{
-    int thing_number = 0;
-    mobjinfo_t *mobj;
-    
-    if (sscanf(line, "Thing %i", &thing_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    // dehacked files are indexed from 1
-    --thing_number;
+static void *deh_thing_start(deh_context_t *context, char *line);
+static void deh_thing_parse_line(deh_context_t *context, char *line,
+                                 void *tag);
+static void deh_thing_sha1_sum(SHA1_CTX *context);
 
-    if (thing_number < 0 || thing_number >= NUMMOBJTYPES)
-    {
-        DEH_Warning(context, "Invalid thing number: %i", thing_number);
-        return NULL;
-    }
-    
-    mobj = &mobjinfo[thing_number];
-    
-    return mobj;
-}
-
-static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
-{
-    mobjinfo_t *mobj;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    mobj = (mobjinfo_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-//    printf("Set %s to %s for mobj\n", variable_name, value);
-
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    // Set the field value
-
-    DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
-}
-
-static void DEH_ThingSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMMOBJTYPES; ++i)
-    {
-        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_thing =
 {
-    "Thing",
-    NULL,
-    DEH_ThingStart,
-    DEH_ThingParseLine,
-    NULL,
-    DEH_ThingSHA1Sum,
+  "Thing",
+  NULL,
+  deh_thing_start,
+  deh_thing_parse_line,
+  NULL,
+  deh_thing_sha1_sum,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_thing_start(deh_context_t *context, char *line)
+{
+  int thing_number = 0;
+  mobjinfo_t *mobj;
+
+  if (sscanf(line, "Thing %i", &thing_number) != 1)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  /* dehacked files are indexed from 1 */
+
+  --thing_number;
+
+  if (thing_number < 0 || thing_number >= NUMMOBJTYPES)
+    {
+      deh_warning(context, "Invalid thing number: %i", thing_number);
+      return NULL;
+    }
+
+  mobj = &mobjinfo[thing_number];
+
+  return mobj;
+}
+
+static void deh_thing_parse_line(deh_context_t *context, char *line,
+                                 void *tag)
+{
+  mobjinfo_t *mobj;
+  char *variable_name;
+  char *value;
+  int ivalue;
+
+  if (tag == NULL) return;
+
+  mobj = (mobjinfo_t *)tag;
+
+  /* Parse the assignment */
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  /* all values are integers */
+
+  ivalue = atoi(value);
+
+  /* Set the field value */
+
+  deh_set_mapping(context, &thing_mapping, mobj, variable_name, ivalue);
+}
+
+static void deh_thing_sha1_sum(SHA1_CTX *context)
+{
+  int i;
+
+  for (i = 0; i < NUMMOBJTYPES; ++i)
+    {
+      deh_struct_sha1_sum(context, &thing_mapping, &mobjinfo[i]);
+    }
+}
diff --git a/games/NXDoom/src/doom/deh_weapon.c b/games/NXDoom/src/doom/deh_weapon.c
index 2c1804758..7c2ea08c3 100644
--- a/games/NXDoom/src/doom/deh_weapon.c
+++ b/games/NXDoom/src/doom/deh_weapon.c
@@ -1,19 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Weapon" sections in dehacked files
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/deh_weapon.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Parses "Weapon" sections in dehacked files
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,75 +35,97 @@
 #include "deh_main.h"
 #include "deh_mapping.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
-  DEH_MAPPING("Ammo type",        ammo)
-  DEH_MAPPING("Deselect frame",   upstate)
-  DEH_MAPPING("Select frame",     downstate)
-  DEH_MAPPING("Bobbing frame",    readystate)
-  DEH_MAPPING("Shooting frame",   atkstate)
-  DEH_MAPPING("Firing frame",     flashstate)
+DEH_MAPPING("Ammo type", ammo)
+DEH_MAPPING("Deselect frame", upstate)
+DEH_MAPPING("Select frame", downstate)
+DEH_MAPPING("Bobbing frame", readystate)
+DEH_MAPPING("Shooting frame", atkstate)
+DEH_MAPPING("Firing frame", flashstate)
 DEH_END_MAPPING
 
-static void *DEH_WeaponStart(deh_context_t *context, char *line)
-{
-    int weapon_number = 0;
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
+static void *deh_weapon_start(deh_context_t *context, char *line);
+static void deh_weapon_parse_line(deh_context_t *context, char *line,
+                                  void *tag);
+static void deh_weapon_sha1_sum(SHA1_CTX *context);
 
-    if (weapon_number < 0 || weapon_number >= NUMWEAPONS)
-    {
-        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
-        return NULL;
-    }
-    
-    return &weaponinfo[weapon_number];
-}
-
-static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    weaponinfo_t *weapon;
-    int ivalue;
-    
-    if (tag == NULL)
-        return;
-
-    weapon = (weaponinfo_t *) tag;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
-}
-
-static void DEH_WeaponSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMWEAPONS ;++i)
-    {
-        DEH_StructSHA1Sum(context, &weapon_mapping, &weaponinfo[i]);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 deh_section_t deh_section_weapon =
 {
-    "Weapon",
-    NULL,
-    DEH_WeaponStart,
-    DEH_WeaponParseLine,
-    NULL,
-    DEH_WeaponSHA1Sum,
+  "Weapon",
+  NULL,
+  deh_weapon_start,
+  deh_weapon_parse_line,
+  NULL,
+  deh_weapon_sha1_sum,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void *deh_weapon_start(deh_context_t *context, char *line)
+{
+  int weapon_number = 0;
+
+  if (sscanf(line, "Weapon %i", &weapon_number) != 1)
+    {
+      deh_warning(context, "Parse error on section start");
+      return NULL;
+    }
+
+  if (weapon_number < 0 || weapon_number >= NUMWEAPONS)
+    {
+      deh_warning(context, "Invalid weapon number: %i", weapon_number);
+      return NULL;
+    }
+
+  return &weaponinfo[weapon_number];
+}
+
+static void deh_weapon_parse_line(deh_context_t *context, char *line,
+                                  void *tag)
+{
+  char *variable_name;
+  char *value;
+  weaponinfo_t *weapon;
+  int ivalue;
+
+  if (tag == NULL) return;
+
+  weapon = (weaponinfo_t *)tag;
+
+  if (!deh_parse_assignment(line, &variable_name, &value))
+    {
+      /* Failed to parse */
+
+      deh_warning(context, "Failed to parse assignment");
+      return;
+    }
+
+  ivalue = atoi(value);
+
+  deh_set_mapping(context, &weapon_mapping, weapon, variable_name, ivalue);
+}
+
+static void deh_weapon_sha1_sum(SHA1_CTX *context)
+{
+  int i;
+
+  for (i = 0; i < NUMWEAPONS; ++i)
+    {
+      deh_struct_sha1_sum(context, &weapon_mapping, &weaponinfo[i]);
+    }
+}
+
diff --git a/games/NXDoom/src/doom/doom_icon.c b/games/NXDoom/src/doom/doom_icon.c
deleted file mode 100644
index 4fb45212e..000000000
--- a/games/NXDoom/src/doom/doom_icon.c
+++ /dev/null
@@ -1,2736 +0,0 @@
-static int doom_icon_w = 128;
-static int doom_icon_h = 128;
-
-static const unsigned int doom_icon_data[] = {
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
-    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
-    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
-    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
-    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
-    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
-    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
-    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
-    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
-    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
-    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
-    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
-    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
-    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
-    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
-    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
-    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
-    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
-    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
-    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
-    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
-    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
-    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
-    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
-    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
-    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
-    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
-    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
-    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
-    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
-    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
-    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
-    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
-    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
-    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
-    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
-    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
-    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
-    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
-    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
-    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
-    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
-    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
-    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
-    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
-    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x93756aff, 0x917569ff, 0xa8836eff, 0xb68b70ff, 
-    0xb68b70ff, 0xb68b70ff, 0xb68b70ff, 0xb68b70ff, 0xb68b70ff, 0xbc967eff, 
-    0xc7ad9dff, 0xc6ac9cff, 0xc6ac9cff, 0xc5ab9bff, 0xc5ab9bff, 0xc4a99aff, 
-    0xc3a899ff, 0xc3a899ff, 0xc2a798ff, 0xba9581ff, 0xb58870ff, 0xb58870ff, 
-    0xb58770ff, 0xb58670ff, 0xb4856fff, 0xb2836dff, 0xb0816bff, 0xae7e69ff, 
-    0xad7f6aff, 0xb29183ff, 0xb29589ff, 0xb19387ff, 0xb09286ff, 0xad8f83ff, 
-    0xab8d81ff, 0xaa8c80ff, 0xa88a7eff, 0xa6877cff, 0xa28175ff, 0x986553ff, 
-    0x966351ff, 0x956150ff, 0x935f4eff, 0x915d4cff, 0x8f5a4aff, 0x8e5949ff, 
-    0x8c5647ff, 0x895445ff, 0x8d6154ff, 0x917169ff, 0x8f6f66ff, 0x8e6d65ff, 
-    0x8c6b63ff, 0x8a6961ff, 0x896860ff, 0x87655eff, 0x85635cff, 0x84625bff, 
-    0x7a473dff, 0x743b30ff, 0x72382fff, 0x753c34ff, 0x773f3aff, 0x7a4040ff, 
-    0x7c4345ff, 0x724549ff, 0x5f454bff, 0x674e55ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
-    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
-    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
-    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
-    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
-    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
-    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
-    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
-    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
-    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
-    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
-    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
-    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
-    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
-    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
-    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
-    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
-    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
-    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
-    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
-    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfac394ff, 0xfac79bff, 
-    0xf8c49aff, 0xf8c49aff, 0xf7c299ff, 0xf7c199ff, 0xf6c098ff, 0xf6bf98ff, 
-    0xf5bd97ff, 0xf6b68bff, 0xfda770ff, 0xfda670ff, 0xfca570ff, 0xfca470ff, 
-    0xfca370ff, 0xfca270ff, 0xfca070ff, 0xfc9f70ff, 0xfc9e70ff, 0xf4a783ff, 
-    0xedae91ff, 0xecac90ff, 0xecac90ff, 0xeba98fff, 0xe9a78dff, 0xe8a58cff, 
-    0xe6a38aff, 0xe5a189ff, 0xe39e87ff, 0xef8c6bff, 0xef8666ff, 0xed8364ff, 
-    0xec8163ff, 0xe97e61ff, 0xe87c60ff, 0xe6785eff, 0xe5775dff, 0xe3735aff, 
-    0xdf755fff, 0xd28474ff, 0xce8274ff, 0xcd8072ff, 0xcb7d71ff, 0xca7b6fff, 
-    0xc8796eff, 0xc6776cff, 0xc5756bff, 0xc37269ff, 0xc8655aff, 0xcf5348ff, 
-    0xcd5046ff, 0xcb4e45ff, 0xc94b42ff, 0xc84941ff, 0xc6453fff, 0xc4443eff, 
-    0xc2403cff, 0xc13e3bff, 0xb4504eff, 0xaf5656ff, 0xad5454ff, 0xad5658ff, 
-    0xae565bff, 0xad575dff, 0xaf5961ff, 0xaf5a64ff, 0xb05a67ff, 0xae5b69ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfc8929ff, 0xfe892aff, 0xfe882aff, 0xfe862aff, 0xfd842aff, 0xfd822aff, 
-    0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 
-    0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 
-    0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
-    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
-    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
-    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
-    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23c27ff, 0xf13a27ff, 
-    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
-    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
-    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
-    0xe6242bff, 0xe3242bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfb8729ff, 0xfe882aff, 0xfe862aff, 0xfd842aff, 
-    0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 
-    0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 
-    0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
-    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
-    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
-    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
-    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
-    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
-    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
-    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
-    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe2242bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfb8629ff, 0xfe862aff, 
-    0xfd842aff, 0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 
-    0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 
-    0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 
-    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
-    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
-    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
-    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
-    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
-    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
-    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
-    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe1232cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfb8429ff, 0xfd842aff, 0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 0xfc7d29ff, 
-    0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 
-    0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 
-    0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
-    0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
-    0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
-    0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
-    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
-    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
-    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
-    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
-    0xe3232dff, 0xe0232dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfa8229ff, 0xfd822aff, 0xfd8129ff, 0xfd7f29ff, 
-    0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 
-    0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 
-    0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
-    0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
-    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
-    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
-    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
-    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
-    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
-    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
-    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xdf232dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfa8029ff, 0xfd8129ff, 
-    0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 
-    0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 
-    0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 
-    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 
-    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
-    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
-    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
-    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
-    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
-    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
-    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xde232eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfa7f28ff, 0xfd7f29ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 0xfb7829ff, 
-    0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 
-    0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
-    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
-    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
-    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
-    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
-    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
-    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
-    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
-    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
-    0xe0232fff, 0xdd222fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfa7e28ff, 0xfc7d29ff, 0xfc7b29ff, 0xfc7a29ff, 
-    0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 
-    0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
-    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
-    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
-    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
-    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
-    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
-    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
-    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
-    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
-    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xdc222fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf97c28ff, 0xfc7b29ff, 
-    0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 
-    0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 
-    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
-    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
-    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
-    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
-    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
-    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
-    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
-    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
-    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdb2230ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf97a28ff, 0xfc7a29ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 0xfb7329ff, 
-    0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 
-    0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
-    0xf45f2cff, 0xb3a38eff, 0x80d8d8ff, 0x73e2eaff, 0x72e1eaff, 0x71dfe9ff, 
-    0x70dde8ff, 0x70dce7ff, 0x6fdae6ff, 0x6ed8e6ff, 0x6dd7e5ff, 0x6cd5e4ff, 
-    0x6cd4e3ff, 0x6bd2e2ff, 0x6bd0e1ff, 0x6acfe0ff, 0x69cde0ff, 0x69cbdfff, 
-    0x68cadeff, 0x69c6daff, 0x76b6c8ff, 0x8f9ba5ff, 0xbd6b6aff, 0xeb392dff, 
-    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
-    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
-    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
-    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
-    0xdd2231ff, 0xda2231ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf97928ff, 0xfb7829ff, 0xfb7629ff, 0xfb7529ff, 
-    0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 
-    0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
-    0xf75e28ff, 0xf75c28ff, 0xa7b1a1ff, 0x6aeef8ff, 0x6aecf8ff, 0x69ebf7ff, 
-    0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 0x66e4f3ff, 0x65e2f3ff, 0x64e1f2ff, 
-    0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 
-    0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 
-    0x5acce7ff, 0x6ab9d0ff, 0xb8686cff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
-    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
-    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
-    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
-    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xd82131ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf87728ff, 0xfb7629ff, 
-    0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 
-    0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 
-    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf06232ff, 0x6bedf6ff, 0x6aecf8ff, 
-    0x69ebf7ff, 0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 0x66e4f3ff, 0x65e2f3ff, 
-    0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 
-    0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 
-    0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x91889aff, 
-    0xeb2f2aff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
-    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
-    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
-    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd72132ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf87528ff, 0xfb7529ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 0xfa6e29ff, 
-    0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
-    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xe36d44ff, 
-    0x6aecf8ff, 0x69ebf7ff, 0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 0x66e4f3ff, 
-    0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 
-    0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 
-    0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 
-    0x57c5e3ff, 0x56c3e3ff, 0x8a829fff, 0xed2827ff, 0xee2726ff, 0xed2626ff, 
-    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
-    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
-    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
-    0xd92133ff, 0xd62133ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf87428ff, 0xfb7329ff, 0xfa7129ff, 0xfa6f29ff, 
-    0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
-    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
-    0xf65928ff, 0xf5582aff, 0x78dae0ff, 0x68e9f6ff, 0x67e7f5ff, 0x67e6f4ff, 
-    0x66e4f3ff, 0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 0x62dcefff, 
-    0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 
-    0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 
-    0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0xa75a77ff, 
-    0xec2627ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
-    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
-    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
-    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd52033ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf87228ff, 0xfa7129ff, 
-    0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 
-    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
-    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xce7e61ff, 0x69e4f2ff, 
-    0x67e6f4ff, 0x66e4f3ff, 0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 0x63def0ff, 
-    0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 
-    0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 
-    0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 
-    0x53bee0ff, 0x62abceff, 0xd32540ff, 0xea2529ff, 0xea2528ff, 0xe92529ff, 
-    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
-    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
-    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd42034ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf77028ff, 0xfa6f29ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 0xf96829ff, 
-    0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
-    0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
-    0xf55228ff, 0xc5826cff, 0x68e1f0ff, 0x65e2f3ff, 0x64e1f2ff, 0x63dff1ff, 
-    0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 
-    0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 
-    0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 
-    0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0xa15579ff, 0xd51f3cff, 
-    0xe8252aff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
-    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
-    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
-    0xd62035ff, 0xd32035ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf76e28ff, 0xfa6e29ff, 0xf96c29ff, 0xf96a29ff, 
-    0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
-    0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
-    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xc57e6bff, 0x65e0f0ff, 
-    0x63dff1ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 0x5fd7edff, 
-    0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 
-    0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 
-    0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 
-    0x7b82a8ff, 0xcc1e45ff, 0xd31f3dff, 0xe6242bff, 0xe6242bff, 0xe5242cff, 
-    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
-    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
-    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd22035ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf76d28ff, 0xf96c29ff, 
-    0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 
-    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 
-    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
-    0xf44b27ff, 0x6ad8e7ff, 0x63def0ff, 0x62dcefff, 0x61daeeff, 0x60d9edff, 
-    0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 
-    0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 
-    0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 
-    0x51badeff, 0x50b8ddff, 0x649cc2ff, 0xcb1e45ff, 0xca1d44ff, 0xd21f3dff, 
-    0xe4242dff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
-    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
-    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd11f36ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf66b28ff, 0xf96a29ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 0xf86328ff, 
-    0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
-    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
-    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0x6ad7e6ff, 0x62dcefff, 0x61daeeff, 
-    0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 
-    0x62c5ddff, 0x7ba1bcff, 0x7aa1bbff, 0x799fbbff, 0x68b2cfff, 0x57c7e4ff, 
-    0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 
-    0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x58aad0ff, 0xca1d44ff, 
-    0xc91d44ff, 0xc81d44ff, 0xd01f3dff, 0xe2232eff, 0xe2232eff, 0xe1232eff, 
-    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
-    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
-    0xd31f37ff, 0xd01f37ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf66928ff, 0xf96829ff, 0xf96728ff, 0xf86528ff, 
-    0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
-    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
-    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0x69d5e5ff, 
-    0x61daeeff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 
-    0x5cd0e9ff, 0x5bcfe8ff, 0x77a6c1ff, 0xd12943ff, 0xd12842ff, 0xd12742ff, 
-    0xd12542ff, 0xb84462ff, 0x67acccff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 
-    0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 
-    0x54acd3ff, 0xc91d44ff, 0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 0xcf1e3dff, 
-    0xe0232fff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
-    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 
-    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xcf1f37ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf66728ff, 0xf96728ff, 
-    0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 
-    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
-    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
-    0xf34627ff, 0x68d2e4ff, 0x60d9edff, 0x5fd7edff, 0x5fd5ecff, 0x5ed4ebff, 
-    0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x76a5c0ff, 0xd12842ff, 
-    0xd12742ff, 0xd12542ff, 0xd02442ff, 0xd02342ff, 0xb74162ff, 0x55bfe0ff, 
-    0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 
-    0x4fb5dbff, 0x4eb3daff, 0x52aad2ff, 0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 
-    0xc71d44ff, 0xc61d43ff, 0xcd1e3dff, 0xde2231ff, 0xde2230ff, 0xdd2231ff, 
-    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
-    0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xce1f38ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf66627ff, 0xf86528ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 0xf75e28ff, 
-    0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
-    0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
-    0xf34827ff, 0xf34627ff, 0xf34427ff, 0x67d1e3ff, 0x5fd7edff, 0x5fd5ecff, 
-    0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 
-    0x76a4bfff, 0xd12742ff, 0xd12542ff, 0xd02442ff, 0xd02342ff, 0xd02142ff, 
-    0xcf2042ff, 0x64a8caff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 
-    0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x51a9d2ff, 0xc91d43ff, 
-    0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xcc1e3dff, 
-    0xdc2232ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
-    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 
-    0xd01f39ff, 0xcd1e39ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf56427ff, 0xf86328ff, 0xf86228ff, 0xf76028ff, 
-    0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
-    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
-    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0x66cfe3ff, 
-    0x5fd5ecff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 
-    0x5acce7ff, 0x59cae6ff, 0x75a1beff, 0xd12542ff, 0xd02442ff, 0xd02342ff, 
-    0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 0x7197baff, 0x52bbdeff, 0x51badeff, 
-    0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 
-    0x9a948aff, 0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 
-    0xc41d42ff, 0xc31d42ff, 0xcb1e3eff, 0xd92133ff, 0xd92133ff, 0xd82134ff, 
-    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 
-    0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xcc1e39ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf56227ff, 0xf86228ff, 
-    0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 
-    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
-    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
-    0xf24127ff, 0x66cde2ff, 0x5ed4ebff, 0x5dd2eaff, 0x5cd0e9ff, 0x5bcfe8ff, 
-    0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x74a0bdff, 0xd02442ff, 
-    0xd02342ff, 0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 0xcf1e42ff, 0x6f95b9ff, 
-    0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 
-    0x4cb0d9ff, 0x9b998aff, 0xfcd843ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 
-    0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 0xc91d3eff, 
-    0xd72135ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
-    0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcb1e3aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf56127ff, 0xf76028ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 0xf65928ff, 
-    0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
-    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
-    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0x65cce1ff, 0x5dd2eaff, 0x5cd0e9ff, 
-    0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 
-    0x749fbdff, 0xd02342ff, 0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 0xcf1e42ff, 
-    0xce1e43ff, 0x6f95b9ff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 
-    0x4db1d9ff, 0x4cb0d9ff, 0x9b998aff, 0xffe243ff, 0xfcd642ff, 0xc61d43ff, 
-    0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 
-    0xc11c42ff, 0xc11c42ff, 0xc71c3eff, 0xd52036ff, 0xd52036ff, 0xd42036ff, 
-    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 
-    0xcd1e3bff, 0xca1e3bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf45f27ff, 0xf75e28ff, 0xf75c28ff, 0xf75b28ff, 
-    0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
-    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
-    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0x64cae0ff, 
-    0x5cd0e9ff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 
-    0x57c7e4ff, 0x57c5e3ff, 0x739cbdff, 0xd02142ff, 0xcf2042ff, 0xcf1f42ff, 
-    0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 0x6e93b8ff, 0x4fb6dcff, 0x4fb5dbff, 
-    0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9b998aff, 0xffe243ff, 0xffdf42ff, 
-    0xfbd440ff, 0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 
-    0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xc61d3fff, 
-    0xd32037ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 
-    0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xc91d3bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf45d27ff, 0xf75c28ff, 
-    0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 
-    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
-    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
-    0xf23b27ff, 0x63c8dfff, 0x5bcfe8ff, 0x5bcde8ff, 0x5acce7ff, 0x59cae6ff, 
-    0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x739cbcff, 0xcf2042ff, 
-    0xcf1f42ff, 0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 0xcc1e44ff, 0x6d91b8ff, 
-    0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9b998aff, 0xffe243ff, 
-    0xffdf42ff, 0xfedd40ff, 0xfbd23fff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 
-    0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 
-    0xbf1c42ff, 0xbe1b41ff, 0xc41c3fff, 0xd21f39ff, 0xd11f38ff, 0xd01f39ff, 
-    0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xc81d3cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf45b27ff, 0xf75b28ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 0xf55428ff, 
-    0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
-    0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
-    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0x62c7deff, 0x5bcde8ff, 0x5acce7ff, 
-    0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 
-    0x729abbff, 0xcf1f42ff, 0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 0xcc1e44ff, 
-    0xcc1e45ff, 0x6d91b8ff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9c998aff, 
-    0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfbcf3eff, 0xc41d42ff, 
-    0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 
-    0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xc31c3fff, 
-    0xd01f3aff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 
-    0xca1d3dff, 0xc71d3dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf45a27ff, 0xf65928ff, 0xf65728ff, 0xf65528ff, 
-    0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
-    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
-    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0x62c6deff, 
-    0x5acce7ff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 
-    0x55c2e2ff, 0x54c0e1ff, 0x7198baff, 0xcf1e42ff, 0xce1e43ff, 0xcd1e44ff, 
-    0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 0x6b8fb6ff, 0x4db1d9ff, 0x4cb0d9ff, 
-    0x9c998aff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 
-    0xfbcd3dff, 0xc31d42ff, 0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 0xc11c42ff, 
-    0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 
-    0xbc1b41ff, 0xbc1b41ff, 0xc11b40ff, 0xce1e3bff, 0xcd1e3bff, 0xcc1e3cff, 
-    0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc61d3dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf35827ff, 0xf65728ff, 
-    0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 
-    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
-    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
-    0xf13627ff, 0x61c5ddff, 0x59cae6ff, 0x58c8e5ff, 0x57c7e4ff, 0x57c5e3ff, 
-    0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x7197baff, 0xce1e43ff, 
-    0xcd1e44ff, 0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 0xca1d44ff, 0x6b8eb5ff, 
-    0x4cb0d9ff, 0x9c998aff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 
-    0xfed83eff, 0xfed63dff, 0xfacb3cff, 0xc31d42ff, 0xc21c42ff, 0xc11c42ff, 
-    0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 
-    0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xbf1c40ff, 
-    0xcc1e3dff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc41c3eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf35627ff, 0xf65528ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 0xf54f28ff, 
-    0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
-    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
-    0xf13827ff, 0xf13627ff, 0xf03527ff, 0x60c3dcff, 0x58c8e5ff, 0x57c7e4ff, 
-    0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 
-    0x6f95b9ff, 0xcd1e44ff, 0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 0xca1d44ff, 
-    0xc91d44ff, 0x6a8db5ff, 0x9c998aff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 
-    0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfac93bff, 0xc21c42ff, 
-    0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 
-    0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 
-    0xba1a42ff, 0xb91a43ff, 0xbe1b41ff, 0xc91d3eff, 0xc91d3eff, 0xc81d3eff, 
-    0xc61c3fff, 0xc31c3fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf35427ff, 0xf55428ff, 0xf55228ff, 0xf55028ff, 
-    0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
-    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
-    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0x60c0dbff, 
-    0x57c7e4ff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 
-    0x53bddfff, 0x52bbdeff, 0x6f95b9ff, 0xcc1e44ff, 0xcc1e45ff, 0xcb1e45ff, 
-    0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 0xbd8c69ff, 0xffe243ff, 0xffdf42ff, 
-    0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 
-    0xfac63aff, 0xc11c42ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 0xbf1c42ff, 
-    0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 
-    0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xbd1b42ff, 
-    0xc71d3fff, 0xc61c3fff, 0xc51c40ff, 0xc21c3fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf25327ff, 0xf55228ff, 
-    0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 
-    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
-    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
-    0xf03126ff, 0x5fbfdaff, 0x57c5e3ff, 0x56c3e3ff, 0x55c2e2ff, 0x54c0e1ff, 
-    0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x6e93b8ff, 0xcc1e45ff, 
-    0xcb1e45ff, 0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 0xc91d43ff, 0xf2b343ff, 
-    0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 
-    0xfdd23bff, 0xfdcf3aff, 0xfac438ff, 0xc11c42ff, 0xc01c42ff, 0xbf1c42ff, 
-    0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 
-    0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 
-    0xb81a43ff, 0xb71a42ff, 0xba1a42ff, 0xc41c40ff, 0xc41c40ff, 0xc11c40ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf25127ff, 0xf55028ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 0xf44927ff, 
-    0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
-    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
-    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0x5fbdd9ff, 0x56c3e3ff, 0x55c2e2ff, 
-    0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 
-    0x6d91b8ff, 0xcb1e45ff, 0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 0xc91d43ff, 
-    0xc81d43ff, 0xf2b142ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 
-    0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xf9c237ff, 0xc01c42ff, 
-    0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 
-    0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 
-    0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb91a42ff, 
-    0xc21c41ff, 0xc01b41ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf24f27ff, 0xf54f28ff, 0xf44d27ff, 0xf44b27ff, 
-    0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
-    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
-    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0x5ebbd9ff, 
-    0x55c2e2ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 0x51badeff, 
-    0x50b8ddff, 0x4fb6dcff, 0x6d91b8ff, 0xca1d44ff, 0xc91d44ff, 0xc81d44ff, 
-    0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 0xf0af41ff, 0xfedb3fff, 0xfed83eff, 
-    0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 
-    0xf9c036ff, 0xbf1c42ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 0xbd1b42ff, 
-    0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 
-    0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb81a44ff, 0xbe1b41ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf24e27ff, 0xf44d27ff, 
-    0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 
-    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
-    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
-    0xef2c26ff, 0x5dbad8ff, 0x54c0e1ff, 0x53bee0ff, 0x53bddfff, 0x52bbdeff, 
-    0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x6b8fb6ff, 0xc91d44ff, 
-    0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 0xf0ae40ff, 
-    0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 
-    0xfccb37ff, 0xfcc836ff, 0xf9be36ff, 0xbf1c42ff, 0xbe1b41ff, 0xbe1a42ff, 
-    0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 
-    0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb51a43ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf14c26ff, 0xf44b27ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 0xf34427ff, 
-    0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
-    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
-    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0x5cb8d8ff, 0x53bee0ff, 0x53bddfff, 
-    0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 
-    0x6b8eb5ff, 0xc81d44ff, 0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 0xc61d43ff, 
-    0xc51d43ff, 0xf0ab3fff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 
-    0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xf9bc35ff, 0xbe1b41ff, 
-    0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 
-    0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 
-    0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb01945ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf14b26ff, 0xf44927ff, 0xf34827ff, 0xf34627ff, 
-    0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
-    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
-    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0x5bb6d7ff, 
-    0x53bddfff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 
-    0x4eb3daff, 0x4db1d9ff, 0x6a8db5ff, 0xc91d43ff, 0xc81d43ff, 0xc71d44ff, 
-    0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xf0aa3eff, 0xfdd43cff, 0xfdd23bff, 
-    0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
-    0xf9ba34ff, 0xbe1a42ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 0xbb1a42ff, 
-    0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 
-    0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb11844ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf14926ff, 0xf34827ff, 
-    0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 
-    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
-    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
-    0xee2726ff, 0x5bb5d6ff, 0x52bbdeff, 0x51badeff, 0x50b8ddff, 0x4fb6dcff, 
-    0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9d8184ff, 0xc81d43ff, 
-    0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 0xefa83eff, 
-    0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
-    0xfcc434ff, 0xfcc233ff, 0xf8b732ff, 0xbd1b42ff, 0xbc1b41ff, 0xbc1b41ff, 
-    0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 
-    0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
-    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xaf1946ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf04826ff, 0xf34627ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 0xf23f27ff, 
-    0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
-    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
-    0xee2826ff, 0xee2726ff, 0xed2626ff, 0x5ab3d5ff, 0x51badeff, 0x50b8ddff, 
-    0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0x9c998aff, 
-    0xf2b343ff, 0xc71d44ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 0xc41d42ff, 
-    0xc31d42ff, 0xefa73dff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 
-    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xf8b531ff, 0xbc1b41ff, 
-    0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 
-    0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 
-    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
-    0xb11947ff, 0xae1946ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xf04626ff, 0xf34427ff, 0xf34227ff, 0xf24127ff, 
-    0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
-    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
-    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0x59b3d5ff, 
-    0x50b8ddff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 
-    0x9c998aff, 0xffe243ff, 0xf2b142ff, 0xc61d43ff, 0xc51d43ff, 0xc51c43ff, 
-    0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xeea43cff, 0xfdcd38ff, 0xfccb37ff, 
-    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
-    0xf8b330ff, 0xbc1b41ff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 0xb91a43ff, 
-    0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
-    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xad1946ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf04426ff, 0xf34227ff, 
-    0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 
-    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
-    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
-    0xeb2528ff, 0x58b1d4ff, 0x4fb6dcff, 0x4fb5dbff, 0x4eb3daff, 0x4db1d9ff, 
-    0x4cb0d9ff, 0x9d9b89ff, 0xffe243ff, 0xffdf42ff, 0xf0af41ff, 0xc51d43ff, 
-    0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc52541ff, 0xf5b63aff, 
-    0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
-    0xfbbd30ff, 0xfbbb2fff, 0xf8b02fff, 0xbb1a42ff, 0xbb1a42ff, 0xba1a42ff, 
-    0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
-    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xad1946ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf04226ff, 0xf24127ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 0xf13a27ff, 
-    0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
-    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
-    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0x57afd3ff, 0x4fb5dbff, 0x4eb3daff, 
-    0x4db1d9ff, 0x4cb0d9ff, 0xa09a87ff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 
-    0xf0ae40ff, 0xc51c43ff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 0xc52541ff, 
-    0xefa63aff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 
-    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xf7ae2eff, 0xbb1a42ff, 
-    0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 
-    0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
-    0xaf1847ff, 0xad1947ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xef4126ff, 0xf23f27ff, 0xf23d27ff, 0xf23b27ff, 
-    0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
-    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
-    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0x57aed2ff, 
-    0x4eb3daff, 0x4db1d9ff, 0x4cb0d9ff, 0xa39b84ff, 0xffe243ff, 0xffdf42ff, 
-    0xfedd40ff, 0xfedb3fff, 0xf0ab3fff, 0xc41d42ff, 0xc31d42ff, 0xc31d42ff, 
-    0xc52541ff, 0xefa63aff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
-    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
-    0xf7ad2dff, 0xba1a42ff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 0xb81a43ff, 
-    0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 
-    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xac1946ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xef3f26ff, 0xf23d27ff, 
-    0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 
-    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
-    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
-    0xe8252aff, 0x56acd1ff, 0x4db1d9ff, 0x4cb0d9ff, 0xa29a85ff, 0xffe243ff, 
-    0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xf0aa3eff, 0xc31d42ff, 
-    0xc31d42ff, 0xc52541ff, 0xefa63aff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
-    0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
-    0xfab62dff, 0xfab42cff, 0xf7ab2bff, 0xb91a43ff, 0xb91a42ff, 0xb81a42ff, 
-    0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
-    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 
-    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xac1948ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xef3d26ff, 0xf23b27ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 0xf03527ff, 
-    0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
-    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
-    0xe92529ff, 0xe8252aff, 0xe7242aff, 0x55aad0ff, 0x4cb0d9ff, 0xa29a85ff, 
-    0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 
-    0xefa83eff, 0xc31d42ff, 0xc52541ff, 0xefa63aff, 0xfccb37ff, 0xfcc836ff, 
-    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 
-    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xf7a82aff, 0xb91a42ff, 
-    0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 
-    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
-    0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
-    0xad1849ff, 0xab1849ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xef3b26ff, 0xf13a27ff, 0xf13827ff, 0xf13627ff, 
-    0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
-    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
-    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0x54a9d0ff, 
-    0xa29a85ff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 0xfed83eff, 
-    0xfed63dff, 0xfdd43cff, 0xefa73dff, 0xc52541ff, 0xefa63aff, 0xfccb37ff, 
-    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
-    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
-    0xf6a629ff, 0xb81a42ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
-    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
-    0xae1847ff, 0xad1849ff, 0xad174aff, 0xab1848ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xee3a26ff, 0xf13827ff, 
-    0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 
-    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
-    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
-    0xe5242cff, 0xae9a7bff, 0xffe243ff, 0xffdf42ff, 0xfedd40ff, 0xfedb3fff, 
-    0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xf2ad3bff, 0xefa53aff, 
-    0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
-    0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
-    0xfaaf29ff, 0xf9ad28ff, 0xf6a428ff, 0xb81a43ff, 0xb71a42ff, 0xb61943ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
-    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
-    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xaa1849ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xee3826ff, 0xf13627ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 0xf02f26ff, 
-    0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
-    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
-    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xfed942ff, 0xffdf42ff, 0xfedd40ff, 
-    0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 
-    0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 
-    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 
-    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf19629ff, 0xb71a42ff, 
-    0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
-    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
-    0xac174aff, 0xaa194bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xee3626ff, 0xf03527ff, 0xf03326ff, 0xf03126ff, 
-    0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
-    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
-    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xfed741ff, 
-    0xfedd40ff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 0xfdd23bff, 
-    0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
-    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
-    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
-    0xd75e34ff, 0xb61943ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 
-    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
-    0xad1749ff, 0xac174aff, 0xab184cff, 0xa9184aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xed3526ff, 0xf03326ff, 
-    0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 
-    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
-    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
-    0xe2232eff, 0xfdd53fff, 0xfedb3fff, 0xfed83eff, 0xfed63dff, 0xfdd43cff, 
-    0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
-    0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
-    0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
-    0xf9a826ff, 0xe4792eff, 0xb71b42ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
-    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 
-    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
-    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xa9184aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xed3325ff, 0xf03126ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 0xef2a26ff, 
-    0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
-    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
-    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xfdd33eff, 0xfed83eff, 0xfed63dff, 
-    0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 
-    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 
-    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 
-    0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
-    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
-    0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
-    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
-    0xaa174cff, 0xa8184cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xed3125ff, 0xf02f26ff, 0xef2e26ff, 0xef2c26ff, 
-    0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
-    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
-    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xfcd03dff, 
-    0xfed63dff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 
-    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
-    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
-    0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
-    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
-    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
-    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa8174bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xed2f25ff, 0xef2e26ff, 
-    0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 
-    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
-    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
-    0xdf2230ff, 0xfcce3cff, 0xfdd43cff, 0xfdd23bff, 0xfdcf3aff, 0xfdcd38ff, 
-    0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
-    0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
-    0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
-    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
-    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
-    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa8164cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xec2e25ff, 0xef2c26ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 0xed2626ff, 
-    0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
-    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
-    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xfbcc3bff, 0xfdd23bff, 0xfdcf3aff, 
-    0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 
-    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 
-    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 
-    0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
-    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
-    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
-    0xa9154eff, 0xa8164eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xec2c25ff, 0xef2a26ff, 0xee2826ff, 0xee2726ff, 
-    0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
-    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
-    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xfbca3aff, 
-    0xfdcf3aff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 
-    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
-    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
-    0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 
-    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
-    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
-    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa6164eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xec2a25ff, 0xee2826ff, 
-    0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 
-    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
-    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
-    0xdc2232ff, 0xfbc739ff, 0xfdcd38ff, 0xfccb37ff, 0xfcc836ff, 0xfcc635ff, 
-    0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
-    0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
-    0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
-    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 
-    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
-    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
-    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa5164eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xeb2825ff, 0xee2726ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 0xea2528ff, 
-    0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
-    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
-    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xfbc537ff, 0xfccb37ff, 0xfcc836ff, 
-    0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 
-    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 
-    0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
-    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
-    0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
-    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
-    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
-    0xa61550ff, 0xa5154fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xeb2725ff, 0xed2626ff, 0xec2627ff, 0xeb2528ff, 
-    0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
-    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
-    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xfac336ff, 
-    0xfcc836ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 
-    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
-    0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
-    0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
-    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
-    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 
-    0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa5164fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xea2625ff, 0xec2627ff, 
-    0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 
-    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
-    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
-    0xd82134ff, 0xfac135ff, 0xfcc635ff, 0xfcc434ff, 0xfcc233ff, 0xfbbf31ff, 
-    0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
-    0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
-    0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
-    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
-    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
-    0xa9154fff, 0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa61551ff, 0xa41651ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xe92626ff, 0xeb2528ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 0xe7242aff, 
-    0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
-    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
-    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xfabf35ff, 0xfcc434ff, 0xfcc233ff, 
-    0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 
-    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 
-    0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb11947ff, 0xb01946ff, 0xaf1947ff, 
-    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
-    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
-    0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa61551ff, 
-    0xa51553ff, 0xa31552ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe82527ff, 0xea2528ff, 0xe92529ff, 0xe8252aff, 
-    0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
-    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
-    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xfabd35ff, 
-    0xfcc233ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 
-    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
-    0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 
-    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
-    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
-    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
-    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa31551ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xe72527ff, 0xe92529ff, 
-    0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 
-    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
-    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
-    0xd52036ff, 0xfabb34ff, 0xfbbf31ff, 0xfbbd30ff, 0xfbbb2fff, 0xfbb82eff, 
-    0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
-    0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
-    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 
-    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
-    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
-    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 
-    0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa21553ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xe62528ff, 0xe8252aff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 0xe4242cff, 
-    0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
-    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
-    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xf9b732ff, 0xfbbd30ff, 0xfbbb2fff, 
-    0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 
-    0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
-    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
-    0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
-    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
-    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
-    0xa61550ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 
-    0xa31455ff, 0xa21554ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe52529ff, 0xe7242aff, 0xe6242bff, 0xe5242cff, 
-    0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
-    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
-    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xf9b531ff, 
-    0xfbbb2fff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 0xfaaf29ff, 
-    0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
-    0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
-    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
-    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 
-    0xa7154fff, 0xa61550ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 
-    0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa11454ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xe42429ff, 0xe6242bff, 
-    0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 
-    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
-    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
-    0xd21f38ff, 0xf9b330ff, 0xfbb82eff, 0xfab62dff, 0xfab42cff, 0xfab22aff, 
-    0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 0xb71c43ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
-    0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
-    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
-    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
-    0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 
-    0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21356ff, 0xa01455ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xe3242aff, 0xe5242cff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 0xe1232eff, 
-    0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
-    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
-    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xf9b02fff, 0xfab62dff, 0xfab42cff, 
-    0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 0xe4792eff, 
-    0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 
-    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
-    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
-    0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 
-    0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21356ff, 
-    0xa11357ff, 0x9f1456ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe3242bff, 0xe4242cff, 0xe3232dff, 0xe2232eff, 
-    0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
-    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 
-    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xf7ab2eff, 
-    0xfab42cff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 0xf9a826ff, 
-    0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 
-    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
-    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
-    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
-    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 
-    0xa21356ff, 0xa11357ff, 0xa01358ff, 0x9e1457ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xe2242bff, 0xe3232dff, 
-    0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 
-    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
-    0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 
-    0xcf1e3aff, 0xed8930ff, 0xfab22aff, 0xfaaf29ff, 0xf9ad28ff, 0xf9ab27ff, 
-    0xf9a826ff, 0xe4792eff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 0xb41a44ff, 
-    0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 
-    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
-    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
-    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 
-    0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 
-    0xa31456ff, 0xa21356ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9c1357ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xe1232cff, 0xe2232eff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 0xde2230ff, 
-    0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
-    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 
-    0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xd33438ff, 0xf5a22bff, 0xf9ad28ff, 
-    0xf9ab27ff, 0xf9a826ff, 0xe2752fff, 0xb71c43ff, 0xb51944ff, 0xb41943ff, 
-    0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 
-    0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
-    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
-    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
-    0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 
-    0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 
-    0x9d1259ff, 0x9b1358ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe0232dff, 0xe1232eff, 0xe0232fff, 0xdf2230ff, 
-    0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
-    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 
-    0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 
-    0xce293bff, 0xd75d35ff, 0xdb6633ff, 0xcc4639ff, 0xb61943ff, 0xb51944ff, 
-    0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 0xb21946ff, 
-    0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
-    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
-    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 
-    0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 
-    0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 
-    0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9a1359ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xdf232dff, 0xe0232fff, 
-    0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 
-    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
-    0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 
-    0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc81d3fff, 0xba1b41ff, 0xb61943ff, 
-    0xb51944ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 0xb21945ff, 
-    0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 
-    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
-    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
-    0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 
-    0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 
-    0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x991359ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xde232eff, 0xdf2230ff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 0xda2132ff, 
-    0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
-    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 
-    0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 
-    0xc51c40ff, 0xb81a42ff, 0xb41943ff, 0xb41a44ff, 0xb31944ff, 0xb31944ff, 
-    0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 0xaf1947ff, 
-    0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
-    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
-    0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 
-    0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 
-    0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 
-    0x9a125bff, 0x98125aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xdd222fff, 0xde2230ff, 0xdd2231ff, 0xdc2232ff, 
-    0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 
-    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 
-    0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 
-    0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc31c40ff, 0xb81a43ff, 0xb31944ff, 
-    0xb31944ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 0xb01946ff, 
-    0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 
-    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
-    0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
-    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 
-    0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 
-    0x9b125bff, 0x9a125bff, 0x99115cff, 0x97125bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xdc222fff, 0xdd2231ff, 
-    0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 0xd62035ff, 
-    0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 
-    0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 
-    0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 
-    0xc11b42ff, 0xb61a44ff, 0xb21945ff, 0xb21946ff, 0xb21845ff, 0xb01846ff, 
-    0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 0xad1849ff, 
-    0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 
-    0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 0xa61450ff, 
-    0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 
-    0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 
-    0x9c125aff, 0x9b125bff, 0x9a125bff, 0x99115cff, 0x98115dff, 0x96125bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xdb2230ff, 0xdc2232ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 0xd72034ff, 
-    0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 
-    0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 
-    0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 
-    0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 0xbf1b43ff, 0xb41a45ff, 0xb21845ff, 
-    0xb01846ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 0xae1847ff, 
-    0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 
-    0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa9154fff, 0xa7154fff, 
-    0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 
-    0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 
-    0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x9a125bff, 0x99115cff, 0x98115dff, 
-    0x97115dff, 0x95125cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xda2231ff, 0xda2132ff, 0xd92133ff, 0xd82134ff, 
-    0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 0xd21f38ff, 
-    0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 
-    0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 
-    0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 0xc01b43ff, 0xbf1b44ff, 
-    0xbe1a44ff, 0xb31946ff, 0xb01946ff, 0xaf1947ff, 0xaf1847ff, 0xaf1848ff, 
-    0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 0xab184cff, 
-    0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 0xa8154fff, 
-    0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 0xa41454ff, 
-    0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 0xa01358ff, 
-    0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x9a125bff, 0x99115cff, 
-    0x98115dff, 0x97115dff, 0x96115eff, 0x94115dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xcb212eff, 0xd92133ff, 
-    0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 0xd31f37ff, 
-    0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 0xcd1e3bff, 
-    0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 0xc61c3fff, 
-    0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 0xc01b43ff, 
-    0xbf1b44ff, 0xbe1a44ff, 0xbd1a45ff, 0xbb1a46ff, 0xb21946ff, 0xaf1847ff, 
-    0xaf1848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 0xac174aff, 
-    0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 0xa9154eff, 
-    0xa8154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 0xa51553ff, 
-    0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 0xa11357ff, 
-    0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 0x9a125bff, 
-    0x99115cff, 0x98115dff, 0x97115dff, 0x96115eff, 0x95105fff, 0x8d1255ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xb22727ea, 0xd82134ff, 0xd72034ff, 0xd62035ff, 0xd52036ff, 0xd42036ff, 
-    0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 0xce1e3aff, 
-    0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 0xc81d3eff, 
-    0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 0xc11b42ff, 
-    0xc01b43ff, 0xbf1b44ff, 0xbe1a44ff, 0xbd1a45ff, 0xbc1a46ff, 0xbb1a46ff, 
-    0xb91948ff, 0xb11848ff, 0xae1847ff, 0xad1849ff, 0xad174aff, 0xad1749ff, 
-    0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 0xa9164dff, 
-    0xa9154eff, 0xa8154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 0xa61551ff, 
-    0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 0xa21357ff, 
-    0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 0x9b125bff, 
-    0x9a125bff, 0x99115cff, 0x98115dff, 0x97115dff, 0x96115eff, 0x95105fff, 
-    0x94105fff, 0x861c44e9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xa5352622, 0xb72429f7, 0xd62035ff, 0xd52036ff, 
-    0xd42036ff, 0xd31f37ff, 0xd21f38ff, 0xd11f38ff, 0xd01f39ff, 0xcf1e3aff, 
-    0xce1e3aff, 0xcd1e3bff, 0xcc1e3cff, 0xcb1d3cff, 0xca1d3dff, 0xc91d3eff, 
-    0xc81d3eff, 0xc61c3fff, 0xc51c40ff, 0xc41c40ff, 0xc31c41ff, 0xc21b42ff, 
-    0xc11b42ff, 0xc01b43ff, 0xbf1b44ff, 0xbe1a44ff, 0xbd1a45ff, 0xbc1a46ff, 
-    0xbb1a46ff, 0xba1947ff, 0xb91948ff, 0xb71948ff, 0xaf1949ff, 0xad174aff, 
-    0xad1749ff, 0xac174aff, 0xab184cff, 0xaa174bff, 0xaa174cff, 0xa9174eff, 
-    0xa9164dff, 0xa9154eff, 0xa8154fff, 0xa7154fff, 0xa61450ff, 0xa61551ff, 
-    0xa61551ff, 0xa51553ff, 0xa41454ff, 0xa41453ff, 0xa31455ff, 0xa31456ff, 
-    0xa21357ff, 0xa11357ff, 0xa01358ff, 0x9f1359ff, 0x9d1259ff, 0x9c125aff, 
-    0x9b125bff, 0x9a125bff, 0x99115cff, 0x98115dff, 0x97115dff, 0x96115eff, 
-    0x95105fff, 0x94105fff, 0x87194af6, 0x87303820, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xa333224b, 0xa72e2597, 0xa32c269b, 0xa32c269b, 0xa32c269b, 0xa12c269b, 
-    0xa12c269b, 0xa12c269b, 0xa12c279b, 0xa02c279b, 0xa02c279b, 0xa02c279b, 
-    0xa02c299b, 0x9e2c299b, 0x9e2b299b, 0x9e2b299b, 0x9c2b299b, 0x9c2b299b, 
-    0x9c2b2b9b, 0x9b2b2b9b, 0x9b2b2b9b, 0x9b2b2b9b, 0x9b2b2b9b, 0x992b2b9b, 
-    0x992b2c9b, 0x992b2c9b, 0x992b2c9b, 0x972b2c9b, 0x972b2c9b, 0x972b2c9b, 
-    0x97292e9b, 0x94292f9d, 0x94292f9d, 0x92292f9d, 0x92292f9d, 0x9329319c, 
-    0x9329319c, 0x9129319c, 0x9129319c, 0x9129319c, 0x9029319c, 0x8e29319c, 
-    0x8e29319c, 0x9129319b, 0x9129319b, 0x8f27319b, 0x8f27319b, 0x8f27339b, 
-    0x8d27339b, 0x8d27339b, 0x8d27339b, 0x8d27339b, 0x8c27359b, 0x8c27359b, 
-    0x8c27359b, 0x8a27359b, 0x8a27359b, 0x8a27369b, 0x8a27369b, 0x8927369b, 
-    0x8927369b, 0x8926369b, 0x8a273897, 0x8b2c334b, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-};
diff --git a/games/NXDoom/src/doom/doomdata.h b/games/NXDoom/src/doom/doomdata.h
index 6e42be6fc..ede23cf5e 100644
--- a/games/NXDoom/src/doom/doomdata.h
+++ b/games/NXDoom/src/doom/doomdata.h
@@ -1,213 +1,248 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  all external data is defined here
-//  most of the data is loaded into different structures at run time
-//  some internal structures shared by many modules are here
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/doomdata.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  all external data is defined here
+ *  most of the data is loaded into different structures at run time
+ *  some internal structures shared by many modules are here
+ *
+ ****************************************************************************/
 
 #ifndef __DOOMDATA__
 #define __DOOMDATA__
 
-// The most basic types we use, portability.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* The most basic types we use, portability. */
+
 #include "doomtype.h"
 
-// Some global defines, that configure the game.
+/* Some global defines, that configure the game. */
+
 #include "doomdef.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* LineDef attributes. */
 
-//
-// Map level types.
-// The following data structures define the persistent format
-// used in the lumps of the WAD files.
-//
+/* Solid, is an obstacle. */
+
+#define ML_BLOCKING 1
+
+/* Blocks monsters only. */
+
+#define ML_BLOCKMONSTERS 2
+
+/* Backside will not be present at all if not two sided. */
+
+#define ML_TWOSIDED 4
+
+/* If a texture is pegged, the texture will have the end exposed to air held
+ * constant at the top or bottom of the texture (stairs or pulled down
+ * things) and will move with a height change of one of the neighbor sectors.
+ *
+ * Unpegged textures always have the first row of the texture at the top
+ * pixel  the line for both top and bottom textures (use next to windows).
+ */
+
+/* upper texture unpegged */
+
+#define ML_DONTPEGTOP 8
+
+/* lower texture unpegged */
+
+#define ML_DONTPEGBOTTOM 16
+
+/* In AutoMap: don't map as two sided: IT'S A SECRET! */
+
+#define ML_SECRET 32
+
+/* Sound rendering: don't let sound cross two of these. */
+
+#define ML_SOUNDBLOCK 64
+
+/* Don't draw on the automap at all. */
+
+#define ML_DONTDRAW 128
+
+/* Set if already seen, thus drawn in automap. */
+
+#define ML_MAPPED 256
+
+/* Indicate a leaf. */
+
+#define NF_SUBSECTOR 0x8000
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Map level types.
+ * The following data structures define the persistent format
+ * used in the lumps of the WAD files.
+ */
+
+/* Lump order in a map WAD: each map needs a couple of lumps
+ * to provide a complete scene geometry description.
+ */
 
-// Lump order in a map WAD: each map needs a couple of lumps
-// to provide a complete scene geometry description.
 enum
 {
-  ML_LABEL,		// A separator, name, ExMx or MAPxx
-  ML_THINGS,		// Monsters, items..
-  ML_LINEDEFS,		// LineDefs, from editing
-  ML_SIDEDEFS,		// SideDefs, from editing
-  ML_VERTEXES,		// Vertices, edited and BSP splits generated
-  ML_SEGS,		// LineSegs, from LineDefs split by BSP
-  ML_SSECTORS,		// SubSectors, list of LineSegs
-  ML_NODES,		// BSP nodes
-  ML_SECTORS,		// Sectors, from editing
-  ML_REJECT,		// LUT, sector-sector visibility	
-  ML_BLOCKMAP		// LUT, motion clipping, walls/grid element
+  ML_LABEL,    /* A separator, name, ExMx or MAPxx */
+  ML_THINGS,   /* Monsters, items.. */
+  ML_LINEDEFS, /* LineDefs, from editing */
+  ML_SIDEDEFS, /* SideDefs, from editing */
+  ML_VERTICES, /* Vertices, edited and BSP splits generated */
+  ML_SEGS,     /* LineSegs, from LineDefs split by BSP */
+  ML_SSECTORS, /* SubSectors, list of LineSegs */
+  ML_NODES,    /* BSP nodes */
+  ML_SECTORS,  /* Sectors, from editing */
+  ML_REJECT,   /* LUT, sector-sector visibility */
+  ML_BLOCKMAP  /* LUT, motion clipping, walls/grid element */
 };
 
+/* A single Vertex. */
 
-// A single Vertex.
-typedef PACKED_STRUCT (
+begin_packed_struct struct mapvertex_t
 {
-  short		x;
-  short		y;
-}) mapvertex_t;
+  short x;
+  short y;
+} end_packed_struct;
 
+typedef struct mapvertex_t mapvertex_t;
 
-// A SideDef, defining the visual appearance of a wall,
-// by setting textures and offsets.
-typedef PACKED_STRUCT (
+/* A SideDef, defining the visual appearance of a wall, by setting textures
+ * and offsets.
+ */
+
+begin_packed_struct struct mapsidedef_t
 {
-  short		textureoffset;
-  short		rowoffset;
-  char		toptexture[8];
-  char		bottomtexture[8];
-  char		midtexture[8];
-  // Front sector, towards viewer.
-  short		sector;
-}) mapsidedef_t;
+  short textureoffset;
+  short rowoffset;
+  char toptexture[8];
+  char bottomtexture[8];
+  char midtexture[8];
+  short sector;
+} end_packed_struct;
 
+typedef struct mapsidedef_t mapsidedef_t;
 
+/* A LineDef, as used for editing, and as input to the BSP builder.
+ */
 
-// A LineDef, as used for editing, and as input
-// to the BSP builder.
-typedef PACKED_STRUCT (
+begin_packed_struct struct maplinedef_t
 {
-  short		v1;
-  short		v2;
-  short		flags;
-  short		special;
-  short		tag;
-  // sidenum[1] will be -1 if one sided
-  short		sidenum[2];		
-}) maplinedef_t;
+  short v1;
+  short v2;
+  short flags;
+  short special;
+  short tag;
 
+  /* sidenum[1] will be -1 if one sided */
 
-//
-// LineDef attributes.
-//
+  short sidenum[2];
+} end_packed_struct;
 
-// Solid, is an obstacle.
-#define ML_BLOCKING		1
+typedef struct maplinedef_t maplinedef_t;
 
-// Blocks monsters only.
-#define ML_BLOCKMONSTERS	2
+/* Sector definition, from editing. */
 
-// Backside will not be present at all
-//  if not two sided.
-#define ML_TWOSIDED		4
-
-// If a texture is pegged, the texture will have
-// the end exposed to air held constant at the
-// top or bottom of the texture (stairs or pulled
-// down things) and will move with a height change
-// of one of the neighbor sectors.
-// Unpegged textures allways have the first row of
-// the texture at the top pixel of the line for both
-// top and bottom textures (use next to windows).
-
-// upper texture unpegged
-#define ML_DONTPEGTOP		8
-
-// lower texture unpegged
-#define ML_DONTPEGBOTTOM	16	
-
-// In AutoMap: don't map as two sided: IT'S A SECRET!
-#define ML_SECRET		32
-
-// Sound rendering: don't let sound cross two of these.
-#define ML_SOUNDBLOCK		64
-
-// Don't draw on the automap at all.
-#define ML_DONTDRAW		128
-
-// Set if already seen, thus drawn in automap.
-#define ML_MAPPED		256
-
-
-
-
-// Sector definition, from editing.
-typedef	PACKED_STRUCT (
+begin_packed_struct struct mapsector_t
 {
-  short		floorheight;
-  short		ceilingheight;
-  char		floorpic[8];
-  char		ceilingpic[8];
-  short		lightlevel;
-  short		special;
-  short		tag;
-}) mapsector_t;
+  short floorheight;
+  short ceilingheight;
+  char floorpic[8];
+  char ceilingpic[8];
+  short lightlevel;
+  short special;
+  short tag;
+} end_packed_struct;
 
-// SubSector, as generated by BSP.
-typedef PACKED_STRUCT (
+typedef struct mapsector_t mapsector_t;
+
+/* SubSector, as generated by BSP. */
+
+begin_packed_struct struct mapsubsector_t
 {
-  short		numsegs;
-  // Index of first one, segs are stored sequentially.
-  short		firstseg;	
-}) mapsubsector_t;
+  short numsegs;
 
+  /* Index of first one, segs are stored sequentially. */
 
-// LineSeg, generated by splitting LineDefs
-// using partition lines selected by BSP builder.
-typedef PACKED_STRUCT (
+  short firstseg;
+} end_packed_struct;
+
+typedef struct mapsubsector_t mapsubsector_t;
+
+/* LineSeg, generated by splitting LineDefs using partition lines selected by
+ * BSP builder.
+ */
+
+begin_packed_struct struct mapseg_t
 {
-  short		v1;
-  short		v2;
-  short		angle;		
-  short		linedef;
-  short		side;
-  short		offset;
-}) mapseg_t;
+  short v1;
+  short v2;
+  short angle;
+  short linedef;
+  short side;
+  short offset;
+} end_packed_struct;
 
+typedef struct mapseg_t mapseg_t;
 
+/* BSP node structure. */
 
-// BSP node structure.
-
-// Indicate a leaf.
-#define	NF_SUBSECTOR	0x8000
-
-typedef PACKED_STRUCT (
+begin_packed_struct struct mapnode_t
 {
-  // Partition line from (x,y) to x+dx,y+dy)
-  short		x;
-  short		y;
-  short		dx;
-  short		dy;
+  /* Partition line from (x,y) to x+dx,y+dy */
 
-  // Bounding box for each child,
-  // clip against view frustum.
-  short		bbox[2][4];
+  short x;
+  short y;
+  short dx;
+  short dy;
 
-  // If NF_SUBSECTOR its a subsector,
-  // else it's a node of another subtree.
-  unsigned short	children[2];
+  /* Bounding box for each child, clip against view frustum. */
 
-}) mapnode_t;
+  short bbox[2][4];
 
+  /* If NF_SUBSECTOR its a subsector, else it's a node of another subtree. */
 
+  unsigned short children[2];
+} end_packed_struct;
 
+typedef struct mapnode_t mapnode_t;
 
-// Thing definition, position, orientation and type,
-// plus skill/visibility flags and attributes.
-typedef PACKED_STRUCT (
+/* Thing definition, position, orientation and type, plus skill/visibility
+ * flags and attributes.
+ */
+
+begin_packed_struct struct mapthing_t
 {
-    short		x;
-    short		y;
-    short		angle;
-    short		type;
-    short		options;
-}) mapthing_t;
+  short x;
+  short y;
+  short angle;
+  short type;
+  short options;
+} end_packed_struct;
 
+typedef struct mapthing_t mapthing_t;
 
-
-
-
-#endif			// __DOOMDATA__
+#endif /* __DOOMDATA__ */
diff --git a/games/NXDoom/src/doom/doomdef.c b/games/NXDoom/src/doom/doomdef.c
index d31f3efa2..5cc227884 100644
--- a/games/NXDoom/src/doom/doomdef.c
+++ b/games/NXDoom/src/doom/doomdef.c
@@ -1,28 +1,33 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  DoomDef - basic defines for DOOM, e.g. Version, game mode
-//   and skill level, and display parameters.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/doomdef.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  DoomDef - basic defines for DOOM, e.g. Version, game mode
+ *  and skill level, and display parameters.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomdef.h"
 
-// Location for any defines turned variables.
-
-// None.
-
-
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/doomdef.h b/games/NXDoom/src/doom/doomdef.h
index 62d729ddb..cf00f12ee 100644
--- a/games/NXDoom/src/doom/doomdef.h
+++ b/games/NXDoom/src/doom/doomdef.h
@@ -1,168 +1,171 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Internally used data structures for virtually everything,
-//   lots of other stuff.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/doomdef.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Internally used data structures for virtually everything, lots of other
+ *   stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __DOOMDEF__
 #define __DOOMDEF__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <stdio.h>
 #include <string.h>
 
+#include "d_mode.h"
 #include "doomtype.h"
 #include "i_timer.h"
-#include "d_mode.h"
 
-//
-// Global parameters/defines.
-//
-// DOOM version
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* DOOM version */
+
 #define DOOM_VERSION 109
 
-// Version code for cph's longtics hack ("v1.91")
+/* Version code for cph's longtics hack ("v1.91") */
+
 #define DOOM_191_VERSION 111
 
+/* The maximum number of players, multiplayer/networking. */
 
-// If rangecheck is undefined,
-// most parameter validation debugging code will not be compiled
-#define RANGECHECK
-
-// The maximum number of players, multiplayer/networking.
 #define MAXPLAYERS 4
 
-// The current state of the game: whether we are
-// playing, gazing at the intermission screen,
-// the game final animation, or a demo. 
+/* Difficulty/skill settings/filters. */
+
+/* Skill flags. */
+
+#define MTF_EASY 1
+#define MTF_NORMAL 2
+#define MTF_HARD 4
+
+/* Deaf monsters/do not react to sound. */
+
+#define MTF_AMBUSH 8
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* The current state of the game: whether we are playing, gazing at the
+ * intermission screen, the game final animation, or a demo.
+ */
+
 typedef enum
 {
-    GS_LEVEL,
-    GS_INTERMISSION,
-    GS_FINALE,
-    GS_DEMOSCREEN,
+  GS_LEVEL,
+  GS_INTERMISSION,
+  GS_FINALE,
+  GS_DEMOSCREEN,
 } gamestate_t;
 
 typedef enum
 {
-    ga_nothing,
-    ga_loadlevel,
-    ga_newgame,
-    ga_loadgame,
-    ga_savegame,
-    ga_playdemo,
-    ga_completed,
-    ga_victory,
-    ga_worlddone,
-    ga_screenshot
+  ga_nothing,
+  ga_loadlevel,
+  ga_newgame,
+  ga_loadgame,
+  ga_savegame,
+  ga_playdemo,
+  ga_completed,
+  ga_victory,
+  ga_worlddone,
+  ga_screenshot
 } gameaction_t;
 
-//
-// Difficulty/skill settings/filters.
-//
+/* Key cards. */
 
-// Skill flags.
-#define	MTF_EASY		1
-#define	MTF_NORMAL		2
-#define	MTF_HARD		4
-
-// Deaf monsters/do not react to sound.
-#define	MTF_AMBUSH		8
-
-
-//
-// Key cards.
-//
 typedef enum
 {
-    it_bluecard,
-    it_yellowcard,
-    it_redcard,
-    it_blueskull,
-    it_yellowskull,
-    it_redskull,
-    
-    NUMCARDS
-    
+  it_bluecard,
+  it_yellowcard,
+  it_redcard,
+  it_blueskull,
+  it_yellowskull,
+  it_redskull,
+
+  NUMCARDS
 } card_t;
 
+/* The defined weapons, including a marker indicating user has not changed
+ * weapon.
+ */
 
-
-// The defined weapons,
-//  including a marker indicating
-//  user has not changed weapon.
 typedef enum
 {
-    wp_fist,
-    wp_pistol,
-    wp_shotgun,
-    wp_chaingun,
-    wp_missile,
-    wp_plasma,
-    wp_bfg,
-    wp_chainsaw,
-    wp_supershotgun,
+  wp_fist,
+  wp_pistol,
+  wp_shotgun,
+  wp_chaingun,
+  wp_missile,
+  wp_plasma,
+  wp_bfg,
+  wp_chainsaw,
+  wp_supershotgun,
 
-    NUMWEAPONS,
-    
-    // No pending weapon change.
-    wp_nochange
+  NUMWEAPONS,
 
+  /* No pending weapon change. */
+
+  wp_nochange
 } weapontype_t;
 
+/* Ammunition types defined. */
 
-// Ammunition types defined.
 typedef enum
 {
-    am_clip,	// Pistol / chaingun ammo.
-    am_shell,	// Shotgun / double barreled shotgun.
-    am_cell,	// Plasma rifle, BFG.
-    am_misl,	// Missile launcher.
-    NUMAMMO,
-    am_noammo	// Unlimited for chainsaw / fist.	
-
+  am_clip,  /* Pistol / chaingun ammo. */
+  am_shell, /* Shotgun / double barreled shotgun. */
+  am_cell,  /* Plasma rifle, BFG. */
+  am_misl,  /* Missile launcher. */
+  NUMAMMO,
+  am_noammo /* Unlimited for chainsaw / fist. */
 } ammotype_t;
 
+/* Power up artifacts. */
 
-// Power up artifacts.
 typedef enum
 {
-    pw_invulnerability,
-    pw_strength,
-    pw_invisibility,
-    pw_ironfeet,
-    pw_allmap,
-    pw_infrared,
-    NUMPOWERS
-    
+  pw_invulnerability,
+  pw_strength,
+  pw_invisibility,
+  pw_ironfeet,
+  pw_allmap,
+  pw_infrared,
+  NUMPOWERS
 } powertype_t;
 
+/* Power up durations, how many seconds till expiration, assuming TICRATE is
+ * 35 ticks/second.
+ */
 
-
-//
-// Power up durations,
-//  how many seconds till expiration,
-//  assuming TICRATE is 35 ticks/second.
-//
 typedef enum
 {
-    INVULNTICS	= (30*TICRATE),
-    INVISTICS	= (60*TICRATE),
-    INFRATICS	= (120*TICRATE),
-    IRONTICS	= (60*TICRATE)
-    
+  INVULNTICS = (30 * TICRATE),
+  INVISTICS = (60 * TICRATE),
+  INFRATICS = (120 * TICRATE),
+  IRONTICS = (60 * TICRATE)
 } powerduration_t;
 
-#endif          // __DOOMDEF__
+#endif /* __DOOMDEF__ */
diff --git a/games/NXDoom/src/doom/doomstat.c b/games/NXDoom/src/doom/doomstat.c
index f8e83f3cb..5f38dd84c 100644
--- a/games/NXDoom/src/doom/doomstat.c
+++ b/games/NXDoom/src/doom/doomstat.c
@@ -1,35 +1,49 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Put all global tate variables here.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/doomstat.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Put all global state variables here.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
 #include "doomstat.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-// Game Mode - identify IWAD as shareware, retail etc.
-GameMode_t gamemode = indetermined;
-GameMission_t	gamemission = doom;
-GameVersion_t   gameversion = exe_final2;
-GameVariant_t   gamevariant = vanilla;
-
-// Set if homebrew PWAD stuff has been added.
-boolean	modifiedgame;
+/* Game Mode - identify IWAD as shareware, retail etc. */
 
+game_mode_t gamemode = indetermined;
+gamemission_t gamemission = doom;
+game_version_t gameversion = exe_final2;
+game_variant_t gamevariant = vanilla;
 
+/* Set if homebrew PWAD stuff has been added. */
 
+boolean modifiedgame;
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/doomstat.h b/games/NXDoom/src/doom/doomstat.h
index 689f59503..55f31f130 100644
--- a/games/NXDoom/src/doom/doomstat.h
+++ b/games/NXDoom/src/doom/doomstat.h
@@ -1,277 +1,273 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   All the global variables that store the internal state.
-//   Theoretically speaking, the internal state of the engine
-//    should be found by looking at the variables collected
-//    here, and every relevant module will have to include
-//    this header file.
-//   In practice, things are a bit messy.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/doomstat.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   All the global variables that store the internal state.
+ *   Theoretically speaking, the internal state of the engine
+ *    should be found by looking at the variables collected
+ *    here, and every relevant module will have to include
+ *    this header file.
+ *   In practice, things are a bit messy.
+ *
+ ****************************************************************************/
 
 #ifndef __D_STATE__
 #define __D_STATE__
 
-// We need globally shared data structures,
-//  for defining the global state variables.
-#include "doomdata.h"
-#include "d_loop.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* We need globally shared data structures, for defining the global state
+ * variables.
+ */
+
+#include "d_loop.h"
+#include "doomdata.h"
+
+/* We need the player data structure as well. */
 
-// We need the playr data structure as well.
 #include "d_player.h"
 
-// Game mode/mission
+/* Game mode/mission */
+
 #include "d_mode.h"
 
 #include "net_defs.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Convenience macro.
+ * 'gamemission' can be equal to pack_chex or pack_hacx, but these are
+ * just modified versions of doom and doom2, and should be interpreted
+ * as the same most of the time.
+ */
 
-// ------------------------
-// Command line parameters.
-//
-extern  boolean	nomonsters;	// checkparm of -nomonsters
-extern  boolean	respawnparm;	// checkparm of -respawn
-extern  boolean	fastparm;	// checkparm of -fast
+#define logical_gamemission                                                  \
+  (gamemission == pack_chex   ? doom                                         \
+   : gamemission == pack_hacx ? doom2                                        \
+                              : gamemission)
 
-extern  boolean	devparm;	// DEBUG: launched with -devparm
+#define MAX_DM_STARTS 10
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-// -----------------------------------------------------
-// Game Mode - identify IWAD as shareware, retail etc.
-//
-extern GameMode_t	gamemode;
-extern GameMission_t	gamemission;
-extern GameVersion_t    gameversion;
-extern GameVariant_t    gamevariant;
+/* Command line parameters. */
 
-// Convenience macro.
-// 'gamemission' can be equal to pack_chex or pack_hacx, but these are
-// just modified versions of doom and doom2, and should be interpreted
-// as the same most of the time.
+extern boolean nomonsters;  /* checkparm of -nomonsters */
+extern boolean respawnparm; /* checkparm of -respawn */
+extern boolean fastparm;    /* checkparm of -fast */
 
-#define logical_gamemission                             \
-    (gamemission == pack_chex ? doom :                  \
-     gamemission == pack_hacx ? doom2 : gamemission)
+extern boolean devparm; /* DEBUG: launched with -devparm */
 
-// Set if homebrew PWAD stuff has been added.
-extern  boolean	modifiedgame;
+/* Game Mode - identify IWAD as shareware, retail etc. */
 
+extern game_mode_t gamemode;
+extern gamemission_t gamemission;
+extern game_version_t gameversion;
+extern game_variant_t gamevariant;
 
-// -------------------------------------------
-// Selected skill type, map etc.
-//
+/* Set if homebrew PWAD stuff has been added. */
 
-// Defaults for menu, methinks.
-extern  skill_t		startskill;
-extern  int             startepisode;
-extern	int		startmap;
+extern boolean modifiedgame;
 
-// Savegame slot to load on startup.  This is the value provided to
-// the -loadgame option.  If this has not been provided, this is -1.
+/* Selected skill type, map etc. */
 
-extern  int             startloadgame;
+/* Defaults for menu, methinks. */
 
-extern  boolean		autostart;
+extern skill_t startskill;
+extern int startepisode;
+extern int startmap;
 
-// Selected by user. 
-extern  skill_t         gameskill;
-extern  int		gameepisode;
-extern  int		gamemap;
+/* Savegame slot to load on startup.  This is the value provided to
+ * the -loadgame option.  If this has not been provided, this is -1.
+ */
 
-// If non-zero, exit the level after this number of minutes
-extern  int             timelimit;
+extern int startloadgame;
 
-// Nightmare mode flag, single player.
-extern  boolean         respawnmonsters;
+extern boolean autostart;
 
-// Netgame? Only true if >1 player.
-extern  boolean	netgame;
+/* Selected by user. */
+
+extern skill_t gameskill;
+extern int gameepisode;
+extern int gamemap;
+
+/* If non-zero, exit the level after this number of minutes */
+
+extern int timelimit;
+
+/* Nightmare mode flag, single player. */
+
+extern boolean respawnmonsters;
+
+/* Netgame? Only true if >1 player. */
+
+extern boolean netgame;
+
+/* 0=Cooperative; 1=Deathmatch; 2=Altdeath */
 
-// 0=Cooperative; 1=Deathmatch; 2=Altdeath
 extern int deathmatch;
 
-// -------------------------
-// Internal parameters for sound rendering.
-// These have been taken from the DOS version,
-//  but are not (yet) supported with Linux
-//  (e.g. no sound volume adjustment with menu.
+/* Internal parameters for sound rendering.
+ * These have been taken from the DOS version,
+ *  but are not (yet) supported with Linux
+ *  (e.g. no sound volume adjustment with menu.
+ * From m_menu.c:
+ *  Sound FX volume has default, 0 - 15
+ *  Music volume has default, 0 - 15
+ * These are multiplied by 8.
+ */
 
-// From m_menu.c:
-//  Sound FX volume has default, 0 - 15
-//  Music volume has default, 0 - 15
-// These are multiplied by 8.
-extern int sfxVolume;
-extern int musicVolume;
+extern int g_sfx_volume;
+extern int g_music_volume;
 
-// Current music/sfx card - index useless
-//  w/o a reference LUT in a sound module.
-// Ideally, this would use indices found
-//  in: /usr/include/linux/soundcard.h
-extern int snd_MusicDevice;
-extern int snd_SfxDevice;
-// Config file? Same disclaimer as above.
-extern int snd_DesiredMusicDevice;
-extern int snd_DesiredSfxDevice;
+/* Status flags for refresh. */
 
+/* Depending on view size - no status bar?
+ * Note that there is no way to disable the status bar explicitly.
+ */
 
-// -------------------------
-// Status flags for refresh.
-//
+extern boolean statusbaractive;
 
-// Depending on view size - no status bar?
-// Note that there is no way to disable the
-//  status bar explicitely.
-extern  boolean statusbaractive;
+extern boolean automapactive; /* In AutoMap mode? */
+extern boolean g_menuactive;  /* Menu over-layed? */
+extern boolean paused;        /* Game Pause? */
 
-extern  boolean automapactive;	// In AutoMap mode?
-extern  boolean	menuactive;	// Menu overlayed?
-extern  boolean	paused;		// Game Pause?
+extern boolean viewactive;
 
+extern boolean nodrawers;
 
-extern  boolean		viewactive;
+extern boolean testcontrols;
+extern int testcontrols_mousespeed;
 
-extern  boolean		nodrawers;
+/* This one is related to the 3-screen display mode.
+ * ANG90 = left side, ANG270 = right
+ */
 
+extern int viewangleoffset;
 
-extern  boolean         testcontrols;
-extern  int             testcontrols_mousespeed;
+/* Player taking events, and displaying. */
 
+extern int consoleplayer;
+extern int displayplayer;
 
+/* Scores, rating.
+ * Statistics on a given map, for intermission.
+ */
 
+extern int totalkills;
+extern int totalitems;
+extern int totalsecret;
 
-// This one is related to the 3-screen display mode.
-// ANG90 = left side, ANG270 = right
-extern  int	viewangleoffset;
+/* Timer, for scores. */
 
-// Player taking events, and displaying.
-extern  int	consoleplayer;	
-extern  int	displayplayer;
+extern int levelstarttic; /* gametic at level start */
+extern int leveltime;     /* tics in game play for par */
 
+/* DEMO playback/recording related stuff.
+ * No demo, there is a human player in charge?
+ * Disable save/end game?
+ */
 
-// -------------------------------------
-// Scores, rating.
-// Statistics on a given map, for intermission.
-//
-extern  int	totalkills;
-extern	int	totalitems;
-extern	int	totalsecret;
+extern boolean usergame;
 
-// Timer, for scores.
-extern  int	levelstarttic;	// gametic at level start
-extern  int	leveltime;	// tics in game play for par
+/* ? */
 
+extern boolean demoplayback;
+extern boolean demorecording;
 
-
-// --------------------------------------
-// DEMO playback/recording related stuff.
-// No demo, there is a human player in charge?
-// Disable save/end game?
-extern  boolean	usergame;
-
-//?
-extern  boolean	demoplayback;
-extern  boolean	demorecording;
-
-// Round angleturn in ticcmds to the nearest 256.  This is used when
-// recording Vanilla demos in netgames.
+/* Round angleturn in ticcmds to the nearest 256.  This is used when
+ * recording Vanilla demos in netgames.
+ */
 
 extern boolean lowres_turn;
 
-// Quit after playing a demo from cmdline.
-extern  boolean		singledemo;	
+/* Quit after playing a demo from cmdline. */
 
+extern boolean singledemo;
 
+/* ? */
 
+extern gamestate_t gamestate;
 
-//?
-extern  gamestate_t     gamestate;
+/* Internal parameters, fixed.
+ * These are set by the engine, and not changed
+ *  according to user inputs. Partly load from
+ *  WAD, partly set at startup time.
+ */
 
+/* Bookkeeping on players - state. */
 
+extern player_t players[MAXPLAYERS];
 
+/* Alive? Disconnected? */
 
+extern boolean playeringame[MAXPLAYERS];
 
+/* Player spawn spots for deathmatch. */
 
-//-----------------------------
-// Internal parameters, fixed.
-// These are set by the engine, and not changed
-//  according to user inputs. Partly load from
-//  WAD, partly set at startup time.
+extern mapthing_t deathmatchstarts[MAX_DM_STARTS];
+extern mapthing_t *deathmatch_p;
 
+/* Player spawn spots. */
 
+extern mapthing_t playerstarts[MAXPLAYERS];
+extern boolean playerstartsingame[MAXPLAYERS];
 
-// Bookkeeping on players - state.
-extern	player_t	players[MAXPLAYERS];
+/* Intermission stats.
+ * Parameters for world map / intermission.
+ */
 
-// Alive? Disconnected?
-extern  boolean		playeringame[MAXPLAYERS];
+extern wbstartstruct_t wminfo;
 
+/* Internal parameters, used for engine. */
 
-// Player spawn spots for deathmatch.
-#define MAX_DM_STARTS   10
-extern  mapthing_t      deathmatchstarts[MAX_DM_STARTS];
-extern  mapthing_t*	deathmatch_p;
+/* File handling stuff. */
 
-// Player spawn spots.
-extern  mapthing_t      playerstarts[MAXPLAYERS];
-extern  boolean         playerstartsingame[MAXPLAYERS];
-// Intermission stats.
-// Parameters for world map / intermission.
-extern  wbstartstruct_t		wminfo;	
+extern char *savegamedir;
 
+/* if true, load all graphics at level load */
 
+extern boolean precache;
 
+/* wipegamestate can be set to -1 to force a wipe on the next draw */
 
+extern gamestate_t wipegamestate;
 
+extern int g_mouse_sensitivity;
 
+extern int bodyqueslot;
 
-//-----------------------------------------
-// Internal parameters, used for engine.
-//
+/* Needed to store the number of the dummy sky flat.
+ * Used for rendering, as well as tracking projectiles etc.
+ */
 
-// File handling stuff.
-extern  char        *savegamedir;
+extern int skyflatnum;
 
-// if true, load all graphics at level load
-extern  boolean         precache;
+/* Netgame stuff (buffers and pointers, i.e. indices). */
 
+extern int rndindex;
 
-// wipegamestate can be set to -1
-//  to force a wipe on the next draw
-extern  gamestate_t     wipegamestate;
+extern ticcmd_t *netcmds;
 
-extern  int             mouseSensitivity;
-
-extern  int             bodyqueslot;
-
-
-
-// Needed to store the number of the dummy sky flat.
-// Used for rendering,
-//  as well as tracking projectiles etc.
-extern int		skyflatnum;
-
-
-
-// Netgame stuff (buffers and pointers, i.e. indices).
-
-
-extern	int		rndindex;
-
-extern  ticcmd_t       *netcmds;
-
-
-#endif
+#endif /* __D_STATE__ */
diff --git a/games/NXDoom/src/doom/dstrings.c b/games/NXDoom/src/doom/dstrings.c
index 86433ab28..514e8c408 100644
--- a/games/NXDoom/src/doom/dstrings.c
+++ b/games/NXDoom/src/doom/dstrings.c
@@ -1,59 +1,57 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Globally defined strings.
-// 
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/dstrings.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Globally defined strings.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "dstrings.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 const char *doom1_endmsg[] =
 {
-  "are you sure you want to\nquit this great game?",
-  "please don't leave, there's more\ndemons to toast!",
-  "let's beat it -- this is turning\ninto a bloodbath!",
-  "i wouldn't leave if i were you.\ndos is much worse.",
-  "you're trying to say you like dos\nbetter than me, right?",
-  "don't leave yet -- there's a\ndemon around that corner!",
-  "ya know, next time you come in here\ni'm gonna toast ya.",
-  "go ahead and leave. see if i care.",
+  DOOM1_ENDMSG
 };
 
 const char *doom2_endmsg[] =
 {
-  // QuitDOOM II messages
-  "are you sure you want to\nquit this great game?",
-  "you want to quit?\nthen, thou hast lost an eighth!",
-  "don't go now, there's a \ndimensional shambler waiting\nat the dos prompt!",
-  "get outta here and go back\nto your boring programs.",
-  "if i were your boss, i'd \n deathmatch ya in a minute!",
-  "look, bud. you leave now\nand you forfeit your body count!",
-  "just leave. when you come\nback, i'll be waiting with a bat.",
-  "you're lucky i don't smack\nyou for thinking about leaving.",
+  DOOM2_ENDMSG
 };
 
+/* UNUSED messages included in the source release */
+
 #if 0
-
-// UNUSED messages included in the source release
-
-char* endmsg[] =
+char *endmsg[] =
 {
-  // DOOM1
+  /* DOOM1 */
+
   QUITMSG,
-  // FinalDOOM?
+
+  /* FinalDOOM? */
+
   "fuck you, pussy!\nget the fuck out!",
   "you quit and i'll jizz\nin your cystholes!",
   "if you leave, i'll make\nthe lord drink my jizz.",
@@ -62,12 +60,12 @@ char* endmsg[] =
   "suck it down, asshole!\nyou're a fucking wimp!",
   "don't quit now! we're \nstill spending your money!",
 
-  // Internal debug. Different style, too.
-  "THIS IS NO MESSAGE!\nPage intentionally left blank."
-};
+  /* Internal debug. Different style, too. */
 
+  "THIS IS NO MESSAGE!\nPage intentionally left blank.",
+};
 #endif
 
-  
-
-
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/dstrings.h b/games/NXDoom/src/doom/dstrings.h
index 81115792a..b1330f66d 100644
--- a/games/NXDoom/src/doom/dstrings.h
+++ b/games/NXDoom/src/doom/dstrings.h
@@ -1,41 +1,62 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:
-//	DOOM strings, by language.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/dstrings.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ * DOOM strings, by language.
+ *
+ ****************************************************************************/
 
 #ifndef __DSTRINGS__
 #define __DSTRINGS__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-// All important printed strings.
+#include <nuttx/config.h>
 
+/* All important printed strings. */
+
+#if defined(CONFIG_GAMES_NXDOOM_LANG_EN)
 #include "d_englsh.h"
+#elif defined(CONFIG_GAMES_NXDOOM_LANG_FR)
+#include "d_french.h"
+#else
+#error "Unsupported language choice."
+#endif
 
-// Misc. other strings.
-#define SAVEGAMENAME	"doomsav"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Misc. other strings. */
 
-// QuitDOOM messages
-// 8 per each game type
-#define NUM_QUITMESSAGES   8
+#define SAVEGAMENAME "doomsav"
+
+/* QuitDOOM messages; 8 per each game type */
+
+#define NUM_QUITMESSAGES (8)
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern const char *doom1_endmsg[];
 extern const char *doom2_endmsg[];
 
-
-#endif
+#endif /* __DSTRINGS__ */
diff --git a/games/NXDoom/src/doom/f_finale.c b/games/NXDoom/src/doom/f_finale.c
index 0acd6e398..a9d964aff 100644
--- a/games/NXDoom/src/doom/f_finale.c
+++ b/games/NXDoom/src/doom/f_finale.c
@@ -1,718 +1,769 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Game completion, final screen animation.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/f_finale.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Game completion, final screen animation.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 
-// Functions.
+/* Functions. */
+
 #include "deh_main.h"
-#include "i_system.h"
 #include "i_swap.h"
-#include "z_zone.h"
+#include "i_system.h"
 #include "v_video.h"
 #include "w_wad.h"
-#include "s_sound.h"
+#include "z_zone.h"
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+#include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* Data. */
 
-// Data.
 #include "d_main.h"
 #include "dstrings.h"
-#include "sounds.h"
 
 #include "doomstat.h"
 #include "r_state.h"
 
+#include "hu_stuff.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define TEXTSPEED 3
+#define TEXTWAIT 250
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef enum
 {
-    F_STAGE_TEXT,
-    F_STAGE_ARTSCREEN,
-    F_STAGE_CAST,
+  F_STAGE_TEXT,
+  F_STAGE_ARTSCREEN,
+  F_STAGE_CAST,
 } finalestage_t;
 
-// ?
-//#include "doomstat.h"
-//#include "r_local.h"
-//#include "f_finale.h"
-
-// Stage of animation:
-finalestage_t finalestage;
-
-unsigned int finalecount;
-
-#define	TEXTSPEED	3
-#define	TEXTWAIT	250
+/* ?
+ * #include "doomstat.h"
+ * #include "r_local.h"
+ * #include "f_finale.h"
+ */
 
 typedef struct
 {
-    GameMission_t mission;
-    int episode, level;
-    const char *background;
-    const char *text;
+  gamemission_t mission;
+  int episode;
+  int level;
+  const char *background;
+  const char *text;
 } textscreen_t;
 
-static textscreen_t textscreens[] =
+typedef struct
 {
-    { doom,      1, 8,  "FLOOR4_8",  E1TEXT},
-    { doom,      2, 8,  "SFLR6_1",   E2TEXT},
-    { doom,      3, 8,  "MFLR8_4",   E3TEXT},
-    { doom,      4, 8,  "MFLR8_3",   E4TEXT},
+  const char *name;
+  mobjtype_t type;
+} castinfo_t;
 
-    { doom2,     1, 6,  "SLIME16",   C1TEXT},
-    { doom2,     1, 11, "RROCK14",   C2TEXT},
-    { doom2,     1, 20, "RROCK07",   C3TEXT},
-    { doom2,     1, 30, "RROCK17",   C4TEXT},
-    { doom2,     1, 15, "RROCK13",   C5TEXT},
-    { doom2,     1, 31, "RROCK19",   C6TEXT},
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-    { pack_tnt,  1, 6,  "SLIME16",   T1TEXT},
-    { pack_tnt,  1, 11, "RROCK14",   T2TEXT},
-    { pack_tnt,  1, 20, "RROCK07",   T3TEXT},
-    { pack_tnt,  1, 30, "RROCK17",   T4TEXT},
-    { pack_tnt,  1, 15, "RROCK13",   T5TEXT},
-    { pack_tnt,  1, 31, "RROCK19",   T6TEXT},
-
-    { pack_plut, 1, 6,  "SLIME16",   P1TEXT},
-    { pack_plut, 1, 11, "RROCK14",   P2TEXT},
-    { pack_plut, 1, 20, "RROCK07",   P3TEXT},
-    { pack_plut, 1, 30, "RROCK17",   P4TEXT},
-    { pack_plut, 1, 15, "RROCK13",   P5TEXT},
-    { pack_plut, 1, 31, "RROCK19",   P6TEXT},
+static textscreen_t g_textscreens[] =
+{
+  {doom, 1, 8, "FLOOR4_8", E1TEXT},
+  {doom, 2, 8, "SFLR6_1", E2TEXT},
+  {doom, 3, 8, "MFLR8_4", E3TEXT},
+  {doom, 4, 8, "MFLR8_3", E4TEXT},
+  {doom2, 1, 6, "SLIME16", C1TEXT},
+  {doom2, 1, 11, "RROCK14", C2TEXT},
+  {doom2, 1, 20, "RROCK07", C3TEXT},
+  {doom2, 1, 30, "RROCK17", C4TEXT},
+  {doom2, 1, 15, "RROCK13", C5TEXT},
+  {doom2, 1, 31, "RROCK19", C6TEXT},
+  {pack_tnt, 1, 6, "SLIME16", T1TEXT},
+  {pack_tnt, 1, 11, "RROCK14", T2TEXT},
+  {pack_tnt, 1, 20, "RROCK07", T3TEXT},
+  {pack_tnt, 1, 30, "RROCK17", T4TEXT},
+  {pack_tnt, 1, 15, "RROCK13", T5TEXT},
+  {pack_tnt, 1, 31, "RROCK19", T6TEXT},
+  {pack_plut, 1, 6, "SLIME16", P1TEXT},
+  {pack_plut, 1, 11, "RROCK14", P2TEXT},
+  {pack_plut, 1, 20, "RROCK07", P3TEXT},
+  {pack_plut, 1, 30, "RROCK17", P4TEXT},
+  {pack_plut, 1, 15, "RROCK13", P5TEXT},
+  {pack_plut, 1, 31, "RROCK19", P6TEXT},
 };
 
+/* Final DOOM 2 animation
+ * Casting by id Software. in order of appearance
+ */
+
+static castinfo_t g_castorder[] =
+{
+  {CC_ZOMBIE, MT_POSSESSED},
+  {CC_SHOTGUN, MT_SHOTGUY},
+  {CC_HEAVY, MT_CHAINGUY},
+  {CC_IMP, MT_TROOP},
+  {CC_DEMON, MT_SERGEANT},
+  {CC_LOST, MT_SKULL},
+  {CC_CACO, MT_HEAD},
+  {CC_HELL, MT_KNIGHT},
+  {CC_BARON, MT_BRUISER},
+  {CC_ARACH, MT_BABY},
+  {CC_PAIN, MT_PAIN},
+  {CC_REVEN, MT_UNDEAD},
+  {CC_MANCU, MT_FATSO},
+  {CC_ARCH, MT_VILE},
+  {CC_SPIDER, MT_SPIDER},
+  {CC_CYBER, MT_CYBORG},
+  {CC_HERO, MT_PLAYER},
+  {NULL, 0},
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Stage of animation: */
+
+finalestage_t finalestage;
+unsigned int finalecount;
+
 const char *finaletext;
 const char *finaleflat;
 
-void	F_StartCast (void);
-void	F_CastTicker (void);
-boolean F_CastResponder (event_t *ev);
-void	F_CastDrawer (void);
+int castnum;
+int casttics;
+state_t *caststate;
+boolean castdeath;
+int castframes;
+int castonmelee;
+boolean castattacking;
 
-//
-// F_StartFinale
-//
-void F_StartFinale (void)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void f_start_cast(void)
 {
-    size_t i;
+  wipegamestate = -1; /* force a screen wipe */
+  castnum = 0;
+  caststate = &states[mobjinfo[g_castorder[castnum].type].seestate];
+  casttics = caststate->tics;
+  castdeath = false;
+  finalestage = F_STAGE_CAST;
+  castframes = 0;
+  castonmelee = 0;
+  castattacking = false;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_change_music(MUS_EVIL, true);
+#endif
+}
 
-    gameaction = ga_nothing;
-    gamestate = GS_FINALE;
-    viewactive = false;
-    automapactive = false;
+static void f_text_write(void)
+{
+  byte *src;
+  pixel_t *dest;
+  int x;
+  int y;
+  int w;
+  signed int count;
+  const char *ch;
+  int c;
+  int cx;
+  int cy;
 
-    if (logical_gamemission == doom)
+  /* erase the entire screen to a tiled background */
+
+  src = w_cache_lump_name(finaleflat, PU_CACHE);
+  dest = i_video_buffer;
+
+  for (y = 0; y < SCREENHEIGHT; y++)
     {
-        S_ChangeMusic(mus_victor, true);
-    }
-    else
-    {
-        S_ChangeMusic(mus_read_m, true);
-    }
-
-    // Find the right screen and set the text and background
-
-    for (i=0; i<arrlen(textscreens); ++i)
-    {
-        textscreen_t *screen = &textscreens[i];
-
-        // Hack for Chex Quest
-
-        if (gameversion == exe_chex && screen->mission == doom)
+      for (x = 0; x < SCREENWIDTH / 64; x++)
         {
-            screen->level = 5;
+          memcpy(dest, src + ((y & 63) << 6), 64);
+          dest += 64;
         }
 
-        if (logical_gamemission == screen->mission
-         && (logical_gamemission != doom || gameepisode == screen->episode)
-         && gamemap == screen->level)
+      if (SCREENWIDTH & 63)
         {
-            finaletext = screen->text;
-            finaleflat = screen->background;
+          memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+          dest += (SCREENWIDTH & 63);
         }
     }
 
-    // Do dehacked substitutions of strings
-  
-    finaletext = DEH_String(finaletext);
-    finaleflat = DEH_String(finaleflat);
-    
-    finalestage = F_STAGE_TEXT;
-    finalecount = 0;
-	
-}
+  v_mark_rect(0, 0, SCREENWIDTH, SCREENHEIGHT);
 
+  /* draw some of the text onto the screen */
 
+  cx = 10;
+  cy = 10;
+  ch = finaletext;
 
-boolean F_Responder (event_t *event)
-{
-    if (finalestage == F_STAGE_CAST)
-	return F_CastResponder (event);
-	
-    return false;
-}
-
-
-//
-// F_Ticker
-//
-void F_Ticker (void)
-{
-    size_t		i;
-    
-    // check for skipping
-    if ( (gamemode == commercial)
-      && ( finalecount > 50) )
+  count = ((signed int)finalecount - 10) / TEXTSPEED;
+  if (count < 0) count = 0;
+  for (; count; count--)
     {
-      // go on to the next level
-      for (i=0 ; i<MAXPLAYERS ; i++)
-	if (players[i].cmd.buttons)
-	  break;
-				
+      c = *ch++;
+      if (!c) break;
+      if (c == '\n')
+        {
+          cx = 10;
+          cy += 11;
+          continue;
+        }
+
+      c = toupper(c) - HU_FONTSTART;
+      if (c < 0 || c >= HU_FONTSIZE)
+        {
+          cx += 4;
+          continue;
+        }
+
+      w = SHORT(hu_font[c]->width);
+      if (cx + w > SCREENWIDTH) break;
+      v_draw_patch(cx, cy, hu_font[c]);
+      cx += w;
+    }
+}
+
+static void f_cast_ticker(void)
+{
+  int st;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  int sfx;
+#endif
+
+  if (--casttics > 0) return; /* not time to change state yet */
+
+  if (caststate->tics == -1 || caststate->nextstate == S_NULL)
+    {
+      /* switch from deathstate to next monster */
+
+      castnum++;
+      castdeath = false;
+      if (g_castorder[castnum].name == NULL) castnum = 0;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (mobjinfo[g_castorder[castnum].type].seesound)
+        {
+          s_start_sound(NULL, mobjinfo[g_castorder[castnum].type].seesound);
+        }
+
+#endif
+
+      caststate = &states[mobjinfo[g_castorder[castnum].type].seestate];
+      castframes = 0;
+    }
+  else
+    {
+      /* just advance to next state in animation */
+
+      if (caststate == &states[S_PLAY_ATK1])
+        {
+          goto stopattack; /* Oh, gross hack! */
+        }
+
+      st = caststate->nextstate;
+      caststate = &states[st];
+      castframes++;
+
+      /* sound hacks.... */
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      switch (st)
+        {
+        case S_PLAY_ATK1:
+          sfx = SFX_DSHTGN;
+          break;
+        case S_POSS_ATK2:
+          sfx = SFX_PISTOL;
+          break;
+        case S_SPOS_ATK2:
+          sfx = SFX_SHOTGN;
+          break;
+        case S_VILE_ATK2:
+          sfx = SFX_VILATK;
+          break;
+        case S_SKEL_FIST2:
+          sfx = SFX_SKESWG;
+          break;
+        case S_SKEL_FIST4:
+          sfx = SFX_SKEPCH;
+          break;
+        case S_SKEL_MISS2:
+          sfx = SFX_SKEATK;
+          break;
+        case S_FATT_ATK8:
+        case S_FATT_ATK5:
+        case S_FATT_ATK2:
+          sfx = SFX_FIRSHT;
+          break;
+        case S_CPOS_ATK2:
+        case S_CPOS_ATK3:
+        case S_CPOS_ATK4:
+          sfx = SFX_SHOTGN;
+          break;
+        case S_TROO_ATK3:
+          sfx = SFX_CLAW;
+          break;
+        case S_SARG_ATK2:
+          sfx = SFX_SGTATK;
+          break;
+        case S_BOSS_ATK2:
+        case S_BOS2_ATK2:
+        case S_HEAD_ATK2:
+          sfx = SFX_FIRSHT;
+          break;
+        case S_SKULL_ATK2:
+          sfx = SFX_SKLATK;
+          break;
+        case S_SPID_ATK2:
+        case S_SPID_ATK3:
+          sfx = SFX_SHOTGN;
+          break;
+        case S_BSPI_ATK2:
+          sfx = SFX_PLASMA;
+          break;
+        case S_CYBER_ATK2:
+        case S_CYBER_ATK4:
+        case S_CYBER_ATK6:
+          sfx = SFX_RLAUNC;
+          break;
+        case S_PAIN_ATK3:
+          sfx = SFX_SKLATK;
+          break;
+        default:
+          sfx = 0;
+          break;
+        }
+
+      if (sfx) s_start_sound(NULL, sfx);
+#endif
+    }
+
+  if (castframes == 12)
+    {
+      /* go into attack frame */
+
+      castattacking = true;
+
+      if (castonmelee)
+        {
+          caststate =
+              &states[mobjinfo[g_castorder[castnum].type].meleestate];
+        }
+      else
+        {
+          caststate =
+              &states[mobjinfo[g_castorder[castnum].type].missilestate];
+        }
+
+      castonmelee ^= 1;
+
+      if (caststate == &states[S_NULL])
+        {
+          if (castonmelee)
+            {
+              caststate =
+                  &states[mobjinfo[g_castorder[castnum].type].meleestate];
+            }
+          else
+            {
+              caststate =
+                  &states[mobjinfo[g_castorder[castnum].type].missilestate];
+            }
+        }
+    }
+
+  if (castattacking)
+    {
+      if (castframes == 24 ||
+          caststate == &states[mobjinfo[g_castorder[castnum].type].seestate])
+        {
+        stopattack:
+          castattacking = false;
+          castframes = 0;
+          caststate = &states[mobjinfo[g_castorder[castnum].type].seestate];
+        }
+    }
+
+  casttics = caststate->tics;
+  if (casttics == -1) casttics = 15;
+}
+
+static boolean f_cast_responder(event_t *ev)
+{
+  if (ev->type != ev_keydown) return false;
+
+  if (castdeath) return true; /* already in dying frames */
+
+  /* go into death frame */
+
+  castdeath = true;
+  caststate = &states[mobjinfo[g_castorder[castnum].type].deathstate];
+  casttics = caststate->tics;
+  castframes = 0;
+  castattacking = false;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (mobjinfo[g_castorder[castnum].type].deathsound)
+    {
+      s_start_sound(NULL, mobjinfo[g_castorder[castnum].type].deathsound);
+    }
+#endif
+
+  return true;
+}
+
+static void f_cast_print(const char *text)
+{
+  const char *ch;
+  int c;
+  int cx;
+  int w;
+  int width;
+
+  /* find width */
+
+  ch = text;
+  width = 0;
+
+  while (ch)
+    {
+      c = *ch++;
+      if (!c) break;
+      c = toupper(c) - HU_FONTSTART;
+      if (c < 0 || c >= HU_FONTSIZE)
+        {
+          width += 4;
+          continue;
+        }
+
+      w = SHORT(hu_font[c]->width);
+      width += w;
+    }
+
+  /* draw it */
+
+  cx = SCREENWIDTH / 2 - width / 2;
+  ch = text;
+  while (ch)
+    {
+      c = *ch++;
+      if (!c) break;
+      c = toupper(c) - HU_FONTSTART;
+      if (c < 0 || c >= HU_FONTSIZE)
+        {
+          cx += 4;
+          continue;
+        }
+
+      w = SHORT(hu_font[c]->width);
+      v_draw_patch(cx, 180, hu_font[c]);
+      cx += w;
+    }
+}
+
+static void f_cast_drawer(void)
+{
+  spritedef_t *sprdef;
+  spriteframe_t *sprframe;
+  int lump;
+  boolean flip;
+  patch_t *patch;
+
+  /* erase the entire screen to a background */
+
+  v_draw_patch(0, 0, w_cache_lump_name(("BOSSBACK"), PU_CACHE));
+
+  f_cast_print((g_castorder[castnum].name));
+
+  /* draw the current frame in the middle of the screen */
+
+  sprdef = &sprites[caststate->sprite];
+  sprframe = &sprdef->spriteframes[caststate->frame & FF_FRAMEMASK];
+  lump = sprframe->lump[0];
+  flip = (boolean)sprframe->flip[0];
+
+  patch = w_cache_lump_num(lump + firstspritelump, PU_CACHE);
+  if (flip)
+    v_draw_patch_flipped(SCREENWIDTH / 2, 170, patch);
+  else
+    v_draw_patch(SCREENWIDTH / 2, 170, patch);
+}
+
+static void f_draw_patch_col(int x, patch_t *patch, int col)
+{
+  column_t *column;
+  byte *source;
+  pixel_t *dest;
+  pixel_t *desttop;
+  int count;
+
+  column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+  desttop = i_video_buffer + x;
+
+  /* step through the posts in a column */
+
+  while (column->topdelta != 0xff)
+    {
+      source = (byte *)column + 3;
+      dest = desttop + column->topdelta * SCREENWIDTH;
+      count = column->length;
+
+      while (count--)
+        {
+          *dest = *source++;
+          dest += SCREENWIDTH;
+        }
+
+      column = (column_t *)((byte *)column + column->length + 4);
+    }
+}
+
+static void f_bunny_scroll(void)
+{
+  signed int scrolled;
+  int x;
+  patch_t *p1;
+  patch_t *p2;
+  char name[10];
+  int stage;
+  static int laststage;
+
+  p1 = w_cache_lump_name(("PFUB2"), PU_LEVEL);
+  p2 = w_cache_lump_name(("PFUB1"), PU_LEVEL);
+
+  v_mark_rect(0, 0, SCREENWIDTH, SCREENHEIGHT);
+
+  scrolled = (SCREENWIDTH - ((signed int)finalecount - 230) / 2);
+  if (scrolled > SCREENWIDTH) scrolled = SCREENWIDTH;
+  if (scrolled < 0) scrolled = 0;
+
+  for (x = 0; x < SCREENWIDTH; x++)
+    {
+      if (x + scrolled < SCREENWIDTH)
+        f_draw_patch_col(x, p1, x + scrolled);
+      else
+        f_draw_patch_col(x, p2, x + scrolled - SCREENWIDTH);
+    }
+
+  if (finalecount < 1130) return;
+  if (finalecount < 1180)
+    {
+      v_draw_patch((SCREENWIDTH - 13 * 8) / 2, (SCREENHEIGHT - 8 * 8) / 2,
+                   w_cache_lump_name(("END0"), PU_CACHE));
+      laststage = 0;
+      return;
+    }
+
+  stage = (finalecount - 1180) / 5;
+  if (stage > 6) stage = 6;
+  if (stage > laststage)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_PISTOL);
+#endif
+      laststage = stage;
+    }
+
+  snprintf(name, 10, "END%i", stage);
+  v_draw_patch((SCREENWIDTH - 13 * 8) / 2, (SCREENHEIGHT - 8 * 8) / 2,
+               w_cache_lump_name(name, PU_CACHE));
+}
+
+static void f_art_screen_drawer(void)
+{
+  const char *lumpname;
+
+  if (gameepisode == 3)
+    {
+      f_bunny_scroll();
+    }
+  else
+    {
+      switch (gameepisode)
+        {
+        case 1:
+          if (gameversion >= exe_ultimate)
+            {
+              lumpname = "CREDIT";
+            }
+          else
+            {
+              lumpname = "HELP2";
+            }
+          break;
+        case 2:
+          lumpname = "VICTORY2";
+          break;
+        case 4:
+          lumpname = "ENDPIC";
+          break;
+        default:
+          return;
+        }
+
+      lumpname = (lumpname);
+
+      v_draw_patch(0, 0, w_cache_lump_name(lumpname, PU_CACHE));
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* f_start_finale */
+
+void f_start_finale(void)
+{
+  size_t i;
+
+  gameaction = ga_nothing;
+  gamestate = GS_FINALE;
+  viewactive = false;
+  automapactive = false;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (logical_gamemission == doom)
+    {
+      s_change_music(MUS_VICTOR, true);
+    }
+  else
+    {
+      s_change_music(MUS_READ_M, true);
+    }
+#endif
+
+  /* Find the right screen and set the text and background */
+
+  for (i = 0; i < arrlen(g_textscreens); ++i)
+    {
+      textscreen_t *screen = &g_textscreens[i];
+
+      /* Hack for Chex Quest */
+
+      if (gameversion == exe_chex && screen->mission == doom)
+        {
+          screen->level = 5;
+        }
+
+      if (logical_gamemission == screen->mission &&
+          (logical_gamemission != doom || gameepisode == screen->episode) &&
+          gamemap == screen->level)
+        {
+          finaletext = screen->text;
+          finaleflat = screen->background;
+        }
+    }
+
+  /* Do dehacked substitutions of strings */
+
+  finaletext = (finaletext);
+  finaleflat = (finaleflat);
+
+  finalestage = F_STAGE_TEXT;
+  finalecount = 0;
+}
+
+boolean f_responder(event_t *event)
+{
+  if (finalestage == F_STAGE_CAST) return f_cast_responder(event);
+
+  return false;
+}
+
+void f_ticker(void)
+{
+  size_t i;
+
+  /* check for skipping */
+
+  if ((gamemode == commercial) && (finalecount > 50))
+    {
+      /* go on to the next level */
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (players[i].cmd.buttons) break;
+        }
+
       if (i < MAXPLAYERS)
-      {	
-	if (gamemap == 30)
-	  F_StartCast ();
-	else
-	  gameaction = ga_worlddone;
-      }
-    }
-    
-    // advance animation
-    finalecount++;
-	
-    if (finalestage == F_STAGE_CAST)
-    {
-	F_CastTicker ();
-	return;
-    }
-	
-    if ( gamemode == commercial)
-	return;
-		
-    if (finalestage == F_STAGE_TEXT
-     && finalecount>strlen (finaletext)*TEXTSPEED + TEXTWAIT)
-    {
-	finalecount = 0;
-	finalestage = F_STAGE_ARTSCREEN;
-	wipegamestate = -1;		// force a wipe
-	if (gameepisode == 3)
-	    S_StartMusic (mus_bunny);
-    }
-}
-
-
-
-//
-// F_TextWrite
-//
-
-#include "hu_stuff.h"
-
-
-void F_TextWrite (void)
-{
-    byte*	src;
-    pixel_t*	dest;
-    
-    int		x,y,w;
-    signed int	count;
-    const char *ch;
-    int		c;
-    int		cx;
-    int		cy;
-    
-    // erase the entire screen to a tiled background
-    src = W_CacheLumpName ( finaleflat , PU_CACHE);
-    dest = I_VideoBuffer;
-	
-    for (y=0 ; y<SCREENHEIGHT ; y++)
-    {
-	for (x=0 ; x<SCREENWIDTH/64 ; x++)
-	{
-	    memcpy (dest, src+((y&63)<<6), 64);
-	    dest += 64;
-	}
-	if (SCREENWIDTH&63)
-	{
-	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63);
-	    dest += (SCREENWIDTH&63);
-	}
-    }
-
-    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
-    
-    // draw some of the text onto the screen
-    cx = 10;
-    cy = 10;
-    ch = finaletext;
-	
-    count = ((signed int) finalecount - 10) / TEXTSPEED;
-    if (count < 0)
-	count = 0;
-    for ( ; count ; count-- )
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	if (c == '\n')
-	{
-	    cx = 10;
-	    cy += 11;
-	    continue;
-	}
-		
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c >= HU_FONTSIZE)
-	{
-	    cx += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	if (cx+w > SCREENWIDTH)
-	    break;
-	V_DrawPatch(cx, cy, hu_font[c]);
-	cx+=w;
-    }
-	
-}
-
-//
-// Final DOOM 2 animation
-// Casting by id Software.
-//   in order of appearance
-//
-typedef struct
-{
-    const char	*name;
-    mobjtype_t	type;
-} castinfo_t;
-
-castinfo_t	castorder[] = {
-    {CC_ZOMBIE, MT_POSSESSED},
-    {CC_SHOTGUN, MT_SHOTGUY},
-    {CC_HEAVY, MT_CHAINGUY},
-    {CC_IMP, MT_TROOP},
-    {CC_DEMON, MT_SERGEANT},
-    {CC_LOST, MT_SKULL},
-    {CC_CACO, MT_HEAD},
-    {CC_HELL, MT_KNIGHT},
-    {CC_BARON, MT_BRUISER},
-    {CC_ARACH, MT_BABY},
-    {CC_PAIN, MT_PAIN},
-    {CC_REVEN, MT_UNDEAD},
-    {CC_MANCU, MT_FATSO},
-    {CC_ARCH, MT_VILE},
-    {CC_SPIDER, MT_SPIDER},
-    {CC_CYBER, MT_CYBORG},
-    {CC_HERO, MT_PLAYER},
-
-    {NULL,0}
-};
-
-int		castnum;
-int		casttics;
-state_t*	caststate;
-boolean		castdeath;
-int		castframes;
-int		castonmelee;
-boolean		castattacking;
-
-
-//
-// F_StartCast
-//
-void F_StartCast (void)
-{
-    wipegamestate = -1;		// force a screen wipe
-    castnum = 0;
-    caststate = &states[mobjinfo[castorder[castnum].type].seestate];
-    casttics = caststate->tics;
-    castdeath = false;
-    finalestage = F_STAGE_CAST;
-    castframes = 0;
-    castonmelee = 0;
-    castattacking = false;
-    S_ChangeMusic(mus_evil, true);
-}
-
-
-//
-// F_CastTicker
-//
-void F_CastTicker (void)
-{
-    int		st;
-    int		sfx;
-	
-    if (--casttics > 0)
-	return;			// not time to change state yet
-		
-    if (caststate->tics == -1 || caststate->nextstate == S_NULL)
-    {
-	// switch from deathstate to next monster
-	castnum++;
-	castdeath = false;
-	if (castorder[castnum].name == NULL)
-	    castnum = 0;
-	if (mobjinfo[castorder[castnum].type].seesound)
-	    S_StartSound (NULL, mobjinfo[castorder[castnum].type].seesound);
-	caststate = &states[mobjinfo[castorder[castnum].type].seestate];
-	castframes = 0;
-    }
-    else
-    {
-	// just advance to next state in animation
-	if (caststate == &states[S_PLAY_ATK1])
-	    goto stopattack;	// Oh, gross hack!
-	st = caststate->nextstate;
-	caststate = &states[st];
-	castframes++;
-	
-	// sound hacks....
-	switch (st)
-	{
-	  case S_PLAY_ATK1:	sfx = sfx_dshtgn; break;
-	  case S_POSS_ATK2:	sfx = sfx_pistol; break;
-	  case S_SPOS_ATK2:	sfx = sfx_shotgn; break;
-	  case S_VILE_ATK2:	sfx = sfx_vilatk; break;
-	  case S_SKEL_FIST2:	sfx = sfx_skeswg; break;
-	  case S_SKEL_FIST4:	sfx = sfx_skepch; break;
-	  case S_SKEL_MISS2:	sfx = sfx_skeatk; break;
-	  case S_FATT_ATK8:
-	  case S_FATT_ATK5:
-	  case S_FATT_ATK2:	sfx = sfx_firsht; break;
-	  case S_CPOS_ATK2:
-	  case S_CPOS_ATK3:
-	  case S_CPOS_ATK4:	sfx = sfx_shotgn; break;
-	  case S_TROO_ATK3:	sfx = sfx_claw; break;
-	  case S_SARG_ATK2:	sfx = sfx_sgtatk; break;
-	  case S_BOSS_ATK2:
-	  case S_BOS2_ATK2:
-	  case S_HEAD_ATK2:	sfx = sfx_firsht; break;
-	  case S_SKULL_ATK2:	sfx = sfx_sklatk; break;
-	  case S_SPID_ATK2:
-	  case S_SPID_ATK3:	sfx = sfx_shotgn; break;
-	  case S_BSPI_ATK2:	sfx = sfx_plasma; break;
-	  case S_CYBER_ATK2:
-	  case S_CYBER_ATK4:
-	  case S_CYBER_ATK6:	sfx = sfx_rlaunc; break;
-	  case S_PAIN_ATK3:	sfx = sfx_sklatk; break;
-	  default: sfx = 0; break;
-	}
-		
-	if (sfx)
-	    S_StartSound (NULL, sfx);
-    }
-	
-    if (castframes == 12)
-    {
-	// go into attack frame
-	castattacking = true;
-	if (castonmelee)
-	    caststate=&states[mobjinfo[castorder[castnum].type].meleestate];
-	else
-	    caststate=&states[mobjinfo[castorder[castnum].type].missilestate];
-	castonmelee ^= 1;
-	if (caststate == &states[S_NULL])
-	{
-	    if (castonmelee)
-		caststate=
-		    &states[mobjinfo[castorder[castnum].type].meleestate];
-	    else
-		caststate=
-		    &states[mobjinfo[castorder[castnum].type].missilestate];
-	}
-    }
-	
-    if (castattacking)
-    {
-	if (castframes == 24
-	    ||	caststate == &states[mobjinfo[castorder[castnum].type].seestate] )
-	{
-	  stopattack:
-	    castattacking = false;
-	    castframes = 0;
-	    caststate = &states[mobjinfo[castorder[castnum].type].seestate];
-	}
-    }
-	
-    casttics = caststate->tics;
-    if (casttics == -1)
-	casttics = 15;
-}
-
-
-//
-// F_CastResponder
-//
-
-boolean F_CastResponder (event_t* ev)
-{
-    if (ev->type != ev_keydown)
-	return false;
-		
-    if (castdeath)
-	return true;			// already in dying frames
-		
-    // go into death frame
-    castdeath = true;
-    caststate = &states[mobjinfo[castorder[castnum].type].deathstate];
-    casttics = caststate->tics;
-    castframes = 0;
-    castattacking = false;
-    if (mobjinfo[castorder[castnum].type].deathsound)
-	S_StartSound (NULL, mobjinfo[castorder[castnum].type].deathsound);
-	
-    return true;
-}
-
-
-void F_CastPrint (const char *text)
-{
-    const char *ch;
-    int		c;
-    int		cx;
-    int		w;
-    int		width;
-    
-    // find width
-    ch = text;
-    width = 0;
-	
-    while (ch)
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c >= HU_FONTSIZE)
-	{
-	    width += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	width += w;
-    }
-    
-    // draw it
-    cx = SCREENWIDTH/2-width/2;
-    ch = text;
-    while (ch)
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c >= HU_FONTSIZE)
-	{
-	    cx += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	V_DrawPatch(cx, 180, hu_font[c]);
-	cx+=w;
-    }
-	
-}
-
-
-//
-// F_CastDrawer
-//
-
-void F_CastDrawer (void)
-{
-    spritedef_t*	sprdef;
-    spriteframe_t*	sprframe;
-    int			lump;
-    boolean		flip;
-    patch_t*		patch;
-    
-    // erase the entire screen to a background
-    V_DrawPatch (0, 0, W_CacheLumpName (DEH_String("BOSSBACK"), PU_CACHE));
-
-    F_CastPrint (DEH_String(castorder[castnum].name));
-    
-    // draw the current frame in the middle of the screen
-    sprdef = &sprites[caststate->sprite];
-    sprframe = &sprdef->spriteframes[ caststate->frame & FF_FRAMEMASK];
-    lump = sprframe->lump[0];
-    flip = (boolean)sprframe->flip[0];
-			
-    patch = W_CacheLumpNum (lump+firstspritelump, PU_CACHE);
-    if (flip)
-	V_DrawPatchFlipped(SCREENWIDTH/2, 170, patch);
-    else
-	V_DrawPatch(SCREENWIDTH/2, 170, patch);
-}
-
-
-//
-// F_DrawPatchCol
-//
-void
-F_DrawPatchCol
-( int		x,
-  patch_t*	patch,
-  int		col )
-{
-    column_t*	column;
-    byte*	source;
-    pixel_t*	dest;
-    pixel_t*	desttop;
-    int		count;
-	
-    column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
-    desttop = I_VideoBuffer + x;
-
-    // step through the posts in a column
-    while (column->topdelta != 0xff )
-    {
-	source = (byte *)column + 3;
-	dest = desttop + column->topdelta*SCREENWIDTH;
-	count = column->length;
-		
-	while (count--)
-	{
-	    *dest = *source++;
-	    dest += SCREENWIDTH;
-	}
-	column = (column_t *)(  (byte *)column + column->length + 4 );
-    }
-}
-
-
-//
-// F_BunnyScroll
-//
-void F_BunnyScroll (void)
-{
-    signed int  scrolled;
-    int		x;
-    patch_t*	p1;
-    patch_t*	p2;
-    char	name[10];
-    int		stage;
-    static int	laststage;
-		
-    p1 = W_CacheLumpName (DEH_String("PFUB2"), PU_LEVEL);
-    p2 = W_CacheLumpName (DEH_String("PFUB1"), PU_LEVEL);
-
-    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
-	
-    scrolled = (SCREENWIDTH - ((signed int) finalecount-230)/2);
-    if (scrolled > SCREENWIDTH)
-	scrolled = SCREENWIDTH;
-    if (scrolled < 0)
-	scrolled = 0;
-		
-    for ( x=0 ; x<SCREENWIDTH ; x++)
-    {
-	if (x+scrolled < SCREENWIDTH)
-	    F_DrawPatchCol (x, p1, x+scrolled);
-	else
-	    F_DrawPatchCol (x, p2, x+scrolled - SCREENWIDTH);		
-    }
-	
-    if (finalecount < 1130)
-	return;
-    if (finalecount < 1180)
-    {
-        V_DrawPatch((SCREENWIDTH - 13 * 8) / 2,
-                    (SCREENHEIGHT - 8 * 8) / 2, 
-                    W_CacheLumpName(DEH_String("END0"), PU_CACHE));
-	laststage = 0;
-	return;
-    }
-	
-    stage = (finalecount-1180) / 5;
-    if (stage > 6)
-	stage = 6;
-    if (stage > laststage)
-    {
-	S_StartSound (NULL, sfx_pistol);
-	laststage = stage;
-    }
-	
-    DEH_snprintf(name, 10, "END%i", stage);
-    V_DrawPatch((SCREENWIDTH - 13 * 8) / 2, 
-                (SCREENHEIGHT - 8 * 8) / 2, 
-                W_CacheLumpName (name,PU_CACHE));
-}
-
-static void F_ArtScreenDrawer(void)
-{
-    const char *lumpname;
-    
-    if (gameepisode == 3)
-    {
-        F_BunnyScroll();
-    }
-    else
-    {
-        switch (gameepisode)
         {
-            case 1:
-                if (gameversion >= exe_ultimate)
-                {
-                    lumpname = "CREDIT";
-                }
-                else
-                {
-                    lumpname = "HELP2";
-                }
-                break;
-            case 2:
-                lumpname = "VICTORY2";
-                break;
-            case 4:
-                lumpname = "ENDPIC";
-                break;
-            default:
-                return;
+          if (gamemap == 30)
+            f_start_cast();
+          else
+            gameaction = ga_worlddone;
         }
-
-        lumpname = DEH_String(lumpname);
-
-        V_DrawPatch (0, 0, W_CacheLumpName(lumpname, PU_CACHE));
     }
-}
 
-//
-// F_Drawer
-//
-void F_Drawer (void)
-{
-    switch (finalestage)
+  /* advance animation */
+
+  finalecount++;
+
+  if (finalestage == F_STAGE_CAST)
     {
-        case F_STAGE_CAST:
-            F_CastDrawer();
-            break;
-        case F_STAGE_TEXT:
-            F_TextWrite();
-            break;
-        case F_STAGE_ARTSCREEN:
-            F_ArtScreenDrawer();
-            break;
+      f_cast_ticker();
+      return;
+    }
+
+  if (gamemode == commercial) return;
+
+  if (finalestage == F_STAGE_TEXT &&
+      finalecount > strlen(finaletext) * TEXTSPEED + TEXTWAIT)
+    {
+      finalecount = 0;
+      finalestage = F_STAGE_ARTSCREEN;
+      wipegamestate = -1; /* force a wipe */
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameepisode == 3) s_start_music(MUS_BUNNY);
+#endif
     }
 }
 
-
+void f_drawer(void)
+{
+  switch (finalestage)
+    {
+    case F_STAGE_CAST:
+      f_cast_drawer();
+      break;
+    case F_STAGE_TEXT:
+      f_text_write();
+      break;
+    case F_STAGE_ARTSCREEN:
+      f_art_screen_drawer();
+      break;
+    }
+}
diff --git a/games/NXDoom/src/doom/f_finale.h b/games/NXDoom/src/doom/f_finale.h
index daa71c32a..3e60e15a7 100644
--- a/games/NXDoom/src/doom/f_finale.h
+++ b/games/NXDoom/src/doom/f_finale.h
@@ -1,45 +1,49 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/f_finale.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef __F_FINALE__
 #define __F_FINALE__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "doomtype.h"
 #include "d_event.h"
-//
-// FINALE
-//
+#include "doomtype.h"
 
-// Called by main loop.
-boolean F_Responder (event_t* ev);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Called by main loop.
-void F_Ticker (void);
+/* Called by main loop. */
 
-// Called by main loop.
-void F_Drawer (void);
+boolean f_responder(event_t *ev);
 
+/* Called by main loop. */
 
-void F_StartFinale (void);
+void f_ticker(void);
 
+/* Called by main loop. */
 
+void f_drawer(void);
 
+void f_start_finale(void);
 
-#endif
+#endif /* __F_FINALE__ */
diff --git a/games/NXDoom/src/doom/f_wipe.c b/games/NXDoom/src/doom/f_wipe.c
index 0fa7754dd..e10a0bd21 100644
--- a/games/NXDoom/src/doom/f_wipe.c
+++ b/games/NXDoom/src/doom/f_wipe.c
@@ -1,294 +1,296 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Mission begin melt/wipe screen special effect.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/f_wipe.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Mission begin melt/wipe screen special effect.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <string.h>
 
-#include "z_zone.h"
 #include "i_video.h"
-#include "v_video.h"
 #include "m_random.h"
+#include "v_video.h"
+#include "z_zone.h"
 
 #include "doomtype.h"
 
 #include "f_wipe.h"
 
-//
-//                       SCREEN WIPE PACKAGE
-//
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-// when zero, stop the wipe
-static boolean	go = 0;
+static void wipe_shitty_col_major_xform(dpixel_t *array, int width,
+                                        int height);
+static int wip_init_colour_xform(int width, int height, int ticks);
+static int wipe_do_colour_xform(int width, int height, int ticks);
+static int wip_exit_color_xform(int width, int height, int ticks);
+static int wipe_init_melt(int width, int height, int ticks);
+static int wipe_do_melt(int width, int height, int ticks);
+static int wipe_exit_melt(int width, int height, int ticks);
 
-static pixel_t*	wipe_scr_start;
-static pixel_t*	wipe_scr_end;
-static pixel_t*	wipe_scr;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
+/* when zero, stop the wipe */
 
-void
-wipe_shittyColMajorXform
-( dpixel_t*	array,
-  int		width,
-  int		height )
+static boolean go = 0;
+
+static pixel_t *wipe_scr_start;
+static pixel_t *wipe_scr_end;
+static pixel_t *wipe_scr;
+
+static int *g_y;
+
+static int (*g_wipes[])(int, int, int) =
 {
-    int		x;
-    int		y;
-    dpixel_t*	dest;
+  wip_init_colour_xform, wipe_do_colour_xform, wip_exit_color_xform,
+  wipe_init_melt,        wipe_do_melt,         wipe_exit_melt,
+};
 
-    dest = (dpixel_t*) Z_Malloc(width*height*sizeof(*dest), PU_STATIC, 0);
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-    for(y=0;y<height;y++)
-	for(x=0;x<width;x++)
-	    dest[x*height+y] = array[y*width+x];
-
-    memcpy(array, dest, width*height*sizeof(*dest));
-
-    Z_Free(dest);
-
-}
-
-int
-wipe_initColorXForm
-( int	width,
-  int	height,
-  int	ticks )
+static void wipe_shitty_col_major_xform(dpixel_t *array, int width,
+                                        int height)
 {
-    memcpy(wipe_scr, wipe_scr_start, width*height*sizeof(*wipe_scr));
-    return 0;
-}
+  int x;
+  int y;
+  dpixel_t *dest;
 
-int
-wipe_doColorXForm
-( int	width,
-  int	height,
-  int	ticks )
-{
-    boolean	changed;
-    pixel_t*	w;
-    pixel_t*	e;
-    int		newval;
+  dest = (dpixel_t *)z_malloc(width * height * sizeof(*dest), PU_STATIC, 0);
 
-    changed = false;
-    w = wipe_scr;
-    e = wipe_scr_end;
-    
-    while (w!=wipe_scr+width*height)
+  for (y = 0; y < height; y++)
     {
-	if (*w != *e)
-	{
-	    if (*w > *e)
-	    {
-		newval = *w - ticks;
-		if (newval < *e)
-		    *w = *e;
-		else
-		    *w = newval;
-		changed = true;
-	    }
-	    else if (*w < *e)
-	    {
-		newval = *w + ticks;
-		if (newval > *e)
-		    *w = *e;
-		else
-		    *w = newval;
-		changed = true;
-	    }
-	}
-	w++;
-	e++;
+      for (x = 0; x < width; x++)
+        {
+          dest[x * height + y] = array[y * width + x];
+        }
     }
 
-    return !changed;
+  memcpy(array, dest, width * height * sizeof(*dest));
 
+  z_free(dest);
 }
 
-int
-wipe_exitColorXForm
-( int	width,
-  int	height,
-  int	ticks )
+static int wip_init_colour_xform(int width, int height, int ticks)
 {
-    return 0;
+  memcpy(wipe_scr, wipe_scr_start, width * height * sizeof(*wipe_scr));
+  return 0;
 }
 
-
-static int*	y;
-
-int
-wipe_initMelt
-( int	width,
-  int	height,
-  int	ticks )
+static int wipe_do_colour_xform(int width, int height, int ticks)
 {
-    int i, r;
-    
-    // copy start screen to main screen
-    memcpy(wipe_scr, wipe_scr_start, width*height*sizeof(*wipe_scr));
-    
-    // makes this wipe faster (in theory)
-    // to have stuff in column-major format
-    wipe_shittyColMajorXform((dpixel_t*)wipe_scr_start, width/2, height);
-    wipe_shittyColMajorXform((dpixel_t*)wipe_scr_end, width/2, height);
-    
-    // setup initial column positions
-    // (y<0 => not ready to scroll yet)
-    y = (int *) Z_Malloc(width*sizeof(int), PU_STATIC, 0);
-    y[0] = -(M_Random()%16);
-    for (i=1;i<width;i++)
+  boolean changed;
+  pixel_t *w;
+  pixel_t *e;
+  int newval;
+
+  changed = false;
+  w = wipe_scr;
+  e = wipe_scr_end;
+
+  while (w != wipe_scr + width * height)
     {
-	r = (M_Random()%3) - 1;
-	y[i] = y[i-1] + r;
-	if (y[i] > 0) y[i] = 0;
-	else if (y[i] == -16) y[i] = -15;
+      if (*w != *e)
+        {
+          if (*w > *e)
+            {
+              newval = *w - ticks;
+              if (newval < *e)
+                *w = *e;
+              else
+                *w = newval;
+              changed = true;
+            }
+          else if (*w < *e)
+            {
+              newval = *w + ticks;
+              if (newval > *e)
+                *w = *e;
+              else
+                *w = newval;
+              changed = true;
+            }
+        }
+
+      w++;
+      e++;
     }
 
-    return 0;
+  return !changed;
 }
 
-int
-wipe_doMelt
-( int	width,
-  int	height,
-  int	ticks )
+static int wip_exit_color_xform(int width, int height, int ticks)
 {
-    int		i;
-    int		j;
-    int		dy;
-    int		idx;
-    
-    dpixel_t*	s;
-    dpixel_t*	d;
-    boolean	done = true;
+  return 0;
+}
 
-    width/=2;
+static int wipe_init_melt(int width, int height, int ticks)
+{
+  int i;
+  int r;
 
-    while (ticks--)
+  /* copy start screen to main screen */
+
+  memcpy(wipe_scr, wipe_scr_start, width * height * sizeof(*wipe_scr));
+
+  /* makes this wipe faster (in theory)
+   * to have stuff in column-major format
+   */
+
+  wipe_shitty_col_major_xform((dpixel_t *)wipe_scr_start, width / 2, height);
+  wipe_shitty_col_major_xform((dpixel_t *)wipe_scr_end, width / 2, height);
+
+  /* setup initial column positions
+   * (y<0 => not ready to scroll yet)
+   */
+
+  g_y = (int *)z_malloc(width * sizeof(int), PU_STATIC, 0);
+  g_y[0] = -(m_random() % 16);
+  for (i = 1; i < width; i++)
     {
-	for (i=0;i<width;i++)
-	{
-	    if (y[i]<0)
-	    {
-		y[i]++; done = false;
-	    }
-	    else if (y[i] < height)
-	    {
-		dy = (y[i] < 16) ? y[i]+1 : 8;
-		if (y[i]+dy >= height) dy = height - y[i];
-		s = &((dpixel_t *)wipe_scr_end)[i*height+y[i]];
-		d = &((dpixel_t *)wipe_scr)[y[i]*width+i];
-		idx = 0;
-		for (j=dy;j;j--)
-		{
-		    d[idx] = *(s++);
-		    idx += width;
-		}
-		y[i] += dy;
-		s = &((dpixel_t *)wipe_scr_start)[i*height];
-		d = &((dpixel_t *)wipe_scr)[y[i]*width+i];
-		idx = 0;
-		for (j=height-y[i];j;j--)
-		{
-		    d[idx] = *(s++);
-		    idx += width;
-		}
-		done = false;
-	    }
-	}
+      r = (m_random() % 3) - 1;
+      g_y[i] = g_y[i - 1] + r;
+      if (g_y[i] > 0)
+        g_y[i] = 0;
+      else if (g_y[i] == -16)
+        g_y[i] = -15;
     }
 
-    return done;
-
+  return 0;
 }
 
-int
-wipe_exitMelt
-( int	width,
-  int	height,
-  int	ticks )
+static int wipe_do_melt(int width, int height, int ticks)
 {
-    Z_Free(y);
-    Z_Free(wipe_scr_start);
-    Z_Free(wipe_scr_end);
-    return 0;
-}
+  int i;
+  int j;
+  int dy;
+  int idx;
 
-int
-wipe_StartScreen
-( int	x,
-  int	y,
-  int	width,
-  int	height )
-{
-    wipe_scr_start = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*wipe_scr_start), PU_STATIC, NULL);
-    I_ReadScreen(wipe_scr_start);
-    return 0;
-}
+  dpixel_t *s;
+  dpixel_t *d;
+  boolean done = true;
 
-int
-wipe_EndScreen
-( int	x,
-  int	y,
-  int	width,
-  int	height )
-{
-    wipe_scr_end = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*wipe_scr_end), PU_STATIC, NULL);
-    I_ReadScreen(wipe_scr_end);
-    V_DrawBlock(x, y, width, height, wipe_scr_start); // restore start scr.
-    return 0;
-}
+  width /= 2;
 
-int
-wipe_ScreenWipe
-( int	wipeno,
-  int	x,
-  int	y,
-  int	width,
-  int	height,
-  int	ticks )
-{
-    int rc;
-    static int (*wipes[])(int, int, int) =
+  while (ticks--)
     {
-	wipe_initColorXForm, wipe_doColorXForm, wipe_exitColorXForm,
-	wipe_initMelt, wipe_doMelt, wipe_exitMelt
-    };
+      for (i = 0; i < width; i++)
+        {
+          if (g_y[i] < 0)
+            {
+              g_y[i]++;
+              done = false;
+            }
+          else if (g_y[i] < height)
+            {
+              dy = (g_y[i] < 16) ? g_y[i] + 1 : 8;
+              if (g_y[i] + dy >= height) dy = height - g_y[i];
+              s = &((dpixel_t *)wipe_scr_end)[i * height + g_y[i]];
+              d = &((dpixel_t *)wipe_scr)[g_y[i] * width + i];
+              idx = 0;
+              for (j = dy; j; j--)
+                {
+                  d[idx] = *(s++);
+                  idx += width;
+                }
 
-    // initial stuff
-    if (!go)
-    {
-	go = 1;
-	// wipe_scr = (pixel_t *) Z_Malloc(width*height, PU_STATIC, 0); // DEBUG
-	wipe_scr = I_VideoBuffer;
-	(*wipes[wipeno*3])(width, height, ticks);
+              g_y[i] += dy;
+              s = &((dpixel_t *)wipe_scr_start)[i * height];
+              d = &((dpixel_t *)wipe_scr)[g_y[i] * width + i];
+              idx = 0;
+              for (j = height - g_y[i]; j; j--)
+                {
+                  d[idx] = *(s++);
+                  idx += width;
+                }
+
+              done = false;
+            }
+        }
     }
 
-    // do a piece of wipe-in
-    V_MarkRect(0, 0, width, height);
-    rc = (*wipes[wipeno*3+1])(width, height, ticks);
-    //  V_DrawBlock(x, y, 0, width, height, wipe_scr); // DEBUG
-
-    // final stuff
-    if (rc)
-    {
-	go = 0;
-	(*wipes[wipeno*3+2])(width, height, ticks);
-    }
-
-    return !go;
+  return done;
 }
 
+static int wipe_exit_melt(int width, int height, int ticks)
+{
+  z_free(g_y);
+  z_free(wipe_scr_start);
+  z_free(wipe_scr_end);
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int wipe_start_screen(int x, int y, int width, int height)
+{
+  wipe_scr_start = z_malloc(
+      SCREENWIDTH * SCREENHEIGHT * sizeof(*wipe_scr_start), PU_STATIC, NULL);
+  i_read_screen(wipe_scr_start);
+  return 0;
+}
+
+int wipe_endscreen(int x, int y, int width, int height)
+{
+  wipe_scr_end = z_malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*wipe_scr_end),
+                          PU_STATIC, NULL);
+  i_read_screen(wipe_scr_end);
+  v_draw_block(x, y, width, height, wipe_scr_start); /* restore start scr. */
+  return 0;
+}
+
+int wipe_screen_wipe(int wipeno, int x, int y, int width, int height,
+                     int ticks)
+{
+  int rc;
+
+  /* initial stuff */
+
+  if (!go)
+    {
+      go = 1;
+      wipe_scr = i_video_buffer;
+      (*g_wipes[wipeno * 3])(width, height, ticks);
+    }
+
+  /* do a piece of wipe-in */
+
+  v_mark_rect(0, 0, width, height);
+  rc = (*g_wipes[wipeno * 3 + 1])(width, height, ticks);
+
+  /* final stuff */
+
+  if (rc)
+    {
+      go = 0;
+      (*g_wipes[wipeno * 3 + 2])(width, height, ticks);
+    }
+
+  return !go;
+}
diff --git a/games/NXDoom/src/doom/f_wipe.h b/games/NXDoom/src/doom/f_wipe.h
index f48a9ca65..c421385a5 100644
--- a/games/NXDoom/src/doom/f_wipe.h
+++ b/games/NXDoom/src/doom/f_wipe.h
@@ -1,63 +1,53 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Mission start screen wipe/melt, special effects.
-//	
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/f_wipe.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Mission start screen wipe/melt, special effects.
+ *
+ ****************************************************************************/
 
 #ifndef __F_WIPE_H__
 #define __F_WIPE_H__
 
-//
-//                       SCREEN WIPE PACKAGE
-//
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* SCREEN WIPE PACKAGE */
 
 enum
 {
-    // simple gradual pixel change for 8-bit only
-    wipe_ColorXForm,
-    
-    // weird screen melt
-    wipe_Melt,	
+  /* simple gradual pixel change for 8-bit only */
 
-    wipe_NUMWIPES
+  WIPE_COLORXFORM,
+  WIPE_MELT, /* weird screen melt */
+  WIPE_NUMWIPES
 };
 
-int
-wipe_StartScreen
-( int		x,
-  int		y,
-  int		width,
-  int		height );
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+int wipe_start_screen(int x, int y, int width, int height);
 
-int
-wipe_EndScreen
-( int		x,
-  int		y,
-  int		width,
-  int		height );
+int wipe_endscreen(int x, int y, int width, int height);
 
+int wipe_screen_wipe(int wipeno, int x, int y, int width, int height,
+                     int ticks);
 
-int
-wipe_ScreenWipe
-( int		wipeno,
-  int		x,
-  int		y,
-  int		width,
-  int		height,
-  int		ticks );
-
-#endif
+#endif /* __F_WIPE_H__ */
diff --git a/games/NXDoom/src/doom/g_game.c b/games/NXDoom/src/doom/g_game.c
index 425871217..03589f06b 100644
--- a/games/NXDoom/src/doom/g_game.c
+++ b/games/NXDoom/src/doom/g_game.c
@@ -1,2408 +1,2462 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/g_game.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  none
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-#include <string.h>
-#include <stdlib.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "doomdef.h" 
+#include "doomdef.h"
 #include "doomkeys.h"
 #include "doomstat.h"
 
 #include "deh_main.h"
 #include "deh_misc.h"
 
-#include "z_zone.h"
 #include "f_finale.h"
-#include "m_argv.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "m_menu.h"
-#include "m_random.h"
+#include "i_input.h"
 #include "i_joystick.h"
+#include "i_swap.h"
 #include "i_system.h"
 #include "i_timer.h"
-#include "i_input.h"
-#include "i_swap.h"
 #include "i_video.h"
+#include "m_argv.h"
+#include "m_controls.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "m_random.h"
+#include "z_zone.h"
 
-#include "p_setup.h"
 #include "p_saveg.h"
+#include "p_setup.h"
 #include "p_tick.h"
 
 #include "d_main.h"
 
-#include "wi_stuff.h"
+#include "am_map.h"
 #include "hu_stuff.h"
 #include "st_stuff.h"
-#include "am_map.h"
 #include "statdump.h"
+#include "wi_stuff.h"
+
+/* Needs access to LFB. */
 
-// Needs access to LFB.
 #include "v_video.h"
 
 #include "w_wad.h"
 
-#include "p_local.h" 
+#include "p_local.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
-
-// Data.
-#include "dstrings.h"
 #include "sounds.h"
+#endif
+
+/* Data. */
+
+#include "dstrings.h"
+
+/* SKY handling - still the wrong place. */
 
-// SKY handling - still the wrong place.
 #include "r_data.h"
 #include "r_sky.h"
 
-
-
 #include "g_game.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define SAVEGAMESIZE	0x2c000
+#define SAVEGAMESIZE 0x2c000
 
-void	G_ReadDemoTiccmd (ticcmd_t* cmd); 
-void	G_WriteDemoTiccmd (ticcmd_t* cmd); 
-void	G_PlayerReborn (int player); 
- 
-void	G_DoReborn (int playernum); 
- 
-void	G_DoLoadLevel (void); 
-void	G_DoNewGame (void); 
-void	G_DoPlayDemo (void); 
-void	G_DoCompleted (void); 
-void	G_DoVictory (void); 
-void	G_DoWorldDone (void); 
-void	G_DoSaveGame (void); 
- 
-// Gamestate the last time G_Ticker was called.
+#define MAXPLMOVE (forwardmove[1])
 
-gamestate_t     oldgamestate; 
- 
-gameaction_t    gameaction; 
-gamestate_t     gamestate; 
-skill_t         gameskill; 
-boolean		respawnmonsters;
-int             gameepisode; 
-int             gamemap; 
+#define TURBOTHRESHOLD 0x32
 
-// If non-zero, exit the level after this number of minutes.
+#define BODYQUESIZE 32
 
-int             timelimit;
+#define SLOWTURNTICS 6
 
-boolean         paused; 
-boolean         sendpause;             	// send a pause event next tic 
-boolean         sendsave;             	// send a save event next tic 
-boolean         usergame;               // ok to save / end game 
- 
-boolean         timingdemo;             // if true, exit with report on completion 
-boolean         nodrawers;              // for comparative timing purposes 
-int             starttime;          	// for comparative timing purposes  	 
- 
-boolean         viewactive; 
- 
-int             deathmatch;           	// only if started as net death 
-boolean         netgame;                // only true if packets are broadcast 
-boolean         playeringame[MAXPLAYERS]; 
-player_t        players[MAXPLAYERS]; 
+#define NUMKEYS 256
+#define MAX_JOY_BUTTONS 20
 
-boolean         turbodetected[MAXPLAYERS];
- 
-int             consoleplayer;          // player taking events and displaying 
-int             displayplayer;          // view being displayed 
-int             levelstarttic;          // gametic at level start 
-int             totalkills, totalitems, totalsecret;    // for intermission 
- 
-char           *demoname;
-boolean         demorecording; 
-boolean         longtics;               // cph's doom 1.91 longtics hack
-boolean         lowres_turn;            // low resolution turning for longtics
-boolean         demoplayback; 
-boolean		netdemo; 
-byte*		demobuffer;
-byte*		demo_p;
-byte*		demoend; 
-boolean         singledemo;            	// quit after playing a demo from cmdline 
- 
-boolean         precache = true;        // if true, load all graphics at start 
+#define DEMOMARKER 0x80
 
-boolean         testcontrols = false;    // Invoked by setup to test controls
-int             testcontrols_mousespeed;
- 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
- 
-wbstartstruct_t wminfo;               	// parms for world map / intermission 
- 
-byte		consistancy[MAXPLAYERS][BACKUPTICS]; 
- 
-#define MAXPLMOVE		(forwardmove[1]) 
- 
-#define TURBOTHRESHOLD	0x32
-
-fixed_t         forwardmove[2] = {0x19, 0x32}; 
-fixed_t         sidemove[2] = {0x18, 0x28}; 
-fixed_t         angleturn[3] = {640, 1280, 320};    // + slow turn 
-
-static int *weapon_keys[] = {
-    &key_weapon1,
-    &key_weapon2,
-    &key_weapon3,
-    &key_weapon4,
-    &key_weapon5,
-    &key_weapon6,
-    &key_weapon7,
-    &key_weapon8
+struct weapon_order
+{
+  weapontype_t weapon;
+  weapontype_t weapon_num;
 };
 
-// Set to -1 or +1 to switch to the previous or next weapon.
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void p_spawn_player(mapthing_t *mthing);
+void g_player_reborn(int player);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Gamestate the last time g_ticker was called. */
+
+gamestate_t oldgamestate;
+
+gameaction_t gameaction;
+gamestate_t gamestate;
+skill_t gameskill;
+boolean respawnmonsters;
+int gameepisode;
+int gamemap;
+
+/* If non-zero, exit the level after this number of minutes. */
+
+int timelimit;
+
+boolean paused;
+boolean sendpause; /* send a pause event next tic */
+boolean sendsave;  /* send a save event next tic */
+boolean usergame;  /* ok to save / end game */
+
+boolean timingdemo; /* if true, exit with report on completion */
+boolean nodrawers;  /* for comparative timing purposes */
+int starttime;      /* for comparative timing purposes */
+
+boolean viewactive;
+
+int deathmatch;  /* only if started as net death */
+boolean netgame; /* only true if packets are broadcast */
+boolean playeringame[MAXPLAYERS];
+player_t players[MAXPLAYERS];
+
+boolean turbodetected[MAXPLAYERS];
+
+int consoleplayer; /* player taking events and displaying */
+int displayplayer; /* view being displayed */
+int levelstarttic; /* gametic at level start */
+int totalkills;
+int totalitems;
+int totalsecret; /* for intermission */
+
+char *demoname;
+boolean demorecording;
+boolean longtics;    /* cph's doom 1.91 longtics hack */
+boolean lowres_turn; /* low resolution turning for longtics */
+boolean demoplayback;
+boolean netdemo;
+byte *demobuffer;
+byte *demo_p;
+byte *demoend;
+boolean singledemo; /* quit after playing a demo from cmdline */
+
+boolean precache = true; /* if true, load all graphics at start */
+
+boolean testcontrols = false; /* Invoked by setup to test controls */
+int testcontrols_mousespeed;
+
+wbstartstruct_t wminfo; /* params for world map / intermission */
+
+byte consistency[MAXPLAYERS][CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
+
+fixed_t forwardmove[2] =
+{
+    0x19, 0x32
+};
+
+fixed_t sidemove[2] =
+{
+    0x18, 0x28
+};
+
+/* + slow turn */
+
+fixed_t angleturn[3] =
+{
+  640, 1280, 320
+};
+
+/* mouse values are used once */
+
+int mousex;
+int mousey;
+
+mobj_t *bodyque[BODYQUESIZE];
+int bodyqueslot;
+
+int vanilla_savegame_limit = 1;
+int vanilla_demo_limit = 1;
+
+/* G_DoCompleted */
+
+boolean secretexit;
+
+char savename[256];
+
+skill_t d_skill;
+int d_episode;
+int d_map;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int *weapon_keys[] =
+{
+  &key_weapon1, &key_weapon2, &key_weapon3, &key_weapon4,
+  &key_weapon5, &key_weapon6, &key_weapon7, &key_weapon8,
+};
+
+/* Set to -1 or +1 to switch to the previous or next weapon. */
 
 static int next_weapon = 0;
 
-// Used for prev/next weapon keys.
+/* Used for prev/next weapon keys. */
 
-static const struct
+static const struct weapon_order weapon_order_table[] =
 {
-    weapontype_t weapon;
-    weapontype_t weapon_num;
-} weapon_order_table[] = {
-    { wp_fist,            wp_fist },
-    { wp_chainsaw,        wp_fist },
-    { wp_pistol,          wp_pistol },
-    { wp_shotgun,         wp_shotgun },
-    { wp_supershotgun,    wp_shotgun },
-    { wp_chaingun,        wp_chaingun },
-    { wp_missile,         wp_missile },
-    { wp_plasma,          wp_plasma },
-    { wp_bfg,             wp_bfg }
+  {wp_fist, wp_fist},
+  {wp_chainsaw, wp_fist},
+  {wp_pistol, wp_pistol},
+  {wp_shotgun, wp_shotgun},
+  {wp_supershotgun, wp_shotgun},
+  {wp_chaingun, wp_chaingun},
+  {wp_missile, wp_missile},
+  {wp_plasma, wp_plasma},
+  {wp_bfg, wp_bfg},
 };
 
-#define SLOWTURNTICS	6 
- 
-#define NUMKEYS		256 
-#define MAX_JOY_BUTTONS 20
+static boolean gamekeydown[NUMKEYS];
+static int turnheld; /* for accelerative turning */
 
-static boolean  gamekeydown[NUMKEYS]; 
-static int      turnheld;		// for accelerative turning 
- 
-static boolean  mousearray[MAX_MOUSE_BUTTONS + 1];
-static boolean *mousebuttons = &mousearray[1];  // allow [-1]
+static boolean mousearray[MAX_MOUSE_BUTTONS + 1];
+static boolean *mousebuttons = &mousearray[1]; /* allow [-1] */
 
-// mouse values are used once 
-int             mousex;
-int             mousey;         
+static int dclicktime;
+static boolean dclickstate;
+static int dclicks;
+static int dclicktime2;
+static boolean dclickstate2;
+static int dclicks2;
 
-static int      dclicktime;
-static boolean  dclickstate;
-static int      dclicks; 
-static int      dclicktime2;
-static boolean  dclickstate2;
-static int      dclicks2;
+/* joystick values are repeated */
 
-// joystick values are repeated 
-static int      joyxmove;
-static int      joyymove;
-static int      joystrafemove;
-static boolean  joyarray[MAX_JOY_BUTTONS + 1]; 
-static boolean *joybuttons = &joyarray[1];		// allow [-1] 
- 
-static int      savegameslot; 
-static char     savedescription[32]; 
- 
-#define	BODYQUESIZE	32
+static int joyxmove;
+static int joyymove;
+static int joystrafemove;
+static boolean joyarray[MAX_JOY_BUTTONS + 1];
+static boolean *joybuttons = &joyarray[1]; /* allow [-1] */
 
-mobj_t*		bodyque[BODYQUESIZE]; 
-int		bodyqueslot; 
- 
-int             vanilla_savegame_limit = 1;
-int             vanilla_demo_limit = 1;
- 
-int G_CmdChecksum (ticcmd_t* cmd) 
-{ 
-    size_t		i;
-    int		sum = 0; 
-	 
-    for (i=0 ; i< sizeof(*cmd)/4 - 1 ; i++) 
-	sum += ((int *)cmd)[i]; 
-		 
-    return sum; 
-} 
+static int savegameslot;
+static char savedescription[32];
 
-static boolean WeaponSelectable(weapontype_t weapon)
-{
-    // Can't select the super shotgun in Doom 1.
+/* DOOM Par Times */
 
-    if (weapon == wp_supershotgun && logical_gamemission == doom)
-    {
-        return false;
-    }
-
-    // These weapons aren't available in shareware.
-
-    if ((weapon == wp_plasma || weapon == wp_bfg)
-     && gamemission == doom && gamemode == shareware)
-    {
-        return false;
-    }
-
-    // Can't select a weapon if we don't own it.
-
-    if (!players[consoleplayer].weaponowned[weapon])
-    {
-        return false;
-    }
-
-    // Can't select the fist if we have the chainsaw, unless
-    // we also have the berserk pack.
-
-    if (weapon == wp_fist
-     && players[consoleplayer].weaponowned[wp_chainsaw]
-     && !players[consoleplayer].powers[pw_strength])
-    {
-        return false;
-    }
-
-    return true;
-}
-
-static int G_NextWeapon(int direction)
-{
-    weapontype_t weapon;
-    int start_i, i;
-
-    // Find index in the table.
-
-    if (players[consoleplayer].pendingweapon == wp_nochange)
-    {
-        weapon = players[consoleplayer].readyweapon;
-    }
-    else
-    {
-        weapon = players[consoleplayer].pendingweapon;
-    }
-
-    for (i=0; i<arrlen(weapon_order_table); ++i)
-    {
-        if (weapon_order_table[i].weapon == weapon)
-        {
-            break;
-        }
-    }
-
-    // The current weapon must be present in weapon_order_table
-    // otherwise something has gone terribly wrong
-    if (i >= arrlen(weapon_order_table)) {
-        I_Error("Internal error: weapon %d not present in weapon_order_table", weapon);
-    }
-
-    // Switch weapon. Don't loop forever.
-    start_i = i;
-    do
-    {
-        i += direction;
-        i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
-    } while (i != start_i && !WeaponSelectable(weapon_order_table[i].weapon));
-
-    return weapon_order_table[i].weapon_num;
-}
-
-//
-// G_BuildTiccmd
-// Builds a ticcmd from all of the available inputs
-// or reads it from the demo buffer. 
-// If recording a demo, write it out 
-// 
-void G_BuildTiccmd (ticcmd_t* cmd, int maketic) 
-{ 
-    int		i; 
-    boolean	strafe;
-    boolean	bstrafe; 
-    int		speed;
-    int		tspeed; 
-    int		forward;
-    int		side;
-
-    memset(cmd, 0, sizeof(ticcmd_t));
-
-    cmd->consistancy = 
-	consistancy[consoleplayer][maketic%BACKUPTICS]; 
- 
-    strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe] 
-	|| joybuttons[joybstrafe]; 
-
-    // fraggle: support the old "joyb_speed = 31" hack which
-    // allowed an autorun effect
-
-    speed = key_speed >= NUMKEYS
-         || joybspeed >= MAX_JOY_BUTTONS
-         || gamekeydown[key_speed] 
-         || joybuttons[joybspeed]
-         || mousebuttons[mousebspeed];
- 
-    forward = side = 0;
-    
-    // use two stage accelerative turning
-    // on the keyboard and joystick
-    if (joyxmove < 0
-	|| joyxmove > 0  
-	|| gamekeydown[key_right]
-	|| gamekeydown[key_left]
-	|| mousebuttons[mousebturnright]
-	|| mousebuttons[mousebturnleft])
-	turnheld += ticdup; 
-    else 
-	turnheld = 0; 
-
-    if (turnheld < SLOWTURNTICS) 
-	tspeed = 2;             // slow turn 
-    else 
-	tspeed = speed;
-    
-    // let movement keys cancel each other out
-    if (strafe) 
-    { 
-	if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-	{
-	    // fprintf(stderr, "strafe right\n");
-	    side += sidemove[speed]; 
-	}
-	if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-	{
-	    //	fprintf(stderr, "strafe left\n");
-	    side -= sidemove[speed]; 
-	}
-        if (use_analog && joyxmove)
-        {
-            joyxmove = joyxmove * joystick_move_sensitivity / 10;
-            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
-            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
-            side += FixedMul(sidemove[speed], joyxmove);
-        }
-        else if (joystick_move_sensitivity)
-        {
-            if (joyxmove > 0)
-                side += sidemove[speed];
-            if (joyxmove < 0)
-                side -= sidemove[speed];
-        }
-    } 
-    else 
-    { 
-	if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-	    cmd->angleturn -= angleturn[tspeed]; 
-	if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-	    cmd->angleturn += angleturn[tspeed]; 
-        if (use_analog && joyxmove)
-        {
-            // Cubic response curve allows for finer control when stick
-            // deflection is small.
-            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
-            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
-            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
-        }
-        else if (joystick_turn_sensitivity)
-        {
-            if (joyxmove > 0)
-                cmd->angleturn -= angleturn[tspeed];
-            if (joyxmove < 0)
-                cmd->angleturn += angleturn[tspeed];
-        }
-    } 
- 
-    if (gamekeydown[key_up]) 
-    {
-	// fprintf(stderr, "up\n");
-	forward += forwardmove[speed]; 
-    }
-    if (gamekeydown[key_down]) 
-    {
-	// fprintf(stderr, "down\n");
-	forward -= forwardmove[speed]; 
-    }
-
-    if (use_analog && joyymove)
-    {
-        joyymove = joyymove * joystick_move_sensitivity / 10;
-        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
-        joyymove = (joyymove < -FRACUNIT) ? -FRACUNIT : joyymove;
-        forward -= FixedMul(forwardmove[speed], joyymove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joyymove < 0)
-            forward += forwardmove[speed];
-        if (joyymove > 0)
-            forward -= forwardmove[speed];
-    }
-
-    if (gamekeydown[key_strafeleft]
-     || joybuttons[joybstrafeleft]
-     || mousebuttons[mousebstrafeleft])
-    {
-        side -= sidemove[speed];
-    }
-
-    if (gamekeydown[key_straferight]
-     || joybuttons[joybstraferight]
-     || mousebuttons[mousebstraferight])
-    {
-        side += sidemove[speed]; 
-    }
-
-    if (use_analog && joystrafemove)
-    {
-        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
-        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
-        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
-        side += FixedMul(sidemove[speed], joystrafemove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joystrafemove < 0)
-            side -= sidemove[speed];
-        if (joystrafemove > 0)
-            side += sidemove[speed];
-    }
-
-    // buttons
-    cmd->chatchar = HU_dequeueChatChar(); 
- 
-    if (gamekeydown[key_fire] || mousebuttons[mousebfire] 
-	|| joybuttons[joybfire]) 
-	cmd->buttons |= BT_ATTACK; 
- 
-    if (gamekeydown[key_use]
-     || joybuttons[joybuse]
-     || mousebuttons[mousebuse])
-    { 
-	cmd->buttons |= BT_USE;
-	// clear double clicks if hit use button 
-	dclicks = 0;                   
-    } 
-
-    // If the previous or next weapon button is pressed, the
-    // next_weapon variable is set to change weapons when
-    // we generate a ticcmd.  Choose a new weapon.
-
-    if (gamestate == GS_LEVEL && next_weapon != 0)
-    {
-        i = G_NextWeapon(next_weapon);
-        cmd->buttons |= BT_CHANGE;
-        cmd->buttons |= i << BT_WEAPONSHIFT;
-    }
-    else
-    {
-        // Check weapon keys.
-
-        for (i=0; i<arrlen(weapon_keys); ++i)
-        {
-            int key = *weapon_keys[i];
-
-            if (gamekeydown[key])
-            {
-                cmd->buttons |= BT_CHANGE;
-                cmd->buttons |= i<<BT_WEAPONSHIFT;
-                break;
-            }
-        }
-    }
-
-    next_weapon = 0;
-
-    // mouse
-    if (mousebuttons[mousebforward]) 
-    {
-	forward += forwardmove[speed];
-    }
-    if (mousebuttons[mousebbackward])
-    {
-        forward -= forwardmove[speed];
-    }
-
-    if (dclick_use)
-    {
-        // forward double click
-        if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1 ) 
-        { 
-            dclickstate = mousebuttons[mousebforward]; 
-            if (dclickstate) 
-                dclicks++; 
-            if (dclicks == 2) 
-            { 
-                cmd->buttons |= BT_USE; 
-                dclicks = 0; 
-            } 
-            else 
-                dclicktime = 0; 
-        } 
-        else 
-        { 
-            dclicktime += ticdup; 
-            if (dclicktime > 20) 
-            { 
-                dclicks = 0; 
-                dclickstate = 0; 
-            } 
-        }
-        
-        // strafe double click
-        bstrafe =
-            mousebuttons[mousebstrafe] 
-            || joybuttons[joybstrafe]; 
-        if (bstrafe != dclickstate2 && dclicktime2 > 1 ) 
-        { 
-            dclickstate2 = bstrafe; 
-            if (dclickstate2) 
-                dclicks2++; 
-            if (dclicks2 == 2) 
-            { 
-                cmd->buttons |= BT_USE; 
-                dclicks2 = 0; 
-            } 
-            else 
-                dclicktime2 = 0; 
-        } 
-        else 
-        { 
-            dclicktime2 += ticdup; 
-            if (dclicktime2 > 20) 
-            { 
-                dclicks2 = 0; 
-                dclickstate2 = 0; 
-            } 
-        } 
-    }
-
-    forward += mousey; 
-
-    if (strafe) 
-	side += mousex*2; 
-    else 
-	cmd->angleturn -= mousex*0x8; 
-
-    if (mousex == 0)
-    {
-        // No movement in the previous frame
-
-        testcontrols_mousespeed = 0;
-    }
-    
-    mousex = mousey = 0; 
-	 
-    if (forward > MAXPLMOVE) 
-	forward = MAXPLMOVE; 
-    else if (forward < -MAXPLMOVE) 
-	forward = -MAXPLMOVE; 
-    if (side > MAXPLMOVE) 
-	side = MAXPLMOVE; 
-    else if (side < -MAXPLMOVE) 
-	side = -MAXPLMOVE; 
- 
-    cmd->forwardmove += forward; 
-    cmd->sidemove += side;
-    
-    // special buttons
-    if (sendpause) 
-    { 
-	sendpause = false; 
-	cmd->buttons = BT_SPECIAL | BTS_PAUSE; 
-    } 
- 
-    if (sendsave) 
-    { 
-	sendsave = false; 
-	cmd->buttons = BT_SPECIAL | BTS_SAVEGAME | (savegameslot<<BTS_SAVESHIFT); 
-    } 
-
-    // low-res turning
-
-    if (lowres_turn)
-    {
-        static signed short carry = 0;
-        signed short desired_angleturn;
-
-        desired_angleturn = cmd->angleturn + carry;
-
-        // round angleturn to the nearest 256 unit boundary
-        // for recording demos with single byte values for turn
-
-        cmd->angleturn = (desired_angleturn + 128) & 0xff00;
-
-        // Carry forward the error from the reduced resolution to the
-        // next tic, so that successive small movements can accumulate.
-
-        carry = desired_angleturn - cmd->angleturn;
-    }
-} 
- 
-
-//
-// G_DoLoadLevel 
-//
-void G_DoLoadLevel (void) 
-{ 
-    int             i; 
-
-    // Set the sky map.
-    // First thing, we have a dummy sky texture name,
-    //  a flat. The data is in the WAD only because
-    //  we look for an actual index, instead of simply
-    //  setting one.
-
-    skyflatnum = R_FlatNumForName(DEH_String(SKYFLATNAME));
-
-    // The "Sky never changes in Doom II" bug was fixed in
-    // the id Anthology version of doom2.exe for Final Doom.
-    if ((gamemode == commercial)
-     && (gameversion == exe_final2 || gameversion == exe_chex))
-    {
-        const char *skytexturename;
-
-        if (gamemap < 12)
-        {
-            skytexturename = "SKY1";
-        }
-        else if (gamemap < 21)
-        {
-            skytexturename = "SKY2";
-        }
-        else
-        {
-            skytexturename = "SKY3";
-        }
-
-        skytexturename = DEH_String(skytexturename);
-
-        skytexture = R_TextureNumForName(skytexturename);
-    }
-
-    levelstarttic = gametic;        // for time calculation
-    
-    if (wipegamestate == GS_LEVEL) 
-	wipegamestate = -1;             // force a wipe 
-
-    gamestate = GS_LEVEL; 
-
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-    { 
-	turbodetected[i] = false;
-	if (playeringame[i] && players[i].playerstate == PST_DEAD) 
-	    players[i].playerstate = PST_REBORN; 
-	memset (players[i].frags,0,sizeof(players[i].frags)); 
-    } 
-		 
-    P_SetupLevel (gameepisode, gamemap, 0, gameskill);    
-    displayplayer = consoleplayer;		// view the guy you are playing    
-    gameaction = ga_nothing; 
-    Z_CheckHeap ();
-    
-    // clear cmd building stuff
-
-    memset (gamekeydown, 0, sizeof(gamekeydown));
-    joyxmove = joyymove = joystrafemove = 0;
-    mousex = mousey = 0;
-    sendpause = sendsave = paused = false;
-    memset(mousearray, 0, sizeof(mousearray));
-    memset(joyarray, 0, sizeof(joyarray));
-
-    if (testcontrols)
-    {
-        players[consoleplayer].message = "Press escape to quit.";
-    }
-} 
-
-static void SetJoyButtons(unsigned int buttons_mask)
-{
-    int i;
-
-    for (i=0; i<MAX_JOY_BUTTONS; ++i)
-    {
-        int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!joybuttons[i] && button_on)
-        {
-            // Weapon cycling:
-
-            if (i == joybprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == joybnextweapon)
-            {
-                next_weapon = 1;
-            }
-        }
-
-        joybuttons[i] = button_on;
-    }
-}
-
-static void SetMouseButtons(unsigned int buttons_mask)
-{
-    int i;
-
-    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
-    {
-        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!mousebuttons[i] && button_on)
-        {
-            if (i == mousebprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == mousebnextweapon)
-            {
-                next_weapon = 1;
-            }
-        }
-
-	mousebuttons[i] = button_on;
-    }
-}
-
-//
-// G_Responder  
-// Get info needed to make ticcmd_ts for the players.
-// 
-boolean G_Responder (event_t* ev) 
-{ 
-    // allow spy mode changes even during the demo
-    if (gamestate == GS_LEVEL && ev->type == ev_keydown 
-     && ev->data1 == key_spy && (singledemo || !deathmatch) )
-    {
-	// spy mode 
-	do 
-	{ 
-	    displayplayer++; 
-	    if (displayplayer == MAXPLAYERS) 
-		displayplayer = 0; 
-	} while (!playeringame[displayplayer] && displayplayer != consoleplayer); 
-	return true; 
-    }
-    
-    // any other key pops up menu if in demos
-    if (gameaction == ga_nothing && !singledemo && 
-	(demoplayback || gamestate == GS_DEMOSCREEN) 
-	) 
-    { 
-	if (ev->type == ev_keydown ||  
-	    (ev->type == ev_mouse && ev->data1) || 
-	    (ev->type == ev_joystick && ev->data1) ) 
-	{ 
-	    M_StartControlPanel (); 
-	    joywait = I_GetTime() + 5;
-	    return true; 
-	} 
-	return false; 
-    } 
-
-    if (gamestate == GS_LEVEL) 
-    { 
-#if 0 
-	if (devparm && ev->type == ev_keydown && ev->data1 == ';') 
-	{ 
-	    G_DeathMatchSpawnPlayer (0); 
-	    return true; 
-	} 
-#endif 
-	if (HU_Responder (ev)) 
-	    return true;	// chat ate the event 
-	if (ST_Responder (ev)) 
-	    return true;	// status window ate it 
-	if (AM_Responder (ev)) 
-	    return true;	// automap ate it 
-    } 
-	 
-    if (gamestate == GS_FINALE) 
-    { 
-	if (F_Responder (ev)) 
-	    return true;	// finale ate the event 
-    } 
-
-    if (testcontrols && ev->type == ev_mouse)
-    {
-        // If we are invoked by setup to test the controls, save the 
-        // mouse speed so that we can display it on-screen.
-        // Perform a low pass filter on this so that the thermometer 
-        // appears to move smoothly.
-
-        testcontrols_mousespeed = abs(ev->data2);
-    }
-
-    // If the next/previous weapon keys are pressed, set the next_weapon
-    // variable to change weapons when the next ticcmd is generated.
-
-    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
-    {
-        next_weapon = -1;
-    }
-    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
-    {
-        next_weapon = 1;
-    }
-
-    switch (ev->type) 
-    { 
-      case ev_keydown: 
-	if (ev->data1 == key_pause) 
-	{ 
-	    sendpause = true; 
-	}
-        else if (ev->data1 <NUMKEYS) 
-        {
-	    gamekeydown[ev->data1] = true; 
-        }
-
-	return true;    // eat key down events 
- 
-      case ev_keyup: 
-	if (ev->data1 <NUMKEYS) 
-	    gamekeydown[ev->data1] = false; 
-	return false;   // always let key up events filter down 
-		 
-      case ev_mouse: 
-        SetMouseButtons(ev->data1);
-	mousex = ev->data2*(mouseSensitivity+5)/10; 
-	mousey = ev->data3*(mouseSensitivity+5)/10; 
-	return true;    // eat events 
- 
-      case ev_joystick: 
-        SetJoyButtons(ev->data1);
-	joyxmove = ev->data2; 
-	joyymove = ev->data3; 
-        joystrafemove = ev->data4;
-	return true;    // eat events 
- 
-      default: 
-	break; 
-    } 
- 
-    return false; 
-} 
- 
- 
- 
-//
-// G_Ticker
-// Make ticcmd_ts for the players.
-//
-void G_Ticker (void) 
-{ 
-    int		i;
-    int		buf; 
-    ticcmd_t*	cmd;
-    
-    // do player reborns if needed
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-	if (playeringame[i] && players[i].playerstate == PST_REBORN) 
-	    G_DoReborn (i);
-    
-    // do things to change the game state
-    while (gameaction != ga_nothing) 
-    { 
-	switch (gameaction) 
-	{ 
-	  case ga_loadlevel: 
-	    G_DoLoadLevel (); 
-	    break; 
-	  case ga_newgame: 
-	    G_DoNewGame (); 
-	    break; 
-	  case ga_loadgame: 
-	    G_DoLoadGame (); 
-	    break; 
-	  case ga_savegame: 
-	    G_DoSaveGame (); 
-	    break; 
-	  case ga_playdemo: 
-	    G_DoPlayDemo (); 
-	    break; 
-	  case ga_completed: 
-	    G_DoCompleted (); 
-	    break; 
-	  case ga_victory: 
-	    F_StartFinale (); 
-	    break; 
-	  case ga_worlddone: 
-	    G_DoWorldDone (); 
-	    break; 
-	  case ga_screenshot: 
-	    V_ScreenShot("DOOM%02i.%s"); 
-            players[consoleplayer].message = DEH_String("screen shot");
-	    gameaction = ga_nothing; 
-	    break; 
-	  case ga_nothing: 
-	    break; 
-	} 
-    }
-    
-    // get commands, check consistancy,
-    // and build new consistancy check
-    buf = (gametic/ticdup)%BACKUPTICS; 
- 
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i]) 
-	{ 
-	    cmd = &players[i].cmd; 
-
-	    memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
-
-	    if (demoplayback) 
-		G_ReadDemoTiccmd (cmd); 
-	    if (demorecording) 
-		G_WriteDemoTiccmd (cmd);
-	    
-	    // check for turbo cheats
-
-            // check ~ 4 seconds whether to display the turbo message. 
-            // store if the turbo threshold was exceeded in any tics
-            // over the past 4 seconds.  offset the checking period
-            // for each player so messages are not displayed at the
-            // same time.
-
-            if (cmd->forwardmove > TURBOTHRESHOLD)
-            {
-                turbodetected[i] = true;
-            }
-
-            if ((gametic & 31) == 0 
-             && ((gametic >> 5) % MAXPLAYERS) == i
-             && turbodetected[i])
-            {
-                static char turbomessage[80];
-                M_snprintf(turbomessage, sizeof(turbomessage),
-                           "%s is turbo!", player_names[i]);
-                players[consoleplayer].message = turbomessage;
-                turbodetected[i] = false;
-            }
-
-	    if (netgame && !netdemo && !(gametic%ticdup) ) 
-	    { 
-		if (gametic > BACKUPTICS 
-		    && consistancy[i][buf] != cmd->consistancy) 
-		{ 
-		    I_Error ("consistency failure (%i should be %i)",
-			     cmd->consistancy, consistancy[i][buf]); 
-		} 
-		if (players[i].mo) 
-		    consistancy[i][buf] = players[i].mo->x; 
-		else 
-		    consistancy[i][buf] = rndindex; 
-	    } 
-	}
-    }
-    
-    // check for special buttons
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i]) 
-	{ 
-	    if (players[i].cmd.buttons & BT_SPECIAL) 
-	    { 
-		switch (players[i].cmd.buttons & BT_SPECIALMASK) 
-		{ 
-		  case BTS_PAUSE: 
-		    paused ^= 1; 
-		    if (paused) 
-			S_PauseSound (); 
-		    else 
-			S_ResumeSound (); 
-		    break; 
-					 
-		  case BTS_SAVEGAME: 
-		    if (!savedescription[0]) 
-                    {
-                        M_StringCopy(savedescription, "NET GAME",
-                                     sizeof(savedescription));
-                    }
-
-		    savegameslot =  
-			(players[i].cmd.buttons & BTS_SAVEMASK)>>BTS_SAVESHIFT; 
-		    gameaction = ga_savegame; 
-		    break; 
-		} 
-	    } 
-	}
-    }
-
-    // Have we just finished displaying an intermission screen?
-
-    if (oldgamestate == GS_INTERMISSION && gamestate != GS_INTERMISSION)
-    {
-        WI_End();
-    }
-
-    oldgamestate = gamestate;
-    
-    // do main actions
-    switch (gamestate) 
-    { 
-      case GS_LEVEL: 
-	P_Ticker (); 
-	ST_Ticker (); 
-	AM_Ticker (); 
-	HU_Ticker ();            
-	break; 
-	 
-      case GS_INTERMISSION: 
-	WI_Ticker (); 
-	break; 
-			 
-      case GS_FINALE: 
-	F_Ticker (); 
-	break; 
- 
-      case GS_DEMOSCREEN: 
-	D_PageTicker (); 
-	break;
-    }        
-} 
- 
- 
-//
-// PLAYER STRUCTURE FUNCTIONS
-// also see P_SpawnPlayer in P_Things
-//
-
-//
-// G_InitPlayer 
-// Called at the start.
-// Called by the game initialization functions.
-//
-void G_InitPlayer (int player) 
-{
-    // clear everything else to defaults
-    G_PlayerReborn (player); 
-}
- 
- 
-
-//
-// G_PlayerFinishLevel
-// Can when a player completes a level.
-//
-void G_PlayerFinishLevel (int player) 
-{ 
-    player_t*	p; 
-	 
-    p = &players[player]; 
-	 
-    memset (p->powers, 0, sizeof (p->powers)); 
-    memset (p->cards, 0, sizeof (p->cards)); 
-    p->mo->flags &= ~MF_SHADOW;		// cancel invisibility 
-    p->extralight = 0;			// cancel gun flashes 
-    p->fixedcolormap = 0;		// cancel ir gogles 
-    p->damagecount = 0;			// no palette changes 
-    p->bonuscount = 0; 
-} 
- 
-
-//
-// G_PlayerReborn
-// Called after a player dies 
-// almost everything is cleared and initialized 
-//
-void G_PlayerReborn (int player) 
-{ 
-    player_t*	p; 
-    int		i; 
-    int		frags[MAXPLAYERS]; 
-    int		killcount;
-    int		itemcount;
-    int		secretcount; 
-	 
-    memcpy (frags,players[player].frags,sizeof(frags)); 
-    killcount = players[player].killcount; 
-    itemcount = players[player].itemcount; 
-    secretcount = players[player].secretcount; 
-	 
-    p = &players[player]; 
-    memset (p, 0, sizeof(*p)); 
- 
-    memcpy (players[player].frags, frags, sizeof(players[player].frags)); 
-    players[player].killcount = killcount; 
-    players[player].itemcount = itemcount; 
-    players[player].secretcount = secretcount; 
- 
-    p->usedown = p->attackdown = true;	// don't do anything immediately 
-    p->playerstate = PST_LIVE;       
-    p->health = deh_initial_health;     // Use dehacked value
-    p->readyweapon = p->pendingweapon = wp_pistol; 
-    p->weaponowned[wp_fist] = true; 
-    p->weaponowned[wp_pistol] = true; 
-    p->ammo[am_clip] = deh_initial_bullets; 
-	 
-    for (i=0 ; i<NUMAMMO ; i++) 
-	p->maxammo[i] = maxammo[i]; 
-		 
-}
-
-//
-// G_CheckSpot  
-// Returns false if the player cannot be respawned
-// at the given mapthing_t spot  
-// because something is occupying it 
-//
-void P_SpawnPlayer (mapthing_t* mthing); 
- 
-boolean
-G_CheckSpot
-( int		playernum,
-  mapthing_t*	mthing ) 
-{ 
-    fixed_t		x;
-    fixed_t		y; 
-    subsector_t*	ss; 
-    mobj_t*		mo; 
-    int			i;
-	
-    if (!players[playernum].mo)
-    {
-	// first spawn of level, before corpses
-	for (i=0 ; i<playernum ; i++)
-	    if (players[i].mo->x == mthing->x << FRACBITS
-		&& players[i].mo->y == mthing->y << FRACBITS)
-		return false;	
-	return true;
-    }
-		
-    x = mthing->x << FRACBITS; 
-    y = mthing->y << FRACBITS; 
-	 
-    if (!P_CheckPosition (players[playernum].mo, x, y) ) 
-	return false; 
- 
-    // flush an old corpse if needed 
-    if (bodyqueslot >= BODYQUESIZE) 
-	P_RemoveMobj (bodyque[bodyqueslot%BODYQUESIZE]); 
-    bodyque[bodyqueslot%BODYQUESIZE] = players[playernum].mo; 
-    bodyqueslot++; 
-
-    // spawn a teleport fog
-    ss = R_PointInSubsector (x,y);
-
-
-    // The code in the released source looks like this:
-    //
-    //    an = ( ANG45 * (((unsigned int) mthing->angle)/45) )
-    //         >> ANGLETOFINESHIFT;
-    //    mo = P_SpawnMobj (x+20*finecosine[an], y+20*finesine[an]
-    //                     , ss->sector->floorheight
-    //                     , MT_TFOG);
-    //
-    // But 'an' can be a signed value in the DOS version. This means that
-    // we get a negative index and the lookups into finecosine/finesine
-    // end up dereferencing values in finetangent[].
-    // A player spawning on a deathmatch start facing directly west spawns
-    // "silently" with no spawn fog. Emulate this.
-    //
-    // This code is imported from PrBoom+.
-
-    {
-        fixed_t xa, ya;
-        signed int an;
-
-        // This calculation overflows in Vanilla Doom, but here we deliberately
-        // avoid integer overflow as it is undefined behavior, so the value of
-        // 'an' will always be positive.
-        an = (ANG45 >> ANGLETOFINESHIFT) * ((signed int) mthing->angle / 45);
-
-        switch (an)
-        {
-            case 4096:  // -4096:
-                xa = finetangent[2048];    // finecosine[-4096]
-                ya = finetangent[0];       // finesine[-4096]
-                break;
-            case 5120:  // -3072:
-                xa = finetangent[3072];    // finecosine[-3072]
-                ya = finetangent[1024];    // finesine[-3072]
-                break;
-            case 6144:  // -2048:
-                xa = finesine[0];          // finecosine[-2048]
-                ya = finetangent[2048];    // finesine[-2048]
-                break;
-            case 7168:  // -1024:
-                xa = finesine[1024];       // finecosine[-1024]
-                ya = finetangent[3072];    // finesine[-1024]
-                break;
-            case 0:
-            case 1024:
-            case 2048:
-            case 3072:
-                xa = finecosine[an];
-                ya = finesine[an];
-                break;
-            case 8192:  // 360 deg:
-                xa = tantoangle[0];        // finecosine[8192]
-                ya = finesine[8192];       // finesine[8192]
-                break;
-            default:
-                I_Error("G_CheckSpot: unexpected angle %d\n", an);
-                xa = ya = 0;
-                break;
-        }
-        mo = P_SpawnMobj(x + 20 * xa, y + 20 * ya,
-                         ss->sector->floorheight, MT_TFOG);
-    }
-
-    if (players[consoleplayer].viewz != 1) 
-	S_StartSound (mo, sfx_telept);	// don't start sound on first frame 
- 
-    return true; 
-} 
-
-
-//
-// G_DeathMatchSpawnPlayer 
-// Spawns a player at one of the random death match spots 
-// called at level load and each death 
-//
-void G_DeathMatchSpawnPlayer (int playernum) 
-{ 
-    int             i,j; 
-    int				selections; 
-	 
-    selections = deathmatch_p - deathmatchstarts; 
-    if (selections < 4) 
-	I_Error ("Only %i deathmatch spots, 4 required", selections); 
- 
-    for (j=0 ; j<20 ; j++) 
-    { 
-	i = P_Random() % selections; 
-	if (G_CheckSpot (playernum, &deathmatchstarts[i]) ) 
-	{ 
-	    deathmatchstarts[i].type = playernum+1; 
-	    P_SpawnPlayer (&deathmatchstarts[i]); 
-	    return; 
-	} 
-    } 
- 
-    // no good spot, so the player will probably get stuck 
-    P_SpawnPlayer (&playerstarts[playernum]); 
-} 
-
-//
-// G_DoReborn 
-// 
-void G_DoReborn (int playernum) 
-{ 
-    int                             i; 
-	 
-    if (!netgame)
-    {
-	// reload the level from scratch
-	gameaction = ga_loadlevel;  
-    }
-    else 
-    {
-	// respawn at the start
-
-	// first dissasociate the corpse 
-	players[playernum].mo->player = NULL;   
-		 
-	// spawn at random spot if in death match 
-	if (deathmatch) 
-	{ 
-	    G_DeathMatchSpawnPlayer (playernum); 
-	    return; 
-	} 
-		 
-	if (G_CheckSpot (playernum, &playerstarts[playernum]) ) 
-	{ 
-	    P_SpawnPlayer (&playerstarts[playernum]); 
-	    return; 
-	}
-	
-	// try to spawn at one of the other players spots 
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (G_CheckSpot (playernum, &playerstarts[i]) ) 
-	    { 
-		playerstarts[i].type = playernum+1;	// fake as other player 
-		P_SpawnPlayer (&playerstarts[i]); 
-		playerstarts[i].type = i+1;		// restore 
-		return; 
-	    }	    
-	    // he's going to be inside something.  Too bad.
-	}
-	P_SpawnPlayer (&playerstarts[playernum]); 
-    } 
-} 
- 
- 
-void G_ScreenShot (void) 
-{ 
-    gameaction = ga_screenshot; 
-} 
- 
-
-
-// DOOM Par Times
 static const int pars[4][10] =
-{ 
-    {0}, 
-    {0,30,75,120,90,165,180,180,30,165}, 
-    {0,90,90,90,120,90,360,240,30,170}, 
-    {0,90,45,90,150,90,90,165,30,135} 
-}; 
+{
+  {0},
+  {0, 30, 75, 120, 90, 165, 180, 180, 30, 165},
+  {0, 90, 90, 90, 120, 90, 360, 240, 30, 170},
+  {0, 90, 45, 90, 150, 90, 90, 165, 30, 135},
+};
+
+/* DOOM II Par Times */
 
-// DOOM II Par Times
 static const int cpars[32] =
 {
-    30,90,120,120,90,150,120,120,270,90,	//  1-10
-    210,150,150,150,210,150,420,150,210,150,	// 11-20
-    240,150,180,150,150,300,330,420,300,180,	// 21-30
-    120,30					// 31-32
+  30,  90,  120, 120, 90,  150, 120, 120, 270, 90,  /*  1-10 */
+  210, 150, 150, 150, 210, 150, 420, 150, 210, 150, /* 11-20 */
+  240, 150, 180, 150, 150, 300, 330, 420, 300, 180, /* 21-30 */
+  120, 30,                                          /* 31-32 */
 };
 
-// Chex Quest Par Times
+/* Chex Quest Par Times */
+
 static const int chexpars[6] =
-{ 
-    0,120,360,480,200,360
-}; 
- 
-
-//
-// G_DoCompleted 
-//
-boolean		secretexit; 
- 
-void G_ExitLevel (void) 
-{ 
-    secretexit = false; 
-    gameaction = ga_completed; 
-} 
-
-// Here's for the german edition.
-void G_SecretExitLevel (void) 
-{ 
-    // IF NO WOLF3D LEVELS, NO SECRET EXIT!
-    if ( (gamemode == commercial)
-      && (W_CheckNumForName("map31")<0))
-	secretexit = false;
-    else
-	secretexit = true; 
-    gameaction = ga_completed; 
-} 
- 
-void G_DoCompleted (void) 
-{ 
-    int             i; 
-	 
-    gameaction = ga_nothing; 
- 
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-	if (playeringame[i]) 
-	    G_PlayerFinishLevel (i);        // take away cards and stuff 
-	 
-    if (automapactive) 
-	AM_Stop (); 
-	
-    if (gamemode != commercial)
-    {
-        // Chex Quest ends after 5 levels, rather than 8.
-
-        if (gameversion == exe_chex)
-        {
-            if (gamemap == 5)
-            {
-                gameaction = ga_victory;
-                return;
-            }
-        }
-        else
-        {
-            switch(gamemap)
-            {
-              case 8:
-                gameaction = ga_victory;
-                return;
-              case 9: 
-                for (i=0 ; i<MAXPLAYERS ; i++) 
-                    players[i].didsecret = true; 
-                break;
-            }
-        }
-    }
-
-//#if 0  Hmmm - why?
-    if ( (gamemap == 8)
-	 && (gamemode != commercial) ) 
-    {
-	// victory 
-	gameaction = ga_victory; 
-	return; 
-    } 
-	 
-    if ( (gamemap == 9)
-	 && (gamemode != commercial) ) 
-    {
-	// exit secret level 
-	for (i=0 ; i<MAXPLAYERS ; i++) 
-	    players[i].didsecret = true; 
-    } 
-//#endif
-    
-	 
-    wminfo.didsecret = players[consoleplayer].didsecret; 
-    wminfo.epsd = gameepisode -1; 
-    wminfo.last = gamemap -1;
-    
-    // wminfo.next is 0 biased, unlike gamemap
-    if ( gamemode == commercial)
-    {
-	if (secretexit)
-	    switch(gamemap)
-	    {
-	      case 15: wminfo.next = 30; break;
-	      case 31: wminfo.next = 31; break;
-	    }
-	else
-	    switch(gamemap)
-	    {
-	      case 31:
-	      case 32: wminfo.next = 15; break;
-	      default: wminfo.next = gamemap;
-	    }
-    }
-    else
-    {
-	if (secretexit) 
-	    wminfo.next = 8; 	// go to secret level 
-	else if (gamemap == 9) 
-	{
-	    // returning from secret level 
-	    switch (gameepisode) 
-	    { 
-	      case 1: 
-		wminfo.next = 3; 
-		break; 
-	      case 2: 
-		wminfo.next = 5; 
-		break; 
-	      case 3: 
-		wminfo.next = 6; 
-		break; 
-	      case 4:
-		wminfo.next = 2;
-		break;
-	    }                
-	} 
-	else 
-	    wminfo.next = gamemap;          // go to next level 
-    }
-		 
-    wminfo.maxkills = totalkills; 
-    wminfo.maxitems = totalitems; 
-    wminfo.maxsecret = totalsecret; 
-    wminfo.maxfrags = 0; 
-
-    // Set par time. Exceptions are added for purposes of
-    // statcheck regression testing.
-    if (gamemode == commercial)
-    {
-        // map33 reads its par time from beyond the cpars[] array
-        if (gamemap == 33)
-        {
-            int cpars32;
-
-            memcpy(&cpars32, DEH_String(GAMMALVL0), sizeof(int));
-            cpars32 = LONG(cpars32);
-
-            wminfo.partime = TICRATE*cpars32;
-        }
-        else
-        {
-            wminfo.partime = TICRATE*cpars[gamemap-1];
-        }
-    }
-    // Doom episode 4 doesn't have a par time, so this
-    // overflows into the cpars array.
-    else if (gameepisode < 4)
-    {
-        if (gameversion == exe_chex && gameepisode == 1 && gamemap < 6)
-        {
-            wminfo.partime = TICRATE*chexpars[gamemap];
-        }
-        else
-        {
-            wminfo.partime = TICRATE*pars[gameepisode][gamemap];
-        }
-    }
-    else
-    {
-        wminfo.partime = TICRATE*cpars[gamemap];
-    }
-
-    wminfo.pnum = consoleplayer; 
- 
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-    { 
-	wminfo.plyr[i].in = playeringame[i]; 
-	wminfo.plyr[i].skills = players[i].killcount; 
-	wminfo.plyr[i].sitems = players[i].itemcount; 
-	wminfo.plyr[i].ssecret = players[i].secretcount; 
-	wminfo.plyr[i].stime = leveltime; 
-	memcpy (wminfo.plyr[i].frags, players[i].frags 
-		, sizeof(wminfo.plyr[i].frags)); 
-    } 
- 
-    gamestate = GS_INTERMISSION; 
-    viewactive = false; 
-    automapactive = false; 
-
-    StatCopy(&wminfo);
- 
-    WI_Start (&wminfo); 
-} 
-
-
-//
-// G_WorldDone 
-//
-void G_WorldDone (void) 
-{ 
-    gameaction = ga_worlddone; 
-
-    if (secretexit) 
-	players[consoleplayer].didsecret = true; 
-
-    if ( gamemode == commercial )
-    {
-	switch (gamemap)
-	{
-	  case 15:
-	  case 31:
-	    if (!secretexit)
-		break;
-	  case 6:
-	  case 11:
-	  case 20:
-	  case 30:
-	    F_StartFinale ();
-	    break;
-	}
-    }
-} 
- 
-void G_DoWorldDone (void) 
-{        
-    gamestate = GS_LEVEL; 
-    gamemap = wminfo.next+1; 
-    G_DoLoadLevel (); 
-    gameaction = ga_nothing; 
-    viewactive = true; 
-} 
- 
-
-
-//
-// G_InitFromSavegame
-// Can be called by the startup code or the menu task. 
-//
-
-char	savename[256];
-
-void G_LoadGame (char* name) 
-{ 
-    M_StringCopy(savename, name, sizeof(savename));
-    gameaction = ga_loadgame; 
-} 
-
-void G_DoLoadGame (void) 
-{ 
-    int savedleveltime;
-	 
-    gameaction = ga_nothing; 
-	 
-    save_stream = M_fopen(savename, "rb");
-
-    if (save_stream == NULL)
-    {
-        I_Error("Could not load savegame %s", savename);
-    }
-
-    savegame_error = false;
-
-    if (!P_ReadSaveGameHeader())
-    {
-        fclose(save_stream);
-        return;
-    }
-
-    savedleveltime = leveltime;
-    
-    // load a base level 
-    G_InitNew (gameskill, gameepisode, gamemap); 
- 
-    leveltime = savedleveltime;
-
-    // dearchive all the modifications
-    P_UnArchivePlayers (); 
-    P_UnArchiveWorld (); 
-    P_UnArchiveThinkers (); 
-    P_UnArchiveSpecials (); 
- 
-    if (!P_ReadSaveGameEOF())
-	I_Error ("Bad savegame");
-
-    fclose(save_stream);
-    
-    if (setsizeneeded)
-	R_ExecuteSetViewSize ();
-    
-    // draw the pattern into the back screen
-    R_FillBackScreen ();   
-} 
- 
-
-//
-// G_SaveGame
-// Called by the menu task.
-// Description is a 24 byte text string 
-//
-void
-G_SaveGame
-( int	slot,
-  char*	description )
 {
-    savegameslot = slot;
-    M_StringCopy(savedescription, description, sizeof(savedescription));
-    sendsave = true;
-}
-
-void G_DoSaveGame (void) 
-{ 
-    char *savegame_file;
-    char *temp_savegame_file;
-    char *recovery_savegame_file;
-
-    recovery_savegame_file = NULL;
-    temp_savegame_file = P_TempSaveGameFile();
-    savegame_file = P_SaveGameFile(savegameslot);
-
-    // Open the savegame file for writing.  We write to a temporary file
-    // and then rename it at the end if it was successfully written.
-    // This prevents an existing savegame from being overwritten by
-    // a corrupted one, or if a savegame buffer overrun occurs.
-    save_stream = M_fopen(temp_savegame_file, "wb");
-
-    if (save_stream == NULL)
-    {
-        // Failed to save the game, so we're going to have to abort. But
-        // to be nice, save to somewhere else before we call I_Error().
-        recovery_savegame_file = M_TempFile("recovery.dsg");
-        save_stream = M_fopen(recovery_savegame_file, "wb");
-        if (save_stream == NULL)
-        {
-            I_Error("Failed to open either '%s' or '%s' to write savegame.",
-                    temp_savegame_file, recovery_savegame_file);
-        }
-    }
-
-    savegame_error = false;
-
-    P_WriteSaveGameHeader(savedescription);
-
-    P_ArchivePlayers ();
-    P_ArchiveWorld ();
-    P_ArchiveThinkers ();
-    P_ArchiveSpecials ();
-
-    P_WriteSaveGameEOF();
-
-    // Enforce the same savegame size limit as in Vanilla Doom,
-    // except if the vanilla_savegame_limit setting is turned off.
-
-    if (vanilla_savegame_limit && ftell(save_stream) > SAVEGAMESIZE)
-    {
-        I_Error("Savegame buffer overrun");
-    }
-
-    // Finish up, close the savegame file.
-
-    fclose(save_stream);
-
-    if (recovery_savegame_file != NULL)
-    {
-        // We failed to save to the normal location, but we wrote a
-        // recovery file to the temp directory. Now we can bomb out
-        // with an error.
-        I_Error("Failed to open savegame file '%s' for writing.\n"
-                "But your game has been saved to '%s' for recovery.",
-                temp_savegame_file, recovery_savegame_file);
-    }
-
-    // Now rename the temporary savegame file to the actual savegame
-    // file, overwriting the old savegame if there was one there.
-
-    M_remove(savegame_file);
-    M_rename(temp_savegame_file, savegame_file);
-
-    gameaction = ga_nothing;
-    M_StringCopy(savedescription, "", sizeof(savedescription));
-
-    players[consoleplayer].message = DEH_String(GGSAVED);
-
-    // draw the pattern into the back screen
-    R_FillBackScreen ();
-}
- 
-
-//
-// G_InitNew
-// Can be called by the startup code or the menu task,
-// consoleplayer, displayplayer, playeringame[] should be set. 
-//
-skill_t	d_skill; 
-int     d_episode; 
-int     d_map; 
- 
-void
-G_DeferedInitNew
-( skill_t	skill,
-  int		episode,
-  int		map) 
-{ 
-    d_skill = skill; 
-    d_episode = episode; 
-    d_map = map; 
-    gameaction = ga_newgame; 
-} 
-
-
-void G_DoNewGame (void) 
-{
-    demoplayback = false; 
-    netdemo = false;
-    netgame = false;
-    deathmatch = false;
-    playeringame[1] = playeringame[2] = playeringame[3] = 0;
-    respawnparm = false;
-    fastparm = false;
-    nomonsters = false;
-    consoleplayer = 0;
-    G_InitNew (d_skill, d_episode, d_map); 
-    gameaction = ga_nothing; 
-} 
-
-
-void
-G_InitNew
-( skill_t	skill,
-  int		episode,
-  int		map )
-{
-    const char *skytexturename;
-    int             i;
-
-    if (paused)
-    {
-	paused = false;
-	S_ResumeSound ();
-    }
-
-    /*
-    // Note: This commented-out block of code was added at some point
-    // between the DOS version(s) and the Doom source release. It isn't
-    // found in disassemblies of the DOS version and causes IDCLEV and
-    // the -warp command line parameter to behave differently.
-    // This is left here for posterity.
-
-    // This was quite messy with SPECIAL and commented parts.
-    // Supposedly hacks to make the latest edition work.
-    // It might not work properly.
-    if (episode < 1)
-      episode = 1;
-
-    if ( gamemode == retail )
-    {
-      if (episode > 4)
-	episode = 4;
-    }
-    else if ( gamemode == shareware )
-    {
-      if (episode > 1)
-	   episode = 1;	// only start episode 1 on shareware
-    }
-    else
-    {
-      if (episode > 3)
-	episode = 3;
-    }
-    */
-
-    if (skill > sk_nightmare)
-	skill = sk_nightmare;
-
-    if (gameversion >= exe_ultimate)
-    {
-        if (episode == 0)
-        {
-            episode = 4;
-        }
-    }
-    else
-    {
-        if (episode < 1)
-        {
-            episode = 1;
-        }
-        if (episode > 3)
-        {
-            episode = 3;
-        }
-    }
-
-    if (episode > 1 && gamemode == shareware)
-    {
-        episode = 1;
-    }
-
-    if (map < 1)
-	map = 1;
-
-    if ( (map > 9)
-	 && ( gamemode != commercial) )
-      map = 9;
-
-    M_ClearRandom ();
-
-    if (skill == sk_nightmare || respawnparm )
-	respawnmonsters = true;
-    else
-	respawnmonsters = false;
-
-    if (fastparm || (skill == sk_nightmare && gameskill != sk_nightmare) )
-    {
-	for (i=S_SARG_RUN1 ; i<=S_SARG_PAIN2 ; i++)
-	    states[i].tics >>= 1;
-	mobjinfo[MT_BRUISERSHOT].speed = 20*FRACUNIT;
-	mobjinfo[MT_HEADSHOT].speed = 20*FRACUNIT;
-	mobjinfo[MT_TROOPSHOT].speed = 20*FRACUNIT;
-    }
-    else if (skill != sk_nightmare && gameskill == sk_nightmare)
-    {
-	for (i=S_SARG_RUN1 ; i<=S_SARG_PAIN2 ; i++)
-	    states[i].tics <<= 1;
-	mobjinfo[MT_BRUISERSHOT].speed = 15*FRACUNIT;
-	mobjinfo[MT_HEADSHOT].speed = 10*FRACUNIT;
-	mobjinfo[MT_TROOPSHOT].speed = 10*FRACUNIT;
-    }
-
-    // force players to be initialized upon first level load
-    for (i=0 ; i<MAXPLAYERS ; i++)
-	players[i].playerstate = PST_REBORN;
-
-    usergame = true;                // will be set false if a demo
-    paused = false;
-    demoplayback = false;
-    automapactive = false;
-    viewactive = true;
-    gameepisode = episode;
-    gamemap = map;
-    gameskill = skill;
-
-    // Set the sky to use.
-    //
-    // Note: This IS broken, but it is how Vanilla Doom behaves.
-    // See http://doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
-    //
-    // Because we set the sky here at the start of a game, not at the
-    // start of a level, the sky texture never changes unless we
-    // restore from a saved game.  This was fixed before the Doom
-    // source release, but this IS the way Vanilla DOS Doom behaves.
-
-    if (gamemode == commercial)
-    {
-        skytexturename = DEH_String("SKY3");
-        skytexture = R_TextureNumForName(skytexturename);
-        if (gamemap < 21)
-        {
-            skytexturename = DEH_String(gamemap < 12 ? "SKY1" : "SKY2");
-            skytexture = R_TextureNumForName(skytexturename);
-        }
-    }
-    else
-    {
-        switch (gameepisode)
-        {
-          default:
-          case 1:
-            skytexturename = "SKY1";
-            break;
-          case 2:
-            skytexturename = "SKY2";
-            break;
-          case 3:
-            skytexturename = "SKY3";
-            break;
-          case 4:        // Special Edition sky
-            skytexturename = "SKY4";
-            break;
-        }
-        skytexturename = DEH_String(skytexturename);
-        skytexture = R_TextureNumForName(skytexturename);
-    }
-
-    G_DoLoadLevel ();
-}
-
-
-//
-// DEMO RECORDING 
-// 
-#define DEMOMARKER		0x80
-
-
-void G_ReadDemoTiccmd (ticcmd_t* cmd) 
-{ 
-    if (*demo_p == DEMOMARKER) 
-    {
-	// end of demo data stream 
-	G_CheckDemoStatus (); 
-	return; 
-    } 
-    cmd->forwardmove = ((signed char)*demo_p++); 
-    cmd->sidemove = ((signed char)*demo_p++); 
-
-    // If this is a longtics demo, read back in higher resolution
-
-    if (longtics)
-    {
-        cmd->angleturn = *demo_p++;
-        cmd->angleturn |= (*demo_p++) << 8;
-    }
-    else
-    {
-        cmd->angleturn = ((unsigned char) *demo_p++)<<8; 
-    }
-
-    cmd->buttons = (unsigned char)*demo_p++; 
-} 
-
-// Increase the size of the demo buffer to allow unlimited demos
-
-static void IncreaseDemoBuffer(void)
-{
-    int current_length;
-    byte *new_demobuffer;
-    byte *new_demop;
-    int new_length;
-
-    // Find the current size
-
-    current_length = demoend - demobuffer;
-    
-    // Generate a new buffer twice the size
-    new_length = current_length * 2;
-    
-    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
-    new_demop = new_demobuffer + (demo_p - demobuffer);
-
-    // Copy over the old data
-
-    memcpy(new_demobuffer, demobuffer, current_length);
-
-    // Free the old buffer and point the demo pointers at the new buffer.
-
-    Z_Free(demobuffer);
-
-    demobuffer = new_demobuffer;
-    demo_p = new_demop;
-    demoend = demobuffer + new_length;
-}
-
-void G_WriteDemoTiccmd (ticcmd_t* cmd) 
-{ 
-    byte *demo_start;
-
-    if (gamekeydown[key_demo_quit])           // press q to end demo recording 
-	G_CheckDemoStatus (); 
-
-    demo_start = demo_p;
-
-    *demo_p++ = cmd->forwardmove; 
-    *demo_p++ = cmd->sidemove; 
-
-    // If this is a longtics demo, record in higher resolution
- 
-    if (longtics)
-    {
-        *demo_p++ = (cmd->angleturn & 0xff);
-        *demo_p++ = (cmd->angleturn >> 8) & 0xff;
-    }
-    else
-    {
-        *demo_p++ = cmd->angleturn >> 8; 
-    }
-
-    *demo_p++ = cmd->buttons; 
-
-    // reset demo pointer back
-    demo_p = demo_start;
-
-    if (demo_p > demoend - 16)
-    {
-        if (vanilla_demo_limit)
-        {
-            // no more space 
-            G_CheckDemoStatus (); 
-            return; 
-        }
-        else
-        {
-            // Vanilla demo limit disabled: unlimited
-            // demo lengths!
-
-            IncreaseDemoBuffer();
-        }
-    } 
-	
-    G_ReadDemoTiccmd (cmd);         // make SURE it is exactly the same 
-} 
- 
- 
- 
-//
-// G_RecordDemo
-//
-void G_RecordDemo (const char *name)
-{
-    size_t demoname_size;
-    int i;
-    int maxsize;
-
-    usergame = false;
-    demoname_size = strlen(name) + 5;
-    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
-    M_snprintf(demoname, demoname_size, "%s.lmp", name);
-    maxsize = 0x20000;
-
-    //!
-    // @arg <size>
-    // @category demo
-    // @vanilla
-    //
-    // Specify the demo buffer size (KiB)
-    //
-
-    i = M_CheckParmWithArgs("-maxdemo", 1);
-    if (i)
-	maxsize = atoi(myargv[i+1])*1024;
-    demobuffer = Z_Malloc (maxsize,PU_STATIC,NULL); 
-    demoend = demobuffer + maxsize;
-	
-    demorecording = true; 
-} 
-
-// Get the demo version code appropriate for the version set in gameversion.
-int G_VanillaVersionCode(void)
-{
-    switch (gameversion)
-    {
-        case exe_doom_1_666:
-            return 106;
-        case exe_doom_1_7:
-            return 107;
-        case exe_doom_1_8:
-            return 108;
-        case exe_doom_1_9:
-        default:  // All other versions are variants on v1.9:
-            return 109;
-    }
-}
-
-void G_BeginRecording (void) 
-{ 
-    int             i; 
-
-    demo_p = demobuffer;
-
-    //!
-    // @category demo
-    //
-    // Record a high resolution "Doom 1.91" demo.
-    //
-
-    longtics = D_NonVanillaRecord(M_ParmExists("-longtics"),
-                                  "Doom 1.91 demo format");
-
-    // If not recording a longtics demo, record in low res
-    lowres_turn = !longtics;
-
-    if (longtics)
-    {
-        *demo_p++ = DOOM_191_VERSION;
-    }
-    else if (gameversion > exe_doom_1_2)
-    {
-        *demo_p++ = G_VanillaVersionCode();
-    }
-
-    *demo_p++ = gameskill; 
-    *demo_p++ = gameepisode; 
-    *demo_p++ = gamemap; 
-    if (longtics || gameversion > exe_doom_1_2)
-    {
-        *demo_p++ = deathmatch; 
-        *demo_p++ = respawnparm;
-        *demo_p++ = fastparm;
-        *demo_p++ = nomonsters;
-        *demo_p++ = consoleplayer;
-    }
-	 
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-	*demo_p++ = playeringame[i]; 		 
-} 
- 
-
-//
-// G_PlayDemo 
-//
+  0, 120, 360, 480, 200, 360,
+};
 
 static const char *defdemoname;
- 
-void G_DeferedPlayDemo(const char *name)
-{ 
-    defdemoname = name; 
-    gameaction = ga_playdemo; 
-} 
 
-// Generate a string describing a demo version
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static const char *DemoVersionDescription(int version)
+static boolean weapon_selectable(weapontype_t weapon)
 {
-    static char resultbuf[16];
+  /* Can't select the super shotgun in Doom 1. */
 
-    switch (version)
+  if (weapon == wp_supershotgun && logical_gamemission == doom)
     {
-        case 104:
-            return "v1.4";
-        case 105:
-            return "v1.5";
-        case 106:
-            return "v1.6/v1.666";
-        case 107:
-            return "v1.7/v1.7a";
-        case 108:
-            return "v1.8";
-        case 109:
-            return "v1.9";
-        case 111:
-            return "v1.91 hack demo?";
-        default:
-            break;
+      return false;
     }
 
-    // Unknown version.  Perhaps this is a pre-v1.4 IWAD?  If the version
-    // byte is in the range 0-4 then it can be a v1.0-v1.2 demo.
+  /* These weapons aren't available in shareware. */
 
-    if (version >= 0 && version <= 4)
+  if ((weapon == wp_plasma || weapon == wp_bfg) && gamemission == doom &&
+      gamemode == shareware)
     {
-        return "v1.0/v1.1/v1.2";
+      return false;
     }
-    else
+
+  /* Can't select a weapon if we don't own it. */
+
+  if (!players[consoleplayer].weaponowned[weapon])
     {
-        M_snprintf(resultbuf, sizeof(resultbuf),
-                   "%i.%i (unknown)", version / 100, version % 100);
-        return resultbuf;
+      return false;
+    }
+
+  /* Can't select the fist if we have the chainsaw, unless
+   * we also have the berserk pack.
+   */
+
+  if (weapon == wp_fist && players[consoleplayer].weaponowned[wp_chainsaw] &&
+      !players[consoleplayer].powers[pw_strength])
+    {
+      return false;
+    }
+
+  return true;
+}
+
+static int g_next_weapon(int direction)
+{
+  weapontype_t weapon;
+  int start_i;
+  int i;
+
+  /* Find index in the table. */
+
+  if (players[consoleplayer].pendingweapon == wp_nochange)
+    {
+      weapon = players[consoleplayer].readyweapon;
+    }
+  else
+    {
+      weapon = players[consoleplayer].pendingweapon;
+    }
+
+  for (i = 0; i < arrlen(weapon_order_table); ++i)
+    {
+      if (weapon_order_table[i].weapon == weapon)
+        {
+          break;
+        }
+    }
+
+  /* The current weapon must be present in weapon_order_table
+   * otherwise something has gone terribly wrong
+   */
+
+  if (i >= arrlen(weapon_order_table))
+    {
+      i_error("Internal error: weapon %d not present in weapon_order_table",
+              weapon);
+    }
+
+  /* Switch weapon. Don't loop forever. */
+
+  start_i = i;
+  do
+    {
+      i += direction;
+      i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
+    }
+  while (i != start_i && !weapon_selectable(weapon_order_table[i].weapon));
+
+  return weapon_order_table[i].weapon_num;
+}
+
+static int g_cmd_checksum(ticcmd_t *cmd)
+{
+  size_t i;
+  int sum = 0;
+
+  for (i = 0; i < sizeof(*cmd) / 4 - 1; i++)
+    sum += ((int *)cmd)[i];
+
+  return sum;
+}
+
+static void g_do_load_level(void)
+{
+  int i;
+
+  /* Set the sky map.
+   * First thing, we have a dummy sky texture name,
+   *  a flat. The data is in the WAD only because
+   *  we look for an actual index, instead of simply
+   *  setting one.
+   */
+
+  skyflatnum = r_flat_num_for_name((SKYFLATNAME));
+
+  /* The "Sky never changes in Doom II" bug was fixed in
+   * the id Anthology version of doom2.exe for Final Doom.
+   */
+
+  if ((gamemode == commercial) &&
+      (gameversion == exe_final2 || gameversion == exe_chex))
+    {
+      const char *skytexturename;
+
+      if (gamemap < 12)
+        {
+          skytexturename = "SKY1";
+        }
+      else if (gamemap < 21)
+        {
+          skytexturename = "SKY2";
+        }
+      else
+        {
+          skytexturename = "SKY3";
+        }
+
+      skytexturename = (skytexturename);
+
+      skytexture = r_texture_num_for_name(skytexturename);
+    }
+
+  levelstarttic = gametic; /* for time calculation */
+
+  if (wipegamestate == GS_LEVEL) wipegamestate = -1; /* force a wipe */
+
+  gamestate = GS_LEVEL;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      turbodetected[i] = false;
+      if (playeringame[i] && players[i].playerstate == PST_DEAD)
+        players[i].playerstate = PST_REBORN;
+      memset(players[i].frags, 0, sizeof(players[i].frags));
+    }
+
+  p_setup_level(gameepisode, gamemap, 0, gameskill);
+  displayplayer = consoleplayer; /* view the guy you are playing */
+  gameaction = ga_nothing;
+  z_check_heap();
+
+  /* clear cmd building stuff */
+
+  memset(gamekeydown, 0, sizeof(gamekeydown));
+  joyxmove = joyymove = joystrafemove = 0;
+  mousex = mousey = 0;
+  sendpause = sendsave = paused = false;
+  memset(mousearray, 0, sizeof(mousearray));
+  memset(joyarray, 0, sizeof(joyarray));
+
+  if (testcontrols)
+    {
+      players[consoleplayer].message = "Press escape to quit.";
     }
 }
 
-void G_DoPlayDemo (void)
+static void set_joy_buttons(unsigned int buttons_mask)
 {
-    skill_t skill;
-    int i, lumpnum, episode, map;
-    int demoversion;
-    boolean olddemo = false;
+  int i;
 
-    lumpnum = W_GetNumForName(defdemoname);
-    gameaction = ga_nothing;
-    demobuffer = W_CacheLumpNum(lumpnum, PU_STATIC);
-    demo_p = demobuffer;
-
-    demoversion = *demo_p++;
-
-    if (demoversion >= 0 && demoversion <= 4)
+  for (i = 0; i < MAX_JOY_BUTTONS; ++i)
     {
-        olddemo = true;
-        demo_p--;
+      int button_on = (buttons_mask & (1 << i)) != 0;
+
+      /* Detect button press: */
+
+      if (!joybuttons[i] && button_on)
+        {
+          /* Weapon cycling: */
+
+          if (i == joybprevweapon)
+            {
+              next_weapon = -1;
+            }
+          else if (i == joybnextweapon)
+            {
+              next_weapon = 1;
+            }
+        }
+
+      joybuttons[i] = button_on;
+    }
+}
+
+static void set_mouse_buttons(unsigned int buttons_mask)
+{
+  int i;
+
+  for (i = 0; i < MAX_MOUSE_BUTTONS; ++i)
+    {
+      unsigned int button_on = (buttons_mask & (1 << i)) != 0;
+
+      /* Detect button press: */
+
+      if (!mousebuttons[i] && button_on)
+        {
+          if (i == mousebprevweapon)
+            {
+              next_weapon = -1;
+            }
+          else if (i == mousebnextweapon)
+            {
+              next_weapon = 1;
+            }
+        }
+
+      mousebuttons[i] = button_on;
+    }
+}
+
+/* g_check_spot
+ * Returns false if the player cannot be respawned
+ * at the given mapthing_t spot because something is occupying it
+ */
+
+static boolean g_check_spot(int playernum, mapthing_t *mthing)
+{
+  fixed_t x;
+  fixed_t y;
+  subsector_t *ss;
+  mobj_t *mo;
+  int i;
+
+  if (!players[playernum].mo)
+    {
+      /* first spawn of level, before corpses */
+
+      for (i = 0; i < playernum; i++)
+        {
+          if (players[i].mo->x == mthing->x << FRACBITS &&
+              players[i].mo->y == mthing->y << FRACBITS)
+            {
+              return false;
+            }
+        }
+
+      return true;
     }
 
-    longtics = false;
+  x = mthing->x << FRACBITS;
+  y = mthing->y << FRACBITS;
 
-    // Longtics demos use the modified format that is generated by cph's
-    // hacked "v1.91" doom exe. This is a non-vanilla extension.
-    if (D_NonVanillaPlayback(demoversion == DOOM_191_VERSION, lumpnum,
+  if (!p_check_position(players[playernum].mo, x, y)) return false;
+
+  /* flush an old corpse if needed */
+
+  if (bodyqueslot >= BODYQUESIZE)
+    {
+      p_remove_mobj(bodyque[bodyqueslot % BODYQUESIZE]);
+    }
+
+  bodyque[bodyqueslot % BODYQUESIZE] = players[playernum].mo;
+  bodyqueslot++;
+
+  /* spawn a teleport fog */
+
+  ss = r_point_in_subsector(x, y);
+
+  /* The code in the released source looks like this:
+   *
+   *    an = ( ANG45 * (((unsigned int) mthing->angle)/45) )
+   *         >> ANGLETOFINESHIFT;
+   *    mo = p_spawn_mobj (x+20*finecosine[an], y+20*finesine[an]
+   *                     , ss->sector->floorheight
+   *                     , MT_TFOG);
+   *
+   * But 'an' can be a signed value in the DOS version. This means that
+   * we get a negative index and the lookups into finecosine/finesine
+   * end up dereferencing values in finetangent[].
+   * A player spawning on a deathmatch start facing directly west spawns
+   * "silently" with no spawn fog. Emulate this.
+   *
+   * This code is imported from PrBoom+.
+   */
+
+  fixed_t xa;
+  fixed_t ya;
+  signed int an;
+
+  /* This calculation overflows in Vanilla Doom, but here we deliberately
+   * avoid integer overflow as it is undefined behavior, so the value of
+   * 'an' will always be positive.
+   */
+
+  an = (ANG45 >> ANGLETOFINESHIFT) * ((signed int)mthing->angle / 45);
+
+  switch (an)
+    {
+    case 4096:                /* -4096: */
+      xa = finetangent[2048]; /* finecosine[-4096] */
+      ya = finetangent[0];    /* finesine[-4096] */
+      break;
+    case 5120:                /* -3072: */
+      xa = finetangent[3072]; /* finecosine[-3072] */
+      ya = finetangent[1024]; /* finesine[-3072] */
+      break;
+    case 6144:                /* -2048: */
+      xa = finesine[0];       /* finecosine[-2048] */
+      ya = finetangent[2048]; /* finesine[-2048] */
+      break;
+    case 7168:                /* -1024: */
+      xa = finesine[1024];    /* finecosine[-1024] */
+      ya = finetangent[3072]; /* finesine[-1024] */
+      break;
+    case 0:
+    case 1024:
+    case 2048:
+    case 3072:
+      xa = finecosine[an];
+      ya = finesine[an];
+      break;
+    case 8192:             /* 360 deg: */
+      xa = tantoangle[0];  /* finecosine[8192] */
+      ya = finesine[8192]; /* finesine[8192] */
+      break;
+    default:
+      i_error("g_check_spot: unexpected angle %d\n", an);
+      xa = ya = 0;
+      break;
+    }
+
+  mo = p_spawn_mobj(x + 20 * xa, y + 20 * ya, ss->sector->floorheight,
+                    MT_TFOG);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (players[consoleplayer].viewz != 1)
+    {
+      /* don't start sound on first frame */
+
+      s_start_sound(mo, SFX_TELEPT);
+    }
+#else
+  UNUSED(mo);
+#endif
+
+  return true;
+}
+
+static void g_do_reborn(int playernum)
+{
+  int i;
+
+  if (!netgame)
+    {
+      /* reload the level from scratch */
+
+      gameaction = ga_loadlevel;
+    }
+  else
+    {
+      /* respawn at the start first disassociate the corpse */
+
+      players[playernum].mo->player = NULL;
+
+      /* spawn at random spot if in death match */
+
+      if (deathmatch)
+        {
+          g_death_match_spawn_player(playernum);
+          return;
+        }
+
+      if (g_check_spot(playernum, &playerstarts[playernum]))
+        {
+          p_spawn_player(&playerstarts[playernum]);
+          return;
+        }
+
+      /* try to spawn at one of the other players spots */
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (g_check_spot(playernum, &playerstarts[i]))
+            {
+              playerstarts[i].type = playernum + 1; /* fake as other player */
+              p_spawn_player(&playerstarts[i]);
+              playerstarts[i].type = i + 1; /* restore */
+              return;
+            }
+
+          /* he's going to be inside something.  Too bad. */
+        }
+
+      p_spawn_player(&playerstarts[playernum]);
+    }
+}
+
+static void g_do_new_game(void)
+{
+  demoplayback = false;
+  netdemo = false;
+  netgame = false;
+  deathmatch = false;
+  playeringame[1] = playeringame[2] = playeringame[3] = 0;
+  respawnparm = false;
+  fastparm = false;
+  nomonsters = false;
+  consoleplayer = 0;
+  g_init_new(d_skill, d_episode, d_map);
+  gameaction = ga_nothing;
+}
+
+static void g_do_save_game(void)
+{
+  char *savegame_file;
+  char *temp_savegame_file;
+  char *recovery_savegame_file;
+
+  recovery_savegame_file = NULL;
+  temp_savegame_file = p_temp_save_game_file();
+  savegame_file = p_save_game_file(savegameslot);
+
+  /* Open the savegame file for writing.  We write to a temporary file
+   * and then rename it at the end if it was successfully written.
+   * This prevents an existing savegame from being overwritten by
+   * a corrupted one, or if a savegame buffer overrun occurs.
+   */
+
+  save_stream = fopen(temp_savegame_file, "wb");
+
+  if (save_stream == NULL)
+    {
+      /* Failed to save the game, so we're going to have to abort. But
+       * to be nice, save to somewhere else before we call i_error().
+       */
+
+      recovery_savegame_file = m_temp_file("recovery.dsg");
+      save_stream = fopen(recovery_savegame_file, "wb");
+      if (save_stream == NULL)
+        {
+          i_error("Failed to open either '%s' or '%s' to write savegame.",
+                  temp_savegame_file, recovery_savegame_file);
+        }
+    }
+
+  savegame_error = false;
+
+  p_write_save_game_header(savedescription);
+
+  p_archive_players();
+  p_archive_world();
+  p_archive_thinkers();
+  p_archive_specials();
+
+  p_write_save_game_eof();
+
+  /* Enforce the same savegame size limit as in Vanilla Doom,
+   * except if the vanilla_savegame_limit setting is turned off.
+   */
+
+  if (vanilla_savegame_limit && ftell(save_stream) > SAVEGAMESIZE)
+    {
+      i_error("Savegame buffer overrun");
+    }
+
+  /* Finish up, close the savegame file. */
+
+  fclose(save_stream);
+
+  if (recovery_savegame_file != NULL)
+    {
+      /* We failed to save to the normal location, but we wrote a
+       * recovery file to the temp directory. Now we can bomb out
+       * with an error.
+       */
+
+      i_error("Failed to open savegame file '%s' for writing.\n"
+              "But your game has been saved to '%s' for recovery.",
+              temp_savegame_file, recovery_savegame_file);
+    }
+
+  /* Now rename the temporary savegame file to the actual savegame
+   * file, overwriting the old savegame if there was one there.
+   */
+
+  remove(savegame_file);
+  rename(temp_savegame_file, savegame_file);
+
+  gameaction = ga_nothing;
+  m_str_copy(savedescription, "", sizeof(savedescription));
+
+  players[consoleplayer].message = (GGSAVED);
+
+  /* draw the pattern into the back screen */
+
+  r_fill_back_screen();
+}
+
+/* Generate a string describing a demo version */
+
+static const char *demo_version_description(int version)
+{
+  static char resultbuf[16];
+
+  switch (version)
+    {
+    case 104:
+      return "v1.4";
+    case 105:
+      return "v1.5";
+    case 106:
+      return "v1.6/v1.666";
+    case 107:
+      return "v1.7/v1.7a";
+    case 108:
+      return "v1.8";
+    case 109:
+      return "v1.9";
+    case 111:
+      return "v1.91 hack demo?";
+    default:
+      break;
+    }
+
+  /* Unknown version. Perhaps this is a pre-v1.4 IWAD?  If the version
+   * byte is in the range 0-4 then it can be a v1.0-v1.2 demo.
+   */
+
+  if (version >= 0 && version <= 4)
+    {
+      return "v1.0/v1.1/v1.2";
+    }
+  else
+    {
+      snprintf(resultbuf, sizeof(resultbuf), "%i.%i (unknown)",
+              version / 100, version % 100);
+      return resultbuf;
+    }
+}
+
+static void g_do_play_demo(void)
+{
+  skill_t skill;
+  int i;
+  int lumpnum;
+  int episode;
+  int map;
+  int demoversion;
+  boolean olddemo = false;
+
+  lumpnum = w_get_num_for_name(defdemoname);
+  gameaction = ga_nothing;
+  demobuffer = w_cache_lump_num(lumpnum, PU_STATIC);
+  demo_p = demobuffer;
+
+  demoversion = *demo_p++;
+
+  if (demoversion >= 0 && demoversion <= 4)
+    {
+      olddemo = true;
+      demo_p--;
+    }
+
+  longtics = false;
+
+  /* Longtics demos use the modified format that is generated by cph's
+   * hacked "v1.91" doom exe. This is a non-vanilla extension.
+   */
+
+  if (d_non_vanilla_playback(demoversion == DOOM_191_VERSION, lumpnum,
                              "Doom 1.91 demo format"))
     {
-        longtics = true;
+      longtics = true;
     }
-    else if (demoversion != G_VanillaVersionCode() &&
-             !(gameversion <= exe_doom_1_2 && olddemo))
+  else if (demoversion != g_vanilla_version_code() &&
+           !(gameversion <= exe_doom_1_2 && olddemo))
     {
-        const char *message = "Demo is from a different game version!\n"
-                              "(read %i, should be %i)\n"
-                              "\n"
-                              "*** You may need to upgrade your version "
-                                  "of Doom to v1.9. ***\n"
-                              "    See: https://www.doomworld.com/classicdoom"
-                                        "/info/patches.php\n"
-                              "    This appears to be %s.";
+      const char *message = "Demo is from a different game version!\n"
+                            "(read %i, should be %i)\n"
+                            "\n"
+                            "*** You may need to upgrade your version "
+                            "of Doom to v1.9. ***\n"
+                            "    See: https://www.doomworld.com/classicdoom"
+                            "/info/patches.php\n"
+                            "    This appears to be %s.";
 
-        I_Error(message, demoversion, G_VanillaVersionCode(),
-                         DemoVersionDescription(demoversion));
+      i_error(message, demoversion, g_vanilla_version_code(),
+              demo_version_description(demoversion));
     }
 
-    skill = *demo_p++; 
-    episode = *demo_p++; 
-    map = *demo_p++; 
-    if (!olddemo)
+  skill = *demo_p++;
+  episode = *demo_p++;
+  map = *demo_p++;
+
+  if (!olddemo)
     {
-        deathmatch = *demo_p++;
-        respawnparm = *demo_p++;
-        fastparm = *demo_p++;
-        nomonsters = *demo_p++;
-        consoleplayer = *demo_p++;
+      deathmatch = *demo_p++;
+      respawnparm = *demo_p++;
+      fastparm = *demo_p++;
+      nomonsters = *demo_p++;
+      consoleplayer = *demo_p++;
     }
-    else
+  else
     {
-        deathmatch = 0;
-        respawnparm = 0;
-        fastparm = 0;
-        nomonsters = 0;
-        consoleplayer = 0;
+      deathmatch = 0;
+      respawnparm = 0;
+      fastparm = 0;
+      nomonsters = 0;
+      consoleplayer = 0;
     }
-    
-        
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-	playeringame[i] = *demo_p++; 
 
-    if (playeringame[1] || M_CheckParm("-solo-net") > 0
-                        || M_CheckParm("-netdemo") > 0)
+  for (i = 0; i < MAXPLAYERS; i++)
+    playeringame[i] = *demo_p++;
+
+  if (playeringame[1] || m_check_parm("-solo-net") > 0 ||
+      m_check_parm("-netdemo") > 0)
     {
-	netgame = true;
-	netdemo = true;
+      netgame = true;
+      netdemo = true;
     }
 
-    // don't spend a lot of time in loadlevel 
-    precache = false;
-    G_InitNew (skill, episode, map); 
-    precache = true; 
-    starttime = I_GetTime (); 
+  /* don't spend a lot of time in loadlevel */
 
-    usergame = false; 
-    demoplayback = true; 
-} 
+  precache = false;
+  g_init_new(skill, episode, map);
+  precache = true;
+  starttime = i_get_time();
 
-//
-// G_TimeDemo 
-//
-void G_TimeDemo (char* name) 
+  usergame = false;
+  demoplayback = true;
+}
+
+/* g_playerfinishlevel
+ * Can when a player completes a level.
+ */
+
+static void g_player_finish_level(int player)
 {
-    //!
-    // @category video
-    // @vanilla
-    //
-    // Disable rendering the screen entirely.
-    //
+  player_t *p;
 
-    nodrawers = M_CheckParm ("-nodraw");
+  p = &players[player];
 
-    timingdemo = true; 
-    singletics = true; 
+  memset(p->powers, 0, sizeof(p->powers));
+  memset(p->cards, 0, sizeof(p->cards));
+  p->mo->flags &= ~MF_SHADOW; /* cancel invisibility */
+  p->extralight = 0;          /* cancel gun flashes */
+  p->fixedcolormap = 0;       /* cancel ir gogles */
+  p->damagecount = 0;         /* no palette changes */
+  p->bonuscount = 0;
+}
 
-    defdemoname = name; 
-    gameaction = ga_playdemo; 
-} 
- 
- 
-/* 
-=================== 
-= 
-= G_CheckDemoStatus 
-= 
-= Called after a death or level completion to allow demos to be cleaned up 
-= Returns true if a new demo loop action will take place 
-=================== 
-*/ 
- 
-boolean G_CheckDemoStatus (void) 
-{ 
-    int             endtime; 
-	 
-    if (timingdemo) 
-    { 
-        float fps;
-        int realtics;
+static void g_do_completed(void)
+{
+  int i;
 
-	endtime = I_GetTime (); 
-        realtics = endtime - starttime;
-        fps = ((float) gametic * TICRATE) / realtics;
+  gameaction = ga_nothing;
 
-        // Prevent recursive calls
-        timingdemo = false;
-        demoplayback = false;
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i])
+        {
+          g_player_finish_level(i); /* take away cards and stuff */
+        }
+    }
 
-	I_Error ("timed %i gametics in %i realtics (%f fps)",
-                 gametic, realtics, fps);
-    } 
-	 
-    if (demoplayback) 
-    { 
-        W_ReleaseLumpName(defdemoname);
-	demoplayback = false; 
-	netdemo = false;
-	netgame = false;
-	deathmatch = false;
-	playeringame[1] = playeringame[2] = playeringame[3] = 0;
-	respawnparm = false;
-	fastparm = false;
-	nomonsters = false;
-	consoleplayer = 0;
-        
-        if (singledemo) 
-            I_Quit (); 
-        else 
-            D_AdvanceDemo (); 
+  if (automapactive) am_stop();
 
-	return true; 
-    } 
- 
-    if (demorecording) 
-    { 
-	*demo_p++ = DEMOMARKER; 
-	M_WriteFile (demoname, demobuffer, demo_p - demobuffer); 
-	Z_Free (demobuffer); 
-	demorecording = false; 
-	I_Error ("Demo %s recorded",demoname); 
-    } 
-	 
-    return false; 
-} 
- 
- 
- 
+  if (gamemode != commercial)
+    {
+      /* Chex Quest ends after 5 levels, rather than 8. */
+
+      if (gameversion == exe_chex)
+        {
+          if (gamemap == 5)
+            {
+              gameaction = ga_victory;
+              return;
+            }
+        }
+      else
+        {
+          switch (gamemap)
+            {
+            case 8:
+              gameaction = ga_victory;
+              return;
+            case 9:
+              for (i = 0; i < MAXPLAYERS; i++)
+                players[i].didsecret = true;
+              break;
+            }
+        }
+    }
+
+  /* #if 0  Hmmm - why? */
+
+  if ((gamemap == 8) && (gamemode != commercial))
+    {
+      /* victory */
+
+      gameaction = ga_victory;
+      return;
+    }
+
+  if ((gamemap == 9) && (gamemode != commercial))
+    {
+      /* exit secret level */
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        players[i].didsecret = true;
+    }
+
+  /* #endif */
+
+  wminfo.didsecret = players[consoleplayer].didsecret;
+  wminfo.epsd = gameepisode - 1;
+  wminfo.last = gamemap - 1;
+
+  /* wminfo.next is 0 biased, unlike gamemap */
+
+  if (gamemode == commercial)
+    {
+      if (secretexit) switch (gamemap)
+          {
+          case 15:
+            wminfo.next = 30;
+            break;
+          case 31:
+            wminfo.next = 31;
+            break;
+          }
+      else
+        switch (gamemap)
+          {
+          case 31:
+          case 32:
+            wminfo.next = 15;
+            break;
+          default:
+            wminfo.next = gamemap;
+          }
+    }
+  else
+    {
+      if (secretexit)
+        wminfo.next = 8; /* go to secret level */
+      else if (gamemap == 9)
+        {
+          /* returning from secret level */
+
+          switch (gameepisode)
+            {
+            case 1:
+              wminfo.next = 3;
+              break;
+            case 2:
+              wminfo.next = 5;
+              break;
+            case 3:
+              wminfo.next = 6;
+              break;
+            case 4:
+              wminfo.next = 2;
+              break;
+            }
+        }
+      else
+        wminfo.next = gamemap; /* go to next level */
+    }
+
+  wminfo.maxkills = totalkills;
+  wminfo.maxitems = totalitems;
+  wminfo.maxsecret = totalsecret;
+  wminfo.maxfrags = 0;
+
+  /* Set par time. Exceptions are added for purposes of
+   * statcheck regression testing.
+   */
+
+  if (gamemode == commercial)
+    {
+      /* map33 reads its par time from beyond the cpars[] array */
+
+      if (gamemap == 33)
+        {
+          int cpars32;
+
+          memcpy(&cpars32, (GAMMALVL0), sizeof(int));
+          cpars32 = LONG(cpars32);
+
+          wminfo.partime = TICRATE * cpars32;
+        }
+      else
+        {
+          wminfo.partime = TICRATE * cpars[gamemap - 1];
+        }
+    }
+
+  /* Doom episode 4 doesn't have a par time, so this
+   * overflows into the cpars array.
+   */
+
+  else if (gameepisode < 4)
+    {
+      if (gameversion == exe_chex && gameepisode == 1 && gamemap < 6)
+        {
+          wminfo.partime = TICRATE * chexpars[gamemap];
+        }
+      else
+        {
+          wminfo.partime = TICRATE * pars[gameepisode][gamemap];
+        }
+    }
+  else
+    {
+      wminfo.partime = TICRATE * cpars[gamemap];
+    }
+
+  wminfo.pnum = consoleplayer;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      wminfo.plyr[i].in = playeringame[i];
+      wminfo.plyr[i].skills = players[i].killcount;
+      wminfo.plyr[i].sitems = players[i].itemcount;
+      wminfo.plyr[i].ssecret = players[i].secretcount;
+      wminfo.plyr[i].stime = leveltime;
+      memcpy(wminfo.plyr[i].frags, players[i].frags,
+             sizeof(wminfo.plyr[i].frags));
+    }
+
+  gamestate = GS_INTERMISSION;
+  viewactive = false;
+  automapactive = false;
+
+  stat_copy(&wminfo);
+
+  wi_start(&wminfo);
+}
+
+static void g_do_world_done(void)
+{
+  gamestate = GS_LEVEL;
+  gamemap = wminfo.next + 1;
+  g_do_load_level();
+  gameaction = ga_nothing;
+  viewactive = true;
+}
+
+/* Increase the size of the demo buffer to allow unlimited demos */
+
+static void increase_demo_buffer(void)
+{
+  int current_length;
+  byte *new_demobuffer;
+  byte *new_demop;
+  int new_length;
+
+  /* Find the current size */
+
+  current_length = demoend - demobuffer;
+
+  /* Generate a new buffer twice the size */
+
+  new_length = current_length * 2;
+
+  new_demobuffer = z_malloc(new_length, PU_STATIC, 0);
+  new_demop = new_demobuffer + (demo_p - demobuffer);
+
+  /* Copy over the old data */
+
+  memcpy(new_demobuffer, demobuffer, current_length);
+
+  /* Free the old buffer and point the demo pointers at the new buffer. */
+
+  z_free(demobuffer);
+
+  demobuffer = new_demobuffer;
+  demo_p = new_demop;
+  demoend = demobuffer + new_length;
+}
+
+/* DEMO RECORDING */
+
+static void g_read_demo_ticcmd(ticcmd_t *cmd)
+{
+  if (*demo_p == DEMOMARKER)
+    {
+      /* end of demo data stream */
+
+      g_check_demo_status();
+      return;
+    }
+
+  cmd->forwardmove = ((signed char)*demo_p++);
+  cmd->sidemove = ((signed char)*demo_p++);
+
+  /* If this is a longtics demo, read back in higher resolution */
+
+  if (longtics)
+    {
+      cmd->angleturn = *demo_p++;
+      cmd->angleturn |= (*demo_p++) << 8;
+    }
+  else
+    {
+      cmd->angleturn = ((unsigned char)*demo_p++) << 8;
+    }
+
+  cmd->buttons = (unsigned char)*demo_p++;
+}
+
+static void g_write_demo_ticcmd(ticcmd_t *cmd)
+{
+  byte *demo_start;
+
+  if (gamekeydown[key_demo_quit]) /* press q to end demo recording */
+    g_check_demo_status();
+
+  demo_start = demo_p;
+
+  *demo_p++ = cmd->forwardmove;
+  *demo_p++ = cmd->sidemove;
+
+  /* If this is a longtics demo, record in higher resolution */
+
+  if (longtics)
+    {
+      *demo_p++ = (cmd->angleturn & 0xff);
+      *demo_p++ = (cmd->angleturn >> 8) & 0xff;
+    }
+  else
+    {
+      *demo_p++ = cmd->angleturn >> 8;
+    }
+
+  *demo_p++ = cmd->buttons;
+
+  /* reset demo pointer back */
+
+  demo_p = demo_start;
+
+  if (demo_p > demoend - 16)
+    {
+      if (vanilla_demo_limit)
+        {
+          /* no more space */
+
+          g_check_demo_status();
+          return;
+        }
+      else
+        {
+          /* Vanilla demo limit disabled: unlimited
+           * demo lengths!
+           */
+
+          increase_demo_buffer();
+        }
+    }
+
+  g_read_demo_ticcmd(cmd); /* make SURE it is exactly the same */
+}
+
+/* Called at the start.
+ * Called by the game initialization functions.
+ */
+
+static void g_init_player(int player)
+{
+  /* clear everything else to defaults */
+
+  g_player_reborn(player);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* g_build_ticcmd
+ * Builds a ticcmd from all of the available inputs
+ * or reads it from the demo buffer.
+ * If recording a demo, write it out
+ */
+
+void g_build_ticcmd(ticcmd_t *cmd, int maketic)
+{
+  int i;
+  boolean strafe;
+  boolean bstrafe;
+  int speed;
+  int tspeed;
+  int forward;
+  int side;
+
+  memset(cmd, 0, sizeof(ticcmd_t));
+
+  cmd->consistency =
+      consistency[consoleplayer]
+                 [maketic % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
+
+  strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe] ||
+           joybuttons[joybstrafe];
+
+  /* fraggle: support the old "joyb_speed = 31" hack which
+   * allowed an autorun effect
+   */
+
+  speed = key_speed >= NUMKEYS || joybspeed >= MAX_JOY_BUTTONS ||
+          gamekeydown[key_speed] || joybuttons[joybspeed] ||
+          mousebuttons[mousebspeed];
+
+  forward = side = 0;
+
+  /* use two stage accelerative turning
+   * on the keyboard and joystick
+   */
+
+  if (joyxmove < 0 || joyxmove > 0 || gamekeydown[key_right] ||
+      gamekeydown[key_left] || mousebuttons[mousebturnright] ||
+      mousebuttons[mousebturnleft])
+    {
+      turnheld += ticdup;
+    }
+  else
+    {
+      turnheld = 0;
+    }
+
+  if (turnheld < SLOWTURNTICS)
+    {
+      tspeed = 2; /* slow turn */
+    }
+  else
+    {
+      tspeed = speed;
+    }
+
+  /* let movement keys cancel each other out */
+
+  if (strafe)
+    {
+      if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+        {
+          side += sidemove[speed];
+        }
+
+      if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+        {
+          side -= sidemove[speed];
+        }
+
+      if (use_analog && joyxmove)
+        {
+          joyxmove = joyxmove * joystick_move_sensitivity / 10;
+          joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
+          joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
+          side += fixed_mul(sidemove[speed], joyxmove);
+        }
+      else if (joystick_move_sensitivity)
+        {
+          if (joyxmove > 0) side += sidemove[speed];
+          if (joyxmove < 0) side -= sidemove[speed];
+        }
+    }
+  else
+    {
+      if (gamekeydown[key_right] || mousebuttons[mousebturnright])
+        cmd->angleturn -= angleturn[tspeed];
+      if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
+        cmd->angleturn += angleturn[tspeed];
+      if (use_analog && joyxmove)
+        {
+          /* Cubic response curve allows for finer control when stick
+           * deflection is small.
+           */
+
+          joyxmove = fixed_mul(fixed_mul(joyxmove, joyxmove), joyxmove);
+          joyxmove = joyxmove * joystick_turn_sensitivity / 10;
+          cmd->angleturn -= fixed_mul(angleturn[1], joyxmove);
+        }
+      else if (joystick_turn_sensitivity)
+        {
+          if (joyxmove > 0) cmd->angleturn -= angleturn[tspeed];
+          if (joyxmove < 0) cmd->angleturn += angleturn[tspeed];
+        }
+    }
+
+  if (gamekeydown[key_up])
+    {
+      forward += forwardmove[speed];
+    }
+
+  if (gamekeydown[key_down])
+    {
+      forward -= forwardmove[speed];
+    }
+
+  if (use_analog && joyymove)
+    {
+      joyymove = joyymove * joystick_move_sensitivity / 10;
+      joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
+      joyymove = (joyymove < -FRACUNIT) ? -FRACUNIT : joyymove;
+      forward -= fixed_mul(forwardmove[speed], joyymove);
+    }
+  else if (joystick_move_sensitivity)
+    {
+      if (joyymove < 0) forward += forwardmove[speed];
+      if (joyymove > 0) forward -= forwardmove[speed];
+    }
+
+  if (gamekeydown[key_strafeleft] || joybuttons[joybstrafeleft] ||
+      mousebuttons[mousebstrafeleft])
+    {
+      side -= sidemove[speed];
+    }
+
+  if (gamekeydown[key_straferight] || joybuttons[joybstraferight] ||
+      mousebuttons[mousebstraferight])
+    {
+      side += sidemove[speed];
+    }
+
+  if (use_analog && joystrafemove)
+    {
+      joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
+      joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
+      joystrafemove =
+          (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
+      side += fixed_mul(sidemove[speed], joystrafemove);
+    }
+  else if (joystick_move_sensitivity)
+    {
+      if (joystrafemove < 0) side -= sidemove[speed];
+      if (joystrafemove > 0) side += sidemove[speed];
+    }
+
+  /* buttons */
+
+  cmd->chatchar = hu_dequeue_chat_char();
+
+  if (gamekeydown[key_fire] || mousebuttons[mousebfire] ||
+      joybuttons[joybfire])
+    cmd->buttons |= BT_ATTACK;
+
+  if (gamekeydown[key_use] || joybuttons[joybuse] || mousebuttons[mousebuse])
+    {
+      cmd->buttons |= BT_USE;
+      dclicks = 0; /* clear double clicks if hit use button */
+    }
+
+  /* If the previous or next weapon button is pressed, the
+   * next_weapon variable is set to change weapons when
+   * we generate a ticcmd.  Choose a new weapon.
+   */
+
+  if (gamestate == GS_LEVEL && next_weapon != 0)
+    {
+      i = g_next_weapon(next_weapon);
+      cmd->buttons |= BT_CHANGE;
+      cmd->buttons |= i << BT_WEAPONSHIFT;
+    }
+  else
+    {
+      /* Check weapon keys. */
+
+      for (i = 0; i < arrlen(weapon_keys); ++i)
+        {
+          int key = *weapon_keys[i];
+
+          if (gamekeydown[key])
+            {
+              cmd->buttons |= BT_CHANGE;
+              cmd->buttons |= i << BT_WEAPONSHIFT;
+              break;
+            }
+        }
+    }
+
+  next_weapon = 0;
+
+  /* mouse */
+
+  if (mousebuttons[mousebforward])
+    {
+      forward += forwardmove[speed];
+    }
+
+  if (mousebuttons[mousebbackward])
+    {
+      forward -= forwardmove[speed];
+    }
+
+  if (dclick_use)
+    {
+      /* forward double click */
+
+      if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1)
+        {
+          dclickstate = mousebuttons[mousebforward];
+          if (dclickstate) dclicks++;
+          if (dclicks == 2)
+            {
+              cmd->buttons |= BT_USE;
+              dclicks = 0;
+            }
+          else
+            dclicktime = 0;
+        }
+      else
+        {
+          dclicktime += ticdup;
+          if (dclicktime > 20)
+            {
+              dclicks = 0;
+              dclickstate = 0;
+            }
+        }
+
+      /* strafe double click */
+
+      bstrafe = mousebuttons[mousebstrafe] || joybuttons[joybstrafe];
+      if (bstrafe != dclickstate2 && dclicktime2 > 1)
+        {
+          dclickstate2 = bstrafe;
+          if (dclickstate2) dclicks2++;
+          if (dclicks2 == 2)
+            {
+              cmd->buttons |= BT_USE;
+              dclicks2 = 0;
+            }
+          else
+            dclicktime2 = 0;
+        }
+      else
+        {
+          dclicktime2 += ticdup;
+          if (dclicktime2 > 20)
+            {
+              dclicks2 = 0;
+              dclickstate2 = 0;
+            }
+        }
+    }
+
+  forward += mousey;
+
+  if (strafe)
+    side += mousex * 2;
+  else
+    cmd->angleturn -= mousex * 0x8;
+
+  if (mousex == 0)
+    {
+      /* No movement in the previous frame */
+
+      testcontrols_mousespeed = 0;
+    }
+
+  mousex = mousey = 0;
+
+  if (forward > MAXPLMOVE)
+    forward = MAXPLMOVE;
+  else if (forward < -MAXPLMOVE)
+    forward = -MAXPLMOVE;
+  if (side > MAXPLMOVE)
+    side = MAXPLMOVE;
+  else if (side < -MAXPLMOVE)
+    side = -MAXPLMOVE;
+
+  cmd->forwardmove += forward;
+  cmd->sidemove += side;
+
+  /* special buttons */
+
+  if (sendpause)
+    {
+      sendpause = false;
+      cmd->buttons = BT_SPECIAL | BTS_PAUSE;
+    }
+
+  if (sendsave)
+    {
+      sendsave = false;
+      cmd->buttons =
+          BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
+    }
+
+  /* low-res turning */
+
+  if (lowres_turn)
+    {
+      static signed short carry = 0;
+      signed short desired_angleturn;
+
+      desired_angleturn = cmd->angleturn + carry;
+
+      /* round angleturn to the nearest 256 unit boundary
+       * for recording demos with single byte values for turn
+       */
+
+      cmd->angleturn = (desired_angleturn + 128) & 0xff00;
+
+      /* Carry forward the error from the reduced resolution to the
+       * next tic, so that successive small movements can accumulate.
+       */
+
+      carry = desired_angleturn - cmd->angleturn;
+    }
+}
+
+/* g_responder
+ * Get info needed to make ticcmd_ts for the players.
+ */
+
+boolean g_responder(event_t *ev)
+{
+  /* allow spy mode changes even during the demo */
+
+  if (gamestate == GS_LEVEL && ev->type == ev_keydown &&
+      ev->data1 == key_spy && (singledemo || !deathmatch))
+    {
+      /* spy mode */
+
+      do
+        {
+          displayplayer++;
+          if (displayplayer == MAXPLAYERS) displayplayer = 0;
+        }
+      while (!playeringame[displayplayer] && displayplayer != consoleplayer);
+      return true;
+    }
+
+  /* any other key pops up menu if in demos */
+
+  if (gameaction == ga_nothing && !singledemo &&
+      (demoplayback || gamestate == GS_DEMOSCREEN))
+    {
+      if (ev->type == ev_keydown || (ev->type == ev_mouse && ev->data1) ||
+          (ev->type == ev_joystick && ev->data1))
+        {
+          m_start_control_panel();
+          joywait = i_get_time() + 5;
+          return true;
+        }
+
+      return false;
+    }
+
+  if (gamestate == GS_LEVEL)
+    {
+#if 0
+      if (devparm && ev->type == ev_keydown && ev->data1 == ';')
+        {
+          g_death_match_spawn_player(0);
+          return true;
+        }
+
+#endif
+      if (hu_responder(ev)) return true; /* chat ate the event */
+      if (st_responder(ev)) return true; /* status window ate it */
+      if (am_responder(ev)) return true; /* automap ate it */
+    }
+
+  if (gamestate == GS_FINALE)
+    {
+      if (f_responder(ev)) return true; /* finale ate the event */
+    }
+
+  if (testcontrols && ev->type == ev_mouse)
+    {
+      /* If we are invoked by setup to test the controls, save the
+       * mouse speed so that we can display it on-screen.
+       * Perform a low pass filter on this so that the thermometer
+       * appears to move smoothly.
+       */
+
+      testcontrols_mousespeed = abs(ev->data2);
+    }
+
+  /* If the next/previous weapon keys are pressed, set the next_weapon
+   * variable to change weapons when the next ticcmd is generated.
+   */
+
+  if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
+    {
+      next_weapon = -1;
+    }
+  else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
+    {
+      next_weapon = 1;
+    }
+
+  switch (ev->type)
+    {
+    case ev_keydown:
+      if (ev->data1 == key_pause)
+        {
+          sendpause = true;
+        }
+      else if (ev->data1 < NUMKEYS)
+        {
+          gamekeydown[ev->data1] = true;
+        }
+
+      return true; /* eat key down events */
+
+    case ev_keyup:
+      if (ev->data1 < NUMKEYS) gamekeydown[ev->data1] = false;
+      return false; /* always let key up events filter down */
+
+    case ev_mouse:
+      set_mouse_buttons(ev->data1);
+      mousex = ev->data2 * (g_mouse_sensitivity + 5) / 10;
+      mousey = ev->data3 * (g_mouse_sensitivity + 5) / 10;
+      return true; /* eat events */
+
+    case ev_joystick:
+      set_joy_buttons(ev->data1);
+      joyxmove = ev->data2;
+      joyymove = ev->data3;
+      joystrafemove = ev->data4;
+      return true; /* eat events */
+
+    default:
+      break;
+    }
+
+  return false;
+}
+
+/* g_ticker
+ * Make ticcmd_ts for the players.
+ */
+
+void g_ticker(void)
+{
+  int i;
+  int buf;
+  ticcmd_t *cmd;
+
+  /* do player reborns if needed */
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i] && players[i].playerstate == PST_REBORN)
+        {
+          g_do_reborn(i);
+        }
+    }
+
+  /* do things to change the game state */
+
+  while (gameaction != ga_nothing)
+    {
+      switch (gameaction)
+        {
+        case ga_loadlevel:
+          g_do_load_level();
+          break;
+        case ga_newgame:
+          g_do_new_game();
+          break;
+        case ga_loadgame:
+          g_do_load_game();
+          break;
+        case ga_savegame:
+          g_do_save_game();
+          break;
+        case ga_playdemo:
+          g_do_play_demo();
+          break;
+        case ga_completed:
+          g_do_completed();
+          break;
+        case ga_victory:
+          f_start_finale();
+          break;
+        case ga_worlddone:
+          g_do_world_done();
+          break;
+        case ga_screenshot:
+          v_screenshot("DOOM%02i.%s");
+          players[consoleplayer].message = ("screen shot");
+          gameaction = ga_nothing;
+          break;
+        case ga_nothing:
+          break;
+        }
+    }
+
+  /* get commands, check consistency, and build new consistency check */
+
+  buf = (gametic / ticdup) % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i])
+        {
+          cmd = &players[i].cmd;
+
+          memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
+
+          if (demoplayback) g_read_demo_ticcmd(cmd);
+          if (demorecording) g_write_demo_ticcmd(cmd);
+
+          /* check for turbo cheats
+           * check ~ 4 seconds whether to display the turbo message.
+           * store if the turbo threshold was exceeded in any tics
+           * over the past 4 seconds.  offset the checking period
+           * for each player so messages are not displayed at the
+           * same time.
+           */
+
+          if (cmd->forwardmove > TURBOTHRESHOLD)
+            {
+              turbodetected[i] = true;
+            }
+
+          if ((gametic & 31) == 0 && ((gametic >> 5) % MAXPLAYERS) == i &&
+              turbodetected[i])
+            {
+              static char turbomessage[80];
+              snprintf(turbomessage, sizeof(turbomessage), "%s is turbo!",
+                       player_names[i]);
+              players[consoleplayer].message = turbomessage;
+              turbodetected[i] = false;
+            }
+
+          if (netgame && !netdemo && !(gametic % ticdup))
+            {
+              if (gametic > CONFIG_GAMES_NXDOOM_NET_BACKUPTICS &&
+                  consistency[i][buf] != cmd->consistency)
+                {
+                  i_error("consistency failure (%i should be %i)",
+                          cmd->consistency, consistency[i][buf]);
+                }
+
+              if (players[i].mo)
+                consistency[i][buf] = players[i].mo->x;
+              else
+                consistency[i][buf] = rndindex;
+            }
+        }
+    }
+
+  /* check for special buttons */
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i])
+        {
+          if (players[i].cmd.buttons & BT_SPECIAL)
+            {
+              switch (players[i].cmd.buttons & BT_SPECIALMASK)
+                {
+                case BTS_PAUSE:
+                  paused ^= 1;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                  if (paused)
+                    s_pause_sound();
+                  else
+                    s_resume_sound();
+                  break;
+#endif
+
+                case BTS_SAVEGAME:
+                  if (!savedescription[0])
+                    {
+                      m_str_copy(savedescription, "NET GAME",
+                                 sizeof(savedescription));
+                    }
+
+                  savegameslot = (players[i].cmd.buttons & BTS_SAVEMASK) >>
+                                 BTS_SAVESHIFT;
+                  gameaction = ga_savegame;
+                  break;
+                }
+            }
+        }
+    }
+
+  /* Have we just finished displaying an intermission screen? */
+
+  if (oldgamestate == GS_INTERMISSION && gamestate != GS_INTERMISSION)
+    {
+      wi_end();
+    }
+
+  oldgamestate = gamestate;
+
+  /* do main actions */
+
+  switch (gamestate)
+    {
+    case GS_LEVEL:
+      p_ticker();
+      st_ticker();
+      am_ticker();
+      hu_ticker();
+      break;
+
+    case GS_INTERMISSION:
+      wi_ticker();
+      break;
+
+    case GS_FINALE:
+      f_ticker();
+      break;
+
+    case GS_DEMOSCREEN:
+      d_page_ticker();
+      break;
+    }
+}
+
+/* PLAYER STRUCTURE FUNCTIONS
+ * also see p_spawn_player in P_Things
+ */
+
+/* g_player_reborn
+ * Called after a player dies almost everything is cleared and initialized
+ */
+
+void g_player_reborn(int player)
+{
+  player_t *p;
+  int i;
+  int frags[MAXPLAYERS];
+  int killcount;
+  int itemcount;
+  int secretcount;
+
+  memcpy(frags, players[player].frags, sizeof(frags));
+  killcount = players[player].killcount;
+  itemcount = players[player].itemcount;
+  secretcount = players[player].secretcount;
+
+  p = &players[player];
+  memset(p, 0, sizeof(*p));
+
+  memcpy(players[player].frags, frags, sizeof(players[player].frags));
+  players[player].killcount = killcount;
+  players[player].itemcount = itemcount;
+  players[player].secretcount = secretcount;
+
+  p->usedown = p->attackdown = true; /* don't do anything immediately */
+  p->playerstate = PST_LIVE;
+  p->health = deh_initial_health; /* Use dehacked value */
+  p->readyweapon = p->pendingweapon = wp_pistol;
+  p->weaponowned[wp_fist] = true;
+  p->weaponowned[wp_pistol] = true;
+  p->ammo[am_clip] = deh_initial_bullets;
+
+  for (i = 0; i < NUMAMMO; i++)
+    p->maxammo[i] = maxammo[i];
+}
+
+/* g_death_match_spawn_player
+ * Spawns a player at one of the random death match spots
+ * called at level load and each death
+ */
+
+void g_death_match_spawn_player(int playernum)
+{
+  int i;
+  int j;
+  int selections;
+
+  selections = deathmatch_p - deathmatchstarts;
+  if (selections < 4)
+    i_error("Only %i deathmatch spots, 4 required", selections);
+
+  for (j = 0; j < 20; j++)
+    {
+      i = p_random() % selections;
+      if (g_check_spot(playernum, &deathmatchstarts[i]))
+        {
+          deathmatchstarts[i].type = playernum + 1;
+          p_spawn_player(&deathmatchstarts[i]);
+          return;
+        }
+    }
+
+  /* no good spot, so the player will probably get stuck */
+
+  p_spawn_player(&playerstarts[playernum]);
+}
+
+void g_screenshot(void)
+{
+  gameaction = ga_screenshot;
+}
+
+void g_exit_level(void)
+{
+  secretexit = false;
+  gameaction = ga_completed;
+}
+
+/* Here's for the german edition. */
+
+void g_secret_exit_level(void)
+{
+  /* IF NO WOLF3D LEVELS, NO SECRET EXIT! */
+
+  if ((gamemode == commercial) && (w_check_num_for_name("map31") < 0))
+    secretexit = false;
+  else
+    secretexit = true;
+  gameaction = ga_completed;
+}
+
+void g_world_done(void)
+{
+  gameaction = ga_worlddone;
+
+  if (secretexit) players[consoleplayer].didsecret = true;
+
+  if (gamemode == commercial)
+    {
+      switch (gamemap)
+        {
+        case 15:
+        case 31:
+          if (!secretexit) break;
+        case 6:
+        case 11:
+        case 20:
+        case 30:
+          f_start_finale();
+          break;
+        }
+    }
+}
+
+/* g_initfromsavegame
+ * Can be called by the startup code or the menu task.
+ */
+
+void g_load_game(char *name)
+{
+  m_str_copy(savename, name, sizeof(savename));
+  gameaction = ga_loadgame;
+}
+
+void g_do_load_game(void)
+{
+  int savedleveltime;
+
+  gameaction = ga_nothing;
+
+  save_stream = fopen(savename, "rb");
+
+  if (save_stream == NULL)
+    {
+      i_error("Could not load savegame %s", savename);
+    }
+
+  savegame_error = false;
+
+  if (!p_read_save_game_header())
+    {
+      fclose(save_stream);
+      return;
+    }
+
+  savedleveltime = leveltime;
+
+  /* load a base level */
+
+  g_init_new(gameskill, gameepisode, gamemap);
+
+  leveltime = savedleveltime;
+
+  /* dearchive all the modifications */
+
+  p_unarchive_players();
+  p_unarchive_world();
+  p_unarchive_thinkers();
+  p_unarchive_specials();
+
+  if (!p_read_save_game_eof()) i_error("Bad savegame");
+
+  fclose(save_stream);
+
+  if (setsizeneeded) r_execute_set_view_size();
+
+  /* draw the pattern into the back screen */
+
+  r_fill_back_screen();
+}
+
+/* g_save_game
+ * Called by the menu task.
+ * Description is a 24 byte text string
+ */
+
+void g_save_game(int slot, char *description)
+{
+  savegameslot = slot;
+  m_str_copy(savedescription, description, sizeof(savedescription));
+  sendsave = true;
+}
+
+/* g_init_new
+ * Can be called by the startup code or the menu task,
+ * consoleplayer, displayplayer, playeringame[] should be set.
+ */
+
+void g_deferred_init_new(skill_t skill, int episode, int map)
+{
+  d_skill = skill;
+  d_episode = episode;
+  d_map = map;
+  gameaction = ga_newgame;
+}
+
+void g_init_new(skill_t skill, int episode, int map)
+{
+  const char *skytexturename;
+  int i;
+
+  if (paused)
+    {
+      paused = false;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_resume_sound();
+#endif
+    }
+
+  /* Note: This commented-out block of code was added at some point
+   * between the DOS version(s) and the Doom source release. It isn't
+   * found in disassemblies of the DOS version and causes IDCLEV and
+   * the -warp command line parameter to behave differently.
+   * This is left here for posterity.
+   * This was quite messy with SPECIAL and commented parts.
+   * Supposedly hacks to make the latest edition work.
+   * It might not work properly.
+   *
+   * if (episode < 1)
+   *   episode = 1;
+   * if ( gamemode == retail )
+   * {
+   *   if (episode > 4)
+   *     episode = 4;
+   * }
+   * else if ( gamemode == shareware )
+   * {
+   *   if (episode > 1)
+   *        episode = 1;  // only start episode 1 on shareware
+   * }
+   * else
+   * {
+   *   if (episode > 3)
+   *     episode = 3;
+   * }
+   */
+
+  if (skill > sk_nightmare) skill = sk_nightmare;
+
+  if (gameversion >= exe_ultimate)
+    {
+      if (episode == 0)
+        {
+          episode = 4;
+        }
+    }
+  else
+    {
+      if (episode < 1)
+        {
+          episode = 1;
+        }
+
+      if (episode > 3)
+        {
+          episode = 3;
+        }
+    }
+
+  if (episode > 1 && gamemode == shareware)
+    {
+      episode = 1;
+    }
+
+  if (map < 1) map = 1;
+
+  if ((map > 9) && (gamemode != commercial)) map = 9;
+
+  m_clear_random();
+
+  if (skill == sk_nightmare || respawnparm)
+    respawnmonsters = true;
+  else
+    respawnmonsters = false;
+
+  if (fastparm || (skill == sk_nightmare && gameskill != sk_nightmare))
+    {
+      for (i = S_SARG_RUN1; i <= S_SARG_PAIN2; i++)
+        states[i].tics >>= 1;
+      mobjinfo[MT_BRUISERSHOT].speed = 20 * FRACUNIT;
+      mobjinfo[MT_HEADSHOT].speed = 20 * FRACUNIT;
+      mobjinfo[MT_TROOPSHOT].speed = 20 * FRACUNIT;
+    }
+  else if (skill != sk_nightmare && gameskill == sk_nightmare)
+    {
+      for (i = S_SARG_RUN1; i <= S_SARG_PAIN2; i++)
+        states[i].tics <<= 1;
+      mobjinfo[MT_BRUISERSHOT].speed = 15 * FRACUNIT;
+      mobjinfo[MT_HEADSHOT].speed = 10 * FRACUNIT;
+      mobjinfo[MT_TROOPSHOT].speed = 10 * FRACUNIT;
+    }
+
+  /* force players to be initialized upon first level load */
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    players[i].playerstate = PST_REBORN;
+
+  usergame = true; /* will be set false if a demo */
+  paused = false;
+  demoplayback = false;
+  automapactive = false;
+  viewactive = true;
+  gameepisode = episode;
+  gamemap = map;
+  gameskill = skill;
+
+  /* Set the sky to use.
+   *
+   * Note: This IS broken, but it is how Vanilla Doom behaves.
+   * See http: *doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
+   *
+   * Because we set the sky here at the start of a game, not at the
+   * start of a level, the sky texture never changes unless we
+   * restore from a saved game.  This was fixed before the Doom
+   * source release, but this IS the way Vanilla DOS Doom behaves.
+   */
+
+  if (gamemode == commercial)
+    {
+      skytexturename = ("SKY3");
+      skytexture = r_texture_num_for_name(skytexturename);
+      if (gamemap < 21)
+        {
+          skytexturename = (gamemap < 12 ? "SKY1" : "SKY2");
+          skytexture = r_texture_num_for_name(skytexturename);
+        }
+    }
+  else
+    {
+      switch (gameepisode)
+        {
+        default:
+        case 1:
+          skytexturename = "SKY1";
+          break;
+        case 2:
+          skytexturename = "SKY2";
+          break;
+        case 3:
+          skytexturename = "SKY3";
+          break;
+        case 4: /* Special Edition sky */
+          skytexturename = "SKY4";
+          break;
+        }
+
+      skytexturename = (skytexturename);
+      skytexture = r_texture_num_for_name(skytexturename);
+    }
+
+  g_do_load_level();
+}
+
+void g_record_demo(const char *name)
+{
+  size_t demoname_size;
+  int i;
+  int maxsize;
+
+  usergame = false;
+  demoname_size = strlen(name) + 5;
+  demoname = z_malloc(demoname_size, PU_STATIC, NULL);
+  snprintf(demoname, demoname_size, "%s.lmp", name);
+  maxsize = 0x20000;
+
+  /* @arg <size>
+   * @category demo
+   * @vanilla
+   *
+   * Specify the demo buffer size (KiB)
+   */
+
+  i = m_check_parm_with_args("-maxdemo", 1);
+  if (i) maxsize = atoi(myargv[i + 1]) * 1024;
+  demobuffer = z_malloc(maxsize, PU_STATIC, NULL);
+  demoend = demobuffer + maxsize;
+
+  demorecording = true;
+}
+
+/* Get the demo version code appropriate for the version set in gameversion.
+ */
+
+int g_vanilla_version_code(void)
+{
+  switch (gameversion)
+    {
+    case exe_doom_1_666:
+      return 106;
+    case exe_doom_1_7:
+      return 107;
+    case exe_doom_1_8:
+      return 108;
+    case exe_doom_1_9:
+    default: /* All other versions are variants on v1.9: */
+      return 109;
+    }
+}
+
+void g_begin_recording(void)
+{
+  int i;
+
+  demo_p = demobuffer;
+
+  /* @category demo
+   *
+   * Record a high resolution "Doom 1.91" demo.
+   */
+
+  longtics = d_non_vanilla_record(m_parm_exists("-longtics"),
+                                  "Doom 1.91 demo format");
+
+  /* If not recording a longtics demo, record in low res */
+
+  lowres_turn = !longtics;
+
+  if (longtics)
+    {
+      *demo_p++ = DOOM_191_VERSION;
+    }
+  else if (gameversion > exe_doom_1_2)
+    {
+      *demo_p++ = g_vanilla_version_code();
+    }
+
+  *demo_p++ = gameskill;
+  *demo_p++ = gameepisode;
+  *demo_p++ = gamemap;
+  if (longtics || gameversion > exe_doom_1_2)
+    {
+      *demo_p++ = deathmatch;
+      *demo_p++ = respawnparm;
+      *demo_p++ = fastparm;
+      *demo_p++ = nomonsters;
+      *demo_p++ = consoleplayer;
+    }
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    *demo_p++ = playeringame[i];
+}
+
+void g_defered_play_demo(const char *name)
+{
+  defdemoname = name;
+  gameaction = ga_playdemo;
+}
+
+void g_time_demo(char *name)
+{
+  /* @category video
+   * @vanilla
+   *
+   * Disable rendering the screen entirely.
+   */
+
+  nodrawers = m_check_parm("-nodraw");
+
+  timingdemo = true;
+  singletics = true;
+
+  defdemoname = name;
+  gameaction = ga_playdemo;
+}
+
+/* g_check_demo_status
+ *
+ * Called after a death or level completion to allow demos to be cleaned up
+ * Returns true if a new demo loop action will take place
+ */
+
+boolean g_check_demo_status(void)
+{
+  int endtime;
+
+  if (timingdemo)
+    {
+      float fps;
+      int realtics;
+
+      endtime = i_get_time();
+      realtics = endtime - starttime;
+      fps = ((float)gametic * TICRATE) / realtics;
+
+      /* Prevent recursive calls */
+
+      timingdemo = false;
+      demoplayback = false;
+
+      i_error("timed %i gametics in %i realtics (%f fps)", gametic, realtics,
+              fps);
+    }
+
+  if (demoplayback)
+    {
+      w_release_lump_name(defdemoname);
+      demoplayback = false;
+      netdemo = false;
+      netgame = false;
+      deathmatch = false;
+      playeringame[1] = playeringame[2] = playeringame[3] = 0;
+      respawnparm = false;
+      fastparm = false;
+      nomonsters = false;
+      consoleplayer = 0;
+
+      if (singledemo)
+        i_quit();
+      else
+        d_advance_demo();
+
+      return true;
+    }
+
+  if (demorecording)
+    {
+      *demo_p++ = DEMOMARKER;
+      m_write_file(demoname, demobuffer, demo_p - demobuffer);
+      z_free(demobuffer);
+      demorecording = false;
+      i_error("Demo %s recorded", demoname);
+    }
+
+  return false;
+}
diff --git a/games/NXDoom/src/doom/g_game.h b/games/NXDoom/src/doom/g_game.h
index 1e8729d18..80c3fe2ee 100644
--- a/games/NXDoom/src/doom/g_game.h
+++ b/games/NXDoom/src/doom/g_game.h
@@ -1,79 +1,41 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Duh.
-// 
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/g_game.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Duh.
+ *
+ ****************************************************************************/
 
 #ifndef __G_GAME__
 #define __G_GAME__
 
-#include "doomdef.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_event.h"
 #include "d_ticcmd.h"
+#include "doomdef.h"
 #include "m_fixed.h"
 
-
-//
-// GAME
-//
-void G_DeathMatchSpawnPlayer (int playernum);
-
-void G_InitNew (skill_t skill, int episode, int map);
-
-// Can be called by the startup code or M_Responder.
-// A normal game starts at map 1,
-// but a warp test can start elsewhere
-void G_DeferedInitNew (skill_t skill, int episode, int map);
-
-void G_DeferedPlayDemo (const char* demo);
-
-// Can be called by the startup code or M_Responder,
-// calls P_SetupLevel or W_EnterWorld.
-void G_LoadGame (char* name);
-
-void G_DoLoadGame (void);
-
-// Called by M_Responder.
-void G_SaveGame (int slot, char* description);
-
-// Only called by startup code.
-void G_RecordDemo (const char* name);
-
-void G_BeginRecording (void);
-
-void G_PlayDemo (char* name);
-void G_TimeDemo (char* name);
-boolean G_CheckDemoStatus (void);
-
-void G_ExitLevel (void);
-void G_SecretExitLevel (void);
-
-void G_WorldDone (void);
-
-// Read current data from inputs and build a player movement command.
-
-void G_BuildTiccmd (ticcmd_t *cmd, int maketic); 
-
-void G_Ticker (void);
-boolean G_Responder (event_t*	ev);
-
-void G_ScreenShot (void);
-
-void G_DrawMouseSpeedBox(void);
-int G_VanillaVersionCode(void);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern int vanilla_savegame_limit;
 extern int vanilla_demo_limit;
@@ -83,6 +45,61 @@ extern fixed_t sidemove[2];
 
 extern boolean sendpause;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* GAME */
 
+void g_death_match_spawn_player(int playernum);
+
+void g_init_new(skill_t skill, int episode, int map);
+
+/* Can be called by the startup code or m_responder.
+ * A normal game starts at map 1,
+ * but a warp test can start elsewhere
+ */
+
+void g_deferred_init_new(skill_t skill, int episode, int map);
+
+void g_defered_play_demo(const char *demo);
+
+/* Can be called by the startup code or m_responder,
+ * calls p_setup_level or W_EnterWorld.
+ */
+
+void g_load_game(char *name);
+
+void g_do_load_game(void);
+
+/* Called by m_responder. */
+
+void g_save_game(int slot, char *description);
+
+/* Only called by startup code. */
+
+void g_record_demo(const char *name);
+
+void g_begin_recording(void);
+
+void g_play_demo(char *name);
+void g_time_demo(char *name);
+boolean g_check_demo_status(void);
+
+void g_exit_level(void);
+void g_secret_exit_level(void);
+
+void g_world_done(void);
+
+/* Read current data from inputs and build a player movement command. */
+
+void g_build_ticcmd(ticcmd_t *cmd, int maketic);
+
+void g_ticker(void);
+boolean g_responder(event_t *ev);
+
+void g_screenshot(void);
+
+int g_vanilla_version_code(void);
+
+#endif /* __G_GAME__ */
diff --git a/games/NXDoom/src/doom/hu_lib.c b/games/NXDoom/src/doom/hu_lib.c
index d32c2004d..cfa962331 100644
--- a/games/NXDoom/src/doom/hu_lib.c
+++ b/games/NXDoom/src/doom/hu_lib.c
@@ -1,20 +1,28 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  heads-up text and input code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/hu_lib.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  heads-up text and input code
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 
@@ -22,326 +30,289 @@
 #include "doomkeys.h"
 #include "doomstat.h"
 
-#include "v_video.h"
 #include "i_swap.h"
+#include "v_video.h"
 
 #include "hu_lib.h"
-#include "r_local.h"
 #include "r_draw.h"
+#include "r_local.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* boolean : whether the screen is always erased */
 
-// boolean : whether the screen is always erased
 #define noterased viewwindowx
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-void HUlib_init(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void hu_lib_clear_text(hu_textline_t *t)
 {
+  t->len = 0;
+  t->l[0] = 0;
+  t->needsupdate = true;
 }
 
-void HUlib_clearTextLine(hu_textline_t* t)
+void hu_lib_init_text_line(hu_textline_t *t, int x, int y, patch_t **f,
+                           int sc)
 {
-    t->len = 0;
-    t->l[0] = 0;
-    t->needsupdate = true;
+  t->x = x;
+  t->y = y;
+  t->f = f;
+  t->sc = sc;
+  hu_lib_clear_text(t);
 }
 
-void
-HUlib_initTextLine
-( hu_textline_t*	t,
-  int			x,
-  int			y,
-  patch_t**		f,
-  int			sc )
+boolean hu_lib_add_char_to_text_line(hu_textline_t *t, char ch)
 {
-    t->x = x;
-    t->y = y;
-    t->f = f;
-    t->sc = sc;
-    HUlib_clearTextLine(t);
-}
-
-boolean
-HUlib_addCharToTextLine
-( hu_textline_t*	t,
-  char			ch )
-{
-
-    if (t->len == HU_MAXLINELENGTH)
-	return false;
-    else
+  if (t->len == HU_MAXLINELENGTH)
     {
-	t->l[t->len++] = ch;
-	t->l[t->len] = 0;
-	t->needsupdate = 4;
-	return true;
+      return false;
     }
-
-}
-
-boolean HUlib_delCharFromTextLine(hu_textline_t* t)
-{
-
-    if (!t->len) return false;
-    else
+  else
     {
-	t->l[--t->len] = 0;
-	t->needsupdate = 4;
-	return true;
-    }
-
-}
-
-void
-HUlib_drawTextLine
-( hu_textline_t*	l,
-  boolean		drawcursor )
-{
-
-    int			i;
-    int			w;
-    int			x;
-    unsigned char	c;
-
-    // draw the new stuff
-    x = l->x;
-    for (i=0;i<l->len;i++)
-    {
-	c = toupper(l->l[i]);
-	if (c != ' '
-	    && c >= l->sc
-	    && c <= '_')
-	{
-	    w = SHORT(l->f[c - l->sc]->width);
-	    if (x+w > SCREENWIDTH)
-		break;
-	    V_DrawPatchDirect(x, l->y, l->f[c - l->sc]);
-	    x += w;
-	}
-	else
-	{
-	    x += 4;
-	    if (x >= SCREENWIDTH)
-		break;
-	}
-    }
-
-    // draw the cursor if requested
-    if (drawcursor
-	&& x + SHORT(l->f['_' - l->sc]->width) <= SCREENWIDTH)
-    {
-	V_DrawPatchDirect(x, l->y, l->f['_' - l->sc]);
+      t->l[t->len++] = ch;
+      t->l[t->len] = 0;
+      t->needsupdate = 4;
+      return true;
     }
 }
 
-
-// sorta called by HU_Erase and just better darn get things straight
-void HUlib_eraseTextLine(hu_textline_t* l)
+boolean hu_lib_del_char_from_text_line(hu_textline_t *t)
 {
-    int			lh;
-    int			y;
-    int			yoffset;
-
-    // Only erases when NOT in automap and the screen is reduced,
-    // and the text must either need updating or refreshing
-    // (because of a recent change back from the automap)
-
-    if (!automapactive &&
-	viewwindowx && l->needsupdate)
+  if (!t->len)
     {
-	lh = SHORT(l->f[0]->height) + 1;
-	for (y=l->y,yoffset=y*SCREENWIDTH ; y<l->y+lh ; y++,yoffset+=SCREENWIDTH)
-	{
-	    if (y < viewwindowy || y >= viewwindowy + viewheight)
-		R_VideoErase(yoffset, SCREENWIDTH); // erase entire line
-	    else
-	    {
-		R_VideoErase(yoffset, viewwindowx); // erase left border
-		R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
-		// erase right border
-	    }
-	}
+      return false;
+    }
+  else
+    {
+      t->l[--t->len] = 0;
+      t->needsupdate = 4;
+      return true;
+    }
+}
+
+void hu_lib_draw_text_line(hu_textline_t *l, boolean drawcursor)
+{
+  int i;
+  int w;
+  int x;
+  unsigned char c;
+
+  /* draw the new stuff */
+
+  x = l->x;
+  for (i = 0; i < l->len; i++)
+    {
+      c = toupper(l->l[i]);
+      if (c != ' ' && c >= l->sc && c <= '_')
+        {
+          w = SHORT(l->f[c - l->sc]->width);
+          if (x + w > SCREENWIDTH) break;
+          v_draw_patch_direct(x, l->y, l->f[c - l->sc]);
+          x += w;
+        }
+      else
+        {
+          x += 4;
+          if (x >= SCREENWIDTH) break;
+        }
     }
 
-    if (l->needsupdate) l->needsupdate--;
+  /* draw the cursor if requested */
 
-}
-
-void
-HUlib_initSText
-( hu_stext_t*	s,
-  int		x,
-  int		y,
-  int		h,
-  patch_t**	font,
-  int		startchar,
-  boolean*	on )
-{
-
-    int i;
-
-    s->h = h;
-    s->on = on;
-    s->laston = true;
-    s->cl = 0;
-    for (i=0;i<h;i++)
-	HUlib_initTextLine(&s->l[i],
-			   x, y - i*(SHORT(font[0]->height)+1),
-			   font, startchar);
-
-}
-
-void HUlib_addLineToSText(hu_stext_t* s)
-{
-
-    int i;
-
-    // add a clear line
-    if (++s->cl == s->h)
-	s->cl = 0;
-    HUlib_clearTextLine(&s->l[s->cl]);
-
-    // everything needs updating
-    for (i=0 ; i<s->h ; i++)
-	s->l[i].needsupdate = 4;
-
-}
-
-void
-HUlib_addMessageToSText
-( hu_stext_t*	s,
-  const char*	prefix,
-  const char*	msg )
-{
-    HUlib_addLineToSText(s);
-    if (prefix)
-	while (*prefix)
-	    HUlib_addCharToTextLine(&s->l[s->cl], *(prefix++));
-
-    while (*msg)
-	HUlib_addCharToTextLine(&s->l[s->cl], *(msg++));
-}
-
-void HUlib_drawSText(hu_stext_t* s)
-{
-    int i, idx;
-    hu_textline_t *l;
-
-    if (!*s->on)
-	return; // if not on, don't draw
-
-    // draw everything
-    for (i=0 ; i<s->h ; i++)
+  if (drawcursor && x + SHORT(l->f['_' - l->sc]->width) <= SCREENWIDTH)
     {
-	idx = s->cl - i;
-	if (idx < 0)
-	    idx += s->h; // handle queue of lines
-	
-	l = &s->l[idx];
+      v_draw_patch_direct(x, l->y, l->f['_' - l->sc]);
+    }
+}
 
-	// need a decision made here on whether to skip the draw
-	HUlib_drawTextLine(l, false); // no cursor, please
+/* sorta called by hu_erase and just better darn get things straight */
+
+void hu_lib_erase_text_line(hu_textline_t *l)
+{
+  int lh;
+  int y;
+  int yoffset;
+
+  /* Only erases when NOT in automap and the screen is reduced, and the text
+   * must either need updating or refreshing (because of a recent change back
+   * from the automap)
+   */
+
+  if (!automapactive && viewwindowx && l->needsupdate)
+    {
+      lh = SHORT(l->f[0]->height) + 1;
+      for (y = l->y, yoffset = y * SCREENWIDTH; y < l->y + lh;
+           y++, yoffset += SCREENWIDTH)
+        {
+          if (y < viewwindowy || y >= viewwindowy + viewheight)
+            r_video_erase(yoffset, SCREENWIDTH); /* erase entire line */
+          else
+            {
+              r_video_erase(yoffset, viewwindowx); /* erase left border */
+              r_video_erase(yoffset + viewwindowx + viewwidth, viewwindowx);
+
+              /* erase right border */
+            }
+        }
     }
 
+  if (l->needsupdate) l->needsupdate--;
 }
 
-void HUlib_eraseSText(hu_stext_t* s)
+void hu_lib_init_stext(hu_stext_t *s, int x, int y, int h, patch_t **font,
+                     int startchar, boolean *on)
 {
+  int i;
 
-    int i;
+  s->h = h;
+  s->on = on;
+  s->laston = true;
+  s->cl = 0;
+  for (i = 0; i < h; i++)
+    hu_lib_init_text_line(&s->l[i], x, y - i * (SHORT(font[0]->height) + 1),
+                       font, startchar);
+}
 
-    for (i=0 ; i<s->h ; i++)
+void hu_lib_add_line_to_stext(hu_stext_t *s)
+{
+  int i;
+
+  /* add a clear line */
+
+  if (++s->cl == s->h) s->cl = 0;
+  hu_lib_clear_text(&s->l[s->cl]);
+
+  /* everything needs updating */
+
+  for (i = 0; i < s->h; i++)
     {
-	if (s->laston && !*s->on)
-	    s->l[i].needsupdate = 4;
-	HUlib_eraseTextLine(&s->l[i]);
+      s->l[i].needsupdate = 4;
     }
-    s->laston = *s->on;
-
 }
 
-void
-HUlib_initIText
-( hu_itext_t*	it,
-  int		x,
-  int		y,
-  patch_t**	font,
-  int		startchar,
-  boolean*	on )
+void hu_lib_add_messsage_to_stext(hu_stext_t *s, const char *prefix,
+                             const char *msg)
 {
-    it->lm = 0; // default left margin is start of text
-    it->on = on;
-    it->laston = true;
-    HUlib_initTextLine(&it->l, x, y, font, startchar);
+  hu_lib_add_line_to_stext(s);
+
+  if (prefix)
+    {
+      while (*prefix)
+        {
+          hu_lib_add_char_to_text_line(&s->l[s->cl], *(prefix++));
+        }
+    }
+
+  while (*msg)
+    {
+      hu_lib_add_char_to_text_line(&s->l[s->cl], *(msg++));
+    }
 }
 
-
-// The following deletion routines adhere to the left margin restriction
-void HUlib_delCharFromIText(hu_itext_t* it)
+void hu_lib_draw_stext(hu_stext_t *s)
 {
-    if (it->l.len != it->lm)
-	HUlib_delCharFromTextLine(&it->l);
+  int i;
+  int idx;
+  hu_textline_t *l;
+
+  if (!*s->on) return; /* if not on, don't draw */
+
+  /* draw everything */
+
+  for (i = 0; i < s->h; i++)
+    {
+      idx = s->cl - i;
+      if (idx < 0) idx += s->h; /* handle queue of lines */
+
+      l = &s->l[idx];
+
+      /* need a decision made here on whether to skip the draw */
+
+      hu_lib_draw_text_line(l, false); /* no cursor, please */
+    }
 }
 
-void HUlib_eraseLineFromIText(hu_itext_t* it)
+void hu_lib_erase_stext(hu_stext_t *s)
 {
-    while (it->lm != it->l.len)
-	HUlib_delCharFromTextLine(&it->l);
+  int i;
+
+  for (i = 0; i < s->h; i++)
+    {
+      if (s->laston && !*s->on) s->l[i].needsupdate = 4;
+      hu_lib_erase_text_line(&s->l[i]);
+    }
+
+  s->laston = *s->on;
 }
 
-// Resets left margin as well
-void HUlib_resetIText(hu_itext_t* it)
+void hu_lib_init_itext(hu_itext_t *it, int x, int y, patch_t **font,
+                     int startchar, boolean *on)
 {
-    it->lm = 0;
-    HUlib_clearTextLine(&it->l);
+  it->lm = 0; /* default left margin is start of text */
+  it->on = on;
+  it->laston = true;
+  hu_lib_init_text_line(&it->l, x, y, font, startchar);
 }
 
-void
-HUlib_addPrefixToIText
-( hu_itext_t*	it,
-  char*		str )
+/* The following deletion routines adhere to the left margin restriction */
+
+void hu_lib_del_char_from_itext(hu_itext_t *it)
 {
-    while (*str)
-	HUlib_addCharToTextLine(&it->l, *(str++));
-    it->lm = it->l.len;
+  if (it->l.len != it->lm) hu_lib_del_char_from_text_line(&it->l);
 }
 
-// wrapper function for handling general keyed input.
-// returns true if it ate the key
-boolean
-HUlib_keyInIText
-( hu_itext_t*	it,
-  unsigned char ch )
+/* Resets left margin as well */
+
+void hu_lib_reset_itext(hu_itext_t *it)
 {
-    ch = toupper(ch);
-
-    if (ch >= ' ' && ch <= '_') 
-  	HUlib_addCharToTextLine(&it->l, (char) ch);
-    else 
-	if (ch == KEY_BACKSPACE) 
-	    HUlib_delCharFromIText(it);
-	else 
-	    if (ch != KEY_ENTER) 
-		return false; // did not eat key
-
-    return true; // ate the key
-
+  it->lm = 0;
+  hu_lib_clear_text(&it->l);
 }
 
-void HUlib_drawIText(hu_itext_t* it)
+/* wrapper function for handling general keyed input.
+ * returns true if it ate the key
+ */
+
+boolean hu_lib_key_in_itext(hu_itext_t *it, unsigned char ch)
 {
+  ch = toupper(ch);
 
-    hu_textline_t *l = &it->l;
-
-    if (!*it->on)
-	return;
-    HUlib_drawTextLine(l, true); // draw the line w/ cursor
+  if (ch >= ' ' && ch <= '_')
+    {
+      hu_lib_add_char_to_text_line(&it->l, (char)ch);
+    }
+  else if (ch == KEY_BACKSPACE)
+    {
+      hu_lib_del_char_from_itext(it);
+    }
+  else if (ch != KEY_ENTER)
+    {
+      return false; /* did not eat key */
+    }
 
+  return true; /* ate the key */
 }
 
-void HUlib_eraseIText(hu_itext_t* it)
+void hu_lib_draw_itext(hu_itext_t *it)
 {
-    if (it->laston && !*it->on)
-	it->l.needsupdate = 4;
-    HUlib_eraseTextLine(&it->l);
-    it->laston = *it->on;
+  hu_textline_t *l = &it->l;
+
+  if (!*it->on) return;
+  hu_lib_draw_text_line(l, true); /* draw the line w/ cursor */
 }
 
+void hu_lib_erase_itext(hu_itext_t *it)
+{
+  if (it->laston && !*it->on) it->l.needsupdate = 4;
+  hu_lib_erase_text_line(&it->l);
+  it->laston = *it->on;
+}
diff --git a/games/NXDoom/src/doom/hu_lib.h b/games/NXDoom/src/doom/hu_lib.h
index ca5eb8d8c..e9ab12a24 100644
--- a/games/NXDoom/src/doom/hu_lib.h
+++ b/games/NXDoom/src/doom/hu_lib.h
@@ -1,182 +1,178 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/hu_lib.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION: none
+ *
+ ****************************************************************************/
 
 #ifndef __HULIB__
 #define __HULIB__
 
-// We are referring to patches.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* We are referring to patches. */
+
 #include "r_defs.h"
 
-// font stuff
-#define HU_CHARERASE	KEY_BACKSPACE
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define HU_MAXLINES		4
-#define HU_MAXLINELENGTH	80
+/* font stuff */
 
-//
-// Typedefs of widgets
-//
+#define HU_CHARERASE KEY_BACKSPACE
+
+#define HU_MAXLINES 4
+#define HU_MAXLINELENGTH 80
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Typedefs of widgets */
+
+/* Text Line widget
+ *  (parent of Scrolling Text and Input Text widgets)
+ */
 
-// Text Line widget
-//  (parent of Scrolling Text and Input Text widgets)
 typedef struct
 {
-    // left-justified position of scrolling text window
-    int		x;
-    int		y;
-    
-    patch_t**	f;			// font
-    int		sc;			// start character
-    char	l[HU_MAXLINELENGTH+1];	// line of text
-    int		len;		      	// current line length
+  /* left-justified position of scrolling text window */
 
-    // whether this line needs to be udpated
-    int		needsupdate;	      
+  int x;
+  int y;
 
+  patch_t **f;                  /* font */
+  int sc;                       /* start character */
+  char l[HU_MAXLINELENGTH + 1]; /* line of text */
+  int len;                      /* current line length */
+
+  /* whether this line needs to be updated */
+
+  int needsupdate;
 } hu_textline_t;
 
+/* Scrolling Text window widget (child of Text Line widget) */
 
-
-// Scrolling Text window widget
-//  (child of Text Line widget)
 typedef struct
 {
-    hu_textline_t	l[HU_MAXLINES];	// text lines to draw
-    int			h;		// height in lines
-    int			cl;		// current line number
+  hu_textline_t l[HU_MAXLINES]; /* text lines to draw */
+  int h;                        /* height in lines */
+  int cl;                       /* current line number */
 
-    // pointer to boolean stating whether to update window
-    boolean*		on;
-    boolean		laston;		// last value of *->on.
+  /* pointer to boolean stating whether to update window */
 
+  boolean *on;
+  boolean laston; /* last value of *->on. */
 } hu_stext_t;
 
+/* Input Text Line widget (child of Text Line widget) */
 
-
-// Input Text Line widget
-//  (child of Text Line widget)
 typedef struct
 {
-    hu_textline_t	l;		// text line to input on
+  hu_textline_t l; /* text line to input on */
 
-     // left margin past which I am not to delete characters
-    int			lm;
+  /* left margin past which I am not to delete characters */
 
-    // pointer to boolean stating whether to update window
-    boolean*		on; 
-    boolean		laston; // last value of *->on;
+  int lm;
 
+  /* pointer to boolean stating whether to update window */
+
+  boolean *on;
+  boolean laston; /* last value of *->on; */
 } hu_itext_t;
 
+/* Widget creation, access, and update routines */
 
-//
-// Widget creation, access, and update routines
-//
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// initializes heads-up widget library
-void HUlib_init(void);
+/* textline code */
 
-//
-// textline code
-//
+/* clear a line of text */
 
-// clear a line of text
-void	HUlib_clearTextLine(hu_textline_t *t);
+void hu_lib_clear_text(hu_textline_t *t);
 
-void	HUlib_initTextLine(hu_textline_t *t, int x, int y, patch_t **f, int sc);
+void hu_lib_init_text_line(hu_textline_t *t, int x, int y, patch_t **f,
+                           int sc);
 
-// returns success
-boolean HUlib_addCharToTextLine(hu_textline_t *t, char ch);
+/* returns success */
 
-// returns success
-boolean HUlib_delCharFromTextLine(hu_textline_t *t);
+boolean hu_lib_add_char_to_text_line(hu_textline_t *t, char ch);
 
-// draws tline
-void	HUlib_drawTextLine(hu_textline_t *l, boolean drawcursor);
+/* returns success */
 
-// erases text line
-void	HUlib_eraseTextLine(hu_textline_t *l); 
+boolean hu_lib_del_char_from_text_line(hu_textline_t *t);
 
+/* draws tline */
 
-//
-// Scrolling Text window widget routines
-//
+void hu_lib_draw_text_line(hu_textline_t *l, boolean drawcursor);
 
-// ?
-void
-HUlib_initSText
-( hu_stext_t*	s,
-  int		x,
-  int		y,
-  int		h,
-  patch_t**	font,
-  int		startchar,
-  boolean*	on );
+/* erases text line */
 
-// add a new line
-void HUlib_addLineToSText(hu_stext_t* s);  
+void hu_lib_erase_text_line(hu_textline_t *l);
 
-// ?
-void
-HUlib_addMessageToSText
-( hu_stext_t*	s,
-  const char*	prefix,
-  const char*	msg );
+/* Scrolling Text window widget routines */
 
-// draws stext
-void HUlib_drawSText(hu_stext_t* s);
+void hu_lib_init_stext(hu_stext_t *s, int x, int y, int h, patch_t **font,
+                       int startchar, boolean *on);
 
-// erases all stext lines
-void HUlib_eraseSText(hu_stext_t* s); 
+/* add a new line */
 
-// Input Text Line widget routines
-void
-HUlib_initIText
-( hu_itext_t*	it,
-  int		x,
-  int		y,
-  patch_t**	font,
-  int		startchar,
-  boolean*	on );
+void hu_lib_add_line_to_stext(hu_stext_t *s);
 
-// enforces left margin
-void HUlib_delCharFromIText(hu_itext_t* it);
+/* ? */
 
-// enforces left margin
-void HUlib_eraseLineFromIText(hu_itext_t* it);
+void hu_lib_add_messsage_to_stext(hu_stext_t *s, const char *prefix,
+                                  const char *msg);
 
-// resets line and left margin
-void HUlib_resetIText(hu_itext_t* it);
+/* draws stext */
 
-// left of left-margin
-void
-HUlib_addPrefixToIText
-( hu_itext_t*	it,
-  char*		str );
+void hu_lib_draw_stext(hu_stext_t *s);
 
-// whether eaten
-boolean
-HUlib_keyInIText
-( hu_itext_t*	it,
-  unsigned char ch );
+/* erases all stext lines */
 
-void HUlib_drawIText(hu_itext_t* it);
+void hu_lib_erase_stext(hu_stext_t *s);
 
-// erases all itext lines
-void HUlib_eraseIText(hu_itext_t* it); 
+/* Input Text Line widget routines */
 
-#endif
+void hu_lib_init_itext(hu_itext_t *it, int x, int y, patch_t **font,
+                       int startchar, boolean *on);
+
+/* enforces left margin */
+
+void hu_lib_del_char_from_itext(hu_itext_t *it);
+
+/* resets line and left margin */
+
+void hu_lib_reset_itext(hu_itext_t *it);
+
+/* whether eaten */
+
+boolean hu_lib_key_in_itext(hu_itext_t *it, unsigned char ch);
+
+void hu_lib_draw_itext(hu_itext_t *it);
+
+/* erases all itext lines */
+
+void hu_lib_erase_itext(hu_itext_t *it);
+
+#endif /* __HULIB__ */
diff --git a/games/NXDoom/src/doom/hu_stuff.c b/games/NXDoom/src/doom/hu_stuff.c
index bb2002964..9dfd61abc 100644
--- a/games/NXDoom/src/doom/hu_stuff.c
+++ b/games/NXDoom/src/doom/hu_stuff.c
@@ -1,20 +1,28 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  Heads-up displays
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/hu_stuff.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  Heads-up displays
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -29,679 +37,605 @@
 #include "i_swap.h"
 #include "i_video.h"
 
-#include "hu_stuff.h"
 #include "hu_lib.h"
+#include "hu_stuff.h"
 #include "m_controls.h"
-#include "m_misc.h"
 #include "m_menu.h"
+#include "m_misc.h"
 #include "w_wad.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "doomstat.h"
 
-// Data.
+/* Data. */
+
 #include "dstrings.h"
-#include "sounds.h"
 
-//
-// Locally used constants, shortcuts.
-//
-#define HU_TITLE	(mapnames[(gameepisode-1)*9+gamemap-1])
-#define HU_TITLE2	(mapnames_commercial[gamemap-1])
-#define HU_TITLEP	(mapnames_commercial[gamemap-1 + 32])
-#define HU_TITLET	(mapnames_commercial[gamemap-1 + 64])
-#define HU_TITLE_CHEX   (mapnames_chex[(gameepisode-1)*9+gamemap-1])
-#define HU_TITLEHEIGHT	1
-#define HU_TITLEX	0
-#define HU_TITLEY	(167 - SHORT(hu_font[0]->height))
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define HU_INPUTTOGGLE	't'
-#define HU_INPUTX	HU_MSGX
-#define HU_INPUTY	(HU_MSGY + HU_MSGHEIGHT*(SHORT(hu_font[0]->height) +1))
-#define HU_INPUTWIDTH	64
-#define HU_INPUTHEIGHT	1
+/* Locally used constants, shortcuts. */
 
+#define HU_TITLE (mapnames[(gameepisode - 1) * 9 + gamemap - 1])
+#define HU_TITLE2 (mapnames_commercial[gamemap - 1])
+#define HU_TITLEP (mapnames_commercial[gamemap - 1 + 32])
+#define HU_TITLET (mapnames_commercial[gamemap - 1 + 64])
+#define HU_TITLE_CHEX (mapnames_chex[(gameepisode - 1) * 9 + gamemap - 1])
+#define HU_TITLEHEIGHT 1
+#define HU_TITLEX 0
+#define HU_TITLEY (167 - SHORT(hu_font[0]->height))
 
+#define HU_INPUTTOGGLE 't'
+#define HU_INPUTX HU_MSGX
+#define HU_INPUTY (HU_MSGY + HU_MSGHEIGHT * (SHORT(hu_font[0]->height) + 1))
+#define HU_INPUTWIDTH 64
+#define HU_INPUTHEIGHT 1
+
+#define QUEUESIZE 128
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static player_t *plr;
+static hu_textline_t w_title;
+static hu_itext_t w_chat;
+static boolean always_off = false;
+static char chat_dest[MAXPLAYERS];
+static hu_itext_t w_inputbuffer[MAXPLAYERS];
+
+static boolean message_on;
+static boolean message_nottobefuckedwith;
+
+static hu_stext_t w_message;
+static int message_counter;
+
+static boolean headsupactive = false;
+
+static char chatchars[QUEUESIZE];
+static int head = 0;
+static int tail = 0;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 char *chat_macros[10];
 
 const char *player_names[] =
 {
-    HUSTR_PLRGREEN,
-    HUSTR_PLRINDIGO,
-    HUSTR_PLRBROWN,
-    HUSTR_PLRRED
+  HUSTR_PLRGREEN,
+  HUSTR_PLRINDIGO,
+  HUSTR_PLRBROWN,
+  HUSTR_PLRRED,
 };
 
-char			chat_char; // remove later.
-static player_t*	plr;
-patch_t*		hu_font[HU_FONTSIZE];
-static hu_textline_t	w_title;
-boolean			chat_on;
-static hu_itext_t	w_chat;
-static boolean		always_off = false;
-static char		chat_dest[MAXPLAYERS];
-static hu_itext_t w_inputbuffer[MAXPLAYERS];
+char chat_char; /* remove later. */
 
-static boolean		message_on;
-boolean			message_dontfuckwithme;
-static boolean		message_nottobefuckedwith;
+patch_t *hu_font[HU_FONTSIZE];
+boolean chat_on;
+boolean message_dontfuckwithme;
 
-static hu_stext_t	w_message;
-static int		message_counter;
+/* Builtin map names.
+ * The actual names can be found in DStrings.h.
+ */
 
+/* DOOM shareware/registered/retail (Ultimate) names. */
 
-static boolean		headsupactive = false;
-
-//
-// Builtin map names.
-// The actual names can be found in DStrings.h.
-//
-
-const char *mapnames[] =	// DOOM shareware/registered/retail (Ultimate) names.
+const char *mapnames[] =
 {
-
-    HUSTR_E1M1,
-    HUSTR_E1M2,
-    HUSTR_E1M3,
-    HUSTR_E1M4,
-    HUSTR_E1M5,
-    HUSTR_E1M6,
-    HUSTR_E1M7,
-    HUSTR_E1M8,
-    HUSTR_E1M9,
-
-    HUSTR_E2M1,
-    HUSTR_E2M2,
-    HUSTR_E2M3,
-    HUSTR_E2M4,
-    HUSTR_E2M5,
-    HUSTR_E2M6,
-    HUSTR_E2M7,
-    HUSTR_E2M8,
-    HUSTR_E2M9,
-
-    HUSTR_E3M1,
-    HUSTR_E3M2,
-    HUSTR_E3M3,
-    HUSTR_E3M4,
-    HUSTR_E3M5,
-    HUSTR_E3M6,
-    HUSTR_E3M7,
-    HUSTR_E3M8,
-    HUSTR_E3M9,
-
-    HUSTR_E4M1,
-    HUSTR_E4M2,
-    HUSTR_E4M3,
-    HUSTR_E4M4,
-    HUSTR_E4M5,
-    HUSTR_E4M6,
-    HUSTR_E4M7,
-    HUSTR_E4M8,
-    HUSTR_E4M9,
-
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL"
+  HUSTR_E1M1, HUSTR_E1M2, HUSTR_E1M3, HUSTR_E1M4, HUSTR_E1M5, HUSTR_E1M6,
+  HUSTR_E1M7, HUSTR_E1M8, HUSTR_E1M9, HUSTR_E2M1, HUSTR_E2M2, HUSTR_E2M3,
+  HUSTR_E2M4, HUSTR_E2M5, HUSTR_E2M6, HUSTR_E2M7, HUSTR_E2M8, HUSTR_E2M9,
+  HUSTR_E3M1, HUSTR_E3M2, HUSTR_E3M3, HUSTR_E3M4, HUSTR_E3M5, HUSTR_E3M6,
+  HUSTR_E3M7, HUSTR_E3M8, HUSTR_E3M9, HUSTR_E4M1, HUSTR_E4M2, HUSTR_E4M3,
+  HUSTR_E4M4, HUSTR_E4M5, HUSTR_E4M6, HUSTR_E4M7, HUSTR_E4M8, HUSTR_E4M9,
+  "NEWLEVEL", "NEWLEVEL", "NEWLEVEL", "NEWLEVEL", "NEWLEVEL", "NEWLEVEL",
+  "NEWLEVEL", "NEWLEVEL", "NEWLEVEL",
 };
 
-const char *mapnames_chex[] =   // Chex Quest names.
+/* Chex Quest names. */
+
+const char *mapnames_chex[] =
 {
-
-    HUSTR_E1M1,
-    HUSTR_E1M2,
-    HUSTR_E1M3,
-    HUSTR_E1M4,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-    HUSTR_E1M5,
-
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL"
+  HUSTR_E1M1, HUSTR_E1M2, HUSTR_E1M3, HUSTR_E1M4, HUSTR_E1M5,
+  HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5,
+  HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5,
+  HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5,
+  HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5,
+  HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5,
+  HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5, HUSTR_E1M5,
+  HUSTR_E1M5, "NEWLEVEL", "NEWLEVEL", "NEWLEVEL", "NEWLEVEL",
+  "NEWLEVEL", "NEWLEVEL", "NEWLEVEL", "NEWLEVEL", "NEWLEVEL",
 };
 
-// List of names for levels in commercial IWADs
-// (doom2.wad, plutonia.wad, tnt.wad).  These are stored in a
-// single large array; WADs like pl2.wad have a MAP33, and rely on
-// the layout in the Vanilla executable, where it is possible to
-// overflow the end of one array into the next.
+/* List of names for levels in commercial IWADs
+ * (doom2.wad, plutonia.wad, tnt.wad).  These are stored in a
+ * single large array; WADs like pl2.wad have a MAP33, and rely on
+ * the layout in the Vanilla executable, where it is possible to
+ * overflow the end of one array into the next.
+ */
 
 const char *mapnames_commercial[] =
 {
-    // DOOM 2 map names.
+  HUSTR_1, /* DOOM 2 map names. */
+  HUSTR_2,
+  HUSTR_3,
+  HUSTR_4,
+  HUSTR_5,
+  HUSTR_6,
+  HUSTR_7,
+  HUSTR_8,
+  HUSTR_9,
+  HUSTR_10,
+  HUSTR_11,
+  HUSTR_12,
+  HUSTR_13,
+  HUSTR_14,
+  HUSTR_15,
+  HUSTR_16,
+  HUSTR_17,
+  HUSTR_18,
+  HUSTR_19,
+  HUSTR_20,
+  HUSTR_21,
+  HUSTR_22,
+  HUSTR_23,
+  HUSTR_24,
+  HUSTR_25,
+  HUSTR_26,
+  HUSTR_27,
+  HUSTR_28,
+  HUSTR_29,
+  HUSTR_30,
+  HUSTR_31,
+  HUSTR_32,
+  PHUSTR_1, /* Plutonia WAD map names. */
+  PHUSTR_2,
+  PHUSTR_3,
+  PHUSTR_4,
+  PHUSTR_5,
+  PHUSTR_6,
+  PHUSTR_7,
+  PHUSTR_8,
+  PHUSTR_9,
+  PHUSTR_10,
+  PHUSTR_11,
+  PHUSTR_12,
+  PHUSTR_13,
+  PHUSTR_14,
+  PHUSTR_15,
+  PHUSTR_16,
+  PHUSTR_17,
+  PHUSTR_18,
+  PHUSTR_19,
+  PHUSTR_20,
+  PHUSTR_21,
+  PHUSTR_22,
+  PHUSTR_23,
+  PHUSTR_24,
+  PHUSTR_25,
+  PHUSTR_26,
+  PHUSTR_27,
+  PHUSTR_28,
+  PHUSTR_29,
+  PHUSTR_30,
+  PHUSTR_31,
+  PHUSTR_32,
+  THUSTR_1, /* TNT WAD map names. */
+  THUSTR_2,
+  THUSTR_3,
+  THUSTR_4,
+  THUSTR_5,
+  THUSTR_6,
+  THUSTR_7,
+  THUSTR_8,
+  THUSTR_9,
+  THUSTR_10,
+  THUSTR_11,
+  THUSTR_12,
+  THUSTR_13,
+  THUSTR_14,
+  THUSTR_15,
+  THUSTR_16,
+  THUSTR_17,
+  THUSTR_18,
+  THUSTR_19,
+  THUSTR_20,
+  THUSTR_21,
+  THUSTR_22,
+  THUSTR_23,
+  THUSTR_24,
+  THUSTR_25,
+  THUSTR_26,
+  THUSTR_27,
+  THUSTR_28,
+  THUSTR_29,
+  THUSTR_30,
+  THUSTR_31,
+  THUSTR_32,
 
-    HUSTR_1,
-    HUSTR_2,
-    HUSTR_3,
-    HUSTR_4,
-    HUSTR_5,
-    HUSTR_6,
-    HUSTR_7,
-    HUSTR_8,
-    HUSTR_9,
-    HUSTR_10,
-    HUSTR_11,
-	
-    HUSTR_12,
-    HUSTR_13,
-    HUSTR_14,
-    HUSTR_15,
-    HUSTR_16,
-    HUSTR_17,
-    HUSTR_18,
-    HUSTR_19,
-    HUSTR_20,
-	
-    HUSTR_21,
-    HUSTR_22,
-    HUSTR_23,
-    HUSTR_24,
-    HUSTR_25,
-    HUSTR_26,
-    HUSTR_27,
-    HUSTR_28,
-    HUSTR_29,
-    HUSTR_30,
-    HUSTR_31,
-    HUSTR_32,
+  /* Emulation: TNT maps 33-35 can be warped to and played if they exist
+   * so include blank names instead of spilling over
+   */
 
-    // Plutonia WAD map names.
-
-    PHUSTR_1,
-    PHUSTR_2,
-    PHUSTR_3,
-    PHUSTR_4,
-    PHUSTR_5,
-    PHUSTR_6,
-    PHUSTR_7,
-    PHUSTR_8,
-    PHUSTR_9,
-    PHUSTR_10,
-    PHUSTR_11,
-	
-    PHUSTR_12,
-    PHUSTR_13,
-    PHUSTR_14,
-    PHUSTR_15,
-    PHUSTR_16,
-    PHUSTR_17,
-    PHUSTR_18,
-    PHUSTR_19,
-    PHUSTR_20,
-	
-    PHUSTR_21,
-    PHUSTR_22,
-    PHUSTR_23,
-    PHUSTR_24,
-    PHUSTR_25,
-    PHUSTR_26,
-    PHUSTR_27,
-    PHUSTR_28,
-    PHUSTR_29,
-    PHUSTR_30,
-    PHUSTR_31,
-    PHUSTR_32,
-    
-    // TNT WAD map names.
-
-    THUSTR_1,
-    THUSTR_2,
-    THUSTR_3,
-    THUSTR_4,
-    THUSTR_5,
-    THUSTR_6,
-    THUSTR_7,
-    THUSTR_8,
-    THUSTR_9,
-    THUSTR_10,
-    THUSTR_11,
-	
-    THUSTR_12,
-    THUSTR_13,
-    THUSTR_14,
-    THUSTR_15,
-    THUSTR_16,
-    THUSTR_17,
-    THUSTR_18,
-    THUSTR_19,
-    THUSTR_20,
-	
-    THUSTR_21,
-    THUSTR_22,
-    THUSTR_23,
-    THUSTR_24,
-    THUSTR_25,
-    THUSTR_26,
-    THUSTR_27,
-    THUSTR_28,
-    THUSTR_29,
-    THUSTR_30,
-    THUSTR_31,
-    THUSTR_32,
-
-    // Emulation: TNT maps 33-35 can be warped to and played if they exist
-    // so include blank names instead of spilling over
-    "",
-    "",
-    ""
+  "",
+  "",
+  "",
 };
 
-void HU_Init(void)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void hu_stop(void)
 {
-
-    int		i;
-    int		j;
-    char	buffer[9];
-
-    // load the heads-up font
-    j = HU_FONTSTART;
-    for (i=0;i<HU_FONTSIZE;i++)
-    {
-	DEH_snprintf(buffer, 9, "STCFN%.3d", j++);
-	hu_font[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
-    }
-
+  headsupactive = false;
 }
 
-void HU_Stop(void)
+static void hu_queue_chat_char(char c)
 {
-    headsupactive = false;
-}
-
-void HU_Start(void)
-{
-
-    int		i;
-    const char *s;
-
-    if (headsupactive)
-	HU_Stop();
-
-    plr = &players[consoleplayer];
-    message_on = false;
-    message_dontfuckwithme = false;
-    message_nottobefuckedwith = false;
-    chat_on = false;
-
-    // create the message widget
-    HUlib_initSText(&w_message,
-		    HU_MSGX, HU_MSGY, HU_MSGHEIGHT,
-		    hu_font,
-		    HU_FONTSTART, &message_on);
-
-    // create the map title widget
-    HUlib_initTextLine(&w_title,
-		       HU_TITLEX, HU_TITLEY,
-		       hu_font,
-		       HU_FONTSTART);
-    
-    switch ( logical_gamemission )
+  if (((head + 1) & (QUEUESIZE - 1)) == tail)
     {
-      case doom:
-	s = HU_TITLE;
-	break;
-      case doom2:
-	 s = HU_TITLE2;
-         // Pre-Final Doom compatibility: map33-map35 names don't spill over
-         if (gameversion <= exe_doom_1_9 && gamemap >= 33)
-         {
-             s = "";
-         }
-	 break;
-      case pack_plut:
-	s = HU_TITLEP;
-	break;
-      case pack_tnt:
-	s = HU_TITLET;
-	break;
-      default:
-         s = "Unknown level";
-         break;
+      plr->message = (HUSTR_MSGU);
     }
-
-    if (logical_gamemission == doom && gameversion == exe_chex)
+  else
     {
-        s = HU_TITLE_CHEX;
-    }
-
-    // dehacked substitution to get modified level name
-
-    s = DEH_String(s);
-    
-    while (*s)
-	HUlib_addCharToTextLine(&w_title, *(s++));
-
-    // create the chat widget
-    HUlib_initIText(&w_chat,
-		    HU_INPUTX, HU_INPUTY,
-		    hu_font,
-		    HU_FONTSTART, &chat_on);
-
-    // create the inputbuffer widgets
-    for (i=0 ; i<MAXPLAYERS ; i++)
-	HUlib_initIText(&w_inputbuffer[i], 0, 0, 0, 0, &always_off);
-
-    headsupactive = true;
-
-}
-
-void HU_Drawer(void)
-{
-
-    HUlib_drawSText(&w_message);
-    HUlib_drawIText(&w_chat);
-    if (automapactive)
-	HUlib_drawTextLine(&w_title, false);
-
-}
-
-void HU_Erase(void)
-{
-
-    HUlib_eraseSText(&w_message);
-    HUlib_eraseIText(&w_chat);
-    HUlib_eraseTextLine(&w_title);
-
-}
-
-void HU_Ticker(void)
-{
-
-    int i, rc;
-    char c;
-
-    // tick down message counter if message is up
-    if (message_counter && !--message_counter)
-    {
-	message_on = false;
-	message_nottobefuckedwith = false;
-    }
-
-    if (showMessages || message_dontfuckwithme)
-    {
-
-	// display message if necessary
-	if ((plr->message && !message_nottobefuckedwith)
-	    || (plr->message && message_dontfuckwithme))
-	{
-	    HUlib_addMessageToSText(&w_message, 0, plr->message);
-	    plr->message = 0;
-	    message_on = true;
-	    message_counter = HU_MSGTIMEOUT;
-	    message_nottobefuckedwith = message_dontfuckwithme;
-	    message_dontfuckwithme = 0;
-	}
-
-    } // else message_on = false;
-
-    // check for incoming chat characters
-    if (netgame)
-    {
-	for (i=0 ; i<MAXPLAYERS; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-	    if (i != consoleplayer
-		&& (c = players[i].cmd.chatchar))
-	    {
-		if (c <= HU_BROADCAST)
-		    chat_dest[i] = c;
-		else
-		{
-		    rc = HUlib_keyInIText(&w_inputbuffer[i], c);
-		    if (rc && c == KEY_ENTER)
-		    {
-			if (w_inputbuffer[i].l.len
-			    && (chat_dest[i] == consoleplayer+1
-				|| chat_dest[i] == HU_BROADCAST))
-			{
-			    HUlib_addMessageToSText(&w_message,
-						    DEH_String(player_names[i]),
-						    w_inputbuffer[i].l.l);
-			    
-			    message_nottobefuckedwith = true;
-			    message_on = true;
-			    message_counter = HU_MSGTIMEOUT;
-			    if ( gamemode == commercial )
-			      S_StartSound(0, sfx_radio);
-			    else if (gameversion > exe_doom_1_2)
-			      S_StartSound(0, sfx_tink);
-			}
-			HUlib_resetIText(&w_inputbuffer[i]);
-		    }
-		}
-		players[i].cmd.chatchar = 0;
-	    }
-	}
-    }
-
-}
-
-#define QUEUESIZE		128
-
-static char	chatchars[QUEUESIZE];
-static int	head = 0;
-static int	tail = 0;
-
-
-void HU_queueChatChar(char c)
-{
-    if (((head + 1) & (QUEUESIZE-1)) == tail)
-    {
-	plr->message = DEH_String(HUSTR_MSGU);
-    }
-    else
-    {
-	chatchars[head] = c;
-	head = (head + 1) & (QUEUESIZE-1);
+      chatchars[head] = c;
+      head = (head + 1) & (QUEUESIZE - 1);
     }
 }
 
-char HU_dequeueChatChar(void)
+static void start_chat_input(int dest)
 {
-    char c;
+  chat_on = true;
+  hu_lib_reset_itext(&w_chat);
+  hu_queue_chat_char(HU_BROADCAST);
 
-    if (head != tail)
-    {
-	c = chatchars[tail];
-	tail = (tail + 1) & (QUEUESIZE-1);
-    }
-    else
-    {
-	c = 0;
-    }
-
-    return c;
+  i_start_text_input(0, 8, SCREENWIDTH, 16);
 }
 
-static void StartChatInput(int dest)
+static void stop_chat_input(void)
 {
-    chat_on = true;
-    HUlib_resetIText(&w_chat);
-    HU_queueChatChar(HU_BROADCAST);
-
-    I_StartTextInput(0, 8, SCREENWIDTH, 16);
+  chat_on = false;
+  i_stop_text_input();
 }
 
-static void StopChatInput(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void hu_init(void)
 {
-    chat_on = false;
-    I_StopTextInput();
+  uint8_t i;
+  uint8_t j;
+  char buffer[9];
+
+  /* load the heads-up font */
+
+  j = HU_FONTSTART;
+  for (i = 0; i < HU_FONTSIZE; i++)
+    {
+      snprintf(buffer, 9, "STCFN%.3u", j++);
+      hu_font[i] = (patch_t *)w_cache_lump_name(buffer, PU_STATIC);
+    }
 }
 
-boolean HU_Responder(event_t *ev)
+void hu_start(void)
 {
+  int i;
+  const char *s;
 
-    static char		lastmessage[HU_MAXLINELENGTH+1];
-    const char		*macromessage;
-    boolean		eatkey = false;
-    static boolean	altdown = false;
-    unsigned char 	c;
-    int			i;
-    int			numplayers;
-    
-    static int		num_nobrainers = 0;
+  if (headsupactive) hu_stop();
 
-    numplayers = 0;
-    for (i=0 ; i<MAXPLAYERS ; i++)
-	numplayers += playeringame[i];
+  plr = &players[consoleplayer];
+  message_on = false;
+  message_dontfuckwithme = false;
+  message_nottobefuckedwith = false;
+  chat_on = false;
 
-    if (ev->data1 == KEY_RSHIFT)
+  /* create the message widget */
+
+  hu_lib_init_stext(&w_message, HU_MSGX, HU_MSGY, HU_MSGHEIGHT, hu_font,
+                  HU_FONTSTART, &message_on);
+
+  /* create the map title widget */
+
+  hu_lib_init_text_line(&w_title, HU_TITLEX, HU_TITLEY, hu_font,
+                        HU_FONTSTART);
+
+  switch (logical_gamemission)
     {
-	return false;
-    }
-    else if (ev->data1 == KEY_RALT || ev->data1 == KEY_LALT)
-    {
-	altdown = ev->type == ev_keydown;
-	return false;
+    case doom:
+      s = HU_TITLE;
+      break;
+    case doom2:
+      s = HU_TITLE2;
+
+      /* Pre-Final Doom compatibility: map33-map35 names don't spill over */
+
+      if (gameversion <= exe_doom_1_9 && gamemap >= 33)
+        {
+          s = "";
+        }
+
+      break;
+    case pack_plut:
+      s = HU_TITLEP;
+      break;
+    case pack_tnt:
+      s = HU_TITLET;
+      break;
+    default:
+      s = "Unknown level";
+      break;
     }
 
-    if (ev->type != ev_keydown)
-	return false;
-
-    if (!chat_on)
+  if (logical_gamemission == doom && gameversion == exe_chex)
     {
-	if (ev->data1 == key_message_refresh)
-	{
-	    message_on = true;
-	    message_counter = HU_MSGTIMEOUT;
-	    eatkey = true;
-	}
-	else if (netgame && ev->data2 == key_multi_msg)
-	{
-	    eatkey = true;
-            StartChatInput(HU_BROADCAST);
-	}
-	else if (netgame && numplayers > 2)
-	{
-	    for (i=0; i<MAXPLAYERS ; i++)
-	    {
-		if (ev->data2 == key_multi_msgplayer[i])
-		{
-		    if (playeringame[i] && i!=consoleplayer)
-		    {
-			eatkey = true;
-                        StartChatInput(i + 1);
-			break;
-		    }
-		    else if (i == consoleplayer)
-		    {
-			num_nobrainers++;
-			if (num_nobrainers < 3)
-			    plr->message = DEH_String(HUSTR_TALKTOSELF1);
-			else if (num_nobrainers < 6)
-			    plr->message = DEH_String(HUSTR_TALKTOSELF2);
-			else if (num_nobrainers < 9)
-			    plr->message = DEH_String(HUSTR_TALKTOSELF3);
-			else if (num_nobrainers < 32)
-			    plr->message = DEH_String(HUSTR_TALKTOSELF4);
-			else
-			    plr->message = DEH_String(HUSTR_TALKTOSELF5);
-		    }
-		}
-	    }
-	}
+      s = HU_TITLE_CHEX;
     }
-    else
+
+  /* dehacked substitution to get modified level name */
+
+  s = (s);
+  while (*s)
     {
-	// send a macro
-	if (altdown)
-	{
-	    c = ev->data1 - '0';
-	    if (c > 9)
-		return false;
-	    // fprintf(stderr, "got here\n");
-	    macromessage = chat_macros[c];
+      hu_lib_add_char_to_text_line(&w_title, *(s++));
+    }
 
-	    // kill last message with a '\n'
-	    HU_queueChatChar(KEY_ENTER); // DEBUG!!!
+  /* create the chat widget */
 
-	    // send the macro message
-	    while (*macromessage)
-		HU_queueChatChar(*macromessage++);
-	    HU_queueChatChar(KEY_ENTER);
+  hu_lib_init_itext(&w_chat, HU_INPUTX, HU_INPUTY, hu_font, HU_FONTSTART,
+                  &chat_on);
 
-            // leave chat mode and notify that it was sent
-            StopChatInput();
-            M_StringCopy(lastmessage, chat_macros[c], sizeof(lastmessage));
-            plr->message = lastmessage;
-            eatkey = true;
-	}
-	else
-	{
-            c = ev->data3;
+  /* create the inputbuffer widgets */
 
-	    eatkey = HUlib_keyInIText(&w_chat, c);
-	    if (eatkey)
-	    {
-		// static unsigned char buf[20]; // DEBUG
-		HU_queueChatChar(c);
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      hu_lib_init_itext(&w_inputbuffer[i], 0, 0, 0, 0, &always_off);
+    }
 
-		// M_snprintf(buf, sizeof(buf), "KEY: %d => %d", ev->data1, c);
-		//        plr->message = buf;
-	    }
-	    if (c == KEY_ENTER)
-	    {
-		StopChatInput();
-                if (w_chat.l.len)
+  headsupactive = true;
+}
+
+void hu_drawer(void)
+{
+  hu_lib_draw_stext(&w_message);
+  hu_lib_draw_itext(&w_chat);
+  if (automapactive) hu_lib_draw_text_line(&w_title, false);
+}
+
+void hu_erase(void)
+{
+  hu_lib_erase_stext(&w_message);
+  hu_lib_erase_itext(&w_chat);
+  hu_lib_erase_text_line(&w_title);
+}
+
+void hu_ticker(void)
+{
+  int i;
+  int rc;
+  char c;
+
+  /* tick down message counter if message is up */
+
+  if (message_counter && !--message_counter)
+    {
+      message_on = false;
+      message_nottobefuckedwith = false;
+    }
+
+  if (g_show_messages || message_dontfuckwithme)
+    {
+      /* display message if necessary */
+
+      if ((plr->message && !message_nottobefuckedwith) ||
+          (plr->message && message_dontfuckwithme))
+        {
+          hu_lib_add_messsage_to_stext(&w_message, 0, plr->message);
+          plr->message = 0;
+          message_on = true;
+          message_counter = HU_MSGTIMEOUT;
+          message_nottobefuckedwith = message_dontfuckwithme;
+          message_dontfuckwithme = 0;
+        }
+    }
+
+  /* check for incoming chat characters */
+
+  if (netgame)
+    {
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (!playeringame[i]) continue;
+          if (i != consoleplayer && (c = players[i].cmd.chatchar))
+            {
+              if (c <= HU_BROADCAST)
+                chat_dest[i] = c;
+              else
                 {
-                    M_StringCopy(lastmessage, w_chat.l.l, sizeof(lastmessage));
-                    plr->message = lastmessage;
+                  rc = hu_lib_key_in_itext(&w_inputbuffer[i], c);
+                  if (rc && c == KEY_ENTER)
+                    {
+                      if (w_inputbuffer[i].l.len &&
+                          (chat_dest[i] == consoleplayer + 1 ||
+                           chat_dest[i] == HU_BROADCAST))
+                        {
+                          hu_lib_add_messsage_to_stext(&w_message,
+                                                  (player_names[i]),
+                                                  w_inputbuffer[i].l.l);
+
+                          message_nottobefuckedwith = true;
+                          message_on = true;
+                          message_counter = HU_MSGTIMEOUT;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                          if (gamemode == commercial)
+                            s_start_sound(0, SFX_RADIO);
+                          else if (gameversion > exe_doom_1_2)
+                            s_start_sound(0, SFX_TINK);
+#endif
+                        }
+
+                      hu_lib_reset_itext(&w_inputbuffer[i]);
+                    }
                 }
-	    }
-	    else if (c == KEY_ESCAPE)
-	    {
-                StopChatInput();
+
+              players[i].cmd.chatchar = 0;
             }
-	}
+        }
+    }
+}
+
+char hu_dequeue_chat_char(void)
+{
+  char c;
+
+  if (head != tail)
+    {
+      c = chatchars[tail];
+      tail = (tail + 1) & (QUEUESIZE - 1);
+    }
+  else
+    {
+      c = 0;
     }
 
-    return eatkey;
+  return c;
+}
+
+boolean hu_responder(event_t *ev)
+{
+  static char lastmessage[HU_MAXLINELENGTH + 1];
+  const char *macromessage;
+  boolean eatkey = false;
+  static boolean altdown = false;
+  unsigned char c;
+  int i;
+  int numplayers;
+
+  static int num_nobrainers = 0;
+
+  numplayers = 0;
+  for (i = 0; i < MAXPLAYERS; i++)
+    numplayers += playeringame[i];
+
+  if (ev->data1 == KEY_RSHIFT)
+    {
+      return false;
+    }
+  else if (ev->data1 == KEY_RALT || ev->data1 == KEY_LALT)
+    {
+      altdown = ev->type == ev_keydown;
+      return false;
+    }
+
+  if (ev->type != ev_keydown) return false;
+
+  if (!chat_on)
+    {
+      if (ev->data1 == key_message_refresh)
+        {
+          message_on = true;
+          message_counter = HU_MSGTIMEOUT;
+          eatkey = true;
+        }
+      else if (netgame && ev->data2 == key_multi_msg)
+        {
+          eatkey = true;
+          start_chat_input(HU_BROADCAST);
+        }
+      else if (netgame && numplayers > 2)
+        {
+          for (i = 0; i < MAXPLAYERS; i++)
+            {
+              if (ev->data2 == key_multi_msgplayer[i])
+                {
+                  if (playeringame[i] && i != consoleplayer)
+                    {
+                      eatkey = true;
+                      start_chat_input(i + 1);
+                      break;
+                    }
+                  else if (i == consoleplayer)
+                    {
+                      num_nobrainers++;
+                      if (num_nobrainers < 3)
+                        plr->message = (HUSTR_TALKTOSELF1);
+                      else if (num_nobrainers < 6)
+                        plr->message = (HUSTR_TALKTOSELF2);
+                      else if (num_nobrainers < 9)
+                        plr->message = (HUSTR_TALKTOSELF3);
+                      else if (num_nobrainers < 32)
+                        plr->message = (HUSTR_TALKTOSELF4);
+                      else
+                        plr->message = (HUSTR_TALKTOSELF5);
+                    }
+                }
+            }
+        }
+    }
+  else
+    {
+      /* send a macro */
+
+      if (altdown)
+        {
+          c = ev->data1 - '0';
+          if (c > 9) return false;
+          macromessage = chat_macros[c];
+
+          /* kill last message with a '\n' */
+
+          hu_queue_chat_char(KEY_ENTER); /* DEBUG!!! */
+
+          /* send the macro message */
+
+          while (*macromessage)
+            {
+              hu_queue_chat_char(*macromessage++);
+            }
+
+          hu_queue_chat_char(KEY_ENTER);
+
+          /* leave chat mode and notify that it was sent */
+
+          stop_chat_input();
+          m_str_copy(lastmessage, chat_macros[c], sizeof(lastmessage));
+          plr->message = lastmessage;
+          eatkey = true;
+        }
+      else
+        {
+          c = ev->data3;
+
+          eatkey = hu_lib_key_in_itext(&w_chat, c);
+          if (eatkey)
+            {
+              hu_queue_chat_char(c);
+            }
+
+          if (c == KEY_ENTER)
+            {
+              stop_chat_input();
+              if (w_chat.l.len)
+                {
+                  m_str_copy(lastmessage, w_chat.l.l, sizeof(lastmessage));
+                  plr->message = lastmessage;
+                }
+            }
+          else if (c == KEY_ESCAPE)
+            {
+              stop_chat_input();
+            }
+        }
+    }
+
+  return eatkey;
 }
diff --git a/games/NXDoom/src/doom/hu_stuff.h b/games/NXDoom/src/doom/hu_stuff.h
index c5757af67..646a916c2 100644
--- a/games/NXDoom/src/doom/hu_stuff.h
+++ b/games/NXDoom/src/doom/hu_stuff.h
@@ -1,58 +1,60 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  Head up display
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/hu_stuff.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION: Head up display
+ *
+ ****************************************************************************/
 
 #ifndef __HU_STUFF_H__
 #define __HU_STUFF_H__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_event.h"
 #include "v_patch.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-//
-// Globally visible constants.
-//
-#define HU_FONTSTART	'!'	// the first font characters
-#define HU_FONTEND	'_'	// the last font characters
+/* Globally visible constants. */
 
-// Calculate # of glyphs in font.
-#define HU_FONTSIZE	(HU_FONTEND - HU_FONTSTART + 1)	
+#define HU_FONTSTART '!' /* the first font characters */
+#define HU_FONTEND '_'   /* the last font characters */
 
-#define HU_BROADCAST	5
+/* Calculate # of glyphs in font. */
 
-#define HU_MSGX		0
-#define HU_MSGY		0
-#define HU_MSGWIDTH	64	// in characters
-#define HU_MSGHEIGHT	1	// in lines
+#define HU_FONTSIZE (HU_FONTEND - HU_FONTSTART + 1)
 
-#define HU_MSGTIMEOUT	(4*TICRATE)
+#define HU_BROADCAST 5
 
-//
-// HEADS UP TEXT
-//
+#define HU_MSGX 0
+#define HU_MSGY 0
+#define HU_MSGWIDTH 64 /* in characters */
+#define HU_MSGHEIGHT 1 /* in lines */
 
-void HU_Init(void);
-void HU_Start(void);
+#define HU_MSGTIMEOUT (4 * TICRATE)
 
-boolean HU_Responder(event_t* ev);
-
-void HU_Ticker(void);
-void HU_Drawer(void);
-char HU_dequeueChatChar(void);
-void HU_Erase(void);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern const char *player_names[4];
 extern char *chat_macros[10];
@@ -63,6 +65,20 @@ extern boolean message_dontfuckwithme;
 
 extern boolean chat_on;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* HEADS UP TEXT */
 
+void hu_init(void);
+void hu_start(void);
+
+boolean hu_responder(event_t *ev);
+
+void hu_ticker(void);
+void hu_drawer(void);
+char hu_dequeue_chat_char(void);
+void hu_erase(void);
+
+#endif /* __HU_STUFF_H__ */
diff --git a/games/NXDoom/src/doom/info.c b/games/NXDoom/src/doom/info.c
index 11ea1abf7..24cc86937 100644
--- a/games/NXDoom/src/doom/info.c
+++ b/games/NXDoom/src/doom/info.c
@@ -1,4662 +1,5356 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Thing frame/state LUT,
-//	generated by multigen utilitiy.
-//	This one is the original DOOM version, preserved.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/info.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Thing frame/state LUT, generated by multigen utility.
+ *  This one is the original DOOM version, preserved.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
-// Data.
-#include "sounds.h"
 #include "m_fixed.h"
+#include "sounds.h"
 
 #include "info.h"
 
 #include "p_mobj.h"
 
-const char *sprnames[] = {
-    "TROO","SHTG","PUNG","PISG","PISF","SHTF","SHT2","CHGG","CHGF","MISG",
-    "MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2",
-    "PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY","POSS",
-    "SPOS","VILE","FIRE","FATB","FBXP","SKEL","MANF","FATT","CPOS","SARG",
-    "HEAD","BAL7","BOSS","BOS2","SKUL","SPID","BSPI","APLS","APBX","CYBR",
-    "PAIN","SSWV","KEEN","BBRN","BOSF","ARM1","ARM2","BAR1","BEXP","FCAN",
-    "BON1","BON2","BKEY","RKEY","YKEY","BSKU","RSKU","YSKU","STIM","MEDI",
-    "SOUL","PINV","PSTR","PINS","MEGA","SUIT","PMAP","PVIS","CLIP","AMMO",
-    "ROCK","BROK","CELL","CELP","SHEL","SBOX","BPAK","BFUG","MGUN","CSAW",
-    "LAUN","PLAS","SHOT","SGN2","COLU","SMT2","GOR1","POL2","POL5","POL4",
-    "POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2",
-    "COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU",
-    "COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2","HDB3",
-    "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2", NULL
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#if 0
+
+/* Using misc1 & misc2 */
+
+#define STATE_ENTRY(s, f, t, a, ns)                                          \
+  {                                                                          \
+      .sprite = (s),                                                         \
+      .frame = (f),                                                          \
+      .tics = (t),                                                           \
+      .action = {(a)},                                                       \
+      .nextstate = (ns),                                                     \
+      .misc1 = 0,                                                            \
+      .misc2 = 0,                                                            \
+  }
+#else
+
+/* No misc1 & misc2 members */
+
+#define STATE_ENTRY(s, f, t, a, ns)                                          \
+  {                                                                          \
+      .sprite = (s),                                                         \
+      .frame = (f),                                                          \
+      .tics = (t),                                                           \
+      .action = {(a)},                                                       \
+      .nextstate = (ns),                                                     \
+  }
+#endif
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const char *sprnames[] =
+{
+  "TROO", "SHTG", "PUNG", "PISG", "PISF", "SHTF", "SHT2", "CHGG", "CHGF",
+  "MISG", "MISF", "SAWG", "PLSG", "PLSF", "BFGG", "BFGF", "BLUD", "PUFF",
+  "BAL1", "BAL2", "PLSS", "PLSE", "MISL", "BFS1", "BFE1", "BFE2", "TFOG",
+  "IFOG", "PLAY", "POSS", "SPOS", "VILE", "FIRE", "FATB", "FBXP", "SKEL",
+  "MANF", "FATT", "CPOS", "SARG", "HEAD", "BAL7", "BOSS", "BOS2", "SKUL",
+  "SPID", "BSPI", "APLS", "APBX", "CYBR", "PAIN", "SSWV", "KEEN", "BBRN",
+  "BOSF", "ARM1", "ARM2", "BAR1", "BEXP", "FCAN", "BON1", "BON2", "BKEY",
+  "RKEY", "YKEY", "BSKU", "RSKU", "YSKU", "STIM", "MEDI", "SOUL", "PINV",
+  "PSTR", "PINS", "MEGA", "SUIT", "PMAP", "PVIS", "CLIP", "AMMO", "ROCK",
+  "BROK", "CELL", "CELP", "SHEL", "SBOX", "BPAK", "BFUG", "MGUN", "CSAW",
+  "LAUN", "PLAS", "SHOT", "SGN2", "COLU", "SMT2", "GOR1", "POL2", "POL5",
+  "POL4", "POL3", "POL1", "POL6", "GOR2", "GOR3", "GOR4", "GOR5", "SMIT",
+  "COL1", "COL2", "COL3", "COL4", "CAND", "CBRA", "COL6", "TRE1", "TRE2",
+  "ELEC", "CEYE", "FSKU", "COL5", "TBLU", "TGRN", "TRED", "SMBT", "SMGT",
+  "SMRT", "HDB1", "HDB2", "HDB3", "HDB4", "HDB5", "HDB6", "POB1", "POB2",
+  "BRS1", "TLMP", "TLP2", NULL,
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Doesn't work with g++, needs actionf_p1
-void  A_Light0();
-void A_WeaponReady();
-void A_Lower();
-void A_Raise();
-void A_Punch();
-void A_ReFire();
-void A_FirePistol();
-void A_Light1();
-void A_FireShotgun();
-void A_Light2();
-void A_FireShotgun2();
-void A_CheckReload();
-void A_OpenShotgun2();
-void A_LoadShotgun2();
-void A_CloseShotgun2();
-void A_FireCGun();
-void A_GunFlash();
-void A_FireMissile();
-void A_Saw();
-void A_FirePlasma();
-void A_BFGsound();
-void A_FireBFG();
-void A_BFGSpray();
-void A_Explode();
-void A_Pain();
-void A_PlayerScream();
-void A_Fall();
-void A_XScream();
-void A_Look();
-void A_Chase();
-void A_FaceTarget();
-void A_PosAttack();
-void A_Scream();
-void A_SPosAttack();
-void A_VileChase();
-void A_VileStart();
-void A_VileTarget();
-void A_VileAttack();
-void A_StartFire();
-void A_Fire();
-void A_FireCrackle();
-void A_Tracer();
-void A_SkelWhoosh();
-void A_SkelFist();
-void A_SkelMissile();
-void A_FatRaise();
-void A_FatAttack1();
-void A_FatAttack2();
-void A_FatAttack3();
-void A_BossDeath();
-void A_CPosAttack();
-void A_CPosRefire();
-void A_TroopAttack();
-void A_SargAttack();
-void A_HeadAttack();
-void A_BruisAttack();
-void A_SkullAttack();
-void A_Metal();
-void A_SpidRefire();
-void A_BabyMetal();
-void A_BspiAttack();
-void A_Hoof();
-void A_CyberAttack();
-void A_PainAttack();
-void A_PainDie();
-void A_KeenDie();
-void A_BrainPain();
-void A_BrainScream();
-void A_BrainDie();
-void A_BrainAwake();
-void A_BrainSpit();
-void A_SpawnSound();
-void A_SpawnFly();
-void A_BrainExplode();
+/* Doesn't work with g++, needs actionf_p1 */
 
+void a_light0();
+void a_weapon_ready();
+void a_lower();
+void a_raise();
+void a_punch();
+void a_refire();
+void a_fire_pistol();
+void a_light1();
+void a_fire_shotgun();
+void a_light2();
+void a_fire_shotgun2();
+void a_check_reload();
+void a_open_shotgun2();
+void a_load_shotgun2();
+void a_close_shotgun2();
+void a_fire_cgun();
+void a_gun_flash();
+void a_fire_missile();
+void a_saw();
+void a_fire_plasma();
+void a_bfg_sound();
+void a_fire_bfg();
+void a_bfg_spray();
+void a_explode();
+void a_pain();
+void a_player_screm();
+void a_fall();
+void a_xscream();
+void a_look();
+void a_chase();
+void a_face_target();
+void a_pos_attack();
+void a_scream();
+void a_s_pos_attack();
+void a_vile_chase();
+void a_vile_start();
+void a_vile_target();
+void a_vile_attack();
+void a_start_fire();
+void a_fire();
+void a_fire_crackle();
+void a_tracer();
+void a_skel_woosh();
+void a_skel_fist();
+void a_skel_missile();
+void a_fat_raise();
+void a_fat_attack1();
+void a_fat_attack2();
+void a_fat_attack3();
+void a_boss_death();
+void a_c_pos_attack();
+void a_c_pos_refire();
+void a_troop_attack();
+void a_sarg_attack();
+void a_head_attack();
+void a_bruis_attack();
+void a_skull_attack();
+void a_metal();
+void a_spid_refire();
+void a_baby_metal();
+void a_bspi_attack();
+void a_hoof();
+void a_cyber_attack();
+void a_pain_attack();
+void a_pain_die();
+void a_keen_die();
+void a_brain_pain();
+void a_brain_scream();
+void a_brain_die();
+void a_brain_awake();
+void a_brain_split();
+void a_spawn_sound();
+void a_spawn_fly();
+void a_brain_explode();
 
-state_t	states[NUMSTATES] = {
-    {SPR_TROO,0,-1,{NULL},S_NULL,0,0},	// S_NULL
-    {SPR_SHTG,4,0,{A_Light0},S_NULL,0,0},	// S_LIGHTDONE
-    {SPR_PUNG,0,1,{A_WeaponReady},S_PUNCH,0,0},	// S_PUNCH
-    {SPR_PUNG,0,1,{A_Lower},S_PUNCHDOWN,0,0},	// S_PUNCHDOWN
-    {SPR_PUNG,0,1,{A_Raise},S_PUNCHUP,0,0},	// S_PUNCHUP
-    {SPR_PUNG,1,4,{NULL},S_PUNCH2,0,0},		// S_PUNCH1
-    {SPR_PUNG,2,4,{A_Punch},S_PUNCH3,0,0},	// S_PUNCH2
-    {SPR_PUNG,3,5,{NULL},S_PUNCH4,0,0},		// S_PUNCH3
-    {SPR_PUNG,2,4,{NULL},S_PUNCH5,0,0},		// S_PUNCH4
-    {SPR_PUNG,1,5,{A_ReFire},S_PUNCH,0,0},	// S_PUNCH5
-    {SPR_PISG,0,1,{A_WeaponReady},S_PISTOL,0,0},// S_PISTOL
-    {SPR_PISG,0,1,{A_Lower},S_PISTOLDOWN,0,0},	// S_PISTOLDOWN
-    {SPR_PISG,0,1,{A_Raise},S_PISTOLUP,0,0},	// S_PISTOLUP
-    {SPR_PISG,0,4,{NULL},S_PISTOL2,0,0},	// S_PISTOL1
-    {SPR_PISG,1,6,{A_FirePistol},S_PISTOL3,0,0},// S_PISTOL2
-    {SPR_PISG,2,4,{NULL},S_PISTOL4,0,0},	// S_PISTOL3
-    {SPR_PISG,1,5,{A_ReFire},S_PISTOL,0,0},	// S_PISTOL4
-    {SPR_PISF,32768,7,{A_Light1},S_LIGHTDONE,0,0},	// S_PISTOLFLASH
-    {SPR_SHTG,0,1,{A_WeaponReady},S_SGUN,0,0},	// S_SGUN
-    {SPR_SHTG,0,1,{A_Lower},S_SGUNDOWN,0,0},	// S_SGUNDOWN
-    {SPR_SHTG,0,1,{A_Raise},S_SGUNUP,0,0},	// S_SGUNUP
-    {SPR_SHTG,0,3,{NULL},S_SGUN2,0,0},	// S_SGUN1
-    {SPR_SHTG,0,7,{A_FireShotgun},S_SGUN3,0,0},	// S_SGUN2
-    {SPR_SHTG,1,5,{NULL},S_SGUN4,0,0},	// S_SGUN3
-    {SPR_SHTG,2,5,{NULL},S_SGUN5,0,0},	// S_SGUN4
-    {SPR_SHTG,3,4,{NULL},S_SGUN6,0,0},	// S_SGUN5
-    {SPR_SHTG,2,5,{NULL},S_SGUN7,0,0},	// S_SGUN6
-    {SPR_SHTG,1,5,{NULL},S_SGUN8,0,0},	// S_SGUN7
-    {SPR_SHTG,0,3,{NULL},S_SGUN9,0,0},	// S_SGUN8
-    {SPR_SHTG,0,7,{A_ReFire},S_SGUN,0,0},	// S_SGUN9
-    {SPR_SHTF,32768,4,{A_Light1},S_SGUNFLASH2,0,0},	// S_SGUNFLASH1
-    {SPR_SHTF,32769,3,{A_Light2},S_LIGHTDONE,0,0},	// S_SGUNFLASH2
-    {SPR_SHT2,0,1,{A_WeaponReady},S_DSGUN,0,0},	// S_DSGUN
-    {SPR_SHT2,0,1,{A_Lower},S_DSGUNDOWN,0,0},	// S_DSGUNDOWN
-    {SPR_SHT2,0,1,{A_Raise},S_DSGUNUP,0,0},	// S_DSGUNUP
-    {SPR_SHT2,0,3,{NULL},S_DSGUN2,0,0},	// S_DSGUN1
-    {SPR_SHT2,0,7,{A_FireShotgun2},S_DSGUN3,0,0},	// S_DSGUN2
-    {SPR_SHT2,1,7,{NULL},S_DSGUN4,0,0},	// S_DSGUN3
-    {SPR_SHT2,2,7,{A_CheckReload},S_DSGUN5,0,0},	// S_DSGUN4
-    {SPR_SHT2,3,7,{A_OpenShotgun2},S_DSGUN6,0,0},	// S_DSGUN5
-    {SPR_SHT2,4,7,{NULL},S_DSGUN7,0,0},	// S_DSGUN6
-    {SPR_SHT2,5,7,{A_LoadShotgun2},S_DSGUN8,0,0},	// S_DSGUN7
-    {SPR_SHT2,6,6,{NULL},S_DSGUN9,0,0},	// S_DSGUN8
-    {SPR_SHT2,7,6,{A_CloseShotgun2},S_DSGUN10,0,0},	// S_DSGUN9
-    {SPR_SHT2,0,5,{A_ReFire},S_DSGUN,0,0},	// S_DSGUN10
-    {SPR_SHT2,1,7,{NULL},S_DSNR2,0,0},	// S_DSNR1
-    {SPR_SHT2,0,3,{NULL},S_DSGUNDOWN,0,0},	// S_DSNR2
-    {SPR_SHT2,32776,5,{A_Light1},S_DSGUNFLASH2,0,0},	// S_DSGUNFLASH1
-    {SPR_SHT2,32777,4,{A_Light2},S_LIGHTDONE,0,0},	// S_DSGUNFLASH2
-    {SPR_CHGG,0,1,{A_WeaponReady},S_CHAIN,0,0},	// S_CHAIN
-    {SPR_CHGG,0,1,{A_Lower},S_CHAINDOWN,0,0},	// S_CHAINDOWN
-    {SPR_CHGG,0,1,{A_Raise},S_CHAINUP,0,0},	// S_CHAINUP
-    {SPR_CHGG,0,4,{A_FireCGun},S_CHAIN2,0,0},	// S_CHAIN1
-    {SPR_CHGG,1,4,{A_FireCGun},S_CHAIN3,0,0},	// S_CHAIN2
-    {SPR_CHGG,1,0,{A_ReFire},S_CHAIN,0,0},	// S_CHAIN3
-    {SPR_CHGF,32768,5,{A_Light1},S_LIGHTDONE,0,0},	// S_CHAINFLASH1
-    {SPR_CHGF,32769,5,{A_Light2},S_LIGHTDONE,0,0},	// S_CHAINFLASH2
-    {SPR_MISG,0,1,{A_WeaponReady},S_MISSILE,0,0},	// S_MISSILE
-    {SPR_MISG,0,1,{A_Lower},S_MISSILEDOWN,0,0},	// S_MISSILEDOWN
-    {SPR_MISG,0,1,{A_Raise},S_MISSILEUP,0,0},	// S_MISSILEUP
-    {SPR_MISG,1,8,{A_GunFlash},S_MISSILE2,0,0},	// S_MISSILE1
-    {SPR_MISG,1,12,{A_FireMissile},S_MISSILE3,0,0},	// S_MISSILE2
-    {SPR_MISG,1,0,{A_ReFire},S_MISSILE,0,0},	// S_MISSILE3
-    {SPR_MISF,32768,3,{A_Light1},S_MISSILEFLASH2,0,0},	// S_MISSILEFLASH1
-    {SPR_MISF,32769,4,{NULL},S_MISSILEFLASH3,0,0},	// S_MISSILEFLASH2
-    {SPR_MISF,32770,4,{A_Light2},S_MISSILEFLASH4,0,0},	// S_MISSILEFLASH3
-    {SPR_MISF,32771,4,{A_Light2},S_LIGHTDONE,0,0},	// S_MISSILEFLASH4
-    {SPR_SAWG,2,4,{A_WeaponReady},S_SAWB,0,0},	// S_SAW
-    {SPR_SAWG,3,4,{A_WeaponReady},S_SAW,0,0},	// S_SAWB
-    {SPR_SAWG,2,1,{A_Lower},S_SAWDOWN,0,0},	// S_SAWDOWN
-    {SPR_SAWG,2,1,{A_Raise},S_SAWUP,0,0},	// S_SAWUP
-    {SPR_SAWG,0,4,{A_Saw},S_SAW2,0,0},	// S_SAW1
-    {SPR_SAWG,1,4,{A_Saw},S_SAW3,0,0},	// S_SAW2
-    {SPR_SAWG,1,0,{A_ReFire},S_SAW,0,0},	// S_SAW3
-    {SPR_PLSG,0,1,{A_WeaponReady},S_PLASMA,0,0},	// S_PLASMA
-    {SPR_PLSG,0,1,{A_Lower},S_PLASMADOWN,0,0},	// S_PLASMADOWN
-    {SPR_PLSG,0,1,{A_Raise},S_PLASMAUP,0,0},	// S_PLASMAUP
-    {SPR_PLSG,0,3,{A_FirePlasma},S_PLASMA2,0,0},	// S_PLASMA1
-    {SPR_PLSG,1,20,{A_ReFire},S_PLASMA,0,0},	// S_PLASMA2
-    {SPR_PLSF,32768,4,{A_Light1},S_LIGHTDONE,0,0},	// S_PLASMAFLASH1
-    {SPR_PLSF,32769,4,{A_Light1},S_LIGHTDONE,0,0},	// S_PLASMAFLASH2
-    {SPR_BFGG,0,1,{A_WeaponReady},S_BFG,0,0},	// S_BFG
-    {SPR_BFGG,0,1,{A_Lower},S_BFGDOWN,0,0},	// S_BFGDOWN
-    {SPR_BFGG,0,1,{A_Raise},S_BFGUP,0,0},	// S_BFGUP
-    {SPR_BFGG,0,20,{A_BFGsound},S_BFG2,0,0},	// S_BFG1
-    {SPR_BFGG,1,10,{A_GunFlash},S_BFG3,0,0},	// S_BFG2
-    {SPR_BFGG,1,10,{A_FireBFG},S_BFG4,0,0},	// S_BFG3
-    {SPR_BFGG,1,20,{A_ReFire},S_BFG,0,0},	// S_BFG4
-    {SPR_BFGF,32768,11,{A_Light1},S_BFGFLASH2,0,0},	// S_BFGFLASH1
-    {SPR_BFGF,32769,6,{A_Light2},S_LIGHTDONE,0,0},	// S_BFGFLASH2
-    {SPR_BLUD,2,8,{NULL},S_BLOOD2,0,0},	// S_BLOOD1
-    {SPR_BLUD,1,8,{NULL},S_BLOOD3,0,0},	// S_BLOOD2
-    {SPR_BLUD,0,8,{NULL},S_NULL,0,0},	// S_BLOOD3
-    {SPR_PUFF,32768,4,{NULL},S_PUFF2,0,0},	// S_PUFF1
-    {SPR_PUFF,1,4,{NULL},S_PUFF3,0,0},	// S_PUFF2
-    {SPR_PUFF,2,4,{NULL},S_PUFF4,0,0},	// S_PUFF3
-    {SPR_PUFF,3,4,{NULL},S_NULL,0,0},	// S_PUFF4
-    {SPR_BAL1,32768,4,{NULL},S_TBALL2,0,0},	// S_TBALL1
-    {SPR_BAL1,32769,4,{NULL},S_TBALL1,0,0},	// S_TBALL2
-    {SPR_BAL1,32770,6,{NULL},S_TBALLX2,0,0},	// S_TBALLX1
-    {SPR_BAL1,32771,6,{NULL},S_TBALLX3,0,0},	// S_TBALLX2
-    {SPR_BAL1,32772,6,{NULL},S_NULL,0,0},	// S_TBALLX3
-    {SPR_BAL2,32768,4,{NULL},S_RBALL2,0,0},	// S_RBALL1
-    {SPR_BAL2,32769,4,{NULL},S_RBALL1,0,0},	// S_RBALL2
-    {SPR_BAL2,32770,6,{NULL},S_RBALLX2,0,0},	// S_RBALLX1
-    {SPR_BAL2,32771,6,{NULL},S_RBALLX3,0,0},	// S_RBALLX2
-    {SPR_BAL2,32772,6,{NULL},S_NULL,0,0},	// S_RBALLX3
-    {SPR_PLSS,32768,6,{NULL},S_PLASBALL2,0,0},	// S_PLASBALL
-    {SPR_PLSS,32769,6,{NULL},S_PLASBALL,0,0},	// S_PLASBALL2
-    {SPR_PLSE,32768,4,{NULL},S_PLASEXP2,0,0},	// S_PLASEXP
-    {SPR_PLSE,32769,4,{NULL},S_PLASEXP3,0,0},	// S_PLASEXP2
-    {SPR_PLSE,32770,4,{NULL},S_PLASEXP4,0,0},	// S_PLASEXP3
-    {SPR_PLSE,32771,4,{NULL},S_PLASEXP5,0,0},	// S_PLASEXP4
-    {SPR_PLSE,32772,4,{NULL},S_NULL,0,0},	// S_PLASEXP5
-    {SPR_MISL,32768,1,{NULL},S_ROCKET,0,0},	// S_ROCKET
-    {SPR_BFS1,32768,4,{NULL},S_BFGSHOT2,0,0},	// S_BFGSHOT
-    {SPR_BFS1,32769,4,{NULL},S_BFGSHOT,0,0},	// S_BFGSHOT2
-    {SPR_BFE1,32768,8,{NULL},S_BFGLAND2,0,0},	// S_BFGLAND
-    {SPR_BFE1,32769,8,{NULL},S_BFGLAND3,0,0},	// S_BFGLAND2
-    {SPR_BFE1,32770,8,{A_BFGSpray},S_BFGLAND4,0,0},	// S_BFGLAND3
-    {SPR_BFE1,32771,8,{NULL},S_BFGLAND5,0,0},	// S_BFGLAND4
-    {SPR_BFE1,32772,8,{NULL},S_BFGLAND6,0,0},	// S_BFGLAND5
-    {SPR_BFE1,32773,8,{NULL},S_NULL,0,0},	// S_BFGLAND6
-    {SPR_BFE2,32768,8,{NULL},S_BFGEXP2,0,0},	// S_BFGEXP
-    {SPR_BFE2,32769,8,{NULL},S_BFGEXP3,0,0},	// S_BFGEXP2
-    {SPR_BFE2,32770,8,{NULL},S_BFGEXP4,0,0},	// S_BFGEXP3
-    {SPR_BFE2,32771,8,{NULL},S_NULL,0,0},	// S_BFGEXP4
-    {SPR_MISL,32769,8,{A_Explode},S_EXPLODE2,0,0},	// S_EXPLODE1
-    {SPR_MISL,32770,6,{NULL},S_EXPLODE3,0,0},	// S_EXPLODE2
-    {SPR_MISL,32771,4,{NULL},S_NULL,0,0},	// S_EXPLODE3
-    {SPR_TFOG,32768,6,{NULL},S_TFOG01,0,0},	// S_TFOG
-    {SPR_TFOG,32769,6,{NULL},S_TFOG02,0,0},	// S_TFOG01
-    {SPR_TFOG,32768,6,{NULL},S_TFOG2,0,0},	// S_TFOG02
-    {SPR_TFOG,32769,6,{NULL},S_TFOG3,0,0},	// S_TFOG2
-    {SPR_TFOG,32770,6,{NULL},S_TFOG4,0,0},	// S_TFOG3
-    {SPR_TFOG,32771,6,{NULL},S_TFOG5,0,0},	// S_TFOG4
-    {SPR_TFOG,32772,6,{NULL},S_TFOG6,0,0},	// S_TFOG5
-    {SPR_TFOG,32773,6,{NULL},S_TFOG7,0,0},	// S_TFOG6
-    {SPR_TFOG,32774,6,{NULL},S_TFOG8,0,0},	// S_TFOG7
-    {SPR_TFOG,32775,6,{NULL},S_TFOG9,0,0},	// S_TFOG8
-    {SPR_TFOG,32776,6,{NULL},S_TFOG10,0,0},	// S_TFOG9
-    {SPR_TFOG,32777,6,{NULL},S_NULL,0,0},	// S_TFOG10
-    {SPR_IFOG,32768,6,{NULL},S_IFOG01,0,0},	// S_IFOG
-    {SPR_IFOG,32769,6,{NULL},S_IFOG02,0,0},	// S_IFOG01
-    {SPR_IFOG,32768,6,{NULL},S_IFOG2,0,0},	// S_IFOG02
-    {SPR_IFOG,32769,6,{NULL},S_IFOG3,0,0},	// S_IFOG2
-    {SPR_IFOG,32770,6,{NULL},S_IFOG4,0,0},	// S_IFOG3
-    {SPR_IFOG,32771,6,{NULL},S_IFOG5,0,0},	// S_IFOG4
-    {SPR_IFOG,32772,6,{NULL},S_NULL,0,0},	// S_IFOG5
-    {SPR_PLAY,0,-1,{NULL},S_NULL,0,0},	// S_PLAY
-    {SPR_PLAY,0,4,{NULL},S_PLAY_RUN2,0,0},	// S_PLAY_RUN1
-    {SPR_PLAY,1,4,{NULL},S_PLAY_RUN3,0,0},	// S_PLAY_RUN2
-    {SPR_PLAY,2,4,{NULL},S_PLAY_RUN4,0,0},	// S_PLAY_RUN3
-    {SPR_PLAY,3,4,{NULL},S_PLAY_RUN1,0,0},	// S_PLAY_RUN4
-    {SPR_PLAY,4,12,{NULL},S_PLAY,0,0},	// S_PLAY_ATK1
-    {SPR_PLAY,32773,6,{NULL},S_PLAY_ATK1,0,0},	// S_PLAY_ATK2
-    {SPR_PLAY,6,4,{NULL},S_PLAY_PAIN2,0,0},	// S_PLAY_PAIN
-    {SPR_PLAY,6,4,{A_Pain},S_PLAY,0,0},	// S_PLAY_PAIN2
-    {SPR_PLAY,7,10,{NULL},S_PLAY_DIE2,0,0},	// S_PLAY_DIE1
-    {SPR_PLAY,8,10,{A_PlayerScream},S_PLAY_DIE3,0,0},	// S_PLAY_DIE2
-    {SPR_PLAY,9,10,{A_Fall},S_PLAY_DIE4,0,0},	// S_PLAY_DIE3
-    {SPR_PLAY,10,10,{NULL},S_PLAY_DIE5,0,0},	// S_PLAY_DIE4
-    {SPR_PLAY,11,10,{NULL},S_PLAY_DIE6,0,0},	// S_PLAY_DIE5
-    {SPR_PLAY,12,10,{NULL},S_PLAY_DIE7,0,0},	// S_PLAY_DIE6
-    {SPR_PLAY,13,-1,{NULL},S_NULL,0,0},	// S_PLAY_DIE7
-    {SPR_PLAY,14,5,{NULL},S_PLAY_XDIE2,0,0},	// S_PLAY_XDIE1
-    {SPR_PLAY,15,5,{A_XScream},S_PLAY_XDIE3,0,0},	// S_PLAY_XDIE2
-    {SPR_PLAY,16,5,{A_Fall},S_PLAY_XDIE4,0,0},	// S_PLAY_XDIE3
-    {SPR_PLAY,17,5,{NULL},S_PLAY_XDIE5,0,0},	// S_PLAY_XDIE4
-    {SPR_PLAY,18,5,{NULL},S_PLAY_XDIE6,0,0},	// S_PLAY_XDIE5
-    {SPR_PLAY,19,5,{NULL},S_PLAY_XDIE7,0,0},	// S_PLAY_XDIE6
-    {SPR_PLAY,20,5,{NULL},S_PLAY_XDIE8,0,0},	// S_PLAY_XDIE7
-    {SPR_PLAY,21,5,{NULL},S_PLAY_XDIE9,0,0},	// S_PLAY_XDIE8
-    {SPR_PLAY,22,-1,{NULL},S_NULL,0,0},	// S_PLAY_XDIE9
-    {SPR_POSS,0,10,{A_Look},S_POSS_STND2,0,0},	// S_POSS_STND
-    {SPR_POSS,1,10,{A_Look},S_POSS_STND,0,0},	// S_POSS_STND2
-    {SPR_POSS,0,4,{A_Chase},S_POSS_RUN2,0,0},	// S_POSS_RUN1
-    {SPR_POSS,0,4,{A_Chase},S_POSS_RUN3,0,0},	// S_POSS_RUN2
-    {SPR_POSS,1,4,{A_Chase},S_POSS_RUN4,0,0},	// S_POSS_RUN3
-    {SPR_POSS,1,4,{A_Chase},S_POSS_RUN5,0,0},	// S_POSS_RUN4
-    {SPR_POSS,2,4,{A_Chase},S_POSS_RUN6,0,0},	// S_POSS_RUN5
-    {SPR_POSS,2,4,{A_Chase},S_POSS_RUN7,0,0},	// S_POSS_RUN6
-    {SPR_POSS,3,4,{A_Chase},S_POSS_RUN8,0,0},	// S_POSS_RUN7
-    {SPR_POSS,3,4,{A_Chase},S_POSS_RUN1,0,0},	// S_POSS_RUN8
-    {SPR_POSS,4,10,{A_FaceTarget},S_POSS_ATK2,0,0},	// S_POSS_ATK1
-    {SPR_POSS,5,8,{A_PosAttack},S_POSS_ATK3,0,0},	// S_POSS_ATK2
-    {SPR_POSS,4,8,{NULL},S_POSS_RUN1,0,0},	// S_POSS_ATK3
-    {SPR_POSS,6,3,{NULL},S_POSS_PAIN2,0,0},	// S_POSS_PAIN
-    {SPR_POSS,6,3,{A_Pain},S_POSS_RUN1,0,0},	// S_POSS_PAIN2
-    {SPR_POSS,7,5,{NULL},S_POSS_DIE2,0,0},	// S_POSS_DIE1
-    {SPR_POSS,8,5,{A_Scream},S_POSS_DIE3,0,0},	// S_POSS_DIE2
-    {SPR_POSS,9,5,{A_Fall},S_POSS_DIE4,0,0},	// S_POSS_DIE3
-    {SPR_POSS,10,5,{NULL},S_POSS_DIE5,0,0},	// S_POSS_DIE4
-    {SPR_POSS,11,-1,{NULL},S_NULL,0,0},	// S_POSS_DIE5
-    {SPR_POSS,12,5,{NULL},S_POSS_XDIE2,0,0},	// S_POSS_XDIE1
-    {SPR_POSS,13,5,{A_XScream},S_POSS_XDIE3,0,0},	// S_POSS_XDIE2
-    {SPR_POSS,14,5,{A_Fall},S_POSS_XDIE4,0,0},	// S_POSS_XDIE3
-    {SPR_POSS,15,5,{NULL},S_POSS_XDIE5,0,0},	// S_POSS_XDIE4
-    {SPR_POSS,16,5,{NULL},S_POSS_XDIE6,0,0},	// S_POSS_XDIE5
-    {SPR_POSS,17,5,{NULL},S_POSS_XDIE7,0,0},	// S_POSS_XDIE6
-    {SPR_POSS,18,5,{NULL},S_POSS_XDIE8,0,0},	// S_POSS_XDIE7
-    {SPR_POSS,19,5,{NULL},S_POSS_XDIE9,0,0},	// S_POSS_XDIE8
-    {SPR_POSS,20,-1,{NULL},S_NULL,0,0},	// S_POSS_XDIE9
-    {SPR_POSS,10,5,{NULL},S_POSS_RAISE2,0,0},	// S_POSS_RAISE1
-    {SPR_POSS,9,5,{NULL},S_POSS_RAISE3,0,0},	// S_POSS_RAISE2
-    {SPR_POSS,8,5,{NULL},S_POSS_RAISE4,0,0},	// S_POSS_RAISE3
-    {SPR_POSS,7,5,{NULL},S_POSS_RUN1,0,0},	// S_POSS_RAISE4
-    {SPR_SPOS,0,10,{A_Look},S_SPOS_STND2,0,0},	// S_SPOS_STND
-    {SPR_SPOS,1,10,{A_Look},S_SPOS_STND,0,0},	// S_SPOS_STND2
-    {SPR_SPOS,0,3,{A_Chase},S_SPOS_RUN2,0,0},	// S_SPOS_RUN1
-    {SPR_SPOS,0,3,{A_Chase},S_SPOS_RUN3,0,0},	// S_SPOS_RUN2
-    {SPR_SPOS,1,3,{A_Chase},S_SPOS_RUN4,0,0},	// S_SPOS_RUN3
-    {SPR_SPOS,1,3,{A_Chase},S_SPOS_RUN5,0,0},	// S_SPOS_RUN4
-    {SPR_SPOS,2,3,{A_Chase},S_SPOS_RUN6,0,0},	// S_SPOS_RUN5
-    {SPR_SPOS,2,3,{A_Chase},S_SPOS_RUN7,0,0},	// S_SPOS_RUN6
-    {SPR_SPOS,3,3,{A_Chase},S_SPOS_RUN8,0,0},	// S_SPOS_RUN7
-    {SPR_SPOS,3,3,{A_Chase},S_SPOS_RUN1,0,0},	// S_SPOS_RUN8
-    {SPR_SPOS,4,10,{A_FaceTarget},S_SPOS_ATK2,0,0},	// S_SPOS_ATK1
-    {SPR_SPOS,32773,10,{A_SPosAttack},S_SPOS_ATK3,0,0},	// S_SPOS_ATK2
-    {SPR_SPOS,4,10,{NULL},S_SPOS_RUN1,0,0},	// S_SPOS_ATK3
-    {SPR_SPOS,6,3,{NULL},S_SPOS_PAIN2,0,0},	// S_SPOS_PAIN
-    {SPR_SPOS,6,3,{A_Pain},S_SPOS_RUN1,0,0},	// S_SPOS_PAIN2
-    {SPR_SPOS,7,5,{NULL},S_SPOS_DIE2,0,0},	// S_SPOS_DIE1
-    {SPR_SPOS,8,5,{A_Scream},S_SPOS_DIE3,0,0},	// S_SPOS_DIE2
-    {SPR_SPOS,9,5,{A_Fall},S_SPOS_DIE4,0,0},	// S_SPOS_DIE3
-    {SPR_SPOS,10,5,{NULL},S_SPOS_DIE5,0,0},	// S_SPOS_DIE4
-    {SPR_SPOS,11,-1,{NULL},S_NULL,0,0},	// S_SPOS_DIE5
-    {SPR_SPOS,12,5,{NULL},S_SPOS_XDIE2,0,0},	// S_SPOS_XDIE1
-    {SPR_SPOS,13,5,{A_XScream},S_SPOS_XDIE3,0,0},	// S_SPOS_XDIE2
-    {SPR_SPOS,14,5,{A_Fall},S_SPOS_XDIE4,0,0},	// S_SPOS_XDIE3
-    {SPR_SPOS,15,5,{NULL},S_SPOS_XDIE5,0,0},	// S_SPOS_XDIE4
-    {SPR_SPOS,16,5,{NULL},S_SPOS_XDIE6,0,0},	// S_SPOS_XDIE5
-    {SPR_SPOS,17,5,{NULL},S_SPOS_XDIE7,0,0},	// S_SPOS_XDIE6
-    {SPR_SPOS,18,5,{NULL},S_SPOS_XDIE8,0,0},	// S_SPOS_XDIE7
-    {SPR_SPOS,19,5,{NULL},S_SPOS_XDIE9,0,0},	// S_SPOS_XDIE8
-    {SPR_SPOS,20,-1,{NULL},S_NULL,0,0},	// S_SPOS_XDIE9
-    {SPR_SPOS,11,5,{NULL},S_SPOS_RAISE2,0,0},	// S_SPOS_RAISE1
-    {SPR_SPOS,10,5,{NULL},S_SPOS_RAISE3,0,0},	// S_SPOS_RAISE2
-    {SPR_SPOS,9,5,{NULL},S_SPOS_RAISE4,0,0},	// S_SPOS_RAISE3
-    {SPR_SPOS,8,5,{NULL},S_SPOS_RAISE5,0,0},	// S_SPOS_RAISE4
-    {SPR_SPOS,7,5,{NULL},S_SPOS_RUN1,0,0},	// S_SPOS_RAISE5
-    {SPR_VILE,0,10,{A_Look},S_VILE_STND2,0,0},	// S_VILE_STND
-    {SPR_VILE,1,10,{A_Look},S_VILE_STND,0,0},	// S_VILE_STND2
-    {SPR_VILE,0,2,{A_VileChase},S_VILE_RUN2,0,0},	// S_VILE_RUN1
-    {SPR_VILE,0,2,{A_VileChase},S_VILE_RUN3,0,0},	// S_VILE_RUN2
-    {SPR_VILE,1,2,{A_VileChase},S_VILE_RUN4,0,0},	// S_VILE_RUN3
-    {SPR_VILE,1,2,{A_VileChase},S_VILE_RUN5,0,0},	// S_VILE_RUN4
-    {SPR_VILE,2,2,{A_VileChase},S_VILE_RUN6,0,0},	// S_VILE_RUN5
-    {SPR_VILE,2,2,{A_VileChase},S_VILE_RUN7,0,0},	// S_VILE_RUN6
-    {SPR_VILE,3,2,{A_VileChase},S_VILE_RUN8,0,0},	// S_VILE_RUN7
-    {SPR_VILE,3,2,{A_VileChase},S_VILE_RUN9,0,0},	// S_VILE_RUN8
-    {SPR_VILE,4,2,{A_VileChase},S_VILE_RUN10,0,0},	// S_VILE_RUN9
-    {SPR_VILE,4,2,{A_VileChase},S_VILE_RUN11,0,0},	// S_VILE_RUN10
-    {SPR_VILE,5,2,{A_VileChase},S_VILE_RUN12,0,0},	// S_VILE_RUN11
-    {SPR_VILE,5,2,{A_VileChase},S_VILE_RUN1,0,0},	// S_VILE_RUN12
-    {SPR_VILE,32774,0,{A_VileStart},S_VILE_ATK2,0,0},	// S_VILE_ATK1
-    {SPR_VILE,32774,10,{A_FaceTarget},S_VILE_ATK3,0,0},	// S_VILE_ATK2
-    {SPR_VILE,32775,8,{A_VileTarget},S_VILE_ATK4,0,0},	// S_VILE_ATK3
-    {SPR_VILE,32776,8,{A_FaceTarget},S_VILE_ATK5,0,0},	// S_VILE_ATK4
-    {SPR_VILE,32777,8,{A_FaceTarget},S_VILE_ATK6,0,0},	// S_VILE_ATK5
-    {SPR_VILE,32778,8,{A_FaceTarget},S_VILE_ATK7,0,0},	// S_VILE_ATK6
-    {SPR_VILE,32779,8,{A_FaceTarget},S_VILE_ATK8,0,0},	// S_VILE_ATK7
-    {SPR_VILE,32780,8,{A_FaceTarget},S_VILE_ATK9,0,0},	// S_VILE_ATK8
-    {SPR_VILE,32781,8,{A_FaceTarget},S_VILE_ATK10,0,0},	// S_VILE_ATK9
-    {SPR_VILE,32782,8,{A_VileAttack},S_VILE_ATK11,0,0},	// S_VILE_ATK10
-    {SPR_VILE,32783,20,{NULL},S_VILE_RUN1,0,0},	// S_VILE_ATK11
-    {SPR_VILE,32794,10,{NULL},S_VILE_HEAL2,0,0},	// S_VILE_HEAL1
-    {SPR_VILE,32795,10,{NULL},S_VILE_HEAL3,0,0},	// S_VILE_HEAL2
-    {SPR_VILE,32796,10,{NULL},S_VILE_RUN1,0,0},	// S_VILE_HEAL3
-    {SPR_VILE,16,5,{NULL},S_VILE_PAIN2,0,0},	// S_VILE_PAIN
-    {SPR_VILE,16,5,{A_Pain},S_VILE_RUN1,0,0},	// S_VILE_PAIN2
-    {SPR_VILE,16,7,{NULL},S_VILE_DIE2,0,0},	// S_VILE_DIE1
-    {SPR_VILE,17,7,{A_Scream},S_VILE_DIE3,0,0},	// S_VILE_DIE2
-    {SPR_VILE,18,7,{A_Fall},S_VILE_DIE4,0,0},	// S_VILE_DIE3
-    {SPR_VILE,19,7,{NULL},S_VILE_DIE5,0,0},	// S_VILE_DIE4
-    {SPR_VILE,20,7,{NULL},S_VILE_DIE6,0,0},	// S_VILE_DIE5
-    {SPR_VILE,21,7,{NULL},S_VILE_DIE7,0,0},	// S_VILE_DIE6
-    {SPR_VILE,22,7,{NULL},S_VILE_DIE8,0,0},	// S_VILE_DIE7
-    {SPR_VILE,23,5,{NULL},S_VILE_DIE9,0,0},	// S_VILE_DIE8
-    {SPR_VILE,24,5,{NULL},S_VILE_DIE10,0,0},	// S_VILE_DIE9
-    {SPR_VILE,25,-1,{NULL},S_NULL,0,0},	// S_VILE_DIE10
-    {SPR_FIRE,32768,2,{A_StartFire},S_FIRE2,0,0},	// S_FIRE1
-    {SPR_FIRE,32769,2,{A_Fire},S_FIRE3,0,0},	// S_FIRE2
-    {SPR_FIRE,32768,2,{A_Fire},S_FIRE4,0,0},	// S_FIRE3
-    {SPR_FIRE,32769,2,{A_Fire},S_FIRE5,0,0},	// S_FIRE4
-    {SPR_FIRE,32770,2,{A_FireCrackle},S_FIRE6,0,0},	// S_FIRE5
-    {SPR_FIRE,32769,2,{A_Fire},S_FIRE7,0,0},	// S_FIRE6
-    {SPR_FIRE,32770,2,{A_Fire},S_FIRE8,0,0},	// S_FIRE7
-    {SPR_FIRE,32769,2,{A_Fire},S_FIRE9,0,0},	// S_FIRE8
-    {SPR_FIRE,32770,2,{A_Fire},S_FIRE10,0,0},	// S_FIRE9
-    {SPR_FIRE,32771,2,{A_Fire},S_FIRE11,0,0},	// S_FIRE10
-    {SPR_FIRE,32770,2,{A_Fire},S_FIRE12,0,0},	// S_FIRE11
-    {SPR_FIRE,32771,2,{A_Fire},S_FIRE13,0,0},	// S_FIRE12
-    {SPR_FIRE,32770,2,{A_Fire},S_FIRE14,0,0},	// S_FIRE13
-    {SPR_FIRE,32771,2,{A_Fire},S_FIRE15,0,0},	// S_FIRE14
-    {SPR_FIRE,32772,2,{A_Fire},S_FIRE16,0,0},	// S_FIRE15
-    {SPR_FIRE,32771,2,{A_Fire},S_FIRE17,0,0},	// S_FIRE16
-    {SPR_FIRE,32772,2,{A_Fire},S_FIRE18,0,0},	// S_FIRE17
-    {SPR_FIRE,32771,2,{A_Fire},S_FIRE19,0,0},	// S_FIRE18
-    {SPR_FIRE,32772,2,{A_FireCrackle},S_FIRE20,0,0},	// S_FIRE19
-    {SPR_FIRE,32773,2,{A_Fire},S_FIRE21,0,0},	// S_FIRE20
-    {SPR_FIRE,32772,2,{A_Fire},S_FIRE22,0,0},	// S_FIRE21
-    {SPR_FIRE,32773,2,{A_Fire},S_FIRE23,0,0},	// S_FIRE22
-    {SPR_FIRE,32772,2,{A_Fire},S_FIRE24,0,0},	// S_FIRE23
-    {SPR_FIRE,32773,2,{A_Fire},S_FIRE25,0,0},	// S_FIRE24
-    {SPR_FIRE,32774,2,{A_Fire},S_FIRE26,0,0},	// S_FIRE25
-    {SPR_FIRE,32775,2,{A_Fire},S_FIRE27,0,0},	// S_FIRE26
-    {SPR_FIRE,32774,2,{A_Fire},S_FIRE28,0,0},	// S_FIRE27
-    {SPR_FIRE,32775,2,{A_Fire},S_FIRE29,0,0},	// S_FIRE28
-    {SPR_FIRE,32774,2,{A_Fire},S_FIRE30,0,0},	// S_FIRE29
-    {SPR_FIRE,32775,2,{A_Fire},S_NULL,0,0},	// S_FIRE30
-    {SPR_PUFF,1,4,{NULL},S_SMOKE2,0,0},	// S_SMOKE1
-    {SPR_PUFF,2,4,{NULL},S_SMOKE3,0,0},	// S_SMOKE2
-    {SPR_PUFF,1,4,{NULL},S_SMOKE4,0,0},	// S_SMOKE3
-    {SPR_PUFF,2,4,{NULL},S_SMOKE5,0,0},	// S_SMOKE4
-    {SPR_PUFF,3,4,{NULL},S_NULL,0,0},	// S_SMOKE5
-    {SPR_FATB,32768,2,{A_Tracer},S_TRACER2,0,0},	// S_TRACER
-    {SPR_FATB,32769,2,{A_Tracer},S_TRACER,0,0},	// S_TRACER2
-    {SPR_FBXP,32768,8,{NULL},S_TRACEEXP2,0,0},	// S_TRACEEXP1
-    {SPR_FBXP,32769,6,{NULL},S_TRACEEXP3,0,0},	// S_TRACEEXP2
-    {SPR_FBXP,32770,4,{NULL},S_NULL,0,0},	// S_TRACEEXP3
-    {SPR_SKEL,0,10,{A_Look},S_SKEL_STND2,0,0},	// S_SKEL_STND
-    {SPR_SKEL,1,10,{A_Look},S_SKEL_STND,0,0},	// S_SKEL_STND2
-    {SPR_SKEL,0,2,{A_Chase},S_SKEL_RUN2,0,0},	// S_SKEL_RUN1
-    {SPR_SKEL,0,2,{A_Chase},S_SKEL_RUN3,0,0},	// S_SKEL_RUN2
-    {SPR_SKEL,1,2,{A_Chase},S_SKEL_RUN4,0,0},	// S_SKEL_RUN3
-    {SPR_SKEL,1,2,{A_Chase},S_SKEL_RUN5,0,0},	// S_SKEL_RUN4
-    {SPR_SKEL,2,2,{A_Chase},S_SKEL_RUN6,0,0},	// S_SKEL_RUN5
-    {SPR_SKEL,2,2,{A_Chase},S_SKEL_RUN7,0,0},	// S_SKEL_RUN6
-    {SPR_SKEL,3,2,{A_Chase},S_SKEL_RUN8,0,0},	// S_SKEL_RUN7
-    {SPR_SKEL,3,2,{A_Chase},S_SKEL_RUN9,0,0},	// S_SKEL_RUN8
-    {SPR_SKEL,4,2,{A_Chase},S_SKEL_RUN10,0,0},	// S_SKEL_RUN9
-    {SPR_SKEL,4,2,{A_Chase},S_SKEL_RUN11,0,0},	// S_SKEL_RUN10
-    {SPR_SKEL,5,2,{A_Chase},S_SKEL_RUN12,0,0},	// S_SKEL_RUN11
-    {SPR_SKEL,5,2,{A_Chase},S_SKEL_RUN1,0,0},	// S_SKEL_RUN12
-    {SPR_SKEL,6,0,{A_FaceTarget},S_SKEL_FIST2,0,0},	// S_SKEL_FIST1
-    {SPR_SKEL,6,6,{A_SkelWhoosh},S_SKEL_FIST3,0,0},	// S_SKEL_FIST2
-    {SPR_SKEL,7,6,{A_FaceTarget},S_SKEL_FIST4,0,0},	// S_SKEL_FIST3
-    {SPR_SKEL,8,6,{A_SkelFist},S_SKEL_RUN1,0,0},	// S_SKEL_FIST4
-    {SPR_SKEL,32777,0,{A_FaceTarget},S_SKEL_MISS2,0,0},	// S_SKEL_MISS1
-    {SPR_SKEL,32777,10,{A_FaceTarget},S_SKEL_MISS3,0,0},	// S_SKEL_MISS2
-    {SPR_SKEL,10,10,{A_SkelMissile},S_SKEL_MISS4,0,0},	// S_SKEL_MISS3
-    {SPR_SKEL,10,10,{A_FaceTarget},S_SKEL_RUN1,0,0},	// S_SKEL_MISS4
-    {SPR_SKEL,11,5,{NULL},S_SKEL_PAIN2,0,0},	// S_SKEL_PAIN
-    {SPR_SKEL,11,5,{A_Pain},S_SKEL_RUN1,0,0},	// S_SKEL_PAIN2
-    {SPR_SKEL,11,7,{NULL},S_SKEL_DIE2,0,0},	// S_SKEL_DIE1
-    {SPR_SKEL,12,7,{NULL},S_SKEL_DIE3,0,0},	// S_SKEL_DIE2
-    {SPR_SKEL,13,7,{A_Scream},S_SKEL_DIE4,0,0},	// S_SKEL_DIE3
-    {SPR_SKEL,14,7,{A_Fall},S_SKEL_DIE5,0,0},	// S_SKEL_DIE4
-    {SPR_SKEL,15,7,{NULL},S_SKEL_DIE6,0,0},	// S_SKEL_DIE5
-    {SPR_SKEL,16,-1,{NULL},S_NULL,0,0},	// S_SKEL_DIE6
-    {SPR_SKEL,16,5,{NULL},S_SKEL_RAISE2,0,0},	// S_SKEL_RAISE1
-    {SPR_SKEL,15,5,{NULL},S_SKEL_RAISE3,0,0},	// S_SKEL_RAISE2
-    {SPR_SKEL,14,5,{NULL},S_SKEL_RAISE4,0,0},	// S_SKEL_RAISE3
-    {SPR_SKEL,13,5,{NULL},S_SKEL_RAISE5,0,0},	// S_SKEL_RAISE4
-    {SPR_SKEL,12,5,{NULL},S_SKEL_RAISE6,0,0},	// S_SKEL_RAISE5
-    {SPR_SKEL,11,5,{NULL},S_SKEL_RUN1,0,0},	// S_SKEL_RAISE6
-    {SPR_MANF,32768,4,{NULL},S_FATSHOT2,0,0},	// S_FATSHOT1
-    {SPR_MANF,32769,4,{NULL},S_FATSHOT1,0,0},	// S_FATSHOT2
-    {SPR_MISL,32769,8,{NULL},S_FATSHOTX2,0,0},	// S_FATSHOTX1
-    {SPR_MISL,32770,6,{NULL},S_FATSHOTX3,0,0},	// S_FATSHOTX2
-    {SPR_MISL,32771,4,{NULL},S_NULL,0,0},	// S_FATSHOTX3
-    {SPR_FATT,0,15,{A_Look},S_FATT_STND2,0,0},	// S_FATT_STND
-    {SPR_FATT,1,15,{A_Look},S_FATT_STND,0,0},	// S_FATT_STND2
-    {SPR_FATT,0,4,{A_Chase},S_FATT_RUN2,0,0},	// S_FATT_RUN1
-    {SPR_FATT,0,4,{A_Chase},S_FATT_RUN3,0,0},	// S_FATT_RUN2
-    {SPR_FATT,1,4,{A_Chase},S_FATT_RUN4,0,0},	// S_FATT_RUN3
-    {SPR_FATT,1,4,{A_Chase},S_FATT_RUN5,0,0},	// S_FATT_RUN4
-    {SPR_FATT,2,4,{A_Chase},S_FATT_RUN6,0,0},	// S_FATT_RUN5
-    {SPR_FATT,2,4,{A_Chase},S_FATT_RUN7,0,0},	// S_FATT_RUN6
-    {SPR_FATT,3,4,{A_Chase},S_FATT_RUN8,0,0},	// S_FATT_RUN7
-    {SPR_FATT,3,4,{A_Chase},S_FATT_RUN9,0,0},	// S_FATT_RUN8
-    {SPR_FATT,4,4,{A_Chase},S_FATT_RUN10,0,0},	// S_FATT_RUN9
-    {SPR_FATT,4,4,{A_Chase},S_FATT_RUN11,0,0},	// S_FATT_RUN10
-    {SPR_FATT,5,4,{A_Chase},S_FATT_RUN12,0,0},	// S_FATT_RUN11
-    {SPR_FATT,5,4,{A_Chase},S_FATT_RUN1,0,0},	// S_FATT_RUN12
-    {SPR_FATT,6,20,{A_FatRaise},S_FATT_ATK2,0,0},	// S_FATT_ATK1
-    {SPR_FATT,32775,10,{A_FatAttack1},S_FATT_ATK3,0,0},	// S_FATT_ATK2
-    {SPR_FATT,8,5,{A_FaceTarget},S_FATT_ATK4,0,0},	// S_FATT_ATK3
-    {SPR_FATT,6,5,{A_FaceTarget},S_FATT_ATK5,0,0},	// S_FATT_ATK4
-    {SPR_FATT,32775,10,{A_FatAttack2},S_FATT_ATK6,0,0},	// S_FATT_ATK5
-    {SPR_FATT,8,5,{A_FaceTarget},S_FATT_ATK7,0,0},	// S_FATT_ATK6
-    {SPR_FATT,6,5,{A_FaceTarget},S_FATT_ATK8,0,0},	// S_FATT_ATK7
-    {SPR_FATT,32775,10,{A_FatAttack3},S_FATT_ATK9,0,0},	// S_FATT_ATK8
-    {SPR_FATT,8,5,{A_FaceTarget},S_FATT_ATK10,0,0},	// S_FATT_ATK9
-    {SPR_FATT,6,5,{A_FaceTarget},S_FATT_RUN1,0,0},	// S_FATT_ATK10
-    {SPR_FATT,9,3,{NULL},S_FATT_PAIN2,0,0},	// S_FATT_PAIN
-    {SPR_FATT,9,3,{A_Pain},S_FATT_RUN1,0,0},	// S_FATT_PAIN2
-    {SPR_FATT,10,6,{NULL},S_FATT_DIE2,0,0},	// S_FATT_DIE1
-    {SPR_FATT,11,6,{A_Scream},S_FATT_DIE3,0,0},	// S_FATT_DIE2
-    {SPR_FATT,12,6,{A_Fall},S_FATT_DIE4,0,0},	// S_FATT_DIE3
-    {SPR_FATT,13,6,{NULL},S_FATT_DIE5,0,0},	// S_FATT_DIE4
-    {SPR_FATT,14,6,{NULL},S_FATT_DIE6,0,0},	// S_FATT_DIE5
-    {SPR_FATT,15,6,{NULL},S_FATT_DIE7,0,0},	// S_FATT_DIE6
-    {SPR_FATT,16,6,{NULL},S_FATT_DIE8,0,0},	// S_FATT_DIE7
-    {SPR_FATT,17,6,{NULL},S_FATT_DIE9,0,0},	// S_FATT_DIE8
-    {SPR_FATT,18,6,{NULL},S_FATT_DIE10,0,0},	// S_FATT_DIE9
-    {SPR_FATT,19,-1,{A_BossDeath},S_NULL,0,0},	// S_FATT_DIE10
-    {SPR_FATT,17,5,{NULL},S_FATT_RAISE2,0,0},	// S_FATT_RAISE1
-    {SPR_FATT,16,5,{NULL},S_FATT_RAISE3,0,0},	// S_FATT_RAISE2
-    {SPR_FATT,15,5,{NULL},S_FATT_RAISE4,0,0},	// S_FATT_RAISE3
-    {SPR_FATT,14,5,{NULL},S_FATT_RAISE5,0,0},	// S_FATT_RAISE4
-    {SPR_FATT,13,5,{NULL},S_FATT_RAISE6,0,0},	// S_FATT_RAISE5
-    {SPR_FATT,12,5,{NULL},S_FATT_RAISE7,0,0},	// S_FATT_RAISE6
-    {SPR_FATT,11,5,{NULL},S_FATT_RAISE8,0,0},	// S_FATT_RAISE7
-    {SPR_FATT,10,5,{NULL},S_FATT_RUN1,0,0},	// S_FATT_RAISE8
-    {SPR_CPOS,0,10,{A_Look},S_CPOS_STND2,0,0},	// S_CPOS_STND
-    {SPR_CPOS,1,10,{A_Look},S_CPOS_STND,0,0},	// S_CPOS_STND2
-    {SPR_CPOS,0,3,{A_Chase},S_CPOS_RUN2,0,0},	// S_CPOS_RUN1
-    {SPR_CPOS,0,3,{A_Chase},S_CPOS_RUN3,0,0},	// S_CPOS_RUN2
-    {SPR_CPOS,1,3,{A_Chase},S_CPOS_RUN4,0,0},	// S_CPOS_RUN3
-    {SPR_CPOS,1,3,{A_Chase},S_CPOS_RUN5,0,0},	// S_CPOS_RUN4
-    {SPR_CPOS,2,3,{A_Chase},S_CPOS_RUN6,0,0},	// S_CPOS_RUN5
-    {SPR_CPOS,2,3,{A_Chase},S_CPOS_RUN7,0,0},	// S_CPOS_RUN6
-    {SPR_CPOS,3,3,{A_Chase},S_CPOS_RUN8,0,0},	// S_CPOS_RUN7
-    {SPR_CPOS,3,3,{A_Chase},S_CPOS_RUN1,0,0},	// S_CPOS_RUN8
-    {SPR_CPOS,4,10,{A_FaceTarget},S_CPOS_ATK2,0,0},	// S_CPOS_ATK1
-    {SPR_CPOS,32773,4,{A_CPosAttack},S_CPOS_ATK3,0,0},	// S_CPOS_ATK2
-    {SPR_CPOS,32772,4,{A_CPosAttack},S_CPOS_ATK4,0,0},	// S_CPOS_ATK3
-    {SPR_CPOS,5,1,{A_CPosRefire},S_CPOS_ATK2,0,0},	// S_CPOS_ATK4
-    {SPR_CPOS,6,3,{NULL},S_CPOS_PAIN2,0,0},	// S_CPOS_PAIN
-    {SPR_CPOS,6,3,{A_Pain},S_CPOS_RUN1,0,0},	// S_CPOS_PAIN2
-    {SPR_CPOS,7,5,{NULL},S_CPOS_DIE2,0,0},	// S_CPOS_DIE1
-    {SPR_CPOS,8,5,{A_Scream},S_CPOS_DIE3,0,0},	// S_CPOS_DIE2
-    {SPR_CPOS,9,5,{A_Fall},S_CPOS_DIE4,0,0},	// S_CPOS_DIE3
-    {SPR_CPOS,10,5,{NULL},S_CPOS_DIE5,0,0},	// S_CPOS_DIE4
-    {SPR_CPOS,11,5,{NULL},S_CPOS_DIE6,0,0},	// S_CPOS_DIE5
-    {SPR_CPOS,12,5,{NULL},S_CPOS_DIE7,0,0},	// S_CPOS_DIE6
-    {SPR_CPOS,13,-1,{NULL},S_NULL,0,0},	// S_CPOS_DIE7
-    {SPR_CPOS,14,5,{NULL},S_CPOS_XDIE2,0,0},	// S_CPOS_XDIE1
-    {SPR_CPOS,15,5,{A_XScream},S_CPOS_XDIE3,0,0},	// S_CPOS_XDIE2
-    {SPR_CPOS,16,5,{A_Fall},S_CPOS_XDIE4,0,0},	// S_CPOS_XDIE3
-    {SPR_CPOS,17,5,{NULL},S_CPOS_XDIE5,0,0},	// S_CPOS_XDIE4
-    {SPR_CPOS,18,5,{NULL},S_CPOS_XDIE6,0,0},	// S_CPOS_XDIE5
-    {SPR_CPOS,19,-1,{NULL},S_NULL,0,0},	// S_CPOS_XDIE6
-    {SPR_CPOS,13,5,{NULL},S_CPOS_RAISE2,0,0},	// S_CPOS_RAISE1
-    {SPR_CPOS,12,5,{NULL},S_CPOS_RAISE3,0,0},	// S_CPOS_RAISE2
-    {SPR_CPOS,11,5,{NULL},S_CPOS_RAISE4,0,0},	// S_CPOS_RAISE3
-    {SPR_CPOS,10,5,{NULL},S_CPOS_RAISE5,0,0},	// S_CPOS_RAISE4
-    {SPR_CPOS,9,5,{NULL},S_CPOS_RAISE6,0,0},	// S_CPOS_RAISE5
-    {SPR_CPOS,8,5,{NULL},S_CPOS_RAISE7,0,0},	// S_CPOS_RAISE6
-    {SPR_CPOS,7,5,{NULL},S_CPOS_RUN1,0,0},	// S_CPOS_RAISE7
-    {SPR_TROO,0,10,{A_Look},S_TROO_STND2,0,0},	// S_TROO_STND
-    {SPR_TROO,1,10,{A_Look},S_TROO_STND,0,0},	// S_TROO_STND2
-    {SPR_TROO,0,3,{A_Chase},S_TROO_RUN2,0,0},	// S_TROO_RUN1
-    {SPR_TROO,0,3,{A_Chase},S_TROO_RUN3,0,0},	// S_TROO_RUN2
-    {SPR_TROO,1,3,{A_Chase},S_TROO_RUN4,0,0},	// S_TROO_RUN3
-    {SPR_TROO,1,3,{A_Chase},S_TROO_RUN5,0,0},	// S_TROO_RUN4
-    {SPR_TROO,2,3,{A_Chase},S_TROO_RUN6,0,0},	// S_TROO_RUN5
-    {SPR_TROO,2,3,{A_Chase},S_TROO_RUN7,0,0},	// S_TROO_RUN6
-    {SPR_TROO,3,3,{A_Chase},S_TROO_RUN8,0,0},	// S_TROO_RUN7
-    {SPR_TROO,3,3,{A_Chase},S_TROO_RUN1,0,0},	// S_TROO_RUN8
-    {SPR_TROO,4,8,{A_FaceTarget},S_TROO_ATK2,0,0},	// S_TROO_ATK1
-    {SPR_TROO,5,8,{A_FaceTarget},S_TROO_ATK3,0,0},	// S_TROO_ATK2
-    {SPR_TROO,6,6,{A_TroopAttack},S_TROO_RUN1,0,0},	// S_TROO_ATK3
-    {SPR_TROO,7,2,{NULL},S_TROO_PAIN2,0,0},	// S_TROO_PAIN
-    {SPR_TROO,7,2,{A_Pain},S_TROO_RUN1,0,0},	// S_TROO_PAIN2
-    {SPR_TROO,8,8,{NULL},S_TROO_DIE2,0,0},	// S_TROO_DIE1
-    {SPR_TROO,9,8,{A_Scream},S_TROO_DIE3,0,0},	// S_TROO_DIE2
-    {SPR_TROO,10,6,{NULL},S_TROO_DIE4,0,0},	// S_TROO_DIE3
-    {SPR_TROO,11,6,{A_Fall},S_TROO_DIE5,0,0},	// S_TROO_DIE4
-    {SPR_TROO,12,-1,{NULL},S_NULL,0,0},	// S_TROO_DIE5
-    {SPR_TROO,13,5,{NULL},S_TROO_XDIE2,0,0},	// S_TROO_XDIE1
-    {SPR_TROO,14,5,{A_XScream},S_TROO_XDIE3,0,0},	// S_TROO_XDIE2
-    {SPR_TROO,15,5,{NULL},S_TROO_XDIE4,0,0},	// S_TROO_XDIE3
-    {SPR_TROO,16,5,{A_Fall},S_TROO_XDIE5,0,0},	// S_TROO_XDIE4
-    {SPR_TROO,17,5,{NULL},S_TROO_XDIE6,0,0},	// S_TROO_XDIE5
-    {SPR_TROO,18,5,{NULL},S_TROO_XDIE7,0,0},	// S_TROO_XDIE6
-    {SPR_TROO,19,5,{NULL},S_TROO_XDIE8,0,0},	// S_TROO_XDIE7
-    {SPR_TROO,20,-1,{NULL},S_NULL,0,0},	// S_TROO_XDIE8
-    {SPR_TROO,12,8,{NULL},S_TROO_RAISE2,0,0},	// S_TROO_RAISE1
-    {SPR_TROO,11,8,{NULL},S_TROO_RAISE3,0,0},	// S_TROO_RAISE2
-    {SPR_TROO,10,6,{NULL},S_TROO_RAISE4,0,0},	// S_TROO_RAISE3
-    {SPR_TROO,9,6,{NULL},S_TROO_RAISE5,0,0},	// S_TROO_RAISE4
-    {SPR_TROO,8,6,{NULL},S_TROO_RUN1,0,0},	// S_TROO_RAISE5
-    {SPR_SARG,0,10,{A_Look},S_SARG_STND2,0,0},	// S_SARG_STND
-    {SPR_SARG,1,10,{A_Look},S_SARG_STND,0,0},	// S_SARG_STND2
-    {SPR_SARG,0,2,{A_Chase},S_SARG_RUN2,0,0},	// S_SARG_RUN1
-    {SPR_SARG,0,2,{A_Chase},S_SARG_RUN3,0,0},	// S_SARG_RUN2
-    {SPR_SARG,1,2,{A_Chase},S_SARG_RUN4,0,0},	// S_SARG_RUN3
-    {SPR_SARG,1,2,{A_Chase},S_SARG_RUN5,0,0},	// S_SARG_RUN4
-    {SPR_SARG,2,2,{A_Chase},S_SARG_RUN6,0,0},	// S_SARG_RUN5
-    {SPR_SARG,2,2,{A_Chase},S_SARG_RUN7,0,0},	// S_SARG_RUN6
-    {SPR_SARG,3,2,{A_Chase},S_SARG_RUN8,0,0},	// S_SARG_RUN7
-    {SPR_SARG,3,2,{A_Chase},S_SARG_RUN1,0,0},	// S_SARG_RUN8
-    {SPR_SARG,4,8,{A_FaceTarget},S_SARG_ATK2,0,0},	// S_SARG_ATK1
-    {SPR_SARG,5,8,{A_FaceTarget},S_SARG_ATK3,0,0},	// S_SARG_ATK2
-    {SPR_SARG,6,8,{A_SargAttack},S_SARG_RUN1,0,0},	// S_SARG_ATK3
-    {SPR_SARG,7,2,{NULL},S_SARG_PAIN2,0,0},	// S_SARG_PAIN
-    {SPR_SARG,7,2,{A_Pain},S_SARG_RUN1,0,0},	// S_SARG_PAIN2
-    {SPR_SARG,8,8,{NULL},S_SARG_DIE2,0,0},	// S_SARG_DIE1
-    {SPR_SARG,9,8,{A_Scream},S_SARG_DIE3,0,0},	// S_SARG_DIE2
-    {SPR_SARG,10,4,{NULL},S_SARG_DIE4,0,0},	// S_SARG_DIE3
-    {SPR_SARG,11,4,{A_Fall},S_SARG_DIE5,0,0},	// S_SARG_DIE4
-    {SPR_SARG,12,4,{NULL},S_SARG_DIE6,0,0},	// S_SARG_DIE5
-    {SPR_SARG,13,-1,{NULL},S_NULL,0,0},	// S_SARG_DIE6
-    {SPR_SARG,13,5,{NULL},S_SARG_RAISE2,0,0},	// S_SARG_RAISE1
-    {SPR_SARG,12,5,{NULL},S_SARG_RAISE3,0,0},	// S_SARG_RAISE2
-    {SPR_SARG,11,5,{NULL},S_SARG_RAISE4,0,0},	// S_SARG_RAISE3
-    {SPR_SARG,10,5,{NULL},S_SARG_RAISE5,0,0},	// S_SARG_RAISE4
-    {SPR_SARG,9,5,{NULL},S_SARG_RAISE6,0,0},	// S_SARG_RAISE5
-    {SPR_SARG,8,5,{NULL},S_SARG_RUN1,0,0},	// S_SARG_RAISE6
-    {SPR_HEAD,0,10,{A_Look},S_HEAD_STND,0,0},	// S_HEAD_STND
-    {SPR_HEAD,0,3,{A_Chase},S_HEAD_RUN1,0,0},	// S_HEAD_RUN1
-    {SPR_HEAD,1,5,{A_FaceTarget},S_HEAD_ATK2,0,0},	// S_HEAD_ATK1
-    {SPR_HEAD,2,5,{A_FaceTarget},S_HEAD_ATK3,0,0},	// S_HEAD_ATK2
-    {SPR_HEAD,32771,5,{A_HeadAttack},S_HEAD_RUN1,0,0},	// S_HEAD_ATK3
-    {SPR_HEAD,4,3,{NULL},S_HEAD_PAIN2,0,0},	// S_HEAD_PAIN
-    {SPR_HEAD,4,3,{A_Pain},S_HEAD_PAIN3,0,0},	// S_HEAD_PAIN2
-    {SPR_HEAD,5,6,{NULL},S_HEAD_RUN1,0,0},	// S_HEAD_PAIN3
-    {SPR_HEAD,6,8,{NULL},S_HEAD_DIE2,0,0},	// S_HEAD_DIE1
-    {SPR_HEAD,7,8,{A_Scream},S_HEAD_DIE3,0,0},	// S_HEAD_DIE2
-    {SPR_HEAD,8,8,{NULL},S_HEAD_DIE4,0,0},	// S_HEAD_DIE3
-    {SPR_HEAD,9,8,{NULL},S_HEAD_DIE5,0,0},	// S_HEAD_DIE4
-    {SPR_HEAD,10,8,{A_Fall},S_HEAD_DIE6,0,0},	// S_HEAD_DIE5
-    {SPR_HEAD,11,-1,{NULL},S_NULL,0,0},	// S_HEAD_DIE6
-    {SPR_HEAD,11,8,{NULL},S_HEAD_RAISE2,0,0},	// S_HEAD_RAISE1
-    {SPR_HEAD,10,8,{NULL},S_HEAD_RAISE3,0,0},	// S_HEAD_RAISE2
-    {SPR_HEAD,9,8,{NULL},S_HEAD_RAISE4,0,0},	// S_HEAD_RAISE3
-    {SPR_HEAD,8,8,{NULL},S_HEAD_RAISE5,0,0},	// S_HEAD_RAISE4
-    {SPR_HEAD,7,8,{NULL},S_HEAD_RAISE6,0,0},	// S_HEAD_RAISE5
-    {SPR_HEAD,6,8,{NULL},S_HEAD_RUN1,0,0},	// S_HEAD_RAISE6
-    {SPR_BAL7,32768,4,{NULL},S_BRBALL2,0,0},	// S_BRBALL1
-    {SPR_BAL7,32769,4,{NULL},S_BRBALL1,0,0},	// S_BRBALL2
-    {SPR_BAL7,32770,6,{NULL},S_BRBALLX2,0,0},	// S_BRBALLX1
-    {SPR_BAL7,32771,6,{NULL},S_BRBALLX3,0,0},	// S_BRBALLX2
-    {SPR_BAL7,32772,6,{NULL},S_NULL,0,0},	// S_BRBALLX3
-    {SPR_BOSS,0,10,{A_Look},S_BOSS_STND2,0,0},	// S_BOSS_STND
-    {SPR_BOSS,1,10,{A_Look},S_BOSS_STND,0,0},	// S_BOSS_STND2
-    {SPR_BOSS,0,3,{A_Chase},S_BOSS_RUN2,0,0},	// S_BOSS_RUN1
-    {SPR_BOSS,0,3,{A_Chase},S_BOSS_RUN3,0,0},	// S_BOSS_RUN2
-    {SPR_BOSS,1,3,{A_Chase},S_BOSS_RUN4,0,0},	// S_BOSS_RUN3
-    {SPR_BOSS,1,3,{A_Chase},S_BOSS_RUN5,0,0},	// S_BOSS_RUN4
-    {SPR_BOSS,2,3,{A_Chase},S_BOSS_RUN6,0,0},	// S_BOSS_RUN5
-    {SPR_BOSS,2,3,{A_Chase},S_BOSS_RUN7,0,0},	// S_BOSS_RUN6
-    {SPR_BOSS,3,3,{A_Chase},S_BOSS_RUN8,0,0},	// S_BOSS_RUN7
-    {SPR_BOSS,3,3,{A_Chase},S_BOSS_RUN1,0,0},	// S_BOSS_RUN8
-    {SPR_BOSS,4,8,{A_FaceTarget},S_BOSS_ATK2,0,0},	// S_BOSS_ATK1
-    {SPR_BOSS,5,8,{A_FaceTarget},S_BOSS_ATK3,0,0},	// S_BOSS_ATK2
-    {SPR_BOSS,6,8,{A_BruisAttack},S_BOSS_RUN1,0,0},	// S_BOSS_ATK3
-    {SPR_BOSS,7,2,{NULL},S_BOSS_PAIN2,0,0},	// S_BOSS_PAIN
-    {SPR_BOSS,7,2,{A_Pain},S_BOSS_RUN1,0,0},	// S_BOSS_PAIN2
-    {SPR_BOSS,8,8,{NULL},S_BOSS_DIE2,0,0},	// S_BOSS_DIE1
-    {SPR_BOSS,9,8,{A_Scream},S_BOSS_DIE3,0,0},	// S_BOSS_DIE2
-    {SPR_BOSS,10,8,{NULL},S_BOSS_DIE4,0,0},	// S_BOSS_DIE3
-    {SPR_BOSS,11,8,{A_Fall},S_BOSS_DIE5,0,0},	// S_BOSS_DIE4
-    {SPR_BOSS,12,8,{NULL},S_BOSS_DIE6,0,0},	// S_BOSS_DIE5
-    {SPR_BOSS,13,8,{NULL},S_BOSS_DIE7,0,0},	// S_BOSS_DIE6
-    {SPR_BOSS,14,-1,{A_BossDeath},S_NULL,0,0},	// S_BOSS_DIE7
-    {SPR_BOSS,14,8,{NULL},S_BOSS_RAISE2,0,0},	// S_BOSS_RAISE1
-    {SPR_BOSS,13,8,{NULL},S_BOSS_RAISE3,0,0},	// S_BOSS_RAISE2
-    {SPR_BOSS,12,8,{NULL},S_BOSS_RAISE4,0,0},	// S_BOSS_RAISE3
-    {SPR_BOSS,11,8,{NULL},S_BOSS_RAISE5,0,0},	// S_BOSS_RAISE4
-    {SPR_BOSS,10,8,{NULL},S_BOSS_RAISE6,0,0},	// S_BOSS_RAISE5
-    {SPR_BOSS,9,8,{NULL},S_BOSS_RAISE7,0,0},	// S_BOSS_RAISE6
-    {SPR_BOSS,8,8,{NULL},S_BOSS_RUN1,0,0},	// S_BOSS_RAISE7
-    {SPR_BOS2,0,10,{A_Look},S_BOS2_STND2,0,0},	// S_BOS2_STND
-    {SPR_BOS2,1,10,{A_Look},S_BOS2_STND,0,0},	// S_BOS2_STND2
-    {SPR_BOS2,0,3,{A_Chase},S_BOS2_RUN2,0,0},	// S_BOS2_RUN1
-    {SPR_BOS2,0,3,{A_Chase},S_BOS2_RUN3,0,0},	// S_BOS2_RUN2
-    {SPR_BOS2,1,3,{A_Chase},S_BOS2_RUN4,0,0},	// S_BOS2_RUN3
-    {SPR_BOS2,1,3,{A_Chase},S_BOS2_RUN5,0,0},	// S_BOS2_RUN4
-    {SPR_BOS2,2,3,{A_Chase},S_BOS2_RUN6,0,0},	// S_BOS2_RUN5
-    {SPR_BOS2,2,3,{A_Chase},S_BOS2_RUN7,0,0},	// S_BOS2_RUN6
-    {SPR_BOS2,3,3,{A_Chase},S_BOS2_RUN8,0,0},	// S_BOS2_RUN7
-    {SPR_BOS2,3,3,{A_Chase},S_BOS2_RUN1,0,0},	// S_BOS2_RUN8
-    {SPR_BOS2,4,8,{A_FaceTarget},S_BOS2_ATK2,0,0},	// S_BOS2_ATK1
-    {SPR_BOS2,5,8,{A_FaceTarget},S_BOS2_ATK3,0,0},	// S_BOS2_ATK2
-    {SPR_BOS2,6,8,{A_BruisAttack},S_BOS2_RUN1,0,0},	// S_BOS2_ATK3
-    {SPR_BOS2,7,2,{NULL},S_BOS2_PAIN2,0,0},	// S_BOS2_PAIN
-    {SPR_BOS2,7,2,{A_Pain},S_BOS2_RUN1,0,0},	// S_BOS2_PAIN2
-    {SPR_BOS2,8,8,{NULL},S_BOS2_DIE2,0,0},	// S_BOS2_DIE1
-    {SPR_BOS2,9,8,{A_Scream},S_BOS2_DIE3,0,0},	// S_BOS2_DIE2
-    {SPR_BOS2,10,8,{NULL},S_BOS2_DIE4,0,0},	// S_BOS2_DIE3
-    {SPR_BOS2,11,8,{A_Fall},S_BOS2_DIE5,0,0},	// S_BOS2_DIE4
-    {SPR_BOS2,12,8,{NULL},S_BOS2_DIE6,0,0},	// S_BOS2_DIE5
-    {SPR_BOS2,13,8,{NULL},S_BOS2_DIE7,0,0},	// S_BOS2_DIE6
-    {SPR_BOS2,14,-1,{NULL},S_NULL,0,0},	// S_BOS2_DIE7
-    {SPR_BOS2,14,8,{NULL},S_BOS2_RAISE2,0,0},	// S_BOS2_RAISE1
-    {SPR_BOS2,13,8,{NULL},S_BOS2_RAISE3,0,0},	// S_BOS2_RAISE2
-    {SPR_BOS2,12,8,{NULL},S_BOS2_RAISE4,0,0},	// S_BOS2_RAISE3
-    {SPR_BOS2,11,8,{NULL},S_BOS2_RAISE5,0,0},	// S_BOS2_RAISE4
-    {SPR_BOS2,10,8,{NULL},S_BOS2_RAISE6,0,0},	// S_BOS2_RAISE5
-    {SPR_BOS2,9,8,{NULL},S_BOS2_RAISE7,0,0},	// S_BOS2_RAISE6
-    {SPR_BOS2,8,8,{NULL},S_BOS2_RUN1,0,0},	// S_BOS2_RAISE7
-    {SPR_SKUL,32768,10,{A_Look},S_SKULL_STND2,0,0},	// S_SKULL_STND
-    {SPR_SKUL,32769,10,{A_Look},S_SKULL_STND,0,0},	// S_SKULL_STND2
-    {SPR_SKUL,32768,6,{A_Chase},S_SKULL_RUN2,0,0},	// S_SKULL_RUN1
-    {SPR_SKUL,32769,6,{A_Chase},S_SKULL_RUN1,0,0},	// S_SKULL_RUN2
-    {SPR_SKUL,32770,10,{A_FaceTarget},S_SKULL_ATK2,0,0},	// S_SKULL_ATK1
-    {SPR_SKUL,32771,4,{A_SkullAttack},S_SKULL_ATK3,0,0},	// S_SKULL_ATK2
-    {SPR_SKUL,32770,4,{NULL},S_SKULL_ATK4,0,0},	// S_SKULL_ATK3
-    {SPR_SKUL,32771,4,{NULL},S_SKULL_ATK3,0,0},	// S_SKULL_ATK4
-    {SPR_SKUL,32772,3,{NULL},S_SKULL_PAIN2,0,0},	// S_SKULL_PAIN
-    {SPR_SKUL,32772,3,{A_Pain},S_SKULL_RUN1,0,0},	// S_SKULL_PAIN2
-    {SPR_SKUL,32773,6,{NULL},S_SKULL_DIE2,0,0},	// S_SKULL_DIE1
-    {SPR_SKUL,32774,6,{A_Scream},S_SKULL_DIE3,0,0},	// S_SKULL_DIE2
-    {SPR_SKUL,32775,6,{NULL},S_SKULL_DIE4,0,0},	// S_SKULL_DIE3
-    {SPR_SKUL,32776,6,{A_Fall},S_SKULL_DIE5,0,0},	// S_SKULL_DIE4
-    {SPR_SKUL,9,6,{NULL},S_SKULL_DIE6,0,0},	// S_SKULL_DIE5
-    {SPR_SKUL,10,6,{NULL},S_NULL,0,0},	// S_SKULL_DIE6
-    {SPR_SPID,0,10,{A_Look},S_SPID_STND2,0,0},	// S_SPID_STND
-    {SPR_SPID,1,10,{A_Look},S_SPID_STND,0,0},	// S_SPID_STND2
-    {SPR_SPID,0,3,{A_Metal},S_SPID_RUN2,0,0},	// S_SPID_RUN1
-    {SPR_SPID,0,3,{A_Chase},S_SPID_RUN3,0,0},	// S_SPID_RUN2
-    {SPR_SPID,1,3,{A_Chase},S_SPID_RUN4,0,0},	// S_SPID_RUN3
-    {SPR_SPID,1,3,{A_Chase},S_SPID_RUN5,0,0},	// S_SPID_RUN4
-    {SPR_SPID,2,3,{A_Metal},S_SPID_RUN6,0,0},	// S_SPID_RUN5
-    {SPR_SPID,2,3,{A_Chase},S_SPID_RUN7,0,0},	// S_SPID_RUN6
-    {SPR_SPID,3,3,{A_Chase},S_SPID_RUN8,0,0},	// S_SPID_RUN7
-    {SPR_SPID,3,3,{A_Chase},S_SPID_RUN9,0,0},	// S_SPID_RUN8
-    {SPR_SPID,4,3,{A_Metal},S_SPID_RUN10,0,0},	// S_SPID_RUN9
-    {SPR_SPID,4,3,{A_Chase},S_SPID_RUN11,0,0},	// S_SPID_RUN10
-    {SPR_SPID,5,3,{A_Chase},S_SPID_RUN12,0,0},	// S_SPID_RUN11
-    {SPR_SPID,5,3,{A_Chase},S_SPID_RUN1,0,0},	// S_SPID_RUN12
-    {SPR_SPID,32768,20,{A_FaceTarget},S_SPID_ATK2,0,0},	// S_SPID_ATK1
-    {SPR_SPID,32774,4,{A_SPosAttack},S_SPID_ATK3,0,0},	// S_SPID_ATK2
-    {SPR_SPID,32775,4,{A_SPosAttack},S_SPID_ATK4,0,0},	// S_SPID_ATK3
-    {SPR_SPID,32775,1,{A_SpidRefire},S_SPID_ATK2,0,0},	// S_SPID_ATK4
-    {SPR_SPID,8,3,{NULL},S_SPID_PAIN2,0,0},	// S_SPID_PAIN
-    {SPR_SPID,8,3,{A_Pain},S_SPID_RUN1,0,0},	// S_SPID_PAIN2
-    {SPR_SPID,9,20,{A_Scream},S_SPID_DIE2,0,0},	// S_SPID_DIE1
-    {SPR_SPID,10,10,{A_Fall},S_SPID_DIE3,0,0},	// S_SPID_DIE2
-    {SPR_SPID,11,10,{NULL},S_SPID_DIE4,0,0},	// S_SPID_DIE3
-    {SPR_SPID,12,10,{NULL},S_SPID_DIE5,0,0},	// S_SPID_DIE4
-    {SPR_SPID,13,10,{NULL},S_SPID_DIE6,0,0},	// S_SPID_DIE5
-    {SPR_SPID,14,10,{NULL},S_SPID_DIE7,0,0},	// S_SPID_DIE6
-    {SPR_SPID,15,10,{NULL},S_SPID_DIE8,0,0},	// S_SPID_DIE7
-    {SPR_SPID,16,10,{NULL},S_SPID_DIE9,0,0},	// S_SPID_DIE8
-    {SPR_SPID,17,10,{NULL},S_SPID_DIE10,0,0},	// S_SPID_DIE9
-    {SPR_SPID,18,30,{NULL},S_SPID_DIE11,0,0},	// S_SPID_DIE10
-    {SPR_SPID,18,-1,{A_BossDeath},S_NULL,0,0},	// S_SPID_DIE11
-    {SPR_BSPI,0,10,{A_Look},S_BSPI_STND2,0,0},	// S_BSPI_STND
-    {SPR_BSPI,1,10,{A_Look},S_BSPI_STND,0,0},	// S_BSPI_STND2
-    {SPR_BSPI,0,20,{NULL},S_BSPI_RUN1,0,0},	// S_BSPI_SIGHT
-    {SPR_BSPI,0,3,{A_BabyMetal},S_BSPI_RUN2,0,0},	// S_BSPI_RUN1
-    {SPR_BSPI,0,3,{A_Chase},S_BSPI_RUN3,0,0},	// S_BSPI_RUN2
-    {SPR_BSPI,1,3,{A_Chase},S_BSPI_RUN4,0,0},	// S_BSPI_RUN3
-    {SPR_BSPI,1,3,{A_Chase},S_BSPI_RUN5,0,0},	// S_BSPI_RUN4
-    {SPR_BSPI,2,3,{A_Chase},S_BSPI_RUN6,0,0},	// S_BSPI_RUN5
-    {SPR_BSPI,2,3,{A_Chase},S_BSPI_RUN7,0,0},	// S_BSPI_RUN6
-    {SPR_BSPI,3,3,{A_BabyMetal},S_BSPI_RUN8,0,0},	// S_BSPI_RUN7
-    {SPR_BSPI,3,3,{A_Chase},S_BSPI_RUN9,0,0},	// S_BSPI_RUN8
-    {SPR_BSPI,4,3,{A_Chase},S_BSPI_RUN10,0,0},	// S_BSPI_RUN9
-    {SPR_BSPI,4,3,{A_Chase},S_BSPI_RUN11,0,0},	// S_BSPI_RUN10
-    {SPR_BSPI,5,3,{A_Chase},S_BSPI_RUN12,0,0},	// S_BSPI_RUN11
-    {SPR_BSPI,5,3,{A_Chase},S_BSPI_RUN1,0,0},	// S_BSPI_RUN12
-    {SPR_BSPI,32768,20,{A_FaceTarget},S_BSPI_ATK2,0,0},	// S_BSPI_ATK1
-    {SPR_BSPI,32774,4,{A_BspiAttack},S_BSPI_ATK3,0,0},	// S_BSPI_ATK2
-    {SPR_BSPI,32775,4,{NULL},S_BSPI_ATK4,0,0},	// S_BSPI_ATK3
-    {SPR_BSPI,32775,1,{A_SpidRefire},S_BSPI_ATK2,0,0},	// S_BSPI_ATK4
-    {SPR_BSPI,8,3,{NULL},S_BSPI_PAIN2,0,0},	// S_BSPI_PAIN
-    {SPR_BSPI,8,3,{A_Pain},S_BSPI_RUN1,0,0},	// S_BSPI_PAIN2
-    {SPR_BSPI,9,20,{A_Scream},S_BSPI_DIE2,0,0},	// S_BSPI_DIE1
-    {SPR_BSPI,10,7,{A_Fall},S_BSPI_DIE3,0,0},	// S_BSPI_DIE2
-    {SPR_BSPI,11,7,{NULL},S_BSPI_DIE4,0,0},	// S_BSPI_DIE3
-    {SPR_BSPI,12,7,{NULL},S_BSPI_DIE5,0,0},	// S_BSPI_DIE4
-    {SPR_BSPI,13,7,{NULL},S_BSPI_DIE6,0,0},	// S_BSPI_DIE5
-    {SPR_BSPI,14,7,{NULL},S_BSPI_DIE7,0,0},	// S_BSPI_DIE6
-    {SPR_BSPI,15,-1,{A_BossDeath},S_NULL,0,0},	// S_BSPI_DIE7
-    {SPR_BSPI,15,5,{NULL},S_BSPI_RAISE2,0,0},	// S_BSPI_RAISE1
-    {SPR_BSPI,14,5,{NULL},S_BSPI_RAISE3,0,0},	// S_BSPI_RAISE2
-    {SPR_BSPI,13,5,{NULL},S_BSPI_RAISE4,0,0},	// S_BSPI_RAISE3
-    {SPR_BSPI,12,5,{NULL},S_BSPI_RAISE5,0,0},	// S_BSPI_RAISE4
-    {SPR_BSPI,11,5,{NULL},S_BSPI_RAISE6,0,0},	// S_BSPI_RAISE5
-    {SPR_BSPI,10,5,{NULL},S_BSPI_RAISE7,0,0},	// S_BSPI_RAISE6
-    {SPR_BSPI,9,5,{NULL},S_BSPI_RUN1,0,0},	// S_BSPI_RAISE7
-    {SPR_APLS,32768,5,{NULL},S_ARACH_PLAZ2,0,0},	// S_ARACH_PLAZ
-    {SPR_APLS,32769,5,{NULL},S_ARACH_PLAZ,0,0},	// S_ARACH_PLAZ2
-    {SPR_APBX,32768,5,{NULL},S_ARACH_PLEX2,0,0},	// S_ARACH_PLEX
-    {SPR_APBX,32769,5,{NULL},S_ARACH_PLEX3,0,0},	// S_ARACH_PLEX2
-    {SPR_APBX,32770,5,{NULL},S_ARACH_PLEX4,0,0},	// S_ARACH_PLEX3
-    {SPR_APBX,32771,5,{NULL},S_ARACH_PLEX5,0,0},	// S_ARACH_PLEX4
-    {SPR_APBX,32772,5,{NULL},S_NULL,0,0},	// S_ARACH_PLEX5
-    {SPR_CYBR,0,10,{A_Look},S_CYBER_STND2,0,0},	// S_CYBER_STND
-    {SPR_CYBR,1,10,{A_Look},S_CYBER_STND,0,0},	// S_CYBER_STND2
-    {SPR_CYBR,0,3,{A_Hoof},S_CYBER_RUN2,0,0},	// S_CYBER_RUN1
-    {SPR_CYBR,0,3,{A_Chase},S_CYBER_RUN3,0,0},	// S_CYBER_RUN2
-    {SPR_CYBR,1,3,{A_Chase},S_CYBER_RUN4,0,0},	// S_CYBER_RUN3
-    {SPR_CYBR,1,3,{A_Chase},S_CYBER_RUN5,0,0},	// S_CYBER_RUN4
-    {SPR_CYBR,2,3,{A_Chase},S_CYBER_RUN6,0,0},	// S_CYBER_RUN5
-    {SPR_CYBR,2,3,{A_Chase},S_CYBER_RUN7,0,0},	// S_CYBER_RUN6
-    {SPR_CYBR,3,3,{A_Metal},S_CYBER_RUN8,0,0},	// S_CYBER_RUN7
-    {SPR_CYBR,3,3,{A_Chase},S_CYBER_RUN1,0,0},	// S_CYBER_RUN8
-    {SPR_CYBR,4,6,{A_FaceTarget},S_CYBER_ATK2,0,0},	// S_CYBER_ATK1
-    {SPR_CYBR,5,12,{A_CyberAttack},S_CYBER_ATK3,0,0},	// S_CYBER_ATK2
-    {SPR_CYBR,4,12,{A_FaceTarget},S_CYBER_ATK4,0,0},	// S_CYBER_ATK3
-    {SPR_CYBR,5,12,{A_CyberAttack},S_CYBER_ATK5,0,0},	// S_CYBER_ATK4
-    {SPR_CYBR,4,12,{A_FaceTarget},S_CYBER_ATK6,0,0},	// S_CYBER_ATK5
-    {SPR_CYBR,5,12,{A_CyberAttack},S_CYBER_RUN1,0,0},	// S_CYBER_ATK6
-    {SPR_CYBR,6,10,{A_Pain},S_CYBER_RUN1,0,0},	// S_CYBER_PAIN
-    {SPR_CYBR,7,10,{NULL},S_CYBER_DIE2,0,0},	// S_CYBER_DIE1
-    {SPR_CYBR,8,10,{A_Scream},S_CYBER_DIE3,0,0},	// S_CYBER_DIE2
-    {SPR_CYBR,9,10,{NULL},S_CYBER_DIE4,0,0},	// S_CYBER_DIE3
-    {SPR_CYBR,10,10,{NULL},S_CYBER_DIE5,0,0},	// S_CYBER_DIE4
-    {SPR_CYBR,11,10,{NULL},S_CYBER_DIE6,0,0},	// S_CYBER_DIE5
-    {SPR_CYBR,12,10,{A_Fall},S_CYBER_DIE7,0,0},	// S_CYBER_DIE6
-    {SPR_CYBR,13,10,{NULL},S_CYBER_DIE8,0,0},	// S_CYBER_DIE7
-    {SPR_CYBR,14,10,{NULL},S_CYBER_DIE9,0,0},	// S_CYBER_DIE8
-    {SPR_CYBR,15,30,{NULL},S_CYBER_DIE10,0,0},	// S_CYBER_DIE9
-    {SPR_CYBR,15,-1,{A_BossDeath},S_NULL,0,0},	// S_CYBER_DIE10
-    {SPR_PAIN,0,10,{A_Look},S_PAIN_STND,0,0},	// S_PAIN_STND
-    {SPR_PAIN,0,3,{A_Chase},S_PAIN_RUN2,0,0},	// S_PAIN_RUN1
-    {SPR_PAIN,0,3,{A_Chase},S_PAIN_RUN3,0,0},	// S_PAIN_RUN2
-    {SPR_PAIN,1,3,{A_Chase},S_PAIN_RUN4,0,0},	// S_PAIN_RUN3
-    {SPR_PAIN,1,3,{A_Chase},S_PAIN_RUN5,0,0},	// S_PAIN_RUN4
-    {SPR_PAIN,2,3,{A_Chase},S_PAIN_RUN6,0,0},	// S_PAIN_RUN5
-    {SPR_PAIN,2,3,{A_Chase},S_PAIN_RUN1,0,0},	// S_PAIN_RUN6
-    {SPR_PAIN,3,5,{A_FaceTarget},S_PAIN_ATK2,0,0},	// S_PAIN_ATK1
-    {SPR_PAIN,4,5,{A_FaceTarget},S_PAIN_ATK3,0,0},	// S_PAIN_ATK2
-    {SPR_PAIN,32773,5,{A_FaceTarget},S_PAIN_ATK4,0,0},	// S_PAIN_ATK3
-    {SPR_PAIN,32773,0,{A_PainAttack},S_PAIN_RUN1,0,0},	// S_PAIN_ATK4
-    {SPR_PAIN,6,6,{NULL},S_PAIN_PAIN2,0,0},	// S_PAIN_PAIN
-    {SPR_PAIN,6,6,{A_Pain},S_PAIN_RUN1,0,0},	// S_PAIN_PAIN2
-    {SPR_PAIN,32775,8,{NULL},S_PAIN_DIE2,0,0},	// S_PAIN_DIE1
-    {SPR_PAIN,32776,8,{A_Scream},S_PAIN_DIE3,0,0},	// S_PAIN_DIE2
-    {SPR_PAIN,32777,8,{NULL},S_PAIN_DIE4,0,0},	// S_PAIN_DIE3
-    {SPR_PAIN,32778,8,{NULL},S_PAIN_DIE5,0,0},	// S_PAIN_DIE4
-    {SPR_PAIN,32779,8,{A_PainDie},S_PAIN_DIE6,0,0},	// S_PAIN_DIE5
-    {SPR_PAIN,32780,8,{NULL},S_NULL,0,0},	// S_PAIN_DIE6
-    {SPR_PAIN,12,8,{NULL},S_PAIN_RAISE2,0,0},	// S_PAIN_RAISE1
-    {SPR_PAIN,11,8,{NULL},S_PAIN_RAISE3,0,0},	// S_PAIN_RAISE2
-    {SPR_PAIN,10,8,{NULL},S_PAIN_RAISE4,0,0},	// S_PAIN_RAISE3
-    {SPR_PAIN,9,8,{NULL},S_PAIN_RAISE5,0,0},	// S_PAIN_RAISE4
-    {SPR_PAIN,8,8,{NULL},S_PAIN_RAISE6,0,0},	// S_PAIN_RAISE5
-    {SPR_PAIN,7,8,{NULL},S_PAIN_RUN1,0,0},	// S_PAIN_RAISE6
-    {SPR_SSWV,0,10,{A_Look},S_SSWV_STND2,0,0},	// S_SSWV_STND
-    {SPR_SSWV,1,10,{A_Look},S_SSWV_STND,0,0},	// S_SSWV_STND2
-    {SPR_SSWV,0,3,{A_Chase},S_SSWV_RUN2,0,0},	// S_SSWV_RUN1
-    {SPR_SSWV,0,3,{A_Chase},S_SSWV_RUN3,0,0},	// S_SSWV_RUN2
-    {SPR_SSWV,1,3,{A_Chase},S_SSWV_RUN4,0,0},	// S_SSWV_RUN3
-    {SPR_SSWV,1,3,{A_Chase},S_SSWV_RUN5,0,0},	// S_SSWV_RUN4
-    {SPR_SSWV,2,3,{A_Chase},S_SSWV_RUN6,0,0},	// S_SSWV_RUN5
-    {SPR_SSWV,2,3,{A_Chase},S_SSWV_RUN7,0,0},	// S_SSWV_RUN6
-    {SPR_SSWV,3,3,{A_Chase},S_SSWV_RUN8,0,0},	// S_SSWV_RUN7
-    {SPR_SSWV,3,3,{A_Chase},S_SSWV_RUN1,0,0},	// S_SSWV_RUN8
-    {SPR_SSWV,4,10,{A_FaceTarget},S_SSWV_ATK2,0,0},	// S_SSWV_ATK1
-    {SPR_SSWV,5,10,{A_FaceTarget},S_SSWV_ATK3,0,0},	// S_SSWV_ATK2
-    {SPR_SSWV,32774,4,{A_CPosAttack},S_SSWV_ATK4,0,0},	// S_SSWV_ATK3
-    {SPR_SSWV,5,6,{A_FaceTarget},S_SSWV_ATK5,0,0},	// S_SSWV_ATK4
-    {SPR_SSWV,32774,4,{A_CPosAttack},S_SSWV_ATK6,0,0},	// S_SSWV_ATK5
-    {SPR_SSWV,5,1,{A_CPosRefire},S_SSWV_ATK2,0,0},	// S_SSWV_ATK6
-    {SPR_SSWV,7,3,{NULL},S_SSWV_PAIN2,0,0},	// S_SSWV_PAIN
-    {SPR_SSWV,7,3,{A_Pain},S_SSWV_RUN1,0,0},	// S_SSWV_PAIN2
-    {SPR_SSWV,8,5,{NULL},S_SSWV_DIE2,0,0},	// S_SSWV_DIE1
-    {SPR_SSWV,9,5,{A_Scream},S_SSWV_DIE3,0,0},	// S_SSWV_DIE2
-    {SPR_SSWV,10,5,{A_Fall},S_SSWV_DIE4,0,0},	// S_SSWV_DIE3
-    {SPR_SSWV,11,5,{NULL},S_SSWV_DIE5,0,0},	// S_SSWV_DIE4
-    {SPR_SSWV,12,-1,{NULL},S_NULL,0,0},	// S_SSWV_DIE5
-    {SPR_SSWV,13,5,{NULL},S_SSWV_XDIE2,0,0},	// S_SSWV_XDIE1
-    {SPR_SSWV,14,5,{A_XScream},S_SSWV_XDIE3,0,0},	// S_SSWV_XDIE2
-    {SPR_SSWV,15,5,{A_Fall},S_SSWV_XDIE4,0,0},	// S_SSWV_XDIE3
-    {SPR_SSWV,16,5,{NULL},S_SSWV_XDIE5,0,0},	// S_SSWV_XDIE4
-    {SPR_SSWV,17,5,{NULL},S_SSWV_XDIE6,0,0},	// S_SSWV_XDIE5
-    {SPR_SSWV,18,5,{NULL},S_SSWV_XDIE7,0,0},	// S_SSWV_XDIE6
-    {SPR_SSWV,19,5,{NULL},S_SSWV_XDIE8,0,0},	// S_SSWV_XDIE7
-    {SPR_SSWV,20,5,{NULL},S_SSWV_XDIE9,0,0},	// S_SSWV_XDIE8
-    {SPR_SSWV,21,-1,{NULL},S_NULL,0,0},	// S_SSWV_XDIE9
-    {SPR_SSWV,12,5,{NULL},S_SSWV_RAISE2,0,0},	// S_SSWV_RAISE1
-    {SPR_SSWV,11,5,{NULL},S_SSWV_RAISE3,0,0},	// S_SSWV_RAISE2
-    {SPR_SSWV,10,5,{NULL},S_SSWV_RAISE4,0,0},	// S_SSWV_RAISE3
-    {SPR_SSWV,9,5,{NULL},S_SSWV_RAISE5,0,0},	// S_SSWV_RAISE4
-    {SPR_SSWV,8,5,{NULL},S_SSWV_RUN1,0,0},	// S_SSWV_RAISE5
-    {SPR_KEEN,0,-1,{NULL},S_KEENSTND,0,0},	// S_KEENSTND
-    {SPR_KEEN,0,6,{NULL},S_COMMKEEN2,0,0},	// S_COMMKEEN
-    {SPR_KEEN,1,6,{NULL},S_COMMKEEN3,0,0},	// S_COMMKEEN2
-    {SPR_KEEN,2,6,{A_Scream},S_COMMKEEN4,0,0},	// S_COMMKEEN3
-    {SPR_KEEN,3,6,{NULL},S_COMMKEEN5,0,0},	// S_COMMKEEN4
-    {SPR_KEEN,4,6,{NULL},S_COMMKEEN6,0,0},	// S_COMMKEEN5
-    {SPR_KEEN,5,6,{NULL},S_COMMKEEN7,0,0},	// S_COMMKEEN6
-    {SPR_KEEN,6,6,{NULL},S_COMMKEEN8,0,0},	// S_COMMKEEN7
-    {SPR_KEEN,7,6,{NULL},S_COMMKEEN9,0,0},	// S_COMMKEEN8
-    {SPR_KEEN,8,6,{NULL},S_COMMKEEN10,0,0},	// S_COMMKEEN9
-    {SPR_KEEN,9,6,{NULL},S_COMMKEEN11,0,0},	// S_COMMKEEN10
-    {SPR_KEEN,10,6,{A_KeenDie},S_COMMKEEN12,0,0},// S_COMMKEEN11
-    {SPR_KEEN,11,-1,{NULL},S_NULL,0,0},		// S_COMMKEEN12
-    {SPR_KEEN,12,4,{NULL},S_KEENPAIN2,0,0},	// S_KEENPAIN
-    {SPR_KEEN,12,8,{A_Pain},S_KEENSTND,0,0},	// S_KEENPAIN2
-    {SPR_BBRN,0,-1,{NULL},S_NULL,0,0},		// S_BRAIN
-    {SPR_BBRN,1,36,{A_BrainPain},S_BRAIN,0,0},	// S_BRAIN_PAIN
-    {SPR_BBRN,0,100,{A_BrainScream},S_BRAIN_DIE2,0,0},	// S_BRAIN_DIE1
-    {SPR_BBRN,0,10,{NULL},S_BRAIN_DIE3,0,0},	// S_BRAIN_DIE2
-    {SPR_BBRN,0,10,{NULL},S_BRAIN_DIE4,0,0},	// S_BRAIN_DIE3
-    {SPR_BBRN,0,-1,{A_BrainDie},S_NULL,0,0},	// S_BRAIN_DIE4
-    {SPR_SSWV,0,10,{A_Look},S_BRAINEYE,0,0},	// S_BRAINEYE
-    {SPR_SSWV,0,181,{A_BrainAwake},S_BRAINEYE1,0,0},	// S_BRAINEYESEE
-    {SPR_SSWV,0,150,{A_BrainSpit},S_BRAINEYE1,0,0},	// S_BRAINEYE1
-    {SPR_BOSF,32768,3,{A_SpawnSound},S_SPAWN2,0,0},	// S_SPAWN1
-    {SPR_BOSF,32769,3,{A_SpawnFly},S_SPAWN3,0,0},	// S_SPAWN2
-    {SPR_BOSF,32770,3,{A_SpawnFly},S_SPAWN4,0,0},	// S_SPAWN3
-    {SPR_BOSF,32771,3,{A_SpawnFly},S_SPAWN1,0,0},	// S_SPAWN4
-    {SPR_FIRE,32768,4,{A_Fire},S_SPAWNFIRE2,0,0},	// S_SPAWNFIRE1
-    {SPR_FIRE,32769,4,{A_Fire},S_SPAWNFIRE3,0,0},	// S_SPAWNFIRE2
-    {SPR_FIRE,32770,4,{A_Fire},S_SPAWNFIRE4,0,0},	// S_SPAWNFIRE3
-    {SPR_FIRE,32771,4,{A_Fire},S_SPAWNFIRE5,0,0},	// S_SPAWNFIRE4
-    {SPR_FIRE,32772,4,{A_Fire},S_SPAWNFIRE6,0,0},	// S_SPAWNFIRE5
-    {SPR_FIRE,32773,4,{A_Fire},S_SPAWNFIRE7,0,0},	// S_SPAWNFIRE6
-    {SPR_FIRE,32774,4,{A_Fire},S_SPAWNFIRE8,0,0},	// S_SPAWNFIRE7
-    {SPR_FIRE,32775,4,{A_Fire},S_NULL,0,0},		// S_SPAWNFIRE8
-    {SPR_MISL,32769,10,{NULL},S_BRAINEXPLODE2,0,0},	// S_BRAINEXPLODE1
-    {SPR_MISL,32770,10,{NULL},S_BRAINEXPLODE3,0,0},	// S_BRAINEXPLODE2
-    {SPR_MISL,32771,10,{A_BrainExplode},S_NULL,0,0},	// S_BRAINEXPLODE3
-    {SPR_ARM1,0,6,{NULL},S_ARM1A,0,0},	// S_ARM1
-    {SPR_ARM1,32769,7,{NULL},S_ARM1,0,0},	// S_ARM1A
-    {SPR_ARM2,0,6,{NULL},S_ARM2A,0,0},	// S_ARM2
-    {SPR_ARM2,32769,6,{NULL},S_ARM2,0,0},	// S_ARM2A
-    {SPR_BAR1,0,6,{NULL},S_BAR2,0,0},	// S_BAR1
-    {SPR_BAR1,1,6,{NULL},S_BAR1,0,0},	// S_BAR2
-    {SPR_BEXP,32768,5,{NULL},S_BEXP2,0,0},	// S_BEXP
-    {SPR_BEXP,32769,5,{A_Scream},S_BEXP3,0,0},	// S_BEXP2
-    {SPR_BEXP,32770,5,{NULL},S_BEXP4,0,0},	// S_BEXP3
-    {SPR_BEXP,32771,10,{A_Explode},S_BEXP5,0,0},	// S_BEXP4
-    {SPR_BEXP,32772,10,{NULL},S_NULL,0,0},	// S_BEXP5
-    {SPR_FCAN,32768,4,{NULL},S_BBAR2,0,0},	// S_BBAR1
-    {SPR_FCAN,32769,4,{NULL},S_BBAR3,0,0},	// S_BBAR2
-    {SPR_FCAN,32770,4,{NULL},S_BBAR1,0,0},	// S_BBAR3
-    {SPR_BON1,0,6,{NULL},S_BON1A,0,0},	// S_BON1
-    {SPR_BON1,1,6,{NULL},S_BON1B,0,0},	// S_BON1A
-    {SPR_BON1,2,6,{NULL},S_BON1C,0,0},	// S_BON1B
-    {SPR_BON1,3,6,{NULL},S_BON1D,0,0},	// S_BON1C
-    {SPR_BON1,2,6,{NULL},S_BON1E,0,0},	// S_BON1D
-    {SPR_BON1,1,6,{NULL},S_BON1,0,0},	// S_BON1E
-    {SPR_BON2,0,6,{NULL},S_BON2A,0,0},	// S_BON2
-    {SPR_BON2,1,6,{NULL},S_BON2B,0,0},	// S_BON2A
-    {SPR_BON2,2,6,{NULL},S_BON2C,0,0},	// S_BON2B
-    {SPR_BON2,3,6,{NULL},S_BON2D,0,0},	// S_BON2C
-    {SPR_BON2,2,6,{NULL},S_BON2E,0,0},	// S_BON2D
-    {SPR_BON2,1,6,{NULL},S_BON2,0,0},	// S_BON2E
-    {SPR_BKEY,0,10,{NULL},S_BKEY2,0,0},	// S_BKEY
-    {SPR_BKEY,32769,10,{NULL},S_BKEY,0,0},	// S_BKEY2
-    {SPR_RKEY,0,10,{NULL},S_RKEY2,0,0},	// S_RKEY
-    {SPR_RKEY,32769,10,{NULL},S_RKEY,0,0},	// S_RKEY2
-    {SPR_YKEY,0,10,{NULL},S_YKEY2,0,0},	// S_YKEY
-    {SPR_YKEY,32769,10,{NULL},S_YKEY,0,0},	// S_YKEY2
-    {SPR_BSKU,0,10,{NULL},S_BSKULL2,0,0},	// S_BSKULL
-    {SPR_BSKU,32769,10,{NULL},S_BSKULL,0,0},	// S_BSKULL2
-    {SPR_RSKU,0,10,{NULL},S_RSKULL2,0,0},	// S_RSKULL
-    {SPR_RSKU,32769,10,{NULL},S_RSKULL,0,0},	// S_RSKULL2
-    {SPR_YSKU,0,10,{NULL},S_YSKULL2,0,0},	// S_YSKULL
-    {SPR_YSKU,32769,10,{NULL},S_YSKULL,0,0},	// S_YSKULL2
-    {SPR_STIM,0,-1,{NULL},S_NULL,0,0},	// S_STIM
-    {SPR_MEDI,0,-1,{NULL},S_NULL,0,0},	// S_MEDI
-    {SPR_SOUL,32768,6,{NULL},S_SOUL2,0,0},	// S_SOUL
-    {SPR_SOUL,32769,6,{NULL},S_SOUL3,0,0},	// S_SOUL2
-    {SPR_SOUL,32770,6,{NULL},S_SOUL4,0,0},	// S_SOUL3
-    {SPR_SOUL,32771,6,{NULL},S_SOUL5,0,0},	// S_SOUL4
-    {SPR_SOUL,32770,6,{NULL},S_SOUL6,0,0},	// S_SOUL5
-    {SPR_SOUL,32769,6,{NULL},S_SOUL,0,0},	// S_SOUL6
-    {SPR_PINV,32768,6,{NULL},S_PINV2,0,0},	// S_PINV
-    {SPR_PINV,32769,6,{NULL},S_PINV3,0,0},	// S_PINV2
-    {SPR_PINV,32770,6,{NULL},S_PINV4,0,0},	// S_PINV3
-    {SPR_PINV,32771,6,{NULL},S_PINV,0,0},	// S_PINV4
-    {SPR_PSTR,32768,-1,{NULL},S_NULL,0,0},	// S_PSTR
-    {SPR_PINS,32768,6,{NULL},S_PINS2,0,0},	// S_PINS
-    {SPR_PINS,32769,6,{NULL},S_PINS3,0,0},	// S_PINS2
-    {SPR_PINS,32770,6,{NULL},S_PINS4,0,0},	// S_PINS3
-    {SPR_PINS,32771,6,{NULL},S_PINS,0,0},	// S_PINS4
-    {SPR_MEGA,32768,6,{NULL},S_MEGA2,0,0},	// S_MEGA
-    {SPR_MEGA,32769,6,{NULL},S_MEGA3,0,0},	// S_MEGA2
-    {SPR_MEGA,32770,6,{NULL},S_MEGA4,0,0},	// S_MEGA3
-    {SPR_MEGA,32771,6,{NULL},S_MEGA,0,0},	// S_MEGA4
-    {SPR_SUIT,32768,-1,{NULL},S_NULL,0,0},	// S_SUIT
-    {SPR_PMAP,32768,6,{NULL},S_PMAP2,0,0},	// S_PMAP
-    {SPR_PMAP,32769,6,{NULL},S_PMAP3,0,0},	// S_PMAP2
-    {SPR_PMAP,32770,6,{NULL},S_PMAP4,0,0},	// S_PMAP3
-    {SPR_PMAP,32771,6,{NULL},S_PMAP5,0,0},	// S_PMAP4
-    {SPR_PMAP,32770,6,{NULL},S_PMAP6,0,0},	// S_PMAP5
-    {SPR_PMAP,32769,6,{NULL},S_PMAP,0,0},	// S_PMAP6
-    {SPR_PVIS,32768,6,{NULL},S_PVIS2,0,0},	// S_PVIS
-    {SPR_PVIS,1,6,{NULL},S_PVIS,0,0},	// S_PVIS2
-    {SPR_CLIP,0,-1,{NULL},S_NULL,0,0},	// S_CLIP
-    {SPR_AMMO,0,-1,{NULL},S_NULL,0,0},	// S_AMMO
-    {SPR_ROCK,0,-1,{NULL},S_NULL,0,0},	// S_ROCK
-    {SPR_BROK,0,-1,{NULL},S_NULL,0,0},	// S_BROK
-    {SPR_CELL,0,-1,{NULL},S_NULL,0,0},	// S_CELL
-    {SPR_CELP,0,-1,{NULL},S_NULL,0,0},	// S_CELP
-    {SPR_SHEL,0,-1,{NULL},S_NULL,0,0},	// S_SHEL
-    {SPR_SBOX,0,-1,{NULL},S_NULL,0,0},	// S_SBOX
-    {SPR_BPAK,0,-1,{NULL},S_NULL,0,0},	// S_BPAK
-    {SPR_BFUG,0,-1,{NULL},S_NULL,0,0},	// S_BFUG
-    {SPR_MGUN,0,-1,{NULL},S_NULL,0,0},	// S_MGUN
-    {SPR_CSAW,0,-1,{NULL},S_NULL,0,0},	// S_CSAW
-    {SPR_LAUN,0,-1,{NULL},S_NULL,0,0},	// S_LAUN
-    {SPR_PLAS,0,-1,{NULL},S_NULL,0,0},	// S_PLAS
-    {SPR_SHOT,0,-1,{NULL},S_NULL,0,0},	// S_SHOT
-    {SPR_SGN2,0,-1,{NULL},S_NULL,0,0},	// S_SHOT2
-    {SPR_COLU,32768,-1,{NULL},S_NULL,0,0},	// S_COLU
-    {SPR_SMT2,0,-1,{NULL},S_NULL,0,0},	// S_STALAG
-    {SPR_GOR1,0,10,{NULL},S_BLOODYTWITCH2,0,0},	// S_BLOODYTWITCH
-    {SPR_GOR1,1,15,{NULL},S_BLOODYTWITCH3,0,0},	// S_BLOODYTWITCH2
-    {SPR_GOR1,2,8,{NULL},S_BLOODYTWITCH4,0,0},	// S_BLOODYTWITCH3
-    {SPR_GOR1,1,6,{NULL},S_BLOODYTWITCH,0,0},	// S_BLOODYTWITCH4
-    {SPR_PLAY,13,-1,{NULL},S_NULL,0,0},	// S_DEADTORSO
-    {SPR_PLAY,18,-1,{NULL},S_NULL,0,0},	// S_DEADBOTTOM
-    {SPR_POL2,0,-1,{NULL},S_NULL,0,0},	// S_HEADSONSTICK
-    {SPR_POL5,0,-1,{NULL},S_NULL,0,0},	// S_GIBS
-    {SPR_POL4,0,-1,{NULL},S_NULL,0,0},	// S_HEADONASTICK
-    {SPR_POL3,32768,6,{NULL},S_HEADCANDLES2,0,0},	// S_HEADCANDLES
-    {SPR_POL3,32769,6,{NULL},S_HEADCANDLES,0,0},	// S_HEADCANDLES2
-    {SPR_POL1,0,-1,{NULL},S_NULL,0,0},	// S_DEADSTICK
-    {SPR_POL6,0,6,{NULL},S_LIVESTICK2,0,0},	// S_LIVESTICK
-    {SPR_POL6,1,8,{NULL},S_LIVESTICK,0,0},	// S_LIVESTICK2
-    {SPR_GOR2,0,-1,{NULL},S_NULL,0,0},	// S_MEAT2
-    {SPR_GOR3,0,-1,{NULL},S_NULL,0,0},	// S_MEAT3
-    {SPR_GOR4,0,-1,{NULL},S_NULL,0,0},	// S_MEAT4
-    {SPR_GOR5,0,-1,{NULL},S_NULL,0,0},	// S_MEAT5
-    {SPR_SMIT,0,-1,{NULL},S_NULL,0,0},	// S_STALAGTITE
-    {SPR_COL1,0,-1,{NULL},S_NULL,0,0},	// S_TALLGRNCOL
-    {SPR_COL2,0,-1,{NULL},S_NULL,0,0},	// S_SHRTGRNCOL
-    {SPR_COL3,0,-1,{NULL},S_NULL,0,0},	// S_TALLREDCOL
-    {SPR_COL4,0,-1,{NULL},S_NULL,0,0},	// S_SHRTREDCOL
-    {SPR_CAND,32768,-1,{NULL},S_NULL,0,0},	// S_CANDLESTIK
-    {SPR_CBRA,32768,-1,{NULL},S_NULL,0,0},	// S_CANDELABRA
-    {SPR_COL6,0,-1,{NULL},S_NULL,0,0},	// S_SKULLCOL
-    {SPR_TRE1,0,-1,{NULL},S_NULL,0,0},	// S_TORCHTREE
-    {SPR_TRE2,0,-1,{NULL},S_NULL,0,0},	// S_BIGTREE
-    {SPR_ELEC,0,-1,{NULL},S_NULL,0,0},	// S_TECHPILLAR
-    {SPR_CEYE,32768,6,{NULL},S_EVILEYE2,0,0},	// S_EVILEYE
-    {SPR_CEYE,32769,6,{NULL},S_EVILEYE3,0,0},	// S_EVILEYE2
-    {SPR_CEYE,32770,6,{NULL},S_EVILEYE4,0,0},	// S_EVILEYE3
-    {SPR_CEYE,32769,6,{NULL},S_EVILEYE,0,0},	// S_EVILEYE4
-    {SPR_FSKU,32768,6,{NULL},S_FLOATSKULL2,0,0},	// S_FLOATSKULL
-    {SPR_FSKU,32769,6,{NULL},S_FLOATSKULL3,0,0},	// S_FLOATSKULL2
-    {SPR_FSKU,32770,6,{NULL},S_FLOATSKULL,0,0},	// S_FLOATSKULL3
-    {SPR_COL5,0,14,{NULL},S_HEARTCOL2,0,0},	// S_HEARTCOL
-    {SPR_COL5,1,14,{NULL},S_HEARTCOL,0,0},	// S_HEARTCOL2
-    {SPR_TBLU,32768,4,{NULL},S_BLUETORCH2,0,0},	// S_BLUETORCH
-    {SPR_TBLU,32769,4,{NULL},S_BLUETORCH3,0,0},	// S_BLUETORCH2
-    {SPR_TBLU,32770,4,{NULL},S_BLUETORCH4,0,0},	// S_BLUETORCH3
-    {SPR_TBLU,32771,4,{NULL},S_BLUETORCH,0,0},	// S_BLUETORCH4
-    {SPR_TGRN,32768,4,{NULL},S_GREENTORCH2,0,0},	// S_GREENTORCH
-    {SPR_TGRN,32769,4,{NULL},S_GREENTORCH3,0,0},	// S_GREENTORCH2
-    {SPR_TGRN,32770,4,{NULL},S_GREENTORCH4,0,0},	// S_GREENTORCH3
-    {SPR_TGRN,32771,4,{NULL},S_GREENTORCH,0,0},	// S_GREENTORCH4
-    {SPR_TRED,32768,4,{NULL},S_REDTORCH2,0,0},	// S_REDTORCH
-    {SPR_TRED,32769,4,{NULL},S_REDTORCH3,0,0},	// S_REDTORCH2
-    {SPR_TRED,32770,4,{NULL},S_REDTORCH4,0,0},	// S_REDTORCH3
-    {SPR_TRED,32771,4,{NULL},S_REDTORCH,0,0},	// S_REDTORCH4
-    {SPR_SMBT,32768,4,{NULL},S_BTORCHSHRT2,0,0},	// S_BTORCHSHRT
-    {SPR_SMBT,32769,4,{NULL},S_BTORCHSHRT3,0,0},	// S_BTORCHSHRT2
-    {SPR_SMBT,32770,4,{NULL},S_BTORCHSHRT4,0,0},	// S_BTORCHSHRT3
-    {SPR_SMBT,32771,4,{NULL},S_BTORCHSHRT,0,0},	// S_BTORCHSHRT4
-    {SPR_SMGT,32768,4,{NULL},S_GTORCHSHRT2,0,0},	// S_GTORCHSHRT
-    {SPR_SMGT,32769,4,{NULL},S_GTORCHSHRT3,0,0},	// S_GTORCHSHRT2
-    {SPR_SMGT,32770,4,{NULL},S_GTORCHSHRT4,0,0},	// S_GTORCHSHRT3
-    {SPR_SMGT,32771,4,{NULL},S_GTORCHSHRT,0,0},	// S_GTORCHSHRT4
-    {SPR_SMRT,32768,4,{NULL},S_RTORCHSHRT2,0,0},	// S_RTORCHSHRT
-    {SPR_SMRT,32769,4,{NULL},S_RTORCHSHRT3,0,0},	// S_RTORCHSHRT2
-    {SPR_SMRT,32770,4,{NULL},S_RTORCHSHRT4,0,0},	// S_RTORCHSHRT3
-    {SPR_SMRT,32771,4,{NULL},S_RTORCHSHRT,0,0},	// S_RTORCHSHRT4
-    {SPR_HDB1,0,-1,{NULL},S_NULL,0,0},	// S_HANGNOGUTS
-    {SPR_HDB2,0,-1,{NULL},S_NULL,0,0},	// S_HANGBNOBRAIN
-    {SPR_HDB3,0,-1,{NULL},S_NULL,0,0},	// S_HANGTLOOKDN
-    {SPR_HDB4,0,-1,{NULL},S_NULL,0,0},	// S_HANGTSKULL
-    {SPR_HDB5,0,-1,{NULL},S_NULL,0,0},	// S_HANGTLOOKUP
-    {SPR_HDB6,0,-1,{NULL},S_NULL,0,0},	// S_HANGTNOBRAIN
-    {SPR_POB1,0,-1,{NULL},S_NULL,0,0},	// S_COLONGIBS
-    {SPR_POB2,0,-1,{NULL},S_NULL,0,0},	// S_SMALLPOOL
-    {SPR_BRS1,0,-1,{NULL},S_NULL,0,0},		// S_BRAINSTEM
-    {SPR_TLMP,32768,4,{NULL},S_TECHLAMP2,0,0},	// S_TECHLAMP
-    {SPR_TLMP,32769,4,{NULL},S_TECHLAMP3,0,0},	// S_TECHLAMP2
-    {SPR_TLMP,32770,4,{NULL},S_TECHLAMP4,0,0},	// S_TECHLAMP3
-    {SPR_TLMP,32771,4,{NULL},S_TECHLAMP,0,0},	// S_TECHLAMP4
-    {SPR_TLP2,32768,4,{NULL},S_TECH2LAMP2,0,0},	// S_TECH2LAMP
-    {SPR_TLP2,32769,4,{NULL},S_TECH2LAMP3,0,0},	// S_TECH2LAMP2
-    {SPR_TLP2,32770,4,{NULL},S_TECH2LAMP4,0,0},	// S_TECH2LAMP3
-    {SPR_TLP2,32771,4,{NULL},S_TECH2LAMP,0,0}	// S_TECH2LAMP4
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+state_t states[NUMSTATES] =
+{
+  STATE_ENTRY(SPR_TROO, 0, -1, NULL, S_NULL),               /* S_NULL */
+  STATE_ENTRY(SPR_SHTG, 4, 0, a_light0, S_NULL),            /* S_LIGHTDONE */
+  STATE_ENTRY(SPR_PUNG, 0, 1, a_weapon_ready, S_PUNCH),     /* S_PUNCH */
+  STATE_ENTRY(SPR_PUNG, 0, 1, a_lower, S_PUNCHDOWN),        /* S_PUNCHDOWN */
+  STATE_ENTRY(SPR_PUNG, 0, 1, a_raise, S_PUNCHUP),          /* S_PUNCHUP */
+  STATE_ENTRY(SPR_PUNG, 1, 4, NULL, S_PUNCH2),              /* S_PUNCH1 */
+  STATE_ENTRY(SPR_PUNG, 2, 4, a_punch, S_PUNCH3),           /* S_PUNCH2 */
+  STATE_ENTRY(SPR_PUNG, 3, 5, NULL, S_PUNCH4),              /* S_PUNCH3 */
+  STATE_ENTRY(SPR_PUNG, 2, 4, NULL, S_PUNCH5),              /* S_PUNCH4 */
+  STATE_ENTRY(SPR_PUNG, 1, 5, a_refire, S_PUNCH),           /* S_PUNCH5 */
+  STATE_ENTRY(SPR_PISG, 0, 1, a_weapon_ready, S_PISTOL),    /* S_PISTOL */
+  STATE_ENTRY(SPR_PISG, 0, 1, a_lower, S_PISTOLDOWN),       /* S_PISTOLDOWN */
+  STATE_ENTRY(SPR_PISG, 0, 1, a_raise, S_PISTOLUP),         /* S_PISTOLUP */
+  STATE_ENTRY(SPR_PISG, 0, 4, NULL, S_PISTOL2),             /* S_PISTOL1 */
+  STATE_ENTRY(SPR_PISG, 1, 6, a_fire_pistol, S_PISTOL3),    /* S_PISTOL2 */
+  STATE_ENTRY(SPR_PISG, 2, 4, NULL, S_PISTOL4),             /* S_PISTOL3 */
+  STATE_ENTRY(SPR_PISG, 1, 5, a_refire, S_PISTOL),          /* S_PISTOL4 */
+  STATE_ENTRY(SPR_PISF, 32768, 7, a_light1,
+              S_LIGHTDONE),                                 /* S_PISTOLFLASH */
+  STATE_ENTRY(SPR_SHTG, 0, 1, a_weapon_ready, S_SGUN),      /* S_SGUN */
+  STATE_ENTRY(SPR_SHTG, 0, 1, a_lower, S_SGUNDOWN),         /* S_SGUNDOWN */
+  STATE_ENTRY(SPR_SHTG, 0, 1, a_raise, S_SGUNUP),           /* S_SGUNUP */
+  STATE_ENTRY(SPR_SHTG, 0, 3, NULL, S_SGUN2),               /* S_SGUN1 */
+  STATE_ENTRY(SPR_SHTG, 0, 7, a_fire_shotgun, S_SGUN3),     /* S_SGUN2 */
+  STATE_ENTRY(SPR_SHTG, 1, 5, NULL, S_SGUN4),               /* S_SGUN3 */
+  STATE_ENTRY(SPR_SHTG, 2, 5, NULL, S_SGUN5),               /* S_SGUN4 */
+  STATE_ENTRY(SPR_SHTG, 3, 4, NULL, S_SGUN6),               /* S_SGUN5 */
+  STATE_ENTRY(SPR_SHTG, 2, 5, NULL, S_SGUN7),               /* S_SGUN6 */
+  STATE_ENTRY(SPR_SHTG, 1, 5, NULL, S_SGUN8),               /* S_SGUN7 */
+  STATE_ENTRY(SPR_SHTG, 0, 3, NULL, S_SGUN9),               /* S_SGUN8 */
+  STATE_ENTRY(SPR_SHTG, 0, 7, a_refire, S_SGUN),            /* S_SGUN9 */
+  STATE_ENTRY(SPR_SHTF, 32768, 4, a_light1,
+              S_SGUNFLASH2),                                /* S_SGUNFLASH1 */
+  STATE_ENTRY(SPR_SHTF, 32769, 3, a_light2, S_LIGHTDONE),   /* S_SGUNFLASH2 */
+  STATE_ENTRY(SPR_SHT2, 0, 1, a_weapon_ready, S_DSGUN),     /* S_DSGUN */
+  STATE_ENTRY(SPR_SHT2, 0, 1, a_lower, S_DSGUNDOWN),        /* S_DSGUNDOWN */
+  STATE_ENTRY(SPR_SHT2, 0, 1, a_raise, S_DSGUNUP),          /* S_DSGUNUP */
+  STATE_ENTRY(SPR_SHT2, 0, 3, NULL, S_DSGUN2),              /* S_DSGUN1 */
+  STATE_ENTRY(SPR_SHT2, 0, 7, a_fire_shotgun2, S_DSGUN3),   /* S_DSGUN2 */
+  STATE_ENTRY(SPR_SHT2, 1, 7, NULL, S_DSGUN4),              /* S_DSGUN3 */
+  STATE_ENTRY(SPR_SHT2, 2, 7, a_check_reload, S_DSGUN5),    /* S_DSGUN4 */
+  STATE_ENTRY(SPR_SHT2, 3, 7, a_open_shotgun2, S_DSGUN6),   /* S_DSGUN5 */
+  STATE_ENTRY(SPR_SHT2, 4, 7, NULL, S_DSGUN7),              /* S_DSGUN6 */
+  STATE_ENTRY(SPR_SHT2, 5, 7, a_load_shotgun2, S_DSGUN8),   /* S_DSGUN7 */
+  STATE_ENTRY(SPR_SHT2, 6, 6, NULL, S_DSGUN9),              /* S_DSGUN8 */
+  STATE_ENTRY(SPR_SHT2, 7, 6, a_close_shotgun2, S_DSGUN10), /* S_DSGUN9 */
+  STATE_ENTRY(SPR_SHT2, 0, 5, a_refire, S_DSGUN),           /* S_DSGUN10 */
+  STATE_ENTRY(SPR_SHT2, 1, 7, NULL, S_DSNR2),               /* S_DSNR1 */
+  STATE_ENTRY(SPR_SHT2, 0, 3, NULL, S_DSGUNDOWN),           /* S_DSNR2 */
+  STATE_ENTRY(SPR_SHT2, 32776, 5, a_light1,
+              S_DSGUNFLASH2), /* S_DSGUNFLASH1 */
+  STATE_ENTRY(SPR_SHT2, 32777, 4, a_light2,
+              S_LIGHTDONE),                                 /* S_DSGUNFLASH2 */
+  STATE_ENTRY(SPR_CHGG, 0, 1, a_weapon_ready, S_CHAIN),     /* S_CHAIN */
+  STATE_ENTRY(SPR_CHGG, 0, 1, a_lower, S_CHAINDOWN),        /* S_CHAINDOWN */
+  STATE_ENTRY(SPR_CHGG, 0, 1, a_raise, S_CHAINUP),          /* S_CHAINUP */
+  STATE_ENTRY(SPR_CHGG, 0, 4, a_fire_cgun, S_CHAIN2),       /* S_CHAIN1 */
+  STATE_ENTRY(SPR_CHGG, 1, 4, a_fire_cgun, S_CHAIN3),       /* S_CHAIN2 */
+  STATE_ENTRY(SPR_CHGG, 1, 0, a_refire, S_CHAIN),           /* S_CHAIN3 */
+  STATE_ENTRY(SPR_CHGF, 32768, 5, a_light1,
+              S_LIGHTDONE), /* S_CHAINFLASH1 */
+  STATE_ENTRY(SPR_CHGF, 32769, 5, a_light2,
+              S_LIGHTDONE),                                 /* S_CHAINFLASH2 */
+  STATE_ENTRY(SPR_MISG, 0, 1, a_weapon_ready, S_MISSILE),   /* S_MISSILE */
+  STATE_ENTRY(SPR_MISG, 0, 1, a_lower, S_MISSILEDOWN),      /* S_MISSILEDOWN */
+  STATE_ENTRY(SPR_MISG, 0, 1, a_raise, S_MISSILEUP),        /* S_MISSILEUP */
+  STATE_ENTRY(SPR_MISG, 1, 8, a_gun_flash, S_MISSILE2),     /* S_MISSILE1 */
+  STATE_ENTRY(SPR_MISG, 1, 12, a_fire_missile, S_MISSILE3), /* S_MISSILE2 */
+  STATE_ENTRY(SPR_MISG, 1, 0, a_refire, S_MISSILE),         /* S_MISSILE3 */
+  STATE_ENTRY(SPR_MISF, 32768, 3, a_light1,
+              S_MISSILEFLASH2), /* S_MISSILEFLASH1 */
+  STATE_ENTRY(SPR_MISF, 32769, 4, NULL,
+              S_MISSILEFLASH3), /* S_MISSILEFLASH2 */
+  STATE_ENTRY(SPR_MISF, 32770, 4, a_light2,
+              S_MISSILEFLASH4), /* S_MISSILEFLASH3 */
+  STATE_ENTRY(SPR_MISF, 32771, 4, a_light2,
+              S_LIGHTDONE),                              /* S_MISSILEFLASH4 */
+  STATE_ENTRY(SPR_SAWG, 2, 4, a_weapon_ready, S_SAWB),   /* S_SAW */
+  STATE_ENTRY(SPR_SAWG, 3, 4, a_weapon_ready, S_SAW),    /* S_SAWB */
+  STATE_ENTRY(SPR_SAWG, 2, 1, a_lower, S_SAWDOWN),       /* S_SAWDOWN */
+  STATE_ENTRY(SPR_SAWG, 2, 1, a_raise, S_SAWUP),         /* S_SAWUP */
+  STATE_ENTRY(SPR_SAWG, 0, 4, a_saw, S_SAW2),            /* S_SAW1 */
+  STATE_ENTRY(SPR_SAWG, 1, 4, a_saw, S_SAW3),            /* S_SAW2 */
+  STATE_ENTRY(SPR_SAWG, 1, 0, a_refire, S_SAW),          /* S_SAW3 */
+  STATE_ENTRY(SPR_PLSG, 0, 1, a_weapon_ready, S_PLASMA), /* S_PLASMA */
+  STATE_ENTRY(SPR_PLSG, 0, 1, a_lower, S_PLASMADOWN),    /* S_PLASMADOWN */
+  STATE_ENTRY(SPR_PLSG, 0, 1, a_raise, S_PLASMAUP),      /* S_PLASMAUP */
+  STATE_ENTRY(SPR_PLSG, 0, 3, a_fire_plasma, S_PLASMA2), /* S_PLASMA1 */
+  STATE_ENTRY(SPR_PLSG, 1, 20, a_refire, S_PLASMA),      /* S_PLASMA2 */
+  STATE_ENTRY(SPR_PLSF, 32768, 4, a_light1,
+              S_LIGHTDONE), /* S_PLASMAFLASH1 */
+  STATE_ENTRY(SPR_PLSF, 32769, 4, a_light1,
+              S_LIGHTDONE),                                 /* S_PLASMAFLASH2 */
+  STATE_ENTRY(SPR_BFGG, 0, 1, a_weapon_ready, S_BFG),       /* S_BFG */
+  STATE_ENTRY(SPR_BFGG, 0, 1, a_lower, S_BFGDOWN),          /* S_BFGDOWN */
+  STATE_ENTRY(SPR_BFGG, 0, 1, a_raise, S_BFGUP),            /* S_BFGUP */
+  STATE_ENTRY(SPR_BFGG, 0, 20, a_bfg_sound, S_BFG2),        /* S_BFG1 */
+  STATE_ENTRY(SPR_BFGG, 1, 10, a_gun_flash, S_BFG3),        /* S_BFG2 */
+  STATE_ENTRY(SPR_BFGG, 1, 10, a_fire_bfg, S_BFG4),         /* S_BFG3 */
+  STATE_ENTRY(SPR_BFGG, 1, 20, a_refire, S_BFG),            /* S_BFG4 */
+  STATE_ENTRY(SPR_BFGF, 32768, 11, a_light1, S_BFGFLASH2),  /* S_BFGFLASH1 */
+  STATE_ENTRY(SPR_BFGF, 32769, 6, a_light2, S_LIGHTDONE),   /* S_BFGFLASH2 */
+  STATE_ENTRY(SPR_BLUD, 2, 8, NULL, S_BLOOD2),              /* S_BLOOD1 */
+  STATE_ENTRY(SPR_BLUD, 1, 8, NULL, S_BLOOD3),              /* S_BLOOD2 */
+  STATE_ENTRY(SPR_BLUD, 0, 8, NULL, S_NULL),                /* S_BLOOD3 */
+  STATE_ENTRY(SPR_PUFF, 32768, 4, NULL, S_PUFF2),           /* S_PUFF1 */
+  STATE_ENTRY(SPR_PUFF, 1, 4, NULL, S_PUFF3),               /* S_PUFF2 */
+  STATE_ENTRY(SPR_PUFF, 2, 4, NULL, S_PUFF4),               /* S_PUFF3 */
+  STATE_ENTRY(SPR_PUFF, 3, 4, NULL, S_NULL),                /* S_PUFF4 */
+  STATE_ENTRY(SPR_BAL1, 32768, 4, NULL, S_TBALL2),          /* S_TBALL1 */
+  STATE_ENTRY(SPR_BAL1, 32769, 4, NULL, S_TBALL1),          /* S_TBALL2 */
+  STATE_ENTRY(SPR_BAL1, 32770, 6, NULL, S_TBALLX2),         /* S_TBALLX1 */
+  STATE_ENTRY(SPR_BAL1, 32771, 6, NULL, S_TBALLX3),         /* S_TBALLX2 */
+  STATE_ENTRY(SPR_BAL1, 32772, 6, NULL, S_NULL),            /* S_TBALLX3 */
+  STATE_ENTRY(SPR_BAL2, 32768, 4, NULL, S_RBALL2),          /* S_RBALL1 */
+  STATE_ENTRY(SPR_BAL2, 32769, 4, NULL, S_RBALL1),          /* S_RBALL2 */
+  STATE_ENTRY(SPR_BAL2, 32770, 6, NULL, S_RBALLX2),         /* S_RBALLX1 */
+  STATE_ENTRY(SPR_BAL2, 32771, 6, NULL, S_RBALLX3),         /* S_RBALLX2 */
+  STATE_ENTRY(SPR_BAL2, 32772, 6, NULL, S_NULL),            /* S_RBALLX3 */
+  STATE_ENTRY(SPR_PLSS, 32768, 6, NULL, S_PLASBALL2),       /* S_PLASBALL */
+  STATE_ENTRY(SPR_PLSS, 32769, 6, NULL, S_PLASBALL),        /* S_PLASBALL2 */
+  STATE_ENTRY(SPR_PLSE, 32768, 4, NULL, S_PLASEXP2),        /* S_PLASEXP */
+  STATE_ENTRY(SPR_PLSE, 32769, 4, NULL, S_PLASEXP3),        /* S_PLASEXP2 */
+  STATE_ENTRY(SPR_PLSE, 32770, 4, NULL, S_PLASEXP4),        /* S_PLASEXP3 */
+  STATE_ENTRY(SPR_PLSE, 32771, 4, NULL, S_PLASEXP5),        /* S_PLASEXP4 */
+  STATE_ENTRY(SPR_PLSE, 32772, 4, NULL, S_NULL),            /* S_PLASEXP5 */
+  STATE_ENTRY(SPR_MISL, 32768, 1, NULL, S_ROCKET),          /* S_ROCKET */
+  STATE_ENTRY(SPR_BFS1, 32768, 4, NULL, S_BFGSHOT2),        /* S_BFGSHOT */
+  STATE_ENTRY(SPR_BFS1, 32769, 4, NULL, S_BFGSHOT),         /* S_BFGSHOT2 */
+  STATE_ENTRY(SPR_BFE1, 32768, 8, NULL, S_BFGLAND2),        /* S_BFGLAND */
+  STATE_ENTRY(SPR_BFE1, 32769, 8, NULL, S_BFGLAND3),        /* S_BFGLAND2 */
+  STATE_ENTRY(SPR_BFE1, 32770, 8, a_bfg_spray, S_BFGLAND4), /* S_BFGLAND3 */
+  STATE_ENTRY(SPR_BFE1, 32771, 8, NULL, S_BFGLAND5),        /* S_BFGLAND4 */
+  STATE_ENTRY(SPR_BFE1, 32772, 8, NULL, S_BFGLAND6),        /* S_BFGLAND5 */
+  STATE_ENTRY(SPR_BFE1, 32773, 8, NULL, S_NULL),            /* S_BFGLAND6 */
+  STATE_ENTRY(SPR_BFE2, 32768, 8, NULL, S_BFGEXP2),         /* S_BFGEXP */
+  STATE_ENTRY(SPR_BFE2, 32769, 8, NULL, S_BFGEXP3),         /* S_BFGEXP2 */
+  STATE_ENTRY(SPR_BFE2, 32770, 8, NULL, S_BFGEXP4),         /* S_BFGEXP3 */
+  STATE_ENTRY(SPR_BFE2, 32771, 8, NULL, S_NULL),            /* S_BFGEXP4 */
+  STATE_ENTRY(SPR_MISL, 32769, 8, a_explode, S_EXPLODE2),   /* S_EXPLODE1 */
+  STATE_ENTRY(SPR_MISL, 32770, 6, NULL, S_EXPLODE3),        /* S_EXPLODE2 */
+  STATE_ENTRY(SPR_MISL, 32771, 4, NULL, S_NULL),            /* S_EXPLODE3 */
+  STATE_ENTRY(SPR_TFOG, 32768, 6, NULL, S_TFOG01),          /* S_TFOG */
+  STATE_ENTRY(SPR_TFOG, 32769, 6, NULL, S_TFOG02),          /* S_TFOG01 */
+  STATE_ENTRY(SPR_TFOG, 32768, 6, NULL, S_TFOG2),           /* S_TFOG02 */
+  STATE_ENTRY(SPR_TFOG, 32769, 6, NULL, S_TFOG3),           /* S_TFOG2 */
+  STATE_ENTRY(SPR_TFOG, 32770, 6, NULL, S_TFOG4),           /* S_TFOG3 */
+  STATE_ENTRY(SPR_TFOG, 32771, 6, NULL, S_TFOG5),           /* S_TFOG4 */
+  STATE_ENTRY(SPR_TFOG, 32772, 6, NULL, S_TFOG6),           /* S_TFOG5 */
+  STATE_ENTRY(SPR_TFOG, 32773, 6, NULL, S_TFOG7),           /* S_TFOG6 */
+  STATE_ENTRY(SPR_TFOG, 32774, 6, NULL, S_TFOG8),           /* S_TFOG7 */
+  STATE_ENTRY(SPR_TFOG, 32775, 6, NULL, S_TFOG9),           /* S_TFOG8 */
+  STATE_ENTRY(SPR_TFOG, 32776, 6, NULL, S_TFOG10),          /* S_TFOG9 */
+  STATE_ENTRY(SPR_TFOG, 32777, 6, NULL, S_NULL),            /* S_TFOG10 */
+  STATE_ENTRY(SPR_IFOG, 32768, 6, NULL, S_IFOG01),          /* S_IFOG */
+  STATE_ENTRY(SPR_IFOG, 32769, 6, NULL, S_IFOG02),          /* S_IFOG01 */
+  STATE_ENTRY(SPR_IFOG, 32768, 6, NULL, S_IFOG2),           /* S_IFOG02 */
+  STATE_ENTRY(SPR_IFOG, 32769, 6, NULL, S_IFOG3),           /* S_IFOG2 */
+  STATE_ENTRY(SPR_IFOG, 32770, 6, NULL, S_IFOG4),           /* S_IFOG3 */
+  STATE_ENTRY(SPR_IFOG, 32771, 6, NULL, S_IFOG5),           /* S_IFOG4 */
+  STATE_ENTRY(SPR_IFOG, 32772, 6, NULL, S_NULL),            /* S_IFOG5 */
+  STATE_ENTRY(SPR_PLAY, 0, -1, NULL, S_NULL),               /* S_PLAY */
+  STATE_ENTRY(SPR_PLAY, 0, 4, NULL, S_PLAY_RUN2),           /* S_PLAY_RUN1 */
+  STATE_ENTRY(SPR_PLAY, 1, 4, NULL, S_PLAY_RUN3),           /* S_PLAY_RUN2 */
+  STATE_ENTRY(SPR_PLAY, 2, 4, NULL, S_PLAY_RUN4),           /* S_PLAY_RUN3 */
+  STATE_ENTRY(SPR_PLAY, 3, 4, NULL, S_PLAY_RUN1),           /* S_PLAY_RUN4 */
+  STATE_ENTRY(SPR_PLAY, 4, 12, NULL, S_PLAY),               /* S_PLAY_ATK1 */
+  STATE_ENTRY(SPR_PLAY, 32773, 6, NULL, S_PLAY_ATK1),       /* S_PLAY_ATK2 */
+  STATE_ENTRY(SPR_PLAY, 6, 4, NULL, S_PLAY_PAIN2),          /* S_PLAY_PAIN */
+  STATE_ENTRY(SPR_PLAY, 6, 4, a_pain, S_PLAY),              /* S_PLAY_PAIN2 */
+  STATE_ENTRY(SPR_PLAY, 7, 10, NULL, S_PLAY_DIE2),          /* S_PLAY_DIE1 */
+  STATE_ENTRY(SPR_PLAY, 8, 10, a_player_screm,
+              S_PLAY_DIE3),                                 /* S_PLAY_DIE2 */
+  STATE_ENTRY(SPR_PLAY, 9, 10, a_fall, S_PLAY_DIE4),        /* S_PLAY_DIE3 */
+  STATE_ENTRY(SPR_PLAY, 10, 10, NULL, S_PLAY_DIE5),         /* S_PLAY_DIE4 */
+  STATE_ENTRY(SPR_PLAY, 11, 10, NULL, S_PLAY_DIE6),         /* S_PLAY_DIE5 */
+  STATE_ENTRY(SPR_PLAY, 12, 10, NULL, S_PLAY_DIE7),         /* S_PLAY_DIE6 */
+  STATE_ENTRY(SPR_PLAY, 13, -1, NULL, S_NULL),              /* S_PLAY_DIE7 */
+  STATE_ENTRY(SPR_PLAY, 14, 5, NULL, S_PLAY_XDIE2),         /* S_PLAY_XDIE1 */
+  STATE_ENTRY(SPR_PLAY, 15, 5, a_xscream, S_PLAY_XDIE3),    /* S_PLAY_XDIE2 */
+  STATE_ENTRY(SPR_PLAY, 16, 5, a_fall, S_PLAY_XDIE4),       /* S_PLAY_XDIE3 */
+  STATE_ENTRY(SPR_PLAY, 17, 5, NULL, S_PLAY_XDIE5),         /* S_PLAY_XDIE4 */
+  STATE_ENTRY(SPR_PLAY, 18, 5, NULL, S_PLAY_XDIE6),         /* S_PLAY_XDIE5 */
+  STATE_ENTRY(SPR_PLAY, 19, 5, NULL, S_PLAY_XDIE7),         /* S_PLAY_XDIE6 */
+  STATE_ENTRY(SPR_PLAY, 20, 5, NULL, S_PLAY_XDIE8),         /* S_PLAY_XDIE7 */
+  STATE_ENTRY(SPR_PLAY, 21, 5, NULL, S_PLAY_XDIE9),         /* S_PLAY_XDIE8 */
+  STATE_ENTRY(SPR_PLAY, 22, -1, NULL, S_NULL),              /* S_PLAY_XDIE9 */
+  STATE_ENTRY(SPR_POSS, 0, 10, a_look, S_POSS_STND2),       /* S_POSS_STND */
+  STATE_ENTRY(SPR_POSS, 1, 10, a_look, S_POSS_STND),        /* S_POSS_STND2 */
+  STATE_ENTRY(SPR_POSS, 0, 4, a_chase, S_POSS_RUN2),        /* S_POSS_RUN1 */
+  STATE_ENTRY(SPR_POSS, 0, 4, a_chase, S_POSS_RUN3),        /* S_POSS_RUN2 */
+  STATE_ENTRY(SPR_POSS, 1, 4, a_chase, S_POSS_RUN4),        /* S_POSS_RUN3 */
+  STATE_ENTRY(SPR_POSS, 1, 4, a_chase, S_POSS_RUN5),        /* S_POSS_RUN4 */
+  STATE_ENTRY(SPR_POSS, 2, 4, a_chase, S_POSS_RUN6),        /* S_POSS_RUN5 */
+  STATE_ENTRY(SPR_POSS, 2, 4, a_chase, S_POSS_RUN7),        /* S_POSS_RUN6 */
+  STATE_ENTRY(SPR_POSS, 3, 4, a_chase, S_POSS_RUN8),        /* S_POSS_RUN7 */
+  STATE_ENTRY(SPR_POSS, 3, 4, a_chase, S_POSS_RUN1),        /* S_POSS_RUN8 */
+  STATE_ENTRY(SPR_POSS, 4, 10, a_face_target,
+              S_POSS_ATK2),                               /* S_POSS_ATK1 */
+  STATE_ENTRY(SPR_POSS, 5, 8, a_pos_attack, S_POSS_ATK3), /* S_POSS_ATK2 */
+  STATE_ENTRY(SPR_POSS, 4, 8, NULL, S_POSS_RUN1),         /* S_POSS_ATK3 */
+  STATE_ENTRY(SPR_POSS, 6, 3, NULL, S_POSS_PAIN2),        /* S_POSS_PAIN */
+  STATE_ENTRY(SPR_POSS, 6, 3, a_pain, S_POSS_RUN1),       /* S_POSS_PAIN2 */
+  STATE_ENTRY(SPR_POSS, 7, 5, NULL, S_POSS_DIE2),         /* S_POSS_DIE1 */
+  STATE_ENTRY(SPR_POSS, 8, 5, a_scream, S_POSS_DIE3),     /* S_POSS_DIE2 */
+  STATE_ENTRY(SPR_POSS, 9, 5, a_fall, S_POSS_DIE4),       /* S_POSS_DIE3 */
+  STATE_ENTRY(SPR_POSS, 10, 5, NULL, S_POSS_DIE5),        /* S_POSS_DIE4 */
+  STATE_ENTRY(SPR_POSS, 11, -1, NULL, S_NULL),            /* S_POSS_DIE5 */
+  STATE_ENTRY(SPR_POSS, 12, 5, NULL, S_POSS_XDIE2),       /* S_POSS_XDIE1 */
+  STATE_ENTRY(SPR_POSS, 13, 5, a_xscream, S_POSS_XDIE3),  /* S_POSS_XDIE2 */
+  STATE_ENTRY(SPR_POSS, 14, 5, a_fall, S_POSS_XDIE4),     /* S_POSS_XDIE3 */
+  STATE_ENTRY(SPR_POSS, 15, 5, NULL, S_POSS_XDIE5),       /* S_POSS_XDIE4 */
+  STATE_ENTRY(SPR_POSS, 16, 5, NULL, S_POSS_XDIE6),       /* S_POSS_XDIE5 */
+  STATE_ENTRY(SPR_POSS, 17, 5, NULL, S_POSS_XDIE7),       /* S_POSS_XDIE6 */
+  STATE_ENTRY(SPR_POSS, 18, 5, NULL, S_POSS_XDIE8),       /* S_POSS_XDIE7 */
+  STATE_ENTRY(SPR_POSS, 19, 5, NULL, S_POSS_XDIE9),       /* S_POSS_XDIE8 */
+  STATE_ENTRY(SPR_POSS, 20, -1, NULL, S_NULL),            /* S_POSS_XDIE9 */
+  STATE_ENTRY(SPR_POSS, 10, 5, NULL, S_POSS_RAISE2),      /* S_POSS_RAISE1 */
+  STATE_ENTRY(SPR_POSS, 9, 5, NULL, S_POSS_RAISE3),       /* S_POSS_RAISE2 */
+  STATE_ENTRY(SPR_POSS, 8, 5, NULL, S_POSS_RAISE4),       /* S_POSS_RAISE3 */
+  STATE_ENTRY(SPR_POSS, 7, 5, NULL, S_POSS_RUN1),         /* S_POSS_RAISE4 */
+  STATE_ENTRY(SPR_SPOS, 0, 10, a_look, S_SPOS_STND2),     /* S_SPOS_STND */
+  STATE_ENTRY(SPR_SPOS, 1, 10, a_look, S_SPOS_STND),      /* S_SPOS_STND2 */
+  STATE_ENTRY(SPR_SPOS, 0, 3, a_chase, S_SPOS_RUN2),      /* S_SPOS_RUN1 */
+  STATE_ENTRY(SPR_SPOS, 0, 3, a_chase, S_SPOS_RUN3),      /* S_SPOS_RUN2 */
+  STATE_ENTRY(SPR_SPOS, 1, 3, a_chase, S_SPOS_RUN4),      /* S_SPOS_RUN3 */
+  STATE_ENTRY(SPR_SPOS, 1, 3, a_chase, S_SPOS_RUN5),      /* S_SPOS_RUN4 */
+  STATE_ENTRY(SPR_SPOS, 2, 3, a_chase, S_SPOS_RUN6),      /* S_SPOS_RUN5 */
+  STATE_ENTRY(SPR_SPOS, 2, 3, a_chase, S_SPOS_RUN7),      /* S_SPOS_RUN6 */
+  STATE_ENTRY(SPR_SPOS, 3, 3, a_chase, S_SPOS_RUN8),      /* S_SPOS_RUN7 */
+  STATE_ENTRY(SPR_SPOS, 3, 3, a_chase, S_SPOS_RUN1),      /* S_SPOS_RUN8 */
+  STATE_ENTRY(SPR_SPOS, 4, 10, a_face_target,
+              S_SPOS_ATK2), /* S_SPOS_ATK1 */
+  STATE_ENTRY(SPR_SPOS, 32773, 10, a_s_pos_attack,
+              S_SPOS_ATK3),                                /* S_SPOS_ATK2 */
+  STATE_ENTRY(SPR_SPOS, 4, 10, NULL, S_SPOS_RUN1),         /* S_SPOS_ATK3 */
+  STATE_ENTRY(SPR_SPOS, 6, 3, NULL, S_SPOS_PAIN2),         /* S_SPOS_PAIN */
+  STATE_ENTRY(SPR_SPOS, 6, 3, a_pain, S_SPOS_RUN1),        /* S_SPOS_PAIN2 */
+  STATE_ENTRY(SPR_SPOS, 7, 5, NULL, S_SPOS_DIE2),          /* S_SPOS_DIE1 */
+  STATE_ENTRY(SPR_SPOS, 8, 5, a_scream, S_SPOS_DIE3),      /* S_SPOS_DIE2 */
+  STATE_ENTRY(SPR_SPOS, 9, 5, a_fall, S_SPOS_DIE4),        /* S_SPOS_DIE3 */
+  STATE_ENTRY(SPR_SPOS, 10, 5, NULL, S_SPOS_DIE5),         /* S_SPOS_DIE4 */
+  STATE_ENTRY(SPR_SPOS, 11, -1, NULL, S_NULL),             /* S_SPOS_DIE5 */
+  STATE_ENTRY(SPR_SPOS, 12, 5, NULL, S_SPOS_XDIE2),        /* S_SPOS_XDIE1 */
+  STATE_ENTRY(SPR_SPOS, 13, 5, a_xscream, S_SPOS_XDIE3),   /* S_SPOS_XDIE2 */
+  STATE_ENTRY(SPR_SPOS, 14, 5, a_fall, S_SPOS_XDIE4),      /* S_SPOS_XDIE3 */
+  STATE_ENTRY(SPR_SPOS, 15, 5, NULL, S_SPOS_XDIE5),        /* S_SPOS_XDIE4 */
+  STATE_ENTRY(SPR_SPOS, 16, 5, NULL, S_SPOS_XDIE6),        /* S_SPOS_XDIE5 */
+  STATE_ENTRY(SPR_SPOS, 17, 5, NULL, S_SPOS_XDIE7),        /* S_SPOS_XDIE6 */
+  STATE_ENTRY(SPR_SPOS, 18, 5, NULL, S_SPOS_XDIE8),        /* S_SPOS_XDIE7 */
+  STATE_ENTRY(SPR_SPOS, 19, 5, NULL, S_SPOS_XDIE9),        /* S_SPOS_XDIE8 */
+  STATE_ENTRY(SPR_SPOS, 20, -1, NULL, S_NULL),             /* S_SPOS_XDIE9 */
+  STATE_ENTRY(SPR_SPOS, 11, 5, NULL, S_SPOS_RAISE2),       /* S_SPOS_RAISE1 */
+  STATE_ENTRY(SPR_SPOS, 10, 5, NULL, S_SPOS_RAISE3),       /* S_SPOS_RAISE2 */
+  STATE_ENTRY(SPR_SPOS, 9, 5, NULL, S_SPOS_RAISE4),        /* S_SPOS_RAISE3 */
+  STATE_ENTRY(SPR_SPOS, 8, 5, NULL, S_SPOS_RAISE5),        /* S_SPOS_RAISE4 */
+  STATE_ENTRY(SPR_SPOS, 7, 5, NULL, S_SPOS_RUN1),          /* S_SPOS_RAISE5 */
+  STATE_ENTRY(SPR_VILE, 0, 10, a_look, S_VILE_STND2),      /* S_VILE_STND */
+  STATE_ENTRY(SPR_VILE, 1, 10, a_look, S_VILE_STND),       /* S_VILE_STND2 */
+  STATE_ENTRY(SPR_VILE, 0, 2, a_vile_chase, S_VILE_RUN2),  /* S_VILE_RUN1 */
+  STATE_ENTRY(SPR_VILE, 0, 2, a_vile_chase, S_VILE_RUN3),  /* S_VILE_RUN2 */
+  STATE_ENTRY(SPR_VILE, 1, 2, a_vile_chase, S_VILE_RUN4),  /* S_VILE_RUN3 */
+  STATE_ENTRY(SPR_VILE, 1, 2, a_vile_chase, S_VILE_RUN5),  /* S_VILE_RUN4 */
+  STATE_ENTRY(SPR_VILE, 2, 2, a_vile_chase, S_VILE_RUN6),  /* S_VILE_RUN5 */
+  STATE_ENTRY(SPR_VILE, 2, 2, a_vile_chase, S_VILE_RUN7),  /* S_VILE_RUN6 */
+  STATE_ENTRY(SPR_VILE, 3, 2, a_vile_chase, S_VILE_RUN8),  /* S_VILE_RUN7 */
+  STATE_ENTRY(SPR_VILE, 3, 2, a_vile_chase, S_VILE_RUN9),  /* S_VILE_RUN8 */
+  STATE_ENTRY(SPR_VILE, 4, 2, a_vile_chase, S_VILE_RUN10), /* S_VILE_RUN9 */
+  STATE_ENTRY(SPR_VILE, 4, 2, a_vile_chase,
+              S_VILE_RUN11), /* S_VILE_RUN10 */
+  STATE_ENTRY(SPR_VILE, 5, 2, a_vile_chase,
+              S_VILE_RUN12),                              /* S_VILE_RUN11 */
+  STATE_ENTRY(SPR_VILE, 5, 2, a_vile_chase, S_VILE_RUN1), /* S_VILE_RUN12 */
+  STATE_ENTRY(SPR_VILE, 32774, 0, a_vile_start,
+              S_VILE_ATK2), /* S_VILE_ATK1 */
+  STATE_ENTRY(SPR_VILE, 32774, 10, a_face_target,
+              S_VILE_ATK3), /* S_VILE_ATK2 */
+  STATE_ENTRY(SPR_VILE, 32775, 8, a_vile_target,
+              S_VILE_ATK4), /* S_VILE_ATK3 */
+  STATE_ENTRY(SPR_VILE, 32776, 8, a_face_target,
+              S_VILE_ATK5), /* S_VILE_ATK4 */
+  STATE_ENTRY(SPR_VILE, 32777, 8, a_face_target,
+              S_VILE_ATK6), /* S_VILE_ATK5 */
+  STATE_ENTRY(SPR_VILE, 32778, 8, a_face_target,
+              S_VILE_ATK7), /* S_VILE_ATK6 */
+  STATE_ENTRY(SPR_VILE, 32779, 8, a_face_target,
+              S_VILE_ATK8), /* S_VILE_ATK7 */
+  STATE_ENTRY(SPR_VILE, 32780, 8, a_face_target,
+              S_VILE_ATK9), /* S_VILE_ATK8 */
+  STATE_ENTRY(SPR_VILE, 32781, 8, a_face_target,
+              S_VILE_ATK10), /* S_VILE_ATK9 */
+  STATE_ENTRY(SPR_VILE, 32782, 8, a_vile_attack,
+              S_VILE_ATK11),                             /* S_VILE_ATK10 */
+  STATE_ENTRY(SPR_VILE, 32783, 20, NULL, S_VILE_RUN1),   /* S_VILE_ATK11 */
+  STATE_ENTRY(SPR_VILE, 32794, 10, NULL, S_VILE_HEAL2),  /* S_VILE_HEAL1 */
+  STATE_ENTRY(SPR_VILE, 32795, 10, NULL, S_VILE_HEAL3),  /* S_VILE_HEAL2 */
+  STATE_ENTRY(SPR_VILE, 32796, 10, NULL, S_VILE_RUN1),   /* S_VILE_HEAL3 */
+  STATE_ENTRY(SPR_VILE, 16, 5, NULL, S_VILE_PAIN2),      /* S_VILE_PAIN */
+  STATE_ENTRY(SPR_VILE, 16, 5, a_pain, S_VILE_RUN1),     /* S_VILE_PAIN2 */
+  STATE_ENTRY(SPR_VILE, 16, 7, NULL, S_VILE_DIE2),       /* S_VILE_DIE1 */
+  STATE_ENTRY(SPR_VILE, 17, 7, a_scream, S_VILE_DIE3),   /* S_VILE_DIE2 */
+  STATE_ENTRY(SPR_VILE, 18, 7, a_fall, S_VILE_DIE4),     /* S_VILE_DIE3 */
+  STATE_ENTRY(SPR_VILE, 19, 7, NULL, S_VILE_DIE5),       /* S_VILE_DIE4 */
+  STATE_ENTRY(SPR_VILE, 20, 7, NULL, S_VILE_DIE6),       /* S_VILE_DIE5 */
+  STATE_ENTRY(SPR_VILE, 21, 7, NULL, S_VILE_DIE7),       /* S_VILE_DIE6 */
+  STATE_ENTRY(SPR_VILE, 22, 7, NULL, S_VILE_DIE8),       /* S_VILE_DIE7 */
+  STATE_ENTRY(SPR_VILE, 23, 5, NULL, S_VILE_DIE9),       /* S_VILE_DIE8 */
+  STATE_ENTRY(SPR_VILE, 24, 5, NULL, S_VILE_DIE10),      /* S_VILE_DIE9 */
+  STATE_ENTRY(SPR_VILE, 25, -1, NULL, S_NULL),           /* S_VILE_DIE10 */
+  STATE_ENTRY(SPR_FIRE, 32768, 2, a_start_fire,
+          S_FIRE2),                                      /* S_FIRE1 */
+  STATE_ENTRY(SPR_FIRE, 32769, 2, a_fire, S_FIRE3),      /* S_FIRE2 */
+  STATE_ENTRY(SPR_FIRE, 32768, 2, a_fire, S_FIRE4),      /* S_FIRE3 */
+  STATE_ENTRY(SPR_FIRE, 32769, 2, a_fire, S_FIRE5),      /* S_FIRE4 */
+  STATE_ENTRY(SPR_FIRE, 32770, 2, a_fire_crackle,
+          S_FIRE6),                                      /* S_FIRE5 */
+  STATE_ENTRY(SPR_FIRE, 32769, 2, a_fire, S_FIRE7),      /* S_FIRE6 */
+  STATE_ENTRY(SPR_FIRE, 32770, 2, a_fire, S_FIRE8),      /* S_FIRE7 */
+  STATE_ENTRY(SPR_FIRE, 32769, 2, a_fire, S_FIRE9),      /* S_FIRE8 */
+  STATE_ENTRY(SPR_FIRE, 32770, 2, a_fire, S_FIRE10),     /* S_FIRE9 */
+  STATE_ENTRY(SPR_FIRE, 32771, 2, a_fire, S_FIRE11),     /* S_FIRE10 */
+  STATE_ENTRY(SPR_FIRE, 32770, 2, a_fire, S_FIRE12),     /* S_FIRE11 */
+  STATE_ENTRY(SPR_FIRE, 32771, 2, a_fire, S_FIRE13),     /* S_FIRE12 */
+  STATE_ENTRY(SPR_FIRE, 32770, 2, a_fire, S_FIRE14),     /* S_FIRE13 */
+  STATE_ENTRY(SPR_FIRE, 32771, 2, a_fire, S_FIRE15),     /* S_FIRE14 */
+  STATE_ENTRY(SPR_FIRE, 32772, 2, a_fire, S_FIRE16),     /* S_FIRE15 */
+  STATE_ENTRY(SPR_FIRE, 32771, 2, a_fire, S_FIRE17),     /* S_FIRE16 */
+  STATE_ENTRY(SPR_FIRE, 32772, 2, a_fire, S_FIRE18),     /* S_FIRE17 */
+  STATE_ENTRY(SPR_FIRE, 32771, 2, a_fire, S_FIRE19),     /* S_FIRE18 */
+  STATE_ENTRY(SPR_FIRE, 32772, 2, a_fire_crackle,
+          S_FIRE20),                                     /* S_FIRE19 */
+  STATE_ENTRY(SPR_FIRE, 32773, 2, a_fire, S_FIRE21),     /* S_FIRE20 */
+  STATE_ENTRY(SPR_FIRE, 32772, 2, a_fire, S_FIRE22),     /* S_FIRE21 */
+  STATE_ENTRY(SPR_FIRE, 32773, 2, a_fire, S_FIRE23),     /* S_FIRE22 */
+  STATE_ENTRY(SPR_FIRE, 32772, 2, a_fire, S_FIRE24),     /* S_FIRE23 */
+  STATE_ENTRY(SPR_FIRE, 32773, 2, a_fire, S_FIRE25),     /* S_FIRE24 */
+  STATE_ENTRY(SPR_FIRE, 32774, 2, a_fire, S_FIRE26),     /* S_FIRE25 */
+  STATE_ENTRY(SPR_FIRE, 32775, 2, a_fire, S_FIRE27),     /* S_FIRE26 */
+  STATE_ENTRY(SPR_FIRE, 32774, 2, a_fire, S_FIRE28),     /* S_FIRE27 */
+  STATE_ENTRY(SPR_FIRE, 32775, 2, a_fire, S_FIRE29),     /* S_FIRE28 */
+  STATE_ENTRY(SPR_FIRE, 32774, 2, a_fire, S_FIRE30),     /* S_FIRE29 */
+  STATE_ENTRY(SPR_FIRE, 32775, 2, a_fire, S_NULL),       /* S_FIRE30 */
+  STATE_ENTRY(SPR_PUFF, 1, 4, NULL, S_SMOKE2),           /* S_SMOKE1 */
+  STATE_ENTRY(SPR_PUFF, 2, 4, NULL, S_SMOKE3),           /* S_SMOKE2 */
+  STATE_ENTRY(SPR_PUFF, 1, 4, NULL, S_SMOKE4),           /* S_SMOKE3 */
+  STATE_ENTRY(SPR_PUFF, 2, 4, NULL, S_SMOKE5),           /* S_SMOKE4 */
+  STATE_ENTRY(SPR_PUFF, 3, 4, NULL, S_NULL),             /* S_SMOKE5 */
+  STATE_ENTRY(SPR_FATB, 32768, 2, a_tracer, S_TRACER2),  /* S_TRACER */
+  STATE_ENTRY(SPR_FATB, 32769, 2, a_tracer, S_TRACER),   /* S_TRACER2 */
+  STATE_ENTRY(SPR_FBXP, 32768, 8, NULL, S_TRACEEXP2),    /* S_TRACEEXP1 */
+  STATE_ENTRY(SPR_FBXP, 32769, 6, NULL, S_TRACEEXP3),    /* S_TRACEEXP2 */
+  STATE_ENTRY(SPR_FBXP, 32770, 4, NULL, S_NULL),         /* S_TRACEEXP3 */
+  STATE_ENTRY(SPR_SKEL, 0, 10, a_look, S_SKEL_STND2),    /* S_SKEL_STND */
+  STATE_ENTRY(SPR_SKEL, 1, 10, a_look, S_SKEL_STND),     /* S_SKEL_STND2 */
+  STATE_ENTRY(SPR_SKEL, 0, 2, a_chase, S_SKEL_RUN2),     /* S_SKEL_RUN1 */
+  STATE_ENTRY(SPR_SKEL, 0, 2, a_chase, S_SKEL_RUN3),     /* S_SKEL_RUN2 */
+  STATE_ENTRY(SPR_SKEL, 1, 2, a_chase, S_SKEL_RUN4),     /* S_SKEL_RUN3 */
+  STATE_ENTRY(SPR_SKEL, 1, 2, a_chase, S_SKEL_RUN5),     /* S_SKEL_RUN4 */
+  STATE_ENTRY(SPR_SKEL, 2, 2, a_chase, S_SKEL_RUN6),     /* S_SKEL_RUN5 */
+  STATE_ENTRY(SPR_SKEL, 2, 2, a_chase, S_SKEL_RUN7),     /* S_SKEL_RUN6 */
+  STATE_ENTRY(SPR_SKEL, 3, 2, a_chase, S_SKEL_RUN8),     /* S_SKEL_RUN7 */
+  STATE_ENTRY(SPR_SKEL, 3, 2, a_chase, S_SKEL_RUN9),     /* S_SKEL_RUN8 */
+  STATE_ENTRY(SPR_SKEL, 4, 2, a_chase, S_SKEL_RUN10),    /* S_SKEL_RUN9 */
+  STATE_ENTRY(SPR_SKEL, 4, 2, a_chase, S_SKEL_RUN11),    /* S_SKEL_RUN10 */
+  STATE_ENTRY(SPR_SKEL, 5, 2, a_chase, S_SKEL_RUN12),    /* S_SKEL_RUN11 */
+  STATE_ENTRY(SPR_SKEL, 5, 2, a_chase, S_SKEL_RUN1),     /* S_SKEL_RUN12 */
+  STATE_ENTRY(SPR_SKEL, 6, 0, a_face_target,
+              S_SKEL_FIST2),                             /* S_SKEL_FIST1 */
+  STATE_ENTRY(SPR_SKEL, 6, 6, a_skel_woosh,
+              S_SKEL_FIST3),                             /* S_SKEL_FIST2 */
+  STATE_ENTRY(SPR_SKEL, 7, 6, a_face_target,
+              S_SKEL_FIST4),                             /* S_SKEL_FIST3 */
+  STATE_ENTRY(SPR_SKEL, 8, 6, a_skel_fist, S_SKEL_RUN1), /* S_SKEL_FIST4 */
+  STATE_ENTRY(SPR_SKEL, 32777, 0, a_face_target,
+              S_SKEL_MISS2), /* S_SKEL_MISS1 */
+  STATE_ENTRY(SPR_SKEL, 32777, 10, a_face_target,
+              S_SKEL_MISS3), /* S_SKEL_MISS2 */
+  STATE_ENTRY(SPR_SKEL, 10, 10, a_skel_missile,
+              S_SKEL_MISS4), /* S_SKEL_MISS3 */
+  STATE_ENTRY(SPR_SKEL, 10, 10, a_face_target,
+              S_SKEL_RUN1),                               /* S_SKEL_MISS4 */
+  STATE_ENTRY(SPR_SKEL, 11, 5, NULL, S_SKEL_PAIN2),       /* S_SKEL_PAIN */
+  STATE_ENTRY(SPR_SKEL, 11, 5, a_pain, S_SKEL_RUN1),      /* S_SKEL_PAIN2 */
+  STATE_ENTRY(SPR_SKEL, 11, 7, NULL, S_SKEL_DIE2),        /* S_SKEL_DIE1 */
+  STATE_ENTRY(SPR_SKEL, 12, 7, NULL, S_SKEL_DIE3),        /* S_SKEL_DIE2 */
+  STATE_ENTRY(SPR_SKEL, 13, 7, a_scream, S_SKEL_DIE4),    /* S_SKEL_DIE3 */
+  STATE_ENTRY(SPR_SKEL, 14, 7, a_fall, S_SKEL_DIE5),      /* S_SKEL_DIE4 */
+  STATE_ENTRY(SPR_SKEL, 15, 7, NULL, S_SKEL_DIE6),        /* S_SKEL_DIE5 */
+  STATE_ENTRY(SPR_SKEL, 16, -1, NULL, S_NULL),            /* S_SKEL_DIE6 */
+  STATE_ENTRY(SPR_SKEL, 16, 5, NULL, S_SKEL_RAISE2),      /* S_SKEL_RAISE1 */
+  STATE_ENTRY(SPR_SKEL, 15, 5, NULL, S_SKEL_RAISE3),      /* S_SKEL_RAISE2 */
+  STATE_ENTRY(SPR_SKEL, 14, 5, NULL, S_SKEL_RAISE4),      /* S_SKEL_RAISE3 */
+  STATE_ENTRY(SPR_SKEL, 13, 5, NULL, S_SKEL_RAISE5),      /* S_SKEL_RAISE4 */
+  STATE_ENTRY(SPR_SKEL, 12, 5, NULL, S_SKEL_RAISE6),      /* S_SKEL_RAISE5 */
+  STATE_ENTRY(SPR_SKEL, 11, 5, NULL, S_SKEL_RUN1),        /* S_SKEL_RAISE6 */
+  STATE_ENTRY(SPR_MANF, 32768, 4, NULL, S_FATSHOT2),      /* S_FATSHOT1 */
+  STATE_ENTRY(SPR_MANF, 32769, 4, NULL, S_FATSHOT1),      /* S_FATSHOT2 */
+  STATE_ENTRY(SPR_MISL, 32769, 8, NULL, S_FATSHOTX2),     /* S_FATSHOTX1 */
+  STATE_ENTRY(SPR_MISL, 32770, 6, NULL, S_FATSHOTX3),     /* S_FATSHOTX2 */
+  STATE_ENTRY(SPR_MISL, 32771, 4, NULL, S_NULL),          /* S_FATSHOTX3 */
+  STATE_ENTRY(SPR_FATT, 0, 15, a_look, S_FATT_STND2),     /* S_FATT_STND */
+  STATE_ENTRY(SPR_FATT, 1, 15, a_look, S_FATT_STND),      /* S_FATT_STND2 */
+  STATE_ENTRY(SPR_FATT, 0, 4, a_chase, S_FATT_RUN2),      /* S_FATT_RUN1 */
+  STATE_ENTRY(SPR_FATT, 0, 4, a_chase, S_FATT_RUN3),      /* S_FATT_RUN2 */
+  STATE_ENTRY(SPR_FATT, 1, 4, a_chase, S_FATT_RUN4),      /* S_FATT_RUN3 */
+  STATE_ENTRY(SPR_FATT, 1, 4, a_chase, S_FATT_RUN5),      /* S_FATT_RUN4 */
+  STATE_ENTRY(SPR_FATT, 2, 4, a_chase, S_FATT_RUN6),      /* S_FATT_RUN5 */
+  STATE_ENTRY(SPR_FATT, 2, 4, a_chase, S_FATT_RUN7),      /* S_FATT_RUN6 */
+  STATE_ENTRY(SPR_FATT, 3, 4, a_chase, S_FATT_RUN8),      /* S_FATT_RUN7 */
+  STATE_ENTRY(SPR_FATT, 3, 4, a_chase, S_FATT_RUN9),      /* S_FATT_RUN8 */
+  STATE_ENTRY(SPR_FATT, 4, 4, a_chase, S_FATT_RUN10),     /* S_FATT_RUN9 */
+  STATE_ENTRY(SPR_FATT, 4, 4, a_chase, S_FATT_RUN11),     /* S_FATT_RUN10 */
+  STATE_ENTRY(SPR_FATT, 5, 4, a_chase, S_FATT_RUN12),     /* S_FATT_RUN11 */
+  STATE_ENTRY(SPR_FATT, 5, 4, a_chase, S_FATT_RUN1),      /* S_FATT_RUN12 */
+  STATE_ENTRY(SPR_FATT, 6, 20, a_fat_raise, S_FATT_ATK2), /* S_FATT_ATK1 */
+  STATE_ENTRY(SPR_FATT, 32775, 10, a_fat_attack1,
+              S_FATT_ATK3),                                /* S_FATT_ATK2 */
+  STATE_ENTRY(SPR_FATT, 8, 5, a_face_target, S_FATT_ATK4), /* S_FATT_ATK3 */
+  STATE_ENTRY(SPR_FATT, 6, 5, a_face_target, S_FATT_ATK5), /* S_FATT_ATK4 */
+  STATE_ENTRY(SPR_FATT, 32775, 10, a_fat_attack2,
+              S_FATT_ATK6),                                /* S_FATT_ATK5 */
+  STATE_ENTRY(SPR_FATT, 8, 5, a_face_target, S_FATT_ATK7), /* S_FATT_ATK6 */
+  STATE_ENTRY(SPR_FATT, 6, 5, a_face_target, S_FATT_ATK8), /* S_FATT_ATK7 */
+  STATE_ENTRY(SPR_FATT, 32775, 10, a_fat_attack3,
+              S_FATT_ATK9), /* S_FATT_ATK8 */
+  STATE_ENTRY(SPR_FATT, 8, 5, a_face_target,
+              S_FATT_ATK10), /* S_FATT_ATK9 */
+  STATE_ENTRY(SPR_FATT, 6, 5, a_face_target,
+              S_FATT_RUN1),                            /* S_FATT_ATK10 */
+  STATE_ENTRY(SPR_FATT, 9, 3, NULL, S_FATT_PAIN2),     /* S_FATT_PAIN */
+  STATE_ENTRY(SPR_FATT, 9, 3, a_pain, S_FATT_RUN1),    /* S_FATT_PAIN2 */
+  STATE_ENTRY(SPR_FATT, 10, 6, NULL, S_FATT_DIE2),     /* S_FATT_DIE1 */
+  STATE_ENTRY(SPR_FATT, 11, 6, a_scream, S_FATT_DIE3), /* S_FATT_DIE2 */
+  STATE_ENTRY(SPR_FATT, 12, 6, a_fall, S_FATT_DIE4),   /* S_FATT_DIE3 */
+  STATE_ENTRY(SPR_FATT, 13, 6, NULL, S_FATT_DIE5),     /* S_FATT_DIE4 */
+  STATE_ENTRY(SPR_FATT, 14, 6, NULL, S_FATT_DIE6),     /* S_FATT_DIE5 */
+  STATE_ENTRY(SPR_FATT, 15, 6, NULL, S_FATT_DIE7),     /* S_FATT_DIE6 */
+  STATE_ENTRY(SPR_FATT, 16, 6, NULL, S_FATT_DIE8),     /* S_FATT_DIE7 */
+  STATE_ENTRY(SPR_FATT, 17, 6, NULL, S_FATT_DIE9),     /* S_FATT_DIE8 */
+  STATE_ENTRY(SPR_FATT, 18, 6, NULL, S_FATT_DIE10),    /* S_FATT_DIE9 */
+  STATE_ENTRY(SPR_FATT, 19, -1, a_boss_death, S_NULL), /* S_FATT_DIE10 */
+  STATE_ENTRY(SPR_FATT, 17, 5, NULL, S_FATT_RAISE2),   /* S_FATT_RAISE1 */
+  STATE_ENTRY(SPR_FATT, 16, 5, NULL, S_FATT_RAISE3),   /* S_FATT_RAISE2 */
+  STATE_ENTRY(SPR_FATT, 15, 5, NULL, S_FATT_RAISE4),   /* S_FATT_RAISE3 */
+  STATE_ENTRY(SPR_FATT, 14, 5, NULL, S_FATT_RAISE5),   /* S_FATT_RAISE4 */
+  STATE_ENTRY(SPR_FATT, 13, 5, NULL, S_FATT_RAISE6),   /* S_FATT_RAISE5 */
+  STATE_ENTRY(SPR_FATT, 12, 5, NULL, S_FATT_RAISE7),   /* S_FATT_RAISE6 */
+  STATE_ENTRY(SPR_FATT, 11, 5, NULL, S_FATT_RAISE8),   /* S_FATT_RAISE7 */
+  STATE_ENTRY(SPR_FATT, 10, 5, NULL, S_FATT_RUN1),     /* S_FATT_RAISE8 */
+  STATE_ENTRY(SPR_CPOS, 0, 10, a_look, S_CPOS_STND2),  /* S_CPOS_STND */
+  STATE_ENTRY(SPR_CPOS, 1, 10, a_look, S_CPOS_STND),   /* S_CPOS_STND2 */
+  STATE_ENTRY(SPR_CPOS, 0, 3, a_chase, S_CPOS_RUN2),   /* S_CPOS_RUN1 */
+  STATE_ENTRY(SPR_CPOS, 0, 3, a_chase, S_CPOS_RUN3),   /* S_CPOS_RUN2 */
+  STATE_ENTRY(SPR_CPOS, 1, 3, a_chase, S_CPOS_RUN4),   /* S_CPOS_RUN3 */
+  STATE_ENTRY(SPR_CPOS, 1, 3, a_chase, S_CPOS_RUN5),   /* S_CPOS_RUN4 */
+  STATE_ENTRY(SPR_CPOS, 2, 3, a_chase, S_CPOS_RUN6),   /* S_CPOS_RUN5 */
+  STATE_ENTRY(SPR_CPOS, 2, 3, a_chase, S_CPOS_RUN7),   /* S_CPOS_RUN6 */
+  STATE_ENTRY(SPR_CPOS, 3, 3, a_chase, S_CPOS_RUN8),   /* S_CPOS_RUN7 */
+  STATE_ENTRY(SPR_CPOS, 3, 3, a_chase, S_CPOS_RUN1),   /* S_CPOS_RUN8 */
+  STATE_ENTRY(SPR_CPOS, 4, 10, a_face_target,
+              S_CPOS_ATK2), /* S_CPOS_ATK1 */
+  STATE_ENTRY(SPR_CPOS, 32773, 4, a_c_pos_attack,
+              S_CPOS_ATK3), /* S_CPOS_ATK2 */
+  STATE_ENTRY(SPR_CPOS, 32772, 4, a_c_pos_attack,
+              S_CPOS_ATK4), /* S_CPOS_ATK3 */
+  STATE_ENTRY(SPR_CPOS, 5, 1, a_c_pos_refire,
+              S_CPOS_ATK2),                                /* S_CPOS_ATK4 */
+  STATE_ENTRY(SPR_CPOS, 6, 3, NULL, S_CPOS_PAIN2),         /* S_CPOS_PAIN */
+  STATE_ENTRY(SPR_CPOS, 6, 3, a_pain, S_CPOS_RUN1),        /* S_CPOS_PAIN2 */
+  STATE_ENTRY(SPR_CPOS, 7, 5, NULL, S_CPOS_DIE2),          /* S_CPOS_DIE1 */
+  STATE_ENTRY(SPR_CPOS, 8, 5, a_scream, S_CPOS_DIE3),      /* S_CPOS_DIE2 */
+  STATE_ENTRY(SPR_CPOS, 9, 5, a_fall, S_CPOS_DIE4),        /* S_CPOS_DIE3 */
+  STATE_ENTRY(SPR_CPOS, 10, 5, NULL, S_CPOS_DIE5),         /* S_CPOS_DIE4 */
+  STATE_ENTRY(SPR_CPOS, 11, 5, NULL, S_CPOS_DIE6),         /* S_CPOS_DIE5 */
+  STATE_ENTRY(SPR_CPOS, 12, 5, NULL, S_CPOS_DIE7),         /* S_CPOS_DIE6 */
+  STATE_ENTRY(SPR_CPOS, 13, -1, NULL, S_NULL),             /* S_CPOS_DIE7 */
+  STATE_ENTRY(SPR_CPOS, 14, 5, NULL, S_CPOS_XDIE2),        /* S_CPOS_XDIE1 */
+  STATE_ENTRY(SPR_CPOS, 15, 5, a_xscream, S_CPOS_XDIE3),   /* S_CPOS_XDIE2 */
+  STATE_ENTRY(SPR_CPOS, 16, 5, a_fall, S_CPOS_XDIE4),      /* S_CPOS_XDIE3 */
+  STATE_ENTRY(SPR_CPOS, 17, 5, NULL, S_CPOS_XDIE5),        /* S_CPOS_XDIE4 */
+  STATE_ENTRY(SPR_CPOS, 18, 5, NULL, S_CPOS_XDIE6),        /* S_CPOS_XDIE5 */
+  STATE_ENTRY(SPR_CPOS, 19, -1, NULL, S_NULL),             /* S_CPOS_XDIE6 */
+  STATE_ENTRY(SPR_CPOS, 13, 5, NULL, S_CPOS_RAISE2),       /* S_CPOS_RAISE1 */
+  STATE_ENTRY(SPR_CPOS, 12, 5, NULL, S_CPOS_RAISE3),       /* S_CPOS_RAISE2 */
+  STATE_ENTRY(SPR_CPOS, 11, 5, NULL, S_CPOS_RAISE4),       /* S_CPOS_RAISE3 */
+  STATE_ENTRY(SPR_CPOS, 10, 5, NULL, S_CPOS_RAISE5),       /* S_CPOS_RAISE4 */
+  STATE_ENTRY(SPR_CPOS, 9, 5, NULL, S_CPOS_RAISE6),        /* S_CPOS_RAISE5 */
+  STATE_ENTRY(SPR_CPOS, 8, 5, NULL, S_CPOS_RAISE7),        /* S_CPOS_RAISE6 */
+  STATE_ENTRY(SPR_CPOS, 7, 5, NULL, S_CPOS_RUN1),          /* S_CPOS_RAISE7 */
+  STATE_ENTRY(SPR_TROO, 0, 10, a_look, S_TROO_STND2),      /* S_TROO_STND */
+  STATE_ENTRY(SPR_TROO, 1, 10, a_look, S_TROO_STND),       /* S_TROO_STND2 */
+  STATE_ENTRY(SPR_TROO, 0, 3, a_chase, S_TROO_RUN2),       /* S_TROO_RUN1 */
+  STATE_ENTRY(SPR_TROO, 0, 3, a_chase, S_TROO_RUN3),       /* S_TROO_RUN2 */
+  STATE_ENTRY(SPR_TROO, 1, 3, a_chase, S_TROO_RUN4),       /* S_TROO_RUN3 */
+  STATE_ENTRY(SPR_TROO, 1, 3, a_chase, S_TROO_RUN5),       /* S_TROO_RUN4 */
+  STATE_ENTRY(SPR_TROO, 2, 3, a_chase, S_TROO_RUN6),       /* S_TROO_RUN5 */
+  STATE_ENTRY(SPR_TROO, 2, 3, a_chase, S_TROO_RUN7),       /* S_TROO_RUN6 */
+  STATE_ENTRY(SPR_TROO, 3, 3, a_chase, S_TROO_RUN8),       /* S_TROO_RUN7 */
+  STATE_ENTRY(SPR_TROO, 3, 3, a_chase, S_TROO_RUN1),       /* S_TROO_RUN8 */
+  STATE_ENTRY(SPR_TROO, 4, 8, a_face_target, S_TROO_ATK2), /* S_TROO_ATK1 */
+  STATE_ENTRY(SPR_TROO, 5, 8, a_face_target, S_TROO_ATK3), /* S_TROO_ATK2 */
+  STATE_ENTRY(SPR_TROO, 6, 6, a_troop_attack,
+              S_TROO_RUN1),                                /* S_TROO_ATK3 */
+  STATE_ENTRY(SPR_TROO, 7, 2, NULL, S_TROO_PAIN2),         /* S_TROO_PAIN */
+  STATE_ENTRY(SPR_TROO, 7, 2, a_pain, S_TROO_RUN1),        /* S_TROO_PAIN2 */
+  STATE_ENTRY(SPR_TROO, 8, 8, NULL, S_TROO_DIE2),          /* S_TROO_DIE1 */
+  STATE_ENTRY(SPR_TROO, 9, 8, a_scream, S_TROO_DIE3),      /* S_TROO_DIE2 */
+  STATE_ENTRY(SPR_TROO, 10, 6, NULL, S_TROO_DIE4),         /* S_TROO_DIE3 */
+  STATE_ENTRY(SPR_TROO, 11, 6, a_fall, S_TROO_DIE5),       /* S_TROO_DIE4 */
+  STATE_ENTRY(SPR_TROO, 12, -1, NULL, S_NULL),             /* S_TROO_DIE5 */
+  STATE_ENTRY(SPR_TROO, 13, 5, NULL, S_TROO_XDIE2),        /* S_TROO_XDIE1 */
+  STATE_ENTRY(SPR_TROO, 14, 5, a_xscream, S_TROO_XDIE3),   /* S_TROO_XDIE2 */
+  STATE_ENTRY(SPR_TROO, 15, 5, NULL, S_TROO_XDIE4),        /* S_TROO_XDIE3 */
+  STATE_ENTRY(SPR_TROO, 16, 5, a_fall, S_TROO_XDIE5),      /* S_TROO_XDIE4 */
+  STATE_ENTRY(SPR_TROO, 17, 5, NULL, S_TROO_XDIE6),        /* S_TROO_XDIE5 */
+  STATE_ENTRY(SPR_TROO, 18, 5, NULL, S_TROO_XDIE7),        /* S_TROO_XDIE6 */
+  STATE_ENTRY(SPR_TROO, 19, 5, NULL, S_TROO_XDIE8),        /* S_TROO_XDIE7 */
+  STATE_ENTRY(SPR_TROO, 20, -1, NULL, S_NULL),             /* S_TROO_XDIE8 */
+  STATE_ENTRY(SPR_TROO, 12, 8, NULL, S_TROO_RAISE2),       /* S_TROO_RAISE1 */
+  STATE_ENTRY(SPR_TROO, 11, 8, NULL, S_TROO_RAISE3),       /* S_TROO_RAISE2 */
+  STATE_ENTRY(SPR_TROO, 10, 6, NULL, S_TROO_RAISE4),       /* S_TROO_RAISE3 */
+  STATE_ENTRY(SPR_TROO, 9, 6, NULL, S_TROO_RAISE5),        /* S_TROO_RAISE4 */
+  STATE_ENTRY(SPR_TROO, 8, 6, NULL, S_TROO_RUN1),          /* S_TROO_RAISE5 */
+  STATE_ENTRY(SPR_SARG, 0, 10, a_look, S_SARG_STND2),      /* S_SARG_STND */
+  STATE_ENTRY(SPR_SARG, 1, 10, a_look, S_SARG_STND),       /* S_SARG_STND2 */
+  STATE_ENTRY(SPR_SARG, 0, 2, a_chase, S_SARG_RUN2),       /* S_SARG_RUN1 */
+  STATE_ENTRY(SPR_SARG, 0, 2, a_chase, S_SARG_RUN3),       /* S_SARG_RUN2 */
+  STATE_ENTRY(SPR_SARG, 1, 2, a_chase, S_SARG_RUN4),       /* S_SARG_RUN3 */
+  STATE_ENTRY(SPR_SARG, 1, 2, a_chase, S_SARG_RUN5),       /* S_SARG_RUN4 */
+  STATE_ENTRY(SPR_SARG, 2, 2, a_chase, S_SARG_RUN6),       /* S_SARG_RUN5 */
+  STATE_ENTRY(SPR_SARG, 2, 2, a_chase, S_SARG_RUN7),       /* S_SARG_RUN6 */
+  STATE_ENTRY(SPR_SARG, 3, 2, a_chase, S_SARG_RUN8),       /* S_SARG_RUN7 */
+  STATE_ENTRY(SPR_SARG, 3, 2, a_chase, S_SARG_RUN1),       /* S_SARG_RUN8 */
+  STATE_ENTRY(SPR_SARG, 4, 8, a_face_target, S_SARG_ATK2), /* S_SARG_ATK1 */
+  STATE_ENTRY(SPR_SARG, 5, 8, a_face_target, S_SARG_ATK3), /* S_SARG_ATK2 */
+  STATE_ENTRY(SPR_SARG, 6, 8, a_sarg_attack, S_SARG_RUN1), /* S_SARG_ATK3 */
+  STATE_ENTRY(SPR_SARG, 7, 2, NULL, S_SARG_PAIN2),         /* S_SARG_PAIN */
+  STATE_ENTRY(SPR_SARG, 7, 2, a_pain, S_SARG_RUN1),        /* S_SARG_PAIN2 */
+  STATE_ENTRY(SPR_SARG, 8, 8, NULL, S_SARG_DIE2),          /* S_SARG_DIE1 */
+  STATE_ENTRY(SPR_SARG, 9, 8, a_scream, S_SARG_DIE3),      /* S_SARG_DIE2 */
+  STATE_ENTRY(SPR_SARG, 10, 4, NULL, S_SARG_DIE4),         /* S_SARG_DIE3 */
+  STATE_ENTRY(SPR_SARG, 11, 4, a_fall, S_SARG_DIE5),       /* S_SARG_DIE4 */
+  STATE_ENTRY(SPR_SARG, 12, 4, NULL, S_SARG_DIE6),         /* S_SARG_DIE5 */
+  STATE_ENTRY(SPR_SARG, 13, -1, NULL, S_NULL),             /* S_SARG_DIE6 */
+  STATE_ENTRY(SPR_SARG, 13, 5, NULL, S_SARG_RAISE2),       /* S_SARG_RAISE1 */
+  STATE_ENTRY(SPR_SARG, 12, 5, NULL, S_SARG_RAISE3),       /* S_SARG_RAISE2 */
+  STATE_ENTRY(SPR_SARG, 11, 5, NULL, S_SARG_RAISE4),       /* S_SARG_RAISE3 */
+  STATE_ENTRY(SPR_SARG, 10, 5, NULL, S_SARG_RAISE5),       /* S_SARG_RAISE4 */
+  STATE_ENTRY(SPR_SARG, 9, 5, NULL, S_SARG_RAISE6),        /* S_SARG_RAISE5 */
+  STATE_ENTRY(SPR_SARG, 8, 5, NULL, S_SARG_RUN1),          /* S_SARG_RAISE6 */
+  STATE_ENTRY(SPR_HEAD, 0, 10, a_look, S_HEAD_STND),       /* S_HEAD_STND */
+  STATE_ENTRY(SPR_HEAD, 0, 3, a_chase, S_HEAD_RUN1),       /* S_HEAD_RUN1 */
+  STATE_ENTRY(SPR_HEAD, 1, 5, a_face_target, S_HEAD_ATK2), /* S_HEAD_ATK1 */
+  STATE_ENTRY(SPR_HEAD, 2, 5, a_face_target, S_HEAD_ATK3), /* S_HEAD_ATK2 */
+  STATE_ENTRY(SPR_HEAD, 32771, 5, a_head_attack,
+              S_HEAD_RUN1),                                /* S_HEAD_ATK3 */
+  STATE_ENTRY(SPR_HEAD, 4, 3, NULL, S_HEAD_PAIN2),         /* S_HEAD_PAIN */
+  STATE_ENTRY(SPR_HEAD, 4, 3, a_pain, S_HEAD_PAIN3),       /* S_HEAD_PAIN2 */
+  STATE_ENTRY(SPR_HEAD, 5, 6, NULL, S_HEAD_RUN1),          /* S_HEAD_PAIN3 */
+  STATE_ENTRY(SPR_HEAD, 6, 8, NULL, S_HEAD_DIE2),          /* S_HEAD_DIE1 */
+  STATE_ENTRY(SPR_HEAD, 7, 8, a_scream, S_HEAD_DIE3),      /* S_HEAD_DIE2 */
+  STATE_ENTRY(SPR_HEAD, 8, 8, NULL, S_HEAD_DIE4),          /* S_HEAD_DIE3 */
+  STATE_ENTRY(SPR_HEAD, 9, 8, NULL, S_HEAD_DIE5),          /* S_HEAD_DIE4 */
+  STATE_ENTRY(SPR_HEAD, 10, 8, a_fall, S_HEAD_DIE6),       /* S_HEAD_DIE5 */
+  STATE_ENTRY(SPR_HEAD, 11, -1, NULL, S_NULL),             /* S_HEAD_DIE6 */
+  STATE_ENTRY(SPR_HEAD, 11, 8, NULL, S_HEAD_RAISE2),       /* S_HEAD_RAISE1 */
+  STATE_ENTRY(SPR_HEAD, 10, 8, NULL, S_HEAD_RAISE3),       /* S_HEAD_RAISE2 */
+  STATE_ENTRY(SPR_HEAD, 9, 8, NULL, S_HEAD_RAISE4),        /* S_HEAD_RAISE3 */
+  STATE_ENTRY(SPR_HEAD, 8, 8, NULL, S_HEAD_RAISE5),        /* S_HEAD_RAISE4 */
+  STATE_ENTRY(SPR_HEAD, 7, 8, NULL, S_HEAD_RAISE6),        /* S_HEAD_RAISE5 */
+  STATE_ENTRY(SPR_HEAD, 6, 8, NULL, S_HEAD_RUN1),          /* S_HEAD_RAISE6 */
+  STATE_ENTRY(SPR_BAL7, 32768, 4, NULL, S_BRBALL2),        /* S_BRBALL1 */
+  STATE_ENTRY(SPR_BAL7, 32769, 4, NULL, S_BRBALL1),        /* S_BRBALL2 */
+  STATE_ENTRY(SPR_BAL7, 32770, 6, NULL, S_BRBALLX2),       /* S_BRBALLX1 */
+  STATE_ENTRY(SPR_BAL7, 32771, 6, NULL, S_BRBALLX3),       /* S_BRBALLX2 */
+  STATE_ENTRY(SPR_BAL7, 32772, 6, NULL, S_NULL),           /* S_BRBALLX3 */
+  STATE_ENTRY(SPR_BOSS, 0, 10, a_look, S_BOSS_STND2),      /* S_BOSS_STND */
+  STATE_ENTRY(SPR_BOSS, 1, 10, a_look, S_BOSS_STND),       /* S_BOSS_STND2 */
+  STATE_ENTRY(SPR_BOSS, 0, 3, a_chase, S_BOSS_RUN2),       /* S_BOSS_RUN1 */
+  STATE_ENTRY(SPR_BOSS, 0, 3, a_chase, S_BOSS_RUN3),       /* S_BOSS_RUN2 */
+  STATE_ENTRY(SPR_BOSS, 1, 3, a_chase, S_BOSS_RUN4),       /* S_BOSS_RUN3 */
+  STATE_ENTRY(SPR_BOSS, 1, 3, a_chase, S_BOSS_RUN5),       /* S_BOSS_RUN4 */
+  STATE_ENTRY(SPR_BOSS, 2, 3, a_chase, S_BOSS_RUN6),       /* S_BOSS_RUN5 */
+  STATE_ENTRY(SPR_BOSS, 2, 3, a_chase, S_BOSS_RUN7),       /* S_BOSS_RUN6 */
+  STATE_ENTRY(SPR_BOSS, 3, 3, a_chase, S_BOSS_RUN8),       /* S_BOSS_RUN7 */
+  STATE_ENTRY(SPR_BOSS, 3, 3, a_chase, S_BOSS_RUN1),       /* S_BOSS_RUN8 */
+  STATE_ENTRY(SPR_BOSS, 4, 8, a_face_target, S_BOSS_ATK2), /* S_BOSS_ATK1 */
+  STATE_ENTRY(SPR_BOSS, 5, 8, a_face_target, S_BOSS_ATK3), /* S_BOSS_ATK2 */
+  STATE_ENTRY(SPR_BOSS, 6, 8, a_bruis_attack,
+              S_BOSS_RUN1),                                /* S_BOSS_ATK3 */
+  STATE_ENTRY(SPR_BOSS, 7, 2, NULL, S_BOSS_PAIN2),         /* S_BOSS_PAIN */
+  STATE_ENTRY(SPR_BOSS, 7, 2, a_pain, S_BOSS_RUN1),        /* S_BOSS_PAIN2 */
+  STATE_ENTRY(SPR_BOSS, 8, 8, NULL, S_BOSS_DIE2),          /* S_BOSS_DIE1 */
+  STATE_ENTRY(SPR_BOSS, 9, 8, a_scream, S_BOSS_DIE3),      /* S_BOSS_DIE2 */
+  STATE_ENTRY(SPR_BOSS, 10, 8, NULL, S_BOSS_DIE4),         /* S_BOSS_DIE3 */
+  STATE_ENTRY(SPR_BOSS, 11, 8, a_fall, S_BOSS_DIE5),       /* S_BOSS_DIE4 */
+  STATE_ENTRY(SPR_BOSS, 12, 8, NULL, S_BOSS_DIE6),         /* S_BOSS_DIE5 */
+  STATE_ENTRY(SPR_BOSS, 13, 8, NULL, S_BOSS_DIE7),         /* S_BOSS_DIE6 */
+  STATE_ENTRY(SPR_BOSS, 14, -1, a_boss_death, S_NULL),     /* S_BOSS_DIE7 */
+  STATE_ENTRY(SPR_BOSS, 14, 8, NULL, S_BOSS_RAISE2),       /* S_BOSS_RAISE1 */
+  STATE_ENTRY(SPR_BOSS, 13, 8, NULL, S_BOSS_RAISE3),       /* S_BOSS_RAISE2 */
+  STATE_ENTRY(SPR_BOSS, 12, 8, NULL, S_BOSS_RAISE4),       /* S_BOSS_RAISE3 */
+  STATE_ENTRY(SPR_BOSS, 11, 8, NULL, S_BOSS_RAISE5),       /* S_BOSS_RAISE4 */
+  STATE_ENTRY(SPR_BOSS, 10, 8, NULL, S_BOSS_RAISE6),       /* S_BOSS_RAISE5 */
+  STATE_ENTRY(SPR_BOSS, 9, 8, NULL, S_BOSS_RAISE7),        /* S_BOSS_RAISE6 */
+  STATE_ENTRY(SPR_BOSS, 8, 8, NULL, S_BOSS_RUN1),          /* S_BOSS_RAISE7 */
+  STATE_ENTRY(SPR_BOS2, 0, 10, a_look, S_BOS2_STND2),      /* S_BOS2_STND */
+  STATE_ENTRY(SPR_BOS2, 1, 10, a_look, S_BOS2_STND),       /* S_BOS2_STND2 */
+  STATE_ENTRY(SPR_BOS2, 0, 3, a_chase, S_BOS2_RUN2),       /* S_BOS2_RUN1 */
+  STATE_ENTRY(SPR_BOS2, 0, 3, a_chase, S_BOS2_RUN3),       /* S_BOS2_RUN2 */
+  STATE_ENTRY(SPR_BOS2, 1, 3, a_chase, S_BOS2_RUN4),       /* S_BOS2_RUN3 */
+  STATE_ENTRY(SPR_BOS2, 1, 3, a_chase, S_BOS2_RUN5),       /* S_BOS2_RUN4 */
+  STATE_ENTRY(SPR_BOS2, 2, 3, a_chase, S_BOS2_RUN6),       /* S_BOS2_RUN5 */
+  STATE_ENTRY(SPR_BOS2, 2, 3, a_chase, S_BOS2_RUN7),       /* S_BOS2_RUN6 */
+  STATE_ENTRY(SPR_BOS2, 3, 3, a_chase, S_BOS2_RUN8),       /* S_BOS2_RUN7 */
+  STATE_ENTRY(SPR_BOS2, 3, 3, a_chase, S_BOS2_RUN1),       /* S_BOS2_RUN8 */
+  STATE_ENTRY(SPR_BOS2, 4, 8, a_face_target, S_BOS2_ATK2), /* S_BOS2_ATK1 */
+  STATE_ENTRY(SPR_BOS2, 5, 8, a_face_target, S_BOS2_ATK3), /* S_BOS2_ATK2 */
+  STATE_ENTRY(SPR_BOS2, 6, 8, a_bruis_attack,
+              S_BOS2_RUN1),                           /* S_BOS2_ATK3 */
+  STATE_ENTRY(SPR_BOS2, 7, 2, NULL, S_BOS2_PAIN2),    /* S_BOS2_PAIN */
+  STATE_ENTRY(SPR_BOS2, 7, 2, a_pain, S_BOS2_RUN1),   /* S_BOS2_PAIN2 */
+  STATE_ENTRY(SPR_BOS2, 8, 8, NULL, S_BOS2_DIE2),     /* S_BOS2_DIE1 */
+  STATE_ENTRY(SPR_BOS2, 9, 8, a_scream, S_BOS2_DIE3), /* S_BOS2_DIE2 */
+  STATE_ENTRY(SPR_BOS2, 10, 8, NULL, S_BOS2_DIE4),    /* S_BOS2_DIE3 */
+  STATE_ENTRY(SPR_BOS2, 11, 8, a_fall, S_BOS2_DIE5),  /* S_BOS2_DIE4 */
+  STATE_ENTRY(SPR_BOS2, 12, 8, NULL, S_BOS2_DIE6),    /* S_BOS2_DIE5 */
+  STATE_ENTRY(SPR_BOS2, 13, 8, NULL, S_BOS2_DIE7),    /* S_BOS2_DIE6 */
+  STATE_ENTRY(SPR_BOS2, 14, -1, NULL, S_NULL),        /* S_BOS2_DIE7 */
+  STATE_ENTRY(SPR_BOS2, 14, 8, NULL, S_BOS2_RAISE2),  /* S_BOS2_RAISE1 */
+  STATE_ENTRY(SPR_BOS2, 13, 8, NULL, S_BOS2_RAISE3),  /* S_BOS2_RAISE2 */
+  STATE_ENTRY(SPR_BOS2, 12, 8, NULL, S_BOS2_RAISE4),  /* S_BOS2_RAISE3 */
+  STATE_ENTRY(SPR_BOS2, 11, 8, NULL, S_BOS2_RAISE5),  /* S_BOS2_RAISE4 */
+  STATE_ENTRY(SPR_BOS2, 10, 8, NULL, S_BOS2_RAISE6),  /* S_BOS2_RAISE5 */
+  STATE_ENTRY(SPR_BOS2, 9, 8, NULL, S_BOS2_RAISE7),   /* S_BOS2_RAISE6 */
+  STATE_ENTRY(SPR_BOS2, 8, 8, NULL, S_BOS2_RUN1),     /* S_BOS2_RAISE7 */
+  STATE_ENTRY(SPR_SKUL, 32768, 10, a_look,
+              S_SKULL_STND2), /* S_SKULL_STND */
+  STATE_ENTRY(SPR_SKUL, 32769, 10, a_look,
+              S_SKULL_STND),  /* S_SKULL_STND2 */
+  STATE_ENTRY(SPR_SKUL, 32768, 6, a_chase,
+          S_SKULL_RUN2),      /* S_SKULL_RUN1 */
+  STATE_ENTRY(SPR_SKUL, 32769, 6, a_chase,
+          S_SKULL_RUN1),      /* S_SKULL_RUN2 */
+  STATE_ENTRY(SPR_SKUL, 32770, 10, a_face_target,
+              S_SKULL_ATK2),  /* S_SKULL_ATK1 */
+  STATE_ENTRY(SPR_SKUL, 32771, 4, a_skull_attack,
+              S_SKULL_ATK3),                             /* S_SKULL_ATK2 */
+  STATE_ENTRY(SPR_SKUL, 32770, 4, NULL, S_SKULL_ATK4),   /* S_SKULL_ATK3 */
+  STATE_ENTRY(SPR_SKUL, 32771, 4, NULL, S_SKULL_ATK3),   /* S_SKULL_ATK4 */
+  STATE_ENTRY(SPR_SKUL, 32772, 3, NULL, S_SKULL_PAIN2),  /* S_SKULL_PAIN */
+  STATE_ENTRY(SPR_SKUL, 32772, 3, a_pain, S_SKULL_RUN1), /* S_SKULL_PAIN2 */
+  STATE_ENTRY(SPR_SKUL, 32773, 6, NULL, S_SKULL_DIE2),   /* S_SKULL_DIE1 */
+  STATE_ENTRY(SPR_SKUL, 32774, 6, a_scream,
+              S_SKULL_DIE3),                             /* S_SKULL_DIE2 */
+  STATE_ENTRY(SPR_SKUL, 32775, 6, NULL, S_SKULL_DIE4),   /* S_SKULL_DIE3 */
+  STATE_ENTRY(SPR_SKUL, 32776, 6, a_fall, S_SKULL_DIE5), /* S_SKULL_DIE4 */
+  STATE_ENTRY(SPR_SKUL, 9, 6, NULL, S_SKULL_DIE6),       /* S_SKULL_DIE5 */
+  STATE_ENTRY(SPR_SKUL, 10, 6, NULL, S_NULL),            /* S_SKULL_DIE6 */
+  STATE_ENTRY(SPR_SPID, 0, 10, a_look, S_SPID_STND2),    /* S_SPID_STND */
+  STATE_ENTRY(SPR_SPID, 1, 10, a_look, S_SPID_STND),     /* S_SPID_STND2 */
+  STATE_ENTRY(SPR_SPID, 0, 3, a_metal, S_SPID_RUN2),     /* S_SPID_RUN1 */
+  STATE_ENTRY(SPR_SPID, 0, 3, a_chase, S_SPID_RUN3),     /* S_SPID_RUN2 */
+  STATE_ENTRY(SPR_SPID, 1, 3, a_chase, S_SPID_RUN4),     /* S_SPID_RUN3 */
+  STATE_ENTRY(SPR_SPID, 1, 3, a_chase, S_SPID_RUN5),     /* S_SPID_RUN4 */
+  STATE_ENTRY(SPR_SPID, 2, 3, a_metal, S_SPID_RUN6),     /* S_SPID_RUN5 */
+  STATE_ENTRY(SPR_SPID, 2, 3, a_chase, S_SPID_RUN7),     /* S_SPID_RUN6 */
+  STATE_ENTRY(SPR_SPID, 3, 3, a_chase, S_SPID_RUN8),     /* S_SPID_RUN7 */
+  STATE_ENTRY(SPR_SPID, 3, 3, a_chase, S_SPID_RUN9),     /* S_SPID_RUN8 */
+  STATE_ENTRY(SPR_SPID, 4, 3, a_metal, S_SPID_RUN10),    /* S_SPID_RUN9 */
+  STATE_ENTRY(SPR_SPID, 4, 3, a_chase, S_SPID_RUN11),    /* S_SPID_RUN10 */
+  STATE_ENTRY(SPR_SPID, 5, 3, a_chase, S_SPID_RUN12),    /* S_SPID_RUN11 */
+  STATE_ENTRY(SPR_SPID, 5, 3, a_chase, S_SPID_RUN1),     /* S_SPID_RUN12 */
+  STATE_ENTRY(SPR_SPID, 32768, 20, a_face_target,
+              S_SPID_ATK2), /* S_SPID_ATK1 */
+  STATE_ENTRY(SPR_SPID, 32774, 4, a_s_pos_attack,
+              S_SPID_ATK3), /* S_SPID_ATK2 */
+  STATE_ENTRY(SPR_SPID, 32775, 4, a_s_pos_attack,
+              S_SPID_ATK4), /* S_SPID_ATK3 */
+  STATE_ENTRY(SPR_SPID, 32775, 1, a_spid_refire,
+              S_SPID_ATK2),                               /* S_SPID_ATK4 */
+  STATE_ENTRY(SPR_SPID, 8, 3, NULL, S_SPID_PAIN2),        /* S_SPID_PAIN */
+  STATE_ENTRY(SPR_SPID, 8, 3, a_pain, S_SPID_RUN1),       /* S_SPID_PAIN2 */
+  STATE_ENTRY(SPR_SPID, 9, 20, a_scream, S_SPID_DIE2),    /* S_SPID_DIE1 */
+  STATE_ENTRY(SPR_SPID, 10, 10, a_fall, S_SPID_DIE3),     /* S_SPID_DIE2 */
+  STATE_ENTRY(SPR_SPID, 11, 10, NULL, S_SPID_DIE4),       /* S_SPID_DIE3 */
+  STATE_ENTRY(SPR_SPID, 12, 10, NULL, S_SPID_DIE5),       /* S_SPID_DIE4 */
+  STATE_ENTRY(SPR_SPID, 13, 10, NULL, S_SPID_DIE6),       /* S_SPID_DIE5 */
+  STATE_ENTRY(SPR_SPID, 14, 10, NULL, S_SPID_DIE7),       /* S_SPID_DIE6 */
+  STATE_ENTRY(SPR_SPID, 15, 10, NULL, S_SPID_DIE8),       /* S_SPID_DIE7 */
+  STATE_ENTRY(SPR_SPID, 16, 10, NULL, S_SPID_DIE9),       /* S_SPID_DIE8 */
+  STATE_ENTRY(SPR_SPID, 17, 10, NULL, S_SPID_DIE10),      /* S_SPID_DIE9 */
+  STATE_ENTRY(SPR_SPID, 18, 30, NULL, S_SPID_DIE11),      /* S_SPID_DIE10 */
+  STATE_ENTRY(SPR_SPID, 18, -1, a_boss_death, S_NULL),    /* S_SPID_DIE11 */
+  STATE_ENTRY(SPR_BSPI, 0, 10, a_look, S_BSPI_STND2),     /* S_BSPI_STND */
+  STATE_ENTRY(SPR_BSPI, 1, 10, a_look, S_BSPI_STND),      /* S_BSPI_STND2 */
+  STATE_ENTRY(SPR_BSPI, 0, 20, NULL, S_BSPI_RUN1),        /* S_BSPI_SIGHT */
+  STATE_ENTRY(SPR_BSPI, 0, 3, a_baby_metal, S_BSPI_RUN2), /* S_BSPI_RUN1 */
+  STATE_ENTRY(SPR_BSPI, 0, 3, a_chase, S_BSPI_RUN3),      /* S_BSPI_RUN2 */
+  STATE_ENTRY(SPR_BSPI, 1, 3, a_chase, S_BSPI_RUN4),      /* S_BSPI_RUN3 */
+  STATE_ENTRY(SPR_BSPI, 1, 3, a_chase, S_BSPI_RUN5),      /* S_BSPI_RUN4 */
+  STATE_ENTRY(SPR_BSPI, 2, 3, a_chase, S_BSPI_RUN6),      /* S_BSPI_RUN5 */
+  STATE_ENTRY(SPR_BSPI, 2, 3, a_chase, S_BSPI_RUN7),      /* S_BSPI_RUN6 */
+  STATE_ENTRY(SPR_BSPI, 3, 3, a_baby_metal, S_BSPI_RUN8), /* S_BSPI_RUN7 */
+  STATE_ENTRY(SPR_BSPI, 3, 3, a_chase, S_BSPI_RUN9),      /* S_BSPI_RUN8 */
+  STATE_ENTRY(SPR_BSPI, 4, 3, a_chase, S_BSPI_RUN10),     /* S_BSPI_RUN9 */
+  STATE_ENTRY(SPR_BSPI, 4, 3, a_chase, S_BSPI_RUN11),     /* S_BSPI_RUN10 */
+  STATE_ENTRY(SPR_BSPI, 5, 3, a_chase, S_BSPI_RUN12),     /* S_BSPI_RUN11 */
+  STATE_ENTRY(SPR_BSPI, 5, 3, a_chase, S_BSPI_RUN1),      /* S_BSPI_RUN12 */
+  STATE_ENTRY(SPR_BSPI, 32768, 20, a_face_target,
+              S_BSPI_ATK2), /* S_BSPI_ATK1 */
+  STATE_ENTRY(SPR_BSPI, 32774, 4, a_bspi_attack,
+              S_BSPI_ATK3),                           /* S_BSPI_ATK2 */
+  STATE_ENTRY(SPR_BSPI, 32775, 4, NULL, S_BSPI_ATK4), /* S_BSPI_ATK3 */
+  STATE_ENTRY(SPR_BSPI, 32775, 1, a_spid_refire,
+              S_BSPI_ATK2),                             /* S_BSPI_ATK4 */
+  STATE_ENTRY(SPR_BSPI, 8, 3, NULL, S_BSPI_PAIN2),      /* S_BSPI_PAIN */
+  STATE_ENTRY(SPR_BSPI, 8, 3, a_pain, S_BSPI_RUN1),     /* S_BSPI_PAIN2 */
+  STATE_ENTRY(SPR_BSPI, 9, 20, a_scream, S_BSPI_DIE2),  /* S_BSPI_DIE1 */
+  STATE_ENTRY(SPR_BSPI, 10, 7, a_fall, S_BSPI_DIE3),    /* S_BSPI_DIE2 */
+  STATE_ENTRY(SPR_BSPI, 11, 7, NULL, S_BSPI_DIE4),      /* S_BSPI_DIE3 */
+  STATE_ENTRY(SPR_BSPI, 12, 7, NULL, S_BSPI_DIE5),      /* S_BSPI_DIE4 */
+  STATE_ENTRY(SPR_BSPI, 13, 7, NULL, S_BSPI_DIE6),      /* S_BSPI_DIE5 */
+  STATE_ENTRY(SPR_BSPI, 14, 7, NULL, S_BSPI_DIE7),      /* S_BSPI_DIE6 */
+  STATE_ENTRY(SPR_BSPI, 15, -1, a_boss_death, S_NULL),  /* S_BSPI_DIE7 */
+  STATE_ENTRY(SPR_BSPI, 15, 5, NULL, S_BSPI_RAISE2),    /* S_BSPI_RAISE1 */
+  STATE_ENTRY(SPR_BSPI, 14, 5, NULL, S_BSPI_RAISE3),    /* S_BSPI_RAISE2 */
+  STATE_ENTRY(SPR_BSPI, 13, 5, NULL, S_BSPI_RAISE4),    /* S_BSPI_RAISE3 */
+  STATE_ENTRY(SPR_BSPI, 12, 5, NULL, S_BSPI_RAISE5),    /* S_BSPI_RAISE4 */
+  STATE_ENTRY(SPR_BSPI, 11, 5, NULL, S_BSPI_RAISE6),    /* S_BSPI_RAISE5 */
+  STATE_ENTRY(SPR_BSPI, 10, 5, NULL, S_BSPI_RAISE7),    /* S_BSPI_RAISE6 */
+  STATE_ENTRY(SPR_BSPI, 9, 5, NULL, S_BSPI_RUN1),       /* S_BSPI_RAISE7 */
+  STATE_ENTRY(SPR_APLS, 32768, 5, NULL, S_ARACH_PLAZ2), /* S_ARACH_PLAZ */
+  STATE_ENTRY(SPR_APLS, 32769, 5, NULL, S_ARACH_PLAZ),  /* S_ARACH_PLAZ2 */
+  STATE_ENTRY(SPR_APBX, 32768, 5, NULL, S_ARACH_PLEX2), /* S_ARACH_PLEX */
+  STATE_ENTRY(SPR_APBX, 32769, 5, NULL, S_ARACH_PLEX3), /* S_ARACH_PLEX2 */
+  STATE_ENTRY(SPR_APBX, 32770, 5, NULL, S_ARACH_PLEX4), /* S_ARACH_PLEX3 */
+  STATE_ENTRY(SPR_APBX, 32771, 5, NULL, S_ARACH_PLEX5), /* S_ARACH_PLEX4 */
+  STATE_ENTRY(SPR_APBX, 32772, 5, NULL, S_NULL),        /* S_ARACH_PLEX5 */
+  STATE_ENTRY(SPR_CYBR, 0, 10, a_look, S_CYBER_STND2),  /* S_CYBER_STND */
+  STATE_ENTRY(SPR_CYBR, 1, 10, a_look, S_CYBER_STND),   /* S_CYBER_STND2 */
+  STATE_ENTRY(SPR_CYBR, 0, 3, a_hoof, S_CYBER_RUN2),    /* S_CYBER_RUN1 */
+  STATE_ENTRY(SPR_CYBR, 0, 3, a_chase, S_CYBER_RUN3),   /* S_CYBER_RUN2 */
+  STATE_ENTRY(SPR_CYBR, 1, 3, a_chase, S_CYBER_RUN4),   /* S_CYBER_RUN3 */
+  STATE_ENTRY(SPR_CYBR, 1, 3, a_chase, S_CYBER_RUN5),   /* S_CYBER_RUN4 */
+  STATE_ENTRY(SPR_CYBR, 2, 3, a_chase, S_CYBER_RUN6),   /* S_CYBER_RUN5 */
+  STATE_ENTRY(SPR_CYBR, 2, 3, a_chase, S_CYBER_RUN7),   /* S_CYBER_RUN6 */
+  STATE_ENTRY(SPR_CYBR, 3, 3, a_metal, S_CYBER_RUN8),   /* S_CYBER_RUN7 */
+  STATE_ENTRY(SPR_CYBR, 3, 3, a_chase, S_CYBER_RUN1),   /* S_CYBER_RUN8 */
+  STATE_ENTRY(SPR_CYBR, 4, 6, a_face_target,
+              S_CYBER_ATK2), /* S_CYBER_ATK1 */
+  STATE_ENTRY(SPR_CYBR, 5, 12, a_cyber_attack,
+              S_CYBER_ATK3), /* S_CYBER_ATK2 */
+  STATE_ENTRY(SPR_CYBR, 4, 12, a_face_target,
+              S_CYBER_ATK4), /* S_CYBER_ATK3 */
+  STATE_ENTRY(SPR_CYBR, 5, 12, a_cyber_attack,
+              S_CYBER_ATK5), /* S_CYBER_ATK4 */
+  STATE_ENTRY(SPR_CYBR, 4, 12, a_face_target,
+              S_CYBER_ATK6), /* S_CYBER_ATK5 */
+  STATE_ENTRY(SPR_CYBR, 5, 12, a_cyber_attack,
+              S_CYBER_RUN1),                               /* S_CYBER_ATK6 */
+  STATE_ENTRY(SPR_CYBR, 6, 10, a_pain, S_CYBER_RUN1),      /* S_CYBER_PAIN */
+  STATE_ENTRY(SPR_CYBR, 7, 10, NULL, S_CYBER_DIE2),        /* S_CYBER_DIE1 */
+  STATE_ENTRY(SPR_CYBR, 8, 10, a_scream, S_CYBER_DIE3),    /* S_CYBER_DIE2 */
+  STATE_ENTRY(SPR_CYBR, 9, 10, NULL, S_CYBER_DIE4),        /* S_CYBER_DIE3 */
+  STATE_ENTRY(SPR_CYBR, 10, 10, NULL, S_CYBER_DIE5),       /* S_CYBER_DIE4 */
+  STATE_ENTRY(SPR_CYBR, 11, 10, NULL, S_CYBER_DIE6),       /* S_CYBER_DIE5 */
+  STATE_ENTRY(SPR_CYBR, 12, 10, a_fall, S_CYBER_DIE7),     /* S_CYBER_DIE6 */
+  STATE_ENTRY(SPR_CYBR, 13, 10, NULL, S_CYBER_DIE8),       /* S_CYBER_DIE7 */
+  STATE_ENTRY(SPR_CYBR, 14, 10, NULL, S_CYBER_DIE9),       /* S_CYBER_DIE8 */
+  STATE_ENTRY(SPR_CYBR, 15, 30, NULL, S_CYBER_DIE10),      /* S_CYBER_DIE9 */
+  STATE_ENTRY(SPR_CYBR, 15, -1, a_boss_death, S_NULL),     /* S_CYBER_DIE10 */
+  STATE_ENTRY(SPR_PAIN, 0, 10, a_look, S_PAIN_STND),       /* S_PAIN_STND */
+  STATE_ENTRY(SPR_PAIN, 0, 3, a_chase, S_PAIN_RUN2),       /* S_PAIN_RUN1 */
+  STATE_ENTRY(SPR_PAIN, 0, 3, a_chase, S_PAIN_RUN3),       /* S_PAIN_RUN2 */
+  STATE_ENTRY(SPR_PAIN, 1, 3, a_chase, S_PAIN_RUN4),       /* S_PAIN_RUN3 */
+  STATE_ENTRY(SPR_PAIN, 1, 3, a_chase, S_PAIN_RUN5),       /* S_PAIN_RUN4 */
+  STATE_ENTRY(SPR_PAIN, 2, 3, a_chase, S_PAIN_RUN6),       /* S_PAIN_RUN5 */
+  STATE_ENTRY(SPR_PAIN, 2, 3, a_chase, S_PAIN_RUN1),       /* S_PAIN_RUN6 */
+  STATE_ENTRY(SPR_PAIN, 3, 5, a_face_target, S_PAIN_ATK2), /* S_PAIN_ATK1 */
+  STATE_ENTRY(SPR_PAIN, 4, 5, a_face_target, S_PAIN_ATK3), /* S_PAIN_ATK2 */
+  STATE_ENTRY(SPR_PAIN, 32773, 5, a_face_target,
+              S_PAIN_ATK4), /* S_PAIN_ATK3 */
+  STATE_ENTRY(SPR_PAIN, 32773, 0, a_pain_attack,
+              S_PAIN_RUN1),                               /* S_PAIN_ATK4 */
+  STATE_ENTRY(SPR_PAIN, 6, 6, NULL, S_PAIN_PAIN2),        /* S_PAIN_PAIN */
+  STATE_ENTRY(SPR_PAIN, 6, 6, a_pain, S_PAIN_RUN1),       /* S_PAIN_PAIN2 */
+  STATE_ENTRY(SPR_PAIN, 32775, 8, NULL, S_PAIN_DIE2),     /* S_PAIN_DIE1 */
+  STATE_ENTRY(SPR_PAIN, 32776, 8, a_scream, S_PAIN_DIE3), /* S_PAIN_DIE2 */
+  STATE_ENTRY(SPR_PAIN, 32777, 8, NULL, S_PAIN_DIE4),     /* S_PAIN_DIE3 */
+  STATE_ENTRY(SPR_PAIN, 32778, 8, NULL, S_PAIN_DIE5),     /* S_PAIN_DIE4 */
+  STATE_ENTRY(SPR_PAIN, 32779, 8, a_pain_die,
+              S_PAIN_DIE6),                           /* S_PAIN_DIE5 */
+  STATE_ENTRY(SPR_PAIN, 32780, 8, NULL, S_NULL),      /* S_PAIN_DIE6 */
+  STATE_ENTRY(SPR_PAIN, 12, 8, NULL, S_PAIN_RAISE2),  /* S_PAIN_RAISE1 */
+  STATE_ENTRY(SPR_PAIN, 11, 8, NULL, S_PAIN_RAISE3),  /* S_PAIN_RAISE2 */
+  STATE_ENTRY(SPR_PAIN, 10, 8, NULL, S_PAIN_RAISE4),  /* S_PAIN_RAISE3 */
+  STATE_ENTRY(SPR_PAIN, 9, 8, NULL, S_PAIN_RAISE5),   /* S_PAIN_RAISE4 */
+  STATE_ENTRY(SPR_PAIN, 8, 8, NULL, S_PAIN_RAISE6),   /* S_PAIN_RAISE5 */
+  STATE_ENTRY(SPR_PAIN, 7, 8, NULL, S_PAIN_RUN1),     /* S_PAIN_RAISE6 */
+  STATE_ENTRY(SPR_SSWV, 0, 10, a_look, S_SSWV_STND2), /* S_SSWV_STND */
+  STATE_ENTRY(SPR_SSWV, 1, 10, a_look, S_SSWV_STND),  /* S_SSWV_STND2 */
+  STATE_ENTRY(SPR_SSWV, 0, 3, a_chase, S_SSWV_RUN2),  /* S_SSWV_RUN1 */
+  STATE_ENTRY(SPR_SSWV, 0, 3, a_chase, S_SSWV_RUN3),  /* S_SSWV_RUN2 */
+  STATE_ENTRY(SPR_SSWV, 1, 3, a_chase, S_SSWV_RUN4),  /* S_SSWV_RUN3 */
+  STATE_ENTRY(SPR_SSWV, 1, 3, a_chase, S_SSWV_RUN5),  /* S_SSWV_RUN4 */
+  STATE_ENTRY(SPR_SSWV, 2, 3, a_chase, S_SSWV_RUN6),  /* S_SSWV_RUN5 */
+  STATE_ENTRY(SPR_SSWV, 2, 3, a_chase, S_SSWV_RUN7),  /* S_SSWV_RUN6 */
+  STATE_ENTRY(SPR_SSWV, 3, 3, a_chase, S_SSWV_RUN8),  /* S_SSWV_RUN7 */
+  STATE_ENTRY(SPR_SSWV, 3, 3, a_chase, S_SSWV_RUN1),  /* S_SSWV_RUN8 */
+  STATE_ENTRY(SPR_SSWV, 4, 10, a_face_target,
+              S_SSWV_ATK2), /* S_SSWV_ATK1 */
+  STATE_ENTRY(SPR_SSWV, 5, 10, a_face_target,
+              S_SSWV_ATK3), /* S_SSWV_ATK2 */
+  STATE_ENTRY(SPR_SSWV, 32774, 4, a_c_pos_attack,
+              S_SSWV_ATK4),                                 /* S_SSWV_ATK3 */
+  STATE_ENTRY(SPR_SSWV, 5, 6, a_face_target, S_SSWV_ATK5) , /* S_SSWV_ATK4 */
+  STATE_ENTRY(SPR_SSWV, 32774, 4, a_c_pos_attack,
+              S_SSWV_ATK6), /* S_SSWV_ATK5 */
+  STATE_ENTRY(SPR_SSWV, 5, 1, a_c_pos_refire,
+              S_SSWV_ATK2),                                 /* S_SSWV_ATK6 */
+  STATE_ENTRY(SPR_SSWV, 7, 3, NULL, S_SSWV_PAIN2),          /* S_SSWV_PAIN */
+  STATE_ENTRY(SPR_SSWV, 7, 3, a_pain, S_SSWV_RUN1),         /* S_SSWV_PAIN2 */
+  STATE_ENTRY(SPR_SSWV, 8, 5, NULL, S_SSWV_DIE2),           /* S_SSWV_DIE1 */
+  STATE_ENTRY(SPR_SSWV, 9, 5, a_scream, S_SSWV_DIE3),       /* S_SSWV_DIE2 */
+  STATE_ENTRY(SPR_SSWV, 10, 5, a_fall, S_SSWV_DIE4),        /* S_SSWV_DIE3 */
+  STATE_ENTRY(SPR_SSWV, 11, 5, NULL, S_SSWV_DIE5),          /* S_SSWV_DIE4 */
+  STATE_ENTRY(SPR_SSWV, 12, -1, NULL, S_NULL),              /* S_SSWV_DIE5 */
+  STATE_ENTRY(SPR_SSWV, 13, 5, NULL, S_SSWV_XDIE2),         /* S_SSWV_XDIE1 */
+  STATE_ENTRY(SPR_SSWV, 14, 5, a_xscream, S_SSWV_XDIE3),    /* S_SSWV_XDIE2 */
+  STATE_ENTRY(SPR_SSWV, 15, 5, a_fall, S_SSWV_XDIE4),       /* S_SSWV_XDIE3 */
+  STATE_ENTRY(SPR_SSWV, 16, 5, NULL, S_SSWV_XDIE5),         /* S_SSWV_XDIE4 */
+  STATE_ENTRY(SPR_SSWV, 17, 5, NULL, S_SSWV_XDIE6),         /* S_SSWV_XDIE5 */
+  STATE_ENTRY(SPR_SSWV, 18, 5, NULL, S_SSWV_XDIE7),         /* S_SSWV_XDIE6 */
+  STATE_ENTRY(SPR_SSWV, 19, 5, NULL, S_SSWV_XDIE8),         /* S_SSWV_XDIE7 */
+  STATE_ENTRY(SPR_SSWV, 20, 5, NULL, S_SSWV_XDIE9),         /* S_SSWV_XDIE8 */
+  STATE_ENTRY(SPR_SSWV, 21, -1, NULL, S_NULL),              /* S_SSWV_XDIE9 */
+  STATE_ENTRY(SPR_SSWV, 12, 5, NULL, S_SSWV_RAISE2),        /* S_SSWV_RAISE1 */
+  STATE_ENTRY(SPR_SSWV, 11, 5, NULL, S_SSWV_RAISE3),        /* S_SSWV_RAISE2 */
+  STATE_ENTRY(SPR_SSWV, 10, 5, NULL, S_SSWV_RAISE4),        /* S_SSWV_RAISE3 */
+  STATE_ENTRY(SPR_SSWV, 9, 5, NULL, S_SSWV_RAISE5),         /* S_SSWV_RAISE4 */
+  STATE_ENTRY(SPR_SSWV, 8, 5, NULL, S_SSWV_RUN1),           /* S_SSWV_RAISE5 */
+  STATE_ENTRY(SPR_KEEN, 0, -1, NULL, S_KEENSTND),           /* S_KEENSTND */
+  STATE_ENTRY(SPR_KEEN, 0, 6, NULL, S_COMMKEEN2),           /* S_COMMKEEN */
+  STATE_ENTRY(SPR_KEEN, 1, 6, NULL, S_COMMKEEN3),           /* S_COMMKEEN2 */
+  STATE_ENTRY(SPR_KEEN, 2, 6, a_scream, S_COMMKEEN4),       /* S_COMMKEEN3 */
+  STATE_ENTRY(SPR_KEEN, 3, 6, NULL, S_COMMKEEN5),           /* S_COMMKEEN4 */
+  STATE_ENTRY(SPR_KEEN, 4, 6, NULL, S_COMMKEEN6),           /* S_COMMKEEN5 */
+  STATE_ENTRY(SPR_KEEN, 5, 6, NULL, S_COMMKEEN7),           /* S_COMMKEEN6 */
+  STATE_ENTRY(SPR_KEEN, 6, 6, NULL, S_COMMKEEN8),           /* S_COMMKEEN7 */
+  STATE_ENTRY(SPR_KEEN, 7, 6, NULL, S_COMMKEEN9),           /* S_COMMKEEN8 */
+  STATE_ENTRY(SPR_KEEN, 8, 6, NULL, S_COMMKEEN10),          /* S_COMMKEEN9 */
+  STATE_ENTRY(SPR_KEEN, 9, 6, NULL, S_COMMKEEN11),          /* S_COMMKEEN10 */
+  STATE_ENTRY(SPR_KEEN, 10, 6, a_keen_die, S_COMMKEEN12),   /* S_COMMKEEN11 */
+  STATE_ENTRY(SPR_KEEN, 11, -1, NULL, S_NULL),              /* S_COMMKEEN12 */
+  STATE_ENTRY(SPR_KEEN, 12, 4, NULL, S_KEENPAIN2),          /* S_KEENPAIN */
+  STATE_ENTRY(SPR_KEEN, 12, 8, a_pain, S_KEENSTND),         /* S_KEENPAIN2 */
+  STATE_ENTRY(SPR_BBRN, 0, -1, NULL, S_NULL),               /* S_BRAIN */
+  STATE_ENTRY(SPR_BBRN, 1, 36, a_brain_pain, S_BRAIN),      /* S_BRAIN_PAIN */
+  STATE_ENTRY(SPR_BBRN, 0, 100, a_brain_scream,
+              S_BRAIN_DIE2),                                /* S_BRAIN_DIE1 */
+  STATE_ENTRY(SPR_BBRN, 0, 10, NULL, S_BRAIN_DIE3),         /* S_BRAIN_DIE2 */
+  STATE_ENTRY(SPR_BBRN, 0, 10, NULL, S_BRAIN_DIE4),         /* S_BRAIN_DIE3 */
+  STATE_ENTRY(SPR_BBRN, 0, -1, a_brain_die, S_NULL),        /* S_BRAIN_DIE4 */
+  STATE_ENTRY(SPR_SSWV, 0, 10, a_look, S_BRAINEYE),         /* S_BRAINEYE */
+  STATE_ENTRY(SPR_SSWV, 0, 181,
+          a_brain_awake, S_BRAINEYE1),                      /* S_BRAINEYESEE */
+  STATE_ENTRY(SPR_SSWV, 0, 150,
+          a_brain_split, S_BRAINEYE1),                      /* S_BRAINEYE1 */
+  STATE_ENTRY(SPR_BOSF, 32768, 3, a_spawn_sound, S_SPAWN2), /* S_SPAWN1 */
+  STATE_ENTRY(SPR_BOSF, 32769, 3, a_spawn_fly, S_SPAWN3),   /* S_SPAWN2 */
+  STATE_ENTRY(SPR_BOSF, 32770, 3, a_spawn_fly, S_SPAWN4),   /* S_SPAWN3 */
+  STATE_ENTRY(SPR_BOSF, 32771, 3, a_spawn_fly, S_SPAWN1),   /* S_SPAWN4 */
+  STATE_ENTRY(SPR_FIRE, 32768, 4, a_fire, S_SPAWNFIRE2),    /* S_SPAWNFIRE1 */
+  STATE_ENTRY(SPR_FIRE, 32769, 4, a_fire, S_SPAWNFIRE3),    /* S_SPAWNFIRE2 */
+  STATE_ENTRY(SPR_FIRE, 32770, 4, a_fire, S_SPAWNFIRE4),    /* S_SPAWNFIRE3 */
+  STATE_ENTRY(SPR_FIRE, 32771, 4, a_fire, S_SPAWNFIRE5),    /* S_SPAWNFIRE4 */
+  STATE_ENTRY(SPR_FIRE, 32772, 4, a_fire, S_SPAWNFIRE6),    /* S_SPAWNFIRE5 */
+  STATE_ENTRY(SPR_FIRE, 32773, 4, a_fire, S_SPAWNFIRE7),    /* S_SPAWNFIRE6 */
+  STATE_ENTRY(SPR_FIRE, 32774, 4, a_fire, S_SPAWNFIRE8),    /* S_SPAWNFIRE7 */
+  STATE_ENTRY(SPR_FIRE, 32775, 4, a_fire, S_NULL),          /* S_SPAWNFIRE8 */
+  STATE_ENTRY(SPR_MISL, 32769, 10, NULL,
+          S_BRAINEXPLODE2), /* S_BRAINEXPLODE1 */
+  STATE_ENTRY(SPR_MISL, 32770, 10, NULL,
+              S_BRAINEXPLODE3), /* S_BRAINEXPLODE2 */
+  STATE_ENTRY(SPR_MISL, 32771, 10, a_brain_explode,
+              S_NULL),                                   /* S_BRAINEXPLODE3 */
+  STATE_ENTRY(SPR_ARM1, 0, 6, NULL, S_ARM1A),            /* S_ARM1 */
+  STATE_ENTRY(SPR_ARM1, 32769, 7, NULL, S_ARM1),         /* S_ARM1A */
+  STATE_ENTRY(SPR_ARM2, 0, 6, NULL, S_ARM2A),            /* S_ARM2 */
+  STATE_ENTRY(SPR_ARM2, 32769, 6, NULL, S_ARM2),         /* S_ARM2A */
+  STATE_ENTRY(SPR_BAR1, 0, 6, NULL, S_BAR2),             /* S_BAR1 */
+  STATE_ENTRY(SPR_BAR1, 1, 6, NULL, S_BAR1),             /* S_BAR2 */
+  STATE_ENTRY(SPR_BEXP, 32768, 5, NULL, S_BEXP2),        /* S_BEXP */
+  STATE_ENTRY(SPR_BEXP, 32769, 5, a_scream, S_BEXP3),    /* S_BEXP2 */
+  STATE_ENTRY(SPR_BEXP, 32770, 5, NULL, S_BEXP4),        /* S_BEXP3 */
+  STATE_ENTRY(SPR_BEXP, 32771, 10, a_explode, S_BEXP5),  /* S_BEXP4 */
+  STATE_ENTRY(SPR_BEXP, 32772, 10, NULL, S_NULL),        /* S_BEXP5 */
+  STATE_ENTRY(SPR_FCAN, 32768, 4, NULL, S_BBAR2),        /* S_BBAR1 */
+  STATE_ENTRY(SPR_FCAN, 32769, 4, NULL, S_BBAR3),        /* S_BBAR2 */
+  STATE_ENTRY(SPR_FCAN, 32770, 4, NULL, S_BBAR1),        /* S_BBAR3 */
+  STATE_ENTRY(SPR_BON1, 0, 6, NULL, S_BON1A),            /* S_BON1 */
+  STATE_ENTRY(SPR_BON1, 1, 6, NULL, S_BON1B),            /* S_BON1A */
+  STATE_ENTRY(SPR_BON1, 2, 6, NULL, S_BON1C),            /* S_BON1B */
+  STATE_ENTRY(SPR_BON1, 3, 6, NULL, S_BON1D),            /* S_BON1C */
+  STATE_ENTRY(SPR_BON1, 2, 6, NULL, S_BON1E),            /* S_BON1D */
+  STATE_ENTRY(SPR_BON1, 1, 6, NULL, S_BON1),             /* S_BON1E */
+  STATE_ENTRY(SPR_BON2, 0, 6, NULL, S_BON2A),            /* S_BON2 */
+  STATE_ENTRY(SPR_BON2, 1, 6, NULL, S_BON2B),            /* S_BON2A */
+  STATE_ENTRY(SPR_BON2, 2, 6, NULL, S_BON2C),            /* S_BON2B */
+  STATE_ENTRY(SPR_BON2, 3, 6, NULL, S_BON2D),            /* S_BON2C */
+  STATE_ENTRY(SPR_BON2, 2, 6, NULL, S_BON2E),            /* S_BON2D */
+  STATE_ENTRY(SPR_BON2, 1, 6, NULL, S_BON2),             /* S_BON2E */
+  STATE_ENTRY(SPR_BKEY, 0, 10, NULL, S_BKEY2),           /* S_BKEY */
+  STATE_ENTRY(SPR_BKEY, 32769, 10, NULL, S_BKEY),        /* S_BKEY2 */
+  STATE_ENTRY(SPR_RKEY, 0, 10, NULL, S_RKEY2),           /* S_RKEY */
+  STATE_ENTRY(SPR_RKEY, 32769, 10, NULL, S_RKEY),        /* S_RKEY2 */
+  STATE_ENTRY(SPR_YKEY, 0, 10, NULL, S_YKEY2),           /* S_YKEY */
+  STATE_ENTRY(SPR_YKEY, 32769, 10, NULL, S_YKEY),        /* S_YKEY2 */
+  STATE_ENTRY(SPR_BSKU, 0, 10, NULL, S_BSKULL2),         /* S_BSKULL */
+  STATE_ENTRY(SPR_BSKU, 32769, 10, NULL, S_BSKULL),      /* S_BSKULL2 */
+  STATE_ENTRY(SPR_RSKU, 0, 10, NULL, S_RSKULL2),         /* S_RSKULL */
+  STATE_ENTRY(SPR_RSKU, 32769, 10, NULL, S_RSKULL),      /* S_RSKULL2 */
+  STATE_ENTRY(SPR_YSKU, 0, 10, NULL, S_YSKULL2),         /* S_YSKULL */
+  STATE_ENTRY(SPR_YSKU, 32769, 10, NULL, S_YSKULL),      /* S_YSKULL2 */
+  STATE_ENTRY(SPR_STIM, 0, -1, NULL, S_NULL),            /* S_STIM */
+  STATE_ENTRY(SPR_MEDI, 0, -1, NULL, S_NULL),            /* S_MEDI */
+  STATE_ENTRY(SPR_SOUL, 32768, 6, NULL, S_SOUL2),        /* S_SOUL */
+  STATE_ENTRY(SPR_SOUL, 32769, 6, NULL, S_SOUL3),        /* S_SOUL2 */
+  STATE_ENTRY(SPR_SOUL, 32770, 6, NULL, S_SOUL4),        /* S_SOUL3 */
+  STATE_ENTRY(SPR_SOUL, 32771, 6, NULL, S_SOUL5),        /* S_SOUL4 */
+  STATE_ENTRY(SPR_SOUL, 32770, 6, NULL, S_SOUL6),        /* S_SOUL5 */
+  STATE_ENTRY(SPR_SOUL, 32769, 6, NULL, S_SOUL),         /* S_SOUL6 */
+  STATE_ENTRY(SPR_PINV, 32768, 6, NULL, S_PINV2),        /* S_PINV */
+  STATE_ENTRY(SPR_PINV, 32769, 6, NULL, S_PINV3),        /* S_PINV2 */
+  STATE_ENTRY(SPR_PINV, 32770, 6, NULL, S_PINV4),        /* S_PINV3 */
+  STATE_ENTRY(SPR_PINV, 32771, 6, NULL, S_PINV),         /* S_PINV4 */
+  STATE_ENTRY(SPR_PSTR, 32768, -1, NULL, S_NULL),        /* S_PSTR */
+  STATE_ENTRY(SPR_PINS, 32768, 6, NULL, S_PINS2),        /* S_PINS */
+  STATE_ENTRY(SPR_PINS, 32769, 6, NULL, S_PINS3),        /* S_PINS2 */
+  STATE_ENTRY(SPR_PINS, 32770, 6, NULL, S_PINS4),        /* S_PINS3 */
+  STATE_ENTRY(SPR_PINS, 32771, 6, NULL, S_PINS),         /* S_PINS4 */
+  STATE_ENTRY(SPR_MEGA, 32768, 6, NULL, S_MEGA2),        /* S_MEGA */
+  STATE_ENTRY(SPR_MEGA, 32769, 6, NULL, S_MEGA3),        /* S_MEGA2 */
+  STATE_ENTRY(SPR_MEGA, 32770, 6, NULL, S_MEGA4),        /* S_MEGA3 */
+  STATE_ENTRY(SPR_MEGA, 32771, 6, NULL, S_MEGA),         /* S_MEGA4 */
+  STATE_ENTRY(SPR_SUIT, 32768, -1, NULL, S_NULL),        /* S_SUIT */
+  STATE_ENTRY(SPR_PMAP, 32768, 6, NULL, S_PMAP2),        /* S_PMAP */
+  STATE_ENTRY(SPR_PMAP, 32769, 6, NULL, S_PMAP3),        /* S_PMAP2 */
+  STATE_ENTRY(SPR_PMAP, 32770, 6, NULL, S_PMAP4),        /* S_PMAP3 */
+  STATE_ENTRY(SPR_PMAP, 32771, 6, NULL, S_PMAP5),        /* S_PMAP4 */
+  STATE_ENTRY(SPR_PMAP, 32770, 6, NULL, S_PMAP6),        /* S_PMAP5 */
+  STATE_ENTRY(SPR_PMAP, 32769, 6, NULL, S_PMAP),         /* S_PMAP6 */
+  STATE_ENTRY(SPR_PVIS, 32768, 6, NULL, S_PVIS2),        /* S_PVIS */
+  STATE_ENTRY(SPR_PVIS, 1, 6, NULL, S_PVIS),             /* S_PVIS2 */
+  STATE_ENTRY(SPR_CLIP, 0, -1, NULL, S_NULL),            /* S_CLIP */
+  STATE_ENTRY(SPR_AMMO, 0, -1, NULL, S_NULL),            /* S_AMMO */
+  STATE_ENTRY(SPR_ROCK, 0, -1, NULL, S_NULL),            /* S_ROCK */
+  STATE_ENTRY(SPR_BROK, 0, -1, NULL, S_NULL),            /* S_BROK */
+  STATE_ENTRY(SPR_CELL, 0, -1, NULL, S_NULL),            /* S_CELL */
+  STATE_ENTRY(SPR_CELP, 0, -1, NULL, S_NULL),            /* S_CELP */
+  STATE_ENTRY(SPR_SHEL, 0, -1, NULL, S_NULL),            /* S_SHEL */
+  STATE_ENTRY(SPR_SBOX, 0, -1, NULL, S_NULL),            /* S_SBOX */
+  STATE_ENTRY(SPR_BPAK, 0, -1, NULL, S_NULL),            /* S_BPAK */
+  STATE_ENTRY(SPR_BFUG, 0, -1, NULL, S_NULL),            /* S_BFUG */
+  STATE_ENTRY(SPR_MGUN, 0, -1, NULL, S_NULL),            /* S_MGUN */
+  STATE_ENTRY(SPR_CSAW, 0, -1, NULL, S_NULL),            /* S_CSAW */
+  STATE_ENTRY(SPR_LAUN, 0, -1, NULL, S_NULL),            /* S_LAUN */
+  STATE_ENTRY(SPR_PLAS, 0, -1, NULL, S_NULL),            /* S_PLAS */
+  STATE_ENTRY(SPR_SHOT, 0, -1, NULL, S_NULL),            /* S_SHOT */
+  STATE_ENTRY(SPR_SGN2, 0, -1, NULL, S_NULL),            /* S_SHOT2 */
+  STATE_ENTRY(SPR_COLU, 32768, -1, NULL, S_NULL),        /* S_COLU */
+  STATE_ENTRY(SPR_SMT2, 0, -1, NULL, S_NULL),            /* S_STALAG */
+  STATE_ENTRY(SPR_GOR1, 0, 10, NULL, S_BLOODYTWITCH2),   /* S_BLOODYTWITCH */
+  STATE_ENTRY(SPR_GOR1, 1, 15, NULL, S_BLOODYTWITCH3),   /* S_BLOODYTWITCH2 */
+  STATE_ENTRY(SPR_GOR1, 2, 8, NULL, S_BLOODYTWITCH4),    /* S_BLOODYTWITCH3 */
+  STATE_ENTRY(SPR_GOR1, 1, 6, NULL, S_BLOODYTWITCH),     /* S_BLOODYTWITCH4 */
+  STATE_ENTRY(SPR_PLAY, 13, -1, NULL, S_NULL),           /* S_DEADTORSO */
+  STATE_ENTRY(SPR_PLAY, 18, -1, NULL, S_NULL),           /* S_DEADBOTTOM */
+  STATE_ENTRY(SPR_POL2, 0, -1, NULL, S_NULL),            /* S_HEADSONSTICK */
+  STATE_ENTRY(SPR_POL5, 0, -1, NULL, S_NULL),            /* S_GIBS */
+  STATE_ENTRY(SPR_POL4, 0, -1, NULL, S_NULL),            /* S_HEADONASTICK */
+  STATE_ENTRY(SPR_POL3, 32768, 6, NULL, S_HEADCANDLES2), /* S_HEADCANDLES */
+  STATE_ENTRY(SPR_POL3, 32769, 6, NULL, S_HEADCANDLES),  /* S_HEADCANDLES2 */
+  STATE_ENTRY(SPR_POL1, 0, -1, NULL, S_NULL),            /* S_DEADSTICK */
+  STATE_ENTRY(SPR_POL6, 0, 6, NULL, S_LIVESTICK2),       /* S_LIVESTICK */
+  STATE_ENTRY(SPR_POL6, 1, 8, NULL, S_LIVESTICK),        /* S_LIVESTICK2 */
+  STATE_ENTRY(SPR_GOR2, 0, -1, NULL, S_NULL),            /* S_MEAT2 */
+  STATE_ENTRY(SPR_GOR3, 0, -1, NULL, S_NULL),            /* S_MEAT3 */
+  STATE_ENTRY(SPR_GOR4, 0, -1, NULL, S_NULL),            /* S_MEAT4 */
+  STATE_ENTRY(SPR_GOR5, 0, -1, NULL, S_NULL),            /* S_MEAT5 */
+  STATE_ENTRY(SPR_SMIT, 0, -1, NULL, S_NULL),            /* S_STALAGTITE */
+  STATE_ENTRY(SPR_COL1, 0, -1, NULL, S_NULL),            /* S_TALLGRNCOL */
+  STATE_ENTRY(SPR_COL2, 0, -1, NULL, S_NULL),            /* S_SHRTGRNCOL */
+  STATE_ENTRY(SPR_COL3, 0, -1, NULL, S_NULL),            /* S_TALLREDCOL */
+  STATE_ENTRY(SPR_COL4, 0, -1, NULL, S_NULL),            /* S_SHRTREDCOL */
+  STATE_ENTRY(SPR_CAND, 32768, -1, NULL, S_NULL),        /* S_CANDLESTIK */
+  STATE_ENTRY(SPR_CBRA, 32768, -1, NULL, S_NULL),        /* S_CANDELABRA */
+  STATE_ENTRY(SPR_COL6, 0, -1, NULL, S_NULL),            /* S_SKULLCOL */
+  STATE_ENTRY(SPR_TRE1, 0, -1, NULL, S_NULL),            /* S_TORCHTREE */
+  STATE_ENTRY(SPR_TRE2, 0, -1, NULL, S_NULL),            /* S_BIGTREE */
+  STATE_ENTRY(SPR_ELEC, 0, -1, NULL, S_NULL),            /* S_TECHPILLAR */
+  STATE_ENTRY(SPR_CEYE, 32768, 6, NULL, S_EVILEYE2),     /* S_EVILEYE */
+  STATE_ENTRY(SPR_CEYE, 32769, 6, NULL, S_EVILEYE3),     /* S_EVILEYE2 */
+  STATE_ENTRY(SPR_CEYE, 32770, 6, NULL, S_EVILEYE4),     /* S_EVILEYE3 */
+  STATE_ENTRY(SPR_CEYE, 32769, 6, NULL, S_EVILEYE),      /* S_EVILEYE4 */
+  STATE_ENTRY(SPR_FSKU, 32768, 6, NULL, S_FLOATSKULL2),  /* S_FLOATSKULL */
+  STATE_ENTRY(SPR_FSKU, 32769, 6, NULL, S_FLOATSKULL3),  /* S_FLOATSKULL2 */
+  STATE_ENTRY(SPR_FSKU, 32770, 6, NULL, S_FLOATSKULL),   /* S_FLOATSKULL3 */
+  STATE_ENTRY(SPR_COL5, 0, 14, NULL, S_HEARTCOL2),       /* S_HEARTCOL */
+  STATE_ENTRY(SPR_COL5, 1, 14, NULL, S_HEARTCOL),        /* S_HEARTCOL2 */
+  STATE_ENTRY(SPR_TBLU, 32768, 4, NULL, S_BLUETORCH2),   /* S_BLUETORCH */
+  STATE_ENTRY(SPR_TBLU, 32769, 4, NULL, S_BLUETORCH3),   /* S_BLUETORCH2 */
+  STATE_ENTRY(SPR_TBLU, 32770, 4, NULL, S_BLUETORCH4),   /* S_BLUETORCH3 */
+  STATE_ENTRY(SPR_TBLU, 32771, 4, NULL, S_BLUETORCH),    /* S_BLUETORCH4 */
+  STATE_ENTRY(SPR_TGRN, 32768, 4, NULL, S_GREENTORCH2),  /* S_GREENTORCH */
+  STATE_ENTRY(SPR_TGRN, 32769, 4, NULL, S_GREENTORCH3),  /* S_GREENTORCH2 */
+  STATE_ENTRY(SPR_TGRN, 32770, 4, NULL, S_GREENTORCH4),  /* S_GREENTORCH3 */
+  STATE_ENTRY(SPR_TGRN, 32771, 4, NULL, S_GREENTORCH),   /* S_GREENTORCH4 */
+  STATE_ENTRY(SPR_TRED, 32768, 4, NULL, S_REDTORCH2),    /* S_REDTORCH */
+  STATE_ENTRY(SPR_TRED, 32769, 4, NULL, S_REDTORCH3),    /* S_REDTORCH2 */
+  STATE_ENTRY(SPR_TRED, 32770, 4, NULL, S_REDTORCH4),    /* S_REDTORCH3 */
+  STATE_ENTRY(SPR_TRED, 32771, 4, NULL, S_REDTORCH),     /* S_REDTORCH4 */
+  STATE_ENTRY(SPR_SMBT, 32768, 4, NULL, S_BTORCHSHRT2),  /* S_BTORCHSHRT */
+  STATE_ENTRY(SPR_SMBT, 32769, 4, NULL, S_BTORCHSHRT3),  /* S_BTORCHSHRT2 */
+  STATE_ENTRY(SPR_SMBT, 32770, 4, NULL, S_BTORCHSHRT4),  /* S_BTORCHSHRT3 */
+  STATE_ENTRY(SPR_SMBT, 32771, 4, NULL, S_BTORCHSHRT),   /* S_BTORCHSHRT4 */
+  STATE_ENTRY(SPR_SMGT, 32768, 4, NULL, S_GTORCHSHRT2),  /* S_GTORCHSHRT */
+  STATE_ENTRY(SPR_SMGT, 32769, 4, NULL, S_GTORCHSHRT3),  /* S_GTORCHSHRT2 */
+  STATE_ENTRY(SPR_SMGT, 32770, 4, NULL, S_GTORCHSHRT4),  /* S_GTORCHSHRT3 */
+  STATE_ENTRY(SPR_SMGT, 32771, 4, NULL, S_GTORCHSHRT),   /* S_GTORCHSHRT4 */
+  STATE_ENTRY(SPR_SMRT, 32768, 4, NULL, S_RTORCHSHRT2),  /* S_RTORCHSHRT */
+  STATE_ENTRY(SPR_SMRT, 32769, 4, NULL, S_RTORCHSHRT3),  /* S_RTORCHSHRT2 */
+  STATE_ENTRY(SPR_SMRT, 32770, 4, NULL, S_RTORCHSHRT4),  /* S_RTORCHSHRT3 */
+  STATE_ENTRY(SPR_SMRT, 32771, 4, NULL, S_RTORCHSHRT),   /* S_RTORCHSHRT4 */
+  STATE_ENTRY(SPR_HDB1, 0, -1, NULL, S_NULL),            /* S_HANGNOGUTS */
+  STATE_ENTRY(SPR_HDB2, 0, -1, NULL, S_NULL),            /* S_HANGBNOBRAIN */
+  STATE_ENTRY(SPR_HDB3, 0, -1, NULL, S_NULL),            /* S_HANGTLOOKDN */
+  STATE_ENTRY(SPR_HDB4, 0, -1, NULL, S_NULL),            /* S_HANGTSKULL */
+  STATE_ENTRY(SPR_HDB5, 0, -1, NULL, S_NULL),            /* S_HANGTLOOKUP */
+  STATE_ENTRY(SPR_HDB6, 0, -1, NULL, S_NULL),            /* S_HANGTNOBRAIN */
+  STATE_ENTRY(SPR_POB1, 0, -1, NULL, S_NULL),            /* S_COLONGIBS */
+  STATE_ENTRY(SPR_POB2, 0, -1, NULL, S_NULL),            /* S_SMALLPOOL */
+  STATE_ENTRY(SPR_BRS1, 0, -1, NULL, S_NULL),            /* S_BRAINSTEM */
+  STATE_ENTRY(SPR_TLMP, 32768, 4, NULL, S_TECHLAMP2),    /* S_TECHLAMP */
+  STATE_ENTRY(SPR_TLMP, 32769, 4, NULL, S_TECHLAMP3),    /* S_TECHLAMP2 */
+  STATE_ENTRY(SPR_TLMP, 32770, 4, NULL, S_TECHLAMP4),    /* S_TECHLAMP3 */
+  STATE_ENTRY(SPR_TLMP, 32771, 4, NULL, S_TECHLAMP),     /* S_TECHLAMP4 */
+  STATE_ENTRY(SPR_TLP2, 32768, 4, NULL, S_TECH2LAMP2),   /* S_TECH2LAMP */
+  STATE_ENTRY(SPR_TLP2, 32769, 4, NULL, S_TECH2LAMP3),   /* S_TECH2LAMP2 */
+  STATE_ENTRY(SPR_TLP2, 32770, 4, NULL, S_TECH2LAMP4),   /* S_TECH2LAMP3 */
+  STATE_ENTRY(SPR_TLP2, 32771, 4, NULL, S_TECH2LAMP)     /* S_TECH2LAMP4 */
 };
 
-
-mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
-
-    {		// MT_PLAYER
-	-1,		// doomednum
-	S_PLAY,		// spawnstate
-	100,		// spawnhealth
-	S_PLAY_RUN1,		// seestate
-	sfx_None,		// seesound
-	0,		// reactiontime
-	sfx_None,		// attacksound
-	S_PLAY_PAIN,		// painstate
-	255,		// painchance
-	sfx_plpain,		// painsound
-	S_NULL,		// meleestate
-	S_PLAY_ATK1,		// missilestate
-	S_PLAY_DIE1,		// deathstate
-	S_PLAY_XDIE1,		// xdeathstate
-	sfx_pldeth,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_POSSESSED
-	3004,		// doomednum
-	S_POSS_STND,		// spawnstate
-	20,		// spawnhealth
-	S_POSS_RUN1,		// seestate
-	sfx_posit1,		// seesound
-	8,		// reactiontime
-	sfx_pistol,		// attacksound
-	S_POSS_PAIN,		// painstate
-	200,		// painchance
-	sfx_popain,		// painsound
-	0,		// meleestate
-	S_POSS_ATK1,		// missilestate
-	S_POSS_DIE1,		// deathstate
-	S_POSS_XDIE1,		// xdeathstate
-	sfx_podth1,		// deathsound
-	8,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_posact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_POSS_RAISE1		// raisestate
-    },
-
-    {		// MT_SHOTGUY
-	9,		// doomednum
-	S_SPOS_STND,		// spawnstate
-	30,		// spawnhealth
-	S_SPOS_RUN1,		// seestate
-	sfx_posit2,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_SPOS_PAIN,		// painstate
-	170,		// painchance
-	sfx_popain,		// painsound
-	0,		// meleestate
-	S_SPOS_ATK1,		// missilestate
-	S_SPOS_DIE1,		// deathstate
-	S_SPOS_XDIE1,		// xdeathstate
-	sfx_podth2,		// deathsound
-	8,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_posact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_SPOS_RAISE1		// raisestate
-    },
-
-    {		// MT_VILE
-	64,		// doomednum
-	S_VILE_STND,		// spawnstate
-	700,		// spawnhealth
-	S_VILE_RUN1,		// seestate
-	sfx_vilsit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_VILE_PAIN,		// painstate
-	10,		// painchance
-	sfx_vipain,		// painsound
-	0,		// meleestate
-	S_VILE_ATK1,		// missilestate
-	S_VILE_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_vildth,		// deathsound
-	15,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	500,		// mass
-	0,		// damage
-	sfx_vilact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_FIRE
-	-1,		// doomednum
-	S_FIRE1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_UNDEAD
-	66,		// doomednum
-	S_SKEL_STND,		// spawnstate
-	300,		// spawnhealth
-	S_SKEL_RUN1,		// seestate
-	sfx_skesit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_SKEL_PAIN,		// painstate
-	100,		// painchance
-	sfx_popain,		// painsound
-	S_SKEL_FIST1,		// meleestate
-	S_SKEL_MISS1,		// missilestate
-	S_SKEL_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_skedth,		// deathsound
-	10,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	500,		// mass
-	0,		// damage
-	sfx_skeact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_SKEL_RAISE1		// raisestate
-    },
-
-    {		// MT_TRACER
-	-1,		// doomednum
-	S_TRACER,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_skeatk,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_TRACEEXP1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_barexp,		// deathsound
-	10*FRACUNIT,		// speed
-	11*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	10,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_SMOKE
-	-1,		// doomednum
-	S_SMOKE1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_FATSO
-	67,		// doomednum
-	S_FATT_STND,		// spawnstate
-	600,		// spawnhealth
-	S_FATT_RUN1,		// seestate
-	sfx_mansit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_FATT_PAIN,		// painstate
-	80,		// painchance
-	sfx_mnpain,		// painsound
-	0,		// meleestate
-	S_FATT_ATK1,		// missilestate
-	S_FATT_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_mandth,		// deathsound
-	8,		// speed
-	48*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	1000,		// mass
-	0,		// damage
-	sfx_posact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_FATT_RAISE1		// raisestate
-    },
-
-    {		// MT_FATSHOT
-	-1,		// doomednum
-	S_FATSHOT1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_firsht,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_FATSHOTX1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	20*FRACUNIT,		// speed
-	6*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	8,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_CHAINGUY
-	65,		// doomednum
-	S_CPOS_STND,		// spawnstate
-	70,		// spawnhealth
-	S_CPOS_RUN1,		// seestate
-	sfx_posit2,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_CPOS_PAIN,		// painstate
-	170,		// painchance
-	sfx_popain,		// painsound
-	0,		// meleestate
-	S_CPOS_ATK1,		// missilestate
-	S_CPOS_DIE1,		// deathstate
-	S_CPOS_XDIE1,		// xdeathstate
-	sfx_podth2,		// deathsound
-	8,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_posact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_CPOS_RAISE1		// raisestate
-    },
-
-    {		// MT_TROOP
-	3001,		// doomednum
-	S_TROO_STND,		// spawnstate
-	60,		// spawnhealth
-	S_TROO_RUN1,		// seestate
-	sfx_bgsit1,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_TROO_PAIN,		// painstate
-	200,		// painchance
-	sfx_popain,		// painsound
-	S_TROO_ATK1,		// meleestate
-	S_TROO_ATK1,		// missilestate
-	S_TROO_DIE1,		// deathstate
-	S_TROO_XDIE1,		// xdeathstate
-	sfx_bgdth1,		// deathsound
-	8,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_bgact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_TROO_RAISE1		// raisestate
-    },
-
-    {		// MT_SERGEANT
-	3002,		// doomednum
-	S_SARG_STND,		// spawnstate
-	150,		// spawnhealth
-	S_SARG_RUN1,		// seestate
-	sfx_sgtsit,		// seesound
-	8,		// reactiontime
-	sfx_sgtatk,		// attacksound
-	S_SARG_PAIN,		// painstate
-	180,		// painchance
-	sfx_dmpain,		// painsound
-	S_SARG_ATK1,		// meleestate
-	0,		// missilestate
-	S_SARG_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_sgtdth,		// deathsound
-	10,		// speed
-	30*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	400,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_SARG_RAISE1		// raisestate
-    },
-
-    {		// MT_SHADOWS
-	58,		// doomednum
-	S_SARG_STND,		// spawnstate
-	150,		// spawnhealth
-	S_SARG_RUN1,		// seestate
-	sfx_sgtsit,		// seesound
-	8,		// reactiontime
-	sfx_sgtatk,		// attacksound
-	S_SARG_PAIN,		// painstate
-	180,		// painchance
-	sfx_dmpain,		// painsound
-	S_SARG_ATK1,		// meleestate
-	0,		// missilestate
-	S_SARG_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_sgtdth,		// deathsound
-	10,		// speed
-	30*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	400,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_SHADOW|MF_COUNTKILL,		// flags
-	S_SARG_RAISE1		// raisestate
-    },
-
-    {		// MT_HEAD
-	3005,		// doomednum
-	S_HEAD_STND,		// spawnstate
-	400,		// spawnhealth
-	S_HEAD_RUN1,		// seestate
-	sfx_cacsit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_HEAD_PAIN,		// painstate
-	128,		// painchance
-	sfx_dmpain,		// painsound
-	0,		// meleestate
-	S_HEAD_ATK1,		// missilestate
-	S_HEAD_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_cacdth,		// deathsound
-	8,		// speed
-	31*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	400,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL,		// flags
-	S_HEAD_RAISE1		// raisestate
-    },
-
-    {		// MT_BRUISER
-	3003,		// doomednum
-	S_BOSS_STND,		// spawnstate
-	1000,		// spawnhealth
-	S_BOSS_RUN1,		// seestate
-	sfx_brssit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_BOSS_PAIN,		// painstate
-	50,		// painchance
-	sfx_dmpain,		// painsound
-	S_BOSS_ATK1,		// meleestate
-	S_BOSS_ATK1,		// missilestate
-	S_BOSS_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_brsdth,		// deathsound
-	8,		// speed
-	24*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	1000,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_BOSS_RAISE1		// raisestate
-    },
-
-    {		// MT_BRUISERSHOT
-	-1,		// doomednum
-	S_BRBALL1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_firsht,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_BRBALLX1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	15*FRACUNIT,		// speed
-	6*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	8,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_KNIGHT
-	69,		// doomednum
-	S_BOS2_STND,		// spawnstate
-	500,		// spawnhealth
-	S_BOS2_RUN1,		// seestate
-	sfx_kntsit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_BOS2_PAIN,		// painstate
-	50,		// painchance
-	sfx_dmpain,		// painsound
-	S_BOS2_ATK1,		// meleestate
-	S_BOS2_ATK1,		// missilestate
-	S_BOS2_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_kntdth,		// deathsound
-	8,		// speed
-	24*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	1000,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_BOS2_RAISE1		// raisestate
-    },
-
-    {		// MT_SKULL
-	3006,		// doomednum
-	S_SKULL_STND,		// spawnstate
-	100,		// spawnhealth
-	S_SKULL_RUN1,		// seestate
-	0,		// seesound
-	8,		// reactiontime
-	sfx_sklatk,		// attacksound
-	S_SKULL_PAIN,		// painstate
-	256,		// painchance
-	sfx_dmpain,		// painsound
-	0,		// meleestate
-	S_SKULL_ATK1,		// missilestate
-	S_SKULL_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	8,		// speed
-	16*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	50,		// mass
-	3,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_SPIDER
-	7,		// doomednum
-	S_SPID_STND,		// spawnstate
-	3000,		// spawnhealth
-	S_SPID_RUN1,		// seestate
-	sfx_spisit,		// seesound
-	8,		// reactiontime
-	sfx_shotgn,		// attacksound
-	S_SPID_PAIN,		// painstate
-	40,		// painchance
-	sfx_dmpain,		// painsound
-	0,		// meleestate
-	S_SPID_ATK1,		// missilestate
-	S_SPID_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_spidth,		// deathsound
-	12,		// speed
-	128*FRACUNIT,		// radius
-	100*FRACUNIT,		// height
-	1000,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BABY
-	68,		// doomednum
-	S_BSPI_STND,		// spawnstate
-	500,		// spawnhealth
-	S_BSPI_SIGHT,		// seestate
-	sfx_bspsit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_BSPI_PAIN,		// painstate
-	128,		// painchance
-	sfx_dmpain,		// painsound
-	0,		// meleestate
-	S_BSPI_ATK1,		// missilestate
-	S_BSPI_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_bspdth,		// deathsound
-	12,		// speed
-	64*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	600,		// mass
-	0,		// damage
-	sfx_bspact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_BSPI_RAISE1		// raisestate
-    },
-
-    {		// MT_CYBORG
-	16,		// doomednum
-	S_CYBER_STND,		// spawnstate
-	4000,		// spawnhealth
-	S_CYBER_RUN1,		// seestate
-	sfx_cybsit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_CYBER_PAIN,		// painstate
-	20,		// painchance
-	sfx_dmpain,		// painsound
-	0,		// meleestate
-	S_CYBER_ATK1,		// missilestate
-	S_CYBER_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_cybdth,		// deathsound
-	16,		// speed
-	40*FRACUNIT,		// radius
-	110*FRACUNIT,		// height
-	1000,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_PAIN
-	71,		// doomednum
-	S_PAIN_STND,		// spawnstate
-	400,		// spawnhealth
-	S_PAIN_RUN1,		// seestate
-	sfx_pesit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_PAIN_PAIN,		// painstate
-	128,		// painchance
-	sfx_pepain,		// painsound
-	0,		// meleestate
-	S_PAIN_ATK1,		// missilestate
-	S_PAIN_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_pedth,		// deathsound
-	8,		// speed
-	31*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	400,		// mass
-	0,		// damage
-	sfx_dmact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL,		// flags
-	S_PAIN_RAISE1		// raisestate
-    },
-
-    {		// MT_WOLFSS
-	84,		// doomednum
-	S_SSWV_STND,		// spawnstate
-	50,		// spawnhealth
-	S_SSWV_RUN1,		// seestate
-	sfx_sssit,		// seesound
-	8,		// reactiontime
-	0,		// attacksound
-	S_SSWV_PAIN,		// painstate
-	170,		// painchance
-	sfx_popain,		// painsound
-	0,		// meleestate
-	S_SSWV_ATK1,		// missilestate
-	S_SSWV_DIE1,		// deathstate
-	S_SSWV_XDIE1,		// xdeathstate
-	sfx_ssdth,		// deathsound
-	8,		// speed
-	20*FRACUNIT,		// radius
-	56*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_posact,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_SSWV_RAISE1		// raisestate
-    },
-
-    {		// MT_KEEN
-	72,		// doomednum
-	S_KEENSTND,		// spawnstate
-	100,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_KEENPAIN,		// painstate
-	256,		// painchance
-	sfx_keenpn,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_COMMKEEN,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_keendt,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	72*FRACUNIT,		// height
-	10000000,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY|MF_SHOOTABLE|MF_COUNTKILL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BOSSBRAIN
-	88,		// doomednum
-	S_BRAIN,		// spawnstate
-	250,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_BRAIN_PAIN,		// painstate
-	255,		// painchance
-	sfx_bospn,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_BRAIN_DIE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_bosdth,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	10000000,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SHOOTABLE,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BOSSSPIT
-	89,		// doomednum
-	S_BRAINEYE,		// spawnstate
-	1000,		// spawnhealth
-	S_BRAINEYESEE,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	32*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BOSSTARGET
-	87,		// doomednum
-	S_NULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	32*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_SPAWNSHOT
-	-1,		// doomednum
-	S_SPAWN1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_bospit,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	10*FRACUNIT,		// speed
-	6*FRACUNIT,		// radius
-	32*FRACUNIT,		// height
-	100,		// mass
-	3,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_NOCLIP,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_SPAWNFIRE
-	-1,		// doomednum
-	S_SPAWNFIRE1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BARREL
-	2035,		// doomednum
-	S_BAR1,		// spawnstate
-	20,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_BEXP,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_barexp,		// deathsound
-	0,		// speed
-	10*FRACUNIT,		// radius
-	42*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_TROOPSHOT
-	-1,		// doomednum
-	S_TBALL1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_firsht,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_TBALLX1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	10*FRACUNIT,		// speed
-	6*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	3,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_HEADSHOT
-	-1,		// doomednum
-	S_RBALL1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_firsht,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_RBALLX1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	10*FRACUNIT,		// speed
-	6*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	5,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_ROCKET
-	-1,		// doomednum
-	S_ROCKET,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_rlaunc,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_EXPLODE1,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_barexp,		// deathsound
-	20*FRACUNIT,		// speed
-	11*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	20,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_PLASMA
-	-1,		// doomednum
-	S_PLASBALL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_plasma,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_PLASEXP,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	25*FRACUNIT,		// speed
-	13*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	5,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BFG
-	-1,		// doomednum
-	S_BFGSHOT,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	0,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_BFGLAND,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_rxplod,		// deathsound
-	25*FRACUNIT,		// speed
-	13*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	100,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_ARACHPLAZ
-	-1,		// doomednum
-	S_ARACH_PLAZ,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_plasma,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_ARACH_PLEX,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
-	25*FRACUNIT,		// speed
-	13*FRACUNIT,		// radius
-	8*FRACUNIT,		// height
-	100,		// mass
-	5,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_PUFF
-	-1,		// doomednum
-	S_PUFF1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_BLOOD
-	-1,		// doomednum
-	S_BLOOD1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_TFOG
-	-1,		// doomednum
-	S_TFOG,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_IFOG
-	-1,		// doomednum
-	S_IFOG,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_TELEPORTMAN
-	14,		// doomednum
-	S_NULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_EXTRABFG
-	-1,		// doomednum
-	S_BFGEXP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC0
-	2018,		// doomednum
-	S_ARM1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC1
-	2019,		// doomednum
-	S_ARM2,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC2
-	2014,		// doomednum
-	S_BON1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC3
-	2015,		// doomednum
-	S_BON2,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC4
-	5,		// doomednum
-	S_BKEY,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC5
-	13,		// doomednum
-	S_RKEY,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC6
-	6,		// doomednum
-	S_YKEY,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC7
-	39,		// doomednum
-	S_YSKULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC8
-	38,		// doomednum
-	S_RSKULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC9
-	40,		// doomednum
-	S_BSKULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_NOTDMATCH,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC10
-	2011,		// doomednum
-	S_STIM,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC11
-	2012,		// doomednum
-	S_MEDI,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC12
-	2013,		// doomednum
-	S_SOUL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_INV
-	2022,		// doomednum
-	S_PINV,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC13
-	2023,		// doomednum
-	S_PSTR,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_INS
-	2024,		// doomednum
-	S_PINS,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC14
-	2025,		// doomednum
-	S_SUIT,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC15
-	2026,		// doomednum
-	S_PMAP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC16
-	2045,		// doomednum
-	S_PVIS,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MEGA
-	83,		// doomednum
-	S_MEGA,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_CLIP
-	2007,		// doomednum
-	S_CLIP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC17
-	2048,		// doomednum
-	S_AMMO,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC18
-	2010,		// doomednum
-	S_ROCK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC19
-	2046,		// doomednum
-	S_BROK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC20
-	2047,		// doomednum
-	S_CELL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC21
-	17,		// doomednum
-	S_CELP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC22
-	2008,		// doomednum
-	S_SHEL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC23
-	2049,		// doomednum
-	S_SBOX,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC24
-	8,		// doomednum
-	S_BPAK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC25
-	2006,		// doomednum
-	S_BFUG,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_CHAINGUN
-	2002,		// doomednum
-	S_MGUN,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC26
-	2005,		// doomednum
-	S_CSAW,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC27
-	2003,		// doomednum
-	S_LAUN,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC28
-	2004,		// doomednum
-	S_PLAS,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_SHOTGUN
-	2001,		// doomednum
-	S_SHOT,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_SUPERSHOTGUN
-	82,		// doomednum
-	S_SHOT2,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC29
-	85,		// doomednum
-	S_TECHLAMP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC30
-	86,		// doomednum
-	S_TECH2LAMP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC31
-	2028,		// doomednum
-	S_COLU,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC32
-	30,		// doomednum
-	S_TALLGRNCOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC33
-	31,		// doomednum
-	S_SHRTGRNCOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC34
-	32,		// doomednum
-	S_TALLREDCOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC35
-	33,		// doomednum
-	S_SHRTREDCOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC36
-	37,		// doomednum
-	S_SKULLCOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC37
-	36,		// doomednum
-	S_HEARTCOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC38
-	41,		// doomednum
-	S_EVILEYE,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC39
-	42,		// doomednum
-	S_FLOATSKULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC40
-	43,		// doomednum
-	S_TORCHTREE,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC41
-	44,		// doomednum
-	S_BLUETORCH,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC42
-	45,		// doomednum
-	S_GREENTORCH,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC43
-	46,		// doomednum
-	S_REDTORCH,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC44
-	55,		// doomednum
-	S_BTORCHSHRT,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC45
-	56,		// doomednum
-	S_GTORCHSHRT,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC46
-	57,		// doomednum
-	S_RTORCHSHRT,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC47
-	47,		// doomednum
-	S_STALAGTITE,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC48
-	48,		// doomednum
-	S_TECHPILLAR,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC49
-	34,		// doomednum
-	S_CANDLESTIK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC50
-	35,		// doomednum
-	S_CANDELABRA,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC51
-	49,		// doomednum
-	S_BLOODYTWITCH,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	68*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC52
-	50,		// doomednum
-	S_MEAT2,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	84*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC53
-	51,		// doomednum
-	S_MEAT3,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	84*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC54
-	52,		// doomednum
-	S_MEAT4,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	68*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC55
-	53,		// doomednum
-	S_MEAT5,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	52*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC56
-	59,		// doomednum
-	S_MEAT2,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	84*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC57
-	60,		// doomednum
-	S_MEAT4,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	68*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC58
-	61,		// doomednum
-	S_MEAT3,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	52*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC59
-	62,		// doomednum
-	S_MEAT5,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	52*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC60
-	63,		// doomednum
-	S_BLOODYTWITCH,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	68*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC61
-	22,		// doomednum
-	S_HEAD_DIE6,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC62
-	15,		// doomednum
-	S_PLAY_DIE7,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC63
-	18,		// doomednum
-	S_POSS_DIE5,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC64
-	21,		// doomednum
-	S_SARG_DIE6,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC65
-	23,		// doomednum
-	S_SKULL_DIE6,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC66
-	20,		// doomednum
-	S_TROO_DIE5,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC67
-	19,		// doomednum
-	S_SPOS_DIE5,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC68
-	10,		// doomednum
-	S_PLAY_XDIE9,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC69
-	12,		// doomednum
-	S_PLAY_XDIE9,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC70
-	28,		// doomednum
-	S_HEADSONSTICK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC71
-	24,		// doomednum
-	S_GIBS,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	0,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC72
-	27,		// doomednum
-	S_HEADONASTICK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC73
-	29,		// doomednum
-	S_HEADCANDLES,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC74
-	25,		// doomednum
-	S_DEADSTICK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC75
-	26,		// doomednum
-	S_LIVESTICK,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC76
-	54,		// doomednum
-	S_BIGTREE,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	32*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC77
-	70,		// doomednum
-	S_BBAR1,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC78
-	73,		// doomednum
-	S_HANGNOGUTS,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	88*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC79
-	74,		// doomednum
-	S_HANGBNOBRAIN,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	88*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC80
-	75,		// doomednum
-	S_HANGTLOOKDN,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC81
-	76,		// doomednum
-	S_HANGTSKULL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC82
-	77,		// doomednum
-	S_HANGTLOOKUP,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC83
-	78,		// doomednum
-	S_HANGTNOBRAIN,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	16*FRACUNIT,		// radius
-	64*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC84
-	79,		// doomednum
-	S_COLONGIBS,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC85
-	80,		// doomednum
-	S_SMALLPOOL,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP,		// flags
-	S_NULL		// raisestate
-    },
-
-    {		// MT_MISC86
-	81,		// doomednum
-	S_BRAINSTEM,		// spawnstate
-	1000,		// spawnhealth
-	S_NULL,		// seestate
-	sfx_None,		// seesound
-	8,		// reactiontime
-	sfx_None,		// attacksound
-	S_NULL,		// painstate
-	0,		// painchance
-	sfx_None,		// painsound
-	S_NULL,		// meleestate
-	S_NULL,		// missilestate
-	S_NULL,		// deathstate
-	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
-	0,		// speed
-	20*FRACUNIT,		// radius
-	16*FRACUNIT,		// height
-	100,		// mass
-	0,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP,		// flags
-	S_NULL		// raisestate
-    }
+mobjinfo_t mobjinfo[NUMMOBJTYPES] =
+{
+    {
+        /* MT_PLAYER */
+
+        .doomednum = -1,
+        .spawnstate = S_PLAY,
+        .spawnhealth = 100,
+        .seestate = S_PLAY_RUN1,
+        .reactiontime = 0,
+        .painstate = S_PLAY_PAIN,
+        .painchance = 255,
+        .meleestate = S_NULL,
+        .missilestate = S_PLAY_ATK1,
+        .deathstate = S_PLAY_DIE1,
+        .xdeathstate = S_PLAY_XDIE1,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_DROPOFF |
+                 MF_PICKUP | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_PLPAIN,
+        .deathsound = SFX_PLDETH,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_POSSESSED */
+
+        .doomednum = 3004,
+        .spawnstate = S_POSS_STND,
+        .spawnhealth = 20,
+        .seestate = S_POSS_RUN1,
+        .reactiontime = 8,
+        .painstate = S_POSS_PAIN,
+        .painchance = 200,
+        .meleestate = 0,
+        .missilestate = S_POSS_ATK1,
+        .deathstate = S_POSS_DIE1,
+        .xdeathstate = S_POSS_XDIE1,
+        .speed = 8,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_POSS_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_PISTOL,
+        .painsound = SFX_POPAIN,
+        .deathsound = SFX_PODTH1,
+        .activesound = SFX_POSACT,
+        .seesound = SFX_POSIT1,
+#endif
+    },
+
+    {
+        /* MT_SHOTGUY */
+
+        .doomednum = 9,
+        .spawnstate = S_SPOS_STND,
+        .spawnhealth = 30,
+        .seestate = S_SPOS_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SPOS_PAIN,
+        .painchance = 170,
+        .meleestate = 0,
+        .missilestate = S_SPOS_ATK1,
+        .deathstate = S_SPOS_DIE1,
+        .xdeathstate = S_SPOS_XDIE1,
+        .speed = 8,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_SPOS_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_POPAIN,
+        .deathsound = SFX_PODTH2,
+        .activesound = SFX_POSACT,
+        .seesound = SFX_POSIT2,
+#endif
+    },
+
+    {
+        /* MT_VILE */
+
+        .doomednum = 64,
+        .spawnstate = S_VILE_STND,
+        .spawnhealth = 700,
+        .seestate = S_VILE_RUN1,
+        .reactiontime = 8,
+        .painstate = S_VILE_PAIN,
+        .painchance = 10,
+        .meleestate = 0,
+        .missilestate = S_VILE_ATK1,
+        .deathstate = S_VILE_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 15,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 500,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_VIPAIN,
+        .deathsound = SFX_VILDTH,
+        .activesound = SFX_VILACT,
+        .seesound = SFX_VILSIT,
+#endif
+    },
+
+    {
+        /* MT_FIRE */
+
+        .doomednum = -1,
+        .spawnstate = S_FIRE1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_UNDEAD */
+
+        .doomednum = 66,
+        .spawnstate = S_SKEL_STND,
+        .spawnhealth = 300,
+        .seestate = S_SKEL_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SKEL_PAIN,
+        .painchance = 100,
+        .meleestate = S_SKEL_FIST1,
+        .missilestate = S_SKEL_MISS1,
+        .deathstate = S_SKEL_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 10,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 500,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_SKEL_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_POPAIN,
+        .deathsound = SFX_SKEDTH,
+        .activesound = SFX_SKEACT,
+        .seesound = SFX_SKESIT,
+#endif
+    },
+
+    {
+        /* MT_TRACER */
+
+        .doomednum = -1,
+        .spawnstate = S_TRACER,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_TRACEEXP1,
+        .xdeathstate = S_NULL,
+        .speed = 10 * FRACUNIT,
+        .radius = 11 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 10,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_BAREXP,
+        .activesound = SFX_NONE,
+        .seesound = SFX_SKEATK,
+#endif
+    },
+
+    {
+        /* MT_SMOKE */
+
+        .doomednum = -1,
+        .spawnstate = S_SMOKE1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_FATSO */
+
+        .doomednum = 67,
+        .spawnstate = S_FATT_STND,
+        .spawnhealth = 600,
+        .seestate = S_FATT_RUN1,
+        .reactiontime = 8,
+        .painstate = S_FATT_PAIN,
+        .painchance = 80,
+        .meleestate = 0,
+        .missilestate = S_FATT_ATK1,
+        .deathstate = S_FATT_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 8,
+        .radius = 48 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 1000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_FATT_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_MNPAIN,
+        .deathsound = SFX_MANDTH,
+        .activesound = SFX_POSACT,
+        .seesound = SFX_MANSIT,
+#endif
+    },
+
+    {
+        /* MT_FATSHOT */
+
+        .doomednum = -1,
+        .spawnstate = S_FATSHOT1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_FATSHOTX1,
+        .xdeathstate = S_NULL,
+        .speed = 20 * FRACUNIT,
+        .radius = 6 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 8,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_FIRSHT,
+#endif
+    },
+
+    {
+        /* MT_CHAINGUY */
+
+        .doomednum = 65,
+        .spawnstate = S_CPOS_STND,
+        .spawnhealth = 70,
+        .seestate = S_CPOS_RUN1,
+        .reactiontime = 8,
+        .painstate = S_CPOS_PAIN,
+        .painchance = 170,
+        .meleestate = 0,
+        .missilestate = S_CPOS_ATK1,
+        .deathstate = S_CPOS_DIE1,
+        .xdeathstate = S_CPOS_XDIE1,
+        .speed = 8,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_CPOS_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_POPAIN,
+        .deathsound = SFX_PODTH2,
+        .activesound = SFX_POSACT,
+        .seesound = SFX_POSIT2,
+#endif
+    },
+
+    {
+        /* MT_TROOP */
+
+        .doomednum = 3001,
+        .spawnstate = S_TROO_STND,
+        .spawnhealth = 60,
+        .seestate = S_TROO_RUN1,
+        .reactiontime = 8,
+        .painstate = S_TROO_PAIN,
+        .painchance = 200,
+        .meleestate = S_TROO_ATK1,
+        .missilestate = S_TROO_ATK1,
+        .deathstate = S_TROO_DIE1,
+        .xdeathstate = S_TROO_XDIE1,
+        .speed = 8,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_TROO_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_POPAIN,
+        .deathsound = SFX_BGDTH1,
+        .activesound = SFX_BGACT,
+        .seesound = SFX_BGSIT1,
+#endif
+    },
+
+    {
+        /* MT_SERGEANT */
+
+        .doomednum = 3002,
+        .spawnstate = S_SARG_STND,
+        .spawnhealth = 150,
+        .seestate = S_SARG_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SARG_PAIN,
+        .painchance = 180,
+        .meleestate = S_SARG_ATK1,
+        .missilestate = 0,
+        .deathstate = S_SARG_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 10,
+        .radius = 30 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 400,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_SARG_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_SGTATK,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_SGTDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_SGTSIT,
+#endif
+    },
+
+    {
+        /* MT_SHADOWS */
+
+        .doomednum = 58,
+        .spawnstate = S_SARG_STND,
+        .spawnhealth = 150,
+        .seestate = S_SARG_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SARG_PAIN,
+        .painchance = 180,
+        .meleestate = S_SARG_ATK1,
+        .missilestate = 0,
+        .deathstate = S_SARG_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 10,
+        .radius = 30 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 400,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_SHADOW | MF_COUNTKILL,
+        .raisestate = S_SARG_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_SGTATK,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_SGTDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_SGTSIT,
+#endif
+    },
+
+    {
+        /* MT_HEAD */
+
+        .doomednum = 3005,
+        .spawnstate = S_HEAD_STND,
+        .spawnhealth = 400,
+        .seestate = S_HEAD_RUN1,
+        .reactiontime = 8,
+        .painstate = S_HEAD_PAIN,
+        .painchance = 128,
+        .meleestate = 0,
+        .missilestate = S_HEAD_ATK1,
+        .deathstate = S_HEAD_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 8,
+        .radius = 31 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 400,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_FLOAT |
+                 MF_NOGRAVITY | MF_COUNTKILL,
+        .raisestate = S_HEAD_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_CACDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_CACSIT,
+#endif
+    },
+
+    {
+        /* MT_BRUISER */
+
+        .doomednum = 3003,
+        .spawnstate = S_BOSS_STND,
+        .spawnhealth = 1000,
+        .seestate = S_BOSS_RUN1,
+        .reactiontime = 8,
+        .painstate = S_BOSS_PAIN,
+        .painchance = 50,
+        .meleestate = S_BOSS_ATK1,
+        .missilestate = S_BOSS_ATK1,
+        .deathstate = S_BOSS_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 8,
+        .radius = 24 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 1000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_BOSS_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_BRSDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_BRSSIT,
+#endif
+    },
+
+    {
+        /* MT_BRUISERSHOT */
+
+        .doomednum = -1,
+        .spawnstate = S_BRBALL1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_BRBALLX1,
+        .xdeathstate = S_NULL,
+        .speed = 15 * FRACUNIT,
+        .radius = 6 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 8,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_FIRSHT,
+#endif
+    },
+
+    {
+        /* MT_KNIGHT */
+
+        .doomednum = 69,
+        .spawnstate = S_BOS2_STND,
+        .spawnhealth = 500,
+        .seestate = S_BOS2_RUN1,
+        .reactiontime = 8,
+        .painstate = S_BOS2_PAIN,
+        .painchance = 50,
+        .meleestate = S_BOS2_ATK1,
+        .missilestate = S_BOS2_ATK1,
+        .deathstate = S_BOS2_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 8,
+        .radius = 24 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 1000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_BOS2_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_KNTDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_KNTSIT,
+#endif
+    },
+
+    {
+        /* MT_SKULL */
+
+        .doomednum = 3006,
+        .spawnstate = S_SKULL_STND,
+        .spawnhealth = 100,
+        .seestate = S_SKULL_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SKULL_PAIN,
+        .painchance = 256,
+        .meleestate = 0,
+        .missilestate = S_SKULL_ATK1,
+        .deathstate = S_SKULL_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 8,
+        .radius = 16 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 50,
+        .damage = 3,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_FLOAT | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_SKLATK,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_DMACT,
+        .seesound = 0,
+#endif
+    },
+
+    {
+        /* MT_SPIDER */
+
+        .doomednum = 7,
+        .spawnstate = S_SPID_STND,
+        .spawnhealth = 3000,
+        .seestate = S_SPID_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SPID_PAIN,
+        .painchance = 40,
+        .meleestate = 0,
+        .missilestate = S_SPID_ATK1,
+        .deathstate = S_SPID_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 12,
+        .radius = 128 * FRACUNIT,
+        .height = 100 * FRACUNIT,
+        .mass = 1000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_SHOTGN,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_SPIDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_SPISIT,
+#endif
+    },
+
+    {
+        /* MT_BABY */
+
+        .doomednum = 68,
+        .spawnstate = S_BSPI_STND,
+        .spawnhealth = 500,
+        .seestate = S_BSPI_SIGHT,
+        .reactiontime = 8,
+        .painstate = S_BSPI_PAIN,
+        .painchance = 128,
+        .meleestate = 0,
+        .missilestate = S_BSPI_ATK1,
+        .deathstate = S_BSPI_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 12,
+        .radius = 64 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 600,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_BSPI_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_BSPDTH,
+        .activesound = SFX_BSPACT,
+        .seesound = SFX_BSPSIT,
+#endif
+    },
+
+    {
+        /* MT_CYBORG */
+
+        .doomednum = 16,
+        .spawnstate = S_CYBER_STND,
+        .spawnhealth = 4000,
+        .seestate = S_CYBER_RUN1,
+        .reactiontime = 8,
+        .painstate = S_CYBER_PAIN,
+        .painchance = 20,
+        .meleestate = 0,
+        .missilestate = S_CYBER_ATK1,
+        .deathstate = S_CYBER_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 16,
+        .radius = 40 * FRACUNIT,
+        .height = 110 * FRACUNIT,
+        .mass = 1000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_DMPAIN,
+        .deathsound = SFX_CYBDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_CYBSIT,
+#endif
+    },
+
+    {
+        /* MT_PAIN */
+
+        .doomednum = 71,
+        .spawnstate = S_PAIN_STND,
+        .spawnhealth = 400,
+        .seestate = S_PAIN_RUN1,
+        .reactiontime = 8,
+        .painstate = S_PAIN_PAIN,
+        .painchance = 128,
+        .meleestate = 0,
+        .missilestate = S_PAIN_ATK1,
+        .deathstate = S_PAIN_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 8,
+        .radius = 31 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 400,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_FLOAT |
+                 MF_NOGRAVITY | MF_COUNTKILL,
+        .raisestate = S_PAIN_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_PEPAIN,
+        .deathsound = SFX_PEDTH,
+        .activesound = SFX_DMACT,
+        .seesound = SFX_PESIT,
+#endif
+    },
+
+    {
+        /* MT_WOLFSS */
+
+        .doomednum = 84,
+        .spawnstate = S_SSWV_STND,
+        .spawnhealth = 50,
+        .seestate = S_SSWV_RUN1,
+        .reactiontime = 8,
+        .painstate = S_SSWV_PAIN,
+        .painchance = 170,
+        .meleestate = 0,
+        .missilestate = S_SSWV_ATK1,
+        .deathstate = S_SSWV_DIE1,
+        .xdeathstate = S_SSWV_XDIE1,
+        .speed = 8,
+        .radius = 20 * FRACUNIT,
+        .height = 56 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_SSWV_RAISE1,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = 0,
+        .painsound = SFX_POPAIN,
+        .deathsound = SFX_SSDTH,
+        .activesound = SFX_POSACT,
+        .seesound = SFX_SSSIT,
+#endif
+    },
+
+    {
+        /* MT_KEEN */
+
+        .doomednum = 72,
+        .spawnstate = S_KEENSTND,
+        .spawnhealth = 100,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_KEENPAIN,
+        .painchance = 256,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_COMMKEEN,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 72 * FRACUNIT,
+        .mass = 10000000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY |
+                 MF_SHOOTABLE | MF_COUNTKILL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_KEENPN,
+        .deathsound = SFX_KEENDT,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_BOSSBRAIN */
+
+        .doomednum = 88,
+        .spawnstate = S_BRAIN,
+        .spawnhealth = 250,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_BRAIN_PAIN,
+        .painchance = 255,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_BRAIN_DIE1,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 10000000,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_BOSPN,
+        .deathsound = SFX_BOSDTH,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_BOSSSPIT */
+
+        .doomednum = 89,
+        .spawnstate = S_BRAINEYE,
+        .spawnhealth = 1000,
+        .seestate = S_BRAINEYESEE,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 32 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOSECTOR,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_BOSSTARGET */
+
+        .doomednum = 87,
+        .spawnstate = S_NULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 32 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOSECTOR,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_SPAWNSHOT */
+
+        .doomednum = -1,
+        .spawnstate = S_SPAWN1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 10 * FRACUNIT,
+        .radius = 6 * FRACUNIT,
+        .height = 32 * FRACUNIT,
+        .mass = 100,
+        .damage = 3,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF |
+                 MF_NOGRAVITY | MF_NOCLIP,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_BOSPIT,
+#endif
+    },
+
+    {
+        /* MT_SPAWNFIRE */
+
+        .doomednum = -1,
+        .spawnstate = S_SPAWNFIRE1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_BARREL */
+
+        .doomednum = 2035,
+        .spawnstate = S_BAR1,
+        .spawnhealth = 20,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_BEXP,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 10 * FRACUNIT,
+        .height = 42 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_BAREXP,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_TROOPSHOT */
+
+        .doomednum = -1,
+        .spawnstate = S_TBALL1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_TBALLX1,
+        .xdeathstate = S_NULL,
+        .speed = 10 * FRACUNIT,
+        .radius = 6 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 3,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_FIRSHT,
+#endif
+    },
+
+    {
+        /* MT_HEADSHOT */
+
+        .doomednum = -1,
+        .spawnstate = S_RBALL1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_RBALLX1,
+        .xdeathstate = S_NULL,
+        .speed = 10 * FRACUNIT,
+        .radius = 6 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 5,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_FIRSHT,
+#endif
+    },
+
+    {
+        /* MT_ROCKET */
+
+        .doomednum = -1,
+        .spawnstate = S_ROCKET,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_EXPLODE1,
+        .xdeathstate = S_NULL,
+        .speed = 20 * FRACUNIT,
+        .radius = 11 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 20,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_BAREXP,
+        .activesound = SFX_NONE,
+        .seesound = SFX_RLAUNC,
+#endif
+    },
+
+    {
+        /* MT_PLASMA */
+
+        .doomednum = -1,
+        .spawnstate = S_PLASBALL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_PLASEXP,
+        .xdeathstate = S_NULL,
+        .speed = 25 * FRACUNIT,
+        .radius = 13 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 5,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_PLASMA,
+#endif
+    },
+
+    {
+        /* MT_BFG */
+
+        .doomednum = -1,
+        .spawnstate = S_BFGSHOT,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_BFGLAND,
+        .xdeathstate = S_NULL,
+        .speed = 25 * FRACUNIT,
+        .radius = 13 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 100,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_RXPLOD,
+        .activesound = SFX_NONE,
+        .seesound = 0,
+#endif
+    },
+
+    {
+        /* MT_ARACHPLAZ */
+
+        .doomednum = -1,
+        .spawnstate = S_ARACH_PLAZ,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_ARACH_PLEX,
+        .xdeathstate = S_NULL,
+        .speed = 25 * FRACUNIT,
+        .radius = 13 * FRACUNIT,
+        .height = 8 * FRACUNIT,
+        .mass = 100,
+        .damage = 5,
+        .flags = MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_FIRXPL,
+        .activesound = SFX_NONE,
+        .seesound = SFX_PLASMA,
+#endif
+    },
+
+    {
+        /* MT_PUFF */
+
+        .doomednum = -1,
+        .spawnstate = S_PUFF1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_BLOOD */
+
+        .doomednum = -1,
+        .spawnstate = S_BLOOD1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_TFOG */
+
+        .doomednum = -1,
+        .spawnstate = S_TFOG,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_IFOG */
+
+        .doomednum = -1,
+        .spawnstate = S_IFOG,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_TELEPORTMAN */
+
+        .doomednum = 14,
+        .spawnstate = S_NULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOSECTOR,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_EXTRABFG */
+
+        .doomednum = -1,
+        .spawnstate = S_BFGEXP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC0 */
+
+        .doomednum = 2018,
+        .spawnstate = S_ARM1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC1 */
+
+        .doomednum = 2019,
+        .spawnstate = S_ARM2,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC2 */
+
+        .doomednum = 2014,
+        .spawnstate = S_BON1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC3 */
+
+        .doomednum = 2015,
+        .spawnstate = S_BON2,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC4 */
+
+        .doomednum = 5,
+        .spawnstate = S_BKEY,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC5 */
+
+        .doomednum = 13,
+        .spawnstate = S_RKEY,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC6 */
+
+        .doomednum = 6,
+        .spawnstate = S_YKEY,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC7 */
+
+        .doomednum = 39,
+        .spawnstate = S_YSKULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC8 */
+
+        .doomednum = 38,
+        .spawnstate = S_RSKULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC9 */
+
+        .doomednum = 40,
+        .spawnstate = S_BSKULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_NOTDMATCH,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC10 */
+
+        .doomednum = 2011,
+        .spawnstate = S_STIM,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC11 */
+
+        .doomednum = 2012,
+        .spawnstate = S_MEDI,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC12 */
+
+        .doomednum = 2013,
+        .spawnstate = S_SOUL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_INV */
+
+        .doomednum = 2022,
+        .spawnstate = S_PINV,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC13 */
+
+        .doomednum = 2023,
+        .spawnstate = S_PSTR,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_INS */
+
+        .doomednum = 2024,
+        .spawnstate = S_PINS,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC14 */
+
+        .doomednum = 2025,
+        .spawnstate = S_SUIT,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC15 */
+
+        .doomednum = 2026,
+        .spawnstate = S_PMAP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC16 */
+
+        .doomednum = 2045,
+        .spawnstate = S_PVIS,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MEGA */
+
+        .doomednum = 83,
+        .spawnstate = S_MEGA,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL | MF_COUNTITEM,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_CLIP */
+
+        .doomednum = 2007,
+        .spawnstate = S_CLIP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC17 */
+
+        .doomednum = 2048,
+        .spawnstate = S_AMMO,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC18 */
+
+        .doomednum = 2010,
+        .spawnstate = S_ROCK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC19 */
+
+        .doomednum = 2046,
+        .spawnstate = S_BROK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC20 */
+
+        .doomednum = 2047,
+        .spawnstate = S_CELL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC21 */
+
+        .doomednum = 17,
+        .spawnstate = S_CELP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC22 */
+
+        .doomednum = 2008,
+        .spawnstate = S_SHEL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC23 */
+
+        .doomednum = 2049,
+        .spawnstate = S_SBOX,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC24 */
+
+        .doomednum = 8,
+        .spawnstate = S_BPAK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC25 */
+
+        .doomednum = 2006,
+        .spawnstate = S_BFUG,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_CHAINGUN */
+
+        .doomednum = 2002,
+        .spawnstate = S_MGUN,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC26 */
+
+        .doomednum = 2005,
+        .spawnstate = S_CSAW,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC27 */
+
+        .doomednum = 2003,
+        .spawnstate = S_LAUN,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC28 */
+
+        .doomednum = 2004,
+        .spawnstate = S_PLAS,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_SHOTGUN */
+
+        .doomednum = 2001,
+        .spawnstate = S_SHOT,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_SUPERSHOTGUN */
+
+        .doomednum = 82,
+        .spawnstate = S_SHOT2,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPECIAL,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC29 */
+
+        .doomednum = 85,
+        .spawnstate = S_TECHLAMP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC30 */
+
+        .doomednum = 86,
+        .spawnstate = S_TECH2LAMP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC31 */
+
+        .doomednum = 2028,
+        .spawnstate = S_COLU,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC32 */
+
+        .doomednum = 30,
+        .spawnstate = S_TALLGRNCOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC33 */
+
+        .doomednum = 31,
+        .spawnstate = S_SHRTGRNCOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC34 */
+
+        .doomednum = 32,
+        .spawnstate = S_TALLREDCOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC35 */
+
+        .doomednum = 33,
+        .spawnstate = S_SHRTREDCOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC36 */
+
+        .doomednum = 37,
+        .spawnstate = S_SKULLCOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC37 */
+
+        .doomednum = 36,
+        .spawnstate = S_HEARTCOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC38 */
+
+        .doomednum = 41,
+        .spawnstate = S_EVILEYE,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC39 */
+
+        .doomednum = 42,
+        .spawnstate = S_FLOATSKULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC40 */
+
+        .doomednum = 43,
+        .spawnstate = S_TORCHTREE,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC41 */
+
+        .doomednum = 44,
+        .spawnstate = S_BLUETORCH,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC42 */
+
+        .doomednum = 45,
+        .spawnstate = S_GREENTORCH,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC43 */
+
+        .doomednum = 46,
+        .spawnstate = S_REDTORCH,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC44 */
+
+        .doomednum = 55,
+        .spawnstate = S_BTORCHSHRT,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC45 */
+
+        .doomednum = 56,
+        .spawnstate = S_GTORCHSHRT,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC46 */
+
+        .doomednum = 57,
+        .spawnstate = S_RTORCHSHRT,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC47 */
+
+        .doomednum = 47,
+        .spawnstate = S_STALAGTITE,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC48 */
+
+        .doomednum = 48,
+        .spawnstate = S_TECHPILLAR,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC49 */
+
+        .doomednum = 34,
+        .spawnstate = S_CANDLESTIK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC50 */
+
+        .doomednum = 35,
+        .spawnstate = S_CANDELABRA,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC51 */
+
+        .doomednum = 49,
+        .spawnstate = S_BLOODYTWITCH,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 68 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC52 */
+
+        .doomednum = 50,
+        .spawnstate = S_MEAT2,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 84 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC53 */
+
+        .doomednum = 51,
+        .spawnstate = S_MEAT3,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 84 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC54 */
+
+        .doomednum = 52,
+        .spawnstate = S_MEAT4,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 68 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC55 */
+
+        .doomednum = 53,
+        .spawnstate = S_MEAT5,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 52 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC56 */
+
+        .doomednum = 59,
+        .spawnstate = S_MEAT2,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 84 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC57 */
+
+        .doomednum = 60,
+        .spawnstate = S_MEAT4,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 68 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC58 */
+
+        .doomednum = 61,
+        .spawnstate = S_MEAT3,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 52 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC59 */
+
+        .doomednum = 62,
+        .spawnstate = S_MEAT5,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 52 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC60 */
+
+        .doomednum = 63,
+        .spawnstate = S_BLOODYTWITCH,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 68 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC61 */
+
+        .doomednum = 22,
+        .spawnstate = S_HEAD_DIE6,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC62 */
+
+        .doomednum = 15,
+        .spawnstate = S_PLAY_DIE7,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC63 */
+
+        .doomednum = 18,
+        .spawnstate = S_POSS_DIE5,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC64 */
+
+        .doomednum = 21,
+        .spawnstate = S_SARG_DIE6,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC65 */
+
+        .doomednum = 23,
+        .spawnstate = S_SKULL_DIE6,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC66 */
+
+        .doomednum = 20,
+        .spawnstate = S_TROO_DIE5,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC67 */
+
+        .doomednum = 19,
+        .spawnstate = S_SPOS_DIE5,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC68 */
+
+        .doomednum = 10,
+        .spawnstate = S_PLAY_XDIE9,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC69 */
+
+        .doomednum = 12,
+        .spawnstate = S_PLAY_XDIE9,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC70 */
+
+        .doomednum = 28,
+        .spawnstate = S_HEADSONSTICK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC71 */
+
+        .doomednum = 24,
+        .spawnstate = S_GIBS,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = 0,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC72 */
+
+        .doomednum = 27,
+        .spawnstate = S_HEADONASTICK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC73 */
+
+        .doomednum = 29,
+        .spawnstate = S_HEADCANDLES,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC74 */
+
+        .doomednum = 25,
+        .spawnstate = S_DEADSTICK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC75 */
+
+        .doomednum = 26,
+        .spawnstate = S_LIVESTICK,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC76 */
+
+        .doomednum = 54,
+        .spawnstate = S_BIGTREE,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 32 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC77 */
+
+        .doomednum = 70,
+        .spawnstate = S_BBAR1,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC78 */
+
+        .doomednum = 73,
+        .spawnstate = S_HANGNOGUTS,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 88 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC79 */
+
+        .doomednum = 74,
+        .spawnstate = S_HANGBNOBRAIN,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 88 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC80 */
+
+        .doomednum = 75,
+        .spawnstate = S_HANGTLOOKDN,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC81 */
+
+        .doomednum = 76,
+        .spawnstate = S_HANGTSKULL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC82 */
+
+        .doomednum = 77,
+        .spawnstate = S_HANGTLOOKUP,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC83 */
+
+        .doomednum = 78,
+        .spawnstate = S_HANGTNOBRAIN,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 16 * FRACUNIT,
+        .height = 64 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC84 */
+
+        .doomednum = 79,
+        .spawnstate = S_COLONGIBS,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC85 */
+
+        .doomednum = 80,
+        .spawnstate = S_SMALLPOOL,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+        .seesound = SFX_NONE,
+#endif
+    },
+
+    {
+        /* MT_MISC86 */
+
+        .doomednum = 81,
+        .spawnstate = S_BRAINSTEM,
+        .spawnhealth = 1000,
+        .seestate = S_NULL,
+        .reactiontime = 8,
+        .painstate = S_NULL,
+        .painchance = 0,
+        .meleestate = S_NULL,
+        .missilestate = S_NULL,
+        .deathstate = S_NULL,
+        .xdeathstate = S_NULL,
+        .speed = 0,
+        .radius = 20 * FRACUNIT,
+        .height = 16 * FRACUNIT,
+        .mass = 100,
+        .damage = 0,
+        .flags = MF_NOBLOCKMAP,
+        .raisestate = S_NULL,
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+        .seesound = SFX_NONE,
+        .attacksound = SFX_NONE,
+        .painsound = SFX_NONE,
+        .deathsound = SFX_NONE,
+        .activesound = SFX_NONE,
+#endif
+    },
 };
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/info.h b/games/NXDoom/src/doom/info.h
index c426d07bf..508475f9d 100644
--- a/games/NXDoom/src/doom/info.h
+++ b/games/NXDoom/src/doom/info.h
@@ -1,1331 +1,1380 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Thing frame/state LUT,
-//	generated by multigen utilitiy.
-//	This one is the original DOOM version, preserved.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/info.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Thing frame/state LUT, generated by multigen utility.
+ *  This one is the original DOOM version, preserved.
+ *
+ ****************************************************************************/
 
 #ifndef __INFO__
 #define __INFO__
 
-// Needed for action function pointer handling.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdint.h>
+
+/* Needed for action function pointer handling. */
+
 #include "d_think.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef enum
 {
-    SPR_TROO,
-    SPR_SHTG,
-    SPR_PUNG,
-    SPR_PISG,
-    SPR_PISF,
-    SPR_SHTF,
-    SPR_SHT2,
-    SPR_CHGG,
-    SPR_CHGF,
-    SPR_MISG,
-    SPR_MISF,
-    SPR_SAWG,
-    SPR_PLSG,
-    SPR_PLSF,
-    SPR_BFGG,
-    SPR_BFGF,
-    SPR_BLUD,
-    SPR_PUFF,
-    SPR_BAL1,
-    SPR_BAL2,
-    SPR_PLSS,
-    SPR_PLSE,
-    SPR_MISL,
-    SPR_BFS1,
-    SPR_BFE1,
-    SPR_BFE2,
-    SPR_TFOG,
-    SPR_IFOG,
-    SPR_PLAY,
-    SPR_POSS,
-    SPR_SPOS,
-    SPR_VILE,
-    SPR_FIRE,
-    SPR_FATB,
-    SPR_FBXP,
-    SPR_SKEL,
-    SPR_MANF,
-    SPR_FATT,
-    SPR_CPOS,
-    SPR_SARG,
-    SPR_HEAD,
-    SPR_BAL7,
-    SPR_BOSS,
-    SPR_BOS2,
-    SPR_SKUL,
-    SPR_SPID,
-    SPR_BSPI,
-    SPR_APLS,
-    SPR_APBX,
-    SPR_CYBR,
-    SPR_PAIN,
-    SPR_SSWV,
-    SPR_KEEN,
-    SPR_BBRN,
-    SPR_BOSF,
-    SPR_ARM1,
-    SPR_ARM2,
-    SPR_BAR1,
-    SPR_BEXP,
-    SPR_FCAN,
-    SPR_BON1,
-    SPR_BON2,
-    SPR_BKEY,
-    SPR_RKEY,
-    SPR_YKEY,
-    SPR_BSKU,
-    SPR_RSKU,
-    SPR_YSKU,
-    SPR_STIM,
-    SPR_MEDI,
-    SPR_SOUL,
-    SPR_PINV,
-    SPR_PSTR,
-    SPR_PINS,
-    SPR_MEGA,
-    SPR_SUIT,
-    SPR_PMAP,
-    SPR_PVIS,
-    SPR_CLIP,
-    SPR_AMMO,
-    SPR_ROCK,
-    SPR_BROK,
-    SPR_CELL,
-    SPR_CELP,
-    SPR_SHEL,
-    SPR_SBOX,
-    SPR_BPAK,
-    SPR_BFUG,
-    SPR_MGUN,
-    SPR_CSAW,
-    SPR_LAUN,
-    SPR_PLAS,
-    SPR_SHOT,
-    SPR_SGN2,
-    SPR_COLU,
-    SPR_SMT2,
-    SPR_GOR1,
-    SPR_POL2,
-    SPR_POL5,
-    SPR_POL4,
-    SPR_POL3,
-    SPR_POL1,
-    SPR_POL6,
-    SPR_GOR2,
-    SPR_GOR3,
-    SPR_GOR4,
-    SPR_GOR5,
-    SPR_SMIT,
-    SPR_COL1,
-    SPR_COL2,
-    SPR_COL3,
-    SPR_COL4,
-    SPR_CAND,
-    SPR_CBRA,
-    SPR_COL6,
-    SPR_TRE1,
-    SPR_TRE2,
-    SPR_ELEC,
-    SPR_CEYE,
-    SPR_FSKU,
-    SPR_COL5,
-    SPR_TBLU,
-    SPR_TGRN,
-    SPR_TRED,
-    SPR_SMBT,
-    SPR_SMGT,
-    SPR_SMRT,
-    SPR_HDB1,
-    SPR_HDB2,
-    SPR_HDB3,
-    SPR_HDB4,
-    SPR_HDB5,
-    SPR_HDB6,
-    SPR_POB1,
-    SPR_POB2,
-    SPR_BRS1,
-    SPR_TLMP,
-    SPR_TLP2,
-    NUMSPRITES
-
+  SPR_TROO,
+  SPR_SHTG,
+  SPR_PUNG,
+  SPR_PISG,
+  SPR_PISF,
+  SPR_SHTF,
+  SPR_SHT2,
+  SPR_CHGG,
+  SPR_CHGF,
+  SPR_MISG,
+  SPR_MISF,
+  SPR_SAWG,
+  SPR_PLSG,
+  SPR_PLSF,
+  SPR_BFGG,
+  SPR_BFGF,
+  SPR_BLUD,
+  SPR_PUFF,
+  SPR_BAL1,
+  SPR_BAL2,
+  SPR_PLSS,
+  SPR_PLSE,
+  SPR_MISL,
+  SPR_BFS1,
+  SPR_BFE1,
+  SPR_BFE2,
+  SPR_TFOG,
+  SPR_IFOG,
+  SPR_PLAY,
+  SPR_POSS,
+  SPR_SPOS,
+  SPR_VILE,
+  SPR_FIRE,
+  SPR_FATB,
+  SPR_FBXP,
+  SPR_SKEL,
+  SPR_MANF,
+  SPR_FATT,
+  SPR_CPOS,
+  SPR_SARG,
+  SPR_HEAD,
+  SPR_BAL7,
+  SPR_BOSS,
+  SPR_BOS2,
+  SPR_SKUL,
+  SPR_SPID,
+  SPR_BSPI,
+  SPR_APLS,
+  SPR_APBX,
+  SPR_CYBR,
+  SPR_PAIN,
+  SPR_SSWV,
+  SPR_KEEN,
+  SPR_BBRN,
+  SPR_BOSF,
+  SPR_ARM1,
+  SPR_ARM2,
+  SPR_BAR1,
+  SPR_BEXP,
+  SPR_FCAN,
+  SPR_BON1,
+  SPR_BON2,
+  SPR_BKEY,
+  SPR_RKEY,
+  SPR_YKEY,
+  SPR_BSKU,
+  SPR_RSKU,
+  SPR_YSKU,
+  SPR_STIM,
+  SPR_MEDI,
+  SPR_SOUL,
+  SPR_PINV,
+  SPR_PSTR,
+  SPR_PINS,
+  SPR_MEGA,
+  SPR_SUIT,
+  SPR_PMAP,
+  SPR_PVIS,
+  SPR_CLIP,
+  SPR_AMMO,
+  SPR_ROCK,
+  SPR_BROK,
+  SPR_CELL,
+  SPR_CELP,
+  SPR_SHEL,
+  SPR_SBOX,
+  SPR_BPAK,
+  SPR_BFUG,
+  SPR_MGUN,
+  SPR_CSAW,
+  SPR_LAUN,
+  SPR_PLAS,
+  SPR_SHOT,
+  SPR_SGN2,
+  SPR_COLU,
+  SPR_SMT2,
+  SPR_GOR1,
+  SPR_POL2,
+  SPR_POL5,
+  SPR_POL4,
+  SPR_POL3,
+  SPR_POL1,
+  SPR_POL6,
+  SPR_GOR2,
+  SPR_GOR3,
+  SPR_GOR4,
+  SPR_GOR5,
+  SPR_SMIT,
+  SPR_COL1,
+  SPR_COL2,
+  SPR_COL3,
+  SPR_COL4,
+  SPR_CAND,
+  SPR_CBRA,
+  SPR_COL6,
+  SPR_TRE1,
+  SPR_TRE2,
+  SPR_ELEC,
+  SPR_CEYE,
+  SPR_FSKU,
+  SPR_COL5,
+  SPR_TBLU,
+  SPR_TGRN,
+  SPR_TRED,
+  SPR_SMBT,
+  SPR_SMGT,
+  SPR_SMRT,
+  SPR_HDB1,
+  SPR_HDB2,
+  SPR_HDB3,
+  SPR_HDB4,
+  SPR_HDB5,
+  SPR_HDB6,
+  SPR_POB1,
+  SPR_POB2,
+  SPR_BRS1,
+  SPR_TLMP,
+  SPR_TLP2,
+  NUMSPRITES
 } spritenum_t;
 
 typedef enum
 {
-    S_NULL,
-    S_LIGHTDONE,
-    S_PUNCH,
-    S_PUNCHDOWN,
-    S_PUNCHUP,
-    S_PUNCH1,
-    S_PUNCH2,
-    S_PUNCH3,
-    S_PUNCH4,
-    S_PUNCH5,
-    S_PISTOL,
-    S_PISTOLDOWN,
-    S_PISTOLUP,
-    S_PISTOL1,
-    S_PISTOL2,
-    S_PISTOL3,
-    S_PISTOL4,
-    S_PISTOLFLASH,
-    S_SGUN,
-    S_SGUNDOWN,
-    S_SGUNUP,
-    S_SGUN1,
-    S_SGUN2,
-    S_SGUN3,
-    S_SGUN4,
-    S_SGUN5,
-    S_SGUN6,
-    S_SGUN7,
-    S_SGUN8,
-    S_SGUN9,
-    S_SGUNFLASH1,
-    S_SGUNFLASH2,
-    S_DSGUN,
-    S_DSGUNDOWN,
-    S_DSGUNUP,
-    S_DSGUN1,
-    S_DSGUN2,
-    S_DSGUN3,
-    S_DSGUN4,
-    S_DSGUN5,
-    S_DSGUN6,
-    S_DSGUN7,
-    S_DSGUN8,
-    S_DSGUN9,
-    S_DSGUN10,
-    S_DSNR1,
-    S_DSNR2,
-    S_DSGUNFLASH1,
-    S_DSGUNFLASH2,
-    S_CHAIN,
-    S_CHAINDOWN,
-    S_CHAINUP,
-    S_CHAIN1,
-    S_CHAIN2,
-    S_CHAIN3,
-    S_CHAINFLASH1,
-    S_CHAINFLASH2,
-    S_MISSILE,
-    S_MISSILEDOWN,
-    S_MISSILEUP,
-    S_MISSILE1,
-    S_MISSILE2,
-    S_MISSILE3,
-    S_MISSILEFLASH1,
-    S_MISSILEFLASH2,
-    S_MISSILEFLASH3,
-    S_MISSILEFLASH4,
-    S_SAW,
-    S_SAWB,
-    S_SAWDOWN,
-    S_SAWUP,
-    S_SAW1,
-    S_SAW2,
-    S_SAW3,
-    S_PLASMA,
-    S_PLASMADOWN,
-    S_PLASMAUP,
-    S_PLASMA1,
-    S_PLASMA2,
-    S_PLASMAFLASH1,
-    S_PLASMAFLASH2,
-    S_BFG,
-    S_BFGDOWN,
-    S_BFGUP,
-    S_BFG1,
-    S_BFG2,
-    S_BFG3,
-    S_BFG4,
-    S_BFGFLASH1,
-    S_BFGFLASH2,
-    S_BLOOD1,
-    S_BLOOD2,
-    S_BLOOD3,
-    S_PUFF1,
-    S_PUFF2,
-    S_PUFF3,
-    S_PUFF4,
-    S_TBALL1,
-    S_TBALL2,
-    S_TBALLX1,
-    S_TBALLX2,
-    S_TBALLX3,
-    S_RBALL1,
-    S_RBALL2,
-    S_RBALLX1,
-    S_RBALLX2,
-    S_RBALLX3,
-    S_PLASBALL,
-    S_PLASBALL2,
-    S_PLASEXP,
-    S_PLASEXP2,
-    S_PLASEXP3,
-    S_PLASEXP4,
-    S_PLASEXP5,
-    S_ROCKET,
-    S_BFGSHOT,
-    S_BFGSHOT2,
-    S_BFGLAND,
-    S_BFGLAND2,
-    S_BFGLAND3,
-    S_BFGLAND4,
-    S_BFGLAND5,
-    S_BFGLAND6,
-    S_BFGEXP,
-    S_BFGEXP2,
-    S_BFGEXP3,
-    S_BFGEXP4,
-    S_EXPLODE1,
-    S_EXPLODE2,
-    S_EXPLODE3,
-    S_TFOG,
-    S_TFOG01,
-    S_TFOG02,
-    S_TFOG2,
-    S_TFOG3,
-    S_TFOG4,
-    S_TFOG5,
-    S_TFOG6,
-    S_TFOG7,
-    S_TFOG8,
-    S_TFOG9,
-    S_TFOG10,
-    S_IFOG,
-    S_IFOG01,
-    S_IFOG02,
-    S_IFOG2,
-    S_IFOG3,
-    S_IFOG4,
-    S_IFOG5,
-    S_PLAY,
-    S_PLAY_RUN1,
-    S_PLAY_RUN2,
-    S_PLAY_RUN3,
-    S_PLAY_RUN4,
-    S_PLAY_ATK1,
-    S_PLAY_ATK2,
-    S_PLAY_PAIN,
-    S_PLAY_PAIN2,
-    S_PLAY_DIE1,
-    S_PLAY_DIE2,
-    S_PLAY_DIE3,
-    S_PLAY_DIE4,
-    S_PLAY_DIE5,
-    S_PLAY_DIE6,
-    S_PLAY_DIE7,
-    S_PLAY_XDIE1,
-    S_PLAY_XDIE2,
-    S_PLAY_XDIE3,
-    S_PLAY_XDIE4,
-    S_PLAY_XDIE5,
-    S_PLAY_XDIE6,
-    S_PLAY_XDIE7,
-    S_PLAY_XDIE8,
-    S_PLAY_XDIE9,
-    S_POSS_STND,
-    S_POSS_STND2,
-    S_POSS_RUN1,
-    S_POSS_RUN2,
-    S_POSS_RUN3,
-    S_POSS_RUN4,
-    S_POSS_RUN5,
-    S_POSS_RUN6,
-    S_POSS_RUN7,
-    S_POSS_RUN8,
-    S_POSS_ATK1,
-    S_POSS_ATK2,
-    S_POSS_ATK3,
-    S_POSS_PAIN,
-    S_POSS_PAIN2,
-    S_POSS_DIE1,
-    S_POSS_DIE2,
-    S_POSS_DIE3,
-    S_POSS_DIE4,
-    S_POSS_DIE5,
-    S_POSS_XDIE1,
-    S_POSS_XDIE2,
-    S_POSS_XDIE3,
-    S_POSS_XDIE4,
-    S_POSS_XDIE5,
-    S_POSS_XDIE6,
-    S_POSS_XDIE7,
-    S_POSS_XDIE8,
-    S_POSS_XDIE9,
-    S_POSS_RAISE1,
-    S_POSS_RAISE2,
-    S_POSS_RAISE3,
-    S_POSS_RAISE4,
-    S_SPOS_STND,
-    S_SPOS_STND2,
-    S_SPOS_RUN1,
-    S_SPOS_RUN2,
-    S_SPOS_RUN3,
-    S_SPOS_RUN4,
-    S_SPOS_RUN5,
-    S_SPOS_RUN6,
-    S_SPOS_RUN7,
-    S_SPOS_RUN8,
-    S_SPOS_ATK1,
-    S_SPOS_ATK2,
-    S_SPOS_ATK3,
-    S_SPOS_PAIN,
-    S_SPOS_PAIN2,
-    S_SPOS_DIE1,
-    S_SPOS_DIE2,
-    S_SPOS_DIE3,
-    S_SPOS_DIE4,
-    S_SPOS_DIE5,
-    S_SPOS_XDIE1,
-    S_SPOS_XDIE2,
-    S_SPOS_XDIE3,
-    S_SPOS_XDIE4,
-    S_SPOS_XDIE5,
-    S_SPOS_XDIE6,
-    S_SPOS_XDIE7,
-    S_SPOS_XDIE8,
-    S_SPOS_XDIE9,
-    S_SPOS_RAISE1,
-    S_SPOS_RAISE2,
-    S_SPOS_RAISE3,
-    S_SPOS_RAISE4,
-    S_SPOS_RAISE5,
-    S_VILE_STND,
-    S_VILE_STND2,
-    S_VILE_RUN1,
-    S_VILE_RUN2,
-    S_VILE_RUN3,
-    S_VILE_RUN4,
-    S_VILE_RUN5,
-    S_VILE_RUN6,
-    S_VILE_RUN7,
-    S_VILE_RUN8,
-    S_VILE_RUN9,
-    S_VILE_RUN10,
-    S_VILE_RUN11,
-    S_VILE_RUN12,
-    S_VILE_ATK1,
-    S_VILE_ATK2,
-    S_VILE_ATK3,
-    S_VILE_ATK4,
-    S_VILE_ATK5,
-    S_VILE_ATK6,
-    S_VILE_ATK7,
-    S_VILE_ATK8,
-    S_VILE_ATK9,
-    S_VILE_ATK10,
-    S_VILE_ATK11,
-    S_VILE_HEAL1,
-    S_VILE_HEAL2,
-    S_VILE_HEAL3,
-    S_VILE_PAIN,
-    S_VILE_PAIN2,
-    S_VILE_DIE1,
-    S_VILE_DIE2,
-    S_VILE_DIE3,
-    S_VILE_DIE4,
-    S_VILE_DIE5,
-    S_VILE_DIE6,
-    S_VILE_DIE7,
-    S_VILE_DIE8,
-    S_VILE_DIE9,
-    S_VILE_DIE10,
-    S_FIRE1,
-    S_FIRE2,
-    S_FIRE3,
-    S_FIRE4,
-    S_FIRE5,
-    S_FIRE6,
-    S_FIRE7,
-    S_FIRE8,
-    S_FIRE9,
-    S_FIRE10,
-    S_FIRE11,
-    S_FIRE12,
-    S_FIRE13,
-    S_FIRE14,
-    S_FIRE15,
-    S_FIRE16,
-    S_FIRE17,
-    S_FIRE18,
-    S_FIRE19,
-    S_FIRE20,
-    S_FIRE21,
-    S_FIRE22,
-    S_FIRE23,
-    S_FIRE24,
-    S_FIRE25,
-    S_FIRE26,
-    S_FIRE27,
-    S_FIRE28,
-    S_FIRE29,
-    S_FIRE30,
-    S_SMOKE1,
-    S_SMOKE2,
-    S_SMOKE3,
-    S_SMOKE4,
-    S_SMOKE5,
-    S_TRACER,
-    S_TRACER2,
-    S_TRACEEXP1,
-    S_TRACEEXP2,
-    S_TRACEEXP3,
-    S_SKEL_STND,
-    S_SKEL_STND2,
-    S_SKEL_RUN1,
-    S_SKEL_RUN2,
-    S_SKEL_RUN3,
-    S_SKEL_RUN4,
-    S_SKEL_RUN5,
-    S_SKEL_RUN6,
-    S_SKEL_RUN7,
-    S_SKEL_RUN8,
-    S_SKEL_RUN9,
-    S_SKEL_RUN10,
-    S_SKEL_RUN11,
-    S_SKEL_RUN12,
-    S_SKEL_FIST1,
-    S_SKEL_FIST2,
-    S_SKEL_FIST3,
-    S_SKEL_FIST4,
-    S_SKEL_MISS1,
-    S_SKEL_MISS2,
-    S_SKEL_MISS3,
-    S_SKEL_MISS4,
-    S_SKEL_PAIN,
-    S_SKEL_PAIN2,
-    S_SKEL_DIE1,
-    S_SKEL_DIE2,
-    S_SKEL_DIE3,
-    S_SKEL_DIE4,
-    S_SKEL_DIE5,
-    S_SKEL_DIE6,
-    S_SKEL_RAISE1,
-    S_SKEL_RAISE2,
-    S_SKEL_RAISE3,
-    S_SKEL_RAISE4,
-    S_SKEL_RAISE5,
-    S_SKEL_RAISE6,
-    S_FATSHOT1,
-    S_FATSHOT2,
-    S_FATSHOTX1,
-    S_FATSHOTX2,
-    S_FATSHOTX3,
-    S_FATT_STND,
-    S_FATT_STND2,
-    S_FATT_RUN1,
-    S_FATT_RUN2,
-    S_FATT_RUN3,
-    S_FATT_RUN4,
-    S_FATT_RUN5,
-    S_FATT_RUN6,
-    S_FATT_RUN7,
-    S_FATT_RUN8,
-    S_FATT_RUN9,
-    S_FATT_RUN10,
-    S_FATT_RUN11,
-    S_FATT_RUN12,
-    S_FATT_ATK1,
-    S_FATT_ATK2,
-    S_FATT_ATK3,
-    S_FATT_ATK4,
-    S_FATT_ATK5,
-    S_FATT_ATK6,
-    S_FATT_ATK7,
-    S_FATT_ATK8,
-    S_FATT_ATK9,
-    S_FATT_ATK10,
-    S_FATT_PAIN,
-    S_FATT_PAIN2,
-    S_FATT_DIE1,
-    S_FATT_DIE2,
-    S_FATT_DIE3,
-    S_FATT_DIE4,
-    S_FATT_DIE5,
-    S_FATT_DIE6,
-    S_FATT_DIE7,
-    S_FATT_DIE8,
-    S_FATT_DIE9,
-    S_FATT_DIE10,
-    S_FATT_RAISE1,
-    S_FATT_RAISE2,
-    S_FATT_RAISE3,
-    S_FATT_RAISE4,
-    S_FATT_RAISE5,
-    S_FATT_RAISE6,
-    S_FATT_RAISE7,
-    S_FATT_RAISE8,
-    S_CPOS_STND,
-    S_CPOS_STND2,
-    S_CPOS_RUN1,
-    S_CPOS_RUN2,
-    S_CPOS_RUN3,
-    S_CPOS_RUN4,
-    S_CPOS_RUN5,
-    S_CPOS_RUN6,
-    S_CPOS_RUN7,
-    S_CPOS_RUN8,
-    S_CPOS_ATK1,
-    S_CPOS_ATK2,
-    S_CPOS_ATK3,
-    S_CPOS_ATK4,
-    S_CPOS_PAIN,
-    S_CPOS_PAIN2,
-    S_CPOS_DIE1,
-    S_CPOS_DIE2,
-    S_CPOS_DIE3,
-    S_CPOS_DIE4,
-    S_CPOS_DIE5,
-    S_CPOS_DIE6,
-    S_CPOS_DIE7,
-    S_CPOS_XDIE1,
-    S_CPOS_XDIE2,
-    S_CPOS_XDIE3,
-    S_CPOS_XDIE4,
-    S_CPOS_XDIE5,
-    S_CPOS_XDIE6,
-    S_CPOS_RAISE1,
-    S_CPOS_RAISE2,
-    S_CPOS_RAISE3,
-    S_CPOS_RAISE4,
-    S_CPOS_RAISE5,
-    S_CPOS_RAISE6,
-    S_CPOS_RAISE7,
-    S_TROO_STND,
-    S_TROO_STND2,
-    S_TROO_RUN1,
-    S_TROO_RUN2,
-    S_TROO_RUN3,
-    S_TROO_RUN4,
-    S_TROO_RUN5,
-    S_TROO_RUN6,
-    S_TROO_RUN7,
-    S_TROO_RUN8,
-    S_TROO_ATK1,
-    S_TROO_ATK2,
-    S_TROO_ATK3,
-    S_TROO_PAIN,
-    S_TROO_PAIN2,
-    S_TROO_DIE1,
-    S_TROO_DIE2,
-    S_TROO_DIE3,
-    S_TROO_DIE4,
-    S_TROO_DIE5,
-    S_TROO_XDIE1,
-    S_TROO_XDIE2,
-    S_TROO_XDIE3,
-    S_TROO_XDIE4,
-    S_TROO_XDIE5,
-    S_TROO_XDIE6,
-    S_TROO_XDIE7,
-    S_TROO_XDIE8,
-    S_TROO_RAISE1,
-    S_TROO_RAISE2,
-    S_TROO_RAISE3,
-    S_TROO_RAISE4,
-    S_TROO_RAISE5,
-    S_SARG_STND,
-    S_SARG_STND2,
-    S_SARG_RUN1,
-    S_SARG_RUN2,
-    S_SARG_RUN3,
-    S_SARG_RUN4,
-    S_SARG_RUN5,
-    S_SARG_RUN6,
-    S_SARG_RUN7,
-    S_SARG_RUN8,
-    S_SARG_ATK1,
-    S_SARG_ATK2,
-    S_SARG_ATK3,
-    S_SARG_PAIN,
-    S_SARG_PAIN2,
-    S_SARG_DIE1,
-    S_SARG_DIE2,
-    S_SARG_DIE3,
-    S_SARG_DIE4,
-    S_SARG_DIE5,
-    S_SARG_DIE6,
-    S_SARG_RAISE1,
-    S_SARG_RAISE2,
-    S_SARG_RAISE3,
-    S_SARG_RAISE4,
-    S_SARG_RAISE5,
-    S_SARG_RAISE6,
-    S_HEAD_STND,
-    S_HEAD_RUN1,
-    S_HEAD_ATK1,
-    S_HEAD_ATK2,
-    S_HEAD_ATK3,
-    S_HEAD_PAIN,
-    S_HEAD_PAIN2,
-    S_HEAD_PAIN3,
-    S_HEAD_DIE1,
-    S_HEAD_DIE2,
-    S_HEAD_DIE3,
-    S_HEAD_DIE4,
-    S_HEAD_DIE5,
-    S_HEAD_DIE6,
-    S_HEAD_RAISE1,
-    S_HEAD_RAISE2,
-    S_HEAD_RAISE3,
-    S_HEAD_RAISE4,
-    S_HEAD_RAISE5,
-    S_HEAD_RAISE6,
-    S_BRBALL1,
-    S_BRBALL2,
-    S_BRBALLX1,
-    S_BRBALLX2,
-    S_BRBALLX3,
-    S_BOSS_STND,
-    S_BOSS_STND2,
-    S_BOSS_RUN1,
-    S_BOSS_RUN2,
-    S_BOSS_RUN3,
-    S_BOSS_RUN4,
-    S_BOSS_RUN5,
-    S_BOSS_RUN6,
-    S_BOSS_RUN7,
-    S_BOSS_RUN8,
-    S_BOSS_ATK1,
-    S_BOSS_ATK2,
-    S_BOSS_ATK3,
-    S_BOSS_PAIN,
-    S_BOSS_PAIN2,
-    S_BOSS_DIE1,
-    S_BOSS_DIE2,
-    S_BOSS_DIE3,
-    S_BOSS_DIE4,
-    S_BOSS_DIE5,
-    S_BOSS_DIE6,
-    S_BOSS_DIE7,
-    S_BOSS_RAISE1,
-    S_BOSS_RAISE2,
-    S_BOSS_RAISE3,
-    S_BOSS_RAISE4,
-    S_BOSS_RAISE5,
-    S_BOSS_RAISE6,
-    S_BOSS_RAISE7,
-    S_BOS2_STND,
-    S_BOS2_STND2,
-    S_BOS2_RUN1,
-    S_BOS2_RUN2,
-    S_BOS2_RUN3,
-    S_BOS2_RUN4,
-    S_BOS2_RUN5,
-    S_BOS2_RUN6,
-    S_BOS2_RUN7,
-    S_BOS2_RUN8,
-    S_BOS2_ATK1,
-    S_BOS2_ATK2,
-    S_BOS2_ATK3,
-    S_BOS2_PAIN,
-    S_BOS2_PAIN2,
-    S_BOS2_DIE1,
-    S_BOS2_DIE2,
-    S_BOS2_DIE3,
-    S_BOS2_DIE4,
-    S_BOS2_DIE5,
-    S_BOS2_DIE6,
-    S_BOS2_DIE7,
-    S_BOS2_RAISE1,
-    S_BOS2_RAISE2,
-    S_BOS2_RAISE3,
-    S_BOS2_RAISE4,
-    S_BOS2_RAISE5,
-    S_BOS2_RAISE6,
-    S_BOS2_RAISE7,
-    S_SKULL_STND,
-    S_SKULL_STND2,
-    S_SKULL_RUN1,
-    S_SKULL_RUN2,
-    S_SKULL_ATK1,
-    S_SKULL_ATK2,
-    S_SKULL_ATK3,
-    S_SKULL_ATK4,
-    S_SKULL_PAIN,
-    S_SKULL_PAIN2,
-    S_SKULL_DIE1,
-    S_SKULL_DIE2,
-    S_SKULL_DIE3,
-    S_SKULL_DIE4,
-    S_SKULL_DIE5,
-    S_SKULL_DIE6,
-    S_SPID_STND,
-    S_SPID_STND2,
-    S_SPID_RUN1,
-    S_SPID_RUN2,
-    S_SPID_RUN3,
-    S_SPID_RUN4,
-    S_SPID_RUN5,
-    S_SPID_RUN6,
-    S_SPID_RUN7,
-    S_SPID_RUN8,
-    S_SPID_RUN9,
-    S_SPID_RUN10,
-    S_SPID_RUN11,
-    S_SPID_RUN12,
-    S_SPID_ATK1,
-    S_SPID_ATK2,
-    S_SPID_ATK3,
-    S_SPID_ATK4,
-    S_SPID_PAIN,
-    S_SPID_PAIN2,
-    S_SPID_DIE1,
-    S_SPID_DIE2,
-    S_SPID_DIE3,
-    S_SPID_DIE4,
-    S_SPID_DIE5,
-    S_SPID_DIE6,
-    S_SPID_DIE7,
-    S_SPID_DIE8,
-    S_SPID_DIE9,
-    S_SPID_DIE10,
-    S_SPID_DIE11,
-    S_BSPI_STND,
-    S_BSPI_STND2,
-    S_BSPI_SIGHT,
-    S_BSPI_RUN1,
-    S_BSPI_RUN2,
-    S_BSPI_RUN3,
-    S_BSPI_RUN4,
-    S_BSPI_RUN5,
-    S_BSPI_RUN6,
-    S_BSPI_RUN7,
-    S_BSPI_RUN8,
-    S_BSPI_RUN9,
-    S_BSPI_RUN10,
-    S_BSPI_RUN11,
-    S_BSPI_RUN12,
-    S_BSPI_ATK1,
-    S_BSPI_ATK2,
-    S_BSPI_ATK3,
-    S_BSPI_ATK4,
-    S_BSPI_PAIN,
-    S_BSPI_PAIN2,
-    S_BSPI_DIE1,
-    S_BSPI_DIE2,
-    S_BSPI_DIE3,
-    S_BSPI_DIE4,
-    S_BSPI_DIE5,
-    S_BSPI_DIE6,
-    S_BSPI_DIE7,
-    S_BSPI_RAISE1,
-    S_BSPI_RAISE2,
-    S_BSPI_RAISE3,
-    S_BSPI_RAISE4,
-    S_BSPI_RAISE5,
-    S_BSPI_RAISE6,
-    S_BSPI_RAISE7,
-    S_ARACH_PLAZ,
-    S_ARACH_PLAZ2,
-    S_ARACH_PLEX,
-    S_ARACH_PLEX2,
-    S_ARACH_PLEX3,
-    S_ARACH_PLEX4,
-    S_ARACH_PLEX5,
-    S_CYBER_STND,
-    S_CYBER_STND2,
-    S_CYBER_RUN1,
-    S_CYBER_RUN2,
-    S_CYBER_RUN3,
-    S_CYBER_RUN4,
-    S_CYBER_RUN5,
-    S_CYBER_RUN6,
-    S_CYBER_RUN7,
-    S_CYBER_RUN8,
-    S_CYBER_ATK1,
-    S_CYBER_ATK2,
-    S_CYBER_ATK3,
-    S_CYBER_ATK4,
-    S_CYBER_ATK5,
-    S_CYBER_ATK6,
-    S_CYBER_PAIN,
-    S_CYBER_DIE1,
-    S_CYBER_DIE2,
-    S_CYBER_DIE3,
-    S_CYBER_DIE4,
-    S_CYBER_DIE5,
-    S_CYBER_DIE6,
-    S_CYBER_DIE7,
-    S_CYBER_DIE8,
-    S_CYBER_DIE9,
-    S_CYBER_DIE10,
-    S_PAIN_STND,
-    S_PAIN_RUN1,
-    S_PAIN_RUN2,
-    S_PAIN_RUN3,
-    S_PAIN_RUN4,
-    S_PAIN_RUN5,
-    S_PAIN_RUN6,
-    S_PAIN_ATK1,
-    S_PAIN_ATK2,
-    S_PAIN_ATK3,
-    S_PAIN_ATK4,
-    S_PAIN_PAIN,
-    S_PAIN_PAIN2,
-    S_PAIN_DIE1,
-    S_PAIN_DIE2,
-    S_PAIN_DIE3,
-    S_PAIN_DIE4,
-    S_PAIN_DIE5,
-    S_PAIN_DIE6,
-    S_PAIN_RAISE1,
-    S_PAIN_RAISE2,
-    S_PAIN_RAISE3,
-    S_PAIN_RAISE4,
-    S_PAIN_RAISE5,
-    S_PAIN_RAISE6,
-    S_SSWV_STND,
-    S_SSWV_STND2,
-    S_SSWV_RUN1,
-    S_SSWV_RUN2,
-    S_SSWV_RUN3,
-    S_SSWV_RUN4,
-    S_SSWV_RUN5,
-    S_SSWV_RUN6,
-    S_SSWV_RUN7,
-    S_SSWV_RUN8,
-    S_SSWV_ATK1,
-    S_SSWV_ATK2,
-    S_SSWV_ATK3,
-    S_SSWV_ATK4,
-    S_SSWV_ATK5,
-    S_SSWV_ATK6,
-    S_SSWV_PAIN,
-    S_SSWV_PAIN2,
-    S_SSWV_DIE1,
-    S_SSWV_DIE2,
-    S_SSWV_DIE3,
-    S_SSWV_DIE4,
-    S_SSWV_DIE5,
-    S_SSWV_XDIE1,
-    S_SSWV_XDIE2,
-    S_SSWV_XDIE3,
-    S_SSWV_XDIE4,
-    S_SSWV_XDIE5,
-    S_SSWV_XDIE6,
-    S_SSWV_XDIE7,
-    S_SSWV_XDIE8,
-    S_SSWV_XDIE9,
-    S_SSWV_RAISE1,
-    S_SSWV_RAISE2,
-    S_SSWV_RAISE3,
-    S_SSWV_RAISE4,
-    S_SSWV_RAISE5,
-    S_KEENSTND,
-    S_COMMKEEN,
-    S_COMMKEEN2,
-    S_COMMKEEN3,
-    S_COMMKEEN4,
-    S_COMMKEEN5,
-    S_COMMKEEN6,
-    S_COMMKEEN7,
-    S_COMMKEEN8,
-    S_COMMKEEN9,
-    S_COMMKEEN10,
-    S_COMMKEEN11,
-    S_COMMKEEN12,
-    S_KEENPAIN,
-    S_KEENPAIN2,
-    S_BRAIN,
-    S_BRAIN_PAIN,
-    S_BRAIN_DIE1,
-    S_BRAIN_DIE2,
-    S_BRAIN_DIE3,
-    S_BRAIN_DIE4,
-    S_BRAINEYE,
-    S_BRAINEYESEE,
-    S_BRAINEYE1,
-    S_SPAWN1,
-    S_SPAWN2,
-    S_SPAWN3,
-    S_SPAWN4,
-    S_SPAWNFIRE1,
-    S_SPAWNFIRE2,
-    S_SPAWNFIRE3,
-    S_SPAWNFIRE4,
-    S_SPAWNFIRE5,
-    S_SPAWNFIRE6,
-    S_SPAWNFIRE7,
-    S_SPAWNFIRE8,
-    S_BRAINEXPLODE1,
-    S_BRAINEXPLODE2,
-    S_BRAINEXPLODE3,
-    S_ARM1,
-    S_ARM1A,
-    S_ARM2,
-    S_ARM2A,
-    S_BAR1,
-    S_BAR2,
-    S_BEXP,
-    S_BEXP2,
-    S_BEXP3,
-    S_BEXP4,
-    S_BEXP5,
-    S_BBAR1,
-    S_BBAR2,
-    S_BBAR3,
-    S_BON1,
-    S_BON1A,
-    S_BON1B,
-    S_BON1C,
-    S_BON1D,
-    S_BON1E,
-    S_BON2,
-    S_BON2A,
-    S_BON2B,
-    S_BON2C,
-    S_BON2D,
-    S_BON2E,
-    S_BKEY,
-    S_BKEY2,
-    S_RKEY,
-    S_RKEY2,
-    S_YKEY,
-    S_YKEY2,
-    S_BSKULL,
-    S_BSKULL2,
-    S_RSKULL,
-    S_RSKULL2,
-    S_YSKULL,
-    S_YSKULL2,
-    S_STIM,
-    S_MEDI,
-    S_SOUL,
-    S_SOUL2,
-    S_SOUL3,
-    S_SOUL4,
-    S_SOUL5,
-    S_SOUL6,
-    S_PINV,
-    S_PINV2,
-    S_PINV3,
-    S_PINV4,
-    S_PSTR,
-    S_PINS,
-    S_PINS2,
-    S_PINS3,
-    S_PINS4,
-    S_MEGA,
-    S_MEGA2,
-    S_MEGA3,
-    S_MEGA4,
-    S_SUIT,
-    S_PMAP,
-    S_PMAP2,
-    S_PMAP3,
-    S_PMAP4,
-    S_PMAP5,
-    S_PMAP6,
-    S_PVIS,
-    S_PVIS2,
-    S_CLIP,
-    S_AMMO,
-    S_ROCK,
-    S_BROK,
-    S_CELL,
-    S_CELP,
-    S_SHEL,
-    S_SBOX,
-    S_BPAK,
-    S_BFUG,
-    S_MGUN,
-    S_CSAW,
-    S_LAUN,
-    S_PLAS,
-    S_SHOT,
-    S_SHOT2,
-    S_COLU,
-    S_STALAG,
-    S_BLOODYTWITCH,
-    S_BLOODYTWITCH2,
-    S_BLOODYTWITCH3,
-    S_BLOODYTWITCH4,
-    S_DEADTORSO,
-    S_DEADBOTTOM,
-    S_HEADSONSTICK,
-    S_GIBS,
-    S_HEADONASTICK,
-    S_HEADCANDLES,
-    S_HEADCANDLES2,
-    S_DEADSTICK,
-    S_LIVESTICK,
-    S_LIVESTICK2,
-    S_MEAT2,
-    S_MEAT3,
-    S_MEAT4,
-    S_MEAT5,
-    S_STALAGTITE,
-    S_TALLGRNCOL,
-    S_SHRTGRNCOL,
-    S_TALLREDCOL,
-    S_SHRTREDCOL,
-    S_CANDLESTIK,
-    S_CANDELABRA,
-    S_SKULLCOL,
-    S_TORCHTREE,
-    S_BIGTREE,
-    S_TECHPILLAR,
-    S_EVILEYE,
-    S_EVILEYE2,
-    S_EVILEYE3,
-    S_EVILEYE4,
-    S_FLOATSKULL,
-    S_FLOATSKULL2,
-    S_FLOATSKULL3,
-    S_HEARTCOL,
-    S_HEARTCOL2,
-    S_BLUETORCH,
-    S_BLUETORCH2,
-    S_BLUETORCH3,
-    S_BLUETORCH4,
-    S_GREENTORCH,
-    S_GREENTORCH2,
-    S_GREENTORCH3,
-    S_GREENTORCH4,
-    S_REDTORCH,
-    S_REDTORCH2,
-    S_REDTORCH3,
-    S_REDTORCH4,
-    S_BTORCHSHRT,
-    S_BTORCHSHRT2,
-    S_BTORCHSHRT3,
-    S_BTORCHSHRT4,
-    S_GTORCHSHRT,
-    S_GTORCHSHRT2,
-    S_GTORCHSHRT3,
-    S_GTORCHSHRT4,
-    S_RTORCHSHRT,
-    S_RTORCHSHRT2,
-    S_RTORCHSHRT3,
-    S_RTORCHSHRT4,
-    S_HANGNOGUTS,
-    S_HANGBNOBRAIN,
-    S_HANGTLOOKDN,
-    S_HANGTSKULL,
-    S_HANGTLOOKUP,
-    S_HANGTNOBRAIN,
-    S_COLONGIBS,
-    S_SMALLPOOL,
-    S_BRAINSTEM,
-    S_TECHLAMP,
-    S_TECHLAMP2,
-    S_TECHLAMP3,
-    S_TECHLAMP4,
-    S_TECH2LAMP,
-    S_TECH2LAMP2,
-    S_TECH2LAMP3,
-    S_TECH2LAMP4,
-    NUMSTATES
+  S_NULL,
+  S_LIGHTDONE,
+  S_PUNCH,
+  S_PUNCHDOWN,
+  S_PUNCHUP,
+  S_PUNCH1,
+  S_PUNCH2,
+  S_PUNCH3,
+  S_PUNCH4,
+  S_PUNCH5,
+  S_PISTOL,
+  S_PISTOLDOWN,
+  S_PISTOLUP,
+  S_PISTOL1,
+  S_PISTOL2,
+  S_PISTOL3,
+  S_PISTOL4,
+  S_PISTOLFLASH,
+  S_SGUN,
+  S_SGUNDOWN,
+  S_SGUNUP,
+  S_SGUN1,
+  S_SGUN2,
+  S_SGUN3,
+  S_SGUN4,
+  S_SGUN5,
+  S_SGUN6,
+  S_SGUN7,
+  S_SGUN8,
+  S_SGUN9,
+  S_SGUNFLASH1,
+  S_SGUNFLASH2,
+  S_DSGUN,
+  S_DSGUNDOWN,
+  S_DSGUNUP,
+  S_DSGUN1,
+  S_DSGUN2,
+  S_DSGUN3,
+  S_DSGUN4,
+  S_DSGUN5,
+  S_DSGUN6,
+  S_DSGUN7,
+  S_DSGUN8,
+  S_DSGUN9,
+  S_DSGUN10,
+  S_DSNR1,
+  S_DSNR2,
+  S_DSGUNFLASH1,
+  S_DSGUNFLASH2,
+  S_CHAIN,
+  S_CHAINDOWN,
+  S_CHAINUP,
+  S_CHAIN1,
+  S_CHAIN2,
+  S_CHAIN3,
+  S_CHAINFLASH1,
+  S_CHAINFLASH2,
+  S_MISSILE,
+  S_MISSILEDOWN,
+  S_MISSILEUP,
+  S_MISSILE1,
+  S_MISSILE2,
+  S_MISSILE3,
+  S_MISSILEFLASH1,
+  S_MISSILEFLASH2,
+  S_MISSILEFLASH3,
+  S_MISSILEFLASH4,
+  S_SAW,
+  S_SAWB,
+  S_SAWDOWN,
+  S_SAWUP,
+  S_SAW1,
+  S_SAW2,
+  S_SAW3,
+  S_PLASMA,
+  S_PLASMADOWN,
+  S_PLASMAUP,
+  S_PLASMA1,
+  S_PLASMA2,
+  S_PLASMAFLASH1,
+  S_PLASMAFLASH2,
+  S_BFG,
+  S_BFGDOWN,
+  S_BFGUP,
+  S_BFG1,
+  S_BFG2,
+  S_BFG3,
+  S_BFG4,
+  S_BFGFLASH1,
+  S_BFGFLASH2,
+  S_BLOOD1,
+  S_BLOOD2,
+  S_BLOOD3,
+  S_PUFF1,
+  S_PUFF2,
+  S_PUFF3,
+  S_PUFF4,
+  S_TBALL1,
+  S_TBALL2,
+  S_TBALLX1,
+  S_TBALLX2,
+  S_TBALLX3,
+  S_RBALL1,
+  S_RBALL2,
+  S_RBALLX1,
+  S_RBALLX2,
+  S_RBALLX3,
+  S_PLASBALL,
+  S_PLASBALL2,
+  S_PLASEXP,
+  S_PLASEXP2,
+  S_PLASEXP3,
+  S_PLASEXP4,
+  S_PLASEXP5,
+  S_ROCKET,
+  S_BFGSHOT,
+  S_BFGSHOT2,
+  S_BFGLAND,
+  S_BFGLAND2,
+  S_BFGLAND3,
+  S_BFGLAND4,
+  S_BFGLAND5,
+  S_BFGLAND6,
+  S_BFGEXP,
+  S_BFGEXP2,
+  S_BFGEXP3,
+  S_BFGEXP4,
+  S_EXPLODE1,
+  S_EXPLODE2,
+  S_EXPLODE3,
+  S_TFOG,
+  S_TFOG01,
+  S_TFOG02,
+  S_TFOG2,
+  S_TFOG3,
+  S_TFOG4,
+  S_TFOG5,
+  S_TFOG6,
+  S_TFOG7,
+  S_TFOG8,
+  S_TFOG9,
+  S_TFOG10,
+  S_IFOG,
+  S_IFOG01,
+  S_IFOG02,
+  S_IFOG2,
+  S_IFOG3,
+  S_IFOG4,
+  S_IFOG5,
+  S_PLAY,
+  S_PLAY_RUN1,
+  S_PLAY_RUN2,
+  S_PLAY_RUN3,
+  S_PLAY_RUN4,
+  S_PLAY_ATK1,
+  S_PLAY_ATK2,
+  S_PLAY_PAIN,
+  S_PLAY_PAIN2,
+  S_PLAY_DIE1,
+  S_PLAY_DIE2,
+  S_PLAY_DIE3,
+  S_PLAY_DIE4,
+  S_PLAY_DIE5,
+  S_PLAY_DIE6,
+  S_PLAY_DIE7,
+  S_PLAY_XDIE1,
+  S_PLAY_XDIE2,
+  S_PLAY_XDIE3,
+  S_PLAY_XDIE4,
+  S_PLAY_XDIE5,
+  S_PLAY_XDIE6,
+  S_PLAY_XDIE7,
+  S_PLAY_XDIE8,
+  S_PLAY_XDIE9,
+  S_POSS_STND,
+  S_POSS_STND2,
+  S_POSS_RUN1,
+  S_POSS_RUN2,
+  S_POSS_RUN3,
+  S_POSS_RUN4,
+  S_POSS_RUN5,
+  S_POSS_RUN6,
+  S_POSS_RUN7,
+  S_POSS_RUN8,
+  S_POSS_ATK1,
+  S_POSS_ATK2,
+  S_POSS_ATK3,
+  S_POSS_PAIN,
+  S_POSS_PAIN2,
+  S_POSS_DIE1,
+  S_POSS_DIE2,
+  S_POSS_DIE3,
+  S_POSS_DIE4,
+  S_POSS_DIE5,
+  S_POSS_XDIE1,
+  S_POSS_XDIE2,
+  S_POSS_XDIE3,
+  S_POSS_XDIE4,
+  S_POSS_XDIE5,
+  S_POSS_XDIE6,
+  S_POSS_XDIE7,
+  S_POSS_XDIE8,
+  S_POSS_XDIE9,
+  S_POSS_RAISE1,
+  S_POSS_RAISE2,
+  S_POSS_RAISE3,
+  S_POSS_RAISE4,
+  S_SPOS_STND,
+  S_SPOS_STND2,
+  S_SPOS_RUN1,
+  S_SPOS_RUN2,
+  S_SPOS_RUN3,
+  S_SPOS_RUN4,
+  S_SPOS_RUN5,
+  S_SPOS_RUN6,
+  S_SPOS_RUN7,
+  S_SPOS_RUN8,
+  S_SPOS_ATK1,
+  S_SPOS_ATK2,
+  S_SPOS_ATK3,
+  S_SPOS_PAIN,
+  S_SPOS_PAIN2,
+  S_SPOS_DIE1,
+  S_SPOS_DIE2,
+  S_SPOS_DIE3,
+  S_SPOS_DIE4,
+  S_SPOS_DIE5,
+  S_SPOS_XDIE1,
+  S_SPOS_XDIE2,
+  S_SPOS_XDIE3,
+  S_SPOS_XDIE4,
+  S_SPOS_XDIE5,
+  S_SPOS_XDIE6,
+  S_SPOS_XDIE7,
+  S_SPOS_XDIE8,
+  S_SPOS_XDIE9,
+  S_SPOS_RAISE1,
+  S_SPOS_RAISE2,
+  S_SPOS_RAISE3,
+  S_SPOS_RAISE4,
+  S_SPOS_RAISE5,
+  S_VILE_STND,
+  S_VILE_STND2,
+  S_VILE_RUN1,
+  S_VILE_RUN2,
+  S_VILE_RUN3,
+  S_VILE_RUN4,
+  S_VILE_RUN5,
+  S_VILE_RUN6,
+  S_VILE_RUN7,
+  S_VILE_RUN8,
+  S_VILE_RUN9,
+  S_VILE_RUN10,
+  S_VILE_RUN11,
+  S_VILE_RUN12,
+  S_VILE_ATK1,
+  S_VILE_ATK2,
+  S_VILE_ATK3,
+  S_VILE_ATK4,
+  S_VILE_ATK5,
+  S_VILE_ATK6,
+  S_VILE_ATK7,
+  S_VILE_ATK8,
+  S_VILE_ATK9,
+  S_VILE_ATK10,
+  S_VILE_ATK11,
+  S_VILE_HEAL1,
+  S_VILE_HEAL2,
+  S_VILE_HEAL3,
+  S_VILE_PAIN,
+  S_VILE_PAIN2,
+  S_VILE_DIE1,
+  S_VILE_DIE2,
+  S_VILE_DIE3,
+  S_VILE_DIE4,
+  S_VILE_DIE5,
+  S_VILE_DIE6,
+  S_VILE_DIE7,
+  S_VILE_DIE8,
+  S_VILE_DIE9,
+  S_VILE_DIE10,
+  S_FIRE1,
+  S_FIRE2,
+  S_FIRE3,
+  S_FIRE4,
+  S_FIRE5,
+  S_FIRE6,
+  S_FIRE7,
+  S_FIRE8,
+  S_FIRE9,
+  S_FIRE10,
+  S_FIRE11,
+  S_FIRE12,
+  S_FIRE13,
+  S_FIRE14,
+  S_FIRE15,
+  S_FIRE16,
+  S_FIRE17,
+  S_FIRE18,
+  S_FIRE19,
+  S_FIRE20,
+  S_FIRE21,
+  S_FIRE22,
+  S_FIRE23,
+  S_FIRE24,
+  S_FIRE25,
+  S_FIRE26,
+  S_FIRE27,
+  S_FIRE28,
+  S_FIRE29,
+  S_FIRE30,
+  S_SMOKE1,
+  S_SMOKE2,
+  S_SMOKE3,
+  S_SMOKE4,
+  S_SMOKE5,
+  S_TRACER,
+  S_TRACER2,
+  S_TRACEEXP1,
+  S_TRACEEXP2,
+  S_TRACEEXP3,
+  S_SKEL_STND,
+  S_SKEL_STND2,
+  S_SKEL_RUN1,
+  S_SKEL_RUN2,
+  S_SKEL_RUN3,
+  S_SKEL_RUN4,
+  S_SKEL_RUN5,
+  S_SKEL_RUN6,
+  S_SKEL_RUN7,
+  S_SKEL_RUN8,
+  S_SKEL_RUN9,
+  S_SKEL_RUN10,
+  S_SKEL_RUN11,
+  S_SKEL_RUN12,
+  S_SKEL_FIST1,
+  S_SKEL_FIST2,
+  S_SKEL_FIST3,
+  S_SKEL_FIST4,
+  S_SKEL_MISS1,
+  S_SKEL_MISS2,
+  S_SKEL_MISS3,
+  S_SKEL_MISS4,
+  S_SKEL_PAIN,
+  S_SKEL_PAIN2,
+  S_SKEL_DIE1,
+  S_SKEL_DIE2,
+  S_SKEL_DIE3,
+  S_SKEL_DIE4,
+  S_SKEL_DIE5,
+  S_SKEL_DIE6,
+  S_SKEL_RAISE1,
+  S_SKEL_RAISE2,
+  S_SKEL_RAISE3,
+  S_SKEL_RAISE4,
+  S_SKEL_RAISE5,
+  S_SKEL_RAISE6,
+  S_FATSHOT1,
+  S_FATSHOT2,
+  S_FATSHOTX1,
+  S_FATSHOTX2,
+  S_FATSHOTX3,
+  S_FATT_STND,
+  S_FATT_STND2,
+  S_FATT_RUN1,
+  S_FATT_RUN2,
+  S_FATT_RUN3,
+  S_FATT_RUN4,
+  S_FATT_RUN5,
+  S_FATT_RUN6,
+  S_FATT_RUN7,
+  S_FATT_RUN8,
+  S_FATT_RUN9,
+  S_FATT_RUN10,
+  S_FATT_RUN11,
+  S_FATT_RUN12,
+  S_FATT_ATK1,
+  S_FATT_ATK2,
+  S_FATT_ATK3,
+  S_FATT_ATK4,
+  S_FATT_ATK5,
+  S_FATT_ATK6,
+  S_FATT_ATK7,
+  S_FATT_ATK8,
+  S_FATT_ATK9,
+  S_FATT_ATK10,
+  S_FATT_PAIN,
+  S_FATT_PAIN2,
+  S_FATT_DIE1,
+  S_FATT_DIE2,
+  S_FATT_DIE3,
+  S_FATT_DIE4,
+  S_FATT_DIE5,
+  S_FATT_DIE6,
+  S_FATT_DIE7,
+  S_FATT_DIE8,
+  S_FATT_DIE9,
+  S_FATT_DIE10,
+  S_FATT_RAISE1,
+  S_FATT_RAISE2,
+  S_FATT_RAISE3,
+  S_FATT_RAISE4,
+  S_FATT_RAISE5,
+  S_FATT_RAISE6,
+  S_FATT_RAISE7,
+  S_FATT_RAISE8,
+  S_CPOS_STND,
+  S_CPOS_STND2,
+  S_CPOS_RUN1,
+  S_CPOS_RUN2,
+  S_CPOS_RUN3,
+  S_CPOS_RUN4,
+  S_CPOS_RUN5,
+  S_CPOS_RUN6,
+  S_CPOS_RUN7,
+  S_CPOS_RUN8,
+  S_CPOS_ATK1,
+  S_CPOS_ATK2,
+  S_CPOS_ATK3,
+  S_CPOS_ATK4,
+  S_CPOS_PAIN,
+  S_CPOS_PAIN2,
+  S_CPOS_DIE1,
+  S_CPOS_DIE2,
+  S_CPOS_DIE3,
+  S_CPOS_DIE4,
+  S_CPOS_DIE5,
+  S_CPOS_DIE6,
+  S_CPOS_DIE7,
+  S_CPOS_XDIE1,
+  S_CPOS_XDIE2,
+  S_CPOS_XDIE3,
+  S_CPOS_XDIE4,
+  S_CPOS_XDIE5,
+  S_CPOS_XDIE6,
+  S_CPOS_RAISE1,
+  S_CPOS_RAISE2,
+  S_CPOS_RAISE3,
+  S_CPOS_RAISE4,
+  S_CPOS_RAISE5,
+  S_CPOS_RAISE6,
+  S_CPOS_RAISE7,
+  S_TROO_STND,
+  S_TROO_STND2,
+  S_TROO_RUN1,
+  S_TROO_RUN2,
+  S_TROO_RUN3,
+  S_TROO_RUN4,
+  S_TROO_RUN5,
+  S_TROO_RUN6,
+  S_TROO_RUN7,
+  S_TROO_RUN8,
+  S_TROO_ATK1,
+  S_TROO_ATK2,
+  S_TROO_ATK3,
+  S_TROO_PAIN,
+  S_TROO_PAIN2,
+  S_TROO_DIE1,
+  S_TROO_DIE2,
+  S_TROO_DIE3,
+  S_TROO_DIE4,
+  S_TROO_DIE5,
+  S_TROO_XDIE1,
+  S_TROO_XDIE2,
+  S_TROO_XDIE3,
+  S_TROO_XDIE4,
+  S_TROO_XDIE5,
+  S_TROO_XDIE6,
+  S_TROO_XDIE7,
+  S_TROO_XDIE8,
+  S_TROO_RAISE1,
+  S_TROO_RAISE2,
+  S_TROO_RAISE3,
+  S_TROO_RAISE4,
+  S_TROO_RAISE5,
+  S_SARG_STND,
+  S_SARG_STND2,
+  S_SARG_RUN1,
+  S_SARG_RUN2,
+  S_SARG_RUN3,
+  S_SARG_RUN4,
+  S_SARG_RUN5,
+  S_SARG_RUN6,
+  S_SARG_RUN7,
+  S_SARG_RUN8,
+  S_SARG_ATK1,
+  S_SARG_ATK2,
+  S_SARG_ATK3,
+  S_SARG_PAIN,
+  S_SARG_PAIN2,
+  S_SARG_DIE1,
+  S_SARG_DIE2,
+  S_SARG_DIE3,
+  S_SARG_DIE4,
+  S_SARG_DIE5,
+  S_SARG_DIE6,
+  S_SARG_RAISE1,
+  S_SARG_RAISE2,
+  S_SARG_RAISE3,
+  S_SARG_RAISE4,
+  S_SARG_RAISE5,
+  S_SARG_RAISE6,
+  S_HEAD_STND,
+  S_HEAD_RUN1,
+  S_HEAD_ATK1,
+  S_HEAD_ATK2,
+  S_HEAD_ATK3,
+  S_HEAD_PAIN,
+  S_HEAD_PAIN2,
+  S_HEAD_PAIN3,
+  S_HEAD_DIE1,
+  S_HEAD_DIE2,
+  S_HEAD_DIE3,
+  S_HEAD_DIE4,
+  S_HEAD_DIE5,
+  S_HEAD_DIE6,
+  S_HEAD_RAISE1,
+  S_HEAD_RAISE2,
+  S_HEAD_RAISE3,
+  S_HEAD_RAISE4,
+  S_HEAD_RAISE5,
+  S_HEAD_RAISE6,
+  S_BRBALL1,
+  S_BRBALL2,
+  S_BRBALLX1,
+  S_BRBALLX2,
+  S_BRBALLX3,
+  S_BOSS_STND,
+  S_BOSS_STND2,
+  S_BOSS_RUN1,
+  S_BOSS_RUN2,
+  S_BOSS_RUN3,
+  S_BOSS_RUN4,
+  S_BOSS_RUN5,
+  S_BOSS_RUN6,
+  S_BOSS_RUN7,
+  S_BOSS_RUN8,
+  S_BOSS_ATK1,
+  S_BOSS_ATK2,
+  S_BOSS_ATK3,
+  S_BOSS_PAIN,
+  S_BOSS_PAIN2,
+  S_BOSS_DIE1,
+  S_BOSS_DIE2,
+  S_BOSS_DIE3,
+  S_BOSS_DIE4,
+  S_BOSS_DIE5,
+  S_BOSS_DIE6,
+  S_BOSS_DIE7,
+  S_BOSS_RAISE1,
+  S_BOSS_RAISE2,
+  S_BOSS_RAISE3,
+  S_BOSS_RAISE4,
+  S_BOSS_RAISE5,
+  S_BOSS_RAISE6,
+  S_BOSS_RAISE7,
+  S_BOS2_STND,
+  S_BOS2_STND2,
+  S_BOS2_RUN1,
+  S_BOS2_RUN2,
+  S_BOS2_RUN3,
+  S_BOS2_RUN4,
+  S_BOS2_RUN5,
+  S_BOS2_RUN6,
+  S_BOS2_RUN7,
+  S_BOS2_RUN8,
+  S_BOS2_ATK1,
+  S_BOS2_ATK2,
+  S_BOS2_ATK3,
+  S_BOS2_PAIN,
+  S_BOS2_PAIN2,
+  S_BOS2_DIE1,
+  S_BOS2_DIE2,
+  S_BOS2_DIE3,
+  S_BOS2_DIE4,
+  S_BOS2_DIE5,
+  S_BOS2_DIE6,
+  S_BOS2_DIE7,
+  S_BOS2_RAISE1,
+  S_BOS2_RAISE2,
+  S_BOS2_RAISE3,
+  S_BOS2_RAISE4,
+  S_BOS2_RAISE5,
+  S_BOS2_RAISE6,
+  S_BOS2_RAISE7,
+  S_SKULL_STND,
+  S_SKULL_STND2,
+  S_SKULL_RUN1,
+  S_SKULL_RUN2,
+  S_SKULL_ATK1,
+  S_SKULL_ATK2,
+  S_SKULL_ATK3,
+  S_SKULL_ATK4,
+  S_SKULL_PAIN,
+  S_SKULL_PAIN2,
+  S_SKULL_DIE1,
+  S_SKULL_DIE2,
+  S_SKULL_DIE3,
+  S_SKULL_DIE4,
+  S_SKULL_DIE5,
+  S_SKULL_DIE6,
+  S_SPID_STND,
+  S_SPID_STND2,
+  S_SPID_RUN1,
+  S_SPID_RUN2,
+  S_SPID_RUN3,
+  S_SPID_RUN4,
+  S_SPID_RUN5,
+  S_SPID_RUN6,
+  S_SPID_RUN7,
+  S_SPID_RUN8,
+  S_SPID_RUN9,
+  S_SPID_RUN10,
+  S_SPID_RUN11,
+  S_SPID_RUN12,
+  S_SPID_ATK1,
+  S_SPID_ATK2,
+  S_SPID_ATK3,
+  S_SPID_ATK4,
+  S_SPID_PAIN,
+  S_SPID_PAIN2,
+  S_SPID_DIE1,
+  S_SPID_DIE2,
+  S_SPID_DIE3,
+  S_SPID_DIE4,
+  S_SPID_DIE5,
+  S_SPID_DIE6,
+  S_SPID_DIE7,
+  S_SPID_DIE8,
+  S_SPID_DIE9,
+  S_SPID_DIE10,
+  S_SPID_DIE11,
+  S_BSPI_STND,
+  S_BSPI_STND2,
+  S_BSPI_SIGHT,
+  S_BSPI_RUN1,
+  S_BSPI_RUN2,
+  S_BSPI_RUN3,
+  S_BSPI_RUN4,
+  S_BSPI_RUN5,
+  S_BSPI_RUN6,
+  S_BSPI_RUN7,
+  S_BSPI_RUN8,
+  S_BSPI_RUN9,
+  S_BSPI_RUN10,
+  S_BSPI_RUN11,
+  S_BSPI_RUN12,
+  S_BSPI_ATK1,
+  S_BSPI_ATK2,
+  S_BSPI_ATK3,
+  S_BSPI_ATK4,
+  S_BSPI_PAIN,
+  S_BSPI_PAIN2,
+  S_BSPI_DIE1,
+  S_BSPI_DIE2,
+  S_BSPI_DIE3,
+  S_BSPI_DIE4,
+  S_BSPI_DIE5,
+  S_BSPI_DIE6,
+  S_BSPI_DIE7,
+  S_BSPI_RAISE1,
+  S_BSPI_RAISE2,
+  S_BSPI_RAISE3,
+  S_BSPI_RAISE4,
+  S_BSPI_RAISE5,
+  S_BSPI_RAISE6,
+  S_BSPI_RAISE7,
+  S_ARACH_PLAZ,
+  S_ARACH_PLAZ2,
+  S_ARACH_PLEX,
+  S_ARACH_PLEX2,
+  S_ARACH_PLEX3,
+  S_ARACH_PLEX4,
+  S_ARACH_PLEX5,
+  S_CYBER_STND,
+  S_CYBER_STND2,
+  S_CYBER_RUN1,
+  S_CYBER_RUN2,
+  S_CYBER_RUN3,
+  S_CYBER_RUN4,
+  S_CYBER_RUN5,
+  S_CYBER_RUN6,
+  S_CYBER_RUN7,
+  S_CYBER_RUN8,
+  S_CYBER_ATK1,
+  S_CYBER_ATK2,
+  S_CYBER_ATK3,
+  S_CYBER_ATK4,
+  S_CYBER_ATK5,
+  S_CYBER_ATK6,
+  S_CYBER_PAIN,
+  S_CYBER_DIE1,
+  S_CYBER_DIE2,
+  S_CYBER_DIE3,
+  S_CYBER_DIE4,
+  S_CYBER_DIE5,
+  S_CYBER_DIE6,
+  S_CYBER_DIE7,
+  S_CYBER_DIE8,
+  S_CYBER_DIE9,
+  S_CYBER_DIE10,
+  S_PAIN_STND,
+  S_PAIN_RUN1,
+  S_PAIN_RUN2,
+  S_PAIN_RUN3,
+  S_PAIN_RUN4,
+  S_PAIN_RUN5,
+  S_PAIN_RUN6,
+  S_PAIN_ATK1,
+  S_PAIN_ATK2,
+  S_PAIN_ATK3,
+  S_PAIN_ATK4,
+  S_PAIN_PAIN,
+  S_PAIN_PAIN2,
+  S_PAIN_DIE1,
+  S_PAIN_DIE2,
+  S_PAIN_DIE3,
+  S_PAIN_DIE4,
+  S_PAIN_DIE5,
+  S_PAIN_DIE6,
+  S_PAIN_RAISE1,
+  S_PAIN_RAISE2,
+  S_PAIN_RAISE3,
+  S_PAIN_RAISE4,
+  S_PAIN_RAISE5,
+  S_PAIN_RAISE6,
+  S_SSWV_STND,
+  S_SSWV_STND2,
+  S_SSWV_RUN1,
+  S_SSWV_RUN2,
+  S_SSWV_RUN3,
+  S_SSWV_RUN4,
+  S_SSWV_RUN5,
+  S_SSWV_RUN6,
+  S_SSWV_RUN7,
+  S_SSWV_RUN8,
+  S_SSWV_ATK1,
+  S_SSWV_ATK2,
+  S_SSWV_ATK3,
+  S_SSWV_ATK4,
+  S_SSWV_ATK5,
+  S_SSWV_ATK6,
+  S_SSWV_PAIN,
+  S_SSWV_PAIN2,
+  S_SSWV_DIE1,
+  S_SSWV_DIE2,
+  S_SSWV_DIE3,
+  S_SSWV_DIE4,
+  S_SSWV_DIE5,
+  S_SSWV_XDIE1,
+  S_SSWV_XDIE2,
+  S_SSWV_XDIE3,
+  S_SSWV_XDIE4,
+  S_SSWV_XDIE5,
+  S_SSWV_XDIE6,
+  S_SSWV_XDIE7,
+  S_SSWV_XDIE8,
+  S_SSWV_XDIE9,
+  S_SSWV_RAISE1,
+  S_SSWV_RAISE2,
+  S_SSWV_RAISE3,
+  S_SSWV_RAISE4,
+  S_SSWV_RAISE5,
+  S_KEENSTND,
+  S_COMMKEEN,
+  S_COMMKEEN2,
+  S_COMMKEEN3,
+  S_COMMKEEN4,
+  S_COMMKEEN5,
+  S_COMMKEEN6,
+  S_COMMKEEN7,
+  S_COMMKEEN8,
+  S_COMMKEEN9,
+  S_COMMKEEN10,
+  S_COMMKEEN11,
+  S_COMMKEEN12,
+  S_KEENPAIN,
+  S_KEENPAIN2,
+  S_BRAIN,
+  S_BRAIN_PAIN,
+  S_BRAIN_DIE1,
+  S_BRAIN_DIE2,
+  S_BRAIN_DIE3,
+  S_BRAIN_DIE4,
+  S_BRAINEYE,
+  S_BRAINEYESEE,
+  S_BRAINEYE1,
+  S_SPAWN1,
+  S_SPAWN2,
+  S_SPAWN3,
+  S_SPAWN4,
+  S_SPAWNFIRE1,
+  S_SPAWNFIRE2,
+  S_SPAWNFIRE3,
+  S_SPAWNFIRE4,
+  S_SPAWNFIRE5,
+  S_SPAWNFIRE6,
+  S_SPAWNFIRE7,
+  S_SPAWNFIRE8,
+  S_BRAINEXPLODE1,
+  S_BRAINEXPLODE2,
+  S_BRAINEXPLODE3,
+  S_ARM1,
+  S_ARM1A,
+  S_ARM2,
+  S_ARM2A,
+  S_BAR1,
+  S_BAR2,
+  S_BEXP,
+  S_BEXP2,
+  S_BEXP3,
+  S_BEXP4,
+  S_BEXP5,
+  S_BBAR1,
+  S_BBAR2,
+  S_BBAR3,
+  S_BON1,
+  S_BON1A,
+  S_BON1B,
+  S_BON1C,
+  S_BON1D,
+  S_BON1E,
+  S_BON2,
+  S_BON2A,
+  S_BON2B,
+  S_BON2C,
+  S_BON2D,
+  S_BON2E,
+  S_BKEY,
+  S_BKEY2,
+  S_RKEY,
+  S_RKEY2,
+  S_YKEY,
+  S_YKEY2,
+  S_BSKULL,
+  S_BSKULL2,
+  S_RSKULL,
+  S_RSKULL2,
+  S_YSKULL,
+  S_YSKULL2,
+  S_STIM,
+  S_MEDI,
+  S_SOUL,
+  S_SOUL2,
+  S_SOUL3,
+  S_SOUL4,
+  S_SOUL5,
+  S_SOUL6,
+  S_PINV,
+  S_PINV2,
+  S_PINV3,
+  S_PINV4,
+  S_PSTR,
+  S_PINS,
+  S_PINS2,
+  S_PINS3,
+  S_PINS4,
+  S_MEGA,
+  S_MEGA2,
+  S_MEGA3,
+  S_MEGA4,
+  S_SUIT,
+  S_PMAP,
+  S_PMAP2,
+  S_PMAP3,
+  S_PMAP4,
+  S_PMAP5,
+  S_PMAP6,
+  S_PVIS,
+  S_PVIS2,
+  S_CLIP,
+  S_AMMO,
+  S_ROCK,
+  S_BROK,
+  S_CELL,
+  S_CELP,
+  S_SHEL,
+  S_SBOX,
+  S_BPAK,
+  S_BFUG,
+  S_MGUN,
+  S_CSAW,
+  S_LAUN,
+  S_PLAS,
+  S_SHOT,
+  S_SHOT2,
+  S_COLU,
+  S_STALAG,
+  S_BLOODYTWITCH,
+  S_BLOODYTWITCH2,
+  S_BLOODYTWITCH3,
+  S_BLOODYTWITCH4,
+  S_DEADTORSO,
+  S_DEADBOTTOM,
+  S_HEADSONSTICK,
+  S_GIBS,
+  S_HEADONASTICK,
+  S_HEADCANDLES,
+  S_HEADCANDLES2,
+  S_DEADSTICK,
+  S_LIVESTICK,
+  S_LIVESTICK2,
+  S_MEAT2,
+  S_MEAT3,
+  S_MEAT4,
+  S_MEAT5,
+  S_STALAGTITE,
+  S_TALLGRNCOL,
+  S_SHRTGRNCOL,
+  S_TALLREDCOL,
+  S_SHRTREDCOL,
+  S_CANDLESTIK,
+  S_CANDELABRA,
+  S_SKULLCOL,
+  S_TORCHTREE,
+  S_BIGTREE,
+  S_TECHPILLAR,
+  S_EVILEYE,
+  S_EVILEYE2,
+  S_EVILEYE3,
+  S_EVILEYE4,
+  S_FLOATSKULL,
+  S_FLOATSKULL2,
+  S_FLOATSKULL3,
+  S_HEARTCOL,
+  S_HEARTCOL2,
+  S_BLUETORCH,
+  S_BLUETORCH2,
+  S_BLUETORCH3,
+  S_BLUETORCH4,
+  S_GREENTORCH,
+  S_GREENTORCH2,
+  S_GREENTORCH3,
+  S_GREENTORCH4,
+  S_REDTORCH,
+  S_REDTORCH2,
+  S_REDTORCH3,
+  S_REDTORCH4,
+  S_BTORCHSHRT,
+  S_BTORCHSHRT2,
+  S_BTORCHSHRT3,
+  S_BTORCHSHRT4,
+  S_GTORCHSHRT,
+  S_GTORCHSHRT2,
+  S_GTORCHSHRT3,
+  S_GTORCHSHRT4,
+  S_RTORCHSHRT,
+  S_RTORCHSHRT2,
+  S_RTORCHSHRT3,
+  S_RTORCHSHRT4,
+  S_HANGNOGUTS,
+  S_HANGBNOBRAIN,
+  S_HANGTLOOKDN,
+  S_HANGTSKULL,
+  S_HANGTLOOKUP,
+  S_HANGTNOBRAIN,
+  S_COLONGIBS,
+  S_SMALLPOOL,
+  S_BRAINSTEM,
+  S_TECHLAMP,
+  S_TECHLAMP2,
+  S_TECHLAMP3,
+  S_TECHLAMP4,
+  S_TECH2LAMP,
+  S_TECH2LAMP2,
+  S_TECH2LAMP3,
+  S_TECH2LAMP4,
+  NUMSTATES
 } statenum_t;
 
+/* Tightly packed to save space! */
 
-typedef struct
+begin_packed_struct struct state_t
 {
-    spritenum_t sprite;
-    int frame;
-    int tics;
-    // void (*action) ();
-    actionf_t action;
-    statenum_t nextstate;
-    int misc1;
-    int misc2;
-} state_t;
+  actionf_t action; /* void (*action) (); */
+  spritenum_t sprite;
+  statenum_t nextstate;
 
-extern state_t	states[NUMSTATES];
-extern const char *sprnames[];
+  int32_t tics;   /* -1 to 181 */
 
-typedef enum {
-    MT_PLAYER,
-    MT_POSSESSED,
-    MT_SHOTGUY,
-    MT_VILE,
-    MT_FIRE,
-    MT_UNDEAD,
-    MT_TRACER,
-    MT_SMOKE,
-    MT_FATSO,
-    MT_FATSHOT,
-    MT_CHAINGUY,
-    MT_TROOP,
-    MT_SERGEANT,
-    MT_SHADOWS,
-    MT_HEAD,
-    MT_BRUISER,
-    MT_BRUISERSHOT,
-    MT_KNIGHT,
-    MT_SKULL,
-    MT_SPIDER,
-    MT_BABY,
-    MT_CYBORG,
-    MT_PAIN,
-    MT_WOLFSS,
-    MT_KEEN,
-    MT_BOSSBRAIN,
-    MT_BOSSSPIT,
-    MT_BOSSTARGET,
-    MT_SPAWNSHOT,
-    MT_SPAWNFIRE,
-    MT_BARREL,
-    MT_TROOPSHOT,
-    MT_HEADSHOT,
-    MT_ROCKET,
-    MT_PLASMA,
-    MT_BFG,
-    MT_ARACHPLAZ,
-    MT_PUFF,
-    MT_BLOOD,
-    MT_TFOG,
-    MT_IFOG,
-    MT_TELEPORTMAN,
-    MT_EXTRABFG,
-    MT_MISC0,
-    MT_MISC1,
-    MT_MISC2,
-    MT_MISC3,
-    MT_MISC4,
-    MT_MISC5,
-    MT_MISC6,
-    MT_MISC7,
-    MT_MISC8,
-    MT_MISC9,
-    MT_MISC10,
-    MT_MISC11,
-    MT_MISC12,
-    MT_INV,
-    MT_MISC13,
-    MT_INS,
-    MT_MISC14,
-    MT_MISC15,
-    MT_MISC16,
-    MT_MEGA,
-    MT_CLIP,
-    MT_MISC17,
-    MT_MISC18,
-    MT_MISC19,
-    MT_MISC20,
-    MT_MISC21,
-    MT_MISC22,
-    MT_MISC23,
-    MT_MISC24,
-    MT_MISC25,
-    MT_CHAINGUN,
-    MT_MISC26,
-    MT_MISC27,
-    MT_MISC28,
-    MT_SHOTGUN,
-    MT_SUPERSHOTGUN,
-    MT_MISC29,
-    MT_MISC30,
-    MT_MISC31,
-    MT_MISC32,
-    MT_MISC33,
-    MT_MISC34,
-    MT_MISC35,
-    MT_MISC36,
-    MT_MISC37,
-    MT_MISC38,
-    MT_MISC39,
-    MT_MISC40,
-    MT_MISC41,
-    MT_MISC42,
-    MT_MISC43,
-    MT_MISC44,
-    MT_MISC45,
-    MT_MISC46,
-    MT_MISC47,
-    MT_MISC48,
-    MT_MISC49,
-    MT_MISC50,
-    MT_MISC51,
-    MT_MISC52,
-    MT_MISC53,
-    MT_MISC54,
-    MT_MISC55,
-    MT_MISC56,
-    MT_MISC57,
-    MT_MISC58,
-    MT_MISC59,
-    MT_MISC60,
-    MT_MISC61,
-    MT_MISC62,
-    MT_MISC63,
-    MT_MISC64,
-    MT_MISC65,
-    MT_MISC66,
-    MT_MISC67,
-    MT_MISC68,
-    MT_MISC69,
-    MT_MISC70,
-    MT_MISC71,
-    MT_MISC72,
-    MT_MISC73,
-    MT_MISC74,
-    MT_MISC75,
-    MT_MISC76,
-    MT_MISC77,
-    MT_MISC78,
-    MT_MISC79,
-    MT_MISC80,
-    MT_MISC81,
-    MT_MISC82,
-    MT_MISC83,
-    MT_MISC84,
-    MT_MISC85,
-    MT_MISC86,
-    NUMMOBJTYPES
+  uint16_t frame; /* 0 to 32796 */
 
+  /* NOTE: as far as I can tell, these fields are never used. They are set to
+   * zero in the state lookup table, and the only other place directly
+   * referencing them is P_SetPsprite, which uses them seemingly as a fixed
+   * point number to set some other coordinates later. However, in my
+   * gameplay, the check for `if (state->misc1)` never evaluates to true.
+   * Therefore, in my quest to save memory in one of the games largest lookup
+   * tables, I am removing these fields.
+   */
+
+#if 0
+  int misc1;
+  int misc2;
+#endif
+} end_packed_struct;
+
+typedef struct state_t state_t;
+
+typedef enum
+{
+  MT_PLAYER,
+  MT_POSSESSED,
+  MT_SHOTGUY,
+  MT_VILE,
+  MT_FIRE,
+  MT_UNDEAD,
+  MT_TRACER,
+  MT_SMOKE,
+  MT_FATSO,
+  MT_FATSHOT,
+  MT_CHAINGUY,
+  MT_TROOP,
+  MT_SERGEANT,
+  MT_SHADOWS,
+  MT_HEAD,
+  MT_BRUISER,
+  MT_BRUISERSHOT,
+  MT_KNIGHT,
+  MT_SKULL,
+  MT_SPIDER,
+  MT_BABY,
+  MT_CYBORG,
+  MT_PAIN,
+  MT_WOLFSS,
+  MT_KEEN,
+  MT_BOSSBRAIN,
+  MT_BOSSSPIT,
+  MT_BOSSTARGET,
+  MT_SPAWNSHOT,
+  MT_SPAWNFIRE,
+  MT_BARREL,
+  MT_TROOPSHOT,
+  MT_HEADSHOT,
+  MT_ROCKET,
+  MT_PLASMA,
+  MT_BFG,
+  MT_ARACHPLAZ,
+  MT_PUFF,
+  MT_BLOOD,
+  MT_TFOG,
+  MT_IFOG,
+  MT_TELEPORTMAN,
+  MT_EXTRABFG,
+  MT_MISC0,
+  MT_MISC1,
+  MT_MISC2,
+  MT_MISC3,
+  MT_MISC4,
+  MT_MISC5,
+  MT_MISC6,
+  MT_MISC7,
+  MT_MISC8,
+  MT_MISC9,
+  MT_MISC10,
+  MT_MISC11,
+  MT_MISC12,
+  MT_INV,
+  MT_MISC13,
+  MT_INS,
+  MT_MISC14,
+  MT_MISC15,
+  MT_MISC16,
+  MT_MEGA,
+  MT_CLIP,
+  MT_MISC17,
+  MT_MISC18,
+  MT_MISC19,
+  MT_MISC20,
+  MT_MISC21,
+  MT_MISC22,
+  MT_MISC23,
+  MT_MISC24,
+  MT_MISC25,
+  MT_CHAINGUN,
+  MT_MISC26,
+  MT_MISC27,
+  MT_MISC28,
+  MT_SHOTGUN,
+  MT_SUPERSHOTGUN,
+  MT_MISC29,
+  MT_MISC30,
+  MT_MISC31,
+  MT_MISC32,
+  MT_MISC33,
+  MT_MISC34,
+  MT_MISC35,
+  MT_MISC36,
+  MT_MISC37,
+  MT_MISC38,
+  MT_MISC39,
+  MT_MISC40,
+  MT_MISC41,
+  MT_MISC42,
+  MT_MISC43,
+  MT_MISC44,
+  MT_MISC45,
+  MT_MISC46,
+  MT_MISC47,
+  MT_MISC48,
+  MT_MISC49,
+  MT_MISC50,
+  MT_MISC51,
+  MT_MISC52,
+  MT_MISC53,
+  MT_MISC54,
+  MT_MISC55,
+  MT_MISC56,
+  MT_MISC57,
+  MT_MISC58,
+  MT_MISC59,
+  MT_MISC60,
+  MT_MISC61,
+  MT_MISC62,
+  MT_MISC63,
+  MT_MISC64,
+  MT_MISC65,
+  MT_MISC66,
+  MT_MISC67,
+  MT_MISC68,
+  MT_MISC69,
+  MT_MISC70,
+  MT_MISC71,
+  MT_MISC72,
+  MT_MISC73,
+  MT_MISC74,
+  MT_MISC75,
+  MT_MISC76,
+  MT_MISC77,
+  MT_MISC78,
+  MT_MISC79,
+  MT_MISC80,
+  MT_MISC81,
+  MT_MISC82,
+  MT_MISC83,
+  MT_MISC84,
+  MT_MISC85,
+  MT_MISC86,
+  NUMMOBJTYPES
 } mobjtype_t;
 
-typedef struct
-{
-    int	doomednum;
-    int	spawnstate;
-    int	spawnhealth;
-    int	seestate;
-    int	seesound;
-    int	reactiontime;
-    int	attacksound;
-    int	painstate;
-    int	painchance;
-    int	painsound;
-    int	meleestate;
-    int	missilestate;
-    int	deathstate;
-    int	xdeathstate;
-    int	deathsound;
-    int	speed;
-    int	radius;
-    int	height;
-    int	mass;
-    int	damage;
-    int	activesound;
-    int	flags;
-    int	raisestate;
+/* Ranges for these members were obtained by analyzing the `mobjinfo`
+ * array at game startup.
+ */
 
-} mobjinfo_t;
+begin_packed_struct struct mobjinfo_t
+{
+  uint32_t flags;        /* 0 to 33557510 */
+  uint32_t radius;       /* 393216 to 8388608 */
+  uint32_t height;       /* 524288 to 7208960 */
+  uint32_t mass;         /* 50 to 10000000 */
+  uint32_t speed;        /* 0 to 1638400 */
+  int16_t doomednum;     /* -1 to 3006 */
+  uint16_t spawnhealth;  /* 20 to 4000 */
+  uint16_t spawnstate;   /* 0 to 963 */
+  uint16_t seestate;     /* 0 to 785 */
+  uint16_t painstate;    /* 0 to 779 */
+  uint16_t painchance;   /* 0 to 256 */
+  uint16_t meleestate;   /* 0 to 566 */
+  uint16_t missilestate; /* 0 to 736 */
+  uint16_t deathstate;   /* 0 to 808 */
+  uint16_t xdeathstate;  /* 0 to 749 */
+  uint16_t raisestate;   /* 0 to 758 */
+  uint8_t damage;        /* 0 to 100 */
+  uint8_t reactiontime;  /* 0 to 8 */
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  uint8_t seesound;    /* 0 to 107 */
+  uint8_t attacksound; /* 0 to 52 */
+  uint8_t painsound;   /* 0 to 103 */
+  uint8_t deathsound;  /* 0 to 104 */
+  uint8_t activesound; /* 0 to 105 */
+#endif
+} end_packed_struct;
+
+typedef struct mobjinfo_t mobjinfo_t;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern state_t states[NUMSTATES];
+extern const char *sprnames[];
+
+/* Size before opt: 0000000000012604
+ * Size after opt with sound: 0000000000007124
+ * Size after opt without sound: 0000000000006028
+ *
+ * Best improvement: 6576 bytes
+ * Best improvement: 6.42KB
+ */
 
 extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
 
-#endif
+#endif /* __INFO__ */
diff --git a/games/NXDoom/src/doom/m_menu.c b/games/NXDoom/src/doom/m_menu.c
index 71b47cbf6..55dd9589f 100644
--- a/games/NXDoom/src/doom/m_menu.c
+++ b/games/NXDoom/src/doom/m_menu.c
@@ -1,26 +1,33 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM selection menu, options, episode etc.
-//	Sliders and icons. Kinda widget stuff.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/m_menu.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  DOOM selection menu, options, episode etc.
+ *  Sliders and icons. Kinda widget stuff.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdlib.h>
 #include <ctype.h>
-
+#include <stdlib.h>
 
 #include "doomdef.h"
 #include "doomkeys.h"
@@ -42,7 +49,6 @@
 
 #include "r_local.h"
 
-
 #include "hu_stuff.h"
 
 #include "g_game.h"
@@ -52,2077 +58,2097 @@
 #include "p_saveg.h"
 #include "p_setup.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "doomstat.h"
 
-// Data.
-#include "sounds.h"
+/* Data. */
 
 #include "m_menu.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-//
-// defaulted values
-//
-int			mouseSensitivity = 5;
+#define SKULLXOFF -32
+#define LINEHEIGHT 16
 
-// Show messages has default, 0 = off, 1 = on
-int			showMessages = 1;
-	
+#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
+#define JOY_BUTTON_PRESSED(x)                                                \
+  (JOY_BUTTON_MAPPED(x) && (ev->data1 & (1 << (x))) != 0)
 
-// Blocky mode, has default, 0 = high, 1 = normal
-int			detailLevel = 0;
-int			screenblocks = 9;
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-// temp for screenblocks (0-9)
-int			screenSize;
+void (*message_routine)(int response);
 
-// -1 = no quicksave slot picked!
-int			quickSaveSlot;
+/* MENU TYPEDEFS */
 
- // 1 = message to be printed
-int			messageToPrint;
-// ...and here is the message string!
-const char		*messageString;
-
-// message x & y
-int			messx;
-int			messy;
-int			messageLastMenuActive;
-
-// timed message = no input from user
-boolean			messageNeedsInput;
-
-void    (*messageRoutine)(int response);
-
-char gammamsg[5][26] =
-{
-    GAMMALVL0,
-    GAMMALVL1,
-    GAMMALVL2,
-    GAMMALVL3,
-    GAMMALVL4
-};
-
-// we are going to be entering a savegame string
-int			saveStringEnter;              
-int             	saveSlot;	// which slot to save in
-int			saveCharIndex;	// which char we're editing
-static boolean          joypadSave = false; // was the save action initiated by joypad?
-// old save description before edit
-char			saveOldString[SAVESTRINGSIZE];  
-
-boolean			inhelpscreens;
-boolean			menuactive;
-
-#define SKULLXOFF		-32
-#define LINEHEIGHT		16
-
-char			savegamestrings[10][SAVESTRINGSIZE];
-
-char	endstring[160];
-
-static boolean opldev;
-
-//
-// MENU TYPEDEFS
-//
 typedef struct
 {
-    // 0 = no cursor here, 1 = ok, 2 = arrows ok
-    short	status;
-    
-    char	name[10];
-    
-    // choice = menu item #.
-    // if status = 2,
-    //   choice=0:leftarrow,1:rightarrow
-    void	(*routine)(int choice);
-    
-    // hotkey in menu
-    char	alphaKey;			
+  /* 0 = no cursor here, 1 = ok, 2 = arrows ok */
+
+  short status;
+
+  char name[10];
+
+  /* choice = menu item #.
+   * if status = 2,
+   *   choice=0:leftarrow,1:rightarrow
+   */
+
+  void (*routine)(int choice);
+
+  /* hotkey in menu */
+
+  char alpha_key;
 } menuitem_t;
 
-
-
 typedef struct menu_s
 {
-    short		numitems;	// # of menu items
-    struct menu_s*	prevMenu;	// previous menu
-    menuitem_t*		menuitems;	// menu items
-    void		(*routine)();	// draw routine
-    short		x;
-    short		y;		// x,y of menu
-    short		lastOn;		// last item user was on in menu
+  short numitems;           /* # of menu items */
+  struct menu_s *prev_menu; /* previous menu */
+  menuitem_t *menu_items;   /* menu items */
+  void (*routine)(void);    /* draw routine */
+  short x;
+  short y;       /* x,y of menu */
+  short last_on; /* last item user was on in menu */
 } menu_t;
 
-short		itemOn;			// menu item skull is on
-short		skullAnimCounter;	// skull animation counter
-short		whichSkull;		// which skull to draw
+/* DOOM MENU */
 
-// graphic name of skulls
-// warning: initializer-string for array of chars is too long
-const char *skullName[2] = {"M_SKULL1","M_SKULL2"};
-
-// current menudef
-menu_t*	currentMenu;                          
-
-//
-// PROTOTYPES
-//
-static void M_NewGame(int choice);
-static void M_Episode(int choice);
-static void M_ChooseSkill(int choice);
-static void M_LoadGame(int choice);
-static void M_SaveGame(int choice);
-static void M_Options(int choice);
-static void M_EndGame(int choice);
-static void M_ReadThis(int choice);
-static void M_ReadThis2(int choice);
-static void M_QuitDOOM(int choice);
-
-static void M_ChangeMessages(int choice);
-static void M_ChangeSensitivity(int choice);
-static void M_SfxVol(int choice);
-static void M_MusicVol(int choice);
-static void M_ChangeDetail(int choice);
-static void M_SizeDisplay(int choice);
-static void M_Sound(int choice);
-
-static void M_FinishReadThis(int choice);
-static void M_LoadSelect(int choice);
-static void M_SaveSelect(int choice);
-static void M_ReadSaveStrings(void);
-static void M_QuickSave(void);
-static void M_QuickLoad(void);
-
-static void M_DrawMainMenu(void);
-static void M_DrawReadThis1(void);
-static void M_DrawReadThis2(void);
-static void M_DrawNewGame(void);
-static void M_DrawEpisode(void);
-static void M_DrawOptions(void);
-static void M_DrawSound(void);
-static void M_DrawLoad(void);
-static void M_DrawSave(void);
-
-static void M_DrawSaveLoadBorder(int x,int y);
-static void M_SetupNextMenu(menu_t *menudef);
-static void M_DrawThermo(int x,int y,int thermWidth,int thermDot);
-static void M_WriteText(int x, int y, const char *string);
-static int  M_StringWidth(const char *string);
-static int  M_StringHeight(const char *string);
-static void M_StartMessage(const char *string, void *routine, boolean input);
-static void M_ClearMenus (void);
-
-
-
-
-//
-// DOOM MENU
-//
 enum
 {
-    newgame = 0,
-    options,
-    loadgame,
-    savegame,
-    readthis,
-    quitdoom,
-    main_end
+  MAIN_NEWGAME = 0,
+  MAIN_OPTIONS,
+  MAIN_LOADGAME,
+  MAIN_SAVEGAME,
+  MAIN_READTHIS,
+  MAIN_QUITDOOM,
+  MAIN_END
 } main_e;
 
-menuitem_t MainMenu[]=
-{
-    {1,"M_NGAME",M_NewGame,'n'},
-    {1,"M_OPTION",M_Options,'o'},
-    {1,"M_LOADG",M_LoadGame,'l'},
-    {1,"M_SAVEG",M_SaveGame,'s'},
-    // Another hickup with Special edition.
-    {1,"M_RDTHIS",M_ReadThis,'r'},
-    {1,"M_QUITG",M_QuitDOOM,'q'}
-};
+/* EPISODE SELECT */
 
-menu_t  MainDef =
-{
-    main_end,
-    NULL,
-    MainMenu,
-    M_DrawMainMenu,
-    97,64,
-    0
-};
-
-
-//
-// EPISODE SELECT
-//
 enum
 {
-    ep1,
-    ep2,
-    ep3,
-    ep4,
-    ep_end
+  EPISODE_EP1,
+  EPISODE_EP2,
+  EPISODE_EP3,
+  EPISODE_EP4,
+  EPISODE_END
 } episodes_e;
 
-menuitem_t EpisodeMenu[]=
-{
-    {1,"M_EPI1", M_Episode,'k'},
-    {1,"M_EPI2", M_Episode,'t'},
-    {1,"M_EPI3", M_Episode,'i'},
-    {1,"M_EPI4", M_Episode,'t'}
-};
+/* NEW GAME */
 
-menu_t  EpiDef =
-{
-    ep_end,		// # of menu items
-    &MainDef,		// previous menu
-    EpisodeMenu,	// menuitem_t ->
-    M_DrawEpisode,	// drawing routine ->
-    48,63,              // x,y
-    ep1			// lastOn
-};
-
-//
-// NEW GAME
-//
 enum
 {
-    killthings,
-    toorough,
-    hurtme,
-    violence,
-    nightmare,
-    newg_end
+  NEWGAME_KILLTHINGS,
+  NEWGAME_TOOROUGH,
+  NEWGAME_HURTME,
+  NEWGAME_VIOLANCE,
+  NEWGAME_NIGHTMARE,
+  NEWGAME_END
 } newgame_e;
 
-menuitem_t NewGameMenu[]=
-{
-    {1,"M_JKILL",	M_ChooseSkill, 'i'},
-    {1,"M_ROUGH",	M_ChooseSkill, 'h'},
-    {1,"M_HURT",	M_ChooseSkill, 'h'},
-    {1,"M_ULTRA",	M_ChooseSkill, 'u'},
-    {1,"M_NMARE",	M_ChooseSkill, 'n'}
-};
+/* OPTIONS MENU */
 
-menu_t  NewDef =
-{
-    newg_end,		// # of menu items
-    &EpiDef,		// previous menu
-    NewGameMenu,	// menuitem_t ->
-    M_DrawNewGame,	// drawing routine ->
-    48,63,              // x,y
-    hurtme		// lastOn
-};
-
-
-
-//
-// OPTIONS MENU
-//
 enum
 {
-    endgame,
-    messages,
-    detail,
-    scrnsize,
-    option_empty1,
-    mousesens,
-    option_empty2,
-    soundvol,
-    opt_end
+  OPT_ENDGAME,
+  OPT_MESSAGES,
+  OPT_DETAIL,
+  OPT_SCRNSIZE,
+  OPT_EMPTY1,
+  OPT_MOUSESENS,
+  OPT_EMPTY2,
+  OPT_SOUNDVOL,
+  OPT_END
 } options_e;
 
-menuitem_t OptionsMenu[]=
-{
-    {1,"M_ENDGAM",	M_EndGame,'e'},
-    {1,"M_MESSG",	M_ChangeMessages,'m'},
-    {1,"M_DETAIL",	M_ChangeDetail,'g'},
-    {2,"M_SCRNSZ",	M_SizeDisplay,'s'},
-    {-1,"",0,'\0'},
-    {2,"M_MSENS",	M_ChangeSensitivity,'m'},
-    {-1,"",0,'\0'},
-    {1,"M_SVOL",	M_Sound,'s'}
-};
-
-menu_t  OptionsDef =
-{
-    opt_end,
-    &MainDef,
-    OptionsMenu,
-    M_DrawOptions,
-    60,37,
-    0
-};
-
-//
-// Read This! MENU 1 & 2
-//
 enum
 {
-    rdthsempty1,
-    read1_end
+  RDTHSEMPTY1,
+  READ1_END
 } read_e;
 
-menuitem_t ReadMenu1[] =
-{
-    {1,"",M_ReadThis2,0}
-};
-
-menu_t  ReadDef1 =
-{
-    read1_end,
-    &MainDef,
-    ReadMenu1,
-    M_DrawReadThis1,
-    280,185,
-    0
-};
-
 enum
 {
-    rdthsempty2,
-    read2_end
+  RDTHSEMPTY2,
+  READ2_END
 } read_e2;
 
-menuitem_t ReadMenu2[]=
-{
-    {1,"",M_FinishReadThis,0}
-};
+/* SOUND VOLUME MENU */
 
-menu_t  ReadDef2 =
-{
-    read2_end,
-    &ReadDef1,
-    ReadMenu2,
-    M_DrawReadThis2,
-    330,175,
-    0
-};
-
-//
-// SOUND VOLUME MENU
-//
 enum
 {
-    sfx_vol,
-    sfx_empty1,
-    music_vol,
-    sfx_empty2,
-    sound_end
+  SOUND_SFXVOL,
+  SOUND_SFXEMPTY1,
+  SOUND_MUSICVOL,
+  SOUND_SFXEMPTY2,
+  SOUND_END
 } sound_e;
 
-menuitem_t SoundMenu[]=
-{
-    {2,"M_SFXVOL",M_SfxVol,'s'},
-    {-1,"",0,'\0'},
-    {2,"M_MUSVOL",M_MusicVol,'m'},
-    {-1,"",0,'\0'}
-};
+/* LOAD GAME MENU */
 
-menu_t  SoundDef =
-{
-    sound_end,
-    &OptionsDef,
-    SoundMenu,
-    M_DrawSound,
-    80,64,
-    0
-};
-
-//
-// LOAD GAME MENU
-//
 enum
 {
-    load1,
-    load2,
-    load3,
-    load4,
-    load5,
-    load6,
-    load_end
+  LOAD_1,
+  LOAD_2,
+  LOAD_3,
+  LOAD_4,
+  LOAD_5,
+  LOAD_6,
+  LOAD_END
 } load_e;
 
-menuitem_t LoadMenu[]=
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void m_new_game(int choice);
+static void m_episode(int choice);
+static void m_choose_skill(int choice);
+static void m_load_game(int choice);
+static void m_save_game(int choice);
+static void m_options(int choice);
+static void m_end_game(int choice);
+static void m_read_this(int choice);
+static void m_read_this2(int choice);
+static void m_quit_doom(int choice);
+
+static void m_change_messages(int choice);
+static void m_change_sensitivity(int choice);
+static void m_sfx_vol(int choice);
+static void m_music_vol(int choice);
+static void m_change_detail(int choice);
+static void m_size_display(int choice);
+static void m_sound(int choice);
+
+static void m_finish_read_this(int choice);
+static void m_load_select(int choice);
+static void m_save_select(int choice);
+static void m_read_save_strings(void);
+static void m_quick_save(void);
+static void m_quick_load(void);
+
+static void m_drawmain_menu(void);
+static void m_draw_read_this1(void);
+static void m_draw_read_this2(void);
+static void m_draw_new_game(void);
+static void m_draw_episode(void);
+static void m_draw_options(void);
+static void m_draw_sound(void);
+static void m_draw_load(void);
+static void m_draw_save(void);
+
+static void m_draw_save_load_border(int x, int y);
+static void m_setup_next_menu(menu_t *menudef);
+static void m_draw_thermo(int x, int y, int therm_width, int therm_dot);
+static void m_write_text(int x, int y, const char *string);
+static int m_string_width(const char *string);
+static int m_string_height(const char *string);
+static void m_start_message(const char *string,
+        void *routine, boolean input);
+static void m_clear_menus(void);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* defaulted values */
+
+int g_mouse_sensitivity = 5;
+
+/* Show messages has default, 0 = off, 1 = on */
+
+int g_show_messages = 1;
+
+/* Blocky mode, has default, 0 = high, 1 = normal */
+
+int g_detail_level = 0;
+int screenblocks = 9;
+
+boolean g_menuactive;
+boolean inhelpscreens;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* message x & y */
+
+static int g_messx;
+static int g_messy;
+static int g_message_last_menu_active;
+
+/* timed message = no input from user */
+
+static boolean g_message_needs_input;
+
+static char g_gammamsg[5][26] =
 {
-    {1,"", M_LoadSelect,'1'},
-    {1,"", M_LoadSelect,'2'},
-    {1,"", M_LoadSelect,'3'},
-    {1,"", M_LoadSelect,'4'},
-    {1,"", M_LoadSelect,'5'},
-    {1,"", M_LoadSelect,'6'}
+    GAMMALVL0, GAMMALVL1, GAMMALVL2, GAMMALVL3, GAMMALVL4,
 };
 
-menu_t  LoadDef =
+/* we are going to be entering a savegame string */
+
+static int g_save_string_enter;
+static int g_save_slot;       /* which slot to save in */
+static int g_save_char_index; /* which char we're editing */
+
+/* old save description before edit */
+
+static char g_save_old_string[SAVESTRINGSIZE];
+
+static char g_save_game_strings[10][SAVESTRINGSIZE];
+
+static char g_endstring[160];
+
+static short g_item_on;            /* menu item skull is on */
+static short g_skull_anim_counter; /* skull animation counter */
+static short g_which_skull;        /* which skull to draw */
+
+/* temp for screenblocks (0-9) */
+
+static int g_screen_size;
+
+/* -1 = no quicksave slot picked! */
+
+static int g_quick_save_slot;
+
+/* 1 = message to be printed */
+
+static int g_message_to_print;
+
+/* ...and here is the message string! */
+
+static const char *g_message_string;
+
+static int g_epi;
+
+/* graphic name of skulls
+ * warning: initializer-string for array of chars is too long
+ */
+
+static const char *g_skull_name[2] =
 {
-    load_end,
-    &MainDef,
-    LoadMenu,
-    M_DrawLoad,
-    80,54,
-    0
+    "M_SKULL1",
+    "M_SKULL2",
 };
 
-//
-// SAVE GAME MENU
-//
-menuitem_t SaveMenu[]=
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+static int g_quitsounds[8] =
 {
-    {1,"", M_SaveSelect,'1'},
-    {1,"", M_SaveSelect,'2'},
-    {1,"", M_SaveSelect,'3'},
-    {1,"", M_SaveSelect,'4'},
-    {1,"", M_SaveSelect,'5'},
-    {1,"", M_SaveSelect,'6'}
+    SFX_PLDETH, SFX_DMPAIN, SFX_POPAIN, SFX_SLOP,
+    SFX_TELEPT, SFX_POSIT1, SFX_POSIT3, SFX_SGTATK,
 };
 
-menu_t  SaveDef =
+static int g_quitsounds2[8] =
 {
-    load_end,
-    &MainDef,
-    SaveMenu,
-    M_DrawSave,
-    80,54,
-    0
+    SFX_VILACT, SFX_GETPOW, SFX_BOSCUB, SFX_SLOP,
+    SFX_SKESWG, SFX_KNTDTH, SFX_BSPACT, SFX_SGTATK,
+};
+#endif
+
+/* was the save action initiated by joypad? */
+
+static boolean g_joypad_save = false;
+
+static char g_tempstring[90];
+
+static const char *g_detail_names[2] =
+{
+    "M_GDHIGH",
+    "M_GDLOW",
 };
 
-
-//
-// M_ReadSaveStrings
-//  read the strings from the savegame files
-//
-void M_ReadSaveStrings(void)
+static const char *g_msg_names[2] =
 {
-    FILE   *handle;
-    int     i;
-    char    name[256];
-
-    for (i = 0;i < load_end;i++)
-    {
-        int retval;
-        M_StringCopy(name, P_SaveGameFile(i), sizeof(name));
-
-	handle = M_fopen(name, "rb");
-        if (handle == NULL)
-        {
-            M_StringCopy(savegamestrings[i], EMPTYSTRING, SAVESTRINGSIZE);
-            LoadMenu[i].status = 0;
-            continue;
-        }
-        retval = fread(&savegamestrings[i], 1, SAVESTRINGSIZE, handle);
-	fclose(handle);
-        LoadMenu[i].status = retval == SAVESTRINGSIZE;
-    }
-}
-
-
-//
-// M_LoadGame & Cie.
-//
-void M_DrawLoad(void)
-{
-    int             i;
-	
-    V_DrawPatchDirect(72, 28, 
-                      W_CacheLumpName(DEH_String("M_LOADG"), PU_CACHE));
-
-    for (i = 0;i < load_end; i++)
-    {
-	M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
-	M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
-    }
-}
-
-
-
-//
-// Draw border for the savegame description
-//
-void M_DrawSaveLoadBorder(int x,int y)
-{
-    int             i;
-	
-    V_DrawPatchDirect(x - 8, y + 7,
-                      W_CacheLumpName(DEH_String("M_LSLEFT"), PU_CACHE));
-	
-    for (i = 0;i < 24;i++)
-    {
-	V_DrawPatchDirect(x, y + 7,
-                          W_CacheLumpName(DEH_String("M_LSCNTR"), PU_CACHE));
-	x += 8;
-    }
-
-    V_DrawPatchDirect(x, y + 7, 
-                      W_CacheLumpName(DEH_String("M_LSRGHT"), PU_CACHE));
-}
-
-
-
-//
-// User wants to load this game
-//
-void M_LoadSelect(int choice)
-{
-    char    name[256];
-	
-    M_StringCopy(name, P_SaveGameFile(choice), sizeof(name));
-
-    G_LoadGame (name);
-    M_ClearMenus ();
-}
-
-//
-// Selected from DOOM menu
-//
-void M_LoadGame (int choice)
-{
-    if (netgame)
-    {
-	M_StartMessage(DEH_String(LOADNET),NULL,false);
-	return;
-    }
-	
-    M_SetupNextMenu(&LoadDef);
-    M_ReadSaveStrings();
-}
-
-
-//
-//  M_SaveGame & Cie.
-//
-void M_DrawSave(void)
-{
-    int             i;
-	
-    V_DrawPatchDirect(72, 28, W_CacheLumpName(DEH_String("M_SAVEG"), PU_CACHE));
-    for (i = 0;i < load_end; i++)
-    {
-	M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
-	M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
-    }
-	
-    if (saveStringEnter)
-    {
-	i = M_StringWidth(savegamestrings[saveSlot]);
-	M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*saveSlot,"_");
-    }
-}
-
-//
-// M_Responder calls this when user is finished
-//
-void M_DoSave(int slot)
-{
-    G_SaveGame (slot,savegamestrings[slot]);
-    M_ClearMenus ();
-
-    // PICK QUICKSAVE SLOT YET?
-    if (quickSaveSlot == -2)
-	quickSaveSlot = slot;
-}
-
-//
-// Generate a default save slot name when the user saves to
-// an empty slot via the joypad.
-//
-static void SetDefaultSaveName(int slot)
-{
-    // map from IWAD or PWAD?
-    if (W_IsIWADLump(maplumpinfo) && strcmp(savegamedir, ""))
-    {
-        M_snprintf(savegamestrings[itemOn], SAVESTRINGSIZE,
-                   "%s", maplumpinfo->name);
-    }
-    else
-    {
-        char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpinfo));
-        char *ext = strrchr(wadname, '.');
-
-        if (ext != NULL)
-        {
-            *ext = '\0';
-        }
-
-        M_snprintf(savegamestrings[itemOn], SAVESTRINGSIZE,
-                   "%s (%s)", maplumpinfo->name,
-                   wadname);
-        free(wadname);
-    }
-    M_ForceUppercase(savegamestrings[itemOn]);
-    joypadSave = false;
-}
-
-//
-// User wants to save. Start string input for M_Responder
-//
-void M_SaveSelect(int choice)
-{
-    int x, y;
-
-    // we are going to be intercepting all chars
-    saveStringEnter = 1;
-
-    // We need to turn on text input:
-    x = LoadDef.x - 11;
-    y = LoadDef.y + choice * LINEHEIGHT - 4;
-    I_StartTextInput(x, y, x + 8 + 24 * 8 + 8, y + LINEHEIGHT - 2);
-
-    saveSlot = choice;
-    M_StringCopy(saveOldString,savegamestrings[choice], SAVESTRINGSIZE);
-    if (!strcmp(savegamestrings[choice], EMPTYSTRING))
-    {
-        savegamestrings[choice][0] = 0;
-
-        if (joypadSave)
-        {
-            SetDefaultSaveName(choice);
-        }
-    }
-    saveCharIndex = strlen(savegamestrings[choice]);
-}
-
-//
-// Selected from DOOM menu
-//
-void M_SaveGame (int choice)
-{
-    if (!usergame)
-    {
-	M_StartMessage(DEH_String(SAVEDEAD),NULL,false);
-	return;
-    }
-	
-    if (gamestate != GS_LEVEL)
-	return;
-	
-    M_SetupNextMenu(&SaveDef);
-    M_ReadSaveStrings();
-}
-
-
-
-//
-//      M_QuickSave
-//
-static char tempstring[90];
-
-void M_QuickSaveResponse(int key)
-{
-    if (key == key_menu_confirm)
-    {
-	M_DoSave(quickSaveSlot);
-	S_StartSound(NULL,sfx_swtchx);
-    }
-}
-
-void M_QuickSave(void)
-{
-    if (!usergame)
-    {
-	S_StartSound(NULL,sfx_oof);
-	return;
-    }
-
-    if (gamestate != GS_LEVEL)
-	return;
-	
-    if (quickSaveSlot < 0)
-    {
-	M_StartControlPanel();
-	M_ReadSaveStrings();
-	M_SetupNextMenu(&SaveDef);
-	quickSaveSlot = -2;	// means to pick a slot now
-	return;
-    }
-    DEH_snprintf(tempstring, sizeof(tempstring),
-                 QSPROMPT, savegamestrings[quickSaveSlot]);
-    M_StartMessage(tempstring, M_QuickSaveResponse, true);
-}
-
-
-
-//
-// M_QuickLoad
-//
-void M_QuickLoadResponse(int key)
-{
-    if (key == key_menu_confirm)
-    {
-	M_LoadSelect(quickSaveSlot);
-	S_StartSound(NULL,sfx_swtchx);
-    }
-}
-
-
-void M_QuickLoad(void)
-{
-    if (netgame)
-    {
-	M_StartMessage(DEH_String(QLOADNET),NULL,false);
-	return;
-    }
-	
-    if (quickSaveSlot < 0)
-    {
-	M_StartMessage(DEH_String(QSAVESPOT),NULL,false);
-	return;
-    }
-    DEH_snprintf(tempstring, sizeof(tempstring),
-                 QLPROMPT, savegamestrings[quickSaveSlot]);
-    M_StartMessage(tempstring, M_QuickLoadResponse, true);
-}
-
-
-
-
-//
-// Read This Menus
-// Had a "quick hack to fix romero bug"
-//
-void M_DrawReadThis1(void)
-{
-    inhelpscreens = true;
-
-    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP2"), PU_CACHE));
-}
-
-
-
-//
-// Read This Menus - optional second page.
-//
-void M_DrawReadThis2(void)
-{
-    inhelpscreens = true;
-
-    // We only ever draw the second page if this is 
-    // gameversion == exe_doom_1_9 and gamemode == registered
-
-    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE));
-}
-
-void M_DrawReadThisCommercial(void)
-{
-    inhelpscreens = true;
-
-    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP"), PU_CACHE));
-}
-
-
-//
-// Change Sfx & Music volumes
-//
-void M_DrawSound(void)
-{
-    V_DrawPatchDirect (60, 38, W_CacheLumpName(DEH_String("M_SVOL"), PU_CACHE));
-
-    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_vol+1),
-		 16,sfxVolume);
-
-    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(music_vol+1),
-		 16,musicVolume);
-}
-
-void M_Sound(int choice)
-{
-    M_SetupNextMenu(&SoundDef);
-}
-
-void M_SfxVol(int choice)
-{
-    switch(choice)
-    {
-      case 0:
-	if (sfxVolume)
-	    sfxVolume--;
-	break;
-      case 1:
-	if (sfxVolume < 15)
-	    sfxVolume++;
-	break;
-    }
-	
-    S_SetSfxVolume(sfxVolume * 8);
-}
-
-void M_MusicVol(int choice)
-{
-    switch(choice)
-    {
-      case 0:
-	if (musicVolume)
-	    musicVolume--;
-	break;
-      case 1:
-	if (musicVolume < 15)
-	    musicVolume++;
-	break;
-    }
-	
-    S_SetMusicVolume(musicVolume * 8);
-}
-
-
-
-
-//
-// M_DrawMainMenu
-//
-void M_DrawMainMenu(void)
-{
-    V_DrawPatchDirect(94, 2,
-                      W_CacheLumpName(DEH_String("M_DOOM"), PU_CACHE));
-}
-
-
-
-
-//
-// M_NewGame
-//
-void M_DrawNewGame(void)
-{
-    V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NEWG"), PU_CACHE));
-    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_SKILL"), PU_CACHE));
-}
-
-void M_NewGame(int choice)
-{
-    if (netgame && !demoplayback)
-    {
-	M_StartMessage(DEH_String(NEWGAME),NULL,false);
-	return;
-    }
-	
-    // Chex Quest disabled the episode select screen, as did Doom II.
-
-    if (gamemode == commercial || gameversion == exe_chex)
-	M_SetupNextMenu(&NewDef);
-    else
-	M_SetupNextMenu(&EpiDef);
-}
-
-
-//
-//      M_Episode
-//
-int     epi;
-
-void M_DrawEpisode(void)
-{
-    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_EPISOD"), PU_CACHE));
-}
-
-void M_VerifyNightmare(int key)
-{
-    if (key != key_menu_confirm)
-	return;
-		
-    G_DeferedInitNew(nightmare,epi+1,1);
-    M_ClearMenus ();
-}
-
-void M_ChooseSkill(int choice)
-{
-    if (choice == nightmare)
-    {
-	M_StartMessage(DEH_String(NIGHTMARE),M_VerifyNightmare,true);
-	return;
-    }
-	
-    G_DeferedInitNew(choice,epi+1,1);
-    M_ClearMenus ();
-}
-
-void M_Episode(int choice)
-{
-    if ( (gamemode == shareware)
-	 && choice)
-    {
-	M_StartMessage(DEH_String(SWSTRING),NULL,false);
-	M_SetupNextMenu(&ReadDef1);
-	return;
-    }
-
-    epi = choice;
-    M_SetupNextMenu(&NewDef);
-}
-
-
-
-//
-// M_Options
-//
-static const char *detailNames[2] = {"M_GDHIGH","M_GDLOW"};
-static const char *msgNames[2] = {"M_MSGOFF","M_MSGON"};
-
-void M_DrawOptions(void)
-{
-    V_DrawPatchDirect(108, 15, W_CacheLumpName(DEH_String("M_OPTTTL"),
-                                               PU_CACHE));
-	
-    V_DrawPatchDirect(OptionsDef.x + 175, OptionsDef.y + LINEHEIGHT * detail,
-		      W_CacheLumpName(DEH_String(detailNames[detailLevel]),
-			              PU_CACHE));
-
-    V_DrawPatchDirect(OptionsDef.x + 120, OptionsDef.y + LINEHEIGHT * messages,
-                      W_CacheLumpName(DEH_String(msgNames[showMessages]),
-                                      PU_CACHE));
-
-    M_DrawThermo(OptionsDef.x, OptionsDef.y + LINEHEIGHT * (mousesens + 1),
-		 10, mouseSensitivity);
-
-    M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(scrnsize+1),
-		 9,screenSize);
-}
-
-void M_Options(int choice)
-{
-    M_SetupNextMenu(&OptionsDef);
-}
-
-
-
-//
-//      Toggle messages on/off
-//
-void M_ChangeMessages(int choice)
-{
-    // warning: unused parameter `int choice'
-    choice = 0;
-    showMessages = 1 - showMessages;
-	
-    if (!showMessages)
-	players[consoleplayer].message = DEH_String(MSGOFF);
-    else
-	players[consoleplayer].message = DEH_String(MSGON);
-
-    message_dontfuckwithme = true;
-}
-
-
-//
-// M_EndGame
-//
-void M_EndGameResponse(int key)
-{
-    if (key != key_menu_confirm)
-	return;
-		
-    currentMenu->lastOn = itemOn;
-    M_ClearMenus ();
-    D_StartTitle ();
-}
-
-void M_EndGame(int choice)
-{
-    choice = 0;
-    if (!usergame)
-    {
-	S_StartSound(NULL,sfx_oof);
-	return;
-    }
-	
-    if (netgame)
-    {
-	M_StartMessage(DEH_String(NETEND),NULL,false);
-	return;
-    }
-	
-    M_StartMessage(DEH_String(ENDGAME),M_EndGameResponse,true);
-}
-
-
-
-
-//
-// M_ReadThis
-//
-void M_ReadThis(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&ReadDef1);
-}
-
-void M_ReadThis2(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&ReadDef2);
-}
-
-void M_FinishReadThis(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&MainDef);
-}
-
-
-
-
-//
-// M_QuitDOOM
-//
-int     quitsounds[8] =
-{
-    sfx_pldeth,
-    sfx_dmpain,
-    sfx_popain,
-    sfx_slop,
-    sfx_telept,
-    sfx_posit1,
-    sfx_posit3,
-    sfx_sgtatk
+    "M_MSGOFF",
+    "M_MSGON",
 };
 
-int     quitsounds2[8] =
+/* current menudef */
+
+static menu_t *g_current_menu;
+
+static menuitem_t g_main_menu[] =
 {
-    sfx_vilact,
-    sfx_getpow,
-    sfx_boscub,
-    sfx_slop,
-    sfx_skeswg,
-    sfx_kntdth,
-    sfx_bspact,
-    sfx_sgtatk
+  {1, "M_NGAME", m_new_game, 'n'},
+  {1, "M_OPTION", m_options, 'o'},
+  {1, "M_LOADG", m_load_game, 'l'},
+  {1, "M_SAVEG", m_save_game, 's'},
+  {1, "M_RDTHIS", m_read_this, 'r'}, /* Another hiccup with Special edition. */
+  {1, "M_QUITG", m_quit_doom, 'q'},
 };
 
-
-
-void M_QuitResponse(int key)
+static menu_t g_main_def =
+{
+    MAIN_END, NULL, g_main_menu, m_drawmain_menu, 97, 64, 0,
+};
+
+static menuitem_t g_episode_menu[] =
+{
+    {1, "M_EPI1", m_episode, 'k'},
+    {1, "M_EPI2", m_episode, 't'},
+    {1, "M_EPI3", m_episode, 'i'},
+    {1, "M_EPI4", m_episode, 't'},
+};
+
+static menu_t g_epi_def =
+{
+    EPISODE_END,    /* # of menu items */
+    &g_main_def,    /* previous menu */
+    g_episode_menu, /* menuitem_t -> */
+    m_draw_episode, /* drawing routine -> */
+    48,
+    63,         /* x,y */
+    EPISODE_EP1 /* lastOn */
+};
+
+static menuitem_t new_game_menu[] =
+{
+  {1, "M_JKILL", m_choose_skill, 'i'},
+  {1, "M_ROUGH", m_choose_skill, 'h'},
+  {1, "M_HURT", m_choose_skill, 'h'},
+  {1, "M_ULTRA", m_choose_skill, 'u'},
+  {1, "M_NMARE", m_choose_skill, 'n'},
+};
+
+static menu_t g_new_def =
+{
+    NEWGAME_END,     /* # of menu items */
+    &g_epi_def,      /* previous menu */
+    new_game_menu,   /* menuitem_t -> */
+    m_draw_new_game, /* drawing routine -> */
+    48,
+    63,            /* x,y */
+    NEWGAME_HURTME /* lastOn */
+};
+
+static menuitem_t g_options_menu[] =
 {
-    if (key != key_menu_confirm)
-	return;
-    if (!netgame)
     {
-	if (gamemode == commercial)
-	    S_StartSound(NULL,quitsounds2[(gametic>>2)&7]);
-	else
-	    S_StartSound(NULL,quitsounds[(gametic>>2)&7]);
-	I_WaitVBL(105);
+        1,
+        "M_ENDGAM",
+        m_end_game,
+        'e',
+    },
+    {
+        1,
+        "M_MESSG",
+        m_change_messages,
+        'm',
+    },
+    {
+        1,
+        "M_DETAIL",
+        m_change_detail,
+        'g',
+    },
+    {
+        2,
+        "M_SCRNSZ",
+        m_size_display,
+        's',
+    },
+    {
+        -1,
+        "",
+        0,
+        '\0',
+    },
+    {
+        2,
+        "M_MSENS",
+        m_change_sensitivity,
+        'm',
+    },
+    {
+        -1,
+        "",
+        0,
+        '\0',
+    },
+    {
+        1,
+        "M_SVOL",
+        m_sound,
+        's',
+    },
+};
+
+static menu_t g_options_def =
+{
+    OPT_END, &g_main_def, g_options_menu, m_draw_options, 60, 37, 0,
+};
+
+/* Read This! MENU 1 & 2 */
+
+static menuitem_t g_read_menu1[] =
+{
+    {1, "", m_read_this2, 0},
+};
+
+static menu_t g_read_def1 =
+{
+    READ1_END, &g_main_def, g_read_menu1, m_draw_read_this1, 280, 185, 0,
+};
+
+static menuitem_t g_read_menu2[] =
+{
+    {1, "", m_finish_read_this, 0},
+};
+
+static menu_t g_read_def2 =
+{
+    READ2_END, &g_read_def1, g_read_menu2, m_draw_read_this2, 330, 175, 0,
+};
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+static menuitem_t g_sound_menu[] =
+{
+    {
+        2,
+        "M_SFXVOL",
+        m_sfx_vol,
+        's',
+    },
+    {
+        -1,
+        "",
+        0,
+        '\0',
+    },
+    {
+        2,
+        "M_MUSVOL",
+        m_music_vol,
+        'm',
+    },
+    {
+        -1,
+        "",
+        0,
+        '\0',
+    },
+};
+
+static menu_t g_sound_def =
+{
+    SOUND_END, &g_options_def, g_sound_menu, m_draw_sound, 80, 64, 0,
+};
+#endif
+
+static menuitem_t g_load_menu[] =
+{
+  {1, "", m_load_select, '1'},
+  {1, "", m_load_select, '2'},
+  {1, "", m_load_select, '3'},
+  {1, "", m_load_select, '4'},
+  {1, "", m_load_select, '5'},
+  {1, "", m_load_select, '6'},
+};
+
+static menu_t g_load_def =
+{
+  LOAD_END, &g_main_def, g_load_menu, m_draw_load, 80, 54, 0,
+};
+
+/* SAVE GAME MENU */
+
+static menuitem_t g_save_menu[] =
+{
+  {1, "", m_save_select, '1'},
+  {1, "", m_save_select, '2'},
+  {1, "", m_save_select, '3'},
+  {1, "", m_save_select, '4'},
+  {1, "", m_save_select, '5'},
+  {1, "", m_save_select, '6'},
+};
+
+static menu_t g_save_def =
+{
+    LOAD_END, &g_main_def, g_save_menu, m_draw_save, 80, 54, 0,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Generate a default save slot name when the user saves to
+ * an empty slot via the joypad.
+ */
+
+static void set_default_save_name(int slot)
+{
+  /* map from IWAD or PWAD? */
+
+  if (w_is_iwad_lump(maplumpinfo) && strcmp(savegamedir, ""))
+    {
+      snprintf(g_save_game_strings[g_item_on], SAVESTRINGSIZE, "%s",
+               maplumpinfo->name);
     }
-    I_Quit ();
-}
-
-
-static const char *M_SelectEndMessage(void)
-{
-    const char **endmsg;
-
-    if (logical_gamemission == doom)
+  else
     {
-        // Doom 1
+      char *wadname = m_string_duplicate(w_wad_name_for_lump(maplumpinfo));
+      char *ext = strrchr(wadname, '.');
 
-        endmsg = doom1_endmsg;
-    }
-    else
-    {
-        // Doom 2
-        
-        endmsg = doom2_endmsg;
-    }
-
-    return endmsg[gametic % NUM_QUITMESSAGES];
-}
-
-
-void M_QuitDOOM(int choice)
-{
-    DEH_snprintf(endstring, sizeof(endstring), "%s\n\n" DOSY,
-                 DEH_String(M_SelectEndMessage()));
-
-    M_StartMessage(endstring,M_QuitResponse,true);
-}
-
-
-
-
-void M_ChangeSensitivity(int choice)
-{
-    switch(choice)
-    {
-      case 0:
-	if (mouseSensitivity)
-	    mouseSensitivity--;
-	break;
-      case 1:
-	if (mouseSensitivity < 9)
-	    mouseSensitivity++;
-	break;
-    }
-}
-
-
-
-
-void M_ChangeDetail(int choice)
-{
-    choice = 0;
-    detailLevel = 1 - detailLevel;
-
-    R_SetViewSize (screenblocks, detailLevel);
-
-    if (!detailLevel)
-	players[consoleplayer].message = DEH_String(DETAILHI);
-    else
-	players[consoleplayer].message = DEH_String(DETAILLO);
-}
-
-
-
-
-void M_SizeDisplay(int choice)
-{
-    switch(choice)
-    {
-      case 0:
-	if (screenSize > 0)
-	{
-	    screenblocks--;
-	    screenSize--;
-	}
-	break;
-      case 1:
-	if (screenSize < 8)
-	{
-	    screenblocks++;
-	    screenSize++;
-	}
-	break;
-    }
-	
-
-    R_SetViewSize (screenblocks, detailLevel);
-}
-
-
-
-
-//
-//      Menu Functions
-//
-void
-M_DrawThermo
-( int	x,
-  int	y,
-  int	thermWidth,
-  int	thermDot )
-{
-    int		xx;
-    int		i;
-
-    xx = x;
-    V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERML"), PU_CACHE));
-    xx += 8;
-    for (i=0;i<thermWidth;i++)
-    {
-	V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERMM"), PU_CACHE));
-	xx += 8;
-    }
-    V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERMR"), PU_CACHE));
-
-    V_DrawPatchDirect((x + 8) + thermDot * 8, y,
-		      W_CacheLumpName(DEH_String("M_THERMO"), PU_CACHE));
-}
-
-
-void
-M_StartMessage
-( const char	*string,
-  void*		routine,
-  boolean	input )
-{
-    messageLastMenuActive = menuactive;
-    messageToPrint = 1;
-    messageString = string;
-    messageRoutine = routine;
-    messageNeedsInput = input;
-    menuactive = true;
-    return;
-}
-
-
-//
-// Find string width from hu_font chars
-//
-int M_StringWidth(const char *string)
-{
-    size_t             i;
-    int             w = 0;
-    int             c;
-	
-    for (i = 0;i < strlen(string);i++)
-    {
-	c = toupper(string[i]) - HU_FONTSTART;
-	if (c < 0 || c >= HU_FONTSIZE)
-	    w += 4;
-	else
-	    w += SHORT (hu_font[c]->width);
-    }
-		
-    return w;
-}
-
-
-
-//
-//      Find string height from hu_font chars
-//
-int M_StringHeight(const char* string)
-{
-    size_t             i;
-    int             h;
-    int             height = SHORT(hu_font[0]->height);
-	
-    h = height;
-    for (i = 0;i < strlen(string);i++)
-	if (string[i] == '\n')
-	    h += height;
-		
-    return h;
-}
-
-
-//
-//      Write a string using the hu_font
-//
-void
-M_WriteText
-( int		x,
-  int		y,
-  const char *string)
-{
-    int		w;
-    const char *ch;
-    int		c;
-    int		cx;
-    int		cy;
-		
-
-    ch = string;
-    cx = x;
-    cy = y;
-	
-    while(1)
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	if (c == '\n')
-	{
-	    cx = x;
-	    cy += 12;
-	    continue;
-	}
-		
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c>= HU_FONTSIZE)
-	{
-	    cx += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	if (cx+w > SCREENWIDTH)
-	    break;
-	V_DrawPatchDirect(cx, cy, hu_font[c]);
-	cx+=w;
-    }
-}
-
-// These keys evaluate to a "null" key in Vanilla Doom that allows weird
-// jumping in the menus. Preserve this behavior for accuracy.
-
-static boolean IsNullKey(int key)
-{
-    return key == KEY_PAUSE || key == KEY_CAPSLOCK
-        || key == KEY_SCRLCK || key == KEY_NUMLOCK;
-}
-
-//
-// CONTROL PANEL
-//
-
-//
-// M_Responder
-//
-boolean M_Responder (event_t* ev)
-{
-    int             ch;
-    int             key;
-    int             i;
-    static  int     mousewait = 0;
-    static  int     mousey = 0;
-    static  int     lasty = 0;
-    static  int     mousex = 0;
-    static  int     lastx = 0;
-    int dir;
-
-    // In testcontrols mode, none of the function keys should do anything
-    // - the only key is escape to quit.
-
-    if (testcontrols)
-    {
-        if (ev->type == ev_quit
-         || (ev->type == ev_keydown
-          && (ev->data1 == key_menu_activate || ev->data1 == key_menu_quit)))
+      if (ext != NULL)
         {
-            I_Quit();
-            return true;
+          *ext = '\0';
         }
 
-        return false;
+      snprintf(g_save_game_strings[g_item_on], SAVESTRINGSIZE, "%s (%s)",
+               maplumpinfo->name, wadname);
+      free(wadname);
     }
 
-    // "close" button pressed on window?
-    if (ev->type == ev_quit)
+  m_force_uppercase(g_save_game_strings[g_item_on]);
+  g_joypad_save = false;
+}
+
+/* m_responder calls this when user is finished */
+
+static void m_do_save(int slot)
+{
+  g_save_game(slot, g_save_game_strings[slot]);
+  m_clear_menus();
+
+  /* PICK QUICKSAVE SLOT YET? */
+
+  if (g_quick_save_slot == -2) g_quick_save_slot = slot;
+}
+
+static void m_quick_save_response(int key)
+{
+  if (key == key_menu_confirm)
     {
-        // First click on close button = bring up quit confirm message.
-        // Second click on close button = confirm quit
+      m_do_save(g_quick_save_slot);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_SWTCHX);
+#endif
+    }
+}
 
-        if (menuactive && messageToPrint && messageRoutine == M_QuitResponse)
-        {
-            M_QuitResponse(key_menu_confirm);
-        }
-        else
-        {
-            S_StartSound(NULL,sfx_swtchn);
-            M_QuitDOOM(0);
-        }
+static void m_quick_load_response(int key)
+{
+  if (key == key_menu_confirm)
+    {
+      m_load_select(g_quick_save_slot);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_SWTCHX);
+#endif
+    }
+}
 
-        return true;
+/* These keys evaluate to a "null" key in Vanilla Doom that allows weird
+ * jumping in the menus. Preserve this behavior for accuracy.
+ */
+
+static boolean is_null_key(int key)
+{
+  return key == KEY_PAUSE || key == KEY_CAPSLOCK || key == KEY_SCRLCK ||
+         key == KEY_NUMLOCK;
+}
+
+static void m_start_message(const char *string, void *routine, boolean input)
+{
+  g_message_last_menu_active = g_menuactive;
+  g_message_to_print = 1;
+  g_message_string = string;
+  message_routine = routine;
+  g_message_needs_input = input;
+  g_menuactive = true;
+  return;
+}
+
+static const char *m_select_end_message(void)
+{
+  const char **endmsg;
+
+  if (logical_gamemission == doom)
+    {
+      /* Doom 1 */
+
+      endmsg = doom1_endmsg;
+    }
+  else
+    {
+      /* Doom 2 */
+
+      endmsg = doom2_endmsg;
     }
 
-    // key is the key pressed, ch is the actual character typed
-  
-    ch = 0;
-    key = -1;
-	
-    if (ev->type == ev_joystick)
+  return endmsg[gametic % NUM_QUITMESSAGES];
+}
+
+static void m_quit_response(int key)
+{
+  if (key != key_menu_confirm) return;
+  if (!netgame)
     {
-        // Simulate key presses from joystick events to interact with the menu.
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gamemode == commercial)
+        s_start_sound(NULL, g_quitsounds2[(gametic >> 2) & 7]);
+      else
+        s_start_sound(NULL, g_quitsounds[(gametic >> 2) & 7]);
+#endif
+      i_wait_vbl(105);
+    }
 
-        if (menuactive)
+  i_quit();
+}
+
+static void m_end_game_response(int key)
+{
+  if (key != key_menu_confirm) return;
+
+  g_current_menu->last_on = g_item_on;
+  m_clear_menus();
+  d_start_title();
+}
+
+static void m_draw_read_this_commercial(void)
+{
+  inhelpscreens = true;
+
+  v_draw_patch_direct(0, 0, w_cache_lump_name(("HELP"), PU_CACHE));
+}
+
+static void m_verify_nightmare(int key)
+{
+  if (key != key_menu_confirm) return;
+
+  g_deferred_init_new(NEWGAME_NIGHTMARE, g_epi + 1, 1);
+  m_clear_menus();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/*  read the strings from the savegame files */
+
+void m_read_save_strings(void)
+{
+  FILE *handle;
+  int i;
+  char name[256];
+
+  for (i = 0; i < LOAD_END; i++)
+    {
+      int retval;
+      m_str_copy(name, p_save_game_file(i), sizeof(name));
+
+      handle = fopen(name, "rb");
+      if (handle == NULL)
         {
-            if (JOY_GET_DPAD(ev->data6) != JOY_DIR_NONE)
+          m_str_copy(g_save_game_strings[i], EMPTYSTRING, SAVESTRINGSIZE);
+          g_load_menu[i].status = 0;
+          continue;
+        }
+
+      retval = fread(&g_save_game_strings[i], 1, SAVESTRINGSIZE, handle);
+      fclose(handle);
+      g_load_menu[i].status = retval == SAVESTRINGSIZE;
+    }
+}
+
+void m_draw_load(void)
+{
+  int i;
+
+  v_draw_patch_direct(72, 28, w_cache_lump_name(("M_LOADG"), PU_CACHE));
+
+  for (i = 0; i < LOAD_END; i++)
+    {
+      m_draw_save_load_border(g_load_def.x, g_load_def.y + LINEHEIGHT * i);
+      m_write_text(g_load_def.x, g_load_def.y + LINEHEIGHT * i,
+                   g_save_game_strings[i]);
+    }
+}
+
+/* Draw border for the savegame description */
+
+void m_draw_save_load_border(int x, int y)
+{
+  int i;
+
+  v_draw_patch_direct(x - 8, y + 7,
+                      w_cache_lump_name(("M_LSLEFT"), PU_CACHE));
+
+  for (i = 0; i < 24; i++)
+    {
+      v_draw_patch_direct(x, y + 7,
+                          w_cache_lump_name(("M_LSCNTR"), PU_CACHE));
+      x += 8;
+    }
+
+  v_draw_patch_direct(x, y + 7, w_cache_lump_name(("M_LSRGHT"), PU_CACHE));
+}
+
+/* User wants to load this game */
+
+void m_load_select(int choice)
+{
+  char name[256];
+
+  m_str_copy(name, p_save_game_file(choice), sizeof(name));
+
+  g_load_game(name);
+  m_clear_menus();
+}
+
+/* Selected from DOOM menu */
+
+void m_load_game(int choice)
+{
+  if (netgame)
+    {
+      m_start_message((LOADNET), NULL, false);
+      return;
+    }
+
+  m_setup_next_menu(&g_load_def);
+  m_read_save_strings();
+}
+
+/* M_SaveGame & Cie. */
+
+void m_draw_save(void)
+{
+  int i;
+
+  v_draw_patch_direct(72, 28, w_cache_lump_name(("M_SAVEG"), PU_CACHE));
+  for (i = 0; i < LOAD_END; i++)
+    {
+      m_draw_save_load_border(g_load_def.x, g_load_def.y + LINEHEIGHT * i);
+      m_write_text(g_load_def.x, g_load_def.y + LINEHEIGHT * i,
+                   g_save_game_strings[i]);
+    }
+
+  if (g_save_string_enter)
+    {
+      i = m_string_width(g_save_game_strings[g_save_slot]);
+      m_write_text(g_load_def.x + i,
+              g_load_def.y + LINEHEIGHT * g_save_slot, "_");
+    }
+}
+
+/* User wants to save. Start string input for m_responder */
+
+void m_save_select(int choice)
+{
+  int x;
+  int y;
+
+  /* we are going to be intercepting all chars */
+
+  g_save_string_enter = 1;
+
+  /* We need to turn on text input: */
+
+  x = g_load_def.x - 11;
+  y = g_load_def.y + choice * LINEHEIGHT - 4;
+  i_start_text_input(x, y, x + 8 + 24 * 8 + 8, y + LINEHEIGHT - 2);
+
+  g_save_slot = choice;
+  m_str_copy(g_save_old_string, g_save_game_strings[choice], SAVESTRINGSIZE);
+  if (!strcmp(g_save_game_strings[choice], EMPTYSTRING))
+    {
+      g_save_game_strings[choice][0] = 0;
+
+      if (g_joypad_save)
+        {
+          set_default_save_name(choice);
+        }
+    }
+
+  g_save_char_index = strlen(g_save_game_strings[choice]);
+}
+
+/* Selected from DOOM menu */
+
+void m_save_game(int choice)
+{
+  if (!usergame)
+    {
+      m_start_message((SAVEDEAD), NULL, false);
+      return;
+    }
+
+  if (gamestate != GS_LEVEL) return;
+
+  m_setup_next_menu(&g_save_def);
+  m_read_save_strings();
+}
+
+void m_quick_save(void)
+{
+  if (!usergame)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_OOF);
+#endif
+      return;
+    }
+
+  if (gamestate != GS_LEVEL) return;
+
+  if (g_quick_save_slot < 0)
+    {
+      m_start_control_panel();
+      m_read_save_strings();
+      m_setup_next_menu(&g_save_def);
+      g_quick_save_slot = -2; /* means to pick a slot now */
+      return;
+    }
+
+  snprintf(g_tempstring, sizeof(g_tempstring), QSPROMPT,
+           g_save_game_strings[g_quick_save_slot]);
+  m_start_message(g_tempstring, m_quick_save_response, true);
+}
+
+void m_quick_load(void)
+{
+  if (netgame)
+    {
+      m_start_message((QLOADNET), NULL, false);
+      return;
+    }
+
+  if (g_quick_save_slot < 0)
+    {
+      m_start_message((QSAVESPOT), NULL, false);
+      return;
+    }
+
+  snprintf(g_tempstring, sizeof(g_tempstring), QLPROMPT,
+           g_save_game_strings[g_quick_save_slot]);
+  m_start_message(g_tempstring, m_quick_load_response, true);
+}
+
+/* Read This Menus
+ * Had a "quick hack to fix romero bug"
+ */
+
+void m_draw_read_this1(void)
+{
+  inhelpscreens = true;
+
+  v_draw_patch_direct(0, 0, w_cache_lump_name(("HELP2"), PU_CACHE));
+}
+
+/* Read This Menus - optional second page. */
+
+void m_draw_read_this2(void)
+{
+  inhelpscreens = true;
+
+  /* We only ever draw the second page if this is
+   * gameversion == exe_doom_1_9 and gamemode == registered
+   */
+
+  v_draw_patch_direct(0, 0, w_cache_lump_name(("HELP1"), PU_CACHE));
+}
+
+/* Change Sfx & Music volumes */
+
+void m_draw_sound(void)
+{
+  v_draw_patch_direct(60, 38, w_cache_lump_name(("M_SVOL"), PU_CACHE));
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  m_draw_thermo(g_sound_def.x,
+                g_sound_def.y + LINEHEIGHT * (SOUND_SFXVOL + 1), 16,
+                g_sfx_volume);
+
+  m_draw_thermo(g_sound_def.x,
+                g_sound_def.y + LINEHEIGHT * (SOUND_MUSICVOL + 1), 16,
+                g_music_volume);
+#endif
+}
+
+void m_sound(int choice)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  m_setup_next_menu(&g_sound_def);
+#endif
+}
+
+void m_sfx_vol(int choice)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  switch (choice)
+    {
+    case 0:
+      if (g_sfx_volume) g_sfx_volume--;
+      break;
+    case 1:
+      if (g_sfx_volume < 15) g_sfx_volume++;
+      break;
+    }
+
+  s_set_sfx_volume(g_sfx_volume * 8);
+#endif
+}
+
+void m_music_vol(int choice)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  switch (choice)
+    {
+    case 0:
+      if (g_music_volume) g_music_volume--;
+      break;
+    case 1:
+      if (g_music_volume < 15) g_music_volume++;
+      break;
+    }
+
+  s_set_music_volume(g_music_volume * 8);
+#endif
+}
+
+void m_drawmain_menu(void)
+{
+  v_draw_patch_direct(94, 2, w_cache_lump_name(("M_DOOM"), PU_CACHE));
+}
+
+void m_draw_new_game(void)
+{
+  v_draw_patch_direct(96, 14, w_cache_lump_name(("M_NEWG"), PU_CACHE));
+  v_draw_patch_direct(54, 38, w_cache_lump_name(("M_SKILL"), PU_CACHE));
+}
+
+void m_new_game(int choice)
+{
+  if (netgame && !demoplayback)
+    {
+      m_start_message((NEWGAME), NULL, false);
+      return;
+    }
+
+  /* Chex Quest disabled the episode select screen, as did Doom II. */
+
+  if (gamemode == commercial || gameversion == exe_chex)
+    m_setup_next_menu(&g_new_def);
+  else
+    m_setup_next_menu(&g_epi_def);
+}
+
+void m_draw_episode(void)
+{
+  v_draw_patch_direct(54, 38, w_cache_lump_name(("M_EPISOD"), PU_CACHE));
+}
+
+void m_choose_skill(int choice)
+{
+  if (choice == NEWGAME_NIGHTMARE)
+    {
+      m_start_message((NIGHTMARE), m_verify_nightmare, true);
+      return;
+    }
+
+  g_deferred_init_new(choice, g_epi + 1, 1);
+  m_clear_menus();
+}
+
+void m_episode(int choice)
+{
+  if ((gamemode == shareware) && choice)
+    {
+      m_start_message((SWSTRING), NULL, false);
+      m_setup_next_menu(&g_read_def1);
+      return;
+    }
+
+  g_epi = choice;
+  m_setup_next_menu(&g_new_def);
+}
+
+void m_draw_options(void)
+{
+  v_draw_patch_direct(108, 15, w_cache_lump_name(("M_OPTTTL"), PU_CACHE));
+
+  v_draw_patch_direct(
+      g_options_def.x + 175, g_options_def.y + LINEHEIGHT * OPT_DETAIL,
+      w_cache_lump_name((g_detail_names[g_detail_level]), PU_CACHE));
+
+  v_draw_patch_direct(
+      g_options_def.x + 120, g_options_def.y + LINEHEIGHT * OPT_MESSAGES,
+      w_cache_lump_name((g_msg_names[g_show_messages]), PU_CACHE));
+
+  m_draw_thermo(g_options_def.x,
+                g_options_def.y + LINEHEIGHT * (OPT_MOUSESENS + 1), 10,
+                g_mouse_sensitivity);
+
+  m_draw_thermo(g_options_def.x,
+                g_options_def.y + LINEHEIGHT * (OPT_SCRNSIZE + 1), 9,
+                g_screen_size);
+}
+
+void m_options(int choice)
+{
+  m_setup_next_menu(&g_options_def);
+}
+
+/* Toggle messages on/off */
+
+void m_change_messages(int choice)
+{
+  /* warning: unused parameter `int choice' */
+
+  choice = 0;
+  g_show_messages = 1 - g_show_messages;
+
+  if (!g_show_messages)
+    players[consoleplayer].message = (MSGOFF);
+  else
+    players[consoleplayer].message = (MSGON);
+
+  message_dontfuckwithme = true;
+}
+
+void m_end_game(int choice)
+{
+  choice = 0;
+  if (!usergame)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_OOF);
+#endif
+      return;
+    }
+
+  if (netgame)
+    {
+      m_start_message((NETEND), NULL, false);
+      return;
+    }
+
+  m_start_message((ENDGAME), m_end_game_response, true);
+}
+
+void m_read_this(int choice)
+{
+  choice = 0;
+  m_setup_next_menu(&g_read_def1);
+}
+
+void m_read_this2(int choice)
+{
+  choice = 0;
+  m_setup_next_menu(&g_read_def2);
+}
+
+void m_finish_read_this(int choice)
+{
+  choice = 0;
+  m_setup_next_menu(&g_main_def);
+}
+
+void m_quit_doom(int choice)
+{
+  snprintf(g_endstring, sizeof(g_endstring), "%s\n\n" DOSY,
+           (m_select_end_message()));
+
+  m_start_message(g_endstring, m_quit_response, true);
+}
+
+void m_change_sensitivity(int choice)
+{
+  switch (choice)
+    {
+    case 0:
+      if (g_mouse_sensitivity) g_mouse_sensitivity--;
+      break;
+    case 1:
+      if (g_mouse_sensitivity < 9) g_mouse_sensitivity++;
+      break;
+    }
+}
+
+void m_change_detail(int choice)
+{
+  choice = 0;
+  g_detail_level = 1 - g_detail_level;
+
+  r_set_view_size(screenblocks, g_detail_level);
+
+  if (!g_detail_level)
+    players[consoleplayer].message = (DETAILHI);
+  else
+    players[consoleplayer].message = (DETAILLO);
+}
+
+void m_size_display(int choice)
+{
+  switch (choice)
+    {
+    case 0:
+      if (g_screen_size > 0)
+        {
+          screenblocks--;
+          g_screen_size--;
+        }
+      break;
+    case 1:
+      if (g_screen_size < 8)
+        {
+          screenblocks++;
+          g_screen_size++;
+        }
+      break;
+    }
+
+  r_set_view_size(screenblocks, g_detail_level);
+}
+
+/* Menu Functions */
+
+void m_draw_thermo(int x, int y, int therm_width, int therm_dot)
+{
+  int xx;
+  int i;
+
+  xx = x;
+  v_draw_patch_direct(xx, y, w_cache_lump_name(("M_THERML"), PU_CACHE));
+  xx += 8;
+  for (i = 0; i < therm_width; i++)
+    {
+      v_draw_patch_direct(xx, y, w_cache_lump_name(("M_THERMM"), PU_CACHE));
+      xx += 8;
+    }
+
+  v_draw_patch_direct(xx, y, w_cache_lump_name(("M_THERMR"), PU_CACHE));
+
+  v_draw_patch_direct((x + 8) + therm_dot * 8, y,
+                      w_cache_lump_name(("M_THERMO"), PU_CACHE));
+}
+
+/* Find string width from hu_font chars */
+
+int m_string_width(const char *string)
+{
+  size_t i;
+  int w = 0;
+  int c;
+
+  for (i = 0; i < strlen(string); i++)
+    {
+      c = toupper(string[i]) - HU_FONTSTART;
+      if (c < 0 || c >= HU_FONTSIZE)
+        w += 4;
+      else
+        w += SHORT(hu_font[c]->width);
+    }
+
+  return w;
+}
+
+/* Find string height from hu_font chars */
+
+int m_string_height(const char *string)
+{
+  size_t i;
+  int h;
+  int height = SHORT(hu_font[0]->height);
+
+  h = height;
+  for (i = 0; i < strlen(string); i++)
+    {
+      if (string[i] == '\n') h += height;
+    }
+
+  return h;
+}
+
+/* Write a string using the hu_font */
+
+void m_write_text(int x, int y, const char *string)
+{
+  int w;
+  const char *ch;
+  int c;
+  int cx;
+  int cy;
+
+  ch = string;
+  cx = x;
+  cy = y;
+
+  while (1)
+    {
+      c = *ch++;
+      if (!c) break;
+      if (c == '\n')
+        {
+          cx = x;
+          cy += 12;
+          continue;
+        }
+
+      c = toupper(c) - HU_FONTSTART;
+      if (c < 0 || c >= HU_FONTSIZE)
+        {
+          cx += 4;
+          continue;
+        }
+
+      w = SHORT(hu_font[c]->width);
+      if (cx + w > SCREENWIDTH) break;
+      v_draw_patch_direct(cx, cy, hu_font[c]);
+      cx += w;
+    }
+}
+
+/* CONTROL PANEL */
+
+boolean m_responder(event_t *ev)
+{
+  int ch;
+  int key;
+  int i;
+  static int mousewait = 0;
+  static int mousey = 0;
+  static int lasty = 0;
+  static int mousex = 0;
+  static int lastx = 0;
+  int dir;
+
+  /* In testcontrols mode, none of the function keys should do anything
+   * - the only key is escape to quit.
+   */
+
+  if (testcontrols)
+    {
+      if (ev->type == ev_quit ||
+          (ev->type == ev_keydown &&
+           (ev->data1 == key_menu_activate || ev->data1 == key_menu_quit)))
+        {
+          i_quit();
+          return true;
+        }
+
+      return false;
+    }
+
+  /* "close" button pressed on window? */
+
+  if (ev->type == ev_quit)
+    {
+      /* First click on close button = bring up quit confirm message.
+       * Second click on close button = confirm quit
+       */
+
+      if (g_menuactive && g_message_to_print &&
+          message_routine == m_quit_response)
+        {
+          m_quit_response(key_menu_confirm);
+        }
+      else
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_quit_doom(0);
+        }
+
+      return true;
+    }
+
+  /* key is the key pressed, ch is the actual character typed */
+
+  ch = 0;
+  key = -1;
+
+  if (ev->type == ev_joystick)
+    {
+      /* Simulate key presses from joystick events to interact with the menu.
+       */
+
+      if (g_menuactive)
+        {
+          if (JOY_GET_DPAD(ev->data6) != JOY_DIR_NONE)
             {
-                dir = JOY_GET_DPAD(ev->data6);
+              dir = JOY_GET_DPAD(ev->data6);
             }
-            else if (JOY_GET_LSTICK(ev->data6) != JOY_DIR_NONE)
+          else if (JOY_GET_LSTICK(ev->data6) != JOY_DIR_NONE)
             {
-                dir = JOY_GET_LSTICK(ev->data6);
+              dir = JOY_GET_LSTICK(ev->data6);
             }
-            else
+          else
             {
-                dir = JOY_GET_RSTICK(ev->data6);
+              dir = JOY_GET_RSTICK(ev->data6);
             }
 
-            if (dir & JOY_DIR_UP)
+          if (dir & JOY_DIR_UP)
             {
-                key = key_menu_up;
-                joywait = I_GetTime() + 5;
+              key = key_menu_up;
+              joywait = i_get_time() + 5;
             }
-            else if (dir & JOY_DIR_DOWN)
+          else if (dir & JOY_DIR_DOWN)
             {
-                key = key_menu_down;
-                joywait = I_GetTime() + 5;
-            }
-            if (dir & JOY_DIR_LEFT)
-            {
-                key = key_menu_left;
-                joywait = I_GetTime() + 5;
-            }
-            else if (dir & JOY_DIR_RIGHT)
-            {
-                key = key_menu_right;
-                joywait = I_GetTime() + 5;
+              key = key_menu_down;
+              joywait = i_get_time() + 5;
             }
 
-#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
-#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (ev->data1 & (1 << (x))) != 0)
-
-            if (JOY_BUTTON_PRESSED(joybfire))
+          if (dir & JOY_DIR_LEFT)
             {
-                // Simulate a 'Y' keypress when Doom show a Y/N dialog with Fire button.
-                if (messageToPrint && messageNeedsInput)
+              key = key_menu_left;
+              joywait = i_get_time() + 5;
+            }
+          else if (dir & JOY_DIR_RIGHT)
+            {
+              key = key_menu_right;
+              joywait = i_get_time() + 5;
+            }
+
+          if (JOY_BUTTON_PRESSED(joybfire))
+            {
+              /* Simulate a 'Y' keypress when Doom show a Y/N dialog with
+               * Fire button.
+               */
+
+              if (g_message_to_print && g_message_needs_input)
                 {
-                    key = key_menu_confirm;
+                  key = key_menu_confirm;
                 }
-                // Simulate pressing "Enter" when we are supplying a save slot name
-                else if (saveStringEnter)
+
+              /* Simulate pressing "Enter" when we are supplying a save slot
+               * name
+               */
+
+              else if (g_save_string_enter)
                 {
-                    key = KEY_ENTER;
+                  key = KEY_ENTER;
                 }
-                else
+              else
                 {
-                    // if selecting a save slot via joypad, set a flag
-                    if (currentMenu == &SaveDef)
+                  /* if selecting a save slot via joypad, set a flag */
+
+                  if (g_current_menu == &g_save_def)
                     {
-                        joypadSave = true;
-                    }
-                    key = key_menu_forward;
-                }
-                joywait = I_GetTime() + 5;
-            }
-            if (JOY_BUTTON_PRESSED(joybuse))
-            {
-                // Simulate a 'N' keypress when Doom show a Y/N dialog with Use button.
-                if (messageToPrint && messageNeedsInput)
-                {
-                    key = key_menu_abort;
-                }
-                // If user was entering a save name, back out
-                else if (saveStringEnter)
-                {
-                    key = KEY_ESCAPE;
-                }
-                else
-                {
-                    key = key_menu_back;
-                }
-                joywait = I_GetTime() + 5;
-            }
-        }
-        if (JOY_BUTTON_PRESSED(joybmenu))
-        {
-            key = key_menu_activate;
-            joywait = I_GetTime() + 5;
-        }
-    }
-    else
-    {
-	if (ev->type == ev_mouse && mousewait < I_GetTime() && menuactive)
-	{
-	    mousey += ev->data3;
-	    if (mousey < lasty-30)
-	    {
-		key = key_menu_down;
-		mousewait = I_GetTime() + 5;
-		mousey = lasty -= 30;
-	    }
-	    else if (mousey > lasty+30)
-	    {
-		key = key_menu_up;
-		mousewait = I_GetTime() + 5;
-		mousey = lasty += 30;
-	    }
-		
-	    mousex += ev->data2;
-	    if (mousex < lastx-30)
-	    {
-		key = key_menu_left;
-		mousewait = I_GetTime() + 5;
-		mousex = lastx -= 30;
-	    }
-	    else if (mousex > lastx+30)
-	    {
-		key = key_menu_right;
-		mousewait = I_GetTime() + 5;
-		mousex = lastx += 30;
-	    }
-		
-	    if (ev->data1&1)
-	    {
-		key = key_menu_forward;
-		mousewait = I_GetTime() + 15;
-	    }
-			
-	    if (ev->data1&2)
-	    {
-		key = key_menu_back;
-		mousewait = I_GetTime() + 15;
-	    }
-	}
-	else
-	{
-	    if (ev->type == ev_keydown)
-	    {
-		key = ev->data1;
-		ch = ev->data2;
-	    }
-	}
-    }
-    
-    if (key == -1)
-	return false;
-
-    // Save Game string input
-    if (saveStringEnter)
-    {
-	switch(key)
-	{
-	  case KEY_BACKSPACE:
-	    if (saveCharIndex > 0)
-	    {
-		saveCharIndex--;
-		savegamestrings[saveSlot][saveCharIndex] = 0;
-	    }
-	    break;
-
-          case KEY_ESCAPE:
-            saveStringEnter = 0;
-            I_StopTextInput();
-            M_StringCopy(savegamestrings[saveSlot], saveOldString,
-                         SAVESTRINGSIZE);
-            break;
-
-	  case KEY_ENTER:
-	    saveStringEnter = 0;
-            I_StopTextInput();
-	    if (savegamestrings[saveSlot][0])
-		M_DoSave(saveSlot);
-	    break;
-
-	  default:
-            // Savegame name entry. This is complicated.
-            // Vanilla has a bug where the shift key is ignored when entering
-            // a savegame name. If vanilla_keyboard_mapping is on, we want
-            // to emulate this bug by using ev->data1. But if it's turned off,
-            // it implies the user doesn't care about Vanilla emulation:
-            // instead, use ev->data3 which gives the fully-translated and
-            // modified key input.
-
-            if (ev->type != ev_keydown)
-            {
-                break;
-            }
-            if (vanilla_keyboard_mapping)
-            {
-                ch = ev->data1;
-            }
-            else
-            {
-                ch = ev->data3;
-            }
-
-            ch = toupper(ch);
-
-            if (ch != ' '
-             && (ch - HU_FONTSTART < 0 || ch - HU_FONTSTART >= HU_FONTSIZE))
-            {
-                break;
-            }
-
-	    if (ch >= 32 && ch <= 127 &&
-		saveCharIndex < SAVESTRINGSIZE-1 &&
-		M_StringWidth(savegamestrings[saveSlot]) <
-		(SAVESTRINGSIZE-2)*8)
-	    {
-		savegamestrings[saveSlot][saveCharIndex++] = ch;
-		savegamestrings[saveSlot][saveCharIndex] = 0;
-	    }
-	    break;
-	}
-	return true;
-    }
-
-    // Take care of any messages that need input
-    if (messageToPrint)
-    {
-	if (messageNeedsInput)
-        {
-            if (key != ' ' && key != KEY_ESCAPE
-             && key != key_menu_confirm && key != key_menu_abort)
-            {
-                return false;
-            }
-	}
-
-	menuactive = messageLastMenuActive;
-	messageToPrint = 0;
-	if (messageRoutine)
-	    messageRoutine(key);
-
-	menuactive = false;
-	S_StartSound(NULL,sfx_swtchx);
-	return true;
-    }
-
-    if ((devparm && key == key_menu_help) ||
-        (key != 0 && key == key_menu_screenshot))
-    {
-	G_ScreenShot ();
-	return true;
-    }
-
-    // F-Keys
-    if (!menuactive)
-    {
-	if (key == key_menu_decscreen)      // Screen size down
-        {
-	    if (automapactive || chat_on)
-		return false;
-	    M_SizeDisplay(0);
-	    S_StartSound(NULL,sfx_stnmov);
-	    return true;
-	}
-        else if (key == key_menu_incscreen) // Screen size up
-        {
-	    if (automapactive || chat_on)
-		return false;
-	    M_SizeDisplay(1);
-	    S_StartSound(NULL,sfx_stnmov);
-	    return true;
-	}
-        else if (key == key_menu_help)     // Help key
-        {
-	    M_StartControlPanel ();
-
-	    if (gameversion >= exe_ultimate)
-	      currentMenu = &ReadDef2;
-	    else
-	      currentMenu = &ReadDef1;
-
-	    itemOn = 0;
-	    S_StartSound(NULL,sfx_swtchn);
-	    return true;
-	}
-        else if (key == key_menu_save)     // Save
-        {
-	    M_StartControlPanel();
-	    S_StartSound(NULL,sfx_swtchn);
-	    M_SaveGame(0);
-	    return true;
-        }
-        else if (key == key_menu_load)     // Load
-        {
-	    M_StartControlPanel();
-	    S_StartSound(NULL,sfx_swtchn);
-	    M_LoadGame(0);
-	    return true;
-        }
-        else if (key == key_menu_volume)   // Sound Volume
-        {
-	    M_StartControlPanel ();
-	    currentMenu = &SoundDef;
-	    itemOn = sfx_vol;
-	    S_StartSound(NULL,sfx_swtchn);
-	    return true;
-	}
-        else if (key == key_menu_detail)   // Detail toggle
-        {
-	    M_ChangeDetail(0);
-	    S_StartSound(NULL,sfx_swtchn);
-	    return true;
-        }
-        else if (key == key_menu_qsave)    // Quicksave
-        {
-	    S_StartSound(NULL,sfx_swtchn);
-	    M_QuickSave();
-	    return true;
-        }
-        else if (key == key_menu_endgame)  // End game
-        {
-	    S_StartSound(NULL,sfx_swtchn);
-	    M_EndGame(0);
-	    return true;
-        }
-        else if (key == key_menu_messages) // Toggle messages
-        {
-	    M_ChangeMessages(0);
-	    S_StartSound(NULL,sfx_swtchn);
-	    return true;
-        }
-        else if (key == key_menu_qload)    // Quickload
-        {
-	    S_StartSound(NULL,sfx_swtchn);
-	    M_QuickLoad();
-	    return true;
-        }
-        else if (key == key_menu_quit)     // Quit DOOM
-        {
-	    S_StartSound(NULL,sfx_swtchn);
-	    M_QuitDOOM(0);
-	    return true;
-        }
-        else if (key == key_menu_gamma)    // gamma toggle
-        {
-	    usegamma++;
-	    if (usegamma > 4)
-		usegamma = 0;
-	    players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
-            I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
-	    return true;
-	}
-    }
-
-    // Pop-up menu?
-    if (!menuactive)
-    {
-	if (key == key_menu_activate)
-	{
-	    M_StartControlPanel ();
-	    S_StartSound(NULL,sfx_swtchn);
-	    return true;
-	}
-	return false;
-    }
-
-    // Keys usable within menu
-
-    if (key == key_menu_down)
-    {
-        // Move down to next item
-
-        do
-	{
-	    if (itemOn+1 > currentMenu->numitems-1)
-		itemOn = 0;
-	    else itemOn++;
-	    S_StartSound(NULL,sfx_pstop);
-	} while(currentMenu->menuitems[itemOn].status==-1);
-
-	return true;
-    }
-    else if (key == key_menu_up)
-    {
-        // Move back up to previous item
-
-	do
-	{
-	    if (!itemOn)
-		itemOn = currentMenu->numitems-1;
-	    else itemOn--;
-	    S_StartSound(NULL,sfx_pstop);
-	} while(currentMenu->menuitems[itemOn].status==-1);
-
-	return true;
-    }
-    else if (key == key_menu_left)
-    {
-        // Slide slider left
-
-	if (currentMenu->menuitems[itemOn].routine &&
-	    currentMenu->menuitems[itemOn].status == 2)
-	{
-	    S_StartSound(NULL,sfx_stnmov);
-	    currentMenu->menuitems[itemOn].routine(0);
-	}
-	return true;
-    }
-    else if (key == key_menu_right)
-    {
-        // Slide slider right
-
-	if (currentMenu->menuitems[itemOn].routine &&
-	    currentMenu->menuitems[itemOn].status == 2)
-	{
-	    S_StartSound(NULL,sfx_stnmov);
-	    currentMenu->menuitems[itemOn].routine(1);
-	}
-	return true;
-    }
-    else if (key == key_menu_forward)
-    {
-        // Activate menu item
-
-	if (currentMenu->menuitems[itemOn].routine &&
-	    currentMenu->menuitems[itemOn].status)
-	{
-	    currentMenu->lastOn = itemOn;
-	    if (currentMenu->menuitems[itemOn].status == 2)
-	    {
-		currentMenu->menuitems[itemOn].routine(1);      // right arrow
-		S_StartSound(NULL,sfx_stnmov);
-	    }
-	    else
-	    {
-		currentMenu->menuitems[itemOn].routine(itemOn);
-		S_StartSound(NULL,sfx_pistol);
-	    }
-	}
-	return true;
-    }
-    else if (key == key_menu_activate)
-    {
-        // Deactivate menu
-
-	currentMenu->lastOn = itemOn;
-	M_ClearMenus ();
-	S_StartSound(NULL,sfx_swtchx);
-	return true;
-    }
-    else if (key == key_menu_back)
-    {
-        // Go back to previous menu
-
-	currentMenu->lastOn = itemOn;
-	if (currentMenu->prevMenu)
-	{
-	    currentMenu = currentMenu->prevMenu;
-	    itemOn = currentMenu->lastOn;
-	    S_StartSound(NULL,sfx_swtchn);
-	}
-	return true;
-    }
-
-    // Keyboard shortcut?
-    // Vanilla Doom has a weird behavior where it jumps to the scroll bars
-    // when the certain keys are pressed, so emulate this.
-
-    else if (ch != 0 || IsNullKey(key))
-    {
-	for (i = itemOn+1;i < currentMenu->numitems;i++)
-        {
-	    if (currentMenu->menuitems[i].alphaKey == ch)
-	    {
-		itemOn = i;
-		S_StartSound(NULL,sfx_pstop);
-		return true;
-	    }
-        }
-
-	for (i = 0;i <= itemOn;i++)
-        {
-	    if (currentMenu->menuitems[i].alphaKey == ch)
-	    {
-		itemOn = i;
-		S_StartSound(NULL,sfx_pstop);
-		return true;
-	    }
-        }
-    }
-
-    return false;
-}
-
-
-
-//
-// M_StartControlPanel
-//
-void M_StartControlPanel (void)
-{
-    // intro might call this repeatedly
-    if (menuactive)
-	return;
-    
-    menuactive = 1;
-    currentMenu = &MainDef;         // JDC
-    itemOn = currentMenu->lastOn;   // JDC
-}
-
-// Display OPL debug messages - hack for GENMIDI development.
-
-static void M_DrawOPLDev(void)
-{
-    char debug[1024];
-    char *curr, *p;
-    int line;
-
-    I_OPL_DevMessages(debug, sizeof(debug));
-    curr = debug;
-    line = 0;
-
-    for (;;)
-    {
-        p = strchr(curr, '\n');
-
-        if (p != NULL)
-        {
-            *p = '\0';
-        }
-
-        M_WriteText(0, line * 8, curr);
-        ++line;
-
-        if (p == NULL)
-        {
-            break;
-        }
-
-        curr = p + 1;
-    }
-}
-
-//
-// M_Drawer
-// Called after the view has been rendered,
-// but before it has been blitted.
-//
-void M_Drawer (void)
-{
-    static short	x;
-    static short	y;
-    unsigned int	i;
-    unsigned int	max;
-    char		string[80];
-    const char          *name;
-    int			start;
-
-    inhelpscreens = false;
-    
-    // Horiz. & Vertically center string and print it.
-    if (messageToPrint)
-    {
-	start = 0;
-	y = SCREENHEIGHT/2 - M_StringHeight(messageString) / 2;
-	while (messageString[start] != '\0')
-	{
-	    boolean foundnewline = false;
-
-            for (i = 0; messageString[start + i] != '\0'; i++)
-            {
-                if (messageString[start + i] == '\n')
-                {
-                    M_StringCopy(string, messageString + start,
-                                 sizeof(string));
-                    if (i < sizeof(string))
-                    {
-                        string[i] = '\0';
+                      g_joypad_save = true;
                     }
 
-                    foundnewline = true;
-                    start += i + 1;
-                    break;
+                  key = key_menu_forward;
+                }
+
+              joywait = i_get_time() + 5;
+            }
+
+          if (JOY_BUTTON_PRESSED(joybuse))
+            {
+              /* Simulate a 'N' keypress when Doom show a Y/N dialog with Use
+               * button.
+               */
+
+              if (g_message_to_print && g_message_needs_input)
+                {
+                  key = key_menu_abort;
+                }
+
+              /* If user was entering a save name, back out */
+
+              else if (g_save_string_enter)
+                {
+                  key = KEY_ESCAPE;
+                }
+              else
+                {
+                  key = key_menu_back;
+                }
+
+              joywait = i_get_time() + 5;
+            }
+        }
+
+      if (JOY_BUTTON_PRESSED(joybmenu))
+        {
+          key = key_menu_activate;
+          joywait = i_get_time() + 5;
+        }
+    }
+  else
+    {
+      if (ev->type == ev_mouse && mousewait < i_get_time() && g_menuactive)
+        {
+          mousey += ev->data3;
+          if (mousey < lasty - 30)
+            {
+              key = key_menu_down;
+              mousewait = i_get_time() + 5;
+              mousey = lasty -= 30;
+            }
+          else if (mousey > lasty + 30)
+            {
+              key = key_menu_up;
+              mousewait = i_get_time() + 5;
+              mousey = lasty += 30;
+            }
+
+          mousex += ev->data2;
+          if (mousex < lastx - 30)
+            {
+              key = key_menu_left;
+              mousewait = i_get_time() + 5;
+              mousex = lastx -= 30;
+            }
+          else if (mousex > lastx + 30)
+            {
+              key = key_menu_right;
+              mousewait = i_get_time() + 5;
+              mousex = lastx += 30;
+            }
+
+          if (ev->data1 & 1)
+            {
+              key = key_menu_forward;
+              mousewait = i_get_time() + 15;
+            }
+
+          if (ev->data1 & 2)
+            {
+              key = key_menu_back;
+              mousewait = i_get_time() + 15;
+            }
+        }
+      else
+        {
+          if (ev->type == ev_keydown)
+            {
+              key = ev->data1;
+              ch = ev->data2;
+            }
+        }
+    }
+
+  if (key == -1) return false;
+
+  /* Save Game string input */
+
+  if (g_save_string_enter)
+    {
+      switch (key)
+        {
+        case KEY_BACKSPACE:
+          if (g_save_char_index > 0)
+            {
+              g_save_char_index--;
+              g_save_game_strings[g_save_slot][g_save_char_index] = 0;
+            }
+          break;
+
+        case KEY_ESCAPE:
+          g_save_string_enter = 0;
+          i_stop_text_input();
+          m_str_copy(g_save_game_strings[g_save_slot], g_save_old_string,
+                     SAVESTRINGSIZE);
+          break;
+
+        case KEY_ENTER:
+          g_save_string_enter = 0;
+          i_stop_text_input();
+          if (g_save_game_strings[g_save_slot][0]) m_do_save(g_save_slot);
+          break;
+
+        default:
+          /* Savegame name entry. This is complicated.
+           * Vanilla has a bug where the shift key is ignored when entering
+           * a savegame name. If vanilla_keyboard_mapping is on, we want
+           * to emulate this bug by using ev->data1. But if it's turned off,
+           * it implies the user doesn't care about Vanilla emulation:
+           * instead, use ev->data3 which gives the fully-translated and
+           * modified key input.
+           */
+
+          if (ev->type != ev_keydown)
+            {
+              break;
+            }
+
+          if (vanilla_keyboard_mapping)
+            {
+              ch = ev->data1;
+            }
+          else
+            {
+              ch = ev->data3;
+            }
+
+          ch = toupper(ch);
+
+          if (ch != ' ' &&
+              (ch - HU_FONTSTART < 0 || ch - HU_FONTSTART >= HU_FONTSIZE))
+            {
+              break;
+            }
+
+          if (ch >= 32 && ch <= 127 &&
+              g_save_char_index < SAVESTRINGSIZE - 1 &&
+              m_string_width(g_save_game_strings[g_save_slot]) <
+                  (SAVESTRINGSIZE - 2) * 8)
+            {
+              g_save_game_strings[g_save_slot][g_save_char_index++] = ch;
+              g_save_game_strings[g_save_slot][g_save_char_index] = 0;
+            }
+
+          break;
+        }
+
+      return true;
+    }
+
+  /* Take care of any messages that need input */
+
+  if (g_message_to_print)
+    {
+      if (g_message_needs_input)
+        {
+          if (key != ' ' && key != KEY_ESCAPE && key != key_menu_confirm &&
+              key != key_menu_abort)
+            {
+              return false;
+            }
+        }
+
+      g_menuactive = g_message_last_menu_active;
+      g_message_to_print = 0;
+      if (message_routine) message_routine(key);
+
+      g_menuactive = false;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_SWTCHX);
+#endif
+      return true;
+    }
+
+  if ((devparm && key == key_menu_help) ||
+      (key != 0 && key == key_menu_screenshot))
+    {
+      g_screenshot();
+      return true;
+    }
+
+  /* F-Keys */
+
+  if (!g_menuactive)
+    {
+      if (key == key_menu_decscreen) /* Screen size down */
+        {
+          if (automapactive || chat_on) return false;
+          m_size_display(0);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_STNMOV);
+#endif
+          return true;
+        }
+      else if (key == key_menu_incscreen) /* Screen size up */
+        {
+          if (automapactive || chat_on) return false;
+          m_size_display(1);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_STNMOV);
+#endif
+          return true;
+        }
+      else if (key == key_menu_help) /* Help key */
+        {
+          m_start_control_panel();
+
+          if (gameversion >= exe_ultimate)
+            g_current_menu = &g_read_def2;
+          else
+            g_current_menu = &g_read_def1;
+
+          g_item_on = 0;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          return true;
+        }
+      else if (key == key_menu_save) /* Save */
+        {
+          m_start_control_panel();
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_save_game(0);
+          return true;
+        }
+      else if (key == key_menu_load) /* Load */
+        {
+          m_start_control_panel();
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_load_game(0);
+          return true;
+        }
+      else if (key == key_menu_volume) /* Sound Volume */
+        {
+          m_start_control_panel();
+          g_item_on = SOUND_SFXVOL;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          g_current_menu = &g_sound_def;
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          return true;
+        }
+      else if (key == key_menu_detail) /* Detail toggle */
+        {
+          m_change_detail(0);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          return true;
+        }
+      else if (key == key_menu_qsave) /* Quicksave */
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_quick_save();
+          return true;
+        }
+      else if (key == key_menu_endgame) /* End game */
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_end_game(0);
+          return true;
+        }
+      else if (key == key_menu_messages) /* Toggle messages */
+        {
+          m_change_messages(0);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          return true;
+        }
+      else if (key == key_menu_qload) /* Quickload */
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_quick_load();
+          return true;
+        }
+      else if (key == key_menu_quit) /* Quit DOOM */
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          m_quit_doom(0);
+          return true;
+        }
+      else if (key == key_menu_gamma) /* gamma toggle */
+        {
+          usegamma++;
+          if (usegamma > 4) usegamma = 0;
+          players[consoleplayer].message = (g_gammamsg[usegamma]);
+          i_set_palette(w_cache_lump_name(("PLAYPAL"), PU_CACHE));
+          return true;
+        }
+    }
+
+  /* Pop-up menu? */
+
+  if (!g_menuactive)
+    {
+      if (key == key_menu_activate)
+        {
+          m_start_control_panel();
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+          return true;
+        }
+
+      return false;
+    }
+
+  /* Keys usable within menu */
+
+  if (key == key_menu_down)
+    {
+      /* Move down to next item */
+
+      do
+        {
+          if (g_item_on + 1 > g_current_menu->numitems - 1)
+            g_item_on = 0;
+          else
+            g_item_on++;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_PSTOP);
+#endif
+        }
+      while (g_current_menu->menu_items[g_item_on].status == -1);
+
+      return true;
+    }
+  else if (key == key_menu_up)
+    {
+      /* Move back up to previous item */
+
+      do
+        {
+          if (!g_item_on)
+            g_item_on = g_current_menu->numitems - 1;
+          else
+            g_item_on--;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_PSTOP);
+#endif
+        }
+      while (g_current_menu->menu_items[g_item_on].status == -1);
+
+      return true;
+    }
+  else if (key == key_menu_left)
+    {
+      /* Slide slider left */
+
+      if (g_current_menu->menu_items[g_item_on].routine &&
+          g_current_menu->menu_items[g_item_on].status == 2)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_STNMOV);
+#endif
+          g_current_menu->menu_items[g_item_on].routine(0);
+        }
+
+      return true;
+    }
+  else if (key == key_menu_right)
+    {
+      /* Slide slider right */
+
+      if (g_current_menu->menu_items[g_item_on].routine &&
+          g_current_menu->menu_items[g_item_on].status == 2)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_STNMOV);
+#endif
+          g_current_menu->menu_items[g_item_on].routine(1);
+        }
+
+      return true;
+    }
+  else if (key == key_menu_forward)
+    {
+      /* Activate menu item */
+
+      if (g_current_menu->menu_items[g_item_on].routine &&
+          g_current_menu->menu_items[g_item_on].status)
+        {
+          g_current_menu->last_on = g_item_on;
+          if (g_current_menu->menu_items[g_item_on].status == 2)
+            {
+              g_current_menu->menu_items[g_item_on].routine(
+                  1); /* right arrow */
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(NULL, SFX_STNMOV);
+#endif
+            }
+          else
+            {
+              g_current_menu->menu_items[g_item_on].routine(g_item_on);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(NULL, SFX_PISTOL);
+#endif
+            }
+        }
+
+      return true;
+    }
+  else if (key == key_menu_activate)
+    {
+      /* Deactivate menu */
+
+      g_current_menu->last_on = g_item_on;
+      m_clear_menus();
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(NULL, SFX_SWTCHX);
+#endif
+      return true;
+    }
+  else if (key == key_menu_back)
+    {
+      /* Go back to previous menu */
+
+      g_current_menu->last_on = g_item_on;
+      if (g_current_menu->prev_menu)
+        {
+          g_current_menu = g_current_menu->prev_menu;
+          g_item_on = g_current_menu->last_on;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_SWTCHN);
+#endif
+        }
+
+      return true;
+    }
+
+  /* Keyboard shortcut?
+   * Vanilla Doom has a weird behavior where it jumps to the scroll bars
+   * when the certain keys are pressed, so emulate this.
+   */
+
+  else if (ch != 0 || is_null_key(key))
+    {
+      for (i = g_item_on + 1; i < g_current_menu->numitems; i++)
+        {
+          if (g_current_menu->menu_items[i].alpha_key == ch)
+            {
+              g_item_on = i;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(NULL, SFX_PSTOP);
+#endif
+              return true;
+            }
+        }
+
+      for (i = 0; i <= g_item_on; i++)
+        {
+          if (g_current_menu->menu_items[i].alpha_key == ch)
+            {
+              g_item_on = i;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(NULL, SFX_PSTOP);
+#endif
+              return true;
+            }
+        }
+    }
+
+  return false;
+}
+
+void m_start_control_panel(void)
+{
+  /* intro might call this repeatedly */
+
+  if (g_menuactive) return;
+
+  g_menuactive = 1;
+  g_current_menu = &g_main_def;        /* JDC */
+  g_item_on = g_current_menu->last_on; /* JDC */
+}
+
+/* Display OPL debug messages - hack for GENMIDI development. */
+
+#if 0
+static void m_draw_opl_dev(void)
+{
+  char debug[1024];
+  char *curr;
+  char *p;
+  int line;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  i_opl_dev_messages(debug, sizeof(debug));
+#endif
+  curr = debug;
+  line = 0;
+
+  for (; ; )
+    {
+      p = strchr(curr, '\n');
+
+      if (p != NULL)
+        {
+          *p = '\0';
+        }
+
+      m_write_text(0, line * 8, curr);
+      ++line;
+
+      if (p == NULL)
+        {
+          break;
+        }
+
+      curr = p + 1;
+    }
+}
+#endif
+
+/* m_drawer
+ * Called after the view has been rendered,
+ * but before it has been blitted.
+ */
+
+void m_drawer(void)
+{
+  static short x;
+  static short y;
+  unsigned int i;
+  unsigned int max;
+  char string[80];
+  const char *name;
+  int start;
+
+  inhelpscreens = false;
+
+  /* Horiz. & Vertically center string and print it. */
+
+  if (g_message_to_print)
+    {
+      start = 0;
+      y = SCREENHEIGHT / 2 - m_string_height(g_message_string) / 2;
+      while (g_message_string[start] != '\0')
+        {
+          boolean foundnewline = false;
+
+          for (i = 0; g_message_string[start + i] != '\0'; i++)
+            {
+              if (g_message_string[start + i] == '\n')
+                {
+                  m_str_copy(string, g_message_string + start,
+                             sizeof(string));
+                  if (i < sizeof(string))
+                    {
+                      string[i] = '\0';
+                    }
+
+                  foundnewline = true;
+                  start += i + 1;
+                  break;
                 }
             }
 
-            if (!foundnewline)
+          if (!foundnewline)
             {
-                M_StringCopy(string, messageString + start, sizeof(string));
-                start += strlen(string);
+              m_str_copy(string, g_message_string + start, sizeof(string));
+              start += strlen(string);
             }
 
-	    x = SCREENWIDTH/2 - M_StringWidth(string) / 2;
-	    M_WriteText(x, y, string);
-	    y += SHORT(hu_font[0]->height);
-	}
+          x = SCREENWIDTH / 2 - m_string_width(string) / 2;
+          m_write_text(x, y, string);
+          y += SHORT(hu_font[0]->height);
+        }
 
-	return;
+      return;
     }
 
-    if (opldev)
+  if (!g_menuactive) return;
+
+  if (g_current_menu->routine)
+    g_current_menu->routine(); /* call Draw routine */
+
+  /* DRAW MENU */
+
+  x = g_current_menu->x;
+  y = g_current_menu->y;
+  max = g_current_menu->numitems;
+
+  for (i = 0; i < max; i++)
     {
-        M_DrawOPLDev();
+      name = (g_current_menu->menu_items[i].name);
+
+      if (name[0] && w_check_num_for_name(name) > 0)
+        {
+          v_draw_patch_direct(x, y, w_cache_lump_name(name, PU_CACHE));
+        }
+
+      y += LINEHEIGHT;
     }
 
-    if (!menuactive)
-	return;
+  /* DRAW SKULL */
 
-    if (currentMenu->routine)
-	currentMenu->routine();         // call Draw routine
-    
-    // DRAW MENU
-    x = currentMenu->x;
-    y = currentMenu->y;
-    max = currentMenu->numitems;
-
-    for (i=0;i<max;i++)
-    {
-        name = DEH_String(currentMenu->menuitems[i].name);
-
-	if (name[0] && W_CheckNumForName(name) > 0)
-	{
-	    V_DrawPatchDirect (x, y, W_CacheLumpName(name, PU_CACHE));
-	}
-	y += LINEHEIGHT;
-    }
-
-    
-    // DRAW SKULL
-    V_DrawPatchDirect(x + SKULLXOFF, currentMenu->y - 5 + itemOn*LINEHEIGHT,
-		      W_CacheLumpName(DEH_String(skullName[whichSkull]),
-				      PU_CACHE));
+  v_draw_patch_direct(
+      x + SKULLXOFF, g_current_menu->y - 5 + g_item_on * LINEHEIGHT,
+      w_cache_lump_name((g_skull_name[g_which_skull]), PU_CACHE));
 }
 
-
-//
-// M_ClearMenus
-//
-void M_ClearMenus (void)
+void m_clear_menus(void)
 {
-    menuactive = 0;
-    // if (!netgame && usergame && paused)
-    //       sendpause = true;
+  g_menuactive = 0;
 }
 
-
-
-
-//
-// M_SetupNextMenu
-//
-void M_SetupNextMenu(menu_t *menudef)
+void m_setup_next_menu(menu_t *menudef)
 {
-    currentMenu = menudef;
-    itemOn = currentMenu->lastOn;
+  g_current_menu = menudef;
+  g_item_on = g_current_menu->last_on;
 }
 
-
-//
-// M_Ticker
-//
-void M_Ticker (void)
+void m_ticker(void)
 {
-    if (--skullAnimCounter <= 0)
+  if (--g_skull_anim_counter <= 0)
     {
-	whichSkull ^= 1;
-	skullAnimCounter = 8;
+      g_which_skull ^= 1;
+      g_skull_anim_counter = 8;
     }
 }
 
-
-//
-// M_Init
-//
-void M_Init (void)
+void m_init(void)
 {
-    currentMenu = &MainDef;
-    menuactive = 0;
-    itemOn = currentMenu->lastOn;
-    whichSkull = 0;
-    skullAnimCounter = 10;
-    screenSize = screenblocks - 3;
-    messageToPrint = 0;
-    messageString = NULL;
-    messageLastMenuActive = menuactive;
-    quickSaveSlot = -1;
+  g_current_menu = &g_main_def;
+  g_menuactive = 0;
+  g_item_on = g_current_menu->last_on;
+  g_which_skull = 0;
+  g_skull_anim_counter = 10;
+  g_screen_size = screenblocks - 3;
+  g_message_to_print = 0;
+  g_message_string = NULL;
+  g_message_last_menu_active = g_menuactive;
+  g_quick_save_slot = -1;
 
-    // Here we could catch other version dependencies,
-    //  like HELP1/2, and four episodes.
+  /* Here we could catch other version dependencies, like HELP1/2, and four
+   * episodes.
+   */
 
-    // The same hacks were used in the original Doom EXEs.
+  /* The same hacks were used in the original Doom EXEs. */
 
-    if (gameversion >= exe_ultimate)
+  if (gameversion >= exe_ultimate)
     {
-        MainMenu[readthis].routine = M_ReadThis2;
-        ReadDef2.prevMenu = NULL;
+      g_main_menu[MAIN_READTHIS].routine = m_read_this2;
+      g_read_def2.prev_menu = NULL;
     }
 
-    if (gameversion >= exe_final && gameversion <= exe_final2)
+  if (gameversion >= exe_final && gameversion <= exe_final2)
     {
-        ReadDef2.routine = M_DrawReadThisCommercial;
+      g_read_def2.routine = m_draw_read_this_commercial;
     }
 
-    if (gamemode == commercial)
+  if (gamemode == commercial)
     {
-        MainMenu[readthis] = MainMenu[quitdoom];
-        MainDef.numitems--;
-        MainDef.y += 8;
-        NewDef.prevMenu = &MainDef;
-        ReadDef1.routine = M_DrawReadThisCommercial;
-        ReadDef1.x = 330;
-        ReadDef1.y = 165;
-        ReadMenu1[rdthsempty1].routine = M_FinishReadThis;
+      g_main_menu[MAIN_READTHIS] = g_main_menu[MAIN_QUITDOOM];
+      g_main_def.numitems--;
+      g_main_def.y += 8;
+      g_new_def.prev_menu = &g_main_def;
+      g_read_def1.routine = m_draw_read_this_commercial;
+      g_read_def1.x = 330;
+      g_read_def1.y = 165;
+      g_read_menu1[RDTHSEMPTY1].routine = m_finish_read_this;
     }
 
-    // Versions of doom.exe before the Ultimate Doom release only had
-    // three episodes; if we're emulating one of those then don't try
-    // to show episode four. If we are, then do show episode four
-    // (should crash if missing).
-    if (gameversion < exe_ultimate)
+  /* Versions of doom.exe before the Ultimate Doom release only had
+   * three episodes; if we're emulating one of those then don't try
+   * to show episode four. If we are, then do show episode four
+   * (should crash if missing).
+   */
+
+  if (gameversion < exe_ultimate)
     {
-        EpiDef.numitems--;
-    }
-    // chex.exe shows only one episode.
-    else if (gameversion == exe_chex)
-    {
-        EpiDef.numitems = 1;
+      g_epi_def.numitems--;
     }
 
-    opldev = M_CheckParm("-opldev") > 0;
+  /* chex.exe shows only one episode. */
+
+  else if (gameversion == exe_chex)
+    {
+      g_epi_def.numitems = 1;
+    }
 }
-
diff --git a/games/NXDoom/src/doom/m_menu.h b/games/NXDoom/src/doom/m_menu.h
index 2c7867f12..545f3eb8a 100644
--- a/games/NXDoom/src/doom/m_menu.h
+++ b/games/NXDoom/src/doom/m_menu.h
@@ -1,62 +1,76 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Menu widget stuff, episode selection and such.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/m_menu.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Menu widget stuff, episode selection and such.
+ *
+ ****************************************************************************/
 
 #ifndef __M_MENU__
 #define __M_MENU__
 
-
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "d_event.h"
 
-//
-// MENUS
-//
-// Called by main loop,
-// saves config file and calls I_Quit when user exits.
-// Even when the menu is not displayed,
-// this can resize the view and change game parameters.
-// Does all the real work of the menu interaction.
-boolean M_Responder (event_t *ev);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-
-// Called by main loop,
-// only used for menu (skull cursor) animation.
-void M_Ticker (void);
-
-// Called by main loop,
-// draws the menus directly into the screen buffer.
-void M_Drawer (void);
-
-// Called by D_DoomMain,
-// loads the config file.
-void M_Init (void);
-
-// Called by intro code to force menu up upon a keypress,
-// does nothing if menu is already up.
-void M_StartControlPanel (void);
-
-
-extern int detailLevel;
+extern int g_detail_level;
 extern int screenblocks;
 
 extern boolean inhelpscreens;
-extern int showMessages;
+extern int g_show_messages;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* MENUS
+ *
+ * Called by main loop,
+ * saves config file and calls i_quit when user exits.
+ * Even when the menu is not displayed,
+ * this can resize the view and change game parameters.
+ * Does all the real work of the menu interaction.
+ */
+
+boolean m_responder(event_t *ev);
+
+/* Called by main loop, only used for menu (skull cursor) animation. */
+
+void m_ticker(void);
+
+/* Called by main loop, draws the menus directly into the screen buffer. */
+
+void m_drawer(void);
+
+/* Called by d_doom_main, loads the config file. */
+
+void m_init(void);
+
+/* Called by intro code to force menu up upon a keypress, does nothing if
+ * menu is already up.
+ */
+
+void m_start_control_panel(void);
+
+#endif /* __M_MENU__ */
diff --git a/games/NXDoom/src/doom/m_random.c b/games/NXDoom/src/doom/m_random.c
index b4f59b33f..1c846cc0c 100644
--- a/games/NXDoom/src/doom/m_random.c
+++ b/games/NXDoom/src/doom/m_random.c
@@ -1,72 +1,90 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Random number LUT.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/m_random.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Random number LUT.
+ *
+ ****************************************************************************/
 
-//
-// M_Random
-// Returns a 0-255 number
-//
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static const unsigned char rndtable[256] = {
-    0,   8, 109, 220, 222, 241, 149, 107,  75, 248, 254, 140,  16,  66 ,
-    74,  21, 211,  47,  80, 242, 154,  27, 205, 128, 161,  89,  77,  36 ,
-    95, 110,  85,  48, 212, 140, 211, 249,  22,  79, 200,  50,  28, 188 ,
-    52, 140, 202, 120,  68, 145,  62,  70, 184, 190,  91, 197, 152, 224 ,
-    149, 104,  25, 178, 252, 182, 202, 182, 141, 197,   4,  81, 181, 242 ,
-    145,  42,  39, 227, 156, 198, 225, 193, 219,  93, 122, 175, 249,   0 ,
-    175, 143,  70, 239,  46, 246, 163,  53, 163, 109, 168, 135,   2, 235 ,
-    25,  92,  20, 145, 138,  77,  69, 166,  78, 176, 173, 212, 166, 113 ,
-    94, 161,  41,  50, 239,  49, 111, 164,  70,  60,   2,  37, 171,  75 ,
-    136, 156,  11,  56,  42, 146, 138, 229,  73, 146,  77,  61,  98, 196 ,
-    135, 106,  63, 197, 195,  86,  96, 203, 113, 101, 170, 247, 181, 113 ,
-    80, 250, 108,   7, 255, 237, 129, 226,  79, 107, 112, 166, 103, 241 ,
-    24, 223, 239, 120, 198,  58,  60,  82, 128,   3, 184,  66, 143, 224 ,
-    145, 224,  81, 206, 163,  45,  63,  90, 168, 114,  59,  33, 159,  95 ,
-    28, 139, 123,  98, 125, 196,  15,  70, 194, 253,  54,  14, 109, 226 ,
-    71,  17, 161,  93, 186,  87, 244, 138,  20,  52, 123, 251,  26,  36 ,
-    17,  46,  52, 231, 232,  76,  31, 221,  84,  37, 216, 165, 212, 106 ,
-    197, 242,  98,  43,  39, 175, 254, 145, 190,  84, 118, 222, 187, 136 ,
-    120, 163, 236, 249
+/* m_random
+ * Returns a 0-255 number
+ */
+
+static const unsigned char rndtable[256] =
+{
+  0,   8,   109, 220, 222, 241, 149, 107, 75,  248, 254, 140, 16,  66,  74,
+  21,  211, 47,  80,  242, 154, 27,  205, 128, 161, 89,  77,  36,  95,  110,
+  85,  48,  212, 140, 211, 249, 22,  79,  200, 50,  28,  188, 52,  140, 202,
+  120, 68,  145, 62,  70,  184, 190, 91,  197, 152, 224, 149, 104, 25,  178,
+  252, 182, 202, 182, 141, 197, 4,   81,  181, 242, 145, 42,  39,  227, 156,
+  198, 225, 193, 219, 93,  122, 175, 249, 0,   175, 143, 70,  239, 46,  246,
+  163, 53,  163, 109, 168, 135, 2,   235, 25,  92,  20,  145, 138, 77,  69,
+  166, 78,  176, 173, 212, 166, 113, 94,  161, 41,  50,  239, 49,  111, 164,
+  70,  60,  2,   37,  171, 75,  136, 156, 11,  56,  42,  146, 138, 229, 73,
+  146, 77,  61,  98,  196, 135, 106, 63,  197, 195, 86,  96,  203, 113, 101,
+  170, 247, 181, 113, 80,  250, 108, 7,   255, 237, 129, 226, 79,  107, 112,
+  166, 103, 241, 24,  223, 239, 120, 198, 58,  60,  82,  128, 3,   184, 66,
+  143, 224, 145, 224, 81,  206, 163, 45,  63,  90,  168, 114, 59,  33,  159,
+  95,  28,  139, 123, 98,  125, 196, 15,  70,  194, 253, 54,  14,  109, 226,
+  71,  17,  161, 93,  186, 87,  244, 138, 20,  52,  123, 251, 26,  36,  17,
+  46,  52,  231, 232, 76,  31,  221, 84,  37,  216, 165, 212, 106, 197, 242,
+  98,  43,  39,  175, 254, 145, 190, 84,  118, 222, 187, 136, 120, 163, 236,
+  249,
 };
 
-int	rndindex = 0;
-int	prndindex = 0;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-// Which one is deterministic?
-int P_Random (void)
+int rndindex = 0;
+int prndindex = 0;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Which one is deterministic? */
+
+int p_random(void)
 {
-    prndindex = (prndindex+1)&0xff;
-    return rndtable[prndindex];
+  prndindex = (prndindex + 1) & 0xff;
+  return rndtable[prndindex];
 }
 
-int M_Random (void)
+int m_random(void)
 {
-    rndindex = (rndindex+1)&0xff;
-    return rndtable[rndindex];
+  rndindex = (rndindex + 1) & 0xff;
+  return rndtable[rndindex];
 }
 
-void M_ClearRandom (void)
+void m_clear_random(void)
 {
-    rndindex = prndindex = 0;
+  rndindex = prndindex = 0;
 }
 
-// inspired by the same routine in Eternity, thanks haleyjd
-int P_SubRandom (void)
+/* inspired by the same routine in Eternity, thanks haleyjd */
+
+int p_sub_random(void)
 {
-    int r = P_Random();
-    return r - P_Random();
+  int r = p_random();
+  return r - p_random();
 }
diff --git a/games/NXDoom/src/doom/m_random.h b/games/NXDoom/src/doom/m_random.h
index 902691f1d..f5f5cf74a 100644
--- a/games/NXDoom/src/doom/m_random.h
+++ b/games/NXDoom/src/doom/m_random.h
@@ -1,40 +1,50 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/m_random.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef __M_RANDOM__
 #define __M_RANDOM__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomtype.h"
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Returns a number from 0 to 255,
-// from a lookup table.
-int M_Random (void);
+/* Returns a number from 0 to 255, from a lookup table. */
 
-// As M_Random, but used only by the play simulation.
-int P_Random (void);
+int m_random(void);
 
-// Fix randoms for demos.
-void M_ClearRandom (void);
+/* As m_random, but used only by the play simulation. */
 
-// Defined version of P_Random() - P_Random()
-int P_SubRandom (void);
+int p_random(void);
 
-#endif
+/* Fix randoms for demos. */
+
+void m_clear_random(void);
+
+/* Defined version of p_random() - p_random() */
+
+int p_sub_random(void);
+
+#endif /* __M_RANDOM__ */
diff --git a/games/NXDoom/src/doom/p_ceilng.c b/games/NXDoom/src/doom/p_ceilng.c
index d1e61c898..582ad604e 100644
--- a/games/NXDoom/src/doom/p_ceilng.c
+++ b/games/NXDoom/src/doom/p_ceilng.c
@@ -1,324 +1,327 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_ceilng.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-#include "z_zone.h"
 #include "doomdef.h"
 #include "p_local.h"
+#include "z_zone.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* State. */
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
 
-// Data.
-#include "sounds.h"
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// CEILINGS
-//
+/* CEILINGS */
 
+ceiling_t *activeceilings[MAXCEILINGS];
 
-ceiling_t*	activeceilings[MAXCEILINGS];
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/* t_move_ceiling */
 
-//
-// T_MoveCeiling
-//
-
-void T_MoveCeiling (ceiling_t* ceiling)
+void t_move_ceiling(ceiling_t *ceiling)
 {
-    result_e	res;
-	
-    switch(ceiling->direction)
+  result_e res;
+
+  switch (ceiling->direction)
     {
-      case 0:
-	// IN STASIS
-	break;
-      case 1:
-	// UP
-	res = T_MovePlane(ceiling->sector,
-			  ceiling->speed,
-			  ceiling->topheight,
-			  false,1,ceiling->direction);
-	
-	if (!(leveltime&7))
-	{
-	    switch(ceiling->type)
-	    {
-	      case silentCrushAndRaise:
-		break;
-	      default:
-		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
-		// ?
-		break;
-	    }
-	}
-	
-	if (res == pastdest)
-	{
-	    switch(ceiling->type)
-	    {
-	      case raiseToHighest:
-		P_RemoveActiveCeiling(ceiling);
-		break;
-		
-	      case silentCrushAndRaise:
-		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
-	      case fastCrushAndRaise:
-	      case crushAndRaise:
-		ceiling->direction = -1;
-		break;
-		
-	      default:
-		break;
-	    }
-	    
-	}
-	break;
-	
-      case -1:
-	// DOWN
-	res = T_MovePlane(ceiling->sector,
-			  ceiling->speed,
-			  ceiling->bottomheight,
-			  ceiling->crush,1,ceiling->direction);
-	
-	if (!(leveltime&7))
-	{
-	    switch(ceiling->type)
-	    {
-	      case silentCrushAndRaise: break;
-	      default:
-		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
-	    }
-	}
-	
-	if (res == pastdest)
-	{
-	    switch(ceiling->type)
-	    {
-	      case silentCrushAndRaise:
-		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
-	      case crushAndRaise:
-		ceiling->speed = CEILSPEED;
-	      case fastCrushAndRaise:
-		ceiling->direction = 1;
-		break;
+    case 0: /* IN STASIS */
+      break;
+    case 1: /* UP */
+      res = t_move_plane(ceiling->sector, ceiling->speed, ceiling->topheight,
+                        false, 1, ceiling->direction);
 
-	      case lowerAndCrush:
-	      case lowerToFloor:
-		P_RemoveActiveCeiling(ceiling);
-		break;
+      if (!(leveltime & 7))
+        {
+          switch (ceiling->type)
+            {
+            case CEIL_SILENTCRUSHANDRAISE:
+              break;
+            default:
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&ceiling->sector->soundorg, SFX_STNMOV);
+#endif
+              /* ? */
 
-	      default:
-		break;
-	    }
-	}
-	else // ( res != pastdest )
-	{
-	    if (res == crushed)
-	    {
-		switch(ceiling->type)
-		{
-		  case silentCrushAndRaise:
-		  case crushAndRaise:
-		  case lowerAndCrush:
-		    ceiling->speed = CEILSPEED / 8;
-		    break;
+              break;
+            }
+        }
 
-		  default:
-		    break;
-		}
-	    }
-	}
-	break;
+      if (res == pastdest)
+        {
+          switch (ceiling->type)
+            {
+            case CEIL_RAISETOHIGHEST:
+              p_remove_active_ceiling(ceiling);
+              break;
+
+            case CEIL_SILENTCRUSHANDRAISE:
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&ceiling->sector->soundorg, SFX_PSTOP);
+#endif
+            case CEIL_FASTCRUSHANDRAISE:
+            case CEIL_CRUSHANDRAISE:
+              ceiling->direction = -1;
+              break;
+
+            default:
+              break;
+            }
+        }
+      break;
+
+    case -1: /* DOWN */
+      res = t_move_plane(ceiling->sector, ceiling->speed,
+              ceiling->bottomheight, ceiling->crush, 1, ceiling->direction);
+
+      if (!(leveltime & 7))
+        {
+          switch (ceiling->type)
+            {
+            case CEIL_SILENTCRUSHANDRAISE:
+              break;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+            default:
+              s_start_sound(&ceiling->sector->soundorg, SFX_STNMOV);
+#else
+            default:
+              break;
+#endif
+            }
+        }
+
+      if (res == pastdest)
+        {
+          switch (ceiling->type)
+            {
+            case CEIL_SILENTCRUSHANDRAISE:
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&ceiling->sector->soundorg, SFX_PSTOP);
+#endif
+            case CEIL_CRUSHANDRAISE:
+              ceiling->speed = CEILSPEED;
+            case CEIL_FASTCRUSHANDRAISE:
+              ceiling->direction = 1;
+              break;
+
+            case CEIL_LOWERANDCRUSH:
+            case CEIL_LOWERTOFLOOR:
+              p_remove_active_ceiling(ceiling);
+              break;
+
+            default:
+              break;
+            }
+        }
+      else /* ( res != pastdest ) */
+        {
+          if (res == crushed)
+            {
+              switch (ceiling->type)
+                {
+                case CEIL_SILENTCRUSHANDRAISE:
+                case CEIL_CRUSHANDRAISE:
+                case CEIL_LOWERANDCRUSH:
+                  ceiling->speed = CEILSPEED / 8;
+                  break;
+
+                default:
+                  break;
+                }
+            }
+        }
+      break;
     }
 }
 
+/* ev_do_ceiling
+ * Move a ceiling up/down and all around!
+ */
 
-//
-// EV_DoCeiling
-// Move a ceiling up/down and all around!
-//
-int
-EV_DoCeiling
-( line_t*	line,
-  ceiling_e	type )
+int ev_do_ceiling(line_t *line, ceiling_e type)
 {
-    int		secnum;
-    int		rtn;
-    sector_t*	sec;
-    ceiling_t*	ceiling;
-	
-    secnum = -1;
-    rtn = 0;
-    
-    //	Reactivate in-stasis ceilings...for certain types.
-    switch(type)
-    {
-      case fastCrushAndRaise:
-      case silentCrushAndRaise:
-      case crushAndRaise:
-	P_ActivateInStasisCeiling(line);
-      default:
-	break;
-    }
-	
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-	sec = &sectors[secnum];
-	if (sec->specialdata)
-	    continue;
-	
-	// new door thinker
-	rtn = 1;
-	ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVSPEC, 0);
-	P_AddThinker (&ceiling->thinker);
-	sec->specialdata = ceiling;
-	ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
-	ceiling->sector = sec;
-	ceiling->crush = false;
-	
-	switch(type)
-	{
-	  case fastCrushAndRaise:
-	    ceiling->crush = true;
-	    ceiling->topheight = sec->ceilingheight;
-	    ceiling->bottomheight = sec->floorheight + (8*FRACUNIT);
-	    ceiling->direction = -1;
-	    ceiling->speed = CEILSPEED * 2;
-	    break;
+  int secnum;
+  int rtn;
+  sector_t *sec;
+  ceiling_t *ceiling;
 
-	  case silentCrushAndRaise:
-	  case crushAndRaise:
-	    ceiling->crush = true;
-	    ceiling->topheight = sec->ceilingheight;
-	  case lowerAndCrush:
-	  case lowerToFloor:
-	    ceiling->bottomheight = sec->floorheight;
-	    if (type != lowerToFloor)
-		ceiling->bottomheight += 8*FRACUNIT;
-	    ceiling->direction = -1;
-	    ceiling->speed = CEILSPEED;
-	    break;
+  secnum = -1;
+  rtn = 0;
 
-	  case raiseToHighest:
-	    ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
-	    ceiling->direction = 1;
-	    ceiling->speed = CEILSPEED;
-	    break;
-	}
-		
-	ceiling->tag = sec->tag;
-	ceiling->type = type;
-	P_AddActiveCeiling(ceiling);
+  /* Reactivate in-stasis ceilings... for certain types. */
+
+  switch (type)
+    {
+    case CEIL_FASTCRUSHANDRAISE:
+    case CEIL_SILENTCRUSHANDRAISE:
+    case CEIL_CRUSHANDRAISE:
+      p_activate_in_stasis_ceiling(line);
+    default:
+      break;
     }
-    return rtn;
+
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
+    {
+      sec = &sectors[secnum];
+      if (sec->specialdata) continue;
+
+      /* new door thinker */
+
+      rtn = 1;
+      ceiling = z_malloc(sizeof(*ceiling), PU_LEVSPEC, 0);
+      p_add_thinker(&ceiling->thinker);
+      sec->specialdata = ceiling;
+      ceiling->thinker.function.acp1 = (actionf_p1)t_move_ceiling;
+      ceiling->sector = sec;
+      ceiling->crush = false;
+
+      switch (type)
+        {
+        case CEIL_FASTCRUSHANDRAISE:
+          ceiling->crush = true;
+          ceiling->topheight = sec->ceilingheight;
+          ceiling->bottomheight = sec->floorheight + (8 * FRACUNIT);
+          ceiling->direction = -1;
+          ceiling->speed = CEILSPEED * 2;
+          break;
+
+        case CEIL_SILENTCRUSHANDRAISE:
+        case CEIL_CRUSHANDRAISE:
+          ceiling->crush = true;
+          ceiling->topheight = sec->ceilingheight;
+        case CEIL_LOWERANDCRUSH:
+        case CEIL_LOWERTOFLOOR:
+          ceiling->bottomheight = sec->floorheight;
+          if (type != CEIL_LOWERTOFLOOR)
+            {
+              ceiling->bottomheight += 8 * FRACUNIT;
+            }
+
+          ceiling->direction = -1;
+          ceiling->speed = CEILSPEED;
+          break;
+
+        case CEIL_RAISETOHIGHEST:
+          ceiling->topheight = p_find_heighest_ceiling_surrounding(sec);
+          ceiling->direction = 1;
+          ceiling->speed = CEILSPEED;
+          break;
+        }
+
+      ceiling->tag = sec->tag;
+      ceiling->type = type;
+      p_add_active_ceiling(ceiling);
+    }
+
+  return rtn;
 }
 
+/* Add an active ceiling */
 
-//
-// Add an active ceiling
-//
-void P_AddActiveCeiling(ceiling_t* c)
+void p_add_active_ceiling(ceiling_t *c)
 {
-    int		i;
-    
-    for (i = 0; i < MAXCEILINGS;i++)
+  int i;
+
+  for (i = 0; i < MAXCEILINGS; i++)
     {
-	if (activeceilings[i] == NULL)
-	{
-	    activeceilings[i] = c;
-	    return;
-	}
+      if (activeceilings[i] == NULL)
+        {
+          activeceilings[i] = c;
+          return;
+        }
     }
 }
 
+/* Remove a ceiling's thinker */
 
-
-//
-// Remove a ceiling's thinker
-//
-void P_RemoveActiveCeiling(ceiling_t* c)
+void p_remove_active_ceiling(ceiling_t *c)
 {
-    int		i;
-	
-    for (i = 0;i < MAXCEILINGS;i++)
+  int i;
+
+  for (i = 0; i < MAXCEILINGS; i++)
     {
-	if (activeceilings[i] == c)
-	{
-	    activeceilings[i]->sector->specialdata = NULL;
-	    P_RemoveThinker (&activeceilings[i]->thinker);
-	    activeceilings[i] = NULL;
-	    break;
-	}
+      if (activeceilings[i] == c)
+        {
+          activeceilings[i]->sector->specialdata = NULL;
+          p_remove_thinker(&activeceilings[i]->thinker);
+          activeceilings[i] = NULL;
+          break;
+        }
     }
 }
 
+/* Restart a ceiling that's in-stasis */
 
-
-//
-// Restart a ceiling that's in-stasis
-//
-void P_ActivateInStasisCeiling(line_t* line)
+void p_activate_in_stasis_ceiling(line_t *line)
 {
-    int		i;
-	
-    for (i = 0;i < MAXCEILINGS;i++)
+  int i;
+
+  for (i = 0; i < MAXCEILINGS; i++)
     {
-	if (activeceilings[i]
-	    && (activeceilings[i]->tag == line->tag)
-	    && (activeceilings[i]->direction == 0))
-	{
-	    activeceilings[i]->direction = activeceilings[i]->olddirection;
-	    activeceilings[i]->thinker.function.acp1
-	      = (actionf_p1)T_MoveCeiling;
-	}
+      if (activeceilings[i] && (activeceilings[i]->tag == line->tag) &&
+          (activeceilings[i]->direction == 0))
+        {
+          activeceilings[i]->direction = activeceilings[i]->olddirection;
+          activeceilings[i]->thinker.function.acp1 =
+              (actionf_p1)t_move_ceiling;
+        }
     }
 }
 
+/* ev_ceiling_crush_stop
+ * Stop a ceiling from crushing!
+ */
 
-
-//
-// EV_CeilingCrushStop
-// Stop a ceiling from crushing!
-//
-int	EV_CeilingCrushStop(line_t	*line)
+int ev_ceiling_crush_stop(line_t *line)
 {
-    int		i;
-    int		rtn;
-	
-    rtn = 0;
-    for (i = 0;i < MAXCEILINGS;i++)
-    {
-	if (activeceilings[i]
-	    && (activeceilings[i]->tag == line->tag)
-	    && (activeceilings[i]->direction != 0))
-	{
-	    activeceilings[i]->olddirection = activeceilings[i]->direction;
-	    activeceilings[i]->thinker.function.acv = (actionf_v)NULL;
-	    activeceilings[i]->direction = 0;		// in-stasis
-	    rtn = 1;
-	}
-    }
-    
+  int i;
+  int rtn;
 
-    return rtn;
+  rtn = 0;
+  for (i = 0; i < MAXCEILINGS; i++)
+    {
+      if (activeceilings[i] && (activeceilings[i]->tag == line->tag) &&
+          (activeceilings[i]->direction != 0))
+        {
+          activeceilings[i]->olddirection = activeceilings[i]->direction;
+          activeceilings[i]->thinker.function.acv = (actionf_v)NULL;
+          activeceilings[i]->direction = 0; /* in-stasis */
+          rtn = 1;
+        }
+    }
+
+  return rtn;
 }
diff --git a/games/NXDoom/src/doom/p_doors.c b/games/NXDoom/src/doom/p_doors.c
index b0947248a..324fefa4b 100644
--- a/games/NXDoom/src/doom/p_doors.c
+++ b/games/NXDoom/src/doom/p_doors.c
@@ -1,779 +1,802 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION: Door animation code (opening/closing)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_doors.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION: Door animation code (opening/closing)
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-#include "z_zone.h"
-#include "doomdef.h"
 #include "deh_main.h"
-#include "p_local.h"
+#include "doomdef.h"
 #include "i_system.h"
+#include "p_local.h"
+#include "z_zone.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
+/* State. */
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
 
-// Data.
+/* Data. */
+
 #include "dstrings.h"
-#include "sounds.h"
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Sliding door frame information */
 
 #if 0
-//
-// Sliding door frame information
-//
-slidename_t	slideFrameNames[MAXSLIDEDOORS] =
+slidename_t g_slide_frame_names[MAXSLIDEDOORS] =
 {
-    {"GDOORF1","GDOORF2","GDOORF3","GDOORF4",	// front
-     "GDOORB1","GDOORB2","GDOORB3","GDOORB4"},	// back
-	 
-    {"\0","\0","\0","\0"}
+{
+  "GDOORF1", "GDOORF2", "GDOORF3", "GDOORF4",  /* front */
+  "GDOORB1", "GDOORB2", "GDOORB3", "GDOORB4"   /* back */
+},
+{
+  "\0", "\0", "\0", "\0"
+}
 };
+
+slideframe_t g_slide_frames[MAXSLIDEDOORS];
 #endif
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-//
-// VERTICAL DOORS
-//
+/* VERTICAL DOORS */
 
-//
-// T_VerticalDoor
-//
-void T_VerticalDoor (vldoor_t* door)
+void t_vertical_door(vldoor_t *door)
 {
-    result_e	res;
-	
-    switch(door->direction)
+  result_e res;
+
+  switch (door->direction)
     {
-      case 0:
-	// WAITING
-	if (!--door->topcountdown)
-	{
-	    switch(door->type)
-	    {
-	      case vld_blazeRaise:
-		door->direction = -1; // time to go back down
-		S_StartSound(&door->sector->soundorg, sfx_bdcls);
-		break;
-		
-	      case vld_normal:
-		door->direction = -1; // time to go back down
-		S_StartSound(&door->sector->soundorg, sfx_dorcls);
-		break;
-		
-	      case vld_close30ThenOpen:
-		door->direction = 1;
-		S_StartSound(&door->sector->soundorg, sfx_doropn);
-		break;
-		
-	      default:
-		break;
-	    }
-	}
-	break;
-	
-      case 2:
-	//  INITIAL WAIT
-	if (!--door->topcountdown)
-	{
-	    switch(door->type)
-	    {
-	      case vld_raiseIn5Mins:
-		door->direction = 1;
-		door->type = vld_normal;
-		S_StartSound(&door->sector->soundorg, sfx_doropn);
-		break;
-		
-	      default:
-		break;
-	    }
-	}
-	break;
-	
-      case -1:
-	// DOWN
-	res = T_MovePlane(door->sector,
-			  door->speed,
-			  door->sector->floorheight,
-			  false,1,door->direction);
-	if (res == pastdest)
-	{
-	    switch(door->type)
-	    {
-	      case vld_blazeRaise:
-	      case vld_blazeClose:
-		door->sector->specialdata = NULL;
-		P_RemoveThinker (&door->thinker);  // unlink and free
-		S_StartSound(&door->sector->soundorg, sfx_bdcls);
-		break;
-		
-	      case vld_normal:
-	      case vld_close:
-		door->sector->specialdata = NULL;
-		P_RemoveThinker (&door->thinker);  // unlink and free
-		break;
-		
-	      case vld_close30ThenOpen:
-		door->direction = 0;
-		door->topcountdown = TICRATE*30;
-		break;
-		
-	      default:
-		break;
-	    }
-	}
-	else if (res == crushed)
-	{
-	    switch(door->type)
-	    {
-	      case vld_blazeClose:
-	      case vld_close:		// DO NOT GO BACK UP!
-		break;
-		
-	      default:
-		door->direction = 1;
-		S_StartSound(&door->sector->soundorg, sfx_doropn);
-		break;
-	    }
-	}
-	break;
-	
-      case 1:
-	// UP
-	res = T_MovePlane(door->sector,
-			  door->speed,
-			  door->topheight,
-			  false,1,door->direction);
-	
-	if (res == pastdest)
-	{
-	    switch(door->type)
-	    {
-	      case vld_blazeRaise:
-	      case vld_normal:
-		door->direction = 0; // wait at top
-		door->topcountdown = door->topwait;
-		break;
-		
-	      case vld_close30ThenOpen:
-	      case vld_blazeOpen:
-	      case vld_open:
-		door->sector->specialdata = NULL;
-		P_RemoveThinker (&door->thinker);  // unlink and free
-		break;
-		
-	      default:
-		break;
-	    }
-	}
-	break;
-    }
-}
-
-
-//
-// EV_DoLockedDoor
-// Move a locked door up/down
-//
-
-int
-EV_DoLockedDoor
-( line_t*	line,
-  vldoor_e	type,
-  mobj_t*	thing )
-{
-    player_t*	p;
-	
-    p = thing->player;
-	
-    if (!p)
-	return 0;
-		
-    switch(line->special)
-    {
-      case 99:	// Blue Lock
-      case 133:
-	if (!p->cards[it_bluecard] && !p->cards[it_blueskull])
-	{
-	    p->message = DEH_String(PD_BLUEO);
-	    S_StartSound(NULL,sfx_oof);
-	    return 0;
-	}
-	break;
-	
-      case 134: // Red Lock
-      case 135:
-	if (!p->cards[it_redcard] && !p->cards[it_redskull])
-	{
-	    p->message = DEH_String(PD_REDO);
-	    S_StartSound(NULL,sfx_oof);
-	    return 0;
-	}
-	break;
-	
-      case 136:	// Yellow Lock
-      case 137:
-	if (!p->cards[it_yellowcard] &&
-	    !p->cards[it_yellowskull])
-	{
-	    p->message = DEH_String(PD_YELLOWO);
-	    S_StartSound(NULL,sfx_oof);
-	    return 0;
-	}
-	break;	
-    }
-
-    return EV_DoDoor(line,type);
-}
-
-
-int
-EV_DoDoor
-( line_t*	line,
-  vldoor_e	type )
-{
-    int		secnum,rtn;
-    sector_t*	sec;
-    vldoor_t*	door;
-	
-    secnum = -1;
-    rtn = 0;
-    
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-	sec = &sectors[secnum];
-	if (sec->specialdata)
-	    continue;
-		
-	
-	// new door thinker
-	rtn = 1;
-	door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-	P_AddThinker (&door->thinker);
-	sec->specialdata = door;
-
-	door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
-	door->sector = sec;
-	door->type = type;
-	door->topwait = VDOORWAIT;
-	door->speed = VDOORSPEED;
-		
-	switch(type)
-	{
-	  case vld_blazeClose:
-	    door->topheight = P_FindLowestCeilingSurrounding(sec);
-	    door->topheight -= 4*FRACUNIT;
-	    door->direction = -1;
-	    door->speed = VDOORSPEED * 4;
-	    S_StartSound(&door->sector->soundorg, sfx_bdcls);
-	    break;
-	    
-	  case vld_close:
-	    door->topheight = P_FindLowestCeilingSurrounding(sec);
-	    door->topheight -= 4*FRACUNIT;
-	    door->direction = -1;
-	    S_StartSound(&door->sector->soundorg, sfx_dorcls);
-	    break;
-	    
-	  case vld_close30ThenOpen:
-	    door->topheight = sec->ceilingheight;
-	    door->direction = -1;
-	    S_StartSound(&door->sector->soundorg, sfx_dorcls);
-	    break;
-	    
-	  case vld_blazeRaise:
-	  case vld_blazeOpen:
-	    door->direction = 1;
-	    door->topheight = P_FindLowestCeilingSurrounding(sec);
-	    door->topheight -= 4*FRACUNIT;
-	    door->speed = VDOORSPEED * 4;
-	    if (door->topheight != sec->ceilingheight)
-		S_StartSound(&door->sector->soundorg, sfx_bdopn);
-	    break;
-	    
-	  case vld_normal:
-	  case vld_open:
-	    door->direction = 1;
-	    door->topheight = P_FindLowestCeilingSurrounding(sec);
-	    door->topheight -= 4*FRACUNIT;
-	    if (door->topheight != sec->ceilingheight)
-		S_StartSound(&door->sector->soundorg, sfx_doropn);
-	    break;
-	    
-	  default:
-	    break;
-	}
-		
-    }
-    return rtn;
-}
-
-
-//
-// EV_VerticalDoor : open a door manually, no tag value
-//
-void
-EV_VerticalDoor
-( line_t*	line,
-  mobj_t*	thing )
-{
-    player_t*	player;
-    sector_t*	sec;
-    vldoor_t*	door;
-    int		side;
-	
-    side = 0;	// only front sides can be used
-
-    //	Check for locks
-    player = thing->player;
-		
-    switch(line->special)
-    {
-      case 26: // Blue Lock
-      case 32:
-	if ( !player )
-	    return;
-	
-	if (!player->cards[it_bluecard] && !player->cards[it_blueskull])
-	{
-	    player->message = DEH_String(PD_BLUEK);
-	    S_StartSound(NULL,sfx_oof);
-	    return;
-	}
-	break;
-	
-      case 27: // Yellow Lock
-      case 34:
-	if ( !player )
-	    return;
-	
-	if (!player->cards[it_yellowcard] &&
-	    !player->cards[it_yellowskull])
-	{
-	    player->message = DEH_String(PD_YELLOWK);
-	    S_StartSound(NULL,sfx_oof);
-	    return;
-	}
-	break;
-	
-      case 28: // Red Lock
-      case 33:
-	if ( !player )
-	    return;
-	
-	if (!player->cards[it_redcard] && !player->cards[it_redskull])
-	{
-	    player->message = DEH_String(PD_REDK);
-	    S_StartSound(NULL,sfx_oof);
-	    return;
-	}
-	break;
-    }
-	
-    // if the sector has an active thinker, use it
-
-    if (line->sidenum[side^1] == -1)
-    {
-        I_Error("EV_VerticalDoor: DR special type on 1-sided linedef");
-    }
-
-    sec = sides[ line->sidenum[side^1]] .sector;
-
-    if (sec->specialdata)
-    {
-	door = sec->specialdata;
-	switch(line->special)
-	{
-	  case	1: // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
-	  case	26:
-	  case	27:
-	  case	28:
-	  case	117:
-	    if (door->direction == -1)
-		door->direction = 1;	// go back up
-	    else
-	    {
-		if (!thing->player)
-		    return;		// JDC: bad guys never close doors
-
-                // When is a door not a door?
-                // In Vanilla, door->direction is set, even though
-                // "specialdata" might not actually point at a door.
-
-                if (door->thinker.function.acp1 == (actionf_p1) T_VerticalDoor)
-                {
-                    door->direction = -1;	// start going down immediately
-                }
-                else if (door->thinker.function.acp1 == (actionf_p1) T_PlatRaise)
-                {
-                    // Erm, this is a plat, not a door.
-                    // This notably causes a problem in ep1-0500.lmp where
-                    // a plat and a door are cross-referenced; the door
-                    // doesn't open on 64-bit.
-                    // The direction field in vldoor_t corresponds to the wait
-                    // field in plat_t.  Let's set that to -1 instead.
-
-                    plat_t *plat;
-
-                    plat = (plat_t *) door;
-                    plat->wait = -1;
-                }
-                else
-                {
-                    // This isn't a door OR a plat.  Now we're in trouble.
-
-                    fprintf(stderr, "EV_VerticalDoor: Tried to close "
-                                    "something that wasn't a door.\n");
-
-                    // Try closing it anyway. At least it will work on 32-bit
-                    // machines.
-
-                    door->direction = -1;
-                }
-	    }
-	    return;
-	}
-    }
-	
-    // for proper sound
-    switch(line->special)
-    {
-      case 117:	// BLAZING DOOR RAISE
-      case 118:	// BLAZING DOOR OPEN
-	S_StartSound(&sec->soundorg,sfx_bdopn);
-	break;
-	
-      case 1:	// NORMAL DOOR SOUND
-      case 31:
-	S_StartSound(&sec->soundorg,sfx_doropn);
-	break;
-	
-      default:	// LOCKED DOOR SOUND
-	S_StartSound(&sec->soundorg,sfx_doropn);
-	break;
-    }
-	
-    
-    // new door thinker
-    door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-    P_AddThinker (&door->thinker);
-    sec->specialdata = door;
-    door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 1;
-    door->speed = VDOORSPEED;
-    door->topwait = VDOORWAIT;
-
-    switch(line->special)
-    {
-      case 1:
-      case 26:
-      case 27:
-      case 28:
-	door->type = vld_normal;
-	break;
-	
-      case 31:
-      case 32:
-      case 33:
-      case 34:
-	door->type = vld_open;
-	line->special = 0;
-	break;
-	
-      case 117:	// blazing door raise
-	door->type = vld_blazeRaise;
-	door->speed = VDOORSPEED*4;
-	break;
-      case 118:	// blazing door open
-	door->type = vld_blazeOpen;
-	line->special = 0;
-	door->speed = VDOORSPEED*4;
-	break;
-    }
-    
-    // find the top and bottom of the movement range
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4*FRACUNIT;
-}
-
-
-//
-// Spawn a door that closes after 30 seconds
-//
-void P_SpawnDoorCloseIn30 (sector_t* sec)
-{
-    vldoor_t*	door;
-	
-    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
-
-    P_AddThinker (&door->thinker);
-
-    sec->specialdata = door;
-    sec->special = 0;
-
-    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 0;
-    door->type = vld_normal;
-    door->speed = VDOORSPEED;
-    door->topcountdown = 30 * TICRATE;
-}
-
-//
-// Spawn a door that opens after 5 minutes
-//
-void
-P_SpawnDoorRaiseIn5Mins
-( sector_t*	sec,
-  int		secnum )
-{
-    vldoor_t*	door;
-	
-    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
-    
-    P_AddThinker (&door->thinker);
-
-    sec->specialdata = door;
-    sec->special = 0;
-
-    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 2;
-    door->type = vld_raiseIn5Mins;
-    door->speed = VDOORSPEED;
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4*FRACUNIT;
-    door->topwait = VDOORWAIT;
-    door->topcountdown = 5 * 60 * TICRATE;
-}
-
-
-
-// UNUSED
-// Separate into p_slidoor.c?
-
-#if 0		// ABANDONED TO THE MISTS OF TIME!!!
-//
-// EV_SlidingDoor : slide a door horizontally
-// (animate midtexture, then set noblocking line)
-//
-
-
-slideframe_t slideFrames[MAXSLIDEDOORS];
-
-void P_InitSlidingDoorFrames(void)
-{
-    int		i;
-    int		f1;
-    int		f2;
-    int		f3;
-    int		f4;
-	
-    // DOOM II ONLY...
-    if ( gamemode != commercial)
-	return;
-	
-    for (i = 0;i < MAXSLIDEDOORS; i++)
-    {
-	if (!slideFrameNames[i].frontFrame1[0])
-	    break;
-			
-	f1 = R_TextureNumForName(slideFrameNames[i].frontFrame1);
-	f2 = R_TextureNumForName(slideFrameNames[i].frontFrame2);
-	f3 = R_TextureNumForName(slideFrameNames[i].frontFrame3);
-	f4 = R_TextureNumForName(slideFrameNames[i].frontFrame4);
-
-	slideFrames[i].frontFrames[0] = f1;
-	slideFrames[i].frontFrames[1] = f2;
-	slideFrames[i].frontFrames[2] = f3;
-	slideFrames[i].frontFrames[3] = f4;
-		
-	f1 = R_TextureNumForName(slideFrameNames[i].backFrame1);
-	f2 = R_TextureNumForName(slideFrameNames[i].backFrame2);
-	f3 = R_TextureNumForName(slideFrameNames[i].backFrame3);
-	f4 = R_TextureNumForName(slideFrameNames[i].backFrame4);
-
-	slideFrames[i].backFrames[0] = f1;
-	slideFrames[i].backFrames[1] = f2;
-	slideFrames[i].backFrames[2] = f3;
-	slideFrames[i].backFrames[3] = f4;
-    }
-}
-
-
-//
-// Return index into "slideFrames" array
-// for which door type to use
-//
-int P_FindSlidingDoorType(line_t*	line)
-{
-    int		i;
-    int		val;
-	
-    for (i = 0;i < MAXSLIDEDOORS;i++)
-    {
-	val = sides[line->sidenum[0]].midtexture;
-	if (val == slideFrames[i].frontFrames[0])
-	    return i;
-    }
-	
-    return -1;
-}
-
-void T_SlidingDoor (slidedoor_t*	door)
-{
-    switch(door->status)
-    {
-      case sd_opening:
-	if (!door->timer--)
-	{
-	    if (++door->frame == SNUMFRAMES)
-	    {
-		// IF DOOR IS DONE OPENING...
-		sides[door->line->sidenum[0]].midtexture = 0;
-		sides[door->line->sidenum[1]].midtexture = 0;
-		door->line->flags &= ML_BLOCKING^0xff;
-					
-		if (door->type == sdt_openOnly)
-		{
-		    door->frontsector->specialdata = NULL;
-		    P_RemoveThinker (&door->thinker);
-		    break;
-		}
-					
-		door->timer = SDOORWAIT;
-		door->status = sd_waiting;
-	    }
-	    else
-	    {
-		// IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
-		door->timer = SWAITTICS;
-					
-		sides[door->line->sidenum[0]].midtexture =
-		    slideFrames[door->whichDoorIndex].
-		    frontFrames[door->frame];
-		sides[door->line->sidenum[1]].midtexture =
-		    slideFrames[door->whichDoorIndex].
-		    backFrames[door->frame];
-	    }
-	}
-	break;
-			
-      case sd_waiting:
-	// IF DOOR IS DONE WAITING...
-	if (!door->timer--)
-	{
-	    // CAN DOOR CLOSE?
-	    if (door->frontsector->thinglist != NULL ||
-		door->backsector->thinglist != NULL)
-	    {
-		door->timer = SDOORWAIT;
-		break;
-	    }
-
-	    //door->frame = SNUMFRAMES-1;
-	    door->status = sd_closing;
-	    door->timer = SWAITTICS;
-	}
-	break;
-			
-      case sd_closing:
-	if (!door->timer--)
-	{
-	    if (--door->frame < 0)
-	    {
-		// IF DOOR IS DONE CLOSING...
-		door->line->flags |= ML_BLOCKING;
-		door->frontsector->specialdata = NULL;
-		P_RemoveThinker (&door->thinker);
-		break;
-	    }
-	    else
-	    {
-		// IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
-		door->timer = SWAITTICS;
-					
-		sides[door->line->sidenum[0]].midtexture =
-		    slideFrames[door->whichDoorIndex].
-		    frontFrames[door->frame];
-		sides[door->line->sidenum[1]].midtexture =
-		    slideFrames[door->whichDoorIndex].
-		    backFrames[door->frame];
-	    }
-	}
-	break;
-    }
-}
-
-
-
-void
-EV_SlidingDoor
-( line_t*	line,
-  mobj_t*	thing )
-{
-    sector_t*		sec;
-    slidedoor_t*	door;
-	
-    // DOOM II ONLY...
-    if (gamemode != commercial)
-	return;
-    
-    // Make sure door isn't already being animated
-    sec = line->frontsector;
-    door = NULL;
-    if (sec->specialdata)
-    {
-	if (!thing->player)
-	    return;
-			
-	door = sec->specialdata;
-	if (door->type == sdt_openAndClose)
-	{
-	    if (door->status == sd_waiting)
-		door->status = sd_closing;
-	}
-	else
-	    return;
-    }
-    
-    // Init sliding door vars
-    if (!door)
-    {
-	door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-	P_AddThinker (&door->thinker);
-	sec->specialdata = door;
-		
-	door->type = sdt_openAndClose;
-	door->status = sd_opening;
-	door->whichDoorIndex = P_FindSlidingDoorType(line);
-
-	if (door->whichDoorIndex < 0)
-	    I_Error("EV_SlidingDoor: Can't use texture for sliding door!");
-			
-	door->frontsector = sec;
-	door->backsector = line->backsector;
-	door->thinker.function = T_SlidingDoor;
-	door->timer = SWAITTICS;
-	door->frame = 0;
-	door->line = line;
-    }
-}
+    case 0: /* WAITING */
+      if (!--door->topcountdown)
+        {
+          switch (door->type)
+            {
+            case VLD_BLAZERAISE:
+              door->direction = -1; /* time to go back down */
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&door->sector->soundorg, SFX_BDCLS);
 #endif
+              break;
+
+            case VLD_NORMAL:
+              door->direction = -1; /* time to go back down */
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&door->sector->soundorg, SFX_DORCLS);
+#endif
+              break;
+
+            case VLD_CLOSE30THENOPEN:
+              door->direction = 1;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&door->sector->soundorg, SFX_DOROPN);
+#endif
+              break;
+
+            default:
+              break;
+            }
+        }
+      break;
+
+    case 2: /* INITIAL WAIT */
+      if (!--door->topcountdown)
+        {
+          switch (door->type)
+            {
+            case VLD_RAISEIN5MINS:
+              door->direction = 1;
+              door->type = VLD_NORMAL;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&door->sector->soundorg, SFX_DOROPN);
+#endif
+              break;
+
+            default:
+              break;
+            }
+        }
+
+      break;
+
+    case -1: /* DOWN */
+      res = t_move_plane(door->sector, door->speed,
+              door->sector->floorheight, false, 1, door->direction);
+
+      if (res == pastdest)
+        {
+          switch (door->type)
+            {
+            case VLD_BLAZERAISE:
+            case VLD_BLAZECLOSE:
+              door->sector->specialdata = NULL;
+              p_remove_thinker(&door->thinker); /* unlink and free */
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&door->sector->soundorg, SFX_BDCLS);
+#endif
+              break;
+
+            case VLD_NORMAL:
+            case VLD_CLOSE:
+              door->sector->specialdata = NULL;
+              p_remove_thinker(&door->thinker); /* unlink and free */
+              break;
+
+            case VLD_CLOSE30THENOPEN:
+              door->direction = 0;
+              door->topcountdown = TICRATE * 30;
+              break;
+
+            default:
+              break;
+            }
+        }
+      else if (res == crushed)
+        {
+          switch (door->type)
+            {
+            case VLD_BLAZECLOSE:
+            case VLD_CLOSE: /* DO NOT GO BACK UP! */
+              break;
+
+            default:
+              door->direction = 1;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&door->sector->soundorg, SFX_DOROPN);
+#endif
+              break;
+            }
+        }
+      break;
+
+    case 1: /* UP */
+      res = t_move_plane(door->sector, door->speed, door->topheight,
+              false, 1, door->direction);
+
+      if (res == pastdest)
+        {
+          switch (door->type)
+            {
+            case VLD_BLAZERAISE:
+            case VLD_NORMAL:
+              door->direction = 0; /* wait at top */
+              door->topcountdown = door->topwait;
+              break;
+
+            case VLD_CLOSE30THENOPEN:
+            case VLD_BLAZEOPEN:
+            case VLD_OPEN:
+              door->sector->specialdata = NULL;
+              p_remove_thinker(&door->thinker); /* unlink and free */
+              break;
+
+            default:
+              break;
+            }
+        }
+
+      break;
+    }
+}
+
+/* ev_do_locked_door
+ * Move a locked door up/down
+ */
+
+int ev_do_locked_door(line_t *line, vldoor_e type, mobj_t *thing)
+{
+  player_t *p;
+
+  p = thing->player;
+
+  if (!p) return 0;
+
+  switch (line->special)
+    {
+    case 99: /* Blue Lock */
+    case 133:
+      if (!p->cards[it_bluecard] && !p->cards[it_blueskull])
+        {
+          p->message = (PD_BLUEO);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_OOF);
+#endif
+          return 0;
+        }
+      break;
+
+    case 134: /* Red Lock */
+    case 135:
+      if (!p->cards[it_redcard] && !p->cards[it_redskull])
+        {
+          p->message = (PD_REDO);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_OOF);
+#endif
+          return 0;
+        }
+      break;
+
+    case 136: /* Yellow Lock */
+    case 137:
+      if (!p->cards[it_yellowcard] && !p->cards[it_yellowskull])
+        {
+          p->message = (PD_YELLOWO);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_OOF);
+#endif
+          return 0;
+        }
+
+      break;
+    }
+
+  return ev_do_door(line, type);
+}
+
+int ev_do_door(line_t *line, vldoor_e type)
+{
+  int secnum;
+  int rtn;
+  sector_t *sec;
+  vldoor_t *door;
+
+  secnum = -1;
+  rtn = 0;
+
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
+    {
+      sec = &sectors[secnum];
+      if (sec->specialdata) continue;
+
+      /* new door thinker */
+
+      rtn = 1;
+      door = z_malloc(sizeof(*door), PU_LEVSPEC, 0);
+      p_add_thinker(&door->thinker);
+      sec->specialdata = door;
+
+      door->thinker.function.acp1 = (actionf_p1)t_vertical_door;
+      door->sector = sec;
+      door->type = type;
+      door->topwait = VDOORWAIT;
+      door->speed = VDOORSPEED;
+
+      switch (type)
+        {
+        case VLD_BLAZECLOSE:
+          door->topheight = p_find_lowest_ceiling_surrounding(sec);
+          door->topheight -= 4 * FRACUNIT;
+          door->direction = -1;
+          door->speed = VDOORSPEED * 4;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&door->sector->soundorg, SFX_BDCLS);
+#endif
+          break;
+
+        case VLD_CLOSE:
+          door->topheight = p_find_lowest_ceiling_surrounding(sec);
+          door->topheight -= 4 * FRACUNIT;
+          door->direction = -1;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&door->sector->soundorg, SFX_DORCLS);
+#endif
+          break;
+
+        case VLD_CLOSE30THENOPEN:
+          door->topheight = sec->ceilingheight;
+          door->direction = -1;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&door->sector->soundorg, SFX_DORCLS);
+#endif
+          break;
+
+        case VLD_BLAZERAISE:
+        case VLD_BLAZEOPEN:
+          door->direction = 1;
+          door->topheight = p_find_lowest_ceiling_surrounding(sec);
+          door->topheight -= 4 * FRACUNIT;
+          door->speed = VDOORSPEED * 4;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          if (door->topheight != sec->ceilingheight)
+            s_start_sound(&door->sector->soundorg, SFX_BDOPN);
+#endif
+          break;
+
+        case VLD_NORMAL:
+        case VLD_OPEN:
+          door->direction = 1;
+          door->topheight = p_find_lowest_ceiling_surrounding(sec);
+          door->topheight -= 4 * FRACUNIT;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          if (door->topheight != sec->ceilingheight)
+            s_start_sound(&door->sector->soundorg, SFX_DOROPN);
+#endif
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  return rtn;
+}
+
+/* ev_vertical_door : open a door manually, no tag value */
+
+void ev_vertical_door(line_t *line, mobj_t *thing)
+{
+  player_t *player;
+  sector_t *sec;
+  vldoor_t *door;
+  int side;
+
+  side = 0; /* only front sides can be used */
+
+  /* Check for locks */
+
+  player = thing->player;
+
+  switch (line->special)
+    {
+    case 26: /* Blue Lock */
+    case 32:
+      if (!player) return;
+
+      if (!player->cards[it_bluecard] && !player->cards[it_blueskull])
+        {
+          player->message = (PD_BLUEK);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_OOF);
+#endif
+          return;
+        }
+      break;
+
+    case 27: /* Yellow Lock */
+    case 34:
+      if (!player) return;
+
+      if (!player->cards[it_yellowcard] && !player->cards[it_yellowskull])
+        {
+          player->message = (PD_YELLOWK);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_OOF);
+#endif
+          return;
+        }
+      break;
+
+    case 28: /* Red Lock */
+    case 33:
+      if (!player) return;
+
+      if (!player->cards[it_redcard] && !player->cards[it_redskull])
+        {
+          player->message = (PD_REDK);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(NULL, SFX_OOF);
+#endif
+          return;
+        }
+      break;
+    }
+
+  /* if the sector has an active thinker, use it */
+
+  if (line->sidenum[side ^ 1] == -1)
+    {
+      i_error("ev_vertical_door: DR special type on 1-sided linedef");
+    }
+
+  sec = sides[line->sidenum[side ^ 1]].sector;
+
+  if (sec->specialdata)
+    {
+      door = sec->specialdata;
+      switch (line->special)
+        {
+        case 1: /* ONLY FOR "RAISE" DOORS, NOT "OPEN"s */
+        case 26:
+        case 27:
+        case 28:
+        case 117:
+          if (door->direction == -1)
+            door->direction = 1; /* go back up */
+          else
+            {
+              if (!thing->player) return; /* JDC: bad guys never close doors */
+
+              /* When is a door not a door?
+               * In Vanilla, door->direction is set, even though
+               * "specialdata" might not actually point at a door.
+               */
+
+              if (door->thinker.function.acp1 ==
+                      (actionf_p1)t_vertical_door)
+                {
+                  door->direction = -1; /* start going down immediately */
+                }
+              else if (door->thinker.function.acp1 ==
+                      (actionf_p1)t_plat_raise)
+                {
+                  /* Erm, this is a plat, not a door.
+                   * This notably causes a problem in ep1-0500.lmp where
+                   * a plat and a door are cross-referenced; the door
+                   * doesn't open on 64-bit.
+                   * The direction field in vldoor_t corresponds to the wait
+                   * field in plat_t.  Let's set that to -1 instead.
+                   */
+
+                  plat_t *plat;
+
+                  plat = (plat_t *)door;
+                  plat->wait = -1;
+                }
+              else
+                {
+                  /* This isn't a door OR a plat.  Now we're in trouble. */
+
+                  fprintf(stderr, "ev_vertical_door: Tried to close "
+                                  "something that wasn't a door.\n");
+
+                  /* Try closing it anyway. At least it will work on 32-bit
+                   * machines.
+                   */
+
+                  door->direction = -1;
+                }
+            }
+
+          return;
+        }
+    }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  /* for proper sound */
+
+  switch (line->special)
+    {
+    case 117: /* BLAZING DOOR RAISE */
+    case 118: /* BLAZING DOOR OPEN */
+      s_start_sound(&sec->soundorg, SFX_BDOPN);
+      break;
+
+    case 1: /* NORMAL DOOR SOUND */
+    case 31:
+      s_start_sound(&sec->soundorg, SFX_DOROPN);
+      break;
+
+    default: /* LOCKED DOOR SOUND */
+      s_start_sound(&sec->soundorg, SFX_DOROPN);
+      break;
+    }
+#endif
+
+  /* new door thinker */
+
+  door = z_malloc(sizeof(*door), PU_LEVSPEC, 0);
+  p_add_thinker(&door->thinker);
+  sec->specialdata = door;
+  door->thinker.function.acp1 = (actionf_p1)t_vertical_door;
+  door->sector = sec;
+  door->direction = 1;
+  door->speed = VDOORSPEED;
+  door->topwait = VDOORWAIT;
+
+  switch (line->special)
+    {
+    case 1:
+    case 26:
+    case 27:
+    case 28:
+      door->type = VLD_NORMAL;
+      break;
+
+    case 31:
+    case 32:
+    case 33:
+    case 34:
+      door->type = VLD_OPEN;
+      line->special = 0;
+      break;
+
+    case 117: /* blazing door raise */
+      door->type = VLD_BLAZERAISE;
+      door->speed = VDOORSPEED * 4;
+      break;
+    case 118: /* blazing door open */
+      door->type = VLD_BLAZEOPEN;
+      line->special = 0;
+      door->speed = VDOORSPEED * 4;
+      break;
+    }
+
+  /* find the top and bottom of the movement range */
+
+  door->topheight = p_find_lowest_ceiling_surrounding(sec);
+  door->topheight -= 4 * FRACUNIT;
+}
+
+/* Spawn a door that closes after 30 seconds */
+
+void p_spawn_door_close_in30(sector_t *sec)
+{
+  vldoor_t *door;
+
+  door = z_malloc(sizeof(*door), PU_LEVSPEC, 0);
+
+  p_add_thinker(&door->thinker);
+
+  sec->specialdata = door;
+  sec->special = 0;
+
+  door->thinker.function.acp1 = (actionf_p1)t_vertical_door;
+  door->sector = sec;
+  door->direction = 0;
+  door->type = VLD_NORMAL;
+  door->speed = VDOORSPEED;
+  door->topcountdown = 30 * TICRATE;
+}
+
+/* Spawn a door that opens after 5 minutes */
+
+void p_spawn_door_raise_in_5min(sector_t *sec, int secnum)
+{
+  vldoor_t *door;
+
+  door = z_malloc(sizeof(*door), PU_LEVSPEC, 0);
+
+  p_add_thinker(&door->thinker);
+
+  sec->specialdata = door;
+  sec->special = 0;
+
+  door->thinker.function.acp1 = (actionf_p1)t_vertical_door;
+  door->sector = sec;
+  door->direction = 2;
+  door->type = VLD_RAISEIN5MINS;
+  door->speed = VDOORSPEED;
+  door->topheight = p_find_lowest_ceiling_surrounding(sec);
+  door->topheight -= 4 * FRACUNIT;
+  door->topwait = VDOORWAIT;
+  door->topcountdown = 5 * 60 * TICRATE;
+}
+
+/* UNUSED
+ * Separate into p_slidoor.c?
+ */
+
+#if 0 /* ABANDONED TO THE MISTS OF TIME!!! */
+
+/* ev_sliding_door : slide a door horizontally
+ * (animate midtexture, then set noblocking line)
+ */
+
+void p_init_sliding_door_frames(void)
+{
+  int i;
+  int f1;
+  int f2;
+  int f3;
+  int f4;
+
+  /* DOOM II ONLY... */
+
+  if (gamemode != commercial) return;
+
+  for (i = 0; i < MAXSLIDEDOORS; i++)
+    {
+      if (!g_slide_frame_names[i].front_frame1[0]) break;
+
+      f1 = r_texture_num_for_name(g_slide_frame_names[i].front_frame1);
+      f2 = r_texture_num_for_name(g_slide_frame_names[i].front_frame2);
+      f3 = r_texture_num_for_name(g_slide_frame_names[i].front_frame3);
+      f4 = r_texture_num_for_name(g_slide_frame_names[i].front_frame4);
+
+      g_slide_frames[i].front_frames[0] = f1;
+      g_slide_frames[i].front_frames[1] = f2;
+      g_slide_frames[i].front_frames[2] = f3;
+      g_slide_frames[i].front_frames[3] = f4;
+
+      f1 = r_texture_num_for_name(g_slide_frame_names[i].back_frame1);
+      f2 = r_texture_num_for_name(g_slide_frame_names[i].back_frame2);
+      f3 = r_texture_num_for_name(g_slide_frame_names[i].back_frame3);
+      f4 = r_texture_num_for_name(g_slide_frame_names[i].back_frame4);
+
+      g_slide_frames[i].back_frames[0] = f1;
+      g_slide_frames[i].back_frames[1] = f2;
+      g_slide_frames[i].back_frames[2] = f3;
+      g_slide_frames[i].back_frames[3] = f4;
+    }
+}
+
+/* Return index into "g_slide_frames" array for which door type to use */
+
+static int p_find_sliding_door(line_t *line)
+{
+  int i;
+  int val;
+
+  for (i = 0; i < MAXSLIDEDOORS; i++)
+    {
+      val = sides[line->sidenum[0]].midtexture;
+      if (val == g_slide_frames[i].front_frames[0]) return i;
+    }
+
+  return -1;
+}
+
+static void t_sliding_door(slidedoor_t *door)
+{
+  switch (door->status)
+    {
+    case sd_opening:
+      if (!door->timer--)
+        {
+          if (++door->frame == SNUMFRAMES)
+            {
+              /* IF DOOR IS DONE OPENING... */
+
+              sides[door->line->sidenum[0]].midtexture = 0;
+              sides[door->line->sidenum[1]].midtexture = 0;
+              door->line->flags &= ML_BLOCKING ^ 0xff;
+
+              if (door->type == SDT_OPENONLY)
+                {
+                  door->frontsector->specialdata = NULL;
+                  p_remove_thinker(&door->thinker);
+                  break;
+                }
+
+              door->timer = SDOORWAIT;
+              door->status = sd_waiting;
+            }
+          else
+            {
+              /* IF DOOR NEEDS TO ANIMATE TO NEXT FRAME... */
+
+              door->timer = SWAITTICS;
+
+              sides[door->line->sidenum[0]].midtexture =
+                  g_slide_frames[door->which_door_index]
+                      .front_frames[door->frame];
+              sides[door->line->sidenum[1]].midtexture =
+                  g_slide_frames[door->which_door_index]
+                      .back_frames[door->frame];
+            }
+        }
+      break;
+
+    case sd_waiting:
+
+      /* IF DOOR IS DONE WAITING... */
+
+      if (!door->timer--)
+        {
+          /* CAN DOOR CLOSE? */
+
+          if (door->frontsector->thinglist != NULL ||
+              door->backsector->thinglist != NULL)
+            {
+              door->timer = SDOORWAIT;
+              break;
+            }
+
+          /* door->frame = SNUMFRAMES-1; */
+
+          door->status = sd_closing;
+          door->timer = SWAITTICS;
+        }
+      break;
+
+    case sd_closing:
+      if (!door->timer--)
+        {
+          if (--door->frame < 0)
+            {
+              /* IF DOOR IS DONE CLOSING... */
+
+              door->line->flags |= ML_BLOCKING;
+              door->frontsector->specialdata = NULL;
+              p_remove_thinker(&door->thinker);
+              break;
+            }
+          else
+            {
+              /* IF DOOR NEEDS TO ANIMATE TO NEXT FRAME... */
+
+              door->timer = SWAITTICS;
+
+              sides[door->line->sidenum[0]].midtexture =
+                  g_slide_frames[door->which_door_index]
+                      .front_frames[door->frame];
+              sides[door->line->sidenum[1]].midtexture =
+                  g_slide_frames[door->which_door_index]
+                      .back_frames[door->frame];
+            }
+        }
+      break;
+    }
+}
+
+void ev_sliding_door(line_t *line, mobj_t *thing)
+{
+  sector_t *sec;
+  slidedoor_t *door;
+
+  /* DOOM II ONLY... */
+
+  if (gamemode != commercial) return;
+
+  /* Make sure door isn't already being animated */
+
+  sec = line->frontsector;
+  door = NULL;
+  if (sec->specialdata)
+    {
+      if (!thing->player) return;
+
+      door = sec->specialdata;
+      if (door->type == SDT_OPENANDCLOSE)
+        {
+          if (door->status == sd_waiting) door->status = sd_closing;
+        }
+      else
+        return;
+    }
+
+  /* Init sliding door vars */
+
+  if (!door)
+    {
+      door = z_malloc(sizeof(*door), PU_LEVSPEC, 0);
+      p_add_thinker(&door->thinker);
+      sec->specialdata = door;
+
+      door->type = SDT_OPENANDCLOSE;
+      door->status = sd_opening;
+      door->which_door_index = p_find_sliding_door(line);
+
+      if (door->which_door_index < 0)
+        i_error("ev_sliding_door: Can't use texture for sliding door!");
+
+      door->frontsector = sec;
+      door->backsector = line->backsector;
+      door->thinker.function = t_sliding_door;
+      door->timer = SWAITTICS;
+      door->frame = 0;
+      door->line = line;
+    }
+}
+#endif /* UNUSED */
diff --git a/games/NXDoom/src/doom/p_enemy.c b/games/NXDoom/src/doom/p_enemy.c
index c6acf390e..cf10325af 100644
--- a/games/NXDoom/src/doom/p_enemy.c
+++ b/games/NXDoom/src/doom/p_enemy.c
@@ -1,2024 +1,1932 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Enemy thinking, AI.
-//	Action Pointer Functions
-//	that are associated with states/frames. 
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_enemy.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Enemy thinking, AI.
+ *  Action Pointer Functions
+ *  that are associated with states/frames.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "m_random.h"
 #include "i_system.h"
+#include "m_random.h"
 
 #include "doomdef.h"
 #include "p_local.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "g_game.h"
 
-// State.
+/* State. */
+
 #include "doomstat.h"
 #include "r_state.h"
 
-// Data.
-#include "sounds.h"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define TRACEANGLE 0xc000000
 
+#define FATSPREAD (ANG90 / 8)
 
+#define SKULLSPEED (20 * FRACUNIT)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Data. */
 
 typedef enum
 {
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-    
+  DI_EAST,
+  DI_NORTHEAST,
+  DI_NORTH,
+  DI_NORTHWEST,
+  DI_WEST,
+  DI_SOUTHWEST,
+  DI_SOUTH,
+  DI_SOUTHEAST,
+  DI_NODIR,
+  NUMDIRS
 } dirtype_t;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void a_fall(mobj_t *actor);
+void a_refire(player_t *player, pspdef_t *psp);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* p_new_chase_dir related LUT. */
 
-//
-// P_NewChaseDir related LUT.
-//
 dirtype_t opposite[] =
 {
-  DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST,
-  DI_EAST, DI_NORTHEAST, DI_NORTH, DI_NORTHWEST, DI_NODIR
+  DI_WEST,      DI_SOUTHWEST, DI_SOUTH,     DI_SOUTHEAST, DI_EAST,
+  DI_NORTHEAST, DI_NORTH,     DI_NORTHWEST, DI_NODIR,
 };
 
 dirtype_t diags[] =
 {
-    DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST
+  DI_NORTHWEST,
+  DI_NORTHEAST,
+  DI_SOUTHWEST,
+  DI_SOUTHEAST,
 };
 
+/* ENEMY THINKING
+ * Enemies are always spawned with targetplayer = -1, threshold = 0
+ * Most monsters are spawned unaware of all players, but some can be made
+ * preaware
+ */
 
+/* Called by p_noise_alert.
+ * Recursively traverse adjacent sectors, sound blocking lines cut off
+ * traversal.
+ */
 
+mobj_t *soundtarget;
 
-
-void A_Fall (mobj_t *actor);
-
-
-//
-// ENEMY THINKING
-// Enemies are allways spawned
-// with targetplayer = -1, threshold = 0
-// Most monsters are spawned unaware of all players,
-// but some can be made preaware
-//
-
-
-//
-// Called by P_NoiseAlert.
-// Recursively traverse adjacent sectors,
-// sound blocking lines cut off traversal.
-//
-
-mobj_t*		soundtarget;
-
-void
-P_RecursiveSound
-( sector_t*	sec,
-  int		soundblocks )
+fixed_t xspeed[8] =
 {
-    int		i;
-    line_t*	check;
-    sector_t*	other;
-	
-    // wake up all monsters in this sector
-    if (sec->validcount == validcount
-	&& sec->soundtraversed <= soundblocks+1)
-    {
-	return;		// already flooded
-    }
-    
-    sec->validcount = validcount;
-    sec->soundtraversed = soundblocks+1;
-    sec->soundtarget = soundtarget;
-	
-    for (i=0 ;i<sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	if (! (check->flags & ML_TWOSIDED) )
-	    continue;
-	
-	P_LineOpening (check);
+  FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000, 0, 47000
+};
 
-	if (openrange <= 0)
-	    continue;	// closed door
-	
-	if ( sides[ check->sidenum[0] ].sector == sec)
-	    other = sides[ check->sidenum[1] ] .sector;
-	else
-	    other = sides[ check->sidenum[0] ].sector;
-	
-	if (check->flags & ML_SOUNDBLOCK)
-	{
-	    if (!soundblocks)
-		P_RecursiveSound (other, 1);
-	}
-	else
-	    P_RecursiveSound (other, soundblocks);
-    }
-}
-
-
-
-//
-// P_NoiseAlert
-// If a monster yells at a player,
-// it will alert other monsters to the player.
-//
-void
-P_NoiseAlert
-( mobj_t*	target,
-  mobj_t*	emmiter )
+fixed_t yspeed[8] =
 {
-    soundtarget = target;
-    validcount++;
-    P_RecursiveSound (emmiter->subsector->sector, 0);
-}
+  0, 47000, FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000
+};
 
+mobj_t *corpsehit;
+mobj_t *vileobj;
+fixed_t viletryx;
+fixed_t viletryy;
 
+mobj_t *braintargets[32];
+int numbraintargets;
+int braintargeton = 0;
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-//
-// P_CheckMeleeRange
-//
-boolean P_CheckMeleeRange (mobj_t*	actor)
+static void p_recursive_sound(sector_t *sec, int soundblocks)
 {
-    mobj_t*	pl;
-    fixed_t	dist;
-    fixed_t range;
-	
-    if (!actor->target)
-	return false;
-		
-    pl = actor->target;
-    dist = P_AproxDistance (pl->x-actor->x, pl->y-actor->y);
+  int i;
+  line_t *check;
+  sector_t *other;
 
-    if (gameversion < exe_doom_1_5)
-        range = MELEERANGE;
-    else
-        range = MELEERANGE-20*FRACUNIT+pl->info->radius;
+  /* wake up all monsters in this sector */
 
-    if (dist >= range)
-        return false;
-
-	
-    if (! P_CheckSight (actor, actor->target) )
-	return false;
-							
-    return true;		
-}
-
-//
-// P_CheckMissileRange
-//
-boolean P_CheckMissileRange (mobj_t* actor)
-{
-    fixed_t	dist;
-	
-    if (! P_CheckSight (actor, actor->target) )
-	return false;
-	
-    if ( actor->flags & MF_JUSTHIT )
+  if (sec->validcount == validcount &&
+      sec->soundtraversed <= soundblocks + 1)
     {
-	// the target just hit the enemy,
-	// so fight back!
-	actor->flags &= ~MF_JUSTHIT;
-	return true;
-    }
-	
-    if (actor->reactiontime)
-	return false;	// do not attack yet
-		
-    // OPTIMIZE: get this from a global checksight
-    dist = P_AproxDistance ( actor->x-actor->target->x,
-			     actor->y-actor->target->y) - 64*FRACUNIT;
-    
-    if (!actor->info->meleestate)
-	dist -= 128*FRACUNIT;	// no melee attack, so fire more
-
-    dist >>= FRACBITS;
-
-    if (actor->type == MT_VILE)
-    {
-	if (dist > 14*64)	
-	    return false;	// too far away
-    }
-	
-
-    if (actor->type == MT_UNDEAD)
-    {
-	if (dist < 196)	
-	    return false;	// close for fist attack
-	dist >>= 1;
-    }
-	
-
-    if (actor->type == MT_CYBORG
-	|| actor->type == MT_SPIDER
-	|| actor->type == MT_SKULL)
-    {
-	dist >>= 1;
-    }
-    
-    if (dist > 200)
-	dist = 200;
-		
-    if (actor->type == MT_CYBORG && dist > 160)
-	dist = 160;
-		
-    if (P_Random () < dist)
-	return false;
-		
-    return true;
-}
-
-
-//
-// P_Move
-// Move in the current direction,
-// returns false if the move is blocked.
-//
-fixed_t	xspeed[8] = {FRACUNIT,47000,0,-47000,-FRACUNIT,-47000,0,47000};
-fixed_t yspeed[8] = {0,47000,FRACUNIT,47000,0,-47000,-FRACUNIT,-47000};
-
-boolean P_Move (mobj_t*	actor)
-{
-    fixed_t	tryx;
-    fixed_t	tryy;
-    
-    line_t*	ld;
-    
-    // warning: 'catch', 'throw', and 'try'
-    // are all C++ reserved words
-    boolean	try_ok;
-    boolean	good;
-		
-    if (actor->movedir == DI_NODIR)
-	return false;
-		
-    if ((unsigned)actor->movedir >= 8)
-	I_Error ("Weird actor->movedir!");
-		
-    tryx = actor->x + actor->info->speed*xspeed[actor->movedir];
-    tryy = actor->y + actor->info->speed*yspeed[actor->movedir];
-
-    try_ok = P_TryMove (actor, tryx, tryy);
-
-    if (!try_ok)
-    {
-	// open any specials
-	if (actor->flags & MF_FLOAT && floatok)
-	{
-	    // must adjust height
-	    if (actor->z < tmfloorz)
-		actor->z += FLOATSPEED;
-	    else
-		actor->z -= FLOATSPEED;
-
-	    actor->flags |= MF_INFLOAT;
-	    return true;
-	}
-		
-	if (!numspechit)
-	    return false;
-			
-	actor->movedir = DI_NODIR;
-	good = false;
-	while (numspechit--)
-	{
-	    ld = spechit[numspechit];
-	    // if the special is not a door
-	    // that can be opened,
-	    // return false
-	    if (P_UseSpecialLine (actor, ld,0))
-		good = true;
-	}
-	return good;
-    }
-    else
-    {
-	actor->flags &= ~MF_INFLOAT;
-    }
-	
-	
-    if (! (actor->flags & MF_FLOAT) )	
-	actor->z = actor->floorz;
-    return true; 
-}
-
-
-//
-// TryWalk
-// Attempts to move actor on
-// in its current (ob->moveangle) direction.
-// If blocked by either a wall or an actor
-// returns FALSE
-// If move is either clear or blocked only by a door,
-// returns TRUE and sets...
-// If a door is in the way,
-// an OpenDoor call is made to start it opening.
-//
-boolean P_TryWalk (mobj_t* actor)
-{	
-    if (!P_Move (actor))
-    {
-	return false;
+      return; /* already flooded */
     }
 
-    actor->movecount = P_Random()&15;
-    return true;
-}
+  sec->validcount = validcount;
+  sec->soundtraversed = soundblocks + 1;
+  sec->soundtarget = soundtarget;
 
-
-
-
-void P_NewChaseDir (mobj_t*	actor)
-{
-    fixed_t	deltax;
-    fixed_t	deltay;
-    
-    dirtype_t	d[3];
-    
-    int		tdir;
-    dirtype_t	olddir;
-    
-    dirtype_t	turnaround;
-
-    if (!actor->target)
-	I_Error ("P_NewChaseDir: called with no target");
-		
-    olddir = actor->movedir;
-    turnaround=opposite[olddir];
-
-    deltax = actor->target->x - actor->x;
-    deltay = actor->target->y - actor->y;
-
-    if (deltax>10*FRACUNIT)
-	d[1]= DI_EAST;
-    else if (deltax<-10*FRACUNIT)
-	d[1]= DI_WEST;
-    else
-	d[1]=DI_NODIR;
-
-    if (deltay<-10*FRACUNIT)
-	d[2]= DI_SOUTH;
-    else if (deltay>10*FRACUNIT)
-	d[2]= DI_NORTH;
-    else
-	d[2]=DI_NODIR;
-
-    // try direct route
-    if (d[1] != DI_NODIR
-	&& d[2] != DI_NODIR)
+  for (i = 0; i < sec->linecount; i++)
     {
-	actor->movedir = diags[((deltay<0)<<1)+(deltax>0)];
-	if (actor->movedir != (int) turnaround && P_TryWalk(actor))
-	    return;
-    }
+      check = sec->lines[i];
+      if (!(check->flags & ML_TWOSIDED)) continue;
 
-    // try other directions
-    if (P_Random() > 200
-	||  abs(deltay)>abs(deltax))
-    {
-	tdir=d[1];
-	d[1]=d[2];
-	d[2]=tdir;
-    }
+      p_line_opening(check);
 
-    if (d[1]==turnaround)
-	d[1]=DI_NODIR;
-    if (d[2]==turnaround)
-	d[2]=DI_NODIR;
-	
-    if (d[1]!=DI_NODIR)
-    {
-	actor->movedir = d[1];
-	if (P_TryWalk(actor))
-	{
-	    // either moved forward or attacked
-	    return;
-	}
-    }
+      if (openrange <= 0) continue; /* closed door */
 
-    if (d[2]!=DI_NODIR)
-    {
-	actor->movedir =d[2];
+      if (sides[check->sidenum[0]].sector == sec)
+        other = sides[check->sidenum[1]].sector;
+      else
+        other = sides[check->sidenum[0]].sector;
 
-	if (P_TryWalk(actor))
-	    return;
-    }
-
-    // there is no direct path to the player,
-    // so pick another direction.
-    if (olddir!=DI_NODIR)
-    {
-	actor->movedir =olddir;
-
-	if (P_TryWalk(actor))
-	    return;
-    }
-
-    // randomly determine direction of search
-    if (P_Random()&1) 	
-    {
-	for ( tdir=DI_EAST;
-	      tdir<=DI_SOUTHEAST;
-	      tdir++ )
-	{
-	    if (tdir != (int) turnaround)
-	    {
-		actor->movedir =tdir;
-		
-		if ( P_TryWalk(actor) )
-		    return;
-	    }
-	}
-    }
-    else
-    {
-	for ( tdir=DI_SOUTHEAST;
-	      tdir != (DI_EAST-1);
-	      tdir-- )
-	{
-	    if (tdir != (int) turnaround)
-	    {
-		actor->movedir = tdir;
-		
-		if ( P_TryWalk(actor) )
-		    return;
-	    }
-	}
-    }
-
-    if (turnaround !=  DI_NODIR)
-    {
-	actor->movedir =turnaround;
-	if ( P_TryWalk(actor) )
-	    return;
-    }
-
-    actor->movedir = DI_NODIR;	// can not move
-}
-
-
-
-//
-// P_LookForPlayers
-// If allaround is false, only look 180 degrees in front.
-// Returns true if a player is targeted.
-//
-boolean
-P_LookForPlayers
-( mobj_t*	actor,
-  boolean	allaround )
-{
-    int		c;
-    int		stop;
-    player_t*	player;
-    angle_t	an;
-    fixed_t	dist;
-
-    c = 0;
-    stop = (actor->lastlook-1)&3;
-	
-    for ( ; ; actor->lastlook = (actor->lastlook+1)&3 )
-    {
-	if (!playeringame[actor->lastlook])
-	    continue;
-			
-	if (c++ == 2
-	    || actor->lastlook == stop)
-	{
-	    // done looking
-	    return false;	
-	}
-	
-	player = &players[actor->lastlook];
-
-	if (player->health <= 0)
-	    continue;		// dead
-
-	if (!P_CheckSight (actor, player->mo))
-	    continue;		// out of sight
-			
-	if (!allaround)
-	{
-	    an = R_PointToAngle2 (actor->x,
-				  actor->y, 
-				  player->mo->x,
-				  player->mo->y)
-		- actor->angle;
-	    
-	    if (an > ANG90 && an < ANG270)
-	    {
-		dist = P_AproxDistance (player->mo->x - actor->x,
-					player->mo->y - actor->y);
-		// if real close, react anyway
-		if (dist > MELEERANGE)
-		    continue;	// behind back
-	    }
-	}
-		
-	actor->target = player->mo;
-	return true;
-    }
-
-    return false;
-}
-
-
-//
-// A_KeenDie
-// DOOM II special, map 32.
-// Uses special tag 666.
-//
-void A_KeenDie (mobj_t* mo)
-{
-    thinker_t*	th;
-    mobj_t*	mo2;
-    line_t	junk;
-
-    A_Fall (mo);
-    
-    // scan the remaining thinkers
-    // to see if all Keens are dead
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
-    {
-	if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-	    continue;
-
-	mo2 = (mobj_t *)th;
-	if (mo2 != mo
-	    && mo2->type == mo->type
-	    && mo2->health > 0)
-	{
-	    // other Keen not dead
-	    return;		
-	}
-    }
-
-    junk.tag = 666;
-    EV_DoDoor(&junk, vld_open);
-}
-
-
-//
-// ACTION ROUTINES
-//
-
-//
-// A_Look
-// Stay in state until a player is sighted.
-//
-void A_Look (mobj_t* actor)
-{
-    mobj_t*	targ;
-	
-    actor->threshold = 0;	// any shot will wake up
-    targ = actor->subsector->sector->soundtarget;
-
-    if (targ
-	&& (targ->flags & MF_SHOOTABLE) )
-    {
-	actor->target = targ;
-
-	if ( actor->flags & MF_AMBUSH )
-	{
-	    if (P_CheckSight (actor, actor->target))
-		goto seeyou;
-	}
-	else
-	    goto seeyou;
-    }
-	
-	
-    if (!P_LookForPlayers (actor, false) )
-	return;
-		
-    // go into chase state
-  seeyou:
-    if (actor->info->seesound)
-    {
-	int		sound;
-		
-	switch (actor->info->seesound)
-	{
-	  case sfx_posit1:
-	  case sfx_posit2:
-	  case sfx_posit3:
-	    sound = sfx_posit1+P_Random()%3;
-	    break;
-
-	  case sfx_bgsit1:
-	  case sfx_bgsit2:
-	    sound = sfx_bgsit1+P_Random()%2;
-	    break;
-
-	  default:
-	    sound = actor->info->seesound;
-	    break;
-	}
-
-	if (actor->type==MT_SPIDER
-	    || actor->type == MT_CYBORG)
-	{
-	    // full volume
-	    S_StartSound (NULL, sound);
-	}
-	else
-	    S_StartSound (actor, sound);
-    }
-
-    P_SetMobjState (actor, actor->info->seestate);
-}
-
-
-//
-// A_Chase
-// Actor has a melee attack,
-// so it tries to close as fast as possible
-//
-void A_Chase (mobj_t*	actor)
-{
-    int		delta;
-
-    if (actor->reactiontime)
-	actor->reactiontime--;
-				
-
-    // modify target threshold
-    if  (actor->threshold)
-    {
-        if (gameversion > exe_doom_1_2 && 
-            (!actor->target || actor->target->health <= 0))
-	{
-	    actor->threshold = 0;
-	}
-	else
-	    actor->threshold--;
-    }
-    
-    // turn towards movement direction if not there yet
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-	delta = actor->angle - (actor->movedir << 29);
-	
-	if (delta > 0)
-	    actor->angle -= ANG90/2;
-	else if (delta < 0)
-	    actor->angle += ANG90/2;
-    }
-
-    if (!actor->target
-	|| !(actor->target->flags&MF_SHOOTABLE))
-    {
-	// look for a new target
-	if (P_LookForPlayers(actor,true))
-	    return; 	// got a new target
-	
-	P_SetMobjState (actor, actor->info->spawnstate);
-	return;
-    }
-    
-    // do not attack twice in a row
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-	actor->flags &= ~MF_JUSTATTACKED;
-	if (gameskill != sk_nightmare && !fastparm)
-	    P_NewChaseDir (actor);
-	return;
-    }
-    
-    // check for melee attack
-    if (actor->info->meleestate
-	&& P_CheckMeleeRange (actor))
-    {
-	if (actor->info->attacksound)
-	    S_StartSound (actor, actor->info->attacksound);
-
-	P_SetMobjState (actor, actor->info->meleestate);
-	return;
-    }
-    
-    // check for missile attack
-    if (actor->info->missilestate)
-    {
-	if (gameskill < sk_nightmare
-	    && !fastparm && actor->movecount)
-	{
-	    goto nomissile;
-	}
-	
-	if (!P_CheckMissileRange (actor))
-	    goto nomissile;
-	
-	P_SetMobjState (actor, actor->info->missilestate);
-	actor->flags |= MF_JUSTATTACKED;
-	return;
-    }
-
-    // ?
-  nomissile:
-    // possibly choose another target
-    if (netgame
-	&& !actor->threshold
-	&& !P_CheckSight (actor, actor->target) )
-    {
-	if (P_LookForPlayers(actor,true))
-	    return;	// got a new target
-    }
-    
-    // chase towards player
-    if (--actor->movecount<0
-	|| !P_Move (actor))
-    {
-	P_NewChaseDir (actor);
-    }
-    
-    // make active sound
-    if (actor->info->activesound
-	&& P_Random () < 3)
-    {
-	S_StartSound (actor, actor->info->activesound);
-    }
-}
-
-
-//
-// A_FaceTarget
-//
-void A_FaceTarget (mobj_t* actor)
-{	
-    if (!actor->target)
-	return;
-    
-    actor->flags &= ~MF_AMBUSH;
-	
-    actor->angle = R_PointToAngle2 (actor->x,
-				    actor->y,
-				    actor->target->x,
-				    actor->target->y);
-    
-    if (actor->target->flags & MF_SHADOW)
-	actor->angle += P_SubRandom() << 21;
-}
-
-
-//
-// A_PosAttack
-//
-void A_PosAttack (mobj_t* actor)
-{
-    int		angle;
-    int		damage;
-    int		slope;
-	
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-    angle = actor->angle;
-    slope = P_AimLineAttack (actor, angle, MISSILERANGE);
-
-    S_StartSound (actor, sfx_pistol);
-    angle += P_SubRandom() << 20;
-    damage = ((P_Random()%5)+1)*3;
-    P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
-}
-
-void A_SPosAttack (mobj_t* actor)
-{
-    int		i;
-    int		angle;
-    int		bangle;
-    int		damage;
-    int		slope;
-	
-    if (!actor->target)
-	return;
-
-    S_StartSound (actor, sfx_shotgn);
-    A_FaceTarget (actor);
-    bangle = actor->angle;
-    slope = P_AimLineAttack (actor, bangle, MISSILERANGE);
-
-    for (i=0 ; i<3 ; i++)
-    {
-	angle = bangle + (P_SubRandom() << 20);
-	damage = ((P_Random()%5)+1)*3;
-	P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
-    }
-}
-
-void A_CPosAttack (mobj_t* actor)
-{
-    int		angle;
-    int		bangle;
-    int		damage;
-    int		slope;
-	
-    if (!actor->target)
-	return;
-
-    S_StartSound (actor, sfx_shotgn);
-    A_FaceTarget (actor);
-    bangle = actor->angle;
-    slope = P_AimLineAttack (actor, bangle, MISSILERANGE);
-
-    angle = bangle + (P_SubRandom() << 20);
-    damage = ((P_Random()%5)+1)*3;
-    P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
-}
-
-void A_CPosRefire (mobj_t* actor)
-{	
-    // keep firing unless target got out of sight
-    A_FaceTarget (actor);
-
-    if (P_Random () < 40)
-	return;
-
-    if (!actor->target
-	|| actor->target->health <= 0
-	|| !P_CheckSight (actor, actor->target) )
-    {
-	P_SetMobjState (actor, actor->info->seestate);
-    }
-}
-
-
-void A_SpidRefire (mobj_t* actor)
-{	
-    // keep firing unless target got out of sight
-    A_FaceTarget (actor);
-
-    if (P_Random () < 10)
-	return;
-
-    if (!actor->target
-	|| actor->target->health <= 0
-	|| !P_CheckSight (actor, actor->target) )
-    {
-	P_SetMobjState (actor, actor->info->seestate);
-    }
-}
-
-void A_BspiAttack (mobj_t *actor)
-{	
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-
-    // launch a missile
-    P_SpawnMissile (actor, actor->target, MT_ARACHPLAZ);
-}
-
-
-//
-// A_TroopAttack
-//
-void A_TroopAttack (mobj_t* actor)
-{
-    int		damage;
-	
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-    if (P_CheckMeleeRange (actor))
-    {
-	S_StartSound (actor, sfx_claw);
-	damage = (P_Random()%8+1)*3;
-	P_DamageMobj (actor->target, actor, actor, damage);
-	return;
-    }
-
-    
-    // launch a missile
-    P_SpawnMissile (actor, actor->target, MT_TROOPSHOT);
-}
-
-
-void A_SargAttack (mobj_t* actor)
-{
-    int		damage;
-
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-
-    if (gameversion >= exe_doom_1_5)
-    {
-        if (!P_CheckMeleeRange (actor))
-            return;
-    }
-
-    damage = ((P_Random()%10)+1)*4;
-
-    if (gameversion <= exe_doom_1_2)
-        P_LineAttack(actor, actor->angle, MELEERANGE, 0, damage);
-    else
-        P_DamageMobj (actor->target, actor, actor, damage);
-}
-
-void A_HeadAttack (mobj_t* actor)
-{
-    int		damage;
-	
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-    if (P_CheckMeleeRange (actor))
-    {
-	damage = (P_Random()%6+1)*10;
-	P_DamageMobj (actor->target, actor, actor, damage);
-	return;
-    }
-    
-    // launch a missile
-    P_SpawnMissile (actor, actor->target, MT_HEADSHOT);
-}
-
-void A_CyberAttack (mobj_t* actor)
-{	
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-    P_SpawnMissile (actor, actor->target, MT_ROCKET);
-}
-
-
-void A_BruisAttack (mobj_t* actor)
-{
-    int		damage;
-	
-    if (!actor->target)
-	return;
-		
-    if (P_CheckMeleeRange (actor))
-    {
-	S_StartSound (actor, sfx_claw);
-	damage = (P_Random()%8+1)*10;
-	P_DamageMobj (actor->target, actor, actor, damage);
-	return;
-    }
-    
-    // launch a missile
-    P_SpawnMissile (actor, actor->target, MT_BRUISERSHOT);
-}
-
-
-//
-// A_SkelMissile
-//
-void A_SkelMissile (mobj_t* actor)
-{	
-    mobj_t*	mo;
-	
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-    actor->z += 16*FRACUNIT;	// so missile spawns higher
-    mo = P_SpawnMissile (actor, actor->target, MT_TRACER);
-    actor->z -= 16*FRACUNIT;	// back to normal
-
-    mo->x += mo->momx;
-    mo->y += mo->momy;
-    mo->tracer = actor->target;
-}
-
-int	TRACEANGLE = 0xc000000;
-
-void A_Tracer (mobj_t* actor)
-{
-    angle_t	exact;
-    fixed_t	dist;
-    fixed_t	slope;
-    mobj_t*	dest;
-    mobj_t*	th;
-		
-    if (gametic & 3)
-	return;
-    
-    // spawn a puff of smoke behind the rocket		
-    P_SpawnPuff (actor->x, actor->y, actor->z);
-	
-    th = P_SpawnMobj (actor->x-actor->momx,
-		      actor->y-actor->momy,
-		      actor->z, MT_SMOKE);
-    
-    th->momz = FRACUNIT;
-    th->tics -= P_Random()&3;
-    if (th->tics < 1)
-	th->tics = 1;
-    
-    // adjust direction
-    dest = actor->tracer;
-	
-    if (!dest || dest->health <= 0)
-	return;
-    
-    // change angle	
-    exact = R_PointToAngle2 (actor->x,
-			     actor->y,
-			     dest->x,
-			     dest->y);
-
-    if (exact != actor->angle)
-    {
-	if (exact - actor->angle > 0x80000000)
-	{
-	    actor->angle -= TRACEANGLE;
-	    if (exact - actor->angle < 0x80000000)
-		actor->angle = exact;
-	}
-	else
-	{
-	    actor->angle += TRACEANGLE;
-	    if (exact - actor->angle > 0x80000000)
-		actor->angle = exact;
-	}
-    }
-	
-    exact = actor->angle>>ANGLETOFINESHIFT;
-    actor->momx = FixedMul (actor->info->speed, finecosine[exact]);
-    actor->momy = FixedMul (actor->info->speed, finesine[exact]);
-    
-    // change slope
-    dist = P_AproxDistance (dest->x - actor->x,
-			    dest->y - actor->y);
-    
-    dist = dist / actor->info->speed;
-
-    if (dist < 1)
-	dist = 1;
-    slope = (dest->z+40*FRACUNIT - actor->z) / dist;
-
-    if (slope < actor->momz)
-	actor->momz -= FRACUNIT/8;
-    else
-	actor->momz += FRACUNIT/8;
-}
-
-
-void A_SkelWhoosh (mobj_t*	actor)
-{
-    if (!actor->target)
-	return;
-    A_FaceTarget (actor);
-    S_StartSound (actor,sfx_skeswg);
-}
-
-void A_SkelFist (mobj_t*	actor)
-{
-    int		damage;
-
-    if (!actor->target)
-	return;
-		
-    A_FaceTarget (actor);
-	
-    if (P_CheckMeleeRange (actor))
-    {
-	damage = ((P_Random()%10)+1)*6;
-	S_StartSound (actor, sfx_skepch);
-	P_DamageMobj (actor->target, actor, actor, damage);
-    }
-}
-
-
-
-//
-// PIT_VileCheck
-// Detect a corpse that could be raised.
-//
-mobj_t*		corpsehit;
-mobj_t*		vileobj;
-fixed_t		viletryx;
-fixed_t		viletryy;
-
-boolean PIT_VileCheck (mobj_t*	thing)
-{
-    int		maxdist;
-    boolean	check;
-	
-    if (!(thing->flags & MF_CORPSE) )
-	return true;	// not a monster
-    
-    if (thing->tics != -1)
-	return true;	// not lying still yet
-    
-    if (thing->info->raisestate == S_NULL)
-	return true;	// monster doesn't have a raise state
-    
-    maxdist = thing->info->radius + mobjinfo[MT_VILE].radius;
-	
-    if ( abs(thing->x - viletryx) > maxdist
-	 || abs(thing->y - viletryy) > maxdist )
-	return true;		// not actually touching
-		
-    corpsehit = thing;
-    corpsehit->momx = corpsehit->momy = 0;
-    corpsehit->height <<= 2;
-    check = P_CheckPosition (corpsehit, corpsehit->x, corpsehit->y);
-    corpsehit->height >>= 2;
-
-    if (!check)
-	return true;		// doesn't fit here
-		
-    return false;		// got one, so stop checking
-}
-
-
-
-//
-// A_VileChase
-// Check for ressurecting a body
-//
-void A_VileChase (mobj_t* actor)
-{
-    int			xl;
-    int			xh;
-    int			yl;
-    int			yh;
-    
-    int			bx;
-    int			by;
-
-    mobjinfo_t*		info;
-    mobj_t*		temp;
-	
-    if (actor->movedir != DI_NODIR)
-    {
-	// check for corpses to raise
-	viletryx =
-	    actor->x + actor->info->speed*xspeed[actor->movedir];
-	viletryy =
-	    actor->y + actor->info->speed*yspeed[actor->movedir];
-
-	xl = (viletryx - bmaporgx - MAXRADIUS*2)>>MAPBLOCKSHIFT;
-	xh = (viletryx - bmaporgx + MAXRADIUS*2)>>MAPBLOCKSHIFT;
-	yl = (viletryy - bmaporgy - MAXRADIUS*2)>>MAPBLOCKSHIFT;
-	yh = (viletryy - bmaporgy + MAXRADIUS*2)>>MAPBLOCKSHIFT;
-	
-	vileobj = actor;
-	for (bx=xl ; bx<=xh ; bx++)
-	{
-	    for (by=yl ; by<=yh ; by++)
-	    {
-		// Call PIT_VileCheck to check
-		// whether object is a corpse
-		// that canbe raised.
-		if (!P_BlockThingsIterator(bx,by,PIT_VileCheck))
-		{
-		    // got one!
-		    temp = actor->target;
-		    actor->target = corpsehit;
-		    A_FaceTarget (actor);
-		    actor->target = temp;
-					
-		    P_SetMobjState (actor, S_VILE_HEAL1);
-		    S_StartSound (corpsehit, sfx_slop);
-		    info = corpsehit->info;
-		    
-		    P_SetMobjState (corpsehit,info->raisestate);
-		    corpsehit->height <<= 2;
-		    corpsehit->flags = info->flags;
-		    corpsehit->health = info->spawnhealth;
-		    corpsehit->target = NULL;
-
-		    return;
-		}
-	    }
-	}
-    }
-
-    // Return to normal attack.
-    A_Chase (actor);
-}
-
-
-//
-// A_VileStart
-//
-void A_VileStart (mobj_t* actor)
-{
-    S_StartSound (actor, sfx_vilatk);
-}
-
-
-//
-// A_Fire
-// Keep fire in front of player unless out of sight
-//
-void A_Fire (mobj_t* actor);
-
-void A_StartFire (mobj_t* actor)
-{
-    S_StartSound(actor,sfx_flamst);
-    A_Fire(actor);
-}
-
-void A_FireCrackle (mobj_t* actor)
-{
-    S_StartSound(actor,sfx_flame);
-    A_Fire(actor);
-}
-
-void A_Fire (mobj_t* actor)
-{
-    mobj_t*	dest;
-    mobj_t*     target;
-    unsigned	an;
-		
-    dest = actor->tracer;
-    if (!dest)
-	return;
-
-    target = P_SubstNullMobj(actor->target);
-		
-    // don't move it if the vile lost sight
-    if (!P_CheckSight (target, dest) )
-	return;
-
-    an = dest->angle >> ANGLETOFINESHIFT;
-
-    P_UnsetThingPosition (actor);
-    actor->x = dest->x + FixedMul (24*FRACUNIT, finecosine[an]);
-    actor->y = dest->y + FixedMul (24*FRACUNIT, finesine[an]);
-    actor->z = dest->z;
-    P_SetThingPosition (actor);
-}
-
-
-
-//
-// A_VileTarget
-// Spawn the hellfire
-//
-void A_VileTarget (mobj_t*	actor)
-{
-    mobj_t*	fog;
-	
-    if (!actor->target)
-	return;
-
-    A_FaceTarget (actor);
-
-    fog = P_SpawnMobj (actor->target->x,
-		       actor->target->x,
-		       actor->target->z, MT_FIRE);
-    
-    actor->tracer = fog;
-    fog->target = actor;
-    fog->tracer = actor->target;
-    A_Fire (fog);
-}
-
-
-
-
-//
-// A_VileAttack
-//
-void A_VileAttack (mobj_t* actor)
-{	
-    mobj_t*	fire;
-    int		an;
-	
-    if (!actor->target)
-	return;
-    
-    A_FaceTarget (actor);
-
-    if (!P_CheckSight (actor, actor->target) )
-	return;
-
-    S_StartSound (actor, sfx_barexp);
-    P_DamageMobj (actor->target, actor, actor, 20);
-    actor->target->momz = 1000*FRACUNIT/actor->target->info->mass;
-	
-    an = actor->angle >> ANGLETOFINESHIFT;
-
-    fire = actor->tracer;
-
-    if (!fire)
-	return;
-		
-    // move the fire between the vile and the player
-    fire->x = actor->target->x - FixedMul (24*FRACUNIT, finecosine[an]);
-    fire->y = actor->target->y - FixedMul (24*FRACUNIT, finesine[an]);	
-    P_RadiusAttack (fire, actor, 70 );
-}
-
-
-
-
-//
-// Mancubus attack,
-// firing three missiles (bruisers)
-// in three different directions?
-// Doesn't look like it. 
-//
-#define	FATSPREAD	(ANG90/8)
-
-void A_FatRaise (mobj_t *actor)
-{
-    A_FaceTarget (actor);
-    S_StartSound (actor, sfx_manatk);
-}
-
-
-void A_FatAttack1 (mobj_t* actor)
-{
-    mobj_t*	mo;
-    mobj_t*     target;
-    int		an;
-
-    A_FaceTarget (actor);
-
-    // Change direction  to ...
-    actor->angle += FATSPREAD;
-    target = P_SubstNullMobj(actor->target);
-    P_SpawnMissile (actor, target, MT_FATSHOT);
-
-    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
-    mo->angle += FATSPREAD;
-    an = mo->angle >> ANGLETOFINESHIFT;
-    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
-    mo->momy = FixedMul (mo->info->speed, finesine[an]);
-}
-
-void A_FatAttack2 (mobj_t* actor)
-{
-    mobj_t*	mo;
-    mobj_t*     target;
-    int		an;
-
-    A_FaceTarget (actor);
-    // Now here choose opposite deviation.
-    actor->angle -= FATSPREAD;
-    target = P_SubstNullMobj(actor->target);
-    P_SpawnMissile (actor, target, MT_FATSHOT);
-
-    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
-    mo->angle -= FATSPREAD*2;
-    an = mo->angle >> ANGLETOFINESHIFT;
-    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
-    mo->momy = FixedMul (mo->info->speed, finesine[an]);
-}
-
-void A_FatAttack3 (mobj_t*	actor)
-{
-    mobj_t*	mo;
-    mobj_t*     target;
-    int		an;
-
-    A_FaceTarget (actor);
-
-    target = P_SubstNullMobj(actor->target);
-    
-    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
-    mo->angle -= FATSPREAD/2;
-    an = mo->angle >> ANGLETOFINESHIFT;
-    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
-    mo->momy = FixedMul (mo->info->speed, finesine[an]);
-
-    mo = P_SpawnMissile (actor, target, MT_FATSHOT);
-    mo->angle += FATSPREAD/2;
-    an = mo->angle >> ANGLETOFINESHIFT;
-    mo->momx = FixedMul (mo->info->speed, finecosine[an]);
-    mo->momy = FixedMul (mo->info->speed, finesine[an]);
-}
-
-
-//
-// SkullAttack
-// Fly at the player like a missile.
-//
-#define	SKULLSPEED		(20*FRACUNIT)
-
-void A_SkullAttack (mobj_t* actor)
-{
-    mobj_t*		dest;
-    angle_t		an;
-    int			dist;
-
-    if (!actor->target)
-	return;
-		
-    dest = actor->target;	
-    actor->flags |= MF_SKULLFLY;
-
-    S_StartSound (actor, actor->info->attacksound);
-    A_FaceTarget (actor);
-    an = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul (SKULLSPEED, finecosine[an]);
-    actor->momy = FixedMul (SKULLSPEED, finesine[an]);
-    dist = P_AproxDistance (dest->x - actor->x, dest->y - actor->y);
-    dist = dist / SKULLSPEED;
-    
-    if (dist < 1)
-	dist = 1;
-    actor->momz = (dest->z+(dest->height>>1) - actor->z) / dist;
-}
-
-
-//
-// A_PainShootSkull
-// Spawn a lost soul and launch it at the target
-//
-void
-A_PainShootSkull
-( mobj_t*	actor,
-  angle_t	angle )
-{
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	z;
-    
-    mobj_t*	newmobj;
-    angle_t	an;
-    int		prestep;
-    int		count;
-    thinker_t*	currentthinker;
-
-    // count total number of skull currently on the level
-    count = 0;
-
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
-    {
-	if (   (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
-	    && ((mobj_t *)currentthinker)->type == MT_SKULL)
-	    count++;
-	currentthinker = currentthinker->next;
-    }
-
-    // if there are allready 20 skulls on the level,
-    // don't spit another one
-    if (count > 20)
-	return;
-
-
-    // okay, there's playe for another one
-    an = angle >> ANGLETOFINESHIFT;
-    
-    prestep =
-	4*FRACUNIT
-	+ 3*(actor->info->radius + mobjinfo[MT_SKULL].radius)/2;
-    
-    x = actor->x + FixedMul (prestep, finecosine[an]);
-    y = actor->y + FixedMul (prestep, finesine[an]);
-    z = actor->z + 8*FRACUNIT;
-		
-    newmobj = P_SpawnMobj (x , y, z, MT_SKULL);
-
-    // Check for movements.
-    if (!P_TryMove (newmobj, newmobj->x, newmobj->y))
-    {
-	// kill it immediately
-	P_DamageMobj (newmobj,actor,actor,10000);	
-	return;
-    }
-		
-    newmobj->target = actor->target;
-    A_SkullAttack (newmobj);
-}
-
-
-//
-// A_PainAttack
-// Spawn a lost soul and launch it at the target
-// 
-void A_PainAttack (mobj_t* actor)
-{
-    if (!actor->target)
-	return;
-
-    A_FaceTarget (actor);
-    A_PainShootSkull (actor, actor->angle);
-}
-
-
-void A_PainDie (mobj_t* actor)
-{
-    A_Fall (actor);
-    A_PainShootSkull (actor, actor->angle+ANG90);
-    A_PainShootSkull (actor, actor->angle+ANG180);
-    A_PainShootSkull (actor, actor->angle+ANG270);
-}
-
-
-
-
-
-
-void A_Scream (mobj_t* actor)
-{
-    int		sound;
-	
-    switch (actor->info->deathsound)
-    {
-      case 0:
-	return;
-		
-      case sfx_podth1:
-      case sfx_podth2:
-      case sfx_podth3:
-	sound = sfx_podth1 + P_Random ()%3;
-	break;
-		
-      case sfx_bgdth1:
-      case sfx_bgdth2:
-	sound = sfx_bgdth1 + P_Random ()%2;
-	break;
-	
-      default:
-	sound = actor->info->deathsound;
-	break;
-    }
-
-    // Check for bosses.
-    if (actor->type==MT_SPIDER
-	|| actor->type == MT_CYBORG)
-    {
-	// full volume
-	S_StartSound (NULL, sound);
-    }
-    else
-	S_StartSound (actor, sound);
-}
-
-
-void A_XScream (mobj_t* actor)
-{
-    S_StartSound (actor, sfx_slop);	
-}
-
-void A_Pain (mobj_t* actor)
-{
-    if (actor->info->painsound)
-	S_StartSound (actor, actor->info->painsound);	
-}
-
-
-
-void A_Fall (mobj_t *actor)
-{
-    // actor is on ground, it can be walked over
-    actor->flags &= ~MF_SOLID;
-
-    // So change this if corpse objects
-    // are meant to be obstacles.
-}
-
-
-//
-// A_Explode
-//
-void A_Explode (mobj_t* thingy)
-{
-    P_RadiusAttack(thingy, thingy->target, 128);
-}
-
-// Check whether the death of the specified monster type is allowed
-// to trigger the end of episode special action.
-//
-// This behavior changed in v1.9, the most notable effect of which
-// was to break uac_dead.wad
-
-static boolean CheckBossEnd(mobjtype_t motype)
-{
-    if (gameversion < exe_ultimate)
-    {
-        if (gamemap != 8)
+      if (check->flags & ML_SOUNDBLOCK)
         {
-            return false;
+          if (!soundblocks) p_recursive_sound(other, 1);
+        }
+      else
+        p_recursive_sound(other, soundblocks);
+    }
+}
+
+static boolean p_check_missile_range(mobj_t *actor)
+{
+  fixed_t dist;
+
+  if (!p_check_sight(actor, actor->target)) return false;
+
+  if (actor->flags & MF_JUSTHIT)
+    {
+      /* the target just hit the enemy, so fight back! */
+
+      actor->flags &= ~MF_JUSTHIT;
+      return true;
+    }
+
+  if (actor->reactiontime) return false; /* do not attack yet */
+
+  /* OPTIMIZE: get this from a global checksight */
+
+  dist = p_approx_distance(actor->x - actor->target->x,
+                           actor->y - actor->target->y) -
+         64 * FRACUNIT;
+
+  if (!actor->info->meleestate)
+    dist -= 128 * FRACUNIT; /* no melee attack, so fire more */
+
+  dist >>= FRACBITS;
+
+  if (actor->type == MT_VILE)
+    {
+      if (dist > 14 * 64) return false; /* too far away */
+    }
+
+  if (actor->type == MT_UNDEAD)
+    {
+      if (dist < 196) return false; /* close for fist attack */
+      dist >>= 1;
+    }
+
+  if (actor->type == MT_CYBORG || actor->type == MT_SPIDER ||
+      actor->type == MT_SKULL)
+    {
+      dist >>= 1;
+    }
+
+  if (dist > 200) dist = 200;
+
+  if (actor->type == MT_CYBORG && dist > 160) dist = 160;
+
+  if (p_random() < dist) return false;
+
+  return true;
+}
+
+/* p_move
+ * Move in the current direction, returns false if the move is blocked.
+ */
+
+static boolean p_move(mobj_t *actor)
+{
+  fixed_t tryx;
+  fixed_t tryy;
+
+  line_t *ld;
+
+  /* warning: 'catch', 'throw', and 'try' are all C++ reserved words */
+
+  boolean try_ok;
+  boolean good;
+
+  if (actor->movedir == DI_NODIR) return false;
+
+  if ((unsigned)actor->movedir >= 8) i_error("Weird actor->movedir!");
+
+  tryx = actor->x + actor->info->speed * xspeed[actor->movedir];
+  tryy = actor->y + actor->info->speed * yspeed[actor->movedir];
+
+  try_ok = p_try_move(actor, tryx, tryy);
+
+  if (!try_ok)
+    {
+      /* open any specials */
+
+      if (actor->flags & MF_FLOAT && floatok)
+        {
+          /* must adjust height */
+
+          if (actor->z < tmfloorz)
+            actor->z += FLOATSPEED;
+          else
+            actor->z -= FLOATSPEED;
+
+          actor->flags |= MF_INFLOAT;
+          return true;
         }
 
-        // Baron death on later episodes is nothing special.
+      if (!numspechit) return false;
 
-        if (motype == MT_BRUISER && gameepisode != 1)
+      actor->movedir = DI_NODIR;
+      good = false;
+      while (numspechit--)
         {
-            return false;
+          ld = spechit[numspechit];
+
+          /* if the special is not a door that can be opened, return false */
+
+          if (p_use_special_line(actor, ld, 0)) good = true;
         }
 
-        return true;
+      return good;
     }
-    else
+  else
     {
-        // New logic that appeared in Ultimate Doom.
-        // Looks like the logic was overhauled while adding in the
-        // episode 4 support.  Now bosses only trigger on their
-        // specific episode.
-
-	switch(gameepisode)
-	{
-            case 1:
-                return gamemap == 8 && motype == MT_BRUISER;
-
-            case 2:
-                return gamemap == 8 && motype == MT_CYBORG;
-
-            case 3:
-                return gamemap == 8 && motype == MT_SPIDER;
-
-	    case 4:
-                return (gamemap == 6 && motype == MT_CYBORG)
-                    || (gamemap == 8 && motype == MT_SPIDER);
-
-            default:
-                return gamemap == 8;
-	}
+      actor->flags &= ~MF_INFLOAT;
     }
+
+  if (!(actor->flags & MF_FLOAT)) actor->z = actor->floorz;
+  return true;
 }
 
-//
-// A_BossDeath
-// Possibly trigger special effects
-// if on first boss level
-//
-void A_BossDeath (mobj_t* mo)
+/* p_try_walk
+ *
+ * Attempts to move actor on in its current (ob->moveangle) direction.
+ * If blocked by either a wall or an actor returns FALSE
+ * If move is either clear or blocked only by a door, returns TRUE and
+ * sets...
+ * If a door is in the way, an OpenDoor call is made to start it opening.
+ */
+
+static boolean p_try_walk(mobj_t *actor)
 {
-    thinker_t*	th;
-    mobj_t*	mo2;
-    line_t	junk;
-    int		i;
-		
-    if ( gamemode == commercial)
+  if (!p_move(actor))
     {
-	if (gamemap != 7)
-	    return;
-		
-	if ((mo->type != MT_FATSO)
-	    && (mo->type != MT_BABY))
-	    return;
+      return false;
     }
-    else
+
+  actor->movecount = p_random() & 15;
+  return true;
+}
+
+static void p_new_chase_dir(mobj_t *actor)
+{
+  fixed_t deltax;
+  fixed_t deltay;
+
+  dirtype_t d[3];
+
+  int tdir;
+  dirtype_t olddir;
+
+  dirtype_t turnaround;
+
+  if (!actor->target) i_error("p_new_chase_dir: called with no target");
+
+  olddir = actor->movedir;
+  turnaround = opposite[olddir];
+
+  deltax = actor->target->x - actor->x;
+  deltay = actor->target->y - actor->y;
+
+  if (deltax > 10 * FRACUNIT)
+    d[1] = DI_EAST;
+  else if (deltax < -10 * FRACUNIT)
+    d[1] = DI_WEST;
+  else
+    d[1] = DI_NODIR;
+
+  if (deltay < -10 * FRACUNIT)
+    d[2] = DI_SOUTH;
+  else if (deltay > 10 * FRACUNIT)
+    d[2] = DI_NORTH;
+  else
+    d[2] = DI_NODIR;
+
+  /* try direct route */
+
+  if (d[1] != DI_NODIR && d[2] != DI_NODIR)
     {
-        if (!CheckBossEnd(mo->type))
+      actor->movedir = diags[((deltay < 0) << 1) + (deltax > 0)];
+      if (actor->movedir != (int)turnaround && p_try_walk(actor)) return;
+    }
+
+  /* try other directions */
+
+  if (p_random() > 200 || abs(deltay) > abs(deltax))
+    {
+      tdir = d[1];
+      d[1] = d[2];
+      d[2] = tdir;
+    }
+
+  if (d[1] == turnaround) d[1] = DI_NODIR;
+  if (d[2] == turnaround) d[2] = DI_NODIR;
+
+  if (d[1] != DI_NODIR)
+    {
+      actor->movedir = d[1];
+      if (p_try_walk(actor))
         {
-            return;
+          return; /* either moved forward or attacked */
         }
     }
 
-    // make sure there is a player alive for victory
-    for (i=0 ; i<MAXPLAYERS ; i++)
-	if (playeringame[i] && players[i].health > 0)
-	    break;
-    
-    if (i==MAXPLAYERS)
-	return;	// no one left alive, so do not end game
-    
-    // scan the remaining thinkers to see
-    // if all bosses are dead
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+  if (d[2] != DI_NODIR)
     {
-	if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-	    continue;
-	
-	mo2 = (mobj_t *)th;
-	if (mo2 != mo
-	    && mo2->type == mo->type
-	    && mo2->health > 0)
-	{
-	    // other boss not dead
-	    return;
-	}
+      actor->movedir = d[2];
+
+      if (p_try_walk(actor)) return;
     }
-	
-    // victory!
-    if ( gamemode == commercial)
+
+  /* there is no direct path to the player, so pick another direction. */
+
+  if (olddir != DI_NODIR)
     {
-	if (gamemap == 7)
-	{
-	    if (mo->type == MT_FATSO)
-	    {
-		junk.tag = 666;
-		EV_DoFloor(&junk,lowerFloorToLowest);
-		return;
-	    }
-	    
-	    if (mo->type == MT_BABY)
-	    {
-		junk.tag = 667;
-		EV_DoFloor(&junk,raiseToTexture);
-		return;
-	    }
-	}
+      actor->movedir = olddir;
+
+      if (p_try_walk(actor)) return;
     }
-    else
+
+  /* randomly determine direction of search */
+
+  if (p_random() & 1)
     {
-	switch(gameepisode)
-	{
-	  case 1:
-	    junk.tag = 666;
-	    EV_DoFloor (&junk, lowerFloorToLowest);
-	    return;
-	    break;
-	    
-	  case 4:
-	    switch(gamemap)
-	    {
-	      case 6:
-		junk.tag = 666;
-		EV_DoDoor (&junk, vld_blazeOpen);
-		return;
-		break;
-		
-	      case 8:
-		junk.tag = 666;
-		EV_DoFloor (&junk, lowerFloorToLowest);
-		return;
-		break;
-	    }
-	}
+      for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
+        {
+          if (tdir != (int)turnaround)
+            {
+              actor->movedir = tdir;
+
+              if (p_try_walk(actor)) return;
+            }
+        }
     }
-	
-    G_ExitLevel ();
-}
-
-
-void A_Hoof (mobj_t* mo)
-{
-    S_StartSound (mo, sfx_hoof);
-    A_Chase (mo);
-}
-
-void A_Metal (mobj_t* mo)
-{
-    S_StartSound (mo, sfx_metal);
-    A_Chase (mo);
-}
-
-void A_BabyMetal (mobj_t* mo)
-{
-    S_StartSound (mo, sfx_bspwlk);
-    A_Chase (mo);
-}
-
-void
-A_OpenShotgun2
-( player_t*	player,
-  pspdef_t*	psp )
-{
-    S_StartSound (player->mo, sfx_dbopn);
-}
-
-void
-A_LoadShotgun2
-( player_t*	player,
-  pspdef_t*	psp )
-{
-    S_StartSound (player->mo, sfx_dbload);
-}
-
-void
-A_ReFire
-( player_t*	player,
-  pspdef_t*	psp );
-
-void
-A_CloseShotgun2
-( player_t*	player,
-  pspdef_t*	psp )
-{
-    S_StartSound (player->mo, sfx_dbcls);
-    A_ReFire(player,psp);
-}
-
-
-
-mobj_t*		braintargets[32];
-int		numbraintargets;
-int		braintargeton = 0;
-
-void A_BrainAwake (mobj_t* mo)
-{
-    thinker_t*	thinker;
-    mobj_t*	m;
-	
-    // find all the target spots
-    numbraintargets = 0;
-    braintargeton = 0;
-
-    for (thinker = thinkercap.next ;
-	 thinker != &thinkercap ;
-	 thinker = thinker->next)
+  else
     {
-	if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
-	    continue;	// not a mobj
+      for (tdir = DI_SOUTHEAST; tdir != (DI_EAST - 1); tdir--)
+        {
+          if (tdir != (int)turnaround)
+            {
+              actor->movedir = tdir;
 
-	m = (mobj_t *)thinker;
-
-	if (m->type == MT_BOSSTARGET )
-	{
-	    braintargets[numbraintargets] = m;
-	    numbraintargets++;
-	}
+              if (p_try_walk(actor)) return;
+            }
+        }
     }
-	
-    S_StartSound (NULL,sfx_bossit);
-}
 
-
-void A_BrainPain (mobj_t*	mo)
-{
-    S_StartSound (NULL,sfx_bospn);
-}
-
-
-void A_BrainScream (mobj_t*	mo)
-{
-    int		x;
-    int		y;
-    int		z;
-    mobj_t*	th;
-	
-    for (x=mo->x - 196*FRACUNIT ; x< mo->x + 320*FRACUNIT ; x+= FRACUNIT*8)
+  if (turnaround != DI_NODIR)
     {
-	y = mo->y - 320*FRACUNIT;
-	z = 128 + P_Random()*2*FRACUNIT;
-	th = P_SpawnMobj (x,y,z, MT_ROCKET);
-	th->momz = P_Random()*512;
-
-	P_SetMobjState (th, S_BRAINEXPLODE1);
-
-	th->tics -= P_Random()&7;
-	if (th->tics < 1)
-	    th->tics = 1;
+      actor->movedir = turnaround;
+      if (p_try_walk(actor)) return;
     }
-	
-    S_StartSound (NULL,sfx_bosdth);
+
+  actor->movedir = DI_NODIR; /* can not move */
 }
 
+/* p_look_for_players
+ * If allaround is false, only look 180 degrees in front. Returns true if a
+ * player is targeted.
+ */
 
-
-void A_BrainExplode (mobj_t* mo)
+static boolean p_look_for_players(mobj_t *actor, boolean allaround)
 {
-    int		x;
-    int		y;
-    int		z;
-    mobj_t*	th;
-	
-    x = mo->x +  P_SubRandom() * 2048;
-    y = mo->y;
-    z = 128 + P_Random()*2*FRACUNIT;
-    th = P_SpawnMobj (x,y,z, MT_ROCKET);
-    th->momz = P_Random()*512;
+  int c;
+  int stop;
+  player_t *player;
+  angle_t an;
+  fixed_t dist;
 
-    P_SetMobjState (th, S_BRAINEXPLODE1);
+  c = 0;
+  stop = (actor->lastlook - 1) & 3;
 
-    th->tics -= P_Random()&7;
-    if (th->tics < 1)
-	th->tics = 1;
-}
-
-
-void A_BrainDie (mobj_t*	mo)
-{
-    G_ExitLevel ();
-}
-
-void A_BrainSpit (mobj_t*	mo)
-{
-    mobj_t*	targ;
-    mobj_t*	newmobj;
-    
-    static int	easy = 0;
-	
-    easy ^= 1;
-    if (gameskill <= sk_easy && (!easy))
-	return;
-		
-    // shoot a cube at current target
-    targ = braintargets[braintargeton];
-    if (numbraintargets == 0)
+  for (; ; actor->lastlook = (actor->lastlook + 1) & 3)
     {
-        I_Error("A_BrainSpit: numbraintargets was 0 (vanilla crashes here)");
+      if (!playeringame[actor->lastlook]) continue;
+
+      if (c++ == 2 || actor->lastlook == stop)
+        {
+          return false; /* done looking */
+        }
+
+      player = &players[actor->lastlook];
+
+      if (player->health <= 0) continue; /* dead */
+
+      if (!p_check_sight(actor, player->mo)) continue; /* out of sight */
+
+      if (!allaround)
+        {
+          an = r_point_to_angle2(actor->x, actor->y, player->mo->x,
+                                 player->mo->y) -
+               actor->angle;
+
+          if (an > ANG90 && an < ANG270)
+            {
+              dist = p_approx_distance(player->mo->x - actor->x,
+                                       player->mo->y - actor->y);
+
+              /* if real close, react anyway */
+
+              if (dist > MELEERANGE) continue; /* behind back */
+            }
+        }
+
+      actor->target = player->mo;
+      return true;
     }
-    braintargeton = (braintargeton+1)%numbraintargets;
 
-    // spawn brain missile
-    newmobj = P_SpawnMissile (mo, targ, MT_SPAWNSHOT);
-    newmobj->target = targ;
-    newmobj->reactiontime =
-	((targ->y - mo->y)/newmobj->momy) / newmobj->state->tics;
-
-    S_StartSound(NULL, sfx_bospit);
+  return false;
 }
 
+/* pit_vile_check
+ * Detect a corpse that could be raised.
+ */
 
-
-void A_SpawnFly (mobj_t* mo);
-
-// travelling cube sound
-void A_SpawnSound (mobj_t* mo)	
+static boolean pit_vile_check(mobj_t *thing)
 {
-    S_StartSound (mo,sfx_boscub);
-    A_SpawnFly(mo);
-}
+  int maxdist;
+  boolean check;
 
-void A_SpawnFly (mobj_t* mo)
-{
-    mobj_t*	newmobj;
-    mobj_t*	fog;
-    mobj_t*	targ;
-    int		r;
-    mobjtype_t	type;
-	
-    if (--mo->reactiontime)
-	return;	// still flying
-	
-    targ = P_SubstNullMobj(mo->target);
+  if (!(thing->flags & MF_CORPSE)) return true; /* not a monster */
 
-    // First spawn teleport fog.
-    fog = P_SpawnMobj (targ->x, targ->y, targ->z, MT_SPAWNFIRE);
-    S_StartSound (fog, sfx_telept);
+  if (thing->tics != -1) return true; /* not lying still yet */
 
-    // Randomly select monster to spawn.
-    r = P_Random ();
-
-    // Probability distribution (kind of :),
-    // decreasing likelihood.
-    if ( r<50 )
-	type = MT_TROOP;
-    else if (r<90)
-	type = MT_SERGEANT;
-    else if (r<120)
-	type = MT_SHADOWS;
-    else if (r<130)
-	type = MT_PAIN;
-    else if (r<160)
-	type = MT_HEAD;
-    else if (r<162)
-	type = MT_VILE;
-    else if (r<172)
-	type = MT_UNDEAD;
-    else if (r<192)
-	type = MT_BABY;
-    else if (r<222)
-	type = MT_FATSO;
-    else if (r<246)
-	type = MT_KNIGHT;
-    else
-	type = MT_BRUISER;		
-
-    newmobj	= P_SpawnMobj (targ->x, targ->y, targ->z, type);
-    if (P_LookForPlayers (newmobj, true) )
-	P_SetMobjState (newmobj, newmobj->info->seestate);
-	
-    // telefrag anything in this spot
-    P_TeleportMove (newmobj, newmobj->x, newmobj->y);
-
-    // remove self (i.e., cube).
-    P_RemoveMobj (mo);
-}
-
-
-
-void A_PlayerScream (mobj_t* mo)
-{
-    // Default death sound.
-    int		sound = sfx_pldeth;
-	
-    if ( (gamemode == commercial)
-	&& 	(mo->health < -50))
+  if (thing->info->raisestate == S_NULL)
     {
-	// IF THE PLAYER DIES
-	// LESS THAN -50% WITHOUT GIBBING
-	sound = sfx_pdiehi;
+      return true; /* monster doesn't have a raise state */
     }
-    
-    S_StartSound (mo, sound);
+
+  maxdist = thing->info->radius + mobjinfo[MT_VILE].radius;
+
+  if (abs(thing->x - viletryx) > maxdist ||
+      abs(thing->y - viletryy) > maxdist)
+    {
+      return true; /* not actually touching */
+    }
+
+  corpsehit = thing;
+  corpsehit->momx = corpsehit->momy = 0;
+  corpsehit->height <<= 2;
+  check = p_check_position(corpsehit, corpsehit->x, corpsehit->y);
+  corpsehit->height >>= 2;
+
+  if (!check) return true; /* doesn't fit here */
+
+  return false; /* got one, so stop checking */
+}
+
+/* Check whether the death of the specified monster type is allowed
+ * to trigger the end of episode special action.
+ *
+ * This behavior changed in v1.9, the most notable effect of which
+ * was to break uac_dead.wad
+ */
+
+static boolean check_boss_end(mobjtype_t motype)
+{
+  if (gameversion < exe_ultimate)
+    {
+      if (gamemap != 8)
+        {
+          return false;
+        }
+
+      /* Baron death on later episodes is nothing special. */
+
+      if (motype == MT_BRUISER && gameepisode != 1)
+        {
+          return false;
+        }
+
+      return true;
+    }
+  else
+    {
+      /* New logic that appeared in Ultimate Doom.
+       * Looks like the logic was overhauled while adding in the
+       * episode 4 support.  Now bosses only trigger on their
+       * specific episode.
+       */
+
+      switch (gameepisode)
+        {
+        case 1:
+          return gamemap == 8 && motype == MT_BRUISER;
+
+        case 2:
+          return gamemap == 8 && motype == MT_CYBORG;
+
+        case 3:
+          return gamemap == 8 && motype == MT_SPIDER;
+
+        case 4:
+          return (gamemap == 6 && motype == MT_CYBORG) ||
+                 (gamemap == 8 && motype == MT_SPIDER);
+
+        default:
+          return gamemap == 8;
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* p_noise_alert
+ * If a monster yells at a player,
+ * it will alert other monsters to the player.
+ */
+
+void p_noise_alert(mobj_t *target, mobj_t *emmiter)
+{
+  soundtarget = target;
+  validcount++;
+  p_recursive_sound(emmiter->subsector->sector, 0);
+}
+
+boolean p_check_melee_range(mobj_t *actor)
+{
+  mobj_t *pl;
+  fixed_t dist;
+  fixed_t range;
+
+  if (!actor->target) return false;
+
+  pl = actor->target;
+  dist = p_approx_distance(pl->x - actor->x, pl->y - actor->y);
+
+  if (gameversion < exe_doom_1_5)
+    range = MELEERANGE;
+  else
+    range = MELEERANGE - 20 * FRACUNIT + pl->info->radius;
+
+  if (dist >= range) return false;
+
+  if (!p_check_sight(actor, actor->target)) return false;
+
+  return true;
+}
+
+/* a_keen_die
+ * DOOM II special, map 32. Uses special tag 666.
+ */
+
+void a_keen_die(mobj_t *mo)
+{
+  thinker_t *th;
+  mobj_t *mo2;
+  line_t junk;
+
+  a_fall(mo);
+
+  /* scan the remaining thinkers to see if all Keens are dead */
+
+  for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+      if (th->function.acp1 != (actionf_p1)p_mobj_thinker) continue;
+
+      mo2 = (mobj_t *)th;
+      if (mo2 != mo && mo2->type == mo->type && mo2->health > 0)
+        {
+          return; /* other Keen not dead */
+        }
+    }
+
+  junk.tag = 666;
+  ev_do_door(&junk, VLD_OPEN);
+}
+
+/* ACTION ROUTINES */
+
+/* a_look
+ * Stay in state until a player is sighted.
+ */
+
+void a_look(mobj_t *actor)
+{
+  mobj_t *targ;
+
+  actor->threshold = 0; /* any shot will wake up */
+  targ = actor->subsector->sector->soundtarget;
+
+  if (targ && (targ->flags & MF_SHOOTABLE))
+    {
+      actor->target = targ;
+
+      if (actor->flags & MF_AMBUSH)
+        {
+          if (p_check_sight(actor, actor->target)) goto seeyou;
+        }
+      else
+        {
+          goto seeyou;
+        }
+    }
+
+  if (!p_look_for_players(actor, false)) return;
+
+  /* go into chase state */
+
+seeyou:
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (actor->info->seesound)
+    {
+      int sound;
+
+      switch (actor->info->seesound)
+        {
+        case SFX_POSIT1:
+        case SFX_POSIT2:
+        case SFX_POSIT3:
+          sound = SFX_POSIT1 + p_random() % 3;
+          break;
+
+        case SFX_BGSIT1:
+        case SFX_BGSIT2:
+          sound = SFX_BGSIT1 + p_random() % 2;
+          break;
+
+        default:
+          sound = actor->info->seesound;
+          break;
+        }
+
+      if (actor->type == MT_SPIDER || actor->type == MT_CYBORG)
+        {
+          /* full volume */
+
+          s_start_sound(NULL, sound);
+        }
+      else
+        s_start_sound(actor, sound);
+    }
+#endif
+
+  p_set_mobj_state(actor, actor->info->seestate);
+}
+
+/* a_chase
+ * Actor has a melee attack, so it tries to close as fast as possible
+ */
+
+void a_chase(mobj_t *actor)
+{
+  int delta;
+
+  if (actor->reactiontime) actor->reactiontime--;
+
+  /* modify target threshold */
+
+  if (actor->threshold)
+    {
+      if (gameversion > exe_doom_1_2 &&
+          (!actor->target || actor->target->health <= 0))
+        {
+          actor->threshold = 0;
+        }
+      else
+        actor->threshold--;
+    }
+
+  /* turn towards movement direction if not there yet */
+
+  if (actor->movedir < 8)
+    {
+      actor->angle &= (7u << 29);
+      delta = actor->angle - (actor->movedir << 29);
+
+      if (delta > 0)
+        actor->angle -= ANG90 / 2;
+      else if (delta < 0)
+        actor->angle += ANG90 / 2;
+    }
+
+  if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
+    {
+      /* look for a new target */
+
+      if (p_look_for_players(actor, true)) return; /* got a new target */
+
+      p_set_mobj_state(actor, actor->info->spawnstate);
+      return;
+    }
+
+  /* do not attack twice in a row */
+
+  if (actor->flags & MF_JUSTATTACKED)
+    {
+      actor->flags &= ~MF_JUSTATTACKED;
+      if (gameskill != sk_nightmare && !fastparm) p_new_chase_dir(actor);
+      return;
+    }
+
+  /* check for melee attack */
+
+  if (actor->info->meleestate && p_check_melee_range(actor))
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (actor->info->attacksound)
+        s_start_sound(actor, actor->info->attacksound);
+#endif
+
+      p_set_mobj_state(actor, actor->info->meleestate);
+      return;
+    }
+
+  /* check for missile attack */
+
+  if (actor->info->missilestate)
+    {
+      if (gameskill < sk_nightmare && !fastparm && actor->movecount)
+        {
+          goto nomissile;
+        }
+
+      if (!p_check_missile_range(actor)) goto nomissile;
+
+      p_set_mobj_state(actor, actor->info->missilestate);
+      actor->flags |= MF_JUSTATTACKED;
+      return;
+    }
+
+  /* ? */
+
+nomissile:
+
+  /* possibly choose another target */
+
+  if (netgame && !actor->threshold && !p_check_sight(actor, actor->target))
+    {
+      if (p_look_for_players(actor, true)) return; /* got a new target */
+    }
+
+  /* chase towards player */
+
+  if (--actor->movecount < 0 || !p_move(actor))
+    {
+      p_new_chase_dir(actor);
+    }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+
+  /* make active sound */
+
+  if (actor->info->activesound && p_random() < 3)
+    {
+      s_start_sound(actor, actor->info->activesound);
+    }
+#endif
+}
+
+void a_face_target(mobj_t *actor)
+{
+  if (!actor->target) return;
+
+  actor->flags &= ~MF_AMBUSH;
+
+  actor->angle = r_point_to_angle2(actor->x, actor->y, actor->target->x,
+                                   actor->target->y);
+
+  if (actor->target->flags & MF_SHADOW) actor->angle += p_sub_random() << 21;
+}
+
+void a_pos_attack(mobj_t *actor)
+{
+  int angle;
+  int damage;
+  int slope;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+  angle = actor->angle;
+  slope = p_aim_line_attack(actor, angle, MISSILERANGE);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_PISTOL);
+#endif
+  angle += p_sub_random() << 20;
+  damage = ((p_random() % 5) + 1) * 3;
+  p_line_attack(actor, angle, MISSILERANGE, slope, damage);
+}
+
+void a_s_pos_attack(mobj_t *actor)
+{
+  int i;
+  int angle;
+  int bangle;
+  int damage;
+  int slope;
+
+  if (!actor->target) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_SHOTGN);
+#endif
+  a_face_target(actor);
+  bangle = actor->angle;
+  slope = p_aim_line_attack(actor, bangle, MISSILERANGE);
+
+  for (i = 0; i < 3; i++)
+    {
+      angle = bangle + (p_sub_random() << 20);
+      damage = ((p_random() % 5) + 1) * 3;
+      p_line_attack(actor, angle, MISSILERANGE, slope, damage);
+    }
+}
+
+void a_c_pos_attack(mobj_t *actor)
+{
+  int angle;
+  int bangle;
+  int damage;
+  int slope;
+
+  if (!actor->target) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_SHOTGN);
+#endif
+  a_face_target(actor);
+  bangle = actor->angle;
+  slope = p_aim_line_attack(actor, bangle, MISSILERANGE);
+
+  angle = bangle + (p_sub_random() << 20);
+  damage = ((p_random() % 5) + 1) * 3;
+  p_line_attack(actor, angle, MISSILERANGE, slope, damage);
+}
+
+void a_c_pos_refire(mobj_t *actor)
+{
+  /* keep firing unless target got out of sight */
+
+  a_face_target(actor);
+
+  if (p_random() < 40) return;
+
+  if (!actor->target || actor->target->health <= 0 ||
+      !p_check_sight(actor, actor->target))
+    {
+      p_set_mobj_state(actor, actor->info->seestate);
+    }
+}
+
+void a_spid_refire(mobj_t *actor)
+{
+  /* keep firing unless target got out of sight */
+
+  a_face_target(actor);
+
+  if (p_random() < 10) return;
+
+  if (!actor->target || actor->target->health <= 0 ||
+      !p_check_sight(actor, actor->target))
+    {
+      p_set_mobj_state(actor, actor->info->seestate);
+    }
+}
+
+void a_bspi_attack(mobj_t *actor)
+{
+  if (!actor->target) return;
+
+  a_face_target(actor);
+
+  /* launch a missile */
+
+  p_spawn_missile(actor, actor->target, MT_ARACHPLAZ);
+}
+
+void a_troop_attack(mobj_t *actor)
+{
+  int damage;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+  if (p_check_melee_range(actor))
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(actor, SFX_CLAW);
+#endif
+      damage = (p_random() % 8 + 1) * 3;
+      p_damage_mobj(actor->target, actor, actor, damage);
+      return;
+    }
+
+  /* launch a missile */
+
+  p_spawn_missile(actor, actor->target, MT_TROOPSHOT);
+}
+
+void a_sarg_attack(mobj_t *actor)
+{
+  int damage;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+
+  if (gameversion >= exe_doom_1_5)
+    {
+      if (!p_check_melee_range(actor)) return;
+    }
+
+  damage = ((p_random() % 10) + 1) * 4;
+
+  if (gameversion <= exe_doom_1_2)
+    p_line_attack(actor, actor->angle, MELEERANGE, 0, damage);
+  else
+    p_damage_mobj(actor->target, actor, actor, damage);
+}
+
+void a_head_attack(mobj_t *actor)
+{
+  int damage;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+  if (p_check_melee_range(actor))
+    {
+      damage = (p_random() % 6 + 1) * 10;
+      p_damage_mobj(actor->target, actor, actor, damage);
+      return;
+    }
+
+  /* launch a missile */
+
+  p_spawn_missile(actor, actor->target, MT_HEADSHOT);
+}
+
+void a_cyber_attack(mobj_t *actor)
+{
+  if (!actor->target) return;
+
+  a_face_target(actor);
+  p_spawn_missile(actor, actor->target, MT_ROCKET);
+}
+
+void a_bruis_attack(mobj_t *actor)
+{
+  int damage;
+
+  if (!actor->target) return;
+
+  if (p_check_melee_range(actor))
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(actor, SFX_CLAW);
+#endif
+      damage = (p_random() % 8 + 1) * 10;
+      p_damage_mobj(actor->target, actor, actor, damage);
+      return;
+    }
+
+  /* launch a missile */
+
+  p_spawn_missile(actor, actor->target, MT_BRUISERSHOT);
+}
+
+void a_skel_missile(mobj_t *actor)
+{
+  mobj_t *mo;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+  actor->z += 16 * FRACUNIT; /* so missile spawns higher */
+  mo = p_spawn_missile(actor, actor->target, MT_TRACER);
+  actor->z -= 16 * FRACUNIT; /* back to normal */
+
+  mo->x += mo->momx;
+  mo->y += mo->momy;
+  mo->tracer = actor->target;
+}
+
+void a_tracer(mobj_t *actor)
+{
+  angle_t exact;
+  fixed_t dist;
+  fixed_t slope;
+  mobj_t *dest;
+  mobj_t *th;
+
+  if (gametic & 3) return;
+
+  /* spawn a puff of smoke behind the rocket */
+
+  p_spawn_puff(actor->x, actor->y, actor->z);
+
+  th = p_spawn_mobj(actor->x - actor->momx, actor->y - actor->momy, actor->z,
+                    MT_SMOKE);
+
+  th->momz = FRACUNIT;
+  th->tics -= p_random() & 3;
+  if (th->tics < 1) th->tics = 1;
+
+  /* adjust direction */
+
+  dest = actor->tracer;
+
+  if (!dest || dest->health <= 0) return;
+
+  /* change angle */
+
+  exact = r_point_to_angle2(actor->x, actor->y, dest->x, dest->y);
+
+  if (exact != actor->angle)
+    {
+      if (exact - actor->angle > 0x80000000)
+        {
+          actor->angle -= TRACEANGLE;
+          if (exact - actor->angle < 0x80000000) actor->angle = exact;
+        }
+      else
+        {
+          actor->angle += TRACEANGLE;
+          if (exact - actor->angle > 0x80000000) actor->angle = exact;
+        }
+    }
+
+  exact = actor->angle >> ANGLETOFINESHIFT;
+  actor->momx = fixed_mul(actor->info->speed, finecosine[exact]);
+  actor->momy = fixed_mul(actor->info->speed, finesine[exact]);
+
+  /* change slope */
+
+  dist = p_approx_distance(dest->x - actor->x, dest->y - actor->y);
+
+  dist = dist / actor->info->speed;
+
+  if (dist < 1) dist = 1;
+  slope = (dest->z + 40 * FRACUNIT - actor->z) / dist;
+
+  if (slope < actor->momz)
+    actor->momz -= FRACUNIT / 8;
+  else
+    actor->momz += FRACUNIT / 8;
+}
+
+void a_skel_woosh(mobj_t *actor)
+{
+  if (!actor->target) return;
+  a_face_target(actor);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_SKESWG);
+#endif
+}
+
+void a_skel_fist(mobj_t *actor)
+{
+  int damage;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+
+  if (p_check_melee_range(actor))
+    {
+      damage = ((p_random() % 10) + 1) * 6;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(actor, SFX_SKEPCH);
+#endif
+      p_damage_mobj(actor->target, actor, actor, damage);
+    }
+}
+
+/* a_vile_chase
+ * Check for resurrecting a body
+ */
+
+void a_vile_chase(mobj_t *actor)
+{
+  int xl;
+  int xh;
+  int yl;
+  int yh;
+
+  int bx;
+  int by;
+
+  mobjinfo_t *info;
+  mobj_t *temp;
+
+  if (actor->movedir != DI_NODIR)
+    {
+      /* check for corpses to raise */
+
+      viletryx = actor->x + actor->info->speed * xspeed[actor->movedir];
+      viletryy = actor->y + actor->info->speed * yspeed[actor->movedir];
+
+      xl = (viletryx - bmaporgx - MAXRADIUS * 2) >> MAPBLOCKSHIFT;
+      xh = (viletryx - bmaporgx + MAXRADIUS * 2) >> MAPBLOCKSHIFT;
+      yl = (viletryy - bmaporgy - MAXRADIUS * 2) >> MAPBLOCKSHIFT;
+      yh = (viletryy - bmaporgy + MAXRADIUS * 2) >> MAPBLOCKSHIFT;
+
+      vileobj = actor;
+      for (bx = xl; bx <= xh; bx++)
+        {
+          for (by = yl; by <= yh; by++)
+            {
+              /* Call pit_vile_check to check whether object is a corpse that
+               * can be raised.
+               */
+
+              if (!p_block_things_iterator(bx, by, pit_vile_check))
+                {
+                  /* got one! */
+
+                  temp = actor->target;
+                  actor->target = corpsehit;
+                  a_face_target(actor);
+                  actor->target = temp;
+
+                  p_set_mobj_state(actor, S_VILE_HEAL1);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                  s_start_sound(corpsehit, SFX_SLOP);
+#endif
+                  info = corpsehit->info;
+
+                  p_set_mobj_state(corpsehit, info->raisestate);
+                  corpsehit->height <<= 2;
+                  corpsehit->flags = info->flags;
+                  corpsehit->health = info->spawnhealth;
+                  corpsehit->target = NULL;
+
+                  return;
+                }
+            }
+        }
+    }
+
+  /* Return to normal attack. */
+
+  a_chase(actor);
+}
+
+/* Keep fire in front of player unless out of sight */
+
+void a_fire(mobj_t *actor)
+{
+  mobj_t *dest;
+  mobj_t *target;
+  unsigned an;
+
+  dest = actor->tracer;
+  if (!dest) return;
+
+  target = p_subst_null_mobj(actor->target);
+
+  /* don't move it if the vile lost sight */
+
+  if (!p_check_sight(target, dest)) return;
+
+  an = dest->angle >> ANGLETOFINESHIFT;
+
+  p_unset_thing_position(actor);
+  actor->x = dest->x + fixed_mul(24 * FRACUNIT, finecosine[an]);
+  actor->y = dest->y + fixed_mul(24 * FRACUNIT, finesine[an]);
+  actor->z = dest->z;
+  p_set_thing_position(actor);
+}
+
+void a_vile_start(mobj_t *actor)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_VILATK);
+#endif
+}
+
+void a_start_fire(mobj_t *actor)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_FLAMST);
+#endif
+  a_fire(actor);
+}
+
+void a_fire_crackle(mobj_t *actor)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_FLAME);
+#endif
+  a_fire(actor);
+}
+
+/* a_vile_target
+ * Spawn the hellfire
+ */
+
+void a_vile_target(mobj_t *actor)
+{
+  mobj_t *fog;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+
+  fog = p_spawn_mobj(actor->target->x, actor->target->x, actor->target->z,
+                     MT_FIRE);
+
+  actor->tracer = fog;
+  fog->target = actor;
+  fog->tracer = actor->target;
+  a_fire(fog);
+}
+
+void a_vile_attack(mobj_t *actor)
+{
+  mobj_t *fire;
+  int an;
+
+  if (!actor->target) return;
+
+  a_face_target(actor);
+
+  if (!p_check_sight(actor, actor->target)) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_BAREXP);
+#endif
+  p_damage_mobj(actor->target, actor, actor, 20);
+  actor->target->momz = 1000 * FRACUNIT / actor->target->info->mass;
+
+  an = actor->angle >> ANGLETOFINESHIFT;
+
+  fire = actor->tracer;
+
+  if (!fire) return;
+
+  /* move the fire between the vile and the player */
+
+  fire->x = actor->target->x - fixed_mul(24 * FRACUNIT, finecosine[an]);
+  fire->y = actor->target->y - fixed_mul(24 * FRACUNIT, finesine[an]);
+  p_radius_attack(fire, actor, 70);
+}
+
+/* Mancubus attack,
+ * firing three missiles (bruisers) in three different directions?
+ * Doesn't look like it.
+ */
+
+void a_fat_raise(mobj_t *actor)
+{
+  a_face_target(actor);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_MANATK);
+#endif
+}
+
+void a_fat_attack1(mobj_t *actor)
+{
+  mobj_t *mo;
+  mobj_t *target;
+  int an;
+
+  a_face_target(actor);
+
+  /* Change direction  to ... */
+
+  actor->angle += FATSPREAD;
+  target = p_subst_null_mobj(actor->target);
+  p_spawn_missile(actor, target, MT_FATSHOT);
+
+  mo = p_spawn_missile(actor, target, MT_FATSHOT);
+  mo->angle += FATSPREAD;
+  an = mo->angle >> ANGLETOFINESHIFT;
+  mo->momx = fixed_mul(mo->info->speed, finecosine[an]);
+  mo->momy = fixed_mul(mo->info->speed, finesine[an]);
+}
+
+void a_fat_attack2(mobj_t *actor)
+{
+  mobj_t *mo;
+  mobj_t *target;
+  int an;
+
+  a_face_target(actor);
+
+  /* Now here choose opposite deviation. */
+
+  actor->angle -= FATSPREAD;
+  target = p_subst_null_mobj(actor->target);
+  p_spawn_missile(actor, target, MT_FATSHOT);
+
+  mo = p_spawn_missile(actor, target, MT_FATSHOT);
+  mo->angle -= FATSPREAD * 2;
+  an = mo->angle >> ANGLETOFINESHIFT;
+  mo->momx = fixed_mul(mo->info->speed, finecosine[an]);
+  mo->momy = fixed_mul(mo->info->speed, finesine[an]);
+}
+
+void a_fat_attack3(mobj_t *actor)
+{
+  mobj_t *mo;
+  mobj_t *target;
+  int an;
+
+  a_face_target(actor);
+
+  target = p_subst_null_mobj(actor->target);
+
+  mo = p_spawn_missile(actor, target, MT_FATSHOT);
+  mo->angle -= FATSPREAD / 2;
+  an = mo->angle >> ANGLETOFINESHIFT;
+  mo->momx = fixed_mul(mo->info->speed, finecosine[an]);
+  mo->momy = fixed_mul(mo->info->speed, finesine[an]);
+
+  mo = p_spawn_missile(actor, target, MT_FATSHOT);
+  mo->angle += FATSPREAD / 2;
+  an = mo->angle >> ANGLETOFINESHIFT;
+  mo->momx = fixed_mul(mo->info->speed, finecosine[an]);
+  mo->momy = fixed_mul(mo->info->speed, finesine[an]);
+}
+
+/* SkullAttack
+ * Fly at the player like a missile.
+ */
+
+void a_skull_attack(mobj_t *actor)
+{
+  mobj_t *dest;
+  angle_t an;
+  int dist;
+
+  if (!actor->target) return;
+
+  dest = actor->target;
+  actor->flags |= MF_SKULLFLY;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, actor->info->attacksound);
+#endif
+  a_face_target(actor);
+  an = actor->angle >> ANGLETOFINESHIFT;
+  actor->momx = fixed_mul(SKULLSPEED, finecosine[an]);
+  actor->momy = fixed_mul(SKULLSPEED, finesine[an]);
+  dist = p_approx_distance(dest->x - actor->x, dest->y - actor->y);
+  dist = dist / SKULLSPEED;
+
+  if (dist < 1) dist = 1;
+  actor->momz = (dest->z + (dest->height >> 1) - actor->z) / dist;
+}
+
+/* a_pain_shoot_skull
+ * Spawn a lost soul and launch it at the target
+ */
+
+void a_pain_shoot_skull(mobj_t *actor, angle_t angle)
+{
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
+
+  mobj_t *newmobj;
+  angle_t an;
+  int prestep;
+  int count;
+  thinker_t *currentthinker;
+
+  /* count total number of skull currently on the level */
+
+  count = 0;
+
+  currentthinker = thinkercap.next;
+  while (currentthinker != &thinkercap)
+    {
+      if ((currentthinker->function.acp1 == (actionf_p1)p_mobj_thinker) &&
+          ((mobj_t *)currentthinker)->type == MT_SKULL)
+        count++;
+      currentthinker = currentthinker->next;
+    }
+
+  /* if there are already 20 skulls on the level, don't spit another one */
+
+  if (count > 20) return;
+
+  /* okay, there's player for another one */
+
+  an = angle >> ANGLETOFINESHIFT;
+
+  prestep = 4 * FRACUNIT +
+            3 * (actor->info->radius + mobjinfo[MT_SKULL].radius) / 2;
+
+  x = actor->x + fixed_mul(prestep, finecosine[an]);
+  y = actor->y + fixed_mul(prestep, finesine[an]);
+  z = actor->z + 8 * FRACUNIT;
+
+  newmobj = p_spawn_mobj(x, y, z, MT_SKULL);
+
+  /* Check for movements. */
+
+  if (!p_try_move(newmobj, newmobj->x, newmobj->y))
+    {
+      /* kill it immediately */
+
+      p_damage_mobj(newmobj, actor, actor, 10000);
+      return;
+    }
+
+  newmobj->target = actor->target;
+  a_skull_attack(newmobj);
+}
+
+/* a_pain_attack
+ * Spawn a lost soul and launch it at the target
+ */
+
+void a_pain_attack(mobj_t *actor)
+{
+  if (!actor->target) return;
+
+  a_face_target(actor);
+  a_pain_shoot_skull(actor, actor->angle);
+}
+
+void a_pain_die(mobj_t *actor)
+{
+  a_fall(actor);
+  a_pain_shoot_skull(actor, actor->angle + ANG90);
+  a_pain_shoot_skull(actor, actor->angle + ANG180);
+  a_pain_shoot_skull(actor, actor->angle + ANG270);
+}
+
+void a_scream(mobj_t *actor)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  int sound;
+
+  switch (actor->info->deathsound)
+    {
+    case 0:
+      return;
+
+    case SFX_PODTH1:
+    case SFX_PODTH2:
+    case SFX_PODTH3:
+      sound = SFX_PODTH1 + p_random() % 3;
+      break;
+
+    case SFX_BGDTH1:
+    case SFX_BGDTH2:
+      sound = SFX_BGDTH1 + p_random() % 2;
+      break;
+
+    default:
+      sound = actor->info->deathsound;
+      break;
+    }
+
+  /* Check for bosses. */
+
+  if (actor->type == MT_SPIDER || actor->type == MT_CYBORG)
+    {
+      s_start_sound(NULL, sound); /* full volume */
+    }
+  else
+    s_start_sound(actor, sound);
+#endif
+}
+
+void a_xscream(mobj_t *actor)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(actor, SFX_SLOP);
+#endif
+}
+
+void a_pain(mobj_t *actor)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (actor->info->painsound) s_start_sound(actor, actor->info->painsound);
+#endif
+}
+
+void a_fall(mobj_t *actor)
+{
+  /* actor is on ground, it can be walked over */
+
+  actor->flags &= ~MF_SOLID;
+
+  /* So change this if corpse objects are meant to be obstacles. */
+}
+
+void a_explode(mobj_t *thingy)
+{
+  p_radius_attack(thingy, thingy->target, 128);
+}
+
+/* a_boss_death
+ * Possibly trigger special effects if on first boss level
+ */
+
+void a_boss_death(mobj_t *mo)
+{
+  thinker_t *th;
+  mobj_t *mo2;
+  line_t junk;
+  int i;
+
+  if (gamemode == commercial)
+    {
+      if (gamemap != 7) return;
+
+      if ((mo->type != MT_FATSO) && (mo->type != MT_BABY)) return;
+    }
+  else
+    {
+      if (!check_boss_end(mo->type))
+        {
+          return;
+        }
+    }
+
+  /* make sure there is a player alive for victory */
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i] && players[i].health > 0) break;
+    }
+
+  if (i == MAXPLAYERS) return; /* no one left alive, so do not end game */
+
+  /* scan the remaining thinkers to see if all bosses are dead */
+
+  for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+      if (th->function.acp1 != (actionf_p1)p_mobj_thinker) continue;
+
+      mo2 = (mobj_t *)th;
+      if (mo2 != mo && mo2->type == mo->type && mo2->health > 0)
+        {
+          return; /* other boss not dead */
+        }
+    }
+
+  /* victory! */
+
+  if (gamemode == commercial)
+    {
+      if (gamemap == 7)
+        {
+          if (mo->type == MT_FATSO)
+            {
+              junk.tag = 666;
+              ev_do_floor(&junk, FLOOR_LOWERFLOORTOLOWEST);
+              return;
+            }
+
+          if (mo->type == MT_BABY)
+            {
+              junk.tag = 667;
+              ev_do_floor(&junk, FLOOR_RAISETOTEXTURE);
+              return;
+            }
+        }
+    }
+  else
+    {
+      switch (gameepisode)
+        {
+        case 1:
+          junk.tag = 666;
+          ev_do_floor(&junk, FLOOR_LOWERFLOORTOLOWEST);
+          return;
+          break;
+
+        case 4:
+          switch (gamemap)
+            {
+            case 6:
+              junk.tag = 666;
+              ev_do_door(&junk, VLD_BLAZEOPEN);
+              return;
+              break;
+
+            case 8:
+              junk.tag = 666;
+              ev_do_floor(&junk, FLOOR_LOWERFLOORTOLOWEST);
+              return;
+              break;
+            }
+        }
+    }
+
+  g_exit_level();
+}
+
+void a_hoof(mobj_t *mo)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(mo, SFX_HOOF);
+#endif
+  a_chase(mo);
+}
+
+void a_metal(mobj_t *mo)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(mo, SFX_METAL);
+#endif
+  a_chase(mo);
+}
+
+void a_baby_metal(mobj_t *mo)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(mo, SFX_BSPWLK);
+#endif
+  a_chase(mo);
+}
+
+void a_open_shotgun2(player_t *player, pspdef_t *psp)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_DBOPN);
+#endif
+}
+
+void a_load_shotgun2(player_t *player, pspdef_t *psp)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_DBLOAD);
+#endif
+}
+
+void a_close_shotgun2(player_t *player, pspdef_t *psp)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_DBCLS);
+#endif
+  a_refire(player, psp);
+}
+
+void a_brain_awake(mobj_t *mo)
+{
+  thinker_t *thinker;
+  mobj_t *m;
+
+  /* find all the target spots */
+
+  numbraintargets = 0;
+  braintargeton = 0;
+
+  for (thinker = thinkercap.next; thinker != &thinkercap;
+       thinker = thinker->next)
+    {
+      if (thinker->function.acp1 != (actionf_p1)p_mobj_thinker)
+        {
+          continue; /* not a mobj */
+        }
+
+      m = (mobj_t *)thinker;
+
+      if (m->type == MT_BOSSTARGET)
+        {
+          braintargets[numbraintargets] = m;
+          numbraintargets++;
+        }
+    }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(NULL, SFX_BOSSIT);
+#endif
+}
+
+void a_brain_pain(mobj_t *mo)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(NULL, SFX_BOSPN);
+#endif
+}
+
+void a_brain_scream(mobj_t *mo)
+{
+  int x;
+  int y;
+  int z;
+  mobj_t *th;
+
+  for (x = mo->x - 196 * FRACUNIT; x < mo->x + 320 * FRACUNIT;
+       x += FRACUNIT * 8)
+    {
+      y = mo->y - 320 * FRACUNIT;
+      z = 128 + p_random() * 2 * FRACUNIT;
+      th = p_spawn_mobj(x, y, z, MT_ROCKET);
+      th->momz = p_random() * 512;
+
+      p_set_mobj_state(th, S_BRAINEXPLODE1);
+
+      th->tics -= p_random() & 7;
+      if (th->tics < 1) th->tics = 1;
+    }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(NULL, SFX_BOSDTH);
+#endif
+}
+
+void a_brain_explode(mobj_t *mo)
+{
+  int x;
+  int y;
+  int z;
+  mobj_t *th;
+
+  x = mo->x + p_sub_random() * 2048;
+  y = mo->y;
+  z = 128 + p_random() * 2 * FRACUNIT;
+  th = p_spawn_mobj(x, y, z, MT_ROCKET);
+  th->momz = p_random() * 512;
+
+  p_set_mobj_state(th, S_BRAINEXPLODE1);
+
+  th->tics -= p_random() & 7;
+  if (th->tics < 1) th->tics = 1;
+}
+
+void a_brain_die(mobj_t *mo)
+{
+  g_exit_level();
+}
+
+void a_brain_split(mobj_t *mo)
+{
+  mobj_t *targ;
+  mobj_t *newmobj;
+
+  static int easy = 0;
+
+  easy ^= 1;
+  if (gameskill <= sk_easy && (!easy)) return;
+
+  /* shoot a cube at current target */
+
+  targ = braintargets[braintargeton];
+  if (numbraintargets == 0)
+    {
+      i_error("a_brain_split: numbraintargets was 0 (vanilla crashes here)");
+    }
+
+  braintargeton = (braintargeton + 1) % numbraintargets;
+
+  /* spawn brain missile */
+
+  newmobj = p_spawn_missile(mo, targ, MT_SPAWNSHOT);
+  newmobj->target = targ;
+  newmobj->reactiontime =
+      ((targ->y - mo->y) / newmobj->momy) / newmobj->state->tics;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(NULL, SFX_BOSPIT);
+#endif
+}
+
+void a_spawn_fly(mobj_t *mo)
+{
+  mobj_t *newmobj;
+  mobj_t *fog;
+  mobj_t *targ;
+  int r;
+  mobjtype_t type;
+
+  if (--mo->reactiontime) return; /* still flying */
+
+  targ = p_subst_null_mobj(mo->target);
+
+  /* First spawn teleport fog. */
+
+  fog = p_spawn_mobj(targ->x, targ->y, targ->z, MT_SPAWNFIRE);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(fog, SFX_TELEPT);
+#else
+  UNUSED(fog);
+#endif
+
+  /* Randomly select monster to spawn. */
+
+  r = p_random();
+
+  /* Probability distribution (kind of :), decreasing likelihood. */
+
+  if (r < 50)
+    type = MT_TROOP;
+  else if (r < 90)
+    type = MT_SERGEANT;
+  else if (r < 120)
+    type = MT_SHADOWS;
+  else if (r < 130)
+    type = MT_PAIN;
+  else if (r < 160)
+    type = MT_HEAD;
+  else if (r < 162)
+    type = MT_VILE;
+  else if (r < 172)
+    type = MT_UNDEAD;
+  else if (r < 192)
+    type = MT_BABY;
+  else if (r < 222)
+    type = MT_FATSO;
+  else if (r < 246)
+    type = MT_KNIGHT;
+  else
+    type = MT_BRUISER;
+
+  newmobj = p_spawn_mobj(targ->x, targ->y, targ->z, type);
+  if (p_look_for_players(newmobj, true))
+    p_set_mobj_state(newmobj, newmobj->info->seestate);
+
+  /* telefrag anything in this spot */
+
+  p_teleport_move(newmobj, newmobj->x, newmobj->y);
+
+  /* remove self (i.e., cube). */
+
+  p_remove_mobj(mo);
+}
+
+/* travelling cube sound */
+
+void a_spawn_sound(mobj_t *mo)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(mo, SFX_BOSCUB);
+#endif
+  a_spawn_fly(mo);
+}
+
+void a_player_screm(mobj_t *mo)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+
+  /* Default death sound. */
+
+  int sound = SFX_PLDETH;
+
+  if ((gamemode == commercial) && (mo->health < -50))
+    {
+      /* IF THE PLAYER DIES LESS THAN -50% WITHOUT GIBBING */
+
+      sound = SFX_PDIEHI;
+    }
+
+  s_start_sound(mo, sound);
+#else
+  UNUSED(mo);
+#endif
 }
diff --git a/games/NXDoom/src/doom/p_floor.c b/games/NXDoom/src/doom/p_floor.c
index 2bf42e55d..656240785 100644
--- a/games/NXDoom/src/doom/p_floor.c
+++ b/games/NXDoom/src/doom/p_floor.c
@@ -1,561 +1,569 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Floor animation: raising stairs.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_floor.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Floor animation: raising stairs.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-#include "z_zone.h"
 #include "doomdef.h"
 #include "p_local.h"
+#include "z_zone.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* State. */
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
-// Data.
-#include "sounds.h"
 
-//e6y
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* e6y */
+
 #define STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE 10
 
-//
-// FLOORS
-//
+/* FLOORS */
 
-//
-// Move a plane (floor or ceiling) and check for crushing
-//
-result_e
-T_MovePlane
-( sector_t*	sector,
-  fixed_t	speed,
-  fixed_t	dest,
-  boolean	crush,
-  int		floorOrCeiling,
-  int		direction )
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Move a plane (floor or ceiling) and check for crushing */
+
+result_e t_move_plane(sector_t *sector, fixed_t speed, fixed_t dest,
+                      boolean crush, int floor_or_ceiling, int direction)
 {
-    boolean	flag;
-    fixed_t	lastpos;
-	
-    switch(floorOrCeiling)
+  boolean flag;
+  fixed_t lastpos;
+
+  switch (floor_or_ceiling)
     {
-      case 0:
-	// FLOOR
-	switch(direction)
-	{
-	  case -1:
-	    // DOWN
-	    if (sector->floorheight - speed < dest)
-	    {
-		lastpos = sector->floorheight;
-		sector->floorheight = dest;
-		flag = P_ChangeSector(sector,crush);
-		if (flag == true)
-		{
-		    sector->floorheight =lastpos;
-		    P_ChangeSector(sector,crush);
-		    //return crushed;
-		}
-		return pastdest;
-	    }
-	    else
-	    {
-		lastpos = sector->floorheight;
-		sector->floorheight -= speed;
-		flag = P_ChangeSector(sector,crush);
-		if (flag == true)
-		{
-		    sector->floorheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    return crushed;
-		}
-	    }
-	    break;
-						
-	  case 1:
-	    // UP
-	    if (sector->floorheight + speed > dest)
-	    {
-		lastpos = sector->floorheight;
-		sector->floorheight = dest;
-		flag = P_ChangeSector(sector,crush);
-		if (flag == true)
-		{
-		    sector->floorheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    //return crushed;
-		}
-		return pastdest;
-	    }
-	    else
-	    {
-		// COULD GET CRUSHED
-		lastpos = sector->floorheight;
-		sector->floorheight += speed;
-		flag = P_ChangeSector(sector,crush);
-		if (flag == true)
-		{
-		    if (crush == true)
-			return crushed;
-		    sector->floorheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    return crushed;
-		}
-	    }
-	    break;
-	}
-	break;
-									
-      case 1:
-	// CEILING
-	switch(direction)
-	{
-	  case -1:
-	    // DOWN
-	    if (sector->ceilingheight - speed < dest)
-	    {
-		lastpos = sector->ceilingheight;
-		sector->ceilingheight = dest;
-		flag = P_ChangeSector(sector,crush);
+    case 0: /* FLOOR */
+      switch (direction)
+        {
+        case -1: /* DOWN */
+          if (sector->floorheight - speed < dest)
+            {
+              lastpos = sector->floorheight;
+              sector->floorheight = dest;
+              flag = p_change_sector(sector, crush);
+              if (flag == true)
+                {
+                  sector->floorheight = lastpos;
+                  p_change_sector(sector, crush);
 
-		if (flag == true)
-		{
-		    sector->ceilingheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    //return crushed;
-		}
-		return pastdest;
-	    }
-	    else
-	    {
-		// COULD GET CRUSHED
-		lastpos = sector->ceilingheight;
-		sector->ceilingheight -= speed;
-		flag = P_ChangeSector(sector,crush);
+                  /* return crushed; */
+                }
 
-		if (flag == true)
-		{
-		    if (crush == true)
-			return crushed;
-		    sector->ceilingheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    return crushed;
-		}
-	    }
-	    break;
-						
-	  case 1:
-	    // UP
-	    if (sector->ceilingheight + speed > dest)
-	    {
-		lastpos = sector->ceilingheight;
-		sector->ceilingheight = dest;
-		flag = P_ChangeSector(sector,crush);
-		if (flag == true)
-		{
-		    sector->ceilingheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    //return crushed;
-		}
-		return pastdest;
-	    }
-	    else
-	    {
-		lastpos = sector->ceilingheight;
-		sector->ceilingheight += speed;
-		flag = P_ChangeSector(sector,crush);
-// UNUSED
-#if 0
-		if (flag == true)
-		{
-		    sector->ceilingheight = lastpos;
-		    P_ChangeSector(sector,crush);
-		    return crushed;
-		}
+              return pastdest;
+            }
+          else
+            {
+              lastpos = sector->floorheight;
+              sector->floorheight -= speed;
+              flag = p_change_sector(sector, crush);
+              if (flag == true)
+                {
+                  sector->floorheight = lastpos;
+                  p_change_sector(sector, crush);
+                  return crushed;
+                }
+            }
+
+          break;
+
+        case 1: /* UP */
+          if (sector->floorheight + speed > dest)
+            {
+              lastpos = sector->floorheight;
+              sector->floorheight = dest;
+              flag = p_change_sector(sector, crush);
+              if (flag == true)
+                {
+                  sector->floorheight = lastpos;
+                  p_change_sector(sector, crush);
+
+                  /* return crushed; */
+                }
+
+              return pastdest;
+            }
+          else
+            {
+              /* COULD GET CRUSHED */
+
+              lastpos = sector->floorheight;
+              sector->floorheight += speed;
+              flag = p_change_sector(sector, crush);
+              if (flag == true)
+                {
+                  if (crush == true) return crushed;
+                  sector->floorheight = lastpos;
+                  p_change_sector(sector, crush);
+                  return crushed;
+                }
+            }
+          break;
+        }
+      break;
+
+    case 1: /* CEILING */
+      switch (direction)
+        {
+        case -1: /* DOWN */
+          if (sector->ceilingheight - speed < dest)
+            {
+              lastpos = sector->ceilingheight;
+              sector->ceilingheight = dest;
+              flag = p_change_sector(sector, crush);
+
+              if (flag == true)
+                {
+                  sector->ceilingheight = lastpos;
+                  p_change_sector(sector, crush);
+
+                  /* return crushed; */
+                }
+
+              return pastdest;
+            }
+          else
+            {
+              /* COULD GET CRUSHED */
+
+              lastpos = sector->ceilingheight;
+              sector->ceilingheight -= speed;
+              flag = p_change_sector(sector, crush);
+
+              if (flag == true)
+                {
+                  if (crush == true) return crushed;
+                  sector->ceilingheight = lastpos;
+                  p_change_sector(sector, crush);
+                  return crushed;
+                }
+            }
+          break;
+
+        case 1: /* UP */
+          if (sector->ceilingheight + speed > dest)
+            {
+              lastpos = sector->ceilingheight;
+              sector->ceilingheight = dest;
+              flag = p_change_sector(sector, crush);
+              if (flag == true)
+                {
+                  sector->ceilingheight = lastpos;
+                  p_change_sector(sector, crush);
+
+                  /* return crushed; */
+                }
+
+              return pastdest;
+            }
+          else
+            {
+              lastpos = sector->ceilingheight;
+              sector->ceilingheight += speed;
+              flag = p_change_sector(sector, crush);
+
+#if 0 /* UNUSED */
+              if (flag == true)
+                {
+                  sector->ceilingheight = lastpos;
+                  p_change_sector(sector, crush);
+                  return crushed;
+                }
 #endif
-	    }
-	    break;
-	}
-	break;
-		
+            }
+          break;
+        }
+      break;
     }
-    return ok;
+
+  return ok;
 }
 
+/* MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN) */
 
-//
-// MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
-//
-void T_MoveFloor(floormove_t* floor)
+void t_move_floor(floormove_t *floor)
 {
-    result_e	res;
-	
-    res = T_MovePlane(floor->sector,
-		      floor->speed,
-		      floor->floordestheight,
-		      floor->crush,0,floor->direction);
-    
-    if (!(leveltime&7))
-	S_StartSound(&floor->sector->soundorg, sfx_stnmov);
-    
-    if (res == pastdest)
+  result_e res;
+
+  res = t_move_plane(floor->sector, floor->speed, floor->floordestheight,
+                     floor->crush, 0, floor->direction);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (!(leveltime & 7)) s_start_sound(&floor->sector->soundorg, SFX_STNMOV);
+#endif
+
+  if (res == pastdest)
     {
-	floor->sector->specialdata = NULL;
+      floor->sector->specialdata = NULL;
 
-	if (floor->direction == 1)
-	{
-	    switch(floor->type)
-	    {
-	      case donutRaise:
-		floor->sector->special = floor->newspecial;
-		floor->sector->floorpic = floor->texture;
-	      default:
-		break;
-	    }
-	}
-	else if (floor->direction == -1)
-	{
-	    switch(floor->type)
-	    {
-	      case lowerAndChange:
-		floor->sector->special = floor->newspecial;
-		floor->sector->floorpic = floor->texture;
-	      default:
-		break;
-	    }
-	}
-	P_RemoveThinker(&floor->thinker);
+      if (floor->direction == 1)
+        {
+          switch (floor->type)
+            {
+            case FLOOR_DONUTRAISE:
+              floor->sector->special = floor->newspecial;
+              floor->sector->floorpic = floor->texture;
+            default:
+              break;
+            }
+        }
+      else if (floor->direction == -1)
+        {
+          switch (floor->type)
+            {
+            case FLOOR_LOWERANDCHANGE:
+              floor->sector->special = floor->newspecial;
+              floor->sector->floorpic = floor->texture;
+            default:
+              break;
+            }
+        }
 
-	S_StartSound(&floor->sector->soundorg, sfx_pstop);
+      p_remove_thinker(&floor->thinker);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(&floor->sector->soundorg, SFX_PSTOP);
+#endif
     }
-
 }
 
-//
-// HANDLE FLOOR TYPES
-//
-int
-EV_DoFloor
-( line_t*	line,
-  floor_e	floortype )
+/* HANDLE FLOOR TYPES */
+
+int ev_do_floor(line_t *line, floor_e floortype)
 {
-    int			secnum;
-    int			rtn;
-    int			i;
-    sector_t*		sec;
-    floormove_t*	floor;
+  int secnum;
+  int rtn;
+  int i;
+  sector_t *sec;
+  floormove_t *floor;
 
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+  secnum = -1;
+  rtn = 0;
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
     {
-	sec = &sectors[secnum];
-		
-	// ALREADY MOVING?  IF SO, KEEP GOING...
-	if (sec->specialdata)
-	    continue;
-	
-	// new floor thinker
-	rtn = 1;
-	floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-	P_AddThinker (&floor->thinker);
-	sec->specialdata = floor;
-	floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-	floor->type = floortype;
-	floor->crush = false;
+      sec = &sectors[secnum];
 
-	switch(floortype)
-	{
-	  case lowerFloor:
-	    floor->direction = -1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = 
-		P_FindHighestFloorSurrounding(sec);
-	    break;
+      /* ALREADY MOVING?  IF SO, KEEP GOING... */
 
-	  case lowerFloorToLowest:
-	    floor->direction = -1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = 
-		P_FindLowestFloorSurrounding(sec);
-	    break;
+      if (sec->specialdata) continue;
 
-	  case turboLower:
-	    floor->direction = -1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED * 4;
-	    floor->floordestheight = 
-		P_FindHighestFloorSurrounding(sec);
-	    if (gameversion <= exe_doom_1_2 ||
-	        floor->floordestheight != sec->floorheight)
-		floor->floordestheight += 8*FRACUNIT;
-	    break;
+      /* new floor thinker */
 
-	  case raiseFloorCrush:
-	    floor->crush = true;
-	  case raiseFloor:
-	    floor->direction = 1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = 
-		P_FindLowestCeilingSurrounding(sec);
-	    if (floor->floordestheight > sec->ceilingheight)
-		floor->floordestheight = sec->ceilingheight;
-	    floor->floordestheight -= (8*FRACUNIT)*
-		(floortype == raiseFloorCrush);
-	    break;
+      rtn = 1;
+      floor = z_malloc(sizeof(*floor), PU_LEVSPEC, 0);
+      p_add_thinker(&floor->thinker);
+      sec->specialdata = floor;
+      floor->thinker.function.acp1 = (actionf_p1)t_move_floor;
+      floor->type = floortype;
+      floor->crush = false;
 
-	  case raiseFloorTurbo:
-	    floor->direction = 1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED*4;
-	    floor->floordestheight = 
-		P_FindNextHighestFloor(sec,sec->floorheight);
-	    break;
+      switch (floortype)
+        {
+        case FLOOR_LOWERFLOOR:
+          floor->direction = -1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight = p_find_highest_floor_surrounding(sec);
+          break;
 
-	  case raiseFloorToNearest:
-	    floor->direction = 1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = 
-		P_FindNextHighestFloor(sec,sec->floorheight);
-	    break;
+        case FLOOR_LOWERFLOORTOLOWEST:
+          floor->direction = -1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight = p_find_lowest_floor_surrounding(sec);
+          break;
 
-	  case raiseFloor24:
-	    floor->direction = 1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = floor->sector->floorheight +
-		24 * FRACUNIT;
-	    break;
-	  case raiseFloor512:
-	    floor->direction = 1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = floor->sector->floorheight +
-		512 * FRACUNIT;
-	    break;
+        case FLOOR_TURBOLOWER:
+          floor->direction = -1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED * 4;
+          floor->floordestheight = p_find_highest_floor_surrounding(sec);
+          if (gameversion <= exe_doom_1_2 ||
+              floor->floordestheight != sec->floorheight)
+            floor->floordestheight += 8 * FRACUNIT;
+          break;
 
-	  case raiseFloor24AndChange:
-	    floor->direction = 1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = floor->sector->floorheight +
-		24 * FRACUNIT;
-	    sec->floorpic = line->frontsector->floorpic;
-	    sec->special = line->frontsector->special;
-	    break;
+        case FLOOR_RAISEFLOORCRUSH:
+          floor->crush = true;
+        case FLOOR_RAISEFLOOR:
+          floor->direction = 1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight = p_find_lowest_ceiling_surrounding(sec);
+          if (floor->floordestheight > sec->ceilingheight)
+            floor->floordestheight = sec->ceilingheight;
+          floor->floordestheight -=
+              (8 * FRACUNIT) * (floortype == FLOOR_RAISEFLOORCRUSH);
+          break;
 
-	  case raiseToTexture:
-	  {
-	      int	minsize = INT_MAX;
-	      side_t*	side;
-				
-	      floor->direction = 1;
-	      floor->sector = sec;
-	      floor->speed = FLOORSPEED;
-	      for (i = 0; i < sec->linecount; i++)
-	      {
-		  if (twoSided (secnum, i) )
-		  {
-		      side = getSide(secnum,i,0);
-		      if (side->bottomtexture >= 0)
-			  if (textureheight[side->bottomtexture] < 
-			      minsize)
-			      minsize = 
-				  textureheight[side->bottomtexture];
-		      side = getSide(secnum,i,1);
-		      if (side->bottomtexture >= 0)
-			  if (textureheight[side->bottomtexture] < 
-			      minsize)
-			      minsize = 
-				  textureheight[side->bottomtexture];
-		  }
-	      }
-	      floor->floordestheight =
-		  floor->sector->floorheight + minsize;
-	  }
-	  break;
-	  
-	  case lowerAndChange:
-	    floor->direction = -1;
-	    floor->sector = sec;
-	    floor->speed = FLOORSPEED;
-	    floor->floordestheight = 
-		P_FindLowestFloorSurrounding(sec);
-	    floor->texture = sec->floorpic;
+        case FLOOR_RAISEFLOORTURBO:
+          floor->direction = 1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED * 4;
+          floor->floordestheight =
+              p_find_next_highest_floor(sec, sec->floorheight);
+          break;
 
-	    for (i = 0; i < sec->linecount; i++)
-	    {
-		if ( twoSided(secnum, i) )
-		{
-		    if (getSide(secnum,i,0)->sector-sectors == secnum)
-		    {
-			sec = getSector(secnum,i,1);
+        case FLOOR_RAISEFLOORTONEAREST:
+          floor->direction = 1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight =
+              p_find_next_highest_floor(sec, sec->floorheight);
+          break;
 
-			if (sec->floorheight == floor->floordestheight)
-			{
-			    floor->texture = sec->floorpic;
-			    floor->newspecial = sec->special;
-			    break;
-			}
-		    }
-		    else
-		    {
-			sec = getSector(secnum,i,0);
+        case FLOOR_RAISEFLOOR24:
+          floor->direction = 1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight =
+              floor->sector->floorheight + 24 * FRACUNIT;
+          break;
 
-			if (sec->floorheight == floor->floordestheight)
-			{
-			    floor->texture = sec->floorpic;
-			    floor->newspecial = sec->special;
-			    break;
-			}
-		    }
-		}
-	    }
-	  default:
-	    break;
-	}
+        case FLOOR_RAISEFLOOR512:
+          floor->direction = 1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight =
+              floor->sector->floorheight + 512 * FRACUNIT;
+          break;
+
+        case FLOOR_RAISEFLOOR24ANDCHANGE:
+          floor->direction = 1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight =
+              floor->sector->floorheight + 24 * FRACUNIT;
+          sec->floorpic = line->frontsector->floorpic;
+          sec->special = line->frontsector->special;
+          break;
+
+        case FLOOR_RAISETOTEXTURE:
+          {
+            int minsize = INT_MAX;
+            side_t *side;
+
+            floor->direction = 1;
+            floor->sector = sec;
+            floor->speed = FLOORSPEED;
+            for (i = 0; i < sec->linecount; i++)
+              {
+                if (two_sided(secnum, i))
+                  {
+                    side = get_side(secnum, i, 0);
+                    if (side->bottomtexture >= 0)
+                      if (textureheight[side->bottomtexture] < minsize)
+                        minsize = textureheight[side->bottomtexture];
+                    side = get_side(secnum, i, 1);
+                    if (side->bottomtexture >= 0)
+                      if (textureheight[side->bottomtexture] < minsize)
+                        minsize = textureheight[side->bottomtexture];
+                  }
+              }
+
+            floor->floordestheight = floor->sector->floorheight + minsize;
+          }
+          break;
+
+        case FLOOR_LOWERANDCHANGE:
+          floor->direction = -1;
+          floor->sector = sec;
+          floor->speed = FLOORSPEED;
+          floor->floordestheight = p_find_lowest_floor_surrounding(sec);
+          floor->texture = sec->floorpic;
+
+          for (i = 0; i < sec->linecount; i++)
+            {
+              if (two_sided(secnum, i))
+                {
+                  if (get_side(secnum, i, 0)->sector - sectors == secnum)
+                    {
+                      sec = get_sector(secnum, i, 1);
+
+                      if (sec->floorheight == floor->floordestheight)
+                        {
+                          floor->texture = sec->floorpic;
+                          floor->newspecial = sec->special;
+                          break;
+                        }
+                    }
+                  else
+                    {
+                      sec = get_sector(secnum, i, 0);
+
+                      if (sec->floorheight == floor->floordestheight)
+                        {
+                          floor->texture = sec->floorpic;
+                          floor->newspecial = sec->special;
+                          break;
+                        }
+                    }
+                }
+            }
+
+        default:
+          break;
+        }
     }
-    return rtn;
+
+  return rtn;
 }
 
+/* BUILD A STAIRCASE! */
 
-
-
-//
-// BUILD A STAIRCASE!
-//
-int
-EV_BuildStairs
-( line_t*	line,
-  stair_e	type )
+int ev_build_stairs(line_t *line, stair_e type)
 {
-    int			secnum;
-    int			height;
-    int			i;
-    int			newsecnum;
-    int			texture;
-    int			ok;
-    int			rtn;
-    
-    sector_t*		sec;
-    sector_t*		tsec;
+  int secnum;
+  int height;
+  int i;
+  int newsecnum;
+  int texture;
+  int is_ok;
+  int rtn;
 
-    floormove_t*	floor;
-    
-    fixed_t		stairsize = 0;
-    fixed_t		speed = 0;
+  sector_t *sec;
+  sector_t *tsec;
 
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+  floormove_t *floor;
+
+  fixed_t stairsize = 0;
+  fixed_t speed = 0;
+
+  secnum = -1;
+  rtn = 0;
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
     {
-	sec = &sectors[secnum];
-		
-	// ALREADY MOVING?  IF SO, KEEP GOING...
-	if (sec->specialdata)
-	    continue;
-	
-	// new floor thinker
-	rtn = 1;
-	floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-	P_AddThinker (&floor->thinker);
-	sec->specialdata = floor;
-	floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-	floor->direction = 1;
-	floor->sector = sec;
-	switch(type)
-	{
-	  case build8:
-	    speed = FLOORSPEED/4;
-	    stairsize = 8*FRACUNIT;
-	    break;
-	  case turbo16:
-	    speed = FLOORSPEED*4;
-	    stairsize = 16*FRACUNIT;
-	    break;
-	}
-	floor->speed = speed;
-	height = sec->floorheight + stairsize;
-	floor->floordestheight = height;
-	// Initialize
-	floor->type = lowerFloor;
-	// e6y
-	// Uninitialized crush field will not be equal to 0 or 1 (true)
-	// with high probability. So, initialize it with any other value
-	floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
-		
-	texture = sec->floorpic;
-	
-	// Find next sector to raise
-	// 1.	Find 2-sided line with same sector side[0]
-	// 2.	Other side is the next sector to raise
-	do
-	{
-	    ok = 0;
-	    for (i = 0;i < sec->linecount;i++)
-	    {
-		if ( !((sec->lines[i])->flags & ML_TWOSIDED) )
-		    continue;
-					
-		tsec = (sec->lines[i])->frontsector;
-		newsecnum = tsec-sectors;
-		
-		if (secnum != newsecnum)
-		    continue;
+      sec = &sectors[secnum];
 
-		tsec = (sec->lines[i])->backsector;
-		newsecnum = tsec - sectors;
+      /* ALREADY MOVING?  IF SO, KEEP GOING... */
 
-		if (tsec->floorpic != texture)
-		    continue;
-					
-		height += stairsize;
+      if (sec->specialdata) continue;
 
-		if (tsec->specialdata)
-		    continue;
-					
-		sec = tsec;
-		secnum = newsecnum;
-		floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+      /* new floor thinker */
 
-		P_AddThinker (&floor->thinker);
+      rtn = 1;
+      floor = z_malloc(sizeof(*floor), PU_LEVSPEC, 0);
+      p_add_thinker(&floor->thinker);
+      sec->specialdata = floor;
+      floor->thinker.function.acp1 = (actionf_p1)t_move_floor;
+      floor->direction = 1;
+      floor->sector = sec;
 
-		sec->specialdata = floor;
-		floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-		floor->direction = 1;
-		floor->sector = sec;
-		floor->speed = speed;
-		floor->floordestheight = height;
-		// Initialize
-		floor->type = lowerFloor;
-		// e6y
-		// Uninitialized crush field will not be equal to 0 or 1 (true)
-		// with high probability. So, initialize it with any other value
-		floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
-		ok = 1;
-		break;
-	    }
-	} while(ok);
+      switch (type)
+        {
+        case STAIR_BUILD8:
+          speed = FLOORSPEED / 4;
+          stairsize = 8 * FRACUNIT;
+          break;
+        case STAIR_TURBO16:
+          speed = FLOORSPEED * 4;
+          stairsize = 16 * FRACUNIT;
+          break;
+        }
+
+      floor->speed = speed;
+      height = sec->floorheight + stairsize;
+      floor->floordestheight = height;
+
+      /* Initialize */
+
+      floor->type = FLOOR_LOWERFLOOR;
+
+      /* e6y
+       * Uninitialized crush field will not be equal to 0 or 1 (true)
+       * with high probability. So, initialize it with any other value
+       */
+
+      floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
+
+      texture = sec->floorpic;
+
+      /* Find next sector to raise
+       * 1. Find 2-sided line with same sector side[0]
+       * 2. Other side is the next sector to raise
+       */
+
+      do
+        {
+          is_ok = 0;
+          for (i = 0; i < sec->linecount; i++)
+            {
+              if (!((sec->lines[i])->flags & ML_TWOSIDED)) continue;
+
+              tsec = (sec->lines[i])->frontsector;
+              newsecnum = tsec - sectors;
+
+              if (secnum != newsecnum) continue;
+
+              tsec = (sec->lines[i])->backsector;
+              newsecnum = tsec - sectors;
+
+              if (tsec->floorpic != texture) continue;
+
+              height += stairsize;
+
+              if (tsec->specialdata) continue;
+
+              sec = tsec;
+              secnum = newsecnum;
+              floor = z_malloc(sizeof(*floor), PU_LEVSPEC, 0);
+
+              p_add_thinker(&floor->thinker);
+
+              sec->specialdata = floor;
+              floor->thinker.function.acp1 = (actionf_p1)t_move_floor;
+              floor->direction = 1;
+              floor->sector = sec;
+              floor->speed = speed;
+              floor->floordestheight = height;
+
+              /* Initialize */
+
+              floor->type = FLOOR_LOWERFLOOR;
+
+              /* e6y
+               * Uninitialized crush field will not be equal to 0 or 1
+               * (true) with high probability. So, initialize it with any
+               * other value
+               */
+
+              floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
+              is_ok = 1;
+              break;
+            }
+        }
+      while (is_ok);
     }
-    return rtn;
-}
 
+  return rtn;
+}
diff --git a/games/NXDoom/src/doom/p_inter.c b/games/NXDoom/src/doom/p_inter.c
index b6e403298..cd77f8ca7 100644
--- a/games/NXDoom/src/doom/p_inter.c
+++ b/games/NXDoom/src/doom/p_inter.c
@@ -1,931 +1,890 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Handling interactions (i.e., collisions).
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_inter.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Handling interactions (i.e., collisions).
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+/* Data. */
 
-
-// Data.
 #include "doomdef.h"
 #include "dstrings.h"
-#include "sounds.h"
 
 #include "deh_main.h"
 #include "deh_misc.h"
 #include "doomstat.h"
 
-#include "m_random.h"
 #include "i_system.h"
+#include "m_random.h"
 
 #include "am_map.h"
 
 #include "p_local.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "p_inter.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define BONUSADD	6
+#define BONUSADD 6
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+/* a weapon is found with two clip loads, a big item has five clip loads */
 
-
-// a weapon is found with two clip loads,
-// a big item has five clip loads
-int	maxammo[NUMAMMO] = {200, 50, 300, 50};
-int	clipammo[NUMAMMO] = {10, 4, 20, 1};
-
-
-//
-// GET STUFF
-//
-
-//
-// P_GiveAmmo
-// Num is the number of clip loads,
-// not the individual count (0= 1/2 clip).
-// Returns false if the ammo can't be picked up at all
-//
-
-boolean
-P_GiveAmmo
-( player_t*	player,
-  ammotype_t	ammo,
-  int		num )
+int maxammo[NUMAMMO] =
 {
-    int		oldammo;
-	
-    if (ammo == am_noammo)
-	return false;
-		
-    if (ammo >= NUMAMMO)
-	I_Error ("P_GiveAmmo: bad type %i", ammo);
-		
-    if ( player->ammo[ammo] == player->maxammo[ammo]  )
-	return false;
-		
-    if (num)
-	num *= clipammo[ammo];
-    else
-	num = clipammo[ammo]/2;
-    
-    if (gameskill == sk_baby
-	|| gameskill == sk_nightmare)
+  200, 50, 300, 50
+};
+
+int clipammo[NUMAMMO] =
+{
+  10, 4, 20, 1
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* GET STUFF */
+
+/* p_give_ammo
+ *
+ * Num is the number of clip loads, not the individual count (0= 1/2 clip).
+ *
+ * Returns false if the ammo can't be picked up at all
+ */
+
+static boolean p_give_ammo(player_t *player, ammotype_t ammo, int num)
+{
+  int oldammo;
+
+  if (ammo == am_noammo) return false;
+
+  if (ammo >= NUMAMMO) i_error("p_give_ammo: bad type %i", ammo);
+
+  if (player->ammo[ammo] == player->maxammo[ammo]) return false;
+
+  if (num)
+    num *= clipammo[ammo];
+  else
+    num = clipammo[ammo] / 2;
+
+  if (gameskill == sk_baby || gameskill == sk_nightmare)
     {
-	// give double ammo in trainer mode,
-	// you'll need in nightmare
-	num <<= 1;
+      /* give double ammo in trainer mode, you'll need in nightmare */
+
+      num <<= 1;
     }
-    
-		
-    oldammo = player->ammo[ammo];
-    player->ammo[ammo] += num;
 
-    if (player->ammo[ammo] > player->maxammo[ammo])
-	player->ammo[ammo] = player->maxammo[ammo];
+  oldammo = player->ammo[ammo];
+  player->ammo[ammo] += num;
 
-    // If non zero ammo, 
-    // don't change up weapons,
-    // player was lower on purpose.
-    if (oldammo)
-	return true;	
+  if (player->ammo[ammo] > player->maxammo[ammo])
+    player->ammo[ammo] = player->maxammo[ammo];
 
-    // We were down to zero,
-    // so select a new weapon.
-    // Preferences are not user selectable.
-    switch (ammo)
+  /* If non zero ammo, don't change up weapons, player was lower on purpose.
+   */
+
+  if (oldammo) return true;
+
+  /* We were down to zero, so select a new weapon. Preferences are not user
+   * selectable.
+   */
+
+  switch (ammo)
     {
-      case am_clip:
-	if (player->readyweapon == wp_fist)
-	{
-	    if (player->weaponowned[wp_chaingun])
-		player->pendingweapon = wp_chaingun;
-	    else
-		player->pendingweapon = wp_pistol;
-	}
-	break;
-	
-      case am_shell:
-	if (player->readyweapon == wp_fist
-	    || player->readyweapon == wp_pistol)
-	{
-	    if (player->weaponowned[wp_shotgun])
-		player->pendingweapon = wp_shotgun;
-	}
-	break;
-	
-      case am_cell:
-	if (player->readyweapon == wp_fist
-	    || player->readyweapon == wp_pistol)
-	{
-	    if (player->weaponowned[wp_plasma])
-		player->pendingweapon = wp_plasma;
-	}
-	break;
-	
-      case am_misl:
-	if (player->readyweapon == wp_fist)
-	{
-	    if (player->weaponowned[wp_missile])
-		player->pendingweapon = wp_missile;
-	}
-      default:
-	break;
+    case am_clip:
+      if (player->readyweapon == wp_fist)
+        {
+          if (player->weaponowned[wp_chaingun])
+            player->pendingweapon = wp_chaingun;
+          else
+            player->pendingweapon = wp_pistol;
+        }
+
+      break;
+
+    case am_shell:
+      if (player->readyweapon == wp_fist || player->readyweapon == wp_pistol)
+        {
+          if (player->weaponowned[wp_shotgun])
+            player->pendingweapon = wp_shotgun;
+        }
+
+      break;
+
+    case am_cell:
+      if (player->readyweapon == wp_fist || player->readyweapon == wp_pistol)
+        {
+          if (player->weaponowned[wp_plasma])
+            player->pendingweapon = wp_plasma;
+        }
+
+      break;
+
+    case am_misl:
+      if (player->readyweapon == wp_fist)
+        {
+          if (player->weaponowned[wp_missile])
+            player->pendingweapon = wp_missile;
+        }
+
+    default:
+      break;
     }
-	
-    return true;
+
+  return true;
 }
 
+/* p_give_weapon
+ *
+ * The weapon name may have a MF_DROPPED flag ored in.
+ */
 
-//
-// P_GiveWeapon
-// The weapon name may have a MF_DROPPED flag ored in.
-//
-boolean
-P_GiveWeapon
-( player_t*	player,
-  weapontype_t	weapon,
-  boolean	dropped )
+static boolean p_give_weapon(player_t *player, weapontype_t weapon,
+                             boolean dropped)
 {
-    boolean	gaveammo;
-    boolean	gaveweapon;
-	
-    if (netgame
-	&& (deathmatch!=2)
-	 && !dropped )
-    {
-	// leave placed weapons forever on net games
-	if (player->weaponowned[weapon])
-	    return false;
+  boolean gaveammo;
+  boolean gaveweapon;
 
-	player->bonuscount += BONUSADD;
-	player->weaponowned[weapon] = true;
-
-	if (deathmatch)
-	    P_GiveAmmo (player, weaponinfo[weapon].ammo, 5);
-	else
-	    P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
-	player->pendingweapon = weapon;
-
-	if (player == &players[consoleplayer])
-	    S_StartSound (NULL, sfx_wpnup);
-	return false;
-    }
-	
-    if (weaponinfo[weapon].ammo != am_noammo)
+  if (netgame && (deathmatch != 2) && !dropped)
     {
-	// give one clip with a dropped weapon,
-	// two clips with a found weapon
-	if (dropped)
-	    gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 1);
-	else
-	    gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
+      /* leave placed weapons forever on net games */
+
+      if (player->weaponowned[weapon]) return false;
+
+      player->bonuscount += BONUSADD;
+      player->weaponowned[weapon] = true;
+
+      if (deathmatch)
+        p_give_ammo(player, weaponinfo[weapon].ammo, 5);
+      else
+        p_give_ammo(player, weaponinfo[weapon].ammo, 2);
+      player->pendingweapon = weapon;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (player == &players[consoleplayer]) s_start_sound(NULL, SFX_WPNUP);
+#endif
+      return false;
     }
-    else
-	gaveammo = false;
-	
-    if (player->weaponowned[weapon])
-	gaveweapon = false;
-    else
+
+  if (weaponinfo[weapon].ammo != am_noammo)
     {
-	gaveweapon = true;
-	player->weaponowned[weapon] = true;
-	player->pendingweapon = weapon;
+      /* give one clip with a dropped weapon, two clips with a found weapon */
+
+      if (dropped)
+        gaveammo = p_give_ammo(player, weaponinfo[weapon].ammo, 1);
+      else
+        gaveammo = p_give_ammo(player, weaponinfo[weapon].ammo, 2);
     }
-	
-    return (gaveweapon || gaveammo);
+  else
+    gaveammo = false;
+
+  if (player->weaponowned[weapon])
+    gaveweapon = false;
+  else
+    {
+      gaveweapon = true;
+      player->weaponowned[weapon] = true;
+      player->pendingweapon = weapon;
+    }
+
+  return (gaveweapon || gaveammo);
 }
 
- 
+/* p_give_body
+ * Returns false if the body isn't needed at all
+ */
 
-//
-// P_GiveBody
-// Returns false if the body isn't needed at all
-//
-boolean
-P_GiveBody
-( player_t*	player,
-  int		num )
+static boolean p_give_body(player_t *player, int num)
 {
-    if (player->health >= MAXHEALTH)
-	return false;
-		
-    player->health += num;
-    if (player->health > MAXHEALTH)
-	player->health = MAXHEALTH;
-    player->mo->health = player->health;
-	
-    return true;
+  if (player->health >= MAXHEALTH) return false;
+
+  player->health += num;
+  if (player->health > MAXHEALTH) player->health = MAXHEALTH;
+  player->mo->health = player->health;
+
+  return true;
 }
 
+/* p_give_armor
+ * Returns false if the armor is worse than the current armor.
+ */
 
-
-//
-// P_GiveArmor
-// Returns false if the armor is worse
-// than the current armor.
-//
-boolean
-P_GiveArmor
-( player_t*	player,
-  int		armortype )
+static boolean p_give_armor(player_t *player, int armortype)
 {
-    int		hits;
-	
-    hits = armortype*100;
-    if (player->armorpoints >= hits)
-	return false;	// don't pick up
-		
-    player->armortype = armortype;
-    player->armorpoints = hits;
-	
-    return true;
+  int hits;
+
+  hits = armortype * 100;
+  if (player->armorpoints >= hits) return false; /* don't pick up */
+
+  player->armortype = armortype;
+  player->armorpoints = hits;
+
+  return true;
 }
 
-
-
-//
-// P_GiveCard
-//
-void
-P_GiveCard
-( player_t*	player,
-  card_t	card )
+static void p_give_card(player_t *player, card_t card)
 {
-    if (player->cards[card])
-	return;
-    
-    player->bonuscount = BONUSADD;
-    player->cards[card] = 1;
+  if (player->cards[card]) return;
+
+  player->bonuscount = BONUSADD;
+  player->cards[card] = 1;
 }
 
-
-//
-// P_GivePower
-//
-boolean
-P_GivePower
-( player_t*	player,
-  int /*powertype_t*/	power )
+static void p_kill_mobj(mobj_t *source, mobj_t *target)
 {
-    if (power == pw_invulnerability)
+  mobjtype_t item;
+  mobj_t *mo;
+
+  target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY);
+
+  if (target->type != MT_SKULL) target->flags &= ~MF_NOGRAVITY;
+
+  target->flags |= MF_CORPSE | MF_DROPOFF;
+  target->height >>= 2;
+
+  if (source && source->player)
     {
-	player->powers[power] = INVULNTICS;
-	return true;
+      /* count for intermission */
+
+      if (target->flags & MF_COUNTKILL) source->player->killcount++;
+
+      if (target->player) source->player->frags[target->player - players]++;
     }
-    
-    if (power == pw_invisibility)
+  else if (!netgame && (target->flags & MF_COUNTKILL))
     {
-	player->powers[power] = INVISTICS;
-	player->mo->flags |= MF_SHADOW;
-	return true;
+      /* count all monster deaths, even those caused by other monsters */
+
+      players[0].killcount++;
     }
-    
-    if (power == pw_infrared)
+
+  if (target->player)
     {
-	player->powers[power] = INFRATICS;
-	return true;
+      /* count environment kills against you */
+
+      if (!source) target->player->frags[target->player - players]++;
+
+      target->flags &= ~MF_SOLID;
+      target->player->playerstate = PST_DEAD;
+      p_drop_weapon(target->player);
+
+      if (target->player == &players[consoleplayer] && automapactive)
+        {
+          /* don't die in auto map, switch view prior to dying */
+
+          am_stop();
+        }
     }
-    
-    if (power == pw_ironfeet)
+
+  if (target->health < -target->info->spawnhealth &&
+      target->info->xdeathstate)
     {
-	player->powers[power] = IRONTICS;
-	return true;
+      p_set_mobj_state(target, target->info->xdeathstate);
     }
-    
-    if (power == pw_strength)
+  else
+    p_set_mobj_state(target, target->info->deathstate);
+
+  target->tics -= p_random() & 3;
+
+  if (target->tics < 1) target->tics = 1;
+
+  /* In Chex Quest, monsters don't drop items. */
+
+  if (gameversion == exe_chex)
     {
-	P_GiveBody (player, 100);
-	player->powers[power] = 1;
-	return true;
+      return;
     }
-	
-    if (player->powers[power])
-	return false;	// already got it
-		
-    player->powers[power] = 1;
-    return true;
+
+  /* Drop stuff.
+   * This determines the kind of object spawned during the death frame of a
+   * thing.
+   */
+
+  switch (target->type)
+    {
+    case MT_WOLFSS:
+    case MT_POSSESSED:
+      item = MT_CLIP;
+      break;
+
+    case MT_SHOTGUY:
+      item = MT_SHOTGUN;
+      break;
+
+    case MT_CHAINGUY:
+      item = MT_CHAINGUN;
+      break;
+
+    default:
+      return;
+    }
+
+  mo = p_spawn_mobj(target->x, target->y, ONFLOORZ, item);
+  mo->flags |= MF_DROPPED; /* special versions of items */
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-
-//
-// P_TouchSpecialThing
-//
-void
-P_TouchSpecialThing
-( mobj_t*	special,
-  mobj_t*	toucher )
+boolean p_give_power(player_t *player, int /* powertype_t */ power)
 {
-    player_t*	player;
-    int		i;
-    fixed_t	delta;
-    int		sound;
-		
-    delta = special->z - toucher->z;
-
-    if (delta > toucher->height
-	|| delta < -8*FRACUNIT)
+  if (power == pw_invulnerability)
     {
-	// out of reach
-	return;
+      player->powers[power] = INVULNTICS;
+      return true;
     }
-    
-	
-    sound = sfx_itemup;	
-    player = toucher->player;
 
-    // Dead thing touching.
-    // Can happen with a sliding player corpse.
-    if (toucher->health <= 0)
-	return;
-
-    // Identify by sprite.
-    switch (special->sprite)
+  if (power == pw_invisibility)
     {
-	// armor
-      case SPR_ARM1:
-	if (!P_GiveArmor (player, deh_green_armor_class))
-	    return;
-	player->message = DEH_String(GOTARMOR);
-	break;
-		
-      case SPR_ARM2:
-	if (!P_GiveArmor (player, deh_blue_armor_class))
-	    return;
-	player->message = DEH_String(GOTMEGA);
-	break;
-	
-	// bonus items
-      case SPR_BON1:
-	player->health++;		// can go over 100%
-	if (player->health > deh_max_health)
-	    player->health = deh_max_health;
-	player->mo->health = player->health;
-	player->message = DEH_String(GOTHTHBONUS);
-	break;
-	
-      case SPR_BON2:
-	player->armorpoints++;		// can go over 100%
-	if (player->armorpoints > deh_max_armor && gameversion > exe_doom_1_2)
-	    player->armorpoints = deh_max_armor;
-        // deh_green_armor_class only applies to the green armor shirt;
-        // for the armor helmets, armortype 1 is always used.
-	if (!player->armortype)
-	    player->armortype = 1;
-	player->message = DEH_String(GOTARMBONUS);
-	break;
-	
-      case SPR_SOUL:
-	player->health += deh_soulsphere_health;
-	if (player->health > deh_max_soulsphere)
-	    player->health = deh_max_soulsphere;
-	player->mo->health = player->health;
-	player->message = DEH_String(GOTSUPER);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-      case SPR_MEGA:
-	if (gamemode != commercial)
-	    return;
-	player->health = deh_megasphere_health;
-	player->mo->health = player->health;
-        // We always give armor type 2 for the megasphere; dehacked only 
-        // affects the MegaArmor.
-	P_GiveArmor (player, 2);
-	player->message = DEH_String(GOTMSPHERE);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-	// cards
-	// leave cards for everyone
-      case SPR_BKEY:
-	if (!player->cards[it_bluecard])
-	    player->message = DEH_String(GOTBLUECARD);
-	P_GiveCard (player, it_bluecard);
-	if (!netgame)
-	    break;
-	return;
-	
-      case SPR_YKEY:
-	if (!player->cards[it_yellowcard])
-	    player->message = DEH_String(GOTYELWCARD);
-	P_GiveCard (player, it_yellowcard);
-	if (!netgame)
-	    break;
-	return;
-	
-      case SPR_RKEY:
-	if (!player->cards[it_redcard])
-	    player->message = DEH_String(GOTREDCARD);
-	P_GiveCard (player, it_redcard);
-	if (!netgame)
-	    break;
-	return;
-	
-      case SPR_BSKU:
-	if (!player->cards[it_blueskull])
-	    player->message = DEH_String(GOTBLUESKUL);
-	P_GiveCard (player, it_blueskull);
-	if (!netgame)
-	    break;
-	return;
-	
-      case SPR_YSKU:
-	if (!player->cards[it_yellowskull])
-	    player->message = DEH_String(GOTYELWSKUL);
-	P_GiveCard (player, it_yellowskull);
-	if (!netgame)
-	    break;
-	return;
-	
-      case SPR_RSKU:
-	if (!player->cards[it_redskull])
-	    player->message = DEH_String(GOTREDSKULL);
-	P_GiveCard (player, it_redskull);
-	if (!netgame)
-	    break;
-	return;
-	
-	// medikits, heals
-      case SPR_STIM:
-	if (!P_GiveBody (player, 10))
-	    return;
-	player->message = DEH_String(GOTSTIM);
-	break;
-	
-      case SPR_MEDI:
-	if (!P_GiveBody (player, 25))
-	    return;
-
-	if (player->health < 25)
-	    player->message = DEH_String(GOTMEDINEED);
-	else
-	    player->message = DEH_String(GOTMEDIKIT);
-	break;
-
-	
-	// power ups
-      case SPR_PINV:
-	if (!P_GivePower (player, pw_invulnerability))
-	    return;
-	player->message = DEH_String(GOTINVUL);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-      case SPR_PSTR:
-	if (!P_GivePower (player, pw_strength))
-	    return;
-	player->message = DEH_String(GOTBERSERK);
-	if (player->readyweapon != wp_fist)
-	    player->pendingweapon = wp_fist;
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-      case SPR_PINS:
-	if (!P_GivePower (player, pw_invisibility))
-	    return;
-	player->message = DEH_String(GOTINVIS);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-      case SPR_SUIT:
-	if (!P_GivePower (player, pw_ironfeet))
-	    return;
-	player->message = DEH_String(GOTSUIT);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-      case SPR_PMAP:
-	if (!P_GivePower (player, pw_allmap))
-	    return;
-	player->message = DEH_String(GOTMAP);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-      case SPR_PVIS:
-	if (!P_GivePower (player, pw_infrared))
-	    return;
-	player->message = DEH_String(GOTVISOR);
-	if (gameversion > exe_doom_1_2)
-	    sound = sfx_getpow;
-	break;
-	
-	// ammo
-      case SPR_CLIP:
-	if (special->flags & MF_DROPPED)
-	{
-	    if (!P_GiveAmmo (player,am_clip,0))
-		return;
-	}
-	else
-	{
-	    if (!P_GiveAmmo (player,am_clip,1))
-		return;
-	}
-	player->message = DEH_String(GOTCLIP);
-	break;
-	
-      case SPR_AMMO:
-	if (!P_GiveAmmo (player, am_clip,5))
-	    return;
-	player->message = DEH_String(GOTCLIPBOX);
-	break;
-	
-      case SPR_ROCK:
-	if (!P_GiveAmmo (player, am_misl,1))
-	    return;
-	player->message = DEH_String(GOTROCKET);
-	break;
-	
-      case SPR_BROK:
-	if (!P_GiveAmmo (player, am_misl,5))
-	    return;
-	player->message = DEH_String(GOTROCKBOX);
-	break;
-	
-      case SPR_CELL:
-	if (!P_GiveAmmo (player, am_cell,1))
-	    return;
-	player->message = DEH_String(GOTCELL);
-	break;
-	
-      case SPR_CELP:
-	if (!P_GiveAmmo (player, am_cell,5))
-	    return;
-	player->message = DEH_String(GOTCELLBOX);
-	break;
-	
-      case SPR_SHEL:
-	if (!P_GiveAmmo (player, am_shell,1))
-	    return;
-	player->message = DEH_String(GOTSHELLS);
-	break;
-	
-      case SPR_SBOX:
-	if (!P_GiveAmmo (player, am_shell,5))
-	    return;
-	player->message = DEH_String(GOTSHELLBOX);
-	break;
-	
-      case SPR_BPAK:
-	if (!player->backpack)
-	{
-	    for (i=0 ; i<NUMAMMO ; i++)
-		player->maxammo[i] *= 2;
-	    player->backpack = true;
-	}
-	for (i=0 ; i<NUMAMMO ; i++)
-	    P_GiveAmmo (player, i, 1);
-	player->message = DEH_String(GOTBACKPACK);
-	break;
-	
-	// weapons
-      case SPR_BFUG:
-	if (!P_GiveWeapon (player, wp_bfg, false) )
-	    return;
-	player->message = DEH_String(GOTBFG9000);
-	sound = sfx_wpnup;	
-	break;
-	
-      case SPR_MGUN:
-        if (!P_GiveWeapon(player, wp_chaingun,
-                          (special->flags & MF_DROPPED) != 0))
-            return;
-	player->message = DEH_String(GOTCHAINGUN);
-	sound = sfx_wpnup;	
-	break;
-	
-      case SPR_CSAW:
-	if (!P_GiveWeapon (player, wp_chainsaw, false) )
-	    return;
-	player->message = DEH_String(GOTCHAINSAW);
-	sound = sfx_wpnup;	
-	break;
-	
-      case SPR_LAUN:
-	if (!P_GiveWeapon (player, wp_missile, false) )
-	    return;
-	player->message = DEH_String(GOTLAUNCHER);
-	sound = sfx_wpnup;	
-	break;
-	
-      case SPR_PLAS:
-	if (!P_GiveWeapon (player, wp_plasma, false) )
-	    return;
-	player->message = DEH_String(GOTPLASMA);
-	sound = sfx_wpnup;	
-	break;
-	
-      case SPR_SHOT:
-        if (!P_GiveWeapon(player, wp_shotgun,
-                          (special->flags & MF_DROPPED) != 0))
-            return;
-	player->message = DEH_String(GOTSHOTGUN);
-	sound = sfx_wpnup;	
-	break;
-		
-      case SPR_SGN2:
-        if (!P_GiveWeapon(player, wp_supershotgun,
-                          (special->flags & MF_DROPPED) != 0))
-            return;
-	player->message = DEH_String(GOTSHOTGUN2);
-	sound = sfx_wpnup;	
-	break;
-		
-      default:
-	I_Error ("P_SpecialThing: Unknown gettable thing");
+      player->powers[power] = INVISTICS;
+      player->mo->flags |= MF_SHADOW;
+      return true;
     }
-	
-    if (special->flags & MF_COUNTITEM)
-	player->itemcount++;
-    P_RemoveMobj (special);
-    player->bonuscount += BONUSADD;
-    if (player == &players[consoleplayer])
-	S_StartSound (NULL, sound);
+
+  if (power == pw_infrared)
+    {
+      player->powers[power] = INFRATICS;
+      return true;
+    }
+
+  if (power == pw_ironfeet)
+    {
+      player->powers[power] = IRONTICS;
+      return true;
+    }
+
+  if (power == pw_strength)
+    {
+      p_give_body(player, 100);
+      player->powers[power] = 1;
+      return true;
+    }
+
+  if (player->powers[power]) return false; /* already got it */
+
+  player->powers[power] = 1;
+  return true;
 }
 
-
-//
-// KillMobj
-//
-void
-P_KillMobj
-( mobj_t*	source,
-  mobj_t*	target )
+void p_touch_special_thing(mobj_t *special, mobj_t *toucher)
 {
-    mobjtype_t	item;
-    mobj_t*	mo;
-	
-    target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SKULLFLY);
+  player_t *player;
+  int i;
+  fixed_t delta;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  int sound;
+#endif
 
-    if (target->type != MT_SKULL)
-	target->flags &= ~MF_NOGRAVITY;
+  delta = special->z - toucher->z;
 
-    target->flags |= MF_CORPSE|MF_DROPOFF;
-    target->height >>= 2;
-
-    if (source && source->player)
+  if (delta > toucher->height || delta < -8 * FRACUNIT)
     {
-	// count for intermission
-	if (target->flags & MF_COUNTKILL)
-	    source->player->killcount++;	
-
-	if (target->player)
-	    source->player->frags[target->player-players]++;
-    }
-    else if (!netgame && (target->flags & MF_COUNTKILL) )
-    {
-	// count all monster deaths,
-	// even those caused by other monsters
-	players[0].killcount++;
-    }
-    
-    if (target->player)
-    {
-	// count environment kills against you
-	if (!source)	
-	    target->player->frags[target->player-players]++;
-			
-	target->flags &= ~MF_SOLID;
-	target->player->playerstate = PST_DEAD;
-	P_DropWeapon (target->player);
-
-	if (target->player == &players[consoleplayer]
-	    && automapactive)
-	{
-	    // don't die in auto map,
-	    // switch view prior to dying
-	    AM_Stop ();
-	}
-	
+      return; /* out of reach */
     }
 
-    if (target->health < -target->info->spawnhealth 
-	&& target->info->xdeathstate)
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  sound = SFX_ITEMUP;
+#endif
+  player = toucher->player;
+
+  /* Dead thing touching. Can happen with a sliding player corpse. */
+
+  if (toucher->health <= 0) return;
+
+  /* Identify by sprite. */
+
+  switch (special->sprite)
     {
-	P_SetMobjState (target, target->info->xdeathstate);
-    }
-    else
-	P_SetMobjState (target, target->info->deathstate);
-    target->tics -= P_Random()&3;
+      /* armor */
 
-    if (target->tics < 1)
-	target->tics = 1;
-		
-    //	I_StartSound (&actor->r, actor->info->deathsound);
+    case SPR_ARM1:
+      if (!p_give_armor(player, deh_green_armor_class)) return;
+      player->message = (GOTARMOR);
+      break;
 
-    // In Chex Quest, monsters don't drop items.
+    case SPR_ARM2:
+      if (!p_give_armor(player, deh_blue_armor_class)) return;
+      player->message = (GOTMEGA);
+      break;
 
-    if (gameversion == exe_chex)
-    {
+      /* bonus items */
+
+    case SPR_BON1:
+      player->health++; /* can go over 100% */
+      if (player->health > deh_max_health) player->health = deh_max_health;
+      player->mo->health = player->health;
+      player->message = (GOTHTHBONUS);
+      break;
+
+    case SPR_BON2:
+      player->armorpoints++; /* can go over 100% */
+      if (player->armorpoints > deh_max_armor && gameversion > exe_doom_1_2)
+        {
+          player->armorpoints = deh_max_armor;
+        }
+
+      /* deh_green_armor_class only applies to the green armor shirt;
+       * for the armor helmets, armortype 1 is always used.
+       */
+
+      if (!player->armortype) player->armortype = 1;
+      player->message = (GOTARMBONUS);
+      break;
+
+    case SPR_SOUL:
+      player->health += deh_soulsphere_health;
+      if (player->health > deh_max_soulsphere)
+        player->health = deh_max_soulsphere;
+      player->mo->health = player->health;
+      player->message = (GOTSUPER);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+    case SPR_MEGA:
+      if (gamemode != commercial) return;
+      player->health = deh_megasphere_health;
+      player->mo->health = player->health;
+
+      /* We always give armor type 2 for the megasphere; dehacked only
+       * affects the MegaArmor.
+       */
+
+      p_give_armor(player, 2);
+      player->message = (GOTMSPHERE);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+      /* cards
+       * leave cards for everyone
+       */
+
+    case SPR_BKEY:
+      if (!player->cards[it_bluecard]) player->message = (GOTBLUECARD);
+      p_give_card(player, it_bluecard);
+      if (!netgame) break;
+      return;
+
+    case SPR_YKEY:
+      if (!player->cards[it_yellowcard]) player->message = (GOTYELWCARD);
+      p_give_card(player, it_yellowcard);
+      if (!netgame) break;
+      return;
+
+    case SPR_RKEY:
+      if (!player->cards[it_redcard]) player->message = (GOTREDCARD);
+      p_give_card(player, it_redcard);
+      if (!netgame) break;
+      return;
+
+    case SPR_BSKU:
+      if (!player->cards[it_blueskull]) player->message = (GOTBLUESKUL);
+      p_give_card(player, it_blueskull);
+      if (!netgame) break;
+      return;
+
+    case SPR_YSKU:
+      if (!player->cards[it_yellowskull]) player->message = (GOTYELWSKUL);
+      p_give_card(player, it_yellowskull);
+      if (!netgame) break;
+      return;
+
+    case SPR_RSKU:
+      if (!player->cards[it_redskull]) player->message = (GOTREDSKULL);
+      p_give_card(player, it_redskull);
+      if (!netgame) break;
+      return;
+
+      /* medikits, heals */
+
+    case SPR_STIM:
+      if (!p_give_body(player, 10)) return;
+      player->message = (GOTSTIM);
+      break;
+
+    case SPR_MEDI:
+      if (!p_give_body(player, 25)) return;
+
+      if (player->health < 25)
+        player->message = (GOTMEDINEED);
+      else
+        player->message = (GOTMEDIKIT);
+      break;
+
+      /* power ups */
+
+    case SPR_PINV:
+      if (!p_give_power(player, pw_invulnerability)) return;
+      player->message = (GOTINVUL);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+    case SPR_PSTR:
+      if (!p_give_power(player, pw_strength)) return;
+      player->message = (GOTBERSERK);
+      if (player->readyweapon != wp_fist) player->pendingweapon = wp_fist;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+    case SPR_PINS:
+      if (!p_give_power(player, pw_invisibility)) return;
+      player->message = (GOTINVIS);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+    case SPR_SUIT:
+      if (!p_give_power(player, pw_ironfeet)) return;
+      player->message = (GOTSUIT);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+    case SPR_PMAP:
+      if (!p_give_power(player, pw_allmap)) return;
+      player->message = (GOTMAP);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+    case SPR_PVIS:
+      if (!p_give_power(player, pw_infrared)) return;
+      player->message = (GOTVISOR);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (gameversion > exe_doom_1_2) sound = SFX_GETPOW;
+#endif
+      break;
+
+      /* ammo */
+
+    case SPR_CLIP:
+      if (special->flags & MF_DROPPED)
+        {
+          if (!p_give_ammo(player, am_clip, 0)) return;
+        }
+      else
+        {
+          if (!p_give_ammo(player, am_clip, 1)) return;
+        }
+
+      player->message = (GOTCLIP);
+      break;
+
+    case SPR_AMMO:
+      if (!p_give_ammo(player, am_clip, 5)) return;
+      player->message = (GOTCLIPBOX);
+      break;
+
+    case SPR_ROCK:
+      if (!p_give_ammo(player, am_misl, 1)) return;
+      player->message = (GOTROCKET);
+      break;
+
+    case SPR_BROK:
+      if (!p_give_ammo(player, am_misl, 5)) return;
+      player->message = (GOTROCKBOX);
+      break;
+
+    case SPR_CELL:
+      if (!p_give_ammo(player, am_cell, 1)) return;
+      player->message = (GOTCELL);
+      break;
+
+    case SPR_CELP:
+      if (!p_give_ammo(player, am_cell, 5)) return;
+      player->message = (GOTCELLBOX);
+      break;
+
+    case SPR_SHEL:
+      if (!p_give_ammo(player, am_shell, 1)) return;
+      player->message = (GOTSHELLS);
+      break;
+
+    case SPR_SBOX:
+      if (!p_give_ammo(player, am_shell, 5)) return;
+      player->message = (GOTSHELLBOX);
+      break;
+
+    case SPR_BPAK:
+      if (!player->backpack)
+        {
+          for (i = 0; i < NUMAMMO; i++)
+            player->maxammo[i] *= 2;
+          player->backpack = true;
+        }
+
+      for (i = 0; i < NUMAMMO; i++)
+        p_give_ammo(player, i, 1);
+      player->message = (GOTBACKPACK);
+      break;
+
+      /* weapons */
+
+    case SPR_BFUG:
+      if (!p_give_weapon(player, wp_bfg, false)) return;
+      player->message = (GOTBFG9000);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    case SPR_MGUN:
+      if (!p_give_weapon(player, wp_chaingun,
+                         (special->flags & MF_DROPPED) != 0))
         return;
+      player->message = (GOTCHAINGUN);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    case SPR_CSAW:
+      if (!p_give_weapon(player, wp_chainsaw, false)) return;
+      player->message = (GOTCHAINSAW);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    case SPR_LAUN:
+      if (!p_give_weapon(player, wp_missile, false)) return;
+      player->message = (GOTLAUNCHER);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    case SPR_PLAS:
+      if (!p_give_weapon(player, wp_plasma, false)) return;
+      player->message = (GOTPLASMA);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    case SPR_SHOT:
+      if (!p_give_weapon(player, wp_shotgun,
+                         (special->flags & MF_DROPPED) != 0))
+        return;
+      player->message = (GOTSHOTGUN);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    case SPR_SGN2:
+      if (!p_give_weapon(player, wp_supershotgun,
+                         (special->flags & MF_DROPPED) != 0))
+        return;
+      player->message = (GOTSHOTGUN2);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      sound = SFX_WPNUP;
+#endif
+      break;
+
+    default:
+      i_error("P_SpecialThing: Unknown gettable thing");
     }
 
-    // Drop stuff.
-    // This determines the kind of object spawned
-    // during the death frame of a thing.
-    switch (target->type)
-    {
-      case MT_WOLFSS:
-      case MT_POSSESSED:
-	item = MT_CLIP;
-	break;
-	
-      case MT_SHOTGUY:
-	item = MT_SHOTGUN;
-	break;
-	
-      case MT_CHAINGUY:
-	item = MT_CHAINGUN;
-	break;
-	
-      default:
-	return;
-    }
-
-    mo = P_SpawnMobj (target->x,target->y,ONFLOORZ, item);
-    mo->flags |= MF_DROPPED;	// special versions of items
+  if (special->flags & MF_COUNTITEM) player->itemcount++;
+  p_remove_mobj(special);
+  player->bonuscount += BONUSADD;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (player == &players[consoleplayer]) s_start_sound(NULL, sound);
+#endif
 }
 
+/* p_damage_mobj
+ * Damages both enemies and players "inflictor" is the thing that caused the
+ * damage creature or missile, can be NULL (slime, etc) "source" is the thing
+ * to target after taking damage creature or NULL
+ *
+ * Source and inflictor are the same for melee attacks.
+ * Source can be NULL for slime, barrel explosions and other environmental
+ * stuff.
+ */
 
-
-
-//
-// P_DamageMobj
-// Damages both enemies and players
-// "inflictor" is the thing that caused the damage
-//  creature or missile, can be NULL (slime, etc)
-// "source" is the thing to target after taking damage
-//  creature or NULL
-// Source and inflictor are the same for melee attacks.
-// Source can be NULL for slime, barrel explosions
-// and other environmental stuff.
-//
-void
-P_DamageMobj
-( mobj_t*	target,
-  mobj_t*	inflictor,
-  mobj_t*	source,
-  int 		damage )
+void p_damage_mobj(mobj_t *target, mobj_t *inflictor, mobj_t *source,
+                   int damage)
 {
-    unsigned	ang;
-    int		saved;
-    player_t*	player;
-    fixed_t	thrust;
-    int		temp;
-	
-    if ( !(target->flags & MF_SHOOTABLE) )
-	return;	// shouldn't happen...
-		
-    if (target->health <= 0)
-	return;
+  unsigned ang;
+  int saved;
+  player_t *player;
+  fixed_t thrust;
+  int temp;
 
-    if ( target->flags & MF_SKULLFLY )
+  if (!(target->flags & MF_SHOOTABLE)) return; /* shouldn't happen... */
+
+  if (target->health <= 0) return;
+
+  if (target->flags & MF_SKULLFLY)
     {
-	target->momx = target->momy = target->momz = 0;
-    }
-	
-    player = target->player;
-    if (player && gameskill == sk_baby)
-	damage >>= 1; 	// take half damage in trainer mode
-		
-
-    // Some close combat weapons should not
-    // inflict thrust and push the victim out of reach,
-    // thus kick away unless using the chainsaw.
-    if (inflictor
-	&& !(target->flags & MF_NOCLIP)
-	&& (!source
-	    || !source->player
-	    || source->player->readyweapon != wp_chainsaw))
-    {
-	ang = R_PointToAngle2 ( inflictor->x,
-				inflictor->y,
-				target->x,
-				target->y);
-		
-	thrust = damage*(FRACUNIT>>3)*100/target->info->mass;
-
-	// make fall forwards sometimes
-	if ( damage < 40
-	     && damage > target->health
-	     && target->z - inflictor->z > 64*FRACUNIT
-	     && (P_Random ()&1) )
-	{
-	    ang += ANG180;
-	    thrust *= 4;
-	}
-		
-	ang >>= ANGLETOFINESHIFT;
-	target->momx += FixedMul (thrust, finecosine[ang]);
-	target->momy += FixedMul (thrust, finesine[ang]);
-    }
-    
-    // player specific
-    if (player)
-    {
-	// end of game hell hack
-	if (target->subsector->sector->special == 11
-	    && damage >= target->health)
-	{
-	    damage = target->health - 1;
-	}
-	
-
-	// Below certain threshold,
-	// ignore damage in GOD mode, or with INVUL power.
-	if ( damage < 1000
-	     && ( (player->cheats&CF_GODMODE)
-		  || player->powers[pw_invulnerability] ) )
-	{
-	    return;
-	}
-	
-	if (player->armortype)
-	{
-	    if (player->armortype == 1)
-		saved = damage/3;
-	    else
-		saved = damage/2;
-	    
-	    if (player->armorpoints <= saved)
-	    {
-		// armor is used up
-		saved = player->armorpoints;
-		player->armortype = 0;
-	    }
-	    player->armorpoints -= saved;
-	    damage -= saved;
-	}
-	player->health -= damage; 	// mirror mobj health here for Dave
-	if (player->health < 0)
-	    player->health = 0;
-	
-	player->attacker = source;
-	player->damagecount += damage;	// add damage after armor / invuln
-
-	if (player->damagecount > 100)
-	    player->damagecount = 100;	// teleport stomp does 10k points...
-	
-	temp = damage < 100 ? damage : 100;
-
-	if (player == &players[consoleplayer])
-	    I_Tactile (40,10,40+temp*2);
-    }
-    
-    // do the damage	
-    target->health -= damage;	
-    if (target->health <= 0)
-    {
-	P_KillMobj (source, target);
-	return;
+      target->momx = target->momy = target->momz = 0;
     }
 
-    if ( (P_Random () < target->info->painchance)
-	 && !(target->flags&MF_SKULLFLY) )
-    {
-	target->flags |= MF_JUSTHIT;	// fight back!
-	
-	P_SetMobjState (target, target->info->painstate);
-    }
-			
-    target->reactiontime = 0;		// we're awake now...	
+  player = target->player;
+  if (player && gameskill == sk_baby)
+    damage >>= 1; /* take half damage in trainer mode */
 
-    if ( (!target->threshold || target->type == MT_VILE)
-	 && source && (source != target || gameversion < exe_doom_1_5)
-	 && source->type != MT_VILE)
+  /* Some close combat weapons should not
+   * inflict thrust and push the victim out of reach,
+   * thus kick away unless using the chainsaw.
+   */
+
+  if (inflictor && !(target->flags & MF_NOCLIP) &&
+      (!source || !source->player ||
+       source->player->readyweapon != wp_chainsaw))
     {
-	// if not intent on another player,
-	// chase after this one
-	target->target = source;
-	target->threshold = BASETHRESHOLD;
-	if (target->state == &states[target->info->spawnstate]
-	    && target->info->seestate != S_NULL)
-	    P_SetMobjState (target, target->info->seestate);
+      ang = r_point_to_angle2(inflictor->x, inflictor->y,
+              target->x, target->y);
+
+      thrust = damage * (FRACUNIT >> 3) * 100 / target->info->mass;
+
+      /* make fall forwards sometimes */
+
+      if (damage < 40 && damage > target->health &&
+          target->z - inflictor->z > 64 * FRACUNIT && (p_random() & 1))
+        {
+          ang += ANG180;
+          thrust *= 4;
+        }
+
+      ang >>= ANGLETOFINESHIFT;
+      target->momx += fixed_mul(thrust, finecosine[ang]);
+      target->momy += fixed_mul(thrust, finesine[ang]);
+    }
+
+  /* player specific */
+
+  if (player)
+    {
+      /* end of game hell hack */
+
+      if (target->subsector->sector->special == 11 &&
+          damage >= target->health)
+        {
+          damage = target->health - 1;
+        }
+
+      /* Below certain threshold, ignore damage in GOD mode, or with INVUL
+       * power.
+       */
+
+      if (damage < 1000 && ((player->cheats & CF_GODMODE) ||
+                            player->powers[pw_invulnerability]))
+        {
+          return;
+        }
+
+      if (player->armortype)
+        {
+          if (player->armortype == 1)
+            saved = damage / 3;
+          else
+            saved = damage / 2;
+
+          if (player->armorpoints <= saved)
+            {
+              /* armor is used up */
+
+              saved = player->armorpoints;
+              player->armortype = 0;
+            }
+
+          player->armorpoints -= saved;
+          damage -= saved;
+        }
+
+      player->health -= damage; /* mirror mobj health here for Dave */
+      if (player->health < 0) player->health = 0;
+
+      player->attacker = source;
+      player->damagecount += damage; /* add damage after armor / invuln */
+
+      if (player->damagecount > 100)
+        {
+          player->damagecount = 100; /* teleport stomp does 10k points... */
+        }
+
+      temp = damage < 100 ? damage : 100;
+
+      if (player == &players[consoleplayer])
+        {
+          i_tactile(40, 10, 40 + temp * 2);
+        }
+    }
+
+  /* do the damage */
+
+  target->health -= damage;
+  if (target->health <= 0)
+    {
+      p_kill_mobj(source, target);
+      return;
+    }
+
+  if ((p_random() < target->info->painchance) &&
+      !(target->flags & MF_SKULLFLY))
+    {
+      target->flags |= MF_JUSTHIT; /* fight back! */
+
+      p_set_mobj_state(target, target->info->painstate);
+    }
+
+  target->reactiontime = 0; /* we're awake now... */
+
+  if ((!target->threshold || target->type == MT_VILE) && source &&
+      (source != target || gameversion < exe_doom_1_5) &&
+      source->type != MT_VILE)
+    {
+      /* if not intent on another player, chase after this one */
+
+      target->target = source;
+      target->threshold = BASETHRESHOLD;
+      if (target->state == &states[target->info->spawnstate] &&
+          target->info->seestate != S_NULL)
+        p_set_mobj_state(target, target->info->seestate);
     }
-			
 }
-
diff --git a/games/NXDoom/src/doom/p_inter.h b/games/NXDoom/src/doom/p_inter.h
index 5764d5dab..450349e9c 100644
--- a/games/NXDoom/src/doom/p_inter.h
+++ b/games/NXDoom/src/doom/p_inter.h
@@ -1,30 +1,30 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_inter.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef __P_INTER__
 #define __P_INTER__
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+boolean p_give_power(player_t *, int);
 
-
-boolean	P_GivePower(player_t*, int);
-
-
-
-#endif
+#endif /* __P_INTER__ */
diff --git a/games/NXDoom/src/doom/p_lights.c b/games/NXDoom/src/doom/p_lights.c
index 863338dcf..019e1c941 100644
--- a/games/NXDoom/src/doom/p_lights.c
+++ b/games/NXDoom/src/doom/p_lights.c
@@ -1,350 +1,314 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Handle Sector base lighting effects.
-//	Muzzle flash?
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_lights.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Handle Sector base lighting effects.
+ *  Muzzle flash?
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-#include "z_zone.h"
 #include "m_random.h"
+#include "z_zone.h"
 
 #include "doomdef.h"
 #include "p_local.h"
 
+/* State. */
 
-// State.
 #include "r_state.h"
 
-//
-// FIRELIGHT FLICKER
-//
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-//
-// T_FireFlicker
-//
-void T_FireFlicker (fireflicker_t* flick)
+/* FIRELIGHT FLICKER */
+
+/* t_fire_flicker */
+
+static void t_fire_flicker(fireflicker_t *flick)
 {
-    int	amount;
-	
-    if (--flick->count)
-	return;
-	
-    amount = (P_Random()&3)*16;
-    
-    if (flick->sector->lightlevel - amount < flick->minlight)
-	flick->sector->lightlevel = flick->minlight;
-    else
-	flick->sector->lightlevel = flick->maxlight - amount;
+  int amount;
 
-    flick->count = 4;
+  if (--flick->count) return;
+
+  amount = (p_random() & 3) * 16;
+
+  if (flick->sector->lightlevel - amount < flick->minlight)
+    flick->sector->lightlevel = flick->minlight;
+  else
+    flick->sector->lightlevel = flick->maxlight - amount;
+
+  flick->count = 4;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-
-//
-// P_SpawnFireFlicker
-//
-void P_SpawnFireFlicker (sector_t*	sector)
+void p_spawn_fire_flicker(sector_t *sector)
 {
-    fireflicker_t*	flick;
-	
-    // Note that we are resetting sector attributes.
-    // Nothing special about it during gameplay.
-    sector->special = 0; 
-	
-    flick = Z_Malloc ( sizeof(*flick), PU_LEVSPEC, 0);
+  fireflicker_t *flick;
 
-    P_AddThinker (&flick->thinker);
+  /* Note that we are resetting sector attributes. Nothing special about it
+   * during gameplay.
+   */
 
-    flick->thinker.function.acp1 = (actionf_p1) T_FireFlicker;
-    flick->sector = sector;
-    flick->maxlight = sector->lightlevel;
-    flick->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel)+16;
-    flick->count = 4;
+  sector->special = 0;
+
+  flick = z_malloc(sizeof(*flick), PU_LEVSPEC, 0);
+
+  p_add_thinker(&flick->thinker);
+
+  flick->thinker.function.acp1 = (actionf_p1)t_fire_flicker;
+  flick->sector = sector;
+  flick->maxlight = sector->lightlevel;
+  flick->minlight = p_find_min_surrounding(sector, sector->lightlevel) + 16;
+  flick->count = 4;
 }
 
+/* BROKEN LIGHT FLASHING */
 
+/* t_light_flash
+ * Do flashing lights.
+ */
 
-//
-// BROKEN LIGHT FLASHING
-//
-
-
-//
-// T_LightFlash
-// Do flashing lights.
-//
-void T_LightFlash (lightflash_t* flash)
+void t_light_flash(lightflash_t *flash)
 {
-    if (--flash->count)
-	return;
-	
-    if (flash->sector->lightlevel == flash->maxlight)
+  if (--flash->count) return;
+
+  if (flash->sector->lightlevel == flash->maxlight)
     {
-	flash-> sector->lightlevel = flash->minlight;
-	flash->count = (P_Random()&flash->mintime)+1;
+      flash->sector->lightlevel = flash->minlight;
+      flash->count = (p_random() & flash->mintime) + 1;
     }
-    else
+  else
     {
-	flash-> sector->lightlevel = flash->maxlight;
-	flash->count = (P_Random()&flash->maxtime)+1;
-    }
-
-}
-
-
-
-
-//
-// P_SpawnLightFlash
-// After the map has been loaded, scan each sector
-// for specials that spawn thinkers
-//
-void P_SpawnLightFlash (sector_t*	sector)
-{
-    lightflash_t*	flash;
-
-    // nothing special about it during gameplay
-    sector->special = 0;	
-	
-    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
-
-    P_AddThinker (&flash->thinker);
-
-    flash->thinker.function.acp1 = (actionf_p1) T_LightFlash;
-    flash->sector = sector;
-    flash->maxlight = sector->lightlevel;
-
-    flash->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
-    flash->maxtime = 64;
-    flash->mintime = 7;
-    flash->count = (P_Random()&flash->maxtime)+1;
-}
-
-
-
-//
-// STROBE LIGHT FLASHING
-//
-
-
-//
-// T_StrobeFlash
-//
-void T_StrobeFlash (strobe_t*		flash)
-{
-    if (--flash->count)
-	return;
-	
-    if (flash->sector->lightlevel == flash->minlight)
-    {
-	flash-> sector->lightlevel = flash->maxlight;
-	flash->count = flash->brighttime;
-    }
-    else
-    {
-	flash-> sector->lightlevel = flash->minlight;
-	flash->count =flash->darktime;
-    }
-
-}
-
-
-
-//
-// P_SpawnStrobeFlash
-// After the map has been loaded, scan each sector
-// for specials that spawn thinkers
-//
-void
-P_SpawnStrobeFlash
-( sector_t*	sector,
-  int		fastOrSlow,
-  int		inSync )
-{
-    strobe_t*	flash;
-	
-    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
-
-    P_AddThinker (&flash->thinker);
-
-    flash->sector = sector;
-    flash->darktime = fastOrSlow;
-    flash->brighttime = STROBEBRIGHT;
-    flash->thinker.function.acp1 = (actionf_p1) T_StrobeFlash;
-    flash->maxlight = sector->lightlevel;
-    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
-		
-    if (flash->minlight == flash->maxlight)
-	flash->minlight = 0;
-
-    // nothing special about it during gameplay
-    sector->special = 0;	
-
-    if (!inSync)
-	flash->count = (P_Random()&7)+1;
-    else
-	flash->count = 1;
-}
-
-
-//
-// Start strobing lights (usually from a trigger)
-//
-void EV_StartLightStrobing(line_t*	line)
-{
-    int		secnum;
-    sector_t*	sec;
-	
-    secnum = -1;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-	sec = &sectors[secnum];
-	if (sec->specialdata)
-	    continue;
-	
-	P_SpawnStrobeFlash (sec,SLOWDARK, 0);
+      flash->sector->lightlevel = flash->maxlight;
+      flash->count = (p_random() & flash->maxtime) + 1;
     }
 }
 
+/* p_spawn_light_flash
+ * After the map has been loaded, scan each sector for specials that spawn
+ * thinkers
+ */
 
-
-//
-// TURN LINE'S TAG LIGHTS OFF
-//
-void EV_TurnTagLightsOff(line_t* line)
+void p_spawn_light_flash(sector_t *sector)
 {
-    int			i;
-    int			j;
-    int			min;
-    sector_t*		sector;
-    sector_t*		tsec;
-    line_t*		templine;
-	
-    sector = sectors;
-    
-    for (j = 0;j < numsectors; j++, sector++)
+  lightflash_t *flash;
+
+  /* nothing special about it during gameplay */
+
+  sector->special = 0;
+
+  flash = z_malloc(sizeof(*flash), PU_LEVSPEC, 0);
+
+  p_add_thinker(&flash->thinker);
+
+  flash->thinker.function.acp1 = (actionf_p1)t_light_flash;
+  flash->sector = sector;
+  flash->maxlight = sector->lightlevel;
+
+  flash->minlight = p_find_min_surrounding(sector, sector->lightlevel);
+  flash->maxtime = 64;
+  flash->mintime = 7;
+  flash->count = (p_random() & flash->maxtime) + 1;
+}
+
+/* STROBE LIGHT FLASHING */
+
+void t_strobe_flash(strobe_t *flash)
+{
+  if (--flash->count) return;
+
+  if (flash->sector->lightlevel == flash->minlight)
     {
-	if (sector->tag == line->tag)
-	{
-	    min = sector->lightlevel;
-	    for (i = 0;i < sector->linecount; i++)
-	    {
-		templine = sector->lines[i];
-		tsec = getNextSector(templine,sector);
-		if (!tsec)
-		    continue;
-		if (tsec->lightlevel < min)
-		    min = tsec->lightlevel;
-	    }
-	    sector->lightlevel = min;
-	}
+      flash->sector->lightlevel = flash->maxlight;
+      flash->count = flash->brighttime;
+    }
+  else
+    {
+      flash->sector->lightlevel = flash->minlight;
+      flash->count = flash->darktime;
     }
 }
 
+/* p_spawn_strobe_flash
+ * After the map has been loaded, scan each sector for specials that spawn
+ * thinkers
+ */
 
-//
-// TURN LINE'S TAG LIGHTS ON
-//
-void
-EV_LightTurnOn
-( line_t*	line,
-  int		bright )
+void p_spawn_strobe_flash(sector_t *sector, int fast_or_slow, int in_sync)
 {
-    int		i;
-    int		j;
-    sector_t*	sector;
-    sector_t*	temp;
-    line_t*	templine;
-	
-    sector = sectors;
-	
-    for (i=0;i<numsectors;i++, sector++)
+  strobe_t *flash;
+
+  flash = z_malloc(sizeof(*flash), PU_LEVSPEC, 0);
+
+  p_add_thinker(&flash->thinker);
+
+  flash->sector = sector;
+  flash->darktime = fast_or_slow;
+  flash->brighttime = STROBEBRIGHT;
+  flash->thinker.function.acp1 = (actionf_p1)t_strobe_flash;
+  flash->maxlight = sector->lightlevel;
+  flash->minlight = p_find_min_surrounding(sector, sector->lightlevel);
+
+  if (flash->minlight == flash->maxlight) flash->minlight = 0;
+
+  /* nothing special about it during gameplay */
+
+  sector->special = 0;
+
+  if (!in_sync)
+    flash->count = (p_random() & 7) + 1;
+  else
+    flash->count = 1;
+}
+
+/* Start strobing lights (usually from a trigger) */
+
+void ev_start_light_strobing(line_t *line)
+{
+  int secnum;
+  sector_t *sec;
+
+  secnum = -1;
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
     {
-	if (sector->tag == line->tag)
-	{
-	    // bright = 0 means to search
-	    // for highest light level
-	    // surrounding sector
-	    if (!bright)
-	    {
-		for (j = 0;j < sector->linecount; j++)
-		{
-		    templine = sector->lines[j];
-		    temp = getNextSector(templine,sector);
+      sec = &sectors[secnum];
+      if (sec->specialdata) continue;
 
-		    if (!temp)
-			continue;
-
-		    if (temp->lightlevel > bright)
-			bright = temp->lightlevel;
-		}
-	    }
-	    sector-> lightlevel = bright;
-	}
+      p_spawn_strobe_flash(sec, SLOWDARK, 0);
     }
 }
 
-    
-//
-// Spawn glowing light
-//
+/* TURN LINE'S TAG LIGHTS OFF */
 
-void T_Glow(glow_t*	g)
+void ev_turn_tag_lights_off(line_t *line)
 {
-    switch(g->direction)
+  int i;
+  int j;
+  int min;
+  sector_t *sector;
+  sector_t *tsec;
+  line_t *templine;
+
+  sector = sectors;
+
+  for (j = 0; j < numsectors; j++, sector++)
     {
-      case -1:
-	// DOWN
-	g->sector->lightlevel -= GLOWSPEED;
-	if (g->sector->lightlevel <= g->minlight)
-	{
-	    g->sector->lightlevel += GLOWSPEED;
-	    g->direction = 1;
-	}
-	break;
-	
-      case 1:
-	// UP
-	g->sector->lightlevel += GLOWSPEED;
-	if (g->sector->lightlevel >= g->maxlight)
-	{
-	    g->sector->lightlevel -= GLOWSPEED;
-	    g->direction = -1;
-	}
-	break;
+      if (sector->tag == line->tag)
+        {
+          min = sector->lightlevel;
+          for (i = 0; i < sector->linecount; i++)
+            {
+              templine = sector->lines[i];
+              tsec = get_next_sector(templine, sector);
+              if (!tsec) continue;
+              if (tsec->lightlevel < min) min = tsec->lightlevel;
+            }
+
+          sector->lightlevel = min;
+        }
     }
 }
 
+/* TURN LINE'S TAG LIGHTS ON */
 
-void P_SpawnGlowingLight(sector_t*	sector)
+void ev_light_turn_on(line_t *line, int bright)
 {
-    glow_t*	g;
-	
-    g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
+  int i;
+  int j;
+  sector_t *sector;
+  sector_t *temp;
+  line_t *templine;
 
-    P_AddThinker(&g->thinker);
+  sector = sectors;
 
-    g->sector = sector;
-    g->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
-    g->maxlight = sector->lightlevel;
-    g->thinker.function.acp1 = (actionf_p1) T_Glow;
-    g->direction = -1;
+  for (i = 0; i < numsectors; i++, sector++)
+    {
+      if (sector->tag == line->tag)
+        {
+          /* bright = 0 means to search for highest light level surrounding
+           * sector
+           */
 
-    sector->special = 0;
+          if (!bright)
+            {
+              for (j = 0; j < sector->linecount; j++)
+                {
+                  templine = sector->lines[j];
+                  temp = get_next_sector(templine, sector);
+
+                  if (!temp) continue;
+
+                  if (temp->lightlevel > bright) bright = temp->lightlevel;
+                }
+            }
+
+          sector->lightlevel = bright;
+        }
+    }
 }
 
+/* Spawn glowing light */
+
+void t_glow(glow_t *g)
+{
+  switch (g->direction)
+    {
+    case -1: /* DOWN */
+      g->sector->lightlevel -= GLOWSPEED;
+      if (g->sector->lightlevel <= g->minlight)
+        {
+          g->sector->lightlevel += GLOWSPEED;
+          g->direction = 1;
+        }
+      break;
+
+    case 1: /* UP */
+      g->sector->lightlevel += GLOWSPEED;
+      if (g->sector->lightlevel >= g->maxlight)
+        {
+          g->sector->lightlevel -= GLOWSPEED;
+          g->direction = -1;
+        }
+      break;
+    }
+}
+
+void p_spawn_glowing_light(sector_t *sector)
+{
+  glow_t *g;
+
+  g = z_malloc(sizeof(*g), PU_LEVSPEC, 0);
+
+  p_add_thinker(&g->thinker);
+
+  g->sector = sector;
+  g->minlight = p_find_min_surrounding(sector, sector->lightlevel);
+  g->maxlight = sector->lightlevel;
+  g->thinker.function.acp1 = (actionf_p1)t_glow;
+  g->direction = -1;
+
+  sector->special = 0;
+}
diff --git a/games/NXDoom/src/doom/p_local.h b/games/NXDoom/src/doom/p_local.h
index 411596762..30bd51d63 100644
--- a/games/NXDoom/src/doom/p_local.h
+++ b/games/NXDoom/src/doom/p_local.h
@@ -1,305 +1,268 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Play functions, animation, global header.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_local.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Play functions, animation, global header.
+ *
+ ****************************************************************************/
 
 #ifndef __P_LOCAL__
 #define __P_LOCAL__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #ifndef __R_LOCAL__
 #include "r_local.h"
 #endif
 
-#define FLOATSPEED		(FRACUNIT*4)
+/* P_SPEC */
 
+#include "p_spec.h"
 
-#define MAXHEALTH		100
-#define VIEWHEIGHT		(41*FRACUNIT)
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// mapblocks are used to check movement
-// against lines and things
-#define MAPBLOCKUNITS	128
-#define MAPBLOCKSIZE	(MAPBLOCKUNITS*FRACUNIT)
-#define MAPBLOCKSHIFT	(FRACBITS+7)
-#define MAPBMASK		(MAPBLOCKSIZE-1)
-#define MAPBTOFRAC		(MAPBLOCKSHIFT-FRACBITS)
+#define FLOATSPEED (FRACUNIT * 4)
 
+#define MAXHEALTH 100
+#define VIEWHEIGHT (41 * FRACUNIT)
 
-// player radius for movement checking
-#define PLAYERRADIUS	16*FRACUNIT
+/* mapblocks are used to check movement against lines and things */
 
-// MAXRADIUS is for precalculated sector block boxes
-// the spider demon is larger,
-// but we do not have any moving sectors nearby
-#define MAXRADIUS		32*FRACUNIT
+#define MAPBLOCKUNITS 128
+#define MAPBLOCKSIZE (MAPBLOCKUNITS * FRACUNIT)
+#define MAPBLOCKSHIFT (FRACBITS + 7)
+#define MAPBMASK (MAPBLOCKSIZE - 1)
+#define MAPBTOFRAC (MAPBLOCKSHIFT - FRACBITS)
 
-#define GRAVITY		FRACUNIT
-#define MAXMOVE		(30*FRACUNIT)
+/* player radius for movement checking */
 
-#define USERANGE		(64*FRACUNIT)
-#define MELEERANGE		(64*FRACUNIT)
-#define MISSILERANGE	(32*64*FRACUNIT)
+#define PLAYERRADIUS 16 * FRACUNIT
 
-// follow a player exlusively for 3 seconds
-#define	BASETHRESHOLD	 	100
+/* MAXRADIUS is for precalculated sector block boxes the spider demon is
+ * larger, but we do not have any moving sectors nearby
+ */
 
+#define MAXRADIUS 32 * FRACUNIT
 
+#define GRAVITY FRACUNIT
+#define MAXMOVE (30 * FRACUNIT)
 
-//
-// P_TICK
-//
+#define USERANGE (64 * FRACUNIT)
+#define MELEERANGE (64 * FRACUNIT)
+#define MISSILERANGE (32 * 64 * FRACUNIT)
 
-// both the head and tail of the thinker list
-extern	thinker_t	thinkercap;	
+/* follow a player exclusively for 3 seconds */
 
+#define BASETHRESHOLD 100
 
-void P_InitThinkers (void);
-void P_AddThinker (thinker_t* thinker);
-void P_RemoveThinker (thinker_t* thinker);
+#define ONFLOORZ INT_MIN
+#define ONCEILINGZ INT_MAX
 
+/* Time interval for item respawning. */
 
-//
-// P_PSPR
-//
-void P_SetupPsprites (player_t* curplayer);
-void P_MovePsprites (player_t* curplayer);
-void P_DropWeapon (player_t* player);
+#define ITEMQUESIZE 128
 
+/* Extended MAXINTERCEPTS, to allow for intercepts overrun emulation. */
 
-//
-// P_USER
-//
-void	P_PlayerThink (player_t* player);
+#define MAXINTERCEPTS_ORIGINAL 128
+#define MAXINTERCEPTS (MAXINTERCEPTS_ORIGINAL + 61)
 
+#define PT_ADDLINES 1
+#define PT_ADDTHINGS 2
+#define PT_EARLYOUT 4
 
-//
-// P_MOBJ
-//
-#define ONFLOORZ		INT_MIN
-#define ONCEILINGZ		INT_MAX
+/* fraggle: I have increased the size of this buffer.  In the original Doom,
+ * overrunning past this limit caused other bits of memory to be overwritten,
+ * affecting demo playback.  However, in doing so, the limit was still
+ * exceeded.  So we have to support more than 8 specials.
+ *
+ * We keep the original limit, to detect what variables in memory were
+ * overwritten (see SpechitOverrun())
+ */
 
-// Time interval for item respawning.
-#define ITEMQUESIZE		128
+#define MAXSPECIALCROSS 20
+#define MAXSPECIALCROSS_ORIGINAL 8
 
-extern mapthing_t	itemrespawnque[ITEMQUESIZE];
-extern int		itemrespawntime[ITEMQUESIZE];
-extern int		iquehead;
-extern int		iquetail;
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* P_MAPUTL */
 
-void P_RespawnSpecials (void);
-
-mobj_t*
-P_SpawnMobj
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z,
-  mobjtype_t	type );
-
-void 	P_RemoveMobj (mobj_t* th);
-mobj_t* P_SubstNullMobj (mobj_t* th);
-boolean	P_SetMobjState (mobj_t* mobj, statenum_t state);
-void 	P_MobjThinker (mobj_t* mobj);
-
-void	P_SpawnPuff (fixed_t x, fixed_t y, fixed_t z);
-void 	P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage);
-mobj_t* P_SpawnMissile (mobj_t* source, mobj_t* dest, mobjtype_t type);
-void	P_SpawnPlayerMissile (mobj_t* source, mobjtype_t type);
-
-
-//
-// P_ENEMY
-//
-void P_NoiseAlert (mobj_t* target, mobj_t* emmiter);
-
-
-//
-// P_MAPUTL
-//
 typedef struct
 {
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	dx;
-    fixed_t	dy;
-    
+  fixed_t x;
+  fixed_t y;
+  fixed_t dx;
+  fixed_t dy;
 } divline_t;
 
 typedef struct
 {
-    fixed_t	frac;		// along trace line
-    boolean	isaline;
-    union {
-	mobj_t*	thing;
-	line_t*	line;
-    }			d;
+  fixed_t frac; /* along trace line */
+  boolean isaline;
+  union
+  {
+    mobj_t *thing;
+    line_t *line;
+  } d;
 } intercept_t;
 
-// Extended MAXINTERCEPTS, to allow for intercepts overrun emulation.
+typedef boolean (*traverser_t)(intercept_t *in);
 
-#define MAXINTERCEPTS_ORIGINAL 128
-#define MAXINTERCEPTS          (MAXINTERCEPTS_ORIGINAL + 61)
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-extern intercept_t	intercepts[MAXINTERCEPTS];
-extern intercept_t*	intercept_p;
+/* P_TICK */
 
-typedef boolean (*traverser_t) (intercept_t *in);
+/* both the head and tail of the thinker list */
 
-fixed_t P_AproxDistance (fixed_t dx, fixed_t dy);
-int 	P_PointOnLineSide (fixed_t x, fixed_t y, line_t* line);
-int 	P_PointOnDivlineSide (fixed_t x, fixed_t y, divline_t* line);
-void 	P_MakeDivline (line_t* li, divline_t* dl);
-fixed_t P_InterceptVector (divline_t* v2, divline_t* v1);
-int 	P_BoxOnLineSide (fixed_t* tmbox, line_t* ld);
+extern thinker_t thinkercap;
 
-extern fixed_t		opentop;
-extern fixed_t 		openbottom;
-extern fixed_t		openrange;
-extern fixed_t		lowfloor;
+extern mapthing_t itemrespawnque[ITEMQUESIZE];
+extern int itemrespawntime[ITEMQUESIZE];
+extern int iquehead;
+extern int iquetail;
 
-void 	P_LineOpening (line_t* linedef);
+extern intercept_t intercepts[MAXINTERCEPTS];
+extern intercept_t *intercept_p;
 
-boolean P_BlockLinesIterator (int x, int y, boolean(*func)(line_t*) );
-boolean P_BlockThingsIterator (int x, int y, boolean(*func)(mobj_t*) );
+extern fixed_t opentop;
+extern fixed_t openbottom;
+extern fixed_t openrange;
+extern fixed_t lowfloor;
 
-#define PT_ADDLINES		1
-#define PT_ADDTHINGS	2
-#define PT_EARLYOUT		4
+extern divline_t trace;
 
-extern divline_t	trace;
+/* If "floatok" true, move would be ok if within "tmfloorz - tmceilingz". */
 
-boolean
-P_PathTraverse
-( fixed_t	x1,
-  fixed_t	y1,
-  fixed_t	x2,
-  fixed_t	y2,
-  int		flags,
-  boolean	(*trav) (intercept_t *));
+extern boolean floatok;
+extern fixed_t tmfloorz;
+extern fixed_t tmceilingz;
 
-void P_UnsetThingPosition (mobj_t* thing);
-void P_SetThingPosition (mobj_t* thing);
+extern line_t *ceilingline;
 
+extern line_t *spechit[MAXSPECIALCROSS];
+extern int numspechit;
 
-//
-// P_MAP
-//
-
-// If "floatok" true, move would be ok
-// if within "tmfloorz - tmceilingz".
-extern boolean		floatok;
-extern fixed_t		tmfloorz;
-extern fixed_t		tmceilingz;
-
-
-extern	line_t*		ceilingline;
-
-// fraggle: I have increased the size of this buffer.  In the original Doom,
-// overrunning past this limit caused other bits of memory to be overwritten,
-// affecting demo playback.  However, in doing so, the limit was still
-// exceeded.  So we have to support more than 8 specials.
-//
-// We keep the original limit, to detect what variables in memory were
-// overwritten (see SpechitOverrun())
-
-#define MAXSPECIALCROSS 		20
-#define MAXSPECIALCROSS_ORIGINAL	8
-
-extern	line_t*	spechit[MAXSPECIALCROSS];
-extern	int	numspechit;
-
-boolean P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y);
-boolean P_TryMove (mobj_t* thing, fixed_t x, fixed_t y);
-boolean P_TeleportMove (mobj_t* thing, fixed_t x, fixed_t y);
-void	P_SlideMove (mobj_t* mo);
-boolean P_CheckSight (mobj_t* t1, mobj_t* t2);
-void 	P_UseLines (player_t* player);
-
-boolean P_ChangeSector (sector_t* sector, boolean crunch);
-
-extern mobj_t*	linetarget;	// who got hit (or NULL)
-
+extern mobj_t *linetarget; /* who got hit (or NULL) */
 
 extern fixed_t attackrange;
 
-// slopes to top and bottom of target
-extern fixed_t	topslope;
-extern fixed_t	bottomslope;
+/* slopes to top and bottom of target */
 
+extern fixed_t topslope;
+extern fixed_t bottomslope;
 
-fixed_t
-P_AimLineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance );
+extern byte *rejectmatrix;  /* for fast sight rejection */
+extern short *blockmaplump; /* offsets in blockmap are from here */
+extern short *blockmap;
+extern int bmapwidth;
+extern int bmapheight; /* in mapblocks */
+extern fixed_t bmaporgx;
+extern fixed_t bmaporgy;    /* origin of block map */
+extern mobj_t **blocklinks; /* for thing chains */
 
-void
-P_LineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance,
-  fixed_t	slope,
-  int		damage );
+extern int maxammo[NUMAMMO];
+extern int clipammo[NUMAMMO];
 
-void
-P_RadiusAttack
-( mobj_t*	spot,
-  mobj_t*	source,
-  int		damage );
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+void p_init_thinkers(void);
+void p_add_thinker(thinker_t *thinker);
+void p_remove_thinker(thinker_t *thinker);
 
+/* P_PSPR */
 
-//
-// P_SETUP
-//
-extern byte*		rejectmatrix;	// for fast sight rejection
-extern short*		blockmaplump;	// offsets in blockmap are from here
-extern short*		blockmap;
-extern int		bmapwidth;
-extern int		bmapheight;	// in mapblocks
-extern fixed_t		bmaporgx;
-extern fixed_t		bmaporgy;	// origin of block map
-extern mobj_t**		blocklinks;	// for thing chains
+void p_setup_psprites(player_t *curplayer);
+void p_move_psprites(player_t *curplayer);
+void p_drop_weapon(player_t *player);
 
+/* P_USER */
 
+void p_player_think(player_t *player);
 
-//
-// P_INTER
-//
-extern int		maxammo[NUMAMMO];
-extern int		clipammo[NUMAMMO];
+/* P_MOBJ */
 
-void
-P_TouchSpecialThing
-( mobj_t*	special,
-  mobj_t*	toucher );
+void p_respawn_specials(void);
 
-void
-P_DamageMobj
-( mobj_t*	target,
-  mobj_t*	inflictor,
-  mobj_t*	source,
-  int		damage );
+mobj_t *p_spawn_mobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
 
+void p_remove_mobj(mobj_t *th);
+mobj_t *p_subst_null_mobj(mobj_t *th);
+boolean p_set_mobj_state(mobj_t *mobj, statenum_t state);
+void p_mobj_thinker(mobj_t *mobj);
 
-//
-// P_SPEC
-//
-#include "p_spec.h"
+void p_spawn_puff(fixed_t x, fixed_t y, fixed_t z);
+void p_spawn_blood(fixed_t x, fixed_t y, fixed_t z, int damage);
+mobj_t *p_spawn_missile(mobj_t *source, mobj_t *dest, mobjtype_t type);
+void p_spawn_player_missile(mobj_t *source, mobjtype_t type);
 
+/* P_ENEMY */
 
-#endif	// __P_LOCAL__
+void p_noise_alert(mobj_t *target, mobj_t *emmiter);
+
+fixed_t p_approx_distance(fixed_t dx, fixed_t dy);
+int p_point_on_line_side(fixed_t x, fixed_t y, line_t *line);
+int p_point_on_divline_side(fixed_t x, fixed_t y, divline_t *line);
+int p_box_on_line_side(fixed_t *tmbox, line_t *ld);
+
+void p_line_opening(line_t *linedef);
+
+boolean p_block_lines_iterator(int x, int y, boolean (*func)(line_t *));
+boolean p_block_things_iterator(int x, int y, boolean (*func)(mobj_t *));
+
+boolean p_path_traverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                        int flags, boolean (*trav)(intercept_t *));
+
+void p_unset_thing_position(mobj_t *thing);
+void p_set_thing_position(mobj_t *thing);
+
+/* P_MAP */
+
+boolean p_check_position(mobj_t *thing, fixed_t x, fixed_t y);
+boolean p_try_move(mobj_t *thing, fixed_t x, fixed_t y);
+boolean p_teleport_move(mobj_t *thing, fixed_t x, fixed_t y);
+void p_slide_move(mobj_t *mo);
+boolean p_check_sight(mobj_t *t1, mobj_t *t2);
+void p_use_lines(player_t *player);
+
+boolean p_change_sector(sector_t *sector, boolean crunch);
+
+fixed_t p_aim_line_attack(mobj_t *t1, angle_t angle, fixed_t distance);
+
+void p_line_attack(mobj_t *t1, angle_t angle, fixed_t distance,
+        fixed_t slope, int damage);
+
+void p_radius_attack(mobj_t *spot, mobj_t *source, int damage);
+
+/* P_INTER */
+
+void p_touch_special_thing(mobj_t *special, mobj_t *toucher);
+
+void p_damage_mobj(mobj_t *target, mobj_t *inflictor, mobj_t *source,
+                   int damage);
+
+#endif /* __P_LOCAL__ */
diff --git a/games/NXDoom/src/doom/p_map.c b/games/NXDoom/src/doom/p_map.c
index 425416ce7..2b4aa4386 100644
--- a/games/NXDoom/src/doom/p_map.c
+++ b/games/NXDoom/src/doom/p_map.c
@@ -1,1445 +1,1470 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard, Andrey Budko
-//
-// 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.
-//
-// DESCRIPTION:
-//	Movement, collision handling.
-//	Shooting and aiming.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_map.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard, Andrey Budko
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Movement, collision handling.
+ *  Shooting and aiming.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "deh_misc.h"
 
+#include "i_system.h"
 #include "m_bbox.h"
 #include "m_random.h"
-#include "i_system.h"
 
 #include "doomdef.h"
 #include "m_argv.h"
 #include "m_misc.h"
 #include "p_local.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
-// Data.
-#include "sounds.h"
 
-// Spechit overrun magic value.
-//
-// This is the value used by PrBoom-plus.  I think the value below is 
-// actually better and works with more demos.  However, I think
-// it's better for the spechits emulation to be compatible with
-// PrBoom-plus, at least so that the big spechits emulation list
-// on Doomworld can also be used with Chocolate Doom.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Spechit overrun magic value.
+ *
+ * This is the value used by PrBoom-plus.  I think the value below is
+ * actually better and works with more demos.  However, I think
+ * it's better for the spechits emulation to be compatible with
+ * PrBoom-plus, at least so that the big spechits emulation list
+ * on Doomworld can also be used with Chocolate Doom.
+ */
 
 #define DEFAULT_SPECHIT_MAGIC 0x01C09C98
 
-// This is from a post by myk on the Doomworld forums, 
-// outputted from entryway's spechit_magic generator for
-// s205n546.lmp.  The _exact_ value of this isn't too
-// important; as long as it is in the right general
-// range, it will usually work.  Otherwise, we can use
-// the generator (hacked doom2.exe) and provide it 
-// with -spechit.
+/* This is from a post by myk on the Doomworld forums,
+ * outputted from entryway's spechit_magic generator for
+ * s205n546.lmp.  The _exact_ value of this isn't too
+ * important; as long as it is in the right general
+ * range, it will usually work.  Otherwise, we can use
+ * the generator (hacked doom2.exe) and provide it
+ * with -spechit.
+ */
 
-//#define DEFAULT_SPECHIT_MAGIC 0x84f968e8
+/* #define DEFAULT_SPECHIT_MAGIC 0x84f968e8 */
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-fixed_t		tmbbox[4];
-mobj_t*		tmthing;
-int		tmflags;
-fixed_t		tmx;
-fixed_t		tmy;
+fixed_t tmbbox[4];
+mobj_t *tmthing;
+int tmflags;
+fixed_t tmx;
+fixed_t tmy;
 
+/* If "floatok" true, move would be ok
+ * if within "tmfloorz - tmceilingz".
+ */
 
-// If "floatok" true, move would be ok
-// if within "tmfloorz - tmceilingz".
-boolean		floatok;
+boolean floatok;
 
-fixed_t		tmfloorz;
-fixed_t		tmceilingz;
-fixed_t		tmdropoffz;
+fixed_t tmfloorz;
+fixed_t tmceilingz;
+fixed_t tmdropoffz;
 
-// keep track of the line that lowers the ceiling,
-// so missiles don't explode against sky hack walls
-line_t*		ceilingline;
+/* keep track of the line that lowers the ceiling,
+ * so missiles don't explode against sky hack walls
+ */
 
-// keep track of special lines as they are hit,
-// but don't process them until the move is proven valid
+line_t *ceilingline;
 
-line_t*		spechit[MAXSPECIALCROSS];
-int		numspechit;
+/* keep track of special lines as they are hit,
+ * but don't process them until the move is proven valid
+ */
 
+line_t *spechit[MAXSPECIALCROSS];
+int numspechit;
 
+/* SLIDE MOVE
+ * Allows the player to slide along any angled walls.
+ */
 
-//
-// TELEPORT MOVE
-// 
+fixed_t bestslidefrac;
+fixed_t secondslidefrac;
 
-//
-// PIT_StompThing
-//
-boolean PIT_StompThing (mobj_t* thing)
+line_t *bestslideline;
+line_t *secondslideline;
+
+mobj_t *slidemo;
+
+fixed_t tmxmove;
+fixed_t tmymove;
+
+/* p_line_attack */
+
+mobj_t *linetarget; /* who got hit (or NULL) */
+mobj_t *shootthing;
+
+/* Height if not aiming up or down
+ * ???: use slope for monsters?
+ */
+
+fixed_t shootz;
+
+int la_damage;
+fixed_t attackrange;
+
+fixed_t aimslope;
+
+/* USE LINES */
+
+mobj_t *usething;
+
+/* RADIUS ATTACK */
+
+mobj_t *bombsource;
+mobj_t *bombspot;
+int bombdamage;
+
+/* SECTOR HEIGHT CHANGING
+ * After modifying a sectors floor or ceiling height,
+ * call this routine to adjust the positions
+ * of all things that touch the sector.
+ *
+ * If anything doesn't fit anymore, true will be returned.
+ *
+ * If crunch is true, they will take damage as they are being crushed.
+ *
+ * If Crunch is false, you should set the sector height back the way it was
+ * and call p_change_sector again to undo the changes.
+ */
+
+boolean crushchange;
+boolean nofit;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* TELEPORT MOVE */
+
+static boolean pit_stomp_thing(mobj_t *thing)
 {
-    fixed_t	blockdist;
-		
-    if (!(thing->flags & MF_SHOOTABLE) )
-	return true;
-		
-    blockdist = thing->radius + tmthing->radius;
-    
-    if ( abs(thing->x - tmx) >= blockdist
-	 || abs(thing->y - tmy) >= blockdist )
+  fixed_t blockdist;
+
+  if (!(thing->flags & MF_SHOOTABLE)) return true;
+
+  blockdist = thing->radius + tmthing->radius;
+
+  if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
     {
-	// didn't hit it
-	return true;
+      return true; /* didn't hit it */
     }
-    
-    // don't clip against self
-    if (thing == tmthing)
-	return true;
-    
-    // monsters don't stomp things except on boss level
-    if ( !tmthing->player && gamemap != 30)
-	return false;	
-		
-    P_DamageMobj (thing, tmthing, tmthing, 10000);
-	
-    return true;
+
+  /* don't clip against self */
+
+  if (thing == tmthing) return true;
+
+  /* monsters don't stomp things except on boss level */
+
+  if (!tmthing->player && gamemap != 30) return false;
+
+  p_damage_mobj(thing, tmthing, tmthing, 10000);
+
+  return true;
 }
 
+/* Code to emulate the behavior of Vanilla Doom when encountering an overrun
+ * of the spechit array.  This is by Andrey Budko (e6y) and comes from his
+ * PrBoom plus port.  A big thanks to Andrey for this.
+ */
 
-//
-// P_TeleportMove
-//
-boolean
-P_TeleportMove
-( mobj_t*	thing,
-  fixed_t	x,
-  fixed_t	y )
+static void spechit_overrun(line_t *ld)
 {
-    int			xl;
-    int			xh;
-    int			yl;
-    int			yh;
-    int			bx;
-    int			by;
-    
-    subsector_t*	newsubsec;
-    
-    // kill anything occupying the position
-    tmthing = thing;
-    tmflags = thing->flags;
-	
-    tmx = x;
-    tmy = y;
-	
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
+  static unsigned int baseaddr = 0;
+  unsigned int addr;
 
-    newsubsec = R_PointInSubsector (x,y);
-    ceilingline = NULL;
-    
-    // The base floor/ceiling is from the subsector
-    // that contains the point.
-    // Any contacted lines the step closer together
-    // will adjust them.
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-			
-    validcount++;
-    numspechit = 0;
-    
-    // stomp on any things contacted
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
-
-    for (bx=xl ; bx<=xh ; bx++)
-	for (by=yl ; by<=yh ; by++)
-	    if (!P_BlockThingsIterator(bx,by,PIT_StompThing))
-		return false;
-    
-    // the move is ok,
-    // so link the thing into its new position
-    P_UnsetThingPosition (thing);
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;	
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition (thing);
-	
-    return true;
-}
-
-
-//
-// MOVEMENT ITERATOR FUNCTIONS
-//
-
-static void SpechitOverrun(line_t *ld);
-
-//
-// PIT_CheckLine
-// Adjusts tmfloorz and tmceilingz as lines are contacted
-//
-boolean PIT_CheckLine (line_t* ld)
-{
-    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
-	|| tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-	|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
-	|| tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP] )
-	return true;
-
-    if (P_BoxOnLineSide (tmbbox, ld) != -1)
-	return true;
-		
-    // A line has been hit
-    
-    // The moving thing's destination position will cross
-    // the given line.
-    // If this should not be allowed, return false.
-    // If the line is special, keep track of it
-    // to process later if the move is proven ok.
-    // NOTE: specials are NOT sorted by order,
-    // so two special lines that are only 8 pixels apart
-    // could be crossed in either order.
-    
-    if (!ld->backsector)
-	return false;		// one sided line
-		
-    if (!(tmthing->flags & MF_MISSILE) )
+  if (baseaddr == 0)
     {
-	if ( ld->flags & ML_BLOCKING )
-	    return false;	// explicitly blocking everything
+      int p;
 
-	if ( !tmthing->player && ld->flags & ML_BLOCKMONSTERS )
-	    return false;	// block monsters only
-    }
+      /* This is the first time we have had an overrun.  Work out
+       * what base address we are going to use.
+       * Allow a spechit value to be specified on the command line.
+       */
 
-    // set openrange, opentop, openbottom
-    P_LineOpening (ld);	
-	
-    // adjust floor / ceiling heights
-    if (opentop < tmceilingz)
-    {
-	tmceilingz = opentop;
-	ceilingline = ld;
-    }
+      /* @category compat
+       * @arg <n>
+       *
+       * Use the specified magic value when emulating spechit overruns.
+       */
 
-    if (openbottom > tmfloorz)
-	tmfloorz = openbottom;	
+      p = m_check_parm_with_args("-spechit", 1);
 
-    if (lowfloor < tmdropoffz)
-	tmdropoffz = lowfloor;
-		
-    // if contacted a special line, add it to the list
-    if (ld->special)
-    {
-        spechit[numspechit] = ld;
-	numspechit++;
-
-        // fraggle: spechits overrun emulation code from prboom-plus
-        if (numspechit > MAXSPECIALCROSS_ORIGINAL)
+      if (p > 0)
         {
-            SpechitOverrun(ld);
+          m_str_to_int(myargv[p + 1], (int *)&baseaddr);
+        }
+      else
+        {
+          baseaddr = DEFAULT_SPECHIT_MAGIC;
         }
     }
 
-    return true;
-}
+  /* Calculate address used in doom2.exe */
 
-//
-// PIT_CheckThing
-//
-boolean PIT_CheckThing (mobj_t* thing)
-{
-    fixed_t		blockdist;
-    boolean		solid;
-    int			damage;
-		
-    if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE) ))
-	return true;
-    
-    blockdist = thing->radius + tmthing->radius;
+  addr = baseaddr + (ld - lines) * 0x3e;
 
-    if ( abs(thing->x - tmx) >= blockdist
-	 || abs(thing->y - tmy) >= blockdist )
+  switch (numspechit)
     {
-	// didn't hit it
-	return true;	
-    }
-    
-    // don't clip against self
-    if (thing == tmthing)
-	return true;
-    
-    // check for skulls slamming into things
-    if (tmthing->flags & MF_SKULLFLY)
-    {
-	damage = ((P_Random()%8)+1)*tmthing->info->damage;
-	
-	P_DamageMobj (thing, tmthing, tmthing, damage);
-	
-	tmthing->flags &= ~MF_SKULLFLY;
-	tmthing->momx = tmthing->momy = tmthing->momz = 0;
-	
-	P_SetMobjState (tmthing, tmthing->info->spawnstate);
-	
-	return false;		// stop moving
-    }
-
-    
-    // missiles can hit other things
-    if (tmthing->flags & MF_MISSILE)
-    {
-	// see if it went over / under
-	if (tmthing->z > thing->z + thing->height)
-	    return true;		// overhead
-	if (tmthing->z+tmthing->height < thing->z)
-	    return true;		// underneath
-		
-	if (tmthing->target 
-         && (tmthing->target->type == thing->type || 
-	    (tmthing->target->type == MT_KNIGHT && thing->type == MT_BRUISER)||
-	    (tmthing->target->type == MT_BRUISER && thing->type == MT_KNIGHT) ) )
-	{
-	    // Don't hit same species as originator.
-	    if (thing == tmthing->target)
-		return true;
-
-            // sdh: Add deh_species_infighting here.  We can override the
-            // "monsters of the same species cant hurt each other" behavior
-            // through dehacked patches
-
-	    if (thing->type != MT_PLAYER && !deh_species_infighting)
-	    {
-		// Explode, but do no damage.
-		// Let players missile other players.
-		return false;
-	    }
-	}
-	
-	if (! (thing->flags & MF_SHOOTABLE) )
-	{
-	    // didn't do any damage
-	    return !(thing->flags & MF_SOLID);	
-	}
-	
-	// damage / explode
-	damage = ((P_Random()%8)+1)*tmthing->info->damage;
-	P_DamageMobj (thing, tmthing, tmthing->target, damage);
-
-	// don't traverse any more
-	return false;				
-    }
-    
-    // check for special pickup
-    if (thing->flags & MF_SPECIAL)
-    {
-	solid = (thing->flags & MF_SOLID) != 0;
-	if (tmflags&MF_PICKUP)
-	{
-	    // can remove thing
-	    P_TouchSpecialThing (thing, tmthing);
-	}
-	return !solid;
-    }
-	
-    return !(thing->flags & MF_SOLID);
-}
-
-
-//
-// MOVEMENT CLIPPING
-//
-
-//
-// P_CheckPosition
-// This is purely informative, nothing is modified
-// (except things picked up).
-// 
-// in:
-//  a mobj_t (can be valid or invalid)
-//  a position to be checked
-//   (doesn't need to be related to the mobj_t->x,y)
-//
-// during:
-//  special things are touched if MF_PICKUP
-//  early out on solid lines?
-//
-// out:
-//  newsubsec
-//  floorz
-//  ceilingz
-//  tmdropoffz
-//   the lowest point contacted
-//   (monsters won't move to a dropoff)
-//  speciallines[]
-//  numspeciallines
-//
-boolean
-P_CheckPosition
-( mobj_t*	thing,
-  fixed_t	x,
-  fixed_t	y )
-{
-    int			xl;
-    int			xh;
-    int			yl;
-    int			yh;
-    int			bx;
-    int			by;
-    subsector_t*	newsubsec;
-
-    tmthing = thing;
-    tmflags = thing->flags;
-	
-    tmx = x;
-    tmy = y;
-	
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector (x,y);
-    ceilingline = NULL;
-    
-    // The base floor / ceiling is from the subsector
-    // that contains the point.
-    // Any contacted lines the step closer together
-    // will adjust them.
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-			
-    validcount++;
-    numspechit = 0;
-
-    if ( tmflags & MF_NOCLIP )
-	return true;
-    
-    // Check things first, possibly picking things up.
-    // The bounding box is extended by MAXRADIUS
-    // because mobj_ts are grouped into mapblocks
-    // based on their origin point, and can overlap
-    // into adjacent blocks by up to MAXRADIUS units.
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
-
-    for (bx=xl ; bx<=xh ; bx++)
-	for (by=yl ; by<=yh ; by++)
-	    if (!P_BlockThingsIterator(bx,by,PIT_CheckThing))
-		return false;
-    
-    // check lines
-    xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
-
-    for (bx=xl ; bx<=xh ; bx++)
-	for (by=yl ; by<=yh ; by++)
-	    if (!P_BlockLinesIterator (bx,by,PIT_CheckLine))
-		return false;
-
-    return true;
-}
-
-
-//
-// P_TryMove
-// Attempt to move to a new position,
-// crossing special lines unless MF_TELEPORT is set.
-//
-boolean
-P_TryMove
-( mobj_t*	thing,
-  fixed_t	x,
-  fixed_t	y )
-{
-    fixed_t	oldx;
-    fixed_t	oldy;
-    int		side;
-    int		oldside;
-    line_t*	ld;
-
-    floatok = false;
-    if (!P_CheckPosition (thing, x, y))
-	return false;		// solid wall or thing
-    
-    if ( !(thing->flags & MF_NOCLIP) )
-    {
-	if (tmceilingz - tmfloorz < thing->height)
-	    return false;	// doesn't fit
-
-	floatok = true;
-	
-	if ( !(thing->flags&MF_TELEPORT) 
-	     &&tmceilingz - thing->z < thing->height)
-	    return false;	// mobj must lower itself to fit
-
-	if ( !(thing->flags&MF_TELEPORT)
-	     && tmfloorz - thing->z > 24*FRACUNIT )
-	    return false;	// too big a step up
-
-	if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT))
-	     && tmfloorz - tmdropoffz > 24*FRACUNIT )
-	    return false;	// don't stand over a dropoff
-    }
-    
-    // the move is ok,
-    // so link the thing into its new position
-    P_UnsetThingPosition (thing);
-
-    oldx = thing->x;
-    oldy = thing->y;
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;	
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition (thing);
-    
-    // if any special lines were hit, do the effect
-    if (! (thing->flags&(MF_TELEPORT|MF_NOCLIP)) )
-    {
-	while (numspechit--)
-	{
-	    // see if the line was crossed
-	    ld = spechit[numspechit];
-	    side = P_PointOnLineSide (thing->x, thing->y, ld);
-	    oldside = P_PointOnLineSide (oldx, oldy, ld);
-	    if (side != oldside)
-	    {
-		if (ld->special)
-		    P_CrossSpecialLine (ld-lines, oldside, thing);
-	    }
-	}
-    }
-
-    return true;
-}
-
-
-//
-// P_ThingHeightClip
-// Takes a valid thing and adjusts the thing->floorz,
-// thing->ceilingz, and possibly thing->z.
-// This is called for all nearby monsters
-// whenever a sector changes height.
-// If the thing doesn't fit,
-// the z will be set to the lowest value
-// and false will be returned.
-//
-boolean P_ThingHeightClip (mobj_t* thing)
-{
-    boolean		onfloor;
-	
-    onfloor = (thing->z == thing->floorz);
-	
-    P_CheckPosition (thing, thing->x, thing->y);	
-    // what about stranding a monster partially off an edge?
-	
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-	
-    if (onfloor)
-    {
-	// walking monsters rise and fall with the floor
-	thing->z = thing->floorz;
-    }
-    else
-    {
-	// don't adjust a floating monster unless forced to
-	if (thing->z+thing->height > thing->ceilingz)
-	    thing->z = thing->ceilingz - thing->height;
-    }
-	
-    if (thing->ceilingz - thing->floorz < thing->height)
-	return false;
-		
-    return true;
-}
-
-
-
-//
-// SLIDE MOVE
-// Allows the player to slide along any angled walls.
-//
-fixed_t		bestslidefrac;
-fixed_t		secondslidefrac;
-
-line_t*		bestslideline;
-line_t*		secondslideline;
-
-mobj_t*		slidemo;
-
-fixed_t		tmxmove;
-fixed_t		tmymove;
-
-
-
-//
-// P_HitSlideLine
-// Adjusts the xmove / ymove
-// so that the next move will slide along the wall.
-//
-void P_HitSlideLine (line_t* ld)
-{
-    int			side;
-
-    angle_t		lineangle;
-    angle_t		moveangle;
-    angle_t		deltaangle;
-    
-    fixed_t		movelen;
-    fixed_t		newlen;
-	
-	
-    if (ld->slopetype == ST_HORIZONTAL)
-    {
-	tmymove = 0;
-	return;
-    }
-    
-    if (ld->slopetype == ST_VERTICAL)
-    {
-	tmxmove = 0;
-	return;
-    }
-	
-    side = P_PointOnLineSide (slidemo->x, slidemo->y, ld);
-	
-    lineangle = R_PointToAngle2 (0,0, ld->dx, ld->dy);
-
-    if (side == 1)
-	lineangle += ANG180;
-
-    moveangle = R_PointToAngle2 (0,0, tmxmove, tmymove);
-    deltaangle = moveangle-lineangle;
-
-    if (deltaangle > ANG180)
-	deltaangle += ANG180;
-    //	I_Error ("SlideLine: ang>ANG180");
-
-    lineangle >>= ANGLETOFINESHIFT;
-    deltaangle >>= ANGLETOFINESHIFT;
-	
-    movelen = P_AproxDistance (tmxmove, tmymove);
-    newlen = FixedMul (movelen, finecosine[deltaangle]);
-
-    tmxmove = FixedMul (newlen, finecosine[lineangle]);	
-    tmymove = FixedMul (newlen, finesine[lineangle]);	
-}
-
-
-//
-// PTR_SlideTraverse
-//
-boolean PTR_SlideTraverse (intercept_t* in)
-{
-    line_t*	li;
-	
-    if (!in->isaline)
-	I_Error ("PTR_SlideTraverse: not a line?");
-		
-    li = in->d.line;
-    
-    if ( ! (li->flags & ML_TWOSIDED) )
-    {
-	if (P_PointOnLineSide (slidemo->x, slidemo->y, li))
-	{
-	    // don't hit the back side
-	    return true;		
-	}
-	goto isblocking;
-    }
-
-    // set openrange, opentop, openbottom
-    P_LineOpening (li);
-    
-    if (openrange < slidemo->height)
-	goto isblocking;		// doesn't fit
-		
-    if (opentop - slidemo->z < slidemo->height)
-	goto isblocking;		// mobj is too high
-
-    if (openbottom - slidemo->z > 24*FRACUNIT )
-	goto isblocking;		// too big a step up
-
-    // this line doesn't block movement
-    return true;		
-	
-    // the line does block movement,
-    // see if it is closer than best so far
-  isblocking:		
-    if (in->frac < bestslidefrac)
-    {
-	secondslidefrac = bestslidefrac;
-	secondslideline = bestslideline;
-	bestslidefrac = in->frac;
-	bestslideline = li;
-    }
-	
-    return false;	// stop
-}
-
-
-
-//
-// P_SlideMove
-// The momx / momy move is bad, so try to slide
-// along a wall.
-// Find the first line hit, move flush to it,
-// and slide along it
-//
-// This is a kludgy mess.
-//
-void P_SlideMove (mobj_t* mo)
-{
-    fixed_t		leadx;
-    fixed_t		leady;
-    fixed_t		trailx;
-    fixed_t		traily;
-    fixed_t		newx;
-    fixed_t		newy;
-    int			hitcount;
-		
-    slidemo = mo;
-    hitcount = 0;
-    
-  retry:
-    if (++hitcount == 3)
-	goto stairstep;		// don't loop forever
-
-    
-    // trace along the three leading corners
-    if (mo->momx > 0)
-    {
-	leadx = mo->x + mo->radius;
-	trailx = mo->x - mo->radius;
-    }
-    else
-    {
-	leadx = mo->x - mo->radius;
-	trailx = mo->x + mo->radius;
-    }
-	
-    if (mo->momy > 0)
-    {
-	leady = mo->y + mo->radius;
-	traily = mo->y - mo->radius;
-    }
-    else
-    {
-	leady = mo->y - mo->radius;
-	traily = mo->y + mo->radius;
-    }
-		
-    bestslidefrac = FRACUNIT+1;
-	
-    P_PathTraverse ( leadx, leady, leadx+mo->momx, leady+mo->momy,
-		     PT_ADDLINES, PTR_SlideTraverse );
-    P_PathTraverse ( trailx, leady, trailx+mo->momx, leady+mo->momy,
-		     PT_ADDLINES, PTR_SlideTraverse );
-    P_PathTraverse ( leadx, traily, leadx+mo->momx, traily+mo->momy,
-		     PT_ADDLINES, PTR_SlideTraverse );
-    
-    // move up to the wall
-    if (bestslidefrac == FRACUNIT+1)
-    {
-	// the move most have hit the middle, so stairstep
-      stairstep:
-	if (!P_TryMove (mo, mo->x, mo->y + mo->momy))
-	    P_TryMove (mo, mo->x + mo->momx, mo->y);
-	return;
-    }
-
-    // fudge a bit to make sure it doesn't hit
-    bestslidefrac -= 0x800;	
-    if (bestslidefrac > 0)
-    {
-	newx = FixedMul (mo->momx, bestslidefrac);
-	newy = FixedMul (mo->momy, bestslidefrac);
-	
-	if (!P_TryMove (mo, mo->x+newx, mo->y+newy))
-	    goto stairstep;
-    }
-    
-    // Now continue along the wall.
-    // First calculate remainder.
-    bestslidefrac = FRACUNIT-(bestslidefrac+0x800);
-    
-    if (bestslidefrac > FRACUNIT)
-	bestslidefrac = FRACUNIT;
-    
-    if (bestslidefrac <= 0)
-	return;
-    
-    tmxmove = FixedMul (mo->momx, bestslidefrac);
-    tmymove = FixedMul (mo->momy, bestslidefrac);
-
-    P_HitSlideLine (bestslideline);	// clip the moves
-
-    mo->momx = tmxmove;
-    mo->momy = tmymove;
-		
-    if (!P_TryMove (mo, mo->x+tmxmove, mo->y+tmymove))
-    {
-	goto retry;
+    case 9:
+    case 10:
+    case 11:
+    case 12:
+      tmbbox[numspechit - 9] = addr;
+      break;
+    case 13:
+      crushchange = addr;
+      break;
+    case 14:
+      nofit = addr;
+      break;
+    default:
+      fprintf(stderr,
+              "SpechitOverrun: Warning: unable to emulate"
+              "an overrun where numspechit=%i\n",
+              numspechit);
+      break;
     }
 }
 
+/* pit_check_line
+ * Adjusts tmfloorz and tmceilingz as lines are contacted
+ */
 
-//
-// P_LineAttack
-//
-mobj_t*		linetarget;	// who got hit (or NULL)
-mobj_t*		shootthing;
-
-// Height if not aiming up or down
-// ???: use slope for monsters?
-fixed_t		shootz;	
-
-int		la_damage;
-fixed_t		attackrange;
-
-fixed_t		aimslope;
-
-
-//
-// PTR_AimTraverse
-// Sets linetaget and aimslope when a target is aimed at.
-//
-boolean
-PTR_AimTraverse (intercept_t* in)
+static boolean pit_check_line(line_t *ld)
 {
-    line_t*		li;
-    mobj_t*		th;
-    fixed_t		slope;
-    fixed_t		thingtopslope;
-    fixed_t		thingbottomslope;
-    fixed_t		dist;
-		
-    if (in->isaline)
+  if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
+      tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
+      tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
+      tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
     {
-	li = in->d.line;
-	
-	if ( !(li->flags & ML_TWOSIDED) )
-	    return false;		// stop
-	
-	// Crosses a two sided line.
-	// A two sided line will restrict
-	// the possible target ranges.
-	P_LineOpening (li);
-	
-	if (openbottom >= opentop)
-	    return false;		// stop
-	
-	dist = FixedMul (attackrange, in->frac);
-
-        if (li->backsector == NULL
-         || li->frontsector->floorheight != li->backsector->floorheight)
-	{
-	    slope = FixedDiv (openbottom - shootz , dist);
-	    if (slope > bottomslope)
-		bottomslope = slope;
-	}
-		
-	if (li->backsector == NULL
-         || li->frontsector->ceilingheight != li->backsector->ceilingheight)
-	{
-	    slope = FixedDiv (opentop - shootz , dist);
-	    if (slope < topslope)
-		topslope = slope;
-	}
-		
-	if (topslope <= bottomslope)
-	    return false;		// stop
-			
-	return true;			// shot continues
+      return true;
     }
-    
-    // shoot a thing
-    th = in->d.thing;
-    if (th == shootthing)
-	return true;			// can't shoot self
-    
-    if (!(th->flags&MF_SHOOTABLE))
-	return true;			// corpse or something
 
-    // check angles to see if the thing can be aimed at
-    dist = FixedMul (attackrange, in->frac);
-    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
+  if (p_box_on_line_side(tmbbox, ld) != -1) return true;
 
-    if (thingtopslope < bottomslope)
-	return true;			// shot over the thing
+  /* A line has been hit */
 
-    thingbottomslope = FixedDiv (th->z - shootz, dist);
+  /* The moving thing's destination position will cross
+   * the given line.
+   * If this should not be allowed, return false.
+   * If the line is special, keep track of it
+   * to process later if the move is proven ok.
+   * NOTE: specials are NOT sorted by order,
+   * so two special lines that are only 8 pixels apart
+   * could be crossed in either order.
+   */
 
-    if (thingbottomslope > topslope)
-	return true;			// shot under the thing
-    
-    // this thing can be hit!
-    if (thingtopslope > topslope)
-	thingtopslope = topslope;
-    
-    if (thingbottomslope < bottomslope)
-	thingbottomslope = bottomslope;
+  if (!ld->backsector) return false; /* one sided line */
 
-    aimslope = (thingtopslope+thingbottomslope)/2;
-    linetarget = th;
-
-    return false;			// don't go any farther
-}
-
-
-//
-// PTR_ShootTraverse
-//
-boolean PTR_ShootTraverse (intercept_t* in)
-{
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
-    fixed_t		frac;
-    
-    line_t*		li;
-    
-    mobj_t*		th;
-
-    fixed_t		slope;
-    fixed_t		dist;
-    fixed_t		thingtopslope;
-    fixed_t		thingbottomslope;
-		
-    if (in->isaline)
+  if (!(tmthing->flags & MF_MISSILE))
     {
-	li = in->d.line;
-	
-	if (li->special)
-	    P_ShootSpecialLine (shootthing, li);
-
-	if ( !(li->flags & ML_TWOSIDED) )
-	    goto hitline;
-	
-	// crosses a two sided line
-	P_LineOpening (li);
-		
-	dist = FixedMul (attackrange, in->frac);
-
-        // e6y: emulation of missed back side on two-sided lines.
-        // backsector can be NULL when emulating missing back side.
-
-        if (li->backsector == NULL)
+      if (ld->flags & ML_BLOCKING)
         {
-            slope = FixedDiv (openbottom - shootz , dist);
-            if (slope > aimslope)
-                goto hitline;
-
-            slope = FixedDiv (opentop - shootz , dist);
-            if (slope < aimslope)
-                goto hitline;
+          return false; /* explicitly blocking everything */
         }
-        else
+
+      if (!tmthing->player && ld->flags & ML_BLOCKMONSTERS)
         {
-            if (li->frontsector->floorheight != li->backsector->floorheight)
+          return false; /* block monsters only */
+        }
+    }
+
+  /* set openrange, opentop, openbottom */
+
+  p_line_opening(ld);
+
+  /* adjust floor / ceiling heights */
+
+  if (opentop < tmceilingz)
+    {
+      tmceilingz = opentop;
+      ceilingline = ld;
+    }
+
+  if (openbottom > tmfloorz) tmfloorz = openbottom;
+
+  if (lowfloor < tmdropoffz) tmdropoffz = lowfloor;
+
+  /* if contacted a special line, add it to the list */
+
+  if (ld->special)
+    {
+      spechit[numspechit] = ld;
+      numspechit++;
+
+      /* fraggle: spechits overrun emulation code from prboom-plus */
+
+      if (numspechit > MAXSPECIALCROSS_ORIGINAL)
+        {
+          spechit_overrun(ld);
+        }
+    }
+
+  return true;
+}
+
+/* pit_radius_attack
+ * "bombsource" is the creature that caused the explosion at "bombspot".
+ */
+
+static boolean pit_radius_attack(mobj_t *thing)
+{
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t dist;
+
+  if (!(thing->flags & MF_SHOOTABLE)) return true;
+
+  /* Boss spider and cyborg take no damage from concussion. */
+
+  if (thing->type == MT_CYBORG || thing->type == MT_SPIDER) return true;
+
+  dx = abs(thing->x - bombspot->x);
+  dy = abs(thing->y - bombspot->y);
+
+  dist = dx > dy ? dx : dy;
+  dist = (dist - thing->radius) >> FRACBITS;
+
+  if (dist < 0) dist = 0;
+
+  if (dist >= bombdamage) return true; /* out of range */
+
+  if (p_check_sight(thing, bombspot))
+    {
+      /* must be in direct path */
+
+      p_damage_mobj(thing, bombspot, bombsource, bombdamage - dist);
+    }
+
+  return true;
+}
+
+/* p_things_height_clip
+ * Takes a valid thing and adjusts the thing->floorz, thing->ceilingz, and
+ * possibly thing->z.
+ *
+ * This is called for all nearby monsters whenever a sector changes height.
+ *
+ * If the thing doesn't fit, the z will be set to the lowest value and false
+ * will be returned.
+ */
+
+static boolean p_things_height_clip(mobj_t *thing)
+{
+  boolean onfloor;
+
+  onfloor = (thing->z == thing->floorz);
+
+  p_check_position(thing, thing->x, thing->y);
+
+  /* what about stranding a monster partially off an edge? */
+
+  thing->floorz = tmfloorz;
+  thing->ceilingz = tmceilingz;
+
+  if (onfloor)
+    {
+      /* walking monsters rise and fall with the floor */
+
+      thing->z = thing->floorz;
+    }
+  else
+    {
+      /* don't adjust a floating monster unless forced to */
+
+      if (thing->z + thing->height > thing->ceilingz)
+        thing->z = thing->ceilingz - thing->height;
+    }
+
+  if (thing->ceilingz - thing->floorz < thing->height) return false;
+
+  return true;
+}
+
+/* p_hit_slide_line
+ * Adjusts the xmove / ymove so that the next move will slide along the wall.
+ */
+
+static void p_hit_slide_line(line_t *ld)
+{
+  int side;
+
+  angle_t lineangle;
+  angle_t moveangle;
+  angle_t deltaangle;
+
+  fixed_t movelen;
+  fixed_t newlen;
+
+  if (ld->slopetype == ST_HORIZONTAL)
+    {
+      tmymove = 0;
+      return;
+    }
+
+  if (ld->slopetype == ST_VERTICAL)
+    {
+      tmxmove = 0;
+      return;
+    }
+
+  side = p_point_on_line_side(slidemo->x, slidemo->y, ld);
+
+  lineangle = r_point_to_angle2(0, 0, ld->dx, ld->dy);
+
+  if (side == 1) lineangle += ANG180;
+
+  moveangle = r_point_to_angle2(0, 0, tmxmove, tmymove);
+  deltaangle = moveangle - lineangle;
+
+  if (deltaangle > ANG180) deltaangle += ANG180;
+
+  lineangle >>= ANGLETOFINESHIFT;
+  deltaangle >>= ANGLETOFINESHIFT;
+
+  movelen = p_approx_distance(tmxmove, tmymove);
+  newlen = fixed_mul(movelen, finecosine[deltaangle]);
+
+  tmxmove = fixed_mul(newlen, finecosine[lineangle]);
+  tmymove = fixed_mul(newlen, finesine[lineangle]);
+}
+
+/* ptr_slide_traverse */
+
+static boolean ptr_slide_traverse(intercept_t *in)
+{
+  line_t *li;
+
+  if (!in->isaline) i_error("ptr_slide_traverse: not a line?");
+
+  li = in->d.line;
+
+  if (!(li->flags & ML_TWOSIDED))
+    {
+      if (p_point_on_line_side(slidemo->x, slidemo->y, li))
+        {
+          return true; /* don't hit the back side */
+        }
+
+      goto isblocking;
+    }
+
+  /* set openrange, opentop, openbottom */
+
+  p_line_opening(li);
+
+  if (openrange < slidemo->height)
+    {
+      goto isblocking; /* doesn't fit */
+    }
+
+  if (opentop - slidemo->z < slidemo->height)
+    {
+      goto isblocking; /* mobj is too high */
+    }
+
+  if (openbottom - slidemo->z > 24 * FRACUNIT)
+    {
+      goto isblocking; /* too big a step up */
+    }
+
+  /* this line doesn't block movement */
+
+  return true;
+
+  /* the line does block movement,
+   * see if it is closer than best so far
+   */
+
+isblocking:
+  if (in->frac < bestslidefrac)
+    {
+      secondslidefrac = bestslidefrac;
+      secondslideline = bestslideline;
+      bestslidefrac = in->frac;
+      bestslideline = li;
+    }
+
+  return false; /* stop */
+}
+
+static boolean ptr_use_traverse(intercept_t *in)
+{
+  int side;
+
+  if (!in->d.line->special)
+    {
+      p_line_opening(in->d.line);
+      if (openrange <= 0)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(usething, SFX_NOWAY);
+#endif
+
+          /* can't use through a wall */
+
+          return false;
+        }
+
+      /* not a special line, but keep checking */
+
+      return true;
+    }
+
+  side = 0;
+  if (p_point_on_line_side(usething->x, usething->y, in->d.line) == 1)
+    {
+      side = 1;
+    }
+
+  /* return false; don't use back side */
+
+  p_use_special_line(usething, in->d.line, side);
+
+  /* can't use for than one special line in a row */
+
+  return false;
+}
+
+/* ptr_aim_traverse
+ * Sets linetaget and aimslope when a target is aimed at.
+ */
+
+static boolean ptr_aim_traverse(intercept_t *in)
+{
+  line_t *li;
+  mobj_t *th;
+  fixed_t slope;
+  fixed_t thingtopslope;
+  fixed_t thingbottomslope;
+  fixed_t dist;
+
+  if (in->isaline)
+    {
+      li = in->d.line;
+
+      if (!(li->flags & ML_TWOSIDED)) return false; /* stop */
+
+      /* Crosses a two sided line.
+       * A two sided line will restrict
+       * the possible target ranges.
+       */
+
+      p_line_opening(li);
+
+      if (openbottom >= opentop) return false; /* stop */
+
+      dist = fixed_mul(attackrange, in->frac);
+
+      if (li->backsector == NULL ||
+          li->frontsector->floorheight != li->backsector->floorheight)
+        {
+          slope = fixed_div(openbottom - shootz, dist);
+          if (slope > bottomslope) bottomslope = slope;
+        }
+
+      if (li->backsector == NULL ||
+          li->frontsector->ceilingheight != li->backsector->ceilingheight)
+        {
+          slope = fixed_div(opentop - shootz, dist);
+          if (slope < topslope) topslope = slope;
+        }
+
+      if (topslope <= bottomslope) return false; /* stop */
+
+      return true; /* shot continues */
+    }
+
+  /* shoot a thing */
+
+  th = in->d.thing;
+  if (th == shootthing) return true; /* can't shoot self */
+
+  if (!(th->flags & MF_SHOOTABLE)) return true; /* corpse or something */
+
+  /* check angles to see if the thing can be aimed at */
+
+  dist = fixed_mul(attackrange, in->frac);
+  thingtopslope = fixed_div(th->z + th->height - shootz, dist);
+
+  if (thingtopslope < bottomslope) return true; /* shot over the thing */
+
+  thingbottomslope = fixed_div(th->z - shootz, dist);
+
+  if (thingbottomslope > topslope) return true; /* shot under the thing */
+
+  /* this thing can be hit! */
+
+  if (thingtopslope > topslope) thingtopslope = topslope;
+
+  if (thingbottomslope < bottomslope) thingbottomslope = bottomslope;
+
+  aimslope = (thingtopslope + thingbottomslope) / 2;
+  linetarget = th;
+
+  return false; /* don't go any farther */
+}
+
+/* ptr_shoot_traverse */
+
+static boolean ptr_shoot_traverse(intercept_t *in)
+{
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
+  fixed_t frac;
+
+  line_t *li;
+
+  mobj_t *th;
+
+  fixed_t slope;
+  fixed_t dist;
+  fixed_t thingtopslope;
+  fixed_t thingbottomslope;
+
+  if (in->isaline)
+    {
+      li = in->d.line;
+
+      if (li->special) p_shoot_special_line(shootthing, li);
+
+      if (!(li->flags & ML_TWOSIDED)) goto hitline;
+
+      /* crosses a two sided line */
+
+      p_line_opening(li);
+
+      dist = fixed_mul(attackrange, in->frac);
+
+      /* e6y: emulation of missed back side on two-sided lines.
+       * backsector can be NULL when emulating missing back side.
+       */
+
+      if (li->backsector == NULL)
+        {
+          slope = fixed_div(openbottom - shootz, dist);
+          if (slope > aimslope) goto hitline;
+
+          slope = fixed_div(opentop - shootz, dist);
+          if (slope < aimslope) goto hitline;
+        }
+      else
+        {
+          if (li->frontsector->floorheight
+                  != li->backsector->floorheight)
             {
-                slope = FixedDiv (openbottom - shootz , dist);
-                if (slope > aimslope)
-                    goto hitline;
+              slope = fixed_div(openbottom - shootz, dist);
+              if (slope > aimslope) goto hitline;
             }
 
-            if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+          if (li->frontsector->ceilingheight
+                  != li->backsector->ceilingheight)
             {
-                slope = FixedDiv (opentop - shootz , dist);
-                if (slope < aimslope)
-                    goto hitline;
+              slope = fixed_div(opentop - shootz, dist);
+              if (slope < aimslope) goto hitline;
             }
         }
 
-	// shot continues
-	return true;
-	
-	
-	// hit line
-      hitline:
-	// position a bit closer
-	frac = in->frac - FixedDiv (4*FRACUNIT,attackrange);
-	x = trace.x + FixedMul (trace.dx, frac);
-	y = trace.y + FixedMul (trace.dy, frac);
-	z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
+      /* shot continues */
 
-	if (li->frontsector->ceilingpic == skyflatnum)
-	{
-	    // don't shoot the sky!
-	    if (z > li->frontsector->ceilingheight)
-		return false;
-	    
-	    // it's a sky hack wall
-	    if	(li->backsector && li->backsector->ceilingpic == skyflatnum)
-		return false;		
-	}
+      return true;
 
-	// Spawn bullet puffs.
-	P_SpawnPuff (x,y,z);
-	
-	// don't go any farther
-	return false;	
-    }
-    
-    // shoot a thing
-    th = in->d.thing;
-    if (th == shootthing)
-	return true;		// can't shoot self
-    
-    if (!(th->flags&MF_SHOOTABLE))
-	return true;		// corpse or something
-		
-    // check angles to see if the thing can be aimed at
-    dist = FixedMul (attackrange, in->frac);
-    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
+      /* hit line */
 
-    if (thingtopslope < aimslope)
-	return true;		// shot over the thing
+    hitline:
 
-    thingbottomslope = FixedDiv (th->z - shootz, dist);
+      /* position a bit closer */
 
-    if (thingbottomslope > aimslope)
-	return true;		// shot under the thing
+      frac = in->frac - fixed_div(4 * FRACUNIT, attackrange);
+      x = trace.x + fixed_mul(trace.dx, frac);
+      y = trace.y + fixed_mul(trace.dy, frac);
+      z = shootz + fixed_mul(aimslope, fixed_mul(frac, attackrange));
 
-    
-    // hit thing
-    // position a bit closer
-    frac = in->frac - FixedDiv (10*FRACUNIT,attackrange);
-
-    x = trace.x + FixedMul (trace.dx, frac);
-    y = trace.y + FixedMul (trace.dy, frac);
-    z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
-
-    // Spawn bullet puffs or blod spots,
-    // depending on target type.
-    if (in->d.thing->flags & MF_NOBLOOD)
-	P_SpawnPuff (x,y,z);
-    else
-	P_SpawnBlood (x,y,z, la_damage);
-
-    if (la_damage)
-	P_DamageMobj (th, shootthing, shootthing, la_damage);
-
-    // don't go any farther
-    return false;
-	
-}
-
-
-//
-// P_AimLineAttack
-//
-fixed_t
-P_AimLineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance )
-{
-    fixed_t	x2;
-    fixed_t	y2;
-
-    t1 = P_SubstNullMobj(t1);
-	
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    
-    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
-    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
-    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
-
-    // can't shoot outside view angles
-    topslope = (SCREENHEIGHT/2)*FRACUNIT/(SCREENWIDTH/2);	
-    bottomslope = -(SCREENHEIGHT/2)*FRACUNIT/(SCREENWIDTH/2);
-    
-    attackrange = distance;
-    linetarget = NULL;
-	
-    P_PathTraverse ( t1->x, t1->y,
-		     x2, y2,
-		     PT_ADDLINES|PT_ADDTHINGS,
-		     PTR_AimTraverse );
-		
-    if (linetarget)
-	return aimslope;
-
-    return 0;
-}
- 
-
-//
-// P_LineAttack
-// If damage == 0, it is just a test trace
-// that will leave linetarget set.
-//
-void
-P_LineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance,
-  fixed_t	slope,
-  int		damage )
-{
-    fixed_t	x2;
-    fixed_t	y2;
-	
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    la_damage = damage;
-    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
-    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
-    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
-    attackrange = distance;
-    aimslope = slope;
-		
-    P_PathTraverse ( t1->x, t1->y,
-		     x2, y2,
-		     PT_ADDLINES|PT_ADDTHINGS,
-		     PTR_ShootTraverse );
-}
- 
-
-
-//
-// USE LINES
-//
-mobj_t*		usething;
-
-boolean	PTR_UseTraverse (intercept_t* in)
-{
-    int		side;
-	
-    if (!in->d.line->special)
-    {
-	P_LineOpening (in->d.line);
-	if (openrange <= 0)
-	{
-	    S_StartSound (usething, sfx_noway);
-	    
-	    // can't use through a wall
-	    return false;	
-	}
-	// not a special line, but keep checking
-	return true ;		
-    }
-	
-    side = 0;
-    if (P_PointOnLineSide (usething->x, usething->y, in->d.line) == 1)
-	side = 1;
-    
-    //	return false;		// don't use back side
-	
-    P_UseSpecialLine (usething, in->d.line, side);
-
-    // can't use for than one special line in a row
-    return false;
-}
-
-
-//
-// P_UseLines
-// Looks for special lines in front of the player to activate.
-//
-void P_UseLines (player_t*	player) 
-{
-    int		angle;
-    fixed_t	x1;
-    fixed_t	y1;
-    fixed_t	x2;
-    fixed_t	y2;
-	
-    usething = player->mo;
-		
-    angle = player->mo->angle >> ANGLETOFINESHIFT;
-
-    x1 = player->mo->x;
-    y1 = player->mo->y;
-    x2 = x1 + (USERANGE>>FRACBITS)*finecosine[angle];
-    y2 = y1 + (USERANGE>>FRACBITS)*finesine[angle];
-	
-    P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse );
-}
-
-
-//
-// RADIUS ATTACK
-//
-mobj_t*		bombsource;
-mobj_t*		bombspot;
-int		bombdamage;
-
-
-//
-// PIT_RadiusAttack
-// "bombsource" is the creature
-// that caused the explosion at "bombspot".
-//
-boolean PIT_RadiusAttack (mobj_t* thing)
-{
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	dist;
-	
-    if (!(thing->flags & MF_SHOOTABLE) )
-	return true;
-
-    // Boss spider and cyborg
-    // take no damage from concussion.
-    if (thing->type == MT_CYBORG
-	|| thing->type == MT_SPIDER)
-	return true;	
-		
-    dx = abs(thing->x - bombspot->x);
-    dy = abs(thing->y - bombspot->y);
-    
-    dist = dx>dy ? dx : dy;
-    dist = (dist - thing->radius) >> FRACBITS;
-
-    if (dist < 0)
-	dist = 0;
-
-    if (dist >= bombdamage)
-	return true;	// out of range
-
-    if ( P_CheckSight (thing, bombspot) )
-    {
-	// must be in direct path
-	P_DamageMobj (thing, bombspot, bombsource, bombdamage - dist);
-    }
-    
-    return true;
-}
-
-
-//
-// P_RadiusAttack
-// Source is the creature that caused the explosion at spot.
-//
-void
-P_RadiusAttack
-( mobj_t*	spot,
-  mobj_t*	source,
-  int		damage )
-{
-    int		x;
-    int		y;
-    
-    int		xl;
-    int		xh;
-    int		yl;
-    int		yh;
-    
-    fixed_t	dist;
-	
-    dist = (damage+MAXRADIUS)<<FRACBITS;
-    yh = (spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
-    yl = (spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
-    xh = (spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
-    xl = (spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
-    bombspot = spot;
-    bombsource = source;
-    bombdamage = damage;
-	
-    for (y=yl ; y<=yh ; y++)
-	for (x=xl ; x<=xh ; x++)
-	    P_BlockThingsIterator (x, y, PIT_RadiusAttack );
-}
-
-
-
-//
-// SECTOR HEIGHT CHANGING
-// After modifying a sectors floor or ceiling height,
-// call this routine to adjust the positions
-// of all things that touch the sector.
-//
-// If anything doesn't fit anymore, true will be returned.
-// If crunch is true, they will take damage
-//  as they are being crushed.
-// If Crunch is false, you should set the sector height back
-//  the way it was and call P_ChangeSector again
-//  to undo the changes.
-//
-boolean		crushchange;
-boolean		nofit;
-
-
-//
-// PIT_ChangeSector
-//
-boolean PIT_ChangeSector (mobj_t*	thing)
-{
-    mobj_t*	mo;
-	
-    if (P_ThingHeightClip (thing))
-    {
-	// keep checking
-	return true;
-    }
-    
-
-    // crunch bodies to giblets
-    if (thing->health <= 0)
-    {
-	P_SetMobjState (thing, S_GIBS);
-
-    if (gameversion > exe_doom_1_2)
-	    thing->flags &= ~MF_SOLID;
-	thing->height = 0;
-	thing->radius = 0;
-
-	// keep checking
-	return true;		
-    }
-
-    // crunch dropped items
-    if (thing->flags & MF_DROPPED)
-    {
-	P_RemoveMobj (thing);
-	
-	// keep checking
-	return true;		
-    }
-
-    if (! (thing->flags & MF_SHOOTABLE) )
-    {
-	// assume it is bloody gibs or something
-	return true;			
-    }
-    
-    nofit = true;
-
-    if (crushchange && !(leveltime&3) )
-    {
-	P_DamageMobj(thing,NULL,NULL,10);
-
-	// spray blood in a random direction
-	mo = P_SpawnMobj (thing->x,
-			  thing->y,
-			  thing->z + thing->height/2, MT_BLOOD);
-	
-	mo->momx = P_SubRandom() << 12;
-	mo->momy = P_SubRandom() << 12;
-    }
-
-    // keep checking (crush other things)	
-    return true;	
-}
-
-
-
-//
-// P_ChangeSector
-//
-boolean
-P_ChangeSector
-( sector_t*	sector,
-  boolean	crunch )
-{
-    int		x;
-    int		y;
-	
-    nofit = false;
-    crushchange = crunch;
-	
-    // re-check heights for all things near the moving sector
-    for (x=sector->blockbox[BOXLEFT] ; x<= sector->blockbox[BOXRIGHT] ; x++)
-	for (y=sector->blockbox[BOXBOTTOM];y<= sector->blockbox[BOXTOP] ; y++)
-	    P_BlockThingsIterator (x, y, PIT_ChangeSector);
-	
-	
-    return nofit;
-}
-
-// Code to emulate the behavior of Vanilla Doom when encountering an overrun
-// of the spechit array.  This is by Andrey Budko (e6y) and comes from his
-// PrBoom plus port.  A big thanks to Andrey for this.
-
-static void SpechitOverrun(line_t *ld)
-{
-    static unsigned int baseaddr = 0;
-    unsigned int addr;
-   
-    if (baseaddr == 0)
-    {
-        int p;
-
-        // This is the first time we have had an overrun.  Work out
-        // what base address we are going to use.
-        // Allow a spechit value to be specified on the command line.
-
-        //!
-        // @category compat
-        // @arg <n>
-        //
-        // Use the specified magic value when emulating spechit overruns.
-        //
-
-        p = M_CheckParmWithArgs("-spechit", 1);
-        
-        if (p > 0)
+      if (li->frontsector->ceilingpic == skyflatnum)
         {
-            M_StrToInt(myargv[p+1], (int *) &baseaddr);
+          /* don't shoot the sky! */
+
+          if (z > li->frontsector->ceilingheight) return false;
+
+          /* it's a sky hack wall */
+
+          if (li->backsector &&
+              li->backsector->ceilingpic == skyflatnum)
+            {
+              return false;
+            }
         }
-        else
+
+      /* Spawn bullet puffs. */
+
+      p_spawn_puff(x, y, z);
+
+      /* don't go any farther */
+
+      return false;
+    }
+
+  /* shoot a thing */
+
+  th = in->d.thing;
+  if (th == shootthing) return true; /* can't shoot self */
+
+  if (!(th->flags & MF_SHOOTABLE)) return true; /* corpse or something */
+
+  /* check angles to see if the thing can be aimed at */
+
+  dist = fixed_mul(attackrange, in->frac);
+  thingtopslope = fixed_div(th->z + th->height - shootz, dist);
+
+  if (thingtopslope < aimslope) return true; /* shot over the thing  */
+
+  thingbottomslope = fixed_div(th->z - shootz, dist);
+
+  if (thingbottomslope > aimslope) return true; /* shot under the thing */
+
+  /* hit thing position a bit closer */
+
+  frac = in->frac - fixed_div(10 * FRACUNIT, attackrange);
+
+  x = trace.x + fixed_mul(trace.dx, frac);
+  y = trace.y + fixed_mul(trace.dy, frac);
+  z = shootz + fixed_mul(aimslope, fixed_mul(frac, attackrange));
+
+  /* Spawn bullet puffs or blod spots,
+   * depending on target type.
+   */
+
+  if (in->d.thing->flags & MF_NOBLOOD)
+    p_spawn_puff(x, y, z);
+  else
+    p_spawn_blood(x, y, z, la_damage);
+
+  if (la_damage) p_damage_mobj(th, shootthing, shootthing, la_damage);
+
+  /* don't go any farther */
+
+  return false;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* p_teleport_move */
+
+boolean p_teleport_move(mobj_t *thing, fixed_t x, fixed_t y)
+{
+  int xl;
+  int xh;
+  int yl;
+  int yh;
+  int bx;
+  int by;
+
+  subsector_t *newsubsec;
+
+  /* kill anything occupying the position */
+
+  tmthing = thing;
+  tmflags = thing->flags;
+
+  tmx = x;
+  tmy = y;
+
+  tmbbox[BOXTOP] = y + tmthing->radius;
+  tmbbox[BOXBOTTOM] = y - tmthing->radius;
+  tmbbox[BOXRIGHT] = x + tmthing->radius;
+  tmbbox[BOXLEFT] = x - tmthing->radius;
+
+  newsubsec = r_point_in_subsector(x, y);
+  ceilingline = NULL;
+
+  /* The base floor/ceiling is from the subsector
+   * that contains the point.
+   * Any contacted lines the step closer together
+   * will adjust them.
+   */
+
+  tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+  tmceilingz = newsubsec->sector->ceilingheight;
+
+  validcount++;
+  numspechit = 0;
+
+  /* stomp on any things contacted */
+
+  xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+  xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+  yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+  yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+  for (bx = xl; bx <= xh; bx++)
+    {
+      for (by = yl; by <= yh; by++)
         {
-            baseaddr = DEFAULT_SPECHIT_MAGIC;
+          if (!p_block_things_iterator(bx, by, pit_stomp_thing))
+            {
+              return false;
+            }
         }
     }
-    
-    // Calculate address used in doom2.exe
 
-    addr = baseaddr + (ld - lines) * 0x3E;
+  /* the move is ok,
+   * so link the thing into its new position
+   */
 
-    switch(numspechit)
+  p_unset_thing_position(thing);
+
+  thing->floorz = tmfloorz;
+  thing->ceilingz = tmceilingz;
+  thing->x = x;
+  thing->y = y;
+
+  p_set_thing_position(thing);
+
+  return true;
+}
+
+boolean pit_check_thing(mobj_t *thing)
+{
+  fixed_t blockdist;
+  boolean solid;
+  int damage;
+
+  if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE))) return true;
+
+  blockdist = thing->radius + tmthing->radius;
+
+  if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
     {
-        case 9: 
-        case 10:
-        case 11:
-        case 12:
-            tmbbox[numspechit-9] = addr;
-            break;
-        case 13: 
-            crushchange = addr; 
-            break;
-        case 14: 
-            nofit = addr; 
-            break;
-        default:
-            fprintf(stderr, "SpechitOverrun: Warning: unable to emulate"
-                            "an overrun where numspechit=%i\n",
-                            numspechit);
-            break;
+      return true; /* didn't hit it */
+    }
+
+  /* don't clip against self */
+
+  if (thing == tmthing) return true;
+
+  /* check for skulls slamming into things */
+
+  if (tmthing->flags & MF_SKULLFLY)
+    {
+      damage = ((p_random() % 8) + 1) * tmthing->info->damage;
+
+      p_damage_mobj(thing, tmthing, tmthing, damage);
+
+      tmthing->flags &= ~MF_SKULLFLY;
+      tmthing->momx = tmthing->momy = tmthing->momz = 0;
+
+      p_set_mobj_state(tmthing, tmthing->info->spawnstate);
+
+      return false; /* stop moving */
+    }
+
+  /* missiles can hit other things */
+
+  if (tmthing->flags & MF_MISSILE)
+    {
+      /* see if it went over / under */
+
+      if (tmthing->z > thing->z + thing->height)
+        {
+          return true; /* overhead */
+        }
+
+      if (tmthing->z + tmthing->height < thing->z)
+        {
+          return true; /* underneath */
+        }
+
+      if (tmthing->target &&
+          (tmthing->target->type == thing->type ||
+           (tmthing->target->type == MT_KNIGHT &&
+            thing->type == MT_BRUISER) ||
+           (tmthing->target->type == MT_BRUISER &&
+            thing->type == MT_KNIGHT)))
+        {
+          /* Don't hit same species as originator. */
+
+          if (thing == tmthing->target) return true;
+
+          /* sdh: Add deh_species_infighting here.  We can override the
+           * "monsters of the same species can't hurt each other" behavior
+           * through dehacked patches
+           */
+
+          if (thing->type != MT_PLAYER && !deh_species_infighting)
+            {
+              /* Explode, but do no damage.
+               * Let players missile other players.
+               */
+
+              return false;
+            }
+        }
+
+      if (!(thing->flags & MF_SHOOTABLE))
+        {
+          /* didn't do any damage */
+
+          return !(thing->flags & MF_SOLID);
+        }
+
+      /* damage / explode */
+
+      damage = ((p_random() % 8) + 1) * tmthing->info->damage;
+      p_damage_mobj(thing, tmthing, tmthing->target, damage);
+
+      /* don't traverse any more */
+
+      return false;
+    }
+
+  /* check for special pickup */
+
+  if (thing->flags & MF_SPECIAL)
+    {
+      solid = (thing->flags & MF_SOLID) != 0;
+      if (tmflags & MF_PICKUP)
+        {
+          /* can remove thing */
+
+          p_touch_special_thing(thing, tmthing);
+        }
+
+      return !solid;
+    }
+
+  return !(thing->flags & MF_SOLID);
+}
+
+/* MOVEMENT CLIPPING */
+
+/* p_check_position
+ * This is purely informative, nothing is modified
+ * (except things picked up).
+ *
+ * in:
+ *  a mobj_t (can be valid or invalid)
+ *  a position to be checked
+ *   (doesn't need to be related to the mobj_t->x,y)
+ *
+ * during:
+ *  special things are touched if MF_PICKUP
+ *  early out on solid lines?
+ *
+ * out:
+ *  newsubsec
+ *  floorz
+ *  ceilingz
+ *  tmdropoffz
+ *   the lowest point contacted
+ *   (monsters won't move to a dropoff)
+ *  speciallines[]
+ *  numspeciallines
+ */
+
+boolean p_check_position(mobj_t *thing, fixed_t x, fixed_t y)
+{
+  int xl;
+  int xh;
+  int yl;
+  int yh;
+  int bx;
+  int by;
+  subsector_t *newsubsec;
+
+  tmthing = thing;
+  tmflags = thing->flags;
+
+  tmx = x;
+  tmy = y;
+
+  tmbbox[BOXTOP] = y + tmthing->radius;
+  tmbbox[BOXBOTTOM] = y - tmthing->radius;
+  tmbbox[BOXRIGHT] = x + tmthing->radius;
+  tmbbox[BOXLEFT] = x - tmthing->radius;
+
+  newsubsec = r_point_in_subsector(x, y);
+  ceilingline = NULL;
+
+  /* The base floor / ceiling is from the subsector
+   * that contains the point.
+   * Any contacted lines the step closer together
+   * will adjust them.
+   */
+
+  tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
+  tmceilingz = newsubsec->sector->ceilingheight;
+
+  validcount++;
+  numspechit = 0;
+
+  if (tmflags & MF_NOCLIP) return true;
+
+  /* Check things first, possibly picking things up.
+   * The bounding box is extended by MAXRADIUS
+   * because mobj_ts are grouped into mapblocks
+   * based on their origin point, and can overlap
+   * into adjacent blocks by up to MAXRADIUS units.
+   */
+
+  xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+  xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+  yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+  yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+
+  for (bx = xl; bx <= xh; bx++)
+    {
+      for (by = yl; by <= yh; by++)
+        {
+          if (!p_block_things_iterator(bx, by, pit_check_thing))
+            {
+              return false;
+            }
+        }
+    }
+
+  /* check lines */
+
+  xl = (tmbbox[BOXLEFT] - bmaporgx) >> MAPBLOCKSHIFT;
+  xh = (tmbbox[BOXRIGHT] - bmaporgx) >> MAPBLOCKSHIFT;
+  yl = (tmbbox[BOXBOTTOM] - bmaporgy) >> MAPBLOCKSHIFT;
+  yh = (tmbbox[BOXTOP] - bmaporgy) >> MAPBLOCKSHIFT;
+
+  for (bx = xl; bx <= xh; bx++)
+    {
+      for (by = yl; by <= yh; by++)
+        {
+          if (!p_block_lines_iterator(bx, by, pit_check_line))
+            {
+              return false;
+            }
+        }
+    }
+
+  return true;
+}
+
+/* p_try_move
+ * Attempt to move to a new position,
+ * crossing special lines unless MF_TELEPORT is set.
+ */
+
+boolean p_try_move(mobj_t *thing, fixed_t x, fixed_t y)
+{
+  fixed_t oldx;
+  fixed_t oldy;
+  int side;
+  int oldside;
+  line_t *ld;
+
+  floatok = false;
+  if (!p_check_position(thing, x, y))
+    {
+      return false; /* solid wall or thing */
+    }
+
+  if (!(thing->flags & MF_NOCLIP))
+    {
+      if (tmceilingz - tmfloorz < thing->height)
+        {
+          return false; /* doesn't fit */
+        }
+
+      floatok = true;
+
+      if (!(thing->flags & MF_TELEPORT) &&
+          tmceilingz - thing->z < thing->height)
+        {
+          return false; /* mobj must lower itself to fit */
+        }
+
+      if (!(thing->flags & MF_TELEPORT) &&
+          tmfloorz - thing->z > 24 * FRACUNIT)
+        {
+          return false; /* too big a step up */
+        }
+
+      if (!(thing->flags & (MF_DROPOFF | MF_FLOAT)) &&
+          tmfloorz - tmdropoffz > 24 * FRACUNIT)
+        {
+          return false; /* don't stand over a dropoff */
+        }
+    }
+
+  /* the move is ok,
+   * so link the thing into its new position
+   */
+
+  p_unset_thing_position(thing);
+
+  oldx = thing->x;
+  oldy = thing->y;
+  thing->floorz = tmfloorz;
+  thing->ceilingz = tmceilingz;
+  thing->x = x;
+  thing->y = y;
+
+  p_set_thing_position(thing);
+
+  /* if any special lines were hit, do the effect */
+
+  if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
+    {
+      while (numspechit--)
+        {
+          /* see if the line was crossed */
+
+          ld = spechit[numspechit];
+          side = p_point_on_line_side(thing->x, thing->y, ld);
+          oldside = p_point_on_line_side(oldx, oldy, ld);
+          if (side != oldside)
+            {
+              if (ld->special)
+                {
+                  p_cross_special_line(ld - lines, oldside, thing);
+                }
+            }
+        }
+    }
+
+  return true;
+}
+
+/* p_slide_move
+ * The momx / momy move is bad, so try to slide
+ * along a wall.
+ * Find the first line hit, move flush to it,
+ * and slide along it
+ *
+ * This is a kludgy mess.
+ */
+
+void p_slide_move(mobj_t *mo)
+{
+  fixed_t leadx;
+  fixed_t leady;
+  fixed_t trailx;
+  fixed_t traily;
+  fixed_t newx;
+  fixed_t newy;
+  int hitcount;
+
+  slidemo = mo;
+  hitcount = 0;
+
+retry:
+  if (++hitcount == 3) goto stairstep; /* don't loop forever */
+
+  /* trace along the three leading corners */
+
+  if (mo->momx > 0)
+    {
+      leadx = mo->x + mo->radius;
+      trailx = mo->x - mo->radius;
+    }
+  else
+    {
+      leadx = mo->x - mo->radius;
+      trailx = mo->x + mo->radius;
+    }
+
+  if (mo->momy > 0)
+    {
+      leady = mo->y + mo->radius;
+      traily = mo->y - mo->radius;
+    }
+  else
+    {
+      leady = mo->y - mo->radius;
+      traily = mo->y + mo->radius;
+    }
+
+  bestslidefrac = FRACUNIT + 1;
+
+  p_path_traverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
+                 PT_ADDLINES, ptr_slide_traverse);
+  p_path_traverse(trailx, leady, trailx + mo->momx, leady + mo->momy,
+                 PT_ADDLINES, ptr_slide_traverse);
+  p_path_traverse(leadx, traily, leadx + mo->momx, traily + mo->momy,
+                 PT_ADDLINES, ptr_slide_traverse);
+
+  /* move up to the wall */
+
+  if (bestslidefrac == FRACUNIT + 1)
+    {
+      /* the move most have hit the middle, so stairstep */
+
+    stairstep:
+      if (!p_try_move(mo, mo->x, mo->y + mo->momy))
+        p_try_move(mo, mo->x + mo->momx, mo->y);
+      return;
+    }
+
+  /* fudge a bit to make sure it doesn't hit */
+
+  bestslidefrac -= 0x800;
+  if (bestslidefrac > 0)
+    {
+      newx = fixed_mul(mo->momx, bestslidefrac);
+      newy = fixed_mul(mo->momy, bestslidefrac);
+
+      if (!p_try_move(mo, mo->x + newx, mo->y + newy)) goto stairstep;
+    }
+
+  /* Now continue along the wall.
+   * First calculate remainder.
+   */
+
+  bestslidefrac = FRACUNIT - (bestslidefrac + 0x800);
+
+  if (bestslidefrac > FRACUNIT) bestslidefrac = FRACUNIT;
+
+  if (bestslidefrac <= 0) return;
+
+  tmxmove = fixed_mul(mo->momx, bestslidefrac);
+  tmymove = fixed_mul(mo->momy, bestslidefrac);
+
+  p_hit_slide_line(bestslideline); /* clip the moves */
+
+  mo->momx = tmxmove;
+  mo->momy = tmymove;
+
+  if (!p_try_move(mo, mo->x + tmxmove, mo->y + tmymove))
+    {
+      goto retry;
     }
 }
 
+/* p_aim_line_attack */
+
+fixed_t p_aim_line_attack(mobj_t *t1, angle_t angle, fixed_t distance)
+{
+  fixed_t x2;
+  fixed_t y2;
+
+  t1 = p_subst_null_mobj(t1);
+
+  angle >>= ANGLETOFINESHIFT;
+  shootthing = t1;
+
+  x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
+  y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
+  shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
+
+  /* can't shoot outside view angles */
+
+  topslope = (SCREENHEIGHT / 2) * FRACUNIT / (SCREENWIDTH / 2);
+  bottomslope = -(SCREENHEIGHT / 2) * FRACUNIT / (SCREENWIDTH / 2);
+
+  attackrange = distance;
+  linetarget = NULL;
+
+  p_path_traverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                 ptr_aim_traverse);
+
+  if (linetarget) return aimslope;
+
+  return 0;
+}
+
+/* p_line_attack
+ *
+ * If damage == 0, it is just a test trace that will leave linetarget set.
+ */
+
+void p_line_attack(mobj_t *t1, angle_t angle, fixed_t distance,
+        fixed_t slope, int damage)
+{
+  fixed_t x2;
+  fixed_t y2;
+
+  angle >>= ANGLETOFINESHIFT;
+  shootthing = t1;
+  la_damage = damage;
+  x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
+  y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
+  shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
+  attackrange = distance;
+  aimslope = slope;
+
+  p_path_traverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
+                 ptr_shoot_traverse);
+}
+
+/* p_use_lines
+ * Looks for special lines in front of the player to activate.
+ */
+
+void p_use_lines(player_t *player)
+{
+  int angle;
+  fixed_t x1;
+  fixed_t y1;
+  fixed_t x2;
+  fixed_t y2;
+
+  usething = player->mo;
+
+  angle = player->mo->angle >> ANGLETOFINESHIFT;
+
+  x1 = player->mo->x;
+  y1 = player->mo->y;
+  x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
+  y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
+
+  p_path_traverse(x1, y1, x2, y2, PT_ADDLINES, ptr_use_traverse);
+}
+
+/* p_radius_attack
+ * Source is the creature that caused the explosion at spot.
+ */
+
+void p_radius_attack(mobj_t *spot, mobj_t *source, int damage)
+{
+  int x;
+  int y;
+
+  int xl;
+  int xh;
+  int yl;
+  int yh;
+
+  fixed_t dist;
+
+  dist = (damage + MAXRADIUS) << FRACBITS;
+  yh = (spot->y + dist - bmaporgy) >> MAPBLOCKSHIFT;
+  yl = (spot->y - dist - bmaporgy) >> MAPBLOCKSHIFT;
+  xh = (spot->x + dist - bmaporgx) >> MAPBLOCKSHIFT;
+  xl = (spot->x - dist - bmaporgx) >> MAPBLOCKSHIFT;
+  bombspot = spot;
+  bombsource = source;
+  bombdamage = damage;
+
+  for (y = yl; y <= yh; y++)
+    {
+      for (x = xl; x <= xh; x++)
+        {
+          p_block_things_iterator(x, y, pit_radius_attack);
+        }
+    }
+}
+
+/* pit_change_sector */
+
+static boolean pit_change_sector(mobj_t *thing)
+{
+  mobj_t *mo;
+
+  if (p_things_height_clip(thing))
+    {
+      return true; /* keep checking */
+    }
+
+  /* crunch bodies to giblets */
+
+  if (thing->health <= 0)
+    {
+      p_set_mobj_state(thing, S_GIBS);
+
+      if (gameversion > exe_doom_1_2) thing->flags &= ~MF_SOLID;
+      thing->height = 0;
+      thing->radius = 0;
+
+      /* keep checking */
+
+      return true;
+    }
+
+  /* crunch dropped items */
+
+  if (thing->flags & MF_DROPPED)
+    {
+      p_remove_mobj(thing);
+
+      return true; /* keep checking */
+    }
+
+  if (!(thing->flags & MF_SHOOTABLE))
+    {
+      return true; /* assume it is bloody gibs or something */
+    }
+
+  nofit = true;
+
+  if (crushchange && !(leveltime & 3))
+    {
+      p_damage_mobj(thing, NULL, NULL, 10);
+
+      /* spray blood in a random direction */
+
+      mo = p_spawn_mobj(thing->x, thing->y, thing->z + thing->height / 2,
+                       MT_BLOOD);
+
+      mo->momx = p_sub_random() << 12;
+      mo->momy = p_sub_random() << 12;
+    }
+
+  /* keep checking (crush other things) */
+
+  return true;
+}
+
+/* p_change_sector */
+
+boolean p_change_sector(sector_t *sector, boolean crunch)
+{
+  int x;
+  int y;
+
+  nofit = false;
+  crushchange = crunch;
+
+  /* re-check heights for all things near the moving sector */
+
+  for (x = sector->blockbox[BOXLEFT]; x <= sector->blockbox[BOXRIGHT]; x++)
+    {
+      for (y = sector->blockbox[BOXBOTTOM]; y <= sector->blockbox[BOXTOP];
+           y++)
+        {
+          p_block_things_iterator(x, y, pit_change_sector);
+        }
+    }
+
+  return nofit;
+}
diff --git a/games/NXDoom/src/doom/p_maputl.c b/games/NXDoom/src/doom/p_maputl.c
index cb74c942f..f5c193274 100644
--- a/games/NXDoom/src/doom/p_maputl.c
+++ b/games/NXDoom/src/doom/p_maputl.c
@@ -1,30 +1,36 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2005, 2006 Andrey Budko
-//
-// 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.
-//
-// DESCRIPTION:
-//	Movement/collision utility functions,
-//	as used by function in p_map.c. 
-//	BLOCKMAP Iterator functions,
-//	and some PIT_* functions to use for iteration.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_maputl.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ * Copyright(C) 2005, 2006 Andrey Budko
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Movement/collision utility functions,
+ *  as used by function in p_map.c.
+ *  BLOCKMAP Iterator functions,
+ *  and some PIT_* functions to use for iteration.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 
-
 #include "m_bbox.h"
 #include "m_misc.h"
 
@@ -32,971 +38,902 @@
 #include "doomstat.h"
 #include "p_local.h"
 
+/* State. */
 
-// State.
 #include "r_state.h"
 
-//
-// P_AproxDistance
-// Gives an estimation of distance (not exact)
-//
-
-fixed_t
-P_AproxDistance
-( fixed_t	dx,
-  fixed_t	dy )
-{
-    dx = abs(dx);
-    dy = abs(dy);
-    if (dx < dy)
-	return dx+dy-(dx>>1);
-    return dx+dy-(dy>>1);
-}
-
-
-//
-// P_PointOnLineSide
-// Returns 0 or 1
-//
-int
-P_PointOnLineSide
-( fixed_t	x,
-  fixed_t	y,
-  line_t*	line )
-{
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
-	
-    if (!line->dx)
-    {
-	if (x <= line->v1->x)
-	    return line->dy > 0;
-	
-	return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-	if (y <= line->v1->y)
-	    return line->dx < 0;
-	
-	return line->dx > 0;
-    }
-	
-    dx = (x - line->v1->x);
-    dy = (y - line->v1->y);
-	
-    left = FixedMul ( line->dy>>FRACBITS , dx );
-    right = FixedMul ( dy , line->dx>>FRACBITS );
-	
-    if (right < left)
-	return 0;		// front side
-    return 1;			// back side
-}
-
-
-
-//
-// P_BoxOnLineSide
-// Considers the line to be infinite
-// Returns side 0 or 1, -1 if box crosses the line.
-//
-int
-P_BoxOnLineSide
-( fixed_t*	tmbox,
-  line_t*	ld )
-{
-    int		p1 = 0;
-    int		p2 = 0;
-	
-    switch (ld->slopetype)
-    {
-      case ST_HORIZONTAL:
-	p1 = tmbox[BOXTOP] > ld->v1->y;
-	p2 = tmbox[BOXBOTTOM] > ld->v1->y;
-	if (ld->dx < 0)
-	{
-	    p1 ^= 1;
-	    p2 ^= 1;
-	}
-	break;
-	
-      case ST_VERTICAL:
-	p1 = tmbox[BOXRIGHT] < ld->v1->x;
-	p2 = tmbox[BOXLEFT] < ld->v1->x;
-	if (ld->dy < 0)
-	{
-	    p1 ^= 1;
-	    p2 ^= 1;
-	}
-	break;
-	
-      case ST_POSITIVE:
-	p1 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXTOP], ld);
-	p2 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
-	break;
-	
-      case ST_NEGATIVE:
-	p1 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
-	p2 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
-	break;
-    }
-
-    if (p1 == p2)
-	return p1;
-    return -1;
-}
-
-
-//
-// P_PointOnDivlineSide
-// Returns 0 or 1.
-//
-int
-P_PointOnDivlineSide
-( fixed_t	x,
-  fixed_t	y,
-  divline_t*	line )
-{
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
-	
-    if (!line->dx)
-    {
-	if (x <= line->x)
-	    return line->dy > 0;
-	
-	return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-	if (y <= line->y)
-	    return line->dx < 0;
-
-	return line->dx > 0;
-    }
-	
-    dx = (x - line->x);
-    dy = (y - line->y);
-	
-    // try to quickly decide by looking at sign bits
-    if ( (line->dy ^ line->dx ^ dx ^ dy)&0x80000000 )
-    {
-	if ( (line->dy ^ dx) & 0x80000000 )
-	    return 1;		// (left is negative)
-	return 0;
-    }
-	
-    left = FixedMul ( line->dy>>8, dx>>8 );
-    right = FixedMul ( dy>>8 , line->dx>>8 );
-	
-    if (right < left)
-	return 0;		// front side
-    return 1;			// back side
-}
-
-
-
-//
-// P_MakeDivline
-//
-void
-P_MakeDivline
-( line_t*	li,
-  divline_t*	dl )
-{
-    dl->x = li->v1->x;
-    dl->y = li->v1->y;
-    dl->dx = li->dx;
-    dl->dy = li->dy;
-}
-
-
-
-//
-// P_InterceptVector
-// Returns the fractional intercept point
-// along the first divline.
-// This is only called by the addthings
-// and addlines traversers.
-//
-fixed_t
-P_InterceptVector
-( divline_t*	v2,
-  divline_t*	v1 )
-{
-#if 1
-    fixed_t	frac;
-    fixed_t	num;
-    fixed_t	den;
-	
-    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
-
-    if (den == 0)
-	return 0;
-    //	I_Error ("P_InterceptVector: parallel");
-    
-    num =
-	FixedMul ( (v1->x - v2->x)>>8 ,v1->dy )
-	+FixedMul ( (v2->y - v1->y)>>8, v1->dx );
-
-    frac = FixedDiv (num , den);
-
-    return frac;
-#else	// UNUSED, float debug.
-    float	frac;
-    float	num;
-    float	den;
-    float	v1x;
-    float	v1y;
-    float	v1dx;
-    float	v1dy;
-    float	v2x;
-    float	v2y;
-    float	v2dx;
-    float	v2dy;
-
-    v1x = (float)v1->x/FRACUNIT;
-    v1y = (float)v1->y/FRACUNIT;
-    v1dx = (float)v1->dx/FRACUNIT;
-    v1dy = (float)v1->dy/FRACUNIT;
-    v2x = (float)v2->x/FRACUNIT;
-    v2y = (float)v2->y/FRACUNIT;
-    v2dx = (float)v2->dx/FRACUNIT;
-    v2dy = (float)v2->dy/FRACUNIT;
-	
-    den = v1dy*v2dx - v1dx*v2dy;
-
-    if (den == 0)
-	return 0;	// parallel
-    
-    num = (v1x - v2x)*v1dy + (v2y - v1y)*v1dx;
-    frac = num / den;
-
-    return frac*FRACUNIT;
-#endif
-}
-
-
-//
-// P_LineOpening
-// Sets opentop and openbottom to the window
-// through a two sided line.
-// OPTIMIZE: keep this precalculated
-//
-fixed_t opentop;
-fixed_t openbottom;
-fixed_t openrange;
-fixed_t	lowfloor;
-
-
-void P_LineOpening (line_t* linedef)
-{
-    sector_t*	front;
-    sector_t*	back;
-	
-    if (linedef->sidenum[1] == -1)
-    {
-	// single sided line
-	openrange = 0;
-	return;
-    }
-	 
-    front = linedef->frontsector;
-    back = linedef->backsector;
-	
-    if (front->ceilingheight < back->ceilingheight)
-	opentop = front->ceilingheight;
-    else
-	opentop = back->ceilingheight;
-
-    if (front->floorheight > back->floorheight)
-    {
-	openbottom = front->floorheight;
-	lowfloor = back->floorheight;
-    }
-    else
-    {
-	openbottom = back->floorheight;
-	lowfloor = front->floorheight;
-    }
-	
-    openrange = opentop - openbottom;
-}
-
-
-//
-// THING POSITION SETTING
-//
-
-
-//
-// P_UnsetThingPosition
-// Unlinks a thing from block map and sectors.
-// On each position change, BLOCKMAP and other
-// lookups maintaining lists ot things inside
-// these structures need to be updated.
-//
-void P_UnsetThingPosition (mobj_t* thing)
-{
-    int		blockx;
-    int		blocky;
-
-    if ( ! (thing->flags & MF_NOSECTOR) )
-    {
-	// inert things don't need to be in blockmap?
-	// unlink from subsector
-	if (thing->snext)
-	    thing->snext->sprev = thing->sprev;
-
-	if (thing->sprev)
-	    thing->sprev->snext = thing->snext;
-	else
-	    thing->subsector->sector->thinglist = thing->snext;
-    }
-	
-    if ( ! (thing->flags & MF_NOBLOCKMAP) )
-    {
-	// inert things don't need to be in blockmap
-	// unlink from block map
-	if (thing->bnext)
-	    thing->bnext->bprev = thing->bprev;
-	
-	if (thing->bprev)
-	    thing->bprev->bnext = thing->bnext;
-	else
-	{
-	    blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
-	    blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
-
-	    if (blockx>=0 && blockx < bmapwidth
-		&& blocky>=0 && blocky <bmapheight)
-	    {
-		blocklinks[blocky*bmapwidth+blockx] = thing->bnext;
-	    }
-	}
-    }
-}
-
-
-//
-// P_SetThingPosition
-// Links a thing into both a block and a subsector
-// based on it's x y.
-// Sets thing->subsector properly
-//
-void
-P_SetThingPosition (mobj_t* thing)
-{
-    subsector_t*	ss;
-    sector_t*		sec;
-    int			blockx;
-    int			blocky;
-    mobj_t**		link;
-
-    
-    // link into subsector
-    ss = R_PointInSubsector (thing->x,thing->y);
-    thing->subsector = ss;
-    
-    if ( ! (thing->flags & MF_NOSECTOR) )
-    {
-	// invisible things don't go into the sector links
-	sec = ss->sector;
-	
-	thing->sprev = NULL;
-	thing->snext = sec->thinglist;
-
-	if (sec->thinglist)
-	    sec->thinglist->sprev = thing;
-
-	sec->thinglist = thing;
-    }
-
-    
-    // link into blockmap
-    if ( ! (thing->flags & MF_NOBLOCKMAP) )
-    {
-	// inert things don't need to be in blockmap		
-	blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
-	blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
-
-	if (blockx>=0
-	    && blockx < bmapwidth
-	    && blocky>=0
-	    && blocky < bmapheight)
-	{
-	    link = &blocklinks[blocky*bmapwidth+blockx];
-	    thing->bprev = NULL;
-	    thing->bnext = *link;
-	    if (*link)
-		(*link)->bprev = thing;
-
-	    *link = thing;
-	}
-	else
-	{
-	    // thing is off the map
-	    thing->bnext = thing->bprev = NULL;
-	}
-    }
-}
-
-
-
-//
-// BLOCK MAP ITERATORS
-// For each line/thing in the given mapblock,
-// call the passed PIT_* function.
-// If the function returns false,
-// exit with false without checking anything else.
-//
-
-
-//
-// P_BlockLinesIterator
-// The validcount flags are used to avoid checking lines
-// that are marked in multiple mapblocks,
-// so increment validcount before the first call
-// to P_BlockLinesIterator, then make one or more calls
-// to it.
-//
-boolean
-P_BlockLinesIterator
-( int			x,
-  int			y,
-  boolean(*func)(line_t*) )
-{
-    int			offset;
-    short*		list;
-    line_t*		ld;
-	
-    if (x<0
-	|| y<0
-	|| x>=bmapwidth
-	|| y>=bmapheight)
-    {
-	return true;
-    }
-    
-    offset = y*bmapwidth+x;
-	
-    offset = *(blockmap+offset);
-
-    for ( list = blockmaplump+offset ; *list != -1 ; list++)
-    {
-	ld = &lines[*list];
-
-	if (ld->validcount == validcount)
-	    continue; 	// line has already been checked
-
-	ld->validcount = validcount;
-		
-	if ( !func(ld) )
-	    return false;
-    }
-    return true;	// everything was checked
-}
-
-
-//
-// P_BlockThingsIterator
-//
-boolean
-P_BlockThingsIterator
-( int                   x,
-  int                   y,
-  boolean(*func)(mobj_t*) )
-{
-    mobj_t*             mobj;
-
-    if ( x<0
-         || y<0
-         || x>=bmapwidth
-         || y>=bmapheight)
-    {
-        return true;
-    }
-
-    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
-
-    for (mobj = blocklinks[y*bmapwidth+x] ;
-         mobj ;
-         mobj = mobj->bnext)
-    {
-        if (!func( mobj ) )
-            return false;
-    }
-    return true;
-}
-
-
-
-//
-// INTERCEPT ROUTINES
-//
-intercept_t	intercepts[MAXINTERCEPTS];
-intercept_t*	intercept_p;
-
-divline_t 	trace;
-boolean 	earlyout;
-int		ptflags;
-
-static void InterceptsOverrun(int num_intercepts, intercept_t *intercept);
-
-//
-// PIT_AddLineIntercepts.
-// Looks for lines in the given block
-// that intercept the given trace
-// to add to the intercepts list.
-//
-// A line is crossed if its endpoints
-// are on opposite sides of the trace.
-// Returns true if earlyout and a solid line hit.
-//
-boolean
-PIT_AddLineIntercepts (line_t* ld)
-{
-    int			s1;
-    int			s2;
-    fixed_t		frac;
-    divline_t		dl;
-	
-    // avoid precision problems with two routines
-    if ( trace.dx > FRACUNIT*16
-	 || trace.dy > FRACUNIT*16
-	 || trace.dx < -FRACUNIT*16
-	 || trace.dy < -FRACUNIT*16)
-    {
-	s1 = P_PointOnDivlineSide (ld->v1->x, ld->v1->y, &trace);
-	s2 = P_PointOnDivlineSide (ld->v2->x, ld->v2->y, &trace);
-    }
-    else
-    {
-	s1 = P_PointOnLineSide (trace.x, trace.y, ld);
-	s2 = P_PointOnLineSide (trace.x+trace.dx, trace.y+trace.dy, ld);
-    }
-    
-    if (s1 == s2)
-	return true;	// line isn't crossed
-    
-    // hit the line
-    P_MakeDivline (ld, &dl);
-    frac = P_InterceptVector (&trace, &dl);
-
-    if (frac < 0)
-	return true;	// behind source
-	
-    // try to early out the check
-    if (earlyout
-	&& frac < FRACUNIT
-	&& !ld->backsector)
-    {
-	return false;	// stop checking
-    }
-    
-	
-    intercept_p->frac = frac;
-    intercept_p->isaline = true;
-    intercept_p->d.line = ld;
-    InterceptsOverrun(intercept_p - intercepts, intercept_p);
-    intercept_p++;
-
-    return true;	// continue
-}
-
-
-
-//
-// PIT_AddThingIntercepts
-//
-boolean PIT_AddThingIntercepts (mobj_t* thing)
-{
-    fixed_t		x1;
-    fixed_t		y1;
-    fixed_t		x2;
-    fixed_t		y2;
-    
-    int			s1;
-    int			s2;
-    
-    boolean		tracepositive;
-
-    divline_t		dl;
-    
-    fixed_t		frac;
-	
-    tracepositive = (trace.dx ^ trace.dy)>0;
-		
-    // check a corner to corner crossection for hit
-    if (tracepositive)
-    {
-	x1 = thing->x - thing->radius;
-	y1 = thing->y + thing->radius;
-		
-	x2 = thing->x + thing->radius;
-	y2 = thing->y - thing->radius;			
-    }
-    else
-    {
-	x1 = thing->x - thing->radius;
-	y1 = thing->y - thing->radius;
-		
-	x2 = thing->x + thing->radius;
-	y2 = thing->y + thing->radius;			
-    }
-    
-    s1 = P_PointOnDivlineSide (x1, y1, &trace);
-    s2 = P_PointOnDivlineSide (x2, y2, &trace);
-
-    if (s1 == s2)
-	return true;		// line isn't crossed
-	
-    dl.x = x1;
-    dl.y = y1;
-    dl.dx = x2-x1;
-    dl.dy = y2-y1;
-    
-    frac = P_InterceptVector (&trace, &dl);
-
-    if (frac < 0)
-	return true;		// behind source
-
-    intercept_p->frac = frac;
-    intercept_p->isaline = false;
-    intercept_p->d.thing = thing;
-    InterceptsOverrun(intercept_p - intercepts, intercept_p);
-    intercept_p++;
-
-    return true;		// keep going
-}
-
-
-//
-// P_TraverseIntercepts
-// Returns true if the traverser function returns true
-// for all lines.
-// 
-boolean
-P_TraverseIntercepts
-( traverser_t	func,
-  fixed_t	maxfrac )
-{
-    int			count;
-    fixed_t		dist;
-    intercept_t*	scan;
-    intercept_t*	in;
-	
-    count = intercept_p - intercepts;
-    
-    in = 0;			// shut up compiler warning
-	
-    while (count--)
-    {
-	dist = INT_MAX;
-	for (scan = intercepts ; scan<intercept_p ; scan++)
-	{
-	    if (scan->frac < dist)
-	    {
-		dist = scan->frac;
-		in = scan;
-	    }
-	}
-	
-	if (dist > maxfrac)
-	    return true;	// checked everything in range		
-
-#if 0  // UNUSED
-    {
-	// don't check these yet, there may be others inserted
-	in = scan = intercepts;
-	for ( scan = intercepts ; scan<intercept_p ; scan++)
-	    if (scan->frac > maxfrac)
-		*in++ = *scan;
-	intercept_p = in;
-	return false;
-    }
-#endif
-
-        if ( !func (in) )
-	    return false;	// don't bother going farther
-
-	in->frac = INT_MAX;
-    }
-	
-    return true;		// everything was traversed
-}
-
-
-// Intercepts Overrun emulation, from PrBoom-plus.
-// Thanks to Andrey Budko (entryway) for researching this and his 
-// implementation of Intercepts Overrun emulation in PrBoom-plus
-// which this is based on.
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Intercepts Overrun emulation, from PrBoom-plus.
+ * Thanks to Andrey Budko (entryway) for researching this and his
+ * implementation of Intercepts Overrun emulation in PrBoom-plus
+ * which this is based on.
+ */
 
 typedef struct
 {
-    int len;
-    void *addr;
-    boolean int16_array;
+  int len;
+  void *addr;
+  boolean int16_array;
 } intercepts_overrun_t;
 
-// Intercepts memory table.  This is where various variables are located
-// in memory in Vanilla Doom.  When the intercepts table overflows, we
-// need to write to them.
-//
-// Almost all of the values to overwrite are 32-bit integers, except for
-// playerstarts, which is effectively an array of 16-bit integers and
-// must be treated differently.
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-static intercepts_overrun_t intercepts_overrun[] =
+fixed_t p_intercept_vector(divline_t *v2, divline_t *v1);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Intercepts memory table.  This is where various variables are located
+ * in memory in Vanilla Doom.  When the intercepts table overflows, we
+ * need to write to them.
+ *
+ * Almost all of the values to overwrite are 32-bit integers, except for
+ * playerstarts, which is effectively an array of 16-bit integers and
+ * must be treated differently.
+ */
+
+static intercepts_overrun_t g_intercepts_overrun[] =
 {
-    {4,   NULL,                          false},
-    {4,   NULL, /* &earlyout, */         false},
-    {4,   NULL, /* &intercept_p, */      false},
-    {4,   &lowfloor,                     false},
-    {4,   &openbottom,                   false},
-    {4,   &opentop,                      false},
-    {4,   &openrange,                    false},
-    {4,   NULL,                          false},
-    {120, NULL, /* &activeplats, */      false},
-    {8,   NULL,                          false},
-    {4,   &bulletslope,                  false},
-    {4,   NULL, /* &swingx, */           false},
-    {4,   NULL, /* &swingy, */           false},
-    {4,   NULL,                          false},
-    {40,  &playerstarts,                 true},
-    {4,   NULL, /* &blocklinks, */       false},
-    {4,   &bmapwidth,                    false},
-    {4,   NULL, /* &blockmap, */         false},
-    {4,   &bmaporgx,                     false},
-    {4,   &bmaporgy,                     false},
-    {4,   NULL, /* &blockmaplump, */     false},
-    {4,   &bmapheight,                   false},
-    {0,   NULL,                          false},
+  {4, NULL, false},
+  {4, NULL, /* &earlyout, */ false},
+  {4, NULL, /* &intercept_p, */ false},
+  {4, &lowfloor, false},
+  {4, &openbottom, false},
+  {4, &opentop, false},
+  {4, &openrange, false},
+  {4, NULL, false},
+  {120, NULL, /* &activeplats, */ false},
+  {8, NULL, false},
+  {4, &bulletslope, false},
+  {4, NULL, /* &swingx, */ false},
+  {4, NULL, /* &swingy, */ false},
+  {4, NULL, false},
+  {40, &playerstarts, true},
+  {4, NULL, /* &blocklinks, */ false},
+  {4, &bmapwidth, false},
+  {4, NULL, /* &blockmap, */ false},
+  {4, &bmaporgx, false},
+  {4, &bmaporgy, false},
+  {4, NULL, /* &blockmaplump, */ false},
+  {4, &bmapheight, false},
+  {0, NULL, false},
 };
 
-// Overwrite a specific memory location with a value.
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-static void InterceptsMemoryOverrun(int location, int value)
+fixed_t opentop;
+fixed_t openbottom;
+fixed_t openrange;
+fixed_t lowfloor;
+
+/* INTERCEPT ROUTINES */
+
+intercept_t intercepts[MAXINTERCEPTS];
+intercept_t *intercept_p;
+
+divline_t trace;
+boolean earlyout;
+int ptflags;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void p_make_divline(line_t *li, divline_t *dl)
 {
-    int i, offset;
-    int index;
-    void *addr;
+  dl->x = li->v1->x;
+  dl->y = li->v1->y;
+  dl->dx = li->dx;
+  dl->dy = li->dy;
+}
 
-    i = 0;
-    offset = 0;
+/* Overwrite a specific memory location with a value. */
 
-    // Search down the array until we find the right entry
+static void intercepts_mem_overrun(int location, int value)
+{
+  int i;
+  int offset;
+  int index;
+  void *addr;
 
-    while (intercepts_overrun[i].len != 0)
+  i = 0;
+  offset = 0;
+
+  /* Search down the array until we find the right entry */
+
+  while (g_intercepts_overrun[i].len != 0)
     {
-        if (offset + intercepts_overrun[i].len > location)
+      if (offset + g_intercepts_overrun[i].len > location)
         {
-            addr = intercepts_overrun[i].addr;
+          addr = g_intercepts_overrun[i].addr;
 
-            // Write the value to the memory location.
-            // 16-bit and 32-bit values are written differently.
+          /* Write the value to the memory location.
+           * 16-bit and 32-bit values are written differently.
+           */
 
-            if (addr != NULL)
+          if (addr != NULL)
             {
-                if (intercepts_overrun[i].int16_array)
+              if (g_intercepts_overrun[i].int16_array)
                 {
-                    index = (location - offset) / 2;
-                    ((short *) addr)[index] = value & 0xffff;
-                    ((short *) addr)[index + 1] = (value >> 16) & 0xffff;
+                  index = (location - offset) / 2;
+                  ((short *)addr)[index] = value & 0xffff;
+                  ((short *)addr)[index + 1] = (value >> 16) & 0xffff;
                 }
-                else
+              else
                 {
-                    index = (location - offset) / 4;
-                    ((int *) addr)[index] = value;
+                  index = (location - offset) / 4;
+                  ((int *)addr)[index] = value;
                 }
             }
 
-            break;
+          break;
         }
 
-        offset += intercepts_overrun[i].len;
-        ++i;
+      offset += g_intercepts_overrun[i].len;
+      ++i;
     }
 }
 
-// Emulate overruns of the intercepts[] array.
+/* Emulate overruns of the intercepts[] array. */
 
-static void InterceptsOverrun(int num_intercepts, intercept_t *intercept)
+static void intercepts_overrun(int num_intercepts, intercept_t *intercept)
 {
-    int location;
+  int location;
 
-    if (num_intercepts <= MAXINTERCEPTS_ORIGINAL)
+  if (num_intercepts <= MAXINTERCEPTS_ORIGINAL)
     {
-        // No overrun
-
-        return;
+      return; /* No overrun */
     }
 
-    location = (num_intercepts - MAXINTERCEPTS_ORIGINAL - 1) * 12;
+  location = (num_intercepts - MAXINTERCEPTS_ORIGINAL - 1) * 12;
 
-    // Overwrite memory that is overwritten in Vanilla Doom, using
-    // the values from the intercept structure.
-    //
-    // Note: the ->d.{thing,line} member should really have its
-    // address translated into the correct address value for 
-    // Vanilla Doom.
+  /* Overwrite memory that is overwritten in Vanilla Doom, using
+   * the values from the intercept structure.
+   *
+   * Note: the ->d.{thing,line} member should really have its
+   * address translated into the correct address value for
+   * Vanilla Doom.
+   */
 
-    InterceptsMemoryOverrun(location, intercept->frac);
-    InterceptsMemoryOverrun(location + 4, intercept->isaline);
-    InterceptsMemoryOverrun(location + 8, (intptr_t) intercept->d.thing);
+  intercepts_mem_overrun(location, intercept->frac);
+  intercepts_mem_overrun(location + 4, intercept->isaline);
+  intercepts_mem_overrun(location + 8, (intptr_t)intercept->d.thing);
 }
 
+/* pit_add_line_intercepts.
+ * Looks for lines in the given block
+ * that intercept the given trace
+ * to add to the intercepts list.
+ *
+ * A line is crossed if its endpoints
+ * are on opposite sides of the trace.
+ * Returns true if earlyout and a solid line hit.
+ */
 
-//
-// P_PathTraverse
-// Traces a line from x1,y1 to x2,y2,
-// calling the traverser function for each.
-// Returns true if the traverser function returns true
-// for all lines.
-//
-boolean
-P_PathTraverse
-( fixed_t		x1,
-  fixed_t		y1,
-  fixed_t		x2,
-  fixed_t		y2,
-  int			flags,
-  boolean (*trav) (intercept_t *))
+static boolean pit_add_line_intercepts(line_t *ld)
 {
-    fixed_t	xt1;
-    fixed_t	yt1;
-    fixed_t	xt2;
-    fixed_t	yt2;
-    
-    fixed_t	xstep;
-    fixed_t	ystep;
-    
-    fixed_t	partial;
-    
-    fixed_t	xintercept;
-    fixed_t	yintercept;
-    
-    int		mapx;
-    int		mapy;
-    
-    int		mapxstep;
-    int		mapystep;
+  int s1;
+  int s2;
+  fixed_t frac;
+  divline_t dl;
 
-    int		count;
-		
-    earlyout = (flags & PT_EARLYOUT) != 0;
-		
-    validcount++;
-    intercept_p = intercepts;
-	
-    if ( ((x1-bmaporgx)&(MAPBLOCKSIZE-1)) == 0)
-	x1 += FRACUNIT;	// don't side exactly on a line
-    
-    if ( ((y1-bmaporgy)&(MAPBLOCKSIZE-1)) == 0)
-	y1 += FRACUNIT;	// don't side exactly on a line
+  /* avoid precision problems with two routines */
 
-    trace.x = x1;
-    trace.y = y1;
-    trace.dx = x2 - x1;
-    trace.dy = y2 - y1;
-
-    x1 -= bmaporgx;
-    y1 -= bmaporgy;
-    xt1 = x1>>MAPBLOCKSHIFT;
-    yt1 = y1>>MAPBLOCKSHIFT;
-
-    x2 -= bmaporgx;
-    y2 -= bmaporgy;
-    xt2 = x2>>MAPBLOCKSHIFT;
-    yt2 = y2>>MAPBLOCKSHIFT;
-
-    if (xt2 > xt1)
+  if (trace.dx > FRACUNIT * 16 || trace.dy > FRACUNIT * 16 ||
+      trace.dx < -FRACUNIT * 16 || trace.dy < -FRACUNIT * 16)
     {
-	mapxstep = 1;
-	partial = FRACUNIT - ((x1>>MAPBTOFRAC)&(FRACUNIT-1));
-	ystep = FixedDiv (y2-y1,abs(x2-x1));
+      s1 = p_point_on_divline_side(ld->v1->x, ld->v1->y, &trace);
+      s2 = p_point_on_divline_side(ld->v2->x, ld->v2->y, &trace);
     }
-    else if (xt2 < xt1)
+  else
     {
-	mapxstep = -1;
-	partial = (x1>>MAPBTOFRAC)&(FRACUNIT-1);
-	ystep = FixedDiv (y2-y1,abs(x2-x1));
+      s1 = p_point_on_line_side(trace.x, trace.y, ld);
+      s2 = p_point_on_line_side(trace.x + trace.dx, trace.y + trace.dy, ld);
     }
-    else
-    {
-	mapxstep = 0;
-	partial = FRACUNIT;
-	ystep = 256*FRACUNIT;
-    }	
 
-    yintercept = (y1>>MAPBTOFRAC) + FixedMul (partial, ystep);
+  if (s1 == s2) return true; /* line isn't crossed */
 
-	
-    if (yt2 > yt1)
+  /* hit the line */
+
+  p_make_divline(ld, &dl);
+  frac = p_intercept_vector(&trace, &dl);
+
+  if (frac < 0) return true; /* behind source */
+
+  /* try to early out the check */
+
+  if (earlyout && frac < FRACUNIT && !ld->backsector)
     {
-	mapystep = 1;
-	partial = FRACUNIT - ((y1>>MAPBTOFRAC)&(FRACUNIT-1));
-	xstep = FixedDiv (x2-x1,abs(y2-y1));
+      return false; /* stop checking */
     }
-    else if (yt2 < yt1)
-    {
-	mapystep = -1;
-	partial = (y1>>MAPBTOFRAC)&(FRACUNIT-1);
-	xstep = FixedDiv (x2-x1,abs(y2-y1));
-    }
-    else
-    {
-	mapystep = 0;
-	partial = FRACUNIT;
-	xstep = 256*FRACUNIT;
-    }	
-    xintercept = (x1>>MAPBTOFRAC) + FixedMul (partial, xstep);
-    
-    // Step through map blocks.
-    // Count is present to prevent a round off error
-    // from skipping the break.
-    mapx = xt1;
-    mapy = yt1;
-	
-    for (count = 0 ; count < 64 ; count++)
-    {
-	if (flags & PT_ADDLINES)
-	{
-	    if (!P_BlockLinesIterator (mapx, mapy,PIT_AddLineIntercepts))
-		return false;	// early out
-	}
-	
-	if (flags & PT_ADDTHINGS)
-	{
-	    if (!P_BlockThingsIterator (mapx, mapy,PIT_AddThingIntercepts))
-		return false;	// early out
-	}
-		
-	if (mapx == xt2
-	    && mapy == yt2)
-	{
-	    break;
-	}
-	
-	if ( (yintercept >> FRACBITS) == mapy)
-	{
-	    yintercept += ystep;
-	    mapx += mapxstep;
-	}
-	else if ( (xintercept >> FRACBITS) == mapx)
-	{
-	    xintercept += xstep;
-	    mapy += mapystep;
-	}
-		
-    }
-    // go through the sorted list
-    return P_TraverseIntercepts ( trav, FRACUNIT );
+
+  intercept_p->frac = frac;
+  intercept_p->isaline = true;
+  intercept_p->d.line = ld;
+  intercepts_overrun(intercept_p - intercepts, intercept_p);
+  intercept_p++;
+
+  return true; /* continue */
 }
 
+static boolean pit_add_thing_intercepts(mobj_t *thing)
+{
+  fixed_t x1;
+  fixed_t y1;
+  fixed_t x2;
+  fixed_t y2;
 
+  int s1;
+  int s2;
 
+  boolean tracepositive;
+
+  divline_t dl;
+
+  fixed_t frac;
+
+  tracepositive = (trace.dx ^ trace.dy) > 0;
+
+  /* check a corner to corner cross-section for hit */
+
+  if (tracepositive)
+    {
+      x1 = thing->x - thing->radius;
+      y1 = thing->y + thing->radius;
+
+      x2 = thing->x + thing->radius;
+      y2 = thing->y - thing->radius;
+    }
+  else
+    {
+      x1 = thing->x - thing->radius;
+      y1 = thing->y - thing->radius;
+
+      x2 = thing->x + thing->radius;
+      y2 = thing->y + thing->radius;
+    }
+
+  s1 = p_point_on_divline_side(x1, y1, &trace);
+  s2 = p_point_on_divline_side(x2, y2, &trace);
+
+  if (s1 == s2) return true; /* line isn't crossed */
+
+  dl.x = x1;
+  dl.y = y1;
+  dl.dx = x2 - x1;
+  dl.dy = y2 - y1;
+
+  frac = p_intercept_vector(&trace, &dl);
+
+  if (frac < 0) return true; /* behind source */
+
+  intercept_p->frac = frac;
+  intercept_p->isaline = false;
+  intercept_p->d.thing = thing;
+  intercepts_overrun(intercept_p - intercepts, intercept_p);
+  intercept_p++;
+
+  return true; /* keep going */
+}
+
+/* p_traverse_intercepts
+ * Returns true if the traverser function returns true for all lines.
+ */
+
+static boolean p_traverse_intercepts(traverser_t func, fixed_t maxfrac)
+{
+  int count;
+  fixed_t dist;
+  intercept_t *scan;
+  intercept_t *in;
+
+  count = intercept_p - intercepts;
+
+  in = 0; /* shut up compiler warning */
+
+  while (count--)
+    {
+      dist = INT_MAX;
+      for (scan = intercepts; scan < intercept_p; scan++)
+        {
+          if (scan->frac < dist)
+            {
+              dist = scan->frac;
+              in = scan;
+            }
+        }
+
+      if (dist > maxfrac) return true; /* checked everything in range */
+
+#if 0 /* UNUSED */
+
+  /* don't check these yet, there may be others inserted */
+
+  in = scan = intercepts;
+  for (scan = intercepts; scan < intercept_p; scan++)
+    {
+      if (scan->frac > maxfrac) *in++ = *scan;
+    }
+
+  intercept_p = in;
+  return false;
+#endif
+
+      if (!func(in)) return false; /* don't bother going farther */
+
+      in->frac = INT_MAX;
+    }
+
+  return true; /* everything was traversed */
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* p_approx_distance
+ * Gives an estimation of distance (not exact)
+ */
+
+fixed_t p_approx_distance(fixed_t dx, fixed_t dy)
+{
+  dx = abs(dx);
+  dy = abs(dy);
+  if (dx < dy) return dx + dy - (dx >> 1);
+  return dx + dy - (dy >> 1);
+}
+
+/* p_point_on_line_side
+ * Returns 0 or 1
+ */
+
+int p_point_on_line_side(fixed_t x, fixed_t y, line_t *line)
+{
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t left;
+  fixed_t right;
+
+  if (!line->dx)
+    {
+      if (x <= line->v1->x) return line->dy > 0;
+
+      return line->dy < 0;
+    }
+
+  if (!line->dy)
+    {
+      if (y <= line->v1->y) return line->dx < 0;
+
+      return line->dx > 0;
+    }
+
+  dx = (x - line->v1->x);
+  dy = (y - line->v1->y);
+
+  left = fixed_mul(line->dy >> FRACBITS, dx);
+  right = fixed_mul(dy, line->dx >> FRACBITS);
+
+  if (right < left) return 0; /* front side */
+
+  return 1;                   /* back side */
+}
+
+/* p_box_on_line_side
+ * Considers the line to be infinite
+ * Returns side 0 or 1, -1 if box crosses the line.
+ */
+
+int p_box_on_line_side(fixed_t *tmbox, line_t *ld)
+{
+  int p1 = 0;
+  int p2 = 0;
+
+  switch (ld->slopetype)
+    {
+    case ST_HORIZONTAL:
+      p1 = tmbox[BOXTOP] > ld->v1->y;
+      p2 = tmbox[BOXBOTTOM] > ld->v1->y;
+      if (ld->dx < 0)
+        {
+          p1 ^= 1;
+          p2 ^= 1;
+        }
+      break;
+
+    case ST_VERTICAL:
+      p1 = tmbox[BOXRIGHT] < ld->v1->x;
+      p2 = tmbox[BOXLEFT] < ld->v1->x;
+      if (ld->dy < 0)
+        {
+          p1 ^= 1;
+          p2 ^= 1;
+        }
+      break;
+
+    case ST_POSITIVE:
+      p1 = p_point_on_line_side(tmbox[BOXLEFT], tmbox[BOXTOP], ld);
+      p2 = p_point_on_line_side(tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
+      break;
+
+    case ST_NEGATIVE:
+      p1 = p_point_on_line_side(tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
+      p2 = p_point_on_line_side(tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
+      break;
+    }
+
+  if (p1 == p2) return p1;
+  return -1;
+}
+
+/* p_point_on_divline_side
+ * Returns 0 or 1.
+ */
+
+int p_point_on_divline_side(fixed_t x, fixed_t y, divline_t *line)
+{
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t left;
+  fixed_t right;
+
+  if (!line->dx)
+    {
+      if (x <= line->x) return line->dy > 0;
+
+      return line->dy < 0;
+    }
+
+  if (!line->dy)
+    {
+      if (y <= line->y) return line->dx < 0;
+
+      return line->dx > 0;
+    }
+
+  dx = (x - line->x);
+  dy = (y - line->y);
+
+  /* try to quickly decide by looking at sign bits */
+
+  if ((line->dy ^ line->dx ^ dx ^ dy) & 0x80000000)
+    {
+      if ((line->dy ^ dx) & 0x80000000) return 1; /* (left is negative) */
+      return 0;
+    }
+
+  left = fixed_mul(line->dy >> 8, dx >> 8);
+  right = fixed_mul(dy >> 8, line->dx >> 8);
+
+  if (right < left) return 0; /* front side */
+
+  return 1; /* back side */
+}
+
+/* p_intercept_vector
+ *
+ * Returns the fractional intercept point along the first divline.
+ * This is only called by the addthings and addlines traversers.
+ */
+
+fixed_t p_intercept_vector(divline_t *v2, divline_t *v1)
+{
+#if 1
+  fixed_t frac;
+  fixed_t num;
+  fixed_t den;
+
+  den = fixed_mul(v1->dy >> 8, v2->dx) - fixed_mul(v1->dx >> 8, v2->dy);
+
+  if (den == 0) return 0;
+
+  num = fixed_mul((v1->x - v2->x) >> 8, v1->dy) +
+        fixed_mul((v2->y - v1->y) >> 8, v1->dx);
+
+  frac = fixed_div(num, den);
+
+  return frac;
+#else /* UNUSED, float debug. */
+  float frac;
+  float num;
+  float den;
+  float v1x;
+  float v1y;
+  float v1dx;
+  float v1dy;
+  float v2x;
+  float v2y;
+  float v2dx;
+  float v2dy;
+
+  v1x = (float)v1->x / FRACUNIT;
+  v1y = (float)v1->y / FRACUNIT;
+  v1dx = (float)v1->dx / FRACUNIT;
+  v1dy = (float)v1->dy / FRACUNIT;
+  v2x = (float)v2->x / FRACUNIT;
+  v2y = (float)v2->y / FRACUNIT;
+  v2dx = (float)v2->dx / FRACUNIT;
+  v2dy = (float)v2->dy / FRACUNIT;
+
+  den = v1dy * v2dx - v1dx * v2dy;
+
+  if (den == 0) return 0; /* parallel */
+
+  num = (v1x - v2x) * v1dy + (v2y - v1y) * v1dx;
+  frac = num / den;
+
+  return frac * FRACUNIT;
+#endif
+}
+
+/* p_line_opening
+ * Sets opentop and openbottom to the window through a two sided line.
+ * OPTIMIZE: keep this precalculated
+ */
+
+void p_line_opening(line_t *p_linedef)
+{
+  sector_t *front;
+  sector_t *back;
+
+  if (p_linedef->sidenum[1] == -1)
+    {
+      /* single sided line */
+
+      openrange = 0;
+      return;
+    }
+
+  front = p_linedef->frontsector;
+  back = p_linedef->backsector;
+
+  if (front->ceilingheight < back->ceilingheight)
+    opentop = front->ceilingheight;
+  else
+    opentop = back->ceilingheight;
+
+  if (front->floorheight > back->floorheight)
+    {
+      openbottom = front->floorheight;
+      lowfloor = back->floorheight;
+    }
+  else
+    {
+      openbottom = back->floorheight;
+      lowfloor = front->floorheight;
+    }
+
+  openrange = opentop - openbottom;
+}
+
+/* THING POSITION SETTING */
+
+/* p_unset_thing_position
+ *
+ * Unlinks a thing from block map and sectors.
+ *
+ * On each position change, BLOCKMAP and other lookups maintaining lists to
+ * things inside these structures need to be updated.
+ */
+
+void p_unset_thing_position(mobj_t *thing)
+{
+  int blockx;
+  int blocky;
+
+  if (!(thing->flags & MF_NOSECTOR))
+    {
+      /* inert things don't need to be in blockmap? unlink from subsector */
+
+      if (thing->snext) thing->snext->sprev = thing->sprev;
+
+      if (thing->sprev)
+        thing->sprev->snext = thing->snext;
+      else
+        thing->subsector->sector->thinglist = thing->snext;
+    }
+
+  if (!(thing->flags & MF_NOBLOCKMAP))
+    {
+      /* inert things don't need to be in blockmap unlink from block map */
+
+      if (thing->bnext) thing->bnext->bprev = thing->bprev;
+
+      if (thing->bprev)
+        thing->bprev->bnext = thing->bnext;
+      else
+        {
+          blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
+          blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
+
+          if (blockx >= 0 && blockx < bmapwidth && blocky >= 0 &&
+              blocky < bmapheight)
+            {
+              blocklinks[blocky * bmapwidth + blockx] = thing->bnext;
+            }
+        }
+    }
+}
+
+/* p_set_thing_position
+ * Links a thing into both a block and a subsector based on it's x y.
+ * Sets thing->subsector properly
+ */
+
+void p_set_thing_position(mobj_t *thing)
+{
+  subsector_t *ss;
+  sector_t *sec;
+  int blockx;
+  int blocky;
+  mobj_t **link;
+
+  /* link into subsector */
+
+  ss = r_point_in_subsector(thing->x, thing->y);
+  thing->subsector = ss;
+
+  if (!(thing->flags & MF_NOSECTOR))
+    {
+      /* invisible things don't go into the sector links */
+
+      sec = ss->sector;
+
+      thing->sprev = NULL;
+      thing->snext = sec->thinglist;
+
+      if (sec->thinglist) sec->thinglist->sprev = thing;
+
+      sec->thinglist = thing;
+    }
+
+  /* link into blockmap */
+
+  if (!(thing->flags & MF_NOBLOCKMAP))
+    {
+      /* inert things don't need to be in blockmap */
+
+      blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
+      blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
+
+      if (blockx >= 0 && blockx < bmapwidth && blocky >= 0 &&
+          blocky < bmapheight)
+        {
+          link = &blocklinks[blocky * bmapwidth + blockx];
+          thing->bprev = NULL;
+          thing->bnext = *link;
+          if (*link) (*link)->bprev = thing;
+
+          *link = thing;
+        }
+      else
+        {
+          /* thing is off the map */
+
+          thing->bnext = thing->bprev = NULL;
+        }
+    }
+}
+
+/* BLOCK MAP ITERATORS
+ * For each line/thing in the given mapblock,
+ * call the passed PIT_* function.
+ * If the function returns false,
+ * exit with false without checking anything else.
+ */
+
+/* p_block_lines_iterator
+ * The validcount flags are used to avoid checking lines
+ * that are marked in multiple mapblocks,
+ * so increment validcount before the first call
+ * to p_block_lines_iterator, then make one or more calls
+ * to it.
+ */
+
+boolean p_block_lines_iterator(int x, int y, boolean (*func)(line_t *))
+{
+  int offset;
+  short *list;
+  line_t *ld;
+
+  if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+    {
+      return true;
+    }
+
+  offset = y * bmapwidth + x;
+
+  offset = *(blockmap + offset);
+
+  for (list = blockmaplump + offset; *list != -1; list++)
+    {
+      ld = &lines[*list];
+
+      if (ld->validcount == validcount)
+        continue; /* line has already been checked */
+
+      ld->validcount = validcount;
+
+      if (!func(ld)) return false;
+    }
+
+  return true; /* everything was checked */
+}
+
+boolean p_block_things_iterator(int x, int y, boolean (*func)(mobj_t *))
+{
+  mobj_t *mobj;
+
+  if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+    {
+      return true;
+    }
+
+  LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y * bmapwidth + x], bnext);
+
+  for (mobj = blocklinks[y * bmapwidth + x]; mobj; mobj = mobj->bnext)
+    {
+      if (!func(mobj)) return false;
+    }
+
+  return true;
+}
+
+/* p_path_traverse
+ *
+ * Traces a line from x1,y1 to x2,y2, calling the traverser function for
+ * each.
+ * Returns true if the traverser function returns true for all lines.
+ */
+
+boolean p_path_traverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                        int flags, boolean (*trav)(intercept_t *))
+{
+  fixed_t xt1;
+  fixed_t yt1;
+  fixed_t xt2;
+  fixed_t yt2;
+
+  fixed_t xstep;
+  fixed_t ystep;
+
+  fixed_t partial;
+
+  fixed_t xintercept;
+  fixed_t yintercept;
+
+  int mapx;
+  int mapy;
+
+  int mapxstep;
+  int mapystep;
+
+  int count;
+
+  earlyout = (flags & PT_EARLYOUT) != 0;
+
+  validcount++;
+  intercept_p = intercepts;
+
+  if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
+    {
+      x1 += FRACUNIT; /* don't side exactly on a line */
+    }
+
+  if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
+    {
+      y1 += FRACUNIT; /* don't side exactly on a line */
+    }
+
+  trace.x = x1;
+  trace.y = y1;
+  trace.dx = x2 - x1;
+  trace.dy = y2 - y1;
+
+  x1 -= bmaporgx;
+  y1 -= bmaporgy;
+  xt1 = x1 >> MAPBLOCKSHIFT;
+  yt1 = y1 >> MAPBLOCKSHIFT;
+
+  x2 -= bmaporgx;
+  y2 -= bmaporgy;
+  xt2 = x2 >> MAPBLOCKSHIFT;
+  yt2 = y2 >> MAPBLOCKSHIFT;
+
+  if (xt2 > xt1)
+    {
+      mapxstep = 1;
+      partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+      ystep = fixed_div(y2 - y1, abs(x2 - x1));
+    }
+  else if (xt2 < xt1)
+    {
+      mapxstep = -1;
+      partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+      ystep = fixed_div(y2 - y1, abs(x2 - x1));
+    }
+  else
+    {
+      mapxstep = 0;
+      partial = FRACUNIT;
+      ystep = 256 * FRACUNIT;
+    }
+
+  yintercept = (y1 >> MAPBTOFRAC) + fixed_mul(partial, ystep);
+
+  if (yt2 > yt1)
+    {
+      mapystep = 1;
+      partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
+      xstep = fixed_div(x2 - x1, abs(y2 - y1));
+    }
+  else if (yt2 < yt1)
+    {
+      mapystep = -1;
+      partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
+      xstep = fixed_div(x2 - x1, abs(y2 - y1));
+    }
+  else
+    {
+      mapystep = 0;
+      partial = FRACUNIT;
+      xstep = 256 * FRACUNIT;
+    }
+
+  xintercept = (x1 >> MAPBTOFRAC) + fixed_mul(partial, xstep);
+
+  /* Step through map blocks.
+   * Count is present to prevent a round off error
+   * from skipping the break.
+   */
+
+  mapx = xt1;
+  mapy = yt1;
+
+  for (count = 0; count < 64; count++)
+    {
+      if (flags & PT_ADDLINES)
+        {
+          if (!p_block_lines_iterator(mapx, mapy, pit_add_line_intercepts))
+            {
+              return false; /* early out */
+            }
+        }
+
+      if (flags & PT_ADDTHINGS)
+        {
+          if (!p_block_things_iterator(mapx, mapy, pit_add_thing_intercepts))
+            {
+              return false; /* early out */
+            }
+        }
+
+      if (mapx == xt2 && mapy == yt2)
+        {
+          break;
+        }
+
+      if ((yintercept >> FRACBITS) == mapy)
+        {
+          yintercept += ystep;
+          mapx += mapxstep;
+        }
+      else if ((xintercept >> FRACBITS) == mapx)
+        {
+          xintercept += xstep;
+          mapy += mapystep;
+        }
+    }
+
+  /* go through the sorted list */
+
+  return p_traverse_intercepts(trav, FRACUNIT);
+}
diff --git a/games/NXDoom/src/doom/p_mobj.c b/games/NXDoom/src/doom/p_mobj.c
index 481c52822..4b81fa45a 100644
--- a/games/NXDoom/src/doom/p_mobj.c
+++ b/games/NXDoom/src/doom/p_mobj.c
@@ -1,1072 +1,1126 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Moving object handling. Spawn functions.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_mobj.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Moving object handling. Spawn functions.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
 #include "i_system.h"
-#include "z_zone.h"
 #include "m_random.h"
+#include "z_zone.h"
 
 #include "doomdef.h"
 #include "p_local.h"
-#include "sounds.h"
 
-#include "st_stuff.h"
 #include "hu_stuff.h"
+#include "st_stuff.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "doomstat.h"
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-void G_PlayerReborn (int player);
-void P_SpawnMapThing (mapthing_t*	mthing);
-
-
-//
-// P_SetMobjState
-// Returns true if the mobj is still present.
-//
-int test;
-
-// Use a heuristic approach to detect infinite state cycles: Count the number
-// of times the loop in P_SetMobjState() executes and exit with an error once
-// an arbitrary very large limit is reached.
+/* Use a heuristic approach to detect infinite state cycles: Count the number
+ * of times the loop in p_set_mobj_state() executes and exit with an error
+ * once an arbitrary very large limit is reached.
+ */
 
 #define MOBJ_CYCLE_LIMIT 1000000
 
-boolean
-P_SetMobjState
-( mobj_t*	mobj,
-  statenum_t	state )
+#define STOPSPEED 0x1000
+#define FRICTION 0xe800
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+int test;
+
+mapthing_t itemrespawnque[ITEMQUESIZE];
+int itemrespawntime[ITEMQUESIZE];
+int iquehead;
+int iquetail;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void g_player_reborn(int player);
+void p_spawn_map_thing(mapthing_t *mthing);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: p_explode_missile
+ ****************************************************************************/
+
+static void p_explode_missile(mobj_t *mo)
 {
-    state_t*	st;
-    int	cycle_counter = 0;
+  mo->momx = mo->momy = mo->momz = 0;
 
-    do
-    {
-	if (state == S_NULL)
-	{
-	    mobj->state = (state_t *) S_NULL;
-	    P_RemoveMobj (mobj);
-	    return false;
-	}
+  p_set_mobj_state(mo, mobjinfo[mo->type].deathstate);
 
-	st = &states[state];
-	mobj->state = st;
-	mobj->tics = st->tics;
-	mobj->sprite = st->sprite;
-	mobj->frame = st->frame;
+  mo->tics -= p_random() & 3;
 
-	// Modified handling.
-	// Call action functions when the state is set
-	if (st->action.acp1)		
-	    st->action.acp1(mobj);	
-	
-	state = st->nextstate;
+  if (mo->tics < 1) mo->tics = 1;
 
-	if (cycle_counter++ > MOBJ_CYCLE_LIMIT)
-	{
-	    I_Error("P_SetMobjState: Infinite state cycle detected!");
-	}
-    } while (!mobj->tics);
-				
-    return true;
+  mo->flags &= ~MF_MISSILE;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (mo->info->deathsound) s_start_sound(mo, mo->info->deathsound);
+#endif
 }
 
+/****************************************************************************
+ * Name: p_xy_movement
+ ****************************************************************************/
 
-//
-// P_ExplodeMissile  
-//
-void P_ExplodeMissile (mobj_t* mo)
+static void p_xy_movement(mobj_t *mo)
 {
-    mo->momx = mo->momy = mo->momz = 0;
+  fixed_t ptryx;
+  fixed_t ptryy;
+  player_t *player;
+  fixed_t xmove;
+  fixed_t ymove;
 
-    P_SetMobjState (mo, mobjinfo[mo->type].deathstate);
-
-    mo->tics -= P_Random()&3;
-
-    if (mo->tics < 1)
-	mo->tics = 1;
-
-    mo->flags &= ~MF_MISSILE;
-
-    if (mo->info->deathsound)
-	S_StartSound (mo, mo->info->deathsound);
-}
-
-
-//
-// P_XYMovement  
-//
-#define STOPSPEED		0x1000
-#define FRICTION		0xe800
-
-void P_XYMovement (mobj_t* mo) 
-{ 	
-    fixed_t 	ptryx;
-    fixed_t	ptryy;
-    player_t*	player;
-    fixed_t	xmove;
-    fixed_t	ymove;
-			
-    if (!mo->momx && !mo->momy)
+  if (!mo->momx && !mo->momy)
     {
-	if (mo->flags & MF_SKULLFLY)
-	{
-	    // the skull slammed into something
-	    mo->flags &= ~MF_SKULLFLY;
-	    mo->momx = mo->momy = mo->momz = 0;
+      if (mo->flags & MF_SKULLFLY)
+        {
+          /* the skull slammed into something */
 
-	    P_SetMobjState (mo, mo->info->spawnstate);
-	}
-	return;
-    }
-	
-    player = mo->player;
-		
-    if (mo->momx > MAXMOVE)
-	mo->momx = MAXMOVE;
-    else if (mo->momx < -MAXMOVE)
-	mo->momx = -MAXMOVE;
+          mo->flags &= ~MF_SKULLFLY;
+          mo->momx = mo->momy = mo->momz = 0;
 
-    if (mo->momy > MAXMOVE)
-	mo->momy = MAXMOVE;
-    else if (mo->momy < -MAXMOVE)
-	mo->momy = -MAXMOVE;
-		
-    xmove = mo->momx;
-    ymove = mo->momy;
-	
-    do
-    {
-	if (xmove > MAXMOVE/2 || ymove > MAXMOVE/2)
-	{
-	    ptryx = mo->x + xmove/2;
-	    ptryy = mo->y + ymove/2;
-	    xmove >>= 1;
-	    ymove >>= 1;
-	}
-	else
-	{
-	    ptryx = mo->x + xmove;
-	    ptryy = mo->y + ymove;
-	    xmove = ymove = 0;
-	}
-		
-	if (!P_TryMove (mo, ptryx, ptryy))
-	{
-	    // blocked move
-	    if (mo->player)
-	    {	// try to slide along it
-		P_SlideMove (mo);
-	    }
-	    else if (mo->flags & MF_MISSILE)
-	    {
-		// explode a missile
-		if (ceilingline &&
-		    ceilingline->backsector &&
-		    ceilingline->backsector->ceilingpic == skyflatnum)
-		{
-		    // Hack to prevent missiles exploding
-		    // against the sky.
-		    // Does not handle sky floors.
-		    P_RemoveMobj (mo);
-		    return;
-		}
-		P_ExplodeMissile (mo);
-	    }
-	    else
-		mo->momx = mo->momy = 0;
-	}
-    } while (xmove || ymove);
-    
-    // slow down
-    if (player && player->cheats & CF_NOMOMENTUM)
-    {
-	// debug option for no sliding at all
-	mo->momx = mo->momy = 0;
-	return;
+          p_set_mobj_state(mo, mo->info->spawnstate);
+        }
+
+      return;
     }
 
-    if (mo->flags & (MF_MISSILE | MF_SKULLFLY) )
-	return; 	// no friction for missiles ever
-		
-    if (mo->z > mo->floorz)
-	return;		// no friction when airborne
+  player = mo->player;
 
-    if (mo->flags & MF_CORPSE)
+  if (mo->momx > MAXMOVE)
+    mo->momx = MAXMOVE;
+  else if (mo->momx < -MAXMOVE)
+    mo->momx = -MAXMOVE;
+
+  if (mo->momy > MAXMOVE)
+    mo->momy = MAXMOVE;
+  else if (mo->momy < -MAXMOVE)
+    mo->momy = -MAXMOVE;
+
+  xmove = mo->momx;
+  ymove = mo->momy;
+
+  do
     {
-	// do not stop sliding
-	//  if halfway off a step with some momentum
-	if (mo->momx > FRACUNIT/4
-	    || mo->momx < -FRACUNIT/4
-	    || mo->momy > FRACUNIT/4
-	    || mo->momy < -FRACUNIT/4)
-	{
-	    if (mo->floorz != mo->subsector->sector->floorheight)
-		return;
-	}
+      if (xmove > MAXMOVE / 2 || ymove > MAXMOVE / 2)
+        {
+          ptryx = mo->x + xmove / 2;
+          ptryy = mo->y + ymove / 2;
+          xmove >>= 1;
+          ymove >>= 1;
+        }
+      else
+        {
+          ptryx = mo->x + xmove;
+          ptryy = mo->y + ymove;
+          xmove = ymove = 0;
+        }
+
+      if (!p_try_move(mo, ptryx, ptryy))
+        {
+          /* blocked move */
+
+          if (mo->player)
+            {
+              /* try to slide along it */
+
+              p_slide_move(mo);
+            }
+          else if (mo->flags & MF_MISSILE)
+            {
+              /* explode a missile */
+
+              if (ceilingline && ceilingline->backsector &&
+                  ceilingline->backsector->ceilingpic == skyflatnum)
+                {
+                  /* Hack to prevent missiles exploding
+                   * against the sky.
+                   * Does not handle sky floors.
+                   */
+
+                  p_remove_mobj(mo);
+                  return;
+                }
+
+              p_explode_missile(mo);
+            }
+          else
+            mo->momx = mo->momy = 0;
+        }
+    }
+  while (xmove || ymove);
+
+  /* slow down */
+
+  if (player && player->cheats & CF_NOMOMENTUM)
+    {
+      /* debug option for no sliding at all */
+
+      mo->momx = mo->momy = 0;
+      return;
     }
 
-    if (mo->momx > -STOPSPEED
-	&& mo->momx < STOPSPEED
-	&& mo->momy > -STOPSPEED
-	&& mo->momy < STOPSPEED
-	&& (!player
-	    || (player->cmd.forwardmove== 0
-		&& player->cmd.sidemove == 0 ) ) )
+  if (mo->flags & (MF_MISSILE | MF_SKULLFLY))
+    return; /* no friction for missiles ever */
+
+  if (mo->z > mo->floorz) return; /* no friction when airborne */
+
+  if (mo->flags & MF_CORPSE)
     {
-	// if in a walking frame, stop moving
-	if ( player&&(unsigned)((player->mo->state - states)- S_PLAY_RUN1) < 4)
-	    P_SetMobjState (player->mo, S_PLAY);
-	
-	mo->momx = 0;
-	mo->momy = 0;
+      /* do not stop sliding
+       *  if halfway off a step with some momentum
+       */
+
+      if (mo->momx > FRACUNIT / 4 || mo->momx < -FRACUNIT / 4 ||
+          mo->momy > FRACUNIT / 4 || mo->momy < -FRACUNIT / 4)
+        {
+          if (mo->floorz != mo->subsector->sector->floorheight) return;
+        }
     }
-    else
+
+  if (mo->momx > -STOPSPEED && mo->momx < STOPSPEED &&
+      mo->momy > -STOPSPEED && mo->momy < STOPSPEED &&
+      (!player ||
+       (player->cmd.forwardmove == 0 && player->cmd.sidemove == 0)))
     {
-	mo->momx = FixedMul (mo->momx, FRICTION);
-	mo->momy = FixedMul (mo->momy, FRICTION);
+      /* if in a walking frame, stop moving */
+
+      if (player &&
+          (unsigned)((player->mo->state - states) - S_PLAY_RUN1) < 4)
+        p_set_mobj_state(player->mo, S_PLAY);
+
+      mo->momx = 0;
+      mo->momy = 0;
+    }
+  else
+    {
+      mo->momx = fixed_mul(mo->momx, FRICTION);
+      mo->momy = fixed_mul(mo->momy, FRICTION);
     }
 }
 
-//
-// P_ZMovement
-//
-void P_ZMovement (mobj_t* mo)
+/****************************************************************************
+ * Name: p_z_movement
+ ****************************************************************************/
+
+static void p_z_movement(mobj_t *mo)
 {
-    fixed_t	dist;
-    fixed_t	delta;
-    
-    // check for smooth step up
-    if (mo->player && mo->z < mo->floorz)
+  fixed_t dist;
+  fixed_t delta;
+
+  /* check for smooth step up */
+
+  if (mo->player && mo->z < mo->floorz)
     {
-	mo->player->viewheight -= mo->floorz-mo->z;
+      mo->player->viewheight -= mo->floorz - mo->z;
 
-	mo->player->deltaviewheight
-	    = (VIEWHEIGHT - mo->player->viewheight)>>3;
-    }
-    
-    // adjust height
-    mo->z += mo->momz;
-	
-    if ( mo->flags & MF_FLOAT
-	 && mo->target)
-    {
-	// float down towards target if too close
-	if ( !(mo->flags & MF_SKULLFLY)
-	     && !(mo->flags & MF_INFLOAT) )
-	{
-	    dist = P_AproxDistance (mo->x - mo->target->x,
-				    mo->y - mo->target->y);
-	    
-	    delta =(mo->target->z + (mo->height>>1)) - mo->z;
-
-	    if (delta<0 && dist < -(delta*3) )
-		mo->z -= FLOATSPEED;
-	    else if (delta>0 && dist < (delta*3) )
-		mo->z += FLOATSPEED;			
-	}
-	
-    }
-    
-    // clip movement
-    if (mo->z <= mo->floorz)
-    {
-	// hit the floor
-
-	// Note (id):
-	//  somebody left this after the setting momz to 0,
-	//  kinda useless there.
-	//
-	// cph - This was the a bug in the linuxdoom-1.10 source which
-	//  caused it not to sync Doom 2 v1.9 demos. Someone
-	//  added the above comment and moved up the following code. So
-	//  demos would desync in close lost soul fights.
-	// Note that this only applies to original Doom 1 or Doom2 demos - not
-	//  Final Doom and Ultimate Doom.  So we test demo_compatibility *and*
-	//  gamemission. (Note we assume that Doom1 is always Ult Doom, which
-	//  seems to hold for most published demos.)
-        //  
-        //  fraggle - cph got the logic here slightly wrong.  There are three
-        //  versions of Doom 1.9:
-        //
-        //  * The version used in registered doom 1.9 + doom2 - no bounce
-        //  * The version used in ultimate doom - has bounce
-        //  * The version used in final doom - has bounce
-        //
-        // So we need to check that this is either retail or commercial
-        // (but not doom2)
-	
-	int correct_lost_soul_bounce = gameversion >= exe_ultimate;
-
-	if (correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
-	{
-	    // the skull slammed into something
-	    mo->momz = -mo->momz;
-	}
-	
-	if (mo->momz < 0)
-	{
-	    if (mo->player
-		&& mo->momz < -GRAVITY*8)	
-	    {
-		// Squat down.
-		// Decrease viewheight for a moment
-		// after hitting the ground (hard),
-		// and utter appropriate sound.
-		mo->player->deltaviewheight = mo->momz>>3;
-		S_StartSound (mo, sfx_oof);
-	    }
-	    mo->momz = 0;
-	}
-	mo->z = mo->floorz;
-
-
-	// cph 2001/05/26 -
-	// See lost soul bouncing comment above. We need this here for bug
-	// compatibility with original Doom2 v1.9 - if a soul is charging and
-	// hit by a raising floor this incorrectly reverses its Y momentum.
-	//
-
-        if (!correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
-            mo->momz = -mo->momz;
-
-	if ( (mo->flags & MF_MISSILE)
-	     && !(mo->flags & MF_NOCLIP) )
-	{
-	    P_ExplodeMissile (mo);
-	    return;
-	}
-    }
-    else if (! (mo->flags & MF_NOGRAVITY) )
-    {
-	if (mo->momz == 0)
-	    mo->momz = -GRAVITY*2;
-	else
-	    mo->momz -= GRAVITY;
-    }
-	
-    if (mo->z + mo->height > mo->ceilingz)
-    {
-	// hit the ceiling
-	if (mo->momz > 0)
-	    mo->momz = 0;
-	{
-	    mo->z = mo->ceilingz - mo->height;
-	}
-
-	if (mo->flags & MF_SKULLFLY)
-	{	// the skull slammed into something
-	    mo->momz = -mo->momz;
-	}
-	
-	if ( (mo->flags & MF_MISSILE)
-	     && !(mo->flags & MF_NOCLIP) )
-	{
-	    P_ExplodeMissile (mo);
-	    return;
-	}
-    }
-} 
-
-
-
-//
-// P_NightmareRespawn
-//
-void
-P_NightmareRespawn (mobj_t* mobj)
-{
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z; 
-    subsector_t*	ss; 
-    mobj_t*		mo;
-    mapthing_t*		mthing;
-		
-    x = mobj->spawnpoint.x << FRACBITS; 
-    y = mobj->spawnpoint.y << FRACBITS; 
-
-    // somthing is occupying it's position?
-    if (!P_CheckPosition (mobj, x, y) ) 
-	return;	// no respwan
-
-    // spawn a teleport fog at old spot
-    // because of removal of the body?
-    mo = P_SpawnMobj (mobj->x,
-		      mobj->y,
-		      mobj->subsector->sector->floorheight , MT_TFOG); 
-    // initiate teleport sound
-    S_StartSound (mo, sfx_telept);
-
-    // spawn a teleport fog at the new spot
-    ss = R_PointInSubsector (x,y); 
-
-    mo = P_SpawnMobj (x, y, ss->sector->floorheight , MT_TFOG); 
-
-    S_StartSound (mo, sfx_telept);
-
-    // spawn the new monster
-    mthing = &mobj->spawnpoint;
-	
-    // spawn it
-    if (mobj->info->flags & MF_SPAWNCEILING)
-	z = ONCEILINGZ;
-    else
-	z = ONFLOORZ;
-
-    // inherit attributes from deceased one
-    mo = P_SpawnMobj (x,y,z, mobj->type);
-    mo->spawnpoint = mobj->spawnpoint;	
-    mo->angle = ANG45 * (mthing->angle/45);
-
-    if (mthing->options & MTF_AMBUSH)
-	mo->flags |= MF_AMBUSH;
-
-    mo->reactiontime = 18;
-	
-    // remove the old monster,
-    P_RemoveMobj (mobj);
-}
-
-
-//
-// P_MobjThinker
-//
-void P_MobjThinker (mobj_t* mobj)
-{
-    // momentum movement
-    if (mobj->momx
-	|| mobj->momy
-	|| (mobj->flags&MF_SKULLFLY) )
-    {
-	P_XYMovement (mobj);
-
-	// FIXME: decent NOP/NULL/Nil function pointer please.
-	if (mobj->thinker.function.acv == (actionf_v) (-1))
-	    return;		// mobj was removed
-    }
-    if ( (mobj->z != mobj->floorz)
-	 || mobj->momz )
-    {
-	P_ZMovement (mobj);
-	
-	// FIXME: decent NOP/NULL/Nil function pointer please.
-	if (mobj->thinker.function.acv == (actionf_v) (-1))
-	    return;		// mobj was removed
+      mo->player->deltaviewheight =
+          (VIEWHEIGHT - mo->player->viewheight) >> 3;
     }
 
-    
-    // cycle through states,
-    // calling action functions at transitions
-    if (mobj->tics != -1)
+  mo->z += mo->momz; /* adjust height */
+
+  if (mo->flags & MF_FLOAT && mo->target)
     {
-	mobj->tics--;
-		
-	// you can cycle through multiple states in a tic
-	if (!mobj->tics)
-	    if (!P_SetMobjState (mobj, mobj->state->nextstate) )
-		return;		// freed itself
-    }
-    else
-    {
-	// check for nightmare respawn
-	if (! (mobj->flags & MF_COUNTKILL) )
-	    return;
+      /* float down towards target if too close */
 
-	if (!respawnmonsters)
-	    return;
+      if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
+        {
+          dist = p_approx_distance(mo->x - mo->target->x,
+                  mo->y - mo->target->y);
 
-	mobj->movecount++;
+          delta = (mo->target->z + (mo->height >> 1)) - mo->z;
 
-	if (mobj->movecount < 12*TICRATE)
-	    return;
-
-	if ( leveltime&31 )
-	    return;
-
-	if (P_Random () > 4)
-	    return;
-
-	P_NightmareRespawn (mobj);
+          if (delta < 0 && dist < -(delta * 3))
+            mo->z -= FLOATSPEED;
+          else if (delta > 0 && dist < (delta * 3))
+            mo->z += FLOATSPEED;
+        }
     }
 
-}
+  /* clip movement */
 
-
-//
-// P_SpawnMobj
-//
-mobj_t*
-P_SpawnMobj
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z,
-  mobjtype_t	type )
-{
-    mobj_t*	mobj;
-    state_t*	st;
-    mobjinfo_t*	info;
-	
-    mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
-    memset (mobj, 0, sizeof (*mobj));
-    info = &mobjinfo[type];
-	
-    mobj->type = type;
-    mobj->info = info;
-    mobj->x = x;
-    mobj->y = y;
-    mobj->radius = info->radius;
-    mobj->height = info->height;
-    mobj->flags = info->flags;
-    mobj->health = info->spawnhealth;
-
-    if (gameskill != sk_nightmare)
-	mobj->reactiontime = info->reactiontime;
-    
-    mobj->lastlook = P_Random () % MAXPLAYERS;
-    // do not set the state with P_SetMobjState,
-    // because action routines can not be called yet
-    st = &states[info->spawnstate];
-
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-
-    // set subsector and/or block links
-    P_SetThingPosition (mobj);
-	
-    mobj->floorz = mobj->subsector->sector->floorheight;
-    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-
-    if (z == ONFLOORZ)
-	mobj->z = mobj->floorz;
-    else if (z == ONCEILINGZ)
-	mobj->z = mobj->ceilingz - mobj->info->height;
-    else 
-	mobj->z = z;
-
-    mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-	
-    P_AddThinker (&mobj->thinker);
-
-    return mobj;
-}
-
-
-//
-// P_RemoveMobj
-//
-mapthing_t	itemrespawnque[ITEMQUESIZE];
-int		itemrespawntime[ITEMQUESIZE];
-int		iquehead;
-int		iquetail;
-
-
-void P_RemoveMobj (mobj_t* mobj)
-{
-    if ((mobj->flags & MF_SPECIAL)
-	&& !(mobj->flags & MF_DROPPED)
-	&& (mobj->type != MT_INV)
-	&& (mobj->type != MT_INS))
+  if (mo->z <= mo->floorz)
     {
-	itemrespawnque[iquehead] = mobj->spawnpoint;
-	itemrespawntime[iquehead] = leveltime;
-	iquehead = (iquehead+1)&(ITEMQUESIZE-1);
+      /* hit the floor */
 
-	// lose one off the end?
-	if (iquehead == iquetail)
-	    iquetail = (iquetail+1)&(ITEMQUESIZE-1);
+      /* Note (id):
+       *  somebody left this after the setting momz to 0,
+       *  kinda useless there.
+       *
+       * cph - This was the a bug in the linuxdoom-1.10 source which
+       *  caused it not to sync Doom 2 v1.9 demos. Someone
+       *  added the above comment and moved up the following code. So
+       *  demos would desync in close lost soul fights.
+       * Note that this only applies to original Doom 1 or Doom2 demos - not
+       *  Final Doom and Ultimate Doom.  So we test demo_compatibility *and*
+       *  gamemission. (Note we assume that Doom1 is always Ult Doom, which
+       *  seems to hold for most published demos.)
+       *
+       *  fraggle - cph got the logic here slightly wrong.  There are three
+       *  versions of Doom 1.9:
+       *
+       *  * The version used in registered doom 1.9 + doom2 - no bounce
+       *  * The version used in ultimate doom - has bounce
+       *  * The version used in final doom - has bounce
+       *
+       * So we need to check that this is either retail or commercial
+       * (but not doom2)
+       */
+
+      int correct_lost_soul_bounce = gameversion >= exe_ultimate;
+
+      if (correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
+        {
+          /* the skull slammed into something */
+
+          mo->momz = -mo->momz;
+        }
+
+      if (mo->momz < 0)
+        {
+          if (mo->player && mo->momz < -GRAVITY * 8)
+            {
+              /* Squat down.
+               * Decrease viewheight for a moment after hitting the ground
+               * (hard), and utter appropriate sound.
+               */
+
+              mo->player->deltaviewheight = mo->momz >> 3;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(mo, SFX_OOF);
+#endif
+            }
+
+          mo->momz = 0;
+        }
+
+      mo->z = mo->floorz;
+
+      /* cph 2001/05/26 -
+       * See lost soul bouncing comment above. We need this here for bug
+       * compatibility with original Doom2 v1.9 - if a soul is charging and
+       * hit by a raising floor this incorrectly reverses its Y momentum.
+       */
+
+      if (!correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
+        mo->momz = -mo->momz;
+
+      if ((mo->flags & MF_MISSILE) && !(mo->flags & MF_NOCLIP))
+        {
+          p_explode_missile(mo);
+          return;
+        }
     }
-	
-    // unlink from sector and block lists
-    P_UnsetThingPosition (mobj);
-    
-    // stop any playing sound
-    S_StopSound (mobj);
-    
-    // free block
-    P_RemoveThinker ((thinker_t*)mobj);
-}
-
-
-
-
-//
-// P_RespawnSpecials
-//
-void P_RespawnSpecials (void)
-{
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
-    
-    subsector_t*	ss; 
-    mobj_t*		mo;
-    mapthing_t*		mthing;
-    
-    int			i;
-
-    // only respawn items in deathmatch
-    if (deathmatch != 2)
-	return;	// 
-
-    // nothing left to respawn?
-    if (iquehead == iquetail)
-	return;		
-
-    // wait at least 30 seconds
-    if (leveltime - itemrespawntime[iquetail] < 30*TICRATE)
-	return;			
-
-    mthing = &itemrespawnque[iquetail];
-	
-    x = mthing->x << FRACBITS; 
-    y = mthing->y << FRACBITS; 
-	  
-    // spawn a teleport fog at the new spot
-    ss = R_PointInSubsector (x,y); 
-    mo = P_SpawnMobj (x, y, ss->sector->floorheight , MT_IFOG); 
-    S_StartSound (mo, sfx_itmbk);
-
-    // find which type to spawn
-    for (i=0 ; i< NUMMOBJTYPES ; i++)
+  else if (!(mo->flags & MF_NOGRAVITY))
     {
-	if (mthing->type == mobjinfo[i].doomednum)
-	    break;
+      if (mo->momz == 0)
+        mo->momz = -GRAVITY * 2;
+      else
+        mo->momz -= GRAVITY;
     }
 
-    if (i >= NUMMOBJTYPES)
+  if (mo->z + mo->height > mo->ceilingz)
     {
-        I_Error("P_RespawnSpecials: Failed to find mobj type with doomednum "
-                "%d when respawning thing. This would cause a buffer overrun "
-                "in vanilla Doom", mthing->type);
-    }
+      /* hit the ceiling */
 
-    // spawn it
-    if (mobjinfo[i].flags & MF_SPAWNCEILING)
-	z = ONCEILINGZ;
-    else
-	z = ONFLOORZ;
+      if (mo->momz > 0)
+        {
+          mo->momz = 0;
+        }
 
-    mo = P_SpawnMobj (x,y,z, i);
-    mo->spawnpoint = *mthing;	
-    mo->angle = ANG45 * (mthing->angle/45);
+      mo->z = mo->ceilingz - mo->height;
 
-    // pull it from the que
-    iquetail = (iquetail+1)&(ITEMQUESIZE-1);
-}
+      if (mo->flags & MF_SKULLFLY)
+        {
+          /* the skull slammed into something */
 
+          mo->momz = -mo->momz;
+        }
 
-
-
-//
-// P_SpawnPlayer
-// Called when a player is spawned on the level.
-// Most of the player structure stays unchanged
-//  between levels.
-//
-void P_SpawnPlayer (mapthing_t* mthing)
-{
-    player_t*		p;
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
-
-    mobj_t*		mobj;
-
-    int			i;
-
-    if (mthing->type == 0)
-    {
-        return;
-    }
-
-    // not playing?
-    if (!playeringame[mthing->type-1])
-	return;					
-		
-    p = &players[mthing->type-1];
-
-    if (p->playerstate == PST_REBORN)
-	G_PlayerReborn (mthing->type-1);
-
-    x 		= mthing->x << FRACBITS;
-    y 		= mthing->y << FRACBITS;
-    z		= ONFLOORZ;
-    mobj	= P_SpawnMobj (x,y,z, MT_PLAYER);
-
-    // set color translations for player sprites
-    if (mthing->type > 1)		
-	mobj->flags |= (mthing->type-1)<<MF_TRANSSHIFT;
-		
-    mobj->angle	= ANG45 * (mthing->angle/45);
-    mobj->player = p;
-    mobj->health = p->health;
-
-    p->mo = mobj;
-    p->playerstate = PST_LIVE;	
-    p->refire = 0;
-    p->message = NULL;
-    p->damagecount = 0;
-    p->bonuscount = 0;
-    p->extralight = 0;
-    p->fixedcolormap = 0;
-    p->viewheight = VIEWHEIGHT;
-
-    // setup gun psprite
-    P_SetupPsprites (p);
-    
-    // give all cards in death match mode
-    if (deathmatch)
-	for (i=0 ; i<NUMCARDS ; i++)
-	    p->cards[i] = true;
-			
-    if (mthing->type-1 == consoleplayer)
-    {
-	// wake up the status bar
-	ST_Start ();
-	// wake up the heads up text
-	HU_Start ();		
+      if ((mo->flags & MF_MISSILE) && !(mo->flags & MF_NOCLIP))
+        {
+          p_explode_missile(mo);
+          return;
+        }
     }
 }
 
+/****************************************************************************
+ * Name: p_nightmare_respawn
+ ****************************************************************************/
 
-//
-// P_SpawnMapThing
-// The fields of the mapthing should
-// already be in host byte order.
-//
-void P_SpawnMapThing (mapthing_t* mthing)
+static void p_nightmare_respawn(mobj_t *mobj)
 {
-    int			i;
-    int			bit;
-    mobj_t*		mobj;
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
-		
-    // count deathmatch start positions
-    if (mthing->type == 11)
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
+  subsector_t *ss;
+  mobj_t *mo;
+  mapthing_t *mthing;
+
+  x = mobj->spawnpoint.x << FRACBITS;
+  y = mobj->spawnpoint.y << FRACBITS;
+
+  /* something is occupying it's position? */
+
+  if (!p_check_position(mobj, x, y)) return; /* no respawn */
+
+  /* spawn a teleport fog at old spot because of removal of the body? */
+
+  mo = p_spawn_mobj(mobj->x, mobj->y, mobj->subsector->sector->floorheight,
+                    MT_TFOG);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  /* initiate teleport sound */
+
+  s_start_sound(mo, SFX_TELEPT);
+#endif
+
+  /* spawn a teleport fog at the new spot */
+
+  ss = r_point_in_subsector(x, y);
+
+  mo = p_spawn_mobj(x, y, ss->sector->floorheight, MT_TFOG);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(mo, SFX_TELEPT);
+#endif
+
+  mthing = &mobj->spawnpoint; /* spawn the new monster */
+
+  /* spawn it */
+
+  if (mobj->info->flags & MF_SPAWNCEILING)
+    z = ONCEILINGZ;
+  else
+    z = ONFLOORZ;
+
+  /* inherit attributes from deceased one */
+
+  mo = p_spawn_mobj(x, y, z, mobj->type);
+  mo->spawnpoint = mobj->spawnpoint;
+  mo->angle = ANG45 * (mthing->angle / 45);
+
+  if (mthing->options & MTF_AMBUSH) mo->flags |= MF_AMBUSH;
+
+  mo->reactiontime = 18;
+
+  /* remove the old monster, */
+
+  p_remove_mobj(mobj);
+}
+
+/****************************************************************************
+ * Name: p_check_missile_spawn
+ *
+ * Description:
+ *  Moves the missile forward a bit and possibly explodes it right there.
+ *
+ ****************************************************************************/
+
+static void p_check_missile_spawn(mobj_t *th)
+{
+  th->tics -= p_random() & 3;
+  if (th->tics < 1) th->tics = 1;
+
+  /* move a little forward so an angle can be computed if it immediately
+   * explodes
+   */
+
+  th->x += (th->momx >> 1);
+  th->y += (th->momy >> 1);
+  th->z += (th->momz >> 1);
+
+  if (!p_try_move(th, th->x, th->y)) p_explode_missile(th);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: p_set_mobj_state
+ *
+ * Description:
+ *  Returns true if the mobj is still present.
+ *
+ ****************************************************************************/
+
+boolean p_set_mobj_state(mobj_t *mobj, statenum_t state)
+{
+  state_t *st;
+  int cycle_counter = 0;
+
+  do
     {
-	if (deathmatch_p < &deathmatchstarts[10])
-	{
-	    memcpy (deathmatch_p, mthing, sizeof(*mthing));
-	    deathmatch_p++;
-	}
-	return;
+      if (state == S_NULL)
+        {
+          mobj->state = (state_t *)S_NULL;
+          p_remove_mobj(mobj);
+          return false;
+        }
+
+      st = &states[state];
+      mobj->state = st;
+      mobj->tics = st->tics;
+      mobj->sprite = st->sprite;
+      mobj->frame = st->frame;
+
+      /* Modified handling.
+       * Call action functions when the state is set
+       */
+
+      if (st->action.acp1) st->action.acp1(mobj);
+
+      state = st->nextstate;
+
+      if (cycle_counter++ > MOBJ_CYCLE_LIMIT)
+        {
+          i_error("p_set_mobj_state: Infinite state cycle detected!");
+        }
+    }
+  while (!mobj->tics);
+
+  return true;
+}
+
+/****************************************************************************
+ * Name: p_mobj_thinker
+ ****************************************************************************/
+
+void p_mobj_thinker(mobj_t *mobj)
+{
+  /* momentum movement */
+
+  if (mobj->momx || mobj->momy || (mobj->flags & MF_SKULLFLY))
+    {
+      p_xy_movement(mobj);
+
+      /* FIXME: decent NOP/NULL/Nil function pointer please. */
+
+      if (mobj->thinker.function.acv == (actionf_v)(-1))
+        return; /* mobj was removed */
     }
 
-    if (mthing->type <= 0)
+  if ((mobj->z != mobj->floorz) || mobj->momz)
     {
-        // Thing type 0 is actually "player -1 start".  
-        // For some reason, Vanilla Doom accepts/ignores this.
+      p_z_movement(mobj);
 
-        return;
-    }
-	
-    // check for players specially
-    if (mthing->type <= 4)
-    {
-	// save spots for respawning in network games
-	playerstarts[mthing->type-1] = *mthing;
-	playerstartsingame[mthing->type-1] = true;
-	if (!deathmatch)
-	    P_SpawnPlayer (mthing);
+      /* FIXME: decent NOP/NULL/Nil function pointer please. */
 
-	return;
+      if (mobj->thinker.function.acv == (actionf_v)(-1))
+        return; /* mobj was removed */
     }
 
-    // check for appropriate skill level
-    if (!netgame && (mthing->options & 16) )
-	return;
-		
-    if (gameskill == sk_baby)
-	bit = 1;
-    else if (gameskill == sk_nightmare)
-	bit = 4;
-    else
-        // avoid undefined behavior (left shift by negative value and rhs too big)
-        // by accurately emulating what doom.exe did: reduce mod 32.
-        // For more details check:
-        // https://github.com/chocolate-doom/chocolate-doom/issues/1677
-        bit = (int) (1U << ((gameskill - 1) & 0x1F));
+  /* cycle through states, calling action functions at transitions */
 
-    if (!(mthing->options & bit) )
-	return;
-	
-    // find which type to spawn
-    for (i=0 ; i< NUMMOBJTYPES ; i++)
-	if (mthing->type == mobjinfo[i].doomednum)
-	    break;
-	
-    if (i==NUMMOBJTYPES)
-	I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",
-		 mthing->type,
-		 mthing->x, mthing->y);
-		
-    // don't spawn keycards and players in deathmatch
-    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
-	return;
-		
-    // don't spawn any monsters if -nomonsters
-    if (nomonsters
-	&& ( i == MT_SKULL
-	     || (mobjinfo[i].flags & MF_COUNTKILL)) )
+  if (mobj->tics != -1)
     {
-	return;
+      mobj->tics--;
+
+      /* you can cycle through multiple states in a tic */
+
+      if (!mobj->tics)
+        {
+          if (!p_set_mobj_state(mobj, mobj->state->nextstate))
+            {
+              return; /* freed itself */
+            }
+        }
     }
-    
-    // spawn it
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-
-    if (mobjinfo[i].flags & MF_SPAWNCEILING)
-	z = ONCEILINGZ;
-    else
-	z = ONFLOORZ;
-    
-    mobj = P_SpawnMobj (x,y,z, i);
-    mobj->spawnpoint = *mthing;
-
-    if (mobj->tics > 0)
-	mobj->tics = 1 + (P_Random () % mobj->tics);
-    if (mobj->flags & MF_COUNTKILL)
-	totalkills++;
-    if (mobj->flags & MF_COUNTITEM)
-	totalitems++;
-		
-    mobj->angle = ANG45 * (mthing->angle/45);
-    if (mthing->options & MTF_AMBUSH)
-	mobj->flags |= MF_AMBUSH;
-}
-
-
-
-//
-// GAME SPAWN FUNCTIONS
-//
-
-
-//
-// P_SpawnPuff
-//
-
-void
-P_SpawnPuff
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z )
-{
-    mobj_t*	th;
-	
-    z += (P_SubRandom() << 10);
-
-    th = P_SpawnMobj (x,y,z, MT_PUFF);
-    th->momz = FRACUNIT;
-    th->tics -= P_Random()&3;
-
-    if (th->tics < 1)
-	th->tics = 1;
-	
-    // don't make punches spark on the wall
-    if (attackrange == MELEERANGE)
-	P_SetMobjState (th, S_PUFF3);
-}
-
-
-
-//
-// P_SpawnBlood
-// 
-void
-P_SpawnBlood
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z,
-  int		damage )
-{
-    mobj_t*	th;
-	
-    z += (P_SubRandom() << 10);
-    th = P_SpawnMobj (x,y,z, MT_BLOOD);
-    th->momz = FRACUNIT*2;
-    th->tics -= P_Random()&3;
-
-    if (th->tics < 1)
-	th->tics = 1;
-		
-    if (damage <= 12 && damage >= 9)
-	P_SetMobjState (th,S_BLOOD2);
-    else if (damage < 9)
-	P_SetMobjState (th,S_BLOOD3);
-}
-
-
-
-//
-// P_CheckMissileSpawn
-// Moves the missile forward a bit
-//  and possibly explodes it right there.
-//
-void P_CheckMissileSpawn (mobj_t* th)
-{
-    th->tics -= P_Random()&3;
-    if (th->tics < 1)
-	th->tics = 1;
-    
-    // move a little forward so an angle can
-    // be computed if it immediately explodes
-    th->x += (th->momx>>1);
-    th->y += (th->momy>>1);
-    th->z += (th->momz>>1);
-
-    if (!P_TryMove (th, th->x, th->y))
-	P_ExplodeMissile (th);
-}
-
-// Certain functions assume that a mobj_t pointer is non-NULL,
-// causing a crash in some situations where it is NULL.  Vanilla
-// Doom did not crash because of the lack of proper memory 
-// protection. This function substitutes NULL pointers for
-// pointers to a dummy mobj, to avoid a crash.
-
-mobj_t *P_SubstNullMobj(mobj_t *mobj)
-{
-    if (mobj == NULL)
+  else
     {
-        static mobj_t dummy_mobj;
+      /* check for nightmare respawn */
 
-        dummy_mobj.x = 0;
-        dummy_mobj.y = 0;
-        dummy_mobj.z = 0;
-        dummy_mobj.flags = 0;
+      if (!(mobj->flags & MF_COUNTKILL)) return;
 
-        mobj = &dummy_mobj;
+      if (!respawnmonsters) return;
+
+      mobj->movecount++;
+
+      if (mobj->movecount < 12 * TICRATE) return;
+
+      if (leveltime & 31) return;
+
+      if (p_random() > 4) return;
+
+      p_nightmare_respawn(mobj);
+    }
+}
+
+/****************************************************************************
+ * Name: p_spawn_mobj
+ ****************************************************************************/
+
+mobj_t *p_spawn_mobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
+{
+  mobj_t *mobj;
+  state_t *st;
+  mobjinfo_t *info;
+
+  mobj = z_malloc(sizeof(*mobj), PU_LEVEL, NULL);
+  memset(mobj, 0, sizeof(*mobj));
+  info = &mobjinfo[type];
+
+  mobj->type = type;
+  mobj->info = info;
+  mobj->x = x;
+  mobj->y = y;
+  mobj->radius = info->radius;
+  mobj->height = info->height;
+  mobj->flags = info->flags;
+  mobj->health = info->spawnhealth;
+
+  if (gameskill != sk_nightmare) mobj->reactiontime = info->reactiontime;
+
+  mobj->lastlook = p_random() % MAXPLAYERS;
+
+  /* do not set the state with p_set_mobj_state,
+   * because action routines can not be called yet
+   */
+
+  st = &states[info->spawnstate];
+
+  mobj->state = st;
+  mobj->tics = st->tics;
+  mobj->sprite = st->sprite;
+  mobj->frame = st->frame;
+
+  /* set subsector and/or block links */
+
+  p_set_thing_position(mobj);
+
+  mobj->floorz = mobj->subsector->sector->floorheight;
+  mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+
+  if (z == ONFLOORZ)
+    mobj->z = mobj->floorz;
+  else if (z == ONCEILINGZ)
+    mobj->z = mobj->ceilingz - mobj->info->height;
+  else
+    mobj->z = z;
+
+  mobj->thinker.function.acp1 = (actionf_p1)p_mobj_thinker;
+
+  p_add_thinker(&mobj->thinker);
+
+  return mobj;
+}
+
+/****************************************************************************
+ * Name: p_remove_mobj
+ ****************************************************************************/
+
+void p_remove_mobj(mobj_t *mobj)
+{
+  if ((mobj->flags & MF_SPECIAL) && !(mobj->flags & MF_DROPPED) &&
+      (mobj->type != MT_INV) && (mobj->type != MT_INS))
+    {
+      itemrespawnque[iquehead] = mobj->spawnpoint;
+      itemrespawntime[iquehead] = leveltime;
+      iquehead = (iquehead + 1) & (ITEMQUESIZE - 1);
+
+      /* lose one off the end? */
+
+      if (iquehead == iquetail)
+        {
+          iquetail = (iquetail + 1) & (ITEMQUESIZE - 1);
+        }
     }
 
-    return mobj;
+  /* unlink from sector and block lists */
+
+  p_unset_thing_position(mobj);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  /* stop any playing sound */
+
+  s_stop_sound(mobj);
+#endif
+
+  p_remove_thinker((thinker_t *)mobj); /* free block */
 }
 
-//
-// P_SpawnMissile
-//
-mobj_t*
-P_SpawnMissile
-( mobj_t*	source,
-  mobj_t*	dest,
-  mobjtype_t	type )
+/****************************************************************************
+ * Name: p_respawn_specials
+ ****************************************************************************/
+
+void p_respawn_specials(void)
 {
-    mobj_t*	th;
-    angle_t	an;
-    int		dist;
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
 
-    th = P_SpawnMobj (source->x,
-		      source->y,
-		      source->z + 4*8*FRACUNIT, type);
-    
-    if (th->info->seesound)
-	S_StartSound (th, th->info->seesound);
+  subsector_t *ss;
+  mobj_t *mo;
+  mapthing_t *mthing;
 
-    th->target = source;	// where it came from
-    an = R_PointToAngle2 (source->x, source->y, dest->x, dest->y);
+  int i;
 
-    // fuzzy player
-    if (dest->flags & MF_SHADOW)
-	an += P_SubRandom() << 20;
+  /* only respawn items in deathmatch */
 
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul (th->info->speed, finecosine[an]);
-    th->momy = FixedMul (th->info->speed, finesine[an]);
-	
-    dist = P_AproxDistance (dest->x - source->x, dest->y - source->y);
-    dist = dist / th->info->speed;
+  if (deathmatch != 2) return;
 
-    if (dist < 1)
-	dist = 1;
+  /* nothing left to respawn? */
 
-    th->momz = (dest->z - source->z) / dist;
-    P_CheckMissileSpawn (th);
-	
-    return th;
-}
+  if (iquehead == iquetail) return;
 
+  /* wait at least 30 seconds */
 
-//
-// P_SpawnPlayerMissile
-// Tries to aim at a nearby monster
-//
-void
-P_SpawnPlayerMissile
-( mobj_t*	source,
-  mobjtype_t	type )
-{
-    mobj_t*	th;
-    angle_t	an;
-    
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	z;
-    fixed_t	slope;
-    
-    // see which target is to be aimed at
-    an = source->angle;
-    slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
-    
-    if (!linetarget)
+  if (leveltime - itemrespawntime[iquetail] < 30 * TICRATE) return;
+
+  mthing = &itemrespawnque[iquetail];
+
+  x = mthing->x << FRACBITS;
+  y = mthing->y << FRACBITS;
+
+  /* spawn a teleport fog at the new spot */
+
+  ss = r_point_in_subsector(x, y);
+  mo = p_spawn_mobj(x, y, ss->sector->floorheight, MT_IFOG);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(mo, SFX_ITMBK);
+#endif
+
+  /* find which type to spawn */
+
+  for (i = 0; i < NUMMOBJTYPES; i++)
     {
-	an += 1<<26;
-	slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
-
-	if (!linetarget)
-	{
-	    an -= 2<<26;
-	    slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
-	}
-
-	if (!linetarget)
-	{
-	    an = source->angle;
-	    slope = 0;
-	}
+      if (mthing->type == mobjinfo[i].doomednum) break;
     }
-		
-    x = source->x;
-    y = source->y;
-    z = source->z + 4*8*FRACUNIT;
-	
-    th = P_SpawnMobj (x,y,z, type);
 
-    if (th->info->seesound)
-	S_StartSound (th, th->info->seesound);
+  if (i >= NUMMOBJTYPES)
+    {
+      i_error("p_respawn_specials: Failed to find mobj type with doomednum "
+              "%d when respawning thing. This would cause a buffer overrun "
+              "in vanilla Doom",
+              mthing->type);
+    }
 
-    th->target = source;
-    th->angle = an;
-    th->momx = FixedMul( th->info->speed,
-			 finecosine[an>>ANGLETOFINESHIFT]);
-    th->momy = FixedMul( th->info->speed,
-			 finesine[an>>ANGLETOFINESHIFT]);
-    th->momz = FixedMul( th->info->speed, slope);
+  /* spawn it */
 
-    P_CheckMissileSpawn (th);
+  if (mobjinfo[i].flags & MF_SPAWNCEILING)
+    z = ONCEILINGZ;
+  else
+    z = ONFLOORZ;
+
+  mo = p_spawn_mobj(x, y, z, i);
+  mo->spawnpoint = *mthing;
+  mo->angle = ANG45 * (mthing->angle / 45);
+
+  /* pull it from the que */
+
+  iquetail = (iquetail + 1) & (ITEMQUESIZE - 1);
 }
 
+/****************************************************************************
+ * Name: p_spawn_player
+ *
+ * Description:
+ *  Called when a player is spawned on the level.
+ *  Most of the player structure stays unchanged between levels.
+ *
+ ****************************************************************************/
+
+void p_spawn_player(mapthing_t *mthing)
+{
+  player_t *p;
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
+
+  mobj_t *mobj;
+
+  int i;
+
+  if (mthing->type == 0)
+    {
+      return;
+    }
+
+  /* not playing? */
+
+  if (!playeringame[mthing->type - 1]) return;
+
+  p = &players[mthing->type - 1];
+
+  if (p->playerstate == PST_REBORN) g_player_reborn(mthing->type - 1);
+
+  x = mthing->x << FRACBITS;
+  y = mthing->y << FRACBITS;
+  z = ONFLOORZ;
+  mobj = p_spawn_mobj(x, y, z, MT_PLAYER);
+
+  /* set color translations for player sprites */
+
+  if (mthing->type > 1) mobj->flags |= (mthing->type - 1) << MF_TRANSSHIFT;
+
+  mobj->angle = ANG45 * (mthing->angle / 45);
+  mobj->player = p;
+  mobj->health = p->health;
+
+  p->mo = mobj;
+  p->playerstate = PST_LIVE;
+  p->refire = 0;
+  p->message = NULL;
+  p->damagecount = 0;
+  p->bonuscount = 0;
+  p->extralight = 0;
+  p->fixedcolormap = 0;
+  p->viewheight = VIEWHEIGHT;
+
+  p_setup_psprites(p); /* setup gun psprite */
+
+  /* give all cards in death match mode */
+
+  if (deathmatch)
+    {
+      for (i = 0; i < NUMCARDS; i++)
+        {
+          p->cards[i] = true;
+        }
+    }
+
+  if (mthing->type - 1 == consoleplayer)
+    {
+      st_start(); /* wake up the status bar */
+      hu_start(); /* wake up the heads up text */
+    }
+}
+
+/****************************************************************************
+ * Name: p_spawn_map_thing
+ *
+ * Description:
+ *  The fields of the mapthing should already be in host byte order.
+ *
+ ****************************************************************************/
+
+void p_spawn_map_thing(mapthing_t *mthing)
+{
+  int i;
+  int bit;
+  mobj_t *mobj;
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
+
+  /* count deathmatch start positions */
+
+  if (mthing->type == 11)
+    {
+      if (deathmatch_p < &deathmatchstarts[10])
+        {
+          memcpy(deathmatch_p, mthing, sizeof(*mthing));
+          deathmatch_p++;
+        }
+
+      return;
+    }
+
+  if (mthing->type <= 0)
+    {
+      /* Thing type 0 is actually "player -1 start".
+       * For some reason, Vanilla Doom accepts/ignores this.
+       */
+
+      return;
+    }
+
+  /* check for players specially */
+
+  if (mthing->type <= 4)
+    {
+      /* save spots for respawning in network games */
+
+      playerstarts[mthing->type - 1] = *mthing;
+      playerstartsingame[mthing->type - 1] = true;
+      if (!deathmatch) p_spawn_player(mthing);
+
+      return;
+    }
+
+  /* check for appropriate skill level */
+
+  if (!netgame && (mthing->options & 16)) return;
+
+  if (gameskill == sk_baby)
+    {
+      bit = 1;
+    }
+  else if (gameskill == sk_nightmare)
+    {
+      bit = 4;
+    }
+  else
+    {
+      /* avoid undefined behavior (left shift by negative value and rhs too
+       * big) by accurately emulating what doom.exe did: reduce mod 32. For
+       * more details check:
+       * https://github.com/chocolate-doom/chocolate-doom/issues/1677
+       */
+
+      bit = (int)(1U << ((gameskill - 1) & 0x1f));
+    }
+
+  if (!(mthing->options & bit)) return;
+
+  /* find which type to spawn */
+
+  for (i = 0; i < NUMMOBJTYPES; i++)
+    {
+      if (mthing->type == mobjinfo[i].doomednum) break;
+    }
+
+  if (i == NUMMOBJTYPES)
+    i_error("p_spawn_map_thing: Unknown type %i at (%i, %i)", mthing->type,
+            mthing->x, mthing->y);
+
+  /* don't spawn keycards and players in deathmatch */
+
+  if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH) return;
+
+  /* don't spawn any monsters if -nomonsters */
+
+  if (nomonsters && (i == MT_SKULL || (mobjinfo[i].flags & MF_COUNTKILL)))
+    {
+      return;
+    }
+
+  /* spawn it */
+
+  x = mthing->x << FRACBITS;
+  y = mthing->y << FRACBITS;
+
+  if (mobjinfo[i].flags & MF_SPAWNCEILING)
+    z = ONCEILINGZ;
+  else
+    z = ONFLOORZ;
+
+  mobj = p_spawn_mobj(x, y, z, i);
+  mobj->spawnpoint = *mthing;
+
+  if (mobj->tics > 0) mobj->tics = 1 + (p_random() % mobj->tics);
+  if (mobj->flags & MF_COUNTKILL) totalkills++;
+  if (mobj->flags & MF_COUNTITEM) totalitems++;
+
+  mobj->angle = ANG45 * (mthing->angle / 45);
+  if (mthing->options & MTF_AMBUSH) mobj->flags |= MF_AMBUSH;
+}
+
+/* GAME SPAWN FUNCTIONS */
+
+/****************************************************************************
+ * Name: p_spawn_puff
+ ****************************************************************************/
+
+void p_spawn_puff(fixed_t x, fixed_t y, fixed_t z)
+{
+  mobj_t *th;
+
+  z += (p_sub_random() << 10);
+
+  th = p_spawn_mobj(x, y, z, MT_PUFF);
+  th->momz = FRACUNIT;
+  th->tics -= p_random() & 3;
+
+  if (th->tics < 1) th->tics = 1;
+
+  /* don't make punches spark on the wall */
+
+  if (attackrange == MELEERANGE) p_set_mobj_state(th, S_PUFF3);
+}
+
+/****************************************************************************
+ * Name: p_spawn_blood
+ ****************************************************************************/
+
+void p_spawn_blood(fixed_t x, fixed_t y, fixed_t z, int damage)
+{
+  mobj_t *th;
+
+  z += (p_sub_random() << 10);
+  th = p_spawn_mobj(x, y, z, MT_BLOOD);
+  th->momz = FRACUNIT * 2;
+  th->tics -= p_random() & 3;
+
+  if (th->tics < 1) th->tics = 1;
+
+  if (damage <= 12 && damage >= 9)
+    p_set_mobj_state(th, S_BLOOD2);
+  else if (damage < 9)
+    p_set_mobj_state(th, S_BLOOD3);
+}
+
+/****************************************************************************
+ * Name: p_subst_null_mobj
+ *
+ * Description:
+ *  Certain functions assume that a mobj_t pointer is non-NULL,
+ *  causing a crash in some situations where it is NULL.  Vanilla
+ *  Doom did not crash because of the lack of proper memory
+ *  protection. This function substitutes NULL pointers for
+ *  pointers to a dummy mobj, to avoid a crash.
+ *
+ ****************************************************************************/
+
+mobj_t *p_subst_null_mobj(mobj_t *mobj)
+{
+  if (mobj == NULL)
+    {
+      static mobj_t dummy_mobj;
+
+      dummy_mobj.x = 0;
+      dummy_mobj.y = 0;
+      dummy_mobj.z = 0;
+      dummy_mobj.flags = 0;
+
+      mobj = &dummy_mobj;
+    }
+
+  return mobj;
+}
+
+/****************************************************************************
+ * Name: p_spawn_missile
+ ****************************************************************************/
+
+mobj_t *p_spawn_missile(mobj_t *source, mobj_t *dest, mobjtype_t type)
+{
+  mobj_t *th;
+  angle_t an;
+  int dist;
+
+  th = p_spawn_mobj(source->x, source->y,
+          source->z + 4 * 8 * FRACUNIT, type);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (th->info->seesound) s_start_sound(th, th->info->seesound);
+#endif
+
+  th->target = source; /* where it came from */
+  an = r_point_to_angle2(source->x, source->y, dest->x, dest->y);
+
+  /* fuzzy player */
+
+  if (dest->flags & MF_SHADOW) an += p_sub_random() << 20;
+
+  th->angle = an;
+  an >>= ANGLETOFINESHIFT;
+  th->momx = fixed_mul(th->info->speed, finecosine[an]);
+  th->momy = fixed_mul(th->info->speed, finesine[an]);
+
+  dist = p_approx_distance(dest->x - source->x, dest->y - source->y);
+  dist = dist / th->info->speed;
+
+  if (dist < 1) dist = 1;
+
+  th->momz = (dest->z - source->z) / dist;
+  p_check_missile_spawn(th);
+
+  return th;
+}
+
+/****************************************************************************
+ * Name: p_spawn_player_missile
+ *
+ * Description:
+ *  Tries to aim at a nearby monster
+ *
+ ****************************************************************************/
+
+void p_spawn_player_missile(mobj_t *source, mobjtype_t type)
+{
+  mobj_t *th;
+  angle_t an;
+
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
+  fixed_t slope;
+
+  /* see which target is to be aimed at */
+
+  an = source->angle;
+  slope = p_aim_line_attack(source, an, 16 * 64 * FRACUNIT);
+
+  if (!linetarget)
+    {
+      an += 1 << 26;
+      slope = p_aim_line_attack(source, an, 16 * 64 * FRACUNIT);
+
+      if (!linetarget)
+        {
+          an -= 2 << 26;
+          slope = p_aim_line_attack(source, an, 16 * 64 * FRACUNIT);
+        }
+
+      if (!linetarget)
+        {
+          an = source->angle;
+          slope = 0;
+        }
+    }
+
+  x = source->x;
+  y = source->y;
+  z = source->z + 4 * 8 * FRACUNIT;
+
+  th = p_spawn_mobj(x, y, z, type);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (th->info->seesound) s_start_sound(th, th->info->seesound);
+#endif
+
+  th->target = source;
+  th->angle = an;
+  th->momx = fixed_mul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
+  th->momy = fixed_mul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
+  th->momz = fixed_mul(th->info->speed, slope);
+
+  p_check_missile_spawn(th);
+}
diff --git a/games/NXDoom/src/doom/p_mobj.h b/games/NXDoom/src/doom/p_mobj.h
index 90ed764b9..6cd73f3a6 100644
--- a/games/NXDoom/src/doom/p_mobj.h
+++ b/games/NXDoom/src/doom/p_mobj.h
@@ -1,284 +1,357 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Map Objects, MObj, definition and handling.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_mobj.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Map Objects, MObj, definition and handling.
+ *
+ ****************************************************************************/
 
 #ifndef __P_MOBJ__
 #define __P_MOBJ__
 
-// Basics.
-#include "tables.h"
-#include "m_fixed.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Basics. */
+
+#include "m_fixed.h"
+#include "tables.h"
+
+/* We need the thinker_t stuff. */
 
-// We need the thinker_t stuff.
 #include "d_think.h"
 
-// We need the WAD data structure for Map things,
-// from the THINGS lump.
+/* We need the WAD data structure for Map things, from the THINGS lump. */
+
 #include "doomdata.h"
 
-// States are tied to finite states are
-//  tied to animation frames.
-// Needs precompiled tables/data structures.
+/* States are tied to finite states are tied to animation frames.
+ * Needs precompiled tables/data structures.
+ */
+
 #include "info.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* NOTES: mobj_t
+ *
+ * mobj_ts are used to tell the refresh where to draw an image,
+ * tell the world simulation when objects are contacted,
+ * and tell the sound driver how to position a sound.
+ *
+ * The refresh uses the next and prev links to follow
+ * lists of things in sectors as they are being drawn.
+ * The sprite, frame, and angle elements determine which patch_t
+ * is used to draw the sprite if it is visible.
+ * The sprite and frame values are almost always set
+ * from state_t structures.
+ * The statescr.exe utility generates the states.h and states.c
+ * files that contain the sprite/frame numbers from the
+ * statescr.txt source file.
+ * The xyz origin point represents a point at the bottom middle
+ * of the sprite (between the feet of a biped).
+ * This is the default origin position for patch_ts grabbed
+ * with lumpy.exe.
+ * A walking creature will have its z equal to the floor
+ * it is standing on.
+ *
+ * The sound code uses the x,y, and subsector fields
+ * to do stereo positioning of any sound effited by the mobj_t.
+ *
+ * The play simulation uses the blocklinks, x,y,z, radius, height
+ * to determine when mobj_ts are touching each other,
+ * touching lines in the map, or hit by trace lines (gunshots,
+ * lines of sight, etc).
+ * The mobj_t->flags element has various bit flags
+ * used by the simulation.
+ *
+ * Every mobj_t is linked into a single sector
+ * based on its origin coordinates.
+ * The subsector_t is found with r_point_in_subsector(x,y),
+ * and the sector_t can be found with subsector->sector.
+ * The sector links are only used by the rendering code,
+ * the play simulation does not care about them at all.
+ *
+ * Any mobj_t that needs to be acted upon by something else
+ * in the play world (block movement, be shot, etc) will also
+ * need to be linked into the blockmap.
+ * If the thing has the MF_NOBLOCK flag set, it will not use
+ * the block links. It can still interact with other things,
+ * but only as the instigator (missiles will run into other
+ * things, but nothing can run into a missile).
+ * Each block in the grid is 128*128 units, and knows about
+ * every line_t that it contains a piece of, and every
+ * interactable mobj_t that has its origin contained.
+ *
+ * A valid mobj_t is a mobj_t that has the proper subsector_t
+ * filled in for its xy coordinates and is linked into the
+ * sector from which the subsector was made, or has the
+ * MF_NOSECTOR flag set (the subsector_t needs to be valid
+ * even if MF_NOSECTOR is set), and is linked into a blockmap
+ * block or has the MF_NOBLOCKMAP flag set.
+ * Links should only be modified by the P_[Un]SetThingPosition()
+ * functions.
+ * Do not change the MF_NO? flags while a thing is valid.
+ *
+ * Any questions?
+ */
 
+/* Misc. mobj flags */
 
-
-
-//
-// NOTES: mobj_t
-//
-// mobj_ts are used to tell the refresh where to draw an image,
-// tell the world simulation when objects are contacted,
-// and tell the sound driver how to position a sound.
-//
-// The refresh uses the next and prev links to follow
-// lists of things in sectors as they are being drawn.
-// The sprite, frame, and angle elements determine which patch_t
-// is used to draw the sprite if it is visible.
-// The sprite and frame values are allmost allways set
-// from state_t structures.
-// The statescr.exe utility generates the states.h and states.c
-// files that contain the sprite/frame numbers from the
-// statescr.txt source file.
-// The xyz origin point represents a point at the bottom middle
-// of the sprite (between the feet of a biped).
-// This is the default origin position for patch_ts grabbed
-// with lumpy.exe.
-// A walking creature will have its z equal to the floor
-// it is standing on.
-//
-// The sound code uses the x,y, and subsector fields
-// to do stereo positioning of any sound effited by the mobj_t.
-//
-// The play simulation uses the blocklinks, x,y,z, radius, height
-// to determine when mobj_ts are touching each other,
-// touching lines in the map, or hit by trace lines (gunshots,
-// lines of sight, etc).
-// The mobj_t->flags element has various bit flags
-// used by the simulation.
-//
-// Every mobj_t is linked into a single sector
-// based on its origin coordinates.
-// The subsector_t is found with R_PointInSubsector(x,y),
-// and the sector_t can be found with subsector->sector.
-// The sector links are only used by the rendering code,
-// the play simulation does not care about them at all.
-//
-// Any mobj_t that needs to be acted upon by something else
-// in the play world (block movement, be shot, etc) will also
-// need to be linked into the blockmap.
-// If the thing has the MF_NOBLOCK flag set, it will not use
-// the block links. It can still interact with other things,
-// but only as the instigator (missiles will run into other
-// things, but nothing can run into a missile).
-// Each block in the grid is 128*128 units, and knows about
-// every line_t that it contains a piece of, and every
-// interactable mobj_t that has its origin contained.  
-//
-// A valid mobj_t is a mobj_t that has the proper subsector_t
-// filled in for its xy coordinates and is linked into the
-// sector from which the subsector was made, or has the
-// MF_NOSECTOR flag set (the subsector_t needs to be valid
-// even if MF_NOSECTOR is set), and is linked into a blockmap
-// block or has the MF_NOBLOCKMAP flag set.
-// Links should only be modified by the P_[Un]SetThingPosition()
-// functions.
-// Do not change the MF_NO? flags while a thing is valid.
-//
-// Any questions?
-//
-
-//
-// Misc. mobj flags
-//
 typedef enum
 {
-    // Call P_SpecialThing when touched.
-    MF_SPECIAL		= 1,
-    // Blocks.
-    MF_SOLID		= 2,
-    // Can be hit.
-    MF_SHOOTABLE	= 4,
-    // Don't use the sector links (invisible but touchable).
-    MF_NOSECTOR		= 8,
-    // Don't use the blocklinks (inert but displayable)
-    MF_NOBLOCKMAP	= 16,                    
+  MF_SPECIAL = 1,   /* Call P_SpecialThing when touched. */
+  MF_SOLID = 2,     /* Blocks. */
+  MF_SHOOTABLE = 4, /* Can be hit. */
 
-    // Not to be activated by sound, deaf monster.
-    MF_AMBUSH		= 32,
-    // Will try to attack right back.
-    MF_JUSTHIT		= 64,
-    // Will take at least one step before attacking.
-    MF_JUSTATTACKED	= 128,
-    // On level spawning (initial position),
-    //  hang from ceiling instead of stand on floor.
-    MF_SPAWNCEILING	= 256,
-    // Don't apply gravity (every tic),
-    //  that is, object will float, keeping current height
-    //  or changing it actively.
-    MF_NOGRAVITY	= 512,
+  /* Don't use the sector links (invisible but touchable). */
 
-    // Movement flags.
-    // This allows jumps from high places.
-    MF_DROPOFF		= 0x400,
-    // For players, will pick up items.
-    MF_PICKUP		= 0x800,
-    // Player cheat. ???
-    MF_NOCLIP		= 0x1000,
-    // Player: keep info about sliding along walls.
-    MF_SLIDE		= 0x2000,
-    // Allow moves to any height, no gravity.
-    // For active floaters, e.g. cacodemons, pain elementals.
-    MF_FLOAT		= 0x4000,
-    // Don't cross lines
-    //   ??? or look at heights on teleport.
-    MF_TELEPORT		= 0x8000,
-    // Don't hit same species, explode on block.
-    // Player missiles as well as fireballs of various kinds.
-    MF_MISSILE		= 0x10000,	
-    // Dropped by a demon, not level spawned.
-    // E.g. ammo clips dropped by dying former humans.
-    MF_DROPPED		= 0x20000,
-    // Use fuzzy draw (shadow demons or spectres),
-    //  temporary player invisibility powerup.
-    MF_SHADOW		= 0x40000,
-    // Flag: don't bleed when shot (use puff),
-    //  barrels and shootable furniture shall not bleed.
-    MF_NOBLOOD		= 0x80000,
-    // Don't stop moving halfway off a step,
-    //  that is, have dead bodies slide down all the way.
-    MF_CORPSE		= 0x100000,
-    // Floating to a height for a move, ???
-    //  don't auto float to target's height.
-    MF_INFLOAT		= 0x200000,
+  MF_NOSECTOR = 8,
 
-    // On kill, count this enemy object
-    //  towards intermission kill total.
-    // Happy gathering.
-    MF_COUNTKILL	= 0x400000,
-    
-    // On picking up, count this item object
-    //  towards intermission item total.
-    MF_COUNTITEM	= 0x800000,
+  /* Don't use the blocklinks (inert but displayable) */
 
-    // Special handling: skull in flight.
-    // Neither a cacodemon nor a missile.
-    MF_SKULLFLY		= 0x1000000,
+  MF_NOBLOCKMAP = 16,
 
-    // Don't spawn this object
-    //  in death match mode (e.g. key cards).
-    MF_NOTDMATCH    	= 0x2000000,
+  /* Not to be activated by sound, deaf monster. */
 
-    // Player sprites in multiplayer modes are modified
-    //  using an internal color lookup table for re-indexing.
-    // If 0x4 0x8 or 0xc,
-    //  use a translation table for player colormaps
-    MF_TRANSLATION  	= 0xc000000,
-    // Hmm ???.
-    MF_TRANSSHIFT	= 26
+  MF_AMBUSH = 32,
 
+  /* Will try to attack right back. */
+
+  MF_JUSTHIT = 64,
+
+  /* Will take at least one step before attacking. */
+
+  MF_JUSTATTACKED = 128,
+
+  /* On level spawning (initial position), hang from ceiling instead of stand
+   * on floor.
+   */
+
+  MF_SPAWNCEILING = 256,
+
+  /* Don't apply gravity (every tic), that is, object will float, keeping
+   * current height or changing it actively.
+   */
+
+  MF_NOGRAVITY = 512,
+
+  /* Movement flags. This allows jumps from high places. */
+
+  MF_DROPOFF = 0x400,
+
+  /* For players, will pick up items. */
+
+  MF_PICKUP = 0x800,
+
+  /* Player cheat. ??? */
+
+  MF_NOCLIP = 0x1000,
+
+  /* Player: keep info about sliding along walls. */
+
+  MF_SLIDE = 0x2000,
+
+  /* Allow moves to any height, no gravity.
+   * For active floaters, e.g. cacodemons, pain elementals.
+   */
+
+  MF_FLOAT = 0x4000,
+
+  /* Don't cross lines ??? or look at heights on teleport. */
+
+  MF_TELEPORT = 0x8000,
+
+  /* Don't hit same species, explode on block.
+   * Player missiles as well as fireballs of various kinds.
+   */
+
+  MF_MISSILE = 0x10000,
+
+  /* Dropped by a demon, not level spawned.
+   * E.g. ammo clips dropped by dying former humans.
+   */
+
+  MF_DROPPED = 0x20000,
+
+  /* Use fuzzy draw (shadow demons or spectres), temporary player
+   * invisibility powerup.
+   */
+
+  MF_SHADOW = 0x40000,
+
+  /* Flag: don't bleed when shot (use puff), barrels and shootable furniture
+   * shall not bleed.
+   */
+
+  MF_NOBLOOD = 0x80000,
+
+  /* Don't stop moving halfway off a step, that is, have dead bodies slide
+   * down all the way.
+   */
+
+  MF_CORPSE = 0x100000,
+
+  /* Floating to a height for a move, ??? don't auto float to target's
+   * height.
+   */
+
+  MF_INFLOAT = 0x200000,
+
+  /* On kill, count this enemy object towards intermission kill total.
+   * Happy gathering.
+   */
+
+  MF_COUNTKILL = 0x400000,
+
+  /* On picking up, count this item object towards intermission item total. */
+
+  MF_COUNTITEM = 0x800000,
+
+  /* Special handling: skull in flight.
+   * Neither a cacodemon nor a missile.
+   */
+
+  MF_SKULLFLY = 0x1000000,
+
+  /* Don't spawn this object in death match mode (e.g. key cards).
+   */
+
+  MF_NOTDMATCH = 0x2000000,
+
+  /* Player sprites in multiplayer modes are modified using an internal color
+   * lookup table for re-indexing.
+   *
+   * If 0x4 0x8 or 0xc, use a translation table for player colormaps
+   */
+
+  MF_TRANSLATION = 0xc000000,
+
+  /* Hmm ???. */
+
+  MF_TRANSSHIFT = 26
 } mobjflag_t;
 
+/* Map Object definition. */
 
-// Map Object definition.
 typedef struct mobj_s
 {
-    // List: thinker links.
-    thinker_t		thinker;
+  /* List: thinker links. */
 
-    // Info for drawing: position.
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
+  thinker_t thinker;
 
-    // More list: links in sector (if needed)
-    struct mobj_s*	snext;
-    struct mobj_s*	sprev;
+  /* Info for drawing: position. */
 
-    //More drawing info: to determine current sprite.
-    angle_t		angle;	// orientation
-    spritenum_t		sprite;	// used to find patch_t and flip value
-    int			frame;	// might be ORed with FF_FULLBRIGHT
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
 
-    // Interaction info, by BLOCKMAP.
-    // Links in blocks (if needed).
-    struct mobj_s*	bnext;
-    struct mobj_s*	bprev;
-    
-    struct subsector_s*	subsector;
+  /* More list: links in sector (if needed) */
 
-    // The closest interval over all contacted Sectors.
-    fixed_t		floorz;
-    fixed_t		ceilingz;
+  struct mobj_s *snext;
+  struct mobj_s *sprev;
 
-    // For movement checking.
-    fixed_t		radius;
-    fixed_t		height;	
+  /* More drawing info: to determine current sprite. */
 
-    // Momentums, used to update position.
-    fixed_t		momx;
-    fixed_t		momy;
-    fixed_t		momz;
+  angle_t angle;      /* orientation */
+  spritenum_t sprite; /* used to find patch_t and flip value */
+  int frame;          /* might be ORed with FF_FULLBRIGHT */
 
-    // If == validcount, already checked.
-    int			validcount;
+  /* Interaction info, by BLOCKMAP.
+   * Links in blocks (if needed).
+   */
 
-    mobjtype_t		type;
-    mobjinfo_t*		info;	// &mobjinfo[mobj->type]
-    
-    int			tics;	// state tic counter
-    state_t*		state;
-    int			flags;
-    int			health;
+  struct mobj_s *bnext;
+  struct mobj_s *bprev;
 
-    // Movement direction, movement generation (zig-zagging).
-    int			movedir;	// 0-7
-    int			movecount;	// when 0, select a new dir
+  struct subsector_s *subsector;
 
-    // Thing being chased/attacked (or NULL),
-    // also the originator for missiles.
-    struct mobj_s*	target;
+  /* The closest interval over all contacted Sectors. */
 
-    // Reaction time: if non 0, don't attack yet.
-    // Used by player to freeze a bit after teleporting.
-    int			reactiontime;   
+  fixed_t floorz;
+  fixed_t ceilingz;
 
-    // If >0, the target will be chased
-    // no matter what (even if shot)
-    int			threshold;
+  /* For movement checking. */
 
-    // Additional info record for player avatars only.
-    // Only valid if type == MT_PLAYER
-    struct player_s*	player;
+  fixed_t radius;
+  fixed_t height;
 
-    // Player number last looked for.
-    int			lastlook;	
+  /* Momentums, used to update position. */
 
-    // For nightmare respawn.
-    mapthing_t		spawnpoint;	
+  fixed_t momx;
+  fixed_t momy;
+  fixed_t momz;
 
-    // Thing being chased/attacked for tracers.
-    struct mobj_s*	tracer;	
-    
+  /* If == validcount, already checked. */
+
+  int validcount;
+
+  mobjtype_t type;
+  mobjinfo_t *info; /* &mobjinfo[mobj->type] */
+
+  int tics; /* state tic counter */
+  state_t *state;
+  int flags;
+  int health;
+
+  /* Movement direction, movement generation (zig-zagging). */
+
+  int movedir;   /* 0-7 */
+  int movecount; /* when 0, select a new dir */
+
+  /* Thing being chased/attacked (or NULL),
+   * also the originator for missiles.
+   */
+
+  struct mobj_s *target;
+
+  /* Reaction time: if non 0, don't attack yet.
+   * Used by player to freeze a bit after teleporting.
+   */
+
+  int reactiontime;
+
+  /* If >0, the target will be chased
+   * no matter what (even if shot)
+   */
+
+  int threshold;
+
+  /* Additional info record for player avatars only.
+   * Only valid if type == MT_PLAYER
+   */
+
+  struct player_s *player;
+
+  /* Player number last looked for. */
+
+  int lastlook;
+
+  /* For nightmare re-spawn. */
+
+  mapthing_t spawnpoint;
+
+  /* Thing being chased/attacked for tracers. */
+
+  struct mobj_s *tracer;
 } mobj_t;
 
-
-
-#endif
+#endif /* __P_MOBJ__ */
diff --git a/games/NXDoom/src/doom/p_plats.c b/games/NXDoom/src/doom/p_plats.c
index 9e773d55c..8cbbf7052 100644
--- a/games/NXDoom/src/doom/p_plats.c
+++ b/games/NXDoom/src/doom/p_plats.c
@@ -1,304 +1,336 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Plats (i.e. elevator platforms) code, raising/lowering.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_plats.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Plats (i.e. elevator platforms) code, raising/lowering.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
 #include "i_system.h"
-#include "z_zone.h"
 #include "m_random.h"
+#include "z_zone.h"
 
 #include "doomdef.h"
 #include "p_local.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* State. */
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
 
-// Data.
-#include "sounds.h"
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+plat_t *activeplats[MAXPLATS];
 
-plat_t*		activeplats[MAXPLATS];
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/* Move a plat up and down */
 
-
-//
-// Move a plat up and down
-//
-void T_PlatRaise(plat_t* plat)
+void t_plat_raise(plat_t *plat)
 {
-    result_e	res;
-	
-    switch(plat->status)
+  result_e res;
+
+  switch (plat->status)
     {
-      case up:
-	res = T_MovePlane(plat->sector,
-			  plat->speed,
-			  plat->high,
-			  plat->crush,0,1);
-					
-	if (plat->type == raiseAndChange
-	    || plat->type == raiseToNearestAndChange)
-	{
-	    if (!(leveltime&7))
-		S_StartSound(&plat->sector->soundorg, sfx_stnmov);
-	}
-	
-				
-	if (res == crushed && (!plat->crush))
-	{
-	    plat->count = plat->wait;
-	    plat->status = down;
-	    S_StartSound(&plat->sector->soundorg, sfx_pstart);
-	}
-	else
-	{
-	    if (res == pastdest)
-	    {
-		plat->count = plat->wait;
-		plat->status = waiting;
-		S_StartSound(&plat->sector->soundorg, sfx_pstop);
+    case up:
+      res = t_move_plane(plat->sector, plat->speed,
+              plat->high, plat->crush, 0, 1);
 
-		switch(plat->type)
-		{
-		  case blazeDWUS:
-		  case downWaitUpStay:
-		    P_RemoveActivePlat(plat);
-		    break;
-		    
-		  case raiseAndChange:
-		  case raiseToNearestAndChange:
-		    P_RemoveActivePlat(plat);
-		    break;
-		    
-		  default:
-		    break;
-		}
-	    }
-	}
-	break;
-	
-      case	down:
-	res = T_MovePlane(plat->sector,plat->speed,plat->low,false,0,-1);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (plat->type == PLAT_RAISEANDCHANGE ||
+          plat->type == PLAT_RAISETONEARESTANDCHANGE)
+        {
+          if (!(leveltime & 7))
+            s_start_sound(&plat->sector->soundorg, SFX_STNMOV);
+        }
+#endif
 
-	if (res == pastdest)
-	{
-	    plat->count = plat->wait;
-	    plat->status = waiting;
-	    S_StartSound(&plat->sector->soundorg,sfx_pstop);
-	}
-	break;
-	
-      case	waiting:
-	if (!--plat->count)
-	{
-	    if (plat->sector->floorheight == plat->low)
-		plat->status = up;
-	    else
-		plat->status = down;
-	    S_StartSound(&plat->sector->soundorg,sfx_pstart);
-	}
-      case	in_stasis:
-	break;
+      if (res == crushed && (!plat->crush))
+        {
+          plat->count = plat->wait;
+          plat->status = down;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&plat->sector->soundorg, SFX_PSTART);
+#endif
+        }
+      else
+        {
+          if (res == pastdest)
+            {
+              plat->count = plat->wait;
+              plat->status = waiting;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(&plat->sector->soundorg, SFX_PSTOP);
+#endif
+
+              switch (plat->type)
+                {
+                case PLAT_BLAZEDWUS:
+                case PLAT_DOWNWAITUPSTAY:
+                  p_remove_active_plat(plat);
+                  break;
+
+                case PLAT_RAISEANDCHANGE:
+                case PLAT_RAISETONEARESTANDCHANGE:
+                  p_remove_active_plat(plat);
+                  break;
+
+                default:
+                  break;
+                }
+            }
+        }
+      break;
+
+    case down:
+      res = t_move_plane(plat->sector, plat->speed, plat->low, false, 0, -1);
+
+      if (res == pastdest)
+        {
+          plat->count = plat->wait;
+          plat->status = waiting;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&plat->sector->soundorg, SFX_PSTOP);
+#endif
+        }
+      break;
+
+    case waiting:
+      if (!--plat->count)
+        {
+          if (plat->sector->floorheight == plat->low)
+            plat->status = up;
+          else
+            plat->status = down;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&plat->sector->soundorg, SFX_PSTART);
+#endif
+        }
+
+    case in_stasis:
+      break;
     }
 }
 
+/* Do Platforms
+ *  "amount" is only used for SOME platforms.
+ */
 
-//
-// Do Platforms
-//  "amount" is only used for SOME platforms.
-//
-int
-EV_DoPlat
-( line_t*	line,
-  plattype_e	type,
-  int		amount )
+int ev_do_plat(line_t *line, plattype_e type, int amount)
 {
-    plat_t*	plat;
-    int		secnum;
-    int		rtn;
-    sector_t*	sec;
-	
-    secnum = -1;
-    rtn = 0;
+  plat_t *plat;
+  int secnum;
+  int rtn;
+  sector_t *sec;
 
-    
-    //	Activate all <type> plats that are in_stasis
-    switch(type)
+  secnum = -1;
+  rtn = 0;
+
+  /* Activate all <type> plats that are in_stasis */
+
+  switch (type)
     {
-      case perpetualRaise:
-	P_ActivateInStasis(line->tag);
-	break;
-	
-      default:
-	break;
+    case PLAT_PERPETUALRAISE:
+      p_activate_in_stasis(line->tag);
+      break;
+
+    default:
+      break;
     }
-	
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
     {
-	sec = &sectors[secnum];
+      sec = &sectors[secnum];
 
-	if (sec->specialdata)
-	    continue;
-	
-	// Find lowest & highest floors around sector
-	rtn = 1;
-	plat = Z_Malloc( sizeof(*plat), PU_LEVSPEC, 0);
-	P_AddThinker(&plat->thinker);
-		
-	plat->type = type;
-	plat->sector = sec;
-	plat->sector->specialdata = plat;
-	plat->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
-	plat->crush = false;
-	plat->tag = line->tag;
-	
-	switch(type)
-	{
-	  case raiseToNearestAndChange:
-	    plat->speed = PLATSPEED/2;
-	    sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-	    plat->high = P_FindNextHighestFloor(sec,sec->floorheight);
-	    plat->wait = 0;
-	    plat->status = up;
-	    // NO MORE DAMAGE, IF APPLICABLE
-	    sec->special = 0;		
+      if (sec->specialdata) continue;
 
-	    S_StartSound(&sec->soundorg,sfx_stnmov);
-	    break;
-	    
-	  case raiseAndChange:
-	    plat->speed = PLATSPEED/2;
-	    sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-	    plat->high = sec->floorheight + amount*FRACUNIT;
-	    plat->wait = 0;
-	    plat->status = up;
+      /* Find lowest & highest floors around sector */
 
-	    S_StartSound(&sec->soundorg,sfx_stnmov);
-	    break;
-	    
-	  case downWaitUpStay:
-	    plat->speed = PLATSPEED * 4;
-	    plat->low = P_FindLowestFloorSurrounding(sec);
+      rtn = 1;
+      plat = z_malloc(sizeof(*plat), PU_LEVSPEC, 0);
+      p_add_thinker(&plat->thinker);
 
-	    if (plat->low > sec->floorheight)
-		plat->low = sec->floorheight;
+      plat->type = type;
+      plat->sector = sec;
+      plat->sector->specialdata = plat;
+      plat->thinker.function.acp1 = (actionf_p1)t_plat_raise;
+      plat->crush = false;
+      plat->tag = line->tag;
 
-	    plat->high = sec->floorheight;
-	    plat->wait = TICRATE*PLATWAIT;
-	    plat->status = down;
-	    S_StartSound(&sec->soundorg,sfx_pstart);
-	    break;
-	    
-	  case blazeDWUS:
-	    plat->speed = PLATSPEED * 8;
-	    plat->low = P_FindLowestFloorSurrounding(sec);
+      switch (type)
+        {
+        case PLAT_RAISETONEARESTANDCHANGE:
+          plat->speed = PLATSPEED / 2;
+          sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+          plat->high = p_find_next_highest_floor(sec, sec->floorheight);
+          plat->wait = 0;
+          plat->status = up;
 
-	    if (plat->low > sec->floorheight)
-		plat->low = sec->floorheight;
+          /* NO MORE DAMAGE, IF APPLICABLE */
 
-	    plat->high = sec->floorheight;
-	    plat->wait = TICRATE*PLATWAIT;
-	    plat->status = down;
-	    S_StartSound(&sec->soundorg,sfx_pstart);
-	    break;
-	    
-	  case perpetualRaise:
-	    plat->speed = PLATSPEED;
-	    plat->low = P_FindLowestFloorSurrounding(sec);
+          sec->special = 0;
 
-	    if (plat->low > sec->floorheight)
-		plat->low = sec->floorheight;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&sec->soundorg, SFX_STNMOV);
+#endif
+          break;
 
-	    plat->high = P_FindHighestFloorSurrounding(sec);
+        case PLAT_RAISEANDCHANGE:
+          plat->speed = PLATSPEED / 2;
+          sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+          plat->high = sec->floorheight + amount * FRACUNIT;
+          plat->wait = 0;
+          plat->status = up;
 
-	    if (plat->high < sec->floorheight)
-		plat->high = sec->floorheight;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&sec->soundorg, SFX_STNMOV);
+#endif
+          break;
 
-	    plat->wait = TICRATE*PLATWAIT;
-	    plat->status = P_Random()&1;
+        case PLAT_DOWNWAITUPSTAY:
+          plat->speed = PLATSPEED * 4;
+          plat->low = p_find_lowest_floor_surrounding(sec);
 
-	    S_StartSound(&sec->soundorg,sfx_pstart);
-	    break;
-	}
-	P_AddActivePlat(plat);
+          if (plat->low > sec->floorheight) plat->low = sec->floorheight;
+
+          plat->high = sec->floorheight;
+          plat->wait = TICRATE * PLATWAIT;
+          plat->status = down;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&sec->soundorg, SFX_PSTART);
+#endif
+          break;
+
+        case PLAT_BLAZEDWUS:
+          plat->speed = PLATSPEED * 8;
+          plat->low = p_find_lowest_floor_surrounding(sec);
+
+          if (plat->low > sec->floorheight) plat->low = sec->floorheight;
+
+          plat->high = sec->floorheight;
+          plat->wait = TICRATE * PLATWAIT;
+          plat->status = down;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&sec->soundorg, SFX_PSTART);
+#endif
+          break;
+
+        case PLAT_PERPETUALRAISE:
+          plat->speed = PLATSPEED;
+          plat->low = p_find_lowest_floor_surrounding(sec);
+
+          if (plat->low > sec->floorheight) plat->low = sec->floorheight;
+
+          plat->high = p_find_highest_floor_surrounding(sec);
+
+          if (plat->high < sec->floorheight) plat->high = sec->floorheight;
+
+          plat->wait = TICRATE * PLATWAIT;
+          plat->status = p_random() & 1;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(&sec->soundorg, SFX_PSTART);
+#endif
+          break;
+        }
+
+      p_add_active_plat(plat);
     }
-    return rtn;
+
+  return rtn;
 }
 
-
-
-void P_ActivateInStasis(int tag)
+void p_activate_in_stasis(int tag)
 {
-    int		i;
-	
-    for (i = 0;i < MAXPLATS;i++)
-	if (activeplats[i]
-	    && (activeplats[i])->tag == tag
-	    && (activeplats[i])->status == in_stasis)
-	{
-	    (activeplats[i])->status = (activeplats[i])->oldstatus;
-	    (activeplats[i])->thinker.function.acp1
-	      = (actionf_p1) T_PlatRaise;
-	}
+  int i;
+
+  for (i = 0; i < MAXPLATS; i++)
+    {
+      if (activeplats[i] && (activeplats[i])->tag == tag &&
+          (activeplats[i])->status == in_stasis)
+        {
+          (activeplats[i])->status = (activeplats[i])->oldstatus;
+          (activeplats[i])->thinker.function.acp1 = (actionf_p1)t_plat_raise;
+        }
+    }
 }
 
-void EV_StopPlat(line_t* line)
+void ev_stop_plat(line_t *line)
 {
-    int		j;
-	
-    for (j = 0;j < MAXPLATS;j++)
-	if (activeplats[j]
-	    && ((activeplats[j])->status != in_stasis)
-	    && ((activeplats[j])->tag == line->tag))
-	{
-	    (activeplats[j])->oldstatus = (activeplats[j])->status;
-	    (activeplats[j])->status = in_stasis;
-	    (activeplats[j])->thinker.function.acv = (actionf_v)NULL;
-	}
+  int j;
+
+  for (j = 0; j < MAXPLATS; j++)
+    {
+      if (activeplats[j] && ((activeplats[j])->status != in_stasis) &&
+          ((activeplats[j])->tag == line->tag))
+        {
+          (activeplats[j])->oldstatus = (activeplats[j])->status;
+          (activeplats[j])->status = in_stasis;
+          (activeplats[j])->thinker.function.acv = (actionf_v)NULL;
+        }
+    }
 }
 
-void P_AddActivePlat(plat_t* plat)
+void p_add_active_plat(plat_t *plat)
 {
-    int		i;
-    
-    for (i = 0;i < MAXPLATS;i++)
-	if (activeplats[i] == NULL)
-	{
-	    activeplats[i] = plat;
-	    return;
-	}
-    I_Error ("P_AddActivePlat: no more plats!");
+  int i;
+
+  for (i = 0; i < MAXPLATS; i++)
+    {
+      if (activeplats[i] == NULL)
+        {
+          activeplats[i] = plat;
+          return;
+        }
+    }
+
+  i_error("p_add_active_plat: no more plats!");
 }
 
-void P_RemoveActivePlat(plat_t* plat)
+void p_remove_active_plat(plat_t *plat)
 {
-    int		i;
-    for (i = 0;i < MAXPLATS;i++)
-	if (plat == activeplats[i])
-	{
-	    (activeplats[i])->sector->specialdata = NULL;
-	    P_RemoveThinker(&(activeplats[i])->thinker);
-	    activeplats[i] = NULL;
-	    
-	    return;
-	}
-    I_Error ("P_RemoveActivePlat: can't find plat!");
+  int i;
+  for (i = 0; i < MAXPLATS; i++)
+    {
+      if (plat == activeplats[i])
+        {
+          (activeplats[i])->sector->specialdata = NULL;
+          p_remove_thinker(&(activeplats[i])->thinker);
+          activeplats[i] = NULL;
+
+          return;
+        }
+    }
+
+  i_error("p_remove_active_plat: can't find plat!");
 }
diff --git a/games/NXDoom/src/doom/p_pspr.c b/games/NXDoom/src/doom/p_pspr.c
index c8c1776ca..9800b0e7c 100644
--- a/games/NXDoom/src/doom/p_pspr.c
+++ b/games/NXDoom/src/doom/p_pspr.c
@@ -1,887 +1,786 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Weapon sprite animation, weapon objects.
-//	Action functions for weapons.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_pspr.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Weapon sprite animation, weapon objects.
+ *  Action functions for weapons.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "doomdef.h"
 #include "d_event.h"
+#include "doomdef.h"
 
 #include "deh_misc.h"
 
 #include "m_random.h"
 #include "p_local.h"
-#include "s_sound.h"
 
-// State.
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+#include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* State. */
+
 #include "doomstat.h"
 
-// Data.
-#include "sounds.h"
+/* Data. */
 
 #include "p_pspr.h"
 
-#define LOWERSPEED		FRACUNIT*6
-#define RAISESPEED		FRACUNIT*6
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define WEAPONBOTTOM	128*FRACUNIT
-#define WEAPONTOP		32*FRACUNIT
+#define LOWERSPEED FRACUNIT * 6
+#define RAISESPEED FRACUNIT * 6
 
+#define WEAPONBOTTOM 128 * FRACUNIT
+#define WEAPONTOP 32 * FRACUNIT
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// P_SetPsprite
-//
-void
-P_SetPsprite
-( player_t*	player,
-  int		position,
-  statenum_t	stnum ) 
+fixed_t swingx;
+fixed_t swingy;
+
+fixed_t bulletslope;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void p_set_psprite(player_t *player, int position, statenum_t stnum)
 {
-    pspdef_t*	psp;
-    state_t*	state;
-	
-    psp = &player->psprites[position];
-	
-    do
+  pspdef_t *psp;
+  state_t *state;
+
+  psp = &player->psprites[position];
+
+  do
     {
-	if (!stnum)
-	{
-	    // object removed itself
-	    psp->state = NULL;
-	    break;	
-	}
-	
-	state = &states[stnum];
-	psp->state = state;
-	psp->tics = state->tics;	// could be 0
+      if (!stnum)
+        {
+          /* object removed itself */
 
-	if (state->misc1)
-	{
-	    // coordinate set
-	    psp->sx = state->misc1 << FRACBITS;
-	    psp->sy = state->misc2 << FRACBITS;
-	}
-	
-	// Call action routine.
-	// Modified handling.
-	if (state->action.acp2)
-	{
-	    state->action.acp2(player, psp);
-	    if (!psp->state)
-		break;
-	}
-	
-	stnum = psp->state->nextstate;
-	
-    } while (!psp->tics);
-    // an initial state of 0 could cycle through
-}
+          psp->state = NULL;
+          break;
+        }
 
+      state = &states[stnum];
+      psp->state = state;
+      psp->tics = state->tics; /* could be 0 */
 
+#if 0 /* Unused as far as I can tell */
+      if (state->misc1)
+        {
+          /* coordinate set */
 
-//
-// P_CalcSwing
-//	
-fixed_t		swingx;
-fixed_t		swingy;
+          psp->sx = state->misc1 << FRACBITS;
+          psp->sy = state->misc2 << FRACBITS;
+        }
+#endif
 
-void P_CalcSwing (player_t*	player)
-{
-    fixed_t	swing;
-    int		angle;
-	
-    // OPTIMIZE: tablify this.
-    // A LUT would allow for different modes,
-    //  and add flexibility.
+      /* Call action routine.
+       * Modified handling.
+       */
 
-    swing = player->bob;
+      if (state->action.acp2)
+        {
+          state->action.acp2(player, psp);
+          if (!psp->state) break;
+        }
 
-    angle = (FINEANGLES/70*leveltime)&FINEMASK;
-    swingx = FixedMul ( swing, finesine[angle]);
-
-    angle = (FINEANGLES/70*leveltime+FINEANGLES/2)&FINEMASK;
-    swingy = -FixedMul ( swingx, finesine[angle]);
-}
-
-
-
-//
-// P_BringUpWeapon
-// Starts bringing the pending weapon up
-// from the bottom of the screen.
-// Uses player
-//
-void P_BringUpWeapon (player_t* player)
-{
-    statenum_t	newstate;
-	
-    if (player->pendingweapon == wp_nochange)
-	player->pendingweapon = player->readyweapon;
-		
-    if (player->pendingweapon == wp_chainsaw)
-	S_StartSound (player->mo, sfx_sawup);
-		
-    newstate = weaponinfo[player->pendingweapon].upstate;
-
-    player->pendingweapon = wp_nochange;
-    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
-
-    P_SetPsprite (player, ps_weapon, newstate);
-}
-
-//
-// P_CheckAmmo
-// Returns true if there is enough ammo to shoot.
-// If not, selects the next weapon to use.
-//
-boolean P_CheckAmmo (player_t* player)
-{
-    ammotype_t		ammo;
-    int			count;
-
-    ammo = weaponinfo[player->readyweapon].ammo;
-
-    // Minimal amount for one shot varies.
-    if (player->readyweapon == wp_bfg)
-	count = deh_bfg_cells_per_shot;
-    else if (player->readyweapon == wp_supershotgun)
-	count = 2;	// Double barrel.
-    else
-	count = 1;	// Regular.
-
-    // Some do not need ammunition anyway.
-    // Return if current ammunition sufficient.
-    if (ammo == am_noammo || player->ammo[ammo] >= count)
-	return true;
-		
-    // Out of ammo, pick a weapon to change to.
-    // Preferences are set here.
-    do
-    {
-	if (player->weaponowned[wp_plasma]
-	    && player->ammo[am_cell]
-	    && (gamemode != shareware) )
-	{
-	    player->pendingweapon = wp_plasma;
-	}
-	else if (player->weaponowned[wp_supershotgun] 
-		 && player->ammo[am_shell]>2
-		 && (gamemode == commercial) )
-	{
-	    player->pendingweapon = wp_supershotgun;
-	}
-	else if (player->weaponowned[wp_chaingun]
-		 && player->ammo[am_clip])
-	{
-	    player->pendingweapon = wp_chaingun;
-	}
-	else if (player->weaponowned[wp_shotgun]
-		 && player->ammo[am_shell])
-	{
-	    player->pendingweapon = wp_shotgun;
-	}
-	else if (player->ammo[am_clip])
-	{
-	    player->pendingweapon = wp_pistol;
-	}
-	else if (player->weaponowned[wp_chainsaw])
-	{
-	    player->pendingweapon = wp_chainsaw;
-	}
-	else if (player->weaponowned[wp_missile]
-		 && player->ammo[am_misl])
-	{
-	    player->pendingweapon = wp_missile;
-	}
-	else if (player->weaponowned[wp_bfg]
-		 && player->ammo[am_cell]>40
-		 && (gamemode != shareware) )
-	{
-	    player->pendingweapon = wp_bfg;
-	}
-	else
-	{
-	    // If everything fails.
-	    player->pendingweapon = wp_fist;
-	}
-	
-    } while (player->pendingweapon == wp_nochange);
-
-    // Now set appropriate weapon overlay.
-    P_SetPsprite (player,
-		  ps_weapon,
-		  weaponinfo[player->readyweapon].downstate);
-
-    return false;	
-}
-
-
-//
-// P_FireWeapon.
-//
-void P_FireWeapon (player_t* player)
-{
-    statenum_t	newstate;
-	
-    if (!P_CheckAmmo (player))
-	return;
-	
-    P_SetMobjState (player->mo, S_PLAY_ATK1);
-    newstate = weaponinfo[player->readyweapon].atkstate;
-    P_SetPsprite (player, ps_weapon, newstate);
-    P_NoiseAlert (player->mo, player->mo);
-}
-
-
-
-//
-// P_DropWeapon
-// Player died, so put the weapon away.
-//
-void P_DropWeapon (player_t* player)
-{
-    P_SetPsprite (player,
-		  ps_weapon,
-		  weaponinfo[player->readyweapon].downstate);
-}
-
-
-
-//
-// A_WeaponReady
-// The player can fire the weapon
-// or change to another weapon at this time.
-// Follows after getting weapon up,
-// or after previous attack/fire sequence.
-//
-void
-A_WeaponReady
-( player_t*	player,
-  pspdef_t*	psp )
-{	
-    statenum_t	newstate;
-    int		angle;
-    
-    // get out of attack state
-    if (player->mo->state == &states[S_PLAY_ATK1]
-	|| player->mo->state == &states[S_PLAY_ATK2] )
-    {
-	P_SetMobjState (player->mo, S_PLAY);
+      stnum = psp->state->nextstate;
     }
-    
-    if (player->readyweapon == wp_chainsaw
-	&& psp->state == &states[S_SAW])
-    {
-	S_StartSound (player->mo, sfx_sawidl);
-    }
-    
-    // check for change
-    //  if player is dead, put the weapon away
-    if (player->pendingweapon != wp_nochange || !player->health)
-    {
-	// change weapon
-	//  (pending weapon should allready be validated)
-	newstate = weaponinfo[player->readyweapon].downstate;
-	P_SetPsprite (player, ps_weapon, newstate);
-	return;	
-    }
-    
-    // check for fire
-    //  the missile launcher and bfg do not auto fire
-    if (player->cmd.buttons & BT_ATTACK)
-    {
-	if ( !player->attackdown
-	     || (player->readyweapon != wp_missile
-		 && player->readyweapon != wp_bfg) )
-	{
-	    player->attackdown = true;
-	    P_FireWeapon (player);		
-	    return;
-	}
-    }
-    else
-	player->attackdown = false;
-    
-    // bob the weapon based on movement speed
-    angle = (128*leveltime)&FINEMASK;
-    psp->sx = FRACUNIT + FixedMul (player->bob, finecosine[angle]);
-    angle &= FINEANGLES/2-1;
-    psp->sy = WEAPONTOP + FixedMul (player->bob, finesine[angle]);
+  while (!psp->tics);
+
+  /* an initial state of 0 could cycle through */
 }
 
-
-
-//
-// A_ReFire
-// The player can re-fire the weapon
-// without lowering it entirely.
-//
-void A_ReFire
-( player_t*	player,
-  pspdef_t*	psp )
+static void p_calc_swing(player_t *player)
 {
-    
-    // check for fire
-    //  (if a weaponchange is pending, let it go through instead)
-    if ( (player->cmd.buttons & BT_ATTACK) 
-	 && player->pendingweapon == wp_nochange
-	 && player->health)
+  fixed_t swing;
+  int angle;
+
+  /* OPTIMIZE: tablify this.
+   * A LUT would allow for different modes, and add flexibility.
+   */
+
+  swing = player->bob;
+
+  angle = (FINEANGLES / 70 * leveltime) & FINEMASK;
+  swingx = fixed_mul(swing, finesine[angle]);
+
+  angle = (FINEANGLES / 70 * leveltime + FINEANGLES / 2) & FINEMASK;
+  swingy = -fixed_mul(swingx, finesine[angle]);
+}
+
+/* p_bringup_weapon
+ * Starts bringing the pending weapon up from the bottom of the screen. Uses
+ * player
+ */
+
+static void p_bringup_weapon(player_t *player)
+{
+  statenum_t newstate;
+
+  if (player->pendingweapon == wp_nochange)
+    player->pendingweapon = player->readyweapon;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  if (player->pendingweapon == wp_chainsaw)
+    s_start_sound(player->mo, SFX_SAWUP);
+#endif
+
+  newstate = weaponinfo[player->pendingweapon].upstate;
+
+  player->pendingweapon = wp_nochange;
+  player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+
+  p_set_psprite(player, ps_weapon, newstate);
+}
+
+/* Doom does not check the bounds of the ammo array.  As a result,
+ * it is possible to use an ammo type > 4 that overflows into the
+ * maxammo array and affects that instead.  Through dehacked, for
+ * example, it is possible to make a weapon that decreases the max
+ * number of ammo for another weapon.  Emulate this.
+ */
+
+static void decrease_ammo(player_t *player, int ammonum, int amount)
+{
+  if (ammonum < NUMAMMO)
     {
-	player->refire++;
-	P_FireWeapon (player);
+      player->ammo[ammonum] -= amount;
     }
-    else
+  else
     {
-	player->refire = 0;
-	P_CheckAmmo (player);
+      player->maxammo[ammonum - NUMAMMO] -= amount;
     }
 }
 
+/* p_bullet_slope
+ * Sets a slope so a near miss is at approximately
+ * the height of the intended target
+ */
 
-void
-A_CheckReload
-( player_t*	player,
-  pspdef_t*	psp )
+static void p_bullet_slope(mobj_t *mo)
 {
-    P_CheckAmmo (player);
+  angle_t an;
+
+  /* see which target is to be aimed at */
+
+  an = mo->angle;
+  bulletslope = p_aim_line_attack(mo, an, 16 * 64 * FRACUNIT);
+
+  if (!linetarget)
+    {
+      an += 1 << 26;
+      bulletslope = p_aim_line_attack(mo, an, 16 * 64 * FRACUNIT);
+      if (!linetarget)
+        {
+          an -= 2 << 26;
+          bulletslope = p_aim_line_attack(mo, an, 16 * 64 * FRACUNIT);
+        }
+    }
+}
+
+static void p_gunshot(mobj_t *mo, boolean accurate)
+{
+  angle_t angle;
+  int damage;
+
+  damage = 5 * (p_random() % 3 + 1);
+  angle = mo->angle;
+
+  if (!accurate) angle += p_sub_random() << 18;
+
+  p_line_attack(mo, angle, MISSILERANGE, bulletslope, damage);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* p_check_ammo
+ * Returns true if there is enough ammo to shoot.
+ * If not, selects the next weapon to use.
+ */
+
+boolean p_check_ammo(player_t *player)
+{
+  ammotype_t ammo;
+  int count;
+
+  ammo = weaponinfo[player->readyweapon].ammo;
+
+  /* Minimal amount for one shot varies. */
+
+  if (player->readyweapon == wp_bfg)
+    count = deh_bfg_cells_per_shot;
+  else if (player->readyweapon == wp_supershotgun)
+    count = 2; /* Double barrel. */
+  else
+    count = 1; /* Regular. */
+
+  /* Some do not need ammunition anyway.
+   * Return if current ammunition sufficient.
+   */
+
+  if (ammo == am_noammo || player->ammo[ammo] >= count) return true;
+
+  /* Out of ammo, pick a weapon to change to.
+   * Preferences are set here.
+   */
+
+  do
+    {
+      if (player->weaponowned[wp_plasma] && player->ammo[am_cell] &&
+          (gamemode != shareware))
+        {
+          player->pendingweapon = wp_plasma;
+        }
+      else if (player->weaponowned[wp_supershotgun] &&
+               player->ammo[am_shell] > 2 && (gamemode == commercial))
+        {
+          player->pendingweapon = wp_supershotgun;
+        }
+      else if (player->weaponowned[wp_chaingun] && player->ammo[am_clip])
+        {
+          player->pendingweapon = wp_chaingun;
+        }
+      else if (player->weaponowned[wp_shotgun] && player->ammo[am_shell])
+        {
+          player->pendingweapon = wp_shotgun;
+        }
+      else if (player->ammo[am_clip])
+        {
+          player->pendingweapon = wp_pistol;
+        }
+      else if (player->weaponowned[wp_chainsaw])
+        {
+          player->pendingweapon = wp_chainsaw;
+        }
+      else if (player->weaponowned[wp_missile] && player->ammo[am_misl])
+        {
+          player->pendingweapon = wp_missile;
+        }
+      else if (player->weaponowned[wp_bfg] && player->ammo[am_cell] > 40 &&
+               (gamemode != shareware))
+        {
+          player->pendingweapon = wp_bfg;
+        }
+      else
+        {
+          /* If everything fails. */
+
+          player->pendingweapon = wp_fist;
+        }
+    }
+  while (player->pendingweapon == wp_nochange);
+
+  /* Now set appropriate weapon overlay. */
+
+  p_set_psprite(player, ps_weapon,
+          weaponinfo[player->readyweapon].downstate);
+  return false;
+}
+
+static void p_fire_weapon(player_t *player)
+{
+  statenum_t newstate;
+
+  if (!p_check_ammo(player)) return;
+
+  p_set_mobj_state(player->mo, S_PLAY_ATK1);
+  newstate = weaponinfo[player->readyweapon].atkstate;
+  p_set_psprite(player, ps_weapon, newstate);
+  p_noise_alert(player->mo, player->mo);
+}
+
+/* p_drop_weapon
+ * Player died, so put the weapon away.
+ */
+
+void p_drop_weapon(player_t *player)
+{
+  p_set_psprite(player, ps_weapon,
+          weaponinfo[player->readyweapon].downstate);
+}
+
+/* a_weapon_ready
+ * The player can fire the weapon or change to another weapon at this time.
+ * Follows after getting weapon up, or after previous attack/fire sequence.
+ */
+
+void a_weapon_ready(player_t *player, pspdef_t *psp)
+{
+  statenum_t newstate;
+  int angle;
+
+  /* get out of attack state */
+
+  if (player->mo->state == &states[S_PLAY_ATK1] ||
+      player->mo->state == &states[S_PLAY_ATK2])
+    {
+      p_set_mobj_state(player->mo, S_PLAY);
+    }
+
+  if (player->readyweapon == wp_chainsaw && psp->state == &states[S_SAW])
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(player->mo, SFX_SAWIDL);
+#endif
+    }
+
+  /* check for change if player is dead, put the weapon away */
+
+  if (player->pendingweapon != wp_nochange || !player->health)
+    {
+      /* change weapon (pending weapon should already be validated) */
+
+      newstate = weaponinfo[player->readyweapon].downstate;
+      p_set_psprite(player, ps_weapon, newstate);
+      return;
+    }
+
+  /* check for fire the missile launcher and bfg do not auto fire */
+
+  if (player->cmd.buttons & BT_ATTACK)
+    {
+      if (!player->attackdown || (player->readyweapon != wp_missile &&
+                                  player->readyweapon != wp_bfg))
+        {
+          player->attackdown = true;
+          p_fire_weapon(player);
+          return;
+        }
+    }
+  else
+    player->attackdown = false;
+
+  /* bob the weapon based on movement speed */
+
+  angle = (128 * leveltime) & FINEMASK;
+  psp->sx = FRACUNIT + fixed_mul(player->bob, finecosine[angle]);
+  angle &= FINEANGLES / 2 - 1;
+  psp->sy = WEAPONTOP + fixed_mul(player->bob, finesine[angle]);
+}
+
+/* a_refire
+ * The player can re-fire the weapon without lowering it entirely.
+ */
+
+void a_refire(player_t *player, pspdef_t *psp)
+{
+  /* check for fire (if a weaponchange is pending, let it go through instead)
+   */
+
+  if ((player->cmd.buttons & BT_ATTACK) &&
+      player->pendingweapon == wp_nochange && player->health)
+    {
+      player->refire++;
+      p_fire_weapon(player);
+    }
+  else
+    {
+      player->refire = 0;
+      p_check_ammo(player);
+    }
+}
+
+void a_check_reload(player_t *player, pspdef_t *psp)
+{
+  p_check_ammo(player);
 #if 0
-    if (player->ammo[am_shell]<2)
-	P_SetPsprite (player, ps_weapon, S_DSNR1);
+  if (player->ammo[am_shell] < 2)
+    {
+      p_set_psprite(player, ps_weapon, S_DSNR1);
+    }
 #endif
 }
 
+/* a_lower
+ * Lowers current weapon, and changes weapon at bottom.
+ */
 
+void a_lower(player_t *player, pspdef_t *psp)
+{
+  psp->sy += LOWERSPEED;
 
-//
-// A_Lower
-// Lowers current weapon,
-//  and changes weapon at bottom.
-//
-void
-A_Lower
-( player_t*	player,
-  pspdef_t*	psp )
-{	
-    psp->sy += LOWERSPEED;
+  /* Is already down. */
 
-    // Is already down.
-    if (psp->sy < WEAPONBOTTOM )
-	return;
+  if (psp->sy < WEAPONBOTTOM) return;
 
-    // Player is dead.
-    if (player->playerstate == PST_DEAD)
+  /* Player is dead. */
+
+  if (player->playerstate == PST_DEAD)
     {
-	psp->sy = WEAPONBOTTOM;
+      psp->sy = WEAPONBOTTOM;
 
-	// don't bring weapon back up
-	return;		
+      /* don't bring weapon back up */
+
+      return;
     }
-    
-    // The old weapon has been lowered off the screen,
-    // so change the weapon and start raising it
-    if (!player->health)
+
+  /* The old weapon has been lowered off the screen, so change the weapon and
+   * start raising it
+   */
+
+  if (!player->health)
     {
-	// Player is dead, so keep the weapon off screen.
-	P_SetPsprite (player,  ps_weapon, S_NULL);
-	return;	
+      /* Player is dead, so keep the weapon off screen. */
+
+      p_set_psprite(player, ps_weapon, S_NULL);
+      return;
     }
-	
-    player->readyweapon = player->pendingweapon; 
 
-    P_BringUpWeapon (player);
+  player->readyweapon = player->pendingweapon;
+
+  p_bringup_weapon(player);
 }
 
-
-//
-// A_Raise
-//
-void
-A_Raise
-( player_t*	player,
-  pspdef_t*	psp )
+void a_raise(player_t *player, pspdef_t *psp)
 {
-    statenum_t	newstate;
-	
-    psp->sy -= RAISESPEED;
+  statenum_t newstate;
 
-    if (psp->sy > WEAPONTOP )
-	return;
-    
-    psp->sy = WEAPONTOP;
-    
-    // The weapon has been raised all the way,
-    //  so change to the ready state.
-    newstate = weaponinfo[player->readyweapon].readystate;
+  psp->sy -= RAISESPEED;
 
-    P_SetPsprite (player, ps_weapon, newstate);
+  if (psp->sy > WEAPONTOP) return;
+
+  psp->sy = WEAPONTOP;
+
+  /* The weapon has been raised all the way, so change to the ready state. */
+
+  newstate = weaponinfo[player->readyweapon].readystate;
+
+  p_set_psprite(player, ps_weapon, newstate);
 }
 
-
-
-//
-// A_GunFlash
-//
-void
-A_GunFlash
-( player_t*	player,
-  pspdef_t*	psp ) 
+void a_gun_flash(player_t *player, pspdef_t *psp)
 {
-    P_SetMobjState (player->mo, S_PLAY_ATK2);
-    P_SetPsprite (player,ps_flash,weaponinfo[player->readyweapon].flashstate);
+  p_set_mobj_state(player->mo, S_PLAY_ATK2);
+  p_set_psprite(player, ps_flash,
+          weaponinfo[player->readyweapon].flashstate);
 }
 
+/* WEAPON ATTACKS */
 
-
-//
-// WEAPON ATTACKS
-//
-
-
-//
-// A_Punch
-//
-void
-A_Punch
-( player_t*	player,
-  pspdef_t*	psp ) 
+void a_punch(player_t *player, pspdef_t *psp)
 {
-    angle_t	angle;
-    int		damage;
-    int		slope;
-	
-    damage = (P_Random ()%10+1)<<1;
+  angle_t angle;
+  int damage;
+  int slope;
 
-    if (player->powers[pw_strength])	
-	damage *= 10;
+  damage = (p_random() % 10 + 1) << 1;
 
-    angle = player->mo->angle;
-    angle += P_SubRandom() << 18;
-    slope = P_AimLineAttack (player->mo, angle, MELEERANGE);
-    P_LineAttack (player->mo, angle, MELEERANGE, slope, damage);
+  if (player->powers[pw_strength]) damage *= 10;
 
-    // turn to face target
-    if (linetarget)
+  angle = player->mo->angle;
+  angle += p_sub_random() << 18;
+  slope = p_aim_line_attack(player->mo, angle, MELEERANGE);
+  p_line_attack(player->mo, angle, MELEERANGE, slope, damage);
+
+  /* turn to face target */
+
+  if (linetarget)
     {
-	S_StartSound (player->mo, sfx_punch);
-	player->mo->angle = R_PointToAngle2 (player->mo->x,
-					     player->mo->y,
-					     linetarget->x,
-					     linetarget->y);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(player->mo, SFX_PUNCH);
+#endif
+      player->mo->angle = r_point_to_angle2(player->mo->x, player->mo->y,
+                                            linetarget->x, linetarget->y);
     }
 }
 
-
-//
-// A_Saw
-//
-void
-A_Saw
-( player_t*	player,
-  pspdef_t*	psp ) 
+void a_saw(player_t *player, pspdef_t *psp)
 {
-    angle_t	angle;
-    int		damage;
-    int		slope;
+  angle_t angle;
+  int damage;
+  int slope;
 
-    damage = 2*(P_Random ()%10+1);
-    angle = player->mo->angle;
-    angle += P_SubRandom() << 18;
-    
-    // use meleerange + 1 se the puff doesn't skip the flash
-    slope = P_AimLineAttack (player->mo, angle, MELEERANGE+1);
-    P_LineAttack (player->mo, angle, MELEERANGE+1, slope, damage);
+  damage = 2 * (p_random() % 10 + 1);
+  angle = player->mo->angle;
+  angle += p_sub_random() << 18;
 
-    if (!linetarget)
+  /* use meleerange + 1 se the puff doesn't skip the flash */
+
+  slope = p_aim_line_attack(player->mo, angle, MELEERANGE + 1);
+  p_line_attack(player->mo, angle, MELEERANGE + 1, slope, damage);
+
+  if (!linetarget)
     {
-	S_StartSound (player->mo, sfx_sawful);
-	return;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(player->mo, SFX_SAWFUL);
+#endif
+      return;
     }
-    S_StartSound (player->mo, sfx_sawhit);
-	
-    // turn to face target
-    angle = R_PointToAngle2 (player->mo->x, player->mo->y,
-			     linetarget->x, linetarget->y);
-    if (angle - player->mo->angle > ANG180)
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_SAWHIT);
+#endif
+
+  /* turn to face target */
+
+  angle = r_point_to_angle2(player->mo->x, player->mo->y, linetarget->x,
+                            linetarget->y);
+  if (angle - player->mo->angle > ANG180)
     {
-	if ((signed int) (angle - player->mo->angle) < -ANG90/20)
-	    player->mo->angle = angle + ANG90/21;
-	else
-	    player->mo->angle -= ANG90/20;
+      if ((signed int)(angle - player->mo->angle) < -ANG90 / 20)
+        player->mo->angle = angle + ANG90 / 21;
+      else
+        player->mo->angle -= ANG90 / 20;
     }
-    else
+  else
     {
-	if (angle - player->mo->angle > ANG90/20)
-	    player->mo->angle = angle - ANG90/21;
-	else
-	    player->mo->angle += ANG90/20;
+      if (angle - player->mo->angle > ANG90 / 20)
+        player->mo->angle = angle - ANG90 / 21;
+      else
+        player->mo->angle += ANG90 / 20;
     }
-    player->mo->flags |= MF_JUSTATTACKED;
+
+  player->mo->flags |= MF_JUSTATTACKED;
 }
 
-// Doom does not check the bounds of the ammo array.  As a result,
-// it is possible to use an ammo type > 4 that overflows into the
-// maxammo array and affects that instead.  Through dehacked, for
-// example, it is possible to make a weapon that decreases the max
-// number of ammo for another weapon.  Emulate this.
-
-static void DecreaseAmmo(player_t *player, int ammonum, int amount)
+void a_fire_missile(player_t *player, pspdef_t *psp)
 {
-    if (ammonum < NUMAMMO)
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo, 1);
+  p_spawn_player_missile(player->mo, MT_ROCKET);
+}
+
+void a_fire_bfg(player_t *player, pspdef_t *psp)
+{
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo,
+                deh_bfg_cells_per_shot);
+  p_spawn_player_missile(player->mo, MT_BFG);
+}
+
+void a_fire_plasma(player_t *player, pspdef_t *psp)
+{
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+  p_set_psprite(player, ps_flash,
+                weaponinfo[player->readyweapon].flashstate +
+                    (p_random() & 1));
+
+  p_spawn_player_missile(player->mo, MT_PLASMA);
+}
+
+void a_fire_pistol(player_t *player, pspdef_t *psp)
+{
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_PISTOL);
+#endif
+
+  p_set_mobj_state(player->mo, S_PLAY_ATK2);
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+  p_set_psprite(player, ps_flash,
+          weaponinfo[player->readyweapon].flashstate);
+
+  p_bullet_slope(player->mo);
+  p_gunshot(player->mo, !player->refire);
+}
+
+void a_fire_shotgun(player_t *player, pspdef_t *psp)
+{
+  int i;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_SHOTGN);
+#endif
+  p_set_mobj_state(player->mo, S_PLAY_ATK2);
+
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+  p_set_psprite(player, ps_flash,
+          weaponinfo[player->readyweapon].flashstate);
+
+  p_bullet_slope(player->mo);
+
+  for (i = 0; i < 7; i++)
+    p_gunshot(player->mo, false);
+}
+
+void a_fire_shotgun2(player_t *player, pspdef_t *psp)
+{
+  int i;
+  angle_t angle;
+  int damage;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_DSHTGN);
+#endif
+  p_set_mobj_state(player->mo, S_PLAY_ATK2);
+
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo, 2);
+
+  p_set_psprite(player, ps_flash,
+          weaponinfo[player->readyweapon].flashstate);
+
+  p_bullet_slope(player->mo);
+
+  for (i = 0; i < 20; i++)
     {
-        player->ammo[ammonum] -= amount;
-    }
-    else
-    {
-        player->maxammo[ammonum - NUMAMMO] -= amount;
+      damage = 5 * (p_random() % 3 + 1);
+      angle = player->mo->angle;
+      angle += p_sub_random() << ANGLETOFINESHIFT;
+      p_line_attack(player->mo, angle, MISSILERANGE,
+                    bulletslope + (p_sub_random() << 5), damage);
     }
 }
 
-
-//
-// A_FireMissile
-//
-void
-A_FireMissile
-( player_t*	player,
-  pspdef_t*	psp ) 
+void a_fire_cgun(player_t *player, pspdef_t *psp)
 {
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
-    P_SpawnPlayerMissile (player->mo, MT_ROCKET);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_PISTOL);
+#endif
+
+  if (!player->ammo[weaponinfo[player->readyweapon].ammo]) return;
+
+  p_set_mobj_state(player->mo, S_PLAY_ATK2);
+  decrease_ammo(player, weaponinfo[player->readyweapon].ammo, 1);
+
+  p_set_psprite(player, ps_flash,
+                weaponinfo[player->readyweapon].flashstate + psp->state -
+                    &states[S_CHAIN1]);
+
+  p_bullet_slope(player->mo);
+
+  p_gunshot(player->mo, !player->refire);
 }
 
+/* ? */
 
-//
-// A_FireBFG
-//
-void
-A_FireBFG
-( player_t*	player,
-  pspdef_t*	psp ) 
+void a_light0(player_t *player, pspdef_t *psp)
 {
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 
-                 deh_bfg_cells_per_shot);
-    P_SpawnPlayerMissile (player->mo, MT_BFG);
+  player->extralight = 0;
 }
 
-
-
-//
-// A_FirePlasma
-//
-void
-A_FirePlasma
-( player_t*	player,
-  pspdef_t*	psp ) 
+void a_light1(player_t *player, pspdef_t *psp)
 {
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
-
-    P_SetPsprite (player,
-		  ps_flash,
-		  weaponinfo[player->readyweapon].flashstate+(P_Random ()&1) );
-
-    P_SpawnPlayerMissile (player->mo, MT_PLASMA);
+  player->extralight = 1;
 }
 
-
-
-//
-// P_BulletSlope
-// Sets a slope so a near miss is at aproximately
-// the height of the intended target
-//
-fixed_t		bulletslope;
-
-
-void P_BulletSlope (mobj_t*	mo)
+void a_light2(player_t *player, pspdef_t *psp)
 {
-    angle_t	an;
-    
-    // see which target is to be aimed at
-    an = mo->angle;
-    bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
+  player->extralight = 2;
+}
 
-    if (!linetarget)
+/* a_bfg_spray
+ * Spawn a BFG explosion on every monster in view
+ */
+
+void a_bfg_spray(mobj_t *mo)
+{
+  int i;
+  int j;
+  int damage;
+  angle_t an;
+
+  /* offset angles from its attack angle */
+
+  for (i = 0; i < 40; i++)
     {
-	an += 1<<26;
-	bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-	if (!linetarget)
-	{
-	    an -= 2<<26;
-	    bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-	}
+      an = mo->angle - ANG90 / 2 + ANG90 / 40 * i;
+
+      /* mo->target is the originator (player) of the missile */
+
+      p_aim_line_attack(mo->target, an, 16 * 64 * FRACUNIT);
+
+      if (!linetarget) continue;
+
+      p_spawn_mobj(linetarget->x, linetarget->y,
+                   linetarget->z + (linetarget->height >> 2), MT_EXTRABFG);
+
+      damage = 0;
+      for (j = 0; j < 15; j++)
+        damage += (p_random() & 7) + 1;
+
+      p_damage_mobj(linetarget, mo->target, mo->target, damage);
     }
 }
 
+/* a_bfg_sound */
 
-//
-// P_GunShot
-//
-void
-P_GunShot
-( mobj_t*	mo,
-  boolean	accurate )
+void a_bfg_sound(player_t *player, pspdef_t *psp)
 {
-    angle_t	angle;
-    int		damage;
-	
-    damage = 5*(P_Random ()%3+1);
-    angle = mo->angle;
-
-    if (!accurate)
-	angle += P_SubRandom() << 18;
-
-    P_LineAttack (mo, angle, MISSILERANGE, bulletslope, damage);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start_sound(player->mo, SFX_BFG);
+#endif
 }
 
+/* p_setup_psprites
+ * Called at start of level for each player.
+ */
 
-//
-// A_FirePistol
-//
-void
-A_FirePistol
-( player_t*	player,
-  pspdef_t*	psp ) 
+void p_setup_psprites(player_t *player)
 {
-    S_StartSound (player->mo, sfx_pistol);
+  int i;
 
-    P_SetMobjState (player->mo, S_PLAY_ATK2);
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
+  /* remove all psprites */
 
-    P_SetPsprite (player,
-		  ps_flash,
-		  weaponinfo[player->readyweapon].flashstate);
+  for (i = 0; i < NUMPSPRITES; i++)
+    player->psprites[i].state = NULL;
 
-    P_BulletSlope (player->mo);
-    P_GunShot (player->mo, !player->refire);
+  /* spawn the gun */
+
+  player->pendingweapon = player->readyweapon;
+  p_bringup_weapon(player);
 }
 
+/* p_move_psprites
+ * Called every tic by player thinking routine.
+ */
 
-//
-// A_FireShotgun
-//
-void
-A_FireShotgun
-( player_t*	player,
-  pspdef_t*	psp ) 
+void p_move_psprites(player_t *player)
 {
-    int		i;
-	
-    S_StartSound (player->mo, sfx_shotgn);
-    P_SetMobjState (player->mo, S_PLAY_ATK2);
+  int i;
+  pspdef_t *psp;
 
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
-
-    P_SetPsprite (player,
-		  ps_flash,
-		  weaponinfo[player->readyweapon].flashstate);
-
-    P_BulletSlope (player->mo);
-	
-    for (i=0 ; i<7 ; i++)
-	P_GunShot (player->mo, false);
-}
-
-
-
-//
-// A_FireShotgun2
-//
-void
-A_FireShotgun2
-( player_t*	player,
-  pspdef_t*	psp ) 
-{
-    int		i;
-    angle_t	angle;
-    int		damage;
-		
-	
-    S_StartSound (player->mo, sfx_dshtgn);
-    P_SetMobjState (player->mo, S_PLAY_ATK2);
-
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 2);
-
-    P_SetPsprite (player,
-		  ps_flash,
-		  weaponinfo[player->readyweapon].flashstate);
-
-    P_BulletSlope (player->mo);
-	
-    for (i=0 ; i<20 ; i++)
+  psp = &player->psprites[0];
+  for (i = 0; i < NUMPSPRITES; i++, psp++)
     {
-	damage = 5*(P_Random ()%3+1);
-	angle = player->mo->angle;
-	angle += P_SubRandom() << ANGLETOFINESHIFT;
-	P_LineAttack (player->mo,
-		      angle,
-		      MISSILERANGE,
-		      bulletslope + (P_SubRandom() << 5), damage);
+      /* a null state means not active */
+
+      if (psp->state)
+        {
+          /* drop tic count and possibly change state */
+
+          /* a -1 tic count never changes */
+
+          if (psp->tics != -1)
+            {
+              psp->tics--;
+              if (!psp->tics)
+                {
+                  p_set_psprite(player, i, psp->state->nextstate);
+                }
+            }
+        }
     }
+
+  player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
+  player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
 }
-
-
-//
-// A_FireCGun
-//
-void
-A_FireCGun
-( player_t*	player,
-  pspdef_t*	psp ) 
-{
-    S_StartSound (player->mo, sfx_pistol);
-
-    if (!player->ammo[weaponinfo[player->readyweapon].ammo])
-	return;
-		
-    P_SetMobjState (player->mo, S_PLAY_ATK2);
-    DecreaseAmmo(player, weaponinfo[player->readyweapon].ammo, 1);
-
-    P_SetPsprite (player,
-		  ps_flash,
-		  weaponinfo[player->readyweapon].flashstate
-		  + psp->state
-		  - &states[S_CHAIN1] );
-
-    P_BulletSlope (player->mo);
-	
-    P_GunShot (player->mo, !player->refire);
-}
-
-
-
-//
-// ?
-//
-void A_Light0 (player_t *player, pspdef_t *psp)
-{
-    player->extralight = 0;
-}
-
-void A_Light1 (player_t *player, pspdef_t *psp)
-{
-    player->extralight = 1;
-}
-
-void A_Light2 (player_t *player, pspdef_t *psp)
-{
-    player->extralight = 2;
-}
-
-
-//
-// A_BFGSpray
-// Spawn a BFG explosion on every monster in view
-//
-void A_BFGSpray (mobj_t* mo) 
-{
-    int			i;
-    int			j;
-    int			damage;
-    angle_t		an;
-	
-    // offset angles from its attack angle
-    for (i=0 ; i<40 ; i++)
-    {
-	an = mo->angle - ANG90/2 + ANG90/40*i;
-
-	// mo->target is the originator (player)
-	//  of the missile
-	P_AimLineAttack (mo->target, an, 16*64*FRACUNIT);
-
-	if (!linetarget)
-	    continue;
-
-	P_SpawnMobj (linetarget->x,
-		     linetarget->y,
-		     linetarget->z + (linetarget->height>>2),
-		     MT_EXTRABFG);
-	
-	damage = 0;
-	for (j=0;j<15;j++)
-	    damage += (P_Random()&7) + 1;
-
-	P_DamageMobj (linetarget, mo->target,mo->target, damage);
-    }
-}
-
-
-//
-// A_BFGsound
-//
-void
-A_BFGsound
-( player_t*	player,
-  pspdef_t*	psp )
-{
-    S_StartSound (player->mo, sfx_bfg);
-}
-
-
-
-//
-// P_SetupPsprites
-// Called at start of level for each player.
-//
-void P_SetupPsprites (player_t* player) 
-{
-    int	i;
-	
-    // remove all psprites
-    for (i=0 ; i<NUMPSPRITES ; i++)
-	player->psprites[i].state = NULL;
-		
-    // spawn the gun
-    player->pendingweapon = player->readyweapon;
-    P_BringUpWeapon (player);
-}
-
-
-
-
-//
-// P_MovePsprites
-// Called every tic by player thinking routine.
-//
-void P_MovePsprites (player_t* player) 
-{
-    int		i;
-    pspdef_t*	psp;
-	
-    psp = &player->psprites[0];
-    for (i=0 ; i<NUMPSPRITES ; i++, psp++)
-    {
-	// a null state means not active
-	if (psp->state)
-	{
-	    // drop tic count and possibly change state
-
-	    // a -1 tic count never changes
-	    if (psp->tics != -1)	
-	    {
-		psp->tics--;
-		if (!psp->tics)
-		    P_SetPsprite (player, i, psp->state->nextstate);
-	    }				
-	}
-    }
-    
-    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
-    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
-}
-
-
diff --git a/games/NXDoom/src/doom/p_pspr.h b/games/NXDoom/src/doom/p_pspr.h
index 2616bd476..83ab57f6a 100644
--- a/games/NXDoom/src/doom/p_pspr.h
+++ b/games/NXDoom/src/doom/p_pspr.h
@@ -1,75 +1,88 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Sprite animation.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_pspr.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Sprite animation.
+ *
+ ****************************************************************************/
 
 #ifndef __P_PSPR__
 #define __P_PSPR__
 
-// Basic data types.
-// Needs fixed point, and BAM angles.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Basic data types.
+ * Needs fixed point, and BAM angles.
+ */
+
 #include "m_fixed.h"
 #include "tables.h"
 
+/* Needs to include the precompiled sprite animation tables.
+ *
+ * Header generated by multigen utility.
+ *
+ * This includes all the data for thing animation,
+ * i.e. the Thing Attributes table and the Frame Sequence table.
+ */
 
-//
-// Needs to include the precompiled
-//  sprite animation tables.
-// Header generated by multigen utility.
-// This includes all the data for thing animation,
-// i.e. the Thing Atrributes table
-// and the Frame Sequence table.
 #include "info.h"
 
+/* Frame flags:
+ * handles maximum brightness (torches, muzzle flare, light sources)
+ */
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-//
-// Frame flags:
-// handles maximum brightness (torches, muzzle flare, light sources)
-//
-#define FF_FULLBRIGHT	0x8000	// flag in thing->frame
-#define FF_FRAMEMASK	0x7fff
+#define FF_FULLBRIGHT 0x8000 /* flag in thing->frame */
+#define FF_FRAMEMASK 0x7fff
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* Overlay psprites are scaled shapes drawn directly on the view screen,
+ * coordinates are given for a 320*200 view screen.
+ */
 
-//
-// Overlay psprites are scaled shapes
-// drawn directly on the view screen,
-// coordinates are given for a 320*200 view screen.
-//
 typedef enum
 {
-    ps_weapon,
-    ps_flash,
-    NUMPSPRITES
-
+  ps_weapon,
+  ps_flash,
+  NUMPSPRITES
 } psprnum_t;
 
 typedef struct
 {
-    state_t*	state;	// a NULL state means not active
-    int		tics;
-    fixed_t	sx;
-    fixed_t	sy;
-
+  state_t *state; /* a NULL state means not active */
+  int tics;
+  fixed_t sx;
+  fixed_t sy;
 } pspdef_t;
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern fixed_t bulletslope;
 
-
-#endif
+#endif /* __P_PSPR__ */
diff --git a/games/NXDoom/src/doom/p_saveg.c b/games/NXDoom/src/doom/p_saveg.c
index 1192bff90..5c5439cb9 100644
--- a/games/NXDoom/src/doom/p_saveg.c
+++ b/games/NXDoom/src/doom/p_saveg.c
@@ -1,1888 +1,2129 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Archiving: SaveGame I/O.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_saveg.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Archiving: SaveGame I/O.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "dstrings.h"
 #include "deh_main.h"
+#include "dstrings.h"
 #include "i_system.h"
-#include "z_zone.h"
 #include "p_local.h"
 #include "p_saveg.h"
+#include "z_zone.h"
+
+/* State. */
 
-// State.
 #include "doomstat.h"
 #include "g_game.h"
 #include "m_misc.h"
 #include "r_state.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Enum values are 32-bit integers. */
+
+#define saveg_read_enum saveg_read32
+#define saveg_write_enum saveg_write32
+
+/* think_t
+ * This is just an actionf_t.
+ */
+
+#define saveg_read_think_t saveg_read_actionf_t
+#define saveg_write_think_t saveg_write_actionf_t
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+enum
+{
+  tc_ceiling,
+  tc_door,
+  tc_floor,
+  tc_plat,
+  tc_flash,
+  tc_strobe,
+  tc_glow,
+  tc_endspecials
+} specials_e;
+
+/* Thinkers */
+
+typedef enum
+{
+  tc_end,
+  tc_mobj
+} thinkerclass_t;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 FILE *save_stream;
 int savegamelength;
 boolean savegame_error;
 
-// Get the filename of a temporary file to write the savegame to.  After
-// the file has been successfully saved, it will be renamed to the 
-// real file.
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-char *P_TempSaveGameFile(void)
-{
-    static char *filename = NULL;
-
-    if (filename == NULL)
-    {
-        filename = M_StringJoin(savegamedir, "temp.dsg", NULL);
-    }
-
-    return filename;
-}
-
-// Get the filename of the save game file to use for the specified slot.
-
-char *P_SaveGameFile(int slot)
-{
-    static char *filename = NULL;
-    static size_t filename_size = 0;
-    char basename[32];
-
-    if (filename == NULL)
-    {
-        filename_size = strlen(savegamedir) + 32;
-        filename = malloc(filename_size);
-    }
-
-    DEH_snprintf(basename, 32, SAVEGAMENAME "%d.dsg", slot);
-    M_snprintf(filename, filename_size, "%s%s", savegamedir, basename);
-
-    return filename;
-}
-
-// Endian-safe integer read/write functions
+/* Endian-safe integer read/write functions */
 
 static byte saveg_read8(void)
 {
-    byte result = -1;
+  byte result = -1;
 
-    if (fread(&result, 1, 1, save_stream) < 1)
+  if (fread(&result, 1, 1, save_stream) < 1)
     {
-        if (!savegame_error)
+      if (!savegame_error)
         {
-            fprintf(stderr, "saveg_read8: Unexpected end of file while "
-                            "reading save game\n");
+          fprintf(stderr, "saveg_read8: Unexpected end of file while "
+                          "reading save game\n");
 
-            savegame_error = true;
+          savegame_error = true;
         }
     }
 
-    return result;
+  return result;
 }
 
 static void saveg_write8(byte value)
 {
-    if (fwrite(&value, 1, 1, save_stream) < 1)
+  if (fwrite(&value, 1, 1, save_stream) < 1)
     {
-        if (!savegame_error)
+      if (!savegame_error)
         {
-            fprintf(stderr, "saveg_write8: Error while writing save game\n");
+          fprintf(stderr, "saveg_write8: Error while writing save game\n");
 
-            savegame_error = true;
+          savegame_error = true;
         }
     }
 }
 
 static short saveg_read16(void)
 {
-    int result;
+  int result;
 
-    result = saveg_read8();
-    result |= saveg_read8() << 8;
+  result = saveg_read8();
+  result |= saveg_read8() << 8;
 
-    return result;
+  return result;
 }
 
 static void saveg_write16(short value)
 {
-    saveg_write8(value & 0xff);
-    saveg_write8((value >> 8) & 0xff);
+  saveg_write8(value & 0xff);
+  saveg_write8((value >> 8) & 0xff);
 }
 
 static int saveg_read32(void)
 {
-    int result;
+  int result;
 
-    result = saveg_read8();
-    result |= saveg_read8() << 8;
-    result |= saveg_read8() << 16;
-    result |= saveg_read8() << 24;
+  result = saveg_read8();
+  result |= saveg_read8() << 8;
+  result |= saveg_read8() << 16;
+  result |= saveg_read8() << 24;
 
-    return result;
+  return result;
 }
 
 static void saveg_write32(int value)
 {
-    saveg_write8(value & 0xff);
-    saveg_write8((value >> 8) & 0xff);
-    saveg_write8((value >> 16) & 0xff);
-    saveg_write8((value >> 24) & 0xff);
+  saveg_write8(value & 0xff);
+  saveg_write8((value >> 8) & 0xff);
+  saveg_write8((value >> 16) & 0xff);
+  saveg_write8((value >> 24) & 0xff);
 }
 
-// Pad to 4-byte boundaries
+/* Pad to 4-byte boundaries */
 
 static void saveg_read_pad(void)
 {
-    unsigned long pos;
-    int padding;
-    int i;
+  unsigned long pos;
+  int padding;
+  int i;
 
-    pos = ftell(save_stream);
+  pos = ftell(save_stream);
 
-    padding = (4 - (pos & 3)) & 3;
+  padding = (4 - (pos & 3)) & 3;
 
-    for (i=0; i<padding; ++i)
+  for (i = 0; i < padding; ++i)
     {
-        saveg_read8();
+      saveg_read8();
     }
 }
 
 static void saveg_write_pad(void)
 {
-    unsigned long pos;
-    int padding;
-    int i;
+  unsigned long pos;
+  int padding;
+  int i;
 
-    pos = ftell(save_stream);
+  pos = ftell(save_stream);
 
-    padding = (4 - (pos & 3)) & 3;
+  padding = (4 - (pos & 3)) & 3;
 
-    for (i=0; i<padding; ++i)
+  for (i = 0; i < padding; ++i)
     {
-        saveg_write8(0);
+      saveg_write8(0);
     }
 }
 
-
-// Pointers
+/* Pointers */
 
 static void *saveg_readp(void)
 {
-    return (void *) (intptr_t) saveg_read32();
+  return (void *)(intptr_t)saveg_read32();
 }
 
 static void saveg_writep(const void *p)
 {
-    saveg_write32((intptr_t) p);
+  saveg_write32((intptr_t)p);
 }
 
-// Enum values are 32-bit integers.
+/* Structure read/write functions */
 
-#define saveg_read_enum saveg_read32
-#define saveg_write_enum saveg_write32
-
-//
-// Structure read/write functions
-//
-
-//
-// mapthing_t
-//
+/* mapthing_t */
 
 static void saveg_read_mapthing_t(mapthing_t *str)
 {
-    // short x;
-    str->x = saveg_read16();
+  /* short x; */
 
-    // short y;
-    str->y = saveg_read16();
+  str->x = saveg_read16();
 
-    // short angle;
-    str->angle = saveg_read16();
+  /* short y; */
 
-    // short type;
-    str->type = saveg_read16();
+  str->y = saveg_read16();
 
-    // short options;
-    str->options = saveg_read16();
+  /* short angle; */
+
+  str->angle = saveg_read16();
+
+  /* short type; */
+
+  str->type = saveg_read16();
+
+  /* short options; */
+
+  str->options = saveg_read16();
 }
 
 static void saveg_write_mapthing_t(mapthing_t *str)
 {
-    // short x;
-    saveg_write16(str->x);
+  /* short x; */
 
-    // short y;
-    saveg_write16(str->y);
+  saveg_write16(str->x);
 
-    // short angle;
-    saveg_write16(str->angle);
+  /* short y; */
 
-    // short type;
-    saveg_write16(str->type);
+  saveg_write16(str->y);
 
-    // short options;
-    saveg_write16(str->options);
+  /* short angle; */
+
+  saveg_write16(str->angle);
+
+  /* short type; */
+
+  saveg_write16(str->type);
+
+  /* short options; */
+
+  saveg_write16(str->options);
 }
 
-//
-// actionf_t
-// 
+/* actionf_t */
 
 static void saveg_read_actionf_t(actionf_t *str)
 {
-    // actionf_p1 acp1;
-    str->acp1 = saveg_readp();
+  /* actionf_p1 acp1; */
+
+  str->acp1 = saveg_readp();
 }
 
 static void saveg_write_actionf_t(actionf_t *str)
 {
-    // actionf_p1 acp1;
-    saveg_writep(str->acp1);
+  /* actionf_p1 acp1; */
+
+  saveg_writep(str->acp1);
 }
 
-//
-// think_t
-//
-// This is just an actionf_t.
-//
-
-#define saveg_read_think_t saveg_read_actionf_t
-#define saveg_write_think_t saveg_write_actionf_t
-
-//
-// thinker_t
-//
+/* thinker_t */
 
 static void saveg_read_thinker_t(thinker_t *str)
 {
-    // struct thinker_s* prev;
-    str->prev = saveg_readp();
+  /* struct thinker_s* prev; */
 
-    // struct thinker_s* next;
-    str->next = saveg_readp();
+  str->prev = saveg_readp();
 
-    // think_t function;
-    saveg_read_think_t(&str->function);
+  /* struct thinker_s* next; */
+
+  str->next = saveg_readp();
+
+  /* think_t function; */
+
+  saveg_read_think_t(&str->function);
 }
 
 static void saveg_write_thinker_t(thinker_t *str)
 {
-    // struct thinker_s* prev;
-    saveg_writep(str->prev);
+  /* struct thinker_s* prev; */
 
-    // struct thinker_s* next;
-    saveg_writep(str->next);
+  saveg_writep(str->prev);
 
-    // think_t function;
-    saveg_write_think_t(&str->function);
+  /* struct thinker_s* next; */
+
+  saveg_writep(str->next);
+
+  /* think_t function; */
+
+  saveg_write_think_t(&str->function);
 }
 
-//
-// mobj_t
-//
+/* mobj_t */
 
 static void saveg_read_mobj_t(mobj_t *str)
 {
-    int pl;
+  int pl;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // fixed_t x;
-    str->x = saveg_read32();
+  saveg_read_thinker_t(&str->thinker);
 
-    // fixed_t y;
-    str->y = saveg_read32();
+  /* fixed_t x; */
 
-    // fixed_t z;
-    str->z = saveg_read32();
+  str->x = saveg_read32();
 
-    // struct mobj_s* snext;
-    str->snext = saveg_readp();
+  /* fixed_t y; */
 
-    // struct mobj_s* sprev;
-    str->sprev = saveg_readp();
+  str->y = saveg_read32();
 
-    // angle_t angle;
-    str->angle = saveg_read32();
+  /* fixed_t z; */
 
-    // spritenum_t sprite;
-    str->sprite = saveg_read_enum();
+  str->z = saveg_read32();
 
-    // int frame;
-    str->frame = saveg_read32();
+  /* struct mobj_s* snext; */
 
-    // struct mobj_s* bnext;
-    str->bnext = saveg_readp();
+  str->snext = saveg_readp();
 
-    // struct mobj_s* bprev;
-    str->bprev = saveg_readp();
+  /* struct mobj_s* sprev; */
 
-    // struct subsector_s* subsector;
-    str->subsector = saveg_readp();
+  str->sprev = saveg_readp();
 
-    // fixed_t floorz;
-    str->floorz = saveg_read32();
+  /* angle_t angle; */
 
-    // fixed_t ceilingz;
-    str->ceilingz = saveg_read32();
+  str->angle = saveg_read32();
 
-    // fixed_t radius;
-    str->radius = saveg_read32();
+  /* spritenum_t sprite; */
 
-    // fixed_t height;
-    str->height = saveg_read32();
+  str->sprite = saveg_read_enum();
 
-    // fixed_t momx;
-    str->momx = saveg_read32();
+  /* int frame; */
 
-    // fixed_t momy;
-    str->momy = saveg_read32();
+  str->frame = saveg_read32();
 
-    // fixed_t momz;
-    str->momz = saveg_read32();
+  /* struct mobj_s* bnext; */
 
-    // int validcount;
-    str->validcount = saveg_read32();
+  str->bnext = saveg_readp();
 
-    // mobjtype_t type;
-    str->type = saveg_read_enum();
+  /* struct mobj_s* bprev; */
 
-    // mobjinfo_t* info;
-    str->info = saveg_readp();
+  str->bprev = saveg_readp();
 
-    // int tics;
-    str->tics = saveg_read32();
+  /* struct subsector_s* subsector; */
 
-    // state_t* state;
-    str->state = &states[saveg_read32()];
+  str->subsector = saveg_readp();
 
-    // int flags;
-    str->flags = saveg_read32();
+  /* fixed_t floorz; */
 
-    // int health;
-    str->health = saveg_read32();
+  str->floorz = saveg_read32();
 
-    // int movedir;
-    str->movedir = saveg_read32();
+  /* fixed_t ceilingz; */
 
-    // int movecount;
-    str->movecount = saveg_read32();
+  str->ceilingz = saveg_read32();
 
-    // struct mobj_s* target;
-    str->target = saveg_readp();
+  /* fixed_t radius; */
 
-    // int reactiontime;
-    str->reactiontime = saveg_read32();
+  str->radius = saveg_read32();
 
-    // int threshold;
-    str->threshold = saveg_read32();
+  /* fixed_t height; */
 
-    // struct player_s* player;
-    pl = saveg_read32();
+  str->height = saveg_read32();
 
-    if (pl > 0)
+  /* fixed_t momx; */
+
+  str->momx = saveg_read32();
+
+  /* fixed_t momy; */
+
+  str->momy = saveg_read32();
+
+  /* fixed_t momz; */
+
+  str->momz = saveg_read32();
+
+  /* int validcount; */
+
+  str->validcount = saveg_read32();
+
+  /* mobjtype_t type; */
+
+  str->type = saveg_read_enum();
+
+  /* mobjinfo_t* info; */
+
+  str->info = saveg_readp();
+
+  /* int tics; */
+
+  str->tics = saveg_read32();
+
+  /* state_t* state; */
+
+  str->state = &states[saveg_read32()];
+
+  /* int flags; */
+
+  str->flags = saveg_read32();
+
+  /* int health; */
+
+  str->health = saveg_read32();
+
+  /* int movedir; */
+
+  str->movedir = saveg_read32();
+
+  /* int movecount; */
+
+  str->movecount = saveg_read32();
+
+  /* struct mobj_s* target; */
+
+  str->target = saveg_readp();
+
+  /* int reactiontime; */
+
+  str->reactiontime = saveg_read32();
+
+  /* int threshold; */
+
+  str->threshold = saveg_read32();
+
+  /* struct player_s* player; */
+
+  pl = saveg_read32();
+
+  if (pl > 0)
     {
-        str->player = &players[pl - 1];
-        str->player->mo = str;
+      str->player = &players[pl - 1];
+      str->player->mo = str;
     }
-    else
+  else
     {
-        str->player = NULL;
+      str->player = NULL;
     }
 
-    // int lastlook;
-    str->lastlook = saveg_read32();
+  /* int lastlook; */
 
-    // mapthing_t spawnpoint;
-    saveg_read_mapthing_t(&str->spawnpoint);
+  str->lastlook = saveg_read32();
 
-    // struct mobj_s* tracer;
-    str->tracer = saveg_readp();
+  /* mapthing_t spawnpoint; */
+
+  saveg_read_mapthing_t(&str->spawnpoint);
+
+  /* struct mobj_s* tracer; */
+
+  str->tracer = saveg_readp();
 }
 
 static void saveg_write_mobj_t(mobj_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // fixed_t x;
-    saveg_write32(str->x);
+  saveg_write_thinker_t(&str->thinker);
 
-    // fixed_t y;
-    saveg_write32(str->y);
+  /* fixed_t x; */
 
-    // fixed_t z;
-    saveg_write32(str->z);
+  saveg_write32(str->x);
 
-    // struct mobj_s* snext;
-    saveg_writep(str->snext);
+  /* fixed_t y; */
 
-    // struct mobj_s* sprev;
-    saveg_writep(str->sprev);
+  saveg_write32(str->y);
 
-    // angle_t angle;
-    saveg_write32(str->angle);
+  /* fixed_t z; */
 
-    // spritenum_t sprite;
-    saveg_write_enum(str->sprite);
+  saveg_write32(str->z);
 
-    // int frame;
-    saveg_write32(str->frame);
+  /* struct mobj_s* snext; */
 
-    // struct mobj_s* bnext;
-    saveg_writep(str->bnext);
+  saveg_writep(str->snext);
 
-    // struct mobj_s* bprev;
-    saveg_writep(str->bprev);
+  /* struct mobj_s* sprev; */
 
-    // struct subsector_s* subsector;
-    saveg_writep(str->subsector);
+  saveg_writep(str->sprev);
 
-    // fixed_t floorz;
-    saveg_write32(str->floorz);
+  /* angle_t angle; */
 
-    // fixed_t ceilingz;
-    saveg_write32(str->ceilingz);
+  saveg_write32(str->angle);
 
-    // fixed_t radius;
-    saveg_write32(str->radius);
+  /* spritenum_t sprite; */
 
-    // fixed_t height;
-    saveg_write32(str->height);
+  saveg_write_enum(str->sprite);
 
-    // fixed_t momx;
-    saveg_write32(str->momx);
+  /* int frame; */
 
-    // fixed_t momy;
-    saveg_write32(str->momy);
+  saveg_write32(str->frame);
 
-    // fixed_t momz;
-    saveg_write32(str->momz);
+  /* struct mobj_s* bnext; */
 
-    // int validcount;
-    saveg_write32(str->validcount);
+  saveg_writep(str->bnext);
 
-    // mobjtype_t type;
-    saveg_write_enum(str->type);
+  /* struct mobj_s* bprev; */
 
-    // mobjinfo_t* info;
-    saveg_writep(str->info);
+  saveg_writep(str->bprev);
 
-    // int tics;
-    saveg_write32(str->tics);
+  /* struct subsector_s* subsector; */
 
-    // state_t* state;
-    saveg_write32(str->state - states);
+  saveg_writep(str->subsector);
 
-    // int flags;
-    saveg_write32(str->flags);
+  /* fixed_t floorz; */
 
-    // int health;
-    saveg_write32(str->health);
+  saveg_write32(str->floorz);
 
-    // int movedir;
-    saveg_write32(str->movedir);
+  /* fixed_t ceilingz; */
 
-    // int movecount;
-    saveg_write32(str->movecount);
+  saveg_write32(str->ceilingz);
 
-    // struct mobj_s* target;
-    saveg_writep(str->target);
+  /* fixed_t radius; */
 
-    // int reactiontime;
-    saveg_write32(str->reactiontime);
+  saveg_write32(str->radius);
 
-    // int threshold;
-    saveg_write32(str->threshold);
+  /* fixed_t height; */
 
-    // struct player_s* player;
-    if (str->player)
+  saveg_write32(str->height);
+
+  /* fixed_t momx; */
+
+  saveg_write32(str->momx);
+
+  /* fixed_t momy; */
+
+  saveg_write32(str->momy);
+
+  /* fixed_t momz; */
+
+  saveg_write32(str->momz);
+
+  /* int validcount; */
+
+  saveg_write32(str->validcount);
+
+  /* mobjtype_t type; */
+
+  saveg_write_enum(str->type);
+
+  /* mobjinfo_t* info; */
+
+  saveg_writep(str->info);
+
+  /* int tics; */
+
+  saveg_write32(str->tics);
+
+  /* state_t* state; */
+
+  saveg_write32(str->state - states);
+
+  /* int flags; */
+
+  saveg_write32(str->flags);
+
+  /* int health; */
+
+  saveg_write32(str->health);
+
+  /* int movedir; */
+
+  saveg_write32(str->movedir);
+
+  /* int movecount; */
+
+  saveg_write32(str->movecount);
+
+  /* struct mobj_s* target; */
+
+  saveg_writep(str->target);
+
+  /* int reactiontime; */
+
+  saveg_write32(str->reactiontime);
+
+  /* int threshold; */
+
+  saveg_write32(str->threshold);
+
+  /* struct player_s* player; */
+
+  if (str->player)
     {
-        saveg_write32(str->player - players + 1);
+      saveg_write32(str->player - players + 1);
     }
-    else
+  else
     {
-        saveg_write32(0);
+      saveg_write32(0);
     }
 
-    // int lastlook;
-    saveg_write32(str->lastlook);
+  /* int lastlook; */
 
-    // mapthing_t spawnpoint;
-    saveg_write_mapthing_t(&str->spawnpoint);
+  saveg_write32(str->lastlook);
 
-    // struct mobj_s* tracer;
-    saveg_writep(str->tracer);
+  /* mapthing_t spawnpoint; */
+
+  saveg_write_mapthing_t(&str->spawnpoint);
+
+  /* struct mobj_s* tracer; */
+
+  saveg_writep(str->tracer);
 }
 
-
-//
-// ticcmd_t
-//
+/* ticcmd_t */
 
 static void saveg_read_ticcmd_t(ticcmd_t *str)
 {
+  /* signed char forwardmove; */
 
-    // signed char forwardmove;
-    str->forwardmove = saveg_read8();
+  str->forwardmove = saveg_read8();
 
-    // signed char sidemove;
-    str->sidemove = saveg_read8();
+  /* signed char sidemove; */
 
-    // short angleturn;
-    str->angleturn = saveg_read16();
+  str->sidemove = saveg_read8();
 
-    // short consistancy;
-    str->consistancy = saveg_read16();
+  /* short angleturn; */
 
-    // byte chatchar;
-    str->chatchar = saveg_read8();
+  str->angleturn = saveg_read16();
 
-    // byte buttons;
-    str->buttons = saveg_read8();
+  /* short consistency; */
+
+  str->consistency = saveg_read16();
+
+  /* byte chatchar; */
+
+  str->chatchar = saveg_read8();
+
+  /* byte buttons; */
+
+  str->buttons = saveg_read8();
 }
 
 static void saveg_write_ticcmd_t(ticcmd_t *str)
 {
+  /* signed char forwardmove; */
 
-    // signed char forwardmove;
-    saveg_write8(str->forwardmove);
+  saveg_write8(str->forwardmove);
 
-    // signed char sidemove;
-    saveg_write8(str->sidemove);
+  /* signed char sidemove; */
 
-    // short angleturn;
-    saveg_write16(str->angleturn);
+  saveg_write8(str->sidemove);
 
-    // short consistancy;
-    saveg_write16(str->consistancy);
+  /* short angleturn; */
 
-    // byte chatchar;
-    saveg_write8(str->chatchar);
+  saveg_write16(str->angleturn);
 
-    // byte buttons;
-    saveg_write8(str->buttons);
+  /* short consistency; */
+
+  saveg_write16(str->consistency);
+
+  /* byte chatchar; */
+
+  saveg_write8(str->chatchar);
+
+  /* byte buttons; */
+
+  saveg_write8(str->buttons);
 }
 
-//
-// pspdef_t
-//
+/* pspdef_t */
 
 static void saveg_read_pspdef_t(pspdef_t *str)
 {
-    int state;
+  int state;
 
-    // state_t* state;
-    state = saveg_read32();
+  /* state_t* state; */
 
-    if (state > 0)
+  state = saveg_read32();
+
+  if (state > 0)
     {
-        str->state = &states[state];
+      str->state = &states[state];
     }
-    else
+  else
     {
-        str->state = NULL;
+      str->state = NULL;
     }
 
-    // int tics;
-    str->tics = saveg_read32();
+  /* int tics; */
 
-    // fixed_t sx;
-    str->sx = saveg_read32();
+  str->tics = saveg_read32();
 
-    // fixed_t sy;
-    str->sy = saveg_read32();
+  /* fixed_t sx; */
+
+  str->sx = saveg_read32();
+
+  /* fixed_t sy; */
+
+  str->sy = saveg_read32();
 }
 
 static void saveg_write_pspdef_t(pspdef_t *str)
 {
-    // state_t* state;
-    if (str->state)
+  /* state_t* state; */
+
+  if (str->state)
     {
-        saveg_write32(str->state - states);
+      saveg_write32(str->state - states);
     }
-    else
+  else
     {
-        saveg_write32(0);
+      saveg_write32(0);
     }
 
-    // int tics;
-    saveg_write32(str->tics);
+  /* int tics; */
 
-    // fixed_t sx;
-    saveg_write32(str->sx);
+  saveg_write32(str->tics);
 
-    // fixed_t sy;
-    saveg_write32(str->sy);
+  /* fixed_t sx; */
+
+  saveg_write32(str->sx);
+
+  /* fixed_t sy; */
+
+  saveg_write32(str->sy);
 }
 
-//
-// player_t
-//
+/* player_t */
 
 static void saveg_read_player_t(player_t *str)
 {
-    int i;
+  int i;
 
-    // mobj_t* mo;
-    str->mo = saveg_readp();
+  /* mobj_t* mo; */
 
-    // playerstate_t playerstate;
-    str->playerstate = saveg_read_enum();
+  str->mo = saveg_readp();
 
-    // ticcmd_t cmd;
-    saveg_read_ticcmd_t(&str->cmd);
+  /* playerstate_t playerstate; */
 
-    // fixed_t viewz;
-    str->viewz = saveg_read32();
+  str->playerstate = saveg_read_enum();
 
-    // fixed_t viewheight;
-    str->viewheight = saveg_read32();
+  /* ticcmd_t cmd; */
 
-    // fixed_t deltaviewheight;
-    str->deltaviewheight = saveg_read32();
+  saveg_read_ticcmd_t(&str->cmd);
 
-    // fixed_t bob;
-    str->bob = saveg_read32();
+  /* fixed_t viewz; */
 
-    // int health;
-    str->health = saveg_read32();
+  str->viewz = saveg_read32();
 
-    // int armorpoints;
-    str->armorpoints = saveg_read32();
+  /* fixed_t viewheight; */
 
-    // int armortype;
-    str->armortype = saveg_read32();
+  str->viewheight = saveg_read32();
 
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
+  /* fixed_t deltaviewheight; */
+
+  str->deltaviewheight = saveg_read32();
+
+  /* fixed_t bob; */
+
+  str->bob = saveg_read32();
+
+  /* int health; */
+
+  str->health = saveg_read32();
+
+  /* int armorpoints; */
+
+  str->armorpoints = saveg_read32();
+
+  /* int armortype; */
+
+  str->armortype = saveg_read32();
+
+  /* int powers[NUMPOWERS]; */
+
+  for (i = 0; i < NUMPOWERS; ++i)
     {
-        str->powers[i] = saveg_read32();
+      str->powers[i] = saveg_read32();
     }
 
-    // boolean cards[NUMCARDS];
-    for (i=0; i<NUMCARDS; ++i)
+  /* boolean cards[NUMCARDS]; */
+
+  for (i = 0; i < NUMCARDS; ++i)
     {
-        str->cards[i] = saveg_read32();
+      str->cards[i] = saveg_read32();
     }
 
-    // boolean backpack;
-    str->backpack = saveg_read32();
+  /* boolean backpack; */
 
-    // int frags[MAXPLAYERS];
-    for (i=0; i<MAXPLAYERS; ++i)
+  str->backpack = saveg_read32();
+
+  /* int frags[MAXPLAYERS]; */
+
+  for (i = 0; i < MAXPLAYERS; ++i)
     {
-        str->frags[i] = saveg_read32();
+      str->frags[i] = saveg_read32();
     }
 
-    // weapontype_t readyweapon;
-    str->readyweapon = saveg_read_enum();
+  /* weapontype_t readyweapon; */
 
-    // weapontype_t pendingweapon;
-    str->pendingweapon = saveg_read_enum();
+  str->readyweapon = saveg_read_enum();
 
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
+  /* weapontype_t pendingweapon; */
+
+  str->pendingweapon = saveg_read_enum();
+
+  /* boolean weaponowned[NUMWEAPONS]; */
+
+  for (i = 0; i < NUMWEAPONS; ++i)
     {
-        str->weaponowned[i] = saveg_read32();
+      str->weaponowned[i] = saveg_read32();
     }
 
-    // int ammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
+  /* int ammo[NUMAMMO]; */
+
+  for (i = 0; i < NUMAMMO; ++i)
     {
-        str->ammo[i] = saveg_read32();
+      str->ammo[i] = saveg_read32();
     }
 
-    // int maxammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
+  /* int maxammo[NUMAMMO]; */
+
+  for (i = 0; i < NUMAMMO; ++i)
     {
-        str->maxammo[i] = saveg_read32();
+      str->maxammo[i] = saveg_read32();
     }
 
-    // int attackdown;
-    str->attackdown = saveg_read32();
+  /* int attackdown; */
 
-    // int usedown;
-    str->usedown = saveg_read32();
+  str->attackdown = saveg_read32();
 
-    // int cheats;
-    str->cheats = saveg_read32();
+  /* int usedown; */
 
-    // int refire;
-    str->refire = saveg_read32();
+  str->usedown = saveg_read32();
 
-    // int killcount;
-    str->killcount = saveg_read32();
+  /* int cheats; */
 
-    // int itemcount;
-    str->itemcount = saveg_read32();
+  str->cheats = saveg_read32();
 
-    // int secretcount;
-    str->secretcount = saveg_read32();
+  /* int refire; */
 
-    // char* message;
-    str->message = saveg_readp();
+  str->refire = saveg_read32();
 
-    // int damagecount;
-    str->damagecount = saveg_read32();
+  /* int killcount; */
 
-    // int bonuscount;
-    str->bonuscount = saveg_read32();
+  str->killcount = saveg_read32();
 
-    // mobj_t* attacker;
-    str->attacker = saveg_readp();
+  /* int itemcount; */
 
-    // int extralight;
-    str->extralight = saveg_read32();
+  str->itemcount = saveg_read32();
 
-    // int fixedcolormap;
-    str->fixedcolormap = saveg_read32();
+  /* int secretcount; */
 
-    // int colormap;
-    str->colormap = saveg_read32();
+  str->secretcount = saveg_read32();
 
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
+  /* char* message; */
+
+  str->message = saveg_readp();
+
+  /* int damagecount; */
+
+  str->damagecount = saveg_read32();
+
+  /* int bonuscount; */
+
+  str->bonuscount = saveg_read32();
+
+  /* mobj_t* attacker; */
+
+  str->attacker = saveg_readp();
+
+  /* int extralight; */
+
+  str->extralight = saveg_read32();
+
+  /* int fixedcolormap; */
+
+  str->fixedcolormap = saveg_read32();
+
+  /* int colormap; */
+
+  str->colormap = saveg_read32();
+
+  /* pspdef_t psprites[NUMPSPRITES]; */
+
+  for (i = 0; i < NUMPSPRITES; ++i)
     {
-        saveg_read_pspdef_t(&str->psprites[i]);
+      saveg_read_pspdef_t(&str->psprites[i]);
     }
 
-    // boolean didsecret;
-    str->didsecret = saveg_read32();
+  /* boolean didsecret; */
+
+  str->didsecret = saveg_read32();
 }
 
 static void saveg_write_player_t(player_t *str)
 {
-    int i;
+  int i;
 
-    // mobj_t* mo;
-    saveg_writep(str->mo);
+  /* mobj_t* mo; */
 
-    // playerstate_t playerstate;
-    saveg_write_enum(str->playerstate);
+  saveg_writep(str->mo);
 
-    // ticcmd_t cmd;
-    saveg_write_ticcmd_t(&str->cmd);
+  /* playerstate_t playerstate; */
 
-    // fixed_t viewz;
-    saveg_write32(str->viewz);
+  saveg_write_enum(str->playerstate);
 
-    // fixed_t viewheight;
-    saveg_write32(str->viewheight);
+  /* ticcmd_t cmd; */
 
-    // fixed_t deltaviewheight;
-    saveg_write32(str->deltaviewheight);
+  saveg_write_ticcmd_t(&str->cmd);
 
-    // fixed_t bob;
-    saveg_write32(str->bob);
+  /* fixed_t viewz; */
 
-    // int health;
-    saveg_write32(str->health);
+  saveg_write32(str->viewz);
 
-    // int armorpoints;
-    saveg_write32(str->armorpoints);
+  /* fixed_t viewheight; */
 
-    // int armortype;
-    saveg_write32(str->armortype);
+  saveg_write32(str->viewheight);
 
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
+  /* fixed_t deltaviewheight; */
+
+  saveg_write32(str->deltaviewheight);
+
+  /* fixed_t bob; */
+
+  saveg_write32(str->bob);
+
+  /* int health; */
+
+  saveg_write32(str->health);
+
+  /* int armorpoints; */
+
+  saveg_write32(str->armorpoints);
+
+  /* int armortype; */
+
+  saveg_write32(str->armortype);
+
+  /* int powers[NUMPOWERS]; */
+
+  for (i = 0; i < NUMPOWERS; ++i)
     {
-        saveg_write32(str->powers[i]);
+      saveg_write32(str->powers[i]);
     }
 
-    // boolean cards[NUMCARDS];
-    for (i=0; i<NUMCARDS; ++i)
+  /* boolean cards[NUMCARDS]; */
+
+  for (i = 0; i < NUMCARDS; ++i)
     {
-        saveg_write32(str->cards[i]);
+      saveg_write32(str->cards[i]);
     }
 
-    // boolean backpack;
-    saveg_write32(str->backpack);
+  /* boolean backpack; */
 
-    // int frags[MAXPLAYERS];
-    for (i=0; i<MAXPLAYERS; ++i)
+  saveg_write32(str->backpack);
+
+  /* int frags[MAXPLAYERS]; */
+
+  for (i = 0; i < MAXPLAYERS; ++i)
     {
-        saveg_write32(str->frags[i]);
+      saveg_write32(str->frags[i]);
     }
 
-    // weapontype_t readyweapon;
-    saveg_write_enum(str->readyweapon);
+  /* weapontype_t readyweapon; */
 
-    // weapontype_t pendingweapon;
-    saveg_write_enum(str->pendingweapon);
+  saveg_write_enum(str->readyweapon);
 
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
+  /* weapontype_t pendingweapon; */
+
+  saveg_write_enum(str->pendingweapon);
+
+  /* boolean weaponowned[NUMWEAPONS]; */
+
+  for (i = 0; i < NUMWEAPONS; ++i)
     {
-        saveg_write32(str->weaponowned[i]);
+      saveg_write32(str->weaponowned[i]);
     }
 
-    // int ammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
+  /* int ammo[NUMAMMO]; */
+
+  for (i = 0; i < NUMAMMO; ++i)
     {
-        saveg_write32(str->ammo[i]);
+      saveg_write32(str->ammo[i]);
     }
 
-    // int maxammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
+  /* int maxammo[NUMAMMO]; */
+
+  for (i = 0; i < NUMAMMO; ++i)
     {
-        saveg_write32(str->maxammo[i]);
+      saveg_write32(str->maxammo[i]);
     }
 
-    // int attackdown;
-    saveg_write32(str->attackdown);
+  /* int attackdown; */
 
-    // int usedown;
-    saveg_write32(str->usedown);
+  saveg_write32(str->attackdown);
 
-    // int cheats;
-    saveg_write32(str->cheats);
+  /* int usedown; */
 
-    // int refire;
-    saveg_write32(str->refire);
+  saveg_write32(str->usedown);
 
-    // int killcount;
-    saveg_write32(str->killcount);
+  /* int cheats; */
 
-    // int itemcount;
-    saveg_write32(str->itemcount);
+  saveg_write32(str->cheats);
 
-    // int secretcount;
-    saveg_write32(str->secretcount);
+  /* int refire; */
 
-    // char* message;
-    saveg_writep(str->message);
+  saveg_write32(str->refire);
 
-    // int damagecount;
-    saveg_write32(str->damagecount);
+  /* int killcount; */
 
-    // int bonuscount;
-    saveg_write32(str->bonuscount);
+  saveg_write32(str->killcount);
 
-    // mobj_t* attacker;
-    saveg_writep(str->attacker);
+  /* int itemcount; */
 
-    // int extralight;
-    saveg_write32(str->extralight);
+  saveg_write32(str->itemcount);
 
-    // int fixedcolormap;
-    saveg_write32(str->fixedcolormap);
+  /* int secretcount; */
 
-    // int colormap;
-    saveg_write32(str->colormap);
+  saveg_write32(str->secretcount);
 
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
+  /* char* message; */
+
+  saveg_writep(str->message);
+
+  /* int damagecount; */
+
+  saveg_write32(str->damagecount);
+
+  /* int bonuscount; */
+
+  saveg_write32(str->bonuscount);
+
+  /* mobj_t* attacker; */
+
+  saveg_writep(str->attacker);
+
+  /* int extralight; */
+
+  saveg_write32(str->extralight);
+
+  /* int fixedcolormap; */
+
+  saveg_write32(str->fixedcolormap);
+
+  /* int colormap; */
+
+  saveg_write32(str->colormap);
+
+  /* pspdef_t psprites[NUMPSPRITES]; */
+
+  for (i = 0; i < NUMPSPRITES; ++i)
     {
-        saveg_write_pspdef_t(&str->psprites[i]);
+      saveg_write_pspdef_t(&str->psprites[i]);
     }
 
-    // boolean didsecret;
-    saveg_write32(str->didsecret);
+  /* boolean didsecret; */
+
+  saveg_write32(str->didsecret);
 }
 
-
-//
-// ceiling_t
-//
+/* ceiling_t */
 
 static void saveg_read_ceiling_t(ceiling_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // ceiling_e type;
-    str->type = saveg_read_enum();
+  saveg_read_thinker_t(&str->thinker);
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  /* ceiling_e type; */
 
-    // fixed_t bottomheight;
-    str->bottomheight = saveg_read32();
+  str->type = saveg_read_enum();
 
-    // fixed_t topheight;
-    str->topheight = saveg_read32();
+  /* sector_t* sector; */
 
-    // fixed_t speed;
-    str->speed = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // boolean crush;
-    str->crush = saveg_read32();
+  /* fixed_t bottomheight; */
 
-    // int direction;
-    str->direction = saveg_read32();
+  str->bottomheight = saveg_read32();
 
-    // int tag;
-    str->tag = saveg_read32();
+  /* fixed_t topheight; */
 
-    // int olddirection;
-    str->olddirection = saveg_read32();
+  str->topheight = saveg_read32();
+
+  /* fixed_t speed; */
+
+  str->speed = saveg_read32();
+
+  /* boolean crush; */
+
+  str->crush = saveg_read32();
+
+  /* int direction; */
+
+  str->direction = saveg_read32();
+
+  /* int tag; */
+
+  str->tag = saveg_read32();
+
+  /* int olddirection; */
+
+  str->olddirection = saveg_read32();
 }
 
 static void saveg_write_ceiling_t(ceiling_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // ceiling_e type;
-    saveg_write_enum(str->type);
+  saveg_write_thinker_t(&str->thinker);
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  /* ceiling_e type; */
 
-    // fixed_t bottomheight;
-    saveg_write32(str->bottomheight);
+  saveg_write_enum(str->type);
 
-    // fixed_t topheight;
-    saveg_write32(str->topheight);
+  /* sector_t* sector; */
 
-    // fixed_t speed;
-    saveg_write32(str->speed);
+  saveg_write32(str->sector - sectors);
 
-    // boolean crush;
-    saveg_write32(str->crush);
+  /* fixed_t bottomheight; */
 
-    // int direction;
-    saveg_write32(str->direction);
+  saveg_write32(str->bottomheight);
 
-    // int tag;
-    saveg_write32(str->tag);
+  /* fixed_t topheight; */
 
-    // int olddirection;
-    saveg_write32(str->olddirection);
+  saveg_write32(str->topheight);
+
+  /* fixed_t speed; */
+
+  saveg_write32(str->speed);
+
+  /* boolean crush; */
+
+  saveg_write32(str->crush);
+
+  /* int direction; */
+
+  saveg_write32(str->direction);
+
+  /* int tag; */
+
+  saveg_write32(str->tag);
+
+  /* int olddirection; */
+
+  saveg_write32(str->olddirection);
 }
 
-//
-// vldoor_t
-//
+/* vldoor_t */
 
 static void saveg_read_vldoor_t(vldoor_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // vldoor_e type;
-    str->type = saveg_read_enum();
+  saveg_read_thinker_t(&str->thinker);
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  /* vldoor_e type; */
 
-    // fixed_t topheight;
-    str->topheight = saveg_read32();
+  str->type = saveg_read_enum();
 
-    // fixed_t speed;
-    str->speed = saveg_read32();
+  /* sector_t* sector; */
 
-    // int direction;
-    str->direction = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // int topwait;
-    str->topwait = saveg_read32();
+  /* fixed_t topheight; */
 
-    // int topcountdown;
-    str->topcountdown = saveg_read32();
+  str->topheight = saveg_read32();
+
+  /* fixed_t speed; */
+
+  str->speed = saveg_read32();
+
+  /* int direction; */
+
+  str->direction = saveg_read32();
+
+  /* int topwait; */
+
+  str->topwait = saveg_read32();
+
+  /* int topcountdown; */
+
+  str->topcountdown = saveg_read32();
 }
 
 static void saveg_write_vldoor_t(vldoor_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // vldoor_e type;
-    saveg_write_enum(str->type);
+  saveg_write_thinker_t(&str->thinker);
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  /* vldoor_e type; */
 
-    // fixed_t topheight;
-    saveg_write32(str->topheight);
+  saveg_write_enum(str->type);
 
-    // fixed_t speed;
-    saveg_write32(str->speed);
+  /* sector_t* sector; */
 
-    // int direction;
-    saveg_write32(str->direction);
+  saveg_write32(str->sector - sectors);
 
-    // int topwait;
-    saveg_write32(str->topwait);
+  /* fixed_t topheight; */
 
-    // int topcountdown;
-    saveg_write32(str->topcountdown);
+  saveg_write32(str->topheight);
+
+  /* fixed_t speed; */
+
+  saveg_write32(str->speed);
+
+  /* int direction; */
+
+  saveg_write32(str->direction);
+
+  /* int topwait; */
+
+  saveg_write32(str->topwait);
+
+  /* int topcountdown; */
+
+  saveg_write32(str->topcountdown);
 }
 
-//
-// floormove_t
-//
+/* floormove_t */
 
 static void saveg_read_floormove_t(floormove_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // floor_e type;
-    str->type = saveg_read_enum();
+  saveg_read_thinker_t(&str->thinker);
 
-    // boolean crush;
-    str->crush = saveg_read32();
+  /* floor_e type; */
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  str->type = saveg_read_enum();
 
-    // int direction;
-    str->direction = saveg_read32();
+  /* boolean crush; */
 
-    // int newspecial;
-    str->newspecial = saveg_read32();
+  str->crush = saveg_read32();
 
-    // short texture;
-    str->texture = saveg_read16();
+  /* sector_t* sector; */
 
-    // fixed_t floordestheight;
-    str->floordestheight = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // fixed_t speed;
-    str->speed = saveg_read32();
+  /* int direction; */
+
+  str->direction = saveg_read32();
+
+  /* int newspecial; */
+
+  str->newspecial = saveg_read32();
+
+  /* short texture; */
+
+  str->texture = saveg_read16();
+
+  /* fixed_t floordestheight; */
+
+  str->floordestheight = saveg_read32();
+
+  /* fixed_t speed; */
+
+  str->speed = saveg_read32();
 }
 
 static void saveg_write_floormove_t(floormove_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // floor_e type;
-    saveg_write_enum(str->type);
+  saveg_write_thinker_t(&str->thinker);
 
-    // boolean crush;
-    saveg_write32(str->crush);
+  /* floor_e type; */
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  saveg_write_enum(str->type);
 
-    // int direction;
-    saveg_write32(str->direction);
+  /* boolean crush; */
 
-    // int newspecial;
-    saveg_write32(str->newspecial);
+  saveg_write32(str->crush);
 
-    // short texture;
-    saveg_write16(str->texture);
+  /* sector_t* sector; */
 
-    // fixed_t floordestheight;
-    saveg_write32(str->floordestheight);
+  saveg_write32(str->sector - sectors);
 
-    // fixed_t speed;
-    saveg_write32(str->speed);
+  /* int direction; */
+
+  saveg_write32(str->direction);
+
+  /* int newspecial; */
+
+  saveg_write32(str->newspecial);
+
+  /* short texture; */
+
+  saveg_write16(str->texture);
+
+  /* fixed_t floordestheight; */
+
+  saveg_write32(str->floordestheight);
+
+  /* fixed_t speed; */
+
+  saveg_write32(str->speed);
 }
 
-//
-// plat_t
-//
+/* plat_t */
 
 static void saveg_read_plat_t(plat_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  saveg_read_thinker_t(&str->thinker);
 
-    // fixed_t speed;
-    str->speed = saveg_read32();
+  /* sector_t* sector; */
 
-    // fixed_t low;
-    str->low = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // fixed_t high;
-    str->high = saveg_read32();
+  /* fixed_t speed; */
 
-    // int wait;
-    str->wait = saveg_read32();
+  str->speed = saveg_read32();
 
-    // int count;
-    str->count = saveg_read32();
+  /* fixed_t low; */
 
-    // plat_e status;
-    str->status = saveg_read_enum();
+  str->low = saveg_read32();
 
-    // plat_e oldstatus;
-    str->oldstatus = saveg_read_enum();
+  /* fixed_t high; */
 
-    // boolean crush;
-    str->crush = saveg_read32();
+  str->high = saveg_read32();
 
-    // int tag;
-    str->tag = saveg_read32();
+  /* int wait; */
 
-    // plattype_e type;
-    str->type = saveg_read_enum();
+  str->wait = saveg_read32();
+
+  /* int count; */
+
+  str->count = saveg_read32();
+
+  /* plat_e status; */
+
+  str->status = saveg_read_enum();
+
+  /* plat_e oldstatus; */
+
+  str->oldstatus = saveg_read_enum();
+
+  /* boolean crush; */
+
+  str->crush = saveg_read32();
+
+  /* int tag; */
+
+  str->tag = saveg_read32();
+
+  /* plattype_e type; */
+
+  str->type = saveg_read_enum();
 }
 
 static void saveg_write_plat_t(plat_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  saveg_write_thinker_t(&str->thinker);
 
-    // fixed_t speed;
-    saveg_write32(str->speed);
+  /* sector_t* sector; */
 
-    // fixed_t low;
-    saveg_write32(str->low);
+  saveg_write32(str->sector - sectors);
 
-    // fixed_t high;
-    saveg_write32(str->high);
+  /* fixed_t speed; */
 
-    // int wait;
-    saveg_write32(str->wait);
+  saveg_write32(str->speed);
 
-    // int count;
-    saveg_write32(str->count);
+  /* fixed_t low; */
 
-    // plat_e status;
-    saveg_write_enum(str->status);
+  saveg_write32(str->low);
 
-    // plat_e oldstatus;
-    saveg_write_enum(str->oldstatus);
+  /* fixed_t high; */
 
-    // boolean crush;
-    saveg_write32(str->crush);
+  saveg_write32(str->high);
 
-    // int tag;
-    saveg_write32(str->tag);
+  /* int wait; */
 
-    // plattype_e type;
-    saveg_write_enum(str->type);
+  saveg_write32(str->wait);
+
+  /* int count; */
+
+  saveg_write32(str->count);
+
+  /* plat_e status; */
+
+  saveg_write_enum(str->status);
+
+  /* plat_e oldstatus; */
+
+  saveg_write_enum(str->oldstatus);
+
+  /* boolean crush; */
+
+  saveg_write32(str->crush);
+
+  /* int tag; */
+
+  saveg_write32(str->tag);
+
+  /* plattype_e type; */
+
+  saveg_write_enum(str->type);
 }
 
-//
-// lightflash_t
-//
+/* lightflash_t */
 
 static void saveg_read_lightflash_t(lightflash_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  saveg_read_thinker_t(&str->thinker);
 
-    // int count;
-    str->count = saveg_read32();
+  /* sector_t* sector; */
 
-    // int maxlight;
-    str->maxlight = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // int minlight;
-    str->minlight = saveg_read32();
+  /* int count; */
 
-    // int maxtime;
-    str->maxtime = saveg_read32();
+  str->count = saveg_read32();
 
-    // int mintime;
-    str->mintime = saveg_read32();
+  /* int maxlight; */
+
+  str->maxlight = saveg_read32();
+
+  /* int minlight; */
+
+  str->minlight = saveg_read32();
+
+  /* int maxtime; */
+
+  str->maxtime = saveg_read32();
+
+  /* int mintime; */
+
+  str->mintime = saveg_read32();
 }
 
 static void saveg_write_lightflash_t(lightflash_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  saveg_write_thinker_t(&str->thinker);
 
-    // int count;
-    saveg_write32(str->count);
+  /* sector_t* sector; */
 
-    // int maxlight;
-    saveg_write32(str->maxlight);
+  saveg_write32(str->sector - sectors);
 
-    // int minlight;
-    saveg_write32(str->minlight);
+  /* int count; */
 
-    // int maxtime;
-    saveg_write32(str->maxtime);
+  saveg_write32(str->count);
 
-    // int mintime;
-    saveg_write32(str->mintime);
+  /* int maxlight; */
+
+  saveg_write32(str->maxlight);
+
+  /* int minlight; */
+
+  saveg_write32(str->minlight);
+
+  /* int maxtime; */
+
+  saveg_write32(str->maxtime);
+
+  /* int mintime; */
+
+  saveg_write32(str->mintime);
 }
 
-//
-// strobe_t
-//
+/* strobe_t */
 
 static void saveg_read_strobe_t(strobe_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  saveg_read_thinker_t(&str->thinker);
 
-    // int count;
-    str->count = saveg_read32();
+  /* sector_t* sector; */
 
-    // int minlight;
-    str->minlight = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // int maxlight;
-    str->maxlight = saveg_read32();
+  /* int count; */
 
-    // int darktime;
-    str->darktime = saveg_read32();
+  str->count = saveg_read32();
 
-    // int brighttime;
-    str->brighttime = saveg_read32();
+  /* int minlight; */
+
+  str->minlight = saveg_read32();
+
+  /* int maxlight; */
+
+  str->maxlight = saveg_read32();
+
+  /* int darktime; */
+
+  str->darktime = saveg_read32();
+
+  /* int brighttime; */
+
+  str->brighttime = saveg_read32();
 }
 
 static void saveg_write_strobe_t(strobe_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  saveg_write_thinker_t(&str->thinker);
 
-    // int count;
-    saveg_write32(str->count);
+  /* sector_t* sector; */
 
-    // int minlight;
-    saveg_write32(str->minlight);
+  saveg_write32(str->sector - sectors);
 
-    // int maxlight;
-    saveg_write32(str->maxlight);
+  /* int count; */
 
-    // int darktime;
-    saveg_write32(str->darktime);
+  saveg_write32(str->count);
 
-    // int brighttime;
-    saveg_write32(str->brighttime);
+  /* int minlight; */
+
+  saveg_write32(str->minlight);
+
+  /* int maxlight; */
+
+  saveg_write32(str->maxlight);
+
+  /* int darktime; */
+
+  saveg_write32(str->darktime);
+
+  /* int brighttime; */
+
+  saveg_write32(str->brighttime);
 }
 
-//
-// glow_t
-//
+/* glow_t */
 
 static void saveg_read_glow_t(glow_t *str)
 {
-    int sector;
+  int sector;
 
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
+  saveg_read_thinker_t(&str->thinker);
 
-    // int minlight;
-    str->minlight = saveg_read32();
+  /* sector_t* sector; */
 
-    // int maxlight;
-    str->maxlight = saveg_read32();
+  sector = saveg_read32();
+  str->sector = &sectors[sector];
 
-    // int direction;
-    str->direction = saveg_read32();
+  /* int minlight; */
+
+  str->minlight = saveg_read32();
+
+  /* int maxlight; */
+
+  str->maxlight = saveg_read32();
+
+  /* int direction; */
+
+  str->direction = saveg_read32();
 }
 
 static void saveg_write_glow_t(glow_t *str)
 {
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
+  /* thinker_t thinker; */
 
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
+  saveg_write_thinker_t(&str->thinker);
 
-    // int minlight;
-    saveg_write32(str->minlight);
+  /* sector_t* sector; */
 
-    // int maxlight;
-    saveg_write32(str->maxlight);
+  saveg_write32(str->sector - sectors);
 
-    // int direction;
-    saveg_write32(str->direction);
+  /* int minlight; */
+
+  saveg_write32(str->minlight);
+
+  /* int maxlight; */
+
+  saveg_write32(str->maxlight);
+
+  /* int direction; */
+
+  saveg_write32(str->direction);
 }
 
-//
-// Write the header for a savegame
-//
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-void P_WriteSaveGameHeader(char *description)
+/* Write the header for a savegame */
+
+void p_write_save_game_header(char *description)
 {
-    char name[VERSIONSIZE]; 
-    int i; 
-	
-    for (i=0; description[i] != '\0'; ++i)
-        saveg_write8(description[i]);
-    for (; i<SAVESTRINGSIZE; ++i)
-        saveg_write8(0);
+  char name[VERSIONSIZE];
+  int i;
 
-    memset(name, 0, sizeof(name));
-    M_snprintf(name, sizeof(name), "version %i", G_VanillaVersionCode());
+  for (i = 0; description[i] != '\0'; ++i)
+    saveg_write8(description[i]);
+  for (; i < SAVESTRINGSIZE; ++i)
+    saveg_write8(0);
 
-    for (i=0; i<VERSIONSIZE; ++i)
-        saveg_write8(name[i]);
-	 
-    saveg_write8(gameskill);
-    saveg_write8(gameepisode);
-    saveg_write8(gamemap);
+  memset(name, 0, sizeof(name));
+  snprintf(name, sizeof(name), "version %i", g_vanilla_version_code());
 
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-        saveg_write8(playeringame[i]);
+  for (i = 0; i < VERSIONSIZE; ++i)
+    saveg_write8(name[i]);
 
-    saveg_write8((leveltime >> 16) & 0xff);
-    saveg_write8((leveltime >> 8) & 0xff);
-    saveg_write8(leveltime & 0xff);
+  saveg_write8(gameskill);
+  saveg_write8(gameepisode);
+  saveg_write8(gamemap);
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    saveg_write8(playeringame[i]);
+
+  saveg_write8((leveltime >> 16) & 0xff);
+  saveg_write8((leveltime >> 8) & 0xff);
+  saveg_write8(leveltime & 0xff);
 }
 
-// 
-// Read the header for a savegame
-//
+/* Get the filename of a temporary file to write the savegame to.  After
+ * the file has been successfully saved, it will be renamed to the
+ * real file.
+ */
 
-boolean P_ReadSaveGameHeader(void)
+char *p_temp_save_game_file(void)
 {
-    int	 i; 
-    byte a, b, c; 
-    char vcheck[VERSIONSIZE]; 
-    char read_vcheck[VERSIONSIZE];
-	 
-    // skip the description field 
+  static char *filename = NULL;
 
-    for (i=0; i<SAVESTRINGSIZE; ++i)
-        saveg_read8();
-    
-    for (i=0; i<VERSIONSIZE; ++i)
-        read_vcheck[i] = saveg_read8();
-
-    memset(vcheck, 0, sizeof(vcheck));
-    M_snprintf(vcheck, sizeof(vcheck), "version %i", G_VanillaVersionCode());
-    if (strcmp(read_vcheck, vcheck) != 0)
-	return false;				// bad version 
-
-    gameskill = saveg_read8();
-    gameepisode = saveg_read8();
-    gamemap = saveg_read8();
-
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-	playeringame[i] = saveg_read8();
-
-    // get the times 
-    a = saveg_read8();
-    b = saveg_read8();
-    c = saveg_read8();
-    leveltime = (a<<16) + (b<<8) + c; 
-
-    return true;
-}
-
-//
-// Read the end of file marker.  Returns true if read successfully.
-// 
-
-boolean P_ReadSaveGameEOF(void)
-{
-    int value;
-
-    value = saveg_read8();
-
-    return value == SAVEGAME_EOF;
-}
-
-//
-// Write the end of file marker
-//
-
-void P_WriteSaveGameEOF(void)
-{
-    saveg_write8(SAVEGAME_EOF);
-}
-
-//
-// P_ArchivePlayers
-//
-void P_ArchivePlayers (void)
-{
-    int		i;
-		
-    for (i=0 ; i<MAXPLAYERS ; i++)
+  if (filename == NULL)
     {
-	if (!playeringame[i])
-	    continue;
-	
-	saveg_write_pad();
+      filename = m_string_join(savegamedir, "temp.dsg", NULL);
+    }
 
-        saveg_write_player_t(&players[i]);
+  return filename;
+}
+
+/* Get the filename of the save game file to use for the specified slot. */
+
+char *p_save_game_file(int slot)
+{
+  static char *filename = NULL;
+  static size_t filename_size = 0;
+  char basename[32];
+
+  if (filename == NULL)
+    {
+      filename_size = strlen(savegamedir) + 32;
+      filename = malloc(filename_size);
+    }
+
+  snprintf(basename, 32, SAVEGAMENAME "%d.dsg", slot);
+  snprintf(filename, filename_size, "%s%s", savegamedir, basename);
+
+  return filename;
+}
+
+/* Read the header for a savegame */
+
+boolean p_read_save_game_header(void)
+{
+  int i;
+  byte a, b, c;
+  char vcheck[VERSIONSIZE];
+  char read_vcheck[VERSIONSIZE];
+
+  /* skip the description field */
+
+  for (i = 0; i < SAVESTRINGSIZE; ++i)
+    saveg_read8();
+
+  for (i = 0; i < VERSIONSIZE; ++i)
+    read_vcheck[i] = saveg_read8();
+
+  memset(vcheck, 0, sizeof(vcheck));
+  snprintf(vcheck, sizeof(vcheck), "version %i", g_vanilla_version_code());
+  if (strcmp(read_vcheck, vcheck) != 0) return false; /* bad version */
+
+  gameskill = saveg_read8();
+  gameepisode = saveg_read8();
+  gamemap = saveg_read8();
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    playeringame[i] = saveg_read8();
+
+  /* get the times */
+
+  a = saveg_read8();
+  b = saveg_read8();
+  c = saveg_read8();
+  leveltime = (a << 16) + (b << 8) + c;
+
+  return true;
+}
+
+/* Read the end of file marker. Returns true if read successfully. */
+
+boolean p_read_save_game_eof(void)
+{
+  int value;
+
+  value = saveg_read8();
+
+  return value == SAVEGAME_EOF;
+}
+
+/* Write the end of file marker */
+
+void p_write_save_game_eof(void)
+{
+  saveg_write8(SAVEGAME_EOF);
+}
+
+void p_archive_players(void)
+{
+  int i;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (!playeringame[i]) continue;
+
+      saveg_write_pad();
+
+      saveg_write_player_t(&players[i]);
     }
 }
 
-
-
-//
-// P_UnArchivePlayers
-//
-void P_UnArchivePlayers (void)
+void p_unarchive_players(void)
 {
-    int		i;
-	
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (!playeringame[i])
-	    continue;
-	
-	saveg_read_pad();
+  int i;
 
-        saveg_read_player_t(&players[i]);
-	
-	// will be set when unarc thinker
-	players[i].mo = NULL;	
-	players[i].message = NULL;
-	players[i].attacker = NULL;
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (!playeringame[i]) continue;
+
+      saveg_read_pad();
+
+      saveg_read_player_t(&players[i]);
+
+      /* will be set when unarc thinker */
+
+      players[i].mo = NULL;
+      players[i].message = NULL;
+      players[i].attacker = NULL;
     }
 }
 
-
-//
-// P_ArchiveWorld
-//
-void P_ArchiveWorld (void)
+void p_archive_world(void)
 {
-    int			i;
-    int			j;
-    sector_t*		sec;
-    line_t*		li;
-    side_t*		si;
-    
-    // do sectors
-    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+  int i;
+  int j;
+  sector_t *sec;
+  line_t *li;
+  side_t *si;
+
+  /* do sectors */
+
+  for (i = 0, sec = sectors; i < numsectors; i++, sec++)
     {
-	saveg_write16(sec->floorheight >> FRACBITS);
-	saveg_write16(sec->ceilingheight >> FRACBITS);
-	saveg_write16(sec->floorpic);
-	saveg_write16(sec->ceilingpic);
-	saveg_write16(sec->lightlevel);
-	saveg_write16(sec->special);		// needed?
-	saveg_write16(sec->tag);		// needed?
+      saveg_write16(sec->floorheight >> FRACBITS);
+      saveg_write16(sec->ceilingheight >> FRACBITS);
+      saveg_write16(sec->floorpic);
+      saveg_write16(sec->ceilingpic);
+      saveg_write16(sec->lightlevel);
+      saveg_write16(sec->special); /* needed? */
+
+      saveg_write16(sec->tag); /* needed? */
     }
 
-    
-    // do lines
-    for (i=0, li = lines ; i<numlines ; i++,li++)
-    {
-	saveg_write16(li->flags);
-	saveg_write16(li->special);
-	saveg_write16(li->tag);
-	for (j=0 ; j<2 ; j++)
-	{
-	    if (li->sidenum[j] == -1)
-		continue;
-	    
-	    si = &sides[li->sidenum[j]];
+  /* do lines */
 
-	    saveg_write16(si->textureoffset >> FRACBITS);
-	    saveg_write16(si->rowoffset >> FRACBITS);
-	    saveg_write16(si->toptexture);
-	    saveg_write16(si->bottomtexture);
-	    saveg_write16(si->midtexture);	
-	}
+  for (i = 0, li = lines; i < numlines; i++, li++)
+    {
+      saveg_write16(li->flags);
+      saveg_write16(li->special);
+      saveg_write16(li->tag);
+      for (j = 0; j < 2; j++)
+        {
+          if (li->sidenum[j] == -1) continue;
+
+          si = &sides[li->sidenum[j]];
+
+          saveg_write16(si->textureoffset >> FRACBITS);
+          saveg_write16(si->rowoffset >> FRACBITS);
+          saveg_write16(si->toptexture);
+          saveg_write16(si->bottomtexture);
+          saveg_write16(si->midtexture);
+        }
     }
 }
 
-
-
-//
-// P_UnArchiveWorld
-//
-void P_UnArchiveWorld (void)
+void p_unarchive_world(void)
 {
-    int			i;
-    int			j;
-    sector_t*		sec;
-    line_t*		li;
-    side_t*		si;
-    
-    // do sectors
-    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+  int i;
+  int j;
+  sector_t *sec;
+  line_t *li;
+  side_t *si;
+
+  /* do sectors */
+
+  for (i = 0, sec = sectors; i < numsectors; i++, sec++)
     {
-	sec->floorheight = saveg_read16() << FRACBITS;
-	sec->ceilingheight = saveg_read16() << FRACBITS;
-	sec->floorpic = saveg_read16();
-	sec->ceilingpic = saveg_read16();
-	sec->lightlevel = saveg_read16();
-	sec->special = saveg_read16();		// needed?
-	sec->tag = saveg_read16();		// needed?
-	sec->specialdata = 0;
-	sec->soundtarget = 0;
+      sec->floorheight = saveg_read16() << FRACBITS;
+      sec->ceilingheight = saveg_read16() << FRACBITS;
+      sec->floorpic = saveg_read16();
+      sec->ceilingpic = saveg_read16();
+      sec->lightlevel = saveg_read16();
+      sec->special = saveg_read16(); /* needed? */
+
+      sec->tag = saveg_read16(); /* needed? */
+
+      sec->specialdata = 0;
+      sec->soundtarget = 0;
     }
-    
-    // do lines
-    for (i=0, li = lines ; i<numlines ; i++,li++)
+
+  /* do lines */
+
+  for (i = 0, li = lines; i < numlines; i++, li++)
     {
-	li->flags = saveg_read16();
-	li->special = saveg_read16();
-	li->tag = saveg_read16();
-	for (j=0 ; j<2 ; j++)
-	{
-	    if (li->sidenum[j] == -1)
-		continue;
-	    si = &sides[li->sidenum[j]];
-	    si->textureoffset = saveg_read16() << FRACBITS;
-	    si->rowoffset = saveg_read16() << FRACBITS;
-	    si->toptexture = saveg_read16();
-	    si->bottomtexture = saveg_read16();
-	    si->midtexture = saveg_read16();
-	}
+      li->flags = saveg_read16();
+      li->special = saveg_read16();
+      li->tag = saveg_read16();
+      for (j = 0; j < 2; j++)
+        {
+          if (li->sidenum[j] == -1) continue;
+          si = &sides[li->sidenum[j]];
+          si->textureoffset = saveg_read16() << FRACBITS;
+          si->rowoffset = saveg_read16() << FRACBITS;
+          si->toptexture = saveg_read16();
+          si->bottomtexture = saveg_read16();
+          si->midtexture = saveg_read16();
+        }
     }
 }
 
-
-
-
-
-//
-// Thinkers
-//
-typedef enum
+void p_archive_thinkers(void)
 {
-    tc_end,
-    tc_mobj
+  thinker_t *th;
 
-} thinkerclass_t;
+  /* save off the current thinkers */
 
-
-//
-// P_ArchiveThinkers
-//
-void P_ArchiveThinkers (void)
-{
-    thinker_t*		th;
-
-    // save off the current thinkers
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+  for (th = thinkercap.next; th != &thinkercap; th = th->next)
     {
-	if (th->function.acp1 == (actionf_p1)P_MobjThinker)
-	{
-            saveg_write8(tc_mobj);
-	    saveg_write_pad();
-            saveg_write_mobj_t((mobj_t *) th);
+      if (th->function.acp1 == (actionf_p1)p_mobj_thinker)
+        {
+          saveg_write8(tc_mobj);
+          saveg_write_pad();
+          saveg_write_mobj_t((mobj_t *)th);
 
-	    continue;
-	}
-		
-	// I_Error ("P_ArchiveThinkers: Unknown thinker function");
+          continue;
+        }
     }
 
-    // add a terminating marker
-    saveg_write8(tc_end);
+  /* add a terminating marker */
+
+  saveg_write8(tc_end);
 }
 
-
-
-//
-// P_UnArchiveThinkers
-//
-void P_UnArchiveThinkers (void)
+void p_unarchive_thinkers(void)
 {
-    byte		tclass;
-    thinker_t*		currentthinker;
-    thinker_t*		next;
-    mobj_t*		mobj;
-    
-    // remove all the current thinkers
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
+  byte tclass;
+  thinker_t *currentthinker;
+  thinker_t *next;
+  mobj_t *mobj;
+
+  /* remove all the current thinkers */
+
+  currentthinker = thinkercap.next;
+  while (currentthinker != &thinkercap)
     {
-	next = currentthinker->next;
-	
-	if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
-	    P_RemoveMobj ((mobj_t *)currentthinker);
-	else
-	    Z_Free (currentthinker);
+      next = currentthinker->next;
 
-	currentthinker = next;
-    }
-    P_InitThinkers ();
-    
-    // read in saved thinkers
-    while (1)
-    {
-	tclass = saveg_read8();
-	switch (tclass)
-	{
-	  case tc_end:
-	    return; 	// end of list
-			
-	  case tc_mobj:
-	    saveg_read_pad();
-	    mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
-            saveg_read_mobj_t(mobj);
+      if (currentthinker->function.acp1 == (actionf_p1)p_mobj_thinker)
+        p_remove_mobj((mobj_t *)currentthinker);
+      else
+        z_free(currentthinker);
 
-	    mobj->target = NULL;
-            mobj->tracer = NULL;
-	    P_SetThingPosition (mobj);
-	    mobj->info = &mobjinfo[mobj->type];
-	    mobj->floorz = mobj->subsector->sector->floorheight;
-	    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-	    mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-	    P_AddThinker (&mobj->thinker);
-	    break;
-
-	  default:
-	    I_Error ("Unknown tclass %i in savegame",tclass);
-	}
-	
+      currentthinker = next;
     }
 
+  p_init_thinkers();
+
+  /* read in saved thinkers */
+
+  while (1)
+    {
+      tclass = saveg_read8();
+      switch (tclass)
+        {
+        case tc_end:
+          return; /* end of list */
+
+        case tc_mobj:
+          saveg_read_pad();
+          mobj = z_malloc(sizeof(*mobj), PU_LEVEL, NULL);
+          saveg_read_mobj_t(mobj);
+
+          mobj->target = NULL;
+          mobj->tracer = NULL;
+          p_set_thing_position(mobj);
+          mobj->info = &mobjinfo[mobj->type];
+          mobj->floorz = mobj->subsector->sector->floorheight;
+          mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+          mobj->thinker.function.acp1 = (actionf_p1)p_mobj_thinker;
+          p_add_thinker(&mobj->thinker);
+          break;
+
+        default:
+          i_error("Unknown tclass %i in savegame", tclass);
+        }
+    }
 }
 
+/* Things to handle:
+ *
+ * t_move_ceiling, (ceiling_t: sector_t * swizzle), - active list
+ * t_vertical_door, (vldoor_t: sector_t * swizzle),
+ * t_move_floor, (floormove_t: sector_t * swizzle),
+ * t_light_flash, (lightflash_t: sector_t * swizzle),
+ * t_strobe_flash, (strobe_t: sector_t *),
+ * t_glow, (glow_t: sector_t *),
+ * t_plat_raise, (plat_t: sector_t *), - active list
+ */
 
-//
-// P_ArchiveSpecials
-//
-enum
+void p_archive_specials(void)
 {
-    tc_ceiling,
-    tc_door,
-    tc_floor,
-    tc_plat,
-    tc_flash,
-    tc_strobe,
-    tc_glow,
-    tc_endspecials
+  thinker_t *th;
+  int i;
 
-} specials_e;	
+  /* save off the current thinkers */
 
-
-
-//
-// Things to handle:
-//
-// T_MoveCeiling, (ceiling_t: sector_t * swizzle), - active list
-// T_VerticalDoor, (vldoor_t: sector_t * swizzle),
-// T_MoveFloor, (floormove_t: sector_t * swizzle),
-// T_LightFlash, (lightflash_t: sector_t * swizzle),
-// T_StrobeFlash, (strobe_t: sector_t *),
-// T_Glow, (glow_t: sector_t *),
-// T_PlatRaise, (plat_t: sector_t *), - active list
-//
-void P_ArchiveSpecials (void)
-{
-    thinker_t*		th;
-    int			i;
-	
-    // save off the current thinkers
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+  for (th = thinkercap.next; th != &thinkercap; th = th->next)
     {
-	if (th->function.acv == (actionf_v)NULL)
-	{
-	    for (i = 0; i < MAXCEILINGS;i++)
-		if (activeceilings[i] == (ceiling_t *)th)
-		    break;
-	    
-	    if (i<MAXCEILINGS)
-	    {
-                saveg_write8(tc_ceiling);
-		saveg_write_pad();
-                saveg_write_ceiling_t((ceiling_t *) th);
-	    }
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
-	{
-            saveg_write8(tc_ceiling);
-	    saveg_write_pad();
-            saveg_write_ceiling_t((ceiling_t *) th);
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_VerticalDoor)
-	{
-            saveg_write8(tc_door);
-	    saveg_write_pad();
-            saveg_write_vldoor_t((vldoor_t *) th);
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_MoveFloor)
-	{
-            saveg_write8(tc_floor);
-	    saveg_write_pad();
-            saveg_write_floormove_t((floormove_t *) th);
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_PlatRaise)
-	{
-            saveg_write8(tc_plat);
-	    saveg_write_pad();
-            saveg_write_plat_t((plat_t *) th);
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_LightFlash)
-	{
-            saveg_write8(tc_flash);
-	    saveg_write_pad();
-            saveg_write_lightflash_t((lightflash_t *) th);
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_StrobeFlash)
-	{
-            saveg_write8(tc_strobe);
-	    saveg_write_pad();
-            saveg_write_strobe_t((strobe_t *) th);
-	    continue;
-	}
-			
-	if (th->function.acp1 == (actionf_p1)T_Glow)
-	{
-            saveg_write8(tc_glow);
-	    saveg_write_pad();
-            saveg_write_glow_t((glow_t *) th);
-	    continue;
-	}
-    }
-	
-    // add a terminating marker
-    saveg_write8(tc_endspecials);
+      if (th->function.acv == (actionf_v)NULL)
+        {
+          for (i = 0; i < MAXCEILINGS; i++)
+            {
+              if (activeceilings[i] == (ceiling_t *)th) break;
+            }
 
-}
+          if (i < MAXCEILINGS)
+            {
+              saveg_write8(tc_ceiling);
+              saveg_write_pad();
+              saveg_write_ceiling_t((ceiling_t *)th);
+            }
 
+          continue;
+        }
 
-//
-// P_UnArchiveSpecials
-//
-void P_UnArchiveSpecials (void)
-{
-    byte		tclass;
-    ceiling_t*		ceiling;
-    vldoor_t*		door;
-    floormove_t*	floor;
-    plat_t*		plat;
-    lightflash_t*	flash;
-    strobe_t*		strobe;
-    glow_t*		glow;
-	
-	
-    // read in saved thinkers
-    while (1)
-    {
-	tclass = saveg_read8();
+      if (th->function.acp1 == (actionf_p1)t_move_ceiling)
+        {
+          saveg_write8(tc_ceiling);
+          saveg_write_pad();
+          saveg_write_ceiling_t((ceiling_t *)th);
+          continue;
+        }
 
-	switch (tclass)
-	{
-	  case tc_endspecials:
-	    return;	// end of list
-			
-	  case tc_ceiling:
-	    saveg_read_pad();
-	    ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL);
-            saveg_read_ceiling_t(ceiling);
-	    ceiling->sector->specialdata = ceiling;
+      if (th->function.acp1 == (actionf_p1)t_vertical_door)
+        {
+          saveg_write8(tc_door);
+          saveg_write_pad();
+          saveg_write_vldoor_t((vldoor_t *)th);
+          continue;
+        }
 
-	    if (ceiling->thinker.function.acp1)
-		ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+      if (th->function.acp1 == (actionf_p1)t_move_floor)
+        {
+          saveg_write8(tc_floor);
+          saveg_write_pad();
+          saveg_write_floormove_t((floormove_t *)th);
+          continue;
+        }
 
-	    P_AddThinker (&ceiling->thinker);
-	    P_AddActiveCeiling(ceiling);
-	    break;
-				
-	  case tc_door:
-	    saveg_read_pad();
-	    door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL);
-            saveg_read_vldoor_t(door);
-	    door->sector->specialdata = door;
-	    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-	    P_AddThinker (&door->thinker);
-	    break;
-				
-	  case tc_floor:
-	    saveg_read_pad();
-	    floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL);
-            saveg_read_floormove_t(floor);
-	    floor->sector->specialdata = floor;
-	    floor->thinker.function.acp1 = (actionf_p1)T_MoveFloor;
-	    P_AddThinker (&floor->thinker);
-	    break;
-				
-	  case tc_plat:
-	    saveg_read_pad();
-	    plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL);
-            saveg_read_plat_t(plat);
-	    plat->sector->specialdata = plat;
+      if (th->function.acp1 == (actionf_p1)t_plat_raise)
+        {
+          saveg_write8(tc_plat);
+          saveg_write_pad();
+          saveg_write_plat_t((plat_t *)th);
+          continue;
+        }
 
-	    if (plat->thinker.function.acp1)
-		plat->thinker.function.acp1 = (actionf_p1)T_PlatRaise;
+      if (th->function.acp1 == (actionf_p1)t_light_flash)
+        {
+          saveg_write8(tc_flash);
+          saveg_write_pad();
+          saveg_write_lightflash_t((lightflash_t *)th);
+          continue;
+        }
 
-	    P_AddThinker (&plat->thinker);
-	    P_AddActivePlat(plat);
-	    break;
-				
-	  case tc_flash:
-	    saveg_read_pad();
-	    flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL);
-            saveg_read_lightflash_t(flash);
-	    flash->thinker.function.acp1 = (actionf_p1)T_LightFlash;
-	    P_AddThinker (&flash->thinker);
-	    break;
-				
-	  case tc_strobe:
-	    saveg_read_pad();
-	    strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL);
-            saveg_read_strobe_t(strobe);
-	    strobe->thinker.function.acp1 = (actionf_p1)T_StrobeFlash;
-	    P_AddThinker (&strobe->thinker);
-	    break;
-				
-	  case tc_glow:
-	    saveg_read_pad();
-	    glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL);
-            saveg_read_glow_t(glow);
-	    glow->thinker.function.acp1 = (actionf_p1)T_Glow;
-	    P_AddThinker (&glow->thinker);
-	    break;
-				
-	  default:
-	    I_Error ("P_UnarchiveSpecials:Unknown tclass %i "
-		     "in savegame",tclass);
-	}
-	
+      if (th->function.acp1 == (actionf_p1)t_strobe_flash)
+        {
+          saveg_write8(tc_strobe);
+          saveg_write_pad();
+          saveg_write_strobe_t((strobe_t *)th);
+          continue;
+        }
+
+      if (th->function.acp1 == (actionf_p1)t_glow)
+        {
+          saveg_write8(tc_glow);
+          saveg_write_pad();
+          saveg_write_glow_t((glow_t *)th);
+          continue;
+        }
     }
 
+  /* add a terminating marker */
+
+  saveg_write8(tc_endspecials);
 }
 
+void p_unarchive_specials(void)
+{
+  byte tclass;
+  ceiling_t *ceiling;
+  vldoor_t *door;
+  floormove_t *floor;
+  plat_t *plat;
+  lightflash_t *flash;
+  strobe_t *strobe;
+  glow_t *glow;
+
+  /* read in saved thinkers */
+
+  while (1)
+    {
+      tclass = saveg_read8();
+
+      switch (tclass)
+        {
+        case tc_endspecials:
+          return; /* end of list */
+
+        case tc_ceiling:
+          saveg_read_pad();
+          ceiling = z_malloc(sizeof(*ceiling), PU_LEVEL, NULL);
+          saveg_read_ceiling_t(ceiling);
+          ceiling->sector->specialdata = ceiling;
+
+          if (ceiling->thinker.function.acp1)
+            ceiling->thinker.function.acp1 = (actionf_p1)t_move_ceiling;
+
+          p_add_thinker(&ceiling->thinker);
+          p_add_active_ceiling(ceiling);
+          break;
+
+        case tc_door:
+          saveg_read_pad();
+          door = z_malloc(sizeof(*door), PU_LEVEL, NULL);
+          saveg_read_vldoor_t(door);
+          door->sector->specialdata = door;
+          door->thinker.function.acp1 = (actionf_p1)t_vertical_door;
+          p_add_thinker(&door->thinker);
+          break;
+
+        case tc_floor:
+          saveg_read_pad();
+          floor = z_malloc(sizeof(*floor), PU_LEVEL, NULL);
+          saveg_read_floormove_t(floor);
+          floor->sector->specialdata = floor;
+          floor->thinker.function.acp1 = (actionf_p1)t_move_floor;
+          p_add_thinker(&floor->thinker);
+          break;
+
+        case tc_plat:
+          saveg_read_pad();
+          plat = z_malloc(sizeof(*plat), PU_LEVEL, NULL);
+          saveg_read_plat_t(plat);
+          plat->sector->specialdata = plat;
+
+          if (plat->thinker.function.acp1)
+            plat->thinker.function.acp1 = (actionf_p1)t_plat_raise;
+
+          p_add_thinker(&plat->thinker);
+          p_add_active_plat(plat);
+          break;
+
+        case tc_flash:
+          saveg_read_pad();
+          flash = z_malloc(sizeof(*flash), PU_LEVEL, NULL);
+          saveg_read_lightflash_t(flash);
+          flash->thinker.function.acp1 = (actionf_p1)t_light_flash;
+          p_add_thinker(&flash->thinker);
+          break;
+
+        case tc_strobe:
+          saveg_read_pad();
+          strobe = z_malloc(sizeof(*strobe), PU_LEVEL, NULL);
+          saveg_read_strobe_t(strobe);
+          strobe->thinker.function.acp1 = (actionf_p1)t_strobe_flash;
+          p_add_thinker(&strobe->thinker);
+          break;
+
+        case tc_glow:
+          saveg_read_pad();
+          glow = z_malloc(sizeof(*glow), PU_LEVEL, NULL);
+          saveg_read_glow_t(glow);
+          glow->thinker.function.acp1 = (actionf_p1)t_glow;
+          p_add_thinker(&glow->thinker);
+          break;
+
+        default:
+          i_error("P_UnarchiveSpecials:Unknown tclass %i "
+                  "in savegame",
+                  tclass);
+        }
+    }
+}
diff --git a/games/NXDoom/src/doom/p_saveg.h b/games/NXDoom/src/doom/p_saveg.h
index 518a5b706..8c27b6dc7 100644
--- a/games/NXDoom/src/doom/p_saveg.h
+++ b/games/NXDoom/src/doom/p_saveg.h
@@ -1,65 +1,86 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Savegame I/O, archiving, persistence.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_saveg.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Savegame I/O, archiving, persistence.
+ *
+ ****************************************************************************/
 
 #ifndef __P_SAVEG__
 #define __P_SAVEG__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <stdio.h>
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define SAVEGAME_EOF 0x1d
 #define VERSIONSIZE 16
 
-// maximum size of a savegame description
+/* maximum size of a savegame description */
 
 #define SAVESTRINGSIZE 24
 
-// temporary filename to use while saving.
-
-char *P_TempSaveGameFile(void);
-
-// filename to use for a savegame slot
-
-char *P_SaveGameFile(int slot);
-
-// Savegame file header read/write functions
-
-boolean P_ReadSaveGameHeader(void);
-void P_WriteSaveGameHeader(char *description);
-
-// Savegame end-of-file read/write functions
-
-boolean P_ReadSaveGameEOF(void);
-void P_WriteSaveGameEOF(void);
-
-// Persistent storage/archiving.
-// These are the load / save game routines.
-void P_ArchivePlayers (void);
-void P_UnArchivePlayers (void);
-void P_ArchiveWorld (void);
-void P_UnArchiveWorld (void);
-void P_ArchiveThinkers (void);
-void P_UnArchiveThinkers (void);
-void P_ArchiveSpecials (void);
-void P_UnArchiveSpecials (void);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern FILE *save_stream;
 extern boolean savegame_error;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* temporary filename to use while saving. */
+
+char *p_temp_save_game_file(void);
+
+/* filename to use for a savegame slot */
+
+char *p_save_game_file(int slot);
+
+/* Savegame file header read/write functions */
+
+boolean p_read_save_game_header(void);
+void p_write_save_game_header(char *description);
+
+/* Savegame end-of-file read/write functions */
+
+boolean p_read_save_game_eof(void);
+void p_write_save_game_eof(void);
+
+/* Persistent storage/archiving.
+ * These are the load / save game routines.
+ */
+
+void p_archive_players(void);
+void p_unarchive_players(void);
+void p_archive_world(void);
+void p_unarchive_world(void);
+void p_archive_thinkers(void);
+void p_unarchive_thinkers(void);
+void p_archive_specials(void);
+void p_unarchive_specials(void);
+
+#endif /* __P_SAVEG__ */
diff --git a/games/NXDoom/src/doom/p_setup.c b/games/NXDoom/src/doom/p_setup.c
index fbb1a180d..3dc608abf 100644
--- a/games/NXDoom/src/doom/p_setup.c
+++ b/games/NXDoom/src/doom/p_setup.c
@@ -1,23 +1,30 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Do all the WAD I/O, get map description,
-//	set up initial state and misc. LUTs.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_setup.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Do all the WAD I/O, get map description, set up initial state and misc.
+ * LUTs.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <math.h>
 #include <stdlib.h>
@@ -38,796 +45,790 @@
 #include "p_local.h"
 #include "p_rejectpad.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#endif
 
 #include "doomstat.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-void	P_SpawnMapThing (mapthing_t*	mthing);
+/* Maintain single and multi player starting spots. */
 
+#define MAX_DEATHMATCH_STARTS 10
 
-//
-// MAP related Lookup tables.
-// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
-//
-int		numvertexes;
-vertex_t*	vertexes;
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-int		numsegs;
-seg_t*		segs;
+void p_spawn_map_thing(mapthing_t *mthing);
 
-int		numsectors;
-sector_t*	sectors;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-int		numsubsectors;
-subsector_t*	subsectors;
+static int totallines;
 
-int		numnodes;
-node_t*		nodes;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-int		numlines;
-line_t*		lines;
+/* MAP related Lookup tables.
+ * Store VERTICES, LINEDEFS, SIDEDEFS, etc.
+ */
 
-int		numsides;
-side_t*		sides;
+int numvertices;
+vertex_t *vertices;
 
-static int      totallines;
+int numsegs;
+seg_t *segs;
 
-// BLOCKMAP
-// Created from axis aligned bounding box
-// of the map, a rectangular array of
-// blocks of size ...
-// Used to speed up collision detection
-// by spatial subdivision in 2D.
-//
-// Blockmap size.
-int		bmapwidth;
-int		bmapheight;	// size in mapblocks
-short*		blockmap;	// int for larger maps
-// offsets in blockmap are from here
-short*		blockmaplump;		
-// origin of block map
-fixed_t		bmaporgx;
-fixed_t		bmaporgy;
-// for thing chains
-mobj_t**	blocklinks;		
+int numsectors;
+sector_t *sectors;
 
+int numsubsectors;
+subsector_t *subsectors;
 
-// REJECT
-// For fast sight rejection.
-// Speeds up enemy AI by skipping detailed
-//  LineOf Sight calculation.
-// Without special effect, this could be
-//  used as a PVS lookup as well.
-//
-byte*		rejectmatrix;
+int numnodes;
+node_t *nodes;
 
+int numlines;
+line_t *lines;
 
-// Maintain single and multi player starting spots.
-#define MAX_DEATHMATCH_STARTS	10
+int numsides;
+side_t *sides;
 
-mapthing_t	deathmatchstarts[MAX_DEATHMATCH_STARTS];
-mapthing_t*	deathmatch_p;
-mapthing_t	playerstarts[MAXPLAYERS];
-boolean     playerstartsingame[MAXPLAYERS];
+/* BLOCKMAP
+ * Created from axis aligned bounding box
+ * of the map, a rectangular array of
+ * blocks of size ...
+ * Used to speed up collision detection
+ * by spatial subdivision in 2D.
+ */
 
+/* Blockmap size. */
 
+int bmapwidth;
+int bmapheight;  /* size in mapblocks */
+short *blockmap; /* int for larger maps */
 
+/* offsets in blockmap are from here */
 
+short *blockmaplump;
 
-//
-// P_LoadVertexes
-//
-void P_LoadVertexes (int lump)
-{
-    byte*		data;
-    int			i;
-    mapvertex_t*	ml;
-    vertex_t*		li;
+/* origin of block map */
 
-    // Determine number of lumps:
-    //  total lump length / vertex record length.
-    numvertexes = W_LumpLength (lump) / sizeof(mapvertex_t);
+fixed_t bmaporgx;
+fixed_t bmaporgy;
 
-    // Allocate zone memory for buffer.
-    vertexes = Z_Malloc (numvertexes*sizeof(vertex_t),PU_LEVEL,0);	
+/* for thing chains */
 
-    // Load data into cache.
-    data = W_CacheLumpNum (lump, PU_STATIC);
-	
-    ml = (mapvertex_t *)data;
-    li = vertexes;
+mobj_t **blocklinks;
 
-    // Copy and convert vertex coordinates,
-    // internal representation as fixed.
-    for (i=0 ; i<numvertexes ; i++, li++, ml++)
-    {
-	li->x = SHORT(ml->x)<<FRACBITS;
-	li->y = SHORT(ml->y)<<FRACBITS;
-    }
+/* REJECT
+ * For fast sight rejection.
+ * Speeds up enemy AI by skipping detailed LineOf Sight calculation.
+ * Without special effect, this could be used as a PVS lookup as well.
+ */
 
-    // Free buffer memory.
-    W_ReleaseLumpNum(lump);
-}
+byte *rejectmatrix;
 
-//
-// GetSectorAtNullAddress
-//
-sector_t* GetSectorAtNullAddress(void)
-{
-    static boolean null_sector_is_initialized = false;
-    static sector_t null_sector;
+mapthing_t deathmatchstarts[MAX_DEATHMATCH_STARTS];
+mapthing_t *deathmatch_p;
+mapthing_t playerstarts[MAXPLAYERS];
+boolean playerstartsingame[MAXPLAYERS];
 
-    if (!null_sector_is_initialized)
-    {
-        memset(&null_sector, 0, sizeof(null_sector));
-        I_GetMemoryValue(0, &null_sector.floorheight, 4);
-        I_GetMemoryValue(4, &null_sector.ceilingheight, 4);
-        null_sector_is_initialized = true;
-    }
+/* pointer to the current map lump info struct */
 
-    return &null_sector;
-}
-
-//
-// P_LoadSegs
-//
-void P_LoadSegs (int lump)
-{
-    byte*		data;
-    int			i;
-    mapseg_t*		ml;
-    seg_t*		li;
-    line_t*		ldef;
-    int			linedef;
-    int			side;
-    int                 sidenum;
-	
-    numsegs = W_LumpLength (lump) / sizeof(mapseg_t);
-    segs = Z_Malloc (numsegs*sizeof(seg_t),PU_LEVEL,0);	
-    memset (segs, 0, numsegs*sizeof(seg_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    ml = (mapseg_t *)data;
-    li = segs;
-    for (i=0 ; i<numsegs ; i++, li++, ml++)
-    {
-	li->v1 = &vertexes[SHORT(ml->v1)];
-	li->v2 = &vertexes[SHORT(ml->v2)];
-
-	li->angle = (SHORT(ml->angle))<<FRACBITS;
-	li->offset = (SHORT(ml->offset))<<FRACBITS;
-	linedef = SHORT(ml->linedef);
-	ldef = &lines[linedef];
-	li->linedef = ldef;
-	side = SHORT(ml->side);
-
-        // e6y: check for wrong indexes
-        if ((unsigned)ldef->sidenum[side] >= (unsigned)numsides)
-        {
-            I_Error("P_LoadSegs: linedef %d for seg %d references a non-existent sidedef %d",
-                    linedef, i, (unsigned)ldef->sidenum[side]);
-        }
-
-	li->sidedef = &sides[ldef->sidenum[side]];
-	li->frontsector = sides[ldef->sidenum[side]].sector;
-
-        if (ldef-> flags & ML_TWOSIDED)
-        {
-            sidenum = ldef->sidenum[side ^ 1];
-
-            // If the sidenum is out of range, this may be a "glass hack"
-            // impassible window.  Point at side #0 (this may not be
-            // the correct Vanilla behavior; however, it seems to work for
-            // OTTAWAU.WAD, which is the one place I've seen this trick
-            // used).
-
-            if (sidenum < 0 || sidenum >= numsides)
-            {
-                li->backsector = GetSectorAtNullAddress();
-            }
-            else
-            {
-                li->backsector = sides[sidenum].sector;
-            }
-        }
-        else
-        {
-	    li->backsector = 0;
-        }
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadSubsectors
-//
-void P_LoadSubsectors (int lump)
-{
-    byte*		data;
-    int			i;
-    mapsubsector_t*	ms;
-    subsector_t*	ss;
-	
-    numsubsectors = W_LumpLength (lump) / sizeof(mapsubsector_t);
-    subsectors = Z_Malloc (numsubsectors*sizeof(subsector_t),PU_LEVEL,0);	
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    ms = (mapsubsector_t *)data;
-    memset (subsectors,0, numsubsectors*sizeof(subsector_t));
-    ss = subsectors;
-    
-    for (i=0 ; i<numsubsectors ; i++, ss++, ms++)
-    {
-	ss->numlines = SHORT(ms->numsegs);
-	ss->firstline = SHORT(ms->firstseg);
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-
-//
-// P_LoadSectors
-//
-void P_LoadSectors (int lump)
-{
-    byte*		data;
-    int			i;
-    mapsector_t*	ms;
-    sector_t*		ss;
-	
-    numsectors = W_LumpLength (lump) / sizeof(mapsector_t);
-    sectors = Z_Malloc (numsectors*sizeof(sector_t),PU_LEVEL,0);	
-    memset (sectors, 0, numsectors*sizeof(sector_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    ms = (mapsector_t *)data;
-    ss = sectors;
-    for (i=0 ; i<numsectors ; i++, ss++, ms++)
-    {
-	ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
-	ss->ceilingheight = SHORT(ms->ceilingheight)<<FRACBITS;
-	ss->floorpic = R_FlatNumForName(ms->floorpic);
-	ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
-	ss->lightlevel = SHORT(ms->lightlevel);
-	ss->special = SHORT(ms->special);
-	ss->tag = SHORT(ms->tag);
-	ss->thinglist = NULL;
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadNodes
-//
-void P_LoadNodes (int lump)
-{
-    byte*	data;
-    int		i;
-    int		j;
-    int		k;
-    mapnode_t*	mn;
-    node_t*	no;
-	
-    numnodes = W_LumpLength (lump) / sizeof(mapnode_t);
-    nodes = Z_Malloc (numnodes*sizeof(node_t),PU_LEVEL,0);	
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    mn = (mapnode_t *)data;
-    no = nodes;
-    
-    for (i=0 ; i<numnodes ; i++, no++, mn++)
-    {
-	no->x = SHORT(mn->x)<<FRACBITS;
-	no->y = SHORT(mn->y)<<FRACBITS;
-	no->dx = SHORT(mn->dx)<<FRACBITS;
-	no->dy = SHORT(mn->dy)<<FRACBITS;
-	for (j=0 ; j<2 ; j++)
-	{
-	    no->children[j] = SHORT(mn->children[j]);
-	    for (k=0 ; k<4 ; k++)
-		no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
-	}
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadThings
-//
-void P_LoadThings (int lump)
-{
-    byte               *data;
-    int			i;
-    mapthing_t         *mt;
-    mapthing_t          spawnthing;
-    int			numthings;
-    boolean		spawn;
-
-    data = W_CacheLumpNum (lump,PU_STATIC);
-    numthings = W_LumpLength (lump) / sizeof(mapthing_t);
-	
-    mt = (mapthing_t *)data;
-    for (i=0 ; i<numthings ; i++, mt++)
-    {
-	spawn = true;
-
-	// Do not spawn cool, new monsters if !commercial
-	if (gamemode != commercial)
-	{
-	    switch (SHORT(mt->type))
-	    {
-	      case 68:	// Arachnotron
-	      case 64:	// Archvile
-	      case 88:	// Boss Brain
-	      case 89:	// Boss Shooter
-	      case 69:	// Hell Knight
-	      case 67:	// Mancubus
-	      case 71:	// Pain Elemental
-	      case 65:	// Former Human Commando
-	      case 66:	// Revenant
-	      case 84:	// Wolf SS
-		spawn = false;
-		break;
-	    }
-	}
-	if (spawn == false)
-	    break;
-
-	// Do spawn all other stuff. 
-	spawnthing.x = SHORT(mt->x);
-	spawnthing.y = SHORT(mt->y);
-	spawnthing.angle = SHORT(mt->angle);
-	spawnthing.type = SHORT(mt->type);
-	spawnthing.options = SHORT(mt->options);
-	
-	P_SpawnMapThing(&spawnthing);
-    }
-
-    if (!deathmatch)
-    {
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            if (playeringame[i] && !playerstartsingame[i])
-            {
-                I_Error("P_LoadThings: Player %d start missing (vanilla crashes here)", i + 1);
-            }
-            playerstartsingame[i] = false;
-        }
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadLineDefs
-// Also counts secret lines for intermissions.
-//
-void P_LoadLineDefs (int lump)
-{
-    byte*		data;
-    int			i;
-    maplinedef_t*	mld;
-    line_t*		ld;
-    vertex_t*		v1;
-    vertex_t*		v2;
-	
-    numlines = W_LumpLength (lump) / sizeof(maplinedef_t);
-    lines = Z_Malloc (numlines*sizeof(line_t),PU_LEVEL,0);	
-    memset (lines, 0, numlines*sizeof(line_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    mld = (maplinedef_t *)data;
-    ld = lines;
-    for (i=0 ; i<numlines ; i++, mld++, ld++)
-    {
-	ld->flags = SHORT(mld->flags);
-	ld->special = SHORT(mld->special);
-	ld->tag = SHORT(mld->tag);
-	v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
-	v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
-	ld->dx = v2->x - v1->x;
-	ld->dy = v2->y - v1->y;
-	
-	if (!ld->dx)
-	    ld->slopetype = ST_VERTICAL;
-	else if (!ld->dy)
-	    ld->slopetype = ST_HORIZONTAL;
-	else
-	{
-	    if (FixedDiv (ld->dy , ld->dx) > 0)
-		ld->slopetype = ST_POSITIVE;
-	    else
-		ld->slopetype = ST_NEGATIVE;
-	}
-		
-	if (v1->x < v2->x)
-	{
-	    ld->bbox[BOXLEFT] = v1->x;
-	    ld->bbox[BOXRIGHT] = v2->x;
-	}
-	else
-	{
-	    ld->bbox[BOXLEFT] = v2->x;
-	    ld->bbox[BOXRIGHT] = v1->x;
-	}
-
-	if (v1->y < v2->y)
-	{
-	    ld->bbox[BOXBOTTOM] = v1->y;
-	    ld->bbox[BOXTOP] = v2->y;
-	}
-	else
-	{
-	    ld->bbox[BOXBOTTOM] = v2->y;
-	    ld->bbox[BOXTOP] = v1->y;
-	}
-
-	ld->sidenum[0] = SHORT(mld->sidenum[0]);
-	ld->sidenum[1] = SHORT(mld->sidenum[1]);
-
-	if (ld->sidenum[0] != -1)
-	    ld->frontsector = sides[ld->sidenum[0]].sector;
-	else
-	    ld->frontsector = 0;
-
-	if (ld->sidenum[1] != -1)
-	    ld->backsector = sides[ld->sidenum[1]].sector;
-	else
-	    ld->backsector = 0;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadSideDefs
-//
-void P_LoadSideDefs (int lump)
-{
-    byte*		data;
-    int			i;
-    mapsidedef_t*	msd;
-    side_t*		sd;
-	
-    numsides = W_LumpLength (lump) / sizeof(mapsidedef_t);
-    sides = Z_Malloc (numsides*sizeof(side_t),PU_LEVEL,0);	
-    memset (sides, 0, numsides*sizeof(side_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    msd = (mapsidedef_t *)data;
-    sd = sides;
-    for (i=0 ; i<numsides ; i++, msd++, sd++)
-    {
-	sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
-	sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
-	sd->toptexture = R_TextureNumForName(msd->toptexture);
-	sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
-	sd->midtexture = R_TextureNumForName(msd->midtexture);
-	sd->sector = &sectors[SHORT(msd->sector)];
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadBlockMap
-//
-void P_LoadBlockMap (int lump)
-{
-    int i;
-    int count;
-    int lumplen;
-
-    lumplen = W_LumpLength(lump);
-    count = lumplen / 2;
-	
-    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
-    W_ReadLump(lump, blockmaplump);
-    blockmap = blockmaplump + 4;
-
-    // Swap all short integers to native byte ordering.
-  
-    for (i=0; i<count; i++)
-    {
-	blockmaplump[i] = SHORT(blockmaplump[i]);
-    }
-		
-    // Read the header
-
-    bmaporgx = blockmaplump[0]<<FRACBITS;
-    bmaporgy = blockmaplump[1]<<FRACBITS;
-    bmapwidth = blockmaplump[2];
-    bmapheight = blockmaplump[3];
-	
-    // Clear out mobj chains
-
-    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
-    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
-    memset(blocklinks, 0, count);
-}
-
-
-
-//
-// P_GroupLines
-// Builds sector line lists and subsector sector numbers.
-// Finds block bounding boxes for sectors.
-//
-void P_GroupLines (void)
-{
-    line_t**		linebuffer;
-    int			i;
-    int			j;
-    line_t*		li;
-    sector_t*		sector;
-    subsector_t*	ss;
-    seg_t*		seg;
-    fixed_t		bbox[4];
-    int			block;
-	
-    // look up sector number for each subsector
-    ss = subsectors;
-    for (i=0 ; i<numsubsectors ; i++, ss++)
-    {
-	seg = &segs[ss->firstline];
-	ss->sector = seg->sidedef->sector;
-    }
-
-    // count number of lines in each sector
-    li = lines;
-    totallines = 0;
-    for (i=0 ; i<numlines ; i++, li++)
-    {
-	totallines++;
-	li->frontsector->linecount++;
-
-	if (li->backsector && li->backsector != li->frontsector)
-	{
-	    li->backsector->linecount++;
-	    totallines++;
-	}
-    }
-
-    // build line tables for each sector	
-    linebuffer = Z_Malloc (totallines*sizeof(line_t *), PU_LEVEL, 0);
-
-    for (i=0; i<numsectors; ++i)
-    {
-        // Assign the line buffer for this sector
-
-        sectors[i].lines = linebuffer;
-        linebuffer += sectors[i].linecount;
-
-        // Reset linecount to zero so in the next stage we can count
-        // lines into the list.
-
-        sectors[i].linecount = 0;
-    }
-
-    // Assign lines to sectors
-
-    for (i=0; i<numlines; ++i)
-    { 
-        li = &lines[i];
-
-        if (li->frontsector != NULL)
-        {
-            sector = li->frontsector;
-
-            sector->lines[sector->linecount] = li;
-            ++sector->linecount;
-        }
-
-        if (li->backsector != NULL && li->frontsector != li->backsector)
-        {
-            sector = li->backsector;
-
-            sector->lines[sector->linecount] = li;
-            ++sector->linecount;
-        }
-    }
-    
-    // Generate bounding boxes for sectors
-	
-    sector = sectors;
-    for (i=0 ; i<numsectors ; i++, sector++)
-    {
-	M_ClearBox (bbox);
-
-	for (j=0 ; j<sector->linecount; j++)
-	{
-            li = sector->lines[j];
-
-            M_AddToBox (bbox, li->v1->x, li->v1->y);
-            M_AddToBox (bbox, li->v2->x, li->v2->y);
-	}
-
-	// set the degenmobj_t to the middle of the bounding box
-	sector->soundorg.x = (bbox[BOXRIGHT]+bbox[BOXLEFT])/2;
-	sector->soundorg.y = (bbox[BOXTOP]+bbox[BOXBOTTOM])/2;
-		
-	// adjust bounding box to map blocks
-	block = (bbox[BOXTOP]-bmaporgy+MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block >= bmapheight ? bmapheight-1 : block;
-	sector->blockbox[BOXTOP]=block;
-
-	block = (bbox[BOXBOTTOM]-bmaporgy-MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block < 0 ? 0 : block;
-	sector->blockbox[BOXBOTTOM]=block;
-
-	block = (bbox[BOXRIGHT]-bmaporgx+MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block >= bmapwidth ? bmapwidth-1 : block;
-	sector->blockbox[BOXRIGHT]=block;
-
-	block = (bbox[BOXLEFT]-bmaporgx-MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block < 0 ? 0 : block;
-	sector->blockbox[BOXLEFT]=block;
-    }
-	
-}
-
-
-static void P_LoadReject(int lumpnum)
-{
-    int minlength;
-    int lumplen;
-
-    // Calculate the size that the REJECT lump *should* be.
-
-    minlength = (numsectors * numsectors + 7) / 8;
-
-    // If the lump meets the minimum length, it can be loaded directly.
-    // Otherwise, we need to allocate a buffer of the correct size
-    // and pad it with appropriate data.
-
-    lumplen = W_LumpLength(lumpnum);
-
-    if (lumplen >= minlength)
-    {
-        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
-    }
-    else
-    {
-        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
-        W_ReadLump(lumpnum, rejectmatrix);
-
-        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
-    }
-}
-
-// pointer to the current map lump info struct
 lumpinfo_t *maplumpinfo;
 
-//
-// P_SetupLevel
-//
-void
-P_SetupLevel
-( int		episode,
-  int		map,
-  int		playermask,
-  skill_t	skill)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void p_load_vertices(int lump)
 {
-    int		i;
-    char	lumpname[9];
-    int		lumpnum;
-	
-    totalkills = totalitems = totalsecret = wminfo.maxfrags = 0;
-    wminfo.partime = 180;
-    for (i=0 ; i<MAXPLAYERS ; i++)
+  byte *data;
+  int i;
+  mapvertex_t *ml;
+  vertex_t *li;
+
+  /* Determine number of lumps: total lump length / vertex record length. */
+
+  numvertices = w_lump_length(lump) / sizeof(mapvertex_t);
+
+  /* Allocate zone memory for buffer. */
+
+  vertices = z_malloc(numvertices * sizeof(vertex_t), PU_LEVEL, 0);
+
+  /* Load data into cache. */
+
+  data = w_cache_lump_num(lump, PU_STATIC);
+
+  ml = (mapvertex_t *)data;
+  li = vertices;
+
+  /* Copy and convert vertex coordinates, internal representation as fixed. */
+
+  for (i = 0; i < numvertices; i++, li++, ml++)
     {
-	players[i].killcount = players[i].secretcount 
-	    = players[i].itemcount = 0;
+      li->x = SHORT(ml->x) << FRACBITS;
+      li->y = SHORT(ml->y) << FRACBITS;
     }
 
-    // Initial height of PointOfView
-    // will be set by player think.
-    players[consoleplayer].viewz = 1; 
-
-    // Make sure all sounds are stopped before Z_FreeTags.
-    S_Start ();			
-
-    Z_FreeTags (PU_LEVEL, PU_PURGELEVEL-1);
-
-    // UNUSED W_Profile ();
-    P_InitThinkers ();
-
-    // if working with a devlopment map, reload it
-    W_Reload ();
-
-    // find map name
-    if ( gamemode == commercial)
-    {
-	if (map<10)
-	    DEH_snprintf(lumpname, 9, "map0%i", map);
-	else
-	    DEH_snprintf(lumpname, 9, "map%i", map);
-    }
-    else
-    {
-	lumpname[0] = 'E';
-	lumpname[1] = '0' + episode;
-	lumpname[2] = 'M';
-	lumpname[3] = '0' + map;
-	lumpname[4] = 0;
-    }
-
-    lumpnum = W_GetNumForName (lumpname);
-	
-    maplumpinfo = lumpinfo[lumpnum];
-
-    leveltime = 0;
-	
-    // note: most of this ordering is important	
-    P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
-    P_LoadVertexes (lumpnum+ML_VERTEXES);
-    P_LoadSectors (lumpnum+ML_SECTORS);
-    P_LoadSideDefs (lumpnum+ML_SIDEDEFS);
-
-    P_LoadLineDefs (lumpnum+ML_LINEDEFS);
-    P_LoadSubsectors (lumpnum+ML_SSECTORS);
-    P_LoadNodes (lumpnum+ML_NODES);
-    P_LoadSegs (lumpnum+ML_SEGS);
-
-    P_GroupLines ();
-    P_LoadReject (lumpnum+ML_REJECT);
-
-    bodyqueslot = 0;
-    deathmatch_p = deathmatchstarts;
-    P_LoadThings (lumpnum+ML_THINGS);
-    
-    // if deathmatch, randomly spawn the active players
-    if (deathmatch)
-    {
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	    if (playeringame[i])
-	    {
-		players[i].mo = NULL;
-		G_DeathMatchSpawnPlayer (i);
-	    }
-			
-    }
-
-    // clear special respawning que
-    iquehead = iquetail = 0;		
-	
-    // set up world state
-    P_SpawnSpecials ();
-	
-    // build subsector connect matrix
-    //	UNUSED P_ConnectSubsectors ();
-
-    // preload graphics
-    if (precache)
-	R_PrecacheLevel ();
-
-    //printf ("free memory: 0x%x\n", Z_FreeMemory());
+  /* Free buffer memory. */
 
+  w_release_lump_num(lump);
 }
 
-
-
-//
-// P_Init
-//
-void P_Init (void)
+static sector_t *get_sector_at_null_address(void)
 {
-    P_InitSwitchList ();
-    P_InitPicAnims ();
-    R_InitSprites (sprnames);
+  static boolean null_sector_is_initialized = false;
+  static sector_t null_sector;
+
+  if (!null_sector_is_initialized)
+    {
+      memset(&null_sector, 0, sizeof(null_sector));
+      i_get_memory_value(0, &null_sector.floorheight, 4);
+      i_get_memory_value(4, &null_sector.ceilingheight, 4);
+      null_sector_is_initialized = true;
+    }
+
+  return &null_sector;
 }
 
+static void p_load_segs(int lump)
+{
+  byte *data;
+  int i;
+  mapseg_t *ml;
+  seg_t *li;
+  line_t *ldef;
+  int linedef_int;
+  int side;
+  int sidenum;
 
+  numsegs = w_lump_length(lump) / sizeof(mapseg_t);
+  segs = z_malloc(numsegs * sizeof(seg_t), PU_LEVEL, 0);
+  memset(segs, 0, numsegs * sizeof(seg_t));
+  data = w_cache_lump_num(lump, PU_STATIC);
 
+  ml = (mapseg_t *)data;
+  li = segs;
+  for (i = 0; i < numsegs; i++, li++, ml++)
+    {
+      li->v1 = &vertices[SHORT(ml->v1)];
+      li->v2 = &vertices[SHORT(ml->v2)];
+
+      li->angle = (SHORT(ml->angle)) << FRACBITS;
+      li->offset = (SHORT(ml->offset)) << FRACBITS;
+      linedef_int = SHORT(ml->linedef);
+      ldef = &lines[linedef_int];
+      li->linedef = ldef;
+      side = SHORT(ml->side);
+
+      /* e6y: check for wrong indexes */
+
+      if ((unsigned)ldef->sidenum[side] >= (unsigned)numsides)
+        {
+          i_error("p_load_segs: linedef %d for seg %d references a "
+                  "non-existent sidedef %d",
+                  linedef_int, i, (unsigned)ldef->sidenum[side]);
+        }
+
+      li->sidedef = &sides[ldef->sidenum[side]];
+      li->frontsector = sides[ldef->sidenum[side]].sector;
+
+      if (ldef->flags & ML_TWOSIDED)
+        {
+          sidenum = ldef->sidenum[side ^ 1];
+
+          /* If the sidenum is out of range, this may be a "glass hack"
+           * impassable window. Point at side #0 (this may not be
+           * the correct Vanilla behavior; however, it seems to work for
+           * OTTAWAU.WAD, which is the one place I've seen this trick
+           * used).
+           */
+
+          if (sidenum < 0 || sidenum >= numsides)
+            {
+              li->backsector = get_sector_at_null_address();
+            }
+          else
+            {
+              li->backsector = sides[sidenum].sector;
+            }
+        }
+      else
+        {
+          li->backsector = 0;
+        }
+    }
+
+  w_release_lump_num(lump);
+}
+
+static void p_load_subsectors(int lump)
+{
+  byte *data;
+  int i;
+  mapsubsector_t *ms;
+  subsector_t *ss;
+
+  numsubsectors = w_lump_length(lump) / sizeof(mapsubsector_t);
+  subsectors = z_malloc(numsubsectors * sizeof(subsector_t), PU_LEVEL, 0);
+  data = w_cache_lump_num(lump, PU_STATIC);
+
+  ms = (mapsubsector_t *)data;
+  memset(subsectors, 0, numsubsectors * sizeof(subsector_t));
+  ss = subsectors;
+
+  for (i = 0; i < numsubsectors; i++, ss++, ms++)
+    {
+      ss->numlines = SHORT(ms->numsegs);
+      ss->firstline = SHORT(ms->firstseg);
+    }
+
+  w_release_lump_num(lump);
+}
+
+static void p_load_sectors(int lump)
+{
+  byte *data;
+  int i;
+  mapsector_t *ms;
+  sector_t *ss;
+
+  numsectors = w_lump_length(lump) / sizeof(mapsector_t);
+  sectors = z_malloc(numsectors * sizeof(sector_t), PU_LEVEL, 0);
+  memset(sectors, 0, numsectors * sizeof(sector_t));
+  data = w_cache_lump_num(lump, PU_STATIC);
+
+  ms = (mapsector_t *)data;
+  ss = sectors;
+  for (i = 0; i < numsectors; i++, ss++, ms++)
+    {
+      ss->floorheight = SHORT(ms->floorheight) << FRACBITS;
+      ss->ceilingheight = SHORT(ms->ceilingheight) << FRACBITS;
+      ss->floorpic = r_flat_num_for_name(ms->floorpic);
+      ss->ceilingpic = r_flat_num_for_name(ms->ceilingpic);
+      ss->lightlevel = SHORT(ms->lightlevel);
+      ss->special = SHORT(ms->special);
+      ss->tag = SHORT(ms->tag);
+      ss->thinglist = NULL;
+    }
+
+  w_release_lump_num(lump);
+}
+
+static void p_load_nodes(int lump)
+{
+  byte *data;
+  int i;
+  int j;
+  int k;
+  mapnode_t *mn;
+  node_t *no;
+
+  numnodes = w_lump_length(lump) / sizeof(mapnode_t);
+  nodes = z_malloc(numnodes * sizeof(node_t), PU_LEVEL, 0);
+  data = w_cache_lump_num(lump, PU_STATIC);
+
+  mn = (mapnode_t *)data;
+  no = nodes;
+
+  for (i = 0; i < numnodes; i++, no++, mn++)
+    {
+      no->x = SHORT(mn->x) << FRACBITS;
+      no->y = SHORT(mn->y) << FRACBITS;
+      no->dx = SHORT(mn->dx) << FRACBITS;
+      no->dy = SHORT(mn->dy) << FRACBITS;
+      for (j = 0; j < 2; j++)
+        {
+          no->children[j] = SHORT(mn->children[j]);
+          for (k = 0; k < 4; k++)
+            no->bbox[j][k] = SHORT(mn->bbox[j][k]) << FRACBITS;
+        }
+    }
+
+  w_release_lump_num(lump);
+}
+
+static void p_load_things(int lump)
+{
+  byte *data;
+  int i;
+  mapthing_t *mt;
+  mapthing_t spawnthing;
+  int numthings;
+  boolean spawn;
+
+  data = w_cache_lump_num(lump, PU_STATIC);
+  numthings = w_lump_length(lump) / sizeof(mapthing_t);
+
+  mt = (mapthing_t *)data;
+  for (i = 0; i < numthings; i++, mt++)
+    {
+      spawn = true;
+
+      /* Do not spawn cool, new monsters if !commercial */
+
+      if (gamemode != commercial)
+        {
+          switch (SHORT(mt->type))
+            {
+            case 68: /* Arachnotron */
+            case 64: /* Archvile */
+            case 88: /* Boss Brain */
+            case 89: /* Boss Shooter */
+            case 69: /* Hell Knight */
+            case 67: /* Mancubus */
+            case 71: /* Pain Elemental */
+            case 65: /* Former Human Commando */
+            case 66: /* Revenant */
+            case 84: /* Wolf SS */
+              spawn = false;
+              break;
+            }
+        }
+
+      if (spawn == false) break;
+
+      /* Do spawn all other stuff. */
+
+      spawnthing.x = SHORT(mt->x);
+      spawnthing.y = SHORT(mt->y);
+      spawnthing.angle = SHORT(mt->angle);
+      spawnthing.type = SHORT(mt->type);
+      spawnthing.options = SHORT(mt->options);
+
+      p_spawn_map_thing(&spawnthing);
+    }
+
+  if (!deathmatch)
+    {
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (playeringame[i] && !playerstartsingame[i])
+            {
+              i_error("p_load_things: Player %d start missing (vanilla "
+                      "crashes here)",
+                      i + 1);
+            }
+
+          playerstartsingame[i] = false;
+        }
+    }
+
+  w_release_lump_num(lump);
+}
+
+/* p_load_linedefs
+ * Also counts secret lines for intermissions.
+ */
+
+static void p_load_linedefs(int lump)
+{
+  byte *data;
+  int i;
+  maplinedef_t *mld;
+  line_t *ld;
+  vertex_t *v1;
+  vertex_t *v2;
+
+  numlines = w_lump_length(lump) / sizeof(maplinedef_t);
+  lines = z_malloc(numlines * sizeof(line_t), PU_LEVEL, 0);
+  memset(lines, 0, numlines * sizeof(line_t));
+  data = w_cache_lump_num(lump, PU_STATIC);
+
+  mld = (maplinedef_t *)data;
+  ld = lines;
+  for (i = 0; i < numlines; i++, mld++, ld++)
+    {
+      ld->flags = SHORT(mld->flags);
+      ld->special = SHORT(mld->special);
+      ld->tag = SHORT(mld->tag);
+      v1 = ld->v1 = &vertices[SHORT(mld->v1)];
+      v2 = ld->v2 = &vertices[SHORT(mld->v2)];
+      ld->dx = v2->x - v1->x;
+      ld->dy = v2->y - v1->y;
+
+      if (!ld->dx)
+        ld->slopetype = ST_VERTICAL;
+      else if (!ld->dy)
+        ld->slopetype = ST_HORIZONTAL;
+      else
+        {
+          if (fixed_div(ld->dy, ld->dx) > 0)
+            ld->slopetype = ST_POSITIVE;
+          else
+            ld->slopetype = ST_NEGATIVE;
+        }
+
+      if (v1->x < v2->x)
+        {
+          ld->bbox[BOXLEFT] = v1->x;
+          ld->bbox[BOXRIGHT] = v2->x;
+        }
+      else
+        {
+          ld->bbox[BOXLEFT] = v2->x;
+          ld->bbox[BOXRIGHT] = v1->x;
+        }
+
+      if (v1->y < v2->y)
+        {
+          ld->bbox[BOXBOTTOM] = v1->y;
+          ld->bbox[BOXTOP] = v2->y;
+        }
+      else
+        {
+          ld->bbox[BOXBOTTOM] = v2->y;
+          ld->bbox[BOXTOP] = v1->y;
+        }
+
+      ld->sidenum[0] = SHORT(mld->sidenum[0]);
+      ld->sidenum[1] = SHORT(mld->sidenum[1]);
+
+      if (ld->sidenum[0] != -1)
+        ld->frontsector = sides[ld->sidenum[0]].sector;
+      else
+        ld->frontsector = 0;
+
+      if (ld->sidenum[1] != -1)
+        ld->backsector = sides[ld->sidenum[1]].sector;
+      else
+        ld->backsector = 0;
+    }
+
+  w_release_lump_num(lump);
+}
+
+static void p_load_side_defs(int lump)
+{
+  byte *data;
+  int i;
+  mapsidedef_t *msd;
+  side_t *sd;
+
+  numsides = w_lump_length(lump) / sizeof(mapsidedef_t);
+  sides = z_malloc(numsides * sizeof(side_t), PU_LEVEL, 0);
+  memset(sides, 0, numsides * sizeof(side_t));
+  data = w_cache_lump_num(lump, PU_STATIC);
+
+  msd = (mapsidedef_t *)data;
+  sd = sides;
+  for (i = 0; i < numsides; i++, msd++, sd++)
+    {
+      sd->textureoffset = SHORT(msd->textureoffset) << FRACBITS;
+      sd->rowoffset = SHORT(msd->rowoffset) << FRACBITS;
+      sd->toptexture = r_texture_num_for_name(msd->toptexture);
+      sd->bottomtexture = r_texture_num_for_name(msd->bottomtexture);
+      sd->midtexture = r_texture_num_for_name(msd->midtexture);
+      sd->sector = &sectors[SHORT(msd->sector)];
+    }
+
+  w_release_lump_num(lump);
+}
+
+static void p_load_block_map(int lump)
+{
+  int i;
+  int count;
+  int lumplen;
+
+  lumplen = w_lump_length(lump);
+  count = lumplen / 2;
+
+  blockmaplump = z_malloc(lumplen, PU_LEVEL, NULL);
+  w_read_lump(lump, blockmaplump);
+  blockmap = blockmaplump + 4;
+
+  /* Swap all short integers to native byte ordering. */
+
+  for (i = 0; i < count; i++)
+    {
+      blockmaplump[i] = SHORT(blockmaplump[i]);
+    }
+
+  /* Read the header */
+
+  bmaporgx = blockmaplump[0] << FRACBITS;
+  bmaporgy = blockmaplump[1] << FRACBITS;
+  bmapwidth = blockmaplump[2];
+  bmapheight = blockmaplump[3];
+
+  /* Clear out mobj chains */
+
+  count = sizeof(*blocklinks) * bmapwidth * bmapheight;
+  blocklinks = z_malloc(count, PU_LEVEL, 0);
+  memset(blocklinks, 0, count);
+}
+
+/* p_group_lines
+ * Builds sector line lists and subsector sector numbers.
+ * Finds block bounding boxes for sectors.
+ */
+
+static void p_group_lines(void)
+{
+  line_t **linebuffer;
+  int i;
+  int j;
+  line_t *li;
+  sector_t *sector;
+  subsector_t *ss;
+  seg_t *seg;
+  fixed_t bbox[4];
+  int block;
+
+  /* look up sector number for each subsector */
+
+  ss = subsectors;
+  for (i = 0; i < numsubsectors; i++, ss++)
+    {
+      seg = &segs[ss->firstline];
+      ss->sector = seg->sidedef->sector;
+    }
+
+  /* count number of lines in each sector */
+
+  li = lines;
+  totallines = 0;
+  for (i = 0; i < numlines; i++, li++)
+    {
+      totallines++;
+      li->frontsector->linecount++;
+
+      if (li->backsector && li->backsector != li->frontsector)
+        {
+          li->backsector->linecount++;
+          totallines++;
+        }
+    }
+
+  /* build line tables for each sector */
+
+  linebuffer = z_malloc(totallines * sizeof(line_t *), PU_LEVEL, 0);
+
+  for (i = 0; i < numsectors; ++i)
+    {
+      /* Assign the line buffer for this sector */
+
+      sectors[i].lines = linebuffer;
+      linebuffer += sectors[i].linecount;
+
+      /* Reset linecount to zero so in the next stage we can count
+       * lines into the list.
+       */
+
+      sectors[i].linecount = 0;
+    }
+
+  /* Assign lines to sectors */
+
+  for (i = 0; i < numlines; ++i)
+    {
+      li = &lines[i];
+
+      if (li->frontsector != NULL)
+        {
+          sector = li->frontsector;
+
+          sector->lines[sector->linecount] = li;
+          ++sector->linecount;
+        }
+
+      if (li->backsector != NULL && li->frontsector != li->backsector)
+        {
+          sector = li->backsector;
+
+          sector->lines[sector->linecount] = li;
+          ++sector->linecount;
+        }
+    }
+
+  /* Generate bounding boxes for sectors */
+
+  sector = sectors;
+  for (i = 0; i < numsectors; i++, sector++)
+    {
+      m_clear_box(bbox);
+
+      for (j = 0; j < sector->linecount; j++)
+        {
+          li = sector->lines[j];
+
+          m_add_to_box(bbox, li->v1->x, li->v1->y);
+          m_add_to_box(bbox, li->v2->x, li->v2->y);
+        }
+
+      /* set the degenmobj_t to the middle of the bounding box */
+
+      sector->soundorg.x = (bbox[BOXRIGHT] + bbox[BOXLEFT]) / 2;
+      sector->soundorg.y = (bbox[BOXTOP] + bbox[BOXBOTTOM]) / 2;
+
+      /* adjust bounding box to map blocks */
+
+      block = (bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
+      block = block >= bmapheight ? bmapheight - 1 : block;
+      sector->blockbox[BOXTOP] = block;
+
+      block = (bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
+      block = block < 0 ? 0 : block;
+      sector->blockbox[BOXBOTTOM] = block;
+
+      block = (bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
+      block = block >= bmapwidth ? bmapwidth - 1 : block;
+      sector->blockbox[BOXRIGHT] = block;
+
+      block = (bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
+      block = block < 0 ? 0 : block;
+      sector->blockbox[BOXLEFT] = block;
+    }
+}
+
+static void p_load_reject(int lumpnum)
+{
+  int minlength;
+  int lumplen;
+
+  /* Calculate the size that the REJECT lump *should* be. */
+
+  minlength = (numsectors * numsectors + 7) / 8;
+
+  /* If the lump meets the minimum length, it can be loaded directly.
+   * Otherwise, we need to allocate a buffer of the correct size
+   * and pad it with appropriate data.
+   */
+
+  lumplen = w_lump_length(lumpnum);
+
+  if (lumplen >= minlength)
+    {
+      rejectmatrix = w_cache_lump_num(lumpnum, PU_LEVEL);
+    }
+  else
+    {
+      rejectmatrix = z_malloc(minlength, PU_LEVEL, &rejectmatrix);
+      w_read_lump(lumpnum, rejectmatrix);
+
+      pad_reject_array(rejectmatrix + lumplen, minlength - lumplen,
+                       totallines);
+    }
+}
+
+/* p_setup_level */
+
+void p_setup_level(int episode, int map, int playermask, skill_t skill)
+{
+  int i;
+  char lumpname[9];
+  int lumpnum;
+
+  totalkills = totalitems = totalsecret = wminfo.maxfrags = 0;
+  wminfo.partime = 180;
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      players[i].killcount = players[i].secretcount = players[i].itemcount =
+          0;
+    }
+
+  /* Initial height of PointOfView will be set by player think. */
+
+  players[consoleplayer].viewz = 1;
+
+  /* Make sure all sounds are stopped before z_free_tags. */
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  s_start();
+#endif
+
+  z_free_tags(PU_LEVEL, PU_PURGELEVEL - 1);
+
+  /* UNUSED w_profile (); */
+
+  p_init_thinkers();
+
+  /* if working with a development map, reload it */
+
+  w_reload();
+
+  /* find map name */
+
+  if (gamemode == commercial)
+    {
+      if (map < 10)
+        snprintf(lumpname, 9, "map0%d", (int8_t)map);
+      else
+        snprintf(lumpname, 9, "map%d", (int8_t)map);
+    }
+  else
+    {
+      lumpname[0] = 'E';
+      lumpname[1] = '0' + episode;
+      lumpname[2] = 'M';
+      lumpname[3] = '0' + map;
+      lumpname[4] = 0;
+    }
+
+  lumpnum = w_get_num_for_name(lumpname);
+
+  maplumpinfo = lumpinfo[lumpnum];
+
+  leveltime = 0;
+
+  /* note: most of this ordering is important */
+
+  p_load_block_map(lumpnum + ML_BLOCKMAP);
+  p_load_vertices(lumpnum + ML_VERTICES);
+  p_load_sectors(lumpnum + ML_SECTORS);
+  p_load_side_defs(lumpnum + ML_SIDEDEFS);
+
+  p_load_linedefs(lumpnum + ML_LINEDEFS);
+  p_load_subsectors(lumpnum + ML_SSECTORS);
+  p_load_nodes(lumpnum + ML_NODES);
+  p_load_segs(lumpnum + ML_SEGS);
+
+  p_group_lines();
+  p_load_reject(lumpnum + ML_REJECT);
+
+  bodyqueslot = 0;
+  deathmatch_p = deathmatchstarts;
+  p_load_things(lumpnum + ML_THINGS);
+
+  /* if deathmatch, randomly spawn the active players */
+
+  if (deathmatch)
+    {
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (playeringame[i])
+            {
+              players[i].mo = NULL;
+              g_death_match_spawn_player(i);
+            }
+        }
+    }
+
+  /* clear special respawning que */
+
+  iquehead = iquetail = 0;
+
+  /* set up world state */
+
+  p_spawn_specials();
+
+  /* preload graphics */
+
+  if (precache) r_precache_level();
+}
+
+void p_init(void)
+{
+  p_init_switch_list();
+  p_init_pic_anims();
+  r_init_sprites(sprnames);
+}
diff --git a/games/NXDoom/src/doom/p_setup.h b/games/NXDoom/src/doom/p_setup.h
index 97ca104ef..ee4cdb563 100644
--- a/games/NXDoom/src/doom/p_setup.h
+++ b/games/NXDoom/src/doom/p_setup.h
@@ -1,39 +1,51 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Setup a game, startup stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_setup.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Setup a game, startup stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __P_SETUP__
 #define __P_SETUP__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "w_wad.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern lumpinfo_t *maplumpinfo;
 
-// NOT called by W_Ticker. Fixme.
-void
-P_SetupLevel
-( int		episode,
-  int		map,
-  int		playermask,
-  skill_t	skill);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Called by startup code.
-void P_Init (void);
+/* NOT called by W_Ticker. Fixme. */
 
-#endif
+void p_setup_level(int episode, int map, int playermask, skill_t skill);
+
+/* Called by startup code. */
+
+void p_init(void);
+
+#endif /* __P_SETUP__ */
diff --git a/games/NXDoom/src/doom/p_sight.c b/games/NXDoom/src/doom/p_sight.c
index 6457417e4..84167065e 100644
--- a/games/NXDoom/src/doom/p_sight.c
+++ b/games/NXDoom/src/doom/p_sight.c
@@ -1,21 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	LineOfSight/Visibility checks, uses REJECT Lookup Table.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_sight.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  LineOfSight/Visibility checks, uses REJECT Lookup Table.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomdef.h"
 #include "doomstat.h"
@@ -23,372 +31,375 @@
 #include "i_system.h"
 #include "p_local.h"
 
-// State.
+/* State. */
+
 #include "r_state.h"
 
-//
-// P_CheckSight
-//
-fixed_t		sightzstart;		// eye z of looker
-fixed_t		topslope;
-fixed_t		bottomslope;		// slopes to top and bottom of target
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-divline_t	strace;			// from t1 to t2
-fixed_t		t2x;
-fixed_t		t2y;
+/* p_check_sight */
 
-int		sightcounts[2];
+fixed_t sightzstart; /* eye z of looker */
+fixed_t topslope;
+fixed_t bottomslope; /* slopes to top and bottom of target */
 
+divline_t strace; /* from t1 to t2 */
+fixed_t t2x;
+fixed_t t2y;
 
-// PTR_SightTraverse() for Doom 1.2 sight calculations
-// taken from prboom-plus/src/p_sight.c:69-102
-boolean PTR_SightTraverse(intercept_t *in)
+int sightcounts[2];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* PTR_SightTraverse() for Doom 1.2 sight calculations
+ * taken from prboom-plus/src/p_sight.c:69-102
+ */
+
+static boolean ptr_sight_traverse(intercept_t *in)
 {
-    line_t *li;
-    fixed_t slope;
+  line_t *li;
+  fixed_t slope;
 
-    li = in->d.line;
+  li = in->d.line;
 
-    //
-    // crosses a two sided line
-    //
-    P_LineOpening(li);
+  /* crosses a two sided line */
 
-    if (openbottom >= opentop) // quick test for totally closed doors
-        return false;          // stop
+  p_line_opening(li);
 
-    if (li->frontsector->floorheight != li->backsector->floorheight)
+  /* quick test for totally closed doors */
+
+  if (openbottom >= opentop)
     {
-        slope = FixedDiv(openbottom - sightzstart, in->frac);
-        if (slope > bottomslope)
-            bottomslope = slope;
+      return false; /* stop */
     }
 
-    if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+  if (li->frontsector->floorheight != li->backsector->floorheight)
     {
-        slope = FixedDiv(opentop - sightzstart, in->frac);
-        if (slope < topslope)
-            topslope = slope;
+      slope = fixed_div(openbottom - sightzstart, in->frac);
+      if (slope > bottomslope) bottomslope = slope;
     }
 
-    if (topslope <= bottomslope)
-        return false; // stop
+  if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
+    {
+      slope = fixed_div(opentop - sightzstart, in->frac);
+      if (slope < topslope) topslope = slope;
+    }
 
-    return true; // keep going
+  if (topslope <= bottomslope) return false; /* stop */
+
+  return true; /* keep going */
 }
 
+/* p_divline_side
+ * Returns side 0 (front), 1 (back), or 2 (on).
+ */
 
-//
-// P_DivlineSide
-// Returns side 0 (front), 1 (back), or 2 (on).
-//
-int
-P_DivlineSide
-( fixed_t	x,
-  fixed_t	y,
-  divline_t*	node )
+static int p_divline_side(fixed_t x, fixed_t y, divline_t *node)
 {
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t left;
+  fixed_t right;
 
-    if (!node->dx)
+  if (!node->dx)
     {
-	if (x==node->x)
-	    return 2;
-	
-	if (x <= node->x)
-	    return node->dy > 0;
+      if (x == node->x) return 2;
 
-	return node->dy < 0;
+      if (x <= node->x) return node->dy > 0;
+
+      return node->dy < 0;
     }
-    
-    if (!node->dy)
+
+  if (!node->dy)
     {
-	if (x==node->y)
-	    return 2;
+      if (x == node->y) return 2;
 
-	if (y <= node->y)
-	    return node->dx < 0;
+      if (y <= node->y) return node->dx < 0;
 
-	return node->dx > 0;
+      return node->dx > 0;
     }
-	
-    dx = (x - node->x);
-    dy = (y - node->y);
 
-    left =  (node->dy>>FRACBITS) * (dx>>FRACBITS);
-    right = (dy>>FRACBITS) * (node->dx>>FRACBITS);
-	
-    if (right < left)
-	return 0;	// front side
-    
-    if (left == right)
-	return 2;
-    return 1;		// back side
+  dx = (x - node->x);
+  dy = (y - node->y);
+
+  left = (node->dy >> FRACBITS) * (dx >> FRACBITS);
+  right = (dy >> FRACBITS) * (node->dx >> FRACBITS);
+
+  if (right < left) return 0; /* front side */
+
+  if (left == right) return 2;
+  return 1; /* back side */
 }
 
+/* p_intercept_vector2
+ * Returns the fractional intercept point along the first divline.
+ * This is only called by the addthings and addlines traversers.
+ */
 
-//
-// P_InterceptVector2
-// Returns the fractional intercept point
-// along the first divline.
-// This is only called by the addthings and addlines traversers.
-//
-fixed_t
-P_InterceptVector2
-( divline_t*	v2,
-  divline_t*	v1 )
+static fixed_t p_intercept_vector2(divline_t *v2, divline_t *v1)
 {
-    fixed_t	frac;
-    fixed_t	num;
-    fixed_t	den;
-	
-    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
+  fixed_t frac;
+  fixed_t num;
+  fixed_t den;
 
-    if (den == 0)
-	return 0;
-    //	I_Error ("P_InterceptVector: parallel");
-    
-    num = FixedMul ( (v1->x - v2->x)>>8 ,v1->dy) + 
-	FixedMul ( (v2->y - v1->y)>>8 , v1->dx);
-    frac = FixedDiv (num , den);
+  den = fixed_mul(v1->dy >> 8, v2->dx) - fixed_mul(v1->dx >> 8, v2->dy);
 
-    return frac;
+  if (den == 0) return 0;
+
+  num = fixed_mul((v1->x - v2->x) >> 8, v1->dy) +
+        fixed_mul((v2->y - v1->y) >> 8, v1->dx);
+  frac = fixed_div(num, den);
+
+  return frac;
 }
 
-//
-// P_CrossSubsector
-// Returns true
-//  if strace crosses the given subsector successfully.
-//
-boolean P_CrossSubsector (int num)
+/* p_cross_subsector
+ * Returns true if strace crosses the given subsector successfully.
+ */
+
+static boolean p_cross_subsector(int num)
 {
-    seg_t*		seg;
-    line_t*		line;
-    int			s1;
-    int			s2;
-    int			count;
-    subsector_t*	sub;
-    sector_t*		front;
-    sector_t*		back;
-    fixed_t		opentop;
-    fixed_t		openbottom;
-    divline_t		divl;
-    vertex_t*		v1;
-    vertex_t*		v2;
-    fixed_t		frac;
-    fixed_t		slope;
-	
-#ifdef RANGECHECK
-    if (num>=numsubsectors)
-	I_Error ("P_CrossSubsector: ss %i with numss = %i",
-		 num,
-		 numsubsectors);
+  seg_t *seg;
+  line_t *line;
+  int s1;
+  int s2;
+  int count;
+  subsector_t *sub;
+  sector_t *front;
+  sector_t *back;
+  fixed_t l_opentop;
+  fixed_t l_openbottom;
+  divline_t divl;
+  vertex_t *v1;
+  vertex_t *v2;
+  fixed_t frac;
+  fixed_t slope;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (num >= numsubsectors)
+    i_error("p_cross_subsector: ss %i with numss = %i", num, numsubsectors);
 #endif
 
-    sub = &subsectors[num];
-    
-    // check lines
-    count = sub->numlines;
-    seg = &segs[sub->firstline];
+  sub = &subsectors[num];
 
-    for ( ; count ; seg++, count--)
+  /* check lines */
+
+  count = sub->numlines;
+  seg = &segs[sub->firstline];
+
+  for (; count; seg++, count--)
     {
-	line = seg->linedef;
+      line = seg->linedef;
 
-	// allready checked other side?
-	if (line->validcount == validcount)
-	    continue;
-	
-	line->validcount = validcount;
+      /* already checked other side? */
 
-	v1 = line->v1;
-	v2 = line->v2;
-	s1 = P_DivlineSide (v1->x,v1->y, &strace);
-	s2 = P_DivlineSide (v2->x, v2->y, &strace);
+      if (line->validcount == validcount) continue;
 
-	// line isn't crossed?
-	if (s1 == s2)
-	    continue;
-	
-	divl.x = v1->x;
-	divl.y = v1->y;
-	divl.dx = v2->x - v1->x;
-	divl.dy = v2->y - v1->y;
-	s1 = P_DivlineSide (strace.x, strace.y, &divl);
-	s2 = P_DivlineSide (t2x, t2y, &divl);
+      line->validcount = validcount;
 
-	// line isn't crossed?
-	if (s1 == s2)
-	    continue;	
+      v1 = line->v1;
+      v2 = line->v2;
+      s1 = p_divline_side(v1->x, v1->y, &strace);
+      s2 = p_divline_side(v2->x, v2->y, &strace);
 
-        // Backsector may be NULL if this is an "impassible
-        // glass" hack line.
+      /* line isn't crossed? */
 
-        if (line->backsector == NULL)
+      if (s1 == s2) continue;
+
+      divl.x = v1->x;
+      divl.y = v1->y;
+      divl.dx = v2->x - v1->x;
+      divl.dy = v2->y - v1->y;
+      s1 = p_divline_side(strace.x, strace.y, &divl);
+      s2 = p_divline_side(t2x, t2y, &divl);
+
+      /* line isn't crossed? */
+
+      if (s1 == s2) continue;
+
+      /* Backsector may be NULL if this is an "impassable
+       * glass" hack line.
+       */
+
+      if (line->backsector == NULL)
         {
-            return false;
+          return false;
         }
 
-	// stop because it is not two sided anyway
-	// might do this after updating validcount?
-	if ( !(line->flags & ML_TWOSIDED) )
-	    return false;
-	
-	// crosses a two sided line
-	front = seg->frontsector;
-	back = seg->backsector;
+      /* stop because it is not two sided anyway
+       * might do this after updating validcount?
+       */
 
-	// no wall to block sight with?
-	if (front->floorheight == back->floorheight
-	    && front->ceilingheight == back->ceilingheight)
-	    continue;	
+      if (!(line->flags & ML_TWOSIDED)) return false;
 
-	// possible occluder
-	// because of ceiling height differences
-	if (front->ceilingheight < back->ceilingheight)
-	    opentop = front->ceilingheight;
-	else
-	    opentop = back->ceilingheight;
+      /* crosses a two sided line */
 
-	// because of ceiling height differences
-	if (front->floorheight > back->floorheight)
-	    openbottom = front->floorheight;
-	else
-	    openbottom = back->floorheight;
-		
-	// quick test for totally closed doors
-	if (openbottom >= opentop)	
-	    return false;		// stop
-	
-	frac = P_InterceptVector2 (&strace, &divl);
-		
-	if (front->floorheight != back->floorheight)
-	{
-	    slope = FixedDiv (openbottom - sightzstart , frac);
-	    if (slope > bottomslope)
-		bottomslope = slope;
-	}
-		
-	if (front->ceilingheight != back->ceilingheight)
-	{
-	    slope = FixedDiv (opentop - sightzstart , frac);
-	    if (slope < topslope)
-		topslope = slope;
-	}
-		
-	if (topslope <= bottomslope)
-	    return false;		// stop				
+      front = seg->frontsector;
+      back = seg->backsector;
+
+      /* no wall to block sight with? */
+
+      if (front->floorheight == back->floorheight &&
+          front->ceilingheight == back->ceilingheight)
+        continue;
+
+      /* possible occluder
+       * because of ceiling height differences
+       */
+
+      if (front->ceilingheight < back->ceilingheight)
+        l_opentop = front->ceilingheight;
+      else
+        l_opentop = back->ceilingheight;
+
+      /* because of ceiling height differences */
+
+      if (front->floorheight > back->floorheight)
+        l_openbottom = front->floorheight;
+      else
+        l_openbottom = back->floorheight;
+
+      /* quick test for totally closed doors */
+
+      if (l_openbottom >= l_opentop) return false; /* stop */
+
+      frac = p_intercept_vector2(&strace, &divl);
+
+      if (front->floorheight != back->floorheight)
+        {
+          slope = fixed_div(l_openbottom - sightzstart, frac);
+          if (slope > bottomslope) bottomslope = slope;
+        }
+
+      if (front->ceilingheight != back->ceilingheight)
+        {
+          slope = fixed_div(l_opentop - sightzstart, frac);
+          if (slope < topslope) topslope = slope;
+        }
+
+      if (topslope <= bottomslope) return false; /* stop */
     }
-    // passed the subsector ok
-    return true;		
+
+  /* passed the subsector ok */
+
+  return true;
 }
 
+/* p_cross_bsp_node
+ * Returns true if strace crosses the given node successfully.
+ */
 
-
-//
-// P_CrossBSPNode
-// Returns true
-//  if strace crosses the given node successfully.
-//
-boolean P_CrossBSPNode (int bspnum)
+static boolean p_cross_bsp_node(int bspnum)
 {
-    node_t*	bsp;
-    int		side;
+  node_t *bsp;
+  int side;
 
-    if (bspnum & NF_SUBSECTOR)
+  if (bspnum & NF_SUBSECTOR)
     {
-	if (bspnum == -1)
-	    return P_CrossSubsector (0);
-	else
-	    return P_CrossSubsector (bspnum&(~NF_SUBSECTOR));
+      if (bspnum == -1)
+        {
+          return p_cross_subsector(0);
+        }
+      else
+        {
+          return p_cross_subsector(bspnum & (~NF_SUBSECTOR));
+        }
     }
-		
-    bsp = &nodes[bspnum];
-    
-    // decide which side the start point is on
-    side = P_DivlineSide (strace.x, strace.y, (divline_t *)bsp);
-    if (side == 2)
-	side = 0;	// an "on" should cross both sides
 
-    // cross the starting side
-    if (!P_CrossBSPNode (bsp->children[side]) )
-	return false;
-	
-    // the partition plane is crossed here
-    if (side == P_DivlineSide (t2x, t2y,(divline_t *)bsp))
+  bsp = &nodes[bspnum];
+
+  /* decide which side the start point is on */
+
+  side = p_divline_side(strace.x, strace.y, (divline_t *)bsp);
+  if (side == 2) side = 0; /* an "on" should cross both sides */
+
+  /* cross the starting side */
+
+  if (!p_cross_bsp_node(bsp->children[side])) return false;
+
+  /* the partition plane is crossed here */
+
+  if (side == p_divline_side(t2x, t2y, (divline_t *)bsp))
     {
-	// the line doesn't touch the other side
-	return true;
+      /* the line doesn't touch the other side */
+
+      return true;
     }
-    
-    // cross the ending side		
-    return P_CrossBSPNode (bsp->children[side^1]);
+
+  /* cross the ending side */
+
+  return p_cross_bsp_node(bsp->children[side ^ 1]);
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-//
-// P_CheckSight
-// Returns true
-//  if a straight line between t1 and t2 is unobstructed.
-// Uses REJECT.
-//
-boolean
-P_CheckSight
-( mobj_t*	t1,
-  mobj_t*	t2 )
+/* p_check_sight
+ * Returns true if a straight line between t1 and t2 is unobstructed.
+ * Uses REJECT.
+ */
+
+boolean p_check_sight(mobj_t *t1, mobj_t *t2)
 {
-    int		s1;
-    int		s2;
-    int		pnum;
-    int		bytenum;
-    int		bitnum;
-    
-    // First check for trivial rejection.
+  int s1;
+  int s2;
+  int pnum;
+  int bytenum;
+  int bitnum;
 
-    // Determine subsector entries in REJECT table.
-    s1 = (t1->subsector->sector - sectors);
-    s2 = (t2->subsector->sector - sectors);
-    pnum = s1*numsectors + s2;
-    bytenum = pnum>>3;
-    bitnum = 1 << (pnum&7);
+  /* First check for trivial rejection. */
 
-    // Check in REJECT table.
-    if (rejectmatrix[bytenum]&bitnum)
+  /* Determine subsector entries in REJECT table. */
+
+  s1 = (t1->subsector->sector - sectors);
+  s2 = (t2->subsector->sector - sectors);
+  pnum = s1 * numsectors + s2;
+  bytenum = pnum >> 3;
+  bitnum = 1 << (pnum & 7);
+
+  /* Check in REJECT table. */
+
+  if (rejectmatrix[bytenum] & bitnum)
     {
-	sightcounts[0]++;
+      sightcounts[0]++;
 
-	// can't possibly be connected
-	return false;	
+      /* can't possibly be connected */
+
+      return false;
     }
 
-    // An unobstructed LOS is possible.
-    // Now look from eyes of t1 to any part of t2.
-    sightcounts[1]++;
+  /* An unobstructed LOS is possible.
+   * Now look from eyes of t1 to any part of t2.
+   */
 
-    validcount++;
-	
-    sightzstart = t1->z + t1->height - (t1->height>>2);
-    topslope = (t2->z+t2->height) - sightzstart;
-    bottomslope = (t2->z) - sightzstart;
-	
-    if (gameversion <= exe_doom_1_2)
+  sightcounts[1]++;
+
+  validcount++;
+
+  sightzstart = t1->z + t1->height - (t1->height >> 2);
+  topslope = (t2->z + t2->height) - sightzstart;
+  bottomslope = (t2->z) - sightzstart;
+
+  if (gameversion <= exe_doom_1_2)
     {
-        return P_PathTraverse(t1->x, t1->y, t2->x, t2->y,
-                              PT_EARLYOUT | PT_ADDLINES, PTR_SightTraverse);
+      return p_path_traverse(t1->x, t1->y, t2->x, t2->y,
+                             PT_EARLYOUT | PT_ADDLINES,
+                             ptr_sight_traverse);
     }
 
-    strace.x = t1->x;
-    strace.y = t1->y;
-    t2x = t2->x;
-    t2y = t2->y;
-    strace.dx = t2->x - t1->x;
-    strace.dy = t2->y - t1->y;
+  strace.x = t1->x;
+  strace.y = t1->y;
+  t2x = t2->x;
+  t2y = t2->y;
+  strace.dx = t2->x - t1->x;
+  strace.dy = t2->y - t1->y;
 
-    // the head node is the last node output
-    return P_CrossBSPNode (numnodes-1);	
+  /* the head node is the last node output */
+
+  return p_cross_bsp_node(numnodes - 1);
 }
-
-
diff --git a/games/NXDoom/src/doom/p_spec.c b/games/NXDoom/src/doom/p_spec.c
index 8d890ce2e..2b095210d 100644
--- a/games/NXDoom/src/doom/p_spec.c
+++ b/games/NXDoom/src/doom/p_spec.c
@@ -1,25 +1,32 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Implements special effects:
-//	Texture animation, height or lighting changes
-//	 according to adjacent sectors, respective
-//	 utility functions, etc.
-//	Line Tag handling. Line and Sector triggers.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_spec.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Implements special effects:
+ *  Texture animation, height or lighting changes according to adjacent
+ *  sectors, respective utility functions, etc.
+ *  Line Tag handling. Line and Sector triggers.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 
@@ -28,1492 +35,1342 @@
 
 #include "deh_main.h"
 #include "i_system.h"
-#include "z_zone.h"
 #include "m_argv.h"
 #include "m_misc.h"
 #include "m_random.h"
 #include "w_wad.h"
+#include "z_zone.h"
 
-#include "r_local.h"
 #include "p_local.h"
+#include "r_local.h"
 
 #include "g_game.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* State. */
 
-// State.
 #include "r_state.h"
 
-// Data.
-#include "sounds.h"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define MAXANIMS 32
 
-//
-// Animating textures and planes
-// There is another anim_t used in wi_stuff, unrelated.
-//
-typedef struct
-{
-    boolean	istexture;
-    int		picnum;
-    int		basepic;
-    int		numpics;
-    int		speed;
-    
-} anim_t;
+/* Animating line specials */
 
-//
-//      source animation definition
-//
-typedef struct
-{
-    int 	istexture;	// if false, it is a flat
-    char	endname[9];
-    char	startname[9];
-    int		speed;
-} animdef_t;
+#define MAXLINEANIMS 64
 
+/* version <= 1.2 did not have a limit and could handle up to 66 scrolling
+ * linedefs before displaying adverse effects. All other versions have a
+ * limit of 64.
+ */
 
+#define MAXLINEANIMS1_2 66
 
-#define MAXANIMS                32
+/* Thanks to entryway for the Vanilla overflow emulation.
+ * 20 adjoining sectors max!
+ */
 
+#define MAX_ADJOINING_SECTORS 20
 
-//
-// P_InitPicAnims
-//
-
-// Floor/ceiling animation sequences,
-//  defined by first and last frame,
-//  i.e. the flat (64x64 tile) name to
-//  be used.
-// The full animation sequence is given
-//  using all the flats between the start
-//  and end entry, in the order found in
-//  the WAD file.
-//
-animdef_t		animdefs[] =
-{
-    {false,	"NUKAGE3",	"NUKAGE1",	8},
-    {false,	"FWATER4",	"FWATER1",	8},
-    {false,	"SWATER4",	"SWATER1", 	8},
-    {false,	"LAVA4",	"LAVA1",	8},
-    {false,	"BLOOD3",	"BLOOD1",	8},
-
-    // DOOM II flat animations.
-    {false,	"RROCK08",	"RROCK05",	8},		
-    {false,	"SLIME04",	"SLIME01",	8},
-    {false,	"SLIME08",	"SLIME05",	8},
-    {false,	"SLIME12",	"SLIME09",	8},
-
-    {true,	"BLODGR4",	"BLODGR1",	8},
-    {true,	"SLADRIP3",	"SLADRIP1",	8},
-
-    {true,	"BLODRIP4",	"BLODRIP1",	8},
-    {true,	"FIREWALL",	"FIREWALA",	8},
-    {true,	"GSTFONT3",	"GSTFONT1",	8},
-    {true,	"FIRELAVA",	"FIRELAV3",	8},
-    {true,	"FIREMAG3",	"FIREMAG1",	8},
-    {true,	"FIREBLU2",	"FIREBLU1",	8},
-    {true,	"ROCKRED3",	"ROCKRED1",	8},
-
-    {true,	"BFALL4",	"BFALL1",	8},
-    {true,	"SFALL4",	"SFALL1",	8},
-    {true,	"WFALL4",	"WFALL1",	8},
-    {true,	"DBRAIN4",	"DBRAIN1",	8},
-	
-    {-1,        "",             "",             0},
-};
-
-anim_t		anims[MAXANIMS];
-anim_t*		lastanim;
-
-
-//
-//      Animating line specials
-//
-#define MAXLINEANIMS            64
-// version <= 1.2 did not have a limit and could handle up to 66 scrolling
-// linedefs before displaying adverse effects. All other versions have a limit
-// of 64.
-#define MAXLINEANIMS1_2         66
-
-short numlinespecials;
-line_t *linespeciallist[MAXLINEANIMS1_2];
-
-
-
-void P_InitPicAnims (void)
-{
-    int		i;
-
-    
-    //	Init animation
-    lastanim = anims;
-    for (i=0 ; animdefs[i].istexture != -1 ; i++)
-    {
-        const char *startname, *endname;
-
-        startname = DEH_String(animdefs[i].startname);
-        endname = DEH_String(animdefs[i].endname);
-
-	if (animdefs[i].istexture)
-	{
-	    // different episode ?
-	    if (R_CheckTextureNumForName(startname) == -1)
-		continue;	
-
-	    lastanim->picnum = R_TextureNumForName(endname);
-	    lastanim->basepic = R_TextureNumForName(startname);
-	}
-	else
-	{
-	    if (W_CheckNumForName(startname) == -1)
-		continue;
-
-	    lastanim->picnum = R_FlatNumForName(endname);
-	    lastanim->basepic = R_FlatNumForName(startname);
-	}
-
-	lastanim->istexture = animdefs[i].istexture;
-	lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
-
-	if (lastanim->numpics < 2)
-	    I_Error ("P_InitPicAnims: bad cycle from %s to %s",
-		     startname, endname);
-	
-	lastanim->speed = animdefs[i].speed;
-	lastanim++;
-    }
-	
-}
-
-
-
-//
-// UTILITIES
-//
-
-
-
-//
-// getSide()
-// Will return a side_t*
-//  given the number of the current sector,
-//  the line number, and the side (0/1) that you want.
-//
-side_t*
-getSide
-( int		currentSector,
-  int		line,
-  int		side )
-{
-    return &sides[ (sectors[currentSector].lines[line])->sidenum[side] ];
-}
-
-
-//
-// getSector()
-// Will return a sector_t*
-//  given the number of the current sector,
-//  the line number and the side (0/1) that you want.
-//
-sector_t*
-getSector
-( int		currentSector,
-  int		line,
-  int		side )
-{
-    return sides[ (sectors[currentSector].lines[line])->sidenum[side] ].sector;
-}
-
-
-//
-// twoSided()
-// Given the sector number and the line number,
-//  it will tell you whether the line is two-sided or not.
-//
-int
-twoSided
-( int	sector,
-  int	line )
-{
-    return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
-}
-
-
-
-
-//
-// getNextSector()
-// Return sector_t * of sector next to current.
-// NULL if not two-sided line
-//
-sector_t*
-getNextSector
-( line_t*	line,
-  sector_t*	sec )
-{
-    if (!(line->flags & ML_TWOSIDED))
-	return NULL;
-		
-    if (line->frontsector == sec)
-	return line->backsector;
-	
-    return line->frontsector;
-}
-
-
-
-//
-// P_FindLowestFloorSurrounding()
-// FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-fixed_t	P_FindLowestFloorSurrounding(sector_t* sec)
-{
-    int			i;
-    line_t*		check;
-    sector_t*		other;
-    fixed_t		floor = sec->floorheight;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-
-	if (!other)
-	    continue;
-	
-	if (other->floorheight < floor)
-	    floor = other->floorheight;
-    }
-    return floor;
-}
-
-
-
-//
-// P_FindHighestFloorSurrounding()
-// FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-fixed_t	P_FindHighestFloorSurrounding(sector_t *sec)
-{
-    int			i;
-    line_t*		check;
-    sector_t*		other;
-    fixed_t		floor = -500*FRACUNIT;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-	
-	if (!other)
-	    continue;
-	
-	if (other->floorheight > floor)
-	    floor = other->floorheight;
-    }
-    return floor;
-}
-
-
-
-//
-// P_FindNextHighestFloor
-// FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
-// Note: this should be doable w/o a fixed array.
-
-// Thanks to entryway for the Vanilla overflow emulation.
-
-// 20 adjoining sectors max!
-#define MAX_ADJOINING_SECTORS     20
-
-fixed_t
-P_FindNextHighestFloor
-( sector_t* sec,
-  int       currentheight )
-{
-    int         i;
-    int         h;
-    int         min;
-    line_t*     check;
-    sector_t*   other;
-    fixed_t     height = currentheight;
-    fixed_t     heightlist[MAX_ADJOINING_SECTORS + 2];
-
-    for (i=0, h=0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check,sec);
-
-        if (!other)
-            continue;
-        
-        if (other->floorheight > height)
-        {
-            // Emulation of memory (stack) overflow
-            if (h == MAX_ADJOINING_SECTORS + 1)
-            {
-                height = other->floorheight;
-            }
-            else if (h == MAX_ADJOINING_SECTORS + 2)
-            {
-                // Fatal overflow: game crashes at 22 sectors
-                I_Error("Sector with more than 22 adjoining sectors. "
-                        "Vanilla will crash here");
-            }
-
-            heightlist[h++] = other->floorheight;
-        }
-    }
-    
-    // Find lowest height in list
-    if (!h)
-    {
-        return currentheight;
-    }
-        
-    min = heightlist[0];
-    
-    // Range checking? 
-    for (i = 1; i < h; i++)
-    {
-        if (heightlist[i] < min)
-        {
-            min = heightlist[i];
-        }
-    }
-
-    return min;
-}
-
-//
-// FIND LOWEST CEILING IN THE SURROUNDING SECTORS
-//
-fixed_t
-P_FindLowestCeilingSurrounding(sector_t* sec)
-{
-    int			i;
-    line_t*		check;
-    sector_t*		other;
-    fixed_t		height = INT_MAX;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-
-	if (!other)
-	    continue;
-
-	if (other->ceilingheight < height)
-	    height = other->ceilingheight;
-    }
-    return height;
-}
-
-
-//
-// FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
-//
-fixed_t	P_FindHighestCeilingSurrounding(sector_t* sec)
-{
-    int		i;
-    line_t*	check;
-    sector_t*	other;
-    fixed_t	height = 0;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-
-	if (!other)
-	    continue;
-
-	if (other->ceilingheight > height)
-	    height = other->ceilingheight;
-    }
-    return height;
-}
-
-
-
-//
-// RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
-//
-int
-P_FindSectorFromLineTag
-( line_t*	line,
-  int		start )
-{
-    int	i;
-	
-    for (i=start+1;i<numsectors;i++)
-	if (sectors[i].tag == line->tag)
-	    return i;
-    
-    return -1;
-}
-
-
-
-
-//
-// Find minimum light from an adjacent sector
-//
-int
-P_FindMinSurroundingLight
-( sector_t*	sector,
-  int		max )
-{
-    int		i;
-    int		min;
-    line_t*	line;
-    sector_t*	check;
-	
-    min = max;
-    for (i=0 ; i < sector->linecount ; i++)
-    {
-	line = sector->lines[i];
-	check = getNextSector(line,sector);
-
-	if (!check)
-	    continue;
-
-	if (check->lightlevel < min)
-	    min = check->lightlevel;
-    }
-    return min;
-}
-
-
-
-//
-// EVENTS
-// Events are operations triggered by using, crossing,
-// or shooting special lines, or by timed thinkers.
-//
-
-//
-// P_CrossSpecialLine - TRIGGER
-// Called every time a thing origin is about
-//  to cross a line with a non 0 special.
-//
-void
-P_CrossSpecialLine
-( int		linenum,
-  int		side,
-  mobj_t*	thing )
-{
-    line_t*	line;
-    int		ok;
-
-    line = &lines[linenum];
-    
-    if (gameversion <= exe_doom_1_2)
-    {
-        if (line->special > 98 && line->special != 104)
-        {
-            return;
-        }
-    }
-    else
-    {
-        //	Triggers that other things can activate
-        if (!thing->player)
-        {
-            // Things that should NOT trigger specials...
-            switch(thing->type)
-            {
-                case MT_ROCKET:
-                case MT_PLASMA:
-                case MT_BFG:
-                case MT_TROOPSHOT:
-                case MT_HEADSHOT:
-                case MT_BRUISERSHOT:
-                    return;
-
-                default: break;
-            }
-        }
-    }
-
-    if (!thing->player)
-    {
-	ok = 0;
-	switch(line->special)
-	{
-	  case 39:	// TELEPORT TRIGGER
-	  case 97:	// TELEPORT RETRIGGER
-	  case 125:	// TELEPORT MONSTERONLY TRIGGER
-	  case 126:	// TELEPORT MONSTERONLY RETRIGGER
-	  case 4:	// RAISE DOOR
-	  case 10:	// PLAT DOWN-WAIT-UP-STAY TRIGGER
-	  case 88:	// PLAT DOWN-WAIT-UP-STAY RETRIGGER
-	    ok = 1;
-	    break;
-	}
-	if (!ok)
-	    return;
-    }
-
-    
-    // Note: could use some const's here.
-    switch (line->special)
-    {
-	// TRIGGERS.
-	// All from here to RETRIGGERS.
-      case 2:
-	// Open Door
-	EV_DoDoor(line,vld_open);
-	line->special = 0;
-	break;
-
-      case 3:
-	// Close Door
-	EV_DoDoor(line,vld_close);
-	line->special = 0;
-	break;
-
-      case 4:
-	// Raise Door
-	EV_DoDoor(line,vld_normal);
-	line->special = 0;
-	break;
-	
-      case 5:
-	// Raise Floor
-	EV_DoFloor(line,raiseFloor);
-	line->special = 0;
-	break;
-	
-      case 6:
-	// Fast Ceiling Crush & Raise
-	EV_DoCeiling(line,fastCrushAndRaise);
-	line->special = 0;
-	break;
-	
-      case 8:
-	// Build Stairs
-	EV_BuildStairs(line,build8);
-	line->special = 0;
-	break;
-	
-      case 10:
-	// PlatDownWaitUp
-	EV_DoPlat(line,downWaitUpStay,0);
-	line->special = 0;
-	break;
-	
-      case 12:
-	// Light Turn On - brightest near
-	EV_LightTurnOn(line,0);
-	line->special = 0;
-	break;
-	
-      case 13:
-	// Light Turn On 255
-	EV_LightTurnOn(line,255);
-	line->special = 0;
-	break;
-	
-      case 16:
-	// Close Door 30
-	EV_DoDoor(line,vld_close30ThenOpen);
-	line->special = 0;
-	break;
-	
-      case 17:
-	// Start Light Strobing
-	EV_StartLightStrobing(line);
-	line->special = 0;
-	break;
-	
-      case 19:
-	// Lower Floor
-	EV_DoFloor(line,lowerFloor);
-	line->special = 0;
-	break;
-	
-      case 22:
-	// Raise floor to nearest height and change texture
-	EV_DoPlat(line,raiseToNearestAndChange,0);
-	line->special = 0;
-	break;
-	
-      case 25:
-	// Ceiling Crush and Raise
-	EV_DoCeiling(line,crushAndRaise);
-	line->special = 0;
-	break;
-	
-      case 30:
-	// Raise floor to shortest texture height
-	//  on either side of lines.
-	EV_DoFloor(line,raiseToTexture);
-	line->special = 0;
-	break;
-	
-      case 35:
-	// Lights Very Dark
-	EV_LightTurnOn(line,35);
-	line->special = 0;
-	break;
-	
-      case 36:
-	// Lower Floor (TURBO)
-	EV_DoFloor(line,turboLower);
-	line->special = 0;
-	break;
-	
-      case 37:
-	// LowerAndChange
-	EV_DoFloor(line,lowerAndChange);
-	line->special = 0;
-	break;
-	
-      case 38:
-	// Lower Floor To Lowest
-	EV_DoFloor( line, lowerFloorToLowest );
-	line->special = 0;
-	break;
-	
-      case 39:
-	// TELEPORT!
-	EV_Teleport( line, side, thing );
-	line->special = 0;
-	break;
-
-      case 40:
-	// RaiseCeilingLowerFloor
-	EV_DoCeiling( line, raiseToHighest );
-	EV_DoFloor( line, lowerFloorToLowest );
-	line->special = 0;
-	break;
-	
-      case 44:
-	// Ceiling Crush
-	EV_DoCeiling( line, lowerAndCrush );
-	line->special = 0;
-	break;
-	
-      case 52:
-	// EXIT!
-	G_ExitLevel ();
-	break;
-	
-      case 53:
-	// Perpetual Platform Raise
-	EV_DoPlat(line,perpetualRaise,0);
-	line->special = 0;
-	break;
-	
-      case 54:
-	// Platform Stop
-	EV_StopPlat(line);
-	line->special = 0;
-	break;
-
-      case 56:
-	// Raise Floor Crush
-	EV_DoFloor(line,raiseFloorCrush);
-	line->special = 0;
-	break;
-
-      case 57:
-	// Ceiling Crush Stop
-	EV_CeilingCrushStop(line);
-	line->special = 0;
-	break;
-	
-      case 58:
-	// Raise Floor 24
-	EV_DoFloor(line,raiseFloor24);
-	line->special = 0;
-	break;
-
-      case 59:
-	// Raise Floor 24 And Change
-	EV_DoFloor(line,raiseFloor24AndChange);
-	line->special = 0;
-	break;
-	
-      case 104:
-	// Turn lights off in sector(tag)
-	EV_TurnTagLightsOff(line);
-	line->special = 0;
-	break;
-	
-      case 108:
-	// Blazing Door Raise (faster than TURBO!)
-	EV_DoDoor (line,vld_blazeRaise);
-	line->special = 0;
-	break;
-	
-      case 109:
-	// Blazing Door Open (faster than TURBO!)
-	EV_DoDoor (line,vld_blazeOpen);
-	line->special = 0;
-	break;
-	
-      case 100:
-	// Build Stairs Turbo 16
-	EV_BuildStairs(line,turbo16);
-	line->special = 0;
-	break;
-	
-      case 110:
-	// Blazing Door Close (faster than TURBO!)
-	EV_DoDoor (line,vld_blazeClose);
-	line->special = 0;
-	break;
-
-      case 119:
-	// Raise floor to nearest surr. floor
-	EV_DoFloor(line,raiseFloorToNearest);
-	line->special = 0;
-	break;
-	
-      case 121:
-	// Blazing PlatDownWaitUpStay
-	EV_DoPlat(line,blazeDWUS,0);
-	line->special = 0;
-	break;
-	
-      case 124:
-	// Secret EXIT
-	G_SecretExitLevel ();
-	break;
-		
-      case 125:
-	// TELEPORT MonsterONLY
-	if (!thing->player)
-	{
-	    EV_Teleport( line, side, thing );
-	    line->special = 0;
-	}
-	break;
-	
-      case 130:
-	// Raise Floor Turbo
-	EV_DoFloor(line,raiseFloorTurbo);
-	line->special = 0;
-	break;
-	
-      case 141:
-	// Silent Ceiling Crush & Raise
-	EV_DoCeiling(line,silentCrushAndRaise);
-	line->special = 0;
-	break;
-	
-	// RETRIGGERS.  All from here till end.
-      case 72:
-	// Ceiling Crush
-	EV_DoCeiling( line, lowerAndCrush );
-	break;
-
-      case 73:
-	// Ceiling Crush and Raise
-	EV_DoCeiling(line,crushAndRaise);
-	break;
-
-      case 74:
-	// Ceiling Crush Stop
-	EV_CeilingCrushStop(line);
-	break;
-	
-      case 75:
-	// Close Door
-	EV_DoDoor(line,vld_close);
-	break;
-	
-      case 76:
-	// Close Door 30
-	EV_DoDoor(line,vld_close30ThenOpen);
-	break;
-	
-      case 77:
-	// Fast Ceiling Crush & Raise
-	EV_DoCeiling(line,fastCrushAndRaise);
-	break;
-	
-      case 79:
-	// Lights Very Dark
-	EV_LightTurnOn(line,35);
-	break;
-	
-      case 80:
-	// Light Turn On - brightest near
-	EV_LightTurnOn(line,0);
-	break;
-	
-      case 81:
-	// Light Turn On 255
-	EV_LightTurnOn(line,255);
-	break;
-	
-      case 82:
-	// Lower Floor To Lowest
-	EV_DoFloor( line, lowerFloorToLowest );
-	break;
-	
-      case 83:
-	// Lower Floor
-	EV_DoFloor(line,lowerFloor);
-	break;
-
-      case 84:
-	// LowerAndChange
-	EV_DoFloor(line,lowerAndChange);
-	break;
-
-      case 86:
-	// Open Door
-	EV_DoDoor(line,vld_open);
-	break;
-	
-      case 87:
-	// Perpetual Platform Raise
-	EV_DoPlat(line,perpetualRaise,0);
-	break;
-	
-      case 88:
-	// PlatDownWaitUp
-	EV_DoPlat(line,downWaitUpStay,0);
-	break;
-	
-      case 89:
-	// Platform Stop
-	EV_StopPlat(line);
-	break;
-	
-      case 90:
-	// Raise Door
-	EV_DoDoor(line,vld_normal);
-	break;
-	
-      case 91:
-	// Raise Floor
-	EV_DoFloor(line,raiseFloor);
-	break;
-	
-      case 92:
-	// Raise Floor 24
-	EV_DoFloor(line,raiseFloor24);
-	break;
-	
-      case 93:
-	// Raise Floor 24 And Change
-	EV_DoFloor(line,raiseFloor24AndChange);
-	break;
-	
-      case 94:
-	// Raise Floor Crush
-	EV_DoFloor(line,raiseFloorCrush);
-	break;
-	
-      case 95:
-	// Raise floor to nearest height
-	// and change texture.
-	EV_DoPlat(line,raiseToNearestAndChange,0);
-	break;
-	
-      case 96:
-	// Raise floor to shortest texture height
-	// on either side of lines.
-	EV_DoFloor(line,raiseToTexture);
-	break;
-	
-      case 97:
-	// TELEPORT!
-	EV_Teleport( line, side, thing );
-	break;
-	
-      case 98:
-	// Lower Floor (TURBO)
-	EV_DoFloor(line,turboLower);
-	break;
-
-      case 105:
-	// Blazing Door Raise (faster than TURBO!)
-	EV_DoDoor (line,vld_blazeRaise);
-	break;
-	
-      case 106:
-	// Blazing Door Open (faster than TURBO!)
-	EV_DoDoor (line,vld_blazeOpen);
-	break;
-
-      case 107:
-	// Blazing Door Close (faster than TURBO!)
-	EV_DoDoor (line,vld_blazeClose);
-	break;
-
-      case 120:
-	// Blazing PlatDownWaitUpStay.
-	EV_DoPlat(line,blazeDWUS,0);
-	break;
-	
-      case 126:
-	// TELEPORT MonsterONLY.
-	if (!thing->player)
-	    EV_Teleport( line, side, thing );
-	break;
-	
-      case 128:
-	// Raise To Nearest Floor
-	EV_DoFloor(line,raiseFloorToNearest);
-	break;
-	
-      case 129:
-	// Raise Floor Turbo
-	EV_DoFloor(line,raiseFloorTurbo);
-	break;
-    }
-}
-
-
-
-//
-// P_ShootSpecialLine - IMPACT SPECIALS
-// Called when a thing shoots a special line.
-//
-void
-P_ShootSpecialLine
-( mobj_t*	thing,
-  line_t*	line )
-{
-    int		ok;
-    
-    //	Impacts that other things can activate.
-    if (!thing->player)
-    {
-	ok = 0;
-	switch(line->special)
-	{
-	  case 46:
-	    // OPEN DOOR IMPACT
-	    ok = 1;
-	    break;
-	}
-	if (!ok)
-	    return;
-    }
-
-    switch(line->special)
-    {
-      case 24:
-	// RAISE FLOOR
-	EV_DoFloor(line,raiseFloor);
-	P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 46:
-	// OPEN DOOR
-	EV_DoDoor(line,vld_open);
-	P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 47:
-	// RAISE FLOOR NEAR AND CHANGE
-	EV_DoPlat(line,raiseToNearestAndChange,0);
-	P_ChangeSwitchTexture(line,0);
-	break;
-    }
-}
-
-
-
-//
-// P_PlayerInSpecialSector
-// Called every tic frame
-//  that the player origin is in a special sector
-//
-void P_PlayerInSpecialSector (player_t* player)
-{
-    sector_t*	sector;
-	
-    sector = player->mo->subsector->sector;
-
-    // Falling, not all the way down yet?
-    if (player->mo->z != sector->floorheight)
-	return;	
-
-    // Has hitten ground.
-    switch (sector->special)
-    {
-      case 5:
-	// HELLSLIME DAMAGE
-	if (!player->powers[pw_ironfeet])
-	    if (!(leveltime&0x1f))
-		P_DamageMobj (player->mo, NULL, NULL, 10);
-	break;
-	
-      case 7:
-	// NUKAGE DAMAGE
-	if (!player->powers[pw_ironfeet])
-	    if (!(leveltime&0x1f))
-		P_DamageMobj (player->mo, NULL, NULL, 5);
-	break;
-	
-      case 16:
-	// SUPER HELLSLIME DAMAGE
-      case 4:
-	// STROBE HURT
-	if (!player->powers[pw_ironfeet]
-	    || (P_Random()<5) )
-	{
-	    if (!(leveltime&0x1f))
-		P_DamageMobj (player->mo, NULL, NULL, 20);
-	}
-	break;
-			
-      case 9:
-	// SECRET SECTOR
-	player->secretcount++;
-	sector->special = 0;
-	break;
-			
-      case 11:
-	// EXIT SUPER DAMAGE! (for E1M8 finale)
-	player->cheats &= ~CF_GODMODE;
-
-	if (!(leveltime&0x1f))
-	    P_DamageMobj (player->mo, NULL, NULL, 20);
-
-	if (player->health <= 10)
-	    G_ExitLevel();
-	break;
-			
-      default:
-	I_Error ("P_PlayerInSpecialSector: "
-		 "unknown special %i",
-		 sector->special);
-	break;
-    };
-}
-
-
-
-
-//
-// P_UpdateSpecials
-// Animate planes, scroll walls, etc.
-//
-boolean		levelTimer;
-int		levelTimeCount;
-
-void P_UpdateSpecials (void)
-{
-    anim_t*	anim;
-    int		pic;
-    int		i;
-    line_t*	line;
-
-    
-    //	LEVEL TIMER
-    if (levelTimer == true)
-    {
-	levelTimeCount--;
-	if (!levelTimeCount)
-	    G_ExitLevel();
-    }
-    
-    //	ANIMATE FLATS AND TEXTURES GLOBALLY
-    for (anim = anims ; anim < lastanim ; anim++)
-    {
-	for (i=anim->basepic ; i<anim->basepic+anim->numpics ; i++)
-	{
-	    pic = anim->basepic + ( (leveltime/anim->speed + i)%anim->numpics );
-	    if (anim->istexture)
-		texturetranslation[i] = pic;
-	    else
-		flattranslation[i] = pic;
-	}
-    }
-
-    
-    //	ANIMATE LINE SPECIALS
-    for (i = 0; i < numlinespecials; i++)
-    {
-	line = linespeciallist[i];
-	switch(line->special)
-	{
-	  case 48:
-	    // EFFECT FIRSTCOL SCROLL +
-	    sides[line->sidenum[0]].textureoffset += FRACUNIT;
-	    break;
-	}
-    }
-
-    
-    //	DO BUTTONS
-    for (i = 0; i < MAXBUTTONS; i++)
-	if (buttonlist[i].btimer)
-	{
-	    buttonlist[i].btimer--;
-	    if (!buttonlist[i].btimer)
-	    {
-		switch(buttonlist[i].where)
-		{
-		  case top:
-		    sides[buttonlist[i].line->sidenum[0]].toptexture =
-			buttonlist[i].btexture;
-		    break;
-		    
-		  case middle:
-		    sides[buttonlist[i].line->sidenum[0]].midtexture =
-			buttonlist[i].btexture;
-		    break;
-		    
-		  case bottom:
-		    sides[buttonlist[i].line->sidenum[0]].bottomtexture =
-			buttonlist[i].btexture;
-		    break;
-		}
-		S_StartSound(&buttonlist[i].soundorg,sfx_swtchn);
-		memset(&buttonlist[i],0,sizeof(button_t));
-	    }
-	}
-}
-
-
-//
-// Donut overrun emulation
-//
-// Derived from the code from PrBoom+.  Thanks go to Andrey Budko (entryway)
-// as usual :-)
-//
+/* Donut overrun emulation
+ *
+ * Derived from the code from PrBoom+.  Thanks go to Andrey Budko (entryway)
+ * as usual :-)
+ */
 
 #define DONUT_FLOORHEIGHT_DEFAULT 0x00000000
 #define DONUT_FLOORPIC_DEFAULT 0x16
 
-static void DonutOverrun(fixed_t *s3_floorheight, short *s3_floorpic,
-                         line_t *line, sector_t *pillar_sector)
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Animating textures and planes
+ * There is another anim_t used in wi_stuff, unrelated.
+ */
+
+typedef struct
 {
-    static int first = 1;
-    static int tmp_s3_floorheight;
-    static int tmp_s3_floorpic;
+  boolean istexture;
+  int picnum;
+  int basepic;
+  int numpics;
+  int speed;
+} anim_t;
 
-    if (first)
+/* source animation definition */
+
+typedef struct
+{
+  int istexture; /* if false, it is a flat */
+  char endname[9];
+  char startname[9];
+  int speed;
+} animdef_t;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* p_init_pic_anims */
+
+/* Floor/ceiling animation sequences, defined by first and last frame, i.e.
+ * the flat (64x64 tile) name to be used.
+ *
+ * The full animation sequence is given using all the flats between the start
+ * and end entry, in the order found in the WAD file.
+ */
+
+static animdef_t g_animdefs[] =
+{
+  {false, "NUKAGE3", "NUKAGE1", 8},
+  {false, "FWATER4", "FWATER1", 8},
+  {false, "SWATER4", "SWATER1", 8},
+  {false, "LAVA4", "LAVA1", 8},
+  {false, "BLOOD3", "BLOOD1", 8},
+  {false, "RROCK08", "RROCK05", 8}, /* DOOM II flat animations. */
+  {false, "SLIME04", "SLIME01", 8},
+  {false, "SLIME08", "SLIME05", 8},
+  {false, "SLIME12", "SLIME09", 8},
+  {true, "BLODGR4", "BLODGR1", 8},
+  {true, "SLADRIP3", "SLADRIP1", 8},
+  {true, "BLODRIP4", "BLODRIP1", 8},
+  {true, "FIREWALL", "FIREWALA", 8},
+  {true, "GSTFONT3", "GSTFONT1", 8},
+  {true, "FIRELAVA", "FIRELAV3", 8},
+  {true, "FIREMAG3", "FIREMAG1", 8},
+  {true, "FIREBLU2", "FIREBLU1", 8},
+  {true, "ROCKRED3", "ROCKRED1", 8},
+  {true, "BFALL4", "BFALL1", 8},
+  {true, "SFALL4", "SFALL1", 8},
+  {true, "WFALL4", "WFALL1", 8},
+  {true, "DBRAIN4", "DBRAIN1", 8},
+  { -1, "", "", 0},
+};
+
+static anim_t g_anims[MAXANIMS];
+static anim_t *g_lastanim;
+
+static short g_numlinespecials;
+static line_t *g_linespeciallist[MAXLINEANIMS1_2];
+
+/* p_update_specials
+ * Animate planes, scroll walls, etc.
+ */
+
+static boolean g_level_timer;
+static int g_level_time_count;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void donut_overrun(fixed_t *s3_floorheight, short *s3_floorpic,
+                          line_t *line, sector_t *pillar_sector)
+{
+  static int first = 1;
+  static int tmp_s3_floorheight;
+  static int tmp_s3_floorpic;
+
+  if (first)
     {
-        int p;
+      int p;
 
-        // This is the first time we have had an overrun.
-        first = 0;
+      /* This is the first time we have had an overrun. */
 
-        // Default values
-        tmp_s3_floorheight = DONUT_FLOORHEIGHT_DEFAULT;
-        tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
+      first = 0;
 
-        //!
-        // @category compat
-        // @arg <x> <y>
-        //
-        // Use the specified magic values when emulating behavior caused
-        // by memory overruns from improperly constructed donuts.
-        // In Vanilla Doom this can differ depending on the operating
-        // system.  The default (if this option is not specified) is to
-        // emulate the behavior when running under Windows 98.
+      /* Default values */
 
-        p = M_CheckParmWithArgs("-donut", 2);
+      tmp_s3_floorheight = DONUT_FLOORHEIGHT_DEFAULT;
+      tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
 
-        if (p > 0)
+      /* @category compat
+       * @arg <x> <y>
+       *
+       * Use the specified magic values when emulating behavior caused
+       * by memory overruns from improperly constructed donuts.
+       * In Vanilla Doom this can differ depending on the operating
+       * system.  The default (if this option is not specified) is to
+       * emulate the behavior when running under Windows 98.
+       */
+
+      p = m_check_parm_with_args("-donut", 2);
+
+      if (p > 0)
         {
-            // Dump of needed memory: (fixed_t)0000:0000 and (short)0000:0008
-            //
-            // C:\>debug
-            // -d 0:0
-            //
-            // DOS 6.22:
-            // 0000:0000    (57 92 19 00) F4 06 70 00-(16 00)
-            // DOS 7.1:
-            // 0000:0000    (9E 0F C9 00) 65 04 70 00-(16 00)
-            // Win98:
-            // 0000:0000    (00 00 00 00) 65 04 70 00-(16 00)
-            // DOSBox under XP:
-            // 0000:0000    (00 00 00 F1) ?? ?? ?? 00-(07 00)
+          /* Dump of needed memory: (fixed_t)0000:0000 and (short)0000:0008
+           *
+           * C:\>debug
+           * -d 0:0
+           *
+           * DOS 6.22:
+           * 0000:0000    (57 92 19 00) F4 06 70 00-(16 00)
+           * DOS 7.1:
+           * 0000:0000    (9E 0F C9 00) 65 04 70 00-(16 00)
+           * Win98:
+           * 0000:0000    (00 00 00 00) 65 04 70 00-(16 00)
+           * DOSBox under XP:
+           * 0000:0000    (00 00 00 F1) ?? ?? ?? 00-(07 00)
+           */
 
-            M_StrToInt(myargv[p + 1], &tmp_s3_floorheight);
-            M_StrToInt(myargv[p + 2], &tmp_s3_floorpic);
+          m_str_to_int(myargv[p + 1], &tmp_s3_floorheight);
+          m_str_to_int(myargv[p + 2], &tmp_s3_floorpic);
 
-            if (tmp_s3_floorpic >= numflats)
+          if (tmp_s3_floorpic >= numflats)
             {
-                fprintf(stderr,
-                        "DonutOverrun: The second parameter for \"-donut\" "
-                        "switch should be greater than 0 and less than number "
-                        "of flats (%d). Using default value (%d) instead. \n",
-                        numflats, DONUT_FLOORPIC_DEFAULT);
-                tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
+              fprintf(stderr,
+                      "DonutOverrun: The second parameter for \"-donut\" "
+                      "switch should be greater than 0 and less than number "
+                      "of flats (%d). Using default value (%d) instead. \n",
+                      numflats, DONUT_FLOORPIC_DEFAULT);
+              tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
             }
         }
     }
 
-    /*
-    fprintf(stderr,
-            "Linedef: %d; Sector: %d; "
-            "New floor height: %d; New floor pic: %d\n",
-            line->iLineID, pillar_sector->iSectorID,
-            tmp_s3_floorheight >> 16, tmp_s3_floorpic);
-     */
-
-    *s3_floorheight = (fixed_t) tmp_s3_floorheight;
-    *s3_floorpic = (short) tmp_s3_floorpic;
+  *s3_floorheight = (fixed_t)tmp_s3_floorheight;
+  *s3_floorpic = (short)tmp_s3_floorpic;
 }
 
+/* p_spawn_specials
+ * After the map has been loaded, scan for specials that spawn thinkers
+ */
 
-//
-// Special Stuff that can not be categorized
-//
-int EV_DoDonut(line_t*	line)
+static unsigned int num_scrollers(void)
 {
-    sector_t*		s1;
-    sector_t*		s2;
-    sector_t*		s3;
-    int			secnum;
-    int			rtn;
-    int			i;
-    floormove_t*	floor;
-    fixed_t s3_floorheight;
-    short s3_floorpic;
+  unsigned int i;
+  unsigned int scrollers = 0;
 
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+  for (i = 0; i < numlines; i++)
     {
-	s1 = &sectors[secnum];
-
-	// ALREADY MOVING?  IF SO, KEEP GOING...
-	if (s1->specialdata)
-	    continue;
-
-	rtn = 1;
-	s2 = getNextSector(s1->lines[0],s1);
-
-        // Vanilla Doom does not check if the linedef is one sided.  The
-        // game does not crash, but reads invalid memory and causes the
-        // sector floor to move "down" to some unknown height.
-        // DOSbox prints a warning about an invalid memory access.
-        //
-        // I'm not sure exactly what invalid memory is being read.  This
-        // isn't something that should be done, anyway.
-        // Just print a warning and return.
-
-        if (s2 == NULL)
+      if (48 == lines[i].special)
         {
-            fprintf(stderr,
-                    "EV_DoDonut: linedef had no second sidedef! "
-                    "Unexpected behavior may occur in Vanilla Doom. \n");
-	    break;
-        }
-
-	for (i = 0; i < s2->linecount; i++)
-	{
-	    s3 = s2->lines[i]->backsector;
-
-	    if (s3 == s1)
-		continue;
-
-            if (s3 == NULL)
-            {
-                // e6y
-                // s3 is NULL, so
-                // s3->floorheight is an int at 0000:0000
-                // s3->floorpic is a short at 0000:0008
-                // Trying to emulate
-
-                fprintf(stderr,
-                        "EV_DoDonut: WARNING: emulating buffer overrun due to "
-                        "NULL back sector. "
-                        "Unexpected behavior may occur in Vanilla Doom.\n");
-
-                DonutOverrun(&s3_floorheight, &s3_floorpic, line, s1);
-            }
-            else
-            {
-                s3_floorheight = s3->floorheight;
-                s3_floorpic = s3->floorpic;
-            }
-
-	    //	Spawn rising slime
-	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-	    P_AddThinker (&floor->thinker);
-	    s2->specialdata = floor;
-	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-	    floor->type = donutRaise;
-	    floor->crush = false;
-	    floor->direction = 1;
-	    floor->sector = s2;
-	    floor->speed = FLOORSPEED / 2;
-	    floor->texture = s3_floorpic;
-	    floor->newspecial = 0;
-	    floor->floordestheight = s3_floorheight;
-	    
-	    //	Spawn lowering donut-hole
-	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-	    P_AddThinker (&floor->thinker);
-	    s1->specialdata = floor;
-	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-	    floor->type = lowerFloor;
-	    floor->crush = false;
-	    floor->direction = -1;
-	    floor->sector = s1;
-	    floor->speed = FLOORSPEED / 2;
-	    floor->floordestheight = s3_floorheight;
-	    break;
-	}
-    }
-    return rtn;
-}
-
-
-
-//
-// SPECIAL SPAWNING
-//
-
-//
-// P_SpawnSpecials
-// After the map has been loaded, scan for specials
-//  that spawn thinkers
-//
-
-static unsigned int NumScrollers()
-{
-    unsigned int i, scrollers = 0;
-
-    for (i = 0; i < numlines; i++)
-    {
-        if (48 == lines[i].special)
-        {
-            scrollers++;
+          scrollers++;
         }
     }
-    return scrollers;
+
+  return scrollers;
 }
 
-// Parses command line parameters.
-void P_SpawnSpecials (void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void p_init_pic_anims(void)
 {
-    sector_t*	sector;
-    int		i;
-    short maxlineanims = (gameversion <= exe_doom_1_2) ? MAXLINEANIMS1_2
-        : MAXLINEANIMS;
+  int i;
 
-    // See if -TIMER was specified.
+  /* Init animation */
 
-    if (timelimit > 0 && deathmatch)
+  g_lastanim = g_anims;
+  for (i = 0; g_animdefs[i].istexture != -1; i++)
     {
-        levelTimer = true;
-        levelTimeCount = timelimit * 60 * TICRATE;
+      const char *startname;
+      const char *endname;
+
+      startname = (g_animdefs[i].startname);
+      endname = (g_animdefs[i].endname);
+
+      if (g_animdefs[i].istexture)
+        {
+          /* different episode ? */
+
+          if (r_check_texture_num_for_name(startname) == -1) continue;
+
+          g_lastanim->picnum = r_texture_num_for_name(endname);
+          g_lastanim->basepic = r_texture_num_for_name(startname);
+        }
+      else
+        {
+          if (w_check_num_for_name(startname) == -1) continue;
+
+          g_lastanim->picnum = r_flat_num_for_name(endname);
+          g_lastanim->basepic = r_flat_num_for_name(startname);
+        }
+
+      g_lastanim->istexture = g_animdefs[i].istexture;
+      g_lastanim->numpics = g_lastanim->picnum - g_lastanim->basepic + 1;
+
+      if (g_lastanim->numpics < 2)
+        i_error("p_init_pic_anims: bad cycle from %s to %s", startname,
+                endname);
+
+      g_lastanim->speed = g_animdefs[i].speed;
+      g_lastanim++;
     }
-    else
-    {
-	levelTimer = false;
-    }
-
-    //	Init special SECTORs.
-    sector = sectors;
-    for (i=0 ; i<numsectors ; i++, sector++)
-    {
-	if (!sector->special)
-	    continue;
-	
-	switch (sector->special)
-	{
-	  case 1:
-	    // FLICKERING LIGHTS
-	    P_SpawnLightFlash (sector);
-	    break;
-
-	  case 2:
-	    // STROBE FAST
-	    P_SpawnStrobeFlash(sector,FASTDARK,0);
-	    break;
-	    
-	  case 3:
-	    // STROBE SLOW
-	    P_SpawnStrobeFlash(sector,SLOWDARK,0);
-	    break;
-	    
-	  case 4:
-	    // STROBE FAST/DEATH SLIME
-	    P_SpawnStrobeFlash(sector,FASTDARK,0);
-	    sector->special = 4;
-	    break;
-	    
-	  case 8:
-	    // GLOWING LIGHT
-	    P_SpawnGlowingLight(sector);
-	    break;
-	  case 9:
-	    // SECRET SECTOR
-	    totalsecret++;
-	    break;
-	    
-	  case 10:
-	    // DOOR CLOSE IN 30 SECONDS
-	    P_SpawnDoorCloseIn30 (sector);
-	    break;
-	    
-	  case 12:
-	    // SYNC STROBE SLOW
-	    P_SpawnStrobeFlash (sector, SLOWDARK, 1);
-	    break;
-
-	  case 13:
-	    // SYNC STROBE FAST
-	    P_SpawnStrobeFlash (sector, FASTDARK, 1);
-	    break;
-
-	  case 14:
-	    // DOOR RAISE IN 5 MINUTES
-	    P_SpawnDoorRaiseIn5Mins (sector, i);
-	    break;
-	    
-        case 17:
-            // first introduced in official v1.4 beta
-            if (gameversion > exe_doom_1_2)
-            {
-                P_SpawnFireFlicker(sector);
-            }
-            break;
-	}
-    }
-
-    
-    //	Init line EFFECTs
-    numlinespecials = 0;
-    for (i = 0;i < numlines; i++)
-    {
-	switch(lines[i].special)
-	{
-	  case 48:
-            if (numlinespecials >= maxlineanims)
-            {
-                I_Error("P_SpawnSpecials: Too many scrolling wall linedefs "
-                        "(%d)! (Vanilla limit is %d)", NumScrollers(),
-                        maxlineanims);
-            }
-	    // EFFECT FIRSTCOL SCROLL+
-	    linespeciallist[numlinespecials] = &lines[i];
-	    numlinespecials++;
-	    break;
-	}
-    }
-
-    
-    //	Init other misc stuff
-    for (i = 0;i < MAXCEILINGS;i++)
-	activeceilings[i] = NULL;
-
-    for (i = 0;i < MAXPLATS;i++)
-	activeplats[i] = NULL;
-    
-    for (i = 0;i < MAXBUTTONS;i++)
-	memset(&buttonlist[i],0,sizeof(button_t));
-
-    // UNUSED: no horizonal sliders.
-    //	P_InitSlidingDoorFrames();
+}
+
+/* UTILITIES */
+
+/* get_side()
+ * Will return a side_t* given the number of the current sector, the line
+ * number, and the side (0/1) that you want.
+ */
+
+side_t *get_side(int current_sector, int line, int side)
+{
+  return &sides[(sectors[current_sector].lines[line])->sidenum[side]];
+}
+
+/* get_sector()
+ * Will return a sector_t* given the number of the current sector, the line
+ * number and the side (0/1) that you want.
+ */
+
+sector_t *get_sector(int current_sector, int line, int side)
+{
+  return sides[(sectors[current_sector].lines[line])->sidenum[side]].sector;
+}
+
+/* two_sided()
+ * Given the sector number and the line number, it will tell you whether the
+ * line is two-sided or not.
+ */
+
+int two_sided(int sector, int line)
+{
+  return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
+}
+
+/* get_next_sector()
+ * Return sector_t * of sector next to current. NULL if not two-sided line
+ */
+
+sector_t *get_next_sector(line_t *line, sector_t *sec)
+{
+  if (!(line->flags & ML_TWOSIDED)) return NULL;
+
+  if (line->frontsector == sec) return line->backsector;
+
+  return line->frontsector;
+}
+
+/* p_find_lowest_floor_surrounding()
+ * FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
+ */
+
+fixed_t p_find_lowest_floor_surrounding(sector_t *sec)
+{
+  int i;
+  line_t *check;
+  sector_t *other;
+  fixed_t floor = sec->floorheight;
+
+  for (i = 0; i < sec->linecount; i++)
+    {
+      check = sec->lines[i];
+      other = get_next_sector(check, sec);
+
+      if (!other) continue;
+
+      if (other->floorheight < floor) floor = other->floorheight;
+    }
+
+  return floor;
+}
+
+/* p_find_highest_floor_surrounding()
+ * FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
+ */
+
+fixed_t p_find_highest_floor_surrounding(sector_t *sec)
+{
+  int i;
+  line_t *check;
+  sector_t *other;
+  fixed_t floor = -500 * FRACUNIT;
+
+  for (i = 0; i < sec->linecount; i++)
+    {
+      check = sec->lines[i];
+      other = get_next_sector(check, sec);
+
+      if (!other) continue;
+
+      if (other->floorheight > floor) floor = other->floorheight;
+    }
+
+  return floor;
+}
+
+/* p_find_next_highest_floor
+ * FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
+ * Note: this should be doable w/o a fixed array.
+ */
+
+fixed_t p_find_next_highest_floor(sector_t *sec, int currentheight)
+{
+  int i;
+  int h;
+  int min;
+  line_t *check;
+  sector_t *other;
+  fixed_t height = currentheight;
+  fixed_t heightlist[MAX_ADJOINING_SECTORS + 2];
+
+  for (i = 0, h = 0; i < sec->linecount; i++)
+    {
+      check = sec->lines[i];
+      other = get_next_sector(check, sec);
+
+      if (!other) continue;
+
+      if (other->floorheight > height)
+        {
+          /* Emulation of memory (stack) overflow */
+
+          if (h == MAX_ADJOINING_SECTORS + 1)
+            {
+              height = other->floorheight;
+            }
+          else if (h == MAX_ADJOINING_SECTORS + 2)
+            {
+              /* Fatal overflow: game crashes at 22 sectors */
+
+              i_error("Sector with more than 22 adjoining sectors. "
+                      "Vanilla will crash here");
+            }
+
+          heightlist[h++] = other->floorheight;
+        }
+    }
+
+  /* Find lowest height in list */
+
+  if (!h)
+    {
+      return currentheight;
+    }
+
+  min = heightlist[0];
+
+  /* Range checking? */
+
+  for (i = 1; i < h; i++)
+    {
+      if (heightlist[i] < min)
+        {
+          min = heightlist[i];
+        }
+    }
+
+  return min;
+}
+
+/* FIND LOWEST CEILING IN THE SURROUNDING SECTORS */
+
+fixed_t p_find_lowest_ceiling_surrounding(sector_t *sec)
+{
+  int i;
+  line_t *check;
+  sector_t *other;
+  fixed_t height = INT_MAX;
+
+  for (i = 0; i < sec->linecount; i++)
+    {
+      check = sec->lines[i];
+      other = get_next_sector(check, sec);
+
+      if (!other) continue;
+
+      if (other->ceilingheight < height) height = other->ceilingheight;
+    }
+
+  return height;
+}
+
+/* FIND HIGHEST CEILING IN THE SURROUNDING SECTORS */
+
+fixed_t p_find_heighest_ceiling_surrounding(sector_t *sec)
+{
+  int i;
+  line_t *check;
+  sector_t *other;
+  fixed_t height = 0;
+
+  for (i = 0; i < sec->linecount; i++)
+    {
+      check = sec->lines[i];
+      other = get_next_sector(check, sec);
+
+      if (!other) continue;
+
+      if (other->ceilingheight > height) height = other->ceilingheight;
+    }
+
+  return height;
+}
+
+/* RETURN NEXT SECTOR # THAT LINE TAG REFERS TO */
+
+int p_find_sector_from_line_tag(line_t *line, int start)
+{
+  int i;
+
+  for (i = start + 1; i < numsectors; i++)
+    {
+      if (sectors[i].tag == line->tag)
+        {
+          return i;
+        }
+    }
+
+  return -1;
+}
+
+/* Find minimum light from an adjacent sector */
+
+int p_find_min_surrounding(sector_t *sector, int max)
+{
+  int i;
+  int min;
+  line_t *line;
+  sector_t *check;
+
+  min = max;
+  for (i = 0; i < sector->linecount; i++)
+    {
+      line = sector->lines[i];
+      check = get_next_sector(line, sector);
+
+      if (!check) continue;
+
+      if (check->lightlevel < min) min = check->lightlevel;
+    }
+
+  return min;
+}
+
+/* EVENTS
+ * Events are operations triggered by using, crossing,
+ * or shooting special lines, or by timed thinkers.
+ */
+
+/* p_cross_special_line - TRIGGER
+ * Called every time a thing origin is about to cross a line with a non 0
+ * special.
+ */
+
+void p_cross_special_line(int linenum, int side, mobj_t *thing)
+{
+  line_t *line;
+  int is_ok;
+
+  line = &lines[linenum];
+
+  if (gameversion <= exe_doom_1_2)
+    {
+      if (line->special > 98 && line->special != 104)
+        {
+          return;
+        }
+    }
+  else
+    {
+      /* Triggers that other things can activate */
+
+      if (!thing->player)
+        {
+          /* Things that should NOT trigger specials... */
+
+          switch (thing->type)
+            {
+            case MT_ROCKET:
+            case MT_PLASMA:
+            case MT_BFG:
+            case MT_TROOPSHOT:
+            case MT_HEADSHOT:
+            case MT_BRUISERSHOT:
+              return;
+
+            default:
+              break;
+            }
+        }
+    }
+
+  if (!thing->player)
+    {
+      is_ok = 0;
+      switch (line->special)
+        {
+        case 39:  /* TELEPORT TRIGGER */
+        case 97:  /* TELEPORT RETRIGGER */
+        case 125: /* TELEPORT MONSTERONLY TRIGGER */
+        case 126: /* TELEPORT MONSTERONLY RETRIGGER */
+        case 4:   /* RAISE DOOR */
+        case 10:  /* PLAT DOWN-WAIT-UP-STAY TRIGGER */
+        case 88:  /* PLAT DOWN-WAIT-UP-STAY RETRIGGER */
+          is_ok = 1;
+          break;
+        }
+
+      if (!is_ok) return;
+    }
+
+  /* Note: could use some const's here. */
+
+  switch (line->special)
+    {
+      /* TRIGGERS.
+       * All from here to RETRIGGERS.
+       */
+
+    case 2: /* Open Door */
+      ev_do_door(line, VLD_OPEN);
+      line->special = 0;
+      break;
+
+    case 3: /* Close Door */
+      ev_do_door(line, VLD_CLOSE);
+      line->special = 0;
+      break;
+
+    case 4: /* Raise Door */
+      ev_do_door(line, VLD_NORMAL);
+      line->special = 0;
+      break;
+
+    case 5: /* Raise Floor */
+      ev_do_floor(line, FLOOR_RAISEFLOOR);
+      line->special = 0;
+      break;
+
+    case 6: /* Fast Ceiling Crush & Raise */
+      ev_do_ceiling(line, CEIL_FASTCRUSHANDRAISE);
+      line->special = 0;
+      break;
+
+    case 8: /* Build Stairs */
+      ev_build_stairs(line, STAIR_BUILD8);
+      line->special = 0;
+      break;
+
+    case 10: /* PlatDownWaitUp */
+      ev_do_plat(line, PLAT_DOWNWAITUPSTAY, 0);
+      line->special = 0;
+      break;
+
+    case 12: /* Light Turn On - brightest near */
+      ev_light_turn_on(line, 0);
+      line->special = 0;
+      break;
+
+    case 13: /* Light Turn On 255 */
+      ev_light_turn_on(line, 255);
+      line->special = 0;
+      break;
+
+    case 16: /* Close Door 30 */
+      ev_do_door(line, VLD_CLOSE30THENOPEN);
+      line->special = 0;
+      break;
+
+    case 17: /* Start Light Strobing */
+      ev_start_light_strobing(line);
+      line->special = 0;
+      break;
+
+    case 19: /* Lower Floor */
+      ev_do_floor(line, FLOOR_LOWERFLOOR);
+      line->special = 0;
+      break;
+
+    case 22: /* Raise floor to nearest height and change texture */
+      ev_do_plat(line, PLAT_RAISETONEARESTANDCHANGE, 0);
+      line->special = 0;
+      break;
+
+    case 25: /* Ceiling Crush and Raise */
+      ev_do_ceiling(line, CEIL_CRUSHANDRAISE);
+      line->special = 0;
+      break;
+
+    case 30:
+
+      /* Raise floor to shortest texture height on either side of lines. */
+
+      ev_do_floor(line, FLOOR_RAISETOTEXTURE);
+      line->special = 0;
+      break;
+
+    case 35: /* Lights Very Dark */
+      ev_light_turn_on(line, 35);
+      line->special = 0;
+      break;
+
+    case 36: /* Lower Floor (TURBO) */
+      ev_do_floor(line, FLOOR_TURBOLOWER);
+      line->special = 0;
+      break;
+
+    case 37: /* LowerAndChange */
+      ev_do_floor(line, FLOOR_LOWERANDCHANGE);
+      line->special = 0;
+      break;
+
+    case 38: /* Lower Floor To Lowest */
+      ev_do_floor(line, FLOOR_LOWERFLOORTOLOWEST);
+      line->special = 0;
+      break;
+
+    case 39: /* TELEPORT! */
+      ev_teleport(line, side, thing);
+      line->special = 0;
+      break;
+
+    case 40: /* RaiseCeilingLowerFloor */
+      ev_do_ceiling(line, CEIL_RAISETOHIGHEST);
+      ev_do_floor(line, FLOOR_LOWERFLOORTOLOWEST);
+      line->special = 0;
+      break;
+
+    case 44: /* Ceiling Crush */
+      ev_do_ceiling(line, CEIL_LOWERANDCRUSH);
+      line->special = 0;
+      break;
+
+    case 52: /* EXIT! */
+      g_exit_level();
+      break;
+
+    case 53: /* Perpetual Platform Raise */
+      ev_do_plat(line, PLAT_PERPETUALRAISE, 0);
+      line->special = 0;
+      break;
+
+    case 54: /* Platform Stop */
+      ev_stop_plat(line);
+      line->special = 0;
+      break;
+
+    case 56: /* Raise Floor Crush */
+      ev_do_floor(line, FLOOR_RAISEFLOORCRUSH);
+      line->special = 0;
+      break;
+
+    case 57: /* Ceiling Crush Stop */
+      ev_ceiling_crush_stop(line);
+      line->special = 0;
+      break;
+
+    case 58: /* Raise Floor 24 */
+      ev_do_floor(line, FLOOR_RAISEFLOOR24);
+      line->special = 0;
+      break;
+
+    case 59: /* Raise Floor 24 And Change */
+      ev_do_floor(line, FLOOR_RAISEFLOOR24ANDCHANGE);
+      line->special = 0;
+      break;
+
+    case 104: /* Turn lights off in sector(tag) */
+      ev_turn_tag_lights_off(line);
+      line->special = 0;
+      break;
+
+    case 108: /* Blazing Door Raise (faster than TURBO!) */
+      ev_do_door(line, VLD_BLAZERAISE);
+      line->special = 0;
+      break;
+
+    case 109: /* Blazing Door Open (faster than TURBO!) */
+      ev_do_door(line, VLD_BLAZEOPEN);
+      line->special = 0;
+      break;
+
+    case 100: /* Build Stairs Turbo 16 */
+      ev_build_stairs(line, STAIR_TURBO16);
+      line->special = 0;
+      break;
+
+    case 110: /* Blazing Door Close (faster than TURBO!) */
+      ev_do_door(line, VLD_BLAZECLOSE);
+      line->special = 0;
+      break;
+
+    case 119: /* Raise floor to nearest surr. floor */
+      ev_do_floor(line, FLOOR_RAISEFLOORTONEAREST);
+      line->special = 0;
+      break;
+
+    case 121: /* Blazing PlatDownWaitUpStay */
+      ev_do_plat(line, PLAT_BLAZEDWUS, 0);
+      line->special = 0;
+      break;
+
+    case 124: /* Secret EXIT */
+      g_secret_exit_level();
+      break;
+
+    case 125: /* TELEPORT MonsterONLY */
+      if (!thing->player)
+        {
+          ev_teleport(line, side, thing);
+          line->special = 0;
+        }
+      break;
+
+    case 130: /* Raise Floor Turbo */
+      ev_do_floor(line, FLOOR_RAISEFLOORTURBO);
+      line->special = 0;
+      break;
+
+    case 141: /* Silent Ceiling Crush & Raise */
+      ev_do_ceiling(line, CEIL_SILENTCRUSHANDRAISE);
+      line->special = 0;
+      break;
+
+      /* RETRIGGERS.  All from here till end. */
+
+    case 72: /* Ceiling Crush */
+      ev_do_ceiling(line, CEIL_LOWERANDCRUSH);
+      break;
+
+    case 73: /* Ceiling Crush and Raise */
+      ev_do_ceiling(line, CEIL_CRUSHANDRAISE);
+      break;
+
+    case 74: /* Ceiling Crush Stop */
+      ev_ceiling_crush_stop(line);
+      break;
+
+    case 75: /* Close Door */
+      ev_do_door(line, VLD_CLOSE);
+      break;
+
+    case 76: /* Close Door 30 */
+      ev_do_door(line, VLD_CLOSE30THENOPEN);
+      break;
+
+    case 77: /* Fast Ceiling Crush & Raise */
+      ev_do_ceiling(line, CEIL_FASTCRUSHANDRAISE);
+      break;
+
+    case 79: /* Lights Very Dark */
+      ev_light_turn_on(line, 35);
+      break;
+
+    case 80: /* Light Turn On - brightest near */
+      ev_light_turn_on(line, 0);
+      break;
+
+    case 81: /* Light Turn On 255 */
+      ev_light_turn_on(line, 255);
+      break;
+
+    case 82: /* Lower Floor To Lowest */
+      ev_do_floor(line, FLOOR_LOWERFLOORTOLOWEST);
+      break;
+
+    case 83: /* Lower Floor */
+      ev_do_floor(line, FLOOR_LOWERFLOOR);
+      break;
+
+    case 84: /* LowerAndChange */
+      ev_do_floor(line, FLOOR_LOWERANDCHANGE);
+      break;
+
+    case 86: /* Open Door */
+      ev_do_door(line, VLD_OPEN);
+      break;
+
+    case 87: /* Perpetual Platform Raise */
+      ev_do_plat(line, PLAT_PERPETUALRAISE, 0);
+      break;
+
+    case 88: /* PlatDownWaitUp */
+      ev_do_plat(line, PLAT_DOWNWAITUPSTAY, 0);
+      break;
+
+    case 89: /* Platform Stop */
+      ev_stop_plat(line);
+      break;
+
+    case 90: /* Raise Door */
+      ev_do_door(line, VLD_NORMAL);
+      break;
+
+    case 91: /* Raise Floor */
+      ev_do_floor(line, FLOOR_RAISEFLOOR);
+      break;
+
+    case 92: /* Raise Floor 24 */
+      ev_do_floor(line, FLOOR_RAISEFLOOR24);
+      break;
+
+    case 93: /* Raise Floor 24 And Change */
+      ev_do_floor(line, FLOOR_RAISEFLOOR24ANDCHANGE);
+      break;
+
+    case 94: /* Raise Floor Crush */
+      ev_do_floor(line, FLOOR_RAISEFLOORCRUSH);
+      break;
+
+    case 95: /* Raise floor to nearest height and change texture. */
+      ev_do_plat(line, PLAT_RAISETONEARESTANDCHANGE, 0);
+      break;
+
+    case 96:
+
+      /* Raise floor to shortest texture height on either side of lines. */
+
+      ev_do_floor(line, FLOOR_RAISETOTEXTURE);
+      break;
+
+    case 97: /* TELEPORT! */
+      ev_teleport(line, side, thing);
+      break;
+
+    case 98: /* Lower Floor (TURBO) */
+      ev_do_floor(line, FLOOR_TURBOLOWER);
+      break;
+
+    case 105: /* Blazing Door Raise (faster than TURBO!) */
+      ev_do_door(line, VLD_BLAZERAISE);
+      break;
+
+    case 106: /* Blazing Door Open (faster than TURBO!) */
+      ev_do_door(line, VLD_BLAZEOPEN);
+      break;
+
+    case 107: /* Blazing Door Close (faster than TURBO!) */
+      ev_do_door(line, VLD_BLAZECLOSE);
+      break;
+
+    case 120: /* Blazing PlatDownWaitUpStay. */
+      ev_do_plat(line, PLAT_BLAZEDWUS, 0);
+      break;
+
+    case 126: /* TELEPORT MonsterONLY. */
+      if (!thing->player) ev_teleport(line, side, thing);
+      break;
+
+    case 128: /* Raise To Nearest Floor */
+      ev_do_floor(line, FLOOR_RAISEFLOORTONEAREST);
+      break;
+
+    case 129: /* Raise Floor Turbo */
+      ev_do_floor(line, FLOOR_RAISEFLOORTURBO);
+      break;
+    }
+}
+
+/* p_shoot_special_line - IMPACT SPECIALS
+ * Called when a thing shoots a special line.
+ */
+
+void p_shoot_special_line(mobj_t *thing, line_t *line)
+{
+  int is_ok;
+
+  /* Impacts that other things can activate. */
+
+  if (!thing->player)
+    {
+      is_ok = 0;
+      switch (line->special)
+        {
+        case 46: /* OPEN DOOR IMPACT */
+          is_ok = 1;
+          break;
+        }
+
+      if (!is_ok) return;
+    }
+
+  switch (line->special)
+    {
+    case 24: /* RAISE FLOOR */
+      ev_do_floor(line, FLOOR_RAISEFLOOR);
+      p_change_switch_texture(line, 0);
+      break;
+
+    case 46: /* OPEN DOOR */
+      ev_do_door(line, VLD_OPEN);
+      p_change_switch_texture(line, 1);
+      break;
+
+    case 47: /* RAISE FLOOR NEAR AND CHANGE */
+      ev_do_plat(line, PLAT_RAISETONEARESTANDCHANGE, 0);
+      p_change_switch_texture(line, 0);
+      break;
+    }
+}
+
+/* p_player_in_special_sector
+ * Called every tic frame that the player origin is in a special sector
+ */
+
+void p_player_in_special_sector(player_t *player)
+{
+  sector_t *sector;
+
+  sector = player->mo->subsector->sector;
+
+  /* Falling, not all the way down yet? */
+
+  if (player->mo->z != sector->floorheight) return;
+
+  /* Has hitten ground. */
+
+  switch (sector->special)
+    {
+    case 5: /* HELLSLIME DAMAGE */
+      if (!player->powers[pw_ironfeet])
+        {
+          if (!(leveltime & 0x1f)) p_damage_mobj(player->mo, NULL, NULL, 10);
+        }
+
+      break;
+
+    case 7: /* NUKAGE DAMAGE */
+      if (!player->powers[pw_ironfeet])
+        {
+          if (!(leveltime & 0x1f)) p_damage_mobj(player->mo, NULL, NULL, 5);
+        }
+
+      break;
+
+    case 16: /* SUPER HELLSLIME DAMAGE */
+    case 4:  /* STROBE HURT */
+      if (!player->powers[pw_ironfeet] || (p_random() < 5))
+        {
+          if (!(leveltime & 0x1f)) p_damage_mobj(player->mo, NULL, NULL, 20);
+        }
+
+      break;
+
+    case 9: /* SECRET SECTOR */
+      player->secretcount++;
+      sector->special = 0;
+      break;
+
+    case 11: /* EXIT SUPER DAMAGE! (for E1M8 finale) */
+      player->cheats &= ~CF_GODMODE;
+
+      if (!(leveltime & 0x1f)) p_damage_mobj(player->mo, NULL, NULL, 20);
+
+      if (player->health <= 10) g_exit_level();
+      break;
+
+    default:
+      i_error("p_player_in_special_sector: "
+              "unknown special %i",
+              sector->special);
+      break;
+    };
+}
+
+void p_update_specials(void)
+{
+  anim_t *anim;
+  int pic;
+  int i;
+  line_t *line;
+
+  /* LEVEL TIMER */
+
+  if (g_level_timer == true)
+    {
+      g_level_time_count--;
+      if (!g_level_time_count) g_exit_level();
+    }
+
+  /* ANIMATE FLATS AND TEXTURES GLOBALLY */
+
+  for (anim = g_anims; anim < g_lastanim; anim++)
+    {
+      for (i = anim->basepic; i < anim->basepic + anim->numpics; i++)
+        {
+          pic = anim->basepic +
+              ((leveltime / anim->speed + i) % anim->numpics);
+
+          if (anim->istexture)
+            texturetranslation[i] = pic;
+          else
+            flattranslation[i] = pic;
+        }
+    }
+
+  /* ANIMATE LINE SPECIALS */
+
+  for (i = 0; i < g_numlinespecials; i++)
+    {
+      line = g_linespeciallist[i];
+      switch (line->special)
+        {
+        case 48: /* EFFECT FIRSTCOL SCROLL + */
+          sides[line->sidenum[0]].textureoffset += FRACUNIT;
+          break;
+        }
+    }
+
+  /* DO BUTTONS */
+
+  for (i = 0; i < MAXBUTTONS; i++)
+    if (buttonlist[i].btimer)
+      {
+        buttonlist[i].btimer--;
+        if (!buttonlist[i].btimer)
+          {
+            switch (buttonlist[i].where)
+              {
+              case top:
+                sides[buttonlist[i].line->sidenum[0]].toptexture =
+                    buttonlist[i].btexture;
+                break;
+
+              case middle:
+                sides[buttonlist[i].line->sidenum[0]].midtexture =
+                    buttonlist[i].btexture;
+                break;
+
+              case bottom:
+                sides[buttonlist[i].line->sidenum[0]].bottomtexture =
+                    buttonlist[i].btexture;
+                break;
+              }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+            s_start_sound(&buttonlist[i].soundorg, SFX_SWTCHN);
+#endif
+            memset(&buttonlist[i], 0, sizeof(button_t));
+          }
+      }
+}
+
+/* Special Stuff that can not be categorized */
+
+int ev_do_donut(line_t *line)
+{
+  sector_t *s1;
+  sector_t *s2;
+  sector_t *s3;
+  int secnum;
+  int rtn;
+  int i;
+  floormove_t *floor;
+  fixed_t s3_floorheight;
+  short s3_floorpic;
+
+  secnum = -1;
+  rtn = 0;
+  while ((secnum = p_find_sector_from_line_tag(line, secnum)) >= 0)
+    {
+      s1 = &sectors[secnum];
+
+      /* ALREADY MOVING?  IF SO, KEEP GOING... */
+
+      if (s1->specialdata) continue;
+
+      rtn = 1;
+      s2 = get_next_sector(s1->lines[0], s1);
+
+      /* Vanilla Doom does not check if the linedef is one sided.  The
+       * game does not crash, but reads invalid memory and causes the
+       * sector floor to move "down" to some unknown height.
+       * DOSbox prints a warning about an invalid memory access.
+       *
+       * I'm not sure exactly what invalid memory is being read.  This
+       * isn't something that should be done, anyway.
+       * Just print a warning and return.
+       */
+
+      if (s2 == NULL)
+        {
+          fprintf(stderr,
+                  "ev_do_donut: linedef had no second sidedef! "
+                  "Unexpected behavior may occur in Vanilla Doom. \n");
+          break;
+        }
+
+      for (i = 0; i < s2->linecount; i++)
+        {
+          s3 = s2->lines[i]->backsector;
+
+          if (s3 == s1) continue;
+
+          if (s3 == NULL)
+            {
+              /* e6y
+               * s3 is NULL, so
+               * s3->floorheight is an int at 0000:0000
+               * s3->floorpic is a short at 0000:0008
+               * Trying to emulate
+               */
+
+              fprintf(stderr, "ev_do_donut: WARNING: emulating buffer "
+                              "overrun due to NULL back sector. Unexpected "
+                              "behavior may occur in Vanilla Doom.\n");
+
+              donut_overrun(&s3_floorheight, &s3_floorpic, line, s1);
+            }
+          else
+            {
+              s3_floorheight = s3->floorheight;
+              s3_floorpic = s3->floorpic;
+            }
+
+          /* Spawn rising slime */
+
+          floor = z_malloc(sizeof(*floor), PU_LEVSPEC, 0);
+          p_add_thinker(&floor->thinker);
+          s2->specialdata = floor;
+          floor->thinker.function.acp1 = (actionf_p1)t_move_floor;
+          floor->type = FLOOR_DONUTRAISE;
+          floor->crush = false;
+          floor->direction = 1;
+          floor->sector = s2;
+          floor->speed = FLOORSPEED / 2;
+          floor->texture = s3_floorpic;
+          floor->newspecial = 0;
+          floor->floordestheight = s3_floorheight;
+
+          /* Spawn lowering donut-hole */
+
+          floor = z_malloc(sizeof(*floor), PU_LEVSPEC, 0);
+          p_add_thinker(&floor->thinker);
+          s1->specialdata = floor;
+          floor->thinker.function.acp1 = (actionf_p1)t_move_floor;
+          floor->type = FLOOR_LOWERFLOOR;
+          floor->crush = false;
+          floor->direction = -1;
+          floor->sector = s1;
+          floor->speed = FLOORSPEED / 2;
+          floor->floordestheight = s3_floorheight;
+          break;
+        }
+    }
+
+  return rtn;
+}
+
+/* SPECIAL SPAWNING */
+
+/* Parses command line parameters. */
+
+void p_spawn_specials(void)
+{
+  sector_t *sector;
+  int i;
+  short maxlineanims =
+      (gameversion <= exe_doom_1_2) ? MAXLINEANIMS1_2 : MAXLINEANIMS;
+
+  /* See if -TIMER was specified. */
+
+  if (timelimit > 0 && deathmatch)
+    {
+      g_level_timer = true;
+      g_level_time_count = timelimit * 60 * TICRATE;
+    }
+  else
+    {
+      g_level_timer = false;
+    }
+
+  /* Init special SECTORs. */
+
+  sector = sectors;
+  for (i = 0; i < numsectors; i++, sector++)
+    {
+      if (!sector->special) continue;
+
+      switch (sector->special)
+        {
+        case 1: /* FLICKERING LIGHTS */
+          p_spawn_light_flash(sector);
+          break;
+
+        case 2: /* STROBE FAST */
+          p_spawn_strobe_flash(sector, FASTDARK, 0);
+          break;
+
+        case 3: /* STROBE SLOW */
+          p_spawn_strobe_flash(sector, SLOWDARK, 0);
+          break;
+
+        case 4: /* STROBE FAST/DEATH SLIME */
+          p_spawn_strobe_flash(sector, FASTDARK, 0);
+          sector->special = 4;
+          break;
+
+        case 8: /* GLOWING LIGHT */
+          p_spawn_glowing_light(sector);
+          break;
+
+        case 9: /* SECRET SECTOR */
+          totalsecret++;
+          break;
+
+        case 10: /* DOOR CLOSE IN 30 SECONDS */
+          p_spawn_door_close_in30(sector);
+          break;
+
+        case 12: /* SYNC STROBE SLOW */
+          p_spawn_strobe_flash(sector, SLOWDARK, 1);
+          break;
+
+        case 13: /* SYNC STROBE FAST */
+          p_spawn_strobe_flash(sector, FASTDARK, 1);
+          break;
+
+        case 14: /* DOOR RAISE IN 5 MINUTES */
+          p_spawn_door_raise_in_5min(sector, i);
+          break;
+
+        case 17: /* first introduced in official v1.4 beta */
+          if (gameversion > exe_doom_1_2)
+            {
+              p_spawn_fire_flicker(sector);
+            }
+          break;
+        }
+    }
+
+  /* Init line EFFECTs */
+
+  g_numlinespecials = 0;
+
+  for (i = 0; i < numlines; i++)
+    {
+      switch (lines[i].special)
+        {
+        case 48:
+          if (g_numlinespecials >= maxlineanims)
+            {
+              i_error("p_spawn_specials: Too many scrolling wall linedefs "
+                      "(%d)! (Vanilla limit is %d)",
+                      num_scrollers(), maxlineanims);
+            }
+
+          /* EFFECT FIRSTCOL SCROLL+ */
+
+          g_linespeciallist[g_numlinespecials] = &lines[i];
+          g_numlinespecials++;
+          break;
+        }
+    }
+
+  /* Init other misc stuff */
+
+  for (i = 0; i < MAXCEILINGS; i++)
+    activeceilings[i] = NULL;
+
+  for (i = 0; i < MAXPLATS; i++)
+    activeplats[i] = NULL;
+
+  for (i = 0; i < MAXBUTTONS; i++)
+    memset(&buttonlist[i], 0, sizeof(button_t));
+
+  /* UNUSED: no horizontal sliders.
+   * p_init_sliding_door_frames();
+   */
 }
diff --git a/games/NXDoom/src/doom/p_spec.h b/games/NXDoom/src/doom/p_spec.h
index a1343bfa3..f69c818b4 100644
--- a/games/NXDoom/src/doom/p_spec.h
+++ b/games/NXDoom/src/doom/p_spec.h
@@ -1,637 +1,503 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//	Implements special effects:
-//	Texture animation, height or lighting changes
-//	 according to adjacent sectors, respective
-//	 utility functions, etc.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_spec.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  none
+ *  Implements special effects:
+ *  Texture animation, height or lighting changes according to adjacent
+ *  sectors, respective utility functions, etc.
+ *
+ ****************************************************************************/
 
 #ifndef __P_SPEC__
 #define __P_SPEC__
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-//
-// End-level timer (-TIMER option)
-//
-extern	boolean levelTimer;
-extern	int	levelTimeCount;
+/* Define values for map objects */
 
+#define MO_TELEPORTMAN 14
 
-//      Define values for map objects
-#define MO_TELEPORTMAN          14
+#define GLOWSPEED 8
+#define STROBEBRIGHT 5
+#define FASTDARK 15
+#define SLOWDARK 35
 
+/* max # of wall switches in a level */
 
-// at game start
-void    P_InitPicAnims (void);
+#define MAXSWITCHES 50
 
-// at map load
-void    P_SpawnSpecials (void);
+/* 4 players, 4 buttons each at once, max. */
 
-// every tic
-void    P_UpdateSpecials (void);
+#define MAXBUTTONS 16
 
-// when needed
-boolean
-P_UseSpecialLine
-( mobj_t*	thing,
-  line_t*	line,
-  int		side );
+/* 1 second, in ticks. */
 
-void
-P_ShootSpecialLine
-( mobj_t*	thing,
-  line_t*	line );
+#define BUTTONTIME 35
 
-void
-P_CrossSpecialLine
-( int		linenum,
-  int		side,
-  mobj_t*	thing );
+#define PLATWAIT 3
+#define PLATSPEED FRACUNIT
+#define MAXPLATS 30
 
-void    P_PlayerInSpecialSector (player_t* player);
+#define FLOORSPEED FRACUNIT
 
-int
-twoSided
-( int		sector,
-  int		line );
+#define VDOORSPEED FRACUNIT * 2
+#define VDOORWAIT 150
 
-sector_t*
-getSector
-( int		currentSector,
-  int		line,
-  int		side );
+#define CEILSPEED FRACUNIT
+#define CEILWAIT 150
+#define MAXCEILINGS 30
 
-side_t*
-getSide
-( int		currentSector,
-  int		line,
-  int		side );
+#if 0 /* UNUSED */
 
-fixed_t P_FindLowestFloorSurrounding(sector_t* sec);
-fixed_t P_FindHighestFloorSurrounding(sector_t* sec);
+/* how many frames of animation */
 
-fixed_t
-P_FindNextHighestFloor
-( sector_t*	sec,
-  int		currentheight );
+#define SNUMFRAMES 4
 
-fixed_t P_FindLowestCeilingSurrounding(sector_t* sec);
-fixed_t P_FindHighestCeilingSurrounding(sector_t* sec);
+#define SDOORWAIT 35 * 3
+#define SWAITTICS 4
 
-int
-P_FindSectorFromLineTag
-( line_t*	line,
-  int		start );
+/* how many diff. types of anims */
 
-int
-P_FindMinSurroundingLight
-( sector_t*	sector,
-  int		max );
+#define MAXSLIDEDOORS 5
+#endif
 
-sector_t*
-getNextSector
-( line_t*	line,
-  sector_t*	sec );
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+/* P_LIGHTS */
 
-//
-// SPECIAL
-//
-int EV_DoDonut(line_t* line);
-
-
-
-//
-// P_LIGHTS
-//
 typedef struct
 {
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		count;
-    int		maxlight;
-    int		minlight;
-    
+  thinker_t thinker;
+  sector_t *sector;
+  int count;
+  int maxlight;
+  int minlight;
 } fireflicker_t;
 
-
-
 typedef struct
 {
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		count;
-    int		maxlight;
-    int		minlight;
-    int		maxtime;
-    int		mintime;
-    
+  thinker_t thinker;
+  sector_t *sector;
+  int count;
+  int maxlight;
+  int minlight;
+  int maxtime;
+  int mintime;
 } lightflash_t;
 
-
-
 typedef struct
 {
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		count;
-    int		minlight;
-    int		maxlight;
-    int		darktime;
-    int		brighttime;
-    
+  thinker_t thinker;
+  sector_t *sector;
+  int count;
+  int minlight;
+  int maxlight;
+  int darktime;
+  int brighttime;
 } strobe_t;
 
-
-
-
 typedef struct
 {
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		minlight;
-    int		maxlight;
-    int		direction;
-
+  thinker_t thinker;
+  sector_t *sector;
+  int minlight;
+  int maxlight;
+  int direction;
 } glow_t;
 
+/* P_SWITCH */
 
-#define GLOWSPEED			8
-#define STROBEBRIGHT		5
-#define FASTDARK			15
-#define SLOWDARK			35
-
-void    P_SpawnFireFlicker (sector_t* sector);
-void    T_LightFlash (lightflash_t* flash);
-void    P_SpawnLightFlash (sector_t* sector);
-void    T_StrobeFlash (strobe_t* flash);
-
-void
-P_SpawnStrobeFlash
-( sector_t*	sector,
-  int		fastOrSlow,
-  int		inSync );
-
-void    EV_StartLightStrobing(line_t* line);
-void    EV_TurnTagLightsOff(line_t* line);
-
-void
-EV_LightTurnOn
-( line_t*	line,
-  int		bright );
-
-void    T_Glow(glow_t* g);
-void    P_SpawnGlowingLight(sector_t* sector);
-
-
-
-
-//
-// P_SWITCH
-//
 typedef struct
 {
-    char	name1[9];
-    char	name2[9];
-    short	episode;
-    
+  char name1[9];
+  char name2[9];
+  short episode;
 } switchlist_t;
 
-
 typedef enum
 {
-    top,
-    middle,
-    bottom
-
+  top,
+  middle,
+  bottom
 } bwhere_e;
 
-
 typedef struct
 {
-    line_t*	line;
-    bwhere_e	where;
-    int		btexture;
-    int		btimer;
-    degenmobj_t *soundorg;
-
+  line_t *line;
+  bwhere_e where;
+  int btexture;
+  int btimer;
+  degenmobj_t *soundorg;
 } button_t;
 
+/* P_PLATS */
 
-
-
- // max # of wall switches in a level
-#define MAXSWITCHES		50
-
- // 4 players, 4 buttons each at once, max.
-#define MAXBUTTONS		16
-
- // 1 second, in ticks. 
-#define BUTTONTIME      35             
-
-extern button_t	buttonlist[MAXBUTTONS]; 
-
-void
-P_ChangeSwitchTexture
-( line_t*	line,
-  int		useAgain );
-
-void P_InitSwitchList(void);
-
-
-//
-// P_PLATS
-//
 typedef enum
 {
-    up,
-    down,
-    waiting,
-    in_stasis
-
+  up,
+  down,
+  waiting,
+  in_stasis
 } plat_e;
 
-
-
 typedef enum
 {
-    perpetualRaise,
-    downWaitUpStay,
-    raiseAndChange,
-    raiseToNearestAndChange,
-    blazeDWUS
-
+  PLAT_PERPETUALRAISE,
+  PLAT_DOWNWAITUPSTAY,
+  PLAT_RAISEANDCHANGE,
+  PLAT_RAISETONEARESTANDCHANGE,
+  PLAT_BLAZEDWUS
 } plattype_e;
 
-
-
 typedef struct
 {
-    thinker_t	thinker;
-    sector_t*	sector;
-    fixed_t	speed;
-    fixed_t	low;
-    fixed_t	high;
-    int		wait;
-    int		count;
-    plat_e	status;
-    plat_e	oldstatus;
-    boolean	crush;
-    int		tag;
-    plattype_e	type;
-    
+  thinker_t thinker;
+  sector_t *sector;
+  fixed_t speed;
+  fixed_t low;
+  fixed_t high;
+  int wait;
+  int count;
+  plat_e status;
+  plat_e oldstatus;
+  boolean crush;
+  int tag;
+  plattype_e type;
 } plat_t;
 
-
-
-#define PLATWAIT		3
-#define PLATSPEED		FRACUNIT
-#define MAXPLATS		30
-
-
-extern plat_t*	activeplats[MAXPLATS];
-
-void    T_PlatRaise(plat_t*	plat);
-
-int
-EV_DoPlat
-( line_t*	line,
-  plattype_e	type,
-  int		amount );
-
-void    P_AddActivePlat(plat_t* plat);
-void    P_RemoveActivePlat(plat_t* plat);
-void    EV_StopPlat(line_t* line);
-void    P_ActivateInStasis(int tag);
-
-
-//
-// P_DOORS
-//
-typedef enum
-{
-    vld_normal,
-    vld_close30ThenOpen,
-    vld_close,
-    vld_open,
-    vld_raiseIn5Mins,
-    vld_blazeRaise,
-    vld_blazeOpen,
-    vld_blazeClose
-
-} vldoor_e;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    vldoor_e	type;
-    sector_t*	sector;
-    fixed_t	topheight;
-    fixed_t	speed;
-
-    // 1 = up, 0 = waiting at top, -1 = down
-    int             direction;
-    
-    // tics to wait at the top
-    int             topwait;
-    // (keep in case a door going down is reset)
-    // when it reaches 0, start going down
-    int             topcountdown;
-    
-} vldoor_t;
-
-
-
-#define VDOORSPEED		FRACUNIT*2
-#define VDOORWAIT		150
-
-void
-EV_VerticalDoor
-( line_t*	line,
-  mobj_t*	thing );
-
-int
-EV_DoDoor
-( line_t*	line,
-  vldoor_e	type );
-
-int
-EV_DoLockedDoor
-( line_t*	line,
-  vldoor_e	type,
-  mobj_t*	thing );
-
-void    T_VerticalDoor (vldoor_t* door);
-void    P_SpawnDoorCloseIn30 (sector_t* sec);
-
-void
-P_SpawnDoorRaiseIn5Mins
-( sector_t*	sec,
-  int		secnum );
-
-
-
-#if 0 // UNUSED
-//
-//      Sliding doors...
-//
-typedef enum
-{
-    sd_opening,
-    sd_waiting,
-    sd_closing
-
-} sd_e;
-
-
+/* P_FLOOR */
 
 typedef enum
 {
-    sdt_openOnly,
-    sdt_closeOnly,
-    sdt_openAndClose
+  /* lower floor to highest surrounding floor */
 
-} sdt_e;
+  FLOOR_LOWERFLOOR,
 
+  /* lower floor to lowest surrounding floor */
 
+  FLOOR_LOWERFLOORTOLOWEST,
 
+  /* lower floor to highest surrounding floor VERY FAST */
 
-typedef struct
-{
-    thinker_t	thinker;
-    sdt_e	type;
-    line_t*	line;
-    int		frame;
-    int		whichDoorIndex;
-    int		timer;
-    sector_t*	frontsector;
-    sector_t*	backsector;
-    sd_e	 status;
+  FLOOR_TURBOLOWER,
 
-} slidedoor_t;
+  /* raise floor to lowest surrounding CEILING */
 
+  FLOOR_RAISEFLOOR,
 
+  /* raise floor to next highest surrounding floor */
 
-typedef struct
-{
-    char	frontFrame1[9];
-    char	frontFrame2[9];
-    char	frontFrame3[9];
-    char	frontFrame4[9];
-    char	backFrame1[9];
-    char	backFrame2[9];
-    char	backFrame3[9];
-    char	backFrame4[9];
-    
-} slidename_t;
+  FLOOR_RAISEFLOORTONEAREST,
 
+  /* raise floor to shortest height texture around it */
 
+  FLOOR_RAISETOTEXTURE,
 
-typedef struct
-{
-    int             frontFrames[4];
-    int             backFrames[4];
+  /* lower floor to lowest surrounding floor and change floorpic */
 
-} slideframe_t;
+  FLOOR_LOWERANDCHANGE,
 
+  FLOOR_RAISEFLOOR24,
+  FLOOR_RAISEFLOOR24ANDCHANGE,
+  FLOOR_RAISEFLOORCRUSH,
 
+  /* raise to next highest floor, turbo-speed */
 
-// how many frames of animation
-#define SNUMFRAMES		4
-
-#define SDOORWAIT		35*3
-#define SWAITTICS		4
-
-// how many diff. types of anims
-#define MAXSLIDEDOORS	5                            
-
-void P_InitSlidingDoorFrames(void);
-
-void
-EV_SlidingDoor
-( line_t*	line,
-  mobj_t*	thing );
-#endif
-
-
-
-//
-// P_CEILNG
-//
-typedef enum
-{
-    lowerToFloor,
-    raiseToHighest,
-    lowerAndCrush,
-    crushAndRaise,
-    fastCrushAndRaise,
-    silentCrushAndRaise
-
-} ceiling_e;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    ceiling_e	type;
-    sector_t*	sector;
-    fixed_t	bottomheight;
-    fixed_t	topheight;
-    fixed_t	speed;
-    boolean	crush;
-
-    // 1 = up, 0 = waiting, -1 = down
-    int		direction;
-
-    // ID
-    int		tag;                   
-    int		olddirection;
-    
-} ceiling_t;
-
-
-
-
-
-#define CEILSPEED		FRACUNIT
-#define CEILWAIT		150
-#define MAXCEILINGS		30
-
-extern ceiling_t*	activeceilings[MAXCEILINGS];
-
-int
-EV_DoCeiling
-( line_t*	line,
-  ceiling_e	type );
-
-void    T_MoveCeiling (ceiling_t* ceiling);
-void    P_AddActiveCeiling(ceiling_t* c);
-void    P_RemoveActiveCeiling(ceiling_t* c);
-int	EV_CeilingCrushStop(line_t* line);
-void    P_ActivateInStasisCeiling(line_t* line);
-
-
-//
-// P_FLOOR
-//
-typedef enum
-{
-    // lower floor to highest surrounding floor
-    lowerFloor,
-    
-    // lower floor to lowest surrounding floor
-    lowerFloorToLowest,
-    
-    // lower floor to highest surrounding floor VERY FAST
-    turboLower,
-    
-    // raise floor to lowest surrounding CEILING
-    raiseFloor,
-    
-    // raise floor to next highest surrounding floor
-    raiseFloorToNearest,
-
-    // raise floor to shortest height texture around it
-    raiseToTexture,
-    
-    // lower floor to lowest surrounding floor
-    //  and change floorpic
-    lowerAndChange,
-  
-    raiseFloor24,
-    raiseFloor24AndChange,
-    raiseFloorCrush,
-
-     // raise to next highest floor, turbo-speed
-    raiseFloorTurbo,       
-    donutRaise,
-    raiseFloor512
-    
+  FLOOR_RAISEFLOORTURBO,
+  FLOOR_DONUTRAISE,
+  FLOOR_RAISEFLOOR512
 } floor_e;
 
-
-
-
 typedef enum
 {
-    build8,	// slowly build by 8
-    turbo16	// quickly build by 16
-    
+  STAIR_BUILD8, /* slowly build by 8 */
+  STAIR_TURBO16 /* quickly build by 16 */
 } stair_e;
 
-
-
 typedef struct
 {
-    thinker_t	thinker;
-    floor_e	type;
-    boolean	crush;
-    sector_t*	sector;
-    int		direction;
-    int		newspecial;
-    short	texture;
-    fixed_t	floordestheight;
-    fixed_t	speed;
-
+  thinker_t thinker;
+  floor_e type;
+  boolean crush;
+  sector_t *sector;
+  int direction;
+  int newspecial;
+  short texture;
+  fixed_t floordestheight;
+  fixed_t speed;
 } floormove_t;
 
-
-
-#define FLOORSPEED		FRACUNIT
-
 typedef enum
 {
-    ok,
-    crushed,
-    pastdest
-    
+  ok,
+  crushed,
+  pastdest
 } result_e;
 
-result_e
-T_MovePlane
-( sector_t*	sector,
-  fixed_t	speed,
-  fixed_t	dest,
-  boolean	crush,
-  int		floorOrCeiling,
-  int		direction );
+typedef enum
+{
+  VLD_NORMAL,
+  VLD_CLOSE30THENOPEN,
+  VLD_CLOSE,
+  VLD_OPEN,
+  VLD_RAISEIN5MINS,
+  VLD_BLAZERAISE,
+  VLD_BLAZEOPEN,
+  VLD_BLAZECLOSE
+} vldoor_e;
 
-int
-EV_BuildStairs
-( line_t*	line,
-  stair_e	type );
+typedef struct
+{
+  thinker_t thinker;
+  vldoor_e type;
+  sector_t *sector;
+  fixed_t topheight;
+  fixed_t speed;
 
-int
-EV_DoFloor
-( line_t*	line,
-  floor_e	floortype );
+  /* 1 = up, 0 = waiting at top, -1 = down */
 
-void T_MoveFloor( floormove_t* floor);
+  int direction;
 
-//
-// P_TELEPT
-//
-int
-EV_Teleport
-( line_t*	line,
-  int		side,
-  mobj_t*	thing );
+  /* tics to wait at the top */
 
+  int topwait;
+
+  /* (keep in case a door going down is reset)
+   * when it reaches 0, start going down
+   */
+
+  int topcountdown;
+} vldoor_t;
+
+/* P_CEILNG */
+
+typedef enum
+{
+  CEIL_LOWERTOFLOOR,
+  CEIL_RAISETOHIGHEST,
+  CEIL_LOWERANDCRUSH,
+  CEIL_CRUSHANDRAISE,
+  CEIL_FASTCRUSHANDRAISE,
+  CEIL_SILENTCRUSHANDRAISE
+} ceiling_e;
+
+typedef struct
+{
+  thinker_t thinker;
+  ceiling_e type;
+  sector_t *sector;
+  fixed_t bottomheight;
+  fixed_t topheight;
+  fixed_t speed;
+  boolean crush;
+
+  /* 1 = up, 0 = waiting, -1 = down */
+
+  int direction;
+
+  /* ID */
+
+  int tag;
+  int olddirection;
+} ceiling_t;
+
+#if 0 /* UNUSED */
+
+/* Sliding doors... */
+
+typedef enum
+{
+  sd_opening,
+  sd_waiting,
+  sd_closing
+} sd_e;
+
+typedef enum
+{
+  SDT_OPENONLY,
+  SDT_CLOSEONLY,
+  SDT_OPENANDCLOSE
+} sdt_e;
+
+typedef struct
+{
+  thinker_t thinker;
+  sdt_e type;
+  line_t *line;
+  int frame;
+  int which_door_index;
+  int timer;
+  sector_t *frontsector;
+  sector_t *backsector;
+  sd_e status;
+} slidedoor_t;
+
+typedef struct
+{
+  char front_frame1[9];
+  char front_frame2[9];
+  char front_frame3[9];
+  char front_frame4[9];
+  char back_frame1[9];
+  char back_frame2[9];
+  char back_frame3[9];
+  char back_frame4[9];
+} slidename_t;
+
+typedef struct
+{
+  int front_frames[4];
+  int back_frames[4];
+} slideframe_t;
 #endif
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* End-level timer (-TIMER option) */
+
+extern button_t buttonlist[MAXBUTTONS];
+
+extern plat_t *activeplats[MAXPLATS];
+
+extern ceiling_t *activeceilings[MAXCEILINGS];
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* at game start */
+
+void p_init_pic_anims(void);
+
+/* at map load */
+
+void p_spawn_specials(void);
+
+/* every tic */
+
+void p_update_specials(void);
+
+/* when needed */
+
+boolean p_use_special_line(mobj_t *thing, line_t *line, int side);
+
+void p_shoot_special_line(mobj_t *thing, line_t *line);
+
+void p_cross_special_line(int linenum, int side, mobj_t *thing);
+
+void p_player_in_special_sector(player_t *player);
+
+int two_sided(int sector, int line);
+
+sector_t *get_sector(int current_sector, int line, int side);
+
+side_t *get_side(int current_sector, int line, int side);
+
+fixed_t p_find_lowest_floor_surrounding(sector_t *sec);
+fixed_t p_find_highest_floor_surrounding(sector_t *sec);
+
+fixed_t p_find_next_highest_floor(sector_t *sec, int currentheight);
+
+fixed_t p_find_lowest_ceiling_surrounding(sector_t *sec);
+fixed_t p_find_heighest_ceiling_surrounding(sector_t *sec);
+
+int p_find_sector_from_line_tag(line_t *line, int start);
+
+int p_find_min_surrounding(sector_t *sector, int max);
+
+sector_t *get_next_sector(line_t *line, sector_t *sec);
+
+/* SPECIAL */
+
+int ev_do_donut(line_t *line);
+
+void p_spawn_fire_flicker(sector_t *sector);
+void t_light_flash(lightflash_t *flash);
+void p_spawn_light_flash(sector_t *sector);
+void t_strobe_flash(strobe_t *flash);
+
+void p_spawn_strobe_flash(sector_t *sector, int fast_or_slow, int in_sync);
+
+void ev_start_light_strobing(line_t *line);
+void ev_turn_tag_lights_off(line_t *line);
+
+void ev_light_turn_on(line_t *line, int bright);
+
+void t_glow(glow_t *g);
+void p_spawn_glowing_light(sector_t *sector);
+
+void p_change_switch_texture(line_t *line, int use_again);
+
+void p_init_switch_list(void);
+
+void t_plat_raise(plat_t *plat);
+
+int ev_do_plat(line_t *line, plattype_e type, int amount);
+
+void p_add_active_plat(plat_t *plat);
+void p_remove_active_plat(plat_t *plat);
+void ev_stop_plat(line_t *line);
+void p_activate_in_stasis(int tag);
+
+/* P_DOORS */
+
+void ev_vertical_door(line_t *line, mobj_t *thing);
+
+int ev_do_door(line_t *line, vldoor_e type);
+
+int ev_do_locked_door(line_t *line, vldoor_e type, mobj_t *thing);
+
+void t_vertical_door(vldoor_t *door);
+void p_spawn_door_close_in30(sector_t *sec);
+
+void p_spawn_door_raise_in_5min(sector_t *sec, int secnum);
+
+int ev_do_ceiling(line_t *line, ceiling_e type);
+
+void t_move_ceiling(ceiling_t *ceiling);
+void p_add_active_ceiling(ceiling_t *c);
+void p_remove_active_ceiling(ceiling_t *c);
+int ev_ceiling_crush_stop(line_t *line);
+void p_activate_in_stasis_ceiling(line_t *line);
+
+result_e t_move_plane(sector_t *sector, fixed_t speed, fixed_t dest,
+                     boolean crush, int floor_or_ceiling, int direction);
+
+int ev_build_stairs(line_t *line, stair_e type);
+
+int ev_do_floor(line_t *line, floor_e floortype);
+
+void t_move_floor(floormove_t *floor);
+
+/* P_TELEPT */
+
+int ev_teleport(line_t *line, int side, mobj_t *thing);
+
+#if 0 /* UNUSED */
+void p_init_sliding_door_frames(void);
+
+void ev_sliding_door(line_t *line, mobj_t *thing);
+#endif
+
+#endif /* __P_SPEC__ */
diff --git a/games/NXDoom/src/doom/p_switch.c b/games/NXDoom/src/doom/p_switch.c
index b9ef2195a..27640d5ec 100644
--- a/games/NXDoom/src/doom/p_switch.c
+++ b/games/NXDoom/src/doom/p_switch.c
@@ -1,641 +1,596 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:
-//	Switches, buttons. Two-state animation. Exits.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_switch.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * DESCRIPTION:
+ *  Switches, buttons. Two-state animation. Exits.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
-#include "i_system.h"
 #include "deh_main.h"
 #include "doomdef.h"
+#include "i_system.h"
 #include "p_local.h"
 
 #include "g_game.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
-
-// Data.
 #include "sounds.h"
+#endif
+
+/* State. */
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-//
-// CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
-//
-switchlist_t alphSwitchList[] =
+/* CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE */
+
+static switchlist_t g_alph_switch_list[] =
 {
-    // Doom shareware episode 1 switches
-    {"SW1BRCOM",	"SW2BRCOM",	1},
-    {"SW1BRN1",	"SW2BRN1",	1},
-    {"SW1BRN2",	"SW2BRN2",	1},
-    {"SW1BRNGN",	"SW2BRNGN",	1},
-    {"SW1BROWN",	"SW2BROWN",	1},
-    {"SW1COMM",	"SW2COMM",	1},
-    {"SW1COMP",	"SW2COMP",	1},
-    {"SW1DIRT",	"SW2DIRT",	1},
-    {"SW1EXIT",	"SW2EXIT",	1},
-    {"SW1GRAY",	"SW2GRAY",	1},
-    {"SW1GRAY1",	"SW2GRAY1",	1},
-    {"SW1METAL",	"SW2METAL",	1},
-    {"SW1PIPE",	"SW2PIPE",	1},
-    {"SW1SLAD",	"SW2SLAD",	1},
-    {"SW1STARG",	"SW2STARG",	1},
-    {"SW1STON1",	"SW2STON1",	1},
-    {"SW1STON2",	"SW2STON2",	1},
-    {"SW1STONE",	"SW2STONE",	1},
-    {"SW1STRTN",	"SW2STRTN",	1},
-
-    // Doom registered episodes 2&3 switches
-    {"SW1BLUE",	"SW2BLUE",	2},
-    {"SW1CMT",		"SW2CMT",	2},
-    {"SW1GARG",	"SW2GARG",	2},
-    {"SW1GSTON",	"SW2GSTON",	2},
-    {"SW1HOT",		"SW2HOT",	2},
-    {"SW1LION",	"SW2LION",	2},
-    {"SW1SATYR",	"SW2SATYR",	2},
-    {"SW1SKIN",	"SW2SKIN",	2},
-    {"SW1VINE",	"SW2VINE",	2},
-    {"SW1WOOD",	"SW2WOOD",	2},
-
-    // Doom II switches
-    {"SW1PANEL",	"SW2PANEL",	3},
-    {"SW1ROCK",	"SW2ROCK",	3},
-    {"SW1MET2",	"SW2MET2",	3},
-    {"SW1WDMET",	"SW2WDMET",	3},
-    {"SW1BRIK",	"SW2BRIK",	3},
-    {"SW1MOD1",	"SW2MOD1",	3},
-    {"SW1ZIM",		"SW2ZIM",	3},
-    {"SW1STON6",	"SW2STON6",	3},
-    {"SW1TEK",		"SW2TEK",	3},
-    {"SW1MARB",	"SW2MARB",	3},
-    {"SW1SKULL",	"SW2SKULL",	3},
+  {"SW1BRCOM", "SW2BRCOM", 1}, /* Doom shareware episode 1 switches */
+  {"SW1BRN1", "SW2BRN1", 1},
+  {"SW1BRN2", "SW2BRN2", 1},
+  {"SW1BRNGN", "SW2BRNGN", 1},
+  {"SW1BROWN", "SW2BROWN", 1},
+  {"SW1COMM", "SW2COMM", 1},
+  {"SW1COMP", "SW2COMP", 1},
+  {"SW1DIRT", "SW2DIRT", 1},
+  {"SW1EXIT", "SW2EXIT", 1},
+  {"SW1GRAY", "SW2GRAY", 1},
+  {"SW1GRAY1", "SW2GRAY1", 1},
+  {"SW1METAL", "SW2METAL", 1},
+  {"SW1PIPE", "SW2PIPE", 1},
+  {"SW1SLAD", "SW2SLAD", 1},
+  {"SW1STARG", "SW2STARG", 1},
+  {"SW1STON1", "SW2STON1", 1},
+  {"SW1STON2", "SW2STON2", 1},
+  {"SW1STONE", "SW2STONE", 1},
+  {"SW1STRTN", "SW2STRTN", 1},
+  {"SW1BLUE", "SW2BLUE", 2}, /* Doom registered episodes 2 & 3 switches */
+  {"SW1CMT", "SW2CMT", 2},
+  {"SW1GARG", "SW2GARG", 2},
+  {"SW1GSTON", "SW2GSTON", 2},
+  {"SW1HOT", "SW2HOT", 2},
+  {"SW1LION", "SW2LION", 2},
+  {"SW1SATYR", "SW2SATYR", 2},
+  {"SW1SKIN", "SW2SKIN", 2},
+  {"SW1VINE", "SW2VINE", 2},
+  {"SW1WOOD", "SW2WOOD", 2},
+  {"SW1PANEL", "SW2PANEL", 3}, /* Doom II switches */
+  {"SW1ROCK", "SW2ROCK", 3},
+  {"SW1MET2", "SW2MET2", 3},
+  {"SW1WDMET", "SW2WDMET", 3},
+  {"SW1BRIK", "SW2BRIK", 3},
+  {"SW1MOD1", "SW2MOD1", 3},
+  {"SW1ZIM", "SW2ZIM", 3},
+  {"SW1STON6", "SW2STON6", 3},
+  {"SW1TEK", "SW2TEK", 3},
+  {"SW1MARB", "SW2MARB", 3},
+  {"SW1SKULL", "SW2SKULL", 3},
 };
 
-int		switchlist[MAXSWITCHES * 2];
-int		numswitches;
-button_t        buttonlist[MAXBUTTONS];
+static int g_numswitches;
 
-//
-// P_InitSwitchList
-// Only called at game initialization.
-//
-void P_InitSwitchList(void)
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+int switchlist[MAXSWITCHES * 2];
+button_t buttonlist[MAXBUTTONS];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Start a button counting down till it turns off. */
+
+static void p_start_button(line_t *line, bwhere_e w, int texture, int time)
 {
-    int i, slindex, episode;
+  int i;
 
-    // Note that this is called "episode" here but it's actually something
-    // quite different. As we progress from Shareware->Registered->Doom II
-    // we support more switch textures.
-    switch (gamemode)
+  /* See if button is already pressed */
+
+  for (i = 0; i < MAXBUTTONS; i++)
     {
-        case registered:
-        case retail:
-            episode = 2;
-            break;
-        case commercial:
-            episode = 3;
-            break;
+      if (buttonlist[i].btimer && buttonlist[i].line == line)
+        {
+          return;
+        }
+    }
+
+  for (i = 0; i < MAXBUTTONS; i++)
+    {
+      if (!buttonlist[i].btimer)
+        {
+          buttonlist[i].line = line;
+          buttonlist[i].where = w;
+          buttonlist[i].btexture = texture;
+          buttonlist[i].btimer = time;
+          buttonlist[i].soundorg = &line->frontsector->soundorg;
+          return;
+        }
+    }
+
+  i_error("P_StartButton: no button slots left!");
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* p_init_switch_list
+ * Only called at game initialization.
+ */
+
+void p_init_switch_list(void)
+{
+  int i;
+  int slindex;
+  int episode;
+
+  /* Note that this is called "episode" here but it's actually something
+   * quite different. As we progress from Shareware->Registered->Doom II
+   * we support more switch textures.
+   */
+
+  switch (gamemode)
+    {
+    case registered:
+    case retail:
+      episode = 2;
+      break;
+    case commercial:
+      episode = 3;
+      break;
+    default:
+      episode = 1;
+      break;
+    }
+
+  slindex = 0;
+
+  for (i = 0; i < arrlen(g_alph_switch_list); i++)
+    {
+      if (g_alph_switch_list[i].episode <= episode)
+        {
+          switchlist[slindex++] =
+              r_texture_num_for_name((g_alph_switch_list[i].name1));
+          switchlist[slindex++] =
+              r_texture_num_for_name((g_alph_switch_list[i].name2));
+        }
+    }
+
+  g_numswitches = slindex / 2;
+  switchlist[slindex] = -1;
+}
+
+/* Function that changes wall texture.
+ * Tell it if switch is ok to use again (1=yes, it's a button).
+ */
+
+void p_change_switch_texture(line_t *line, int use_again)
+{
+  int tex_top;
+  int tex_mid;
+  int tex_bot;
+  int i;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  int sound;
+#endif
+
+  if (!use_again) line->special = 0;
+
+  tex_top = sides[line->sidenum[0]].toptexture;
+  tex_mid = sides[line->sidenum[0]].midtexture;
+  tex_bot = sides[line->sidenum[0]].bottomtexture;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+  sound = SFX_SWTCHN;
+
+  /* EXIT SWITCH? */
+
+  if (line->special == 11) sound = SFX_SWTCHX;
+#endif
+
+  for (i = 0; i < g_numswitches * 2; i++)
+    {
+      if (switchlist[i] == tex_top)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(buttonlist->soundorg, sound);
+#endif
+          sides[line->sidenum[0]].toptexture = switchlist[i ^ 1];
+
+          if (use_again)
+            {
+              p_start_button(line, top, switchlist[i], BUTTONTIME);
+            }
+
+          return;
+        }
+      else
+        {
+          if (switchlist[i] == tex_mid)
+            {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(buttonlist->soundorg, sound);
+#endif
+              sides[line->sidenum[0]].midtexture = switchlist[i ^ 1];
+
+              if (use_again)
+                p_start_button(line, middle, switchlist[i], BUTTONTIME);
+
+              return;
+            }
+          else
+            {
+              if (switchlist[i] == tex_bot)
+                {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                  s_start_sound(buttonlist->soundorg, sound);
+#endif
+                  sides[line->sidenum[0]].bottomtexture = switchlist[i ^ 1];
+
+                  if (use_again)
+                    p_start_button(line, bottom, switchlist[i], BUTTONTIME);
+
+                  return;
+                }
+            }
+        }
+    }
+}
+
+/* p_use_special_line
+ * Called when a thing uses a special line.
+ * Only the front sides of lines are usable.
+ */
+
+boolean p_use_special_line(mobj_t *thing, line_t *line, int side)
+{
+  /* Err...
+   * Use the back sides of VERY SPECIAL lines...
+   */
+
+  if (side)
+    {
+      switch (line->special)
+        {
+        case 124:
+
+          /* Sliding door open & close
+           * UNUSED?
+           */
+
+          break;
+
         default:
-            episode = 1;
-            break;
+          return false;
+          break;
+        }
     }
 
-    slindex = 0;
+  /* Switches that other things can activate. */
 
-    for (i = 0; i < arrlen(alphSwitchList); i++)
+  if (!thing->player)
     {
-	if (alphSwitchList[i].episode <= episode)
-	{
-	    switchlist[slindex++] =
-                R_TextureNumForName(DEH_String(alphSwitchList[i].name1));
-	    switchlist[slindex++] =
-                R_TextureNumForName(DEH_String(alphSwitchList[i].name2));
-	}
+      /* never open secret doors */
+
+      if (line->flags & ML_SECRET) return false;
+
+      switch (line->special)
+        {
+        case 1:  /* MANUAL DOOR RAISE */
+        case 32: /* MANUAL BLUE */
+        case 33: /* MANUAL RED */
+        case 34: /* MANUAL YELLOW */
+          break;
+
+        default:
+          return false;
+          break;
+        }
     }
 
-    numswitches = slindex / 2;
-    switchlist[slindex] = -1;
+  /* do something */
+
+  switch (line->special)
+    {
+      /* MANUALS */
+
+    case 1:  /* Vertical Door */
+    case 26: /* Blue Door/Locked */
+    case 27: /* Yellow Door /Locked */
+    case 28: /* Red Door /Locked */
+
+    case 31: /* Manual door open */
+    case 32: /* Blue locked door open */
+    case 33: /* Red locked door open */
+    case 34: /* Yellow locked door open */
+
+    case 117: /* Blazing door raise */
+    case 118: /* Blazing door open */
+      ev_vertical_door(line, thing);
+      break;
+
+      /* UNUSED - Door Slide Open&Close
+       *  case 124:
+       *  ev_sliding_door (line, thing);
+       *  break;
+       */
+
+      /* SWITCHES */
+
+    case 7: /* Build Stairs */
+      if (ev_build_stairs(line, STAIR_BUILD8))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 9: /* Change Donut */
+      if (ev_do_donut(line)) p_change_switch_texture(line, 0);
+      break;
+
+    case 11: /* Exit level */
+      p_change_switch_texture(line, 0);
+      g_exit_level();
+      break;
+
+    case 14: /* Raise Floor 32 and change texture */
+      if (ev_do_plat(line, PLAT_RAISEANDCHANGE, 32))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 15: /* Raise Floor 24 and change texture */
+      if (ev_do_plat(line, PLAT_RAISEANDCHANGE, 24))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 18: /* Raise Floor to next highest floor */
+      if (ev_do_floor(line, FLOOR_RAISEFLOORTONEAREST))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 20: /* Raise Plat next highest floor and change texture */
+      if (ev_do_plat(line, PLAT_RAISETONEARESTANDCHANGE, 0))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 21: /* PlatDownWaitUpStay */
+      if (ev_do_plat(line, PLAT_DOWNWAITUPSTAY, 0))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 23: /* Lower Floor to Lowest */
+      if (ev_do_floor(line, FLOOR_LOWERFLOORTOLOWEST))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 29: /* Raise Door */
+      if (ev_do_door(line, VLD_NORMAL)) p_change_switch_texture(line, 0);
+      break;
+
+    case 41: /* Lower Ceiling to Floor */
+      if (ev_do_ceiling(line, CEIL_LOWERTOFLOOR))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 71: /* Turbo Lower Floor */
+      if (ev_do_floor(line, FLOOR_TURBOLOWER))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 49: /* Ceiling Crush And Raise */
+      if (ev_do_ceiling(line, CEIL_CRUSHANDRAISE))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 50: /* Close Door */
+      if (ev_do_door(line, VLD_CLOSE)) p_change_switch_texture(line, 0);
+      break;
+
+    case 51: /* Secret EXIT */
+      p_change_switch_texture(line, 0);
+      g_secret_exit_level();
+      break;
+
+    case 55: /* Raise Floor Crush */
+      if (ev_do_floor(line, FLOOR_RAISEFLOORCRUSH))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 101: /* Raise Floor */
+      if (ev_do_floor(line, FLOOR_RAISEFLOOR))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 102: /* Lower Floor to Surrounding floor height */
+      if (ev_do_floor(line, FLOOR_LOWERFLOOR))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 103: /* Open Door */
+      if (ev_do_door(line, VLD_OPEN)) p_change_switch_texture(line, 0);
+      break;
+
+    case 111: /* Blazing Door Raise (faster than TURBO!) */
+      if (ev_do_door(line, VLD_BLAZERAISE)) p_change_switch_texture(line, 0);
+      break;
+
+    case 112: /* Blazing Door Open (faster than TURBO!) */
+      if (ev_do_door(line, VLD_BLAZEOPEN)) p_change_switch_texture(line, 0);
+      break;
+
+    case 113: /* Blazing Door Close (faster than TURBO!) */
+      if (ev_do_door(line, VLD_BLAZECLOSE)) p_change_switch_texture(line, 0);
+      break;
+
+    case 122: /* Blazing PlatDownWaitUpStay */
+      if (ev_do_plat(line, PLAT_BLAZEDWUS, 0))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 127: /* Build Stairs Turbo 16 */
+      if (ev_build_stairs(line, STAIR_TURBO16))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 131: /* Raise Floor Turbo */
+      if (ev_do_floor(line, FLOOR_RAISEFLOORTURBO))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 133: /* BlzOpenDoor BLUE */
+    case 135: /* BlzOpenDoor RED */
+    case 137: /* BlzOpenDoor YELLOW */
+      if (ev_do_locked_door(line, VLD_BLAZEOPEN, thing))
+        p_change_switch_texture(line, 0);
+      break;
+
+    case 140: /* Raise Floor 512 */
+      if (ev_do_floor(line, FLOOR_RAISEFLOOR512))
+        p_change_switch_texture(line, 0);
+      break;
+
+      /* BUTTONS */
+
+    case 42: /* Close Door */
+      if (ev_do_door(line, VLD_CLOSE)) p_change_switch_texture(line, 1);
+      break;
+
+    case 43: /* Lower Ceiling to Floor */
+      if (ev_do_ceiling(line, CEIL_LOWERTOFLOOR))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 45: /* Lower Floor to Surrounding floor height */
+      if (ev_do_floor(line, FLOOR_LOWERFLOOR))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 60: /* Lower Floor to Lowest */
+      if (ev_do_floor(line, FLOOR_LOWERFLOORTOLOWEST))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 61: /* Open Door */
+      if (ev_do_door(line, VLD_OPEN)) p_change_switch_texture(line, 1);
+      break;
+
+    case 62: /* PlatDownWaitUpStay */
+      if (ev_do_plat(line, PLAT_DOWNWAITUPSTAY, 1))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 63: /* Raise Door */
+      if (ev_do_door(line, VLD_NORMAL)) p_change_switch_texture(line, 1);
+      break;
+
+    case 64: /* Raise Floor to ceiling */
+      if (ev_do_floor(line, FLOOR_RAISEFLOOR))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 66: /* Raise Floor 24 and change texture */
+      if (ev_do_plat(line, PLAT_RAISEANDCHANGE, 24))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 67: /* Raise Floor 32 and change texture */
+      if (ev_do_plat(line, PLAT_RAISEANDCHANGE, 32))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 65: /* Raise Floor Crush */
+      if (ev_do_floor(line, FLOOR_RAISEFLOORCRUSH))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 68: /* Raise Plat to next highest floor and change texture */
+      if (ev_do_plat(line, PLAT_RAISETONEARESTANDCHANGE, 0))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 69: /* Raise Floor to next highest floor */
+      if (ev_do_floor(line, FLOOR_RAISEFLOORTONEAREST))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 70: /* Turbo Lower Floor */
+      if (ev_do_floor(line, FLOOR_TURBOLOWER))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 114: /* Blazing Door Raise (faster than TURBO!) */
+      if (ev_do_door(line, VLD_BLAZERAISE)) p_change_switch_texture(line, 1);
+      break;
+
+    case 115: /* Blazing Door Open (faster than TURBO!) */
+      if (ev_do_door(line, VLD_BLAZEOPEN)) p_change_switch_texture(line, 1);
+      break;
+
+    case 116: /* Blazing Door Close (faster than TURBO!) */
+      if (ev_do_door(line, VLD_BLAZECLOSE)) p_change_switch_texture(line, 1);
+      break;
+
+    case 123: /* Blazing PlatDownWaitUpStay */
+      if (ev_do_plat(line, PLAT_BLAZEDWUS, 0))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 132: /* Raise Floor Turbo */
+      if (ev_do_floor(line, FLOOR_RAISEFLOORTURBO))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 99:  /* BlzOpenDoor BLUE */
+    case 134: /* BlzOpenDoor RED */
+    case 136: /* BlzOpenDoor YELLOW */
+      if (ev_do_locked_door(line, VLD_BLAZEOPEN, thing))
+        p_change_switch_texture(line, 1);
+      break;
+
+    case 138:
+
+      /* Light Turn On */
+
+      ev_light_turn_on(line, 255);
+      p_change_switch_texture(line, 1);
+      break;
+
+    case 139:
+
+      /* Light Turn Off */
+
+      ev_light_turn_on(line, 35);
+      p_change_switch_texture(line, 1);
+      break;
+    }
+
+  return true;
 }
-
-
-//
-// Start a button counting down till it turns off.
-//
-void
-P_StartButton
-( line_t*	line,
-  bwhere_e	w,
-  int		texture,
-  int		time )
-{
-    int		i;
-    
-    // See if button is already pressed
-    for (i = 0;i < MAXBUTTONS;i++)
-    {
-	if (buttonlist[i].btimer
-	    && buttonlist[i].line == line)
-	{
-	    
-	    return;
-	}
-    }
-    
-
-    
-    for (i = 0;i < MAXBUTTONS;i++)
-    {
-	if (!buttonlist[i].btimer)
-	{
-	    buttonlist[i].line = line;
-	    buttonlist[i].where = w;
-	    buttonlist[i].btexture = texture;
-	    buttonlist[i].btimer = time;
-	    buttonlist[i].soundorg = &line->frontsector->soundorg;
-	    return;
-	}
-    }
-    
-    I_Error("P_StartButton: no button slots left!");
-}
-
-
-
-
-
-//
-// Function that changes wall texture.
-// Tell it if switch is ok to use again (1=yes, it's a button).
-//
-void
-P_ChangeSwitchTexture
-( line_t*	line,
-  int 		useAgain )
-{
-    int     texTop;
-    int     texMid;
-    int     texBot;
-    int     i;
-    int     sound;
-	
-    if (!useAgain)
-	line->special = 0;
-
-    texTop = sides[line->sidenum[0]].toptexture;
-    texMid = sides[line->sidenum[0]].midtexture;
-    texBot = sides[line->sidenum[0]].bottomtexture;
-	
-    sound = sfx_swtchn;
-
-    // EXIT SWITCH?
-    if (line->special == 11)                
-	sound = sfx_swtchx;
-	
-    for (i = 0;i < numswitches*2;i++)
-    {
-	if (switchlist[i] == texTop)
-	{
-	    S_StartSound(buttonlist->soundorg,sound);
-	    sides[line->sidenum[0]].toptexture = switchlist[i^1];
-
-	    if (useAgain)
-		P_StartButton(line,top,switchlist[i],BUTTONTIME);
-
-	    return;
-	}
-	else
-	{
-	    if (switchlist[i] == texMid)
-	    {
-		S_StartSound(buttonlist->soundorg,sound);
-		sides[line->sidenum[0]].midtexture = switchlist[i^1];
-
-		if (useAgain)
-		    P_StartButton(line, middle,switchlist[i],BUTTONTIME);
-
-		return;
-	    }
-	    else
-	    {
-		if (switchlist[i] == texBot)
-		{
-		    S_StartSound(buttonlist->soundorg,sound);
-		    sides[line->sidenum[0]].bottomtexture = switchlist[i^1];
-
-		    if (useAgain)
-			P_StartButton(line, bottom,switchlist[i],BUTTONTIME);
-
-		    return;
-		}
-	    }
-	}
-    }
-}
-
-
-
-
-
-
-//
-// P_UseSpecialLine
-// Called when a thing uses a special line.
-// Only the front sides of lines are usable.
-//
-boolean
-P_UseSpecialLine
-( mobj_t*	thing,
-  line_t*	line,
-  int		side )
-{               
-
-    // Err...
-    // Use the back sides of VERY SPECIAL lines...
-    if (side)
-    {
-	switch(line->special)
-	{
-	  case 124:
-	    // Sliding door open&close
-	    // UNUSED?
-	    break;
-
-	  default:
-	    return false;
-	    break;
-	}
-    }
-
-    
-    // Switches that other things can activate.
-    if (!thing->player)
-    {
-	// never open secret doors
-	if (line->flags & ML_SECRET)
-	    return false;
-	
-	switch(line->special)
-	{
-	  case 1: 	// MANUAL DOOR RAISE
-	  case 32:	// MANUAL BLUE
-	  case 33:	// MANUAL RED
-	  case 34:	// MANUAL YELLOW
-	    break;
-	    
-	  default:
-	    return false;
-	    break;
-	}
-    }
-
-    
-    // do something  
-    switch (line->special)
-    {
-	// MANUALS
-      case 1:		// Vertical Door
-      case 26:		// Blue Door/Locked
-      case 27:		// Yellow Door /Locked
-      case 28:		// Red Door /Locked
-
-      case 31:		// Manual door open
-      case 32:		// Blue locked door open
-      case 33:		// Red locked door open
-      case 34:		// Yellow locked door open
-
-      case 117:		// Blazing door raise
-      case 118:		// Blazing door open
-	EV_VerticalDoor (line, thing);
-	break;
-	
-	//UNUSED - Door Slide Open&Close
-	// case 124:
-	// EV_SlidingDoor (line, thing);
-	// break;
-
-	// SWITCHES
-      case 7:
-	// Build Stairs
-	if (EV_BuildStairs(line,build8))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-
-      case 9:
-	// Change Donut
-	if (EV_DoDonut(line))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 11:
-	// Exit level
-	P_ChangeSwitchTexture(line,0);
-	G_ExitLevel ();
-	break;
-	
-      case 14:
-	// Raise Floor 32 and change texture
-	if (EV_DoPlat(line,raiseAndChange,32))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 15:
-	// Raise Floor 24 and change texture
-	if (EV_DoPlat(line,raiseAndChange,24))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 18:
-	// Raise Floor to next highest floor
-	if (EV_DoFloor(line, raiseFloorToNearest))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 20:
-	// Raise Plat next highest floor and change texture
-	if (EV_DoPlat(line,raiseToNearestAndChange,0))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 21:
-	// PlatDownWaitUpStay
-	if (EV_DoPlat(line,downWaitUpStay,0))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 23:
-	// Lower Floor to Lowest
-	if (EV_DoFloor(line,lowerFloorToLowest))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 29:
-	// Raise Door
-	if (EV_DoDoor(line,vld_normal))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 41:
-	// Lower Ceiling to Floor
-	if (EV_DoCeiling(line,lowerToFloor))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 71:
-	// Turbo Lower Floor
-	if (EV_DoFloor(line,turboLower))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 49:
-	// Ceiling Crush And Raise
-	if (EV_DoCeiling(line,crushAndRaise))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 50:
-	// Close Door
-	if (EV_DoDoor(line,vld_close))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 51:
-	// Secret EXIT
-	P_ChangeSwitchTexture(line,0);
-	G_SecretExitLevel ();
-	break;
-	
-      case 55:
-	// Raise Floor Crush
-	if (EV_DoFloor(line,raiseFloorCrush))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 101:
-	// Raise Floor
-	if (EV_DoFloor(line,raiseFloor))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 102:
-	// Lower Floor to Surrounding floor height
-	if (EV_DoFloor(line,lowerFloor))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 103:
-	// Open Door
-	if (EV_DoDoor(line,vld_open))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 111:
-	// Blazing Door Raise (faster than TURBO!)
-	if (EV_DoDoor (line,vld_blazeRaise))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 112:
-	// Blazing Door Open (faster than TURBO!)
-	if (EV_DoDoor (line,vld_blazeOpen))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 113:
-	// Blazing Door Close (faster than TURBO!)
-	if (EV_DoDoor (line,vld_blazeClose))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 122:
-	// Blazing PlatDownWaitUpStay
-	if (EV_DoPlat(line,blazeDWUS,0))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 127:
-	// Build Stairs Turbo 16
-	if (EV_BuildStairs(line,turbo16))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 131:
-	// Raise Floor Turbo
-	if (EV_DoFloor(line,raiseFloorTurbo))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 133:
-	// BlzOpenDoor BLUE
-      case 135:
-	// BlzOpenDoor RED
-      case 137:
-	// BlzOpenDoor YELLOW
-	if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-      case 140:
-	// Raise Floor 512
-	if (EV_DoFloor(line,raiseFloor512))
-	    P_ChangeSwitchTexture(line,0);
-	break;
-	
-	// BUTTONS
-      case 42:
-	// Close Door
-	if (EV_DoDoor(line,vld_close))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 43:
-	// Lower Ceiling to Floor
-	if (EV_DoCeiling(line,lowerToFloor))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 45:
-	// Lower Floor to Surrounding floor height
-	if (EV_DoFloor(line,lowerFloor))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 60:
-	// Lower Floor to Lowest
-	if (EV_DoFloor(line,lowerFloorToLowest))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 61:
-	// Open Door
-	if (EV_DoDoor(line,vld_open))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 62:
-	// PlatDownWaitUpStay
-	if (EV_DoPlat(line,downWaitUpStay,1))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 63:
-	// Raise Door
-	if (EV_DoDoor(line,vld_normal))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 64:
-	// Raise Floor to ceiling
-	if (EV_DoFloor(line,raiseFloor))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 66:
-	// Raise Floor 24 and change texture
-	if (EV_DoPlat(line,raiseAndChange,24))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 67:
-	// Raise Floor 32 and change texture
-	if (EV_DoPlat(line,raiseAndChange,32))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 65:
-	// Raise Floor Crush
-	if (EV_DoFloor(line,raiseFloorCrush))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 68:
-	// Raise Plat to next highest floor and change texture
-	if (EV_DoPlat(line,raiseToNearestAndChange,0))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 69:
-	// Raise Floor to next highest floor
-	if (EV_DoFloor(line, raiseFloorToNearest))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 70:
-	// Turbo Lower Floor
-	if (EV_DoFloor(line,turboLower))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 114:
-	// Blazing Door Raise (faster than TURBO!)
-	if (EV_DoDoor (line,vld_blazeRaise))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 115:
-	// Blazing Door Open (faster than TURBO!)
-	if (EV_DoDoor (line,vld_blazeOpen))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 116:
-	// Blazing Door Close (faster than TURBO!)
-	if (EV_DoDoor (line,vld_blazeClose))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 123:
-	// Blazing PlatDownWaitUpStay
-	if (EV_DoPlat(line,blazeDWUS,0))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 132:
-	// Raise Floor Turbo
-	if (EV_DoFloor(line,raiseFloorTurbo))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 99:
-	// BlzOpenDoor BLUE
-      case 134:
-	// BlzOpenDoor RED
-      case 136:
-	// BlzOpenDoor YELLOW
-	if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
-	    P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 138:
-	// Light Turn On
-	EV_LightTurnOn(line,255);
-	P_ChangeSwitchTexture(line,1);
-	break;
-	
-      case 139:
-	// Light Turn Off
-	EV_LightTurnOn(line,35);
-	P_ChangeSwitchTexture(line,1);
-	break;
-			
-    }
-	
-    return true;
-}
-
diff --git a/games/NXDoom/src/doom/p_telept.c b/games/NXDoom/src/doom/p_telept.c
index 8e2d5e16c..3986a0543 100644
--- a/games/NXDoom/src/doom/p_telept.c
+++ b/games/NXDoom/src/doom/p_telept.c
@@ -1,132 +1,141 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Teleportation.
-//
-
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_telept.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Teleportation.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomdef.h"
 #include "doomstat.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "p_local.h"
 
+/* State. */
 
-// Data.
-#include "sounds.h"
-
-// State.
 #include "r_state.h"
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-
-//
-// TELEPORTATION
-//
-int
-EV_Teleport
-( line_t*	line,
-  int		side,
-  mobj_t*	thing )
+int ev_teleport(line_t *line, int side, mobj_t *thing)
 {
-    int		i;
-    int		tag;
-    mobj_t*	m;
-    mobj_t*	fog;
-    unsigned	an;
-    thinker_t*	thinker;
-    sector_t*	sector;
-    fixed_t	oldx;
-    fixed_t	oldy;
-    fixed_t	oldz;
+  int i;
+  int tag;
+  mobj_t *m;
+  mobj_t *fog;
+  unsigned an;
+  thinker_t *thinker;
+  sector_t *sector;
+  fixed_t oldx;
+  fixed_t oldy;
+  fixed_t oldz;
 
-    // don't teleport missiles
-    if (thing->flags & MF_MISSILE)
-	return 0;		
+  /* don't teleport missiles */
 
-    // Don't teleport if hit back of line,
-    //  so you can get out of teleporter.
-    if (side == 1)		
-	return 0;	
+  if (thing->flags & MF_MISSILE) return 0;
 
-    
-    tag = line->tag;
-    for (i = 0; i < numsectors; i++)
+  /* Don't teleport if hit back of line, so you can get out of teleporter. */
+
+  if (side == 1) return 0;
+
+  tag = line->tag;
+  for (i = 0; i < numsectors; i++)
     {
-	if (sectors[ i ].tag == tag )
-	{
-	    for (thinker = thinkercap.next;
-		 thinker != &thinkercap;
-		 thinker = thinker->next)
-	    {
-		// not a mobj
-		if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
-		    continue;	
+      if (sectors[i].tag == tag)
+        {
+          for (thinker = thinkercap.next; thinker != &thinkercap;
+               thinker = thinker->next)
+            {
+              /* not a mobj */
 
-		m = (mobj_t *)thinker;
-		
-		// not a teleportman
-		if (m->type != MT_TELEPORTMAN )
-		    continue;		
+              if (thinker->function.acp1 != (actionf_p1)p_mobj_thinker)
+                continue;
 
-		sector = m->subsector->sector;
-		// wrong sector
-		if (sector-sectors != i )
-		    continue;	
+              m = (mobj_t *)thinker;
 
-		oldx = thing->x;
-		oldy = thing->y;
-		oldz = thing->z;
-				
-		if (!P_TeleportMove (thing, m->x, m->y))
-		    return 0;
+              /* not a teleportman */
 
-                // The first Final Doom executable does not set thing->z
-                // when teleporting. This quirk is unique to this
-                // particular version; the later version included in
-                // some versions of the Id Anthology fixed this.
+              if (m->type != MT_TELEPORTMAN) continue;
 
-                if (gameversion != exe_final)
-		    thing->z = thing->floorz;
+              sector = m->subsector->sector;
 
-		if (thing->player)
-		    thing->player->viewz = thing->z+thing->player->viewheight;
+              /* wrong sector */
 
-		// spawn teleport fog at source and destination
-		fog = P_SpawnMobj (oldx, oldy, oldz, MT_TFOG);
-		S_StartSound (fog, sfx_telept);
-		an = m->angle >> ANGLETOFINESHIFT;
-		fog = P_SpawnMobj (m->x+20*finecosine[an], m->y+20*finesine[an]
-				   , thing->z, MT_TFOG);
+              if (sector - sectors != i) continue;
 
-		// emit sound, where?
-		S_StartSound (fog, sfx_telept);
-		
-		// don't move for a bit
-		if (thing->player)
-		    thing->reactiontime = 18;	
+              oldx = thing->x;
+              oldy = thing->y;
+              oldz = thing->z;
 
-		thing->angle = m->angle;
-		thing->momx = thing->momy = thing->momz = 0;
-		return 1;
-	    }	
-	}
+              if (!p_teleport_move(thing, m->x, m->y)) return 0;
+
+              /* The first Final Doom executable does not set thing->z
+               * when teleporting. This quirk is unique to this
+               * particular version; the later version included in
+               * some versions of the Id Anthology fixed this.
+               */
+
+              if (gameversion != exe_final) thing->z = thing->floorz;
+
+              if (thing->player)
+                thing->player->viewz = thing->z + thing->player->viewheight;
+
+              /* spawn teleport fog at source and destination */
+
+              fog = p_spawn_mobj(oldx, oldy, oldz, MT_TFOG);
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(fog, SFX_TELEPT);
+#endif
+              an = m->angle >> ANGLETOFINESHIFT;
+              fog = p_spawn_mobj(m->x + 20 * finecosine[an],
+                                 m->y + 20 * finesine[an],
+                                 thing->z, MT_TFOG);
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+
+              /* emit sound, where? */
+
+              s_start_sound(fog, SFX_TELEPT);
+#else
+              UNUSED(fog);
+#endif
+
+              /* don't move for a bit */
+
+              if (thing->player) thing->reactiontime = 18;
+
+              thing->angle = m->angle;
+              thing->momx = thing->momy = thing->momz = 0;
+              return 1;
+            }
+        }
     }
-    return 0;
-}
 
+  return 0;
+}
diff --git a/games/NXDoom/src/doom/p_tick.c b/games/NXDoom/src/doom/p_tick.c
index 5a93b80f1..d2655dd18 100644
--- a/games/NXDoom/src/doom/p_tick.c
+++ b/games/NXDoom/src/doom/p_tick.c
@@ -1,153 +1,145 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Archiving: SaveGame I/O.
-//	Thinker, Ticker.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_tick.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Archiving: SaveGame I/O.
+ *  Thinker, Ticker.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "z_zone.h"
 #include "p_local.h"
+#include "z_zone.h"
 
 #include "doomstat.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-int	leveltime;
+int leveltime;
 
-//
-// THINKERS
-// All thinkers should be allocated by Z_Malloc
-// so they can be operated on uniformly.
-// The actual structures will vary in size,
-// but the first element must be thinker_t.
-//
+/* THINKERS
+ * All thinkers should be allocated by z_malloc
+ * so they can be operated on uniformly.
+ * The actual structures will vary in size,
+ * but the first element must be thinker_t.
+ */
 
+/* Both the head and tail of the thinker list. */
 
+thinker_t thinkercap;
 
-// Both the head and tail of the thinker list.
-thinker_t	thinkercap;
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-
-//
-// P_InitThinkers
-//
-void P_InitThinkers (void)
+static void p_run_thinkers(void)
 {
-    thinkercap.prev = thinkercap.next  = &thinkercap;
+  thinker_t *currentthinker, *nextthinker;
+
+  currentthinker = thinkercap.next;
+  while (currentthinker != &thinkercap)
+    {
+      if (currentthinker->function.acv == (actionf_v)(-1))
+        {
+          /* time to remove it */
+
+          nextthinker = currentthinker->next;
+          currentthinker->next->prev = currentthinker->prev;
+          currentthinker->prev->next = currentthinker->next;
+          z_free(currentthinker);
+        }
+      else
+        {
+          if (currentthinker->function.acp1)
+            currentthinker->function.acp1(currentthinker);
+          nextthinker = currentthinker->next;
+        }
+
+      currentthinker = nextthinker;
+    }
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-
-
-//
-// P_AddThinker
-// Adds a new thinker at the end of the list.
-//
-void P_AddThinker (thinker_t* thinker)
+void p_init_thinkers(void)
 {
-    thinkercap.prev->next = thinker;
-    thinker->next = &thinkercap;
-    thinker->prev = thinkercap.prev;
-    thinkercap.prev = thinker;
+  thinkercap.prev = thinkercap.next = &thinkercap;
 }
 
+/* p_add_thinker
+ * Adds a new thinker at the end of the list.
+ */
 
-
-//
-// P_RemoveThinker
-// Deallocation is lazy -- it will not actually be freed
-// until its thinking turn comes up.
-//
-void P_RemoveThinker (thinker_t* thinker)
+void p_add_thinker(thinker_t *thinker)
 {
-  // FIXME: NOP.
+  thinkercap.prev->next = thinker;
+  thinker->next = &thinkercap;
+  thinker->prev = thinkercap.prev;
+  thinkercap.prev = thinker;
+}
+
+/* p_remove_thinker Deallocation is lazy -- it will not actually be freed
+ * until its thinking turn comes up.
+ */
+
+void p_remove_thinker(thinker_t *thinker)
+{
+  /* FIXME: NOP. */
+
   thinker->function.acv = (actionf_v)(-1);
 }
 
-
-
-//
-// P_AllocateThinker
-// Allocates memory and adds a new thinker at the end of the list.
-//
-void P_AllocateThinker (thinker_t*	thinker)
+void p_ticker(void)
 {
-}
+  int i;
 
+  /* run the tic */
 
+  if (paused) return;
 
-//
-// P_RunThinkers
-//
-void P_RunThinkers (void)
-{
-    thinker_t *currentthinker, *nextthinker;
+  /* pause if in menu and at least one tic has been run */
 
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
+  if (!netgame && g_menuactive && !demoplayback &&
+      players[consoleplayer].viewz != 1)
     {
-	if ( currentthinker->function.acv == (actionf_v)(-1) )
-	{
-	    // time to remove it
-            nextthinker = currentthinker->next;
-	    currentthinker->next->prev = currentthinker->prev;
-	    currentthinker->prev->next = currentthinker->next;
-	    Z_Free(currentthinker);
-	}
-	else
-	{
-	    if (currentthinker->function.acp1)
-		currentthinker->function.acp1 (currentthinker);
-            nextthinker = currentthinker->next;
-	}
-	currentthinker = nextthinker;
+      return;
     }
-}
 
-
-
-//
-// P_Ticker
-//
-
-void P_Ticker (void)
-{
-    int		i;
-    
-    // run the tic
-    if (paused)
-	return;
-		
-    // pause if in menu and at least one tic has been run
-    if ( !netgame
-	 && menuactive
-	 && !demoplayback
-	 && players[consoleplayer].viewz != 1)
+  for (i = 0; i < MAXPLAYERS; i++)
     {
-	return;
+      if (playeringame[i])
+        {
+          p_player_think(&players[i]);
+        }
     }
-    
-		
-    for (i=0 ; i<MAXPLAYERS ; i++)
-	if (playeringame[i])
-	    P_PlayerThink (&players[i]);
-			
-    P_RunThinkers ();
-    P_UpdateSpecials ();
-    P_RespawnSpecials ();
 
-    // for par times
-    leveltime++;	
+  p_run_thinkers();
+  p_update_specials();
+  p_respawn_specials();
+
+  /* for par times */
+
+  leveltime++;
 }
diff --git a/games/NXDoom/src/doom/p_tick.h b/games/NXDoom/src/doom/p_tick.h
index ddfcd74fc..0b2d5dee1 100644
--- a/games/NXDoom/src/doom/p_tick.h
+++ b/games/NXDoom/src/doom/p_tick.h
@@ -1,33 +1,32 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	?
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_tick.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION: ?
+ *
+ ****************************************************************************/
 
 #ifndef __P_TICK__
 #define __P_TICK__
 
+/* Called by C_Ticker, can call G_PlayerExited.
+ * Carries out all thinking of monsters and players.
+ */
 
+void p_ticker(void);
 
-
-// Called by C_Ticker,
-// can call G_PlayerExited.
-// Carries out all thinking of monsters and players.
-void P_Ticker (void);
-
-
-
-#endif
+#endif /* __P_TICK__ */
diff --git a/games/NXDoom/src/doom/p_user.c b/games/NXDoom/src/doom/p_user.c
index 772871ef9..0a5d0107b 100644
--- a/games/NXDoom/src/doom/p_user.c
+++ b/games/NXDoom/src/doom/p_user.c
@@ -1,379 +1,371 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Player related stuff.
-//	Bobbing POV/weapon, movement.
-//	Pending weapon.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/p_user.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Player related stuff.
+ *  Bobbing POV/weapon, movement.
+ *  Pending weapon.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-
-#include "doomdef.h"
 #include "d_event.h"
+#include "doomdef.h"
 
 #include "p_local.h"
 
 #include "doomstat.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Index of the special effects (INVUL inverse) map. */
 
-// Index of the special effects (INVUL inverse) map.
-#define INVERSECOLORMAP		32
+#define INVERSECOLORMAP 32
 
+/* Movement. */
 
-//
-// Movement.
-//
+/* 16 pixels of bob */
 
-// 16 pixels of bob
-#define MAXBOB	0x100000	
+#define MAXBOB 0x100000
 
-boolean		onground;
+#define ANG5 (ANG90 / 18)
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// P_Thrust
-// Moves the given origin along a given angle.
-//
-void
-P_Thrust
-( player_t*	player,
-  angle_t	angle,
-  fixed_t	move ) 
+boolean onground;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* P_Thrust
+ * Moves the given origin along a given angle.
+ */
+
+static void p_thrust(player_t *player, angle_t angle, fixed_t move)
 {
-    angle >>= ANGLETOFINESHIFT;
-    
-    player->mo->momx += FixedMul(move,finecosine[angle]); 
-    player->mo->momy += FixedMul(move,finesine[angle]);
+  angle >>= ANGLETOFINESHIFT;
+
+  player->mo->momx += fixed_mul(move, finecosine[angle]);
+  player->mo->momy += fixed_mul(move, finesine[angle]);
 }
 
+/* Calculate the walking / running height adjustment */
 
-
-
-//
-// P_CalcHeight
-// Calculate the walking / running height adjustment
-//
-void P_CalcHeight (player_t* player) 
+static void p_calc_height(player_t *player)
 {
-    int		angle;
-    fixed_t	bob;
-    
-    // Regular movement bobbing
-    // (needs to be calculated for gun swing
-    // even if not on ground)
-    // OPTIMIZE: tablify angle
-    // Note: a LUT allows for effects
-    //  like a ramp with low health.
-    player->bob =
-	FixedMul (player->mo->momx, player->mo->momx)
-	+ FixedMul (player->mo->momy,player->mo->momy);
-    
-    player->bob >>= 2;
+  int angle;
+  fixed_t bob;
 
-    if (player->bob>MAXBOB)
-	player->bob = MAXBOB;
+  /* Regular movement bobbing
+   * (needs to be calculated for gun swing
+   * even if not on ground)
+   * OPTIMIZE: tablify angle
+   * Note: a LUT allows for effects
+   *  like a ramp with low health.
+   */
 
-    if ((player->cheats & CF_NOMOMENTUM) || !onground)
+  player->bob = fixed_mul(player->mo->momx, player->mo->momx) +
+                fixed_mul(player->mo->momy, player->mo->momy);
+
+  player->bob >>= 2;
+
+  if (player->bob > MAXBOB) player->bob = MAXBOB;
+
+  if ((player->cheats & CF_NOMOMENTUM) || !onground)
     {
-	player->viewz = player->mo->z + VIEWHEIGHT;
+      player->viewz = player->mo->z + VIEWHEIGHT;
 
-	if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
-	    player->viewz = player->mo->ceilingz-4*FRACUNIT;
+      if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
+        player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
 
-	player->viewz = player->mo->z + player->viewheight;
-	return;
+      player->viewz = player->mo->z + player->viewheight;
+      return;
     }
-		
-    angle = (FINEANGLES/20*leveltime)&FINEMASK;
-    bob = FixedMul ( player->bob/2, finesine[angle]);
 
-    
-    // move viewheight
-    if (player->playerstate == PST_LIVE)
+  angle = (FINEANGLES / 20 * leveltime) & FINEMASK;
+  bob = fixed_mul(player->bob / 2, finesine[angle]);
+
+  /* move viewheight */
+
+  if (player->playerstate == PST_LIVE)
     {
-	player->viewheight += player->deltaviewheight;
+      player->viewheight += player->deltaviewheight;
 
-	if (player->viewheight > VIEWHEIGHT)
-	{
-	    player->viewheight = VIEWHEIGHT;
-	    player->deltaviewheight = 0;
-	}
+      if (player->viewheight > VIEWHEIGHT)
+        {
+          player->viewheight = VIEWHEIGHT;
+          player->deltaviewheight = 0;
+        }
 
-	if (player->viewheight < VIEWHEIGHT/2)
-	{
-	    player->viewheight = VIEWHEIGHT/2;
-	    if (player->deltaviewheight <= 0)
-		player->deltaviewheight = 1;
-	}
-	
-	if (player->deltaviewheight)	
-	{
-	    player->deltaviewheight += FRACUNIT/4;
-	    if (!player->deltaviewheight)
-		player->deltaviewheight = 1;
-	}
+      if (player->viewheight < VIEWHEIGHT / 2)
+        {
+          player->viewheight = VIEWHEIGHT / 2;
+          if (player->deltaviewheight <= 0) player->deltaviewheight = 1;
+        }
+
+      if (player->deltaviewheight)
+        {
+          player->deltaviewheight += FRACUNIT / 4;
+          if (!player->deltaviewheight) player->deltaviewheight = 1;
+        }
     }
-    player->viewz = player->mo->z + player->viewheight + bob;
 
-    if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
-	player->viewz = player->mo->ceilingz-4*FRACUNIT;
+  player->viewz = player->mo->z + player->viewheight + bob;
+
+  if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
+    player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
 }
 
-
-
-//
-// P_MovePlayer
-//
-void P_MovePlayer (player_t* player)
+static void p_move_player(player_t *player)
 {
-    ticcmd_t*		cmd;
-	
-    cmd = &player->cmd;
-	
-    player->mo->angle += (cmd->angleturn<<FRACBITS);
+  ticcmd_t *cmd;
 
-    // Do not let the player control movement
-    //  if not onground.
-    onground = (player->mo->z <= player->mo->floorz);
-	
-    if (cmd->forwardmove && onground)
-	P_Thrust (player, player->mo->angle, cmd->forwardmove*2048);
-    
-    if (cmd->sidemove && onground)
-	P_Thrust (player, player->mo->angle-ANG90, cmd->sidemove*2048);
+  cmd = &player->cmd;
 
-    if ( (cmd->forwardmove || cmd->sidemove) 
-	 && player->mo->state == &states[S_PLAY] )
+  player->mo->angle += (cmd->angleturn << FRACBITS);
+
+  /* Do not let the player control movement if not onground. */
+
+  onground = (player->mo->z <= player->mo->floorz);
+
+  if (cmd->forwardmove && onground)
+    p_thrust(player, player->mo->angle, cmd->forwardmove * 2048);
+
+  if (cmd->sidemove && onground)
+    p_thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2048);
+
+  if ((cmd->forwardmove || cmd->sidemove) &&
+      player->mo->state == &states[S_PLAY])
     {
-	P_SetMobjState (player->mo, S_PLAY_RUN1);
+      p_set_mobj_state(player->mo, S_PLAY_RUN1);
     }
-}	
-
-
-
-//
-// P_DeathThink
-// Fall on your face when dying.
-// Decrease POV height to floor height.
-//
-#define ANG5   	(ANG90/18)
-
-void P_DeathThink (player_t* player)
-{
-    angle_t		angle;
-    angle_t		delta;
-
-    P_MovePsprites (player);
-	
-    // fall to the ground
-    if (player->viewheight > 6*FRACUNIT)
-	player->viewheight -= FRACUNIT;
-
-    if (player->viewheight < 6*FRACUNIT)
-	player->viewheight = 6*FRACUNIT;
-
-    player->deltaviewheight = 0;
-    onground = (player->mo->z <= player->mo->floorz);
-    P_CalcHeight (player);
-	
-    if (player->attacker && player->attacker != player->mo)
-    {
-	angle = R_PointToAngle2 (player->mo->x,
-				 player->mo->y,
-				 player->attacker->x,
-				 player->attacker->y);
-	
-	delta = angle - player->mo->angle;
-	
-	if (delta < ANG5 || delta > (unsigned)-ANG5)
-	{
-	    // Looking at killer,
-	    //  so fade damage flash down.
-	    player->mo->angle = angle;
-
-	    if (player->damagecount)
-		player->damagecount--;
-	}
-	else if (delta < ANG180)
-	    player->mo->angle += ANG5;
-	else
-	    player->mo->angle -= ANG5;
-    }
-    else if (player->damagecount)
-	player->damagecount--;
-	
-
-    if (player->cmd.buttons & BT_USE)
-	player->playerstate = PST_REBORN;
 }
 
+/* P_DeathThink
+ * Fall on your face when dying.
+ * Decrease POV height to floor height.
+ */
 
-
-//
-// P_PlayerThink
-//
-void P_PlayerThink (player_t* player)
+static void p_death_think(player_t *player)
 {
-    ticcmd_t*		cmd;
-    weapontype_t	newweapon;
-	
-    // fixme: do this in the cheat code
-    if (player->cheats & CF_NOCLIP)
-	player->mo->flags |= MF_NOCLIP;
-    else
-	player->mo->flags &= ~MF_NOCLIP;
-    
-    // chain saw run forward
-    cmd = &player->cmd;
-    if (player->mo->flags & MF_JUSTATTACKED)
-    {
-	cmd->angleturn = 0;
-	cmd->forwardmove = 0xc800/512;
-	cmd->sidemove = 0;
-	player->mo->flags &= ~MF_JUSTATTACKED;
-    }
-			
-	
-    if (player->playerstate == PST_DEAD)
-    {
-	P_DeathThink (player);
-	return;
-    }
-    
-    // Move around.
-    // Reactiontime is used to prevent movement
-    //  for a bit after a teleport.
-    if (player->mo->reactiontime)
-	player->mo->reactiontime--;
-    else
-	P_MovePlayer (player);
-    
-    P_CalcHeight (player);
+  angle_t angle;
+  angle_t delta;
 
-    if (player->mo->subsector->sector->special)
-	P_PlayerInSpecialSector (player);
-    
-    // Check for weapon change.
+  p_move_psprites(player);
 
-    // A special event has no other buttons.
-    if (cmd->buttons & BT_SPECIAL)
-	cmd->buttons = 0;			
-		
-    if (cmd->buttons & BT_CHANGE)
+  /* fall to the ground */
+
+  if (player->viewheight > 6 * FRACUNIT) player->viewheight -= FRACUNIT;
+
+  if (player->viewheight < 6 * FRACUNIT) player->viewheight = 6 * FRACUNIT;
+
+  player->deltaviewheight = 0;
+  onground = (player->mo->z <= player->mo->floorz);
+  p_calc_height(player);
+
+  if (player->attacker && player->attacker != player->mo)
     {
-	// The actual changing of the weapon is done
-	//  when the weapon psprite can do it
-	//  (read: not in the middle of an attack).
-	newweapon = (cmd->buttons&BT_WEAPONMASK)>>BT_WEAPONSHIFT;
-	
-	if (newweapon == wp_fist
-	    && player->weaponowned[wp_chainsaw]
-	    && !(player->readyweapon == wp_chainsaw
-		 && player->powers[pw_strength]))
-	{
-	    newweapon = wp_chainsaw;
-	}
-	
-	if ( (gamemode == commercial)
-	    && newweapon == wp_shotgun 
-	    && player->weaponowned[wp_supershotgun]
-	    && player->readyweapon != wp_supershotgun)
-	{
-	    newweapon = wp_supershotgun;
-	}
-	
+      angle = r_point_to_angle2(player->mo->x, player->mo->y,
+                                player->attacker->x, player->attacker->y);
 
-	if (player->weaponowned[newweapon]
-	    && newweapon != player->readyweapon)
-	{
-	    // Do not go to plasma or BFG in shareware,
-	    //  even if cheated.
-	    if ((newweapon != wp_plasma
-		 && newweapon != wp_bfg)
-		|| (gamemode != shareware) )
-	    {
-		player->pendingweapon = newweapon;
-	    }
-	}
-    }
-    
-    // check for use
-    if (cmd->buttons & BT_USE)
-    {
-	if (!player->usedown)
-	{
-	    P_UseLines (player);
-	    player->usedown = true;
-	}
-    }
-    else
-	player->usedown = false;
-    
-    // cycle psprites
-    P_MovePsprites (player);
-    
-    // Counters, time dependend power ups.
+      delta = angle - player->mo->angle;
 
-    // Strength counts up to diminish fade.
-    if (player->powers[pw_strength])
-	player->powers[pw_strength]++;	
-		
-    if (player->powers[pw_invulnerability])
-	player->powers[pw_invulnerability]--;
+      if (delta < ANG5 || delta > (unsigned)-ANG5)
+        {
+          /* Looking at killer, so fade damage flash down. */
 
-    if (player->powers[pw_invisibility])
-	if (! --player->powers[pw_invisibility] )
-	    player->mo->flags &= ~MF_SHADOW;
-			
-    if (player->powers[pw_infrared])
-	player->powers[pw_infrared]--;
-		
-    if (player->powers[pw_ironfeet])
-	player->powers[pw_ironfeet]--;
-		
-    if (player->damagecount)
-	player->damagecount--;
-		
-    if (player->bonuscount)
-	player->bonuscount--;
+          player->mo->angle = angle;
 
-    
-    // Handling colormaps.
-    if (player->powers[pw_invulnerability])
-    {
-	if (player->powers[pw_invulnerability] > 4*32
-	    || (player->powers[pw_invulnerability]&8) )
-	    player->fixedcolormap = INVERSECOLORMAP;
-	else
-	    player->fixedcolormap = 0;
+          if (player->damagecount) player->damagecount--;
+        }
+      else if (delta < ANG180)
+        player->mo->angle += ANG5;
+      else
+        player->mo->angle -= ANG5;
     }
-    else if (player->powers[pw_infrared])	
-    {
-	if (player->powers[pw_infrared] > 4*32
-	    || (player->powers[pw_infrared]&8) )
-	{
-	    // almost full bright
-	    player->fixedcolormap = 1;
-	}
-	else
-	    player->fixedcolormap = 0;
-    }
-    else
-	player->fixedcolormap = 0;
+  else if (player->damagecount)
+    player->damagecount--;
+
+  if (player->cmd.buttons & BT_USE) player->playerstate = PST_REBORN;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+void p_player_think(player_t *player)
+{
+  ticcmd_t *cmd;
+  weapontype_t newweapon;
+
+  /* fixme: do this in the cheat code */
+
+  if (player->cheats & CF_NOCLIP)
+    player->mo->flags |= MF_NOCLIP;
+  else
+    player->mo->flags &= ~MF_NOCLIP;
+
+  /* chain saw run forward */
+
+  cmd = &player->cmd;
+  if (player->mo->flags & MF_JUSTATTACKED)
+    {
+      cmd->angleturn = 0;
+      cmd->forwardmove = 0xc800 / 512;
+      cmd->sidemove = 0;
+      player->mo->flags &= ~MF_JUSTATTACKED;
+    }
+
+  if (player->playerstate == PST_DEAD)
+    {
+      p_death_think(player);
+      return;
+    }
+
+  /* Move around.
+   * Reactiontime is used to prevent movement for a bit after a teleport.
+   */
+
+  if (player->mo->reactiontime)
+    player->mo->reactiontime--;
+  else
+    p_move_player(player);
+
+  p_calc_height(player);
+
+  if (player->mo->subsector->sector->special)
+    {
+      p_player_in_special_sector(player);
+    }
+
+  /* Check for weapon change. */
+
+  /* A special event has no other buttons. */
+
+  if (cmd->buttons & BT_SPECIAL) cmd->buttons = 0;
+
+  if (cmd->buttons & BT_CHANGE)
+    {
+      /* The actual changing of the weapon is done
+       *  when the weapon psprite can do it
+       *  (read: not in the middle of an attack).
+       */
+
+      newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
+
+      if (newweapon == wp_fist && player->weaponowned[wp_chainsaw] &&
+          !(player->readyweapon == wp_chainsaw &&
+            player->powers[pw_strength]))
+        {
+          newweapon = wp_chainsaw;
+        }
+
+      if ((gamemode == commercial) && newweapon == wp_shotgun &&
+          player->weaponowned[wp_supershotgun] &&
+          player->readyweapon != wp_supershotgun)
+        {
+          newweapon = wp_supershotgun;
+        }
+
+      if (player->weaponowned[newweapon] && newweapon != player->readyweapon)
+        {
+          /* Do not go to plasma or BFG in shareware, even if cheated. */
+
+          if ((newweapon != wp_plasma && newweapon != wp_bfg) ||
+              (gamemode != shareware))
+            {
+              player->pendingweapon = newweapon;
+            }
+        }
+    }
+
+  /* check for use */
+
+  if (cmd->buttons & BT_USE)
+    {
+      if (!player->usedown)
+        {
+          p_use_lines(player);
+          player->usedown = true;
+        }
+    }
+  else
+    player->usedown = false;
+
+  /* cycle psprites */
+
+  p_move_psprites(player);
+
+  /* Counters, time dependent power ups. */
+
+  /* Strength counts up to diminish fade. */
+
+  if (player->powers[pw_strength]) player->powers[pw_strength]++;
+
+  if (player->powers[pw_invulnerability])
+    player->powers[pw_invulnerability]--;
+
+  if (player->powers[pw_invisibility])
+    {
+      if (!--player->powers[pw_invisibility])
+        {
+          player->mo->flags &= ~MF_SHADOW;
+        }
+    }
+
+  if (player->powers[pw_infrared]) player->powers[pw_infrared]--;
+
+  if (player->powers[pw_ironfeet]) player->powers[pw_ironfeet]--;
+
+  if (player->damagecount) player->damagecount--;
+
+  if (player->bonuscount) player->bonuscount--;
+
+  /* Handling colormaps. */
+
+  if (player->powers[pw_invulnerability])
+    {
+      if (player->powers[pw_invulnerability] > 4 * 32 ||
+          (player->powers[pw_invulnerability] & 8))
+        player->fixedcolormap = INVERSECOLORMAP;
+      else
+        player->fixedcolormap = 0;
+    }
+  else if (player->powers[pw_infrared])
+    {
+      if (player->powers[pw_infrared] > 4 * 32 ||
+          (player->powers[pw_infrared] & 8))
+        {
+          /* almost full bright */
+
+          player->fixedcolormap = 1;
+        }
+      else
+        player->fixedcolormap = 0;
+    }
+  else
+    player->fixedcolormap = 0;
+}
diff --git a/games/NXDoom/src/doom/r_bsp.c b/games/NXDoom/src/doom/r_bsp.c
index 755d2eefc..605b21bea 100644
--- a/games/NXDoom/src/doom/r_bsp.c
+++ b/games/NXDoom/src/doom/r_bsp.c
@@ -1,23 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	BSP traversal, handling of LineSegs for rendering.
-//
-
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_bsp.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  BSP traversal, handling of LineSegs for rendering.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomdef.h"
 
@@ -29,555 +35,650 @@
 #include "r_plane.h"
 #include "r_things.h"
 
-// State.
 #include "doomstat.h"
 #include "r_state.h"
 
-//#include "r_local.h"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* We must expand MAXSEGS to the theoretical limit of the number of solidsegs
+ * that can be generated in a scene by the DOOM engine. This was determined
+ * by Lee Killough during BOOM development to be a function of the
+ * screensize. The simplest thing we can do, other than fix this bug, is to
+ * let the game render overage and then bomb out by detecting the overflow
+ * after the fact. -haleyjd
+ */
 
+/* #define MAXSEGS 32 */
 
-seg_t*		curline;
-side_t*		sidedef;
-line_t*		linedef;
-sector_t*	frontsector;
-sector_t*	backsector;
-
-drawseg_t	drawsegs[MAXDRAWSEGS];
-drawseg_t*	ds_p;
-
-
-void
-R_StoreWallRange
-( int	start,
-  int	stop );
-
-
-
-
-//
-// R_ClearDrawSegs
-//
-void R_ClearDrawSegs (void)
-{
-    ds_p = drawsegs;
-}
-
-
-
-//
-// ClipWallSegment
-// Clips the given range of columns
-// and includes it in the new clip list.
-//
-typedef	struct
-{
-    int	first;
-    int last;
-    
-} cliprange_t;
-
-// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
-// that can be generated in a scene by the DOOM engine. This was determined by
-// Lee Killough during BOOM development to be a function of the screensize.
-// The simplest thing we can do, other than fix this bug, is to let the game
-// render overage and then bomb out by detecting the overflow after the 
-// fact. -haleyjd
-//#define MAXSEGS 32
 #define MAXSEGS (SCREENWIDTH / 2 + 1)
 
-// newend is one past the last valid seg
-cliprange_t*	newend;
-cliprange_t	solidsegs[MAXSEGS];
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
+/* ClipWallSegment
+ * Clips the given range of columns and includes it in the new clip list.
+ */
 
-
-
-//
-// R_ClipSolidWallSegment
-// Does handle solid walls,
-//  e.g. single sided LineDefs (middle texture)
-//  that entirely block the view.
-// 
-void
-R_ClipSolidWallSegment
-( int			first,
-  int			last )
+typedef struct
 {
-    cliprange_t*	next;
-    cliprange_t*	start;
+  int first;
+  int last;
+} cliprange_t;
 
-    // Find the first range that touches the range
-    //  (adjacent pixels are touching).
-    start = solidsegs;
-    while (start->last < first-1)
-	start++;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-    if (first < start->first)
-    {
-	if (last < start->first-1)
-	{
-	    // Post is entirely visible (above start),
-	    //  so insert a new clippost.
-	    R_StoreWallRange (first, last);
-	    next = newend;
-	    newend++;
-	    
-	    while (next != start)
-	    {
-		*next = *(next-1);
-		next--;
-	    }
-	    next->first = first;
-	    next->last = last;
-	    return;
-	}
-		
-	// There is a fragment above *start.
-	R_StoreWallRange (first, start->first - 1);
-	// Now adjust the clip size.
-	start->first = first;	
-    }
+seg_t *curline;
+side_t *sidedef;
+line_t *linedef;
+sector_t *frontsector;
+sector_t *backsector;
 
-    // Bottom contained in start?
-    if (last <= start->last)
-	return;			
-		
-    next = start;
-    while (last >= (next+1)->first-1)
-    {
-	// There is a fragment between two posts.
-	R_StoreWallRange (next->last + 1, (next+1)->first - 1);
-	next++;
-	
-	if (last <= next->last)
-	{
-	    // Bottom is contained in next.
-	    // Adjust the clip size.
-	    start->last = next->last;	
-	    goto crunch;
-	}
-    }
-	
-    // There is a fragment after *next.
-    R_StoreWallRange (next->last + 1, last);
-    // Adjust the clip size.
-    start->last = last;
-	
-    // Remove start+1 to next from the clip list,
-    // because start now covers their area.
-  crunch:
-    if (next == start)
-    {
-	// Post just extended past the bottom of one post.
-	return;
-    }
-    
+drawseg_t drawsegs[CONFIG_GAMES_NXDOOM_MAXDRAWSEGS];
+drawseg_t *ds_p;
 
-    while (next++ != newend)
-    {
-	// Remove a post.
-	*++start = *next;
-    }
+/* newend is one past the last valid seg */
 
-    newend = start+1;
-}
+cliprange_t *newend;
+cliprange_t solidsegs[MAXSEGS];
 
-
-
-//
-// R_ClipPassWallSegment
-// Clips the given range of columns,
-//  but does not includes it in the clip list.
-// Does handle windows,
-//  e.g. LineDefs with upper and lower texture.
-//
-void
-R_ClipPassWallSegment
-( int	first,
-  int	last )
+int checkcoord[12][4] =
 {
-    cliprange_t*	start;
-
-    // Find the first range that touches the range
-    //  (adjacent pixels are touching).
-    start = solidsegs;
-    while (start->last < first-1)
-	start++;
-
-    if (first < start->first)
     {
-	if (last < start->first-1)
-	{
-	    // Post is entirely visible (above start).
-	    R_StoreWallRange (first, last);
-	    return;
-	}
-		
-	// There is a fragment above *start.
-	R_StoreWallRange (first, start->first - 1);
-    }
-
-    // Bottom contained in start?
-    if (last <= start->last)
-	return;			
-		
-    while (last >= (start+1)->first-1)
+        3,
+        0,
+        2,
+        1,
+    },
     {
-	// There is a fragment between two posts.
-	R_StoreWallRange (start->last + 1, (start+1)->first - 1);
-	start++;
-	
-	if (last <= start->last)
-	    return;
-    }
-	
-    // There is a fragment after *next.
-    R_StoreWallRange (start->last + 1, last);
-}
-
-
-
-//
-// R_ClearClipSegs
-//
-void R_ClearClipSegs (void)
-{
-    solidsegs[0].first = -0x7fffffff;
-    solidsegs[0].last = -1;
-    solidsegs[1].first = viewwidth;
-    solidsegs[1].last = 0x7fffffff;
-    newend = solidsegs+2;
-}
-
-//
-// R_AddLine
-// Clips the given segment
-// and adds any visible pieces to the line list.
-//
-void R_AddLine (seg_t*	line)
-{
-    int			x1;
-    int			x2;
-    angle_t		angle1;
-    angle_t		angle2;
-    angle_t		span;
-    angle_t		tspan;
-    
-    curline = line;
-
-    // OPTIMIZE: quickly reject orthogonal back sides.
-    angle1 = R_PointToAngle (line->v1->x, line->v1->y);
-    angle2 = R_PointToAngle (line->v2->x, line->v2->y);
-    
-    // Clip to view edges.
-    // OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW).
-    span = angle1 - angle2;
-    
-    // Back side? I.e. backface culling?
-    if (span >= ANG180)
-	return;		
-
-    // Global angle needed by segcalc.
-    rw_angle1 = angle1;
-    angle1 -= viewangle;
-    angle2 -= viewangle;
-	
-    tspan = angle1 + clipangle;
-    if (tspan > 2*clipangle)
+        3,
+        0,
+        2,
+        0,
+    },
     {
-	tspan -= 2*clipangle;
-
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return;
-	
-	angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2*clipangle)
+        3,
+        1,
+        2,
+        0,
+    },
     {
-	tspan -= 2*clipangle;
-
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return;	
-	angle2 = -clipangle;
-    }
-    
-    // The seg is in the view range,
-    // but not necessarily visible.
-    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
-    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
-    x1 = viewangletox[angle1];
-    x2 = viewangletox[angle2];
-
-    // Does not cross a pixel?
-    if (x1 == x2)
-	return;				
-	
-    backsector = line->backsector;
-
-    // Single sided line?
-    if (!backsector)
-	goto clipsolid;		
-
-    // Closed door.
-    if (backsector->ceilingheight <= frontsector->floorheight
-	|| backsector->floorheight >= frontsector->ceilingheight)
-	goto clipsolid;		
-
-    // Window.
-    if (backsector->ceilingheight != frontsector->ceilingheight
-	|| backsector->floorheight != frontsector->floorheight)
-	goto clippass;	
-		
-    // Reject empty lines used for triggers
-    //  and special events.
-    // Identical floor and ceiling on both sides,
-    // identical light levels on both sides,
-    // and no middle texture.
-    if (backsector->ceilingpic == frontsector->ceilingpic
-	&& backsector->floorpic == frontsector->floorpic
-	&& backsector->lightlevel == frontsector->lightlevel
-	&& curline->sidedef->midtexture == 0)
+        0,
+    },
     {
-	return;
-    }
-    
-				
-  clippass:
-    R_ClipPassWallSegment (x1, x2-1);	
-    return;
-		
-  clipsolid:
-    R_ClipSolidWallSegment (x1, x2-1);
-}
-
-
-//
-// R_CheckBBox
-// Checks BSP node/subtree bounding box.
-// Returns true
-//  if some part of the bbox might be visible.
-//
-int	checkcoord[12][4] =
-{
-    {3,0,2,1},
-    {3,0,2,0},
-    {3,1,2,0},
-    {0},
-    {2,0,2,1},
-    {0,0,0,0},
-    {3,1,3,0},
-    {0},
-    {2,0,3,1},
-    {2,1,3,1},
-    {2,1,3,0}
+        2,
+        0,
+        2,
+        1,
+    },
+    {
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        3,
+        1,
+        3,
+        0,
+    },
+    {
+        0,
+    },
+    {
+        2,
+        0,
+        3,
+        1,
+    },
+    {
+        2,
+        1,
+        3,
+        1,
+    },
+    {
+        2,
+        1,
+        3,
+        0,
+    },
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-boolean R_CheckBBox (fixed_t*	bspcoord)
+void r_store_wall_range(int start, int stop);
+void r_clip_solid_wall_segment(int first, int last);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: r_clip_pass_wall_segment
+ *
+ * Description:
+ *  Clips the given range of columns,
+ *   but does not includes it in the clip list.
+ *  Does handle windows,
+ *   e.g. LineDefs with upper and lower texture.
+ *
+ ****************************************************************************/
+
+static void r_clip_pass_wall_segment(int first, int last)
 {
-    int			boxx;
-    int			boxy;
-    int			boxpos;
+  cliprange_t *start;
 
-    fixed_t		x1;
-    fixed_t		y1;
-    fixed_t		x2;
-    fixed_t		y2;
-    
-    angle_t		angle1;
-    angle_t		angle2;
-    angle_t		span;
-    angle_t		tspan;
-    
-    cliprange_t*	start;
+  /* Find the first range that touches the range
+   *  (adjacent pixels are touching).
+   */
 
-    int			sx1;
-    int			sx2;
-    
-    // Find the corners of the box
-    // that define the edges from current viewpoint.
-    if (viewx <= bspcoord[BOXLEFT])
-	boxx = 0;
-    else if (viewx < bspcoord[BOXRIGHT])
-	boxx = 1;
-    else
-	boxx = 2;
-		
-    if (viewy >= bspcoord[BOXTOP])
-	boxy = 0;
-    else if (viewy > bspcoord[BOXBOTTOM])
-	boxy = 1;
-    else
-	boxy = 2;
-		
-    boxpos = (boxy<<2)+boxx;
-    if (boxpos == 5)
-	return true;
-	
-    x1 = bspcoord[checkcoord[boxpos][0]];
-    y1 = bspcoord[checkcoord[boxpos][1]];
-    x2 = bspcoord[checkcoord[boxpos][2]];
-    y2 = bspcoord[checkcoord[boxpos][3]];
-    
-    // check clip list for an open space
-    angle1 = R_PointToAngle (x1, y1) - viewangle;
-    angle2 = R_PointToAngle (x2, y2) - viewangle;
-	
-    span = angle1 - angle2;
+  start = solidsegs;
+  while (start->last < first - 1)
+    start++;
 
-    // Sitting on a line?
-    if (span >= ANG180)
-	return true;
-    
-    tspan = angle1 + clipangle;
-
-    if (tspan > 2*clipangle)
+  if (first < start->first)
     {
-	tspan -= 2*clipangle;
+      if (last < start->first - 1)
+        {
+          /* Post is entirely visible (above start). */
 
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return false;	
+          r_store_wall_range(first, last);
+          return;
+        }
 
-	angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2*clipangle)
-    {
-	tspan -= 2*clipangle;
+      /* There is a fragment above *start. */
 
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return false;
-	
-	angle2 = -clipangle;
+      r_store_wall_range(first, start->first - 1);
     }
 
+  /* Bottom contained in start? */
 
-    // Find the first clippost
-    //  that touches the source post
-    //  (adjacent pixels are touching).
-    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
-    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
-    sx1 = viewangletox[angle1];
-    sx2 = viewangletox[angle2];
+  if (last <= start->last) return;
 
-    // Does not cross a pixel.
-    if (sx1 == sx2)
-	return false;			
-    sx2--;
-	
-    start = solidsegs;
-    while (start->last < sx2)
-	start++;
-    
-    if (sx1 >= start->first
-	&& sx2 <= start->last)
+  while (last >= (start + 1)->first - 1)
     {
-	// The clippost contains the new span.
-	return false;
+      /* There is a fragment between two posts. */
+
+      r_store_wall_range(start->last + 1, (start + 1)->first - 1);
+      start++;
+
+      if (last <= start->last) return;
     }
 
-    return true;
+  /* There is a fragment after *next. */
+
+  r_store_wall_range(start->last + 1, last);
 }
 
+/* r_check_b_box
+ * Checks BSP node/subtree bounding box.
+ * Returns true if some part of the bbox might be visible.
+ */
 
-
-//
-// R_Subsector
-// Determine floor/ceiling planes.
-// Add sprites of things in sector.
-// Draw one or more line segments.
-//
-void R_Subsector (int num)
+static boolean r_check_b_box(fixed_t *bspcoord)
 {
-    int			count;
-    seg_t*		line;
-    subsector_t*	sub;
-	
-#ifdef RANGECHECK
-    if (num>=numsubsectors)
-	I_Error ("R_Subsector: ss %i with numss = %i",
-		 num,
-		 numsubsectors);
+  int boxx;
+  int boxy;
+  int boxpos;
+
+  fixed_t x1;
+  fixed_t y1;
+  fixed_t x2;
+  fixed_t y2;
+
+  angle_t angle1;
+  angle_t angle2;
+  angle_t span;
+  angle_t tspan;
+
+  cliprange_t *start;
+
+  int sx1;
+  int sx2;
+
+  /* Find the corners of the box
+   * that define the edges from current viewpoint.
+   */
+
+  if (viewx <= bspcoord[BOXLEFT])
+    boxx = 0;
+  else if (viewx < bspcoord[BOXRIGHT])
+    boxx = 1;
+  else
+    boxx = 2;
+
+  if (viewy >= bspcoord[BOXTOP])
+    boxy = 0;
+  else if (viewy > bspcoord[BOXBOTTOM])
+    boxy = 1;
+  else
+    boxy = 2;
+
+  boxpos = (boxy << 2) + boxx;
+  if (boxpos == 5) return true;
+
+  x1 = bspcoord[checkcoord[boxpos][0]];
+  y1 = bspcoord[checkcoord[boxpos][1]];
+  x2 = bspcoord[checkcoord[boxpos][2]];
+  y2 = bspcoord[checkcoord[boxpos][3]];
+
+  /* check clip list for an open space */
+
+  angle1 = r_point_to_angle(x1, y1) - viewangle;
+  angle2 = r_point_to_angle(x2, y2) - viewangle;
+
+  span = angle1 - angle2;
+
+  /* Sitting on a line? */
+
+  if (span >= ANG180) return true;
+
+  tspan = angle1 + clipangle;
+
+  if (tspan > 2 * clipangle)
+    {
+      tspan -= 2 * clipangle;
+
+      /* Totally off the left edge? */
+
+      if (tspan >= span) return false;
+
+      angle1 = clipangle;
+    }
+
+  tspan = clipangle - angle2;
+  if (tspan > 2 * clipangle)
+    {
+      tspan -= 2 * clipangle;
+
+      /* Totally off the left edge? */
+
+      if (tspan >= span) return false;
+
+      angle2 = -clipangle;
+    }
+
+  /* Find the first clippost
+   *  that touches the source post
+   *  (adjacent pixels are touching).
+   */
+
+  angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
+  angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
+  sx1 = viewangletox[angle1];
+  sx2 = viewangletox[angle2];
+
+  /* Does not cross a pixel. */
+
+  if (sx1 == sx2) return false;
+  sx2--;
+
+  start = solidsegs;
+  while (start->last < sx2)
+    start++;
+
+  if (sx1 >= start->first && sx2 <= start->last)
+    {
+      /* The clippost contains the new span. */
+
+      return false;
+    }
+
+  return true;
+}
+
+/****************************************************************************
+ * Name: r_add_line
+ *
+ * Description:
+ *  Clips the given segment
+ *  and adds any visible pieces to the line list.
+ *
+ ****************************************************************************/
+
+static void r_add_line(seg_t *line)
+{
+  int x1;
+  int x2;
+  angle_t angle1;
+  angle_t angle2;
+  angle_t span;
+  angle_t tspan;
+
+  curline = line;
+
+  /* OPTIMIZE: quickly reject orthogonal back sides. */
+
+  angle1 = r_point_to_angle(line->v1->x, line->v1->y);
+  angle2 = r_point_to_angle(line->v2->x, line->v2->y);
+
+  /* Clip to view edges.
+   * OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW).
+   */
+
+  span = angle1 - angle2;
+
+  /* Back side? I.e. backface culling? */
+
+  if (span >= ANG180) return;
+
+  /* Global angle needed by segcalc. */
+
+  rw_angle1 = angle1;
+  angle1 -= viewangle;
+  angle2 -= viewangle;
+
+  tspan = angle1 + clipangle;
+  if (tspan > 2 * clipangle)
+    {
+      tspan -= 2 * clipangle;
+
+      /* Totally off the left edge? */
+
+      if (tspan >= span) return;
+
+      angle1 = clipangle;
+    }
+
+  tspan = clipangle - angle2;
+  if (tspan > 2 * clipangle)
+    {
+      tspan -= 2 * clipangle;
+
+      /* Totally off the left edge? */
+
+      if (tspan >= span) return;
+      angle2 = -clipangle;
+    }
+
+  /* The seg is in the view range, but not necessarily visible. */
+
+  angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
+  angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
+  x1 = viewangletox[angle1];
+  x2 = viewangletox[angle2];
+
+  /* Does not cross a pixel? */
+
+  if (x1 == x2) return;
+
+  backsector = line->backsector;
+
+  /* Single sided line? */
+
+  if (!backsector) goto clipsolid;
+
+  /* Closed door. */
+
+  if (backsector->ceilingheight <= frontsector->floorheight ||
+      backsector->floorheight >= frontsector->ceilingheight)
+    {
+      goto clipsolid;
+    }
+
+  /* Window. */
+
+  if (backsector->ceilingheight != frontsector->ceilingheight ||
+      backsector->floorheight != frontsector->floorheight)
+    {
+      goto clippass;
+    }
+
+  /* Reject empty lines used for triggers
+   *  and special events.
+   * Identical floor and ceiling on both sides,
+   * identical light levels on both sides,
+   * and no middle texture.
+   */
+
+  if (backsector->ceilingpic == frontsector->ceilingpic &&
+      backsector->floorpic == frontsector->floorpic &&
+      backsector->lightlevel == frontsector->lightlevel &&
+      curline->sidedef->midtexture == 0)
+    {
+      return;
+    }
+
+clippass:
+  r_clip_pass_wall_segment(x1, x2 - 1);
+  return;
+
+clipsolid:
+  r_clip_solid_wall_segment(x1, x2 - 1);
+}
+
+/* r_subsector
+ * Determine floor/ceiling planes.
+ * Add sprites of things in sector.
+ * Draw one or more line segments.
+ */
+
+static void r_subsector(int num)
+{
+  int count;
+  seg_t *line;
+  subsector_t *sub;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (num >= numsubsectors)
+    i_error("R_Subsector: ss %i with numss = %i", num, numsubsectors);
 #endif
 
-    sscount++;
-    sub = &subsectors[num];
-    frontsector = sub->sector;
-    count = sub->numlines;
-    line = &segs[sub->firstline];
+  sscount++;
+  sub = &subsectors[num];
+  frontsector = sub->sector;
+  count = sub->numlines;
+  line = &segs[sub->firstline];
 
-    if (frontsector->floorheight < viewz)
+  if (frontsector->floorheight < viewz)
     {
-	floorplane = R_FindPlane (frontsector->floorheight,
-				  frontsector->floorpic,
-				  frontsector->lightlevel);
+      floorplane =
+          r_find_plane(frontsector->floorheight, frontsector->floorpic,
+                       frontsector->lightlevel);
     }
-    else
-	floorplane = NULL;
-    
-    if (frontsector->ceilingheight > viewz 
-	|| frontsector->ceilingpic == skyflatnum)
-    {
-	ceilingplane = R_FindPlane (frontsector->ceilingheight,
-				    frontsector->ceilingpic,
-				    frontsector->lightlevel);
-    }
-    else
-	ceilingplane = NULL;
-		
-    R_AddSprites (frontsector);	
+  else
+    floorplane = NULL;
 
-    while (count--)
+  if (frontsector->ceilingheight > viewz ||
+      frontsector->ceilingpic == skyflatnum)
     {
-	R_AddLine (line);
-	line++;
+      ceilingplane =
+          r_find_plane(frontsector->ceilingheight, frontsector->ceilingpic,
+                       frontsector->lightlevel);
+    }
+  else
+    ceilingplane = NULL;
+
+  r_add_sprites(frontsector);
+
+  while (count--)
+    {
+      r_add_line(line);
+      line++;
     }
 
-    // check for solidsegs overflow - extremely unsatisfactory!
-    if(newend > &solidsegs[32])
-        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
+  /* check for solidsegs overflow - extremely unsatisfactory! */
+
+  if (newend > &solidsegs[32])
+    {
+      i_error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
+    }
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/****************************************************************************
+ * Name: r_clear_draw_segs
+ ****************************************************************************/
 
-
-//
-// RenderBSPNode
-// Renders all subsectors below a given node,
-//  traversing subtree recursively.
-// Just call with BSP root.
-void R_RenderBSPNode (int bspnum)
+void r_clear_draw_segs(void)
 {
-    node_t*	bsp;
-    int		side;
-
-    // Found a subsector?
-    if (bspnum & NF_SUBSECTOR)
-    {
-	if (bspnum == -1)			
-	    R_Subsector (0);
-	else
-	    R_Subsector (bspnum&(~NF_SUBSECTOR));
-	return;
-    }
-		
-    bsp = &nodes[bspnum];
-    
-    // Decide which side the view point is on.
-    side = R_PointOnSide (viewx, viewy, bsp);
-
-    // Recursively divide front space.
-    R_RenderBSPNode (bsp->children[side]); 
-
-    // Possibly divide back space.
-    if (R_CheckBBox (bsp->bbox[side^1]))	
-	R_RenderBSPNode (bsp->children[side^1]);
+  ds_p = drawsegs;
 }
 
+/****************************************************************************
+ * Name: r_clip_solid_wall_segment
+ *
+ * Description:
+ *  Does handle solid walls, e.g. single sided LineDefs (middle texture)
+ *  that entirely block the view.
+ *
+ ****************************************************************************/
 
+void r_clip_solid_wall_segment(int first, int last)
+{
+  cliprange_t *next;
+  cliprange_t *start;
+
+  /* Find the first range that touches the range
+   * (adjacent pixels are touching).
+   */
+
+  start = solidsegs;
+  while (start->last < first - 1)
+    start++;
+
+  if (first < start->first)
+    {
+      if (last < start->first - 1)
+        {
+          /* Post is entirely visible (above start),
+           * so insert a new clippost.
+           */
+
+          r_store_wall_range(first, last);
+          next = newend;
+          newend++;
+
+          while (next != start)
+            {
+              *next = *(next - 1);
+              next--;
+            }
+
+          next->first = first;
+          next->last = last;
+          return;
+        }
+
+      /* There is a fragment above *start. */
+
+      r_store_wall_range(first, start->first - 1);
+
+      /* Now adjust the clip size. */
+
+      start->first = first;
+    }
+
+  /* Bottom contained in start? */
+
+  if (last <= start->last) return;
+
+  next = start;
+  while (last >= (next + 1)->first - 1)
+    {
+      /* There is a fragment between two posts. */
+
+      r_store_wall_range(next->last + 1, (next + 1)->first - 1);
+      next++;
+
+      if (last <= next->last)
+        {
+          /* Bottom is contained in next.
+           * Adjust the clip size.
+           */
+
+          start->last = next->last;
+          goto crunch;
+        }
+    }
+
+  /* There is a fragment after *next. */
+
+  r_store_wall_range(next->last + 1, last);
+
+  /* Adjust the clip size. */
+
+  start->last = last;
+
+  /* Remove start+1 to next from the clip list,
+   * because start now covers their area.
+   */
+
+crunch:
+  if (next == start)
+    {
+      /* Post just extended past the bottom of one post. */
+
+      return;
+    }
+
+  while (next++ != newend)
+    {
+      /* Remove a post. */
+
+      *++start = *next;
+    }
+
+  newend = start + 1;
+}
+
+/****************************************************************************
+ * Name: r_clear_clip_segs
+ ****************************************************************************/
+
+void r_clear_clip_segs(void)
+{
+  solidsegs[0].first = -0x7fffffff;
+  solidsegs[0].last = -1;
+  solidsegs[1].first = viewwidth;
+  solidsegs[1].last = 0x7fffffff;
+  newend = solidsegs + 2;
+}
+
+/* RenderBSPNode
+ * Renders all subsectors below a given node, traversing subtree recursively.
+ * Just call with BSP root.
+ */
+
+void r_render_bsp_node(int bspnum)
+{
+  node_t *bsp;
+  int side;
+
+  /* Found a subsector? */
+
+  if (bspnum & NF_SUBSECTOR)
+    {
+      if (bspnum == -1)
+        r_subsector(0);
+      else
+        r_subsector(bspnum & (~NF_SUBSECTOR));
+      return;
+    }
+
+  bsp = &nodes[bspnum];
+
+  /* Decide which side the view point is on. */
+
+  side = r_point_on_side(viewx, viewy, bsp);
+
+  /* Recursively divide front space. */
+
+  r_render_bsp_node(bsp->children[side]);
+
+  /* Possibly divide back space. */
+
+  if (r_check_b_box(bsp->bbox[side ^ 1]))
+    r_render_bsp_node(bsp->children[side ^ 1]);
+}
diff --git a/games/NXDoom/src/doom/r_bsp.h b/games/NXDoom/src/doom/r_bsp.h
index 1723e6861..66c6d611f 100644
--- a/games/NXDoom/src/doom/r_bsp.h
+++ b/games/NXDoom/src/doom/r_bsp.h
@@ -1,61 +1,73 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh module, BSP traversal and handling.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_bsp.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh module, BSP traversal and handling.
+ *
+ ****************************************************************************/
 
 #ifndef __R_BSP__
 #define __R_BSP__
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+typedef void (*drawfunc_t)(int start, int stop);
 
-extern seg_t*		curline;
-extern side_t*		sidedef;
-extern line_t*		linedef;
-extern sector_t*	frontsector;
-extern sector_t*	backsector;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-extern int		rw_x;
-extern int		rw_stopx;
+extern seg_t *curline;
+extern side_t *sidedef;
+extern line_t *linedef;
+extern sector_t *frontsector;
+extern sector_t *backsector;
 
-extern boolean		segtextured;
+extern int rw_x;
+extern int rw_stopx;
 
-// false if the back side is the same plane
-extern boolean		markfloor;		
-extern boolean		markceiling;
+extern boolean segtextured;
 
-extern boolean		skymap;
+/* false if the back side is the same plane */
 
-extern drawseg_t	drawsegs[MAXDRAWSEGS];
-extern drawseg_t*	ds_p;
+extern boolean markfloor;
+extern boolean markceiling;
 
-extern lighttable_t**	hscalelight;
-extern lighttable_t**	vscalelight;
-extern lighttable_t**	dscalelight;
+extern boolean skymap;
 
+extern drawseg_t drawsegs[CONFIG_GAMES_NXDOOM_MAXDRAWSEGS];
+extern drawseg_t *ds_p;
 
-typedef void (*drawfunc_t) (int start, int stop);
+extern lighttable_t **hscalelight;
+extern lighttable_t **vscalelight;
+extern lighttable_t **dscalelight;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// BSP?
-void R_ClearClipSegs (void);
-void R_ClearDrawSegs (void);
+/* BSP? */
 
+void r_clear_clip_segs(void);
+void r_clear_draw_segs(void);
 
-void R_RenderBSPNode (int bspnum);
+void r_render_bsp_node(int bspnum);
 
-
-#endif
+#endif /* __R_BSP__ */
diff --git a/games/NXDoom/src/doom/r_data.c b/games/NXDoom/src/doom/r_data.c
index 7f1bbbe00..2a35c2eda 100644
--- a/games/NXDoom/src/doom/r_data.c
+++ b/games/NXDoom/src/doom/r_data.c
@@ -1,21 +1,30 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Preparation of data for rendering,
-//	generation of lookups, caching, retrieval by name.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_data.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Preparation of data for rendering,
+ *  generation of lookups, caching, retrieval by name.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
@@ -24,881 +33,912 @@
 #include "i_system.h"
 #include "z_zone.h"
 
-
 #include "w_wad.h"
 
 #include "doomdef.h"
 #include "m_misc.h"
-#include "r_local.h"
 #include "p_local.h"
+#include "r_local.h"
 
 #include "doomstat.h"
 #include "r_sky.h"
 
-
 #include "r_data.h"
 
-//
-// Graphics.
-// DOOM graphics for walls and sprites
-// is stored in vertical runs of opaque pixels (posts).
-// A column is composed of zero or more posts,
-// a patch or sprite is composed of zero or more columns.
-// 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
+/* Graphics.
+ * DOOM graphics for walls and sprites
+ * is stored in vertical runs of opaque pixels (posts).
+ * A column is composed of zero or more posts,
+ * a patch or sprite is composed of zero or more columns.
+ */
 
+/* Texture definition.
+ * Each texture is composed of one or more patches,
+ * with patches being lumps stored in the WAD.
+ * The lumps are referenced by number, and patched
+ * into the rectangular texture space using origin
+ * and possibly other attributes.
+ */
 
-//
-// Texture definition.
-// Each texture is composed of one or more patches,
-// with patches being lumps stored in the WAD.
-// The lumps are referenced by number, and patched
-// into the rectangular texture space using origin
-// and possibly other attributes.
-//
-typedef PACKED_STRUCT (
+begin_packed_struct struct mappatch_t
 {
-    short	originx;
-    short	originy;
-    short	patch;
-    short	stepdir;
-    short	colormap;
-}) mappatch_t;
+  short originx;
+  short originy;
+  short patch;
+  short stepdir;
+  short colormap;
+} end_packed_struct;
 
+typedef struct mappatch_t mappatch_t;
 
-//
-// Texture definition.
-// A DOOM wall texture is a list of patches
-// which are to be combined in a predefined order.
-//
-typedef PACKED_STRUCT (
+/* Texture definition.
+ * A DOOM wall texture is a list of patches
+ * which are to be combined in a predefined order.
+ */
+
+begin_packed_struct struct maptexture_t
 {
-    char		name[8];
-    int			masked;	
-    short		width;
-    short		height;
-    int                 obsolete;
-    short		patchcount;
-    mappatch_t	patches[1];
-}) maptexture_t;
+  char name[8];
+  int masked;
+  short width;
+  short height;
+  int obsolete;
+  short patchcount;
+  mappatch_t patches[1];
+} end_packed_struct;
 
+typedef struct maptexture_t maptexture_t;
+
+/* A single patch from a texture definition, basically a rectangular area
+ * within the texture rectangle.
+ */
 
-// A single patch from a texture definition,
-//  basically a rectangular area within
-//  the texture rectangle.
 typedef struct
 {
-    // Block origin (allways UL),
-    // which has allready accounted
-    // for the internal origin of the patch.
-    short	originx;	
-    short	originy;
-    int		patch;
+  /* Block origin (always UL), which has already accounted for the internal
+   * origin of the patch.
+   */
+
+  short originx;
+  short originy;
+  int patch;
 } texpatch_t;
 
-
-// A maptexturedef_t describes a rectangular texture,
-//  which is composed of one or more mappatch_t structures
-//  that arrange graphic patches.
+/* A maptexturedef_t describes a rectangular texture, which is composed of
+ * one or more mappatch_t structures that arrange graphic patches.
+ */
 
 typedef struct texture_s texture_t;
 
 struct texture_s
 {
-    // Keep name for switch changing, etc.
-    char	name[8];		
-    short	width;
-    short	height;
+  /* Keep name for switch changing, etc. */
 
-    // Index in textures list
+  char name[8];
+  short width;
+  short height;
 
-    int         index;
+  /* Index in textures list */
 
-    // Next in hash table chain
+  int index;
 
-    texture_t  *next;
-    
-    // All the patches[patchcount]
-    //  are drawn back to front into the cached texture.
-    short	patchcount;
-    texpatch_t	patches[1];		
+  /* Next in hash table chain */
+
+  texture_t *next;
+
+  /* All the patches[patchcount] are drawn back to front into the cached
+   * texture.
+   */
+
+  short patchcount;
+  texpatch_t patches[1];
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+int firstflat;
+int lastflat;
+int numflats;
 
-int		firstflat;
-int		lastflat;
-int		numflats;
+int firstpatch;
+int lastpatch;
+int numpatches;
 
-int		firstpatch;
-int		lastpatch;
-int		numpatches;
+int firstspritelump;
+int lastspritelump;
+int numspritelumps;
 
-int		firstspritelump;
-int		lastspritelump;
-int		numspritelumps;
+int numtextures;
+texture_t **textures;
+texture_t **textures_hashtable;
 
-int		numtextures;
-texture_t**	textures;
-texture_t**     textures_hashtable;
+int *texturewidthmask;
 
+/* needed for texture pegging */
 
-int*			texturewidthmask;
-// needed for texture pegging
-fixed_t*		textureheight;		
-int*			texturecompositesize;
-short**			texturecolumnlump;
-unsigned short**	texturecolumnofs;
-byte**			texturecomposite;
+fixed_t *textureheight;
+int *texturecompositesize;
+short **texturecolumnlump;
+unsigned short **texturecolumnofs;
+byte **texturecomposite;
 
-// for global animation
-int*		flattranslation;
-int*		texturetranslation;
+/* for global animation */
 
-// needed for pre rendering
-fixed_t*	spritewidth;	
-fixed_t*	spriteoffset;
-fixed_t*	spritetopoffset;
+int *flattranslation;
+int *texturetranslation;
 
-lighttable_t	*colormaps;
+/* needed for pre rendering */
 
+fixed_t *spritewidth;
+fixed_t *spriteoffset;
+fixed_t *spritetopoffset;
 
-//
-// MAPTEXTURE_T CACHING
-// When a texture is first needed,
-//  it counts the number of composite columns
-//  required in the texture and allocates space
-//  for a column directory and any new columns.
-// The directory will simply point inside other patches
-//  if there is only one patch in a given column,
-//  but any columns with multiple patches
-//  will have new column_ts generated.
-//
+lighttable_t *colormaps;
 
+int flatmemory;
+int texturememory;
+int spritememory;
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-//
-// R_DrawColumnInCache
-// Clip and draw a column
-//  from a patch into a cached post.
-//
-void
-R_DrawColumnInCache
-( column_t*	patch,
-  byte*		cache,
-  int		originy,
-  int		cacheheight )
+static void generate_texture_hashtable(void)
 {
-    int		count;
-    int		position;
-    byte*	source;
+  texture_t **rover;
+  int i;
+  int key;
 
-    while (patch->topdelta != 0xff)
+  textures_hashtable =
+      z_malloc(sizeof(texture_t *) * numtextures, PU_STATIC, 0);
+
+  memset(textures_hashtable, 0, sizeof(texture_t *) * numtextures);
+
+  /* Add all textures to hash table */
+
+  for (i = 0; i < numtextures; ++i)
     {
-	source = (byte *)patch + 3;
-	count = patch->length;
-	position = originy + patch->topdelta;
+      /* Store index */
 
-	if (position < 0)
-	{
-	    count += position;
-	    position = 0;
-	}
+      textures[i]->index = i;
 
-	if (position + count > cacheheight)
-	    count = cacheheight - position;
+      /* Vanilla Doom does a linear search of the textures array
+       * and stops at the first entry it finds. If there are two
+       * entries with the same name, the first one in the array
+       * wins. The new entry must therefore be added at the end
+       * of the hash chain, so that earlier entries win.
+       */
 
-	if (count > 0)
-	    memcpy (cache + position, source, count);
-		
-	patch = (column_t *)(  (byte *)patch + patch->length + 4); 
-    }
-}
+      key = w_lump_name_hash(textures[i]->name) % numtextures;
 
+      rover = &textures_hashtable[key];
 
-
-//
-// R_GenerateComposite
-// Using the texture definition,
-//  the composite texture is created from the patches,
-//  and each column is cached.
-//
-void R_GenerateComposite (int texnum)
-{
-    byte*		block;
-    texture_t*		texture;
-    texpatch_t*		patch;	
-    patch_t*		realpatch;
-    int			x;
-    int			x1;
-    int			x2;
-    int			i;
-    column_t*		patchcol;
-    short*		collump;
-    unsigned short*	colofs;
-	
-    texture = textures[texnum];
-
-    block = Z_Malloc (texturecompositesize[texnum],
-		      PU_STATIC, 
-		      &texturecomposite[texnum]);	
-
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-    
-    // Composite the columns together.
-    for (i=0 , patch = texture->patches;
-	 i<texture->patchcount;
-	 i++, patch++)
-    {
-	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
-	x1 = patch->originx;
-	x2 = x1 + SHORT(realpatch->width);
-
-	if (x1<0)
-	    x = 0;
-	else
-	    x = x1;
-	
-	if (x2 > texture->width)
-	    x2 = texture->width;
-
-	for ( ; x<x2 ; x++)
-	{
-	    // Column does not have multiple patches?
-	    if (collump[x] >= 0)
-		continue;
-	    
-	    patchcol = (column_t *)((byte *)realpatch
-				    + LONG(realpatch->columnofs[x-x1]));
-	    R_DrawColumnInCache (patchcol,
-				 block + colofs[x],
-				 patch->originy,
-				 texture->height);
-	}
-						
-    }
-
-    // Now that the texture has been built in column cache,
-    //  it is purgable from zone memory.
-    Z_ChangeTag (block, PU_CACHE);
-}
-
-
-
-//
-// R_GenerateLookup
-//
-void R_GenerateLookup (int texnum)
-{
-    texture_t*		texture;
-    byte*		patchcount;	// patchcount[texture->width]
-    texpatch_t*		patch;	
-    patch_t*		realpatch;
-    int			x;
-    int			x1;
-    int			x2;
-    int			i;
-    short*		collump;
-    unsigned short*	colofs;
-	
-    texture = textures[texnum];
-
-    // Composited texture not created yet.
-    texturecomposite[texnum] = 0;
-    
-    texturecompositesize[texnum] = 0;
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-    
-    // Now count the number of columns
-    //  that are covered by more than one patch.
-    // Fill in the lump / offset, so columns
-    //  with only a single patch are all done.
-    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
-    memset (patchcount, 0, texture->width);
-
-    for (i=0 , patch = texture->patches;
-	 i<texture->patchcount;
-	 i++, patch++)
-    {
-	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
-	x1 = patch->originx;
-	x2 = x1 + SHORT(realpatch->width);
-	
-	if (x1 < 0)
-	    x = 0;
-	else
-	    x = x1;
-
-	if (x2 > texture->width)
-	    x2 = texture->width;
-	for ( ; x<x2 ; x++)
-	{
-	    patchcount[x]++;
-	    collump[x] = patch->patch;
-	    colofs[x] = LONG(realpatch->columnofs[x-x1])+3;
-	}
-    }
-	
-    for (x=0 ; x<texture->width ; x++)
-    {
-	if (!patchcount[x])
-	{
-	    printf ("R_GenerateLookup: column without a patch (%s)\n",
-		    texture->name);
-	    return;
-	}
-	// I_Error ("R_GenerateLookup: column without a patch");
-	
-	if (patchcount[x] > 1)
-	{
-	    // Use the cached block.
-	    collump[x] = -1;	
-	    colofs[x] = texturecompositesize[texnum];
-	    
-	    if (texturecompositesize[texnum] > 0x10000-texture->height)
-	    {
-		I_Error ("R_GenerateLookup: texture %i is >64k",
-			 texnum);
-	    }
-	    
-	    texturecompositesize[texnum] += texture->height;
-	}
-    }
-
-    Z_Free(patchcount);
-}
-
-
-
-
-//
-// R_GetColumn
-//
-byte*
-R_GetColumn
-( int		tex,
-  int		col )
-{
-    int		lump;
-    int		ofs;
-	
-    col &= texturewidthmask[tex];
-    lump = texturecolumnlump[tex][col];
-    ofs = texturecolumnofs[tex][col];
-    
-    if (lump > 0)
-	return (byte *)W_CacheLumpNum(lump,PU_CACHE)+ofs;
-
-    if (!texturecomposite[tex])
-	R_GenerateComposite (tex);
-
-    return texturecomposite[tex] + ofs;
-}
-
-
-static void GenerateTextureHashTable(void)
-{
-    texture_t **rover;
-    int i;
-    int key;
-
-    textures_hashtable 
-            = Z_Malloc(sizeof(texture_t *) * numtextures, PU_STATIC, 0);
-
-    memset(textures_hashtable, 0, sizeof(texture_t *) * numtextures);
-
-    // Add all textures to hash table
-
-    for (i=0; i<numtextures; ++i)
-    {
-        // Store index
-
-        textures[i]->index = i;
-
-        // Vanilla Doom does a linear search of the texures array
-        // and stops at the first entry it finds.  If there are two
-        // entries with the same name, the first one in the array
-        // wins. The new entry must therefore be added at the end
-        // of the hash chain, so that earlier entries win.
-
-        key = W_LumpNameHash(textures[i]->name) % numtextures;
-
-        rover = &textures_hashtable[key];
-
-        while (*rover != NULL)
+      while (*rover != NULL)
         {
-            rover = &(*rover)->next;
+          rover = &(*rover)->next;
         }
 
-        // Hook into hash table
+      /* Hook into hash table */
 
-        textures[i]->next = NULL;
-        *rover = textures[i];
+      textures[i]->next = NULL;
+      *rover = textures[i];
     }
 }
 
+/****************************************************************************
+ * Name: r_generate_lookup
+ ****************************************************************************/
 
-//
-// R_InitTextures
-// Initializes the texture list
-//  with the textures from the world map.
-//
-void R_InitTextures (void)
+static void r_generate_lookup(int texnum)
 {
-    maptexture_t*	mtexture;
-    texture_t*		texture;
-    mappatch_t*		mpatch;
-    texpatch_t*		patch;
+  texture_t *texture;
+  byte *patchcount; /* patchcount[texture->width] */
+  texpatch_t *patch;
+  patch_t *realpatch;
+  int x;
+  int x1;
+  int x2;
+  int i;
+  short *collump;
+  unsigned short *colofs;
 
-    int			i;
-    int			j;
+  texture = textures[texnum];
 
-    int*		maptex;
-    int*		maptex2;
-    int*		maptex1;
-    
-    char		name[9];
-    char*		names;
-    char*		name_p;
-    
-    int*		patchlookup;
-    
-    int			nummappatches;
-    int			offset;
-    int			maxoff;
-    int			maxoff2;
-    int			numtextures1;
-    int			numtextures2;
+  /* Composited texture not created yet. */
 
-    int*		directory;
-    
-    int			temp1;
-    int			temp2;
-    int			temp3;
+  texturecomposite[texnum] = 0;
 
-    
-    // Load the patch names from pnames.lmp.
-    name[8] = 0;
-    names = W_CacheLumpName (DEH_String("PNAMES"), PU_STATIC);
-    nummappatches = LONG ( *((int *)names) );
-    name_p = names + 4;
-    patchlookup = Z_Malloc(nummappatches*sizeof(*patchlookup), PU_STATIC, NULL);
+  texturecompositesize[texnum] = 0;
+  collump = texturecolumnlump[texnum];
+  colofs = texturecolumnofs[texnum];
 
-    for (i = 0; i < nummappatches; i++)
+  /* Now count the number of columns that are covered by more than one patch.
+   *
+   * Fill in the lump / offset, so columns with only a single patch are all
+   * done.
+   */
+
+  patchcount = (byte *)z_malloc(texture->width, PU_STATIC, &patchcount);
+  memset(patchcount, 0, texture->width);
+
+  for (i = 0, patch = texture->patches;
+       i < texture->patchcount;
+       i++, patch++)
     {
-        M_StringCopy(name, name_p + i * 8, sizeof(name));
-        patchlookup[i] = W_CheckNumForName(name);
-    }
-    W_ReleaseLumpName(DEH_String("PNAMES"));
+      realpatch = w_cache_lump_num(patch->patch, PU_CACHE);
+      x1 = patch->originx;
+      x2 = x1 + SHORT(realpatch->width);
 
-    // Load the map texture definitions from textures.lmp.
-    // The data is contained in one or two lumps,
-    //  TEXTURE1 for shareware, plus TEXTURE2 for commercial.
-    maptex = maptex1 = W_CacheLumpName (DEH_String("TEXTURE1"), PU_STATIC);
-    numtextures1 = LONG(*maptex);
-    maxoff = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE1")));
-    directory = maptex+1;
-	
-    if (W_CheckNumForName (DEH_String("TEXTURE2")) != -1)
-    {
-	maptex2 = W_CacheLumpName (DEH_String("TEXTURE2"), PU_STATIC);
-	numtextures2 = LONG(*maptex2);
-	maxoff2 = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE2")));
-    }
-    else
-    {
-	maptex2 = NULL;
-	numtextures2 = 0;
-	maxoff2 = 0;
-    }
-    numtextures = numtextures1 + numtextures2;
-	
-    textures = Z_Malloc (numtextures * sizeof(*textures), PU_STATIC, 0);
-    texturecolumnlump = Z_Malloc (numtextures * sizeof(*texturecolumnlump), PU_STATIC, 0);
-    texturecolumnofs = Z_Malloc (numtextures * sizeof(*texturecolumnofs), PU_STATIC, 0);
-    texturecomposite = Z_Malloc (numtextures * sizeof(*texturecomposite), PU_STATIC, 0);
-    texturecompositesize = Z_Malloc (numtextures * sizeof(*texturecompositesize), PU_STATIC, 0);
-    texturewidthmask = Z_Malloc (numtextures * sizeof(*texturewidthmask), PU_STATIC, 0);
-    textureheight = Z_Malloc (numtextures * sizeof(*textureheight), PU_STATIC, 0);
+      if (x1 < 0)
+        x = 0;
+      else
+        x = x1;
 
-    //	Really complex printing shit...
-    temp1 = W_GetNumForName (DEH_String("S_START"));  // P_???????
-    temp2 = W_GetNumForName (DEH_String("S_END")) - 1;
-    temp3 = ((temp2-temp1+63)/64) + ((numtextures+63)/64);
-
-    // If stdout is a real console, use the classic vanilla "filling
-    // up the box" effect, which uses backspace to "step back" inside
-    // the box.  If stdout is a file, don't draw the box.
-
-    if (I_ConsoleStdout())
-    {
-        printf("[");
-        for (i = 0; i < temp3 + 9; i++)
-            printf(" ");
-        printf("]");
-        for (i = 0; i < temp3 + 10; i++)
-            printf("\b");
-    }
-	
-    for (i=0 ; i<numtextures ; i++, directory++)
-    {
-	if (!(i&63))
-	    printf (".");
-
-	if (i == numtextures1)
-	{
-	    // Start looking in second texture file.
-	    maptex = maptex2;
-	    maxoff = maxoff2;
-	    directory = maptex+1;
-	}
-		
-	offset = LONG(*directory);
-
-	if (offset > maxoff)
-	    I_Error ("R_InitTextures: bad texture directory");
-	
-	mtexture = (maptexture_t *) ( (byte *)maptex + offset);
-
-	texture = textures[i] =
-	    Z_Malloc (sizeof(texture_t)
-		      + sizeof(texpatch_t)*(SHORT(mtexture->patchcount)-1),
-		      PU_STATIC, 0);
-	
-	texture->width = SHORT(mtexture->width);
-	texture->height = SHORT(mtexture->height);
-	texture->patchcount = SHORT(mtexture->patchcount);
-	
-	memcpy (texture->name, mtexture->name, sizeof(texture->name));
-	mpatch = &mtexture->patches[0];
-	patch = &texture->patches[0];
-
-	for (j=0 ; j<texture->patchcount ; j++, mpatch++, patch++)
-	{
-	    patch->originx = SHORT(mpatch->originx);
-	    patch->originy = SHORT(mpatch->originy);
-	    patch->patch = patchlookup[SHORT(mpatch->patch)];
-	    if (patch->patch == -1)
-	    {
-		I_Error ("R_InitTextures: Missing patch in texture %s",
-			 texture->name);
-	    }
-	}		
-	texturecolumnlump[i] = Z_Malloc (texture->width*sizeof(**texturecolumnlump), PU_STATIC,0);
-	texturecolumnofs[i] = Z_Malloc (texture->width*sizeof(**texturecolumnofs), PU_STATIC,0);
-
-	j = 1;
-	while (j*2 <= texture->width)
-	    j<<=1;
-
-	texturewidthmask[i] = j-1;
-	textureheight[i] = texture->height<<FRACBITS;
+      if (x2 > texture->width) x2 = texture->width;
+      for (; x < x2; x++)
+        {
+          patchcount[x]++;
+          collump[x] = patch->patch;
+          colofs[x] = LONG(realpatch->columnofs[x - x1]) + 3;
+        }
     }
 
-    Z_Free(patchlookup);
+  for (x = 0; x < texture->width; x++)
+    {
+      if (!patchcount[x])
+        {
+          printf("r_generate_lookup: column without a patch (%s)\n",
+                 texture->name);
+          return;
+        }
 
-    W_ReleaseLumpName(DEH_String("TEXTURE1"));
-    if (maptex2)
-        W_ReleaseLumpName(DEH_String("TEXTURE2"));
-    
-    // Precalculate whatever possible.	
+      if (patchcount[x] > 1)
+        {
+          /* Use the cached block. */
 
-    for (i=0 ; i<numtextures ; i++)
-	R_GenerateLookup (i);
-    
-    // Create translation table for global animation.
-    texturetranslation = Z_Malloc ((numtextures+1)*sizeof(*texturetranslation), PU_STATIC, 0);
-    
-    for (i=0 ; i<numtextures ; i++)
-	texturetranslation[i] = i;
+          collump[x] = -1;
+          colofs[x] = texturecompositesize[texnum];
 
-    GenerateTextureHashTable();
+          if (texturecompositesize[texnum] > 0x10000 - texture->height)
+            {
+              i_error("r_generate_lookup: texture %i is >64k", texnum);
+            }
+
+          texturecompositesize[texnum] += texture->height;
+        }
+    }
+
+  z_free(patchcount);
 }
 
+/* MAPTEXTURE_T CACHING
+ *
+ * When a texture is first needed, it counts the number of composite columns
+ * required in the texture and allocates space for a column directory and any
+ * new columns.
+ *
+ * The directory will simply point inside other patches if there is only one
+ * patch in a given column, but any columns with multiple patches will have
+ * new column_ts generated.
+ */
 
+/****************************************************************************
+ * Name: r_init_textures
+ *
+ * Description:
+ *  Initializes the texture list
+ *   with the textures from the world map.
+ *
+ ****************************************************************************/
 
-//
-// R_InitFlats
-//
-void R_InitFlats (void)
+static void r_init_textures(void)
 {
-    int		i;
-	
-    firstflat = W_GetNumForName (DEH_String("F_START")) + 1;
-    lastflat = W_GetNumForName (DEH_String("F_END")) - 1;
-    numflats = lastflat - firstflat + 1;
-	
-    // Create translation table for global animation.
-    flattranslation = Z_Malloc ((numflats+1)*sizeof(*flattranslation), PU_STATIC, 0);
-    
-    for (i=0 ; i<numflats ; i++)
-	flattranslation[i] = i;
+  maptexture_t *mtexture;
+  texture_t *texture;
+  mappatch_t *mpatch;
+  texpatch_t *patch;
+
+  int i;
+  int j;
+
+  int *maptex;
+  int *maptex2;
+  int *maptex1;
+
+  char name[9];
+  char *names;
+  char *name_p;
+
+  int *patchlookup;
+
+  int nummappatches;
+  int offset;
+  int maxoff;
+  int maxoff2;
+  int numtextures1;
+  int numtextures2;
+
+  int *directory;
+
+  int temp1;
+  int temp2;
+  int temp3;
+
+  /* Load the patch names from pnames.lmp. */
+
+  name[8] = 0;
+  names = w_cache_lump_name(("PNAMES"), PU_STATIC);
+  nummappatches = LONG(*((int *)names));
+  name_p = names + 4;
+  patchlookup =
+      z_malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
+
+  for (i = 0; i < nummappatches; i++)
+    {
+      m_str_copy(name, name_p + i * 8, sizeof(name));
+      patchlookup[i] = w_check_num_for_name(name);
+    }
+
+  w_release_lump_name(("PNAMES"));
+
+  /* Load the map texture definitions from textures.lmp.
+   * The data is contained in one or two lumps,
+   *  TEXTURE1 for shareware, plus TEXTURE2 for commercial.
+   */
+
+  maptex = maptex1 = w_cache_lump_name(("TEXTURE1"), PU_STATIC);
+  numtextures1 = LONG(*maptex);
+  maxoff = w_lump_length(w_get_num_for_name(("TEXTURE1")));
+  directory = maptex + 1;
+
+  if (w_check_num_for_name(("TEXTURE2")) != -1)
+    {
+      maptex2 = w_cache_lump_name(("TEXTURE2"), PU_STATIC);
+      numtextures2 = LONG(*maptex2);
+      maxoff2 = w_lump_length(w_get_num_for_name(("TEXTURE2")));
+    }
+  else
+    {
+      maptex2 = NULL;
+      numtextures2 = 0;
+      maxoff2 = 0;
+    }
+
+  numtextures = numtextures1 + numtextures2;
+
+  textures = z_malloc(numtextures * sizeof(*textures), PU_STATIC, 0);
+  texturecolumnlump =
+      z_malloc(numtextures * sizeof(*texturecolumnlump), PU_STATIC, 0);
+  texturecolumnofs =
+      z_malloc(numtextures * sizeof(*texturecolumnofs), PU_STATIC, 0);
+  texturecomposite =
+      z_malloc(numtextures * sizeof(*texturecomposite), PU_STATIC, 0);
+  texturecompositesize =
+      z_malloc(numtextures * sizeof(*texturecompositesize), PU_STATIC, 0);
+  texturewidthmask =
+      z_malloc(numtextures * sizeof(*texturewidthmask), PU_STATIC, 0);
+  textureheight =
+      z_malloc(numtextures * sizeof(*textureheight), PU_STATIC, 0);
+
+  /* Really complex printing shit... */
+
+  temp1 = w_get_num_for_name(("S_START")); /* P_??????? */
+  temp2 = w_get_num_for_name(("S_END")) - 1;
+  temp3 = ((temp2 - temp1 + 63) / 64) + ((numtextures + 63) / 64);
+
+  /* If stdout is a real console, use the classic vanilla "filling
+   * up the box" effect, which uses backspace to "step back" inside
+   * the box.  If stdout is a file, don't draw the box.
+   */
+
+  if (i_console_stdout())
+    {
+      printf("[");
+      for (i = 0; i < temp3 + 9; i++)
+        printf(" ");
+      printf("]");
+      for (i = 0; i < temp3 + 10; i++)
+        printf("\b");
+    }
+
+  for (i = 0; i < numtextures; i++, directory++)
+    {
+      if (!(i & 63)) printf(".");
+
+      if (i == numtextures1)
+        {
+          /* Start looking in second texture file. */
+
+          maptex = maptex2;
+          maxoff = maxoff2;
+          directory = maptex + 1;
+        }
+
+      offset = LONG(*directory);
+
+      if (offset > maxoff) i_error("r_init_textures: bad texture directory");
+
+      mtexture = (maptexture_t *)((byte *)maptex + offset);
+
+      texture = textures[i] =
+          z_malloc(sizeof(texture_t) +
+                   sizeof(texpatch_t) * (SHORT(mtexture->patchcount) - 1),
+                   PU_STATIC, 0);
+
+      texture->width = SHORT(mtexture->width);
+      texture->height = SHORT(mtexture->height);
+      texture->patchcount = SHORT(mtexture->patchcount);
+
+      memcpy(texture->name, mtexture->name, sizeof(texture->name));
+      mpatch = &mtexture->patches[0];
+      patch = &texture->patches[0];
+
+      for (j = 0; j < texture->patchcount; j++, mpatch++, patch++)
+        {
+          patch->originx = SHORT(mpatch->originx);
+          patch->originy = SHORT(mpatch->originy);
+          patch->patch = patchlookup[SHORT(mpatch->patch)];
+          if (patch->patch == -1)
+            {
+              i_error("r_init_textures: Missing patch in texture %s",
+                      texture->name);
+            }
+        }
+
+      texturecolumnlump[i] = z_malloc(
+          texture->width * sizeof(**texturecolumnlump), PU_STATIC, 0);
+      texturecolumnofs[i] =
+          z_malloc(texture->width * sizeof(**texturecolumnofs),
+                  PU_STATIC, 0);
+
+      j = 1;
+      while (j * 2 <= texture->width)
+        j <<= 1;
+
+      texturewidthmask[i] = j - 1;
+      textureheight[i] = texture->height << FRACBITS;
+    }
+
+  z_free(patchlookup);
+
+  w_release_lump_name(("TEXTURE1"));
+  if (maptex2) w_release_lump_name(("TEXTURE2"));
+
+  /* Precalculate whatever possible. */
+
+  for (i = 0; i < numtextures; i++)
+    r_generate_lookup(i);
+
+  /* Create translation table for global animation. */
+
+  texturetranslation =
+      z_malloc((numtextures + 1) * sizeof(*texturetranslation),
+              PU_STATIC, 0);
+
+  for (i = 0; i < numtextures; i++)
+    texturetranslation[i] = i;
+
+  generate_texture_hashtable();
 }
 
+/****************************************************************************
+ * Name: r_init_flats
+ ****************************************************************************/
 
-//
-// R_InitSpriteLumps
-// Finds the width and hoffset of all sprites in the wad,
-//  so the sprite does not need to be cached completely
-//  just for having the header info ready during rendering.
-//
-void R_InitSpriteLumps (void)
+static void r_init_flats(void)
 {
-    int		i;
-    patch_t	*patch;
-	
-    firstspritelump = W_GetNumForName (DEH_String("S_START")) + 1;
-    lastspritelump = W_GetNumForName (DEH_String("S_END")) - 1;
-    
-    numspritelumps = lastspritelump - firstspritelump + 1;
-    spritewidth = Z_Malloc (numspritelumps*sizeof(*spritewidth), PU_STATIC, 0);
-    spriteoffset = Z_Malloc (numspritelumps*sizeof(*spriteoffset), PU_STATIC, 0);
-    spritetopoffset = Z_Malloc (numspritelumps*sizeof(*spritetopoffset), PU_STATIC, 0);
-	
-    for (i=0 ; i< numspritelumps ; i++)
-    {
-	if (!(i&63))
-	    printf (".");
+  int i;
 
-	patch = W_CacheLumpNum (firstspritelump+i, PU_CACHE);
-	spritewidth[i] = SHORT(patch->width)<<FRACBITS;
-	spriteoffset[i] = SHORT(patch->leftoffset)<<FRACBITS;
-	spritetopoffset[i] = SHORT(patch->topoffset)<<FRACBITS;
-    }
+  firstflat = w_get_num_for_name(("F_START")) + 1;
+  lastflat = w_get_num_for_name(("F_END")) - 1;
+  numflats = lastflat - firstflat + 1;
+
+  /* Create translation table for global animation. */
+
+  flattranslation =
+      z_malloc((numflats + 1) * sizeof(*flattranslation), PU_STATIC, 0);
+
+  for (i = 0; i < numflats; i++)
+    flattranslation[i] = i;
 }
 
+/****************************************************************************
+ * Name: r_init_sprite_lumps
+ *
+ * Description:
+ *  Finds the width and hoffset of all sprites in the wad,
+ *   so the sprite does not need to be cached completely
+ *   just for having the header info ready during rendering.
+ *
+ ****************************************************************************/
 
-
-//
-// R_InitColormaps
-//
-void R_InitColormaps (void)
+static void r_init_sprite_lumps(void)
 {
-    int	lump;
+  int i;
+  patch_t *patch;
 
-    // Load in the light tables, 
-    //  256 byte align tables.
-    lump = W_GetNumForName(DEH_String("COLORMAP"));
-    colormaps = W_CacheLumpNum(lump, PU_STATIC);
+  firstspritelump = w_get_num_for_name(("S_START")) + 1;
+  lastspritelump = w_get_num_for_name(("S_END")) - 1;
+
+  numspritelumps = lastspritelump - firstspritelump + 1;
+  spritewidth =
+      z_malloc(numspritelumps * sizeof(*spritewidth), PU_STATIC, 0);
+  spriteoffset =
+      z_malloc(numspritelumps * sizeof(*spriteoffset), PU_STATIC, 0);
+  spritetopoffset =
+      z_malloc(numspritelumps * sizeof(*spritetopoffset), PU_STATIC, 0);
+
+  for (i = 0; i < numspritelumps; i++)
+    {
+      if (!(i & 63)) printf(".");
+
+      patch = w_cache_lump_num(firstspritelump + i, PU_CACHE);
+      spritewidth[i] = SHORT(patch->width) << FRACBITS;
+      spriteoffset[i] = SHORT(patch->leftoffset) << FRACBITS;
+      spritetopoffset[i] = SHORT(patch->topoffset) << FRACBITS;
+    }
 }
 
+/****************************************************************************
+ * Name: r_init_colourmaps
+ ****************************************************************************/
 
-
-//
-// R_InitData
-// Locates all the lumps
-//  that will be used by all views
-// Must be called after W_Init.
-//
-void R_InitData (void)
+static void r_init_colourmaps(void)
 {
-    R_InitTextures ();
-    printf (".");
-    R_InitFlats ();
-    printf (".");
-    R_InitSpriteLumps ();
-    printf (".");
-    R_InitColormaps ();
+  int lump;
+
+  /* Load in the light tables, 256 byte align tables. */
+
+  lump = w_get_num_for_name(("COLORMAP"));
+  colormaps = w_cache_lump_num(lump, PU_STATIC);
 }
 
+/****************************************************************************
+ * Name: r_draw_column_in_cache
+ *
+ * Description:
+ *  Clip and draw a column from a patch into a cached post.
+ *
+ ****************************************************************************/
 
-
-//
-// R_FlatNumForName
-// Retrieval, get a flat number for a flat name.
-//
-int R_FlatNumForName(const char *name)
+static void r_draw_column_in_cache(column_t *patch, byte *cache, int originy,
+                         int cacheheight)
 {
-    int		i;
-    char	namet[9];
+  int count;
+  int position;
+  byte *source;
 
-    i = W_CheckNumForName (name);
-
-    if (i == -1)
+  while (patch->topdelta != 0xff)
     {
-	namet[8] = 0;
-	memcpy (namet, name,8);
-	I_Error ("R_FlatNumForName: %s not found",namet);
+      source = (byte *)patch + 3;
+      count = patch->length;
+      position = originy + patch->topdelta;
+
+      if (position < 0)
+        {
+          count += position;
+          position = 0;
+        }
+
+      if (position + count > cacheheight) count = cacheheight - position;
+
+      if (count > 0) memcpy(cache + position, source, count);
+
+      patch = (column_t *)((byte *)patch + patch->length + 4);
     }
-    return i - firstflat;
 }
 
+/****************************************************************************
+ * Name: r_generate_composite
+ *
+ * Description:
+ *  Using the texture definition, the composite texture is created from the
+ *  patches, and each column is cached.
+ *
+ ****************************************************************************/
 
-
-
-//
-// R_CheckTextureNumForName
-// Check whether texture is available.
-// Filter out NoTexture indicator.
-//
-int R_CheckTextureNumForName(const char *name)
+static void r_generate_composite(int texnum)
 {
-    texture_t *texture;
-    int key;
+  byte *block;
+  texture_t *texture;
+  texpatch_t *patch;
+  patch_t *realpatch;
+  int x;
+  int x1;
+  int x2;
+  int i;
+  column_t *patchcol;
+  short *collump;
+  unsigned short *colofs;
 
-    // "NoTexture" marker.
-    if (name[0] == '-')		
-	return 0;
-		
-    key = W_LumpNameHash(name) % numtextures;
+  texture = textures[texnum];
 
-    texture=textures_hashtable[key]; 
-    
-    while (texture != NULL)
+  block = z_malloc(texturecompositesize[texnum], PU_STATIC,
+                   &texturecomposite[texnum]);
+
+  collump = texturecolumnlump[texnum];
+  colofs = texturecolumnofs[texnum];
+
+  /* Composite the columns together. */
+
+  for (i = 0, patch = texture->patches;
+       i < texture->patchcount;
+       i++, patch++)
     {
-	if (!strncasecmp (texture->name, name, 8) )
-	    return texture->index;
+      realpatch = w_cache_lump_num(patch->patch, PU_CACHE);
+      x1 = patch->originx;
+      x2 = x1 + SHORT(realpatch->width);
 
-        texture = texture->next;
+      if (x1 < 0)
+        x = 0;
+      else
+        x = x1;
+
+      if (x2 > texture->width) x2 = texture->width;
+
+      for (; x < x2; x++)
+        {
+          /* Column does not have multiple patches? */
+
+          if (collump[x] >= 0) continue;
+
+          patchcol = (column_t *)((byte *)realpatch +
+                                  LONG(realpatch->columnofs[x - x1]));
+          r_draw_column_in_cache(patchcol, block + colofs[x],
+                  patch->originy, texture->height);
+        }
     }
-    
-    return -1;
+
+  /* Now that the texture has been built in column cache,
+   * it is purgeable from zone memory.
+   */
+
+  z_change_tag(block, PU_CACHE);
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/****************************************************************************
+ * Name: r_get_column
+ ****************************************************************************/
 
-//
-// R_TextureNumForName
-// Calls R_CheckTextureNumForName,
-//  aborts with error message.
-//
-int R_TextureNumForName(const char *name)
+byte *r_get_column(int tex, int col)
 {
-    int		i;
-	
-    i = R_CheckTextureNumForName (name);
+  int lump;
+  int ofs;
 
-    if (i==-1)
-    {
-	I_Error ("R_TextureNumForName: %s not found",
-		 name);
-    }
-    return i;
+  col &= texturewidthmask[tex];
+  lump = texturecolumnlump[tex][col];
+  ofs = texturecolumnofs[tex][col];
+
+  if (lump > 0) return (byte *)w_cache_lump_num(lump, PU_CACHE) + ofs;
+
+  if (!texturecomposite[tex]) r_generate_composite(tex);
+
+  return texturecomposite[tex] + ofs;
 }
 
+/****************************************************************************
+ * Name: r_init_data
+ *
+ * Description:
+ *  Locates all the lumps that will be used by all views
+ *  Must be called after W_Init.
+ *
+ ****************************************************************************/
 
-
-
-//
-// R_PrecacheLevel
-// Preloads all relevant graphics for the level.
-//
-int		flatmemory;
-int		texturememory;
-int		spritememory;
-
-void R_PrecacheLevel (void)
+void r_init_data(void)
 {
-    char*		flatpresent;
-    char*		texturepresent;
-    char*		spritepresent;
-
-    int			i;
-    int			j;
-    int			k;
-    int			lump;
-    
-    texture_t*		texture;
-    thinker_t*		th;
-    spriteframe_t*	sf;
-
-    if (demoplayback)
-	return;
-    
-    // Precache flats.
-    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
-    memset (flatpresent,0,numflats);	
-
-    for (i=0 ; i<numsectors ; i++)
-    {
-	flatpresent[sectors[i].floorpic] = 1;
-	flatpresent[sectors[i].ceilingpic] = 1;
-    }
-	
-    flatmemory = 0;
-
-    for (i=0 ; i<numflats ; i++)
-    {
-	if (flatpresent[i])
-	{
-	    lump = firstflat + i;
-	    flatmemory += lumpinfo[lump]->size;
-	    W_CacheLumpNum(lump, PU_CACHE);
-	}
-    }
-
-    Z_Free(flatpresent);
-    
-    // Precache textures.
-    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
-    memset (texturepresent,0, numtextures);
-	
-    for (i=0 ; i<numsides ; i++)
-    {
-	texturepresent[sides[i].toptexture] = 1;
-	texturepresent[sides[i].midtexture] = 1;
-	texturepresent[sides[i].bottomtexture] = 1;
-    }
-
-    // Sky texture is always present.
-    // Note that F_SKY1 is the name used to
-    //  indicate a sky floor/ceiling as a flat,
-    //  while the sky texture is stored like
-    //  a wall texture, with an episode dependend
-    //  name.
-    texturepresent[skytexture] = 1;
-	
-    texturememory = 0;
-    for (i=0 ; i<numtextures ; i++)
-    {
-	if (!texturepresent[i])
-	    continue;
-
-	texture = textures[i];
-	
-	for (j=0 ; j<texture->patchcount ; j++)
-	{
-	    lump = texture->patches[j].patch;
-	    texturememory += lumpinfo[lump]->size;
-	    W_CacheLumpNum(lump , PU_CACHE);
-	}
-    }
-
-    Z_Free(texturepresent);
-    
-    // Precache sprites.
-    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
-    memset (spritepresent,0, numsprites);
-	
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
-    {
-	if (th->function.acp1 == (actionf_p1)P_MobjThinker)
-	    spritepresent[((mobj_t *)th)->sprite] = 1;
-    }
-	
-    spritememory = 0;
-    for (i=0 ; i<numsprites ; i++)
-    {
-	if (!spritepresent[i])
-	    continue;
-
-	for (j=0 ; j<sprites[i].numframes ; j++)
-	{
-	    sf = &sprites[i].spriteframes[j];
-	    for (k=0 ; k<8 ; k++)
-	    {
-		lump = firstspritelump + sf->lump[k];
-		spritememory += lumpinfo[lump]->size;
-		W_CacheLumpNum(lump , PU_CACHE);
-	    }
-	}
-    }
-
-    Z_Free(spritepresent);
+  r_init_textures();
+  printf(".");
+  r_init_flats();
+  printf(".");
+  r_init_sprite_lumps();
+  printf(".");
+  r_init_colourmaps();
 }
 
+/****************************************************************************
+ * Name: r_flat_num_for_name
+ *
+ * Description:
+ *  Retrieval, get a flat number for a flat name.
+ *
+ ****************************************************************************/
 
+int r_flat_num_for_name(const char *name)
+{
+  int i;
+  char namet[9];
 
+  i = w_check_num_for_name(name);
 
+  if (i == -1)
+    {
+      namet[8] = 0;
+      memcpy(namet, name, 8);
+      i_error("r_flat_num_for_name: %s not found", namet);
+    }
+
+  return i - firstflat;
+}
+
+/****************************************************************************
+ * Name: r_check_texture_num_for_name
+ *
+ * Description:
+ *  Check whether texture is available.
+ *  Filter out NoTexture indicator.
+ *
+ ****************************************************************************/
+
+int r_check_texture_num_for_name(const char *name)
+{
+  texture_t *texture;
+  int key;
+
+  /* "NoTexture" marker. */
+
+  if (name[0] == '-') return 0;
+
+  key = w_lump_name_hash(name) % numtextures;
+
+  texture = textures_hashtable[key];
+
+  while (texture != NULL)
+    {
+      if (!strncasecmp(texture->name, name, 8)) return texture->index;
+
+      texture = texture->next;
+    }
+
+  return -1;
+}
+
+/****************************************************************************
+ * Name: r_texture_num_for_name
+ *
+ * Description:
+ *  Calls r_check_texture_num_for_name, aborts with error message.
+ *
+ ****************************************************************************/
+
+int r_texture_num_for_name(const char *name)
+{
+  int i;
+
+  i = r_check_texture_num_for_name(name);
+
+  if (i == -1)
+    {
+      i_error("r_texture_num_for_name: %s not found", name);
+    }
+
+  return i;
+}
+
+/****************************************************************************
+ * Name: r_precache_level
+ *
+ * Description:
+ *  Preloads all relevant graphics for the level.
+ *
+ ****************************************************************************/
+
+void r_precache_level(void)
+{
+  char *flatpresent;
+  char *texturepresent;
+  char *spritepresent;
+
+  int i;
+  int j;
+  int k;
+  int lump;
+
+  texture_t *texture;
+  thinker_t *th;
+  spriteframe_t *sf;
+
+  if (demoplayback) return;
+
+  /* Precache flats. */
+
+  flatpresent = z_malloc(numflats, PU_STATIC, NULL);
+  memset(flatpresent, 0, numflats);
+
+  for (i = 0; i < numsectors; i++)
+    {
+      flatpresent[sectors[i].floorpic] = 1;
+      flatpresent[sectors[i].ceilingpic] = 1;
+    }
+
+  flatmemory = 0;
+
+  for (i = 0; i < numflats; i++)
+    {
+      if (flatpresent[i])
+        {
+          lump = firstflat + i;
+          flatmemory += lumpinfo[lump]->size;
+          w_cache_lump_num(lump, PU_CACHE);
+        }
+    }
+
+  z_free(flatpresent);
+
+  /* Precache textures. */
+
+  texturepresent = z_malloc(numtextures, PU_STATIC, NULL);
+  memset(texturepresent, 0, numtextures);
+
+  for (i = 0; i < numsides; i++)
+    {
+      texturepresent[sides[i].toptexture] = 1;
+      texturepresent[sides[i].midtexture] = 1;
+      texturepresent[sides[i].bottomtexture] = 1;
+    }
+
+  /* Sky texture is always present.
+   * Note that F_SKY1 is the name used to indicate a sky floor/ceiling as a
+   * flat, while the sky texture is stored like a wall texture, with an
+   * episode dependent name.
+   */
+
+  texturepresent[skytexture] = 1;
+
+  texturememory = 0;
+  for (i = 0; i < numtextures; i++)
+    {
+      if (!texturepresent[i]) continue;
+
+      texture = textures[i];
+
+      for (j = 0; j < texture->patchcount; j++)
+        {
+          lump = texture->patches[j].patch;
+          texturememory += lumpinfo[lump]->size;
+          w_cache_lump_num(lump, PU_CACHE);
+        }
+    }
+
+  z_free(texturepresent);
+
+  /* Precache sprites. */
+
+  spritepresent = z_malloc(numsprites, PU_STATIC, NULL);
+  memset(spritepresent, 0, numsprites);
+
+  for (th = thinkercap.next; th != &thinkercap; th = th->next)
+    {
+      if (th->function.acp1 == (actionf_p1)p_mobj_thinker)
+        spritepresent[((mobj_t *)th)->sprite] = 1;
+    }
+
+  spritememory = 0;
+  for (i = 0; i < numsprites; i++)
+    {
+      if (!spritepresent[i]) continue;
+
+      for (j = 0; j < sprites[i].numframes; j++)
+        {
+          sf = &sprites[i].spriteframes[j];
+          for (k = 0; k < 8; k++)
+            {
+              lump = firstspritelump + sf->lump[k];
+              spritememory += lumpinfo[lump]->size;
+              w_cache_lump_num(lump, PU_CACHE);
+            }
+        }
+    }
+
+  z_free(spritepresent);
+}
diff --git a/games/NXDoom/src/doom/r_data.h b/games/NXDoom/src/doom/r_data.h
index 1b273088d..f320ed0f7 100644
--- a/games/NXDoom/src/doom/r_data.h
+++ b/games/NXDoom/src/doom/r_data.h
@@ -1,55 +1,68 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Refresh module, data I/O, caching, retrieval of graphics
-//  by name.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_data.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh module, data I/O, caching, retrieval of graphics
+ *  by name.
+ *
+ ****************************************************************************/
 
 #ifndef __R_DATA__
 #define __R_DATA__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "r_defs.h"
 #include "r_state.h"
 
-
-// Retrieve column data for span blitting.
-byte*
-R_GetColumn
-( int		tex,
-  int		col );
-
-
-// I/O, setting up the stuff.
-void R_InitData (void);
-void R_PrecacheLevel (void);
-
-
-// Retrieval.
-// Floor/ceiling opaque texture tiles,
-// lookup by name. For animation?
-int R_FlatNumForName(const char *name);
-
-
-// Called by P_Ticker for switches and animations,
-// returns the texture number for the texture name.
-int R_TextureNumForName(const char *name);
-int R_CheckTextureNumForName(const char *name);
-
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern int numflats;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* Retrieve column data for span blitting. */
+
+byte *r_get_column(int tex, int col);
+
+/* I/O, setting up the stuff. */
+
+void r_init_data(void);
+void r_precache_level(void);
+
+/* Retrieval.
+ * Floor/ceiling opaque texture tiles,
+ * lookup by name. For animation?
+ */
+
+int r_flat_num_for_name(const char *name);
+
+/* Called by p_ticker for switches and animations,
+ * returns the texture number for the texture name.
+ */
+
+int r_texture_num_for_name(const char *name);
+int r_check_texture_num_for_name(const char *name);
+
+#endif /* __R_DATA__ */
diff --git a/games/NXDoom/src/doom/r_defs.h b/games/NXDoom/src/doom/r_defs.h
index d87ca38a9..ae84ae63e 100644
--- a/games/NXDoom/src/doom/r_defs.h
+++ b/games/NXDoom/src/doom/r_defs.h
@@ -1,448 +1,444 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Refresh/rendering module, shared data struct definitions.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_defs.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Refresh/rendering module, shared data struct definitions.
+ *
+ ****************************************************************************/
 
 #ifndef __R_DEFS__
 #define __R_DEFS__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Screenwidth. */
 
-// Screenwidth.
 #include "doomdef.h"
 
-// Some more or less basic data types
-// we depend on.
+/* Some more or less basic data types we depend on. */
+
 #include "m_fixed.h"
 
-// We rely on the thinker data struct
-// to handle sound origins in sectors.
+/* We rely on the thinker data struct to handle sound origins in sectors. */
+
 #include "d_think.h"
-// SECTORS do store MObjs anyway.
+
+/* SECTORS do store MObjs anyway. */
+
 #include "p_mobj.h"
 
 #include "i_video.h"
 
 #include "v_patch.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Silhouette, needed for clipping Segs (mainly) and sprites representing
+ * things.
+ */
 
+#define SIL_NONE 0
+#define SIL_BOTTOM 1
+#define SIL_TOP 2
+#define SIL_BOTH 3
 
-// Silhouette, needed for clipping Segs (mainly)
-// and sprites representing things.
-#define SIL_NONE		0
-#define SIL_BOTTOM		1
-#define SIL_TOP			2
-#define SIL_BOTH		3
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-#define MAXDRAWSEGS		256
+/* INTERNAL MAP TYPES used by play and refresh */
 
+/* Your plain vanilla vertex.
+ *
+ * Note: transformed values not buffered locally, like some DOOM-alikes
+ * ("wt", "WebView") did.
+ */
 
-
-
-
-//
-// INTERNAL MAP TYPES
-//  used by play and refresh
-//
-
-//
-// Your plain vanilla vertex.
-// Note: transformed values not buffered locally,
-//  like some DOOM-alikes ("wt", "WebView") did.
-//
 typedef struct
 {
-    fixed_t	x;
-    fixed_t	y;
-    
+  fixed_t x;
+  fixed_t y;
 } vertex_t;
 
+/* Forward of LineDefs, for Sectors. */
 
-// Forward of LineDefs, for Sectors.
 struct line_s;
 
-// Each sector has a degenmobj_t in its center
-//  for sound origin purposes.
-// I suppose this does not handle sound from
-//  moving objects (doppler), because
-//  position is prolly just buffered, not
-//  updated.
+/* Each sector has a degenmobj_t in its center for sound origin purposes.
+ *
+ * I suppose this does not handle sound from moving objects (doppler),
+ * because position is prolly just buffered, not updated.
+ */
+
 typedef struct
 {
-    thinker_t		thinker;	// not used for anything
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
-
+  thinker_t thinker; /* not used for anything */
+  fixed_t x;
+  fixed_t y;
+  fixed_t z;
 } degenmobj_t;
 
-//
-// The SECTORS record, at runtime.
-// Stores things/mobjs.
-//
-typedef	struct
-{
-    fixed_t	floorheight;
-    fixed_t	ceilingheight;
-    short	floorpic;
-    short	ceilingpic;
-    short	lightlevel;
-    short	special;
-    short	tag;
-
-    // 0 = untraversed, 1,2 = sndlines -1
-    int		soundtraversed;
-
-    // thing that made a sound (or null)
-    mobj_t*	soundtarget;
-
-    // mapblock bounding box for height changes
-    int		blockbox[4];
-
-    // origin for any sounds played by the sector
-    degenmobj_t	soundorg;
-
-    // if == validcount, already checked
-    int		validcount;
-
-    // list of mobjs in sector
-    mobj_t*	thinglist;
-
-    // thinker_t for reversable actions
-    void*	specialdata;
-
-    int			linecount;
-    struct line_s**	lines;	// [linecount] size
-    
-} sector_t;
-
-
-
-
-//
-// The SideDef.
-//
+/* The SECTORS record, at runtime. Stores things/mobjs. */
 
 typedef struct
 {
-    // add this to the calculated texture column
-    fixed_t	textureoffset;
-    
-    // add this to the calculated texture top
-    fixed_t	rowoffset;
+  fixed_t floorheight;
+  fixed_t ceilingheight;
+  short floorpic;
+  short ceilingpic;
+  short lightlevel;
+  short special;
+  short tag;
 
-    // Texture indices.
-    // We do not maintain names here. 
-    short	toptexture;
-    short	bottomtexture;
-    short	midtexture;
+  /* 0 = untraversed, 1,2 = sndlines -1 */
 
-    // Sector the SideDef is facing.
-    sector_t*	sector;
-    
+  int soundtraversed;
+
+  /* thing that made a sound (or null) */
+
+  mobj_t *soundtarget;
+
+  /* mapblock bounding box for height changes */
+
+  int blockbox[4];
+
+  /* origin for any sounds played by the sector */
+
+  degenmobj_t soundorg;
+
+  /* if == validcount, already checked */
+
+  int validcount;
+
+  /* list of mobjs in sector */
+
+  mobj_t *thinglist;
+
+  /* thinker_t for reversible actions */
+
+  void *specialdata;
+
+  int linecount;
+  struct line_s **lines; /* [linecount] size */
+} sector_t;
+
+/* The SideDef. */
+
+typedef struct
+{
+  /* add this to the calculated texture column */
+
+  fixed_t textureoffset;
+
+  /* add this to the calculated texture top */
+
+  fixed_t rowoffset;
+
+  /* Texture indices. We do not maintain names here. */
+
+  short toptexture;
+  short bottomtexture;
+  short midtexture;
+
+  /* Sector the SideDef is facing. */
+
+  sector_t *sector;
 } side_t;
 
+/* Move clipping aid for LineDefs. */
 
-
-//
-// Move clipping aid for LineDefs.
-//
 typedef enum
 {
-    ST_HORIZONTAL,
-    ST_VERTICAL,
-    ST_POSITIVE,
-    ST_NEGATIVE
-
+  ST_HORIZONTAL,
+  ST_VERTICAL,
+  ST_POSITIVE,
+  ST_NEGATIVE
 } slopetype_t;
 
-
-
 typedef struct line_s
 {
-    // Vertices, from v1 to v2.
-    vertex_t*	v1;
-    vertex_t*	v2;
+  /* Vertices, from v1 to v2. */
 
-    // Precalculated v2 - v1 for side checking.
-    fixed_t	dx;
-    fixed_t	dy;
+  vertex_t *v1;
+  vertex_t *v2;
 
-    // Animation related.
-    short	flags;
-    short	special;
-    short	tag;
+  /* Precalculated v2 - v1 for side checking. */
 
-    // Visual appearance: SideDefs.
-    //  sidenum[1] will be -1 if one sided
-    short	sidenum[2];			
+  fixed_t dx;
+  fixed_t dy;
 
-    // Neat. Another bounding box, for the extent
-    //  of the LineDef.
-    fixed_t	bbox[4];
+  /* Animation related. */
 
-    // To aid move clipping.
-    slopetype_t	slopetype;
+  short flags;
+  short special;
+  short tag;
 
-    // Front and back sector.
-    // Note: redundant? Can be retrieved from SideDefs.
-    sector_t*	frontsector;
-    sector_t*	backsector;
+  /* Visual appearance: SideDefs. sidenum[1] will be -1 if one sided */
 
-    // if == validcount, already checked
-    int		validcount;
+  short sidenum[2];
 
-    // thinker_t for reversable actions
-    void*	specialdata;		
+  /* Neat. Another bounding box, for the extent of the LineDef. */
+
+  fixed_t bbox[4];
+
+  /* To aid move clipping. */
+
+  slopetype_t slopetype;
+
+  /* Front and back sector.
+   * Note: redundant? Can be retrieved from SideDefs.
+   */
+
+  sector_t *frontsector;
+  sector_t *backsector;
+
+  /* if == validcount, already checked */
+
+  int validcount;
+
+  /* thinker_t for reversible actions */
+
+  void *specialdata;
 } line_t;
 
+/* A SubSector.
+ * References a Sector.
+ *
+ * Basically, this is a list of LineSegs, indicating the visible walls that
+ * define (all or some) sides of a convex BSP leaf.
+ */
 
-
-
-//
-// A SubSector.
-// References a Sector.
-// Basically, this is a list of LineSegs,
-//  indicating the visible walls that define
-//  (all or some) sides of a convex BSP leaf.
-//
 typedef struct subsector_s
 {
-    sector_t*	sector;
-    short	numlines;
-    short	firstline;
-    
+  sector_t *sector;
+  short numlines;
+  short firstline;
 } subsector_t;
 
+/* The LineSeg. */
 
-
-//
-// The LineSeg.
-//
 typedef struct
 {
-    vertex_t*	v1;
-    vertex_t*	v2;
-    
-    fixed_t	offset;
+  vertex_t *v1;
+  vertex_t *v2;
 
-    angle_t	angle;
+  fixed_t offset;
 
-    side_t*	sidedef;
-    line_t*	linedef;
+  angle_t angle;
 
-    // Sector references.
-    // Could be retrieved from linedef, too.
-    // backsector is NULL for one sided lines
-    sector_t*	frontsector;
-    sector_t*	backsector;
-    
+  side_t *sidedef;
+  line_t *linedef;
+
+  /* Sector references.
+   * Could be retrieved from linedef, too.
+   * backsector is NULL for one sided lines
+   */
+
+  sector_t *frontsector;
+  sector_t *backsector;
 } seg_t;
 
+/* BSP node. */
 
-
-//
-// BSP node.
-//
 typedef struct
 {
-    // Partition line.
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	dx;
-    fixed_t	dy;
+  /* Partition line. */
 
-    // Bounding box for each child.
-    fixed_t	bbox[2][4];
+  fixed_t x;
+  fixed_t y;
+  fixed_t dx;
+  fixed_t dy;
 
-    // If NF_SUBSECTOR its a subsector.
-    unsigned short children[2];
-    
+  /* Bounding box for each child. */
+
+  fixed_t bbox[2][4];
+
+  /* If NF_SUBSECTOR its a subsector. */
+
+  unsigned short children[2];
 } node_t;
 
+/* PC direct to screen pointers
+ * B UNUSED - keep till detailshift in r_draw.c resolved
+ * extern byte* destview;
+ * extern byte* destscreen;
+ */
 
+/* OTHER TYPES */
 
+/* This could be wider for >8 bit display.
+ *
+ * Indeed, true color support is possible precalculating 24bpp
+ * lightmap/colormap LUT. from darkening PLAYPAL to all black. Could even
+ * use more than 32 levels.
+ */
 
-// PC direct to screen pointers
-//B UNUSED - keep till detailshift in r_draw.c resolved
-//extern byte*	destview;
-//extern byte*	destscreen;
+typedef pixel_t lighttable_t;
 
+/* ? */
 
-
-
-
-//
-// OTHER TYPES
-//
-
-// This could be wider for >8 bit display.
-// Indeed, true color support is posibble
-//  precalculating 24bpp lightmap/colormap LUT.
-//  from darkening PLAYPAL to all black.
-// Could even us emore than 32 levels.
-typedef pixel_t		lighttable_t;
-
-
-
-
-//
-// ?
-//
 typedef struct drawseg_s
 {
-    seg_t*		curline;
-    int			x1;
-    int			x2;
+  seg_t *curline;
+  int x1;
+  int x2;
 
-    fixed_t		scale1;
-    fixed_t		scale2;
-    fixed_t		scalestep;
+  fixed_t scale1;
+  fixed_t scale2;
+  fixed_t scalestep;
 
-    // 0=none, 1=bottom, 2=top, 3=both
-    int			silhouette;
+  /* 0=none, 1=bottom, 2=top, 3=both */
 
-    // do not clip sprites above this
-    fixed_t		bsilheight;
+  int silhouette;
 
-    // do not clip sprites below this
-    fixed_t		tsilheight;
-    
-    // Pointers to lists for sprite clipping,
-    //  all three adjusted so [x1] is first value.
-    short*		sprtopclip;		
-    short*		sprbottomclip;	
-    short*		maskedtexturecol;
-    
+  /* do not clip sprites above this */
+
+  fixed_t bsilheight;
+
+  /* do not clip sprites below this */
+
+  fixed_t tsilheight;
+
+  /* Pointers to lists for sprite clipping, all three adjusted so [x1] is
+   * first value.
+   */
+
+  short *sprtopclip;
+  short *sprbottomclip;
+  short *maskedtexturecol;
 } drawseg_t;
 
+/* A vissprite_t is a thing that will be drawn during a refresh.
+ *
+ * I.e. a sprite object that is partly visible.
+ */
 
-
-// A vissprite_t is a thing
-//  that will be drawn during a refresh.
-// I.e. a sprite object that is partly visible.
 typedef struct vissprite_s
 {
-    // Doubly linked list.
-    struct vissprite_s*	prev;
-    struct vissprite_s*	next;
-    
-    int			x1;
-    int			x2;
+  /* Doubly linked list. */
 
-    // for line side calculation
-    fixed_t		gx;
-    fixed_t		gy;		
+  struct vissprite_s *prev;
+  struct vissprite_s *next;
 
-    // global bottom / top for silhouette clipping
-    fixed_t		gz;
-    fixed_t		gzt;
+  int x1;
+  int x2;
 
-    // horizontal position of x1
-    fixed_t		startfrac;
-    
-    fixed_t		scale;
-    
-    // negative if flipped
-    fixed_t		xiscale;	
+  /* for line side calculation */
 
-    fixed_t		texturemid;
-    int			patch;
+  fixed_t gx;
+  fixed_t gy;
 
-    // for color translation and shadow draw,
-    //  maxbright frames as well
-    lighttable_t*	colormap;
-   
-    int			mobjflags;
-    
+  /* global bottom / top for silhouette clipping */
+
+  fixed_t gz;
+  fixed_t gzt;
+
+  /* horizontal position of x1 */
+
+  fixed_t startfrac;
+
+  fixed_t scale;
+
+  /* negative if flipped */
+
+  fixed_t xiscale;
+
+  fixed_t texturemid;
+  int patch;
+
+  /* for color translation and shadow draw, maxbright frames as well */
+
+  lighttable_t *colormap;
+
+  int mobjflags;
 } vissprite_t;
 
+/* Sprites are patches with a special naming convention so they can be
+ * recognized by r_init_sprites.
+ *
+ * The base name is NNNNFx or NNNNFxFx, with x indicating the rotation,
+ * x = 0, 1-7.
+ *
+ * The sprite and frame specified by a thing_t is range checked at run time.
+ *
+ * A sprite is a patch_t that is assumed to represent a three dimensional
+ * object and may have multiple rotations pre drawn.
+ *
+ * Horizontal flipping is used to save space, thus NNNNF2F5 defines a
+ * mirrored patch.
+ *
+ * Some sprites will only have one picture used for all views: NNNNF0
+ */
 
-//	
-// Sprites are patches with a special naming convention
-//  so they can be recognized by R_InitSprites.
-// The base name is NNNNFx or NNNNFxFx, with
-//  x indicating the rotation, x = 0, 1-7.
-// The sprite and frame specified by a thing_t
-//  is range checked at run time.
-// A sprite is a patch_t that is assumed to represent
-//  a three dimensional object and may have multiple
-//  rotations pre drawn.
-// Horizontal flipping is used to save space,
-//  thus NNNNF2F5 defines a mirrored patch.
-// Some sprites will only have one picture used
-// for all views: NNNNF0
-//
 typedef struct
 {
-    // If false use 0 for any position.
-    // Note: as eight entries are available,
-    //  we might as well insert the same name eight times.
-    boolean	rotate;
+  /* If false use 0 for any position.
+   * Note: as eight entries are available, we might as well insert the same
+   * name eight times.
+   */
 
-    // Lump to use for view angles 0-7.
-    short	lump[8];
+  boolean rotate;
 
-    // Flip bit (1 = flip) to use for view angles 0-7.
-    byte	flip[8];
-    
+  /* Lump to use for view angles 0-7. */
+
+  short lump[8];
+
+  /* Flip bit (1 = flip) to use for view angles 0-7. */
+
+  byte flip[8];
 } spriteframe_t;
 
+/* A sprite definition: a number of animation frames. */
 
-
-//
-// A sprite definition:
-//  a number of animation frames.
-//
 typedef struct
 {
-    int			numframes;
-    spriteframe_t*	spriteframes;
-
+  int numframes;
+  spriteframe_t *spriteframes;
 } spritedef_t;
 
+/* Now what is a visplane, anyway? */
 
-
-//
-// Now what is a visplane, anyway?
-// 
 typedef struct
 {
-  fixed_t		height;
-  int			picnum;
-  int			lightlevel;
-  int			minx;
-  int			maxx;
-  
-  // leave pads for [minx-1]/[maxx+1]
-  
-  byte		pad1;
-  // Here lies the rub for all
-  //  dynamic resize/change of resolution.
-  byte		top[SCREENWIDTH];
-  byte		pad2;
-  byte		pad3;
-  // See above.
-  byte		bottom[SCREENWIDTH];
-  byte		pad4;
+  fixed_t height;
+  int picnum;
+  int lightlevel;
+  int minx;
+  int maxx;
 
+  /* leave pads for [minx-1]/[maxx+1] */
+
+  byte pad1;
+
+  /* Here lies the rub for all dynamic resize/change of resolution. */
+
+  byte top[SCREENWIDTH];
+  byte pad2;
+  byte pad3;
+
+  /* See above. */
+
+  byte bottom[SCREENWIDTH];
+  byte pad4;
 } visplane_t;
 
-
-
-
-#endif
+#endif /* __R_DEFS__ */
diff --git a/games/NXDoom/src/doom/r_draw.c b/games/NXDoom/src/doom/r_draw.c
index 4fc41b5d5..ff243912a 100644
--- a/games/NXDoom/src/doom/r_draw.c
+++ b/games/NXDoom/src/doom/r_draw.c
@@ -1,959 +1,965 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The actual span/column drawing functions.
-//	Here find the main potential for optimization,
-//	 e.g. inline assembly, different algorithms.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_draw.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  The actual span/column drawing functions.
+ *  Here find the main potential for optimization, e.g. inline assembly,
+ *  different algorithms.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-
-#include "doomdef.h"
 #include "deh_main.h"
+#include "doomdef.h"
 
 #include "i_system.h"
-#include "z_zone.h"
 #include "w_wad.h"
+#include "z_zone.h"
 
 #include "r_local.h"
 
-// Needs access to LFB (guess what).
+/* Needs access to LFB (guess what). */
+
 #include "v_video.h"
 
-// State.
+/* State. */
+
 #include "doomstat.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// ?
-#define MAXWIDTH			1120
-#define MAXHEIGHT			832
+/* ? */
 
-// status bar height at bottom of screen
-#define SBARHEIGHT		32
+#define MAXWIDTH 1120
+#define MAXHEIGHT 832
 
-//
-// All drawing to the view buffer is accomplished in this file.
-// The other refresh files only know about ccordinates,
-//  not the architecture of the frame buffer.
-// Conveniently, the frame buffer is a linear one,
-//  and we need only the base address,
-//  and the total size == width*height*depth/8.,
-//
+/* status bar height at bottom of screen */
 
+#define SBARHEIGHT 32
 
-byte*		viewimage; 
-int		viewwidth;
-int		scaledviewwidth;
-int		viewheight;
-int		viewwindowx;
-int		viewwindowy; 
-pixel_t*		ylookup[MAXHEIGHT];
-int		columnofs[MAXWIDTH]; 
+/* Spectre/Invisibility. */
 
-// Color tables for different players,
-//  translate a limited part to another
-//  (color ramps used for  suit colors).
-//
-byte		translations[3][256];	
- 
-// Backing buffer containing the bezel drawn around the screen and 
-// surrounding background.
+#define FUZZTABLE 50
+#define FUZZOFF (SCREENWIDTH)
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* All drawing to the view buffer is accomplished in this file.
+ *
+ * The other refresh files only know about coordinates, not the architecture
+ * of the frame buffer.
+ *
+ * Conveniently, the frame buffer is a linear one, and we need only the base
+ * address, and the total size == width*height*depth/8.,
+ */
+
+byte *viewimage;
+int viewwidth;
+int scaledviewwidth;
+int viewheight;
+int viewwindowx;
+int viewwindowy;
+pixel_t *ylookup[MAXHEIGHT];
+int columnofs[MAXWIDTH];
+
+/* Color tables for different players, translate a limited part to another
+ * (color ramps used for  suit colors).
+ */
+
+byte translations[3][256];
+
+lighttable_t *dc_colormap;
+int dc_x;
+int dc_yl;
+int dc_yh;
+fixed_t dc_iscale;
+fixed_t dc_texturemid;
+
+/* first pixel in a column (possibly virtual) */
+
+byte *dc_source;
+
+int fuzzoffset[FUZZTABLE] =
+{
+  FUZZOFF,  -FUZZOFF, FUZZOFF,  -FUZZOFF, FUZZOFF,  FUZZOFF,  -FUZZOFF,
+  FUZZOFF,  FUZZOFF,  -FUZZOFF, FUZZOFF,  FUZZOFF,  FUZZOFF,  -FUZZOFF,
+  FUZZOFF,  FUZZOFF,  FUZZOFF,  -FUZZOFF, -FUZZOFF, -FUZZOFF, -FUZZOFF,
+  FUZZOFF,  -FUZZOFF, -FUZZOFF, FUZZOFF,  FUZZOFF,  FUZZOFF,  FUZZOFF,
+  -FUZZOFF, FUZZOFF,  -FUZZOFF, FUZZOFF,  FUZZOFF,  -FUZZOFF, -FUZZOFF,
+  FUZZOFF,  FUZZOFF,  -FUZZOFF, -FUZZOFF, -FUZZOFF, -FUZZOFF, FUZZOFF,
+  FUZZOFF,  FUZZOFF,  FUZZOFF,  -FUZZOFF, FUZZOFF,  FUZZOFF,  -FUZZOFF,
+  FUZZOFF,
+};
+
+int fuzzpos = 0;
+
+byte *dc_translation;
+byte *translationtables;
+
+int ds_y;
+int ds_x1;
+int ds_x2;
+
+lighttable_t *ds_colormap;
+
+fixed_t ds_xfrac;
+fixed_t ds_yfrac;
+fixed_t ds_xstep;
+fixed_t ds_ystep;
+
+/* start of a 64*64 tile image */
+
+byte *ds_source;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Backing buffer containing the bezel drawn around the screen and
+ * surrounding background.
+ */
 
 static pixel_t *background_buffer = NULL;
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-//
-// R_DrawColumn
-// Source is the top of the column to scale.
-//
-lighttable_t*		dc_colormap; 
-int			dc_x; 
-int			dc_yl; 
-int			dc_yh; 
-fixed_t			dc_iscale; 
-fixed_t			dc_texturemid;
+/* Source is the top of the column to scale.
+ *
+ * A column is a vertical slice/span from a wall texture that, given the DOOM
+ * style restrictions on the view orientation, will always have constant z
+ * depth.
+ *
+ * Thus a special case loop for very fast rendering can be used. It has also
+ * been used with Wolfenstein 3D.
+ */
 
-// first pixel in a column (possibly virtual) 
-byte*			dc_source;		
+void r_draw_column(void)
+{
+  int count;
+  pixel_t *dest;
+  fixed_t frac;
+  fixed_t fracstep;
 
-// just for profiling 
-int			dccount;
+  count = dc_yh - dc_yl;
 
-//
-// A column is a vertical slice/span from a wall texture that,
-//  given the DOOM style restrictions on the view orientation,
-//  will always have constant z depth.
-// Thus a special case loop for very fast rendering can
-//  be used. It has also been used with Wolfenstein 3D.
-// 
-void R_DrawColumn (void) 
-{ 
-    int			count; 
-    pixel_t*		dest;
-    fixed_t		frac;
-    fixed_t		fracstep;	 
- 
-    count = dc_yh - dc_yl; 
+  /* Zero length, column does not exceed a pixel. */
 
-    // Zero length, column does not exceed a pixel.
-    if (count < 0) 
-	return; 
-				 
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-	|| dc_yl < 0
-	|| dc_yh >= SCREENHEIGHT) 
-	I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x); 
-#endif 
+  if (count < 0) return;
 
-    // Framebuffer destination address.
-    // Use ylookup LUT to avoid multiply with ScreenWidth.
-    // Use columnofs LUT for subwindows? 
-    dest = ylookup[dc_yl] + columnofs[dc_x];  
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    i_error("r_draw_column: %i to %i at %i", dc_yl, dc_yh, dc_x);
+#endif
 
-    // Determine scaling,
-    //  which is the only mapping to be done.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
+  /* Framebuffer destination address.
+   * Use ylookup LUT to avoid multiply with ScreenWidth.
+   * Use columnofs LUT for subwindows?
+   */
 
-    // Inner loop that does the actual texture mapping,
-    //  e.g. a DDA-lile scaling.
-    // This is as fast as it gets.
-    do 
+  dest = ylookup[dc_yl] + columnofs[dc_x];
+
+  /* Determine scaling, which is the only mapping to be done. */
+
+  fracstep = dc_iscale;
+  frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+  /* Inner loop that does the actual texture mapping,
+   *  e.g. a DDA-lile scaling.
+   * This is as fast as it gets.
+   */
+
+  do
     {
-	// Re-map color indices from wall texture column
-	//  using a lighting/special effects LUT.
-	*dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
-	
-	dest += SCREENWIDTH; 
-	frac += fracstep;
-	
-    } while (count--); 
-} 
+      /* Re-map color indices from wall texture column
+       *  using a lighting/special effects LUT.
+       */
 
+      *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
 
+      dest += SCREENWIDTH;
+      frac += fracstep;
+    }
+  while (count--);
+}
+
+/* UNUSED. Loop unrolled. */
 
-// UNUSED.
-// Loop unrolled.
 #if 0
-void R_DrawColumn (void) 
-{ 
-    int			count; 
-    byte*		source;
-    byte*		dest;
-    byte*		colormap;
-    
-    unsigned		frac;
-    unsigned		fracstep;
-    unsigned		fracstep2;
-    unsigned		fracstep3;
-    unsigned		fracstep4;	 
- 
-    count = dc_yh - dc_yl + 1; 
-
-    source = dc_source;
-    colormap = dc_colormap;		 
-    dest = ylookup[dc_yl] + columnofs[dc_x];  
-	 
-    fracstep = dc_iscale<<9; 
-    frac = (dc_texturemid + (dc_yl-centery)*dc_iscale)<<9; 
- 
-    fracstep2 = fracstep+fracstep;
-    fracstep3 = fracstep2+fracstep;
-    fracstep4 = fracstep3+fracstep;
-	
-    while (count >= 8) 
-    { 
-	dest[0] = colormap[source[frac>>25]]; 
-	dest[SCREENWIDTH] = colormap[source[(frac+fracstep)>>25]]; 
-	dest[SCREENWIDTH*2] = colormap[source[(frac+fracstep2)>>25]]; 
-	dest[SCREENWIDTH*3] = colormap[source[(frac+fracstep3)>>25]];
-	
-	frac += fracstep4; 
-
-	dest[SCREENWIDTH*4] = colormap[source[frac>>25]]; 
-	dest[SCREENWIDTH*5] = colormap[source[(frac+fracstep)>>25]]; 
-	dest[SCREENWIDTH*6] = colormap[source[(frac+fracstep2)>>25]]; 
-	dest[SCREENWIDTH*7] = colormap[source[(frac+fracstep3)>>25]]; 
-
-	frac += fracstep4; 
-	dest += SCREENWIDTH*8; 
-	count -= 8;
-    } 
-	
-    while (count > 0)
-    { 
-	*dest = colormap[source[frac>>25]]; 
-	dest += SCREENWIDTH; 
-	frac += fracstep; 
-	count--;
-    } 
-}
-#endif
-
-
-void R_DrawColumnLow (void) 
-{ 
-    int			count; 
-    pixel_t*		dest;
-    pixel_t*		dest2;
-    fixed_t		frac;
-    fixed_t		fracstep;	 
-    int                 x;
- 
-    count = dc_yh - dc_yl; 
-
-    // Zero length.
-    if (count < 0) 
-	return; 
-				 
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-	|| dc_yl < 0
-	|| dc_yh >= SCREENHEIGHT)
-    {
-	
-	I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-    }
-    //	dccount++; 
-#endif 
-    // Blocky mode, need to multiply by 2.
-    x = dc_x << 1;
-    
-    dest = ylookup[dc_yl] + columnofs[x];
-    dest2 = ylookup[dc_yl] + columnofs[x+1];
-    
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep;
-    
-    do 
-    {
-	// Hack. Does not work corretly.
-	*dest2 = *dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
-	dest += SCREENWIDTH;
-	dest2 += SCREENWIDTH;
-	frac += fracstep; 
-
-    } while (count--);
-}
-
-
-//
-// Spectre/Invisibility.
-//
-#define FUZZTABLE		50 
-#define FUZZOFF	(SCREENWIDTH)
-
-
-int	fuzzoffset[FUZZTABLE] =
+void r_draw_column(void)
 {
-    FUZZOFF,-FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,
-    FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,
-    FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,
-    FUZZOFF,-FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,
-    FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,-FUZZOFF,FUZZOFF,
-    FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,
-    FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF,FUZZOFF,-FUZZOFF,FUZZOFF 
-}; 
+  int count;
+  byte *source;
+  byte *dest;
+  byte *colormap;
 
-int	fuzzpos = 0; 
+  unsigned frac;
+  unsigned fracstep;
+  unsigned fracstep2;
+  unsigned fracstep3;
+  unsigned fracstep4;
 
+  count = dc_yh - dc_yl + 1;
 
-//
-// Framebuffer postprocessing.
-// Creates a fuzzy image by copying pixels
-//  from adjacent ones to left and right.
-// Used with an all black colormap, this
-//  could create the SHADOW effect,
-//  i.e. spectres and invisible players.
-//
-void R_DrawFuzzColumn (void) 
-{ 
-    int			count; 
-    pixel_t*		dest;
+  source = dc_source;
+  colormap = dc_colormap;
+  dest = ylookup[dc_yl] + columnofs[dc_x];
 
-    // Adjust borders. Low... 
-    if (!dc_yl) 
-	dc_yl = 1;
+  fracstep = dc_iscale << 9;
+  frac = (dc_texturemid + (dc_yl - centery) * dc_iscale) << 9;
 
-    // .. and high.
-    if (dc_yh == viewheight-1) 
-	dc_yh = viewheight - 2; 
-		 
-    count = dc_yh - dc_yl; 
+  fracstep2 = fracstep + fracstep;
+  fracstep3 = fracstep2 + fracstep;
+  fracstep4 = fracstep3 + fracstep;
 
-    // Zero length.
-    if (count < 0) 
-	return; 
-
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-	|| dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+  while (count >= 8)
     {
-	I_Error ("R_DrawFuzzColumn: %i to %i at %i",
-		 dc_yl, dc_yh, dc_x);
+      dest[0] = colormap[source[frac >> 25]];
+      dest[SCREENWIDTH] = colormap[source[(frac + fracstep) >> 25]];
+      dest[SCREENWIDTH * 2] = colormap[source[(frac + fracstep2) >> 25]];
+      dest[SCREENWIDTH * 3] = colormap[source[(frac + fracstep3) >> 25]];
+
+      frac += fracstep4;
+
+      dest[SCREENWIDTH * 4] = colormap[source[frac >> 25]];
+      dest[SCREENWIDTH * 5] = colormap[source[(frac + fracstep) >> 25]];
+      dest[SCREENWIDTH * 6] = colormap[source[(frac + fracstep2) >> 25]];
+      dest[SCREENWIDTH * 7] = colormap[source[(frac + fracstep3) >> 25]];
+
+      frac += fracstep4;
+      dest += SCREENWIDTH * 8;
+      count -= 8;
     }
+
+  while (count > 0)
+    {
+      *dest = colormap[source[frac >> 25]];
+      dest += SCREENWIDTH;
+      frac += fracstep;
+      count--;
+    }
+}
 #endif
-    
-    dest = ylookup[dc_yl] + columnofs[dc_x];
 
-    // Looks like an attempt at dithering,
-    //  using the colormap #6 (of 0-31, a bit
-    //  brighter than average).
-    do 
-    {
-	// Lookup framebuffer, and retrieve
-	//  a pixel that is either one column
-	//  left or right of the current one.
-	// Add index from colormap to index.
-	*dest = colormaps[6*256+dest[fuzzoffset[fuzzpos]]]; 
-
-	// Clamp table lookup index.
-	if (++fuzzpos == FUZZTABLE) 
-	    fuzzpos = 0;
-	
-	dest += SCREENWIDTH;
-    } while (count--); 
-} 
-
-// low detail mode version
- 
-void R_DrawFuzzColumnLow (void) 
-{ 
-    int			count; 
-    pixel_t*		dest;
-    pixel_t*		dest2;
-    int x;
-
-    // Adjust borders. Low... 
-    if (!dc_yl) 
-	dc_yl = 1;
-
-    // .. and high.
-    if (dc_yh == viewheight-1) 
-	dc_yh = viewheight - 2; 
-		 
-    count = dc_yh - dc_yl; 
-
-    // Zero length.
-    if (count < 0) 
-	return; 
-
-    // low detail mode, need to multiply by 2
-    
-    x = dc_x << 1;
-    
-#ifdef RANGECHECK 
-    if ((unsigned)x >= SCREENWIDTH
-	|| dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-    {
-	I_Error ("R_DrawFuzzColumn: %i to %i at %i",
-		 dc_yl, dc_yh, dc_x);
-    }
-#endif
-    
-    dest = ylookup[dc_yl] + columnofs[x];
-    dest2 = ylookup[dc_yl] + columnofs[x+1];
-
-    // Looks like an attempt at dithering,
-    //  using the colormap #6 (of 0-31, a bit
-    //  brighter than average).
-    do 
-    {
-	// Lookup framebuffer, and retrieve
-	//  a pixel that is either one column
-	//  left or right of the current one.
-	// Add index from colormap to index.
-	*dest = colormaps[6*256+dest[fuzzoffset[fuzzpos]]]; 
-	*dest2 = colormaps[6*256+dest2[fuzzoffset[fuzzpos]]]; 
-
-	// Clamp table lookup index.
-	if (++fuzzpos == FUZZTABLE) 
-	    fuzzpos = 0;
-	
-	dest += SCREENWIDTH;
-	dest2 += SCREENWIDTH;
-    } while (count--); 
-} 
- 
-  
-  
- 
-
-//
-// R_DrawTranslatedColumn
-// Used to draw player sprites
-//  with the green colorramp mapped to others.
-// Could be used with different translation
-//  tables, e.g. the lighter colored version
-//  of the BaronOfHell, the HellKnight, uses
-//  identical sprites, kinda brightened up.
-//
-byte*	dc_translation;
-byte*	translationtables;
-
-void R_DrawTranslatedColumn (void) 
-{ 
-    int			count; 
-    pixel_t*		dest;
-    fixed_t		frac;
-    fixed_t		fracstep;	 
- 
-    count = dc_yh - dc_yl; 
-    if (count < 0) 
-	return; 
-				 
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-	|| dc_yl < 0
-	|| dc_yh >= SCREENHEIGHT)
-    {
-	I_Error ( "R_DrawColumn: %i to %i at %i",
-		  dc_yl, dc_yh, dc_x);
-    }
-    
-#endif 
-
-
-    dest = ylookup[dc_yl] + columnofs[dc_x]; 
-
-    // Looks familiar.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    // Here we do an additional index re-mapping.
-    do 
-    {
-	// Translation tables are used
-	//  to map certain colorramps to other ones,
-	//  used with PLAY sprites.
-	// Thus the "green" ramp of the player 0 sprite
-	//  is mapped to gray, red, black/indigo. 
-	*dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
-	dest += SCREENWIDTH;
-	
-	frac += fracstep; 
-    } while (count--); 
-} 
-
-void R_DrawTranslatedColumnLow (void) 
-{ 
-    int			count; 
-    pixel_t*		dest;
-    pixel_t*		dest2;
-    fixed_t		frac;
-    fixed_t		fracstep;	 
-    int                 x;
- 
-    count = dc_yh - dc_yl; 
-    if (count < 0) 
-	return; 
-
-    // low detail, need to scale by 2
-    x = dc_x << 1;
-				 
-#ifdef RANGECHECK 
-    if ((unsigned)x >= SCREENWIDTH
-	|| dc_yl < 0
-	|| dc_yh >= SCREENHEIGHT)
-    {
-	I_Error ( "R_DrawColumn: %i to %i at %i",
-		  dc_yl, dc_yh, x);
-    }
-    
-#endif 
-
-
-    dest = ylookup[dc_yl] + columnofs[x]; 
-    dest2 = ylookup[dc_yl] + columnofs[x+1]; 
-
-    // Looks familiar.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    // Here we do an additional index re-mapping.
-    do 
-    {
-	// Translation tables are used
-	//  to map certain colorramps to other ones,
-	//  used with PLAY sprites.
-	// Thus the "green" ramp of the player 0 sprite
-	//  is mapped to gray, red, black/indigo. 
-	*dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
-	*dest2 = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
-	dest += SCREENWIDTH;
-	dest2 += SCREENWIDTH;
-	
-	frac += fracstep; 
-    } while (count--); 
-} 
-
-
-
-
-//
-// R_InitTranslationTables
-// Creates the translation tables to map
-//  the green color ramp to gray, brown, red.
-// Assumes a given structure of the PLAYPAL.
-// Could be read from a lump instead.
-//
-void R_InitTranslationTables (void)
+void r_draw_column_low(void)
 {
-    int		i;
-	
-    translationtables = Z_Malloc (256*3, PU_STATIC, 0);
-    
-    // translate just the 16 green colors
-    for (i=0 ; i<256 ; i++)
+  int count;
+  pixel_t *dest;
+  pixel_t *dest2;
+  fixed_t frac;
+  fixed_t fracstep;
+  int x;
+
+  count = dc_yh - dc_yl;
+
+  /* Zero length. */
+
+  if (count < 0) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
     {
-	if (i >= 0x70 && i<= 0x7f)
-	{
-	    // map green ramp to gray, brown, red
-	    translationtables[i] = 0x60 + (i&0xf);
-	    translationtables [i+256] = 0x40 + (i&0xf);
-	    translationtables [i+512] = 0x20 + (i&0xf);
-	}
-	else
-	{
-	    // Keep all other colors as is.
-	    translationtables[i] = translationtables[i+256] 
-		= translationtables[i+512] = i;
-	}
+      i_error("r_draw_column: %i to %i at %i", dc_yl, dc_yh, dc_x);
     }
-}
-
-
-
-
-//
-// R_DrawSpan 
-// With DOOM style restrictions on view orientation,
-//  the floors and ceilings consist of horizontal slices
-//  or spans with constant z depth.
-// However, rotation around the world z axis is possible,
-//  thus this mapping, while simpler and faster than
-//  perspective correct texture mapping, has to traverse
-//  the texture at an angle in all but a few cases.
-// In consequence, flats are not stored by column (like walls),
-//  and the inner loop has to step in texture space u and v.
-//
-int			ds_y; 
-int			ds_x1; 
-int			ds_x2;
-
-lighttable_t*		ds_colormap; 
-
-fixed_t			ds_xfrac; 
-fixed_t			ds_yfrac; 
-fixed_t			ds_xstep; 
-fixed_t			ds_ystep;
-
-// start of a 64*64 tile image 
-byte*			ds_source;	
-
-// just for profiling
-int			dscount;
-
-
-//
-// Draws the actual span.
-void R_DrawSpan (void) 
-{ 
-    unsigned int position, step;
-    pixel_t *dest;
-    int count;
-    int spot;
-    unsigned int xtemp, ytemp;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1
-	|| ds_x1<0
-	|| ds_x2>=SCREENWIDTH
-	|| (unsigned)ds_y>SCREENHEIGHT)
-    {
-	I_Error( "R_DrawSpan: %i to %i at %i",
-		 ds_x1,ds_x2,ds_y);
-    }
-//	dscount++;
 #endif
 
-    // Pack position and step variables into a single 32-bit integer,
-    // with x in the top 16 bits and y in the bottom 16 bits.  For
-    // each 16-bit part, the top 6 bits are the integer part and the
-    // bottom 10 bits are the fractional part of the pixel position.
+  /* Blocky mode, need to multiply by 2. */
 
-    position = ((ds_xfrac << 10) & 0xffff0000)
-             | ((ds_yfrac >> 6)  & 0x0000ffff);
-    step = ((ds_xstep << 10) & 0xffff0000)
-         | ((ds_ystep >> 6)  & 0x0000ffff);
+  x = dc_x << 1;
 
-    dest = ylookup[ds_y] + columnofs[ds_x1];
+  dest = ylookup[dc_yl] + columnofs[x];
+  dest2 = ylookup[dc_yl] + columnofs[x + 1];
 
-    // We do not check for zero spans here?
-    count = ds_x2 - ds_x1;
+  fracstep = dc_iscale;
+  frac = dc_texturemid + (dc_yl - centery) * fracstep;
 
-    do
+  do
     {
-	// Calculate current texture index in u,v.
-        ytemp = (position >> 4) & 0x0fc0;
-        xtemp = (position >> 26);
-        spot = xtemp | ytemp;
+      /* Hack. Does not work correctly. */
 
-	// Lookup pixel from flat texture tile,
-	//  re-index using light/colormap.
-	*dest++ = ds_colormap[ds_source[spot]];
-
-        position += step;
-
-    } while (count--);
+      *dest2 = *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
+      dest += SCREENWIDTH;
+      dest2 += SCREENWIDTH;
+      frac += fracstep;
+    }
+  while (count--);
 }
 
+/* Framebuffer postprocessing.
+ *
+ * Creates a fuzzy image by copying pixels from adjacent ones to left and
+ * right.
+ *
+ * Used with an all black colormap, this could create the SHADOW effect, i.e.
+ * spectres and invisible players.
+ */
 
-
-// UNUSED.
-// Loop unrolled by 4.
-#if 0
-void R_DrawSpan (void) 
-{ 
-    unsigned	position, step;
-
-    byte*	source;
-    byte*	colormap;
-    pixel_t*	dest;
-    
-    unsigned	count;
-    usingned	spot; 
-    unsigned	value;
-    unsigned	temp;
-    unsigned	xtemp;
-    unsigned	ytemp;
-		
-    position = ((ds_xfrac<<10)&0xffff0000) | ((ds_yfrac>>6)&0xffff);
-    step = ((ds_xstep<<10)&0xffff0000) | ((ds_ystep>>6)&0xffff);
-		
-    source = ds_source;
-    colormap = ds_colormap;
-    dest = ylookup[ds_y] + columnofs[ds_x1];	 
-    count = ds_x2 - ds_x1 + 1; 
-	
-    while (count >= 4) 
-    { 
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[0] = colormap[source[spot]]; 
-
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[1] = colormap[source[spot]];
-	
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[2] = colormap[source[spot]];
-	
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[3] = colormap[source[spot]]; 
-		
-	count -= 4;
-	dest += 4;
-    } 
-    while (count > 0) 
-    { 
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	*dest++ = colormap[source[spot]]; 
-	count--;
-    } 
-} 
-#endif
-
-
-//
-// Again..
-//
-void R_DrawSpanLow (void)
+void r_draw_fuzz_column(void)
 {
-    unsigned int position, step;
-    unsigned int xtemp, ytemp;
-    pixel_t *dest;
-    int count;
-    int spot;
+  int count;
+  pixel_t *dest;
 
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1
-	|| ds_x1<0
-	|| ds_x2>=SCREENWIDTH
-	|| (unsigned)ds_y>SCREENHEIGHT)
+  /* Adjust borders. Low... */
+
+  if (!dc_yl) dc_yl = 1;
+
+  /* .. and high. */
+
+  if (dc_yh == viewheight - 1) dc_yh = viewheight - 2;
+
+  count = dc_yh - dc_yl;
+
+  /* Zero length. */
+
+  if (count < 0) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
     {
-	I_Error( "R_DrawSpan: %i to %i at %i",
-		 ds_x1,ds_x2,ds_y);
+      i_error("r_draw_fuzz_column: %i to %i at %i", dc_yl, dc_yh, dc_x);
     }
-//	dscount++; 
 #endif
 
-    position = ((ds_xfrac << 10) & 0xffff0000)
-             | ((ds_yfrac >> 6)  & 0x0000ffff);
-    step = ((ds_xstep << 10) & 0xffff0000)
-         | ((ds_ystep >> 6)  & 0x0000ffff);
+  dest = ylookup[dc_yl] + columnofs[dc_x];
 
-    count = (ds_x2 - ds_x1);
+  /* Looks like an attempt at dithering,
+   *  using the colormap #6 (of 0-31, a bit
+   *  brighter than average).
+   */
 
-    // Blocky mode, need to multiply by 2.
-    ds_x1 <<= 1;
-    ds_x2 <<= 1;
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-
-    do
+  do
     {
-	// Calculate current texture index in u,v.
-        ytemp = (position >> 4) & 0x0fc0;
-        xtemp = (position >> 26);
-        spot = xtemp | ytemp;
+      /* Lookup framebuffer, and retrieve a pixel that is either one column
+       * left or right of the current one. Add index from colormap to index.
+       */
 
-	// Lowres/blocky mode does it twice,
-	//  while scale is adjusted appropriately.
-	*dest++ = ds_colormap[ds_source[spot]];
-	*dest++ = ds_colormap[ds_source[spot]];
+      *dest = colormaps[6 * 256 + dest[fuzzoffset[fuzzpos]]];
 
-	position += step;
+      /* Clamp table lookup index. */
 
-    } while (count--);
+      if (++fuzzpos == FUZZTABLE) fuzzpos = 0;
+
+      dest += SCREENWIDTH;
+    }
+  while (count--);
 }
 
-//
-// R_InitBuffer 
-// Creats lookup tables that avoid
-//  multiplies and other hazzles
-//  for getting the framebuffer address
-//  of a pixel to draw.
-//
-void
-R_InitBuffer
-( int		width,
-  int		height ) 
-{ 
-    int		i; 
+/* low detail mode version */
 
-    // Handle resize,
-    //  e.g. smaller view windows
-    //  with border and/or status bar.
-    viewwindowx = (SCREENWIDTH-width) >> 1; 
+void r_draw_fuzz_column_low(void)
+{
+  int count;
+  pixel_t *dest;
+  pixel_t *dest2;
+  int x;
 
-    // Column offset. For windows.
-    for (i=0 ; i<width ; i++) 
-	columnofs[i] = viewwindowx + i;
+  /* Adjust borders. Low... */
 
-    // Samw with base row offset.
-    if (width == SCREENWIDTH) 
-	viewwindowy = 0; 
-    else 
-	viewwindowy = (SCREENHEIGHT-SBARHEIGHT-height) >> 1; 
+  if (!dc_yl) dc_yl = 1;
 
-    // Preclaculate all row offsets.
-    for (i=0 ; i<height ; i++) 
-	ylookup[i] = I_VideoBuffer + (i+viewwindowy)*SCREENWIDTH; 
-} 
- 
- 
+  /* .. and high. */
 
+  if (dc_yh == viewheight - 1) dc_yh = viewheight - 2;
 
-//
-// R_FillBackScreen
-// Fills the back screen with a pattern
-//  for variable screen sizes
-// Also draws a beveled edge.
-//
-void R_FillBackScreen (void) 
-{ 
-    byte*	src;
-    pixel_t*	dest;
-    int		x;
-    int		y; 
-    patch_t*	patch;
+  count = dc_yh - dc_yl;
 
-    // DOOM border patch.
-    const char *name1 = DEH_String("FLOOR7_2");
+  /* Zero length. */
 
-    // DOOM II border patch.
-    const char *name2 = DEH_String("GRNROCK");
+  if (count < 0) return;
 
-    const char *name;
+  /* low detail mode, need to multiply by 2 */
 
-    // If we are running full screen, there is no need to do any of this,
-    // and the background buffer can be freed if it was previously in use.
+  x = dc_x << 1;
 
-    if (scaledviewwidth == SCREENWIDTH)
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
     {
-        if (background_buffer != NULL)
+      i_error("r_draw_fuzz_column: %i to %i at %i", dc_yl, dc_yh, dc_x);
+    }
+#endif
+
+  dest = ylookup[dc_yl] + columnofs[x];
+  dest2 = ylookup[dc_yl] + columnofs[x + 1];
+
+  /* Looks like an attempt at dithering, using the colormap #6
+   * (of 0-31, a bit brighter than average).
+   */
+
+  do
+    {
+      /* Lookup framebuffer, and retrieve a pixel that is either one column
+       * left or right of the current one. Add index from colormap to index.
+       */
+
+      *dest = colormaps[6 * 256 + dest[fuzzoffset[fuzzpos]]];
+      *dest2 = colormaps[6 * 256 + dest2[fuzzoffset[fuzzpos]]];
+
+      /* Clamp table lookup index. */
+
+      if (++fuzzpos == FUZZTABLE) fuzzpos = 0;
+
+      dest += SCREENWIDTH;
+      dest2 += SCREENWIDTH;
+    }
+  while (count--);
+}
+
+/* r_draw_translated_column
+ *
+ * Used to draw player sprites with the green colorramp mapped to others.
+ *
+ * Could be used with different translation tables, e.g. the lighter colored
+ * version of the BaronOfHell, the HellKnight, uses identical sprites, kinda
+ * brightened up.
+ */
+
+void r_draw_translated_column(void)
+{
+  int count;
+  pixel_t *dest;
+  fixed_t frac;
+  fixed_t fracstep;
+
+  count = dc_yh - dc_yl;
+  if (count < 0) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    {
+      i_error("r_draw_column: %i to %i at %i", dc_yl, dc_yh, dc_x);
+    }
+
+#endif
+
+  dest = ylookup[dc_yl] + columnofs[dc_x];
+
+  /* Looks familiar. */
+
+  fracstep = dc_iscale;
+  frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+  /* Here we do an additional index re-mapping. */
+
+  do
+    {
+      /* Translation tables are used to map certain colorramps to other ones,
+       * used with PLAY sprites.
+       *
+       * Thus the "green" ramp of the player 0 sprite is mapped to gray, red,
+       * black/indigo.
+       */
+
+      *dest = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
+      dest += SCREENWIDTH;
+
+      frac += fracstep;
+    }
+  while (count--);
+}
+
+void r_draw_translated_column_low(void)
+{
+  int count;
+  pixel_t *dest;
+  pixel_t *dest2;
+  fixed_t frac;
+  fixed_t fracstep;
+  int x;
+
+  count = dc_yh - dc_yl;
+  if (count < 0) return;
+
+  /* low detail, need to scale by 2 */
+
+  x = dc_x << 1;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
+    {
+      i_error("r_draw_column: %i to %i at %i", dc_yl, dc_yh, x);
+    }
+
+#endif
+
+  dest = ylookup[dc_yl] + columnofs[x];
+  dest2 = ylookup[dc_yl] + columnofs[x + 1];
+
+  /* Looks familiar. */
+
+  fracstep = dc_iscale;
+  frac = dc_texturemid + (dc_yl - centery) * fracstep;
+
+  /* Here we do an additional index re-mapping. */
+
+  do
+    {
+      /* Translation tables are used to map certain colorramps to other ones,
+       * used with PLAY sprites.
+       *
+       * Thus the "green" ramp of the player 0 sprite is mapped to gray, red,
+       * black/indigo.
+       */
+
+      *dest = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
+      *dest2 = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
+      dest += SCREENWIDTH;
+      dest2 += SCREENWIDTH;
+
+      frac += fracstep;
+    }
+  while (count--);
+}
+
+/* r_init_translation_table
+ *
+ * Creates the translation tables to map the green color ramp to gray, brown,
+ * red.
+ *
+ * Assumes a given structure of the PLAYPAL. Could be read from a lump
+ * instead.
+ */
+
+void r_init_translation_table(void)
+{
+  int i;
+
+  translationtables = z_malloc(256 * 3, PU_STATIC, 0);
+
+  /* translate just the 16 green colors */
+
+  for (i = 0; i < 256; i++)
+    {
+      if (i >= 0x70 && i <= 0x7f)
         {
-            Z_Free(background_buffer);
-            background_buffer = NULL;
+          /* map green ramp to gray, brown, red */
+
+          translationtables[i] = 0x60 + (i & 0xf);
+          translationtables[i + 256] = 0x40 + (i & 0xf);
+          translationtables[i + 512] = 0x20 + (i & 0xf);
+        }
+      else
+        {
+          /* Keep all other colors as is. */
+
+          translationtables[i] = translationtables[i + 256] =
+              translationtables[i + 512] = i;
+        }
+    }
+}
+
+/* r_draw_span
+ *
+ * With DOOM style restrictions on view orientation, the floors and ceilings
+ * consist of horizontal slices or spans with constant z depth.
+ *
+ * However, rotation around the world z axis is possible, thus this mapping,
+ * while simpler and faster than perspective correct texture mapping, has to
+ * traverse the texture at an angle in all but a few cases.
+ *
+ * In consequence, flats are not stored by column (like walls), and the inner
+ * loop has to step in texture space u and v.
+ *
+ * Draws the actual span.
+ */
+
+void r_draw_span(void)
+{
+  unsigned int position;
+  unsigned int step;
+  pixel_t *dest;
+  int count;
+  int spot;
+  unsigned int xtemp;
+  unsigned int ytemp;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH ||
+      (unsigned)ds_y > SCREENHEIGHT)
+    {
+      i_error("r_draw_span: %i to %i at %i", ds_x1, ds_x2, ds_y);
+    }
+#endif
+
+  /* Pack position and step variables into a single 32-bit integer,
+   * with x in the top 16 bits and y in the bottom 16 bits.  For
+   * each 16-bit part, the top 6 bits are the integer part and the
+   * bottom 10 bits are the fractional part of the pixel position.
+   */
+
+  position = ((ds_xfrac << 10) & 0xffff0000) |
+      ((ds_yfrac >> 6) & 0x0000ffff);
+  step = ((ds_xstep << 10) & 0xffff0000) | ((ds_ystep >> 6) & 0x0000ffff);
+
+  dest = ylookup[ds_y] + columnofs[ds_x1];
+
+  /* We do not check for zero spans here? */
+
+  count = ds_x2 - ds_x1;
+
+  do
+    {
+      /* Calculate current texture index in u,v. */
+
+      ytemp = (position >> 4) & 0x0fc0;
+      xtemp = (position >> 26);
+      spot = xtemp | ytemp;
+
+      /* Lookup pixel from flat texture tile, re-index using light/colormap.
+       */
+
+      *dest++ = ds_colormap[ds_source[spot]];
+
+      position += step;
+    }
+  while (count--);
+}
+
+/* UNUSED. Loop unrolled by 4. */
+
+#if 0
+void r_draw_span(void)
+{
+  unsigned position;
+  unsigned step;
+
+  byte *source;
+  byte *colormap;
+  pixel_t *dest;
+
+  unsigned count;
+  usingned spot;
+  unsigned value;
+  unsigned temp;
+  unsigned xtemp;
+  unsigned ytemp;
+
+  position = ((ds_xfrac << 10) & 0xffff0000) | ((ds_yfrac >> 6) & 0xffff);
+  step = ((ds_xstep << 10) & 0xffff0000) | ((ds_ystep >> 6) & 0xffff);
+
+  source = ds_source;
+  colormap = ds_colormap;
+  dest = ylookup[ds_y] + columnofs[ds_x1];
+  count = ds_x2 - ds_x1 + 1;
+
+  while (count >= 4)
+    {
+      ytemp = position >> 4;
+      ytemp = ytemp & 4032;
+      xtemp = position >> 26;
+      spot = xtemp | ytemp;
+      position += step;
+      dest[0] = colormap[source[spot]];
+
+      ytemp = position >> 4;
+      ytemp = ytemp & 4032;
+      xtemp = position >> 26;
+      spot = xtemp | ytemp;
+      position += step;
+      dest[1] = colormap[source[spot]];
+
+      ytemp = position >> 4;
+      ytemp = ytemp & 4032;
+      xtemp = position >> 26;
+      spot = xtemp | ytemp;
+      position += step;
+      dest[2] = colormap[source[spot]];
+
+      ytemp = position >> 4;
+      ytemp = ytemp & 4032;
+      xtemp = position >> 26;
+      spot = xtemp | ytemp;
+      position += step;
+      dest[3] = colormap[source[spot]];
+
+      count -= 4;
+      dest += 4;
+    }
+  while (count > 0)
+    {
+      ytemp = position >> 4;
+      ytemp = ytemp & 4032;
+      xtemp = position >> 26;
+      spot = xtemp | ytemp;
+      position += step;
+      *dest++ = colormap[source[spot]];
+      count--;
+    }
+}
+#endif
+
+/* Again.. */
+
+void r_draw_span_low(void)
+{
+  unsigned int position;
+  unsigned int step;
+  unsigned int xtemp;
+  unsigned int ytemp;
+  pixel_t *dest;
+  int count;
+  int spot;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH ||
+      (unsigned)ds_y > SCREENHEIGHT)
+    {
+      i_error("r_draw_span: %i to %i at %i", ds_x1, ds_x2, ds_y);
+    }
+#endif
+
+  position = ((ds_xfrac << 10) & 0xffff0000) |
+      ((ds_yfrac >> 6) & 0x0000ffff);
+  step = ((ds_xstep << 10) & 0xffff0000) | ((ds_ystep >> 6) & 0x0000ffff);
+
+  count = (ds_x2 - ds_x1);
+
+  /* Blocky mode, need to multiply by 2. */
+
+  ds_x1 <<= 1;
+  ds_x2 <<= 1;
+
+  dest = ylookup[ds_y] + columnofs[ds_x1];
+
+  do
+    {
+      /* Calculate current texture index in u,v. */
+
+      ytemp = (position >> 4) & 0x0fc0;
+      xtemp = (position >> 26);
+      spot = xtemp | ytemp;
+
+      /* Lowres/blocky mode does it twice, while scale is adjusted
+       * appropriately.
+       */
+
+      *dest++ = ds_colormap[ds_source[spot]];
+      *dest++ = ds_colormap[ds_source[spot]];
+
+      position += step;
+    }
+  while (count--);
+}
+
+/* r_init_buffer
+ *
+ * Creates lookup tables that avoid multiplies and other hazzles for getting
+ * the framebuffer address of a pixel to draw.
+ */
+
+void r_init_buffer(int width, int height)
+{
+  int i;
+
+  /* Handle resize,
+   *  e.g. smaller view windows
+   *  with border and/or status bar.
+   */
+
+  viewwindowx = (SCREENWIDTH - width) >> 1;
+
+  /* Column offset. For windows. */
+
+  for (i = 0; i < width; i++)
+    columnofs[i] = viewwindowx + i;
+
+  /* Samw with base row offset. */
+
+  if (width == SCREENWIDTH)
+    viewwindowy = 0;
+  else
+    viewwindowy = (SCREENHEIGHT - SBARHEIGHT - height) >> 1;
+
+  /* Preclaculate all row offsets. */
+
+  for (i = 0; i < height; i++)
+    ylookup[i] = i_video_buffer + (i + viewwindowy) * SCREENWIDTH;
+}
+
+/* r_fill_back_screen
+ *
+ * Fills the back screen with a pattern for variable screen sizes
+ * Also draws a beveled edge.
+ */
+
+void r_fill_back_screen(void)
+{
+  byte *src;
+  pixel_t *dest;
+  int x;
+  int y;
+  patch_t *patch;
+
+  /* DOOM border patch. */
+
+  const char *name1 = ("FLOOR7_2");
+
+  /* DOOM II border patch. */
+
+  const char *name2 = ("GRNROCK");
+
+  const char *name;
+
+  /* If we are running full screen, there is no need to do any of this,
+   * and the background buffer can be freed if it was previously in use.
+   */
+
+  if (scaledviewwidth == SCREENWIDTH)
+    {
+      if (background_buffer != NULL)
+        {
+          z_free(background_buffer);
+          background_buffer = NULL;
         }
 
-	return;
+      return;
     }
 
-    // Allocate the background buffer if necessary
-	
-    if (background_buffer == NULL)
+  /* Allocate the background buffer if necessary */
+
+  if (background_buffer == NULL)
     {
-        background_buffer = Z_Malloc(SCREENWIDTH * (SCREENHEIGHT - SBARHEIGHT) * sizeof(*background_buffer),
-                                     PU_STATIC, NULL);
+      background_buffer = z_malloc(
+              SCREENWIDTH * (SCREENHEIGHT - SBARHEIGHT) *
+              sizeof(*background_buffer), PU_STATIC, NULL);
     }
 
-    if (gamemode == commercial)
-	name = name2;
-    else
-	name = name1;
-    
-    src = W_CacheLumpName(name, PU_CACHE); 
-    dest = background_buffer;
-	 
-    for (y=0 ; y<SCREENHEIGHT-SBARHEIGHT ; y++) 
-    { 
-	for (x=0 ; x<SCREENWIDTH/64 ; x++) 
-	{ 
-	    memcpy (dest, src+((y&63)<<6), 64); 
-	    dest += 64; 
-	} 
+  if (gamemode == commercial)
+    name = name2;
+  else
+    name = name1;
 
-	if (SCREENWIDTH&63) 
-	{ 
-	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63); 
-	    dest += (SCREENWIDTH&63); 
-	} 
-    } 
-     
-    // Draw screen and bezel; this is done to a separate screen buffer.
+  src = w_cache_lump_name(name, PU_CACHE);
+  dest = background_buffer;
 
-    V_UseBuffer(background_buffer);
-
-    patch = W_CacheLumpName(DEH_String("brdr_t"),PU_CACHE);
-
-    for (x=0 ; x<scaledviewwidth ; x+=8)
-	V_DrawPatch(viewwindowx+x, viewwindowy-8, patch);
-    patch = W_CacheLumpName(DEH_String("brdr_b"),PU_CACHE);
-
-    for (x=0 ; x<scaledviewwidth ; x+=8)
-	V_DrawPatch(viewwindowx+x, viewwindowy+viewheight, patch);
-    patch = W_CacheLumpName(DEH_String("brdr_l"),PU_CACHE);
-
-    for (y=0 ; y<viewheight ; y+=8)
-	V_DrawPatch(viewwindowx-8, viewwindowy+y, patch);
-    patch = W_CacheLumpName(DEH_String("brdr_r"),PU_CACHE);
-
-    for (y=0 ; y<viewheight ; y+=8)
-	V_DrawPatch(viewwindowx+scaledviewwidth, viewwindowy+y, patch);
-
-    // Draw beveled edge. 
-    V_DrawPatch(viewwindowx-8,
-                viewwindowy-8,
-                W_CacheLumpName(DEH_String("brdr_tl"),PU_CACHE));
-    
-    V_DrawPatch(viewwindowx+scaledviewwidth,
-                viewwindowy-8,
-                W_CacheLumpName(DEH_String("brdr_tr"),PU_CACHE));
-    
-    V_DrawPatch(viewwindowx-8,
-                viewwindowy+viewheight,
-                W_CacheLumpName(DEH_String("brdr_bl"),PU_CACHE));
-    
-    V_DrawPatch(viewwindowx+scaledviewwidth,
-                viewwindowy+viewheight,
-                W_CacheLumpName(DEH_String("brdr_br"),PU_CACHE));
-
-    V_RestoreBuffer();
-} 
- 
-
-//
-// Copy a screen buffer.
-//
-void
-R_VideoErase
-( unsigned	ofs,
-  int		count ) 
-{ 
-  // LFB copy.
-  // This might not be a good idea if memcpy
-  //  is not optiomal, e.g. byte by byte on
-  //  a 32bit CPU, as GNU GCC/Linux libc did
-  //  at one point.
-
-    if (background_buffer != NULL)
+  for (y = 0; y < SCREENHEIGHT - SBARHEIGHT; y++)
     {
-        memcpy(I_VideoBuffer + ofs, background_buffer + ofs, count * sizeof(*I_VideoBuffer));
+      for (x = 0; x < SCREENWIDTH / 64; x++)
+        {
+          memcpy(dest, src + ((y & 63) << 6), 64);
+          dest += 64;
+        }
+
+      if (SCREENWIDTH & 63)
+        {
+          memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
+          dest += (SCREENWIDTH & 63);
+        }
     }
-} 
 
+  /* Draw screen and bezel; this is done to a separate screen buffer. */
 
-//
-// R_DrawViewBorder
-// Draws the border around the view
-//  for different size windows?
-//
-void R_DrawViewBorder (void) 
-{ 
-    int		top;
-    int		side;
-    int		ofs;
-    int		i; 
- 
-    if (scaledviewwidth == SCREENWIDTH) 
-	return; 
-  
-    top = ((SCREENHEIGHT-SBARHEIGHT)-viewheight)/2; 
-    side = (SCREENWIDTH-scaledviewwidth)/2; 
- 
-    // copy top and one line of left side 
-    R_VideoErase (0, top*SCREENWIDTH+side); 
- 
-    // copy one line of right side and bottom 
-    ofs = (viewheight+top)*SCREENWIDTH-side; 
-    R_VideoErase (ofs, top*SCREENWIDTH+side); 
- 
-    // copy sides using wraparound 
-    ofs = top*SCREENWIDTH + SCREENWIDTH-side; 
-    side <<= 1;
-    
-    for (i=1 ; i<viewheight ; i++) 
-    { 
-	R_VideoErase (ofs, side); 
-	ofs += SCREENWIDTH; 
-    } 
+  v_use_buffer(background_buffer);
 
-    // ? 
-    V_MarkRect (0,0,SCREENWIDTH, SCREENHEIGHT-SBARHEIGHT); 
-} 
- 
- 
+  patch = w_cache_lump_name(("brdr_t"), PU_CACHE);
+
+  for (x = 0; x < scaledviewwidth; x += 8)
+    v_draw_patch(viewwindowx + x, viewwindowy - 8, patch);
+  patch = w_cache_lump_name(("brdr_b"), PU_CACHE);
+
+  for (x = 0; x < scaledviewwidth; x += 8)
+    v_draw_patch(viewwindowx + x, viewwindowy + viewheight, patch);
+  patch = w_cache_lump_name(("brdr_l"), PU_CACHE);
+
+  for (y = 0; y < viewheight; y += 8)
+    v_draw_patch(viewwindowx - 8, viewwindowy + y, patch);
+  patch = w_cache_lump_name(("brdr_r"), PU_CACHE);
+
+  for (y = 0; y < viewheight; y += 8)
+    v_draw_patch(viewwindowx + scaledviewwidth, viewwindowy + y, patch);
+
+  /* Draw beveled edge. */
+
+  v_draw_patch(viewwindowx - 8, viewwindowy - 8,
+               w_cache_lump_name(("brdr_tl"), PU_CACHE));
+
+  v_draw_patch(viewwindowx + scaledviewwidth, viewwindowy - 8,
+               w_cache_lump_name(("brdr_tr"), PU_CACHE));
+
+  v_draw_patch(viewwindowx - 8, viewwindowy + viewheight,
+               w_cache_lump_name(("brdr_bl"), PU_CACHE));
+
+  v_draw_patch(viewwindowx + scaledviewwidth, viewwindowy + viewheight,
+               w_cache_lump_name(("brdr_br"), PU_CACHE));
+
+  v_restore_buffer();
+}
+
+/* Copy a screen buffer. */
+
+void r_video_erase(unsigned ofs, int count)
+{
+  /* LFB copy.
+   * This might not be a good idea if memcpy is not optional, e.g. byte by
+   * byte on a 32bit CPU, as GNU GCC/Linux libc did at one point.
+   */
+
+  if (background_buffer != NULL)
+    {
+      memcpy(i_video_buffer + ofs, background_buffer + ofs,
+             count * sizeof(*i_video_buffer));
+    }
+}
+
+/* r_draw_view_border
+ * Draws the border around the view for different size windows?
+ */
+
+void r_draw_view_border(void)
+{
+  int top;
+  int side;
+  int ofs;
+  int i;
+
+  if (scaledviewwidth == SCREENWIDTH) return;
+
+  top = ((SCREENHEIGHT - SBARHEIGHT) - viewheight) / 2;
+  side = (SCREENWIDTH - scaledviewwidth) / 2;
+
+  /* copy top and one line of left side */
+
+  r_video_erase(0, top * SCREENWIDTH + side);
+
+  /* copy one line of right side and bottom */
+
+  ofs = (viewheight + top) * SCREENWIDTH - side;
+  r_video_erase(ofs, top * SCREENWIDTH + side);
+
+  /* copy sides using wraparound */
+
+  ofs = top * SCREENWIDTH + SCREENWIDTH - side;
+  side <<= 1;
+
+  for (i = 1; i < viewheight; i++)
+    {
+      r_video_erase(ofs, side);
+      ofs += SCREENWIDTH;
+    }
+
+  /* ? */
+
+  v_mark_rect(0, 0, SCREENWIDTH, SCREENHEIGHT - SBARHEIGHT);
+}
diff --git a/games/NXDoom/src/doom/r_draw.h b/games/NXDoom/src/doom/r_draw.h
index 5b0c818b5..47e85c1ed 100644
--- a/games/NXDoom/src/doom/r_draw.h
+++ b/games/NXDoom/src/doom/r_draw.h
@@ -1,104 +1,107 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_draw.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __R_DRAW__
 #define __R_DRAW__
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+extern lighttable_t *dc_colormap;
+extern int dc_x;
+extern int dc_yl;
+extern int dc_yh;
+extern fixed_t dc_iscale;
+extern fixed_t dc_texturemid;
 
+/* first pixel in a column */
 
-extern lighttable_t*	dc_colormap;
-extern int		dc_x;
-extern int		dc_yl;
-extern int		dc_yh;
-extern fixed_t		dc_iscale;
-extern fixed_t		dc_texturemid;
+extern byte *dc_source;
 
-// first pixel in a column
-extern byte*		dc_source;		
+extern int ds_y;
+extern int ds_x1;
+extern int ds_x2;
 
+extern lighttable_t *ds_colormap;
 
-// The span blitting interface.
-// Hook in assembler or system specific BLT
-//  here.
-void 	R_DrawColumn (void);
-void 	R_DrawColumnLow (void);
+extern fixed_t ds_xfrac;
+extern fixed_t ds_yfrac;
+extern fixed_t ds_xstep;
+extern fixed_t ds_ystep;
 
-// The Spectre/Invisibility effect.
-void 	R_DrawFuzzColumn (void);
-void 	R_DrawFuzzColumnLow (void);
+/* start of a 64*64 tile image */
 
-// Draw with color translation tables,
-//  for player sprite rendering,
-//  Green/Red/Blue/Indigo shirts.
-void	R_DrawTranslatedColumn (void);
-void	R_DrawTranslatedColumnLow (void);
+extern byte *ds_source;
 
-void
-R_VideoErase
-( unsigned	ofs,
-  int		count );
+extern byte *translationtables;
+extern byte *dc_translation;
 
-extern int		ds_y;
-extern int		ds_x1;
-extern int		ds_x2;
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-extern lighttable_t*	ds_colormap;
+/* Span blitting for rows, floor/ceiling. No Spectre effect needed. */
 
-extern fixed_t		ds_xfrac;
-extern fixed_t		ds_yfrac;
-extern fixed_t		ds_xstep;
-extern fixed_t		ds_ystep;
+void r_draw_span(void);
 
-// start of a 64*64 tile image
-extern byte*		ds_source;		
+/* Low resolution mode, 160x200? */
 
-extern byte*		translationtables;
-extern byte*		dc_translation;
+void r_draw_span_low(void);
 
+void r_init_buffer(int width, int height);
 
-// Span blitting for rows, floor/ceiling.
-// No Sepctre effect needed.
-void 	R_DrawSpan (void);
+/* Initialize color translation tables, for player rendering etc. */
 
-// Low resolution mode, 160x200?
-void 	R_DrawSpanLow (void);
+void r_init_translation_table(void);
 
+/* Rendering function. */
 
-void
-R_InitBuffer
-( int		width,
-  int		height );
+void r_fill_back_screen(void);
 
+/* If the view size is not full screen, draws a border around it. */
 
-// Initialize color translation tables,
-//  for player rendering etc.
-void	R_InitTranslationTables (void);
+void r_draw_view_border(void);
 
+/* The span blitting interface.
+ * Hook in assembler or system specific BLT here.
+ */
 
+void r_draw_column(void);
+void r_draw_column_low(void);
 
-// Rendering function.
-void R_FillBackScreen (void);
+/* The Spectre/Invisibility effect. */
 
-// If the view size is not full screen, draws a border around it.
-void R_DrawViewBorder (void);
+void r_draw_fuzz_column(void);
+void r_draw_fuzz_column_low(void);
 
+/* Draw with color translation tables, for player sprite rendering,
+ * Green/Red/Blue/Indigo shirts.
+ */
 
+void r_draw_translated_column(void);
+void r_draw_translated_column_low(void);
 
-#endif
+void r_video_erase(unsigned ofs, int count);
+
+#endif /* __R_DRAW__ */
diff --git a/games/NXDoom/src/doom/r_local.h b/games/NXDoom/src/doom/r_local.h
index 1b9249210..b1fd33e1c 100644
--- a/games/NXDoom/src/doom/r_local.h
+++ b/games/NXDoom/src/doom/r_local.h
@@ -1,45 +1,54 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh (R_*) module, global header.
-//	All the rendering/drawing stuff is here.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_local.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh (R_*) module, global header.
+ *  All the rendering/drawing stuff is here.
+ *
+ ****************************************************************************/
 
 #ifndef __R_LOCAL__
 #define __R_LOCAL__
 
-// Binary Angles, sine/cosine/atan lookups.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Binary Angles, sine/cosine/atan lookups. */
+
 #include "tables.h"
 
-// Screen size related parameters.
+/* Screen size related parameters. */
+
 #include "doomdef.h"
 
-// Include the refresh/render data structs.
+/* Include the refresh/render data structs. */
+
 #include "r_data.h"
 
+/* Separate header file for each module. */
 
-
-//
-// Separate header file for each module.
-//
-#include "r_main.h"
 #include "r_bsp.h"
-#include "r_segs.h"
-#include "r_plane.h"
 #include "r_data.h"
-#include "r_things.h"
 #include "r_draw.h"
+#include "r_main.h"
+#include "r_plane.h"
+#include "r_segs.h"
+#include "r_things.h"
 
-#endif		// __R_LOCAL__
+#endif /* __R_LOCAL__ */
diff --git a/games/NXDoom/src/doom/r_main.c b/games/NXDoom/src/doom/r_main.c
index 970bd19b6..5eb1a4eee 100644
--- a/games/NXDoom/src/doom/r_main.c
+++ b/games/NXDoom/src/doom/r_main.c
@@ -1,33 +1,36 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Rendering main loop and setup functions,
-//	 utility functions (BSP, geometry, trigonometry).
-//	See tables.c, too.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_main.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Rendering main loop and setup functions, utility functions (BSP,
+ *  geometry, trigonometry). See tables.c, too.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-
-
-#include <stdlib.h>
 #include <math.h>
+#include <stdlib.h>
 
-
-#include "doomdef.h"
 #include "d_loop.h"
+#include "doomdef.h"
 
 #include "m_bbox.h"
 #include "m_menu.h"
@@ -35,856 +38,844 @@
 #include "r_local.h"
 #include "r_sky.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Fineangles in the SCREENWIDTH wide window. */
 
+#define FIELDOFVIEW 2048
 
+#define DISTMAP 2
 
-// Fineangles in the SCREENWIDTH wide window.
-#define FIELDOFVIEW		2048	
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+int viewangleoffset;
 
+/* increment every time a check is made */
 
-int			viewangleoffset;
+int validcount = 1;
 
-// increment every time a check is made
-int			validcount = 1;		
+lighttable_t *fixedcolormap;
 
+int centerx;
+int centery;
 
-lighttable_t*		fixedcolormap;
+fixed_t centerxfrac;
+fixed_t centeryfrac;
+fixed_t projection;
 
-int			centerx;
-int			centery;
+/* just for profiling purposes */
 
-fixed_t			centerxfrac;
-fixed_t			centeryfrac;
-fixed_t			projection;
+int framecount;
 
-// just for profiling purposes
-int			framecount;	
+int sscount;
+int linecount;
+int loopcount;
 
-int			sscount;
-int			linecount;
-int			loopcount;
+fixed_t viewx;
+fixed_t viewy;
+fixed_t viewz;
 
-fixed_t			viewx;
-fixed_t			viewy;
-fixed_t			viewz;
+angle_t viewangle;
 
-angle_t			viewangle;
+fixed_t viewcos;
+fixed_t viewsin;
 
-fixed_t			viewcos;
-fixed_t			viewsin;
+player_t *viewplayer;
 
-player_t*		viewplayer;
+/* 0 = high, 1 = low */
 
-// 0 = high, 1 = low
-int			detailshift;	
+int detailshift;
 
-//
-// precalculated math tables
-//
-angle_t			clipangle;
+/* precalculated math tables */
 
-// The viewangletox[viewangle + FINEANGLES/4] lookup
-// maps the visible view angles to screen X coordinates,
-// flattening the arc to a flat projection plane.
-// There will be many angles mapped to the same X. 
-int			viewangletox[FINEANGLES/2];
+angle_t clipangle;
 
-// The xtoviewangleangle[] table maps a screen pixel
-// to the lowest viewangle that maps back to x ranges
-// from clipangle to -clipangle.
-angle_t			xtoviewangle[SCREENWIDTH+1];
+/* The viewangletox[viewangle + FINEANGLES/4] lookup
+ * maps the visible view angles to screen X coordinates,
+ * flattening the arc to a flat projection plane.
+ * There will be many angles mapped to the same X.
+ */
 
-lighttable_t*		scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-lighttable_t*		scalelightfixed[MAXLIGHTSCALE];
-lighttable_t*		zlight[LIGHTLEVELS][MAXLIGHTZ];
+int viewangletox[FINEANGLES / 2];
 
-// bumped light from gun blasts
-int			extralight;			
+/* The xtoviewangleangle[] table maps a screen pixel
+ * to the lowest viewangle that maps back to x ranges
+ * from clipangle to -clipangle.
+ */
 
+angle_t xtoviewangle[SCREENWIDTH + 1];
 
+lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+lighttable_t *scalelightfixed[MAXLIGHTSCALE];
+lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
 
-void (*colfunc) (void);
-void (*basecolfunc) (void);
-void (*fuzzcolfunc) (void);
-void (*transcolfunc) (void);
-void (*spanfunc) (void);
+/* bumped light from gun blasts */
 
+int extralight;
 
+void (*colfunc)(void);
+void (*basecolfunc)(void);
+void (*fuzzcolfunc)(void);
+void (*transcolfunc)(void);
+void (*spanfunc)(void);
 
-//
-// R_AddPointToBox
-// Expand a given bbox
-// so that it encloses a given point.
-//
-void
-R_AddPointToBox
-( int		x,
-  int		y,
-  fixed_t*	box )
+boolean setsizeneeded;
+int setblocks;
+int setdetail;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: r_add_point_to_box
+ *
+ * Description:
+ *  Expand a given bbox so that it encloses a given point.
+ *
+ ****************************************************************************/
+
+static void r_add_point_to_box(int x, int y, fixed_t *box)
 {
-    if (x< box[BOXLEFT])
-	box[BOXLEFT] = x;
-    if (x> box[BOXRIGHT])
-	box[BOXRIGHT] = x;
-    if (y< box[BOXBOTTOM])
-	box[BOXBOTTOM] = y;
-    if (y> box[BOXTOP])
-	box[BOXTOP] = y;
+  if (x < box[BOXLEFT]) box[BOXLEFT] = x;
+  if (x > box[BOXRIGHT]) box[BOXRIGHT] = x;
+  if (y < box[BOXBOTTOM]) box[BOXBOTTOM] = y;
+  if (y > box[BOXTOP]) box[BOXTOP] = y;
 }
 
+/****************************************************************************
+ * Name: r_setup_frame
+ ****************************************************************************/
 
-//
-// R_PointOnSide
-// Traverse BSP (sub) tree,
-//  check point against partition plane.
-// Returns side 0 (front) or 1 (back).
-//
-int
-R_PointOnSide
-( fixed_t	x,
-  fixed_t	y,
-  node_t*	node )
+static void r_setup_frame(player_t *player)
 {
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
-	
-    if (!node->dx)
-    {
-	if (x <= node->x)
-	    return node->dy > 0;
-	
-	return node->dy < 0;
-    }
-    if (!node->dy)
-    {
-	if (y <= node->y)
-	    return node->dx < 0;
-	
-	return node->dx > 0;
-    }
-	
-    dx = (x - node->x);
-    dy = (y - node->y);
-	
-    // Try to quickly decide by looking at sign bits.
-    if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
-    {
-	if  ( (node->dy ^ dx) & 0x80000000 )
-	{
-	    // (left is negative)
-	    return 1;
-	}
-	return 0;
-    }
+  int i;
 
-    left = FixedMul ( node->dy>>FRACBITS , dx );
-    right = FixedMul ( dy , node->dx>>FRACBITS );
-	
-    if (right < left)
+  viewplayer = player;
+  viewx = player->mo->x;
+  viewy = player->mo->y;
+  viewangle = player->mo->angle + viewangleoffset;
+  extralight = player->extralight;
+
+  viewz = player->viewz;
+
+  viewsin = finesine[viewangle >> ANGLETOFINESHIFT];
+  viewcos = finecosine[viewangle >> ANGLETOFINESHIFT];
+
+  sscount = 0;
+
+  if (player->fixedcolormap)
     {
-	// front side
-	return 0;
+      fixedcolormap = colormaps + player->fixedcolormap * 256;
+
+      walllights = scalelightfixed;
+
+      for (i = 0; i < MAXLIGHTSCALE; i++)
+        scalelightfixed[i] = fixedcolormap;
     }
-    // back side
-    return 1;			
+  else
+    fixedcolormap = 0;
+
+  framecount++;
+  validcount++;
 }
 
+/****************************************************************************
+ * Name: r_init_light_tables
+ *
+ * Description:
+ *  Only inits the zlight table, because the scalelight table changes with
+ *  view size.
+ *
+ ****************************************************************************/
 
-int
-R_PointOnSegSide
-( fixed_t	x,
-  fixed_t	y,
-  seg_t*	line )
+static void r_init_light_tables(void)
 {
-    fixed_t	lx;
-    fixed_t	ly;
-    fixed_t	ldx;
-    fixed_t	ldy;
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
-	
-    lx = line->v1->x;
-    ly = line->v1->y;
-	
-    ldx = line->v2->x - lx;
-    ldy = line->v2->y - ly;
-	
-    if (!ldx)
-    {
-	if (x <= lx)
-	    return ldy > 0;
-	
-	return ldy < 0;
-    }
-    if (!ldy)
-    {
-	if (y <= ly)
-	    return ldx < 0;
-	
-	return ldx > 0;
-    }
-	
-    dx = (x - lx);
-    dy = (y - ly);
-	
-    // Try to quickly decide by looking at sign bits.
-    if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
-    {
-	if  ( (ldy ^ dx) & 0x80000000 )
-	{
-	    // (left is negative)
-	    return 1;
-	}
-	return 0;
-    }
+  int i;
+  int j;
+  int level;
+  int startmap;
+  int scale;
 
-    left = FixedMul ( ldy>>FRACBITS , dx );
-    right = FixedMul ( dy , ldx>>FRACBITS );
-	
-    if (right < left)
+  /* Calculate the light levels to use for each level / distance combination.
+   */
+
+  for (i = 0; i < LIGHTLEVELS; i++)
     {
-	// front side
-	return 0;
+      startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
+      for (j = 0; j < MAXLIGHTZ; j++)
+        {
+          scale = fixed_div((SCREENWIDTH / 2 * FRACUNIT),
+                  (j + 1) << LIGHTZSHIFT);
+          scale >>= LIGHTSCALESHIFT;
+          level = startmap - scale / DISTMAP;
+
+          if (level < 0) level = 0;
+
+          if (level >= NUMCOLORMAPS) level = NUMCOLORMAPS - 1;
+
+          zlight[i][j] = colormaps + level * 256;
+        }
     }
-    // back side
-    return 1;			
 }
 
+/****************************************************************************
+ * Name: r_init_tables
+ ****************************************************************************/
 
-//
-// R_PointToAngle
-// To get a global angle from cartesian coordinates,
-//  the coordinates are flipped until they are in
-//  the first octant of the coordinate system, then
-//  the y (<=x) is scaled and divided by x to get a
-//  tangent (slope) value which is looked up in the
-//  tantoangle[] table.
-
-//
-
-
-
-
-angle_t
-R_PointToAngle
-( fixed_t	x,
-  fixed_t	y )
-{	
-    x -= viewx;
-    y -= viewy;
-    
-    if ( (!x) && (!y) )
-	return 0;
-
-    if (x>= 0)
-    {
-	// x >=0
-	if (y>= 0)
-	{
-	    // y>= 0
-
-	    if (x>y)
-	    {
-		// octant 0
-		return tantoangle[ SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		// octant 1
-		return ANG90-1-tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-	else
-	{
-	    // y<0
-	    y = -y;
-
-	    if (x>y)
-	    {
-		// octant 8
-		return -tantoangle[SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		// octant 7
-		return ANG270+tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-    }
-    else
-    {
-	// x<0
-	x = -x;
-
-	if (y>= 0)
-	{
-	    // y>= 0
-	    if (x>y)
-	    {
-		// octant 3
-		return ANG180-1-tantoangle[ SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		// octant 2
-		return ANG90+ tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-	else
-	{
-	    // y<0
-	    y = -y;
-
-	    if (x>y)
-	    {
-		// octant 4
-		return ANG180+tantoangle[ SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		 // octant 5
-		return ANG270-1-tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-    }
-    return 0;
-}
-
-
-angle_t
-R_PointToAngle2
-( fixed_t	x1,
-  fixed_t	y1,
-  fixed_t	x2,
-  fixed_t	y2 )
-{	
-    viewx = x1;
-    viewy = y1;
-    
-    return R_PointToAngle (x2, y2);
-}
-
-
-fixed_t
-R_PointToDist
-( fixed_t	x,
-  fixed_t	y )
+static void r_init_tables(void)
 {
-    int		angle;
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	temp;
-    fixed_t	dist;
-    fixed_t     frac;
-	
-    dx = abs(x - viewx);
-    dy = abs(y - viewy);
-	
-    if (dy>dx)
+#if 0 /* UNUSED: now getting from tables.c */
+  int i;
+  float a;
+  float fv;
+  int t;
+
+  /* viewangle tangent table */
+
+  for (i = 0; i < FINEANGLES / 2; i++)
     {
-	temp = dx;
-	dx = dy;
-	dy = temp;
+      a = (i - FINEANGLES / 4 + 0.5) * PI * 2 / FINEANGLES;
+      fv = FRACUNIT * tan(a);
+      t = fv;
+      finetangent[i] = t;
     }
 
-    // Fix crashes in udm1.wad
+  /* finesine table */
 
-    if (dx != 0)
+  for (i = 0; i < 5 * FINEANGLES / 4; i++)
     {
-        frac = FixedDiv(dy, dx);
-    }
-    else
-    {
-	frac = 0;
-    }
-	
-    angle = (tantoangle[frac>>DBITS]+ANG90) >> ANGLETOFINESHIFT;
+      /* OPTIMIZE: mirror... */
 
-    // use as cosine
-    dist = FixedDiv (dx, finesine[angle] );	
-	
-    return dist;
-}
-
-
-
-
-//
-// R_InitPointToAngle
-//
-void R_InitPointToAngle (void)
-{
-    // UNUSED - now getting from tables.c
-#if 0
-    int	i;
-    long	t;
-    float	f;
-//
-// slope (tangent) to angle lookup
-//
-    for (i=0 ; i<=SLOPERANGE ; i++)
-    {
-	f = atan( (float)i/SLOPERANGE )/(3.141592657*2);
-	t = 0xffffffff*f;
-	tantoangle[i] = t;
+      a = (i + 0.5) * PI * 2 / FINEANGLES;
+      t = FRACUNIT * sin(a);
+      finesine[i] = t;
     }
 #endif
 }
 
+/****************************************************************************
+ * Name: r_init_point_to_angle
+ ****************************************************************************/
 
-//
-// R_ScaleFromGlobalAngle
-// Returns the texture mapping scale
-//  for the current line (horizontal span)
-//  at the given angle.
-// rw_distance must be calculated first.
-//
-fixed_t R_ScaleFromGlobalAngle (angle_t visangle)
+static void r_init_point_to_angle(void)
 {
-    fixed_t		scale;
-    angle_t		anglea;
-    angle_t		angleb;
-    int			sinea;
-    int			sineb;
-    fixed_t		num;
-    int			den;
+#if 0 /* UNUSED - now getting from tables.c */
+  int i;
+  long t;
+  float f;
 
-    // UNUSED
-#if 0
-{
-    fixed_t		dist;
-    fixed_t		z;
-    fixed_t		sinv;
-    fixed_t		cosv;
-	
-    sinv = finesine[(visangle-rw_normalangle)>>ANGLETOFINESHIFT];	
-    dist = FixedDiv (rw_distance, sinv);
-    cosv = finecosine[(viewangle-visangle)>>ANGLETOFINESHIFT];
-    z = abs(FixedMul (dist, cosv));
-    scale = FixedDiv(projection, z);
-    return scale;
-}
-#endif
+  /* slope (tangent) to angle lookup */
 
-    anglea = ANG90 + (visangle-viewangle);
-    angleb = ANG90 + (visangle-rw_normalangle);
-
-    // both sines are allways positive
-    sinea = finesine[anglea>>ANGLETOFINESHIFT];	
-    sineb = finesine[angleb>>ANGLETOFINESHIFT];
-    num = FixedMul(projection,sineb)<<detailshift;
-    den = FixedMul(rw_distance,sinea);
-
-    if (den > num>>FRACBITS)
+  for (i = 0; i <= SLOPERANGE; i++)
     {
-	scale = FixedDiv (num, den);
-
-	if (scale > 64*FRACUNIT)
-	    scale = 64*FRACUNIT;
-	else if (scale < 256)
-	    scale = 256;
-    }
-    else
-	scale = 64*FRACUNIT;
-	
-    return scale;
-}
-
-
-
-//
-// R_InitTables
-//
-void R_InitTables (void)
-{
-    // UNUSED: now getting from tables.c
-#if 0
-    int		i;
-    float	a;
-    float	fv;
-    int		t;
-    
-    // viewangle tangent table
-    for (i=0 ; i<FINEANGLES/2 ; i++)
-    {
-	a = (i-FINEANGLES/4+0.5)*PI*2/FINEANGLES;
-	fv = FRACUNIT*tan (a);
-	t = fv;
-	finetangent[i] = t;
-    }
-    
-    // finesine table
-    for (i=0 ; i<5*FINEANGLES/4 ; i++)
-    {
-	// OPTIMIZE: mirror...
-	a = (i+0.5)*PI*2/FINEANGLES;
-	t = FRACUNIT*sin (a);
-	finesine[i] = t;
+      f = atan((float)i / SLOPERANGE) / (3.141592657 * 2);
+      t = 0xffffffff * f;
+      tantoangle[i] = t;
     }
 #endif
-
 }
 
+/****************************************************************************
+ * Name: r_init_texture_mapping
+ ****************************************************************************/
 
-
-//
-// R_InitTextureMapping
-//
-void R_InitTextureMapping (void)
+static void r_init_texture_mapping(void)
 {
-    int			i;
-    int			x;
-    int			t;
-    fixed_t		focallength;
-    
-    // Use tangent table to generate viewangletox:
-    //  viewangletox will give the next greatest x
-    //  after the view angle.
-    //
-    // Calc focallength
-    //  so FIELDOFVIEW angles covers SCREENWIDTH.
-    focallength = FixedDiv (centerxfrac,
-			    finetangent[FINEANGLES/4+FIELDOFVIEW/2] );
-	
-    for (i=0 ; i<FINEANGLES/2 ; i++)
-    {
-	if (finetangent[i] > FRACUNIT*2)
-	    t = -1;
-	else if (finetangent[i] < -FRACUNIT*2)
-	    t = viewwidth+1;
-	else
-	{
-	    t = FixedMul (finetangent[i], focallength);
-	    t = (centerxfrac - t+FRACUNIT-1)>>FRACBITS;
+  int i;
+  int x;
+  int t;
+  fixed_t focallength;
 
-	    if (t < -1)
-		t = -1;
-	    else if (t>viewwidth+1)
-		t = viewwidth+1;
-	}
-	viewangletox[i] = t;
-    }
-    
-    // Scan viewangletox[] to generate xtoviewangle[]:
-    //  xtoviewangle will give the smallest view angle
-    //  that maps to x.	
-    for (x=0;x<=viewwidth;x++)
+  /* Use tangent table to generate viewangletox:
+   *  viewangletox will give the next greatest x
+   *  after the view angle.
+   *
+   * Calc focallength
+   *  so FIELDOFVIEW angles covers SCREENWIDTH.
+   */
+
+  focallength =
+      fixed_div(centerxfrac, finetangent[FINEANGLES / 4 + FIELDOFVIEW / 2]);
+
+  for (i = 0; i < FINEANGLES / 2; i++)
     {
-	i = 0;
-	while (viewangletox[i]>x)
-	    i++;
-	xtoviewangle[x] = (i<<ANGLETOFINESHIFT)-ANG90;
+      if (finetangent[i] > FRACUNIT * 2)
+        t = -1;
+      else if (finetangent[i] < -FRACUNIT * 2)
+        t = viewwidth + 1;
+      else
+        {
+          t = fixed_mul(finetangent[i], focallength);
+          t = (centerxfrac - t + FRACUNIT - 1) >> FRACBITS;
+
+          if (t < -1)
+            t = -1;
+          else if (t > viewwidth + 1)
+            t = viewwidth + 1;
+        }
+
+      viewangletox[i] = t;
     }
-    
-    // Take out the fencepost cases from viewangletox.
-    for (i=0 ; i<FINEANGLES/2 ; i++)
+
+  /* Scan viewangletox[] to generate xtoviewangle[]:
+   *  xtoviewangle will give the smallest view angle
+   *  that maps to x.
+   */
+
+  for (x = 0; x <= viewwidth; x++)
     {
-	t = FixedMul (finetangent[i], focallength);
-	t = centerx - t;
-	
-	if (viewangletox[i] == -1)
-	    viewangletox[i] = 0;
-	else if (viewangletox[i] == viewwidth+1)
-	    viewangletox[i]  = viewwidth;
+      i = 0;
+      while (viewangletox[i] > x)
+        i++;
+      xtoviewangle[x] = (i << ANGLETOFINESHIFT) - ANG90;
     }
-	
-    clipangle = xtoviewangle[0];
+
+  /* Take out the fencepost cases from viewangletox. */
+
+  for (i = 0; i < FINEANGLES / 2; i++)
+    {
+      t = fixed_mul(finetangent[i], focallength);
+      t = centerx - t;
+
+      if (viewangletox[i] == -1)
+        viewangletox[i] = 0;
+      else if (viewangletox[i] == viewwidth + 1)
+        viewangletox[i] = viewwidth;
+    }
+
+  clipangle = xtoviewangle[0];
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/****************************************************************************
+ * Name: r_point_on_side
+ *
+ * Description:
+ *  Traverse BSP (sub) tree, check point against partition plane.
+ *
+ * Returns:
+ *   Side 0 (front) or 1 (back).
+ ****************************************************************************/
 
-//
-// R_InitLightTables
-// Only inits the zlight table,
-//  because the scalelight table changes with view size.
-//
-#define DISTMAP		2
-
-void R_InitLightTables (void)
+int r_point_on_side(fixed_t x, fixed_t y, node_t *node)
 {
-    int		i;
-    int		j;
-    int		level;
-    int		startmap; 	
-    int		scale;
-    
-    // Calculate the light levels to use
-    //  for each level / distance combination.
-    for (i=0 ; i< LIGHTLEVELS ; i++)
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t left;
+  fixed_t right;
+
+  if (!node->dx)
     {
-	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
-	for (j=0 ; j<MAXLIGHTZ ; j++)
-	{
-	    scale = FixedDiv ((SCREENWIDTH/2*FRACUNIT), (j+1)<<LIGHTZSHIFT);
-	    scale >>= LIGHTSCALESHIFT;
-	    level = startmap - scale/DISTMAP;
-	    
-	    if (level < 0)
-		level = 0;
+      if (x <= node->x) return node->dy > 0;
 
-	    if (level >= NUMCOLORMAPS)
-		level = NUMCOLORMAPS-1;
-
-	    zlight[i][j] = colormaps + level*256;
-	}
+      return node->dy < 0;
     }
+
+  if (!node->dy)
+    {
+      if (y <= node->y) return node->dx < 0;
+
+      return node->dx > 0;
+    }
+
+  dx = (x - node->x);
+  dy = (y - node->y);
+
+  /* Try to quickly decide by looking at sign bits. */
+
+  if ((node->dy ^ node->dx ^ dx ^ dy) & 0x80000000)
+    {
+      if ((node->dy ^ dx) & 0x80000000)
+        {
+          return 1; /* (left is negative) */
+        }
+
+      return 0;
+    }
+
+  left = fixed_mul(node->dy >> FRACBITS, dx);
+  right = fixed_mul(dy, node->dx >> FRACBITS);
+
+  if (right < left)
+    {
+      return 0; /* front side */
+    }
+
+  return 1; /* back side */
 }
 
+/****************************************************************************
+ * Name: r_point_on_seg_side
+ ****************************************************************************/
 
-
-//
-// R_SetViewSize
-// Do not really change anything here,
-//  because it might be in the middle of a refresh.
-// The change will take effect next refresh.
-//
-boolean		setsizeneeded;
-int		setblocks;
-int		setdetail;
-
-
-void
-R_SetViewSize
-( int		blocks,
-  int		detail )
+int r_point_on_seg_side(fixed_t x, fixed_t y, seg_t *line)
 {
-    setsizeneeded = true;
-    setblocks = blocks;
-    setdetail = detail;
+  fixed_t lx;
+  fixed_t ly;
+  fixed_t ldx;
+  fixed_t ldy;
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t left;
+  fixed_t right;
+
+  lx = line->v1->x;
+  ly = line->v1->y;
+
+  ldx = line->v2->x - lx;
+  ldy = line->v2->y - ly;
+
+  if (!ldx)
+    {
+      if (x <= lx) return ldy > 0;
+
+      return ldy < 0;
+    }
+
+  if (!ldy)
+    {
+      if (y <= ly) return ldx < 0;
+
+      return ldx > 0;
+    }
+
+  dx = (x - lx);
+  dy = (y - ly);
+
+  /* Try to quickly decide by looking at sign bits. */
+
+  if ((ldy ^ ldx ^ dx ^ dy) & 0x80000000)
+    {
+      if ((ldy ^ dx) & 0x80000000)
+        {
+          return 1; /* (left is negative) */
+        }
+
+      return 0;
+    }
+
+  left = fixed_mul(ldy >> FRACBITS, dx);
+  right = fixed_mul(dy, ldx >> FRACBITS);
+
+  if (right < left)
+    {
+      return 0; /* front side */
+    }
+
+  return 1; /* back side */
 }
 
+/****************************************************************************
+ * Name: r_point_to_angle
+ *
+ * Description:
+ *  To get a global angle from cartesian coordinates, the coordinates are
+ *  flipped until they are in the first octant of the coordinate system, then
+ *  the y (<=x) is scaled and divided by x to get a tangent (slope) value
+ * which is looked up in the tantoangle[] table.
+ *
+ ****************************************************************************/
 
-//
-// R_ExecuteSetViewSize
-//
-void R_ExecuteSetViewSize (void)
+angle_t r_point_to_angle(fixed_t x, fixed_t y)
 {
-    fixed_t	cosadj;
-    fixed_t	dy;
-    int		i;
-    int		j;
-    int		level;
-    int		startmap; 	
+  x -= viewx;
+  y -= viewy;
 
-    setsizeneeded = false;
+  if ((!x) && (!y)) return 0;
 
-    if (setblocks == 11)
+  if (x >= 0)
     {
-	scaledviewwidth = SCREENWIDTH;
-	viewheight = SCREENHEIGHT;
-    }
-    else
-    {
-	scaledviewwidth = setblocks*32;
-	viewheight = (setblocks*168/10)&~7;
-    }
-    
-    detailshift = setdetail;
-    viewwidth = scaledviewwidth>>detailshift;
-	
-    centery = viewheight/2;
-    centerx = viewwidth/2;
-    centerxfrac = centerx<<FRACBITS;
-    centeryfrac = centery<<FRACBITS;
-    projection = centerxfrac;
+      /* x >=0 */
 
-    if (!detailshift)
-    {
-	colfunc = basecolfunc = R_DrawColumn;
-	fuzzcolfunc = R_DrawFuzzColumn;
-	transcolfunc = R_DrawTranslatedColumn;
-	spanfunc = R_DrawSpan;
+      if (y >= 0)
+        {
+          /* y>= 0 */
+
+          if (x > y)
+            {
+              return tantoangle[slope_div(y, x)]; /* octant 0 */
+            }
+          else
+            {
+              return ANG90 - 1 - tantoangle[slope_div(x, y)]; /* octant 1 */
+            }
+        }
+      else
+        {
+          /* y<0 */
+
+          y = -y;
+
+          if (x > y)
+            {
+              return -tantoangle[slope_div(y, x)]; /* octant 8 */
+            }
+          else
+            {
+              return ANG270 + tantoangle[slope_div(x, y)]; /* octant 7 */
+            }
+        }
     }
-    else
+  else
     {
-	colfunc = basecolfunc = R_DrawColumnLow;
-	fuzzcolfunc = R_DrawFuzzColumnLow;
-	transcolfunc = R_DrawTranslatedColumnLow;
-	spanfunc = R_DrawSpanLow;
+      /* x<0 */
+
+      x = -x;
+
+      if (y >= 0)
+        {
+          /* y>= 0 */
+
+          if (x > y)
+            {
+              return ANG180 - 1 - tantoangle[slope_div(y, x)]; /* octant 3 */
+            }
+          else
+            {
+              return ANG90 + tantoangle[slope_div(x, y)]; /* octant 2 */
+            }
+        }
+      else
+        {
+          y = -y; /* y<0 */
+
+          if (x > y)
+            {
+              return ANG180 + tantoangle[slope_div(y, x)]; /* octant 4 */
+            }
+          else
+            {
+              return ANG270 - 1 - tantoangle[slope_div(x, y)]; /* octant 5 */
+            }
+        }
     }
 
-    R_InitBuffer (scaledviewwidth, viewheight);
-	
-    R_InitTextureMapping ();
-    
-    // psprite scales
-    pspritescale = FRACUNIT*viewwidth/SCREENWIDTH;
-    pspriteiscale = FRACUNIT*SCREENWIDTH/viewwidth;
-    
-    // thing clipping
-    for (i=0 ; i<viewwidth ; i++)
-	screenheightarray[i] = viewheight;
-    
-    // planes
-    for (i=0 ; i<viewheight ; i++)
-    {
-	dy = ((i-viewheight/2)<<FRACBITS)+FRACUNIT/2;
-	dy = abs(dy);
-	yslope[i] = FixedDiv ( (viewwidth<<detailshift)/2*FRACUNIT, dy);
-    }
-	
-    for (i=0 ; i<viewwidth ; i++)
-    {
-	cosadj = abs(finecosine[xtoviewangle[i]>>ANGLETOFINESHIFT]);
-	distscale[i] = FixedDiv (FRACUNIT,cosadj);
-    }
-    
-    // Calculate the light levels to use
-    //  for each level / scale combination.
-    for (i=0 ; i< LIGHTLEVELS ; i++)
-    {
-	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
-	for (j=0 ; j<MAXLIGHTSCALE ; j++)
-	{
-	    level = startmap - j*SCREENWIDTH/(viewwidth<<detailshift)/DISTMAP;
-	    
-	    if (level < 0)
-		level = 0;
-
-	    if (level >= NUMCOLORMAPS)
-		level = NUMCOLORMAPS-1;
-
-	    scalelight[i][j] = colormaps + level*256;
-	}
-    }
+  return 0;
 }
 
+/****************************************************************************
+ * Name: r_point_to_angle2
+ ****************************************************************************/
 
-
-//
-// R_Init
-//
-
-
-
-void R_Init (void)
+angle_t r_point_to_angle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
 {
-    R_InitData ();
-    printf (".");
-    R_InitPointToAngle ();
-    printf (".");
-    R_InitTables ();
-    // viewwidth / viewheight / detailLevel are set by the defaults
-    printf (".");
+  viewx = x1;
+  viewy = y1;
 
-    R_SetViewSize (screenblocks, detailLevel);
-    R_InitPlanes ();
-    printf (".");
-    R_InitLightTables ();
-    printf (".");
-    R_InitSkyMap ();
-    R_InitTranslationTables ();
-    printf (".");
-	
-    framecount = 0;
+  return r_point_to_angle(x2, y2);
 }
 
+/****************************************************************************
+ * Name: r_point_to_dist
+ ****************************************************************************/
 
-//
-// R_PointInSubsector
-//
-subsector_t*
-R_PointInSubsector
-( fixed_t	x,
-  fixed_t	y )
+fixed_t r_point_to_dist(fixed_t x, fixed_t y)
 {
-    node_t*	node;
-    int		side;
-    int		nodenum;
+  int angle;
+  fixed_t dx;
+  fixed_t dy;
+  fixed_t temp;
+  fixed_t dist;
+  fixed_t frac;
 
-    // single subsector is a special case
-    if (!numnodes)				
-	return subsectors;
-		
-    nodenum = numnodes-1;
+  dx = abs(x - viewx);
+  dy = abs(y - viewy);
 
-    while (! (nodenum & NF_SUBSECTOR) )
+  if (dy > dx)
     {
-	node = &nodes[nodenum];
-	side = R_PointOnSide (x, y, node);
-	nodenum = node->children[side];
+      temp = dx;
+      dx = dy;
+      dy = temp;
     }
-	
-    return &subsectors[nodenum & ~NF_SUBSECTOR];
-}
 
+  /* Fix crashes in udm1.wad */
 
-
-//
-// R_SetupFrame
-//
-void R_SetupFrame (player_t* player)
-{		
-    int		i;
-    
-    viewplayer = player;
-    viewx = player->mo->x;
-    viewy = player->mo->y;
-    viewangle = player->mo->angle + viewangleoffset;
-    extralight = player->extralight;
-
-    viewz = player->viewz;
-    
-    viewsin = finesine[viewangle>>ANGLETOFINESHIFT];
-    viewcos = finecosine[viewangle>>ANGLETOFINESHIFT];
-	
-    sscount = 0;
-	
-    if (player->fixedcolormap)
+  if (dx != 0)
     {
-	fixedcolormap =
-	    colormaps
-	    + player->fixedcolormap*256;
-	
-	walllights = scalelightfixed;
-
-	for (i=0 ; i<MAXLIGHTSCALE ; i++)
-	    scalelightfixed[i] = fixedcolormap;
+      frac = fixed_div(dy, dx);
     }
-    else
-	fixedcolormap = 0;
-		
-    framecount++;
-    validcount++;
+  else
+    {
+      frac = 0;
+    }
+
+  angle = (tantoangle[frac >> DBITS] + ANG90) >> ANGLETOFINESHIFT;
+
+  dist = fixed_div(dx, finesine[angle]); /* use as cosine */
+
+  return dist;
 }
 
+/****************************************************************************
+ * Name: r_scale_from_global_angle
+ *
+ * Description:
+ *  Returns the texture mapping scale for the current line (horizontal span)
+ *  at the given angle. rw_distance must be calculated first.
+ *
+ ****************************************************************************/
 
+fixed_t r_scale_from_global_angle(angle_t visangle)
+{
+  fixed_t scale;
+  angle_t anglea;
+  angle_t angleb;
+  int sinea;
+  int sineb;
+  fixed_t num;
+  int den;
 
-//
-// R_RenderView
-//
-void R_RenderPlayerView (player_t* player)
-{	
-    R_SetupFrame (player);
+#if 0 /* UNUSED */
+  fixed_t dist;
+  fixed_t z;
+  fixed_t sinv;
+  fixed_t cosv;
 
-    // Clear buffers.
-    R_ClearClipSegs ();
-    R_ClearDrawSegs ();
-    R_ClearPlanes ();
-    R_ClearSprites ();
-    
-    // check for new console commands.
-    NetUpdate ();
+  sinv = finesine[(visangle - rw_normalangle) >> ANGLETOFINESHIFT];
+  dist = fixed_div(rw_distance, sinv);
+  cosv = finecosine[(viewangle - visangle) >> ANGLETOFINESHIFT];
+  z = abs(fixed_mul(dist, cosv));
+  scale = fixed_div(projection, z);
+  return scale;
+#endif
 
-    // The head node is the last node output.
-    R_RenderBSPNode (numnodes-1);
-    
-    // Check for new console commands.
-    NetUpdate ();
-    
-    R_DrawPlanes ();
-    
-    // Check for new console commands.
-    NetUpdate ();
-    
-    R_DrawMasked ();
+  anglea = ANG90 + (visangle - viewangle);
+  angleb = ANG90 + (visangle - rw_normalangle);
 
-    // Check for new console commands.
-    NetUpdate ();				
+  /* both sines are always positive */
+
+  sinea = finesine[anglea >> ANGLETOFINESHIFT];
+  sineb = finesine[angleb >> ANGLETOFINESHIFT];
+  num = fixed_mul(projection, sineb) << detailshift;
+  den = fixed_mul(rw_distance, sinea);
+
+  if (den > num >> FRACBITS)
+    {
+      scale = fixed_div(num, den);
+
+      if (scale > 64 * FRACUNIT)
+        scale = 64 * FRACUNIT;
+      else if (scale < 256)
+        scale = 256;
+    }
+  else
+    scale = 64 * FRACUNIT;
+
+  return scale;
+}
+
+/****************************************************************************
+ * Name: r_set_view_size
+ *
+ * Description:
+ *  Do not really change anything here, because it might be in the middle
+ *  of a refresh. The change will take effect next refresh.
+ *
+ ****************************************************************************/
+
+void r_set_view_size(int blocks, int detail)
+{
+  setsizeneeded = true;
+  setblocks = blocks;
+  setdetail = detail;
+}
+
+/****************************************************************************
+ * Name: r_execute_set_view_size
+ ****************************************************************************/
+
+void r_execute_set_view_size(void)
+{
+  fixed_t cosadj;
+  fixed_t dy;
+  int i;
+  int j;
+  int level;
+  int startmap;
+
+  setsizeneeded = false;
+
+  if (setblocks == 11)
+    {
+      scaledviewwidth = SCREENWIDTH;
+      viewheight = SCREENHEIGHT;
+    }
+  else
+    {
+      scaledviewwidth = setblocks * 32;
+      viewheight = (setblocks * 168 / 10) & ~7;
+    }
+
+  detailshift = setdetail;
+  viewwidth = scaledviewwidth >> detailshift;
+
+  centery = viewheight / 2;
+  centerx = viewwidth / 2;
+  centerxfrac = centerx << FRACBITS;
+  centeryfrac = centery << FRACBITS;
+  projection = centerxfrac;
+
+  if (!detailshift)
+    {
+      colfunc = basecolfunc = r_draw_column;
+      fuzzcolfunc = r_draw_fuzz_column;
+      transcolfunc = r_draw_translated_column;
+      spanfunc = r_draw_span;
+    }
+  else
+    {
+      colfunc = basecolfunc = r_draw_column_low;
+      fuzzcolfunc = r_draw_fuzz_column_low;
+      transcolfunc = r_draw_translated_column_low;
+      spanfunc = r_draw_span_low;
+    }
+
+  r_init_buffer(scaledviewwidth, viewheight);
+
+  r_init_texture_mapping();
+
+  /* psprite scales */
+
+  pspritescale = FRACUNIT * viewwidth / SCREENWIDTH;
+  pspriteiscale = FRACUNIT * SCREENWIDTH / viewwidth;
+
+  /* thing clipping */
+
+  for (i = 0; i < viewwidth; i++)
+    screenheightarray[i] = viewheight;
+
+  /* planes */
+
+  for (i = 0; i < viewheight; i++)
+    {
+      dy = ((i - viewheight / 2) << FRACBITS) + FRACUNIT / 2;
+      dy = abs(dy);
+      yslope[i] = fixed_div((viewwidth << detailshift) / 2 * FRACUNIT, dy);
+    }
+
+  for (i = 0; i < viewwidth; i++)
+    {
+      cosadj = abs(finecosine[xtoviewangle[i] >> ANGLETOFINESHIFT]);
+      distscale[i] = fixed_div(FRACUNIT, cosadj);
+    }
+
+  /* Calculate the light levels to use for each level / scale combination. */
+
+  for (i = 0; i < LIGHTLEVELS; i++)
+    {
+      startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
+      for (j = 0; j < MAXLIGHTSCALE; j++)
+        {
+          level = startmap -
+                  j * SCREENWIDTH / (viewwidth << detailshift) / DISTMAP;
+
+          if (level < 0) level = 0;
+
+          if (level >= NUMCOLORMAPS) level = NUMCOLORMAPS - 1;
+
+          scalelight[i][j] = colormaps + level * 256;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: r_init
+ ****************************************************************************/
+
+void r_init(void)
+{
+  r_init_data();
+  printf(".");
+  r_init_point_to_angle();
+  printf(".");
+  r_init_tables();
+
+  /* viewwidth / viewheight / g_detail_level are set by the defaults */
+
+  printf(".");
+
+  r_set_view_size(screenblocks, g_detail_level);
+  r_init_planes();
+  printf(".");
+  r_init_light_tables();
+  printf(".");
+  r_init_sky_map();
+  r_init_translation_table();
+  printf(".");
+
+  framecount = 0;
+}
+
+/****************************************************************************
+ * Name: r_point_in_subsector
+ ****************************************************************************/
+
+subsector_t *r_point_in_subsector(fixed_t x, fixed_t y)
+{
+  node_t *node;
+  int side;
+  int nodenum;
+
+  /* single subsector is a special case */
+
+  if (!numnodes) return subsectors;
+
+  nodenum = numnodes - 1;
+
+  while (!(nodenum & NF_SUBSECTOR))
+    {
+      node = &nodes[nodenum];
+      side = r_point_on_side(x, y, node);
+      nodenum = node->children[side];
+    }
+
+  return &subsectors[nodenum & ~NF_SUBSECTOR];
+}
+
+/****************************************************************************
+ * Name: r_render_player_view
+ ****************************************************************************/
+
+void r_render_player_view(player_t *player)
+{
+  r_setup_frame(player);
+
+  /* Clear buffers. */
+
+  r_clear_clip_segs();
+  r_clear_draw_segs();
+  r_clear_planes();
+  r_clear_sprites();
+
+  /* check for new console commands. */
+
+  net_update();
+
+  /* The head node is the last node output. */
+
+  r_render_bsp_node(numnodes - 1);
+
+  /* Check for new console commands. */
+
+  net_update();
+
+  r_draw_planes();
+
+  /* Check for new console commands. */
+
+  net_update();
+
+  r_draw_masked();
+
+  /* Check for new console commands. */
+
+  net_update();
 }
diff --git a/games/NXDoom/src/doom/r_main.h b/games/NXDoom/src/doom/r_main.h
index f97bd817e..706ddb660 100644
--- a/games/NXDoom/src/doom/r_main.h
+++ b/games/NXDoom/src/doom/r_main.h
@@ -1,165 +1,150 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_main.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __R_MAIN__
 #define __R_MAIN__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_player.h"
 #include "r_data.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Lighting LUT.
+ * Used for z-depth cuing per column/row, and other lighting effects (sector
+ * ambient, flash).
+ */
 
+/* Lighting constants. Now why not 32 levels here? */
 
-//
-// POV related.
-//
-extern fixed_t		viewcos;
-extern fixed_t		viewsin;
+#define LIGHTLEVELS 16
+#define LIGHTSEGSHIFT 4
 
-extern int		viewwindowx;
-extern int		viewwindowy;
+#define MAXLIGHTSCALE 48
+#define LIGHTSCALESHIFT 12
+#define MAXLIGHTZ 128
+#define LIGHTZSHIFT 20
 
+/* Number of diminishing brightness levels.
+ * There a 0-31, i.e. 32 LUT in the COLORMAP lump.
+ */
 
+#define NUMCOLORMAPS 32
 
-extern int		centerx;
-extern int		centery;
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-extern fixed_t		centerxfrac;
-extern fixed_t		centeryfrac;
-extern fixed_t		projection;
+/* Function pointers to switch refresh/drawing functions.
+ * Used to select shadow mode etc.
+ */
 
-extern int		validcount;
+extern void (*colfunc)(void);
+extern void (*transcolfunc)(void);
+extern void (*basecolfunc)(void);
+extern void (*fuzzcolfunc)(void);
 
-extern int		linecount;
-extern int		loopcount;
+/* No shadow effects on floors. */
 
-extern  boolean setsizeneeded;
+extern void (*spanfunc)(void);
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// Lighting LUT.
-// Used for z-depth cuing per column/row,
-//  and other lighting effects (sector ambient, flash).
-//
+/* POV related. */
 
-// Lighting constants.
-// Now why not 32 levels here?
-#define LIGHTLEVELS	        16
-#define LIGHTSEGSHIFT	         4
+extern fixed_t viewcos;
+extern fixed_t viewsin;
 
-#define MAXLIGHTSCALE		48
-#define LIGHTSCALESHIFT		12
-#define MAXLIGHTZ	       128
-#define LIGHTZSHIFT		20
+extern int viewwindowx;
+extern int viewwindowy;
 
-extern lighttable_t*	scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-extern lighttable_t*	scalelightfixed[MAXLIGHTSCALE];
-extern lighttable_t*	zlight[LIGHTLEVELS][MAXLIGHTZ];
+extern int centerx;
+extern int centery;
 
-extern int		extralight;
-extern lighttable_t*	fixedcolormap;
+extern fixed_t centerxfrac;
+extern fixed_t centeryfrac;
+extern fixed_t projection;
 
+extern int validcount;
 
-// Number of diminishing brightness levels.
-// There a 0-31, i.e. 32 LUT in the COLORMAP lump.
-#define NUMCOLORMAPS		32
+extern int linecount;
+extern int loopcount;
 
+extern boolean setsizeneeded;
 
-// Blocky/low detail mode.
-//B remove this?
-//  0 = high, 1 = low
-extern	int		detailshift;	
+extern lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+extern lighttable_t *scalelightfixed[MAXLIGHTSCALE];
+extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
 
+extern int extralight;
+extern lighttable_t *fixedcolormap;
 
-//
-// Function pointers to switch refresh/drawing functions.
-// Used to select shadow mode etc.
-//
-extern void		(*colfunc) (void);
-extern void		(*transcolfunc) (void);
-extern void		(*basecolfunc) (void);
-extern void		(*fuzzcolfunc) (void);
-// No shadow effects on floors.
-extern void		(*spanfunc) (void);
+/* Blocky/low detail mode. B remove this? 0 = high, 1 = low
+ */
 
+extern int detailshift;
 
-//
-// Utility functions.
-int
-R_PointOnSide
-( fixed_t	x,
-  fixed_t	y,
-  node_t*	node );
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-int
-R_PointOnSegSide
-( fixed_t	x,
-  fixed_t	y,
-  seg_t*	line );
+/* Utility functions. */
 
-angle_t
-R_PointToAngle
-( fixed_t	x,
-  fixed_t	y );
+int r_point_on_side(fixed_t x, fixed_t y, node_t *node);
 
-angle_t
-R_PointToAngle2
-( fixed_t	x1,
-  fixed_t	y1,
-  fixed_t	x2,
-  fixed_t	y2 );
+int r_point_on_seg_side(fixed_t x, fixed_t y, seg_t *line);
 
-fixed_t
-R_PointToDist
-( fixed_t	x,
-  fixed_t	y );
+angle_t r_point_to_angle(fixed_t x, fixed_t y);
 
+angle_t r_point_to_angle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
 
-fixed_t R_ScaleFromGlobalAngle (angle_t visangle);
+fixed_t r_point_to_dist(fixed_t x, fixed_t y);
 
-subsector_t*
-R_PointInSubsector
-( fixed_t	x,
-  fixed_t	y );
+fixed_t r_scale_from_global_angle(angle_t visangle);
 
-void
-R_AddPointToBox
-( int		x,
-  int		y,
-  fixed_t*	box );
+subsector_t *r_point_in_subsector(fixed_t x, fixed_t y);
 
+/* REFRESH - the actual rendering functions. */
 
+/* Called by G_Drawer. */
 
-//
-// REFRESH - the actual rendering functions.
-//
+void r_render_player_view(player_t *player);
 
-// Called by G_Drawer.
-void R_RenderPlayerView (player_t *player);
+/* Called by startup code. */
 
-// Called by startup code.
-void R_Init (void);
+void r_init(void);
 
-// Called by M_Responder.
-void R_SetViewSize (int blocks, int detail);
+/* Called by m_responder. */
 
-void R_ExecuteSetViewSize(void);
+void r_set_view_size(int blocks, int detail);
 
+void r_execute_set_view_size(void);
 
-#endif
+#endif /* __R_MAIN__ */
diff --git a/games/NXDoom/src/doom/r_plane.c b/games/NXDoom/src/doom/r_plane.c
index b63b20fd2..65a2c2fa7 100644
--- a/games/NXDoom/src/doom/r_plane.c
+++ b/games/NXDoom/src/doom/r_plane.c
@@ -1,30 +1,38 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Here is a core component: drawing the floors and ceilings,
-//	 while maintaining a per column clipping list only.
-//	Moreover, the sky areas have to be determined.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_plane.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Here is a core component: drawing the floors and ceilings, while
+ *  maintaining a per column clipping list only. Moreover, the sky areas
+ *  have to be determined.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "i_system.h"
-#include "z_zone.h"
 #include "w_wad.h"
+#include "z_zone.h"
 
 #include "doomdef.h"
 #include "doomstat.h"
@@ -32,418 +40,378 @@
 #include "r_local.h"
 #include "r_sky.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define MAXOPENINGS (SCREENWIDTH * CONFIG_GAMES_NXDOOM_MAXOPENINGS)
 
-planefunction_t		floorfunc;
-planefunction_t		ceilingfunc;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// opening
-//
+planefunction_t floorfunc;
+planefunction_t ceilingfunc;
 
-// Here comes the obnoxious "visplane".
-#define MAXVISPLANES	128
-visplane_t		visplanes[MAXVISPLANES];
-visplane_t*		lastvisplane;
-visplane_t*		floorplane;
-visplane_t*		ceilingplane;
+/* opening */
 
-// ?
-#define MAXOPENINGS	SCREENWIDTH*64
-short			openings[MAXOPENINGS];
-short*			lastopening;
+/* Here comes the obnoxious "visplane". */
 
+visplane_t visplanes[CONFIG_GAMES_NXDOOM_MAXVISPLANES];
+visplane_t *lastvisplane;
+visplane_t *floorplane;
+visplane_t *ceilingplane;
 
-//
-// Clip values are the solid pixel bounding the range.
-//  floorclip starts out SCREENHEIGHT
-//  ceilingclip starts out -1
-//
-short			floorclip[SCREENWIDTH];
-short			ceilingclip[SCREENWIDTH];
+short openings[MAXOPENINGS];
+short *lastopening;
 
-//
-// spanstart holds the start of a plane span
-// initialized to 0 at start
-//
-int			spanstart[SCREENHEIGHT];
-int			spanstop[SCREENHEIGHT];
+/* Clip values are the solid pixel bounding the range. floorclip starts out
+ * SCREENHEIGHT ceilingclip starts out -1
+ */
 
-//
-// texture mapping
-//
-lighttable_t**		planezlight;
-fixed_t			planeheight;
+short floorclip[SCREENWIDTH];
+short ceilingclip[SCREENWIDTH];
 
-fixed_t			yslope[SCREENHEIGHT];
-fixed_t			distscale[SCREENWIDTH];
-fixed_t			basexscale;
-fixed_t			baseyscale;
+/* spanstart holds the start of a plane span initialized to 0 at start */
 
-fixed_t			cachedheight[SCREENHEIGHT];
-fixed_t			cacheddistance[SCREENHEIGHT];
-fixed_t			cachedxstep[SCREENHEIGHT];
-fixed_t			cachedystep[SCREENHEIGHT];
+int spanstart[SCREENHEIGHT];
+int spanstop[SCREENHEIGHT];
 
+/* texture mapping */
 
+lighttable_t **planezlight;
+fixed_t planeheight;
 
-//
-// R_InitPlanes
-// Only at game startup.
-//
-void R_InitPlanes (void)
+fixed_t yslope[SCREENHEIGHT];
+fixed_t distscale[SCREENWIDTH];
+fixed_t basexscale;
+fixed_t baseyscale;
+
+fixed_t cachedheight[SCREENHEIGHT];
+fixed_t cacheddistance[SCREENHEIGHT];
+fixed_t cachedxstep[SCREENHEIGHT];
+fixed_t cachedystep[SCREENHEIGHT];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Uses global vars:
+ *  planeheight
+ *  ds_source
+ *  basexscale
+ *  baseyscale
+ *  viewx
+ *  viewy
+ *
+ * BASIC PRIMITIVE
+ */
+
+static void r_map_plane(int y, int x1, int x2)
 {
-  // Doh!
-}
+  angle_t angle;
+  fixed_t distance;
+  fixed_t length;
+  unsigned index;
 
-
-//
-// R_MapPlane
-//
-// Uses global vars:
-//  planeheight
-//  ds_source
-//  basexscale
-//  baseyscale
-//  viewx
-//  viewy
-//
-// BASIC PRIMITIVE
-//
-void
-R_MapPlane
-( int		y,
-  int		x1,
-  int		x2 )
-{
-    angle_t	angle;
-    fixed_t	distance;
-    fixed_t	length;
-    unsigned	index;
-	
-#ifdef RANGECHECK
-    if (x2 < x1
-     || x1 < 0
-     || x2 >= viewwidth
-     || y > viewheight)
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (x2 < x1 || x1 < 0 || x2 >= viewwidth || y > viewheight)
     {
-	I_Error ("R_MapPlane: %i, %i at %i",x1,x2,y);
+      i_error("R_MapPlane: %i, %i at %i", x1, x2, y);
     }
 #endif
 
-    if (planeheight != cachedheight[y])
+  if (planeheight != cachedheight[y])
     {
-	cachedheight[y] = planeheight;
-	distance = cacheddistance[y] = FixedMul (planeheight, yslope[y]);
-	ds_xstep = cachedxstep[y] = FixedMul (distance,basexscale);
-	ds_ystep = cachedystep[y] = FixedMul (distance,baseyscale);
+      cachedheight[y] = planeheight;
+      distance = cacheddistance[y] = fixed_mul(planeheight, yslope[y]);
+      ds_xstep = cachedxstep[y] = fixed_mul(distance, basexscale);
+      ds_ystep = cachedystep[y] = fixed_mul(distance, baseyscale);
     }
-    else
+  else
     {
-	distance = cacheddistance[y];
-	ds_xstep = cachedxstep[y];
-	ds_ystep = cachedystep[y];
+      distance = cacheddistance[y];
+      ds_xstep = cachedxstep[y];
+      ds_ystep = cachedystep[y];
     }
-	
-    length = FixedMul (distance,distscale[x1]);
-    angle = (viewangle + xtoviewangle[x1])>>ANGLETOFINESHIFT;
-    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
-    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
 
-    if (fixedcolormap)
-	ds_colormap = fixedcolormap;
-    else
+  length = fixed_mul(distance, distscale[x1]);
+  angle = (viewangle + xtoviewangle[x1]) >> ANGLETOFINESHIFT;
+  ds_xfrac = viewx + fixed_mul(finecosine[angle], length);
+  ds_yfrac = -viewy - fixed_mul(finesine[angle], length);
+
+  if (fixedcolormap)
+    ds_colormap = fixedcolormap;
+  else
     {
-	index = distance >> LIGHTZSHIFT;
-	
-	if (index >= MAXLIGHTZ )
-	    index = MAXLIGHTZ-1;
+      index = distance >> LIGHTZSHIFT;
 
-	ds_colormap = planezlight[index];
+      if (index >= MAXLIGHTZ) index = MAXLIGHTZ - 1;
+
+      ds_colormap = planezlight[index];
     }
-	
-    ds_y = y;
-    ds_x1 = x1;
-    ds_x2 = x2;
 
-    // high or low detail
-    spanfunc ();	
+  ds_y = y;
+  ds_x1 = x1;
+  ds_x2 = x2;
+
+  /* high or low detail */
+
+  spanfunc();
 }
 
-
-//
-// R_ClearPlanes
-// At begining of frame.
-//
-void R_ClearPlanes (void)
+static void r_make_spans(int x, int t1, int b1, int t2, int b2)
 {
-    int		i;
-    angle_t	angle;
-    
-    // opening / clipping determination
-    for (i=0 ; i<viewwidth ; i++)
+  while (t1 < t2 && t1 <= b1)
     {
-	floorclip[i] = viewheight;
-	ceilingclip[i] = -1;
+      r_map_plane(t1, spanstart[t1], x - 1);
+      t1++;
+    }
+  while (b1 > b2 && b1 >= t1)
+    {
+      r_map_plane(b1, spanstart[b1], x - 1);
+      b1--;
     }
 
-    lastvisplane = visplanes;
-    lastopening = openings;
-    
-    // texture calculation
-    memset (cachedheight, 0, sizeof(cachedheight));
-
-    // left to right mapping
-    angle = (viewangle-ANG90)>>ANGLETOFINESHIFT;
-	
-    // scale will be unit scale at SCREENWIDTH/2 distance
-    basexscale = FixedDiv (finecosine[angle],centerxfrac);
-    baseyscale = -FixedDiv (finesine[angle],centerxfrac);
-}
-
-
-
-
-//
-// R_FindPlane
-//
-visplane_t*
-R_FindPlane
-( fixed_t	height,
-  int		picnum,
-  int		lightlevel )
-{
-    visplane_t*	check;
-	
-    if (picnum == skyflatnum)
+  while (t2 < t1 && t2 <= b2)
     {
-	height = 0;			// all skys map together
-	lightlevel = 0;
+      spanstart[t2] = x;
+      t2++;
     }
-	
-    for (check=visplanes; check<lastvisplane; check++)
+  while (b2 > b1 && b2 >= t2)
     {
-	if (height == check->height
-	    && picnum == check->picnum
-	    && lightlevel == check->lightlevel)
-	{
-	    break;
-	}
-    }
-    
-			
-    if (check < lastvisplane)
-	return check;
-		
-    if (lastvisplane - visplanes == MAXVISPLANES)
-	I_Error ("R_FindPlane: no more visplanes");
-		
-    lastvisplane++;
-
-    check->height = height;
-    check->picnum = picnum;
-    check->lightlevel = lightlevel;
-    check->minx = SCREENWIDTH;
-    check->maxx = -1;
-    
-    memset (check->top,0xff,sizeof(check->top));
-		
-    return check;
-}
-
-
-//
-// R_CheckPlane
-//
-visplane_t*
-R_CheckPlane
-( visplane_t*	pl,
-  int		start,
-  int		stop )
-{
-    int		intrl;
-    int		intrh;
-    int		unionl;
-    int		unionh;
-    int		x;
-	
-    if (start < pl->minx)
-    {
-	intrl = pl->minx;
-	unionl = start;
-    }
-    else
-    {
-	unionl = pl->minx;
-	intrl = start;
-    }
-	
-    if (stop > pl->maxx)
-    {
-	intrh = pl->maxx;
-	unionh = stop;
-    }
-    else
-    {
-	unionh = pl->maxx;
-	intrh = stop;
-    }
-
-    for (x=intrl ; x<= intrh ; x++)
-	if (pl->top[x] != 0xff)
-	    break;
-
-    if (x > intrh)
-    {
-	pl->minx = unionl;
-	pl->maxx = unionh;
-
-	// use the same one
-	return pl;		
-    }
-	
-    // make a new visplane
-    lastvisplane->height = pl->height;
-    lastvisplane->picnum = pl->picnum;
-    lastvisplane->lightlevel = pl->lightlevel;
-    
-    if (lastvisplane - visplanes == MAXVISPLANES)
-	I_Error ("R_CheckPlane: no more visplanes");
-
-    pl = lastvisplane++;
-    pl->minx = start;
-    pl->maxx = stop;
-
-    memset (pl->top,0xff,sizeof(pl->top));
-		
-    return pl;
-}
-
-
-//
-// R_MakeSpans
-//
-void
-R_MakeSpans
-( int		x,
-  int		t1,
-  int		b1,
-  int		t2,
-  int		b2 )
-{
-    while (t1 < t2 && t1<=b1)
-    {
-	R_MapPlane (t1,spanstart[t1],x-1);
-	t1++;
-    }
-    while (b1 > b2 && b1>=t1)
-    {
-	R_MapPlane (b1,spanstart[b1],x-1);
-	b1--;
-    }
-	
-    while (t2 < t1 && t2<=b2)
-    {
-	spanstart[t2] = x;
-	t2++;
-    }
-    while (b2 > b1 && b2>=t2)
-    {
-	spanstart[b2] = x;
-	b2--;
+      spanstart[b2] = x;
+      b2--;
     }
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/* r_init_planes
+ * Only at game startup.
+ */
 
-//
-// R_DrawPlanes
-// At the end of each frame.
-//
-void R_DrawPlanes (void)
+void r_init_planes(void)
 {
-    visplane_t*		pl;
-    int			light;
-    int			x;
-    int			stop;
-    int			angle;
-    int                 lumpnum;
-				
-#ifdef RANGECHECK
-    if (ds_p - drawsegs > MAXDRAWSEGS)
-	I_Error ("R_DrawPlanes: drawsegs overflow (%td)",
-		 ds_p - drawsegs);
-    
-    if (lastvisplane - visplanes > MAXVISPLANES)
-	I_Error ("R_DrawPlanes: visplane overflow (%td)",
-		 lastvisplane - visplanes);
-    
-    if (lastopening - openings > MAXOPENINGS)
-	I_Error ("R_DrawPlanes: opening overflow (%td)",
-		 lastopening - openings);
+  /* Doh! */
+}
+
+/* r_clear_planes
+ * At beginning of frame.
+ */
+
+void r_clear_planes(void)
+{
+  int i;
+  angle_t angle;
+
+  /* opening / clipping determination */
+
+  for (i = 0; i < viewwidth; i++)
+    {
+      floorclip[i] = viewheight;
+      ceilingclip[i] = -1;
+    }
+
+  lastvisplane = visplanes;
+  lastopening = openings;
+
+  /* texture calculation */
+
+  memset(cachedheight, 0, sizeof(cachedheight));
+
+  /* left to right mapping */
+
+  angle = (viewangle - ANG90) >> ANGLETOFINESHIFT;
+
+  /* scale will be unit scale at SCREENWIDTH/2 distance */
+
+  basexscale = fixed_div(finecosine[angle], centerxfrac);
+  baseyscale = -fixed_div(finesine[angle], centerxfrac);
+}
+
+visplane_t *r_find_plane(fixed_t height, int picnum, int lightlevel)
+{
+  visplane_t *check;
+
+  if (picnum == skyflatnum)
+    {
+      height = 0; /* all skys map together */
+      lightlevel = 0;
+    }
+
+  for (check = visplanes; check < lastvisplane; check++)
+    {
+      if (height == check->height && picnum == check->picnum &&
+          lightlevel == check->lightlevel)
+        {
+          break;
+        }
+    }
+
+  if (check < lastvisplane) return check;
+
+  if (lastvisplane - visplanes == CONFIG_GAMES_NXDOOM_MAXVISPLANES)
+    i_error("r_find_plane: no more visplanes");
+
+  lastvisplane++;
+
+  check->height = height;
+  check->picnum = picnum;
+  check->lightlevel = lightlevel;
+  check->minx = SCREENWIDTH;
+  check->maxx = -1;
+
+  memset(check->top, 0xff, sizeof(check->top));
+
+  return check;
+}
+
+visplane_t *r_check_plane(visplane_t *pl, int start, int stop)
+{
+  int intrl;
+  int intrh;
+  int unionl;
+  int unionh;
+  int x;
+
+  if (start < pl->minx)
+    {
+      intrl = pl->minx;
+      unionl = start;
+    }
+  else
+    {
+      unionl = pl->minx;
+      intrl = start;
+    }
+
+  if (stop > pl->maxx)
+    {
+      intrh = pl->maxx;
+      unionh = stop;
+    }
+  else
+    {
+      unionh = pl->maxx;
+      intrh = stop;
+    }
+
+  for (x = intrl; x <= intrh; x++)
+    {
+      if (pl->top[x] != 0xff) break;
+    }
+
+  if (x > intrh)
+    {
+      pl->minx = unionl;
+      pl->maxx = unionh;
+
+      return pl; /* use the same one */
+    }
+
+  /* make a new visplane */
+
+  lastvisplane->height = pl->height;
+  lastvisplane->picnum = pl->picnum;
+  lastvisplane->lightlevel = pl->lightlevel;
+
+  if (lastvisplane - visplanes == CONFIG_GAMES_NXDOOM_MAXVISPLANES)
+    i_error("r_check_plane: no more visplanes");
+
+  pl = lastvisplane++;
+  pl->minx = start;
+  pl->maxx = stop;
+
+  memset(pl->top, 0xff, sizeof(pl->top));
+
+  return pl;
+}
+
+/* At the end of each frame. */
+
+void r_draw_planes(void)
+{
+  visplane_t *pl;
+  int light;
+  int x;
+  int stop;
+  int angle;
+  int lumpnum;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (ds_p - drawsegs > CONFIG_GAMES_NXDOOM_MAXDRAWSEGS)
+    i_error("r_draw_planes: drawsegs overflow (%td)", ds_p - drawsegs);
+
+  if (lastvisplane - visplanes > CONFIG_GAMES_NXDOOM_MAXVISPLANES)
+    i_error("r_draw_planes: visplane overflow (%td)",
+            lastvisplane - visplanes);
+
+  if (lastopening - openings > MAXOPENINGS)
+    i_error("r_draw_planes: opening overflow (%td)", lastopening - openings);
 #endif
 
-    for (pl = visplanes ; pl < lastvisplane ; pl++)
+  for (pl = visplanes; pl < lastvisplane; pl++)
     {
-	if (pl->minx > pl->maxx)
-	    continue;
+      if (pl->minx > pl->maxx) continue;
 
-	
-	// sky flat
-	if (pl->picnum == skyflatnum)
-	{
-	    dc_iscale = pspriteiscale>>detailshift;
-	    
-	    // Sky is allways drawn full bright,
-	    //  i.e. colormaps[0] is used.
-	    // Because of this hack, sky is not affected
-	    //  by INVUL inverse mapping.
-	    dc_colormap = colormaps;
-	    dc_texturemid = skytexturemid;
-	    for (x=pl->minx ; x <= pl->maxx ; x++)
-	    {
-		dc_yl = pl->top[x];
-		dc_yh = pl->bottom[x];
+      /* sky flat */
 
-		if (dc_yl <= dc_yh)
-		{
-		    angle = (viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
-		    dc_x = x;
-		    dc_source = R_GetColumn(skytexture, angle);
-		    colfunc ();
-		}
-	    }
-	    continue;
-	}
-	
-	// regular flat
-        lumpnum = firstflat + flattranslation[pl->picnum];
-	ds_source = W_CacheLumpNum(lumpnum, PU_STATIC);
-	
-	planeheight = abs(pl->height-viewz);
-	light = (pl->lightlevel >> LIGHTSEGSHIFT)+extralight;
+      if (pl->picnum == skyflatnum)
+        {
+          dc_iscale = pspriteiscale >> detailshift;
 
-	if (light >= LIGHTLEVELS)
-	    light = LIGHTLEVELS-1;
+          /* Sky is always drawn full bright, i.e. colormaps[0] is used.
+           * Because of this hack, sky is not affected by INVUL inverse
+           * mapping.
+           */
 
-	if (light < 0)
-	    light = 0;
+          dc_colormap = colormaps;
+          dc_texturemid = skytexturemid;
+          for (x = pl->minx; x <= pl->maxx; x++)
+            {
+              dc_yl = pl->top[x];
+              dc_yh = pl->bottom[x];
 
-	planezlight = zlight[light];
+              if (dc_yl <= dc_yh)
+                {
+                  angle = (viewangle + xtoviewangle[x]) >> ANGLETOSKYSHIFT;
+                  dc_x = x;
+                  dc_source = r_get_column(skytexture, angle);
+                  colfunc();
+                }
+            }
 
-	pl->top[pl->maxx+1] = 0xff;
-	pl->top[pl->minx-1] = 0xff;
-		
-	stop = pl->maxx + 1;
+          continue;
+        }
 
-	for (x=pl->minx ; x<= stop ; x++)
-	{
-	    R_MakeSpans(x,pl->top[x-1],
-			pl->bottom[x-1],
-			pl->top[x],
-			pl->bottom[x]);
-	}
-	
-        W_ReleaseLumpNum(lumpnum);
+      /* regular flat */
+
+      lumpnum = firstflat + flattranslation[pl->picnum];
+      ds_source = w_cache_lump_num(lumpnum, PU_STATIC);
+
+      planeheight = abs(pl->height - viewz);
+      light = (pl->lightlevel >> LIGHTSEGSHIFT) + extralight;
+
+      if (light >= LIGHTLEVELS) light = LIGHTLEVELS - 1;
+
+      if (light < 0) light = 0;
+
+      planezlight = zlight[light];
+
+      pl->top[pl->maxx + 1] = 0xff;
+      pl->top[pl->minx - 1] = 0xff;
+
+      stop = pl->maxx + 1;
+
+      for (x = pl->minx; x <= stop; x++)
+        {
+          r_make_spans(x, pl->top[x - 1], pl->bottom[x - 1], pl->top[x],
+                       pl->bottom[x]);
+        }
+
+      w_release_lump_num(lumpnum);
     }
 }
diff --git a/games/NXDoom/src/doom/r_plane.h b/games/NXDoom/src/doom/r_plane.h
index 57b50e5bc..1ae3b7925 100644
--- a/games/NXDoom/src/doom/r_plane.h
+++ b/games/NXDoom/src/doom/r_plane.h
@@ -1,76 +1,69 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh, visplane stuff (floor, ceilings).
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_plane.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh, visplane stuff (floor, ceilings).
+ *
+ ****************************************************************************/
 
 #ifndef __R_PLANE__
 #define __R_PLANE__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "r_data.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+typedef void (*planefunction_t)(int top, int bottom);
 
-// Visplane related.
-extern  short*		lastopening;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+/* Visplane related. */
 
-typedef void (*planefunction_t) (int top, int bottom);
+extern short *lastopening;
 
-extern planefunction_t	floorfunc;
-extern planefunction_t	ceilingfunc_t;
+extern planefunction_t floorfunc;
+extern planefunction_t ceilingfunc_t;
 
-extern short		floorclip[SCREENWIDTH];
-extern short		ceilingclip[SCREENWIDTH];
+extern short floorclip[SCREENWIDTH];
+extern short ceilingclip[SCREENWIDTH];
 
-extern fixed_t		yslope[SCREENHEIGHT];
-extern fixed_t		distscale[SCREENWIDTH];
+extern fixed_t yslope[SCREENHEIGHT];
+extern fixed_t distscale[SCREENWIDTH];
 
-void R_InitPlanes (void);
-void R_ClearPlanes (void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void
-R_MapPlane
-( int		y,
-  int		x1,
-  int		x2 );
+void r_init_planes(void);
+void r_clear_planes(void);
 
-void
-R_MakeSpans
-( int		x,
-  int		t1,
-  int		b1,
-  int		t2,
-  int		b2 );
+void r_draw_planes(void);
 
-void R_DrawPlanes (void);
+visplane_t *r_find_plane(fixed_t height, int picnum, int lightlevel);
 
-visplane_t*
-R_FindPlane
-( fixed_t	height,
-  int		picnum,
-  int		lightlevel );
+visplane_t *r_check_plane(visplane_t *pl, int start, int stop);
 
-visplane_t*
-R_CheckPlane
-( visplane_t*	pl,
-  int		start,
-  int		stop );
-
-
-
-#endif
+#endif /* __R_PLANE__ */
diff --git a/games/NXDoom/src/doom/r_segs.c b/games/NXDoom/src/doom/r_segs.c
index 06881a520..83d9b026f 100644
--- a/games/NXDoom/src/doom/r_segs.c
+++ b/games/NXDoom/src/doom/r_segs.c
@@ -1,25 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	All the clipping: columns, horizontal spans, sky columns.
-//
-
-
-
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_segs.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  All the clipping: columns, horizontal spans, sky columns.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,712 +36,752 @@
 #include "r_local.h"
 #include "r_sky.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// OPTIMIZE: closed two sided lines as single sided
+#define HEIGHTBITS 12
+#define HEIGHTUNIT (1 << HEIGHTBITS)
 
-// True if any of the segs textures might be visible.
-boolean		segtextured;	
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-// False if the back side is the same plane.
-boolean		markfloor;	
-boolean		markceiling;
+/* OPTIMIZE: closed two sided lines as single sided */
 
-boolean		maskedtexture;
-int		toptexture;
-int		bottomtexture;
-int		midtexture;
+/* True if any of the segs textures might be visible. */
 
+boolean segtextured;
 
-angle_t		rw_normalangle;
-// angle to line origin
-int		rw_angle1;	
+/* False if the back side is the same plane. */
 
-//
-// regular wall
-//
-int		rw_x;
-int		rw_stopx;
-angle_t		rw_centerangle;
-fixed_t		rw_offset;
-fixed_t		rw_distance;
-fixed_t		rw_scale;
-fixed_t		rw_scalestep;
-fixed_t		rw_midtexturemid;
-fixed_t		rw_toptexturemid;
-fixed_t		rw_bottomtexturemid;
+boolean markfloor;
+boolean markceiling;
 
-int		worldtop;
-int		worldbottom;
-int		worldhigh;
-int		worldlow;
+boolean maskedtexture;
+int toptexture;
+int bottomtexture;
+int midtexture;
 
-fixed_t		pixhigh;
-fixed_t		pixlow;
-fixed_t		pixhighstep;
-fixed_t		pixlowstep;
+angle_t rw_normalangle;
 
-fixed_t		topfrac;
-fixed_t		topstep;
+/* angle to line origin */
 
-fixed_t		bottomfrac;
-fixed_t		bottomstep;
+int rw_angle1;
 
+/* regular wall */
 
-lighttable_t**	walllights;
+int rw_x;
+int rw_stopx;
+angle_t rw_centerangle;
+fixed_t rw_offset;
+fixed_t rw_distance;
+fixed_t rw_scale;
+fixed_t rw_scalestep;
+fixed_t rw_midtexturemid;
+fixed_t rw_toptexturemid;
+fixed_t rw_bottomtexturemid;
 
-short*		maskedtexturecol;
+int worldtop;
+int worldbottom;
+int worldhigh;
+int worldlow;
 
+fixed_t pixhigh;
+fixed_t pixlow;
+fixed_t pixhighstep;
+fixed_t pixlowstep;
 
+fixed_t topfrac;
+fixed_t topstep;
 
-//
-// R_RenderMaskedSegRange
-//
-void
-R_RenderMaskedSegRange
-( drawseg_t*	ds,
-  int		x1,
-  int		x2 )
+fixed_t bottomfrac;
+fixed_t bottomstep;
+
+lighttable_t **walllights;
+
+short *maskedtexturecol;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Draws zero, one, or two textures (and possibly a masked texture) for
+ * walls.
+ *
+ * Can draw or mark the starting pixel of floor and ceiling textures.
+ * CALLED: CORE LOOPING ROUTINE.
+ */
+
+static void r_render_seg_loop(void)
 {
-    unsigned	index;
-    column_t*	col;
-    int		lightnum;
-    int		texnum;
-    
-    // Calculate light table.
-    // Use different light tables
-    //   for horizontal / vertical / diagonal. Diagonal?
-    // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-    curline = ds->curline;
-    frontsector = curline->frontsector;
-    backsector = curline->backsector;
-    texnum = texturetranslation[curline->sidedef->midtexture];
-	
-    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
+  angle_t angle;
+  unsigned index;
+  int yl;
+  int yh;
+  int mid;
+  fixed_t texturecolumn;
+  int top;
+  int bottom;
 
-    if (curline->v1->y == curline->v2->y)
-	lightnum--;
-    else if (curline->v1->x == curline->v2->x)
-	lightnum++;
-
-    if (lightnum < 0)		
-	walllights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-	walllights = scalelight[LIGHTLEVELS-1];
-    else
-	walllights = scalelight[lightnum];
-
-    maskedtexturecol = ds->maskedtexturecol;
-
-    rw_scalestep = ds->scalestep;		
-    spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
-    mfloorclip = ds->sprbottomclip;
-    mceilingclip = ds->sprtopclip;
-    
-    // find positioning
-    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
+  for (; rw_x < rw_stopx; rw_x++)
     {
-	dc_texturemid = frontsector->floorheight > backsector->floorheight
-	    ? frontsector->floorheight : backsector->floorheight;
-	dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
-    }
-    else
-    {
-	dc_texturemid =frontsector->ceilingheight<backsector->ceilingheight
-	    ? frontsector->ceilingheight : backsector->ceilingheight;
-	dc_texturemid = dc_texturemid - viewz;
-    }
-    dc_texturemid += curline->sidedef->rowoffset;
-			
-    if (fixedcolormap)
-	dc_colormap = fixedcolormap;
-    
-    // draw the columns
-    for (dc_x = x1 ; dc_x <= x2 ; dc_x++)
-    {
-	// calculate lighting
-	if (maskedtexturecol[dc_x] != SHRT_MAX)
-	{
-	    if (!fixedcolormap)
-	    {
-		index = spryscale>>LIGHTSCALESHIFT;
+      /* mark floor / ceiling areas */
 
-		if (index >=  MAXLIGHTSCALE )
-		    index = MAXLIGHTSCALE-1;
+      yl = (topfrac + HEIGHTUNIT - 1) >> HEIGHTBITS;
 
-		dc_colormap = walllights[index];
-	    }
-			
-	    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-	    dc_iscale = 0xffffffffu / (unsigned)spryscale;
-	    
-	    // draw the texture
-	    col = (column_t *)( 
-		(byte *)R_GetColumn(texnum,maskedtexturecol[dc_x]) -3);
-			
-	    R_DrawMaskedColumn (col);
-	    maskedtexturecol[dc_x] = SHRT_MAX;
-	}
-	spryscale += rw_scalestep;
-    }
-	
-}
+      /* no space above wall? */
 
+      if (yl < ceilingclip[rw_x] + 1) yl = ceilingclip[rw_x] + 1;
 
-
-
-//
-// R_RenderSegLoop
-// Draws zero, one, or two textures (and possibly a masked
-//  texture) for walls.
-// Can draw or mark the starting pixel of floor and ceiling
-//  textures.
-// CALLED: CORE LOOPING ROUTINE.
-//
-#define HEIGHTBITS		12
-#define HEIGHTUNIT		(1<<HEIGHTBITS)
-
-void R_RenderSegLoop (void)
-{
-    angle_t		angle;
-    unsigned		index;
-    int			yl;
-    int			yh;
-    int			mid;
-    fixed_t		texturecolumn;
-    int			top;
-    int			bottom;
-
-    for ( ; rw_x < rw_stopx ; rw_x++)
-    {
-	// mark floor / ceiling areas
-	yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
-
-	// no space above wall?
-	if (yl < ceilingclip[rw_x]+1)
-	    yl = ceilingclip[rw_x]+1;
-	
-	if (markceiling)
-	{
-	    top = ceilingclip[rw_x]+1;
-	    bottom = yl-1;
-
-	    if (bottom >= floorclip[rw_x])
-		bottom = floorclip[rw_x]-1;
-
-	    if (top <= bottom)
-	    {
-		ceilingplane->top[rw_x] = top;
-		ceilingplane->bottom[rw_x] = bottom;
-	    }
-	}
-		
-	yh = bottomfrac>>HEIGHTBITS;
-
-	if (yh >= floorclip[rw_x])
-	    yh = floorclip[rw_x]-1;
-
-	if (markfloor)
-	{
-	    top = yh+1;
-	    bottom = floorclip[rw_x]-1;
-	    if (top <= ceilingclip[rw_x])
-		top = ceilingclip[rw_x]+1;
-	    if (top <= bottom)
-	    {
-		floorplane->top[rw_x] = top;
-		floorplane->bottom[rw_x] = bottom;
-	    }
-	}
-	
-	// texturecolumn and lighting are independent of wall tiers
-	if (segtextured)
-	{
-	    // calculate texture offset
-	    angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
-	    texturecolumn = rw_offset-FixedMul(finetangent[angle],rw_distance);
-	    texturecolumn >>= FRACBITS;
-	    // calculate lighting
-	    index = rw_scale>>LIGHTSCALESHIFT;
-
-	    if (index >=  MAXLIGHTSCALE )
-		index = MAXLIGHTSCALE-1;
-
-	    dc_colormap = walllights[index];
-	    dc_x = rw_x;
-	    dc_iscale = 0xffffffffu / (unsigned)rw_scale;
-	}
-        else
+      if (markceiling)
         {
-            // purely to shut up the compiler
+          top = ceilingclip[rw_x] + 1;
+          bottom = yl - 1;
 
-            texturecolumn = 0;
+          if (bottom >= floorclip[rw_x]) bottom = floorclip[rw_x] - 1;
+
+          if (top <= bottom)
+            {
+              ceilingplane->top[rw_x] = top;
+              ceilingplane->bottom[rw_x] = bottom;
+            }
         }
-	
-	// draw the wall tiers
-	if (midtexture)
-	{
-	    // single sided line
-	    dc_yl = yl;
-	    dc_yh = yh;
-	    dc_texturemid = rw_midtexturemid;
-	    dc_source = R_GetColumn(midtexture,texturecolumn);
-	    colfunc ();
-	    ceilingclip[rw_x] = viewheight;
-	    floorclip[rw_x] = -1;
-	}
-	else
-	{
-	    // two sided line
-	    if (toptexture)
-	    {
-		// top wall
-		mid = pixhigh>>HEIGHTBITS;
-		pixhigh += pixhighstep;
 
-		if (mid >= floorclip[rw_x])
-		    mid = floorclip[rw_x]-1;
+      yh = bottomfrac >> HEIGHTBITS;
 
-		if (mid >= yl)
-		{
-		    dc_yl = yl;
-		    dc_yh = mid;
-		    dc_texturemid = rw_toptexturemid;
-		    dc_source = R_GetColumn(toptexture,texturecolumn);
-		    colfunc ();
-		    ceilingclip[rw_x] = mid;
-		}
-		else
-		    ceilingclip[rw_x] = yl-1;
-	    }
-	    else
-	    {
-		// no top wall
-		if (markceiling)
-		    ceilingclip[rw_x] = yl-1;
-	    }
-			
-	    if (bottomtexture)
-	    {
-		// bottom wall
-		mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
-		pixlow += pixlowstep;
+      if (yh >= floorclip[rw_x]) yh = floorclip[rw_x] - 1;
 
-		// no space above wall?
-		if (mid <= ceilingclip[rw_x])
-		    mid = ceilingclip[rw_x]+1;
-		
-		if (mid <= yh)
-		{
-		    dc_yl = mid;
-		    dc_yh = yh;
-		    dc_texturemid = rw_bottomtexturemid;
-		    dc_source = R_GetColumn(bottomtexture,
-					    texturecolumn);
-		    colfunc ();
-		    floorclip[rw_x] = mid;
-		}
-		else
-		    floorclip[rw_x] = yh+1;
-	    }
-	    else
-	    {
-		// no bottom wall
-		if (markfloor)
-		    floorclip[rw_x] = yh+1;
-	    }
-			
-	    if (maskedtexture)
-	    {
-		// save texturecol
-		//  for backdrawing of masked mid texture
-		maskedtexturecol[rw_x] = texturecolumn;
-	    }
-	}
-		
-	rw_scale += rw_scalestep;
-	topfrac += topstep;
-	bottomfrac += bottomstep;
+      if (markfloor)
+        {
+          top = yh + 1;
+          bottom = floorclip[rw_x] - 1;
+          if (top <= ceilingclip[rw_x]) top = ceilingclip[rw_x] + 1;
+          if (top <= bottom)
+            {
+              floorplane->top[rw_x] = top;
+              floorplane->bottom[rw_x] = bottom;
+            }
+        }
+
+      /* texturecolumn and lighting are independent of wall tiers */
+
+      if (segtextured)
+        {
+          /* calculate texture offset */
+
+          angle = (rw_centerangle + xtoviewangle[rw_x]) >> ANGLETOFINESHIFT;
+          texturecolumn =
+              rw_offset - fixed_mul(finetangent[angle], rw_distance);
+          texturecolumn >>= FRACBITS;
+
+          /* calculate lighting */
+
+          index = rw_scale >> LIGHTSCALESHIFT;
+
+          if (index >= MAXLIGHTSCALE) index = MAXLIGHTSCALE - 1;
+
+          dc_colormap = walllights[index];
+          dc_x = rw_x;
+          dc_iscale = 0xffffffffu / (unsigned)rw_scale;
+        }
+      else
+        {
+          /* purely to shut up the compiler */
+
+          texturecolumn = 0;
+        }
+
+      /* draw the wall tiers */
+
+      if (midtexture)
+        {
+          /* single sided line */
+
+          dc_yl = yl;
+          dc_yh = yh;
+          dc_texturemid = rw_midtexturemid;
+          dc_source = r_get_column(midtexture, texturecolumn);
+          colfunc();
+          ceilingclip[rw_x] = viewheight;
+          floorclip[rw_x] = -1;
+        }
+      else
+        {
+          /* two sided line */
+
+          if (toptexture)
+            {
+              /* top wall */
+
+              mid = pixhigh >> HEIGHTBITS;
+              pixhigh += pixhighstep;
+
+              if (mid >= floorclip[rw_x]) mid = floorclip[rw_x] - 1;
+
+              if (mid >= yl)
+                {
+                  dc_yl = yl;
+                  dc_yh = mid;
+                  dc_texturemid = rw_toptexturemid;
+                  dc_source = r_get_column(toptexture, texturecolumn);
+                  colfunc();
+                  ceilingclip[rw_x] = mid;
+                }
+              else
+                ceilingclip[rw_x] = yl - 1;
+            }
+          else
+            {
+              /* no top wall */
+
+              if (markceiling) ceilingclip[rw_x] = yl - 1;
+            }
+
+          if (bottomtexture)
+            {
+              /* bottom wall */
+
+              mid = (pixlow + HEIGHTUNIT - 1) >> HEIGHTBITS;
+              pixlow += pixlowstep;
+
+              /* no space above wall? */
+
+              if (mid <= ceilingclip[rw_x]) mid = ceilingclip[rw_x] + 1;
+
+              if (mid <= yh)
+                {
+                  dc_yl = mid;
+                  dc_yh = yh;
+                  dc_texturemid = rw_bottomtexturemid;
+                  dc_source = r_get_column(bottomtexture, texturecolumn);
+                  colfunc();
+                  floorclip[rw_x] = mid;
+                }
+              else
+                floorclip[rw_x] = yh + 1;
+            }
+          else
+            {
+              /* no bottom wall */
+
+              if (markfloor) floorclip[rw_x] = yh + 1;
+            }
+
+          if (maskedtexture)
+            {
+              /* save texturecol
+               *  for backdrawing of masked mid texture
+               */
+
+              maskedtexturecol[rw_x] = texturecolumn;
+            }
+        }
+
+      rw_scale += rw_scalestep;
+      topfrac += topstep;
+      bottomfrac += bottomstep;
     }
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-
-
-//
-// R_StoreWallRange
-// A wall segment will be drawn
-//  between start and stop pixels (inclusive).
-//
-void
-R_StoreWallRange
-( int	start,
-  int	stop )
+void r_render_masked_seg_range(drawseg_t *ds, int x1, int x2)
 {
-    fixed_t		hyp;
-    fixed_t		sineval;
-    angle_t		distangle, offsetangle;
-    fixed_t		vtop;
-    int			lightnum;
+  unsigned index;
+  column_t *col;
+  int lightnum;
+  int texnum;
 
-    // don't overflow and crash
-    if (ds_p == &drawsegs[MAXDRAWSEGS])
-	return;		
-		
-#ifdef RANGECHECK
-    if (start >=viewwidth || start > stop)
-	I_Error ("Bad R_RenderWallRange: %i to %i", start , stop);
-#endif
-    
-    sidedef = curline->sidedef;
-    linedef = curline->linedef;
+  /* Calculate light table.
+   * Use different light tables for horizontal / vertical / diagonal.
+   * Diagonal? OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+   */
 
-    // mark the segment as visible for auto map
-    linedef->flags |= ML_MAPPED;
-    
-    // calculate rw_distance for scale calculation
-    rw_normalangle = curline->angle + ANG90;
-    offsetangle = abs((int)rw_normalangle-(int)rw_angle1);
-    
-    if (offsetangle > ANG90)
-	offsetangle = ANG90;
+  curline = ds->curline;
+  frontsector = curline->frontsector;
+  backsector = curline->backsector;
+  texnum = texturetranslation[curline->sidedef->midtexture];
 
-    distangle = ANG90 - offsetangle;
-    hyp = R_PointToDist (curline->v1->x, curline->v1->y);
-    sineval = finesine[distangle>>ANGLETOFINESHIFT];
-    rw_distance = FixedMul (hyp, sineval);
-		
-	
-    ds_p->x1 = rw_x = start;
-    ds_p->x2 = stop;
-    ds_p->curline = curline;
-    rw_stopx = stop+1;
-    
-    // calculate scale at both ends and step
-    ds_p->scale1 = rw_scale = 
-	R_ScaleFromGlobalAngle (viewangle + xtoviewangle[start]);
-    
-    if (stop > start )
+  lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
+
+  if (curline->v1->y == curline->v2->y)
+    lightnum--;
+  else if (curline->v1->x == curline->v2->x)
+    lightnum++;
+
+  if (lightnum < 0)
+    walllights = scalelight[0];
+  else if (lightnum >= LIGHTLEVELS)
+    walllights = scalelight[LIGHTLEVELS - 1];
+  else
+    walllights = scalelight[lightnum];
+
+  maskedtexturecol = ds->maskedtexturecol;
+
+  rw_scalestep = ds->scalestep;
+  spryscale = ds->scale1 + (x1 - ds->x1) * rw_scalestep;
+  mfloorclip = ds->sprbottomclip;
+  mceilingclip = ds->sprtopclip;
+
+  /* find positioning */
+
+  if (curline->linedef->flags & ML_DONTPEGBOTTOM)
     {
-	ds_p->scale2 = R_ScaleFromGlobalAngle (viewangle + xtoviewangle[stop]);
-	ds_p->scalestep = rw_scalestep = 
-	    (ds_p->scale2 - rw_scale) / (stop-start);
+      dc_texturemid = frontsector->floorheight > backsector->floorheight
+                          ? frontsector->floorheight
+                          : backsector->floorheight;
+      dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
     }
-    else
+  else
     {
-	// UNUSED: try to fix the stretched line bug
-#if 0
-	if (rw_distance < FRACUNIT/2)
-	{
-	    fixed_t		trx,try;
-	    fixed_t		gxt,gyt;
-
-	    trx = curline->v1->x - viewx;
-	    try = curline->v1->y - viewy;
-			
-	    gxt = FixedMul(trx,viewcos); 
-	    gyt = -FixedMul(try,viewsin); 
-	    ds_p->scale1 = FixedDiv(projection, gxt-gyt)<<detailshift;
-	}
-#endif
-	ds_p->scale2 = ds_p->scale1;
+      dc_texturemid = frontsector->ceilingheight < backsector->ceilingheight
+                          ? frontsector->ceilingheight
+                          : backsector->ceilingheight;
+      dc_texturemid = dc_texturemid - viewz;
     }
-    
-    // calculate texture boundaries
-    //  and decide if floor / ceiling marks are needed
-    worldtop = frontsector->ceilingheight - viewz;
-    worldbottom = frontsector->floorheight - viewz;
-	
-    midtexture = toptexture = bottomtexture = maskedtexture = 0;
-    ds_p->maskedtexturecol = NULL;
-	
-    if (!backsector)
+
+  dc_texturemid += curline->sidedef->rowoffset;
+
+  if (fixedcolormap) dc_colormap = fixedcolormap;
+
+  /* draw the columns */
+
+  for (dc_x = x1; dc_x <= x2; dc_x++)
     {
-	// single sided line
-	midtexture = texturetranslation[sidedef->midtexture];
-	// a single sided line is terminal, so it must mark ends
-	markfloor = markceiling = true;
-	if (linedef->flags & ML_DONTPEGBOTTOM)
-	{
-	    vtop = frontsector->floorheight +
-		textureheight[sidedef->midtexture];
-	    // bottom of texture at bottom
-	    rw_midtexturemid = vtop - viewz;	
-	}
-	else
-	{
-	    // top of texture at top
-	    rw_midtexturemid = worldtop;
-	}
-	rw_midtexturemid += sidedef->rowoffset;
+      /* calculate lighting */
 
-	ds_p->silhouette = SIL_BOTH;
-	ds_p->sprtopclip = screenheightarray;
-	ds_p->sprbottomclip = negonearray;
-	ds_p->bsilheight = INT_MAX;
-	ds_p->tsilheight = INT_MIN;
+      if (maskedtexturecol[dc_x] != SHRT_MAX)
+        {
+          if (!fixedcolormap)
+            {
+              index = spryscale >> LIGHTSCALESHIFT;
+
+              if (index >= MAXLIGHTSCALE) index = MAXLIGHTSCALE - 1;
+
+              dc_colormap = walllights[index];
+            }
+
+          sprtopscreen = centeryfrac - fixed_mul(dc_texturemid, spryscale);
+          dc_iscale = 0xffffffffu / (unsigned)spryscale;
+
+          /* draw the texture */
+
+          col = (column_t *)((byte *)r_get_column(texnum,
+                                                 maskedtexturecol[dc_x]) -
+                             3);
+
+          r_draw_masked_column(col);
+          maskedtexturecol[dc_x] = SHRT_MAX;
+        }
+
+      spryscale += rw_scalestep;
     }
-    else
-    {
-	// two sided line
-	ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
-	ds_p->silhouette = 0;
-	
-	if (frontsector->floorheight > backsector->floorheight)
-	{
-	    ds_p->silhouette = SIL_BOTTOM;
-	    ds_p->bsilheight = frontsector->floorheight;
-	}
-	else if (backsector->floorheight > viewz)
-	{
-	    ds_p->silhouette = SIL_BOTTOM;
-	    ds_p->bsilheight = INT_MAX;
-	    // ds_p->sprbottomclip = negonearray;
-	}
-	
-	if (frontsector->ceilingheight < backsector->ceilingheight)
-	{
-	    ds_p->silhouette |= SIL_TOP;
-	    ds_p->tsilheight = frontsector->ceilingheight;
-	}
-	else if (backsector->ceilingheight < viewz)
-	{
-	    ds_p->silhouette |= SIL_TOP;
-	    ds_p->tsilheight = INT_MIN;
-	    // ds_p->sprtopclip = screenheightarray;
-	}
-		
-	if (backsector->ceilingheight <= frontsector->floorheight)
-	{
-	    ds_p->sprbottomclip = negonearray;
-	    ds_p->bsilheight = INT_MAX;
-	    ds_p->silhouette |= SIL_BOTTOM;
-	}
-	
-	if (backsector->floorheight >= frontsector->ceilingheight)
-	{
-	    ds_p->sprtopclip = screenheightarray;
-	    ds_p->tsilheight = INT_MIN;
-	    ds_p->silhouette |= SIL_TOP;
-	}
-	
-	worldhigh = backsector->ceilingheight - viewz;
-	worldlow = backsector->floorheight - viewz;
-		
-	// hack to allow height changes in outdoor areas
-	if (frontsector->ceilingpic == skyflatnum 
-	    && backsector->ceilingpic == skyflatnum)
-	{
-	    worldtop = worldhigh;
-	}
-	
-			
-	if (worldlow != worldbottom 
-	    || backsector->floorpic != frontsector->floorpic
-	    || backsector->lightlevel != frontsector->lightlevel)
-	{
-	    markfloor = true;
-	}
-	else
-	{
-	    // same plane on both sides
-	    markfloor = false;
-	}
-	
-			
-	if (worldhigh != worldtop 
-	    || backsector->ceilingpic != frontsector->ceilingpic
-	    || backsector->lightlevel != frontsector->lightlevel)
-	{
-	    markceiling = true;
-	}
-	else
-	{
-	    // same plane on both sides
-	    markceiling = false;
-	}
-	
-	if (backsector->ceilingheight <= frontsector->floorheight
-	    || backsector->floorheight >= frontsector->ceilingheight)
-	{
-	    // closed door
-	    markceiling = markfloor = true;
-	}
-	
-
-	if (worldhigh < worldtop)
-	{
-	    // top texture
-	    toptexture = texturetranslation[sidedef->toptexture];
-	    if (linedef->flags & ML_DONTPEGTOP)
-	    {
-		// top of texture at top
-		rw_toptexturemid = worldtop;
-	    }
-	    else
-	    {
-		vtop =
-		    backsector->ceilingheight
-		    + textureheight[sidedef->toptexture];
-		
-		// bottom of texture
-		rw_toptexturemid = vtop - viewz;	
-	    }
-	}
-	if (worldlow > worldbottom)
-	{
-	    // bottom texture
-	    bottomtexture = texturetranslation[sidedef->bottomtexture];
-
-	    if (linedef->flags & ML_DONTPEGBOTTOM )
-	    {
-		// bottom of texture at bottom
-		// top of texture at top
-		rw_bottomtexturemid = worldtop;
-	    }
-	    else	// top of texture at top
-		rw_bottomtexturemid = worldlow;
-	}
-	rw_toptexturemid += sidedef->rowoffset;
-	rw_bottomtexturemid += sidedef->rowoffset;
-	
-	// allocate space for masked texture tables
-	if (sidedef->midtexture)
-	{
-	    // masked midtexture
-	    maskedtexture = true;
-	    ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
-	    lastopening += rw_stopx - rw_x;
-	}
-    }
-    
-    // calculate rw_offset (only needed for textured lines)
-    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
-
-    if (segtextured)
-    {
-	offsetangle = rw_normalangle-rw_angle1;
-	
-	if (offsetangle > ANG180)
-	    offsetangle = -offsetangle;
-
-	if (offsetangle > ANG90)
-	    offsetangle = ANG90;
-
-	sineval = finesine[offsetangle >>ANGLETOFINESHIFT];
-	rw_offset = FixedMul (hyp, sineval);
-
-	if (rw_normalangle-rw_angle1 < ANG180)
-	    rw_offset = -rw_offset;
-
-	rw_offset += sidedef->textureoffset + curline->offset;
-	rw_centerangle = ANG90 + viewangle - rw_normalangle;
-	
-	// calculate light table
-	//  use different light tables
-	//  for horizontal / vertical / diagonal
-	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-	if (!fixedcolormap)
-	{
-	    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
-
-	    if (curline->v1->y == curline->v2->y)
-		lightnum--;
-	    else if (curline->v1->x == curline->v2->x)
-		lightnum++;
-
-	    if (lightnum < 0)		
-		walllights = scalelight[0];
-	    else if (lightnum >= LIGHTLEVELS)
-		walllights = scalelight[LIGHTLEVELS-1];
-	    else
-		walllights = scalelight[lightnum];
-	}
-    }
-    
-    // if a floor / ceiling plane is on the wrong side
-    //  of the view plane, it is definitely invisible
-    //  and doesn't need to be marked.
-    
-  
-    if (frontsector->floorheight >= viewz)
-    {
-	// above view plane
-	markfloor = false;
-    }
-    
-    if (frontsector->ceilingheight <= viewz 
-	&& frontsector->ceilingpic != skyflatnum)
-    {
-	// below view plane
-	markceiling = false;
-    }
-
-    
-    // calculate incremental stepping values for texture edges
-    worldtop >>= 4;
-    worldbottom >>= 4;
-	
-    topstep = -FixedMul (rw_scalestep, worldtop);
-    topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
-
-    bottomstep = -FixedMul (rw_scalestep,worldbottom);
-    bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
-	
-    if (backsector)
-    {	
-	worldhigh >>= 4;
-	worldlow >>= 4;
-
-	if (worldhigh < worldtop)
-	{
-	    pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
-	    pixhighstep = -FixedMul (rw_scalestep,worldhigh);
-	}
-	
-	if (worldlow > worldbottom)
-	{
-	    pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
-	    pixlowstep = -FixedMul (rw_scalestep,worldlow);
-	}
-    }
-    
-    // render it
-    if (markceiling)
-	ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
-    
-    if (markfloor)
-	floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
-
-    R_RenderSegLoop ();
-
-    
-    // save sprite clipping info
-    if ( ((ds_p->silhouette & SIL_TOP) || maskedtexture)
-	 && !ds_p->sprtopclip)
-    {
-	memcpy (lastopening, ceilingclip+start, sizeof(*lastopening)*(rw_stopx-start));
-	ds_p->sprtopclip = lastopening - start;
-	lastopening += rw_stopx - start;
-    }
-    
-    if ( ((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
-	 && !ds_p->sprbottomclip)
-    {
-	memcpy (lastopening, floorclip+start, sizeof(*lastopening)*(rw_stopx-start));
-	ds_p->sprbottomclip = lastopening - start;
-	lastopening += rw_stopx - start;	
-    }
-
-    if (maskedtexture && !(ds_p->silhouette&SIL_TOP))
-    {
-	ds_p->silhouette |= SIL_TOP;
-	ds_p->tsilheight = INT_MIN;
-    }
-    if (maskedtexture && !(ds_p->silhouette&SIL_BOTTOM))
-    {
-	ds_p->silhouette |= SIL_BOTTOM;
-	ds_p->bsilheight = INT_MAX;
-    }
-    ds_p++;
 }
 
+/* r_store_wall_range
+ * A wall segment will be drawn between start and stop pixels (inclusive).
+ */
+
+void r_store_wall_range(int start, int stop)
+{
+  fixed_t hyp;
+  fixed_t sineval;
+  angle_t distangle, offsetangle;
+  fixed_t vtop;
+  int lightnum;
+
+  /* don't overflow and crash */
+
+  if (ds_p == &drawsegs[CONFIG_GAMES_NXDOOM_MAXDRAWSEGS]) return;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (start >= viewwidth || start > stop)
+    i_error("Bad R_RenderWallRange: %i to %i", start, stop);
+#endif
+
+  sidedef = curline->sidedef;
+  linedef = curline->linedef;
+
+  /* mark the segment as visible for auto map */
+
+  linedef->flags |= ML_MAPPED;
+
+  /* calculate rw_distance for scale calculation */
+
+  rw_normalangle = curline->angle + ANG90;
+  offsetangle = abs((int)rw_normalangle - (int)rw_angle1);
+
+  if (offsetangle > ANG90) offsetangle = ANG90;
+
+  distangle = ANG90 - offsetangle;
+  hyp = r_point_to_dist(curline->v1->x, curline->v1->y);
+  sineval = finesine[distangle >> ANGLETOFINESHIFT];
+  rw_distance = fixed_mul(hyp, sineval);
+
+  ds_p->x1 = rw_x = start;
+  ds_p->x2 = stop;
+  ds_p->curline = curline;
+  rw_stopx = stop + 1;
+
+  /* calculate scale at both ends and step */
+
+  ds_p->scale1 = rw_scale =
+      r_scale_from_global_angle(viewangle + xtoviewangle[start]);
+
+  if (stop > start)
+    {
+      ds_p->scale2 =
+          r_scale_from_global_angle(viewangle + xtoviewangle[stop]);
+      ds_p->scalestep = rw_scalestep =
+          (ds_p->scale2 - rw_scale) / (stop - start);
+    }
+  else
+    {
+#if 0 /* UNUSED: try to fix the stretched line bug */
+      if (rw_distance < FRACUNIT / 2)
+        {
+          fixed_t trx, try;
+          fixed_t gxt, gyt;
+
+          trx = curline->v1->x - viewx;
+          try = curline->v1->y - viewy;
+
+          gxt = fixed_mul(trx, viewcos);
+          gyt = -fixed_mul(try, viewsin);
+          ds_p->scale1 = fixed_div(projection, gxt - gyt) << detailshift;
+        }
+
+#endif
+      ds_p->scale2 = ds_p->scale1;
+    }
+
+  /* calculate texture boundaries and decide if floor / ceiling marks are
+   * needed
+   */
+
+  worldtop = frontsector->ceilingheight - viewz;
+  worldbottom = frontsector->floorheight - viewz;
+
+  midtexture = toptexture = bottomtexture = maskedtexture = 0;
+  ds_p->maskedtexturecol = NULL;
+
+  if (!backsector)
+    {
+      /* single sided line */
+
+      midtexture = texturetranslation[sidedef->midtexture];
+
+      /* a single sided line is terminal, so it must mark ends */
+
+      markfloor = markceiling = true;
+      if (linedef->flags & ML_DONTPEGBOTTOM)
+        {
+          vtop =
+              frontsector->floorheight + textureheight[sidedef->midtexture];
+
+          /* bottom of texture at bottom */
+
+          rw_midtexturemid = vtop - viewz;
+        }
+      else
+        {
+          /* top of texture at top */
+
+          rw_midtexturemid = worldtop;
+        }
+
+      rw_midtexturemid += sidedef->rowoffset;
+
+      ds_p->silhouette = SIL_BOTH;
+      ds_p->sprtopclip = screenheightarray;
+      ds_p->sprbottomclip = negonearray;
+      ds_p->bsilheight = INT_MAX;
+      ds_p->tsilheight = INT_MIN;
+    }
+  else
+    {
+      /* two sided line */
+
+      ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
+      ds_p->silhouette = 0;
+
+      if (frontsector->floorheight > backsector->floorheight)
+        {
+          ds_p->silhouette = SIL_BOTTOM;
+          ds_p->bsilheight = frontsector->floorheight;
+        }
+      else if (backsector->floorheight > viewz)
+        {
+          ds_p->silhouette = SIL_BOTTOM;
+          ds_p->bsilheight = INT_MAX;
+
+          /* ds_p->sprbottomclip = negonearray; */
+        }
+
+      if (frontsector->ceilingheight < backsector->ceilingheight)
+        {
+          ds_p->silhouette |= SIL_TOP;
+          ds_p->tsilheight = frontsector->ceilingheight;
+        }
+      else if (backsector->ceilingheight < viewz)
+        {
+          ds_p->silhouette |= SIL_TOP;
+          ds_p->tsilheight = INT_MIN;
+
+          /* ds_p->sprtopclip = screenheightarray; */
+        }
+
+      if (backsector->ceilingheight <= frontsector->floorheight)
+        {
+          ds_p->sprbottomclip = negonearray;
+          ds_p->bsilheight = INT_MAX;
+          ds_p->silhouette |= SIL_BOTTOM;
+        }
+
+      if (backsector->floorheight >= frontsector->ceilingheight)
+        {
+          ds_p->sprtopclip = screenheightarray;
+          ds_p->tsilheight = INT_MIN;
+          ds_p->silhouette |= SIL_TOP;
+        }
+
+      worldhigh = backsector->ceilingheight - viewz;
+      worldlow = backsector->floorheight - viewz;
+
+      /* hack to allow height changes in outdoor areas */
+
+      if (frontsector->ceilingpic == skyflatnum &&
+          backsector->ceilingpic == skyflatnum)
+        {
+          worldtop = worldhigh;
+        }
+
+      if (worldlow != worldbottom ||
+          backsector->floorpic != frontsector->floorpic ||
+          backsector->lightlevel != frontsector->lightlevel)
+        {
+          markfloor = true;
+        }
+      else
+        {
+          /* same plane on both sides */
+
+          markfloor = false;
+        }
+
+      if (worldhigh != worldtop ||
+          backsector->ceilingpic != frontsector->ceilingpic ||
+          backsector->lightlevel != frontsector->lightlevel)
+        {
+          markceiling = true;
+        }
+      else
+        {
+          /* same plane on both sides */
+
+          markceiling = false;
+        }
+
+      if (backsector->ceilingheight <= frontsector->floorheight ||
+          backsector->floorheight >= frontsector->ceilingheight)
+        {
+          /* closed door */
+
+          markceiling = markfloor = true;
+        }
+
+      if (worldhigh < worldtop)
+        {
+          /* top texture */
+
+          toptexture = texturetranslation[sidedef->toptexture];
+          if (linedef->flags & ML_DONTPEGTOP)
+            {
+              /* top of texture at top */
+
+              rw_toptexturemid = worldtop;
+            }
+          else
+            {
+              vtop = backsector->ceilingheight +
+                     textureheight[sidedef->toptexture];
+
+              /* bottom of texture */
+
+              rw_toptexturemid = vtop - viewz;
+            }
+        }
+
+      if (worldlow > worldbottom)
+        {
+          /* bottom texture */
+
+          bottomtexture = texturetranslation[sidedef->bottomtexture];
+
+          if (linedef->flags & ML_DONTPEGBOTTOM)
+            {
+              /* bottom of texture at bottom top of texture at top */
+
+              rw_bottomtexturemid = worldtop;
+            }
+          else /* top of texture at top */
+            rw_bottomtexturemid = worldlow;
+        }
+
+      rw_toptexturemid += sidedef->rowoffset;
+      rw_bottomtexturemid += sidedef->rowoffset;
+
+      /* allocate space for masked texture tables */
+
+      if (sidedef->midtexture)
+        {
+          /* masked midtexture */
+
+          maskedtexture = true;
+          ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
+          lastopening += rw_stopx - rw_x;
+        }
+    }
+
+  /* calculate rw_offset (only needed for textured lines) */
+
+  segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
+
+  if (segtextured)
+    {
+      offsetangle = rw_normalangle - rw_angle1;
+
+      if (offsetangle > ANG180) offsetangle = -offsetangle;
+
+      if (offsetangle > ANG90) offsetangle = ANG90;
+
+      sineval = finesine[offsetangle >> ANGLETOFINESHIFT];
+      rw_offset = fixed_mul(hyp, sineval);
+
+      if (rw_normalangle - rw_angle1 < ANG180) rw_offset = -rw_offset;
+
+      rw_offset += sidedef->textureoffset + curline->offset;
+      rw_centerangle = ANG90 + viewangle - rw_normalangle;
+
+      /* calculate light table use different light tables for horizontal /
+       * vertical / diagonal
+       *
+       * OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+       */
+
+      if (!fixedcolormap)
+        {
+          lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
+
+          if (curline->v1->y == curline->v2->y)
+            lightnum--;
+          else if (curline->v1->x == curline->v2->x)
+            lightnum++;
+
+          if (lightnum < 0)
+            walllights = scalelight[0];
+          else if (lightnum >= LIGHTLEVELS)
+            walllights = scalelight[LIGHTLEVELS - 1];
+          else
+            walllights = scalelight[lightnum];
+        }
+    }
+
+  /* if a floor / ceiling plane is on the wrong side of the view plane, it is
+   * definitely invisible and doesn't need to be marked.
+   */
+
+  if (frontsector->floorheight >= viewz)
+    {
+      /* above view plane */
+
+      markfloor = false;
+    }
+
+  if (frontsector->ceilingheight <= viewz &&
+      frontsector->ceilingpic != skyflatnum)
+    {
+      /* below view plane */
+
+      markceiling = false;
+    }
+
+  /* calculate incremental stepping values for texture edges */
+
+  worldtop >>= 4;
+  worldbottom >>= 4;
+
+  topstep = -fixed_mul(rw_scalestep, worldtop);
+  topfrac = (centeryfrac >> 4) - fixed_mul(worldtop, rw_scale);
+
+  bottomstep = -fixed_mul(rw_scalestep, worldbottom);
+  bottomfrac = (centeryfrac >> 4) - fixed_mul(worldbottom, rw_scale);
+
+  if (backsector)
+    {
+      worldhigh >>= 4;
+      worldlow >>= 4;
+
+      if (worldhigh < worldtop)
+        {
+          pixhigh = (centeryfrac >> 4) - fixed_mul(worldhigh, rw_scale);
+          pixhighstep = -fixed_mul(rw_scalestep, worldhigh);
+        }
+
+      if (worldlow > worldbottom)
+        {
+          pixlow = (centeryfrac >> 4) - fixed_mul(worldlow, rw_scale);
+          pixlowstep = -fixed_mul(rw_scalestep, worldlow);
+        }
+    }
+
+  /* render it */
+
+  if (markceiling)
+    {
+      ceilingplane = r_check_plane(ceilingplane, rw_x, rw_stopx - 1);
+    }
+
+  if (markfloor)
+    {
+      floorplane = r_check_plane(floorplane, rw_x, rw_stopx - 1);
+    }
+
+  r_render_seg_loop();
+
+  /* save sprite clipping info */
+
+  if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
+    {
+      memcpy(lastopening, ceilingclip + start,
+             sizeof(*lastopening) * (rw_stopx - start));
+      ds_p->sprtopclip = lastopening - start;
+      lastopening += rw_stopx - start;
+    }
+
+  if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture) &&
+      !ds_p->sprbottomclip)
+    {
+      memcpy(lastopening, floorclip + start,
+             sizeof(*lastopening) * (rw_stopx - start));
+      ds_p->sprbottomclip = lastopening - start;
+      lastopening += rw_stopx - start;
+    }
+
+  if (maskedtexture && !(ds_p->silhouette & SIL_TOP))
+    {
+      ds_p->silhouette |= SIL_TOP;
+      ds_p->tsilheight = INT_MIN;
+    }
+
+  if (maskedtexture && !(ds_p->silhouette & SIL_BOTTOM))
+    {
+      ds_p->silhouette |= SIL_BOTTOM;
+      ds_p->bsilheight = INT_MAX;
+    }
+
+  ds_p++;
+}
diff --git a/games/NXDoom/src/doom/r_segs.h b/games/NXDoom/src/doom/r_segs.h
index 8e6a768f4..8bd13275f 100644
--- a/games/NXDoom/src/doom/r_segs.h
+++ b/games/NXDoom/src/doom/r_segs.h
@@ -1,34 +1,39 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh module, drawing LineSegs from BSP.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_segs.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh module, drawing LineSegs from BSP.
+ *
+ ****************************************************************************/
 
 #ifndef __R_SEGS__
 #define __R_SEGS__
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern lighttable_t **walllights;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void
-R_RenderMaskedSegRange
-( drawseg_t*	ds,
-  int		x1,
-  int		x2 );
+void r_render_masked_seg_range(drawseg_t *ds, int x1, int x2);
 
-
-#endif
+#endif /* __R_SEGS__ */
diff --git a/games/NXDoom/src/doom/r_sky.c b/games/NXDoom/src/doom/r_sky.c
index bcd5a75bb..d84e6729b 100644
--- a/games/NXDoom/src/doom/r_sky.c
+++ b/games/NXDoom/src/doom/r_sky.c
@@ -1,52 +1,68 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Sky rendering. The DOOM sky is a texture map like any
-//  wall, wrapping around. A 1024 columns equal 360 degrees.
-//  The default sky map is 256 columns and repeats 4 times
-//  on a 320 screen?
-//  
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_sky.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Sky rendering. The DOOM sky is a texture map like any
+ *  wall, wrapping around. A 1024 columns equal 360 degrees.
+ *  The default sky map is 256 columns and repeats 4 times
+ *  on a 320 screen?
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+/* Needed for FRACUNIT. */
 
-// Needed for FRACUNIT.
 #include "m_fixed.h"
 
-// Needed for Flat retrieval.
-#include "r_data.h"
+/* Needed for Flat retrieval. */
 
+#include "r_data.h"
 
 #include "r_sky.h"
 
-//
-// sky mapping
-//
-int			skyflatnum;
-int			skytexture;
-int			skytexturemid;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+/* sky mapping */
 
+int skyflatnum;
+int skytexture;
+int skytexturemid;
 
-//
-// R_InitSkyMap
-// Called whenever the view size changes.
-//
-void R_InitSkyMap (void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: r_init_sky_map
+ *
+ * Description:
+ *  Called whenever the view size changes.
+ *
+ ****************************************************************************/
+
+void r_init_sky_map(void)
 {
-  // skyflatnum = R_FlatNumForName ( SKYFLATNAME );
-    skytexturemid = SCREENHEIGHT/2*FRACUNIT;
-}
+  /* skyflatnum = r_flat_num_for_name ( SKYFLATNAME ); */
 
+  skytexturemid = SCREENHEIGHT / 2 * FRACUNIT;
+}
diff --git a/games/NXDoom/src/doom/r_sky.h b/games/NXDoom/src/doom/r_sky.h
index 8ad6680aa..e9455b72e 100644
--- a/games/NXDoom/src/doom/r_sky.h
+++ b/games/NXDoom/src/doom/r_sky.h
@@ -1,37 +1,54 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Sky rendering.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_sky.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Sky rendering.
+ *
+ ****************************************************************************/
 
 #ifndef __R_SKY__
 #define __R_SKY__
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* SKY, store the number for name. */
 
-// SKY, store the number for name.
-#define			SKYFLATNAME  "F_SKY1"
+#define SKYFLATNAME "F_SKY1"
 
-// The sky map is 256*128*4 maps.
-#define ANGLETOSKYSHIFT		22
+/* The sky map is 256*128*4 maps. */
 
-extern  int		skytexture;
-extern int		skytexturemid;
+#define ANGLETOSKYSHIFT 22
 
-// Called whenever the view size changes.
-void R_InitSkyMap (void);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern int skytexture;
+extern int skytexturemid;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Called whenever the view size changes. */
+
+void r_init_sky_map(void);
 
 #endif
diff --git a/games/NXDoom/src/doom/r_state.h b/games/NXDoom/src/doom/r_state.h
index 2a60e2fe8..cab81830d 100644
--- a/games/NXDoom/src/doom/r_state.h
+++ b/games/NXDoom/src/doom/r_state.h
@@ -1,127 +1,130 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh/render internal state variables (global).
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_state.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh/render internal state variables (global).
+ *
+ ****************************************************************************/
 
 #ifndef __R_STATE__
 #define __R_STATE__
 
-// Need data structure definitions.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Need data structure definitions. */
+
 #include "d_player.h"
 #include "r_data.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+/* Refresh internal data structures, for rendering. */
 
+/* needed for texture pegging */
 
+extern fixed_t *textureheight;
 
+/* needed for pre rendering (fracs) */
 
-//
-// Refresh internal data structures,
-//  for rendering.
-//
+extern fixed_t *spritewidth;
 
-// needed for texture pegging
-extern fixed_t*		textureheight;
+extern fixed_t *spriteoffset;
+extern fixed_t *spritetopoffset;
 
-// needed for pre rendering (fracs)
-extern fixed_t*		spritewidth;
+extern lighttable_t *colormaps;
 
-extern fixed_t*		spriteoffset;
-extern fixed_t*		spritetopoffset;
+extern int viewwidth;
+extern int scaledviewwidth;
+extern int viewheight;
 
-extern lighttable_t*	colormaps;
+extern int firstflat;
 
-extern int		viewwidth;
-extern int		scaledviewwidth;
-extern int		viewheight;
+/* for global animation */
 
-extern int		firstflat;
+extern int *flattranslation;
+extern int *texturetranslation;
 
-// for global animation
-extern int*		flattranslation;	
-extern int*		texturetranslation;	
+/* Sprite.... */
 
+extern int firstspritelump;
+extern int lastspritelump;
+extern int numspritelumps;
 
-// Sprite....
-extern int		firstspritelump;
-extern int		lastspritelump;
-extern int		numspritelumps;
+/* Lookup tables for map data. */
 
+extern int numsprites;
+extern spritedef_t *sprites;
 
+extern int numvertices;
+extern vertex_t *vertices;
 
-//
-// Lookup tables for map data.
-//
-extern int		numsprites;
-extern spritedef_t*	sprites;
+extern int numsegs;
+extern seg_t *segs;
 
-extern int		numvertexes;
-extern vertex_t*	vertexes;
+extern int numsectors;
+extern sector_t *sectors;
 
-extern int		numsegs;
-extern seg_t*		segs;
+extern int numsubsectors;
+extern subsector_t *subsectors;
 
-extern int		numsectors;
-extern sector_t*	sectors;
+extern int numnodes;
+extern node_t *nodes;
 
-extern int		numsubsectors;
-extern subsector_t*	subsectors;
+extern int numlines;
+extern line_t *lines;
 
-extern int		numnodes;
-extern node_t*		nodes;
+extern int numsides;
+extern side_t *sides;
 
-extern int		numlines;
-extern line_t*		lines;
+/* POV data. */
 
-extern int		numsides;
-extern side_t*		sides;
+extern fixed_t viewx;
+extern fixed_t viewy;
+extern fixed_t viewz;
 
+extern angle_t viewangle;
+extern player_t *viewplayer;
 
-//
-// POV data.
-//
-extern fixed_t		viewx;
-extern fixed_t		viewy;
-extern fixed_t		viewz;
+/* ? */
 
-extern angle_t		viewangle;
-extern player_t*	viewplayer;
+extern angle_t clipangle;
 
+extern int viewangletox[FINEANGLES / 2];
+extern angle_t xtoviewangle[SCREENWIDTH + 1];
 
-// ?
-extern angle_t		clipangle;
+/* extern fixed_t finetangent[FINEANGLES/2]; */
 
-extern int		viewangletox[FINEANGLES/2];
-extern angle_t		xtoviewangle[SCREENWIDTH+1];
-//extern fixed_t		finetangent[FINEANGLES/2];
+extern fixed_t rw_distance;
+extern angle_t rw_normalangle;
 
-extern fixed_t		rw_distance;
-extern angle_t		rw_normalangle;
+/* angle to line origin */
 
+extern int rw_angle1;
 
+/* Segs count? */
 
-// angle to line origin
-extern int		rw_angle1;
+extern int sscount;
 
-// Segs count?
-extern int		sscount;
+extern visplane_t *floorplane;
+extern visplane_t *ceilingplane;
 
-extern visplane_t*	floorplane;
-extern visplane_t*	ceilingplane;
-
-
-#endif
+#endif /* __R_STATE__ */
diff --git a/games/NXDoom/src/doom/r_things.c b/games/NXDoom/src/doom/r_things.c
index 5533fd9bf..019d83a70 100644
--- a/games/NXDoom/src/doom/r_things.c
+++ b/games/NXDoom/src/doom/r_things.c
@@ -1,982 +1,974 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh of things, i.e. objects represented by sprites.
-//
-
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_things.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Refresh of things, i.e. objects represented by sprites.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 
-
 #include "deh_main.h"
 #include "doomdef.h"
 
 #include "i_swap.h"
 #include "i_system.h"
-#include "z_zone.h"
 #include "w_wad.h"
+#include "z_zone.h"
 
 #include "r_local.h"
 
 #include "doomstat.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define MINZ (FRACUNIT * 4)
+#define BASEYCENTER (SCREENHEIGHT / 2)
 
-#define MINZ				(FRACUNIT*4)
-#define BASEYCENTER			(SCREENHEIGHT/2)
-
-//void R_DrawColumn (void);
-//void R_DrawFuzzColumn (void);
-
-
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef struct
 {
-    int		x1;
-    int		x2;
-	
-    int		column;
-    int		topclip;
-    int		bottomclip;
+  int x1;
+  int x2;
 
+  int column;
+  int topclip;
+  int bottomclip;
 } maskdraw_t;
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+/* Sprite rotation 0 is facing the viewer, rotation 1 is one angle turn
+ * CLOCKWISE around the axis.
+ *
+ * This is not the same as the angle, which increases counter clockwise
+ * (protractor). There was a lot of stuff grabbed wrong, so I changed it...
+ */
 
-//
-// Sprite rotation 0 is facing the viewer,
-//  rotation 1 is one angle turn CLOCKWISE around the axis.
-// This is not the same as the angle,
-//  which increases counter clockwise (protractor).
-// There was a lot of stuff grabbed wrong, so I changed it...
-//
-fixed_t		pspritescale;
-fixed_t		pspriteiscale;
+fixed_t pspritescale;
+fixed_t pspriteiscale;
 
-lighttable_t**	spritelights;
+lighttable_t **spritelights;
 
-// constant arrays
-//  used for psprite clipping and initializing clipping
-short		negonearray[SCREENWIDTH];
-short		screenheightarray[SCREENWIDTH];
+/* constant arrays used for psprite clipping and initializing clipping */
 
+short negonearray[SCREENWIDTH];
+short screenheightarray[SCREENWIDTH];
 
-//
-// INITIALIZATION FUNCTIONS
-//
+/* INITIALIZATION FUNCTIONS */
 
-// variables used to look up
-//  and range check thing_t sprites patches
-spritedef_t*	sprites;
-int		numsprites;
+/* variables used to look up and range check thing_t sprites patches */
 
-spriteframe_t	sprtemp[29];
-int		maxframe;
-const char	*spritename;
+spritedef_t *sprites;
+int numsprites;
 
+spriteframe_t sprtemp[29];
+int maxframe;
+const char *spritename;
 
+vissprite_t vissprites[CONFIG_GAMES_NXDOOM_MAXVISSPRITES];
+vissprite_t *vissprite_p;
+int newvissprite;
 
+vissprite_t overflowsprite;
 
-//
-// R_InstallSpriteLump
-// Local function for R_InitSprites.
-//
-void
-R_InstallSpriteLump
-( int		lump,
-  unsigned	frame,
-  unsigned	rotation,
-  boolean	flipped )
+short *mfloorclip;
+short *mceilingclip;
+
+fixed_t spryscale;
+fixed_t sprtopscreen;
+
+vissprite_t vsprsortedhead;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* R_InstallSpriteLump
+ * Local function for r_init_sprites.
+ */
+
+static void r_install_sprite_lump(int lump, unsigned frame,
+        unsigned rotation, boolean flipped)
 {
-    int		r;
-	
-    if (frame >= 29 || rotation > 8)
-	I_Error("R_InstallSpriteLump: "
-		"Bad frame characters in lump %i", lump);
-	
-    if ((int)frame > maxframe)
-	maxframe = frame;
-		
-    if (rotation == 0)
+  int r;
+
+  if (frame >= 29 || rotation > 8)
+    i_error("R_InstallSpriteLump: "
+            "Bad frame characters in lump %i",
+            lump);
+
+  if ((int)frame > maxframe) maxframe = frame;
+
+  if (rotation == 0)
     {
-	// the lump should be used for all rotations
-	if (sprtemp[frame].rotate == false)
-	    I_Error ("R_InitSprites: Sprite %s frame %c has "
-		     "multip rot=0 lump", spritename, 'A'+frame);
+      /* the lump should be used for all rotations */
 
-	if (sprtemp[frame].rotate == true)
-	    I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
-		     "and a rot=0 lump", spritename, 'A'+frame);
-			
-	sprtemp[frame].rotate = false;
-	for (r=0 ; r<8 ; r++)
-	{
-	    sprtemp[frame].lump[r] = lump - firstspritelump;
-	    sprtemp[frame].flip[r] = (byte)flipped;
-	}
-	return;
-    }
-	
-    // the lump is only used for one rotation
-    if (sprtemp[frame].rotate == false)
-	I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
-		 "and a rot=0 lump", spritename, 'A'+frame);
-		
-    sprtemp[frame].rotate = true;
+      if (sprtemp[frame].rotate == false)
+        i_error("r_init_sprites: Sprite %s frame %c has "
+                "multip rot=0 lump",
+                spritename, 'A' + frame);
 
-    // make 0 based
-    rotation--;		
-    if (sprtemp[frame].lump[rotation] != -1)
-	I_Error ("R_InitSprites: Sprite %s : %c : %c "
-		 "has two lumps mapped to it",
-		 spritename, 'A'+frame, '1'+rotation);
-		
-    sprtemp[frame].lump[rotation] = lump - firstspritelump;
-    sprtemp[frame].flip[rotation] = (byte)flipped;
-}
+      if (sprtemp[frame].rotate == true)
+        i_error("r_init_sprites: Sprite %s frame %c has rotations "
+                "and a rot=0 lump",
+                spritename, 'A' + frame);
 
+      sprtemp[frame].rotate = false;
+      for (r = 0; r < 8; r++)
+        {
+          sprtemp[frame].lump[r] = lump - firstspritelump;
+          sprtemp[frame].flip[r] = (byte)flipped;
+        }
 
-
-
-//
-// R_InitSpriteDefs
-// Pass a null terminated list of sprite names
-//  (4 chars exactly) to be used.
-// Builds the sprite rotation matrixes to account
-//  for horizontally flipped sprites.
-// Will report an error if the lumps are inconsistant. 
-// Only called at startup.
-//
-// Sprite lump names are 4 characters for the actor,
-//  a letter for the frame, and a number for the rotation.
-// A sprite that is flippable will have an additional
-//  letter/number appended.
-// The rotation character can be 0 to signify no rotations.
-//
-void R_InitSpriteDefs(const char **namelist)
-{ 
-    const char **check;
-    int		i;
-    int		l;
-    int		frame;
-    int		rotation;
-    int		start;
-    int		end;
-    int		patched;
-		
-    // count the number of sprite names
-    check = namelist;
-    while (*check != NULL)
-	check++;
-
-    numsprites = check-namelist;
-	
-    if (!numsprites)
-	return;
-		
-    sprites = Z_Malloc(numsprites *sizeof(*sprites), PU_STATIC, NULL);
-	
-    start = firstspritelump-1;
-    end = lastspritelump+1;
-	
-    // scan all the lump names for each of the names,
-    //  noting the highest frame letter.
-    // Just compare 4 characters as ints
-    for (i=0 ; i<numsprites ; i++)
-    {
-	spritename = DEH_String(namelist[i]);
-	memset (sprtemp,-1, sizeof(sprtemp));
-		
-	maxframe = -1;
-	
-	// scan the lumps,
-	//  filling in the frames for whatever is found
-	for (l=start+1 ; l<end ; l++)
-	{
-	    if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
-	    {
-		frame = lumpinfo[l]->name[4] - 'A';
-		rotation = lumpinfo[l]->name[5] - '0';
-
-		if (modifiedgame)
-		    patched = W_GetNumForName (lumpinfo[l]->name);
-		else
-		    patched = l;
-
-		R_InstallSpriteLump (patched, frame, rotation, false);
-
-		if (lumpinfo[l]->name[6])
-		{
-		    frame = lumpinfo[l]->name[6] - 'A';
-		    rotation = lumpinfo[l]->name[7] - '0';
-		    R_InstallSpriteLump (l, frame, rotation, true);
-		}
-	    }
-	}
-	
-	// check the frames that were found for completeness
-	if (maxframe == -1)
-	{
-	    sprites[i].numframes = 0;
-	    continue;
-	}
-		
-	maxframe++;
-	
-	for (frame = 0 ; frame < maxframe ; frame++)
-	{
-	    switch ((int)sprtemp[frame].rotate)
-	    {
-	      case -1:
-		// no rotations were found for that frame at all
-		I_Error ("R_InitSprites: No patches found "
-			 "for %s frame %c", spritename, frame+'A');
-		break;
-		
-	      case 0:
-		// only the first rotation is needed
-		break;
-			
-	      case 1:
-		// must have all 8 frames
-		for (rotation=0 ; rotation<8 ; rotation++)
-		    if (sprtemp[frame].lump[rotation] == -1)
-			I_Error ("R_InitSprites: Sprite %s frame %c "
-				 "is missing rotations",
-				 spritename, frame+'A');
-		break;
-	    }
-	}
-	
-	// allocate space for the frames present and copy sprtemp to it
-	sprites[i].numframes = maxframe;
-	sprites[i].spriteframes = 
-	    Z_Malloc (maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
-	memcpy (sprites[i].spriteframes, sprtemp, maxframe*sizeof(spriteframe_t));
+      return;
     }
 
+  /* the lump is only used for one rotation */
+
+  if (sprtemp[frame].rotate == false)
+    i_error("r_init_sprites: Sprite %s frame %c has rotations "
+            "and a rot=0 lump",
+            spritename, 'A' + frame);
+
+  sprtemp[frame].rotate = true;
+
+  /* make 0 based */
+
+  rotation--;
+  if (sprtemp[frame].lump[rotation] != -1)
+    i_error("r_init_sprites: Sprite %s : %c : %c "
+            "has two lumps mapped to it",
+            spritename, 'A' + frame, '1' + rotation);
+
+  sprtemp[frame].lump[rotation] = lump - firstspritelump;
+  sprtemp[frame].flip[rotation] = (byte)flipped;
 }
 
+/* r_init_sprite_defs
+ *
+ * Pass a null terminated list of sprite names (4 chars exactly) to be used.
+ *
+ * Builds the sprite rotation matrixes to account for horizontally flipped
+ * sprites.
+ *
+ * Will report an error if the lumps are inconsistent. Only called at
+ * startup.
+ *
+ * Sprite lump names are 4 characters for the actor, a letter for the frame,
+ * and a number for the rotation.
+ *
+ * A sprite that is flippable will have an additional letter/number appended.
+ *
+ * The rotation character can be 0 to signify no rotations.
+ */
 
-
-
-//
-// GAME FUNCTIONS
-//
-vissprite_t	vissprites[MAXVISSPRITES];
-vissprite_t*	vissprite_p;
-int		newvissprite;
-
-
-
-//
-// R_InitSprites
-// Called at program start.
-//
-void R_InitSprites(const char **namelist)
+static void r_init_sprite_defs(const char **namelist)
 {
-    int		i;
-	
-    for (i=0 ; i<SCREENWIDTH ; i++)
+  const char **check;
+  int i;
+  int l;
+  int frame;
+  int rotation;
+  int start;
+  int end;
+  int patched;
+
+  /* count the number of sprite names */
+
+  check = namelist;
+  while (*check != NULL)
+    check++;
+
+  numsprites = check - namelist;
+
+  if (!numsprites) return;
+
+  sprites = z_malloc(numsprites * sizeof(*sprites), PU_STATIC, NULL);
+
+  start = firstspritelump - 1;
+  end = lastspritelump + 1;
+
+  /* scan all the lump names for each of the names, noting the highest frame
+   * letter. Just compare 4 characters as ints
+   */
+
+  for (i = 0; i < numsprites; i++)
     {
-	negonearray[i] = -1;
+      spritename = (namelist[i]);
+      memset(sprtemp, -1, sizeof(sprtemp));
+
+      maxframe = -1;
+
+      /* scan the lumps, filling in the frames for whatever is found
+       */
+
+      for (l = start + 1; l < end; l++)
+        {
+          if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
+            {
+              frame = lumpinfo[l]->name[4] - 'A';
+              rotation = lumpinfo[l]->name[5] - '0';
+
+              if (modifiedgame)
+                patched = w_get_num_for_name(lumpinfo[l]->name);
+              else
+                patched = l;
+
+              r_install_sprite_lump(patched, frame, rotation, false);
+
+              if (lumpinfo[l]->name[6])
+                {
+                  frame = lumpinfo[l]->name[6] - 'A';
+                  rotation = lumpinfo[l]->name[7] - '0';
+                  r_install_sprite_lump(l, frame, rotation, true);
+                }
+            }
+        }
+
+      /* check the frames that were found for completeness */
+
+      if (maxframe == -1)
+        {
+          sprites[i].numframes = 0;
+          continue;
+        }
+
+      maxframe++;
+
+      for (frame = 0; frame < maxframe; frame++)
+        {
+          switch ((int)sprtemp[frame].rotate)
+            {
+            case -1:
+
+              /* no rotations were found for that frame at all */
+
+              i_error("r_init_sprites: No patches found "
+                      "for %s frame %c",
+                      spritename, frame + 'A');
+              break;
+
+            case 0:
+              break; /* only the first rotation is needed */
+
+            case 1:
+
+              /* must have all 8 frames */
+
+              for (rotation = 0; rotation < 8; rotation++)
+                if (sprtemp[frame].lump[rotation] == -1)
+                  i_error("r_init_sprites: Sprite %s frame %c "
+                          "is missing rotations",
+                          spritename, frame + 'A');
+              break;
+            }
+        }
+
+      /* allocate space for the frames present and copy sprtemp to it */
+
+      sprites[i].numframes = maxframe;
+      sprites[i].spriteframes =
+          z_malloc(maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
+      memcpy(sprites[i].spriteframes, sprtemp,
+             maxframe * sizeof(spriteframe_t));
     }
-	
-    R_InitSpriteDefs (namelist);
 }
 
-
-
-//
-// R_ClearSprites
-// Called at frame start.
-//
-void R_ClearSprites (void)
+static vissprite_t *r_new_vis_sprite(void)
 {
-    vissprite_p = vissprites;
-}
-
-
-//
-// R_NewVisSprite
-//
-vissprite_t	overflowsprite;
-
-vissprite_t* R_NewVisSprite (void)
-{
-    if (vissprite_p == &vissprites[MAXVISSPRITES])
-	return &overflowsprite;
-    
-    vissprite_p++;
-    return vissprite_p-1;
-}
-
-
-
-//
-// R_DrawMaskedColumn
-// Used for sprites and masked mid textures.
-// Masked means: partly transparent, i.e. stored
-//  in posts/runs of opaque pixels.
-//
-short*		mfloorclip;
-short*		mceilingclip;
-
-fixed_t		spryscale;
-fixed_t		sprtopscreen;
-
-void R_DrawMaskedColumn (column_t* column)
-{
-    int		topscreen;
-    int 	bottomscreen;
-    fixed_t	basetexturemid;
-	
-    basetexturemid = dc_texturemid;
-	
-    for ( ; column->topdelta != 0xff ; ) 
+  if (vissprite_p == &vissprites[CONFIG_GAMES_NXDOOM_MAXVISSPRITES])
     {
-	// calculate unclipped screen coordinates
-	//  for post
-	topscreen = sprtopscreen + spryscale*column->topdelta;
-	bottomscreen = topscreen + spryscale*column->length;
-
-	dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
-	dc_yh = (bottomscreen-1)>>FRACBITS;
-		
-	if (dc_yh >= mfloorclip[dc_x])
-	    dc_yh = mfloorclip[dc_x]-1;
-	if (dc_yl <= mceilingclip[dc_x])
-	    dc_yl = mceilingclip[dc_x]+1;
-
-	if (dc_yl <= dc_yh)
-	{
-	    dc_source = (byte *)column + 3;
-	    dc_texturemid = basetexturemid - (column->topdelta<<FRACBITS);
-	    // dc_source = (byte *)column + 3 - column->topdelta;
-
-	    // Drawn by either R_DrawColumn
-	    //  or (SHADOW) R_DrawFuzzColumn.
-	    colfunc ();	
-	}
-	column = (column_t *)(  (byte *)column + column->length + 4);
+      return &overflowsprite;
     }
-	
-    dc_texturemid = basetexturemid;
+
+  vissprite_p++;
+  return vissprite_p - 1;
 }
 
+/* R_DrawVisSprite
+ *  mfloorclip and mceilingclip should also be set.
+ */
 
-
-//
-// R_DrawVisSprite
-//  mfloorclip and mceilingclip should also be set.
-//
-void
-R_DrawVisSprite
-( vissprite_t*		vis,
-  int			x1,
-  int			x2 )
+static void r_draw_vis_sprite(vissprite_t *vis, int x1, int x2)
 {
-    column_t*		column;
-    int			texturecolumn;
-    fixed_t		frac;
-    patch_t*		patch;
-	
-	
-    patch = W_CacheLumpNum (vis->patch+firstspritelump, PU_CACHE);
+  column_t *column;
+  int texturecolumn;
+  fixed_t frac;
+  patch_t *patch;
 
-    dc_colormap = vis->colormap;
-    
-    if (!dc_colormap)
+  patch = w_cache_lump_num(vis->patch + firstspritelump, PU_CACHE);
+
+  dc_colormap = vis->colormap;
+
+  if (!dc_colormap)
     {
-	// NULL colormap = shadow draw
-	colfunc = fuzzcolfunc;
+      /* NULL colormap = shadow draw */
+
+      colfunc = fuzzcolfunc;
     }
-    else if (vis->mobjflags & MF_TRANSLATION)
+  else if (vis->mobjflags & MF_TRANSLATION)
     {
-	colfunc = transcolfunc;
-	dc_translation = translationtables - 256 +
-	    ( (vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT-8) );
+      colfunc = transcolfunc;
+      dc_translation =
+          translationtables - 256 +
+          ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
     }
-	
-    dc_iscale = abs(vis->xiscale)>>detailshift;
-    dc_texturemid = vis->texturemid;
-    frac = vis->startfrac;
-    spryscale = vis->scale;
-    sprtopscreen = centeryfrac - FixedMul(dc_texturemid,spryscale);
-	
-    for (dc_x=vis->x1 ; dc_x<=vis->x2 ; dc_x++, frac += vis->xiscale)
+
+  dc_iscale = abs(vis->xiscale) >> detailshift;
+  dc_texturemid = vis->texturemid;
+  frac = vis->startfrac;
+  spryscale = vis->scale;
+  sprtopscreen = centeryfrac - fixed_mul(dc_texturemid, spryscale);
+
+  for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
     {
-	texturecolumn = frac>>FRACBITS;
-#ifdef RANGECHECK
-	if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
-	    I_Error ("R_DrawSpriteRange: bad texturecolumn");
+      texturecolumn = frac >> FRACBITS;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+      if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
+        {
+          i_error("R_DrawSpriteRange: bad texturecolumn");
+        }
+
 #endif
-	column = (column_t *) ((byte *)patch +
-			       LONG(patch->columnofs[texturecolumn]));
-	R_DrawMaskedColumn (column);
+
+      column = (column_t *)((byte *)patch +
+               LONG(patch->columnofs[texturecolumn]));
+      r_draw_masked_column(column);
     }
 
-    colfunc = basecolfunc;
+  colfunc = basecolfunc;
 }
 
+/* R_ProjectSprite
+ * Generates a vissprite for a thing if it might be visible.
+ */
 
-
-//
-// R_ProjectSprite
-// Generates a vissprite for a thing
-//  if it might be visible.
-//
-void R_ProjectSprite (mobj_t* thing)
+static void r_project_sprite(mobj_t *thing)
 {
-    fixed_t		tr_x;
-    fixed_t		tr_y;
-    
-    fixed_t		gxt;
-    fixed_t		gyt;
-    
-    fixed_t		tx;
-    fixed_t		tz;
+  fixed_t tr_x;
+  fixed_t tr_y;
 
-    fixed_t		xscale;
-    
-    int			x1;
-    int			x2;
+  fixed_t gxt;
+  fixed_t gyt;
 
-    spritedef_t*	sprdef;
-    spriteframe_t*	sprframe;
-    int			lump;
-    
-    unsigned		rot;
-    boolean		flip;
-    
-    int			index;
+  fixed_t tx;
+  fixed_t tz;
 
-    vissprite_t*	vis;
-    
-    angle_t		ang;
-    fixed_t		iscale;
-    
-    // transform the origin point
-    tr_x = thing->x - viewx;
-    tr_y = thing->y - viewy;
-	
-    gxt = FixedMul(tr_x,viewcos); 
-    gyt = -FixedMul(tr_y,viewsin);
-    
-    tz = gxt-gyt; 
+  fixed_t xscale;
 
-    // thing is behind view plane?
-    if (tz < MINZ)
-	return;
-    
-    xscale = FixedDiv(projection, tz);
-	
-    gxt = -FixedMul(tr_x,viewsin); 
-    gyt = FixedMul(tr_y,viewcos); 
-    tx = -(gyt+gxt); 
+  int x1;
+  int x2;
 
-    // too far off the side?
-    if (abs(tx)>(tz<<2))
-	return;
-    
-    // decide which patch to use for sprite relative to player
-#ifdef RANGECHECK
-    if ((unsigned int) thing->sprite >= (unsigned int) numsprites)
-	I_Error ("R_ProjectSprite: invalid sprite number %i ",
-		 thing->sprite);
+  spritedef_t *sprdef;
+  spriteframe_t *sprframe;
+  int lump;
+
+  unsigned rot;
+  boolean flip;
+
+  int index;
+
+  vissprite_t *vis;
+
+  angle_t ang;
+  fixed_t iscale;
+
+  /* transform the origin point */
+
+  tr_x = thing->x - viewx;
+  tr_y = thing->y - viewy;
+
+  gxt = fixed_mul(tr_x, viewcos);
+  gyt = -fixed_mul(tr_y, viewsin);
+
+  tz = gxt - gyt;
+
+  /* thing is behind view plane? */
+
+  if (tz < MINZ) return;
+
+  xscale = fixed_div(projection, tz);
+
+  gxt = -fixed_mul(tr_x, viewsin);
+  gyt = fixed_mul(tr_y, viewcos);
+  tx = -(gyt + gxt);
+
+  /* too far off the side? */
+
+  if (abs(tx) > (tz << 2)) return;
+
+  /* decide which patch to use for sprite relative to player */
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned int)thing->sprite >= (unsigned int)numsprites)
+    i_error("R_ProjectSprite: invalid sprite number %i ", thing->sprite);
 #endif
-    sprdef = &sprites[thing->sprite];
-#ifdef RANGECHECK
-    if ( (thing->frame&FF_FRAMEMASK) >= sprdef->numframes )
-	I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
-		 thing->sprite, thing->frame);
+  sprdef = &sprites[thing->sprite];
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((thing->frame & FF_FRAMEMASK) >= sprdef->numframes)
+    i_error("R_ProjectSprite: invalid sprite frame %i : %i ", thing->sprite,
+            thing->frame);
 #endif
-    sprframe = &sprdef->spriteframes[ thing->frame & FF_FRAMEMASK];
+  sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
 
-    if (sprframe->rotate)
+  if (sprframe->rotate)
     {
-	// choose a different rotation based on player view
-	ang = R_PointToAngle (thing->x, thing->y);
-	rot = (ang-thing->angle+(unsigned)(ANG45/2)*9)>>29;
-	lump = sprframe->lump[rot];
-	flip = (boolean)sprframe->flip[rot];
+      /* choose a different rotation based on player view */
+
+      ang = r_point_to_angle(thing->x, thing->y);
+      rot = (ang - thing->angle + (unsigned)(ANG45 / 2) * 9) >> 29;
+      lump = sprframe->lump[rot];
+      flip = (boolean)sprframe->flip[rot];
     }
-    else
+  else
     {
-	// use single rotation for all views
-	lump = sprframe->lump[0];
-	flip = (boolean)sprframe->flip[0];
-    }
-    
-    // calculate edges of the shape
-    tx -= spriteoffset[lump];	
-    x1 = (centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS;
+      /* use single rotation for all views */
 
-    // off the right side?
-    if (x1 > viewwidth)
-	return;
-    
-    tx +=  spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS) - 1;
-
-    // off the left side
-    if (x2 < 0)
-	return;
-    
-    // store information in a vissprite
-    vis = R_NewVisSprite ();
-    vis->mobjflags = thing->flags;
-    vis->scale = xscale<<detailshift;
-    vis->gx = thing->x;
-    vis->gy = thing->y;
-    vis->gz = thing->z;
-    vis->gzt = thing->z + spritetopoffset[lump];
-    vis->texturemid = vis->gzt - viewz;
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
-    iscale = FixedDiv (FRACUNIT, xscale);
-
-    if (flip)
-    {
-	vis->startfrac = spritewidth[lump]-1;
-	vis->xiscale = -iscale;
-    }
-    else
-    {
-	vis->startfrac = 0;
-	vis->xiscale = iscale;
+      lump = sprframe->lump[0];
+      flip = (boolean)sprframe->flip[0];
     }
 
-    if (vis->x1 > x1)
-	vis->startfrac += vis->xiscale*(vis->x1-x1);
-    vis->patch = lump;
-    
-    // get light level
-    if (thing->flags & MF_SHADOW)
-    {
-	// shadow draw
-	vis->colormap = NULL;
-    }
-    else if (fixedcolormap)
-    {
-	// fixed map
-	vis->colormap = fixedcolormap;
-    }
-    else if (thing->frame & FF_FULLBRIGHT)
-    {
-	// full bright
-	vis->colormap = colormaps;
-    }
-    
-    else
-    {
-	// diminished light
-	index = xscale>>(LIGHTSCALESHIFT-detailshift);
+  /* calculate edges of the shape */
 
-	if (index >= MAXLIGHTSCALE) 
-	    index = MAXLIGHTSCALE-1;
+  tx -= spriteoffset[lump];
+  x1 = (centerxfrac + fixed_mul(tx, xscale)) >> FRACBITS;
 
-	vis->colormap = spritelights[index];
-    }	
+  /* off the right side? */
+
+  if (x1 > viewwidth) return;
+
+  tx += spritewidth[lump];
+  x2 = ((centerxfrac + fixed_mul(tx, xscale)) >> FRACBITS) - 1;
+
+  /* off the left side */
+
+  if (x2 < 0) return;
+
+  /* store information in a vissprite */
+
+  vis = r_new_vis_sprite();
+  vis->mobjflags = thing->flags;
+  vis->scale = xscale << detailshift;
+  vis->gx = thing->x;
+  vis->gy = thing->y;
+  vis->gz = thing->z;
+  vis->gzt = thing->z + spritetopoffset[lump];
+  vis->texturemid = vis->gzt - viewz;
+  vis->x1 = x1 < 0 ? 0 : x1;
+  vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
+  iscale = fixed_div(FRACUNIT, xscale);
+
+  if (flip)
+    {
+      vis->startfrac = spritewidth[lump] - 1;
+      vis->xiscale = -iscale;
+    }
+  else
+    {
+      vis->startfrac = 0;
+      vis->xiscale = iscale;
+    }
+
+  if (vis->x1 > x1) vis->startfrac += vis->xiscale * (vis->x1 - x1);
+  vis->patch = lump;
+
+  /* get light level */
+
+  if (thing->flags & MF_SHADOW)
+    {
+      /* shadow draw */
+
+      vis->colormap = NULL;
+    }
+  else if (fixedcolormap)
+    {
+      /* fixed map */
+
+      vis->colormap = fixedcolormap;
+    }
+  else if (thing->frame & FF_FULLBRIGHT)
+    {
+      /* full bright */
+
+      vis->colormap = colormaps;
+    }
+
+  else
+    {
+      /* diminished light */
+
+      index = xscale >> (LIGHTSCALESHIFT - detailshift);
+
+      if (index >= MAXLIGHTSCALE) index = MAXLIGHTSCALE - 1;
+
+      vis->colormap = spritelights[index];
+    }
 }
 
+/* R_DrawPSprite */
 
-
-
-//
-// R_AddSprites
-// During BSP traversal, this adds sprites by sector.
-//
-void R_AddSprites (sector_t* sec)
+static void r_draw_psprite(pspdef_t *psp)
 {
-    mobj_t*		thing;
-    int			lightnum;
+  fixed_t tx;
+  int x1;
+  int x2;
+  spritedef_t *sprdef;
+  spriteframe_t *sprframe;
+  int lump;
+  boolean flip;
+  vissprite_t *vis;
+  vissprite_t avis;
 
-    // BSP is traversed by subsector.
-    // A sector might have been split into several
-    //  subsectors during BSP building.
-    // Thus we check whether its already added.
-    if (sec->validcount == validcount)
-	return;		
+  /* decide which patch to use */
 
-    // Well, now it will be done.
-    sec->validcount = validcount;
-	
-    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT)+extralight;
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((unsigned)psp->state->sprite >= (unsigned int)numsprites)
+    {
+      i_error("R_ProjectSprite: invalid sprite number %i ",
+              psp->state->sprite);
+    }
 
-    if (lightnum < 0)		
-	spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-	spritelights = scalelight[LIGHTLEVELS-1];
-    else
-	spritelights = scalelight[lightnum];
-
-    // Handle all things in sector.
-    for (thing = sec->thinglist ; thing ; thing = thing->snext)
-	R_ProjectSprite (thing);
-}
-
-
-//
-// R_DrawPSprite
-//
-void R_DrawPSprite (pspdef_t* psp)
-{
-    fixed_t		tx;
-    int			x1;
-    int			x2;
-    spritedef_t*	sprdef;
-    spriteframe_t*	sprframe;
-    int			lump;
-    boolean		flip;
-    vissprite_t*	vis;
-    vissprite_t		avis;
-    
-    // decide which patch to use
-#ifdef RANGECHECK
-    if ( (unsigned)psp->state->sprite >= (unsigned int) numsprites)
-	I_Error ("R_ProjectSprite: invalid sprite number %i ",
-		 psp->state->sprite);
 #endif
-    sprdef = &sprites[psp->state->sprite];
-#ifdef RANGECHECK
-    if ( (psp->state->frame & FF_FRAMEMASK)  >= sprdef->numframes)
-	I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
-		 psp->state->sprite, psp->state->frame);
+
+  sprdef = &sprites[psp->state->sprite];
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if ((psp->state->frame & FF_FRAMEMASK) >= sprdef->numframes)
+    {
+      i_error("R_ProjectSprite: invalid sprite frame %i : %i ",
+              psp->state->sprite, psp->state->frame);
+    }
+
 #endif
-    sprframe = &sprdef->spriteframes[ psp->state->frame & FF_FRAMEMASK ];
+  sprframe = &sprdef->spriteframes[psp->state->frame & FF_FRAMEMASK];
 
-    lump = sprframe->lump[0];
-    flip = (boolean)sprframe->flip[0];
-    
-    // calculate edges of the shape
-    tx = psp->sx-(SCREENWIDTH/2)*FRACUNIT;
-	
-    tx -= spriteoffset[lump];	
-    x1 = (centerxfrac + FixedMul (tx,pspritescale) ) >>FRACBITS;
+  lump = sprframe->lump[0];
+  flip = (boolean)sprframe->flip[0];
 
-    // off the right side
-    if (x1 > viewwidth)
-	return;		
+  /* calculate edges of the shape */
 
-    tx +=  spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul (tx, pspritescale) ) >>FRACBITS) - 1;
+  tx = psp->sx - (SCREENWIDTH / 2) * FRACUNIT;
 
-    // off the left side
-    if (x2 < 0)
-	return;
-    
-    // store information in a vissprite
-    vis = &avis;
-    vis->mobjflags = 0;
-    vis->texturemid = (BASEYCENTER<<FRACBITS)+FRACUNIT/2-(psp->sy-spritetopoffset[lump]);
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
-    vis->scale = pspritescale<<detailshift;
-    
-    if (flip)
-    {
-	vis->xiscale = -pspriteiscale;
-	vis->startfrac = spritewidth[lump]-1;
-    }
-    else
-    {
-	vis->xiscale = pspriteiscale;
-	vis->startfrac = 0;
-    }
-    
-    if (vis->x1 > x1)
-	vis->startfrac += vis->xiscale*(vis->x1-x1);
+  tx -= spriteoffset[lump];
+  x1 = (centerxfrac + fixed_mul(tx, pspritescale)) >> FRACBITS;
 
-    vis->patch = lump;
+  /* off the right side */
 
-    if (viewplayer->powers[pw_invisibility] > 4*32
-	|| viewplayer->powers[pw_invisibility] & 8)
+  if (x1 > viewwidth) return;
+
+  tx += spritewidth[lump];
+  x2 = ((centerxfrac + fixed_mul(tx, pspritescale)) >> FRACBITS) - 1;
+
+  /* off the left side */
+
+  if (x2 < 0) return;
+
+  /* store information in a vissprite */
+
+  vis = &avis;
+  vis->mobjflags = 0;
+  vis->texturemid = (BASEYCENTER << FRACBITS) + FRACUNIT / 2 -
+                    (psp->sy - spritetopoffset[lump]);
+  vis->x1 = x1 < 0 ? 0 : x1;
+  vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
+  vis->scale = pspritescale << detailshift;
+
+  if (flip)
     {
-	// shadow draw
-	vis->colormap = NULL;
+      vis->xiscale = -pspriteiscale;
+      vis->startfrac = spritewidth[lump] - 1;
     }
-    else if (fixedcolormap)
+  else
     {
-	// fixed color
-	vis->colormap = fixedcolormap;
+      vis->xiscale = pspriteiscale;
+      vis->startfrac = 0;
     }
-    else if (psp->state->frame & FF_FULLBRIGHT)
+
+  if (vis->x1 > x1) vis->startfrac += vis->xiscale * (vis->x1 - x1);
+
+  vis->patch = lump;
+
+  if (viewplayer->powers[pw_invisibility] > 4 * 32 ||
+      viewplayer->powers[pw_invisibility] & 8)
     {
-	// full bright
-	vis->colormap = colormaps;
+      vis->colormap = NULL; /* shadow draw */
     }
-    else
+  else if (fixedcolormap)
     {
-	// local light
-	vis->colormap = spritelights[MAXLIGHTSCALE-1];
+      vis->colormap = fixedcolormap; /* fixed color */
     }
-	
-    R_DrawVisSprite (vis, vis->x1, vis->x2);
+  else if (psp->state->frame & FF_FULLBRIGHT)
+    {
+      vis->colormap = colormaps; /* full bright */
+    }
+  else
+    {
+      vis->colormap = spritelights[MAXLIGHTSCALE - 1]; /* local light */
+    }
+
+  r_draw_vis_sprite(vis, vis->x1, vis->x2);
 }
 
-
-
-//
-// R_DrawPlayerSprites
-//
-void R_DrawPlayerSprites (void)
+static void r_draw_player_sprites(void)
 {
-    int		i;
-    int		lightnum;
-    pspdef_t*	psp;
-    
-    // get light level
-    lightnum =
-	(viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) 
-	+extralight;
+  int i;
+  int lightnum;
+  pspdef_t *psp;
 
-    if (lightnum < 0)		
-	spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-	spritelights = scalelight[LIGHTLEVELS-1];
-    else
-	spritelights = scalelight[lightnum];
-    
-    // clip to screen bounds
-    mfloorclip = screenheightarray;
-    mceilingclip = negonearray;
-    
-    // add all active psprites
-    for (i=0, psp=viewplayer->psprites;
-	 i<NUMPSPRITES;
-	 i++,psp++)
+  /* get light level */
+
+  lightnum =
+      (viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) +
+      extralight;
+
+  if (lightnum < 0)
+    spritelights = scalelight[0];
+  else if (lightnum >= LIGHTLEVELS)
+    spritelights = scalelight[LIGHTLEVELS - 1];
+  else
+    spritelights = scalelight[lightnum];
+
+  /* clip to screen bounds */
+
+  mfloorclip = screenheightarray;
+  mceilingclip = negonearray;
+
+  /* add all active psprites */
+
+  for (i = 0, psp = viewplayer->psprites; i < NUMPSPRITES; i++, psp++)
     {
-	if (psp->state)
-	    R_DrawPSprite (psp);
+      if (psp->state) r_draw_psprite(psp);
     }
 }
 
-
-
-
-//
-// R_SortVisSprites
-//
-vissprite_t	vsprsortedhead;
-
-
-void R_SortVisSprites (void)
+static void r_sort_vis_sprites(void)
 {
-    int			i;
-    int			count;
-    vissprite_t*	ds;
-    vissprite_t*	best;
-    static vissprite_t	unsorted;
-    fixed_t		bestscale;
+  int i;
+  int count;
+  vissprite_t *ds;
+  vissprite_t *best;
+  static vissprite_t unsorted;
+  fixed_t bestscale;
 
-    count = vissprite_p - vissprites;
-	
-    unsorted.next = unsorted.prev = &unsorted;
+  count = vissprite_p - vissprites;
 
-    if (!count)
-	return;
-		
-    for (ds=vissprites ; ds<vissprite_p ; ds++)
+  unsorted.next = unsorted.prev = &unsorted;
+
+  if (!count) return;
+
+  for (ds = vissprites; ds < vissprite_p; ds++)
     {
-	ds->next = ds+1;
-	ds->prev = ds-1;
+      ds->next = ds + 1;
+      ds->prev = ds - 1;
     }
-    
-    vissprites[0].prev = &unsorted;
-    unsorted.next = &vissprites[0];
-    (vissprite_p-1)->next = &unsorted;
-    unsorted.prev = vissprite_p-1;
-    
-    // pull the vissprites out by scale
 
-    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
-    for (i=0 ; i<count ; i++)
+  vissprites[0].prev = &unsorted;
+  unsorted.next = &vissprites[0];
+  (vissprite_p - 1)->next = &unsorted;
+  unsorted.prev = vissprite_p - 1;
+
+  /* pull the vissprites out by scale */
+
+  vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
+  for (i = 0; i < count; i++)
     {
-	bestscale = INT_MAX;
-        best = unsorted.next;
-	for (ds=unsorted.next ; ds!= &unsorted ; ds=ds->next)
-	{
-	    if (ds->scale < bestscale)
-	    {
-		bestscale = ds->scale;
-		best = ds;
-	    }
-	}
-	best->next->prev = best->prev;
-	best->prev->next = best->next;
-	best->next = &vsprsortedhead;
-	best->prev = vsprsortedhead.prev;
-	vsprsortedhead.prev->next = best;
-	vsprsortedhead.prev = best;
+      bestscale = INT_MAX;
+      best = unsorted.next;
+
+      for (ds = unsorted.next; ds != &unsorted; ds = ds->next)
+        {
+          if (ds->scale < bestscale)
+            {
+              bestscale = ds->scale;
+              best = ds;
+            }
+        }
+
+      best->next->prev = best->prev;
+      best->prev->next = best->next;
+      best->next = &vsprsortedhead;
+      best->prev = vsprsortedhead.prev;
+      vsprsortedhead.prev->next = best;
+      vsprsortedhead.prev = best;
     }
 }
 
-
-
-//
-// R_DrawSprite
-//
-void R_DrawSprite (vissprite_t* spr)
+static void r_draw_sprite(vissprite_t *spr)
 {
-    drawseg_t*		ds;
-    short		clipbot[SCREENWIDTH];
-    short		cliptop[SCREENWIDTH];
-    int			x;
-    int			r1;
-    int			r2;
-    fixed_t		scale;
-    fixed_t		lowscale;
-    int			silhouette;
-		
-    for (x = spr->x1 ; x<=spr->x2 ; x++)
-	clipbot[x] = cliptop[x] = -2;
-    
-    // Scan drawsegs from end to start for obscuring segs.
-    // The first drawseg that has a greater scale
-    //  is the clip seg.
-    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
+  drawseg_t *ds;
+  short clipbot[SCREENWIDTH];
+  short cliptop[SCREENWIDTH];
+  int x;
+  int r1;
+  int r2;
+  fixed_t scale;
+  fixed_t lowscale;
+  int silhouette;
+
+  for (x = spr->x1; x <= spr->x2; x++)
+    clipbot[x] = cliptop[x] = -2;
+
+  /* Scan drawsegs from end to start for obscuring segs.
+   * The first drawseg that has a greater scale is the clip seg.
+   */
+
+  for (ds = ds_p - 1; ds >= drawsegs; ds--)
     {
-	// determine if the drawseg obscures the sprite
-	if (ds->x1 > spr->x2
-	    || ds->x2 < spr->x1
-	    || (!ds->silhouette
-		&& !ds->maskedtexturecol) )
-	{
-	    // does not cover sprite
-	    continue;
-	}
-			
-	r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
-	r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
+      /* determine if the drawseg obscures the sprite */
 
-	if (ds->scale1 > ds->scale2)
-	{
-	    lowscale = ds->scale2;
-	    scale = ds->scale1;
-	}
-	else
-	{
-	    lowscale = ds->scale1;
-	    scale = ds->scale2;
-	}
-		
-	if (scale < spr->scale
-	    || ( lowscale < spr->scale
-		 && !R_PointOnSegSide (spr->gx, spr->gy, ds->curline) ) )
-	{
-	    // masked mid texture?
-	    if (ds->maskedtexturecol)	
-		R_RenderMaskedSegRange (ds, r1, r2);
-	    // seg is behind sprite
-	    continue;			
-	}
+      if (ds->x1 > spr->x2 || ds->x2 < spr->x1 ||
+          (!ds->silhouette && !ds->maskedtexturecol))
+        {
+          continue; /* does not cover sprite */
+        }
 
-	
-	// clip this piece of the sprite
-	silhouette = ds->silhouette;
-	
-	if (spr->gz >= ds->bsilheight)
-	    silhouette &= ~SIL_BOTTOM;
+      r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
+      r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
 
-	if (spr->gzt <= ds->tsilheight)
-	    silhouette &= ~SIL_TOP;
-			
-	if (silhouette == 1)
-	{
-	    // bottom sil
-	    for (x=r1 ; x<=r2 ; x++)
-		if (clipbot[x] == -2)
-		    clipbot[x] = ds->sprbottomclip[x];
-	}
-	else if (silhouette == 2)
-	{
-	    // top sil
-	    for (x=r1 ; x<=r2 ; x++)
-		if (cliptop[x] == -2)
-		    cliptop[x] = ds->sprtopclip[x];
-	}
-	else if (silhouette == 3)
-	{
-	    // both
-	    for (x=r1 ; x<=r2 ; x++)
-	    {
-		if (clipbot[x] == -2)
-		    clipbot[x] = ds->sprbottomclip[x];
-		if (cliptop[x] == -2)
-		    cliptop[x] = ds->sprtopclip[x];
-	    }
-	}
-		
+      if (ds->scale1 > ds->scale2)
+        {
+          lowscale = ds->scale2;
+          scale = ds->scale1;
+        }
+      else
+        {
+          lowscale = ds->scale1;
+          scale = ds->scale2;
+        }
+
+      if (scale < spr->scale ||
+          (lowscale < spr->scale &&
+           !r_point_on_seg_side(spr->gx, spr->gy, ds->curline)))
+        {
+          /* masked mid texture? */
+
+          if (ds->maskedtexturecol) r_render_masked_seg_range(ds, r1, r2);
+          continue; /* seg is behind sprite */
+        }
+
+      /* clip this piece of the sprite */
+
+      silhouette = ds->silhouette;
+
+      if (spr->gz >= ds->bsilheight) silhouette &= ~SIL_BOTTOM;
+
+      if (spr->gzt <= ds->tsilheight) silhouette &= ~SIL_TOP;
+
+      if (silhouette == 1)
+        {
+          /* bottom sil */
+
+          for (x = r1; x <= r2; x++)
+            {
+              if (clipbot[x] == -2) clipbot[x] = ds->sprbottomclip[x];
+            }
+        }
+      else if (silhouette == 2)
+        {
+          /* top sil */
+
+          for (x = r1; x <= r2; x++)
+            {
+              if (cliptop[x] == -2) cliptop[x] = ds->sprtopclip[x];
+            }
+        }
+      else if (silhouette == 3)
+        {
+          /* both */
+
+          for (x = r1; x <= r2; x++)
+            {
+              if (clipbot[x] == -2) clipbot[x] = ds->sprbottomclip[x];
+              if (cliptop[x] == -2) cliptop[x] = ds->sprtopclip[x];
+            }
+        }
     }
-    
-    // all clipping has been performed, so draw the sprite
 
-    // check for unclipped columns
-    for (x = spr->x1 ; x<=spr->x2 ; x++)
+  /* all clipping has been performed, so draw the sprite */
+
+  /* check for unclipped columns */
+
+  for (x = spr->x1; x <= spr->x2; x++)
     {
-	if (clipbot[x] == -2)		
-	    clipbot[x] = viewheight;
+      if (clipbot[x] == -2) clipbot[x] = viewheight;
 
-	if (cliptop[x] == -2)
-	    cliptop[x] = -1;
+      if (cliptop[x] == -2) cliptop[x] = -1;
     }
-		
-    mfloorclip = clipbot;
-    mceilingclip = cliptop;
-    R_DrawVisSprite (spr, spr->x1, spr->x2);
+
+  mfloorclip = clipbot;
+  mceilingclip = cliptop;
+  r_draw_vis_sprite(spr, spr->x1, spr->x2);
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/* r_init_sprites
+ * Called at program start.
+ */
 
-
-//
-// R_DrawMasked
-//
-void R_DrawMasked (void)
+void r_init_sprites(const char **namelist)
 {
-    vissprite_t*	spr;
-    drawseg_t*		ds;
-	
-    R_SortVisSprites ();
+  int i;
 
-    if (vissprite_p > vissprites)
+  for (i = 0; i < SCREENWIDTH; i++)
     {
-	// draw all vissprites back to front
-	for (spr = vsprsortedhead.next ;
-	     spr != &vsprsortedhead ;
-	     spr=spr->next)
-	{
-	    
-	    R_DrawSprite (spr);
-	}
+      negonearray[i] = -1;
     }
-    
-    // render any remaining masked mid textures
-    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
-	if (ds->maskedtexturecol)
-	    R_RenderMaskedSegRange (ds, ds->x1, ds->x2);
-    
-    // draw the psprites on top of everything
-    //  but does not draw on side views
-    if (!viewangleoffset)		
-	R_DrawPlayerSprites ();
+
+  r_init_sprite_defs(namelist);
 }
 
+/* Called at frame start. */
 
+void r_clear_sprites(void)
+{
+  vissprite_p = vissprites;
+}
 
+/* r_draw_masked_column
+ * Used for sprites and masked mid textures.
+ * Masked means: partly transparent, i.e. stored in posts/runs of opaque
+ * pixels.
+ */
+
+void r_draw_masked_column(column_t *column)
+{
+  int topscreen;
+  int bottomscreen;
+  fixed_t basetexturemid;
+
+  basetexturemid = dc_texturemid;
+
+  for (; column->topdelta != 0xff; )
+    {
+      /* calculate unclipped screen coordinates for post */
+
+      topscreen = sprtopscreen + spryscale * column->topdelta;
+      bottomscreen = topscreen + spryscale * column->length;
+
+      dc_yl = (topscreen + FRACUNIT - 1) >> FRACBITS;
+      dc_yh = (bottomscreen - 1) >> FRACBITS;
+
+      if (dc_yh >= mfloorclip[dc_x]) dc_yh = mfloorclip[dc_x] - 1;
+      if (dc_yl <= mceilingclip[dc_x]) dc_yl = mceilingclip[dc_x] + 1;
+
+      if (dc_yl <= dc_yh)
+        {
+          dc_source = (byte *)column + 3;
+          dc_texturemid = basetexturemid - (column->topdelta << FRACBITS);
+
+          /* Drawn by either r_draw_column or (SHADOW) r_draw_fuzz_column.
+           */
+
+          colfunc();
+        }
+
+      column = (column_t *)((byte *)column + column->length + 4);
+    }
+
+  dc_texturemid = basetexturemid;
+}
+
+/* r_add_sprites
+ * During BSP traversal, this adds sprites by sector.
+ */
+
+void r_add_sprites(sector_t *sec)
+{
+  mobj_t *thing;
+  int lightnum;
+
+  /* BSP is traversed by subsector.
+   * A sector might have been split into several subsectors during BSP
+   * building. Thus we check whether its already added.
+   */
+
+  if (sec->validcount == validcount) return;
+
+  /* Well, now it will be done. */
+
+  sec->validcount = validcount;
+
+  lightnum = (sec->lightlevel >> LIGHTSEGSHIFT) + extralight;
+
+  if (lightnum < 0)
+    spritelights = scalelight[0];
+  else if (lightnum >= LIGHTLEVELS)
+    spritelights = scalelight[LIGHTLEVELS - 1];
+  else
+    spritelights = scalelight[lightnum];
+
+  /* Handle all things in sector. */
+
+  for (thing = sec->thinglist; thing; thing = thing->snext)
+    r_project_sprite(thing);
+}
+
+void r_draw_masked(void)
+{
+  vissprite_t *spr;
+  drawseg_t *ds;
+
+  r_sort_vis_sprites();
+
+  if (vissprite_p > vissprites)
+    {
+      /* draw all vissprites back to front */
+
+      for (spr = vsprsortedhead.next;
+           spr != &vsprsortedhead;
+           spr = spr->next)
+        {
+          r_draw_sprite(spr);
+        }
+    }
+
+  /* render any remaining masked mid textures */
+
+  for (ds = ds_p - 1; ds >= drawsegs; ds--)
+    {
+      if (ds->maskedtexturecol)
+        {
+          r_render_masked_seg_range(ds, ds->x1, ds->x2);
+        }
+    }
+
+  /* draw the psprites on top of everything but does not draw on side views
+   */
+
+  if (!viewangleoffset)
+    {
+      r_draw_player_sprites();
+    }
+}
diff --git a/games/NXDoom/src/doom/r_things.h b/games/NXDoom/src/doom/r_things.h
index fc51c34a4..cdd299483 100644
--- a/games/NXDoom/src/doom/r_things.h
+++ b/games/NXDoom/src/doom/r_things.h
@@ -1,65 +1,61 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Rendering of moving objects, sprites.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/r_things.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Rendering of moving objects, sprites.
+ *
+ ****************************************************************************/
 
 #ifndef __R_THINGS__
 #define __R_THINGS__
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
+extern vissprite_t vissprites[CONFIG_GAMES_NXDOOM_MAXVISSPRITES];
+extern vissprite_t *vissprite_p;
+extern vissprite_t vsprsortedhead;
 
-#define MAXVISSPRITES  	128
+/* Constant arrays used for psprite clipping and initializing clipping. */
 
-extern vissprite_t	vissprites[MAXVISSPRITES];
-extern vissprite_t*	vissprite_p;
-extern vissprite_t	vsprsortedhead;
+extern short negonearray[SCREENWIDTH];
+extern short screenheightarray[SCREENWIDTH];
 
-// Constant arrays used for psprite clipping
-//  and initializing clipping.
-extern short		negonearray[SCREENWIDTH];
-extern short		screenheightarray[SCREENWIDTH];
+/* vars for r_draw_masked_column */
 
-// vars for R_DrawMaskedColumn
-extern short*		mfloorclip;
-extern short*		mceilingclip;
-extern fixed_t		spryscale;
-extern fixed_t		sprtopscreen;
+extern short *mfloorclip;
+extern short *mceilingclip;
+extern fixed_t spryscale;
+extern fixed_t sprtopscreen;
 
-extern fixed_t		pspritescale;
-extern fixed_t		pspriteiscale;
+extern fixed_t pspritescale;
+extern fixed_t pspriteiscale;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void R_DrawMaskedColumn (column_t* column);
+void r_draw_masked_column(column_t *column);
 
+void r_add_sprites(sector_t *sec);
+void r_init_sprites(const char **namelist);
+void r_clear_sprites(void);
+void r_draw_masked(void);
 
-void R_SortVisSprites (void);
-
-void R_AddSprites (sector_t* sec);
-void R_AddPSprites (void);
-void R_DrawSprites (void);
-void R_InitSprites(const char **namelist);
-void R_ClearSprites (void);
-void R_DrawMasked (void);
-
-void
-R_ClipVisSprite
-( vissprite_t*		vis,
-  int			xl,
-  int			xh );
-
-
-#endif
+#endif /* __R_THINGS__ */
diff --git a/games/NXDoom/src/doom/s_sound.c b/games/NXDoom/src/doom/s_sound.c
index 76748892a..dbca08a57 100644
--- a/games/NXDoom/src/doom/s_sound.c
+++ b/games/NXDoom/src/doom/s_sound.c
@@ -1,19 +1,28 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/s_sound.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:  none
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,699 +35,737 @@
 #include "doomstat.h"
 #include "doomtype.h"
 
-#include "sounds.h"
 #include "s_sound.h"
+#include "sounds.h"
 
+#include "m_argv.h"
 #include "m_misc.h"
 #include "m_random.h"
-#include "m_argv.h"
 
 #include "p_local.h"
 #include "w_wad.h"
 #include "z_zone.h"
 
-// when to clip out sounds
-// Does not fit the large outdoor areas.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* when to clip out sounds
+ * Does not fit the large outdoor areas.
+ */
 
 #define S_CLIPPING_DIST (1200 * FRACUNIT)
 
-// Distance tp origin when sounds should be maxed out.
-// This should relate to movement clipping resolution
-// (see BLOCKMAP handling).
-// In the source code release: (160*FRACUNIT).  Changed back to the
-// Vanilla value of 200 (why was this changed?)
+/* Distance tp origin when sounds should be maxed out.
+ * This should relate to movement clipping resolution
+ * (see BLOCKMAP handling).
+ * In the source code release: (160*FRACUNIT).  Changed back to the
+ * Vanilla value of 200 (why was this changed?)
+ */
 
 #define S_CLOSE_DIST (200 * FRACUNIT)
 
-// The range over which sound attenuates
+/* The range over which sound attenuates */
 
 #define S_ATTENUATOR ((S_CLIPPING_DIST - S_CLOSE_DIST) >> FRACBITS)
 
-// Stereo separation
+/* Stereo separation */
 
 #define S_STEREO_SWING (96 * FRACUNIT)
 
 #define NORM_PRIORITY 64
 #define NORM_SEP 128
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct
 {
-    // sound information (if null, channel avail.)
-    sfxinfo_t *sfxinfo;
+  /* sound information (if null, channel avail.) */
 
-    // origin of sound
-    mobj_t *origin;
+  sfxinfo_t *sfxinfo;
 
-    // handle of the sound being played
-    int handle;
+  /* origin of sound */
 
-    int pitch;
+  mobj_t *origin;
 
+  /* handle of the sound being played */
+
+  int handle;
+
+  int pitch;
 } channel_t;
 
-// The set of channels available
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* The set of channels available */
 
 static channel_t *channels;
 
-// Maximum volume of a sound effect.
-// Internal default is max out of 0-15.
+/* Internal volume level, ranging from 0-127 */
 
-int sfxVolume = 8;
+static int g_snd_sfx_volume;
 
-// Maximum volume of music.
-
-int musicVolume = 8;
-
-// Internal volume level, ranging from 0-127
-
-static int snd_SfxVolume;
-
-// Whether songs are mus_paused
+/* Whether songs are mus_paused */
 
 static boolean mus_paused;
 
-// Music currently being played
+/* Music currently being played */
 
 static musicinfo_t *mus_playing = NULL;
 
-// Number of channels to use
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Maximum volume of a sound effect.
+ * Internal default is max out of 0-15.
+ */
+
+int g_sfx_volume = 8;
+
+/* Maximum volume of music. */
+
+int g_music_volume = 8;
+
+/* Number of channels to use */
 
 int snd_channels = 8;
 
-//
-// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume,
-//  allocates channel buffer, sets S_sfx lookup.
-//
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-void S_Init(int sfxVolume, int musicVolume)
+static void s_stop_channel(int cnum)
 {
-    int i;
+  int i;
+  channel_t *c;
 
-    if (gameversion == exe_doom_1_666)
+  c = &channels[cnum];
+
+  if (c->sfxinfo)
     {
-        if (logical_gamemission == doom)
+      /* stop the sound playing */
+
+      if (i_sound_playing(c->handle))
         {
-            I_SetOPLDriverVer(opl_doom1_1_666);
-        }
-        else
-        {
-            I_SetOPLDriverVer(opl_doom2_1_666);
-        }
-    }
-    else
-    {
-        I_SetOPLDriverVer(opl_doom_1_9);
-    }
-
-    I_PrecacheSounds(S_sfx, NUMSFX);
-
-    S_SetSfxVolume(sfxVolume);
-    S_SetMusicVolume(musicVolume);
-
-    // Allocating the internal channels for mixing
-    // (the maximum numer of sounds rendered
-    // simultaneously) within zone memory.
-    channels = Z_Malloc(snd_channels*sizeof(channel_t), PU_STATIC, 0);
-
-    // Free all channels for use
-    for (i=0 ; i<snd_channels ; i++)
-    {
-        channels[i].sfxinfo = 0;
-    }
-
-    // no sounds are playing, and they are not mus_paused
-    mus_paused = 0;
-
-    // Note that sounds have not been cached (yet).
-    for (i=1 ; i<NUMSFX ; i++)
-    {
-        S_sfx[i].lumpnum = S_sfx[i].usefulness = -1;
-    }
-
-    // Doom defaults to pitch-shifting off.
-    if (snd_pitchshift == -1)
-    {
-        snd_pitchshift = 0;
-    }
-
-    I_AtExit(S_Shutdown, true);
-}
-
-void S_Shutdown(void)
-{
-    I_ShutdownSound();
-    I_ShutdownMusic();
-}
-
-static void S_StopChannel(int cnum)
-{
-    int i;
-    channel_t *c;
-
-    c = &channels[cnum];
-
-    if (c->sfxinfo)
-    {
-        // stop the sound playing
-
-        if (I_SoundIsPlaying(c->handle))
-        {
-            I_StopSound(c->handle);
+          i_stop_sound(c->handle);
         }
 
-        // check to see if other channels are playing the sound
+      /* check to see if other channels are playing the sound */
 
-        for (i=0; i<snd_channels; i++)
+      for (i = 0; i < snd_channels; i++)
         {
-            if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
+          if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
             {
-                break;
+              break;
             }
         }
 
-        // degrade usefulness of sound data
+      /* degrade usefulness of sound data */
 
-        c->sfxinfo->usefulness--;
-        c->sfxinfo = NULL;
-        c->origin = NULL;
+      c->sfxinfo->usefulness--;
+      c->sfxinfo = NULL;
+      c->origin = NULL;
     }
 }
 
-//
-// Per level startup code.
-// Kills playing sounds at start of level,
-//  determines music if any, changes music.
-//
+/* S_GetChannel: If none available, return -1. Otherwise channel #. */
 
-void S_Start(void)
+static int s_get_channel(mobj_t *origin, sfxinfo_t *sfxinfo)
 {
-    int cnum;
-    int mnum;
+  /* channel number to use */
 
-    // kill all playing sounds at start of level
-    //  (trust me - a good idea)
-    for (cnum=0 ; cnum<snd_channels ; cnum++)
+  int cnum;
+
+  channel_t *c;
+
+  /* Find an open channel */
+
+  for (cnum = 0; cnum < snd_channels; cnum++)
     {
-        if (channels[cnum].sfxinfo)
+      if (!channels[cnum].sfxinfo)
         {
-            S_StopChannel(cnum);
+          break;
+        }
+      else if (origin && channels[cnum].origin == origin)
+        {
+          s_stop_channel(cnum);
+          break;
         }
     }
 
-    // start new music for the level
-    mus_paused = 0;
+  /* None available */
 
-    if (gamemode == commercial)
+  if (cnum == snd_channels)
     {
-        mnum = mus_runnin + gamemap - 1;
-    }
-    else
-    {
-        int spmus[]=
+      /* Look for lower priority */
+
+      for (cnum = 0; cnum < snd_channels; cnum++)
         {
-            // Song - Who? - Where?
-
-            mus_e3m4,        // American     e4m1
-            mus_e3m2,        // Romero       e4m2
-            mus_e3m3,        // Shawn        e4m3
-            mus_e1m5,        // American     e4m4
-            mus_e2m7,        // Tim          e4m5
-            mus_e2m4,        // Romero       e4m6
-            mus_e2m6,        // J.Anderson   e4m7 CHIRON.WAD
-            mus_e2m5,        // Shawn        e4m8
-            mus_e1m9,        // Tim          e4m9
-        };
-
-        if (gameepisode < 4)
-        {
-            mnum = mus_e1m1 + (gameepisode-1)*9 + gamemap-1;
-        }
-        else
-        {
-            mnum = spmus[gamemap-1];
-        }
-    }
-
-    S_ChangeMusic(mnum, true);
-}
-
-void S_StopSound(mobj_t *origin)
-{
-    int cnum;
-
-    for (cnum=0 ; cnum<snd_channels ; cnum++)
-    {
-        if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
-        {
-            S_StopChannel(cnum);
-            break;
-        }
-    }
-}
-
-//
-// S_GetChannel :
-//   If none available, return -1.  Otherwise channel #.
-//
-
-static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo)
-{
-    // channel number to use
-    int                cnum;
-
-    channel_t*        c;
-
-    // Find an open channel
-    for (cnum=0 ; cnum<snd_channels ; cnum++)
-    {
-        if (!channels[cnum].sfxinfo)
-        {
-            break;
-        }
-        else if (origin && channels[cnum].origin == origin)
-        {
-            S_StopChannel(cnum);
-            break;
-        }
-    }
-
-    // None available
-    if (cnum == snd_channels)
-    {
-        // Look for lower priority
-        for (cnum=0 ; cnum<snd_channels ; cnum++)
-        {
-            if (channels[cnum].sfxinfo->priority >= sfxinfo->priority)
+          if (channels[cnum].sfxinfo->priority >= sfxinfo->priority)
             {
-                break;
+              break;
             }
         }
 
-        if (cnum == snd_channels)
+      if (cnum == snd_channels)
         {
-            // FUCK!  No lower priority.  Sorry, Charlie.
-            return -1;
+          /* FUCK!  No lower priority.  Sorry, Charlie. */
+
+          return -1;
         }
-        else
+      else
         {
-            // Otherwise, kick out lower priority.
-            S_StopChannel(cnum);
+          /* Otherwise, kick out lower priority. */
+
+          s_stop_channel(cnum);
         }
     }
 
-    c = &channels[cnum];
+  c = &channels[cnum];
 
-    // channel is decided to be cnum.
-    c->sfxinfo = sfxinfo;
-    c->origin = origin;
+  /* channel is decided to be cnum. */
 
-    return cnum;
+  c->sfxinfo = sfxinfo;
+  c->origin = origin;
+
+  return cnum;
 }
 
-//
-// Changes volume and stereo-separation variables
-//  from the norm of a sound effect to be played.
-// If the sound is not audible, returns a 0.
-// Otherwise, modifies parameters and returns 1.
-//
+/* Changes volume and stereo-separation variables from the norm of a sound
+ * effect to be played. If the sound is not audible, returns a 0. Otherwise,
+ * modifies parameters and returns 1.
+ */
 
-static int S_AdjustSoundParams(mobj_t *listener, mobj_t *source,
-                               int *vol, int *sep)
+static int s_adjust_sound_params(mobj_t *listener, mobj_t *source, int *vol,
+                                 int *sep)
 {
-    fixed_t        approx_dist;
-    fixed_t        adx;
-    fixed_t        ady;
-    angle_t        angle;
+  fixed_t approx_dist;
+  fixed_t adx;
+  fixed_t ady;
+  angle_t angle;
 
-    // calculate the distance to sound origin
-    //  and clip it if necessary
-    adx = abs(listener->x - source->x);
-    ady = abs(listener->y - source->y);
+  /* calculate the distance to sound origin and clip it if necessary */
 
-    // From _GG1_ p.428. Appox. eucledian distance fast.
-    approx_dist = adx + ady - ((adx < ady ? adx : ady)>>1);
+  adx = abs(listener->x - source->x);
+  ady = abs(listener->y - source->y);
 
-    if (gamemap != 8 && approx_dist > S_CLIPPING_DIST)
+  /* From _GG1_ p.428. Appox. Euclidean distance fast. */
+
+  approx_dist = adx + ady - ((adx < ady ? adx : ady) >> 1);
+
+  if (gamemap != 8 && approx_dist > S_CLIPPING_DIST)
     {
-        return 0;
+      return 0;
     }
 
-    // angle of source to listener
-    angle = R_PointToAngle2(listener->x,
-                            listener->y,
-                            source->x,
-                            source->y);
+  /* angle of source to listener */
 
-    if (angle > listener->angle)
+  angle = r_point_to_angle2(listener->x, listener->y, source->x, source->y);
+
+  if (angle > listener->angle)
     {
-        angle = angle - listener->angle;
+      angle = angle - listener->angle;
     }
-    else
+  else
     {
-        angle = angle + (0xffffffff - listener->angle);
+      angle = angle + (0xffffffff - listener->angle);
     }
 
-    angle >>= ANGLETOFINESHIFT;
+  angle >>= ANGLETOFINESHIFT;
 
-    // stereo separation
-    *sep = 128 - (FixedMul(S_STEREO_SWING, finesine[angle]) >> FRACBITS);
+  /* stereo separation */
 
-    // volume calculation
-    if (approx_dist < S_CLOSE_DIST)
+  *sep = 128 - (fixed_mul(S_STEREO_SWING, finesine[angle]) >> FRACBITS);
+
+  /* volume calculation */
+
+  if (approx_dist < S_CLOSE_DIST)
     {
-        *vol = snd_SfxVolume;
+      *vol = g_snd_sfx_volume;
     }
-    else if (gamemap == 8)
+  else if (gamemap == 8)
     {
-        if (approx_dist > S_CLIPPING_DIST)
+      if (approx_dist > S_CLIPPING_DIST)
         {
-            approx_dist = S_CLIPPING_DIST;
+          approx_dist = S_CLIPPING_DIST;
         }
 
-        *vol = 15+ ((snd_SfxVolume-15)
-                    *((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
-            / S_ATTENUATOR;
+      *vol = 15 + ((g_snd_sfx_volume - 15) *
+                   ((S_CLIPPING_DIST - approx_dist) >> FRACBITS)) /
+                      S_ATTENUATOR;
     }
-    else
+  else
     {
-        // distance effect
-        *vol = (snd_SfxVolume
-                * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
-            / S_ATTENUATOR;
+      /* distance effect */
+
+      *vol = (g_snd_sfx_volume *
+              ((S_CLIPPING_DIST - approx_dist) >> FRACBITS)
+              ) / S_ATTENUATOR;
     }
 
-    return (*vol > 0);
+  return (*vol > 0);
 }
 
-// clamp supplied integer to the range 0 <= x <= 255.
+/* clamp supplied integer to the range 0 <= x <= 255. */
 
-static int Clamp(int x)
+static int clamp(int x)
 {
-    if (x < 0)
+  if (x < 0)
     {
-        return 0;
+      return 0;
     }
-    else if (x > 255)
+  else if (x > 255)
     {
-        return 255;
+      return 255;
     }
-    return x;
+
+  return x;
 }
 
-void S_StartSound(void *origin_p, int sfx_id)
+static void s_shutdown(void)
 {
-    sfxinfo_t *sfx;
-    mobj_t *origin;
-    int rc;
-    int sep;
-    int pitch;
-    int cnum;
-    int volume;
+  i_shutdown_sound();
+  i_shutdown_music();
+}
 
-    origin = (mobj_t *) origin_p;
-    volume = snd_SfxVolume;
-
-    // check for bogus sound #
-    if (sfx_id < 1 || sfx_id > NUMSFX)
+static void s_stop_music(void)
+{
+  if (mus_playing)
     {
-        I_Error("Bad sfx #: %d", sfx_id);
-    }
-
-    sfx = &S_sfx[sfx_id];
-
-    // Initialize sound parameters
-    pitch = NORM_PITCH;
-    if (sfx->link)
-    {
-        volume += sfx->volume;
-        pitch = sfx->pitch;
-
-        if (volume < 1)
+      if (mus_paused)
         {
-            return;
+          i_resume_song();
         }
 
-        if (volume > snd_SfxVolume)
+      i_stop_song();
+      i_unregister_song(mus_playing->handle);
+      w_release_lump_num(mus_playing->lumpnum);
+      mus_playing->data = NULL;
+      mus_playing = NULL;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Initializes sound stuff, including volume
+ *
+ * Sets channels, SFX and music volume, allocates channel buffer, sets s_sfx
+ * lookup.
+ */
+
+void s_init(int sfxvolume, int musicvolume)
+{
+  int i;
+
+#if 0
+  if (gameversion == exe_doom_1_666)
+    {
+      if (logical_gamemission == doom)
         {
-            volume = snd_SfxVolume;
+          i_set_opl_driver_ver(opl_doom1_1_666);
+        }
+      else
+        {
+          i_set_opl_driver_ver(opl_doom2_1_666);
+        }
+    }
+  else
+    {
+      i_set_opl_driver_ver(opl_doom_1_9);
+    }
+#endif
+
+  i_precache_sounds(s_sfx, SFX_NUMSFX);
+
+  s_set_sfx_volume(sfxvolume);
+  s_set_music_volume(musicvolume);
+
+  /* Allocating the internal channels for mixing
+   * (the maximum number of sounds rendered
+   * simultaneously) within zone memory.
+   */
+
+  channels = z_malloc(snd_channels * sizeof(channel_t), PU_STATIC, 0);
+
+  /* Free all channels for use */
+
+  for (i = 0; i < snd_channels; i++)
+    {
+      channels[i].sfxinfo = 0;
+    }
+
+  /* no sounds are playing, and they are not mus_paused */
+
+  mus_paused = 0;
+
+  /* Note that sounds have not been cached (yet). */
+
+  for (i = 1; i < SFX_NUMSFX; i++)
+    {
+      s_sfx[i].lumpnum = s_sfx[i].usefulness = -1;
+    }
+
+  /* Doom defaults to pitch-shifting off. */
+
+  if (snd_pitchshift == -1)
+    {
+      snd_pitchshift = 0;
+    }
+
+  i_at_exit(s_shutdown, true);
+}
+
+/* Per level startup code.
+ * Kills playing sounds at start of level, determines music if any, changes
+ * music.
+ */
+
+void s_start(void)
+{
+  int cnum;
+  int mnum;
+
+  /* kill all playing sounds at start of level (trust me - a good idea)
+   */
+
+  for (cnum = 0; cnum < snd_channels; cnum++)
+    {
+      if (channels[cnum].sfxinfo)
+        {
+          s_stop_channel(cnum);
         }
     }
 
+  /* start new music for the level */
 
-    // Check to see if it is audible,
-    //  and if not, modify the params
-    if (origin && origin != players[consoleplayer].mo)
+  mus_paused = 0;
+
+  if (gamemode == commercial)
     {
-        rc = S_AdjustSoundParams(players[consoleplayer].mo,
-                                 origin,
-                                 &volume,
+      mnum = MUS_RUNNIN + gamemap - 1;
+    }
+  else
+    {
+      int spmus[] = {
+          /* Song - Who? - Where? */
+
+          MUS_E3M4, /* American     e4m1 */
+          MUS_E3M2, /* Romero       e4m2 */
+          MUS_E3M3, /* Shawn        e4m3 */
+          MUS_E1M5, /* American     e4m4 */
+          MUS_E2M7, /* Tim          e4m5 */
+          MUS_E2M4, /* Romero       e4m6 */
+          MUS_E2M6, /* J.Anderson   e4m7 CHIRON.WAD */
+          MUS_E2M5, /* Shawn        e4m8 */
+          MUS_E1M9, /* Tim          e4m9 */
+      };
+
+      if (gameepisode < 4)
+        {
+          mnum = MUS_E1M1 + (gameepisode - 1) * 9 + gamemap - 1;
+        }
+      else
+        {
+          mnum = spmus[gamemap - 1];
+        }
+    }
+
+  s_change_music(mnum, true);
+}
+
+void s_stop_sound(mobj_t *origin)
+{
+  int cnum;
+
+  for (cnum = 0; cnum < snd_channels; cnum++)
+    {
+      if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
+        {
+          s_stop_channel(cnum);
+          break;
+        }
+    }
+}
+
+void s_start_sound(void *origin_p, int sfx_id)
+{
+  sfxinfo_t *sfx;
+  mobj_t *origin;
+  int rc;
+  int sep;
+  int pitch;
+  int cnum;
+  int volume;
+
+  origin = (mobj_t *)origin_p;
+  volume = g_snd_sfx_volume;
+
+  /* check for bogus sound # */
+
+  if (sfx_id < 1 || sfx_id > SFX_NUMSFX)
+    {
+      i_error("Bad sfx #: %d", sfx_id);
+    }
+
+  sfx = &s_sfx[sfx_id];
+
+  /* Initialize sound parameters */
+
+  pitch = NORM_PITCH;
+  if (sfx->link)
+    {
+      volume += sfx->volume;
+      pitch = sfx->pitch;
+
+      if (volume < 1)
+        {
+          return;
+        }
+
+      if (volume > g_snd_sfx_volume)
+        {
+          volume = g_snd_sfx_volume;
+        }
+    }
+
+  /* Check to see if it is audible, and if not, modify the params */
+
+  if (origin && origin != players[consoleplayer].mo)
+    {
+      rc = s_adjust_sound_params(players[consoleplayer].mo, origin, &volume,
                                  &sep);
 
-        if (origin->x == players[consoleplayer].mo->x
-         && origin->y == players[consoleplayer].mo->y)
+      if (origin->x == players[consoleplayer].mo->x &&
+          origin->y == players[consoleplayer].mo->y)
         {
-            sep = NORM_SEP;
+          sep = NORM_SEP;
         }
 
-        if (!rc)
+      if (!rc)
         {
-            return;
+          return;
         }
     }
-    else
+  else
     {
-        sep = NORM_SEP;
+      sep = NORM_SEP;
     }
 
-    // hacks to vary the sfx pitches
-    if (sfx_id >= sfx_sawup && sfx_id <= sfx_sawhit)
+  /* hacks to vary the sfx pitches */
+
+  if (sfx_id >= SFX_SAWUP && sfx_id <= SFX_SAWHIT)
     {
-        pitch += 8 - (M_Random()&15);
+      pitch += 8 - (m_random() & 15);
     }
-    else if (sfx_id != sfx_itemup && sfx_id != sfx_tink)
+  else if (sfx_id != SFX_ITEMUP && sfx_id != SFX_TINK)
     {
-        pitch += 16 - (M_Random()&31);
-    }
-    pitch = Clamp(pitch);
-
-    // kill old sound
-    S_StopSound(origin);
-
-    // try to find a channel
-    cnum = S_GetChannel(origin, sfx);
-
-    if (cnum < 0)
-    {
-        return;
+      pitch += 16 - (m_random() & 31);
     }
 
-    // increase the usefulness
-    if (sfx->usefulness++ < 0)
+  pitch = clamp(pitch);
+
+  s_stop_sound(origin); /* kill old sound */
+
+  /* try to find a channel */
+
+  cnum = s_get_channel(origin, sfx);
+
+  if (cnum < 0)
     {
-        sfx->usefulness = 1;
+      return;
     }
 
-    if (sfx->lumpnum < 0)
+  /* increase the usefulness */
+
+  if (sfx->usefulness++ < 0)
     {
-        sfx->lumpnum = I_GetSfxLumpNum(sfx);
+      sfx->usefulness = 1;
     }
 
-    channels[cnum].pitch = pitch;
-    channels[cnum].handle = I_StartSound(sfx, cnum, volume, sep, channels[cnum].pitch);
+  if (sfx->lumpnum < 0)
+    {
+      sfx->lumpnum = i_get_sfx_lumpnum(sfx);
+    }
+
+  channels[cnum].pitch = pitch;
+  channels[cnum].handle =
+      i_start_sound(sfx, cnum, volume, sep, channels[cnum].pitch);
 }
 
-//
-// Stop and resume music, during game PAUSE.
-//
+/* Stop and resume music, during game PAUSE. */
 
-void S_PauseSound(void)
+void s_pause_sound(void)
 {
-    if (mus_playing && !mus_paused)
+  if (mus_playing && !mus_paused)
     {
-        I_PauseSong();
-        mus_paused = true;
+      i_pause_song();
+      mus_paused = true;
     }
 }
 
-void S_ResumeSound(void)
+void s_resume_sound(void)
 {
-    if (mus_playing && mus_paused)
+  if (mus_playing && mus_paused)
     {
-        I_ResumeSong();
-        mus_paused = false;
+      i_resume_song();
+      mus_paused = false;
     }
 }
 
-//
-// Updates music & sounds
-//
+/* Updates music & sounds */
 
-void S_UpdateSounds(mobj_t *listener)
+void s_update_sounds(mobj_t *listener)
 {
-    int                audible;
-    int                cnum;
-    int                volume;
-    int                sep;
-    sfxinfo_t*        sfx;
-    channel_t*        c;
+  int audible;
+  int cnum;
+  int volume;
+  int sep;
+  sfxinfo_t *sfx;
+  channel_t *c;
 
-    I_UpdateSound();
+  i_update_sound();
 
-    for (cnum=0; cnum<snd_channels; cnum++)
+  for (cnum = 0; cnum < snd_channels; cnum++)
     {
-        c = &channels[cnum];
-        sfx = c->sfxinfo;
+      c = &channels[cnum];
+      sfx = c->sfxinfo;
 
-        if (c->sfxinfo)
+      if (c->sfxinfo)
         {
-            if (I_SoundIsPlaying(c->handle))
+          if (i_sound_playing(c->handle))
             {
-                // initialize parameters
-                volume = snd_SfxVolume;
-                sep = NORM_SEP;
+              /* initialize parameters */
 
-                if (sfx->link)
+              volume = g_snd_sfx_volume;
+              sep = NORM_SEP;
+
+              if (sfx->link)
                 {
-                    volume += sfx->volume;
-                    if (volume < 1)
+                  volume += sfx->volume;
+                  if (volume < 1)
                     {
-                        S_StopChannel(cnum);
-                        continue;
+                      s_stop_channel(cnum);
+                      continue;
                     }
-                    else if (volume > snd_SfxVolume)
+                  else if (volume > g_snd_sfx_volume)
                     {
-                        volume = snd_SfxVolume;
+                      volume = g_snd_sfx_volume;
                     }
                 }
 
-                // check non-local sounds for distance clipping
-                //  or modify their params
-                if (c->origin && listener != c->origin)
-                {
-                    audible = S_AdjustSoundParams(listener,
-                                                  c->origin,
-                                                  &volume,
-                                                  &sep);
+              /* check non-local sounds for distance clipping or modify their
+               * params
+               */
 
-                    if (!audible)
+              if (c->origin && listener != c->origin)
+                {
+                  audible = s_adjust_sound_params(listener, c->origin,
+                                                  &volume, &sep);
+
+                  if (!audible)
                     {
-                        S_StopChannel(cnum);
+                      s_stop_channel(cnum);
                     }
-                    else
+                  else
                     {
-                        I_UpdateSoundParams(c->handle, volume, sep);
+                      i_update_sound_params(c->handle, volume, sep);
                     }
                 }
             }
-            else
+          else
             {
-                // if channel is allocated but sound has stopped,
-                //  free it
-                S_StopChannel(cnum);
+              /* if channel is allocated but sound has stopped, free it
+               */
+
+              s_stop_channel(cnum);
             }
         }
     }
 }
 
-void S_SetMusicVolume(int volume)
+void s_set_music_volume(int volume)
 {
-    if (volume < 0 || volume > 127)
+  if (volume < 0 || volume > 127)
     {
-        I_Error("Attempt to set music volume at %d",
-                volume);
+      i_error("Attempt to set music volume at %d", volume);
     }
 
-    I_SetMusicVolume(volume);
+  i_set_music_volume(volume);
 }
 
-void S_SetSfxVolume(int volume)
+void s_set_sfx_volume(int volume)
 {
-    if (volume < 0 || volume > 127)
+  if (volume < 0 || volume > 127)
     {
-        I_Error("Attempt to set sfx volume at %d", volume);
+      i_error("Attempt to set sfx volume at %d", volume);
     }
 
-    snd_SfxVolume = volume;
+  g_snd_sfx_volume = volume;
 }
 
-//
-// Starts some music with the music id found in sounds.h.
-//
+/* Starts some music with the music id found in sounds.h. */
 
-void S_StartMusic(int m_id)
+void s_start_music(int m_id)
 {
-    S_ChangeMusic(m_id, false);
+  s_change_music(m_id, false);
 }
 
-void S_ChangeMusic(int musicnum, int looping)
+void s_change_music(int musicnum, int looping)
 {
-    musicinfo_t *music = NULL;
-    char namebuf[9];
-    void *handle;
+  musicinfo_t *music = NULL;
+  char namebuf[9];
+  void *handle;
 
-    // The Doom IWAD file has two versions of the intro music: d_intro
-    // and d_introa.  The latter is used for OPL playback.
+  /* The Doom IWAD file has two versions of the intro music: d_intro
+   * and d_introa. The latter is used for OPL playback.
+   */
 
-    if (musicnum == mus_intro && (snd_musicdevice == SNDDEVICE_ADLIB
-                               || snd_musicdevice == SNDDEVICE_SB)
-        && W_CheckNumForName("D_INTROA") >= 0)
+  if (musicnum == MUS_INTRO &&
+      (snd_musicdevice == SNDDEVICE_ADLIB ||
+       snd_musicdevice == SNDDEVICE_SB) &&
+      w_check_num_for_name("D_INTROA") >= 0)
     {
-        musicnum = mus_introa;
+      musicnum = MUS_INTROA;
     }
 
-    if (musicnum <= mus_None || musicnum >= NUMMUSIC)
+  if (musicnum <= MUS_NONE || musicnum >= MUS_NUMMUSIC)
     {
-        I_Error("Bad music number %d", musicnum);
+      i_error("Bad music number %d", musicnum);
     }
-    else
+  else
     {
-        music = &S_music[musicnum];
+      music = &s_music[musicnum];
     }
 
-    if (mus_playing == music)
+  if (mus_playing == music)
     {
-        return;
+      return;
     }
 
-    // shutdown old music
-    S_StopMusic();
+  /* shutdown old music */
 
-    // get lumpnum if neccessary
-    if (!music->lumpnum)
+  s_stop_music();
+
+  /* get lumpnum if necessary */
+
+  if (!music->lumpnum)
     {
-        M_snprintf(namebuf, sizeof(namebuf), "d_%s", DEH_String(music->name));
-        music->lumpnum = W_GetNumForName(namebuf);
+      snprintf(namebuf, sizeof(namebuf), "d_%s", (music->name));
+      music->lumpnum = w_get_num_for_name(namebuf);
     }
 
-    music->data = W_CacheLumpNum(music->lumpnum, PU_STATIC);
+  music->data = w_cache_lump_num(music->lumpnum, PU_STATIC);
 
-    handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-    music->handle = handle;
-    I_PlaySong(handle, looping);
+  handle = i_register_song(music->data, w_lump_length(music->lumpnum));
+  music->handle = handle;
+  i_play_song(handle, looping);
 
-    mus_playing = music;
+  mus_playing = music;
 }
-
-boolean S_MusicPlaying(void)
-{
-    return I_MusicIsPlaying();
-}
-
-void S_StopMusic(void)
-{
-    if (mus_playing)
-    {
-        if (mus_paused)
-        {
-            I_ResumeSong();
-        }
-
-        I_StopSong();
-        I_UnRegisterSong(mus_playing->handle);
-        W_ReleaseLumpNum(mus_playing->lumpnum);
-        mus_playing->data = NULL;
-        mus_playing = NULL;
-    }
-}
-
diff --git a/games/NXDoom/src/doom/s_sound.h b/games/NXDoom/src/doom/s_sound.h
index bbd100a0c..21f569d9b 100644
--- a/games/NXDoom/src/doom/s_sound.h
+++ b/games/NXDoom/src/doom/s_sound.h
@@ -1,89 +1,86 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The not so system specific sound interface.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/s_sound.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  The not so system specific sound interface.
+ *
+ ****************************************************************************/
 
 #ifndef __S_SOUND__
 #define __S_SOUND__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "p_mobj.h"
 #include "sounds.h"
 
-//
-// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume,
-//  allocates channel buffer, sets S_sfx lookup.
-//
-
-void S_Init(int sfxVolume, int musicVolume);
-
-
-// Shut down sound 
-
-void S_Shutdown(void);
-
-
-
-//
-// Per level startup code.
-// Kills playing sounds at start of level,
-//  determines music if any, changes music.
-//
-
-void S_Start(void);
-
-//
-// Start sound for thing at <origin>
-//  using <sound_id> from sounds.h
-//
-
-void S_StartSound(void *origin, int sound_id);
-
-// Stop sound for thing at <origin>
-void S_StopSound(mobj_t *origin);
-
-
-// Start music using <music_id> from sounds.h
-void S_StartMusic(int music_id);
-
-// Start music using <music_id> from sounds.h,
-//  and set whether looping
-void S_ChangeMusic(int music_id, int looping);
-
-// query if music is playing
-boolean S_MusicPlaying(void);
-
-// Stops the music fer sure.
-void S_StopMusic(void);
-
-// Stop and resume music, during game PAUSE.
-void S_PauseSound(void);
-void S_ResumeSound(void);
-
-
-//
-// Updates music & sounds
-//
-void S_UpdateSounds(mobj_t *listener);
-
-void S_SetMusicVolume(int volume);
-void S_SetSfxVolume(int volume);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern int snd_channels;
 
-#endif
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+/* Initializes sound stuff, including volume
+ * Sets channels, SFX and music volume, allocates channel buffer, sets s_sfx
+ * lookup.
+ */
+
+void s_init(int sfxvolume, int musicvolume);
+
+/* Per level startup code.
+ * Kills playing sounds at start of level, determines music if any, changes
+ * music.
+ */
+
+void s_start(void);
+
+/* Start sound for thing at <origin> using <sound_id> from sounds.h */
+
+void s_start_sound(void *origin, int sound_id);
+
+/* Stop sound for thing at <origin> */
+
+void s_stop_sound(mobj_t *origin);
+
+/* Start music using <music_id> from sounds.h */
+
+void s_start_music(int music_id);
+
+/* Start music using <music_id> from sounds.h, and set whether looping */
+
+void s_change_music(int music_id, int looping);
+
+/* Stop and resume music, during game PAUSE. */
+
+void s_pause_sound(void);
+void s_resume_sound(void);
+
+/* Updates music & sounds */
+
+void s_update_sounds(mobj_t *listener);
+
+void s_set_music_volume(int volume);
+void s_set_sfx_volume(int volume);
+
+#endif /* __S_SOUND__ */
diff --git a/games/NXDoom/src/doom/sounds.c b/games/NXDoom/src/doom/sounds.c
index e976bc844..b1282cdb2 100644
--- a/games/NXDoom/src/doom/sounds.c
+++ b/games/NXDoom/src/doom/sounds.c
@@ -1,132 +1,89 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Created by a sound utility.
-//	Kept as a sample, DOOM2 sounds.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/sounds.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Created by a sound utility.
+ *  Kept as a sample, DOOM2 sounds.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 
-
 #include "doomtype.h"
 #include "sounds.h"
 
-//
-// Information about all the music
-//
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define MUSIC(name) \
-    { name, 0, NULL, NULL }
+/* Information about all the music */
 
-musicinfo_t S_music[] =
+#define MUSIC(name) {name, 0, NULL, NULL}
+
+/* Information about all the sfx */
+
+#define SOUND(name, priority)                                                \
+  {NULL, name, priority, NULL, -1, -1, 0, 0, -1, NULL}
+#define SOUND_LINK(name, priority, link_id, pitch, volume)                   \
+  {NULL, name, priority, &s_sfx[link_id], pitch, volume, 0, 0, -1, NULL}
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+musicinfo_t s_music[] =
 {
-    MUSIC(NULL),
-    MUSIC("e1m1"),
-    MUSIC("e1m2"),
-    MUSIC("e1m3"),
-    MUSIC("e1m4"),
-    MUSIC("e1m5"),
-    MUSIC("e1m6"),
-    MUSIC("e1m7"),
-    MUSIC("e1m8"),
-    MUSIC("e1m9"),
-    MUSIC("e2m1"),
-    MUSIC("e2m2"),
-    MUSIC("e2m3"),
-    MUSIC("e2m4"),
-    MUSIC("e2m5"),
-    MUSIC("e2m6"),
-    MUSIC("e2m7"),
-    MUSIC("e2m8"),
-    MUSIC("e2m9"),
-    MUSIC("e3m1"),
-    MUSIC("e3m2"),
-    MUSIC("e3m3"),
-    MUSIC("e3m4"),
-    MUSIC("e3m5"),
-    MUSIC("e3m6"),
-    MUSIC("e3m7"),
-    MUSIC("e3m8"),
-    MUSIC("e3m9"),
-    MUSIC("inter"),
-    MUSIC("intro"),
-    MUSIC("bunny"),
-    MUSIC("victor"),
-    MUSIC("introa"),
-    MUSIC("runnin"),
-    MUSIC("stalks"),
-    MUSIC("countd"),
-    MUSIC("betwee"),
-    MUSIC("doom"),
-    MUSIC("the_da"),
-    MUSIC("shawn"),
-    MUSIC("ddtblu"),
-    MUSIC("in_cit"),
-    MUSIC("dead"),
-    MUSIC("stlks2"),
-    MUSIC("theda2"),
-    MUSIC("doom2"),
-    MUSIC("ddtbl2"),
-    MUSIC("runni2"),
-    MUSIC("dead2"),
-    MUSIC("stlks3"),
-    MUSIC("romero"),
-    MUSIC("shawn2"),
-    MUSIC("messag"),
-    MUSIC("count2"),
-    MUSIC("ddtbl3"),
-    MUSIC("ampie"),
-    MUSIC("theda3"),
-    MUSIC("adrian"),
-    MUSIC("messg2"),
-    MUSIC("romer2"),
-    MUSIC("tense"),
-    MUSIC("shawn3"),
-    MUSIC("openin"),
-    MUSIC("evil"),
-    MUSIC("ultima"),
-    MUSIC("read_m"),
-    MUSIC("dm2ttl"),
-    MUSIC("dm2int") 
+  MUSIC(NULL),     MUSIC("e1m1"),   MUSIC("e1m2"),   MUSIC("e1m3"),
+  MUSIC("e1m4"),   MUSIC("e1m5"),   MUSIC("e1m6"),   MUSIC("e1m7"),
+  MUSIC("e1m8"),   MUSIC("e1m9"),   MUSIC("e2m1"),   MUSIC("e2m2"),
+  MUSIC("e2m3"),   MUSIC("e2m4"),   MUSIC("e2m5"),   MUSIC("e2m6"),
+  MUSIC("e2m7"),   MUSIC("e2m8"),   MUSIC("e2m9"),   MUSIC("e3m1"),
+  MUSIC("e3m2"),   MUSIC("e3m3"),   MUSIC("e3m4"),   MUSIC("e3m5"),
+  MUSIC("e3m6"),   MUSIC("e3m7"),   MUSIC("e3m8"),   MUSIC("e3m9"),
+  MUSIC("inter"),  MUSIC("intro"),  MUSIC("bunny"),  MUSIC("victor"),
+  MUSIC("introa"), MUSIC("runnin"), MUSIC("stalks"), MUSIC("countd"),
+  MUSIC("betwee"), MUSIC("doom"),   MUSIC("the_da"), MUSIC("shawn"),
+  MUSIC("ddtblu"), MUSIC("in_cit"), MUSIC("dead"),   MUSIC("stlks2"),
+  MUSIC("theda2"), MUSIC("doom2"),  MUSIC("ddtbl2"), MUSIC("runni2"),
+  MUSIC("dead2"),  MUSIC("stlks3"), MUSIC("romero"), MUSIC("shawn2"),
+  MUSIC("messag"), MUSIC("count2"), MUSIC("ddtbl3"), MUSIC("ampie"),
+  MUSIC("theda3"), MUSIC("adrian"), MUSIC("messg2"), MUSIC("romer2"),
+  MUSIC("tense"),  MUSIC("shawn3"), MUSIC("openin"), MUSIC("evil"),
+  MUSIC("ultima"), MUSIC("read_m"), MUSIC("dm2ttl"), MUSIC("dm2int"),
 };
 
-
-//
-// Information about all the sfx
-//
-
-#define SOUND(name, priority) \
-  { NULL, name, priority, NULL, -1, -1, 0, 0, -1, NULL }
-#define SOUND_LINK(name, priority, link_id, pitch, volume) \
-  { NULL, name, priority, &S_sfx[link_id], pitch, volume, 0, 0, -1, NULL }
-
-sfxinfo_t S_sfx[] =
+sfxinfo_t s_sfx[] =
 {
-  // S_sfx[0] needs to be a dummy for odd reasons.
-  SOUND("none",   0),
+  SOUND("none", 0), /* s_sfx[0] needs to be a dummy for odd reasons. */
   SOUND("pistol", 64),
   SOUND("shotgn", 64),
   SOUND("sgcock", 64),
   SOUND("dshtgn", 64),
-  SOUND("dbopn",  64),
-  SOUND("dbcls",  64),
+  SOUND("dbopn", 64),
+  SOUND("dbcls", 64),
   SOUND("dbload", 64),
   SOUND("plasma", 64),
-  SOUND("bfg",    64),
-  SOUND("sawup",  64),
+  SOUND("bfg", 64),
+  SOUND("sawup", 64),
   SOUND("sawidl", 118),
   SOUND("sawful", 64),
   SOUND("sawhit", 64),
@@ -135,7 +92,7 @@ sfxinfo_t S_sfx[] =
   SOUND("firsht", 70),
   SOUND("firxpl", 70),
   SOUND("pstart", 100),
-  SOUND("pstop",  100),
+  SOUND("pstop", 100),
   SOUND("doropn", 100),
   SOUND("dorcls", 100),
   SOUND("stnmov", 119),
@@ -147,10 +104,10 @@ sfxinfo_t S_sfx[] =
   SOUND("vipain", 96),
   SOUND("mnpain", 96),
   SOUND("pepain", 96),
-  SOUND("slop",   78),
+  SOUND("slop", 78),
   SOUND("itemup", 78),
-  SOUND("wpnup",  78),
-  SOUND("oof",    96),
+  SOUND("wpnup", 78),
+  SOUND("oof", 96),
   SOUND("telept", 32),
   SOUND("posit1", 98),
   SOUND("posit2", 98),
@@ -166,12 +123,12 @@ sfxinfo_t S_sfx[] =
   SOUND("kntsit", 90),
   SOUND("vilsit", 90),
   SOUND("mansit", 90),
-  SOUND("pesit",  90),
+  SOUND("pesit", 90),
   SOUND("sklatk", 70),
   SOUND("sgtatk", 70),
   SOUND("skepch", 70),
   SOUND("vilatk", 70),
-  SOUND("claw",   70),
+  SOUND("claw", 70),
   SOUND("skeswg", 70),
   SOUND("pldeth", 32),
   SOUND("pdiehi", 32),
@@ -189,41 +146,44 @@ sfxinfo_t S_sfx[] =
   SOUND("bspdth", 32),
   SOUND("vildth", 32),
   SOUND("kntdth", 32),
-  SOUND("pedth",  32),
+  SOUND("pedth", 32),
   SOUND("skedth", 32),
   SOUND("posact", 120),
-  SOUND("bgact",  120),
-  SOUND("dmact",  120),
+  SOUND("bgact", 120),
+  SOUND("dmact", 120),
   SOUND("bspact", 100),
   SOUND("bspwlk", 100),
   SOUND("vilact", 100),
-  SOUND("noway",  78),
+  SOUND("noway", 78),
   SOUND("barexp", 60),
-  SOUND("punch",  64),
-  SOUND("hoof",   70),
-  SOUND("metal",  70),
-  SOUND_LINK("chgun", 64, sfx_pistol, 150, 0),
-  SOUND("tink",   60),
-  SOUND("bdopn",  100),
-  SOUND("bdcls",  100),
-  SOUND("itmbk",  100),
-  SOUND("flame",  32),
+  SOUND("punch", 64),
+  SOUND("hoof", 70),
+  SOUND("metal", 70),
+  SOUND_LINK("chgun", 64, SFX_PISTOL, 150, 0),
+  SOUND("tink", 60),
+  SOUND("bdopn", 100),
+  SOUND("bdcls", 100),
+  SOUND("itmbk", 100),
+  SOUND("flame", 32),
   SOUND("flamst", 32),
   SOUND("getpow", 60),
   SOUND("bospit", 70),
   SOUND("boscub", 70),
   SOUND("bossit", 70),
-  SOUND("bospn",  70),
+  SOUND("bospn", 70),
   SOUND("bosdth", 70),
   SOUND("manatk", 70),
   SOUND("mandth", 70),
-  SOUND("sssit",  70),
-  SOUND("ssdth",  70),
+  SOUND("sssit", 70),
+  SOUND("ssdth", 70),
   SOUND("keenpn", 70),
   SOUND("keendt", 70),
   SOUND("skeact", 70),
   SOUND("skesit", 70),
   SOUND("skeatk", 70),
-  SOUND("radio",  60),
+  SOUND("radio", 60),
 };
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/doom/sounds.h b/games/NXDoom/src/doom/sounds.h
index 1e8afc405..a2d9b371f 100644
--- a/games/NXDoom/src/doom/sounds.h
+++ b/games/NXDoom/src/doom/sounds.h
@@ -1,227 +1,241 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Created by the sound utility written by Dave Taylor.
-//	Kept as a sample, DOOM2  sounds. Frozen.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/sounds.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Created by the sound utility written by Dave Taylor.
+ *  Kept as a sample, DOOM2  sounds. Frozen.
+ *
+ ****************************************************************************/
 
 #ifndef __SOUNDS__
 #define __SOUNDS__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "i_sound.h"
 
-// the complete set of sound effects
-extern sfxinfo_t	S_sfx[];
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-// the complete set of music
-extern musicinfo_t	S_music[];
-
-//
-// Identifiers for all music in game.
-//
+/* Identifiers for all music in game. */
 
 typedef enum
 {
-    mus_None,
-    mus_e1m1,
-    mus_e1m2,
-    mus_e1m3,
-    mus_e1m4,
-    mus_e1m5,
-    mus_e1m6,
-    mus_e1m7,
-    mus_e1m8,
-    mus_e1m9,
-    mus_e2m1,
-    mus_e2m2,
-    mus_e2m3,
-    mus_e2m4,
-    mus_e2m5,
-    mus_e2m6,
-    mus_e2m7,
-    mus_e2m8,
-    mus_e2m9,
-    mus_e3m1,
-    mus_e3m2,
-    mus_e3m3,
-    mus_e3m4,
-    mus_e3m5,
-    mus_e3m6,
-    mus_e3m7,
-    mus_e3m8,
-    mus_e3m9,
-    mus_inter,
-    mus_intro,
-    mus_bunny,
-    mus_victor,
-    mus_introa,
-    mus_runnin,
-    mus_stalks,
-    mus_countd,
-    mus_betwee,
-    mus_doom,
-    mus_the_da,
-    mus_shawn,
-    mus_ddtblu,
-    mus_in_cit,
-    mus_dead,
-    mus_stlks2,
-    mus_theda2,
-    mus_doom2,
-    mus_ddtbl2,
-    mus_runni2,
-    mus_dead2,
-    mus_stlks3,
-    mus_romero,
-    mus_shawn2,
-    mus_messag,
-    mus_count2,
-    mus_ddtbl3,
-    mus_ampie,
-    mus_theda3,
-    mus_adrian,
-    mus_messg2,
-    mus_romer2,
-    mus_tense,
-    mus_shawn3,
-    mus_openin,
-    mus_evil,
-    mus_ultima,
-    mus_read_m,
-    mus_dm2ttl,
-    mus_dm2int,
-    NUMMUSIC
+  MUS_NONE,
+  MUS_E1M1,
+  MUS_E1M2,
+  MUS_E1M3,
+  MUS_E1M4,
+  MUS_E1M5,
+  MUS_E1M6,
+  MUS_E1M7,
+  MUS_E1M8,
+  MUS_E1M9,
+  MUS_E2M1,
+  MUS_E2M2,
+  MUS_E2M3,
+  MUS_E2M4,
+  MUS_E2M5,
+  MUS_E2M6,
+  MUS_E2M7,
+  MUS_E2M8,
+  MUS_E2M9,
+  MUS_E3M1,
+  MUS_E3M2,
+  MUS_E3M3,
+  MUS_E3M4,
+  MUS_E3M5,
+  MUS_E3M6,
+  MUS_E3M7,
+  MUS_E3M8,
+  MUS_E3M9,
+  MUS_INTER,
+  MUS_INTRO,
+  MUS_BUNNY,
+  MUS_VICTOR,
+  MUS_INTROA,
+  MUS_RUNNIN,
+  MUS_STALKS,
+  MUS_COUNTD,
+  MUS_BETWEE,
+  MUS_DOOM,
+  MUS_THE_DA,
+  MUS_SHAWN,
+  MUS_DDTBLU,
+  MUS_IN_CIT,
+  MUS_DEAD,
+  MUS_STLKS2,
+  MUS_THEDA2,
+  MUS_DOOM2,
+  MUS_DDTBL2,
+  MUS_RUNNI2,
+  MUS_DEAD2,
+  MUS_STLKS3,
+  MUS_ROMERO,
+  MUS_SHAWN2,
+  MUS_MESSAG,
+  MUS_COUNT2,
+  MUS_DDTBL3,
+  MUS_AMPIE,
+  MUS_THEDA3,
+  MUS_ADRIAN,
+  MUS_MESSG2,
+  MUS_ROMER2,
+  MUS_TENSE,
+  MUS_SHAWN3,
+  MUS_OPENIN,
+  MUS_EVIL,
+  MUS_ULTIMA,
+  MUS_READ_M,
+  MUS_DM2TTL,
+  MUS_DM2INT,
+  MUS_NUMMUSIC
 } musicenum_t;
 
-
-//
-// Identifiers for all sfx in game.
-//
+/* Identifiers for all sfx in game. */
 
 typedef enum
 {
-    sfx_None,
-    sfx_pistol,
-    sfx_shotgn,
-    sfx_sgcock,
-    sfx_dshtgn,
-    sfx_dbopn,
-    sfx_dbcls,
-    sfx_dbload,
-    sfx_plasma,
-    sfx_bfg,
-    sfx_sawup,
-    sfx_sawidl,
-    sfx_sawful,
-    sfx_sawhit,
-    sfx_rlaunc,
-    sfx_rxplod,
-    sfx_firsht,
-    sfx_firxpl,
-    sfx_pstart,
-    sfx_pstop,
-    sfx_doropn,
-    sfx_dorcls,
-    sfx_stnmov,
-    sfx_swtchn,
-    sfx_swtchx,
-    sfx_plpain,
-    sfx_dmpain,
-    sfx_popain,
-    sfx_vipain,
-    sfx_mnpain,
-    sfx_pepain,
-    sfx_slop,
-    sfx_itemup,
-    sfx_wpnup,
-    sfx_oof,
-    sfx_telept,
-    sfx_posit1,
-    sfx_posit2,
-    sfx_posit3,
-    sfx_bgsit1,
-    sfx_bgsit2,
-    sfx_sgtsit,
-    sfx_cacsit,
-    sfx_brssit,
-    sfx_cybsit,
-    sfx_spisit,
-    sfx_bspsit,
-    sfx_kntsit,
-    sfx_vilsit,
-    sfx_mansit,
-    sfx_pesit,
-    sfx_sklatk,
-    sfx_sgtatk,
-    sfx_skepch,
-    sfx_vilatk,
-    sfx_claw,
-    sfx_skeswg,
-    sfx_pldeth,
-    sfx_pdiehi,
-    sfx_podth1,
-    sfx_podth2,
-    sfx_podth3,
-    sfx_bgdth1,
-    sfx_bgdth2,
-    sfx_sgtdth,
-    sfx_cacdth,
-    sfx_skldth,
-    sfx_brsdth,
-    sfx_cybdth,
-    sfx_spidth,
-    sfx_bspdth,
-    sfx_vildth,
-    sfx_kntdth,
-    sfx_pedth,
-    sfx_skedth,
-    sfx_posact,
-    sfx_bgact,
-    sfx_dmact,
-    sfx_bspact,
-    sfx_bspwlk,
-    sfx_vilact,
-    sfx_noway,
-    sfx_barexp,
-    sfx_punch,
-    sfx_hoof,
-    sfx_metal,
-    sfx_chgun,
-    sfx_tink,
-    sfx_bdopn,
-    sfx_bdcls,
-    sfx_itmbk,
-    sfx_flame,
-    sfx_flamst,
-    sfx_getpow,
-    sfx_bospit,
-    sfx_boscub,
-    sfx_bossit,
-    sfx_bospn,
-    sfx_bosdth,
-    sfx_manatk,
-    sfx_mandth,
-    sfx_sssit,
-    sfx_ssdth,
-    sfx_keenpn,
-    sfx_keendt,
-    sfx_skeact,
-    sfx_skesit,
-    sfx_skeatk,
-    sfx_radio,
-    NUMSFX
+  SFX_NONE,
+  SFX_PISTOL,
+  SFX_SHOTGN,
+  SFX_SGCOCK,
+  SFX_DSHTGN,
+  SFX_DBOPN,
+  SFX_DBCLS,
+  SFX_DBLOAD,
+  SFX_PLASMA,
+  SFX_BFG,
+  SFX_SAWUP,
+  SFX_SAWIDL,
+  SFX_SAWFUL,
+  SFX_SAWHIT,
+  SFX_RLAUNC,
+  SFX_RXPLOD,
+  SFX_FIRSHT,
+  SFX_FIRXPL,
+  SFX_PSTART,
+  SFX_PSTOP,
+  SFX_DOROPN,
+  SFX_DORCLS,
+  SFX_STNMOV,
+  SFX_SWTCHN,
+  SFX_SWTCHX,
+  SFX_PLPAIN,
+  SFX_DMPAIN,
+  SFX_POPAIN,
+  SFX_VIPAIN,
+  SFX_MNPAIN,
+  SFX_PEPAIN,
+  SFX_SLOP,
+  SFX_ITEMUP,
+  SFX_WPNUP,
+  SFX_OOF,
+  SFX_TELEPT,
+  SFX_POSIT1,
+  SFX_POSIT2,
+  SFX_POSIT3,
+  SFX_BGSIT1,
+  SFX_BGSIT2,
+  SFX_SGTSIT,
+  SFX_CACSIT,
+  SFX_BRSSIT,
+  SFX_CYBSIT,
+  SFX_SPISIT,
+  SFX_BSPSIT,
+  SFX_KNTSIT,
+  SFX_VILSIT,
+  SFX_MANSIT,
+  SFX_PESIT,
+  SFX_SKLATK,
+  SFX_SGTATK,
+  SFX_SKEPCH,
+  SFX_VILATK,
+  SFX_CLAW,
+  SFX_SKESWG,
+  SFX_PLDETH,
+  SFX_PDIEHI,
+  SFX_PODTH1,
+  SFX_PODTH2,
+  SFX_PODTH3,
+  SFX_BGDTH1,
+  SFX_BGDTH2,
+  SFX_SGTDTH,
+  SFX_CACDTH,
+  SFX_SKLDTH,
+  SFX_BRSDTH,
+  SFX_CYBDTH,
+  SFX_SPIDTH,
+  SFX_BSPDTH,
+  SFX_VILDTH,
+  SFX_KNTDTH,
+  SFX_PEDTH,
+  SFX_SKEDTH,
+  SFX_POSACT,
+  SFX_BGACT,
+  SFX_DMACT,
+  SFX_BSPACT,
+  SFX_BSPWLK,
+  SFX_VILACT,
+  SFX_NOWAY,
+  SFX_BAREXP,
+  SFX_PUNCH,
+  SFX_HOOF,
+  SFX_METAL,
+  SFX_CHGUN,
+  SFX_TINK,
+  SFX_BDOPN,
+  SFX_BDCLS,
+  SFX_ITMBK,
+  SFX_FLAME,
+  SFX_FLAMST,
+  SFX_GETPOW,
+  SFX_BOSPIT,
+  SFX_BOSCUB,
+  SFX_BOSSIT,
+  SFX_BOSPN,
+  SFX_BOSDTH,
+  SFX_MANATK,
+  SFX_MANDTH,
+  SFX_SSSIT,
+  SFX_SSDTH,
+  SFX_KEENPN,
+  SFX_KEENDT,
+  SFX_SKEACT,
+  SFX_SKESIT,
+  SFX_SKEATK,
+  SFX_RADIO,
+  SFX_NUMSFX
 } sfxenum_t;
 
-#endif
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* the complete set of sound effects */
+
+extern sfxinfo_t s_sfx[];
+
+/* the complete set of music */
+
+extern musicinfo_t s_music[];
+
+#endif /* __SOUNDS__ */
diff --git a/games/NXDoom/src/doom/st_lib.c b/games/NXDoom/src/doom/st_lib.c
index 832bb66d3..d8aeda710 100644
--- a/games/NXDoom/src/doom/st_lib.c
+++ b/games/NXDoom/src/doom/st_lib.c
@@ -1,283 +1,238 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The status bar widget code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/st_lib.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  The status bar widget code.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
 
 #include "deh_main.h"
 #include "doomdef.h"
 
-#include "z_zone.h"
 #include "v_video.h"
+#include "z_zone.h"
 
 #include "i_swap.h"
 #include "i_system.h"
 
 #include "w_wad.h"
 
-#include "st_stuff.h"
-#include "st_lib.h"
 #include "r_local.h"
+#include "st_lib.h"
+#include "st_stuff.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-//
-// Hack display negative frags.
-//  Loads and store the stminus lump.
-//
-patch_t*		sttminus;
+/* Hack display negative frags. Loads and store the stminus lump. */
 
-void STlib_init(void)
+patch_t *sttminus;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stlib_draw_num
+ *
+ * Description:
+ *  A fairly efficient way to draw a number based on differences from the old
+ *  number. Note: worth the trouble?
+ *
+ ****************************************************************************/
+
+static void stlib_draw_num(st_number_t *n, boolean refresh)
 {
-    if (W_CheckNumForName(DEH_String("STTMINUS")) >= 0)
-        sttminus = (patch_t *) W_CacheLumpName(DEH_String("STTMINUS"), PU_STATIC);
-    else
-        sttminus = NULL;
-}
+  int numdigits = n->width;
+  int num = *n->num;
 
+  int w = SHORT(n->p[0]->width);
+  int h = SHORT(n->p[0]->height);
+  int x = n->x;
 
-// ?
-void
-STlib_initNum
-( st_number_t*		n,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  boolean*		on,
-  int			width )
-{
-    n->x	= x;
-    n->y	= y;
-    n->oldnum	= 0;
-    n->width	= width;
-    n->num	= num;
-    n->on	= on;
-    n->p	= pl;
-}
+  int neg;
 
+  n->oldnum = *n->num;
 
-// 
-// A fairly efficient way to draw a number
-//  based on differences from the old number.
-// Note: worth the trouble?
-//
-void
-STlib_drawNum
-( st_number_t*	n,
-  boolean	refresh )
-{
+  neg = num < 0;
 
-    int		numdigits = n->width;
-    int		num = *n->num;
-    
-    int		w = SHORT(n->p[0]->width);
-    int		h = SHORT(n->p[0]->height);
-    int		x = n->x;
-    
-    int		neg;
-
-    n->oldnum = *n->num;
-
-    neg = num < 0;
-
-    if (neg)
+  if (neg)
     {
-	if (numdigits == 2 && num < -9)
-	    num = -9;
-	else if (numdigits == 3 && num < -99)
-	    num = -99;
-	
-	num = -num;
+      if (numdigits == 2 && num < -9)
+        num = -9;
+      else if (numdigits == 3 && num < -99)
+        num = -99;
+
+      num = -num;
     }
 
-    // clear the area
-    x = n->x - numdigits*w;
+  /* clear the area */
 
-    if (n->y - ST_Y < 0)
-	I_Error("drawNum: n->y - ST_Y < 0");
+  x = n->x - numdigits * w;
 
-    V_CopyRect(x, n->y - ST_Y, st_backing_screen, w*numdigits, h, x, n->y);
+  if (n->y - ST_Y < 0) i_error("drawNum: n->y - ST_Y < 0");
 
-    // if non-number, do not draw it
-    if (num == 1994)
-	return;
+  v_copy_rect(x, n->y - ST_Y, st_backing_screen, w * numdigits, h, x, n->y);
 
-    x = n->x;
+  if (num == 1994) return; /* if non-number, do not draw it */
 
-    // in the special case of 0, you draw 0
-    if (!num)
-	V_DrawPatch(x - w, n->y, n->p[ 0 ]);
+  x = n->x;
 
-    // draw the new number
-    while (num && numdigits--)
+  /* in the special case of 0, you draw 0 */
+
+  if (!num) v_draw_patch(x - w, n->y, n->p[0]);
+
+  /* draw the new number */
+
+  while (num && numdigits--)
     {
-	x -= w;
-	V_DrawPatch(x, n->y, n->p[ num % 10 ]);
-	num /= 10;
+      x -= w;
+      v_draw_patch(x, n->y, n->p[num % 10]);
+      num /= 10;
     }
 
-    // draw a minus sign if necessary
-    if (neg && sttminus)
-	V_DrawPatch(x - 8, n->y, sttminus);
+  /* draw a minus sign if necessary */
+
+  if (neg && sttminus) v_draw_patch(x - 8, n->y, sttminus);
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-//
-void
-STlib_updateNum
-( st_number_t*		n,
-  boolean		refresh )
+void stlib_init(void)
 {
-    if (*n->on) STlib_drawNum(n, refresh);
+  if (w_check_num_for_name(("STTMINUS")) >= 0)
+    sttminus = (patch_t *)w_cache_lump_name(("STTMINUS"), PU_STATIC);
+  else
+    sttminus = NULL;
 }
 
+/* ? */
 
-//
-void
-STlib_initPercent
-( st_percent_t*		p,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  boolean*		on,
-  patch_t*		percent )
+void stlib_init_num(st_number_t *n, int x, int y, patch_t **pl, int *num,
+                    boolean *on, int width)
 {
-    STlib_initNum(&p->n, x, y, pl, num, on, 3);
-    p->p = percent;
+  n->x = x;
+  n->y = y;
+  n->oldnum = 0;
+  n->width = width;
+  n->num = num;
+  n->on = on;
+  n->p = pl;
 }
 
-
-
-
-void
-STlib_updatePercent
-( st_percent_t*		per,
-  int			refresh )
+void stlib_update_num(st_number_t *n, boolean refresh)
 {
-    if (refresh && *per->n.on)
-	V_DrawPatch(per->n.x, per->n.y, per->p);
-    
-    STlib_updateNum(&per->n, refresh);
+  if (*n->on) stlib_draw_num(n, refresh);
 }
 
-
-
-void
-STlib_initMultIcon
-( st_multicon_t*	i,
-  int			x,
-  int			y,
-  patch_t**		il,
-  int*			inum,
-  boolean*		on )
+void stlib_init_percent(st_percent_t *p, int x, int y, patch_t **pl,
+        int *num, boolean *on, patch_t *percent)
 {
-    i->x	= x;
-    i->y	= y;
-    i->oldinum 	= -1;
-    i->inum	= inum;
-    i->on	= on;
-    i->p	= il;
+  stlib_init_num(&p->n, x, y, pl, num, on, 3);
+  p->p = percent;
 }
 
-
-
-void
-STlib_updateMultIcon
-( st_multicon_t*	mi,
-  boolean		refresh )
+void stlib_update_percent(st_percent_t *per, int refresh)
 {
-    int			w;
-    int			h;
-    int			x;
-    int			y;
+  if (refresh && *per->n.on) v_draw_patch(per->n.x, per->n.y, per->p);
 
-    if (*mi->on
-	&& (mi->oldinum != *mi->inum || refresh)
-	&& (*mi->inum!=-1))
+  stlib_update_num(&per->n, refresh);
+}
+
+void stlib_init_mutl_icon(st_multicon_t *i, int x, int y, patch_t **il,
+                          int *inum, boolean *on)
+{
+  i->x = x;
+  i->y = y;
+  i->oldinum = -1;
+  i->inum = inum;
+  i->on = on;
+  i->p = il;
+}
+
+void stlib_update_mult_icon(st_multicon_t *mi, boolean refresh)
+{
+  int w;
+  int h;
+  int x;
+  int y;
+
+  if (*mi->on && (mi->oldinum != *mi->inum || refresh) && (*mi->inum != -1))
     {
-	if (mi->oldinum != -1)
-	{
-	    x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
-	    y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
-	    w = SHORT(mi->p[mi->oldinum]->width);
-	    h = SHORT(mi->p[mi->oldinum]->height);
+      if (mi->oldinum != -1)
+        {
+          x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
+          y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
+          w = SHORT(mi->p[mi->oldinum]->width);
+          h = SHORT(mi->p[mi->oldinum]->height);
 
-	    if (y - ST_Y < 0)
-		I_Error("updateMultIcon: y - ST_Y < 0");
+          if (y - ST_Y < 0) i_error("updateMultIcon: y - ST_Y < 0");
 
-	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
-	}
-	V_DrawPatch(mi->x, mi->y, mi->p[*mi->inum]);
-	mi->oldinum = *mi->inum;
+          v_copy_rect(x, y - ST_Y, st_backing_screen, w, h, x, y);
+        }
+
+      v_draw_patch(mi->x, mi->y, mi->p[*mi->inum]);
+      mi->oldinum = *mi->inum;
     }
 }
 
-
-
-void
-STlib_initBinIcon
-( st_binicon_t*		b,
-  int			x,
-  int			y,
-  patch_t*		i,
-  boolean*		val,
-  boolean*		on )
+void stlib_init_bin_icon(st_binicon_t *b, int x, int y, patch_t *i,
+                         boolean *val, boolean *on)
 {
-    b->x	= x;
-    b->y	= y;
-    b->oldval	= false;
-    b->val	= val;
-    b->on	= on;
-    b->p	= i;
+  b->x = x;
+  b->y = y;
+  b->oldval = false;
+  b->val = val;
+  b->on = on;
+  b->p = i;
 }
 
-
-
-void
-STlib_updateBinIcon
-( st_binicon_t*		bi,
-  boolean		refresh )
+void stlib_update_bin_icon(st_binicon_t *bi, boolean refresh)
 {
-    int			x;
-    int			y;
-    int			w;
-    int			h;
+  int x;
+  int y;
+  int w;
+  int h;
 
-    if (*bi->on
-     && (bi->oldval != *bi->val || refresh))
+  if (*bi->on && (bi->oldval != *bi->val || refresh))
     {
-	x = bi->x - SHORT(bi->p->leftoffset);
-	y = bi->y - SHORT(bi->p->topoffset);
-	w = SHORT(bi->p->width);
-	h = SHORT(bi->p->height);
+      x = bi->x - SHORT(bi->p->leftoffset);
+      y = bi->y - SHORT(bi->p->topoffset);
+      w = SHORT(bi->p->width);
+      h = SHORT(bi->p->height);
 
-	if (y - ST_Y < 0)
-	    I_Error("updateBinIcon: y - ST_Y < 0");
+      if (y - ST_Y < 0) i_error("updateBinIcon: y - ST_Y < 0");
 
-	if (*bi->val)
-	    V_DrawPatch(bi->x, bi->y, bi->p);
-	else
-	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
+      if (*bi->val)
+        v_draw_patch(bi->x, bi->y, bi->p);
+      else
+        v_copy_rect(x, y - ST_Y, st_backing_screen, w, h, x, y);
 
-	bi->oldval = *bi->val;
+      bi->oldval = *bi->val;
     }
-
 }
-
diff --git a/games/NXDoom/src/doom/st_lib.h b/games/NXDoom/src/doom/st_lib.h
index 3a8f52125..b1fa3867b 100644
--- a/games/NXDoom/src/doom/st_lib.h
+++ b/games/NXDoom/src/doom/st_lib.h
@@ -1,209 +1,187 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// 	The status bar widget code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/st_lib.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  The status bar widget code.
+ *
+ ****************************************************************************/
 
 #ifndef __STLIB__
 #define __STLIB__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* We are referring to patches. */
 
-// We are referring to patches.
 #include "r_defs.h"
 
-//
-// Typedefs of widgets
-//
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-// Number widget
+/* Typedefs of widgets */
+
+/* Number widget */
 
 typedef struct
 {
-    // upper right-hand corner
-    //  of the number (right-justified)
-    int		x;
-    int		y;
+  /* upper right-hand corner of the number (right-justified)
+   */
 
-    // max # of digits in number
-    int width;    
+  int x;
+  int y;
 
-    // last number value
-    int		oldnum;
-    
-    // pointer to current value
-    int*	num;
+  /* max # of digits in number */
 
-    // pointer to boolean stating
-    //  whether to update number
-    boolean*	on;
+  int width;
 
-    // list of patches for 0-9
-    patch_t**	p;
+  /* last number value */
 
-    // user data
-    int data;
-    
+  int oldnum;
+
+  /* pointer to current value */
+
+  int *num;
+
+  /* pointer to boolean stating whether to update number */
+
+  boolean *on;
+
+  /* list of patches for 0-9 */
+
+  patch_t **p;
+
+  /* user data */
+
+  int data;
 } st_number_t;
 
+/* Percent widget ("child" of number widget, or, more precisely, contains a
+ * number widget.)
+ */
 
-
-// Percent widget ("child" of number widget,
-//  or, more precisely, contains a number widget.)
 typedef struct
 {
-    // number information
-    st_number_t		n;
+  /* number information */
 
-    // percent sign graphic
-    patch_t*		p;
-    
+  st_number_t n;
+
+  /* percent sign graphic */
+
+  patch_t *p;
 } st_percent_t;
 
+/* Multiple Icon widget */
 
-
-// Multiple Icon widget
 typedef struct
 {
-     // center-justified location of icons
-    int			x;
-    int			y;
+  /* center-justified location of icons */
 
-    // last icon number
-    int			oldinum;
+  int x;
+  int y;
 
-    // pointer to current icon
-    int*		inum;
+  /* last icon number */
 
-    // pointer to boolean stating
-    //  whether to update icon
-    boolean*		on;
+  int oldinum;
 
-    // list of icons
-    patch_t**		p;
-    
-    // user data
-    int			data;
-    
+  /* pointer to current icon */
+
+  int *inum;
+
+  /* pointer to boolean stating whether to update icon */
+
+  boolean *on;
+
+  /* list of icons */
+
+  patch_t **p;
+
+  /* user data */
+
+  int data;
 } st_multicon_t;
 
-
-
-
-// Binary Icon widget
+/* Binary Icon widget */
 
 typedef struct
 {
-    // center-justified location of icon
-    int			x;
-    int			y;
+  /* center-justified location of icon */
 
-    // last icon value
-    boolean		oldval;
+  int x;
+  int y;
 
-    // pointer to current icon status
-    boolean*		val;
+  /* last icon value */
 
-    // pointer to boolean
-    //  stating whether to update icon
-    boolean*		on;  
+  boolean oldval;
 
+  /* pointer to current icon status */
 
-    patch_t*		p;	// icon
-    int			data;   // user data
-    
+  boolean *val;
+
+  /* pointer to boolean stating whether to update icon */
+
+  boolean *on;
+
+  patch_t *p; /* icon */
+  int data;   /* user data */
 } st_binicon_t;
 
+/* Widget creation, access, and update routines */
 
+/* Initializes widget library.
+ * More precisely, initialize STMINUS,
+ *  everything else is done somewhere else.
+ */
 
-//
-// Widget creation, access, and update routines
-//
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Initializes widget library.
-// More precisely, initialize STMINUS,
-//  everything else is done somewhere else.
-//
-void STlib_init(void);
+void stlib_init(void);
 
+/* Number widget routines */
 
+void stlib_init_num(st_number_t *n, int x, int y, patch_t **pl, int *num,
+                    boolean *on, int width);
 
-// Number widget routines
-void
-STlib_initNum
-( st_number_t*		n,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  boolean*		on,
-  int			width );
+void stlib_update_num(st_number_t *n, boolean refresh);
 
-void
-STlib_updateNum
-( st_number_t*		n,
-  boolean		refresh );
+/* Percent widget routines */
 
+void stlib_init_percent(st_percent_t *p, int x, int y, patch_t **pl,
+        int *num, boolean *on, patch_t *percent);
 
-// Percent widget routines
-void
-STlib_initPercent
-( st_percent_t*		p,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  boolean*		on,
-  patch_t*		percent );
+void stlib_update_percent(st_percent_t *per, int refresh);
 
+/* Multiple Icon widget routines */
 
-void
-STlib_updatePercent
-( st_percent_t*		per,
-  int			refresh );
+void stlib_init_mutl_icon(st_multicon_t *mi, int x, int y, patch_t **il,
+                          int *inum, boolean *on);
 
+void stlib_update_mult_icon(st_multicon_t *mi, boolean refresh);
 
-// Multiple Icon widget routines
-void
-STlib_initMultIcon
-( st_multicon_t*	mi,
-  int			x,
-  int			y,
-  patch_t**		il,
-  int*			inum,
-  boolean*		on );
+/* Binary Icon widget routines */
 
+void stlib_init_bin_icon(st_binicon_t *b, int x, int y, patch_t *i,
+                         boolean *val, boolean *on);
 
-void
-STlib_updateMultIcon
-( st_multicon_t*	mi,
-  boolean		refresh );
+void stlib_update_bin_icon(st_binicon_t *bi, boolean refresh);
 
-// Binary Icon widget routines
-
-void
-STlib_initBinIcon
-( st_binicon_t*		b,
-  int			x,
-  int			y,
-  patch_t*		i,
-  boolean*		val,
-  boolean*		on );
-
-void
-STlib_updateBinIcon
-( st_binicon_t*		bi,
-  boolean		refresh );
-
-#endif
+#endif /* __STLIB__ */
diff --git a/games/NXDoom/src/doom/st_stuff.c b/games/NXDoom/src/doom/st_stuff.c
index da9b8bcf8..7a133b33c 100644
--- a/games/NXDoom/src/doom/st_stuff.c
+++ b/games/NXDoom/src/doom/st_stuff.c
@@ -1,34 +1,41 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Status bar code.
-//	Does the face/direction indicator animatin.
-//	Does palette indicators as well (red pain/berserk, bright pickup)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/st_stuff.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Status bar code.
+ *  Does the face/direction indicator animating.
+ *  Does palette indicators as well (red pain/berserk, bright pickup)
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
 
 #include "i_system.h"
 #include "i_video.h"
-#include "z_zone.h"
 #include "m_misc.h"
 #include "m_random.h"
 #include "w_wad.h"
+#include "z_zone.h"
 
 #include "deh_main.h"
 #include "deh_misc.h"
@@ -37,280 +44,354 @@
 
 #include "g_game.h"
 
-#include "st_stuff.h"
-#include "st_lib.h"
 #include "r_local.h"
+#include "st_lib.h"
+#include "st_stuff.h"
 
-#include "p_local.h"
 #include "p_inter.h"
+#include "p_local.h"
 
 #include "am_map.h"
 #include "m_cheat.h"
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
+
+/* Needs access to LFB. */
 
-// Needs access to LFB.
 #include "v_video.h"
 
-// State.
+/* State. */
+
 #include "doomstat.h"
 
-// Data.
+/* Data. */
+
 #include "dstrings.h"
-#include "sounds.h"
 
-//
-// STATUS BAR DATA
-//
+/* STATUS BAR DATA */
 
+/* Palette indices.
+ * For damage/bonus red-/gold-shifts
+ */
 
-// Palette indices.
-// For damage/bonus red-/gold-shifts
-#define STARTREDPALS		1
-#define STARTBONUSPALS		9
-#define NUMREDPALS			8
-#define NUMBONUSPALS		4
-// Radiation suit, green shift.
-#define RADIATIONPAL		13
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Location of status bar
-#define ST_X				0
-#define ST_X2				104
+#define STARTREDPALS 1
+#define STARTBONUSPALS 9
+#define NUMREDPALS 8
+#define NUMBONUSPALS 4
 
-#define ST_FX  			143
-#define ST_FY  			169
+/* Radiation suit, green shift. */
 
-// Number of status faces.
-#define ST_NUMPAINFACES		5
-#define ST_NUMSTRAIGHTFACES	3
-#define ST_NUMTURNFACES		2
-#define ST_NUMSPECIALFACES		3
+#define RADIATIONPAL 13
 
-#define ST_FACESTRIDE \
-          (ST_NUMSTRAIGHTFACES+ST_NUMTURNFACES+ST_NUMSPECIALFACES)
+/* Location of status bar */
 
-#define ST_NUMEXTRAFACES		2
+#define ST_X 0
+#define ST_X2 104
 
-#define ST_NUMFACES \
-          (ST_FACESTRIDE*ST_NUMPAINFACES+ST_NUMEXTRAFACES)
+#define ST_FX 143
+#define ST_FY 169
 
-#define ST_TURNOFFSET		(ST_NUMSTRAIGHTFACES)
-#define ST_OUCHOFFSET		(ST_TURNOFFSET + ST_NUMTURNFACES)
-#define ST_EVILGRINOFFSET		(ST_OUCHOFFSET + 1)
-#define ST_RAMPAGEOFFSET		(ST_EVILGRINOFFSET + 1)
-#define ST_GODFACE			(ST_NUMPAINFACES*ST_FACESTRIDE)
-#define ST_DEADFACE			(ST_GODFACE+1)
+/* Number of status faces. */
 
-#define ST_FACESX			143
-#define ST_FACESY			168
+#define ST_NUMPAINFACES 5
+#define ST_NUMSTRAIGHTFACES 3
+#define ST_NUMTURNFACES 2
+#define ST_NUMSPECIALFACES 3
 
-#define ST_EVILGRINCOUNT		(2*TICRATE)
-#define ST_STRAIGHTFACECOUNT	(TICRATE/2)
-#define ST_TURNCOUNT		(1*TICRATE)
-#define ST_OUCHCOUNT		(1*TICRATE)
-#define ST_RAMPAGEDELAY		(2*TICRATE)
+#define ST_FACESTRIDE                                                        \
+  (ST_NUMSTRAIGHTFACES + ST_NUMTURNFACES + ST_NUMSPECIALFACES)
 
-#define ST_MUCHPAIN			20
+#define ST_NUMEXTRAFACES 2
 
+#define ST_NUMFACES (ST_FACESTRIDE * ST_NUMPAINFACES + ST_NUMEXTRAFACES)
 
-// Location and size of statistics,
-//  justified according to widget type.
-// Problem is, within which space? STbar? Screen?
-// Note: this could be read in by a lump.
-//       Problem is, is the stuff rendered
-//       into a buffer,
-//       or into the frame buffer?
+#define ST_TURNOFFSET (ST_NUMSTRAIGHTFACES)
+#define ST_OUCHOFFSET (ST_TURNOFFSET + ST_NUMTURNFACES)
+#define ST_EVILGRINOFFSET (ST_OUCHOFFSET + 1)
+#define ST_RAMPAGEOFFSET (ST_EVILGRINOFFSET + 1)
+#define ST_GODFACE (ST_NUMPAINFACES * ST_FACESTRIDE)
+#define ST_DEADFACE (ST_GODFACE + 1)
 
-// AMMO number pos.
-#define ST_AMMOWIDTH		3	
-#define ST_AMMOX			44
-#define ST_AMMOY			171
+#define ST_FACESX 143
+#define ST_FACESY 168
 
-// HEALTH number pos.
-#define ST_HEALTHWIDTH		3	
-#define ST_HEALTHX			90
-#define ST_HEALTHY			171
+#define ST_EVILGRINCOUNT (2 * TICRATE)
+#define ST_STRAIGHTFACECOUNT (TICRATE / 2)
+#define ST_TURNCOUNT (1 * TICRATE)
+#define ST_OUCHCOUNT (1 * TICRATE)
+#define ST_RAMPAGEDELAY (2 * TICRATE)
 
-// Weapon pos.
-#define ST_ARMSX			111
-#define ST_ARMSY			172
-#define ST_ARMSBGX			104
-#define ST_ARMSBGY			168
-#define ST_ARMSXSPACE		12
-#define ST_ARMSYSPACE		10
+#define ST_MUCHPAIN 20
 
-// Frags pos.
-#define ST_FRAGSX			138
-#define ST_FRAGSY			171	
-#define ST_FRAGSWIDTH		2
+/* Location and size of statistics,
+ *  justified according to widget type.
+ * Problem is, within which space? STbar? Screen?
+ * Note: this could be read in by a lump.
+ *       Problem is, is the stuff rendered
+ *       into a buffer,
+ *       or into the frame buffer?
+ */
 
-// ARMOR number pos.
-#define ST_ARMORWIDTH		3
-#define ST_ARMORX			221
-#define ST_ARMORY			171
+/* AMMO number pos. */
 
-// Key icon positions.
-#define ST_KEY0WIDTH		8
-#define ST_KEY0HEIGHT		5
-#define ST_KEY0X			239
-#define ST_KEY0Y			171
-#define ST_KEY1WIDTH		ST_KEY0WIDTH
-#define ST_KEY1X			239
-#define ST_KEY1Y			181
-#define ST_KEY2WIDTH		ST_KEY0WIDTH
-#define ST_KEY2X			239
-#define ST_KEY2Y			191
+#define ST_AMMOWIDTH 3
+#define ST_AMMOX 44
+#define ST_AMMOY 171
 
-// Ammunition counter.
-#define ST_AMMO0WIDTH		3
-#define ST_AMMO0HEIGHT		6
-#define ST_AMMO0X			288
-#define ST_AMMO0Y			173
-#define ST_AMMO1WIDTH		ST_AMMO0WIDTH
-#define ST_AMMO1X			288
-#define ST_AMMO1Y			179
-#define ST_AMMO2WIDTH		ST_AMMO0WIDTH
-#define ST_AMMO2X			288
-#define ST_AMMO2Y			191
-#define ST_AMMO3WIDTH		ST_AMMO0WIDTH
-#define ST_AMMO3X			288
-#define ST_AMMO3Y			185
+/* HEALTH number pos. */
 
-// Indicate maximum ammunition.
-// Only needed because backpack exists.
-#define ST_MAXAMMO0WIDTH		3
-#define ST_MAXAMMO0HEIGHT		5
-#define ST_MAXAMMO0X		314
-#define ST_MAXAMMO0Y		173
-#define ST_MAXAMMO1WIDTH		ST_MAXAMMO0WIDTH
-#define ST_MAXAMMO1X		314
-#define ST_MAXAMMO1Y		179
-#define ST_MAXAMMO2WIDTH		ST_MAXAMMO0WIDTH
-#define ST_MAXAMMO2X		314
-#define ST_MAXAMMO2Y		191
-#define ST_MAXAMMO3WIDTH		ST_MAXAMMO0WIDTH
-#define ST_MAXAMMO3X		314
-#define ST_MAXAMMO3Y		185
+#define ST_HEALTHWIDTH 3
+#define ST_HEALTHX 90
+#define ST_HEALTHY 171
 
-// Dimensions given in characters.
-#define ST_MSGWIDTH			52
+/* Weapon pos. */
 
-// graphics are drawn to a backing screen and blitted to the real screen
-pixel_t			*st_backing_screen;
-	    
-// main player in game
-static player_t*	plyr; 
+#define ST_ARMSX 111
+#define ST_ARMSY 172
+#define ST_ARMSBGX 104
+#define ST_ARMSBGY 168
+#define ST_ARMSXSPACE 12
+#define ST_ARMSYSPACE 10
 
-// ST_Start() has just been called
-static boolean		st_firsttime;
+/* Frags pos. */
 
-// lump number for PLAYPAL
-static int		lu_palette;
+#define ST_FRAGSX 138
+#define ST_FRAGSY 171
+#define ST_FRAGSWIDTH 2
 
-// used for making messages go away
-static int		st_msgcounter=0;
+/* ARMOR number pos. */
 
-// whether left-side main status bar is active
-static boolean		st_statusbaron;
+#define ST_ARMORWIDTH 3
+#define ST_ARMORX 221
+#define ST_ARMORY 171
 
-// whether status bar chat is active
-static boolean		st_chat;
+/* Key icon positions. */
 
-// value of st_chat before message popped up
-static boolean		st_oldchat;
+#define ST_KEY0WIDTH 8
+#define ST_KEY0HEIGHT 5
+#define ST_KEY0X 239
+#define ST_KEY0Y 171
+#define ST_KEY1WIDTH ST_KEY0WIDTH
+#define ST_KEY1X 239
+#define ST_KEY1Y 181
+#define ST_KEY2WIDTH ST_KEY0WIDTH
+#define ST_KEY2X 239
+#define ST_KEY2Y 191
 
-// !deathmatch
-static boolean		st_notdeathmatch; 
+/* Ammunition counter. */
 
-// !deathmatch && st_statusbaron
-static boolean		st_armson;
+#define ST_AMMO0WIDTH 3
+#define ST_AMMO0HEIGHT 6
+#define ST_AMMO0X 288
+#define ST_AMMO0Y 173
+#define ST_AMMO1WIDTH ST_AMMO0WIDTH
+#define ST_AMMO1X 288
+#define ST_AMMO1Y 179
+#define ST_AMMO2WIDTH ST_AMMO0WIDTH
+#define ST_AMMO2X 288
+#define ST_AMMO2Y 191
+#define ST_AMMO3WIDTH ST_AMMO0WIDTH
+#define ST_AMMO3X 288
+#define ST_AMMO3Y 185
 
-// !deathmatch
-static boolean		st_fragson; 
+/* Indicate maximum ammunition.
+ * Only needed because backpack exists.
+ */
 
-// main bar left
-static patch_t*		sbar;
+#define ST_MAXAMMO0WIDTH 3
+#define ST_MAXAMMO0HEIGHT 5
+#define ST_MAXAMMO0X 314
+#define ST_MAXAMMO0Y 173
+#define ST_MAXAMMO1WIDTH ST_MAXAMMO0WIDTH
+#define ST_MAXAMMO1X 314
+#define ST_MAXAMMO1Y 179
+#define ST_MAXAMMO2WIDTH ST_MAXAMMO0WIDTH
+#define ST_MAXAMMO2X 314
+#define ST_MAXAMMO2Y 191
+#define ST_MAXAMMO3WIDTH ST_MAXAMMO0WIDTH
+#define ST_MAXAMMO3X 314
+#define ST_MAXAMMO3Y 185
 
-// main bar right, for doom 1.0
-static patch_t*		sbarr;
+/* Dimensions given in characters. */
 
-// 0-9, tall numbers
-static patch_t*		tallnum[10];
+#define ST_MSGWIDTH 52
 
-// tall % sign
-static patch_t*		tallpercent;
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-// 0-9, short, yellow (,different!) numbers
-static patch_t*		shortnum[10];
+typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
 
-// 3 key-cards, 3 skulls
-static patch_t*		keys[NUMCARDS]; 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-// face status patches
-static patch_t*		faces[ST_NUMFACES];
+/* main player in game */
 
-// face background
-static patch_t*		faceback;
+static player_t *plyr;
 
- // main bar right
-static patch_t*		armsbg;
+/* st_start() has just been called */
 
-// weapon ownership patches
-static patch_t*		arms[6][2]; 
+static boolean st_firsttime;
 
-// ready-weapon widget
-static st_number_t	w_ready;
+/* lump number for PLAYPAL */
 
- // in deathmatch only, summary of frags stats
-static st_number_t	w_frags;
+static int lu_palette;
 
-// health widget
-static st_percent_t	w_health;
+/* used for making messages go away */
 
-// arms background
-static st_binicon_t	w_armsbg; 
+static int st_msgcounter = 0;
 
+/* whether left-side main status bar is active */
 
-// weapon ownership widgets
-static st_multicon_t	w_arms[6];
+static boolean st_statusbaron;
 
-// face status widget
-static st_multicon_t	w_faces; 
+/* whether status bar chat is active */
 
-// keycard widgets
-static st_multicon_t	w_keyboxes[3];
+static boolean st_chat;
 
-// armor widget
-static st_percent_t	w_armor;
+/* value of st_chat before message popped up */
 
-// ammo widgets
-static st_number_t	w_ammo[4];
+static boolean st_oldchat;
 
-// max ammo widgets
-static st_number_t	w_maxammo[4]; 
+/* !deathmatch */
 
+static boolean st_notdeathmatch;
 
+/* !deathmatch && st_statusbaron */
 
- // number of frags so far in deathmatch
-static int	st_fragscount;
+static boolean st_armson;
 
-// used to use appopriately pained face
-static int	st_oldhealth = -1;
+/* !deathmatch */
 
-// used for evil grin
-static boolean	oldweaponsowned[NUMWEAPONS]; 
+static boolean st_fragson;
 
- // count until face changes
-static int	st_facecount = 0;
+/* main bar left */
 
-// current face index, used by w_faces
-static int	st_faceindex = 0;
+static patch_t *sbar;
 
-// holds key-type for each key box on bar
-static int	keyboxes[3]; 
+/* main bar right, for doom 1.0 */
 
-// a random number per tick
-static int	st_randomnumber;  
+static patch_t *sbarr;
+
+/* 0-9, tall numbers */
+
+static patch_t *tallnum[10];
+
+/* tall % sign */
+
+static patch_t *tallpercent;
+
+/* 0-9, short, yellow (,different!) numbers */
+
+static patch_t *shortnum[10];
+
+/* 3 key-cards, 3 skulls */
+
+static patch_t *keys[NUMCARDS];
+
+/* face status patches */
+
+static patch_t *faces[ST_NUMFACES];
+
+/* face background */
+
+static patch_t *faceback;
+
+/* main bar right */
+
+static patch_t *armsbg;
+
+/* weapon ownership patches */
+
+static patch_t *arms[6][2];
+
+/* ready-weapon widget */
+
+static st_number_t w_ready;
+
+/* in deathmatch only, summary of frags stats */
+
+static st_number_t w_frags;
+
+/* health widget */
+
+static st_percent_t w_health;
+
+/* arms background */
+
+static st_binicon_t w_armsbg;
+
+/* weapon ownership widgets */
+
+static st_multicon_t w_arms[6];
+
+/* face status widget */
+
+static st_multicon_t w_faces;
+
+/* keycard widgets */
+
+static st_multicon_t w_keyboxes[3];
+
+/* armor widget */
+
+static st_percent_t w_armor;
+
+/* ammo widgets */
+
+static st_number_t w_ammo[4];
+
+/* max ammo widgets */
+
+static st_number_t w_maxammo[4];
+
+/* number of frags so far in deathmatch */
+
+static int st_fragscount;
+
+/* used to use appropriately pained face */
+
+static int st_oldhealth = -1;
+
+/* used for evil grin */
+
+static boolean oldweaponsowned[NUMWEAPONS];
+
+/* count until face changes */
+
+static int st_facecount = 0;
+
+/* current face index, used by w_faces */
+
+static int st_faceindex = 0;
+
+/* holds key-type for each key box on bar */
+
+static int keyboxes[3];
+
+/* a random number per tick */
+
+static int st_randomnumber;
+
+static int st_palette = 0;
+
+static boolean st_stopped = true;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* graphics are drawn to a backing screen and blitted to the real screen */
+
+pixel_t *st_backing_screen;
 
 cheatseq_t cheat_mus = CHEAT("idmus", 2);
 cheatseq_t cheat_god = CHEAT("iddqd", 0);
@@ -319,1049 +400,1017 @@ cheatseq_t cheat_ammonokey = CHEAT("idfa", 0);
 cheatseq_t cheat_noclip = CHEAT("idspispopd", 0);
 cheatseq_t cheat_commercial_noclip = CHEAT("idclip", 0);
 
-cheatseq_t	cheat_powerup[7] =
+cheatseq_t cheat_powerup[7] =
 {
-    CHEAT("idbeholdv", 0),
-    CHEAT("idbeholds", 0),
-    CHEAT("idbeholdi", 0),
-    CHEAT("idbeholdr", 0),
-    CHEAT("idbeholda", 0),
-    CHEAT("idbeholdl", 0),
-    CHEAT("idbehold", 0),
+  CHEAT("idbeholdv", 0), CHEAT("idbeholds", 0), CHEAT("idbeholdi", 0),
+  CHEAT("idbeholdr", 0), CHEAT("idbeholda", 0), CHEAT("idbeholdl", 0),
+  CHEAT("idbehold", 0),
 };
 
 cheatseq_t cheat_choppers = CHEAT("idchoppers", 0);
 cheatseq_t cheat_clev = CHEAT("idclev", 2);
 cheatseq_t cheat_mypos = CHEAT("idmypos", 0);
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-//
-// STATUS BAR CODE
-//
-void ST_Stop(void);
-
-void ST_refreshBackground(void)
+static void st_stop(void)
 {
+  if (st_stopped) return;
 
-    if (st_statusbaron)
-    {
-        V_UseBuffer(st_backing_screen);
-
-	V_DrawPatch(ST_X, 0, sbar);
-
-	// draw right side of bar if needed (Doom 1.0)
-	if (sbarr)
-	    V_DrawPatch(ST_ARMSBGX, 0, sbarr);
-
-	if (netgame)
-	    V_DrawPatch(ST_FX, 0, faceback);
-
-        V_RestoreBuffer();
-
-	V_CopyRect(ST_X, 0, st_backing_screen, ST_WIDTH, ST_HEIGHT, ST_X, ST_Y);
-    }
-
+  i_set_palette(w_cache_lump_num(lu_palette, PU_CACHE));
+  st_stopped = true;
 }
 
-
-// Respond to keyboard input events,
-//  intercept cheats.
-boolean
-ST_Responder (event_t* ev)
+static void st_refresh_background(void)
 {
-  int		i;
-    
-  // Filter automap on/off.
-  if (ev->type == ev_keyup
-      && ((ev->data1 & 0xffff0000) == AM_MSGHEADER))
-  {
-    switch(ev->data1)
+  if (st_statusbaron)
     {
-      case AM_MSGENTERED:
-	st_firsttime = true;
-	break;
-	
-      case AM_MSGEXITED:
-	//	fprintf(stderr, "AM exited\n");
-	break;
+      v_use_buffer(st_backing_screen);
+
+      v_draw_patch(ST_X, 0, sbar);
+
+      /* draw right side of bar if needed (Doom 1.0) */
+
+      if (sbarr) v_draw_patch(ST_ARMSBGX, 0, sbarr);
+
+      if (netgame) v_draw_patch(ST_FX, 0, faceback);
+
+      v_restore_buffer();
+
+      v_copy_rect(ST_X, 0, st_backing_screen, ST_WIDTH, ST_HEIGHT, ST_X,
+                  ST_Y);
     }
-  }
+}
 
-  // if a user keypress...
-  else if (ev->type == ev_keydown)
-  {
-    if (!netgame && gameskill != sk_nightmare)
+static int st_calc_paint_offset(void)
+{
+  int health;
+  static int lastcalc;
+  static int oldhealth = -1;
+
+  health = plyr->health > 100 ? 100 : plyr->health;
+
+  if (health != oldhealth)
     {
-      // 'dqd' cheat for toggleable god mode
-      if (cht_CheckCheat(&cheat_god, ev->data2))
-      {
-	plyr->cheats ^= CF_GODMODE;
-	if (plyr->cheats & CF_GODMODE)
-	{
-	  if (plyr->mo)
-	    plyr->mo->health = deh_god_mode_health;
-	  
-	  plyr->health = deh_god_mode_health;
-	  plyr->message = DEH_String(STSTR_DQDON);
-	}
-	else 
-	  plyr->message = DEH_String(STSTR_DQDOFF);
-      }
-      // 'fa' cheat for killer fucking arsenal
-      else if (cht_CheckCheat(&cheat_ammonokey, ev->data2))
-      {
-	plyr->armorpoints = deh_idfa_armor;
-	plyr->armortype = deh_idfa_armor_class;
-	
-	for (i=0;i<NUMWEAPONS;i++)
-	  plyr->weaponowned[i] = true;
-	
-	for (i=0;i<NUMAMMO;i++)
-	  plyr->ammo[i] = plyr->maxammo[i];
-	
-	plyr->message = DEH_String(STSTR_FAADDED);
-      }
-      // 'kfa' cheat for key full ammo
-      else if (cht_CheckCheat(&cheat_ammo, ev->data2))
-      {
-	plyr->armorpoints = deh_idkfa_armor;
-	plyr->armortype = deh_idkfa_armor_class;
-	
-	for (i=0;i<NUMWEAPONS;i++)
-	  plyr->weaponowned[i] = true;
-	
-	for (i=0;i<NUMAMMO;i++)
-	  plyr->ammo[i] = plyr->maxammo[i];
-	
-	for (i=0;i<NUMCARDS;i++)
-	  plyr->cards[i] = true;
-	
-	plyr->message = DEH_String(STSTR_KFAADDED);
-      }
-      // 'mus' cheat for changing music
-      else if (cht_CheckCheat(&cheat_mus, ev->data2))
-      {
-	
-	char	buf[3];
-	int		musnum;
-	
-	plyr->message = DEH_String(STSTR_MUS);
-	cht_GetParam(&cheat_mus, buf);
-
-        // Note: The original v1.9 had a bug that tried to play back
-        // the Doom II music regardless of gamemode.  This was fixed
-        // in the Ultimate Doom executable so that it would work for
-        // the Doom 1 music as well.
-
-	if (gamemode == commercial || gameversion < exe_ultimate)
-	{
-	  musnum = mus_runnin + (buf[0]-'0')*10 + buf[1]-'0' - 1;
-	  
-	  if (((buf[0]-'0')*10 + buf[1]-'0') > 35
-       && gameversion >= exe_doom_1_8)
-	    plyr->message = DEH_String(STSTR_NOMUS);
-	  else
-	    S_ChangeMusic(musnum, 1);
-	}
-	else
-	{
-	  musnum = mus_e1m1 + (buf[0]-'1')*9 + (buf[1]-'1');
-	  
-	  if (((buf[0]-'1')*9 + buf[1]-'1') > 31)
-	    plyr->message = DEH_String(STSTR_NOMUS);
-	  else
-	    S_ChangeMusic(musnum, 1);
-	}
-      }
-      else if ( (logical_gamemission == doom 
-                 && cht_CheckCheat(&cheat_noclip, ev->data2))
-             || (logical_gamemission != doom 
-                 && cht_CheckCheat(&cheat_commercial_noclip,ev->data2)))
-      {	
-        // Noclip cheat.
-        // For Doom 1, use the idspipsopd cheat; for all others, use
-        // idclip
-
-	plyr->cheats ^= CF_NOCLIP;
-	
-	if (plyr->cheats & CF_NOCLIP)
-	  plyr->message = DEH_String(STSTR_NCON);
-	else
-	  plyr->message = DEH_String(STSTR_NCOFF);
-      }
-      // 'behold?' power-up cheats
-      for (i=0;i<6;i++)
-      {
-	if (cht_CheckCheat(&cheat_powerup[i], ev->data2))
-	{
-	  if (!plyr->powers[i])
-	    P_GivePower( plyr, i);
-	  else if (i!=pw_strength)
-	    plyr->powers[i] = 1;
-	  else
-	    plyr->powers[i] = 0;
-	  
-	  plyr->message = DEH_String(STSTR_BEHOLDX);
-	}
-      }
-      
-      // 'behold' power-up menu
-      if (cht_CheckCheat(&cheat_powerup[6], ev->data2))
-      {
-	plyr->message = DEH_String(STSTR_BEHOLD);
-      }
-      // 'choppers' invulnerability & chainsaw
-      else if (cht_CheckCheat(&cheat_choppers, ev->data2))
-      {
-	plyr->weaponowned[wp_chainsaw] = true;
-	plyr->powers[pw_invulnerability] = true;
-	plyr->message = DEH_String(STSTR_CHOPPERS);
-      }
-      // 'mypos' for player position
-      else if (cht_CheckCheat(&cheat_mypos, ev->data2))
-      {
-        static char buf[ST_MSGWIDTH];
-        M_snprintf(buf, sizeof(buf), "ang=0x%x;x,y=(0x%x,0x%x)",
-                   players[consoleplayer].mo->angle,
-                   players[consoleplayer].mo->x,
-                   players[consoleplayer].mo->y);
-        plyr->message = buf;
-      }
+      lastcalc = ST_FACESTRIDE * (((100 - health) * ST_NUMPAINFACES) / 101);
+      oldhealth = health;
     }
-    
-    // 'clev' change-level cheat
-    if (!netgame && cht_CheckCheat(&cheat_clev, ev->data2))
+
+  return lastcalc;
+}
+
+/* This is a not-very-pretty routine which handles the face states and their
+ * timing. the precedence of expressions is: dead > evil grin > turned head >
+ * straight ahead
+ */
+
+static void st_update_face_widget(void)
+{
+  int i;
+  angle_t badguyangle;
+  angle_t diffang;
+  static int lastattackdown = -1;
+  static int priority = 0;
+  boolean doevilgrin;
+
+  if (priority < 10)
     {
-      char		buf[3];
-      int		epsd;
-      int		map;
-      
-      cht_GetParam(&cheat_clev, buf);
-      
-      if (gamemode == commercial)
-      {
-	epsd = 0;
-	map = (buf[0] - '0')*10 + buf[1] - '0';
-      }
-      else
-      {
-	epsd = buf[0] - '0';
-	map = buf[1] - '0';
+      /* dead */
 
-        // Chex.exe always warps to episode 1.
-
-        if (gameversion == exe_chex)
+      if (!plyr->health)
         {
-            if (epsd > 1)
+          priority = 9;
+          st_faceindex = ST_DEADFACE;
+          st_facecount = 1;
+        }
+    }
+
+  if (priority < 9)
+    {
+      if (plyr->bonuscount)
+        {
+          /* picking up bonus */
+
+          doevilgrin = false;
+
+          for (i = 0; i < NUMWEAPONS; i++)
             {
-                epsd = 1;
+              if (oldweaponsowned[i] != plyr->weaponowned[i])
+                {
+                  doevilgrin = true;
+                  oldweaponsowned[i] = plyr->weaponowned[i];
+                }
             }
-            if (map > 5)
+
+          if (doevilgrin)
             {
-                map = 5;
+              /* evil grin if just picked up weapon */
+
+              priority = 8;
+              st_facecount = ST_EVILGRINCOUNT;
+              st_faceindex = st_calc_paint_offset() + ST_EVILGRINOFFSET;
             }
         }
-      }
-
-      // Catch invalid maps.
-      if (gamemode != commercial)
-      {
-          if (epsd < 1)
-          {
-              return false;
-          }
-          if (epsd > 4)
-          {
-              return false;
-          }
-          if (epsd == 4 && gameversion < exe_ultimate)
-          {
-              return false;
-          }
-          if (map < 1)
-          {
-              return false;
-          }
-          if (map > 9)
-          {
-              return false;
-          }
-      }
-      else
-      {
-          if (map < 1)
-          {
-              return false;
-          }
-          if (map > 40)
-          {
-              return false;
-          }
-      }
-
-      // So be it.
-      plyr->message = DEH_String(STSTR_CLEV);
-      G_DeferedInitNew(gameskill, epsd, map);
     }
-  }
+
+  if (priority < 8)
+    {
+      if (plyr->damagecount && plyr->attacker && plyr->attacker != plyr->mo)
+        {
+          /* being attacked */
+
+          priority = 7;
+
+          if (plyr->health - st_oldhealth > ST_MUCHPAIN)
+            {
+              st_facecount = ST_TURNCOUNT;
+              st_faceindex = st_calc_paint_offset() + ST_OUCHOFFSET;
+            }
+          else
+            {
+              badguyangle =
+                  r_point_to_angle2(plyr->mo->x, plyr->mo->y,
+                                    plyr->attacker->x, plyr->attacker->y);
+
+              if (badguyangle > plyr->mo->angle)
+                {
+                  /* whether right or left */
+
+                  diffang = badguyangle - plyr->mo->angle;
+                  i = diffang > ANG180;
+                }
+              else
+                {
+                  /* whether left or right */
+
+                  diffang = plyr->mo->angle - badguyangle;
+                  i = diffang <= ANG180;
+                }
+
+              /* confusing, aint it? */
+
+              st_facecount = ST_TURNCOUNT;
+              st_faceindex = st_calc_paint_offset();
+
+              if (diffang < ANG45)
+                {
+                  /* head-on */
+
+                  st_faceindex += ST_RAMPAGEOFFSET;
+                }
+              else if (i)
+                {
+                  /* turn face right */
+
+                  st_faceindex += ST_TURNOFFSET;
+                }
+              else
+                {
+                  /* turn face left */
+
+                  st_faceindex += ST_TURNOFFSET + 1;
+                }
+            }
+        }
+    }
+
+  if (priority < 7)
+    {
+      /* getting hurt because of your own damn stupidity */
+
+      if (plyr->damagecount)
+        {
+          if (plyr->health - st_oldhealth > ST_MUCHPAIN)
+            {
+              priority = 7;
+              st_facecount = ST_TURNCOUNT;
+              st_faceindex = st_calc_paint_offset() + ST_OUCHOFFSET;
+            }
+          else
+            {
+              priority = 6;
+              st_facecount = ST_TURNCOUNT;
+              st_faceindex = st_calc_paint_offset() + ST_RAMPAGEOFFSET;
+            }
+        }
+    }
+
+  if (priority < 6)
+    {
+      /* rapid firing */
+
+      if (plyr->attackdown)
+        {
+          if (lastattackdown == -1)
+            lastattackdown = ST_RAMPAGEDELAY;
+          else if (!--lastattackdown)
+            {
+              priority = 5;
+              st_faceindex = st_calc_paint_offset() + ST_RAMPAGEOFFSET;
+              st_facecount = 1;
+              lastattackdown = 1;
+            }
+        }
+      else
+        lastattackdown = -1;
+    }
+
+  if (priority < 5)
+    {
+      /* invulnerability */
+
+      if ((plyr->cheats & CF_GODMODE) || plyr->powers[pw_invulnerability])
+        {
+          priority = 4;
+
+          st_faceindex = ST_GODFACE;
+          st_facecount = 1;
+        }
+    }
+
+  /* look left or look right if the facecount has timed out */
+
+  if (!st_facecount)
+    {
+      st_faceindex = st_calc_paint_offset() + (st_randomnumber % 3);
+      st_facecount = ST_STRAIGHTFACECOUNT;
+      priority = 0;
+    }
+
+  st_facecount--;
+}
+
+static void st_update_widgets(void)
+{
+  static int largeammo = 1994; /* means "n/a" */
+  int i;
+
+  /* must redirect the pointer if the ready weapon has changed.
+   *  if (w_ready.data != plyr->readyweapon)
+   *  {
+   */
+
+  if (weaponinfo[plyr->readyweapon].ammo == am_noammo)
+    w_ready.num = &largeammo;
+  else
+    w_ready.num = &plyr->ammo[weaponinfo[plyr->readyweapon].ammo];
+
+  /* {
+   * static int tic=0;
+   * static int dir=-1;
+   * if (!(tic&15))
+   *   plyr->ammo[weaponinfo[plyr->readyweapon].ammo]+=dir;
+   * if (plyr->ammo[weaponinfo[plyr->readyweapon].ammo] == -100)
+   *   dir = 1;
+   * tic++;
+   * }
+   */
+
+  w_ready.data = plyr->readyweapon;
+
+  /* if (*w_ready.on)
+   *  stlib_update_num(&w_ready, true);
+   * refresh weapon change
+   *  }
+   */
+
+  /* update keycard multiple widgets */
+
+  for (i = 0; i < 3; i++)
+    {
+      keyboxes[i] = plyr->cards[i] ? i : -1;
+
+      if (plyr->cards[i + 3]) keyboxes[i] = i + 3;
+    }
+
+  /* refresh everything if this is him coming back to life */
+
+  st_update_face_widget();
+
+  /* used by the w_armsbg widget */
+
+  st_notdeathmatch = !deathmatch;
+
+  /* used by w_arms[] widgets */
+
+  st_armson = st_statusbaron && !deathmatch;
+
+  /* used by w_frags widget */
+
+  st_fragson = deathmatch && st_statusbaron;
+  st_fragscount = 0;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (i != consoleplayer)
+        st_fragscount += plyr->frags[i];
+      else
+        st_fragscount -= plyr->frags[i];
+    }
+
+  /* get rid of chat window if up because of message */
+
+  if (!--st_msgcounter) st_chat = st_oldchat;
+}
+
+static void st_do_palette_stuff(void)
+{
+  int palette;
+  byte *pal;
+  int cnt;
+  int bzc;
+
+  cnt = plyr->damagecount;
+
+  if (plyr->powers[pw_strength])
+    {
+      /* slowly fade the berzerk out */
+
+      bzc = 12 - (plyr->powers[pw_strength] >> 6);
+
+      if (bzc > cnt) cnt = bzc;
+    }
+
+  if (cnt)
+    {
+      palette = (cnt + 7) >> 3;
+
+      if (palette >= NUMREDPALS) palette = NUMREDPALS - 1;
+
+      palette += STARTREDPALS;
+    }
+
+  else if (plyr->bonuscount)
+    {
+      palette = (plyr->bonuscount + 7) >> 3;
+
+      if (palette >= NUMBONUSPALS) palette = NUMBONUSPALS - 1;
+
+      palette += STARTBONUSPALS;
+    }
+
+  else if (plyr->powers[pw_ironfeet] > 4 * 32 ||
+           plyr->powers[pw_ironfeet] & 8)
+    palette = RADIATIONPAL;
+  else
+    palette = 0;
+
+  /* In Chex Quest, the player never sees red.  Instead, the
+   * radiation suit palette is used to tint the screen green,
+   * as though the player is being covered in goo by an
+   * attacking flemoid.
+   */
+
+  if (gameversion == exe_chex && palette >= STARTREDPALS &&
+      palette < STARTREDPALS + NUMREDPALS)
+    {
+      palette = RADIATIONPAL;
+    }
+
+  if (palette != st_palette)
+    {
+      st_palette = palette;
+      pal = (byte *)w_cache_lump_num(lu_palette, PU_CACHE) + palette * 768;
+      i_set_palette(pal);
+    }
+}
+
+static void st_draw_widgets(boolean refresh)
+{
+  int i;
+
+  /* used by w_arms[] widgets */
+
+  st_armson = st_statusbaron && !deathmatch;
+
+  /* used by w_frags widget */
+
+  st_fragson = deathmatch && st_statusbaron;
+
+  stlib_update_num(&w_ready, refresh);
+
+  for (i = 0; i < 4; i++)
+    {
+      stlib_update_num(&w_ammo[i], refresh);
+      stlib_update_num(&w_maxammo[i], refresh);
+    }
+
+  stlib_update_percent(&w_health, refresh);
+  stlib_update_percent(&w_armor, refresh);
+
+  stlib_update_bin_icon(&w_armsbg, refresh);
+
+  for (i = 0; i < 6; i++)
+    stlib_update_mult_icon(&w_arms[i], refresh);
+
+  stlib_update_mult_icon(&w_faces, refresh);
+
+  for (i = 0; i < 3; i++)
+    stlib_update_mult_icon(&w_keyboxes[i], refresh);
+
+  stlib_update_num(&w_frags, refresh);
+}
+
+static void st_do_refresh(void)
+{
+  st_firsttime = false;
+
+  /* draw status bar background to off-screen buff */
+
+  st_refresh_background();
+
+  /* and refresh all widgets */
+
+  st_draw_widgets(true);
+}
+
+static void st_diff_draw(void)
+{
+  /* update all widgets */
+
+  st_draw_widgets(false);
+}
+
+/* Iterates through all graphics to be loaded or unloaded, along with
+ * the variable they use, invoking the specified callback function.
+ */
+
+static void st_load_unload_graphics(load_callback_t callback)
+{
+  int i;
+  int j;
+  int facenum;
+
+  char namebuf[9];
+
+  /* Load the numbers, tall and short */
+
+  for (i = 0; i < 10; i++)
+    {
+      snprintf(namebuf, 9, "STTNUM%d", i);
+      callback(namebuf, &tallnum[i]);
+
+      snprintf(namebuf, 9, "STYSNUM%d", i);
+      callback(namebuf, &shortnum[i]);
+    }
+
+  /* Load percent key.
+   * Note: why not load STMINUS here, too?
+   */
+
+  callback(("STTPRCNT"), &tallpercent);
+
+  /* key cards */
+
+  for (i = 0; i < NUMCARDS; i++)
+    {
+      snprintf(namebuf, 9, "STKEYS%d", i);
+      callback(namebuf, &keys[i]);
+    }
+
+  /* arms background */
+
+  callback(("STARMS"), &armsbg);
+
+  /* arms ownership widgets */
+
+  for (i = 0; i < 6; i++)
+    {
+      snprintf(namebuf, 9, "STGNUM%d", i + 2);
+
+      /* gray # */
+
+      callback(namebuf, &arms[i][0]);
+
+      /* yellow # */
+
+      arms[i][1] = shortnum[i + 2];
+    }
+
+  /* face backgrounds for different color players */
+
+  snprintf(namebuf, 9, "STFB%d", consoleplayer);
+  callback(namebuf, &faceback);
+
+  /* status bar background bits */
+
+  if (w_check_num_for_name("STBAR") >= 0)
+    {
+      callback(("STBAR"), &sbar);
+      sbarr = NULL;
+    }
+  else
+    {
+      callback(("STMBARL"), &sbar);
+      callback(("STMBARR"), &sbarr);
+    }
+
+  /* face states */
+
+  facenum = 0;
+  for (i = 0; i < ST_NUMPAINFACES; i++)
+    {
+      for (j = 0; j < ST_NUMSTRAIGHTFACES; j++)
+        {
+          snprintf(namebuf, 9, "STFST%d%d", i, j);
+          callback(namebuf, &faces[facenum]);
+          ++facenum;
+        }
+
+      snprintf(namebuf, 9, "STFTR%d0", i); /* turn right */
+      callback(namebuf, &faces[facenum]);
+      ++facenum;
+      snprintf(namebuf, 9, "STFTL%d0", i); /* turn left */
+      callback(namebuf, &faces[facenum]);
+      ++facenum;
+      snprintf(namebuf, 9, "STFOUCH%d", i); /* ouch! */
+      callback(namebuf, &faces[facenum]);
+      ++facenum;
+      snprintf(namebuf, 9, "STFEVL%d", i); /* evil grin ;) */
+      callback(namebuf, &faces[facenum]);
+      ++facenum;
+      snprintf(namebuf, 9, "STFKILL%d", i); /* pissed off */
+      callback(namebuf, &faces[facenum]);
+      ++facenum;
+    }
+
+  callback(("STFGOD0"), &faces[facenum]);
+  ++facenum;
+  callback(("STFDEAD0"), &faces[facenum]);
+  ++facenum;
+}
+
+static void st_load_callback(const char *lumpname, patch_t **variable)
+{
+  *variable = w_cache_lump_name(lumpname, PU_STATIC);
+}
+
+static void st_load_graphics(void)
+{
+  st_load_unload_graphics(st_load_callback);
+}
+
+static void st_load_data(void)
+{
+  lu_palette = w_get_num_for_name(("PLAYPAL"));
+  st_load_graphics();
+}
+
+static void st_unload_callback(const char *lumpname, patch_t **variable)
+{
+  w_release_lump_name(lumpname);
+  *variable = NULL;
+}
+
+static void st_unload_graphics(void)
+{
+  st_load_unload_graphics(st_unload_callback);
+}
+
+static void st_init_data(void)
+{
+  int i;
+
+  st_firsttime = true;
+  plyr = &players[consoleplayer];
+
+  st_statusbaron = true;
+  st_oldchat = st_chat = false;
+
+  st_faceindex = 0;
+  st_palette = -1;
+
+  st_oldhealth = -1;
+
+  for (i = 0; i < NUMWEAPONS; i++)
+    oldweaponsowned[i] = plyr->weaponowned[i];
+
+  for (i = 0; i < 3; i++)
+    keyboxes[i] = -1;
+
+  stlib_init();
+}
+
+static void st_create_widgets(void)
+{
+  int i;
+
+  /* ready weapon ammo */
+
+  stlib_init_num(&w_ready, ST_AMMOX, ST_AMMOY, tallnum,
+                 &plyr->ammo[weaponinfo[plyr->readyweapon].ammo],
+                 &st_statusbaron, ST_AMMOWIDTH);
+
+  /* the last weapon type */
+
+  w_ready.data = plyr->readyweapon;
+
+  /* health percentage */
+
+  stlib_init_percent(&w_health, ST_HEALTHX, ST_HEALTHY, tallnum,
+                     &plyr->health, &st_statusbaron, tallpercent);
+
+  /* arms background */
+
+  stlib_init_bin_icon(&w_armsbg, ST_ARMSBGX, ST_ARMSBGY, armsbg,
+                      &st_notdeathmatch, &st_statusbaron);
+
+  /* weapons owned */
+
+  for (i = 0; i < 6; i++)
+    {
+      stlib_init_mutl_icon(&w_arms[i], ST_ARMSX + (i % 3) * ST_ARMSXSPACE,
+                           ST_ARMSY + (i / 3) * ST_ARMSYSPACE, arms[i],
+                           &plyr->weaponowned[i + 1], &st_armson);
+    }
+
+  /* frags sum */
+
+  stlib_init_num(&w_frags, ST_FRAGSX, ST_FRAGSY, tallnum, &st_fragscount,
+                 &st_fragson, ST_FRAGSWIDTH);
+
+  /* faces */
+
+  stlib_init_mutl_icon(&w_faces, ST_FACESX, ST_FACESY, faces, &st_faceindex,
+                       &st_statusbaron);
+
+  /* armor percentage - should be colored later */
+
+  stlib_init_percent(&w_armor, ST_ARMORX, ST_ARMORY, tallnum,
+                     &plyr->armorpoints, &st_statusbaron, tallpercent);
+
+  /* keyboxes 0-2 */
+
+  stlib_init_mutl_icon(&w_keyboxes[0], ST_KEY0X, ST_KEY0Y, keys,
+          &keyboxes[0], &st_statusbaron);
+
+  stlib_init_mutl_icon(&w_keyboxes[1], ST_KEY1X, ST_KEY1Y, keys,
+          &keyboxes[1], &st_statusbaron);
+
+  stlib_init_mutl_icon(&w_keyboxes[2], ST_KEY2X, ST_KEY2Y, keys,
+          &keyboxes[2], &st_statusbaron);
+
+  /* ammo count (all four kinds) */
+
+  stlib_init_num(&w_ammo[0], ST_AMMO0X, ST_AMMO0Y, shortnum, &plyr->ammo[0],
+                 &st_statusbaron, ST_AMMO0WIDTH);
+
+  stlib_init_num(&w_ammo[1], ST_AMMO1X, ST_AMMO1Y, shortnum, &plyr->ammo[1],
+                 &st_statusbaron, ST_AMMO1WIDTH);
+
+  stlib_init_num(&w_ammo[2], ST_AMMO2X, ST_AMMO2Y, shortnum, &plyr->ammo[2],
+                 &st_statusbaron, ST_AMMO2WIDTH);
+
+  stlib_init_num(&w_ammo[3], ST_AMMO3X, ST_AMMO3Y, shortnum, &plyr->ammo[3],
+                 &st_statusbaron, ST_AMMO3WIDTH);
+
+  /* max ammo count (all four kinds) */
+
+  stlib_init_num(&w_maxammo[0], ST_MAXAMMO0X, ST_MAXAMMO0Y, shortnum,
+                 &plyr->maxammo[0], &st_statusbaron, ST_MAXAMMO0WIDTH);
+
+  stlib_init_num(&w_maxammo[1], ST_MAXAMMO1X, ST_MAXAMMO1Y, shortnum,
+                 &plyr->maxammo[1], &st_statusbaron, ST_MAXAMMO1WIDTH);
+
+  stlib_init_num(&w_maxammo[2], ST_MAXAMMO2X, ST_MAXAMMO2Y, shortnum,
+                 &plyr->maxammo[2], &st_statusbaron, ST_MAXAMMO2WIDTH);
+
+  stlib_init_num(&w_maxammo[3], ST_MAXAMMO3X, ST_MAXAMMO3Y, shortnum,
+                 &plyr->maxammo[3], &st_statusbaron, ST_MAXAMMO3WIDTH);
+}
+
+/****************************************************************************
+ * Public Function
+ ****************************************************************************/
+
+/* Respond to keyboard input events, intercept cheats. */
+
+boolean st_responder(event_t *ev)
+{
+  int i;
+
+  /* Filter automap on/off. */
+
+  if (ev->type == ev_keyup && ((ev->data1 & 0xffff0000) == AM_MSGHEADER))
+    {
+      switch (ev->data1)
+        {
+        case AM_MSGENTERED:
+          st_firsttime = true;
+          break;
+
+        case AM_MSGEXITED:
+          break;
+        }
+    }
+
+  /* if a user keypress... */
+
+  else if (ev->type == ev_keydown)
+    {
+      if (!netgame && gameskill != sk_nightmare)
+        {
+          /* 'dqd' cheat for toggleable god mode */
+
+          if (cht_check_cheat(&cheat_god, ev->data2))
+            {
+              plyr->cheats ^= CF_GODMODE;
+              if (plyr->cheats & CF_GODMODE)
+                {
+                  if (plyr->mo) plyr->mo->health = deh_god_mode_health;
+
+                  plyr->health = deh_god_mode_health;
+                  plyr->message = (STSTR_DQDON);
+                }
+              else
+                plyr->message = (STSTR_DQDOFF);
+            }
+
+          /* 'fa' cheat for killer fucking arsenal */
+
+          else if (cht_check_cheat(&cheat_ammonokey, ev->data2))
+            {
+              plyr->armorpoints = deh_idfa_armor;
+              plyr->armortype = deh_idfa_armor_class;
+
+              for (i = 0; i < NUMWEAPONS; i++)
+                plyr->weaponowned[i] = true;
+
+              for (i = 0; i < NUMAMMO; i++)
+                plyr->ammo[i] = plyr->maxammo[i];
+
+              plyr->message = (STSTR_FAADDED);
+            }
+
+          /* 'kfa' cheat for key full ammo */
+
+          else if (cht_check_cheat(&cheat_ammo, ev->data2))
+            {
+              plyr->armorpoints = deh_idkfa_armor;
+              plyr->armortype = deh_idkfa_armor_class;
+
+              for (i = 0; i < NUMWEAPONS; i++)
+                plyr->weaponowned[i] = true;
+
+              for (i = 0; i < NUMAMMO; i++)
+                plyr->ammo[i] = plyr->maxammo[i];
+
+              for (i = 0; i < NUMCARDS; i++)
+                plyr->cards[i] = true;
+
+              plyr->message = (STSTR_KFAADDED);
+            }
+
+          /* 'mus' cheat for changing music */
+
+          else if (cht_check_cheat(&cheat_mus, ev->data2))
+            {
+              char buf[3];
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              int musnum;
+#endif
+
+              plyr->message = (STSTR_MUS);
+              ch_get_param(&cheat_mus, buf);
+
+              /* Note: The original v1.9 had a bug that tried to play back
+               * the Doom II music regardless of gamemode.  This was fixed
+               * in the Ultimate Doom executable so that it would work for
+               * the Doom 1 music as well.
+               */
+
+              if (gamemode == commercial || gameversion < exe_ultimate)
+                {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                  musnum =
+                      MUS_RUNNIN + (buf[0] - '0') * 10 + buf[1] - '0' - 1;
+#endif
+
+                  if (((buf[0] - '0') * 10 + buf[1] - '0') > 35 &&
+                      gameversion >= exe_doom_1_8)
+                    plyr->message = (STSTR_NOMUS);
+                  else
+                    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                      s_change_music(musnum, 1);
+#endif
+                    }
+                }
+              else
+                {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                  musnum = MUS_E1M1 + (buf[0] - '1') * 9 + (buf[1] - '1');
+#endif
+
+                  if (((buf[0] - '1') * 9 + buf[1] - '1') > 31)
+                    plyr->message = (STSTR_NOMUS);
+                  else
+                    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+                      s_change_music(musnum, 1);
+#endif
+                    }
+                }
+            }
+          else if ((logical_gamemission == doom &&
+                    cht_check_cheat(&cheat_noclip, ev->data2)) ||
+                   (logical_gamemission != doom &&
+                    cht_check_cheat(&cheat_commercial_noclip, ev->data2)))
+            {
+              /* Noclip cheat.
+               * For Doom 1, use the idspipsopd cheat; for all others, use
+               * idclip
+               */
+
+              plyr->cheats ^= CF_NOCLIP;
+
+              if (plyr->cheats & CF_NOCLIP)
+                plyr->message = (STSTR_NCON);
+              else
+                plyr->message = (STSTR_NCOFF);
+            }
+
+          /* 'behold?' power-up cheats */
+
+          for (i = 0; i < 6; i++)
+            {
+              if (cht_check_cheat(&cheat_powerup[i], ev->data2))
+                {
+                  if (!plyr->powers[i])
+                    p_give_power(plyr, i);
+                  else if (i != pw_strength)
+                    plyr->powers[i] = 1;
+                  else
+                    plyr->powers[i] = 0;
+
+                  plyr->message = (STSTR_BEHOLDX);
+                }
+            }
+
+          /* 'behold' power-up menu */
+
+          if (cht_check_cheat(&cheat_powerup[6], ev->data2))
+            {
+              plyr->message = (STSTR_BEHOLD);
+            }
+
+          /* 'choppers' invulnerability & chainsaw */
+
+          else if (cht_check_cheat(&cheat_choppers, ev->data2))
+            {
+              plyr->weaponowned[wp_chainsaw] = true;
+              plyr->powers[pw_invulnerability] = true;
+              plyr->message = (STSTR_CHOPPERS);
+            }
+
+          /* 'mypos' for player position */
+
+          else if (cht_check_cheat(&cheat_mypos, ev->data2))
+            {
+              static char buf[ST_MSGWIDTH];
+              snprintf(buf, sizeof(buf), "ang=0x%x;x,y=(0x%x,0x%x)",
+                       players[consoleplayer].mo->angle,
+                       players[consoleplayer].mo->x,
+                       players[consoleplayer].mo->y);
+              plyr->message = buf;
+            }
+        }
+
+      /* 'clev' change-level cheat */
+
+      if (!netgame && cht_check_cheat(&cheat_clev, ev->data2))
+        {
+          char buf[3];
+          int epsd;
+          int map;
+
+          ch_get_param(&cheat_clev, buf);
+
+          if (gamemode == commercial)
+            {
+              epsd = 0;
+              map = (buf[0] - '0') * 10 + buf[1] - '0';
+            }
+          else
+            {
+              epsd = buf[0] - '0';
+              map = buf[1] - '0';
+
+              /* Chex.exe always warps to episode 1. */
+
+              if (gameversion == exe_chex)
+                {
+                  if (epsd > 1)
+                    {
+                      epsd = 1;
+                    }
+
+                  if (map > 5)
+                    {
+                      map = 5;
+                    }
+                }
+            }
+
+          /* Catch invalid maps. */
+
+          if (gamemode != commercial)
+            {
+              if (epsd < 1)
+                {
+                  return false;
+                }
+
+              if (epsd > 4)
+                {
+                  return false;
+                }
+
+              if (epsd == 4 && gameversion < exe_ultimate)
+                {
+                  return false;
+                }
+
+              if (map < 1)
+                {
+                  return false;
+                }
+
+              if (map > 9)
+                {
+                  return false;
+                }
+            }
+          else
+            {
+              if (map < 1)
+                {
+                  return false;
+                }
+
+              if (map > 40)
+                {
+                  return false;
+                }
+            }
+
+          /* So be it. */
+
+          plyr->message = (STSTR_CLEV);
+          g_deferred_init_new(gameskill, epsd, map);
+        }
+    }
+
   return false;
 }
 
-
-
-int ST_calcPainOffset(void)
+void st_ticker(void)
 {
-    int		health;
-    static int	lastcalc;
-    static int	oldhealth = -1;
-    
-    health = plyr->health > 100 ? 100 : plyr->health;
-
-    if (health != oldhealth)
-    {
-	lastcalc = ST_FACESTRIDE * (((100 - health) * ST_NUMPAINFACES) / 101);
-	oldhealth = health;
-    }
-    return lastcalc;
+  st_randomnumber = m_random();
+  st_update_widgets();
+  st_oldhealth = plyr->health;
 }
 
-
-//
-// This is a not-very-pretty routine which handles
-//  the face states and their timing.
-// the precedence of expressions is:
-//  dead > evil grin > turned head > straight ahead
-//
-void ST_updateFaceWidget(void)
+void st_drawer(boolean p_fullscreen, boolean refresh)
 {
-    int		i;
-    angle_t	badguyangle;
-    angle_t	diffang;
-    static int	lastattackdown = -1;
-    static int	priority = 0;
-    boolean	doevilgrin;
+  st_statusbaron = (!p_fullscreen) || automapactive;
+  st_firsttime = st_firsttime || refresh;
 
-    if (priority < 10)
+  /* Do red-/gold-shifts from damage/items */
+
+  st_do_palette_stuff();
+
+  /* If just after st_start(), refresh all */
+
+  if (st_firsttime)
     {
-	// dead
-	if (!plyr->health)
-	{
-	    priority = 9;
-	    st_faceindex = ST_DEADFACE;
-	    st_facecount = 1;
-	}
+      st_do_refresh();
     }
-
-    if (priority < 9)
+  else
     {
-	if (plyr->bonuscount)
-	{
-	    // picking up bonus
-	    doevilgrin = false;
-
-	    for (i=0;i<NUMWEAPONS;i++)
-	    {
-		if (oldweaponsowned[i] != plyr->weaponowned[i])
-		{
-		    doevilgrin = true;
-		    oldweaponsowned[i] = plyr->weaponowned[i];
-		}
-	    }
-	    if (doevilgrin) 
-	    {
-		// evil grin if just picked up weapon
-		priority = 8;
-		st_facecount = ST_EVILGRINCOUNT;
-		st_faceindex = ST_calcPainOffset() + ST_EVILGRINOFFSET;
-	    }
-	}
+      /* Otherwise, update as little as possible */
 
+      st_diff_draw();
     }
-  
-    if (priority < 8)
-    {
-	if (plyr->damagecount
-	    && plyr->attacker
-	    && plyr->attacker != plyr->mo)
-	{
-	    // being attacked
-	    priority = 7;
-	    
-	    if (plyr->health - st_oldhealth > ST_MUCHPAIN)
-	    {
-		st_facecount = ST_TURNCOUNT;
-		st_faceindex = ST_calcPainOffset() + ST_OUCHOFFSET;
-	    }
-	    else
-	    {
-		badguyangle = R_PointToAngle2(plyr->mo->x,
-					      plyr->mo->y,
-					      plyr->attacker->x,
-					      plyr->attacker->y);
-		
-		if (badguyangle > plyr->mo->angle)
-		{
-		    // whether right or left
-		    diffang = badguyangle - plyr->mo->angle;
-		    i = diffang > ANG180; 
-		}
-		else
-		{
-		    // whether left or right
-		    diffang = plyr->mo->angle - badguyangle;
-		    i = diffang <= ANG180; 
-		} // confusing, aint it?
-
-		
-		st_facecount = ST_TURNCOUNT;
-		st_faceindex = ST_calcPainOffset();
-		
-		if (diffang < ANG45)
-		{
-		    // head-on    
-		    st_faceindex += ST_RAMPAGEOFFSET;
-		}
-		else if (i)
-		{
-		    // turn face right
-		    st_faceindex += ST_TURNOFFSET;
-		}
-		else
-		{
-		    // turn face left
-		    st_faceindex += ST_TURNOFFSET+1;
-		}
-	    }
-	}
-    }
-  
-    if (priority < 7)
-    {
-	// getting hurt because of your own damn stupidity
-	if (plyr->damagecount)
-	{
-	    if (plyr->health - st_oldhealth > ST_MUCHPAIN)
-	    {
-		priority = 7;
-		st_facecount = ST_TURNCOUNT;
-		st_faceindex = ST_calcPainOffset() + ST_OUCHOFFSET;
-	    }
-	    else
-	    {
-		priority = 6;
-		st_facecount = ST_TURNCOUNT;
-		st_faceindex = ST_calcPainOffset() + ST_RAMPAGEOFFSET;
-	    }
-
-	}
-
-    }
-  
-    if (priority < 6)
-    {
-	// rapid firing
-	if (plyr->attackdown)
-	{
-	    if (lastattackdown==-1)
-		lastattackdown = ST_RAMPAGEDELAY;
-	    else if (!--lastattackdown)
-	    {
-		priority = 5;
-		st_faceindex = ST_calcPainOffset() + ST_RAMPAGEOFFSET;
-		st_facecount = 1;
-		lastattackdown = 1;
-	    }
-	}
-	else
-	    lastattackdown = -1;
-
-    }
-  
-    if (priority < 5)
-    {
-	// invulnerability
-	if ((plyr->cheats & CF_GODMODE)
-	    || plyr->powers[pw_invulnerability])
-	{
-	    priority = 4;
-
-	    st_faceindex = ST_GODFACE;
-	    st_facecount = 1;
-
-	}
-
-    }
-
-    // look left or look right if the facecount has timed out
-    if (!st_facecount)
-    {
-	st_faceindex = ST_calcPainOffset() + (st_randomnumber % 3);
-	st_facecount = ST_STRAIGHTFACECOUNT;
-	priority = 0;
-    }
-
-    st_facecount--;
-
 }
 
-void ST_updateWidgets(void)
+void st_start(void)
 {
-    static int	largeammo = 1994; // means "n/a"
-    int		i;
-
-    // must redirect the pointer if the ready weapon has changed.
-    //  if (w_ready.data != plyr->readyweapon)
-    //  {
-    if (weaponinfo[plyr->readyweapon].ammo == am_noammo)
-	w_ready.num = &largeammo;
-    else
-	w_ready.num = &plyr->ammo[weaponinfo[plyr->readyweapon].ammo];
-    //{
-    // static int tic=0;
-    // static int dir=-1;
-    // if (!(tic&15))
-    //   plyr->ammo[weaponinfo[plyr->readyweapon].ammo]+=dir;
-    // if (plyr->ammo[weaponinfo[plyr->readyweapon].ammo] == -100)
-    //   dir = 1;
-    // tic++;
-    // }
-    w_ready.data = plyr->readyweapon;
-
-    // if (*w_ready.on)
-    //  STlib_updateNum(&w_ready, true);
-    // refresh weapon change
-    //  }
-
-    // update keycard multiple widgets
-    for (i=0;i<3;i++)
+  if (!st_stopped)
     {
-	keyboxes[i] = plyr->cards[i] ? i : -1;
-
-	if (plyr->cards[i+3])
-	    keyboxes[i] = i+3;
+      st_stop();
     }
 
-    // refresh everything if this is him coming back to life
-    ST_updateFaceWidget();
-
-    // used by the w_armsbg widget
-    st_notdeathmatch = !deathmatch;
-    
-    // used by w_arms[] widgets
-    st_armson = st_statusbaron && !deathmatch; 
-
-    // used by w_frags widget
-    st_fragson = deathmatch && st_statusbaron; 
-    st_fragscount = 0;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (i != consoleplayer)
-	    st_fragscount += plyr->frags[i];
-	else
-	    st_fragscount -= plyr->frags[i];
-    }
-
-    // get rid of chat window if up because of message
-    if (!--st_msgcounter)
-	st_chat = st_oldchat;
-
+  st_init_data();
+  st_create_widgets();
+  st_stopped = false;
 }
 
-void ST_Ticker (void)
+void st_init(void)
 {
-
-    st_randomnumber = M_Random();
-    ST_updateWidgets();
-    st_oldhealth = plyr->health;
-
+  st_load_data();
+  st_backing_screen = (pixel_t *)z_malloc(
+      ST_WIDTH * ST_HEIGHT * sizeof(*st_backing_screen), PU_STATIC, 0);
 }
-
-static int st_palette = 0;
-
-void ST_doPaletteStuff(void)
-{
-
-    int		palette;
-    byte*	pal;
-    int		cnt;
-    int		bzc;
-
-    cnt = plyr->damagecount;
-
-    if (plyr->powers[pw_strength])
-    {
-	// slowly fade the berzerk out
-  	bzc = 12 - (plyr->powers[pw_strength]>>6);
-
-	if (bzc > cnt)
-	    cnt = bzc;
-    }
-	
-    if (cnt)
-    {
-	palette = (cnt+7)>>3;
-	
-	if (palette >= NUMREDPALS)
-	    palette = NUMREDPALS-1;
-
-	palette += STARTREDPALS;
-    }
-
-    else if (plyr->bonuscount)
-    {
-	palette = (plyr->bonuscount+7)>>3;
-
-	if (palette >= NUMBONUSPALS)
-	    palette = NUMBONUSPALS-1;
-
-	palette += STARTBONUSPALS;
-    }
-
-    else if ( plyr->powers[pw_ironfeet] > 4*32
-	      || plyr->powers[pw_ironfeet]&8)
-	palette = RADIATIONPAL;
-    else
-	palette = 0;
-
-    // In Chex Quest, the player never sees red.  Instead, the
-    // radiation suit palette is used to tint the screen green,
-    // as though the player is being covered in goo by an
-    // attacking flemoid.
-
-    if (gameversion == exe_chex
-     && palette >= STARTREDPALS && palette < STARTREDPALS + NUMREDPALS)
-    {
-        palette = RADIATIONPAL;
-    }
-
-    if (palette != st_palette)
-    {
-	st_palette = palette;
-	pal = (byte *) W_CacheLumpNum (lu_palette, PU_CACHE)+palette*768;
-	I_SetPalette (pal);
-    }
-
-}
-
-void ST_drawWidgets(boolean refresh)
-{
-    int		i;
-
-    // used by w_arms[] widgets
-    st_armson = st_statusbaron && !deathmatch;
-
-    // used by w_frags widget
-    st_fragson = deathmatch && st_statusbaron; 
-
-    STlib_updateNum(&w_ready, refresh);
-
-    for (i=0;i<4;i++)
-    {
-	STlib_updateNum(&w_ammo[i], refresh);
-	STlib_updateNum(&w_maxammo[i], refresh);
-    }
-
-    STlib_updatePercent(&w_health, refresh);
-    STlib_updatePercent(&w_armor, refresh);
-
-    STlib_updateBinIcon(&w_armsbg, refresh);
-
-    for (i=0;i<6;i++)
-	STlib_updateMultIcon(&w_arms[i], refresh);
-
-    STlib_updateMultIcon(&w_faces, refresh);
-
-    for (i=0;i<3;i++)
-	STlib_updateMultIcon(&w_keyboxes[i], refresh);
-
-    STlib_updateNum(&w_frags, refresh);
-
-}
-
-void ST_doRefresh(void)
-{
-
-    st_firsttime = false;
-
-    // draw status bar background to off-screen buff
-    ST_refreshBackground();
-
-    // and refresh all widgets
-    ST_drawWidgets(true);
-
-}
-
-void ST_diffDraw(void)
-{
-    // update all widgets
-    ST_drawWidgets(false);
-}
-
-void ST_Drawer (boolean fullscreen, boolean refresh)
-{
-  
-    st_statusbaron = (!fullscreen) || automapactive;
-    st_firsttime = st_firsttime || refresh;
-
-    // Do red-/gold-shifts from damage/items
-    ST_doPaletteStuff();
-
-    // If just after ST_Start(), refresh all
-    if (st_firsttime) ST_doRefresh();
-    // Otherwise, update as little as possible
-    else ST_diffDraw();
-
-}
-
-typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
-
-// Iterates through all graphics to be loaded or unloaded, along with
-// the variable they use, invoking the specified callback function.
-
-static void ST_loadUnloadGraphics(load_callback_t callback)
-{
-
-    int		i;
-    int		j;
-    int		facenum;
-    
-    char	namebuf[9];
-
-    // Load the numbers, tall and short
-    for (i=0;i<10;i++)
-    {
-	DEH_snprintf(namebuf, 9, "STTNUM%d", i);
-        callback(namebuf, &tallnum[i]);
-
-	DEH_snprintf(namebuf, 9, "STYSNUM%d", i);
-        callback(namebuf, &shortnum[i]);
-    }
-
-    // Load percent key.
-    //Note: why not load STMINUS here, too?
-
-    callback(DEH_String("STTPRCNT"), &tallpercent);
-
-    // key cards
-    for (i=0;i<NUMCARDS;i++)
-    {
-	DEH_snprintf(namebuf, 9, "STKEYS%d", i);
-        callback(namebuf, &keys[i]);
-    }
-
-    // arms background
-    callback(DEH_String("STARMS"), &armsbg);
-
-    // arms ownership widgets
-    for (i=0; i<6; i++)
-    {
-	DEH_snprintf(namebuf, 9, "STGNUM%d", i+2);
-
-	// gray #
-        callback(namebuf, &arms[i][0]);
-
-	// yellow #
-	arms[i][1] = shortnum[i+2]; 
-    }
-
-    // face backgrounds for different color players
-    DEH_snprintf(namebuf, 9, "STFB%d", consoleplayer);
-    callback(namebuf, &faceback);
-
-    // status bar background bits
-    if (W_CheckNumForName("STBAR") >= 0)
-    {
-        callback(DEH_String("STBAR"), &sbar);
-        sbarr = NULL;
-    }
-    else
-    {
-        callback(DEH_String("STMBARL"), &sbar);
-        callback(DEH_String("STMBARR"), &sbarr);
-    }
-
-    // face states
-    facenum = 0;
-    for (i=0; i<ST_NUMPAINFACES; i++)
-    {
-	for (j=0; j<ST_NUMSTRAIGHTFACES; j++)
-	{
-	    DEH_snprintf(namebuf, 9, "STFST%d%d", i, j);
-            callback(namebuf, &faces[facenum]);
-            ++facenum;
-	}
-	DEH_snprintf(namebuf, 9, "STFTR%d0", i);	// turn right
-        callback(namebuf, &faces[facenum]);
-        ++facenum;
-	DEH_snprintf(namebuf, 9, "STFTL%d0", i);	// turn left
-        callback(namebuf, &faces[facenum]);
-        ++facenum;
-	DEH_snprintf(namebuf, 9, "STFOUCH%d", i);	// ouch!
-        callback(namebuf, &faces[facenum]);
-        ++facenum;
-	DEH_snprintf(namebuf, 9, "STFEVL%d", i);	// evil grin ;)
-        callback(namebuf, &faces[facenum]);
-        ++facenum;
-	DEH_snprintf(namebuf, 9, "STFKILL%d", i);	// pissed off
-        callback(namebuf, &faces[facenum]);
-        ++facenum;
-    }
-
-    callback(DEH_String("STFGOD0"), &faces[facenum]);
-    ++facenum;
-    callback(DEH_String("STFDEAD0"), &faces[facenum]);
-    ++facenum;
-}
-
-static void ST_loadCallback(const char *lumpname, patch_t **variable)
-{
-    *variable = W_CacheLumpName(lumpname, PU_STATIC);
-}
-
-void ST_loadGraphics(void)
-{
-    ST_loadUnloadGraphics(ST_loadCallback);
-}
-
-void ST_loadData(void)
-{
-    lu_palette = W_GetNumForName (DEH_String("PLAYPAL"));
-    ST_loadGraphics();
-}
-
-static void ST_unloadCallback(const char *lumpname, patch_t **variable)
-{
-    W_ReleaseLumpName(lumpname);
-    *variable = NULL;
-}
-
-void ST_unloadGraphics(void)
-{
-    ST_loadUnloadGraphics(ST_unloadCallback);
-}
-
-void ST_unloadData(void)
-{
-    ST_unloadGraphics();
-}
-
-void ST_initData(void)
-{
-
-    int		i;
-
-    st_firsttime = true;
-    plyr = &players[consoleplayer];
-
-    st_statusbaron = true;
-    st_oldchat = st_chat = false;
-
-    st_faceindex = 0;
-    st_palette = -1;
-
-    st_oldhealth = -1;
-
-    for (i=0;i<NUMWEAPONS;i++)
-	oldweaponsowned[i] = plyr->weaponowned[i];
-
-    for (i=0;i<3;i++)
-	keyboxes[i] = -1;
-
-    STlib_init();
-
-}
-
-
-
-void ST_createWidgets(void)
-{
-
-    int i;
-
-    // ready weapon ammo
-    STlib_initNum(&w_ready,
-		  ST_AMMOX,
-		  ST_AMMOY,
-		  tallnum,
-		  &plyr->ammo[weaponinfo[plyr->readyweapon].ammo],
-		  &st_statusbaron,
-		  ST_AMMOWIDTH );
-
-    // the last weapon type
-    w_ready.data = plyr->readyweapon; 
-
-    // health percentage
-    STlib_initPercent(&w_health,
-		      ST_HEALTHX,
-		      ST_HEALTHY,
-		      tallnum,
-		      &plyr->health,
-		      &st_statusbaron,
-		      tallpercent);
-
-    // arms background
-    STlib_initBinIcon(&w_armsbg,
-		      ST_ARMSBGX,
-		      ST_ARMSBGY,
-		      armsbg,
-		      &st_notdeathmatch,
-		      &st_statusbaron);
-
-    // weapons owned
-    for(i=0;i<6;i++)
-    {
-        STlib_initMultIcon(&w_arms[i],
-                           ST_ARMSX+(i%3)*ST_ARMSXSPACE,
-                           ST_ARMSY+(i/3)*ST_ARMSYSPACE,
-                           arms[i],
-                           &plyr->weaponowned[i+1],
-                           &st_armson);
-    }
-
-    // frags sum
-    STlib_initNum(&w_frags,
-		  ST_FRAGSX,
-		  ST_FRAGSY,
-		  tallnum,
-		  &st_fragscount,
-		  &st_fragson,
-		  ST_FRAGSWIDTH);
-
-    // faces
-    STlib_initMultIcon(&w_faces,
-		       ST_FACESX,
-		       ST_FACESY,
-		       faces,
-		       &st_faceindex,
-		       &st_statusbaron);
-
-    // armor percentage - should be colored later
-    STlib_initPercent(&w_armor,
-		      ST_ARMORX,
-		      ST_ARMORY,
-		      tallnum,
-		      &plyr->armorpoints,
-		      &st_statusbaron, tallpercent);
-
-    // keyboxes 0-2
-    STlib_initMultIcon(&w_keyboxes[0],
-		       ST_KEY0X,
-		       ST_KEY0Y,
-		       keys,
-		       &keyboxes[0],
-		       &st_statusbaron);
-    
-    STlib_initMultIcon(&w_keyboxes[1],
-		       ST_KEY1X,
-		       ST_KEY1Y,
-		       keys,
-		       &keyboxes[1],
-		       &st_statusbaron);
-
-    STlib_initMultIcon(&w_keyboxes[2],
-		       ST_KEY2X,
-		       ST_KEY2Y,
-		       keys,
-		       &keyboxes[2],
-		       &st_statusbaron);
-
-    // ammo count (all four kinds)
-    STlib_initNum(&w_ammo[0],
-		  ST_AMMO0X,
-		  ST_AMMO0Y,
-		  shortnum,
-		  &plyr->ammo[0],
-		  &st_statusbaron,
-		  ST_AMMO0WIDTH);
-
-    STlib_initNum(&w_ammo[1],
-		  ST_AMMO1X,
-		  ST_AMMO1Y,
-		  shortnum,
-		  &plyr->ammo[1],
-		  &st_statusbaron,
-		  ST_AMMO1WIDTH);
-
-    STlib_initNum(&w_ammo[2],
-		  ST_AMMO2X,
-		  ST_AMMO2Y,
-		  shortnum,
-		  &plyr->ammo[2],
-		  &st_statusbaron,
-		  ST_AMMO2WIDTH);
-    
-    STlib_initNum(&w_ammo[3],
-		  ST_AMMO3X,
-		  ST_AMMO3Y,
-		  shortnum,
-		  &plyr->ammo[3],
-		  &st_statusbaron,
-		  ST_AMMO3WIDTH);
-
-    // max ammo count (all four kinds)
-    STlib_initNum(&w_maxammo[0],
-		  ST_MAXAMMO0X,
-		  ST_MAXAMMO0Y,
-		  shortnum,
-		  &plyr->maxammo[0],
-		  &st_statusbaron,
-		  ST_MAXAMMO0WIDTH);
-
-    STlib_initNum(&w_maxammo[1],
-		  ST_MAXAMMO1X,
-		  ST_MAXAMMO1Y,
-		  shortnum,
-		  &plyr->maxammo[1],
-		  &st_statusbaron,
-		  ST_MAXAMMO1WIDTH);
-
-    STlib_initNum(&w_maxammo[2],
-		  ST_MAXAMMO2X,
-		  ST_MAXAMMO2Y,
-		  shortnum,
-		  &plyr->maxammo[2],
-		  &st_statusbaron,
-		  ST_MAXAMMO2WIDTH);
-    
-    STlib_initNum(&w_maxammo[3],
-		  ST_MAXAMMO3X,
-		  ST_MAXAMMO3Y,
-		  shortnum,
-		  &plyr->maxammo[3],
-		  &st_statusbaron,
-		  ST_MAXAMMO3WIDTH);
-
-}
-
-static boolean	st_stopped = true;
-
-
-void ST_Start (void)
-{
-
-    if (!st_stopped)
-	ST_Stop();
-
-    ST_initData();
-    ST_createWidgets();
-    st_stopped = false;
-
-}
-
-void ST_Stop (void)
-{
-    if (st_stopped)
-	return;
-
-    I_SetPalette (W_CacheLumpNum (lu_palette, PU_CACHE));
-
-    st_stopped = true;
-}
-
-void ST_Init (void)
-{
-    ST_loadData();
-    st_backing_screen = (pixel_t *) Z_Malloc(ST_WIDTH * ST_HEIGHT * sizeof(*st_backing_screen), PU_STATIC, 0);
-}
-
diff --git a/games/NXDoom/src/doom/st_stuff.h b/games/NXDoom/src/doom/st_stuff.h
index 0cf28bb63..f68279e66 100644
--- a/games/NXDoom/src/doom/st_stuff.h
+++ b/games/NXDoom/src/doom/st_stuff.h
@@ -1,57 +1,54 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Status bar code.
-//	Does the face/direction indicator animatin.
-//	Does palette indicators as well (red pain/berserk, bright pickup)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/st_stuff.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Status bar code.
+ *  Does the face/direction indicator animating.
+ *  Does palette indicators as well (red pain/berserk, bright pickup)
+ *
+ ****************************************************************************/
 
 #ifndef __STSTUFF_H__
 #define __STSTUFF_H__
 
-#include "doomtype.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_event.h"
+#include "doomtype.h"
 #include "m_cheat.h"
 
-// Size of statusbar.
-// Now sensitive for scaling.
-#define ST_HEIGHT	32
-#define ST_WIDTH	SCREENWIDTH
-#define ST_Y		(SCREENHEIGHT - ST_HEIGHT)
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Size of statusbar.
+ * Now sensitive for scaling.
+ */
 
-//
-// STATUS BAR
-//
-
-// Called by main loop.
-boolean ST_Responder (event_t* ev);
-
-// Called by main loop.
-void ST_Ticker (void);
-
-// Called by main loop.
-void ST_Drawer (boolean fullscreen, boolean refresh);
-
-// Called when the console player is spawned on each level.
-void ST_Start (void);
-
-// Called by startup code.
-void ST_Init (void);
-
+#define ST_HEIGHT 32
+#define ST_WIDTH SCREENWIDTH
+#define ST_Y (SCREENHEIGHT - ST_HEIGHT)
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern pixel_t *st_backing_screen;
 extern cheatseq_t cheat_mus;
@@ -65,5 +62,30 @@ extern cheatseq_t cheat_choppers;
 extern cheatseq_t cheat_clev;
 extern cheatseq_t cheat_mypos;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* STATUS BAR */
+
+/* Called by main loop. */
+
+boolean st_responder(event_t *ev);
+
+/* Called by main loop. */
+
+void st_ticker(void);
+
+/* Called by main loop. */
+
+void st_drawer(boolean fullscreen, boolean refresh);
+
+/* Called when the console player is spawned on each level. */
+
+void st_start(void);
+
+/* Called by startup code. */
+
+void st_init(void);
+
+#endif /* __STSTUFF_H__ */
diff --git a/games/NXDoom/src/doom/statdump.c b/games/NXDoom/src/doom/statdump.c
index ae6814a31..1db5657ab 100644
--- a/games/NXDoom/src/doom/statdump.c
+++ b/games/NXDoom/src/doom/statdump.c
@@ -1,357 +1,388 @@
- /*
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/statdump.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Functions for presenting the information captured from the statistics
+ * buffer to a file.
+ *
+ ****************************************************************************/
 
- Copyright(C) 2005-2014 Simon Howard
-
- 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.
-
- --
-
- Functions for presenting the information captured from the statistics
- buffer to a file.
-
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "d_player.h"
 #include "d_mode.h"
+#include "d_player.h"
 #include "m_argv.h"
 #include "m_misc.h"
 
 #include "statdump.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MAX_CAPTURES 32
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 /* Par times for E1M1-E1M9. */
+
 static const int doom1_par_times[] =
 {
-    30, 75, 120, 90, 165, 180, 180, 30, 165,
+  30, 75, 120, 90, 165, 180, 180, 30, 165,
 };
 
 /* Par times for MAP01-MAP09. */
+
 static const int doom2_par_times[] =
 {
-    30, 90, 120, 120, 90, 150, 120, 120, 270,
+  30, 90, 120, 120, 90, 150, 120, 120, 270,
 };
 
 /* Player colors. */
+
 static const char *player_colors[] =
 {
-    "Green", "Indigo", "Brown", "Red"
+  "Green",
+  "Indigo",
+  "Brown",
+  "Red",
 };
 
-// Array of end-of-level statistics that have been captured.
+/* Array of end-of-level statistics that have been captured. */
 
-#define MAX_CAPTURES 32
 static wbstartstruct_t captured_stats[MAX_CAPTURES];
 static int num_captured_stats = 0;
 
-static GameMission_t discovered_gamemission = none;
+static gamemission_t discovered_gamemission = none;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
 /* Try to work out whether this is a Doom 1 or Doom 2 game, by looking
  * at the episode and map, and the par times.  This is used to decide
  * how to format the level name.  Unfortunately, in some cases it is
- * impossible to determine whether this is Doom 1 or Doom 2. */
+ * impossible to determine whether this is Doom 1 or Doom 2.
+ */
 
-static void DiscoverGamemode(const wbstartstruct_t *stats, int num_stats)
+static void discover_game_mode(const wbstartstruct_t *stats, int num_stats)
 {
-    int partime;
-    int level;
-    int i;
+  int partime;
+  int level;
+  int i;
 
-    if (discovered_gamemission != none)
+  if (discovered_gamemission != none)
     {
-        return;
+      return;
     }
 
-    for (i=0; i<num_stats; ++i)
+  for (i = 0; i < num_stats; ++i)
     {
-        level = stats[i].last;
+      level = stats[i].last;
 
-        /* If episode 2, 3 or 4, this is Doom 1. */
+      /* If episode 2, 3 or 4, this is Doom 1. */
 
-        if (stats[i].epsd > 0)
+      if (stats[i].epsd > 0)
         {
-            discovered_gamemission = doom;
-            return;
+          discovered_gamemission = doom;
+          return;
         }
 
-        /* This is episode 1.  If this is level 10 or higher,
-           it must be Doom 2. */
+      /* This is episode 1.  If this is level 10 or higher, it must be
+       * Doom 2.
+       */
 
-        if (level >= 9)
+      if (level >= 9)
         {
-            discovered_gamemission = doom2;
-            return;
+          discovered_gamemission = doom2;
+          return;
         }
 
-        /* Try to work out if this is Doom 1 or Doom 2 by looking
-           at the par time. */
+      /* Try to work out if this is Doom 1 or Doom 2 by looking at the par
+       * time.
+       */
 
-        partime = stats[i].partime;
+      partime = stats[i].partime;
 
-        if (partime == doom1_par_times[level] * TICRATE
-         && partime != doom2_par_times[level] * TICRATE)
+      if (partime == doom1_par_times[level] * TICRATE &&
+          partime != doom2_par_times[level] * TICRATE)
         {
-            discovered_gamemission = doom;
-            return;
+          discovered_gamemission = doom;
+          return;
         }
 
-        if (partime != doom1_par_times[level] * TICRATE
-         && partime == doom2_par_times[level] * TICRATE)
+      if (partime != doom1_par_times[level] * TICRATE &&
+          partime == doom2_par_times[level] * TICRATE)
         {
-            discovered_gamemission = doom2;
-            return;
+          discovered_gamemission = doom2;
+          return;
         }
     }
 }
 
 /* Returns the number of players active in the given stats buffer. */
 
-static int GetNumPlayers(const wbstartstruct_t *stats)
+static int get_num_players(const wbstartstruct_t *stats)
 {
-    int i;
-    int num_players = 0;
+  int i;
+  int num_players = 0;
 
-    for (i=0; i<MAXPLAYERS; ++i)
+  for (i = 0; i < MAXPLAYERS; ++i)
     {
-        if (stats->plyr[i].in)
+      if (stats->plyr[i].in)
         {
-            ++num_players;
+          ++num_players;
         }
     }
 
-    return num_players;
+  return num_players;
 }
 
-static void PrintBanner(FILE *stream)
+static void print_banner(FILE *stream)
 {
-    fprintf(stream, "===========================================\n");
+  fprintf(stream, "===========================================\n");
 }
 
-static void PrintPercentage(FILE *stream, int amount, int total)
+static void print_percentage(FILE *stream, int amount, int total)
 {
-    if (total == 0)
+  if (total == 0)
     {
-        fprintf(stream, "0");
+      fprintf(stream, "0");
     }
-    else
+  else
     {
-        fprintf(stream, "%i / %i", amount, total);
+      fprintf(stream, "%i / %i", amount, total);
 
-        // statdump.exe is a 16-bit program, so very occasionally an
-        // integer overflow can occur when doing this calculation with
-        // a large value. Therefore, cast to short to give the same
-        // output.
+      /* statdump.exe is a 16-bit program, so very occasionally an
+       * integer overflow can occur when doing this calculation with
+       * a large value. Therefore, cast to short to give the same
+       * output.
+       */
 
-        fprintf(stream, " (%i%%)", (short) (amount * 100) / total);
+      fprintf(stream, " (%i%%)", (short)(amount * 100) / total);
     }
 }
 
 /* Display statistics for a single player. */
 
-static void PrintPlayerStats(FILE *stream, const wbstartstruct_t *stats,
-        int player_num)
+static void print_player_stats(FILE *stream, const wbstartstruct_t *stats,
+                             int player_num)
 {
-    const wbplayerstruct_t *player = &stats->plyr[player_num];
+  const wbplayerstruct_t *player = &stats->plyr[player_num];
 
-    fprintf(stream, "Player %i (%s):\n", player_num + 1,
-            player_colors[player_num]);
+  fprintf(stream, "Player %i (%s):\n", player_num + 1,
+          player_colors[player_num]);
 
-    /* Kills percentage */
+  /* Kills percentage */
 
-    fprintf(stream, "\tKills: ");
-    PrintPercentage(stream, player->skills, stats->maxkills);
-    fprintf(stream, "\n");
+  fprintf(stream, "\tKills: ");
+  print_percentage(stream, player->skills, stats->maxkills);
+  fprintf(stream, "\n");
 
-    /* Items percentage */
+  /* Items percentage */
 
-    fprintf(stream, "\tItems: ");
-    PrintPercentage(stream, player->sitems, stats->maxitems);
-    fprintf(stream, "\n");
+  fprintf(stream, "\tItems: ");
+  print_percentage(stream, player->sitems, stats->maxitems);
+  fprintf(stream, "\n");
 
-    /* Secrets percentage */
+  /* Secrets percentage */
 
-    fprintf(stream, "\tSecrets: ");
-    PrintPercentage(stream, player->ssecret, stats->maxsecret);
-    fprintf(stream, "\n");
+  fprintf(stream, "\tSecrets: ");
+  print_percentage(stream, player->ssecret, stats->maxsecret);
+  fprintf(stream, "\n");
 }
 
 /* Frags table for multiplayer games. */
 
-static void PrintFragsTable(FILE *stream, const wbstartstruct_t *stats)
+static void print_frags_table(FILE *stream, const wbstartstruct_t *stats)
 {
-    int x, y;
+  int x;
+  int y;
 
-    fprintf(stream, "Frags:\n");
+  fprintf(stream, "Frags:\n");
 
-    /* Print header */
+  /* Print header */
 
-    fprintf(stream, "\t\t");
+  fprintf(stream, "\t\t");
 
-    for (x=0; x<MAXPLAYERS; ++x)
+  for (x = 0; x < MAXPLAYERS; ++x)
     {
-
-        if (!stats->plyr[x].in)
+      if (!stats->plyr[x].in)
         {
-            continue;
+          continue;
         }
 
-        fprintf(stream, "%s\t", player_colors[x]);
+      fprintf(stream, "%s\t", player_colors[x]);
     }
 
-    fprintf(stream, "\n");
+  fprintf(stream, "\n");
 
-    fprintf(stream, "\t\t-------------------------------- VICTIMS\n");
+  fprintf(stream, "\t\t-------------------------------- VICTIMS\n");
 
-    /* Print table */
+  /* Print table */
 
-    for (y=0; y<MAXPLAYERS; ++y)
+  for (y = 0; y < MAXPLAYERS; ++y)
     {
-        if (!stats->plyr[y].in)
+      if (!stats->plyr[y].in)
         {
-            continue;
+          continue;
         }
 
-        fprintf(stream, "\t%s\t|", player_colors[y]);
+      fprintf(stream, "\t%s\t|", player_colors[y]);
 
-        for (x=0; x<MAXPLAYERS; ++x)
+      for (x = 0; x < MAXPLAYERS; ++x)
         {
-            if (!stats->plyr[x].in)
+          if (!stats->plyr[x].in)
             {
-                continue;
+              continue;
             }
 
-            fprintf(stream, "%i\t", stats->plyr[y].frags[x]);
+          fprintf(stream, "%i\t", stats->plyr[y].frags[x]);
         }
 
-        fprintf(stream, "\n");
+      fprintf(stream, "\n");
     }
 
-    fprintf(stream, "\t\t|\n");
-    fprintf(stream, "\t     KILLERS\n");
+  fprintf(stream, "\t\t|\n");
+  fprintf(stream, "\t     KILLERS\n");
 }
 
 /* Displays the level name: MAPxy or ExMy, depending on game mode. */
 
-static void PrintLevelName(FILE *stream, int episode, int level)
+static void print_level_name(FILE *stream, int episode, int level)
 {
-    PrintBanner(stream);
+  print_banner(stream);
 
-    switch (discovered_gamemission)
+  switch (discovered_gamemission)
     {
-
-        case doom:
-            fprintf(stream, "E%iM%i\n", episode + 1, level + 1);
-            break;
-        case doom2:
-            fprintf(stream, "MAP%02i\n", level + 1);
-            break;
-        default:
-        case none:
-            fprintf(stream, "E%iM%i / MAP%02i\n", 
-                    episode + 1, level + 1, level + 1);
-            break;
+    case doom:
+      fprintf(stream, "E%iM%i\n", episode + 1, level + 1);
+      break;
+    case doom2:
+      fprintf(stream, "MAP%02i\n", level + 1);
+      break;
+    default:
+    case none:
+      fprintf(stream, "E%iM%i / MAP%02i\n", episode + 1, level + 1,
+              level + 1);
+      break;
     }
 
-    PrintBanner(stream);
+  print_banner(stream);
 }
 
 /* Print details of a statistics buffer to the given file. */
 
-static void PrintStats(FILE *stream, const wbstartstruct_t *stats)
+static void print_stats(FILE *stream, const wbstartstruct_t *stats)
 {
-    short leveltime, partime;
-    int i;
+  short leveltime;
+  short partime;
+  int i;
 
-    PrintLevelName(stream, stats->epsd, stats->last);
-    fprintf(stream, "\n");
+  print_level_name(stream, stats->epsd, stats->last);
+  fprintf(stream, "\n");
 
-    leveltime = stats->plyr[0].stime / TICRATE;
-    partime = stats->partime / TICRATE;
-    fprintf(stream, "Time: %i:%02i", leveltime / 60, leveltime % 60);
-    fprintf(stream, " (par: %i:%02i)\n", partime / 60, partime % 60);
-    fprintf(stream, "\n");
+  leveltime = stats->plyr[0].stime / TICRATE;
+  partime = stats->partime / TICRATE;
+  fprintf(stream, "Time: %i:%02i", leveltime / 60, leveltime % 60);
+  fprintf(stream, " (par: %i:%02i)\n", partime / 60, partime % 60);
+  fprintf(stream, "\n");
 
-    for (i=0; i<MAXPLAYERS; ++i)
+  for (i = 0; i < MAXPLAYERS; ++i)
     {
-        if (stats->plyr[i].in)
+      if (stats->plyr[i].in)
         {
-            PrintPlayerStats(stream, stats, i);
+          print_player_stats(stream, stats, i);
         }
     }
 
-    if (GetNumPlayers(stats) >= 2)
+  if (get_num_players(stats) >= 2)
     {
-        PrintFragsTable(stream, stats);
+      print_frags_table(stream, stats);
     }
 
-    fprintf(stream, "\n");
+  fprintf(stream, "\n");
 }
 
-void StatCopy(const wbstartstruct_t *stats)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void stat_copy(const wbstartstruct_t *stats)
 {
-    if (M_ParmExists("-statdump") && num_captured_stats < MAX_CAPTURES)
+  if (m_parm_exists("-statdump") && num_captured_stats < MAX_CAPTURES)
     {
-        memcpy(&captured_stats[num_captured_stats], stats,
-               sizeof(wbstartstruct_t));
-        ++num_captured_stats;
+      memcpy(&captured_stats[num_captured_stats], stats,
+             sizeof(wbstartstruct_t));
+      ++num_captured_stats;
     }
 }
 
-void StatDump(void)
+void stat_dump(void)
 {
-    FILE *dumpfile;
-    int i;
+  FILE *dumpfile;
+  int i;
 
-    //!
-    // @category compat
-    // @arg <filename>
-    //
-    // Dump statistics information to the specified file on the levels
-    // that were played. The output from this option matches the output
-    // from statdump.exe (see ctrlapi.zip in the /idgames archive).
-    //
+  /* @category compat
+   * @arg <filename>
+   *
+   * Dump statistics information to the specified file on the levels
+   * that were played. The output from this option matches the output
+   * from statdump.exe (see ctrlapi.zip in the /idgames archive).
+   */
 
-    i = M_CheckParmWithArgs("-statdump", 1);
+  i = m_check_parm_with_args("-statdump", 1);
 
-    if (i > 0)
+  if (i > 0)
     {
-        printf("Statistics captured for %i level(s)\n", num_captured_stats);
+      printf("Statistics captured for %i level(s)\n", num_captured_stats);
 
-        // We actually know what the real gamemission is, but this has
-        // to match the output from statdump.exe.
+      /* We actually know what the real gamemission is, but this has
+       * to match the output from statdump.exe.
+       */
 
-        DiscoverGamemode(captured_stats, num_captured_stats);
+      discover_game_mode(captured_stats, num_captured_stats);
 
-        // Allow "-" as output file, for stdout.
+      /* Allow "-" as output file, for stdout. */
 
-        if (strcmp(myargv[i + 1], "-") != 0)
+      if (strcmp(myargv[i + 1], "-") != 0)
         {
-            dumpfile = M_fopen(myargv[i + 1], "w");
+          dumpfile = fopen(myargv[i + 1], "w");
         }
-        else
+      else
         {
-            dumpfile = stdout;
+          dumpfile = stdout;
         }
 
-        for (i = 0; i < num_captured_stats; ++i)
+      for (i = 0; i < num_captured_stats; ++i)
         {
-            PrintStats(dumpfile, &captured_stats[i]);
+          print_stats(dumpfile, &captured_stats[i]);
         }
 
-        if (dumpfile != stdout)
+      if (dumpfile != stdout)
         {
-            fclose(dumpfile);
+          fclose(dumpfile);
         }
     }
 }
-
diff --git a/games/NXDoom/src/doom/statdump.h b/games/NXDoom/src/doom/statdump.h
index f4f11efe6..57073aa08 100644
--- a/games/NXDoom/src/doom/statdump.h
+++ b/games/NXDoom/src/doom/statdump.h
@@ -1,23 +1,30 @@
- /*
-
- Copyright(C) 2005-2014 Simon Howard
-
- 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.
-
- */
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/statdump.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef DOOM_STATDUMP_H
 #define DOOM_STATDUMP_H
 
-void StatCopy(const wbstartstruct_t *stats);
-void StatDump(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef DOOM_STATDUMP_H */
+void stat_copy(const wbstartstruct_t *stats);
+void stat_dump(void);
+
+#endif /* DOOM_STATDUMP_H */
diff --git a/games/NXDoom/src/doom/wi_stuff.c b/games/NXDoom/src/doom/wi_stuff.c
index 965cc5571..724aa3320 100644
--- a/games/NXDoom/src/doom/wi_stuff.c
+++ b/games/NXDoom/src/doom/wi_stuff.c
@@ -1,21 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Intermission screens.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/wi_stuff.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Intermission screens.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
@@ -33,232 +41,279 @@
 #include "g_game.h"
 
 #include "r_local.h"
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
 #include "s_sound.h"
+#include "sounds.h"
+#endif
 
 #include "doomstat.h"
 
-// Data.
-#include "sounds.h"
+/* Needs access to LFB. */
 
-// Needs access to LFB.
 #include "v_video.h"
 
 #include "wi_stuff.h"
 
-//
-// Data needed to add patches to full screen intermission pics.
-// Patches are statistics messages, and animations.
-// Loads of by-pixel layout and placement, offsets etc.
-//
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
 
+/* Data needed to add patches to full screen intermission pics.
+ * Patches are statistics messages, and animations.
+ * Loads of by-pixel layout and placement, offsets etc.
+ */
 
-//
-// Different vetween registered DOOM (1994) and
-//  Ultimate DOOM - Final edition (retail, 1995?).
-// This is supposedly ignored for commercial
-//  release (aka DOOM II), which had 34 maps
-//  in one episode. So there.
-#define NUMEPISODES	4
-#define NUMMAPS		9
+/* Different between registered DOOM (1994) and
+ *  Ultimate DOOM - Final edition (retail, 1995?).
+ * This is supposedly ignored for commercial
+ *  release (aka DOOM II), which had 34 maps
+ *  in one episode. So there.
+ */
 
+#define NUMEPISODES 4
+#define NUMMAPS 9
 
-// in tics
-//U #define PAUSELEN		(TICRATE*2) 
-//U #define SCORESTEP		100
-//U #define ANIMPERIOD		32
-// pixel distance from "(YOU)" to "PLAYER N"
-//U #define STARDIST		10 
-//U #define WK 1
+/* in tics
+ * U #define PAUSELEN    (TICRATE*2)
+ * U #define SCORESTEP    100
+ * U #define ANIMPERIOD    32
+ * pixel distance from "(YOU)" to "PLAYER N"
+ * U #define STARDIST    10
+ * U #define WK 1
+ */
 
+/* GLOBAL LOCATIONS */
 
-// GLOBAL LOCATIONS
-#define WI_TITLEY		2
-#define WI_SPACINGY    		33
+#define WI_TITLEY 2
+#define WI_SPACINGY 33
 
-// SINGPLE-PLAYER STUFF
-#define SP_STATSX		50
-#define SP_STATSY		50
+/* SINGLE-PLAYER STUFF */
 
-#define SP_TIMEX		16
-#define SP_TIMEY		(SCREENHEIGHT-32)
+#define SP_STATSX 50
+#define SP_STATSY 50
 
+#define SP_TIMEX 16
+#define SP_TIMEY (SCREENHEIGHT - 32)
 
-// NET GAME STUFF
-#define NG_STATSY		50
-#define NG_STATSX		(32 + SHORT(star->width)/2 + 32*!dofrags)
+/* NET GAME STUFF */
 
-#define NG_SPACINGX    		64
+#define NG_STATSY 50
+#define NG_STATSX (32 + SHORT(star->width) / 2 + 32 * !dofrags)
 
+#define NG_SPACINGX 64
 
-// DEATHMATCH STUFF
-#define DM_MATRIXX		42
-#define DM_MATRIXY		68
+/* DEATHMATCH STUFF */
 
-#define DM_SPACINGX		40
+#define DM_MATRIXX 42
+#define DM_MATRIXY 68
 
-#define DM_TOTALSX		269
+#define DM_SPACINGX 40
 
-#define DM_KILLERSX		10
-#define DM_KILLERSY		100
-#define DM_VICTIMSX    		5
-#define DM_VICTIMSY		50
+#define DM_TOTALSX 269
 
+#define DM_KILLERSX 10
+#define DM_KILLERSY 100
+#define DM_VICTIMSX 5
+#define DM_VICTIMSY 50
 
+/* Animation locations for episode 0 (1).
+ * Using patches saves a lot of space,
+ *  as they replace 320x200 full screen frames.
+ */
 
+#define ANIM(type, period, nanims, x, y, nexttic)                            \
+  {(type), (period), (nanims), {(x), (y)}, (nexttic), 0, {NULL, NULL, NULL}, \
+   0,      0,        0,        0}
+
+/* GENERAL DATA */
+
+/* Locally used stuff. */
+
+/* States for single-player */
+
+#define SP_KILLS 0
+#define SP_ITEMS 2
+#define SP_SECRET 4
+#define SP_FRAGS 6
+#define SP_TIME 8
+#define SP_PAR ST_TIME
+
+#define SP_PAUSE 1
+
+/* in seconds */
+
+#define SHOWNEXTLOCDELAY 4
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef enum
 {
-    ANIM_ALWAYS,
-    ANIM_RANDOM,
-    ANIM_LEVEL
-
+  ANIM_ALWAYS,
+  ANIM_RANDOM,
+  ANIM_LEVEL
 } animenum_t;
 
+/* States for the intermission */
+
+typedef enum
+{
+  NO_STATE = -1,
+  STAT_COUNT,
+  SHOW_NEXT_LOC,
+} stateenum_t;
+
 typedef struct
 {
-    int		x;
-    int		y;
-    
+  int x;
+  int y;
 } point_t;
 
+/* Animation.
+ * There is another anim_t used in p_spec.
+ */
 
-//
-// Animation.
-// There is another anim_t used in p_spec.
-//
 typedef struct
 {
-    animenum_t	type;
+  animenum_t type;
 
-    // period in tics between animations
-    int		period;
+  /* period in tics between animations */
 
-    // number of animation frames
-    int		nanims;
+  int period;
 
-    // location of animation
-    point_t	loc;
+  /* number of animation frames */
 
-    // ALWAYS: n/a,
-    // RANDOM: period deviation (<256),
-    // LEVEL: level
-    int		data1;
+  int nanims;
 
-    // ALWAYS: n/a,
-    // RANDOM: random base period,
-    // LEVEL: n/a
-    int		data2; 
+  /* location of animation */
 
-    // actual graphics for frames of animations
-    patch_t*	p[3]; 
+  point_t loc;
 
-    // following must be initialized to zero before use!
+  /* ALWAYS: n/a,
+   * RANDOM: period deviation (<256),
+   * LEVEL: level
+   */
 
-    // next value of bcnt (used in conjunction with period)
-    int		nexttic;
+  int data1;
 
-    // last drawn animation frame
-    int		lastdrawn;
+  /* ALWAYS: n/a,
+   * RANDOM: random base period,
+   * LEVEL: n/a
+   */
 
-    // next frame number to animate
-    int		ctr;
-    
-    // used by RANDOM and LEVEL when animating
-    int		state;  
+  int data2;
 
+  /* actual graphics for frames of animations */
+
+  patch_t *p[3];
+
+  /* following must be initialized to zero before use! */
+
+  /* next value of bcnt (used in conjunction with period) */
+
+  int nexttic;
+
+  /* last drawn animation frame */
+
+  int lastdrawn;
+
+  /* next frame number to animate */
+
+  int ctr;
+
+  /* used by RANDOM and LEVEL when animating */
+
+  int state;
 } anim_t;
 
+typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
 static point_t lnodes[NUMEPISODES][NUMMAPS] =
 {
-    // Episode 0 World Map
+    /* Episode 0 World Map */
+
     {
-	{ 185, 164 },	// location of level 0 (CJ)
-	{ 148, 143 },	// location of level 1 (CJ)
-	{ 69, 122 },	// location of level 2 (CJ)
-	{ 209, 102 },	// location of level 3 (CJ)
-	{ 116, 89 },	// location of level 4 (CJ)
-	{ 166, 55 },	// location of level 5 (CJ)
-	{ 71, 56 },	// location of level 6 (CJ)
-	{ 135, 29 },	// location of level 7 (CJ)
-	{ 71, 24 }	// location of level 8 (CJ)
+        {185, 164}, /* location of level 0 (CJ) */
+        {148, 143}, /* location of level 1 (CJ) */
+        {69, 122},  /* location of level 2 (CJ) */
+        {209, 102}, /* location of level 3 (CJ) */
+        {116, 89},  /* location of level 4 (CJ) */
+        {166, 55},  /* location of level 5 (CJ) */
+        {71, 56},   /* location of level 6 (CJ) */
+        {135, 29},  /* location of level 7 (CJ) */
+        {71, 24},   /* location of level 8 (CJ) */
     },
 
-    // Episode 1 World Map should go here
+    /* Episode 1 World Map should go here */
+
     {
-	{ 254, 25 },	// location of level 0 (CJ)
-	{ 97, 50 },	// location of level 1 (CJ)
-	{ 188, 64 },	// location of level 2 (CJ)
-	{ 128, 78 },	// location of level 3 (CJ)
-	{ 214, 92 },	// location of level 4 (CJ)
-	{ 133, 130 },	// location of level 5 (CJ)
-	{ 208, 136 },	// location of level 6 (CJ)
-	{ 148, 140 },	// location of level 7 (CJ)
-	{ 235, 158 }	// location of level 8 (CJ)
+        {254, 25},  /* location of level 0 (CJ) */
+        {97, 50},   /* location of level 1 (CJ) */
+        {188, 64},  /* location of level 2 (CJ) */
+        {128, 78},  /* location of level 3 (CJ) */
+        {214, 92},  /* location of level 4 (CJ) */
+        {133, 130}, /* location of level 5 (CJ) */
+        {208, 136}, /* location of level 6 (CJ) */
+        {148, 140}, /* location of level 7 (CJ) */
+        {235, 158}, /* location of level 8 (CJ) */
     },
 
-    // Episode 2 World Map should go here
-    {
-	{ 156, 168 },	// location of level 0 (CJ)
-	{ 48, 154 },	// location of level 1 (CJ)
-	{ 174, 95 },	// location of level 2 (CJ)
-	{ 265, 75 },	// location of level 3 (CJ)
-	{ 130, 48 },	// location of level 4 (CJ)
-	{ 279, 23 },	// location of level 5 (CJ)
-	{ 198, 48 },	// location of level 6 (CJ)
-	{ 140, 25 },	// location of level 7 (CJ)
-	{ 281, 136 }	// location of level 8 (CJ)
-    }
+    /* Episode 2 World Map should go here */
 
+    {
+        {156, 168}, /* location of level 0 (CJ) */
+        {48, 154},  /* location of level 1 (CJ) */
+        {174, 95},  /* location of level 2 (CJ) */
+        {265, 75},  /* location of level 3 (CJ) */
+        {130, 48},  /* location of level 4 (CJ) */
+        {279, 23},  /* location of level 5 (CJ) */
+        {198, 48},  /* location of level 6 (CJ) */
+        {140, 25},  /* location of level 7 (CJ) */
+        {281, 136}, /* location of level 8 (CJ) */
+    },
 };
 
-
-//
-// Animation locations for episode 0 (1).
-// Using patches saves a lot of space,
-//  as they replace 320x200 full screen frames.
-//
-
-#define ANIM(type, period, nanims, x, y, nexttic)            \
-   { (type), (period), (nanims), { (x), (y) }, (nexttic),    \
-     0, { NULL, NULL, NULL }, 0, 0, 0, 0 }
-
-
 static anim_t epsd0animinfo[] =
 {
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 224, 104, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 184, 160, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 112, 136, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 72, 112, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 88, 96, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 48, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 192, 40, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 136, 16, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 80, 16, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 24, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 224, 104, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 184, 160, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 112, 136, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 72, 112, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 88, 96, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 64, 48, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 192, 40, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 136, 16, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 80, 16, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 64, 24, 0),
 };
 
 static anim_t epsd1animinfo[] =
 {
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 1),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 2),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 3),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 4),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 5),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 6),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 7),
-    ANIM(ANIM_LEVEL, TICRATE/3, 3, 192, 144, 8),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 8),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 1),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 2),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 3),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 4),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 5),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 6),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 7),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 3, 192, 144, 8),
+    ANIM(ANIM_LEVEL, TICRATE / 3, 1, 128, 136, 8),
 };
 
 static anim_t epsd2animinfo[] =
 {
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 168, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 40, 136, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 160, 96, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 80, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 120, 32, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/4, 3, 40, 0, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 104, 168, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 40, 136, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 160, 96, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 104, 80, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 3, 3, 120, 32, 0),
+    ANIM(ANIM_ALWAYS, TICRATE / 4, 3, 40, 0, 0),
 };
 
 static int NUMANIMS[NUMEPISODES] =
@@ -272,1562 +327,1567 @@ static anim_t *anims[NUMEPISODES] =
 {
     epsd0animinfo,
     epsd1animinfo,
-    epsd2animinfo
+    epsd2animinfo,
 };
 
+/* used to accelerate or skip a stage */
 
-//
-// GENERAL DATA
-//
+static int acceleratestage;
 
-//
-// Locally used stuff.
-//
+/* wbs->pnum */
 
-// States for single-player
-#define SP_KILLS		0
-#define SP_ITEMS		2
-#define SP_SECRET		4
-#define SP_FRAGS		6 
-#define SP_TIME			8 
-#define SP_PAR			ST_TIME
+static int me;
 
-#define SP_PAUSE		1
+/* specifies current state */
 
-// in seconds
-#define SHOWNEXTLOCDELAY	4
-//#define SHOWLASTLOCDELAY	SHOWNEXTLOCDELAY
+static stateenum_t state;
 
+/* contains information passed into intermission */
 
-// used to accelerate or skip a stage
-static int		acceleratestage;
+static wbstartstruct_t *wbs;
 
-// wbs->pnum
-static int		me;
+static wbplayerstruct_t *plrs; /* wbs->plyr[] */
 
- // specifies current state
-static stateenum_t	state;
+/* used for general timing */
 
-// contains information passed into intermission
-static wbstartstruct_t*	wbs;
+static int cnt;
 
-static wbplayerstruct_t* plrs;  // wbs->plyr[]
+/* used for timing of background animation */
 
-// used for general timing
-static int 		cnt;  
+static int bcnt;
 
-// used for timing of background animation
-static int 		bcnt;
+/* signals to refresh everything for one frame */
 
-// signals to refresh everything for one frame
-static int 		firstrefresh; 
+static int firstrefresh;
 
-static int		cnt_kills[MAXPLAYERS];
-static int		cnt_items[MAXPLAYERS];
-static int		cnt_secret[MAXPLAYERS];
-static int		cnt_time;
-static int		cnt_par;
-static int		cnt_pause;
+static int cnt_kills[MAXPLAYERS];
+static int cnt_items[MAXPLAYERS];
+static int cnt_secret[MAXPLAYERS];
+static int cnt_time;
+static int cnt_par;
+static int cnt_pause;
 
-// # of commercial levels
-static int		NUMCMAPS; 
+/* # of commercial levels */
 
+static int NUMCMAPS;
 
-//
-//	GRAPHICS
-//
+/* GRAPHICS */
 
-// You Are Here graphic
-static patch_t*		yah[3] = { NULL, NULL, NULL }; 
+/* You Are Here graphic */
 
-// splat
-static patch_t*		splat[2] = { NULL, NULL };
+static patch_t *yah[3] =
+{
+  NULL,
+  NULL,
+  NULL,
+};
 
-// %, : graphics
-static patch_t*		percent;
-static patch_t*		colon;
+/* splat */
 
-// 0-9 graphic
-static patch_t*		num[10];
+static patch_t *splat[2] =
+{
+  NULL,
+  NULL,
+};
 
-// minus sign
-static patch_t*		wiminus;
+/* %, : graphics */
 
-// "Finished!" graphics
-static patch_t*		finished;
+static patch_t *percent;
+static patch_t *colon;
 
-// "Entering" graphic
-static patch_t*		entering; 
+/* 0-9 graphic */
 
-// "secret"
-static patch_t*		sp_secret;
+static patch_t *num[10];
 
- // "Kills", "Scrt", "Items", "Frags"
-static patch_t*		kills;
-static patch_t*		secret;
-static patch_t*		items;
-static patch_t*		frags;
+/* minus sign */
 
-// Time sucks.
-static patch_t*		timepatch;
-static patch_t*		par;
-static patch_t*		sucks;
+static patch_t *wiminus;
 
-// "killers", "victims"
-static patch_t*		killers;
-static patch_t*		victims; 
+/* "Finished!" graphics */
 
-// "Total", your face, your dead face
-static patch_t*		total;
-static patch_t*		star;
-static patch_t*		bstar;
+static patch_t *finished;
 
-// "red P[1..MAXPLAYERS]"
-static patch_t*		p[MAXPLAYERS];
+/* "Entering" graphic */
 
-// "gray P[1..MAXPLAYERS]"
-static patch_t*		bp[MAXPLAYERS];
+static patch_t *entering;
 
- // Name graphics of each level (centered)
-static patch_t**	lnames;
+/* "secret" */
+
+static patch_t *sp_secret;
+
+/* "Kills", "Scrt", "Items", "Frags" */
+
+static patch_t *kills;
+static patch_t *secret;
+static patch_t *items;
+static patch_t *frags;
+
+/* Time sucks. */
+
+static patch_t *timepatch;
+static patch_t *par;
+static patch_t *sucks;
+
+/* "killers", "victims" */
+
+static patch_t *killers;
+static patch_t *victims;
+
+/* "Total", your face, your dead face */
+
+static patch_t *total;
+static patch_t *star;
+static patch_t *bstar;
+
+/* "red P[1..MAXPLAYERS]" */
+
+static patch_t *p[MAXPLAYERS];
+
+/* "gray P[1..MAXPLAYERS]" */
+
+static patch_t *bp[MAXPLAYERS];
+
+/* Name graphics of each level (centered) */
+
+static patch_t **lnames;
+
+/* Buffer storing the backdrop */
 
-// Buffer storing the backdrop
 static patch_t *background;
 
-//
-// CODE
-//
+static int dm_state;
+static int dm_frags[MAXPLAYERS][MAXPLAYERS];
+static int dm_totals[MAXPLAYERS];
 
-// slam background
-void WI_slamBackground(void)
+static int cnt_frags[MAXPLAYERS];
+static int dofrags;
+static int ng_state;
+
+static int sp_state;
+
+static boolean snl_pointeron = false;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Common load/unload function.  Iterates over all the graphics
+ * lumps to be loaded/unloaded into memory.
+ */
+
+static void wi_load_unload_data(load_callback_t callback)
 {
-    V_DrawPatch(0, 0, background);
-}
+  int8_t i;
+  int8_t j;
+  char name[9];
+  anim_t *a;
 
-// The ticker is used to detect keys
-//  because of timing issues in netgames.
-boolean WI_Responder(event_t* ev)
-{
-    return false;
-}
-
-
-// Draws "<Levelname> Finished!"
-void WI_drawLF(void)
-{
-    int y = WI_TITLEY;
-
-    if (gamemode != commercial || wbs->last < NUMCMAPS)
+  if (gamemode == commercial)
     {
-        // draw <LevelName> 
-        V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2,
-                    y, lnames[wbs->last]);
-
-        // draw "Finished!"
-        y += (5*SHORT(lnames[wbs->last]->height))/4;
-
-        V_DrawPatch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
+      for (i = 0; i < NUMCMAPS; i++)
+        {
+          snprintf(name, sizeof(name), "CWILV%2.2d", i);
+          callback(name, &lnames[i]);
+        }
     }
-    else if (wbs->last == NUMCMAPS)
+  else
     {
-        // MAP33 - draw "Finished!" only
-        V_DrawPatch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
-    }
-    else if (wbs->last > NUMCMAPS)
-    {
-        // > MAP33.  Doom bombs out here with a Bad V_DrawPatch error.
-        // I'm pretty sure that doom2.exe is just reading into random
-        // bits of memory at this point, but let's try to be accurate
-        // anyway.  This deliberately triggers a V_DrawPatch error.
+      for (i = 0; i < NUMMAPS; i++)
+        {
+          snprintf(name, sizeof(name), "WILV%d%d", wbs->epsd, i);
+          callback(name, &lnames[i]);
+        }
 
-        patch_t tmp = { SCREENWIDTH, SCREENHEIGHT, 1, 1, 
-                        { 0, 0, 0, 0, 0, 0, 0, 0 } };
+      /* you are here */
 
-        V_DrawPatch(0, y, &tmp);
-    }
-}
+      callback(("WIURH0"), &yah[0]);
 
+      /* you are here (alt.) */
 
+      callback(("WIURH1"), &yah[1]);
 
-// Draws "Entering <LevelName>"
-void WI_drawEL(void)
-{
-    int y = WI_TITLEY;
+      /* splat */
 
-    // draw "Entering"
-    V_DrawPatch((SCREENWIDTH - SHORT(entering->width))/2,
-		y,
-                entering);
+      callback(("WISPLAT"), &splat[0]);
 
-    // draw level
-    y += (5*SHORT(lnames[wbs->next]->height))/4;
+      if (wbs->epsd < 3)
+        {
+          for (j = 0; j < NUMANIMS[wbs->epsd]; j++)
+            {
+              a = &anims[wbs->epsd][j];
+              for (i = 0; i < a->nanims; i++)
+                {
+                  /* MONDO HACK! */
 
-    V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->next]->width))/2,
-		y, 
-                lnames[wbs->next]);
+                  if (wbs->epsd != 1 || j != 8)
+                    {
+                      /* animations */
 
-}
+                      snprintf(name, sizeof(name), "WIA%d%.2d%.2d",
+                               wbs->epsd, j, i);
+                      callback(name, &a->p[i]);
+                    }
+                  else
+                    {
+                      /* HACK ALERT! */
 
-void
-WI_drawOnLnode
-( int		n,
-  patch_t*	c[] )
-{
-
-    int		i;
-    int		left;
-    int		top;
-    int		right;
-    int		bottom;
-    boolean	fits = false;
-
-    i = 0;
-    do
-    {
-	left = lnodes[wbs->epsd][n].x - SHORT(c[i]->leftoffset);
-	top = lnodes[wbs->epsd][n].y - SHORT(c[i]->topoffset);
-	right = left + SHORT(c[i]->width);
-	bottom = top + SHORT(c[i]->height);
-
-	if (left >= 0
-	    && right < SCREENWIDTH
-	    && top >= 0
-	    && bottom < SCREENHEIGHT)
-	{
-	    fits = true;
-	}
-	else
-	{
-	    i++;
-	}
-    } while (!fits && i!=2 && c[i] != NULL);
-
-    if (fits && i<2)
-    {
-	V_DrawPatch(lnodes[wbs->epsd][n].x,
-                    lnodes[wbs->epsd][n].y,
-		    c[i]);
-    }
-    else
-    {
-	// DEBUG
-	printf("Could not place patch on level %d", n+1); 
-    }
-}
-
-
-
-void WI_initAnimatedBack(void)
-{
-    int		i;
-    anim_t*	a;
-
-    if (gamemode == commercial)
-	return;
-
-    if (wbs->epsd > 2)
-	return;
-
-    for (i=0;i<NUMANIMS[wbs->epsd];i++)
-    {
-	a = &anims[wbs->epsd][i];
-
-	// init variables
-	a->ctr = -1;
-
-	// specify the next time to draw it
-	if (a->type == ANIM_ALWAYS)
-	    a->nexttic = bcnt + 1 + (M_Random()%a->period);
-	else if (a->type == ANIM_RANDOM)
-	    a->nexttic = bcnt + 1 + a->data2+(M_Random()%a->data1);
-	else if (a->type == ANIM_LEVEL)
-	    a->nexttic = bcnt + 1;
+                      a->p[i] = anims[1][4].p[i];
+                    }
+                }
+            }
+        }
     }
 
-}
+  /* More hacks on minus sign. */
 
-void WI_updateAnimatedBack(void)
-{
-    int		i;
-    anim_t*	a;
+  if (w_check_num_for_name(("WIMINUS")) > 0)
+    callback(("WIMINUS"), &wiminus);
+  else
+    wiminus = NULL;
 
-    if (gamemode == commercial)
-	return;
-
-    if (wbs->epsd > 2)
-	return;
-
-    for (i=0;i<NUMANIMS[wbs->epsd];i++)
+  for (i = 0; i < 10; i++)
     {
-	a = &anims[wbs->epsd][i];
-
-	if (bcnt == a->nexttic)
-	{
-	    switch (a->type)
-	    {
-	      case ANIM_ALWAYS:
-		if (++a->ctr >= a->nanims) a->ctr = 0;
-		a->nexttic = bcnt + a->period;
-		break;
-
-	      case ANIM_RANDOM:
-		a->ctr++;
-		if (a->ctr == a->nanims)
-		{
-		    a->ctr = -1;
-		    a->nexttic = bcnt+a->data2+(M_Random()%a->data1);
-		}
-		else a->nexttic = bcnt + a->period;
-		break;
-		
-	      case ANIM_LEVEL:
-		// gawd-awful hack for level anims
-		if (!(state == StatCount && i == 7)
-		    && wbs->next == a->data1)
-		{
-		    a->ctr++;
-		    if (a->ctr == a->nanims) a->ctr--;
-		    a->nexttic = bcnt + a->period;
-		}
-		break;
-	    }
-	}
+      /* numbers 0-9 */
 
+      snprintf(name, sizeof(name), "WINUM%d", i);
+      callback(name, &num[i]);
     }
 
-}
+  /* percent sign */
 
-void WI_drawAnimatedBack(void)
-{
-    int			i;
-    anim_t*		a;
+  callback(("WIPCNT"), &percent);
 
-    if (gamemode == commercial)
-	return;
+  /* "finished" */
 
-    if (wbs->epsd > 2)
-	return;
+  callback(("WIF"), &finished);
 
-    for (i=0 ; i<NUMANIMS[wbs->epsd] ; i++)
+  /* "entering" */
+
+  callback(("WIENTER"), &entering);
+
+  /* "kills" */
+
+  callback(("WIOSTK"), &kills);
+
+  /* "scrt" */
+
+  callback(("WIOSTS"), &secret);
+
+  /* "secret" */
+
+  callback(("WISCRT2"), &sp_secret);
+
+  /* french wad uses WIOBJ (?) */
+
+  if (w_check_num_for_name(("WIOBJ")) >= 0)
     {
-	a = &anims[wbs->epsd][i];
+      /* "items" */
 
-	if (a->ctr >= 0)
-	    V_DrawPatch(a->loc.x, a->loc.y, a->p[a->ctr]);
-    }
-
-}
-
-//
-// Draws a number.
-// If digits > 0, then use that many digits minimum,
-//  otherwise only use as many as necessary.
-// Returns new x position.
-//
-
-int
-WI_drawNum
-( int		x,
-  int		y,
-  int		n,
-  int		digits )
-{
-
-    int		fontwidth = SHORT(num[0]->width);
-    int		neg;
-    int		temp;
-
-    if (digits < 0)
-    {
-	if (!n)
-	{
-	    // make variable-length zeros 1 digit long
-	    digits = 1;
-	}
-	else
-	{
-	    // figure out # of digits in #
-	    digits = 0;
-	    temp = n;
-
-	    while (temp)
-	    {
-		temp /= 10;
-		digits++;
-	    }
-	}
-    }
-
-    neg = n < 0;
-    if (neg)
-	n = -n;
-
-    // if non-number, do not draw it
-    if (n == 1994)
-	return 0;
-
-    // draw the new number
-    while (digits--)
-    {
-	x -= fontwidth;
-	V_DrawPatch(x, y, num[ n % 10 ]);
-	n /= 10;
-    }
-
-    // draw a minus sign if necessary
-    if (neg && wiminus)
-	V_DrawPatch(x-=8, y, wiminus);
-
-    return x;
-
-}
-
-void
-WI_drawPercent
-( int		x,
-  int		y,
-  int		p )
-{
-    if (p < 0)
-	return;
-
-    V_DrawPatch(x, y, percent);
-    WI_drawNum(x, y, p, -1);
-}
-
-
-
-//
-// Display level completion time and par,
-//  or "sucks" message if overflow.
-//
-void
-WI_drawTime
-( int		x,
-  int		y,
-  int		t )
-{
-
-    int		div;
-    int		n;
-
-    if (t<0)
-	return;
-
-    if (t <= 61*59)
-    {
-	div = 1;
-
-	do
-	{
-	    n = (t / div) % 60;
-	    x = WI_drawNum(x, y, n, 2) - SHORT(colon->width);
-	    div *= 60;
-
-	    // draw
-	    if (div==60 || t / div)
-		V_DrawPatch(x, y, colon);
-	    
-	} while (t / div);
-    }
-    else
-    {
-	// "sucks"
-	V_DrawPatch(x - SHORT(sucks->width), y, sucks); 
-    }
-}
-
-
-void WI_End(void)
-{
-    void WI_unloadData(void);
-    WI_unloadData();
-}
-
-void WI_initNoState(void)
-{
-    state = NoState;
-    acceleratestage = 0;
-    cnt = 10;
-}
-
-void WI_updateNoState(void) {
-
-    WI_updateAnimatedBack();
-
-    if (!--cnt)
-    {
-        // Don't call WI_End yet.  G_WorldDone doesnt immediately 
-        // change gamestate, so WI_Drawer is still going to get
-        // run until that happens.  If we do that after WI_End
-        // (which unloads all the graphics), we're in trouble.
-	//WI_End();
-	G_WorldDone();
-    }
-
-}
-
-static boolean		snl_pointeron = false;
-
-
-void WI_initShowNextLoc(void)
-{
-    state = ShowNextLoc;
-    acceleratestage = 0;
-    cnt = SHOWNEXTLOCDELAY * TICRATE;
-
-    WI_initAnimatedBack();
-}
-
-void WI_updateShowNextLoc(void)
-{
-    WI_updateAnimatedBack();
-
-    if (!--cnt || acceleratestage)
-	WI_initNoState();
-    else
-	snl_pointeron = (cnt & 31) < 20;
-}
-
-void WI_drawShowNextLoc(void)
-{
-
-    int		i;
-    int		last;
-
-    WI_slamBackground();
-
-    // draw animated background
-    WI_drawAnimatedBack(); 
-
-    if ( gamemode != commercial)
-    {
-  	if (wbs->epsd > 2)
-	{
-	    WI_drawEL();
-	    return;
-	}
-	
-	last = (wbs->last == 8) ? wbs->next - 1 : wbs->last;
-
-	// draw a splat on taken cities.
-	for (i=0 ; i<=last ; i++)
-	    WI_drawOnLnode(i, splat);
-
-	// splat the secret level?
-	if (wbs->didsecret)
-	    WI_drawOnLnode(8, splat);
-
-	// draw flashing ptr
-	if (snl_pointeron)
-	    WI_drawOnLnode(wbs->next, yah); 
-    }
-
-    // draws which level you are entering..
-    if ( (gamemode != commercial)
-	 || wbs->next != 30)
-	WI_drawEL();  
-
-}
-
-void WI_drawNoState(void)
-{
-    snl_pointeron = true;
-    WI_drawShowNextLoc();
-}
-
-int WI_fragSum(int playernum)
-{
-    int		i;
-    int		frags = 0;
-    
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i]
-	    && i!=playernum)
-	{
-	    frags += plrs[playernum].frags[i];
-	}
-    }
-
-	
-    // JDC hack - negative frags.
-    frags -= plrs[playernum].frags[playernum];
-    // UNUSED if (frags < 0)
-    // 	frags = 0;
-
-    return frags;
-}
-
-
-
-static int		dm_state;
-static int		dm_frags[MAXPLAYERS][MAXPLAYERS];
-static int		dm_totals[MAXPLAYERS];
-
-
-
-void WI_initDeathmatchStats(void)
-{
-
-    int		i;
-    int		j;
-
-    state = StatCount;
-    acceleratestage = 0;
-    dm_state = 1;
-
-    cnt_pause = TICRATE;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i])
-	{
-	    for (j=0 ; j<MAXPLAYERS ; j++)
-		if (playeringame[j])
-		    dm_frags[i][j] = 0;
-
-	    dm_totals[i] = 0;
-	}
-    }
-    
-    WI_initAnimatedBack();
-}
-
-
-
-void WI_updateDeathmatchStats(void)
-{
-
-    int		i;
-    int		j;
-    
-    boolean	stillticking;
-
-    WI_updateAnimatedBack();
-
-    if (acceleratestage && dm_state != 4)
-    {
-	acceleratestage = 0;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (playeringame[i])
-	    {
-		for (j=0 ; j<MAXPLAYERS ; j++)
-		    if (playeringame[j])
-			dm_frags[i][j] = plrs[i].frags[j];
-
-		dm_totals[i] = WI_fragSum(i);
-	    }
-	}
-	
-
-	S_StartSound(0, sfx_barexp);
-	dm_state = 4;
-    }
-
-    
-    if (dm_state == 2)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-	
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (playeringame[i])
-	    {
-		for (j=0 ; j<MAXPLAYERS ; j++)
-		{
-		    if (playeringame[j]
-			&& dm_frags[i][j] != plrs[i].frags[j])
-		    {
-			if (plrs[i].frags[j] < 0)
-			    dm_frags[i][j]--;
-			else
-			    dm_frags[i][j]++;
-
-			if (dm_frags[i][j] > 99)
-			    dm_frags[i][j] = 99;
-
-			if (dm_frags[i][j] < -99)
-			    dm_frags[i][j] = -99;
-			
-			stillticking = true;
-		    }
-		}
-		dm_totals[i] = WI_fragSum(i);
-
-		if (dm_totals[i] > 99)
-		    dm_totals[i] = 99;
-		
-		if (dm_totals[i] < -99)
-		    dm_totals[i] = -99;
-	    }
-	    
-	}
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    dm_state++;
-	}
-
-    }
-    else if (dm_state == 4)
-    {
-	if (acceleratestage)
-	{
-	    S_StartSound(0, sfx_slop);
-
-	    if ( gamemode == commercial)
-		WI_initNoState();
-	    else
-		WI_initShowNextLoc();
-	}
-    }
-    else if (dm_state & 1)
-    {
-	if (!--cnt_pause)
-	{
-	    dm_state++;
-	    cnt_pause = TICRATE;
-	}
-    }
-}
-
-
-
-void WI_drawDeathmatchStats(void)
-{
-
-    int		i;
-    int		j;
-    int		x;
-    int		y;
-    int		w;
-
-    WI_slamBackground();
-    
-    // draw animated background
-    WI_drawAnimatedBack(); 
-    WI_drawLF();
-
-    // draw stat titles (top line)
-    V_DrawPatch(DM_TOTALSX-SHORT(total->width)/2,
-		DM_MATRIXY-WI_SPACINGY+10,
-		total);
-    
-    V_DrawPatch(DM_KILLERSX, DM_KILLERSY, killers);
-    V_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, victims);
-
-    // draw P?
-    x = DM_MATRIXX + DM_SPACINGX;
-    y = DM_MATRIXY;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i])
-	{
-	    V_DrawPatch(x-SHORT(p[i]->width)/2,
-			DM_MATRIXY - WI_SPACINGY,
-			p[i]);
-	    
-	    V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
-			y,
-			p[i]);
-
-	    if (i == me)
-	    {
-		V_DrawPatch(x-SHORT(p[i]->width)/2,
-			    DM_MATRIXY - WI_SPACINGY,
-			    bstar);
-
-		V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
-			    y,
-			    star);
-	    }
-	}
-	else
-	{
-	    // V_DrawPatch(x-SHORT(bp[i]->width)/2,
-	    //   DM_MATRIXY - WI_SPACINGY, bp[i]);
-	    // V_DrawPatch(DM_MATRIXX-SHORT(bp[i]->width)/2,
-	    //   y, bp[i]);
-	}
-	x += DM_SPACINGX;
-	y += WI_SPACINGY;
-    }
-
-    // draw stats
-    y = DM_MATRIXY+10;
-    w = SHORT(num[0]->width);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	x = DM_MATRIXX + DM_SPACINGX;
-
-	if (playeringame[i])
-	{
-	    for (j=0 ; j<MAXPLAYERS ; j++)
-	    {
-		if (playeringame[j])
-		    WI_drawNum(x+w, y, dm_frags[i][j], 2);
-
-		x += DM_SPACINGX;
-	    }
-	    WI_drawNum(DM_TOTALSX+w, y, dm_totals[i], 2);
-	}
-	y += WI_SPACINGY;
-    }
-}
-
-static int	cnt_frags[MAXPLAYERS];
-static int	dofrags;
-static int	ng_state;
-
-void WI_initNetgameStats(void)
-{
-
-    int i;
-
-    state = StatCount;
-    acceleratestage = 0;
-    ng_state = 1;
-
-    cnt_pause = TICRATE;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (!playeringame[i])
-	    continue;
-
-	cnt_kills[i] = cnt_items[i] = cnt_secret[i] = cnt_frags[i] = 0;
-
-	dofrags += WI_fragSum(i);
-    }
-
-    dofrags = !!dofrags;
-
-    WI_initAnimatedBack();
-}
-
-
-
-void WI_updateNetgameStats(void)
-{
-
-    int		i;
-    int		fsum;
-    
-    boolean	stillticking;
-
-    WI_updateAnimatedBack();
-
-    if (acceleratestage && ng_state != 10)
-    {
-	acceleratestage = 0;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
-	    cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
-	    cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
-
-	    if (dofrags)
-		cnt_frags[i] = WI_fragSum(i);
-	}
-	S_StartSound(0, sfx_barexp);
-	ng_state = 10;
-    }
-
-    if (ng_state == 2)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_kills[i] += 2;
-
-	    if (cnt_kills[i] >= (plrs[i].skills * 100) / wbs->maxkills)
-		cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
-	    else
-		stillticking = true;
-	}
-	
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    ng_state++;
-	}
-    }
-    else if (ng_state == 4)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_items[i] += 2;
-	    if (cnt_items[i] >= (plrs[i].sitems * 100) / wbs->maxitems)
-		cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
-	    else
-		stillticking = true;
-	}
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    ng_state++;
-	}
-    }
-    else if (ng_state == 6)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_secret[i] += 2;
-
-	    if (cnt_secret[i] >= (plrs[i].ssecret * 100) / wbs->maxsecret)
-		cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
-	    else
-		stillticking = true;
-	}
-	
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    ng_state += 1 + 2*!dofrags;
-	}
-    }
-    else if (ng_state == 8)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_frags[i] += 1;
-
-	    if (cnt_frags[i] >= (fsum = WI_fragSum(i)))
-		cnt_frags[i] = fsum;
-	    else
-		stillticking = true;
-	}
-	
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_pldeth);
-	    ng_state++;
-	}
-    }
-    else if (ng_state == 10)
-    {
-	if (acceleratestage)
-	{
-	    S_StartSound(0, sfx_sgcock);
-	    if ( gamemode == commercial )
-		WI_initNoState();
-	    else
-		WI_initShowNextLoc();
-	}
-    }
-    else if (ng_state & 1)
-    {
-	if (!--cnt_pause)
-	{
-	    ng_state++;
-	    cnt_pause = TICRATE;
-	}
-    }
-}
-
-
-
-void WI_drawNetgameStats(void)
-{
-    int		i;
-    int		x;
-    int		y;
-    int		pwidth = SHORT(percent->width);
-
-    WI_slamBackground();
-    
-    // draw animated background
-    WI_drawAnimatedBack(); 
-
-    WI_drawLF();
-
-    // draw stat titles (top line)
-    V_DrawPatch(NG_STATSX+NG_SPACINGX-SHORT(kills->width),
-		NG_STATSY, kills);
-
-    V_DrawPatch(NG_STATSX+2*NG_SPACINGX-SHORT(items->width),
-		NG_STATSY, items);
-
-    V_DrawPatch(NG_STATSX+3*NG_SPACINGX-SHORT(secret->width),
-		NG_STATSY, secret);
-    
-    if (dofrags)
-	V_DrawPatch(NG_STATSX+4*NG_SPACINGX-SHORT(frags->width),
-		    NG_STATSY, frags);
-
-    // draw stats
-    y = NG_STATSY + SHORT(kills->height);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (!playeringame[i])
-	    continue;
-
-	x = NG_STATSX;
-	V_DrawPatch(x-SHORT(p[i]->width), y, p[i]);
-
-	if (i == me)
-	    V_DrawPatch(x-SHORT(p[i]->width), y, star);
-
-	x += NG_SPACINGX;
-	WI_drawPercent(x-pwidth, y+10, cnt_kills[i]);	x += NG_SPACINGX;
-	WI_drawPercent(x-pwidth, y+10, cnt_items[i]);	x += NG_SPACINGX;
-	WI_drawPercent(x-pwidth, y+10, cnt_secret[i]);	x += NG_SPACINGX;
-
-	if (dofrags)
-	    WI_drawNum(x, y+10, cnt_frags[i], -1);
-
-	y += WI_SPACINGY;
-    }
-
-}
-
-static int	sp_state;
-
-void WI_initStats(void)
-{
-    state = StatCount;
-    acceleratestage = 0;
-    sp_state = 1;
-    cnt_kills[0] = cnt_items[0] = cnt_secret[0] = -1;
-    cnt_time = cnt_par = -1;
-    cnt_pause = TICRATE;
-
-    WI_initAnimatedBack();
-}
-
-void WI_updateStats(void)
-{
-
-    WI_updateAnimatedBack();
-
-    if (acceleratestage && sp_state != 10)
-    {
-	acceleratestage = 0;
-	cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
-	cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
-	cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
-	cnt_time = plrs[me].stime / TICRATE;
-	cnt_par = wbs->partime / TICRATE;
-	S_StartSound(0, sfx_barexp);
-	sp_state = 10;
-    }
-
-    if (sp_state == 2)
-    {
-	cnt_kills[0] += 2;
-
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	if (cnt_kills[0] >= (plrs[me].skills * 100) / wbs->maxkills)
-	{
-	    cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
-	    S_StartSound(0, sfx_barexp);
-	    sp_state++;
-	}
-    }
-    else if (sp_state == 4)
-    {
-	cnt_items[0] += 2;
-
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	if (cnt_items[0] >= (plrs[me].sitems * 100) / wbs->maxitems)
-	{
-	    cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
-	    S_StartSound(0, sfx_barexp);
-	    sp_state++;
-	}
-    }
-    else if (sp_state == 6)
-    {
-	cnt_secret[0] += 2;
-
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	if (cnt_secret[0] >= (plrs[me].ssecret * 100) / wbs->maxsecret)
-	{
-	    cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
-	    S_StartSound(0, sfx_barexp);
-	    sp_state++;
-	}
-    }
-
-    else if (sp_state == 8)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	cnt_time += 3;
-
-	if (cnt_time >= plrs[me].stime / TICRATE)
-	    cnt_time = plrs[me].stime / TICRATE;
-
-	cnt_par += 3;
-
-	if (cnt_par >= wbs->partime / TICRATE)
-	{
-	    cnt_par = wbs->partime / TICRATE;
-
-	    if (cnt_time >= plrs[me].stime / TICRATE)
-	    {
-		S_StartSound(0, sfx_barexp);
-		sp_state++;
-	    }
-	}
-    }
-    else if (sp_state == 10)
-    {
-	if (acceleratestage)
-	{
-	    S_StartSound(0, sfx_sgcock);
-
-	    if (gamemode == commercial)
-		WI_initNoState();
-	    else
-		WI_initShowNextLoc();
-	}
-    }
-    else if (sp_state & 1)
-    {
-	if (!--cnt_pause)
-	{
-	    sp_state++;
-	    cnt_pause = TICRATE;
-	}
-    }
-
-}
-
-void WI_drawStats(void)
-{
-    // line height
-    int lh;	
-
-    lh = (3*SHORT(num[0]->height))/2;
-
-    WI_slamBackground();
-
-    // draw animated background
-    WI_drawAnimatedBack();
-    
-    WI_drawLF();
-
-    V_DrawPatch(SP_STATSX, SP_STATSY, kills);
-    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY, cnt_kills[0]);
-
-    V_DrawPatch(SP_STATSX, SP_STATSY+lh, items);
-    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+lh, cnt_items[0]);
-
-    V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, sp_secret);
-    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
-
-    V_DrawPatch(SP_TIMEX, SP_TIMEY, timepatch);
-    WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time);
-
-    if (wbs->epsd < 3)
-    {
-        V_DrawPatch(SCREENWIDTH/2 + SP_TIMEX, SP_TIMEY, par);
-        WI_drawTime(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cnt_par);
-    }
-
-}
-
-void WI_checkForAccelerate(void)
-{
-    int   i;
-    player_t  *player;
-
-    // check for button presses to skip delays
-    for (i=0, player = players ; i<MAXPLAYERS ; i++, player++)
-    {
-	if (playeringame[i])
-	{
-	    if (player->cmd.buttons & BT_ATTACK)
-	    {
-		if (!player->attackdown)
-		    acceleratestage = 1;
-		player->attackdown = true;
-	    }
-	    else
-		player->attackdown = false;
-	    if (player->cmd.buttons & BT_USE)
-	    {
-		if (!player->usedown)
-		    acceleratestage = 1;
-		player->usedown = true;
-	    }
-	    else
-		player->usedown = false;
-	}
-    }
-}
-
-
-
-// Updates stuff each tick
-void WI_Ticker(void)
-{
-    // counter for general background animation
-    bcnt++;  
-
-    if (bcnt == 1)
-    {
-	// intermission music
-  	if ( gamemode == commercial )
-	  S_ChangeMusic(mus_dm2int, true);
-	else
-	  S_ChangeMusic(mus_inter, true); 
-    }
-
-    WI_checkForAccelerate();
-
-    switch (state)
-    {
-      case StatCount:
-	if (deathmatch) WI_updateDeathmatchStats();
-	else if (netgame) WI_updateNetgameStats();
-	else WI_updateStats();
-	break;
-	
-      case ShowNextLoc:
-	WI_updateShowNextLoc();
-	break;
-	
-      case NoState:
-	WI_updateNoState();
-	break;
-    }
-
-}
-
-typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
-
-// Common load/unload function.  Iterates over all the graphics
-// lumps to be loaded/unloaded into memory.
-
-static void WI_loadUnloadData(load_callback_t callback)
-{
-    int i, j;
-    char name[9];
-    anim_t *a;
-
-    if (gamemode == commercial)
-    {
-	for (i=0 ; i<NUMCMAPS ; i++)
-	{
-	    DEH_snprintf(name, 9, "CWILV%2.2d", i);
-            callback(name, &lnames[i]);
-	}
-    }
-    else
-    {
-	for (i=0 ; i<NUMMAPS ; i++)
-	{
-	    DEH_snprintf(name, 9, "WILV%d%d", wbs->epsd, i);
-            callback(name, &lnames[i]);
-	}
-
-	// you are here
-        callback(DEH_String("WIURH0"), &yah[0]);
-
-	// you are here (alt.)
-        callback(DEH_String("WIURH1"), &yah[1]);
-
-	// splat
-        callback(DEH_String("WISPLAT"), &splat[0]);
-
-	if (wbs->epsd < 3)
-	{
-	    for (j=0;j<NUMANIMS[wbs->epsd];j++)
-	    {
-		a = &anims[wbs->epsd][j];
-		for (i=0;i<a->nanims;i++)
-		{
-		    // MONDO HACK!
-		    if (wbs->epsd != 1 || j != 8)
-		    {
-			// animations
-			DEH_snprintf(name, 9, "WIA%d%.2d%.2d", wbs->epsd, j, i);
-                        callback(name, &a->p[i]);
-		    }
-		    else
-		    {
-			// HACK ALERT!
-			a->p[i] = anims[1][4].p[i];
-		    }
-		}
-	    }
-	}
-    }
-
-    // More hacks on minus sign.
-    if (W_CheckNumForName(DEH_String("WIMINUS")) > 0)
-        callback(DEH_String("WIMINUS"), &wiminus);
-    else
-        wiminus = NULL;
-
-    for (i=0;i<10;i++)
-    {
-	 // numbers 0-9
-	DEH_snprintf(name, 9, "WINUM%d", i);
-        callback(name, &num[i]);
-    }
-
-    // percent sign
-    callback(DEH_String("WIPCNT"), &percent);
-
-    // "finished"
-    callback(DEH_String("WIF"), &finished);
-
-    // "entering"
-    callback(DEH_String("WIENTER"), &entering);
-
-    // "kills"
-    callback(DEH_String("WIOSTK"), &kills);
-
-    // "scrt"
-    callback(DEH_String("WIOSTS"), &secret);
-
-     // "secret"
-    callback(DEH_String("WISCRT2"), &sp_secret);
-
-    // french wad uses WIOBJ (?)
-    if (W_CheckNumForName(DEH_String("WIOBJ")) >= 0)
-    {
-    	// "items"
-    	if (netgame && !deathmatch)
-            callback(DEH_String("WIOBJ"), &items);
-    	else
-            callback(DEH_String("WIOSTI"), &items);
-    } else {
-        callback(DEH_String("WIOSTI"), &items);
-    }
-
-    // "frgs"
-    callback(DEH_String("WIFRGS"), &frags);
-
-    // ":"
-    callback(DEH_String("WICOLON"), &colon);
-
-    // "time"
-    callback(DEH_String("WITIME"), &timepatch);
-
-    // "sucks"
-    callback(DEH_String("WISUCKS"), &sucks);
-
-    // "par"
-    callback(DEH_String("WIPAR"), &par);
-
-    // "killers" (vertical)
-    callback(DEH_String("WIKILRS"), &killers);
-
-    // "victims" (horiz)
-    callback(DEH_String("WIVCTMS"), &victims);
-
-    // "total"
-    callback(DEH_String("WIMSTT"), &total);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	// "1,2,3,4"
-	DEH_snprintf(name, 9, "STPB%d", i);
-        callback(name, &p[i]);
-
-	// "1,2,3,4"
-	DEH_snprintf(name, 9, "WIBP%d", i+1);
-        callback(name, &bp[i]);
-    }
-
-    // Background image
-
-    if (gamemode == commercial)
-    {
-        M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
-    }
-    else if (gameversion >= exe_ultimate && wbs->epsd == 3)
-    {
-        M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
-    }
-    else
-    {
-	DEH_snprintf(name, sizeof(name), "WIMAP%d", wbs->epsd);
-    }
-
-    // Draw backdrop and save to a temporary buffer
-
-    callback(name, &background);
-}
-
-static void WI_loadCallback(const char *name, patch_t **variable)
-{
-    *variable = W_CacheLumpName(name, PU_STATIC);
-}
-
-void WI_loadData(void)
-{
-    if (gamemode == commercial)
-    {
-	NUMCMAPS = 32;
-	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMCMAPS,
-				       PU_STATIC, NULL);
-    }
-    else
-    {
-	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMMAPS,
-				       PU_STATIC, NULL);
-    }
-
-    WI_loadUnloadData(WI_loadCallback);
-
-    // These two graphics are special cased because we're sharing
-    // them with the status bar code
-
-    // your face
-    star = W_CacheLumpName(DEH_String("STFST01"), PU_STATIC);
-
-    // dead face
-    bstar = W_CacheLumpName(DEH_String("STFDEAD0"), PU_STATIC);
-}
-
-static void WI_unloadCallback(const char *name, patch_t **variable)
-{
-    W_ReleaseLumpName(name);
-    *variable = NULL;
-}
-
-void WI_unloadData(void)
-{
-    WI_loadUnloadData(WI_unloadCallback);
-
-    // We do not free these lumps as they are shared with the status
-    // bar code.
-   
-    // W_ReleaseLumpName("STFST01");
-    // W_ReleaseLumpName("STFDEAD0");
-}
-
-void WI_Drawer (void)
-{
-    switch (state)
-    {
-      case StatCount:
-	if (deathmatch)
-	    WI_drawDeathmatchStats();
-	else if (netgame)
-	    WI_drawNetgameStats();
-	else
-	    WI_drawStats();
-	break;
-	
-      case ShowNextLoc:
-	WI_drawShowNextLoc();
-	break;
-	
-      case NoState:
-	WI_drawNoState();
-	break;
-    }
-}
-
-
-void WI_initVariables(wbstartstruct_t* wbstartstruct)
-{
-
-    wbs = wbstartstruct;
-
-#ifdef RANGECHECKING
-    if (gamemode != commercial)
-    {
-      if (gameversion >= exe_ultimate)
-	RNGCHECK(wbs->epsd, 0, 3);
+      if (netgame && !deathmatch)
+        callback(("WIOBJ"), &items);
       else
-	RNGCHECK(wbs->epsd, 0, 2);
+        callback(("WIOSTI"), &items);
     }
-    else
+  else
     {
-	RNGCHECK(wbs->last, 0, 8);
-	RNGCHECK(wbs->next, 0, 8);
+      callback(("WIOSTI"), &items);
     }
-    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
-    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
+
+  /* "frgs" */
+
+  callback(("WIFRGS"), &frags);
+
+  /* ":" */
+
+  callback(("WICOLON"), &colon);
+
+  /* "time" */
+
+  callback(("WITIME"), &timepatch);
+
+  /* "sucks" */
+
+  callback(("WISUCKS"), &sucks);
+
+  /* "par" */
+
+  callback(("WIPAR"), &par);
+
+  /* "killers" (vertical) */
+
+  callback(("WIKILRS"), &killers);
+
+  /* "victims" (horiz) */
+
+  callback(("WIVCTMS"), &victims);
+
+  /* "total" */
+
+  callback(("WIMSTT"), &total);
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      /* "1,2,3,4" */
+
+      snprintf(name, sizeof(name), "STPB%d", i);
+      callback(name, &p[i]);
+
+      /* "1,2,3,4" */
+
+      snprintf(name, sizeof(name), "WIBP%d", i + 1);
+      callback(name, &bp[i]);
+    }
+
+  /* Background image */
+
+  if (gamemode == commercial)
+    {
+      m_str_copy(name, ("INTERPIC"), sizeof(name));
+    }
+  else if (gameversion >= exe_ultimate && wbs->epsd == 3)
+    {
+      m_str_copy(name, ("INTERPIC"), sizeof(name));
+    }
+  else
+    {
+      snprintf(name, sizeof(name), "WIMAP%d", wbs->epsd);
+    }
+
+  /* Draw backdrop and save to a temporary buffer */
+
+  callback(name, &background);
+}
+
+static void wi_load_callback(const char *name, patch_t **variable)
+{
+  *variable = w_cache_lump_name(name, PU_STATIC);
+}
+
+static void wi_unload_callback(const char *name, patch_t **variable)
+{
+  w_release_lump_name(name);
+  *variable = NULL;
+}
+
+static void wi_load_data(void)
+{
+  if (gamemode == commercial)
+    {
+      NUMCMAPS = 32;
+      lnames = (patch_t **)z_malloc(sizeof(patch_t *) * NUMCMAPS,
+                                    PU_STATIC, NULL);
+    }
+  else
+    {
+      lnames =
+          (patch_t **)z_malloc(sizeof(patch_t *) * NUMMAPS, PU_STATIC, NULL);
+    }
+
+  wi_load_unload_data(wi_load_callback);
+
+  /* These two graphics are special cased because we're sharing them with the
+   * status bar code
+   */
+
+  /* your face */
+
+  star = w_cache_lump_name(("STFST01"), PU_STATIC);
+
+  /* dead face */
+
+  bstar = w_cache_lump_name(("STFDEAD0"), PU_STATIC);
+}
+
+static void wi_unload_data(void)
+{
+  wi_load_unload_data(wi_unload_callback);
+
+  /* We do not free these lumps as they are shared with the status
+   * bar code.
+   */
+
+  /* w_release_lump_name("STFST01");
+   * w_release_lump_name("STFDEAD0");
+   */
+}
+
+/* slam background */
+
+static void wi_slam_background(void)
+{
+  v_draw_patch(0, 0, background);
+}
+
+/* Draws "<Levelname> Finished!" */
+
+static void wi_draw_lf(void)
+{
+  int y = WI_TITLEY;
+
+  if (gamemode != commercial || wbs->last < NUMCMAPS)
+    {
+      /* draw <LevelName> */
+
+      v_draw_patch((SCREENWIDTH - SHORT(lnames[wbs->last]->width)) / 2, y,
+                   lnames[wbs->last]);
+
+      /* draw "Finished!" */
+
+      y += (5 * SHORT(lnames[wbs->last]->height)) / 4;
+
+      v_draw_patch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
+    }
+  else if (wbs->last == NUMCMAPS)
+    {
+      /* MAP33 - draw "Finished!" only */
+
+      v_draw_patch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
+    }
+  else if (wbs->last > NUMCMAPS)
+    {
+      /* > MAP33.  Doom bombs out here with a Bad v_draw_patch error.
+       * I'm pretty sure that doom2.exe is just reading into random
+       * bits of memory at this point, but let's try to be accurate
+       * anyway.  This deliberately triggers a v_draw_patch error.
+       */
+
+      patch_t tmp =
+        {
+          SCREENWIDTH,
+          SCREENHEIGHT,
+          1,
+          1,
+            {
+              0, 0, 0, 0, 0, 0, 0, 0
+            },
+        };
+
+      v_draw_patch(0, y, &tmp);
+    }
+}
+
+/* Draws "Entering <LevelName>" */
+
+static void wi_draw_e(void)
+{
+  int y = WI_TITLEY;
+
+  /* draw "Entering" */
+
+  v_draw_patch((SCREENWIDTH - SHORT(entering->width)) / 2, y, entering);
+
+  /* draw level */
+
+  y += (5 * SHORT(lnames[wbs->next]->height)) / 4;
+
+  v_draw_patch((SCREENWIDTH - SHORT(lnames[wbs->next]->width)) / 2, y,
+               lnames[wbs->next]);
+}
+
+static void wi_draw_on_lnode(int n, patch_t *c[])
+{
+  int i;
+  int left;
+  int top;
+  int right;
+  int bottom;
+  boolean fits = false;
+
+  i = 0;
+  do
+    {
+      left = lnodes[wbs->epsd][n].x - SHORT(c[i]->leftoffset);
+      top = lnodes[wbs->epsd][n].y - SHORT(c[i]->topoffset);
+      right = left + SHORT(c[i]->width);
+      bottom = top + SHORT(c[i]->height);
+
+      if (left >= 0 && right < SCREENWIDTH && top >= 0 &&
+          bottom < SCREENHEIGHT)
+        {
+          fits = true;
+        }
+      else
+        {
+          i++;
+        }
+    }
+  while (!fits && i != 2 && c[i] != NULL);
+
+  if (fits && i < 2)
+    {
+      v_draw_patch(lnodes[wbs->epsd][n].x, lnodes[wbs->epsd][n].y, c[i]);
+    }
+  else
+    {
+      printf("Could not place patch on level %d", n + 1); /* DEBUG */
+    }
+}
+
+static void wi_init_animate_back(void)
+{
+  int i;
+  anim_t *a;
+
+  if (gamemode == commercial) return;
+
+  if (wbs->epsd > 2) return;
+
+  for (i = 0; i < NUMANIMS[wbs->epsd]; i++)
+    {
+      a = &anims[wbs->epsd][i];
+
+      /* init variables */
+
+      a->ctr = -1;
+
+      /* specify the next time to draw it */
+
+      if (a->type == ANIM_ALWAYS)
+        a->nexttic = bcnt + 1 + (m_random() % a->period);
+      else if (a->type == ANIM_RANDOM)
+        a->nexttic = bcnt + 1 + a->data2 + (m_random() % a->data1);
+      else if (a->type == ANIM_LEVEL)
+        a->nexttic = bcnt + 1;
+    }
+}
+
+static void wi_update_animated_block(void)
+{
+  int i;
+  anim_t *a;
+
+  if (gamemode == commercial) return;
+
+  if (wbs->epsd > 2) return;
+
+  for (i = 0; i < NUMANIMS[wbs->epsd]; i++)
+    {
+      a = &anims[wbs->epsd][i];
+
+      if (bcnt == a->nexttic)
+        {
+          switch (a->type)
+            {
+            case ANIM_ALWAYS:
+              if (++a->ctr >= a->nanims) a->ctr = 0;
+              a->nexttic = bcnt + a->period;
+              break;
+
+            case ANIM_RANDOM:
+              a->ctr++;
+              if (a->ctr == a->nanims)
+                {
+                  a->ctr = -1;
+                  a->nexttic = bcnt + a->data2 + (m_random() % a->data1);
+                }
+              else
+                a->nexttic = bcnt + a->period;
+              break;
+
+            case ANIM_LEVEL:
+
+              /* gawd-awful hack for level anims */
+
+              if (!(state == STAT_COUNT && i == 7) && wbs->next == a->data1)
+                {
+                  a->ctr++;
+                  if (a->ctr == a->nanims) a->ctr--;
+                  a->nexttic = bcnt + a->period;
+                }
+              break;
+            }
+        }
+    }
+}
+
+static void wi_draw_animated_back(void)
+{
+  int i;
+  anim_t *a;
+
+  if (gamemode == commercial) return;
+
+  if (wbs->epsd > 2) return;
+
+  for (i = 0; i < NUMANIMS[wbs->epsd]; i++)
+    {
+      a = &anims[wbs->epsd][i];
+
+      if (a->ctr >= 0) v_draw_patch(a->loc.x, a->loc.y, a->p[a->ctr]);
+    }
+}
+
+/* Draws a number.
+ * If digits > 0, then use that many digits minimum, otherwise only use as
+ * many as necessary. Returns new x position.
+ */
+
+static int wi_draw_num(int x, int y, int n, int digits)
+{
+  int fontwidth = SHORT(num[0]->width);
+  int neg;
+  int temp;
+
+  if (digits < 0)
+    {
+      if (!n)
+        {
+          /* make variable-length zeros 1 digit long */
+
+          digits = 1;
+        }
+      else
+        {
+          /* figure out # of digits in # */
+
+          digits = 0;
+          temp = n;
+
+          while (temp)
+            {
+              temp /= 10;
+              digits++;
+            }
+        }
+    }
+
+  neg = n < 0;
+  if (neg) n = -n;
+
+  /* if non-number, do not draw it */
+
+  if (n == 1994) return 0;
+
+  /* draw the new number */
+
+  while (digits--)
+    {
+      x -= fontwidth;
+      v_draw_patch(x, y, num[n % 10]);
+      n /= 10;
+    }
+
+  /* draw a minus sign if necessary */
+
+  if (neg && wiminus) v_draw_patch(x -= 8, y, wiminus);
+
+  return x;
+}
+
+static void wi_draw_percent(int x, int y, int p_p)
+{
+  if (p_p < 0) return;
+
+  v_draw_patch(x, y, percent);
+  wi_draw_num(x, y, p_p, -1);
+}
+
+/* Display level completion time and par, or "sucks" message if overflow.
+ */
+
+static void wi_draw_time(int x, int y, int t)
+{
+  int div;
+  int n;
+
+  if (t < 0) return;
+
+  if (t <= 61 * 59)
+    {
+      div = 1;
+
+      do
+        {
+          n = (t / div) % 60;
+          x = wi_draw_num(x, y, n, 2) - SHORT(colon->width);
+          div *= 60;
+
+          /* draw */
+
+          if (div == 60 || t / div) v_draw_patch(x, y, colon);
+        }
+      while (t / div);
+    }
+  else
+    {
+      /* "sucks" */
+
+      v_draw_patch(x - SHORT(sucks->width), y, sucks);
+    }
+}
+
+static void wi_init_nostate(void)
+{
+  state = NO_STATE;
+  acceleratestage = 0;
+  cnt = 10;
+}
+
+static void wi_update_no_state(void)
+{
+  wi_update_animated_block();
+
+  if (!--cnt)
+    {
+      /* Don't call wi_end yet.  g_world_done doesn't immediately
+       * change gamestate, so wi_drawer is still going to get
+       * run until that happens.  If we do that after wi_end
+       * (which unloads all the graphics), we're in trouble.
+       * wi_end();
+       */
+
+      g_world_done();
+    }
+}
+
+static void wi_init_show_next_loc(void)
+{
+  state = SHOW_NEXT_LOC;
+  acceleratestage = 0;
+  cnt = SHOWNEXTLOCDELAY * TICRATE;
+
+  wi_init_animate_back();
+}
+
+static void wi_update_show_next_loc(void)
+{
+  wi_update_animated_block();
+
+  if (!--cnt || acceleratestage)
+    wi_init_nostate();
+  else
+    snl_pointeron = (cnt & 31) < 20;
+}
+
+static void wi_draw_show_next_loc(void)
+{
+  int i;
+  int last;
+
+  wi_slam_background();
+
+  /* draw animated background */
+
+  wi_draw_animated_back();
+
+  if (gamemode != commercial)
+    {
+      if (wbs->epsd > 2)
+        {
+          wi_draw_e();
+          return;
+        }
+
+      last = (wbs->last == 8) ? wbs->next - 1 : wbs->last;
+
+      /* draw a splat on taken cities. */
+
+      for (i = 0; i <= last; i++)
+        wi_draw_on_lnode(i, splat);
+
+      /* splat the secret level? */
+
+      if (wbs->didsecret) wi_draw_on_lnode(8, splat);
+
+      /* draw flashing ptr */
+
+      if (snl_pointeron) wi_draw_on_lnode(wbs->next, yah);
+    }
+
+  /* draws which level you are entering.. */
+
+  if ((gamemode != commercial) || wbs->next != 30) wi_draw_e();
+}
+
+static void wi_draw_no_state(void)
+{
+  snl_pointeron = true;
+  wi_draw_show_next_loc();
+}
+
+static int wi_frag_sum(int playernum)
+{
+  int i;
+  int l_frags = 0;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i] && i != playernum)
+        {
+          l_frags += plrs[playernum].frags[i];
+        }
+    }
+
+  /* JDC hack - negative frags. */
+
+  l_frags -= plrs[playernum].frags[playernum];
+
+  /* UNUSED if (frags < 0)
+   * frags = 0;
+   */
+
+  return l_frags;
+}
+
+static void wi_init_deathmatch_stats(void)
+{
+  int i;
+  int j;
+
+  state = STAT_COUNT;
+  acceleratestage = 0;
+  dm_state = 1;
+
+  cnt_pause = TICRATE;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i])
+        {
+          for (j = 0; j < MAXPLAYERS; j++)
+            {
+              if (playeringame[j]) dm_frags[i][j] = 0;
+            }
+
+          dm_totals[i] = 0;
+        }
+    }
+
+  wi_init_animate_back();
+}
+
+static void wi_update_deathmatch_stats(void)
+{
+  int i;
+  int j;
+
+  boolean stillticking;
+
+  wi_update_animated_block();
+
+  if (acceleratestage && dm_state != 4)
+    {
+      acceleratestage = 0;
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (playeringame[i])
+            {
+              for (j = 0; j < MAXPLAYERS; j++)
+                {
+                  if (playeringame[j]) dm_frags[i][j] = plrs[i].frags[j];
+                }
+
+              dm_totals[i] = wi_frag_sum(i);
+            }
+        }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(0, SFX_BAREXP);
+#endif
+      dm_state = 4;
+    }
+
+  if (dm_state == 2)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
 #endif
 
-    acceleratestage = 0;
-    cnt = bcnt = 0;
-    firstrefresh = 1;
-    me = wbs->pnum;
-    plrs = wbs->plyr;
+      stillticking = false;
 
-    if (!wbs->maxkills)
-	wbs->maxkills = 1;
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (playeringame[i])
+            {
+              for (j = 0; j < MAXPLAYERS; j++)
+                {
+                  if (playeringame[j] && dm_frags[i][j] != plrs[i].frags[j])
+                    {
+                      if (plrs[i].frags[j] < 0)
+                        dm_frags[i][j]--;
+                      else
+                        dm_frags[i][j]++;
 
-    if (!wbs->maxitems)
-	wbs->maxitems = 1;
+                      if (dm_frags[i][j] > 99) dm_frags[i][j] = 99;
 
-    if (!wbs->maxsecret)
-	wbs->maxsecret = 1;
+                      if (dm_frags[i][j] < -99) dm_frags[i][j] = -99;
 
-    if ( gameversion < exe_ultimate )
-      if (wbs->epsd > 2)
-	wbs->epsd -= 3;
+                      stillticking = true;
+                    }
+                }
+
+              dm_totals[i] = wi_frag_sum(i);
+
+              if (dm_totals[i] > 99) dm_totals[i] = 99;
+
+              if (dm_totals[i] < -99) dm_totals[i] = -99;
+            }
+        }
+
+      if (!stillticking)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          dm_state++;
+        }
+    }
+  else if (dm_state == 4)
+    {
+      if (acceleratestage)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_SLOP);
+#endif
+
+          if (gamemode == commercial)
+            wi_init_nostate();
+          else
+            wi_init_show_next_loc();
+        }
+    }
+  else if (dm_state & 1)
+    {
+      if (!--cnt_pause)
+        {
+          dm_state++;
+          cnt_pause = TICRATE;
+        }
+    }
 }
 
-void WI_Start(wbstartstruct_t* wbstartstruct)
+static void wi_draw_deathmatch_stats(void)
 {
-    WI_initVariables(wbstartstruct);
-    WI_loadData();
+  int i;
+  int j;
+  int x;
+  int y;
+  int w;
 
-    if (deathmatch)
-	WI_initDeathmatchStats();
-    else if (netgame)
-	WI_initNetgameStats();
-    else
-	WI_initStats();
+  wi_slam_background();
+
+  /* draw animated background */
+
+  wi_draw_animated_back();
+  wi_draw_lf();
+
+  /* draw stat titles (top line) */
+
+  v_draw_patch(DM_TOTALSX - SHORT(total->width) / 2,
+               DM_MATRIXY - WI_SPACINGY + 10, total);
+
+  v_draw_patch(DM_KILLERSX, DM_KILLERSY, killers);
+  v_draw_patch(DM_VICTIMSX, DM_VICTIMSY, victims);
+
+  /* draw P? */
+
+  x = DM_MATRIXX + DM_SPACINGX;
+  y = DM_MATRIXY;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (playeringame[i])
+        {
+          v_draw_patch(x - SHORT(p[i]->width) / 2, DM_MATRIXY - WI_SPACINGY,
+                       p[i]);
+
+          v_draw_patch(DM_MATRIXX - SHORT(p[i]->width) / 2, y, p[i]);
+
+          if (i == me)
+            {
+              v_draw_patch(x - SHORT(p[i]->width) / 2,
+                           DM_MATRIXY - WI_SPACINGY, bstar);
+
+              v_draw_patch(DM_MATRIXX - SHORT(p[i]->width) / 2, y, star);
+            }
+        }
+      else
+        {
+          /* v_draw_patch(x-SHORT(bp[i]->width)/2,
+           *   DM_MATRIXY - WI_SPACINGY, bp[i]);
+           * v_draw_patch(DM_MATRIXX-SHORT(bp[i]->width)/2,
+           *   y, bp[i]);
+           */
+        }
+
+      x += DM_SPACINGX;
+      y += WI_SPACINGY;
+    }
+
+  /* draw stats */
+
+  y = DM_MATRIXY + 10;
+  w = SHORT(num[0]->width);
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      x = DM_MATRIXX + DM_SPACINGX;
+
+      if (playeringame[i])
+        {
+          for (j = 0; j < MAXPLAYERS; j++)
+            {
+              if (playeringame[j]) wi_draw_num(x + w, y, dm_frags[i][j], 2);
+
+              x += DM_SPACINGX;
+            }
+
+          wi_draw_num(DM_TOTALSX + w, y, dm_totals[i], 2);
+        }
+
+      y += WI_SPACINGY;
+    }
+}
+
+static void wi_init_netgame_stats(void)
+{
+  int i;
+
+  state = STAT_COUNT;
+  acceleratestage = 0;
+  ng_state = 1;
+
+  cnt_pause = TICRATE;
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (!playeringame[i]) continue;
+
+      cnt_kills[i] = cnt_items[i] = cnt_secret[i] = cnt_frags[i] = 0;
+
+      dofrags += wi_frag_sum(i);
+    }
+
+  dofrags = !!dofrags;
+
+  wi_init_animate_back();
+}
+
+static void wi_update_netgame_stats(void)
+{
+  int i;
+  int fsum;
+
+  boolean stillticking;
+
+  wi_update_animated_block();
+
+  if (acceleratestage && ng_state != 10)
+    {
+      acceleratestage = 0;
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (!playeringame[i]) continue;
+
+          cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
+          cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
+          cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
+
+          if (dofrags) cnt_frags[i] = wi_frag_sum(i);
+        }
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(0, SFX_BAREXP);
+#endif
+      ng_state = 10;
+    }
+
+  if (ng_state == 2)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      stillticking = false;
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (!playeringame[i]) continue;
+
+          cnt_kills[i] += 2;
+
+          if (cnt_kills[i] >= (plrs[i].skills * 100) / wbs->maxkills)
+            cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
+          else
+            stillticking = true;
+        }
+
+      if (!stillticking)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          ng_state++;
+        }
+    }
+  else if (ng_state == 4)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      stillticking = false;
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (!playeringame[i]) continue;
+
+          cnt_items[i] += 2;
+          if (cnt_items[i] >= (plrs[i].sitems * 100) / wbs->maxitems)
+            cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
+          else
+            stillticking = true;
+        }
+
+      if (!stillticking)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          ng_state++;
+        }
+    }
+  else if (ng_state == 6)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      stillticking = false;
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (!playeringame[i]) continue;
+
+          cnt_secret[i] += 2;
+
+          if (cnt_secret[i] >= (plrs[i].ssecret * 100) / wbs->maxsecret)
+            cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
+          else
+            stillticking = true;
+        }
+
+      if (!stillticking)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          ng_state += 1 + 2 * !dofrags;
+        }
+    }
+  else if (ng_state == 8)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      stillticking = false;
+
+      for (i = 0; i < MAXPLAYERS; i++)
+        {
+          if (!playeringame[i]) continue;
+
+          cnt_frags[i] += 1;
+
+          if (cnt_frags[i] >= (fsum = wi_frag_sum(i)))
+            cnt_frags[i] = fsum;
+          else
+            stillticking = true;
+        }
+
+      if (!stillticking)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_PLDETH);
+#endif
+          ng_state++;
+        }
+    }
+  else if (ng_state == 10)
+    {
+      if (acceleratestage)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_SGCOCK);
+#endif
+          if (gamemode == commercial)
+            wi_init_nostate();
+          else
+            wi_init_show_next_loc();
+        }
+    }
+  else if (ng_state & 1)
+    {
+      if (!--cnt_pause)
+        {
+          ng_state++;
+          cnt_pause = TICRATE;
+        }
+    }
+}
+
+static void wi_init_stats(void)
+{
+  state = STAT_COUNT;
+  acceleratestage = 0;
+  sp_state = 1;
+  cnt_kills[0] = cnt_items[0] = cnt_secret[0] = -1;
+  cnt_time = cnt_par = -1;
+  cnt_pause = TICRATE;
+
+  wi_init_animate_back();
+}
+
+static void wi_update_stats(void)
+{
+  wi_update_animated_block();
+
+  if (acceleratestage && sp_state != 10)
+    {
+      acceleratestage = 0;
+      cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
+      cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
+      cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
+      cnt_time = plrs[me].stime / TICRATE;
+      cnt_par = wbs->partime / TICRATE;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      s_start_sound(0, SFX_BAREXP);
+#endif
+      sp_state = 10;
+    }
+
+  if (sp_state == 2)
+    {
+      cnt_kills[0] += 2;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      if (cnt_kills[0] >= (plrs[me].skills * 100) / wbs->maxkills)
+        {
+          cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          sp_state++;
+        }
+    }
+  else if (sp_state == 4)
+    {
+      cnt_items[0] += 2;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      if (cnt_items[0] >= (plrs[me].sitems * 100) / wbs->maxitems)
+        {
+          cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          sp_state++;
+        }
+    }
+  else if (sp_state == 6)
+    {
+      cnt_secret[0] += 2;
+
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      if (cnt_secret[0] >= (plrs[me].ssecret * 100) / wbs->maxsecret)
+        {
+          cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_BAREXP);
+#endif
+          sp_state++;
+        }
+    }
+
+  else if (sp_state == 8)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      if (!(bcnt & 3)) s_start_sound(0, SFX_PISTOL);
+#endif
+
+      cnt_time += 3;
+
+      if (cnt_time >= plrs[me].stime / TICRATE)
+        cnt_time = plrs[me].stime / TICRATE;
+
+      cnt_par += 3;
+
+      if (cnt_par >= wbs->partime / TICRATE)
+        {
+          cnt_par = wbs->partime / TICRATE;
+
+          if (cnt_time >= plrs[me].stime / TICRATE)
+            {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+              s_start_sound(0, SFX_BAREXP);
+#endif
+              sp_state++;
+            }
+        }
+    }
+  else if (sp_state == 10)
+    {
+      if (acceleratestage)
+        {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+          s_start_sound(0, SFX_SGCOCK);
+#endif
+
+          if (gamemode == commercial)
+            wi_init_nostate();
+          else
+            wi_init_show_next_loc();
+        }
+    }
+  else if (sp_state & 1)
+    {
+      if (!--cnt_pause)
+        {
+          sp_state++;
+          cnt_pause = TICRATE;
+        }
+    }
+}
+
+static void wi_draw_netgame_stats(void)
+{
+  int i;
+  int x;
+  int y;
+  int pwidth = SHORT(percent->width);
+
+  wi_slam_background();
+
+  /* draw animated background */
+
+  wi_draw_animated_back();
+
+  wi_draw_lf();
+
+  /* draw stat titles (top line) */
+
+  v_draw_patch(NG_STATSX + NG_SPACINGX - SHORT(kills->width), NG_STATSY,
+               kills);
+
+  v_draw_patch(NG_STATSX + 2 * NG_SPACINGX - SHORT(items->width), NG_STATSY,
+               items);
+
+  v_draw_patch(NG_STATSX + 3 * NG_SPACINGX - SHORT(secret->width), NG_STATSY,
+               secret);
+
+  if (dofrags)
+    {
+      v_draw_patch(NG_STATSX + 4 * NG_SPACINGX - SHORT(frags->width),
+                   NG_STATSY, frags);
+    }
+
+  /* draw stats */
+
+  y = NG_STATSY + SHORT(kills->height);
+
+  for (i = 0; i < MAXPLAYERS; i++)
+    {
+      if (!playeringame[i]) continue;
+
+      x = NG_STATSX;
+      v_draw_patch(x - SHORT(p[i]->width), y, p[i]);
+
+      if (i == me) v_draw_patch(x - SHORT(p[i]->width), y, star);
+
+      x += NG_SPACINGX;
+      wi_draw_percent(x - pwidth, y + 10, cnt_kills[i]);
+      x += NG_SPACINGX;
+      wi_draw_percent(x - pwidth, y + 10, cnt_items[i]);
+      x += NG_SPACINGX;
+      wi_draw_percent(x - pwidth, y + 10, cnt_secret[i]);
+      x += NG_SPACINGX;
+
+      if (dofrags) wi_draw_num(x, y + 10, cnt_frags[i], -1);
+
+      y += WI_SPACINGY;
+    }
+}
+
+static void wi_draw_stats(void)
+{
+  int lh; /* line height */
+
+  lh = (3 * SHORT(num[0]->height)) / 2;
+
+  wi_slam_background();
+
+  /* draw animated background */
+
+  wi_draw_animated_back();
+
+  wi_draw_lf();
+
+  v_draw_patch(SP_STATSX, SP_STATSY, kills);
+  wi_draw_percent(SCREENWIDTH - SP_STATSX, SP_STATSY, cnt_kills[0]);
+
+  v_draw_patch(SP_STATSX, SP_STATSY + lh, items);
+  wi_draw_percent(SCREENWIDTH - SP_STATSX, SP_STATSY + lh, cnt_items[0]);
+
+  v_draw_patch(SP_STATSX, SP_STATSY + 2 * lh, sp_secret);
+  wi_draw_percent(SCREENWIDTH - SP_STATSX, SP_STATSY + 2 * lh,
+          cnt_secret[0]);
+
+  v_draw_patch(SP_TIMEX, SP_TIMEY, timepatch);
+  wi_draw_time(SCREENWIDTH / 2 - SP_TIMEX, SP_TIMEY, cnt_time);
+
+  if (wbs->epsd < 3)
+    {
+      v_draw_patch(SCREENWIDTH / 2 + SP_TIMEX, SP_TIMEY, par);
+      wi_draw_time(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cnt_par);
+    }
+}
+
+static void wi_check_for_accelerate(void)
+{
+  int i;
+  player_t *player;
+
+  /* check for button presses to skip delays */
+
+  for (i = 0, player = players; i < MAXPLAYERS; i++, player++)
+    {
+      if (playeringame[i])
+        {
+          if (player->cmd.buttons & BT_ATTACK)
+            {
+              if (!player->attackdown) acceleratestage = 1;
+              player->attackdown = true;
+            }
+          else
+            player->attackdown = false;
+          if (player->cmd.buttons & BT_USE)
+            {
+              if (!player->usedown) acceleratestage = 1;
+              player->usedown = true;
+            }
+          else
+            player->usedown = false;
+        }
+    }
+}
+
+static void wi_init_variables(wbstartstruct_t *wbstartstruct)
+{
+  wbs = wbstartstruct;
+
+  acceleratestage = 0;
+  cnt = bcnt = 0;
+  firstrefresh = 1;
+  me = wbs->pnum;
+  plrs = wbs->plyr;
+
+  if (!wbs->maxkills) wbs->maxkills = 1;
+
+  if (!wbs->maxitems) wbs->maxitems = 1;
+
+  if (!wbs->maxsecret) wbs->maxsecret = 1;
+
+  if (gameversion < exe_ultimate)
+    {
+      if (wbs->epsd > 2) wbs->epsd -= 3;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void wi_end(void)
+{
+  wi_unload_data();
+}
+
+/* Updates stuff each tick */
+
+void wi_ticker(void)
+{
+  /* counter for general background animation */
+
+  bcnt++;
+
+  if (bcnt == 1)
+    {
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+      /* intermission music */
+
+      if (gamemode == commercial)
+        s_change_music(MUS_DM2INT, true);
+      else
+        s_change_music(MUS_INTER, true);
+#endif
+    }
+
+  wi_check_for_accelerate();
+
+  switch (state)
+    {
+    case STAT_COUNT:
+      if (deathmatch)
+        wi_update_deathmatch_stats();
+      else if (netgame)
+        wi_update_netgame_stats();
+      else
+        wi_update_stats();
+      break;
+
+    case SHOW_NEXT_LOC:
+      wi_update_show_next_loc();
+      break;
+
+    case NO_STATE:
+      wi_update_no_state();
+      break;
+    }
+}
+
+void wi_drawer(void)
+{
+  switch (state)
+    {
+    case STAT_COUNT:
+      if (deathmatch)
+        wi_draw_deathmatch_stats();
+      else if (netgame)
+        wi_draw_netgame_stats();
+      else
+        wi_draw_stats();
+      break;
+
+    case SHOW_NEXT_LOC:
+      wi_draw_show_next_loc();
+      break;
+
+    case NO_STATE:
+      wi_draw_no_state();
+      break;
+    }
+}
+
+void wi_start(wbstartstruct_t *wbstartstruct)
+{
+  wi_init_variables(wbstartstruct);
+  wi_load_data();
+
+  if (deathmatch)
+    wi_init_deathmatch_stats();
+  else if (netgame)
+    wi_init_netgame_stats();
+  else
+    wi_init_stats();
 }
diff --git a/games/NXDoom/src/doom/wi_stuff.h b/games/NXDoom/src/doom/wi_stuff.h
index 296571f73..78c689d78 100644
--- a/games/NXDoom/src/doom/wi_stuff.h
+++ b/games/NXDoom/src/doom/wi_stuff.h
@@ -1,48 +1,78 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Intermission.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doom/wi_stuff.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Intermission.
+ *
+ ****************************************************************************/
 
 #ifndef __WI_STUFF__
 #define __WI_STUFF__
 
-//#include "v_video.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "doomdef.h"
 
-// States for the intermission
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-typedef enum
-{
-    NoState = -1,
-    StatCount,
-    ShowNextLoc,
-} stateenum_t;
+/****************************************************************************
+ * Name: wi_ticker
+ *
+ * Description:
+ *  Called by main loop, animate the intermission.
+ *
+ ****************************************************************************/
 
-// Called by main loop, animate the intermission.
-void WI_Ticker (void);
+void wi_ticker(void);
 
-// Called by main loop,
-// draws the intermission directly into the screen buffer.
-void WI_Drawer (void);
+/****************************************************************************
+ * Name: wi_drawer
+ *
+ * Description:
+ *  Called by main loop, draws the intermission directly into the screen
+ *  buffer.
+ *
+ ****************************************************************************/
 
-// Setup for an intermission screen.
-void WI_Start(wbstartstruct_t*	 wbstartstruct);
+void wi_drawer(void);
 
-// Shut down the intermission screen
-void WI_End(void);
+/****************************************************************************
+ * Name: wi_start
+ *
+ * Description:
+ *  Setup for an intermission screen.
+ *
+ ****************************************************************************/
 
-#endif
+void wi_start(wbstartstruct_t *wbstartstruct);
+
+/****************************************************************************
+ * Name: wi_end
+ *
+ * Description:
+ *  Shut down the intermission screen
+ *
+ ****************************************************************************/
+
+void wi_end(void);
+
+#endif /* __WI_STUFF__ */
diff --git a/games/NXDoom/src/doomkeys.h b/games/NXDoom/src/doomkeys.h
index 1098c719d..f29a2b782 100644
--- a/games/NXDoom/src/doomkeys.h
+++ b/games/NXDoom/src/doomkeys.h
@@ -1,156 +1,302 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//       Key definitions
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/doomkeys.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *       Key definitions
+ *
+ *
+ ****************************************************************************/
 
 #ifndef __DOOMKEYS__
 #define __DOOMKEYS__
 
-//
-// DOOM keyboard definition.
-// This is the stuff configured by Setup.Exe.
-// Most key data are simple ascii (uppercased).
-//
-#define KEY_RIGHTARROW	0xae
-#define KEY_LEFTARROW	0xac
-#define KEY_UPARROW	0xad
-#define KEY_DOWNARROW	0xaf
-#define KEY_ESCAPE	27
-#define KEY_ENTER	13
-#define KEY_TAB		9
-#define KEY_F1		(0x80+0x3b)
-#define KEY_F2		(0x80+0x3c)
-#define KEY_F3		(0x80+0x3d)
-#define KEY_F4		(0x80+0x3e)
-#define KEY_F5		(0x80+0x3f)
-#define KEY_F6		(0x80+0x40)
-#define KEY_F7		(0x80+0x41)
-#define KEY_F8		(0x80+0x42)
-#define KEY_F9		(0x80+0x43)
-#define KEY_F10		(0x80+0x44)
-#define KEY_F11		(0x80+0x57)
-#define KEY_F12		(0x80+0x58)
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define KEY_BACKSPACE	0x7f
-#define KEY_PAUSE	0xff
+/* DOOM keyboard definition.
+ * This is the stuff configured by Setup.Exe.
+ * Most key data are simple ascii (uppercased).
+ */
 
-#define KEY_EQUALS	0x3d
-#define KEY_MINUS	0x2d
+#define KEY_RIGHTARROW 0xae
+#define KEY_LEFTARROW 0xac
+#define KEY_UPARROW 0xad
+#define KEY_DOWNARROW 0xaf
+#define KEY_ESCAPE 27
+#define KEY_ENTER 13
+#define KEY_TAB 9
+#define KEY_F1 (0x80 + 0x3b)
+#define KEY_F2 (0x80 + 0x3c)
+#define KEY_F3 (0x80 + 0x3d)
+#define KEY_F4 (0x80 + 0x3e)
+#define KEY_F5 (0x80 + 0x3f)
+#define KEY_F6 (0x80 + 0x40)
+#define KEY_F7 (0x80 + 0x41)
+#define KEY_F8 (0x80 + 0x42)
+#define KEY_F9 (0x80 + 0x43)
+#define KEY_F10 (0x80 + 0x44)
+#define KEY_F11 (0x80 + 0x57)
+#define KEY_F12 (0x80 + 0x58)
 
-#define KEY_RSHIFT	(0x80+0x36)
-#define KEY_RCTRL	(0x80+0x1d)
-#define KEY_RALT	(0x80+0x38)
+#define KEY_BACKSPACE 0x7f
+#define KEY_PAUSE 0xff
 
-#define KEY_LALT	KEY_RALT
+#define KEY_EQUALS 0x3d
+#define KEY_MINUS 0x2d
 
-// new keys:
+#define KEY_RSHIFT (0x80 + 0x36)
+#define KEY_RCTRL (0x80 + 0x1d)
+#define KEY_RALT (0x80 + 0x38)
 
-#define KEY_CAPSLOCK    (0x80+0x3a)
-#define KEY_NUMLOCK     (0x80+0x45)
-#define KEY_SCRLCK      (0x80+0x46)
-#define KEY_PRTSCR      (0x80+0x59)
+#define KEY_LALT KEY_RALT
 
-#define KEY_HOME        (0x80+0x47)
-#define KEY_END         (0x80+0x4f)
-#define KEY_PGUP        (0x80+0x49)
-#define KEY_PGDN        (0x80+0x51)
-#define KEY_INS         (0x80+0x52)
-#define KEY_DEL         (0x80+0x53)
+/* new keys: */
 
-#define KEYP_0          KEY_INS
-#define KEYP_1          KEY_END
-#define KEYP_2          KEY_DOWNARROW
-#define KEYP_3          KEY_PGDN
-#define KEYP_4          KEY_LEFTARROW
-#define KEYP_5          (0x80+0x4c)
-#define KEYP_6          KEY_RIGHTARROW
-#define KEYP_7          KEY_HOME
-#define KEYP_8          KEY_UPARROW
-#define KEYP_9          KEY_PGUP
+#define KEY_CAPSLOCK (0x80 + 0x3a)
+#define KEY_NUMLOCK (0x80 + 0x45)
+#define KEY_SCRLCK (0x80 + 0x46)
+#define KEY_PRTSCR (0x80 + 0x59)
 
-#define KEYP_DIVIDE     '/'
-#define KEYP_PLUS       '+'
-#define KEYP_MINUS      '-'
-#define KEYP_MULTIPLY   '*'
-#define KEYP_PERIOD     0
-#define KEYP_EQUALS     KEY_EQUALS
-#define KEYP_ENTER      KEY_ENTER
+#define KEY_HOME (0x80 + 0x47)
+#define KEY_END (0x80 + 0x4f)
+#define KEY_PGUP (0x80 + 0x49)
+#define KEY_PGDN (0x80 + 0x51)
+#define KEY_INS (0x80 + 0x52)
+#define KEY_DEL (0x80 + 0x53)
+
+#define KEYP_0 KEY_INS
+#define KEYP_1 KEY_END
+#define KEYP_2 KEY_DOWNARROW
+#define KEYP_3 KEY_PGDN
+#define KEYP_4 KEY_LEFTARROW
+#define KEYP_5 (0x80 + 0x4c)
+#define KEYP_6 KEY_RIGHTARROW
+#define KEYP_7 KEY_HOME
+#define KEYP_8 KEY_UPARROW
+#define KEYP_9 KEY_PGUP
+
+#define KEYP_DIVIDE '/'
+#define KEYP_PLUS '+'
+#define KEYP_MINUS '-'
+#define KEYP_MULTIPLY '*'
+#define KEYP_PERIOD 0
+#define KEYP_EQUALS KEY_EQUALS
+#define KEYP_ENTER KEY_ENTER
 
 #define KEY_NONUSBACKSLASH '\\'
 
-#define SCANCODE_TO_KEYS_ARRAY {                                            \
-    0,   0,   0,   0,   'a',                                  /* 0-9 */     \
-    'b', 'c', 'd', 'e', 'f',                                                \
-    'g', 'h', 'i', 'j', 'k',                                  /* 10-19 */   \
-    'l', 'm', 'n', 'o', 'p',                                                \
-    'q', 'r', 's', 't', 'u',                                  /* 20-29 */   \
-    'v', 'w', 'x', 'y', 'z',                                                \
-    '1', '2', '3', '4', '5',                                  /* 30-39 */   \
-    '6', '7', '8', '9', '0',                                                \
-    KEY_ENTER, KEY_ESCAPE, KEY_BACKSPACE, KEY_TAB, ' ',       /* 40-49 */   \
-    KEY_MINUS, KEY_EQUALS, '[', ']', '\\',                                  \
-    0,   ';', '\'', '`', ',',                                 /* 50-59 */   \
-    '.', '/', KEY_CAPSLOCK, KEY_F1, KEY_F2,                                 \
-    KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7,                   /* 60-69 */   \
-    KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12,                              \
-    KEY_PRTSCR, KEY_SCRLCK, KEY_PAUSE, KEY_INS, KEY_HOME,     /* 70-79 */   \
-    KEY_PGUP, KEY_DEL, KEY_END, KEY_PGDN, KEY_RIGHTARROW,                   \
-    KEY_LEFTARROW, KEY_DOWNARROW, KEY_UPARROW,                /* 80-89 */   \
-    KEY_NUMLOCK, KEYP_DIVIDE,                                               \
-    KEYP_MULTIPLY, KEYP_MINUS, KEYP_PLUS, KEYP_ENTER, KEYP_1,               \
-    KEYP_2, KEYP_3, KEYP_4, KEYP_5, KEYP_6,                   /* 90-99 */   \
-    KEYP_7, KEYP_8, KEYP_9, KEYP_0, KEYP_PERIOD,                            \
-    KEY_NONUSBACKSLASH, 0, 0, KEYP_EQUALS,                    /* 100-103 */ \
-}
+#define SCANCODE_TO_KEYS_ARRAY                                               \
+  {                                                                          \
+      0,                                                                     \
+      0,                                                                     \
+      0,                                                                     \
+      0,                                                                     \
+      'a', /* 0-9 */                                                         \
+      'b',                                                                   \
+      'c',                                                                   \
+      'd',                                                                   \
+      'e',                                                                   \
+      'f',                                                                   \
+      'g',                                                                   \
+      'h',                                                                   \
+      'i',                                                                   \
+      'j',                                                                   \
+      'k', /* 10-19 */                                                       \
+      'l',                                                                   \
+      'm',                                                                   \
+      'n',                                                                   \
+      'o',                                                                   \
+      'p',                                                                   \
+      'q',                                                                   \
+      'r',                                                                   \
+      's',                                                                   \
+      't',                                                                   \
+      'u', /* 20-29 */                                                       \
+      'v',                                                                   \
+      'w',                                                                   \
+      'x',                                                                   \
+      'y',                                                                   \
+      'z',                                                                   \
+      '1',                                                                   \
+      '2',                                                                   \
+      '3',                                                                   \
+      '4',                                                                   \
+      '5', /* 30-39 */                                                       \
+      '6',                                                                   \
+      '7',                                                                   \
+      '8',                                                                   \
+      '9',                                                                   \
+      '0',                                                                   \
+      KEY_ENTER,                                                             \
+      KEY_ESCAPE,                                                            \
+      KEY_BACKSPACE,                                                         \
+      KEY_TAB,                                                               \
+      ' ', /* 40-49 */                                                       \
+      KEY_MINUS,                                                             \
+      KEY_EQUALS,                                                            \
+      '[',                                                                   \
+      ']',                                                                   \
+      '\\',                                                                  \
+      0,                                                                     \
+      ';',                                                                   \
+      '\'',                                                                  \
+      '`',                                                                   \
+      ',', /* 50-59 */                                                       \
+      '.',                                                                   \
+      '/',                                                                   \
+      KEY_CAPSLOCK,                                                          \
+      KEY_F1,                                                                \
+      KEY_F2,                                                                \
+      KEY_F3,                                                                \
+      KEY_F4,                                                                \
+      KEY_F5,                                                                \
+      KEY_F6,                                                                \
+      KEY_F7, /* 60-69 */                                                    \
+      KEY_F8,                                                                \
+      KEY_F9,                                                                \
+      KEY_F10,                                                               \
+      KEY_F11,                                                               \
+      KEY_F12,                                                               \
+      KEY_PRTSCR,                                                            \
+      KEY_SCRLCK,                                                            \
+      KEY_PAUSE,                                                             \
+      KEY_INS,                                                               \
+      KEY_HOME, /* 70-79 */                                                  \
+      KEY_PGUP,                                                              \
+      KEY_DEL,                                                               \
+      KEY_END,                                                               \
+      KEY_PGDN,                                                              \
+      KEY_RIGHTARROW,                                                        \
+      KEY_LEFTARROW,                                                         \
+      KEY_DOWNARROW,                                                         \
+      KEY_UPARROW, /* 80-89 */                                               \
+      KEY_NUMLOCK,                                                           \
+      KEYP_DIVIDE,                                                           \
+      KEYP_MULTIPLY,                                                         \
+      KEYP_MINUS,                                                            \
+      KEYP_PLUS,                                                             \
+      KEYP_ENTER,                                                            \
+      KEYP_1,                                                                \
+      KEYP_2,                                                                \
+      KEYP_3,                                                                \
+      KEYP_4,                                                                \
+      KEYP_5,                                                                \
+      KEYP_6, /* 90-99 */                                                    \
+      KEYP_7,                                                                \
+      KEYP_8,                                                                \
+      KEYP_9,                                                                \
+      KEYP_0,                                                                \
+      KEYP_PERIOD,                                                           \
+      KEY_NONUSBACKSLASH,                                                    \
+      0,                                                                     \
+      0,                                                                     \
+      KEYP_EQUALS, /* 100-103 */                                             \
+  }
 
-// Default names for keys, to use in English or as fallback.
-#define KEY_NAMES_ARRAY {                                            \
-    { KEY_BACKSPACE,  "BACKSP" },   { KEY_TAB,        "TAB" },       \
-    { KEY_INS,        "INS" },      { KEY_DEL,        "DEL" },       \
-    { KEY_PGUP,       "PGUP" },     { KEY_PGDN,       "PGDN" },      \
-    { KEY_ENTER,      "ENTER" },    { KEY_ESCAPE,     "ESC" },       \
-    { KEY_F1,         "F1" },       { KEY_F2,         "F2" },        \
-    { KEY_F3,         "F3" },       { KEY_F4,         "F4" },        \
-    { KEY_F5,         "F5" },       { KEY_F6,         "F6" },        \
-    { KEY_F7,         "F7" },       { KEY_F8,         "F8" },        \
-    { KEY_F9,         "F9" },       { KEY_F10,        "F10" },       \
-    { KEY_F11,        "F11" },      { KEY_F12,        "F12" },       \
-    { KEY_HOME,       "HOME" },     { KEY_END,        "END" },       \
-    { KEY_MINUS,      "-" },        { KEY_EQUALS,     "=" },         \
-    { KEY_NUMLOCK,    "NUMLCK" },   { KEY_SCRLCK,     "SCRLCK" },    \
-    { KEY_PAUSE,      "PAUSE" },    { KEY_PRTSCR,     "PRTSC" },     \
-    { KEY_UPARROW,    "UP" },       { KEY_DOWNARROW,  "DOWN" },      \
-    { KEY_LEFTARROW,  "LEFT" },     { KEY_RIGHTARROW, "RIGHT" },     \
-    { KEY_RALT,       "ALT" },      { KEY_LALT,       "ALT" },       \
-    { KEY_RSHIFT,     "SHIFT" },    { KEY_CAPSLOCK,   "CAPS" },      \
-    { KEY_RCTRL,      "CTRL" },     { KEYP_5,         "NUM5" },      \
-    { ' ',            "SPACE" },                                     \
-    { 'a', "A" },   { 'b', "B" },   { 'c', "C" },   { 'd', "D" },    \
-    { 'e', "E" },   { 'f', "F" },   { 'g', "G" },   { 'h', "H" },    \
-    { 'i', "I" },   { 'j', "J" },   { 'k', "K" },   { 'l', "L" },    \
-    { 'm', "M" },   { 'n', "N" },   { 'o', "O" },   { 'p', "P" },    \
-    { 'q', "Q" },   { 'r', "R" },   { 's', "S" },   { 't', "T" },    \
-    { 'u', "U" },   { 'v', "V" },   { 'w', "W" },   { 'x', "X" },    \
-    { 'y', "Y" },   { 'z', "Z" },   { '0', "0" },   { '1', "1" },    \
-    { '2', "2" },   { '3', "3" },   { '4', "4" },   { '5', "5" },    \
-    { '6', "6" },   { '7', "7" },   { '8', "8" },   { '9', "9" },    \
-    { '[', "[" },   { ']', "]" },   { ';', ";" },   { '`', "`" },    \
-    { ',', "," },   { '.', "." },   { '/', "/" },   { '\\', "\\" },  \
-    { '\'', "\'" },                                                  \
-}
+/* Default names for keys, to use in English or as fallback. */
 
-#endif          // __DOOMKEYS__
+#define KEY_NAMES_ARRAY                                                      \
+  {                                                                          \
+      {KEY_BACKSPACE, "BACKSP"},                                             \
+      {KEY_TAB, "TAB"},                                                      \
+      {KEY_INS, "INS"},                                                      \
+      {KEY_DEL, "DEL"},                                                      \
+      {KEY_PGUP, "PGUP"},                                                    \
+      {KEY_PGDN, "PGDN"},                                                    \
+      {KEY_ENTER, "ENTER"},                                                  \
+      {KEY_ESCAPE, "ESC"},                                                   \
+      {KEY_F1, "F1"},                                                        \
+      {KEY_F2, "F2"},                                                        \
+      {KEY_F3, "F3"},                                                        \
+      {KEY_F4, "F4"},                                                        \
+      {KEY_F5, "F5"},                                                        \
+      {KEY_F6, "F6"},                                                        \
+      {KEY_F7, "F7"},                                                        \
+      {KEY_F8, "F8"},                                                        \
+      {KEY_F9, "F9"},                                                        \
+      {KEY_F10, "F10"},                                                      \
+      {KEY_F11, "F11"},                                                      \
+      {KEY_F12, "F12"},                                                      \
+      {KEY_HOME, "HOME"},                                                    \
+      {KEY_END, "END"},                                                      \
+      {KEY_MINUS, "-"},                                                      \
+      {KEY_EQUALS, "="},                                                     \
+      {KEY_NUMLOCK, "NUMLCK"},                                               \
+      {KEY_SCRLCK, "SCRLCK"},                                                \
+      {KEY_PAUSE, "PAUSE"},                                                  \
+      {KEY_PRTSCR, "PRTSC"},                                                 \
+      {KEY_UPARROW, "UP"},                                                   \
+      {KEY_DOWNARROW, "DOWN"},                                               \
+      {KEY_LEFTARROW, "LEFT"},                                               \
+      {KEY_RIGHTARROW, "RIGHT"},                                             \
+      {KEY_RALT, "ALT"},                                                     \
+      {KEY_LALT, "ALT"},                                                     \
+      {KEY_RSHIFT, "SHIFT"},                                                 \
+      {KEY_CAPSLOCK, "CAPS"},                                                \
+      {KEY_RCTRL, "CTRL"},                                                   \
+      {KEYP_5, "NUM5"},                                                      \
+      {' ', "SPACE"},                                                        \
+      {'a', "A"},                                                            \
+      {'b', "B"},                                                            \
+      {'c', "C"},                                                            \
+      {'d', "D"},                                                            \
+      {'e', "E"},                                                            \
+      {'f', "F"},                                                            \
+      {'g', "G"},                                                            \
+      {'h', "H"},                                                            \
+      {'i', "I"},                                                            \
+      {'j', "J"},                                                            \
+      {'k', "K"},                                                            \
+      {'l', "L"},                                                            \
+      {'m', "M"},                                                            \
+      {'n', "N"},                                                            \
+      {'o', "O"},                                                            \
+      {'p', "P"},                                                            \
+      {'q', "Q"},                                                            \
+      {'r', "R"},                                                            \
+      {'s', "S"},                                                            \
+      {'t', "T"},                                                            \
+      {'u', "U"},                                                            \
+      {'v', "V"},                                                            \
+      {'w', "W"},                                                            \
+      {'x', "X"},                                                            \
+      {'y', "Y"},                                                            \
+      {'z', "Z"},                                                            \
+      {'0', "0"},                                                            \
+      {'1', "1"},                                                            \
+      {'2', "2"},                                                            \
+      {'3', "3"},                                                            \
+      {'4', "4"},                                                            \
+      {'5', "5"},                                                            \
+      {'6', "6"},                                                            \
+      {'7', "7"},                                                            \
+      {'8', "8"},                                                            \
+      {'9', "9"},                                                            \
+      {'[', "["},                                                            \
+      {']', "]"},                                                            \
+      {';', ";"},                                                            \
+      {'`', "`"},                                                            \
+      {',', ","},                                                            \
+      {'.', "."},                                                            \
+      {'/', "/"},                                                            \
+      {'\\', "\\"},                                                          \
+      {'\'', "\'"},                                                          \
+  }
 
+#endif /* __DOOMKEYS__ */
diff --git a/games/NXDoom/src/doomtype.h b/games/NXDoom/src/doomtype.h
index d90cfec97..2029723ad 100644
--- a/games/NXDoom/src/doomtype.h
+++ b/games/NXDoom/src/doomtype.h
@@ -1,69 +1,72 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Simple basic typedefs, isolated here to make it easier
-//	 separating modules.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/doomtype.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Simple basic typedefs, isolated here to make it easier
+ *  separating modules.
+ *
+ ****************************************************************************/
 
 #ifndef __DOOMTYPE__
 #define __DOOMTYPE__
 
-#include "config.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#if defined(_MSC_VER) && !defined(__cplusplus)
-#define inline __inline
-#endif
-
-// #define macros to provide functions missing in Windows.
-// Outside Windows, we use strings.h for str[n]casecmp.
-
-
-#if !HAVE_DECL_STRCASECMP || !HAVE_DECL_STRNCASECMP
-
-#include <string.h>
-#if !HAVE_DECL_STRCASECMP
-#define strcasecmp stricmp
-#endif
-#if !HAVE_DECL_STRNCASECMP
-#define strncasecmp strnicmp
-#endif
-
-#else
+#include <nuttx/config.h>
 
 #include <strings.h>
 
-#endif
+/* What is really wanted here is stdint.h; however, some old versions
+ * of Solaris don't have stdint.h and only have inttypes.h (the
+ * pre-standardisation version).  inttypes.h is also in the C99
+ * standard and defined to include stdint.h, so include this.
+ */
 
+#include <inttypes.h>
+#include <stdbool.h>
 
-//
-// The packed attribute forces structures to be packed into the minimum 
-// space necessary.  If this is not done, the compiler may align structure
-// fields differently to optimize memory access, inflating the overall
-// structure size.  It is important to use the packed attribute on certain
-// structures where alignment is important, particularly data read/written
-// to disk.
-//
+#include <limits.h>
+
+#include "config.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DIR_SEPARATOR '/'
+#define DIR_SEPARATOR_S "/"
+#define PATH_SEPARATOR ':'
+
+#define arrlen(array) (sizeof(array) / sizeof(*array))
+
+/* The packed attribute forces structures to be packed into the minimum
+ * space necessary.  If this is not done, the compiler may align structure
+ * fields differently to optimize memory access, inflating the overall
+ * structure size.  It is important to use the packed attribute on certain
+ * structures where alignment is important, particularly data read/written
+ * to disk.
+ */
 
 #ifdef __GNUC__
 
-#if defined(_WIN32) && !defined(__clang__)
-#define PACKEDATTR __attribute__((packed,gcc_struct))
-#else
 #define PACKEDATTR __attribute__((packed))
-#endif
 
 #define PRINTF_ATTR(fmt, first) __attribute__((format(printf, fmt, first)))
 #define PRINTF_ARG_ATTR(x) __attribute__((format_arg(x)))
@@ -78,43 +81,33 @@
 #define PRINTF_ATTR(fmt, first)
 #define PRINTF_ARG_ATTR(x)
 #define NORETURN
-#endif
+#endif /* __GNUC__ */
 
-#ifdef __WATCOMC__
-#define PACKEDPREFIX _Packed
-#elif defined(_MSC_VER)
-#define PACKEDPREFIX __pragma(pack(push,1))
-#else
 #define PACKEDPREFIX
-#endif
 
-#define PACKED_STRUCT(...) PACKEDPREFIX struct __VA_ARGS__ PACKEDATTR
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-// C99 integer types; with gcc we just use this.  Other compilers
-// should add conditional statements that define the C99 types.
-
-// What is really wanted here is stdint.h; however, some old versions
-// of Solaris don't have stdint.h and only have inttypes.h (the 
-// pre-standardisation version).  inttypes.h is also in the C99 
-// standard and defined to include stdint.h, so include this. 
-
-#include <inttypes.h>
-#include <stdbool.h>
+/* C99 integer types; with gcc we just use this.  Other compilers
+ * should add conditional statements that define the C99 types.
+ */
 
 #if defined(__cplusplus) || defined(__bool_true_false_are_defined)
 
-// The C++/C99 bool type (or _Bool that is) can only have two values:
-// 0 or 1. However, the Doom source code assumes any non-zero value
-// to evaluate to true, so we have to use an int type here.
+/* The C++/C99 bool type (or _Bool that is) can only have two values:
+ * 0 or 1. However, the Doom source code assumes any non-zero value
+ * to evaluate to true, so we have to use an int type here.
+ */
 
 typedef int boolean;
 
 #else
 
-typedef enum 
+typedef enum
 {
-    false, 
-    true
+  false,
+  true
 } boolean;
 
 #endif
@@ -123,23 +116,4 @@ typedef uint8_t byte;
 typedef uint8_t pixel_t;
 typedef int16_t dpixel_t;
 
-#include <limits.h>
-
-#ifdef _WIN32
-
-#define DIR_SEPARATOR '\\'
-#define DIR_SEPARATOR_S "\\"
-#define PATH_SEPARATOR ';'
-
-#else
-
-#define DIR_SEPARATOR '/'
-#define DIR_SEPARATOR_S "/"
-#define PATH_SEPARATOR ':'
-
-#endif
-
-#define arrlen(array) (sizeof(array) / sizeof(*array))
-
-#endif
-
+#endif /* __DOOMTYPE__ */
diff --git a/games/NXDoom/src/gusconf.c b/games/NXDoom/src/gusconf.c
index 5cd1d62a9..01f6606c5 100644
--- a/games/NXDoom/src/gusconf.c
+++ b/games/NXDoom/src/gusconf.c
@@ -1,301 +1,337 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     GUS emulation code.
-//
-//     Actually emulating a GUS is far too much work; fortunately
-//     GUS "emulation" already exists in the form of Timidity, which
-//     supports GUS patch files. This code therefore converts Doom's
-//     DMXGUS lump into an equivalent Timidity configuration file.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/gusconf.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   GUS emulation code.
+ *
+ *   Actually emulating a GUS is far too much work; fortunately
+ *   GUS "emulation" already exists in the form of Timidity, which
+ *   supports GUS patch files. This code therefore converts Doom's
+ *   DMXGUS lump into an equivalent Timidity configuration file.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "m_misc.h"
 #include "w_wad.h"
 #include "z_zone.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define MAX_INSTRUMENTS 256
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct
 {
-    char *patch_names[MAX_INSTRUMENTS];
-    int used[MAX_INSTRUMENTS];
-    int mapping[MAX_INSTRUMENTS];
-    unsigned int count;
+  char *patch_names[MAX_INSTRUMENTS];
+  int used[MAX_INSTRUMENTS];
+  int mapping[MAX_INSTRUMENTS];
+  unsigned int count;
 } gus_config_t;
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 char *gus_patch_path = "";
 int gus_ram_kb = 1024;
 
-static unsigned int MappingIndex(void)
-{
-    unsigned int result = gus_ram_kb / 256;
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-    if (result < 1)
+static unsigned int mapping_index(void)
+{
+  unsigned int result = gus_ram_kb / 256;
+
+  if (result < 1)
     {
-        return 1;
+      return 1;
     }
-    else if (result > 4)
+  else if (result > 4)
     {
-        return 4;
+      return 4;
     }
-    else
+  else
     {
-        return result;
+      return result;
     }
 }
 
-static int SplitLine(char *line, char **fields, unsigned int max_fields)
+static int split_line(char *line, char **fields, unsigned int max_fields)
 {
-    unsigned int num_fields;
-    char *p;
+  unsigned int num_fields;
+  char *p;
 
-    fields[0] = line;
-    num_fields = 1;
+  fields[0] = line;
+  num_fields = 1;
 
-    for (p = line; *p != '\0'; ++p)
+  for (p = line; *p != '\0'; ++p)
     {
-        if (*p == ',')
+      if (*p == ',')
         {
-            *p = '\0';
+          *p = '\0';
 
-            // Skip spaces following the comma.
-            do
+          /* Skip spaces following the comma. */
+
+          do
             {
-                ++p;
-            } while (*p != '\0' && isspace(*p));
+              ++p;
+            }
+          while (*p != '\0' && isspace(*p));
 
-            fields[num_fields] = p;
-            ++num_fields;
-            --p;
+          fields[num_fields] = p;
+          ++num_fields;
+          --p;
 
-            if (num_fields >= max_fields)
+          if (num_fields >= max_fields)
             {
-                break;
+              break;
             }
         }
-        else if (*p == '#')
+      else if (*p == '#')
         {
-            *p = '\0';
-            break;
+          *p = '\0';
+          break;
         }
     }
 
-    // Strip off trailing whitespace from the end of the line.
-    p = fields[num_fields - 1] + strlen(fields[num_fields - 1]);
-    while (p > fields[num_fields - 1] && isspace(*(p - 1)))
+  /* Strip off trailing whitespace from the end of the line. */
+
+  p = fields[num_fields - 1] + strlen(fields[num_fields - 1]);
+  while (p > fields[num_fields - 1] && isspace(*(p - 1)))
     {
-        --p;
-        *p = '\0';
+      --p;
+      *p = '\0';
     }
 
-    return num_fields;
+  return num_fields;
 }
 
-static void ParseLine(gus_config_t *config, char *line)
+static void parse_line(gus_config_t *config, char *line)
 {
-    char *fields[6];
-    unsigned int i;
-    unsigned int num_fields;
-    unsigned int instr_id, mapped_id;
+  char *fields[6];
+  unsigned int i;
+  unsigned int num_fields;
+  unsigned int instr_id;
+  unsigned int mapped_id;
 
-    num_fields = SplitLine(line, fields, 6);
+  num_fields = split_line(line, fields, 6);
 
-    if (num_fields < 6)
+  if (num_fields < 6)
     {
-        return;
+      return;
     }
 
-    instr_id = atoi(fields[0]);
+  instr_id = atoi(fields[0]);
 
-    // Skip non GM percussions.
-    if ((instr_id >= 128 && instr_id < 128 + 35) || instr_id > 128 + 81)
+  /* Skip non GM percussions. */
+
+  if ((instr_id >= 128 && instr_id < 128 + 35) || instr_id > 128 + 81)
     {
-        return;
+      return;
     }
 
-    mapped_id = atoi(fields[MappingIndex()]);
+  mapped_id = atoi(fields[mapping_index()]);
 
-    for (i = 0; i < config->count; i++)
+  for (i = 0; i < config->count; i++)
     {
-        if (config->used[i] == mapped_id)
+      if (config->used[i] == mapped_id)
         {
-            break;
+          break;
         }
     }
-    
-    if (i == config->count)
+
+  if (i == config->count)
     {
-        // DMX uses wrong patch name (we should use name of 'mapped_id'
-        // instrument, but DMX uses name of 'instr_id' instead).
-        free(config->patch_names[i]);
-        config->patch_names[i] = M_StringDuplicate(fields[5]);
-        config->used[i] = mapped_id;
-        config->count++;
+      /* DMX uses wrong patch name (we should use name of 'mapped_id'
+       * instrument, but DMX uses name of 'instr_id' instead).
+       */
+
+      free(config->patch_names[i]);
+      config->patch_names[i] = m_string_duplicate(fields[5]);
+      config->used[i] = mapped_id;
+      config->count++;
     }
-    config->mapping[instr_id] = i;
+
+  config->mapping[instr_id] = i;
 }
 
-static void ParseDMXConfig(char *dmxconf, gus_config_t *config)
+static void parse_dmx_config(char *dmxconf, gus_config_t *config)
 {
-    char *p, *newline;
-    unsigned int i;
+  char *p;
+  char *newline;
+  unsigned int i;
 
-    memset(config, 0, sizeof(gus_config_t));
+  memset(config, 0, sizeof(gus_config_t));
 
-    for (i = 0; i < MAX_INSTRUMENTS; ++i)
+  for (i = 0; i < MAX_INSTRUMENTS; ++i)
     {
-        config->mapping[i] = -1;
-        config->used[i] = -1;
+      config->mapping[i] = -1;
+      config->used[i] = -1;
     }
 
-    config->count = 0;
+  config->count = 0;
 
-    p = dmxconf;
+  p = dmxconf;
 
-    for (;;)
+  for (; ; )
     {
-        newline = strchr(p, '\n');
+      newline = strchr(p, '\n');
 
-        if (newline != NULL)
+      if (newline != NULL)
         {
-            *newline = '\0';
+          *newline = '\0';
         }
 
-        ParseLine(config, p);
+      parse_line(config, p);
 
-        if (newline == NULL)
+      if (newline == NULL)
         {
-            break;
+          break;
         }
-        else
+      else
         {
-            p = newline + 1;
+          p = newline + 1;
         }
     }
 }
 
-static void FreeDMXConfig(gus_config_t *config)
+static void free_dmx_config(gus_config_t *config)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i = 0; i < MAX_INSTRUMENTS; ++i)
+  for (i = 0; i < MAX_INSTRUMENTS; ++i)
     {
-        free(config->patch_names[i]);
+      free(config->patch_names[i]);
     }
 }
 
-static char *ReadDMXConfig(void)
+static char *read_dmx_config(void)
 {
-    int lumpnum;
-    unsigned int len;
-    char *data;
+  int lumpnum;
+  unsigned int len;
+  char *data;
 
-    // TODO: This should be chosen based on gamemode == commercial:
+  /* TODO: This should be chosen based on gamemode == commercial: */
 
-    lumpnum = W_CheckNumForName("DMXGUS");
+  lumpnum = w_check_num_for_name("DMXGUS");
 
-    if (lumpnum < 0)
+  if (lumpnum < 0)
     {
-        lumpnum = W_GetNumForName("DMXGUSC");
+      lumpnum = w_get_num_for_name("DMXGUSC");
     }
 
-    len = W_LumpLength(lumpnum);
-    data = Z_Malloc(len + 1, PU_STATIC, NULL);
-    W_ReadLump(lumpnum, data);
+  len = w_lump_length(lumpnum);
+  data = z_malloc(len + 1, PU_STATIC, NULL);
+  w_read_lump(lumpnum, data);
 
-    data[len] = '\0';
-    return data;
+  data[len] = '\0';
+  return data;
 }
 
-static boolean WriteTimidityConfig(char *path, gus_config_t *config)
+static boolean write_timidity_config(char *path, gus_config_t *config)
 {
-    FILE *fstream;
-    unsigned int i;
+  FILE *fstream;
+  unsigned int i;
 
-    fstream = M_fopen(path, "w");
+  fstream = fopen(path, "w");
 
-    if (fstream == NULL)
+  if (fstream == NULL)
     {
-        return false;
+      return false;
     }
 
-    fprintf(fstream, "# Autogenerated Timidity config.\n\n");
+  fprintf(fstream, "# Autogenerated Timidity config.\n\n");
 
-    fprintf(fstream, "dir \"%s\"\n", gus_patch_path);
+  fprintf(fstream, "dir \"%s\"\n", gus_patch_path);
 
-    fprintf(fstream, "\nbank 0\n\n");
+  fprintf(fstream, "\nbank 0\n\n");
 
-    for (i = 0; i < 128; ++i)
+  for (i = 0; i < 128; ++i)
     {
-        if (config->mapping[i] >= 0 && config->mapping[i] < MAX_INSTRUMENTS
-         && config->patch_names[config->mapping[i]] != NULL)
+      if (config->mapping[i] >= 0 && config->mapping[i] < MAX_INSTRUMENTS &&
+          config->patch_names[config->mapping[i]] != NULL)
         {
-            fprintf(fstream, "%u %s\n",
-                    i, config->patch_names[config->mapping[i]]);
+          fprintf(fstream, "%u %s\n", i,
+                  config->patch_names[config->mapping[i]]);
         }
     }
 
-    fprintf(fstream, "\ndrumset 0\n\n");
-    
-    for (i = 128 + 35; i <= 128 + 81; ++i)
+  fprintf(fstream, "\ndrumset 0\n\n");
+
+  for (i = 128 + 35; i <= 128 + 81; ++i)
     {
-        if (config->mapping[i] >= 0 && config->mapping[i] < MAX_INSTRUMENTS
-         && config->patch_names[config->mapping[i]] != NULL)
+      if (config->mapping[i] >= 0 && config->mapping[i] < MAX_INSTRUMENTS &&
+          config->patch_names[config->mapping[i]] != NULL)
         {
-            fprintf(fstream, "%u %s\n",
-                    i - 128, config->patch_names[config->mapping[i]]);
+          fprintf(fstream, "%u %s\n", i - 128,
+                  config->patch_names[config->mapping[i]]);
         }
     }
 
-    fprintf(fstream, "\n");
+  fprintf(fstream, "\n");
 
-    fclose(fstream);
+  fclose(fstream);
 
-    return true;
+  return true;
 }
 
-boolean GUS_WriteConfig(char *path)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+boolean gus_write_config(char *path)
 {
-    boolean result;
-    char *dmxconf;
-    gus_config_t config;
+  boolean result;
+  char *dmxconf;
+  gus_config_t config;
 
-    if (!strcmp(gus_patch_path, ""))
+  if (!strcmp(gus_patch_path, ""))
     {
-        printf("You haven't configured gus_patch_path.\n");
-        printf("gus_patch_path needs to point to the location of "
-               "your GUS patch set.\n"
-               "To get a copy of the \"standard\" GUS patches, "
-               "download a copy of dgguspat.zip.\n");
+      printf("You haven't configured gus_patch_path.\n");
+      printf("gus_patch_path needs to point to the location of "
+             "your GUS patch set.\n"
+             "To get a copy of the \"standard\" GUS patches, "
+             "download a copy of dgguspat.zip.\n");
 
-        return false;
+      return false;
     }
 
-    dmxconf = ReadDMXConfig();
-    ParseDMXConfig(dmxconf, &config);
+  dmxconf = read_dmx_config();
+  parse_dmx_config(dmxconf, &config);
 
-    result = WriteTimidityConfig(path, &config);
+  result = write_timidity_config(path, &config);
 
-    FreeDMXConfig(&config);
-    Z_Free(dmxconf);
+  free_dmx_config(&config);
+  z_free(dmxconf);
 
-    return result;
+  return result;
 }
-
diff --git a/games/NXDoom/src/gusconf.h b/games/NXDoom/src/gusconf.h
index 4efbe9952..aef259d5e 100644
--- a/games/NXDoom/src/gusconf.h
+++ b/games/NXDoom/src/gusconf.h
@@ -1,29 +1,45 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     GUS emulation code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/gusconf.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   GUS emulation code.
+ *
+ ****************************************************************************/
 
 #ifndef __GUSCONF_H__
 #define __GUSCONF_H__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern char *gus_patch_path;
 extern int gus_ram_kb;
 
-boolean GUS_WriteConfig(char *path);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef __GUSCONF_H__ */
+boolean gus_write_config(char *path);
 
+#endif /* __GUSCONF_H__ */
diff --git a/games/NXDoom/src/heretic-res.rc.in b/games/NXDoom/src/heretic-res.rc.in
deleted file mode 100644
index 0cf43446d..000000000
--- a/games/NXDoom/src/heretic-res.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-1 ICON "@top_srcdir@/data/heretic.ico"
-
-#include <winuser.h>
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
-
-1 VERSIONINFO
-PRODUCTVERSION @WINDOWS_RC_VERSION@
-FILEVERSION @WINDOWS_RC_VERSION@
-FILETYPE 1
-{
- BLOCK "StringFileInfo"
- {
-  BLOCK "040904E4"
-  {
-   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
-   VALUE "FileDescription", "@PACKAGE_STRING@"
-   VALUE "InternalName", "@PACKAGE_TARNAME@"
-   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
-   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
-   VALUE "ProductName", "@PACKAGE_NAME@"
-   VALUE "ProductVersion", "@PACKAGE_VERSION@"
-  }
- }
- BLOCK "VarFileInfo"
- {
-  VALUE "Translation", 0x409, 1252
- }
-}
-
diff --git a/games/NXDoom/src/heretic/.gitignore b/games/NXDoom/src/heretic/.gitignore
deleted file mode 100644
index 76092240c..000000000
--- a/games/NXDoom/src/heretic/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.deps
-tags
-TAGS
-
diff --git a/games/NXDoom/src/heretic/CMakeLists.txt b/games/NXDoom/src/heretic/CMakeLists.txt
deleted file mode 100644
index ac6d2fbaf..000000000
--- a/games/NXDoom/src/heretic/CMakeLists.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-add_library(heretic STATIC
-            am_data.h
-            am_map.c            am_map.h
-            ct_chat.c           ct_chat.h
-            deh_ammo.c
-            deh_frame.c
-            deh_htext.c
-            deh_htic.c          deh_htic.h
-            deh_sound.c
-            deh_thing.c
-            deh_weapon.c
-            d_main.c
-            d_net.c
-                                doomdata.h
-                                doomdef.h
-                                dstrings.h
-            f_finale.c
-            g_game.c
-            info.c              info.h
-            in_lude.c
-            m_random.c          m_random.h
-            mn_menu.c
-                                p_action.h
-            p_ceilng.c
-            p_doors.c
-            p_enemy.c
-            p_floor.c
-            p_inter.c
-            p_lights.c
-            p_local.h
-            p_map.c
-            p_maputl.c
-            p_mobj.c
-            p_plats.c
-            p_pspr.c
-            p_saveg.c
-            p_setup.c
-            p_sight.c
-            p_spec.c            p_spec.h
-            p_switch.c
-            p_telept.c
-            p_tick.c
-            p_user.c
-            r_bsp.c
-            r_data.c
-            r_draw.c
-                                r_local.h
-            r_main.c
-            r_plane.c
-            r_segs.c
-            r_things.c
-            sb_bar.c
-            sounds.c            sounds.h
-            s_sound.c           s_sound.h)
-
-target_include_directories(heretic PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-
-if (DEFINED EMSCRIPTEN)
-    set(SDL_FLAGS "-s USE_SDL=2")
-    if(ENABLE_SDL2_MIXER)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
-    endif()
-    if(ENABLE_SDL2_NET)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
-    endif()
-else()
-    set(SDL_LINK_LIBS SDL2::SDL2)
-    if(ENABLE_SDL2_MIXER)
-        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
-    endif()
-    if(ENABLE_SDL2_NET)
-        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
-    endif()
-endif()
-target_link_libraries(heretic textscreen ${SDL_LINK_LIBS})
-set_target_properties(heretic PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-set_target_properties(heretic PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/heretic/Makefile.am b/games/NXDoom/src/heretic/Makefile.am
deleted file mode 100644
index ac849d5e5..000000000
--- a/games/NXDoom/src/heretic/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-
-AM_CFLAGS=-I$(top_srcdir)/src                           \
-          -I$(top_srcdir)/textscreen                    \
-          @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
-
-EXTRA_DIST =                                         \
-        CMakeLists.txt                               \
-        heretic_icon.c
-
-noinst_LIBRARIES=libheretic.a
-
-libheretic_a_SOURCES =                               \
-                       am_data.h                     \
-am_map.c               am_map.h                      \
-ct_chat.c              ct_chat.h                     \
-deh_ammo.c                                           \
-deh_frame.c                                          \
-deh_htext.c                                          \
-deh_htic.c             deh_htic.h                    \
-deh_sound.c                                          \
-deh_thing.c                                          \
-deh_weapon.c                                         \
-d_main.c                                             \
-d_net.c                                              \
-                       doomdata.h                    \
-                       doomdef.h                     \
-                       dstrings.h                    \
-f_finale.c                                           \
-g_game.c                                             \
-info.c                 info.h                        \
-in_lude.c                                            \
-m_random.c             m_random.h                    \
-mn_menu.c                                            \
-                       p_action.h                    \
-p_ceilng.c                                           \
-p_doors.c                                            \
-p_enemy.c                                            \
-p_floor.c                                            \
-p_inter.c                                            \
-p_lights.c                                           \
-p_local.h                                            \
-p_map.c                                              \
-p_maputl.c                                           \
-p_mobj.c                                             \
-p_plats.c                                            \
-p_pspr.c                                             \
-p_saveg.c                                            \
-p_setup.c                                            \
-p_sight.c                                            \
-p_spec.c               p_spec.h                      \
-p_switch.c                                           \
-p_telept.c                                           \
-p_tick.c                                             \
-p_user.c                                             \
-r_bsp.c                                              \
-r_data.c                                             \
-r_draw.c                                             \
-                       r_local.h                     \
-r_main.c                                             \
-r_plane.c                                            \
-r_segs.c                                             \
-r_things.c                                           \
-sb_bar.c                                             \
-sounds.c               sounds.h                      \
-s_sound.c              s_sound.h
-
-if HAVE_ICONS
-
-heretic_icon.c : $(top_builddir)/data/heretic.png
-	$(top_builddir)/data/convert-icon $(top_builddir)/data/heretic.png $@
-
-endif
diff --git a/games/NXDoom/src/heretic/am_data.h b/games/NXDoom/src/heretic/am_data.h
deleted file mode 100644
index c5efb0894..000000000
--- a/games/NXDoom/src/heretic/am_data.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// AM_data.h : The vector graphics for the automap
-
-#ifndef __AMDATA_H__
-#define __AMDATA_H__
-
-// a line drawing of the player pointing right, starting from the middle.
-
-#define R ((8*PLAYERRADIUS)/7)
-
-mline_t player_arrow[] = {
-  { { -R+R/4, 0 }, { 0, 0} }, // center line.
-  { { -R+R/4, R/8 }, { R, 0} }, // blade
-  { { -R+R/4, -R/8 }, { R, 0 } },
-  { { -R+R/4, -R/4 }, { -R+R/4, R/4 } }, // crosspiece
-  { { -R+R/8, -R/4 }, { -R+R/8, R/4 } },
-  { { -R+R/8, -R/4 }, { -R+R/4, -R/4} }, //crosspiece connectors
-  { { -R+R/8, R/4 }, { -R+R/4, R/4} },
-  { { -R-R/4, R/8 }, { -R-R/4, -R/8 } }, //pommel
-  { { -R-R/4, R/8 }, { -R+R/8, R/8 } },
-  { { -R-R/4, -R/8}, { -R+R/8, -R/8 } }
-  };
-
-mline_t keysquare[] = {
-	{ { 0, 0 }, { R/4, -R/2 } },
-	{ { R/4, -R/2 }, { R/2, -R/2 } },
-	{ { R/2, -R/2 }, { R/2, R/2 } },
-	{ { R/2, R/2 }, { R/4, R/2 } },
-	{ { R/4, R/2 }, { 0, 0 } }, // handle part type thing
-	{ { 0, 0 }, { -R, 0 } }, // stem
-	{ { -R, 0 }, { -R, -R/2 } }, // end lockpick part
-	{ { -3*R/4, 0 }, { -3*R/4, -R/4 } }
-	};
-
-/*mline_t player_arrow[] = {
-  { { -R+R/8, 0 }, { R, 0 } }, // -----
-  { { R, 0 }, { R-R/2, R/4 } },  // ----->
-  { { R, 0 }, { R-R/2, -R/4 } },
-  { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
-  { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
-  { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
-  { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
-  };
-*/
-#undef R
-#define NUMPLYRLINES (sizeof(player_arrow)/sizeof(mline_t))
-#define NUMKEYSQUARELINES (sizeof(keysquare)/sizeof(mline_t))
-
-#define R ((8*PLAYERRADIUS)/7)
-mline_t cheat_player_arrow[] = {
-  { { -R+R/8, 0 }, { R, 0 } }, // -----
-  { { R, 0 }, { R-R/2, R/6 } },  // ----->
-  { { R, 0 }, { R-R/2, -R/6 } },
-  { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
-  { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
-  { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
-  { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
-  { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
-  { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
-  { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
-  { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
-  { { -R/6, -R/6 }, { 0, -R/6 } },
-  { { 0, -R/6 }, { 0, R/4 } },
-  { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
-  { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
-  { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
-  };
-#undef R
-#define NUMCHEATPLYRLINES (sizeof(cheat_player_arrow)/sizeof(mline_t))
-
-#define R (FRACUNIT)
-mline_t triangle_guy[] = {
-  { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
-  { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0      ), (fixed_t)(R    ) } },
-  { { (fixed_t)(0      ), (fixed_t)(R    ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
-  };
-#undef R
-#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
-
-#define R (FRACUNIT)
-mline_t thintriangle_guy[] = {
-  { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
-  { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
-  { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
-  };
-#undef R
-#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
-
-#endif
diff --git a/games/NXDoom/src/heretic/am_map.c b/games/NXDoom/src/heretic/am_map.c
deleted file mode 100644
index afc0c4222..000000000
--- a/games/NXDoom/src/heretic/am_map.c
+++ /dev/null
@@ -1,1535 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// AM_map.c
-
-#include <stdio.h>
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "m_controls.h"
-#include "p_local.h"
-#include "am_map.h"
-#include "am_data.h"
-
-#include "doomkeys.h"
-#include "v_video.h"
-
-vertex_t KeyPoints[NUM_KEY_TYPES];
-
-#define NUMALIAS 3              // Number of antialiased lines.
-
-const char *LevelNames[] = {
-    // EPISODE 1 - THE CITY OF THE DAMNED
-    "E1M1:  THE DOCKS",
-    "E1M2:  THE DUNGEONS",
-    "E1M3:  THE GATEHOUSE",
-    "E1M4:  THE GUARD TOWER",
-    "E1M5:  THE CITADEL",
-    "E1M6:  THE CATHEDRAL",
-    "E1M7:  THE CRYPTS",
-    "E1M8:  HELL'S MAW",
-    "E1M9:  THE GRAVEYARD",
-    // EPISODE 2 - HELL'S MAW
-    "E2M1:  THE CRATER",
-    "E2M2:  THE LAVA PITS",
-    "E2M3:  THE RIVER OF FIRE",
-    "E2M4:  THE ICE GROTTO",
-    "E2M5:  THE CATACOMBS",
-    "E2M6:  THE LABYRINTH",
-    "E2M7:  THE GREAT HALL",
-    "E2M8:  THE PORTALS OF CHAOS",
-    "E2M9:  THE GLACIER",
-    // EPISODE 3 - THE DOME OF D'SPARIL
-    "E3M1:  THE STOREHOUSE",
-    "E3M2:  THE CESSPOOL",
-    "E3M3:  THE CONFLUENCE",
-    "E3M4:  THE AZURE FORTRESS",
-    "E3M5:  THE OPHIDIAN LAIR",
-    "E3M6:  THE HALLS OF FEAR",
-    "E3M7:  THE CHASM",
-    "E3M8:  D'SPARIL'S KEEP",
-    "E3M9:  THE AQUIFER",
-    // EPISODE 4: THE OSSUARY
-    "E4M1:  CATAFALQUE",
-    "E4M2:  BLOCKHOUSE",
-    "E4M3:  AMBULATORY",
-    "E4M4:  SEPULCHER",
-    "E4M5:  GREAT STAIR",
-    "E4M6:  HALLS OF THE APOSTATE",
-    "E4M7:  RAMPARTS OF PERDITION",
-    "E4M8:  SHATTERED BRIDGE",
-    "E4M9:  MAUSOLEUM",
-    // EPISODE 5: THE STAGNANT DEMESNE
-    "E5M1:  OCHRE CLIFFS",
-    "E5M2:  RAPIDS",
-    "E5M3:  QUAY",
-    "E5M4:  COURTYARD",
-    "E5M5:  HYDRATYR",
-    "E5M6:  COLONNADE",
-    "E5M7:  FOETID MANSE",
-    "E5M8:  FIELD OF JUDGEMENT",
-    "E5M9:  SKEIN OF D'SPARIL",
-    // EPISODE 6: unnamed
-    "E6M1:  ",
-    "E6M2:  ",
-    "E6M3:  ",
-};
-
-static int cheating = 0;
-static int grid = 0;
-
-boolean automapactive = false;
-static int finit_width = SCREENWIDTH;
-static int finit_height = SCREENHEIGHT - 42;
-static int f_x, f_y;            // location of window on screen
-static int f_w, f_h;            // size of window on screen
-static int lightlev;            // used for funky strobing effect
-static byte *fb;                // pseudo-frame buffer
-static int amclock;
-
-static mpoint_t m_paninc;       // how far the window pans each tic (map coords)
-static fixed_t mtof_zoommul;    // how far the window zooms in each tic (map coords)
-static fixed_t ftom_zoommul;    // how far the window zooms in each tic (fb coords)
-
-static fixed_t m_x, m_y;        // LL x,y where the window is on the map (map coords)
-static fixed_t m_x2, m_y2;      // UR x,y where the window is on the map (map coords)
-
-// width/height of window on map (map coords)
-static fixed_t m_w, m_h;
-static fixed_t min_x, min_y;    // based on level size
-static fixed_t max_x, max_y;    // based on level size
-static fixed_t max_w, max_h;    // max_x-min_x, max_y-min_y
-static fixed_t min_w, min_h;    // based on player size
-static fixed_t min_scale_mtof;  // used to tell when to stop zooming out
-static fixed_t max_scale_mtof;  // used to tell when to stop zooming in
-
-// old stuff for recovery later
-static fixed_t old_m_w, old_m_h;
-static fixed_t old_m_x, old_m_y;
-
-// old location used by the Follower routine
-static mpoint_t f_oldloc;
-
-// used by MTOF to scale from map-to-frame-buffer coords
-static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
-// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
-static fixed_t scale_ftom;
-
-static player_t *plr;           // the player represented by an arrow
-static vertex_t oldplr;
-
-//static patch_t *marknums[10]; // numbers used for marking by the automap
-//static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
-//static int markpointnum = 0; // next point to be assigned
-
-static int followplayer = 1;    // specifies whether to follow the player around
-
-static char cheat_amap[] = { 'r', 'a', 'v', 'm', 'a', 'p' };
-
-static byte cheatcount = 0;
-
-static byte antialias[NUMALIAS][8] = {
-    {96, 97, 98, 99, 100, 101, 102, 103},
-    {110, 109, 108, 107, 106, 105, 104, 103},
-    {75, 76, 77, 78, 79, 80, 81, 103}
-};
-
-/*
-static byte *aliasmax[NUMALIAS] = {
-	&antialias[0][7], &antialias[1][7], &antialias[2][7]
-};*/
-
-static byte *maplump;           // pointer to the raw data for the automap background.
-static short mapystart = 0;     // y-value for the start of the map bitmap...used in the paralax stuff.
-static short mapxstart = 0;     //x-value for the bitmap.
-
-//byte screens[][SCREENWIDTH*SCREENHEIGHT];
-//void V_MarkRect (int x, int y, int width, int height);
-
-// Functions
-
-void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
-                int NumLevels, unsigned short IntensityBits);
-
-// Calculates the slope and slope according to the x-axis of a line
-// segment in map coordinates (with the upright y-axis n' all) so
-// that it can be used with the brain-dead drawing stuff.
-
-// Ripped out for Heretic
-/*
-void AM_getIslope(mline_t *ml, islope_t *is)
-{
-  int dx, dy;
-
-  dy = ml->a.y - ml->b.y;
-  dx = ml->b.x - ml->a.x;
-  if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
-  else is->islp = FixedDiv(dx, dy);
-  if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
-  else is->slp = FixedDiv(dy, dx);
-}
-*/
-
-void AM_activateNewScale(void)
-{
-    m_x += m_w / 2;
-    m_y += m_h / 2;
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-    m_x -= m_w / 2;
-    m_y -= m_h / 2;
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-}
-
-void AM_saveScaleAndLoc(void)
-{
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
-}
-
-void AM_restoreScaleAndLoc(void)
-{
-
-    m_w = old_m_w;
-    m_h = old_m_h;
-    if (!followplayer)
-    {
-        m_x = old_m_x;
-        m_y = old_m_y;
-    }
-    else
-    {
-        m_x = plr->mo->x - m_w / 2;
-        m_y = plr->mo->y - m_h / 2;
-    }
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-
-    // Change the scaling multipliers
-    scale_mtof = FixedDiv(f_w << FRACBITS, m_w);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-// adds a marker at the current location
-
-/*
-void AM_addMark(void)
-{
-  markpoints[markpointnum].x = m_x + m_w/2;
-  markpoints[markpointnum].y = m_y + m_h/2;
-  markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
-
-}
-*/
-void AM_findMinMaxBoundaries(void)
-{
-    int i;
-    fixed_t a, b;
-
-    min_x = min_y = INT_MAX;
-    max_x = max_y = -INT_MAX;
-    for (i = 0; i < numvertexes; i++)
-    {
-        if (vertexes[i].x < min_x)
-            min_x = vertexes[i].x;
-        else if (vertexes[i].x > max_x)
-            max_x = vertexes[i].x;
-        if (vertexes[i].y < min_y)
-            min_y = vertexes[i].y;
-        else if (vertexes[i].y > max_y)
-            max_y = vertexes[i].y;
-    }
-    max_w = max_x - min_x;
-    max_h = max_y - min_y;
-    min_w = 2 * PLAYERRADIUS;
-    min_h = 2 * PLAYERRADIUS;
-
-    a = FixedDiv(f_w << FRACBITS, max_w);
-    b = FixedDiv(f_h << FRACBITS, max_h);
-    min_scale_mtof = a < b ? a : b;
-
-    max_scale_mtof = FixedDiv(f_h << FRACBITS, 2 * PLAYERRADIUS);
-
-}
-
-void AM_changeWindowLoc(void)
-{
-    if (m_paninc.x || m_paninc.y)
-    {
-        followplayer = 0;
-        f_oldloc.x = INT_MAX;
-    }
-
-    m_x += m_paninc.x;
-    m_y += m_paninc.y;
-
-    if (m_x + m_w / 2 > max_x)
-    {
-        m_x = max_x - m_w / 2;
-        m_paninc.x = 0;
-    }
-    else if (m_x + m_w / 2 < min_x)
-    {
-        m_x = min_x - m_w / 2;
-        m_paninc.x = 0;
-    }
-    if (m_y + m_h / 2 > max_y)
-    {
-        m_y = max_y - m_h / 2;
-        m_paninc.y = 0;
-    }
-    else if (m_y + m_h / 2 < min_y)
-    {
-        m_y = min_y - m_h / 2;
-        m_paninc.y = 0;
-    }
-
-    // The following code was commented out in the released Heretic source,
-    // but I believe we need to do this here to stop the background moving
-    // when we reach the map boundaries. (In the released source it's done
-    // in AM_clearFB).
-    mapxstart += MTOF(m_paninc.x+FRACUNIT/2);
-    mapystart -= MTOF(m_paninc.y+FRACUNIT/2);
-    if(mapxstart >= finit_width)
-        mapxstart -= finit_width;
-    if(mapxstart < 0)
-        mapxstart += finit_width;
-    if(mapystart >= finit_height)
-        mapystart -= finit_height;
-    if(mapystart < 0)
-        mapystart += finit_height;
-    // - end of code that was commented-out
-
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-}
-
-void AM_initVariables(void)
-{
-    int pnum;
-    thinker_t *think;
-    mobj_t *mo;
-
-    //static event_t st_notify = { ev_keyup, AM_MSGENTERED };
-
-    automapactive = true;
-    fb = I_VideoBuffer;
-
-    f_oldloc.x = INT_MAX;
-    amclock = 0;
-    lightlev = 0;
-
-    m_paninc.x = m_paninc.y = 0;
-    ftom_zoommul = FRACUNIT;
-    mtof_zoommul = FRACUNIT;
-
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-
-    // find player to center on initially
-    if (!playeringame[pnum = consoleplayer])
-        for (pnum = 0; pnum < MAXPLAYERS; pnum++)
-            if (playeringame[pnum])
-                break;
-    plr = &players[pnum];
-    oldplr.x = plr->mo->x;
-    oldplr.y = plr->mo->y;
-    m_x = plr->mo->x - m_w / 2;
-    m_y = plr->mo->y - m_h / 2;
-    AM_changeWindowLoc();
-
-    // for saving & restoring
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
-
-    // load in the location of keys, if in baby mode
-
-    memset(KeyPoints, 0, sizeof(vertex_t) * 3);
-    if (gameskill == sk_baby)
-    {
-        for (think = thinkercap.next; think != &thinkercap;
-             think = think->next)
-        {
-            if (think->function != P_MobjThinker)
-            {                   //not a mobj
-                continue;
-            }
-            mo = (mobj_t *) think;
-            if (mo->type == MT_CKEY)
-            {
-                KeyPoints[0].x = mo->x;
-                KeyPoints[0].y = mo->y;
-            }
-            else if (mo->type == MT_AKYY)
-            {
-                KeyPoints[1].x = mo->x;
-                KeyPoints[1].y = mo->y;
-            }
-            else if (mo->type == MT_BKYY)
-            {
-                KeyPoints[2].x = mo->x;
-                KeyPoints[2].y = mo->y;
-            }
-        }
-    }
-
-    // inform the status bar of the change
-//c  ST_Responder(&st_notify);
-}
-
-void AM_loadPics(void)
-{
-    //int i;
-    //char namebuf[9];
-/*  for (i=0;i<10;i++)
-  {
-    M_snprintf(namebuf, sizeof(namebuf), "AMMNUM%d", i);
-    marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
-  }*/
-    maplump = W_CacheLumpName(DEH_String("AUTOPAGE"), PU_STATIC);
-}
-
-/*void AM_unloadPics(void)
-{
-  int i;
-  for (i=0;i<10;i++) Z_ChangeTag(marknums[i], PU_CACHE);
-
-}*/
-
-/*
-void AM_clearMarks(void)
-{
-  int i;
-  for (i=0;i<AM_NUMMARKPOINTS;i++) markpoints[i].x = -1; // means empty
-  markpointnum = 0;
-}
-*/
-
-// should be called at the start of every level
-// right now, i figure it out myself
-
-void AM_LevelInit(void)
-{
-    f_x = f_y = 0;
-    f_w = finit_width;
-    f_h = finit_height;
-    mapxstart = mapystart = 0;
-
-
-//  AM_clearMarks();
-
-    AM_findMinMaxBoundaries();
-    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7 * FRACUNIT));
-    if (scale_mtof > max_scale_mtof)
-        scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-static boolean stopped = true;
-
-void AM_Stop(void)
-{
-    //static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
-
-//  AM_unloadPics();
-    automapactive = false;
-//  ST_Responder(&st_notify);
-    stopped = true;
-    BorderNeedRefresh = true;
-}
-
-void AM_Start(void)
-{
-    static int lastlevel = -1, lastepisode = -1;
-
-    if (!stopped)
-        AM_Stop();
-    stopped = false;
-    if (gamestate != GS_LEVEL)
-    {
-        return;                 // don't show automap if we aren't in a game!
-    }
-    if (lastlevel != gamemap || lastepisode != gameepisode)
-    {
-        AM_LevelInit();
-        lastlevel = gamemap;
-        lastepisode = gameepisode;
-    }
-    AM_initVariables();
-    AM_loadPics();
-}
-
-// set the window scale to the maximum size
-
-void AM_minOutWindowScale(void)
-{
-    scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-// set the window scale to the minimum size
-
-void AM_maxOutWindowScale(void)
-{
-    scale_mtof = max_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-boolean AM_Responder(event_t * ev)
-{
-    int rc;
-    int key;
-    static int bigstate = 0;
-    static int joywait = 0;
-
-    key = ev->data1;
-    rc = false;
-
-    if (ev->type == ev_joystick && joybautomap >= 0
-        && (ev->data1 & (1 << joybautomap)) != 0 && joywait < I_GetTime())
-    {
-        joywait = I_GetTime() + 5;
-
-        if (!automapactive)
-        {
-            AM_Start ();
-            viewactive = false;
-        }
-        else
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop ();
-        }
-    }
-
-    if (!automapactive)
-    {
-
-        if (ev->type == ev_keydown && key == key_map_toggle
-         && gamestate == GS_LEVEL)
-        {
-            AM_Start();
-            viewactive = false;
-            // viewactive = true;
-            rc = true;
-        }
-    }
-    else if (ev->type == ev_keydown)
-    {
-        rc = true;
-
-        if (key == key_map_east)                 // pan right
-        {
-            if (!followplayer)
-                m_paninc.x = FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_west)            // pan left
-        {
-            if (!followplayer)
-                m_paninc.x = -FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_north)           // pan up
-        {
-            if (!followplayer)
-                m_paninc.y = FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_south)           // pan down
-        {
-            if (!followplayer)
-                m_paninc.y = -FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_zoomout)         // zoom out
-        {
-            mtof_zoommul = M_ZOOMOUT;
-            ftom_zoommul = M_ZOOMIN;
-        }
-        else if (key == key_map_zoomin)          // zoom in
-        {
-            mtof_zoommul = M_ZOOMIN;
-            ftom_zoommul = M_ZOOMOUT;
-        }
-        else if (key == key_map_toggle)          // toggle map (tab)
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop();
-        }
-        else if (key == key_map_maxzoom)
-        {
-            bigstate = !bigstate;
-            if (bigstate)
-            {
-                AM_saveScaleAndLoc();
-                AM_minOutWindowScale();
-            }
-            else
-                AM_restoreScaleAndLoc();
-        }
-        else if (key == key_map_follow)
-        {
-            followplayer = !followplayer;
-            f_oldloc.x = INT_MAX;
-            P_SetMessage(plr,
-                         followplayer ? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF,
-                         true);
-        }
-        /*
-        else if (key == key_map_grid)
-        {
-            grid = !grid;
-            plr->message = grid ? AMSTR_GRIDON : AMSTR_GRIDOFF;
-        }
-        else if (key == key_map_mark)
-        {
-            M_snprintf(buffer, sizeof(buffer), "%s %d",
-                       AMSTR_MARKEDSPOT, markpointnum);
-            plr->message = buffer;
-            AM_addMark();
-        }
-        else if (key == key_map_clearmark)
-        {
-            AM_clearMarks();
-            plr->message = AMSTR_MARKSCLEARED;
-        }
-        */
-        else
-        {
-            rc = false;
-        }
-
-        if (cheat_amap[cheatcount] == ev->data1 && !netgame)
-            cheatcount++;
-        else
-            cheatcount = 0;
-        if (cheatcount == 6)
-        {
-            cheatcount = 0;
-            rc = false;
-            cheating = (cheating + 1) % 3;
-        }
-    }
-
-    else if (ev->type == ev_keyup)
-    {
-        rc = false;
-
-        if (key == key_map_east)
-        {
-            if (!followplayer)
-                m_paninc.x = 0;
-        }
-        else if (key == key_map_west)
-        {
-            if (!followplayer)
-                m_paninc.x = 0;
-        }
-        else if (key == key_map_north)
-        {
-            if (!followplayer)
-                m_paninc.y = 0;
-        }
-        else if (key == key_map_south)
-        {
-            if (!followplayer)
-                m_paninc.y = 0;
-        }
-        else if (key == key_map_zoomout || key == key_map_zoomin)
-        {
-            mtof_zoommul = FRACUNIT;
-            ftom_zoommul = FRACUNIT;
-        }
-    }
-
-    return rc;
-
-}
-
-void AM_changeWindowScale(void)
-{
-
-    // Change the scaling multipliers
-    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-
-    if (scale_mtof < min_scale_mtof)
-        AM_minOutWindowScale();
-    else if (scale_mtof > max_scale_mtof)
-        AM_maxOutWindowScale();
-    else
-        AM_activateNewScale();
-}
-
-void AM_doFollowPlayer(void)
-{
-    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
-    {
-//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
-//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
-//  m_x = plr->mo->x - m_w/2;
-//  m_y = plr->mo->y - m_h/2;
-        m_x = FTOM(MTOF(plr->mo->x)) - m_w / 2;
-        m_y = FTOM(MTOF(plr->mo->y)) - m_h / 2;
-        m_x2 = m_x + m_w;
-        m_y2 = m_y + m_h;
-
-        // do the parallax parchment scrolling.
-/*
-	 dmapx = (MTOF(plr->mo->x)-MTOF(f_oldloc.x)); //fixed point
-	 dmapy = (MTOF(f_oldloc.y)-MTOF(plr->mo->y));
-
-	 if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
-		dmapx=0;  //goes into the automap.
-	 mapxstart += dmapx;
-	 mapystart += dmapy;
-
-  	 while(mapxstart >= finit_width)
-			mapxstart -= finit_width;
-    while(mapxstart < 0)
-			mapxstart += finit_width;
-    while(mapystart >= finit_height)
-			mapystart -= finit_height;
-    while(mapystart < 0)
-			mapystart += finit_height;
-*/
-        f_oldloc.x = plr->mo->x;
-        f_oldloc.y = plr->mo->y;
-    }
-}
-
-// Ripped out for Heretic
-/*
-void AM_updateLightLev(void)
-{
-  static nexttic = 0;
-//static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
-  static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
-  static int litelevelscnt = 0;
-
-  // Change light level
-  if (amclock>nexttic)
-  {
-    lightlev = litelevels[litelevelscnt++];
-    if (litelevelscnt == sizeof(litelevels)/sizeof(int)) litelevelscnt = 0;
-    nexttic = amclock + 6 - (amclock % 6);
-  }
-}
-*/
-
-void AM_Ticker(void)
-{
-
-    if (!automapactive)
-        return;
-
-    amclock++;
-
-    if (followplayer)
-        AM_doFollowPlayer();
-
-    // Change the zoom if necessary
-    if (ftom_zoommul != FRACUNIT)
-        AM_changeWindowScale();
-
-    // Change x,y location
-    if (m_paninc.x || m_paninc.y)
-        AM_changeWindowLoc();
-    // Update light level
-// AM_updateLightLev();
-
-}
-
-void AM_clearFB(int color)
-{
-    int i, j;
-    int dmapx;
-    int dmapy;
-
-    if (followplayer)
-    {
-        dmapx = (MTOF(plr->mo->x) - MTOF(oldplr.x));    //fixed point
-        dmapy = (MTOF(oldplr.y) - MTOF(plr->mo->y));
-
-        oldplr.x = plr->mo->x;
-        oldplr.y = plr->mo->y;
-//              if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
-//                      dmapx=0;  //goes into the automap.
-        mapxstart += dmapx >> 1;
-        mapystart += dmapy >> 1;
-
-        while (mapxstart >= finit_width)
-            mapxstart -= finit_width;
-        while (mapxstart < 0)
-            mapxstart += finit_width;
-        while (mapystart >= finit_height)
-            mapystart -= finit_height;
-        while (mapystart < 0)
-            mapystart += finit_height;
-    }
-    else
-    {
-        // The released Heretic source does this here, but this causes a bug
-        // where the map background keeps moving when we reach the map
-        // boundaries. This is instead done in AM_changeWindowLoc.
-        /*
-        mapxstart += (MTOF(m_paninc.x) >> 1);
-        mapystart -= (MTOF(m_paninc.y) >> 1);
-
-        if (mapxstart >= finit_width)
-            mapxstart -= finit_width;
-        if (mapxstart < 0)
-            mapxstart += finit_width;
-        if (mapystart >= finit_height)
-            mapystart -= finit_height;
-        if (mapystart < 0)
-            mapystart += finit_height;
-        */
-    }
-
-    //blit the automap background to the screen.
-    j = mapystart * finit_width;
-    for (i = 0; i < finit_height; i++)
-    {
-        memcpy(I_VideoBuffer + i * finit_width, maplump + j + mapxstart,
-               finit_width - mapxstart);
-        memcpy(I_VideoBuffer + i * finit_width + finit_width - mapxstart,
-               maplump + j, mapxstart);
-        j += finit_width;
-        if (j >= finit_height * finit_width)
-            j = 0;
-    }
-
-//       memcpy(I_VideoBuffer, maplump, finit_width*finit_height);
-//  memset(fb, color, f_w*f_h);
-}
-
-// Based on Cohen-Sutherland clipping algorithm but with a slightly
-// faster reject and precalculated slopes.  If I need the speed, will
-// hash algorithm to the common cases.
-
-boolean AM_clipMline(mline_t * ml, fline_t * fl)
-{
-    enum
-    { LEFT = 1, RIGHT = 2, BOTTOM = 4, TOP = 8 };
-    int outcode1 = 0, outcode2 = 0, outside;
-    fpoint_t tmp = { 0, 0 };
-    int dx, dy;
-
-#define DOOUTCODE(oc, mx, my) \
-  (oc) = 0; \
-  if ((my) < 0) (oc) |= TOP; \
-  else if ((my) >= f_h) (oc) |= BOTTOM; \
-  if ((mx) < 0) (oc) |= LEFT; \
-  else if ((mx) >= f_w) (oc) |= RIGHT
-
-    // do trivial rejects and outcodes
-    if (ml->a.y > m_y2)
-        outcode1 = TOP;
-    else if (ml->a.y < m_y)
-        outcode1 = BOTTOM;
-    if (ml->b.y > m_y2)
-        outcode2 = TOP;
-    else if (ml->b.y < m_y)
-        outcode2 = BOTTOM;
-    if (outcode1 & outcode2)
-        return false;           // trivially outside
-
-    if (ml->a.x < m_x)
-        outcode1 |= LEFT;
-    else if (ml->a.x > m_x2)
-        outcode1 |= RIGHT;
-    if (ml->b.x < m_x)
-        outcode2 |= LEFT;
-    else if (ml->b.x > m_x2)
-        outcode2 |= RIGHT;
-    if (outcode1 & outcode2)
-        return false;           // trivially outside
-
-    // transform to frame-buffer coordinates.
-    fl->a.x = CXMTOF(ml->a.x);
-    fl->a.y = CYMTOF(ml->a.y);
-    fl->b.x = CXMTOF(ml->b.x);
-    fl->b.y = CYMTOF(ml->b.y);
-    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-    if (outcode1 & outcode2)
-        return false;
-
-    while (outcode1 | outcode2)
-    {
-        // may be partially inside box
-        // find an outside point
-        if (outcode1)
-            outside = outcode1;
-        else
-            outside = outcode2;
-        // clip to each side
-        if (outside & TOP)
-        {
-            dy = fl->a.y - fl->b.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.x = fl->a.x + (dx * (fl->a.y)) / dy;
-            tmp.y = 0;
-        }
-        else if (outside & BOTTOM)
-        {
-            dy = fl->a.y - fl->b.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.x = fl->a.x + (dx * (fl->a.y - f_h)) / dy;
-            tmp.y = f_h - 1;
-        }
-        else if (outside & RIGHT)
-        {
-            dy = fl->b.y - fl->a.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.y = fl->a.y + (dy * (f_w - 1 - fl->a.x)) / dx;
-            tmp.x = f_w - 1;
-        }
-        else if (outside & LEFT)
-        {
-            dy = fl->b.y - fl->a.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.y = fl->a.y + (dy * (-fl->a.x)) / dx;
-            tmp.x = 0;
-        }
-        if (outside == outcode1)
-        {
-            fl->a = tmp;
-            DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-        }
-        else
-        {
-            fl->b = tmp;
-            DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-        }
-        if (outcode1 & outcode2)
-            return false;       // trivially outside
-    }
-
-    return true;
-}
-
-#undef DOOUTCODE
-
-// Classic Bresenham w/ whatever optimizations I need for speed
-
-void AM_drawFline(fline_t * fl, int color)
-{
-
-    register int x, y, dx, dy, sx, sy, ax, ay, d;
-    static int fuck = 0;
-
-    switch (color)
-    {
-        case WALLCOLORS:
-            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y, &antialias[0][0],
-                       8, 3);
-            break;
-        case FDWALLCOLORS:
-            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y, &antialias[1][0],
-                       8, 3);
-            break;
-        case CDWALLCOLORS:
-            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y, &antialias[2][0],
-                       8, 3);
-            break;
-        default:
-            {
-                // For debugging only
-                if (fl->a.x < 0 || fl->a.x >= f_w
-                    || fl->a.y < 0 || fl->a.y >= f_h
-                    || fl->b.x < 0 || fl->b.x >= f_w
-                    || fl->b.y < 0 || fl->b.y >= f_h)
-                {
-                    fprintf(stderr, "fuck %d \r", fuck++);
-                    return;
-                }
-
-#define DOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)    //the MACRO!
-
-                dx = fl->b.x - fl->a.x;
-                ax = 2 * (dx < 0 ? -dx : dx);
-                sx = dx < 0 ? -1 : 1;
-
-                dy = fl->b.y - fl->a.y;
-                ay = 2 * (dy < 0 ? -dy : dy);
-                sy = dy < 0 ? -1 : 1;
-
-                x = fl->a.x;
-                y = fl->a.y;
-
-                if (ax > ay)
-                {
-                    d = ay - ax / 2;
-                    while (1)
-                    {
-                        DOT(x, y, color);
-                        if (x == fl->b.x)
-                            return;
-                        if (d >= 0)
-                        {
-                            y += sy;
-                            d -= ax;
-                        }
-                        x += sx;
-                        d += ay;
-                    }
-                }
-                else
-                {
-                    d = ax - ay / 2;
-                    while (1)
-                    {
-                        DOT(x, y, color);
-                        if (y == fl->b.y)
-                            return;
-                        if (d >= 0)
-                        {
-                            x += sx;
-                            d -= ay;
-                        }
-                        y += sy;
-                        d += ax;
-                    }
-                }
-            }
-    }
-}
-
-/* Wu antialiased line drawer.
- * (X0,Y0),(X1,Y1) = line to draw
- * BaseColor = color # of first color in block used for antialiasing, the
- *          100% intensity version of the drawing color
- * NumLevels = size of color block, with BaseColor+NumLevels-1 being the
- *          0% intensity version of the drawing color
- * IntensityBits = log base 2 of NumLevels; the # of bits used to describe
- *          the intensity of the drawing color. 2**IntensityBits==NumLevels
- */
-void PUTDOT(short xx, short yy, byte * cc, byte * cm)
-{
-    static int oldyy;
-    static int oldyyshifted;
-    byte *oldcc = cc;
-
-    if (xx < 32)
-        cc += 7 - (xx >> 2);
-    else if (xx > (finit_width - 32))
-        cc += 7 - ((finit_width - xx) >> 2);
-//      if(cc==oldcc) //make sure that we don't double fade the corners.
-//      {
-    if (yy < 32)
-        cc += 7 - (yy >> 2);
-    else if (yy > (finit_height - 32))
-        cc += 7 - ((finit_height - yy) >> 2);
-//      }
-    if (cc > cm && cm != NULL)
-    {
-        cc = cm;
-    }
-    else if (cc > oldcc + 6)    // don't let the color escape from the fade table...
-    {
-        cc = oldcc + 6;
-    }
-    if (yy == oldyy + 1)
-    {
-        oldyy++;
-        oldyyshifted += 320;
-    }
-    else if (yy == oldyy - 1)
-    {
-        oldyy--;
-        oldyyshifted -= 320;
-    }
-    else if (yy != oldyy)
-    {
-        oldyy = yy;
-        oldyyshifted = yy * 320;
-    }
-    fb[oldyyshifted + xx] = *(cc);
-//      fb[(yy)*f_w+(xx)]=*(cc);
-}
-
-void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
-                int NumLevels, unsigned short IntensityBits)
-{
-    unsigned short IntensityShift, ErrorAdj, ErrorAcc;
-    unsigned short ErrorAccTemp, Weighting, WeightingComplementMask;
-    short DeltaX, DeltaY, Temp, XDir;
-
-    /* Make sure the line runs top to bottom */
-    if (Y0 > Y1)
-    {
-        Temp = Y0;
-        Y0 = Y1;
-        Y1 = Temp;
-        Temp = X0;
-        X0 = X1;
-        X1 = Temp;
-    }
-    /* Draw the initial pixel, which is always exactly intersected by
-       the line and so needs no weighting */
-    PUTDOT(X0, Y0, &BaseColor[0], NULL);
-
-    if ((DeltaX = X1 - X0) >= 0)
-    {
-        XDir = 1;
-    }
-    else
-    {
-        XDir = -1;
-        DeltaX = -DeltaX;       /* make DeltaX positive */
-    }
-    /* Special-case horizontal, vertical, and diagonal lines, which
-       require no weighting because they go right through the center of
-       every pixel */
-    if ((DeltaY = Y1 - Y0) == 0)
-    {
-        /* Horizontal line */
-        while (DeltaX-- != 0)
-        {
-            X0 += XDir;
-            PUTDOT(X0, Y0, &BaseColor[0], NULL);
-        }
-        return;
-    }
-    if (DeltaX == 0)
-    {
-        /* Vertical line */
-        do
-        {
-            Y0++;
-            PUTDOT(X0, Y0, &BaseColor[0], NULL);
-        }
-        while (--DeltaY != 0);
-        return;
-    }
-    //diagonal line.
-    if (DeltaX == DeltaY)
-    {
-        do
-        {
-            X0 += XDir;
-            Y0++;
-            PUTDOT(X0, Y0, &BaseColor[0], NULL);
-        }
-        while (--DeltaY != 0);
-        return;
-    }
-    /* Line is not horizontal, diagonal, or vertical */
-    ErrorAcc = 0;               /* initialize the line error accumulator to 0 */
-    /* # of bits by which to shift ErrorAcc to get intensity level */
-    IntensityShift = 16 - IntensityBits;
-    /* Mask used to flip all bits in an intensity weighting, producing the
-       result (1 - intensity weighting) */
-    WeightingComplementMask = NumLevels - 1;
-    /* Is this an X-major or Y-major line? */
-    if (DeltaY > DeltaX)
-    {
-        /* Y-major line; calculate 16-bit fixed-point fractional part of a
-           pixel that X advances each time Y advances 1 pixel, truncating the
-           result so that we won't overrun the endpoint along the X axis */
-        ErrorAdj = ((unsigned int) DeltaX << 16) / (unsigned int) DeltaY;
-        /* Draw all pixels other than the first and last */
-        while (--DeltaY)
-        {
-            ErrorAccTemp = ErrorAcc;    /* remember currrent accumulated error */
-            ErrorAcc += ErrorAdj;       /* calculate error for next pixel */
-            if (ErrorAcc <= ErrorAccTemp)
-            {
-                /* The error accumulator turned over, so advance the X coord */
-                X0 += XDir;
-            }
-            Y0++;               /* Y-major, so always advance Y */
-            /* The IntensityBits most significant bits of ErrorAcc give us the
-               intensity weighting for this pixel, and the complement of the
-               weighting for the paired pixel */
-            Weighting = ErrorAcc >> IntensityShift;
-            PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
-            PUTDOT(X0 + XDir, Y0,
-                   &BaseColor[(Weighting ^ WeightingComplementMask)],
-                   &BaseColor[7]);
-        }
-        /* Draw the final pixel, which is always exactly intersected by the line
-           and so needs no weighting */
-        PUTDOT(X1, Y1, &BaseColor[0], NULL);
-        return;
-    }
-    /* It's an X-major line; calculate 16-bit fixed-point fractional part of a
-       pixel that Y advances each time X advances 1 pixel, truncating the
-       result to avoid overrunning the endpoint along the X axis */
-    ErrorAdj = ((unsigned int) DeltaY << 16) / (unsigned int) DeltaX;
-    /* Draw all pixels other than the first and last */
-    while (--DeltaX)
-    {
-        ErrorAccTemp = ErrorAcc;        /* remember currrent accumulated error */
-        ErrorAcc += ErrorAdj;   /* calculate error for next pixel */
-        if (ErrorAcc <= ErrorAccTemp)
-        {
-            /* The error accumulator turned over, so advance the Y coord */
-            Y0++;
-        }
-        X0 += XDir;             /* X-major, so always advance X */
-        /* The IntensityBits most significant bits of ErrorAcc give us the
-           intensity weighting for this pixel, and the complement of the
-           weighting for the paired pixel */
-        Weighting = ErrorAcc >> IntensityShift;
-        PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
-        PUTDOT(X0, Y0 + 1,
-               &BaseColor[(Weighting ^ WeightingComplementMask)],
-               &BaseColor[7]);
-
-    }
-    /* Draw the final pixel, which is always exactly intersected by the line
-       and so needs no weighting */
-    PUTDOT(X1, Y1, &BaseColor[0], NULL);
-}
-
-void AM_drawMline(mline_t * ml, int color)
-{
-    static fline_t fl;
-
-    if (AM_clipMline(ml, &fl))
-        AM_drawFline(&fl, color);       // draws it on frame buffer using fb coords
-
-}
-
-void AM_drawGrid(int color)
-{
-    fixed_t x, y;
-    fixed_t start, end;
-    mline_t ml;
-
-    // Figure out start of vertical gridlines
-    start = m_x;
-    if ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS))
-        start += (MAPBLOCKUNITS << FRACBITS)
-            - ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS));
-    end = m_x + m_w;
-
-    // draw vertical gridlines
-    ml.a.y = m_y;
-    ml.b.y = m_y + m_h;
-    for (x = start; x < end; x += (MAPBLOCKUNITS << FRACBITS))
-    {
-        ml.a.x = x;
-        ml.b.x = x;
-        AM_drawMline(&ml, color);
-    }
-
-    // Figure out start of horizontal gridlines
-    start = m_y;
-    if ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS))
-        start += (MAPBLOCKUNITS << FRACBITS)
-            - ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS));
-    end = m_y + m_h;
-
-    // draw horizontal gridlines
-    ml.a.x = m_x;
-    ml.b.x = m_x + m_w;
-    for (y = start; y < end; y += (MAPBLOCKUNITS << FRACBITS))
-    {
-        ml.a.y = y;
-        ml.b.y = y;
-        AM_drawMline(&ml, color);
-    }
-}
-
-void AM_drawWalls(void)
-{
-    int i;
-    static mline_t l;
-
-    for (i = 0; i < numlines; i++)
-    {
-        l.a.x = lines[i].v1->x;
-        l.a.y = lines[i].v1->y;
-        l.b.x = lines[i].v2->x;
-        l.b.y = lines[i].v2->y;
-        if (cheating || (lines[i].flags & ML_MAPPED))
-        {
-            if ((lines[i].flags & LINE_NEVERSEE) && !cheating)
-                continue;
-            if (!lines[i].backsector)
-            {
-                AM_drawMline(&l, WALLCOLORS + lightlev);
-            }
-            else
-            {
-                if (lines[i].special == 39)
-                {               // teleporters
-                    AM_drawMline(&l, WALLCOLORS + WALLRANGE / 2);
-                }
-                else if (lines[i].flags & ML_SECRET)    // secret door
-                {
-                    if (cheating)
-                        AM_drawMline(&l, 0);
-                    else
-                        AM_drawMline(&l, WALLCOLORS + lightlev);
-                }
-                else if (lines[i].special > 25 && lines[i].special < 35)
-                {
-                    switch (lines[i].special)
-                    {
-                        case 26:
-                        case 32:
-                            AM_drawMline(&l, BLUEKEY);
-                            break;
-                        case 27:
-                        case 34:
-                            AM_drawMline(&l, YELLOWKEY);
-                            break;
-                        case 28:
-                        case 33:
-                            AM_drawMline(&l, GREENKEY);
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                else if (lines[i].backsector->floorheight
-                         != lines[i].frontsector->floorheight)
-                {
-                    AM_drawMline(&l, FDWALLCOLORS + lightlev);  // floor level change
-                }
-                else if (lines[i].backsector->ceilingheight
-                         != lines[i].frontsector->ceilingheight)
-                {
-                    AM_drawMline(&l, CDWALLCOLORS + lightlev);  // ceiling level change
-                }
-                else if (cheating)
-                {
-                    AM_drawMline(&l, TSWALLCOLORS + lightlev);
-                }
-            }
-        }
-        else if (plr->powers[pw_allmap])
-        {
-            if (!(lines[i].flags & LINE_NEVERSEE))
-                AM_drawMline(&l, GRAYS + 3);
-        }
-    }
-
-}
-
-void AM_rotate(fixed_t * x, fixed_t * y, angle_t a)
-{
-    fixed_t tmpx;
-
-    tmpx = FixedMul(*x, finecosine[a >> ANGLETOFINESHIFT])
-        - FixedMul(*y, finesine[a >> ANGLETOFINESHIFT]);
-    *y = FixedMul(*x, finesine[a >> ANGLETOFINESHIFT])
-        + FixedMul(*y, finecosine[a >> ANGLETOFINESHIFT]);
-    *x = tmpx;
-}
-
-void AM_drawLineCharacter(mline_t * lineguy, int lineguylines, fixed_t scale,
-                          angle_t angle, int color, fixed_t x, fixed_t y)
-{
-    int i;
-    mline_t l;
-
-    for (i = 0; i < lineguylines; i++)
-    {
-        l.a.x = lineguy[i].a.x;
-        l.a.y = lineguy[i].a.y;
-        if (scale)
-        {
-            l.a.x = FixedMul(scale, l.a.x);
-            l.a.y = FixedMul(scale, l.a.y);
-        }
-        if (angle)
-            AM_rotate(&l.a.x, &l.a.y, angle);
-        l.a.x += x;
-        l.a.y += y;
-
-        l.b.x = lineguy[i].b.x;
-        l.b.y = lineguy[i].b.y;
-        if (scale)
-        {
-            l.b.x = FixedMul(scale, l.b.x);
-            l.b.y = FixedMul(scale, l.b.y);
-        }
-        if (angle)
-            AM_rotate(&l.b.x, &l.b.y, angle);
-        l.b.x += x;
-        l.b.y += y;
-
-        AM_drawMline(&l, color);
-    }
-
-}
-
-void AM_drawPlayers(void)
-{
-
-    int i;
-    player_t *p;
-    static int their_colors[] = { GREENKEY, YELLOWKEY, BLOODRED, BLUEKEY };
-    int their_color = -1;
-    int color;
-
-    if (!netgame)
-    {
-        /*
-           if (cheating) AM_drawLineCharacter(cheat_player_arrow, NUMCHEATPLYRLINES, 0,
-           plr->mo->angle, WHITE, plr->mo->x, plr->mo->y);
-         *///cheat key player pointer is the same as non-cheat pointer..
-
-        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, plr->mo->angle,
-                             WHITE, plr->mo->x, plr->mo->y);
-        return;
-    }
-
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        their_color++;
-        p = &players[i];
-        if (deathmatch && !singledemo && p != plr)
-        {
-            continue;
-        }
-        if (!playeringame[i])
-            continue;
-        if (p->powers[pw_invisibility])
-            color = 102;        // *close* to the automap color
-        else
-            color = their_colors[their_color];
-        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, p->mo->angle,
-                             color, p->mo->x, p->mo->y);
-    }
-}
-
-void AM_drawThings(int colors, int colorrange)
-{
-    int i;
-    mobj_t *t;
-
-    for (i = 0; i < numsectors; i++)
-    {
-        t = sectors[i].thinglist;
-        while (t)
-        {
-            AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES,
-                                 16 << FRACBITS, t->angle, colors + lightlev,
-                                 t->x, t->y);
-            t = t->snext;
-        }
-    }
-}
-
-/*
-void AM_drawMarks(void)
-{
-  int i, fx, fy, w, h;
-
-  for (i=0;i<AM_NUMMARKPOINTS;i++)
-  {
-    if (markpoints[i].x != -1)
-    {
-      w = SHORT(marknums[i]->width);
-      h = SHORT(marknums[i]->height);
-      fx = CXMTOF(markpoints[i].x);
-      fy = CYMTOF(markpoints[i].y);
-      if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
-  			V_DrawPatch(fx, fy, marknums[i]);
-    }
-  }
-}
-*/
-
-void AM_drawkeys(void)
-{
-    if (KeyPoints[0].x != 0 || KeyPoints[0].y != 0)
-    {
-        AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, YELLOWKEY,
-                             KeyPoints[0].x, KeyPoints[0].y);
-    }
-    if (KeyPoints[1].x != 0 || KeyPoints[1].y != 0)
-    {
-        AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, GREENKEY,
-                             KeyPoints[1].x, KeyPoints[1].y);
-    }
-    if (KeyPoints[2].x != 0 || KeyPoints[2].y != 0)
-    {
-        AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, BLUEKEY,
-                             KeyPoints[2].x, KeyPoints[2].y);
-    }
-}
-
-void AM_drawCrosshair(int color)
-{
-    fb[(f_w * (f_h + 1)) / 2] = color;  // single point for now
-}
-
-void AM_Drawer(void)
-{
-    const char *level_name;
-    int numepisodes;
-
-    if (!automapactive)
-        return;
-
-    UpdateState |= I_FULLSCRN;
-    AM_clearFB(BACKGROUND);
-    if (grid)
-        AM_drawGrid(GRIDCOLORS);
-    AM_drawWalls();
-    AM_drawPlayers();
-    if (cheating == 2)
-        AM_drawThings(THINGCOLORS, THINGRANGE);
-//  AM_drawCrosshair(XHAIRCOLORS);
-
-//  AM_drawMarks();
-    if (gameskill == sk_baby)
-    {
-        AM_drawkeys();
-    }
-
-    if (gamemode == retail)
-    {
-        numepisodes = 5;
-    }
-    else
-    {
-        numepisodes = 3;
-    }
-
-    if (gameepisode <= numepisodes && gamemap < 10)
-    {
-        level_name = LevelNames[(gameepisode - 1) * 9 + gamemap - 1];
-        MN_DrTextA(DEH_String(level_name), 20, 145);
-    }
-//  I_Update();
-//  V_MarkRect(f_x, f_y, f_w, f_h);
-}
diff --git a/games/NXDoom/src/heretic/am_map.h b/games/NXDoom/src/heretic/am_map.h
deleted file mode 100644
index aa535cc30..000000000
--- a/games/NXDoom/src/heretic/am_map.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-#ifndef __AMMAP_H__
-#define __AMMAP_H__
-
-
-#include "r_local.h"
-
-
-// For use if I do walls with outsides/insides
-#define REDS		12*8
-#define REDRANGE	1       //16
-#define BLUES		(256-4*16+8)
-#define BLUERANGE	1       //8
-#define GREENS		(33*8)
-#define GREENRANGE	1       //16
-#define GRAYS		(5*8)
-#define GRAYSRANGE	1       //16
-#define BROWNS		(14*8)
-#define BROWNRANGE	1       //16
-#define YELLOWS		10*8
-#define YELLOWRANGE	1
-#define BLACK		0
-#define WHITE		4*8
-#define PARCH		13*8-1
-#define BLOODRED  150
-#define BLUEKEY 	197
-#define YELLOWKEY 144
-#define GREENKEY  220
-
-// Automap colors
-#define BACKGROUND	PARCH
-#define YOURCOLORS	WHITE
-#define YOURRANGE	0
-#define WALLCOLORS	REDS
-#define WALLRANGE	REDRANGE
-#define TSWALLCOLORS	GRAYS
-#define TSWALLRANGE	GRAYSRANGE
-#define FDWALLCOLORS	BROWNS
-#define FDWALLRANGE	BROWNRANGE
-#define CDWALLCOLORS	YELLOWS
-#define CDWALLRANGE	YELLOWRANGE
-#define THINGCOLORS	GREENS
-#define THINGRANGE	GREENRANGE
-#define SECRETWALLCOLORS WALLCOLORS
-#define SECRETWALLRANGE WALLRANGE
-#define GRIDCOLORS	(GRAYS + GRAYSRANGE/2)
-#define GRIDRANGE	0
-#define XHAIRCOLORS	GRAYS
-
-// drawing stuff
-#define	FB		0
-
-#define AM_NUMMARKPOINTS 10
-
-#define AM_MSGHEADER (('a'<<24)+('m'<<16))
-#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
-#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
-
-#define INITSCALEMTOF (.2*FRACUNIT)     // scale on entry
-// how much the automap moves window per tic in frame-buffer coordinates
-#define F_PANINC	4       // moves 140 pixels in 1 second
-// how much zoom-in per tic
-#define M_ZOOMIN        ((int) (1.02*FRACUNIT)) // goes to 2x in 1 second
-// how much zoom-out per tic
-#define M_ZOOMOUT       ((int) (FRACUNIT/1.02)) // pulls out to 0.5x in 1 second
-
-// translates between frame-buffer and map distances
-#define FTOM(x) FixedMul(((x)<<16),scale_ftom)
-#define MTOF(x) (FixedMul((x),scale_mtof)>>16)
-// translates between frame-buffer and map coordinates
-#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
-#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
-
-// the following is crap
-#define LINE_NEVERSEE ML_DONTDRAW
-
-typedef struct
-{
-    int x, y;
-} fpoint_t;
-
-typedef struct
-{
-    fpoint_t a, b;
-} fline_t;
-
-typedef vertex_t mpoint_t;
-
-typedef struct
-{
-    mpoint_t a, b;
-} mline_t;
-
-typedef struct
-{
-    fixed_t slp, islp;
-} islope_t;
-
-// extern int f_x, f_y, f_w, f_h;
-
-
-extern boolean automapactive;
-extern vertex_t KeyPoints[];
-extern const char *LevelNames[];
-
-
-void AM_Stop(void);
-
-
-#endif
diff --git a/games/NXDoom/src/heretic/ct_chat.c b/games/NXDoom/src/heretic/ct_chat.c
deleted file mode 100644
index f0f8e5ff6..000000000
--- a/games/NXDoom/src/heretic/ct_chat.c
+++ /dev/null
@@ -1,477 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Chat mode
-//
-
-#include <string.h>
-#include <ctype.h>
-
-#include "doomdef.h"
-#include "doomkeys.h"
-
-#include "deh_str.h"
-#include "i_input.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-#define QUEUESIZE		128
-#define MESSAGESIZE	128
-#define MESSAGELEN 	265
-
-#define CT_PLR_GREEN		1
-#define CT_PLR_YELLOW	2
-#define CT_PLR_RED		3
-#define CT_PLR_BLUE		4
-#define CT_PLR_ALL		5
-
-#define CT_ESCAPE 6
-
-// Public data
-
-
-boolean chatmodeon;
-
-// Private data
-
-void CT_queueChatChar(char ch);
-void CT_ClearChatMessage(int player);
-void CT_AddChar(int player, char c);
-void CT_BackSpace(int player);
-
-int head;
-int tail;
-byte ChatQueue[QUEUESIZE];
-int chat_dest[MAXPLAYERS];
-char chat_msg[MAXPLAYERS][MESSAGESIZE];
-char plr_lastmsg[MAXPLAYERS][MESSAGESIZE + 9];  // add in the length of the pre-string
-int msgptr[MAXPLAYERS];
-int msglen[MAXPLAYERS];
-
-boolean cheated;
-
-static int FontABaseLump;
-
-const char *CT_FromPlrText[MAXPLAYERS] = {
-    "GREEN:  ",
-    "YELLOW:  ",
-    "RED:  ",
-    "BLUE:  "
-};
-
-char *chat_macros[10];
-
-boolean altdown;
-boolean shiftdown;
-
-
-//===========================================================================
-//
-// CT_Init
-//
-//      Initialize chat mode data
-//===========================================================================
-
-void CT_Init(void)
-{
-    int i;
-
-    head = 0;                   //initialize the queue index
-    tail = 0;
-    chatmodeon = false;
-    memset(ChatQueue, 0, QUEUESIZE);
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        chat_dest[i] = 0;
-        msgptr[i] = 0;
-        memset(plr_lastmsg[i], 0, MESSAGESIZE);
-        memset(chat_msg[i], 0, MESSAGESIZE);
-    }
-    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
-    return;
-}
-
-//===========================================================================
-//
-// CT_Stop
-//
-//===========================================================================
-
-void CT_Stop(void)
-{
-    chatmodeon = false;
-    I_StopTextInput();
-    return;
-}
-
-// These keys are allowed by Vanilla Heretic:
-
-static boolean ValidChatChar(char c)
-{
-    return (c >= 'a' && c <= 'z')
-        || (c >= 'A' && c <= 'Z')
-        || (c >= '0' && c <= '9')
-        || c == '!' || c == '?'
-        || c == ' ' || c == '\''
-        || c == ',' || c == '.'
-        || c == '-' || c == '=';
-}
-
-//===========================================================================
-//
-// CT_Responder
-//
-//===========================================================================
-
-boolean CT_Responder(event_t * ev)
-{
-    char *macro;
-
-    int sendto;
-
-    if (!netgame)
-    {
-        return false;
-    }
-    if (ev->data1 == KEY_LALT || ev->data2 == KEY_RALT)
-    {
-        altdown = (ev->type == ev_keydown);
-        return false;
-    }
-    if (ev->data1 == KEY_RSHIFT)
-    {
-        shiftdown = (ev->type == ev_keydown);
-        return false;
-    }
-    if (ev->type != ev_keydown)
-    {
-        return false;
-    }
-    if (!chatmodeon)
-    {
-        sendto = 0;
-        if (ev->data1 == key_multi_msg)
-        {
-            sendto = CT_PLR_ALL;
-        }
-        else if (ev->data1 == key_multi_msgplayer[0])
-        {
-            sendto = CT_PLR_GREEN;
-        }
-        else if (ev->data1 == key_multi_msgplayer[1])
-        {
-            sendto = CT_PLR_YELLOW;
-        }
-        else if (ev->data1 == key_multi_msgplayer[2])
-        {
-            sendto = CT_PLR_RED;
-        }
-        else if (ev->data1 == key_multi_msgplayer[3])
-        {
-            sendto = CT_PLR_BLUE;
-        }
-        if (sendto == 0 || (sendto != CT_PLR_ALL && !playeringame[sendto - 1])
-            || sendto == consoleplayer + 1)
-        {
-            return false;
-        }
-        CT_queueChatChar(sendto);
-        chatmodeon = true;
-        I_StartTextInput(25, 10, SCREENWIDTH, 18);
-        return true;
-    }
-    else
-    {
-        if (altdown)
-        {
-            if (ev->data1 >= '0' && ev->data1 <= '9')
-            {
-                if (ev->data1 == '0')
-                {               // macro 0 comes after macro 9
-                    ev->data1 = '9' + 1;
-                }
-                macro = chat_macros[ev->data1 - '1'];
-                CT_queueChatChar(KEY_ENTER);    //send old message
-                CT_queueChatChar(chat_dest[consoleplayer]);     // chose the dest.
-                while (*macro)
-                {
-                    CT_queueChatChar(toupper(*macro++));
-                }
-                CT_queueChatChar(KEY_ENTER);    //send it off...
-                CT_Stop();
-                return true;
-            }
-        }
-        if (ev->data1 == KEY_ENTER)
-        {
-            CT_queueChatChar(KEY_ENTER);
-            CT_Stop();
-            return true;
-        }
-        else if (ev->data1 == KEY_ESCAPE)
-        {
-            CT_queueChatChar(CT_ESCAPE);
-            CT_Stop();
-            return true;
-        }
-        else if (ev->data1 == KEY_BACKSPACE)
-        {
-            CT_queueChatChar(KEY_BACKSPACE);
-            return true;
-        }
-        else if (ValidChatChar(ev->data3))
-        {
-            CT_queueChatChar(toupper(ev->data3));
-            return true;
-        }
-    }
-    return false;
-}
-
-//===========================================================================
-//
-// CT_Ticker
-//
-//===========================================================================
-
-void CT_Ticker(void)
-{
-    int i;
-    int j;
-    char c;
-    int numplayers;
-
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        if ((c = players[i].cmd.chatchar) != 0)
-        {
-            if (c <= 5)
-            {
-                chat_dest[i] = c;
-                continue;
-            }
-            else if (c == CT_ESCAPE)
-            {
-                CT_ClearChatMessage(i);
-            }
-            else if (c == KEY_ENTER)
-            {
-                numplayers = 0;
-                for (j = 0; j < MAXPLAYERS; j++)
-                {
-                    numplayers += playeringame[j];
-                }
-                CT_AddChar(i, 0);       // set the end of message character
-                if (numplayers > 2)
-                {
-                    M_StringCopy(plr_lastmsg[i], DEH_String(CT_FromPlrText[i]),
-                                 sizeof(plr_lastmsg[i]));
-                    M_StringConcat(plr_lastmsg[i], chat_msg[i],
-                                   sizeof(plr_lastmsg[i]));
-                }
-                else
-                {
-                    M_StringCopy(plr_lastmsg[i], chat_msg[i],
-                                 sizeof(plr_lastmsg[i]));
-                }
-                if (i != consoleplayer && (chat_dest[i] == consoleplayer + 1
-                                           || chat_dest[i] == CT_PLR_ALL)
-                    && *chat_msg[i])
-                {
-                    P_SetMessage(&players[consoleplayer], plr_lastmsg[i],
-                                 true);
-                    S_StartSound(NULL, sfx_chat);
-                }
-                else if (i == consoleplayer && (*chat_msg[i]))
-                {
-                    if (numplayers > 1)
-                    {
-                        P_SetMessage(&players[consoleplayer],
-                                     DEH_String("-MESSAGE SENT-"), true);
-                        S_StartSound(NULL, sfx_chat);
-                    }
-                    else
-                    {
-                        P_SetMessage(&players[consoleplayer],
-                                     DEH_String("THERE ARE NO OTHER PLAYERS IN THE GAME!"),
-                                     true);
-                        S_StartSound(NULL, sfx_chat);
-                    }
-                }
-                CT_ClearChatMessage(i);
-            }
-            else if (c == KEY_BACKSPACE)
-            {
-                CT_BackSpace(i);
-            }
-            else
-            {
-                CT_AddChar(i, c);
-            }
-        }
-    }
-    return;
-}
-
-//===========================================================================
-//
-// CT_Drawer
-//
-//===========================================================================
-
-void CT_Drawer(void)
-{
-    int i;
-    int x;
-    patch_t *patch;
-
-    if (chatmodeon)
-    {
-        x = 25;
-        for (i = 0; i < msgptr[consoleplayer]; i++)
-        {
-            if (chat_msg[consoleplayer][i] < 33)
-            {
-                x += 6;
-            }
-            else
-            {
-                patch = W_CacheLumpNum(FontABaseLump +
-                                       chat_msg[consoleplayer][i] - 33,
-                                       PU_CACHE);
-                V_DrawPatch(x, 10, patch);
-                x += patch->width;
-            }
-        }
-        V_DrawPatch(x, 10, W_CacheLumpName(DEH_String("FONTA59"), PU_CACHE));
-        BorderTopRefresh = true;
-        UpdateState |= I_MESSAGES;
-    }
-}
-
-//===========================================================================
-//
-// CT_queueChatChar
-//
-//===========================================================================
-
-void CT_queueChatChar(char ch)
-{
-    if (((tail + 1) & (QUEUESIZE - 1)) == head)
-    {                           // the queue is full
-        return;
-    }
-    ChatQueue[tail] = ch;
-    tail = (tail + 1) & (QUEUESIZE - 1);
-}
-
-//===========================================================================
-//
-// CT_dequeueChatChar
-//
-//===========================================================================
-
-char CT_dequeueChatChar(void)
-{
-    byte temp;
-
-    if (head == tail)
-    {                           // queue is empty
-        return 0;
-    }
-    temp = ChatQueue[head];
-    head = (head + 1) & (QUEUESIZE - 1);
-    return temp;
-}
-
-//===========================================================================
-//
-// CT_AddChar
-//
-//===========================================================================
-
-void CT_AddChar(int player, char c)
-{
-    patch_t *patch;
-
-    if (msgptr[player] + 1 >= MESSAGESIZE || msglen[player] >= MESSAGELEN)
-    {                           // full.
-        return;
-    }
-    chat_msg[player][msgptr[player]] = c;
-    msgptr[player]++;
-    if (c < 33)
-    {
-        msglen[player] += 6;
-    }
-    else
-    {
-        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        msglen[player] += patch->width;
-    }
-}
-
-//===========================================================================
-//
-// CT_BackSpace
-//
-//      Backs up a space, when the user hits (obviously) backspace
-//===========================================================================
-
-void CT_BackSpace(int player)
-{
-    patch_t *patch;
-    char c;
-
-    if (msgptr[player] == 0)
-    {                           // message is already blank
-        return;
-    }
-    msgptr[player]--;
-    c = chat_msg[player][msgptr[player]];
-    if (c < 33)
-    {
-        msglen[player] -= 6;
-    }
-    else
-    {
-        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        msglen[player] -= patch->width;
-    }
-    chat_msg[player][msgptr[player]] = 0;
-}
-
-//===========================================================================
-//
-// CT_ClearChatMessage
-//
-//      Clears out the data for the chat message, but the player's message
-//              is still saved in plrmsg.
-//===========================================================================
-
-void CT_ClearChatMessage(int player)
-{
-    memset(chat_msg[player], 0, MESSAGESIZE);
-    msgptr[player] = 0;
-    msglen[player] = 0;
-}
diff --git a/games/NXDoom/src/heretic/ct_chat.h b/games/NXDoom/src/heretic/ct_chat.h
deleted file mode 100644
index 75aaab270..000000000
--- a/games/NXDoom/src/heretic/ct_chat.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Chat mode stuff
-//
-
-#ifndef HERETIC_CT_CHAT_H
-#define HERETIC_CT_CHAT_H
-
-#define CT_PLR_GREEN	1
-#define CT_PLR_YELLOW	2
-#define CT_PLR_RED		3
-#define CT_PLR_BLUE		4
-#define CT_PLR_ALL		5
-
-#define CT_KEY_GREEN	'g'
-#define CT_KEY_YELLOW	'y'
-#define CT_KEY_RED		'r'
-#define CT_KEY_BLUE		'b'
-#define CT_KEY_ALL		't'
-
-extern char *chat_macros[10];
-
-#endif /* #ifndef HERETIC_CT_CHAT_H */
-
diff --git a/games/NXDoom/src/heretic/d_main.c b/games/NXDoom/src/heretic/d_main.c
deleted file mode 100644
index 9090df83a..000000000
--- a/games/NXDoom/src/heretic/d_main.c
+++ /dev/null
@@ -1,1171 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// D_main.c
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "txt_main.h"
-#include "txt_io.h"
-
-#include "net_client.h"
-
-#include "config.h"
-#include "ct_chat.h"
-#include "doomdef.h"
-#include "deh_main.h"
-#include "d_iwad.h"
-#include "i_endoom.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_sound.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "w_main.h"
-#include "v_video.h"
-#include "am_map.h"
-
-#include "heretic_icon.c"
-
-#define CT_KEY_GREEN    'g'
-#define CT_KEY_YELLOW   'y'
-#define CT_KEY_RED      'r'
-#define CT_KEY_BLUE     'b'
-
-#define STARTUP_WINDOW_X 17
-#define STARTUP_WINDOW_Y 7
-
-GameMode_t gamemode = indetermined;
-const char *gamedescription = "unknown";
-
-boolean nomonsters;             // checkparm of -nomonsters
-boolean respawnparm;            // checkparm of -respawn
-boolean debugmode;              // checkparm of -debug
-boolean ravpic;                 // checkparm of -ravpic
-boolean cdrom;                  // true if cd-rom mode active
-boolean noartiskip;             // whether shift-enter skips an artifact
-
-skill_t startskill;
-int startepisode;
-int startmap;
-int UpdateState;
-static int graphical_startup = 1;
-static boolean using_graphical_startup;
-static boolean main_loop_started = false;
-boolean autostart;
-
-boolean advancedemo;
-
-FILE *debugfile;
-
-static int show_endoom = 1;
-
-void D_ConnectNetGame(void);
-void D_CheckNetGame(void);
-void D_PageDrawer(void);
-void D_AdvanceDemo(void);
-boolean F_Responder(event_t * ev);
-
-//---------------------------------------------------------------------------
-//
-// PROC D_ProcessEvents
-//
-// Send all the events of the given timestamp down the responder chain.
-//
-//---------------------------------------------------------------------------
-
-void D_ProcessEvents(void)
-{
-    event_t *ev;
-
-    while ((ev = D_PopEvent()) != NULL)
-    {
-        if (F_Responder(ev))
-        {
-            continue;
-        }
-        if (MN_Responder(ev))
-        {
-            continue;
-        }
-        G_Responder(ev);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawMessage
-//
-//---------------------------------------------------------------------------
-
-void DrawMessage(void)
-{
-    player_t *player;
-
-    player = &players[consoleplayer];
-    if (player->messageTics <= 0 || !player->message)
-    {                           // No message
-        return;
-    }
-    MN_DrTextA(player->message, 160 - MN_TextAWidth(player->message) / 2, 1);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC D_Display
-//
-// Draw current display, possibly wiping it from the previous.
-//
-//---------------------------------------------------------------------------
-
-
-void D_Display(void)
-{
-    // Change the view size if needed
-    if (setsizeneeded)
-    {
-        R_ExecuteSetViewSize();
-    }
-
-//
-// do buffered drawing
-//
-    switch (gamestate)
-    {
-        case GS_LEVEL:
-            if (!gametic)
-                break;
-            if (automapactive)
-                AM_Drawer();
-            else
-                R_RenderPlayerView(&players[displayplayer]);
-            CT_Drawer();
-            UpdateState |= I_FULLVIEW;
-            SB_Drawer();
-            break;
-        case GS_INTERMISSION:
-            IN_Drawer();
-            break;
-        case GS_FINALE:
-            F_Drawer();
-            break;
-        case GS_DEMOSCREEN:
-            D_PageDrawer();
-            break;
-    }
-
-    if (testcontrols)
-    {
-        V_DrawMouseSpeedBox(testcontrols_mousespeed);
-    }
-
-    if (paused && !MenuActive && !askforquit)
-    {
-        if (!netgame)
-        {
-            V_DrawPatch(160, viewwindowy + 5, W_CacheLumpName(DEH_String("PAUSED"),
-                                                              PU_CACHE));
-        }
-        else
-        {
-            V_DrawPatch(160, 70, W_CacheLumpName(DEH_String("PAUSED"), PU_CACHE));
-        }
-    }
-    // Handle player messages
-    DrawMessage();
-
-    // Menu drawing
-    MN_Drawer();
-
-    // Send out any new accumulation
-    NetUpdate();
-
-    // Flush buffered stuff to screen
-    I_FinishUpdate();
-}
-
-//
-// D_GrabMouseCallback
-//
-// Called to determine whether to grab the mouse pointer
-//
-
-boolean D_GrabMouseCallback(void)
-{
-    // when menu is active or game is paused, release the mouse
-
-    if (MenuActive || paused)
-        return false;
-
-    // only grab mouse when playing levels (but not demos)
-
-    return (gamestate == GS_LEVEL) && !demoplayback && !advancedemo;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC D_DoomLoop
-//
-//---------------------------------------------------------------------------
-
-void D_DoomLoop(void)
-{
-    if (M_CheckParm("-debugfile"))
-    {
-        char filename[20];
-        M_snprintf(filename, sizeof(filename), "debug%i.txt", consoleplayer);
-        debugfile = M_fopen(filename, "w");
-    }
-    I_GraphicsCheckCommandLine();
-    I_SetGrabMouseCallback(D_GrabMouseCallback);
-    I_RegisterWindowIcon(heretic_icon_data, heretic_icon_w, heretic_icon_h);
-    I_InitGraphics();
-
-    main_loop_started = true;
-
-    while (1)
-    {
-        // Frame syncronous IO operations
-        I_StartFrame();
-
-        // Process one or more tics
-        // Will run at least one tic
-        TryRunTics();
-
-        // Move positional sounds
-        S_UpdateSounds(players[consoleplayer].mo);
-        D_Display();
-    }
-}
-
-/*
-===============================================================================
-
-						DEMO LOOP
-
-===============================================================================
-*/
-
-static int demosequence;
-static int pagetic;
-static const char *pagename;
-
-
-/*
-================
-=
-= D_PageTicker
-=
-= Handles timing for warped projection
-=
-================
-*/
-
-void D_PageTicker(void)
-{
-    if (--pagetic < 0)
-        D_AdvanceDemo();
-}
-
-
-/*
-================
-=
-= D_PageDrawer
-=
-================
-*/
-
-void D_PageDrawer(void)
-{
-    V_DrawRawScreen(W_CacheLumpName(pagename, PU_CACHE));
-    if (demosequence == 1)
-    {
-        V_DrawPatch(4, 160, W_CacheLumpName(DEH_String("ADVISOR"), PU_CACHE));
-    }
-    UpdateState |= I_FULLSCRN;
-}
-
-/*
-=================
-=
-= D_AdvanceDemo
-=
-= Called after each demo or intro demosequence finishes
-=================
-*/
-
-void D_AdvanceDemo(void)
-{
-    advancedemo = true;
-}
-
-void D_DoAdvanceDemo(void)
-{
-    players[consoleplayer].playerstate = PST_LIVE;      // don't reborn
-    advancedemo = false;
-    usergame = false;           // can't save / end game here
-    paused = false;
-    gameaction = ga_nothing;
-    demosequence = (demosequence + 1) % 7;
-    switch (demosequence)
-    {
-        case 0:
-            pagetic = 210;
-            gamestate = GS_DEMOSCREEN;
-            pagename = DEH_String("TITLE");
-            S_StartSong(mus_titl, false);
-            break;
-        case 1:
-            pagetic = 140;
-            gamestate = GS_DEMOSCREEN;
-            pagename = DEH_String("TITLE");
-            break;
-        case 2:
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            G_DeferedPlayDemo(DEH_String("demo1"));
-            break;
-        case 3:
-            pagetic = 200;
-            gamestate = GS_DEMOSCREEN;
-            pagename = DEH_String("CREDIT");
-            break;
-        case 4:
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            G_DeferedPlayDemo(DEH_String("demo2"));
-            break;
-        case 5:
-            pagetic = 200;
-            gamestate = GS_DEMOSCREEN;
-            if (gamemode == shareware)
-            {
-                pagename = DEH_String("ORDER");
-            }
-            else
-            {
-                pagename = DEH_String("CREDIT");
-            }
-            break;
-        case 6:
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            G_DeferedPlayDemo(DEH_String("demo3"));
-            break;
-    }
-}
-
-
-/*
-=================
-=
-= D_StartTitle
-=
-=================
-*/
-
-void D_StartTitle(void)
-{
-    gameaction = ga_nothing;
-    demosequence = -1;
-    D_AdvanceDemo();
-}
-
-
-/*
-==============
-=
-= D_CheckRecordFrom
-=
-= -recordfrom <save-num> <demo-name>
-==============
-*/
-
-void D_CheckRecordFrom(void)
-{
-    int p;
-    char *filename;
-
-    //!
-    // @vanilla
-    // @category demo
-    // @arg <save-num> <demo-name>
-    //
-    // Load a game from the given savegame slot and record a demo from
-    // it.  Equivalent to -loadgame <save-num> -record <demo-name>.
-
-    p = M_CheckParmWithArgs("-recordfrom", 2);
-    if (!p)
-        return;
-
-    filename = SV_Filename(myargv[p + 1][0] - '0');
-    G_LoadGame(filename);
-    G_DoLoadGame();             // load the gameskill etc info from savegame
-
-    G_RecordDemo(gameskill, 1, gameepisode, gamemap, myargv[p + 2]);
-    D_DoomLoop();               // never returns
-    free(filename);
-}
-
-/*
-===============
-=
-= D_AddFile
-=
-===============
-*/
-
-// MAPDIR should be defined as the directory that holds development maps
-// for the -wart # # command
-
-#define MAPDIR "\\data\\"
-
-#define SHAREWAREWADNAME "heretic1.wad"
-
-char *iwadfile;
-
-
-void wadprintf(void)
-{
-    if (debugmode)
-    {
-        return;
-    }
-}
-
-boolean D_AddFile(char *file)
-{
-    wad_file_t *handle;
-
-    printf("  adding %s\n", file);
-
-    handle = W_AddFile(file);
-
-    return handle != NULL;
-}
-
-//==========================================================
-//
-//  Startup Thermo code
-//
-//==========================================================
-#define MSG_Y       9
-#define THERM_X     14
-#define THERM_Y     14
-
-int thermMax;
-int thermCurrent;
-char smsg[80];                  // status bar line
-
-//
-//  Heretic startup screen shit
-//
-
-static int startup_line = STARTUP_WINDOW_Y;
-
-void hprintf(const char *string)
-{
-    if (using_graphical_startup)
-    {
-        TXT_BGColor(TXT_COLOR_CYAN, 0);
-        TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-        TXT_GotoXY(STARTUP_WINDOW_X, startup_line);
-        ++startup_line;
-        TXT_Puts(string);
-
-        TXT_UpdateScreen();
-    }
-
-    // haleyjd: shouldn't be WATCOMC-only
-    if (debugmode)
-        puts(string);
-}
-
-void drawstatus(void)
-{
-    int i;
-
-    TXT_GotoXY(1, 24);
-    TXT_BGColor(TXT_COLOR_BLUE, 0);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    for (i=0; smsg[i] != '\0'; ++i) 
-    {
-        TXT_PutChar(smsg[i]);
-    }
-}
-
-static void status(const char *string)
-{
-    if (using_graphical_startup)
-    {
-        M_StringConcat(smsg, string, sizeof(smsg));
-        drawstatus();
-    }
-}
-
-void DrawThermo(void)
-{
-    static int last_progress = -1;
-    int progress;
-    int i;
-
-    if (!using_graphical_startup)
-    {
-        return;
-    }
-
-    // No progress? Don't update the screen.
-
-    progress = (50 * thermCurrent) / thermMax + 2;
-
-    if (last_progress == progress)
-    {
-        return;
-    }
-
-    last_progress = progress;
-
-    TXT_GotoXY(THERM_X, THERM_Y);
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_GREEN);
-    TXT_BGColor(TXT_COLOR_GREEN, 0);
-
-    for (i = 0; i < progress; i++)
-    {
-        TXT_PutChar(0xdb);
-    }
-
-    TXT_UpdateScreen();
-}
-
-void initStartup(void)
-{
-    byte *textScreen;
-    byte *loading;
-
-    if (!graphical_startup || debugmode || testcontrols)
-    {
-        using_graphical_startup = false;
-        return;
-    }
-
-    if (!TXT_Init()) 
-    {
-        using_graphical_startup = false;
-        return;
-    }
-
-    I_InitWindowTitle();
-    I_InitWindowIcon();
-
-    // Blit main screen
-    textScreen = TXT_GetScreenData();
-    loading = W_CacheLumpName(DEH_String("LOADING"), PU_CACHE);
-    memcpy(textScreen, loading, 4000);
-
-    // Print version string
-
-    TXT_BGColor(TXT_COLOR_RED, 0);
-    TXT_FGColor(TXT_COLOR_YELLOW);
-    TXT_GotoXY(46, 2);
-    TXT_Puts(HERETIC_VERSION_TEXT);
-
-    TXT_UpdateScreen();
-
-    using_graphical_startup = true;
-}
-
-static void finishStartup(void)
-{
-    if (using_graphical_startup)
-    {
-        TXT_Shutdown();
-    }
-}
-
-char tmsg[300];
-void tprintf(const char *msg, int initflag)
-{
-    printf("%s", msg);
-}
-
-// haleyjd: moved up, removed WATCOMC code
-void CleanExit(void)
-{
-    DEH_printf("Exited from HERETIC.\n");
-    exit(1);
-}
-
-void CheckAbortStartup(void)
-{
-    // haleyjd: removed WATCOMC
-    // haleyjd FIXME: this should actually work in text mode too, but how to
-    // get input before SDL video init?
-    if(using_graphical_startup)
-    {
-        if(TXT_GetChar() == 27)
-            CleanExit();
-    }
-}
-
-void IncThermo(void)
-{
-    thermCurrent++;
-    DrawThermo();
-    CheckAbortStartup();
-}
-
-void InitThermo(int max)
-{
-    thermMax = max;
-    thermCurrent = 0;
-}
-
-//
-// Add configuration file variable bindings.
-//
-
-void D_BindVariables(void)
-{
-    int i;
-
-    M_ApplyPlatformDefaults();
-
-    I_BindInputVariables();
-    I_BindVideoVariables();
-    I_BindJoystickVariables();
-    I_BindSoundVariables();
-
-    M_BindBaseControls();
-    M_BindHereticControls();
-    M_BindWeaponControls();
-    M_BindChatControls(MAXPLAYERS);
-
-    key_multi_msgplayer[0] = CT_KEY_GREEN;
-    key_multi_msgplayer[1] = CT_KEY_YELLOW;
-    key_multi_msgplayer[2] = CT_KEY_RED;
-    key_multi_msgplayer[3] = CT_KEY_BLUE;
-
-    M_BindMenuControls();
-    M_BindMapControls();
-
-    NET_BindVariables();
-
-    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
-    M_BindIntVariable("sfx_volume",             &snd_MaxVolume);
-    M_BindIntVariable("music_volume",           &snd_MusicVolume);
-    M_BindIntVariable("screenblocks",           &screenblocks);
-    M_BindIntVariable("snd_channels",           &snd_Channels);
-    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
-    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
-    M_BindIntVariable("show_endoom",            &show_endoom);
-    M_BindIntVariable("graphical_startup",      &graphical_startup);
-
-    for (i=0; i<10; ++i)
-    {
-        char buf[12];
-
-        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
-        M_BindStringVariable(buf, &chat_macros[i]);
-    }
-}
-
-// 
-// Called at exit to display the ENDOOM screen (ENDTEXT in Heretic)
-//
-
-static void D_Endoom(void)
-{
-    byte *endoom_data;
-
-    // Disable ENDOOM?
-
-    if (!show_endoom || testcontrols || !main_loop_started)
-    {
-        return;
-    }
-
-    endoom_data = W_CacheLumpName(DEH_String("ENDTEXT"), PU_STATIC);
-
-    I_Endoom(endoom_data);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC D_DoomMain
-//
-//---------------------------------------------------------------------------
-
-void D_DoomMain(void)
-{
-    GameMission_t gamemission;
-    int p;
-    char file[256];
-    char demolumpname[9];
-
-    I_PrintBanner(PACKAGE_STRING);
-
-    I_AtExit(D_Endoom, false);
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Disable monsters.
-    //
-
-    nomonsters = M_ParmExists("-nomonsters");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Monsters respawn after being killed.
-    //
-
-    respawnparm = M_ParmExists("-respawn");
-
-    //!
-    // @vanilla
-    //
-    // Take screenshots when F1 is pressed.
-    //
-
-    ravpic = M_ParmExists("-ravpic");
-
-    //!
-    // @category obscure
-    // @vanilla
-    //
-    // Allow artifacts to be used when the run key is held down.
-    //
-
-    noartiskip = M_ParmExists("-noartiskip");
-
-    debugmode = M_ParmExists("-debug");
-    startskill = sk_medium;
-    startepisode = 1;
-    startmap = 1;
-    autostart = false;
-
-//
-// get skill / episode / map from parms
-//
-
-    //!
-    // @vanilla
-    // @category net
-    //
-    // Start a deathmatch game.
-    //
-
-    if (M_ParmExists("-deathmatch"))
-    {
-        deathmatch = true;
-    }
-
-    //!
-    // @category game
-    // @arg <skill>
-    // @vanilla
-    //
-    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
-    // 0 disables all monsters.
-    //
-
-    p = M_CheckParmWithArgs("-skill", 1);
-    if (p)
-    {
-        startskill = myargv[p + 1][0] - '1';
-        autostart = true;
-    }
-
-    //!
-    // @category game
-    // @arg <n>
-    // @vanilla
-    //
-    // Start playing episode n (1-4).
-    //
-
-    p = M_CheckParmWithArgs("-episode", 1);
-    if (p)
-    {
-        startepisode = myargv[p + 1][0] - '0';
-        startmap = 1;
-        autostart = true;
-    }
-
-    //!
-    // @category game
-    // @arg <x> <y>
-    // @vanilla
-    //
-    // Start a game immediately, warping to level ExMy.
-    //
-
-    p = M_CheckParmWithArgs("-warp", 2);
-    if (p && p < myargc - 2)
-    {
-        startepisode = myargv[p + 1][0] - '0';
-        startmap = myargv[p + 2][0] - '0';
-        autostart = true;
-    }
-
-//
-// init subsystems
-//
-    DEH_printf("V_Init: allocate screens.\n");
-    V_Init();
-
-    // Check for -CDROM
-
-    cdrom = false;
-
-#ifdef _WIN32
-
-    //!
-    // @category obscure
-    // @platform windows
-    // @vanilla
-    //
-    // Save configuration data and savegames in c:\heretic.cd,
-    // allowing play from CD.
-    //
-
-    if (M_CheckParm("-cdrom"))
-    {
-        cdrom = true;
-    }
-#endif
-
-    if (cdrom)
-    {
-        M_SetConfigDir(DEH_String("c:\\heretic.cd"));
-    }
-    else
-    {
-        M_SetConfigDir(NULL);
-    }
-
-    // Load defaults before initing other systems
-    DEH_printf("M_LoadDefaults: Load system defaults.\n");
-    D_BindVariables();
-    M_SetConfigFilenames("heretic.cfg", PROGRAM_PREFIX "heretic.cfg");
-    M_LoadDefaults();
-
-    I_AtExit(M_SaveDefaults, false);
-
-    DEH_printf("Z_Init: Init zone memory allocation daemon.\n");
-    Z_Init();
-
-    DEH_printf("W_Init: Init WADfiles.\n");
-
-    iwadfile = D_FindIWAD(IWAD_MASK_HERETIC, &gamemission);
-
-    if (iwadfile == NULL)
-    {
-        I_Error("Game mode indeterminate. No IWAD was found. Try specifying\n"
-                "one with the '-iwad' command line parameter.");
-    }
-
-    D_AddFile(iwadfile);
-    W_CheckCorrectIWAD(heretic);
-
-    //!
-    // @category mod
-    //
-    // Disable auto-loading of .wad files.
-    //
-    if (!M_ParmExists("-noautoload"))
-    {
-        char *autoload_dir;
-        autoload_dir = M_GetAutoloadDir("heretic.wad");
-        if (autoload_dir != NULL)
-        {
-            DEH_AutoLoadPatches(autoload_dir);
-            W_AutoLoadWADs(autoload_dir);
-            free(autoload_dir);
-        }
-    }
-
-    // Load dehacked patches specified on the command line.
-    DEH_ParseCommandLine();
-
-    // Load PWAD files.
-    W_ParseCommandLine();
-
-    //!
-    // @arg <demo>
-    // @category demo
-    // @vanilla
-    //
-    // Play back the demo named demo.lmp.
-    //
-
-    p = M_CheckParmWithArgs("-playdemo", 1);
-    if (!p)
-    {
-        //!
-        // @arg <demo>
-        // @category demo
-        // @vanilla
-        //
-        // Play back the demo named demo.lmp, determining the framerate
-        // of the screen.
-        //
-
-        p = M_CheckParmWithArgs("-timedemo", 1);
-    }
-
-    if (p)
-    {
-        char *uc_filename = strdup(myargv[p + 1]);
-        M_ForceUppercase(uc_filename);
-
-        // In Vanilla, the filename must be specified without .lmp,
-        // but make that optional.
-        if (M_StringEndsWith(uc_filename, ".LMP"))
-        {
-            M_StringCopy(file, myargv[p + 1], sizeof(file));
-        }
-        else
-        {
-            DEH_snprintf(file, sizeof(file), "%s.lmp", myargv[p + 1]);
-        }
-
-        free(uc_filename);
-
-        if (D_AddFile(file))
-        {
-            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
-                         sizeof(demolumpname));
-        }
-        else
-        {
-            // The file failed to load, but copy the original arg as a
-            // demo name to make tricks like -playdemo demo1 possible.
-            M_StringCopy(demolumpname, myargv[p + 1], sizeof(demolumpname));
-        }
-
-        printf("Playing demo %s.\n", file);
-    }
-
-    // Generate the WAD hash table.  Speed things up a bit.
-    W_GenerateHashTable();
-
-    //!
-    // @category demo
-    //
-    // Record or playback a demo without automatically quitting
-    // after either level exit or player respawn.
-    //
-
-    demoextend = M_ParmExists("-demoextend");
-
-    if (W_CheckNumForName(DEH_String("E2M1")) == -1)
-    {
-        gamemode = shareware;
-        gamedescription = "Heretic (shareware)";
-    }
-    else if (W_CheckNumForName("EXTENDED") != -1)
-    {
-        // Presence of the EXTENDED lump indicates the retail version
-
-        gamemode = retail;
-        gamedescription = "Heretic: Shadow of the Serpent Riders";
-    }
-    else
-    {
-        gamemode = registered;
-        gamedescription = "Heretic (registered)";
-    }
-
-    I_SetWindowTitle(gamedescription);
-
-    savegamedir = M_GetSaveGameDir("heretic.wad");
-
-    I_PrintStartupBanner(gamedescription);
-
-    if (M_ParmExists("-testcontrols"))
-    {
-        startepisode = 1;
-        startmap = 1;
-        autostart = true;
-        testcontrols = true;
-    }
-
-    I_InitTimer();
-    I_InitSound(heretic);
-    I_InitMusic();
-
-    tprintf("NET_Init: Init network subsystem.\n", 1);
-    NET_Init ();
-
-    D_ConnectNetGame();
-
-    // haleyjd: removed WATCOMC
-    initStartup();
-
-    //
-    //  Build status bar line!
-    //
-    smsg[0] = 0;
-    if (deathmatch)
-        status(DEH_String("DeathMatch..."));
-    if (nomonsters)
-        status(DEH_String("No Monsters..."));
-    if (respawnparm)
-        status(DEH_String("Respawning..."));
-    if (autostart)
-    {
-        char temp[64];
-        DEH_snprintf(temp, sizeof(temp),
-                     "Warp to Episode %d, Map %d, Skill %d ",
-                     startepisode, startmap, startskill + 1);
-        status(temp);
-    }
-    wadprintf();                // print the added wadfiles
-
-    tprintf(DEH_String("MN_Init: Init menu system.\n"), 1);
-    MN_Init();
-
-    CT_Init();
-
-    tprintf(DEH_String("R_Init: Init Heretic refresh daemon."), 1);
-    hprintf(DEH_String("Loading graphics"));
-    R_Init();
-    tprintf("\n", 0);
-
-    tprintf(DEH_String("P_Init: Init Playloop state.\n"), 1);
-    hprintf(DEH_String("Init game engine."));
-    P_Init();
-    IncThermo();
-
-    tprintf(DEH_String("I_Init: Setting up machine state.\n"), 1);
-    I_CheckIsScreensaver();
-    I_InitJoystick();
-    IncThermo();
-
-    tprintf(DEH_String("S_Init: Setting up sound.\n"), 1);
-    S_Init();
-    //IO_StartupTimer();
-    S_Start();
-
-    tprintf(DEH_String("D_CheckNetGame: Checking network game status.\n"), 1);
-    hprintf(DEH_String("Checking network game status."));
-    D_CheckNetGame();
-    IncThermo();
-
-    // haleyjd: removed WATCOMC
-
-    tprintf(DEH_String("SB_Init: Loading patches.\n"), 1);
-    SB_Init();
-    IncThermo();
-
-//
-// start the appropriate game based on params
-//
-
-    D_CheckRecordFrom();
-
-    //!
-    // @arg <x>
-    // @category demo
-    // @vanilla
-    //
-    // Record a demo named x.lmp.
-    //
-
-    p = M_CheckParmWithArgs("-record", 1);
-    if (p)
-    {
-        G_RecordDemo(startskill, 1, startepisode, startmap, myargv[p + 1]);
-        D_DoomLoop();           // Never returns
-    }
-
-    p = M_CheckParmWithArgs("-playdemo", 1);
-    if (p)
-    {
-        singledemo = true;      // Quit after one demo
-        G_DeferedPlayDemo(demolumpname);
-        D_DoomLoop();           // Never returns
-    }
-
-    p = M_CheckParmWithArgs("-timedemo", 1);
-    if (p)
-    {
-        G_TimeDemo(demolumpname);
-        D_DoomLoop();           // Never returns
-    }
-
-    //!
-    // @category game
-    // @arg <s>
-    // @vanilla
-    //
-    // Load the game in savegame slot s.
-    //
-
-    p = M_CheckParmWithArgs("-loadgame", 1);
-    if (p && p < myargc - 1)
-    {
-        char *filename;
-
-	filename = SV_Filename(myargv[p + 1][0] - '0');
-        G_LoadGame(filename);
-	free(filename);
-    }
-
-    // Check valid episode and map
-    if (autostart || netgame)
-    {
-        if (!D_ValidEpisodeMap(heretic, gamemode, startepisode, startmap))
-        {
-            startepisode = 1;
-            startmap = 1;
-        }
-    }
-
-    if (gameaction != ga_loadgame)
-    {
-        UpdateState |= I_FULLSCRN;
-        BorderNeedRefresh = true;
-        if (autostart || netgame)
-        {
-            G_InitNew(startskill, startepisode, startmap);
-        }
-        else
-        {
-            D_StartTitle();
-        }
-    }
-
-    finishStartup();
-
-    D_DoomLoop();               // Never returns
-}
diff --git a/games/NXDoom/src/heretic/d_net.c b/games/NXDoom/src/heretic/d_net.c
deleted file mode 100644
index 8aef319fe..000000000
--- a/games/NXDoom/src/heretic/d_net.c
+++ /dev/null
@@ -1,218 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM Network game communication and protocol,
-//	all OS independend parts.
-//
-
-#include <stdlib.h>
-
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "doomdef.h"
-#include "m_argv.h"
-#include "m_misc.h"
-#include "w_checksum.h"
-
-#include "deh_main.h"
-
-#include "d_loop.h"
-
-ticcmd_t *netcmds;
-
-
-// Called when a player leaves the game
-
-static void PlayerQuitGame(player_t *player)
-{
-    static char exitmsg[80];
-    unsigned int player_num;
-
-    player_num = player - players;
-
-    // Note:
-    // The Heretic source code does this, which doesn't actually work.
-    // As a result, the exit message is never seen.
-
-    M_StringCopy(exitmsg, "PLAYER 1 LEFT THE GAME", sizeof(exitmsg));
-    exitmsg[7] += player_num;
-    players[consoleplayer].message = exitmsg;
-
-    playeringame[player_num] = false;
-    players[consoleplayer].message = exitmsg;
-
-    // TODO: check if it is sensible to do this:
-
-    if (demorecording) 
-    {
-        G_CheckDemoStatus ();
-    }
-}
-
-static void RunTic(ticcmd_t *cmds, boolean *ingame)
-{
-    unsigned int i;
-
-    // Check for player quits.
-
-    for (i = 0; i < MAXPLAYERS; ++i)
-    {
-        if (!demoplayback && playeringame[i] && !ingame[i])
-        {
-            PlayerQuitGame(&players[i]);
-        }
-    }
-
-    netcmds = cmds;
-
-    // check that there are players in the game.  if not, we cannot
-    // run a tic.
-
-    if (advancedemo)
-        D_DoAdvanceDemo ();
-
-    G_Ticker ();
-}
-
-static loop_interface_t doom_loop_interface = {
-    D_ProcessEvents,
-    G_BuildTiccmd,
-    RunTic,
-    MN_Ticker
-};
-
-
-// Load game settings from the specified structure and 
-// set global variables.
-
-static void LoadGameSettings(net_gamesettings_t *settings)
-{
-    unsigned int i;
-
-    deathmatch = settings->deathmatch;
-    ticdup = settings->ticdup;
-    startepisode = settings->episode;
-    startmap = settings->map;
-    startskill = settings->skill;
-    // TODO startloadgame = settings->loadgame;
-    lowres_turn = settings->lowres_turn;
-    nomonsters = settings->nomonsters;
-    respawnparm = settings->respawn_monsters;
-    consoleplayer = settings->consoleplayer;
-
-    if (lowres_turn)
-    {
-        printf("NOTE: Turning resolution is reduced; this is probably "
-               "because there is a client recording a Vanilla demo.\n");
-    }
-
-    for (i = 0; i < MAXPLAYERS; ++i)
-    {
-        playeringame[i] = i < settings->num_players;
-    }
-}
-
-// Save the game settings from global variables to the specified
-// game settings structure.
-
-static void SaveGameSettings(net_gamesettings_t *settings)
-{
-    // Fill in game settings structure with appropriate parameters
-    // for the new game
-
-    settings->deathmatch = deathmatch;
-    settings->episode = startepisode;
-    settings->map = startmap;
-    settings->skill = startskill;
-    // TODO settings->loadgame = startloadgame;
-    settings->gameversion = exe_heretic_1_3;
-    settings->nomonsters = nomonsters;
-    settings->respawn_monsters = respawnparm;
-    settings->timelimit = 0;
-
-    settings->lowres_turn = M_ParmExists("-record")
-                         && !M_ParmExists("-longtics");
-}
-
-static void InitConnectData(net_connect_data_t *connect_data)
-{
-    connect_data->drone = false;
-    connect_data->max_players = MAXPLAYERS;
-
-    //
-    // Connect data
-    //
-
-    // Game type fields:
-
-    connect_data->gamemode = gamemode;
-    connect_data->gamemission = heretic;
-
-    // Are we recording a demo? Possibly set lowres turn mode
-
-    connect_data->lowres_turn = M_ParmExists("-record")
-                             && !M_ParmExists("-longtics");
-
-    // Read checksums of our WAD directory and dehacked information
-
-    W_Checksum(connect_data->wad_sha1sum);
-    DEH_Checksum(connect_data->deh_sha1sum);
-
-    connect_data->is_freedoom = 0;
-}
-
-void D_ConnectNetGame(void)
-{
-    net_connect_data_t connect_data;
-
-    InitConnectData(&connect_data);
-    netgame = D_InitNetGame(&connect_data);
-
-    //!
-    // @category net
-    //
-    // Start the game playing as though in a netgame with a single
-    // player.  This can also be used to play back single player netgame
-    // demos.
-    //
-
-    if (M_CheckParm("-solo-net") > 0)
-    {
-        netgame = true;
-    }
-}
-
-//
-// D_CheckNetGame
-// Works out player numbers among the net participants
-//
-
-void D_CheckNetGame (void)
-{
-    net_gamesettings_t settings;
-
-    D_RegisterLoopCallbacks(&doom_loop_interface);
-
-    if (netgame)
-    {
-        autostart = true;
-    }
-
-    SaveGameSettings(&settings);
-    D_StartNetGame(&settings, NULL);
-    LoadGameSettings(&settings);
-}
-
diff --git a/games/NXDoom/src/heretic/deh_ammo.c b/games/NXDoom/src/heretic/deh_ammo.c
deleted file mode 100644
index 39384d75d..000000000
--- a/games/NXDoom/src/heretic/deh_ammo.c
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Ammo" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomdef.h"
-#include "doomtype.h"
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-#include "p_local.h"
-
-static void *DEH_AmmoStart(deh_context_t *context, char *line)
-{
-    int ammo_number = 0;
-
-    if (sscanf(line, "Ammo %i", &ammo_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (ammo_number < 0 || ammo_number >= NUMAMMO)
-    {
-        DEH_Warning(context, "Invalid ammo number: %i", ammo_number);
-        return NULL;
-    }
-
-    return &maxammo[ammo_number];
-}
-
-static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    int ivalue;
-    int ammo_number;
-
-    if (tag == NULL)
-        return;
-
-    ammo_number = ((int *) tag) - maxammo;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    if (!strcasecmp(variable_name, "Per ammo"))
-    {
-        // Heretic doesn't have a "per clip" ammo array, instead
-        // it is per weapon.  However, the weapon number lines
-        // up with the ammo number if we add one.
-
-        GetWeaponAmmo[ammo_number + 1] = ivalue;
-    }
-    else if (!strcasecmp(variable_name, "Max ammo"))
-    {
-        maxammo[ammo_number] = ivalue;
-    }
-    else
-    {
-        DEH_Warning(context, "Field named '%s' not found", variable_name);
-    }
-}
-
-static void DEH_AmmoSHA1Hash(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        SHA1_UpdateInt32(context, maxammo[i]);
-    }
-
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        SHA1_UpdateInt32(context, GetWeaponAmmo[i]);
-    }
-}
-
-deh_section_t deh_section_ammo =
-{
-    "Ammo",
-    NULL,
-    DEH_AmmoStart,
-    DEH_AmmoParseLine,
-    NULL,
-    DEH_AmmoSHA1Hash,
-};
-
diff --git a/games/NXDoom/src/heretic/deh_frame.c b/games/NXDoom/src/heretic/deh_frame.c
deleted file mode 100644
index 711060308..000000000
--- a/games/NXDoom/src/heretic/deh_frame.c
+++ /dev/null
@@ -1,335 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Frame" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "doomtype.h"
-#include "info.h"
-
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-#include "deh_htic.h"
-
-#include "p_action.h"
-
-typedef struct
-{
-    int offsets[deh_hhe_num_versions];
-    void (*func)(struct mobj_s *, struct player_s *, struct pspdef_s *);
-} hhe_action_pointer_t;
-
-// Offsets of action pointers within the Heretic executables.
-// Different versions have different offsets.
-// (Seriously Greg, was this really necessary?  What was wrong with the
-// "copying action pointer from another frame" technique used in dehacked?)
-
-//    Offset                      Action function
-//        v1.0    v1.2    v1.3
-
-static const hhe_action_pointer_t action_pointers[] =
-{
-    { {  77680,  80144,  80208 }, A_AccTeleGlitter },
-    { {  78608,  81104,  81168 }, A_AddPlayerCorpse },
-    { { 115808, 118000, 118240 }, A_AddPlayerRain },
-    { { 112272, 114480, 114720 }, A_BeakAttackPL1 },
-    { { 112448, 114656, 114896 }, A_BeakAttackPL2 },
-    { { 111856, 114176, 114416 }, A_BeakRaise },
-    { { 111568, 113888, 114128 }, A_BeakReady },
-    { {  74640,  77120,  77184 }, A_BeastAttack },
-    { {  70480,  72992,  73056 }, A_BeastPuff },
-    { {  73120,  75600,  75664 }, A_BlueSpark },
-    { { 115456, 117648, 117888 }, A_BoltSpark },
-    { {  77344,  79808,  79872 }, A_BossDeath },
-    { {  69328,  71856,  71920 }, A_Chase },
-    { {      0,  80976,  81040 }, A_CheckBurnGone },
-    { {  78480,  80944,  81008 }, A_CheckSkullDone },
-    { {  78448,  80912,  80976 }, A_CheckSkullFloor },
-    { {  71376,  73888,  73952 }, A_ChicAttack },
-    { {  71488,  74000,  74064 }, A_ChicChase },
-    { {  71456,  73968,  74032 }, A_ChicLook },
-    { {  71520,  74032,  74096 }, A_ChicPain },
-    { {  75792,  78208,  78272 }, A_ClinkAttack },
-    { { 108432, 110816, 111056 }, A_ContMobjSound },
-    { { 114752, 116944, 117184 }, A_DeathBallImpact },
-    { {  70016,  72528,  72592 }, A_DripBlood },
-    { {  77472,  79936,  80000 }, A_ESound },
-    { {  76784,  79248,  79312 }, A_Explode },
-    { {  69872,  72400,  72464 }, A_FaceTarget },
-    { {  71568,  74080,  74144 }, A_Feathers },
-    { { 112928, 115136, 115376 }, A_FireBlasterPL1 },
-    { { 113072, 115280, 115520 }, A_FireBlasterPL2 },
-    { { 115232, 117424, 117664 }, A_FireCrossbowPL1 },
-    { { 115312, 117504, 117744 }, A_FireCrossbowPL2 },
-    { { 113152, 115360, 115600 }, A_FireGoldWandPL1 },
-    { { 113296, 115504, 115744 }, A_FireGoldWandPL2 },
-    { { 113760, 115968, 116208 }, A_FireMacePL1 },
-    { { 114624, 116816, 117056 }, A_FireMacePL2 },
-    { { 116368, 118544, 118784 }, A_FirePhoenixPL1 },
-    { { 116736, 118896, 119136 }, A_FirePhoenixPL2 },
-    { { 115568, 117760, 118000 }, A_FireSkullRodPL1 },
-    { { 115648, 117840, 118080 }, A_FireSkullRodPL2 },
-    { { 117120, 119280, 119520 }, A_FlameEnd },
-    { {  78704,  81200,  81264 }, A_FlameSnd },
-    { { 117152, 119312, 119552 }, A_FloatPuff },
-    { {  78512,  81008,  81072 }, A_FreeTargMobj },
-    { { 117184, 119344, 119584 }, A_GauntletAttack },
-    { {  73232,  75712,  75776 }, A_GenWizard },
-    { {  75872,  78304,  78368 }, A_GhostOff },
-    { {  74752,  77232,  77296 }, A_HeadAttack },
-    { {  75488,  77984,  78048 }, A_HeadFireGrow },
-    { {  75328,  77824,  77888 }, A_HeadIceImpact },
-    { { 116336, 118512, 118752 }, A_HideInCeiling },
-    { {  78736,  81232,  81296 }, A_HideThing },
-    { {  70976,  73488,  73552 }, A_ImpDeath },
-    { {  70304,  72816,  72880 }, A_ImpExplode },
-    { {  70592,  73104,  73168 }, A_ImpMeAttack },
-    { {  70672,  73184,  73248 }, A_ImpMsAttack },
-    { {  70880,  73392,  73456 }, A_ImpMsAttack2 },
-    { {  71024,  73536,  73600 }, A_ImpXDeath1 },
-    { {  71072,  73584,  73648 }, A_ImpXDeath2 },
-    { {  77728,  80192,  80256 }, A_InitKeyGizmo },
-    { { 116720, 118880, 119120 }, A_InitPhoenixPL2 },
-    { {  70160,  72672,  72736 }, A_KnightAttack },
-    { { 117648, 119824, 120064 }, A_Light0 },
-    { {  69200,  71728,  71792 }, A_Look },
-    { { 111760, 114080, 114320 }, A_Lower },
-    { { 114032, 116224, 116464 }, A_MaceBallImpact },
-    { { 114192, 116384, 116624 }, A_MaceBallImpact2 },
-    { { 113904, 116112, 116352 }, A_MacePL1Check },
-    { {  77104,  79568,  79632 }, A_MakePod },
-    { {  73648,  76128,  76192 }, A_MinotaurAtk1 },
-    { {  74112,  76592,  76656 }, A_MinotaurAtk2 },
-    { {  74352,  76832,  76896 }, A_MinotaurAtk3 },
-    { {  74032,  76512,  76576 }, A_MinotaurCharge },
-    { {  73760,  76240,  76304 }, A_MinotaurDecide },
-    { {  74528,  77008,  77072 }, A_MntrFloorFire },
-    { {  71808,  74288,  74352 }, A_MummyAttack },
-    { {  71920,  74400,  74464 }, A_MummyAttack2 },
-    { {  72016,  74496,  74560 }, A_MummyFX1Seek },
-    { {  72048,  74528,  74592 }, A_MummySoul },
-    { {  76400,  78832,  78896 }, A_NoBlocking },
-    { {  69984,  72496,  72560 }, A_Pain },
-    { { 116496, 118656, 118896 }, A_PhoenixPuff },
-    { {  76896,  79360,  79424 }, A_PodPain },
-    { { 116272, 118448, 118688 }, A_RainImpact },
-    { { 111920, 114240, 114480 }, A_Raise },
-    { { 111696, 114016, 114256 }, A_ReFire },
-    { {  77056,  79520,  79584 }, A_RemovePod },
-    { { 116480,      0,      0 }, A_RemovedPhoenixFunc },
-    { {  81952,  84464,  84528 }, A_RestoreArtifact },
-    { {  82048,  84544,  84608 }, A_RestoreSpecialThing1 },
-    { {  82128,  84592,  84656 }, A_RestoreSpecialThing2 },
-    { {  76144,  78576,  78640 }, A_Scream },
-    { { 117104, 119264, 119504 }, A_ShutdownPhoenixPL2 },
-    { {  78288,  80752,  80816 }, A_SkullPop },
-    { { 115776, 117968, 118208 }, A_SkullRodPL2Seek },
-    { { 115984, 118176, 118416 }, A_SkullRodStorm },
-    { {  75632,  78048,  78112 }, A_SnakeAttack },
-    { {  75712,  78128,  78192 }, A_SnakeAttack2 },
-    { {  72144,  74624,  74688 }, A_Sor1Chase },
-    { {  72096,  74576,  74640 }, A_Sor1Pain },
-    { {  73392,  75872,  75936 }, A_Sor2DthInit },
-    { {  73424,  75904,  75968 }, A_Sor2DthLoop },
-    { {  73584,  76064,  76128 }, A_SorDBon },
-    { {  73552,  76032,  76096 }, A_SorDExp },
-    { {  73520,  76000,  76064 }, A_SorDSph },
-    { {  73488,  75968,  76032 }, A_SorRise },
-    { {  73616,  76096,  76160 }, A_SorSightSnd },
-    { {  73456,  75936,  76000 }, A_SorZap },
-    { {  72480,  74960,  75024 }, A_SorcererRise },
-    { { 115088, 117280, 117520 }, A_SpawnRippers },
-    { {  77520,  79984,  80048 }, A_SpawnTeleGlitter },
-    { {  77600,  80064,  80128 }, A_SpawnTeleGlitter2 },
-    { {  72192,  74672,  74736 }, A_Srcr1Attack },
-    { {  72896,  75376,  75440 }, A_Srcr2Attack },
-    { {  72816,  75296,  75360 }, A_Srcr2Decide },
-    { { 112640, 114848, 115088 }, A_StaffAttackPL1 },
-    { { 112784, 114992, 115232 }, A_StaffAttackPL2 },
-    { {  78752,  81248,  81312 }, A_UnHideThing },
-    { {  78080,  80544,  80608 }, A_VolcBallImpact },
-    { {  77856,  80320,  80384 }, A_VolcanoBlast },
-    { {  77824,  80288,  80352 }, A_VolcanoSet },
-    { { 111168, 113488, 113728 }, A_WeaponReady },
-    { {  75168,  77664,  77728 }, A_WhirlwindSeek },
-    { {  75888,  78320,  78384 }, A_WizAtk1 },
-    { {  75920,  78352,  78416 }, A_WizAtk2 },
-    { {  75952,  78384,  78448 }, A_WizAtk3 },
-};
-
-DEH_BEGIN_MAPPING(state_mapping, state_t)
-  DEH_MAPPING("Sprite number",    sprite)
-  DEH_MAPPING("Sprite subnumber", frame)
-  DEH_MAPPING("Duration",         tics)
-  DEH_MAPPING("Next frame",       nextstate)
-  DEH_MAPPING("Unknown 1",        misc1)
-  DEH_MAPPING("Unknown 2",        misc2)
-DEH_END_MAPPING
-
-static void DEH_FrameInit(void)
-{
-    // Bit of a hack here:
-    DEH_HereticInit();
-}
-
-static void *DEH_FrameStart(deh_context_t *context, char *line)
-{
-    int frame_number = 0;
-    int mapped_frame_number;
-    state_t *state;
-
-    if (sscanf(line, "Frame %i", &frame_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    // Map the HHE frame number (which assumes a Heretic 1.0 state table)
-    // to the internal frame number (which is is the Heretic 1.3 state table):
-
-    mapped_frame_number = DEH_MapHereticFrameNumber(frame_number);
-
-    if (mapped_frame_number < 0 || mapped_frame_number >= DEH_HERETIC_NUMSTATES)
-    {
-        DEH_Warning(context, "Invalid frame number: %i", frame_number);
-        return NULL;
-    }
-
-    state = &states[mapped_frame_number];
-
-    return state;
-}
-
-static boolean GetActionPointerForOffset(int offset, void (**result)(struct mobj_s *, struct player_s *, struct pspdef_s *))
-{
-    int i;
-
-    // Special case.
-
-    if (offset == 0)
-    {
-        *result = NULL;
-        return true;
-    }
-
-    for (i=0; i<arrlen(action_pointers); ++i)
-    {
-        if (action_pointers[i].offsets[deh_hhe_version] == offset)
-        {
-            *result = action_pointers[i].func;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-// If an invalid action pointer is specified, the patch may be for a
-// different version from the version we are currently set to.  Try to
-// suggest a different version to use.
-
-static void SuggestOtherVersions(unsigned int offset)
-{
-    unsigned int i, v;
-
-    for (i=0; i<arrlen(action_pointers); ++i)
-    {
-        for (v=0; v<deh_hhe_num_versions; ++v)
-        {
-            if (action_pointers[i].offsets[v] == offset)
-            {
-                DEH_SuggestHereticVersion(v);
-            }
-        }
-    }
-}
-
-static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
-{
-    state_t *state;
-    char *variable_name, *value;
-    int ivalue;
-
-    if (tag == NULL)
-       return;
-
-    state = (state_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    // all values are integers
-
-    ivalue = atoi(value);
-
-    // Action pointer field is a special case:
-
-    if (!strcasecmp(variable_name, "Action pointer"))
-    {
-        void (*func)(struct mobj_s *, struct player_s *, struct pspdef_s *);
-
-        if (!GetActionPointerForOffset(ivalue, &func))
-        {
-            SuggestOtherVersions(ivalue);
-            DEH_Error(context, "Unknown action pointer: %i", ivalue);
-            return;
-        }
-
-        state->action = func;
-    }
-    else
-    {
-        // "Next frame" numbers need to undergo mapping.
-
-        if (!strcasecmp(variable_name, "Next frame"))
-        {
-            ivalue = DEH_MapHereticFrameNumber(ivalue);
-        }
-
-        DEH_SetMapping(context, &state_mapping, state, variable_name, ivalue);
-    }
-}
-
-static void DEH_FrameSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
-    }
-}
-
-deh_section_t deh_section_frame =
-{
-    "Frame",
-    DEH_FrameInit,
-    DEH_FrameStart,
-    DEH_FrameParseLine,
-    NULL,
-    DEH_FrameSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/heretic/deh_htext.c b/games/NXDoom/src/heretic/deh_htext.c
deleted file mode 100644
index 4f42697f3..000000000
--- a/games/NXDoom/src/heretic/deh_htext.c
+++ /dev/null
@@ -1,845 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses Text substitution sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-#include "dstrings.h"
-
-#include "z_zone.h"
-
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_htic.h"
-#include "deh_main.h"
-
-//
-// Ok, Greg, the action pointers thing was bad enough, but this really
-// takes the biscuit.  Why does HHE's text replacement address strings
-// by offset??!!  The dehacked way was much nicer, why change it?
-//
-
-typedef struct
-{
-    unsigned int offsets[deh_hhe_num_versions];
-    const char *string;
-} hhe_string_t;
-
-//     Offsets                 String
-//       v1.0   v1.2   v1.3
-
-static const hhe_string_t strings[] =
-{
-    { {   228,   228,   228 }, "PLAYPAL" },
-    { {  1240,  1252,  1252 }, "E1M1:  THE DOCKS" },
-    { {  1260,  1272,  1272 }, "E1M2:  THE DUNGEONS" },
-    { {  1280,  1292,  1292 }, "E1M3:  THE GATEHOUSE" },
-    { {  1304,  1316,  1316 }, "E1M4:  THE GUARD TOWER" },
-    { {  1328,  1340,  1340 }, "E1M5:  THE CITADEL" },
-    { {  1348,  1360,  1360 }, "E1M6:  THE CATHEDRAL" },
-    { {  1372,  1384,  1384 }, "E1M7:  THE CRYPTS" },
-    { {  1392,  1404,  1404 }, "E1M8:  HELL'S MAW" },
-    { {  1412,  1424,  1424 }, "E1M9:  THE GRAVEYARD" },
-    { {  1436,  1448,  1448 }, "E2M1:  THE CRATER" },
-    { {  1456,  1468,  1468 }, "E2M2:  THE LAVA PITS" },
-    { {  1480,  1492,  1492 }, "E2M3:  THE RIVER OF FIRE" },
-    { {  1508,  1520,  1520 }, "E2M4:  THE ICE GROTTO" },
-    { {  1532,  1544,  1544 }, "E2M5:  THE CATACOMBS" },
-    { {  1556,  1568,  1568 }, "E2M6:  THE LABYRINTH" },
-    { {  1580,  1592,  1592 }, "E2M7:  THE GREAT HALL" },
-    { {  1604,  1616,  1616 }, "E2M8:  THE PORTALS OF CHAOS" },
-    { {  1632,  1644,  1644 }, "E2M9:  THE GLACIER" },
-    { {  1652,  1664,  1664 }, "E3M1:  THE STOREHOUSE" },
-    { {  1676,  1688,  1688 }, "E3M2:  THE CESSPOOL" },
-    { {  1696,  1708,  1708 }, "E3M3:  THE CONFLUENCE" },
-    { {  1720,  1732,  1732 }, "E3M4:  THE AZURE FORTRESS" },
-    { {  1748,  1760,  1760 }, "E3M5:  THE OPHIDIAN LAIR" },
-    { {  1776,  1788,  1788 }, "E3M6:  THE HALLS OF FEAR" },
-    { {  1804,  1816,  1816 }, "E3M7:  THE CHASM" },
-    { {  1824,  1836,  1836 }, "E3M8:  D'SPARIL'S KEEP" },
-    { {  1848,  1860,  1860 }, "E3M9:  THE AQUIFER" },
-    { {     0,  1880,  1880 }, "E4M1:  CATAFALQUE" },
-    { {     0,  1900,  1900 }, "E4M2:  BLOCKHOUSE" },
-    { {     0,  1920,  1920 }, "E4M3:  AMBULATORY" },
-    { {     0,  1940,  1940 }, "E4M4:  SEPULCHER" },
-    { {     0,  1960,  1960 }, "E4M5:  GREAT STAIR" },
-    { {     0,  1980,  1980 }, "E4M6:  HALLS OF THE APOSTATE" },
-    { {     0,  2012,  2012 }, "E4M7:  RAMPARTS OF PERDITION" },
-    { {     0,  2044,  2044 }, "E4M8:  SHATTERED BRIDGE" },
-    { {     0,  2068,  2068 }, "E4M9:  MAUSOLEUM" },
-    { {     0,  2088,  2088 }, "E5M1:  OCHRE CLIFFS" },
-    { {     0,  2108,  2108 }, "E5M2:  RAPIDS" },
-    { {     0,  2124,  2124 }, "E5M3:  QUAY" },
-    { {     0,  2136,  2136 }, "E5M4:  COURTYARD" },
-    { {     0,  2156,  2156 }, "E5M5:  HYDRATYR" },
-    { {     0,  2172,  2172 }, "E5M6:  COLONNADE" },
-    { {     0,  2192,  2192 }, "E5M7:  FOETID MANSE" },
-    { {     0,  2212,  2212 }, "E5M8:  FIELD OF JUDGEMENT" },
-    { {     0,  2240,  2240 }, "E5M9:  SKEIN OF D'SPARIL" },
-    { {  1868,  2268,  2268 }, "AUTOPAGE" },
-    { {  1880,  2280,  2280 }, "FOLLOW MODE ON" },
-    { {  1896,  2296,  2296 }, "FOLLOW MODE OFF" },
-    { {  1924,  2324,  2324 }, "GREEN:  " },
-    { {  1936,  2336,  2336 }, "YELLOW:  " },
-    { {  1948,  2348,  2348 }, "RED:  " },
-    { {  1956,  2356,  2356 }, "BLUE:  " },
-    { {  1964,  2364,  2364 }, "FONTA_S" },
-    { {  1972,  2372,  2372 }, "-MESSAGE SENT-" },
-    { {  1988,  2388,  2388 }, "THERE ARE NO OTHER PLAYERS IN THE GAME!" },
-    { {  2028,  2428,  2428 }, "FONTA59" },
-    { {  2036,  2504,  2504 }, "PAUSED" },
-    { {  2072,  2540,  2540 }, "ADVISOR" },
-    { {  2080,  2548,  2548 }, "TITLE" },
-    { {  2088,  2556,  2556 }, "demo1" },
-    { {  2096,  2564,  2564 }, "CREDIT" },
-    { {  2104,  2572,  2572 }, "demo2" },
-    { {  2112,  2580,  2580 }, "ORDER" },
-    { {  2120,  2588,  2588 }, "demo3" },
-    { {  2304,  2696,  2696 }, "Exited from HERETIC.\n" },
-    { {  2412,  2800,  2800 }, "c:\\heretic.cd" },
-    { {  2528,  2916,  2916 }, "Playing demo %s.lmp.\n" },
-    { {  2592,  2980,  2980 }, "V_Init: allocate screens.\n" },
-    { {  2620,  3008,  3008 }, "M_LoadDefaults: Load system defaults.\n" },
-    { {  2660,  3048,  3048 }, "Z_Init: Init zone memory allocation daemon.\n" },
-    { {  2708,  3096,  3096 }, "W_Init: Init WADfiles.\n" },
-    { {  2732,  3120,  3120 }, "E2M1" },
-    { {     0,  3128,  3128 }, "EXTENDED" },
-    { {  2740,  3140,  3140 }, "LOADING" },
-    { {  2748,  3148,  3148 }, "DeathMatch..." },
-    { {  2764,  3164,  3164 }, "No Monsters..." },
-    { {  2780,  3180,  3180 }, "Respawning..." },
-    { {  2796,  3196,  3196 }, "Warp to Episode %d, Map %d, Skill %d " },
-    { {  2836,  3236,  3236 }, "MN_Init: Init menu system.\n" },
-    { {  2864,  3264,  3264 }, "R_Init: Init Heretic refresh daemon." },
-    { {  2904,  3304,  3304 }, "Loading graphics" },
-    { {  2924,  3324,  3324 }, "P_Init: Init Playloop state." },
-    { {  2956,  3356,  3356 }, "Init game engine." },
-    { {  2976,  3376,  3376 }, "I_Init: Setting up machine state.\n" },
-    { {  3012,  3412,  3412 }, "D_CheckNetGame: Checking network game status.\n" },
-    { {  3060,  3460,  3460 }, "Checking network game status." },
-    { {  3092,  3492,  3492 }, "SB_Init: Loading patches.\n" },
-    { {     0,  3752,  3752 }, "PLAYER 1 LEFT THE GAME" },
-    { {  3508,  3932,  3932 }, "Network game synchronization aborted." },
-    { {     0,  3972,  3972 }, "Different DOOM versions cannot play a net game!" },
-    { {  3908,  4132,  4132 }, "SKY1" },
-    { {  3916,  4140,  4140 }, "SKY2" },
-    { {  3924,  4148,  4148 }, "SKY3" },
-    { {  3736,  4196,  4196 }, "NET GAME" },
-    { {  3748,  4208,  4208 }, "SAVE GAME" },
-    { {  3760,  4220,  4220 }, "Only %i deathmatch spots, 4 required" },
-    { {  3800,  4260,  4260 }, "version %i" },
-    { {  3828,  4372,  4372 }, "c:\\heretic.cd\\hticsav%d.hsg" },
-    { {  3856,  4400,  4400 }, "hticsav%d.hsg" },
-    { {  3896,  4416,  4416 }, "GAME SAVED" },
-    { {  4016,  4456,  4456 }, E1TEXT },
-    { {  4536,  4976,  4976 }, E2TEXT },
-    { {  5068,  5508,  5508 }, E3TEXT },
-    { {     0,  6072,  6072 }, E4TEXT },
-    { {     0,  6780,  6780 }, E5TEXT },
-    { {  5632,  7468,  7468 }, "FLOOR25" },
-    { {  5640,  7476,  7476 }, "FLATHUH1" },
-    { {  5652,  7488,  7488 }, "FLTWAWA2" },
-    { {     0,  7500,  7500 }, "FLOOR28" },
-    { {     0,  7508,  7508 }, "FLOOR08" },
-    { {  5664,  7516,  7516 }, "FONTA_S" },
-    { {  5704,  7524,  7524 }, "PLAYPAL" },
-    { {  5672,  7532,  7532 }, "FINAL1" },
-    { {  5680,  7540,  7540 }, "FINAL2" },
-    { {  5688,  7548,  7548 }, "E2PAL" },
-    { {  5696,  7556,  7556 }, "E2END" },
-    { {  7884,  7564,  7564 }, "TITLE" },
-    { {  5712,  7572,  7572 }, "ORDER" },
-    { {     0,  7580,  7580 }, "CREDIT" },
-    { {  5720,  7588,  7588 }, "IMPX" },
-    { {  5728,  7596,  7596 }, "ACLO" },
-    { {  5736,  7604,  7604 }, "PTN1" },
-    { {  5744,  7612,  7612 }, "SHLD" },
-    { {  5752,  7620,  7620 }, "SHD2" },
-    { {  5760,  7628,  7628 }, "BAGH" },
-    { {  5768,  7636,  7636 }, "SPMP" },
-    { {  5776,  7644,  7644 }, "INVS" },
-    { {  5784,  7652,  7652 }, "PTN2" },
-    { {  5792,  7660,  7660 }, "SOAR" },
-    { {  5800,  7668,  7668 }, "INVU" },
-    { {  5808,  7676,  7676 }, "PWBK" },
-    { {  5816,  7684,  7684 }, "EGGC" },
-    { {  5824,  7692,  7692 }, "EGGM" },
-    { {  5832,  7700,  7700 }, "FX01" },
-    { {  5840,  7708,  7708 }, "SPHL" },
-    { {  5848,  7716,  7716 }, "TRCH" },
-    { {  5856,  7724,  7724 }, "FBMB" },
-    { {  5864,  7732,  7732 }, "XPL1" },
-    { {  5872,  7740,  7740 }, "ATLP" },
-    { {  5880,  7748,  7748 }, "PPOD" },
-    { {  5888,  7756,  7756 }, "AMG1" },
-    { {  5896,  7764,  7764 }, "SPSH" },
-    { {  5904,  7772,  7772 }, "LVAS" },
-    { {  5912,  7780,  7780 }, "SLDG" },
-    { {  5920,  7788,  7788 }, "SKH1" },
-    { {  5928,  7796,  7796 }, "SKH2" },
-    { {  5936,  7804,  7804 }, "SKH3" },
-    { {  5944,  7812,  7812 }, "SKH4" },
-    { {  5952,  7820,  7820 }, "CHDL" },
-    { {  5960,  7828,  7828 }, "SRTC" },
-    { {  5968,  7836,  7836 }, "SMPL" },
-    { {  5976,  7844,  7844 }, "STGS" },
-    { {  5984,  7852,  7852 }, "STGL" },
-    { {  5992,  7860,  7860 }, "STCS" },
-    { {  6000,  7868,  7868 }, "STCL" },
-    { {  6008,  7876,  7876 }, "KFR1" },
-    { {  6016,  7884,  7884 }, "BARL" },
-    { {  6024,  7892,  7892 }, "BRPL" },
-    { {  6032,  7900,  7900 }, "MOS1" },
-    { {  6040,  7908,  7908 }, "MOS2" },
-    { {  6048,  7916,  7916 }, "WTRH" },
-    { {  6056,  7924,  7924 }, "HCOR" },
-    { {  6064,  7932,  7932 }, "KGZ1" },
-    { {  6072,  7940,  7940 }, "KGZB" },
-    { {  6080,  7948,  7948 }, "KGZG" },
-    { {  6088,  7956,  7956 }, "KGZY" },
-    { {  6096,  7964,  7964 }, "VLCO" },
-    { {  6104,  7972,  7972 }, "VFBL" },
-    { {  6112,  7980,  7980 }, "VTFB" },
-    { {  6120,  7988,  7988 }, "SFFI" },
-    { {  6128,  7996,  7996 }, "TGLT" },
-    { {  6136,  8004,  8004 }, "TELE" },
-    { {  6144,  8012,  8012 }, "STFF" },
-    { {  6152,  8020,  8020 }, "PUF3" },
-    { {  6160,  8028,  8028 }, "PUF4" },
-    { {  6168,  8036,  8036 }, "BEAK" },
-    { {  6176,  8044,  8044 }, "WGNT" },
-    { {  6184,  8052,  8052 }, "GAUN" },
-    { {  6192,  8060,  8060 }, "PUF1" },
-    { {  6200,  8068,  8068 }, "WBLS" },
-    { {  6208,  8076,  8076 }, "BLSR" },
-    { {  6216,  8084,  8084 }, "FX18" },
-    { {  6224,  8092,  8092 }, "FX17" },
-    { {  6232,  8100,  8100 }, "WMCE" },
-    { {  6240,  8108,  8108 }, "MACE" },
-    { {  6248,  8116,  8116 }, "FX02" },
-    { {  6256,  8124,  8124 }, "WSKL" },
-    { {  6264,  8132,  8132 }, "HROD" },
-    { {  6272,  8140,  8140 }, "FX00" },
-    { {  6280,  8148,  8148 }, "FX20" },
-    { {  6288,  8156,  8156 }, "FX21" },
-    { {  6296,  8164,  8164 }, "FX22" },
-    { {  6304,  8172,  8172 }, "FX23" },
-    { {  6312,  8180,  8180 }, "GWND" },
-    { {  6320,  8188,  8188 }, "PUF2" },
-    { {  6328,  8196,  8196 }, "WPHX" },
-    { {  6336,  8204,  8204 }, "PHNX" },
-    { {  6344,  8212,  8212 }, "FX04" },
-    { {  6352,  8220,  8220 }, "FX08" },
-    { {  6360,  8228,  8228 }, "FX09" },
-    { {  6368,  8236,  8236 }, "WBOW" },
-    { {  6376,  8244,  8244 }, "CRBW" },
-    { {  6384,  8252,  8252 }, "FX03" },
-    { {  6392,  8260,  8260 }, "BLOD" },
-    { {  6400,  8268,  8268 }, "PLAY" },
-    { {  6408,  8276,  8276 }, "FDTH" },
-    { {  6416,  8284,  8284 }, "BSKL" },
-    { {  6424,  8292,  8292 }, "CHKN" },
-    { {  6432,  8300,  8300 }, "MUMM" },
-    { {  6440,  8308,  8308 }, "FX15" },
-    { {  6448,  8316,  8316 }, "BEAS" },
-    { {  6456,  8324,  8324 }, "FRB1" },
-    { {  6464,  8332,  8332 }, "SNKE" },
-    { {  6472,  8340,  8340 }, "SNFX" },
-    { {  6480,  8348,  8348 }, "HEAD" },
-    { {  6488,  8356,  8356 }, "FX05" },
-    { {  6496,  8364,  8364 }, "FX06" },
-    { {  6504,  8372,  8372 }, "FX07" },
-    { {  6512,  8380,  8380 }, "CLNK" },
-    { {  6520,  8388,  8388 }, "WZRD" },
-    { {  6528,  8396,  8396 }, "FX11" },
-    { {  6536,  8404,  8404 }, "FX10" },
-    { {  6544,  8412,  8412 }, "KNIG" },
-    { {  6552,  8420,  8420 }, "SPAX" },
-    { {  6560,  8428,  8428 }, "RAXE" },
-    { {  6568,  8436,  8436 }, "SRCR" },
-    { {  6576,  8444,  8444 }, "FX14" },
-    { {  6584,  8452,  8452 }, "SOR2" },
-    { {  6592,  8460,  8460 }, "SDTH" },
-    { {  6600,  8468,  8468 }, "FX16" },
-    { {  6608,  8476,  8476 }, "MNTR" },
-    { {  6616,  8484,  8484 }, "FX12" },
-    { {  6624,  8492,  8492 }, "FX13" },
-    { {  6632,  8500,  8500 }, "AKYY" },
-    { {  6640,  8508,  8508 }, "BKYY" },
-    { {  6648,  8516,  8516 }, "CKYY" },
-    { {  6656,  8524,  8524 }, "AMG2" },
-    { {  6664,  8532,  8532 }, "AMM1" },
-    { {  6672,  8540,  8540 }, "AMM2" },
-    { {  6680,  8548,  8548 }, "AMC1" },
-    { {  6688,  8556,  8556 }, "AMC2" },
-    { {  6696,  8564,  8564 }, "AMS1" },
-    { {  6704,  8572,  8572 }, "AMS2" },
-    { {  6712,  8580,  8580 }, "AMP1" },
-    { {  6720,  8588,  8588 }, "AMP2" },
-    { {  6728,  8596,  8596 }, "AMB1" },
-    { {  6736,  8604,  8604 }, "AMB2" },
-    { {  6744,  8612,  8612 }, "K" },
-    { {  6748,  8616,  8616 }, "I" },
-    { {  6752,  8620,  8620 }, "L" },
-    { {  6756,  8624,  8624 }, "E" },
-    { {  6760,  8628,  8628 }, "R" },
-    { {  6764,  8632,  8632 }, "S" },
-    { {  6768,  8636,  8636 }, "PLAYPAL" },
-    { {  6776,  8644,  8644 }, "MAPE1" },
-    { {  6784,  8652,  8652 }, "MAPE2" },
-    { {  6792,  8660,  8660 }, "MAPE3" },
-    { {  6800,  8668,  8668 }, "IN_X" },
-    { {  6808,  8676,  8676 }, "IN_YAH" },
-    { {  6816,  8684,  8684 }, "FONTB16" },
-    { {  6824,  8692,  8692 }, "FONTB_S" },
-    { {  6832,  8700,  8700 }, "FONTB13" },
-    { {  6840,  8708,  8708 }, "FONTB15" },
-    { {  6848,  8716,  8716 }, "FONTB05" },
-    { {  6856,  8724,  8724 }, "FACEA0" },
-    { {  6864,  8732,  8732 }, "FACEB0" },
-    { {  6940,  8808,  8808 }, "FLOOR16" },
-    { {  6948,  8816,  8816 }, "FINISHED" },
-    { {  6960,  8828,  8828 }, "NOW ENTERING:" },
-    { {  6976,  8844,  8844 }, "KILLS" },
-    { {  6984,  8852,  8852 }, "ITEMS" },
-    { {  6992,  8860,  8860 }, "SECRETS" },
-    { {  7000,  8868,  8868 }, "TIME" },
-    { {  7008,  8876,  8876 }, "BONUS" },
-    { {  7016,  8884,  8884 }, "SECRET" },
-    { {  7024,  8892,  8892 }, "TOTAL" },
-    { {  7032,  8900,  8900 }, "VICTIMS" },
-    { {  7040,  8908,  8908 }, ":" },
-    { {  7044,  8912,  8912 }, "NEW GAME" },
-    { {  7056,  8924,  8924 }, "OPTIONS" },
-    { {  7064,  8932,  8932 }, "GAME FILES" },
-    { {  7076,  8944,  8944 }, "INFO" },
-    { {  7084,  8952,  8952 }, "QUIT GAME" },
-    { {  7096,  8964,  8964 }, "CITY OF THE DAMNED" },
-    { {  7116,  8984,  8984 }, "HELL'S MAW" },
-    { {  7128,  8996,  8996 }, "THE DOME OF D'SPARIL" },
-    { {     0,  9020,  9020 }, "THE OSSUARY" },
-    { {     0,  9032,  9032 }, "THE STAGNANT DEMESNE" },
-    { {  7152,  9056,  9056 }, "LOAD GAME" },
-    { {  7164,  9068,  9068 }, "SAVE GAME" },
-    { {  7176,  9080,  9080 }, "THOU NEEDETH A WET-NURSE" },
-    { {  7204,  9108,  9108 }, "YELLOWBELLIES-R-US" },
-    { {  7224,  9128,  9128 }, "BRINGEST THEM ONETH" },
-    { {  7244,  9148,  9148 }, "THOU ART A SMITE-MEISTER" },
-    { {  7272,  9176,  9176 }, "BLACK PLAGUE POSSESSES THEE" },
-    { {  7300,  9204,  9204 }, "END GAME" },
-    { {  7312,  9216,  9216 }, "MESSAGES : " },
-    { {  7324,  9228,  9228 }, "MOUSE SENSITIVITY" },
-    { {  7344,  9248,  9248 }, "MORE..." },
-    { {  7352,  9256,  9256 }, "SCREEN SIZE" },
-    { {  7364,  9268,  9268 }, "SFX VOLUME" },
-    { {  7376,  9280,  9280 }, "MUSIC VOLUME" },
-    { {  7416,  9296,  9296 }, "ARE YOU SURE YOU WANT TO QUIT?" },
-    { {  7448,  9328,  9328 }, "ARE YOU SURE YOU WANT TO END THE GAME?" },
-    { {  7488,  9368,  9368 }, "DO YOU WANT TO QUICKSAVE THE GAME NAMED" },
-    { {  7528,  9408,  9408 }, "DO YOU WANT TO QUICKLOAD THE GAME NAMED" },
-    { {  7392,  9448,  9448 }, "M_SKL00" },
-    { {  7400,  9456,  9456 }, "FONTA_S" },
-    { {  7408,  9464,  9464 }, "FONTB_S" },
-    { {  7568,  9472,  9472 }, "?" },
-    { {  7572,  9476,  9476 }, "M_SLCTR1" },
-    { {  7584,  9488,  9488 }, "M_SLCTR2" },
-    { {  7596,  9500,  9500 }, "M_HTIC" },
-    { {  7604,  9508,  9508 }, "c:\\heretic.cd\\hticsav%d.hsg" },
-    { {  7632,  9536,  9536 }, "hticsav%d.hsg" },
-    { {  7652,  9556,  9556 }, "M_FSLOT" },
-    { {  7660,  9564,  9564 }, "ON" },
-    { {  7664,  9568,  9568 }, "OFF" },
-    { {     0,  9572,  9572 }, "YOU CAN'T START A NEW GAME IN NETPLAY!" },
-    { {     0,  9612,  9612 }, "YOU CAN'T LOAD A GAME IN NETPLAY!" },
-    { {  7668,  9648,  9648 }, "MESSAGES ON" },
-    { {  7680,  9660,  9660 }, "MESSAGES OFF" },
-    { {  7748,  9676,  9676 }, "ONLY AVAILABLE IN THE REGISTERED VERSION" },
-    { {  7792,  9720,  9720 }, "PLAYPAL" },
-    { {  7800,  9728,  9728 }, "QUICKSAVING...." },
-    { {  7816,  9744,  9744 }, "QUICKLOADING...." },
-    { {  7836,  9764,  9764 }, "CHOOSE A QUICKSAVE SLOT" },
-    { {  7860,  9788,  9788 }, "CHOOSE A QUICKLOAD SLOT" },
-    { {     0,  9812,  9812 }, "TITLE" },
-    { {  7892,  9820,  9820 }, "M_SLDLT" },
-    { {  7900,  9828,  9828 }, "M_SLDMD1" },
-    { {  7912,  9840,  9840 }, "M_SLDMD2" },
-    { {  7924,  9852,  9852 }, "M_SLDRT" },
-    { {  7932,  9860,  9860 }, "M_SLDKB" },
-    { {  9016, 10944, 10944 }, "SCREEN SHOT" },
-    { {  9028, 10956, 10956 }, "YOU NEED A BLUE KEY TO OPEN THIS DOOR" },
-    { {  9068, 10996, 10996 }, "YOU NEED A YELLOW KEY TO OPEN THIS DOOR" },
-    { {  9108, 11036, 11036 }, "YOU NEED A GREEN KEY TO OPEN THIS DOOR" },
-    { {  9244, 11172, 11172 }, "CRYSTAL VIAL" },
-    { {  9260, 11188, 11188 }, "SILVER SHIELD" },
-    { {  9276, 11204, 11204 }, "ENCHANTED SHIELD" },
-    { {  9296, 11224, 11224 }, "BAG OF HOLDING" },
-    { {  9312, 11240, 11240 }, "MAP SCROLL" },
-    { {  9324, 11252, 11252 }, "BLUE KEY" },
-    { {  9336, 11264, 11264 }, "YELLOW KEY" },
-    { {  9348, 11276, 11276 }, "GREEN KEY" },
-    { {  9360, 11288, 11288 }, "QUARTZ FLASK" },
-    { {  9376, 11304, 11304 }, "WINGS OF WRATH" },
-    { {  9392, 11320, 11320 }, "RING OF INVINCIBILITY" },
-    { {  9416, 11344, 11344 }, "TOME OF POWER" },
-    { {  9432, 11360, 11360 }, "SHADOWSPHERE" },
-    { {  9448, 11376, 11376 }, "MORPH OVUM" },
-    { {  9460, 11388, 11388 }, "MYSTIC URN" },
-    { {  9472, 11400, 11400 }, "TORCH" },
-    { {  9480, 11408, 11408 }, "TIME BOMB OF THE ANCIENTS" },
-    { {  9508, 11436, 11436 }, "CHAOS DEVICE" },
-    { {  9524, 11452, 11452 }, "WAND CRYSTAL" },
-    { {  9540, 11468, 11468 }, "CRYSTAL GEODE" },
-    { {  9556, 11484, 11484 }, "MACE SPHERES" },
-    { {  9572, 11500, 11500 }, "PILE OF MACE SPHERES" },
-    { {  9596, 11524, 11524 }, "ETHEREAL ARROWS" },
-    { {  9612, 11540, 11540 }, "QUIVER OF ETHEREAL ARROWS" },
-    { {  9640, 11568, 11568 }, "CLAW ORB" },
-    { {  9652, 11580, 11580 }, "ENERGY ORB" },
-    { {  9664, 11592, 11592 }, "LESSER RUNES" },
-    { {  9680, 11608, 11608 }, "GREATER RUNES" },
-    { {  9696, 11624, 11624 }, "FLAME ORB" },
-    { {  9708, 11636, 11636 }, "INFERNO ORB" },
-    { {  9720, 11648, 11648 }, "FIREMACE" },
-    { {  9732, 11660, 11660 }, "ETHEREAL CROSSBOW" },
-    { {  9752, 11680, 11680 }, "DRAGON CLAW" },
-    { {  9764, 11692, 11692 }, "HELLSTAFF" },
-    { {  9776, 11704, 11704 }, "PHOENIX ROD" },
-    { {  9788, 11716, 11716 }, "GAUNTLETS OF THE NECROMANCER" },
-    { { 10088, 12016, 12016 }, "FLTWAWA1" },
-    { { 10100, 12028, 12028 }, "FLTFLWW1" },
-    { { 10112, 12040, 12040 }, "FLTLAVA1" },
-    { { 10124, 12052, 12052 }, "FLATHUH1" },
-    { { 10136, 12064, 12064 }, "FLTSLUD1" },
-    { { 10148, 12076, 12076 }, "END" },
-    { { 10236, 12164, 12164 }, "texture2" },
-    { { 10444, 12372, 12372 }, "PLAYPAL" },
-    { { 10596, 12488, 12488 }, "PNAMES" },
-    { { 10604, 12496, 12496 }, "TEXTURE1" },
-    { { 10616, 12508, 12508 }, "TEXTURE2" },
-    { { 10628, 12520, 12520 }, "S_END" },
-    { { 10636, 12528, 12528 }, "S_START" },
-    { { 10728, 12620, 12620 }, "F_START" },
-    { { 10736, 12628, 12628 }, "F_END" },
-    { { 10744, 12636, 12636 }, "COLORMAP" },
-    { { 10756, 12648, 12648 }, "\nR_InitTextures " },
-    { { 10776, 12668, 12668 }, "R_InitFlats\n" },
-    { { 10792, 12684, 12684 }, "R_InitSpriteLumps " },
-    { { 10948, 12772, 12772 }, "TINTTAB" },
-    { { 10984, 12780, 12780 }, "FLOOR04" },
-    { { 10992, 12788, 12788 }, "FLAT513" },
-    { { 11000, 12796, 12796 }, "bordt" },
-    { { 11008, 12804, 12804 }, "bordb" },
-    { { 11016, 12812, 12812 }, "bordl" },
-    { { 11024, 12820, 12820 }, "bordr" },
-    { { 11032, 12828, 12828 }, "bordtl" },
-    { { 11040, 12836, 12836 }, "bordtr" },
-    { { 11048, 12844, 12844 }, "bordbr" },
-    { { 11056, 12852, 12852 }, "bordbl" },
-    { { 11064, 12860, 12860 }, "R_InitData " },
-    { { 11076, 12872, 12872 }, "R_InitPointToAngle\n" },
-    { { 11096, 12892, 12892 }, "R_InitTables " },
-    { { 11112, 12908, 12908 }, "R_InitPlanes\n" },
-    { { 11128, 12924, 12924 }, "R_InitLightTables " },
-    { { 11148, 12944, 12944 }, "R_InitSkyMap\n" },
-    { { 11164, 12960, 12960 }, "F_SKY1" },
-    { { 12120, 13484, 13484 }, "LTFACE" },
-    { { 12128, 13492, 13492 }, "RTFACE" },
-    { { 12136, 13500, 13500 }, "BARBACK" },
-    { { 12144, 13508, 13508 }, "INVBAR" },
-    { { 12152, 13516, 13516 }, "CHAIN" },
-    { { 12160, 13524, 13524 }, "STATBAR" },
-    { { 12168, 13532, 13532 }, "LIFEBAR" },
-    { { 12176, 13540, 13540 }, "LIFEGEM2" },
-    { { 12188, 13552, 13552 }, "LIFEGEM0" },
-    { { 12200, 13564, 13564 }, "LTFCTOP" },
-    { { 12208, 13572, 13572 }, "RTFCTOP" },
-    { { 12224, 13580, 13580 }, "SELECTBOX" },
-    { { 12236, 13592, 13592 }, "INVGEML1" },
-    { { 12248, 13604, 13604 }, "INVGEML2" },
-    { { 12260, 13616, 13616 }, "INVGEMR1" },
-    { { 12272, 13628, 13628 }, "INVGEMR2" },
-    { { 12284, 13640, 13640 }, "BLACKSQ" },
-    { { 12292, 13648, 13648 }, "ARMCLEAR" },
-    { { 12304, 13660, 13660 }, "CHAINBACK" },
-    { { 12316, 13672, 13672 }, "IN0" },
-    { { 12320, 13676, 13676 }, "NEGNUM" },
-    { { 12328, 13684, 13684 }, "FONTB16" },
-    { { 12336, 13692, 13692 }, "SMALLIN0" },
-    { { 12348, 13704, 13704 }, "PLAYPAL" },
-    { { 12356, 13712, 13712 }, "SPINBK0" },
-    { { 12364, 13720, 13720 }, "SPFLY0" },
-    { { 12372, 13728, 13728 }, "LAME" },
-    { { 12380, 13736, 13736 }, "*** SOUND DEBUG INFO ***" },
-    { { 12408, 13764, 13764 }, "NAME" },
-    { { 12416, 13772, 13772 }, "MO.T" },
-    { { 12424, 13780, 13780 }, "MO.X" },
-    { { 12432, 13788, 13788 }, "MO.Y" },
-    { { 12440, 13796, 13796 }, "ID" },
-    { { 12444, 13800, 13800 }, "PRI" },
-    { { 12448, 13804, 13804 }, "DIST" },
-    { { 12456, 13812, 13812 }, "------" },
-    { { 12464, 13820, 13820 }, "%s" },
-    { { 12468, 13824, 13824 }, "%d" },
-    { { 12472, 13828, 13828 }, "GOD1" },
-    { { 12480, 13836, 13836 }, "GOD2" },
-    { { 12488, 13844, 13844 }, "useartia" },
-    { { 12500, 13856, 13856 }, "ykeyicon" },
-    { { 12512, 13868, 13868 }, "gkeyicon" },
-    { { 12524, 13880, 13880 }, "bkeyicon" },
-    { { 12216, 13892, 13892 }, "ARTIBOX" },
-    { { 12536, 13900, 13900 }, "GOD MODE ON" },
-    { { 12548, 13912, 13912 }, "GOD MODE OFF" },
-    { { 12564, 13928, 13928 }, "NO CLIPPING ON" },
-    { { 12580, 13944, 13944 }, "NO CLIPPING OFF" },
-    { { 12596, 13960, 13960 }, "ALL WEAPONS" },
-    { { 12608, 13972, 13972 }, "POWER OFF" },
-    { { 12620, 13984, 13984 }, "POWER ON" },
-    { { 12632, 13996, 13996 }, "FULL HEALTH" },
-    { { 12644, 14008, 14008 }, "ALL KEYS" },
-    { { 12656, 14020, 14020 }, "SOUND DEBUG ON" },
-    { { 12672, 14036, 14036 }, "SOUND DEBUG OFF" },
-    { { 12688, 14052, 14052 }, "TICKER ON" },
-    { { 12700, 14064, 14064 }, "TICKER OFF" },
-    { { 12712, 14076, 14076 }, "CHOOSE AN ARTIFACT ( A - J )" },
-    { { 12744, 14108, 14108 }, "HOW MANY ( 1 - 9 )" },
-    { { 12764, 14128, 14128 }, "YOU GOT IT" },
-    { { 12776, 14140, 14140 }, "BAD INPUT" },
-    { { 12788, 14152, 14152 }, "LEVEL WARP" },
-    { { 12800, 14164, 14164 }, "CHICKEN OFF" },
-    { { 12812, 14176, 14176 }, "CHICKEN ON" },
-    { { 12824, 14188, 14188 }, "MASSACRE" },
-    { { 12836, 14200, 14200 }, "CHEATER - YOU DON'T DESERVE WEAPONS" },
-    { { 12872, 14236, 14236 }, "TRYING TO CHEAT, EH?  NOW YOU DIE!" },
-};
-
-// String offsets that are valid but we don't support.
-
-static const int unsupported_strings_1_0[] =
-{
-        0,     4,    64,   104,   160,   200,   220,   236,
-      244,   252,   272,   288,   296,   316,   332,   372,
-      436,   500,   504,   536,   544,   560,   576,   584,
-      592,   612,   640,   664,   708,   712,   744,   764,
-      808,   820,   828,   840,   876,   884,   908,   952,
-      992,  1028,  1036,  1048,  1088,  1128,  1160,  1192,
-     1212,  1912,  2044,  2056,  2068,  2128,  2140,  2168,
-     2184,  2196,  2212,  2228,  2240,  2252,  2260,  2264,
-     2284,  2292,  2296,  2300,  2328,  2340,  2352,  2364,
-     2372,  2384,  2388,  2404,  2428,  2436,  2444,  2464,
-     2496,  2508,  2520,  2552,  2564,  2572,  2584,  3120,
-     3128,  3140,  3184,  3220,  3248,  3252,  3256,  3280,
-     3304,  3320,  3352,  3380,  3400,  3432,  3464,  3548,
-     3600,  3624,  3664,  3696,  3812,  3872,  3932,  3940,
-     3976,  3996,  6872,  6896,  7648,  7696,  7940,  7964,
-     7968,  7992,  8020,  8028,  8052,  8056,  8076,  8088,
-     8104,  8116,  8128,  8136,  8148,  8164,  8180,  8192,
-     8204,  8220,  8232,  8248,  8264,  8276,  8292,  8308,
-     8320,  8328,  8340,  8352,  8364,  8376,  8392,  8408,
-     8424,  8436,  8448,  8460,  8472,  8488,  8504,  8520,
-     8536,  8548,  8560,  8572,  8584,  8596,  8608,  8612,
-     8624,  8648,  8660,  8668,  8680,  8708,  8720,  8728,
-     8740,  8752,  8764,  8788,  8800,  8812,  8824,  8848,
-     8860,  8864,  8868,  8876,  8888,  8896,  8916,  8944,
-     8948,  8960,  8964,  8968,  8980,  9148,  9172,  9212,
-     9216,  9220,  9820,  9860,  9892,  9940,  9972, 10012,
-    10036, 10040, 10052, 10080, 10152, 10192, 10248, 10284,
-    10320, 10360, 10392, 10452, 10488, 10508, 10556, 10644,
-    10684, 10812, 10844, 10880, 10912, 10956, 11172, 11200,
-    11232, 11272, 11312, 11348, 11380, 11404, 11436, 11492,
-    11548, 11616, 11684, 11748, 11792, 11840, 11896, 11936,
-    11980, 12028, 12072, 12908, 12924, 12956, 12960, 12968,
-    12976, 13020, 13048, 13076, 13104, 13136, 13168, 13196,
-    13240, 13272, 13292, 13296, 13308, 13312, 13320, 13324,
-    13364, 13408, 13460, 13492, 13516, 13560, 13612, 13664,
-    13700, 13744, 13796, 13848, 13884, 13940, 13996, 14040,
-    14084, 14140, 14148, 14156, 14164, 14184, 14192, 14204,
-    14208, 14212, 14256, 14272, 14284, 14296, 14300, 14312,
-    14320, 14324, 14348, 14356, 14360, 14372, 14380, 14392,
-    14432, 14440, 14444, 14472, 14496, 14516, 14536, 14548,
-    14560, 14572, 14580, 14588, 14596, 14604, 14612, 14620,
-    14636, 14660, 14704, 14740, 14748, 14756, 14760, 14768,
-       -1,
-};
-
-static const int unsupported_strings_1_2[] =
-{
-        0,     4,    64,   104,   160,   200,   220,   236,
-      244,   252,   272,   288,   296,   316,   332,   372,
-      436,   500,   504,   536,   544,   560,   576,   584,
-      592,   612,   640,   664,   708,   712,   744,   756,
-      776,   820,   832,   840,   852,   888,   896,   920,
-      964,  1004,  1040,  1048,  1060,  1100,  1140,  1172,
-     1204,  1224,  2312,  2436,  2448,  2464,  2480,  2492,
-     2512,  2524,  2536,  2596,  2608,  2636,  2652,  2656,
-     2676,  2684,  2688,  2720,  2732,  2744,  2752,  2764,
-     2772,  2776,  2792,  2816,  2824,  2832,  2852,  2884,
-     2896,  2908,  2940,  2952,  2960,  2972,  3520,  3528,
-     3540,  3584,  3620,  3648,  3652,  3656,  3680,  3704,
-     3720,  3776,  3804,  3824,  3856,  3888,  4020,  4044,
-     4084,  4116,  4156,  4272,  4288,  4296,  4332,  4352,
-     4428,  4432,  8740,  8764,  9552,  9868,  9888,  9900,
-     9916,  9928,  9940,  9948,  9960,  9976,  9992, 10004,
-    10016, 10032, 10044, 10060, 10076, 10088, 10104, 10120,
-    10132, 10140, 10152, 10164, 10176, 10188, 10204, 10220,
-    10236, 10248, 10260, 10272, 10284, 10300, 10316, 10332,
-    10348, 10360, 10372, 10384, 10396, 10408, 10420, 10424,
-    10436, 10460, 10472, 10480, 10492, 10520, 10532, 10540,
-    10552, 10564, 10576, 10600, 10612, 10624, 10636, 10660,
-    10672, 10676, 10700, 10704, 10728, 10756, 10764, 10788,
-    10792, 10796, 10804, 10816, 10824, 10844, 10872, 10876,
-    10888, 10892, 10896, 10908, 11076, 11100, 11140, 11144,
-    11148, 11748, 11788, 11820, 11868, 11900, 11940, 11964,
-    11968, 11980, 12008, 12080, 12120, 12176, 12212, 12248,
-    12288, 12320, 12380, 12400, 12448, 12536, 12576, 12704,
-    12736, 12968, 13000, 13024, 13080, 13136, 13204, 13272,
-    13336, 13380, 13428, 14272, 14288, 14320, 14324, 14332,
-    14340, 14384, 14412, 14440, 14468, 14500, 14532, 14560,
-    14604, 14636, 14656, 14696, 14740, 14792, 14824, 14848,
-    14892, 14944, 14996, 15032, 15076, 15128, 15180, 15216,
-    15272, 15328, 15372, 15416, 15472, 15480, 15488, 15496,
-    15516, 15524, 15536, 15540, 15544, 15588, 15604, 15616,
-    15628, 15632, 15644, 15652, 15656, 15680, 15688, 15692,
-    15704, 15712, 15724, 15764, 15772, 15776, 15804, 15828,
-    15848, 15868, 15880, 15892, 15904, 15912, 15920, 15928,
-    15936,    -1,
-};
-
-static const int unsupported_strings_1_3[] =
-{
-        0,     4,    64,   104,   160,   200,   220,   236,
-      244,   252,   272,   288,   296,   316,   332,   372,
-      436,   500,   504,   536,   544,   560,   576,   584,
-      592,   612,   640,   664,   708,   712,   744,   756,
-      776,   820,   832,   840,   852,   888,   896,   920,
-      964,  1004,  1040,  1048,  1060,  1100,  1140,  1172,
-     1204,  1224,  2312,  2436,  2448,  2464,  2480,  2492,
-     2512,  2524,  2536,  2596,  2608,  2636,  2652,  2656,
-     2676,  2684,  2688,  2720,  2732,  2744,  2752,  2764,
-     2772,  2776,  2792,  2816,  2824,  2832,  2852,  2884,
-     2896,  2908,  2940,  2952,  2960,  2972,  3520,  3528,
-     3540,  3584,  3620,  3648,  3652,  3656,  3680,  3704,
-     3720,  3776,  3804,  3824,  3856,  3888,  4020,  4044,
-     4084,  4116,  4156,  4272,  4288,  4296,  4332,  4352,
-     4428,  4432,  8740,  8764,  9552,  9868,  9888,  9900,
-     9916,  9928,  9940,  9948,  9960,  9976,  9992, 10004,
-    10016, 10032, 10044, 10060, 10076, 10088, 10104, 10120,
-    10132, 10140, 10152, 10164, 10176, 10188, 10204, 10220,
-    10236, 10248, 10260, 10272, 10284, 10300, 10316, 10332,
-    10348, 10360, 10372, 10384, 10396, 10408, 10420, 10424,
-    10436, 10460, 10472, 10480, 10492, 10520, 10532, 10540,
-    10552, 10564, 10576, 10600, 10612, 10624, 10636, 10660,
-    10672, 10676, 10700, 10704, 10728, 10756, 10764, 10788,
-    10792, 10796, 10804, 10816, 10824, 10844, 10872, 10876,
-    10888, 10892, 10896, 10908, 11076, 11100, 11140, 11144,
-    11148, 11748, 11788, 11820, 11868, 11900, 11940, 11964,
-    11968, 11980, 12008, 12080, 12120, 12176, 12212, 12248,
-    12288, 12320, 12380, 12400, 12448, 12536, 12576, 12704,
-    12736, 12968, 13000, 13024, 13080, 13136, 13204, 13272,
-    13336, 13380, 13428, 14272, 14288, 14320, 14324, 14332,
-    14340, 14384, 14412, 14440, 14468, 14500, 14532, 14560,
-    14604, 14636, 14656, 14696, 14740, 14792, 14824, 14848,
-    14892, 14944, 14996, 15032, 15076, 15128, 15180, 15216,
-    15272, 15328, 15372, 15416, 15472, 15480, 15488, 15496,
-    15516, 15524, 15536, 15540, 15544, 15588, 15604, 15616,
-    15628, 15632, 15644, 15652, 15656, 15680, 15688, 15692,
-    15704, 15712, 15724, 15764, 15772, 15776, 15804, 15828,
-    15848, 15868, 15880, 15892, 15904, 15912, 15920, 15928,
-    15936,    -1,
-};
-
-static const int *unsupported_strings[] =
-{
-    unsupported_strings_1_0,
-    unsupported_strings_1_2,
-    unsupported_strings_1_3,
-};
-
-static boolean StringIsUnsupported(unsigned int offset)
-{
-    const int *string_list;
-    int i;
-
-    string_list = unsupported_strings[deh_hhe_version];
-
-    for (i=0; string_list[i] >= 0; ++i)
-    {
-        if ((unsigned int) string_list[i] == offset)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static boolean GetStringByOffset(unsigned int offset, const char **result)
-{
-    int i;
-
-    for (i=0; i<arrlen(strings); ++i)
-    {
-        if (strings[i].offsets[deh_hhe_version] == offset)
-        {
-            *result = strings[i].string;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-// Given a string length, find the maximum length of a 
-// string that can replace it.
-
-static int MaxStringLength(int len)
-{
-    // Enough bytes for the string and the NUL terminator
-
-    len += 1;
-
-    // All strings in doom.exe are on 4-byte boundaries, so we may be able
-    // to support a slightly longer string.
-    // Extend up to the next 4-byte boundary
-
-    len += (4 - (len % 4)) % 4;
-
-    // Less one for the NUL terminator.
-
-    return len - 1;
-}
-
-// If a string offset does not match any string, it may be because
-// we are running in the wrong version mode, and the patch was generated
-// for a different Heretic version.  Search the lookup tables to find
-// versiosn that match.
-
-static void SuggestOtherVersions(unsigned int offset)
-{
-    const int *string_list;
-    unsigned int i;
-    unsigned int v;
-
-    // Check main string table.
-
-    for (i=0; i<arrlen(strings); ++i)
-    {
-        for (v=0; v<deh_hhe_num_versions; ++v)
-        {
-            if (strings[i].offsets[v] == offset)
-            {
-                DEH_SuggestHereticVersion(v);
-            }
-        }
-    }
-
-    // Check unsupported string tables.
-
-    for (v=0; v<deh_hhe_num_versions; ++v)
-    {
-        string_list = unsupported_strings[v];
-
-        for (i=0; string_list[i] >= 0; ++i)
-        {
-            if (string_list[i] == offset)
-            {
-                DEH_SuggestHereticVersion(v);
-            }
-        }
-    }
-}
-
-static void *DEH_TextStart(deh_context_t *context, char *line)
-{
-    char *repl_text;
-    const char *orig_text;
-    int orig_offset, repl_len;
-    int i;
-
-    if (sscanf(line, "Text %i %i", &orig_offset, &repl_len) != 2)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    repl_text = malloc(repl_len + 1);
-
-    // read in the "to" text
-
-    for (i=0; i<repl_len; ++i)
-    {
-        int c;
-
-        c = DEH_GetChar(context);
-
-        repl_text[i] = c;
-    }
-    repl_text[repl_len] = '\0';
-
-    // We don't support all strings, but at least recognise them:
-
-    if (StringIsUnsupported(orig_offset))
-    {
-        DEH_Warning(context, "Unsupported string replacement: %i", orig_offset);
-    }
-
-    // Find the string to replace:
-
-    else if (!GetStringByOffset(orig_offset, &orig_text))
-    {
-        SuggestOtherVersions(orig_offset);
-        DEH_Error(context, "Unknown string offset: %i", orig_offset);
-    }
-
-    // Only allow string replacements that are possible in Vanilla Doom.  
-    // Chocolate Doom is unforgiving!
-
-    else if (!deh_allow_long_strings
-          && repl_len > MaxStringLength(strlen(orig_text)))
-    {
-        DEH_Error(context, "Replacement string is longer than the maximum "
-                           "possible in heretic.exe");
-    }
-    else
-    {
-        // Success.
-
-        DEH_AddStringReplacement(orig_text, repl_text);
-    }
-
-    // We must always free the replacement text.
-    free(repl_text);
-
-    return NULL;
-}
-
-static void DEH_TextParseLine(deh_context_t *context, char *line, void *tag)
-{
-    // not used
-}
-
-deh_section_t deh_section_heretic_text =
-{
-    "Text",
-    NULL,
-    DEH_TextStart,
-    DEH_TextParseLine,
-    NULL,
-    NULL,
-};
-
diff --git a/games/NXDoom/src/heretic/deh_htic.c b/games/NXDoom/src/heretic/deh_htic.c
deleted file mode 100644
index 94fb935ce..000000000
--- a/games/NXDoom/src/heretic/deh_htic.c
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Top-level dehacked definitions for Heretic dehacked (HHE).
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_htic.h"
-#include "info.h"
-#include "m_argv.h"
-
-const char *deh_signatures[] =
-{
-    "Patch File for HHE v1.0",
-    "Patch File for HHE v1.1",
-    NULL
-};
-
-static const char *hhe_versions[] =
-{
-    "1.0", "1.2", "1.3"
-};
-
-// Version number for patches.
-
-deh_hhe_version_t deh_hhe_version = deh_hhe_1_0;
-
-
-//
-// List of section types:
-//
-
-deh_section_t *deh_section_types[] =
-{
-    &deh_section_ammo,
-    &deh_section_frame,
-//    &deh_section_pointer, TODO
-    &deh_section_sound,
-    &deh_section_heretic_text,
-    &deh_section_thing,
-    &deh_section_weapon,
-    NULL
-};
-
-static void SetHHEVersionByName(const char *name)
-{
-    int i;
-
-    for (i=0; i<arrlen(hhe_versions); ++i)
-    {
-        if (!strcmp(hhe_versions[i], name))
-        {
-            deh_hhe_version = i;
-            return;
-        }
-    }
-
-    fprintf(stderr, "Unknown Heretic version: %s\n", name);
-    fprintf(stderr, "Valid versions:\n");
-
-    for (i=0; i<arrlen(hhe_versions); ++i)
-    {
-        fprintf(stderr, "\t%s\n", hhe_versions[i]);
-    }
-}
-
-// Initialize Heretic(HHE)-specific dehacked bits.
-
-void DEH_HereticInit(void)
-{
-    int i;
-
-    //!
-    // @arg <version>
-    // @category mod
-    //
-    // Select the Heretic version number that was used to generate the
-    // HHE patch to be loaded.  Patches for each of the Vanilla
-    // Heretic versions (1.0, 1.2, 1.3) can be loaded, but the correct
-    // version number must be specified.
-
-    i = M_CheckParm("-hhever");
-
-    if (i > 0)
-    {
-        SetHHEVersionByName(myargv[i + 1]);
-    }
-
-    // For v1.0 patches, we must apply a slight change to the states[]
-    // table.  The table was changed between 1.0 and 1.3 to add two extra
-    // frames to the player "burning death" animation.
-    //
-    // If we are using a v1.0 patch, we must change the table to cut
-    // these out again.
-
-    if (deh_hhe_version < deh_hhe_1_2)
-    {
-        states[S_PLAY_FDTH18].nextstate = S_NULL;
-    }
-}
-
-int DEH_MapHereticThingType(int type)
-{
-    // Heretic 1.0 had an extra entry in the mobjinfo table that was removed
-    // in later versions. This has been added back into the table for
-    // compatibility. However, it also means that if we're loading a patch
-    // for a later version, we need to translate to the index used internally.
-
-    if (deh_hhe_version > deh_hhe_1_0)
-    {
-        if (type >= MT_PHOENIXFX_REMOVED)
-        {
-            ++type;
-        }
-    }
-
-    return type;
-}
-
-int DEH_MapHereticFrameNumber(int frame)
-{
-    if (deh_hhe_version < deh_hhe_1_2)
-    {
-        // Between Heretic 1.0 and 1.2, two new frames
-        // were added to the "states" table, to extend the "flame death"
-        // animation displayed when the player is killed by fire.  Therefore,
-        // we must map Heretic 1.0 frame numbers to corresponding indexes
-        // for our state table.
-
-        if (frame >= S_PLAY_FDTH19)
-        {
-            frame = (frame - S_PLAY_FDTH19) + S_BLOODYSKULL1;
-        }
-    }
-    else
-    {
-        // After Heretic 1.2, three unused frames were removed from the
-        // states table, unused phoenix rod frames.  Our state table includes
-        // these missing states for backwards compatibility.  We must therefore
-        // adjust frame numbers for v1.2/v1.3 to corresponding indexes for
-        // our state table.
-
-        if (frame >= S_PHOENIXFXIX_1)
-        {
-            frame = (frame - S_PHOENIXFXIX_1) + S_PHOENIXPUFF1;
-        }
-    }
-
-    return frame;
-}
-
-void DEH_SuggestHereticVersion(deh_hhe_version_t version)
-{
-    fprintf(stderr,
-    "\n"
-    "This patch may be for version %s. You are currently running in\n"
-    "Heretic %s mode. For %s mode, add this to your command line:\n"
-    "\n"
-    "\t-hhever %s\n"
-    "\n",
-    hhe_versions[version],
-    hhe_versions[deh_hhe_version],
-    hhe_versions[version],
-    hhe_versions[version]);
-}
-
diff --git a/games/NXDoom/src/heretic/deh_htic.h b/games/NXDoom/src/heretic/deh_htic.h
deleted file mode 100644
index 978d93815..000000000
--- a/games/NXDoom/src/heretic/deh_htic.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Common header for Heretic dehacked (HHE) support.
-//
-
-#ifndef DEH_HTIC_H
-#define DEH_HTIC_H
-
-#include "info.h"
-
-// HHE executable version.  Loading HHE patches is (unfortunately)
-// dependent on the version of the Heretic executable used to make them.
-
-typedef enum
-{
-    deh_hhe_1_0,
-    deh_hhe_1_2,
-    deh_hhe_1_3,
-    deh_hhe_num_versions
-} deh_hhe_version_t;
-
-// HHE doesn't know about the last two states in the state table, so
-// these are considered invalid.
-
-#define DEH_HERETIC_NUMSTATES (NUMSTATES - 2)
-
-// It also doesn't know about the last two things in the mobjinfo table
-// (which correspond to the states above)
-
-#define DEH_HERETIC_NUMMOBJTYPES (NUMMOBJTYPES - 2)
-
-void DEH_HereticInit(void);
-int DEH_MapHereticThingType(int type);
-int DEH_MapHereticFrameNumber(int frame);
-void DEH_SuggestHereticVersion(deh_hhe_version_t version);
-
-extern deh_hhe_version_t deh_hhe_version;
-
-// deh_htext.c:
-extern deh_section_t deh_section_heretic_text;
-
-
-#endif /* #ifndef DEH_HTIC_H */
-
diff --git a/games/NXDoom/src/heretic/deh_sound.c b/games/NXDoom/src/heretic/deh_sound.c
deleted file mode 100644
index c889cd663..000000000
--- a/games/NXDoom/src/heretic/deh_sound.c
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Sound" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "doomtype.h"
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-
-#include "doomdef.h"
-#include "i_sound.h"
-
-#include "sounds.h"
-
-DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t)
-    DEH_MAPPING_STRING("Name", name)
-    DEH_UNSUPPORTED_MAPPING("Special")
-    DEH_MAPPING("Value", priority)
-    DEH_MAPPING("Unknown 1", usefulness)
-    DEH_UNSUPPORTED_MAPPING("Unknown 2")
-    DEH_UNSUPPORTED_MAPPING("Unknown 3")
-    DEH_MAPPING("One/Two", numchannels)
-DEH_END_MAPPING
-
-static void *DEH_SoundStart(deh_context_t *context, char *line)
-{
-    int sound_number = 0;
-    
-    if (sscanf(line, "Sound %i", &sound_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (sound_number < 0 || sound_number >= NUMSFX)
-    {
-        DEH_Warning(context, "Invalid sound number: %i", sound_number);
-        return NULL;
-    }
-
-    if (sound_number >= DEH_VANILLA_NUMSFX)
-    {
-        DEH_Warning(context, "Attempt to modify SFX %i.  This will cause "
-                             "problems in Vanilla dehacked.", sound_number); 
-    }
-
-    return &S_sfx[sound_number];
-}
-
-static void DEH_SoundParseLine(deh_context_t *context, char *line, void *tag)
-{
-    sfxinfo_t *sfx;
-    char *variable_name, *value;
-
-    if (tag == NULL)
-       return;
-
-    sfx = (sfxinfo_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    // Set the field value:
-
-    if (!strcasecmp(variable_name, "Name"))
-    {
-        DEH_SetStringMapping(context, &sound_mapping, sfx,
-                             variable_name, value);
-    }
-    else
-    {
-        DEH_SetMapping(context, &sound_mapping, sfx,
-                       variable_name, atoi(value));
-    }
-}
-
-deh_section_t deh_section_sound =
-{
-    "Sound",
-    NULL,
-    DEH_SoundStart,
-    DEH_SoundParseLine,
-    NULL,
-    NULL,
-};
-
diff --git a/games/NXDoom/src/heretic/deh_thing.c b/games/NXDoom/src/heretic/deh_thing.c
deleted file mode 100644
index e9984fbde..000000000
--- a/games/NXDoom/src/heretic/deh_thing.c
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Thing" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "doomtype.h"
-#include "m_misc.h"
-
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-#include "deh_htic.h"
-
-#include "info.h"
-
-DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
-  DEH_MAPPING("ID #",                doomednum)
-  DEH_MAPPING("Initial frame",       spawnstate)
-  DEH_MAPPING("Hit points",          spawnhealth)
-  DEH_MAPPING("First moving frame",  seestate)
-  DEH_MAPPING("Alert sound",         seesound)
-  DEH_MAPPING("Reaction time",       reactiontime)
-  DEH_MAPPING("Attack sound",        attacksound)
-  DEH_MAPPING("Injury frame",        painstate)
-  DEH_MAPPING("Pain chance",         painchance)
-  DEH_MAPPING("Pain sound",          painsound)
-  DEH_MAPPING("Close attack frame",  meleestate)
-  DEH_MAPPING("Far attack frame",    missilestate)
-  DEH_MAPPING("Burning frame",       crashstate)
-  DEH_MAPPING("Death frame",         deathstate)
-  DEH_MAPPING("Exploding frame",     xdeathstate)
-  DEH_MAPPING("Death sound",         deathsound)
-  DEH_MAPPING("Speed",               speed)
-  DEH_MAPPING("Width",               radius)
-  DEH_MAPPING("Height",              height)
-  DEH_MAPPING("Mass",                mass)
-  DEH_MAPPING("Missile damage",      damage)
-  DEH_MAPPING("Action sound",        activesound)
-  DEH_MAPPING("Bits 1",              flags)
-  DEH_MAPPING("Bits 2",              flags2)
-DEH_END_MAPPING
-
-static void *DEH_ThingStart(deh_context_t *context, char *line)
-{
-    int orig_thing_number = 0, thing_number = 0;
-    mobjinfo_t *mobj;
-
-    if (sscanf(line, "Thing %i", &orig_thing_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    // Translate to the correct thing number based on the exe version this
-    // patch was made for. Subtract one because HHE thing numbers are
-    // indexed from 1.
-
-    thing_number = DEH_MapHereticThingType(orig_thing_number - 1);
-
-    if (thing_number < 0 || thing_number >= DEH_HERETIC_NUMMOBJTYPES)
-    {
-        DEH_Warning(context, "Invalid thing number: %i", orig_thing_number);
-        return NULL;
-    }
-
-    mobj = &mobjinfo[thing_number];
-
-    return mobj;
-}
-
-static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
-{
-    mobjinfo_t *mobj;
-    char *variable_name, *value;
-    int ivalue;
-
-    if (tag == NULL)
-       return;
-
-    mobj = (mobjinfo_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    // all values are integers
-
-    ivalue = atoi(value);
-
-    // If the value to be set is a frame, the frame number must
-    // undergo transformation from a Heretic 1.0 index to a
-    // Heretic 1.3 index.
-
-    if (M_StrCaseStr(variable_name, "frame") != NULL)
-    {
-        ivalue = DEH_MapHereticFrameNumber(ivalue);
-    }
-
-    // Set the field value
-
-    DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
-}
-
-static void DEH_ThingSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMMOBJTYPES; ++i)
-    {
-        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
-    }
-}
-
-deh_section_t deh_section_thing =
-{
-    "Thing",
-    NULL,
-    DEH_ThingStart,
-    DEH_ThingParseLine,
-    NULL,
-    DEH_ThingSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/heretic/deh_weapon.c b/games/NXDoom/src/heretic/deh_weapon.c
deleted file mode 100644
index cdbbbaa9f..000000000
--- a/games/NXDoom/src/heretic/deh_weapon.c
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Weapon" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-#include "m_misc.h"
-
-#include "doomdef.h"
-
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-#include "deh_htic.h"
-
-DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
-  DEH_MAPPING("Ammo type",        ammo)
-  DEH_MAPPING("Deselect frame",   upstate)
-  DEH_MAPPING("Select frame",     downstate)
-  DEH_MAPPING("Bobbing frame",    readystate)
-  DEH_MAPPING("Shooting frame",   atkstate)
-  DEH_MAPPING("Firing frame",     holdatkstate)
-  DEH_MAPPING("Unknown frame",    flashstate)
-DEH_END_MAPPING
-
-static void *DEH_WeaponStart(deh_context_t *context, char *line)
-{
-    int weapon_number = 0;
-
-    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (weapon_number < 0 || weapon_number >= NUMWEAPONS * 2)
-    {
-        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
-        return NULL;
-    }
-
-    // Because of the tome of power, we have two levels of weapons:
-
-    if (weapon_number < NUMWEAPONS)
-    {
-        return &wpnlev1info[weapon_number];
-    }
-    else
-    {
-        return &wpnlev2info[weapon_number - NUMWEAPONS];
-    }
-}
-
-static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    weaponinfo_t *weapon;
-    int ivalue;
-
-    if (tag == NULL)
-        return;
-
-    weapon = (weaponinfo_t *) tag;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    // If this is a frame field, we need to map from Heretic 1.0 frame
-    // numbers to Heretic 1.3 frame numbers.
-
-    if (M_StrCaseStr(variable_name, "frame") != NULL)
-    {
-        ivalue = DEH_MapHereticFrameNumber(ivalue);
-    }
-
-    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
-}
-
-static void DEH_WeaponSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMWEAPONS ;++i)
-    {
-        DEH_StructSHA1Sum(context, &weapon_mapping, &wpnlev1info[i]);
-        DEH_StructSHA1Sum(context, &weapon_mapping, &wpnlev2info[i]);
-    }
-}
-
-deh_section_t deh_section_weapon =
-{
-    "Weapon",
-    NULL,
-    DEH_WeaponStart,
-    DEH_WeaponParseLine,
-    NULL,
-    DEH_WeaponSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/heretic/doomdata.h b/games/NXDoom/src/heretic/doomdata.h
deleted file mode 100644
index 32bc91e6a..000000000
--- a/games/NXDoom/src/heretic/doomdata.h
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DoomData.h
-
-// all external data is defined here
-// most of the data is loaded into different structures at run time
-
-#ifndef __DOOMDATA__
-#define __DOOMDATA__
-
-#include "doomtype.h"
-
-/*
-===============================================================================
-
-						map level types
-
-===============================================================================
-*/
-
-// lump order in a map wad
-enum
-{
-    ML_LABEL,
-    ML_THINGS,
-    ML_LINEDEFS,
-    ML_SIDEDEFS,
-    ML_VERTEXES,
-    ML_SEGS,
-    ML_SSECTORS,
-    ML_NODES,
-    ML_SECTORS,
-    ML_REJECT,
-    ML_BLOCKMAP
-};
-
-
-typedef PACKED_STRUCT (
-{
-    short x, y;
-}) mapvertex_t;
-
-typedef PACKED_STRUCT (
-{
-    short textureoffset;
-    short rowoffset;
-    char toptexture[8], bottomtexture[8], midtexture[8];
-    short sector;               // on viewer's side
-}) mapsidedef_t;
-
-typedef PACKED_STRUCT (
-{
-    short v1, v2;
-    short flags;
-    short special, tag;
-    short sidenum[2];           // sidenum[1] will be -1 if one sided
-}) maplinedef_t;
-
-#define	ML_BLOCKING			1
-#define	ML_BLOCKMONSTERS	2
-#define	ML_TWOSIDED			4       // backside will not be present at all
-                                                                        // if not two sided
-
-// if a texture is pegged, the texture will have the end exposed to air held
-// constant at the top or bottom of the texture (stairs or pulled down things)
-// and will move with a height change of one of the neighbor sectors
-// Unpegged textures allways have the first row of the texture at the top
-// pixel of the line for both top and bottom textures (windows)
-#define	ML_DONTPEGTOP		8
-#define	ML_DONTPEGBOTTOM	16
-
-#define ML_SECRET			32      // don't map as two sided: IT'S A SECRET!
-#define ML_SOUNDBLOCK		64      // don't let sound cross two of these
-#define	ML_DONTDRAW			128     // don't draw on the automap
-#define	ML_MAPPED			256     // set if allready drawn in automap
-
-
-typedef PACKED_STRUCT (
-{
-    short floorheight, ceilingheight;
-    char floorpic[8], ceilingpic[8];
-    short lightlevel;
-    short special, tag;
-}) mapsector_t;
-
-typedef PACKED_STRUCT (
-{
-    short numsegs;
-    short firstseg;             // segs are stored sequentially
-}) mapsubsector_t;
-
-typedef PACKED_STRUCT (
-{
-    short v1, v2;
-    short angle;
-    short linedef, side;
-    short offset;
-}) mapseg_t;
-
-#define	NF_SUBSECTOR	0x8000
-typedef PACKED_STRUCT (
-{
-    short x, y, dx, dy;         // partition line
-    short bbox[2][4];           // bounding box for each child
-    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
-}) mapnode_t;
-
-typedef PACKED_STRUCT (
-{
-    short x, y;
-    short angle;
-    short type;
-    short options;
-}) mapthing_t;
-
-#define	MTF_EASY		1
-#define	MTF_NORMAL		2
-#define	MTF_HARD		4
-#define	MTF_AMBUSH		8
-
-/*
-===============================================================================
-
-						texture definition
-
-===============================================================================
-*/
-
-typedef PACKED_STRUCT (
-{
-    short originx;
-    short originy;
-    short patch;
-    short stepdir;
-    short colormap;
-}) mappatch_t;
-
-typedef PACKED_STRUCT (
-{
-    char name[8];
-    boolean masked;
-    short width;
-    short height;
-    int obsolete;
-    short patchcount;
-    mappatch_t patches[1];
-}) maptexture_t;
-
-
-/*
-===============================================================================
-
-							graphics
-
-===============================================================================
-*/
-
-// a pic is an unmasked block of pixels
-typedef struct
-{
-    byte width, height;
-    byte data;
-} pic_t;
-
-
-
-
-/*
-===============================================================================
-
-							status
-
-===============================================================================
-*/
-
-
-
-
-#endif // __DOOMDATA__
diff --git a/games/NXDoom/src/heretic/doomdef.h b/games/NXDoom/src/heretic/doomdef.h
deleted file mode 100644
index 8d5e13e53..000000000
--- a/games/NXDoom/src/heretic/doomdef.h
+++ /dev/null
@@ -1,858 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// DoomDef.h
-
-#ifndef __DOOMDEF__
-#define __DOOMDEF__
-#include <stdio.h>
-#include <string.h>
-//haleyjd: removed WATCOMC
-#include <limits.h>
-
-#define HERETIC_VERSION 130
-#define HERETIC_VERSION_TEXT "v1.3"
-
-// if rangecheck is undefined, most parameter validation debugging code
-// will not be compiled
-//#define RANGECHECK
-
-// all external data is defined here
-#include "doomdata.h"
-
-// all important printed strings
-#include "dstrings.h"
-
-// header generated by multigen utility
-#include "info.h"
-
-// WAD file access
-#include "w_wad.h"
-
-// fixed_t
-#include "m_fixed.h"
-
-// angle_t 
-#include "tables.h"
-
-// events
-#include "d_event.h"
-
-// gamemode/mission
-#include "d_mode.h"
-
-// ticcmd_t
-#include "d_ticcmd.h"
-
-#include "d_loop.h"
-
-#define	SAVEGAMENAME "hticsav"
-
-/*
-===============================================================================
-
-						GLOBAL TYPES
-
-===============================================================================
-*/
-
-#define NUMARTIFCTS	28
-#define MAXPLAYERS	4
-
-#define	BT_ATTACK		1
-#define	BT_USE			2
-#define	BT_CHANGE		4       // if true, the next 3 bits hold weapon num
-#define	BT_WEAPONMASK	(8+16+32)
-#define	BT_WEAPONSHIFT	3
-
-#define BT_SPECIAL		128     // game events, not really buttons
-#define	BTS_SAVEMASK	(4+8+16)
-#define	BTS_SAVESHIFT	2
-#define	BT_SPECIALMASK	3
-#define	BTS_PAUSE		1       // pause the game
-#define	BTS_SAVEGAME	2       // save the game at each console
-// savegame slot numbers occupy the second byte of buttons
-
-typedef enum
-{
-    GS_LEVEL,
-    GS_INTERMISSION,
-    GS_FINALE,
-    GS_DEMOSCREEN
-} gamestate_t;
-
-typedef enum
-{
-    ga_nothing,
-    ga_loadlevel,
-    ga_newgame,
-    ga_loadgame,
-    ga_savegame,
-    ga_playdemo,
-    ga_completed,
-    ga_victory,
-    ga_worlddone,
-    ga_screenshot
-} gameaction_t;
-
-typedef enum
-{
-    wipe_0,
-    wipe_1,
-    wipe_2,
-    wipe_3,
-    wipe_4,
-    NUMWIPES,
-    wipe_random
-} wipe_t;
-
-/*
-===============================================================================
-
-							MAPOBJ DATA
-
-===============================================================================
-*/
-
-
-struct thinker_s;
-
-// think_t is a function pointer to a routine to handle an actor
-typedef void (*think_t) (struct thinker_s *);
-
-typedef struct thinker_s
-{
-    struct thinker_s *prev, *next;
-    think_t function;
-} thinker_t;
-
-typedef union
-{
-    int i;
-    struct mobj_s *m;
-} specialval_t;
-
-struct player_s;
-
-typedef struct mobj_s
-{
-    thinker_t thinker;          // thinker links
-
-// info for drawing
-    fixed_t x, y, z;
-    struct mobj_s *snext, *sprev;       // links in sector (if needed)
-    angle_t angle;
-    spritenum_t sprite;         // used to find patch_t and flip value
-    int frame;                  // might be ord with FF_FULLBRIGHT
-
-// interaction info
-    struct mobj_s *bnext, *bprev;       // links in blocks (if needed)
-    struct subsector_s *subsector;
-    fixed_t floorz, ceilingz;   // closest together of contacted secs
-    fixed_t radius, height;     // for movement checking
-    fixed_t momx, momy, momz;   // momentums
-
-    int validcount;             // if == validcount, already checked
-
-    mobjtype_t type;
-    mobjinfo_t *info;           // &mobjinfo[mobj->type]
-    int tics;                   // state tic counter
-    state_t *state;
-    int damage;                 // For missiles
-    int flags;
-    int flags2;                 // Heretic flags
-    specialval_t special1;      // Special info
-    specialval_t special2;      // Special info
-    int health;
-    int movedir;                // 0-7
-    int movecount;              // when 0, select a new dir
-    struct mobj_s *target;      // thing being chased/attacked (or NULL)
-    // also the originator for missiles
-    int reactiontime;           // if non 0, don't attack yet
-    // used by player to freeze a bit after
-    // teleporting
-    int threshold;              // if >0, the target will be chased
-    // no matter what (even if shot)
-    struct player_s *player;    // only valid if type == MT_PLAYER
-    int lastlook;               // player number last looked for
-
-    mapthing_t spawnpoint;      // for nightmare respawn
-} mobj_t;
-
-// each sector has a degenmobj_t in it's center for sound origin purposes
-typedef struct
-{
-    thinker_t thinker;          // not used for anything
-    fixed_t x, y, z;
-} degenmobj_t;
-
-//
-// frame flags
-//
-#define	FF_FULLBRIGHT	0x8000  // flag in thing->frame
-#define FF_FRAMEMASK	0x7fff
-
-// --- mobj.flags ---
-
-#define	MF_SPECIAL	1         // call P_SpecialThing when touched
-#define	MF_SOLID	2
-#define	MF_SHOOTABLE	4
-#define	MF_NOSECTOR	8         // don't use the sector links
-                                  // (invisible but touchable)
-#define	MF_NOBLOCKMAP	16        // don't use the blocklinks
-                                  // (inert but displayable)
-#define	MF_AMBUSH	32
-#define	MF_JUSTHIT	64        // try to attack right back
-#define	MF_JUSTATTACKED	128       // take at least one step before attacking
-#define	MF_SPAWNCEILING	256       // hang from ceiling instead of floor
-#define	MF_NOGRAVITY	512       // don't apply gravity every tic
-
-// movement flags
-#define	MF_DROPOFF	0x400     // allow jumps from high places
-#define	MF_PICKUP	0x800     // for players to pick up items
-#define	MF_NOCLIP	0x1000    // player cheat
-#define	MF_SLIDE	0x2000    // keep info about sliding along walls
-#define	MF_FLOAT	0x4000    // allow moves to any height, no gravity
-#define	MF_TELEPORT	0x8000    // don't cross lines or look at heights
-#define MF_MISSILE	0x10000   // don't hit same species, explode on block
-
-#define	MF_DROPPED	0x20000   // dropped by a demon, not level spawned
-#define	MF_SHADOW	0x40000   // use translucent draw (shadow demons / invis)
-#define	MF_NOBLOOD	0x80000   // don't bleed when shot (use puff)
-#define	MF_CORPSE	0x100000  // don't stop moving halfway off a step
-#define	MF_INFLOAT	0x200000  // floating to a height for a move, don't
-                                  // auto float to target's height
-
-#define	MF_COUNTKILL	0x400000  // count towards intermission kill total
-#define	MF_COUNTITEM	0x800000  // count towards intermission item total
-
-#define	MF_SKULLFLY	0x1000000 // skull in flight
-#define	MF_NOTDMATCH	0x2000000 // don't spawn in death match (key cards)
-
-#define	MF_TRANSLATION	0xc000000 // if 0x4 0x8 or 0xc, use a translation
-#define	MF_TRANSSHIFT	26      // table for player colormaps
-
-// --- mobj.flags2 ---
-
-#define MF2_LOGRAV		0x00000001  // alternate gravity setting
-#define MF2_WINDTHRUST		0x00000002  // gets pushed around by the wind
-                                            // specials
-#define MF2_FLOORBOUNCE		0x00000004  // bounces off the floor
-#define MF2_THRUGHOST		0x00000008  // missile will pass through ghosts
-#define MF2_FLY			0x00000010  // fly mode is active
-#define MF2_FOOTCLIP		0x00000020  // if feet are allowed to be clipped
-#define MF2_SPAWNFLOAT		0x00000040  // spawn random float z
-#define MF2_NOTELEPORT		0x00000080  // does not teleport
-#define MF2_RIP			0x00000100  // missile rips through solid
-                                            // targets
-#define MF2_PUSHABLE		0x00000200  // can be pushed by other moving
-                                            // mobjs
-#define MF2_SLIDE		0x00000400  // slides against walls
-#define MF2_ONMOBJ		0x00000800  // mobj is resting on top of another
-                                            // mobj
-#define MF2_PASSMOBJ		0x00001000  // Enable z block checking.  If on,
-                                            // this flag will allow the mobj to
-                                            // pass over/under other mobjs.
-#define MF2_CANNOTPUSH		0x00002000  // cannot push other pushable mobjs
-#define MF2_FEETARECLIPPED	0x00004000  // a mobj's feet are now being cut
-#define MF2_BOSS		0x00008000  // mobj is a major boss
-#define MF2_FIREDAMAGE		0x00010000  // does fire damage
-#define MF2_NODMGTHRUST		0x00020000  // does not thrust target when
-                                            // damaging
-#define MF2_TELESTOMP		0x00040000  // mobj can stomp another
-#define MF2_FLOATBOB		0x00080000  // use float bobbing z movement
-#define MF2_DONTDRAW		0X00100000  // don't generate a vissprite
-
-//=============================================================================
-typedef enum
-{
-    PST_LIVE,                   // playing
-    PST_DEAD,                   // dead on the ground
-    PST_REBORN                  // ready to restart
-} playerstate_t;
-
-// psprites are scaled shapes directly on the view screen
-// coordinates are given for a 320*200 view screen
-typedef enum
-{
-    ps_weapon,
-    ps_flash,
-    NUMPSPRITES
-} psprnum_t;
-
-typedef struct pspdef_s
-{
-    state_t *state;             // a NULL state means not active
-    int tics;
-    fixed_t sx, sy;
-} pspdef_t;
-
-typedef enum
-{
-    key_yellow,
-    key_green,
-    key_blue,
-    NUM_KEY_TYPES
-} keytype_t;
-
-typedef enum
-{
-    wp_staff,
-    wp_goldwand,
-    wp_crossbow,
-    wp_blaster,
-    wp_skullrod,
-    wp_phoenixrod,
-    wp_mace,
-    wp_gauntlets,
-    wp_beak,
-    NUMWEAPONS,
-    wp_nochange
-} weapontype_t;
-
-#define AMMO_GWND_WIMPY 10
-#define AMMO_GWND_HEFTY 50
-#define AMMO_CBOW_WIMPY 5
-#define AMMO_CBOW_HEFTY 20
-#define AMMO_BLSR_WIMPY 10
-#define AMMO_BLSR_HEFTY 25
-#define AMMO_SKRD_WIMPY 20
-#define AMMO_SKRD_HEFTY 100
-#define AMMO_PHRD_WIMPY 1
-#define AMMO_PHRD_HEFTY 10
-#define AMMO_MACE_WIMPY 20
-#define AMMO_MACE_HEFTY 100
-
-typedef enum
-{
-    am_goldwand,
-    am_crossbow,
-    am_blaster,
-    am_skullrod,
-    am_phoenixrod,
-    am_mace,
-    NUMAMMO,
-    am_noammo                   // staff, gauntlets
-} ammotype_t;
-
-typedef struct
-{
-    ammotype_t ammo;
-    int upstate;
-    int downstate;
-    int readystate;
-    int atkstate;
-    int holdatkstate;
-    int flashstate;
-} weaponinfo_t;
-
-extern weaponinfo_t wpnlev1info[NUMWEAPONS];
-extern weaponinfo_t wpnlev2info[NUMWEAPONS];
-
-typedef enum
-{
-    arti_none,
-    arti_invulnerability,
-    arti_invisibility,
-    arti_health,
-    arti_superhealth,
-    arti_tomeofpower,
-    arti_torch,
-    arti_firebomb,
-    arti_egg,
-    arti_fly,
-    arti_teleport,
-    NUMARTIFACTS
-} artitype_t;
-
-typedef enum
-{
-    pw_None,
-    pw_invulnerability,
-    pw_invisibility,
-    pw_allmap,
-    pw_infrared,
-    pw_weaponlevel2,
-    pw_flight,
-    pw_shield,
-    pw_health2,
-    NUMPOWERS
-} powertype_t;
-
-#define	INVULNTICS (30*35)
-#define	INVISTICS (60*35)
-#define	INFRATICS (120*35)
-#define	IRONTICS (60*35)
-#define WPNLEV2TICS (40*35)
-#define FLIGHTTICS (60*35)
-
-#define CHICKENTICS (40*35)
-
-#define MESSAGETICS (4*35)
-#define BLINKTHRESHOLD (4*32)
-
-#define NUMINVENTORYSLOTS	14
-typedef struct
-{
-    int type;
-    int count;
-} inventory_t;
-
-/*
-================
-=
-= player_t
-=
-================
-*/
-
-typedef struct player_s
-{
-    mobj_t *mo;
-    playerstate_t playerstate;
-    ticcmd_t cmd;
-
-    fixed_t viewz;              // focal origin above r.z
-    fixed_t viewheight;         // base height above floor for viewz
-    fixed_t deltaviewheight;    // squat speed
-    fixed_t bob;                // bounded/scaled total momentum
-
-    int flyheight;
-    int lookdir;
-    boolean centering;
-    int health;                 // only used between levels, mo->health
-    // is used during levels
-    int armorpoints, armortype; // armor type is 0-2
-
-    inventory_t inventory[NUMINVENTORYSLOTS];
-    artitype_t readyArtifact;
-    int artifactCount;
-    int inventorySlotNum;
-    int powers[NUMPOWERS];
-    boolean keys[NUM_KEY_TYPES];
-    boolean backpack;
-    signed int frags[MAXPLAYERS];       // kills of other players
-    weapontype_t readyweapon;
-    weapontype_t pendingweapon; // wp_nochange if not changing
-    boolean weaponowned[NUMWEAPONS];
-    int ammo[NUMAMMO];
-    int maxammo[NUMAMMO];
-    int attackdown, usedown;    // true if button down last tic
-    int cheats;                 // bit flags
-
-    int refire;                 // refired shots are less accurate
-
-    int killcount, itemcount, secretcount;      // for intermission
-    const char *message;        // hint messages
-    int messageTics;            // counter for showing messages
-    int damagecount, bonuscount;        // for screen flashing
-    int flamecount;             // for flame thrower duration
-    mobj_t *attacker;           // who did damage (NULL for floors)
-    int extralight;             // so gun flashes light up areas
-    int fixedcolormap;          // can be set to REDCOLORMAP, etc
-    int colormap;               // 0-3 for which color to draw player
-    pspdef_t psprites[NUMPSPRITES];     // view sprites (gun, etc)
-    boolean didsecret;          // true if secret level has been done
-    int chickenTics;            // player is a chicken if > 0
-    int chickenPeck;            // chicken peck countdown
-    mobj_t *rain1;              // active rain maker 1
-    mobj_t *rain2;              // active rain maker 2
-} player_t;
-
-#define CF_NOCLIP		1
-#define	CF_GODMODE		2
-#define	CF_NOMOMENTUM	4       // not really a cheat, just a debug aid
-
-#define	SBARHEIGHT	42      // status bar height at bottom of screen
-
-
-/*
-===============================================================================
-
-					GLOBAL VARIABLES
-
-===============================================================================
-*/
-
-#define TELEFOGHEIGHT (32*FRACUNIT)
-
-extern gameaction_t gameaction;
-
-extern boolean paused;
-
-extern GameMode_t gamemode;
-
-extern boolean ExtendedWAD;     // true if main WAD is the extended version
-
-extern boolean nomonsters;      // checkparm of -nomonsters
-
-extern boolean respawnparm;     // checkparm of -respawn
-
-extern boolean debugmode;       // checkparm of -debug
-
-extern boolean usergame;        // ok to save / end game
-
-extern boolean ravpic;          // checkparm of -ravpic
-
-extern boolean altpal;          // checkparm to use an alternate palette routine
-
-extern boolean cdrom;           // true if cd-rom mode active ("-cdrom")
-
-extern boolean noartiskip;      // whether shift-enter skips an artifact
-
-extern boolean viewactive;
-
-extern boolean deathmatch;      // only if started as net death
-
-extern boolean netgame;         // only true if >1 player
-
-extern boolean playeringame[MAXPLAYERS];
-
-extern int consoleplayer;       // player taking events and displaying
-
-extern int displayplayer;
-
-extern int viewangleoffset;     // ANG90 = left side, ANG270 = right
-
-extern player_t players[MAXPLAYERS];
-
-extern boolean DebugSound;      // debug flag for displaying sound info
-
-extern int GetWeaponAmmo[NUMWEAPONS];
-
-extern boolean demorecording;
-extern boolean demoplayback;
-extern boolean demoextend;      // allow demos to persist through exit/respawn
-extern int skytexture;
-
-// Truncate angleturn in ticcmds to nearest 256.
-// Used when recording Vanilla demos in netgames.
-extern boolean lowres_turn;
-
-extern gamestate_t gamestate;
-extern skill_t gameskill;
-extern boolean respawnmonsters;
-extern int gameepisode;
-extern int gamemap;
-extern int prevmap;
-extern int totalkills, totalitems, totalsecret; // for intermission
-extern int levelstarttic;       // gametic at level start
-extern int leveltime;           // tics in game play for par
-
-extern ticcmd_t *netcmds;
-
-#define SAVEGAMESIZE 0x30000
-#define SAVESTRINGSIZE 24
-
-extern mapthing_t *deathmatch_p;
-extern mapthing_t deathmatchstarts[10];
-extern mapthing_t playerstarts[MAXPLAYERS];
-extern boolean playerstartsingame[MAXPLAYERS];
-
-extern int mouseSensitivity;
-
-extern boolean precache;        // if true, load all graphics at level load
-
-extern boolean singledemo;      // quit after playing a demo from cmdline
-
-extern int bodyqueslot;
-extern skill_t startskill;
-extern int startepisode;
-extern int startmap;
-extern boolean autostart;
-extern boolean advancedemo;
-
-extern boolean testcontrols;
-extern int testcontrols_mousespeed;
-
-extern int vanilla_savegame_limit;
-extern int vanilla_demo_limit;
-
-/*
-===============================================================================
-
-					GLOBAL FUNCTIONS
-
-===============================================================================
-*/
-
-#include "z_zone.h"
-
-//----------
-//BASE LEVEL
-//----------
-void D_DoomMain(void);
-void CheckAbortStartup(void);
-void IncThermo(void);
-void InitThermo(int max);
-void tprintf(const char *string, int initflag);
-// not a globally visible function, just included for source reference
-// calls all startup code
-// parses command line options
-// if not overrided, calls N_AdvanceDemo
-
-void D_DoomLoop(void);
-// not a globally visible function, just included for source reference
-// called by D_DoomMain, never exits
-// manages timing and IO
-// calls all ?_Responder, ?_Ticker, and ?_Drawer functions
-// calls I_GetTime, I_StartFrame, and I_StartTic
-
-void D_StartTitle(void);
-
-
-//---------
-//SYSTEM IO
-//---------
-byte *I_AllocLow(int length);
-// allocates from low memory under dos, just mallocs under unix
-
-// haleyjd: was WATCOMC, preserved for historical interest.
-// This is similar to the -control structure in DOOM v1.4 and Strife.
-#if 0
-extern boolean useexterndriver;
-
-#define EBT_FIRE			1
-#define EBT_OPENDOOR 		2
-#define EBT_SPEED			4
-#define EBT_STRAFE			8
-#define EBT_MAP				0x10
-#define EBT_INVENTORYLEFT 	0x20
-#define EBT_INVENTORYRIGHT 	0x40
-#define EBT_USEARTIFACT		0x80
-#define EBT_FLYDROP			0x100
-#define EBT_CENTERVIEW		0x200
-#define EBT_PAUSE			0x400
-#define EBT_WEAPONCYCLE 	0x800
-
-typedef struct
-{
-    short vector;               // Interrupt vector
-
-    signed char moveForward;    // forward/backward (maxes at 50)
-    signed char moveSideways;   // strafe (maxes at 24)
-    short angleTurn;            // turning speed (640 [slow] 1280 [fast])
-    short angleHead;            // head angle (+2080 [left] : 0 [center] : -2048 [right])
-    signed char pitch;          // look up/down (-110 : +90)
-    signed char flyDirection;   // flyheight (+1/-1)
-    unsigned short buttons;     // EBT_* flags
-} externdata_t;
-#endif
-
-//----
-//GAME
-//----
-
-void G_DeathMatchSpawnPlayer(int playernum);
-
-void G_InitNew(skill_t skill, int episode, int map);
-
-void G_DeferedInitNew(skill_t skill, int episode, int map);
-// can be called by the startup code or M_Responder
-// a normal game starts at map 1, but a warp test can start elsewhere
-
-void G_DeferedPlayDemo(const char *demo);
-
-void G_LoadGame(char *name);
-// can be called by the startup code or M_Responder
-// calls P_SetupLevel or W_EnterWorld
-void G_DoLoadGame(void);
-
-void G_SaveGame(int slot, char *description);
-// called by M_Responder
-
-#define SAVE_GAME_TERMINATOR 0x1d
-// Support routines for saving games
-char *SV_Filename(int slot);
-void SV_Open(char *fileName);
-void SV_OpenRead(char *fileName);
-void SV_WriteSaveGameEOF(void);
-void SV_Close(void);
-void SV_Write(void *buffer, int size);
-void SV_WriteByte(byte val);
-void SV_WriteWord(unsigned short val);
-void SV_WriteLong(unsigned int val);
-void SV_Read(void *buffer, int size);
-byte SV_ReadByte(void);
-uint16_t SV_ReadWord(void);
-uint32_t SV_ReadLong(void);
-
-extern char *savegamedir;
-
-void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
-                  const char *name);
-// only called by startup code
-
-void G_PlayDemo(char *name);
-void G_TimeDemo(char *name);
-boolean G_CheckDemoStatus(void);
-void D_DoAdvanceDemo(void);
-
-void G_ExitLevel(void);
-void G_SecretExitLevel(void);
-
-void D_ProcessEvents(void);
-
-void G_WorldDone(void);
-
-void G_BuildTiccmd(ticcmd_t *cmd, int maketic);
-
-void G_Ticker(void);
-boolean G_Responder(event_t * ev);
-
-void G_ScreenShot(void);
-
-//-----
-//PLAY
-//-----
-
-extern lumpinfo_t *maplumpinfo;
-
-void P_Ticker(void);
-// called by C_Ticker
-// can call G_PlayerExited
-// carries out all thinking of monsters and players
-
-void P_SetupLevel(int episode, int map, int playermask, skill_t skill);
-// called by W_Ticker
-
-void P_Init(void);
-// called by startup code
-
-void P_ArchivePlayers(void);
-void P_UnArchivePlayers(void);
-void P_ArchiveWorld(void);
-void P_UnArchiveWorld(void);
-void P_ArchiveThinkers(void);
-void P_UnArchiveThinkers(void);
-void P_ArchiveSpecials(void);
-void P_UnArchiveSpecials(void);
-// load / save game routines
-
-
-//-------
-//REFRESH
-//-------
-
-extern boolean setsizeneeded;
-
-extern boolean BorderNeedRefresh;
-extern boolean BorderTopRefresh;
-
-extern int UpdateState;
-// define the different areas for the dirty map
-#define I_NOUPDATE	0
-#define I_FULLVIEW	1
-#define I_STATBAR	2
-#define I_MESSAGES	4
-#define I_FULLSCRN	8
-
-void R_RenderPlayerView(player_t * player);
-// called by G_Drawer
-
-void R_Init(void);
-// called by startup code
-
-void R_DrawViewBorder(void);
-void R_DrawTopBorder(void);
-// if the view size is not full screen, draws a border around it
-
-void R_SetViewSize(int blocks, int detail);
-// called by M_Responder
-
-int R_FlatNumForName(const char *name);
-
-int R_TextureNumForName(const char *name);
-int R_CheckTextureNumForName(const char *name);
-// called by P_Ticker for switches and animations
-// returns the texture number for the texture name
-
-
-//----
-//MISC
-//----
-// returns the position of the given parameter in the arg list (0 if not found)
-
-int M_DrawText(int x, int y, boolean direct, char *string);
-
-//----------------------
-// Interlude (IN_lude.c)
-//----------------------
-
-extern boolean intermission;
-
-void IN_Start(void);
-void IN_Ticker(void);
-void IN_Drawer(void);
-
-//----------------------
-// Chat mode (CT_chat.c)
-//----------------------
-
-void CT_Init(void);
-void CT_Drawer(void);
-boolean CT_Responder(event_t * ev);
-void CT_Ticker(void);
-char CT_dequeueChatChar(void);
-
-extern boolean chatmodeon;
-extern boolean ultimatemsg;
-
-//--------------------
-// Finale (F_finale.c)
-//--------------------
-
-void F_Drawer(void);
-void F_Ticker(void);
-void F_StartFinale(void);
-
-//----------------------
-// STATUS BAR (SB_bar.c)
-//----------------------
-
-
-extern boolean inventory;
-extern int curpos;
-extern int inv_ptr;
-extern int playerkeys;
-
-
-void SB_Init(void);
-boolean SB_Responder(event_t * event);
-void SB_Ticker(void);
-void SB_Drawer(void);
-
-//-----------------
-// MENU (MN_menu.c)
-//-----------------
-
-extern boolean askforquit;
-extern boolean MenuActive;
-
-void MN_Init(void);
-void MN_ActivateMenu(void);
-void MN_DeactivateMenu(void);
-boolean MN_Responder(event_t * event);
-void MN_Ticker(void);
-void MN_Drawer(void);
-void MN_DrTextA(const char *text, int x, int y);
-int MN_TextAWidth(const char *text);
-void MN_DrTextB(const char *text, int x, int y);
-int MN_TextBWidth(const char *text);
-
-#include "sounds.h"
-
-#endif // __DOOMDEF__
diff --git a/games/NXDoom/src/heretic/dstrings.h b/games/NXDoom/src/heretic/dstrings.h
deleted file mode 100644
index 54bb97607..000000000
--- a/games/NXDoom/src/heretic/dstrings.h
+++ /dev/null
@@ -1,244 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// DStrings.h
-
-//---------------------------------------------------------------------------
-//
-// P_inter.c
-//
-//---------------------------------------------------------------------------
-
-// Keys
-
-#define TXT_GOTBLUEKEY			"BLUE KEY"
-#define TXT_GOTYELLOWKEY		"YELLOW KEY"
-#define TXT_GOTGREENKEY			"GREEN KEY"
-
-// Artifacts
-
-#define TXT_ARTIHEALTH			"QUARTZ FLASK"
-#define TXT_ARTIFLY				"WINGS OF WRATH"
-#define TXT_ARTIINVULNERABILITY	"RING OF INVINCIBILITY"
-#define TXT_ARTITOMEOFPOWER		"TOME OF POWER"
-#define TXT_ARTIINVISIBILITY	"SHADOWSPHERE"
-#define TXT_ARTIEGG				"MORPH OVUM"
-#define TXT_ARTISUPERHEALTH		"MYSTIC URN"
-#define TXT_ARTITORCH			"TORCH"
-#define TXT_ARTIFIREBOMB		"TIME BOMB OF THE ANCIENTS"
-#define TXT_ARTITELEPORT		"CHAOS DEVICE"
-
-// Items
-
-#define TXT_ITEMHEALTH			"CRYSTAL VIAL"
-#define TXT_ITEMBAGOFHOLDING	"BAG OF HOLDING"
-#define TXT_ITEMSHIELD1			"SILVER SHIELD"
-#define TXT_ITEMSHIELD2			"ENCHANTED SHIELD"
-#define TXT_ITEMSUPERMAP		"MAP SCROLL"
-
-// Ammo
-
-#define TXT_AMMOGOLDWAND1		"WAND CRYSTAL"
-#define TXT_AMMOGOLDWAND2		"CRYSTAL GEODE"
-#define TXT_AMMOMACE1			"MACE SPHERES"
-#define TXT_AMMOMACE2			"PILE OF MACE SPHERES"
-#define TXT_AMMOCROSSBOW1		"ETHEREAL ARROWS"
-#define TXT_AMMOCROSSBOW2		"QUIVER OF ETHEREAL ARROWS"
-#define TXT_AMMOBLASTER1		"CLAW ORB"
-#define TXT_AMMOBLASTER2		"ENERGY ORB"
-#define TXT_AMMOSKULLROD1		"LESSER RUNES"
-#define TXT_AMMOSKULLROD2		"GREATER RUNES"
-#define TXT_AMMOPHOENIXROD1		"FLAME ORB"
-#define TXT_AMMOPHOENIXROD2		"INFERNO ORB"
-
-// Weapons
-
-#define TXT_WPNMACE				"FIREMACE"
-#define TXT_WPNCROSSBOW			"ETHEREAL CROSSBOW"
-#define TXT_WPNBLASTER			"DRAGON CLAW"
-#define TXT_WPNSKULLROD			"HELLSTAFF"
-#define TXT_WPNPHOENIXROD		"PHOENIX ROD"
-#define TXT_WPNGAUNTLETS		"GAUNTLETS OF THE NECROMANCER"
-
-//---------------------------------------------------------------------------
-//
-// SB_bar.c
-//
-//---------------------------------------------------------------------------
-
-#define TXT_CHEATGODON			"GOD MODE ON"
-#define TXT_CHEATGODOFF			"GOD MODE OFF"
-#define TXT_CHEATNOCLIPON		"NO CLIPPING ON"
-#define TXT_CHEATNOCLIPOFF		"NO CLIPPING OFF"
-#define TXT_CHEATWEAPONS		"ALL WEAPONS"
-#define TXT_CHEATFLIGHTON		"FLIGHT ON"
-#define TXT_CHEATFLIGHTOFF		"FLIGHT OFF"
-#define TXT_CHEATPOWERON		"POWER ON"
-#define TXT_CHEATPOWEROFF		"POWER OFF"
-#define TXT_CHEATHEALTH			"FULL HEALTH"
-#define TXT_CHEATKEYS			"ALL KEYS"
-#define TXT_CHEATSOUNDON		"SOUND DEBUG ON"
-#define TXT_CHEATSOUNDOFF		"SOUND DEBUG OFF"
-#define TXT_CHEATTICKERON		"TICKER ON"
-#define TXT_CHEATTICKEROFF		"TICKER OFF"
-#define TXT_CHEATARTIFACTS1		"CHOOSE AN ARTIFACT ( A - J )"
-#define TXT_CHEATARTIFACTS2		"HOW MANY ( 1 - 9 )"
-#define TXT_CHEATARTIFACTS3		"YOU GOT IT"
-#define TXT_CHEATARTIFACTSFAIL	"BAD INPUT"
-#define TXT_CHEATWARP			"LEVEL WARP"
-#define TXT_CHEATSCREENSHOT		"SCREENSHOT"
-#define TXT_CHEATCHICKENON		"CHICKEN ON"
-#define TXT_CHEATCHICKENOFF		"CHICKEN OFF"
-#define TXT_CHEATMASSACRE		"MASSACRE"
-#define TXT_CHEATIDDQD			"TRYING TO CHEAT, EH?  NOW YOU DIE!"
-#define TXT_CHEATIDKFA			"CHEATER - YOU DON'T DESERVE WEAPONS"
-
-//---------------------------------------------------------------------------
-//
-// P_doors.c
-//
-//---------------------------------------------------------------------------
-
-#define TXT_NEEDBLUEKEY			"YOU NEED A BLUE KEY TO OPEN THIS DOOR"
-#define TXT_NEEDGREENKEY		"YOU NEED A GREEN KEY TO OPEN THIS DOOR"
-#define TXT_NEEDYELLOWKEY		"YOU NEED A YELLOW KEY TO OPEN THIS DOOR"
-
-//---------------------------------------------------------------------------
-//
-// G_game.c
-//
-//---------------------------------------------------------------------------
-
-#define TXT_GAMESAVED			"GAME SAVED"
-
-//---------------------------------------------------------------------------
-//
-// AM_map.c
-//
-//---------------------------------------------------------------------------
-
-#define AMSTR_FOLLOWON		"FOLLOW MODE ON"
-#define AMSTR_FOLLOWOFF		"FOLLOW MODE OFF"
-
-#define AMSTR_GRIDON		"Grid ON"
-#define AMSTR_GRIDOFF		"Grid OFF"
-
-#define AMSTR_MARKEDSPOT	"Marked Spot"
-#define AMSTR_MARKSCLEARED	"All Marks Cleared"
-
-//---------------------------------------------------------------------------
-//
-// F_finale.c
-//
-//---------------------------------------------------------------------------
-
-#define E1TEXT	"with the destruction of the iron\n"\
-					"liches and their minions, the last\n"\
-					"of the undead are cleared from this\n"\
-					"plane of existence.\n\n"\
-					"those creatures had to come from\n"\
-					"somewhere, though, and you have the\n"\
-					"sneaky suspicion that the fiery\n"\
-					"portal of hell's maw opens onto\n"\
-					"their home dimension.\n\n"\
-					"to make sure that more undead\n"\
-					"(or even worse things) don't come\n"\
-					"through, you'll have to seal hell's\n"\
-					"maw from the other side. of course\n"\
-					"this means you may get stuck in a\n"\
-					"very unfriendly world, but no one\n"\
-					"ever said being a Heretic was easy!"
-
-#define E2TEXT "the mighty maulotaurs have proved\n"\
-					"to be no match for you, and as\n"\
-					"their steaming corpses slide to the\n"\
-					"ground you feel a sense of grim\n"\
-					"satisfaction that they have been\n"\
-					"destroyed.\n\n"\
-					"the gateways which they guarded\n"\
-					"have opened, revealing what you\n"\
-					"hope is the way home. but as you\n"\
-					"step through, mocking laughter\n"\
-					"rings in your ears.\n\n"\
-					"was some other force controlling\n"\
-					"the maulotaurs? could there be even\n"\
-					"more horrific beings through this\n"\
-					"gate? the sweep of a crystal dome\n"\
-					"overhead where the sky should be is\n"\
-					"certainly not a good sign...."
-
-#define E3TEXT	"the death of d'sparil has loosed\n"\
-					"the magical bonds holding his\n"\
-					"creatures on this plane, their\n"\
-					"dying screams overwhelming his own\n"\
-					"cries of agony.\n\n"\
-					"your oath of vengeance fulfilled,\n"\
-					"you enter the portal to your own\n"\
-					"world, mere moments before the dome\n"\
-					"shatters into a million pieces.\n\n"\
-					"but if d'sparil's power is broken\n"\
-					"forever, why don't you feel safe?\n"\
-					"was it that last shout just before\n"\
-					"his death, the one that sounded\n"\
-					"like a curse? or a summoning? you\n"\
-					"can't really be sure, but it might\n"\
-					"just have been a scream.\n\n"\
-					"then again, what about the other\n"\
-					"serpent riders?"
-
-#define E4TEXT		"you thought you would return to your\n"\
-					"own world after d'sparil died, but\n"\
-					"his final act banished you to his\n"\
-					"own plane. here you entered the\n"\
-					"shattered remnants of lands\n"\
-					"conquered by d'sparil. you defeated\n"\
-					"the last guardians of these lands,\n"\
-					"but now you stand before the gates\n"\
-					"to d'sparil's stronghold. until this\n"\
-					"moment you had no doubts about your\n"\
-					"ability to face anything you might\n"\
-					"encounter, but beyond this portal\n"\
-					"lies the very heart of the evil\n"\
-					"which invaded your world. d'sparil\n"\
-					"might be dead, but the pit where he\n"\
-					"was spawned remains. now you must\n"\
-					"enter that pit in the hopes of\n"\
-					"finding a way out. and somewhere,\n"\
-					"in the darkest corner of d'sparil's\n"\
-					"demesne, his personal bodyguards\n"\
-					"await your arrival ..."
-
-#define E5TEXT		"as the final maulotaur bellows his\n"\
-					"death-agony, you realize that you\n"\
-					"have never come so close to your own\n"\
-					"destruction. not even the fight with\n"\
-					"d'sparil and his disciples had been\n"\
-					"this desperate. grimly you stare at\n"\
-					"the gates which open before you,\n"\
-					"wondering if they lead home, or if\n"\
-					"they open onto some undreamed-of\n"\
-					"horror. you find yourself wondering\n"\
-					"if you have the strength to go on,\n"\
-					"if nothing but death and pain await\n"\
-					"you. but what else can you do, if\n"\
-					"the will to fight is gone? can you\n"\
-					"force yourself to continue in the\n"\
-					"face of such despair? do you have\n"\
-					"the courage? you find, in the end,\n"\
-					"that it is not within you to\n"\
-					"surrender without a fight. eyes\n"\
-					"wide, you go to meet your fate."
-
diff --git a/games/NXDoom/src/heretic/f_finale.c b/games/NXDoom/src/heretic/f_finale.c
deleted file mode 100644
index 4508bd3a3..000000000
--- a/games/NXDoom/src/heretic/f_finale.c
+++ /dev/null
@@ -1,436 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// F_finale.c
-
-#include <ctype.h>
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_swap.h"
-#include "i_video.h"
-#include "s_sound.h"
-#include "v_video.h"
-#include "am_map.h"
-
-static int finalestage;                // 0 = text, 1 = art screen
-static int finalecount;
-
-#define TEXTSPEED       3
-#define TEXTWAIT        250
-
-static const char *finaletext;
-static const char *finaleflat;
-
-static int FontABaseLump;
-
-
-/*
-=======================
-=
-= F_StartFinale
-=
-=======================
-*/
-
-void F_StartFinale(void)
-{
-    gameaction = ga_nothing;
-    gamestate = GS_FINALE;
-    viewactive = false;
-    automapactive = false;
-    players[consoleplayer].messageTics = 1;
-    players[consoleplayer].message = NULL;
-
-    switch (gameepisode)
-    {
-        case 1:
-            finaleflat = DEH_String("FLOOR25");
-            finaletext = DEH_String(E1TEXT);
-            break;
-        case 2:
-            finaleflat = DEH_String("FLATHUH1");
-            finaletext = DEH_String(E2TEXT);
-            break;
-        case 3:
-            finaleflat = DEH_String("FLTWAWA2");
-            finaletext = DEH_String(E3TEXT);
-            break;
-        case 4:
-            finaleflat = DEH_String("FLOOR28");
-            finaletext = DEH_String(E4TEXT);
-            break;
-        case 5:
-            finaleflat = DEH_String("FLOOR08");
-            finaletext = DEH_String(E5TEXT);
-            break;
-    }
-
-    finalestage = 0;
-    finalecount = 0;
-    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
-
-//      S_ChangeMusic(mus_victor, true);
-    S_StartSong(mus_cptd, true);
-}
-
-
-
-boolean F_Responder(event_t * event)
-{
-    if (event->type != ev_keydown)
-    {
-        return false;
-    }
-    if (finalestage == 1 && gameepisode == 2)
-    {                           // we're showing the water pic, make any key kick to demo mode
-        finalestage++;
-        /*
-        memset((byte *) 0xa0000, 0, SCREENWIDTH * SCREENHEIGHT);
-        memset(I_VideoBuffer, 0, SCREENWIDTH * SCREENHEIGHT);
-        I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
-        */
-        return true;
-    }
-    return false;
-}
-
-
-/*
-=======================
-=
-= F_Ticker
-=
-=======================
-*/
-
-void F_Ticker(void)
-{
-    finalecount++;
-    if (!finalestage
-        && finalecount > strlen(finaletext) * TEXTSPEED + TEXTWAIT)
-    {
-        finalecount = 0;
-        if (!finalestage)
-        {
-            finalestage = 1;
-        }
-
-//              wipegamestate = -1;             // force a wipe
-/*
-		if (gameepisode == 3)
-			S_StartMusic (mus_bunny);
-*/
-    }
-}
-
-
-/*
-=======================
-=
-= F_TextWrite
-=
-=======================
-*/
-
-
-void F_TextWrite(void)
-{
-    byte *src, *dest;
-    int x, y;
-    int count;
-    const char *ch;
-    int c;
-    int cx, cy;
-    patch_t *w;
-
-//
-// erase the entire screen to a tiled background
-//
-    src = W_CacheLumpName(finaleflat, PU_CACHE);
-    dest = I_VideoBuffer;
-    for (y = 0; y < SCREENHEIGHT; y++)
-    {
-        for (x = 0; x < SCREENWIDTH / 64; x++)
-        {
-            memcpy(dest, src + ((y & 63) << 6), 64);
-            dest += 64;
-        }
-        if (SCREENWIDTH & 63)
-        {
-            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
-            dest += (SCREENWIDTH & 63);
-        }
-    }
-
-//      V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
-
-//
-// draw some of the text onto the screen
-//
-    cx = 20;
-    cy = 5;
-    ch = finaletext;
-
-    count = (finalecount - 10) / TEXTSPEED;
-    if (count < 0)
-        count = 0;
-    for (; count; count--)
-    {
-        c = *ch++;
-        if (!c)
-            break;
-        if (c == '\n')
-        {
-            cx = 20;
-            cy += 9;
-            continue;
-        }
-
-        c = toupper(c);
-        if (c < 33)
-        {
-            cx += 5;
-            continue;
-        }
-
-        w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        if (cx + SHORT(w->width) > SCREENWIDTH)
-            break;
-        V_DrawPatch(cx, cy, w);
-        cx += SHORT(w->width);
-    }
-
-}
-
-
-void F_DrawPatchCol(int x, patch_t * patch, int col)
-{
-    column_t *column;
-    byte *source, *dest, *desttop;
-    int count;
-
-    column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
-    desttop = I_VideoBuffer + x;
-
-// step through the posts in a column
-
-    while (column->topdelta != 0xff)
-    {
-        source = (byte *) column + 3;
-        dest = desttop + column->topdelta * SCREENWIDTH;
-        count = column->length;
-
-        while (count--)
-        {
-            *dest = *source++;
-            dest += SCREENWIDTH;
-        }
-        column = (column_t *) ((byte *) column + column->length + 4);
-    }
-}
-
-/*
-==================
-=
-= F_DemonScroll
-=
-==================
-*/
-
-void F_DemonScroll(void)
-{
-    byte *p1, *p2;
-    static int yval = 0;
-    static int nextscroll = 0;
-
-    if (finalecount < nextscroll)
-    {
-        return;
-    }
-    p1 = W_CacheLumpName(DEH_String("FINAL1"), PU_LEVEL);
-    p2 = W_CacheLumpName(DEH_String("FINAL2"), PU_LEVEL);
-    if (finalecount < 70)
-    {
-        memcpy(I_VideoBuffer, p1, SCREENHEIGHT * SCREENWIDTH);
-        nextscroll = finalecount;
-        return;
-    }
-    if (yval < 64000)
-    {
-        memcpy(I_VideoBuffer, p2 + SCREENHEIGHT * SCREENWIDTH - yval, yval);
-        memcpy(I_VideoBuffer + yval, p1, SCREENHEIGHT * SCREENWIDTH - yval);
-        yval += SCREENWIDTH;
-        nextscroll = finalecount + 3;
-    }
-    else
-    {                           //else, we'll just sit here and wait, for now
-        memcpy(I_VideoBuffer, p2, SCREENWIDTH * SCREENHEIGHT);
-    }
-}
-
-/*
-==================
-=
-= F_DrawUnderwater
-=
-==================
-*/
-
-void F_DrawUnderwater(void)
-{
-    static boolean underwawa = false;
-    const char *lumpname;
-    byte *palette;
-
-    // The underwater screen has its own palette, which is rather annoying.
-    // The palette doesn't correspond to the normal palette. Because of
-    // this, we must regenerate the lookup tables used in the video scaling
-    // code.
-
-    switch (finalestage)
-    {
-        case 1:
-            if (!underwawa)
-            {
-                underwawa = true;
-                V_DrawFilledBox(0, 0, SCREENWIDTH, SCREENHEIGHT, 0);
-                lumpname = DEH_String("E2PAL");
-                palette = W_CacheLumpName(lumpname, PU_STATIC);
-                I_SetPalette(palette);
-                W_ReleaseLumpName(lumpname);
-                V_DrawRawScreen(W_CacheLumpName(DEH_String("E2END"), PU_CACHE));
-            }
-            paused = false;
-            MenuActive = false;
-            askforquit = false;
-
-            break;
-        case 2:
-            if (underwawa)
-            {
-                lumpname = DEH_String("PLAYPAL");
-                palette = W_CacheLumpName(lumpname, PU_STATIC);
-                I_SetPalette(palette);
-                W_ReleaseLumpName(lumpname);
-                underwawa = false;
-            }
-            V_DrawRawScreen(W_CacheLumpName(DEH_String("TITLE"), PU_CACHE));
-            //D_StartTitle(); // go to intro/demo mode.
-    }
-}
-
-
-#if 0
-/*
-==================
-=
-= F_BunnyScroll
-=
-==================
-*/
-
-void F_BunnyScroll(void)
-{
-    int scrolled, x;
-    patch_t *p1, *p2;
-    char name[10];
-    int stage;
-    static int laststage;
-
-    p1 = W_CacheLumpName("PFUB2", PU_LEVEL);
-    p2 = W_CacheLumpName("PFUB1", PU_LEVEL);
-
-    V_MarkRect(0, 0, SCREENWIDTH, SCREENHEIGHT);
-
-    scrolled = 320 - (finalecount - 230) / 2;
-    if (scrolled > 320)
-        scrolled = 320;
-    if (scrolled < 0)
-        scrolled = 0;
-
-    for (x = 0; x < SCREENWIDTH; x++)
-    {
-        if (x + scrolled < 320)
-            F_DrawPatchCol(x, p1, x + scrolled);
-        else
-            F_DrawPatchCol(x, p2, x + scrolled - 320);
-    }
-
-    if (finalecount < 1130)
-        return;
-    if (finalecount < 1180)
-    {
-        V_DrawPatch((SCREENWIDTH - 13 * 8) / 2, (SCREENHEIGHT - 8 * 8) / 2, 0,
-                    W_CacheLumpName("END0", PU_CACHE));
-        laststage = 0;
-        return;
-    }
-
-    stage = (finalecount - 1180) / 5;
-    if (stage > 6)
-        stage = 6;
-    if (stage > laststage)
-    {
-        S_StartSound(NULL, sfx_pistol);
-        laststage = stage;
-    }
-
-    M_snprintf(name, sizeof(name), "END%i", stage);
-    V_DrawPatch((SCREENWIDTH - 13 * 8) / 2, (SCREENHEIGHT - 8 * 8) / 2,
-                W_CacheLumpName(name, PU_CACHE));
-}
-#endif
-
-/*
-=======================
-=
-= F_Drawer
-=
-=======================
-*/
-
-void F_Drawer(void)
-{
-    UpdateState |= I_FULLSCRN;
-    if (!finalestage)
-        F_TextWrite();
-    else
-    {
-        switch (gameepisode)
-        {
-            case 1:
-                if (gamemode == shareware)
-                {
-                    V_DrawRawScreen(W_CacheLumpName("ORDER", PU_CACHE));
-                }
-                else
-                {
-                    V_DrawRawScreen(W_CacheLumpName("CREDIT", PU_CACHE));
-                }
-                break;
-            case 2:
-                F_DrawUnderwater();
-                break;
-            case 3:
-                F_DemonScroll();
-                break;
-            case 4:            // Just show credits screen for extended episodes
-            case 5:
-                V_DrawRawScreen(W_CacheLumpName("CREDIT", PU_CACHE));
-                break;
-        }
-    }
-}
diff --git a/games/NXDoom/src/heretic/g_game.c b/games/NXDoom/src/heretic/g_game.c
deleted file mode 100644
index 01bcc4aeb..000000000
--- a/games/NXDoom/src/heretic/g_game.c
+++ /dev/null
@@ -1,2284 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// G_game.c
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "doomdef.h"
-#include "doomkeys.h"
-#include "deh_str.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_timer.h"
-#include "i_system.h"
-#include "m_argv.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-// Macros
-
-#define AM_STARTKEY     9
-
-// Functions
-
-void G_ReadDemoTiccmd(ticcmd_t * cmd);
-void G_WriteDemoTiccmd(ticcmd_t * cmd);
-void G_PlayerReborn(int player);
-
-void G_DoReborn(int playernum);
-
-void G_DoLoadLevel(void);
-void G_DoNewGame(void);
-void G_DoPlayDemo(void);
-void G_DoCompleted(void);
-void G_DoVictory(void);
-void G_DoWorldDone(void);
-void G_DoSaveGame(void);
-
-void D_PageTicker(void);
-void D_AdvanceDemo(void);
-
-static boolean InventoryMoveLeft();
-static boolean InventoryMoveRight();
-
-struct
-{
-    int type;   // mobjtype_t
-    int speed[2];
-} MonsterMissileInfo[] = {
-    { MT_IMPBALL, { 10, 20 } },
-    { MT_MUMMYFX1, { 9, 18 } },
-    { MT_KNIGHTAXE, { 9, 18 } },
-    { MT_REDAXE, { 9, 18 } },
-    { MT_BEASTBALL, { 12, 20 } },
-    { MT_WIZFX1, { 18, 24 } },
-    { MT_SNAKEPRO_A, { 14, 20 } },
-    { MT_SNAKEPRO_B, { 14, 20 } },
-    { MT_HEADFX1, { 13, 20 } },
-    { MT_HEADFX3, { 10, 18 } },
-    { MT_MNTRFX1, { 20, 26 } },
-    { MT_MNTRFX2, { 14, 20 } },
-    { MT_SRCRFX1, { 20, 28 } },
-    { MT_SOR2FX1, { 20, 28 } },
-    { -1, { -1, -1 } }                 // Terminator
-};
-
-gameaction_t gameaction;
-gamestate_t gamestate;
-skill_t gameskill;
-boolean respawnmonsters;
-int gameepisode;
-int gamemap;
-int prevmap;
-
-boolean paused;
-boolean sendpause;              // send a pause event next tic
-boolean sendsave;               // send a save event next tic
-boolean usergame;               // ok to save / end game
-
-boolean timingdemo;             // if true, exit with report on completion
-int starttime;                  // for comparative timing purposes
-
-boolean viewactive;
-
-boolean deathmatch;             // only if started as net death
-boolean netgame;                // only true if packets are broadcast
-boolean playeringame[MAXPLAYERS];
-player_t players[MAXPLAYERS];
-
-int consoleplayer;              // player taking events and displaying
-int displayplayer;              // view being displayed
-int levelstarttic;              // gametic at level start
-int totalkills, totalitems, totalsecret;        // for intermission
-
-int mouseSensitivity;
-
-char *demoname;
-boolean demorecording;
-boolean longtics;               // specify high resolution turning in demos
-boolean lowres_turn;
-boolean shortticfix;            // calculate lowres turning like doom
-boolean demoplayback;
-boolean netdemo;
-boolean demoextend;
-byte *demobuffer, *demo_p, *demoend;
-boolean singledemo;             // quit after playing a demo from cmdline
-
-boolean precache = true;        // if true, load all graphics at start
-
-// TODO: Heretic uses 16-bit shorts for consistency?
-byte consistancy[MAXPLAYERS][BACKUPTICS];
-char *savegamedir;
-
-boolean testcontrols = false;
-int testcontrols_mousespeed;
-
-
-//
-// controls (have defaults)
-//
-
-
-
-#define MAXPLMOVE       0x32
-
-fixed_t forwardmove[2] = { 0x19, 0x32 };
-fixed_t sidemove[2] = { 0x18, 0x28 };
-fixed_t angleturn[3] = { 640, 1280, 320 };      // + slow turn
-
-static int *weapon_keys[] =
-{
-    &key_weapon1,
-    &key_weapon2,
-    &key_weapon3,
-    &key_weapon4,
-    &key_weapon5,
-    &key_weapon6,
-    &key_weapon7
-};
-
-// Set to -1 or +1 to switch to the previous or next weapon.
-
-static int next_weapon = 0;
-
-// Used for prev/next weapon keys.
-
-static const struct
-{
-    weapontype_t weapon;
-    weapontype_t weapon_num;
-} weapon_order_table[] = {
-    { wp_staff,       wp_staff },
-    { wp_gauntlets,   wp_staff },
-    { wp_goldwand,    wp_goldwand },
-    { wp_crossbow,    wp_crossbow },
-    { wp_blaster,     wp_blaster },
-    { wp_skullrod,    wp_skullrod },
-    { wp_phoenixrod,  wp_phoenixrod },
-    { wp_mace,        wp_mace },
-    { wp_beak,        wp_beak },
-};
-
-#define SLOWTURNTICS    6
-
-#define NUMKEYS 256
-boolean gamekeydown[NUMKEYS];
-int turnheld;                   // for accelerative turning
-int lookheld;
-
-
-boolean mousearray[MAX_MOUSE_BUTTONS + 1];
-boolean *mousebuttons = &mousearray[1];
-        // allow [-1]
-int mousex, mousey;             // mouse values are used once
-int dclicktime, dclickstate, dclicks;
-int dclicktime2, dclickstate2, dclicks2;
-
-#define MAX_JOY_BUTTONS 20
-
-int joyxmove, joyymove;         // joystick values are repeated
-int joystrafemove;
-int joylook;
-boolean joyarray[MAX_JOY_BUTTONS + 1];
-boolean *joybuttons = &joyarray[1];     // allow [-1]
-
-int savegameslot;
-char savedescription[32];
-
-int vanilla_demo_limit = 1;
-
-int inventoryTics;
-
-// haleyjd: removed WATCOMC
-
-//=============================================================================
-// Not used - ripped out for Heretic
-/*
-int G_CmdChecksum(ticcmd_t *cmd)
-{
-	int     i;
-	int sum;
-
-	sum = 0;
-	for(i = 0; i < sizeof(*cmd)/4-1; i++)
-	{
-		sum += ((int *)cmd)[i];
-	}
-	return(sum);
-}
-*/
-
-static boolean WeaponSelectable(weapontype_t weapon)
-{
-    if (weapon == wp_beak)
-    {
-        return false;
-    }
-
-    return players[consoleplayer].weaponowned[weapon];
-}
-
-static int G_NextWeapon(int direction)
-{
-    weapontype_t weapon;
-    int start_i, i;
-
-    // Find index in the table.
-
-    if (players[consoleplayer].pendingweapon == wp_nochange)
-    {
-        weapon = players[consoleplayer].readyweapon;
-    }
-    else
-    {
-        weapon = players[consoleplayer].pendingweapon;
-    }
-
-    for (i=0; i<arrlen(weapon_order_table); ++i)
-    {
-        if (weapon_order_table[i].weapon == weapon)
-        {
-            break;
-        }
-    }
-
-    // The current weapon must be present in weapon_order_table
-    // otherwise something has gone terribly wrong
-    if (i >= arrlen(weapon_order_table)) {
-        I_Error("Internal error: weapon %d not present in weapon_order_table", weapon);
-    }
-
-    // Switch weapon. Don't loop forever.
-    start_i = i;
-    do
-    {
-        i += direction;
-        i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
-    } while (i != start_i && !WeaponSelectable(weapon_order_table[i].weapon));
-
-    return weapon_order_table[i].weapon_num;
-}
-
-/*
-====================
-=
-= G_BuildTiccmd
-=
-= Builds a ticcmd from all of the available inputs or reads it from the
-= demo buffer.
-= If recording a demo, write it out
-====================
-*/
-
-
-boolean usearti = true;
-
-void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
-{
-    int i;
-    boolean strafe, bstrafe;
-    int speed, tspeed, lspeed;
-    int forward, side;
-    int look, arti;
-    int flyheight;
-
-    // haleyjd: removed externdriver crap
-
-    memset(cmd, 0, sizeof(*cmd));
-    //cmd->consistancy =
-    //      consistancy[consoleplayer][(maketic*ticdup)%BACKUPTICS];
-    cmd->consistancy = consistancy[consoleplayer][maketic % BACKUPTICS];
-
-//printf ("cons: %i\n",cmd->consistancy);
-
-    strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe]
-        || joybuttons[joybstrafe];
-    speed = joybspeed >= MAX_JOY_BUTTONS
-         || gamekeydown[key_speed]
-         || joybuttons[joybspeed]
-         || mousebuttons[mousebspeed];
-
-    // haleyjd: removed externdriver crap
-    
-    forward = side = look = arti = flyheight = 0;
-
-//
-// use two stage accelerative turning on the keyboard and joystick
-//
-    if (joyxmove < 0 || joyxmove > 0
-        || gamekeydown[key_right] || gamekeydown[key_left]
-        || mousebuttons[mousebturnright] || mousebuttons[mousebturnleft])
-        turnheld += ticdup;
-    else
-        turnheld = 0;
-    if (turnheld < SLOWTURNTICS)
-        tspeed = 2;             // slow turn
-    else
-        tspeed = speed;
-
-    if (gamekeydown[key_lookdown] || gamekeydown[key_lookup])
-    {
-        lookheld += ticdup;
-    }
-    else
-    {
-        lookheld = 0;
-    }
-    if (lookheld < SLOWTURNTICS)
-    {
-        lspeed = 1;
-    }
-    else
-    {
-        lspeed = 2;
-    }
-
-//
-// let movement keys cancel each other out
-//
-    if (strafe)
-    {
-        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-            side += sidemove[speed];
-        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-            side -= sidemove[speed];
-        if (use_analog && joyxmove)
-        {
-            joyxmove = joyxmove * joystick_move_sensitivity / 10;
-            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
-            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
-            side += FixedMul(sidemove[speed], joyxmove);
-        }
-        else if (joystick_move_sensitivity)
-        {
-            if (joyxmove > 0)
-                side += sidemove[speed];
-            if (joyxmove < 0)
-                side -= sidemove[speed];
-        }
-    }
-    else
-    {
-        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-            cmd->angleturn -= angleturn[tspeed];
-        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-            cmd->angleturn += angleturn[tspeed];
-        if (use_analog && joyxmove)
-        {
-            // Cubic response curve allows for finer control when stick
-            // deflection is small.
-            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
-            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
-            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
-        }
-        else if (joystick_turn_sensitivity)
-        {
-            if (joyxmove > 0)
-                cmd->angleturn -= angleturn[tspeed];
-            if (joyxmove < 0)
-                cmd->angleturn += angleturn[tspeed];
-        }
-    }
-
-    if (gamekeydown[key_up])
-        forward += forwardmove[speed];
-    if (gamekeydown[key_down])
-        forward -= forwardmove[speed];
-    if (use_analog && joyymove)
-    {
-        joyymove = joyymove * joystick_move_sensitivity / 10;
-        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
-        joyymove = (joyymove < -FRACUNIT) ? FRACUNIT : joyymove;
-        forward -= FixedMul(forwardmove[speed], joyymove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joyymove < 0)
-            forward += forwardmove[speed];
-        if (joyymove > 0)
-            forward -= forwardmove[speed];
-    }
-    if (gamekeydown[key_straferight] || mousebuttons[mousebstraferight]
-     || joybuttons[joybstraferight])
-        side += sidemove[speed];
-    if (gamekeydown[key_strafeleft] || mousebuttons[mousebstrafeleft]
-     || joybuttons[joybstrafeleft])
-        side -= sidemove[speed];
-
-    if (use_analog && joystrafemove)
-    {
-        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
-        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
-        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
-        side += FixedMul(sidemove[speed], joystrafemove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joystrafemove < 0)
-            side -= sidemove[speed];
-        if (joystrafemove > 0)
-            side += sidemove[speed];
-    }
-    // Look up/down/center keys
-    if (gamekeydown[key_lookup])
-    {
-        look = lspeed;
-    }
-    if (gamekeydown[key_lookdown])
-    {
-        look = -lspeed;
-    }
-    if (use_analog && joylook)
-    {
-        joylook = joylook * joystick_look_sensitivity / 10;
-        joylook = (joylook > FRACUNIT) ? FRACUNIT : joylook;
-        joylook = (joylook < -FRACUNIT) ? -FRACUNIT : joylook;
-        look = -FixedMul(2, joylook);
-    }
-    else if (joystick_look_sensitivity)
-    {
-        if (joylook < 0)
-        {
-            look = lspeed;
-        }
-
-        if (joylook > 0)
-        {
-            look = -lspeed;
-        }
-    }
-    // haleyjd: removed externdriver crap
-    if (gamekeydown[key_lookcenter])
-    {
-        look = TOCENTER;
-    }
-
-    // haleyjd: removed externdriver crap
-    
-    // Fly up/down/drop keys
-    if (gamekeydown[key_flyup] || joybuttons[joybflyup])
-    {
-        flyheight = 5;          // note that the actual flyheight will be twice this
-    }
-    if (gamekeydown[key_flydown] || joybuttons[joybflydown])
-    {
-        flyheight = -5;
-    }
-    if (gamekeydown[key_flycenter] || joybuttons[joybflycenter])
-    {
-        flyheight = TOCENTER;
-        // haleyjd: removed externdriver crap
-        look = TOCENTER;
-    }
-
-    // Use artifact key
-    if (gamekeydown[key_useartifact] || mousebuttons[mousebuseartifact]
-        || joybuttons[joybuseartifact])
-    {
-        if (gamekeydown[key_speed] && !noartiskip)
-        {
-            if (players[consoleplayer].inventory[inv_ptr].type != arti_none)
-            {
-                gamekeydown[key_useartifact] = false;
-                mousebuttons[mousebuseartifact] = false;
-                cmd->arti = 0xff;       // skip artifact code
-            }
-        }
-        else
-        {
-            if (inventory)
-            {
-                players[consoleplayer].readyArtifact =
-                    players[consoleplayer].inventory[inv_ptr].type;
-                inventory = false;
-                cmd->arti = 0;
-                usearti = false;
-            }
-            else if (usearti)
-            {
-                cmd->arti = players[consoleplayer].inventory[inv_ptr].type;
-                usearti = false;
-            }
-        }
-    }
-    if (gamekeydown[key_arti_tome] && !cmd->arti
-        && !players[consoleplayer].powers[pw_weaponlevel2])
-    {
-        gamekeydown[key_arti_tome] = false;
-        cmd->arti = arti_tomeofpower;
-    }
-    else if (gamekeydown[key_arti_quartz] && !cmd->arti
-        && (players[consoleplayer].mo->health < MAXHEALTH))
-    {
-        gamekeydown[key_arti_quartz] = false;
-        cmd->arti = arti_health;
-    }
-    else if (gamekeydown[key_arti_urn] && !cmd->arti)
-    {
-        gamekeydown[key_arti_urn] = false;
-        cmd->arti = arti_superhealth;
-    }
-    else if (gamekeydown[key_arti_bomb] && !cmd->arti)
-    {
-        gamekeydown[key_arti_bomb] = false;
-        cmd->arti = arti_firebomb;
-    }
-    else if (gamekeydown[key_arti_ring] && !cmd->arti)
-    {
-        gamekeydown[key_arti_ring] = false;
-        cmd->arti = arti_invulnerability;
-    }
-    else if (gamekeydown[key_arti_chaosdevice] && !cmd->arti)
-    {
-        gamekeydown[key_arti_chaosdevice] = false;
-        cmd->arti = arti_teleport;
-    }
-    else if (gamekeydown[key_arti_shadowsphere] && !cmd->arti)
-    {
-        gamekeydown[key_arti_shadowsphere] = false;
-        cmd->arti = arti_invisibility;
-    }
-    else if (gamekeydown[key_arti_wings] && !cmd->arti)
-    {
-        gamekeydown[key_arti_wings] = false;
-        cmd->arti = arti_fly;
-    }
-    else if (gamekeydown[key_arti_torch] && !cmd->arti)
-    {
-        gamekeydown[key_arti_torch] = false;
-        cmd->arti = arti_torch;
-    }
-    else if (gamekeydown[key_arti_morph] && !cmd->arti)
-    {
-        gamekeydown[key_arti_morph] = false;
-        cmd->arti = arti_egg;
-    }
-
-//
-// buttons
-//
-    cmd->chatchar = CT_dequeueChatChar();
-
-    if (gamekeydown[key_fire] || mousebuttons[mousebfire]
-        || joybuttons[joybfire])
-        cmd->buttons |= BT_ATTACK;
-
-    if (gamekeydown[key_use] || joybuttons[joybuse] || mousebuttons[mousebuse])
-    {
-        cmd->buttons |= BT_USE;
-        dclicks = 0;            // clear double clicks if hit use button
-    }
-
-    // If the previous or next weapon button is pressed, the
-    // next_weapon variable is set to change weapons when
-    // we generate a ticcmd.  Choose a new weapon.
-    // (Can't weapon cycle when the player is a chicken)
-
-    if (gamestate == GS_LEVEL
-     && players[consoleplayer].chickenTics == 0 && next_weapon != 0)
-    {
-        i = G_NextWeapon(next_weapon);
-        cmd->buttons |= BT_CHANGE;
-        cmd->buttons |= i << BT_WEAPONSHIFT;
-    }
-    else
-    {
-        for (i=0; i<arrlen(weapon_keys); ++i)
-        {
-            int key = *weapon_keys[i];
-
-            if (gamekeydown[key])
-            {
-                cmd->buttons |= BT_CHANGE; 
-                cmd->buttons |= i<<BT_WEAPONSHIFT; 
-                break; 
-            }
-        }
-    }
-
-    next_weapon = 0;
-
-//
-// mouse
-//
-    if (mousebuttons[mousebforward])
-    {
-        forward += forwardmove[speed];
-    }
-
-    if (mousebuttons[mousebbackward])
-    {
-	forward -= forwardmove[speed];
-    }
-
-    // Double click to use can be disabled 
-   
-    if (dclick_use)
-    {
-	//
-	// forward double click
-	//
-	if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1)
-	{
-	    dclickstate = mousebuttons[mousebforward];
-	    if (dclickstate)
-		dclicks++;
-	    if (dclicks == 2)
-	    {
-		cmd->buttons |= BT_USE;
-		dclicks = 0;
-	    }
-	    else
-		dclicktime = 0;
-	}
-	else
-	{
-	    dclicktime += ticdup;
-	    if (dclicktime > 20)
-	    {
-		dclicks = 0;
-		dclickstate = 0;
-	    }
-	}
-
-	//
-	// strafe double click
-	//
-
-	bstrafe = mousebuttons[mousebstrafe] || joybuttons[joybstrafe];
-	if (bstrafe != dclickstate2 && dclicktime2 > 1)
-	{
-	    dclickstate2 = bstrafe;
-	    if (dclickstate2)
-		dclicks2++;
-	    if (dclicks2 == 2)
-	    {
-		cmd->buttons |= BT_USE;
-		dclicks2 = 0;
-	    }
-	    else
-		dclicktime2 = 0;
-	}
-	else
-	{
-	    dclicktime2 += ticdup;
-	    if (dclicktime2 > 20)
-	    {
-		dclicks2 = 0;
-		dclickstate2 = 0;
-	    }
-	}
-    }
-
-    if (strafe)
-    {
-        side += mousex * 2;
-    }
-    else
-    {
-        cmd->angleturn -= mousex * 0x8;
-    }
-
-    // No mouse movement in previous frame?
-
-    if (mousex == 0)
-    {
-        testcontrols_mousespeed = 0;
-    }
-
-    forward += mousey;
-    mousex = mousey = 0;
-
-    if (forward > MAXPLMOVE)
-        forward = MAXPLMOVE;
-    else if (forward < -MAXPLMOVE)
-        forward = -MAXPLMOVE;
-    if (side > MAXPLMOVE)
-        side = MAXPLMOVE;
-    else if (side < -MAXPLMOVE)
-        side = -MAXPLMOVE;
-
-    cmd->forwardmove += forward;
-    cmd->sidemove += side;
-    if (players[consoleplayer].playerstate == PST_LIVE)
-    {
-        if (look < 0)
-        {
-            look += 16;
-        }
-        cmd->lookfly = look;
-    }
-    if (flyheight < 0)
-    {
-        flyheight += 16;
-    }
-    cmd->lookfly |= flyheight << 4;
-
-//
-// special buttons
-//
-    if (sendpause)
-    {
-        sendpause = false;
-        cmd->buttons = BT_SPECIAL | BTS_PAUSE;
-    }
-
-    if (sendsave)
-    {
-        sendsave = false;
-        cmd->buttons =
-            BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
-    }
-
-    if (lowres_turn)
-    {
-        if (shortticfix)
-        {
-            static signed short carry = 0;
-            signed short desired_angleturn;
-
-            desired_angleturn = cmd->angleturn + carry;
-
-            // round angleturn to the nearest 256 unit boundary
-            // for recording demos with single byte values for turn
-
-            cmd->angleturn = (desired_angleturn + 128) & 0xff00;
-
-            // Carry forward the error from the reduced resolution to the
-            // next tic, so that successive small movements can accumulate.
-
-            carry = desired_angleturn - cmd->angleturn;
-        }
-        else
-        {
-            // truncate angleturn to the nearest 256 boundary
-            // for recording demos with single byte values for turn
-            cmd->angleturn &= 0xff00;
-        }
-    }
-}
-
-
-/*
-==============
-=
-= G_DoLoadLevel
-=
-==============
-*/
-
-void G_DoLoadLevel(void)
-{
-    int i;
-
-    levelstarttic = gametic;    // for time calculation
-    gamestate = GS_LEVEL;
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (playeringame[i] && players[i].playerstate == PST_DEAD)
-            players[i].playerstate = PST_REBORN;
-        memset(players[i].frags, 0, sizeof(players[i].frags));
-    }
-
-    P_SetupLevel(gameepisode, gamemap, 0, gameskill);
-    displayplayer = consoleplayer;      // view the guy you are playing
-    gameaction = ga_nothing;
-    Z_CheckHeap();
-
-//
-// clear cmd building stuff
-//
-
-    memset(gamekeydown, 0, sizeof(gamekeydown));
-    joyxmove = joyymove = joystrafemove = joylook = 0;
-    mousex = mousey = 0;
-    sendpause = sendsave = paused = false;
-    memset(mousearray, 0, sizeof(mousearray));
-    memset(joyarray, 0, sizeof(joyarray));
-
-    if (testcontrols)
-    {
-        P_SetMessage(&players[consoleplayer], "PRESS ESCAPE TO QUIT.", false);
-    }
-}
-
-static void SetJoyButtons(unsigned int buttons_mask)
-{
-    int i;
-    player_t* plr;
-
-    plr = &players[consoleplayer];
-
-    for (i=0; i<MAX_JOY_BUTTONS; ++i)
-    {
-        int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!joybuttons[i] && button_on)
-        {
-            // Weapon cycling:
-
-            if (i == joybprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == joybnextweapon)
-            {
-                next_weapon = 1;
-            }
-            else if (i == joybinvleft)
-            {
-                InventoryMoveLeft();
-            }
-            else if (i == joybinvright)
-            {
-                InventoryMoveRight();
-            }
-            else if (i == joybuseartifact)
-            {
-                if (!inventory)
-                {
-                    plr->readyArtifact = plr->inventory[inv_ptr].type;
-                }
-                usearti = true;
-            }
-        }
-
-        joybuttons[i] = button_on;
-    }
-}
-
-// If an InventoryMove*() function is called when the inventory is not active,
-// it will instead activate the inventory without attempting to change the
-// selected item. This action is indicated by a return value of false.
-// Otherwise, it attempts to change items and will return a value of true.
-
-static boolean InventoryMoveLeft()
-{
-    inventoryTics = 5 * 35;
-    if (!inventory)
-    {
-        inventory = true;
-        return false;
-    }
-    inv_ptr--;
-    if (inv_ptr < 0)
-    {
-        inv_ptr = 0;
-    }
-    else
-    {
-        curpos--;
-        if (curpos < 0)
-        {
-            curpos = 0;
-        }
-    }
-    return true;
-}
-
-static boolean InventoryMoveRight()
-{
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-    inventoryTics = 5 * 35;
-    if (!inventory)
-    {
-        inventory = true;
-        return false;
-    }
-    inv_ptr++;
-    if (inv_ptr >= plr->inventorySlotNum)
-    {
-        inv_ptr--;
-        if (inv_ptr < 0)
-            inv_ptr = 0;
-    }
-    else
-    {
-        curpos++;
-        if (curpos > 6)
-        {
-            curpos = 6;
-        }
-    }
-    return true;
-}
-
-static void SetMouseButtons(unsigned int buttons_mask)
-{
-    int i;
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-
-    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
-    {
-        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!mousebuttons[i] && button_on)
-        {
-            if (i == mousebprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == mousebnextweapon)
-            {
-                next_weapon = 1;
-            }
-            else if (i == mousebinvleft)
-            {
-                InventoryMoveLeft();
-            }
-            else if (i == mousebinvright)
-            {
-                InventoryMoveRight();
-            }
-            else if (i == mousebuseartifact)
-            {
-                if (!inventory)
-                {
-                    plr->readyArtifact = plr->inventory[inv_ptr].type;
-                }
-                usearti = true;
-            }
-        }
-
-        mousebuttons[i] = button_on;
-    }
-}
-
-/*
-===============================================================================
-=
-= G_Responder
-=
-= get info needed to make ticcmd_ts for the players
-=
-===============================================================================
-*/
-
-boolean G_Responder(event_t * ev)
-{
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-    if (ev->type == ev_keyup && ev->data1 == key_useartifact)
-    {                           // flag to denote that it's okay to use an artifact
-        if (!inventory)
-        {
-            plr->readyArtifact = plr->inventory[inv_ptr].type;
-        }
-        usearti = true;
-    }
-
-    // Check for spy mode player cycle
-    if (gamestate == GS_LEVEL && ev->type == ev_keydown
-        && ev->data1 == KEY_F12 && !deathmatch)
-    {                           // Cycle the display player
-        do
-        {
-            displayplayer++;
-            if (displayplayer == MAXPLAYERS)
-            {
-                displayplayer = 0;
-            }
-        }
-        while (!playeringame[displayplayer]
-               && displayplayer != consoleplayer);
-        return (true);
-    }
-
-    if (gamestate == GS_LEVEL)
-    {
-        if (CT_Responder(ev))
-        {                       // Chat ate the event
-            return (true);
-        }
-        if (SB_Responder(ev))
-        {                       // Status bar ate the event
-            return (true);
-        }
-        if (AM_Responder(ev))
-        {                       // Automap ate the event
-            return (true);
-        }
-    }
-
-    if (ev->type == ev_mouse)
-    {
-        testcontrols_mousespeed = abs(ev->data2);
-    }
-
-    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
-    {
-        next_weapon = -1;
-    }
-    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
-    {
-        next_weapon = 1;
-    }
-
-    switch (ev->type)
-    {
-        case ev_keydown:
-            if (ev->data1 == key_invleft)
-            {
-                if (InventoryMoveLeft())
-                {
-                    return (true);
-                }
-                break;
-            }
-            if (ev->data1 == key_invright)
-            {
-                if (InventoryMoveRight())
-                {
-                    return (true);
-                }
-                break;
-            }
-            if (ev->data1 == key_pause && !MenuActive)
-            {
-                sendpause = true;
-                return (true);
-            }
-            if (ev->data1 < NUMKEYS)
-            {
-                gamekeydown[ev->data1] = true;
-            }
-            return (true);      // eat key down events
-
-        case ev_keyup:
-            if (ev->data1 < NUMKEYS)
-            {
-                gamekeydown[ev->data1] = false;
-            }
-            return (false);     // always let key up events filter down
-
-        case ev_mouse:
-            SetMouseButtons(ev->data1);
-            mousex = ev->data2 * (mouseSensitivity + 5) / 10;
-            mousey = ev->data3 * (mouseSensitivity + 5) / 10;
-            return (true);      // eat events
-
-        case ev_joystick:
-            SetJoyButtons(ev->data1);
-            joyxmove = ev->data2;
-            joyymove = ev->data3;
-            joystrafemove = ev->data4;
-            joylook = ev->data5;
-            return (true);      // eat events
-
-        default:
-            break;
-    }
-    return (false);
-}
-
-/*
-===============================================================================
-=
-= G_Ticker
-=
-===============================================================================
-*/
-
-void G_Ticker(void)
-{
-    int i, buf;
-    ticcmd_t *cmd = NULL;
-
-//
-// do player reborns if needed
-//
-    for (i = 0; i < MAXPLAYERS; i++)
-        if (playeringame[i] && players[i].playerstate == PST_REBORN)
-            G_DoReborn(i);
-
-//
-// do things to change the game state
-//
-    while (gameaction != ga_nothing)
-    {
-        switch (gameaction)
-        {
-            case ga_loadlevel:
-                G_DoLoadLevel();
-                break;
-            case ga_newgame:
-                G_DoNewGame();
-                break;
-            case ga_loadgame:
-                G_DoLoadGame();
-                break;
-            case ga_savegame:
-                G_DoSaveGame();
-                break;
-            case ga_playdemo:
-                G_DoPlayDemo();
-                break;
-            case ga_screenshot:
-                V_ScreenShot("HTIC%02i.%s");
-                gameaction = ga_nothing;
-                break;
-            case ga_completed:
-                G_DoCompleted();
-                break;
-            case ga_worlddone:
-                G_DoWorldDone();
-                break;
-            case ga_victory:
-                F_StartFinale();
-                break;
-            default:
-                break;
-        }
-    }
-
-
-//
-// get commands, check consistancy, and build new consistancy check
-//
-    //buf = gametic%BACKUPTICS;
-    buf = (gametic / ticdup) % BACKUPTICS;
-
-    for (i = 0; i < MAXPLAYERS; i++)
-        if (playeringame[i])
-        {
-            cmd = &players[i].cmd;
-
-            memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
-
-            if (demoplayback)
-                G_ReadDemoTiccmd(cmd);
-            if (demorecording)
-                G_WriteDemoTiccmd(cmd);
-
-            if (netgame && !netdemo && !(gametic % ticdup))
-            {
-                if (gametic > BACKUPTICS
-                    && consistancy[i][buf] != cmd->consistancy)
-                {
-                    I_Error("consistency failure (%i should be %i)",
-                            cmd->consistancy, consistancy[i][buf]);
-                }
-                if (players[i].mo)
-                    consistancy[i][buf] = players[i].mo->x;
-                else
-                    consistancy[i][buf] = rndindex;
-            }
-        }
-
-//
-// check for special buttons
-//
-    for (i = 0; i < MAXPLAYERS; i++)
-        if (playeringame[i])
-        {
-            if (players[i].cmd.buttons & BT_SPECIAL)
-            {
-                switch (players[i].cmd.buttons & BT_SPECIALMASK)
-                {
-                    case BTS_PAUSE:
-                        paused ^= 1;
-                        if (paused)
-                        {
-                            S_PauseSound();
-                        }
-                        else
-                        {
-                            S_ResumeSound();
-                        }
-                        break;
-
-                    case BTS_SAVEGAME:
-                        if (!savedescription[0])
-                        {
-                            if (netgame)
-                            {
-                                M_StringCopy(savedescription,
-                                             DEH_String("NET GAME"),
-                                             sizeof(savedescription));
-                            }
-                            else
-                            {
-                                M_StringCopy(savedescription,
-                                             DEH_String("SAVE GAME"),
-                                             sizeof(savedescription));
-                            }
-                        }
-                        savegameslot =
-                            (players[i].cmd.
-                             buttons & BTS_SAVEMASK) >> BTS_SAVESHIFT;
-                        gameaction = ga_savegame;
-                        break;
-                }
-            }
-        }
-    // turn inventory off after a certain amount of time
-    if (inventory && !(--inventoryTics))
-    {
-        players[consoleplayer].readyArtifact =
-            players[consoleplayer].inventory[inv_ptr].type;
-        inventory = false;
-        cmd->arti = 0;
-    }
-//
-// do main actions
-//
-//
-// do main actions
-//
-    switch (gamestate)
-    {
-        case GS_LEVEL:
-            P_Ticker();
-            SB_Ticker();
-            AM_Ticker();
-            CT_Ticker();
-            break;
-        case GS_INTERMISSION:
-            IN_Ticker();
-            break;
-        case GS_FINALE:
-            F_Ticker();
-            break;
-        case GS_DEMOSCREEN:
-            D_PageTicker();
-            break;
-    }
-}
-
-
-/*
-==============================================================================
-
-						PLAYER STRUCTURE FUNCTIONS
-
-also see P_SpawnPlayer in P_Things
-==============================================================================
-*/
-
-/*
-====================
-=
-= G_InitPlayer
-=
-= Called at the start
-= Called by the game initialization functions
-====================
-*/
-
-void G_InitPlayer(int player)
-{
-    // clear everything else to defaults
-    G_PlayerReborn(player);
-}
-
-
-/*
-====================
-=
-= G_PlayerFinishLevel
-=
-= Can when a player completes a level
-====================
-*/
-
-void G_PlayerFinishLevel(int player)
-{
-    player_t *p;
-    int i;
-
-/*      // BIG HACK
-	inv_ptr = 0;
-	curpos = 0;
-*/
-    // END HACK
-    p = &players[player];
-    for (i = 0; i < p->inventorySlotNum; i++)
-    {
-        p->inventory[i].count = 1;
-    }
-    p->artifactCount = p->inventorySlotNum;
-
-    if (!deathmatch)
-    {
-        for (i = 0; i < 16; i++)
-        {
-            P_PlayerUseArtifact(p, arti_fly);
-        }
-    }
-    memset(p->powers, 0, sizeof(p->powers));
-    memset(p->keys, 0, sizeof(p->keys));
-    playerkeys = 0;
-//      memset(p->inventory, 0, sizeof(p->inventory));
-    if (p->chickenTics)
-    {
-        p->readyweapon = p->mo->special1.i;       // Restore weapon
-        p->chickenTics = 0;
-    }
-    p->messageTics = 0;
-    p->lookdir = 0;
-    p->mo->flags &= ~MF_SHADOW; // Remove invisibility
-    p->extralight = 0;          // Remove weapon flashes
-    p->fixedcolormap = 0;       // Remove torch
-    p->damagecount = 0;         // No palette changes
-    p->bonuscount = 0;
-    p->rain1 = NULL;
-    p->rain2 = NULL;
-    if (p == &players[consoleplayer])
-    {
-        SB_state = -1;          // refresh the status bar
-    }
-}
-
-/*
-====================
-=
-= G_PlayerReborn
-=
-= Called after a player dies
-= almost everything is cleared and initialized
-====================
-*/
-
-void G_PlayerReborn(int player)
-{
-    player_t *p;
-    int i;
-    int frags[MAXPLAYERS];
-    int killcount, itemcount, secretcount;
-    boolean secret;
-
-    secret = false;
-    memcpy(frags, players[player].frags, sizeof(frags));
-    killcount = players[player].killcount;
-    itemcount = players[player].itemcount;
-    secretcount = players[player].secretcount;
-
-    p = &players[player];
-    if (p->didsecret)
-    {
-        secret = true;
-    }
-    memset(p, 0, sizeof(*p));
-
-    memcpy(players[player].frags, frags, sizeof(players[player].frags));
-    players[player].killcount = killcount;
-    players[player].itemcount = itemcount;
-    players[player].secretcount = secretcount;
-
-    p->usedown = p->attackdown = true;  // don't do anything immediately
-    p->playerstate = PST_LIVE;
-    p->health = MAXHEALTH;
-    p->readyweapon = p->pendingweapon = wp_goldwand;
-    p->weaponowned[wp_staff] = true;
-    p->weaponowned[wp_goldwand] = true;
-    p->messageTics = 0;
-    p->lookdir = 0;
-    p->ammo[am_goldwand] = 50;
-    for (i = 0; i < NUMAMMO; i++)
-    {
-        p->maxammo[i] = maxammo[i];
-    }
-    if (gamemap == 9 || secret)
-    {
-        p->didsecret = true;
-    }
-    if (p == &players[consoleplayer])
-    {
-        SB_state = -1;          // refresh the status bar
-        inv_ptr = 0;            // reset the inventory pointer
-        curpos = 0;
-    }
-}
-
-/*
-====================
-=
-= G_CheckSpot
-=
-= Returns false if the player cannot be respawned at the given mapthing_t spot
-= because something is occupying it
-====================
-*/
-
-void P_SpawnPlayer(mapthing_t * mthing);
-
-boolean G_CheckSpot(int playernum, mapthing_t * mthing)
-{
-    fixed_t x, y;
-    subsector_t *ss;
-    unsigned an;
-    mobj_t *mo;
-
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-
-    players[playernum].mo->flags2 &= ~MF2_PASSMOBJ;
-    if (!P_CheckPosition(players[playernum].mo, x, y))
-    {
-        players[playernum].mo->flags2 |= MF2_PASSMOBJ;
-        return false;
-    }
-    players[playernum].mo->flags2 |= MF2_PASSMOBJ;
-
-// spawn a teleport fog
-    ss = R_PointInSubsector(x, y);
-    an = ((unsigned) ANG45 * (mthing->angle / 45)) >> ANGLETOFINESHIFT;
-
-    mo = P_SpawnMobj(x + 20 * finecosine[an], y + 20 * finesine[an],
-                     ss->sector->floorheight + TELEFOGHEIGHT, MT_TFOG);
-
-    if (players[consoleplayer].viewz != 1)
-        S_StartSound(mo, sfx_telept);   // don't start sound on first frame
-
-    return true;
-}
-
-/*
-====================
-=
-= G_DeathMatchSpawnPlayer
-=
-= Spawns a player at one of the random death match spots
-= called at level load and each death
-====================
-*/
-
-void G_DeathMatchSpawnPlayer(int playernum)
-{
-    int i, j;
-    int selections;
-
-    selections = deathmatch_p - deathmatchstarts;
-    if (selections < 4)
-        I_Error("Only %i deathmatch spots, 4 required", selections);
-
-    for (j = 0; j < 20; j++)
-    {
-        i = P_Random() % selections;
-        if (G_CheckSpot(playernum, &deathmatchstarts[i]))
-        {
-            deathmatchstarts[i].type = playernum + 1;
-            P_SpawnPlayer(&deathmatchstarts[i]);
-            return;
-        }
-    }
-
-// no good spot, so the player will probably get stuck
-    P_SpawnPlayer(&playerstarts[playernum]);
-}
-
-/*
-====================
-=
-= G_DoReborn
-=
-====================
-*/
-
-void G_DoReborn(int playernum)
-{
-    int i;
-
-    // quit demo unless -demoextend
-    if (!demoextend && G_CheckDemoStatus())
-        return;
-    if (!netgame)
-        gameaction = ga_loadlevel;      // reload the level from scratch
-    else
-    {                           // respawn at the start
-        players[playernum].mo->player = NULL;   // dissasociate the corpse
-
-        // spawn at random spot if in death match
-        if (deathmatch)
-        {
-            G_DeathMatchSpawnPlayer(playernum);
-            return;
-        }
-
-        if (G_CheckSpot(playernum, &playerstarts[playernum]))
-        {
-            P_SpawnPlayer(&playerstarts[playernum]);
-            return;
-        }
-        // try to spawn at one of the other players spots
-        for (i = 0; i < MAXPLAYERS; i++)
-            if (G_CheckSpot(playernum, &playerstarts[i]))
-            {
-                playerstarts[i].type = playernum + 1;   // fake as other player
-                P_SpawnPlayer(&playerstarts[i]);
-                playerstarts[i].type = i + 1;   // restore
-                return;
-            }
-        // he's going to be inside something.  Too bad.
-        P_SpawnPlayer(&playerstarts[playernum]);
-    }
-}
-
-
-void G_ScreenShot(void)
-{
-    gameaction = ga_screenshot;
-}
-
-
-/*
-====================
-=
-= G_DoCompleted
-=
-====================
-*/
-
-boolean secretexit;
-
-void G_ExitLevel(void)
-{
-    secretexit = false;
-    gameaction = ga_completed;
-}
-
-void G_SecretExitLevel(void)
-{
-    secretexit = true;
-    gameaction = ga_completed;
-}
-
-void G_DoCompleted(void)
-{
-    int i;
-    static int afterSecret[5] = { 7, 5, 5, 5, 4 };
-
-    gameaction = ga_nothing;
-
-    // quit demo unless -demoextend
-    if (!demoextend && G_CheckDemoStatus())
-    {
-        return;
-    }
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (playeringame[i])
-        {
-            G_PlayerFinishLevel(i);
-        }
-    }
-    prevmap = gamemap;
-    if (secretexit == true)
-    {
-        gamemap = 9;
-    }
-    else if (gamemap == 9)
-    {                           // Finished secret level
-        gamemap = afterSecret[gameepisode - 1];
-    }
-    else if (gamemap == 8)
-    {
-        gameaction = ga_victory;
-        return;
-    }
-    else
-    {
-        gamemap++;
-    }
-    gamestate = GS_INTERMISSION;
-    IN_Start();
-}
-
-//============================================================================
-//
-// G_WorldDone
-//
-//============================================================================
-
-void G_WorldDone(void)
-{
-    gameaction = ga_worlddone;
-}
-
-//============================================================================
-//
-// G_DoWorldDone
-//
-//============================================================================
-
-void G_DoWorldDone(void)
-{
-    gamestate = GS_LEVEL;
-    G_DoLoadLevel();
-    gameaction = ga_nothing;
-    viewactive = true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC G_LoadGame
-//
-// Can be called by the startup code or the menu task.
-//
-//---------------------------------------------------------------------------
-
-static char *savename = NULL;
-
-void G_LoadGame(char *name)
-{
-    savename = M_StringDuplicate(name);
-    gameaction = ga_loadgame;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC G_DoLoadGame
-//
-// Called by G_Ticker based on gameaction.
-//
-//---------------------------------------------------------------------------
-
-#define VERSIONSIZE 16
-
-void G_DoLoadGame(void)
-{
-    int i;
-    int a, b, c;
-    char savestr[SAVESTRINGSIZE];
-    char vcheck[VERSIONSIZE], readversion[VERSIONSIZE];
-
-    gameaction = ga_nothing;
-
-    SV_OpenRead(savename);
-
-    free(savename);
-    savename = NULL;
-
-    // Skip the description field
-    SV_Read(savestr, SAVESTRINGSIZE);
-
-    memset(vcheck, 0, sizeof(vcheck));
-    DEH_snprintf(vcheck, VERSIONSIZE, "version %i", HERETIC_VERSION);
-    SV_Read(readversion, VERSIONSIZE);
-
-    if (strncmp(readversion, vcheck, VERSIONSIZE) != 0)
-    {                           // Bad version
-        return;
-    }
-    gameskill = SV_ReadByte();
-    gameepisode = SV_ReadByte();
-    gamemap = SV_ReadByte();
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        playeringame[i] = SV_ReadByte();
-    }
-    // Load a base level
-    G_InitNew(gameskill, gameepisode, gamemap);
-
-    // Create leveltime
-    a = SV_ReadByte();
-    b = SV_ReadByte();
-    c = SV_ReadByte();
-    leveltime = (a << 16) + (b << 8) + c;
-
-    // De-archive all the modifications
-    P_UnArchivePlayers();
-    P_UnArchiveWorld();
-    P_UnArchiveThinkers();
-    P_UnArchiveSpecials();
-
-    if (SV_ReadByte() != SAVE_GAME_TERMINATOR)
-    {                           // Missing savegame termination marker
-        I_Error("Bad savegame");
-    }
-
-    SV_Close();
-}
-
-
-/*
-====================
-=
-= G_InitNew
-=
-= Can be called by the startup code or the menu task
-= consoleplayer, displayplayer, playeringame[] should be set
-====================
-*/
-
-skill_t d_skill;
-int d_episode;
-int d_map;
-
-void G_DeferedInitNew(skill_t skill, int episode, int map)
-{
-    d_skill = skill;
-    d_episode = episode;
-    d_map = map;
-    gameaction = ga_newgame;
-}
-
-void G_DoNewGame(void)
-{
-    G_InitNew(d_skill, d_episode, d_map);
-    gameaction = ga_nothing;
-}
-
-void G_InitNew(skill_t skill, int episode, int map)
-{
-    int i;
-    int speed;
-    static const char *skyLumpNames[5] = {
-        "SKY1", "SKY2", "SKY3", "SKY1", "SKY3"
-    };
-
-    if (paused)
-    {
-        paused = false;
-        S_ResumeSound();
-    }
-    if (skill < sk_baby)
-        skill = sk_baby;
-    if (skill > sk_nightmare)
-        skill = sk_nightmare;
-    if (episode < 1)
-        episode = 1;
-    // Up to 9 episodes for testing
-    if (episode > 9)
-        episode = 9;
-    if (map < 1)
-        map = 1;
-    if (map > 9)
-        map = 9;
-    M_ClearRandom();
-    if (respawnparm)
-    {
-        respawnmonsters = true;
-    }
-    else
-    {
-        respawnmonsters = false;
-    }
-    // Set monster missile speeds
-    speed = skill == sk_nightmare;
-    for (i = 0; MonsterMissileInfo[i].type != -1; i++)
-    {
-        mobjinfo[MonsterMissileInfo[i].type].speed
-            = MonsterMissileInfo[i].speed[speed] << FRACBITS;
-    }
-    // Force players to be initialized upon first level load
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        players[i].playerstate = PST_REBORN;
-        players[i].didsecret = false;
-    }
-    // Set up a bunch of globals
-    usergame = true;            // will be set false if a demo
-    paused = false;
-    demorecording = false;
-    demoplayback = false;
-    netdemo = false;
-    viewactive = true;
-    gameepisode = episode;
-    gamemap = map;
-    gameskill = skill;
-    BorderNeedRefresh = true;
-
-    // Set the sky map
-    if (episode > 5)
-    {
-        skytexture = R_TextureNumForName(DEH_String("SKY1"));
-    }
-    else
-    {
-        skytexture = R_TextureNumForName(DEH_String(skyLumpNames[episode - 1]));
-    }
-
-//
-// give one null ticcmd_t
-//
-#if 0
-    gametic = 0;
-    maketic = 1;
-    for (i = 0; i < MAXPLAYERS; i++)
-        nettics[i] = 1;         // one null event for this gametic
-    memset(localcmds, 0, sizeof(localcmds));
-    memset(netcmds, 0, sizeof(netcmds));
-#endif
-    G_DoLoadLevel();
-}
-
-
-/*
-===============================================================================
-
-							DEMO RECORDING
-
-===============================================================================
-*/
-
-#define DEMOMARKER      0x80
-#define DEMOHEADER_RESPAWN    0x20
-#define DEMOHEADER_LONGTICS   0x10
-#define DEMOHEADER_NOMONSTERS 0x02
-
-void G_ReadDemoTiccmd(ticcmd_t * cmd)
-{
-    if (*demo_p == DEMOMARKER)
-    {                           // end of demo data stream
-        G_CheckDemoStatus();
-        return;
-    }
-    cmd->forwardmove = ((signed char) *demo_p++);
-    cmd->sidemove = ((signed char) *demo_p++);
-
-    // If this is a longtics demo, read back in higher resolution
-
-    if (longtics)
-    {
-        cmd->angleturn = *demo_p++;
-        cmd->angleturn |= (*demo_p++) << 8;
-    }
-    else
-    {
-        cmd->angleturn = ((unsigned char) *demo_p++) << 8;
-    }
-
-    cmd->buttons = (unsigned char) *demo_p++;
-    cmd->lookfly = (unsigned char) *demo_p++;
-    cmd->arti = (unsigned char) *demo_p++;
-}
-
-// Increase the size of the demo buffer to allow unlimited demos
-
-static void IncreaseDemoBuffer(void)
-{
-    int current_length;
-    byte *new_demobuffer;
-    byte *new_demop;
-    int new_length;
-
-    // Find the current size
-
-    current_length = demoend - demobuffer;
-
-    // Generate a new buffer twice the size
-    new_length = current_length * 2;
-
-    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
-    new_demop = new_demobuffer + (demo_p - demobuffer);
-
-    // Copy over the old data
-
-    memcpy(new_demobuffer, demobuffer, current_length);
-
-    // Free the old buffer and point the demo pointers at the new buffer.
-
-    Z_Free(demobuffer);
-
-    demobuffer = new_demobuffer;
-    demo_p = new_demop;
-    demoend = demobuffer + new_length;
-}
-
-void G_WriteDemoTiccmd(ticcmd_t * cmd)
-{
-    byte *demo_start;
-
-    if (gamekeydown[key_demo_quit]) // press to end demo recording
-        G_CheckDemoStatus();
-
-    demo_start = demo_p;
-
-    *demo_p++ = cmd->forwardmove;
-    *demo_p++ = cmd->sidemove;
-
-    // If this is a longtics demo, record in higher resolution
-
-    if (longtics)
-    {
-        *demo_p++ = (cmd->angleturn & 0xff);
-        *demo_p++ = (cmd->angleturn >> 8) & 0xff;
-    }
-    else
-    {
-        *demo_p++ = cmd->angleturn >> 8;
-    }
-
-    *demo_p++ = cmd->buttons;
-    *demo_p++ = cmd->lookfly;
-    *demo_p++ = cmd->arti;
-
-    // reset demo pointer back
-    demo_p = demo_start;
-
-    if (demo_p > demoend - 16)
-    {
-        if (vanilla_demo_limit)
-        {
-            // no more space
-            G_CheckDemoStatus();
-            return;
-        }
-        else
-        {
-            // Vanilla demo limit disabled: unlimited
-            // demo lengths!
-
-            IncreaseDemoBuffer();
-        }
-    }
-
-    G_ReadDemoTiccmd(cmd);      // make SURE it is exactly the same
-}
-
-
-
-/*
-===================
-=
-= G_RecordDemo
-=
-===================
-*/
-
-void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
-                  const char *name)
-{
-    size_t demoname_size;
-    int i;
-    int maxsize;
-
-    //!
-    // @category demo
-    //
-    // Record or playback a demo with high resolution turning.
-    //
-
-    longtics = D_NonVanillaRecord(M_ParmExists("-longtics"),
-                                  "vvHeretic longtics demo");
-
-    // If not recording a longtics demo, record in low res
-
-    lowres_turn = !longtics;
-
-    //!
-    // @category demo
-    //
-    // Smooth out low resolution turning when recording a demo.
-    //
-
-    shortticfix = M_ParmExists("-shortticfix");
-
-    G_InitNew(skill, episode, map);
-    usergame = false;
-    demoname_size = strlen(name) + 5;
-    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
-    M_snprintf(demoname, demoname_size, "%s.lmp", name);
-    maxsize = 0x20000;
-
-    //!
-    // @arg <size>
-    // @category demo
-    // @vanilla
-    //
-    // Specify the demo buffer size (KiB)
-    //
-
-    i = M_CheckParmWithArgs("-maxdemo", 1);
-    if (i)
-        maxsize = atoi(myargv[i + 1]) * 1024;
-    demobuffer = Z_Malloc(maxsize, PU_STATIC, NULL);
-    demoend = demobuffer + maxsize;
-
-    demo_p = demobuffer;
-    *demo_p++ = skill;
-    *demo_p++ = episode;
-    *demo_p++ = map;
-
-    // Write special parameter bits onto player one byte.
-    // This aligns with vvHeretic demo usage:
-    //   0x20 = -respawn
-    //   0x10 = -longtics
-    //   0x02 = -nomonsters
-
-    *demo_p = 1; // assume player one exists
-    if (D_NonVanillaRecord(respawnparm, "vvHeretic -respawn header flag"))
-    {
-        *demo_p |= DEMOHEADER_RESPAWN;
-    }
-    if (longtics)
-    {
-        *demo_p |= DEMOHEADER_LONGTICS;
-    }
-    if (D_NonVanillaRecord(nomonsters, "vvHeretic -nomonsters header flag"))
-    {
-        *demo_p |= DEMOHEADER_NOMONSTERS;
-    }
-    demo_p++;
-
-    for (i = 1; i < MAXPLAYERS; i++)
-        *demo_p++ = playeringame[i];
-
-    demorecording = true;
-}
-
-
-/*
-===================
-=
-= G_PlayDemo
-=
-===================
-*/
-
-static const char *defdemoname;
-
-void G_DeferedPlayDemo(const char *name)
-{
-    defdemoname = name;
-    gameaction = ga_playdemo;
-}
-
-void G_DoPlayDemo(void)
-{
-    skill_t skill;
-    int i, lumpnum, episode, map;
-
-    gameaction = ga_nothing;
-    lumpnum = W_GetNumForName(defdemoname);
-    demobuffer = W_CacheLumpNum(lumpnum, PU_STATIC);
-    demo_p = demobuffer;
-    skill = *demo_p++;
-    episode = *demo_p++;
-    map = *demo_p++;
-
-    // vvHeretic allows extra options to be stored in the upper bits of
-    // the player 1 present byte. However, this is a non-vanilla extension.
-    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_LONGTICS) != 0,
-                             lumpnum, "vvHeretic longtics demo"))
-    {
-        longtics = true;
-    }
-    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_RESPAWN) != 0,
-                             lumpnum, "vvHeretic -respawn header flag"))
-    {
-        respawnparm = true;
-    }
-    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_NOMONSTERS) != 0,
-                             lumpnum, "vvHeretic -nomonsters header flag"))
-    {
-        nomonsters = true;
-    }
-
-    for (i = 0; i < MAXPLAYERS; i++)
-        playeringame[i] = (*demo_p++) != 0;
-
-    if (playeringame[1] || M_CheckParm("-solo-net") > 0
-                        || M_CheckParm("-netdemo") > 0)
-    {
-    	netgame = true;
-    }
-
-    precache = false;           // don't spend a lot of time in loadlevel
-    G_InitNew(skill, episode, map);
-    precache = true;
-    usergame = false;
-    demoplayback = true;
-
-    if (netgame == true)
-    {
-      netdemo = true;
-    }
-}
-
-
-/*
-===================
-=
-= G_TimeDemo
-=
-===================
-*/
-
-void G_TimeDemo(char *name)
-{
-    skill_t skill;
-    int episode, map, i;
-
-    demobuffer = demo_p = W_CacheLumpName(name, PU_STATIC);
-    skill = *demo_p++;
-    episode = *demo_p++;
-    map = *demo_p++;
-
-    // Read special parameter bits: see G_RecordDemo() for details.
-    longtics = (*demo_p & DEMOHEADER_LONGTICS) != 0;
-
-    // don't overwrite arguments from the command line
-    respawnparm |= (*demo_p & DEMOHEADER_RESPAWN) != 0;
-    nomonsters  |= (*demo_p & DEMOHEADER_NOMONSTERS) != 0;
-
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        playeringame[i] = (*demo_p++) != 0;
-    }
-
-    if (playeringame[1] || M_CheckParm("-solo-net") > 0
-                        || M_CheckParm("-netdemo") > 0)
-    {
-      netgame = true;
-    }
-
-    G_InitNew(skill, episode, map);
-    starttime = I_GetTime();
-
-    usergame = false;
-    demoplayback = true;
-    timingdemo = true;
-    singletics = true;
-
-    if (netgame == true)
-    {
-      netdemo = true;
-    }
-}
-
-
-/*
-===================
-=
-= G_CheckDemoStatus
-=
-= Called after a death or level completion to allow demos to be cleaned up
-= Returns true if a new demo loop action will take place
-===================
-*/
-
-boolean G_CheckDemoStatus(void)
-{
-    int endtime, realtics;
-
-    if (timingdemo)
-    {
-        float fps;
-        endtime = I_GetTime();
-        realtics = endtime - starttime;
-        fps = ((float) gametic * TICRATE) / realtics;
-        I_Error("timed %i gametics in %i realtics (%f fps)",
-                gametic, realtics, fps);
-    }
-
-    if (demoplayback)
-    {
-        if (singledemo)
-            I_Quit();
-
-        W_ReleaseLumpName(defdemoname);
-        demoplayback = false;
-        netdemo = false;
-        netgame = false;
-        D_AdvanceDemo();
-        return true;
-    }
-
-    if (demorecording)
-    {
-        *demo_p++ = DEMOMARKER;
-        M_WriteFile(demoname, demobuffer, demo_p - demobuffer);
-        Z_Free(demobuffer);
-        demorecording = false;
-        I_Error("Demo %s recorded", demoname);
-    }
-
-    return false;
-}
-
-/**************************************************************************/
-/**************************************************************************/
-
-//==========================================================================
-//
-// G_SaveGame
-//
-// Called by the menu task.  <description> is a 24 byte text string.
-//
-//==========================================================================
-
-void G_SaveGame(int slot, char *description)
-{
-    savegameslot = slot;
-    M_StringCopy(savedescription, description, sizeof(savedescription));
-    sendsave = true;
-}
-
-//==========================================================================
-//
-// G_DoSaveGame
-//
-// Called by G_Ticker based on gameaction.
-//
-//==========================================================================
-
-void G_DoSaveGame(void)
-{
-    int i;
-    char *filename;
-    char verString[VERSIONSIZE];
-    char *description;
-
-    filename = SV_Filename(savegameslot);
-
-    description = savedescription;
-
-    SV_Open(filename);
-    SV_Write(description, SAVESTRINGSIZE);
-    memset(verString, 0, sizeof(verString));
-    DEH_snprintf(verString, VERSIONSIZE, "version %i", HERETIC_VERSION);
-    SV_Write(verString, VERSIONSIZE);
-    SV_WriteByte(gameskill);
-    SV_WriteByte(gameepisode);
-    SV_WriteByte(gamemap);
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        SV_WriteByte(playeringame[i]);
-    }
-    SV_WriteByte(leveltime >> 16);
-    SV_WriteByte(leveltime >> 8);
-    SV_WriteByte(leveltime);
-    P_ArchivePlayers();
-    P_ArchiveWorld();
-    P_ArchiveThinkers();
-    P_ArchiveSpecials();
-    SV_WriteSaveGameEOF();
-    SV_Close();
-
-    gameaction = ga_nothing;
-    savedescription[0] = 0;
-    P_SetMessage(&players[consoleplayer], DEH_String(TXT_GAMESAVED), true);
-
-    free(filename);
-}
-
diff --git a/games/NXDoom/src/heretic/heretic_icon.c b/games/NXDoom/src/heretic/heretic_icon.c
deleted file mode 100644
index ab8b641c8..000000000
--- a/games/NXDoom/src/heretic/heretic_icon.c
+++ /dev/null
@@ -1,2736 +0,0 @@
-static int heretic_icon_w = 128;
-static int heretic_icon_h = 128;
-
-static const unsigned int heretic_icon_data[] = {
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
-    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
-    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
-    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
-    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
-    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
-    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
-    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
-    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
-    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
-    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
-    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
-    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
-    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
-    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
-    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
-    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
-    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
-    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
-    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
-    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
-    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
-    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
-    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
-    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
-    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
-    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
-    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
-    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
-    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
-    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
-    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
-    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
-    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
-    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
-    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
-    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
-    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
-    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
-    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
-    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
-    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
-    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
-    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
-    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
-    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x93756aff, 0x91756aff, 0x968078ff, 0x99867fff, 
-    0x99867fff, 0x99867fff, 0x99867fff, 0x99867fff, 0x99867fff, 0xa2918bff, 
-    0xb5aaa6ff, 0xb5a9a5ff, 0xb5a9a5ff, 0xb4a8a4ff, 0xb4a8a4ff, 0xb3a7a3ff, 
-    0xb2a6a2ff, 0xb2a6a2ff, 0xb0a5a1ff, 0xa2928cff, 0x98857eff, 0x98847eff, 
-    0x98847eff, 0x98847eff, 0x97837dff, 0x95817bff, 0x937f79ff, 0x907d76ff, 
-    0x907e77ff, 0x9e908cff, 0xa09491ff, 0x9f938fff, 0x9d928eff, 0x9b8f8bff, 
-    0x998d89ff, 0x978c88ff, 0x968a86ff, 0x948884ff, 0x8f827eff, 0x7a6660ff, 
-    0x78645eff, 0x76625dff, 0x74605bff, 0x725e59ff, 0x705c57ff, 0x6e5b55ff, 
-    0x6c5953ff, 0x6a5751ff, 0x73625eff, 0x7f7370ff, 0x7d716eff, 0x7b6f6cff, 
-    0x796d6aff, 0x786c69ff, 0x766a67ff, 0x746865ff, 0x716563ff, 0x716562ff, 
-    0x5d4b47ff, 0x54403bff, 0x523d3aff, 0x55413fff, 0x574445ff, 0x59464aff, 
-    0x5b494fff, 0x5d4950ff, 0x5f464cff, 0x674e55ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
-    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
-    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
-    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
-    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
-    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
-    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
-    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
-    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
-    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
-    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
-    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
-    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
-    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
-    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
-    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
-    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
-    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
-    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
-    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
-    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xb9b8b8ff, 0xbdbdbdff, 
-    0xbbbbbcff, 0xbbbbbbff, 0xbab9baff, 0xb9b9baff, 0xb8b8b9ff, 0xb8b8b8ff, 
-    0xb7b6b7ff, 0xb0afb0ff, 0x9f9ea0ff, 0x9e9ea0ff, 0x9e9da0ff, 0x9e9d9fff, 
-    0x9d9c9fff, 0x9d9c9eff, 0x9c9b9eff, 0x9c9a9eff, 0x9c9a9eff, 0xa6a5a7ff, 
-    0xadacafff, 0xacaaadff, 0xacaaadff, 0xaaa9acff, 0xa8a7aaff, 0xa6a5a8ff, 
-    0xa5a3a7ff, 0xa3a2a5ff, 0xa1a0a3ff, 0x8f8d93ff, 0x8c8a90ff, 0x8a888dff, 
-    0x88868cff, 0x868389ff, 0x848288ff, 0x828086ff, 0x817e85ff, 0x7e7b82ff, 
-    0x807e84ff, 0x8c8b8fff, 0x8b898eff, 0x89878cff, 0x87858bff, 0x858488ff, 
-    0x848287ff, 0x827f85ff, 0x807e83ff, 0x7e7c82ff, 0x737178ff, 0x67636cff, 
-    0x64616aff, 0x635f68ff, 0x605d66ff, 0x5f5b65ff, 0x5d5963ff, 0x5b5761ff, 
-    0x58555fff, 0x57535dff, 0x646168ff, 0x68656cff, 0x66636bff, 0x67656dff, 
-    0x676570ff, 0x676672ff, 0x696775ff, 0x696877ff, 0x6a6a7aff, 0x6b6b7bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x757473ff, 0x747475ff, 0x747374ff, 0x737274ff, 0x727273ff, 0x727173ff, 
-    0x717072ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 
-    0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 
-    0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
-    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
-    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
-    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
-    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
-    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
-    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
-    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
-    0x4a4655ff, 0x4b4653ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x747373ff, 0x747374ff, 0x737274ff, 0x727273ff, 
-    0x727173ff, 0x717072ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 
-    0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 
-    0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 
-    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
-    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
-    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
-    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
-    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
-    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
-    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
-    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x4a4652ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x747272ff, 0x737274ff, 
-    0x727273ff, 0x727173ff, 0x717072ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 
-    0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 
-    0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 
-    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
-    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
-    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
-    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
-    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
-    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
-    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
-    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x4a4652ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x737172ff, 0x727273ff, 0x727173ff, 0x717072ff, 0x706f72ff, 0x706f71ff, 
-    0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 
-    0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 
-    0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
-    0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
-    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
-    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
-    0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
-    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
-    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
-    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
-    0x494654ff, 0x494552ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x727171ff, 0x727173ff, 0x717072ff, 0x706f72ff, 
-    0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 
-    0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 
-    0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 
-    0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
-    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
-    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
-    0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 
-    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
-    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
-    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
-    0x494654ff, 0x494654ff, 0x484554ff, 0x494551ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x727071ff, 0x717072ff, 
-    0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 
-    0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 
-    0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 
-    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 
-    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
-    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
-    0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 
-    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
-    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
-    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
-    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x484551ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x716f70ff, 0x706f72ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 0x6e6c70ff, 
-    0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 
-    0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
-    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
-    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
-    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
-    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
-    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
-    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
-    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
-    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
-    0x474553ff, 0x484551ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x706e70ff, 0x706f71ff, 0x6f6e71ff, 0x6e6d70ff, 
-    0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 
-    0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 
-    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
-    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
-    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
-    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
-    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
-    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
-    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
-    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
-    0x484553ff, 0x474553ff, 0x474553ff, 0x474550ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x706e6fff, 0x6f6e71ff, 
-    0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 
-    0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 
-    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
-    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
-    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
-    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
-    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
-    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
-    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
-    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
-    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x474450ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6f6d6fff, 0x6e6d70ff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 0x6c6a6eff, 
-    0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 
-    0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
-    0x636068ff, 0x727361ff, 0xc3d93eff, 0xceea38ff, 0xcae938ff, 0xc6e838ff, 
-    0xc3e738ff, 0xbfe639ff, 0xbbe539ff, 0xb7e439ff, 0xb4e339ff, 0xb0e23aff, 
-    0xace13aff, 0x96bf43ff, 0x5d5b5fff, 0x595560ff, 0x585460ff, 0x5b595dff, 
-    0x88bb44ff, 0x93d93bff, 0x8fd83bff, 0x8bd73cff, 0x88d53cff, 0x84d43cff, 
-    0x80d33dff, 0x7cd23dff, 0x78d13dff, 0x74d03eff, 0x70d03eff, 0x69bd41ff, 
-    0x535c55ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
-    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
-    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
-    0x464452ff, 0x46444fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x6e6c6eff, 0x6e6c70ff, 0x6d6c6fff, 0x6c6b6fff, 
-    0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 
-    0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 
-    0x646168ff, 0x636068ff, 0x625f67ff, 0xa0ac4dff, 0xd6f434ff, 0xd2f335ff, 
-    0xcef235ff, 0xcaf135ff, 0xc6f036ff, 0xc2ef36ff, 0xbeee36ff, 0xbaed36ff, 
-    0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0x728453ff, 0x585460ff, 
-    0x58535fff, 0x6d8153ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 
-    0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 
-    0x6fd83cff, 0x6bd73dff, 0x568d46ff, 0x4d4757ff, 0x4d4857ff, 0x4d4757ff, 
-    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
-    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
-    0x464552ff, 0x464452ff, 0x454451ff, 0x46444fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6e6b6eff, 0x6d6c6fff, 
-    0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 0x69676cff, 
-    0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 
-    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x828858ff, 
-    0xd1f135ff, 0xcef235ff, 0xcaf135ff, 0xc6f036ff, 0xc2ef36ff, 0xbeee36ff, 
-    0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa3df3aff, 
-    0x62675bff, 0x58535fff, 0x57525fff, 0x5f6459ff, 0x90da3bff, 0x8fe13aff, 
-    0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 
-    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d43dff, 0x4b684aff, 0x423f50ff, 
-    0x4c4656ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
-    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
-    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x45444fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6d6b6dff, 0x6c6b6fff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 0x6a686dff, 
-    0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
-    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
-    0x615e66ff, 0x605d66ff, 0x70725eff, 0xc5ea37ff, 0xc6f036ff, 0xc2ef36ff, 
-    0xbeee36ff, 0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 
-    0x98cc3fff, 0x5f615cff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
-    0x5a5d59ff, 0x81c441ff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 
-    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x66ce3eff, 0x46534dff, 
-    0x413e4eff, 0x413d4eff, 0x413e50ff, 0x4b4655ff, 0x4b4756ff, 0x4b4756ff, 
-    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
-    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
-    0x444451ff, 0x44444eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x6c6a6dff, 0x6c6a6eff, 0x6b696eff, 0x6a686dff, 
-    0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 
-    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
-    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0xbadf3bff, 
-    0xc2ef36ff, 0xbeee36ff, 0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 
-    0xaae838ff, 0xa6e738ff, 0x8bb945ff, 0x58535fff, 0x57525fff, 0x56525eff, 
-    0x56515eff, 0x55505dff, 0x544f5dff, 0x78b244ff, 0x83dd3bff, 0x7fdc3bff, 
-    0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 
-    0x5fc23fff, 0x413e4eff, 0x413d4eff, 0x403d4eff, 0x403d4dff, 0x413e4fff, 
-    0x4a4655ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
-    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
-    0x454451ff, 0x444451ff, 0x434450ff, 0x44434eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6c696cff, 0x6b696eff, 
-    0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 0x67656bff, 
-    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
-    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
-    0x5e5b64ff, 0xb1d63eff, 0xbeee36ff, 0xbaed36ff, 0xb6ec37ff, 0xb2eb37ff, 
-    0xaee937ff, 0xaae838ff, 0xa6e738ff, 0xa2e638ff, 0x84b047ff, 0x57525fff, 
-    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x72a947ff, 
-    0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 
-    0x67d63dff, 0x63d43dff, 0x59b940ff, 0x413d4eff, 0x403d4eff, 0x403d4dff, 
-    0x3f3d4dff, 0x3f3d4dff, 0x403e4eff, 0x494554ff, 0x494654ff, 0x494654ff, 
-    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
-    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x43434eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6b686cff, 0x6a686dff, 0x6a686dff, 0x69676cff, 0x68666cff, 0x68656bff, 
-    0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
-    0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
-    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0xa8cc41ff, 0xbaed36ff, 0xb6ec37ff, 
-    0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 
-    0x7ea649ff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
-    0x534e5cff, 0x6ca048ff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 
-    0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x55af41ff, 0x403d4eff, 
-    0x403d4dff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 0x3f3e4eff, 
-    0x484553ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
-    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
-    0x424350ff, 0x43434dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x6a676bff, 0x6a686dff, 0x69676cff, 0x68666cff, 
-    0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 
-    0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
-    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x9fc243ff, 
-    0xb6ec37ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa6e738ff, 0xa2e638ff, 
-    0x9fe539ff, 0x9be439ff, 0x779e4bff, 0x56515eff, 0x55505dff, 0x544f5dff, 
-    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x68974aff, 0x77da3cff, 0x73d93cff, 
-    0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
-    0x51a643ff, 0x403d4dff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 
-    0x3e3c4cff, 0x3e3d4cff, 0x3f3c4dff, 0x474452ff, 0x474553ff, 0x474553ff, 
-    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
-    0x434350ff, 0x424350ff, 0x42434fff, 0x42434dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6a676bff, 0x69676cff, 
-    0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 0x656269ff, 
-    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 
-    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
-    0x6e755bff, 0xaddc3bff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 0xa6e738ff, 
-    0xa2e638ff, 0x9fe539ff, 0x9be439ff, 0x97e339ff, 0x8fd83bff, 0x87ce3eff, 
-    0x83cc3eff, 0x80ca3eff, 0x7dca3fff, 0x79c93fff, 0x76c83fff, 0x75d03eff, 
-    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
-    0x5cd23eff, 0x58d13eff, 0x52bf40ff, 0x41564bff, 0x3f3d4dff, 0x3e3c4dff, 
-    0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3e3d4dff, 
-    0x464452ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
-    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x42424cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x69666aff, 0x68666cff, 0x68656bff, 0x67656bff, 0x66646aff, 0x66636aff, 
-    0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
-    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
-    0x5d5963ff, 0x5c5863ff, 0x9bc044ff, 0xb2eb37ff, 0xaee937ff, 0xaae838ff, 
-    0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 0x9be439ff, 0x97e339ff, 0x93e239ff, 
-    0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 
-    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 
-    0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x48a243ff, 
-    0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 
-    0x3d3c4bff, 0x3d3c4cff, 0x3e3d4cff, 0x454351ff, 0x454451ff, 0x454451ff, 
-    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
-    0x41424eff, 0x41424cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x68656aff, 0x68656bff, 0x67656bff, 0x66646aff, 
-    0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
-    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
-    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x89a54bff, 0xaee937ff, 
-    0xaae838ff, 0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 0x9be439ff, 0x97e339ff, 
-    0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 
-    0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 
-    0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 
-    0x4cce3fff, 0x438846ff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 
-    0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3d3d4cff, 
-    0x444350ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
-    0x41434fff, 0x41424eff, 0x40424eff, 0x41424cff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x686469ff, 0x67656bff, 
-    0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 0x636068ff, 
-    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
-    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
-    0x5b5861ff, 0x8aad49ff, 0xa6e738ff, 0xa2e638ff, 0x9fe539ff, 0x9be439ff, 
-    0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x83ce3cff, 0x638747ff, 0x5d8049ff, 
-    0x71b940ff, 0x7bdb3bff, 0x77da3cff, 0x68b641ff, 0x547c48ff, 0x548347ff, 
-    0x63c63fff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 
-    0x50cf3fff, 0x4cce3fff, 0x449345ff, 0x3f3e4dff, 0x3e3c4cff, 0x3e3d4cff, 
-    0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
-    0x3c3b4aff, 0x3c3b4bff, 0x3c3c4cff, 0x42434fff, 0x434350ff, 0x424350ff, 
-    0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x40424bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x676469ff, 0x66646aff, 0x66636aff, 0x656269ff, 0x646269ff, 0x646168ff, 
-    0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
-    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
-    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x7a944fff, 0xa2e638ff, 0x9fe539ff, 
-    0x9be439ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 0x586c4cff, 
-    0x454252ff, 0x444251ff, 0x66a144ff, 0x77da3cff, 0x73d93cff, 0x5e9d44ff, 
-    0x423f50ff, 0x413e4fff, 0x4b684aff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 
-    0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x407947ff, 0x3e3c4cff, 
-    0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 
-    0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3c3c4bff, 
-    0x41424fff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 
-    0x3f424dff, 0x40424bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x666368ff, 0x66636aff, 0x656269ff, 0x646269ff, 
-    0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
-    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
-    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x738b51ff, 
-    0x9fe539ff, 0x9be439ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 
-    0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 
-    0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
-    0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 
-    0x3f7148ff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 
-    0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3c3c4aff, 0x40424eff, 0x41424eff, 0x40424eff, 
-    0x40424eff, 0x3f424dff, 0x3f424dff, 0x3f414bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666268ff, 0x656269ff, 
-    0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 
-    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
-    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
-    0x585460ff, 0x6e8153ff, 0x9be439ff, 0x97e339ff, 0x93e239ff, 0x8fe13aff, 
-    0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 
-    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
-    0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 
-    0x44cc40ff, 0x40cb40ff, 0x3e6848ff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 
-    0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
-    0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3b3b49ff, 
-    0x3f414dff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3f414bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x656167ff, 0x646269ff, 0x646168ff, 0x636068ff, 0x625f67ff, 0x625f67ff, 
-    0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
-    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
-    0x595560ff, 0x585460ff, 0x58535fff, 0x697756ff, 0x97e339ff, 0x93e239ff, 
-    0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 
-    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 
-    0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 
-    0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x3c5e4aff, 0x3e3b4cff, 
-    0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 
-    0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 
-    0x3a3b48ff, 0x393b49ff, 0x3b3b49ff, 0x3f414cff, 0x3f424dff, 0x3e414dff, 
-    0x3e414cff, 0x3e414bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x646167ff, 0x646168ff, 0x636068ff, 0x625f67ff, 
-    0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
-    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
-    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x636f57ff, 
-    0x93e239ff, 0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 
-    0x7bdb3bff, 0x5a8247ff, 0x50694bff, 0x4f684bff, 0x5fad42ff, 0x67d63dff, 
-    0x63d43dff, 0x56a942ff, 0x49654aff, 0x46654aff, 0x497d46ff, 0x50cf3fff, 
-    0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 
-    0x3c564aff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 
-    0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393c48ff, 
-    0x3e404cff, 0x3e414cff, 0x3d414cff, 0x3e414aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x646066ff, 0x636068ff, 
-    0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 
-    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
-    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
-    0x56525eff, 0x5f6659ff, 0x8fe13aff, 0x8bdf3aff, 0x87de3aff, 0x83dd3bff, 
-    0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x68b341ff, 0x4c5e4cff, 0x47544dff, 
-    0x5aa443ff, 0x63d43dff, 0x5fd33dff, 0x53a043ff, 0x43514cff, 0x445b4aff, 
-    0x4cac42ff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 
-    0x38c841ff, 0x34c741ff, 0x3b5049ff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
-    0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
-    0x393b48ff, 0x393a48ff, 0x393c48ff, 0x3d414cff, 0x3d414bff, 0x3d414aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x635f66ff, 0x625f67ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 0x605c65ff, 
-    0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
-    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
-    0x57525fff, 0x56525eff, 0x56515eff, 0x5a5c5aff, 0x8bdf3aff, 0x87de3aff, 
-    0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 
-    0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 
-    0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 
-    0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x3b464bff, 0x3c3c4bff, 
-    0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 
-    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x393b48ff, 
-    0x3c414bff, 0x3d404aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x625e65ff, 0x625f67ff, 0x615e66ff, 0x605d66ff, 
-    0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
-    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
-    0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x56535cff, 
-    0x87de3aff, 0x83dd3bff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 0x73d93cff, 
-    0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
-    0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 
-    0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x2cc541ff, 
-    0x3c404bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 
-    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
-    0x383b47ff, 0x383b47ff, 0x383a47ff, 0x3c4049ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x625e65ff, 0x615e66ff, 
-    0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 
-    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
-    0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 
-    0x544f5dff, 0x544e5cff, 0x81d93cff, 0x7fdc3bff, 0x7bdb3bff, 0x77da3cff, 
-    0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
-    0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 
-    0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 
-    0x2cc541ff, 0x29c042ff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
-    0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
-    0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
-    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x393b46ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x615d64ff, 0x605d66ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 0x5e5a64ff, 
-    0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
-    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
-    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x7bcf3eff, 0x7bdb3bff, 
-    0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 
-    0x5fd33dff, 0x57ba41ff, 0x497448ff, 0x43524bff, 0x41514bff, 0x447348ff, 
-    0x47b641ff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x34c741ff, 
-    0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x26b643ff, 0x3c3b4aff, 0x3c3b4bff, 
-    0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 
-    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 
-    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
-    0x373a47ff, 0x373a45ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x605c64ff, 0x605c65ff, 0x5f5b65ff, 0x5e5b64ff, 
-    0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
-    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
-    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
-    0x75c63fff, 0x77da3cff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 0x67d63dff, 
-    0x63d43dff, 0x5fd33dff, 0x54aa42ff, 0x40434dff, 0x403d4dff, 0x3f3d4dff, 
-    0x3f3d4dff, 0x3e3c4dff, 0x3f424dff, 0x40a543ff, 0x3cc940ff, 0x38c841ff, 
-    0x34c741ff, 0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 0x24af43ff, 
-    0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 
-    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
-    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x373a44ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x605b63ff, 0x5f5b65ff, 
-    0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 
-    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
-    0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
-    0x524d5bff, 0x524c5bff, 0x70bd42ff, 0x73d93cff, 0x6fd83cff, 0x6bd73dff, 
-    0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5bcb3fff, 0x424a4cff, 0x403d4dff, 
-    0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 0x3d494bff, 
-    0x38c242ff, 0x34c741ff, 0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 
-    0x20c242ff, 0x22a644ff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
-    0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
-    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a45ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5f5a63ff, 0x5e5b64ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 0x5c5862ff, 
-    0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
-    0x57525fff, 0x56525eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
-    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x6ab443ff, 0x6fd83cff, 
-    0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 0x509e44ff, 
-    0x403d4dff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 
-    0x3e3d4cff, 0x3d3b4dff, 0x379745ff, 0x30c641ff, 0x2cc541ff, 0x28c442ff, 
-    0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x239e45ff, 0x3b3c4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 
-    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 
-    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
-    0x363a46ff, 0x373a44ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x5e5a62ff, 0x5e5a64ff, 0x5d5963ff, 0x5c5863ff, 
-    0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
-    0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 
-    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
-    0x65ab45ff, 0x6bd73dff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 0x5cd23eff, 
-    0x58d13eff, 0x4a8645ff, 0x3f3d4dff, 0x3f3d4dff, 0x3e3c4dff, 0x3e3c4dff, 
-    0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x378046ff, 0x2cc541ff, 
-    0x28c442ff, 0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 0x219546ff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 
-    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
-    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
-    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x363a44ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5e5962ff, 0x5d5963ff, 
-    0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 
-    0x585460ff, 0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 
-    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
-    0x504b5aff, 0x504a59ff, 0x60a247ff, 0x67d63dff, 0x63d43dff, 0x5fd33dff, 
-    0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x477c46ff, 0x3f3d4dff, 0x3e3c4dff, 
-    0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 
-    0x357948ff, 0x28c442ff, 0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 
-    0x15be43ff, 0x218c46ff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
-    0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
-    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
-    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x363a44ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5d5861ff, 0x5c5863ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 0x5a5561ff, 
-    0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 0x56515eff, 
-    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
-    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x5d9949ff, 0x63d43dff, 
-    0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 0x447448ff, 
-    0x3e3c4dff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 
-    0x3d3c4bff, 0x3d3c4cff, 0x347047ff, 0x24c342ff, 0x20c242ff, 0x1cc143ff, 
-    0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x218446ff, 0x3b3b4aff, 0x3a3b4aff, 
-    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 
-    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
-    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
-    0x353a45ff, 0x353943ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x5c5761ff, 0x5c5862ff, 0x5b5762ff, 0x5a5661ff, 
-    0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56525eff, 
-    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
-    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
-    0x59904aff, 0x5fd33dff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 0x50cf3fff, 
-    0x4cce3fff, 0x416a49ff, 0x3e3c4dff, 0x3e3c4cff, 0x3e3d4cff, 0x3d3b4dff, 
-    0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x356749ff, 0x20c242ff, 
-    0x1cc143ff, 0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 0x237c47ff, 
-    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 
-    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
-    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
-    0x353a45ff, 0x353a45ff, 0x343944ff, 0x353943ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5c5760ff, 0x5b5762ff, 
-    0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 0x57525fff, 
-    0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
-    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
-    0x4e4858ff, 0x4e4858ff, 0x56884bff, 0x5cd23eff, 0x58d13eff, 0x54d03eff, 
-    0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x40624aff, 0x3e3c4cff, 0x3e3d4cff, 
-    0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
-    0x355f48ff, 0x1cc143ff, 0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 
-    0x0cbb44ff, 0x257547ff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
-    0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
-    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
-    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x343944ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5b5660ff, 0x5a5661ff, 0x5a5561ff, 0x595560ff, 0x585460ff, 0x58535fff, 
-    0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
-    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
-    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x537f4dff, 0x58d13eff, 
-    0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 0x3e594aff, 
-    0x3e3d4cff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 
-    0x3c3b4cff, 0x3c3b4aff, 0x365749ff, 0x19c043ff, 0x15be43ff, 0x11bd44ff, 
-    0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x286d46ff, 0x393b49ff, 0x393b49ff, 
-    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 
-    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
-    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
-    0x333944ff, 0x343a43ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x5a555fff, 0x5a5561ff, 0x595560ff, 0x585460ff, 
-    0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 
-    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
-    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
-    0x50764eff, 0x54d03eff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 0x44cc40ff, 
-    0x40cb40ff, 0x3e514aff, 0x3d3b4dff, 0x3e3b4cff, 0x3d3c4bff, 0x3d3c4cff, 
-    0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x37504aff, 0x15be43ff, 
-    0x11bd44ff, 0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 0x2a6548ff, 
-    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
-    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
-    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
-    0x343944ff, 0x333944ff, 0x333a44ff, 0x343942ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5a545fff, 0x595560ff, 
-    0x585460ff, 0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 0x55505dff, 
-    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
-    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
-    0x4d4757ff, 0x4c4757ff, 0x4e6f4fff, 0x50cf3fff, 0x4cce3fff, 0x48cd3fff, 
-    0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x3c484cff, 0x3e3b4cff, 0x3d3c4bff, 
-    0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
-    0x374849ff, 0x11bd44ff, 0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 
-    0x0cb846ff, 0x2c5e48ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
-    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
-    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
-    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x343942ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x59545eff, 0x585460ff, 0x58535fff, 0x57525fff, 0x56515eff, 0x56515eff, 
-    0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
-    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
-    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4c6650ff, 0x4cce3fff, 
-    0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 0x3e3f4cff, 
-    0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 
-    0x3c3c4bff, 0x3b3c4aff, 0x3a4049ff, 0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 
-    0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x2f5548ff, 0x393b48ff, 0x393a48ff, 
-    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
-    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
-    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
-    0x333943ff, 0x333942ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x58535eff, 0x58535fff, 0x57525fff, 0x56515eff, 
-    0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
-    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
-    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
-    0x4b5e52ff, 0x48cd3fff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 0x38c841ff, 
-    0x34c341ff, 0x3d3c4bff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 0x3c3b4aff, 
-    0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x0db844ff, 
-    0x0cba45ff, 0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x0cb547ff, 0x324f48ff, 
-    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
-    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
-    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
-    0x333943ff, 0x333943ff, 0x323943ff, 0x333a42ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x58525dff, 0x57525fff, 
-    0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 
-    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
-    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
-    0x4b4756ff, 0x4b4756ff, 0x4a5552ff, 0x44cc40ff, 0x40cb40ff, 0x3cc940ff, 
-    0x38c841ff, 0x34c741ff, 0x31bb42ff, 0x3d3c4cff, 0x3c3c4bff, 0x3c3b4cff, 
-    0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x0fb046ff, 0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x0cb547ff, 
-    0x0cb447ff, 0x344848ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
-    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
-    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
-    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x333941ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x57515dff, 0x56515eff, 0x56515eff, 0x55505dff, 0x544f5dff, 0x544e5cff, 
-    0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
-    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
-    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4d54ff, 0x40cb40ff, 
-    0x3cc940ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x2eb242ff, 0x3c3c4bff, 
-    0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x12a846ff, 0x0cb846ff, 0x0cb746ff, 
-    0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x374047ff, 0x383b48ff, 0x383b47ff, 
-    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
-    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
-    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
-    0x323942ff, 0x333841ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x56505cff, 0x56515eff, 0x55505dff, 0x544f5dff, 
-    0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
-    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
-    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
-    0x494754ff, 0x3dc840ff, 0x38c841ff, 0x34c741ff, 0x30c641ff, 0x2cc541ff, 
-    0x2caa44ff, 0x3c3b4cff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 0x3b3c4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x15a047ff, 
-    0x0cb746ff, 0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x0cb148ff, 0x383c48ff, 
-    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
-    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
-    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
-    0x333a43ff, 0x323942ff, 0x323841ff, 0x313941ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x56505cff, 0x55505dff, 
-    0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 
-    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
-    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
-    0x4a4655ff, 0x494654ff, 0x494654ff, 0x39c142ff, 0x34c741ff, 0x30c641ff, 
-    0x2cc541ff, 0x28c442ff, 0x2aa144ff, 0x3c3b4aff, 0x3c3b4bff, 0x3c3c4bff, 
-    0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
-    0x393b49ff, 0x179947ff, 0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x0cb248ff, 
-    0x0daa48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
-    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
-    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
-    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x313940ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x554f5bff, 0x544f5dff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 0x524c5bff, 
-    0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
-    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
-    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x36b843ff, 
-    0x30c641ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 0x299845ff, 0x3c3b4bff, 
-    0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 
-    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x199047ff, 0x0cb447ff, 0x0cb348ff, 
-    0x0cb248ff, 0x0bb148ff, 0x11a248ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
-    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
-    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
-    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
-    0x303941ff, 0x313941ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x544e5bff, 0x544e5cff, 0x534e5cff, 0x524d5bff, 
-    0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
-    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
-    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
-    0x484553ff, 0x34b044ff, 0x2cc541ff, 0x28c442ff, 0x24c342ff, 0x20c242ff, 
-    0x289046ff, 0x3c3c4bff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x1d8847ff, 
-    0x0cb348ff, 0x0cb248ff, 0x0bb148ff, 0x0bb049ff, 0x139a49ff, 0x373947ff, 
-    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
-    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
-    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
-    0x303842ff, 0x303941ff, 0x303941ff, 0x313941ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x544d5aff, 0x534e5cff, 
-    0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 
-    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
-    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
-    0x484554ff, 0x484553ff, 0x474553ff, 0x32a845ff, 0x28c442ff, 0x24c342ff, 
-    0x20c242ff, 0x1cc143ff, 0x278847ff, 0x3b3c4aff, 0x3b3b4aff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
-    0x393b48ff, 0x1f8048ff, 0x0cb248ff, 0x0bb148ff, 0x0bb049ff, 0x0baf49ff, 
-    0x159349ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
-    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
-    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
-    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x303940ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x534d5aff, 0x524d5bff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 0x504a59ff, 
-    0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
-    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
-    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x31a046ff, 
-    0x24c342ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 0x277f47ff, 0x3b3b4aff, 
-    0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 
-    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x217948ff, 0x0bb148ff, 0x0bb049ff, 
-    0x0baf49ff, 0x0bae4aff, 0x188c49ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
-    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
-    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
-    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
-    0x2f3841ff, 0x30393fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x524c59ff, 0x524c5bff, 0x514b5aff, 0x504b5aff, 
-    0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
-    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
-    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
-    0x464552ff, 0x309747ff, 0x20c242ff, 0x1cc143ff, 0x19c043ff, 0x15be43ff, 
-    0x287747ff, 0x3b3b4aff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 0x393b49ff, 
-    0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x237248ff, 
-    0x0bb049ff, 0x0baf49ff, 0x0bae4aff, 0x0bad4aff, 0x1a834aff, 0x363a46ff, 
-    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
-    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
-    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
-    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x30393fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x524c59ff, 0x514b5aff, 
-    0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 
-    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
-    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
-    0x474553ff, 0x464552ff, 0x464452ff, 0x2f8f48ff, 0x1cc143ff, 0x19c043ff, 
-    0x15be43ff, 0x11bd44ff, 0x286f47ff, 0x3b3b4aff, 0x3a3b4aff, 0x3a3b48ff, 
-    0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
-    0x383b48ff, 0x256b48ff, 0x0baf49ff, 0x0bae4aff, 0x0bad4aff, 0x0bab4bff, 
-    0x1d7c49ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
-    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
-    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
-    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x30393fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x514b58ff, 0x504b5aff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 0x4e4858ff, 
-    0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
-    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
-    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x2f8749ff, 
-    0x19c043ff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 0x2a6748ff, 0x3a3b4aff, 
-    0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 
-    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x286448ff, 0x0bae4aff, 0x0bad4aff, 
-    0x0bab4bff, 0x0baa4bff, 0x1f7649ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
-    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
-    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
-    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
-    0x2f3940ff, 0x2e383fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x504b58ff, 0x504a59ff, 0x4f4959ff, 0x4e4858ff, 
-    0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
-    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
-    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
-    0x454451ff, 0x2f804bff, 0x15be43ff, 0x11bd44ff, 0x0dbc44ff, 0x0cbb44ff, 
-    0x2c6049ff, 0x3a3b48ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 0x393b48ff, 
-    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x2a5b48ff, 
-    0x0bad4aff, 0x0bab4bff, 0x0baa4bff, 0x0ba94cff, 0x216f49ff, 0x363a45ff, 
-    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
-    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
-    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
-    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2e393fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x504a57ff, 0x4f4959ff, 
-    0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 
-    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
-    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
-    0x454451ff, 0x454451ff, 0x444451ff, 0x2f784bff, 0x11bd44ff, 0x0dbc44ff, 
-    0x0cbb44ff, 0x0cba45ff, 0x305847ff, 0x393b49ff, 0x393b49ff, 0x393a48ff, 
-    0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
-    0x373947ff, 0x2c5547ff, 0x0bab4bff, 0x0baa4bff, 0x0ba94cff, 0x0ba84cff, 
-    0x246848ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
-    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
-    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
-    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2d393fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f4957ff, 0x4e4858ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 0x4c4757ff, 
-    0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
-    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
-    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x30704bff, 
-    0x0dbc44ff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 0x315148ff, 0x393b49ff, 
-    0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 
-    0x383b47ff, 0x373947ff, 0x363a46ff, 0x2f4f48ff, 0x0baa4bff, 0x0ba94cff, 
-    0x0ba84cff, 0x0ba74cff, 0x256248ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
-    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
-    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
-    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
-    0x2c393fff, 0x2d393eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4e4856ff, 0x4e4858ff, 0x4d4857ff, 0x4d4757ff, 
-    0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
-    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
-    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
-    0x434350ff, 0x31694cff, 0x0cbb44ff, 0x0cba45ff, 0x0cb945ff, 0x0cb846ff, 
-    0x334a48ff, 0x393a48ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 0x383b48ff, 
-    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x304846ff, 
-    0x0ba94cff, 0x0ba84cff, 0x0ba74cff, 0x0ba64dff, 0x285b48ff, 0x343944ff, 
-    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
-    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
-    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
-    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2d383dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4e4856ff, 0x4d4857ff, 
-    0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 
-    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
-    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
-    0x434450ff, 0x434350ff, 0x424350ff, 0x34624cff, 0x0cba45ff, 0x0cb945ff, 
-    0x0cb846ff, 0x0cb746ff, 0x374248ff, 0x393b48ff, 0x393a48ff, 0x393a47ff, 
-    0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
-    0x363a46ff, 0x344146ff, 0x0ba84cff, 0x0ba74cff, 0x0ba64dff, 0x0ba54dff, 
-    0x2a5447ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
-    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
-    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
-    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2c383eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4d4855ff, 0x4d4757ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 0x4b4756ff, 
-    0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
-    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
-    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x365b4dff, 
-    0x0cb945ff, 0x0cb846ff, 0x0cb746ff, 0x0cb447ff, 0x383c48ff, 0x393a48ff, 
-    0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 
-    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x353b46ff, 0x0ba64cff, 0x0ba64dff, 
-    0x0ba54dff, 0x0ba44eff, 0x2c4e46ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
-    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
-    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
-    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
-    0x2b373eff, 0x2c383dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4d4755ff, 0x4c4757ff, 0x4c4756ff, 0x4b4756ff, 
-    0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 
-    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
-    0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
-    0x41434fff, 0x3a534dff, 0x0cb846ff, 0x0cb746ff, 0x0cb547ff, 0x0eae47ff, 
-    0x393a48ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 0x373947ff, 
-    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
-    0x0ca14cff, 0x0ba54dff, 0x0ba44eff, 0x0ba24eff, 0x2e4746ff, 0x333a44ff, 
-    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
-    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
-    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
-    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2b383dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4d4755ff, 0x4c4756ff, 
-    0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 
-    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
-    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 
-    0x42434fff, 0x41434fff, 0x41424eff, 0x3b4c4dff, 0x0cb746ff, 0x0cb547ff, 
-    0x0cb447ff, 0x11a548ff, 0x393a47ff, 0x383b48ff, 0x383b47ff, 0x383b47ff, 
-    0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
-    0x363a45ff, 0x353a45ff, 0x109a4cff, 0x0ba44eff, 0x0ba24eff, 0x0ba14fff, 
-    0x304245ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
-    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
-    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 
-    0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2b383dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4d4754ff, 0x4b4756ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 0x494654ff, 
-    0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
-    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
-    0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x3e454eff, 
-    0x0cb547ff, 0x0cb447ff, 0x0cb348ff, 0x139f48ff, 0x383b48ff, 0x383b47ff, 
-    0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 
-    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x11934cff, 0x0ba24eff, 
-    0x0ba14fff, 0x0ba04fff, 0x323b43ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
-    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
-    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
-    0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 
-    0x2a383eff, 0x2a383cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4c4754ff, 0x4b4756ff, 0x4a4655ff, 0x4a4655ff, 
-    0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 
-    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
-    0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 
-    0x40424eff, 0x3f424dff, 0x0eb147ff, 0x0cb348ff, 0x0cb248ff, 0x169648ff, 
-    0x383b47ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 0x363a46ff, 
-    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
-    0x148b4cff, 0x0ba14fff, 0x0ba04fff, 0x0d9c4fff, 0x333943ff, 0x323943ff, 
-    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
-    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
-    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 
-    0x2a383eff, 0x2a383eff, 0x29383dff, 0x2a383cff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4c4754ff, 0x4a4655ff, 
-    0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 0x474553ff, 
-    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
-    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 
-    0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x10aa49ff, 0x0cb248ff, 
-    0x0bb148ff, 0x188f48ff, 0x383b47ff, 0x373947ff, 0x363a46ff, 0x373a47ff, 
-    0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
-    0x343944ff, 0x343944ff, 0x16844cff, 0x0ba04fff, 0x0b9f50ff, 0x0f954fff, 
-    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
-    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
-    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 
-    0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x29383cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4b4653ff, 0x4a4655ff, 0x494654ff, 0x494654ff, 0x484554ff, 0x484553ff, 
-    0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
-    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
-    0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 
-    0x13a249ff, 0x0bb148ff, 0x0bb049ff, 0x1a8848ff, 0x373947ff, 0x363a46ff, 
-    0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 
-    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x187e4cff, 0x0b9f50ff, 
-    0x0b9e50ff, 0x108e4eff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
-    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
-    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
-    0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 
-    0x28383dff, 0x29383bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4b4653ff, 0x494654ff, 0x494654ff, 0x484554ff, 
-    0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 
-    0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
-    0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 
-    0x3e414dff, 0x3e414cff, 0x159b49ff, 0x0bb049ff, 0x0baf49ff, 0x1d8049ff, 
-    0x363a46ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 
-    0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
-    0x1b774bff, 0x0b9e50ff, 0x0b9d50ff, 0x12884eff, 0x323942ff, 0x323841ff, 
-    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
-    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
-    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 
-    0x29383dff, 0x28383dff, 0x28383cff, 0x28383bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4a4652ff, 0x494654ff, 
-    0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 0x464452ff, 
-    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 
-    0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 
-    0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x189349ff, 0x0baf49ff, 
-    0x0bae4aff, 0x1e7949ff, 0x373a47ff, 0x363a46ff, 0x363a45ff, 0x363a46ff, 
-    0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 
-    0x333a44ff, 0x333943ff, 0x1d714aff, 0x0b9d50ff, 0x0a9c51ff, 0x14824dff, 
-    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
-    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 
-    0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 
-    0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x28373aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4a4652ff, 0x484554ff, 0x484553ff, 0x474553ff, 0x474553ff, 0x464552ff, 
-    0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
-    0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 
-    0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 
-    0x207f49ff, 0x0bae4aff, 0x0bad4aff, 0x276449ff, 0x363a46ff, 0x363a45ff, 
-    0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 
-    0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x235e48ff, 0x0a9c51ff, 
-    0x0a9b51ff, 0x1c6e4bff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
-    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
-    0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 
-    0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 
-    0x27373bff, 0x27373aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x494552ff, 0x484553ff, 0x474553ff, 0x474553ff, 
-    0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 
-    0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 
-    0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 
-    0x3d414bff, 0x3c414bff, 0x3a454aff, 0x237048ff, 0x256749ff, 0x363b46ff, 
-    0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 0x343944ff, 
-    0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 
-    0x333b43ff, 0x225f48ff, 0x206549ff, 0x2e3d43ff, 0x303941ff, 0x303941ff, 
-    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
-    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 
-    0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 
-    0x27383cff, 0x27373bff, 0x26373bff, 0x27373aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x494551ff, 0x474553ff, 
-    0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 0x444451ff, 
-    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 
-    0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 
-    0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b3f49ff, 
-    0x373b47ff, 0x363a45ff, 0x363a46ff, 0x363a45ff, 0x353a45ff, 0x353a45ff, 
-    0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 0x333943ff, 
-    0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
-    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
-    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 
-    0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 
-    0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 0x263739ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x484551ff, 0x474553ff, 0x464552ff, 0x464452ff, 0x454451ff, 0x454451ff, 
-    0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
-    0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 
-    0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 
-    0x3b404aff, 0x3a404aff, 0x3a3f48ff, 0x363b47ff, 0x363a45ff, 0x353a45ff, 
-    0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 0x333943ff, 
-    0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 
-    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
-    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
-    0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 
-    0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 
-    0x25373aff, 0x263739ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x484551ff, 0x464552ff, 0x464452ff, 0x454451ff, 
-    0x444451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 
-    0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 
-    0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 
-    0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f47ff, 
-    0x363b45ff, 0x353a45ff, 0x343944ff, 0x343944ff, 0x333944ff, 0x333a44ff, 
-    0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 0x323841ff, 
-    0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
-    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
-    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 
-    0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 
-    0x26373bff, 0x25373aff, 0x25373aff, 0x253639ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x474550ff, 0x464452ff, 
-    0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 0x424350ff, 
-    0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 
-    0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 
-    0x3c404bff, 0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 
-    0x393f48ff, 0x383f48ff, 0x383f48ff, 0x353b45ff, 0x343944ff, 0x333944ff, 
-    0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 0x323942ff, 
-    0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 
-    0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 
-    0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 
-    0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 
-    0x26373bff, 0x26373bff, 0x25373aff, 0x25373aff, 0x24363aff, 0x253638ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x474450ff, 0x454451ff, 0x454451ff, 0x444451ff, 0x434450ff, 0x434350ff, 
-    0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 
-    0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 
-    0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 
-    0x393f49ff, 0x393f48ff, 0x383f48ff, 0x383f48ff, 0x373e47ff, 0x373e47ff, 
-    0x353b45ff, 0x333a44ff, 0x333943ff, 0x333943ff, 0x323943ff, 0x333a43ff, 
-    0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 0x303941ff, 
-    0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 
-    0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 
-    0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 
-    0x27373bff, 0x26373bff, 0x26373bff, 0x25373aff, 0x25373aff, 0x24363aff, 
-    0x243639ff, 0x243638ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x46444fff, 0x454451ff, 0x444451ff, 0x434450ff, 
-    0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 0x40424eff, 
-    0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 0x3d414cff, 
-    0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b404aff, 0x3a404aff, 
-    0x3a3f49ff, 0x393f49ff, 0x393f48ff, 0x383f48ff, 0x383f48ff, 0x373e47ff, 
-    0x373e47ff, 0x363e47ff, 0x363e46ff, 0x333944ff, 0x333943ff, 0x323943ff, 
-    0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 0x303941ff, 
-    0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 0x2d3840ff, 
-    0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 0x2b383eff, 
-    0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 0x28383cff, 
-    0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 0x25373aff, 0x25373aff, 
-    0x24363aff, 0x243639ff, 0x233639ff, 0x243637ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x46404aff, 0x444451ff, 
-    0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 0x41424eff, 
-    0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 0x3e414cff, 
-    0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 0x3b404aff, 
-    0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f48ff, 0x383f48ff, 0x383f48ff, 
-    0x373e47ff, 0x373e47ff, 0x363e47ff, 0x363e46ff, 0x353d46ff, 0x353d45ff, 
-    0x323a43ff, 0x333a43ff, 0x323942ff, 0x323841ff, 0x303842ff, 0x303941ff, 
-    0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 0x2f3940ff, 
-    0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 0x2b373eff, 
-    0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 0x28383dff, 
-    0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 0x25373aff, 
-    0x25373aff, 0x24363aff, 0x243639ff, 0x233639ff, 0x233638ff, 0x293333ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x553c3aea, 0x434450ff, 0x434350ff, 0x424350ff, 0x42434fff, 0x41434fff, 
-    0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 0x3e414dff, 
-    0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 0x3b404aff, 
-    0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f48ff, 0x383f48ff, 
-    0x383f48ff, 0x373e47ff, 0x373e47ff, 0x363e47ff, 0x363e46ff, 0x353d46ff, 
-    0x353d45ff, 0x343d45ff, 0x343d45ff, 0x323a42ff, 0x323841ff, 0x303842ff, 
-    0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 0x2e393fff, 
-    0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 0x2c383eff, 
-    0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 0x29383dff, 
-    0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 0x26373bff, 
-    0x25373aff, 0x25373aff, 0x24363aff, 0x243639ff, 0x233639ff, 0x233638ff, 
-    0x223538ff, 0x41332be9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x713c3522, 0x4e3c3df7, 0x424350ff, 0x42434fff, 
-    0x41434fff, 0x41424eff, 0x40424eff, 0x40424eff, 0x3f424dff, 0x3f424dff, 
-    0x3e414dff, 0x3e414cff, 0x3d414cff, 0x3d414bff, 0x3c414bff, 0x3c404bff, 
-    0x3b404aff, 0x3b404aff, 0x3a404aff, 0x3a3f49ff, 0x393f49ff, 0x393f48ff, 
-    0x383f48ff, 0x383f48ff, 0x373e47ff, 0x373e47ff, 0x363e47ff, 0x363e46ff, 
-    0x353d46ff, 0x353d45ff, 0x343d45ff, 0x343d45ff, 0x333d44ff, 0x333c44ff, 
-    0x313943ff, 0x303941ff, 0x303941ff, 0x303941ff, 0x2f3841ff, 0x2f3940ff, 
-    0x2e393fff, 0x2f3940ff, 0x2d3840ff, 0x2d383fff, 0x2c393fff, 0x2b393fff, 
-    0x2c383eff, 0x2b373eff, 0x2b383eff, 0x2a383eff, 0x2a383eff, 0x29383dff, 
-    0x29383dff, 0x28383dff, 0x28383cff, 0x27383cff, 0x27373bff, 0x26373bff, 
-    0x26373bff, 0x25373aff, 0x25373aff, 0x24363aff, 0x243639ff, 0x233639ff, 
-    0x233638ff, 0x223538ff, 0x38332ef6, 0x60382820, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6d3d2c4b, 0x673d2f97, 0x633d309b, 0x633d309b, 0x633d309b, 0x633d309b, 
-    0x633d309b, 0x633b309b, 0x633b2e9b, 0x613b2e9b, 0x613b2e9b, 0x613b2e9b, 
-    0x613b2e9b, 0x613b2e9b, 0x613b2e9b, 0x5f3b2e9b, 0x5f3b2c9b, 0x5f3b2c9b, 
-    0x5f3b2c9b, 0x5f3b2c9b, 0x5f3b2c9b, 0x5f3b2c9b, 0x5f3b2c9b, 0x5e3b2c9b, 
-    0x5e3b2c9b, 0x5e3a2c9b, 0x5e3a2b9b, 0x5e3a2b9b, 0x5e3a2b9b, 0x5e3a2b9b, 
-    0x5e3a2b9b, 0x5c3a2b9b, 0x5c3a2b9b, 0x5b372a9d, 0x5b372a9d, 0x5b372c9d, 
-    0x5b372c9d, 0x5b372a9d, 0x5c392b9c, 0x58382b9c, 0x58382b9c, 0x58382b9c, 
-    0x5a38299c, 0x5a38299c, 0x5838299c, 0x5838299c, 0x5938299b, 0x5938299b, 
-    0x5938279b, 0x5938279b, 0x5938279b, 0x5938279b, 0x5738279b, 0x5738279b, 
-    0x5738279b, 0x5738279b, 0x5738269b, 0x5738269b, 0x5736269b, 0x5736269b, 
-    0x5636269b, 0x5636269b, 0x5a382597, 0x633a224b, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-};
diff --git a/games/NXDoom/src/heretic/in_lude.c b/games/NXDoom/src/heretic/in_lude.c
deleted file mode 100644
index a8ac4255d..000000000
--- a/games/NXDoom/src/heretic/in_lude.c
+++ /dev/null
@@ -1,1075 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-/*
-========================
-=
-= IN_lude.c
-=
-========================
-*/
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "i_video.h"
-#include "v_video.h"
-#include "am_map.h"
-
-
-typedef enum
-{
-    SINGLE,
-    COOPERATIVE,
-    DEATHMATCH
-} gametype_t;
-
-// Public functions
-
-
-boolean intermission;
-
-// Private functions
-
-static void IN_WaitStop(void);
-static void IN_Stop(void);
-static void IN_LoadPics(void);
-static void IN_UnloadPics(void);
-static void IN_CheckForSkip(void);
-static void IN_InitStats(void);
-static void IN_DrawOldLevel(void);
-static void IN_DrawYAH(void);
-static void IN_DrawStatBack(void);
-static void IN_DrawSingleStats(void);
-static void IN_DrawCoopStats(void);
-static void IN_DrawDMStats(void);
-static void IN_DrawNumber(int val, int x, int y, int digits);
-static void IN_DrawTime(int x, int y, int h, int m, int s);
-static void IN_DrTextB(const char *text, int x, int y);
-
-static boolean skipintermission;
-static int interstate = 0;
-static int intertime = -1;
-static int oldintertime = 0;
-static gametype_t gametype;
-
-static int cnt;
-
-static int hours;
-static int minutes;
-static int seconds;
-
-static int slaughterboy;        // in DM, the player with the most kills
-
-static int killPercent[MAXPLAYERS];
-static int bonusPercent[MAXPLAYERS];
-static int secretPercent[MAXPLAYERS];
-
-static patch_t *patchINTERPIC;
-static patch_t *patchBEENTHERE;
-static patch_t *patchGOINGTHERE;
-static patch_t *FontBNumbers[10];
-static patch_t *FontBNegative;
-static patch_t *FontBSlash;
-static patch_t *FontBPercent;
-
-static int FontBLump;
-static int FontBLumpBase;
-static int patchFaceOkayBase;
-static int patchFaceDeadBase;
-
-static signed int totalFrags[MAXPLAYERS];
-static fixed_t dSlideX[MAXPLAYERS];
-static fixed_t dSlideY[MAXPLAYERS];
-
-static const char *KillersText[] = { "K", "I", "L", "L", "E", "R", "S" };
-
-
-typedef struct
-{
-    int x;
-    int y;
-} yahpt_t;
-
-static yahpt_t YAHspot[3][9] = {
-    {
-     {172, 78},
-     {86, 90},
-     {73, 66},
-     {159, 95},
-     {148, 126},
-     {132, 54},
-     {131, 74},
-     {208, 138},
-     {52, 101}
-     },
-    {
-     {218, 57},
-     {137, 81},
-     {155, 124},
-     {171, 68},
-     {250, 86},
-     {136, 98},
-     {203, 90},
-     {220, 140},
-     {279, 106}
-     },
-    {
-     {86, 99},
-     {124, 103},
-     {154, 79},
-     {202, 83},
-     {178, 59},
-     {142, 58},
-     {219, 66},
-     {247, 57},
-     {107, 80}
-     }
-};
-
-static const char *NameForMap(int map)
-{
-    const char *name = LevelNames[(gameepisode - 1) * 9 + map - 1];
-    name = DEH_String(name);
-    if (strlen(name) < 7)
-    {
-        return "";
-    }
-    return name + 7;
-}
-
-//========================================================================
-//
-// IN_Start
-//
-//========================================================================
-
-
-void IN_Start(void)
-{
-    I_SetPalette(W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE));
-    IN_LoadPics();
-    IN_InitStats();
-    intermission = true;
-    interstate = -1;
-    skipintermission = false;
-    intertime = 0;
-    oldintertime = 0;
-    AM_Stop();
-    S_StartSong(mus_intr, true);
-}
-
-//========================================================================
-//
-// IN_WaitStop
-//
-//========================================================================
-
-void IN_WaitStop(void)
-{
-    if (!--cnt)
-    {
-        IN_Stop();
-        G_WorldDone();
-    }
-}
-
-//========================================================================
-//
-// IN_Stop
-//
-//========================================================================
-
-void IN_Stop(void)
-{
-    intermission = false;
-    IN_UnloadPics();
-    SB_state = -1;
-    BorderNeedRefresh = true;
-}
-
-//========================================================================
-//
-// IN_InitStats
-//
-//      Initializes the stats for single player mode
-//========================================================================
-
-void IN_InitStats(void)
-{
-    int i;
-    int j;
-    signed int slaughterfrags;
-    int posnum;
-    int slaughtercount;
-    int playercount;
-    int count;
-
-    if (!netgame)
-    {
-        gametype = SINGLE;
-        count = leveltime / 35;
-        hours = count / 3600;
-        count -= hours * 3600;
-        minutes = count / 60;
-        count -= minutes * 60;
-        seconds = count;
-    }
-    else if (netgame && !deathmatch)
-    {
-        gametype = COOPERATIVE;
-        memset(killPercent, 0, MAXPLAYERS * sizeof(int));
-        memset(bonusPercent, 0, MAXPLAYERS * sizeof(int));
-        memset(secretPercent, 0, MAXPLAYERS * sizeof(int));
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            if (playeringame[i])
-            {
-                if (totalkills)
-                {
-                    killPercent[i] = players[i].killcount * 100 / totalkills;
-                }
-                if (totalitems)
-                {
-                    bonusPercent[i] = players[i].itemcount * 100 / totalitems;
-                }
-                if (totalsecret)
-                {
-                    secretPercent[i] =
-                        players[i].secretcount * 100 / totalsecret;
-                }
-            }
-        }
-    }
-    else
-    {
-        gametype = DEATHMATCH;
-        slaughterboy = 0;
-        slaughterfrags = -9999;
-        posnum = 0;
-        playercount = 0;
-        slaughtercount = 0;
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            totalFrags[i] = 0;
-            if (playeringame[i])
-            {
-                playercount++;
-                for (j = 0; j < MAXPLAYERS; j++)
-                {
-                    if (playeringame[j])
-                    {
-                        totalFrags[i] += players[i].frags[j];
-                    }
-                }
-                dSlideX[i] = (43 * posnum * FRACUNIT) / 20;
-                dSlideY[i] = (36 * posnum * FRACUNIT) / 20;
-                posnum++;
-            }
-            if (totalFrags[i] > slaughterfrags)
-            {
-                slaughterboy = 1 << i;
-                slaughterfrags = totalFrags[i];
-                slaughtercount = 1;
-            }
-            else if (totalFrags[i] == slaughterfrags)
-            {
-                slaughterboy |= 1 << i;
-                slaughtercount++;
-            }
-        }
-        if (playercount == slaughtercount)
-        {                       // don't do the slaughter stuff if everyone is equal
-            slaughterboy = 0;
-        }
-    }
-}
-
-static void IN_LoadUnloadPics(void (*callback)(const char *lumpname,
-                                               int lumpnum,
-                                               patch_t **ptr))
-{
-    int i;
-
-    switch (gameepisode)
-    {
-        case 1:
-            callback(DEH_String("MAPE1"), 0, &patchINTERPIC);
-            break;
-        case 2:
-            callback(DEH_String("MAPE2"), 0, &patchINTERPIC);
-            break;
-        case 3:
-            callback(DEH_String("MAPE3"), 0, &patchINTERPIC);
-            break;
-        default:
-            break;
-    }
-
-    callback(DEH_String("IN_X"), 0, &patchBEENTHERE);
-    callback(DEH_String("IN_YAH"), 0, &patchGOINGTHERE);
-    callback(DEH_String("FONTB13"), 0, &FontBNegative);
-
-    callback(DEH_String("FONTB15"), 0, &FontBSlash);
-    callback(DEH_String("FONTB05"), 0, &FontBPercent);
-
-    FontBLumpBase = W_GetNumForName(DEH_String("FONTB16"));
-
-    for (i = 0; i < 10; i++)
-    {
-        callback(NULL, FontBLumpBase + i, &FontBNumbers[i]);
-    }
-}
-
-//========================================================================
-//
-// IN_LoadPics
-//
-//========================================================================
-
-static void LoadLumpCallback(const char *lumpname, int lumpnum, patch_t **ptr)
-{
-    if (lumpname != NULL)
-    {
-        lumpnum = W_GetNumForName(lumpname);
-    }
-
-    // Cache the lump
-
-    *ptr = W_CacheLumpNum(lumpnum, PU_STATIC);
-}
-
-void IN_LoadPics(void)
-{
-    FontBLump = W_GetNumForName(DEH_String("FONTB_S")) + 1;
-    patchFaceOkayBase = W_GetNumForName(DEH_String("FACEA0"));
-    patchFaceDeadBase = W_GetNumForName(DEH_String("FACEB0"));
-
-    IN_LoadUnloadPics(LoadLumpCallback);
-}
-
-//========================================================================
-//
-// IN_UnloadPics
-//
-//========================================================================
-
-static void UnloadLumpCallback(const char *lumpname, int lumpnum, patch_t **ptr)
-{
-    if (lumpname != NULL)
-    {
-        W_ReleaseLumpName(lumpname);
-    }
-    else
-    {
-        W_ReleaseLumpNum(lumpnum);
-    }
-}
-
-void IN_UnloadPics(void)
-{
-    IN_LoadUnloadPics(UnloadLumpCallback);
-}
-
-//========================================================================
-//
-// IN_Ticker
-//
-//========================================================================
-
-void IN_Ticker(void)
-{
-    if (!intermission)
-    {
-        return;
-    }
-    if (interstate == 3)
-    {
-        IN_WaitStop();
-        return;
-    }
-    IN_CheckForSkip();
-    intertime++;
-    if (oldintertime < intertime)
-    {
-        interstate++;
-        if (gameepisode > 3 && interstate >= 1)
-        {                       // Extended Wad levels:  skip directly to the next level
-            interstate = 3;
-        }
-        switch (interstate)
-        {
-            case 0:
-                oldintertime = intertime + 300;
-                if (gameepisode > 3)
-                {
-                    oldintertime = intertime + 1200;
-                }
-                break;
-            case 1:
-                oldintertime = intertime + 200;
-                break;
-            case 2:
-                oldintertime = INT_MAX;
-                break;
-            case 3:
-                cnt = 10;
-                break;
-            default:
-                break;
-        }
-    }
-    if (skipintermission)
-    {
-        if (interstate == 0 && intertime < 150)
-        {
-            intertime = 150;
-            skipintermission = false;
-            return;
-        }
-        else if (interstate < 2 && gameepisode < 4)
-        {
-            interstate = 2;
-            skipintermission = false;
-            S_StartSound(NULL, sfx_dorcls);
-            return;
-        }
-        interstate = 3;
-        cnt = 10;
-        skipintermission = false;
-        S_StartSound(NULL, sfx_dorcls);
-    }
-}
-
-//========================================================================
-//
-// IN_CheckForSkip
-//
-//      Check to see if any player hit a key
-//========================================================================
-
-void IN_CheckForSkip(void)
-{
-    int i;
-    player_t *player;
-
-    for (i = 0, player = players; i < MAXPLAYERS; i++, player++)
-    {
-        if (playeringame[i])
-        {
-            if (player->cmd.buttons & BT_ATTACK)
-            {
-                if (!player->attackdown)
-                {
-                    skipintermission = 1;
-                }
-                player->attackdown = true;
-            }
-            else
-            {
-                player->attackdown = false;
-            }
-            if (player->cmd.buttons & BT_USE)
-            {
-                if (!player->usedown)
-                {
-                    skipintermission = 1;
-                }
-                player->usedown = true;
-            }
-            else
-            {
-                player->usedown = false;
-            }
-        }
-    }
-}
-
-//========================================================================
-//
-// IN_Drawer
-//
-//========================================================================
-
-void IN_Drawer(void)
-{
-    static int oldinterstate;
-
-    if (!intermission)
-    {
-        return;
-    }
-    if (interstate == 3)
-    {
-        return;
-    }
-    UpdateState |= I_FULLSCRN;
-    if (oldinterstate != 2 && interstate == 2)
-    {
-        S_StartSound(NULL, sfx_pstop);
-    }
-    oldinterstate = interstate;
-    switch (interstate)
-    {
-        case 0:                // draw stats
-            IN_DrawStatBack();
-            switch (gametype)
-            {
-                case SINGLE:
-                    IN_DrawSingleStats();
-                    break;
-                case COOPERATIVE:
-                    IN_DrawCoopStats();
-                    break;
-                case DEATHMATCH:
-                    IN_DrawDMStats();
-                    break;
-            }
-            break;
-        case 1:                // leaving old level
-            if (gameepisode < 4)
-            {
-                V_DrawPatch(0, 0, patchINTERPIC);
-                IN_DrawOldLevel();
-            }
-            break;
-        case 2:                // going to the next level
-            if (gameepisode < 4)
-            {
-                V_DrawPatch(0, 0, patchINTERPIC);
-                IN_DrawYAH();
-            }
-            break;
-        case 3:                // waiting before going to the next level
-            if (gameepisode < 4)
-            {
-                V_DrawPatch(0, 0, patchINTERPIC);
-            }
-            break;
-        default:
-            I_Error("IN_lude:  Intermission state out of range.\n");
-            break;
-    }
-}
-
-//========================================================================
-//
-// IN_DrawStatBack
-//
-//========================================================================
-
-void IN_DrawStatBack(void)
-{
-    int x;
-    int y;
-
-    byte *src;
-    byte *dest;
-
-    src = W_CacheLumpName(DEH_String("FLOOR16"), PU_CACHE);
-    dest = I_VideoBuffer;
-
-    for (y = 0; y < SCREENHEIGHT; y++)
-    {
-        for (x = 0; x < SCREENWIDTH / 64; x++)
-        {
-            memcpy(dest, src + ((y & 63) << 6), 64);
-            dest += 64;
-        }
-        if (SCREENWIDTH & 63)
-        {
-            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
-            dest += (SCREENWIDTH & 63);
-        }
-    }
-}
-
-//========================================================================
-//
-// IN_DrawOldLevel
-//
-//========================================================================
-
-void IN_DrawOldLevel(void)
-{
-    const char *level_name = NameForMap(prevmap);
-    int i;
-    int x;
-
-    x = 160 - MN_TextBWidth(level_name) / 2;
-    IN_DrTextB(level_name, x, 3);
-    x = 160 - MN_TextAWidth(DEH_String("FINISHED")) / 2;
-    MN_DrTextA(DEH_String("FINISHED"), x, 25);
-
-    if (prevmap == 9)
-    {
-        for (i = 0; i < gamemap - 1; i++)
-        {
-            V_DrawPatch(YAHspot[gameepisode - 1][i].x,
-                        YAHspot[gameepisode - 1][i].y, patchBEENTHERE);
-        }
-        if (!(intertime & 16))
-        {
-            V_DrawPatch(YAHspot[gameepisode - 1][8].x,
-                        YAHspot[gameepisode - 1][8].y, patchBEENTHERE);
-        }
-    }
-    else
-    {
-        for (i = 0; i < prevmap - 1; i++)
-        {
-            V_DrawPatch(YAHspot[gameepisode - 1][i].x,
-                        YAHspot[gameepisode - 1][i].y, patchBEENTHERE);
-        }
-        if (players[consoleplayer].didsecret)
-        {
-            V_DrawPatch(YAHspot[gameepisode - 1][8].x,
-                        YAHspot[gameepisode - 1][8].y, patchBEENTHERE);
-        }
-        if (!(intertime & 16))
-        {
-            V_DrawPatch(YAHspot[gameepisode - 1][prevmap - 1].x,
-                        YAHspot[gameepisode - 1][prevmap - 1].y,
-                        patchBEENTHERE);
-        }
-    }
-}
-
-//========================================================================
-//
-// IN_DrawYAH
-//
-//========================================================================
-
-void IN_DrawYAH(void)
-{
-    const char *level_name = NameForMap(gamemap);
-    int i;
-    int x;
-
-    x = 160 - MN_TextAWidth(DEH_String("NOW ENTERING:")) / 2;
-    MN_DrTextA(DEH_String("NOW ENTERING:"), x, 10);
-    x = 160 - MN_TextBWidth(level_name) / 2;
-    IN_DrTextB(level_name, x, 20);
-
-    if (prevmap == 9)
-    {
-        prevmap = gamemap - 1;
-    }
-    for (i = 0; i < prevmap; i++)
-    {
-        V_DrawPatch(YAHspot[gameepisode - 1][i].x,
-                    YAHspot[gameepisode - 1][i].y, patchBEENTHERE);
-    }
-    if (players[consoleplayer].didsecret)
-    {
-        V_DrawPatch(YAHspot[gameepisode - 1][8].x,
-                    YAHspot[gameepisode - 1][8].y, patchBEENTHERE);
-    }
-    if (!(intertime & 16) || interstate == 3)
-    {                           // draw the destination 'X'
-        V_DrawPatch(YAHspot[gameepisode - 1][gamemap - 1].x,
-                    YAHspot[gameepisode - 1][gamemap - 1].y, patchGOINGTHERE);
-    }
-}
-
-//========================================================================
-//
-// IN_DrawSingleStats
-//
-//========================================================================
-
-void IN_DrawSingleStats(void)
-{
-    const char *prev_level_name = NameForMap(prevmap);
-    const char *next_level_name = NameForMap(gamemap);
-    int x;
-    static int sounds;
-
-    IN_DrTextB(DEH_String("KILLS"), 50, 65);
-    IN_DrTextB(DEH_String("ITEMS"), 50, 90);
-    IN_DrTextB(DEH_String("SECRETS"), 50, 115);
-
-    x = 160 - MN_TextBWidth(prev_level_name) / 2;
-    IN_DrTextB(prev_level_name, x, 3);
-    x = 160 - MN_TextAWidth(DEH_String("FINISHED")) / 2;
-    MN_DrTextA(DEH_String("FINISHED"), x, 25);
-
-    if (intertime < 30)
-    {
-        sounds = 0;
-        return;
-    }
-    if (sounds < 1 && intertime >= 30)
-    {
-        S_StartSound(NULL, sfx_dorcls);
-        sounds++;
-    }
-    IN_DrawNumber(players[consoleplayer].killcount, 200, 65, 3);
-    V_DrawShadowedPatch(237, 65, FontBSlash);
-    IN_DrawNumber(totalkills, 248, 65, 3);
-    if (intertime < 60)
-    {
-        return;
-    }
-    if (sounds < 2 && intertime >= 60)
-    {
-        S_StartSound(NULL, sfx_dorcls);
-        sounds++;
-    }
-    IN_DrawNumber(players[consoleplayer].itemcount, 200, 90, 3);
-    V_DrawShadowedPatch(237, 90, FontBSlash);
-    IN_DrawNumber(totalitems, 248, 90, 3);
-    if (intertime < 90)
-    {
-        return;
-    }
-    if (sounds < 3 && intertime >= 90)
-    {
-        S_StartSound(NULL, sfx_dorcls);
-        sounds++;
-    }
-    IN_DrawNumber(players[consoleplayer].secretcount, 200, 115, 3);
-    V_DrawShadowedPatch(237, 115, FontBSlash);
-    IN_DrawNumber(totalsecret, 248, 115, 3);
-    if (intertime < 150)
-    {
-        return;
-    }
-    if (sounds < 4 && intertime >= 150)
-    {
-        S_StartSound(NULL, sfx_dorcls);
-        sounds++;
-    }
-
-    if (gamemode != retail || gameepisode <= 3)
-    {
-        IN_DrTextB(DEH_String("TIME"), 85, 160);
-        IN_DrawTime(155, 160, hours, minutes, seconds);
-    }
-    else
-    {
-        x = 160 - MN_TextAWidth(DEH_String("NOW ENTERING:")) / 2;
-        MN_DrTextA(DEH_String("NOW ENTERING:"), x, 160);
-        x = 160 - MN_TextBWidth(next_level_name) / 2;
-        IN_DrTextB(next_level_name, x, 170);
-        skipintermission = false;
-    }
-}
-
-//========================================================================
-//
-// IN_DrawCoopStats
-//
-//========================================================================
-
-void IN_DrawCoopStats(void)
-{
-    const char *level_name = NameForMap(prevmap);
-    int i;
-    int x;
-    int ypos;
-
-    static int sounds;
-
-    IN_DrTextB(DEH_String("KILLS"), 95, 35);
-    IN_DrTextB(DEH_String("BONUS"), 155, 35);
-    IN_DrTextB(DEH_String("SECRET"), 232, 35);
-    x = 160 - MN_TextBWidth(level_name) / 2;
-    IN_DrTextB(level_name, x, 3);
-    x = 160 - MN_TextAWidth(DEH_String("FINISHED")) / 2;
-    MN_DrTextA(DEH_String("FINISHED"), x, 25);
-
-    ypos = 50;
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (playeringame[i])
-        {
-            V_DrawShadowedPatch(25, ypos,
-                                W_CacheLumpNum(patchFaceOkayBase + i,
-                                               PU_CACHE));
-            if (intertime < 40)
-            {
-                sounds = 0;
-                ypos += 37;
-                continue;
-            }
-            else if (intertime >= 40 && sounds < 1)
-            {
-                S_StartSound(NULL, sfx_dorcls);
-                sounds++;
-            }
-            IN_DrawNumber(killPercent[i], 85, ypos + 10, 3);
-            V_DrawShadowedPatch(121, ypos + 10, FontBPercent);
-            IN_DrawNumber(bonusPercent[i], 160, ypos + 10, 3);
-            V_DrawShadowedPatch(196, ypos + 10, FontBPercent);
-            IN_DrawNumber(secretPercent[i], 237, ypos + 10, 3);
-            V_DrawShadowedPatch(273, ypos + 10, FontBPercent);
-            ypos += 37;
-        }
-    }
-}
-
-//========================================================================
-//
-// IN_DrawDMStats
-//
-//========================================================================
-
-void IN_DrawDMStats(void)
-{
-    int i;
-    int j;
-    int ypos;
-    int xpos;
-    int kpos;
-
-    static int sounds;
-
-    xpos = 90;
-    ypos = 55;
-
-    IN_DrTextB(DEH_String("TOTAL"), 265, 30);
-    MN_DrTextA(DEH_String("VICTIMS"), 140, 8);
-    for (i = 0; i < 7; i++)
-    {
-        MN_DrTextA(DEH_String(KillersText[i]), 10, 80 + 9 * i);
-    }
-    if (intertime < 20)
-    {
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            if (playeringame[i])
-            {
-                V_DrawShadowedPatch(40,
-                                    ((ypos << FRACBITS) +
-                                     dSlideY[i] * intertime) >> FRACBITS,
-                                    W_CacheLumpNum(patchFaceOkayBase + i,
-                                                   PU_CACHE));
-                V_DrawShadowedPatch(((xpos << FRACBITS) +
-                                     dSlideX[i] * intertime) >> FRACBITS, 18,
-                                    W_CacheLumpNum(patchFaceDeadBase + i,
-                                                   PU_CACHE));
-            }
-        }
-        sounds = 0;
-        return;
-    }
-    if (intertime >= 20 && sounds < 1)
-    {
-        S_StartSound(NULL, sfx_dorcls);
-        sounds++;
-    }
-    if (intertime >= 100 && slaughterboy && sounds < 2)
-    {
-        S_StartSound(NULL, sfx_wpnup);
-        sounds++;
-    }
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (playeringame[i])
-        {
-            if (intertime < 100 || i == consoleplayer)
-            {
-                V_DrawShadowedPatch(40, ypos,
-                                    W_CacheLumpNum(patchFaceOkayBase + i,
-                                                   PU_CACHE));
-                V_DrawShadowedPatch(xpos, 18,
-                                    W_CacheLumpNum(patchFaceDeadBase + i,
-                                                   PU_CACHE));
-            }
-            else
-            {
-                V_DrawAltTLPatch(40, ypos,
-                              W_CacheLumpNum(patchFaceOkayBase + i,
-                                             PU_CACHE));
-                V_DrawAltTLPatch(xpos, 18,
-                              W_CacheLumpNum(patchFaceDeadBase + i,
-                                             PU_CACHE));
-            }
-            kpos = 86;
-            for (j = 0; j < MAXPLAYERS; j++)
-            {
-                if (playeringame[j])
-                {
-                    IN_DrawNumber(players[i].frags[j], kpos, ypos + 10, 3);
-                    kpos += 43;
-                }
-            }
-            if (slaughterboy & (1 << i))
-            {
-                if (!(intertime & 16))
-                {
-                    IN_DrawNumber(totalFrags[i], 263, ypos + 10, 3);
-                }
-            }
-            else
-            {
-                IN_DrawNumber(totalFrags[i], 263, ypos + 10, 3);
-            }
-            ypos += 36;
-            xpos += 43;
-        }
-    }
-}
-
-//========================================================================
-//
-// IN_DrawTime
-//
-//========================================================================
-
-void IN_DrawTime(int x, int y, int h, int m, int s)
-{
-    if (h)
-    {
-        IN_DrawNumber(h, x, y, 2);
-        IN_DrTextB(DEH_String(":"), x + 26, y);
-    }
-    x += 34;
-    if (m || h)
-    {
-        IN_DrawNumber(m, x, y, 2);
-    }
-    x += 34;
-    if (s)
-    {
-        IN_DrTextB(DEH_String(":"), x - 8, y);
-        IN_DrawNumber(s, x, y, 2);
-    }
-}
-
-//========================================================================
-//
-// IN_DrawNumber
-//
-//========================================================================
-
-void IN_DrawNumber(int val, int x, int y, int digits)
-{
-    patch_t *patch;
-    int xpos;
-    int oldval;
-    int realdigits;
-    boolean neg;
-
-    oldval = val;
-    xpos = x;
-    neg = false;
-    realdigits = 1;
-
-    if (val < 0)
-    {                           //...this should reflect negative frags
-        val = -val;
-        neg = true;
-        if (val > 99)
-        {
-            val = 99;
-        }
-    }
-    if (val > 9)
-    {
-        realdigits++;
-        if (digits < realdigits)
-        {
-            realdigits = digits;
-            val = 9;
-        }
-    }
-    if (val > 99)
-    {
-        realdigits++;
-        if (digits < realdigits)
-        {
-            realdigits = digits;
-            val = 99;
-        }
-    }
-    if (val > 999)
-    {
-        realdigits++;
-        if (digits < realdigits)
-        {
-            realdigits = digits;
-            val = 999;
-        }
-    }
-    if (digits == 4)
-    {
-        patch = FontBNumbers[val / 1000];
-        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12, y, patch);
-    }
-    if (digits > 2)
-    {
-        if (realdigits > 2)
-        {
-            patch = FontBNumbers[val / 100];
-            V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-        }
-        xpos += 12;
-    }
-    val = val % 100;
-    if (digits > 1)
-    {
-        if (val > 9)
-        {
-            patch = FontBNumbers[val / 10];
-            V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-        }
-        else if (digits == 2 || oldval > 99)
-        {
-            V_DrawShadowedPatch(xpos, y, FontBNumbers[0]);
-        }
-        xpos += 12;
-    }
-    val = val % 10;
-    patch = FontBNumbers[val];
-    V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-    if (neg)
-    {
-        patch = FontBNegative;
-        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12 * (realdigits),
-                            y, patch);
-    }
-}
-
-//========================================================================
-//
-// IN_DrTextB
-//
-//========================================================================
-
-void IN_DrTextB(const char *text, int x, int y)
-{
-    char c;
-    patch_t *p;
-
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            x += 8;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontBLump + c - 33, PU_CACHE);
-            V_DrawShadowedPatch(x, y, p);
-            x += SHORT(p->width) - 1;
-        }
-    }
-}
diff --git a/games/NXDoom/src/heretic/info.c b/games/NXDoom/src/heretic/info.c
deleted file mode 100644
index d736325b7..000000000
--- a/games/NXDoom/src/heretic/info.c
+++ /dev/null
@@ -1,5600 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-#include "doomdef.h"
-#include "p_action.h"
-
-const char *sprnames[] = {
-    "IMPX","ACLO","PTN1","SHLD","SHD2","BAGH","SPMP","INVS","PTN2","SOAR",
-    "INVU","PWBK","EGGC","EGGM","FX01","SPHL","TRCH","FBMB","XPL1","ATLP",
-    "PPOD","AMG1","SPSH","LVAS","SLDG","SKH1","SKH2","SKH3","SKH4","CHDL",
-    "SRTC","SMPL","STGS","STGL","STCS","STCL","KFR1","BARL","BRPL","MOS1",
-    "MOS2","WTRH","HCOR","KGZ1","KGZB","KGZG","KGZY","VLCO","VFBL","VTFB",
-    "SFFI","TGLT","TELE","STFF","PUF3","PUF4","BEAK","WGNT","GAUN","PUF1",
-    "WBLS","BLSR","FX18","FX17","WMCE","MACE","FX02","WSKL","HROD","FX00",
-    "FX20","FX21","FX22","FX23","GWND","PUF2","WPHX","PHNX","FX04","FX08",
-    "FX09","WBOW","CRBW","FX03","BLOD","PLAY","FDTH","BSKL","CHKN","MUMM",
-    "FX15","BEAS","FRB1","SNKE","SNFX","HEAD","FX05","FX06","FX07","CLNK",
-    "WZRD","FX11","FX10","KNIG","SPAX","RAXE","SRCR","FX14","SOR2","SDTH",
-    "FX16","MNTR","FX12","FX13","AKYY","BKYY","CKYY","AMG2","AMM1","AMM2",
-    "AMC1","AMC2","AMS1","AMS2","AMP1","AMP2","AMB1","AMB2", 
-    NULL
-};
-
-state_t states[NUMSTATES] = {
-    {SPR_IMPX, 0, -1, NULL, S_NULL, 0, 0},      // S_NULL
-    {SPR_ACLO, 4, 1050, A_FreeTargMobj, S_NULL, 0, 0},  // S_FREETARGMOBJ
-    {SPR_PTN1, 0, 3, NULL, S_ITEM_PTN1_2, 0, 0},        // S_ITEM_PTN1_1
-    {SPR_PTN1, 1, 3, NULL, S_ITEM_PTN1_3, 0, 0},        // S_ITEM_PTN1_2
-    {SPR_PTN1, 2, 3, NULL, S_ITEM_PTN1_1, 0, 0},        // S_ITEM_PTN1_3
-    {SPR_SHLD, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_SHLD1
-    {SPR_SHD2, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_SHD2_1
-    {SPR_BAGH, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_BAGH1
-    {SPR_SPMP, 0, -1, NULL, S_NULL, 0, 0},      // S_ITEM_SPMP1
-    {SPR_ACLO, 4, 1400, NULL, S_HIDESPECIAL2, 0, 0},    // S_HIDESPECIAL1
-    {SPR_ACLO, 0, 4, A_RestoreSpecialThing1, S_HIDESPECIAL3, 0, 0},     // S_HIDESPECIAL2
-    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL4, 0, 0},       // S_HIDESPECIAL3
-    {SPR_ACLO, 0, 4, NULL, S_HIDESPECIAL5, 0, 0},       // S_HIDESPECIAL4
-    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL6, 0, 0},       // S_HIDESPECIAL5
-    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL7, 0, 0},       // S_HIDESPECIAL6
-    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL8, 0, 0},       // S_HIDESPECIAL7
-    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL9, 0, 0},       // S_HIDESPECIAL8
-    {SPR_ACLO, 3, 4, NULL, S_HIDESPECIAL10, 0, 0},      // S_HIDESPECIAL9
-    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL11, 0, 0},      // S_HIDESPECIAL10
-    {SPR_ACLO, 3, 4, A_RestoreSpecialThing2, S_NULL, 0, 0},     // S_HIDESPECIAL11
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2, 0, 0},       // S_DORMANTARTI1
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3, 0, 0},       // S_DORMANTARTI2
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI4, 0, 0},       // S_DORMANTARTI3
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI5, 0, 0},       // S_DORMANTARTI4
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI6, 0, 0},       // S_DORMANTARTI5
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI7, 0, 0},       // S_DORMANTARTI6
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI8, 0, 0},       // S_DORMANTARTI7
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI9, 0, 0},       // S_DORMANTARTI8
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI10, 0, 0},      // S_DORMANTARTI9
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI11, 0, 0},      // S_DORMANTARTI10
-    {SPR_ACLO, 0, 1400, A_HideThing, S_DORMANTARTI12, 0, 0},    // S_DORMANTARTI11
-    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI13, 0, 0},     // S_DORMANTARTI12
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI14, 0, 0},      // S_DORMANTARTI13
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI15, 0, 0},      // S_DORMANTARTI14
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI16, 0, 0},      // S_DORMANTARTI15
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI17, 0, 0},      // S_DORMANTARTI16
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI18, 0, 0},      // S_DORMANTARTI17
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI19, 0, 0},      // S_DORMANTARTI18
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI20, 0, 0},      // S_DORMANTARTI19
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI21, 0, 0},      // S_DORMANTARTI20
-    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI21
-    {SPR_ACLO, 3, 3, NULL, S_DEADARTI2, 0, 0},  // S_DEADARTI1
-    {SPR_ACLO, 2, 3, NULL, S_DEADARTI3, 0, 0},  // S_DEADARTI2
-    {SPR_ACLO, 3, 3, NULL, S_DEADARTI4, 0, 0},  // S_DEADARTI3
-    {SPR_ACLO, 2, 3, NULL, S_DEADARTI5, 0, 0},  // S_DEADARTI4
-    {SPR_ACLO, 1, 3, NULL, S_DEADARTI6, 0, 0},  // S_DEADARTI5
-    {SPR_ACLO, 2, 3, NULL, S_DEADARTI7, 0, 0},  // S_DEADARTI6
-    {SPR_ACLO, 1, 3, NULL, S_DEADARTI8, 0, 0},  // S_DEADARTI7
-    {SPR_ACLO, 0, 3, NULL, S_DEADARTI9, 0, 0},  // S_DEADARTI8
-    {SPR_ACLO, 1, 3, NULL, S_DEADARTI10, 0, 0}, // S_DEADARTI9
-    {SPR_ACLO, 0, 3, NULL, S_NULL, 0, 0},       // S_DEADARTI10
-    {SPR_INVS, 32768, 350, NULL, S_ARTI_INVS1, 0, 0},   // S_ARTI_INVS1
-    {SPR_PTN2, 0, 4, NULL, S_ARTI_PTN2_2, 0, 0},        // S_ARTI_PTN2_1
-    {SPR_PTN2, 1, 4, NULL, S_ARTI_PTN2_3, 0, 0},        // S_ARTI_PTN2_2
-    {SPR_PTN2, 2, 4, NULL, S_ARTI_PTN2_1, 0, 0},        // S_ARTI_PTN2_3
-    {SPR_SOAR, 0, 5, NULL, S_ARTI_SOAR2, 0, 0}, // S_ARTI_SOAR1
-    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR3, 0, 0}, // S_ARTI_SOAR2
-    {SPR_SOAR, 2, 5, NULL, S_ARTI_SOAR4, 0, 0}, // S_ARTI_SOAR3
-    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR1, 0, 0}, // S_ARTI_SOAR4
-    {SPR_INVU, 0, 3, NULL, S_ARTI_INVU2, 0, 0}, // S_ARTI_INVU1
-    {SPR_INVU, 1, 3, NULL, S_ARTI_INVU3, 0, 0}, // S_ARTI_INVU2
-    {SPR_INVU, 2, 3, NULL, S_ARTI_INVU4, 0, 0}, // S_ARTI_INVU3
-    {SPR_INVU, 3, 3, NULL, S_ARTI_INVU1, 0, 0}, // S_ARTI_INVU4
-    {SPR_PWBK, 0, 350, NULL, S_ARTI_PWBK1, 0, 0},       // S_ARTI_PWBK1
-    {SPR_EGGC, 0, 6, NULL, S_ARTI_EGGC2, 0, 0}, // S_ARTI_EGGC1
-    {SPR_EGGC, 1, 6, NULL, S_ARTI_EGGC3, 0, 0}, // S_ARTI_EGGC2
-    {SPR_EGGC, 2, 6, NULL, S_ARTI_EGGC4, 0, 0}, // S_ARTI_EGGC3
-    {SPR_EGGC, 1, 6, NULL, S_ARTI_EGGC1, 0, 0}, // S_ARTI_EGGC4
-    {SPR_EGGM, 0, 4, NULL, S_EGGFX2, 0, 0},     // S_EGGFX1
-    {SPR_EGGM, 1, 4, NULL, S_EGGFX3, 0, 0},     // S_EGGFX2
-    {SPR_EGGM, 2, 4, NULL, S_EGGFX4, 0, 0},     // S_EGGFX3
-    {SPR_EGGM, 3, 4, NULL, S_EGGFX5, 0, 0},     // S_EGGFX4
-    {SPR_EGGM, 4, 4, NULL, S_EGGFX1, 0, 0},     // S_EGGFX5
-    {SPR_FX01, 32772, 3, NULL, S_EGGFXI1_2, 0, 0},      // S_EGGFXI1_1
-    {SPR_FX01, 32773, 3, NULL, S_EGGFXI1_3, 0, 0},      // S_EGGFXI1_2
-    {SPR_FX01, 32774, 3, NULL, S_EGGFXI1_4, 0, 0},      // S_EGGFXI1_3
-    {SPR_FX01, 32775, 3, NULL, S_NULL, 0, 0},   // S_EGGFXI1_4
-    {SPR_SPHL, 0, 350, NULL, S_ARTI_SPHL1, 0, 0},       // S_ARTI_SPHL1
-    {SPR_TRCH, 32768, 3, NULL, S_ARTI_TRCH2, 0, 0},     // S_ARTI_TRCH1
-    {SPR_TRCH, 32769, 3, NULL, S_ARTI_TRCH3, 0, 0},     // S_ARTI_TRCH2
-    {SPR_TRCH, 32770, 3, NULL, S_ARTI_TRCH1, 0, 0},     // S_ARTI_TRCH3
-    {SPR_FBMB, 4, 350, NULL, S_ARTI_FBMB1, 0, 0},       // S_ARTI_FBMB1
-    {SPR_FBMB, 0, 10, NULL, S_FIREBOMB2, 0, 0}, // S_FIREBOMB1
-    {SPR_FBMB, 1, 10, NULL, S_FIREBOMB3, 0, 0}, // S_FIREBOMB2
-    {SPR_FBMB, 2, 10, NULL, S_FIREBOMB4, 0, 0}, // S_FIREBOMB3
-    {SPR_FBMB, 3, 10, NULL, S_FIREBOMB5, 0, 0}, // S_FIREBOMB4
-    {SPR_FBMB, 4, 6, A_Scream, S_FIREBOMB6, 0, 0},      // S_FIREBOMB5
-    {SPR_XPL1, 32768, 4, A_Explode, S_FIREBOMB7, 0, 0}, // S_FIREBOMB6
-    {SPR_XPL1, 32769, 4, NULL, S_FIREBOMB8, 0, 0},      // S_FIREBOMB7
-    {SPR_XPL1, 32770, 4, NULL, S_FIREBOMB9, 0, 0},      // S_FIREBOMB8
-    {SPR_XPL1, 32771, 4, NULL, S_FIREBOMB10, 0, 0},     // S_FIREBOMB9
-    {SPR_XPL1, 32772, 4, NULL, S_FIREBOMB11, 0, 0},     // S_FIREBOMB10
-    {SPR_XPL1, 32773, 4, NULL, S_NULL, 0, 0},   // S_FIREBOMB11
-    {SPR_ATLP, 0, 4, NULL, S_ARTI_ATLP2, 0, 0}, // S_ARTI_ATLP1
-    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP3, 0, 0}, // S_ARTI_ATLP2
-    {SPR_ATLP, 2, 4, NULL, S_ARTI_ATLP4, 0, 0}, // S_ARTI_ATLP3
-    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP1, 0, 0}, // S_ARTI_ATLP4
-    {SPR_PPOD, 0, 10, NULL, S_POD_WAIT1, 0, 0}, // S_POD_WAIT1
-    {SPR_PPOD, 1, 14, A_PodPain, S_POD_WAIT1, 0, 0},    // S_POD_PAIN1
-    {SPR_PPOD, 32770, 5, A_RemovePod, S_POD_DIE2, 0, 0},        // S_POD_DIE1
-    {SPR_PPOD, 32771, 5, A_Scream, S_POD_DIE3, 0, 0},   // S_POD_DIE2
-    {SPR_PPOD, 32772, 5, A_Explode, S_POD_DIE4, 0, 0},  // S_POD_DIE3
-    {SPR_PPOD, 32773, 10, NULL, S_FREETARGMOBJ, 0, 0},  // S_POD_DIE4
-    {SPR_PPOD, 8, 3, NULL, S_POD_GROW2, 0, 0},  // S_POD_GROW1
-    {SPR_PPOD, 9, 3, NULL, S_POD_GROW3, 0, 0},  // S_POD_GROW2
-    {SPR_PPOD, 10, 3, NULL, S_POD_GROW4, 0, 0}, // S_POD_GROW3
-    {SPR_PPOD, 11, 3, NULL, S_POD_GROW5, 0, 0}, // S_POD_GROW4
-    {SPR_PPOD, 12, 3, NULL, S_POD_GROW6, 0, 0}, // S_POD_GROW5
-    {SPR_PPOD, 13, 3, NULL, S_POD_GROW7, 0, 0}, // S_POD_GROW6
-    {SPR_PPOD, 14, 3, NULL, S_POD_GROW8, 0, 0}, // S_POD_GROW7
-    {SPR_PPOD, 15, 3, NULL, S_POD_WAIT1, 0, 0}, // S_POD_GROW8
-    {SPR_PPOD, 6, 8, NULL, S_PODGOO2, 0, 0},    // S_PODGOO1
-    {SPR_PPOD, 7, 8, NULL, S_PODGOO1, 0, 0},    // S_PODGOO2
-    {SPR_PPOD, 6, 10, NULL, S_NULL, 0, 0},      // S_PODGOOX
-    {SPR_AMG1, 0, 35, A_MakePod, S_PODGENERATOR, 0, 0}, // S_PODGENERATOR
-    {SPR_SPSH, 0, 8, NULL, S_SPLASH2, 0, 0},    // S_SPLASH1
-    {SPR_SPSH, 1, 8, NULL, S_SPLASH3, 0, 0},    // S_SPLASH2
-    {SPR_SPSH, 2, 8, NULL, S_SPLASH4, 0, 0},    // S_SPLASH3
-    {SPR_SPSH, 3, 16, NULL, S_NULL, 0, 0},      // S_SPLASH4
-    {SPR_SPSH, 3, 10, NULL, S_NULL, 0, 0},      // S_SPLASHX
-    {SPR_SPSH, 4, 5, NULL, S_SPLASHBASE2, 0, 0},        // S_SPLASHBASE1
-    {SPR_SPSH, 5, 5, NULL, S_SPLASHBASE3, 0, 0},        // S_SPLASHBASE2
-    {SPR_SPSH, 6, 5, NULL, S_SPLASHBASE4, 0, 0},        // S_SPLASHBASE3
-    {SPR_SPSH, 7, 5, NULL, S_SPLASHBASE5, 0, 0},        // S_SPLASHBASE4
-    {SPR_SPSH, 8, 5, NULL, S_SPLASHBASE6, 0, 0},        // S_SPLASHBASE5
-    {SPR_SPSH, 9, 5, NULL, S_SPLASHBASE7, 0, 0},        // S_SPLASHBASE6
-    {SPR_SPSH, 10, 5, NULL, S_NULL, 0, 0},      // S_SPLASHBASE7
-    {SPR_LVAS, 32768, 5, NULL, S_LAVASPLASH2, 0, 0},    // S_LAVASPLASH1
-    {SPR_LVAS, 32769, 5, NULL, S_LAVASPLASH3, 0, 0},    // S_LAVASPLASH2
-    {SPR_LVAS, 32770, 5, NULL, S_LAVASPLASH4, 0, 0},    // S_LAVASPLASH3
-    {SPR_LVAS, 32771, 5, NULL, S_LAVASPLASH5, 0, 0},    // S_LAVASPLASH4
-    {SPR_LVAS, 32772, 5, NULL, S_LAVASPLASH6, 0, 0},    // S_LAVASPLASH5
-    {SPR_LVAS, 32773, 5, NULL, S_NULL, 0, 0},   // S_LAVASPLASH6
-    {SPR_LVAS, 32774, 5, NULL, S_LAVASMOKE2, 0, 0},     // S_LAVASMOKE1
-    {SPR_LVAS, 32775, 5, NULL, S_LAVASMOKE3, 0, 0},     // S_LAVASMOKE2
-    {SPR_LVAS, 32776, 5, NULL, S_LAVASMOKE4, 0, 0},     // S_LAVASMOKE3
-    {SPR_LVAS, 32777, 5, NULL, S_LAVASMOKE5, 0, 0},     // S_LAVASMOKE4
-    {SPR_LVAS, 32778, 5, NULL, S_NULL, 0, 0},   // S_LAVASMOKE5
-    {SPR_SLDG, 0, 8, NULL, S_SLUDGECHUNK2, 0, 0},       // S_SLUDGECHUNK1
-    {SPR_SLDG, 1, 8, NULL, S_SLUDGECHUNK3, 0, 0},       // S_SLUDGECHUNK2
-    {SPR_SLDG, 2, 8, NULL, S_SLUDGECHUNK4, 0, 0},       // S_SLUDGECHUNK3
-    {SPR_SLDG, 3, 8, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNK4
-    {SPR_SLDG, 3, 6, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNKX
-    {SPR_SLDG, 4, 5, NULL, S_SLUDGESPLASH2, 0, 0},      // S_SLUDGESPLASH1
-    {SPR_SLDG, 5, 5, NULL, S_SLUDGESPLASH3, 0, 0},      // S_SLUDGESPLASH2
-    {SPR_SLDG, 6, 5, NULL, S_SLUDGESPLASH4, 0, 0},      // S_SLUDGESPLASH3
-    {SPR_SLDG, 7, 5, NULL, S_NULL, 0, 0},       // S_SLUDGESPLASH4
-    {SPR_SKH1, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG70_1
-    {SPR_SKH2, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG60_1
-    {SPR_SKH3, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG45_1
-    {SPR_SKH4, 0, -1, NULL, S_NULL, 0, 0},      // S_SKULLHANG35_1
-    {SPR_CHDL, 0, 4, NULL, S_CHANDELIER2, 0, 0},        // S_CHANDELIER1
-    {SPR_CHDL, 1, 4, NULL, S_CHANDELIER3, 0, 0},        // S_CHANDELIER2
-    {SPR_CHDL, 2, 4, NULL, S_CHANDELIER1, 0, 0},        // S_CHANDELIER3
-    {SPR_SRTC, 0, 4, NULL, S_SERPTORCH2, 0, 0}, // S_SERPTORCH1
-    {SPR_SRTC, 1, 4, NULL, S_SERPTORCH3, 0, 0}, // S_SERPTORCH2
-    {SPR_SRTC, 2, 4, NULL, S_SERPTORCH1, 0, 0}, // S_SERPTORCH3
-    {SPR_SMPL, 0, -1, NULL, S_NULL, 0, 0},      // S_SMALLPILLAR
-    {SPR_STGS, 0, -1, NULL, S_NULL, 0, 0},      // S_STALAGMITESMALL
-    {SPR_STGL, 0, -1, NULL, S_NULL, 0, 0},      // S_STALAGMITELARGE
-    {SPR_STCS, 0, -1, NULL, S_NULL, 0, 0},      // S_STALACTITESMALL
-    {SPR_STCL, 0, -1, NULL, S_NULL, 0, 0},      // S_STALACTITELARGE
-    {SPR_KFR1, 32768, 3, NULL, S_FIREBRAZIER2, 0, 0},   // S_FIREBRAZIER1
-    {SPR_KFR1, 32769, 3, NULL, S_FIREBRAZIER3, 0, 0},   // S_FIREBRAZIER2
-    {SPR_KFR1, 32770, 3, NULL, S_FIREBRAZIER4, 0, 0},   // S_FIREBRAZIER3
-    {SPR_KFR1, 32771, 3, NULL, S_FIREBRAZIER5, 0, 0},   // S_FIREBRAZIER4
-    {SPR_KFR1, 32772, 3, NULL, S_FIREBRAZIER6, 0, 0},   // S_FIREBRAZIER5
-    {SPR_KFR1, 32773, 3, NULL, S_FIREBRAZIER7, 0, 0},   // S_FIREBRAZIER6
-    {SPR_KFR1, 32774, 3, NULL, S_FIREBRAZIER8, 0, 0},   // S_FIREBRAZIER7
-    {SPR_KFR1, 32775, 3, NULL, S_FIREBRAZIER1, 0, 0},   // S_FIREBRAZIER8
-    {SPR_BARL, 0, -1, NULL, S_NULL, 0, 0},      // S_BARREL
-    {SPR_BRPL, 0, -1, NULL, S_NULL, 0, 0},      // S_BRPILLAR
-    {SPR_MOS1, 0, -1, NULL, S_NULL, 0, 0},      // S_MOSS1
-    {SPR_MOS2, 0, -1, NULL, S_NULL, 0, 0},      // S_MOSS2
-    {SPR_WTRH, 32768, 6, NULL, S_WALLTORCH2, 0, 0},     // S_WALLTORCH1
-    {SPR_WTRH, 32769, 6, NULL, S_WALLTORCH3, 0, 0},     // S_WALLTORCH2
-    {SPR_WTRH, 32770, 6, NULL, S_WALLTORCH1, 0, 0},     // S_WALLTORCH3
-    {SPR_HCOR, 0, -1, NULL, S_NULL, 0, 0},      // S_HANGINGCORPSE
-    {SPR_KGZ1, 0, 1, NULL, S_KEYGIZMO2, 0, 0},  // S_KEYGIZMO1
-    {SPR_KGZ1, 0, 1, A_InitKeyGizmo, S_KEYGIZMO3, 0, 0},        // S_KEYGIZMO2
-    {SPR_KGZ1, 0, -1, NULL, S_NULL, 0, 0},      // S_KEYGIZMO3
-    {SPR_KGZB, 0, 1, NULL, S_KGZ_START, 0, 0},  // S_KGZ_START
-    {SPR_KGZB, 32768, -1, NULL, S_NULL, 0, 0},  // S_KGZ_BLUEFLOAT1
-    {SPR_KGZG, 32768, -1, NULL, S_NULL, 0, 0},  // S_KGZ_GREENFLOAT1
-    {SPR_KGZY, 32768, -1, NULL, S_NULL, 0, 0},  // S_KGZ_YELLOWFLOAT1
-    {SPR_VLCO, 0, 350, NULL, S_VOLCANO2, 0, 0}, // S_VOLCANO1
-    {SPR_VLCO, 0, 35, A_VolcanoSet, S_VOLCANO3, 0, 0},  // S_VOLCANO2
-    {SPR_VLCO, 1, 3, NULL, S_VOLCANO4, 0, 0},   // S_VOLCANO3
-    {SPR_VLCO, 2, 3, NULL, S_VOLCANO5, 0, 0},   // S_VOLCANO4
-    {SPR_VLCO, 3, 3, NULL, S_VOLCANO6, 0, 0},   // S_VOLCANO5
-    {SPR_VLCO, 1, 3, NULL, S_VOLCANO7, 0, 0},   // S_VOLCANO6
-    {SPR_VLCO, 2, 3, NULL, S_VOLCANO8, 0, 0},   // S_VOLCANO7
-    {SPR_VLCO, 3, 3, NULL, S_VOLCANO9, 0, 0},   // S_VOLCANO8
-    {SPR_VLCO, 4, 10, A_VolcanoBlast, S_VOLCANO2, 0, 0},        // S_VOLCANO9
-    {SPR_VFBL, 0, 4, A_BeastPuff, S_VOLCANOBALL2, 0, 0},        // S_VOLCANOBALL1
-    {SPR_VFBL, 1, 4, A_BeastPuff, S_VOLCANOBALL1, 0, 0},        // S_VOLCANOBALL2
-    {SPR_XPL1, 0, 4, A_VolcBallImpact, S_VOLCANOBALLX2, 0, 0},  // S_VOLCANOBALLX1
-    {SPR_XPL1, 1, 4, NULL, S_VOLCANOBALLX3, 0, 0},      // S_VOLCANOBALLX2
-    {SPR_XPL1, 2, 4, NULL, S_VOLCANOBALLX4, 0, 0},      // S_VOLCANOBALLX3
-    {SPR_XPL1, 3, 4, NULL, S_VOLCANOBALLX5, 0, 0},      // S_VOLCANOBALLX4
-    {SPR_XPL1, 4, 4, NULL, S_VOLCANOBALLX6, 0, 0},      // S_VOLCANOBALLX5
-    {SPR_XPL1, 5, 4, NULL, S_NULL, 0, 0},       // S_VOLCANOBALLX6
-    {SPR_VTFB, 0, 4, NULL, S_VOLCANOTBALL2, 0, 0},      // S_VOLCANOTBALL1
-    {SPR_VTFB, 1, 4, NULL, S_VOLCANOTBALL1, 0, 0},      // S_VOLCANOTBALL2
-    {SPR_SFFI, 2, 4, NULL, S_VOLCANOTBALLX2, 0, 0},     // S_VOLCANOTBALLX1
-    {SPR_SFFI, 1, 4, NULL, S_VOLCANOTBALLX3, 0, 0},     // S_VOLCANOTBALLX2
-    {SPR_SFFI, 0, 4, NULL, S_VOLCANOTBALLX4, 0, 0},     // S_VOLCANOTBALLX3
-    {SPR_SFFI, 1, 4, NULL, S_VOLCANOTBALLX5, 0, 0},     // S_VOLCANOTBALLX4
-    {SPR_SFFI, 2, 4, NULL, S_VOLCANOTBALLX6, 0, 0},     // S_VOLCANOTBALLX5
-    {SPR_SFFI, 3, 4, NULL, S_VOLCANOTBALLX7, 0, 0},     // S_VOLCANOTBALLX6
-    {SPR_SFFI, 4, 4, NULL, S_NULL, 0, 0},       // S_VOLCANOTBALLX7
-    {SPR_TGLT, 0, 8, A_SpawnTeleGlitter, S_TELEGLITGEN1, 0, 0}, // S_TELEGLITGEN1
-    {SPR_TGLT, 5, 8, A_SpawnTeleGlitter2, S_TELEGLITGEN2, 0, 0},        // S_TELEGLITGEN2
-    {SPR_TGLT, 32768, 2, NULL, S_TELEGLITTER1_2, 0, 0}, // S_TELEGLITTER1_1
-    {SPR_TGLT, 32769, 2, A_AccTeleGlitter, S_TELEGLITTER1_3, 0, 0},     // S_TELEGLITTER1_2
-    {SPR_TGLT, 32770, 2, NULL, S_TELEGLITTER1_4, 0, 0}, // S_TELEGLITTER1_3
-    {SPR_TGLT, 32771, 2, A_AccTeleGlitter, S_TELEGLITTER1_5, 0, 0},     // S_TELEGLITTER1_4
-    {SPR_TGLT, 32772, 2, NULL, S_TELEGLITTER1_1, 0, 0}, // S_TELEGLITTER1_5
-    {SPR_TGLT, 32773, 2, NULL, S_TELEGLITTER2_2, 0, 0}, // S_TELEGLITTER2_1
-    {SPR_TGLT, 32774, 2, A_AccTeleGlitter, S_TELEGLITTER2_3, 0, 0},     // S_TELEGLITTER2_2
-    {SPR_TGLT, 32775, 2, NULL, S_TELEGLITTER2_4, 0, 0}, // S_TELEGLITTER2_3
-    {SPR_TGLT, 32776, 2, A_AccTeleGlitter, S_TELEGLITTER2_5, 0, 0},     // S_TELEGLITTER2_4
-    {SPR_TGLT, 32777, 2, NULL, S_TELEGLITTER2_1, 0, 0}, // S_TELEGLITTER2_5
-    {SPR_TELE, 32768, 6, NULL, S_TFOG2, 0, 0},  // S_TFOG1
-    {SPR_TELE, 32769, 6, NULL, S_TFOG3, 0, 0},  // S_TFOG2
-    {SPR_TELE, 32770, 6, NULL, S_TFOG4, 0, 0},  // S_TFOG3
-    {SPR_TELE, 32771, 6, NULL, S_TFOG5, 0, 0},  // S_TFOG4
-    {SPR_TELE, 32772, 6, NULL, S_TFOG6, 0, 0},  // S_TFOG5
-    {SPR_TELE, 32773, 6, NULL, S_TFOG7, 0, 0},  // S_TFOG6
-    {SPR_TELE, 32774, 6, NULL, S_TFOG8, 0, 0},  // S_TFOG7
-    {SPR_TELE, 32775, 6, NULL, S_TFOG9, 0, 0},  // S_TFOG8
-    {SPR_TELE, 32774, 6, NULL, S_TFOG10, 0, 0}, // S_TFOG9
-    {SPR_TELE, 32773, 6, NULL, S_TFOG11, 0, 0}, // S_TFOG10
-    {SPR_TELE, 32772, 6, NULL, S_TFOG12, 0, 0}, // S_TFOG11
-    {SPR_TELE, 32771, 6, NULL, S_TFOG13, 0, 0}, // S_TFOG12
-    {SPR_TELE, 32770, 6, NULL, S_NULL, 0, 0},   // S_TFOG13
-    {SPR_STFF, 0, 0, A_Light0, S_NULL, 0, 0},   // S_LIGHTDONE
-    {SPR_STFF, 0, 1, A_WeaponReady, S_STAFFREADY, 0, 0},        // S_STAFFREADY
-    {SPR_STFF, 0, 1, A_Lower, S_STAFFDOWN, 0, 0},       // S_STAFFDOWN
-    {SPR_STFF, 0, 1, A_Raise, S_STAFFUP, 0, 0}, // S_STAFFUP
-    {SPR_STFF, 3, 4, A_WeaponReady, S_STAFFREADY2_2, 0, 0},     // S_STAFFREADY2_1
-    {SPR_STFF, 4, 4, A_WeaponReady, S_STAFFREADY2_3, 0, 0},     // S_STAFFREADY2_2
-    {SPR_STFF, 5, 4, A_WeaponReady, S_STAFFREADY2_1, 0, 0},     // S_STAFFREADY2_3
-    {SPR_STFF, 3, 1, A_Lower, S_STAFFDOWN2, 0, 0},      // S_STAFFDOWN2
-    {SPR_STFF, 3, 1, A_Raise, S_STAFFUP2, 0, 0},        // S_STAFFUP2
-    {SPR_STFF, 1, 6, NULL, S_STAFFATK1_2, 0, 0},        // S_STAFFATK1_1
-    {SPR_STFF, 2, 8, A_StaffAttackPL1, S_STAFFATK1_3, 0, 0},    // S_STAFFATK1_2
-    {SPR_STFF, 1, 8, A_ReFire, S_STAFFREADY, 0, 0},     // S_STAFFATK1_3
-    {SPR_STFF, 6, 6, NULL, S_STAFFATK2_2, 0, 0},        // S_STAFFATK2_1
-    {SPR_STFF, 7, 8, A_StaffAttackPL2, S_STAFFATK2_3, 0, 0},    // S_STAFFATK2_2
-    {SPR_STFF, 6, 8, A_ReFire, S_STAFFREADY2_1, 0, 0},  // S_STAFFATK2_3
-    {SPR_PUF3, 32768, 4, NULL, S_STAFFPUFF2, 0, 0},     // S_STAFFPUFF1
-    {SPR_PUF3, 1, 4, NULL, S_STAFFPUFF3, 0, 0}, // S_STAFFPUFF2
-    {SPR_PUF3, 2, 4, NULL, S_STAFFPUFF4, 0, 0}, // S_STAFFPUFF3
-    {SPR_PUF3, 3, 4, NULL, S_NULL, 0, 0},       // S_STAFFPUFF4
-    {SPR_PUF4, 32768, 4, NULL, S_STAFFPUFF2_2, 0, 0},   // S_STAFFPUFF2_1
-    {SPR_PUF4, 32769, 4, NULL, S_STAFFPUFF2_3, 0, 0},   // S_STAFFPUFF2_2
-    {SPR_PUF4, 32770, 4, NULL, S_STAFFPUFF2_4, 0, 0},   // S_STAFFPUFF2_3
-    {SPR_PUF4, 32771, 4, NULL, S_STAFFPUFF2_5, 0, 0},   // S_STAFFPUFF2_4
-    {SPR_PUF4, 32772, 4, NULL, S_STAFFPUFF2_6, 0, 0},   // S_STAFFPUFF2_5
-    {SPR_PUF4, 32773, 4, NULL, S_NULL, 0, 0},   // S_STAFFPUFF2_6
-    {SPR_BEAK, 0, 1, A_BeakReady, S_BEAKREADY, 0, 0},   // S_BEAKREADY
-    {SPR_BEAK, 0, 1, A_Lower, S_BEAKDOWN, 0, 0},        // S_BEAKDOWN
-    {SPR_BEAK, 0, 1, A_BeakRaise, S_BEAKUP, 0, 0},      // S_BEAKUP
-    {SPR_BEAK, 0, 18, A_BeakAttackPL1, S_BEAKREADY, 0, 0},      // S_BEAKATK1_1
-    {SPR_BEAK, 0, 12, A_BeakAttackPL2, S_BEAKREADY, 0, 0},      // S_BEAKATK2_1
-    {SPR_WGNT, 0, -1, NULL, S_NULL, 0, 0},      // S_WGNT
-    {SPR_GAUN, 0, 1, A_WeaponReady, S_GAUNTLETREADY, 0, 0},     // S_GAUNTLETREADY
-    {SPR_GAUN, 0, 1, A_Lower, S_GAUNTLETDOWN, 0, 0},    // S_GAUNTLETDOWN
-    {SPR_GAUN, 0, 1, A_Raise, S_GAUNTLETUP, 0, 0},      // S_GAUNTLETUP
-    {SPR_GAUN, 6, 4, A_WeaponReady, S_GAUNTLETREADY2_2, 0, 0},  // S_GAUNTLETREADY2_1
-    {SPR_GAUN, 7, 4, A_WeaponReady, S_GAUNTLETREADY2_3, 0, 0},  // S_GAUNTLETREADY2_2
-    {SPR_GAUN, 8, 4, A_WeaponReady, S_GAUNTLETREADY2_1, 0, 0},  // S_GAUNTLETREADY2_3
-    {SPR_GAUN, 6, 1, A_Lower, S_GAUNTLETDOWN2, 0, 0},   // S_GAUNTLETDOWN2
-    {SPR_GAUN, 6, 1, A_Raise, S_GAUNTLETUP2, 0, 0},     // S_GAUNTLETUP2
-    {SPR_GAUN, 1, 4, NULL, S_GAUNTLETATK1_2, 0, 0},     // S_GAUNTLETATK1_1
-    {SPR_GAUN, 2, 4, NULL, S_GAUNTLETATK1_3, 0, 0},     // S_GAUNTLETATK1_2
-    {SPR_GAUN, 32771, 4, A_GauntletAttack, S_GAUNTLETATK1_4, 0, 0},     // S_GAUNTLETATK1_3
-    {SPR_GAUN, 32772, 4, A_GauntletAttack, S_GAUNTLETATK1_5, 0, 0},     // S_GAUNTLETATK1_4
-    {SPR_GAUN, 32773, 4, A_GauntletAttack, S_GAUNTLETATK1_6, 0, 0},     // S_GAUNTLETATK1_5
-    {SPR_GAUN, 2, 4, A_ReFire, S_GAUNTLETATK1_7, 0, 0}, // S_GAUNTLETATK1_6
-    {SPR_GAUN, 1, 4, A_Light0, S_GAUNTLETREADY, 0, 0},  // S_GAUNTLETATK1_7
-    {SPR_GAUN, 9, 4, NULL, S_GAUNTLETATK2_2, 0, 0},     // S_GAUNTLETATK2_1
-    {SPR_GAUN, 10, 4, NULL, S_GAUNTLETATK2_3, 0, 0},    // S_GAUNTLETATK2_2
-    {SPR_GAUN, 32779, 4, A_GauntletAttack, S_GAUNTLETATK2_4, 0, 0},     // S_GAUNTLETATK2_3
-    {SPR_GAUN, 32780, 4, A_GauntletAttack, S_GAUNTLETATK2_5, 0, 0},     // S_GAUNTLETATK2_4
-    {SPR_GAUN, 32781, 4, A_GauntletAttack, S_GAUNTLETATK2_6, 0, 0},     // S_GAUNTLETATK2_5
-    {SPR_GAUN, 10, 4, A_ReFire, S_GAUNTLETATK2_7, 0, 0},        // S_GAUNTLETATK2_6
-    {SPR_GAUN, 9, 4, A_Light0, S_GAUNTLETREADY2_1, 0, 0},       // S_GAUNTLETATK2_7
-    {SPR_PUF1, 32768, 4, NULL, S_GAUNTLETPUFF1_2, 0, 0},        // S_GAUNTLETPUFF1_1
-    {SPR_PUF1, 32769, 4, NULL, S_GAUNTLETPUFF1_3, 0, 0},        // S_GAUNTLETPUFF1_2
-    {SPR_PUF1, 32770, 4, NULL, S_GAUNTLETPUFF1_4, 0, 0},        // S_GAUNTLETPUFF1_3
-    {SPR_PUF1, 32771, 4, NULL, S_NULL, 0, 0},   // S_GAUNTLETPUFF1_4
-    {SPR_PUF1, 32772, 4, NULL, S_GAUNTLETPUFF2_2, 0, 0},        // S_GAUNTLETPUFF2_1
-    {SPR_PUF1, 32773, 4, NULL, S_GAUNTLETPUFF2_3, 0, 0},        // S_GAUNTLETPUFF2_2
-    {SPR_PUF1, 32774, 4, NULL, S_GAUNTLETPUFF2_4, 0, 0},        // S_GAUNTLETPUFF2_3
-    {SPR_PUF1, 32775, 4, NULL, S_NULL, 0, 0},   // S_GAUNTLETPUFF2_4
-    {SPR_WBLS, 0, -1, NULL, S_NULL, 0, 0},      // S_BLSR
-    {SPR_BLSR, 0, 1, A_WeaponReady, S_BLASTERREADY, 0, 0},      // S_BLASTERREADY
-    {SPR_BLSR, 0, 1, A_Lower, S_BLASTERDOWN, 0, 0},     // S_BLASTERDOWN
-    {SPR_BLSR, 0, 1, A_Raise, S_BLASTERUP, 0, 0},       // S_BLASTERUP
-    {SPR_BLSR, 1, 3, NULL, S_BLASTERATK1_2, 0, 0},      // S_BLASTERATK1_1
-    {SPR_BLSR, 2, 3, NULL, S_BLASTERATK1_3, 0, 0},      // S_BLASTERATK1_2
-    {SPR_BLSR, 3, 2, A_FireBlasterPL1, S_BLASTERATK1_4, 0, 0},  // S_BLASTERATK1_3
-    {SPR_BLSR, 2, 2, NULL, S_BLASTERATK1_5, 0, 0},      // S_BLASTERATK1_4
-    {SPR_BLSR, 1, 2, NULL, S_BLASTERATK1_6, 0, 0},      // S_BLASTERATK1_5
-    {SPR_BLSR, 0, 0, A_ReFire, S_BLASTERREADY, 0, 0},   // S_BLASTERATK1_6
-    {SPR_BLSR, 1, 0, NULL, S_BLASTERATK2_2, 0, 0},      // S_BLASTERATK2_1
-    {SPR_BLSR, 2, 0, NULL, S_BLASTERATK2_3, 0, 0},      // S_BLASTERATK2_2
-    {SPR_BLSR, 3, 3, A_FireBlasterPL2, S_BLASTERATK2_4, 0, 0},  // S_BLASTERATK2_3
-    {SPR_BLSR, 2, 4, NULL, S_BLASTERATK2_5, 0, 0},      // S_BLASTERATK2_4
-    {SPR_BLSR, 1, 4, NULL, S_BLASTERATK2_6, 0, 0},      // S_BLASTERATK2_5
-    {SPR_BLSR, 0, 0, A_ReFire, S_BLASTERREADY, 0, 0},   // S_BLASTERATK2_6
-    {SPR_ACLO, 4, 200, NULL, S_BLASTERFX1_1, 0, 0},     // S_BLASTERFX1_1
-    {SPR_FX18, 32768, 3, A_SpawnRippers, S_BLASTERFXI1_2, 0, 0},        // S_BLASTERFXI1_1
-    {SPR_FX18, 32769, 3, NULL, S_BLASTERFXI1_3, 0, 0},  // S_BLASTERFXI1_2
-    {SPR_FX18, 32770, 4, NULL, S_BLASTERFXI1_4, 0, 0},  // S_BLASTERFXI1_3
-    {SPR_FX18, 32771, 4, NULL, S_BLASTERFXI1_5, 0, 0},  // S_BLASTERFXI1_4
-    {SPR_FX18, 32772, 4, NULL, S_BLASTERFXI1_6, 0, 0},  // S_BLASTERFXI1_5
-    {SPR_FX18, 32773, 4, NULL, S_BLASTERFXI1_7, 0, 0},  // S_BLASTERFXI1_6
-    {SPR_FX18, 32774, 4, NULL, S_NULL, 0, 0},   // S_BLASTERFXI1_7
-    {SPR_FX18, 7, 4, NULL, S_BLASTERSMOKE2, 0, 0},      // S_BLASTERSMOKE1
-    {SPR_FX18, 8, 4, NULL, S_BLASTERSMOKE3, 0, 0},      // S_BLASTERSMOKE2
-    {SPR_FX18, 9, 4, NULL, S_BLASTERSMOKE4, 0, 0},      // S_BLASTERSMOKE3
-    {SPR_FX18, 10, 4, NULL, S_BLASTERSMOKE5, 0, 0},     // S_BLASTERSMOKE4
-    {SPR_FX18, 11, 4, NULL, S_NULL, 0, 0},      // S_BLASTERSMOKE5
-    {SPR_FX18, 12, 4, NULL, S_RIPPER2, 0, 0},   // S_RIPPER1
-    {SPR_FX18, 13, 5, NULL, S_RIPPER1, 0, 0},   // S_RIPPER2
-    {SPR_FX18, 32782, 4, NULL, S_RIPPERX2, 0, 0},       // S_RIPPERX1
-    {SPR_FX18, 32783, 4, NULL, S_RIPPERX3, 0, 0},       // S_RIPPERX2
-    {SPR_FX18, 32784, 4, NULL, S_RIPPERX4, 0, 0},       // S_RIPPERX3
-    {SPR_FX18, 32785, 4, NULL, S_RIPPERX5, 0, 0},       // S_RIPPERX4
-    {SPR_FX18, 32786, 4, NULL, S_NULL, 0, 0},   // S_RIPPERX5
-    {SPR_FX17, 32768, 4, NULL, S_BLASTERPUFF1_2, 0, 0}, // S_BLASTERPUFF1_1
-    {SPR_FX17, 32769, 4, NULL, S_BLASTERPUFF1_3, 0, 0}, // S_BLASTERPUFF1_2
-    {SPR_FX17, 32770, 4, NULL, S_BLASTERPUFF1_4, 0, 0}, // S_BLASTERPUFF1_3
-    {SPR_FX17, 32771, 4, NULL, S_BLASTERPUFF1_5, 0, 0}, // S_BLASTERPUFF1_4
-    {SPR_FX17, 32772, 4, NULL, S_NULL, 0, 0},   // S_BLASTERPUFF1_5
-    {SPR_FX17, 32773, 3, NULL, S_BLASTERPUFF2_2, 0, 0}, // S_BLASTERPUFF2_1
-    {SPR_FX17, 32774, 3, NULL, S_BLASTERPUFF2_3, 0, 0}, // S_BLASTERPUFF2_2
-    {SPR_FX17, 32775, 4, NULL, S_BLASTERPUFF2_4, 0, 0}, // S_BLASTERPUFF2_3
-    {SPR_FX17, 32776, 4, NULL, S_BLASTERPUFF2_5, 0, 0}, // S_BLASTERPUFF2_4
-    {SPR_FX17, 32777, 4, NULL, S_BLASTERPUFF2_6, 0, 0}, // S_BLASTERPUFF2_5
-    {SPR_FX17, 32778, 4, NULL, S_BLASTERPUFF2_7, 0, 0}, // S_BLASTERPUFF2_6
-    {SPR_FX17, 32779, 4, NULL, S_NULL, 0, 0},   // S_BLASTERPUFF2_7
-    {SPR_WMCE, 0, -1, NULL, S_NULL, 0, 0},      // S_WMCE
-    {SPR_MACE, 0, 1, A_WeaponReady, S_MACEREADY, 0, 0}, // S_MACEREADY
-    {SPR_MACE, 0, 1, A_Lower, S_MACEDOWN, 0, 0},        // S_MACEDOWN
-    {SPR_MACE, 0, 1, A_Raise, S_MACEUP, 0, 0},  // S_MACEUP
-    {SPR_MACE, 1, 4, NULL, S_MACEATK1_2, 0, 0}, // S_MACEATK1_1
-    {SPR_MACE, 2, 3, A_FireMacePL1, S_MACEATK1_3, 0, 0},        // S_MACEATK1_2
-    {SPR_MACE, 3, 3, A_FireMacePL1, S_MACEATK1_4, 0, 0},        // S_MACEATK1_3
-    {SPR_MACE, 4, 3, A_FireMacePL1, S_MACEATK1_5, 0, 0},        // S_MACEATK1_4
-    {SPR_MACE, 5, 3, A_FireMacePL1, S_MACEATK1_6, 0, 0},        // S_MACEATK1_5
-    {SPR_MACE, 2, 4, A_ReFire, S_MACEATK1_7, 0, 0},     // S_MACEATK1_6
-    {SPR_MACE, 3, 4, NULL, S_MACEATK1_8, 0, 0}, // S_MACEATK1_7
-    {SPR_MACE, 4, 4, NULL, S_MACEATK1_9, 0, 0}, // S_MACEATK1_8
-    {SPR_MACE, 5, 4, NULL, S_MACEATK1_10, 0, 0},        // S_MACEATK1_9
-    {SPR_MACE, 1, 4, NULL, S_MACEREADY, 0, 0},  // S_MACEATK1_10
-    {SPR_MACE, 1, 4, NULL, S_MACEATK2_2, 0, 0}, // S_MACEATK2_1
-    {SPR_MACE, 3, 4, A_FireMacePL2, S_MACEATK2_3, 0, 0},        // S_MACEATK2_2
-    {SPR_MACE, 1, 4, NULL, S_MACEATK2_4, 0, 0}, // S_MACEATK2_3
-    {SPR_MACE, 0, 8, A_ReFire, S_MACEREADY, 0, 0},      // S_MACEATK2_4
-    {SPR_FX02, 0, 4, A_MacePL1Check, S_MACEFX1_2, 0, 0},        // S_MACEFX1_1
-    {SPR_FX02, 1, 4, A_MacePL1Check, S_MACEFX1_1, 0, 0},        // S_MACEFX1_2
-    {SPR_FX02, 32773, 4, A_MaceBallImpact, S_MACEFXI1_2, 0, 0}, // S_MACEFXI1_1
-    {SPR_FX02, 32774, 4, NULL, S_MACEFXI1_3, 0, 0},     // S_MACEFXI1_2
-    {SPR_FX02, 32775, 4, NULL, S_MACEFXI1_4, 0, 0},     // S_MACEFXI1_3
-    {SPR_FX02, 32776, 4, NULL, S_MACEFXI1_5, 0, 0},     // S_MACEFXI1_4
-    {SPR_FX02, 32777, 4, NULL, S_NULL, 0, 0},   // S_MACEFXI1_5
-    {SPR_FX02, 2, 4, NULL, S_MACEFX2_2, 0, 0},  // S_MACEFX2_1
-    {SPR_FX02, 3, 4, NULL, S_MACEFX2_1, 0, 0},  // S_MACEFX2_2
-    {SPR_FX02, 32773, 4, A_MaceBallImpact2, S_MACEFXI1_2, 0, 0},        // S_MACEFXI2_1
-    {SPR_FX02, 0, 4, NULL, S_MACEFX3_2, 0, 0},  // S_MACEFX3_1
-    {SPR_FX02, 1, 4, NULL, S_MACEFX3_1, 0, 0},  // S_MACEFX3_2
-    {SPR_FX02, 4, 99, NULL, S_MACEFX4_1, 0, 0}, // S_MACEFX4_1
-    {SPR_FX02, 32770, 4, A_DeathBallImpact, S_MACEFXI1_2, 0, 0},        // S_MACEFXI4_1
-    {SPR_WSKL, 0, -1, NULL, S_NULL, 0, 0},      // S_WSKL
-    {SPR_HROD, 0, 1, A_WeaponReady, S_HORNRODREADY, 0, 0},      // S_HORNRODREADY
-    {SPR_HROD, 0, 1, A_Lower, S_HORNRODDOWN, 0, 0},     // S_HORNRODDOWN
-    {SPR_HROD, 0, 1, A_Raise, S_HORNRODUP, 0, 0},       // S_HORNRODUP
-    {SPR_HROD, 0, 4, A_FireSkullRodPL1, S_HORNRODATK1_2, 0, 0}, // S_HORNRODATK1_1
-    {SPR_HROD, 1, 4, A_FireSkullRodPL1, S_HORNRODATK1_3, 0, 0}, // S_HORNRODATK1_2
-    {SPR_HROD, 1, 0, A_ReFire, S_HORNRODREADY, 0, 0},   // S_HORNRODATK1_3
-    {SPR_HROD, 2, 2, NULL, S_HORNRODATK2_2, 0, 0},      // S_HORNRODATK2_1
-    {SPR_HROD, 3, 3, NULL, S_HORNRODATK2_3, 0, 0},      // S_HORNRODATK2_2
-    {SPR_HROD, 4, 2, NULL, S_HORNRODATK2_4, 0, 0},      // S_HORNRODATK2_3
-    {SPR_HROD, 5, 3, NULL, S_HORNRODATK2_5, 0, 0},      // S_HORNRODATK2_4
-    {SPR_HROD, 6, 4, A_FireSkullRodPL2, S_HORNRODATK2_6, 0, 0}, // S_HORNRODATK2_5
-    {SPR_HROD, 5, 2, NULL, S_HORNRODATK2_7, 0, 0},      // S_HORNRODATK2_6
-    {SPR_HROD, 4, 3, NULL, S_HORNRODATK2_8, 0, 0},      // S_HORNRODATK2_7
-    {SPR_HROD, 3, 2, NULL, S_HORNRODATK2_9, 0, 0},      // S_HORNRODATK2_8
-    {SPR_HROD, 2, 2, A_ReFire, S_HORNRODREADY, 0, 0},   // S_HORNRODATK2_9
-    {SPR_FX00, 32768, 6, NULL, S_HRODFX1_2, 0, 0},      // S_HRODFX1_1
-    {SPR_FX00, 32769, 6, NULL, S_HRODFX1_1, 0, 0},      // S_HRODFX1_2
-    {SPR_FX00, 32775, 5, NULL, S_HRODFXI1_2, 0, 0},     // S_HRODFXI1_1
-    {SPR_FX00, 32776, 5, NULL, S_HRODFXI1_3, 0, 0},     // S_HRODFXI1_2
-    {SPR_FX00, 32777, 4, NULL, S_HRODFXI1_4, 0, 0},     // S_HRODFXI1_3
-    {SPR_FX00, 32778, 4, NULL, S_HRODFXI1_5, 0, 0},     // S_HRODFXI1_4
-    {SPR_FX00, 32779, 3, NULL, S_HRODFXI1_6, 0, 0},     // S_HRODFXI1_5
-    {SPR_FX00, 32780, 3, NULL, S_NULL, 0, 0},   // S_HRODFXI1_6
-    {SPR_FX00, 32770, 3, NULL, S_HRODFX2_2, 0, 0},      // S_HRODFX2_1
-    {SPR_FX00, 32771, 3, A_SkullRodPL2Seek, S_HRODFX2_3, 0, 0}, // S_HRODFX2_2
-    {SPR_FX00, 32772, 3, NULL, S_HRODFX2_4, 0, 0},      // S_HRODFX2_3
-    {SPR_FX00, 32773, 3, A_SkullRodPL2Seek, S_HRODFX2_1, 0, 0}, // S_HRODFX2_4
-    {SPR_FX00, 32775, 5, A_AddPlayerRain, S_HRODFXI2_2, 0, 0},  // S_HRODFXI2_1
-    {SPR_FX00, 32776, 5, NULL, S_HRODFXI2_3, 0, 0},     // S_HRODFXI2_2
-    {SPR_FX00, 32777, 4, NULL, S_HRODFXI2_4, 0, 0},     // S_HRODFXI2_3
-    {SPR_FX00, 32778, 3, NULL, S_HRODFXI2_5, 0, 0},     // S_HRODFXI2_4
-    {SPR_FX00, 32779, 3, NULL, S_HRODFXI2_6, 0, 0},     // S_HRODFXI2_5
-    {SPR_FX00, 32780, 3, NULL, S_HRODFXI2_7, 0, 0},     // S_HRODFXI2_6
-    {SPR_FX00, 6, 1, A_HideInCeiling, S_HRODFXI2_8, 0, 0},      // S_HRODFXI2_7
-    {SPR_FX00, 6, 1, A_SkullRodStorm, S_HRODFXI2_8, 0, 0},      // S_HRODFXI2_8
-    {SPR_FX20, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR1_1
-    {SPR_FX21, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR2_1
-    {SPR_FX22, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR3_1
-    {SPR_FX23, 32768, -1, NULL, S_NULL, 0, 0},  // S_RAINPLR4_1
-    {SPR_FX20, 32769, 4, A_RainImpact, S_RAINPLR1X_2, 0, 0},    // S_RAINPLR1X_1
-    {SPR_FX20, 32770, 4, NULL, S_RAINPLR1X_3, 0, 0},    // S_RAINPLR1X_2
-    {SPR_FX20, 32771, 4, NULL, S_RAINPLR1X_4, 0, 0},    // S_RAINPLR1X_3
-    {SPR_FX20, 32772, 4, NULL, S_RAINPLR1X_5, 0, 0},    // S_RAINPLR1X_4
-    {SPR_FX20, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR1X_5
-    {SPR_FX21, 32769, 4, A_RainImpact, S_RAINPLR2X_2, 0, 0},    // S_RAINPLR2X_1
-    {SPR_FX21, 32770, 4, NULL, S_RAINPLR2X_3, 0, 0},    // S_RAINPLR2X_2
-    {SPR_FX21, 32771, 4, NULL, S_RAINPLR2X_4, 0, 0},    // S_RAINPLR2X_3
-    {SPR_FX21, 32772, 4, NULL, S_RAINPLR2X_5, 0, 0},    // S_RAINPLR2X_4
-    {SPR_FX21, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR2X_5
-    {SPR_FX22, 32769, 4, A_RainImpact, S_RAINPLR3X_2, 0, 0},    // S_RAINPLR3X_1
-    {SPR_FX22, 32770, 4, NULL, S_RAINPLR3X_3, 0, 0},    // S_RAINPLR3X_2
-    {SPR_FX22, 32771, 4, NULL, S_RAINPLR3X_4, 0, 0},    // S_RAINPLR3X_3
-    {SPR_FX22, 32772, 4, NULL, S_RAINPLR3X_5, 0, 0},    // S_RAINPLR3X_4
-    {SPR_FX22, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR3X_5
-    {SPR_FX23, 32769, 4, A_RainImpact, S_RAINPLR4X_2, 0, 0},    // S_RAINPLR4X_1
-    {SPR_FX23, 32770, 4, NULL, S_RAINPLR4X_3, 0, 0},    // S_RAINPLR4X_2
-    {SPR_FX23, 32771, 4, NULL, S_RAINPLR4X_4, 0, 0},    // S_RAINPLR4X_3
-    {SPR_FX23, 32772, 4, NULL, S_RAINPLR4X_5, 0, 0},    // S_RAINPLR4X_4
-    {SPR_FX23, 32773, 4, NULL, S_NULL, 0, 0},   // S_RAINPLR4X_5
-    {SPR_FX20, 32774, 4, NULL, S_RAINAIRXPLR1_2, 0, 0}, // S_RAINAIRXPLR1_1
-    {SPR_FX21, 32774, 4, NULL, S_RAINAIRXPLR2_2, 0, 0}, // S_RAINAIRXPLR2_1
-    {SPR_FX22, 32774, 4, NULL, S_RAINAIRXPLR3_2, 0, 0}, // S_RAINAIRXPLR3_1
-    {SPR_FX23, 32774, 4, NULL, S_RAINAIRXPLR4_2, 0, 0}, // S_RAINAIRXPLR4_1
-    {SPR_FX20, 32775, 4, NULL, S_RAINAIRXPLR1_3, 0, 0}, // S_RAINAIRXPLR1_2
-    {SPR_FX21, 32775, 4, NULL, S_RAINAIRXPLR2_3, 0, 0}, // S_RAINAIRXPLR2_2
-    {SPR_FX22, 32775, 4, NULL, S_RAINAIRXPLR3_3, 0, 0}, // S_RAINAIRXPLR3_2
-    {SPR_FX23, 32775, 4, NULL, S_RAINAIRXPLR4_3, 0, 0}, // S_RAINAIRXPLR4_2
-    {SPR_FX20, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR1_3
-    {SPR_FX21, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR2_3
-    {SPR_FX22, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR3_3
-    {SPR_FX23, 32776, 4, NULL, S_NULL, 0, 0},   // S_RAINAIRXPLR4_3
-    {SPR_GWND, 0, 1, A_WeaponReady, S_GOLDWANDREADY, 0, 0},     // S_GOLDWANDREADY
-    {SPR_GWND, 0, 1, A_Lower, S_GOLDWANDDOWN, 0, 0},    // S_GOLDWANDDOWN
-    {SPR_GWND, 0, 1, A_Raise, S_GOLDWANDUP, 0, 0},      // S_GOLDWANDUP
-    {SPR_GWND, 1, 3, NULL, S_GOLDWANDATK1_2, 0, 0},     // S_GOLDWANDATK1_1
-    {SPR_GWND, 2, 5, A_FireGoldWandPL1, S_GOLDWANDATK1_3, 0, 0},        // S_GOLDWANDATK1_2
-    {SPR_GWND, 3, 3, NULL, S_GOLDWANDATK1_4, 0, 0},     // S_GOLDWANDATK1_3
-    {SPR_GWND, 3, 0, A_ReFire, S_GOLDWANDREADY, 0, 0},  // S_GOLDWANDATK1_4
-    {SPR_GWND, 1, 3, NULL, S_GOLDWANDATK2_2, 0, 0},     // S_GOLDWANDATK2_1
-    {SPR_GWND, 2, 4, A_FireGoldWandPL2, S_GOLDWANDATK2_3, 0, 0},        // S_GOLDWANDATK2_2
-    {SPR_GWND, 3, 3, NULL, S_GOLDWANDATK2_4, 0, 0},     // S_GOLDWANDATK2_3
-    {SPR_GWND, 3, 0, A_ReFire, S_GOLDWANDREADY, 0, 0},  // S_GOLDWANDATK2_4
-    {SPR_FX01, 32768, 6, NULL, S_GWANDFX1_2, 0, 0},     // S_GWANDFX1_1
-    {SPR_FX01, 32769, 6, NULL, S_GWANDFX1_1, 0, 0},     // S_GWANDFX1_2
-    {SPR_FX01, 32772, 3, NULL, S_GWANDFXI1_2, 0, 0},    // S_GWANDFXI1_1
-    {SPR_FX01, 32773, 3, NULL, S_GWANDFXI1_3, 0, 0},    // S_GWANDFXI1_2
-    {SPR_FX01, 32774, 3, NULL, S_GWANDFXI1_4, 0, 0},    // S_GWANDFXI1_3
-    {SPR_FX01, 32775, 3, NULL, S_NULL, 0, 0},   // S_GWANDFXI1_4
-    {SPR_FX01, 32770, 6, NULL, S_GWANDFX2_2, 0, 0},     // S_GWANDFX2_1
-    {SPR_FX01, 32771, 6, NULL, S_GWANDFX2_1, 0, 0},     // S_GWANDFX2_2
-    {SPR_PUF2, 32768, 3, NULL, S_GWANDPUFF1_2, 0, 0},   // S_GWANDPUFF1_1
-    {SPR_PUF2, 32769, 3, NULL, S_GWANDPUFF1_3, 0, 0},   // S_GWANDPUFF1_2
-    {SPR_PUF2, 32770, 3, NULL, S_GWANDPUFF1_4, 0, 0},   // S_GWANDPUFF1_3
-    {SPR_PUF2, 32771, 3, NULL, S_GWANDPUFF1_5, 0, 0},   // S_GWANDPUFF1_4
-    {SPR_PUF2, 32772, 3, NULL, S_NULL, 0, 0},   // S_GWANDPUFF1_5
-    {SPR_WPHX, 0, -1, NULL, S_NULL, 0, 0},      // S_WPHX
-    {SPR_PHNX, 0, 1, A_WeaponReady, S_PHOENIXREADY, 0, 0},      // S_PHOENIXREADY
-    {SPR_PHNX, 0, 1, A_Lower, S_PHOENIXDOWN, 0, 0},     // S_PHOENIXDOWN
-    {SPR_PHNX, 0, 1, A_Raise, S_PHOENIXUP, 0, 0},       // S_PHOENIXUP
-    {SPR_PHNX, 1, 5, NULL, S_PHOENIXATK1_2, 0, 0},      // S_PHOENIXATK1_1
-    {SPR_PHNX, 2, 7, A_FirePhoenixPL1, S_PHOENIXATK1_3, 0, 0},  // S_PHOENIXATK1_2
-    {SPR_PHNX, 3, 4, NULL, S_PHOENIXATK1_4, 0, 0},      // S_PHOENIXATK1_3
-    {SPR_PHNX, 1, 4, NULL, S_PHOENIXATK1_5, 0, 0},      // S_PHOENIXATK1_4
-    {SPR_PHNX, 1, 0, A_ReFire, S_PHOENIXREADY, 0, 0},   // S_PHOENIXATK1_5
-    {SPR_PHNX, 1, 3, A_InitPhoenixPL2, S_PHOENIXATK2_2, 0, 0},  // S_PHOENIXATK2_1
-    {SPR_PHNX, 32770, 1, A_FirePhoenixPL2, S_PHOENIXATK2_3, 0, 0},      // S_PHOENIXATK2_2
-    {SPR_PHNX, 1, 4, A_ReFire, S_PHOENIXATK2_4, 0, 0},  // S_PHOENIXATK2_3
-    {SPR_PHNX, 1, 4, A_ShutdownPhoenixPL2, S_PHOENIXREADY, 0, 0},       // S_PHOENIXATK2_4
-    {SPR_FX04, 32768, 4, A_PhoenixPuff, S_PHOENIXFX1_1, 0, 0},  // S_PHOENIXFX1_1
-    {SPR_FX08, 32768, 6, A_Explode, S_PHOENIXFXI1_2, 0, 0},     // S_PHOENIXFXI1_1
-    {SPR_FX08, 32769, 5, NULL, S_PHOENIXFXI1_3, 0, 0},  // S_PHOENIXFXI1_2
-    {SPR_FX08, 32770, 5, NULL, S_PHOENIXFXI1_4, 0, 0},  // S_PHOENIXFXI1_3
-    {SPR_FX08, 32771, 4, NULL, S_PHOENIXFXI1_5, 0, 0},  // S_PHOENIXFXI1_4
-    {SPR_FX08, 32772, 4, NULL, S_PHOENIXFXI1_6, 0, 0},  // S_PHOENIXFXI1_5
-    {SPR_FX08, 32773, 4, NULL, S_PHOENIXFXI1_7, 0, 0},  // S_PHOENIXFXI1_6
-    {SPR_FX08, 32774, 4, NULL, S_PHOENIXFXI1_8, 0, 0},  // S_PHOENIXFXI1_7
-    {SPR_FX08, 32775, 4, NULL, S_NULL, 0, 0},   // S_PHOENIXFXI1_8
-    {SPR_FX08, 32776, 8, NULL, S_PHOENIXFXIX_1, 0, 0 }, // S_PHOENIXFXIX_1
-    {SPR_FX08, 32777, 8, A_RemovedPhoenixFunc, S_PHOENIXFXIX_2, 0, 0 },  // S_PHOENIXFXIX_2
-    {SPR_FX08, 32778, 8, NULL, S_NULL, 0, 0 },          // S_PHOENIXFXIX_3
-    {SPR_FX04, 1, 4, NULL, S_PHOENIXPUFF2, 0, 0},       // S_PHOENIXPUFF1
-    {SPR_FX04, 2, 4, NULL, S_PHOENIXPUFF3, 0, 0},       // S_PHOENIXPUFF2
-    {SPR_FX04, 3, 4, NULL, S_PHOENIXPUFF4, 0, 0},       // S_PHOENIXPUFF3
-    {SPR_FX04, 4, 4, NULL, S_PHOENIXPUFF5, 0, 0},       // S_PHOENIXPUFF4
-    {SPR_FX04, 5, 4, NULL, S_NULL, 0, 0},       // S_PHOENIXPUFF5
-    {SPR_FX09, 32768, 2, NULL, S_PHOENIXFX2_2, 0, 0},   // S_PHOENIXFX2_1
-    {SPR_FX09, 32769, 2, NULL, S_PHOENIXFX2_3, 0, 0},   // S_PHOENIXFX2_2
-    {SPR_FX09, 32768, 2, NULL, S_PHOENIXFX2_4, 0, 0},   // S_PHOENIXFX2_3
-    {SPR_FX09, 32769, 2, NULL, S_PHOENIXFX2_5, 0, 0},   // S_PHOENIXFX2_4
-    {SPR_FX09, 32768, 2, NULL, S_PHOENIXFX2_6, 0, 0},   // S_PHOENIXFX2_5
-    {SPR_FX09, 32769, 2, A_FlameEnd, S_PHOENIXFX2_7, 0, 0},     // S_PHOENIXFX2_6
-    {SPR_FX09, 32770, 2, NULL, S_PHOENIXFX2_8, 0, 0},   // S_PHOENIXFX2_7
-    {SPR_FX09, 32771, 2, NULL, S_PHOENIXFX2_9, 0, 0},   // S_PHOENIXFX2_8
-    {SPR_FX09, 32772, 2, NULL, S_PHOENIXFX2_10, 0, 0},  // S_PHOENIXFX2_9
-    {SPR_FX09, 32773, 2, NULL, S_NULL, 0, 0},   // S_PHOENIXFX2_10
-    {SPR_FX09, 32774, 3, NULL, S_PHOENIXFXI2_2, 0, 0},  // S_PHOENIXFXI2_1
-    {SPR_FX09, 32775, 3, A_FloatPuff, S_PHOENIXFXI2_3, 0, 0},   // S_PHOENIXFXI2_2
-    {SPR_FX09, 32776, 4, NULL, S_PHOENIXFXI2_4, 0, 0},  // S_PHOENIXFXI2_3
-    {SPR_FX09, 32777, 5, NULL, S_PHOENIXFXI2_5, 0, 0},  // S_PHOENIXFXI2_4
-    {SPR_FX09, 32778, 5, NULL, S_NULL, 0, 0},   // S_PHOENIXFXI2_5
-    {SPR_WBOW, 0, -1, NULL, S_NULL, 0, 0},      // S_WBOW
-    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW2, 0, 0},    // S_CRBOW1
-    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW3, 0, 0},    // S_CRBOW2
-    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW4, 0, 0},    // S_CRBOW3
-    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW5, 0, 0},    // S_CRBOW4
-    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW6, 0, 0},    // S_CRBOW5
-    {SPR_CRBW, 0, 1, A_WeaponReady, S_CRBOW7, 0, 0},    // S_CRBOW6
-    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW8, 0, 0},    // S_CRBOW7
-    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW9, 0, 0},    // S_CRBOW8
-    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW10, 0, 0},   // S_CRBOW9
-    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW11, 0, 0},   // S_CRBOW10
-    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW12, 0, 0},   // S_CRBOW11
-    {SPR_CRBW, 1, 1, A_WeaponReady, S_CRBOW13, 0, 0},   // S_CRBOW12
-    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW14, 0, 0},   // S_CRBOW13
-    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW15, 0, 0},   // S_CRBOW14
-    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW16, 0, 0},   // S_CRBOW15
-    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW17, 0, 0},   // S_CRBOW16
-    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW18, 0, 0},   // S_CRBOW17
-    {SPR_CRBW, 2, 1, A_WeaponReady, S_CRBOW1, 0, 0},    // S_CRBOW18
-    {SPR_CRBW, 0, 1, A_Lower, S_CRBOWDOWN, 0, 0},       // S_CRBOWDOWN
-    {SPR_CRBW, 0, 1, A_Raise, S_CRBOWUP, 0, 0}, // S_CRBOWUP
-    {SPR_CRBW, 3, 6, A_FireCrossbowPL1, S_CRBOWATK1_2, 0, 0},   // S_CRBOWATK1_1
-    {SPR_CRBW, 4, 3, NULL, S_CRBOWATK1_3, 0, 0},        // S_CRBOWATK1_2
-    {SPR_CRBW, 5, 3, NULL, S_CRBOWATK1_4, 0, 0},        // S_CRBOWATK1_3
-    {SPR_CRBW, 6, 3, NULL, S_CRBOWATK1_5, 0, 0},        // S_CRBOWATK1_4
-    {SPR_CRBW, 7, 3, NULL, S_CRBOWATK1_6, 0, 0},        // S_CRBOWATK1_5
-    {SPR_CRBW, 0, 4, NULL, S_CRBOWATK1_7, 0, 0},        // S_CRBOWATK1_6
-    {SPR_CRBW, 1, 4, NULL, S_CRBOWATK1_8, 0, 0},        // S_CRBOWATK1_7
-    {SPR_CRBW, 2, 5, A_ReFire, S_CRBOW1, 0, 0}, // S_CRBOWATK1_8
-    {SPR_CRBW, 3, 5, A_FireCrossbowPL2, S_CRBOWATK2_2, 0, 0},   // S_CRBOWATK2_1
-    {SPR_CRBW, 4, 3, NULL, S_CRBOWATK2_3, 0, 0},        // S_CRBOWATK2_2
-    {SPR_CRBW, 5, 2, NULL, S_CRBOWATK2_4, 0, 0},        // S_CRBOWATK2_3
-    {SPR_CRBW, 6, 3, NULL, S_CRBOWATK2_5, 0, 0},        // S_CRBOWATK2_4
-    {SPR_CRBW, 7, 2, NULL, S_CRBOWATK2_6, 0, 0},        // S_CRBOWATK2_5
-    {SPR_CRBW, 0, 3, NULL, S_CRBOWATK2_7, 0, 0},        // S_CRBOWATK2_6
-    {SPR_CRBW, 1, 3, NULL, S_CRBOWATK2_8, 0, 0},        // S_CRBOWATK2_7
-    {SPR_CRBW, 2, 4, A_ReFire, S_CRBOW1, 0, 0}, // S_CRBOWATK2_8
-    {SPR_FX03, 32769, 1, NULL, S_CRBOWFX1, 0, 0},       // S_CRBOWFX1
-    {SPR_FX03, 32775, 8, NULL, S_CRBOWFXI1_2, 0, 0},    // S_CRBOWFXI1_1
-    {SPR_FX03, 32776, 8, NULL, S_CRBOWFXI1_3, 0, 0},    // S_CRBOWFXI1_2
-    {SPR_FX03, 32777, 8, NULL, S_NULL, 0, 0},   // S_CRBOWFXI1_3
-    {SPR_FX03, 32769, 1, A_BoltSpark, S_CRBOWFX2, 0, 0},        // S_CRBOWFX2
-    {SPR_FX03, 32768, 1, NULL, S_CRBOWFX3, 0, 0},       // S_CRBOWFX3
-    {SPR_FX03, 32770, 8, NULL, S_CRBOWFXI3_2, 0, 0},    // S_CRBOWFXI3_1
-    {SPR_FX03, 32771, 8, NULL, S_CRBOWFXI3_3, 0, 0},    // S_CRBOWFXI3_2
-    {SPR_FX03, 32772, 8, NULL, S_NULL, 0, 0},   // S_CRBOWFXI3_3
-    {SPR_FX03, 32773, 8, NULL, S_CRBOWFX4_2, 0, 0},     // S_CRBOWFX4_1
-    {SPR_FX03, 32774, 8, NULL, S_NULL, 0, 0},   // S_CRBOWFX4_2
-    {SPR_BLOD, 2, 8, NULL, S_BLOOD2, 0, 0},     // S_BLOOD1
-    {SPR_BLOD, 1, 8, NULL, S_BLOOD3, 0, 0},     // S_BLOOD2
-    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOOD3
-    {SPR_BLOD, 2, 8, NULL, S_BLOODSPLATTER2, 0, 0},     // S_BLOODSPLATTER1
-    {SPR_BLOD, 1, 8, NULL, S_BLOODSPLATTER3, 0, 0},     // S_BLOODSPLATTER2
-    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTER3
-    {SPR_BLOD, 0, 6, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTERX
-    {SPR_PLAY, 0, -1, NULL, S_NULL, 0, 0},      // S_PLAY
-    {SPR_PLAY, 0, 4, NULL, S_PLAY_RUN2, 0, 0},  // S_PLAY_RUN1
-    {SPR_PLAY, 1, 4, NULL, S_PLAY_RUN3, 0, 0},  // S_PLAY_RUN2
-    {SPR_PLAY, 2, 4, NULL, S_PLAY_RUN4, 0, 0},  // S_PLAY_RUN3
-    {SPR_PLAY, 3, 4, NULL, S_PLAY_RUN1, 0, 0},  // S_PLAY_RUN4
-    {SPR_PLAY, 4, 12, NULL, S_PLAY, 0, 0},      // S_PLAY_ATK1
-    {SPR_PLAY, 32773, 6, NULL, S_PLAY_ATK1, 0, 0},      // S_PLAY_ATK2
-    {SPR_PLAY, 6, 4, NULL, S_PLAY_PAIN2, 0, 0}, // S_PLAY_PAIN
-    {SPR_PLAY, 6, 4, A_Pain, S_PLAY, 0, 0},     // S_PLAY_PAIN2
-    {SPR_PLAY, 7, 6, NULL, S_PLAY_DIE2, 0, 0},  // S_PLAY_DIE1
-    {SPR_PLAY, 8, 6, A_Scream, S_PLAY_DIE3, 0, 0},      // S_PLAY_DIE2
-    {SPR_PLAY, 9, 6, NULL, S_PLAY_DIE4, 0, 0},  // S_PLAY_DIE3
-    {SPR_PLAY, 10, 6, NULL, S_PLAY_DIE5, 0, 0}, // S_PLAY_DIE4
-    {SPR_PLAY, 11, 6, A_NoBlocking, S_PLAY_DIE6, 0, 0}, // S_PLAY_DIE5
-    {SPR_PLAY, 12, 6, NULL, S_PLAY_DIE7, 0, 0}, // S_PLAY_DIE6
-    {SPR_PLAY, 13, 6, NULL, S_PLAY_DIE8, 0, 0}, // S_PLAY_DIE7
-    {SPR_PLAY, 14, 6, NULL, S_PLAY_DIE9, 0, 0}, // S_PLAY_DIE8
-    {SPR_PLAY, 15, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_PLAY_DIE9
-    {SPR_PLAY, 16, 5, A_Scream, S_PLAY_XDIE2, 0, 0},    // S_PLAY_XDIE1
-    {SPR_PLAY, 17, 5, A_SkullPop, S_PLAY_XDIE3, 0, 0},  // S_PLAY_XDIE2
-    {SPR_PLAY, 18, 5, A_NoBlocking, S_PLAY_XDIE4, 0, 0},        // S_PLAY_XDIE3
-    {SPR_PLAY, 19, 5, NULL, S_PLAY_XDIE5, 0, 0},        // S_PLAY_XDIE4
-    {SPR_PLAY, 20, 5, NULL, S_PLAY_XDIE6, 0, 0},        // S_PLAY_XDIE5
-    {SPR_PLAY, 21, 5, NULL, S_PLAY_XDIE7, 0, 0},        // S_PLAY_XDIE6
-    {SPR_PLAY, 22, 5, NULL, S_PLAY_XDIE8, 0, 0},        // S_PLAY_XDIE7
-    {SPR_PLAY, 23, 5, NULL, S_PLAY_XDIE9, 0, 0},        // S_PLAY_XDIE8
-    {SPR_PLAY, 24, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_PLAY_XDIE9
-    {SPR_FDTH, 32768, 5, A_FlameSnd, S_PLAY_FDTH2, 0, 0},       // S_PLAY_FDTH1
-    {SPR_FDTH, 32769, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_FDTH2
-    {SPR_FDTH, 32770, 5, NULL, S_PLAY_FDTH4, 0, 0},     // S_PLAY_FDTH3
-    {SPR_FDTH, 32771, 4, A_Scream, S_PLAY_FDTH5, 0, 0}, // S_PLAY_FDTH4
-    {SPR_FDTH, 32772, 5, NULL, S_PLAY_FDTH6, 0, 0},     // S_PLAY_FDTH5
-    {SPR_FDTH, 32773, 4, NULL, S_PLAY_FDTH7, 0, 0},     // S_PLAY_FDTH6
-    {SPR_FDTH, 32774, 5, A_FlameSnd, S_PLAY_FDTH8, 0, 0},       // S_PLAY_FDTH7
-    {SPR_FDTH, 32775, 4, NULL, S_PLAY_FDTH9, 0, 0},     // S_PLAY_FDTH8
-    {SPR_FDTH, 32776, 5, NULL, S_PLAY_FDTH10, 0, 0},    // S_PLAY_FDTH9
-    {SPR_FDTH, 32777, 4, NULL, S_PLAY_FDTH11, 0, 0},    // S_PLAY_FDTH10
-    {SPR_FDTH, 32778, 5, NULL, S_PLAY_FDTH12, 0, 0},    // S_PLAY_FDTH11
-    {SPR_FDTH, 32779, 4, NULL, S_PLAY_FDTH13, 0, 0},    // S_PLAY_FDTH12
-    {SPR_FDTH, 32780, 5, NULL, S_PLAY_FDTH14, 0, 0},    // S_PLAY_FDTH13
-    {SPR_FDTH, 32781, 4, NULL, S_PLAY_FDTH15, 0, 0},    // S_PLAY_FDTH14
-    {SPR_FDTH, 32782, 5, A_NoBlocking, S_PLAY_FDTH16, 0, 0},    // S_PLAY_FDTH15
-    {SPR_FDTH, 32783, 4, NULL, S_PLAY_FDTH17, 0, 0},    // S_PLAY_FDTH16
-    {SPR_FDTH, 32784, 5, NULL, S_PLAY_FDTH18, 0, 0},    // S_PLAY_FDTH17
-    {SPR_FDTH, 32785, 4, NULL, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH18
-    {SPR_ACLO, 4, 35, A_CheckBurnGone, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH19
-    {SPR_ACLO, 4, 8, NULL, S_NULL, 0, 0},       // S_PLAY_FDTH20
-    {SPR_BSKL, 0, 5, A_CheckSkullFloor, S_BLOODYSKULL2, 0, 0},  // S_BLOODYSKULL1
-    {SPR_BSKL, 1, 5, A_CheckSkullFloor, S_BLOODYSKULL3, 0, 0},  // S_BLOODYSKULL2
-    {SPR_BSKL, 2, 5, A_CheckSkullFloor, S_BLOODYSKULL4, 0, 0},  // S_BLOODYSKULL3
-    {SPR_BSKL, 3, 5, A_CheckSkullFloor, S_BLOODYSKULL5, 0, 0},  // S_BLOODYSKULL4
-    {SPR_BSKL, 4, 5, A_CheckSkullFloor, S_BLOODYSKULL1, 0, 0},  // S_BLOODYSKULL5
-    {SPR_BSKL, 5, 16, A_CheckSkullDone, S_BLOODYSKULLX1, 0, 0}, // S_BLOODYSKULLX1
-    {SPR_BSKL, 5, 1050, NULL, S_NULL, 0, 0},    // S_BLOODYSKULLX2
-    {SPR_CHKN, 0, -1, NULL, S_NULL, 0, 0},      // S_CHICPLAY
-    {SPR_CHKN, 0, 3, NULL, S_CHICPLAY_RUN2, 0, 0},      // S_CHICPLAY_RUN1
-    {SPR_CHKN, 1, 3, NULL, S_CHICPLAY_RUN3, 0, 0},      // S_CHICPLAY_RUN2
-    {SPR_CHKN, 0, 3, NULL, S_CHICPLAY_RUN4, 0, 0},      // S_CHICPLAY_RUN3
-    {SPR_CHKN, 1, 3, NULL, S_CHICPLAY_RUN1, 0, 0},      // S_CHICPLAY_RUN4
-    {SPR_CHKN, 2, 12, NULL, S_CHICPLAY, 0, 0},  // S_CHICPLAY_ATK1
-    {SPR_CHKN, 3, 4, A_Feathers, S_CHICPLAY_PAIN2, 0, 0},       // S_CHICPLAY_PAIN
-    {SPR_CHKN, 2, 4, A_Pain, S_CHICPLAY, 0, 0}, // S_CHICPLAY_PAIN2
-    {SPR_CHKN, 0, 10, A_ChicLook, S_CHICKEN_LOOK2, 0, 0},       // S_CHICKEN_LOOK1
-    {SPR_CHKN, 1, 10, A_ChicLook, S_CHICKEN_LOOK1, 0, 0},       // S_CHICKEN_LOOK2
-    {SPR_CHKN, 0, 3, A_ChicChase, S_CHICKEN_WALK2, 0, 0},       // S_CHICKEN_WALK1
-    {SPR_CHKN, 1, 3, A_ChicChase, S_CHICKEN_WALK1, 0, 0},       // S_CHICKEN_WALK2
-    {SPR_CHKN, 3, 5, A_Feathers, S_CHICKEN_PAIN2, 0, 0},        // S_CHICKEN_PAIN1
-    {SPR_CHKN, 2, 5, A_ChicPain, S_CHICKEN_WALK1, 0, 0},        // S_CHICKEN_PAIN2
-    {SPR_CHKN, 0, 8, A_FaceTarget, S_CHICKEN_ATK2, 0, 0},       // S_CHICKEN_ATK1
-    {SPR_CHKN, 2, 10, A_ChicAttack, S_CHICKEN_WALK1, 0, 0},     // S_CHICKEN_ATK2
-    {SPR_CHKN, 4, 6, A_Scream, S_CHICKEN_DIE2, 0, 0},   // S_CHICKEN_DIE1
-    {SPR_CHKN, 5, 6, A_Feathers, S_CHICKEN_DIE3, 0, 0}, // S_CHICKEN_DIE2
-    {SPR_CHKN, 6, 6, NULL, S_CHICKEN_DIE4, 0, 0},       // S_CHICKEN_DIE3
-    {SPR_CHKN, 7, 6, A_NoBlocking, S_CHICKEN_DIE5, 0, 0},       // S_CHICKEN_DIE4
-    {SPR_CHKN, 8, 6, NULL, S_CHICKEN_DIE6, 0, 0},       // S_CHICKEN_DIE5
-    {SPR_CHKN, 9, 6, NULL, S_CHICKEN_DIE7, 0, 0},       // S_CHICKEN_DIE6
-    {SPR_CHKN, 10, 6, NULL, S_CHICKEN_DIE8, 0, 0},      // S_CHICKEN_DIE7
-    {SPR_CHKN, 11, -1, NULL, S_NULL, 0, 0},     // S_CHICKEN_DIE8
-    {SPR_CHKN, 12, 3, NULL, S_FEATHER2, 0, 0},  // S_FEATHER1
-    {SPR_CHKN, 13, 3, NULL, S_FEATHER3, 0, 0},  // S_FEATHER2
-    {SPR_CHKN, 14, 3, NULL, S_FEATHER4, 0, 0},  // S_FEATHER3
-    {SPR_CHKN, 15, 3, NULL, S_FEATHER5, 0, 0},  // S_FEATHER4
-    {SPR_CHKN, 16, 3, NULL, S_FEATHER6, 0, 0},  // S_FEATHER5
-    {SPR_CHKN, 15, 3, NULL, S_FEATHER7, 0, 0},  // S_FEATHER6
-    {SPR_CHKN, 14, 3, NULL, S_FEATHER8, 0, 0},  // S_FEATHER7
-    {SPR_CHKN, 13, 3, NULL, S_FEATHER1, 0, 0},  // S_FEATHER8
-    {SPR_CHKN, 13, 6, NULL, S_NULL, 0, 0},      // S_FEATHERX
-    {SPR_MUMM, 0, 10, A_Look, S_MUMMY_LOOK2, 0, 0},     // S_MUMMY_LOOK1
-    {SPR_MUMM, 1, 10, A_Look, S_MUMMY_LOOK1, 0, 0},     // S_MUMMY_LOOK2
-    {SPR_MUMM, 0, 4, A_Chase, S_MUMMY_WALK2, 0, 0},     // S_MUMMY_WALK1
-    {SPR_MUMM, 1, 4, A_Chase, S_MUMMY_WALK3, 0, 0},     // S_MUMMY_WALK2
-    {SPR_MUMM, 2, 4, A_Chase, S_MUMMY_WALK4, 0, 0},     // S_MUMMY_WALK3
-    {SPR_MUMM, 3, 4, A_Chase, S_MUMMY_WALK1, 0, 0},     // S_MUMMY_WALK4
-    {SPR_MUMM, 4, 6, A_FaceTarget, S_MUMMY_ATK2, 0, 0}, // S_MUMMY_ATK1
-    {SPR_MUMM, 5, 6, A_MummyAttack, S_MUMMY_ATK3, 0, 0},        // S_MUMMY_ATK2
-    {SPR_MUMM, 6, 6, A_FaceTarget, S_MUMMY_WALK1, 0, 0},        // S_MUMMY_ATK3
-    {SPR_MUMM, 23, 5, A_FaceTarget, S_MUMMYL_ATK2, 0, 0},       // S_MUMMYL_ATK1
-    {SPR_MUMM, 32792, 5, A_FaceTarget, S_MUMMYL_ATK3, 0, 0},    // S_MUMMYL_ATK2
-    {SPR_MUMM, 23, 5, A_FaceTarget, S_MUMMYL_ATK4, 0, 0},       // S_MUMMYL_ATK3
-    {SPR_MUMM, 32792, 5, A_FaceTarget, S_MUMMYL_ATK5, 0, 0},    // S_MUMMYL_ATK4
-    {SPR_MUMM, 23, 5, A_FaceTarget, S_MUMMYL_ATK6, 0, 0},       // S_MUMMYL_ATK5
-    {SPR_MUMM, 32792, 15, A_MummyAttack2, S_MUMMY_WALK1, 0, 0}, // S_MUMMYL_ATK6
-    {SPR_MUMM, 7, 4, NULL, S_MUMMY_PAIN2, 0, 0},        // S_MUMMY_PAIN1
-    {SPR_MUMM, 7, 4, A_Pain, S_MUMMY_WALK1, 0, 0},      // S_MUMMY_PAIN2
-    {SPR_MUMM, 8, 5, NULL, S_MUMMY_DIE2, 0, 0}, // S_MUMMY_DIE1
-    {SPR_MUMM, 9, 5, A_Scream, S_MUMMY_DIE3, 0, 0},     // S_MUMMY_DIE2
-    {SPR_MUMM, 10, 5, A_MummySoul, S_MUMMY_DIE4, 0, 0}, // S_MUMMY_DIE3
-    {SPR_MUMM, 11, 5, NULL, S_MUMMY_DIE5, 0, 0},        // S_MUMMY_DIE4
-    {SPR_MUMM, 12, 5, A_NoBlocking, S_MUMMY_DIE6, 0, 0},        // S_MUMMY_DIE5
-    {SPR_MUMM, 13, 5, NULL, S_MUMMY_DIE7, 0, 0},        // S_MUMMY_DIE6
-    {SPR_MUMM, 14, 5, NULL, S_MUMMY_DIE8, 0, 0},        // S_MUMMY_DIE7
-    {SPR_MUMM, 15, -1, NULL, S_NULL, 0, 0},     // S_MUMMY_DIE8
-    {SPR_MUMM, 16, 5, NULL, S_MUMMY_SOUL2, 0, 0},       // S_MUMMY_SOUL1
-    {SPR_MUMM, 17, 5, NULL, S_MUMMY_SOUL3, 0, 0},       // S_MUMMY_SOUL2
-    {SPR_MUMM, 18, 5, NULL, S_MUMMY_SOUL4, 0, 0},       // S_MUMMY_SOUL3
-    {SPR_MUMM, 19, 9, NULL, S_MUMMY_SOUL5, 0, 0},       // S_MUMMY_SOUL4
-    {SPR_MUMM, 20, 5, NULL, S_MUMMY_SOUL6, 0, 0},       // S_MUMMY_SOUL5
-    {SPR_MUMM, 21, 5, NULL, S_MUMMY_SOUL7, 0, 0},       // S_MUMMY_SOUL6
-    {SPR_MUMM, 22, 5, NULL, S_NULL, 0, 0},      // S_MUMMY_SOUL7
-    {SPR_FX15, 32768, 5, A_ContMobjSound, S_MUMMYFX1_2, 0, 0},  // S_MUMMYFX1_1
-    {SPR_FX15, 32769, 5, A_MummyFX1Seek, S_MUMMYFX1_3, 0, 0},   // S_MUMMYFX1_2
-    {SPR_FX15, 32770, 5, NULL, S_MUMMYFX1_4, 0, 0},     // S_MUMMYFX1_3
-    {SPR_FX15, 32769, 5, A_MummyFX1Seek, S_MUMMYFX1_1, 0, 0},   // S_MUMMYFX1_4
-    {SPR_FX15, 32771, 5, NULL, S_MUMMYFXI1_2, 0, 0},    // S_MUMMYFXI1_1
-    {SPR_FX15, 32772, 5, NULL, S_MUMMYFXI1_3, 0, 0},    // S_MUMMYFXI1_2
-    {SPR_FX15, 32773, 5, NULL, S_MUMMYFXI1_4, 0, 0},    // S_MUMMYFXI1_3
-    {SPR_FX15, 32774, 5, NULL, S_NULL, 0, 0},   // S_MUMMYFXI1_4
-    {SPR_BEAS, 0, 10, A_Look, S_BEAST_LOOK2, 0, 0},     // S_BEAST_LOOK1
-    {SPR_BEAS, 1, 10, A_Look, S_BEAST_LOOK1, 0, 0},     // S_BEAST_LOOK2
-    {SPR_BEAS, 0, 3, A_Chase, S_BEAST_WALK2, 0, 0},     // S_BEAST_WALK1
-    {SPR_BEAS, 1, 3, A_Chase, S_BEAST_WALK3, 0, 0},     // S_BEAST_WALK2
-    {SPR_BEAS, 2, 3, A_Chase, S_BEAST_WALK4, 0, 0},     // S_BEAST_WALK3
-    {SPR_BEAS, 3, 3, A_Chase, S_BEAST_WALK5, 0, 0},     // S_BEAST_WALK4
-    {SPR_BEAS, 4, 3, A_Chase, S_BEAST_WALK6, 0, 0},     // S_BEAST_WALK5
-    {SPR_BEAS, 5, 3, A_Chase, S_BEAST_WALK1, 0, 0},     // S_BEAST_WALK6
-    {SPR_BEAS, 7, 10, A_FaceTarget, S_BEAST_ATK2, 0, 0},        // S_BEAST_ATK1
-    {SPR_BEAS, 8, 10, A_BeastAttack, S_BEAST_WALK1, 0, 0},      // S_BEAST_ATK2
-    {SPR_BEAS, 6, 3, NULL, S_BEAST_PAIN2, 0, 0},        // S_BEAST_PAIN1
-    {SPR_BEAS, 6, 3, A_Pain, S_BEAST_WALK1, 0, 0},      // S_BEAST_PAIN2
-    {SPR_BEAS, 17, 6, NULL, S_BEAST_DIE2, 0, 0},        // S_BEAST_DIE1
-    {SPR_BEAS, 18, 6, A_Scream, S_BEAST_DIE3, 0, 0},    // S_BEAST_DIE2
-    {SPR_BEAS, 19, 6, NULL, S_BEAST_DIE4, 0, 0},        // S_BEAST_DIE3
-    {SPR_BEAS, 20, 6, NULL, S_BEAST_DIE5, 0, 0},        // S_BEAST_DIE4
-    {SPR_BEAS, 21, 6, NULL, S_BEAST_DIE6, 0, 0},        // S_BEAST_DIE5
-    {SPR_BEAS, 22, 6, A_NoBlocking, S_BEAST_DIE7, 0, 0},        // S_BEAST_DIE6
-    {SPR_BEAS, 23, 6, NULL, S_BEAST_DIE8, 0, 0},        // S_BEAST_DIE7
-    {SPR_BEAS, 24, 6, NULL, S_BEAST_DIE9, 0, 0},        // S_BEAST_DIE8
-    {SPR_BEAS, 25, -1, NULL, S_NULL, 0, 0},     // S_BEAST_DIE9
-    {SPR_BEAS, 9, 5, NULL, S_BEAST_XDIE2, 0, 0},        // S_BEAST_XDIE1
-    {SPR_BEAS, 10, 6, A_Scream, S_BEAST_XDIE3, 0, 0},   // S_BEAST_XDIE2
-    {SPR_BEAS, 11, 5, NULL, S_BEAST_XDIE4, 0, 0},       // S_BEAST_XDIE3
-    {SPR_BEAS, 12, 6, NULL, S_BEAST_XDIE5, 0, 0},       // S_BEAST_XDIE4
-    {SPR_BEAS, 13, 5, NULL, S_BEAST_XDIE6, 0, 0},       // S_BEAST_XDIE5
-    {SPR_BEAS, 14, 6, A_NoBlocking, S_BEAST_XDIE7, 0, 0},       // S_BEAST_XDIE6
-    {SPR_BEAS, 15, 5, NULL, S_BEAST_XDIE8, 0, 0},       // S_BEAST_XDIE7
-    {SPR_BEAS, 16, -1, NULL, S_NULL, 0, 0},     // S_BEAST_XDIE8
-    {SPR_FRB1, 0, 2, A_BeastPuff, S_BEASTBALL2, 0, 0},  // S_BEASTBALL1
-    {SPR_FRB1, 0, 2, A_BeastPuff, S_BEASTBALL3, 0, 0},  // S_BEASTBALL2
-    {SPR_FRB1, 1, 2, A_BeastPuff, S_BEASTBALL4, 0, 0},  // S_BEASTBALL3
-    {SPR_FRB1, 1, 2, A_BeastPuff, S_BEASTBALL5, 0, 0},  // S_BEASTBALL4
-    {SPR_FRB1, 2, 2, A_BeastPuff, S_BEASTBALL6, 0, 0},  // S_BEASTBALL5
-    {SPR_FRB1, 2, 2, A_BeastPuff, S_BEASTBALL1, 0, 0},  // S_BEASTBALL6
-    {SPR_FRB1, 3, 4, NULL, S_BEASTBALLX2, 0, 0},        // S_BEASTBALLX1
-    {SPR_FRB1, 4, 4, NULL, S_BEASTBALLX3, 0, 0},        // S_BEASTBALLX2
-    {SPR_FRB1, 5, 4, NULL, S_BEASTBALLX4, 0, 0},        // S_BEASTBALLX3
-    {SPR_FRB1, 6, 4, NULL, S_BEASTBALLX5, 0, 0},        // S_BEASTBALLX4
-    {SPR_FRB1, 7, 4, NULL, S_NULL, 0, 0},       // S_BEASTBALLX5
-    {SPR_FRB1, 0, 4, NULL, S_BURNBALL2, 0, 0},  // S_BURNBALL1
-    {SPR_FRB1, 1, 4, NULL, S_BURNBALL3, 0, 0},  // S_BURNBALL2
-    {SPR_FRB1, 2, 4, NULL, S_BURNBALL4, 0, 0},  // S_BURNBALL3
-    {SPR_FRB1, 3, 4, NULL, S_BURNBALL5, 0, 0},  // S_BURNBALL4
-    {SPR_FRB1, 4, 4, NULL, S_BURNBALL6, 0, 0},  // S_BURNBALL5
-    {SPR_FRB1, 5, 4, NULL, S_BURNBALL7, 0, 0},  // S_BURNBALL6
-    {SPR_FRB1, 6, 4, NULL, S_BURNBALL8, 0, 0},  // S_BURNBALL7
-    {SPR_FRB1, 7, 4, NULL, S_NULL, 0, 0},       // S_BURNBALL8
-    {SPR_FRB1, 32768, 4, NULL, S_BURNBALLFB2, 0, 0},    // S_BURNBALLFB1
-    {SPR_FRB1, 32769, 4, NULL, S_BURNBALLFB3, 0, 0},    // S_BURNBALLFB2
-    {SPR_FRB1, 32770, 4, NULL, S_BURNBALLFB4, 0, 0},    // S_BURNBALLFB3
-    {SPR_FRB1, 32771, 4, NULL, S_BURNBALLFB5, 0, 0},    // S_BURNBALLFB4
-    {SPR_FRB1, 32772, 4, NULL, S_BURNBALLFB6, 0, 0},    // S_BURNBALLFB5
-    {SPR_FRB1, 32773, 4, NULL, S_BURNBALLFB7, 0, 0},    // S_BURNBALLFB6
-    {SPR_FRB1, 32774, 4, NULL, S_BURNBALLFB8, 0, 0},    // S_BURNBALLFB7
-    {SPR_FRB1, 32775, 4, NULL, S_NULL, 0, 0},   // S_BURNBALLFB8
-    {SPR_FRB1, 3, 4, NULL, S_PUFFY2, 0, 0},     // S_PUFFY1
-    {SPR_FRB1, 4, 4, NULL, S_PUFFY3, 0, 0},     // S_PUFFY2
-    {SPR_FRB1, 5, 4, NULL, S_PUFFY4, 0, 0},     // S_PUFFY3
-    {SPR_FRB1, 6, 4, NULL, S_PUFFY5, 0, 0},     // S_PUFFY4
-    {SPR_FRB1, 7, 4, NULL, S_NULL, 0, 0},       // S_PUFFY5
-    {SPR_SNKE, 0, 10, A_Look, S_SNAKE_LOOK2, 0, 0},     // S_SNAKE_LOOK1
-    {SPR_SNKE, 1, 10, A_Look, S_SNAKE_LOOK1, 0, 0},     // S_SNAKE_LOOK2
-    {SPR_SNKE, 0, 4, A_Chase, S_SNAKE_WALK2, 0, 0},     // S_SNAKE_WALK1
-    {SPR_SNKE, 1, 4, A_Chase, S_SNAKE_WALK3, 0, 0},     // S_SNAKE_WALK2
-    {SPR_SNKE, 2, 4, A_Chase, S_SNAKE_WALK4, 0, 0},     // S_SNAKE_WALK3
-    {SPR_SNKE, 3, 4, A_Chase, S_SNAKE_WALK1, 0, 0},     // S_SNAKE_WALK4
-    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK2, 0, 0}, // S_SNAKE_ATK1
-    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK3, 0, 0}, // S_SNAKE_ATK2
-    {SPR_SNKE, 5, 4, A_SnakeAttack, S_SNAKE_ATK4, 0, 0},        // S_SNAKE_ATK3
-    {SPR_SNKE, 5, 4, A_SnakeAttack, S_SNAKE_ATK5, 0, 0},        // S_SNAKE_ATK4
-    {SPR_SNKE, 5, 4, A_SnakeAttack, S_SNAKE_ATK6, 0, 0},        // S_SNAKE_ATK5
-    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK7, 0, 0}, // S_SNAKE_ATK6
-    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK8, 0, 0}, // S_SNAKE_ATK7
-    {SPR_SNKE, 5, 5, A_FaceTarget, S_SNAKE_ATK9, 0, 0}, // S_SNAKE_ATK8
-    {SPR_SNKE, 5, 4, A_SnakeAttack2, S_SNAKE_WALK1, 0, 0},      // S_SNAKE_ATK9
-    {SPR_SNKE, 4, 3, NULL, S_SNAKE_PAIN2, 0, 0},        // S_SNAKE_PAIN1
-    {SPR_SNKE, 4, 3, A_Pain, S_SNAKE_WALK1, 0, 0},      // S_SNAKE_PAIN2
-    {SPR_SNKE, 6, 5, NULL, S_SNAKE_DIE2, 0, 0}, // S_SNAKE_DIE1
-    {SPR_SNKE, 7, 5, A_Scream, S_SNAKE_DIE3, 0, 0},     // S_SNAKE_DIE2
-    {SPR_SNKE, 8, 5, NULL, S_SNAKE_DIE4, 0, 0}, // S_SNAKE_DIE3
-    {SPR_SNKE, 9, 5, NULL, S_SNAKE_DIE5, 0, 0}, // S_SNAKE_DIE4
-    {SPR_SNKE, 10, 5, NULL, S_SNAKE_DIE6, 0, 0},        // S_SNAKE_DIE5
-    {SPR_SNKE, 11, 5, NULL, S_SNAKE_DIE7, 0, 0},        // S_SNAKE_DIE6
-    {SPR_SNKE, 12, 5, A_NoBlocking, S_SNAKE_DIE8, 0, 0},        // S_SNAKE_DIE7
-    {SPR_SNKE, 13, 5, NULL, S_SNAKE_DIE9, 0, 0},        // S_SNAKE_DIE8
-    {SPR_SNKE, 14, 5, NULL, S_SNAKE_DIE10, 0, 0},       // S_SNAKE_DIE9
-    {SPR_SNKE, 15, -1, NULL, S_NULL, 0, 0},     // S_SNAKE_DIE10
-    {SPR_SNFX, 32768, 5, NULL, S_SNAKEPRO_A2, 0, 0},    // S_SNAKEPRO_A1
-    {SPR_SNFX, 32769, 5, NULL, S_SNAKEPRO_A3, 0, 0},    // S_SNAKEPRO_A2
-    {SPR_SNFX, 32770, 5, NULL, S_SNAKEPRO_A4, 0, 0},    // S_SNAKEPRO_A3
-    {SPR_SNFX, 32771, 5, NULL, S_SNAKEPRO_A1, 0, 0},    // S_SNAKEPRO_A4
-    {SPR_SNFX, 32772, 5, NULL, S_SNAKEPRO_AX2, 0, 0},   // S_SNAKEPRO_AX1
-    {SPR_SNFX, 32773, 5, NULL, S_SNAKEPRO_AX3, 0, 0},   // S_SNAKEPRO_AX2
-    {SPR_SNFX, 32774, 4, NULL, S_SNAKEPRO_AX4, 0, 0},   // S_SNAKEPRO_AX3
-    {SPR_SNFX, 32775, 3, NULL, S_SNAKEPRO_AX5, 0, 0},   // S_SNAKEPRO_AX4
-    {SPR_SNFX, 32776, 3, NULL, S_NULL, 0, 0},   // S_SNAKEPRO_AX5
-    {SPR_SNFX, 32777, 6, NULL, S_SNAKEPRO_B2, 0, 0},    // S_SNAKEPRO_B1
-    {SPR_SNFX, 32778, 6, NULL, S_SNAKEPRO_B1, 0, 0},    // S_SNAKEPRO_B2
-    {SPR_SNFX, 32779, 5, NULL, S_SNAKEPRO_BX2, 0, 0},   // S_SNAKEPRO_BX1
-    {SPR_SNFX, 32780, 5, NULL, S_SNAKEPRO_BX3, 0, 0},   // S_SNAKEPRO_BX2
-    {SPR_SNFX, 32781, 4, NULL, S_SNAKEPRO_BX4, 0, 0},   // S_SNAKEPRO_BX3
-    {SPR_SNFX, 32782, 3, NULL, S_NULL, 0, 0},   // S_SNAKEPRO_BX4
-    {SPR_HEAD, 0, 10, A_Look, S_HEAD_LOOK, 0, 0},       // S_HEAD_LOOK
-    {SPR_HEAD, 0, 4, A_Chase, S_HEAD_FLOAT, 0, 0},      // S_HEAD_FLOAT
-    {SPR_HEAD, 0, 5, A_FaceTarget, S_HEAD_ATK2, 0, 0},  // S_HEAD_ATK1
-    {SPR_HEAD, 1, 20, A_HeadAttack, S_HEAD_FLOAT, 0, 0},        // S_HEAD_ATK2
-    {SPR_HEAD, 0, 4, NULL, S_HEAD_PAIN2, 0, 0}, // S_HEAD_PAIN1
-    {SPR_HEAD, 0, 4, A_Pain, S_HEAD_FLOAT, 0, 0},       // S_HEAD_PAIN2
-    {SPR_HEAD, 2, 7, NULL, S_HEAD_DIE2, 0, 0},  // S_HEAD_DIE1
-    {SPR_HEAD, 3, 7, A_Scream, S_HEAD_DIE3, 0, 0},      // S_HEAD_DIE2
-    {SPR_HEAD, 4, 7, NULL, S_HEAD_DIE4, 0, 0},  // S_HEAD_DIE3
-    {SPR_HEAD, 5, 7, NULL, S_HEAD_DIE5, 0, 0},  // S_HEAD_DIE4
-    {SPR_HEAD, 6, 7, A_NoBlocking, S_HEAD_DIE6, 0, 0},  // S_HEAD_DIE5
-    {SPR_HEAD, 7, 7, NULL, S_HEAD_DIE7, 0, 0},  // S_HEAD_DIE6
-    {SPR_HEAD, 8, -1, A_BossDeath, S_NULL, 0, 0},       // S_HEAD_DIE7
-    {SPR_FX05, 0, 6, NULL, S_HEADFX1_2, 0, 0},  // S_HEADFX1_1
-    {SPR_FX05, 1, 6, NULL, S_HEADFX1_3, 0, 0},  // S_HEADFX1_2
-    {SPR_FX05, 2, 6, NULL, S_HEADFX1_1, 0, 0},  // S_HEADFX1_3
-    {SPR_FX05, 3, 5, A_HeadIceImpact, S_HEADFXI1_2, 0, 0},      // S_HEADFXI1_1
-    {SPR_FX05, 4, 5, NULL, S_HEADFXI1_3, 0, 0}, // S_HEADFXI1_2
-    {SPR_FX05, 5, 5, NULL, S_HEADFXI1_4, 0, 0}, // S_HEADFXI1_3
-    {SPR_FX05, 6, 5, NULL, S_NULL, 0, 0},       // S_HEADFXI1_4
-    {SPR_FX05, 7, 6, NULL, S_HEADFX2_2, 0, 0},  // S_HEADFX2_1
-    {SPR_FX05, 8, 6, NULL, S_HEADFX2_3, 0, 0},  // S_HEADFX2_2
-    {SPR_FX05, 9, 6, NULL, S_HEADFX2_1, 0, 0},  // S_HEADFX2_3
-    {SPR_FX05, 3, 5, NULL, S_HEADFXI2_2, 0, 0}, // S_HEADFXI2_1
-    {SPR_FX05, 4, 5, NULL, S_HEADFXI2_3, 0, 0}, // S_HEADFXI2_2
-    {SPR_FX05, 5, 5, NULL, S_HEADFXI2_4, 0, 0}, // S_HEADFXI2_3
-    {SPR_FX05, 6, 5, NULL, S_NULL, 0, 0},       // S_HEADFXI2_4
-    {SPR_FX06, 0, 4, A_HeadFireGrow, S_HEADFX3_2, 0, 0},        // S_HEADFX3_1
-    {SPR_FX06, 1, 4, A_HeadFireGrow, S_HEADFX3_3, 0, 0},        // S_HEADFX3_2
-    {SPR_FX06, 2, 4, A_HeadFireGrow, S_HEADFX3_1, 0, 0},        // S_HEADFX3_3
-    {SPR_FX06, 0, 5, NULL, S_HEADFX3_5, 0, 0},  // S_HEADFX3_4
-    {SPR_FX06, 1, 5, NULL, S_HEADFX3_6, 0, 0},  // S_HEADFX3_5
-    {SPR_FX06, 2, 5, NULL, S_HEADFX3_4, 0, 0},  // S_HEADFX3_6
-    {SPR_FX06, 3, 5, NULL, S_HEADFXI3_2, 0, 0}, // S_HEADFXI3_1
-    {SPR_FX06, 4, 5, NULL, S_HEADFXI3_3, 0, 0}, // S_HEADFXI3_2
-    {SPR_FX06, 5, 5, NULL, S_HEADFXI3_4, 0, 0}, // S_HEADFXI3_3
-    {SPR_FX06, 6, 5, NULL, S_NULL, 0, 0},       // S_HEADFXI3_4
-    {SPR_FX07, 3, 3, NULL, S_HEADFX4_2, 0, 0},  // S_HEADFX4_1
-    {SPR_FX07, 4, 3, NULL, S_HEADFX4_3, 0, 0},  // S_HEADFX4_2
-    {SPR_FX07, 5, 3, NULL, S_HEADFX4_4, 0, 0},  // S_HEADFX4_3
-    {SPR_FX07, 6, 3, NULL, S_HEADFX4_5, 0, 0},  // S_HEADFX4_4
-    {SPR_FX07, 0, 3, A_WhirlwindSeek, S_HEADFX4_6, 0, 0},       // S_HEADFX4_5
-    {SPR_FX07, 1, 3, A_WhirlwindSeek, S_HEADFX4_7, 0, 0},       // S_HEADFX4_6
-    {SPR_FX07, 2, 3, A_WhirlwindSeek, S_HEADFX4_5, 0, 0},       // S_HEADFX4_7
-    {SPR_FX07, 6, 4, NULL, S_HEADFXI4_2, 0, 0}, // S_HEADFXI4_1
-    {SPR_FX07, 5, 4, NULL, S_HEADFXI4_3, 0, 0}, // S_HEADFXI4_2
-    {SPR_FX07, 4, 4, NULL, S_HEADFXI4_4, 0, 0}, // S_HEADFXI4_3
-    {SPR_FX07, 3, 4, NULL, S_NULL, 0, 0},       // S_HEADFXI4_4
-    {SPR_CLNK, 0, 10, A_Look, S_CLINK_LOOK2, 0, 0},     // S_CLINK_LOOK1
-    {SPR_CLNK, 1, 10, A_Look, S_CLINK_LOOK1, 0, 0},     // S_CLINK_LOOK2
-    {SPR_CLNK, 0, 3, A_Chase, S_CLINK_WALK2, 0, 0},     // S_CLINK_WALK1
-    {SPR_CLNK, 1, 3, A_Chase, S_CLINK_WALK3, 0, 0},     // S_CLINK_WALK2
-    {SPR_CLNK, 2, 3, A_Chase, S_CLINK_WALK4, 0, 0},     // S_CLINK_WALK3
-    {SPR_CLNK, 3, 3, A_Chase, S_CLINK_WALK1, 0, 0},     // S_CLINK_WALK4
-    {SPR_CLNK, 4, 5, A_FaceTarget, S_CLINK_ATK2, 0, 0}, // S_CLINK_ATK1
-    {SPR_CLNK, 5, 4, A_FaceTarget, S_CLINK_ATK3, 0, 0}, // S_CLINK_ATK2
-    {SPR_CLNK, 6, 7, A_ClinkAttack, S_CLINK_WALK1, 0, 0},       // S_CLINK_ATK3
-    {SPR_CLNK, 7, 3, NULL, S_CLINK_PAIN2, 0, 0},        // S_CLINK_PAIN1
-    {SPR_CLNK, 7, 3, A_Pain, S_CLINK_WALK1, 0, 0},      // S_CLINK_PAIN2
-    {SPR_CLNK, 8, 6, NULL, S_CLINK_DIE2, 0, 0}, // S_CLINK_DIE1
-    {SPR_CLNK, 9, 6, NULL, S_CLINK_DIE3, 0, 0}, // S_CLINK_DIE2
-    {SPR_CLNK, 10, 5, A_Scream, S_CLINK_DIE4, 0, 0},    // S_CLINK_DIE3
-    {SPR_CLNK, 11, 5, A_NoBlocking, S_CLINK_DIE5, 0, 0},        // S_CLINK_DIE4
-    {SPR_CLNK, 12, 5, NULL, S_CLINK_DIE6, 0, 0},        // S_CLINK_DIE5
-    {SPR_CLNK, 13, 5, NULL, S_CLINK_DIE7, 0, 0},        // S_CLINK_DIE6
-    {SPR_CLNK, 14, -1, NULL, S_NULL, 0, 0},     // S_CLINK_DIE7
-    {SPR_WZRD, 0, 10, A_Look, S_WIZARD_LOOK2, 0, 0},    // S_WIZARD_LOOK1
-    {SPR_WZRD, 1, 10, A_Look, S_WIZARD_LOOK1, 0, 0},    // S_WIZARD_LOOK2
-    {SPR_WZRD, 0, 3, A_Chase, S_WIZARD_WALK2, 0, 0},    // S_WIZARD_WALK1
-    {SPR_WZRD, 0, 4, A_Chase, S_WIZARD_WALK3, 0, 0},    // S_WIZARD_WALK2
-    {SPR_WZRD, 0, 3, A_Chase, S_WIZARD_WALK4, 0, 0},    // S_WIZARD_WALK3
-    {SPR_WZRD, 0, 4, A_Chase, S_WIZARD_WALK5, 0, 0},    // S_WIZARD_WALK4
-    {SPR_WZRD, 1, 3, A_Chase, S_WIZARD_WALK6, 0, 0},    // S_WIZARD_WALK5
-    {SPR_WZRD, 1, 4, A_Chase, S_WIZARD_WALK7, 0, 0},    // S_WIZARD_WALK6
-    {SPR_WZRD, 1, 3, A_Chase, S_WIZARD_WALK8, 0, 0},    // S_WIZARD_WALK7
-    {SPR_WZRD, 1, 4, A_Chase, S_WIZARD_WALK1, 0, 0},    // S_WIZARD_WALK8
-    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK2, 0, 0},   // S_WIZARD_ATK1
-    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK3, 0, 0},   // S_WIZARD_ATK2
-    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK4, 0, 0},   // S_WIZARD_ATK3
-    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK5, 0, 0},   // S_WIZARD_ATK4
-    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK6, 0, 0},   // S_WIZARD_ATK5
-    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK7, 0, 0},   // S_WIZARD_ATK6
-    {SPR_WZRD, 2, 4, A_WizAtk1, S_WIZARD_ATK8, 0, 0},   // S_WIZARD_ATK7
-    {SPR_WZRD, 2, 4, A_WizAtk2, S_WIZARD_ATK9, 0, 0},   // S_WIZARD_ATK8
-    {SPR_WZRD, 3, 12, A_WizAtk3, S_WIZARD_WALK1, 0, 0}, // S_WIZARD_ATK9
-    {SPR_WZRD, 4, 3, A_GhostOff, S_WIZARD_PAIN2, 0, 0}, // S_WIZARD_PAIN1
-    {SPR_WZRD, 4, 3, A_Pain, S_WIZARD_WALK1, 0, 0},     // S_WIZARD_PAIN2
-    {SPR_WZRD, 5, 6, A_GhostOff, S_WIZARD_DIE2, 0, 0},  // S_WIZARD_DIE1
-    {SPR_WZRD, 6, 6, A_Scream, S_WIZARD_DIE3, 0, 0},    // S_WIZARD_DIE2
-    {SPR_WZRD, 7, 6, NULL, S_WIZARD_DIE4, 0, 0},        // S_WIZARD_DIE3
-    {SPR_WZRD, 8, 6, NULL, S_WIZARD_DIE5, 0, 0},        // S_WIZARD_DIE4
-    {SPR_WZRD, 9, 6, A_NoBlocking, S_WIZARD_DIE6, 0, 0},        // S_WIZARD_DIE5
-    {SPR_WZRD, 10, 6, NULL, S_WIZARD_DIE7, 0, 0},       // S_WIZARD_DIE6
-    {SPR_WZRD, 11, 6, NULL, S_WIZARD_DIE8, 0, 0},       // S_WIZARD_DIE7
-    {SPR_WZRD, 12, -1, NULL, S_NULL, 0, 0},     // S_WIZARD_DIE8
-    {SPR_FX11, 32768, 6, NULL, S_WIZFX1_2, 0, 0},       // S_WIZFX1_1
-    {SPR_FX11, 32769, 6, NULL, S_WIZFX1_1, 0, 0},       // S_WIZFX1_2
-    {SPR_FX11, 32770, 5, NULL, S_WIZFXI1_2, 0, 0},      // S_WIZFXI1_1
-    {SPR_FX11, 32771, 5, NULL, S_WIZFXI1_3, 0, 0},      // S_WIZFXI1_2
-    {SPR_FX11, 32772, 5, NULL, S_WIZFXI1_4, 0, 0},      // S_WIZFXI1_3
-    {SPR_FX11, 32773, 5, NULL, S_WIZFXI1_5, 0, 0},      // S_WIZFXI1_4
-    {SPR_FX11, 32774, 5, NULL, S_NULL, 0, 0},   // S_WIZFXI1_5
-    {SPR_IMPX, 0, 10, A_Look, S_IMP_LOOK2, 0, 0},       // S_IMP_LOOK1
-    {SPR_IMPX, 1, 10, A_Look, S_IMP_LOOK3, 0, 0},       // S_IMP_LOOK2
-    {SPR_IMPX, 2, 10, A_Look, S_IMP_LOOK4, 0, 0},       // S_IMP_LOOK3
-    {SPR_IMPX, 1, 10, A_Look, S_IMP_LOOK1, 0, 0},       // S_IMP_LOOK4
-    {SPR_IMPX, 0, 3, A_Chase, S_IMP_FLY2, 0, 0},        // S_IMP_FLY1
-    {SPR_IMPX, 0, 3, A_Chase, S_IMP_FLY3, 0, 0},        // S_IMP_FLY2
-    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY4, 0, 0},        // S_IMP_FLY3
-    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY5, 0, 0},        // S_IMP_FLY4
-    {SPR_IMPX, 2, 3, A_Chase, S_IMP_FLY6, 0, 0},        // S_IMP_FLY5
-    {SPR_IMPX, 2, 3, A_Chase, S_IMP_FLY7, 0, 0},        // S_IMP_FLY6
-    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY8, 0, 0},        // S_IMP_FLY7
-    {SPR_IMPX, 1, 3, A_Chase, S_IMP_FLY1, 0, 0},        // S_IMP_FLY8
-    {SPR_IMPX, 3, 6, A_FaceTarget, S_IMP_MEATK2, 0, 0}, // S_IMP_MEATK1
-    {SPR_IMPX, 4, 6, A_FaceTarget, S_IMP_MEATK3, 0, 0}, // S_IMP_MEATK2
-    {SPR_IMPX, 5, 6, A_ImpMeAttack, S_IMP_FLY1, 0, 0},  // S_IMP_MEATK3
-    {SPR_IMPX, 0, 10, A_FaceTarget, S_IMP_MSATK1_2, 0, 0},      // S_IMP_MSATK1_1
-    {SPR_IMPX, 1, 6, A_ImpMsAttack, S_IMP_MSATK1_3, 0, 0},      // S_IMP_MSATK1_2
-    {SPR_IMPX, 2, 6, NULL, S_IMP_MSATK1_4, 0, 0},       // S_IMP_MSATK1_3
-    {SPR_IMPX, 1, 6, NULL, S_IMP_MSATK1_5, 0, 0},       // S_IMP_MSATK1_4
-    {SPR_IMPX, 0, 6, NULL, S_IMP_MSATK1_6, 0, 0},       // S_IMP_MSATK1_5
-    {SPR_IMPX, 1, 6, NULL, S_IMP_MSATK1_3, 0, 0},       // S_IMP_MSATK1_6
-    {SPR_IMPX, 3, 6, A_FaceTarget, S_IMP_MSATK2_2, 0, 0},       // S_IMP_MSATK2_1
-    {SPR_IMPX, 4, 6, A_FaceTarget, S_IMP_MSATK2_3, 0, 0},       // S_IMP_MSATK2_2
-    {SPR_IMPX, 5, 6, A_ImpMsAttack2, S_IMP_FLY1, 0, 0}, // S_IMP_MSATK2_3
-    {SPR_IMPX, 6, 3, NULL, S_IMP_PAIN2, 0, 0},  // S_IMP_PAIN1
-    {SPR_IMPX, 6, 3, A_Pain, S_IMP_FLY1, 0, 0}, // S_IMP_PAIN2
-    {SPR_IMPX, 6, 4, A_ImpDeath, S_IMP_DIE2, 0, 0},     // S_IMP_DIE1
-    {SPR_IMPX, 7, 5, NULL, S_IMP_DIE2, 0, 0},   // S_IMP_DIE2
-    {SPR_IMPX, 18, 5, A_ImpXDeath1, S_IMP_XDIE2, 0, 0}, // S_IMP_XDIE1
-    {SPR_IMPX, 19, 5, NULL, S_IMP_XDIE3, 0, 0}, // S_IMP_XDIE2
-    {SPR_IMPX, 20, 5, NULL, S_IMP_XDIE4, 0, 0}, // S_IMP_XDIE3
-    {SPR_IMPX, 21, 5, A_ImpXDeath2, S_IMP_XDIE5, 0, 0}, // S_IMP_XDIE4
-    {SPR_IMPX, 22, 5, NULL, S_IMP_XDIE5, 0, 0}, // S_IMP_XDIE5
-    {SPR_IMPX, 8, 7, A_ImpExplode, S_IMP_CRASH2, 0, 0}, // S_IMP_CRASH1
-    {SPR_IMPX, 9, 7, A_Scream, S_IMP_CRASH3, 0, 0},     // S_IMP_CRASH2
-    {SPR_IMPX, 10, 7, NULL, S_IMP_CRASH4, 0, 0},        // S_IMP_CRASH3
-    {SPR_IMPX, 11, -1, NULL, S_NULL, 0, 0},     // S_IMP_CRASH4
-    {SPR_IMPX, 23, 7, NULL, S_IMP_XCRASH2, 0, 0},       // S_IMP_XCRASH1
-    {SPR_IMPX, 24, 7, NULL, S_IMP_XCRASH3, 0, 0},       // S_IMP_XCRASH2
-    {SPR_IMPX, 25, -1, NULL, S_NULL, 0, 0},     // S_IMP_XCRASH3
-    {SPR_IMPX, 12, 5, NULL, S_IMP_CHUNKA2, 0, 0},       // S_IMP_CHUNKA1
-    {SPR_IMPX, 13, 700, NULL, S_IMP_CHUNKA3, 0, 0},     // S_IMP_CHUNKA2
-    {SPR_IMPX, 14, 700, NULL, S_NULL, 0, 0},    // S_IMP_CHUNKA3
-    {SPR_IMPX, 15, 5, NULL, S_IMP_CHUNKB2, 0, 0},       // S_IMP_CHUNKB1
-    {SPR_IMPX, 16, 700, NULL, S_IMP_CHUNKB3, 0, 0},     // S_IMP_CHUNKB2
-    {SPR_IMPX, 17, 700, NULL, S_NULL, 0, 0},    // S_IMP_CHUNKB3
-    {SPR_FX10, 32768, 6, NULL, S_IMPFX2, 0, 0}, // S_IMPFX1
-    {SPR_FX10, 32769, 6, NULL, S_IMPFX3, 0, 0}, // S_IMPFX2
-    {SPR_FX10, 32770, 6, NULL, S_IMPFX1, 0, 0}, // S_IMPFX3
-    {SPR_FX10, 32771, 5, NULL, S_IMPFXI2, 0, 0},        // S_IMPFXI1
-    {SPR_FX10, 32772, 5, NULL, S_IMPFXI3, 0, 0},        // S_IMPFXI2
-    {SPR_FX10, 32773, 5, NULL, S_IMPFXI4, 0, 0},        // S_IMPFXI3
-    {SPR_FX10, 32774, 5, NULL, S_NULL, 0, 0},   // S_IMPFXI4
-    {SPR_KNIG, 0, 10, A_Look, S_KNIGHT_STND2, 0, 0},    // S_KNIGHT_STND1
-    {SPR_KNIG, 1, 10, A_Look, S_KNIGHT_STND1, 0, 0},    // S_KNIGHT_STND2
-    {SPR_KNIG, 0, 4, A_Chase, S_KNIGHT_WALK2, 0, 0},    // S_KNIGHT_WALK1
-    {SPR_KNIG, 1, 4, A_Chase, S_KNIGHT_WALK3, 0, 0},    // S_KNIGHT_WALK2
-    {SPR_KNIG, 2, 4, A_Chase, S_KNIGHT_WALK4, 0, 0},    // S_KNIGHT_WALK3
-    {SPR_KNIG, 3, 4, A_Chase, S_KNIGHT_WALK1, 0, 0},    // S_KNIGHT_WALK4
-    {SPR_KNIG, 4, 10, A_FaceTarget, S_KNIGHT_ATK2, 0, 0},       // S_KNIGHT_ATK1
-    {SPR_KNIG, 5, 8, A_FaceTarget, S_KNIGHT_ATK3, 0, 0},        // S_KNIGHT_ATK2
-    {SPR_KNIG, 6, 8, A_KnightAttack, S_KNIGHT_ATK4, 0, 0},      // S_KNIGHT_ATK3
-    {SPR_KNIG, 4, 10, A_FaceTarget, S_KNIGHT_ATK5, 0, 0},       // S_KNIGHT_ATK4
-    {SPR_KNIG, 5, 8, A_FaceTarget, S_KNIGHT_ATK6, 0, 0},        // S_KNIGHT_ATK5
-    {SPR_KNIG, 6, 8, A_KnightAttack, S_KNIGHT_WALK1, 0, 0},     // S_KNIGHT_ATK6
-    {SPR_KNIG, 7, 3, NULL, S_KNIGHT_PAIN2, 0, 0},       // S_KNIGHT_PAIN1
-    {SPR_KNIG, 7, 3, A_Pain, S_KNIGHT_WALK1, 0, 0},     // S_KNIGHT_PAIN2
-    {SPR_KNIG, 8, 6, NULL, S_KNIGHT_DIE2, 0, 0},        // S_KNIGHT_DIE1
-    {SPR_KNIG, 9, 6, A_Scream, S_KNIGHT_DIE3, 0, 0},    // S_KNIGHT_DIE2
-    {SPR_KNIG, 10, 6, NULL, S_KNIGHT_DIE4, 0, 0},       // S_KNIGHT_DIE3
-    {SPR_KNIG, 11, 6, A_NoBlocking, S_KNIGHT_DIE5, 0, 0},       // S_KNIGHT_DIE4
-    {SPR_KNIG, 12, 6, NULL, S_KNIGHT_DIE6, 0, 0},       // S_KNIGHT_DIE5
-    {SPR_KNIG, 13, 6, NULL, S_KNIGHT_DIE7, 0, 0},       // S_KNIGHT_DIE6
-    {SPR_KNIG, 14, -1, NULL, S_NULL, 0, 0},     // S_KNIGHT_DIE7
-    {SPR_SPAX, 32768, 3, A_ContMobjSound, S_SPINAXE2, 0, 0},    // S_SPINAXE1
-    {SPR_SPAX, 32769, 3, NULL, S_SPINAXE3, 0, 0},       // S_SPINAXE2
-    {SPR_SPAX, 32770, 3, NULL, S_SPINAXE1, 0, 0},       // S_SPINAXE3
-    {SPR_SPAX, 32771, 6, NULL, S_SPINAXEX2, 0, 0},      // S_SPINAXEX1
-    {SPR_SPAX, 32772, 6, NULL, S_SPINAXEX3, 0, 0},      // S_SPINAXEX2
-    {SPR_SPAX, 32773, 6, NULL, S_NULL, 0, 0},   // S_SPINAXEX3
-    {SPR_RAXE, 32768, 5, A_DripBlood, S_REDAXE2, 0, 0}, // S_REDAXE1
-    {SPR_RAXE, 32769, 5, A_DripBlood, S_REDAXE1, 0, 0}, // S_REDAXE2
-    {SPR_RAXE, 32770, 6, NULL, S_REDAXEX2, 0, 0},       // S_REDAXEX1
-    {SPR_RAXE, 32771, 6, NULL, S_REDAXEX3, 0, 0},       // S_REDAXEX2
-    {SPR_RAXE, 32772, 6, NULL, S_NULL, 0, 0},   // S_REDAXEX3
-    {SPR_SRCR, 0, 10, A_Look, S_SRCR1_LOOK2, 0, 0},     // S_SRCR1_LOOK1
-    {SPR_SRCR, 1, 10, A_Look, S_SRCR1_LOOK1, 0, 0},     // S_SRCR1_LOOK2
-    {SPR_SRCR, 0, 5, A_Sor1Chase, S_SRCR1_WALK2, 0, 0}, // S_SRCR1_WALK1
-    {SPR_SRCR, 1, 5, A_Sor1Chase, S_SRCR1_WALK3, 0, 0}, // S_SRCR1_WALK2
-    {SPR_SRCR, 2, 5, A_Sor1Chase, S_SRCR1_WALK4, 0, 0}, // S_SRCR1_WALK3
-    {SPR_SRCR, 3, 5, A_Sor1Chase, S_SRCR1_WALK1, 0, 0}, // S_SRCR1_WALK4
-    {SPR_SRCR, 16, 6, A_Sor1Pain, S_SRCR1_WALK1, 0, 0}, // S_SRCR1_PAIN1
-    {SPR_SRCR, 16, 7, A_FaceTarget, S_SRCR1_ATK2, 0, 0},        // S_SRCR1_ATK1
-    {SPR_SRCR, 17, 6, A_FaceTarget, S_SRCR1_ATK3, 0, 0},        // S_SRCR1_ATK2
-    {SPR_SRCR, 18, 10, A_Srcr1Attack, S_SRCR1_WALK1, 0, 0},     // S_SRCR1_ATK3
-    {SPR_SRCR, 18, 10, A_FaceTarget, S_SRCR1_ATK5, 0, 0},       // S_SRCR1_ATK4
-    {SPR_SRCR, 16, 7, A_FaceTarget, S_SRCR1_ATK6, 0, 0},        // S_SRCR1_ATK5
-    {SPR_SRCR, 17, 6, A_FaceTarget, S_SRCR1_ATK7, 0, 0},        // S_SRCR1_ATK6
-    {SPR_SRCR, 18, 10, A_Srcr1Attack, S_SRCR1_WALK1, 0, 0},     // S_SRCR1_ATK7
-    {SPR_SRCR, 4, 7, NULL, S_SRCR1_DIE2, 0, 0}, // S_SRCR1_DIE1
-    {SPR_SRCR, 5, 7, A_Scream, S_SRCR1_DIE3, 0, 0},     // S_SRCR1_DIE2
-    {SPR_SRCR, 6, 7, NULL, S_SRCR1_DIE4, 0, 0}, // S_SRCR1_DIE3
-    {SPR_SRCR, 7, 6, NULL, S_SRCR1_DIE5, 0, 0}, // S_SRCR1_DIE4
-    {SPR_SRCR, 8, 6, NULL, S_SRCR1_DIE6, 0, 0}, // S_SRCR1_DIE5
-    {SPR_SRCR, 9, 6, NULL, S_SRCR1_DIE7, 0, 0}, // S_SRCR1_DIE6
-    {SPR_SRCR, 10, 6, NULL, S_SRCR1_DIE8, 0, 0},        // S_SRCR1_DIE7
-    {SPR_SRCR, 11, 25, A_SorZap, S_SRCR1_DIE9, 0, 0},   // S_SRCR1_DIE8
-    {SPR_SRCR, 12, 5, NULL, S_SRCR1_DIE10, 0, 0},       // S_SRCR1_DIE9
-    {SPR_SRCR, 13, 5, NULL, S_SRCR1_DIE11, 0, 0},       // S_SRCR1_DIE10
-    {SPR_SRCR, 14, 4, NULL, S_SRCR1_DIE12, 0, 0},       // S_SRCR1_DIE11
-    {SPR_SRCR, 11, 20, A_SorZap, S_SRCR1_DIE13, 0, 0},  // S_SRCR1_DIE12
-    {SPR_SRCR, 12, 5, NULL, S_SRCR1_DIE14, 0, 0},       // S_SRCR1_DIE13
-    {SPR_SRCR, 13, 5, NULL, S_SRCR1_DIE15, 0, 0},       // S_SRCR1_DIE14
-    {SPR_SRCR, 14, 4, NULL, S_SRCR1_DIE16, 0, 0},       // S_SRCR1_DIE15
-    {SPR_SRCR, 11, 12, NULL, S_SRCR1_DIE17, 0, 0},      // S_SRCR1_DIE16
-    {SPR_SRCR, 15, -1, A_SorcererRise, S_NULL, 0, 0},   // S_SRCR1_DIE17
-    {SPR_FX14, 32768, 6, NULL, S_SRCRFX1_2, 0, 0},      // S_SRCRFX1_1
-    {SPR_FX14, 32769, 6, NULL, S_SRCRFX1_3, 0, 0},      // S_SRCRFX1_2
-    {SPR_FX14, 32770, 6, NULL, S_SRCRFX1_1, 0, 0},      // S_SRCRFX1_3
-    {SPR_FX14, 32771, 5, NULL, S_SRCRFXI1_2, 0, 0},     // S_SRCRFXI1_1
-    {SPR_FX14, 32772, 5, NULL, S_SRCRFXI1_3, 0, 0},     // S_SRCRFXI1_2
-    {SPR_FX14, 32773, 5, NULL, S_SRCRFXI1_4, 0, 0},     // S_SRCRFXI1_3
-    {SPR_FX14, 32774, 5, NULL, S_SRCRFXI1_5, 0, 0},     // S_SRCRFXI1_4
-    {SPR_FX14, 32775, 5, NULL, S_NULL, 0, 0},   // S_SRCRFXI1_5
-    {SPR_SOR2, 0, 4, NULL, S_SOR2_RISE2, 0, 0}, // S_SOR2_RISE1
-    {SPR_SOR2, 1, 4, NULL, S_SOR2_RISE3, 0, 0}, // S_SOR2_RISE2
-    {SPR_SOR2, 2, 4, A_SorRise, S_SOR2_RISE4, 0, 0},    // S_SOR2_RISE3
-    {SPR_SOR2, 3, 4, NULL, S_SOR2_RISE5, 0, 0}, // S_SOR2_RISE4
-    {SPR_SOR2, 4, 4, NULL, S_SOR2_RISE6, 0, 0}, // S_SOR2_RISE5
-    {SPR_SOR2, 5, 4, NULL, S_SOR2_RISE7, 0, 0}, // S_SOR2_RISE6
-    {SPR_SOR2, 6, 12, A_SorSightSnd, S_SOR2_WALK1, 0, 0},       // S_SOR2_RISE7
-    {SPR_SOR2, 12, 10, A_Look, S_SOR2_LOOK2, 0, 0},     // S_SOR2_LOOK1
-    {SPR_SOR2, 13, 10, A_Look, S_SOR2_LOOK1, 0, 0},     // S_SOR2_LOOK2
-    {SPR_SOR2, 12, 4, A_Chase, S_SOR2_WALK2, 0, 0},     // S_SOR2_WALK1
-    {SPR_SOR2, 13, 4, A_Chase, S_SOR2_WALK3, 0, 0},     // S_SOR2_WALK2
-    {SPR_SOR2, 14, 4, A_Chase, S_SOR2_WALK4, 0, 0},     // S_SOR2_WALK3
-    {SPR_SOR2, 15, 4, A_Chase, S_SOR2_WALK1, 0, 0},     // S_SOR2_WALK4
-    {SPR_SOR2, 16, 3, NULL, S_SOR2_PAIN2, 0, 0},        // S_SOR2_PAIN1
-    {SPR_SOR2, 16, 6, A_Pain, S_SOR2_WALK1, 0, 0},      // S_SOR2_PAIN2
-    {SPR_SOR2, 17, 9, A_Srcr2Decide, S_SOR2_ATK2, 0, 0},        // S_SOR2_ATK1
-    {SPR_SOR2, 18, 9, A_FaceTarget, S_SOR2_ATK3, 0, 0}, // S_SOR2_ATK2
-    {SPR_SOR2, 19, 20, A_Srcr2Attack, S_SOR2_WALK1, 0, 0},      // S_SOR2_ATK3
-    {SPR_SOR2, 11, 6, NULL, S_SOR2_TELE2, 0, 0},        // S_SOR2_TELE1
-    {SPR_SOR2, 10, 6, NULL, S_SOR2_TELE3, 0, 0},        // S_SOR2_TELE2
-    {SPR_SOR2, 9, 6, NULL, S_SOR2_TELE4, 0, 0}, // S_SOR2_TELE3
-    {SPR_SOR2, 8, 6, NULL, S_SOR2_TELE5, 0, 0}, // S_SOR2_TELE4
-    {SPR_SOR2, 7, 6, NULL, S_SOR2_TELE6, 0, 0}, // S_SOR2_TELE5
-    {SPR_SOR2, 6, 6, NULL, S_SOR2_WALK1, 0, 0}, // S_SOR2_TELE6
-    {SPR_SDTH, 0, 8, A_Sor2DthInit, S_SOR2_DIE2, 0, 0}, // S_SOR2_DIE1
-    {SPR_SDTH, 1, 8, NULL, S_SOR2_DIE3, 0, 0},  // S_SOR2_DIE2
-    {SPR_SDTH, 2, 8, A_SorDSph, S_SOR2_DIE4, 0, 0},     // S_SOR2_DIE3
-    {SPR_SDTH, 3, 7, NULL, S_SOR2_DIE5, 0, 0},  // S_SOR2_DIE4
-    {SPR_SDTH, 4, 7, NULL, S_SOR2_DIE6, 0, 0},  // S_SOR2_DIE5
-    {SPR_SDTH, 5, 7, A_Sor2DthLoop, S_SOR2_DIE7, 0, 0}, // S_SOR2_DIE6
-    {SPR_SDTH, 6, 6, A_SorDExp, S_SOR2_DIE8, 0, 0},     // S_SOR2_DIE7
-    {SPR_SDTH, 7, 6, NULL, S_SOR2_DIE9, 0, 0},  // S_SOR2_DIE8
-    {SPR_SDTH, 8, 18, NULL, S_SOR2_DIE10, 0, 0},        // S_SOR2_DIE9
-    {SPR_SDTH, 9, 6, A_NoBlocking, S_SOR2_DIE11, 0, 0}, // S_SOR2_DIE10
-    {SPR_SDTH, 10, 6, A_SorDBon, S_SOR2_DIE12, 0, 0},   // S_SOR2_DIE11
-    {SPR_SDTH, 11, 6, NULL, S_SOR2_DIE13, 0, 0},        // S_SOR2_DIE12
-    {SPR_SDTH, 12, 6, NULL, S_SOR2_DIE14, 0, 0},        // S_SOR2_DIE13
-    {SPR_SDTH, 13, 6, NULL, S_SOR2_DIE15, 0, 0},        // S_SOR2_DIE14
-    {SPR_SDTH, 14, -1, A_BossDeath, S_NULL, 0, 0},      // S_SOR2_DIE15
-    {SPR_FX16, 32768, 3, A_BlueSpark, S_SOR2FX1_2, 0, 0},       // S_SOR2FX1_1
-    {SPR_FX16, 32769, 3, A_BlueSpark, S_SOR2FX1_3, 0, 0},       // S_SOR2FX1_2
-    {SPR_FX16, 32770, 3, A_BlueSpark, S_SOR2FX1_1, 0, 0},       // S_SOR2FX1_3
-    {SPR_FX16, 32774, 5, A_Explode, S_SOR2FXI1_2, 0, 0},        // S_SOR2FXI1_1
-    {SPR_FX16, 32775, 5, NULL, S_SOR2FXI1_3, 0, 0},     // S_SOR2FXI1_2
-    {SPR_FX16, 32776, 5, NULL, S_SOR2FXI1_4, 0, 0},     // S_SOR2FXI1_3
-    {SPR_FX16, 32777, 5, NULL, S_SOR2FXI1_5, 0, 0},     // S_SOR2FXI1_4
-    {SPR_FX16, 32778, 5, NULL, S_SOR2FXI1_6, 0, 0},     // S_SOR2FXI1_5
-    {SPR_FX16, 32779, 5, NULL, S_NULL, 0, 0},   // S_SOR2FXI1_6
-    {SPR_FX16, 32771, 12, NULL, S_SOR2FXSPARK2, 0, 0},  // S_SOR2FXSPARK1
-    {SPR_FX16, 32772, 12, NULL, S_SOR2FXSPARK3, 0, 0},  // S_SOR2FXSPARK2
-    {SPR_FX16, 32773, 12, NULL, S_NULL, 0, 0},  // S_SOR2FXSPARK3
-    {SPR_FX11, 32768, 35, NULL, S_SOR2FX2_2, 0, 0},     // S_SOR2FX2_1
-    {SPR_FX11, 32768, 5, A_GenWizard, S_SOR2FX2_3, 0, 0},       // S_SOR2FX2_2
-    {SPR_FX11, 32769, 5, NULL, S_SOR2FX2_2, 0, 0},      // S_SOR2FX2_3
-    {SPR_FX11, 32770, 5, NULL, S_SOR2FXI2_2, 0, 0},     // S_SOR2FXI2_1
-    {SPR_FX11, 32771, 5, NULL, S_SOR2FXI2_3, 0, 0},     // S_SOR2FXI2_2
-    {SPR_FX11, 32772, 5, NULL, S_SOR2FXI2_4, 0, 0},     // S_SOR2FXI2_3
-    {SPR_FX11, 32773, 5, NULL, S_SOR2FXI2_5, 0, 0},     // S_SOR2FXI2_4
-    {SPR_FX11, 32774, 5, NULL, S_NULL, 0, 0},   // S_SOR2FXI2_5
-    {SPR_SOR2, 6, 8, NULL, S_SOR2TELEFADE2, 0, 0},      // S_SOR2TELEFADE1
-    {SPR_SOR2, 7, 6, NULL, S_SOR2TELEFADE3, 0, 0},      // S_SOR2TELEFADE2
-    {SPR_SOR2, 8, 6, NULL, S_SOR2TELEFADE4, 0, 0},      // S_SOR2TELEFADE3
-    {SPR_SOR2, 9, 6, NULL, S_SOR2TELEFADE5, 0, 0},      // S_SOR2TELEFADE4
-    {SPR_SOR2, 10, 6, NULL, S_SOR2TELEFADE6, 0, 0},     // S_SOR2TELEFADE5
-    {SPR_SOR2, 11, 6, NULL, S_NULL, 0, 0},      // S_SOR2TELEFADE6
-    {SPR_MNTR, 0, 10, A_Look, S_MNTR_LOOK2, 0, 0},      // S_MNTR_LOOK1
-    {SPR_MNTR, 1, 10, A_Look, S_MNTR_LOOK1, 0, 0},      // S_MNTR_LOOK2
-    {SPR_MNTR, 0, 5, A_Chase, S_MNTR_WALK2, 0, 0},      // S_MNTR_WALK1
-    {SPR_MNTR, 1, 5, A_Chase, S_MNTR_WALK3, 0, 0},      // S_MNTR_WALK2
-    {SPR_MNTR, 2, 5, A_Chase, S_MNTR_WALK4, 0, 0},      // S_MNTR_WALK3
-    {SPR_MNTR, 3, 5, A_Chase, S_MNTR_WALK1, 0, 0},      // S_MNTR_WALK4
-    {SPR_MNTR, 21, 10, A_FaceTarget, S_MNTR_ATK1_2, 0, 0},      // S_MNTR_ATK1_1
-    {SPR_MNTR, 22, 7, A_FaceTarget, S_MNTR_ATK1_3, 0, 0},       // S_MNTR_ATK1_2
-    {SPR_MNTR, 23, 12, A_MinotaurAtk1, S_MNTR_WALK1, 0, 0},     // S_MNTR_ATK1_3
-    {SPR_MNTR, 21, 10, A_MinotaurDecide, S_MNTR_ATK2_2, 0, 0},  // S_MNTR_ATK2_1
-    {SPR_MNTR, 24, 4, A_FaceTarget, S_MNTR_ATK2_3, 0, 0},       // S_MNTR_ATK2_2
-    {SPR_MNTR, 25, 9, A_MinotaurAtk2, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK2_3
-    {SPR_MNTR, 21, 10, A_FaceTarget, S_MNTR_ATK3_2, 0, 0},      // S_MNTR_ATK3_1
-    {SPR_MNTR, 22, 7, A_FaceTarget, S_MNTR_ATK3_3, 0, 0},       // S_MNTR_ATK3_2
-    {SPR_MNTR, 23, 12, A_MinotaurAtk3, S_MNTR_WALK1, 0, 0},     // S_MNTR_ATK3_3
-    {SPR_MNTR, 23, 12, NULL, S_MNTR_ATK3_1, 0, 0},      // S_MNTR_ATK3_4
-    {SPR_MNTR, 20, 2, A_MinotaurCharge, S_MNTR_ATK4_1, 0, 0},   // S_MNTR_ATK4_1
-    {SPR_MNTR, 4, 3, NULL, S_MNTR_PAIN2, 0, 0}, // S_MNTR_PAIN1
-    {SPR_MNTR, 4, 6, A_Pain, S_MNTR_WALK1, 0, 0},       // S_MNTR_PAIN2
-    {SPR_MNTR, 5, 6, NULL, S_MNTR_DIE2, 0, 0},  // S_MNTR_DIE1
-    {SPR_MNTR, 6, 5, NULL, S_MNTR_DIE3, 0, 0},  // S_MNTR_DIE2
-    {SPR_MNTR, 7, 6, A_Scream, S_MNTR_DIE4, 0, 0},      // S_MNTR_DIE3
-    {SPR_MNTR, 8, 5, NULL, S_MNTR_DIE5, 0, 0},  // S_MNTR_DIE4
-    {SPR_MNTR, 9, 6, NULL, S_MNTR_DIE6, 0, 0},  // S_MNTR_DIE5
-    {SPR_MNTR, 10, 5, NULL, S_MNTR_DIE7, 0, 0}, // S_MNTR_DIE6
-    {SPR_MNTR, 11, 6, NULL, S_MNTR_DIE8, 0, 0}, // S_MNTR_DIE7
-    {SPR_MNTR, 12, 5, A_NoBlocking, S_MNTR_DIE9, 0, 0}, // S_MNTR_DIE8
-    {SPR_MNTR, 13, 6, NULL, S_MNTR_DIE10, 0, 0},        // S_MNTR_DIE9
-    {SPR_MNTR, 14, 5, NULL, S_MNTR_DIE11, 0, 0},        // S_MNTR_DIE10
-    {SPR_MNTR, 15, 6, NULL, S_MNTR_DIE12, 0, 0},        // S_MNTR_DIE11
-    {SPR_MNTR, 16, 5, NULL, S_MNTR_DIE13, 0, 0},        // S_MNTR_DIE12
-    {SPR_MNTR, 17, 6, NULL, S_MNTR_DIE14, 0, 0},        // S_MNTR_DIE13
-    {SPR_MNTR, 18, 5, NULL, S_MNTR_DIE15, 0, 0},        // S_MNTR_DIE14
-    {SPR_MNTR, 19, -1, A_BossDeath, S_NULL, 0, 0},      // S_MNTR_DIE15
-    {SPR_FX12, 32768, 6, NULL, S_MNTRFX1_2, 0, 0},      // S_MNTRFX1_1
-    {SPR_FX12, 32769, 6, NULL, S_MNTRFX1_1, 0, 0},      // S_MNTRFX1_2
-    {SPR_FX12, 32770, 5, NULL, S_MNTRFXI1_2, 0, 0},     // S_MNTRFXI1_1
-    {SPR_FX12, 32771, 5, NULL, S_MNTRFXI1_3, 0, 0},     // S_MNTRFXI1_2
-    {SPR_FX12, 32772, 5, NULL, S_MNTRFXI1_4, 0, 0},     // S_MNTRFXI1_3
-    {SPR_FX12, 32773, 5, NULL, S_MNTRFXI1_5, 0, 0},     // S_MNTRFXI1_4
-    {SPR_FX12, 32774, 5, NULL, S_MNTRFXI1_6, 0, 0},     // S_MNTRFXI1_5
-    {SPR_FX12, 32775, 5, NULL, S_NULL, 0, 0},   // S_MNTRFXI1_6
-    {SPR_FX13, 0, 2, A_MntrFloorFire, S_MNTRFX2_1, 0, 0},       // S_MNTRFX2_1
-    {SPR_FX13, 32776, 4, A_Explode, S_MNTRFXI2_2, 0, 0},        // S_MNTRFXI2_1
-    {SPR_FX13, 32777, 4, NULL, S_MNTRFXI2_3, 0, 0},     // S_MNTRFXI2_2
-    {SPR_FX13, 32778, 4, NULL, S_MNTRFXI2_4, 0, 0},     // S_MNTRFXI2_3
-    {SPR_FX13, 32779, 4, NULL, S_MNTRFXI2_5, 0, 0},     // S_MNTRFXI2_4
-    {SPR_FX13, 32780, 4, NULL, S_NULL, 0, 0},   // S_MNTRFXI2_5
-    {SPR_FX13, 32771, 4, NULL, S_MNTRFX3_2, 0, 0},      // S_MNTRFX3_1
-    {SPR_FX13, 32770, 4, NULL, S_MNTRFX3_3, 0, 0},      // S_MNTRFX3_2
-    {SPR_FX13, 32769, 5, NULL, S_MNTRFX3_4, 0, 0},      // S_MNTRFX3_3
-    {SPR_FX13, 32770, 5, NULL, S_MNTRFX3_5, 0, 0},      // S_MNTRFX3_4
-    {SPR_FX13, 32771, 5, NULL, S_MNTRFX3_6, 0, 0},      // S_MNTRFX3_5
-    {SPR_FX13, 32772, 5, NULL, S_MNTRFX3_7, 0, 0},      // S_MNTRFX3_6
-    {SPR_FX13, 32773, 4, NULL, S_MNTRFX3_8, 0, 0},      // S_MNTRFX3_7
-    {SPR_FX13, 32774, 4, NULL, S_MNTRFX3_9, 0, 0},      // S_MNTRFX3_8
-    {SPR_FX13, 32775, 4, NULL, S_NULL, 0, 0},   // S_MNTRFX3_9
-    {SPR_AKYY, 32768, 3, NULL, S_AKYY2, 0, 0},  // S_AKYY1
-    {SPR_AKYY, 32769, 3, NULL, S_AKYY3, 0, 0},  // S_AKYY2
-    {SPR_AKYY, 32770, 3, NULL, S_AKYY4, 0, 0},  // S_AKYY3
-    {SPR_AKYY, 32771, 3, NULL, S_AKYY5, 0, 0},  // S_AKYY4
-    {SPR_AKYY, 32772, 3, NULL, S_AKYY6, 0, 0},  // S_AKYY5
-    {SPR_AKYY, 32773, 3, NULL, S_AKYY7, 0, 0},  // S_AKYY6
-    {SPR_AKYY, 32774, 3, NULL, S_AKYY8, 0, 0},  // S_AKYY7
-    {SPR_AKYY, 32775, 3, NULL, S_AKYY9, 0, 0},  // S_AKYY8
-    {SPR_AKYY, 32776, 3, NULL, S_AKYY10, 0, 0}, // S_AKYY9
-    {SPR_AKYY, 32777, 3, NULL, S_AKYY1, 0, 0},  // S_AKYY10
-    {SPR_BKYY, 32768, 3, NULL, S_BKYY2, 0, 0},  // S_BKYY1
-    {SPR_BKYY, 32769, 3, NULL, S_BKYY3, 0, 0},  // S_BKYY2
-    {SPR_BKYY, 32770, 3, NULL, S_BKYY4, 0, 0},  // S_BKYY3
-    {SPR_BKYY, 32771, 3, NULL, S_BKYY5, 0, 0},  // S_BKYY4
-    {SPR_BKYY, 32772, 3, NULL, S_BKYY6, 0, 0},  // S_BKYY5
-    {SPR_BKYY, 32773, 3, NULL, S_BKYY7, 0, 0},  // S_BKYY6
-    {SPR_BKYY, 32774, 3, NULL, S_BKYY8, 0, 0},  // S_BKYY7
-    {SPR_BKYY, 32775, 3, NULL, S_BKYY9, 0, 0},  // S_BKYY8
-    {SPR_BKYY, 32776, 3, NULL, S_BKYY10, 0, 0}, // S_BKYY9
-    {SPR_BKYY, 32777, 3, NULL, S_BKYY1, 0, 0},  // S_BKYY10
-    {SPR_CKYY, 32768, 3, NULL, S_CKYY2, 0, 0},  // S_CKYY1
-    {SPR_CKYY, 32769, 3, NULL, S_CKYY3, 0, 0},  // S_CKYY2
-    {SPR_CKYY, 32770, 3, NULL, S_CKYY4, 0, 0},  // S_CKYY3
-    {SPR_CKYY, 32771, 3, NULL, S_CKYY5, 0, 0},  // S_CKYY4
-    {SPR_CKYY, 32772, 3, NULL, S_CKYY6, 0, 0},  // S_CKYY5
-    {SPR_CKYY, 32773, 3, NULL, S_CKYY7, 0, 0},  // S_CKYY6
-    {SPR_CKYY, 32774, 3, NULL, S_CKYY8, 0, 0},  // S_CKYY7
-    {SPR_CKYY, 32775, 3, NULL, S_CKYY9, 0, 0},  // S_CKYY8
-    {SPR_CKYY, 32776, 3, NULL, S_CKYY1, 0, 0},  // S_CKYY9
-    {SPR_AMG1, 0, -1, NULL, S_NULL, 0, 0},      // S_AMG1
-    {SPR_AMG2, 0, 4, NULL, S_AMG2_2, 0, 0},     // S_AMG2_1
-    {SPR_AMG2, 1, 4, NULL, S_AMG2_3, 0, 0},     // S_AMG2_2
-    {SPR_AMG2, 2, 4, NULL, S_AMG2_1, 0, 0},     // S_AMG2_3
-    {SPR_AMM1, 0, -1, NULL, S_NULL, 0, 0},      // S_AMM1
-    {SPR_AMM2, 0, -1, NULL, S_NULL, 0, 0},      // S_AMM2
-    {SPR_AMC1, 0, -1, NULL, S_NULL, 0, 0},      // S_AMC1
-    {SPR_AMC2, 0, 5, NULL, S_AMC2_2, 0, 0},     // S_AMC2_1
-    {SPR_AMC2, 1, 5, NULL, S_AMC2_3, 0, 0},     // S_AMC2_2
-    {SPR_AMC2, 2, 5, NULL, S_AMC2_1, 0, 0},     // S_AMC2_3
-    {SPR_AMS1, 0, 5, NULL, S_AMS1_2, 0, 0},     // S_AMS1_1
-    {SPR_AMS1, 1, 5, NULL, S_AMS1_1, 0, 0},     // S_AMS1_2
-    {SPR_AMS2, 0, 5, NULL, S_AMS2_2, 0, 0},     // S_AMS2_1
-    {SPR_AMS2, 1, 5, NULL, S_AMS2_1, 0, 0},     // S_AMS2_2
-    {SPR_AMP1, 0, 4, NULL, S_AMP1_2, 0, 0},     // S_AMP1_1
-    {SPR_AMP1, 1, 4, NULL, S_AMP1_3, 0, 0},     // S_AMP1_2
-    {SPR_AMP1, 2, 4, NULL, S_AMP1_1, 0, 0},     // S_AMP1_3
-    {SPR_AMP2, 0, 4, NULL, S_AMP2_2, 0, 0},     // S_AMP2_1
-    {SPR_AMP2, 1, 4, NULL, S_AMP2_3, 0, 0},     // S_AMP2_2
-    {SPR_AMP2, 2, 4, NULL, S_AMP2_1, 0, 0},     // S_AMP2_3
-    {SPR_AMB1, 0, 4, NULL, S_AMB1_2, 0, 0},     // S_AMB1_1
-    {SPR_AMB1, 1, 4, NULL, S_AMB1_3, 0, 0},     // S_AMB1_2
-    {SPR_AMB1, 2, 4, NULL, S_AMB1_1, 0, 0},     // S_AMB1_3
-    {SPR_AMB2, 0, 4, NULL, S_AMB2_2, 0, 0},     // S_AMB2_1
-    {SPR_AMB2, 1, 4, NULL, S_AMB2_3, 0, 0},     // S_AMB2_2
-    {SPR_AMB2, 2, 4, NULL, S_AMB2_1, 0, 0},     // S_AMB2_3
-    {SPR_AMG1, 0, 100, A_ESound, S_SND_WIND, 0, 0},     // S_SND_WIND
-    {SPR_AMG1, 0, 85, A_ESound, S_SND_WATERFALL, 0, 0}  // S_SND_WATERFALL
-};
-
-
-mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
-
-    {                           // MT_MISC0
-     81,                        // doomednum
-     S_ITEM_PTN1_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ITEMSHIELD1
-     85,                        // doomednum
-     S_ITEM_SHLD1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ITEMSHIELD2
-     31,                        // doomednum
-     S_ITEM_SHD2_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MISC1
-     8,                         // doomednum
-     S_ITEM_BAGH1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MISC2
-     35,                        // doomednum
-     S_ITEM_SPMP1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIINVISIBILITY
-     75,                        // doomednum
-     S_ARTI_INVS1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_SHADOW | MF_COUNTITEM,     // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MISC3
-     82,                        // doomednum
-     S_ARTI_PTN2_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIFLY
-     83,                        // doomednum
-     S_ARTI_SOAR1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIINVULNERABILITY
-     84,                        // doomednum
-     S_ARTI_INVU1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTITOMEOFPOWER
-     86,                        // doomednum
-     S_ARTI_PWBK1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIEGG
-     30,                        // doomednum
-     S_ARTI_EGGC1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_EGGFX
-     -1,                        // doomednum
-     S_EGGFX1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_EGGFXI1_1,               // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     18 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ARTISUPERHEAL
-     32,                        // doomednum
-     S_ARTI_SPHL1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MISC4
-     33,                        // doomednum
-     S_ARTI_TRCH1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MISC5
-     34,                        // doomednum
-     S_ARTI_FBMB1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_FIREBOMB
-     -1,                        // doomednum
-     S_FIREBOMB1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_phohit,                // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTITELEPORT
-     36,                        // doomednum
-     S_ARTI_ATLP1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_COUNTITEM, // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_POD
-     2035,                      // doomednum
-     S_POD_WAIT1,               // spawnstate
-     45,                        // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_POD_PAIN1,               // painstate
-     255,                       // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_POD_DIE1,                // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_podexp,                // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     54 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_NOBLOOD | MF_SHOOTABLE | MF_DROPOFF, // flags
-     MF2_WINDTHRUST | MF2_PUSHABLE | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP   // flags2
-     },
-
-    {                           // MT_PODGOO
-     -1,                        // doomednum
-     S_PODGOO1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_PODGOOX,                 // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
-     },
-
-    {                           // MT_PODGENERATOR
-     43,                        // doomednum
-     S_PODGENERATOR,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SPLASH
-     -1,                        // doomednum
-     S_SPLASH1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SPLASHX,                 // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
-     },
-
-    {                           // MT_SPLASHBASE
-     -1,                        // doomednum
-     S_SPLASHBASE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_LAVASPLASH
-     -1,                        // doomednum
-     S_LAVASPLASH1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_LAVASMOKE
-     -1,                        // doomednum
-     S_LAVASMOKE1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SLUDGECHUNK
-     -1,                        // doomednum
-     S_SLUDGECHUNK1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SLUDGECHUNKX,            // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
-     },
-
-    {                           // MT_SLUDGESPLASH
-     -1,                        // doomednum
-     S_SLUDGESPLASH1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SKULLHANG70
-     17,                        // doomednum
-     S_SKULLHANG70_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     70 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SKULLHANG60
-     24,                        // doomednum
-     S_SKULLHANG60_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     60 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SKULLHANG45
-     25,                        // doomednum
-     S_SKULLHANG45_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     45 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SKULLHANG35
-     26,                        // doomednum
-     S_SKULLHANG35_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     35 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CHANDELIER
-     28,                        // doomednum
-     S_CHANDELIER1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     60 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SERPTORCH
-     27,                        // doomednum
-     S_SERPTORCH1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     54 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SMALLPILLAR
-     29,                        // doomednum
-     S_SMALLPILLAR,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     34 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_STALAGMITESMALL
-     37,                        // doomednum
-     S_STALAGMITESMALL,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_STALAGMITELARGE
-     38,                        // doomednum
-     S_STALAGMITELARGE,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_STALACTITESMALL
-     39,                        // doomednum
-     S_STALACTITESMALL,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     36 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_STALACTITELARGE
-     40,                        // doomednum
-     S_STALACTITELARGE,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     68 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC6
-     76,                        // doomednum
-     S_FIREBRAZIER1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     44 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BARREL
-     44,                        // doomednum
-     S_BARREL,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC7
-     47,                        // doomednum
-     S_BRPILLAR,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     128 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC8
-     48,                        // doomednum
-     S_MOSS1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     23 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC9
-     49,                        // doomednum
-     S_MOSS2,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     27 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC10
-     50,                        // doomednum
-     S_WALLTORCH1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOGRAVITY,              // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC11
-     51,                        // doomednum
-     S_HANGINGCORPSE,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     104 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEYGIZMOBLUE
-     94,                        // doomednum
-     S_KEYGIZMO1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEYGIZMOGREEN
-     95,                        // doomednum
-     S_KEYGIZMO1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEYGIZMOYELLOW
-     96,                        // doomednum
-     S_KEYGIZMO1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEYGIZMOFLOAT
-     -1,                        // doomednum
-     S_KGZ_START,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_NOGRAVITY,   // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC12
-     87,                        // doomednum
-     S_VOLCANO1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_VOLCANOBLAST
-     -1,                        // doomednum
-     S_VOLCANOBALL1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_VOLCANOBALLX1,           // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_volhit,                // deathsound
-     2 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_LOGRAV | MF2_NOTELEPORT | MF2_FIREDAMAGE       // flags2
-     },
-
-    {                           // MT_VOLCANOTBLAST
-     -1,                        // doomednum
-     S_VOLCANOTBALL1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_VOLCANOTBALLX1,          // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     2 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_LOGRAV | MF2_NOTELEPORT | MF2_FIREDAMAGE       // flags2
-     },
-
-    {                           // MT_TELEGLITGEN
-     74,                        // doomednum
-     S_TELEGLITGEN1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_NOSECTOR,        // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TELEGLITGEN2
-     52,                        // doomednum
-     S_TELEGLITGEN2,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_NOSECTOR,        // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TELEGLITTER
-     -1,                        // doomednum
-     S_TELEGLITTER1_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TELEGLITTER2
-     -1,                        // doomednum
-     S_TELEGLITTER2_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TFOG
-     -1,                        // doomednum
-     S_TFOG1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TELEPORTMAN
-     14,                        // doomednum
-     S_NULL,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_STAFFPUFF
-     -1,                        // doomednum
-     S_STAFFPUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_stfhit,                // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_STAFFPUFF2
-     -1,                        // doomednum
-     S_STAFFPUFF2_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_stfpow,                // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BEAKPUFF
-     -1,                        // doomednum
-     S_STAFFPUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_chicatk,               // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC13
-     2005,                      // doomednum
-     S_WGNT,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_GAUNTLETPUFF1
-     -1,                        // doomednum
-     S_GAUNTLETPUFF1_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_GAUNTLETPUFF2
-     -1,                        // doomednum
-     S_GAUNTLETPUFF2_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC14
-     53,                        // doomednum
-     S_BLSR,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BLASTERFX1
-     -1,                        // doomednum
-     S_BLASTERFX1_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BLASTERFXI1_1,           // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_blshit,                // deathsound
-     184 * FRACUNIT,            // speed
-     12 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_BLASTERSMOKE
-     -1,                        // doomednum
-     S_BLASTERSMOKE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
-     },
-
-    {                           // MT_RIPPER
-     -1,                        // doomednum
-     S_RIPPER1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_RIPPERX1,                // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     14 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_RIP   // flags2
-     },
-
-    {                           // MT_BLASTERPUFF1
-     -1,                        // doomednum
-     S_BLASTERPUFF1_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BLASTERPUFF2
-     -1,                        // doomednum
-     S_BLASTERPUFF2_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_WMACE
-     2002,                      // doomednum
-     S_WMCE,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MACEFX1
-     -1,                        // doomednum
-     S_MACEFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_lobsht,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MACEFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     20 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_NOTELEPORT   // flags2
-     },
-
-    {                           // MT_MACEFX2
-     -1,                        // doomednum
-     S_MACEFX2_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MACEFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     6,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_LOGRAV | MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_NOTELEPORT      // flags2
-     },
-
-    {                           // MT_MACEFX3
-     -1,                        // doomednum
-     S_MACEFX3_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MACEFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     7 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     4,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_LOGRAV | MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_NOTELEPORT      // flags2
-     },
-
-    {                           // MT_MACEFX4
-     -1,                        // doomednum
-     S_MACEFX4_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MACEFXI4_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     7 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     18,                        // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_LOGRAV | MF2_FLOORBOUNCE | MF2_THRUGHOST | MF2_TELESTOMP       // flags2
-     },
-
-    {                           // MT_WSKULLROD
-     2004,                      // doomednum
-     S_WSKL,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_HORNRODFX1
-     -1,                        // doomednum
-     S_HRODFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_hrnsht,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HRODFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     22 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
-     },
-
-    {                           // MT_HORNRODFX2
-     -1,                        // doomednum
-     S_HRODFX2_1,               // spawnstate
-     4 * 35,                    // spawnhealth
-     S_NULL,                    // seestate
-     sfx_hrnsht,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HRODFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_ramphit,               // deathsound
-     22 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     10,                        // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_RAINPLR1
-     -1,                        // doomednum
-     S_RAINPLR1_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_RAINPLR1X_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     12 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     5,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_RAINPLR2
-     -1,                        // doomednum
-     S_RAINPLR2_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_RAINPLR2X_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     12 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     5,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_RAINPLR3
-     -1,                        // doomednum
-     S_RAINPLR3_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_RAINPLR3X_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     12 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     5,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_RAINPLR4
-     -1,                        // doomednum
-     S_RAINPLR4_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_RAINPLR4X_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     12 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     5,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_GOLDWANDFX1
-     -1,                        // doomednum
-     S_GWANDFX1_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_GWANDFXI1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_gldhit,                // deathsound
-     22 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_GOLDWANDFX2
-     -1,                        // doomednum
-     S_GWANDFX2_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_GWANDFXI1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     18 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_GOLDWANDPUFF1
-     -1,                        // doomednum
-     S_GWANDPUFF1_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_GOLDWANDPUFF2
-     -1,                        // doomednum
-     S_GWANDFXI1_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_WPHOENIXROD
-     2003,                      // doomednum
-     S_WPHX,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_PHOENIXFX1
-     -1,                        // doomednum
-     S_PHOENIXFX1_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_phosht,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_PHOENIXFXI1_1,           // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_phohit,                // deathsound
-     20 * FRACUNIT,             // speed
-     11 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     20,                        // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_THRUGHOST | MF2_NOTELEPORT     // flags2
-     },
-
-    // The following thing is present in the mobjinfo table from Heretic 1.0,
-    // but not in Heretic 1.3 (ie. it was removed).  It has been re-inserted
-    // here to support HHE patches.
-
-    {                           // MT_PHOENIXFX_REMOVED
-     -1,                        // doomednum
-     S_PHOENIXFXIX_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_PHOENIXFXIX_3,           // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT     // flags2
-     },
-
-    {                           // MT_PHOENIXPUFF
-     -1,                        // doomednum
-     S_PHOENIXPUFF1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
-     },
-
-    {                           // MT_PHOENIXFX2
-     -1,                        // doomednum
-     S_PHOENIXFX2_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_PHOENIXFXI2_1,           // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     6 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_MISC15
-     2001,                      // doomednum
-     S_WBOW,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CRBOWFX1
-     -1,                        // doomednum
-     S_CRBOWFX1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_bowsht,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CRBOWFXI1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     30 * FRACUNIT,             // speed
-     11 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     10,                        // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_CRBOWFX2
-     -1,                        // doomednum
-     S_CRBOWFX2,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_bowsht,                // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CRBOWFXI1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     32 * FRACUNIT,             // speed
-     11 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     6,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_CRBOWFX3
-     -1,                        // doomednum
-     S_CRBOWFX3,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CRBOWFXI3_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     20 * FRACUNIT,             // speed
-     11 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_THRUGHOST | MF2_NOTELEPORT    // flags2
-     },
-
-    {                           // MT_CRBOWFX4
-     -1,                        // doomednum
-     S_CRBOWFX4_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     MF2_LOGRAV                 // flags2
-     },
-
-    {                           // MT_BLOOD
-     -1,                        // doomednum
-     S_BLOOD1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BLOODSPLATTER
-     -1,                        // doomednum
-     S_BLOODSPLATTER1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BLOODSPLATTERX,          // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
-     },
-
-    {                           // MT_PLAYER
-     -1,                        // doomednum
-     S_PLAY,                    // spawnstate
-     100,                       // spawnhealth
-     S_PLAY_RUN1,               // seestate
-     sfx_None,                  // seesound
-     0,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_PLAY_PAIN,               // painstate
-     255,                       // painchance
-     sfx_plrpai,                // painsound
-     S_NULL,                    // meleestate
-     S_PLAY_ATK1,               // missilestate
-     S_NULL,                    // crashstate
-     S_PLAY_DIE1,               // deathstate
-     S_PLAY_XDIE1,              // xdeathstate
-     sfx_plrdth,                // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     56 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
-     MF2_WINDTHRUST | MF2_FOOTCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP   // flags2
-     },
-
-    {                           // MT_BLOODYSKULL
-     -1,                        // doomednum
-     S_BLOODYSKULL1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
-     MF2_LOGRAV | MF2_CANNOTPUSH        // flags2
-     },
-
-    {                           // MT_CHICPLAYER
-     -1,                        // doomednum
-     S_CHICPLAY,                // spawnstate
-     100,                       // spawnhealth
-     S_CHICPLAY_RUN1,           // seestate
-     sfx_None,                  // seesound
-     0,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_CHICPLAY_PAIN,           // painstate
-     255,                       // painchance
-     sfx_chicpai,               // painsound
-     S_NULL,                    // meleestate
-     S_CHICPLAY_ATK1,           // missilestate
-     S_NULL,                    // crashstate
-     S_CHICKEN_DIE1,            // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_chicdth,               // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     24 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_NOTDMATCH,       // flags
-     MF2_WINDTHRUST | MF2_SLIDE | MF2_PASSMOBJ | MF2_FOOTCLIP | MF2_LOGRAV | MF2_TELESTOMP      // flags2
-     },
-
-    {                           // MT_CHICKEN
-     -1,                        // doomednum
-     S_CHICKEN_LOOK1,           // spawnstate
-     10,                        // spawnhealth
-     S_CHICKEN_WALK1,           // seestate
-     sfx_chicpai,               // seesound
-     8,                         // reactiontime
-     sfx_chicatk,               // attacksound
-     S_CHICKEN_PAIN1,           // painstate
-     200,                       // painchance
-     sfx_chicpai,               // painsound
-     S_CHICKEN_ATK1,            // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_CHICKEN_DIE1,            // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_chicdth,               // deathsound
-     4,                         // speed
-     9 * FRACUNIT,              // radius
-     22 * FRACUNIT,             // height
-     40,                        // mass
-     0,                         // damage
-     sfx_chicact,               // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF,       // flags
-     MF2_WINDTHRUST | MF2_FOOTCLIP | MF2_PASSMOBJ       // flags2
-     },
-
-    {                           // MT_FEATHER
-     -1,                        // doomednum
-     S_FEATHER1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FEATHERX,                // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH | MF2_WINDTHRUST      // flags2
-     },
-
-    {                           // MT_MUMMY
-     68,                        // doomednum
-     S_MUMMY_LOOK1,             // spawnstate
-     80,                        // spawnhealth
-     S_MUMMY_WALK1,             // seestate
-     sfx_mumsit,                // seesound
-     8,                         // reactiontime
-     sfx_mumat1,                // attacksound
-     S_MUMMY_PAIN1,             // painstate
-     128,                       // painchance
-     sfx_mumpai,                // painsound
-     S_MUMMY_ATK1,              // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_MUMMY_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_mumdth,                // deathsound
-     12,                        // speed
-     22 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     75,                        // mass
-     0,                         // damage
-     sfx_mumact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_MUMMYLEADER
-     45,                        // doomednum
-     S_MUMMY_LOOK1,             // spawnstate
-     100,                       // spawnhealth
-     S_MUMMY_WALK1,             // seestate
-     sfx_mumsit,                // seesound
-     8,                         // reactiontime
-     sfx_mumat1,                // attacksound
-     S_MUMMY_PAIN1,             // painstate
-     64,                        // painchance
-     sfx_mumpai,                // painsound
-     S_MUMMY_ATK1,              // meleestate
-     S_MUMMYL_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_MUMMY_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_mumdth,                // deathsound
-     12,                        // speed
-     22 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     75,                        // mass
-     0,                         // damage
-     sfx_mumact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_MUMMYGHOST
-     69,                        // doomednum
-     S_MUMMY_LOOK1,             // spawnstate
-     80,                        // spawnhealth
-     S_MUMMY_WALK1,             // seestate
-     sfx_mumsit,                // seesound
-     8,                         // reactiontime
-     sfx_mumat1,                // attacksound
-     S_MUMMY_PAIN1,             // painstate
-     128,                       // painchance
-     sfx_mumpai,                // painsound
-     S_MUMMY_ATK1,              // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_MUMMY_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_mumdth,                // deathsound
-     12,                        // speed
-     22 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     75,                        // mass
-     0,                         // damage
-     sfx_mumact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_MUMMYLEADERGHOST
-     46,                        // doomednum
-     S_MUMMY_LOOK1,             // spawnstate
-     100,                       // spawnhealth
-     S_MUMMY_WALK1,             // seestate
-     sfx_mumsit,                // seesound
-     8,                         // reactiontime
-     sfx_mumat1,                // attacksound
-     S_MUMMY_PAIN1,             // painstate
-     64,                        // painchance
-     sfx_mumpai,                // painsound
-     S_MUMMY_ATK1,              // meleestate
-     S_MUMMYL_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_MUMMY_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_mumdth,                // deathsound
-     12,                        // speed
-     22 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     75,                        // mass
-     0,                         // damage
-     sfx_mumact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_MUMMYSOUL
-     -1,                        // doomednum
-     S_MUMMY_SOUL1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MUMMYFX1
-     -1,                        // doomednum
-     S_MUMMYFX1_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MUMMYFXI1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     9 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     14 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_BEAST
-     70,                        // doomednum
-     S_BEAST_LOOK1,             // spawnstate
-     220,                       // spawnhealth
-     S_BEAST_WALK1,             // seestate
-     sfx_bstsit,                // seesound
-     8,                         // reactiontime
-     sfx_bstatk,                // attacksound
-     S_BEAST_PAIN1,             // painstate
-     100,                       // painchance
-     sfx_bstpai,                // painsound
-     0,                         // meleestate
-     S_BEAST_ATK1,              // missilestate
-     S_NULL,                    // crashstate
-     S_BEAST_DIE1,              // deathstate
-     S_BEAST_XDIE1,             // xdeathstate
-     sfx_bstdth,                // deathsound
-     14,                        // speed
-     32 * FRACUNIT,             // radius
-     74 * FRACUNIT,             // height
-     200,                       // mass
-     0,                         // damage
-     sfx_bstact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_BEASTBALL
-     -1,                        // doomednum
-     S_BEASTBALL1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BEASTBALLX1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     12 * FRACUNIT,             // speed
-     9 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     4,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
-     },
-
-    {                           // MT_BURNBALL
-     -1,                        // doomednum
-     S_BURNBALL1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BEASTBALLX1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     6 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_BURNBALLFB
-     -1,                        // doomednum
-     S_BURNBALLFB1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BEASTBALLX1,             // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     6 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_PUFFY
-     -1,                        // doomednum
-     S_PUFFY1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_PUFFY1,                  // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     6 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SNAKE
-     92,                        // doomednum
-     S_SNAKE_LOOK1,             // spawnstate
-     280,                       // spawnhealth
-     S_SNAKE_WALK1,             // seestate
-     sfx_snksit,                // seesound
-     8,                         // reactiontime
-     sfx_snkatk,                // attacksound
-     S_SNAKE_PAIN1,             // painstate
-     48,                        // painchance
-     sfx_snkpai,                // painsound
-     0,                         // meleestate
-     S_SNAKE_ATK1,              // missilestate
-     S_NULL,                    // crashstate
-     S_SNAKE_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_snkdth,                // deathsound
-     10,                        // speed
-     22 * FRACUNIT,             // radius
-     70 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_snkact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_SNAKEPRO_A
-     -1,                        // doomednum
-     S_SNAKEPRO_A1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SNAKEPRO_AX1,            // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     14 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
-     },
-
-    {                           // MT_SNAKEPRO_B
-     -1,                        // doomednum
-     S_SNAKEPRO_B1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SNAKEPRO_BX1,            // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     14 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_HEAD
-     6,                         // doomednum
-     S_HEAD_LOOK,               // spawnstate
-     700,                       // spawnhealth
-     S_HEAD_FLOAT,              // seestate
-     sfx_hedsit,                // seesound
-     8,                         // reactiontime
-     sfx_hedat1,                // attacksound
-     S_HEAD_PAIN1,              // painstate
-     32,                        // painchance
-     sfx_hedpai,                // painsound
-     0,                         // meleestate
-     S_HEAD_ATK1,               // missilestate
-     S_NULL,                    // crashstate
-     S_HEAD_DIE1,               // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_heddth,                // deathsound
-     6,                         // speed
-     40 * FRACUNIT,             // radius
-     72 * FRACUNIT,             // height
-     325,                       // mass
-     0,                         // damage
-     sfx_hedact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
-     MF2_PASSMOBJ               // flags2
-     },
-
-    {                           // MT_HEADFX1
-     -1,                        // doomednum
-     S_HEADFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HEADFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     13 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_THRUGHOST     // flags2
-     },
-
-    {                           // MT_HEADFX2
-     -1,                        // doomednum
-     S_HEADFX2_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HEADFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     8 * FRACUNIT,              // speed
-     12 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_HEADFX3
-     -1,                        // doomednum
-     S_HEADFX3_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HEADFXI3_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     14 * FRACUNIT,             // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     5,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
-     },
-
-    {                           // MT_WHIRLWIND
-     -1,                        // doomednum
-     S_HEADFX4_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HEADFXI4_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     74 * FRACUNIT,             // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_SHADOW,        // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_CLINK
-     90,                        // doomednum
-     S_CLINK_LOOK1,             // spawnstate
-     150,                       // spawnhealth
-     S_CLINK_WALK1,             // seestate
-     sfx_clksit,                // seesound
-     8,                         // reactiontime
-     sfx_clkatk,                // attacksound
-     S_CLINK_PAIN1,             // painstate
-     32,                        // painchance
-     sfx_clkpai,                // painsound
-     S_CLINK_ATK1,              // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_CLINK_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_clkdth,                // deathsound
-     14,                        // speed
-     20 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     75,                        // mass
-     0,                         // damage
-     sfx_clkact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_WIZARD
-     15,                        // doomednum
-     S_WIZARD_LOOK1,            // spawnstate
-     180,                       // spawnhealth
-     S_WIZARD_WALK1,            // seestate
-     sfx_wizsit,                // seesound
-     8,                         // reactiontime
-     sfx_wizatk,                // attacksound
-     S_WIZARD_PAIN1,            // painstate
-     64,                        // painchance
-     sfx_wizpai,                // painsound
-     0,                         // meleestate
-     S_WIZARD_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_WIZARD_DIE1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_wizdth,                // deathsound
-     12,                        // speed
-     16 * FRACUNIT,             // radius
-     68 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_wizact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_FLOAT | MF_NOGRAVITY,  // flags
-     MF2_PASSMOBJ               // flags2
-     },
-
-    {                           // MT_WIZFX1
-     -1,                        // doomednum
-     S_WIZFX1_1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_WIZFXI1_1,               // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     18 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_IMP
-     66,                        // doomednum
-     S_IMP_LOOK1,               // spawnstate
-     40,                        // spawnhealth
-     S_IMP_FLY1,                // seestate
-     sfx_impsit,                // seesound
-     8,                         // reactiontime
-     sfx_impat1,                // attacksound
-     S_IMP_PAIN1,               // painstate
-     200,                       // painchance
-     sfx_imppai,                // painsound
-     S_IMP_MEATK1,              // meleestate
-     S_IMP_MSATK1_1,            // missilestate
-     S_IMP_CRASH1,              // crashstate
-     S_IMP_DIE1,                // deathstate
-     S_IMP_XDIE1,               // xdeathstate
-     sfx_impdth,                // deathsound
-     10,                        // speed
-     16 * FRACUNIT,             // radius
-     36 * FRACUNIT,             // height
-     50,                        // mass
-     0,                         // damage
-     sfx_impact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_FLOAT | MF_NOGRAVITY | MF_COUNTKILL,  // flags
-     MF2_SPAWNFLOAT | MF2_PASSMOBJ      // flags2
-     },
-
-    {                           // MT_IMPLEADER
-     5,                         // doomednum
-     S_IMP_LOOK1,               // spawnstate
-     80,                        // spawnhealth
-     S_IMP_FLY1,                // seestate
-     sfx_impsit,                // seesound
-     8,                         // reactiontime
-     sfx_impat2,                // attacksound
-     S_IMP_PAIN1,               // painstate
-     200,                       // painchance
-     sfx_imppai,                // painsound
-     0,                         // meleestate
-     S_IMP_MSATK2_1,            // missilestate
-     S_IMP_CRASH1,              // crashstate
-     S_IMP_DIE1,                // deathstate
-     S_IMP_XDIE1,               // xdeathstate
-     sfx_impdth,                // deathsound
-     10,                        // speed
-     16 * FRACUNIT,             // radius
-     36 * FRACUNIT,             // height
-     50,                        // mass
-     0,                         // damage
-     sfx_impact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_FLOAT | MF_NOGRAVITY | MF_COUNTKILL,  // flags
-     MF2_SPAWNFLOAT | MF2_PASSMOBJ      // flags2
-     },
-
-    {                           // MT_IMPCHUNK1
-     -1,                        // doomednum
-     S_IMP_CHUNKA1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_IMPCHUNK2
-     -1,                        // doomednum
-     S_IMP_CHUNKB1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_IMPBALL
-     -1,                        // doomednum
-     S_IMPFX1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_IMPFXI1,                 // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     10 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_NOTELEPORT    // flags2
-     },
-
-    {                           // MT_KNIGHT
-     64,                        // doomednum
-     S_KNIGHT_STND1,            // spawnstate
-     200,                       // spawnhealth
-     S_KNIGHT_WALK1,            // seestate
-     sfx_kgtsit,                // seesound
-     8,                         // reactiontime
-     sfx_kgtatk,                // attacksound
-     S_KNIGHT_PAIN1,            // painstate
-     100,                       // painchance
-     sfx_kgtpai,                // painsound
-     S_KNIGHT_ATK1,             // meleestate
-     S_KNIGHT_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_KNIGHT_DIE1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_kgtdth,                // deathsound
-     12,                        // speed
-     24 * FRACUNIT,             // radius
-     78 * FRACUNIT,             // height
-     150,                       // mass
-     0,                         // damage
-     sfx_kgtact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_KNIGHTGHOST
-     65,                        // doomednum
-     S_KNIGHT_STND1,            // spawnstate
-     200,                       // spawnhealth
-     S_KNIGHT_WALK1,            // seestate
-     sfx_kgtsit,                // seesound
-     8,                         // reactiontime
-     sfx_kgtatk,                // attacksound
-     S_KNIGHT_PAIN1,            // painstate
-     100,                       // painchance
-     sfx_kgtpai,                // painsound
-     S_KNIGHT_ATK1,             // meleestate
-     S_KNIGHT_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_KNIGHT_DIE1,             // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_kgtdth,                // deathsound
-     12,                        // speed
-     24 * FRACUNIT,             // radius
-     78 * FRACUNIT,             // height
-     150,                       // mass
-     0,                         // damage
-     sfx_kgtact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ        // flags2
-     },
-
-    {                           // MT_KNIGHTAXE
-     -1,                        // doomednum
-     S_SPINAXE1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SPINAXEX1,               // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     9 * FRACUNIT,              // speed
-     10 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_WINDTHRUST | MF2_NOTELEPORT | MF2_THRUGHOST    // flags2
-     },
-
-    {                           // MT_REDAXE
-     -1,                        // doomednum
-     S_REDAXE1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_REDAXEX1,                // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_hrnhit,                // deathsound
-     9 * FRACUNIT,              // speed
-     10 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     7,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_THRUGHOST     // flags2
-     },
-
-    {                           // MT_SORCERER1
-     7,                         // doomednum
-     S_SRCR1_LOOK1,             // spawnstate
-     2000,                      // spawnhealth
-     S_SRCR1_WALK1,             // seestate
-     sfx_sbtsit,                // seesound
-     8,                         // reactiontime
-     sfx_sbtatk,                // attacksound
-     S_SRCR1_PAIN1,             // painstate
-     56,                        // painchance
-     sfx_sbtpai,                // painsound
-     0,                         // meleestate
-     S_SRCR1_ATK1,              // missilestate
-     S_NULL,                    // crashstate
-     S_SRCR1_DIE1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_sbtdth,                // deathsound
-     16,                        // speed
-     28 * FRACUNIT,             // radius
-     100 * FRACUNIT,            // height
-     800,                       // mass
-     0,                         // damage
-     sfx_sbtact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ | MF2_BOSS     // flags2
-     },
-
-    {                           // MT_SRCRFX1
-     -1,                        // doomednum
-     S_SRCRFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SRCRFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     20 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     10,                        // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_SORCERER2
-     -1,                        // doomednum
-     S_SOR2_LOOK1,              // spawnstate
-     3500,                      // spawnhealth
-     S_SOR2_WALK1,              // seestate
-     sfx_sorsit,                // seesound
-     8,                         // reactiontime
-     sfx_soratk,                // attacksound
-     S_SOR2_PAIN1,              // painstate
-     32,                        // painchance
-     sfx_sorpai,                // painsound
-     0,                         // meleestate
-     S_SOR2_ATK1,               // missilestate
-     S_NULL,                    // crashstate
-     S_SOR2_DIE1,               // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     14,                        // speed
-     16 * FRACUNIT,             // radius
-     70 * FRACUNIT,             // height
-     300,                       // mass
-     0,                         // damage
-     sfx_soract,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF,       // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ | MF2_BOSS     // flags2
-     },
-
-    {                           // MT_SOR2FX1
-     -1,                        // doomednum
-     S_SOR2FX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SOR2FXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     20 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SOR2FXSPARK
-     -1,                        // doomednum
-     S_SOR2FXSPARK1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
-     },
-
-    {                           // MT_SOR2FX2
-     -1,                        // doomednum
-     S_SOR2FX2_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SOR2FXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     6 * FRACUNIT,              // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     10,                        // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SOR2TELEFADE
-     -1,                        // doomednum
-     S_SOR2TELEFADE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MINOTAUR
-     9,                         // doomednum
-     S_MNTR_LOOK1,              // spawnstate
-     3000,                      // spawnhealth
-     S_MNTR_WALK1,              // seestate
-     sfx_minsit,                // seesound
-     8,                         // reactiontime
-     sfx_minat1,                // attacksound
-     S_MNTR_PAIN1,              // painstate
-     25,                        // painchance
-     sfx_minpai,                // painsound
-     S_MNTR_ATK1_1,             // meleestate
-     S_MNTR_ATK2_1,             // missilestate
-     S_NULL,                    // crashstate
-     S_MNTR_DIE1,               // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_mindth,                // deathsound
-     16,                        // speed
-     28 * FRACUNIT,             // radius
-     100 * FRACUNIT,            // height
-     800,                       // mass
-     7,                         // damage
-     sfx_minact,                // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF,       // flags
-     MF2_FOOTCLIP | MF2_PASSMOBJ | MF2_BOSS     // flags2
-     },
-
-    {                           // MT_MNTRFX1
-     -1,                        // doomednum
-     S_MNTRFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MNTRFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     20 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_MNTRFX2
-     -1,                        // doomednum
-     S_MNTRFX2_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MNTRFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_phohit,                // deathsound
-     14 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_MNTRFX3
-     -1,                        // doomednum
-     S_MNTRFX3_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MNTRFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_phohit,                // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_AKYY
-     73,                        // doomednum
-     S_AKYY1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_NOTDMATCH, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BKYY
-     79,                        // doomednum
-     S_BKYY1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_NOTDMATCH, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CKEY
-     80,                        // doomednum
-     S_CKYY1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL | MF_NOTDMATCH, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMGWNDWIMPY
-     10,                        // doomednum
-     S_AMG1,                    // spawnstate
-     AMMO_GWND_WIMPY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMGWNDHEFTY
-     12,                        // doomednum
-     S_AMG2_1,                  // spawnstate
-     AMMO_GWND_HEFTY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMMACEWIMPY
-     13,                        // doomednum
-     S_AMM1,                    // spawnstate
-     AMMO_MACE_WIMPY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMMACEHEFTY
-     16,                        // doomednum
-     S_AMM2,                    // spawnstate
-     AMMO_MACE_HEFTY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMCBOWWIMPY
-     18,                        // doomednum
-     S_AMC1,                    // spawnstate
-     AMMO_CBOW_WIMPY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMCBOWHEFTY
-     19,                        // doomednum
-     S_AMC2_1,                  // spawnstate
-     AMMO_CBOW_HEFTY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMSKRDWIMPY
-     20,                        // doomednum
-     S_AMS1_1,                  // spawnstate
-     AMMO_SKRD_WIMPY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMSKRDHEFTY
-     21,                        // doomednum
-     S_AMS2_1,                  // spawnstate
-     AMMO_SKRD_HEFTY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMPHRDWIMPY
-     22,                        // doomednum
-     S_AMP1_1,                  // spawnstate
-     AMMO_PHRD_WIMPY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMPHRDHEFTY
-     23,                        // doomednum
-     S_AMP2_1,                  // spawnstate
-     AMMO_PHRD_HEFTY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMBLSRWIMPY
-     54,                        // doomednum
-     S_AMB1_1,                  // spawnstate
-     AMMO_BLSR_WIMPY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AMBLSRHEFTY
-     55,                        // doomednum
-     S_AMB2_1,                  // spawnstate
-     AMMO_BLSR_HEFTY,           // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SOUNDWIND
-     42,                        // doomednum
-     S_SND_WIND,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SOUNDWATERFALL
-     41,                        // doomednum
-     S_SND_WATERFALL,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     sfx_None,                  // seesound
-     8,                         // reactiontime
-     sfx_None,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     sfx_None,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     sfx_None,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     sfx_None,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     }
-};
diff --git a/games/NXDoom/src/heretic/info.h b/games/NXDoom/src/heretic/info.h
deleted file mode 100644
index 2247b658a..000000000
--- a/games/NXDoom/src/heretic/info.h
+++ /dev/null
@@ -1,1584 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef HERETIC_INFO_H
-#define HERETIC_INFO_H
-
-typedef enum
-{
-    SPR_IMPX,
-    SPR_ACLO,
-    SPR_PTN1,
-    SPR_SHLD,
-    SPR_SHD2,
-    SPR_BAGH,
-    SPR_SPMP,
-    SPR_INVS,
-    SPR_PTN2,
-    SPR_SOAR,
-    SPR_INVU,
-    SPR_PWBK,
-    SPR_EGGC,
-    SPR_EGGM,
-    SPR_FX01,
-    SPR_SPHL,
-    SPR_TRCH,
-    SPR_FBMB,
-    SPR_XPL1,
-    SPR_ATLP,
-    SPR_PPOD,
-    SPR_AMG1,
-    SPR_SPSH,
-    SPR_LVAS,
-    SPR_SLDG,
-    SPR_SKH1,
-    SPR_SKH2,
-    SPR_SKH3,
-    SPR_SKH4,
-    SPR_CHDL,
-    SPR_SRTC,
-    SPR_SMPL,
-    SPR_STGS,
-    SPR_STGL,
-    SPR_STCS,
-    SPR_STCL,
-    SPR_KFR1,
-    SPR_BARL,
-    SPR_BRPL,
-    SPR_MOS1,
-    SPR_MOS2,
-    SPR_WTRH,
-    SPR_HCOR,
-    SPR_KGZ1,
-    SPR_KGZB,
-    SPR_KGZG,
-    SPR_KGZY,
-    SPR_VLCO,
-    SPR_VFBL,
-    SPR_VTFB,
-    SPR_SFFI,
-    SPR_TGLT,
-    SPR_TELE,
-    SPR_STFF,
-    SPR_PUF3,
-    SPR_PUF4,
-    SPR_BEAK,
-    SPR_WGNT,
-    SPR_GAUN,
-    SPR_PUF1,
-    SPR_WBLS,
-    SPR_BLSR,
-    SPR_FX18,
-    SPR_FX17,
-    SPR_WMCE,
-    SPR_MACE,
-    SPR_FX02,
-    SPR_WSKL,
-    SPR_HROD,
-    SPR_FX00,
-    SPR_FX20,
-    SPR_FX21,
-    SPR_FX22,
-    SPR_FX23,
-    SPR_GWND,
-    SPR_PUF2,
-    SPR_WPHX,
-    SPR_PHNX,
-    SPR_FX04,
-    SPR_FX08,
-    SPR_FX09,
-    SPR_WBOW,
-    SPR_CRBW,
-    SPR_FX03,
-    SPR_BLOD,
-    SPR_PLAY,
-    SPR_FDTH,
-    SPR_BSKL,
-    SPR_CHKN,
-    SPR_MUMM,
-    SPR_FX15,
-    SPR_BEAS,
-    SPR_FRB1,
-    SPR_SNKE,
-    SPR_SNFX,
-    SPR_HEAD,
-    SPR_FX05,
-    SPR_FX06,
-    SPR_FX07,
-    SPR_CLNK,
-    SPR_WZRD,
-    SPR_FX11,
-    SPR_FX10,
-    SPR_KNIG,
-    SPR_SPAX,
-    SPR_RAXE,
-    SPR_SRCR,
-    SPR_FX14,
-    SPR_SOR2,
-    SPR_SDTH,
-    SPR_FX16,
-    SPR_MNTR,
-    SPR_FX12,
-    SPR_FX13,
-    SPR_AKYY,
-    SPR_BKYY,
-    SPR_CKYY,
-    SPR_AMG2,
-    SPR_AMM1,
-    SPR_AMM2,
-    SPR_AMC1,
-    SPR_AMC2,
-    SPR_AMS1,
-    SPR_AMS2,
-    SPR_AMP1,
-    SPR_AMP2,
-    SPR_AMB1,
-    SPR_AMB2,
-    NUMSPRITES
-} spritenum_t;
-
-typedef enum
-{
-    S_NULL,
-    S_FREETARGMOBJ,
-    S_ITEM_PTN1_1,
-    S_ITEM_PTN1_2,
-    S_ITEM_PTN1_3,
-    S_ITEM_SHLD1,
-    S_ITEM_SHD2_1,
-    S_ITEM_BAGH1,
-    S_ITEM_SPMP1,
-    S_HIDESPECIAL1,
-    S_HIDESPECIAL2,
-    S_HIDESPECIAL3,
-    S_HIDESPECIAL4,
-    S_HIDESPECIAL5,
-    S_HIDESPECIAL6,
-    S_HIDESPECIAL7,
-    S_HIDESPECIAL8,
-    S_HIDESPECIAL9,
-    S_HIDESPECIAL10,
-    S_HIDESPECIAL11,
-    S_DORMANTARTI1,
-    S_DORMANTARTI2,
-    S_DORMANTARTI3,
-    S_DORMANTARTI4,
-    S_DORMANTARTI5,
-    S_DORMANTARTI6,
-    S_DORMANTARTI7,
-    S_DORMANTARTI8,
-    S_DORMANTARTI9,
-    S_DORMANTARTI10,
-    S_DORMANTARTI11,
-    S_DORMANTARTI12,
-    S_DORMANTARTI13,
-    S_DORMANTARTI14,
-    S_DORMANTARTI15,
-    S_DORMANTARTI16,
-    S_DORMANTARTI17,
-    S_DORMANTARTI18,
-    S_DORMANTARTI19,
-    S_DORMANTARTI20,
-    S_DORMANTARTI21,
-    S_DEADARTI1,
-    S_DEADARTI2,
-    S_DEADARTI3,
-    S_DEADARTI4,
-    S_DEADARTI5,
-    S_DEADARTI6,
-    S_DEADARTI7,
-    S_DEADARTI8,
-    S_DEADARTI9,
-    S_DEADARTI10,
-    S_ARTI_INVS1,
-    S_ARTI_PTN2_1,
-    S_ARTI_PTN2_2,
-    S_ARTI_PTN2_3,
-    S_ARTI_SOAR1,
-    S_ARTI_SOAR2,
-    S_ARTI_SOAR3,
-    S_ARTI_SOAR4,
-    S_ARTI_INVU1,
-    S_ARTI_INVU2,
-    S_ARTI_INVU3,
-    S_ARTI_INVU4,
-    S_ARTI_PWBK1,
-    S_ARTI_EGGC1,
-    S_ARTI_EGGC2,
-    S_ARTI_EGGC3,
-    S_ARTI_EGGC4,
-    S_EGGFX1,
-    S_EGGFX2,
-    S_EGGFX3,
-    S_EGGFX4,
-    S_EGGFX5,
-    S_EGGFXI1_1,
-    S_EGGFXI1_2,
-    S_EGGFXI1_3,
-    S_EGGFXI1_4,
-    S_ARTI_SPHL1,
-    S_ARTI_TRCH1,
-    S_ARTI_TRCH2,
-    S_ARTI_TRCH3,
-    S_ARTI_FBMB1,
-    S_FIREBOMB1,
-    S_FIREBOMB2,
-    S_FIREBOMB3,
-    S_FIREBOMB4,
-    S_FIREBOMB5,
-    S_FIREBOMB6,
-    S_FIREBOMB7,
-    S_FIREBOMB8,
-    S_FIREBOMB9,
-    S_FIREBOMB10,
-    S_FIREBOMB11,
-    S_ARTI_ATLP1,
-    S_ARTI_ATLP2,
-    S_ARTI_ATLP3,
-    S_ARTI_ATLP4,
-    S_POD_WAIT1,
-    S_POD_PAIN1,
-    S_POD_DIE1,
-    S_POD_DIE2,
-    S_POD_DIE3,
-    S_POD_DIE4,
-    S_POD_GROW1,
-    S_POD_GROW2,
-    S_POD_GROW3,
-    S_POD_GROW4,
-    S_POD_GROW5,
-    S_POD_GROW6,
-    S_POD_GROW7,
-    S_POD_GROW8,
-    S_PODGOO1,
-    S_PODGOO2,
-    S_PODGOOX,
-    S_PODGENERATOR,
-    S_SPLASH1,
-    S_SPLASH2,
-    S_SPLASH3,
-    S_SPLASH4,
-    S_SPLASHX,
-    S_SPLASHBASE1,
-    S_SPLASHBASE2,
-    S_SPLASHBASE3,
-    S_SPLASHBASE4,
-    S_SPLASHBASE5,
-    S_SPLASHBASE6,
-    S_SPLASHBASE7,
-    S_LAVASPLASH1,
-    S_LAVASPLASH2,
-    S_LAVASPLASH3,
-    S_LAVASPLASH4,
-    S_LAVASPLASH5,
-    S_LAVASPLASH6,
-    S_LAVASMOKE1,
-    S_LAVASMOKE2,
-    S_LAVASMOKE3,
-    S_LAVASMOKE4,
-    S_LAVASMOKE5,
-    S_SLUDGECHUNK1,
-    S_SLUDGECHUNK2,
-    S_SLUDGECHUNK3,
-    S_SLUDGECHUNK4,
-    S_SLUDGECHUNKX,
-    S_SLUDGESPLASH1,
-    S_SLUDGESPLASH2,
-    S_SLUDGESPLASH3,
-    S_SLUDGESPLASH4,
-    S_SKULLHANG70_1,
-    S_SKULLHANG60_1,
-    S_SKULLHANG45_1,
-    S_SKULLHANG35_1,
-    S_CHANDELIER1,
-    S_CHANDELIER2,
-    S_CHANDELIER3,
-    S_SERPTORCH1,
-    S_SERPTORCH2,
-    S_SERPTORCH3,
-    S_SMALLPILLAR,
-    S_STALAGMITESMALL,
-    S_STALAGMITELARGE,
-    S_STALACTITESMALL,
-    S_STALACTITELARGE,
-    S_FIREBRAZIER1,
-    S_FIREBRAZIER2,
-    S_FIREBRAZIER3,
-    S_FIREBRAZIER4,
-    S_FIREBRAZIER5,
-    S_FIREBRAZIER6,
-    S_FIREBRAZIER7,
-    S_FIREBRAZIER8,
-    S_BARREL,
-    S_BRPILLAR,
-    S_MOSS1,
-    S_MOSS2,
-    S_WALLTORCH1,
-    S_WALLTORCH2,
-    S_WALLTORCH3,
-    S_HANGINGCORPSE,
-    S_KEYGIZMO1,
-    S_KEYGIZMO2,
-    S_KEYGIZMO3,
-    S_KGZ_START,
-    S_KGZ_BLUEFLOAT1,
-    S_KGZ_GREENFLOAT1,
-    S_KGZ_YELLOWFLOAT1,
-    S_VOLCANO1,
-    S_VOLCANO2,
-    S_VOLCANO3,
-    S_VOLCANO4,
-    S_VOLCANO5,
-    S_VOLCANO6,
-    S_VOLCANO7,
-    S_VOLCANO8,
-    S_VOLCANO9,
-    S_VOLCANOBALL1,
-    S_VOLCANOBALL2,
-    S_VOLCANOBALLX1,
-    S_VOLCANOBALLX2,
-    S_VOLCANOBALLX3,
-    S_VOLCANOBALLX4,
-    S_VOLCANOBALLX5,
-    S_VOLCANOBALLX6,
-    S_VOLCANOTBALL1,
-    S_VOLCANOTBALL2,
-    S_VOLCANOTBALLX1,
-    S_VOLCANOTBALLX2,
-    S_VOLCANOTBALLX3,
-    S_VOLCANOTBALLX4,
-    S_VOLCANOTBALLX5,
-    S_VOLCANOTBALLX6,
-    S_VOLCANOTBALLX7,
-    S_TELEGLITGEN1,
-    S_TELEGLITGEN2,
-    S_TELEGLITTER1_1,
-    S_TELEGLITTER1_2,
-    S_TELEGLITTER1_3,
-    S_TELEGLITTER1_4,
-    S_TELEGLITTER1_5,
-    S_TELEGLITTER2_1,
-    S_TELEGLITTER2_2,
-    S_TELEGLITTER2_3,
-    S_TELEGLITTER2_4,
-    S_TELEGLITTER2_5,
-    S_TFOG1,
-    S_TFOG2,
-    S_TFOG3,
-    S_TFOG4,
-    S_TFOG5,
-    S_TFOG6,
-    S_TFOG7,
-    S_TFOG8,
-    S_TFOG9,
-    S_TFOG10,
-    S_TFOG11,
-    S_TFOG12,
-    S_TFOG13,
-    S_LIGHTDONE,
-    S_STAFFREADY,
-    S_STAFFDOWN,
-    S_STAFFUP,
-    S_STAFFREADY2_1,
-    S_STAFFREADY2_2,
-    S_STAFFREADY2_3,
-    S_STAFFDOWN2,
-    S_STAFFUP2,
-    S_STAFFATK1_1,
-    S_STAFFATK1_2,
-    S_STAFFATK1_3,
-    S_STAFFATK2_1,
-    S_STAFFATK2_2,
-    S_STAFFATK2_3,
-    S_STAFFPUFF1,
-    S_STAFFPUFF2,
-    S_STAFFPUFF3,
-    S_STAFFPUFF4,
-    S_STAFFPUFF2_1,
-    S_STAFFPUFF2_2,
-    S_STAFFPUFF2_3,
-    S_STAFFPUFF2_4,
-    S_STAFFPUFF2_5,
-    S_STAFFPUFF2_6,
-    S_BEAKREADY,
-    S_BEAKDOWN,
-    S_BEAKUP,
-    S_BEAKATK1_1,
-    S_BEAKATK2_1,
-    S_WGNT,
-    S_GAUNTLETREADY,
-    S_GAUNTLETDOWN,
-    S_GAUNTLETUP,
-    S_GAUNTLETREADY2_1,
-    S_GAUNTLETREADY2_2,
-    S_GAUNTLETREADY2_3,
-    S_GAUNTLETDOWN2,
-    S_GAUNTLETUP2,
-    S_GAUNTLETATK1_1,
-    S_GAUNTLETATK1_2,
-    S_GAUNTLETATK1_3,
-    S_GAUNTLETATK1_4,
-    S_GAUNTLETATK1_5,
-    S_GAUNTLETATK1_6,
-    S_GAUNTLETATK1_7,
-    S_GAUNTLETATK2_1,
-    S_GAUNTLETATK2_2,
-    S_GAUNTLETATK2_3,
-    S_GAUNTLETATK2_4,
-    S_GAUNTLETATK2_5,
-    S_GAUNTLETATK2_6,
-    S_GAUNTLETATK2_7,
-    S_GAUNTLETPUFF1_1,
-    S_GAUNTLETPUFF1_2,
-    S_GAUNTLETPUFF1_3,
-    S_GAUNTLETPUFF1_4,
-    S_GAUNTLETPUFF2_1,
-    S_GAUNTLETPUFF2_2,
-    S_GAUNTLETPUFF2_3,
-    S_GAUNTLETPUFF2_4,
-    S_BLSR,
-    S_BLASTERREADY,
-    S_BLASTERDOWN,
-    S_BLASTERUP,
-    S_BLASTERATK1_1,
-    S_BLASTERATK1_2,
-    S_BLASTERATK1_3,
-    S_BLASTERATK1_4,
-    S_BLASTERATK1_5,
-    S_BLASTERATK1_6,
-    S_BLASTERATK2_1,
-    S_BLASTERATK2_2,
-    S_BLASTERATK2_3,
-    S_BLASTERATK2_4,
-    S_BLASTERATK2_5,
-    S_BLASTERATK2_6,
-    S_BLASTERFX1_1,
-    S_BLASTERFXI1_1,
-    S_BLASTERFXI1_2,
-    S_BLASTERFXI1_3,
-    S_BLASTERFXI1_4,
-    S_BLASTERFXI1_5,
-    S_BLASTERFXI1_6,
-    S_BLASTERFXI1_7,
-    S_BLASTERSMOKE1,
-    S_BLASTERSMOKE2,
-    S_BLASTERSMOKE3,
-    S_BLASTERSMOKE4,
-    S_BLASTERSMOKE5,
-    S_RIPPER1,
-    S_RIPPER2,
-    S_RIPPERX1,
-    S_RIPPERX2,
-    S_RIPPERX3,
-    S_RIPPERX4,
-    S_RIPPERX5,
-    S_BLASTERPUFF1_1,
-    S_BLASTERPUFF1_2,
-    S_BLASTERPUFF1_3,
-    S_BLASTERPUFF1_4,
-    S_BLASTERPUFF1_5,
-    S_BLASTERPUFF2_1,
-    S_BLASTERPUFF2_2,
-    S_BLASTERPUFF2_3,
-    S_BLASTERPUFF2_4,
-    S_BLASTERPUFF2_5,
-    S_BLASTERPUFF2_6,
-    S_BLASTERPUFF2_7,
-    S_WMCE,
-    S_MACEREADY,
-    S_MACEDOWN,
-    S_MACEUP,
-    S_MACEATK1_1,
-    S_MACEATK1_2,
-    S_MACEATK1_3,
-    S_MACEATK1_4,
-    S_MACEATK1_5,
-    S_MACEATK1_6,
-    S_MACEATK1_7,
-    S_MACEATK1_8,
-    S_MACEATK1_9,
-    S_MACEATK1_10,
-    S_MACEATK2_1,
-    S_MACEATK2_2,
-    S_MACEATK2_3,
-    S_MACEATK2_4,
-    S_MACEFX1_1,
-    S_MACEFX1_2,
-    S_MACEFXI1_1,
-    S_MACEFXI1_2,
-    S_MACEFXI1_3,
-    S_MACEFXI1_4,
-    S_MACEFXI1_5,
-    S_MACEFX2_1,
-    S_MACEFX2_2,
-    S_MACEFXI2_1,
-    S_MACEFX3_1,
-    S_MACEFX3_2,
-    S_MACEFX4_1,
-    S_MACEFXI4_1,
-    S_WSKL,
-    S_HORNRODREADY,
-    S_HORNRODDOWN,
-    S_HORNRODUP,
-    S_HORNRODATK1_1,
-    S_HORNRODATK1_2,
-    S_HORNRODATK1_3,
-    S_HORNRODATK2_1,
-    S_HORNRODATK2_2,
-    S_HORNRODATK2_3,
-    S_HORNRODATK2_4,
-    S_HORNRODATK2_5,
-    S_HORNRODATK2_6,
-    S_HORNRODATK2_7,
-    S_HORNRODATK2_8,
-    S_HORNRODATK2_9,
-    S_HRODFX1_1,
-    S_HRODFX1_2,
-    S_HRODFXI1_1,
-    S_HRODFXI1_2,
-    S_HRODFXI1_3,
-    S_HRODFXI1_4,
-    S_HRODFXI1_5,
-    S_HRODFXI1_6,
-    S_HRODFX2_1,
-    S_HRODFX2_2,
-    S_HRODFX2_3,
-    S_HRODFX2_4,
-    S_HRODFXI2_1,
-    S_HRODFXI2_2,
-    S_HRODFXI2_3,
-    S_HRODFXI2_4,
-    S_HRODFXI2_5,
-    S_HRODFXI2_6,
-    S_HRODFXI2_7,
-    S_HRODFXI2_8,
-    S_RAINPLR1_1,
-    S_RAINPLR2_1,
-    S_RAINPLR3_1,
-    S_RAINPLR4_1,
-    S_RAINPLR1X_1,
-    S_RAINPLR1X_2,
-    S_RAINPLR1X_3,
-    S_RAINPLR1X_4,
-    S_RAINPLR1X_5,
-    S_RAINPLR2X_1,
-    S_RAINPLR2X_2,
-    S_RAINPLR2X_3,
-    S_RAINPLR2X_4,
-    S_RAINPLR2X_5,
-    S_RAINPLR3X_1,
-    S_RAINPLR3X_2,
-    S_RAINPLR3X_3,
-    S_RAINPLR3X_4,
-    S_RAINPLR3X_5,
-    S_RAINPLR4X_1,
-    S_RAINPLR4X_2,
-    S_RAINPLR4X_3,
-    S_RAINPLR4X_4,
-    S_RAINPLR4X_5,
-    S_RAINAIRXPLR1_1,
-    S_RAINAIRXPLR2_1,
-    S_RAINAIRXPLR3_1,
-    S_RAINAIRXPLR4_1,
-    S_RAINAIRXPLR1_2,
-    S_RAINAIRXPLR2_2,
-    S_RAINAIRXPLR3_2,
-    S_RAINAIRXPLR4_2,
-    S_RAINAIRXPLR1_3,
-    S_RAINAIRXPLR2_3,
-    S_RAINAIRXPLR3_3,
-    S_RAINAIRXPLR4_3,
-    S_GOLDWANDREADY,
-    S_GOLDWANDDOWN,
-    S_GOLDWANDUP,
-    S_GOLDWANDATK1_1,
-    S_GOLDWANDATK1_2,
-    S_GOLDWANDATK1_3,
-    S_GOLDWANDATK1_4,
-    S_GOLDWANDATK2_1,
-    S_GOLDWANDATK2_2,
-    S_GOLDWANDATK2_3,
-    S_GOLDWANDATK2_4,
-    S_GWANDFX1_1,
-    S_GWANDFX1_2,
-    S_GWANDFXI1_1,
-    S_GWANDFXI1_2,
-    S_GWANDFXI1_3,
-    S_GWANDFXI1_4,
-    S_GWANDFX2_1,
-    S_GWANDFX2_2,
-    S_GWANDPUFF1_1,
-    S_GWANDPUFF1_2,
-    S_GWANDPUFF1_3,
-    S_GWANDPUFF1_4,
-    S_GWANDPUFF1_5,
-    S_WPHX,
-    S_PHOENIXREADY,
-    S_PHOENIXDOWN,
-    S_PHOENIXUP,
-    S_PHOENIXATK1_1,
-    S_PHOENIXATK1_2,
-    S_PHOENIXATK1_3,
-    S_PHOENIXATK1_4,
-    S_PHOENIXATK1_5,
-    S_PHOENIXATK2_1,
-    S_PHOENIXATK2_2,
-    S_PHOENIXATK2_3,
-    S_PHOENIXATK2_4,
-    S_PHOENIXFX1_1,
-    S_PHOENIXFXI1_1,
-    S_PHOENIXFXI1_2,
-    S_PHOENIXFXI1_3,
-    S_PHOENIXFXI1_4,
-    S_PHOENIXFXI1_5,
-    S_PHOENIXFXI1_6,
-    S_PHOENIXFXI1_7,
-    S_PHOENIXFXI1_8,
-    S_PHOENIXFXIX_1,      // [ States in Heretic 1.0 that were removed
-    S_PHOENIXFXIX_2,
-    S_PHOENIXFXIX_3,      // ]
-    S_PHOENIXPUFF1,
-    S_PHOENIXPUFF2,
-    S_PHOENIXPUFF3,
-    S_PHOENIXPUFF4,
-    S_PHOENIXPUFF5,
-    S_PHOENIXFX2_1,
-    S_PHOENIXFX2_2,
-    S_PHOENIXFX2_3,
-    S_PHOENIXFX2_4,
-    S_PHOENIXFX2_5,
-    S_PHOENIXFX2_6,
-    S_PHOENIXFX2_7,
-    S_PHOENIXFX2_8,
-    S_PHOENIXFX2_9,
-    S_PHOENIXFX2_10,
-    S_PHOENIXFXI2_1,
-    S_PHOENIXFXI2_2,
-    S_PHOENIXFXI2_3,
-    S_PHOENIXFXI2_4,
-    S_PHOENIXFXI2_5,
-    S_WBOW,
-    S_CRBOW1,
-    S_CRBOW2,
-    S_CRBOW3,
-    S_CRBOW4,
-    S_CRBOW5,
-    S_CRBOW6,
-    S_CRBOW7,
-    S_CRBOW8,
-    S_CRBOW9,
-    S_CRBOW10,
-    S_CRBOW11,
-    S_CRBOW12,
-    S_CRBOW13,
-    S_CRBOW14,
-    S_CRBOW15,
-    S_CRBOW16,
-    S_CRBOW17,
-    S_CRBOW18,
-    S_CRBOWDOWN,
-    S_CRBOWUP,
-    S_CRBOWATK1_1,
-    S_CRBOWATK1_2,
-    S_CRBOWATK1_3,
-    S_CRBOWATK1_4,
-    S_CRBOWATK1_5,
-    S_CRBOWATK1_6,
-    S_CRBOWATK1_7,
-    S_CRBOWATK1_8,
-    S_CRBOWATK2_1,
-    S_CRBOWATK2_2,
-    S_CRBOWATK2_3,
-    S_CRBOWATK2_4,
-    S_CRBOWATK2_5,
-    S_CRBOWATK2_6,
-    S_CRBOWATK2_7,
-    S_CRBOWATK2_8,
-    S_CRBOWFX1,
-    S_CRBOWFXI1_1,
-    S_CRBOWFXI1_2,
-    S_CRBOWFXI1_3,
-    S_CRBOWFX2,
-    S_CRBOWFX3,
-    S_CRBOWFXI3_1,
-    S_CRBOWFXI3_2,
-    S_CRBOWFXI3_3,
-    S_CRBOWFX4_1,
-    S_CRBOWFX4_2,
-    S_BLOOD1,
-    S_BLOOD2,
-    S_BLOOD3,
-    S_BLOODSPLATTER1,
-    S_BLOODSPLATTER2,
-    S_BLOODSPLATTER3,
-    S_BLOODSPLATTERX,
-    S_PLAY,
-    S_PLAY_RUN1,
-    S_PLAY_RUN2,
-    S_PLAY_RUN3,
-    S_PLAY_RUN4,
-    S_PLAY_ATK1,
-    S_PLAY_ATK2,
-    S_PLAY_PAIN,
-    S_PLAY_PAIN2,
-    S_PLAY_DIE1,
-    S_PLAY_DIE2,
-    S_PLAY_DIE3,
-    S_PLAY_DIE4,
-    S_PLAY_DIE5,
-    S_PLAY_DIE6,
-    S_PLAY_DIE7,
-    S_PLAY_DIE8,
-    S_PLAY_DIE9,
-    S_PLAY_XDIE1,
-    S_PLAY_XDIE2,
-    S_PLAY_XDIE3,
-    S_PLAY_XDIE4,
-    S_PLAY_XDIE5,
-    S_PLAY_XDIE6,
-    S_PLAY_XDIE7,
-    S_PLAY_XDIE8,
-    S_PLAY_XDIE9,
-    S_PLAY_FDTH1,
-    S_PLAY_FDTH2,
-    S_PLAY_FDTH3,
-    S_PLAY_FDTH4,
-    S_PLAY_FDTH5,
-    S_PLAY_FDTH6,
-    S_PLAY_FDTH7,
-    S_PLAY_FDTH8,
-    S_PLAY_FDTH9,
-    S_PLAY_FDTH10,
-    S_PLAY_FDTH11,
-    S_PLAY_FDTH12,
-    S_PLAY_FDTH13,
-    S_PLAY_FDTH14,
-    S_PLAY_FDTH15,
-    S_PLAY_FDTH16,
-    S_PLAY_FDTH17,
-    S_PLAY_FDTH18,
-    S_PLAY_FDTH19,    // < These two frames were not present in the Heretic
-    S_PLAY_FDTH20,    // < 1.0 executable (fire death animation was extended)
-    S_BLOODYSKULL1,
-    S_BLOODYSKULL2,
-    S_BLOODYSKULL3,
-    S_BLOODYSKULL4,
-    S_BLOODYSKULL5,
-    S_BLOODYSKULLX1,
-    S_BLOODYSKULLX2,
-    S_CHICPLAY,
-    S_CHICPLAY_RUN1,
-    S_CHICPLAY_RUN2,
-    S_CHICPLAY_RUN3,
-    S_CHICPLAY_RUN4,
-    S_CHICPLAY_ATK1,
-    S_CHICPLAY_PAIN,
-    S_CHICPLAY_PAIN2,
-    S_CHICKEN_LOOK1,
-    S_CHICKEN_LOOK2,
-    S_CHICKEN_WALK1,
-    S_CHICKEN_WALK2,
-    S_CHICKEN_PAIN1,
-    S_CHICKEN_PAIN2,
-    S_CHICKEN_ATK1,
-    S_CHICKEN_ATK2,
-    S_CHICKEN_DIE1,
-    S_CHICKEN_DIE2,
-    S_CHICKEN_DIE3,
-    S_CHICKEN_DIE4,
-    S_CHICKEN_DIE5,
-    S_CHICKEN_DIE6,
-    S_CHICKEN_DIE7,
-    S_CHICKEN_DIE8,
-    S_FEATHER1,
-    S_FEATHER2,
-    S_FEATHER3,
-    S_FEATHER4,
-    S_FEATHER5,
-    S_FEATHER6,
-    S_FEATHER7,
-    S_FEATHER8,
-    S_FEATHERX,
-    S_MUMMY_LOOK1,
-    S_MUMMY_LOOK2,
-    S_MUMMY_WALK1,
-    S_MUMMY_WALK2,
-    S_MUMMY_WALK3,
-    S_MUMMY_WALK4,
-    S_MUMMY_ATK1,
-    S_MUMMY_ATK2,
-    S_MUMMY_ATK3,
-    S_MUMMYL_ATK1,
-    S_MUMMYL_ATK2,
-    S_MUMMYL_ATK3,
-    S_MUMMYL_ATK4,
-    S_MUMMYL_ATK5,
-    S_MUMMYL_ATK6,
-    S_MUMMY_PAIN1,
-    S_MUMMY_PAIN2,
-    S_MUMMY_DIE1,
-    S_MUMMY_DIE2,
-    S_MUMMY_DIE3,
-    S_MUMMY_DIE4,
-    S_MUMMY_DIE5,
-    S_MUMMY_DIE6,
-    S_MUMMY_DIE7,
-    S_MUMMY_DIE8,
-    S_MUMMY_SOUL1,
-    S_MUMMY_SOUL2,
-    S_MUMMY_SOUL3,
-    S_MUMMY_SOUL4,
-    S_MUMMY_SOUL5,
-    S_MUMMY_SOUL6,
-    S_MUMMY_SOUL7,
-    S_MUMMYFX1_1,
-    S_MUMMYFX1_2,
-    S_MUMMYFX1_3,
-    S_MUMMYFX1_4,
-    S_MUMMYFXI1_1,
-    S_MUMMYFXI1_2,
-    S_MUMMYFXI1_3,
-    S_MUMMYFXI1_4,
-    S_BEAST_LOOK1,
-    S_BEAST_LOOK2,
-    S_BEAST_WALK1,
-    S_BEAST_WALK2,
-    S_BEAST_WALK3,
-    S_BEAST_WALK4,
-    S_BEAST_WALK5,
-    S_BEAST_WALK6,
-    S_BEAST_ATK1,
-    S_BEAST_ATK2,
-    S_BEAST_PAIN1,
-    S_BEAST_PAIN2,
-    S_BEAST_DIE1,
-    S_BEAST_DIE2,
-    S_BEAST_DIE3,
-    S_BEAST_DIE4,
-    S_BEAST_DIE5,
-    S_BEAST_DIE6,
-    S_BEAST_DIE7,
-    S_BEAST_DIE8,
-    S_BEAST_DIE9,
-    S_BEAST_XDIE1,
-    S_BEAST_XDIE2,
-    S_BEAST_XDIE3,
-    S_BEAST_XDIE4,
-    S_BEAST_XDIE5,
-    S_BEAST_XDIE6,
-    S_BEAST_XDIE7,
-    S_BEAST_XDIE8,
-    S_BEASTBALL1,
-    S_BEASTBALL2,
-    S_BEASTBALL3,
-    S_BEASTBALL4,
-    S_BEASTBALL5,
-    S_BEASTBALL6,
-    S_BEASTBALLX1,
-    S_BEASTBALLX2,
-    S_BEASTBALLX3,
-    S_BEASTBALLX4,
-    S_BEASTBALLX5,
-    S_BURNBALL1,
-    S_BURNBALL2,
-    S_BURNBALL3,
-    S_BURNBALL4,
-    S_BURNBALL5,
-    S_BURNBALL6,
-    S_BURNBALL7,
-    S_BURNBALL8,
-    S_BURNBALLFB1,
-    S_BURNBALLFB2,
-    S_BURNBALLFB3,
-    S_BURNBALLFB4,
-    S_BURNBALLFB5,
-    S_BURNBALLFB6,
-    S_BURNBALLFB7,
-    S_BURNBALLFB8,
-    S_PUFFY1,
-    S_PUFFY2,
-    S_PUFFY3,
-    S_PUFFY4,
-    S_PUFFY5,
-    S_SNAKE_LOOK1,
-    S_SNAKE_LOOK2,
-    S_SNAKE_WALK1,
-    S_SNAKE_WALK2,
-    S_SNAKE_WALK3,
-    S_SNAKE_WALK4,
-    S_SNAKE_ATK1,
-    S_SNAKE_ATK2,
-    S_SNAKE_ATK3,
-    S_SNAKE_ATK4,
-    S_SNAKE_ATK5,
-    S_SNAKE_ATK6,
-    S_SNAKE_ATK7,
-    S_SNAKE_ATK8,
-    S_SNAKE_ATK9,
-    S_SNAKE_PAIN1,
-    S_SNAKE_PAIN2,
-    S_SNAKE_DIE1,
-    S_SNAKE_DIE2,
-    S_SNAKE_DIE3,
-    S_SNAKE_DIE4,
-    S_SNAKE_DIE5,
-    S_SNAKE_DIE6,
-    S_SNAKE_DIE7,
-    S_SNAKE_DIE8,
-    S_SNAKE_DIE9,
-    S_SNAKE_DIE10,
-    S_SNAKEPRO_A1,
-    S_SNAKEPRO_A2,
-    S_SNAKEPRO_A3,
-    S_SNAKEPRO_A4,
-    S_SNAKEPRO_AX1,
-    S_SNAKEPRO_AX2,
-    S_SNAKEPRO_AX3,
-    S_SNAKEPRO_AX4,
-    S_SNAKEPRO_AX5,
-    S_SNAKEPRO_B1,
-    S_SNAKEPRO_B2,
-    S_SNAKEPRO_BX1,
-    S_SNAKEPRO_BX2,
-    S_SNAKEPRO_BX3,
-    S_SNAKEPRO_BX4,
-    S_HEAD_LOOK,
-    S_HEAD_FLOAT,
-    S_HEAD_ATK1,
-    S_HEAD_ATK2,
-    S_HEAD_PAIN1,
-    S_HEAD_PAIN2,
-    S_HEAD_DIE1,
-    S_HEAD_DIE2,
-    S_HEAD_DIE3,
-    S_HEAD_DIE4,
-    S_HEAD_DIE5,
-    S_HEAD_DIE6,
-    S_HEAD_DIE7,
-    S_HEADFX1_1,
-    S_HEADFX1_2,
-    S_HEADFX1_3,
-    S_HEADFXI1_1,
-    S_HEADFXI1_2,
-    S_HEADFXI1_3,
-    S_HEADFXI1_4,
-    S_HEADFX2_1,
-    S_HEADFX2_2,
-    S_HEADFX2_3,
-    S_HEADFXI2_1,
-    S_HEADFXI2_2,
-    S_HEADFXI2_3,
-    S_HEADFXI2_4,
-    S_HEADFX3_1,
-    S_HEADFX3_2,
-    S_HEADFX3_3,
-    S_HEADFX3_4,
-    S_HEADFX3_5,
-    S_HEADFX3_6,
-    S_HEADFXI3_1,
-    S_HEADFXI3_2,
-    S_HEADFXI3_3,
-    S_HEADFXI3_4,
-    S_HEADFX4_1,
-    S_HEADFX4_2,
-    S_HEADFX4_3,
-    S_HEADFX4_4,
-    S_HEADFX4_5,
-    S_HEADFX4_6,
-    S_HEADFX4_7,
-    S_HEADFXI4_1,
-    S_HEADFXI4_2,
-    S_HEADFXI4_3,
-    S_HEADFXI4_4,
-    S_CLINK_LOOK1,
-    S_CLINK_LOOK2,
-    S_CLINK_WALK1,
-    S_CLINK_WALK2,
-    S_CLINK_WALK3,
-    S_CLINK_WALK4,
-    S_CLINK_ATK1,
-    S_CLINK_ATK2,
-    S_CLINK_ATK3,
-    S_CLINK_PAIN1,
-    S_CLINK_PAIN2,
-    S_CLINK_DIE1,
-    S_CLINK_DIE2,
-    S_CLINK_DIE3,
-    S_CLINK_DIE4,
-    S_CLINK_DIE5,
-    S_CLINK_DIE6,
-    S_CLINK_DIE7,
-    S_WIZARD_LOOK1,
-    S_WIZARD_LOOK2,
-    S_WIZARD_WALK1,
-    S_WIZARD_WALK2,
-    S_WIZARD_WALK3,
-    S_WIZARD_WALK4,
-    S_WIZARD_WALK5,
-    S_WIZARD_WALK6,
-    S_WIZARD_WALK7,
-    S_WIZARD_WALK8,
-    S_WIZARD_ATK1,
-    S_WIZARD_ATK2,
-    S_WIZARD_ATK3,
-    S_WIZARD_ATK4,
-    S_WIZARD_ATK5,
-    S_WIZARD_ATK6,
-    S_WIZARD_ATK7,
-    S_WIZARD_ATK8,
-    S_WIZARD_ATK9,
-    S_WIZARD_PAIN1,
-    S_WIZARD_PAIN2,
-    S_WIZARD_DIE1,
-    S_WIZARD_DIE2,
-    S_WIZARD_DIE3,
-    S_WIZARD_DIE4,
-    S_WIZARD_DIE5,
-    S_WIZARD_DIE6,
-    S_WIZARD_DIE7,
-    S_WIZARD_DIE8,
-    S_WIZFX1_1,
-    S_WIZFX1_2,
-    S_WIZFXI1_1,
-    S_WIZFXI1_2,
-    S_WIZFXI1_3,
-    S_WIZFXI1_4,
-    S_WIZFXI1_5,
-    S_IMP_LOOK1,
-    S_IMP_LOOK2,
-    S_IMP_LOOK3,
-    S_IMP_LOOK4,
-    S_IMP_FLY1,
-    S_IMP_FLY2,
-    S_IMP_FLY3,
-    S_IMP_FLY4,
-    S_IMP_FLY5,
-    S_IMP_FLY6,
-    S_IMP_FLY7,
-    S_IMP_FLY8,
-    S_IMP_MEATK1,
-    S_IMP_MEATK2,
-    S_IMP_MEATK3,
-    S_IMP_MSATK1_1,
-    S_IMP_MSATK1_2,
-    S_IMP_MSATK1_3,
-    S_IMP_MSATK1_4,
-    S_IMP_MSATK1_5,
-    S_IMP_MSATK1_6,
-    S_IMP_MSATK2_1,
-    S_IMP_MSATK2_2,
-    S_IMP_MSATK2_3,
-    S_IMP_PAIN1,
-    S_IMP_PAIN2,
-    S_IMP_DIE1,
-    S_IMP_DIE2,
-    S_IMP_XDIE1,
-    S_IMP_XDIE2,
-    S_IMP_XDIE3,
-    S_IMP_XDIE4,
-    S_IMP_XDIE5,
-    S_IMP_CRASH1,
-    S_IMP_CRASH2,
-    S_IMP_CRASH3,
-    S_IMP_CRASH4,
-    S_IMP_XCRASH1,
-    S_IMP_XCRASH2,
-    S_IMP_XCRASH3,
-    S_IMP_CHUNKA1,
-    S_IMP_CHUNKA2,
-    S_IMP_CHUNKA3,
-    S_IMP_CHUNKB1,
-    S_IMP_CHUNKB2,
-    S_IMP_CHUNKB3,
-    S_IMPFX1,
-    S_IMPFX2,
-    S_IMPFX3,
-    S_IMPFXI1,
-    S_IMPFXI2,
-    S_IMPFXI3,
-    S_IMPFXI4,
-    S_KNIGHT_STND1,
-    S_KNIGHT_STND2,
-    S_KNIGHT_WALK1,
-    S_KNIGHT_WALK2,
-    S_KNIGHT_WALK3,
-    S_KNIGHT_WALK4,
-    S_KNIGHT_ATK1,
-    S_KNIGHT_ATK2,
-    S_KNIGHT_ATK3,
-    S_KNIGHT_ATK4,
-    S_KNIGHT_ATK5,
-    S_KNIGHT_ATK6,
-    S_KNIGHT_PAIN1,
-    S_KNIGHT_PAIN2,
-    S_KNIGHT_DIE1,
-    S_KNIGHT_DIE2,
-    S_KNIGHT_DIE3,
-    S_KNIGHT_DIE4,
-    S_KNIGHT_DIE5,
-    S_KNIGHT_DIE6,
-    S_KNIGHT_DIE7,
-    S_SPINAXE1,
-    S_SPINAXE2,
-    S_SPINAXE3,
-    S_SPINAXEX1,
-    S_SPINAXEX2,
-    S_SPINAXEX3,
-    S_REDAXE1,
-    S_REDAXE2,
-    S_REDAXEX1,
-    S_REDAXEX2,
-    S_REDAXEX3,
-    S_SRCR1_LOOK1,
-    S_SRCR1_LOOK2,
-    S_SRCR1_WALK1,
-    S_SRCR1_WALK2,
-    S_SRCR1_WALK3,
-    S_SRCR1_WALK4,
-    S_SRCR1_PAIN1,
-    S_SRCR1_ATK1,
-    S_SRCR1_ATK2,
-    S_SRCR1_ATK3,
-    S_SRCR1_ATK4,
-    S_SRCR1_ATK5,
-    S_SRCR1_ATK6,
-    S_SRCR1_ATK7,
-    S_SRCR1_DIE1,
-    S_SRCR1_DIE2,
-    S_SRCR1_DIE3,
-    S_SRCR1_DIE4,
-    S_SRCR1_DIE5,
-    S_SRCR1_DIE6,
-    S_SRCR1_DIE7,
-    S_SRCR1_DIE8,
-    S_SRCR1_DIE9,
-    S_SRCR1_DIE10,
-    S_SRCR1_DIE11,
-    S_SRCR1_DIE12,
-    S_SRCR1_DIE13,
-    S_SRCR1_DIE14,
-    S_SRCR1_DIE15,
-    S_SRCR1_DIE16,
-    S_SRCR1_DIE17,
-    S_SRCRFX1_1,
-    S_SRCRFX1_2,
-    S_SRCRFX1_3,
-    S_SRCRFXI1_1,
-    S_SRCRFXI1_2,
-    S_SRCRFXI1_3,
-    S_SRCRFXI1_4,
-    S_SRCRFXI1_5,
-    S_SOR2_RISE1,
-    S_SOR2_RISE2,
-    S_SOR2_RISE3,
-    S_SOR2_RISE4,
-    S_SOR2_RISE5,
-    S_SOR2_RISE6,
-    S_SOR2_RISE7,
-    S_SOR2_LOOK1,
-    S_SOR2_LOOK2,
-    S_SOR2_WALK1,
-    S_SOR2_WALK2,
-    S_SOR2_WALK3,
-    S_SOR2_WALK4,
-    S_SOR2_PAIN1,
-    S_SOR2_PAIN2,
-    S_SOR2_ATK1,
-    S_SOR2_ATK2,
-    S_SOR2_ATK3,
-    S_SOR2_TELE1,
-    S_SOR2_TELE2,
-    S_SOR2_TELE3,
-    S_SOR2_TELE4,
-    S_SOR2_TELE5,
-    S_SOR2_TELE6,
-    S_SOR2_DIE1,
-    S_SOR2_DIE2,
-    S_SOR2_DIE3,
-    S_SOR2_DIE4,
-    S_SOR2_DIE5,
-    S_SOR2_DIE6,
-    S_SOR2_DIE7,
-    S_SOR2_DIE8,
-    S_SOR2_DIE9,
-    S_SOR2_DIE10,
-    S_SOR2_DIE11,
-    S_SOR2_DIE12,
-    S_SOR2_DIE13,
-    S_SOR2_DIE14,
-    S_SOR2_DIE15,
-    S_SOR2FX1_1,
-    S_SOR2FX1_2,
-    S_SOR2FX1_3,
-    S_SOR2FXI1_1,
-    S_SOR2FXI1_2,
-    S_SOR2FXI1_3,
-    S_SOR2FXI1_4,
-    S_SOR2FXI1_5,
-    S_SOR2FXI1_6,
-    S_SOR2FXSPARK1,
-    S_SOR2FXSPARK2,
-    S_SOR2FXSPARK3,
-    S_SOR2FX2_1,
-    S_SOR2FX2_2,
-    S_SOR2FX2_3,
-    S_SOR2FXI2_1,
-    S_SOR2FXI2_2,
-    S_SOR2FXI2_3,
-    S_SOR2FXI2_4,
-    S_SOR2FXI2_5,
-    S_SOR2TELEFADE1,
-    S_SOR2TELEFADE2,
-    S_SOR2TELEFADE3,
-    S_SOR2TELEFADE4,
-    S_SOR2TELEFADE5,
-    S_SOR2TELEFADE6,
-    S_MNTR_LOOK1,
-    S_MNTR_LOOK2,
-    S_MNTR_WALK1,
-    S_MNTR_WALK2,
-    S_MNTR_WALK3,
-    S_MNTR_WALK4,
-    S_MNTR_ATK1_1,
-    S_MNTR_ATK1_2,
-    S_MNTR_ATK1_3,
-    S_MNTR_ATK2_1,
-    S_MNTR_ATK2_2,
-    S_MNTR_ATK2_3,
-    S_MNTR_ATK3_1,
-    S_MNTR_ATK3_2,
-    S_MNTR_ATK3_3,
-    S_MNTR_ATK3_4,
-    S_MNTR_ATK4_1,
-    S_MNTR_PAIN1,
-    S_MNTR_PAIN2,
-    S_MNTR_DIE1,
-    S_MNTR_DIE2,
-    S_MNTR_DIE3,
-    S_MNTR_DIE4,
-    S_MNTR_DIE5,
-    S_MNTR_DIE6,
-    S_MNTR_DIE7,
-    S_MNTR_DIE8,
-    S_MNTR_DIE9,
-    S_MNTR_DIE10,
-    S_MNTR_DIE11,
-    S_MNTR_DIE12,
-    S_MNTR_DIE13,
-    S_MNTR_DIE14,
-    S_MNTR_DIE15,
-    S_MNTRFX1_1,
-    S_MNTRFX1_2,
-    S_MNTRFXI1_1,
-    S_MNTRFXI1_2,
-    S_MNTRFXI1_3,
-    S_MNTRFXI1_4,
-    S_MNTRFXI1_5,
-    S_MNTRFXI1_6,
-    S_MNTRFX2_1,
-    S_MNTRFXI2_1,
-    S_MNTRFXI2_2,
-    S_MNTRFXI2_3,
-    S_MNTRFXI2_4,
-    S_MNTRFXI2_5,
-    S_MNTRFX3_1,
-    S_MNTRFX3_2,
-    S_MNTRFX3_3,
-    S_MNTRFX3_4,
-    S_MNTRFX3_5,
-    S_MNTRFX3_6,
-    S_MNTRFX3_7,
-    S_MNTRFX3_8,
-    S_MNTRFX3_9,
-    S_AKYY1,
-    S_AKYY2,
-    S_AKYY3,
-    S_AKYY4,
-    S_AKYY5,
-    S_AKYY6,
-    S_AKYY7,
-    S_AKYY8,
-    S_AKYY9,
-    S_AKYY10,
-    S_BKYY1,
-    S_BKYY2,
-    S_BKYY3,
-    S_BKYY4,
-    S_BKYY5,
-    S_BKYY6,
-    S_BKYY7,
-    S_BKYY8,
-    S_BKYY9,
-    S_BKYY10,
-    S_CKYY1,
-    S_CKYY2,
-    S_CKYY3,
-    S_CKYY4,
-    S_CKYY5,
-    S_CKYY6,
-    S_CKYY7,
-    S_CKYY8,
-    S_CKYY9,
-    S_AMG1,
-    S_AMG2_1,
-    S_AMG2_2,
-    S_AMG2_3,
-    S_AMM1,
-    S_AMM2,
-    S_AMC1,
-    S_AMC2_1,
-    S_AMC2_2,
-    S_AMC2_3,
-    S_AMS1_1,
-    S_AMS1_2,
-    S_AMS2_1,
-    S_AMS2_2,
-    S_AMP1_1,
-    S_AMP1_2,
-    S_AMP1_3,
-    S_AMP2_1,
-    S_AMP2_2,
-    S_AMP2_3,
-    S_AMB1_1,
-    S_AMB1_2,
-    S_AMB1_3,
-    S_AMB2_1,
-    S_AMB2_2,
-    S_AMB2_3,
-    S_SND_WIND,
-    S_SND_WATERFALL,
-    NUMSTATES
-} statenum_t;
-
-
-struct mobj_s;
-struct player_s;
-struct pspdef_s;
-
-
-typedef struct
-{
-    spritenum_t sprite;
-    int frame;
-    int tics;
-    void (*action) (struct mobj_s *, struct player_s *, struct pspdef_s *);
-    statenum_t nextstate;
-    int misc1, misc2;
-} state_t;
-
-extern state_t states[NUMSTATES];
-extern const char *sprnames[];
-
-
-
-typedef enum
-{
-    MT_MISC0,
-    MT_ITEMSHIELD1,
-    MT_ITEMSHIELD2,
-    MT_MISC1,
-    MT_MISC2,
-    MT_ARTIINVISIBILITY,
-    MT_MISC3,
-    MT_ARTIFLY,
-    MT_ARTIINVULNERABILITY,
-    MT_ARTITOMEOFPOWER,
-    MT_ARTIEGG,
-    MT_EGGFX,
-    MT_ARTISUPERHEAL,
-    MT_MISC4,
-    MT_MISC5,
-    MT_FIREBOMB,
-    MT_ARTITELEPORT,
-    MT_POD,
-    MT_PODGOO,
-    MT_PODGENERATOR,
-    MT_SPLASH,
-    MT_SPLASHBASE,
-    MT_LAVASPLASH,
-    MT_LAVASMOKE,
-    MT_SLUDGECHUNK,
-    MT_SLUDGESPLASH,
-    MT_SKULLHANG70,
-    MT_SKULLHANG60,
-    MT_SKULLHANG45,
-    MT_SKULLHANG35,
-    MT_CHANDELIER,
-    MT_SERPTORCH,
-    MT_SMALLPILLAR,
-    MT_STALAGMITESMALL,
-    MT_STALAGMITELARGE,
-    MT_STALACTITESMALL,
-    MT_STALACTITELARGE,
-    MT_MISC6,
-    MT_BARREL,
-    MT_MISC7,
-    MT_MISC8,
-    MT_MISC9,
-    MT_MISC10,
-    MT_MISC11,
-    MT_KEYGIZMOBLUE,
-    MT_KEYGIZMOGREEN,
-    MT_KEYGIZMOYELLOW,
-    MT_KEYGIZMOFLOAT,
-    MT_MISC12,
-    MT_VOLCANOBLAST,
-    MT_VOLCANOTBLAST,
-    MT_TELEGLITGEN,
-    MT_TELEGLITGEN2,
-    MT_TELEGLITTER,
-    MT_TELEGLITTER2,
-    MT_TFOG,
-    MT_TELEPORTMAN,
-    MT_STAFFPUFF,
-    MT_STAFFPUFF2,
-    MT_BEAKPUFF,
-    MT_MISC13,
-    MT_GAUNTLETPUFF1,
-    MT_GAUNTLETPUFF2,
-    MT_MISC14,
-    MT_BLASTERFX1,
-    MT_BLASTERSMOKE,
-    MT_RIPPER,
-    MT_BLASTERPUFF1,
-    MT_BLASTERPUFF2,
-    MT_WMACE,
-    MT_MACEFX1,
-    MT_MACEFX2,
-    MT_MACEFX3,
-    MT_MACEFX4,
-    MT_WSKULLROD,
-    MT_HORNRODFX1,
-    MT_HORNRODFX2,
-    MT_RAINPLR1,
-    MT_RAINPLR2,
-    MT_RAINPLR3,
-    MT_RAINPLR4,
-    MT_GOLDWANDFX1,
-    MT_GOLDWANDFX2,
-    MT_GOLDWANDPUFF1,
-    MT_GOLDWANDPUFF2,
-    MT_WPHOENIXROD,
-    MT_PHOENIXFX1,
-    MT_PHOENIXFX_REMOVED,  // In Heretic 1.0, but removed.
-    MT_PHOENIXPUFF,
-    MT_PHOENIXFX2,
-    MT_MISC15,
-    MT_CRBOWFX1,
-    MT_CRBOWFX2,
-    MT_CRBOWFX3,
-    MT_CRBOWFX4,
-    MT_BLOOD,
-    MT_BLOODSPLATTER,
-    MT_PLAYER,
-    MT_BLOODYSKULL,
-    MT_CHICPLAYER,
-    MT_CHICKEN,
-    MT_FEATHER,
-    MT_MUMMY,
-    MT_MUMMYLEADER,
-    MT_MUMMYGHOST,
-    MT_MUMMYLEADERGHOST,
-    MT_MUMMYSOUL,
-    MT_MUMMYFX1,
-    MT_BEAST,
-    MT_BEASTBALL,
-    MT_BURNBALL,
-    MT_BURNBALLFB,
-    MT_PUFFY,
-    MT_SNAKE,
-    MT_SNAKEPRO_A,
-    MT_SNAKEPRO_B,
-    MT_HEAD,
-    MT_HEADFX1,
-    MT_HEADFX2,
-    MT_HEADFX3,
-    MT_WHIRLWIND,
-    MT_CLINK,
-    MT_WIZARD,
-    MT_WIZFX1,
-    MT_IMP,
-    MT_IMPLEADER,
-    MT_IMPCHUNK1,
-    MT_IMPCHUNK2,
-    MT_IMPBALL,
-    MT_KNIGHT,
-    MT_KNIGHTGHOST,
-    MT_KNIGHTAXE,
-    MT_REDAXE,
-    MT_SORCERER1,
-    MT_SRCRFX1,
-    MT_SORCERER2,
-    MT_SOR2FX1,
-    MT_SOR2FXSPARK,
-    MT_SOR2FX2,
-    MT_SOR2TELEFADE,
-    MT_MINOTAUR,
-    MT_MNTRFX1,
-    MT_MNTRFX2,
-    MT_MNTRFX3,
-    MT_AKYY,
-    MT_BKYY,
-    MT_CKEY,
-    MT_AMGWNDWIMPY,
-    MT_AMGWNDHEFTY,
-    MT_AMMACEWIMPY,
-    MT_AMMACEHEFTY,
-    MT_AMCBOWWIMPY,
-    MT_AMCBOWHEFTY,
-    MT_AMSKRDWIMPY,
-    MT_AMSKRDHEFTY,
-    MT_AMPHRDWIMPY,
-    MT_AMPHRDHEFTY,
-    MT_AMBLSRWIMPY,
-    MT_AMBLSRHEFTY,
-    MT_SOUNDWIND,
-    MT_SOUNDWATERFALL,
-    NUMMOBJTYPES
-} mobjtype_t;
-
-typedef struct
-{
-    int doomednum;
-    int spawnstate;
-    int spawnhealth;
-    int seestate;
-    int seesound;
-    int reactiontime;
-    int attacksound;
-    int painstate;
-    int painchance;
-    int painsound;
-    int meleestate;
-    int missilestate;
-    int crashstate;
-    int deathstate;
-    int xdeathstate;
-    int deathsound;
-    int speed;
-    int radius;
-    int height;
-    int mass;
-    int damage;
-    int activesound;
-    int flags;
-    int flags2;
-} mobjinfo_t;
-
-extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
-
-#endif /* #ifndef HERETIC_INFO_H */
-
diff --git a/games/NXDoom/src/heretic/m_random.c b/games/NXDoom/src/heretic/m_random.c
deleted file mode 100644
index 7d535b848..000000000
--- a/games/NXDoom/src/heretic/m_random.c
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include "m_random.h"
-
-/*
-===============
-=
-= M_Random
-=
-= Returns a 0-255 number
-=
-===============
-*/
-
-const unsigned int rndtable[256] = {
-    0, 8, 109, 220, 222, 241, 149, 107, 75, 248, 254, 140, 16, 66,
-    74, 21, 211, 47, 80, 242, 154, 27, 205, 128, 161, 89, 77, 36,
-    95, 110, 85, 48, 212, 140, 211, 249, 22, 79, 200, 50, 28, 188,
-    52, 140, 202, 120, 68, 145, 62, 70, 184, 190, 91, 197, 152, 224,
-    149, 104, 25, 178, 252, 182, 202, 182, 141, 197, 4, 81, 181, 242,
-    145, 42, 39, 227, 156, 198, 225, 193, 219, 93, 122, 175, 249, 0,
-    175, 143, 70, 239, 46, 246, 163, 53, 163, 109, 168, 135, 2, 235,
-    25, 92, 20, 145, 138, 77, 69, 166, 78, 176, 173, 212, 166, 113,
-    94, 161, 41, 50, 239, 49, 111, 164, 70, 60, 2, 37, 171, 75,
-    136, 156, 11, 56, 42, 146, 138, 229, 73, 146, 77, 61, 98, 196,
-    135, 106, 63, 197, 195, 86, 96, 203, 113, 101, 170, 247, 181, 113,
-    80, 250, 108, 7, 255, 237, 129, 226, 79, 107, 112, 166, 103, 241,
-    24, 223, 239, 120, 198, 58, 60, 82, 128, 3, 184, 66, 143, 224,
-    145, 224, 81, 206, 163, 45, 63, 90, 168, 114, 59, 33, 159, 95,
-    28, 139, 123, 98, 125, 196, 15, 70, 194, 253, 54, 14, 109, 226,
-    71, 17, 161, 93, 186, 87, 244, 138, 20, 52, 123, 251, 26, 36,
-    17, 46, 52, 231, 232, 76, 31, 221, 84, 37, 216, 165, 212, 106,
-    197, 242, 98, 43, 39, 175, 254, 145, 190, 84, 118, 222, 187, 136,
-    120, 163, 236, 249
-};
-
-int rndindex = 0;
-int prndindex = 0;
-
-int P_Random(void)
-{
-    prndindex = (prndindex + 1) & 0xff;
-    return rndtable[prndindex];
-}
-
-int M_Random(void)
-{
-    rndindex = (rndindex + 1) & 0xff;
-    return rndtable[rndindex];
-}
-
-void M_ClearRandom(void)
-{
-    rndindex = prndindex = 0;
-}
-
-// inspired by the same routine in Eternity, thanks haleyjd
-int P_SubRandom (void)
-{
-    int r = P_Random();
-    return r - P_Random();
-}
diff --git a/games/NXDoom/src/heretic/m_random.h b/games/NXDoom/src/heretic/m_random.h
deleted file mode 100644
index d7ec2d187..000000000
--- a/games/NXDoom/src/heretic/m_random.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef HERETIC_M_RANDOM_H
-#define HERETIC_M_RANDOM_H
-
-// Most damage defined using HITDICE
-#define HITDICE(a) ((1+(P_Random()&7))*a)
-
-int M_Random(void);
-// returns a number from 0 to 255
-int P_Random(void);
-// as M_Random, but used only by the play simulation
-
-void M_ClearRandom(void);
-// fix randoms for demos
-
-extern int rndindex;
-
-// Defined version of P_Random() - P_Random()
-int P_SubRandom (void);
-
-#endif // HERETIC_M_RANDOM_H
-
diff --git a/games/NXDoom/src/heretic/mn_menu.c b/games/NXDoom/src/heretic/mn_menu.c
deleted file mode 100644
index 95cb62ce5..000000000
--- a/games/NXDoom/src/heretic/mn_menu.c
+++ /dev/null
@@ -1,1824 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// MN_menu.c
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "deh_str.h"
-#include "doomdef.h"
-#include "doomkeys.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_swap.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "r_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-#include "am_map.h"
-
-// Macros
-
-#define LEFT_DIR 0
-#define RIGHT_DIR 1
-#define ITEM_HEIGHT 20
-#define SELECTOR_XOFFSET (-28)
-#define SELECTOR_YOFFSET (-1)
-#define SLOTTEXTLEN     16
-#define ASCII_CURSOR '['
-
-// Types
-
-typedef enum
-{
-    ITT_EMPTY,
-    ITT_EFUNC,
-    ITT_LRFUNC,
-    ITT_SETMENU,
-    ITT_INERT
-} ItemType_t;
-
-typedef enum
-{
-    MENU_MAIN,
-    MENU_EPISODE,
-    MENU_SKILL,
-    MENU_OPTIONS,
-    MENU_OPTIONS2,
-    MENU_FILES,
-    MENU_LOAD,
-    MENU_SAVE,
-    MENU_NONE
-} MenuType_t;
-
-typedef struct
-{
-    ItemType_t type;
-    const char *text;
-    boolean(*func) (int option);
-    int option;
-    MenuType_t menu;
-} MenuItem_t;
-
-typedef struct
-{
-    int x;
-    int y;
-    void (*drawFunc) (void);
-    int itemCount;
-    MenuItem_t *items;
-    int oldItPos;
-    MenuType_t prevMenu;
-} Menu_t;
-
-// Private Functions
-
-static void InitFonts(void);
-static void SetMenu(MenuType_t menu);
-static boolean SCNetCheck(int option);
-static boolean SCQuitGame(int option);
-static boolean SCEpisode(int option);
-static boolean SCSkill(int option);
-static boolean SCMouseSensi(int option);
-static boolean SCSfxVolume(int option);
-static boolean SCMusicVolume(int option);
-static boolean SCScreenSize(int option);
-static boolean SCLoadGame(int option);
-static boolean SCSaveGame(int option);
-static boolean SCMessages(int option);
-static boolean SCEndGame(int option);
-static boolean SCInfo(int option);
-static void DrawMainMenu(void);
-static void DrawEpisodeMenu(void);
-static void DrawSkillMenu(void);
-static void DrawOptionsMenu(void);
-static void DrawOptions2Menu(void);
-static void DrawFileSlots(Menu_t * menu);
-static void DrawFilesMenu(void);
-static void MN_DrawInfo(void);
-static void DrawLoadMenu(void);
-static void DrawSaveMenu(void);
-static void DrawSlider(Menu_t * menu, int item, int width, int slot);
-void MN_LoadSlotText(void);
-
-
-// Public Data
-
-boolean MenuActive;
-int InfoType;
-boolean messageson;
-
-// Private Data
-
-static int FontABaseLump;
-static int FontBBaseLump;
-static int SkullBaseLump;
-static Menu_t *CurrentMenu;
-static int CurrentItPos;
-static int MenuEpisode;
-static int MenuTime;
-static boolean soundchanged;
-
-boolean askforquit;
-static int typeofask;
-static boolean FileMenuKeySteal;
-static boolean slottextloaded;
-static boolean joypadsave;
-static char SlotText[6][SLOTTEXTLEN + 2];
-static char oldSlotText[SLOTTEXTLEN + 2];
-static int SlotStatus[6];
-static int slotptr;
-static int currentSlot;
-static int quicksave;
-static int quickload;
-
-static MenuItem_t MainItems[] = {
-    {ITT_EFUNC, "NEW GAME", SCNetCheck, 1, MENU_EPISODE},
-    {ITT_SETMENU, "OPTIONS", NULL, 0, MENU_OPTIONS},
-    {ITT_SETMENU, "GAME FILES", NULL, 0, MENU_FILES},
-    {ITT_EFUNC, "INFO", SCInfo, 0, MENU_NONE},
-    {ITT_EFUNC, "QUIT GAME", SCQuitGame, 0, MENU_NONE}
-};
-
-static Menu_t MainMenu = {
-    110, 56,
-    DrawMainMenu,
-    5, MainItems,
-    0,
-    MENU_NONE
-};
-
-static MenuItem_t EpisodeItems[] = {
-    {ITT_EFUNC, "CITY OF THE DAMNED", SCEpisode, 1, MENU_NONE},
-    {ITT_EFUNC, "HELL'S MAW", SCEpisode, 2, MENU_NONE},
-    {ITT_EFUNC, "THE DOME OF D'SPARIL", SCEpisode, 3, MENU_NONE},
-    {ITT_EFUNC, "THE OSSUARY", SCEpisode, 4, MENU_NONE},
-    {ITT_EFUNC, "THE STAGNANT DEMESNE", SCEpisode, 5, MENU_NONE}
-};
-
-static Menu_t EpisodeMenu = {
-    80, 50,
-    DrawEpisodeMenu,
-    3, EpisodeItems,
-    0,
-    MENU_MAIN
-};
-
-static MenuItem_t FilesItems[] = {
-    {ITT_EFUNC, "LOAD GAME", SCNetCheck, 2, MENU_LOAD},
-    {ITT_SETMENU, "SAVE GAME", NULL, 0, MENU_SAVE}
-};
-
-static Menu_t FilesMenu = {
-    110, 60,
-    DrawFilesMenu,
-    2, FilesItems,
-    0,
-    MENU_MAIN
-};
-
-static MenuItem_t LoadItems[] = {
-    {ITT_EFUNC, NULL, SCLoadGame, 0, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 1, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 2, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 3, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 4, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 5, MENU_NONE}
-};
-
-static Menu_t LoadMenu = {
-    70, 30,
-    DrawLoadMenu,
-    6, LoadItems,
-    0,
-    MENU_FILES
-};
-
-static MenuItem_t SaveItems[] = {
-    {ITT_EFUNC, NULL, SCSaveGame, 0, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 1, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 2, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 3, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 4, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 5, MENU_NONE}
-};
-
-static Menu_t SaveMenu = {
-    70, 30,
-    DrawSaveMenu,
-    6, SaveItems,
-    0,
-    MENU_FILES
-};
-
-static MenuItem_t SkillItems[] = {
-    {ITT_EFUNC, "THOU NEEDETH A WET-NURSE", SCSkill, sk_baby, MENU_NONE},
-    {ITT_EFUNC, "YELLOWBELLIES-R-US", SCSkill, sk_easy, MENU_NONE},
-    {ITT_EFUNC, "BRINGEST THEM ONETH", SCSkill, sk_medium, MENU_NONE},
-    {ITT_EFUNC, "THOU ART A SMITE-MEISTER", SCSkill, sk_hard, MENU_NONE},
-    {ITT_EFUNC, "BLACK PLAGUE POSSESSES THEE",
-     SCSkill, sk_nightmare, MENU_NONE}
-};
-
-static Menu_t SkillMenu = {
-    38, 30,
-    DrawSkillMenu,
-    5, SkillItems,
-    2,
-    MENU_EPISODE
-};
-
-static MenuItem_t OptionsItems[] = {
-    {ITT_EFUNC, "END GAME", SCEndGame, 0, MENU_NONE},
-    {ITT_EFUNC, "MESSAGES : ", SCMessages, 0, MENU_NONE},
-    {ITT_LRFUNC, "MOUSE SENSITIVITY", SCMouseSensi, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_SETMENU, "MORE...", NULL, 0, MENU_OPTIONS2}
-};
-
-static Menu_t OptionsMenu = {
-    88, 30,
-    DrawOptionsMenu,
-    5, OptionsItems,
-    0,
-    MENU_MAIN
-};
-
-static MenuItem_t Options2Items[] = {
-    {ITT_LRFUNC, "SCREEN SIZE", SCScreenSize, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_LRFUNC, "SFX VOLUME", SCSfxVolume, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_LRFUNC, "MUSIC VOLUME", SCMusicVolume, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE}
-};
-
-static Menu_t Options2Menu = {
-    90, 20,
-    DrawOptions2Menu,
-    6, Options2Items,
-    0,
-    MENU_OPTIONS
-};
-
-static Menu_t *Menus[] = {
-    &MainMenu,
-    &EpisodeMenu,
-    &SkillMenu,
-    &OptionsMenu,
-    &Options2Menu,
-    &FilesMenu,
-    &LoadMenu,
-    &SaveMenu
-};
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_Init
-//
-//---------------------------------------------------------------------------
-
-void MN_Init(void)
-{
-    InitFonts();
-    MenuActive = false;
-    messageson = true;
-    SkullBaseLump = W_GetNumForName(DEH_String("M_SKL00"));
-
-    if (gamemode == retail)
-    {                           // Add episodes 4 and 5 to the menu
-        EpisodeMenu.itemCount = 5;
-        EpisodeMenu.y -= ITEM_HEIGHT;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC InitFonts
-//
-//---------------------------------------------------------------------------
-
-static void InitFonts(void)
-{
-    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
-    FontBBaseLump = W_GetNumForName(DEH_String("FONTB_S")) + 1;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DrTextA
-//
-// Draw text using font A.
-//
-//---------------------------------------------------------------------------
-
-void MN_DrTextA(const char *text, int x, int y)
-{
-    char c;
-    patch_t *p;
-
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            x += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-            V_DrawPatch(x, y, p);
-            x += SHORT(p->width) - 1;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC MN_TextAWidth
-//
-// Returns the pixel width of a string using font A.
-//
-//---------------------------------------------------------------------------
-
-int MN_TextAWidth(const char *text)
-{
-    char c;
-    int width;
-    patch_t *p;
-
-    width = 0;
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            width += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-            width += SHORT(p->width) - 1;
-        }
-    }
-    return (width);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DrTextB
-//
-// Draw text using font B.
-//
-//---------------------------------------------------------------------------
-
-void MN_DrTextB(const char *text, int x, int y)
-{
-    char c;
-    patch_t *p;
-
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            x += 8;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
-            V_DrawPatch(x, y, p);
-            x += SHORT(p->width) - 1;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC MN_TextBWidth
-//
-// Returns the pixel width of a string using font B.
-//
-//---------------------------------------------------------------------------
-
-int MN_TextBWidth(const char *text)
-{
-    char c;
-    int width;
-    patch_t *p;
-
-    width = 0;
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            width += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
-            width += SHORT(p->width) - 1;
-        }
-    }
-    return (width);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_Ticker
-//
-//---------------------------------------------------------------------------
-
-void MN_Ticker(void)
-{
-    if (MenuActive == false)
-    {
-        return;
-    }
-    MenuTime++;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_Drawer
-//
-//---------------------------------------------------------------------------
-
-const char *QuitEndMsg[] = {
-    "ARE YOU SURE YOU WANT TO QUIT?",
-    "ARE YOU SURE YOU WANT TO END THE GAME?",
-    "DO YOU WANT TO QUICKSAVE THE GAME NAMED",
-    "DO YOU WANT TO QUICKLOAD THE GAME NAMED"
-};
-
-void MN_Drawer(void)
-{
-    int i;
-    int x;
-    int y;
-    MenuItem_t *item;
-    const char *message;
-    const char *selName;
-
-    if (MenuActive == false)
-    {
-        if (askforquit)
-        {
-            message = DEH_String(QuitEndMsg[typeofask - 1]);
-
-            MN_DrTextA(message, 160 - MN_TextAWidth(message) / 2, 80);
-            if (typeofask == 3)
-            {
-                MN_DrTextA(SlotText[quicksave - 1], 160 -
-                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
-                MN_DrTextA(DEH_String("?"), 160 +
-                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
-            }
-            if (typeofask == 4)
-            {
-                MN_DrTextA(SlotText[quickload - 1], 160 -
-                           MN_TextAWidth(SlotText[quickload - 1]) / 2, 90);
-                MN_DrTextA(DEH_String("?"), 160 +
-                           MN_TextAWidth(SlotText[quickload - 1]) / 2, 90);
-            }
-            UpdateState |= I_FULLSCRN;
-        }
-        return;
-    }
-    else
-    {
-        UpdateState |= I_FULLSCRN;
-        if (InfoType)
-        {
-            MN_DrawInfo();
-            return;
-        }
-        if (screenblocks < 10)
-        {
-            BorderNeedRefresh = true;
-        }
-        if (CurrentMenu->drawFunc != NULL)
-        {
-            CurrentMenu->drawFunc();
-        }
-        x = CurrentMenu->x;
-        y = CurrentMenu->y;
-        item = CurrentMenu->items;
-        for (i = 0; i < CurrentMenu->itemCount; i++)
-        {
-            if (item->type != ITT_EMPTY && item->text)
-            {
-                MN_DrTextB(DEH_String(item->text), x, y);
-            }
-            y += ITEM_HEIGHT;
-            item++;
-        }
-        y = CurrentMenu->y + (CurrentItPos * ITEM_HEIGHT) + SELECTOR_YOFFSET;
-        selName = DEH_String(MenuTime & 16 ? "M_SLCTR1" : "M_SLCTR2");
-        V_DrawPatch(x + SELECTOR_XOFFSET, y,
-                    W_CacheLumpName(selName, PU_CACHE));
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawMainMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawMainMenu(void)
-{
-    int frame;
-
-    frame = (MenuTime / 3) % 18;
-    V_DrawPatch(88, 0, W_CacheLumpName(DEH_String("M_HTIC"), PU_CACHE));
-    V_DrawPatch(40, 10, W_CacheLumpNum(SkullBaseLump + (17 - frame),
-                                       PU_CACHE));
-    V_DrawPatch(232, 10, W_CacheLumpNum(SkullBaseLump + frame, PU_CACHE));
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawEpisodeMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawEpisodeMenu(void)
-{
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSkillMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawSkillMenu(void)
-{
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawFilesMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawFilesMenu(void)
-{
-// clear out the quicksave/quickload stuff
-    quicksave = 0;
-    quickload = 0;
-    players[consoleplayer].message = NULL;
-    players[consoleplayer].messageTics = 1;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawLoadMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawLoadMenu(void)
-{
-    const char *title;
-
-    title = DEH_String("LOAD GAME");
-
-    MN_DrTextB(title, 160 - MN_TextBWidth(title) / 2, 10);
-    if (!slottextloaded)
-    {
-        MN_LoadSlotText();
-    }
-    DrawFileSlots(&LoadMenu);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSaveMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawSaveMenu(void)
-{
-    const char *title;
-
-    title = DEH_String("SAVE GAME");
-
-    MN_DrTextB(title, 160 - MN_TextBWidth(title) / 2, 10);
-    if (!slottextloaded)
-    {
-        MN_LoadSlotText();
-    }
-    DrawFileSlots(&SaveMenu);
-}
-
-//===========================================================================
-//
-// MN_LoadSlotText
-//
-//              Loads in the text message for each slot
-//===========================================================================
-
-void MN_LoadSlotText(void)
-{
-    FILE *fp;
-    int i;
-    char *filename;
-
-    for (i = 0; i < 6; i++)
-    {
-        int retval;
-        filename = SV_Filename(i);
-        fp = M_fopen(filename, "rb+");
-	free(filename);
-
-        if (!fp)
-        {
-            SlotText[i][0] = 0; // empty the string
-            SlotStatus[i] = 0;
-            continue;
-        }
-        retval = fread(&SlotText[i], 1, SLOTTEXTLEN, fp);
-        fclose(fp);
-        SlotStatus[i] = retval == SLOTTEXTLEN;
-    }
-    slottextloaded = true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawFileSlots
-//
-//---------------------------------------------------------------------------
-
-static void DrawFileSlots(Menu_t * menu)
-{
-    int i;
-    int x;
-    int y;
-
-    x = menu->x;
-    y = menu->y;
-    for (i = 0; i < 6; i++)
-    {
-        V_DrawPatch(x, y, W_CacheLumpName(DEH_String("M_FSLOT"), PU_CACHE));
-        if (SlotStatus[i])
-        {
-            MN_DrTextA(SlotText[i], x + 5, y + 5);
-        }
-        y += ITEM_HEIGHT;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawOptionsMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawOptionsMenu(void)
-{
-    if (messageson)
-    {
-        MN_DrTextB(DEH_String("ON"), 196, 50);
-    }
-    else
-    {
-        MN_DrTextB(DEH_String("OFF"), 196, 50);
-    }
-    DrawSlider(&OptionsMenu, 3, 10, mouseSensitivity);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawOptions2Menu
-//
-//---------------------------------------------------------------------------
-
-static void DrawOptions2Menu(void)
-{
-    DrawSlider(&Options2Menu, 1, 9, screenblocks - 3);
-    DrawSlider(&Options2Menu, 3, 16, snd_MaxVolume);
-    DrawSlider(&Options2Menu, 5, 16, snd_MusicVolume);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCNetCheck
-//
-//---------------------------------------------------------------------------
-
-static boolean SCNetCheck(int option)
-{
-    if (!netgame)
-    {                           // okay to go into the menu
-        return true;
-    }
-    switch (option)
-    {
-        case 1:
-            P_SetMessage(&players[consoleplayer],
-                         "YOU CAN'T START A NEW GAME IN NETPLAY!", true);
-            break;
-        case 2:
-            P_SetMessage(&players[consoleplayer],
-                         "YOU CAN'T LOAD A GAME IN NETPLAY!", true);
-            break;
-        default:
-            break;
-    }
-    MenuActive = false;
-    return false;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCQuitGame
-//
-//---------------------------------------------------------------------------
-
-static boolean SCQuitGame(int option)
-{
-    MenuActive = false;
-    askforquit = true;
-    typeofask = 1;              //quit game
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCEndGame
-//
-//---------------------------------------------------------------------------
-
-static boolean SCEndGame(int option)
-{
-    if (demoplayback || netgame)
-    {
-        return false;
-    }
-    MenuActive = false;
-    askforquit = true;
-    typeofask = 2;              //endgame
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCMessages
-//
-//---------------------------------------------------------------------------
-
-static boolean SCMessages(int option)
-{
-    messageson ^= 1;
-    if (messageson)
-    {
-        P_SetMessage(&players[consoleplayer], DEH_String("MESSAGES ON"), true);
-    }
-    else
-    {
-        P_SetMessage(&players[consoleplayer], DEH_String("MESSAGES OFF"), true);
-    }
-    S_StartSound(NULL, sfx_chat);
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCLoadGame
-//
-//---------------------------------------------------------------------------
-
-static boolean SCLoadGame(int option)
-{
-    char *filename;
-
-    if (!SlotStatus[option])
-    {                           // slot's empty...don't try and load
-        return false;
-    }
-
-    filename = SV_Filename(option);
-    G_LoadGame(filename);
-    free(filename);
-
-    MN_DeactivateMenu();
-    BorderNeedRefresh = true;
-    if (quickload == -1)
-    {
-        quickload = option + 1;
-        players[consoleplayer].message = NULL;
-        players[consoleplayer].messageTics = 1;
-    }
-    return true;
-}
-
-//
-// Generate a default save slot name when the user saves to
-// an empty slot via the joypad.
-//
-static void SetDefaultSaveName(int slot)
-{
-    // map from IWAD or PWAD?
-    if (W_IsIWADLump(maplumpinfo) && strcmp(savegamedir, ""))
-    {
-        M_snprintf(SlotText[slot], SLOTTEXTLEN,
-                   "%s", maplumpinfo->name);
-    }
-    else
-    {
-        char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpinfo));
-        char *ext = strrchr(wadname, '.');
-
-        if (ext != NULL)
-        {
-            *ext = '\0';
-        }
-
-        M_snprintf(SlotText[slot], SLOTTEXTLEN,
-                   "%s (%s)", maplumpinfo->name,
-                   wadname);
-        free(wadname);
-    }
-    M_ForceUppercase(SlotText[slot]);
-    joypadsave = false;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCSaveGame
-//
-//---------------------------------------------------------------------------
-
-static boolean SCSaveGame(int option)
-{
-    char *ptr;
-
-    if (!FileMenuKeySteal)
-    {
-        int x, y;
-
-        FileMenuKeySteal = true;
-        // We need to activate the text input interface to type the save
-        // game name:
-        x = SaveMenu.x + 1;
-        y = SaveMenu.y + 1 + option * ITEM_HEIGHT;
-        I_StartTextInput(x, y, x + 190, y + ITEM_HEIGHT - 2);
-
-        M_StringCopy(oldSlotText, SlotText[option], sizeof(oldSlotText));
-        ptr = SlotText[option];
-
-        if (!strcmp(ptr, "") && joypadsave)
-        {
-            SetDefaultSaveName(option);
-        }
-
-        while (*ptr)
-        {
-            ptr++;
-        }
-        *ptr = '[';
-        *(ptr + 1) = 0;
-        SlotStatus[option]++;
-        currentSlot = option;
-        slotptr = ptr - SlotText[option];
-        return false;
-    }
-    else
-    {
-        G_SaveGame(option, SlotText[option]);
-        FileMenuKeySteal = false;
-        I_StopTextInput();
-        MN_DeactivateMenu();
-    }
-    BorderNeedRefresh = true;
-    if (quicksave == -1)
-    {
-        quicksave = option + 1;
-        players[consoleplayer].message = NULL;
-        players[consoleplayer].messageTics = 1;
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCEpisode
-//
-//---------------------------------------------------------------------------
-
-static boolean SCEpisode(int option)
-{
-    if (gamemode == shareware && option > 1)
-    {
-        P_SetMessage(&players[consoleplayer],
-                     "ONLY AVAILABLE IN THE REGISTERED VERSION", true);
-    }
-    else
-    {
-        MenuEpisode = option;
-        SetMenu(MENU_SKILL);
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCSkill
-//
-//---------------------------------------------------------------------------
-
-static boolean SCSkill(int option)
-{
-    G_DeferedInitNew(option, MenuEpisode, 1);
-    MN_DeactivateMenu();
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCMouseSensi
-//
-//---------------------------------------------------------------------------
-
-static boolean SCMouseSensi(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (mouseSensitivity < 9)
-        {
-            mouseSensitivity++;
-        }
-    }
-    else if (mouseSensitivity)
-    {
-        mouseSensitivity--;
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCSfxVolume
-//
-//---------------------------------------------------------------------------
-
-static boolean SCSfxVolume(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (snd_MaxVolume < 15)
-        {
-            snd_MaxVolume++;
-        }
-    }
-    else if (snd_MaxVolume)
-    {
-        snd_MaxVolume--;
-    }
-    S_SetMaxVolume(false);      // don't recalc the sound curve, yet
-    soundchanged = true;        // we'll set it when we leave the menu
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCMusicVolume
-//
-//---------------------------------------------------------------------------
-
-static boolean SCMusicVolume(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (snd_MusicVolume < 15)
-        {
-            snd_MusicVolume++;
-        }
-    }
-    else if (snd_MusicVolume)
-    {
-        snd_MusicVolume--;
-    }
-    S_SetMusicVolume();
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCScreenSize
-//
-//---------------------------------------------------------------------------
-
-static boolean SCScreenSize(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (screenblocks < 11)
-        {
-            screenblocks++;
-        }
-    }
-    else if (screenblocks > 3)
-    {
-        screenblocks--;
-    }
-    R_SetViewSize(screenblocks, detailLevel);
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCInfo
-//
-//---------------------------------------------------------------------------
-
-static boolean SCInfo(int option)
-{
-    InfoType = 1;
-    S_StartSound(NULL, sfx_dorcls);
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC MN_Responder
-//
-//---------------------------------------------------------------------------
-
-boolean MN_Responder(event_t * event)
-{
-    int charTyped;
-    int key;
-    int i;
-    MenuItem_t *item;
-    char *textBuffer;
-    int dir;
-
-    // In testcontrols mode, none of the function keys should do anything
-    // - the only key is escape to quit.
-
-    if (testcontrols)
-    {
-        if (event->type == ev_quit
-         || (event->type == ev_keydown
-          && (event->data1 == key_menu_activate
-           || event->data1 == key_menu_quit)))
-        {
-            I_Quit();
-            return true;
-        }
-
-        return false;
-    }
-
-    // "close" button pressed on window?
-    if (event->type == ev_quit)
-    {
-        // First click on close = bring up quit confirm message.
-        // Second click = confirm quit.
-
-        if (!MenuActive && askforquit && typeofask == 1)
-        {
-            G_CheckDemoStatus();
-            I_Quit();
-        }
-        else
-        {
-            SCQuitGame(0);
-            S_StartSound(NULL, sfx_chat);
-        }
-        return true;
-    }
-
-    charTyped = 0;
-    key = -1;
-
-    if (event->type == ev_joystick)
-    {
-        // Simulate key presses from joystick events to interact with the menu.
-
-        if (MenuActive)
-        {
-            if (JOY_GET_DPAD(event->data6) != JOY_DIR_NONE)
-            {
-                dir = JOY_GET_DPAD(event->data6);
-            }
-            else if (JOY_GET_LSTICK(event->data6) != JOY_DIR_NONE)
-            {
-                dir = JOY_GET_LSTICK(event->data6);
-            }
-            else
-            {
-                dir = JOY_GET_RSTICK(event->data6);
-            }
-
-            if (dir & JOY_DIR_UP)
-            {
-                key = key_menu_up;
-                joywait = I_GetTime() + 5;
-            }
-            else if (dir & JOY_DIR_DOWN)
-            {
-                key = key_menu_down;
-                joywait = I_GetTime() + 5;
-            }
-            if (dir & JOY_DIR_LEFT)
-            {
-                key = key_menu_left;
-                joywait = I_GetTime() + 5;
-            }
-            else if (dir & JOY_DIR_RIGHT)
-            {
-                key = key_menu_right;
-                joywait = I_GetTime() + 5;
-            }
-
-#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
-#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (event->data1 & (1 << (x))) != 0)
-
-            if (JOY_BUTTON_PRESSED(joybfire))
-            {
-                // Simulate pressing "Enter" when we are supplying a save slot name
-                if (FileMenuKeySteal)
-                {
-                    key = KEY_ENTER;
-                }
-                else
-                {
-                    // if selecting a save slot via joypad, set a flag
-                    if (CurrentMenu == &SaveMenu)
-                    {
-                        joypadsave = true;
-                    }
-                    key = key_menu_forward;
-                }
-                joywait = I_GetTime() + 5;
-            }
-            if (JOY_BUTTON_PRESSED(joybuse))
-            {
-                // If user was entering a save name, back out
-                if (FileMenuKeySteal)
-                {
-                    key = KEY_ESCAPE;
-                }
-                else
-                {
-                    key = key_menu_back;
-                }
-                joywait = I_GetTime() + 5;
-            }
-        }
-        else if (askforquit)
-        {
-            if (JOY_BUTTON_PRESSED(joybfire))
-            {
-                // Simulate a 'Y' keypress
-                key = key_menu_confirm;
-                joywait = I_GetTime() + 5;
-            }
-            if (JOY_BUTTON_PRESSED(joybuse))
-            {
-                // Simulate a 'N' keypress
-                key = key_menu_abort;
-                joywait = I_GetTime() + 5;
-            }
-        }
-        if (JOY_BUTTON_PRESSED(joybmenu))
-        {
-            MN_ActivateMenu();
-            joywait = I_GetTime() + 5;
-            return true;
-        }
-    }
-
-    if (event->type != ev_keydown && key == -1)
-    {
-        return false;
-    }
-
-    if (event->type == ev_keydown)
-    {
-        key = event->data1;
-        charTyped = event->data2;
-    }
-
-    if (InfoType)
-    {
-        if (gamemode == shareware)
-        {
-            InfoType = (InfoType + 1) % 5;
-        }
-        else
-        {
-            InfoType = (InfoType + 1) % 4;
-        }
-        if (key == KEY_ESCAPE)
-        {
-            InfoType = 0;
-        }
-        if (!InfoType)
-        {
-            paused = false;
-            MN_DeactivateMenu();
-            SB_state = -1;      //refresh the statbar
-            BorderNeedRefresh = true;
-        }
-        S_StartSound(NULL, sfx_dorcls);
-        return (true);          //make the info screen eat the keypress
-    }
-
-    if ((ravpic && key == KEY_F1) ||
-        (key != 0 && key == key_menu_screenshot))
-    {
-        G_ScreenShot();
-        return (true);
-    }
-
-    if (askforquit)
-    {
-        if (key == key_menu_confirm)
-        {
-            switch (typeofask)
-            {
-                case 1:
-                    G_CheckDemoStatus();
-                    I_Quit();
-                    return false;
-
-                case 2:
-                    players[consoleplayer].messageTics = 0;
-                    //set the msg to be cleared
-                    players[consoleplayer].message = NULL;
-                    paused = false;
-                    I_SetPalette(W_CacheLumpName
-                                 ("PLAYPAL", PU_CACHE));
-                    D_StartTitle();     // go to intro/demo mode.
-                    break;
-
-                case 3:
-                    P_SetMessage(&players[consoleplayer],
-                                 "QUICKSAVING....", false);
-                    FileMenuKeySteal = true;
-                    SCSaveGame(quicksave - 1);
-                    BorderNeedRefresh = true;
-                    break;
-
-                case 4:
-                    P_SetMessage(&players[consoleplayer],
-                                 "QUICKLOADING....", false);
-                    SCLoadGame(quickload - 1);
-                    BorderNeedRefresh = true;
-                    break;
-
-                default:
-                    break;
-            }
-
-            askforquit = false;
-            typeofask = 0;
-
-            return true;
-        }
-        else if (key == key_menu_abort || key == KEY_ESCAPE)
-        {
-            players[consoleplayer].messageTics = 1;  //set the msg to be cleared
-            askforquit = false;
-            typeofask = 0;
-            paused = false;
-            UpdateState |= I_FULLSCRN;
-            BorderNeedRefresh = true;
-            return true;
-        }
-
-        return false;           // don't let the keys filter thru
-    }
-
-    if (!MenuActive && !chatmodeon)
-    {
-        if (key == key_menu_decscreen)
-        {
-            if (automapactive)
-            {               // Don't screen size in automap
-                return (false);
-            }
-            SCScreenSize(LEFT_DIR);
-            S_StartSound(NULL, sfx_keyup);
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            return (true);
-        }
-        else if (key == key_menu_incscreen)
-        {
-            if (automapactive)
-            {               // Don't screen size in automap
-                return (false);
-            }
-            SCScreenSize(RIGHT_DIR);
-            S_StartSound(NULL, sfx_keyup);
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            return (true);
-        }
-        else if (key == key_menu_help)           // F1
-        {
-            SCInfo(0);      // start up info screens
-            MenuActive = true;
-            return (true);
-        }
-        else if (key == key_menu_save)           // F2 (save game)
-        {
-            if (gamestate == GS_LEVEL && !demoplayback)
-            {
-                MenuActive = true;
-                FileMenuKeySteal = false;
-                MenuTime = 0;
-                CurrentMenu = &SaveMenu;
-                CurrentItPos = CurrentMenu->oldItPos;
-                if (!netgame && !demoplayback)
-                {
-                    paused = true;
-                }
-                S_StartSound(NULL, sfx_dorcls);
-                slottextloaded = false;     //reload the slot text, when needed
-            }
-            return true;
-        }
-        else if (key == key_menu_load)           // F3 (load game)
-        {
-            if (SCNetCheck(2))
-            {
-                MenuActive = true;
-                FileMenuKeySteal = false;
-                MenuTime = 0;
-                CurrentMenu = &LoadMenu;
-                CurrentItPos = CurrentMenu->oldItPos;
-                if (!netgame && !demoplayback)
-                {
-                    paused = true;
-                }
-                S_StartSound(NULL, sfx_dorcls);
-                slottextloaded = false;     //reload the slot text, when needed
-            }
-            return true;
-        }
-        else if (key == key_menu_volume)         // F4 (volume)
-        {
-            MenuActive = true;
-            FileMenuKeySteal = false;
-            MenuTime = 0;
-            CurrentMenu = &Options2Menu;
-            CurrentItPos = CurrentMenu->oldItPos;
-            if (!netgame && !demoplayback)
-            {
-                paused = true;
-            }
-            S_StartSound(NULL, sfx_dorcls);
-            slottextloaded = false; //reload the slot text, when needed
-            return true;
-        }
-        else if (key == key_menu_detail)          // F5 (detail)
-        {
-            // F5 isn't used in Heretic. (detail level)
-            return true;
-        }
-        else if (key == key_menu_qsave)           // F6 (quicksave)
-        {
-            if (gamestate == GS_LEVEL && !demoplayback)
-            {
-                if (!quicksave || quicksave == -1)
-                {
-                    MenuActive = true;
-                    FileMenuKeySteal = false;
-                    MenuTime = 0;
-                    CurrentMenu = &SaveMenu;
-                    CurrentItPos = CurrentMenu->oldItPos;
-                    if (!netgame && !demoplayback)
-                    {
-                        paused = true;
-                    }
-                    S_StartSound(NULL, sfx_dorcls);
-                    slottextloaded = false; //reload the slot text, when needed
-                    quicksave = -1;
-                    P_SetMessage(&players[consoleplayer],
-                                 "CHOOSE A QUICKSAVE SLOT", true);
-                }
-                else
-                {
-                    askforquit = true;
-                    typeofask = 3;
-                    if (!netgame && !demoplayback)
-                    {
-                        paused = true;
-                    }
-                    S_StartSound(NULL, sfx_chat);
-                }
-            }
-            return true;
-        }
-        else if (key == key_menu_endgame)         // F7 (end game)
-        {
-            if (gamestate == GS_LEVEL && !demoplayback)
-            {
-                S_StartSound(NULL, sfx_chat);
-                SCEndGame(0);
-            }
-            return true;
-        }
-        else if (key == key_menu_messages)        // F8 (toggle messages)
-        {
-            SCMessages(0);
-            return true;
-        }
-        else if (key == key_menu_qload)           // F9 (quickload)
-        {
-            if (!quickload || quickload == -1)
-            {
-                MenuActive = true;
-                FileMenuKeySteal = false;
-                MenuTime = 0;
-                CurrentMenu = &LoadMenu;
-                CurrentItPos = CurrentMenu->oldItPos;
-                if (!netgame && !demoplayback)
-                {
-                    paused = true;
-                }
-                S_StartSound(NULL, sfx_dorcls);
-                slottextloaded = false;     //reload the slot text, when needed
-                quickload = -1;
-                P_SetMessage(&players[consoleplayer],
-                             "CHOOSE A QUICKLOAD SLOT", true);
-            }
-            else
-            {
-                askforquit = true;
-                if (!netgame && !demoplayback)
-                {
-                    paused = true;
-                }
-                typeofask = 4;
-                S_StartSound(NULL, sfx_chat);
-            }
-            return true;
-        }
-        else if (key == key_menu_quit)            // F10 (quit)
-        {
-            if (gamestate == GS_LEVEL)
-            {
-                SCQuitGame(0);
-                S_StartSound(NULL, sfx_chat);
-            }
-            return true;
-        }
-        else if (key == key_menu_gamma)           // F11 (gamma correction)
-        {
-            usegamma++;
-            if (usegamma > 4)
-            {
-                usegamma = 0;
-            }
-            I_SetPalette((byte *) W_CacheLumpName("PLAYPAL", PU_CACHE));
-            return true;
-        }
-
-    }
-
-    if (!MenuActive)
-    {
-        if (key == key_menu_activate || gamestate == GS_DEMOSCREEN || demoplayback)
-        {
-            MN_ActivateMenu();
-            return (true);
-        }
-        return (false);
-    }
-    if (!FileMenuKeySteal)
-    {
-        item = &CurrentMenu->items[CurrentItPos];
-
-        if (key == key_menu_down)            // Next menu item
-        {
-            do
-            {
-                if (CurrentItPos + 1 > CurrentMenu->itemCount - 1)
-                {
-                    CurrentItPos = 0;
-                }
-                else
-                {
-                    CurrentItPos++;
-                }
-            }
-            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
-            S_StartSound(NULL, sfx_switch);
-            return (true);
-        }
-        else if (key == key_menu_up)         // Previous menu item
-        {
-            do
-            {
-                if (CurrentItPos == 0)
-                {
-                    CurrentItPos = CurrentMenu->itemCount - 1;
-                }
-                else
-                {
-                    CurrentItPos--;
-                }
-            }
-            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
-            S_StartSound(NULL, sfx_switch);
-            return (true);
-        }
-        else if (key == key_menu_left)       // Slider left
-        {
-            if (item->type == ITT_LRFUNC && item->func != NULL)
-            {
-                item->func(LEFT_DIR);
-                S_StartSound(NULL, sfx_keyup);
-            }
-            return (true);
-        }
-        else if (key == key_menu_right)      // Slider right
-        {
-            if (item->type == ITT_LRFUNC && item->func != NULL)
-            {
-                item->func(RIGHT_DIR);
-                S_StartSound(NULL, sfx_keyup);
-            }
-            return (true);
-        }
-        else if (key == key_menu_forward)    // Activate item (enter)
-        {
-            if (item->type == ITT_SETMENU)
-            {
-                SetMenu(item->menu);
-            }
-            else if (item->func != NULL)
-            {
-                CurrentMenu->oldItPos = CurrentItPos;
-                if (item->type == ITT_LRFUNC)
-                {
-                    item->func(RIGHT_DIR);
-                }
-                else if (item->type == ITT_EFUNC)
-                {
-                    if (item->func(item->option))
-                    {
-                        if (item->menu != MENU_NONE)
-                        {
-                            SetMenu(item->menu);
-                        }
-                    }
-                }
-            }
-            S_StartSound(NULL, sfx_dorcls);
-            return (true);
-        }
-        else if (key == key_menu_activate)     // Toggle menu
-        {
-            MN_DeactivateMenu();
-            return (true);
-        }
-        else if (key == key_menu_back)         // Go back to previous menu
-        {
-            S_StartSound(NULL, sfx_switch);
-            if (CurrentMenu->prevMenu == MENU_NONE)
-            {
-                MN_DeactivateMenu();
-            }
-            else
-            {
-                SetMenu(CurrentMenu->prevMenu);
-            }
-            return (true);
-        }
-        else if (charTyped != 0)
-        {
-            // Jump to menu item based on first letter:
-
-            for (i = 0; i < CurrentMenu->itemCount; i++)
-            {
-                if (CurrentMenu->items[i].text)
-                {
-                    if (toupper(charTyped)
-                        == toupper(DEH_String(CurrentMenu->items[i].text)[0]))
-                    {
-                        CurrentItPos = i;
-                        return (true);
-                    }
-                }
-            }
-        }
-
-        return (false);
-    }
-    else
-    {
-        // Editing file names
-        // When typing a savegame name, we use the fully shifted and
-        // translated input value from event->data3.
-        charTyped = event->data3;
-
-        textBuffer = &SlotText[currentSlot][slotptr];
-        if (key == KEY_BACKSPACE)
-        {
-            if (slotptr)
-            {
-                *textBuffer = 0;
-                slotptr--;
-                textBuffer = &SlotText[currentSlot][slotptr];
-                *textBuffer = ASCII_CURSOR;
-            }
-            return (true);
-        }
-        if (key == KEY_ESCAPE)
-        {
-            memset(SlotText[currentSlot], 0, SLOTTEXTLEN + 2);
-            M_StringCopy(SlotText[currentSlot], oldSlotText,
-                         sizeof(SlotText[currentSlot]));
-            SlotStatus[currentSlot]--;
-            MN_DeactivateMenu();
-            return (true);
-        }
-        if (key == KEY_ENTER)
-        {
-            SlotText[currentSlot][slotptr] = 0; // clear the cursor
-            item = &CurrentMenu->items[CurrentItPos];
-            CurrentMenu->oldItPos = CurrentItPos;
-            if (item->type == ITT_EFUNC)
-            {
-                item->func(item->option);
-                if (item->menu != MENU_NONE)
-                {
-                    SetMenu(item->menu);
-                }
-            }
-            return (true);
-        }
-        if (slotptr < SLOTTEXTLEN && key != KEY_BACKSPACE)
-        {
-            if (isalpha(charTyped))
-            {
-                *textBuffer++ = toupper(charTyped);
-                *textBuffer = ASCII_CURSOR;
-                slotptr++;
-                return (true);
-            }
-            if (isdigit(charTyped) || charTyped == ' '
-              || charTyped == ',' || charTyped == '.' || charTyped == '-'
-              || charTyped == '!')
-            {
-                *textBuffer++ = charTyped;
-                *textBuffer = ASCII_CURSOR;
-                slotptr++;
-                return (true);
-            }
-        }
-        return (true);
-    }
-    return (false);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_ActivateMenu
-//
-//---------------------------------------------------------------------------
-
-void MN_ActivateMenu(void)
-{
-    if (MenuActive)
-    {
-        return;
-    }
-    if (paused)
-    {
-        S_ResumeSound();
-    }
-    MenuActive = true;
-    FileMenuKeySteal = false;
-    MenuTime = 0;
-    CurrentMenu = &MainMenu;
-    CurrentItPos = CurrentMenu->oldItPos;
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-    S_StartSound(NULL, sfx_dorcls);
-    slottextloaded = false;     //reload the slot text, when needed
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DeactivateMenu
-//
-//---------------------------------------------------------------------------
-
-void MN_DeactivateMenu(void)
-{
-    if (CurrentMenu != NULL)
-    {
-        CurrentMenu->oldItPos = CurrentItPos;
-    }
-    MenuActive = false;
-    if (FileMenuKeySteal)
-    {
-        I_StopTextInput();
-    }
-    if (!netgame)
-    {
-        paused = false;
-    }
-    S_StartSound(NULL, sfx_dorcls);
-    if (soundchanged)
-    {
-        S_SetMaxVolume(true);   //recalc the sound curve
-        soundchanged = false;
-    }
-    players[consoleplayer].message = NULL;
-    players[consoleplayer].messageTics = 1;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DrawInfo
-//
-//---------------------------------------------------------------------------
-
-void MN_DrawInfo(void)
-{
-    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
-    V_DrawRawScreen(W_CacheLumpNum(W_GetNumForName("TITLE") + InfoType,
-                                   PU_CACHE));
-//      V_DrawPatch(0, 0, W_CacheLumpNum(W_GetNumForName("TITLE")+InfoType,
-//              PU_CACHE));
-}
-
-
-//---------------------------------------------------------------------------
-//
-// PROC SetMenu
-//
-//---------------------------------------------------------------------------
-
-static void SetMenu(MenuType_t menu)
-{
-    CurrentMenu->oldItPos = CurrentItPos;
-    CurrentMenu = Menus[menu];
-    CurrentItPos = CurrentMenu->oldItPos;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSlider
-//
-//---------------------------------------------------------------------------
-
-static void DrawSlider(Menu_t * menu, int item, int width, int slot)
-{
-    int x;
-    int y;
-    int x2;
-    int count;
-
-    x = menu->x + 24;
-    y = menu->y + 2 + (item * ITEM_HEIGHT);
-    V_DrawPatch(x - 32, y, W_CacheLumpName(DEH_String("M_SLDLT"), PU_CACHE));
-    for (x2 = x, count = width; count--; x2 += 8)
-    {
-        V_DrawPatch(x2, y, W_CacheLumpName(DEH_String(count & 1 ? "M_SLDMD1"
-                                           : "M_SLDMD2"), PU_CACHE));
-    }
-    V_DrawPatch(x2, y, W_CacheLumpName(DEH_String("M_SLDRT"), PU_CACHE));
-    V_DrawPatch(x + 4 + slot * 8, y + 7,
-                W_CacheLumpName(DEH_String("M_SLDKB"), PU_CACHE));
-}
diff --git a/games/NXDoom/src/heretic/p_action.h b/games/NXDoom/src/heretic/p_action.h
deleted file mode 100644
index 8bb87071c..000000000
--- a/games/NXDoom/src/heretic/p_action.h
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// External definitions for action pointer functions.
-//
-
-#ifndef HERETIC_P_ACTION_H
-#define HERETIC_P_ACTION_H
-
-void A_FreeTargMobj(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_RestoreSpecialThing1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_RestoreSpecialThing2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_HideThing(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_UnHideThing(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_RestoreArtifact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Scream(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Explode(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_PodPain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_RemovePod(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MakePod(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_InitKeyGizmo(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_VolcanoSet(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_VolcanoBlast(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BeastPuff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_VolcBallImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SpawnTeleGlitter(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SpawnTeleGlitter2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_AccTeleGlitter(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Light0(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_WeaponReady(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Lower(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Raise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_StaffAttackPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ReFire(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_StaffAttackPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BeakReady(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BeakRaise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BeakAttackPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BeakAttackPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_GauntletAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireBlasterPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireBlasterPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SpawnRippers(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireMacePL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireMacePL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MacePL1Check(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MaceBallImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MaceBallImpact2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_DeathBallImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireSkullRodPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireSkullRodPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SkullRodPL2Seek(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_AddPlayerRain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_HideInCeiling(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SkullRodStorm(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_RainImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireGoldWandPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireGoldWandPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FirePhoenixPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_InitPhoenixPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FirePhoenixPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ShutdownPhoenixPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_PhoenixPuff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_RemovedPhoenixFunc(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FlameEnd(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FloatPuff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireCrossbowPL1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FireCrossbowPL2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BoltSpark(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Pain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_NoBlocking(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_AddPlayerCorpse(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SkullPop(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FlameSnd(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_CheckBurnGone(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_CheckSkullFloor(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_CheckSkullDone(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Feathers(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ChicLook(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ChicChase(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ChicPain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_FaceTarget(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ChicAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Look(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Chase(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MummyAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MummyAttack2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MummySoul(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ContMobjSound(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MummyFX1Seek(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BeastAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SnakeAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SnakeAttack2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_HeadAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BossDeath(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_HeadIceImpact(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_HeadFireGrow(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_WhirlwindSeek(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ClinkAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_WizAtk1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_WizAtk2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_WizAtk3(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_GhostOff(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpMeAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpMsAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpMsAttack2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpDeath(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpXDeath1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpXDeath2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ImpExplode(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_KnightAttack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_DripBlood(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Sor1Chase(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Sor1Pain(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Srcr1Attack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorZap(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorcererRise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorRise(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorSightSnd(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Srcr2Decide(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Srcr2Attack(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Sor2DthInit(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorDSph(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_Sor2DthLoop(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorDExp(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_SorDBon(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_BlueSpark(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_GenWizard(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MinotaurAtk1(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MinotaurDecide(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MinotaurAtk2(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MinotaurAtk3(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MinotaurCharge(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_MntrFloorFire(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-void A_ESound(struct mobj_s *actor, struct player_s *player, struct pspdef_s *psp);
-
-#endif /* #ifndef HERETIC_P_ACTION_H */
-
diff --git a/games/NXDoom/src/heretic/p_ceilng.c b/games/NXDoom/src/heretic/p_ceilng.c
deleted file mode 100644
index c37d39732..000000000
--- a/games/NXDoom/src/heretic/p_ceilng.c
+++ /dev/null
@@ -1,256 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include "doomdef.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-//==================================================================
-//==================================================================
-//
-//                                                      CEILINGS
-//
-//==================================================================
-//==================================================================
-
-ceiling_t *activeceilings[MAXCEILINGS];
-
-//==================================================================
-//
-//      T_MoveCeiling
-//
-//==================================================================
-void T_MoveCeiling(thinker_t *thinker)
-{
-    ceiling_t *ceiling = (ceiling_t *) thinker;
-    result_e res;
-
-    switch (ceiling->direction)
-    {
-        case 0:                // IN STASIS
-            break;
-        case 1:                // UP
-            res = T_MovePlane(ceiling->sector, ceiling->speed,
-                              ceiling->topheight, false, 1,
-                              ceiling->direction);
-            if (!(leveltime & 7))
-                S_StartSound(&ceiling->sector->soundorg,
-                             sfx_dormov);
-            if (res == pastdest)
-                switch (ceiling->type)
-                {
-                    case raiseToHighest:
-                        P_RemoveActiveCeiling(ceiling);
-                        break;
-                    case fastCrushAndRaise:
-                    case crushAndRaise:
-                        ceiling->direction = -1;
-                        break;
-                    default:
-                        break;
-                }
-            break;
-        case -1:               // DOWN
-            res = T_MovePlane(ceiling->sector, ceiling->speed,
-                              ceiling->bottomheight, ceiling->crush, 1,
-                              ceiling->direction);
-            if (!(leveltime & 7))
-                S_StartSound(&ceiling->sector->soundorg,
-                             sfx_dormov);
-            if (res == pastdest)
-                switch (ceiling->type)
-                {
-                    case crushAndRaise:
-                        ceiling->speed = CEILSPEED;
-                    case fastCrushAndRaise:
-                        ceiling->direction = 1;
-                        break;
-                    case lowerAndCrush:
-                    case lowerToFloor:
-                        P_RemoveActiveCeiling(ceiling);
-                        break;
-                    default:
-                        break;
-                }
-            else if (res == crushed)
-                switch (ceiling->type)
-                {
-                    case crushAndRaise:
-                    case lowerAndCrush:
-                        ceiling->speed = CEILSPEED / 8;
-                        break;
-                    default:
-                        break;
-                }
-            break;
-    }
-}
-
-//==================================================================
-//
-//              EV_DoCeiling
-//              Move a ceiling up/down and all around!
-//
-//==================================================================
-int EV_DoCeiling(line_t * line, ceiling_e type)
-{
-    int secnum, rtn;
-    sector_t *sec;
-    ceiling_t *ceiling;
-
-    secnum = -1;
-    rtn = 0;
-
-    //
-    //      Reactivate in-stasis ceilings...for certain types.
-    //
-    switch (type)
-    {
-        case fastCrushAndRaise:
-        case crushAndRaise:
-            P_ActivateInStasisCeiling(line);
-        default:
-            break;
-    }
-
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        //
-        // new door thinker
-        //
-        rtn = 1;
-        ceiling = Z_Malloc(sizeof(*ceiling), PU_LEVSPEC, 0);
-        P_AddThinker(&ceiling->thinker);
-        sec->specialdata = ceiling;
-        ceiling->thinker.function = T_MoveCeiling;
-        ceiling->sector = sec;
-        ceiling->crush = false;
-        switch (type)
-        {
-            case fastCrushAndRaise:
-                ceiling->crush = true;
-                ceiling->topheight = sec->ceilingheight;
-                ceiling->bottomheight = sec->floorheight + (8 * FRACUNIT);
-                ceiling->direction = -1;
-                ceiling->speed = CEILSPEED * 2;
-                break;
-            case crushAndRaise:
-                ceiling->crush = true;
-                ceiling->topheight = sec->ceilingheight;
-            case lowerAndCrush:
-            case lowerToFloor:
-                ceiling->bottomheight = sec->floorheight;
-                if (type != lowerToFloor)
-                    ceiling->bottomheight += 8 * FRACUNIT;
-                ceiling->direction = -1;
-                ceiling->speed = CEILSPEED;
-                break;
-            case raiseToHighest:
-                ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
-                ceiling->direction = 1;
-                ceiling->speed = CEILSPEED;
-                break;
-        }
-
-        ceiling->tag = sec->tag;
-        ceiling->type = type;
-        P_AddActiveCeiling(ceiling);
-    }
-    return rtn;
-}
-
-//==================================================================
-//
-//              Add an active ceiling
-//
-//==================================================================
-void P_AddActiveCeiling(ceiling_t * c)
-{
-    int i;
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] == NULL)
-        {
-            activeceilings[i] = c;
-            return;
-        }
-}
-
-//==================================================================
-//
-//              Remove a ceiling's thinker
-//
-//==================================================================
-void P_RemoveActiveCeiling(ceiling_t * c)
-{
-    int i;
-
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] == c)
-        {
-            activeceilings[i]->sector->specialdata = NULL;
-            P_RemoveThinker(&activeceilings[i]->thinker);
-            activeceilings[i] = NULL;
-            break;
-        }
-}
-
-//==================================================================
-//
-//              Restart a ceiling that's in-stasis
-//
-//==================================================================
-void P_ActivateInStasisCeiling(line_t * line)
-{
-    int i;
-
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] && (activeceilings[i]->tag == line->tag) &&
-            (activeceilings[i]->direction == 0))
-        {
-            activeceilings[i]->direction = activeceilings[i]->olddirection;
-            activeceilings[i]->thinker.function = T_MoveCeiling;
-        }
-}
-
-//==================================================================
-//
-//              EV_CeilingCrushStop
-//              Stop a ceiling from crushing!
-//
-//==================================================================
-int EV_CeilingCrushStop(line_t * line)
-{
-    int i;
-    int rtn;
-
-    rtn = 0;
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] && (activeceilings[i]->tag == line->tag) &&
-            (activeceilings[i]->direction != 0))
-        {
-            activeceilings[i]->olddirection = activeceilings[i]->direction;
-            activeceilings[i]->thinker.function = NULL;
-            activeceilings[i]->direction = 0;   // in-stasis
-            rtn = 1;
-        }
-
-    return rtn;
-}
diff --git a/games/NXDoom/src/heretic/p_doors.c b/games/NXDoom/src/heretic/p_doors.c
deleted file mode 100644
index 3cd403735..000000000
--- a/games/NXDoom/src/heretic/p_doors.c
+++ /dev/null
@@ -1,380 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_doors.c
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-//==================================================================
-//==================================================================
-//
-//                                                      VERTICAL DOORS
-//
-//==================================================================
-//==================================================================
-
-//==================================================================
-//
-//      T_VerticalDoor
-//
-//==================================================================
-void T_VerticalDoor(thinker_t *thinker)
-{
-    vldoor_t *door = (vldoor_t *) thinker;
-    result_e res;
-
-    switch (door->direction)
-    {
-        case 0:                // WAITING
-            if (!--door->topcountdown)
-                switch (door->type)
-                {
-                    case vld_normal:
-                        door->direction = -1;   // time to go back down
-                        S_StartSound(&door->sector->soundorg, sfx_doropn);
-                        break;
-                    case vld_close30ThenOpen:
-                        door->direction = 1;
-                        S_StartSound(&door->sector->soundorg, sfx_doropn);
-                        break;
-                    default:
-                        break;
-                }
-            break;
-        case 2:                // INITIAL WAIT
-            if (!--door->topcountdown)
-            {
-                switch (door->type)
-                {
-                    case vld_raiseIn5Mins:
-                        door->direction = 1;
-                        door->type = vld_normal;
-                        S_StartSound(&door->sector->soundorg, sfx_doropn);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-        case -1:               // DOWN
-            res = T_MovePlane(door->sector, door->speed,
-                              door->sector->floorheight, false, 1,
-                              door->direction);
-            if (res == pastdest)
-            {
-                switch (door->type)
-                {
-                    case vld_normal:
-                    case vld_close:
-                        door->sector->specialdata = NULL;
-                        P_RemoveThinker(&door->thinker);        // unlink and free
-                        S_StartSound(&door->sector->soundorg, sfx_dorcls);
-                        break;
-                    case vld_close30ThenOpen:
-                        door->direction = 0;
-                        door->topcountdown = 35 * 30;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            else if (res == crushed)
-            {
-                switch (door->type)
-                {
-                    case vld_close:        // DON'T GO BACK UP!
-                        break;
-                    default:
-                        door->direction = 1;
-                        S_StartSound(&door->sector->soundorg, sfx_doropn);
-                        break;
-                }
-            }
-            break;
-        case 1:                // UP
-            res = T_MovePlane(door->sector, door->speed,
-                              door->topheight, false, 1, door->direction);
-            if (res == pastdest)
-            {
-                switch (door->type)
-                {
-                    case vld_normal:
-                        door->direction = 0;    // wait at top
-                        door->topcountdown = door->topwait;
-                        break;
-                    case vld_close30ThenOpen:
-                    case vld_open:
-                        door->sector->specialdata = NULL;
-                        P_RemoveThinker(&door->thinker);        // unlink and free
-                        S_StopSound(&door->sector->soundorg);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// EV_DoDoor
-//
-// Move a door up/down
-//
-//----------------------------------------------------------------------------
-
-int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed)
-{
-    int secnum;
-    int retcode;
-    sector_t *sec;
-    vldoor_t *door;
-
-    secnum = -1;
-    retcode = 0;
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-        {
-            continue;
-        }
-        // Add new door thinker
-        retcode = 1;
-        door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-        P_AddThinker(&door->thinker);
-        sec->specialdata = door;
-        door->thinker.function = T_VerticalDoor;
-        door->sector = sec;
-        switch (type)
-        {
-            case vld_close:
-                door->topheight = P_FindLowestCeilingSurrounding(sec);
-                door->topheight -= 4 * FRACUNIT;
-                door->direction = -1;
-                S_StartSound(&door->sector->soundorg, sfx_doropn);
-                break;
-            case vld_close30ThenOpen:
-                door->topheight = sec->ceilingheight;
-                door->direction = -1;
-                S_StartSound(&door->sector->soundorg, sfx_doropn);
-                break;
-            case vld_normal:
-            case vld_open:
-                door->direction = 1;
-                door->topheight = P_FindLowestCeilingSurrounding(sec);
-                door->topheight -= 4 * FRACUNIT;
-                if (door->topheight != sec->ceilingheight)
-                {
-                    S_StartSound(&door->sector->soundorg,
-                                 sfx_doropn);
-                }
-                break;
-            default:
-                break;
-        }
-        door->type = type;
-        door->speed = speed;
-        door->topwait = VDOORWAIT;
-    }
-    return (retcode);
-}
-
-//==================================================================
-//
-//      EV_VerticalDoor : open a door manually, no tag value
-//
-//==================================================================
-void EV_VerticalDoor(line_t * line, mobj_t * thing)
-{
-    player_t *player;
-    sector_t *sec;
-    vldoor_t *door;
-    int side;
-
-    side = 0;                   // only front sides can be used
-//
-//      Check for locks
-//
-    player = thing->player;
-    switch (line->special)
-    {
-        case 26:               // Blue Lock
-        case 32:
-            if (!player)
-            {
-                return;
-            }
-            if (!player->keys[key_blue])
-            {
-                P_SetMessage(player, DEH_String(TXT_NEEDBLUEKEY), false);
-                S_StartSound(NULL, sfx_plroof);
-                return;
-            }
-            break;
-        case 27:               // Yellow Lock
-        case 34:
-            if (!player)
-            {
-                return;
-            }
-            if (!player->keys[key_yellow])
-            {
-                P_SetMessage(player, DEH_String(TXT_NEEDYELLOWKEY), false);
-                S_StartSound(NULL, sfx_plroof);
-                return;
-            }
-            break;
-        case 28:               // Green Lock
-        case 33:
-            if (!player)
-            {
-                return;
-            }
-            if (!player->keys[key_green])
-            {
-                P_SetMessage(player, DEH_String(TXT_NEEDGREENKEY), false);
-                S_StartSound(NULL, sfx_plroof);
-                return;
-            }
-            break;
-    }
-
-    // if the sector has an active thinker, use it
-    sec = sides[line->sidenum[side ^ 1]].sector;
-    if (sec->specialdata)
-    {
-        door = sec->specialdata;
-        switch (line->special)
-        {
-            case 1:            // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
-            case 26:
-            case 27:
-            case 28:
-                if (door->direction == -1)
-                {
-                    door->direction = 1;        // go back up
-                }
-                else
-                {
-                    if (!thing->player)
-                    {           // Monsters don't close doors
-                        return;
-                    }
-                    door->direction = -1;       // start going down immediately
-                }
-                return;
-        }
-    }
-
-    // for proper sound
-    switch (line->special)
-    {
-        case 1:                // NORMAL DOOR SOUND
-        case 31:
-            S_StartSound(&sec->soundorg, sfx_doropn);
-            //S_StartSound(&sec->soundorg, sfx_dormov);
-            break;
-        default:               // LOCKED DOOR SOUND
-            S_StartSound(&sec->soundorg, sfx_doropn);
-            //S_StartSound(&sec->soundorg, sfx_dormov);
-            break;
-    }
-
-    //
-    // new door thinker
-    //
-    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-    P_AddThinker(&door->thinker);
-    sec->specialdata = door;
-    door->thinker.function = T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 1;
-    switch (line->special)
-    {
-        case 1:
-        case 26:
-        case 27:
-        case 28:
-            door->type = vld_normal;
-            break;
-        case 31:
-        case 32:
-        case 33:
-        case 34:
-            door->type = vld_open;
-            line->special = 0;
-            break;
-    }
-    door->speed = VDOORSPEED;
-    door->topwait = VDOORWAIT;
-
-    //
-    // find the top and bottom of the movement range
-    //
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4 * FRACUNIT;
-}
-
-//==================================================================
-//
-//      Spawn a door that closes after 30 seconds
-//
-//==================================================================
-void P_SpawnDoorCloseIn30(sector_t * sec)
-{
-    vldoor_t *door;
-
-    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-    P_AddThinker(&door->thinker);
-    sec->specialdata = door;
-    sec->special = 0;
-    door->thinker.function = T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 0;
-    door->type = vld_normal;
-    door->speed = VDOORSPEED;
-    door->topcountdown = 30 * 35;
-}
-
-//==================================================================
-//
-//      Spawn a door that opens after 5 minutes
-//
-//==================================================================
-void P_SpawnDoorRaiseIn5Mins(sector_t * sec, int secnum)
-{
-    vldoor_t *door;
-
-    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-    P_AddThinker(&door->thinker);
-    sec->specialdata = door;
-    sec->special = 0;
-    door->thinker.function = T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 2;
-    door->type = vld_raiseIn5Mins;
-    door->speed = VDOORSPEED;
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4 * FRACUNIT;
-    door->topwait = VDOORWAIT;
-    door->topcountdown = 5 * 60 * 35;
-}
diff --git a/games/NXDoom/src/heretic/p_enemy.c b/games/NXDoom/src/heretic/p_enemy.c
deleted file mode 100644
index 3ade41ae9..000000000
--- a/games/NXDoom/src/heretic/p_enemy.c
+++ /dev/null
@@ -1,2711 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_enemy.c
-
-#include <stdlib.h>
-#include "doomdef.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-// Macros
-
-#define MAX_BOSS_SPOTS 8
-
-// Types
-
-typedef struct
-{
-    fixed_t x;
-    fixed_t y;
-    angle_t angle;
-} BossSpot_t;
-
-// Private Data
-
-static int BossSpotCount;
-static BossSpot_t BossSpots[MAX_BOSS_SPOTS];
-
-//----------------------------------------------------------------------------
-//
-// PROC P_InitMonsters
-//
-// Called at level load.
-//
-//----------------------------------------------------------------------------
-
-void P_InitMonsters(void)
-{
-    BossSpotCount = 0;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_AddBossSpot
-//
-//----------------------------------------------------------------------------
-
-void P_AddBossSpot(fixed_t x, fixed_t y, angle_t angle)
-{
-    if (BossSpotCount == MAX_BOSS_SPOTS)
-    {
-        I_Error("Too many boss spots.");
-    }
-    BossSpots[BossSpotCount].x = x;
-    BossSpots[BossSpotCount].y = y;
-    BossSpots[BossSpotCount].angle = angle;
-    BossSpotCount++;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_RecursiveSound
-//
-//----------------------------------------------------------------------------
-
-mobj_t *soundtarget;
-
-void P_RecursiveSound(sector_t * sec, int soundblocks)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-
-    // Wake up all monsters in this sector
-    if (sec->validcount == validcount
-        && sec->soundtraversed <= soundblocks + 1)
-    {                           // Already flooded
-        return;
-    }
-    sec->validcount = validcount;
-    sec->soundtraversed = soundblocks + 1;
-    sec->soundtarget = soundtarget;
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        if (!(check->flags & ML_TWOSIDED))
-        {
-            continue;
-        }
-        P_LineOpening(check);
-        if (openrange <= 0)
-        {                       // Closed door
-            continue;
-        }
-        if (sides[check->sidenum[0]].sector == sec)
-        {
-            other = sides[check->sidenum[1]].sector;
-        }
-        else
-        {
-            other = sides[check->sidenum[0]].sector;
-        }
-        if (check->flags & ML_SOUNDBLOCK)
-        {
-            if (!soundblocks)
-            {
-                P_RecursiveSound(other, 1);
-            }
-        }
-        else
-        {
-            P_RecursiveSound(other, soundblocks);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_NoiseAlert
-//
-// If a monster yells at a player, it will alert other monsters to the
-// player.
-//
-//----------------------------------------------------------------------------
-
-void P_NoiseAlert(mobj_t * target, mobj_t * emmiter)
-{
-    soundtarget = target;
-    validcount++;
-    P_RecursiveSound(emmiter->subsector->sector, 0);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_CheckMeleeRange
-//
-//----------------------------------------------------------------------------
-
-boolean P_CheckMeleeRange(mobj_t * actor)
-{
-    mobj_t *mo;
-    fixed_t dist;
-
-    if (!actor->target)
-    {
-        return (false);
-    }
-    mo = actor->target;
-    dist = P_AproxDistance(mo->x - actor->x, mo->y - actor->y);
-    if (dist >= MELEERANGE)
-    {
-        return (false);
-    }
-    if (!P_CheckSight(actor, mo))
-    {
-        return (false);
-    }
-    if (mo->z > actor->z + actor->height)
-    {                           // Target is higher than the attacker
-        return (false);
-    }
-    else if (actor->z > mo->z + mo->height)
-    {                           // Attacker is higher
-        return (false);
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_CheckMissileRange
-//
-//----------------------------------------------------------------------------
-
-boolean P_CheckMissileRange(mobj_t * actor)
-{
-    fixed_t dist;
-
-    if (!P_CheckSight(actor, actor->target))
-    {
-        return (false);
-    }
-    if (actor->flags & MF_JUSTHIT)
-    {                           // The target just hit the enemy, so fight back!
-        actor->flags &= ~MF_JUSTHIT;
-        return (true);
-    }
-    if (actor->reactiontime)
-    {                           // Don't attack yet
-        return (false);
-    }
-    dist = (P_AproxDistance(actor->x - actor->target->x,
-                            actor->y - actor->target->y) >> FRACBITS) - 64;
-    if (!actor->info->meleestate)
-    {                           // No melee attack, so fire more frequently
-        dist -= 128;
-    }
-    if (actor->type == MT_IMP)
-    {                           // Imp's fly attack from far away
-        dist >>= 1;
-    }
-    if (dist > 200)
-    {
-        dist = 200;
-    }
-    if (P_Random() < dist)
-    {
-        return (false);
-    }
-    return (true);
-}
-
-/*
-================
-=
-= P_Move
-=
-= Move in the current direction
-= returns false if the move is blocked
-================
-*/
-
-fixed_t xspeed[8] =
-    { FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000, 0, 47000 };
-fixed_t yspeed[8] =
-    { 0, 47000, FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000 };
-
-
-boolean P_Move(mobj_t * actor)
-{
-    fixed_t tryx, tryy;
-    line_t *ld;
-    boolean good;
-
-    if (actor->movedir == DI_NODIR)
-    {
-        return (false);
-    }
-    tryx = actor->x + actor->info->speed * xspeed[actor->movedir];
-    tryy = actor->y + actor->info->speed * yspeed[actor->movedir];
-    if (!P_TryMove(actor, tryx, tryy))
-    {                           // open any specials
-        if (actor->flags & MF_FLOAT && floatok)
-        {                       // must adjust height
-            if (actor->z < tmfloorz)
-            {
-                actor->z += FLOATSPEED;
-            }
-            else
-            {
-                actor->z -= FLOATSPEED;
-            }
-            actor->flags |= MF_INFLOAT;
-            return (true);
-        }
-        if (!numspechit)
-        {
-            return false;
-        }
-        actor->movedir = DI_NODIR;
-        good = false;
-        while (numspechit--)
-        {
-            ld = spechit[numspechit];
-            // if the special isn't a door that can be opened, return false
-            if (P_UseSpecialLine(actor, ld))
-            {
-                good = true;
-            }
-        }
-        return (good);
-    }
-    else
-    {
-        actor->flags &= ~MF_INFLOAT;
-    }
-    if (!(actor->flags & MF_FLOAT))
-    {
-        if (actor->z > actor->floorz)
-        {
-            P_HitFloor(actor);
-        }
-        actor->z = actor->floorz;
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_TryWalk
-//
-// Attempts to move actor in its current (ob->moveangle) direction.
-// If blocked by either a wall or an actor returns FALSE.
-// If move is either clear of block only by a door, returns TRUE and sets.
-// If a door is in the way, an OpenDoor call is made to start it opening.
-//
-//----------------------------------------------------------------------------
-
-boolean P_TryWalk(mobj_t * actor)
-{
-    if (!P_Move(actor))
-    {
-        return (false);
-    }
-    actor->movecount = P_Random() & 15;
-    return (true);
-}
-
-/*
-================
-=
-= P_NewChaseDir
-=
-================
-*/
-
-dirtype_t opposite[] =
-    { DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST, DI_EAST, DI_NORTHEAST,
-    DI_NORTH, DI_NORTHWEST, DI_NODIR
-};
-
-dirtype_t diags[] =
-    { DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST };
-
-void P_NewChaseDir(mobj_t * actor)
-{
-    fixed_t deltax, deltay;
-    dirtype_t d[3];
-    dirtype_t tdir, olddir, turnaround;
-
-    if (!actor->target)
-        I_Error("P_NewChaseDir: called with no target");
-
-    olddir = actor->movedir;
-    turnaround = opposite[olddir];
-
-    deltax = actor->target->x - actor->x;
-    deltay = actor->target->y - actor->y;
-    if (deltax > 10 * FRACUNIT)
-        d[1] = DI_EAST;
-    else if (deltax < -10 * FRACUNIT)
-        d[1] = DI_WEST;
-    else
-        d[1] = DI_NODIR;
-    if (deltay < -10 * FRACUNIT)
-        d[2] = DI_SOUTH;
-    else if (deltay > 10 * FRACUNIT)
-        d[2] = DI_NORTH;
-    else
-        d[2] = DI_NODIR;
-
-// try direct route
-    if (d[1] != DI_NODIR && d[2] != DI_NODIR)
-    {
-        actor->movedir = diags[((deltay < 0) << 1) + (deltax > 0)];
-        if (actor->movedir != turnaround && P_TryWalk(actor))
-            return;
-    }
-
-// try other directions
-    if (P_Random() > 200 || abs(deltay) > abs(deltax))
-    {
-        tdir = d[1];
-        d[1] = d[2];
-        d[2] = tdir;
-    }
-
-    if (d[1] == turnaround)
-        d[1] = DI_NODIR;
-    if (d[2] == turnaround)
-        d[2] = DI_NODIR;
-
-    if (d[1] != DI_NODIR)
-    {
-        actor->movedir = d[1];
-        if (P_TryWalk(actor))
-            return;             /*either moved forward or attacked */
-    }
-
-    if (d[2] != DI_NODIR)
-    {
-        actor->movedir = d[2];
-        if (P_TryWalk(actor))
-            return;
-    }
-
-/* there is no direct path to the player, so pick another direction */
-
-    if (olddir != DI_NODIR)
-    {
-        actor->movedir = olddir;
-        if (P_TryWalk(actor))
-            return;
-    }
-
-    if (P_Random() & 1)         /*randomly determine direction of search */
-    {
-        for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
-        {
-            if (tdir != turnaround)
-            {
-                actor->movedir = tdir;
-                if (P_TryWalk(actor))
-                    return;
-            }
-        }
-    }
-    else
-    {
-        // Iterate over all movedirs.
-        tdir = DI_SOUTHEAST;
-
-        for (;;)
-        {
-            if (tdir != turnaround)
-            {
-                actor->movedir = tdir;
-                if (P_TryWalk(actor))
-                    return;
-            }
-
-            if (tdir == DI_EAST)
-            {
-                break;
-            }
-
-            --tdir;
-        }
-    }
-
-    if (turnaround != DI_NODIR)
-    {
-        actor->movedir = turnaround;
-        if (P_TryWalk(actor))
-            return;
-    }
-
-    actor->movedir = DI_NODIR;  // can't move
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_LookForMonsters
-//
-//---------------------------------------------------------------------------
-
-#define MONS_LOOK_RANGE (20*64*FRACUNIT)
-#define MONS_LOOK_LIMIT 64
-
-boolean P_LookForMonsters(mobj_t * actor)
-{
-    int count;
-    mobj_t *mo;
-    thinker_t *think;
-
-    if (!P_CheckSight(players[0].mo, actor))
-    {                           // Player can't see monster
-        return (false);
-    }
-    count = 0;
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-        if (!(mo->flags & MF_COUNTKILL) || (mo == actor) || (mo->health <= 0))
-        {                       // Not a valid monster
-            continue;
-        }
-        if (P_AproxDistance(actor->x - mo->x, actor->y - mo->y)
-            > MONS_LOOK_RANGE)
-        {                       // Out of range
-            continue;
-        }
-        if (P_Random() < 16)
-        {                       // Skip
-            continue;
-        }
-        if (count++ > MONS_LOOK_LIMIT)
-        {                       // Stop searching
-            return (false);
-        }
-        if (!P_CheckSight(actor, mo))
-        {                       // Out of sight
-            continue;
-        }
-        // Found a target monster
-        actor->target = mo;
-        return (true);
-    }
-    return (false);
-}
-
-/*
-================
-=
-= P_LookForPlayers
-=
-= If allaround is false, only look 180 degrees in front
-= returns true if a player is targeted
-================
-*/
-
-boolean P_LookForPlayers(mobj_t * actor, boolean allaround)
-{
-    int c;
-    int stop;
-    player_t *player;
-    angle_t an;
-    fixed_t dist;
-
-    if (!netgame && players[0].health <= 0)
-    {                           // Single player game and player is dead, look for monsters
-        return (P_LookForMonsters(actor));
-    }
-    c = 0;
-    stop = (actor->lastlook - 1) & 3;
-    for (;; actor->lastlook = (actor->lastlook + 1) & 3)
-    {
-        if (!playeringame[actor->lastlook])
-            continue;
-
-        if (c++ == 2 || actor->lastlook == stop)
-            return false;       // done looking
-
-        player = &players[actor->lastlook];
-        if (player->health <= 0)
-            continue;           // dead
-        if (!P_CheckSight(actor, player->mo))
-            continue;           // out of sight
-
-        if (!allaround)
-        {
-            an = R_PointToAngle2(actor->x, actor->y,
-                                 player->mo->x, player->mo->y) - actor->angle;
-            if (an > ANG90 && an < ANG270)
-            {
-                dist = P_AproxDistance(player->mo->x - actor->x,
-                                       player->mo->y - actor->y);
-                // if real close, react anyway
-                if (dist > MELEERANGE)
-                    continue;   // behind back
-            }
-        }
-        if (player->mo->flags & MF_SHADOW)
-        {                       // Player is invisible
-            if ((P_AproxDistance(player->mo->x - actor->x,
-                                 player->mo->y - actor->y) > 2 * MELEERANGE)
-                && P_AproxDistance(player->mo->momx, player->mo->momy)
-                < 5 * FRACUNIT)
-            {                   // Player is sneaking - can't detect
-                return (false);
-            }
-            if (P_Random() < 225)
-            {                   // Player isn't sneaking, but still didn't detect
-                return (false);
-            }
-        }
-        actor->target = player->mo;
-        return (true);
-    }
-    return (false);
-}
-
-/*
-===============================================================================
-
-						ACTION ROUTINES
-
-===============================================================================
-*/
-
-/*
-==============
-=
-= A_Look
-=
-= Stay in state until a player is sighted
-=
-==============
-*/
-
-void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *targ;
-
-    actor->threshold = 0;       // any shot will wake up
-    targ = actor->subsector->sector->soundtarget;
-    if (targ && (targ->flags & MF_SHOOTABLE))
-    {
-        actor->target = targ;
-        if (actor->flags & MF_AMBUSH)
-        {
-            if (P_CheckSight(actor, actor->target))
-                goto seeyou;
-        }
-        else
-            goto seeyou;
-    }
-
-
-    if (!P_LookForPlayers(actor, false))
-        return;
-
-// go into chase state
-  seeyou:
-    if (actor->info->seesound)
-    {
-        int sound;
-
-/*
-		switch (actor->info->seesound)
-		{
-		case sfx_posit1:
-		case sfx_posit2:
-		case sfx_posit3:
-			sound = sfx_posit1+P_Random()%3;
-			break;
-		case sfx_bgsit1:
-		case sfx_bgsit2:
-			sound = sfx_bgsit1+P_Random()%2;
-			break;
-		default:
-			sound = actor->info->seesound;
-			break;
-		}
-*/
-        sound = actor->info->seesound;
-        if (actor->flags2 & MF2_BOSS)
-        {                       // Full volume
-            S_StartSound(NULL, sound);
-        }
-        else
-        {
-            S_StartSound(actor, sound);
-        }
-    }
-    P_SetMobjState(actor, actor->info->seestate);
-}
-
-
-/*
-==============
-=
-= A_Chase
-=
-= Actor has a melee attack, so it tries to close as fast as possible
-=
-==============
-*/
-
-void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int delta;
-
-    if (actor->reactiontime)
-    {
-        actor->reactiontime--;
-    }
-
-    // Modify target threshold
-    if (actor->threshold)
-    {
-        actor->threshold--;
-    }
-
-    if (gameskill == sk_nightmare)
-    {                           // Monsters move faster in nightmare mode
-        actor->tics -= actor->tics / 2;
-        if (actor->tics < 3)
-        {
-            actor->tics = 3;
-        }
-    }
-
-//
-// turn towards movement direction if not there yet
-//
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-        delta = actor->angle - (actor->movedir << 29);
-        if (delta > 0)
-        {
-            actor->angle -= ANG90 / 2;
-        }
-        else if (delta < 0)
-        {
-            actor->angle += ANG90 / 2;
-        }
-    }
-
-    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
-    {                           // look for a new target
-        if (P_LookForPlayers(actor, true))
-        {                       // got a new target
-            return;
-        }
-        P_SetMobjState(actor, actor->info->spawnstate);
-        return;
-    }
-
-//
-// don't attack twice in a row
-//
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-        if (gameskill != sk_nightmare)
-            P_NewChaseDir(actor);
-        return;
-    }
-
-//
-// check for melee attack
-//      
-    if (actor->info->meleestate && P_CheckMeleeRange(actor))
-    {
-        if (actor->info->attacksound)
-            S_StartSound(actor, actor->info->attacksound);
-        P_SetMobjState(actor, actor->info->meleestate);
-        return;
-    }
-
-//
-// check for missile attack
-//
-    if (actor->info->missilestate)
-    {
-        if (gameskill < sk_nightmare && actor->movecount)
-            goto nomissile;
-        if (!P_CheckMissileRange(actor))
-            goto nomissile;
-        P_SetMobjState(actor, actor->info->missilestate);
-        actor->flags |= MF_JUSTATTACKED;
-        return;
-    }
-  nomissile:
-
-//
-// possibly choose another target
-//
-    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
-    {
-        if (P_LookForPlayers(actor, true))
-            return;             // got a new target
-    }
-
-//
-// chase towards player
-//
-    if (--actor->movecount < 0 || !P_Move(actor))
-    {
-        P_NewChaseDir(actor);
-    }
-
-//
-// make active sound
-//
-    if (actor->info->activesound && P_Random() < 3)
-    {
-        if (actor->type == MT_WIZARD && P_Random() < 128)
-        {
-            S_StartSound(actor, actor->info->seesound);
-        }
-        else if (actor->type == MT_SORCERER2)
-        {
-            S_StartSound(NULL, actor->info->activesound);
-        }
-        else
-        {
-            S_StartSound(actor, actor->info->activesound);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FaceTarget
-//
-//----------------------------------------------------------------------------
-
-void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    actor->flags &= ~MF_AMBUSH;
-    actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x,
-                                   actor->target->y);
-    if (actor->target->flags & MF_SHADOW)
-    {                           // Target is a ghost
-        actor->angle += P_SubRandom() << 21;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Pain
-//
-//----------------------------------------------------------------------------
-
-void A_Pain(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->info->painsound)
-    {
-        S_StartSound(actor, actor->info->painsound);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_DripBlood
-//
-//----------------------------------------------------------------------------
-
-void A_DripBlood(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1,r2;
-
-    r1 = P_SubRandom();
-    r2 = P_SubRandom();
-
-    mo = P_SpawnMobj(actor->x + (r2 << 11),
-                     actor->y + (r1 << 11), actor->z,
-                     MT_BLOOD);
-    mo->momx = P_SubRandom() << 10;
-    mo->momy = P_SubRandom() << 10;
-    mo->flags2 |= MF2_LOGRAV;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_KnightAttack
-//
-//----------------------------------------------------------------------------
-
-void A_KnightAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
-        S_StartSound(actor, sfx_kgtat2);
-        return;
-    }
-    // Throw axe
-    S_StartSound(actor, actor->info->attacksound);
-    if (actor->type == MT_KNIGHTGHOST || P_Random() < 40)
-    {                           // Red axe
-        P_SpawnMissile(actor, actor->target, MT_REDAXE);
-        return;
-    }
-    // Green axe
-    P_SpawnMissile(actor, actor->target, MT_KNIGHTAXE);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpExplode
-//
-//----------------------------------------------------------------------------
-
-void A_ImpExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_IMPCHUNK1);
-    mo->momx = P_SubRandom() << 10;
-    mo->momy = P_SubRandom() << 10;
-    mo->momz = 9 * FRACUNIT;
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_IMPCHUNK2);
-    mo->momx = P_SubRandom() << 10;
-    mo->momy = P_SubRandom() << 10;
-    mo->momz = 9 * FRACUNIT;
-    if (actor->special1.i == 666)
-    {                           // Extreme death crash
-        P_SetMobjState(actor, S_IMP_XCRASH1);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BeastPuff
-//
-//----------------------------------------------------------------------------
-
-void A_BeastPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_Random() > 64)
-    {
-        int r1,r2,r3;
-        r1 = P_SubRandom();
-        r2 = P_SubRandom();
-        r3 = P_SubRandom();
-        P_SpawnMobj(actor->x + (r3 << 10),
-                    actor->y + (r2 << 10),
-                    actor->z + (r1 << 10), MT_PUFFY);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpMeAttack
-//
-//----------------------------------------------------------------------------
-
-void A_ImpMeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, 5 + (P_Random() & 7));
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpMsAttack
-//
-//----------------------------------------------------------------------------
-
-void A_ImpMsAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *dest;
-    angle_t an;
-    int dist;
-
-    if (!actor->target || P_Random() > 64)
-    {
-        P_SetMobjState(actor, actor->info->seestate);
-        return;
-    }
-    dest = actor->target;
-    actor->flags |= MF_SKULLFLY;
-    S_StartSound(actor, actor->info->attacksound);
-    A_FaceTarget(actor, player, psp);
-    an = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(12 * FRACUNIT, finecosine[an]);
-    actor->momy = FixedMul(12 * FRACUNIT, finesine[an]);
-    dist = P_AproxDistance(dest->x - actor->x, dest->y - actor->y);
-    dist = dist / (12 * FRACUNIT);
-    if (dist < 1)
-    {
-        dist = 1;
-    }
-    actor->momz = (dest->z + (dest->height >> 1) - actor->z) / dist;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpMsAttack2
-//
-// Fireball attack of the imp leader.
-//
-//----------------------------------------------------------------------------
-
-void A_ImpMsAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, 5 + (P_Random() & 7));
-        return;
-    }
-    P_SpawnMissile(actor, actor->target, MT_IMPBALL);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpDeath
-//
-//----------------------------------------------------------------------------
-
-void A_ImpDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SOLID;
-    actor->flags2 |= MF2_FOOTCLIP;
-    if (actor->z <= actor->floorz)
-    {
-        P_SetMobjState(actor, S_IMP_CRASH1);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpXDeath1
-//
-//----------------------------------------------------------------------------
-
-void A_ImpXDeath1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SOLID;
-    actor->flags |= MF_NOGRAVITY;
-    actor->flags2 |= MF2_FOOTCLIP;
-    actor->special1.i = 666;      // Flag the crash routine
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ImpXDeath2
-//
-//----------------------------------------------------------------------------
-
-void A_ImpXDeath2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_NOGRAVITY;
-    if (actor->z <= actor->floorz)
-    {
-        P_SetMobjState(actor, S_IMP_CRASH1);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_UpdateChicken
-//
-// Returns true if the chicken morphs.
-//
-//----------------------------------------------------------------------------
-
-boolean P_UpdateChicken(mobj_t * actor, int tics)
-{
-    mobj_t *fog;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    mobjtype_t moType;
-    mobj_t *mo;
-    mobj_t oldChicken;
-
-    actor->special1.i -= tics;
-    if (actor->special1.i > 0)
-    {
-        return (false);
-    }
-    moType = actor->special2.i;
-    x = actor->x;
-    y = actor->y;
-    z = actor->z;
-    oldChicken = *actor;
-    P_SetMobjState(actor, S_FREETARGMOBJ);
-    mo = P_SpawnMobj(x, y, z, moType);
-    if (P_TestMobjLocation(mo) == false)
-    {                           // Didn't fit
-        P_RemoveMobj(mo);
-        mo = P_SpawnMobj(x, y, z, MT_CHICKEN);
-        mo->angle = oldChicken.angle;
-        mo->flags = oldChicken.flags;
-        mo->health = oldChicken.health;
-        mo->target = oldChicken.target;
-        mo->special1.i = 5 * 35;  // Next try in 5 seconds
-        mo->special2.i = moType;
-        return (false);
-    }
-    mo->angle = oldChicken.angle;
-    mo->target = oldChicken.target;
-    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ChicAttack
-//
-//----------------------------------------------------------------------------
-
-void A_ChicAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateChicken(actor, 18))
-    {
-        return;
-    }
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, 1 + (P_Random() & 1));
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ChicLook
-//
-//----------------------------------------------------------------------------
-
-void A_ChicLook(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateChicken(actor, 10))
-    {
-        return;
-    }
-    A_Look(actor, player, psp);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ChicChase
-//
-//----------------------------------------------------------------------------
-
-void A_ChicChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateChicken(actor, 3))
-    {
-        return;
-    }
-    A_Chase(actor, player, psp);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ChicPain
-//
-//----------------------------------------------------------------------------
-
-void A_ChicPain(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateChicken(actor, 10))
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->painsound);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Feathers
-//
-//----------------------------------------------------------------------------
-
-void A_Feathers(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    int count;
-    mobj_t *mo;
-
-    if (actor->health > 0)
-    {                           // Pain
-        count = P_Random() < 32 ? 2 : 1;
-    }
-    else
-    {                           // Death
-        count = 5 + (P_Random() & 3);
-    }
-    for (i = 0; i < count; i++)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z + 20 * FRACUNIT,
-                         MT_FEATHER);
-        mo->target = actor;
-        mo->momx = P_SubRandom() << 8;
-        mo->momy = P_SubRandom() << 8;
-        mo->momz = FRACUNIT + (P_Random() << 9);
-        P_SetMobjState(mo, S_FEATHER1 + (P_Random() & 7));
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MummyAttack
-//
-//----------------------------------------------------------------------------
-
-void A_MummyAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
-        S_StartSound(actor, sfx_mumat2);
-        return;
-    }
-    S_StartSound(actor, sfx_mumat1);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MummyAttack2
-//
-// Mummy leader missile attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MummyAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    //S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
-        return;
-    }
-    mo = P_SpawnMissile(actor, actor->target, MT_MUMMYFX1);
-    //mo = P_SpawnMissile(actor, actor->target, MT_EGGFX);
-    if (mo != NULL)
-    {
-        mo->special1.m = actor->target;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MummyFX1Seek
-//
-//----------------------------------------------------------------------------
-
-void A_MummyFX1Seek(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 20);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MummySoul
-//
-//----------------------------------------------------------------------------
-
-void A_MummySoul(mobj_t * mummy, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(mummy->x, mummy->y, mummy->z + 10 * FRACUNIT,
-                     MT_MUMMYSOUL);
-    mo->momz = FRACUNIT;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Sor1Pain
-//
-//----------------------------------------------------------------------------
-
-void A_Sor1Pain(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->special1.i = 20;       // Number of steps to walk fast
-    A_Pain(actor, player, psp);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Sor1Chase
-//
-//----------------------------------------------------------------------------
-
-void A_Sor1Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special1.i)
-    {
-        actor->special1.i--;
-        actor->tics -= 3;
-    }
-    A_Chase(actor, player, psp);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Srcr1Attack
-//
-// Sorcerer demon attack.
-//
-//----------------------------------------------------------------------------
-
-void A_Srcr1Attack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    fixed_t momz;
-    angle_t angle;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(8));
-        return;
-    }
-    if (actor->health > (actor->info->spawnhealth / 3) * 2)
-    {                           // Spit one fireball
-        P_SpawnMissile(actor, actor->target, MT_SRCRFX1);
-    }
-    else
-    {                           // Spit three fireballs
-        mo = P_SpawnMissile(actor, actor->target, MT_SRCRFX1);
-        if (mo)
-        {
-            momz = mo->momz;
-            angle = mo->angle;
-            P_SpawnMissileAngle(actor, MT_SRCRFX1, angle - ANG1_X * 3, momz);
-            P_SpawnMissileAngle(actor, MT_SRCRFX1, angle + ANG1_X * 3, momz);
-        }
-        if (actor->health < actor->info->spawnhealth / 3)
-        {                       // Maybe attack again
-            if (actor->special1.i)
-            {                   // Just attacked, so don't attack again
-                actor->special1.i = 0;
-            }
-            else
-            {                   // Set state to attack again
-                actor->special1.i = 1;
-                P_SetMobjState(actor, S_SRCR1_ATK4);
-            }
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SorcererRise
-//
-//----------------------------------------------------------------------------
-
-void A_SorcererRise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    actor->flags &= ~MF_SOLID;
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCERER2);
-    P_SetMobjState(mo, S_SOR2_RISE1);
-    mo->angle = actor->angle;
-    mo->target = actor->target;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_DSparilTeleport
-//
-//----------------------------------------------------------------------------
-
-void P_DSparilTeleport(mobj_t *actor)
-{
-    int i;
-    fixed_t x;
-    fixed_t y;
-    fixed_t prevX;
-    fixed_t prevY;
-    fixed_t prevZ;
-    mobj_t *mo;
-
-    if (!BossSpotCount)
-    {                           // No spots
-        return;
-    }
-    i = P_Random();
-    do
-    {
-        i++;
-        x = BossSpots[i % BossSpotCount].x;
-        y = BossSpots[i % BossSpotCount].y;
-    }
-    while (P_AproxDistance(actor->x - x, actor->y - y) < 128 * FRACUNIT);
-    prevX = actor->x;
-    prevY = actor->y;
-    prevZ = actor->z;
-    if (P_TeleportMove(actor, x, y))
-    {
-        mo = P_SpawnMobj(prevX, prevY, prevZ, MT_SOR2TELEFADE);
-        S_StartSound(mo, sfx_telept);
-        P_SetMobjState(actor, S_SOR2_TELE1);
-        S_StartSound(actor, sfx_telept);
-        actor->z = actor->floorz;
-        actor->angle = BossSpots[i % BossSpotCount].angle;
-        actor->momx = actor->momy = actor->momz = 0;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Srcr2Decide
-//
-//----------------------------------------------------------------------------
-
-void A_Srcr2Decide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    static int chance[] = {
-        192, 120, 120, 120, 64, 64, 32, 16, 0
-    };
-
-    if (!BossSpotCount)
-    {                           // No spots
-        return;
-    }
-    if (P_Random() < chance[actor->health / (actor->info->spawnhealth / 8)])
-    {
-        P_DSparilTeleport(actor);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Srcr2Attack
-//
-//----------------------------------------------------------------------------
-
-void A_Srcr2Attack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int chance;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(NULL, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(20));
-        return;
-    }
-    chance = actor->health < actor->info->spawnhealth / 2 ? 96 : 48;
-    if (P_Random() < chance)
-    {                           // Wizard spawners
-        P_SpawnMissileAngle(actor, MT_SOR2FX2,
-                            actor->angle - ANG45, FRACUNIT / 2);
-        P_SpawnMissileAngle(actor, MT_SOR2FX2,
-                            actor->angle + ANG45, FRACUNIT / 2);
-    }
-    else
-    {                           // Blue bolt
-        P_SpawnMissile(actor, actor->target, MT_SOR2FX1);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BlueSpark
-//
-//----------------------------------------------------------------------------
-
-void A_BlueSpark(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    mobj_t *mo;
-
-    for (i = 0; i < 2; i++)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SOR2FXSPARK);
-        mo->momx = P_SubRandom() << 9;
-        mo->momy = P_SubRandom() << 9;
-        mo->momz = FRACUNIT + (P_Random() << 8);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_GenWizard
-//
-//----------------------------------------------------------------------------
-
-void A_GenWizard(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    mobj_t *fog;
-
-    mo = P_SpawnMobj(actor->x, actor->y,
-                     actor->z - mobjinfo[MT_WIZARD].height / 2, MT_WIZARD);
-    if (P_TestMobjLocation(mo) == false)
-    {                           // Didn't fit
-        P_RemoveMobj(mo);
-        return;
-    }
-    actor->momx = actor->momy = actor->momz = 0;
-    P_SetMobjState(actor, mobjinfo[actor->type].deathstate);
-    actor->flags &= ~MF_MISSILE;
-    fog = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Sor2DthInit
-//
-//----------------------------------------------------------------------------
-
-void A_Sor2DthInit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->special1.i = 7;        // Animation loop counter
-    P_Massacre();               // Kill monsters early
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Sor2DthLoop
-//
-//----------------------------------------------------------------------------
-
-void A_Sor2DthLoop(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (--actor->special1.i)
-    {                           // Need to loop
-        P_SetMobjState(actor, S_SOR2_DIE4);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// D'Sparil Sound Routines
-//
-//----------------------------------------------------------------------------
-
-void A_SorZap(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, sfx_sorzap);
-}
-
-void A_SorRise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, sfx_sorrise);
-}
-
-void A_SorDSph(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, sfx_sordsph);
-}
-
-void A_SorDExp(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, sfx_sordexp);
-}
-
-void A_SorDBon(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, sfx_sordbon);
-}
-
-void A_SorSightSnd(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, sfx_sorsit);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurAtk1
-//
-// Melee attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurAtk1(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    player_t *player;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, sfx_stfpow);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
-        if ((player = actor->target->player) != NULL)
-        {                       // Squish the player
-            player->deltaviewheight = -16 * FRACUNIT;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurDecide
-//
-// Choose a missile attack.
-//
-//----------------------------------------------------------------------------
-
-#define MNTR_CHARGE_SPEED (13*FRACUNIT)
-
-void A_MinotaurDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    mobj_t *target;
-    int dist;
-
-    target = actor->target;
-    if (!target)
-    {
-        return;
-    }
-    S_StartSound(actor, sfx_minsit);
-    dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
-    if (target->z + target->height > actor->z
-        && target->z + target->height < actor->z + actor->height
-        && dist < 8 * 64 * FRACUNIT
-        && dist > 1 * 64 * FRACUNIT && P_Random() < 150)
-    {                           // Charge attack
-        // Don't call the state function right away
-        P_SetMobjStateNF(actor, S_MNTR_ATK4_1);
-        actor->flags |= MF_SKULLFLY;
-        A_FaceTarget(actor, player, psp);
-        angle = actor->angle >> ANGLETOFINESHIFT;
-        actor->momx = FixedMul(MNTR_CHARGE_SPEED, finecosine[angle]);
-        actor->momy = FixedMul(MNTR_CHARGE_SPEED, finesine[angle]);
-        actor->special1.i = 35 / 2;       // Charge duration
-    }
-    else if (target->z == target->floorz
-             && dist < 9 * 64 * FRACUNIT && P_Random() < 220)
-    {                           // Floor fire attack
-        P_SetMobjState(actor, S_MNTR_ATK3_1);
-        actor->special2.i = 0;
-    }
-    else
-    {                           // Swing attack
-        A_FaceTarget(actor, player, psp);
-        // Don't need to call P_SetMobjState because the current state
-        // falls through to the swing attack
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurCharge
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurCharge(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *puff;
-
-    if (actor->special1.i)
-    {
-        puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
-        puff->momz = 2 * FRACUNIT;
-        actor->special1.i--;
-    }
-    else
-    {
-        actor->flags &= ~MF_SKULLFLY;
-        P_SetMobjState(actor, actor->info->seestate);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurAtk2
-//
-// Swing attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurAtk2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-    fixed_t momz;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, sfx_minat2);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(5));
-        return;
-    }
-    mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX1);
-    if (mo)
-    {
-        S_StartSound(mo, sfx_minat2);
-        momz = mo->momz;
-        angle = mo->angle;
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 8), momz);
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 8), momz);
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 16), momz);
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 16), momz);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurAtk3
-//
-// Floor fire attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurAtk3(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    mobj_t *mo;
-    player_t *player;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(5));
-        if ((player = actor->target->player) != NULL)
-        {                       // Squish the player
-            player->deltaviewheight = -16 * FRACUNIT;
-        }
-    }
-    else
-    {
-        mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX2);
-        if (mo != NULL)
-        {
-            S_StartSound(mo, sfx_minat1);
-        }
-    }
-    if (P_Random() < 192 && actor->special2.i == 0)
-    {
-        P_SetMobjState(actor, S_MNTR_ATK3_4);
-        actor->special2.i = 1;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MntrFloorFire
-//
-//----------------------------------------------------------------------------
-
-void A_MntrFloorFire(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1, r2;
-
-    r1 = P_SubRandom();
-    r2 = P_SubRandom();
-
-    actor->z = actor->floorz;
-    mo = P_SpawnMobj(actor->x + (r2 << 10),
-                     actor->y + (r1 << 10), ONFLOORZ,
-                     MT_MNTRFX3);
-    mo->target = actor->target;
-    mo->momx = 1;               // Force block checking
-    P_CheckMissileSpawn(mo);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BeastAttack
-//
-//----------------------------------------------------------------------------
-
-void A_BeastAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
-        return;
-    }
-    P_SpawnMissile(actor, actor->target, MT_BEASTBALL);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_HeadAttack
-//
-//----------------------------------------------------------------------------
-
-void A_HeadAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    mobj_t *fire;
-    mobj_t *baseFire;
-    mobj_t *mo;
-    mobj_t *target;
-    int randAttack;
-    static int atkResolve1[] = { 50, 150 };
-    static int atkResolve2[] = { 150, 200 };
-    int dist;
-
-    // Ice ball             (close 20% : far 60%)
-    // Fire column  (close 40% : far 20%)
-    // Whirlwind    (close 40% : far 20%)
-    // Distance threshold = 8 cells
-
-    target = actor->target;
-    if (target == NULL)
-    {
-        return;
-    }
-    A_FaceTarget(actor, player, psp);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(target, actor, actor, HITDICE(6));
-        return;
-    }
-    dist = P_AproxDistance(actor->x - target->x, actor->y - target->y)
-        > 8 * 64 * FRACUNIT;
-    randAttack = P_Random();
-    if (randAttack < atkResolve1[dist])
-    {                           // Ice ball
-        P_SpawnMissile(actor, target, MT_HEADFX1);
-        S_StartSound(actor, sfx_hedat2);
-    }
-    else if (randAttack < atkResolve2[dist])
-    {                           // Fire column
-        baseFire = P_SpawnMissile(actor, target, MT_HEADFX3);
-        if (baseFire != NULL)
-        {
-            P_SetMobjState(baseFire, S_HEADFX3_4);      // Don't grow
-            for (i = 0; i < 5; i++)
-            {
-                fire = P_SpawnMobj(baseFire->x, baseFire->y,
-                                   baseFire->z, MT_HEADFX3);
-                if (i == 0)
-                {
-                    S_StartSound(actor, sfx_hedat1);
-                }
-                fire->target = baseFire->target;
-                fire->angle = baseFire->angle;
-                fire->momx = baseFire->momx;
-                fire->momy = baseFire->momy;
-                fire->momz = baseFire->momz;
-                fire->damage = 0;
-                fire->health = (i + 1) * 2;
-                P_CheckMissileSpawn(fire);
-            }
-        }
-    }
-    else
-    {                           // Whirlwind
-        mo = P_SpawnMissile(actor, target, MT_WHIRLWIND);
-        if (mo != NULL)
-        {
-            mo->z -= 32 * FRACUNIT;
-            mo->special1.m = target;
-            mo->special2.i = 50;  // Timer for active sound
-            mo->health = 20 * TICRATE;       // Duration
-            S_StartSound(actor, sfx_hedat3);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_WhirlwindSeek
-//
-//----------------------------------------------------------------------------
-
-void A_WhirlwindSeek(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->health -= 3;
-    if (actor->health < 0)
-    {
-        actor->momx = actor->momy = actor->momz = 0;
-        P_SetMobjState(actor, mobjinfo[actor->type].deathstate);
-        actor->flags &= ~MF_MISSILE;
-        return;
-    }
-    if ((actor->special2.i -= 3) < 0)
-    {
-        actor->special2.i = 58 + (P_Random() & 31);
-        S_StartSound(actor, sfx_hedat3);
-    }
-    if (actor->special1.m
-        && (((mobj_t *) (actor->special1.m))->flags & MF_SHADOW))
-    {
-        return;
-    }
-    P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 30);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_HeadIceImpact
-//
-//----------------------------------------------------------------------------
-
-void A_HeadIceImpact(mobj_t * ice, player_t *player, pspdef_t *psp)
-{
-    unsigned int i;
-    angle_t angle;
-    mobj_t *shard;
-
-    for (i = 0; i < 8; i++)
-    {
-        shard = P_SpawnMobj(ice->x, ice->y, ice->z, MT_HEADFX2);
-        angle = i * ANG45;
-        shard->target = ice->target;
-        shard->angle = angle;
-        angle >>= ANGLETOFINESHIFT;
-        shard->momx = FixedMul(shard->info->speed, finecosine[angle]);
-        shard->momy = FixedMul(shard->info->speed, finesine[angle]);
-        shard->momz = (fixed_t)(-.6 * FRACUNIT);
-        P_CheckMissileSpawn(shard);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_HeadFireGrow
-//
-//----------------------------------------------------------------------------
-
-void A_HeadFireGrow(mobj_t * fire, player_t *player, pspdef_t *psp)
-{
-    fire->health--;
-    fire->z += 9 * FRACUNIT;
-    if (fire->health == 0)
-    {
-        fire->damage = fire->info->damage;
-        P_SetMobjState(fire, S_HEADFX3_4);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SnakeAttack
-//
-//----------------------------------------------------------------------------
-
-void A_SnakeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        P_SetMobjState(actor, S_SNAKE_WALK1);
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    A_FaceTarget(actor, player, psp);
-    P_SpawnMissile(actor, actor->target, MT_SNAKEPRO_A);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SnakeAttack2
-//
-//----------------------------------------------------------------------------
-
-void A_SnakeAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        P_SetMobjState(actor, S_SNAKE_WALK1);
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    A_FaceTarget(actor, player, psp);
-    P_SpawnMissile(actor, actor->target, MT_SNAKEPRO_B);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ClinkAttack
-//
-//----------------------------------------------------------------------------
-
-void A_ClinkAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int damage;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        damage = ((P_Random() % 7) + 3);
-        P_DamageMobj(actor->target, actor, actor, damage);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_GhostOff
-//
-//----------------------------------------------------------------------------
-
-void A_GhostOff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SHADOW;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_WizAtk1
-//
-//----------------------------------------------------------------------------
-
-void A_WizAtk1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_FaceTarget(actor, player, psp);
-    actor->flags &= ~MF_SHADOW;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_WizAtk2
-//
-//----------------------------------------------------------------------------
-
-void A_WizAtk2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_FaceTarget(actor, player, psp);
-    actor->flags |= MF_SHADOW;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_WizAtk3
-//
-//----------------------------------------------------------------------------
-
-void A_WizAtk3(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-    fixed_t momz;
-
-    actor->flags &= ~MF_SHADOW;
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
-        return;
-    }
-    mo = P_SpawnMissile(actor, actor->target, MT_WIZFX1);
-    if (mo)
-    {
-        momz = mo->momz;
-        angle = mo->angle;
-        P_SpawnMissileAngle(actor, MT_WIZFX1, angle - (ANG45 / 8), momz);
-        P_SpawnMissileAngle(actor, MT_WIZFX1, angle + (ANG45 / 8), momz);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Scream
-//
-//----------------------------------------------------------------------------
-
-void A_Scream(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    switch (actor->type)
-    {
-        case MT_CHICPLAYER:
-        case MT_SORCERER1:
-        case MT_MINOTAUR:
-            // Make boss death sounds full volume
-            S_StartSound(NULL, actor->info->deathsound);
-            break;
-        case MT_PLAYER:
-            // Handle the different player death screams
-            if (actor->special1.i < 10)
-            {                   // Wimpy death sound
-                S_StartSound(actor, sfx_plrwdth);
-            }
-            else if (actor->health > -50)
-            {                   // Normal death sound
-                S_StartSound(actor, actor->info->deathsound);
-            }
-            else if (actor->health > -100)
-            {                   // Crazy death sound
-                S_StartSound(actor, sfx_plrcdth);
-            }
-            else
-            {                   // Extreme death sound
-                S_StartSound(actor, sfx_gibdth);
-            }
-            break;
-        default:
-            S_StartSound(actor, actor->info->deathsound);
-            break;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_DropItem
-//
-//---------------------------------------------------------------------------
-
-void P_DropItem(mobj_t * source, mobjtype_t type, int special, int chance)
-{
-    mobj_t *mo;
-
-    if (P_Random() > chance)
-    {
-        return;
-    }
-    mo = P_SpawnMobj(source->x, source->y,
-                     source->z + (source->height >> 1), type);
-    mo->momx = P_SubRandom() << 8;
-    mo->momy = P_SubRandom() << 8;
-    mo->momz = FRACUNIT * 5 + (P_Random() << 10);
-    mo->flags |= MF_DROPPED;
-    mo->health = special;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_NoBlocking
-//
-//----------------------------------------------------------------------------
-
-void A_NoBlocking(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SOLID;
-    // Check for monsters dropping things
-    switch (actor->type)
-    {
-        case MT_MUMMY:
-        case MT_MUMMYLEADER:
-        case MT_MUMMYGHOST:
-        case MT_MUMMYLEADERGHOST:
-            P_DropItem(actor, MT_AMGWNDWIMPY, 3, 84);
-            break;
-        case MT_KNIGHT:
-        case MT_KNIGHTGHOST:
-            P_DropItem(actor, MT_AMCBOWWIMPY, 5, 84);
-            break;
-        case MT_WIZARD:
-            P_DropItem(actor, MT_AMBLSRWIMPY, 10, 84);
-            P_DropItem(actor, MT_ARTITOMEOFPOWER, 0, 4);
-            break;
-        case MT_HEAD:
-            P_DropItem(actor, MT_AMBLSRWIMPY, 10, 84);
-            P_DropItem(actor, MT_ARTIEGG, 0, 51);
-            break;
-        case MT_BEAST:
-            P_DropItem(actor, MT_AMCBOWWIMPY, 10, 84);
-            break;
-        case MT_CLINK:
-            P_DropItem(actor, MT_AMSKRDWIMPY, 20, 84);
-            break;
-        case MT_SNAKE:
-            P_DropItem(actor, MT_AMPHRDWIMPY, 5, 84);
-            break;
-        case MT_MINOTAUR:
-            P_DropItem(actor, MT_ARTISUPERHEAL, 0, 51);
-            P_DropItem(actor, MT_AMPHRDWIMPY, 10, 84);
-            break;
-        default:
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Explode
-//
-// Handles a bunch of exploding things.
-//
-//----------------------------------------------------------------------------
-
-void A_Explode(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    int damage;
-
-    damage = 128;
-    switch (actor->type)
-    {
-        case MT_FIREBOMB:      // Time Bombs
-            actor->z += 32 * FRACUNIT;
-            actor->flags &= ~MF_SHADOW;
-            break;
-        case MT_MNTRFX2:       // Minotaur floor fire
-            damage = 24;
-            break;
-        case MT_SOR2FX1:       // D'Sparil missile
-            damage = 80 + (P_Random() & 31);
-            break;
-        default:
-            break;
-    }
-    P_RadiusAttack(actor, actor->target, damage);
-    P_HitFloor(actor);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_PodPain
-//
-//----------------------------------------------------------------------------
-
-void A_PodPain(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    int count;
-    int chance;
-    mobj_t *goo;
-
-    chance = P_Random();
-    if (chance < 128)
-    {
-        return;
-    }
-    count = chance > 240 ? 2 : 1;
-    for (i = 0; i < count; i++)
-    {
-        goo = P_SpawnMobj(actor->x, actor->y,
-                          actor->z + 48 * FRACUNIT, MT_PODGOO);
-        goo->target = actor;
-        goo->momx = P_SubRandom() << 9;
-        goo->momy = P_SubRandom() << 9;
-        goo->momz = FRACUNIT / 2 + (P_Random() << 9);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_RemovePod
-//
-//----------------------------------------------------------------------------
-
-void A_RemovePod(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    if (actor->special2.m)
-    {
-        mo = (mobj_t *) actor->special2.m;
-        if (mo->special1.i > 0)
-        {
-            mo->special1.i--;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MakePod
-//
-//----------------------------------------------------------------------------
-
-#define MAX_GEN_PODS 16
-
-void A_MakePod(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    fixed_t x;
-    fixed_t y;
-
-    if (actor->special1.i == MAX_GEN_PODS)
-    {                           // Too many generated pods
-        return;
-    }
-    x = actor->x;
-    y = actor->y;
-    mo = P_SpawnMobj(x, y, ONFLOORZ, MT_POD);
-    if (P_CheckPosition(mo, x, y) == false)
-    {                           // Didn't fit
-        P_RemoveMobj(mo);
-        return;
-    }
-    P_SetMobjState(mo, S_POD_GROW1);
-    P_ThrustMobj(mo, P_Random() << 24, (fixed_t) (4.5 * FRACUNIT));
-    S_StartSound(mo, sfx_newpod);
-    actor->special1.i++;          // Increment generated pod count
-    mo->special2.m = actor;       // Link the generator to the pod
-    return;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_Massacre
-//
-// Kills all monsters.
-//
-//----------------------------------------------------------------------------
-
-void P_Massacre(void)
-{
-    mobj_t *mo;
-    thinker_t *think;
-
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-        if ((mo->flags & MF_COUNTKILL) && (mo->health > 0))
-        {
-            P_DamageMobj(mo, NULL, NULL, 10000);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BossDeath
-//
-// Trigger special effects if all bosses are dead.
-//
-//----------------------------------------------------------------------------
-
-void A_BossDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    thinker_t *think;
-    line_t dummyLine;
-    static mobjtype_t bossType[6] = {
-        MT_HEAD,
-        MT_MINOTAUR,
-        MT_SORCERER2,
-        MT_HEAD,
-        MT_MINOTAUR,
-        -1
-    };
-
-    if (gamemap != 8)
-    {                           // Not a boss level
-        return;
-    }
-    if (actor->type != bossType[gameepisode - 1])
-    {                           // Not considered a boss in this episode
-        return;
-    }
-    // Make sure all bosses are dead
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-        if ((mo != actor) && (mo->type == actor->type) && (mo->health > 0))
-        {                       // Found a living boss
-            return;
-        }
-    }
-    if (gameepisode > 1)
-    {                           // Kill any remaining monsters
-        P_Massacre();
-    }
-    dummyLine.tag = 666;
-    EV_DoFloor(&dummyLine, lowerFloor);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ESound
-//
-//----------------------------------------------------------------------------
-
-void A_ESound(mobj_t *mo, player_t *player, pspdef_t *psp)
-{
-    int sound = sfx_None;
-
-    switch (mo->type)
-    {
-        case MT_SOUNDWATERFALL:
-            sound = sfx_waterfl;
-            break;
-        case MT_SOUNDWIND:
-            sound = sfx_wind;
-            break;
-        default:
-            break;
-    }
-    S_StartSound(mo, sound);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SpawnTeleGlitter
-//
-//----------------------------------------------------------------------------
-
-void A_SpawnTeleGlitter(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1, r2;
-
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(actor->x + ((r2 & 31) - 16) * FRACUNIT,
-                     actor->y + ((r1 & 31) - 16) * FRACUNIT,
-                     actor->subsector->sector->floorheight, MT_TELEGLITTER);
-    mo->momz = FRACUNIT / 4;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SpawnTeleGlitter2
-//
-//----------------------------------------------------------------------------
-
-void A_SpawnTeleGlitter2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1, r2;
-
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(actor->x + ((r2 & 31) - 16) * FRACUNIT,
-                     actor->y + ((r1 & 31) - 16) * FRACUNIT,
-                     actor->subsector->sector->floorheight, MT_TELEGLITTER2);
-    mo->momz = FRACUNIT / 4;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_AccTeleGlitter
-//
-//----------------------------------------------------------------------------
-
-void A_AccTeleGlitter(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (++actor->health > 35)
-    {
-        actor->momz += actor->momz / 2;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_InitKeyGizmo
-//
-//----------------------------------------------------------------------------
-
-void A_InitKeyGizmo(mobj_t * gizmo, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    statenum_t state = S_NULL;
-
-    switch (gizmo->type)
-    {
-        case MT_KEYGIZMOBLUE:
-            state = S_KGZ_BLUEFLOAT1;
-            break;
-        case MT_KEYGIZMOGREEN:
-            state = S_KGZ_GREENFLOAT1;
-            break;
-        case MT_KEYGIZMOYELLOW:
-            state = S_KGZ_YELLOWFLOAT1;
-            break;
-        default:
-            break;
-    }
-    mo = P_SpawnMobj(gizmo->x, gizmo->y, gizmo->z + 60 * FRACUNIT,
-                     MT_KEYGIZMOFLOAT);
-    P_SetMobjState(mo, state);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_VolcanoSet
-//
-//----------------------------------------------------------------------------
-
-void A_VolcanoSet(mobj_t * volcano, player_t *player, pspdef_t *psp)
-{
-    volcano->tics = 105 + (P_Random() & 127);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_VolcanoBlast
-//
-//----------------------------------------------------------------------------
-
-void A_VolcanoBlast(mobj_t * volcano, player_t *player, pspdef_t *psp)
-{
-    int i;
-    int count;
-    mobj_t *blast;
-    angle_t angle;
-
-    count = 1 + (P_Random() % 3);
-    for (i = 0; i < count; i++)
-    {
-        blast = P_SpawnMobj(volcano->x, volcano->y, volcano->z + 44 * FRACUNIT, MT_VOLCANOBLAST);       // MT_VOLCANOBLAST
-        blast->target = volcano;
-        angle = P_Random() << 24;
-        blast->angle = angle;
-        angle >>= ANGLETOFINESHIFT;
-        blast->momx = FixedMul(1 * FRACUNIT, finecosine[angle]);
-        blast->momy = FixedMul(1 * FRACUNIT, finesine[angle]);
-        blast->momz = (fixed_t)(2.5 * FRACUNIT) + (P_Random() << 10);
-        S_StartSound(blast, sfx_volsht);
-        P_CheckMissileSpawn(blast);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_VolcBallImpact
-//
-//----------------------------------------------------------------------------
-
-void A_VolcBallImpact(mobj_t * ball, player_t *player, pspdef_t *psp)
-{
-    unsigned int i;
-    mobj_t *tiny;
-    angle_t angle;
-
-    if (ball->z <= ball->floorz)
-    {
-        ball->flags |= MF_NOGRAVITY;
-        ball->flags2 &= ~MF2_LOGRAV;
-        ball->z += 28 * FRACUNIT;
-        //ball->momz = 3*FRACUNIT;
-    }
-    P_RadiusAttack(ball, ball->target, 25);
-    for (i = 0; i < 4; i++)
-    {
-        tiny = P_SpawnMobj(ball->x, ball->y, ball->z, MT_VOLCANOTBLAST);
-        tiny->target = ball;
-        angle = i * ANG90;
-        tiny->angle = angle;
-        angle >>= ANGLETOFINESHIFT;
-        tiny->momx = FixedMul((fixed_t)(FRACUNIT * .7), finecosine[angle]);
-        tiny->momy = FixedMul((fixed_t)(FRACUNIT * .7), finesine[angle]);
-        tiny->momz = FRACUNIT + (P_Random() << 9);
-        P_CheckMissileSpawn(tiny);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SkullPop
-//
-//----------------------------------------------------------------------------
-
-void A_SkullPop(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    mobj_t *mo;
-    player_t *player;
-
-    actor->flags &= ~MF_SOLID;
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 48 * FRACUNIT,
-                     MT_BLOODYSKULL);
-    //mo->target = actor;
-    mo->momx = P_SubRandom() << 9;
-    mo->momy = P_SubRandom() << 9;
-    mo->momz = FRACUNIT * 2 + (P_Random() << 6);
-    // Attach player mobj to bloody skull
-    player = actor->player;
-    actor->player = NULL;
-    mo->player = player;
-    mo->health = actor->health;
-    mo->angle = actor->angle;
-
-    // fraggle: This check wasn't originally here in the Vanilla Heretic
-    // source, causing crashes if the player respawns before this
-    // function is called.
-
-    if (player != NULL)
-    {
-        player->mo = mo;
-        player->lookdir = 0;
-        player->damagecount = 32;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_CheckSkullFloor
-//
-//----------------------------------------------------------------------------
-
-void A_CheckSkullFloor(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->z <= actor->floorz)
-    {
-        P_SetMobjState(actor, S_BLOODYSKULLX1);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_CheckSkullDone
-//
-//----------------------------------------------------------------------------
-
-void A_CheckSkullDone(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special2.i == 666)
-    {
-        P_SetMobjState(actor, S_BLOODYSKULLX2);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_CheckBurnGone
-//
-//----------------------------------------------------------------------------
-
-void A_CheckBurnGone(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special2.i == 666)
-    {
-        P_SetMobjState(actor, S_PLAY_FDTH20);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FreeTargMobj
-//
-//----------------------------------------------------------------------------
-
-void A_FreeTargMobj(mobj_t * mo, player_t *player, pspdef_t *psp)
-{
-    mo->momx = mo->momy = mo->momz = 0;
-    mo->z = mo->ceilingz + 4 * FRACUNIT;
-    mo->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_SOLID);
-    mo->flags |= MF_CORPSE | MF_DROPOFF | MF_NOGRAVITY;
-    mo->flags2 &= ~(MF2_PASSMOBJ | MF2_LOGRAV);
-    mo->player = NULL;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_AddPlayerCorpse
-//
-//----------------------------------------------------------------------------
-
-#define BODYQUESIZE 32
-mobj_t *bodyque[BODYQUESIZE];
-int bodyqueslot;
-
-void A_AddPlayerCorpse(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (bodyqueslot >= BODYQUESIZE)
-    {                           // Too many player corpses - remove an old one
-        P_RemoveMobj(bodyque[bodyqueslot % BODYQUESIZE]);
-    }
-    bodyque[bodyqueslot % BODYQUESIZE] = actor;
-    bodyqueslot++;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FlameSnd
-//
-//----------------------------------------------------------------------------
-
-void A_FlameSnd(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(actor, sfx_hedat1);    // Burn sound
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_HideThing
-//
-//----------------------------------------------------------------------------
-
-void A_HideThing(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    //P_UnsetThingPosition(actor);
-    actor->flags2 |= MF2_DONTDRAW;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_UnHideThing
-//
-//----------------------------------------------------------------------------
-
-void A_UnHideThing(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    //P_SetThingPosition(actor);
-    actor->flags2 &= ~MF2_DONTDRAW;
-}
diff --git a/games/NXDoom/src/heretic/p_floor.c b/games/NXDoom/src/heretic/p_floor.c
deleted file mode 100644
index d95a157aa..000000000
--- a/games/NXDoom/src/heretic/p_floor.c
+++ /dev/null
@@ -1,461 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-#include "doomdef.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-//==================================================================
-//==================================================================
-//
-//                                                              FLOORS
-//
-//==================================================================
-//==================================================================
-
-
-
-//==================================================================
-//
-//      Move a plane (floor or ceiling) and check for crushing
-//
-//==================================================================
-result_e T_MovePlane(sector_t * sector, fixed_t speed,
-                     fixed_t dest, boolean crush, int floorOrCeiling,
-                     int direction)
-{
-    boolean flag;
-    fixed_t lastpos;
-
-    switch (floorOrCeiling)
-    {
-        case 0:                // FLOOR
-            switch (direction)
-            {
-                case -1:       // DOWN
-                    if (sector->floorheight - speed < dest)
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return crushed;
-                        }
-                        return pastdest;
-                    }
-                    else
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight -= speed;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return crushed;
-                        }
-                    }
-                    break;
-
-                case 1:        // UP
-                    if (sector->floorheight + speed > dest)
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return crushed;
-                        }
-                        return pastdest;
-                    }
-                    else        // COULD GET CRUSHED
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight += speed;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            if (crush == true)
-                                return crushed;
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return crushed;
-                        }
-                    }
-                    break;
-            }
-            break;
-
-        case 1:                // CEILING
-            switch (direction)
-            {
-                case -1:       // DOWN
-                    if (sector->ceilingheight - speed < dest)
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return crushed;
-                        }
-                        return pastdest;
-                    }
-                    else        // COULD GET CRUSHED
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight -= speed;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            if (crush == true)
-                                return crushed;
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return crushed;
-                        }
-                    }
-                    break;
-
-                case 1:        // UP
-                    if (sector->ceilingheight + speed > dest)
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return crushed;
-                        }
-                        return pastdest;
-                    }
-                    else
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight += speed;
-                        flag = P_ChangeSector(sector, crush);
-#if 0
-                        if (flag == true)
-                        {
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return crushed;
-                        }
-#endif
-                    }
-                    break;
-            }
-            break;
-
-    }
-    return ok;
-}
-
-//==================================================================
-//
-//      MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
-//
-//==================================================================
-void T_MoveFloor(thinker_t *thinker)
-{
-    floormove_t *floor = (floormove_t *) thinker;
-    result_e res;
-
-    res = T_MovePlane(floor->sector, floor->speed,
-                      floor->floordestheight, floor->crush, 0,
-                      floor->direction);
-    if (!(leveltime & 7))
-    {
-        S_StartSound(&floor->sector->soundorg, sfx_dormov);
-    }
-
-    if (res == pastdest)
-    {
-        floor->sector->specialdata = NULL;
-        if (floor->type == raiseBuildStep)
-        {
-            S_StartSound(&floor->sector->soundorg, sfx_pstop);
-        }
-        if (floor->direction == 1)
-            switch (floor->type)
-            {
-                case donutRaise:
-                    floor->sector->special = floor->newspecial;
-                    floor->sector->floorpic = floor->texture;
-                default:
-                    break;
-            }
-        else if (floor->direction == -1)
-            switch (floor->type)
-            {
-                case lowerAndChange:
-                    floor->sector->special = floor->newspecial;
-                    floor->sector->floorpic = floor->texture;
-                default:
-                    break;
-            }
-        P_RemoveThinker(&floor->thinker);
-    }
-
-}
-
-//==================================================================
-//
-//      HANDLE FLOOR TYPES
-//
-//==================================================================
-int EV_DoFloor(line_t * line, floor_e floortype)
-{
-    int secnum;
-    int rtn;
-    int i;
-    sector_t *sec;
-    floormove_t *floor;
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        //      ALREADY MOVING?  IF SO, KEEP GOING...
-        if (sec->specialdata)
-            continue;
-
-        //
-        //      new floor thinker
-        //
-        rtn = 1;
-        floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-        P_AddThinker(&floor->thinker);
-        sec->specialdata = floor;
-        floor->thinker.function = T_MoveFloor;
-        floor->type = floortype;
-        floor->crush = false;
-        switch (floortype)
-        {
-            case lowerFloor:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = P_FindHighestFloorSurrounding(sec);
-                break;
-            case lowerFloorToLowest:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = P_FindLowestFloorSurrounding(sec);
-                break;
-            case turboLower:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED * 4;
-                floor->floordestheight = (8 * FRACUNIT) +
-                    P_FindHighestFloorSurrounding(sec);
-                break;
-            case raiseFloorCrush:
-                floor->crush = true;
-            case raiseFloor:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = P_FindLowestCeilingSurrounding(sec);
-                if (floor->floordestheight > sec->ceilingheight)
-                    floor->floordestheight = sec->ceilingheight;
-                floor->floordestheight -= (8 * FRACUNIT) *
-                    (floortype == raiseFloorCrush);
-                break;
-            case raiseFloorToNearest:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight =
-                    P_FindNextHighestFloor(sec, sec->floorheight);
-                break;
-            case raiseFloor24:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = floor->sector->floorheight +
-                    24 * FRACUNIT;
-                break;
-            case raiseFloor24AndChange:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = floor->sector->floorheight +
-                    24 * FRACUNIT;
-                sec->floorpic = line->frontsector->floorpic;
-                sec->special = line->frontsector->special;
-                break;
-            case raiseToTexture:
-                {
-                    int minsize = INT_MAX;
-                    side_t *side;
-
-                    floor->direction = 1;
-                    floor->sector = sec;
-                    floor->speed = FLOORSPEED;
-                    for (i = 0; i < sec->linecount; i++)
-                        if (twoSided(secnum, i))
-                        {
-                            side = getSide(secnum, i, 0);
-                            if (side->bottomtexture >= 0)
-                                if (textureheight[side->bottomtexture] <
-                                    minsize)
-                                    minsize =
-                                        textureheight[side->bottomtexture];
-                            side = getSide(secnum, i, 1);
-                            if (side->bottomtexture >= 0)
-                                if (textureheight[side->bottomtexture] <
-                                    minsize)
-                                    minsize =
-                                        textureheight[side->bottomtexture];
-                        }
-                    floor->floordestheight = floor->sector->floorheight +
-                        minsize;
-                }
-                break;
-            case lowerAndChange:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = P_FindLowestFloorSurrounding(sec);
-                floor->texture = sec->floorpic;
-                for (i = 0; i < sec->linecount; i++)
-                    if (twoSided(secnum, i))
-                    {
-                        if (getSide(secnum, i, 0)->sector - sectors == secnum)
-                        {
-                            sec = getSector(secnum, i, 1);
-                            floor->texture = sec->floorpic;
-                            floor->newspecial = sec->special;
-                            break;
-                        }
-                        else
-                        {
-                            sec = getSector(secnum, i, 0);
-                            floor->texture = sec->floorpic;
-                            floor->newspecial = sec->special;
-                            break;
-                        }
-                    }
-            default:
-                break;
-        }
-    }
-    return rtn;
-}
-
-//==================================================================
-//
-//      BUILD A STAIRCASE!
-//
-//==================================================================
-int EV_BuildStairs(line_t * line, fixed_t stepDelta)
-{
-    int secnum;
-    int height;
-    int i;
-    int newsecnum;
-    int texture;
-    int ok;
-    int rtn;
-    sector_t *sec, *tsec;
-    floormove_t *floor;
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        // ALREADY MOVING?  IF SO, KEEP GOING...
-        if (sec->specialdata)
-            continue;
-
-        //
-        // new floor thinker
-        //
-        rtn = 1;
-        height = sec->floorheight + stepDelta;
-        floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-        P_AddThinker(&floor->thinker);
-        sec->specialdata = floor;
-        floor->thinker.function = T_MoveFloor;
-        floor->type = raiseBuildStep;
-        floor->direction = 1;
-        floor->sector = sec;
-        floor->speed = FLOORSPEED;
-        floor->floordestheight = height;
-
-        texture = sec->floorpic;
-
-        //
-        // Find next sector to raise
-        // 1.   Find 2-sided line with same sector side[0]
-        // 2.   Other side is the next sector to raise
-        //
-        do
-        {
-            ok = 0;
-            for (i = 0; i < sec->linecount; i++)
-            {
-                if (!((sec->lines[i])->flags & ML_TWOSIDED))
-                    continue;
-
-                tsec = (sec->lines[i])->frontsector;
-                newsecnum = tsec - sectors;
-                if (secnum != newsecnum)
-                    continue;
-                tsec = (sec->lines[i])->backsector;
-                newsecnum = tsec - sectors;
-                if (tsec->floorpic != texture)
-                    continue;
-
-                height += stepDelta;
-                if (tsec->specialdata)
-                    continue;
-
-                sec = tsec;
-                secnum = newsecnum;
-                floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-                P_AddThinker(&floor->thinker);
-                sec->specialdata = floor;
-                floor->thinker.function = T_MoveFloor;
-                floor->type = raiseBuildStep;
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                floor->floordestheight = height;
-                ok = 1;
-                break;
-            }
-        }
-        while (ok);
-    }
-    return (rtn);
-}
diff --git a/games/NXDoom/src/heretic/p_inter.c b/games/NXDoom/src/heretic/p_inter.c
deleted file mode 100644
index cf75a7dbf..000000000
--- a/games/NXDoom/src/heretic/p_inter.c
+++ /dev/null
@@ -1,1488 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_inter.c
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "am_map.h"
-
-
-#define BONUSADD 6
-
-int WeaponValue[] = {
-    1,                          // staff
-    3,                          // goldwand
-    4,                          // crossbow
-    5,                          // blaster
-    6,                          // skullrod
-    7,                          // phoenixrod
-    8,                          // mace
-    2,                          // gauntlets
-    0                           // beak
-};
-
-int maxammo[NUMAMMO] = {
-    100,                        // gold wand
-    50,                         // crossbow
-    200,                        // blaster
-    200,                        // skull rod
-    20,                         // phoenix rod
-    150                         // mace
-};
-
-int GetWeaponAmmo[NUMWEAPONS] = {
-    0,                          // staff
-    25,                         // gold wand
-    10,                         // crossbow
-    30,                         // blaster
-    50,                         // skull rod
-    2,                          // phoenix rod
-    50,                         // mace
-    0,                          // gauntlets
-    0                           // beak
-};
-
-static weapontype_t GetAmmoChange[] = {
-    wp_goldwand,
-    wp_crossbow,
-    wp_blaster,
-    wp_skullrod,
-    wp_phoenixrod,
-    wp_mace
-};
-
-/*
-static boolean GetAmmoChangePL1[NUMWEAPONS][NUMAMMO] =
-{
-	// staff
-	{wp_goldwand, wp_crossbow, wp_blaster, wp_skullrod, -1, wp_mace},
-	// gold wand
-	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, wp_mace},
-	// crossbow
-	{-1, -1, wp_blaster, wp_skullrod, -1, -1},
-	// blaster
-	{-1, -1, -1, -1, -1, -1},
-	// skull rod
-	{-1, -1, -1, -1, -1, -1},
-	// phoenix rod
-	{-1, -1, -1, -1, -1, -1},
-	// mace
-	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, -1},
-	// gauntlets
-	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, wp_mace}
-};
-*/
-
-/*
-static boolean GetAmmoChangePL2[NUMWEAPONS][NUMAMMO] =
-{
-	// staff
-	{wp_goldwand, wp_crossbow, wp_blaster, wp_skullrod, wp_phoenixrod,
-		wp_mace},
-	// gold wand
-	{-1, wp_crossbow, wp_blaster, wp_skullrod, wp_phoenixrod, wp_mace},
-	// crossbow
-	{-1, -1, wp_blaster, wp_skullrod, wp_phoenixrod, -1},
-	// blaster
-	{-1, -1, -1, wp_skullrod, wp_phoenixrod, -1},
-	// skull rod
-	{-1, -1, -1, -1, -1, -1},
-	// phoenix rod
-	{-1, -1, -1, -1, -1, -1},
-	// mace
-	{-1, wp_crossbow, wp_blaster, wp_skullrod, -1, -1},
-	// gauntlets
-	{-1, -1, -1, wp_skullrod, wp_phoenixrod, wp_mace}
-};
-*/
-
-//--------------------------------------------------------------------------
-//
-// PROC P_SetMessage
-//
-//--------------------------------------------------------------------------
-
-boolean ultimatemsg;
-
-void P_SetMessage(player_t * player, const char *message, boolean ultmsg)
-{
-    if ((ultimatemsg || !messageson) && !ultmsg)
-    {
-        return;
-    }
-    player->message = message;
-    player->messageTics = MESSAGETICS;
-    BorderTopRefresh = true;
-    if (ultmsg)
-    {
-        ultimatemsg = true;
-    }
-}
-
-//--------------------------------------------------------------------------
-//
-// FUNC P_GiveAmmo
-//
-// Returns true if the player accepted the ammo, false if it was
-// refused (player has maxammo[ammo]).
-//
-//--------------------------------------------------------------------------
-
-boolean P_GiveAmmo(player_t * player, ammotype_t ammo, int count)
-{
-    int prevAmmo;
-    //weapontype_t changeWeapon;
-
-    if (ammo == am_noammo)
-    {
-        return (false);
-    }
-    if ((unsigned int) ammo >= NUMAMMO)
-    {
-        I_Error("P_GiveAmmo: bad type %i", ammo);
-    }
-    if (player->ammo[ammo] == player->maxammo[ammo])
-    {
-        return (false);
-    }
-    if (gameskill == sk_baby || gameskill == sk_nightmare)
-    {                           // extra ammo in baby mode and nightmare mode
-        count += count >> 1;
-    }
-    prevAmmo = player->ammo[ammo];
-
-    player->ammo[ammo] += count;
-    if (player->ammo[ammo] > player->maxammo[ammo])
-    {
-        player->ammo[ammo] = player->maxammo[ammo];
-    }
-    if (prevAmmo)
-    {
-        // Don't attempt to change weapons if the player already had
-        // ammo of the type just given
-        return (true);
-    }
-    if (player->readyweapon == wp_staff
-        || player->readyweapon == wp_gauntlets)
-    {
-        if (player->weaponowned[GetAmmoChange[ammo]])
-        {
-            player->pendingweapon = GetAmmoChange[ammo];
-        }
-    }
-/*
-	if(player->powers[pw_weaponlevel2])
-	{
-		changeWeapon = GetAmmoChangePL2[player->readyweapon][ammo];
-	}
-	else
-	{
-		changeWeapon = GetAmmoChangePL1[player->readyweapon][ammo];
-	}
-	if(changeWeapon != -1)
-	{
-		if(player->weaponowned[changeWeapon])
-		{
-			player->pendingweapon = changeWeapon;
-		}
-	}
-*/
-    return (true);
-}
-
-//--------------------------------------------------------------------------
-//
-// FUNC P_GiveWeapon
-//
-// Returns true if the weapon or its ammo was accepted.
-//
-//--------------------------------------------------------------------------
-
-boolean P_GiveWeapon(player_t * player, weapontype_t weapon)
-{
-    boolean gaveAmmo;
-    boolean gaveWeapon;
-
-    if (netgame && !deathmatch)
-    {                           // Cooperative net-game
-        if (player->weaponowned[weapon])
-        {
-            return (false);
-        }
-        player->bonuscount += BONUSADD;
-        player->weaponowned[weapon] = true;
-        P_GiveAmmo(player, wpnlev1info[weapon].ammo, GetWeaponAmmo[weapon]);
-        player->pendingweapon = weapon;
-        if (player == &players[consoleplayer])
-        {
-            S_StartSound(NULL, sfx_wpnup);
-        }
-        return (false);
-    }
-    gaveAmmo = P_GiveAmmo(player, wpnlev1info[weapon].ammo,
-                          GetWeaponAmmo[weapon]);
-    if (player->weaponowned[weapon])
-    {
-        gaveWeapon = false;
-    }
-    else
-    {
-        gaveWeapon = true;
-        player->weaponowned[weapon] = true;
-        if (WeaponValue[weapon] > WeaponValue[player->readyweapon])
-        {                       // Only switch to more powerful weapons
-            player->pendingweapon = weapon;
-        }
-    }
-    return (gaveWeapon || gaveAmmo);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GiveBody
-//
-// Returns false if the body isn't needed at all.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GiveBody(player_t * player, int num)
-{
-    int max;
-
-    max = MAXHEALTH;
-    if (player->chickenTics)
-    {
-        max = MAXCHICKENHEALTH;
-    }
-    if (player->health >= max)
-    {
-        return (false);
-    }
-    player->health += num;
-    if (player->health > max)
-    {
-        player->health = max;
-    }
-    player->mo->health = player->health;
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GiveArmor
-//
-// Returns false if the armor is worse than the current armor.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GiveArmor(player_t * player, int armortype)
-{
-    int hits;
-
-    hits = armortype * 100;
-    if (player->armorpoints >= hits)
-    {
-        return (false);
-    }
-    player->armortype = armortype;
-    player->armorpoints = hits;
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_GiveKey
-//
-//---------------------------------------------------------------------------
-
-void P_GiveKey(player_t * player, keytype_t key)
-{
-
-    if (player->keys[key])
-    {
-        return;
-    }
-    if (player == &players[consoleplayer])
-    {
-        playerkeys |= 1 << key;
-        KeyPoints[key].x = 0;
-        KeyPoints[key].y = 0;
-    }
-    player->bonuscount = BONUSADD;
-    player->keys[key] = true;
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GivePower
-//
-// Returns true if power accepted.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GivePower(player_t * player, powertype_t power)
-{
-    if (power == pw_invulnerability)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = INVULNTICS;
-        return (true);
-    }
-    if (power == pw_weaponlevel2)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = WPNLEV2TICS;
-        return (true);
-    }
-    if (power == pw_invisibility)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = INVISTICS;
-        player->mo->flags |= MF_SHADOW;
-        return (true);
-    }
-    if (power == pw_flight)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = FLIGHTTICS;
-        player->mo->flags2 |= MF2_FLY;
-        player->mo->flags |= MF_NOGRAVITY;
-        if (player->mo->z <= player->mo->floorz)
-        {
-            player->flyheight = 10;     // thrust the player in the air a bit
-        }
-        return (true);
-    }
-    if (power == pw_infrared)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = INFRATICS;
-        return (true);
-    }
-/*
-	if(power == pw_ironfeet)
-	{
-		player->powers[power] = IRONTICS;
-		return(true);
-	}
-	if(power == pw_strength)
-	{
-		P_GiveBody(player, 100);
-		player->powers[power] = 1;
-		return(true);
-	}
-*/
-    if (player->powers[power])
-    {
-        return (false);         // already got it
-    }
-    player->powers[power] = 1;
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GiveArtifact
-//
-// Returns true if artifact accepted.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo)
-{
-    int i;
-
-    i = 0;
-    while (player->inventory[i].type != arti && i < player->inventorySlotNum)
-    {
-        i++;
-    }
-    if (i == player->inventorySlotNum)
-    {
-        player->inventory[i].count = 1;
-        player->inventory[i].type = arti;
-        player->inventorySlotNum++;
-    }
-    else
-    {
-        if (player->inventory[i].count >= 16)
-        {                       // Player already has 16 of this item
-            return (false);
-        }
-        player->inventory[i].count++;
-    }
-    if (player->artifactCount == 0)
-    {
-        player->readyArtifact = arti;
-    }
-    player->artifactCount++;
-    if (mo && (mo->flags & MF_COUNTITEM))
-    {
-        player->itemcount++;
-    }
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SetDormantArtifact
-//
-// Removes the MF_SPECIAL flag, and initiates the artifact pickup
-// animation.
-//
-//---------------------------------------------------------------------------
-
-void P_SetDormantArtifact(mobj_t * arti)
-{
-    arti->flags &= ~MF_SPECIAL;
-    if (deathmatch && (arti->type != MT_ARTIINVULNERABILITY)
-        && (arti->type != MT_ARTIINVISIBILITY))
-    {
-        P_SetMobjState(arti, S_DORMANTARTI1);
-    }
-    else
-    {                           // Don't respawn
-        P_SetMobjState(arti, S_DEADARTI1);
-    }
-    S_StartSound(arti, sfx_artiup);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_RestoreArtifact
-//
-//---------------------------------------------------------------------------
-
-void A_RestoreArtifact(mobj_t * arti, player_t *player, pspdef_t *psp)
-{
-    arti->flags |= MF_SPECIAL;
-    P_SetMobjState(arti, arti->info->spawnstate);
-    S_StartSound(arti, sfx_respawn);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_HideSpecialThing
-//
-//----------------------------------------------------------------------------
-
-void P_HideSpecialThing(mobj_t * thing)
-{
-    thing->flags &= ~MF_SPECIAL;
-    thing->flags2 |= MF2_DONTDRAW;
-    P_SetMobjState(thing, S_HIDESPECIAL1);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_RestoreSpecialThing1
-//
-// Make a special thing visible again.
-//
-//---------------------------------------------------------------------------
-
-void A_RestoreSpecialThing1(mobj_t * thing, player_t *player, pspdef_t *psp)
-{
-    if (thing->type == MT_WMACE)
-    {                           // Do random mace placement
-        P_RepositionMace(thing);
-    }
-    thing->flags2 &= ~MF2_DONTDRAW;
-    S_StartSound(thing, sfx_respawn);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_RestoreSpecialThing2
-//
-//---------------------------------------------------------------------------
-
-void A_RestoreSpecialThing2(mobj_t * thing, player_t *player, pspdef_t *psp)
-{
-    thing->flags |= MF_SPECIAL;
-    P_SetMobjState(thing, thing->info->spawnstate);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_TouchSpecialThing
-//
-//---------------------------------------------------------------------------
-
-void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher)
-{
-    int i;
-    player_t *player;
-    fixed_t delta;
-    int sound;
-    boolean respawn;
-
-    delta = special->z - toucher->z;
-    if (delta > toucher->height || delta < -32 * FRACUNIT)
-    {                           // Out of reach
-        return;
-    }
-    if (toucher->health <= 0)
-    {                           // Toucher is dead
-        return;
-    }
-    sound = sfx_itemup;
-    player = toucher->player;
-    respawn = true;
-    switch (special->sprite)
-    {
-            // Items
-        case SPR_PTN1:         // Item_HealingPotion
-            if (!P_GiveBody(player, 10))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_ITEMHEALTH), false);
-            break;
-        case SPR_SHLD:         // Item_Shield1
-            if (!P_GiveArmor(player, 1))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_ITEMSHIELD1), false);
-            break;
-        case SPR_SHD2:         // Item_Shield2
-            if (!P_GiveArmor(player, 2))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_ITEMSHIELD2), false);
-            break;
-        case SPR_BAGH:         // Item_BagOfHolding
-            if (!player->backpack)
-            {
-                for (i = 0; i < NUMAMMO; i++)
-                {
-                    player->maxammo[i] *= 2;
-                }
-                player->backpack = true;
-            }
-            P_GiveAmmo(player, am_goldwand, AMMO_GWND_WIMPY);
-            P_GiveAmmo(player, am_blaster, AMMO_BLSR_WIMPY);
-            P_GiveAmmo(player, am_crossbow, AMMO_CBOW_WIMPY);
-            P_GiveAmmo(player, am_skullrod, AMMO_SKRD_WIMPY);
-            P_GiveAmmo(player, am_phoenixrod, AMMO_PHRD_WIMPY);
-            P_SetMessage(player, DEH_String(TXT_ITEMBAGOFHOLDING), false);
-            break;
-        case SPR_SPMP:         // Item_SuperMap
-            if (!P_GivePower(player, pw_allmap))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_ITEMSUPERMAP), false);
-            break;
-
-            // Keys
-        case SPR_BKYY:         // Key_Blue
-            if (!player->keys[key_blue])
-            {
-                P_SetMessage(player, DEH_String(TXT_GOTBLUEKEY), false);
-            }
-            P_GiveKey(player, key_blue);
-            sound = sfx_keyup;
-            if (!netgame)
-            {
-                break;
-            }
-            return;
-        case SPR_CKYY:         // Key_Yellow
-            if (!player->keys[key_yellow])
-            {
-                P_SetMessage(player, DEH_String(TXT_GOTYELLOWKEY), false);
-            }
-            sound = sfx_keyup;
-            P_GiveKey(player, key_yellow);
-            if (!netgame)
-            {
-                break;
-            }
-            return;
-        case SPR_AKYY:         // Key_Green
-            if (!player->keys[key_green])
-            {
-                P_SetMessage(player, DEH_String(TXT_GOTGREENKEY), false);
-            }
-            sound = sfx_keyup;
-            P_GiveKey(player, key_green);
-            if (!netgame)
-            {
-                break;
-            }
-            return;
-
-            // Artifacts
-        case SPR_PTN2:         // Arti_HealingPotion
-            if (P_GiveArtifact(player, arti_health, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTIHEALTH), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_SOAR:         // Arti_Fly
-            if (P_GiveArtifact(player, arti_fly, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTIFLY), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_INVU:         // Arti_Invulnerability
-            if (P_GiveArtifact(player, arti_invulnerability, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTIINVULNERABILITY), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_PWBK:         // Arti_TomeOfPower
-            if (P_GiveArtifact(player, arti_tomeofpower, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTITOMEOFPOWER), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_INVS:         // Arti_Invisibility
-            if (P_GiveArtifact(player, arti_invisibility, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTIINVISIBILITY), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_EGGC:         // Arti_Egg
-            if (P_GiveArtifact(player, arti_egg, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTIEGG), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_SPHL:         // Arti_SuperHealth
-            if (P_GiveArtifact(player, arti_superhealth, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTISUPERHEALTH), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_TRCH:         // Arti_Torch
-            if (P_GiveArtifact(player, arti_torch, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTITORCH), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_FBMB:         // Arti_FireBomb
-            if (P_GiveArtifact(player, arti_firebomb, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTIFIREBOMB), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-        case SPR_ATLP:         // Arti_Teleport
-            if (P_GiveArtifact(player, arti_teleport, special))
-            {
-                P_SetMessage(player, DEH_String(TXT_ARTITELEPORT), false);
-                P_SetDormantArtifact(special);
-            }
-            return;
-
-            // Ammo
-        case SPR_AMG1:         // Ammo_GoldWandWimpy
-            if (!P_GiveAmmo(player, am_goldwand, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOGOLDWAND1), false);
-            break;
-        case SPR_AMG2:         // Ammo_GoldWandHefty
-            if (!P_GiveAmmo(player, am_goldwand, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOGOLDWAND2), false);
-            break;
-        case SPR_AMM1:         // Ammo_MaceWimpy
-            if (!P_GiveAmmo(player, am_mace, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOMACE1), false);
-            break;
-        case SPR_AMM2:         // Ammo_MaceHefty
-            if (!P_GiveAmmo(player, am_mace, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOMACE2), false);
-            break;
-        case SPR_AMC1:         // Ammo_CrossbowWimpy
-            if (!P_GiveAmmo(player, am_crossbow, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOCROSSBOW1), false);
-            break;
-        case SPR_AMC2:         // Ammo_CrossbowHefty
-            if (!P_GiveAmmo(player, am_crossbow, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOCROSSBOW2), false);
-            break;
-        case SPR_AMB1:         // Ammo_BlasterWimpy
-            if (!P_GiveAmmo(player, am_blaster, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOBLASTER1), false);
-            break;
-        case SPR_AMB2:         // Ammo_BlasterHefty
-            if (!P_GiveAmmo(player, am_blaster, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOBLASTER2), false);
-            break;
-        case SPR_AMS1:         // Ammo_SkullRodWimpy
-            if (!P_GiveAmmo(player, am_skullrod, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOSKULLROD1), false);
-            break;
-        case SPR_AMS2:         // Ammo_SkullRodHefty
-            if (!P_GiveAmmo(player, am_skullrod, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOSKULLROD2), false);
-            break;
-        case SPR_AMP1:         // Ammo_PhoenixRodWimpy
-            if (!P_GiveAmmo(player, am_phoenixrod, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOPHOENIXROD1), false);
-            break;
-        case SPR_AMP2:         // Ammo_PhoenixRodHefty
-            if (!P_GiveAmmo(player, am_phoenixrod, special->health))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_AMMOPHOENIXROD2), false);
-            break;
-
-            // Weapons
-        case SPR_WMCE:         // Weapon_Mace
-            if (!P_GiveWeapon(player, wp_mace))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_WPNMACE), false);
-            sound = sfx_wpnup;
-            break;
-        case SPR_WBOW:         // Weapon_Crossbow
-            if (!P_GiveWeapon(player, wp_crossbow))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_WPNCROSSBOW), false);
-            sound = sfx_wpnup;
-            break;
-        case SPR_WBLS:         // Weapon_Blaster
-            if (!P_GiveWeapon(player, wp_blaster))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_WPNBLASTER), false);
-            sound = sfx_wpnup;
-            break;
-        case SPR_WSKL:         // Weapon_SkullRod
-            if (!P_GiveWeapon(player, wp_skullrod))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_WPNSKULLROD), false);
-            sound = sfx_wpnup;
-            break;
-        case SPR_WPHX:         // Weapon_PhoenixRod
-            if (!P_GiveWeapon(player, wp_phoenixrod))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_WPNPHOENIXROD), false);
-            sound = sfx_wpnup;
-            break;
-        case SPR_WGNT:         // Weapon_Gauntlets
-            if (!P_GiveWeapon(player, wp_gauntlets))
-            {
-                return;
-            }
-            P_SetMessage(player, DEH_String(TXT_WPNGAUNTLETS), false);
-            sound = sfx_wpnup;
-            break;
-        default:
-            I_Error("P_SpecialThing: Unknown gettable thing");
-    }
-    if (special->flags & MF_COUNTITEM)
-    {
-        player->itemcount++;
-    }
-    if (deathmatch && respawn && !(special->flags & MF_DROPPED))
-    {
-        P_HideSpecialThing(special);
-    }
-    else
-    {
-        P_RemoveMobj(special);
-    }
-    player->bonuscount += BONUSADD;
-    if (player == &players[consoleplayer])
-    {
-        S_StartSound(NULL, sound);
-        SB_PaletteFlash();
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_KillMobj
-//
-//---------------------------------------------------------------------------
-
-void P_KillMobj(mobj_t * source, mobj_t * target)
-{
-    target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_NOGRAVITY);
-    target->flags |= MF_CORPSE | MF_DROPOFF;
-    target->flags2 &= ~MF2_PASSMOBJ;
-    target->height >>= 2;
-    if (source && source->player)
-    {
-        if (target->flags & MF_COUNTKILL)
-        {                       // Count for intermission
-            source->player->killcount++;
-        }
-        if (target->player)
-        {                       // Frag stuff
-            if (target == source)
-            {                   // Self-frag
-                target->player->frags[target->player - players]--;
-            }
-            else
-            {
-                source->player->frags[target->player - players]++;
-                if (source->player == &players[consoleplayer])
-                {
-                    S_StartSound(NULL, sfx_gfrag);
-                }
-                if (source->player->chickenTics)
-                {               // Make a super chicken
-                    P_GivePower(source->player, pw_weaponlevel2);
-                }
-            }
-        }
-    }
-    else if (!netgame && (target->flags & MF_COUNTKILL))
-    {                           // Count all monster deaths
-        players[0].killcount++;
-    }
-    if (target->player)
-    {
-        if (!source)
-        {                       // Self-frag
-            target->player->frags[target->player - players]--;
-        }
-        target->flags &= ~MF_SOLID;
-        target->flags2 &= ~MF2_FLY;
-        target->player->powers[pw_flight] = 0;
-        target->player->powers[pw_weaponlevel2] = 0;
-        target->player->playerstate = PST_DEAD;
-        P_DropWeapon(target->player);
-        if (target->flags2 & MF2_FIREDAMAGE)
-        {                       // Player flame death
-            P_SetMobjState(target, S_PLAY_FDTH1);
-            //S_StartSound(target, sfx_hedat1); // Burn sound
-            return;
-        }
-    }
-    if (target->health < -(target->info->spawnhealth >> 1)
-        && target->info->xdeathstate)
-    {                           // Extreme death
-        P_SetMobjState(target, target->info->xdeathstate);
-    }
-    else
-    {                           // Normal death
-        P_SetMobjState(target, target->info->deathstate);
-    }
-    target->tics -= P_Random() & 3;
-//      I_StartSound(&actor->r, actor->info->deathsound);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_MinotaurSlam
-//
-//---------------------------------------------------------------------------
-
-void P_MinotaurSlam(mobj_t * source, mobj_t * target)
-{
-    angle_t angle;
-    fixed_t thrust;
-
-    angle = R_PointToAngle2(source->x, source->y, target->x, target->y);
-    angle >>= ANGLETOFINESHIFT;
-    thrust = 16 * FRACUNIT + (P_Random() << 10);
-    target->momx += FixedMul(thrust, finecosine[angle]);
-    target->momy += FixedMul(thrust, finesine[angle]);
-    P_DamageMobj(target, NULL, NULL, HITDICE(6));
-    if (target->player)
-    {
-        target->reactiontime = 14 + (P_Random() & 7);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_TouchWhirlwind
-//
-//---------------------------------------------------------------------------
-
-void P_TouchWhirlwind(mobj_t * target)
-{
-    int randVal;
-
-    target->angle += P_SubRandom() << 20;
-    target->momx += P_SubRandom() << 10;
-    target->momy += P_SubRandom() << 10;
-    if (leveltime & 16 && !(target->flags2 & MF2_BOSS))
-    {
-        randVal = P_Random();
-        if (randVal > 160)
-        {
-            randVal = 160;
-        }
-        target->momz += randVal << 10;
-        if (target->momz > 12 * FRACUNIT)
-        {
-            target->momz = 12 * FRACUNIT;
-        }
-    }
-    if (!(leveltime & 7))
-    {
-        P_DamageMobj(target, NULL, NULL, 3);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_ChickenMorphPlayer
-//
-// Returns true if the player gets turned into a chicken.
-//
-//---------------------------------------------------------------------------
-
-boolean P_ChickenMorphPlayer(player_t * player)
-{
-    mobj_t *pmo;
-    mobj_t *fog;
-    mobj_t *chicken;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    angle_t angle;
-    int oldFlags2;
-
-    if (player->chickenTics)
-    {
-        if ((player->chickenTics < CHICKENTICS - TICRATE)
-            && !player->powers[pw_weaponlevel2])
-        {                       // Make a super chicken
-            P_GivePower(player, pw_weaponlevel2);
-        }
-        return (false);
-    }
-    if (player->powers[pw_invulnerability])
-    {                           // Immune when invulnerable
-        return (false);
-    }
-    pmo = player->mo;
-    x = pmo->x;
-    y = pmo->y;
-    z = pmo->z;
-    angle = pmo->angle;
-    oldFlags2 = pmo->flags2;
-    P_SetMobjState(pmo, S_FREETARGMOBJ);
-    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-    chicken = P_SpawnMobj(x, y, z, MT_CHICPLAYER);
-    chicken->special1.i = player->readyweapon;
-    chicken->angle = angle;
-    chicken->player = player;
-    player->health = chicken->health = MAXCHICKENHEALTH;
-    player->mo = chicken;
-    player->armorpoints = player->armortype = 0;
-    player->powers[pw_invisibility] = 0;
-    player->powers[pw_weaponlevel2] = 0;
-    if (oldFlags2 & MF2_FLY)
-    {
-        chicken->flags2 |= MF2_FLY;
-    }
-    player->chickenTics = CHICKENTICS;
-    P_ActivateBeak(player);
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_ChickenMorph
-//
-//---------------------------------------------------------------------------
-
-boolean P_ChickenMorph(mobj_t * actor)
-{
-    mobj_t *fog;
-    mobj_t *chicken;
-    mobj_t *target;
-    mobjtype_t moType;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    angle_t angle;
-    int ghost;
-
-    if (actor->player)
-    {
-        return (false);
-    }
-    moType = actor->type;
-    switch (moType)
-    {
-        case MT_POD:
-        case MT_CHICKEN:
-        case MT_HEAD:
-        case MT_MINOTAUR:
-        case MT_SORCERER1:
-        case MT_SORCERER2:
-            return (false);
-        default:
-            break;
-    }
-    x = actor->x;
-    y = actor->y;
-    z = actor->z;
-    angle = actor->angle;
-    ghost = actor->flags & MF_SHADOW;
-    target = actor->target;
-    P_SetMobjState(actor, S_FREETARGMOBJ);
-    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-    chicken = P_SpawnMobj(x, y, z, MT_CHICKEN);
-    chicken->special2.i = moType;
-    chicken->special1.i = CHICKENTICS + P_Random();
-    chicken->flags |= ghost;
-    chicken->target = target;
-    chicken->angle = angle;
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_AutoUseChaosDevice
-//
-//---------------------------------------------------------------------------
-
-boolean P_AutoUseChaosDevice(player_t * player)
-{
-    int i;
-
-    for (i = 0; i < player->inventorySlotNum; i++)
-    {
-        if (player->inventory[i].type == arti_teleport)
-        {
-            P_PlayerUseArtifact(player, arti_teleport);
-            player->health = player->mo->health = (player->health + 1) / 2;
-            return (true);
-        }
-    }
-    return (false);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_AutoUseHealth
-//
-//---------------------------------------------------------------------------
-
-void P_AutoUseHealth(player_t * player, int saveHealth)
-{
-    int i;
-    int count;
-    int normalCount;
-    int normalSlot;
-    int superCount;
-    int superSlot;
-
-    normalCount = 0;
-    superCount = 0;
-    normalSlot = 0;
-    superSlot = 0;
-
-    for (i = 0; i < player->inventorySlotNum; i++)
-    {
-        if (player->inventory[i].type == arti_health)
-        {
-            normalSlot = i;
-            normalCount = player->inventory[i].count;
-        }
-        else if (player->inventory[i].type == arti_superhealth)
-        {
-            superSlot = i;
-            superCount = player->inventory[i].count;
-        }
-    }
-    if ((gameskill == sk_baby) && (normalCount * 25 >= saveHealth))
-    {                           // Use quartz flasks
-        count = (saveHealth + 24) / 25;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 25;
-            P_PlayerRemoveArtifact(player, normalSlot);
-        }
-    }
-    else if (superCount * 100 >= saveHealth)
-    {                           // Use mystic urns
-        count = (saveHealth + 99) / 100;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 100;
-            P_PlayerRemoveArtifact(player, superSlot);
-        }
-    }
-    else if ((gameskill == sk_baby)
-             && (superCount * 100 + normalCount * 25 >= saveHealth))
-    {                           // Use mystic urns and quartz flasks
-        count = (saveHealth + 24) / 25;
-        saveHealth -= count * 25;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 25;
-            P_PlayerRemoveArtifact(player, normalSlot);
-        }
-        count = (saveHealth + 99) / 100;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 100;
-            P_PlayerRemoveArtifact(player, normalSlot);
-        }
-    }
-    player->mo->health = player->health;
-}
-
-/*
-=================
-=
-= P_DamageMobj
-=
-= Damages both enemies and players
-= inflictor is the thing that caused the damage
-= 		creature or missile, can be NULL (slime, etc)
-= source is the thing to target after taking damage
-=		creature or NULL
-= Source and inflictor are the same for melee attacks
-= source can be null for barrel explosions and other environmental stuff
-==================
-*/
-
-void P_DamageMobj
-    (mobj_t * target, mobj_t * inflictor, mobj_t * source, int damage)
-{
-    unsigned ang;
-    int saved;
-    player_t *player;
-    fixed_t thrust;
-    int temp;
-
-    if (!(target->flags & MF_SHOOTABLE))
-    {
-        // Shouldn't happen
-        return;
-    }
-    if (target->health <= 0)
-    {
-        return;
-    }
-    if (target->flags & MF_SKULLFLY)
-    {
-        if (target->type == MT_MINOTAUR)
-        {                       // Minotaur is invulnerable during charge attack
-            return;
-        }
-        target->momx = target->momy = target->momz = 0;
-    }
-    player = target->player;
-    if (player && gameskill == sk_baby)
-    {
-        // Take half damage in trainer mode
-        damage >>= 1;
-    }
-    // Special damage types
-    if (inflictor)
-    {
-        switch (inflictor->type)
-        {
-            case MT_EGGFX:
-                if (player)
-                {
-                    P_ChickenMorphPlayer(player);
-                }
-                else
-                {
-                    P_ChickenMorph(target);
-                }
-                return;         // Always return
-            case MT_WHIRLWIND:
-                P_TouchWhirlwind(target);
-                return;
-            case MT_MINOTAUR:
-                if (inflictor->flags & MF_SKULLFLY)
-                {               // Slam only when in charge mode
-                    P_MinotaurSlam(inflictor, target);
-                    return;
-                }
-                break;
-            case MT_MACEFX4:   // Death ball
-                if ((target->flags2 & MF2_BOSS) || target->type == MT_HEAD)
-                {               // Don't allow cheap boss kills
-                    break;
-                }
-                else if (target->player)
-                {               // Player specific checks
-                    if (target->player->powers[pw_invulnerability])
-                    {           // Can't hurt invulnerable players
-                        break;
-                    }
-                    if (P_AutoUseChaosDevice(target->player))
-                    {           // Player was saved using chaos device
-                        return;
-                    }
-                }
-                damage = 10000; // Something's gonna die
-                break;
-            case MT_PHOENIXFX2:        // Flame thrower
-                if (target->player && P_Random() < 128)
-                {               // Freeze player for a bit
-                    target->reactiontime += 4;
-                }
-                break;
-            case MT_RAINPLR1:  // Rain missiles
-            case MT_RAINPLR2:
-            case MT_RAINPLR3:
-            case MT_RAINPLR4:
-                if (target->flags2 & MF2_BOSS)
-                {               // Decrease damage for bosses
-                    damage = (P_Random() & 7) + 1;
-                }
-                break;
-            case MT_HORNRODFX2:
-            case MT_PHOENIXFX1:
-                if (target->type == MT_SORCERER2 && P_Random() < 96)
-                {               // D'Sparil teleports away
-                    P_DSparilTeleport(target);
-                    return;
-                }
-                break;
-            case MT_BLASTERFX1:
-            case MT_RIPPER:
-                if (target->type == MT_HEAD)
-                {               // Less damage to Ironlich bosses
-                    damage = P_Random() & 1;
-                    if (!damage)
-                    {
-                        return;
-                    }
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    // Push the target unless source is using the gauntlets
-    if (inflictor && (!source || !source->player
-                      || source->player->readyweapon != wp_gauntlets)
-        && !(inflictor->flags2 & MF2_NODMGTHRUST))
-    {
-        ang = R_PointToAngle2(inflictor->x, inflictor->y,
-                              target->x, target->y);
-        //thrust = damage*(FRACUNIT>>3)*100/target->info->mass;
-        // We do this multiplication in unsigned because it might overflow
-        // and signed overflow is undefined behavior
-        // but then we must cast it back to signed for the division
-        // to match original behavior
-        // unsigned to signed cast is implementation defined behavior at worst
-        thrust = ((int) (damage * (FRACUNIT >> 3) * 150u)) / target->info->mass;
-        // make fall forwards sometimes
-        if ((damage < 40) && (damage > target->health)
-            && (target->z - inflictor->z > 64 * FRACUNIT) && (P_Random() & 1))
-        {
-            ang += ANG180;
-            thrust *= 4;
-        }
-        ang >>= ANGLETOFINESHIFT;
-        if (source && source->player && (source == inflictor)
-            && source->player->powers[pw_weaponlevel2]
-            && source->player->readyweapon == wp_staff)
-        {
-            // Staff power level 2
-            target->momx += FixedMul(10 * FRACUNIT, finecosine[ang]);
-            target->momy += FixedMul(10 * FRACUNIT, finesine[ang]);
-            if (!(target->flags & MF_NOGRAVITY))
-            {
-                target->momz += 5 * FRACUNIT;
-            }
-        }
-        else
-        {
-            target->momx += FixedMul(thrust, finecosine[ang]);
-            target->momy += FixedMul(thrust, finesine[ang]);
-        }
-    }
-
-    //
-    // player specific
-    //
-    if (player)
-    {
-        // end of game hell hack
-        //if(target->subsector->sector->special == 11
-        //      && damage >= target->health)
-        //{
-        //      damage = target->health - 1;
-        //}
-
-        if (damage < 1000 && ((player->cheats & CF_GODMODE)
-                              || player->powers[pw_invulnerability]))
-        {
-            return;
-        }
-        if (player->armortype)
-        {
-            if (player->armortype == 1)
-            {
-                saved = damage >> 1;
-            }
-            else
-            {
-                saved = (damage >> 1) + (damage >> 2);
-            }
-            if (player->armorpoints <= saved)
-            {
-                // armor is used up
-                saved = player->armorpoints;
-                player->armortype = 0;
-            }
-            player->armorpoints -= saved;
-            damage -= saved;
-        }
-        if (damage >= player->health
-            && ((gameskill == sk_baby) || deathmatch) && !player->chickenTics)
-        {                       // Try to use some inventory health
-            P_AutoUseHealth(player, damage - player->health + 1);
-        }
-        player->health -= damage;       // mirror mobj health here for Dave
-        if (player->health < 0)
-        {
-            player->health = 0;
-        }
-        player->attacker = source;
-        player->damagecount += damage;  // add damage after armor / invuln
-        if (player->damagecount > 100)
-        {
-            player->damagecount = 100;  // teleport stomp does 10k points...
-        }
-        temp = damage < 100 ? damage : 100;
-        if (player == &players[consoleplayer])
-        {
-            I_Tactile(40, 10, 40 + temp * 2);
-            SB_PaletteFlash();
-        }
-    }
-
-    //
-    // do the damage
-    //
-    target->health -= damage;
-    if (target->health <= 0)
-    {                           // Death
-        target->special1.i = damage;
-        if (target->type == MT_POD && source && source->type != MT_POD)
-        {                       // Make sure players get frags for chain-reaction kills
-            target->target = source;
-        }
-        if (player && inflictor && !player->chickenTics)
-        {                       // Check for flame death
-            if ((inflictor->flags2 & MF2_FIREDAMAGE)
-                || ((inflictor->type == MT_PHOENIXFX1)
-                    && (target->health > -50) && (damage > 25)))
-            {
-                target->flags2 |= MF2_FIREDAMAGE;
-            }
-        }
-        P_KillMobj(source, target);
-        return;
-    }
-    if ((P_Random() < target->info->painchance)
-        && !(target->flags & MF_SKULLFLY))
-    {
-        target->flags |= MF_JUSTHIT;    // fight back!
-        P_SetMobjState(target, target->info->painstate);
-    }
-    target->reactiontime = 0;   // we're awake now...
-    if (!target->threshold && source && !(source->flags2 & MF2_BOSS)
-        && !(target->type == MT_SORCERER2 && source->type == MT_WIZARD))
-    {
-        // Target actor is not intent on another actor,
-        // so make him chase after source
-        target->target = source;
-        target->threshold = BASETHRESHOLD;
-        if (target->state == &states[target->info->spawnstate]
-            && target->info->seestate != S_NULL)
-        {
-            P_SetMobjState(target, target->info->seestate);
-        }
-    }
-}
diff --git a/games/NXDoom/src/heretic/p_lights.c b/games/NXDoom/src/heretic/p_lights.c
deleted file mode 100644
index 407041b3c..000000000
--- a/games/NXDoom/src/heretic/p_lights.c
+++ /dev/null
@@ -1,280 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-#include "doomdef.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "v_video.h"
-
-//==================================================================
-//==================================================================
-//
-//                                                      BROKEN LIGHT FLASHING
-//
-//==================================================================
-//==================================================================
-
-//==================================================================
-//
-//      T_LightFlash
-//
-//      After the map has been loaded, scan each sector for specials
-//      that spawn thinkers
-//
-//==================================================================
-void T_LightFlash(thinker_t *thinker)
-{
-    lightflash_t *flash = (lightflash_t *) thinker;
-
-    if (--flash->count)
-        return;
-
-    if (flash->sector->lightlevel == flash->maxlight)
-    {
-        flash->sector->lightlevel = flash->minlight;
-        flash->count = (P_Random() & flash->mintime) + 1;
-    }
-    else
-    {
-        flash->sector->lightlevel = flash->maxlight;
-        flash->count = (P_Random() & flash->maxtime) + 1;
-    }
-
-}
-
-
-//==================================================================
-//
-//      P_SpawnLightFlash
-//
-//      After the map has been loaded, scan each sector for specials that spawn thinkers
-//
-//==================================================================
-void P_SpawnLightFlash(sector_t * sector)
-{
-    lightflash_t *flash;
-
-    sector->special = 0;        // nothing special about it during gameplay
-
-    flash = Z_Malloc(sizeof(*flash), PU_LEVSPEC, 0);
-    P_AddThinker(&flash->thinker);
-    flash->thinker.function = T_LightFlash;
-    flash->sector = sector;
-    flash->maxlight = sector->lightlevel;
-
-    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
-    flash->maxtime = 64;
-    flash->mintime = 7;
-    flash->count = (P_Random() & flash->maxtime) + 1;
-}
-
-//==================================================================
-//
-//                                                      STROBE LIGHT FLASHING
-//
-//==================================================================
-
-//==================================================================
-//
-//      T_StrobeFlash
-//
-//      After the map has been loaded, scan each sector for specials that spawn thinkers
-//
-//==================================================================
-void T_StrobeFlash(thinker_t *thinker)
-{
-    strobe_t *flash = (strobe_t *) thinker;
-
-    if (--flash->count)
-        return;
-
-    if (flash->sector->lightlevel == flash->minlight)
-    {
-        flash->sector->lightlevel = flash->maxlight;
-        flash->count = flash->brighttime;
-    }
-    else
-    {
-        flash->sector->lightlevel = flash->minlight;
-        flash->count = flash->darktime;
-    }
-
-}
-
-//==================================================================
-//
-//      P_SpawnLightFlash
-//
-//      After the map has been loaded, scan each sector for specials that spawn thinkers
-//
-//==================================================================
-void P_SpawnStrobeFlash(sector_t * sector, int fastOrSlow, int inSync)
-{
-    strobe_t *flash;
-
-    flash = Z_Malloc(sizeof(*flash), PU_LEVSPEC, 0);
-    P_AddThinker(&flash->thinker);
-    flash->sector = sector;
-    flash->darktime = fastOrSlow;
-    flash->brighttime = STROBEBRIGHT;
-    flash->thinker.function = T_StrobeFlash;
-    flash->maxlight = sector->lightlevel;
-    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
-
-    if (flash->minlight == flash->maxlight)
-        flash->minlight = 0;
-    sector->special = 0;        // nothing special about it during gameplay
-
-    if (!inSync)
-        flash->count = (P_Random() & 7) + 1;
-    else
-        flash->count = 1;
-}
-
-//==================================================================
-//
-//      Start strobing lights (usually from a trigger)
-//
-//==================================================================
-void EV_StartLightStrobing(line_t * line)
-{
-    int secnum;
-    sector_t *sec;
-
-    secnum = -1;
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        P_SpawnStrobeFlash(sec, SLOWDARK, 0);
-    }
-}
-
-//==================================================================
-//
-//      TURN LINE'S TAG LIGHTS OFF
-//
-//==================================================================
-void EV_TurnTagLightsOff(line_t * line)
-{
-    int i;
-    int j;
-    int min;
-    sector_t *sector;
-    sector_t *tsec;
-    line_t *templine;
-
-    sector = sectors;
-    for (j = 0; j < numsectors; j++, sector++)
-        if (sector->tag == line->tag)
-        {
-            min = sector->lightlevel;
-            for (i = 0; i < sector->linecount; i++)
-            {
-                templine = sector->lines[i];
-                tsec = getNextSector(templine, sector);
-                if (!tsec)
-                    continue;
-                if (tsec->lightlevel < min)
-                    min = tsec->lightlevel;
-            }
-            sector->lightlevel = min;
-        }
-}
-
-//==================================================================
-//
-//      TURN LINE'S TAG LIGHTS ON
-//
-//==================================================================
-void EV_LightTurnOn(line_t * line, int bright)
-{
-    int i;
-    int j;
-    sector_t *sector;
-    sector_t *temp;
-    line_t *templine;
-
-    sector = sectors;
-
-    for (i = 0; i < numsectors; i++, sector++)
-        if (sector->tag == line->tag)
-        {
-            //
-            // bright = 0 means to search for highest
-            // light level surrounding sector
-            //
-            if (!bright)
-            {
-                for (j = 0; j < sector->linecount; j++)
-                {
-                    templine = sector->lines[j];
-                    temp = getNextSector(templine, sector);
-                    if (!temp)
-                        continue;
-                    if (temp->lightlevel > bright)
-                        bright = temp->lightlevel;
-                }
-            }
-            sector->lightlevel = bright;
-        }
-}
-
-//==================================================================
-//
-//      Spawn glowing light
-//
-//==================================================================
-void T_Glow(thinker_t *thinker)
-{
-    glow_t *g = (glow_t *) thinker;
-
-    switch (g->direction)
-    {
-        case -1:               // DOWN
-            g->sector->lightlevel -= GLOWSPEED;
-            if (g->sector->lightlevel <= g->minlight)
-            {
-                g->sector->lightlevel += GLOWSPEED;
-                g->direction = 1;
-            }
-            break;
-        case 1:                // UP
-            g->sector->lightlevel += GLOWSPEED;
-            if (g->sector->lightlevel >= g->maxlight)
-            {
-                g->sector->lightlevel -= GLOWSPEED;
-                g->direction = -1;
-            }
-            break;
-    }
-}
-
-void P_SpawnGlowingLight(sector_t * sector)
-{
-    glow_t *g;
-
-    g = Z_Malloc(sizeof(*g), PU_LEVSPEC, 0);
-    P_AddThinker(&g->thinker);
-    g->sector = sector;
-    g->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
-    g->maxlight = sector->lightlevel;
-    g->thinker.function = T_Glow;
-    g->direction = -1;
-
-    sector->special = 0;
-}
diff --git a/games/NXDoom/src/heretic/p_local.h b/games/NXDoom/src/heretic/p_local.h
deleted file mode 100644
index 6137d3d0d..000000000
--- a/games/NXDoom/src/heretic/p_local.h
+++ /dev/null
@@ -1,292 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_local.h
-
-#ifndef __P_LOCAL__
-#define __P_LOCAL__
-
-#ifndef __R_LOCAL__
-#include "r_local.h"
-#endif
-
-#define STARTREDPALS	1
-#define STARTBONUSPALS	9
-#define NUMREDPALS		8
-#define NUMBONUSPALS	4
-
-#define FOOTCLIPSIZE	10*FRACUNIT
-
-#define TOCENTER -8
-#define	FLOATSPEED (FRACUNIT*4)
-
-#define	MAXHEALTH 100
-#define MAXCHICKENHEALTH 30
-#define	VIEWHEIGHT (41*FRACUNIT)
-
-// mapblocks are used to check movement against lines and things
-#define MAPBLOCKUNITS	128
-#define	MAPBLOCKSIZE	(MAPBLOCKUNITS*FRACUNIT)
-#define	MAPBLOCKSHIFT	(FRACBITS+7)
-#define	MAPBMASK		(MAPBLOCKSIZE-1)
-#define	MAPBTOFRAC		(MAPBLOCKSHIFT-FRACBITS)
-
-// player radius for movement checking
-#define PLAYERRADIUS 16*FRACUNIT
-
-// MAXRADIUS is for precalculated sector block boxes
-// the spider demon is larger, but we don't have any moving sectors
-// nearby
-#define MAXRADIUS 32*FRACUNIT
-
-#define	GRAVITY FRACUNIT
-#define	MAXMOVE (30*FRACUNIT)
-
-#define	USERANGE (64*FRACUNIT)
-#define	MELEERANGE (64*FRACUNIT)
-#define	MISSILERANGE (32*64*FRACUNIT)
-
-typedef enum
-{
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-} dirtype_t;
-
-#define BASETHRESHOLD 100       // follow a player exlusively for 3 seconds
-
-// ***** P_TICK *****
-
-extern thinker_t thinkercap;    // both the head and tail of the thinker list
-extern int TimerGame;           // tic countdown for deathmatch
-
-void P_InitThinkers(void);
-void P_AddThinker(thinker_t * thinker);
-void P_RemoveThinker(thinker_t * thinker);
-
-// ***** P_PSPR *****
-
-#define USE_GWND_AMMO_1 1
-#define USE_GWND_AMMO_2 1
-#define USE_CBOW_AMMO_1 1
-#define USE_CBOW_AMMO_2 1
-#define USE_BLSR_AMMO_1 1
-#define USE_BLSR_AMMO_2 5
-#define USE_SKRD_AMMO_1 1
-#define USE_SKRD_AMMO_2 5
-#define USE_PHRD_AMMO_1 1
-#define USE_PHRD_AMMO_2 1
-#define USE_MACE_AMMO_1 1
-#define USE_MACE_AMMO_2 5
-
-void P_OpenWeapons(void);
-void P_CloseWeapons(void);
-void P_AddMaceSpot(mapthing_t * mthing);
-void P_RepositionMace(mobj_t * mo);
-void P_SetPsprite(player_t * player, int position, statenum_t stnum);
-void P_SetupPsprites(player_t * curplayer);
-void P_MovePsprites(player_t * curplayer);
-void P_DropWeapon(player_t * player);
-void P_ActivateBeak(player_t * player);
-void P_PostChickenWeapon(player_t * player, weapontype_t weapon);
-void P_UpdateBeak(player_t * player, pspdef_t * psp);
-
-// ***** P_USER *****
-
-void P_PlayerThink(player_t * player);
-void P_Thrust(player_t * player, angle_t angle, fixed_t move);
-void P_PlayerRemoveArtifact(player_t * player, int slot);
-void P_PlayerUseArtifact(player_t * player, artitype_t arti);
-boolean P_UseArtifact(player_t * player, artitype_t arti);
-int P_GetPlayerNum(player_t * player);
-boolean P_UndoPlayerChicken(player_t *player);
-
-
-// ***** P_MOBJ *****
-
-#define FLOOR_SOLID 0
-#define FLOOR_WATER 1
-#define FLOOR_LAVA 2
-#define FLOOR_SLUDGE 3
-
-#define ONFLOORZ INT_MIN
-#define ONCEILINGZ INT_MAX
-#define FLOATRANDZ (INT_MAX-1)
-
-extern mobjtype_t PuffType;
-extern mobj_t *MissileMobj;
-
-mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
-void P_RemoveMobj(mobj_t * th);
-boolean P_SetMobjState(mobj_t * mobj, statenum_t state);
-boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state);
-void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move);
-int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta);
-boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax);
-void P_MobjThinker(thinker_t *thinker);
-void P_BlasterMobjThinker(thinker_t *thinker);
-void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z);
-void P_SpawnBlood(fixed_t x, fixed_t y, fixed_t z, int damage);
-void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator);
-void P_RipperBlood(mobj_t * mo);
-int P_GetThingFloorType(mobj_t * thing);
-int P_HitFloor(mobj_t * thing);
-boolean P_CheckMissileSpawn(mobj_t * missile);
-mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type);
-mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
-                            angle_t angle, fixed_t momz);
-mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type);
-mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle);
-
-// ***** P_ENEMY *****
-
-void P_NoiseAlert(mobj_t * target, mobj_t * emmiter);
-void P_InitMonsters(void);
-void P_AddBossSpot(fixed_t x, fixed_t y, angle_t angle);
-void P_Massacre(void);
-void P_DSparilTeleport(mobj_t * actor);
-
-// ***** P_MAPUTL *****
-
-typedef struct
-{
-    fixed_t x, y, dx, dy;
-} divline_t;
-
-typedef struct
-{
-    fixed_t frac;               // along trace line
-    boolean isaline;
-    union
-    {
-        mobj_t *thing;
-        line_t *line;
-    } d;
-} intercept_t;
-
-#define	MAXINTERCEPTS	128
-extern intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
-typedef boolean(*traverser_t) (intercept_t * in);
-
-
-fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
-int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line);
-int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line);
-void P_MakeDivline(line_t * li, divline_t * dl);
-fixed_t P_InterceptVector(divline_t * v2, divline_t * v1);
-int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld);
-
-extern fixed_t opentop, openbottom, openrange;
-extern fixed_t lowfloor;
-void P_LineOpening(line_t * linedef);
-
-boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *));
-boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *));
-
-#define PT_ADDLINES		1
-#define	PT_ADDTHINGS	2
-#define	PT_EARLYOUT		4
-
-extern divline_t trace;
-boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
-                       int flags, boolean(*trav) (intercept_t *));
-
-void P_UnsetThingPosition(mobj_t * thing);
-void P_SetThingPosition(mobj_t * thing);
-
-// ***** P_MAP *****
-
-extern boolean floatok;         // if true, move would be ok if
-extern fixed_t tmfloorz, tmceilingz;    // within tmfloorz - tmceilingz
-
-extern line_t *ceilingline;
-boolean P_TestMobjLocation(mobj_t * mobj);
-boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y);
-mobj_t *P_CheckOnmobj(mobj_t * thing);
-void P_FakeZMovement(mobj_t * mo);
-boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y);
-boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y);
-void P_SlideMove(mobj_t * mo);
-
-extern fixed_t topslope, bottomslope;   // slopes to top and bottom of target
-
-boolean P_CheckSight(mobj_t * t1, mobj_t * t2);
-void P_UseLines(player_t * player);
-
-boolean P_ChangeSector(sector_t * sector, boolean crunch);
-
-extern mobj_t *linetarget;      // who got hit (or NULL)
-fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance);
-
-void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
-                  int damage);
-
-void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage);
-
-#define	MAXSPECIALCROSS		8
-extern line_t *spechit[MAXSPECIALCROSS];
-extern int numspechit;
-
-
-// ***** P_SETUP *****
-
-extern byte *rejectmatrix;      // for fast sight rejection
-extern short *blockmaplump;     // offsets in blockmap are from here
-extern short *blockmap;
-extern int bmapwidth, bmapheight;       // in mapblocks
-extern fixed_t bmaporgx, bmaporgy;      // origin of block map
-extern mobj_t **blocklinks;     // for thing chains
-
-// ***** P_INTER *****
-
-extern int maxammo[NUMAMMO];
-extern int clipammo[NUMAMMO];
-
-extern boolean messageson;
-
-
-void P_SetMessage(player_t * player, const char *message, boolean ultmsg);
-void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher);
-void P_DamageMobj(mobj_t * target, mobj_t * inflictor, mobj_t * source,
-                  int damage);
-boolean P_GiveAmmo(player_t * player, ammotype_t ammo, int count);
-boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo);
-boolean P_GiveBody(player_t * player, int num);
-boolean P_GivePower(player_t * player, powertype_t power);
-boolean P_ChickenMorphPlayer(player_t * player);
-
-// ***** AM_MAP *****
-
-boolean AM_Responder(event_t * ev);
-void AM_Ticker(void);
-void AM_Drawer(void);
-
-// ***** SB_BAR *****
-
-extern int SB_state;
-extern int ArtifactFlash;
-void SB_PaletteFlash(void);
-
-#include "p_spec.h"
-
-#endif // __P_LOCAL__
diff --git a/games/NXDoom/src/heretic/p_map.c b/games/NXDoom/src/heretic/p_map.c
deleted file mode 100644
index ba5669770..000000000
--- a/games/NXDoom/src/heretic/p_map.c
+++ /dev/null
@@ -1,1696 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// P_map.c
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "m_bbox.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-/*
-===============================================================================
-
-NOTES:
-
-
-===============================================================================
-*/
-
-/*
-===============================================================================
-
-mobj_t NOTES
-
-mobj_ts are used to tell the refresh where to draw an image, tell the world
-simulation when objects are contacted, and tell the sound driver how to
-position a sound.
-
-The refresh uses the next and prev links to follow lists of things in sectors
-as they are being drawn.  The sprite, frame, and angle elements determine which
-patch_t is used to draw the sprite if it is visible.  The sprite and frame
-values are allmost allways set from state_t structures.  The statescr.exe
-utility generates the states.h and states.c files that contain the sprite/frame
-numbers from the statescr.txt source file.  The xyz origin point represents a
-point at the bottom middle of the sprite (between the feet of a biped).  This
-is the default origin position for patch_ts grabbed with lumpy.exe.  A walking
-creature will have its z equal to the floor it is standing on.
- 
-The sound code uses the x,y, and subsector fields to do stereo positioning of
-any sound effited by the mobj_t.
-
-The play simulation uses the blocklinks, x,y,z, radius, height to determine
-when mobj_ts are touching each other, touching lines in the map, or hit by
-trace lines (gunshots, lines of sight, etc). The mobj_t->flags element has
-various bit flags used by the simulation.
-
-
-Every mobj_t is linked into a single sector based on it's origin coordinates.
-The subsector_t is found with R_PointInSubsector(x,y), and the sector_t can be
-found with subsector->sector.  The sector links are only used by the rendering
-code,  the play simulation does not care about them at all.
-
-Any mobj_t that needs to be acted upon be something else in the play world
-(block movement, be shot, etc) will also need to be linked into the blockmap. 
-If the thing has the MF_NOBLOCK flag set, it will not use the block links. It
-can still interact with other things, but only as the instigator (missiles will
-run into other things, but nothing can run into a missile).   Each block in
-the grid is 128*128 units, and knows about every line_t that it contains a
-piece of, and every interactable mobj_t that has it's origin contained.  
-
-A valid mobj_t is a mobj_t that has the proper subsector_t filled in for it's
-xy coordinates and is linked into the subsector's sector or has the MF_NOSECTOR
-flag set (the subsector_t needs to be valid even if MF_NOSECTOR is set), and is
-linked into a blockmap block or has the MF_NOBLOCKMAP flag set.  Links should
-only be modified by the P_[Un]SetThingPosition () functions.  Do not change
-the MF_NO? flags while a thing is valid.
-
-
-===============================================================================
-*/
-
-fixed_t tmbbox[4];
-mobj_t *tmthing;
-int tmflags;
-fixed_t tmx, tmy;
-
-boolean floatok;                // if true, move would be ok if
-                                                                        // within tmfloorz - tmceilingz
-
-fixed_t tmfloorz, tmceilingz, tmdropoffz;
-
-// keep track of the line that lowers the ceiling, so missiles don't explode
-// against sky hack walls
-line_t *ceilingline;
-
-// keep track of special lines as they are hit, but don't process them
-// until the move is proven valid
-#define	MAXSPECIALCROSS		8
-line_t *spechit[MAXSPECIALCROSS];
-int numspechit;
-
-mobj_t *onmobj;                 //generic global onmobj...used for landing on pods/players
-
-/*
-===============================================================================
-
-					TELEPORT MOVE
- 
-===============================================================================
-*/
-
-/*
-==================
-=
-= PIT_StompThing
-=
-==================
-*/
-
-boolean PIT_StompThing(mobj_t * thing)
-{
-    fixed_t blockdist;
-
-    if (!(thing->flags & MF_SHOOTABLE))
-        return true;
-
-    blockdist = thing->radius + tmthing->radius;
-    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
-        return true;            // didn't hit it
-
-    if (thing == tmthing)
-        return true;            // don't clip against self
-
-    if (!(tmthing->flags2 & MF2_TELESTOMP))
-    {                           // Not allowed to stomp things
-        return (false);
-    }
-
-    P_DamageMobj(thing, tmthing, tmthing, 10000);
-
-    return true;
-}
-
-
-/*
-===================
-=
-= P_TeleportMove
-=
-===================
-*/
-
-boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y)
-{
-    int xl, xh, yl, yh, bx, by;
-    subsector_t *newsubsec;
-
-//
-// kill anything occupying the position
-//
-
-    tmthing = thing;
-    tmflags = thing->flags;
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector(x, y);
-    ceilingline = NULL;
-
-//
-// the base floor / ceiling is from the subsector that contains the
-// point.  Any contacted lines the step closer together will adjust them
-//
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-
-    validcount++;
-    numspechit = 0;
-
-//
-// stomp on any things contacted
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockThingsIterator(bx, by, PIT_StompThing))
-                return false;
-
-//
-// the move is ok, so link the thing into its new position
-//      
-    P_UnsetThingPosition(thing);
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition(thing);
-
-    return true;
-}
-
-/*
-===============================================================================
-
-					MOVEMENT ITERATOR FUNCTIONS
- 
-===============================================================================
-*/
-
-/*
-==================
-=
-= PIT_CheckLine
-=
-= Adjusts tmfloorz and tmceilingz as lines are contacted
-==================
-*/
-
-boolean PIT_CheckLine(line_t * ld)
-{
-    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
-        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
-        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
-    {
-        return (true);
-    }
-    if (P_BoxOnLineSide(tmbbox, ld) != -1)
-    {
-        return (true);
-    }
-
-// a line has been hit
-/*
-=
-= The moving thing's destination position will cross the given line.
-= If this should not be allowed, return false.
-= If the line is special, keep track of it to process later if the move
-= 	is proven ok.  NOTE: specials are NOT sorted by order, so two special lines
-= 	that are only 8 pixels apart could be crossed in either order.
-*/
-
-    if (!ld->backsector)
-    {                           // One sided line
-        if (tmthing->flags & MF_MISSILE)
-        {                       // Missiles can trigger impact specials
-            if (ld->special)
-            {
-                spechit[numspechit] = ld;
-                numspechit++;
-            }
-        }
-        return false;
-    }
-    if (!(tmthing->flags & MF_MISSILE))
-    {
-        if (ld->flags & ML_BLOCKING)
-        {                       // Explicitly blocking everything
-            return (false);
-        }
-        if (!tmthing->player && ld->flags & ML_BLOCKMONSTERS
-            && tmthing->type != MT_POD)
-        {                       // Block monsters only
-            return (false);
-        }
-    }
-    P_LineOpening(ld);          // set openrange, opentop, openbottom
-    // adjust floor / ceiling heights
-    if (opentop < tmceilingz)
-    {
-        tmceilingz = opentop;
-        ceilingline = ld;
-    }
-    if (openbottom > tmfloorz)
-    {
-        tmfloorz = openbottom;
-    }
-    if (lowfloor < tmdropoffz)
-    {
-        tmdropoffz = lowfloor;
-    }
-    if (ld->special)
-    {                           // Contacted a special line, add it to the list
-        spechit[numspechit] = ld;
-        numspechit++;
-    }
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC PIT_CheckThing
-//
-//---------------------------------------------------------------------------
-
-boolean PIT_CheckThing(mobj_t * thing)
-{
-    fixed_t blockdist;
-    boolean solid;
-    int damage;
-
-    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
-    {                           // Can't hit thing
-        return (true);
-    }
-    blockdist = thing->radius + tmthing->radius;
-    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
-    {                           // Didn't hit thing
-        return (true);
-    }
-    if (thing == tmthing)
-    {                           // Don't clip against self
-        return (true);
-    }
-    if (tmthing->flags2 & MF2_PASSMOBJ)
-    {                           // check if a mobj passed over/under another object
-        if ((tmthing->type == MT_IMP || tmthing->type == MT_WIZARD)
-            && (thing->type == MT_IMP || thing->type == MT_WIZARD))
-        {                       // don't let imps/wizards fly over other imps/wizards
-            return false;
-        }
-        if (tmthing->z > thing->z + thing->height
-            && !(thing->flags & MF_SPECIAL))
-        {
-            return (true);
-        }
-        else if (tmthing->z + tmthing->height < thing->z
-                 && !(thing->flags & MF_SPECIAL))
-        {                       // under thing
-            return (true);
-        }
-    }
-    // Check for skulls slamming into things
-    if (tmthing->flags & MF_SKULLFLY)
-    {
-        damage = ((P_Random() % 8) + 1) * tmthing->damage;
-        P_DamageMobj(thing, tmthing, tmthing, damage);
-        tmthing->flags &= ~MF_SKULLFLY;
-        tmthing->momx = tmthing->momy = tmthing->momz = 0;
-        P_SetMobjState(tmthing, tmthing->info->seestate);
-        return (false);
-    }
-    // Check for missile
-    if (tmthing->flags & MF_MISSILE)
-    {
-        // Check for passing through a ghost
-        if ((thing->flags & MF_SHADOW) && (tmthing->flags2 & MF2_THRUGHOST))
-        {
-            return (true);
-        }
-        // Check if it went over / under
-        if (tmthing->z > thing->z + thing->height)
-        {                       // Over thing
-            return (true);
-        }
-        if (tmthing->z + tmthing->height < thing->z)
-        {                       // Under thing
-            return (true);
-        }
-        if (tmthing->target && tmthing->target->type == thing->type)
-        {                       // Don't hit same species as originator
-            if (thing == tmthing->target)
-            {                   // Don't missile self
-                return (true);
-            }
-            if (thing->type != MT_PLAYER)
-            {                   // Hit same species as originator, explode, no damage
-                return (false);
-            }
-        }
-        if (!(thing->flags & MF_SHOOTABLE))
-        {                       // Didn't do any damage
-            return !(thing->flags & MF_SOLID);
-        }
-        if (tmthing->flags2 & MF2_RIP)
-        {
-            if (!(thing->flags & MF_NOBLOOD))
-            {                   // Ok to spawn some blood
-                P_RipperBlood(tmthing);
-            }
-            S_StartSound(tmthing, sfx_ripslop);
-            damage = ((P_Random() & 3) + 2) * tmthing->damage;
-            P_DamageMobj(thing, tmthing, tmthing->target, damage);
-            if (thing->flags2 & MF2_PUSHABLE
-                && !(tmthing->flags2 & MF2_CANNOTPUSH))
-            {                   // Push thing
-                thing->momx += tmthing->momx >> 2;
-                thing->momy += tmthing->momy >> 2;
-            }
-            numspechit = 0;
-            return (true);
-        }
-        // Do damage
-        damage = ((P_Random() % 8) + 1) * tmthing->damage;
-        if (damage)
-        {
-            if (!(thing->flags & MF_NOBLOOD) && P_Random() < 192)
-            {
-                P_BloodSplatter(tmthing->x, tmthing->y, tmthing->z, thing);
-            }
-            P_DamageMobj(thing, tmthing, tmthing->target, damage);
-        }
-        return (false);
-    }
-    if (thing->flags2 & MF2_PUSHABLE && !(tmthing->flags2 & MF2_CANNOTPUSH))
-    {                           // Push thing
-        thing->momx += tmthing->momx >> 2;
-        thing->momy += tmthing->momy >> 2;
-    }
-    // Check for special thing
-    if (thing->flags & MF_SPECIAL)
-    {
-        solid = (thing->flags & MF_SOLID) != 0;
-        if (tmflags & MF_PICKUP)
-        {                       // Can be picked up by tmthing
-            P_TouchSpecialThing(thing, tmthing);        // Can remove thing
-        }
-        return (!solid);
-    }
-    return (!(thing->flags & MF_SOLID));
-}
-
-//---------------------------------------------------------------------------
-//
-// PIT_CheckOnmobjZ
-//
-//---------------------------------------------------------------------------
-
-boolean PIT_CheckOnmobjZ(mobj_t * thing)
-{
-    fixed_t blockdist;
-
-    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
-    {                           // Can't hit thing
-        return (true);
-    }
-    blockdist = thing->radius + tmthing->radius;
-    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
-    {                           // Didn't hit thing
-        return (true);
-    }
-    if (thing == tmthing)
-    {                           // Don't clip against self
-        return (true);
-    }
-    if (tmthing->z > thing->z + thing->height)
-    {
-        return (true);
-    }
-    else if (tmthing->z + tmthing->height < thing->z)
-    {                           // under thing
-        return (true);
-    }
-    if (thing->flags & MF_SOLID)
-    {
-        onmobj = thing;
-    }
-    return (!(thing->flags & MF_SOLID));
-}
-
-/*
-===============================================================================
-
- 						MOVEMENT CLIPPING
- 
-===============================================================================
-*/
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_TestMobjLocation
-//
-// Returns true if the mobj is not blocked by anything at its current
-// location, otherwise returns false.
-//
-//----------------------------------------------------------------------------
-
-boolean P_TestMobjLocation(mobj_t * mobj)
-{
-    int flags;
-
-    flags = mobj->flags;
-    mobj->flags &= ~MF_PICKUP;
-    if (P_CheckPosition(mobj, mobj->x, mobj->y))
-    {                           // XY is ok, now check Z
-        mobj->flags = flags;
-        if ((mobj->z < mobj->floorz)
-            || (mobj->z + mobj->height > mobj->ceilingz))
-        {                       // Bad Z
-            return (false);
-        }
-        return (true);
-    }
-    mobj->flags = flags;
-    return (false);
-}
-
-/*
-==================
-=
-= P_CheckPosition
-=
-= This is purely informative, nothing is modified (except things picked up)
-
-in:
-a mobj_t (can be valid or invalid)
-a position to be checked (doesn't need to be related to the mobj_t->x,y)
-
-during:
-special things are touched if MF_PICKUP
-early out on solid lines?
-
-out:
-newsubsec
-floorz
-ceilingz
-tmdropoffz		the lowest point contacted (monsters won't move to a dropoff)
-speciallines[]
-numspeciallines
-
-==================
-*/
-
-boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y)
-{
-    int xl, xh, yl, yh, bx, by;
-    subsector_t *newsubsec;
-
-    tmthing = thing;
-    tmflags = thing->flags;
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector(x, y);
-    ceilingline = NULL;
-
-//
-// the base floor / ceiling is from the subsector that contains the
-// point.  Any contacted lines the step closer together will adjust them
-//
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-
-    validcount++;
-    numspechit = 0;
-
-    if (tmflags & MF_NOCLIP)
-        return true;
-
-//
-// check things first, possibly picking things up
-// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
-// into mapblocks based on their origin point, and can overlap into adjacent
-// blocks by up to MAXRADIUS units
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
-                return false;
-//
-// check lines
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockLinesIterator(bx, by, PIT_CheckLine))
-                return false;
-
-    return true;
-}
-
-//=============================================================================
-//
-// P_CheckOnmobj(mobj_t *thing)
-//
-//              Checks if the new Z position is legal
-//=============================================================================
-
-mobj_t *P_CheckOnmobj(mobj_t * thing)
-{
-    int xl, xh, yl, yh, bx, by;
-    subsector_t *newsubsec;
-    fixed_t x;
-    fixed_t y;
-    mobj_t oldmo;
-
-    x = thing->x;
-    y = thing->y;
-    tmthing = thing;
-    tmflags = thing->flags;
-    oldmo = *thing;             // save the old mobj before the fake zmovement
-    P_FakeZMovement(tmthing);
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector(x, y);
-    ceilingline = NULL;
-
-//
-// the base floor / ceiling is from the subsector that contains the
-// point.  Any contacted lines the step closer together will adjust them
-//
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-
-    validcount++;
-    numspechit = 0;
-
-    if (tmflags & MF_NOCLIP)
-        return NULL;
-
-//
-// check things first, possibly picking things up
-// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
-// into mapblocks based on their origin point, and can overlap into adjacent
-// blocks by up to MAXRADIUS units
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockThingsIterator(bx, by, PIT_CheckOnmobjZ))
-            {
-                *tmthing = oldmo;
-                return onmobj;
-            }
-    *tmthing = oldmo;
-    return NULL;
-}
-
-//=============================================================================
-//
-// P_FakeZMovement
-//
-//              Fake the zmovement so that we can check if a move is legal
-//=============================================================================
-
-void P_FakeZMovement(mobj_t * mo)
-{
-    int dist;
-    int delta;
-//
-// adjust height
-//
-    mo->z += mo->momz;
-    if (mo->flags & MF_FLOAT && mo->target)
-    {                           // float down towards target if too close
-        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
-        {
-            dist =
-                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
-            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
-            if (delta < 0 && dist < -(delta * 3))
-                mo->z -= FLOATSPEED;
-            else if (delta > 0 && dist < (delta * 3))
-                mo->z += FLOATSPEED;
-        }
-    }
-    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
-        && leveltime & 2)
-    {
-        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
-    }
-
-//
-// clip movement
-//
-    if (mo->z <= mo->floorz)
-    {                           // Hit the floor
-        mo->z = mo->floorz;
-        if (mo->momz < 0)
-        {
-            mo->momz = 0;
-        }
-        if (mo->flags & MF_SKULLFLY)
-        {                       // The skull slammed into something
-            mo->momz = -mo->momz;
-        }
-        if (mo->info->crashstate && (mo->flags & MF_CORPSE))
-        {
-            return;
-        }
-    }
-    else if (mo->flags2 & MF2_LOGRAV)
-    {
-        if (mo->momz == 0)
-            mo->momz = -(GRAVITY >> 3) * 2;
-        else
-            mo->momz -= GRAVITY >> 3;
-    }
-    else if (!(mo->flags & MF_NOGRAVITY))
-    {
-        if (mo->momz == 0)
-            mo->momz = -GRAVITY * 2;
-        else
-            mo->momz -= GRAVITY;
-    }
-
-    if (mo->z + mo->height > mo->ceilingz)
-    {                           // hit the ceiling
-        if (mo->momz > 0)
-            mo->momz = 0;
-        mo->z = mo->ceilingz - mo->height;
-        if (mo->flags & MF_SKULLFLY)
-        {                       // the skull slammed into something
-            mo->momz = -mo->momz;
-        }
-    }
-}
-
-//==========================================================================
-//
-// CheckMissileImpact
-//
-//==========================================================================
-
-void CheckMissileImpact(mobj_t * mobj)
-{
-    int i;
-
-    if (!numspechit || !(mobj->flags & MF_MISSILE) || !mobj->target)
-    {
-        return;
-    }
-    if (!mobj->target->player)
-    {
-        return;
-    }
-    for (i = numspechit - 1; i >= 0; i--)
-    {
-        P_ShootSpecialLine(mobj->target, spechit[i]);
-    }
-}
-
-/*
-===================
-=
-= P_TryMove
-=
-= Attempt to move to a new position, crossing special lines unless MF_TELEPORT
-= is set
-=
-===================
-*/
-
-boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y)
-{
-    fixed_t oldx, oldy;
-    int side, oldside;
-    line_t *ld;
-
-    floatok = false;
-    if (!P_CheckPosition(thing, x, y))
-    {                           // Solid wall or thing
-        CheckMissileImpact(thing);
-        return false;
-    }
-    if (!(thing->flags & MF_NOCLIP))
-    {
-        if (tmceilingz - tmfloorz < thing->height)
-        {                       // Doesn't fit
-            CheckMissileImpact(thing);
-            return false;
-        }
-        floatok = true;
-        if (!(thing->flags & MF_TELEPORT)
-            && tmceilingz - thing->z < thing->height
-            && !(thing->flags2 & MF2_FLY))
-        {                       // mobj must lower itself to fit
-            CheckMissileImpact(thing);
-            return false;
-        }
-        if (thing->flags2 & MF2_FLY)
-        {
-            if (thing->z + thing->height > tmceilingz)
-            {
-                thing->momz = -8 * FRACUNIT;
-                return false;
-            }
-            else if (thing->z < tmfloorz
-                     && tmfloorz - tmdropoffz > 24 * FRACUNIT)
-            {
-                thing->momz = 8 * FRACUNIT;
-                return false;
-            }
-        }
-        if (!(thing->flags & MF_TELEPORT)
-            // The Minotaur floor fire (MT_MNTRFX2) can step up any amount
-            && thing->type != MT_MNTRFX2
-            && tmfloorz - thing->z > 24 * FRACUNIT)
-        {                       // Too big a step up
-            CheckMissileImpact(thing);
-            return false;
-        }
-        if ((thing->flags & MF_MISSILE) && tmfloorz > thing->z)
-        {
-            CheckMissileImpact(thing);
-        }
-        if (!(thing->flags & (MF_DROPOFF | MF_FLOAT))
-            && tmfloorz - tmdropoffz > 24 * FRACUNIT)
-        {                       // Can't move over a dropoff
-            return false;
-        }
-    }
-
-//
-// the move is ok, so link the thing into its new position
-//
-    P_UnsetThingPosition(thing);
-
-    oldx = thing->x;
-    oldy = thing->y;
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition(thing);
-
-    if (thing->flags2 & MF2_FOOTCLIP
-        && P_GetThingFloorType(thing) != FLOOR_SOLID)
-    {
-        thing->flags2 |= MF2_FEETARECLIPPED;
-    }
-    else if (thing->flags2 & MF2_FEETARECLIPPED)
-    {
-        thing->flags2 &= ~MF2_FEETARECLIPPED;
-    }
-
-//
-// if any special lines were hit, do the effect
-//
-    if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
-        while (numspechit--)
-        {
-            // see if the line was crossed
-            ld = spechit[numspechit];
-            side = P_PointOnLineSide(thing->x, thing->y, ld);
-            oldside = P_PointOnLineSide(oldx, oldy, ld);
-            if (side != oldside)
-            {
-                if (ld->special)
-                    P_CrossSpecialLine(ld - lines, oldside, thing);
-            }
-        }
-
-    return true;
-}
-
-/*
-==================
-=
-= P_ThingHeightClip
-=
-= Takes a valid thing and adjusts the thing->floorz, thing->ceilingz,
-= anf possibly thing->z
-=
-= This is called for all nearby monsters whenever a sector changes height
-=
-= If the thing doesn't fit, the z will be set to the lowest value and
-= false will be returned
-==================
-*/
-
-boolean P_ThingHeightClip(mobj_t * thing)
-{
-    boolean onfloor;
-
-    onfloor = (thing->z == thing->floorz);
-
-    P_CheckPosition(thing, thing->x, thing->y);
-    // what about stranding a monster partially off an edge?
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-
-    if (onfloor)
-        // walking monsters rise and fall with the floor
-        thing->z = thing->floorz;
-    else
-    {                           // don't adjust a floating monster unless forced to
-        if (thing->z + thing->height > thing->ceilingz)
-            thing->z = thing->ceilingz - thing->height;
-    }
-
-    if (thing->ceilingz - thing->floorz < thing->height)
-        return false;
-
-    return true;
-}
-
-
-/*
-==============================================================================
-
-							SLIDE MOVE
-
-Allows the player to slide along any angled walls
-
-==============================================================================
-*/
-
-fixed_t bestslidefrac, secondslidefrac;
-line_t *bestslideline, *secondslideline;
-mobj_t *slidemo;
-
-fixed_t tmxmove, tmymove;
-
-/*
-==================
-=
-= P_HitSlideLine
-=
-= Adjusts the xmove / ymove so that the next move will slide along the wall
-==================
-*/
-
-void P_HitSlideLine(line_t * ld)
-{
-    int side;
-    angle_t lineangle, moveangle, deltaangle;
-    fixed_t movelen, newlen;
-
-
-    if (ld->slopetype == ST_HORIZONTAL)
-    {
-        tmymove = 0;
-        return;
-    }
-    if (ld->slopetype == ST_VERTICAL)
-    {
-        tmxmove = 0;
-        return;
-    }
-
-    side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
-
-    lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
-    if (side == 1)
-        lineangle += ANG180;
-    moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
-    deltaangle = moveangle - lineangle;
-    if (deltaangle > ANG180)
-        deltaangle += ANG180;
-//              I_Error ("SlideLine: ang>ANG180");
-
-    lineangle >>= ANGLETOFINESHIFT;
-    deltaangle >>= ANGLETOFINESHIFT;
-
-    movelen = P_AproxDistance(tmxmove, tmymove);
-    newlen = FixedMul(movelen, finecosine[deltaangle]);
-    tmxmove = FixedMul(newlen, finecosine[lineangle]);
-    tmymove = FixedMul(newlen, finesine[lineangle]);
-}
-
-/*
-==============
-=
-= PTR_SlideTraverse
-=
-==============
-*/
-
-boolean PTR_SlideTraverse(intercept_t * in)
-{
-    line_t *li;
-
-    if (!in->isaline)
-        I_Error("PTR_SlideTraverse: not a line?");
-
-    li = in->d.line;
-    if (!(li->flags & ML_TWOSIDED))
-    {
-        if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
-            return true;        // don't hit the back side
-        goto isblocking;
-    }
-
-    P_LineOpening(li);          // set openrange, opentop, openbottom
-    if (openrange < slidemo->height)
-        goto isblocking;        // doesn't fit
-
-    if (opentop - slidemo->z < slidemo->height)
-        goto isblocking;        // mobj is too high
-
-    if (openbottom - slidemo->z > 24 * FRACUNIT)
-        goto isblocking;        // too big a step up
-
-    return true;                // this line doesn't block movement
-
-// the line does block movement, see if it is closer than best so far
-  isblocking:
-    if (in->frac < bestslidefrac)
-    {
-        secondslidefrac = bestslidefrac;
-        secondslideline = bestslideline;
-        bestslidefrac = in->frac;
-        bestslideline = li;
-    }
-
-    return false;               // stop
-}
-
-
-/*
-==================
-=
-= P_SlideMove
-=
-= The momx / momy move is bad, so try to slide along a wall
-=
-= Find the first line hit, move flush to it, and slide along it
-=
-= This is a kludgy mess.
-==================
-*/
-
-void P_SlideMove(mobj_t * mo)
-{
-    fixed_t leadx, leady;
-    fixed_t trailx, traily;
-    fixed_t newx, newy;
-    int hitcount;
-
-    slidemo = mo;
-    hitcount = 0;
-  retry:
-    if (++hitcount == 3)
-        goto stairstep;         // don't loop forever
-
-//
-// trace along the three leading corners
-//
-    if (mo->momx > 0)
-    {
-        leadx = mo->x + mo->radius;
-        trailx = mo->x - mo->radius;
-    }
-    else
-    {
-        leadx = mo->x - mo->radius;
-        trailx = mo->x + mo->radius;
-    }
-
-    if (mo->momy > 0)
-    {
-        leady = mo->y + mo->radius;
-        traily = mo->y - mo->radius;
-    }
-    else
-    {
-        leady = mo->y - mo->radius;
-        traily = mo->y + mo->radius;
-    }
-
-    bestslidefrac = FRACUNIT + 1;
-
-    P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
-                   PT_ADDLINES, PTR_SlideTraverse);
-    P_PathTraverse(trailx, leady, trailx + mo->momx, leady + mo->momy,
-                   PT_ADDLINES, PTR_SlideTraverse);
-    P_PathTraverse(leadx, traily, leadx + mo->momx, traily + mo->momy,
-                   PT_ADDLINES, PTR_SlideTraverse);
-
-//
-// move up to the wall
-//
-    if (bestslidefrac == FRACUNIT + 1)
-    {                           // the move most have hit the middle, so stairstep
-      stairstep:
-        if (!P_TryMove(mo, mo->x, mo->y + mo->momy))
-            P_TryMove(mo, mo->x + mo->momx, mo->y);
-        return;
-    }
-
-    bestslidefrac -= 0x800;     // fudge a bit to make sure it doesn't hit
-    if (bestslidefrac > 0)
-    {
-        newx = FixedMul(mo->momx, bestslidefrac);
-        newy = FixedMul(mo->momy, bestslidefrac);
-        if (!P_TryMove(mo, mo->x + newx, mo->y + newy))
-            goto stairstep;
-    }
-
-//
-// now continue along the wall
-//
-    bestslidefrac = FRACUNIT - (bestslidefrac + 0x800); // remainder
-    if (bestslidefrac > FRACUNIT)
-        bestslidefrac = FRACUNIT;
-    if (bestslidefrac <= 0)
-        return;
-
-    tmxmove = FixedMul(mo->momx, bestslidefrac);
-    tmymove = FixedMul(mo->momy, bestslidefrac);
-
-    P_HitSlideLine(bestslideline);      // clip the moves
-
-    mo->momx = tmxmove;
-    mo->momy = tmymove;
-
-    if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove))
-    {
-        goto retry;
-    }
-}
-
-
-
-/*
-==============================================================================
-
-							P_LineAttack
-
-==============================================================================
-*/
-
-
-mobj_t *linetarget;             // who got hit (or NULL)
-mobj_t *shootthing;
-fixed_t shootz;                 // height if not aiming up or down
-                                                                        // ???: use slope for monsters?
-int la_damage;
-fixed_t attackrange;
-
-fixed_t aimslope;
-
-
-/*
-===============================================================================
-=
-= PTR_AimTraverse
-=
-= Sets linetaget and aimslope when a target is aimed at
-===============================================================================
-*/
-
-boolean PTR_AimTraverse(intercept_t * in)
-{
-    line_t *li;
-    mobj_t *th;
-    fixed_t slope, thingtopslope, thingbottomslope;
-    fixed_t dist;
-
-    if (in->isaline)
-    {
-        li = in->d.line;
-        if (!(li->flags & ML_TWOSIDED))
-            return false;       // stop
-//
-// crosses a two sided line
-// a two sided line will restrict the possible target ranges
-        P_LineOpening(li);
-
-        if (openbottom >= opentop)
-            return false;       // stop
-
-        dist = FixedMul(attackrange, in->frac);
-
-        // Added checks if there is no backsector to prevent crashing.
-        // Crashes didn't happen in the DOS version of Heretic
-        // because reading NULL pointer produces unpredictable but
-        // deterministic values instead of crashing.
-        // See https://github.com/chocolate-doom/chocolate-doom/issues/1665
-        if (li->backsector == NULL
-            || li->frontsector->floorheight != li->backsector->floorheight)
-        {
-            slope = FixedDiv(openbottom - shootz, dist);
-            if (slope > bottomslope)
-                bottomslope = slope;
-        }
-
-        if (li->backsector == NULL
-            || li->frontsector->ceilingheight != li->backsector->ceilingheight)
-        {
-            slope = FixedDiv(opentop - shootz, dist);
-            if (slope < topslope)
-                topslope = slope;
-        }
-
-        if (topslope <= bottomslope)
-            return false;       // stop
-
-        return true;            // shot continues
-    }
-
-//
-// shoot a thing
-//
-    th = in->d.thing;
-    if (th == shootthing)
-        return true;            // can't shoot self
-    if (!(th->flags & MF_SHOOTABLE))
-        return true;            // corpse or something
-    if (th->type == MT_POD)
-    {                           // Can't auto-aim at pods
-        return (true);
-    }
-
-// check angles to see if the thing can be aimed at
-
-    dist = FixedMul(attackrange, in->frac);
-    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
-    if (thingtopslope < bottomslope)
-        return true;            // shot over the thing
-    thingbottomslope = FixedDiv(th->z - shootz, dist);
-    if (thingbottomslope > topslope)
-        return true;            // shot under the thing
-
-//
-// this thing can be hit!
-//
-    if (thingtopslope > topslope)
-        thingtopslope = topslope;
-    if (thingbottomslope < bottomslope)
-        thingbottomslope = bottomslope;
-
-    aimslope = (thingtopslope + thingbottomslope) / 2;
-    linetarget = th;
-
-    return false;               // don't go any farther
-}
-
-
-/*
-==============================================================================
-=
-= PTR_ShootTraverse
-=
-==============================================================================
-*/
-
-boolean PTR_ShootTraverse(intercept_t * in)
-{
-    fixed_t x, y, z;
-    fixed_t frac;
-    line_t *li;
-    mobj_t *th;
-    fixed_t slope;
-    fixed_t dist;
-    fixed_t thingtopslope, thingbottomslope;
-    mobj_t *mo;
-
-    if (in->isaline)
-    {
-        li = in->d.line;
-        if (li->special)
-            P_ShootSpecialLine(shootthing, li);
-        if (!(li->flags & ML_TWOSIDED))
-            goto hitline;
-
-//
-// crosses a two sided line
-//
-        P_LineOpening(li);
-
-        dist = FixedMul(attackrange, in->frac);
-
-        if (li->frontsector->floorheight != li->backsector->floorheight)
-        {
-            slope = FixedDiv(openbottom - shootz, dist);
-            if (slope > aimslope)
-                goto hitline;
-        }
-
-        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-        {
-            slope = FixedDiv(opentop - shootz, dist);
-            if (slope < aimslope)
-                goto hitline;
-        }
-
-        return true;            // shot continues
-//
-// hit line
-//
-      hitline:
-        // position a bit closer
-        frac = in->frac - FixedDiv(4 * FRACUNIT, attackrange);
-        x = trace.x + FixedMul(trace.dx, frac);
-        y = trace.y + FixedMul(trace.dy, frac);
-        z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
-
-        if (li->frontsector->ceilingpic == skyflatnum)
-        {
-            if (z > li->frontsector->ceilingheight)
-                return false;   // don't shoot the sky!
-            if (li->backsector && li->backsector->ceilingpic == skyflatnum)
-                return false;   // it's a sky hack wall
-        }
-
-        P_SpawnPuff(x, y, z);
-        return false;           // don't go any farther
-    }
-
-//
-// shoot a thing
-//
-    th = in->d.thing;
-    if (th == shootthing)
-        return true;            // can't shoot self
-    if (!(th->flags & MF_SHOOTABLE))
-        return true;            // corpse or something
-
-//
-// check for physical attacks on a ghost
-//
-    if (th->flags & MF_SHADOW && shootthing->player->readyweapon == wp_staff)
-    {
-        return (true);
-    }
-
-// check angles to see if the thing can be aimed at
-    dist = FixedMul(attackrange, in->frac);
-    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
-    if (thingtopslope < aimslope)
-        return true;            // shot over the thing
-    thingbottomslope = FixedDiv(th->z - shootz, dist);
-    if (thingbottomslope > aimslope)
-        return true;            // shot under the thing
-
-//
-// hit thing
-//
-    // position a bit closer
-    frac = in->frac - FixedDiv(10 * FRACUNIT, attackrange);
-    x = trace.x + FixedMul(trace.dx, frac);
-    y = trace.y + FixedMul(trace.dy, frac);
-    z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
-    if (PuffType == MT_BLASTERPUFF1)
-    {                           // Make blaster big puff
-        mo = P_SpawnMobj(x, y, z, MT_BLASTERPUFF2);
-        S_StartSound(mo, sfx_blshit);
-    }
-    else
-    {
-        P_SpawnPuff(x, y, z);
-    }
-    if (la_damage)
-    {
-        if (!(in->d.thing->flags & MF_NOBLOOD) && P_Random() < 192)
-        {
-            P_BloodSplatter(x, y, z, in->d.thing);
-        }
-        P_DamageMobj(th, shootthing, shootthing, la_damage);
-    }
-    return (false);             // don't go any farther
-}
-
-/*
-=================
-=
-= P_AimLineAttack
-=
-=================
-*/
-
-fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance)
-{
-    fixed_t x2, y2;
-
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
-    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
-    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
-    topslope = 100 * FRACUNIT / 160;    // can't shoot outside view angles
-    bottomslope = -100 * FRACUNIT / 160;
-    attackrange = distance;
-    linetarget = NULL;
-
-    P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
-                   PTR_AimTraverse);
-
-    if (linetarget)
-        return aimslope;
-    return 0;
-}
-
-
-
-/*
-=================
-=
-= P_LineAttack
-=
-= if damage == 0, it is just a test trace that will leave linetarget set
-=
-=================
-*/
-
-void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
-                  int damage)
-{
-    fixed_t x2, y2;
-
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    la_damage = damage;
-    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
-    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
-    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
-    if (t1->flags2 & MF2_FEETARECLIPPED)
-    {
-        shootz -= FOOTCLIPSIZE;
-    }
-    attackrange = distance;
-    aimslope = slope;
-
-    P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
-                   PTR_ShootTraverse);
-}
-
-
-
-/*
-==============================================================================
-
-							USE LINES
-
-==============================================================================
-*/
-
-mobj_t *usething;
-
-boolean PTR_UseTraverse(intercept_t * in)
-{
-    if (!in->d.line->special)
-    {
-        P_LineOpening(in->d.line);
-        if (openrange <= 0)
-        {
-            //S_StartSound (usething, sfx_noway);
-            return false;       // can't use through a wall
-        }
-        return true;            // not a special line, but keep checking
-    }
-
-    if (P_PointOnLineSide(usething->x, usething->y, in->d.line) == 1)
-        return false;           // don't use back sides
-
-    P_UseSpecialLine(usething, in->d.line);
-
-    return false;               // can't use for than one special line in a row
-}
-
-
-/*
-================
-=
-= P_UseLines
-=
-= Looks for special lines in front of the player to activate
-================ 
-*/
-
-void P_UseLines(player_t * player)
-{
-    int angle;
-    fixed_t x1, y1, x2, y2;
-
-    usething = player->mo;
-
-    angle = player->mo->angle >> ANGLETOFINESHIFT;
-    x1 = player->mo->x;
-    y1 = player->mo->y;
-    x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
-    y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
-
-    P_PathTraverse(x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse);
-}
-
-
-
-/*
-==============================================================================
-
-							RADIUS ATTACK
-
-==============================================================================
-*/
-
-mobj_t *bombsource;
-mobj_t *bombspot;
-int bombdamage;
-
-/*
-=================
-=
-= PIT_RadiusAttack
-=
-= Source is the creature that casued the explosion at spot
-=================
-*/
-
-boolean PIT_RadiusAttack(mobj_t * thing)
-{
-    fixed_t dx, dy, dist;
-
-    if (!(thing->flags & MF_SHOOTABLE))
-    {
-        return true;
-    }
-    if (thing->type == MT_MINOTAUR || thing->type == MT_SORCERER1
-        || thing->type == MT_SORCERER2)
-    {                           // Episode 2 and 3 bosses take no damage from PIT_RadiusAttack
-        return (true);
-    }
-    dx = abs(thing->x - bombspot->x);
-    dy = abs(thing->y - bombspot->y);
-    dist = dx > dy ? dx : dy;
-    dist = (dist - thing->radius) >> FRACBITS;
-    if (dist < 0)
-    {
-        dist = 0;
-    }
-    if (dist >= bombdamage)
-    {                           // Out of range
-        return true;
-    }
-    if (P_CheckSight(thing, bombspot))
-    {                           // OK to damage, target is in direct path
-        P_DamageMobj(thing, bombspot, bombsource, bombdamage - dist);
-    }
-    return (true);
-}
-
-/*
-=================
-=
-= P_RadiusAttack
-=
-= Source is the creature that casued the explosion at spot
-=================
-*/
-
-void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage)
-{
-    int x, y, xl, xh, yl, yh;
-    fixed_t dist;
-
-    dist = (damage + MAXRADIUS) << FRACBITS;
-    yh = (spot->y + dist - bmaporgy) >> MAPBLOCKSHIFT;
-    yl = (spot->y - dist - bmaporgy) >> MAPBLOCKSHIFT;
-    xh = (spot->x + dist - bmaporgx) >> MAPBLOCKSHIFT;
-    xl = (spot->x - dist - bmaporgx) >> MAPBLOCKSHIFT;
-    bombspot = spot;
-    if (spot->type == MT_POD && spot->target)
-    {
-        bombsource = spot->target;
-    }
-    else
-    {
-        bombsource = source;
-    }
-    bombdamage = damage;
-    for (y = yl; y <= yh; y++)
-        for (x = xl; x <= xh; x++)
-            P_BlockThingsIterator(x, y, PIT_RadiusAttack);
-}
-
-
-/*
-==============================================================================
-
-						SECTOR HEIGHT CHANGING
-
-= After modifying a sectors floor or ceiling height, call this
-= routine to adjust the positions of all things that touch the
-= sector.
-=
-= If anything doesn't fit anymore, true will be returned.
-= If crunch is true, they will take damage as they are being crushed
-= If Crunch is false, you should set the sector height back the way it
-= was and call P_ChangeSector again to undo the changes
-==============================================================================
-*/
-
-boolean crushchange;
-boolean nofit;
-
-/*
-===============
-=
-= PIT_ChangeSector
-=
-===============
-*/
-
-boolean PIT_ChangeSector(mobj_t * thing)
-{
-    mobj_t *mo;
-
-    if (P_ThingHeightClip(thing))
-        return true;            // keep checking
-
-    // crunch bodies to giblets
-    if (thing->health <= 0)
-    {
-        //P_SetMobjState (thing, S_GIBS);
-        thing->height = 0;
-        thing->radius = 0;
-        return true;            // keep checking
-    }
-
-    // crunch dropped items
-    if (thing->flags & MF_DROPPED)
-    {
-        P_RemoveMobj(thing);
-        return true;            // keep checking
-    }
-
-    if (!(thing->flags & MF_SHOOTABLE))
-        return true;            // assume it is bloody gibs or something
-
-    nofit = true;
-    if (crushchange && !(leveltime & 3))
-    {
-        P_DamageMobj(thing, NULL, NULL, 10);
-        // spray blood in a random direction
-        mo = P_SpawnMobj(thing->x, thing->y, thing->z + thing->height / 2,
-                         MT_BLOOD);
-        mo->momx = P_SubRandom() << 12;
-        mo->momy = P_SubRandom() << 12;
-    }
-
-    return true;                // keep checking (crush other things)   
-}
-
-/*
-===============
-=
-= P_ChangeSector
-=
-===============
-*/
-
-boolean P_ChangeSector(sector_t * sector, boolean crunch)
-{
-    int x, y;
-
-    nofit = false;
-    crushchange = crunch;
-
-// recheck heights for all things near the moving sector
-
-    for (x = sector->blockbox[BOXLEFT]; x <= sector->blockbox[BOXRIGHT]; x++)
-        for (y = sector->blockbox[BOXBOTTOM]; y <= sector->blockbox[BOXTOP];
-             y++)
-            P_BlockThingsIterator(x, y, PIT_ChangeSector);
-
-
-    return nofit;
-}
diff --git a/games/NXDoom/src/heretic/p_maputl.c b/games/NXDoom/src/heretic/p_maputl.c
deleted file mode 100644
index 5150aaeef..000000000
--- a/games/NXDoom/src/heretic/p_maputl.c
+++ /dev/null
@@ -1,779 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_maputl.c
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "m_bbox.h"
-#include "m_misc.h"
-#include "p_local.h"
-
-
-/*
-===================
-=
-= P_AproxDistance
-=
-= Gives an estimation of distance (not exact)
-=
-===================
-*/
-
-fixed_t P_AproxDistance(fixed_t dx, fixed_t dy)
-{
-    dx = abs(dx);
-    dy = abs(dy);
-    if (dx < dy)
-        return dx + dy - (dx >> 1);
-    return dx + dy - (dy >> 1);
-}
-
-
-/*
-==================
-=
-= P_PointOnLineSide
-=
-= Returns 0 or 1
-==================
-*/
-
-int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line)
-{
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    if (!line->dx)
-    {
-        if (x <= line->v1->x)
-            return line->dy > 0;
-        return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-        if (y <= line->v1->y)
-            return line->dx < 0;
-        return line->dx > 0;
-    }
-
-    dx = (x - line->v1->x);
-    dy = (y - line->v1->y);
-
-    left = FixedMul(line->dy >> FRACBITS, dx);
-    right = FixedMul(dy, line->dx >> FRACBITS);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-/*
-=================
-=
-= P_BoxOnLineSide
-=
-= Considers the line to be infinite
-= Returns side 0 or 1, -1 if box crosses the line
-=================
-*/
-
-int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld)
-{
-    int p1 = 0, p2 = 0;
-
-    switch (ld->slopetype)
-    {
-        case ST_HORIZONTAL:
-            p1 = tmbox[BOXTOP] > ld->v1->y;
-            p2 = tmbox[BOXBOTTOM] > ld->v1->y;
-            if (ld->dx < 0)
-            {
-                p1 ^= 1;
-                p2 ^= 1;
-            }
-            break;
-        case ST_VERTICAL:
-            p1 = tmbox[BOXRIGHT] < ld->v1->x;
-            p2 = tmbox[BOXLEFT] < ld->v1->x;
-            if (ld->dy < 0)
-            {
-                p1 ^= 1;
-                p2 ^= 1;
-            }
-            break;
-        case ST_POSITIVE:
-            p1 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXTOP], ld);
-            p2 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
-            break;
-        case ST_NEGATIVE:
-            p1 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
-            p2 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
-            break;
-    }
-
-    if (p1 == p2)
-        return p1;
-    return -1;
-}
-
-/*
-==================
-=
-= P_PointOnDivlineSide
-=
-= Returns 0 or 1
-==================
-*/
-
-int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line)
-{
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    if (!line->dx)
-    {
-        if (x <= line->x)
-            return line->dy > 0;
-        return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-        if (y <= line->y)
-            return line->dx < 0;
-        return line->dx > 0;
-    }
-
-    dx = (x - line->x);
-    dy = (y - line->y);
-
-// try to quickly decide by looking at sign bits
-    if ((line->dy ^ line->dx ^ dx ^ dy) & 0x80000000)
-    {
-        if ((line->dy ^ dx) & 0x80000000)
-            return 1;           // (left is negative)
-        return 0;
-    }
-
-    left = FixedMul(line->dy >> 8, dx >> 8);
-    right = FixedMul(dy >> 8, line->dx >> 8);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-
-/*
-==============
-=
-= P_MakeDivline
-=
-==============
-*/
-
-void P_MakeDivline(line_t * li, divline_t * dl)
-{
-    dl->x = li->v1->x;
-    dl->y = li->v1->y;
-    dl->dx = li->dx;
-    dl->dy = li->dy;
-}
-
-
-/*
-===============
-=
-= P_InterceptVector
-=
-= Returns the fractional intercept point along the first divline
-=
-= This is only called by the addthings and addlines traversers
-===============
-*/
-
-fixed_t P_InterceptVector(divline_t * v2, divline_t * v1)
-{
-#if 1
-    fixed_t frac, num, den;
-
-    den = FixedMul(v1->dy >> 8, v2->dx) - FixedMul(v1->dx >> 8, v2->dy);
-    if (den == 0)
-        return 0;
-//              I_Error ("P_InterceptVector: parallel");
-    num = FixedMul((v1->x - v2->x) >> 8, v1->dy) +
-        FixedMul((v2->y - v1->y) >> 8, v1->dx);
-    frac = FixedDiv(num, den);
-
-    return frac;
-#else
-    float frac, num, den, v1x, v1y, v1dx, v1dy, v2x, v2y, v2dx, v2dy;
-
-    v1x = (float) v1->x / FRACUNIT;
-    v1y = (float) v1->y / FRACUNIT;
-    v1dx = (float) v1->dx / FRACUNIT;
-    v1dy = (float) v1->dy / FRACUNIT;
-    v2x = (float) v2->x / FRACUNIT;
-    v2y = (float) v2->y / FRACUNIT;
-    v2dx = (float) v2->dx / FRACUNIT;
-    v2dy = (float) v2->dy / FRACUNIT;
-
-    den = v1dy * v2dx - v1dx * v2dy;
-    if (den == 0)
-        return 0;               // parallel
-    num = (v1x - v2x) * v1dy + (v2y - v1y) * v1dx;
-    frac = num / den;
-
-    return frac * FRACUNIT;
-#endif
-}
-
-/*
-==================
-=
-= P_LineOpening
-=
-= Sets opentop and openbottom to the window through a two sided line
-= OPTIMIZE: keep this precalculated
-==================
-*/
-
-fixed_t opentop, openbottom, openrange;
-fixed_t lowfloor;
-
-void P_LineOpening(line_t * linedef)
-{
-    sector_t *front, *back;
-
-    if (linedef->sidenum[1] == -1)
-    {                           // single sided line
-        openrange = 0;
-        return;
-    }
-
-    front = linedef->frontsector;
-    back = linedef->backsector;
-
-    if (front->ceilingheight < back->ceilingheight)
-        opentop = front->ceilingheight;
-    else
-        opentop = back->ceilingheight;
-    if (front->floorheight > back->floorheight)
-    {
-        openbottom = front->floorheight;
-        lowfloor = back->floorheight;
-    }
-    else
-    {
-        openbottom = back->floorheight;
-        lowfloor = front->floorheight;
-    }
-
-    openrange = opentop - openbottom;
-}
-
-/*
-===============================================================================
-
-						THING POSITION SETTING
-
-===============================================================================
-*/
-
-/*
-===================
-=
-= P_UnsetThingPosition 
-=
-= Unlinks a thing from block map and sectors
-=
-===================
-*/
-
-void P_UnsetThingPosition(mobj_t * thing)
-{
-    int blockx, blocky;
-
-    if (!(thing->flags & MF_NOSECTOR))
-    {                           // inert things don't need to be in blockmap
-// unlink from subsector
-        if (thing->snext)
-            thing->snext->sprev = thing->sprev;
-        if (thing->sprev)
-            thing->sprev->snext = thing->snext;
-        else
-            thing->subsector->sector->thinglist = thing->snext;
-    }
-
-    if (!(thing->flags & MF_NOBLOCKMAP))
-    {                           // inert things don't need to be in blockmap
-// unlink from block map
-        if (thing->bnext)
-            thing->bnext->bprev = thing->bprev;
-        if (thing->bprev)
-            thing->bprev->bnext = thing->bnext;
-        else
-        {
-            blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
-            blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
-            if (blockx >= 0 && blockx < bmapwidth
-                && blocky >= 0 && blocky < bmapheight)
-                blocklinks[blocky * bmapwidth + blockx] = thing->bnext;
-        }
-    }
-}
-
-
-/*
-===================
-=
-= P_SetThingPosition 
-=
-= Links a thing into both a block and a subsector based on it's x y
-= Sets thing->subsector properly
-=
-===================
-*/
-
-void P_SetThingPosition(mobj_t * thing)
-{
-    subsector_t *ss;
-    sector_t *sec;
-    int blockx, blocky;
-    mobj_t **link;
-
-//
-// link into subsector
-//
-    ss = R_PointInSubsector(thing->x, thing->y);
-    thing->subsector = ss;
-    if (!(thing->flags & MF_NOSECTOR))
-    {                           // invisible things don't go into the sector links
-        sec = ss->sector;
-
-        thing->sprev = NULL;
-        thing->snext = sec->thinglist;
-        if (sec->thinglist)
-            sec->thinglist->sprev = thing;
-        sec->thinglist = thing;
-    }
-
-//
-// link into blockmap
-//
-    if (!(thing->flags & MF_NOBLOCKMAP))
-    {                           // inert things don't need to be in blockmap            
-        blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
-        blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
-        if (blockx >= 0 && blockx < bmapwidth && blocky >= 0
-            && blocky < bmapheight)
-        {
-            link = &blocklinks[blocky * bmapwidth + blockx];
-            thing->bprev = NULL;
-            thing->bnext = *link;
-            if (*link)
-                (*link)->bprev = thing;
-            *link = thing;
-        }
-        else
-        {                       // thing is off the map
-            thing->bnext = thing->bprev = NULL;
-        }
-    }
-}
-
-
-
-/*
-===============================================================================
-
-						BLOCK MAP ITERATORS
-
-For each line/thing in the given mapblock, call the passed function.
-If the function returns false, exit with false without checking anything else.
-
-===============================================================================
-*/
-
-/*
-==================
-=
-= P_BlockLinesIterator
-=
-= The validcount flags are used to avoid checking lines
-= that are marked in multiple mapblocks, so increment validcount before
-= the first call to P_BlockLinesIterator, then make one or more calls to it
-===================
-*/
-
-boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *))
-{
-    int offset;
-    short *list;
-    line_t *ld;
-
-    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
-        return true;
-    offset = y * bmapwidth + x;
-
-    offset = *(blockmap + offset);
-
-    for (list = blockmaplump + offset; *list != -1; list++)
-    {
-        ld = &lines[*list];
-        if (ld->validcount == validcount)
-            continue;           // line has already been checked
-        ld->validcount = validcount;
-
-        if (!func(ld))
-            return false;
-    }
-
-    return true;                // everything was checked
-}
-
-
-/*
-==================
-=
-= P_BlockThingsIterator
-=
-==================
-*/
-
-boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *))
-{
-    mobj_t *mobj;
-
-    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
-        return true;
-
-    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
-
-    for (mobj = blocklinks[y * bmapwidth + x]; mobj; mobj = mobj->bnext)
-        if (!func(mobj))
-            return false;
-
-    return true;
-}
-
-/*
-===============================================================================
-
-					INTERCEPT ROUTINES
-
-===============================================================================
-*/
-
-intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
-
-divline_t trace;
-boolean earlyout;
-int ptflags;
-
-/*
-==================
-=
-= PIT_AddLineIntercepts
-=
-= Looks for lines in the given block that intercept the given trace
-= to add to the intercepts list
-= A line is crossed if its endpoints are on opposite sides of the trace
-= Returns true if earlyout and a solid line hit
-==================
-*/
-
-boolean PIT_AddLineIntercepts(line_t * ld)
-{
-    int s1, s2;
-    fixed_t frac;
-    divline_t dl;
-
-// avoid precision problems with two routines
-    if (trace.dx > FRACUNIT * 16 || trace.dy > FRACUNIT * 16
-        || trace.dx < -FRACUNIT * 16 || trace.dy < -FRACUNIT * 16)
-    {
-        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
-        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
-    }
-    else
-    {
-        s1 = P_PointOnLineSide(trace.x, trace.y, ld);
-        s2 = P_PointOnLineSide(trace.x + trace.dx, trace.y + trace.dy, ld);
-    }
-    if (s1 == s2)
-        return true;            // line isn't crossed
-
-//
-// hit the line
-//
-    P_MakeDivline(ld, &dl);
-    frac = P_InterceptVector(&trace, &dl);
-    if (frac < 0)
-        return true;            // behind source
-
-// try to early out the check
-    if (earlyout && frac < FRACUNIT && !ld->backsector)
-        return false;           // stop checking
-
-    intercept_p->frac = frac;
-    intercept_p->isaline = true;
-    intercept_p->d.line = ld;
-    intercept_p++;
-
-    return true;                // continue
-}
-
-
-
-/*
-==================
-=
-= PIT_AddThingIntercepts
-=
-==================
-*/
-
-boolean PIT_AddThingIntercepts(mobj_t * thing)
-{
-    fixed_t x1, y1, x2, y2;
-    int s1, s2;
-    boolean tracepositive;
-    divline_t dl;
-    fixed_t frac;
-
-    tracepositive = (trace.dx ^ trace.dy) > 0;
-
-    // check a corner to corner crossection for hit
-
-    if (tracepositive)
-    {
-        x1 = thing->x - thing->radius;
-        y1 = thing->y + thing->radius;
-
-        x2 = thing->x + thing->radius;
-        y2 = thing->y - thing->radius;
-    }
-    else
-    {
-        x1 = thing->x - thing->radius;
-        y1 = thing->y - thing->radius;
-
-        x2 = thing->x + thing->radius;
-        y2 = thing->y + thing->radius;
-    }
-    s1 = P_PointOnDivlineSide(x1, y1, &trace);
-    s2 = P_PointOnDivlineSide(x2, y2, &trace);
-    if (s1 == s2)
-        return true;            // line isn't crossed
-
-    dl.x = x1;
-    dl.y = y1;
-    dl.dx = x2 - x1;
-    dl.dy = y2 - y1;
-    frac = P_InterceptVector(&trace, &dl);
-    if (frac < 0)
-        return true;            // behind source
-    intercept_p->frac = frac;
-    intercept_p->isaline = false;
-    intercept_p->d.thing = thing;
-    intercept_p++;
-
-    return true;                // keep going
-}
-
-
-/*
-====================
-=
-= P_TraverseIntercepts
-=
-= Returns true if the traverser function returns true for all lines
-====================
-*/
-
-boolean P_TraverseIntercepts(traverser_t func, fixed_t maxfrac)
-{
-    int count;
-    fixed_t dist;
-    intercept_t *scan, *in;
-
-    count = intercept_p - intercepts;
-    in = 0;                     // shut up compiler warning
-
-    while (count--)
-    {
-        dist = INT_MAX;
-        for (scan = intercepts; scan < intercept_p; scan++)
-            if (scan->frac < dist)
-            {
-                dist = scan->frac;
-                in = scan;
-            }
-
-        if (dist > maxfrac)
-            return true;        // checked everything in range          
-#if 0
-        {                       // don't check these yet, ther may be others inserted
-            in = scan = intercepts;
-            for (scan = intercepts; scan < intercept_p; scan++)
-                if (scan->frac > maxfrac)
-                    *in++ = *scan;
-            intercept_p = in;
-            return false;
-        }
-#endif
-
-        if (!func(in))
-            return false;       // don't bother going farther
-        in->frac = INT_MAX;
-    }
-
-    return true;                // everything was traversed
-}
-
-
-
-/*
-==================
-=
-= P_PathTraverse
-=
-= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
-= Returns true if the traverser function returns true for all lines
-==================
-*/
-
-boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
-                       int flags, boolean(*trav) (intercept_t *))
-{
-    fixed_t xt1, yt1, xt2, yt2;
-    fixed_t xstep, ystep;
-    fixed_t partial;
-    fixed_t xintercept, yintercept;
-    int mapx, mapy, mapxstep, mapystep;
-    int count;
-
-    earlyout = (flags & PT_EARLYOUT) != 0;
-
-    validcount++;
-    intercept_p = intercepts;
-
-    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
-        x1 += FRACUNIT;         // don't side exactly on a line
-    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
-        y1 += FRACUNIT;         // don't side exactly on a line
-    trace.x = x1;
-    trace.y = y1;
-    trace.dx = x2 - x1;
-    trace.dy = y2 - y1;
-
-    x1 -= bmaporgx;
-    y1 -= bmaporgy;
-    xt1 = x1 >> MAPBLOCKSHIFT;
-    yt1 = y1 >> MAPBLOCKSHIFT;
-
-    x2 -= bmaporgx;
-    y2 -= bmaporgy;
-    xt2 = x2 >> MAPBLOCKSHIFT;
-    yt2 = y2 >> MAPBLOCKSHIFT;
-
-    if (xt2 > xt1)
-    {
-        mapxstep = 1;
-        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else if (xt2 < xt1)
-    {
-        mapxstep = -1;
-        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else
-    {
-        mapxstep = 0;
-        partial = FRACUNIT;
-        ystep = 256 * FRACUNIT;
-    }
-    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
-
-
-    if (yt2 > yt1)
-    {
-        mapystep = 1;
-        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else if (yt2 < yt1)
-    {
-        mapystep = -1;
-        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else
-    {
-        mapystep = 0;
-        partial = FRACUNIT;
-        xstep = 256 * FRACUNIT;
-    }
-    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
-
-
-//
-// step through map blocks
-// Count is present to prevent a round off error from skipping the break
-    mapx = xt1;
-    mapy = yt1;
-
-    for (count = 0; count < 64; count++)
-    {
-        if (flags & PT_ADDLINES)
-        {
-            if (!P_BlockLinesIterator(mapx, mapy, PIT_AddLineIntercepts))
-                return false;   // early out
-        }
-        if (flags & PT_ADDTHINGS)
-        {
-            if (!P_BlockThingsIterator(mapx, mapy, PIT_AddThingIntercepts))
-                return false;   // early out
-        }
-
-        if (mapx == xt2 && mapy == yt2)
-            break;
-
-        if ((yintercept >> FRACBITS) == mapy)
-        {
-            yintercept += ystep;
-            mapx += mapxstep;
-        }
-        else if ((xintercept >> FRACBITS) == mapx)
-        {
-            xintercept += xstep;
-            mapy += mapystep;
-        }
-
-    }
-
-
-//
-// go through the sorted list
-//
-    return P_TraverseIntercepts(trav, FRACUNIT);
-}
diff --git a/games/NXDoom/src/heretic/p_mobj.c b/games/NXDoom/src/heretic/p_mobj.c
deleted file mode 100644
index 363dabe4a..000000000
--- a/games/NXDoom/src/heretic/p_mobj.c
+++ /dev/null
@@ -1,1626 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_mobj.c
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "sounds.h"
-#include "s_sound.h"
-
-void G_PlayerReborn(int player);
-void P_SpawnMapThing(mapthing_t * mthing);
-
-mobjtype_t PuffType;
-mobj_t *MissileMobj;
-
-static fixed_t FloatBobOffsets[64] = {
-    0, 51389, 102283, 152192,
-    200636, 247147, 291278, 332604,
-    370727, 405280, 435929, 462380,
-    484378, 501712, 514213, 521763,
-    524287, 521763, 514213, 501712,
-    484378, 462380, 435929, 405280,
-    370727, 332604, 291278, 247147,
-    200636, 152192, 102283, 51389,
-    -1, -51390, -102284, -152193,
-    -200637, -247148, -291279, -332605,
-    -370728, -405281, -435930, -462381,
-    -484380, -501713, -514215, -521764,
-    -524288, -521764, -514214, -501713,
-    -484379, -462381, -435930, -405280,
-    -370728, -332605, -291279, -247148,
-    -200637, -152193, -102284, -51389
-};
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_SetMobjState
-//
-// Returns true if the mobj is still present.
-//
-//----------------------------------------------------------------------------
-
-boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
-{
-    state_t *st;
-
-    if (state == S_NULL)
-    {                           // Remove mobj
-        mobj->state = (state_t *) S_NULL;
-        P_RemoveMobj(mobj);
-        return (false);
-    }
-    st = &states[state];
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-    if (st->action)
-    {                           // Call action function
-        st->action(mobj, NULL, NULL);
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_SetMobjStateNF
-//
-// Same as P_SetMobjState, but does not call the state function.
-//
-//----------------------------------------------------------------------------
-
-boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
-{
-    state_t *st;
-
-    if (state == S_NULL)
-    {                           // Remove mobj
-        mobj->state = (state_t *) S_NULL;
-        P_RemoveMobj(mobj);
-        return (false);
-    }
-    st = &states[state];
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ExplodeMissile
-//
-//----------------------------------------------------------------------------
-
-void P_ExplodeMissile(mobj_t * mo)
-{
-    if (mo->type == MT_WHIRLWIND)
-    {
-        if (++mo->special2.i < 60)
-        {
-            return;
-        }
-    }
-    mo->momx = mo->momy = mo->momz = 0;
-    P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
-    //mo->tics -= P_Random()&3;
-    mo->flags &= ~MF_MISSILE;
-    if (mo->info->deathsound)
-    {
-        S_StartSound(mo, mo->info->deathsound);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_FloorBounceMissile
-//
-//----------------------------------------------------------------------------
-
-void P_FloorBounceMissile(mobj_t * mo)
-{
-    mo->momz = -mo->momz;
-    P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ThrustMobj
-//
-//----------------------------------------------------------------------------
-
-void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move)
-{
-    angle >>= ANGLETOFINESHIFT;
-    mo->momx += FixedMul(move, finecosine[angle]);
-    mo->momy += FixedMul(move, finesine[angle]);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_FaceMobj
-//
-// Returns 1 if 'source' needs to turn clockwise, or 0 if 'source' needs
-// to turn counter clockwise.  'delta' is set to the amount 'source'
-// needs to turn.
-//
-//----------------------------------------------------------------------------
-
-int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta)
-{
-    angle_t diff;
-    angle_t angle1;
-    angle_t angle2;
-
-    angle1 = source->angle;
-    angle2 = R_PointToAngle2(source->x, source->y, target->x, target->y);
-    if (angle2 > angle1)
-    {
-        diff = angle2 - angle1;
-        if (diff > ANG180)
-        {
-            *delta = ANG_MAX - diff;
-            return (0);
-        }
-        else
-        {
-            *delta = diff;
-            return (1);
-        }
-    }
-    else
-    {
-        diff = angle1 - angle2;
-        if (diff > ANG180)
-        {
-            *delta = ANG_MAX - diff;
-            return (1);
-        }
-        else
-        {
-            *delta = diff;
-            return (0);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_SeekerMissile
-//
-// The missile special1 field must be mobj_t *target.  Returns true if
-// target was tracked, false if not.
-//
-//----------------------------------------------------------------------------
-
-boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax)
-{
-    int dir;
-    int dist;
-    angle_t delta;
-    angle_t angle;
-    mobj_t *target;
-
-    target = (mobj_t *) actor->special1.m;
-    if (target == NULL)
-    {
-        return (false);
-    }
-    if (!(target->flags & MF_SHOOTABLE))
-    {                           // Target died
-        actor->special1.m = NULL;
-        return (false);
-    }
-    dir = P_FaceMobj(actor, target, &delta);
-    if (delta > thresh)
-    {
-        delta >>= 1;
-        if (delta > turnMax)
-        {
-            delta = turnMax;
-        }
-    }
-    if (dir)
-    {                           // Turn clockwise
-        actor->angle += delta;
-    }
-    else
-    {                           // Turn counter clockwise
-        actor->angle -= delta;
-    }
-    angle = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
-    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
-    if (actor->z + actor->height < target->z ||
-        target->z + target->height < actor->z)
-    {                           // Need to seek vertically
-        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
-        dist = dist / actor->info->speed;
-        if (dist < 1)
-        {
-            dist = 1;
-        }
-        actor->momz = (target->z - actor->z) / dist;
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_XYMovement
-//
-//----------------------------------------------------------------------------
-
-#define STOPSPEED                       0x1000
-#define FRICTION_NORMAL         0xe800
-#define FRICTION_LOW            0xf900
-#define FRICTION_FLY            0xeb00
-
-void P_XYMovement(mobj_t * mo)
-{
-    fixed_t ptryx, ptryy;
-    player_t *player;
-    fixed_t xmove, ymove;
-    int special;
-    static int windTab[3] = { 2048 * 5, 2048 * 10, 2048 * 25 };
-
-    if (!mo->momx && !mo->momy)
-    {
-        if (mo->flags & MF_SKULLFLY)
-        {                       // A flying mobj slammed into something
-            mo->flags &= ~MF_SKULLFLY;
-            mo->momx = mo->momy = mo->momz = 0;
-            P_SetMobjState(mo, mo->info->seestate);
-        }
-        return;
-    }
-    special = mo->subsector->sector->special;
-    if (mo->flags2 & MF2_WINDTHRUST)
-    {
-        switch (special)
-        {
-            case 40:
-            case 41:
-            case 42:           // Wind_East
-                P_ThrustMobj(mo, 0, windTab[special - 40]);
-                break;
-            case 43:
-            case 44:
-            case 45:           // Wind_North
-                P_ThrustMobj(mo, ANG90, windTab[special - 43]);
-                break;
-            case 46:
-            case 47:
-            case 48:           // Wind_South
-                P_ThrustMobj(mo, ANG270, windTab[special - 46]);
-                break;
-            case 49:
-            case 50:
-            case 51:           // Wind_West
-                P_ThrustMobj(mo, ANG180, windTab[special - 49]);
-                break;
-        }
-    }
-    player = mo->player;
-    if (mo->momx > MAXMOVE)
-    {
-        mo->momx = MAXMOVE;
-    }
-    else if (mo->momx < -MAXMOVE)
-    {
-        mo->momx = -MAXMOVE;
-    }
-    if (mo->momy > MAXMOVE)
-    {
-        mo->momy = MAXMOVE;
-    }
-    else if (mo->momy < -MAXMOVE)
-    {
-        mo->momy = -MAXMOVE;
-    }
-    xmove = mo->momx;
-    ymove = mo->momy;
-    do
-    {
-        if (xmove > MAXMOVE / 2 || ymove > MAXMOVE / 2)
-        {
-            ptryx = mo->x + xmove / 2;
-            ptryy = mo->y + ymove / 2;
-            xmove >>= 1;
-            ymove >>= 1;
-        }
-        else
-        {
-            ptryx = mo->x + xmove;
-            ptryy = mo->y + ymove;
-            xmove = ymove = 0;
-        }
-        if (!P_TryMove(mo, ptryx, ptryy))
-        {                       // Blocked move
-            if (mo->flags2 & MF2_SLIDE)
-            {                   // Try to slide along it
-                P_SlideMove(mo);
-            }
-            else if (mo->flags & MF_MISSILE)
-            {                   // Explode a missile
-                if (ceilingline && ceilingline->backsector
-                    && ceilingline->backsector->ceilingpic == skyflatnum)
-                {               // Hack to prevent missiles exploding against the sky
-                    if (mo->type == MT_BLOODYSKULL)
-                    {
-                        mo->momx = mo->momy = 0;
-                        mo->momz = -FRACUNIT;
-                    }
-                    else
-                    {
-                        P_RemoveMobj(mo);
-                    }
-                    return;
-                }
-                P_ExplodeMissile(mo);
-            }
-            //else if(mo->info->crashstate)
-            //{
-            //      mo->momx = mo->momy = 0;
-            //      P_SetMobjState(mo, mo->info->crashstate);
-            //      return;
-            //}
-            else
-            {
-                mo->momx = mo->momy = 0;
-            }
-        }
-    }
-    while (xmove || ymove);
-
-    // Friction
-
-    if (player && player->cheats & CF_NOMOMENTUM)
-    {                           // Debug option for no sliding at all
-        mo->momx = mo->momy = 0;
-        return;
-    }
-    if (mo->flags & (MF_MISSILE | MF_SKULLFLY))
-    {                           // No friction for missiles
-        return;
-    }
-    if (mo->z > mo->floorz && !(mo->flags2 & MF2_FLY)
-        && !(mo->flags2 & MF2_ONMOBJ))
-    {                           // No friction when falling
-        return;
-    }
-    if (mo->flags & MF_CORPSE)
-    {                           // Don't stop sliding if halfway off a step with some momentum
-        if (mo->momx > FRACUNIT / 4 || mo->momx < -FRACUNIT / 4
-            || mo->momy > FRACUNIT / 4 || mo->momy < -FRACUNIT / 4)
-        {
-            if (mo->floorz != mo->subsector->sector->floorheight)
-            {
-                return;
-            }
-        }
-    }
-    if (mo->momx > -STOPSPEED && mo->momx < STOPSPEED
-        && mo->momy > -STOPSPEED && mo->momy < STOPSPEED
-        && (!player || (player->cmd.forwardmove == 0
-                        && player->cmd.sidemove == 0)))
-    {                           // If in a walking frame, stop moving
-        if (player)
-        {
-            if (player->chickenTics)
-            {
-                if ((unsigned) ((player->mo->state - states)
-                                - S_CHICPLAY_RUN1) < 4)
-                {
-                    P_SetMobjState(player->mo, S_CHICPLAY);
-                }
-            }
-            else
-            {
-                if ((unsigned) ((player->mo->state - states)
-                                - S_PLAY_RUN1) < 4)
-                {
-                    P_SetMobjState(player->mo, S_PLAY);
-                }
-            }
-        }
-        mo->momx = 0;
-        mo->momy = 0;
-    }
-    else
-    {
-        if (mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
-            && !(mo->flags2 & MF2_ONMOBJ))
-        {
-            mo->momx = FixedMul(mo->momx, FRICTION_FLY);
-            mo->momy = FixedMul(mo->momy, FRICTION_FLY);
-        }
-        else if (special == 15) // Friction_Low
-        {
-            mo->momx = FixedMul(mo->momx, FRICTION_LOW);
-            mo->momy = FixedMul(mo->momy, FRICTION_LOW);
-        }
-        else
-        {
-            mo->momx = FixedMul(mo->momx, FRICTION_NORMAL);
-            mo->momy = FixedMul(mo->momy, FRICTION_NORMAL);
-        }
-    }
-}
-
-
-/*
-===============
-=
-= P_ZMovement
-=
-===============
-*/
-
-void P_ZMovement(mobj_t * mo)
-{
-    int dist;
-    int delta;
-//
-// check for smooth step up
-//
-    if (mo->player && mo->z < mo->floorz)
-    {
-        mo->player->viewheight -= mo->floorz - mo->z;
-        mo->player->deltaviewheight =
-            (VIEWHEIGHT - mo->player->viewheight) >> 3;
-    }
-//
-// adjust height
-//
-    mo->z += mo->momz;
-    if (mo->flags & MF_FLOAT && mo->target)
-    {                           // float down towards target if too close
-        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
-        {
-            dist =
-                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
-            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
-            if (delta < 0 && dist < -(delta * 3))
-                mo->z -= FLOATSPEED;
-            else if (delta > 0 && dist < (delta * 3))
-                mo->z += FLOATSPEED;
-        }
-    }
-    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
-        && leveltime & 2)
-    {
-        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
-    }
-
-//
-// clip movement
-//
-    if (mo->z <= mo->floorz)
-    {                           // Hit the floor
-        if (mo->flags & MF_MISSILE)
-        {
-            mo->z = mo->floorz;
-            if (mo->flags2 & MF2_FLOORBOUNCE)
-            {
-                P_FloorBounceMissile(mo);
-                return;
-            }
-            else if (mo->type == MT_MNTRFX2)
-            {                   // Minotaur floor fire can go up steps
-                return;
-            }
-            else
-            {
-                P_ExplodeMissile(mo);
-                return;
-            }
-        }
-        if (mo->z - mo->momz > mo->floorz)
-        {                       // Spawn splashes, etc.
-            P_HitFloor(mo);
-        }
-        mo->z = mo->floorz;
-        if (mo->momz < 0)
-        {
-            if (mo->player && mo->momz < -GRAVITY * 8 && !(mo->flags2 & MF2_FLY))       // squat down
-            {
-                mo->player->deltaviewheight = mo->momz >> 3;
-                S_StartSound(mo, sfx_plroof);
-                // haleyjd: removed externdriver crap
-                mo->player->centering = true;
-            }
-            mo->momz = 0;
-        }
-        if (mo->flags & MF_SKULLFLY)
-        {                       // The skull slammed into something
-            mo->momz = -mo->momz;
-        }
-        if (mo->info->crashstate && (mo->flags & MF_CORPSE))
-        {
-            P_SetMobjState(mo, mo->info->crashstate);
-            return;
-        }
-    }
-    else if (mo->flags2 & MF2_LOGRAV)
-    {
-        if (mo->momz == 0)
-            mo->momz = -(GRAVITY >> 3) * 2;
-        else
-            mo->momz -= GRAVITY >> 3;
-    }
-    else if (!(mo->flags & MF_NOGRAVITY))
-    {
-        if (mo->momz == 0)
-            mo->momz = -GRAVITY * 2;
-        else
-            mo->momz -= GRAVITY;
-    }
-
-    if (mo->z + mo->height > mo->ceilingz)
-    {                           // hit the ceiling
-        if (mo->momz > 0)
-            mo->momz = 0;
-        mo->z = mo->ceilingz - mo->height;
-        if (mo->flags & MF_SKULLFLY)
-        {                       // the skull slammed into something
-            mo->momz = -mo->momz;
-        }
-        if (mo->flags & MF_MISSILE)
-        {
-            if (mo->subsector->sector->ceilingpic == skyflatnum)
-            {
-                if (mo->type == MT_BLOODYSKULL)
-                {
-                    mo->momx = mo->momy = 0;
-                    mo->momz = -FRACUNIT;
-                }
-                else
-                {
-                    P_RemoveMobj(mo);
-                }
-                return;
-            }
-            P_ExplodeMissile(mo);
-            return;
-        }
-    }
-}
-
-
-/*
-================
-=
-= P_NightmareRespawn
-=
-================
-*/
-
-void P_NightmareRespawn(mobj_t * mobj)
-{
-    fixed_t x, y, z;
-    subsector_t *ss;
-    mobj_t *mo;
-    mapthing_t *mthing;
-
-    x = mobj->spawnpoint.x << FRACBITS;
-    y = mobj->spawnpoint.y << FRACBITS;
-
-    if (!P_CheckPosition(mobj, x, y))
-        return;                 // somthing is occupying it's position
-
-
-// spawn a teleport fog at old spot
-
-    mo = P_SpawnMobj(mobj->x, mobj->y,
-                     mobj->subsector->sector->floorheight + TELEFOGHEIGHT,
-                     MT_TFOG);
-    S_StartSound(mo, sfx_telept);
-
-// spawn a teleport fog at the new spot
-    ss = R_PointInSubsector(x, y);
-    mo = P_SpawnMobj(x, y, ss->sector->floorheight + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(mo, sfx_telept);
-
-// spawn the new monster
-    mthing = &mobj->spawnpoint;
-
-// spawn it
-    if (mobj->info->flags & MF_SPAWNCEILING)
-        z = ONCEILINGZ;
-    else
-        z = ONFLOORZ;
-    mo = P_SpawnMobj(x, y, z, mobj->type);
-    mo->spawnpoint = mobj->spawnpoint;
-    mo->angle = ANG45 * (mthing->angle / 45);
-    if (mthing->options & MTF_AMBUSH)
-        mo->flags |= MF_AMBUSH;
-
-    mo->reactiontime = 18;
-
-// remove the old monster
-    P_RemoveMobj(mobj);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_BlasterMobjThinker
-//
-// Thinker for the ultra-fast blaster PL2 ripper-spawning missile.
-//
-//----------------------------------------------------------------------------
-
-void P_BlasterMobjThinker(thinker_t *thinker)
-{
-    mobj_t *mobj = (mobj_t *) thinker;
-    int i;
-    fixed_t xfrac;
-    fixed_t yfrac;
-    fixed_t zfrac;
-    fixed_t z;
-    boolean changexy;
-
-    // Handle movement
-    if (mobj->momx || mobj->momy || (mobj->z != mobj->floorz) || mobj->momz)
-    {
-        xfrac = mobj->momx >> 3;
-        yfrac = mobj->momy >> 3;
-        zfrac = mobj->momz >> 3;
-        changexy = xfrac || yfrac;
-        for (i = 0; i < 8; i++)
-        {
-            if (changexy)
-            {
-                if (!P_TryMove(mobj, mobj->x + xfrac, mobj->y + yfrac))
-                {               // Blocked move
-                    P_ExplodeMissile(mobj);
-                    return;
-                }
-            }
-            mobj->z += zfrac;
-            if (mobj->z <= mobj->floorz)
-            {                   // Hit the floor
-                mobj->z = mobj->floorz;
-                P_HitFloor(mobj);
-                P_ExplodeMissile(mobj);
-                return;
-            }
-            if (mobj->z + mobj->height > mobj->ceilingz)
-            {                   // Hit the ceiling
-                mobj->z = mobj->ceilingz - mobj->height;
-                P_ExplodeMissile(mobj);
-                return;
-            }
-            if (changexy && (P_Random() < 64))
-            {
-                z = mobj->z - 8 * FRACUNIT;
-                if (z < mobj->floorz)
-                {
-                    z = mobj->floorz;
-                }
-                P_SpawnMobj(mobj->x, mobj->y, z, MT_BLASTERSMOKE);
-            }
-        }
-    }
-    // Advance the state
-    if (mobj->tics != -1)
-    {
-        mobj->tics--;
-        while (!mobj->tics)
-        {
-            if (!P_SetMobjState(mobj, mobj->state->nextstate))
-            {                   // mobj was removed
-                return;
-            }
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_MobjThinker
-//
-//----------------------------------------------------------------------------
-
-void P_MobjThinker(thinker_t *thinker)
-{
-    mobj_t *mobj = (mobj_t *) thinker;
-    mobj_t *onmo;
-
-    // Handle X and Y momentums
-    if (mobj->momx || mobj->momy || (mobj->flags & MF_SKULLFLY))
-    {
-        P_XYMovement(mobj);
-        if (mobj->thinker.function == (think_t) - 1)
-        {                       // mobj was removed
-            return;
-        }
-    }
-    if (mobj->flags2 & MF2_FLOATBOB)
-    {                           // Floating item bobbing motion
-        mobj->z = mobj->floorz + FloatBobOffsets[(mobj->health++) & 63];
-    }
-    else if ((mobj->z != mobj->floorz) || mobj->momz)
-    {                           // Handle Z momentum and gravity
-        if (mobj->flags2 & MF2_PASSMOBJ)
-        {
-            if (!(onmo = P_CheckOnmobj(mobj)))
-            {
-                P_ZMovement(mobj);
-            }
-            else
-            {
-                if (mobj->player && mobj->momz < 0)
-                {
-                    mobj->flags2 |= MF2_ONMOBJ;
-                    mobj->momz = 0;
-                }
-                if (mobj->player && (onmo->player || onmo->type == MT_POD))
-                {
-                    mobj->momx = onmo->momx;
-                    mobj->momy = onmo->momy;
-                    if (onmo->z < onmo->floorz)
-                    {
-                        mobj->z += onmo->floorz - onmo->z;
-                        if (onmo->player)
-                        {
-                            onmo->player->viewheight -=
-                                onmo->floorz - onmo->z;
-                            onmo->player->deltaviewheight =
-                                (VIEWHEIGHT - onmo->player->viewheight) >> 3;
-                        }
-                        onmo->z = onmo->floorz;
-                    }
-                }
-            }
-        }
-        else
-        {
-            P_ZMovement(mobj);
-        }
-        if (mobj->thinker.function == (think_t) - 1)
-        {                       // mobj was removed
-            return;
-        }
-    }
-
-//
-// cycle through states, calling action functions at transitions
-//
-    if (mobj->tics != -1)
-    {
-        mobj->tics--;
-        // you can cycle through multiple states in a tic
-        while (!mobj->tics)
-        {
-            if (!P_SetMobjState(mobj, mobj->state->nextstate))
-            {                   // mobj was removed
-                return;
-            }
-        }
-    }
-    else
-    {                           // Check for monster respawn
-        if (!(mobj->flags & MF_COUNTKILL))
-        {
-            return;
-        }
-        if (!respawnmonsters)
-        {
-            return;
-        }
-        mobj->movecount++;
-        if (mobj->movecount < 12 * 35)
-        {
-            return;
-        }
-        if (leveltime & 31)
-        {
-            return;
-        }
-        if (P_Random() > 4)
-        {
-            return;
-        }
-        P_NightmareRespawn(mobj);
-    }
-}
-
-/*
-===============
-=
-= P_SpawnMobj
-=
-===============
-*/
-
-mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
-{
-    mobj_t *mobj;
-    state_t *st;
-    mobjinfo_t *info;
-    fixed_t space;
-
-    mobj = Z_Malloc(sizeof(*mobj), PU_LEVEL, NULL);
-    memset(mobj, 0, sizeof(*mobj));
-    info = &mobjinfo[type];
-    mobj->type = type;
-    mobj->info = info;
-    mobj->x = x;
-    mobj->y = y;
-    mobj->radius = info->radius;
-    mobj->height = info->height;
-    mobj->flags = info->flags;
-    mobj->flags2 = info->flags2;
-    mobj->damage = info->damage;
-    mobj->health = info->spawnhealth;
-    if (gameskill != sk_nightmare)
-    {
-        mobj->reactiontime = info->reactiontime;
-    }
-    mobj->lastlook = P_Random() % MAXPLAYERS;
-
-    // Set the state, but do not use P_SetMobjState, because action
-    // routines can't be called yet.  If the spawnstate has an action
-    // routine, it will not be called.
-    st = &states[info->spawnstate];
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-
-    // Set subsector and/or block links.
-    P_SetThingPosition(mobj);
-    mobj->floorz = mobj->subsector->sector->floorheight;
-    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-    if (z == ONFLOORZ)
-    {
-        mobj->z = mobj->floorz;
-    }
-    else if (z == ONCEILINGZ)
-    {
-        mobj->z = mobj->ceilingz - mobj->info->height;
-    }
-    else if (z == FLOATRANDZ)
-    {
-        space = ((mobj->ceilingz) - (mobj->info->height)) - mobj->floorz;
-        if (space > 48 * FRACUNIT)
-        {
-            space -= 40 * FRACUNIT;
-            mobj->z =
-                ((space * P_Random()) >> 8) + mobj->floorz + 40 * FRACUNIT;
-        }
-        else
-        {
-            mobj->z = mobj->floorz;
-        }
-    }
-    else
-    {
-        mobj->z = z;
-    }
-    if (mobj->flags2 & MF2_FOOTCLIP
-        && P_GetThingFloorType(mobj) != FLOOR_SOLID
-        && mobj->floorz == mobj->subsector->sector->floorheight)
-    {
-        mobj->flags2 |= MF2_FEETARECLIPPED;
-    }
-    else
-    {
-        mobj->flags2 &= ~MF2_FEETARECLIPPED;
-    }
-
-    mobj->thinker.function = P_MobjThinker;
-    P_AddThinker(&mobj->thinker);
-    return (mobj);
-}
-
-/*
-===============
-=
-= P_RemoveMobj
-=
-===============
-*/
-
-void P_RemoveMobj(mobj_t * mobj)
-{
-// unlink from sector and block lists
-    P_UnsetThingPosition(mobj);
-// stop any playing sound
-    S_StopSound(mobj);
-// free block
-    P_RemoveThinker((thinker_t *) mobj);
-}
-
-//=============================================================================
-
-
-/*
-============
-=
-= P_SpawnPlayer
-=
-= Called when a player is spawned on the level 
-= Most of the player structure stays unchanged between levels
-============
-*/
-
-void P_SpawnPlayer(mapthing_t * mthing)
-{
-    player_t *p;
-    fixed_t x, y, z;
-    mobj_t *mobj;
-    int i;
-
-    if (!playeringame[mthing->type - 1])
-        return;                 // not playing
-
-    p = &players[mthing->type - 1];
-
-    if (p->playerstate == PST_REBORN)
-        G_PlayerReborn(mthing->type - 1);
-
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-
-    z = ONFLOORZ;
-    mobj = P_SpawnMobj(x, y, z, MT_PLAYER);
-    if (mthing->type > 1)       // set color translations for player sprites
-        mobj->flags |= (mthing->type - 1) << MF_TRANSSHIFT;
-
-    mobj->angle = ANG45 * (mthing->angle / 45);
-    mobj->player = p;
-    mobj->health = p->health;
-    p->mo = mobj;
-    p->playerstate = PST_LIVE;
-    p->refire = 0;
-    p->message = NULL;
-    p->damagecount = 0;
-    p->bonuscount = 0;
-    p->chickenTics = 0;
-    p->rain1 = NULL;
-    p->rain2 = NULL;
-    p->extralight = 0;
-    p->fixedcolormap = 0;
-    p->viewheight = VIEWHEIGHT;
-    P_SetupPsprites(p);         // setup gun psprite        
-    if (deathmatch)
-    {                           // Give all keys in death match mode
-        for (i = 0; i < NUM_KEY_TYPES; i++)
-        {
-            p->keys[i] = true;
-            if (p == &players[consoleplayer])
-            {
-                playerkeys = 7;
-                UpdateState |= I_STATBAR;
-            }
-        }
-    }
-    else if (p == &players[consoleplayer])
-    {
-        playerkeys = 0;
-        UpdateState |= I_STATBAR;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_SpawnMapThing
-//
-// The fields of the mapthing should already be in host byte order.
-//
-//----------------------------------------------------------------------------
-
-void P_SpawnMapThing(mapthing_t * mthing)
-{
-    int i;
-    int bit;
-    mobj_t *mobj;
-    fixed_t x, y, z;
-
-// count deathmatch start positions
-    if (mthing->type == 11)
-    {
-        if (deathmatch_p < &deathmatchstarts[10])
-        {
-            memcpy(deathmatch_p, mthing, sizeof(*mthing));
-            deathmatch_p++;
-        }
-        return;
-    }
-
-// check for players specially
-    if (mthing->type <= 4)
-    {
-        // save spots for respawning in network games
-        playerstarts[mthing->type - 1] = *mthing;
-        playerstartsingame[mthing->type - 1] = true;
-        if (!deathmatch)
-        {
-            P_SpawnPlayer(mthing);
-        }
-        return;
-    }
-
-    // Ambient sound sequences
-    if (mthing->type >= 1200 && mthing->type < 1300)
-    {
-        P_AddAmbientSfx(mthing->type - 1200);
-        return;
-    }
-
-    // Check for boss spots
-    if (mthing->type == 56)     // Monster_BossSpot
-    {
-        P_AddBossSpot(mthing->x << FRACBITS, mthing->y << FRACBITS,
-                      ANG45 * (mthing->angle / 45));
-        return;
-    }
-
-// check for appropriate skill level
-    if (!netgame && (mthing->options & 16))
-        return;
-
-    if (gameskill == sk_baby)
-        bit = 1;
-    else if (gameskill == sk_nightmare)
-        bit = 4;
-    else
-        bit = 1 << (gameskill - 1);
-    if (!(mthing->options & bit))
-        return;
-
-// find which type to spawn
-    for (i = 0; i < NUMMOBJTYPES; i++)
-        if (mthing->type == mobjinfo[i].doomednum)
-            break;
-
-    if (i == NUMMOBJTYPES)
-        I_Error("P_SpawnMapThing: Unknown type %i at (%i, %i)", mthing->type,
-                mthing->x, mthing->y);
-
-// don't spawn keys and players in deathmatch
-    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
-        return;
-
-// don't spawn any monsters if -nomonsters
-    if (nomonsters && (mobjinfo[i].flags & MF_COUNTKILL))
-        return;
-
-// spawn it
-    switch (i)
-    {                           // Special stuff
-        case MT_WSKULLROD:
-        case MT_WPHOENIXROD:
-        case MT_AMSKRDWIMPY:
-        case MT_AMSKRDHEFTY:
-        case MT_AMPHRDWIMPY:
-        case MT_AMPHRDHEFTY:
-        case MT_AMMACEWIMPY:
-        case MT_AMMACEHEFTY:
-        case MT_ARTISUPERHEAL:
-        case MT_ARTITELEPORT:
-        case MT_ITEMSHIELD2:
-            if (gamemode == shareware)
-            {                   // Don't place on map in shareware version
-                return;
-            }
-            break;
-        case MT_WMACE:
-            if (gamemode != shareware)
-            {                   // Put in the mace spot list
-                P_AddMaceSpot(mthing);
-                return;
-            }
-            return;
-        default:
-            break;
-    }
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-    if (mobjinfo[i].flags & MF_SPAWNCEILING)
-    {
-        z = ONCEILINGZ;
-    }
-    else if (mobjinfo[i].flags2 & MF2_SPAWNFLOAT)
-    {
-        z = FLOATRANDZ;
-    }
-    else
-    {
-        z = ONFLOORZ;
-    }
-    mobj = P_SpawnMobj(x, y, z, i);
-    if (mobj->flags2 & MF2_FLOATBOB)
-    {                           // Seed random starting index for bobbing motion
-        mobj->health = P_Random();
-    }
-    if (mobj->tics > 0)
-    {
-        mobj->tics = 1 + (P_Random() % mobj->tics);
-    }
-    if (mobj->flags & MF_COUNTKILL)
-    {
-        totalkills++;
-        mobj->spawnpoint = *mthing;
-    }
-    if (mobj->flags & MF_COUNTITEM)
-    {
-        totalitems++;
-    }
-    mobj->angle = ANG45 * (mthing->angle / 45);
-    if (mthing->options & MTF_AMBUSH)
-    {
-        mobj->flags |= MF_AMBUSH;
-    }
-}
-
-/*
-===============================================================================
-
-						GAME SPAWN FUNCTIONS
-
-===============================================================================
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SpawnPuff
-//
-//---------------------------------------------------------------------------
-
-
-void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z)
-{
-    mobj_t *puff;
-
-    z += (P_SubRandom() << 10);
-    puff = P_SpawnMobj(x, y, z, PuffType);
-    if (puff->info->attacksound)
-    {
-        S_StartSound(puff, puff->info->attacksound);
-    }
-    switch (PuffType)
-    {
-        case MT_BEAKPUFF:
-        case MT_STAFFPUFF:
-            puff->momz = FRACUNIT;
-            break;
-        case MT_GAUNTLETPUFF1:
-        case MT_GAUNTLETPUFF2:
-            puff->momz = (fixed_t)(.8 * FRACUNIT);
-        default:
-            break;
-    }
-}
-
-/*
-================
-=
-= P_SpawnBlood
-=
-================
-*/
-
-/*
-void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage)
-{
-	mobj_t  *th;
-	
-	z += (P_SubRandom()<<10);
-	th = P_SpawnMobj (x,y,z, MT_BLOOD);
-	th->momz = FRACUNIT*2;
-	th->tics -= P_Random()&3;
-
-	if (damage <= 12 && damage >= 9)
-		P_SetMobjState (th,S_BLOOD2);
-	else if (damage < 9)
-		P_SetMobjState (th,S_BLOOD3);
-}
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_BloodSplatter
-//
-//---------------------------------------------------------------------------
-
-void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(x, y, z, MT_BLOODSPLATTER);
-    mo->target = originator;
-    mo->momx = P_SubRandom() << 9;
-    mo->momy = P_SubRandom() << 9;
-    mo->momz = FRACUNIT * 2;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_RipperBlood
-//
-//---------------------------------------------------------------------------
-
-void P_RipperBlood(mobj_t * mo)
-{
-    mobj_t *th;
-    fixed_t x, y, z;
-
-    x = mo->x + (P_SubRandom() << 12);
-    y = mo->y + (P_SubRandom() << 12);
-    z = mo->z + (P_SubRandom() << 12);
-    th = P_SpawnMobj(x, y, z, MT_BLOOD);
-    th->flags |= MF_NOGRAVITY;
-    th->momx = mo->momx >> 1;
-    th->momy = mo->momy >> 1;
-    th->tics += P_Random() & 3;
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GetThingFloorType
-//
-//---------------------------------------------------------------------------
-
-int P_GetThingFloorType(mobj_t * thing)
-{
-    return (TerrainTypes[thing->subsector->sector->floorpic]);
-/*
-	if(thing->subsector->sector->floorpic
-		== W_GetNumForName("FLTWAWA1")-firstflat)
-	{
-		return(FLOOR_WATER);
-	}
-	else
-	{
-		return(FLOOR_SOLID);
-	}
-*/
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_HitFloor
-//
-//---------------------------------------------------------------------------
-
-int P_HitFloor(mobj_t * thing)
-{
-    mobj_t *mo;
-
-    if (thing->floorz != thing->subsector->sector->floorheight)
-    {                           // don't splash if landing on the edge above water/lava/etc....
-        return (FLOOR_SOLID);
-    }
-    switch (P_GetThingFloorType(thing))
-    {
-        case FLOOR_WATER:
-            P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASHBASE);
-            mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASH);
-            mo->target = thing;
-            mo->momx = P_SubRandom() << 8;
-            mo->momy = P_SubRandom() << 8;
-            mo->momz = 2 * FRACUNIT + (P_Random() << 8);
-            S_StartSound(mo, sfx_gloop);
-            return (FLOOR_WATER);
-        case FLOOR_LAVA:
-            P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASPLASH);
-            mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASMOKE);
-            mo->momz = FRACUNIT + (P_Random() << 7);
-            S_StartSound(mo, sfx_burn);
-            return (FLOOR_LAVA);
-        case FLOOR_SLUDGE:
-            P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SLUDGESPLASH);
-            mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SLUDGECHUNK);
-            mo->target = thing;
-            mo->momx = P_SubRandom() << 8;
-            mo->momy = P_SubRandom() << 8;
-            mo->momz = FRACUNIT + (P_Random() << 8);
-            return (FLOOR_SLUDGE);
-    }
-    return (FLOOR_SOLID);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_CheckMissileSpawn
-//
-// Returns true if the missile is at a valid spawn point, otherwise
-// explodes it and returns false.
-//
-//---------------------------------------------------------------------------
-
-boolean P_CheckMissileSpawn(mobj_t * missile)
-{
-    //missile->tics -= P_Random()&3;
-
-    // move a little forward so an angle can be computed if it
-    // immediately explodes
-    missile->x += (missile->momx >> 1);
-    missile->y += (missile->momy >> 1);
-    missile->z += (missile->momz >> 1);
-    if (!P_TryMove(missile, missile->x, missile->y))
-    {
-        P_ExplodeMissile(missile);
-        return (false);
-    }
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_SpawnMissile
-//
-// Returns NULL if the missile exploded immediately, otherwise returns
-// a mobj_t pointer to the missile.
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type)
-{
-    fixed_t z;
-    mobj_t *th;
-    angle_t an;
-    int dist;
-
-    switch (type)
-    {
-        case MT_MNTRFX1:       // Minotaur swing attack missile
-            z = source->z + 40 * FRACUNIT;
-            break;
-        case MT_MNTRFX2:       // Minotaur floor fire missile
-            z = ONFLOORZ;
-            break;
-        case MT_SRCRFX1:       // Sorcerer Demon fireball
-            z = source->z + 48 * FRACUNIT;
-            break;
-        case MT_KNIGHTAXE:     // Knight normal axe
-        case MT_REDAXE:        // Knight red power axe
-            z = source->z + 36 * FRACUNIT;
-            break;
-        default:
-            z = source->z + 32 * FRACUNIT;
-            break;
-    }
-    if (source->flags2 & MF2_FEETARECLIPPED)
-    {
-        z -= FOOTCLIPSIZE;
-    }
-    th = P_SpawnMobj(source->x, source->y, z, type);
-    if (th->info->seesound)
-    {
-        S_StartSound(th, th->info->seesound);
-    }
-    th->target = source;        // Originator
-    an = R_PointToAngle2(source->x, source->y, dest->x, dest->y);
-    if (dest->flags & MF_SHADOW)
-    {                           // Invisible target
-        an += P_SubRandom() << 21;
-    }
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul(th->info->speed, finecosine[an]);
-    th->momy = FixedMul(th->info->speed, finesine[an]);
-    dist = P_AproxDistance(dest->x - source->x, dest->y - source->y);
-    dist = dist / th->info->speed;
-    if (dist < 1)
-    {
-        dist = 1;
-    }
-    th->momz = (dest->z - source->z) / dist;
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_SpawnMissileAngle
-//
-// Returns NULL if the missile exploded immediately, otherwise returns
-// a mobj_t pointer to the missile.
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
-                            angle_t angle, fixed_t momz)
-{
-    fixed_t z;
-    mobj_t *mo;
-
-    switch (type)
-    {
-        case MT_MNTRFX1:       // Minotaur swing attack missile
-            z = source->z + 40 * FRACUNIT;
-            break;
-        case MT_MNTRFX2:       // Minotaur floor fire missile
-            z = ONFLOORZ;
-            break;
-        case MT_SRCRFX1:       // Sorcerer Demon fireball
-            z = source->z + 48 * FRACUNIT;
-            break;
-        default:
-            z = source->z + 32 * FRACUNIT;
-            break;
-    }
-    if (source->flags2 & MF2_FEETARECLIPPED)
-    {
-        z -= FOOTCLIPSIZE;
-    }
-    mo = P_SpawnMobj(source->x, source->y, z, type);
-    if (mo->info->seesound)
-    {
-        S_StartSound(mo, mo->info->seesound);
-    }
-    mo->target = source;        // Originator
-    mo->angle = angle;
-    angle >>= ANGLETOFINESHIFT;
-    mo->momx = FixedMul(mo->info->speed, finecosine[angle]);
-    mo->momy = FixedMul(mo->info->speed, finesine[angle]);
-    mo->momz = momz;
-    return (P_CheckMissileSpawn(mo) ? mo : NULL);
-}
-
-/*
-================
-=
-= P_SpawnPlayerMissile
-=
-= Tries to aim at a nearby monster
-================
-*/
-
-mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type)
-{
-    angle_t an;
-    fixed_t x, y, z, slope;
-
-    // Try to find a target
-    an = source->angle;
-    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-    if (!linetarget)
-    {
-        an += 1 << 26;
-        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2 << 26;
-            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        }
-        if (!linetarget)
-        {
-            an = source->angle;
-            slope = ((source->player->lookdir) << FRACBITS) / 173;
-        }
-    }
-    x = source->x;
-    y = source->y;
-    z = source->z + 4 * 8 * FRACUNIT +
-        ((source->player->lookdir) << FRACBITS) / 173;
-    if (source->flags2 & MF2_FEETARECLIPPED)
-    {
-        z -= FOOTCLIPSIZE;
-    }
-    MissileMobj = P_SpawnMobj(x, y, z, type);
-    if (MissileMobj->info->seesound)
-    {
-        S_StartSound(MissileMobj, MissileMobj->info->seesound);
-    }
-    MissileMobj->target = source;
-    MissileMobj->angle = an;
-    MissileMobj->momx = FixedMul(MissileMobj->info->speed,
-                                 finecosine[an >> ANGLETOFINESHIFT]);
-    MissileMobj->momy = FixedMul(MissileMobj->info->speed,
-                                 finesine[an >> ANGLETOFINESHIFT]);
-    MissileMobj->momz = FixedMul(MissileMobj->info->speed, slope);
-    if (MissileMobj->type == MT_BLASTERFX1)
-    {                           // Ultra-fast ripper spawning missile
-        MissileMobj->x += (MissileMobj->momx >> 3);
-        MissileMobj->y += (MissileMobj->momy >> 3);
-        MissileMobj->z += (MissileMobj->momz >> 3);
-    }
-    else
-    {                           // Normal missile
-        MissileMobj->x += (MissileMobj->momx >> 1);
-        MissileMobj->y += (MissileMobj->momy >> 1);
-        MissileMobj->z += (MissileMobj->momz >> 1);
-    }
-    if (!P_TryMove(MissileMobj, MissileMobj->x, MissileMobj->y))
-    {                           // Exploded immediately
-        P_ExplodeMissile(MissileMobj);
-        return (NULL);
-    }
-    return (MissileMobj);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SPMAngle
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle)
-{
-    mobj_t *th;
-    angle_t an;
-    fixed_t x, y, z, slope;
-
-//
-// see which target is to be aimed at
-//
-    an = angle;
-    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-    if (!linetarget)
-    {
-        an += 1 << 26;
-        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2 << 26;
-            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        }
-        if (!linetarget)
-        {
-            an = angle;
-            slope = ((source->player->lookdir) << FRACBITS) / 173;
-        }
-    }
-    x = source->x;
-    y = source->y;
-    z = source->z + 4 * 8 * FRACUNIT +
-        ((source->player->lookdir) << FRACBITS) / 173;
-    if (source->flags2 & MF2_FEETARECLIPPED)
-    {
-        z -= FOOTCLIPSIZE;
-    }
-    th = P_SpawnMobj(x, y, z, type);
-    if (th->info->seesound)
-    {
-        S_StartSound(th, th->info->seesound);
-    }
-    th->target = source;
-    th->angle = an;
-    th->momx = FixedMul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
-    th->momy = FixedMul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
-    th->momz = FixedMul(th->info->speed, slope);
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_ContMobjSound
-//
-//---------------------------------------------------------------------------
-
-void A_ContMobjSound(mobj_t * actor, player_t *player, pspdef_t *psp)
-{
-    switch (actor->type)
-    {
-        case MT_KNIGHTAXE:
-            S_StartSound(actor, sfx_kgtatk);
-            break;
-        case MT_MUMMYFX1:
-            S_StartSound(actor, sfx_mumhed);
-            break;
-        default:
-            break;
-    }
-}
diff --git a/games/NXDoom/src/heretic/p_plats.c b/games/NXDoom/src/heretic/p_plats.c
deleted file mode 100644
index 861a9a51a..000000000
--- a/games/NXDoom/src/heretic/p_plats.c
+++ /dev/null
@@ -1,259 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_plats.c
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-plat_t *activeplats[MAXPLATS];
-
-//==================================================================
-//
-//      Move a plat up and down
-//
-//==================================================================
-void T_PlatRaise(thinker_t *thinker)
-{
-    plat_t *plat = (plat_t *) thinker;
-    result_e res;
-
-    switch (plat->status)
-    {
-        case up:
-            res = T_MovePlane(plat->sector, plat->speed,
-                              plat->high, plat->crush, 0, 1);
-            if (!(leveltime & 31))
-            {
-                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
-            }
-            if (plat->type == raiseAndChange
-                || plat->type == raiseToNearestAndChange)
-            {
-                if (!(leveltime & 7))
-                {
-                    S_StartSound(&plat->sector->soundorg,
-                                 sfx_stnmov);
-                }
-            }
-            if (res == crushed && (!plat->crush))
-            {
-                plat->count = plat->wait;
-                plat->status = down;
-                S_StartSound(&plat->sector->soundorg, sfx_pstart);
-            }
-            else if (res == pastdest)
-            {
-                plat->count = plat->wait;
-                plat->status = waiting;
-                S_StartSound(&plat->sector->soundorg, sfx_pstop);
-                switch (plat->type)
-                {
-                    case downWaitUpStay:
-                        P_RemoveActivePlat(plat);
-                        break;
-                    case raiseAndChange:
-                        P_RemoveActivePlat(plat);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-        case down:
-            res =
-                T_MovePlane(plat->sector, plat->speed, plat->low, false, 0,
-                            -1);
-            if (res == pastdest)
-            {
-                plat->count = plat->wait;
-                plat->status = waiting;
-                S_StartSound(&plat->sector->soundorg, sfx_pstop);
-            }
-            else
-            {
-                if (!(leveltime & 31))
-                {
-                    S_StartSound(&plat->sector->soundorg,
-                                 sfx_stnmov);
-                }
-            }
-            break;
-        case waiting:
-            if (!--plat->count)
-            {
-                if (plat->sector->floorheight == plat->low)
-                    plat->status = up;
-                else
-                    plat->status = down;
-                S_StartSound(&plat->sector->soundorg, sfx_pstart);
-            }
-        case in_stasis:
-            break;
-    }
-}
-
-//==================================================================
-//
-//      Do Platforms
-//      "amount" is only used for SOME platforms.
-//
-//==================================================================
-int EV_DoPlat(line_t * line, plattype_e type, int amount)
-{
-    plat_t *plat;
-    int secnum;
-    int rtn;
-    sector_t *sec;
-
-    secnum = -1;
-    rtn = 0;
-
-    //
-    //      Activate all <type> plats that are in_stasis
-    //
-    switch (type)
-    {
-        case perpetualRaise:
-            P_ActivateInStasis(line->tag);
-            break;
-        default:
-            break;
-    }
-
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        //
-        // Find lowest & highest floors around sector
-        //
-        rtn = 1;
-        plat = Z_Malloc(sizeof(*plat), PU_LEVSPEC, 0);
-        P_AddThinker(&plat->thinker);
-
-        plat->type = type;
-        plat->sector = sec;
-        plat->sector->specialdata = plat;
-        plat->thinker.function = T_PlatRaise;
-        plat->crush = false;
-        plat->tag = line->tag;
-        switch (type)
-        {
-            case raiseToNearestAndChange:
-                plat->speed = PLATSPEED / 2;
-                sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-                plat->high = P_FindNextHighestFloor(sec, sec->floorheight);
-                plat->wait = 0;
-                plat->status = up;
-                sec->special = 0;       // NO MORE DAMAGE, IF APPLICABLE
-                S_StartSound(&sec->soundorg, sfx_stnmov);
-                break;
-            case raiseAndChange:
-                plat->speed = PLATSPEED / 2;
-                sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-                plat->high = sec->floorheight + amount * FRACUNIT;
-                plat->wait = 0;
-                plat->status = up;
-                S_StartSound(&sec->soundorg, sfx_stnmov);
-                break;
-            case downWaitUpStay:
-                plat->speed = PLATSPEED * 4;
-                plat->low = P_FindLowestFloorSurrounding(sec);
-                if (plat->low > sec->floorheight)
-                    plat->low = sec->floorheight;
-                plat->high = sec->floorheight;
-                plat->wait = 35 * PLATWAIT;
-                plat->status = down;
-                S_StartSound(&sec->soundorg, sfx_pstart);
-                break;
-            case perpetualRaise:
-                plat->speed = PLATSPEED;
-                plat->low = P_FindLowestFloorSurrounding(sec);
-                if (plat->low > sec->floorheight)
-                    plat->low = sec->floorheight;
-                plat->high = P_FindHighestFloorSurrounding(sec);
-                if (plat->high < sec->floorheight)
-                    plat->high = sec->floorheight;
-                plat->wait = 35 * PLATWAIT;
-                plat->status = P_Random() & 1;
-                S_StartSound(&sec->soundorg, sfx_pstart);
-                break;
-        }
-        P_AddActivePlat(plat);
-    }
-    return rtn;
-}
-
-void P_ActivateInStasis(int tag)
-{
-    int i;
-
-    for (i = 0; i < MAXPLATS; i++)
-        if (activeplats[i] &&
-            (activeplats[i])->tag == tag &&
-            (activeplats[i])->status == in_stasis)
-        {
-            (activeplats[i])->status = (activeplats[i])->oldstatus;
-            (activeplats[i])->thinker.function = T_PlatRaise;
-        }
-}
-
-void EV_StopPlat(line_t * line)
-{
-    int j;
-
-    for (j = 0; j < MAXPLATS; j++)
-        if (activeplats[j] && ((activeplats[j])->status != in_stasis) &&
-            ((activeplats[j])->tag == line->tag))
-        {
-            (activeplats[j])->oldstatus = (activeplats[j])->status;
-            (activeplats[j])->status = in_stasis;
-            (activeplats[j])->thinker.function = NULL;
-        }
-}
-
-void P_AddActivePlat(plat_t * plat)
-{
-    int i;
-    for (i = 0; i < MAXPLATS; i++)
-        if (activeplats[i] == NULL)
-        {
-            activeplats[i] = plat;
-            return;
-        }
-    I_Error("P_AddActivePlat: no more plats!");
-}
-
-void P_RemoveActivePlat(plat_t * plat)
-{
-    int i;
-    for (i = 0; i < MAXPLATS; i++)
-        if (plat == activeplats[i])
-        {
-            (activeplats[i])->sector->specialdata = NULL;
-            P_RemoveThinker(&(activeplats[i])->thinker);
-            activeplats[i] = NULL;
-            return;
-        }
-    I_Error("P_RemoveActivePlat: can't find plat!");
-}
diff --git a/games/NXDoom/src/heretic/p_pspr.c b/games/NXDoom/src/heretic/p_pspr.c
deleted file mode 100644
index 10e967dd6..000000000
--- a/games/NXDoom/src/heretic/p_pspr.c
+++ /dev/null
@@ -1,1907 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_pspr.c
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// Macros
-
-#define LOWERSPEED FRACUNIT*6
-#define RAISESPEED FRACUNIT*6
-#define WEAPONBOTTOM 128*FRACUNIT
-#define WEAPONTOP 32*FRACUNIT
-#define FLAME_THROWER_TICS 10*35
-#define MAGIC_JUNK 1234
-#define MAX_MACE_SPOTS 8
-
-static int MaceSpotCount;
-static struct
-{
-    fixed_t x;
-    fixed_t y;
-} MaceSpots[MAX_MACE_SPOTS];
-
-fixed_t bulletslope;
-
-static int WeaponAmmoUsePL1[NUMWEAPONS] = {
-    0,                          // staff
-    USE_GWND_AMMO_1,            // gold wand
-    USE_CBOW_AMMO_1,            // crossbow
-    USE_BLSR_AMMO_1,            // blaster
-    USE_SKRD_AMMO_1,            // skull rod
-    USE_PHRD_AMMO_1,            // phoenix rod
-    USE_MACE_AMMO_1,            // mace
-    0,                          // gauntlets
-    0                           // beak
-};
-
-static int WeaponAmmoUsePL2[NUMWEAPONS] = {
-    0,                          // staff
-    USE_GWND_AMMO_2,            // gold wand
-    USE_CBOW_AMMO_2,            // crossbow
-    USE_BLSR_AMMO_2,            // blaster
-    USE_SKRD_AMMO_2,            // skull rod
-    USE_PHRD_AMMO_2,            // phoenix rod
-    USE_MACE_AMMO_2,            // mace
-    0,                          // gauntlets
-    0                           // beak
-};
-
-weaponinfo_t wpnlev1info[NUMWEAPONS] = {
-    {                           // Staff
-     am_noammo,                 // ammo
-     S_STAFFUP,                 // upstate
-     S_STAFFDOWN,               // downstate
-     S_STAFFREADY,              // readystate
-     S_STAFFATK1_1,             // atkstate
-     S_STAFFATK1_1,             // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Gold wand
-     am_goldwand,               // ammo
-     S_GOLDWANDUP,              // upstate
-     S_GOLDWANDDOWN,            // downstate
-     S_GOLDWANDREADY,           // readystate
-     S_GOLDWANDATK1_1,          // atkstate
-     S_GOLDWANDATK1_1,          // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Crossbow
-     am_crossbow,               // ammo
-     S_CRBOWUP,                 // upstate
-     S_CRBOWDOWN,               // downstate
-     S_CRBOW1,                  // readystate
-     S_CRBOWATK1_1,             // atkstate
-     S_CRBOWATK1_1,             // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Blaster
-     am_blaster,                // ammo
-     S_BLASTERUP,               // upstate
-     S_BLASTERDOWN,             // downstate
-     S_BLASTERREADY,            // readystate
-     S_BLASTERATK1_1,           // atkstate
-     S_BLASTERATK1_3,           // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Skull rod
-     am_skullrod,               // ammo
-     S_HORNRODUP,               // upstate
-     S_HORNRODDOWN,             // downstate
-     S_HORNRODREADY,            // readystae
-     S_HORNRODATK1_1,           // atkstate
-     S_HORNRODATK1_1,           // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Phoenix rod
-     am_phoenixrod,             // ammo
-     S_PHOENIXUP,               // upstate
-     S_PHOENIXDOWN,             // downstate
-     S_PHOENIXREADY,            // readystate
-     S_PHOENIXATK1_1,           // atkstate
-     S_PHOENIXATK1_1,           // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Mace
-     am_mace,                   // ammo
-     S_MACEUP,                  // upstate
-     S_MACEDOWN,                // downstate
-     S_MACEREADY,               // readystate
-     S_MACEATK1_1,              // atkstate
-     S_MACEATK1_2,              // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Gauntlets
-     am_noammo,                 // ammo
-     S_GAUNTLETUP,              // upstate
-     S_GAUNTLETDOWN,            // downstate
-     S_GAUNTLETREADY,           // readystate
-     S_GAUNTLETATK1_1,          // atkstate
-     S_GAUNTLETATK1_3,          // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Beak
-     am_noammo,                 // ammo
-     S_BEAKUP,                  // upstate
-     S_BEAKDOWN,                // downstate
-     S_BEAKREADY,               // readystate
-     S_BEAKATK1_1,              // atkstate
-     S_BEAKATK1_1,              // holdatkstate
-     S_NULL                     // flashstate
-     }
-};
-
-weaponinfo_t wpnlev2info[NUMWEAPONS] = {
-    {                           // Staff
-     am_noammo,                 // ammo
-     S_STAFFUP2,                // upstate
-     S_STAFFDOWN2,              // downstate
-     S_STAFFREADY2_1,           // readystate
-     S_STAFFATK2_1,             // atkstate
-     S_STAFFATK2_1,             // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Gold wand
-     am_goldwand,               // ammo
-     S_GOLDWANDUP,              // upstate
-     S_GOLDWANDDOWN,            // downstate
-     S_GOLDWANDREADY,           // readystate
-     S_GOLDWANDATK2_1,          // atkstate
-     S_GOLDWANDATK2_1,          // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Crossbow
-     am_crossbow,               // ammo
-     S_CRBOWUP,                 // upstate
-     S_CRBOWDOWN,               // downstate
-     S_CRBOW1,                  // readystate
-     S_CRBOWATK2_1,             // atkstate
-     S_CRBOWATK2_1,             // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Blaster
-     am_blaster,                // ammo
-     S_BLASTERUP,               // upstate
-     S_BLASTERDOWN,             // downstate
-     S_BLASTERREADY,            // readystate
-     S_BLASTERATK2_1,           // atkstate
-     S_BLASTERATK2_3,           // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Skull rod
-     am_skullrod,               // ammo
-     S_HORNRODUP,               // upstate
-     S_HORNRODDOWN,             // downstate
-     S_HORNRODREADY,            // readystae
-     S_HORNRODATK2_1,           // atkstate
-     S_HORNRODATK2_1,           // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Phoenix rod
-     am_phoenixrod,             // ammo
-     S_PHOENIXUP,               // upstate
-     S_PHOENIXDOWN,             // downstate
-     S_PHOENIXREADY,            // readystate
-     S_PHOENIXATK2_1,           // atkstate
-     S_PHOENIXATK2_2,           // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Mace
-     am_mace,                   // ammo
-     S_MACEUP,                  // upstate
-     S_MACEDOWN,                // downstate
-     S_MACEREADY,               // readystate
-     S_MACEATK2_1,              // atkstate
-     S_MACEATK2_1,              // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Gauntlets
-     am_noammo,                 // ammo
-     S_GAUNTLETUP2,             // upstate
-     S_GAUNTLETDOWN2,           // downstate
-     S_GAUNTLETREADY2_1,        // readystate
-     S_GAUNTLETATK2_1,          // atkstate
-     S_GAUNTLETATK2_3,          // holdatkstate
-     S_NULL                     // flashstate
-     },
-    {                           // Beak
-     am_noammo,                 // ammo
-     S_BEAKUP,                  // upstate
-     S_BEAKDOWN,                // downstate
-     S_BEAKREADY,               // readystate
-     S_BEAKATK2_1,              // atkstate
-     S_BEAKATK2_1,              // holdatkstate
-     S_NULL                     // flashstate
-     }
-};
-
-//---------------------------------------------------------------------------
-//
-// PROC P_OpenWeapons
-//
-// Called at level load before things are loaded.
-//
-//---------------------------------------------------------------------------
-
-void P_OpenWeapons(void)
-{
-    MaceSpotCount = 0;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_AddMaceSpot
-//
-//---------------------------------------------------------------------------
-
-void P_AddMaceSpot(mapthing_t * mthing)
-{
-    if (MaceSpotCount == MAX_MACE_SPOTS)
-    {
-        I_Error("Too many mace spots.");
-    }
-    MaceSpots[MaceSpotCount].x = mthing->x << FRACBITS;
-    MaceSpots[MaceSpotCount].y = mthing->y << FRACBITS;
-    MaceSpotCount++;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_RepositionMace
-//
-// Chooses the next spot to place the mace.
-//
-//---------------------------------------------------------------------------
-
-void P_RepositionMace(mobj_t * mo)
-{
-    int spot;
-    subsector_t *ss;
-
-    P_UnsetThingPosition(mo);
-    spot = P_Random() % MaceSpotCount;
-    mo->x = MaceSpots[spot].x;
-    mo->y = MaceSpots[spot].y;
-    ss = R_PointInSubsector(mo->x, mo->y);
-    mo->z = mo->floorz = ss->sector->floorheight;
-    mo->ceilingz = ss->sector->ceilingheight;
-    P_SetThingPosition(mo);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_CloseWeapons
-//
-// Called at level load after things are loaded.
-//
-//---------------------------------------------------------------------------
-
-void P_CloseWeapons(void)
-{
-    int spot;
-
-    if (!MaceSpotCount)
-    {                           // No maces placed
-        return;
-    }
-    if (!deathmatch && P_Random() < 64)
-    {                           // Sometimes doesn't show up if not in deathmatch
-        return;
-    }
-    spot = P_Random() % MaceSpotCount;
-    P_SpawnMobj(MaceSpots[spot].x, MaceSpots[spot].y, ONFLOORZ, MT_WMACE);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SetPsprite
-//
-//---------------------------------------------------------------------------
-
-void P_SetPsprite(player_t * player, int position, statenum_t stnum)
-{
-    pspdef_t *psp;
-    state_t *state;
-
-    psp = &player->psprites[position];
-    do
-    {
-        if (!stnum)
-        {                       // Object removed itself.
-            psp->state = NULL;
-            break;
-        }
-        state = &states[stnum];
-        psp->state = state;
-        psp->tics = state->tics;        // could be 0
-        if (state->misc1)
-        {                       // Set coordinates.
-            psp->sx = state->misc1 << FRACBITS;
-            psp->sy = state->misc2 << FRACBITS;
-        }
-        if (state->action)
-        {                       // Call action routine.
-            state->action(NULL, player, psp);
-            if (!psp->state)
-            {
-                break;
-            }
-        }
-        stnum = psp->state->nextstate;
-    }
-    while (!psp->tics);         // An initial state of 0 could cycle through.
-}
-
-/*
-=================
-=
-= P_CalcSwing
-=
-=================
-*/
-
-/*
-fixed_t	swingx, swingy;
-void P_CalcSwing (player_t *player)
-{
-	fixed_t	swing;
-	int		angle;
-
-// OPTIMIZE: tablify this
-
-	swing = player->bob;
-
-	angle = (FINEANGLES/70*leveltime)&FINEMASK;
-	swingx = FixedMul ( swing, finesine[angle]);
-
-	angle = (FINEANGLES/70*leveltime+FINEANGLES/2)&FINEMASK;
-	swingy = -FixedMul ( swingx, finesine[angle]);
-}
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_ActivateBeak
-//
-//---------------------------------------------------------------------------
-
-void P_ActivateBeak(player_t * player)
-{
-    player->pendingweapon = wp_nochange;
-    player->readyweapon = wp_beak;
-    player->psprites[ps_weapon].sy = WEAPONTOP;
-    P_SetPsprite(player, ps_weapon, S_BEAKREADY);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_PostChickenWeapon
-//
-//---------------------------------------------------------------------------
-
-void P_PostChickenWeapon(player_t * player, weapontype_t weapon)
-{
-    if (weapon == wp_beak)
-    {                           // Should never happen
-        weapon = wp_staff;
-    }
-    player->pendingweapon = wp_nochange;
-    player->readyweapon = weapon;
-    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
-    P_SetPsprite(player, ps_weapon, wpnlev1info[weapon].upstate);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_BringUpWeapon
-//
-// Starts bringing the pending weapon up from the bottom of the screen.
-//
-//---------------------------------------------------------------------------
-
-void P_BringUpWeapon(player_t * player)
-{
-    statenum_t new;
-
-    if (player->pendingweapon == wp_nochange)
-    {
-        player->pendingweapon = player->readyweapon;
-    }
-    if (player->pendingweapon == wp_gauntlets)
-    {
-        S_StartSound(player->mo, sfx_gntact);
-    }
-    if (player->powers[pw_weaponlevel2])
-    {
-        new = wpnlev2info[player->pendingweapon].upstate;
-    }
-    else
-    {
-        new = wpnlev1info[player->pendingweapon].upstate;
-    }
-    player->pendingweapon = wp_nochange;
-    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
-    P_SetPsprite(player, ps_weapon, new);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_CheckAmmo
-//
-// Returns true if there is enough ammo to shoot.  If not, selects the
-// next weapon to use.
-//
-//---------------------------------------------------------------------------
-
-boolean P_CheckAmmo(player_t * player)
-{
-    ammotype_t ammo;
-    int *ammoUse;
-    int count;
-
-    ammo = wpnlev1info[player->readyweapon].ammo;
-    if (player->powers[pw_weaponlevel2] && !deathmatch)
-    {
-        ammoUse = WeaponAmmoUsePL2;
-    }
-    else
-    {
-        ammoUse = WeaponAmmoUsePL1;
-    }
-    count = ammoUse[player->readyweapon];
-    if (ammo == am_noammo || player->ammo[ammo] >= count)
-    {
-        return (true);
-    }
-    // out of ammo, pick a weapon to change to
-    do
-    {
-        if (player->weaponowned[wp_skullrod]
-            && player->ammo[am_skullrod] > ammoUse[wp_skullrod])
-        {
-            player->pendingweapon = wp_skullrod;
-        }
-        else if (player->weaponowned[wp_blaster]
-                 && player->ammo[am_blaster] > ammoUse[wp_blaster])
-        {
-            player->pendingweapon = wp_blaster;
-        }
-        else if (player->weaponowned[wp_crossbow]
-                 && player->ammo[am_crossbow] > ammoUse[wp_crossbow])
-        {
-            player->pendingweapon = wp_crossbow;
-        }
-        else if (player->weaponowned[wp_mace]
-                 && player->ammo[am_mace] > ammoUse[wp_mace])
-        {
-            player->pendingweapon = wp_mace;
-        }
-        else if (player->ammo[am_goldwand] > ammoUse[wp_goldwand])
-        {
-            player->pendingweapon = wp_goldwand;
-        }
-        else if (player->weaponowned[wp_gauntlets])
-        {
-            player->pendingweapon = wp_gauntlets;
-        }
-        else if (player->weaponowned[wp_phoenixrod]
-                 && player->ammo[am_phoenixrod] > ammoUse[wp_phoenixrod])
-        {
-            player->pendingweapon = wp_phoenixrod;
-        }
-        else
-        {
-            player->pendingweapon = wp_staff;
-        }
-    }
-    while (player->pendingweapon == wp_nochange);
-    if (player->powers[pw_weaponlevel2])
-    {
-        P_SetPsprite(player, ps_weapon,
-                     wpnlev2info[player->readyweapon].downstate);
-    }
-    else
-    {
-        P_SetPsprite(player, ps_weapon,
-                     wpnlev1info[player->readyweapon].downstate);
-    }
-    return (false);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_FireWeapon
-//
-//---------------------------------------------------------------------------
-
-void P_FireWeapon(player_t * player)
-{
-    weaponinfo_t *wpinfo;
-    statenum_t attackState;
-
-    if (!P_CheckAmmo(player))
-    {
-        return;
-    }
-    P_SetMobjState(player->mo, S_PLAY_ATK2);
-    wpinfo = player->powers[pw_weaponlevel2] ? &wpnlev2info[0]
-        : &wpnlev1info[0];
-    attackState = player->refire ? wpinfo[player->readyweapon].holdatkstate
-        : wpinfo[player->readyweapon].atkstate;
-    P_SetPsprite(player, ps_weapon, attackState);
-    P_NoiseAlert(player->mo, player->mo);
-    if (player->readyweapon == wp_gauntlets && !player->refire)
-    {                           // Play the sound for the initial gauntlet attack
-        S_StartSound(player->mo, sfx_gntuse);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_DropWeapon
-//
-// The player died, so put the weapon away.
-//
-//---------------------------------------------------------------------------
-
-void P_DropWeapon(player_t * player)
-{
-    if (player->powers[pw_weaponlevel2])
-    {
-        P_SetPsprite(player, ps_weapon,
-                     wpnlev2info[player->readyweapon].downstate);
-    }
-    else
-    {
-        P_SetPsprite(player, ps_weapon,
-                     wpnlev1info[player->readyweapon].downstate);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_WeaponReady
-//
-// The player can fire the weapon or change to another weapon at this time.
-//
-//---------------------------------------------------------------------------
-
-void A_WeaponReady(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int angle;
-
-    if (player->chickenTics)
-    {                           // Change to the chicken beak
-        P_ActivateBeak(player);
-        return;
-    }
-    // Change player from attack state
-    if (player->mo->state == &states[S_PLAY_ATK1]
-        || player->mo->state == &states[S_PLAY_ATK2])
-    {
-        P_SetMobjState(player->mo, S_PLAY);
-    }
-    // Check for staff PL2 active sound
-    if ((player->readyweapon == wp_staff)
-        && (psp->state == &states[S_STAFFREADY2_1]) && P_Random() < 128)
-    {
-        S_StartSound(player->mo, sfx_stfcrk);
-    }
-    // Put the weapon away if the player has a pending weapon or has
-    // died.
-    if (player->pendingweapon != wp_nochange || !player->health)
-    {
-        if (player->powers[pw_weaponlevel2])
-        {
-            P_SetPsprite(player, ps_weapon,
-                         wpnlev2info[player->readyweapon].downstate);
-        }
-        else
-        {
-            P_SetPsprite(player, ps_weapon,
-                         wpnlev1info[player->readyweapon].downstate);
-        }
-        return;
-    }
-
-    // Check for fire.  The phoenix rod does not auto fire.
-    if (player->cmd.buttons & BT_ATTACK)
-    {
-        if (!player->attackdown || (player->readyweapon != wp_phoenixrod))
-        {
-            player->attackdown = true;
-            P_FireWeapon(player);
-            return;
-        }
-    }
-    else
-    {
-        player->attackdown = false;
-    }
-
-    // Bob the weapon based on movement speed.
-    angle = (128 * leveltime) & FINEMASK;
-    psp->sx = FRACUNIT + FixedMul(player->bob, finecosine[angle]);
-    angle &= FINEANGLES / 2 - 1;
-    psp->sy = WEAPONTOP + FixedMul(player->bob, finesine[angle]);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_UpdateBeak
-//
-//---------------------------------------------------------------------------
-
-void P_UpdateBeak(player_t * player, pspdef_t * psp)
-{
-    psp->sy = WEAPONTOP + (player->chickenPeck << (FRACBITS - 1));
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_BeakReady
-//
-//---------------------------------------------------------------------------
-
-void A_BeakReady(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (player->cmd.buttons & BT_ATTACK)
-    {                           // Chicken beak attack
-        player->attackdown = true;
-        P_SetMobjState(player->mo, S_CHICPLAY_ATK1);
-        if (player->powers[pw_weaponlevel2])
-        {
-            P_SetPsprite(player, ps_weapon, S_BEAKATK2_1);
-        }
-        else
-        {
-            P_SetPsprite(player, ps_weapon, S_BEAKATK1_1);
-        }
-        P_NoiseAlert(player->mo, player->mo);
-    }
-    else
-    {
-        if (player->mo->state == &states[S_CHICPLAY_ATK1])
-        {                       // Take out of attack state
-            P_SetMobjState(player->mo, S_CHICPLAY);
-        }
-        player->attackdown = false;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_ReFire
-//
-// The player can re fire the weapon without lowering it entirely.
-//
-//---------------------------------------------------------------------------
-
-void A_ReFire(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if ((player->cmd.buttons & BT_ATTACK)
-        && player->pendingweapon == wp_nochange && player->health)
-    {
-        player->refire++;
-        P_FireWeapon(player);
-    }
-    else
-    {
-        player->refire = 0;
-        P_CheckAmmo(player);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_Lower
-//
-//---------------------------------------------------------------------------
-
-void A_Lower(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (player->chickenTics)
-    {
-        psp->sy = WEAPONBOTTOM;
-    }
-    else
-    {
-        psp->sy += LOWERSPEED;
-    }
-    if (psp->sy < WEAPONBOTTOM)
-    {                           // Not lowered all the way yet
-        return;
-    }
-    if (player->playerstate == PST_DEAD)
-    {                           // Player is dead, so don't bring up a pending weapon
-        psp->sy = WEAPONBOTTOM;
-        return;
-    }
-    if (!player->health)
-    {                           // Player is dead, so keep the weapon off screen
-        P_SetPsprite(player, ps_weapon, S_NULL);
-        return;
-    }
-    player->readyweapon = player->pendingweapon;
-    P_BringUpWeapon(player);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_BeakRaise
-//
-//---------------------------------------------------------------------------
-
-void A_BeakRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    psp->sy = WEAPONTOP;
-    P_SetPsprite(player, ps_weapon,
-                 wpnlev1info[player->readyweapon].readystate);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_Raise
-//
-//---------------------------------------------------------------------------
-
-void A_Raise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    psp->sy -= RAISESPEED;
-    if (psp->sy > WEAPONTOP)
-    {                           // Not raised all the way yet
-        return;
-    }
-    psp->sy = WEAPONTOP;
-    if (player->powers[pw_weaponlevel2])
-    {
-        P_SetPsprite(player, ps_weapon,
-                     wpnlev2info[player->readyweapon].readystate);
-    }
-    else
-    {
-        P_SetPsprite(player, ps_weapon,
-                     wpnlev1info[player->readyweapon].readystate);
-    }
-}
-
-/*
-===============
-=
-= P_BulletSlope
-=
-= Sets a slope so a near miss is at aproximately the height of the
-= intended target
-=
-===============
-*/
-
-void P_BulletSlope(mobj_t * mo)
-{
-    angle_t an;
-
-//
-// see which target is to be aimed at
-//
-    an = mo->angle;
-    bulletslope = P_AimLineAttack(mo, an, 16 * 64 * FRACUNIT);
-    if (!linetarget)
-    {
-        an += 1 << 26;
-        bulletslope = P_AimLineAttack(mo, an, 16 * 64 * FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2 << 26;
-            bulletslope = P_AimLineAttack(mo, an, 16 * 64 * FRACUNIT);
-        }
-        if (!linetarget)
-        {
-            an += 2 << 26;
-            bulletslope = (mo->player->lookdir << FRACBITS) / 173;
-        }
-    }
-}
-
-//****************************************************************************
-//
-// WEAPON ATTACKS
-//
-//****************************************************************************
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BeakAttackPL1
-//
-//----------------------------------------------------------------------------
-
-void A_BeakAttackPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-
-    damage = 1 + (P_Random() & 3);
-    angle = player->mo->angle;
-    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
-    PuffType = MT_BEAKPUFF;
-    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
-    if (linetarget)
-    {
-        player->mo->angle = R_PointToAngle2(player->mo->x,
-                                            player->mo->y, linetarget->x,
-                                            linetarget->y);
-    }
-    S_StartSound(player->mo, sfx_chicpk1 + (P_Random() % 3));
-    player->chickenPeck = 12;
-    psp->tics -= P_Random() & 7;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BeakAttackPL2
-//
-//----------------------------------------------------------------------------
-
-void A_BeakAttackPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-
-    damage = HITDICE(4);
-    angle = player->mo->angle;
-    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
-    PuffType = MT_BEAKPUFF;
-    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
-    if (linetarget)
-    {
-        player->mo->angle = R_PointToAngle2(player->mo->x,
-                                            player->mo->y, linetarget->x,
-                                            linetarget->y);
-    }
-    S_StartSound(player->mo, sfx_chicpk1 + (P_Random() % 3));
-    player->chickenPeck = 12;
-    psp->tics -= P_Random() & 3;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_StaffAttackPL1
-//
-//----------------------------------------------------------------------------
-
-void A_StaffAttackPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-
-    damage = 5 + (P_Random() & 15);
-    angle = player->mo->angle;
-    angle += P_SubRandom() << 18;
-    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
-    PuffType = MT_STAFFPUFF;
-    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
-    if (linetarget)
-    {
-        //S_StartSound(player->mo, sfx_stfhit);
-        // turn to face target
-        player->mo->angle = R_PointToAngle2(player->mo->x,
-                                            player->mo->y, linetarget->x,
-                                            linetarget->y);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_StaffAttackPL2
-//
-//----------------------------------------------------------------------------
-
-void A_StaffAttackPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-
-    // P_inter.c:P_DamageMobj() handles target momentums
-    damage = 18 + (P_Random() & 63);
-    angle = player->mo->angle;
-    angle += P_SubRandom() << 18;
-    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
-    PuffType = MT_STAFFPUFF2;
-    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
-    if (linetarget)
-    {
-        //S_StartSound(player->mo, sfx_stfpow);
-        // turn to face target
-        player->mo->angle = R_PointToAngle2(player->mo->x,
-                                            player->mo->y, linetarget->x,
-                                            linetarget->y);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireBlasterPL1
-//
-//----------------------------------------------------------------------------
-
-void A_FireBlasterPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-    int damage;
-
-    mo = player->mo;
-    S_StartSound(mo, sfx_gldhit);
-    player->ammo[am_blaster] -= USE_BLSR_AMMO_1;
-    P_BulletSlope(mo);
-    damage = HITDICE(4);
-    angle = mo->angle;
-    if (player->refire)
-    {
-        angle += P_SubRandom() << 18;
-    }
-    PuffType = MT_BLASTERPUFF1;
-    P_LineAttack(mo, angle, MISSILERANGE, bulletslope, damage);
-    S_StartSound(player->mo, sfx_blssht);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireBlasterPL2
-//
-//----------------------------------------------------------------------------
-
-void A_FireBlasterPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    player->ammo[am_blaster] -=
-        deathmatch ? USE_BLSR_AMMO_1 : USE_BLSR_AMMO_2;
-    mo = P_SpawnPlayerMissile(player->mo, MT_BLASTERFX1);
-    if (mo)
-    {
-        mo->thinker.function = P_BlasterMobjThinker;
-    }
-    S_StartSound(player->mo, sfx_blssht);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireGoldWandPL1
-//
-//----------------------------------------------------------------------------
-
-void A_FireGoldWandPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-    int damage;
-
-    mo = player->mo;
-    player->ammo[am_goldwand] -= USE_GWND_AMMO_1;
-    P_BulletSlope(mo);
-    damage = 7 + (P_Random() & 7);
-    angle = mo->angle;
-    if (player->refire)
-    {
-        angle += P_SubRandom() << 18;
-    }
-    PuffType = MT_GOLDWANDPUFF1;
-    P_LineAttack(mo, angle, MISSILERANGE, bulletslope, damage);
-    S_StartSound(player->mo, sfx_gldhit);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireGoldWandPL2
-//
-//----------------------------------------------------------------------------
-
-void A_FireGoldWandPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    mobj_t *mo;
-    angle_t angle;
-    int damage;
-    fixed_t momz;
-
-    mo = player->mo;
-    player->ammo[am_goldwand] -=
-        deathmatch ? USE_GWND_AMMO_1 : USE_GWND_AMMO_2;
-    PuffType = MT_GOLDWANDPUFF2;
-    P_BulletSlope(mo);
-    momz = FixedMul(mobjinfo[MT_GOLDWANDFX2].speed, bulletslope);
-    P_SpawnMissileAngle(mo, MT_GOLDWANDFX2, mo->angle - (ANG45 / 8), momz);
-    P_SpawnMissileAngle(mo, MT_GOLDWANDFX2, mo->angle + (ANG45 / 8), momz);
-    angle = mo->angle - (ANG45 / 8);
-    for (i = 0; i < 5; i++)
-    {
-        damage = 1 + (P_Random() & 7);
-        P_LineAttack(mo, angle, MISSILERANGE, bulletslope, damage);
-        angle += ((ANG45 / 8) * 2) / 4;
-    }
-    S_StartSound(player->mo, sfx_gldhit);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireMacePL1B
-//
-//----------------------------------------------------------------------------
-
-void A_FireMacePL1B(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *pmo;
-    mobj_t *ball;
-    angle_t angle;
-
-    if (player->ammo[am_mace] < USE_MACE_AMMO_1)
-    {
-        return;
-    }
-    player->ammo[am_mace] -= USE_MACE_AMMO_1;
-    pmo = player->mo;
-
-    // Vanilla bug here:
-    // Original code here looks like:
-    //   (pmo->flags2 & MF2_FEETARECLIPPED != 0)
-    // C's operator precedence interprets this as:
-    //   (pmo->flags2 & (MF2_FEETARECLIPPED != 0))
-    // Which simplifies to:
-    //   (pmo->flags2 & 1)
-    ball = P_SpawnMobj(pmo->x, pmo->y, pmo->z + 28 * FRACUNIT
-                       - FOOTCLIPSIZE * (pmo->flags2 & 1), MT_MACEFX2);
-
-    ball->momz = 2 * FRACUNIT + ((player->lookdir) << (FRACBITS - 5));
-    angle = pmo->angle;
-    ball->target = pmo;
-    ball->angle = angle;
-    ball->z += (player->lookdir) << (FRACBITS - 4);
-    angle >>= ANGLETOFINESHIFT;
-    ball->momx = (pmo->momx >> 1)
-        + FixedMul(ball->info->speed, finecosine[angle]);
-    ball->momy = (pmo->momy >> 1)
-        + FixedMul(ball->info->speed, finesine[angle]);
-    S_StartSound(ball, sfx_lobsht);
-    P_CheckMissileSpawn(ball);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireMacePL1
-//
-//----------------------------------------------------------------------------
-
-void A_FireMacePL1(mobj_t *mobj, player_t * player, pspdef_t * psp)
-{
-    mobj_t *ball;
-
-    if (P_Random() < 28)
-    {
-        A_FireMacePL1B(mobj, player, psp);
-        return;
-    }
-    if (player->ammo[am_mace] < USE_MACE_AMMO_1)
-    {
-        return;
-    }
-    player->ammo[am_mace] -= USE_MACE_AMMO_1;
-    psp->sx = ((P_Random() & 3) - 2) * FRACUNIT;
-    psp->sy = WEAPONTOP + (P_Random() & 3) * FRACUNIT;
-    ball = P_SPMAngle(player->mo, MT_MACEFX1, player->mo->angle
-                      + (((P_Random() & 7) - 4) << 24));
-    if (ball)
-    {
-        ball->special1.i = 16;    // tics till dropoff
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MacePL1Check
-//
-//----------------------------------------------------------------------------
-
-void A_MacePL1Check(mobj_t * ball, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-
-    if (ball->special1.i == 0)
-    {
-        return;
-    }
-    ball->special1.i -= 4;
-    if (ball->special1.i > 0)
-    {
-        return;
-    }
-    ball->special1.i = 0;
-    ball->flags2 |= MF2_LOGRAV;
-    angle = ball->angle >> ANGLETOFINESHIFT;
-    ball->momx = FixedMul(7 * FRACUNIT, finecosine[angle]);
-    ball->momy = FixedMul(7 * FRACUNIT, finesine[angle]);
-    ball->momz -= ball->momz >> 1;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MaceBallImpact
-//
-//----------------------------------------------------------------------------
-
-void A_MaceBallImpact(mobj_t * ball, player_t *player, pspdef_t *psp)
-{
-    if ((ball->z <= ball->floorz) && (P_HitFloor(ball) != FLOOR_SOLID))
-    {                           // Landed in some sort of liquid
-        P_RemoveMobj(ball);
-        return;
-    }
-    if ((ball->health != MAGIC_JUNK) && (ball->z <= ball->floorz)
-        && ball->momz)
-    {                           // Bounce
-        ball->health = MAGIC_JUNK;
-        ball->momz = (ball->momz * 192) >> 8;
-        ball->flags2 &= ~MF2_FLOORBOUNCE;
-        P_SetMobjState(ball, ball->info->spawnstate);
-        S_StartSound(ball, sfx_bounce);
-    }
-    else
-    {                           // Explode
-        ball->flags |= MF_NOGRAVITY;
-        ball->flags2 &= ~MF2_LOGRAV;
-        S_StartSound(ball, sfx_lobhit);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MaceBallImpact2
-//
-//----------------------------------------------------------------------------
-
-void A_MaceBallImpact2(mobj_t * ball, player_t *player, pspdef_t *psp)
-{
-    mobj_t *tiny;
-    angle_t angle;
-
-    if ((ball->z <= ball->floorz) && (P_HitFloor(ball) != FLOOR_SOLID))
-    {                           // Landed in some sort of liquid
-        P_RemoveMobj(ball);
-        return;
-    }
-    if ((ball->z != ball->floorz) || (ball->momz < 2 * FRACUNIT))
-    {                           // Explode
-        ball->momx = ball->momy = ball->momz = 0;
-        ball->flags |= MF_NOGRAVITY;
-        ball->flags2 &= ~(MF2_LOGRAV | MF2_FLOORBOUNCE);
-    }
-    else
-    {                           // Bounce
-        ball->momz = (ball->momz * 192) >> 8;
-        P_SetMobjState(ball, ball->info->spawnstate);
-
-        tiny = P_SpawnMobj(ball->x, ball->y, ball->z, MT_MACEFX3);
-        angle = ball->angle + ANG90;
-        tiny->target = ball->target;
-        tiny->angle = angle;
-        angle >>= ANGLETOFINESHIFT;
-        tiny->momx = (ball->momx >> 1) + FixedMul(ball->momz - FRACUNIT,
-                                                  finecosine[angle]);
-        tiny->momy = (ball->momy >> 1) + FixedMul(ball->momz - FRACUNIT,
-                                                  finesine[angle]);
-        tiny->momz = ball->momz;
-        P_CheckMissileSpawn(tiny);
-
-        tiny = P_SpawnMobj(ball->x, ball->y, ball->z, MT_MACEFX3);
-        angle = ball->angle - ANG90;
-        tiny->target = ball->target;
-        tiny->angle = angle;
-        angle >>= ANGLETOFINESHIFT;
-        tiny->momx = (ball->momx >> 1) + FixedMul(ball->momz - FRACUNIT,
-                                                  finecosine[angle]);
-        tiny->momy = (ball->momy >> 1) + FixedMul(ball->momz - FRACUNIT,
-                                                  finesine[angle]);
-        tiny->momz = ball->momz;
-        P_CheckMissileSpawn(tiny);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireMacePL2
-//
-//----------------------------------------------------------------------------
-
-void A_FireMacePL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    player->ammo[am_mace] -= deathmatch ? USE_MACE_AMMO_1 : USE_MACE_AMMO_2;
-    mo = P_SpawnPlayerMissile(player->mo, MT_MACEFX4);
-    if (mo)
-    {
-        mo->momx += player->mo->momx;
-        mo->momy += player->mo->momy;
-        mo->momz = 2 * FRACUNIT + ((player->lookdir) << (FRACBITS - 5));
-        if (linetarget)
-        {
-            mo->special1.m = linetarget;
-        }
-    }
-    S_StartSound(player->mo, sfx_lobsht);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_DeathBallImpact
-//
-//----------------------------------------------------------------------------
-
-void A_DeathBallImpact(mobj_t * ball, player_t *player, pspdef_t *psp)
-{
-    int i;
-    mobj_t *target;
-    angle_t angle;
-    boolean newAngle;
-
-    if ((ball->z <= ball->floorz) && (P_HitFloor(ball) != FLOOR_SOLID))
-    {                           // Landed in some sort of liquid
-        P_RemoveMobj(ball);
-        return;
-    }
-    if ((ball->z <= ball->floorz) && ball->momz)
-    {                           // Bounce
-        newAngle = false;
-        target = (mobj_t *) ball->special1.m;
-        if (target)
-        {
-            if (!(target->flags & MF_SHOOTABLE))
-            {                   // Target died
-                ball->special1.m = NULL;
-            }
-            else
-            {                   // Seek
-                angle = R_PointToAngle2(ball->x, ball->y,
-                                        target->x, target->y);
-                newAngle = true;
-            }
-        }
-        else
-        {                       // Find new target
-            angle = 0;
-            for (i = 0; i < 16; i++)
-            {
-                P_AimLineAttack(ball, angle, 10 * 64 * FRACUNIT);
-                if (linetarget && ball->target != linetarget)
-                {
-                    ball->special1.m = linetarget;
-                    angle = R_PointToAngle2(ball->x, ball->y,
-                                            linetarget->x, linetarget->y);
-                    newAngle = true;
-                    break;
-                }
-                angle += ANG45 / 2;
-            }
-        }
-        if (newAngle)
-        {
-            ball->angle = angle;
-            angle >>= ANGLETOFINESHIFT;
-            ball->momx = FixedMul(ball->info->speed, finecosine[angle]);
-            ball->momy = FixedMul(ball->info->speed, finesine[angle]);
-        }
-        P_SetMobjState(ball, ball->info->spawnstate);
-        S_StartSound(ball, sfx_pstop);
-    }
-    else
-    {                           // Explode
-        ball->flags |= MF_NOGRAVITY;
-        ball->flags2 &= ~MF2_LOGRAV;
-        S_StartSound(ball, sfx_phohit);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SpawnRippers
-//
-//----------------------------------------------------------------------------
-
-void A_SpawnRippers(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    unsigned int i;
-    angle_t angle;
-    mobj_t *ripper;
-
-    for (i = 0; i < 8; i++)
-    {
-        ripper = P_SpawnMobj(actor->x, actor->y, actor->z, MT_RIPPER);
-        angle = i * ANG45;
-        ripper->target = actor->target;
-        ripper->angle = angle;
-        angle >>= ANGLETOFINESHIFT;
-        ripper->momx = FixedMul(ripper->info->speed, finecosine[angle]);
-        ripper->momy = FixedMul(ripper->info->speed, finesine[angle]);
-        P_CheckMissileSpawn(ripper);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireCrossbowPL1
-//
-//----------------------------------------------------------------------------
-
-void A_FireCrossbowPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *pmo;
-
-    pmo = player->mo;
-    player->ammo[am_crossbow] -= USE_CBOW_AMMO_1;
-    P_SpawnPlayerMissile(pmo, MT_CRBOWFX1);
-    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle - (ANG45 / 10));
-    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle + (ANG45 / 10));
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireCrossbowPL2
-//
-//----------------------------------------------------------------------------
-
-void A_FireCrossbowPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *pmo;
-
-    pmo = player->mo;
-    player->ammo[am_crossbow] -=
-        deathmatch ? USE_CBOW_AMMO_1 : USE_CBOW_AMMO_2;
-    P_SpawnPlayerMissile(pmo, MT_CRBOWFX2);
-    P_SPMAngle(pmo, MT_CRBOWFX2, pmo->angle - (ANG45 / 10));
-    P_SPMAngle(pmo, MT_CRBOWFX2, pmo->angle + (ANG45 / 10));
-    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle - (ANG45 / 5));
-    P_SPMAngle(pmo, MT_CRBOWFX3, pmo->angle + (ANG45 / 5));
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_BoltSpark
-//
-//----------------------------------------------------------------------------
-
-void A_BoltSpark(mobj_t * bolt, player_t *player, pspdef_t *psp)
-{
-    mobj_t *spark;
-
-    if (P_Random() > 50)
-    {
-        spark = P_SpawnMobj(bolt->x, bolt->y, bolt->z, MT_CRBOWFX4);
-        spark->x += P_SubRandom() << 10;
-        spark->y += P_SubRandom() << 10;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireSkullRodPL1
-//
-//----------------------------------------------------------------------------
-
-void A_FireSkullRodPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    if (player->ammo[am_skullrod] < USE_SKRD_AMMO_1)
-    {
-        return;
-    }
-    player->ammo[am_skullrod] -= USE_SKRD_AMMO_1;
-    mo = P_SpawnPlayerMissile(player->mo, MT_HORNRODFX1);
-    // Randomize the first frame
-    if (mo && P_Random() > 128)
-    {
-        P_SetMobjState(mo, S_HRODFX1_2);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireSkullRodPL2
-//
-// The special2 field holds the player number that shot the rain missile.
-// The special1 field is used for the seeking routines, then as a counter
-// for the sound looping.
-//
-//----------------------------------------------------------------------------
-
-void A_FireSkullRodPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->ammo[am_skullrod] -=
-        deathmatch ? USE_SKRD_AMMO_1 : USE_SKRD_AMMO_2;
-    P_SpawnPlayerMissile(player->mo, MT_HORNRODFX2);
-    // Use MissileMobj instead of the return value from
-    // P_SpawnPlayerMissile because we need to give info to the mobj
-    // even if it exploded immediately.
-    if (netgame)
-    {                           // Multi-player game
-        MissileMobj->special2.i = P_GetPlayerNum(player);
-    }
-    else
-    {                           // Always use red missiles in single player games
-        MissileMobj->special2.i = 2;
-    }
-    if (linetarget)
-    {
-        MissileMobj->special1.m = linetarget;
-    }
-    S_StartSound(MissileMobj, sfx_hrnpow);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SkullRodPL2Seek
-//
-//----------------------------------------------------------------------------
-
-void A_SkullRodPL2Seek(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 30);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_AddPlayerRain
-//
-//----------------------------------------------------------------------------
-
-void A_AddPlayerRain(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    int playerNum;
-    player_t *player;
-
-    playerNum = netgame ? actor->special2.i : 0;
-    if (!playeringame[playerNum])
-    {                           // Player left the game
-        return;
-    }
-    player = &players[playerNum];
-    if (player->health <= 0)
-    {                           // Player is dead
-        return;
-    }
-    if (player->rain1 && player->rain2)
-    {                           // Terminate an active rain
-        if (player->rain1->health < player->rain2->health)
-        {
-            if (player->rain1->health > 16)
-            {
-                player->rain1->health = 16;
-            }
-            player->rain1 = NULL;
-        }
-        else
-        {
-            if (player->rain2->health > 16)
-            {
-                player->rain2->health = 16;
-            }
-            player->rain2 = NULL;
-        }
-    }
-    // Add rain mobj to list
-    if (player->rain1)
-    {
-        player->rain2 = actor;
-    }
-    else
-    {
-        player->rain1 = actor;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SkullRodStorm
-//
-//----------------------------------------------------------------------------
-
-void A_SkullRodStorm(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    fixed_t x;
-    fixed_t y;
-    mobj_t *mo;
-    int playerNum;
-    player_t *player;
-
-    if (actor->health-- == 0)
-    {
-        P_SetMobjState(actor, S_NULL);
-        playerNum = netgame ? actor->special2.i : 0;
-        if (!playeringame[playerNum])
-        {                       // Player left the game
-            return;
-        }
-        player = &players[playerNum];
-        if (player->health <= 0)
-        {                       // Player is dead
-            return;
-        }
-        if (player->rain1 == actor)
-        {
-            player->rain1 = NULL;
-        }
-        else if (player->rain2 == actor)
-        {
-            player->rain2 = NULL;
-        }
-        return;
-    }
-    if (P_Random() < 25)
-    {                           // Fudge rain frequency
-        return;
-    }
-    x = actor->x + ((P_Random() & 127) - 64) * FRACUNIT;
-    y = actor->y + ((P_Random() & 127) - 64) * FRACUNIT;
-    mo = P_SpawnMobj(x, y, ONCEILINGZ, MT_RAINPLR1 + actor->special2.i);
-    mo->target = actor->target;
-    mo->momx = 1;               // Force collision detection
-    mo->momz = -mo->info->speed;
-    mo->special2.i = actor->special2.i;     // Transfer player number
-    P_CheckMissileSpawn(mo);
-    if (!(actor->special1.i & 31))
-    {
-        S_StartSound(actor, sfx_ramrain);
-    }
-    actor->special1.i++;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_RainImpact
-//
-//----------------------------------------------------------------------------
-
-void A_RainImpact(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->z > actor->floorz)
-    {
-        P_SetMobjState(actor, S_RAINAIRXPLR1_1 + actor->special2.i);
-    }
-    else if (P_Random() < 40)
-    {
-        P_HitFloor(actor);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_HideInCeiling
-//
-//----------------------------------------------------------------------------
-
-void A_HideInCeiling(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->z = actor->ceilingz + 4 * FRACUNIT;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FirePhoenixPL1
-//
-//----------------------------------------------------------------------------
-
-void A_FirePhoenixPL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-
-    player->ammo[am_phoenixrod] -= USE_PHRD_AMMO_1;
-    P_SpawnPlayerMissile(player->mo, MT_PHOENIXFX1);
-    //P_SpawnPlayerMissile(player->mo, MT_MNTRFX2);
-    angle = player->mo->angle + ANG180;
-    angle >>= ANGLETOFINESHIFT;
-    player->mo->momx += FixedMul(4 * FRACUNIT, finecosine[angle]);
-    player->mo->momy += FixedMul(4 * FRACUNIT, finesine[angle]);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_PhoenixPuff
-//
-//----------------------------------------------------------------------------
-
-void A_PhoenixPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *puff;
-    angle_t angle;
-
-    P_SeekerMissile(actor, ANG1_X * 5, ANG1_X * 10);
-    puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
-    angle = actor->angle + ANG90;
-    angle >>= ANGLETOFINESHIFT;
-    puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]);
-    puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]);
-    puff->momz = 0;
-    puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
-    angle = actor->angle - ANG90;
-    angle >>= ANGLETOFINESHIFT;
-    puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]);
-    puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]);
-    puff->momz = 0;
-}
-
-//
-// This function was present in the Heretic 1.0 executable for the
-// removed "secondary phoenix flash" object (MT_PHOENIXFX_REMOVED).
-// The purpose of this object is unknown, as is this function.
-//
-
-void A_RemovedPhoenixFunc(mobj_t *actor, player_t * player, pspdef_t * psp)
-{
-    I_Error("Action function invoked for removed Phoenix action!");
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_InitPhoenixPL2
-//
-//----------------------------------------------------------------------------
-
-void A_InitPhoenixPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->flamecount = FLAME_THROWER_TICS;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FirePhoenixPL2
-//
-// Flame thrower effect.
-//
-//----------------------------------------------------------------------------
-
-void A_FirePhoenixPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    mobj_t *pmo;
-    angle_t angle;
-    fixed_t x, y, z;
-    fixed_t slope;
-
-    if (--player->flamecount == 0)
-    {                           // Out of flame
-        P_SetPsprite(player, ps_weapon, S_PHOENIXATK2_4);
-        player->refire = 0;
-        return;
-    }
-    pmo = player->mo;
-    angle = pmo->angle;
-    x = pmo->x + (P_SubRandom() << 9);
-    y = pmo->y + (P_SubRandom() << 9);
-    z = pmo->z + 26 * FRACUNIT + ((player->lookdir) << FRACBITS) / 173;
-    if (pmo->flags2 & MF2_FEETARECLIPPED)
-    {
-        z -= FOOTCLIPSIZE;
-    }
-    slope = ((player->lookdir) << FRACBITS) / 173 + (FRACUNIT / 10);
-    mo = P_SpawnMobj(x, y, z, MT_PHOENIXFX2);
-    mo->target = pmo;
-    mo->angle = angle;
-    mo->momx = pmo->momx + FixedMul(mo->info->speed,
-                                    finecosine[angle >> ANGLETOFINESHIFT]);
-    mo->momy = pmo->momy + FixedMul(mo->info->speed,
-                                    finesine[angle >> ANGLETOFINESHIFT]);
-    mo->momz = FixedMul(mo->info->speed, slope);
-    if (!player->refire || !(leveltime % 38))
-    {
-        S_StartSound(player->mo, sfx_phopow);
-    }
-    P_CheckMissileSpawn(mo);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_ShutdownPhoenixPL2
-//
-//----------------------------------------------------------------------------
-
-void A_ShutdownPhoenixPL2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->ammo[am_phoenixrod] -= USE_PHRD_AMMO_2;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FlameEnd
-//
-//----------------------------------------------------------------------------
-
-void A_FlameEnd(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->momz += (fixed_t)(1.5 * FRACUNIT);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FloatPuff
-//
-//----------------------------------------------------------------------------
-
-void A_FloatPuff(mobj_t * puff, player_t *player, pspdef_t *psp)
-{
-    puff->momz += (fixed_t)(1.8 * FRACUNIT);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_GauntletAttack
-//
-//---------------------------------------------------------------------------
-
-void A_GauntletAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-    int randVal;
-    fixed_t dist;
-
-    psp->sx = ((P_Random() & 3) - 2) * FRACUNIT;
-    psp->sy = WEAPONTOP + (P_Random() & 3) * FRACUNIT;
-    angle = player->mo->angle;
-    if (player->powers[pw_weaponlevel2])
-    {
-        damage = HITDICE(2);
-        dist = 4 * MELEERANGE;
-        angle += P_SubRandom() << 17;
-        PuffType = MT_GAUNTLETPUFF2;
-    }
-    else
-    {
-        damage = HITDICE(2);
-        dist = MELEERANGE + 1;
-        angle += P_SubRandom() << 18;
-        PuffType = MT_GAUNTLETPUFF1;
-    }
-    slope = P_AimLineAttack(player->mo, angle, dist);
-    P_LineAttack(player->mo, angle, dist, slope, damage);
-    if (!linetarget)
-    {
-        if (P_Random() > 64)
-        {
-            player->extralight = !player->extralight;
-        }
-        S_StartSound(player->mo, sfx_gntful);
-        return;
-    }
-    randVal = P_Random();
-    if (randVal < 64)
-    {
-        player->extralight = 0;
-    }
-    else if (randVal < 160)
-    {
-        player->extralight = 1;
-    }
-    else
-    {
-        player->extralight = 2;
-    }
-    if (player->powers[pw_weaponlevel2])
-    {
-        P_GiveBody(player, damage >> 1);
-        S_StartSound(player->mo, sfx_gntpow);
-    }
-    else
-    {
-        S_StartSound(player->mo, sfx_gnthit);
-    }
-    // turn to face target
-    angle = R_PointToAngle2(player->mo->x, player->mo->y,
-                            linetarget->x, linetarget->y);
-    if (angle - player->mo->angle > ANG180)
-    {
-        if ((signed int) (angle - player->mo->angle) < -ANG90 / 20)
-            player->mo->angle = angle + ANG90 / 21;
-        else
-            player->mo->angle -= ANG90 / 20;
-    }
-    else
-    {
-        if (angle - player->mo->angle > ANG90 / 20)
-            player->mo->angle = angle - ANG90 / 21;
-        else
-            player->mo->angle += ANG90 / 20;
-    }
-    player->mo->flags |= MF_JUSTATTACKED;
-}
-
-void A_Light0(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->extralight = 0;
-}
-
-void A_Light1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->extralight = 1;
-}
-
-void A_Light2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->extralight = 2;
-}
-
-//------------------------------------------------------------------------
-//
-// PROC P_SetupPsprites
-//
-// Called at start of level for each player
-//
-//------------------------------------------------------------------------
-
-void P_SetupPsprites(player_t * player)
-{
-    int i;
-
-    // Remove all psprites
-    for (i = 0; i < NUMPSPRITES; i++)
-    {
-        player->psprites[i].state = NULL;
-    }
-    // Spawn the ready weapon
-    player->pendingweapon = player->readyweapon;
-    P_BringUpWeapon(player);
-}
-
-//------------------------------------------------------------------------
-//
-// PROC P_MovePsprites
-//
-// Called every tic by player thinking routine
-//
-//------------------------------------------------------------------------
-
-void P_MovePsprites(player_t * player)
-{
-    int i;
-    pspdef_t *psp;
-
-    psp = &player->psprites[0];
-    for (i = 0; i < NUMPSPRITES; i++, psp++)
-    {
-        if (psp->state != 0)  // a null state means not active
-        {
-            // drop tic count and possibly change state
-            if (psp->tics != -1)        // a -1 tic count never changes
-            {
-                psp->tics--;
-                if (!psp->tics)
-                {
-                    P_SetPsprite(player, i, psp->state->nextstate);
-                }
-            }
-        }
-    }
-    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
-    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
-}
diff --git a/games/NXDoom/src/heretic/p_saveg.c b/games/NXDoom/src/heretic/p_saveg.c
deleted file mode 100644
index c4a2f131d..000000000
--- a/games/NXDoom/src/heretic/p_saveg.c
+++ /dev/null
@@ -1,1925 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_tick.c
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "v_video.h"
-
-static FILE *SaveGameFP;
-
-int vanilla_savegame_limit = 1;
-
-
-//==========================================================================
-//
-// SV_Filename
-//
-// Generate the filename to use for a particular savegame slot.
-// Returns a malloc()'d buffer that must be freed by the caller.
-//
-//==========================================================================
-
-char *SV_Filename(int slot)
-{
-    char *filename;
-    size_t filename_len;
-
-    filename_len = strlen(savegamedir) + strlen(SAVEGAMENAME) + 8;
-    filename = malloc(filename_len);
-    M_snprintf(filename, filename_len,
-               "%s" SAVEGAMENAME "%d.hsg", savegamedir, slot);
-
-    return filename;
-}
-
-//==========================================================================
-//
-// SV_Open
-//
-//==========================================================================
-
-void SV_Open(char *fileName)
-{
-    SaveGameFP = M_fopen(fileName, "wb");
-}
-
-void SV_OpenRead(char *filename)
-{
-    SaveGameFP = M_fopen(filename, "rb");
-
-    if (SaveGameFP == NULL)
-    {
-        I_Error("Could not load savegame %s", filename);
-    }
-}
-
-//==========================================================================
-//
-// SV_WriteSaveGameEOF
-//
-//==========================================================================
-
-void SV_WriteSaveGameEOF(void)
-{
-    SV_WriteByte(SAVE_GAME_TERMINATOR);
-
-    // Enforce the same savegame size limit as in Vanilla Heretic
-
-    if (vanilla_savegame_limit && ftell(SaveGameFP) > SAVEGAMESIZE)
-    {
-        I_Error("Savegame buffer overrun");
-    }
-}
-
-//==========================================================================
-//
-// SV_Close
-//
-//==========================================================================
-
-void SV_Close(void)
-{
-    if (SaveGameFP)
-    {
-        fclose(SaveGameFP);
-        SaveGameFP = NULL;
-    }
-}
-
-//==========================================================================
-//
-// SV_Write
-//
-//==========================================================================
-
-void SV_Write(void *buffer, int size)
-{
-    fwrite(buffer, size, 1, SaveGameFP);
-}
-
-void SV_WriteByte(byte val)
-{
-    SV_Write(&val, sizeof(byte));
-}
-
-void SV_WriteWord(unsigned short val)
-{
-    val = SHORT(val);
-    SV_Write(&val, sizeof(unsigned short));
-}
-
-void SV_WriteLong(unsigned int val)
-{
-    val = LONG(val);
-    SV_Write(&val, sizeof(int));
-}
-
-void SV_WritePtr(const void *ptr)
-{
-    long val = (long)(intptr_t) ptr;
-
-    SV_WriteLong(val & 0xffffffff);
-}
-
-//==========================================================================
-//
-// SV_Read
-//
-//==========================================================================
-
-void SV_Read(void *buffer, int size)
-{
-    int retval = fread(buffer, 1, size, SaveGameFP);
-    if (retval != size)
-    {
-        I_Error("Incomplete read in SV_Read: Expected %d, got %d bytes",
-            size, retval);
-    }
-}
-
-byte SV_ReadByte(void)
-{
-    byte result;
-    SV_Read(&result, sizeof(byte));
-    return result;
-}
-
-uint16_t SV_ReadWord(void)
-{
-    uint16_t result;
-    SV_Read(&result, sizeof(unsigned short));
-    return SHORT(result);
-}
-
-uint32_t SV_ReadLong(void)
-{
-    uint32_t result;
-    SV_Read(&result, sizeof(int));
-    return LONG(result);
-}
-
-//
-// ticcmd_t
-//
-
-static void saveg_read_ticcmd_t(ticcmd_t *str)
-{
-    // char forwardmove;
-    str->forwardmove = SV_ReadByte();
-
-    // char sidemove;
-    str->sidemove = SV_ReadByte();
-
-    // short angleturn;
-    str->angleturn = SV_ReadWord();
-
-    // short consistancy;
-    str->consistancy = SV_ReadWord();
-
-    // byte chatchar;
-    str->chatchar = SV_ReadByte();
-
-    // byte buttons;
-    str->buttons = SV_ReadByte();
-
-    // byte lookfly;
-    str->lookfly = SV_ReadByte();
-
-    // byte arti;
-    str->arti = SV_ReadByte();
-}
-
-static void saveg_write_ticcmd_t(ticcmd_t *str)
-{
-    // char forwardmove;
-    SV_WriteByte(str->forwardmove);
-
-    // char sidemove;
-    SV_WriteByte(str->sidemove);
-
-    // short angleturn;
-    SV_WriteWord(str->angleturn);
-
-    // short consistancy;
-    SV_WriteWord(str->consistancy);
-
-    // byte chatchar;
-    SV_WriteByte(str->chatchar);
-
-    // byte buttons;
-    SV_WriteByte(str->buttons);
-
-    // byte lookfly;
-    SV_WriteByte(str->lookfly);
-
-    // byte arti;
-    SV_WriteByte(str->arti);
-}
-
-//
-// inventory_t
-//
-
-static void saveg_read_inventory_t(inventory_t *str)
-{
-    // int type;
-    str->type = SV_ReadLong();
-
-    // int count;
-    str->count = SV_ReadLong();
-}
-
-static void saveg_write_inventory_t(inventory_t *str)
-{
-    // int type;
-    SV_WriteLong(str->type);
-
-    // int count;
-    SV_WriteLong(str->count);
-}
-
-
-//
-// state_t *
-//
-
-static void saveg_read_state_ptr(state_t **state)
-{
-    int statenum;
-
-    statenum = SV_ReadLong();
-
-    // We have read a state number, but it is indexed according to the state
-    // table in Vanilla Heretic v1.3. To support v1.0 HHE patches we have
-    // three extra states, so map the state number to our internal state
-    // number.
-
-    if (statenum >= S_PHOENIXFXIX_1)
-    {
-        statenum = (statenum - S_PHOENIXFXIX_1) + S_PHOENIXPUFF1;
-    }
-
-    if (statenum == 0)
-    {
-        *state = NULL;
-    }
-    else
-    {
-        *state = &states[statenum];
-    }
-}
-
-static void saveg_write_state_ptr(state_t *state)
-{
-    int statenum;
-
-    // NULL states are just written as zero.
-
-    if (state == NULL)
-    {
-        SV_WriteLong(0);
-        return;
-    }
-
-    statenum = state - states;
-
-    // Our internal state table has three extra states than Vanilla, so map
-    // to the state numbers used by Vanilla Heretic v1.3 for savegame
-    // compatibility.
-
-    if (statenum >= S_PHOENIXPUFF1)
-    {
-        statenum = (statenum - S_PHOENIXPUFF1) + S_PHOENIXFXIX_1;
-    }
-    else if (statenum >= S_PHOENIXFXIX_1)
-    {
-        // Now we're really in trouble. This state doesn't exist in Vanilla
-        // Heretic v1.3 (but does in v1.0). Map to a frame that might be
-        // vaguely sensible.
-
-        statenum = S_PHOENIXFXI1_8;
-    }
-
-    SV_WriteLong(statenum);
-}
-
-
-//
-// pspdef_t
-//
-
-static void saveg_read_pspdef_t(pspdef_t *str)
-{
-    // state_t *state;
-    saveg_read_state_ptr(&str->state);
-
-    // int tics;
-    str->tics = SV_ReadLong();
-
-    // fixed_t sx, sy;
-    str->sx = SV_ReadLong();
-    str->sy = SV_ReadLong();
-}
-
-static void saveg_write_pspdef_t(pspdef_t *str)
-{
-    // state_t *state;
-    saveg_write_state_ptr(str->state);
-
-    // int tics;
-    SV_WriteLong(str->tics);
-
-    // fixed_t sx, sy;
-    SV_WriteLong(str->sx);
-    SV_WriteLong(str->sy);
-}
-
-
-//
-// player_t
-//
-
-static void saveg_read_player_t(player_t *str)
-{
-    int i;
-
-    // mobj_t *mo;
-    SV_ReadLong();
-    str->mo = NULL;
-
-    // playerstate_t playerstate;
-    str->playerstate = SV_ReadLong();
-
-    // ticcmd_t cmd;
-    saveg_read_ticcmd_t(&str->cmd);
-
-    // fixed_t viewz;
-    str->viewz = SV_ReadLong();
-
-    // fixed_t viewheight;
-    str->viewheight = SV_ReadLong();
-
-    // fixed_t deltaviewheight;
-    str->deltaviewheight = SV_ReadLong();
-
-    // fixed_t bob;
-    str->bob = SV_ReadLong();
-
-    // int flyheight;
-    str->flyheight = SV_ReadLong();
-
-    // int lookdir;
-    str->lookdir = SV_ReadLong();
-
-    // boolean centering;
-    str->centering = SV_ReadLong();
-
-    // int health;
-    str->health = SV_ReadLong();
-
-    // int armorpoints, armortype;
-    str->armorpoints = SV_ReadLong();
-    str->armortype = SV_ReadLong();
-
-    // inventory_t inventory[NUMINVENTORYSLOTS];
-    for (i=0; i<NUMINVENTORYSLOTS; ++i)
-    {
-        saveg_read_inventory_t(&str->inventory[i]);
-    }
-
-    // artitype_t readyArtifact;
-    str->readyArtifact = SV_ReadLong();
-
-    // int artifactCount;
-    str->artifactCount = SV_ReadLong();
-
-    // int inventorySlotNum;
-    str->inventorySlotNum = SV_ReadLong();
-
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
-    {
-        str->powers[i] = SV_ReadLong();
-    }
-
-    // boolean keys[NUM_KEY_TYPES];
-    for (i = 0; i < NUM_KEY_TYPES; ++i)
-    {
-        str->keys[i] = SV_ReadLong();
-    }
-
-    // boolean backpack;
-    str->backpack = SV_ReadLong();
-
-    // signed int frags[MAXPLAYERS];
-    for (i=0; i<MAXPLAYERS; ++i)
-    {
-        str->frags[i] = SV_ReadLong();
-    }
-
-    // weapontype_t readyweapon;
-    str->readyweapon = SV_ReadLong();
-
-    // weapontype_t pendingweapon;
-    str->pendingweapon = SV_ReadLong();
-
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        str->weaponowned[i] = SV_ReadLong();
-    }
-
-    // int ammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        str->ammo[i] = SV_ReadLong();
-    }
-
-    // int maxammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        str->maxammo[i] = SV_ReadLong();
-    }
-
-    // int attackdown, usedown;
-    str->attackdown = SV_ReadLong();
-    str->usedown = SV_ReadLong();
-
-    // int cheats;
-    str->cheats = SV_ReadLong();
-
-    // int refire;
-    str->refire = SV_ReadLong();
-
-    // int killcount, itemcount, secretcount;
-    str->killcount = SV_ReadLong();
-    str->itemcount = SV_ReadLong();
-    str->secretcount = SV_ReadLong();
-
-    // char *message;
-    SV_ReadLong();
-    str->message = NULL;
-
-    // int messageTics;
-    str->messageTics = SV_ReadLong();
-
-    // int damagecount, bonuscount;
-    str->damagecount = SV_ReadLong();
-    str->bonuscount = SV_ReadLong();
-
-    // int flamecount;
-    str->flamecount = SV_ReadLong();
-
-    // mobj_t *attacker;
-    SV_ReadLong();
-    str->attacker = NULL;
-
-    // int extralight;
-    str->extralight = SV_ReadLong();
-
-    // int fixedcolormap;
-    str->fixedcolormap = SV_ReadLong();
-
-    // int colormap;
-    str->colormap = SV_ReadLong();
-
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
-    {
-        saveg_read_pspdef_t(&str->psprites[i]);
-    }
-
-    // boolean didsecret;
-    str->didsecret = SV_ReadLong();
-
-    // int chickenTics;
-    str->chickenTics = SV_ReadLong();
-
-    // int chickenPeck;
-    str->chickenPeck = SV_ReadLong();
-
-    // mobj_t *rain1;
-    SV_ReadLong();
-    str->rain1 = NULL;
-
-    // mobj_t *rain2;
-    SV_ReadLong();
-    str->rain2 = NULL;
-}
-
-static void saveg_write_player_t(player_t *str)
-{
-    int i;
-
-    // mobj_t *mo;
-    // pointer will be trashed, but it gets restored on load as
-    // the player number reference is stored in the mo.
-    SV_WritePtr(str->mo);
-
-    // playerstate_t playerstate;
-    SV_WriteLong(str->playerstate);
-
-    // ticcmd_t cmd;
-    saveg_write_ticcmd_t(&str->cmd);
-
-    // fixed_t viewz;
-    SV_WriteLong(str->viewz);
-
-    // fixed_t viewheight;
-    SV_WriteLong(str->viewheight);
-
-    // fixed_t deltaviewheight;
-    SV_WriteLong(str->deltaviewheight);
-
-    // fixed_t bob;
-    SV_WriteLong(str->bob);
-
-    // int flyheight;
-    SV_WriteLong(str->flyheight);
-
-    // int lookdir;
-    SV_WriteLong(str->lookdir);
-
-    // boolean centering;
-    SV_WriteLong(str->centering);
-
-    // int health;
-    SV_WriteLong(str->health);
-
-    // int armorpoints, armortype;
-    SV_WriteLong(str->armorpoints);
-    SV_WriteLong(str->armortype);
-
-    // inventory_t inventory[NUMINVENTORYSLOTS];
-    for (i=0; i<NUMINVENTORYSLOTS; ++i)
-    {
-        saveg_write_inventory_t(&str->inventory[i]);
-    }
-
-    // artitype_t readyArtifact;
-    SV_WriteLong(str->readyArtifact);
-
-    // int artifactCount;
-    SV_WriteLong(str->artifactCount);
-
-    // int inventorySlotNum;
-    SV_WriteLong(str->inventorySlotNum);
-
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
-    {
-        SV_WriteLong(str->powers[i]);
-    }
-
-    // boolean keys[NUMKEYS];
-    for (i = 0; i < NUM_KEY_TYPES; ++i)
-    {
-        SV_WriteLong(str->keys[i]);
-    }
-
-    // boolean backpack;
-    SV_WriteLong(str->backpack);
-
-    // signed int frags[MAXPLAYERS];
-    for (i=0; i<MAXPLAYERS; ++i)
-    {
-        SV_WriteLong(str->frags[i]);
-    }
-
-    // weapontype_t readyweapon;
-    SV_WriteLong(str->readyweapon);
-
-    // weapontype_t pendingweapon;
-    SV_WriteLong(str->pendingweapon);
-
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        SV_WriteLong(str->weaponowned[i]);
-    }
-
-    // int ammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        SV_WriteLong(str->ammo[i]);
-    }
-
-    // int maxammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        SV_WriteLong(str->maxammo[i]);
-    }
-
-    // int attackdown, usedown;
-    SV_WriteLong(str->attackdown);
-    SV_WriteLong(str->usedown);
-
-    // int cheats;
-    SV_WriteLong(str->cheats);
-
-    // int refire;
-    SV_WriteLong(str->refire);
-
-    // int killcount, itemcount, secretcount;
-    SV_WriteLong(str->killcount);
-    SV_WriteLong(str->itemcount);
-    SV_WriteLong(str->secretcount);
-
-    // char *message;
-    SV_WritePtr(str->message);
-
-    // int messageTics;
-    SV_WriteLong(str->messageTics);
-
-    // int damagecount, bonuscount;
-    SV_WriteLong(str->damagecount);
-    SV_WriteLong(str->bonuscount);
-
-    // int flamecount;
-    SV_WriteLong(str->flamecount);
-
-    // mobj_t *attacker;
-    SV_WritePtr(str->attacker);
-
-    // int extralight;
-    SV_WriteLong(str->extralight);
-
-    // int fixedcolormap;
-    SV_WriteLong(str->fixedcolormap);
-
-    // int colormap;
-    SV_WriteLong(str->colormap);
-
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
-    {
-        saveg_write_pspdef_t(&str->psprites[i]);
-    }
-
-    // boolean didsecret;
-    SV_WriteLong(str->didsecret);
-
-    // int chickenTics;
-    SV_WriteLong(str->chickenTics);
-
-    // int chickenPeck;
-    SV_WriteLong(str->chickenPeck);
-
-    // mobj_t *rain1;
-    SV_WritePtr(str->rain1);
-
-    // mobj_t *rain2;
-    SV_WritePtr(str->rain2);
-}
-
-
-//
-// mapthing_t
-//
-
-static void saveg_read_mapthing_t(mapthing_t *str)
-{
-    // short x, y;
-    str->x = SV_ReadWord();
-    str->y = SV_ReadWord();
-
-    // short angle;
-    str->angle = SV_ReadWord();
-
-    // short type;
-    str->type = SV_ReadWord();
-
-    // short options;
-    str->options = SV_ReadWord();
-}
-
-static void saveg_write_mapthing_t(mapthing_t *str)
-{
-    // short x, y;
-    SV_WriteWord(str->x);
-    SV_WriteWord(str->y);
-
-    // short angle;
-    SV_WriteWord(str->angle);
-
-    // short type;
-    SV_WriteWord(str->type);
-
-    // short options;
-    SV_WriteWord(str->options);
-}
-
-
-//
-// thinker_t
-//
-
-static void saveg_read_thinker_t(thinker_t *str)
-{
-    // struct thinker_s *prev, *next;
-    SV_ReadLong();
-    str->prev = NULL;
-    SV_ReadLong();
-    str->next = NULL;
-
-    // think_t function;
-    SV_ReadLong();
-    str->function = NULL;
-}
-
-static void saveg_write_thinker_t(thinker_t *str)
-{
-    // struct thinker_s *prev, *next;
-    SV_WritePtr(str->prev);
-    SV_WritePtr(str->next);
-
-    // think_t function;
-    SV_WritePtr(str->function);
-}
-
-
-//
-// specialval_t
-//
-
-static void saveg_read_specialval_t(specialval_t *str)
-{
-    // This can also be a mobj_t ptr, but we just assume it's
-    // an int. This is probably a really bad assumption that's
-    // likely to end in tears.
-
-    // int i;
-    str->i = SV_ReadLong();
-}
-
-static void saveg_write_specialval_t(specialval_t *str)
-{
-    // int i;
-    SV_WriteLong(str->i);
-}
-
-
-//
-// mobj_t
-//
-
-static void saveg_read_mobj_t(mobj_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // fixed_t x, y, z;
-    str->x = SV_ReadLong();
-    str->y = SV_ReadLong();
-    str->z = SV_ReadLong();
-
-    // struct mobj_s *snext, *sprev;
-    SV_ReadLong();
-    str->snext = NULL;
-    SV_ReadLong();
-    str->sprev = NULL;
-
-    // angle_t angle;
-    str->angle = SV_ReadLong();
-
-    // spritenum_t sprite;
-    str->sprite = SV_ReadLong();
-
-    // int frame;
-    str->frame = SV_ReadLong();
-
-    // struct mobj_s *bnext, *bprev;
-    SV_ReadLong();
-    str->bnext = NULL;
-    SV_ReadLong();
-    str->bprev = NULL;
-
-    // struct subsector_s *subsector;
-    SV_ReadLong();
-    str->subsector = NULL;
-
-    // fixed_t floorz, ceilingz;
-    str->floorz = SV_ReadLong();
-    str->ceilingz = SV_ReadLong();
-
-    // fixed_t radius, height;
-    str->radius = SV_ReadLong();
-    str->height = SV_ReadLong();
-
-    // fixed_t momx, momy, momz;
-    str->momx = SV_ReadLong();
-    str->momy = SV_ReadLong();
-    str->momz = SV_ReadLong();
-
-    // int validcount;
-    str->validcount = SV_ReadLong();
-
-    // mobjtype_t type;
-    str->type = SV_ReadLong();
-
-    // An extra thing type was added for v1.0 HHE compatibility.
-    // Map from the v1.3 thing type index to the internal one.
-    if (str->type >= MT_PHOENIXFX_REMOVED)
-    {
-        ++str->type;
-    }
-
-    // mobjinfo_t *info;
-    SV_ReadLong();
-    str->info = NULL;
-
-    // int tics;
-    str->tics = SV_ReadLong();
-
-    // state_t *state;
-    saveg_read_state_ptr(&str->state);
-
-    // int damage;
-    str->damage = SV_ReadLong();
-
-    // int flags;
-    str->flags = SV_ReadLong();
-
-    // int flags2;
-    str->flags2 = SV_ReadLong();
-
-    // specialval_t special1;
-    saveg_read_specialval_t(&str->special1);
-
-    // specialval_t special2;
-    saveg_read_specialval_t(&str->special2);
-
-    // Now we have a bunch of hacks to try to NULL out special values
-    // where special[12] contained a mobj_t pointer that isn't valid
-    // any more. This isn't in Vanilla but at least it stops the game
-    // from crashing.
-
-    switch (str->type)
-    {
-        // Gas pods use special2.m to point to the pod generator
-        // that made it.
-        case MT_POD:
-            str->special2.m = NULL;
-            break;
-
-        // Several thing types use special1.m to mean 'target':
-        case MT_MACEFX4:     // A_DeathBallImpact
-        case MT_WHIRLWIND:   // A_WhirlwindSeek
-        case MT_MUMMYFX1:    // A_MummyFX1Seek
-        case MT_HORNRODFX2:  // A_SkullRodPL2Seek
-        case MT_PHOENIXFX1:  // A_PhoenixPuff
-            str->special1.m = NULL;
-            break;
-
-        default:
-            break;
-    }
-
-    // int health;
-    str->health = SV_ReadLong();
-
-    // int movedir;
-    str->movedir = SV_ReadLong();
-
-    // int movecount;
-    str->movecount = SV_ReadLong();
-
-    // struct mobj_s *target;
-    SV_ReadLong();
-    str->target = NULL;
-
-    // int reactiontime;
-    str->reactiontime = SV_ReadLong();
-
-    // int threshold;
-    str->threshold = SV_ReadLong();
-
-    // struct player_s *player;
-    i = SV_ReadLong();
-    if (i != 0)
-    {
-        str->player = &players[i - 1];
-        str->player->mo = str;
-    }
-    else
-    {
-        str->player = NULL;
-    }
-
-    // int lastlook;
-    str->lastlook = SV_ReadLong();
-
-    // mapthing_t spawnpoint;
-    saveg_read_mapthing_t(&str->spawnpoint);
-}
-
-static void saveg_write_mobj_t(mobj_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // fixed_t x, y, z;
-    SV_WriteLong(str->x);
-    SV_WriteLong(str->y);
-    SV_WriteLong(str->z);
-
-    // struct mobj_s *snext, *sprev;
-    SV_WritePtr(str->snext);
-    SV_WritePtr(str->sprev);
-
-    // angle_t angle;
-    SV_WriteLong(str->angle);
-
-    // spritenum_t sprite;
-    SV_WriteLong(str->sprite);
-
-    // int frame;
-    SV_WriteLong(str->frame);
-
-    // struct mobj_s *bnext, *bprev;
-    SV_WritePtr(str->bnext);
-    SV_WritePtr(str->bprev);
-
-    // struct subsector_s *subsector;
-    SV_WritePtr(str->subsector);
-
-    // fixed_t floorz, ceilingz;
-    SV_WriteLong(str->floorz);
-    SV_WriteLong(str->ceilingz);
-
-    // fixed_t radius, height;
-    SV_WriteLong(str->radius);
-    SV_WriteLong(str->height);
-
-    // fixed_t momx, momy, momz;
-    SV_WriteLong(str->momx);
-    SV_WriteLong(str->momy);
-    SV_WriteLong(str->momz);
-
-    // int validcount;
-    SV_WriteLong(str->validcount);
-
-    // mobjtype_t type;
-    // Our mobjinfo table has an extra entry, for compatibility with v1.0
-    // HHE patches. So translate the internal thing type index to the
-    // equivalent for Vanilla Heretic v1.3, for savegame compatibility.
-
-    if (str->type > MT_PHOENIXFX_REMOVED)
-    {
-        SV_WriteLong(str->type - 1);
-    }
-    else if (str->type == MT_PHOENIXFX_REMOVED)
-    {
-        // This should never happen, but just in case, do something
-        // vaguely sensible ... ?
-        SV_WriteLong(MT_PHOENIXFX1);
-    }
-    else
-    {
-        SV_WriteLong(str->type);
-    }
-
-    // mobjinfo_t *info;
-    SV_WritePtr(str->info);
-
-    // int tics;
-    SV_WriteLong(str->tics);
-
-    // state_t *state;
-    saveg_write_state_ptr(str->state);
-
-    // int damage;
-    SV_WriteLong(str->damage);
-
-    // int flags;
-    SV_WriteLong(str->flags);
-
-    // int flags2;
-    SV_WriteLong(str->flags2);
-
-    // specialval_t special1;
-    saveg_write_specialval_t(&str->special1);
-
-    // specialval_t special2;
-    saveg_write_specialval_t(&str->special2);
-
-    // int health;
-    SV_WriteLong(str->health);
-
-    // int movedir;
-    SV_WriteLong(str->movedir);
-
-    // int movecount;
-    SV_WriteLong(str->movecount);
-
-    // struct mobj_s *target;
-    SV_WritePtr(str->target);
-
-    // int reactiontime;
-    SV_WriteLong(str->reactiontime);
-
-    // int threshold;
-    SV_WriteLong(str->threshold);
-
-    // struct player_s *player;
-    if (str->player != NULL)
-    {
-        SV_WriteLong(str->player - players + 1);
-    }
-    else
-    {
-        SV_WriteLong(0);
-    }
-
-    // int lastlook;
-    SV_WriteLong(str->lastlook);
-
-    // mapthing_t spawnpoint;
-    saveg_write_mapthing_t(&str->spawnpoint);
-}
-
-
-//
-// ceiling_t
-//
-
-static void saveg_read_ceiling_t(ceiling_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // ceiling_e type;
-    str->type = SV_ReadLong();
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // fixed_t bottomheight, topheight;
-    str->bottomheight = SV_ReadLong();
-    str->topheight = SV_ReadLong();
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // boolean crush;
-    str->crush = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int tag;
-    str->tag = SV_ReadLong();
-
-    // int olddirection;
-    str->olddirection = SV_ReadLong();
-}
-
-static void saveg_write_ceiling_t(ceiling_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // ceiling_e type;
-    SV_WriteLong(str->type);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // fixed_t bottomheight, topheight;
-    SV_WriteLong(str->bottomheight);
-    SV_WriteLong(str->topheight);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // boolean crush;
-    SV_WriteLong(str->crush);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int tag;
-    SV_WriteLong(str->tag);
-
-    // int olddirection;
-    SV_WriteLong(str->olddirection);
-}
-
-
-//
-// vldoor_t
-//
-
-static void saveg_read_vldoor_t(vldoor_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // vldoor_e type;
-    str->type = SV_ReadLong();
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // fixed_t topheight;
-    str->topheight = SV_ReadLong();
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int topwait;
-    str->topwait = SV_ReadLong();
-
-    // int topcountdown;
-    str->topcountdown = SV_ReadLong();
-}
-
-static void saveg_write_vldoor_t(vldoor_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // vldoor_e type;
-    SV_WriteLong(str->type);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // fixed_t topheight;
-    SV_WriteLong(str->topheight);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int topwait;
-    SV_WriteLong(str->topwait);
-
-    // int topcountdown;
-    SV_WriteLong(str->topcountdown);
-}
-
-
-//
-// floormove_t
-//
-
-static void saveg_read_floormove_t(floormove_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // floor_e type;
-    str->type = SV_ReadLong();
-
-    // boolean crush;
-    str->crush = SV_ReadLong();
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int newspecial;
-    str->newspecial = SV_ReadLong();
-
-    // short texture;
-    str->texture = SV_ReadWord();
-
-    // fixed_t floordestheight;
-    str->floordestheight = SV_ReadLong();
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-}
-
-static void saveg_write_floormove_t(floormove_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // floor_e type;
-    SV_WriteLong(str->type);
-
-    // boolean crush;
-    SV_WriteLong(str->crush);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int newspecial;
-    SV_WriteLong(str->newspecial);
-
-    // short texture;
-    SV_WriteWord(str->texture);
-
-    // fixed_t floordestheight;
-    SV_WriteLong(str->floordestheight);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-}
-
-
-//
-// plat_t
-//
-
-static void saveg_read_plat_t(plat_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // fixed_t low;
-    str->low = SV_ReadLong();
-
-    // fixed_t high;
-    str->high = SV_ReadLong();
-
-    // int wait;
-    str->wait = SV_ReadLong();
-
-    // int count;
-    str->count = SV_ReadLong();
-
-    // plat_e status;
-    str->status = SV_ReadLong();
-
-    // plat_e oldstatus;
-    str->oldstatus = SV_ReadLong();
-
-    // boolean crush;
-    str->crush = SV_ReadLong();
-
-    // int tag;
-    str->tag = SV_ReadLong();
-
-    // plattype_e type;
-    str->type = SV_ReadLong();
-}
-
-static void saveg_write_plat_t(plat_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // fixed_t low;
-    SV_WriteLong(str->low);
-
-    // fixed_t high;
-    SV_WriteLong(str->high);
-
-    // int wait;
-    SV_WriteLong(str->wait);
-
-    // int count;
-    SV_WriteLong(str->count);
-
-    // plat_e status;
-    SV_WriteLong(str->status);
-
-    // plat_e oldstatus;
-    SV_WriteLong(str->oldstatus);
-
-    // boolean crush;
-    SV_WriteLong(str->crush);
-
-    // int tag;
-    SV_WriteLong(str->tag);
-
-    // plattype_e type;
-    SV_WriteLong(str->type);
-}
-
-
-//
-// lightflash_t
-//
-
-static void saveg_read_lightflash_t(lightflash_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // int count;
-    str->count = SV_ReadLong();
-
-    // int maxlight;
-    str->maxlight = SV_ReadLong();
-
-    // int minlight;
-    str->minlight = SV_ReadLong();
-
-    // int maxtime;
-    str->maxtime = SV_ReadLong();
-
-    // int mintime;
-    str->mintime = SV_ReadLong();
-}
-
-static void saveg_write_lightflash_t(lightflash_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // int count;
-    SV_WriteLong(str->count);
-
-    // int maxlight;
-    SV_WriteLong(str->maxlight);
-
-    // int minlight;
-    SV_WriteLong(str->minlight);
-
-    // int maxtime;
-    SV_WriteLong(str->maxtime);
-
-    // int mintime;
-    SV_WriteLong(str->mintime);
-}
-
-
-//
-// strobe_t
-//
-
-static void saveg_read_strobe_t(strobe_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // int count;
-    str->count = SV_ReadLong();
-
-    // int minlight;
-    str->minlight = SV_ReadLong();
-
-    // int maxlight;
-    str->maxlight = SV_ReadLong();
-
-    // int darktime;
-    str->darktime = SV_ReadLong();
-
-    // int brighttime;
-    str->brighttime = SV_ReadLong();
-}
-
-static void saveg_write_strobe_t(strobe_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // int count;
-    SV_WriteLong(str->count);
-
-    // int minlight;
-    SV_WriteLong(str->minlight);
-
-    // int maxlight;
-    SV_WriteLong(str->maxlight);
-
-    // int darktime;
-    SV_WriteLong(str->darktime);
-
-    // int brighttime;
-    SV_WriteLong(str->brighttime);
-}
-
-
-//
-// glow_t
-//
-
-static void saveg_read_glow_t(glow_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // int minlight;
-    str->minlight = SV_ReadLong();
-
-    // int maxlight;
-    str->maxlight = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-}
-
-static void saveg_write_glow_t(glow_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // int minlight;
-    SV_WriteLong(str->minlight);
-
-    // int maxlight;
-    SV_WriteLong(str->maxlight);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-}
-
-
-/*
-====================
-=
-= P_ArchivePlayers
-=
-====================
-*/
-
-void P_ArchivePlayers(void)
-{
-    int i;
-
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        saveg_write_player_t(&players[i]);
-    }
-}
-
-/*
-====================
-=
-= P_UnArchivePlayers
-=
-====================
-*/
-
-void P_UnArchivePlayers(void)
-{
-    int i;
-
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (!playeringame[i])
-            continue;
-        saveg_read_player_t(&players[i]);
-        players[i].mo = NULL;   // will be set when unarc thinker
-        players[i].message = NULL;
-        players[i].attacker = NULL;
-    }
-}
-
-//=============================================================================
-
-
-/*
-====================
-=
-= P_ArchiveWorld
-=
-====================
-*/
-
-void P_ArchiveWorld(void)
-{
-    int i, j;
-    sector_t *sec;
-    line_t *li;
-    side_t *si;
-
-    // Sectors
-    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
-    {
-        SV_WriteWord(sec->floorheight >> FRACBITS);
-        SV_WriteWord(sec->ceilingheight >> FRACBITS);
-        SV_WriteWord(sec->floorpic);
-        SV_WriteWord(sec->ceilingpic);
-        SV_WriteWord(sec->lightlevel);
-        SV_WriteWord(sec->special);     // needed?
-        SV_WriteWord(sec->tag); // needed?
-    }
-
-    // Lines
-    for (i = 0, li = lines; i < numlines; i++, li++)
-    {
-        SV_WriteWord(li->flags);
-        SV_WriteWord(li->special);
-        SV_WriteWord(li->tag);
-        for (j = 0; j < 2; j++)
-        {
-            if (li->sidenum[j] == -1)
-            {
-                continue;
-            }
-            si = &sides[li->sidenum[j]];
-            SV_WriteWord(si->textureoffset >> FRACBITS);
-            SV_WriteWord(si->rowoffset >> FRACBITS);
-            SV_WriteWord(si->toptexture);
-            SV_WriteWord(si->bottomtexture);
-            SV_WriteWord(si->midtexture);
-        }
-    }
-}
-
-/*
-====================
-=
-= P_UnArchiveWorld
-=
-====================
-*/
-
-void P_UnArchiveWorld(void)
-{
-    int i, j;
-    sector_t *sec;
-    line_t *li;
-    side_t *si;
-
-//
-// do sectors
-//
-    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
-    {
-        sec->floorheight = SV_ReadWord() << FRACBITS;
-        sec->ceilingheight = SV_ReadWord() << FRACBITS;
-        sec->floorpic = SV_ReadWord();
-        sec->ceilingpic = SV_ReadWord();
-        sec->lightlevel = SV_ReadWord();
-        sec->special = SV_ReadWord();  // needed?
-        sec->tag = SV_ReadWord();      // needed?
-        sec->specialdata = 0;
-        sec->soundtarget = 0;
-    }
-
-//
-// do lines
-//
-    for (i = 0, li = lines; i < numlines; i++, li++)
-    {
-        li->flags = SV_ReadWord();
-        li->special = SV_ReadWord();
-        li->tag = SV_ReadWord();
-        for (j = 0; j < 2; j++)
-        {
-            if (li->sidenum[j] == -1)
-                continue;
-            si = &sides[li->sidenum[j]];
-            si->textureoffset = SV_ReadWord() << FRACBITS;
-            si->rowoffset = SV_ReadWord() << FRACBITS;
-            si->toptexture = SV_ReadWord();
-            si->bottomtexture = SV_ReadWord();
-            si->midtexture = SV_ReadWord();
-        }
-    }
-}
-
-//=============================================================================
-
-typedef enum
-{
-    tc_end,
-    tc_mobj
-} thinkerclass_t;
-
-/*
-====================
-=
-= P_ArchiveThinkers
-=
-====================
-*/
-
-void P_ArchiveThinkers(void)
-{
-    thinker_t *th;
-
-    for (th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if (th->function == P_MobjThinker)
-        {
-            SV_WriteByte(tc_mobj);
-            saveg_write_mobj_t((mobj_t *) th);
-        }
-        //I_Error("P_ArchiveThinkers: Unknown thinker function");
-    }
-
-    // Add a terminating marker
-    SV_WriteByte(tc_end);
-}
-
-/*
-====================
-=
-= P_UnArchiveThinkers
-=
-====================
-*/
-
-void P_UnArchiveThinkers(void)
-{
-    byte tclass;
-    thinker_t *currentthinker, *next;
-    mobj_t *mobj;
-
-    //
-    // remove all the current thinkers
-    //
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
-    {
-        next = currentthinker->next;
-        if (currentthinker->function == P_MobjThinker)
-            P_RemoveMobj((mobj_t *) currentthinker);
-        else
-            Z_Free(currentthinker);
-        currentthinker = next;
-    }
-    P_InitThinkers();
-
-    // read in saved thinkers
-    while (1)
-    {
-        tclass = SV_ReadByte();
-        switch (tclass)
-        {
-            case tc_end:
-                return;         // end of list
-
-            case tc_mobj:
-                mobj = Z_Malloc(sizeof(*mobj), PU_LEVEL, NULL);
-                saveg_read_mobj_t(mobj);
-                mobj->target = NULL;
-                P_SetThingPosition(mobj);
-                mobj->info = &mobjinfo[mobj->type];
-                mobj->floorz = mobj->subsector->sector->floorheight;
-                mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-                mobj->thinker.function = P_MobjThinker;
-                P_AddThinker(&mobj->thinker);
-                break;
-
-            default:
-                I_Error("Unknown tclass %i in savegame", tclass);
-        }
-
-    }
-
-}
-
-//=============================================================================
-
-
-/*
-====================
-=
-= P_ArchiveSpecials
-=
-====================
-*/
-enum
-{
-    tc_ceiling,
-    tc_door,
-    tc_floor,
-    tc_plat,
-    tc_flash,
-    tc_strobe,
-    tc_glow,
-    tc_endspecials
-} specials_e;
-
-void P_ArchiveSpecials(void)
-{
-    /*
-    T_MoveCeiling, (ceiling_t: sector_t * swizzle), - active list
-    T_VerticalDoor, (vldoor_t: sector_t * swizzle),
-    T_MoveFloor, (floormove_t: sector_t * swizzle),
-    T_LightFlash, (lightflash_t: sector_t * swizzle),
-    T_StrobeFlash, (strobe_t: sector_t *),
-    T_Glow, (glow_t: sector_t *),
-    T_PlatRaise, (plat_t: sector_t *), - active list
-    */
-
-    thinker_t *th;
-
-    for (th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if (th->function == T_MoveCeiling)
-        {
-            SV_WriteByte(tc_ceiling);
-            saveg_write_ceiling_t((ceiling_t *) th);
-        }
-        else if (th->function == T_VerticalDoor)
-        {
-            SV_WriteByte(tc_door);
-            saveg_write_vldoor_t((vldoor_t *) th);
-        }
-        else if (th->function == T_MoveFloor)
-        {
-            SV_WriteByte(tc_floor);
-            saveg_write_floormove_t((floormove_t *) th);
-        }
-        else if (th->function == T_PlatRaise)
-        {
-            SV_WriteByte(tc_plat);
-            saveg_write_plat_t((plat_t *) th);
-        }
-        else if (th->function == T_LightFlash)
-        {
-            SV_WriteByte(tc_flash);
-            saveg_write_lightflash_t((lightflash_t *) th);
-        }
-        else if (th->function == T_StrobeFlash)
-        {
-            SV_WriteByte(tc_strobe);
-            saveg_write_strobe_t((strobe_t *) th);
-        }
-        else if (th->function == T_Glow)
-        {
-            SV_WriteByte(tc_glow);
-            saveg_write_glow_t((glow_t *) th);
-        }
-    }
-    // Add a terminating marker
-    SV_WriteByte(tc_endspecials);
-}
-
-/*
-====================
-=
-= P_UnArchiveSpecials
-=
-====================
-*/
-
-void P_UnArchiveSpecials(void)
-{
-    byte tclass;
-    ceiling_t *ceiling;
-    vldoor_t *door;
-    floormove_t *floor;
-    plat_t *plat;
-    lightflash_t *flash;
-    strobe_t *strobe;
-    glow_t *glow;
-
-
-    // read in saved thinkers
-    while (1)
-    {
-        tclass = SV_ReadByte();
-        switch (tclass)
-        {
-            case tc_endspecials:
-                return;         // end of list
-
-            case tc_ceiling:
-                ceiling = Z_Malloc(sizeof(*ceiling), PU_LEVEL, NULL);
-                saveg_read_ceiling_t(ceiling);
-                ceiling->sector->specialdata = T_MoveCeiling;  // ???
-                ceiling->thinker.function = T_MoveCeiling;
-                P_AddThinker(&ceiling->thinker);
-                P_AddActiveCeiling(ceiling);
-                break;
-
-            case tc_door:
-                door = Z_Malloc(sizeof(*door), PU_LEVEL, NULL);
-                saveg_read_vldoor_t(door);
-                door->sector->specialdata = door;
-                door->thinker.function = T_VerticalDoor;
-                P_AddThinker(&door->thinker);
-                break;
-
-            case tc_floor:
-                floor = Z_Malloc(sizeof(*floor), PU_LEVEL, NULL);
-                saveg_read_floormove_t(floor);
-                floor->sector->specialdata = T_MoveFloor;
-                floor->thinker.function = T_MoveFloor;
-                P_AddThinker(&floor->thinker);
-                break;
-
-            case tc_plat:
-                plat = Z_Malloc(sizeof(*plat), PU_LEVEL, NULL);
-                saveg_read_plat_t(plat);
-                plat->sector->specialdata = T_PlatRaise;
-                // In the original Heretic code this was a conditional "fix"
-                // of the thinker function, but the save code (above) decides
-                // whether to save a T_PlatRaise based on thinker function
-                // anyway, so it can't be NULL. Having the conditional causes
-                // a bug, as our saveg_read_thinker_t sets these to NULL.
-                // if (plat->thinker.function)
-                plat->thinker.function = T_PlatRaise;
-                P_AddThinker(&plat->thinker);
-                P_AddActivePlat(plat);
-                break;
-
-            case tc_flash:
-                flash = Z_Malloc(sizeof(*flash), PU_LEVEL, NULL);
-                saveg_read_lightflash_t(flash);
-                flash->thinker.function = T_LightFlash;
-                P_AddThinker(&flash->thinker);
-                break;
-
-            case tc_strobe:
-                strobe = Z_Malloc(sizeof(*strobe), PU_LEVEL, NULL);
-                saveg_read_strobe_t(strobe);
-                strobe->thinker.function = T_StrobeFlash;
-                P_AddThinker(&strobe->thinker);
-                break;
-
-            case tc_glow:
-                glow = Z_Malloc(sizeof(*glow), PU_LEVEL, NULL);
-                saveg_read_glow_t(glow);
-                glow->thinker.function = T_Glow;
-                P_AddThinker(&glow->thinker);
-                break;
-
-            default:
-                I_Error("P_UnarchiveSpecials:Unknown tclass %i "
-                        "in savegame", tclass);
-        }
-
-    }
-
-}
-
-
diff --git a/games/NXDoom/src/heretic/p_setup.c b/games/NXDoom/src/heretic/p_setup.c
deleted file mode 100644
index 645175552..000000000
--- a/games/NXDoom/src/heretic/p_setup.c
+++ /dev/null
@@ -1,709 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_main.c
-
-#include <math.h>
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "m_argv.h"
-#include "m_bbox.h"
-#include "p_local.h"
-#include "p_rejectpad.h"
-#include "s_sound.h"
-
-void P_SpawnMapThing(mapthing_t * mthing);
-
-int numvertexes;
-vertex_t *vertexes;
-
-int numsegs;
-seg_t *segs;
-
-int numsectors;
-sector_t *sectors;
-
-int numsubsectors;
-subsector_t *subsectors;
-
-int numnodes;
-node_t *nodes;
-
-int numlines;
-line_t *lines;
-
-int numsides;
-side_t *sides;
-
-static int totallines;
-
-short *blockmaplump;            // offsets in blockmap are from here
-short *blockmap;
-int bmapwidth, bmapheight;      // in mapblocks
-fixed_t bmaporgx, bmaporgy;     // origin of block map
-mobj_t **blocklinks;            // for thing chains
-
-byte *rejectmatrix;             // for fast sight rejection
-
-mapthing_t deathmatchstarts[10], *deathmatch_p;
-mapthing_t playerstarts[MAXPLAYERS];
-boolean playerstartsingame[MAXPLAYERS];
-
-/*
-=================
-=
-= P_LoadVertexes
-=
-=================
-*/
-
-void P_LoadVertexes(int lump)
-{
-    byte *data;
-    int i;
-    mapvertex_t *ml;
-    vertex_t *li;
-
-    numvertexes = W_LumpLength(lump) / sizeof(mapvertex_t);
-    vertexes = Z_Malloc(numvertexes * sizeof(vertex_t), PU_LEVEL, 0);
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ml = (mapvertex_t *) data;
-    li = vertexes;
-    for (i = 0; i < numvertexes; i++, li++, ml++)
-    {
-        li->x = SHORT(ml->x) << FRACBITS;
-        li->y = SHORT(ml->y) << FRACBITS;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSegs
-=
-=================
-*/
-
-void P_LoadSegs(int lump)
-{
-    byte *data;
-    int i;
-    mapseg_t *ml;
-    seg_t *li;
-    line_t *ldef;
-    int linedef, side;
-
-    numsegs = W_LumpLength(lump) / sizeof(mapseg_t);
-    segs = Z_Malloc(numsegs * sizeof(seg_t), PU_LEVEL, 0);
-    memset(segs, 0, numsegs * sizeof(seg_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ml = (mapseg_t *) data;
-    li = segs;
-    for (i = 0; i < numsegs; i++, li++, ml++)
-    {
-        li->v1 = &vertexes[SHORT(ml->v1)];
-        li->v2 = &vertexes[SHORT(ml->v2)];
-
-        li->angle = (SHORT(ml->angle)) << 16;
-        li->offset = (SHORT(ml->offset)) << 16;
-        linedef = SHORT(ml->linedef);
-        ldef = &lines[linedef];
-        li->linedef = ldef;
-        side = SHORT(ml->side);
-        li->sidedef = &sides[ldef->sidenum[side]];
-        li->frontsector = sides[ldef->sidenum[side]].sector;
-        if (ldef->flags & ML_TWOSIDED)
-            li->backsector = sides[ldef->sidenum[side ^ 1]].sector;
-        else
-            li->backsector = 0;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSubsectors
-=
-=================
-*/
-
-void P_LoadSubsectors(int lump)
-{
-    byte *data;
-    int i;
-    mapsubsector_t *ms;
-    subsector_t *ss;
-
-    numsubsectors = W_LumpLength(lump) / sizeof(mapsubsector_t);
-    subsectors = Z_Malloc(numsubsectors * sizeof(subsector_t), PU_LEVEL, 0);
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ms = (mapsubsector_t *) data;
-    memset(subsectors, 0, numsubsectors * sizeof(subsector_t));
-    ss = subsectors;
-    for (i = 0; i < numsubsectors; i++, ss++, ms++)
-    {
-        ss->numlines = SHORT(ms->numsegs);
-        ss->firstline = SHORT(ms->firstseg);
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSectors
-=
-=================
-*/
-
-void P_LoadSectors(int lump)
-{
-    byte *data;
-    int i;
-    mapsector_t *ms;
-    sector_t *ss;
-
-    numsectors = W_LumpLength(lump) / sizeof(mapsector_t);
-    sectors = Z_Malloc(numsectors * sizeof(sector_t), PU_LEVEL, 0);
-    memset(sectors, 0, numsectors * sizeof(sector_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ms = (mapsector_t *) data;
-    ss = sectors;
-    for (i = 0; i < numsectors; i++, ss++, ms++)
-    {
-        ss->floorheight = SHORT(ms->floorheight) << FRACBITS;
-        ss->ceilingheight = SHORT(ms->ceilingheight) << FRACBITS;
-        ss->floorpic = R_FlatNumForName(ms->floorpic);
-        ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
-        ss->lightlevel = SHORT(ms->lightlevel);
-        ss->special = SHORT(ms->special);
-        ss->tag = SHORT(ms->tag);
-        ss->thinglist = NULL;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadNodes
-=
-=================
-*/
-
-void P_LoadNodes(int lump)
-{
-    byte *data;
-    int i, j, k;
-    mapnode_t *mn;
-    node_t *no;
-
-    numnodes = W_LumpLength(lump) / sizeof(mapnode_t);
-    nodes = Z_Malloc(numnodes * sizeof(node_t), PU_LEVEL, 0);
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    mn = (mapnode_t *) data;
-    no = nodes;
-    for (i = 0; i < numnodes; i++, no++, mn++)
-    {
-        no->x = SHORT(mn->x) << FRACBITS;
-        no->y = SHORT(mn->y) << FRACBITS;
-        no->dx = SHORT(mn->dx) << FRACBITS;
-        no->dy = SHORT(mn->dy) << FRACBITS;
-        for (j = 0; j < 2; j++)
-        {
-            no->children[j] = SHORT(mn->children[j]);
-            for (k = 0; k < 4; k++)
-                no->bbox[j][k] = SHORT(mn->bbox[j][k]) << FRACBITS;
-        }
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-
-/*
-=================
-=
-= P_LoadThings
-=
-=================
-*/
-
-void P_LoadThings(int lump)
-{
-    byte *data;
-    int i;
-    mapthing_t spawnthing;
-    mapthing_t *mt;
-    int numthings;
-
-    data = W_CacheLumpNum(lump, PU_STATIC);
-    numthings = W_LumpLength(lump) / sizeof(mapthing_t);
-
-    mt = (mapthing_t *) data;
-    for (i = 0; i < numthings; i++, mt++)
-    {
-        spawnthing.x = SHORT(mt->x);
-        spawnthing.y = SHORT(mt->y);
-        spawnthing.angle = SHORT(mt->angle);
-        spawnthing.type = SHORT(mt->type);
-        spawnthing.options = SHORT(mt->options);
-        P_SpawnMapThing(&spawnthing);
-    }
-
-    if (!deathmatch)
-    {
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            if (playeringame[i] && !playerstartsingame[i])
-            {
-                I_Error("P_LoadThings: Player %d start missing (vanilla crashes here)", i + 1);
-            }
-            playerstartsingame[i] = false;
-        }
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-
-/*
-=================
-=
-= P_LoadLineDefs
-=
-= Also counts secret lines for intermissions
-=================
-*/
-
-void P_LoadLineDefs(int lump)
-{
-    byte *data;
-    int i;
-    maplinedef_t *mld;
-    line_t *ld;
-    vertex_t *v1, *v2;
-
-    numlines = W_LumpLength(lump) / sizeof(maplinedef_t);
-    lines = Z_Malloc(numlines * sizeof(line_t), PU_LEVEL, 0);
-    memset(lines, 0, numlines * sizeof(line_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    mld = (maplinedef_t *) data;
-    ld = lines;
-    for (i = 0; i < numlines; i++, mld++, ld++)
-    {
-        ld->flags = SHORT(mld->flags);
-        ld->special = SHORT(mld->special);
-        ld->tag = SHORT(mld->tag);
-        v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
-        v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
-        ld->dx = v2->x - v1->x;
-        ld->dy = v2->y - v1->y;
-        if (!ld->dx)
-            ld->slopetype = ST_VERTICAL;
-        else if (!ld->dy)
-            ld->slopetype = ST_HORIZONTAL;
-        else
-        {
-            if (FixedDiv(ld->dy, ld->dx) > 0)
-                ld->slopetype = ST_POSITIVE;
-            else
-                ld->slopetype = ST_NEGATIVE;
-        }
-
-        if (v1->x < v2->x)
-        {
-            ld->bbox[BOXLEFT] = v1->x;
-            ld->bbox[BOXRIGHT] = v2->x;
-        }
-        else
-        {
-            ld->bbox[BOXLEFT] = v2->x;
-            ld->bbox[BOXRIGHT] = v1->x;
-        }
-        if (v1->y < v2->y)
-        {
-            ld->bbox[BOXBOTTOM] = v1->y;
-            ld->bbox[BOXTOP] = v2->y;
-        }
-        else
-        {
-            ld->bbox[BOXBOTTOM] = v2->y;
-            ld->bbox[BOXTOP] = v1->y;
-        }
-        ld->sidenum[0] = SHORT(mld->sidenum[0]);
-        ld->sidenum[1] = SHORT(mld->sidenum[1]);
-        if (ld->sidenum[0] != -1)
-            ld->frontsector = sides[ld->sidenum[0]].sector;
-        else
-            ld->frontsector = 0;
-        if (ld->sidenum[1] != -1)
-            ld->backsector = sides[ld->sidenum[1]].sector;
-        else
-            ld->backsector = 0;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSideDefs
-=
-=================
-*/
-
-void P_LoadSideDefs(int lump)
-{
-    byte *data;
-    int i;
-    mapsidedef_t *msd;
-    side_t *sd;
-
-    numsides = W_LumpLength(lump) / sizeof(mapsidedef_t);
-    sides = Z_Malloc(numsides * sizeof(side_t), PU_LEVEL, 0);
-    memset(sides, 0, numsides * sizeof(side_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    msd = (mapsidedef_t *) data;
-    sd = sides;
-    for (i = 0; i < numsides; i++, msd++, sd++)
-    {
-        sd->textureoffset = SHORT(msd->textureoffset) << FRACBITS;
-        sd->rowoffset = SHORT(msd->rowoffset) << FRACBITS;
-        sd->toptexture = R_TextureNumForName(msd->toptexture);
-        sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
-        sd->midtexture = R_TextureNumForName(msd->midtexture);
-        sd->sector = &sectors[SHORT(msd->sector)];
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-
-/*
-=================
-=
-= P_LoadBlockMap
-=
-=================
-*/
-
-void P_LoadBlockMap(int lump)
-{
-    int i, count;
-    int lumplen;
-
-    lumplen = W_LumpLength(lump);
-
-    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
-    W_ReadLump(lump, blockmaplump);
-    blockmap = blockmaplump + 4;
-
-    // Swap all short integers to native byte ordering:
-
-    count = lumplen / 2;
-    for (i = 0; i < count; i++)
-        blockmaplump[i] = SHORT(blockmaplump[i]);
-
-    bmaporgx = blockmaplump[0] << FRACBITS;
-    bmaporgy = blockmaplump[1] << FRACBITS;
-    bmapwidth = blockmaplump[2];
-    bmapheight = blockmaplump[3];
-
-// clear out mobj chains
-    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
-    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
-    memset(blocklinks, 0, count);
-}
-
-
-
-
-/*
-=================
-=
-= P_GroupLines
-=
-= Builds sector line lists and subsector sector numbers
-= Finds block bounding boxes for sectors
-=================
-*/
-
-void P_GroupLines(void)
-{
-    line_t **linebuffer;
-    int i, j;
-    line_t *li;
-    sector_t *sector;
-    subsector_t *ss;
-    seg_t *seg;
-    fixed_t bbox[4];
-    int block;
-
-// look up sector number for each subsector
-    ss = subsectors;
-    for (i = 0; i < numsubsectors; i++, ss++)
-    {
-        seg = &segs[ss->firstline];
-        ss->sector = seg->sidedef->sector;
-    }
-
-// count number of lines in each sector
-    li = lines;
-    totallines = 0;
-    for (i = 0; i < numlines; i++, li++)
-    {
-        totallines++;
-        li->frontsector->linecount++;
-        if (li->backsector && li->backsector != li->frontsector)
-        {
-            li->backsector->linecount++;
-            totallines++;
-        }
-    }
-
-// build line tables for each sector    
-    linebuffer = Z_Malloc(totallines * sizeof(line_t *), PU_LEVEL, 0);
-    sector = sectors;
-    for (i = 0; i < numsectors; i++, sector++)
-    {
-        M_ClearBox(bbox);
-        sector->lines = linebuffer;
-        li = lines;
-        for (j = 0; j < numlines; j++, li++)
-        {
-            if (li->frontsector == sector || li->backsector == sector)
-            {
-                *linebuffer++ = li;
-                M_AddToBox(bbox, li->v1->x, li->v1->y);
-                M_AddToBox(bbox, li->v2->x, li->v2->y);
-            }
-        }
-        if (linebuffer - sector->lines != sector->linecount)
-            I_Error("P_GroupLines: miscounted");
-
-        // set the degenmobj_t to the middle of the bounding box
-        sector->soundorg.x = (bbox[BOXRIGHT] + bbox[BOXLEFT]) / 2;
-        sector->soundorg.y = (bbox[BOXTOP] + bbox[BOXBOTTOM]) / 2;
-
-        // adjust bounding box to map blocks
-        block = (bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block >= bmapheight ? bmapheight - 1 : block;
-        sector->blockbox[BOXTOP] = block;
-
-        block = (bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block < 0 ? 0 : block;
-        sector->blockbox[BOXBOTTOM] = block;
-
-        block = (bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block >= bmapwidth ? bmapwidth - 1 : block;
-        sector->blockbox[BOXRIGHT] = block;
-
-        block = (bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block < 0 ? 0 : block;
-        sector->blockbox[BOXLEFT] = block;
-    }
-
-}
-
-
-static void P_LoadReject(int lumpnum)
-{
-    int minlength;
-    int lumplen;
-
-    // Calculate the size that the REJECT lump *should* be.
-
-    minlength = (numsectors * numsectors + 7) / 8;
-
-    // If the lump meets the minimum length, it can be loaded directly.
-    // Otherwise, we need to allocate a buffer of the correct size
-    // and pad it with appropriate data.
-
-    lumplen = W_LumpLength(lumpnum);
-
-    if (lumplen >= minlength)
-    {
-        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
-    }
-    else
-    {
-        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
-        W_ReadLump(lumpnum, rejectmatrix);
-
-        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
-    }
-}
-
-//=============================================================================
-
-lumpinfo_t *maplumpinfo;
-
-/*
-=================
-=
-= P_SetupLevel
-=
-=================
-*/
-
-void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
-{
-    int i;
-    int parm;
-    char lumpname[9];
-    int lumpnum;
-    mobj_t *mobj;
-
-    totalkills = totalitems = totalsecret = 0;
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        players[i].killcount = players[i].secretcount
-            = players[i].itemcount = 0;
-    }
-    players[consoleplayer].viewz = 1;   // will be set by player think
-
-    S_Start();                  // make sure all sounds are stopped before Z_FreeTags
-
-    Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
-
-    P_InitThinkers();
-
-//
-// look for a regular (development) map first
-//
-    lumpname[0] = 'E';
-    lumpname[1] = '0' + episode;
-    lumpname[2] = 'M';
-    lumpname[3] = '0' + map;
-    lumpname[4] = 0;
-    leveltime = 0;
-
-    lumpnum = W_GetNumForName(lumpname);
-
-    maplumpinfo = lumpinfo[lumpnum];
-
-// note: most of this ordering is important     
-    P_LoadBlockMap(lumpnum + ML_BLOCKMAP);
-    P_LoadVertexes(lumpnum + ML_VERTEXES);
-    P_LoadSectors(lumpnum + ML_SECTORS);
-    P_LoadSideDefs(lumpnum + ML_SIDEDEFS);
-
-    P_LoadLineDefs(lumpnum + ML_LINEDEFS);
-    P_LoadSubsectors(lumpnum + ML_SSECTORS);
-    P_LoadNodes(lumpnum + ML_NODES);
-    P_LoadSegs(lumpnum + ML_SEGS);
-
-    P_GroupLines();
-    P_LoadReject(lumpnum + ML_REJECT);
-
-    bodyqueslot = 0;
-    deathmatch_p = deathmatchstarts;
-    P_InitAmbientSound();
-    P_InitMonsters();
-    P_OpenWeapons();
-    P_LoadThings(lumpnum + ML_THINGS);
-    P_CloseWeapons();
-
-//
-// if deathmatch, randomly spawn the active players
-//
-    TimerGame = 0;
-    if (deathmatch)
-    {
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            if (playeringame[i])
-            {                   // must give a player spot before deathmatchspawn
-                mobj = P_SpawnMobj(playerstarts[i].x << 16,
-                                   playerstarts[i].y << 16, 0, MT_PLAYER);
-                players[i].mo = mobj;
-                G_DeathMatchSpawnPlayer(i);
-                P_RemoveMobj(mobj);
-            }
-        }
-
-        //!
-        // @arg <n>
-        // @category net
-        // @vanilla
-        //
-        // For multiplayer games: exit each level after n minutes.
-        //
-
-        parm = M_CheckParmWithArgs("-timer", 1);
-        if (parm)
-        {
-            TimerGame = atoi(myargv[parm + 1]) * 35 * 60;
-        }
-    }
-
-// set up world state
-    P_SpawnSpecials();
-
-// build subsector connect matrix
-//      P_ConnectSubsectors ();
-
-// preload graphics
-    if (precache)
-        R_PrecacheLevel();
-
-//printf ("free memory: 0x%x\n", Z_FreeMemory());
-
-}
-
-
-/*
-=================
-=
-= P_Init
-=
-=================
-*/
-
-void P_Init(void)
-{
-    P_InitSwitchList();
-    P_InitPicAnims();
-    P_InitTerrainTypes();
-    P_InitLava();
-    R_InitSprites(sprnames);
-}
diff --git a/games/NXDoom/src/heretic/p_sight.c b/games/NXDoom/src/heretic/p_sight.c
deleted file mode 100644
index 3a442daef..000000000
--- a/games/NXDoom/src/heretic/p_sight.c
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// P_sight.c
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "p_local.h"
-
-/*
-==============================================================================
-
-							P_CheckSight
-
-This uses specialized forms of the maputils routines for optimized performance
-
-==============================================================================
-*/
-
-fixed_t sightzstart;            // eye z of looker
-fixed_t topslope, bottomslope;  // slopes to top and bottom of target
-
-int sightcounts[3];
-
-/*
-==============
-=
-= PTR_SightTraverse
-=
-==============
-*/
-
-boolean PTR_SightTraverse(intercept_t * in)
-{
-    line_t *li;
-    fixed_t slope;
-
-    li = in->d.line;
-
-//
-// crosses a two sided line
-//
-    P_LineOpening(li);
-
-    if (openbottom >= opentop)  // quick test for totally closed doors
-        return false;           // stop
-
-    if (li->frontsector->floorheight != li->backsector->floorheight)
-    {
-        slope = FixedDiv(openbottom - sightzstart, in->frac);
-        if (slope > bottomslope)
-            bottomslope = slope;
-    }
-
-    if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-    {
-        slope = FixedDiv(opentop - sightzstart, in->frac);
-        if (slope < topslope)
-            topslope = slope;
-    }
-
-    if (topslope <= bottomslope)
-        return false;           // stop
-
-    return true;                // keep going
-}
-
-
-
-/*
-==================
-=
-= P_SightBlockLinesIterator
-=
-===================
-*/
-
-boolean P_SightBlockLinesIterator(int x, int y)
-{
-    int offset;
-    short *list;
-    line_t *ld;
-    int s1, s2;
-    divline_t dl;
-
-    offset = y * bmapwidth + x;
-
-    offset = *(blockmap + offset);
-
-    for (list = blockmaplump + offset; *list != -1; list++)
-    {
-        ld = &lines[*list];
-        if (ld->validcount == validcount)
-            continue;           // line has already been checked
-        ld->validcount = validcount;
-
-        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
-        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
-        if (s1 == s2)
-            continue;           // line isn't crossed
-        P_MakeDivline(ld, &dl);
-        s1 = P_PointOnDivlineSide(trace.x, trace.y, &dl);
-        s2 = P_PointOnDivlineSide(trace.x + trace.dx, trace.y + trace.dy,
-                                  &dl);
-        if (s1 == s2)
-            continue;           // line isn't crossed
-
-        // try to early out the check
-        if (!ld->backsector)
-            return false;       // stop checking
-
-        // store the line for later intersection testing
-        intercept_p->d.line = ld;
-        intercept_p++;
-
-    }
-
-    return true;                // everything was checked
-}
-
-/*
-====================
-=
-= P_SightTraverseIntercepts
-=
-= Returns true if the traverser function returns true for all lines
-====================
-*/
-
-boolean P_SightTraverseIntercepts(void)
-{
-    int count;
-    fixed_t dist;
-    intercept_t *scan, *in;
-    divline_t dl;
-
-    count = intercept_p - intercepts;
-//
-// calculate intercept distance
-//
-    for (scan = intercepts; scan < intercept_p; scan++)
-    {
-        P_MakeDivline(scan->d.line, &dl);
-        scan->frac = P_InterceptVector(&trace, &dl);
-    }
-
-//
-// go through in order
-//      
-    in = 0;                     // shut up compiler warning
-
-    while (count--)
-    {
-        dist = INT_MAX;
-        for (scan = intercepts; scan < intercept_p; scan++)
-            if (scan->frac < dist)
-            {
-                dist = scan->frac;
-                in = scan;
-            }
-
-        if (!PTR_SightTraverse(in))
-            return false;       // don't bother going farther
-        in->frac = INT_MAX;
-    }
-
-    return true;                // everything was traversed
-}
-
-
-
-/*
-==================
-=
-= P_SightPathTraverse
-=
-= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
-= Returns true if the traverser function returns true for all lines
-==================
-*/
-
-boolean P_SightPathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
-{
-    fixed_t xt1, yt1, xt2, yt2;
-    fixed_t xstep, ystep;
-    fixed_t partial;
-    fixed_t xintercept, yintercept;
-    int mapx, mapy, mapxstep, mapystep;
-    int count;
-
-    validcount++;
-    intercept_p = intercepts;
-
-    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
-        x1 += FRACUNIT;         // don't side exactly on a line
-    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
-        y1 += FRACUNIT;         // don't side exactly on a line
-    trace.x = x1;
-    trace.y = y1;
-    trace.dx = x2 - x1;
-    trace.dy = y2 - y1;
-
-    x1 -= bmaporgx;
-    y1 -= bmaporgy;
-    xt1 = x1 >> MAPBLOCKSHIFT;
-    yt1 = y1 >> MAPBLOCKSHIFT;
-
-    x2 -= bmaporgx;
-    y2 -= bmaporgy;
-    xt2 = x2 >> MAPBLOCKSHIFT;
-    yt2 = y2 >> MAPBLOCKSHIFT;
-
-// points should never be out of bounds, but check once instead of
-// each block
-    if (xt1 < 0 || yt1 < 0 || xt1 >= bmapwidth || yt1 >= bmapheight
-        || xt2 < 0 || yt2 < 0 || xt2 >= bmapwidth || yt2 >= bmapheight)
-        return false;
-
-    if (xt2 > xt1)
-    {
-        mapxstep = 1;
-        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else if (xt2 < xt1)
-    {
-        mapxstep = -1;
-        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else
-    {
-        mapxstep = 0;
-        partial = FRACUNIT;
-        ystep = 256 * FRACUNIT;
-    }
-    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
-
-
-    if (yt2 > yt1)
-    {
-        mapystep = 1;
-        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else if (yt2 < yt1)
-    {
-        mapystep = -1;
-        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else
-    {
-        mapystep = 0;
-        partial = FRACUNIT;
-        xstep = 256 * FRACUNIT;
-    }
-    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
-
-
-//
-// step through map blocks
-// Count is present to prevent a round off error from skipping the break
-    mapx = xt1;
-    mapy = yt1;
-
-
-    for (count = 0; count < 64; count++)
-    {
-        if (!P_SightBlockLinesIterator(mapx, mapy))
-        {
-            sightcounts[1]++;
-            return false;       // early out
-        }
-
-        if (mapx == xt2 && mapy == yt2)
-            break;
-
-        if ((yintercept >> FRACBITS) == mapy)
-        {
-            yintercept += ystep;
-            mapx += mapxstep;
-        }
-        else if ((xintercept >> FRACBITS) == mapx)
-        {
-            xintercept += xstep;
-            mapy += mapystep;
-        }
-
-    }
-
-
-//
-// couldn't early out, so go through the sorted list
-//
-    sightcounts[2]++;
-
-    return P_SightTraverseIntercepts();
-}
-
-
-
-/*
-=====================
-=
-= P_CheckSight
-=
-= Returns true if a straight line between t1 and t2 is unobstructed
-= look from eyes of t1 to any part of t2
-=
-=====================
-*/
-
-boolean P_CheckSight(mobj_t * t1, mobj_t * t2)
-{
-    int s1, s2;
-    int pnum, bytenum, bitnum;
-
-//
-// check for trivial rejection
-//
-    s1 = (t1->subsector->sector - sectors);
-    s2 = (t2->subsector->sector - sectors);
-    pnum = s1 * numsectors + s2;
-    bytenum = pnum >> 3;
-    bitnum = 1 << (pnum & 7);
-
-    if (rejectmatrix[bytenum] & bitnum)
-    {
-        sightcounts[0]++;
-        return false;           // can't possibly be connected
-    }
-
-//
-// check precisely
-//              
-    sightzstart = t1->z + t1->height - (t1->height >> 2);
-    topslope = (t2->z + t2->height) - sightzstart;
-    bottomslope = (t2->z) - sightzstart;
-
-    return P_SightPathTraverse(t1->x, t1->y, t2->x, t2->y);
-}
diff --git a/games/NXDoom/src/heretic/p_spec.c b/games/NXDoom/src/heretic/p_spec.c
deleted file mode 100644
index cb89bac21..000000000
--- a/games/NXDoom/src/heretic/p_spec.c
+++ /dev/null
@@ -1,1306 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_Spec.c
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-// Macros
-
-#define MAX_AMBIENT_SFX 8       // Per level
-
-// Types
-
-typedef enum
-{
-    afxcmd_play,                // (sound)
-    afxcmd_playabsvol,          // (sound, volume)
-    afxcmd_playrelvol,          // (sound, volume)
-    afxcmd_delay,               // (ticks)
-    afxcmd_delayrand,           // (andbits)
-    afxcmd_end                  // ()
-} afxcmd_t;
-
-// Data
-
-int *LevelAmbientSfx[MAX_AMBIENT_SFX];
-int *AmbSfxPtr;
-int AmbSfxCount;
-int AmbSfxTics;
-int AmbSfxVolume;
-
-int AmbSndSeqInit[] = {         // Startup
-    afxcmd_end
-};
-int AmbSndSeq1[] = {            // Scream
-    afxcmd_play, sfx_amb1,
-    afxcmd_end
-};
-int AmbSndSeq2[] = {            // Squish
-    afxcmd_play, sfx_amb2,
-    afxcmd_end
-};
-int AmbSndSeq3[] = {            // Drops
-    afxcmd_play, sfx_amb3,
-    afxcmd_delay, 16,
-    afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb7,
-    afxcmd_delay, 16,
-    afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb3,
-    afxcmd_delay, 16,
-    afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb7,
-    afxcmd_delay, 16,
-    afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb3,
-    afxcmd_delay, 16,
-    afxcmd_delayrand, 31,
-    afxcmd_play, sfx_amb7,
-    afxcmd_delay, 16,
-    afxcmd_delayrand, 31,
-    afxcmd_end
-};
-int AmbSndSeq4[] = {            // SlowFootSteps
-    afxcmd_play, sfx_amb4,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb4, -3,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb4, -3,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb4, -3,
-    afxcmd_delay, 15,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_end
-};
-int AmbSndSeq5[] = {            // Heartbeat
-    afxcmd_play, sfx_amb5,
-    afxcmd_delay, 35,
-    afxcmd_play, sfx_amb5,
-    afxcmd_delay, 35,
-    afxcmd_play, sfx_amb5,
-    afxcmd_delay, 35,
-    afxcmd_play, sfx_amb5,
-    afxcmd_end
-};
-int AmbSndSeq6[] = {            // Bells
-    afxcmd_play, sfx_amb6,
-    afxcmd_delay, 17,
-    afxcmd_playrelvol, sfx_amb6, -8,
-    afxcmd_delay, 17,
-    afxcmd_playrelvol, sfx_amb6, -8,
-    afxcmd_delay, 17,
-    afxcmd_playrelvol, sfx_amb6, -8,
-    afxcmd_end
-};
-int AmbSndSeq7[] = {            // Growl
-    afxcmd_play, sfx_bstsit,
-    afxcmd_end
-};
-int AmbSndSeq8[] = {            // Magic
-    afxcmd_play, sfx_amb8,
-    afxcmd_end
-};
-int AmbSndSeq9[] = {            // Laughter
-    afxcmd_play, sfx_amb9,
-    afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb9, -4,
-    afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb9, -4,
-    afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb10, -4,
-    afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb10, -4,
-    afxcmd_delay, 16,
-    afxcmd_playrelvol, sfx_amb10, -4,
-    afxcmd_end
-};
-int AmbSndSeq10[] = {           // FastFootsteps
-    afxcmd_play, sfx_amb4,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb4, -3,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb4, -3,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb4, -3,
-    afxcmd_delay, 8,
-    afxcmd_playrelvol, sfx_amb11, -3,
-    afxcmd_end
-};
-
-int *AmbientSfx[] = {
-    AmbSndSeq1,                 // Scream
-    AmbSndSeq2,                 // Squish
-    AmbSndSeq3,                 // Drops
-    AmbSndSeq4,                 // SlowFootsteps
-    AmbSndSeq5,                 // Heartbeat
-    AmbSndSeq6,                 // Bells
-    AmbSndSeq7,                 // Growl
-    AmbSndSeq8,                 // Magic
-    AmbSndSeq9,                 // Laughter
-    AmbSndSeq10                 // FastFootsteps
-};
-
-animdef_t animdefs[] = {
-    // false = flat
-    // true = texture
-    {false, "FLTWAWA3", "FLTWAWA1", 8}, // Water
-    {false, "FLTSLUD3", "FLTSLUD1", 8}, // Sludge
-    {false, "FLTTELE4", "FLTTELE1", 6}, // Teleport
-    {false, "FLTFLWW3", "FLTFLWW1", 9}, // River - West
-    {false, "FLTLAVA4", "FLTLAVA1", 8}, // Lava
-    {false, "FLATHUH4", "FLATHUH1", 8}, // Super Lava
-    {true, "LAVAFL3", "LAVAFL1", 6},    // Texture: Lavaflow
-    {true, "WATRWAL3", "WATRWAL1", 4},  // Texture: Waterfall
-    {-1}
-};
-
-anim_t anims[MAXANIMS];
-anim_t *lastanim;
-
-int *TerrainTypes;
-struct
-{
-    const char *name;
-    int type;
-} TerrainTypeDefs[] =
-{
-    { "FLTWAWA1", FLOOR_WATER },
-    { "FLTFLWW1", FLOOR_WATER },
-    { "FLTLAVA1", FLOOR_LAVA },
-    { "FLATHUH1", FLOOR_LAVA },
-    { "FLTSLUD1", FLOOR_SLUDGE },
-    { "END", -1 }
-};
-
-mobj_t LavaInflictor;
-
-//----------------------------------------------------------------------------
-//
-// PROC P_InitLava
-//
-//----------------------------------------------------------------------------
-
-void P_InitLava(void)
-{
-    memset(&LavaInflictor, 0, sizeof(mobj_t));
-    LavaInflictor.type = MT_PHOENIXFX2;
-    LavaInflictor.flags2 = MF2_FIREDAMAGE | MF2_NODMGTHRUST;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_InitTerrainTypes
-//
-//----------------------------------------------------------------------------
-
-void P_InitTerrainTypes(void)
-{
-    int i;
-    int lump;
-    int size;
-
-    size = (numflats + 1) * sizeof(int);
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-    for (i = 0; TerrainTypeDefs[i].type != -1; i++)
-    {
-        lump = W_CheckNumForName(TerrainTypeDefs[i].name);
-        if (lump != -1)
-        {
-            TerrainTypes[lump - firstflat] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_InitPicAnims
-//
-//----------------------------------------------------------------------------
-
-void P_InitPicAnims(void)
-{
-    const char *startname;
-    const char *endname;
-    int i;
-
-    lastanim = anims;
-    for (i = 0; animdefs[i].istexture != -1; i++)
-    {
-        startname = DEH_String(animdefs[i].startname);
-        endname = DEH_String(animdefs[i].endname);
-
-        if (animdefs[i].istexture)
-        {                       // Texture animation
-            if (R_CheckTextureNumForName(startname) == -1)
-            {                   // Texture doesn't exist
-                continue;
-            }
-            lastanim->picnum = R_TextureNumForName(endname);
-            lastanim->basepic = R_TextureNumForName(startname);
-        }
-        else
-        {                       // Flat animation
-            if (W_CheckNumForName(startname) == -1)
-            {                   // Flat doesn't exist
-                continue;
-            }
-            lastanim->picnum = R_FlatNumForName(endname);
-            lastanim->basepic = R_FlatNumForName(startname);
-        }
-        lastanim->istexture = animdefs[i].istexture;
-        lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
-        if (lastanim->numpics < 2)
-        {
-            I_Error("P_InitPicAnims: bad cycle from %s to %s",
-                    startname, endname);
-        }
-        lastanim->speed = animdefs[i].speed;
-        lastanim++;
-    }
-}
-
-/*
-==============================================================================
-
-							UTILITIES
-
-==============================================================================
-*/
-
-//
-//      Will return a side_t* given the number of the current sector,
-//              the line number, and the side (0/1) that you want.
-//
-side_t *getSide(int currentSector, int line, int side)
-{
-    return &sides[(sectors[currentSector].lines[line])->sidenum[side]];
-}
-
-//
-//      Will return a sector_t* given the number of the current sector,
-//              the line number and the side (0/1) that you want.
-//
-sector_t *getSector(int currentSector, int line, int side)
-{
-    return sides[(sectors[currentSector].lines[line])->sidenum[side]].sector;
-}
-
-//
-//      Given the sector number and the line number, will tell you whether
-//              the line is two-sided or not.
-//
-int twoSided(int sector, int line)
-{
-    return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
-}
-
-//==================================================================
-//
-//      Return sector_t * of sector next to current. NULL if not two-sided line
-//
-//==================================================================
-sector_t *getNextSector(line_t * line, sector_t * sec)
-{
-    if (!(line->flags & ML_TWOSIDED))
-        return NULL;
-
-    if (line->frontsector == sec)
-        return line->backsector;
-
-    return line->frontsector;
-}
-
-//==================================================================
-//
-//      FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindLowestFloorSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t floor = sec->floorheight;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->floorheight < floor)
-            floor = other->floorheight;
-    }
-    return floor;
-}
-
-//==================================================================
-//
-//      FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindHighestFloorSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t floor = -500 * FRACUNIT;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->floorheight > floor)
-            floor = other->floorheight;
-    }
-    return floor;
-}
-
-//==================================================================
-//
-//      FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight)
-{
-    int i;
-    int h;
-    fixed_t min;
-    line_t *check;
-    sector_t *other;
-    fixed_t height = currentheight;
-
-    min = INT_MAX;
-
-    for (i = 0, h = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-
-        if (other != NULL && other->floorheight > height)
-        {
-            if (other->floorheight < min)
-            {
-                min = other->floorheight;
-            }
-
-            ++h;
-        }
-    }
-
-    // Don't return INT_MAX if no higher floor is found.
-
-    if (!h)
-    {
-        return height;
-    }
-
-    // Compatibility note, in case of demo desyncs.
-
-    if (h > 20)
-    {
-        fprintf(stderr, "P_FindNextHighestFloor: exceeded Vanilla limit\n");
-    }
-
-    return min;
-}
-
-//==================================================================
-//
-//      FIND LOWEST CEILING IN THE SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindLowestCeilingSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t height = INT_MAX;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->ceilingheight < height)
-            height = other->ceilingheight;
-    }
-    return height;
-}
-
-//==================================================================
-//
-//      FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindHighestCeilingSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t height = 0;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->ceilingheight > height)
-            height = other->ceilingheight;
-    }
-    return height;
-}
-
-//==================================================================
-//
-//      RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
-//
-//==================================================================
-int P_FindSectorFromLineTag(line_t * line, int start)
-{
-    int i;
-
-    for (i = start + 1; i < numsectors; i++)
-        if (sectors[i].tag == line->tag)
-            return i;
-    return -1;
-}
-
-//==================================================================
-//
-//      Find minimum light from an adjacent sector
-//
-//==================================================================
-int P_FindMinSurroundingLight(sector_t * sector, int max)
-{
-    int i;
-    int min;
-    line_t *line;
-    sector_t *check;
-
-    min = max;
-    for (i = 0; i < sector->linecount; i++)
-    {
-        line = sector->lines[i];
-        check = getNextSector(line, sector);
-        if (!check)
-            continue;
-        if (check->lightlevel < min)
-            min = check->lightlevel;
-    }
-    return min;
-}
-
-/*
-==============================================================================
-
-							EVENTS
-
-Events are operations triggered by using, crossing, or shooting special lines, or by timed thinkers
-
-==============================================================================
-*/
-
-
-
-/*
-===============================================================================
-=
-= P_CrossSpecialLine - TRIGGER
-=
-= Called every time a thing origin is about to cross
-= a line with a non 0 special
-=
-===============================================================================
-*/
-
-void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
-{
-    line_t *line;
-
-    line = &lines[linenum];
-    if (!thing->player)
-    {                           // Check if trigger allowed by non-player mobj
-        switch (line->special)
-        {
-            case 39:           // Trigger_TELEPORT
-            case 97:           // Retrigger_TELEPORT
-            case 4:            // Trigger_Raise_Door
-                //case 10:      // PLAT DOWN-WAIT-UP-STAY TRIGGER
-                //case 88:      // PLAT DOWN-WAIT-UP-STAY RETRIGGER
-                break;
-            default:
-                return;
-                break;
-        }
-    }
-    switch (line->special)
-    {
-            //====================================================
-            // TRIGGERS
-            //====================================================
-        case 2:                // Open Door
-            EV_DoDoor(line, vld_open, VDOORSPEED);
-            line->special = 0;
-            break;
-        case 3:                // Close Door
-            EV_DoDoor(line, vld_close, VDOORSPEED);
-            line->special = 0;
-            break;
-        case 4:                // Raise Door
-            EV_DoDoor(line, vld_normal, VDOORSPEED);
-            line->special = 0;
-            break;
-        case 5:                // Raise Floor
-            EV_DoFloor(line, raiseFloor);
-            line->special = 0;
-            break;
-        case 6:                // Fast Ceiling Crush & Raise
-            EV_DoCeiling(line, fastCrushAndRaise);
-            line->special = 0;
-            break;
-        case 8:                // Trigger_Build_Stairs (8 pixel steps)
-            EV_BuildStairs(line, 8 * FRACUNIT);
-            line->special = 0;
-            break;
-        case 106:              // Trigger_Build_Stairs_16 (16 pixel steps)
-            EV_BuildStairs(line, 16 * FRACUNIT);
-            line->special = 0;
-            break;
-        case 10:               // PlatDownWaitUp
-            EV_DoPlat(line, downWaitUpStay, 0);
-            line->special = 0;
-            break;
-        case 12:               // Light Turn On - brightest near
-            EV_LightTurnOn(line, 0);
-            line->special = 0;
-            break;
-        case 13:               // Light Turn On 255
-            EV_LightTurnOn(line, 255);
-            line->special = 0;
-            break;
-        case 16:               // Close Door 30
-            EV_DoDoor(line, vld_close30ThenOpen, VDOORSPEED);
-            line->special = 0;
-            break;
-        case 17:               // Start Light Strobing
-            EV_StartLightStrobing(line);
-            line->special = 0;
-            break;
-        case 19:               // Lower Floor
-            EV_DoFloor(line, lowerFloor);
-            line->special = 0;
-            break;
-        case 22:               // Raise floor to nearest height and change texture
-            EV_DoPlat(line, raiseToNearestAndChange, 0);
-            line->special = 0;
-            break;
-        case 25:               // Ceiling Crush and Raise
-            EV_DoCeiling(line, crushAndRaise);
-            line->special = 0;
-            break;
-        case 30:               // Raise floor to shortest texture height
-            // on either side of lines
-            EV_DoFloor(line, raiseToTexture);
-            line->special = 0;
-            break;
-        case 35:               // Lights Very Dark
-            EV_LightTurnOn(line, 35);
-            line->special = 0;
-            break;
-        case 36:               // Lower Floor (TURBO)
-            EV_DoFloor(line, turboLower);
-            line->special = 0;
-            break;
-        case 37:               // LowerAndChange
-            EV_DoFloor(line, lowerAndChange);
-            line->special = 0;
-            break;
-        case 38:               // Lower Floor To Lowest
-            EV_DoFloor(line, lowerFloorToLowest);
-            line->special = 0;
-            break;
-        case 39:               // TELEPORT!
-            EV_Teleport(line, side, thing);
-            line->special = 0;
-            break;
-        case 40:               // RaiseCeilingLowerFloor
-            EV_DoCeiling(line, raiseToHighest);
-            EV_DoFloor(line, lowerFloorToLowest);
-            line->special = 0;
-            break;
-        case 44:               // Ceiling Crush
-            EV_DoCeiling(line, lowerAndCrush);
-            line->special = 0;
-            break;
-        case 52:               // EXIT!
-            G_ExitLevel();
-            line->special = 0;
-            break;
-        case 53:               // Perpetual Platform Raise
-            EV_DoPlat(line, perpetualRaise, 0);
-            line->special = 0;
-            break;
-        case 54:               // Platform Stop
-            EV_StopPlat(line);
-            line->special = 0;
-            break;
-        case 56:               // Raise Floor Crush
-            EV_DoFloor(line, raiseFloorCrush);
-            line->special = 0;
-            break;
-        case 57:               // Ceiling Crush Stop
-            EV_CeilingCrushStop(line);
-            line->special = 0;
-            break;
-        case 58:               // Raise Floor 24
-            EV_DoFloor(line, raiseFloor24);
-            line->special = 0;
-            break;
-        case 59:               // Raise Floor 24 And Change
-            EV_DoFloor(line, raiseFloor24AndChange);
-            line->special = 0;
-            break;
-        case 104:              // Turn lights off in sector(tag)
-            EV_TurnTagLightsOff(line);
-            line->special = 0;
-            break;
-        case 105:              // Trigger_SecretExit
-            G_SecretExitLevel();
-            line->special = 0;
-            break;
-
-            //====================================================
-            // RE-DOABLE TRIGGERS
-            //====================================================
-
-        case 72:               // Ceiling Crush
-            EV_DoCeiling(line, lowerAndCrush);
-            break;
-        case 73:               // Ceiling Crush and Raise
-            EV_DoCeiling(line, crushAndRaise);
-            break;
-        case 74:               // Ceiling Crush Stop
-            EV_CeilingCrushStop(line);
-            break;
-        case 75:               // Close Door
-            EV_DoDoor(line, vld_close, VDOORSPEED);
-            break;
-        case 76:               // Close Door 30
-            EV_DoDoor(line, vld_close30ThenOpen, VDOORSPEED);
-            break;
-        case 77:               // Fast Ceiling Crush & Raise
-            EV_DoCeiling(line, fastCrushAndRaise);
-            break;
-        case 79:               // Lights Very Dark
-            EV_LightTurnOn(line, 35);
-            break;
-        case 80:               // Light Turn On - brightest near
-            EV_LightTurnOn(line, 0);
-            break;
-        case 81:               // Light Turn On 255
-            EV_LightTurnOn(line, 255);
-            break;
-        case 82:               // Lower Floor To Lowest
-            EV_DoFloor(line, lowerFloorToLowest);
-            break;
-        case 83:               // Lower Floor
-            EV_DoFloor(line, lowerFloor);
-            break;
-        case 84:               // LowerAndChange
-            EV_DoFloor(line, lowerAndChange);
-            break;
-        case 86:               // Open Door
-            EV_DoDoor(line, vld_open, VDOORSPEED);
-            break;
-        case 87:               // Perpetual Platform Raise
-            EV_DoPlat(line, perpetualRaise, 0);
-            break;
-        case 88:               // PlatDownWaitUp
-            EV_DoPlat(line, downWaitUpStay, 0);
-            break;
-        case 89:               // Platform Stop
-            EV_StopPlat(line);
-            break;
-        case 90:               // Raise Door
-            EV_DoDoor(line, vld_normal, VDOORSPEED);
-            break;
-        case 100:              // Retrigger_Raise_Door_Turbo
-            EV_DoDoor(line, vld_normal, VDOORSPEED * 3);
-            break;
-        case 91:               // Raise Floor
-            EV_DoFloor(line, raiseFloor);
-            break;
-        case 92:               // Raise Floor 24
-            EV_DoFloor(line, raiseFloor24);
-            break;
-        case 93:               // Raise Floor 24 And Change
-            EV_DoFloor(line, raiseFloor24AndChange);
-            break;
-        case 94:               // Raise Floor Crush
-            EV_DoFloor(line, raiseFloorCrush);
-            break;
-        case 95:               // Raise floor to nearest height and change texture
-            EV_DoPlat(line, raiseToNearestAndChange, 0);
-            break;
-        case 96:               // Raise floor to shortest texture height
-            // on either side of lines
-            EV_DoFloor(line, raiseToTexture);
-            break;
-        case 97:               // TELEPORT!
-            EV_Teleport(line, side, thing);
-            break;
-        case 98:               // Lower Floor (TURBO)
-            EV_DoFloor(line, turboLower);
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ShootSpecialLine
-//
-// Called when a thing shoots a special line.
-//
-//----------------------------------------------------------------------------
-
-void P_ShootSpecialLine(mobj_t * thing, line_t * line)
-{
-    if (!thing->player)
-    {                           // Check if trigger allowed by non-player mobj
-        switch (line->special)
-        {
-            case 46:           // Impact_OpenDoor
-                break;
-            default:
-                return;
-                break;
-        }
-    }
-    switch (line->special)
-    {
-        case 24:               // Impact_RaiseFloor
-            EV_DoFloor(line, raiseFloor);
-            P_ChangeSwitchTexture(line, 0);
-            break;
-        case 46:               // Impact_OpenDoor
-            EV_DoDoor(line, vld_open, VDOORSPEED);
-            P_ChangeSwitchTexture(line, 1);
-            break;
-        case 47:               // Impact_RaiseFloorNear&Change
-            EV_DoPlat(line, raiseToNearestAndChange, 0);
-            P_ChangeSwitchTexture(line, 0);
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerInSpecialSector
-//
-// Called every tic frame that the player origin is in a special sector.
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerInSpecialSector(player_t * player)
-{
-    sector_t *sector;
-    static int pushTab[5] = {
-        2048 * 5,
-        2048 * 10,
-        2048 * 25,
-        2048 * 30,
-        2048 * 35
-    };
-
-    sector = player->mo->subsector->sector;
-    if (player->mo->z != sector->floorheight)
-    {                           // Player is not touching the floor
-        return;
-    }
-    switch (sector->special)
-    {
-        case 7:                // Damage_Sludge
-            if (!(leveltime & 31))
-            {
-                P_DamageMobj(player->mo, NULL, NULL, 4);
-            }
-            break;
-        case 5:                // Damage_LavaWimpy
-            if (!(leveltime & 15))
-            {
-                P_DamageMobj(player->mo, &LavaInflictor, NULL, 5);
-                P_HitFloor(player->mo);
-            }
-            break;
-        case 16:               // Damage_LavaHefty
-            if (!(leveltime & 15))
-            {
-                P_DamageMobj(player->mo, &LavaInflictor, NULL, 8);
-                P_HitFloor(player->mo);
-            }
-            break;
-        case 4:                // Scroll_EastLavaDamage
-            P_Thrust(player, 0, 2048 * 28);
-            if (!(leveltime & 15))
-            {
-                P_DamageMobj(player->mo, &LavaInflictor, NULL, 5);
-                P_HitFloor(player->mo);
-            }
-            break;
-        case 9:                // SecretArea
-            player->secretcount++;
-            sector->special = 0;
-            break;
-        case 11:               // Exit_SuperDamage (DOOM E1M8 finale)
-            /*
-               player->cheats &= ~CF_GODMODE;
-               if(!(leveltime&0x1f))
-               {
-               P_DamageMobj(player->mo, NULL, NULL, 20);
-               }
-               if(player->health <= 10)
-               {
-               G_ExitLevel();
-               }
-             */
-            break;
-
-        case 25:
-        case 26:
-        case 27:
-        case 28:
-        case 29:               // Scroll_North
-            P_Thrust(player, ANG90, pushTab[sector->special - 25]);
-            break;
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:               // Scroll_East
-            P_Thrust(player, 0, pushTab[sector->special - 20]);
-            break;
-        case 30:
-        case 31:
-        case 32:
-        case 33:
-        case 34:               // Scroll_South
-            P_Thrust(player, ANG270, pushTab[sector->special - 30]);
-            break;
-        case 35:
-        case 36:
-        case 37:
-        case 38:
-        case 39:               // Scroll_West
-            P_Thrust(player, ANG180, pushTab[sector->special - 35]);
-            break;
-
-        case 40:
-        case 41:
-        case 42:
-        case 43:
-        case 44:
-        case 45:
-        case 46:
-        case 47:
-        case 48:
-        case 49:
-        case 50:
-        case 51:
-            // Wind specials are handled in (P_mobj):P_XYMovement
-            break;
-
-        case 15:               // Friction_Low
-            // Only used in (P_mobj):P_XYMovement and (P_user):P_Thrust
-            break;
-
-        default:
-            I_Error("P_PlayerInSpecialSector: "
-                    "unknown special %i", sector->special);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_UpdateSpecials
-//
-// Animate planes, scroll walls, etc.
-//
-//----------------------------------------------------------------------------
-
-void P_UpdateSpecials(void)
-{
-    int i;
-    int pic;
-    anim_t *anim;
-    line_t *line;
-
-    // Animate flats and textures
-    for (anim = anims; anim < lastanim; anim++)
-    {
-        for (i = anim->basepic; i < anim->basepic + anim->numpics; i++)
-        {
-            pic =
-                anim->basepic +
-                ((leveltime / anim->speed + i) % anim->numpics);
-            if (anim->istexture)
-            {
-                texturetranslation[i] = pic;
-            }
-            else
-            {
-                flattranslation[i] = pic;
-            }
-        }
-    }
-    // Update scrolling texture offsets
-    for (i = 0; i < numlinespecials; i++)
-    {
-        line = linespeciallist[i];
-        switch (line->special)
-        {
-            case 48:           // Effect_Scroll_Left
-                sides[line->sidenum[0]].textureoffset += FRACUNIT;
-                break;
-            case 99:           // Effect_Scroll_Right
-                sides[line->sidenum[0]].textureoffset -= FRACUNIT;
-                break;
-        }
-    }
-    // Handle buttons
-    for (i = 0; i < MAXBUTTONS; i++)
-    {
-        if (buttonlist[i].btimer)
-        {
-            buttonlist[i].btimer--;
-            if (!buttonlist[i].btimer)
-            {
-                switch (buttonlist[i].where)
-                {
-                    case top:
-                        sides[buttonlist[i].line->sidenum[0]].toptexture =
-                            buttonlist[i].btexture;
-                        break;
-                    case middle:
-                        sides[buttonlist[i].line->sidenum[0]].midtexture =
-                            buttonlist[i].btexture;
-                        break;
-                    case bottom:
-                        sides[buttonlist[i].line->sidenum[0]].bottomtexture =
-                            buttonlist[i].btexture;
-                        break;
-                }
-                S_StartSound(buttonlist[i].soundorg, sfx_switch);
-                memset(&buttonlist[i], 0, sizeof(button_t));
-            }
-        }
-    }
-}
-
-//============================================================
-//
-//      Special Stuff that can't be categorized
-//
-//============================================================
-int EV_DoDonut(line_t * line)
-{
-    sector_t *s1;
-    sector_t *s2;
-    sector_t *s3;
-    int secnum;
-    int rtn;
-    int i;
-    floormove_t *floor;
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
-    {
-        s1 = &sectors[secnum];
-
-        //      ALREADY MOVING?  IF SO, KEEP GOING...
-        if (s1->specialdata)
-            continue;
-
-        rtn = 1;
-        s2 = getNextSector(s1->lines[0], s1);
-        for (i = 0; i < s2->linecount; i++)
-        {
-            // Note: This was originally part of the following test:
-            //   (!s2->lines[i]->flags & ML_TWOSIDED) ||
-            // Due to the apparent mistaken formatting, this can never be
-            // true.
-
-            if (s2->lines[i]->backsector == s1)
-                continue;
-            s3 = s2->lines[i]->backsector;
-
-            //
-            //      Spawn rising slime
-            //
-            floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-            P_AddThinker(&floor->thinker);
-            s2->specialdata = floor;
-            floor->thinker.function = T_MoveFloor;
-            floor->type = donutRaise;
-            floor->crush = false;
-            floor->direction = 1;
-            floor->sector = s2;
-            floor->speed = FLOORSPEED / 2;
-            floor->texture = s3->floorpic;
-            floor->newspecial = 0;
-            floor->floordestheight = s3->floorheight;
-
-            //
-            //      Spawn lowering donut-hole
-            //
-            floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-            P_AddThinker(&floor->thinker);
-            s1->specialdata = floor;
-            floor->thinker.function = T_MoveFloor;
-            floor->type = lowerFloor;
-            floor->crush = false;
-            floor->direction = -1;
-            floor->sector = s1;
-            floor->speed = FLOORSPEED / 2;
-            floor->floordestheight = s3->floorheight;
-            break;
-        }
-    }
-    return rtn;
-}
-
-/*
-==============================================================================
-
-							SPECIAL SPAWNING
-
-==============================================================================
-*/
-/*
-================================================================================
-= P_SpawnSpecials
-=
-= After the map has been loaded, scan for specials that
-= spawn thinkers
-=
-===============================================================================
-*/
-
-short numlinespecials;
-line_t *linespeciallist[MAXLINEANIMS];
-
-void P_SpawnSpecials(void)
-{
-    sector_t *sector;
-    int i;
-
-    //
-    //      Init special SECTORs
-    //
-    sector = sectors;
-    for (i = 0; i < numsectors; i++, sector++)
-    {
-        if (!sector->special)
-            continue;
-        switch (sector->special)
-        {
-            case 1:            // FLICKERING LIGHTS
-                P_SpawnLightFlash(sector);
-                break;
-            case 2:            // STROBE FAST
-                P_SpawnStrobeFlash(sector, FASTDARK, 0);
-                break;
-            case 3:            // STROBE SLOW
-                P_SpawnStrobeFlash(sector, SLOWDARK, 0);
-                break;
-            case 4:            // STROBE FAST/DEATH SLIME
-                P_SpawnStrobeFlash(sector, FASTDARK, 0);
-                sector->special = 4;
-                break;
-            case 8:            // GLOWING LIGHT
-                P_SpawnGlowingLight(sector);
-                break;
-            case 9:            // SECRET SECTOR
-                totalsecret++;
-                break;
-            case 10:           // DOOR CLOSE IN 30 SECONDS
-                P_SpawnDoorCloseIn30(sector);
-                break;
-            case 12:           // SYNC STROBE SLOW
-                P_SpawnStrobeFlash(sector, SLOWDARK, 1);
-                break;
-            case 13:           // SYNC STROBE FAST
-                P_SpawnStrobeFlash(sector, FASTDARK, 1);
-                break;
-            case 14:           // DOOR RAISE IN 5 MINUTES
-                P_SpawnDoorRaiseIn5Mins(sector, i);
-                break;
-        }
-    }
-
-
-    //
-    //      Init line EFFECTs
-    //
-    numlinespecials = 0;
-    for (i = 0; i < numlines; i++)
-        switch (lines[i].special)
-        {
-            case 48:           // Effect_Scroll_Left
-            case 99:           // Effect_Scroll_Right
-                linespeciallist[numlinespecials] = &lines[i];
-                numlinespecials++;
-                break;
-        }
-
-    //
-    //      Init other misc stuff
-    //
-    for (i = 0; i < MAXCEILINGS; i++)
-        activeceilings[i] = NULL;
-    for (i = 0; i < MAXPLATS; i++)
-        activeplats[i] = NULL;
-    for (i = 0; i < MAXBUTTONS; i++)
-        memset(&buttonlist[i], 0, sizeof(button_t));
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_InitAmbientSound
-//
-//----------------------------------------------------------------------------
-
-void P_InitAmbientSound(void)
-{
-    AmbSfxCount = 0;
-    AmbSfxVolume = 0;
-    AmbSfxTics = 10 * TICRATE;
-    AmbSfxPtr = AmbSndSeqInit;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_AddAmbientSfx
-//
-// Called by (P_mobj):P_SpawnMapThing during (P_setup):P_SetupLevel.
-//
-//----------------------------------------------------------------------------
-
-void P_AddAmbientSfx(int sequence)
-{
-    if (AmbSfxCount == MAX_AMBIENT_SFX)
-    {
-        I_Error("Too many ambient sound sequences");
-    }
-    LevelAmbientSfx[AmbSfxCount++] = AmbientSfx[sequence];
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_AmbientSound
-//
-// Called every tic by (P_tick):P_Ticker.
-//
-//----------------------------------------------------------------------------
-
-void P_AmbientSound(void)
-{
-    afxcmd_t cmd;
-    int sound;
-    boolean done;
-
-    if (!AmbSfxCount)
-    {                           // No ambient sound sequences on current level
-        return;
-    }
-    if (--AmbSfxTics)
-    {
-        return;
-    }
-    done = false;
-    do
-    {
-        cmd = *AmbSfxPtr++;
-        switch (cmd)
-        {
-            case afxcmd_play:
-                AmbSfxVolume = P_Random() >> 2;
-                S_StartSoundAtVolume(NULL, *AmbSfxPtr++, AmbSfxVolume);
-                break;
-            case afxcmd_playabsvol:
-                sound = *AmbSfxPtr++;
-                AmbSfxVolume = *AmbSfxPtr++;
-                S_StartSoundAtVolume(NULL, sound, AmbSfxVolume);
-                break;
-            case afxcmd_playrelvol:
-                sound = *AmbSfxPtr++;
-                AmbSfxVolume += *AmbSfxPtr++;
-                if (AmbSfxVolume < 0)
-                {
-                    AmbSfxVolume = 0;
-                }
-                else if (AmbSfxVolume > 127)
-                {
-                    AmbSfxVolume = 127;
-                }
-                S_StartSoundAtVolume(NULL, sound, AmbSfxVolume);
-                break;
-            case afxcmd_delay:
-                AmbSfxTics = *AmbSfxPtr++;
-                done = true;
-                break;
-            case afxcmd_delayrand:
-                AmbSfxTics = P_Random() & (*AmbSfxPtr++);
-                done = true;
-                break;
-            case afxcmd_end:
-                AmbSfxTics = 6 * TICRATE + P_Random();
-                AmbSfxPtr = LevelAmbientSfx[P_Random() % AmbSfxCount];
-                done = true;
-                break;
-            default:
-                I_Error("P_AmbientSound: Unknown afxcmd %d", cmd);
-                break;
-        }
-    }
-    while (done == false);
-}
diff --git a/games/NXDoom/src/heretic/p_spec.h b/games/NXDoom/src/heretic/p_spec.h
deleted file mode 100644
index 7d78e4d2c..000000000
--- a/games/NXDoom/src/heretic/p_spec.h
+++ /dev/null
@@ -1,390 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_spec.h
-
-/*
-===============================================================================
-
-							P_SPEC
-
-===============================================================================
-*/
-
-//
-//      Animating textures and planes
-//
-typedef struct
-{
-    boolean istexture;
-    int picnum;
-    int basepic;
-    int numpics;
-    int speed;
-} anim_t;
-
-//
-//      source animation definition
-//
-typedef struct
-{
-    int istexture;          // if false, it's a flat
-    char endname[9];
-    char startname[9];
-    int speed;
-} animdef_t;
-
-#define	MAXANIMS		32
-
-extern anim_t anims[MAXANIMS], *lastanim;
-extern int *TerrainTypes;
-
-//
-//      Animating line specials
-//
-#define	MAXLINEANIMS		64
-extern short numlinespecials;
-extern line_t *linespeciallist[MAXLINEANIMS];
-
-//      Define values for map objects
-#define	MO_TELEPORTMAN		14
-
-// at game start
-void P_InitPicAnims(void);
-void P_InitTerrainTypes(void);
-void P_InitLava(void);
-
-// at map load
-void P_SpawnSpecials(void);
-void P_InitAmbientSound(void);
-void P_AddAmbientSfx(int sequence);
-
-// every tic
-void P_UpdateSpecials(void);
-void P_AmbientSound(void);
-
-// when needed
-boolean P_UseSpecialLine(mobj_t * thing, line_t * line);
-void P_ShootSpecialLine(mobj_t * thing, line_t * line);
-void P_CrossSpecialLine(int linenum, int side, mobj_t * thing);
-
-void P_PlayerInSpecialSector(player_t * player);
-
-int twoSided(int sector, int line);
-sector_t *getSector(int currentSector, int line, int side);
-side_t *getSide(int currentSector, int line, int side);
-fixed_t P_FindLowestFloorSurrounding(sector_t * sec);
-fixed_t P_FindHighestFloorSurrounding(sector_t * sec);
-fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight);
-fixed_t P_FindLowestCeilingSurrounding(sector_t * sec);
-fixed_t P_FindHighestCeilingSurrounding(sector_t * sec);
-int P_FindSectorFromLineTag(line_t * line, int start);
-int P_FindMinSurroundingLight(sector_t * sector, int max);
-sector_t *getNextSector(line_t * line, sector_t * sec);
-
-//
-//      SPECIAL
-//
-int EV_DoDonut(line_t * line);
-
-/*
-===============================================================================
-
-							P_LIGHTS
-
-===============================================================================
-*/
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int count;
-    int maxlight;
-    int minlight;
-    int maxtime;
-    int mintime;
-} lightflash_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int count;
-    int minlight;
-    int maxlight;
-    int darktime;
-    int brighttime;
-} strobe_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int minlight;
-    int maxlight;
-    int direction;
-} glow_t;
-
-#define GLOWSPEED		8
-#define	STROBEBRIGHT	5
-#define	FASTDARK		15
-#define	SLOWDARK		35
-
-void T_LightFlash(thinker_t *thinker);
-void P_SpawnLightFlash(sector_t * sector);
-void T_StrobeFlash(thinker_t *thinker);
-void P_SpawnStrobeFlash(sector_t * sector, int fastOrSlow, int inSync);
-void EV_StartLightStrobing(line_t * line);
-void EV_TurnTagLightsOff(line_t * line);
-void EV_LightTurnOn(line_t * line, int bright);
-void T_Glow(thinker_t *thinker);
-void P_SpawnGlowingLight(sector_t * sector);
-
-/*
-===============================================================================
-
-							P_SWITCH
-
-===============================================================================
-*/
-typedef struct
-{
-    char name1[9];
-    char name2[9];
-    short episode;
-} switchlist_t;
-
-typedef enum
-{
-    top,
-    middle,
-    bottom
-} bwhere_e;
-
-typedef struct
-{
-    line_t *line;
-    bwhere_e where;
-    int btexture;
-    int btimer;
-    void *soundorg;
-} button_t;
-
-#define	MAXSWITCHES	50      // max # of wall switches in a level
-#define	MAXBUTTONS	16      // 4 players, 4 buttons each at once, max.
-#define BUTTONTIME	35      // 1 second
-
-extern button_t buttonlist[MAXBUTTONS];
-
-void P_ChangeSwitchTexture(line_t * line, int useAgain);
-void P_InitSwitchList(void);
-
-/*
-===============================================================================
-
-							P_PLATS
-
-===============================================================================
-*/
-typedef enum
-{
-    up,
-    down,
-    waiting,
-    in_stasis
-} plat_e;
-
-typedef enum
-{
-    perpetualRaise,
-    downWaitUpStay,
-    raiseAndChange,
-    raiseToNearestAndChange
-} plattype_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    fixed_t speed;
-    fixed_t low;
-    fixed_t high;
-    int wait;
-    int count;
-    plat_e status;
-    plat_e oldstatus;
-    boolean crush;
-    int tag;
-    plattype_e type;
-} plat_t;
-
-#define	PLATWAIT	3
-#define	PLATSPEED	FRACUNIT
-#define	MAXPLATS	30
-
-extern plat_t *activeplats[MAXPLATS];
-
-void T_PlatRaise(thinker_t *thinker);
-int EV_DoPlat(line_t * line, plattype_e type, int amount);
-void P_AddActivePlat(plat_t * plat);
-void P_RemoveActivePlat(plat_t * plat);
-void EV_StopPlat(line_t * line);
-void P_ActivateInStasis(int tag);
-
-/*
-===============================================================================
-
-							P_DOORS
-
-===============================================================================
-*/
-typedef enum
-{
-    vld_normal,
-    vld_close30ThenOpen,
-    vld_close,
-    vld_open,
-    vld_raiseIn5Mins
-} vldoor_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    vldoor_e type;
-    sector_t *sector;
-    fixed_t topheight;
-    fixed_t speed;
-    int direction;              // 1 = up, 0 = waiting at top, -1 = down
-    int topwait;                // tics to wait at the top
-    // (keep in case a door going down is reset)
-    int topcountdown;           // when it reaches 0, start going down
-} vldoor_t;
-
-#define	VDOORSPEED	FRACUNIT*2
-#define	VDOORWAIT		150
-
-void EV_VerticalDoor(line_t * line, mobj_t * thing);
-int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed);
-void T_VerticalDoor(thinker_t *thinker);
-void P_SpawnDoorCloseIn30(sector_t * sec);
-void P_SpawnDoorRaiseIn5Mins(sector_t * sec, int secnum);
-
-/*
-===============================================================================
-
-							P_CEILNG
-
-===============================================================================
-*/
-typedef enum
-{
-    lowerToFloor,
-    raiseToHighest,
-    lowerAndCrush,
-    crushAndRaise,
-    fastCrushAndRaise
-} ceiling_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    ceiling_e type;
-    sector_t *sector;
-    fixed_t bottomheight, topheight;
-    fixed_t speed;
-    boolean crush;
-    int direction;              // 1 = up, 0 = waiting, -1 = down
-    int tag;                    // ID
-    int olddirection;
-} ceiling_t;
-
-#define	CEILSPEED		FRACUNIT
-#define	CEILWAIT		150
-#define MAXCEILINGS		30
-
-extern ceiling_t *activeceilings[MAXCEILINGS];
-
-int EV_DoCeiling(line_t * line, ceiling_e type);
-void T_MoveCeiling(thinker_t *thinker);
-void P_AddActiveCeiling(ceiling_t * c);
-void P_RemoveActiveCeiling(ceiling_t * c);
-int EV_CeilingCrushStop(line_t * line);
-void P_ActivateInStasisCeiling(line_t * line);
-
-/*
-===============================================================================
-
-							P_FLOOR
-
-===============================================================================
-*/
-typedef enum
-{
-    lowerFloor,                 // lower floor to highest surrounding floor
-    lowerFloorToLowest,         // lower floor to lowest surrounding floor
-    turboLower,                 // lower floor to highest surrounding floor VERY FAST
-    raiseFloor,                 // raise floor to lowest surrounding CEILING
-    raiseFloorToNearest,        // raise floor to next highest surrounding floor
-    raiseToTexture,             // raise floor to shortest height texture around it
-    lowerAndChange,             // lower floor to lowest surrounding floor and change
-    // floorpic
-    raiseFloor24,
-    raiseFloor24AndChange,
-    raiseFloorCrush,
-    donutRaise,
-    raiseBuildStep              // One step of a staircase
-} floor_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    floor_e type;
-    boolean crush;
-    sector_t *sector;
-    int direction;
-    int newspecial;
-    short texture;
-    fixed_t floordestheight;
-    fixed_t speed;
-} floormove_t;
-
-#define	FLOORSPEED	FRACUNIT
-
-typedef enum
-{
-    ok,
-    crushed,
-    pastdest
-} result_e;
-
-result_e T_MovePlane(sector_t * sector, fixed_t speed,
-                     fixed_t dest, boolean crush, int floorOrCeiling,
-                     int direction);
-
-int EV_BuildStairs(line_t * line, fixed_t stepDelta);
-int EV_DoFloor(line_t * line, floor_e floortype);
-void T_MoveFloor(thinker_t *thinker);
-
-/*
-===============================================================================
-
-							P_TELEPT
-
-===============================================================================
-*/
-
-boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle);
-boolean EV_Teleport(line_t * line, int side, mobj_t * thing);
diff --git a/games/NXDoom/src/heretic/p_switch.c b/games/NXDoom/src/heretic/p_switch.c
deleted file mode 100644
index 885d67326..000000000
--- a/games/NXDoom/src/heretic/p_switch.c
+++ /dev/null
@@ -1,409 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-//==================================================================
-//
-//      CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
-//
-//==================================================================
-switchlist_t alphSwitchList[] = {
-    {"SW1OFF", "SW1ON", 1},
-    {"SW2OFF", "SW2ON", 1},
-
-/*
-	{"SW1CTY",		"SW2CTY",	1},
-	{"SW1ORGRY",	"SW2ORGRY",	1},
-	{"SW1GRSTN",	"SW2GRSTN",	1},
-	{"SW1SNDP",		"SW2SNDP",	1},
-	{"SW1SPINE",	"SW2SPINE",	1},
-	{"SW1SQPEB",	"SW2SQPEB",	1},
-	{"SW1TRST1",	"SW2TRST1",	1},
-	{"SW1CSTL",		"SW2CSTL",	1},
-	{"SW1MOSS",		"SW2MOSS",	1},
-	{"SW1SNDSQ",	"SW2SNDSQ",	1},
-	{"SW1RED",		"SW2RED",	1},
-	{"SW1WOOD",		"SW2WOOD",	1},
-	{"SW1BROWN",	"SW2BROWN",	1},
-
-	{"SW1TRST2",	"SW2TRST2",	2},
-	{"SW1MSC",		"SW2MSC",	2},
-	{"SW1MSC2",		"SW2MSC2",	2},
-	{"SW1GRDMD",	"SW2GRDMD",	2},
-*/
-
-#if 0
-    {"SW1BRCOM", "SW2BRCOM", 1},
-    {"SW1BRN1", "SW2BRN1", 1},
-    {"SW1BRN2", "SW2BRN2", 1},
-    {"SW1BRNGN", "SW2BRNGN", 1},
-    {"SW1BROWN", "SW2BROWN", 1},
-    {"SW1COMM", "SW2COMM", 1},
-    {"SW1COMP", "SW2COMP", 1},
-    {"SW1DIRT", "SW2DIRT", 1},
-    {"SW1EXIT", "SW2EXIT", 1},
-    {"SW1GRAY", "SW2GRAY", 1},
-    {"SW1GRAY1", "SW2GRAY1", 1},
-    {"SW1METAL", "SW2METAL", 1},
-    {"SW1PIPE", "SW2PIPE", 1},
-    {"SW1SLAD", "SW2SLAD", 1},
-    {"SW1STARG", "SW2STARG", 1},
-    {"SW1STON1", "SW2STON1", 1},
-    {"SW1STON2", "SW2STON2", 1},
-    {"SW1STONE", "SW2STONE", 1},
-    {"SW1STRTN", "SW2STRTN", 1},
-
-    {"SW1BLUE", "SW2BLUE", 2},
-    {"SW1CMT", "SW2CMT", 2},
-    {"SW1GARG", "SW2GARG", 2},
-    {"SW1GSTON", "SW2GSTON", 2},
-    {"SW1HOT", "SW2HOT", 2},
-    {"SW1LION", "SW2LION", 2},
-    {"SW1SATYR", "SW2SATYR", 2},
-    {"SW1SKIN", "SW2SKIN", 2},
-    {"SW1VINE", "SW2VINE", 2},
-    {"SW1WOOD", "SW2WOOD", 2},
-#endif
-};
-
-int switchlist[MAXSWITCHES * 2];
-int numswitches;
-button_t buttonlist[MAXBUTTONS];
-
-/*
-===============
-=
-= P_InitSwitchList
-=
-= Only called at game initialization
-=
-===============
-*/
-
-void P_InitSwitchList(void)
-{
-    int i, slindex, episode;
-
-    // Note that this is called "episode" here but it's actually something
-    // quite different. As we progress from Shareware->Registered->Doom II
-    // we support more switch textures.
-    if (gamemode == shareware)
-    {
-        episode = 1;
-    }
-    else
-    {
-        episode = 2;
-    }
-
-    slindex = 0;
-
-    for (i = 0; i < arrlen(alphSwitchList); i++)
-    {
-	if (alphSwitchList[i].episode <= episode)
-	{
-	    switchlist[slindex++] =
-                R_TextureNumForName(DEH_String(alphSwitchList[i].name1));
-	    switchlist[slindex++] =
-                R_TextureNumForName(DEH_String(alphSwitchList[i].name2));
-	}
-    }
-
-    numswitches = slindex / 2;
-    switchlist[slindex] = -1;
-}
-
-//==================================================================
-//
-//      Start a button counting down till it turns off.
-//
-//==================================================================
-void P_StartButton(line_t * line, bwhere_e w, int texture, int time)
-{
-    int i;
-
-    for (i = 0; i < MAXBUTTONS; i++)
-        if (!buttonlist[i].btimer)
-        {
-            buttonlist[i].line = line;
-            buttonlist[i].where = w;
-            buttonlist[i].btexture = texture;
-            buttonlist[i].btimer = time;
-            buttonlist[i].soundorg = &line->frontsector->soundorg;
-            return;
-        }
-
-    I_Error("P_StartButton: no button slots left!");
-}
-
-//==================================================================
-//
-//      Function that changes wall texture.
-//      Tell it if switch is ok to use again (1=yes, it's a button).
-//
-//==================================================================
-void P_ChangeSwitchTexture(line_t * line, int useAgain)
-{
-    int texTop;
-    int texMid;
-    int texBot;
-    int i;
-    int sound;
-
-    if (!useAgain)
-        line->special = 0;
-
-    texTop = sides[line->sidenum[0]].toptexture;
-    texMid = sides[line->sidenum[0]].midtexture;
-    texBot = sides[line->sidenum[0]].bottomtexture;
-
-    sound = sfx_switch;
-    //if (line->special == 11) // EXIT SWITCH?
-    //      sound = sfx_swtchx;
-
-    for (i = 0; i < numswitches * 2; i++)
-        if (switchlist[i] == texTop)
-        {
-            S_StartSound(buttonlist->soundorg, sound);
-            sides[line->sidenum[0]].toptexture = switchlist[i ^ 1];
-            if (useAgain)
-                P_StartButton(line, top, switchlist[i], BUTTONTIME);
-            return;
-        }
-        else if (switchlist[i] == texMid)
-        {
-            S_StartSound(buttonlist->soundorg, sound);
-            sides[line->sidenum[0]].midtexture = switchlist[i ^ 1];
-            if (useAgain)
-                P_StartButton(line, middle, switchlist[i], BUTTONTIME);
-            return;
-        }
-        else if (switchlist[i] == texBot)
-        {
-            S_StartSound(buttonlist->soundorg, sound);
-            sides[line->sidenum[0]].bottomtexture = switchlist[i ^ 1];
-            if (useAgain)
-                P_StartButton(line, bottom, switchlist[i], BUTTONTIME);
-            return;
-        }
-}
-
-/*
-==============================================================================
-=
-= P_UseSpecialLine
-=
-= Called when a thing uses a special line
-= Only the front sides of lines are usable
-===============================================================================
-*/
-
-boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
-{
-    //
-    //      Switches that other things can activate
-    //
-    if (!thing->player)
-    {
-        if (line->flags & ML_SECRET)
-            return false;       // never open secret doors
-        switch (line->special)
-        {
-            case 1:            // MANUAL DOOR RAISE
-            case 32:           // MANUAL BLUE
-            case 33:           // MANUAL RED
-            case 34:           // MANUAL YELLOW
-                break;
-            default:
-                return false;
-        }
-    }
-
-    //
-    // do something
-    //      
-    switch (line->special)
-    {
-            //===============================================
-            //      MANUALS
-            //===============================================
-        case 1:                // Vertical Door
-        case 26:               // Blue Door/Locked
-        case 27:               // Yellow Door /Locked
-        case 28:               // Red Door /Locked
-
-        case 31:               // Manual door open
-        case 32:               // Blue locked door open
-        case 33:               // Red locked door open
-        case 34:               // Yellow locked door open
-            EV_VerticalDoor(line, thing);
-            break;
-            //===============================================
-            //      SWITCHES
-            //===============================================
-        case 7:                // Switch_Build_Stairs (8 pixel steps)
-            if (EV_BuildStairs(line, 8 * FRACUNIT))
-            {
-                P_ChangeSwitchTexture(line, 0);
-            }
-            break;
-        case 107:              // Switch_Build_Stairs_16 (16 pixel steps)
-            if (EV_BuildStairs(line, 16 * FRACUNIT))
-            {
-                P_ChangeSwitchTexture(line, 0);
-            }
-            break;
-        case 9:                // Change Donut
-            if (EV_DoDonut(line))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 11:               // Exit level
-            G_ExitLevel();
-            P_ChangeSwitchTexture(line, 0);
-            break;
-        case 14:               // Raise Floor 32 and change texture
-            if (EV_DoPlat(line, raiseAndChange, 32))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 15:               // Raise Floor 24 and change texture
-            if (EV_DoPlat(line, raiseAndChange, 24))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 18:               // Raise Floor to next highest floor
-            if (EV_DoFloor(line, raiseFloorToNearest))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 20:               // Raise Plat next highest floor and change texture
-            if (EV_DoPlat(line, raiseToNearestAndChange, 0))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 21:               // PlatDownWaitUpStay
-            if (EV_DoPlat(line, downWaitUpStay, 0))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 23:               // Lower Floor to Lowest
-            if (EV_DoFloor(line, lowerFloorToLowest))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 29:               // Raise Door
-            if (EV_DoDoor(line, vld_normal, VDOORSPEED))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 41:               // Lower Ceiling to Floor
-            if (EV_DoCeiling(line, lowerToFloor))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 71:               // Turbo Lower Floor
-            if (EV_DoFloor(line, turboLower))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 49:               // Lower Ceiling And Crush
-            if (EV_DoCeiling(line, lowerAndCrush))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 50:               // Close Door
-            if (EV_DoDoor(line, vld_close, VDOORSPEED))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 51:               // Secret EXIT
-            G_SecretExitLevel();
-            P_ChangeSwitchTexture(line, 0);
-            break;
-        case 55:               // Raise Floor Crush
-            if (EV_DoFloor(line, raiseFloorCrush))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 101:              // Raise Floor
-            if (EV_DoFloor(line, raiseFloor))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 102:              // Lower Floor to Surrounding floor height
-            if (EV_DoFloor(line, lowerFloor))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-        case 103:              // Open Door
-            if (EV_DoDoor(line, vld_open, VDOORSPEED))
-                P_ChangeSwitchTexture(line, 0);
-            break;
-            //===============================================
-            //      BUTTONS
-            //===============================================
-        case 42:               // Close Door
-            if (EV_DoDoor(line, vld_close, VDOORSPEED))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 43:               // Lower Ceiling to Floor
-            if (EV_DoCeiling(line, lowerToFloor))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 45:               // Lower Floor to Surrounding floor height
-            if (EV_DoFloor(line, lowerFloor))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 60:               // Lower Floor to Lowest
-            if (EV_DoFloor(line, lowerFloorToLowest))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 61:               // Open Door
-            if (EV_DoDoor(line, vld_open, VDOORSPEED))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 62:               // PlatDownWaitUpStay
-            if (EV_DoPlat(line, downWaitUpStay, 1))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 63:               // Raise Door
-            if (EV_DoDoor(line, vld_normal, VDOORSPEED))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 64:               // Raise Floor to ceiling
-            if (EV_DoFloor(line, raiseFloor))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 66:               // Raise Floor 24 and change texture
-            if (EV_DoPlat(line, raiseAndChange, 24))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 67:               // Raise Floor 32 and change texture
-            if (EV_DoPlat(line, raiseAndChange, 32))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 65:               // Raise Floor Crush
-            if (EV_DoFloor(line, raiseFloorCrush))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 68:               // Raise Plat to next highest floor and change texture
-            if (EV_DoPlat(line, raiseToNearestAndChange, 0))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 69:               // Raise Floor to next highest floor
-            if (EV_DoFloor(line, raiseFloorToNearest))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-        case 70:               // Turbo Lower Floor
-            if (EV_DoFloor(line, turboLower))
-                P_ChangeSwitchTexture(line, 1);
-            break;
-    }
-
-    return true;
-}
diff --git a/games/NXDoom/src/heretic/p_telept.c b/games/NXDoom/src/heretic/p_telept.c
deleted file mode 100644
index a922f7cf8..000000000
--- a/games/NXDoom/src/heretic/p_telept.c
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_telept.c
-
-#include "doomdef.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_Teleport
-//
-//----------------------------------------------------------------------------
-
-boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle)
-{
-    fixed_t oldx;
-    fixed_t oldy;
-    fixed_t oldz;
-    fixed_t aboveFloor;
-    fixed_t fogDelta;
-    player_t *player;
-    unsigned an;
-    mobj_t *fog;
-
-    oldx = thing->x;
-    oldy = thing->y;
-    oldz = thing->z;
-    aboveFloor = thing->z - thing->floorz;
-    if (!P_TeleportMove(thing, x, y))
-    {
-        return (false);
-    }
-    if (thing->player)
-    {
-        player = thing->player;
-        if (player->powers[pw_flight] && aboveFloor)
-        {
-            thing->z = thing->floorz + aboveFloor;
-            if (thing->z + thing->height > thing->ceilingz)
-            {
-                thing->z = thing->ceilingz - thing->height;
-            }
-            player->viewz = thing->z + player->viewheight;
-        }
-        else
-        {
-            thing->z = thing->floorz;
-            player->viewz = thing->z + player->viewheight;
-            player->lookdir = 0;
-        }
-    }
-    else if (thing->flags & MF_MISSILE)
-    {
-        thing->z = thing->floorz + aboveFloor;
-        if (thing->z + thing->height > thing->ceilingz)
-        {
-            thing->z = thing->ceilingz - thing->height;
-        }
-    }
-    else
-    {
-        thing->z = thing->floorz;
-    }
-    // Spawn teleport fog at source and destination
-    fogDelta = thing->flags & MF_MISSILE ? 0 : TELEFOGHEIGHT;
-    fog = P_SpawnMobj(oldx, oldy, oldz + fogDelta, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-    an = angle >> ANGLETOFINESHIFT;
-    fog = P_SpawnMobj(x + 20 * finecosine[an],
-                      y + 20 * finesine[an], thing->z + fogDelta, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-    if (thing->player && !thing->player->powers[pw_weaponlevel2])
-    {                           // Freeze player for about .5 sec
-        thing->reactiontime = 18;
-    }
-    thing->angle = angle;
-    if (thing->flags2 & MF2_FOOTCLIP
-        && P_GetThingFloorType(thing) != FLOOR_SOLID)
-    {
-        thing->flags2 |= MF2_FEETARECLIPPED;
-    }
-    else if (thing->flags2 & MF2_FEETARECLIPPED)
-    {
-        thing->flags2 &= ~MF2_FEETARECLIPPED;
-    }
-    if (thing->flags & MF_MISSILE)
-    {
-        angle >>= ANGLETOFINESHIFT;
-        thing->momx = FixedMul(thing->info->speed, finecosine[angle]);
-        thing->momy = FixedMul(thing->info->speed, finesine[angle]);
-    }
-    else
-    {
-        thing->momx = thing->momy = thing->momz = 0;
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC EV_Teleport
-//
-//----------------------------------------------------------------------------
-
-boolean EV_Teleport(line_t * line, int side, mobj_t * thing)
-{
-    int i;
-    int tag;
-    mobj_t *m;
-    thinker_t *thinker;
-    sector_t *sector;
-
-    if (thing->flags2 & MF2_NOTELEPORT)
-    {
-        return (false);
-    }
-    if (side == 1)
-    {                           // Don't teleport when crossing back side
-        return (false);
-    }
-    tag = line->tag;
-    for (i = 0; i < numsectors; i++)
-    {
-        if (sectors[i].tag == tag)
-        {
-            for (thinker = thinkercap.next; thinker != &thinkercap;
-                 thinker = thinker->next)
-            {
-                if (thinker->function != P_MobjThinker)
-                {               // Not a mobj
-                    continue;
-                }
-                m = (mobj_t *) thinker;
-                if (m->type != MT_TELEPORTMAN)
-                {               // Not a teleportman
-                    continue;
-                }
-                sector = m->subsector->sector;
-                if (sector - sectors != i)
-                {               // Wrong sector
-                    continue;
-                }
-                return (P_Teleport(thing, m->x, m->y, m->angle));
-            }
-        }
-    }
-    return (false);
-}
diff --git a/games/NXDoom/src/heretic/p_tick.c b/games/NXDoom/src/heretic/p_tick.c
deleted file mode 100644
index ac1c94299..000000000
--- a/games/NXDoom/src/heretic/p_tick.c
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_tick.c
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "v_video.h"
-
-int leveltime;
-int TimerGame;
-
-/*
-===============================================================================
-
-								THINKERS
-
-All thinkers should be allocated by Z_Malloc so they can be operated on uniformly.  The actual
-structures will vary in size, but the first element must be thinker_t.
-
-===============================================================================
-*/
-
-thinker_t thinkercap;           // both the head and tail of the thinker list
-
-/*
-===============
-=
-= P_InitThinkers
-=
-===============
-*/
-
-void P_InitThinkers(void)
-{
-    thinkercap.prev = thinkercap.next = &thinkercap;
-}
-
-
-/*
-===============
-=
-= P_AddThinker
-=
-= Adds a new thinker at the end of the list
-=
-===============
-*/
-
-void P_AddThinker(thinker_t * thinker)
-{
-    thinkercap.prev->next = thinker;
-    thinker->next = &thinkercap;
-    thinker->prev = thinkercap.prev;
-    thinkercap.prev = thinker;
-}
-
-/*
-===============
-=
-= P_RemoveThinker
-=
-= Deallocation is lazy -- it will not actually be freed until its
-= thinking turn comes up
-=
-===============
-*/
-
-void P_RemoveThinker(thinker_t * thinker)
-{
-    thinker->function = (think_t) - 1;
-}
-
-/*
-===============
-=
-= P_AllocateThinker
-=
-= Allocates memory and adds a new thinker at the end of the list
-=
-===============
-*/
-
-void P_AllocateThinker(thinker_t * thinker)
-{
-}
-
-
-/*
-===============
-=
-= P_RunThinkers
-=
-===============
-*/
-
-void P_RunThinkers(void)
-{
-    thinker_t *currentthinker, *nextthinker;
-
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
-    {
-        if (currentthinker->function == (think_t) - 1)
-        {                       // time to remove it
-            nextthinker = currentthinker->next;
-            currentthinker->next->prev = currentthinker->prev;
-            currentthinker->prev->next = currentthinker->next;
-            Z_Free(currentthinker);
-        }
-        else
-        {
-            if (currentthinker->function)
-                currentthinker->function(currentthinker);
-            nextthinker = currentthinker->next;
-        }
-        currentthinker = nextthinker;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_Ticker
-//
-//----------------------------------------------------------------------------
-
-void P_Ticker(void)
-{
-    int i;
-
-    if (paused)
-    {
-        return;
-    }
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (playeringame[i])
-        {
-            P_PlayerThink(&players[i]);
-        }
-    }
-    if (TimerGame)
-    {
-        if (!--TimerGame)
-        {
-            G_ExitLevel();
-        }
-    }
-    P_RunThinkers();
-    P_UpdateSpecials();
-    P_AmbientSound();
-    leveltime++;
-}
diff --git a/games/NXDoom/src/heretic/p_user.c b/games/NXDoom/src/heretic/p_user.c
deleted file mode 100644
index b24029ca7..000000000
--- a/games/NXDoom/src/heretic/p_user.c
+++ /dev/null
@@ -1,1017 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// P_user.c
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-void P_PlayerNextArtifact(player_t * player);
-
-// Macros
-
-#define MAXBOB 0x100000         // 16 pixels of bob
-
-// Data
-
-boolean onground;
-int newtorch;                   // used in the torch flicker effect.
-int newtorchdelta;
-
-boolean WeaponInShareware[] = {
-    true,                       // Staff
-    true,                       // Gold wand
-    true,                       // Crossbow
-    true,                       // Blaster
-    false,                      // Skull rod
-    false,                      // Phoenix rod
-    false,                      // Mace
-    true,                       // Gauntlets
-    true                        // Beak
-};
-
-/*
-==================
-=
-= P_Thrust
-=
-= moves the given origin along a given angle
-=
-==================
-*/
-
-void P_Thrust(player_t * player, angle_t angle, fixed_t move)
-{
-    angle >>= ANGLETOFINESHIFT;
-    if (player->powers[pw_flight] && !(player->mo->z <= player->mo->floorz))
-    {
-        player->mo->momx += FixedMul(move, finecosine[angle]);
-        player->mo->momy += FixedMul(move, finesine[angle]);
-    }
-    else if (player->mo->subsector->sector->special == 15)      // Friction_Low
-    {
-        player->mo->momx += FixedMul(move >> 2, finecosine[angle]);
-        player->mo->momy += FixedMul(move >> 2, finesine[angle]);
-    }
-    else
-    {
-        player->mo->momx += FixedMul(move, finecosine[angle]);
-        player->mo->momy += FixedMul(move, finesine[angle]);
-    }
-}
-
-
-/*
-==================
-=
-= P_CalcHeight
-=
-=Calculate the walking / running height adjustment
-=
-==================
-*/
-
-void P_CalcHeight(player_t * player)
-{
-    int angle;
-    fixed_t bob;
-
-//
-// regular movement bobbing (needs to be calculated for gun swing even
-// if not on ground)
-// OPTIMIZE: tablify angle
-
-    player->bob = FixedMul(player->mo->momx, player->mo->momx) +
-        FixedMul(player->mo->momy, player->mo->momy);
-    player->bob >>= 2;
-    if (player->bob > MAXBOB)
-        player->bob = MAXBOB;
-    if (player->mo->flags2 & MF2_FLY && !onground)
-    {
-        player->bob = FRACUNIT / 2;
-    }
-
-    if ((player->cheats & CF_NOMOMENTUM))
-    {
-        player->viewz = player->mo->z + VIEWHEIGHT;
-        if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
-            player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
-        player->viewz = player->mo->z + player->viewheight;
-        return;
-    }
-
-    angle = (FINEANGLES / 20 * leveltime) & FINEMASK;
-    bob = FixedMul(player->bob / 2, finesine[angle]);
-
-//
-// move viewheight
-//
-    if (player->playerstate == PST_LIVE)
-    {
-        player->viewheight += player->deltaviewheight;
-        if (player->viewheight > VIEWHEIGHT)
-        {
-            player->viewheight = VIEWHEIGHT;
-            player->deltaviewheight = 0;
-        }
-        if (player->viewheight < VIEWHEIGHT / 2)
-        {
-            player->viewheight = VIEWHEIGHT / 2;
-            if (player->deltaviewheight <= 0)
-                player->deltaviewheight = 1;
-        }
-
-        if (player->deltaviewheight)
-        {
-            player->deltaviewheight += FRACUNIT / 4;
-            if (!player->deltaviewheight)
-                player->deltaviewheight = 1;
-        }
-    }
-
-    if (player->chickenTics)
-    {
-        player->viewz = player->mo->z + player->viewheight - (20 * FRACUNIT);
-    }
-    else
-    {
-        player->viewz = player->mo->z + player->viewheight + bob;
-    }
-    if (player->mo->flags2 & MF2_FEETARECLIPPED
-        && player->playerstate != PST_DEAD
-        && player->mo->z <= player->mo->floorz)
-    {
-        player->viewz -= FOOTCLIPSIZE;
-    }
-    if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
-    {
-        player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
-    }
-    if (player->viewz < player->mo->floorz + 4 * FRACUNIT)
-    {
-        player->viewz = player->mo->floorz + 4 * FRACUNIT;
-    }
-}
-
-/*
-=================
-=
-= P_MovePlayer
-=
-=================
-*/
-
-void P_MovePlayer(player_t * player)
-{
-    int look;
-    int fly;
-    ticcmd_t *cmd;
-
-    cmd = &player->cmd;
-    player->mo->angle += (cmd->angleturn << 16);
-
-    onground = (player->mo->z <= player->mo->floorz
-                || (player->mo->flags2 & MF2_ONMOBJ));
-
-    if (player->chickenTics)
-    {                           // Chicken speed
-        if (cmd->forwardmove && (onground || player->mo->flags2 & MF2_FLY))
-            P_Thrust(player, player->mo->angle, cmd->forwardmove * 2500);
-        if (cmd->sidemove && (onground || player->mo->flags2 & MF2_FLY))
-            P_Thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2500);
-    }
-    else
-    {                           // Normal speed
-        if (cmd->forwardmove && (onground || player->mo->flags2 & MF2_FLY))
-            P_Thrust(player, player->mo->angle, cmd->forwardmove * 2048);
-        if (cmd->sidemove && (onground || player->mo->flags2 & MF2_FLY))
-            P_Thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2048);
-    }
-
-    if (cmd->forwardmove || cmd->sidemove)
-    {
-        if (player->chickenTics)
-        {
-            if (player->mo->state == &states[S_CHICPLAY])
-            {
-                P_SetMobjState(player->mo, S_CHICPLAY_RUN1);
-            }
-        }
-        else
-        {
-            if (player->mo->state == &states[S_PLAY])
-            {
-                P_SetMobjState(player->mo, S_PLAY_RUN1);
-            }
-        }
-    }
-
-    look = cmd->lookfly & 15;
-    if (look > 7)
-    {
-        look -= 16;
-    }
-    if (look)
-    {
-        if (look == TOCENTER)
-        {
-            player->centering = true;
-        }
-        else
-        {
-            player->lookdir += 5 * look;
-            if (player->lookdir > 90 || player->lookdir < -110)
-            {
-                player->lookdir -= 5 * look;
-            }
-        }
-    }
-    if (player->centering)
-    {
-        if (player->lookdir > 0)
-        {
-            player->lookdir -= 8;
-        }
-        else if (player->lookdir < 0)
-        {
-            player->lookdir += 8;
-        }
-        if (abs(player->lookdir) < 8)
-        {
-            player->lookdir = 0;
-            player->centering = false;
-        }
-    }
-    fly = cmd->lookfly >> 4;
-    if (fly > 7)
-    {
-        fly -= 16;
-    }
-    if (fly && player->powers[pw_flight])
-    {
-        if (fly != TOCENTER)
-        {
-            player->flyheight = fly * 2;
-            if (!(player->mo->flags2 & MF2_FLY))
-            {
-                player->mo->flags2 |= MF2_FLY;
-                player->mo->flags |= MF_NOGRAVITY;
-            }
-        }
-        else
-        {
-            player->mo->flags2 &= ~MF2_FLY;
-            player->mo->flags &= ~MF_NOGRAVITY;
-        }
-    }
-    else if (fly > 0)
-    {
-        P_PlayerUseArtifact(player, arti_fly);
-    }
-    if (player->mo->flags2 & MF2_FLY)
-    {
-        player->mo->momz = player->flyheight * FRACUNIT;
-        if (player->flyheight)
-        {
-            player->flyheight /= 2;
-        }
-    }
-}
-
-/*
-=================
-=
-= P_DeathThink
-=
-=================
-*/
-
-#define         ANG5    (ANG90/18)
-
-void P_DeathThink(player_t * player)
-{
-    angle_t angle, delta;
-    int lookDelta;
-
-    P_MovePsprites(player);
-
-    onground = (player->mo->z <= player->mo->floorz);
-    if (player->mo->type == MT_BLOODYSKULL)
-    {                           // Flying bloody skull
-        player->viewheight = 6 * FRACUNIT;
-        player->deltaviewheight = 0;
-        //player->damagecount = 20;
-        if (onground)
-        {
-            if (player->lookdir < 60)
-            {
-                lookDelta = (60 - player->lookdir) / 8;
-                if (lookDelta < 1 && (leveltime & 1))
-                {
-                    lookDelta = 1;
-                }
-                else if (lookDelta > 6)
-                {
-                    lookDelta = 6;
-                }
-                player->lookdir += lookDelta;
-            }
-        }
-    }
-    else
-    {                           // Fall to ground
-        player->deltaviewheight = 0;
-        if (player->viewheight > 6 * FRACUNIT)
-            player->viewheight -= FRACUNIT;
-        if (player->viewheight < 6 * FRACUNIT)
-            player->viewheight = 6 * FRACUNIT;
-        if (player->lookdir > 0)
-        {
-            player->lookdir -= 6;
-        }
-        else if (player->lookdir < 0)
-        {
-            player->lookdir += 6;
-        }
-        if (abs(player->lookdir) < 6)
-        {
-            player->lookdir = 0;
-        }
-    }
-    P_CalcHeight(player);
-
-    if (player->attacker && player->attacker != player->mo)
-    {
-        angle = R_PointToAngle2(player->mo->x, player->mo->y,
-                                player->attacker->x, player->attacker->y);
-        delta = angle - player->mo->angle;
-        if (delta < ANG5 || delta > (unsigned) -ANG5)
-        {                       // Looking at killer, so fade damage flash down
-            player->mo->angle = angle;
-            if (player->damagecount)
-            {
-                player->damagecount--;
-            }
-        }
-        else if (delta < ANG180)
-            player->mo->angle += ANG5;
-        else
-            player->mo->angle -= ANG5;
-    }
-    else if (player->damagecount)
-    {
-        player->damagecount--;
-    }
-
-    if (player->cmd.buttons & BT_USE)
-    {
-        if (player == &players[consoleplayer])
-        {
-            I_SetPalette(W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE));
-            inv_ptr = 0;
-            curpos = 0;
-            newtorch = 0;
-            newtorchdelta = 0;
-        }
-        player->playerstate = PST_REBORN;
-        // Let the mobj know the player has entered the reborn state.  Some
-        // mobjs need to know when it's ok to remove themselves.
-        player->mo->special2.i = 666;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ChickenPlayerThink
-//
-//----------------------------------------------------------------------------
-
-void P_ChickenPlayerThink(player_t * player)
-{
-    mobj_t *pmo;
-
-    if (player->health > 0)
-    {                           // Handle beak movement
-        P_UpdateBeak(player, &player->psprites[ps_weapon]);
-    }
-    if (player->chickenTics & 15)
-    {
-        return;
-    }
-    pmo = player->mo;
-    if (!(pmo->momx + pmo->momy) && P_Random() < 160)
-    {                           // Twitch view angle
-        pmo->angle += P_SubRandom() << 19;
-    }
-    if ((pmo->z <= pmo->floorz) && (P_Random() < 32))
-    {                           // Jump and noise
-        pmo->momz += FRACUNIT;
-        P_SetMobjState(pmo, S_CHICPLAY_PAIN);
-        return;
-    }
-    if (P_Random() < 48)
-    {                           // Just noise
-        S_StartSound(pmo, sfx_chicact);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_GetPlayerNum
-//
-//----------------------------------------------------------------------------
-
-int P_GetPlayerNum(player_t * player)
-{
-    int i;
-
-    for (i = 0; i < MAXPLAYERS; i++)
-    {
-        if (player == &players[i])
-        {
-            return (i);
-        }
-    }
-    return (0);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_UndoPlayerChicken
-//
-//----------------------------------------------------------------------------
-
-boolean P_UndoPlayerChicken(player_t * player)
-{
-    mobj_t *fog;
-    mobj_t *mo;
-    mobj_t *pmo;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    angle_t angle;
-    int playerNum;
-    weapontype_t weapon;
-    int oldFlags;
-    int oldFlags2;
-
-    pmo = player->mo;
-    x = pmo->x;
-    y = pmo->y;
-    z = pmo->z;
-    angle = pmo->angle;
-    weapon = pmo->special1.i;
-    oldFlags = pmo->flags;
-    oldFlags2 = pmo->flags2;
-    P_SetMobjState(pmo, S_FREETARGMOBJ);
-    mo = P_SpawnMobj(x, y, z, MT_PLAYER);
-    if (P_TestMobjLocation(mo) == false)
-    {                           // Didn't fit
-        P_RemoveMobj(mo);
-        mo = P_SpawnMobj(x, y, z, MT_CHICPLAYER);
-        mo->angle = angle;
-        mo->health = player->health;
-        mo->special1.i = weapon;
-        mo->player = player;
-        mo->flags = oldFlags;
-        mo->flags2 = oldFlags2;
-        player->mo = mo;
-        player->chickenTics = 2 * 35;
-        return (false);
-    }
-    playerNum = P_GetPlayerNum(player);
-    if (playerNum != 0)
-    {                           // Set color translation
-        mo->flags |= playerNum << MF_TRANSSHIFT;
-    }
-    mo->angle = angle;
-    mo->player = player;
-    mo->reactiontime = 18;
-    if (oldFlags2 & MF2_FLY)
-    {
-        mo->flags2 |= MF2_FLY;
-        mo->flags |= MF_NOGRAVITY;
-    }
-    player->chickenTics = 0;
-    player->powers[pw_weaponlevel2] = 0;
-    player->health = mo->health = MAXHEALTH;
-    player->mo = mo;
-    angle >>= ANGLETOFINESHIFT;
-    fog = P_SpawnMobj(x + 20 * finecosine[angle],
-                      y + 20 * finesine[angle], z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-    P_PostChickenWeapon(player, weapon);
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerThink
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerThink(player_t * player)
-{
-    ticcmd_t *cmd;
-    weapontype_t newweapon;
-
-    // No-clip cheat
-    if (player->cheats & CF_NOCLIP)
-    {
-        player->mo->flags |= MF_NOCLIP;
-    }
-    else
-    {
-        player->mo->flags &= ~MF_NOCLIP;
-    }
-    cmd = &player->cmd;
-    if (player->mo->flags & MF_JUSTATTACKED)
-    {                           // Gauntlets attack auto forward motion
-        cmd->angleturn = 0;
-        cmd->forwardmove = 0xc800 / 512;
-        cmd->sidemove = 0;
-        player->mo->flags &= ~MF_JUSTATTACKED;
-    }
-// messageTics is above the rest of the counters so that messages will
-//              go away, even in death.
-    player->messageTics--;      // Can go negative
-    if (!player->messageTics)
-    {                           // Refresh the screen when a message goes away
-        ultimatemsg = false;    // clear out any chat messages.
-        BorderTopRefresh = true;
-    }
-    if (player->playerstate == PST_DEAD)
-    {
-        P_DeathThink(player);
-        return;
-    }
-    if (player->chickenTics)
-    {
-        P_ChickenPlayerThink(player);
-    }
-    // Handle movement
-    if (player->mo->reactiontime)
-    {                           // Player is frozen
-        player->mo->reactiontime--;
-    }
-    else
-    {
-        P_MovePlayer(player);
-    }
-    P_CalcHeight(player);
-    if (player->mo->subsector->sector->special)
-    {
-        P_PlayerInSpecialSector(player);
-    }
-    if (cmd->arti)
-    {                           // Use an artifact
-        if (cmd->arti == 0xff)
-        {
-            P_PlayerNextArtifact(player);
-        }
-        else
-        {
-            P_PlayerUseArtifact(player, cmd->arti);
-        }
-    }
-    // Check for weapon change
-    if (cmd->buttons & BT_SPECIAL)
-    {                           // A special event has no other buttons
-        cmd->buttons = 0;
-    }
-    if (cmd->buttons & BT_CHANGE)
-    {
-        // The actual changing of the weapon is done when the weapon
-        // psprite can do it (A_WeaponReady), so it doesn't happen in
-        // the middle of an attack.
-        newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
-        if (newweapon == wp_staff && player->weaponowned[wp_gauntlets]
-            && !(player->readyweapon == wp_gauntlets))
-        {
-            newweapon = wp_gauntlets;
-        }
-        if (player->weaponowned[newweapon]
-            && newweapon != player->readyweapon)
-        {
-            if (WeaponInShareware[newweapon] || gamemode != shareware)
-            {
-                player->pendingweapon = newweapon;
-            }
-        }
-    }
-    // Check for use
-    if (cmd->buttons & BT_USE)
-    {
-        if (!player->usedown)
-        {
-            P_UseLines(player);
-            player->usedown = true;
-        }
-    }
-    else
-    {
-        player->usedown = false;
-    }
-    // Chicken counter
-    if (player->chickenTics)
-    {
-        if (player->chickenPeck)
-        {                       // Chicken attack counter
-            player->chickenPeck -= 3;
-        }
-        if (!--player->chickenTics)
-        {                       // Attempt to undo the chicken
-            P_UndoPlayerChicken(player);
-        }
-    }
-    // Cycle psprites
-    P_MovePsprites(player);
-    // Other Counters
-    if (player->powers[pw_invulnerability])
-    {
-        player->powers[pw_invulnerability]--;
-    }
-    if (player->powers[pw_invisibility])
-    {
-        if (!--player->powers[pw_invisibility])
-        {
-            player->mo->flags &= ~MF_SHADOW;
-        }
-    }
-    if (player->powers[pw_infrared])
-    {
-        player->powers[pw_infrared]--;
-    }
-    if (player->powers[pw_flight])
-    {
-        if (!--player->powers[pw_flight])
-        {
-            // haleyjd: removed externdriver crap
-            if (player->mo->z != player->mo->floorz)
-            {
-                player->centering = true;
-            }
-
-            player->mo->flags2 &= ~MF2_FLY;
-            player->mo->flags &= ~MF_NOGRAVITY;
-            BorderTopRefresh = true;    //make sure the sprite's cleared out
-        }
-    }
-    if (player->powers[pw_weaponlevel2])
-    {
-        if (!--player->powers[pw_weaponlevel2])
-        {
-            if ((player->readyweapon == wp_phoenixrod)
-                && (player->psprites[ps_weapon].state
-                    != &states[S_PHOENIXREADY])
-                && (player->psprites[ps_weapon].state
-                    != &states[S_PHOENIXUP]))
-            {
-                P_SetPsprite(player, ps_weapon, S_PHOENIXREADY);
-                player->ammo[am_phoenixrod] -= USE_PHRD_AMMO_2;
-                player->refire = 0;
-            }
-            else if ((player->readyweapon == wp_gauntlets)
-                     || (player->readyweapon == wp_staff))
-            {
-                player->pendingweapon = player->readyweapon;
-            }
-            BorderTopRefresh = true;
-        }
-    }
-    if (player->damagecount)
-    {
-        player->damagecount--;
-    }
-    if (player->bonuscount)
-    {
-        player->bonuscount--;
-    }
-    // Colormaps
-    if (player->powers[pw_invulnerability])
-    {
-        if (player->powers[pw_invulnerability] > BLINKTHRESHOLD
-            || (player->powers[pw_invulnerability] & 8))
-        {
-            player->fixedcolormap = INVERSECOLORMAP;
-        }
-        else
-        {
-            player->fixedcolormap = 0;
-        }
-    }
-    else if (player->powers[pw_infrared])
-    {
-        if (player->powers[pw_infrared] <= BLINKTHRESHOLD)
-        {
-            if (player->powers[pw_infrared] & 8)
-            {
-                player->fixedcolormap = 0;
-            }
-            else
-            {
-                player->fixedcolormap = 1;
-            }
-        }
-        else if (!(leveltime & 16) && player == &players[consoleplayer])
-        {
-            if (newtorch)
-            {
-                if (player->fixedcolormap + newtorchdelta > 7
-                    || player->fixedcolormap + newtorchdelta < 1
-                    || newtorch == player->fixedcolormap)
-                {
-                    newtorch = 0;
-                }
-                else
-                {
-                    player->fixedcolormap += newtorchdelta;
-                }
-            }
-            else
-            {
-                newtorch = (M_Random() & 7) + 1;
-                newtorchdelta = (newtorch == player->fixedcolormap) ?
-                    0 : ((newtorch > player->fixedcolormap) ? 1 : -1);
-            }
-        }
-    }
-    else
-    {
-        player->fixedcolormap = 0;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ArtiTele
-//
-//----------------------------------------------------------------------------
-
-void P_ArtiTele(player_t * player)
-{
-    int i;
-    int selections;
-    fixed_t destX;
-    fixed_t destY;
-    angle_t destAngle;
-
-    if (deathmatch)
-    {
-        selections = deathmatch_p - deathmatchstarts;
-        i = P_Random() % selections;
-        destX = deathmatchstarts[i].x << FRACBITS;
-        destY = deathmatchstarts[i].y << FRACBITS;
-        destAngle = ANG45 * (deathmatchstarts[i].angle / 45);
-    }
-    else
-    {
-        destX = playerstarts[0].x << FRACBITS;
-        destY = playerstarts[0].y << FRACBITS;
-        destAngle = ANG45 * (playerstarts[0].angle / 45);
-    }
-    P_Teleport(player->mo, destX, destY, destAngle);
-    S_StartSound(NULL, sfx_wpnup);      // Full volume laugh
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerNextArtifact
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerNextArtifact(player_t * player)
-{
-    if (player == &players[consoleplayer])
-    {
-        inv_ptr--;
-        if (inv_ptr < 6)
-        {
-            curpos--;
-            if (curpos < 0)
-            {
-                curpos = 0;
-            }
-        }
-        if (inv_ptr < 0)
-        {
-            inv_ptr = player->inventorySlotNum - 1;
-            if (inv_ptr < 6)
-            {
-                curpos = inv_ptr;
-            }
-            else
-            {
-                curpos = 6;
-            }
-        }
-        player->readyArtifact = player->inventory[inv_ptr].type;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerRemoveArtifact
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerRemoveArtifact(player_t * player, int slot)
-{
-    int i;
-    player->artifactCount--;
-    if (!(--player->inventory[slot].count))
-    {                           // Used last of a type - compact the artifact list
-        player->readyArtifact = arti_none;
-        player->inventory[slot].type = arti_none;
-        for (i = slot + 1; i < player->inventorySlotNum; i++)
-        {
-            player->inventory[i - 1] = player->inventory[i];
-        }
-        player->inventorySlotNum--;
-        if (player == &players[consoleplayer])
-        {                       // Set position markers and get next readyArtifact
-            inv_ptr--;
-            if (inv_ptr < 6)
-            {
-                curpos--;
-                if (curpos < 0)
-                {
-                    curpos = 0;
-                }
-            }
-            if (inv_ptr >= player->inventorySlotNum)
-            {
-                inv_ptr = player->inventorySlotNum - 1;
-            }
-            if (inv_ptr < 0)
-            {
-                inv_ptr = 0;
-            }
-            player->readyArtifact = player->inventory[inv_ptr].type;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerUseArtifact
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerUseArtifact(player_t * player, artitype_t arti)
-{
-    int i;
-
-    for (i = 0; i < player->inventorySlotNum; i++)
-    {
-        if (player->inventory[i].type == arti)
-        {                       // Found match - try to use
-            if (P_UseArtifact(player, arti))
-            {                   // Artifact was used - remove it from inventory
-                P_PlayerRemoveArtifact(player, i);
-                if (player == &players[consoleplayer])
-                {
-                    S_StartSound(NULL, sfx_artiuse);
-                    ArtifactFlash = 4;
-                }
-            }
-            else
-            {                   // Unable to use artifact, advance pointer
-                P_PlayerNextArtifact(player);
-            }
-            break;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_UseArtifact
-//
-// Returns true if artifact was used.
-//
-//----------------------------------------------------------------------------
-
-boolean P_UseArtifact(player_t * player, artitype_t arti)
-{
-    mobj_t *mo;
-    angle_t angle;
-
-    switch (arti)
-    {
-        case arti_invulnerability:
-            if (!P_GivePower(player, pw_invulnerability))
-            {
-                return (false);
-            }
-            break;
-        case arti_invisibility:
-            if (!P_GivePower(player, pw_invisibility))
-            {
-                return (false);
-            }
-            break;
-        case arti_health:
-            if (!P_GiveBody(player, 25))
-            {
-                return (false);
-            }
-            break;
-        case arti_superhealth:
-            if (!P_GiveBody(player, 100))
-            {
-                return (false);
-            }
-            break;
-        case arti_tomeofpower:
-            if (player->chickenTics)
-            {                   // Attempt to undo chicken
-                if (P_UndoPlayerChicken(player) == false)
-                {               // Failed
-                    P_DamageMobj(player->mo, NULL, NULL, 10000);
-                }
-                else
-                {               // Succeeded
-                    player->chickenTics = 0;
-                    S_StartSound(player->mo, sfx_wpnup);
-                }
-            }
-            else
-            {
-                if (!P_GivePower(player, pw_weaponlevel2))
-                {
-                    return (false);
-                }
-                if (player->readyweapon == wp_staff)
-                {
-                    P_SetPsprite(player, ps_weapon, S_STAFFREADY2_1);
-                }
-                else if (player->readyweapon == wp_gauntlets)
-                {
-                    P_SetPsprite(player, ps_weapon, S_GAUNTLETREADY2_1);
-                }
-            }
-            break;
-        case arti_torch:
-            if (!P_GivePower(player, pw_infrared))
-            {
-                return (false);
-            }
-            break;
-        case arti_firebomb:
-            angle = player->mo->angle >> ANGLETOFINESHIFT;
-
-            // Vanilla bug here:
-            // Original code here looks like:
-            //   (player->mo->flags2 & MF2_FEETARECLIPPED != 0),
-            // Which under C's operator precedence is:
-            //   (player->mo->flags2 & (MF2_FEETARECLIPPED != 0)),
-            // Which simplifies to:
-            //   (player->mo->flags2 & 1),
-            mo = P_SpawnMobj(player->mo->x + 24 * finecosine[angle],
-                             player->mo->y + 24 * finesine[angle],
-                             player->mo->z -
-                             15 * FRACUNIT * (player->mo->flags2 & 1),
-                             MT_FIREBOMB);
-            mo->target = player->mo;
-            break;
-        case arti_egg:
-            mo = player->mo;
-            P_SpawnPlayerMissile(mo, MT_EGGFX);
-            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 6));
-            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 6));
-            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 3));
-            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 3));
-            break;
-        case arti_fly:
-            if (!P_GivePower(player, pw_flight))
-            {
-                return (false);
-            }
-            break;
-        case arti_teleport:
-            P_ArtiTele(player);
-            break;
-        default:
-            return (false);
-    }
-    return (true);
-}
diff --git a/games/NXDoom/src/heretic/r_bsp.c b/games/NXDoom/src/heretic/r_bsp.c
deleted file mode 100644
index 1e9d3be7a..000000000
--- a/games/NXDoom/src/heretic/r_bsp.c
+++ /dev/null
@@ -1,489 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// R_bsp.c
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "m_bbox.h"
-#include "i_system.h"
-#include "r_local.h"
-
-seg_t *curline;
-side_t *sidedef;
-line_t *linedef;
-sector_t *frontsector, *backsector;
-
-drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
-
-void R_StoreWallRange(int start, int stop);
-
-/*
-====================
-=
-= R_ClearDrawSegs
-=
-====================
-*/
-
-void R_ClearDrawSegs(void)
-{
-    ds_p = drawsegs;
-}
-
-//=============================================================================
-
-
-/*
-===============================================================================
-=
-= ClipWallSegment
-=
-= Clips the given range of columns and includes it in the new clip list
-===============================================================================
-*/
-
-typedef struct
-{
-    int first, last;
-} cliprange_t;
-
-// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
-// that can be generated in a scene by the DOOM engine. This was determined by
-// Lee Killough during BOOM development to be a function of the screensize.
-// The simplest thing we can do, other than fix this bug, is to let the game
-// render overage and then bomb out by detecting the overflow after the 
-// fact. -haleyjd
-//#define MAXSEGS 32
-#define MAXSEGS (SCREENWIDTH / 2 + 1)
-
-cliprange_t solidsegs[MAXSEGS], *newend;        // newend is one past the last valid seg
-
-
-void R_ClipSolidWallSegment(int first, int last)
-{
-    cliprange_t *next, *start;
-
-// find the first range that touches the range (adjacent pixels are touching)
-    start = solidsegs;
-    while (start->last < first - 1)
-        start++;
-
-    if (first < start->first)
-    {
-        if (last < start->first - 1)
-        {                       // post is entirely visible (above start), so insert a new clippost
-            R_StoreWallRange(first, last);
-            next = newend;
-            newend++;
-            while (next != start)
-            {
-                *next = *(next - 1);
-                next--;
-            }
-            next->first = first;
-            next->last = last;
-            return;
-        }
-
-        // there is a fragment above *start
-        R_StoreWallRange(first, start->first - 1);
-        start->first = first;   // adjust the clip size
-    }
-
-    if (last <= start->last)
-        return;                 // bottom contained in start
-
-    next = start;
-    while (last >= (next + 1)->first - 1)
-    {
-        // there is a fragment between two posts
-        R_StoreWallRange(next->last + 1, (next + 1)->first - 1);
-        next++;
-        if (last <= next->last)
-        {                       // bottom is contained in next
-            start->last = next->last;   // adjust the clip size
-            goto crunch;
-        }
-    }
-
-    // there is a fragment after *next
-    R_StoreWallRange(next->last + 1, last);
-    start->last = last;         // adjust the clip size
-
-
-// remove start+1 to next from the clip list,
-// because start now covers their area
-  crunch:
-    if (next == start)
-        return;                 // post just extended past the bottom of one post
-
-    while (next++ != newend)    // remove a post
-        *++start = *next;
-    newend = start + 1;
-}
-
-/*
-===============================================================================
-=
-= R_ClipPassWallSegment
-=
-= Clips the given range of columns, but does not includes it in the clip list
-===============================================================================
-*/
-
-void R_ClipPassWallSegment(int first, int last)
-{
-    cliprange_t *start;
-
-// find the first range that touches the range (adjacent pixels are touching)
-    start = solidsegs;
-    while (start->last < first - 1)
-        start++;
-
-    if (first < start->first)
-    {
-        if (last < start->first - 1)
-        {                       // post is entirely visible (above start)
-            R_StoreWallRange(first, last);
-            return;
-        }
-
-        // there is a fragment above *start
-        R_StoreWallRange(first, start->first - 1);
-    }
-
-    if (last <= start->last)
-        return;                 // bottom contained in start
-
-    while (last >= (start + 1)->first - 1)
-    {
-        // there is a fragment between two posts
-        R_StoreWallRange(start->last + 1, (start + 1)->first - 1);
-        start++;
-        if (last <= start->last)
-            return;
-    }
-
-    // there is a fragment after *next
-    R_StoreWallRange(start->last + 1, last);
-}
-
-
-
-/*
-====================
-=
-= R_ClearClipSegs
-=
-====================
-*/
-
-void R_ClearClipSegs(void)
-{
-    solidsegs[0].first = -0x7fffffff;
-    solidsegs[0].last = -1;
-    solidsegs[1].first = viewwidth;
-    solidsegs[1].last = 0x7fffffff;
-    newend = solidsegs + 2;
-}
-
-
-//=============================================================================
-
-/*
-======================
-=
-= R_AddLine
-=
-= Clips the given segment and adds any visible pieces to the line list
-=
-======================
-*/
-
-void R_AddLine(seg_t * line)
-{
-    int x1, x2;
-    angle_t angle1, angle2, span, tspan;
-
-    curline = line;
-
-// OPTIMIZE: quickly reject orthogonal back sides
-
-    angle1 = R_PointToAngle(line->v1->x, line->v1->y);
-    angle2 = R_PointToAngle(line->v2->x, line->v2->y);
-
-//
-// clip to view edges
-// OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW)
-    span = angle1 - angle2;
-    if (span >= ANG180)
-        return;                 // back side
-
-    rw_angle1 = angle1;         // global angle needed by segcalc
-    angle1 -= viewangle;
-    angle2 -= viewangle;
-
-    tspan = angle1 + clipangle;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return;             // totally off the left edge
-        angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return;             // totally off the left edge
-        angle2 = -clipangle;
-    }
-
-//
-// the seg is in the view range, but not necessarily visible
-//
-    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
-    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
-    x1 = viewangletox[angle1];
-    x2 = viewangletox[angle2];
-    if (x1 == x2)
-        return;                 // does not cross a pixel
-
-    backsector = line->backsector;
-
-    if (!backsector)
-        goto clipsolid;         // single sided line
-
-    if (backsector->ceilingheight <= frontsector->floorheight
-        || backsector->floorheight >= frontsector->ceilingheight)
-        goto clipsolid;         // closed door
-
-    if (backsector->ceilingheight != frontsector->ceilingheight
-        || backsector->floorheight != frontsector->floorheight)
-        goto clippass;          // window
-
-// reject empty lines used for triggers and special events
-    if (backsector->ceilingpic == frontsector->ceilingpic
-        && backsector->floorpic == frontsector->floorpic
-        && backsector->lightlevel == frontsector->lightlevel
-        && curline->sidedef->midtexture == 0)
-        return;
-
-  clippass:
-    R_ClipPassWallSegment(x1, x2 - 1);
-    return;
-
-  clipsolid:
-    R_ClipSolidWallSegment(x1, x2 - 1);
-}
-
-//============================================================================
-
-
-/*
-===============================================================================
-=
-= R_CheckBBox
-=
-= Returns true if some part of the bbox might be visible
-=
-===============================================================================
-*/
-
-int checkcoord[12][4] = {
-    {3, 0, 2, 1},
-    {3, 0, 2, 0},
-    {3, 1, 2, 0},
-    {0},
-    {2, 0, 2, 1},
-    {0, 0, 0, 0},
-    {3, 1, 3, 0},
-    {0},
-    {2, 0, 3, 1},
-    {2, 1, 3, 1},
-    {2, 1, 3, 0}
-};
-
-
-boolean R_CheckBBox(fixed_t * bspcoord)
-{
-    int boxx, boxy, boxpos;
-    fixed_t x1, y1, x2, y2;
-    angle_t angle1, angle2, span, tspan;
-    cliprange_t *start;
-    int sx1, sx2;
-
-// find the corners of the box that define the edges from current viewpoint
-    if (viewx <= bspcoord[BOXLEFT])
-        boxx = 0;
-    else if (viewx < bspcoord[BOXRIGHT])
-        boxx = 1;
-    else
-        boxx = 2;
-
-    if (viewy >= bspcoord[BOXTOP])
-        boxy = 0;
-    else if (viewy > bspcoord[BOXBOTTOM])
-        boxy = 1;
-    else
-        boxy = 2;
-
-    boxpos = (boxy << 2) + boxx;
-    if (boxpos == 5)
-        return true;
-
-    x1 = bspcoord[checkcoord[boxpos][0]];
-    y1 = bspcoord[checkcoord[boxpos][1]];
-    x2 = bspcoord[checkcoord[boxpos][2]];
-    y2 = bspcoord[checkcoord[boxpos][3]];
-
-
-//
-// check clip list for an open space
-//      
-    angle1 = R_PointToAngle(x1, y1) - viewangle;
-    angle2 = R_PointToAngle(x2, y2) - viewangle;
-
-    span = angle1 - angle2;
-    if (span >= ANG180)
-        return true;            // sitting on a line
-    tspan = angle1 + clipangle;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return false;       // totally off the left edge
-        angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return false;       // totally off the left edge
-        angle2 = -clipangle;
-    }
-
-
-// find the first clippost that touches the source post (adjacent pixels are touching)
-    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
-    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
-    sx1 = viewangletox[angle1];
-    sx2 = viewangletox[angle2];
-    if (sx1 == sx2)
-        return false;           // does not cross a pixel
-    sx2--;
-
-    start = solidsegs;
-    while (start->last < sx2)
-        start++;
-    if (sx1 >= start->first && sx2 <= start->last)
-        return false;           // the clippost contains the new span
-
-    return true;
-}
-
-
-/*
-================
-=
-= R_Subsector
-=
-= Draw one or more segments
-================
-*/
-
-void R_Subsector(int num)
-{
-    int count;
-    seg_t *line;
-    subsector_t *sub;
-
-#ifdef RANGECHECK
-    if (num >= numsubsectors)
-        I_Error("R_Subsector: ss %i with numss = %i", num, numsubsectors);
-#endif
-
-    sscount++;
-    sub = &subsectors[num];
-    frontsector = sub->sector;
-    count = sub->numlines;
-    line = &segs[sub->firstline];
-
-    if (frontsector->floorheight < viewz)
-        floorplane = R_FindPlane(frontsector->floorheight,
-                                 frontsector->floorpic,
-                                 frontsector->lightlevel,
-                                 frontsector->special);
-    else
-        floorplane = NULL;
-    if (frontsector->ceilingheight > viewz
-        || frontsector->ceilingpic == skyflatnum)
-        ceilingplane = R_FindPlane(frontsector->ceilingheight,
-                                   frontsector->ceilingpic,
-                                   frontsector->lightlevel, 0);
-    else
-        ceilingplane = NULL;
-
-    R_AddSprites(frontsector);
-
-    while (count--)
-    {
-        R_AddLine(line);
-        line++;
-    }
-
-    // check for solidsegs overflow - extremely unsatisfactory!
-    if(newend > &solidsegs[32])
-        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
-}
-
-
-/*
-===============================================================================
-=
-= RenderBSPNode
-=
-===============================================================================
-*/
-
-void R_RenderBSPNode(int bspnum)
-{
-    node_t *bsp;
-    int side;
-
-    if (bspnum & NF_SUBSECTOR)
-    {
-        if (bspnum == -1)
-            R_Subsector(0);
-        else
-            R_Subsector(bspnum & (~NF_SUBSECTOR));
-        return;
-    }
-
-    bsp = &nodes[bspnum];
-
-//
-// decide which side the view point is on
-//
-    side = R_PointOnSide(viewx, viewy, bsp);
-
-    R_RenderBSPNode(bsp->children[side]);       // recursively divide front space
-
-    if (R_CheckBBox(bsp->bbox[side ^ 1]))       // possibly divide back space
-        R_RenderBSPNode(bsp->children[side ^ 1]);
-}
diff --git a/games/NXDoom/src/heretic/r_data.c b/games/NXDoom/src/heretic/r_data.c
deleted file mode 100644
index 04bdecc86..000000000
--- a/games/NXDoom/src/heretic/r_data.c
+++ /dev/null
@@ -1,732 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// R_data.c
-
-#include "doomdef.h"
-#include "deh_str.h"
-
-#include "i_swap.h"
-#include "i_system.h"
-#include "m_misc.h"
-#include "r_local.h"
-#include "p_local.h"
-
-
-typedef struct
-{
-    int originx;                // block origin (allways UL), which has allready
-    int originy;                // accounted  for the patch's internal origin
-    int patch;
-} texpatch_t;
-
-// a maptexturedef_t describes a rectangular texture, which is composed of one
-// or more mappatch_t structures that arrange graphic patches
-typedef struct
-{
-    char name[8];               // for switch changing, etc
-    short width;
-    short height;
-    short patchcount;
-    texpatch_t patches[1];      // [patchcount] drawn back to front
-    //  into the cached texture
-} texture_t;
-
-
-
-int firstflat, lastflat, numflats;
-int firstpatch, lastpatch, numpatches;
-int firstspritelump, lastspritelump, numspritelumps;
-
-int numtextures;
-texture_t **textures;
-int *texturewidthmask;
-fixed_t *textureheight;         // needed for texture pegging
-int *texturecompositesize;
-short **texturecolumnlump;
-unsigned short **texturecolumnofs;
-byte **texturecomposite;
-
-int *flattranslation;           // for global animation
-int *texturetranslation;        // for global animation
-
-fixed_t *spritewidth;           // needed for pre rendering
-fixed_t *spriteoffset;
-fixed_t *spritetopoffset;
-
-lighttable_t *colormaps;
-
-
-/*
-==============================================================================
-
-						MAPTEXTURE_T CACHING
-
-when a texture is first needed, it counts the number of composite columns
-required in the texture and allocates space for a column directory and any
-new columns.  The directory will simply point inside other patches if there
-is only one patch in a given column, but any columns with multiple patches
-will have new column_ts generated.
-
-==============================================================================
-*/
-
-/*
-===================
-=
-= R_DrawColumnInCache
-=
-= Clip and draw a column from a patch into a cached post
-=
-===================
-*/
-
-void R_DrawColumnInCache(column_t * patch, byte * cache, int originy,
-                         int cacheheight)
-{
-    int count, position;
-    byte *source;
-
-    while (patch->topdelta != 0xff)
-    {
-        source = (byte *) patch + 3;
-        count = patch->length;
-        position = originy + patch->topdelta;
-        if (position < 0)
-        {
-            count += position;
-            position = 0;
-        }
-        if (position + count > cacheheight)
-            count = cacheheight - position;
-        if (count > 0)
-            memcpy(cache + position, source, count);
-
-        patch = (column_t *) ((byte *) patch + patch->length + 4);
-    }
-}
-
-
-/*
-===================
-=
-= R_GenerateComposite
-=
-===================
-*/
-
-void R_GenerateComposite(int texnum)
-{
-    byte *block;
-    texture_t *texture;
-    texpatch_t *patch;
-    patch_t *realpatch;
-    int x, x1, x2;
-    int i;
-    column_t *patchcol;
-    short *collump;
-    unsigned short *colofs;
-
-    texture = textures[texnum];
-    block = Z_Malloc(texturecompositesize[texnum], PU_STATIC,
-                     &texturecomposite[texnum]);
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-
-//
-// composite the columns together
-//
-    for (i = 0, patch = texture->patches; i < texture->patchcount;
-         i++, patch++)
-    {
-        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
-        x1 = patch->originx;
-        x2 = x1 + SHORT(realpatch->width);
-
-        if (x1 < 0)
-            x = 0;
-        else
-            x = x1;
-        if (x2 > texture->width)
-            x2 = texture->width;
-
-        for (; x < x2; x++)
-        {
-            if (collump[x] >= 0)
-                continue;       // column does not have multiple patches
-            patchcol = (column_t *) ((byte *) realpatch +
-                                     LONG(realpatch->columnofs[x - x1]));
-            R_DrawColumnInCache(patchcol, block + colofs[x], patch->originy,
-                                texture->height);
-        }
-
-    }
-
-// now that the texture has been built, it is purgable
-    Z_ChangeTag(block, PU_CACHE);
-}
-
-
-/*
-===================
-=
-= R_GenerateLookup
-=
-===================
-*/
-
-void R_GenerateLookup(int texnum)
-{
-    texture_t *texture;
-    byte *patchcount;           // [texture->width]
-    texpatch_t *patch;
-    patch_t *realpatch;
-    int x, x1, x2;
-    int i;
-    short *collump;
-    unsigned short *colofs;
-
-    texture = textures[texnum];
-
-    texturecomposite[texnum] = 0;       // composited not created yet
-    texturecompositesize[texnum] = 0;
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-
-//
-// count the number of columns that are covered by more than one patch
-// fill in the lump / offset, so columns with only a single patch are
-// all done
-//
-    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
-    memset(patchcount, 0, texture->width);
-
-    for (i = 0, patch = texture->patches; i < texture->patchcount;
-         i++, patch++)
-    {
-        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
-        x1 = patch->originx;
-        x2 = x1 + SHORT(realpatch->width);
-        if (x1 < 0)
-            x = 0;
-        else
-            x = x1;
-        if (x2 > texture->width)
-            x2 = texture->width;
-        for (; x < x2; x++)
-        {
-            patchcount[x]++;
-            collump[x] = patch->patch;
-            colofs[x] = LONG(realpatch->columnofs[x - x1]) + 3;
-        }
-    }
-
-    for (x = 0; x < texture->width; x++)
-    {
-        if (!patchcount[x])
-        {
-            printf("R_GenerateLookup: column without a patch (%s)\n",
-                   texture->name);
-            return;
-        }
-//                      I_Error ("R_GenerateLookup: column without a patch");
-        if (patchcount[x] > 1)
-        {
-            collump[x] = -1;    // use the cached block
-            colofs[x] = texturecompositesize[texnum];
-            if (texturecompositesize[texnum] > 0x10000 - texture->height)
-                I_Error("R_GenerateLookup: texture %i is >64k", texnum);
-            texturecompositesize[texnum] += texture->height;
-        }
-    }
-
-    Z_Free(patchcount);
-}
-
-
-/*
-================
-=
-= R_GetColumn
-=
-================
-*/
-
-byte *R_GetColumn(int tex, int col)
-{
-    int lump, ofs;
-
-    col &= texturewidthmask[tex];
-    lump = texturecolumnlump[tex][col];
-    ofs = texturecolumnofs[tex][col];
-    if (lump > 0)
-        return (byte *) W_CacheLumpNum(lump, PU_CACHE) + ofs;
-    if (!texturecomposite[tex])
-        R_GenerateComposite(tex);
-    return texturecomposite[tex] + ofs;
-}
-
-
-/*
-==================
-=
-= R_InitTextures
-=
-= Initializes the texture list with the textures from the world map
-=
-==================
-*/
-
-void R_InitTextures(void)
-{
-    maptexture_t *mtexture;
-    texture_t *texture;
-    mappatch_t *mpatch;
-    texpatch_t *patch;
-    int i, j;
-    int *maptex, *maptex2, *maptex1;
-    char name[9], *names, *name_p;
-    int *patchlookup;
-    int nummappatches;
-    int offset, maxoff, maxoff2;
-    int numtextures1, numtextures2;
-    int *directory;
-    const char *texture1, *texture2, *pnames;
-
-    texture1 = DEH_String("TEXTURE1");
-    texture2 = DEH_String("TEXTURE2");
-    pnames = DEH_String("PNAMES");
-
-//
-// load the patch names from pnames.lmp
-//
-    names = W_CacheLumpName(pnames, PU_STATIC);
-    nummappatches = LONG(*((int *) names));
-    name_p = names + 4;
-    patchlookup = Z_Malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
-    for (i = 0; i < nummappatches; i++)
-    {
-        M_StringCopy(name, name_p + i * 8, sizeof(name));
-        patchlookup[i] = W_CheckNumForName(name);
-    }
-    W_ReleaseLumpName(pnames);
-
-//
-// load the map texture definitions from textures.lmp
-//
-    maptex = maptex1 = W_CacheLumpName(texture1, PU_STATIC);
-    numtextures1 = LONG(*maptex);
-    maxoff = W_LumpLength(W_GetNumForName(texture1));
-    directory = maptex + 1;
-
-    if (W_CheckNumForName(texture2) != -1)
-    {
-        maptex2 = W_CacheLumpName(texture2, PU_STATIC);
-        numtextures2 = LONG(*maptex2);
-        maxoff2 = W_LumpLength(W_GetNumForName(texture2));
-    }
-    else
-    {
-        maptex2 = NULL;
-        numtextures2 = 0;
-        maxoff2 = 0;
-    }
-    numtextures = numtextures1 + numtextures2;
-
-    //
-    //      Init the startup thermometer at this point...
-    //
-    {
-        int start, end;
-        int spramount;
-        start = W_GetNumForName(DEH_String("S_START"));
-        end = W_GetNumForName(DEH_String("S_END"));
-        spramount = end - start + 1;
-        InitThermo(spramount + numtextures + 6);
-    }
-
-    textures = Z_Malloc(numtextures * sizeof(texture_t *), PU_STATIC, 0);
-    texturecolumnlump = Z_Malloc(numtextures * sizeof(short *), PU_STATIC, 0);
-    texturecolumnofs = Z_Malloc(numtextures * sizeof(unsigned short *), PU_STATIC, 0);
-    texturecomposite = Z_Malloc(numtextures * sizeof(byte *), PU_STATIC, 0);
-    texturecompositesize = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
-    texturewidthmask = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
-    textureheight = Z_Malloc(numtextures * sizeof(fixed_t), PU_STATIC, 0);
-
-    for (i = 0; i < numtextures; i++, directory++)
-    {
-#ifdef __NEXT__
-        if (!(i & 63))
-            printf(".");
-#else
-        IncThermo();
-#endif
-        if (i == numtextures1)
-        {                       // start looking in second texture file
-            maptex = maptex2;
-            maxoff = maxoff2;
-            directory = maptex + 1;
-        }
-
-        offset = LONG(*directory);
-        if (offset > maxoff)
-            I_Error("R_InitTextures: bad texture directory");
-        mtexture = (maptexture_t *) ((byte *) maptex + offset);
-        texture = textures[i] = Z_Malloc(sizeof(texture_t)
-                                         +
-                                         sizeof(texpatch_t) *
-                                         (SHORT(mtexture->patchcount) - 1),
-                                         PU_STATIC, 0);
-        texture->width = SHORT(mtexture->width);
-        texture->height = SHORT(mtexture->height);
-        texture->patchcount = SHORT(mtexture->patchcount);
-        memcpy(texture->name, mtexture->name, sizeof(texture->name));
-        mpatch = &mtexture->patches[0];
-        patch = &texture->patches[0];
-        for (j = 0; j < texture->patchcount; j++, mpatch++, patch++)
-        {
-            patch->originx = SHORT(mpatch->originx);
-            patch->originy = SHORT(mpatch->originy);
-            patch->patch = patchlookup[SHORT(mpatch->patch)];
-            if (patch->patch == -1)
-                I_Error("R_InitTextures: Missing patch in texture %s",
-                        texture->name);
-        }
-        texturecolumnlump[i] = Z_Malloc(texture->width * sizeof(short),
-                                        PU_STATIC, 0);
-        texturecolumnofs[i] = Z_Malloc(texture->width * sizeof(short), 
-                                       PU_STATIC, 0);
-        j = 1;
-        while (j * 2 <= texture->width)
-            j <<= 1;
-        texturewidthmask[i] = j - 1;
-        textureheight[i] = texture->height << FRACBITS;
-    }
-
-    Z_Free(patchlookup);
-
-    W_ReleaseLumpName(texture1);
-    if (maptex2)
-    {
-        W_ReleaseLumpName(texture2);
-    }
-
-//
-// precalculate whatever possible
-//              
-    for (i = 0; i < numtextures; i++)
-    {
-        R_GenerateLookup(i);
-        CheckAbortStartup();
-    }
-
-//
-// translation table for global animation
-//
-    texturetranslation = Z_Malloc((numtextures + 1) * sizeof(int), PU_STATIC, 0);
-    for (i = 0; i < numtextures; i++)
-        texturetranslation[i] = i;
-}
-
-
-/*
-================
-=
-= R_InitFlats
-=
-=================
-*/
-
-void R_InitFlats(void)
-{
-    int i;
-
-    firstflat = W_GetNumForName(DEH_String("F_START")) + 1;
-    lastflat = W_GetNumForName(DEH_String("F_END")) - 1;
-    numflats = lastflat - firstflat + 1;
-
-// translation table for global animation
-    flattranslation = Z_Malloc((numflats + 1) * sizeof(int), PU_STATIC, 0);
-    for (i = 0; i < numflats; i++)
-        flattranslation[i] = i;
-}
-
-
-/*
-================
-=
-= R_InitSpriteLumps
-=
-= Finds the width and hoffset of all sprites in the wad, so the sprite doesn't
-= need to be cached just for the header during rendering
-=================
-*/
-
-void R_InitSpriteLumps(void)
-{
-    int i;
-    patch_t *patch;
-
-    firstspritelump = W_GetNumForName(DEH_String("S_START")) + 1;
-    lastspritelump = W_GetNumForName(DEH_String("S_END")) - 1;
-    numspritelumps = lastspritelump - firstspritelump + 1;
-    spritewidth = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
-    spriteoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
-    spritetopoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
-
-    for (i = 0; i < numspritelumps; i++)
-    {
-#ifdef __NEXT__
-        if (!(i & 63))
-            printf(".");
-#else
-        IncThermo();
-#endif
-        patch = W_CacheLumpNum(firstspritelump + i, PU_CACHE);
-        spritewidth[i] = SHORT(patch->width) << FRACBITS;
-        spriteoffset[i] = SHORT(patch->leftoffset) << FRACBITS;
-        spritetopoffset[i] = SHORT(patch->topoffset) << FRACBITS;
-    }
-}
-
-
-/*
-================
-=
-= R_InitColormaps
-=
-=================
-*/
-
-void R_InitColormaps(void)
-{
-    int lump, length;
-//
-// load in the light tables
-// 256 byte align tables
-//
-    lump = W_GetNumForName(DEH_String("COLORMAP"));
-    length = W_LumpLength(lump);
-    colormaps = Z_Malloc(length, PU_STATIC, 0);
-    W_ReadLump(lump, colormaps);
-}
-
-
-/*
-================
-=
-= R_InitData
-=
-= Locates all the lumps that will be used by all views
-= Must be called after W_Init
-=================
-*/
-
-void R_InitData(void)
-{
-    //tprintf("\nR_InitTextures ", 0);
-    R_InitTextures();
-    printf (".");
-    //tprintf("R_InitFlats\n", 0);
-    R_InitFlats();
-    IncThermo();
-    printf (".");
-    //tprintf("R_InitSpriteLumps ", 0);
-    R_InitSpriteLumps();
-    IncThermo();
-    printf (".");
-    R_InitColormaps();
-}
-
-
-//=============================================================================
-
-/*
-================
-=
-= R_FlatNumForName
-=
-================
-*/
-
-int R_FlatNumForName(const char *name)
-{
-    int i;
-    char namet[9];
-
-    i = W_CheckNumForName(name);
-    if (i == -1)
-    {
-        namet[8] = 0;
-        memcpy(namet, name, 8);
-        I_Error("R_FlatNumForName: %s not found", namet);
-    }
-    return i - firstflat;
-}
-
-
-/*
-================
-=
-= R_CheckTextureNumForName
-=
-================
-*/
-
-int R_CheckTextureNumForName(const char *name)
-{
-    int i;
-
-    if (name[0] == '-')         // no texture marker
-        return 0;
-
-    for (i = 0; i < numtextures; i++)
-        if (!strncasecmp(textures[i]->name, name, 8))
-            return i;
-
-    return -1;
-}
-
-
-/*
-================
-=
-= R_TextureNumForName
-=
-================
-*/
-
-int R_TextureNumForName(const char *name)
-{
-    int i;
-    //char  namet[9];
-
-    i = R_CheckTextureNumForName(name);
-    if (i == -1)
-        I_Error("R_TextureNumForName: %s not found", name);
-
-    return i;
-}
-
-
-/*
-=================
-=
-= R_PrecacheLevel
-=
-= Preloads all relevent graphics for the level
-=================
-*/
-
-int flatmemory, texturememory, spritememory;
-
-void R_PrecacheLevel(void)
-{
-    char *flatpresent;
-    char *texturepresent;
-    char *spritepresent;
-    int i, j, k, lump;
-    texture_t *texture;
-    thinker_t *th;
-    spriteframe_t *sf;
-
-    if (demoplayback)
-        return;
-
-//
-// precache flats
-//      
-    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
-    memset(flatpresent, 0, numflats);
-    for (i = 0; i < numsectors; i++)
-    {
-        flatpresent[sectors[i].floorpic] = 1;
-        flatpresent[sectors[i].ceilingpic] = 1;
-    }
-
-    flatmemory = 0;
-    for (i = 0; i < numflats; i++)
-        if (flatpresent[i])
-        {
-            lump = firstflat + i;
-            flatmemory += lumpinfo[lump]->size;
-            W_CacheLumpNum(lump, PU_CACHE);
-        }
-
-    Z_Free(flatpresent);
-
-//
-// precache textures
-//
-    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
-    memset(texturepresent, 0, numtextures);
-
-    for (i = 0; i < numsides; i++)
-    {
-        texturepresent[sides[i].toptexture] = 1;
-        texturepresent[sides[i].midtexture] = 1;
-        texturepresent[sides[i].bottomtexture] = 1;
-    }
-
-    texturepresent[skytexture] = 1;
-
-    texturememory = 0;
-    for (i = 0; i < numtextures; i++)
-    {
-        if (!texturepresent[i])
-            continue;
-        texture = textures[i];
-        for (j = 0; j < texture->patchcount; j++)
-        {
-            lump = texture->patches[j].patch;
-            texturememory += lumpinfo[lump]->size;
-            W_CacheLumpNum(lump, PU_CACHE);
-        }
-    }
-
-    Z_Free(texturepresent);
-
-//
-// precache sprites
-//
-    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
-    memset(spritepresent, 0, numsprites);
-
-    for (th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if (th->function == P_MobjThinker)
-            spritepresent[((mobj_t *) th)->sprite] = 1;
-    }
-
-    spritememory = 0;
-    for (i = 0; i < numsprites; i++)
-    {
-        if (!spritepresent[i])
-            continue;
-        for (j = 0; j < sprites[i].numframes; j++)
-        {
-            sf = &sprites[i].spriteframes[j];
-            for (k = 0; k < 8; k++)
-            {
-                lump = firstspritelump + sf->lump[k];
-                spritememory += lumpinfo[lump]->size;
-                W_CacheLumpNum(lump, PU_CACHE);
-            }
-        }
-    }
-
-    Z_Free(spritepresent);
-}
diff --git a/games/NXDoom/src/heretic/r_draw.c b/games/NXDoom/src/heretic/r_draw.c
deleted file mode 100644
index 4760cd59a..000000000
--- a/games/NXDoom/src/heretic/r_draw.c
+++ /dev/null
@@ -1,490 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// R_draw.c
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "r_local.h"
-#include "i_video.h"
-#include "v_video.h"
-
-/*
-
-All drawing to the view buffer is accomplished in this file.  The other refresh
-files only know about ccordinates, not the architecture of the frame buffer.
-
-*/
-
-byte *viewimage;
-int viewwidth, scaledviewwidth, viewheight, viewwindowx, viewwindowy;
-byte *ylookup[MAXHEIGHT];
-int columnofs[MAXWIDTH];
-byte translations[3][256];      // color tables for different players
-
-/*
-==================
-=
-= R_DrawColumn
-=
-= Source is the top of the column to scale
-=
-==================
-*/
-
-lighttable_t *dc_colormap;
-int dc_x;
-int dc_yl;
-int dc_yh;
-fixed_t dc_iscale;
-fixed_t dc_texturemid;
-byte *dc_source;                // first pixel in a column (possibly virtual)
-
-int dccount;                    // just for profiling
-
-void R_DrawColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-void R_DrawColumnLow(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-//      dccount++;
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-// Translucent column draw - blended with background using tinttable.
-
-void R_DrawTLColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    if (!dc_yl)
-        dc_yl = 1;
-    if (dc_yh == viewheight - 1)
-        dc_yh = viewheight - 2;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest =
-            tinttable[((*dest) << 8) +
-                      dc_colormap[dc_source[(frac >> FRACBITS) & 127]]];
-
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-/*
-========================
-=
-= R_DrawTranslatedColumn
-=
-========================
-*/
-
-byte *dc_translation;
-byte *translationtables;
-
-void R_DrawTranslatedColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-void R_DrawTranslatedTLColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = tinttable[((*dest) << 8)
-                          +
-                          dc_colormap[dc_translation
-                                      [dc_source[frac >> FRACBITS]]]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-//--------------------------------------------------------------------------
-//
-// PROC R_InitTranslationTables
-//
-//--------------------------------------------------------------------------
-
-void R_InitTranslationTables(void)
-{
-    int i;
-
-    V_LoadTintTable();
-
-    // Allocate translation tables
-    translationtables = Z_Malloc(256 * 3, PU_STATIC, 0);
-
-    // Fill out the translation tables
-    for (i = 0; i < 256; i++)
-    {
-        if (i >= 225 && i <= 240)
-        {
-            translationtables[i] = 114 + (i - 225);     // yellow
-            translationtables[i + 256] = 145 + (i - 225);       // red
-            translationtables[i + 512] = 190 + (i - 225);       // blue
-        }
-        else
-        {
-            translationtables[i] = translationtables[i + 256]
-                = translationtables[i + 512] = i;
-        }
-    }
-}
-
-/*
-================
-=
-= R_DrawSpan
-=
-================
-*/
-
-int ds_y;
-int ds_x1;
-int ds_x2;
-lighttable_t *ds_colormap;
-fixed_t ds_xfrac;
-fixed_t ds_yfrac;
-fixed_t ds_xstep;
-fixed_t ds_ystep;
-byte *ds_source;                // start of a 64*64 tile image
-
-int dscount;                    // just for profiling
-
-void R_DrawSpan(void)
-{
-    fixed_t xfrac, yfrac;
-    byte *dest;
-    int count, spot;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
-        || (unsigned) ds_y > SCREENHEIGHT)
-        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
-//      dscount++;
-#endif
-
-    xfrac = ds_xfrac;
-    yfrac = ds_yfrac;
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-    count = ds_x2 - ds_x1;
-    do
-    {
-        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
-        *dest++ = ds_colormap[ds_source[spot]];
-        xfrac += ds_xstep;
-        yfrac += ds_ystep;
-    }
-    while (count--);
-}
-
-void R_DrawSpanLow(void)
-{
-    fixed_t xfrac, yfrac;
-    byte *dest;
-    int count, spot;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
-        || (unsigned) ds_y > SCREENHEIGHT)
-        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
-//      dscount++;
-#endif
-
-    xfrac = ds_xfrac;
-    yfrac = ds_yfrac;
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-    count = ds_x2 - ds_x1;
-    do
-    {
-        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
-        *dest++ = ds_colormap[ds_source[spot]];
-        xfrac += ds_xstep;
-        yfrac += ds_ystep;
-    }
-    while (count--);
-}
-
-
-
-/*
-================
-=
-= R_InitBuffer
-=
-=================
-*/
-
-void R_InitBuffer(int width, int height)
-{
-    int i;
-
-    viewwindowx = (SCREENWIDTH - width) >> 1;
-    for (i = 0; i < width; i++)
-        columnofs[i] = viewwindowx + i;
-    if (width == SCREENWIDTH)
-        viewwindowy = 0;
-    else
-        viewwindowy = (SCREENHEIGHT - SBARHEIGHT - height) >> 1;
-    for (i = 0; i < height; i++)
-        ylookup[i] = I_VideoBuffer + (i + viewwindowy) * SCREENWIDTH;
-}
-
-
-/*
-==================
-=
-= R_DrawViewBorder
-=
-= Draws the border around the view for different size windows
-==================
-*/
-
-boolean BorderNeedRefresh;
-
-void R_DrawViewBorder(void)
-{
-    byte *src, *dest;
-    int x, y;
-
-    if (scaledviewwidth == SCREENWIDTH)
-        return;
-
-    if (gamemode == shareware)
-    {
-        src = W_CacheLumpName(DEH_String("FLOOR04"), PU_CACHE);
-    }
-    else
-    {
-        src = W_CacheLumpName(DEH_String("FLAT513"), PU_CACHE);
-    }
-    dest = I_VideoBuffer;
-
-    for (y = 0; y < SCREENHEIGHT - SBARHEIGHT; y++)
-    {
-        for (x = 0; x < SCREENWIDTH / 64; x++)
-        {
-            memcpy(dest, src + ((y & 63) << 6), 64);
-            dest += 64;
-        }
-        if (SCREENWIDTH & 63)
-        {
-            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
-            dest += (SCREENWIDTH & 63);
-        }
-    }
-    for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
-    {
-        V_DrawPatch(x, viewwindowy - 4,
-                    W_CacheLumpName(DEH_String("bordt"), PU_CACHE));
-        V_DrawPatch(x, viewwindowy + viewheight,
-                    W_CacheLumpName(DEH_String("bordb"), PU_CACHE));
-    }
-    for (y = viewwindowy; y < viewwindowy + viewheight; y += 16)
-    {
-        V_DrawPatch(viewwindowx - 4, y,
-                    W_CacheLumpName(DEH_String("bordl"), PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, y,
-                    W_CacheLumpName(DEH_String("bordr"), PU_CACHE));
-    }
-    V_DrawPatch(viewwindowx - 4, viewwindowy - 4,
-                W_CacheLumpName(DEH_String("bordtl"), PU_CACHE));
-    V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
-                W_CacheLumpName(DEH_String("bordtr"), PU_CACHE));
-    V_DrawPatch(viewwindowx + viewwidth, viewwindowy + viewheight,
-                W_CacheLumpName(DEH_String("bordbr"), PU_CACHE));
-    V_DrawPatch(viewwindowx - 4, viewwindowy + viewheight,
-                W_CacheLumpName(DEH_String("bordbl"), PU_CACHE));
-}
-
-/*
-==================
-=
-= R_DrawTopBorder
-=
-= Draws the top border around the view for different size windows
-==================
-*/
-
-boolean BorderTopRefresh;
-
-void R_DrawTopBorder(void)
-{
-    byte *src, *dest;
-    int x, y;
-
-    if (scaledviewwidth == SCREENWIDTH)
-        return;
-
-    if (gamemode == shareware)
-    {
-        src = W_CacheLumpName(DEH_String("FLOOR04"), PU_CACHE);
-    }
-    else
-    {
-        src = W_CacheLumpName(DEH_String("FLAT513"), PU_CACHE);
-    }
-    dest = I_VideoBuffer;
-
-    for (y = 0; y < 30; y++)
-    {
-        for (x = 0; x < SCREENWIDTH / 64; x++)
-        {
-            memcpy(dest, src + ((y & 63) << 6), 64);
-            dest += 64;
-        }
-        if (SCREENWIDTH & 63)
-        {
-            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
-            dest += (SCREENWIDTH & 63);
-        }
-    }
-    if (viewwindowy < 25)
-    {
-        for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
-        {
-            V_DrawPatch(x, viewwindowy - 4,
-                        W_CacheLumpName(DEH_String("bordt"), PU_CACHE));
-        }
-        V_DrawPatch(viewwindowx - 4, viewwindowy,
-                    W_CacheLumpName(DEH_String("bordl"), PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, viewwindowy,
-                    W_CacheLumpName(DEH_String("bordr"), PU_CACHE));
-        V_DrawPatch(viewwindowx - 4, viewwindowy + 16,
-                    W_CacheLumpName(DEH_String("bordl"), PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, viewwindowy + 16,
-                    W_CacheLumpName(DEH_String("bordr"), PU_CACHE));
-
-        V_DrawPatch(viewwindowx - 4, viewwindowy - 4,
-                    W_CacheLumpName(DEH_String("bordtl"), PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
-                    W_CacheLumpName(DEH_String("bordtr"), PU_CACHE));
-    }
-}
diff --git a/games/NXDoom/src/heretic/r_local.h b/games/NXDoom/src/heretic/r_local.h
deleted file mode 100644
index cf58ed185..000000000
--- a/games/NXDoom/src/heretic/r_local.h
+++ /dev/null
@@ -1,487 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// R_local.h
-
-#ifndef __R_LOCAL__
-#define __R_LOCAL__
-
-#include "i_video.h"
-#include "v_patch.h"
-
-#define	ANGLETOSKYSHIFT		22      // sky map is 256*128*4 maps
-
-#define	BASEYCENTER			100
-
-#define MAXWIDTH			1120
-#define	MAXHEIGHT			832
-
-#define	PI					3.141592657
-
-#define	CENTERY				(SCREENHEIGHT/2)
-
-#define	MINZ			(FRACUNIT*4)
-
-#define	FIELDOFVIEW		2048    // fineangles in the SCREENWIDTH wide window
-
-//
-// lighting constants
-//
-#define	LIGHTLEVELS			16
-#define	LIGHTSEGSHIFT		4
-#define	MAXLIGHTSCALE		48
-#define	LIGHTSCALESHIFT		12
-#define	MAXLIGHTZ			128
-#define	LIGHTZSHIFT			20
-#define	NUMCOLORMAPS		32      // number of diminishing
-#define	INVERSECOLORMAP		32
-
-/*
-==============================================================================
-
-					INTERNAL MAP TYPES
-
-==============================================================================
-*/
-
-//================ used by play and refresh
-
-typedef struct
-{
-    fixed_t x, y;
-} vertex_t;
-
-struct line_s;
-
-typedef struct
-{
-    fixed_t floorheight, ceilingheight;
-    short floorpic, ceilingpic;
-    short lightlevel;
-    short special, tag;
-
-    int soundtraversed;         // 0 = untraversed, 1,2 = sndlines -1
-    mobj_t *soundtarget;        // thing that made a sound (or null)
-
-    int blockbox[4];            // mapblock bounding box for height changes
-    degenmobj_t soundorg;       // for any sounds played by the sector
-
-    int validcount;             // if == validcount, already checked
-    mobj_t *thinglist;          // list of mobjs in sector
-    void *specialdata;          // thinker_t for reversable actions
-    int linecount;
-    struct line_s **lines;      // [linecount] size
-} sector_t;
-
-typedef struct
-{
-    fixed_t textureoffset;      // add this to the calculated texture col
-    fixed_t rowoffset;          // add this to the calculated texture top
-    short toptexture, bottomtexture, midtexture;
-    sector_t *sector;
-} side_t;
-
-typedef enum
-{ ST_HORIZONTAL, ST_VERTICAL, ST_POSITIVE, ST_NEGATIVE } slopetype_t;
-
-typedef struct line_s
-{
-    vertex_t *v1, *v2;
-    fixed_t dx, dy;             // v2 - v1 for side checking
-    short flags;
-    short special, tag;
-    short sidenum[2];           // sidenum[1] will be -1 if one sided
-    fixed_t bbox[4];
-    slopetype_t slopetype;      // to aid move clipping
-    sector_t *frontsector, *backsector;
-    int validcount;             // if == validcount, already checked
-    void *specialdata;          // thinker_t for reversable actions
-} line_t;
-
-
-typedef struct subsector_s
-{
-    sector_t *sector;
-    short numlines;
-    short firstline;
-} subsector_t;
-
-typedef struct
-{
-    vertex_t *v1, *v2;
-    fixed_t offset;
-    angle_t angle;
-    side_t *sidedef;
-    line_t *linedef;
-    sector_t *frontsector;
-    sector_t *backsector;       // NULL for one sided lines
-} seg_t;
-
-typedef struct
-{
-    fixed_t x, y, dx, dy;       // partition line
-    fixed_t bbox[2][4];         // bounding box for each child
-    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
-} node_t;
-
-
-/*
-==============================================================================
-
-						OTHER TYPES
-
-==============================================================================
-*/
-
-typedef byte lighttable_t;      // this could be wider for >8 bit display
-
-#define	MAXVISPLANES	128
-#define	MAXOPENINGS		SCREENWIDTH*64
-
-typedef struct
-{
-    fixed_t height;
-    int picnum;
-    int lightlevel;
-    int special;
-    int minx, maxx;
-    byte pad1;                  // leave pads for [minx-1]/[maxx+1]
-    byte top[SCREENWIDTH];
-    byte pad2;
-    byte pad3;
-    byte bottom[SCREENWIDTH];
-    byte pad4;
-} visplane_t;
-
-typedef struct drawseg_s
-{
-    seg_t *curline;
-    int x1, x2;
-    fixed_t scale1, scale2, scalestep;
-    int silhouette;             // 0=none, 1=bottom, 2=top, 3=both
-    fixed_t bsilheight;         // don't clip sprites above this
-    fixed_t tsilheight;         // don't clip sprites below this
-// pointers to lists for sprite clipping
-    short *sprtopclip;          // adjusted so [x1] is first value
-    short *sprbottomclip;       // adjusted so [x1] is first value
-    short *maskedtexturecol;    // adjusted so [x1] is first value
-} drawseg_t;
-
-#define	SIL_NONE	0
-#define	SIL_BOTTOM	1
-#define SIL_TOP		2
-#define	SIL_BOTH	3
-
-#define	MAXDRAWSEGS		256
-
-// A vissprite_t is a thing that will be drawn during a refresh
-typedef struct vissprite_s
-{
-    struct vissprite_s *prev, *next;
-    int x1, x2;
-    fixed_t gx, gy;             // for line side calculation
-    fixed_t gz, gzt;            // global bottom / top for silhouette clipping
-    fixed_t startfrac;          // horizontal position of x1
-    fixed_t scale;
-    fixed_t xiscale;            // negative if flipped
-    fixed_t texturemid;
-    int patch;
-    lighttable_t *colormap;
-    int mobjflags;              // for color translation and shadow draw
-    boolean psprite;            // true if psprite
-    fixed_t footclip;           // foot clipping
-} vissprite_t;
-
-
-extern visplane_t *floorplane, *ceilingplane;
-
-// Sprites are patches with a special naming convention so they can be 
-// recognized by R_InitSprites.  The sprite and frame specified by a 
-// thing_t is range checked at run time.
-// a sprite is a patch_t that is assumed to represent a three dimensional
-// object and may have multiple rotations pre drawn.  Horizontal flipping 
-// is used to save space. Some sprites will only have one picture used
-// for all views.  
-
-typedef struct
-{
-    boolean rotate;             // if false use 0 for any position
-    short lump[8];              // lump to use for view angles 0-7
-    byte flip[8];               // flip (1 = flip) to use for view angles 0-7
-} spriteframe_t;
-
-typedef struct
-{
-    int numframes;
-    spriteframe_t *spriteframes;
-} spritedef_t;
-
-extern spritedef_t *sprites;
-extern int numsprites;
-
-//=============================================================================
-
-extern int numvertexes;
-extern vertex_t *vertexes;
-
-extern int numsegs;
-extern seg_t *segs;
-
-extern int numsectors;
-extern sector_t *sectors;
-
-extern int numsubsectors;
-extern subsector_t *subsectors;
-
-extern int numnodes;
-extern node_t *nodes;
-
-extern int numlines;
-extern line_t *lines;
-
-extern int numsides;
-extern side_t *sides;
-
-
-
-extern fixed_t viewx, viewy, viewz;
-extern angle_t viewangle;
-extern player_t *viewplayer;
-
-
-extern angle_t clipangle;
-
-extern int viewangletox[FINEANGLES / 2];
-extern angle_t xtoviewangle[SCREENWIDTH + 1];
-
-extern fixed_t rw_distance;
-extern angle_t rw_normalangle;
-
-//
-// R_main.c
-//
-extern int viewwidth, viewheight, viewwindowx, viewwindowy;
-extern int scaledviewwidth;
-extern int centerx, centery;
-extern int flyheight;
-extern fixed_t centerxfrac;
-extern fixed_t centeryfrac;
-extern fixed_t projection;
-
-extern int validcount;
-
-extern int sscount, linecount, loopcount;
-extern lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-extern lighttable_t *scalelightfixed[MAXLIGHTSCALE];
-extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
-
-extern int extralight;
-extern lighttable_t *fixedcolormap;
-
-extern fixed_t viewcos, viewsin;
-
-extern int detailshift;         // 0 = high, 1 = low
-
-extern int detailLevel;
-extern int screenblocks;
-
-extern void (*colfunc) (void);
-extern void (*basecolfunc) (void);
-extern void (*tlcolfunc) (void);
-extern void (*spanfunc) (void);
-
-int R_PointOnSide(fixed_t x, fixed_t y, node_t * node);
-int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line);
-angle_t R_PointToAngle(fixed_t x, fixed_t y);
-angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
-fixed_t R_PointToDist(fixed_t x, fixed_t y);
-fixed_t R_ScaleFromGlobalAngle(angle_t visangle);
-subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
-void R_AddPointToBox(int x, int y, fixed_t * box);
-void R_ExecuteSetViewSize(void);
-
-
-//
-// R_bsp.c
-//
-extern seg_t *curline;
-extern side_t *sidedef;
-extern line_t *linedef;
-extern sector_t *frontsector, *backsector;
-
-extern int rw_x;
-extern int rw_stopx;
-
-extern boolean segtextured;
-extern boolean markfloor;       // false if the back side is the same plane
-extern boolean markceiling;
-extern boolean skymap;
-
-extern drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
-
-extern lighttable_t **hscalelight, **vscalelight, **dscalelight;
-
-typedef void (*drawfunc_t) (int start, int stop);
-void R_ClearClipSegs(void);
-
-void R_ClearDrawSegs(void);
-void R_InitSkyMap(void);
-void R_RenderBSPNode(int bspnum);
-
-//
-// R_segs.c
-//
-extern int rw_angle1;           // angle to line origin
-extern lighttable_t **walllights;
-
-
-void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2);
-
-
-//
-// R_plane.c
-//
-typedef void (*planefunction_t) (int top, int bottom);
-extern planefunction_t floorfunc, ceilingfunc;
-
-extern int skyflatnum;
-
-extern short openings[MAXOPENINGS], *lastopening;
-
-extern short floorclip[SCREENWIDTH];
-extern short ceilingclip[SCREENWIDTH];
-
-extern fixed_t yslope[SCREENHEIGHT];
-extern fixed_t distscale[SCREENWIDTH];
-
-void R_InitPlanes(void);
-void R_ClearPlanes(void);
-void R_MapPlane(int y, int x1, int x2);
-void R_MakeSpans(int x, int t1, int b1, int t2, int b2);
-void R_DrawPlanes(void);
-
-visplane_t *R_FindPlane(fixed_t height, int picnum, int lightlevel,
-                        int special);
-visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop);
-
-
-//
-// R_debug.m
-//
-extern int drawbsp;
-
-//
-// R_data.c
-//
-extern fixed_t *textureheight;  // needed for texture pegging
-extern fixed_t *spritewidth;    // needed for pre rendering (fracs)
-extern fixed_t *spriteoffset;
-extern fixed_t *spritetopoffset;
-extern lighttable_t *colormaps;
-extern int firstflat;
-extern int numflats;
-
-extern int *flattranslation;    // for global animation
-extern int *texturetranslation; // for global animation
-
-extern int firstspritelump, lastspritelump, numspritelumps;
-
-extern int columnofs[MAXWIDTH];
-
-
-byte *R_GetColumn(int tex, int col);
-void R_InitData(void);
-void R_PrecacheLevel(void);
-
-
-//
-// R_things.c
-//
-#define	MAXVISSPRITES	128
-
-extern vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
-extern vissprite_t vsprsortedhead;
-
-// constant arrays used for psprite clipping and initializing clipping
-extern short negonearray[SCREENWIDTH];
-extern short screenheightarray[SCREENWIDTH];
-
-// vars for R_DrawMaskedColumn
-extern short *mfloorclip;
-extern short *mceilingclip;
-extern fixed_t spryscale;
-extern fixed_t sprtopscreen;
-extern fixed_t sprbotscreen;
-
-extern fixed_t pspritescale, pspriteiscale;
-
-
-void R_DrawMaskedColumn(column_t * column, signed int baseclip);
-
-
-void R_SortVisSprites(void);
-
-void R_AddSprites(sector_t * sec);
-void R_AddPSprites(void);
-void R_DrawSprites(void);
-void R_InitSprites(const char **namelist);
-void R_ClearSprites(void);
-void R_DrawMasked(void);
-void R_ClipVisSprite(vissprite_t * vis, int xl, int xh);
-
-//=============================================================================
-//
-// R_draw.c
-//
-//=============================================================================
-
-extern lighttable_t *dc_colormap;
-extern int dc_x;
-extern int dc_yl;
-extern int dc_yh;
-extern fixed_t dc_iscale;
-extern fixed_t dc_texturemid;
-extern byte *dc_source;         // first pixel in a column
-extern byte *ylookup[MAXHEIGHT];
-
-
-void R_DrawColumn(void);
-void R_DrawColumnLow(void);
-void R_DrawTLColumn(void);
-void R_DrawTLColumnLow(void);
-void R_DrawTranslatedColumn(void);
-void R_DrawTranslatedTLColumn(void);
-void R_DrawTranslatedColumnLow(void);
-
-extern int ds_y;
-extern int ds_x1;
-extern int ds_x2;
-extern lighttable_t *ds_colormap;
-extern fixed_t ds_xfrac;
-extern fixed_t ds_yfrac;
-extern fixed_t ds_xstep;
-extern fixed_t ds_ystep;
-extern byte *ds_source;         // start of a 64*64 tile image
-
-extern byte *translationtables;
-extern byte *dc_translation;
-
-void R_DrawSpan(void);
-void R_DrawSpanLow(void);
-
-void R_InitBuffer(int width, int height);
-void R_InitTranslationTables(void);
-
-#endif // __R_LOCAL__
diff --git a/games/NXDoom/src/heretic/r_main.c b/games/NXDoom/src/heretic/r_main.c
deleted file mode 100644
index 1ff6a68d8..000000000
--- a/games/NXDoom/src/heretic/r_main.c
+++ /dev/null
@@ -1,818 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// R_main.c
-
-#include <stdlib.h>
-#include <math.h>
-#include "doomdef.h"
-#include "m_bbox.h"
-#include "r_local.h"
-#include "tables.h"
-
-int viewangleoffset;
-
-// haleyjd: removed WATCOMC
-
-int validcount = 1;             // increment every time a check is made
-
-lighttable_t *fixedcolormap;
-
-int centerx, centery;
-fixed_t centerxfrac, centeryfrac;
-fixed_t projection;
-
-int framecount;                 // just for profiling purposes
-
-int sscount, linecount, loopcount;
-
-fixed_t viewx, viewy, viewz;
-angle_t viewangle;
-fixed_t viewcos, viewsin;
-player_t *viewplayer;
-
-int detailshift;                // 0 = high, 1 = low
-
-//
-// precalculated math tables
-//
-angle_t clipangle;
-
-// The viewangletox[viewangle + FINEANGLES/4] lookup maps the visible view
-// angles  to screen X coordinates, flattening the arc to a flat projection
-// plane.  There will be many angles mapped to the same X.
-int viewangletox[FINEANGLES / 2];
-
-// The xtoviewangleangle[] table maps a screen pixel to the lowest viewangle
-// that maps back to x ranges from clipangle to -clipangle
-angle_t xtoviewangle[SCREENWIDTH + 1];
-
-lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-lighttable_t *scalelightfixed[MAXLIGHTSCALE];
-lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
-
-int extralight;                 // bumped light from gun blasts
-
-void (*colfunc) (void);
-void (*basecolfunc) (void);
-void (*tlcolfunc) (void);
-void (*transcolfunc) (void);
-void (*spanfunc) (void);
-
-/*
-===================
-=
-= R_AddPointToBox
-=
-===================
-*/
-
-void R_AddPointToBox(int x, int y, fixed_t * box)
-{
-    if (x < box[BOXLEFT])
-        box[BOXLEFT] = x;
-    if (x > box[BOXRIGHT])
-        box[BOXRIGHT] = x;
-    if (y < box[BOXBOTTOM])
-        box[BOXBOTTOM] = y;
-    if (y > box[BOXTOP])
-        box[BOXTOP] = y;
-}
-
-
-
-/*
-===============================================================================
-=
-= R_PointOnSide
-=
-= Returns side 0 (front) or 1 (back)
-===============================================================================
-*/
-
-int R_PointOnSide(fixed_t x, fixed_t y, node_t * node)
-{
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    if (!node->dx)
-    {
-        if (x <= node->x)
-            return node->dy > 0;
-        return node->dy < 0;
-    }
-    if (!node->dy)
-    {
-        if (y <= node->y)
-            return node->dx < 0;
-        return node->dx > 0;
-    }
-
-    dx = (x - node->x);
-    dy = (y - node->y);
-
-// try to quickly decide by looking at sign bits
-    if ((node->dy ^ node->dx ^ dx ^ dy) & 0x80000000)
-    {
-        if ((node->dy ^ dx) & 0x80000000)
-            return 1;           // (left is negative)
-        return 0;
-    }
-
-    left = FixedMul(node->dy >> FRACBITS, dx);
-    right = FixedMul(dy, node->dx >> FRACBITS);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line)
-{
-    fixed_t lx, ly;
-    fixed_t ldx, ldy;
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    lx = line->v1->x;
-    ly = line->v1->y;
-
-    ldx = line->v2->x - lx;
-    ldy = line->v2->y - ly;
-
-    if (!ldx)
-    {
-        if (x <= lx)
-            return ldy > 0;
-        return ldy < 0;
-    }
-    if (!ldy)
-    {
-        if (y <= ly)
-            return ldx < 0;
-        return ldx > 0;
-    }
-
-    dx = (x - lx);
-    dy = (y - ly);
-
-// try to quickly decide by looking at sign bits
-    if ((ldy ^ ldx ^ dx ^ dy) & 0x80000000)
-    {
-        if ((ldy ^ dx) & 0x80000000)
-            return 1;           // (left is negative)
-        return 0;
-    }
-
-    left = FixedMul(ldy >> FRACBITS, dx);
-    right = FixedMul(dy, ldx >> FRACBITS);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-/*
-===============================================================================
-=
-= R_PointToAngle
-=
-===============================================================================
-*/
-
-angle_t R_PointToAngle(fixed_t x, fixed_t y)
-{
-    x -= viewx;
-    y -= viewy;
-    if ((!x) && (!y))
-        return 0;
-    if (x >= 0)
-    {                           // x >=0
-        if (y >= 0)
-        {                       // y>= 0
-            if (x > y)
-                return tantoangle[SlopeDiv(y, x)];      // octant 0
-            else
-                return ANG90 - 1 - tantoangle[SlopeDiv(x, y)];  // octant 1
-        }
-        else
-        {                       // y<0
-            y = -y;
-            if (x > y)
-                return -tantoangle[SlopeDiv(y, x)];     // octant 8
-            else
-                return ANG270 + tantoangle[SlopeDiv(x, y)];     // octant 7
-        }
-    }
-    else
-    {                           // x<0
-        x = -x;
-        if (y >= 0)
-        {                       // y>= 0
-            if (x > y)
-                return ANG180 - 1 - tantoangle[SlopeDiv(y, x)]; // octant 3
-            else
-                return ANG90 + tantoangle[SlopeDiv(x, y)];      // octant 2
-        }
-        else
-        {                       // y<0
-            y = -y;
-            if (x > y)
-                return ANG180 + tantoangle[SlopeDiv(y, x)];     // octant 4
-            else
-                return ANG270 - 1 - tantoangle[SlopeDiv(x, y)]; // octant 5
-        }
-    }
-
-    return 0;
-}
-
-
-angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
-{
-    viewx = x1;
-    viewy = y1;
-    return R_PointToAngle(x2, y2);
-}
-
-
-fixed_t R_PointToDist(fixed_t x, fixed_t y)
-{
-    int angle;
-    fixed_t dx, dy, temp;
-    fixed_t dist;
-
-    dx = abs(x - viewx);
-    dy = abs(y - viewy);
-
-    if (dy > dx)
-    {
-        temp = dx;
-        dx = dy;
-        dy = temp;
-    }
-
-    angle =
-        (tantoangle[FixedDiv(dy, dx) >> DBITS] + ANG90) >> ANGLETOFINESHIFT;
-
-    dist = FixedDiv(dx, finesine[angle]);       // use as cosine
-
-    return dist;
-}
-
-
-
-/*
-=================
-=
-= R_InitPointToAngle
-=
-=================
-*/
-
-void R_InitPointToAngle(void)
-{
-// now getting from tables.c
-#if 0
-    int i;
-    long t;
-    float f;
-//
-// slope (tangent) to angle lookup
-//
-    for (i = 0; i <= SLOPERANGE; i++)
-    {
-        f = atan((float) i / SLOPERANGE) / (3.141592657 * 2);
-        t = 0xffffffff * f;
-        tantoangle[i] = t;
-    }
-#endif
-}
-
-//=============================================================================
-
-/*
-================
-=
-= R_ScaleFromGlobalAngle
-=
-= Returns the texture mapping scale for the current line at the given angle
-= rw_distance must be calculated first
-================
-*/
-
-fixed_t R_ScaleFromGlobalAngle(angle_t visangle)
-{
-    fixed_t scale;
-    int anglea, angleb;
-    int sinea, sineb;
-    fixed_t num, den;
-
-#if 0
-    {
-        fixed_t dist, z;
-        fixed_t sinv, cosv;
-
-        sinv = finesine[(visangle - rw_normalangle) >> ANGLETOFINESHIFT];
-        dist = FixedDiv(rw_distance, sinv);
-        cosv = finecosine[(viewangle - visangle) >> ANGLETOFINESHIFT];
-        z = abs(FixedMul(dist, cosv));
-        scale = FixedDiv(projection, z);
-        return scale;
-    }
-#endif
-
-    anglea = ANG90 + (visangle - viewangle);
-    angleb = ANG90 + (visangle - rw_normalangle);
-// bothe sines are allways positive
-    sinea = finesine[anglea >> ANGLETOFINESHIFT];
-    sineb = finesine[angleb >> ANGLETOFINESHIFT];
-    num = FixedMul(projection, sineb) << detailshift;
-    den = FixedMul(rw_distance, sinea);
-    if (den > num >> 16)
-    {
-        scale = FixedDiv(num, den);
-        if (scale > 64 * FRACUNIT)
-            scale = 64 * FRACUNIT;
-        else if (scale < 256)
-            scale = 256;
-    }
-    else
-        scale = 64 * FRACUNIT;
-
-    return scale;
-}
-
-
-
-/*
-=================
-=
-= R_InitTables
-=
-=================
-*/
-
-void R_InitTables(void)
-{
-// now getting from tables.c
-#if 0
-    int i;
-    float a, fv;
-    int t;
-
-//
-// viewangle tangent table
-//
-    for (i = 0; i < FINEANGLES / 2; i++)
-    {
-        a = (i - FINEANGLES / 4 + 0.5) * PI * 2 / FINEANGLES;
-        fv = FRACUNIT * tan(a);
-        t = fv;
-        finetangent[i] = t;
-    }
-
-//
-// finesine table
-//
-    for (i = 0; i < 5 * FINEANGLES / 4; i++)
-    {
-// OPTIMIZE: mirror...
-        a = (i + 0.5) * PI * 2 / FINEANGLES;
-        t = FRACUNIT * sin(a);
-        finesine[i] = t;
-    }
-#endif
-
-}
-
-
-/*
-=================
-=
-= R_InitTextureMapping
-=
-=================
-*/
-
-void R_InitTextureMapping(void)
-{
-    int i;
-    int x;
-    int t;
-    fixed_t focallength;
-
-
-//
-// use tangent table to generate viewangletox
-// viewangletox will give the next greatest x after the view angle
-//
-    // calc focallength so FIELDOFVIEW angles covers SCREENWIDTH
-    focallength =
-        FixedDiv(centerxfrac, finetangent[FINEANGLES / 4 + FIELDOFVIEW / 2]);
-
-    for (i = 0; i < FINEANGLES / 2; i++)
-    {
-        if (finetangent[i] > FRACUNIT * 2)
-            t = -1;
-        else if (finetangent[i] < -FRACUNIT * 2)
-            t = viewwidth + 1;
-        else
-        {
-            t = FixedMul(finetangent[i], focallength);
-            t = (centerxfrac - t + FRACUNIT - 1) >> FRACBITS;
-            if (t < -1)
-                t = -1;
-            else if (t > viewwidth + 1)
-                t = viewwidth + 1;
-        }
-        viewangletox[i] = t;
-    }
-
-//
-// scan viewangletox[] to generate xtoviewangleangle[]
-//
-// xtoviewangle will give the smallest view angle that maps to x
-    for (x = 0; x <= viewwidth; x++)
-    {
-        i = 0;
-        while (viewangletox[i] > x)
-            i++;
-        xtoviewangle[x] = (i << ANGLETOFINESHIFT) - ANG90;
-    }
-
-//
-// take out the fencepost cases from viewangletox
-//
-    for (i = 0; i < FINEANGLES / 2; i++)
-    {
-        t = FixedMul(finetangent[i], focallength);
-        t = centerx - t;
-        if (viewangletox[i] == -1)
-            viewangletox[i] = 0;
-        else if (viewangletox[i] == viewwidth + 1)
-            viewangletox[i] = viewwidth;
-    }
-
-    clipangle = xtoviewangle[0];
-}
-
-//=============================================================================
-
-/*
-====================
-=
-= R_InitLightTables
-=
-= Only inits the zlight table, because the scalelight table changes
-= with view size
-=
-====================
-*/
-
-#define		DISTMAP	2
-
-void R_InitLightTables(void)
-{
-    int i, j, level, startmap;
-    int scale;
-
-//
-// Calculate the light levels to use for each level / distance combination
-//
-    for (i = 0; i < LIGHTLEVELS; i++)
-    {
-        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
-        for (j = 0; j < MAXLIGHTZ; j++)
-        {
-            scale =
-                FixedDiv((SCREENWIDTH / 2 * FRACUNIT),
-                         (j + 1) << LIGHTZSHIFT);
-            scale >>= LIGHTSCALESHIFT;
-            level = startmap - scale / DISTMAP;
-            if (level < 0)
-                level = 0;
-            if (level >= NUMCOLORMAPS)
-                level = NUMCOLORMAPS - 1;
-            zlight[i][j] = colormaps + level * 256;
-        }
-    }
-}
-
-
-/*
-==============
-=
-= R_SetViewSize
-=
-= Don't really change anything here, because i might be in the middle of
-= a refresh.  The change will take effect next refresh.
-=
-==============
-*/
-
-boolean setsizeneeded;
-int setblocks, setdetail;
-
-void R_SetViewSize(int blocks, int detail)
-{
-    setsizeneeded = true;
-    setblocks = blocks;
-    setdetail = detail;
-}
-
-/*
-==============
-=
-= R_ExecuteSetViewSize
-=
-==============
-*/
-
-void R_ExecuteSetViewSize(void)
-{
-    fixed_t cosadj, dy;
-    int i, j, level, startmap;
-
-    setsizeneeded = false;
-
-    if (setblocks == 11)
-    {
-        scaledviewwidth = SCREENWIDTH;
-        viewheight = SCREENHEIGHT;
-    }
-    else
-    {
-        scaledviewwidth = setblocks * 32;
-        viewheight = (setblocks * 158 / 10);
-    }
-
-    detailshift = setdetail;
-    viewwidth = scaledviewwidth >> detailshift;
-
-    centery = viewheight / 2;
-    centerx = viewwidth / 2;
-    centerxfrac = centerx << FRACBITS;
-    centeryfrac = centery << FRACBITS;
-    projection = centerxfrac;
-
-    if (!detailshift)
-    {
-        colfunc = basecolfunc = R_DrawColumn;
-        tlcolfunc = R_DrawTLColumn;
-        transcolfunc = R_DrawTranslatedColumn;
-        spanfunc = R_DrawSpan;
-    }
-    else
-    {
-        colfunc = basecolfunc = R_DrawColumnLow;
-        tlcolfunc = R_DrawTLColumn;
-        transcolfunc = R_DrawTranslatedColumn;
-        spanfunc = R_DrawSpanLow;
-    }
-
-    R_InitBuffer(scaledviewwidth, viewheight);
-
-    R_InitTextureMapping();
-
-//
-// psprite scales
-//
-    pspritescale = FRACUNIT * viewwidth / SCREENWIDTH;
-    pspriteiscale = FRACUNIT * SCREENWIDTH / viewwidth;
-
-//
-// thing clipping
-//
-    for (i = 0; i < viewwidth; i++)
-        screenheightarray[i] = viewheight;
-
-//
-// planes
-//
-    for (i = 0; i < viewheight; i++)
-    {
-        dy = ((i - viewheight / 2) << FRACBITS) + FRACUNIT / 2;
-        dy = abs(dy);
-        yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT, dy);
-    }
-
-    for (i = 0; i < viewwidth; i++)
-    {
-        cosadj = abs(finecosine[xtoviewangle[i] >> ANGLETOFINESHIFT]);
-        distscale[i] = FixedDiv(FRACUNIT, cosadj);
-    }
-
-//
-// Calculate the light levels to use for each level / scale combination
-//
-    for (i = 0; i < LIGHTLEVELS; i++)
-    {
-        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
-        for (j = 0; j < MAXLIGHTSCALE; j++)
-        {
-            level =
-                startmap -
-                j * SCREENWIDTH / (viewwidth << detailshift) / DISTMAP;
-            if (level < 0)
-                level = 0;
-            if (level >= NUMCOLORMAPS)
-                level = NUMCOLORMAPS - 1;
-            scalelight[i][j] = colormaps + level * 256;
-        }
-    }
-
-//
-// draw the border
-//
-    R_DrawViewBorder();         // erase old menu stuff
-}
-
-
-/*
-==============
-=
-= R_Init
-=
-==============
-*/
-
-int detailLevel;
-int screenblocks = 10;
-
-void R_Init(void)
-{
-    //tprintf("R_InitData ", 1);
-    R_InitData();
-    printf (".");
-    //tprintf("R_InitPointToAngle\n", 0);
-    R_InitPointToAngle();
-    printf (".");
-    //tprintf("R_InitTables ", 0);
-    R_InitTables();
-    // viewwidth / viewheight / detailLevel are set by the defaults
-    printf (".");
-    R_SetViewSize(screenblocks, detailLevel);
-    //tprintf("R_InitPlanes\n", 0);
-    R_InitPlanes();
-    printf (".");
-    //tprintf("R_InitLightTables ", 0);
-    R_InitLightTables();
-    printf (".");
-    //tprintf("R_InitSkyMap\n", 0);
-    R_InitSkyMap();
-    printf (".");
-    R_InitTranslationTables();
-    framecount = 0;
-}
-
-
-/*
-==============
-=
-= R_PointInSubsector
-=
-==============
-*/
-
-subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
-{
-    node_t *node;
-    int side, nodenum;
-
-    if (!numnodes)              // single subsector is a special case
-        return subsectors;
-
-    nodenum = numnodes - 1;
-
-    while (!(nodenum & NF_SUBSECTOR))
-    {
-        node = &nodes[nodenum];
-        side = R_PointOnSide(x, y, node);
-        nodenum = node->children[side];
-    }
-
-    return &subsectors[nodenum & ~NF_SUBSECTOR];
-
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC R_SetupFrame
-//
-//----------------------------------------------------------------------------
-
-void R_SetupFrame(player_t * player)
-{
-    int i;
-    int tableAngle;
-    int tempCentery;
-
-    //drawbsp = 1;
-    viewplayer = player;
-    // haleyjd: removed WATCOMC
-    // haleyjd FIXME: viewangleoffset handling?
-    viewangle = player->mo->angle + viewangleoffset;
-    tableAngle = viewangle >> ANGLETOFINESHIFT;
-    if (player->chickenTics && player->chickenPeck)
-    {                           // Set chicken attack view position
-        viewx = player->mo->x + player->chickenPeck * finecosine[tableAngle];
-        viewy = player->mo->y + player->chickenPeck * finesine[tableAngle];
-    }
-    else
-    {                           // Normal view position
-        viewx = player->mo->x;
-        viewy = player->mo->y;
-    }
-    extralight = player->extralight;
-    viewz = player->viewz;
-
-    tempCentery = viewheight / 2 + (player->lookdir) * screenblocks / 10;
-    if (centery != tempCentery)
-    {
-        centery = tempCentery;
-        centeryfrac = centery << FRACBITS;
-        for (i = 0; i < viewheight; i++)
-        {
-            yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT,
-                                 abs(((i - centery) << FRACBITS) +
-                                     FRACUNIT / 2));
-        }
-    }
-    viewsin = finesine[tableAngle];
-    viewcos = finecosine[tableAngle];
-    sscount = 0;
-    if (player->fixedcolormap)
-    {
-        fixedcolormap = colormaps + player->fixedcolormap
-            * 256 * sizeof(lighttable_t);
-        walllights = scalelightfixed;
-        for (i = 0; i < MAXLIGHTSCALE; i++)
-        {
-            scalelightfixed[i] = fixedcolormap;
-        }
-    }
-    else
-    {
-        fixedcolormap = 0;
-    }
-    framecount++;
-    validcount++;
-    if (BorderNeedRefresh)
-    {
-        if (setblocks < 10)
-        {
-            R_DrawViewBorder();
-        }
-        BorderNeedRefresh = false;
-        BorderTopRefresh = false;
-        UpdateState |= I_FULLSCRN;
-    }
-    if (BorderTopRefresh)
-    {
-        if (setblocks < 10)
-        {
-            R_DrawTopBorder();
-        }
-        BorderTopRefresh = false;
-        UpdateState |= I_MESSAGES;
-    }
-}
-
-/*
-==============
-=
-= R_RenderView
-=
-==============
-*/
-
-void R_RenderPlayerView(player_t * player)
-{
-    R_SetupFrame(player);
-    R_ClearClipSegs();
-    R_ClearDrawSegs();
-    R_ClearPlanes();
-    R_ClearSprites();
-    NetUpdate();                // check for new console commands
-    R_RenderBSPNode(numnodes - 1);      // the head node is the last node output
-    NetUpdate();                // check for new console commands
-    R_DrawPlanes();
-    NetUpdate();                // check for new console commands
-    R_DrawMasked();
-    NetUpdate();                // check for new console commands
-}
diff --git a/games/NXDoom/src/heretic/r_plane.c b/games/NXDoom/src/heretic/r_plane.c
deleted file mode 100644
index e9ed70c76..000000000
--- a/games/NXDoom/src/heretic/r_plane.c
+++ /dev/null
@@ -1,511 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// R_planes.c
-
-#include <stdlib.h>
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_system.h"
-#include "r_local.h"
-
-planefunction_t floorfunc, ceilingfunc;
-
-//
-// sky mapping
-//
-int skyflatnum;
-int skytexture;
-int skytexturemid;
-fixed_t skyiscale;
-
-//
-// opening
-//
-
-visplane_t visplanes[MAXVISPLANES], *lastvisplane;
-visplane_t *floorplane, *ceilingplane;
-
-short openings[MAXOPENINGS], *lastopening;
-
-//
-// clip values are the solid pixel bounding the range
-// floorclip starts out SCREENHEIGHT
-// ceilingclip starts out -1
-//
-short floorclip[SCREENWIDTH];
-short ceilingclip[SCREENWIDTH];
-
-//
-// spanstart holds the start of a plane span
-// initialized to 0 at start
-//
-int spanstart[SCREENHEIGHT];
-int spanstop[SCREENHEIGHT];
-
-//
-// texture mapping
-//
-lighttable_t **planezlight;
-fixed_t planeheight;
-
-fixed_t yslope[SCREENHEIGHT];
-fixed_t distscale[SCREENWIDTH];
-fixed_t basexscale, baseyscale;
-
-fixed_t cachedheight[SCREENHEIGHT];
-fixed_t cacheddistance[SCREENHEIGHT];
-fixed_t cachedxstep[SCREENHEIGHT];
-fixed_t cachedystep[SCREENHEIGHT];
-
-
-/*
-================
-=
-= R_InitSkyMap
-=
-= Called whenever the view size changes
-=
-================
-*/
-
-void R_InitSkyMap(void)
-{
-    skyflatnum = R_FlatNumForName(DEH_String("F_SKY1"));
-    skytexturemid = 200 * FRACUNIT;
-    skyiscale = FRACUNIT;
-}
-
-
-/*
-====================
-=
-= R_InitPlanes
-=
-= Only at game startup
-====================
-*/
-
-void R_InitPlanes(void)
-{
-}
-
-
-/*
-================
-=
-= R_MapPlane
-=
-global vars:
-
-planeheight
-ds_source
-basexscale
-baseyscale
-viewx
-viewy
-
-BASIC PRIMITIVE
-================
-*/
-
-void R_MapPlane(int y, int x1, int x2)
-{
-    angle_t angle;
-    fixed_t distance, length;
-    unsigned index;
-
-#ifdef RANGECHECK
-    if (x2 < x1 || x1 < 0 || x2 >= viewwidth || (unsigned) y > viewheight)
-        I_Error("R_MapPlane: %i, %i at %i", x1, x2, y);
-#endif
-
-    if (planeheight != cachedheight[y])
-    {
-        cachedheight[y] = planeheight;
-        distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
-
-        ds_xstep = cachedxstep[y] = FixedMul(distance, basexscale);
-        ds_ystep = cachedystep[y] = FixedMul(distance, baseyscale);
-    }
-    else
-    {
-        distance = cacheddistance[y];
-        ds_xstep = cachedxstep[y];
-        ds_ystep = cachedystep[y];
-    }
-
-    length = FixedMul(distance, distscale[x1]);
-    angle = (viewangle + xtoviewangle[x1]) >> ANGLETOFINESHIFT;
-    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
-    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
-
-    if (fixedcolormap)
-        ds_colormap = fixedcolormap;
-    else
-    {
-        index = distance >> LIGHTZSHIFT;
-        if (index >= MAXLIGHTZ)
-            index = MAXLIGHTZ - 1;
-        ds_colormap = planezlight[index];
-    }
-
-    ds_y = y;
-    ds_x1 = x1;
-    ds_x2 = x2;
-
-    spanfunc();                 // high or low detail
-}
-
-//=============================================================================
-
-/*
-====================
-=
-= R_ClearPlanes
-=
-= At begining of frame
-====================
-*/
-
-void R_ClearPlanes(void)
-{
-    int i;
-    angle_t angle;
-
-//
-// opening / clipping determination
-//      
-    for (i = 0; i < viewwidth; i++)
-    {
-        floorclip[i] = viewheight;
-        ceilingclip[i] = -1;
-    }
-
-    lastvisplane = visplanes;
-    lastopening = openings;
-
-//
-// texture calculation
-//
-    memset(cachedheight, 0, sizeof(cachedheight));
-    angle = (viewangle - ANG90) >> ANGLETOFINESHIFT;    // left to right mapping
-
-    // scale will be unit scale at SCREENWIDTH/2 distance
-    basexscale = FixedDiv(finecosine[angle], centerxfrac);
-    baseyscale = -FixedDiv(finesine[angle], centerxfrac);
-}
-
-
-
-/*
-===============
-=
-= R_FindPlane
-=
-===============
-*/
-
-visplane_t *R_FindPlane(fixed_t height, int picnum,
-                        int lightlevel, int special)
-{
-    visplane_t *check;
-
-    if (picnum == skyflatnum)
-    {
-        // all skies map together
-        height = 0;
-        lightlevel = 0;
-    }
-
-    for (check = visplanes; check < lastvisplane; check++)
-    {
-        if (height == check->height
-            && picnum == check->picnum
-            && lightlevel == check->lightlevel && special == check->special)
-            break;
-    }
-
-    if (check < lastvisplane)
-    {
-        return (check);
-    }
-
-    if (lastvisplane - visplanes == MAXVISPLANES)
-    {
-        I_Error("R_FindPlane: no more visplanes");
-    }
-
-    lastvisplane++;
-    check->height = height;
-    check->picnum = picnum;
-    check->lightlevel = lightlevel;
-    check->special = special;
-    check->minx = SCREENWIDTH;
-    check->maxx = -1;
-    memset(check->top, 0xff, sizeof(check->top));
-    return (check);
-}
-
-/*
-===============
-=
-= R_CheckPlane
-=
-===============
-*/
-
-visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop)
-{
-    int intrl, intrh;
-    int unionl, unionh;
-    int x;
-
-    if (start < pl->minx)
-    {
-        intrl = pl->minx;
-        unionl = start;
-    }
-    else
-    {
-        unionl = pl->minx;
-        intrl = start;
-    }
-
-    if (stop > pl->maxx)
-    {
-        intrh = pl->maxx;
-        unionh = stop;
-    }
-    else
-    {
-        unionh = pl->maxx;
-        intrh = stop;
-    }
-
-    for (x = intrl; x <= intrh; x++)
-        if (pl->top[x] != 0xff)
-            break;
-
-    if (x > intrh)
-    {
-        pl->minx = unionl;
-        pl->maxx = unionh;
-        return pl;              // use the same one
-    }
-
-// make a new visplane
-
-    lastvisplane->height = pl->height;
-    lastvisplane->picnum = pl->picnum;
-    lastvisplane->lightlevel = pl->lightlevel;
-    lastvisplane->special = pl->special;
-    pl = lastvisplane++;
-    pl->minx = start;
-    pl->maxx = stop;
-    memset(pl->top, 0xff, sizeof(pl->top));
-
-    return pl;
-}
-
-
-
-//=============================================================================
-
-/*
-================
-=
-= R_MakeSpans
-=
-================
-*/
-
-void R_MakeSpans(int x, int t1, int b1, int t2, int b2)
-{
-    while (t1 < t2 && t1 <= b1)
-    {
-        R_MapPlane(t1, spanstart[t1], x - 1);
-        t1++;
-    }
-    while (b1 > b2 && b1 >= t1)
-    {
-        R_MapPlane(b1, spanstart[b1], x - 1);
-        b1--;
-    }
-
-    while (t2 < t1 && t2 <= b2)
-    {
-        spanstart[t2] = x;
-        t2++;
-    }
-    while (b2 > b1 && b2 >= t2)
-    {
-        spanstart[b2] = x;
-        b2--;
-    }
-}
-
-
-
-/*
-================
-=
-= R_DrawPlanes
-=
-= At the end of each frame
-================
-*/
-
-void R_DrawPlanes(void)
-{
-    visplane_t *pl;
-    int light;
-    int x, stop;
-    int lumpnum;
-    int angle;
-    byte *tempSource;
-
-    byte *dest;
-    int count;
-    fixed_t frac, fracstep;
-
-#ifdef RANGECHECK
-    if (ds_p - drawsegs > MAXDRAWSEGS)
-        I_Error("R_DrawPlanes: drawsegs overflow (%td)",
-                ds_p - drawsegs);
-    if (lastvisplane - visplanes > MAXVISPLANES)
-        I_Error("R_DrawPlanes: visplane overflow (%td)",
-                lastvisplane - visplanes);
-    if (lastopening - openings > MAXOPENINGS)
-        I_Error("R_DrawPlanes: opening overflow (%td)",
-                lastopening - openings);
-#endif
-
-    for (pl = visplanes; pl < lastvisplane; pl++)
-    {
-        if (pl->minx > pl->maxx)
-            continue;
-        //
-        // sky flat
-        //
-        if (pl->picnum == skyflatnum)
-        {
-            dc_iscale = skyiscale;
-            dc_colormap = colormaps;    // sky is allways drawn full bright
-            dc_texturemid = skytexturemid;
-            for (x = pl->minx; x <= pl->maxx; x++)
-            {
-                dc_yl = pl->top[x];
-                dc_yh = pl->bottom[x];
-                if (dc_yl <= dc_yh)
-                {
-                    angle = (viewangle + xtoviewangle[x]) >> ANGLETOSKYSHIFT;
-                    dc_x = x;
-                    dc_source = R_GetColumn(skytexture, angle);
-
-                    count = dc_yh - dc_yl;
-                    if (count < 0)
-                        return;
-
-#ifdef RANGECHECK
-                    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0
-                        || dc_yh >= SCREENHEIGHT)
-                        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh,
-                                dc_x);
-#endif
-
-                    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-                    fracstep = 1;
-                    frac = (dc_texturemid >> FRACBITS) + (dc_yl - centery);
-                    do
-                    {
-                        *dest = dc_source[frac];
-                        dest += SCREENWIDTH;
-                        frac += fracstep;
-                    }
-                    while (count--);
-
-//                                      colfunc ();
-                }
-            }
-            continue;
-        }
-
-        //
-        // regular flat
-        //
-        lumpnum = firstflat + flattranslation[pl->picnum];
-
-        tempSource = W_CacheLumpNum(lumpnum, PU_STATIC);
-
-        switch (pl->special)
-        {
-            case 25:
-            case 26:
-            case 27:
-            case 28:
-            case 29:           // Scroll_North
-                ds_source = tempSource;
-                break;
-            case 20:
-            case 21:
-            case 22:
-            case 23:
-            case 24:           // Scroll_East
-                ds_source = tempSource + ((63 - ((leveltime >> 1) & 63)) <<
-                                          (pl->special - 20) & 63);
-                //ds_source = tempSource+((leveltime>>1)&63);
-                break;
-            case 30:
-            case 31:
-            case 32:
-            case 33:
-            case 34:           // Scroll_South
-                ds_source = tempSource;
-                break;
-            case 35:
-            case 36:
-            case 37:
-            case 38:
-            case 39:           // Scroll_West
-                ds_source = tempSource;
-                break;
-            case 4:            // Scroll_EastLavaDamage
-                ds_source =
-                    tempSource + (((63 - ((leveltime >> 1) & 63)) << 3) & 63);
-                break;
-            default:
-                ds_source = tempSource;
-        }
-        planeheight = abs(pl->height - viewz);
-        light = (pl->lightlevel >> LIGHTSEGSHIFT) + extralight;
-        if (light >= LIGHTLEVELS)
-            light = LIGHTLEVELS - 1;
-        if (light < 0)
-            light = 0;
-        planezlight = zlight[light];
-
-        pl->top[pl->maxx + 1] = 0xff;
-        pl->top[pl->minx - 1] = 0xff;
-
-        stop = pl->maxx + 1;
-        for (x = pl->minx; x <= stop; x++)
-            R_MakeSpans(x, pl->top[x - 1], pl->bottom[x - 1], pl->top[x],
-                        pl->bottom[x]);
-
-        W_ReleaseLumpNum(lumpnum);
-    }
-}
diff --git a/games/NXDoom/src/heretic/r_segs.c b/games/NXDoom/src/heretic/r_segs.c
deleted file mode 100644
index b37c94d6c..000000000
--- a/games/NXDoom/src/heretic/r_segs.c
+++ /dev/null
@@ -1,661 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-//**************************************************************************
-//**
-//** R_SEGS.C
-//**
-//** This version has the tall-sector-crossing-precision-bug fixed.
-//**
-//**************************************************************************
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "r_local.h"
-
-// OPTIMIZE: closed two sided lines as single sided
-
-boolean segtextured;            // true if any of the segs textures might be vis
-boolean markfloor;              // false if the back side is the same plane
-boolean markceiling;
-boolean maskedtexture;
-int toptexture, bottomtexture, midtexture;
-
-
-angle_t rw_normalangle;
-int rw_angle1;                  // angle to line origin
-
-//
-// wall
-//
-int rw_x;
-int rw_stopx;
-angle_t rw_centerangle;
-fixed_t rw_offset;
-fixed_t rw_distance;
-fixed_t rw_scale;
-fixed_t rw_scalestep;
-fixed_t rw_midtexturemid;
-fixed_t rw_toptexturemid;
-fixed_t rw_bottomtexturemid;
-
-int worldtop, worldbottom, worldhigh, worldlow;
-
-fixed_t pixhigh, pixlow;
-fixed_t pixhighstep, pixlowstep;
-fixed_t topfrac, topstep;
-fixed_t bottomfrac, bottomstep;
-
-
-lighttable_t **walllights;
-
-short *maskedtexturecol;
-
-/*
-================
-=
-= R_RenderMaskedSegRange
-=
-================
-*/
-
-void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2)
-{
-    unsigned index;
-    column_t *col;
-    int lightnum;
-    int texnum;
-
-//
-// calculate light table
-// use different light tables for horizontal / vertical / diagonal
-// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-    curline = ds->curline;
-    frontsector = curline->frontsector;
-    backsector = curline->backsector;
-    texnum = texturetranslation[curline->sidedef->midtexture];
-
-    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
-    if (curline->v1->y == curline->v2->y)
-        lightnum--;
-    else if (curline->v1->x == curline->v2->x)
-        lightnum++;
-    if (lightnum < 0)
-        walllights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-        walllights = scalelight[LIGHTLEVELS - 1];
-    else
-        walllights = scalelight[lightnum];
-
-    maskedtexturecol = ds->maskedtexturecol;
-
-    rw_scalestep = ds->scalestep;
-    spryscale = ds->scale1 + (x1 - ds->x1) * rw_scalestep;
-    mfloorclip = ds->sprbottomclip;
-    mceilingclip = ds->sprtopclip;
-
-//
-// find positioning
-//
-    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
-    {
-        dc_texturemid = frontsector->floorheight > backsector->floorheight
-            ? frontsector->floorheight : backsector->floorheight;
-        dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
-    }
-    else
-    {
-        dc_texturemid = frontsector->ceilingheight < backsector->ceilingheight
-            ? frontsector->ceilingheight : backsector->ceilingheight;
-        dc_texturemid = dc_texturemid - viewz;
-    }
-    dc_texturemid += curline->sidedef->rowoffset;
-
-    if (fixedcolormap)
-        dc_colormap = fixedcolormap;
-//
-// draw the columns
-//
-    for (dc_x = x1; dc_x <= x2; dc_x++)
-    {
-        // calculate lighting
-        if (maskedtexturecol[dc_x] != SHRT_MAX)
-        {
-            if (!fixedcolormap)
-            {
-                index = spryscale >> LIGHTSCALESHIFT;
-                if (index >= MAXLIGHTSCALE)
-                    index = MAXLIGHTSCALE - 1;
-                dc_colormap = walllights[index];
-            }
-
-            sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-            dc_iscale = 0xffffffffu / (unsigned) spryscale;
-
-            //
-            // draw the texture
-            //
-            col = (column_t *) ((byte *)
-                                R_GetColumn(texnum,
-                                            maskedtexturecol[dc_x]) - 3);
-
-            R_DrawMaskedColumn(col, -1);
-            maskedtexturecol[dc_x] = SHRT_MAX;
-        }
-        spryscale += rw_scalestep;
-    }
-
-}
-
-/*
-================
-=
-= R_RenderSegLoop
-=
-= Draws zero, one, or two textures (and possibly a masked texture) for walls
-= Can draw or mark the starting pixel of floor and ceiling textures
-=
-= CALLED: CORE LOOPING ROUTINE
-================
-*/
-
-#define HEIGHTBITS      12
-#define HEIGHTUNIT      (1<<HEIGHTBITS)
-
-void R_RenderSegLoop(void)
-{
-    angle_t angle;
-    unsigned index;
-    int yl, yh, mid;
-    fixed_t texturecolumn;
-    int top, bottom;
-
-    texturecolumn = 0;               // shut up compiler warning
-
-    for (; rw_x < rw_stopx; rw_x++)
-    {
-//
-// mark floor / ceiling areas
-//
-        yl = (topfrac + HEIGHTUNIT - 1) >> HEIGHTBITS;
-        if (yl < ceilingclip[rw_x] + 1)
-            yl = ceilingclip[rw_x] + 1; // no space above wall
-        if (markceiling)
-        {
-            top = ceilingclip[rw_x] + 1;
-            bottom = yl - 1;
-            if (bottom >= floorclip[rw_x])
-                bottom = floorclip[rw_x] - 1;
-            if (top <= bottom)
-            {
-                ceilingplane->top[rw_x] = top;
-                ceilingplane->bottom[rw_x] = bottom;
-            }
-        }
-
-        yh = bottomfrac >> HEIGHTBITS;
-        if (yh >= floorclip[rw_x])
-            yh = floorclip[rw_x] - 1;
-        if (markfloor)
-        {
-            top = yh + 1;
-            bottom = floorclip[rw_x] - 1;
-            if (top <= ceilingclip[rw_x])
-                top = ceilingclip[rw_x] + 1;
-            if (top <= bottom)
-            {
-                floorplane->top[rw_x] = top;
-                floorplane->bottom[rw_x] = bottom;
-            }
-        }
-
-//
-// texturecolumn and lighting are independent of wall tiers
-//
-        if (segtextured)
-        {
-            // calculate texture offset
-            angle = (rw_centerangle + xtoviewangle[rw_x]) >> ANGLETOFINESHIFT;
-            texturecolumn =
-                rw_offset - FixedMul(finetangent[angle], rw_distance);
-            texturecolumn >>= FRACBITS;
-            // calculate lighting
-            index = rw_scale >> LIGHTSCALESHIFT;
-            if (index >= MAXLIGHTSCALE)
-                index = MAXLIGHTSCALE - 1;
-            dc_colormap = walllights[index];
-            dc_x = rw_x;
-            dc_iscale = 0xffffffffu / (unsigned) rw_scale;
-        }
-
-//
-// draw the wall tiers
-//
-        if (midtexture)
-        {                       // single sided line
-            dc_yl = yl;
-            dc_yh = yh;
-            dc_texturemid = rw_midtexturemid;
-            dc_source = R_GetColumn(midtexture, texturecolumn);
-            colfunc();
-            ceilingclip[rw_x] = viewheight;
-            floorclip[rw_x] = -1;
-        }
-        else
-        {                       // two sided line
-            if (toptexture)
-            {                   // top wall
-                mid = pixhigh >> HEIGHTBITS;
-                pixhigh += pixhighstep;
-                if (mid >= floorclip[rw_x])
-                    mid = floorclip[rw_x] - 1;
-                if (mid >= yl)
-                {
-                    dc_yl = yl;
-                    dc_yh = mid;
-                    dc_texturemid = rw_toptexturemid;
-                    dc_source = R_GetColumn(toptexture, texturecolumn);
-                    colfunc();
-                    ceilingclip[rw_x] = mid;
-                }
-                else
-                    ceilingclip[rw_x] = yl - 1;
-            }
-            else
-            {                   // no top wall
-                if (markceiling)
-                    ceilingclip[rw_x] = yl - 1;
-            }
-
-            if (bottomtexture)
-            {                   // bottom wall
-                mid = (pixlow + HEIGHTUNIT - 1) >> HEIGHTBITS;
-                pixlow += pixlowstep;
-                if (mid <= ceilingclip[rw_x])
-                    mid = ceilingclip[rw_x] + 1;        // no space above wall
-                if (mid <= yh)
-                {
-                    dc_yl = mid;
-                    dc_yh = yh;
-                    dc_texturemid = rw_bottomtexturemid;
-                    dc_source = R_GetColumn(bottomtexture, texturecolumn);
-                    colfunc();
-                    floorclip[rw_x] = mid;
-                }
-                else
-                    floorclip[rw_x] = yh + 1;
-            }
-            else
-            {                   // no bottom wall
-                if (markfloor)
-                    floorclip[rw_x] = yh + 1;
-            }
-
-            if (maskedtexture)
-            {                   // save texturecol for backdrawing of masked mid texture
-                maskedtexturecol[rw_x] = texturecolumn;
-            }
-        }
-
-        rw_scale += rw_scalestep;
-        topfrac += topstep;
-        bottomfrac += bottomstep;
-    }
-
-}
-
-
-
-/*
-=====================
-=
-= R_StoreWallRange
-=
-= A wall segment will be drawn between start and stop pixels (inclusive)
-=
-======================
-*/
-
-void R_StoreWallRange(int start, int stop)
-{
-    fixed_t hyp;
-    fixed_t sineval;
-    angle_t distangle, offsetangle;
-    fixed_t vtop;
-    int lightnum;
-
-    if (ds_p == &drawsegs[MAXDRAWSEGS])
-        return;                 // don't overflow and crash
-
-#ifdef RANGECHECK
-    if (start >= viewwidth || start > stop)
-        I_Error("Bad R_RenderWallRange: %i to %i", start, stop);
-#endif
-
-    sidedef = curline->sidedef;
-    linedef = curline->linedef;
-
-// mark the segment as visible for auto map
-    linedef->flags |= ML_MAPPED;
-
-//
-// calculate rw_distance for scale calculation
-//
-    rw_normalangle = curline->angle + ANG90;
-    offsetangle = abs((int) rw_normalangle - (int) rw_angle1);
-    if (offsetangle > ANG90)
-        offsetangle = ANG90;
-    distangle = ANG90 - offsetangle;
-    hyp = R_PointToDist(curline->v1->x, curline->v1->y);
-    sineval = finesine[distangle >> ANGLETOFINESHIFT];
-    rw_distance = FixedMul(hyp, sineval);
-
-
-    ds_p->x1 = rw_x = start;
-    ds_p->x2 = stop;
-    ds_p->curline = curline;
-    rw_stopx = stop + 1;
-
-//
-// calculate scale at both ends and step
-//
-    ds_p->scale1 = rw_scale =
-        R_ScaleFromGlobalAngle(viewangle + xtoviewangle[start]);
-    if (stop > start)
-    {
-        ds_p->scale2 = R_ScaleFromGlobalAngle(viewangle + xtoviewangle[stop]);
-        ds_p->scalestep = rw_scalestep =
-            (ds_p->scale2 - rw_scale) / (stop - start);
-    }
-    else
-    {
-        //
-        // try to fix the stretched line bug
-        //
-#if 0
-        if (rw_distance < FRACUNIT / 2)
-        {
-            fixed_t trx, try;
-            fixed_t gxt, gyt;
-
-            trx = curline->v1->x - viewx;
-            try = curline->v1->y - viewy;
-
-            gxt = FixedMul(trx, viewcos);
-            gyt = -FixedMul(try, viewsin);
-            ds_p->scale1 = FixedDiv(projection, gxt - gyt);
-        }
-#endif
-        ds_p->scale2 = ds_p->scale1;
-    }
-
-
-//
-// calculate texture boundaries and decide if floor / ceiling marks
-// are needed
-//
-    worldtop = frontsector->ceilingheight - viewz;
-    worldbottom = frontsector->floorheight - viewz;
-
-    midtexture = toptexture = bottomtexture = maskedtexture = 0;
-    ds_p->maskedtexturecol = NULL;
-
-    if (!backsector)
-    {
-//
-// single sided line
-//
-        midtexture = texturetranslation[sidedef->midtexture];
-        // a single sided line is terminal, so it must mark ends
-        markfloor = markceiling = true;
-        if (linedef->flags & ML_DONTPEGBOTTOM)
-        {
-            vtop = frontsector->floorheight +
-                textureheight[sidedef->midtexture];
-            rw_midtexturemid = vtop - viewz;    // bottom of texture at bottom
-        }
-        else
-            rw_midtexturemid = worldtop;        // top of texture at top
-        rw_midtexturemid += sidedef->rowoffset;
-        ds_p->silhouette = SIL_BOTH;
-        ds_p->sprtopclip = screenheightarray;
-        ds_p->sprbottomclip = negonearray;
-        ds_p->bsilheight = INT_MAX;
-        ds_p->tsilheight = INT_MIN;
-    }
-    else
-    {
-//
-// two sided line
-//
-        ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
-        ds_p->silhouette = 0;
-        if (frontsector->floorheight > backsector->floorheight)
-        {
-            ds_p->silhouette = SIL_BOTTOM;
-            ds_p->bsilheight = frontsector->floorheight;
-        }
-        else if (backsector->floorheight > viewz)
-        {
-            ds_p->silhouette = SIL_BOTTOM;
-            ds_p->bsilheight = INT_MAX;
-//                      ds_p->sprbottomclip = negonearray;
-        }
-        if (frontsector->ceilingheight < backsector->ceilingheight)
-        {
-            ds_p->silhouette |= SIL_TOP;
-            ds_p->tsilheight = frontsector->ceilingheight;
-        }
-        else if (backsector->ceilingheight < viewz)
-        {
-            ds_p->silhouette |= SIL_TOP;
-            ds_p->tsilheight = INT_MIN;
-//                      ds_p->sprtopclip = screenheightarray;
-        }
-
-        if (backsector->ceilingheight <= frontsector->floorheight)
-        {
-            ds_p->sprbottomclip = negonearray;
-            ds_p->bsilheight = INT_MAX;
-            ds_p->silhouette |= SIL_BOTTOM;
-        }
-        if (backsector->floorheight >= frontsector->ceilingheight)
-        {
-            ds_p->sprtopclip = screenheightarray;
-            ds_p->tsilheight = INT_MIN;
-            ds_p->silhouette |= SIL_TOP;
-        }
-        worldhigh = backsector->ceilingheight - viewz;
-        worldlow = backsector->floorheight - viewz;
-
-        // hack to allow height changes in outdoor areas
-        if (frontsector->ceilingpic == skyflatnum
-            && backsector->ceilingpic == skyflatnum)
-            worldtop = worldhigh;
-
-        if (worldlow != worldbottom
-            || backsector->floorpic != frontsector->floorpic
-            || backsector->lightlevel != frontsector->lightlevel)
-            markfloor = true;
-        else
-            markfloor = false;  // same plane on both sides
-
-        if (worldhigh != worldtop
-            || backsector->ceilingpic != frontsector->ceilingpic
-            || backsector->lightlevel != frontsector->lightlevel)
-            markceiling = true;
-        else
-            markceiling = false;        // same plane on both sides
-
-        if (backsector->ceilingheight <= frontsector->floorheight
-            || backsector->floorheight >= frontsector->ceilingheight)
-            markceiling = markfloor = true;     // closed door
-
-        if (worldhigh < worldtop)
-        {                       // top texture
-            toptexture = texturetranslation[sidedef->toptexture];
-            if (linedef->flags & ML_DONTPEGTOP)
-                rw_toptexturemid = worldtop;    // top of texture at top
-            else
-            {
-                vtop = backsector->ceilingheight +
-                    textureheight[sidedef->toptexture];
-                rw_toptexturemid = vtop - viewz;        // bottom of texture
-            }
-        }
-        if (worldlow > worldbottom)
-        {                       // bottom texture
-            bottomtexture = texturetranslation[sidedef->bottomtexture];
-            if (linedef->flags & ML_DONTPEGBOTTOM)
-            {                   // bottom of texture at bottom
-                rw_bottomtexturemid = worldtop; // top of texture at top
-            }
-            else                // top of texture at top
-                rw_bottomtexturemid = worldlow;
-        }
-        rw_toptexturemid += sidedef->rowoffset;
-        rw_bottomtexturemid += sidedef->rowoffset;
-
-        //
-        // allocate space for masked texture tables
-        //
-        if (sidedef->midtexture)
-        {                       // masked midtexture
-            maskedtexture = true;
-            ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
-            lastopening += rw_stopx - rw_x;
-        }
-    }
-
-//
-// calculate rw_offset (only needed for textured lines)
-//
-    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
-
-    if (segtextured)
-    {
-        offsetangle = rw_normalangle - rw_angle1;
-        if (offsetangle > ANG180)
-            offsetangle = -offsetangle;
-        if (offsetangle > ANG90)
-            offsetangle = ANG90;
-        sineval = finesine[offsetangle >> ANGLETOFINESHIFT];
-        rw_offset = FixedMul(hyp, sineval);
-        if (rw_normalangle - rw_angle1 < ANG180)
-            rw_offset = -rw_offset;
-        rw_offset += sidedef->textureoffset + curline->offset;
-        rw_centerangle = ANG90 + viewangle - rw_normalangle;
-
-        //
-        // calculate light table
-        // use different light tables for horizontal / vertical / diagonal
-        // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-        if (!fixedcolormap)
-        {
-            lightnum =
-                (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
-            if (curline->v1->y == curline->v2->y)
-                lightnum--;
-            else if (curline->v1->x == curline->v2->x)
-                lightnum++;
-            if (lightnum < 0)
-                walllights = scalelight[0];
-            else if (lightnum >= LIGHTLEVELS)
-                walllights = scalelight[LIGHTLEVELS - 1];
-            else
-                walllights = scalelight[lightnum];
-        }
-    }
-
-
-//
-// if a floor / ceiling plane is on the wrong side of the view plane
-// it is definately invisible and doesn't need to be marked
-//
-    if (frontsector->floorheight >= viewz)
-        markfloor = false;      // above view plane
-    if (frontsector->ceilingheight <= viewz
-        && frontsector->ceilingpic != skyflatnum)
-        markceiling = false;    // below view plane
-
-//
-// calculate incremental stepping values for texture edges
-//
-    worldtop >>= 4;
-    worldbottom >>= 4;
-
-    topstep = -FixedMul(rw_scalestep, worldtop);
-    topfrac = (centeryfrac >> 4) - FixedMul(worldtop, rw_scale);
-
-    bottomstep = -FixedMul(rw_scalestep, worldbottom);
-    bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
-
-    if (backsector)
-    {
-        worldhigh >>= 4;
-        worldlow >>= 4;
-
-        if (worldhigh < worldtop)
-        {
-            pixhigh = (centeryfrac >> 4) - FixedMul(worldhigh, rw_scale);
-            pixhighstep = -FixedMul(rw_scalestep, worldhigh);
-        }
-        if (worldlow > worldbottom)
-        {
-            pixlow = (centeryfrac >> 4) - FixedMul(worldlow, rw_scale);
-            pixlowstep = -FixedMul(rw_scalestep, worldlow);
-        }
-    }
-
-//
-// render it
-//
-    if (markceiling)
-        ceilingplane = R_CheckPlane(ceilingplane, rw_x, rw_stopx - 1);
-    if (markfloor)
-        floorplane = R_CheckPlane(floorplane, rw_x, rw_stopx - 1);
-
-    R_RenderSegLoop();
-
-//
-// save sprite clipping info
-//
-    if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
-    {
-        memcpy(lastopening, ceilingclip + start, 2 * (rw_stopx - start));
-        ds_p->sprtopclip = lastopening - start;
-        lastopening += rw_stopx - start;
-    }
-    if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
-        && !ds_p->sprbottomclip)
-    {
-        memcpy(lastopening, floorclip + start, 2 * (rw_stopx - start));
-        ds_p->sprbottomclip = lastopening - start;
-        lastopening += rw_stopx - start;
-    }
-    if (maskedtexture && !(ds_p->silhouette & SIL_TOP))
-    {
-        ds_p->silhouette |= SIL_TOP;
-        ds_p->tsilheight = INT_MIN;
-    }
-    if (maskedtexture && !(ds_p->silhouette & SIL_BOTTOM))
-    {
-        ds_p->silhouette |= SIL_BOTTOM;
-        ds_p->bsilheight = INT_MAX;
-    }
-    ds_p++;
-}
diff --git a/games/NXDoom/src/heretic/r_things.c b/games/NXDoom/src/heretic/r_things.c
deleted file mode 100644
index 88e35b9bc..000000000
--- a/games/NXDoom/src/heretic/r_things.c
+++ /dev/null
@@ -1,1017 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// R_things.c
-#include <stdio.h>
-#include <stdlib.h>
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "r_local.h"
-
-typedef struct
-{
-    int x1, x2;
-
-    int column;
-    int topclip;
-    int bottomclip;
-} maskdraw_t;
-
-/*
-
-Sprite rotation 0 is facing the viewer, rotation 1 is one angle turn CLOCKWISE around the axis.
-This is not the same as the angle, which increases counter clockwise
-(protractor).  There was a lot of stuff grabbed wrong, so I changed it...
-
-*/
-
-
-fixed_t pspritescale, pspriteiscale;
-
-lighttable_t **spritelights;
-
-// constant arrays used for psprite clipping and initializing clipping
-short negonearray[SCREENWIDTH];
-short screenheightarray[SCREENWIDTH];
-
-/*
-===============================================================================
-
-						INITIALIZATION FUNCTIONS
-
-===============================================================================
-*/
-
-// variables used to look up and range check thing_t sprites patches
-spritedef_t *sprites;
-int numsprites;
-
-spriteframe_t sprtemp[26];
-int maxframe;
-const char *spritename;
-
-
-
-/*
-=================
-=
-= R_InstallSpriteLump
-=
-= Local function for R_InitSprites
-=================
-*/
-
-void R_InstallSpriteLump(int lump, unsigned frame, unsigned rotation,
-                         boolean flipped)
-{
-    int r;
-
-    if (frame >= 26 || rotation > 8)
-        I_Error("R_InstallSpriteLump: Bad frame characters in lump %i", lump);
-
-    if ((int) frame > maxframe)
-        maxframe = frame;
-
-    if (rotation == 0)
-    {
-// the lump should be used for all rotations
-        if (sprtemp[frame].rotate == false)
-            I_Error("R_InitSprites: Sprite %s frame %c has multip rot=0 lump",
-                    spritename, 'A' + frame);
-        if (sprtemp[frame].rotate == true)
-            I_Error
-                ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
-                 spritename, 'A' + frame);
-
-        sprtemp[frame].rotate = false;
-        for (r = 0; r < 8; r++)
-        {
-            sprtemp[frame].lump[r] = lump - firstspritelump;
-            sprtemp[frame].flip[r] = (byte) flipped;
-        }
-        return;
-    }
-
-// the lump is only used for one rotation
-    if (sprtemp[frame].rotate == false)
-        I_Error
-            ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
-             spritename, 'A' + frame);
-
-    sprtemp[frame].rotate = true;
-
-    rotation--;                 // make 0 based
-    if (sprtemp[frame].lump[rotation] != -1)
-        I_Error
-            ("R_InitSprites: Sprite %s : %c : %c has two lumps mapped to it",
-             spritename, 'A' + frame, '1' + rotation);
-
-    sprtemp[frame].lump[rotation] = lump - firstspritelump;
-    sprtemp[frame].flip[rotation] = (byte) flipped;
-}
-
-/*
-=================
-=
-= R_InitSpriteDefs
-=
-= Pass a null terminated list of sprite names (4 chars exactly) to be used
-= Builds the sprite rotation matrixes to account for horizontally flipped
-= sprites.  Will report an error if the lumps are inconsistant
-=Only called at startup
-=
-= Sprite lump names are 4 characters for the actor, a letter for the frame,
-= and a number for the rotation, A sprite that is flippable will have an
-= additional letter/number appended.  The rotation character can be 0 to
-= signify no rotations
-=================
-*/
-
-void R_InitSpriteDefs(const char **namelist)
-{
-    const char **check;
-    int i, l, frame, rotation;
-    int start, end;
-
-// count the number of sprite names
-    check = namelist;
-    while (*check != NULL)
-        check++;
-    numsprites = check - namelist;
-
-    if (!numsprites)
-        return;
-
-    sprites = Z_Malloc(numsprites * sizeof(*sprites), PU_STATIC, NULL);
-
-    start = firstspritelump - 1;
-    end = lastspritelump + 1;
-
-// scan all the lump names for each of the names, noting the highest
-// frame letter
-// Just compare 4 characters as ints
-    for (i = 0; i < numsprites; i++)
-    {
-        spritename = DEH_String(namelist[i]);
-        memset(sprtemp, -1, sizeof(sprtemp));
-
-        maxframe = -1;
-
-        //
-        // scan the lumps, filling in the frames for whatever is found
-        //
-        for (l = start + 1; l < end; l++)
-            if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
-            {
-                frame = lumpinfo[l]->name[4] - 'A';
-                rotation = lumpinfo[l]->name[5] - '0';
-                R_InstallSpriteLump(l, frame, rotation, false);
-                if (lumpinfo[l]->name[6])
-                {
-                    frame = lumpinfo[l]->name[6] - 'A';
-                    rotation = lumpinfo[l]->name[7] - '0';
-                    R_InstallSpriteLump(l, frame, rotation, true);
-                }
-            }
-
-        //
-        // check the frames that were found for completeness
-        //
-        if (maxframe == -1)
-        {
-            //continue;
-            sprites[i].numframes = 0;
-            if (gamemode == shareware)
-                continue;
-            I_Error("R_InitSprites: No lumps found for sprite %s",
-                    spritename);
-        }
-
-        maxframe++;
-        for (frame = 0; frame < maxframe; frame++)
-        {
-            switch ((int) sprtemp[frame].rotate)
-            {
-                case -1:       // no rotations were found for that frame at all
-                    I_Error("R_InitSprites: No patches found for %s frame %c",
-                            spritename, frame + 'A');
-                case 0:        // only the first rotation is needed
-                    break;
-
-                case 1:        // must have all 8 frames
-                    for (rotation = 0; rotation < 8; rotation++)
-                        if (sprtemp[frame].lump[rotation] == -1)
-                            I_Error
-                                ("R_InitSprites: Sprite %s frame %c is missing rotations",
-                                 spritename, frame + 'A');
-            }
-        }
-
-        //
-        // allocate space for the frames present and copy sprtemp to it
-        //
-        sprites[i].numframes = maxframe;
-        sprites[i].spriteframes =
-            Z_Malloc(maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
-        memcpy(sprites[i].spriteframes, sprtemp,
-               maxframe * sizeof(spriteframe_t));
-    }
-
-}
-
-
-/*
-===============================================================================
-
-							GAME FUNCTIONS
-
-===============================================================================
-*/
-
-vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
-int newvissprite;
-
-
-/*
-===================
-=
-= R_InitSprites
-=
-= Called at program start
-===================
-*/
-
-void R_InitSprites(const char **namelist)
-{
-    int i;
-
-    for (i = 0; i < SCREENWIDTH; i++)
-    {
-        negonearray[i] = -1;
-    }
-
-    R_InitSpriteDefs(namelist);
-}
-
-
-/*
-===================
-=
-= R_ClearSprites
-=
-= Called at frame start
-===================
-*/
-
-void R_ClearSprites(void)
-{
-    vissprite_p = vissprites;
-}
-
-
-/*
-===================
-=
-= R_NewVisSprite
-=
-===================
-*/
-
-vissprite_t overflowsprite;
-
-vissprite_t *R_NewVisSprite(void)
-{
-    if (vissprite_p == &vissprites[MAXVISSPRITES])
-        return &overflowsprite;
-    vissprite_p++;
-    return vissprite_p - 1;
-}
-
-
-/*
-================
-=
-= R_DrawMaskedColumn
-=
-= Used for sprites and masked mid textures
-================
-*/
-
-short *mfloorclip;
-short *mceilingclip;
-fixed_t spryscale;
-fixed_t sprtopscreen;
-fixed_t sprbotscreen;
-
-void R_DrawMaskedColumn(column_t * column, signed int baseclip)
-{
-    int topscreen, bottomscreen;
-    fixed_t basetexturemid;
-
-    basetexturemid = dc_texturemid;
-
-    for (; column->topdelta != 0xff;)
-    {
-// calculate unclipped screen coordinates for post
-        topscreen = sprtopscreen + spryscale * column->topdelta;
-        bottomscreen = topscreen + spryscale * column->length;
-        dc_yl = (topscreen + FRACUNIT - 1) >> FRACBITS;
-        dc_yh = (bottomscreen - 1) >> FRACBITS;
-
-        if (dc_yh >= mfloorclip[dc_x])
-            dc_yh = mfloorclip[dc_x] - 1;
-        if (dc_yl <= mceilingclip[dc_x])
-            dc_yl = mceilingclip[dc_x] + 1;
-
-        if (dc_yh >= baseclip && baseclip != -1)
-            dc_yh = baseclip;
-
-        if (dc_yl <= dc_yh)
-        {
-            dc_source = (byte *) column + 3;
-            dc_texturemid = basetexturemid - (column->topdelta << FRACBITS);
-//                      dc_source = (byte *)column + 3 - column->topdelta;
-            colfunc();          // either R_DrawColumn or R_DrawTLColumn
-        }
-        column = (column_t *) ((byte *) column + column->length + 4);
-    }
-
-    dc_texturemid = basetexturemid;
-}
-
-
-/*
-================
-=
-= R_DrawVisSprite
-=
-= mfloorclip and mceilingclip should also be set
-================
-*/
-
-void R_DrawVisSprite(vissprite_t * vis, int x1, int x2)
-{
-    column_t *column;
-    int texturecolumn;
-    fixed_t frac;
-    patch_t *patch;
-    fixed_t baseclip;
-
-
-    patch = W_CacheLumpNum(vis->patch + firstspritelump, PU_CACHE);
-
-    dc_colormap = vis->colormap;
-
-//      if(!dc_colormap)
-//              colfunc = tlcolfunc;  // NULL colormap = shadow draw
-
-    if (vis->mobjflags & MF_SHADOW)
-    {
-        if (vis->mobjflags & MF_TRANSLATION)
-        {
-            colfunc = R_DrawTranslatedTLColumn;
-            dc_translation = translationtables - 256 +
-                ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
-        }
-        else
-        {                       // Draw using shadow column function
-            colfunc = tlcolfunc;
-        }
-    }
-    else if (vis->mobjflags & MF_TRANSLATION)
-    {
-        // Draw using translated column function
-        colfunc = R_DrawTranslatedColumn;
-        dc_translation = translationtables - 256 +
-            ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
-    }
-
-    dc_iscale = abs(vis->xiscale) >> detailshift;
-    dc_texturemid = vis->texturemid;
-    frac = vis->startfrac;
-    spryscale = vis->scale;
-
-    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-
-// check to see if weapon is a vissprite
-    if (vis->psprite)
-    {
-        dc_texturemid += FixedMul(((centery - viewheight / 2) << FRACBITS),
-                                  vis->xiscale);
-        sprtopscreen += (viewheight / 2 - centery) << FRACBITS;
-    }
-
-    if (vis->footclip && !vis->psprite)
-    {
-        sprbotscreen = sprtopscreen + FixedMul(SHORT(patch->height) << FRACBITS,
-                                               spryscale);
-        baseclip = (sprbotscreen - FixedMul(vis->footclip << FRACBITS,
-                                            spryscale)) >> FRACBITS;
-    }
-    else
-    {
-        baseclip = -1;
-    }
-
-    for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
-    {
-        texturecolumn = frac >> FRACBITS;
-#ifdef RANGECHECK
-        if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
-            I_Error("R_DrawSpriteRange: bad texturecolumn");
-#endif
-        column = (column_t *) ((byte *) patch +
-                               LONG(patch->columnofs[texturecolumn]));
-        R_DrawMaskedColumn(column, baseclip);
-    }
-
-    colfunc = basecolfunc;
-}
-
-
-
-/*
-===================
-=
-= R_ProjectSprite
-=
-= Generates a vissprite for a thing if it might be visible
-=
-===================
-*/
-
-void R_ProjectSprite(mobj_t * thing)
-{
-    fixed_t trx, try;
-    fixed_t gxt, gyt;
-    fixed_t tx, tz;
-    fixed_t xscale;
-    int x1, x2;
-    spritedef_t *sprdef;
-    spriteframe_t *sprframe;
-    int lump;
-    unsigned rot;
-    boolean flip;
-    int index;
-    vissprite_t *vis;
-    angle_t ang;
-    fixed_t iscale;
-
-    if (thing->flags2 & MF2_DONTDRAW)
-    {                           // Never make a vissprite when MF2_DONTDRAW is flagged.
-        return;
-    }
-
-//
-// transform the origin point
-//
-    trx = thing->x - viewx;
-    try = thing->y - viewy;
-
-    gxt = FixedMul(trx, viewcos);
-    gyt = -FixedMul(try, viewsin);
-    tz = gxt - gyt;
-
-    if (tz < MINZ)
-        return;                 // thing is behind view plane
-    xscale = FixedDiv(projection, tz);
-
-    gxt = -FixedMul(trx, viewsin);
-    gyt = FixedMul(try, viewcos);
-    tx = -(gyt + gxt);
-
-    if (abs(tx) > (tz << 2))
-        return;                 // too far off the side
-
-//
-// decide which patch to use for sprite reletive to player
-//
-#ifdef RANGECHECK
-    if ((unsigned) thing->sprite >= numsprites)
-        I_Error("R_ProjectSprite: invalid sprite number %i ", thing->sprite);
-#endif
-    sprdef = &sprites[thing->sprite];
-#ifdef RANGECHECK
-    if ((thing->frame & FF_FRAMEMASK) >= sprdef->numframes)
-        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
-                thing->sprite, thing->frame);
-#endif
-    sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
-
-    if (sprframe->rotate)
-    {                           // choose a different rotation based on player view
-        ang = R_PointToAngle(thing->x, thing->y);
-        rot = (ang - thing->angle + (unsigned) (ANG45 / 2) * 9) >> 29;
-        lump = sprframe->lump[rot];
-        flip = (boolean) sprframe->flip[rot];
-    }
-    else
-    {                           // use single rotation for all views
-        lump = sprframe->lump[0];
-        flip = (boolean) sprframe->flip[0];
-    }
-
-//
-// calculate edges of the shape
-//
-    tx -= spriteoffset[lump];
-    x1 = (centerxfrac + FixedMul(tx, xscale)) >> FRACBITS;
-    if (x1 > viewwidth)
-        return;                 // off the right side
-    tx += spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul(tx, xscale)) >> FRACBITS) - 1;
-    if (x2 < 0)
-        return;                 // off the left side
-
-
-//
-// store information in a vissprite
-//
-    vis = R_NewVisSprite();
-    vis->mobjflags = thing->flags;
-    vis->psprite = false;
-    vis->scale = xscale << detailshift;
-    vis->gx = thing->x;
-    vis->gy = thing->y;
-    vis->gz = thing->z;
-    vis->gzt = thing->z + spritetopoffset[lump];
-
-    // foot clipping
-    if (thing->flags2 & MF2_FEETARECLIPPED
-        && thing->z <= thing->subsector->sector->floorheight)
-    {
-        vis->footclip = 10;
-    }
-    else
-        vis->footclip = 0;
-    vis->texturemid = vis->gzt - viewz - (vis->footclip << FRACBITS);
-
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
-    iscale = FixedDiv(FRACUNIT, xscale);
-    if (flip)
-    {
-        vis->startfrac = spritewidth[lump] - 1;
-        vis->xiscale = -iscale;
-    }
-    else
-    {
-        vis->startfrac = 0;
-        vis->xiscale = iscale;
-    }
-    if (vis->x1 > x1)
-        vis->startfrac += vis->xiscale * (vis->x1 - x1);
-    vis->patch = lump;
-//
-// get light level
-//
-
-//      if (thing->flags & MF_SHADOW)
-//              vis->colormap = NULL;                   // shadow draw
-//      else ...
-
-    if (fixedcolormap)
-        vis->colormap = fixedcolormap;  // fixed map
-    else if (thing->frame & FF_FULLBRIGHT)
-        vis->colormap = colormaps;      // full bright
-    else
-    {                           // diminished light
-        index = xscale >> (LIGHTSCALESHIFT - detailshift);
-        if (index >= MAXLIGHTSCALE)
-            index = MAXLIGHTSCALE - 1;
-        vis->colormap = spritelights[index];
-    }
-}
-
-
-
-
-/*
-========================
-=
-= R_AddSprites
-=
-========================
-*/
-
-void R_AddSprites(sector_t * sec)
-{
-    mobj_t *thing;
-    int lightnum;
-
-    if (sec->validcount == validcount)
-        return;                 // already added
-
-    sec->validcount = validcount;
-
-    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT) + extralight;
-    if (lightnum < 0)
-        spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-        spritelights = scalelight[LIGHTLEVELS - 1];
-    else
-        spritelights = scalelight[lightnum];
-
-
-    for (thing = sec->thinglist; thing; thing = thing->snext)
-        R_ProjectSprite(thing);
-}
-
-
-/*
-========================
-=
-= R_DrawPSprite
-=
-========================
-*/
-
-int PSpriteSY[NUMWEAPONS] = {
-    0,                          // staff
-    5 * FRACUNIT,               // goldwand
-    15 * FRACUNIT,              // crossbow
-    15 * FRACUNIT,              // blaster
-    15 * FRACUNIT,              // skullrod
-    15 * FRACUNIT,              // phoenix rod
-    15 * FRACUNIT,              // mace
-    15 * FRACUNIT,              // gauntlets
-    15 * FRACUNIT               // beak
-};
-
-void R_DrawPSprite(pspdef_t * psp)
-{
-    fixed_t tx;
-    int x1, x2;
-    spritedef_t *sprdef;
-    spriteframe_t *sprframe;
-    int lump;
-    boolean flip;
-    vissprite_t *vis, avis;
-
-    int tempangle;
-
-//
-// decide which patch to use
-//
-#ifdef RANGECHECK
-    if ((unsigned) psp->state->sprite >= numsprites)
-        I_Error("R_ProjectSprite: invalid sprite number %i ",
-                psp->state->sprite);
-#endif
-    sprdef = &sprites[psp->state->sprite];
-#ifdef RANGECHECK
-    if ((psp->state->frame & FF_FRAMEMASK) >= sprdef->numframes)
-        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
-                psp->state->sprite, psp->state->frame);
-#endif
-    sprframe = &sprdef->spriteframes[psp->state->frame & FF_FRAMEMASK];
-
-    lump = sprframe->lump[0];
-    flip = (boolean) sprframe->flip[0];
-
-//
-// calculate edges of the shape
-//
-    tx = psp->sx - 160 * FRACUNIT;
-
-    tx -= spriteoffset[lump];
-    if (viewangleoffset)
-    {
-        tempangle =
-            ((centerxfrac / 1024) * (viewangleoffset >> ANGLETOFINESHIFT));
-    }
-    else
-    {
-        tempangle = 0;
-    }
-    x1 = (centerxfrac + FixedMul(tx, pspritescale) + tempangle) >> FRACBITS;
-    if (x1 > viewwidth)
-        return;                 // off the right side
-    tx += spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul(tx, pspritescale) +
-           tempangle) >> FRACBITS) - 1;
-    if (x2 < 0)
-        return;                 // off the left side
-
-//
-// store information in a vissprite
-//
-    vis = &avis;
-    vis->mobjflags = 0;
-    vis->psprite = true;
-    vis->footclip = 0;
-    vis->texturemid =
-        (BASEYCENTER << FRACBITS) + FRACUNIT / 2 - (psp->sy -
-                                                    spritetopoffset[lump]);
-    if (viewheight == SCREENHEIGHT)
-    {
-        vis->texturemid -= PSpriteSY[players[consoleplayer].readyweapon];
-    }
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
-    vis->scale = pspritescale << detailshift;
-    if (flip)
-    {
-        vis->xiscale = -pspriteiscale;
-        vis->startfrac = spritewidth[lump] - 1;
-    }
-    else
-    {
-        vis->xiscale = pspriteiscale;
-        vis->startfrac = 0;
-    }
-    if (vis->x1 > x1)
-        vis->startfrac += vis->xiscale * (vis->x1 - x1);
-    vis->patch = lump;
-
-    if (viewplayer->powers[pw_invisibility] > 4 * 32 ||
-        viewplayer->powers[pw_invisibility] & 8)
-    {
-        // Invisibility
-        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
-        vis->mobjflags |= MF_SHADOW;
-    }
-    else if (fixedcolormap)
-    {
-        // Fixed color
-        vis->colormap = fixedcolormap;
-    }
-    else if (psp->state->frame & FF_FULLBRIGHT)
-    {
-        // Full bright
-        vis->colormap = colormaps;
-    }
-    else
-    {
-        // local light
-        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
-    }
-    R_DrawVisSprite(vis, vis->x1, vis->x2);
-}
-
-/*
-========================
-=
-= R_DrawPlayerSprites
-=
-========================
-*/
-
-void R_DrawPlayerSprites(void)
-{
-    int i, lightnum;
-    pspdef_t *psp;
-
-//
-// get light level
-//
-    lightnum =
-        (viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) +
-        extralight;
-    if (lightnum < 0)
-        spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-        spritelights = scalelight[LIGHTLEVELS - 1];
-    else
-        spritelights = scalelight[lightnum];
-//
-// clip to screen bounds
-//
-    mfloorclip = screenheightarray;
-    mceilingclip = negonearray;
-
-//
-// add all active psprites
-//
-    for (i = 0, psp = viewplayer->psprites; i < NUMPSPRITES; i++, psp++)
-        if (psp->state)
-            R_DrawPSprite(psp);
-
-}
-
-
-/*
-========================
-=
-= R_SortVisSprites
-=
-========================
-*/
-
-vissprite_t vsprsortedhead;
-
-void R_SortVisSprites(void)
-{
-    int i, count;
-    vissprite_t *ds, *best;
-    static vissprite_t unsorted;
-    fixed_t bestscale;
-
-    count = vissprite_p - vissprites;
-
-    unsorted.next = unsorted.prev = &unsorted;
-    if (!count)
-        return;
-
-    for (ds = vissprites; ds < vissprite_p; ds++)
-    {
-        ds->next = ds + 1;
-        ds->prev = ds - 1;
-    }
-    vissprites[0].prev = &unsorted;
-    unsorted.next = &vissprites[0];
-    (vissprite_p - 1)->next = &unsorted;
-    unsorted.prev = vissprite_p - 1;
-
-//
-// pull the vissprites out by scale
-//
-    best = 0;                   // shut up the compiler warning
-    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
-    for (i = 0; i < count; i++)
-    {
-        bestscale = INT_MAX;
-        for (ds = unsorted.next; ds != &unsorted; ds = ds->next)
-        {
-            if (ds->scale < bestscale)
-            {
-                bestscale = ds->scale;
-                best = ds;
-            }
-        }
-        best->next->prev = best->prev;
-        best->prev->next = best->next;
-        best->next = &vsprsortedhead;
-        best->prev = vsprsortedhead.prev;
-        vsprsortedhead.prev->next = best;
-        vsprsortedhead.prev = best;
-    }
-}
-
-
-
-/*
-========================
-=
-= R_DrawSprite
-=
-========================
-*/
-
-void R_DrawSprite(vissprite_t * spr)
-{
-    drawseg_t *ds;
-    short clipbot[SCREENWIDTH], cliptop[SCREENWIDTH];
-    int x, r1, r2;
-    fixed_t scale, lowscale;
-    int silhouette;
-
-    for (x = spr->x1; x <= spr->x2; x++)
-        clipbot[x] = cliptop[x] = -2;
-
-//
-// scan drawsegs from end to start for obscuring segs
-// the first drawseg that has a greater scale is the clip seg
-//
-    for (ds = ds_p - 1; ds >= drawsegs; ds--)
-    {
-        //
-        // determine if the drawseg obscures the sprite
-        //
-        if (ds->x1 > spr->x2 || ds->x2 < spr->x1 ||
-            (!ds->silhouette && !ds->maskedtexturecol))
-            continue;           // doesn't cover sprite
-
-        r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
-        r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
-        if (ds->scale1 > ds->scale2)
-        {
-            lowscale = ds->scale2;
-            scale = ds->scale1;
-        }
-        else
-        {
-            lowscale = ds->scale1;
-            scale = ds->scale2;
-        }
-
-        if (scale < spr->scale || (lowscale < spr->scale
-                                   && !R_PointOnSegSide(spr->gx, spr->gy,
-                                                        ds->curline)))
-        {
-            if (ds->maskedtexturecol)   // masked mid texture
-                R_RenderMaskedSegRange(ds, r1, r2);
-            continue;           // seg is behind sprite
-        }
-
-//
-// clip this piece of the sprite
-//
-        silhouette = ds->silhouette;
-        if (spr->gz >= ds->bsilheight)
-            silhouette &= ~SIL_BOTTOM;
-        if (spr->gzt <= ds->tsilheight)
-            silhouette &= ~SIL_TOP;
-
-        if (silhouette == 1)
-        {                       // bottom sil
-            for (x = r1; x <= r2; x++)
-                if (clipbot[x] == -2)
-                    clipbot[x] = ds->sprbottomclip[x];
-        }
-        else if (silhouette == 2)
-        {                       // top sil
-            for (x = r1; x <= r2; x++)
-                if (cliptop[x] == -2)
-                    cliptop[x] = ds->sprtopclip[x];
-        }
-        else if (silhouette == 3)
-        {                       // both
-            for (x = r1; x <= r2; x++)
-            {
-                if (clipbot[x] == -2)
-                    clipbot[x] = ds->sprbottomclip[x];
-                if (cliptop[x] == -2)
-                    cliptop[x] = ds->sprtopclip[x];
-            }
-        }
-
-    }
-
-//
-// all clipping has been performed, so draw the sprite
-//
-
-// check for unclipped columns
-    for (x = spr->x1; x <= spr->x2; x++)
-    {
-        if (clipbot[x] == -2)
-            clipbot[x] = viewheight;
-        if (cliptop[x] == -2)
-            cliptop[x] = -1;
-    }
-
-    mfloorclip = clipbot;
-    mceilingclip = cliptop;
-    R_DrawVisSprite(spr, spr->x1, spr->x2);
-}
-
-
-/*
-========================
-=
-= R_DrawMasked
-=
-========================
-*/
-
-void R_DrawMasked(void)
-{
-    vissprite_t *spr;
-    drawseg_t *ds;
-
-    R_SortVisSprites();
-
-    if (vissprite_p > vissprites)
-    {
-        // draw all vissprites back to front
-
-        for (spr = vsprsortedhead.next; spr != &vsprsortedhead;
-             spr = spr->next)
-            R_DrawSprite(spr);
-    }
-
-//
-// render any remaining masked mid textures
-//
-    for (ds = ds_p - 1; ds >= drawsegs; ds--)
-        if (ds->maskedtexturecol)
-            R_RenderMaskedSegRange(ds, ds->x1, ds->x2);
-
-//
-// draw the psprites on top of everything
-//
-// Added for the sideviewing with an external device
-    if (viewangleoffset <= 1024 << ANGLETOFINESHIFT || viewangleoffset >=
-        -(1024 << ANGLETOFINESHIFT))
-    {                           // don't draw on side views
-        R_DrawPlayerSprites();
-    }
-
-//      if (!viewangleoffset)           // don't draw on side views
-//              R_DrawPlayerSprites ();
-}
diff --git a/games/NXDoom/src/heretic/s_sound.c b/games/NXDoom/src/heretic/s_sound.c
deleted file mode 100644
index 829278918..000000000
--- a/games/NXDoom/src/heretic/s_sound.c
+++ /dev/null
@@ -1,607 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "i_system.h"
-#include "m_random.h"
-#include "sounds.h"
-#include "s_sound.h"
-#include "i_sound.h"
-#include "r_local.h"
-#include "p_local.h"
-
-#include "sounds.h"
-
-#include "w_wad.h"
-#include "z_zone.h"
-
-/*
-===============================================================================
-
-		MUSIC & SFX API
-
-===============================================================================
-*/
-
-void S_ShutDown(void);
-boolean S_StopSoundID(int sound_id, int priority);
-
-static channel_t channel[MAX_CHANNELS];
-
-static void *rs;          // Handle for the registered song
-int mus_song = -1;
-int mus_lumpnum;
-void *mus_sndptr;
-byte *soundCurve;
-
-int snd_MaxVolume = 10;
-int snd_MusicVolume = 10;
-int snd_Channels = 16;
-
-int AmbChan;
-
-void S_Start(void)
-{
-    int i;
-
-    S_StartSong((gameepisode - 1) * 9 + gamemap - 1, true);
-
-    //stop all sounds
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (channel[i].handle)
-        {
-            S_StopSound(channel[i].mo);
-        }
-    }
-    memset(channel, 0, 8 * sizeof(channel_t));
-}
-
-void S_StartSong(int song, boolean loop)
-{
-    int mus_len;
-
-    if (song == mus_song)
-    {                           // don't replay an old song
-        return;
-    }
-
-    if (rs != NULL)
-    {
-        I_StopSong();
-        I_UnRegisterSong(rs);
-    }
-
-    if (song < mus_e1m1 || song > NUMMUSIC)
-    {
-        return;
-    }
-    mus_lumpnum = W_GetNumForName(S_music[song].name);
-    mus_sndptr = W_CacheLumpNum(mus_lumpnum, PU_MUSIC);
-    mus_len = W_LumpLength(mus_lumpnum);
-    rs = I_RegisterSong(mus_sndptr, mus_len);
-    I_PlaySong(rs, loop);       //'true' denotes endless looping.
-    mus_song = song;
-}
-
-static mobj_t *GetSoundListener(void)
-{
-    static degenmobj_t dummy_listener;
-
-    // If we are at the title screen, the console player doesn't have an
-    // object yet, so return a pointer to a static dummy listener instead.
-
-    if (players[consoleplayer].mo != NULL)
-    {
-        return players[consoleplayer].mo;
-    }
-    else
-    {
-        dummy_listener.x = 0;
-        dummy_listener.y = 0;
-        dummy_listener.z = 0;
-
-        return (mobj_t *) &dummy_listener;
-    }
-}
-
-void S_StartSound(void *_origin, int sound_id)
-{
-    mobj_t *origin = _origin;
-    mobj_t *listener;
-    int dist, vol;
-    int i;
-    int priority;
-    int sep;
-    int angle;
-    int absx;
-    int absy;
-
-    static int sndcount = 0;
-    int chan;
-
-    listener = GetSoundListener();
-
-    if (sound_id == 0 || snd_MaxVolume == 0)
-        return;
-    if (origin == NULL)
-    {
-        origin = listener;
-    }
-
-// calculate the distance before other stuff so that we can throw out
-// sounds that are beyond the hearing range.
-    absx = abs(origin->x - listener->x);
-    absy = abs(origin->y - listener->y);
-    dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
-    dist >>= FRACBITS;
-//  dist = P_AproxDistance(origin->x-viewx, origin->y-viewy)>>FRACBITS;
-
-    if (dist >= MAX_SND_DIST)
-    {
-//      dist = MAX_SND_DIST - 1;
-        return;                 //sound is beyond the hearing range...
-    }
-    if (dist < 0)
-    {
-        dist = 0;
-    }
-    priority = S_sfx[sound_id].priority;
-    priority *= (10 - (dist / 160));
-    if (!S_StopSoundID(sound_id, priority))
-    {
-        return;                 // other sounds have greater priority
-    }
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (origin->player)
-        {
-            i = snd_Channels;
-            break;              // let the player have more than one sound.
-        }
-        if (origin == channel[i].mo)
-        {                       // only allow other mobjs one sound
-            S_StopSound(channel[i].mo);
-            break;
-        }
-    }
-    if (i >= snd_Channels)
-    {
-        if (sound_id >= sfx_wind)
-        {
-            if (AmbChan != -1 && S_sfx[sound_id].priority <=
-                S_sfx[channel[AmbChan].sound_id].priority)
-            {
-                return;         //ambient channel already in use
-            }
-            else
-            {
-                AmbChan = -1;
-            }
-        }
-        for (i = 0; i < snd_Channels; i++)
-        {
-            if (channel[i].mo == NULL)
-            {
-                break;
-            }
-        }
-        if (i >= snd_Channels)
-        {
-            //look for a lower priority sound to replace.
-            sndcount++;
-            if (sndcount >= snd_Channels)
-            {
-                sndcount = 0;
-            }
-            for (chan = 0; chan < snd_Channels; chan++)
-            {
-                i = (sndcount + chan) % snd_Channels;
-                if (priority >= channel[i].priority)
-                {
-                    chan = -1;  //denote that sound should be replaced.
-                    break;
-                }
-            }
-            if (chan != -1)
-            {
-                return;         //no free channels.
-            }
-            else                //replace the lower priority sound.
-            {
-                if (channel[i].handle)
-                {
-                    if (I_SoundIsPlaying(channel[i].handle))
-                    {
-                        I_StopSound(channel[i].handle);
-                    }
-                    if (S_sfx[channel[i].sound_id].usefulness > 0)
-                    {
-                        S_sfx[channel[i].sound_id].usefulness--;
-                    }
-
-                    if (AmbChan == i)
-                    {
-                        AmbChan = -1;
-                    }
-                }
-            }
-        }
-    }
-    if (S_sfx[sound_id].lumpnum == 0)
-    {
-        S_sfx[sound_id].lumpnum = I_GetSfxLumpNum(&S_sfx[sound_id]);
-    }
-
-    // calculate the volume based upon the distance from the sound origin.
-//      vol = (snd_MaxVolume*16 + dist*(-snd_MaxVolume*16)/MAX_SND_DIST)>>9;
-    vol = soundCurve[dist];
-
-    if (origin == listener)
-    {
-        sep = 128;
-    }
-    else
-    {
-        angle = R_PointToAngle2(listener->x, listener->y,
-                                origin->x, origin->y);
-        angle = (angle - viewangle) >> 24;
-        sep = angle * 2 - 128;
-        if (sep < 64)
-            sep = -sep;
-        if (sep > 192)
-            sep = 512 - sep;
-    }
-
-    channel[i].pitch = (byte) (NORM_PITCH + (M_Random() & 7) - (M_Random() & 7));
-    channel[i].handle = I_StartSound(&S_sfx[sound_id], i, vol, sep, channel[i].pitch);
-    channel[i].mo = origin;
-    channel[i].sound_id = sound_id;
-    channel[i].priority = priority;
-    if (sound_id >= sfx_wind)
-    {
-        AmbChan = i;
-    }
-    if (S_sfx[sound_id].usefulness == -1)
-    {
-        S_sfx[sound_id].usefulness = 1;
-    }
-    else
-    {
-        S_sfx[sound_id].usefulness++;
-    }
-}
-
-void S_StartSoundAtVolume(void *_origin, int sound_id, int volume)
-{
-    mobj_t *origin = _origin;
-    mobj_t *listener;
-    int i;
-
-    listener = GetSoundListener();
-
-    if (sound_id == 0 || snd_MaxVolume == 0)
-        return;
-    if (origin == NULL)
-    {
-        origin = listener;
-    }
-
-    if (volume == 0)
-    {
-        return;
-    }
-    volume = (volume * (snd_MaxVolume + 1) * 8) >> 7;
-
-// no priority checking, as ambient sounds would be the LOWEST.
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (channel[i].mo == NULL)
-        {
-            break;
-        }
-    }
-    if (i >= snd_Channels)
-    {
-        return;
-    }
-    if (S_sfx[sound_id].lumpnum == 0)
-    {
-        S_sfx[sound_id].lumpnum = I_GetSfxLumpNum(&S_sfx[sound_id]);
-    }
-
-    channel[i].pitch = (byte) (NORM_PITCH - (M_Random() & 3) + (M_Random() & 3));
-    channel[i].handle = I_StartSound(&S_sfx[sound_id], i, volume, 128, channel[i].pitch);
-    channel[i].mo = origin;
-    channel[i].sound_id = sound_id;
-    channel[i].priority = 1;    //super low priority.
-    if (S_sfx[sound_id].usefulness == -1)
-    {
-        S_sfx[sound_id].usefulness = 1;
-    }
-    else
-    {
-        S_sfx[sound_id].usefulness++;
-    }
-}
-
-boolean S_StopSoundID(int sound_id, int priority)
-{
-    int i;
-    int lp;                     //least priority
-    int found;
-
-    if (S_sfx[sound_id].numchannels == -1)
-    {
-        return (true);
-    }
-    lp = -1;                    //denote the argument sound_id
-    found = 0;
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (channel[i].sound_id == sound_id && channel[i].mo)
-        {
-            found++;            //found one.  Now, should we replace it??
-            if (priority >= channel[i].priority)
-            {                   // if we're gonna kill one, then this'll be it
-                lp = i;
-                priority = channel[i].priority;
-            }
-        }
-    }
-    if (found < S_sfx[sound_id].numchannels)
-    {
-        return (true);
-    }
-    else if (lp == -1)
-    {
-        return (false);         // don't replace any sounds
-    }
-    if (channel[lp].handle)
-    {
-        if (I_SoundIsPlaying(channel[lp].handle))
-        {
-            I_StopSound(channel[lp].handle);
-        }
-        if (S_sfx[channel[i].sound_id].usefulness > 0)
-        {
-            S_sfx[channel[i].sound_id].usefulness--;
-        }
-        channel[lp].mo = NULL;
-    }
-    return (true);
-}
-
-void S_StopSound(void *_origin)
-{
-    mobj_t *origin = _origin;
-    int i;
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (channel[i].mo == origin)
-        {
-            I_StopSound(channel[i].handle);
-            if (S_sfx[channel[i].sound_id].usefulness > 0)
-            {
-                S_sfx[channel[i].sound_id].usefulness--;
-            }
-            channel[i].handle = 0;
-            channel[i].mo = NULL;
-            if (AmbChan == i)
-            {
-                AmbChan = -1;
-            }
-        }
-    }
-}
-
-void S_SoundLink(mobj_t * oldactor, mobj_t * newactor)
-{
-    int i;
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (channel[i].mo == oldactor)
-            channel[i].mo = newactor;
-    }
-}
-
-void S_PauseSound(void)
-{
-    I_PauseSong();
-}
-
-void S_ResumeSound(void)
-{
-    I_ResumeSong();
-}
-
-void S_UpdateSounds(mobj_t * listener)
-{
-    int i, dist, vol;
-    int angle;
-    int sep;
-    int priority;
-    int absx;
-    int absy;
-
-    I_UpdateSound();
-
-    listener = GetSoundListener();
-    if (snd_MaxVolume == 0)
-    {
-        return;
-    }
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (!channel[i].handle || S_sfx[channel[i].sound_id].usefulness == -1)
-        {
-            continue;
-        }
-        if (!I_SoundIsPlaying(channel[i].handle))
-        {
-            if (S_sfx[channel[i].sound_id].usefulness > 0)
-            {
-                S_sfx[channel[i].sound_id].usefulness--;
-            }
-            channel[i].handle = 0;
-            channel[i].mo = NULL;
-            channel[i].sound_id = 0;
-            if (AmbChan == i)
-            {
-                AmbChan = -1;
-            }
-        }
-        if (channel[i].mo == NULL || channel[i].sound_id == 0
-         || channel[i].mo == listener || listener == NULL)
-        {
-            continue;
-        }
-        else
-        {
-            absx = abs(channel[i].mo->x - listener->x);
-            absy = abs(channel[i].mo->y - listener->y);
-            dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
-            dist >>= FRACBITS;
-//          dist = P_AproxDistance(channel[i].mo->x-listener->x, channel[i].mo->y-listener->y)>>FRACBITS;
-
-            if (dist >= MAX_SND_DIST)
-            {
-                S_StopSound(channel[i].mo);
-                continue;
-            }
-            if (dist < 0)
-                dist = 0;
-
-// calculate the volume based upon the distance from the sound origin.
-//          vol = (*((byte *)W_CacheLumpName("SNDCURVE", PU_CACHE)+dist)*(snd_MaxVolume*8))>>7;
-            vol = soundCurve[dist];
-
-            angle = R_PointToAngle2(listener->x, listener->y,
-                                    channel[i].mo->x, channel[i].mo->y);
-            angle = (angle - viewangle) >> 24;
-            sep = angle * 2 - 128;
-            if (sep < 64)
-                sep = -sep;
-            if (sep > 192)
-                sep = 512 - sep;
-            // TODO: Pitch shifting.
-            I_UpdateSoundParams(channel[i].handle, vol, sep);
-            priority = S_sfx[channel[i].sound_id].priority;
-            priority *= (10 - (dist >> 8));
-            channel[i].priority = priority;
-        }
-    }
-}
-
-void S_Init(void)
-{
-    I_SetOPLDriverVer(opl_doom2_1_666);
-    soundCurve = Z_Malloc(MAX_SND_DIST, PU_STATIC, NULL);
-    if (snd_Channels > 8)
-    {
-        snd_Channels = 8;
-    }
-    I_SetMusicVolume(snd_MusicVolume * 8);
-    S_SetMaxVolume(true);
-
-    I_AtExit(S_ShutDown, true);
-
-    // Heretic defaults to pitch-shifting on
-    if (snd_pitchshift == -1)
-    {
-        snd_pitchshift = 1;
-    }
-
-    I_PrecacheSounds(S_sfx, NUMSFX);
-}
-
-void S_GetChannelInfo(SoundInfo_t * s)
-{
-    int i;
-    ChanInfo_t *c;
-
-    s->channelCount = snd_Channels;
-    s->musicVolume = snd_MusicVolume;
-    s->soundVolume = snd_MaxVolume;
-    for (i = 0; i < snd_Channels; i++)
-    {
-        c = &s->chan[i];
-        c->id = channel[i].sound_id;
-        c->priority = channel[i].priority;
-        c->name = S_sfx[c->id].name;
-        c->mo = channel[i].mo;
-
-        if (c->mo != NULL)
-        {
-            c->distance = P_AproxDistance(c->mo->x - viewx, c->mo->y - viewy)
-                >> FRACBITS;
-        }
-        else
-        {
-            c->distance = 0;
-        }
-    }
-}
-
-void S_SetMaxVolume(boolean fullprocess)
-{
-    int i;
-
-    if (!fullprocess)
-    {
-        soundCurve[0] =
-            (*((byte *) W_CacheLumpName("SNDCURVE", PU_CACHE)) *
-             (snd_MaxVolume * 8)) >> 7;
-    }
-    else
-    {
-        for (i = 0; i < MAX_SND_DIST; i++)
-        {
-            soundCurve[i] =
-                (*((byte *) W_CacheLumpName("SNDCURVE", PU_CACHE) + i) *
-                 (snd_MaxVolume * 8)) >> 7;
-        }
-    }
-}
-
-static boolean musicPaused;
-void S_SetMusicVolume(void)
-{
-    I_SetMusicVolume(snd_MusicVolume * 8);
-    if (snd_MusicVolume == 0)
-    {
-        I_PauseSong();
-        musicPaused = true;
-    }
-    else if (musicPaused)
-    {
-        musicPaused = false;
-        I_ResumeSong();
-    }
-}
-
-void S_ShutDown(void)
-{
-    I_StopSong();
-    I_UnRegisterSong(rs);
-    I_ShutdownSound();
-}
-
diff --git a/games/NXDoom/src/heretic/s_sound.h b/games/NXDoom/src/heretic/s_sound.h
deleted file mode 100644
index 796be73ee..000000000
--- a/games/NXDoom/src/heretic/s_sound.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// soundst.h
-
-#ifndef __SOUNDSTH__
-#define __SOUNDSTH__
-
-extern int snd_MaxVolume;
-extern int snd_MusicVolume;
-extern int snd_Channels;
-
-
-void S_Start(void);
-void S_StartSound(void *origin, int sound_id);
-void S_StartSoundAtVolume(void *origin, int sound_id, int volume);
-void S_StopSound(void *origin);
-void S_PauseSound(void);
-void S_ResumeSound(void);
-void S_UpdateSounds(mobj_t * listener);
-void S_StartSong(int song, boolean loop);
-void S_Init(void);
-void S_GetChannelInfo(SoundInfo_t * s);
-void S_SetMaxVolume(boolean fullprocess);
-void S_SetMusicVolume(void);
-
-#endif
diff --git a/games/NXDoom/src/heretic/sb_bar.c b/games/NXDoom/src/heretic/sb_bar.c
deleted file mode 100644
index bcc5d765a..000000000
--- a/games/NXDoom/src/heretic/sb_bar.c
+++ /dev/null
@@ -1,1283 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// SB_bar.c
-
-#include "doomdef.h"
-#include "deh_str.h"
-#include "i_video.h"
-#include "i_swap.h"
-#include "m_cheat.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-#include "am_map.h"
-
-// Types
-
-typedef struct Cheat_s
-{
-    void (*func) (player_t * player, struct Cheat_s * cheat);
-    cheatseq_t *seq;
-} Cheat_t;
-
-// Private Functions
-
-static void DrawSoundInfo(void);
-static void ShadeLine(int x, int y, int height, int shade);
-static void ShadeChain(void);
-static void DrINumber(signed int val, int x, int y);
-static void DrBNumber(signed int val, int x, int y);
-static void DrawCommonBar(void);
-static void DrawMainBar(void);
-static void DrawInventoryBar(void);
-static void DrawFullScreenStuff(void);
-static boolean HandleCheats(byte key);
-static void CheatGodFunc(player_t * player, Cheat_t * cheat);
-static void CheatNoClipFunc(player_t * player, Cheat_t * cheat);
-static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat);
-static void CheatPowerFunc(player_t * player, Cheat_t * cheat);
-static void CheatHealthFunc(player_t * player, Cheat_t * cheat);
-static void CheatKeysFunc(player_t * player, Cheat_t * cheat);
-static void CheatSoundFunc(player_t * player, Cheat_t * cheat);
-static void CheatTickerFunc(player_t * player, Cheat_t * cheat);
-static void CheatArtifact1Func(player_t * player, Cheat_t * cheat);
-static void CheatArtifact2Func(player_t * player, Cheat_t * cheat);
-static void CheatArtifact3Func(player_t * player, Cheat_t * cheat);
-static void CheatWarpFunc(player_t * player, Cheat_t * cheat);
-static void CheatChickenFunc(player_t * player, Cheat_t * cheat);
-static void CheatMassacreFunc(player_t * player, Cheat_t * cheat);
-static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat);
-static void CheatIDDQDFunc(player_t * player, Cheat_t * cheat);
-
-// Public Data
-
-boolean DebugSound;             // debug flag for displaying sound info
-
-boolean inventory;
-int curpos;
-int inv_ptr;
-int ArtifactFlash;
-
-static int DisplayTicker = 0;
-
-// Private Data
-
-static int HealthMarker;
-static int ChainWiggle;
-static player_t *CPlayer;
-int playpalette;
-
-patch_t *PatchLTFACE;
-patch_t *PatchRTFACE;
-patch_t *PatchBARBACK;
-patch_t *PatchCHAIN;
-patch_t *PatchSTATBAR;
-patch_t *PatchLIFEGEM;
-//patch_t *PatchEMPWEAP;
-//patch_t *PatchLIL4BOX;
-patch_t *PatchLTFCTOP;
-patch_t *PatchRTFCTOP;
-//patch_t *PatchARMORBOX;
-//patch_t *PatchARTIBOX;
-patch_t *PatchSELECTBOX;
-//patch_t *PatchKILLSPIC;
-//patch_t *PatchMANAPIC;
-//patch_t *PatchPOWERICN;
-patch_t *PatchINVLFGEM1;
-patch_t *PatchINVLFGEM2;
-patch_t *PatchINVRTGEM1;
-patch_t *PatchINVRTGEM2;
-patch_t *PatchINumbers[10];
-patch_t *PatchNEGATIVE;
-patch_t *PatchSmNumbers[10];
-patch_t *PatchBLACKSQ;
-patch_t *PatchINVBAR;
-patch_t *PatchARMCLEAR;
-patch_t *PatchCHAINBACK;
-//byte *ShadeTables;
-int FontBNumBase;
-int spinbooklump;
-int spinflylump;
-
-// Toggle god mode
-cheatseq_t CheatGodSeq = CHEAT("quicken", 0);
-
-// Toggle no clipping mode
-cheatseq_t CheatNoClipSeq = CHEAT("kitty", 0);
-
-// Get all weapons and ammo
-cheatseq_t CheatWeaponsSeq = CHEAT("rambo", 0);
-
-// Toggle tome of power
-cheatseq_t CheatPowerSeq = CHEAT("shazam", 0);
-
-// Get full health
-cheatseq_t CheatHealthSeq = CHEAT("ponce", 0);
-
-// Get all keys
-cheatseq_t CheatKeysSeq = CHEAT("skel", 0);
-
-// Toggle sound debug info
-cheatseq_t CheatSoundSeq = CHEAT("noise", 0);
-
-// Toggle ticker
-cheatseq_t CheatTickerSeq = CHEAT("ticker", 0);
-
-// Get an artifact 1st stage (ask for type)
-cheatseq_t CheatArtifact1Seq = CHEAT("gimme", 0);
-
-// Get an artifact 2nd stage (ask for count)
-cheatseq_t CheatArtifact2Seq = CHEAT("gimme", 1);
-
-// Get an artifact final stage
-cheatseq_t CheatArtifact3Seq = CHEAT("gimme", 2);
-
-// Warp to new level
-cheatseq_t CheatWarpSeq = CHEAT("engage", 2);
-
-// Save a screenshot
-cheatseq_t CheatChickenSeq = CHEAT("cockadoodledoo", 0);
-
-// Kill all monsters
-cheatseq_t CheatMassacreSeq = CHEAT("massacre", 0);
-
-cheatseq_t CheatIDKFASeq = CHEAT("idkfa", 0);
-cheatseq_t CheatIDDQDSeq = CHEAT("iddqd", 0);
-
-static Cheat_t Cheats[] = {
-    {CheatGodFunc,       &CheatGodSeq},
-    {CheatNoClipFunc,    &CheatNoClipSeq},
-    {CheatWeaponsFunc,   &CheatWeaponsSeq},
-    {CheatPowerFunc,     &CheatPowerSeq},
-    {CheatHealthFunc,    &CheatHealthSeq},
-    {CheatKeysFunc,      &CheatKeysSeq},
-    {CheatSoundFunc,     &CheatSoundSeq},
-    {CheatTickerFunc,    &CheatTickerSeq},
-    {CheatArtifact1Func, &CheatArtifact1Seq},
-    {CheatArtifact2Func, &CheatArtifact2Seq},
-    {CheatArtifact3Func, &CheatArtifact3Seq},
-    {CheatWarpFunc,      &CheatWarpSeq},
-    {CheatChickenFunc,   &CheatChickenSeq},
-    {CheatMassacreFunc,  &CheatMassacreSeq},
-    {CheatIDKFAFunc,     &CheatIDKFASeq},
-    {CheatIDDQDFunc,     &CheatIDDQDSeq},
-    {NULL,               NULL} 
-};
-
-//---------------------------------------------------------------------------
-//
-// PROC SB_Init
-//
-//---------------------------------------------------------------------------
-
-void SB_Init(void)
-{
-    int i;
-    int startLump;
-
-    PatchLTFACE = W_CacheLumpName(DEH_String("LTFACE"), PU_STATIC);
-    PatchRTFACE = W_CacheLumpName(DEH_String("RTFACE"), PU_STATIC);
-    PatchBARBACK = W_CacheLumpName(DEH_String("BARBACK"), PU_STATIC);
-    PatchINVBAR = W_CacheLumpName(DEH_String("INVBAR"), PU_STATIC);
-    PatchCHAIN = W_CacheLumpName(DEH_String("CHAIN"), PU_STATIC);
-    if (deathmatch)
-    {
-        PatchSTATBAR = W_CacheLumpName(DEH_String("STATBAR"), PU_STATIC);
-    }
-    else
-    {
-        PatchSTATBAR = W_CacheLumpName(DEH_String("LIFEBAR"), PU_STATIC);
-    }
-    if (!netgame)
-    {                           // single player game uses red life gem
-        PatchLIFEGEM = W_CacheLumpName(DEH_String("LIFEGEM2"), PU_STATIC);
-    }
-    else
-    {
-        PatchLIFEGEM = W_CacheLumpNum(W_GetNumForName(DEH_String("LIFEGEM0"))
-                                      + consoleplayer, PU_STATIC);
-    }
-    PatchLTFCTOP = W_CacheLumpName(DEH_String("LTFCTOP"), PU_STATIC);
-    PatchRTFCTOP = W_CacheLumpName(DEH_String("RTFCTOP"), PU_STATIC);
-    PatchSELECTBOX = W_CacheLumpName(DEH_String("SELECTBOX"), PU_STATIC);
-    PatchINVLFGEM1 = W_CacheLumpName(DEH_String("INVGEML1"), PU_STATIC);
-    PatchINVLFGEM2 = W_CacheLumpName(DEH_String("INVGEML2"), PU_STATIC);
-    PatchINVRTGEM1 = W_CacheLumpName(DEH_String("INVGEMR1"), PU_STATIC);
-    PatchINVRTGEM2 = W_CacheLumpName(DEH_String("INVGEMR2"), PU_STATIC);
-    PatchBLACKSQ = W_CacheLumpName(DEH_String("BLACKSQ"), PU_STATIC);
-    PatchARMCLEAR = W_CacheLumpName(DEH_String("ARMCLEAR"), PU_STATIC);
-    PatchCHAINBACK = W_CacheLumpName(DEH_String("CHAINBACK"), PU_STATIC);
-    startLump = W_GetNumForName(DEH_String("IN0"));
-    for (i = 0; i < 10; i++)
-    {
-        PatchINumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
-    }
-    PatchNEGATIVE = W_CacheLumpName(DEH_String("NEGNUM"), PU_STATIC);
-    FontBNumBase = W_GetNumForName(DEH_String("FONTB16"));
-    startLump = W_GetNumForName(DEH_String("SMALLIN0"));
-    for (i = 0; i < 10; i++)
-    {
-        PatchSmNumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
-    }
-    playpalette = W_GetNumForName(DEH_String("PLAYPAL"));
-    spinbooklump = W_GetNumForName(DEH_String("SPINBK0"));
-    spinflylump = W_GetNumForName(DEH_String("SPFLY0"));
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SB_Ticker
-//
-//---------------------------------------------------------------------------
-
-void SB_Ticker(void)
-{
-    int delta;
-    int curHealth;
-
-    if (leveltime & 1)
-    {
-        ChainWiggle = P_Random() & 1;
-    }
-    curHealth = players[consoleplayer].mo->health;
-    if (curHealth < 0)
-    {
-        curHealth = 0;
-    }
-    if (curHealth < HealthMarker)
-    {
-        delta = (HealthMarker - curHealth) >> 2;
-        if (delta < 1)
-        {
-            delta = 1;
-        }
-        else if (delta > 8)
-        {
-            delta = 8;
-        }
-        HealthMarker -= delta;
-    }
-    else if (curHealth > HealthMarker)
-    {
-        delta = (curHealth - HealthMarker) >> 2;
-        if (delta < 1)
-        {
-            delta = 1;
-        }
-        else if (delta > 8)
-        {
-            delta = 8;
-        }
-        HealthMarker += delta;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrINumber
-//
-// Draws a three digit number.
-//
-//---------------------------------------------------------------------------
-
-static void DrINumber(signed int val, int x, int y)
-{
-    patch_t *patch;
-    int oldval;
-
-    oldval = val;
-    if (val < 0)
-    {
-        if (val < -9)
-        {
-            V_DrawPatch(x + 1, y + 1, W_CacheLumpName(DEH_String("LAME"), PU_CACHE));
-        }
-        else
-        {
-            val = -val;
-            V_DrawPatch(x + 18, y, PatchINumbers[val]);
-            V_DrawPatch(x + 9, y, PatchNEGATIVE);
-        }
-        return;
-    }
-    if (val > 99)
-    {
-        patch = PatchINumbers[val / 100];
-        V_DrawPatch(x, y, patch);
-    }
-    val = val % 100;
-    if (val > 9 || oldval > 99)
-    {
-        patch = PatchINumbers[val / 10];
-        V_DrawPatch(x + 9, y, patch);
-    }
-    val = val % 10;
-    patch = PatchINumbers[val];
-    V_DrawPatch(x + 18, y, patch);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrBNumber
-//
-// Draws a three digit number using FontB
-//
-//---------------------------------------------------------------------------
-
-static void DrBNumber(signed int val, int x, int y)
-{
-    patch_t *patch;
-    int xpos;
-    int oldval;
-
-    oldval = val;
-    xpos = x;
-    if (val < 0)
-    {
-        val = 0;
-    }
-    if (val > 99)
-    {
-        patch = W_CacheLumpNum(FontBNumBase + val / 100, PU_CACHE);
-        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-    }
-    val = val % 100;
-    xpos += 12;
-    if (val > 9 || oldval > 99)
-    {
-        patch = W_CacheLumpNum(FontBNumBase + val / 10, PU_CACHE);
-        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-    }
-    val = val % 10;
-    xpos += 12;
-    patch = W_CacheLumpNum(FontBNumBase + val, PU_CACHE);
-    V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrSmallNumber
-//
-// Draws a small two digit number.
-//
-//---------------------------------------------------------------------------
-
-static void DrSmallNumber(int val, int x, int y)
-{
-    patch_t *patch;
-
-    if (val == 1)
-    {
-        return;
-    }
-    if (val > 9)
-    {
-        patch = PatchSmNumbers[val / 10];
-        V_DrawPatch(x, y, patch);
-    }
-    val = val % 10;
-    patch = PatchSmNumbers[val];
-    V_DrawPatch(x + 4, y, patch);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC ShadeLine
-//
-//---------------------------------------------------------------------------
-
-static void ShadeLine(int x, int y, int height, int shade)
-{
-    byte *dest;
-    byte *shades;
-
-    shades = colormaps + 9 * 256 + shade * 2 * 256;
-    dest = I_VideoBuffer + y * SCREENWIDTH + x;
-    while (height--)
-    {
-        *(dest) = *(shades + *dest);
-        dest += SCREENWIDTH;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC ShadeChain
-//
-//---------------------------------------------------------------------------
-
-static void ShadeChain(void)
-{
-    int i;
-
-    for (i = 0; i < 16; i++)
-    {
-        ShadeLine(277 + i, 190, 10, i / 2);
-        ShadeLine(19 + i, 190, 10, 7 - (i / 2));
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSoundInfo
-//
-// Displays sound debugging information.
-//
-//---------------------------------------------------------------------------
-
-static void DrawSoundInfo(void)
-{
-    int i;
-    SoundInfo_t s;
-    ChanInfo_t *c;
-    char text[32];
-    int x;
-    int y;
-    int xPos[7] = { 1, 75, 112, 156, 200, 230, 260 };
-
-    if (leveltime & 16)
-    {
-        MN_DrTextA(DEH_String("*** SOUND DEBUG INFO ***"), xPos[0], 20);
-    }
-    S_GetChannelInfo(&s);
-    if (s.channelCount == 0)
-    {
-        return;
-    }
-    x = 0;
-    MN_DrTextA(DEH_String("NAME"), xPos[x++], 30);
-    MN_DrTextA(DEH_String("MO.T"), xPos[x++], 30);
-    MN_DrTextA(DEH_String("MO.X"), xPos[x++], 30);
-    MN_DrTextA(DEH_String("MO.Y"), xPos[x++], 30);
-    MN_DrTextA(DEH_String("ID"), xPos[x++], 30);
-    MN_DrTextA(DEH_String("PRI"), xPos[x++], 30);
-    MN_DrTextA(DEH_String("DIST"), xPos[x++], 30);
-    for (i = 0; i < s.channelCount; i++)
-    {
-        c = &s.chan[i];
-        x = 0;
-        y = 40 + i * 10;
-        if (c->mo == NULL)
-        {                       // Channel is unused
-            MN_DrTextA(DEH_String("------"), xPos[0], y);
-            continue;
-        }
-        M_snprintf(text, sizeof(text), "%s", c->name);
-        M_ForceUppercase(text);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->mo->type);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->mo->x >> FRACBITS);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->mo->y >> FRACBITS);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->id);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->priority);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->distance);
-        MN_DrTextA(text, xPos[x++], y);
-    }
-    UpdateState |= I_FULLSCRN;
-    BorderNeedRefresh = true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SB_Drawer
-//
-//---------------------------------------------------------------------------
-
-char patcharti[][10] = {
-    {"ARTIBOX"},                // none
-    {"ARTIINVU"},               // invulnerability
-    {"ARTIINVS"},               // invisibility
-    {"ARTIPTN2"},               // health
-    {"ARTISPHL"},               // superhealth
-    {"ARTIPWBK"},               // tomeofpower
-    {"ARTITRCH"},               // torch
-    {"ARTIFBMB"},               // firebomb
-    {"ARTIEGGC"},               // egg
-    {"ARTISOAR"},               // fly
-    {"ARTIATLP"}                // teleport
-};
-
-char ammopic[][10] = {
-    {"INAMGLD"},
-    {"INAMBOW"},
-    {"INAMBST"},
-    {"INAMRAM"},
-    {"INAMPNX"},
-    {"INAMLOB"}
-};
-
-int SB_state = -1;
-static int oldarti = 0;
-static int oldartiCount = 0;
-static int oldfrags = -9999;
-static int oldammo = -1;
-static int oldarmor = -1;
-static int oldweapon = -1;
-static int oldhealth = -1;
-static int oldlife = -1;
-static int oldkeys = -1;
-
-int playerkeys = 0;
-
-
-void SB_Drawer(void)
-{
-    int frame;
-    static boolean hitCenterFrame;
-
-    // Sound info debug stuff
-    if (DebugSound == true)
-    {
-        DrawSoundInfo();
-    }
-    CPlayer = &players[consoleplayer];
-    if (viewheight == SCREENHEIGHT && !automapactive)
-    {
-        DrawFullScreenStuff();
-        SB_state = -1;
-    }
-    else
-    {
-        if (SB_state == -1)
-        {
-            V_DrawPatch(0, 158, PatchBARBACK);
-            if (players[consoleplayer].cheats & CF_GODMODE)
-            {
-                V_DrawPatch(16, 167,
-                            W_CacheLumpName(DEH_String("GOD1"), PU_CACHE));
-                V_DrawPatch(287, 167,
-                            W_CacheLumpName(DEH_String("GOD2"), PU_CACHE));
-            }
-            oldhealth = -1;
-        }
-        DrawCommonBar();
-        if (!inventory)
-        {
-            if (SB_state != 0)
-            {
-                // Main interface
-                V_DrawPatch(34, 160, PatchSTATBAR);
-                oldarti = 0;
-                oldammo = -1;
-                oldarmor = -1;
-                oldweapon = -1;
-                oldfrags = -9999;       //can't use -1, 'cuz of negative frags
-                oldlife = -1;
-                oldkeys = -1;
-            }
-            DrawMainBar();
-            SB_state = 0;
-        }
-        else
-        {
-            if (SB_state != 1)
-            {
-                V_DrawPatch(34, 160, PatchINVBAR);
-            }
-            DrawInventoryBar();
-            SB_state = 1;
-        }
-    }
-    SB_PaletteFlash();
-
-    // Flight icons
-    if (CPlayer->powers[pw_flight])
-    {
-        if (CPlayer->powers[pw_flight] > BLINKTHRESHOLD
-            || !(CPlayer->powers[pw_flight] & 16))
-        {
-            frame = (leveltime / 3) & 15;
-            if (CPlayer->mo->flags2 & MF2_FLY)
-            {
-                if (hitCenterFrame && (frame != 15 && frame != 0))
-                {
-                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + 15,
-                                                       PU_CACHE));
-                }
-                else
-                {
-                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + frame,
-                                                       PU_CACHE));
-                    hitCenterFrame = false;
-                }
-            }
-            else
-            {
-                if (!hitCenterFrame && (frame != 15 && frame != 0))
-                {
-                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + frame,
-                                                       PU_CACHE));
-                    hitCenterFrame = false;
-                }
-                else
-                {
-                    V_DrawPatch(20, 17, W_CacheLumpNum(spinflylump + 15,
-                                                       PU_CACHE));
-                    hitCenterFrame = true;
-                }
-            }
-            BorderTopRefresh = true;
-            UpdateState |= I_MESSAGES;
-        }
-        else
-        {
-            BorderTopRefresh = true;
-            UpdateState |= I_MESSAGES;
-        }
-    }
-
-    if (CPlayer->powers[pw_weaponlevel2] && !CPlayer->chickenTics)
-    {
-        if (CPlayer->powers[pw_weaponlevel2] > BLINKTHRESHOLD
-            || !(CPlayer->powers[pw_weaponlevel2] & 16))
-        {
-            frame = (leveltime / 3) & 15;
-            V_DrawPatch(300, 17,
-                        W_CacheLumpNum(spinbooklump + frame, PU_CACHE));
-            BorderTopRefresh = true;
-            UpdateState |= I_MESSAGES;
-        }
-        else
-        {
-            BorderTopRefresh = true;
-            UpdateState |= I_MESSAGES;
-        }
-    }
-/*
-		if(CPlayer->powers[pw_weaponlevel2] > BLINKTHRESHOLD
-			|| (CPlayer->powers[pw_weaponlevel2]&8))
-		{
-			V_DrawPatch(291, 0, W_CacheLumpName("ARTIPWBK", PU_CACHE));
-		}
-		else
-		{
-			BorderTopRefresh = true;
-		}
-	}
-*/
-}
-
-// sets the new palette based upon current values of player->damagecount
-// and player->bonuscount
-void SB_PaletteFlash(void)
-{
-    static int sb_palette = 0;
-    int palette;
-    byte *pal;
-
-    CPlayer = &players[consoleplayer];
-
-    if (CPlayer->damagecount)
-    {
-        palette = (CPlayer->damagecount + 7) >> 3;
-        if (palette >= NUMREDPALS)
-        {
-            palette = NUMREDPALS - 1;
-        }
-        palette += STARTREDPALS;
-    }
-    else if (CPlayer->bonuscount)
-    {
-        palette = (CPlayer->bonuscount + 7) >> 3;
-        if (palette >= NUMBONUSPALS)
-        {
-            palette = NUMBONUSPALS - 1;
-        }
-        palette += STARTBONUSPALS;
-    }
-    else
-    {
-        palette = 0;
-    }
-    if (palette != sb_palette)
-    {
-        sb_palette = palette;
-        pal = (byte *) W_CacheLumpNum(playpalette, PU_CACHE) + palette * 768;
-        I_SetPalette(pal);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawCommonBar
-//
-//---------------------------------------------------------------------------
-
-void DrawCommonBar(void)
-{
-    int chainY;
-    int healthPos;
-
-    V_DrawPatch(0, 148, PatchLTFCTOP);
-    V_DrawPatch(290, 148, PatchRTFCTOP);
-
-    if (oldhealth != HealthMarker)
-    {
-        oldhealth = HealthMarker;
-        healthPos = HealthMarker;
-        if (healthPos < 0)
-        {
-            healthPos = 0;
-        }
-        if (healthPos > 100)
-        {
-            healthPos = 100;
-        }
-        healthPos = (healthPos * 256) / 100;
-        chainY =
-            (HealthMarker == CPlayer->mo->health) ? 191 : 191 + ChainWiggle;
-        V_DrawPatch(0, 190, PatchCHAINBACK);
-        V_DrawPatch(2 + (healthPos % 17), chainY, PatchCHAIN);
-        V_DrawPatch(17 + healthPos, chainY, PatchLIFEGEM);
-        V_DrawPatch(0, 190, PatchLTFACE);
-        V_DrawPatch(276, 190, PatchRTFACE);
-        ShadeChain();
-        UpdateState |= I_STATBAR;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawMainBar
-//
-//---------------------------------------------------------------------------
-
-void DrawMainBar(void)
-{
-    int i;
-    int temp;
-
-    // Ready artifact
-    if (ArtifactFlash)
-    {
-        V_DrawPatch(180, 161, PatchBLACKSQ);
-
-        temp = W_GetNumForName(DEH_String("useartia")) + ArtifactFlash - 1;
-
-        V_DrawPatch(182, 161, W_CacheLumpNum(temp, PU_CACHE));
-        ArtifactFlash--;
-        oldarti = -1;           // so that the correct artifact fills in after the flash
-        UpdateState |= I_STATBAR;
-    }
-    else if (oldarti != CPlayer->readyArtifact
-             || oldartiCount != CPlayer->inventory[inv_ptr].count)
-    {
-        V_DrawPatch(180, 161, PatchBLACKSQ);
-        if (CPlayer->readyArtifact > 0)
-        {
-            V_DrawPatch(179, 160,
-                        W_CacheLumpName(DEH_String(patcharti[CPlayer->readyArtifact]),
-                                        PU_CACHE));
-            DrSmallNumber(CPlayer->inventory[inv_ptr].count, 201, 182);
-        }
-        oldarti = CPlayer->readyArtifact;
-        oldartiCount = CPlayer->inventory[inv_ptr].count;
-        UpdateState |= I_STATBAR;
-    }
-
-    // Frags
-    if (deathmatch)
-    {
-        temp = 0;
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            temp += CPlayer->frags[i];
-        }
-        if (temp != oldfrags)
-        {
-            V_DrawPatch(57, 171, PatchARMCLEAR);
-            DrINumber(temp, 61, 170);
-            oldfrags = temp;
-            UpdateState |= I_STATBAR;
-        }
-    }
-    else
-    {
-        temp = HealthMarker;
-        if (temp < 0)
-        {
-            temp = 0;
-        }
-        else if (temp > 100)
-        {
-            temp = 100;
-        }
-        if (oldlife != temp)
-        {
-            oldlife = temp;
-            V_DrawPatch(57, 171, PatchARMCLEAR);
-            DrINumber(temp, 61, 170);
-            UpdateState |= I_STATBAR;
-        }
-    }
-
-    // Keys
-    if (oldkeys != playerkeys)
-    {
-        if (CPlayer->keys[key_yellow])
-        {
-            V_DrawPatch(153, 164, W_CacheLumpName(DEH_String("ykeyicon"), PU_CACHE));
-        }
-        if (CPlayer->keys[key_green])
-        {
-            V_DrawPatch(153, 172, W_CacheLumpName(DEH_String("gkeyicon"), PU_CACHE));
-        }
-        if (CPlayer->keys[key_blue])
-        {
-            V_DrawPatch(153, 180, W_CacheLumpName(DEH_String("bkeyicon"), PU_CACHE));
-        }
-        oldkeys = playerkeys;
-        UpdateState |= I_STATBAR;
-    }
-    // Ammo
-    temp = CPlayer->ammo[wpnlev1info[CPlayer->readyweapon].ammo];
-    if (oldammo != temp || oldweapon != CPlayer->readyweapon)
-    {
-        V_DrawPatch(108, 161, PatchBLACKSQ);
-        if (temp && CPlayer->readyweapon > 0 && CPlayer->readyweapon < 7)
-        {
-            DrINumber(temp, 109, 162);
-            V_DrawPatch(111, 172,
-                        W_CacheLumpName(DEH_String(ammopic[CPlayer->readyweapon - 1]),
-                                        PU_CACHE));
-        }
-        oldammo = temp;
-        oldweapon = CPlayer->readyweapon;
-        UpdateState |= I_STATBAR;
-    }
-
-    // Armor
-    if (oldarmor != CPlayer->armorpoints)
-    {
-        V_DrawPatch(224, 171, PatchARMCLEAR);
-        DrINumber(CPlayer->armorpoints, 228, 170);
-        oldarmor = CPlayer->armorpoints;
-        UpdateState |= I_STATBAR;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawInventoryBar
-//
-//---------------------------------------------------------------------------
-
-void DrawInventoryBar(void)
-{
-    const char *patch;
-    int i;
-    int x;
-
-    x = inv_ptr - curpos;
-    UpdateState |= I_STATBAR;
-    V_DrawPatch(34, 160, PatchINVBAR);
-    for (i = 0; i < 7; i++)
-    {
-        //V_DrawPatch(50+i*31, 160, W_CacheLumpName("ARTIBOX", PU_CACHE));
-        if (CPlayer->inventorySlotNum > x + i
-            && CPlayer->inventory[x + i].type != arti_none)
-        {
-            patch = DEH_String(patcharti[CPlayer->inventory[x + i].type]);
-
-            V_DrawPatch(50 + i * 31, 160, W_CacheLumpName(patch, PU_CACHE));
-            DrSmallNumber(CPlayer->inventory[x + i].count, 69 + i * 31, 182);
-        }
-    }
-    V_DrawPatch(50 + curpos * 31, 189, PatchSELECTBOX);
-    if (x != 0)
-    {
-        V_DrawPatch(38, 159, !(leveltime & 4) ? PatchINVLFGEM1 :
-                    PatchINVLFGEM2);
-    }
-    if (CPlayer->inventorySlotNum - x > 7)
-    {
-        V_DrawPatch(269, 159, !(leveltime & 4) ?
-                    PatchINVRTGEM1 : PatchINVRTGEM2);
-    }
-}
-
-void DrawFullScreenStuff(void)
-{
-    const char *patch;
-    int i;
-    int x;
-    int temp;
-
-    UpdateState |= I_FULLSCRN;
-    if (CPlayer->mo->health > 0)
-    {
-        DrBNumber(CPlayer->mo->health, 5, 180);
-    }
-    else
-    {
-        DrBNumber(0, 5, 180);
-    }
-    if (deathmatch)
-    {
-        temp = 0;
-        for (i = 0; i < MAXPLAYERS; i++)
-        {
-            if (playeringame[i])
-            {
-                temp += CPlayer->frags[i];
-            }
-        }
-        DrINumber(temp, 45, 185);
-    }
-    if (!inventory)
-    {
-        if (CPlayer->readyArtifact > 0)
-        {
-            patch = DEH_String(patcharti[CPlayer->readyArtifact]);
-            V_DrawAltTLPatch(286, 170, W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));
-            V_DrawPatch(286, 170, W_CacheLumpName(patch, PU_CACHE));
-            DrSmallNumber(CPlayer->inventory[inv_ptr].count, 307, 192);
-        }
-    }
-    else
-    {
-        x = inv_ptr - curpos;
-        for (i = 0; i < 7; i++)
-        {
-            V_DrawAltTLPatch(50 + i * 31, 168,
-                          W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));
-            if (CPlayer->inventorySlotNum > x + i
-                && CPlayer->inventory[x + i].type != arti_none)
-            {
-                patch = DEH_String(patcharti[CPlayer->inventory[x + i].type]);
-                V_DrawPatch(50 + i * 31, 168,
-                            W_CacheLumpName(patch, PU_CACHE));
-                DrSmallNumber(CPlayer->inventory[x + i].count, 69 + i * 31,
-                              190);
-            }
-        }
-        V_DrawPatch(50 + curpos * 31, 197, PatchSELECTBOX);
-        if (x != 0)
-        {
-            V_DrawPatch(38, 167, !(leveltime & 4) ? PatchINVLFGEM1 :
-                        PatchINVLFGEM2);
-        }
-        if (CPlayer->inventorySlotNum - x > 7)
-        {
-            V_DrawPatch(269, 167, !(leveltime & 4) ?
-                        PatchINVRTGEM1 : PatchINVRTGEM2);
-        }
-    }
-}
-
-//--------------------------------------------------------------------------
-//
-// FUNC SB_Responder
-//
-//--------------------------------------------------------------------------
-
-boolean SB_Responder(event_t * event)
-{
-    if (event->type == ev_keydown)
-    {
-        if (HandleCheats(event->data1))
-        {                       // Need to eat the key
-            return (true);
-        }
-    }
-    return (false);
-}
-
-//--------------------------------------------------------------------------
-//
-// FUNC HandleCheats
-//
-// Returns true if the caller should eat the key.
-//
-//--------------------------------------------------------------------------
-
-static boolean HandleCheats(byte key)
-{
-    int i;
-    boolean eat;
-
-    if (netgame || gameskill == sk_nightmare)
-    {                           // Can't cheat in a net-game, or in nightmare mode
-        return (false);
-    }
-    if (players[consoleplayer].health <= 0)
-    {                           // Dead players can't cheat
-        return (false);
-    }
-    eat = false;
-    for (i = 0; Cheats[i].func != NULL; i++)
-    {
-        if (cht_CheckCheat(Cheats[i].seq, key))
-        {
-            Cheats[i].func(&players[consoleplayer], &Cheats[i]);
-            S_StartSound(NULL, sfx_dorcls);
-        }
-    }
-    return (eat);
-}
-
-//--------------------------------------------------------------------------
-//
-// CHEAT FUNCTIONS
-//
-//--------------------------------------------------------------------------
-
-static void CheatGodFunc(player_t * player, Cheat_t * cheat)
-{
-    player->cheats ^= CF_GODMODE;
-    if (player->cheats & CF_GODMODE)
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATGODON), false);
-    }
-    else
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATGODOFF), false);
-    }
-    SB_state = -1;
-}
-
-static void CheatNoClipFunc(player_t * player, Cheat_t * cheat)
-{
-    player->cheats ^= CF_NOCLIP;
-    if (player->cheats & CF_NOCLIP)
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATNOCLIPON), false);
-    }
-    else
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATNOCLIPOFF), false);
-    }
-}
-
-static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat)
-{
-    int i;
-
-    player->armorpoints = 200;
-    player->armortype = 2;
-    if (!player->backpack)
-    {
-        for (i = 0; i < NUMAMMO; i++)
-        {
-            player->maxammo[i] *= 2;
-        }
-        player->backpack = true;
-    }
-    for (i = 0; i < NUMWEAPONS - 1; i++)
-    {
-        player->weaponowned[i] = true;
-    }
-    if (gamemode == shareware)
-    {
-        player->weaponowned[wp_skullrod] = false;
-        player->weaponowned[wp_phoenixrod] = false;
-        player->weaponowned[wp_mace] = false;
-    }
-    for (i = 0; i < NUMAMMO; i++)
-    {
-        player->ammo[i] = player->maxammo[i];
-    }
-    P_SetMessage(player, DEH_String(TXT_CHEATWEAPONS), false);
-}
-
-static void CheatPowerFunc(player_t * player, Cheat_t * cheat)
-{
-    if (player->powers[pw_weaponlevel2])
-    {
-        player->powers[pw_weaponlevel2] = 0;
-        P_SetMessage(player, DEH_String(TXT_CHEATPOWEROFF), false);
-    }
-    else
-    {
-        P_UseArtifact(player, arti_tomeofpower);
-        P_SetMessage(player, DEH_String(TXT_CHEATPOWERON), false);
-    }
-}
-
-static void CheatHealthFunc(player_t * player, Cheat_t * cheat)
-{
-    if (player->chickenTics)
-    {
-        player->health = player->mo->health = MAXCHICKENHEALTH;
-    }
-    else
-    {
-        player->health = player->mo->health = MAXHEALTH;
-    }
-    P_SetMessage(player, DEH_String(TXT_CHEATHEALTH), false);
-}
-
-static void CheatKeysFunc(player_t * player, Cheat_t * cheat)
-{
-    player->keys[key_yellow] = true;
-    player->keys[key_green] = true;
-    player->keys[key_blue] = true;
-    playerkeys = 7;             // Key refresh flags
-    P_SetMessage(player, DEH_String(TXT_CHEATKEYS), false);
-}
-
-static void CheatSoundFunc(player_t * player, Cheat_t * cheat)
-{
-    DebugSound = !DebugSound;
-    if (DebugSound)
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATSOUNDON), false);
-    }
-    else
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATSOUNDOFF), false);
-    }
-}
-
-static void CheatTickerFunc(player_t * player, Cheat_t * cheat)
-{
-    DisplayTicker = !DisplayTicker;
-    if (DisplayTicker)
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATTICKERON), false);
-    }
-    else
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATTICKEROFF), false);
-    }
-
-    I_DisplayFPSDots(DisplayTicker);
-}
-
-static void CheatArtifact1Func(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS1), false);
-}
-
-static void CheatArtifact2Func(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS2), false);
-}
-
-static void CheatArtifact3Func(player_t * player, Cheat_t * cheat)
-{
-    char args[2];
-    int i;
-    int j;
-    int type;
-    int count;
-
-    cht_GetParam(cheat->seq, args);
-    type = args[0] - 'a' + 1;
-    count = args[1] - '0';
-    if (type == 26 && count == 0)
-    {                           // All artifacts
-        for (i = arti_none + 1; i < NUMARTIFACTS; i++)
-        {
-            if (gamemode == shareware 
-             && (i == arti_superhealth || i == arti_teleport))
-            {
-                continue;
-            }
-            for (j = 0; j < 16; j++)
-            {
-                P_GiveArtifact(player, i, NULL);
-            }
-        }
-        P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS3), false);
-    }
-    else if (type > arti_none && type < NUMARTIFACTS
-             && count > 0 && count < 10)
-    {
-        if (gamemode == shareware
-         && (type == arti_superhealth || type == arti_teleport))
-        {
-            P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTSFAIL), false);
-            return;
-        }
-        for (i = 0; i < count; i++)
-        {
-            P_GiveArtifact(player, type, NULL);
-        }
-        P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTS3), false);
-    }
-    else
-    {                           // Bad input
-        P_SetMessage(player, DEH_String(TXT_CHEATARTIFACTSFAIL), false);
-    }
-}
-
-static void CheatWarpFunc(player_t * player, Cheat_t * cheat)
-{
-    char args[2];
-    int episode;
-    int map;
-
-    cht_GetParam(cheat->seq, args);
-
-    episode = args[0] - '0';
-    map = args[1] - '0';
-    if (D_ValidEpisodeMap(heretic, gamemode, episode, map))
-    {
-        G_DeferedInitNew(gameskill, episode, map);
-        P_SetMessage(player, DEH_String(TXT_CHEATWARP), false);
-    }
-}
-
-static void CheatChickenFunc(player_t * player, Cheat_t * cheat)
-{
-    if (player->chickenTics)
-    {
-        if (P_UndoPlayerChicken(player))
-        {
-            P_SetMessage(player, DEH_String(TXT_CHEATCHICKENOFF), false);
-        }
-    }
-    else if (P_ChickenMorphPlayer(player))
-    {
-        P_SetMessage(player, DEH_String(TXT_CHEATCHICKENON), false);
-    }
-}
-
-static void CheatMassacreFunc(player_t * player, Cheat_t * cheat)
-{
-    P_Massacre();
-    P_SetMessage(player, DEH_String(TXT_CHEATMASSACRE), false);
-}
-
-static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat)
-{
-    int i;
-    if (player->chickenTics)
-    {
-        return;
-    }
-    for (i = 1; i < 8; i++)
-    {
-        player->weaponowned[i] = false;
-    }
-    player->pendingweapon = wp_staff;
-    P_SetMessage(player, DEH_String(TXT_CHEATIDKFA), true);
-}
-
-static void CheatIDDQDFunc(player_t * player, Cheat_t * cheat)
-{
-    P_DamageMobj(player->mo, NULL, player->mo, 10000);
-    P_SetMessage(player, DEH_String(TXT_CHEATIDDQD), true);
-}
diff --git a/games/NXDoom/src/heretic/sounds.c b/games/NXDoom/src/heretic/sounds.c
deleted file mode 100644
index 3e1dda157..000000000
--- a/games/NXDoom/src/heretic/sounds.c
+++ /dev/null
@@ -1,249 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// sounds.c
-
-#include "doomdef.h"
-#include "i_sound.h"
-#include "sounds.h"
-
-// Music info
-
-#define MUSIC(name) \
-    { name, 0, NULL, NULL }
-
-musicinfo_t S_music[] = {
-    MUSIC("MUS_E1M1"),            // 1-1
-    MUSIC("MUS_E1M2"),
-    MUSIC("MUS_E1M3"),
-    MUSIC("MUS_E1M4"),
-    MUSIC("MUS_E1M5"),
-    MUSIC("MUS_E1M6"),
-    MUSIC("MUS_E1M7"),
-    MUSIC("MUS_E1M8"),
-    MUSIC("MUS_E1M9"),
-
-    MUSIC("MUS_E2M1"),            // 2-1
-    MUSIC("MUS_E2M2"),
-    MUSIC("MUS_E2M3"),
-    MUSIC("MUS_E2M4"),
-    MUSIC("MUS_E1M4"),
-    MUSIC("MUS_E2M6"),
-    MUSIC("MUS_E2M7"),
-    MUSIC("MUS_E2M8"),
-    MUSIC("MUS_E2M9"),
-
-    MUSIC("MUS_E1M1"),            // 3-1
-    MUSIC("MUS_E3M2"),
-    MUSIC("MUS_E3M3"),
-    MUSIC("MUS_E1M6"),
-    MUSIC("MUS_E1M3"),
-    MUSIC("MUS_E1M2"),
-    MUSIC("MUS_E1M5"),
-    MUSIC("MUS_E1M9"),
-    MUSIC("MUS_E2M6"),
-
-    MUSIC("MUS_E1M6"),            // 4-1
-    MUSIC("MUS_E1M2"),
-    MUSIC("MUS_E1M3"),
-    MUSIC("MUS_E1M4"),
-    MUSIC("MUS_E1M5"),
-    MUSIC("MUS_E1M1"),
-    MUSIC("MUS_E1M7"),
-    MUSIC("MUS_E1M8"),
-    MUSIC("MUS_E1M9"),
-
-    MUSIC("MUS_E2M1"),            // 5-1
-    MUSIC("MUS_E2M2"),
-    MUSIC("MUS_E2M3"),
-    MUSIC("MUS_E2M4"),
-    MUSIC("MUS_E1M4"),
-    MUSIC("MUS_E2M6"),
-    MUSIC("MUS_E2M7"),
-    MUSIC("MUS_E2M8"),
-    MUSIC("MUS_E2M9"),
-
-    MUSIC("MUS_E3M2"),            // 6-1
-    MUSIC("MUS_E3M3"),            // 6-2
-    MUSIC("MUS_E1M6"),            // 6-3
-
-    MUSIC("MUS_TITL"),
-    MUSIC("MUS_INTR"),
-    MUSIC("MUS_CPTD")
-};
-
-// Sound info
-
-    /* Macro for original heretic sfxinfo_t 
-#define SOUND(name, priority, numchannels) \
-    { name, NULL, priority, -1, NULL, 0, numchannels }
-#define SOUND_LINK(name, link_id, priority, numchannels) \
-    { name, &S_sfx[link_id], priority, -1, NULL, 0, numchannels }
-    */
-
-#define SOUND(name, priority, numchannels) \
-    { NULL, name, priority, NULL, -1, -1, -1, 0, numchannels, NULL }
-#define SOUND_LINK(name, link_id, priority, numchannels) \
-    { NULL, name, priority, &S_sfx[link_id], 0, 0, -1, 0, numchannels, NULL }
-
-sfxinfo_t S_sfx[] = {
-    SOUND("",        0,   0),
-    SOUND("gldhit",  32,  2),
-    SOUND("gntful",  32,  -1),
-    SOUND("gnthit",  32,  -1),
-    SOUND("gntpow",  32,  -1),
-    SOUND("gntact",  32,  -1),
-    SOUND("gntuse",  32,  -1),
-    SOUND("phosht",  32,  2),
-    SOUND("phohit",  32,  -1),
-    SOUND_LINK("-phopow", sfx_hedat1, 32, 1),
-    SOUND("lobsht",  20,  2),
-    SOUND("lobhit",  20,  2),
-    SOUND("lobpow",  20,  2),
-    SOUND("hrnsht",  32,  2),
-    SOUND("hrnhit",  32,  2),
-    SOUND("hrnpow",  32,  2),
-    SOUND("ramphit", 32,  2),
-    SOUND("ramrain", 10,  2),
-    SOUND("bowsht",  32,  2),
-    SOUND("stfhit",  32,  2),
-    SOUND("stfpow",  32,  2),
-    SOUND("stfcrk",  32,  2),
-    SOUND("impsit",  32,  2),
-    SOUND("impat1",  32,  2),
-    SOUND("impat2",  32,  2),
-    SOUND("impdth",  80,  2),
-    SOUND_LINK("-impact", sfx_impsit, 20, 2),
-    SOUND("imppai",  32,  2),
-    SOUND("mumsit",  32,  2),
-    SOUND("mumat1",  32,  2),
-    SOUND("mumat2",  32,  2),
-    SOUND("mumdth",  80,  2),
-    SOUND_LINK("-mumact", sfx_mumsit, 20, 2),
-    SOUND("mumpai",  32,  2),
-    SOUND("mumhed",  32,  2),
-    SOUND("bstsit",  32,  2),
-    SOUND("bstatk",  32,  2),
-    SOUND("bstdth",  80,  2),
-    SOUND("bstact",  20,  2),
-    SOUND("bstpai",  32,  2),
-    SOUND("clksit",  32,  2),
-    SOUND("clkatk",  32,  2),
-    SOUND("clkdth",  80,  2),
-    SOUND("clkact",  20,  2),
-    SOUND("clkpai",  32,  2),
-    SOUND("snksit",  32,  2),
-    SOUND("snkatk",  32,  2),
-    SOUND("snkdth",  80,  2),
-    SOUND("snkact",  20,  2),
-    SOUND("snkpai",  32,  2),
-    SOUND("kgtsit",  32,  2),
-    SOUND("kgtatk",  32,  2),
-    SOUND("kgtat2",  32,  2),
-    SOUND("kgtdth",  80,  2),
-    SOUND_LINK("-kgtact", sfx_kgtsit, 20, 2),
-    SOUND("kgtpai",  32,  2),
-    SOUND("wizsit",  32,  2),
-    SOUND("wizatk",  32,  2),
-    SOUND("wizdth",  80,  2),
-    SOUND("wizact",  20,  2),
-    SOUND("wizpai",  32,  2),
-    SOUND("minsit",  32,  2),
-    SOUND("minat1",  32,  2),
-    SOUND("minat2",  32,  2),
-    SOUND("minat3",  32,  2),
-    SOUND("mindth",  80,  2),
-    SOUND("minact",  20,  2),
-    SOUND("minpai",  32,  2),
-    SOUND("hedsit",  32,  2),
-    SOUND("hedat1",  32,  2),
-    SOUND("hedat2",  32,  2),
-    SOUND("hedat3",  32,  2),
-    SOUND("heddth",  80,  2),
-    SOUND("hedact",  20,  2),
-    SOUND("hedpai",  32,  2),
-    SOUND("sorzap",  32,  2),
-    SOUND("sorrise", 32,  2),
-    SOUND("sorsit",  200, 2),
-    SOUND("soratk",  32,  2),
-    SOUND("soract",  200, 2),
-    SOUND("sorpai",  200, 2),
-    SOUND("sordsph", 200, 2),
-    SOUND("sordexp", 200, 2),
-    SOUND("sordbon", 200, 2),
-    SOUND_LINK("-sbtsit", sfx_bstsit, 32, 2),
-    SOUND_LINK("-sbtatk", sfx_bstatk, 32, 2),
-    SOUND("sbtdth",  80,  2),
-    SOUND("sbtact",  20,  2),
-    SOUND("sbtpai",  32,  2),
-    SOUND("plroof",  32,  2),
-    SOUND("plrpai",  32,  2),
-    SOUND("plrdth",  80,  2),
-    SOUND("gibdth",  100, 2),
-    SOUND("plrwdth", 80,  2),
-    SOUND("plrcdth", 100, 2),
-    SOUND("itemup",  32,  2),
-    SOUND("wpnup",   32,  2),
-    SOUND("telept",  50,  2),
-    SOUND("doropn",  40,  2),
-    SOUND("dorcls",  40,  2),
-    SOUND("dormov",  40,  2),
-    SOUND("artiup",  32,  2),
-    SOUND("switch",  40,  2),
-    SOUND("pstart",  40,  2),
-    SOUND("pstop",   40,  2),
-    SOUND("stnmov",  40,  2),
-    SOUND("chicpai", 32,  2),
-    SOUND("chicatk", 32,  2),
-    SOUND("chicdth", 40,  2),
-    SOUND("chicact", 32,  2),
-    SOUND("chicpk1", 32,  2),
-    SOUND("chicpk2", 32,  2),
-    SOUND("chicpk3", 32,  2),
-    SOUND("keyup",   50,  2),
-    SOUND("ripslop", 16,  2),
-    SOUND("newpod",  16,  -1),
-    SOUND("podexp",  40,  -1),
-    SOUND("bounce",  16,  2),
-    SOUND_LINK("-volsht", sfx_bstatk, 16, 2),
-    SOUND_LINK("-volhit", sfx_lobhit, 16, 2),
-    SOUND("burn",    10,  2),
-    SOUND("splash",  10,  1),
-    SOUND("gloop",   10,  2),
-    SOUND("respawn", 10,  1),
-    SOUND("blssht",  32,  2),
-    SOUND("blshit",  32,  2),
-    SOUND("chat",    100, 1),
-    SOUND("artiuse", 32,  1),
-    SOUND("gfrag",   100, 1),
-    SOUND("waterfl", 16,  2),
-
-    // Monophonic sounds
-
-    SOUND("wind",    16,  1),
-    SOUND("amb1",    1,   1),
-    SOUND("amb2",    1,   1),
-    SOUND("amb3",    1,   1),
-    SOUND("amb4",    1,   1),
-    SOUND("amb5",    1,   1),
-    SOUND("amb6",    1,   1),
-    SOUND("amb7",    1,   1),
-    SOUND("amb8",    1,   1),
-    SOUND("amb9",    1,   1),
-    SOUND("amb10",   1,   1),
-    SOUND("amb11",   1,   0)
-};
diff --git a/games/NXDoom/src/heretic/sounds.h b/games/NXDoom/src/heretic/sounds.h
deleted file mode 100644
index f49b02798..000000000
--- a/games/NXDoom/src/heretic/sounds.h
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// sounds.h
-
-#ifndef __SOUNDSH__
-#define __SOUNDSH__
-
-#include "i_sound.h"
-
-#define MAX_SND_DIST 	1600
-#define MAX_CHANNELS	16
-
-// Music identifiers
-
-typedef enum
-{
-    mus_e1m1,
-    mus_e1m2,
-    mus_e1m3,
-    mus_e1m4,
-    mus_e1m5,
-    mus_e1m6,
-    mus_e1m7,
-    mus_e1m8,
-    mus_e1m9,
-
-    mus_e2m1,
-    mus_e2m2,
-    mus_e2m3,
-    mus_e2m4,
-    mus_e2m5,
-    mus_e2m6,
-    mus_e2m7,
-    mus_e2m8,
-    mus_e2m9,
-
-    mus_e3m1,
-    mus_e3m2,
-    mus_e3m3,
-    mus_e3m4,
-    mus_e3m5,
-    mus_e3m6,
-    mus_e3m7,
-    mus_e3m8,
-    mus_e3m9,
-
-    mus_e4m1,
-    mus_e4m2,
-    mus_e4m3,
-    mus_e4m4,
-    mus_e4m5,
-    mus_e4m6,
-    mus_e4m7,
-    mus_e4m8,
-    mus_e4m9,
-
-    mus_e5m1,
-    mus_e5m2,
-    mus_e5m3,
-    mus_e5m4,
-    mus_e5m5,
-    mus_e5m6,
-    mus_e5m7,
-    mus_e5m8,
-    mus_e5m9,
-
-    mus_e6m1,
-    mus_e6m2,
-    mus_e6m3,
-
-    mus_titl,
-    mus_intr,
-    mus_cptd,
-    NUMMUSIC
-} musicenum_t;
-
-#if 0
-typedef struct
-{
-    char name[8];
-} musicinfo_t;
-
-typedef struct sfxinfo_s
-{
-    char name[8];
-    struct sfxinfo_s *link;     // Make alias for another sound
-    unsigned short priority;    // Higher priority takes precendence
-    int usefulness;             // Determines when a sound should be cached out
-    void *snd_ptr;
-    int lumpnum;
-    int numchannels;            // total number of channels a sound type may occupy
-} sfxinfo_t;
-
-#endif
-
-typedef struct
-{
-    mobj_t *mo;
-    int sound_id;
-    int handle;
-    int pitch;
-    int priority;
-} channel_t;
-
-typedef struct
-{
-    int id;
-    unsigned short priority;
-    char *name;
-    mobj_t *mo;
-    int distance;
-} ChanInfo_t;
-
-typedef struct
-{
-    int channelCount;
-    int musicVolume;
-    int soundVolume;
-    ChanInfo_t chan[8];
-} SoundInfo_t;
-
-// Sound identifiers
-
-typedef enum
-{
-    sfx_None,
-    sfx_gldhit,
-    sfx_gntful,
-    sfx_gnthit,
-    sfx_gntpow,
-    sfx_gntact,
-    sfx_gntuse,
-    sfx_phosht,
-    sfx_phohit,
-    sfx_phopow,
-    sfx_lobsht,
-    sfx_lobhit,
-    sfx_lobpow,
-    sfx_hrnsht,
-    sfx_hrnhit,
-    sfx_hrnpow,
-    sfx_ramphit,
-    sfx_ramrain,
-    sfx_bowsht,
-    sfx_stfhit,
-    sfx_stfpow,
-    sfx_stfcrk,
-    sfx_impsit,
-    sfx_impat1,
-    sfx_impat2,
-    sfx_impdth,
-    sfx_impact,
-    sfx_imppai,
-    sfx_mumsit,
-    sfx_mumat1,
-    sfx_mumat2,
-    sfx_mumdth,
-    sfx_mumact,
-    sfx_mumpai,
-    sfx_mumhed,
-    sfx_bstsit,
-    sfx_bstatk,
-    sfx_bstdth,
-    sfx_bstact,
-    sfx_bstpai,
-    sfx_clksit,
-    sfx_clkatk,
-    sfx_clkdth,
-    sfx_clkact,
-    sfx_clkpai,
-    sfx_snksit,
-    sfx_snkatk,
-    sfx_snkdth,
-    sfx_snkact,
-    sfx_snkpai,
-    sfx_kgtsit,
-    sfx_kgtatk,
-    sfx_kgtat2,
-    sfx_kgtdth,
-    sfx_kgtact,
-    sfx_kgtpai,
-    sfx_wizsit,
-    sfx_wizatk,
-    sfx_wizdth,
-    sfx_wizact,
-    sfx_wizpai,
-    sfx_minsit,
-    sfx_minat1,
-    sfx_minat2,
-    sfx_minat3,
-    sfx_mindth,
-    sfx_minact,
-    sfx_minpai,
-    sfx_hedsit,
-    sfx_hedat1,
-    sfx_hedat2,
-    sfx_hedat3,
-    sfx_heddth,
-    sfx_hedact,
-    sfx_hedpai,
-    sfx_sorzap,
-    sfx_sorrise,
-    sfx_sorsit,
-    sfx_soratk,
-    sfx_soract,
-    sfx_sorpai,
-    sfx_sordsph,
-    sfx_sordexp,
-    sfx_sordbon,
-    sfx_sbtsit,
-    sfx_sbtatk,
-    sfx_sbtdth,
-    sfx_sbtact,
-    sfx_sbtpai,
-    sfx_plroof,
-    sfx_plrpai,
-    sfx_plrdth,                 // Normal
-    sfx_gibdth,                 // Extreme
-    sfx_plrwdth,                // Wimpy
-    sfx_plrcdth,                // Crazy
-    sfx_itemup,
-    sfx_wpnup,
-    sfx_telept,
-    sfx_doropn,
-    sfx_dorcls,
-    sfx_dormov,
-    sfx_artiup,
-    sfx_switch,
-    sfx_pstart,
-    sfx_pstop,
-    sfx_stnmov,
-    sfx_chicpai,
-    sfx_chicatk,
-    sfx_chicdth,
-    sfx_chicact,
-    sfx_chicpk1,
-    sfx_chicpk2,
-    sfx_chicpk3,
-    sfx_keyup,
-    sfx_ripslop,
-    sfx_newpod,
-    sfx_podexp,
-    sfx_bounce,
-    sfx_volsht,
-    sfx_volhit,
-    sfx_burn,
-    sfx_splash,
-    sfx_gloop,
-    sfx_respawn,
-    sfx_blssht,
-    sfx_blshit,
-    sfx_chat,
-    sfx_artiuse,
-    sfx_gfrag,
-    sfx_waterfl,
-
-    // Monophonic sounds
-
-    sfx_wind,
-    sfx_amb1,
-    sfx_amb2,
-    sfx_amb3,
-    sfx_amb4,
-    sfx_amb5,
-    sfx_amb6,
-    sfx_amb7,
-    sfx_amb8,
-    sfx_amb9,
-    sfx_amb10,
-    sfx_amb11,
-    NUMSFX
-} sfxenum_t;
-
-extern sfxinfo_t S_sfx[];
-extern musicinfo_t S_music[];
-
-#endif
diff --git a/games/NXDoom/src/hexen-res.rc.in b/games/NXDoom/src/hexen-res.rc.in
deleted file mode 100644
index b2b811b60..000000000
--- a/games/NXDoom/src/hexen-res.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-1 ICON "@top_srcdir@/data/hexen.ico"
-
-#include <winuser.h>
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
-
-1 VERSIONINFO
-PRODUCTVERSION @WINDOWS_RC_VERSION@
-FILEVERSION @WINDOWS_RC_VERSION@
-FILETYPE 1
-{
- BLOCK "StringFileInfo"
- {
-  BLOCK "040904E4"
-  {
-   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
-   VALUE "FileDescription", "@PACKAGE_STRING@"
-   VALUE "InternalName", "@PACKAGE_TARNAME@"
-   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
-   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
-   VALUE "ProductName", "@PACKAGE_NAME@"
-   VALUE "ProductVersion", "@PACKAGE_VERSION@"
-  }
- }
- BLOCK "VarFileInfo"
- {
-  VALUE "Translation", 0x409, 1252
- }
-}
-
diff --git a/games/NXDoom/src/hexen/.gitignore b/games/NXDoom/src/hexen/.gitignore
deleted file mode 100644
index d4e88e5a2..000000000
--- a/games/NXDoom/src/hexen/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-.deps
-tags
-TAGS
diff --git a/games/NXDoom/src/hexen/CMakeLists.txt b/games/NXDoom/src/hexen/CMakeLists.txt
deleted file mode 100644
index 3eba5d073..000000000
--- a/games/NXDoom/src/hexen/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-add_library(hexen STATIC
-            a_action.c
-                                am_data.h
-            am_map.c            am_map.h
-            ct_chat.c
-                                ct_chat.h
-            d_net.c
-            f_finale.c
-            g_game.c
-                                h2def.h
-            h2_main.c
-            info.c              info.h
-            in_lude.c
-            m_random.c          m_random.h
-            mn_menu.c
-            p_acs.c
-                                p_action.h
-            p_anim.c
-            p_ceilng.c
-            p_doors.c
-            p_enemy.c
-            p_floor.c
-            p_inter.c
-            p_lights.c
-                                p_local.h
-            p_map.c
-            p_maputl.c
-            p_mobj.c
-            po_man.c
-            p_plats.c
-            p_pspr.c
-            p_setup.c
-            p_sight.c
-            p_spec.c           p_spec.h
-            p_switch.c
-            p_telept.c
-            p_things.c
-            p_tick.c
-            p_user.c
-            r_bsp.c
-            r_data.c
-            r_draw.c
-                                r_local.h
-            r_main.c
-            r_plane.c
-            r_segs.c
-            r_things.c
-            s_sound.c           s_sound.h
-            sb_bar.c
-            sc_man.c
-            sn_sonix.c
-            sounds.c            sounds.h
-            st_start.c          st_start.h
-            sv_save.c
-                                textdefs.h
-                                xddefs.h)
-
-target_include_directories(hexen PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-if (DEFINED EMSCRIPTEN)
-    set(SDL_FLAGS "-s USE_SDL=2")
-    if(ENABLE_SDL2_MIXER)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
-    endif()
-    if(ENABLE_SDL2_NET)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
-    endif()
-else()
-    set(SDL_LINK_LIBS SDL2::SDL2)
-    if(ENABLE_SDL2_MIXER)
-        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
-    endif()
-    if(ENABLE_SDL2_NET)
-        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
-    endif()
-endif()
-target_link_libraries(hexen ${SDL_LINK_LIBS})
-set_target_properties(hexen PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-set_target_properties(hexen PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/hexen/Makefile.am b/games/NXDoom/src/hexen/Makefile.am
deleted file mode 100644
index c974ba3c8..000000000
--- a/games/NXDoom/src/hexen/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-AM_CFLAGS=-I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
-
-EXTRA_DIST =                          \
-        CMakeLists.txt                \
-        hexen_icon.c
-
-noinst_LIBRARIES=libhexen.a
-
-libhexen_a_SOURCES =                  \
-a_action.c                            \
-                    am_data.h         \
-am_map.c            am_map.h          \
-ct_chat.c                             \
-                    ct_chat.h         \
-d_net.c                               \
-f_finale.c                            \
-g_game.c                              \
-                    h2def.h           \
-h2_main.c                             \
-info.c              info.h            \
-in_lude.c                             \
-m_random.c          m_random.h        \
-mn_menu.c                             \
-p_acs.c                               \
-                    p_action.h        \
-p_anim.c                              \
-p_ceilng.c                            \
-p_doors.c                             \
-p_enemy.c                             \
-p_floor.c                             \
-p_inter.c                             \
-p_lights.c                            \
-                    p_local.h         \
-p_map.c                               \
-p_maputl.c                            \
-p_mobj.c                              \
-po_man.c                              \
-p_plats.c                             \
-p_pspr.c                              \
-p_setup.c                             \
-p_sight.c                             \
-p_spec.c           p_spec.h           \
-p_switch.c                            \
-p_telept.c                            \
-p_things.c                            \
-p_tick.c                              \
-p_user.c                              \
-r_bsp.c                               \
-r_data.c                              \
-r_draw.c                              \
-                    r_local.h         \
-r_main.c                              \
-r_plane.c                             \
-r_segs.c                              \
-r_things.c                            \
-s_sound.c           s_sound.h         \
-sb_bar.c                              \
-sc_man.c                              \
-sn_sonix.c                            \
-sounds.c            sounds.h          \
-st_start.c          st_start.h        \
-sv_save.c                             \
-                    textdefs.h        \
-                    xddefs.h
-
-if HAVE_ICONS
-
-hexen_icon.c : $(top_builddir)/data/hexen.png
-	$(top_builddir)/data/convert-icon $(top_builddir)/data/hexen.png $@
-
-endif
diff --git a/games/NXDoom/src/hexen/a_action.c b/games/NXDoom/src/hexen/a_action.c
deleted file mode 100644
index 7842f556a..000000000
--- a/games/NXDoom/src/hexen/a_action.c
+++ /dev/null
@@ -1,1341 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-int orbitTableX[256] = {
-    983025, 982725, 981825, 980340, 978255, 975600, 972330, 968490,
-    964065, 959070, 953475, 947325, 940590, 933300, 925440, 917025,
-    908055, 898545, 888495, 877905, 866775, 855135, 842985, 830310,
-    817155, 803490, 789360, 774735, 759660, 744120, 728130, 711690,
-    694845, 677565, 659880, 641805, 623340, 604500, 585285, 565725,
-    545820, 525600, 505050, 484200, 463065, 441645, 419955, 398010,
-    375840, 353430, 330810, 307995, 285000, 261825, 238485, 215010,
-    191400, 167685, 143865, 119955, 95970, 71940, 47850, 23745,
-    -375, -24495, -48600, -72690, -96720, -120705, -144600, -168420,
-    -192150, -215745, -239220, -262545, -285720, -308715, -331530, -354135,
-    -376530, -398700, -420630, -442320, -463725, -484860, -505695, -526230,
-    -546450, -566340, -585885, -605085, -623925, -642375, -660435, -678105,
-    -695370, -712215, -728625, -744600, -760125, -775200, -789795, -803925,
-    -817575, -830715, -843375, -855510, -867135, -878235, -888810, -898845,
-    -908340, -917295, -925695, -933540, -940815, -947520, -953670, -959235,
-    -964215, -968625, -972450, -975690, -978330, -980400, -981870, -982740,
-    -983025, -982725, -981825, -980340, -978255, -975600, -972330, -968490,
-    -964065, -959070, -953475, -947325, -940590, -933300, -925440, -917025,
-    -908055, -898545, -888495, -877905, -866775, -855135, -842985, -830310,
-    -817155, -803490, -789360, -774735, -759660, -744120, -728130, -711690,
-    -694845, -677565, -659880, -641805, -623340, -604485, -585285, -565725,
-    -545820, -525600, -505050, -484200, -463065, -441645, -419955, -398010,
-    -375840, -353430, -330810, -307995, -285000, -261825, -238485, -215010,
-    -191400, -167685, -143865, -119955, -95970, -71940, -47850, -23745,
-    375, 24495, 48600, 72690, 96720, 120705, 144600, 168420,
-    192150, 215745, 239220, 262545, 285720, 308715, 331530, 354135,
-    376530, 398700, 420630, 442320, 463725, 484860, 505695, 526230,
-    546450, 566340, 585885, 605085, 623925, 642375, 660435, 678105,
-    695370, 712215, 728625, 744600, 760125, 775200, 789795, 803925,
-    817575, 830715, 843375, 855510, 867135, 878235, 888810, 898845,
-    908340, 917295, 925695, 933540, 940815, 947520, 953670, 959235,
-    964215, 968625, 972450, 975690, 978330, 980400, 981870, 982740
-};
-
-int orbitTableY[256] = {
-    375, 24495, 48600, 72690, 96720, 120705, 144600, 168420,
-    192150, 215745, 239220, 262545, 285720, 308715, 331530, 354135,
-    376530, 398700, 420630, 442320, 463725, 484860, 505695, 526230,
-    546450, 566340, 585885, 605085, 623925, 642375, 660435, 678105,
-    695370, 712215, 728625, 744600, 760125, 775200, 789795, 803925,
-    817575, 830715, 843375, 855510, 867135, 878235, 888810, 898845,
-    908340, 917295, 925695, 933540, 940815, 947520, 953670, 959235,
-    964215, 968625, 972450, 975690, 978330, 980400, 981870, 982740,
-    983025, 982725, 981825, 980340, 978255, 975600, 972330, 968490,
-    964065, 959070, 953475, 947325, 940590, 933300, 925440, 917025,
-    908055, 898545, 888495, 877905, 866775, 855135, 842985, 830310,
-    817155, 803490, 789360, 774735, 759660, 744120, 728130, 711690,
-    694845, 677565, 659880, 641805, 623340, 604500, 585285, 565725,
-    545820, 525600, 505050, 484200, 463065, 441645, 419955, 398010,
-    375840, 353430, 330810, 307995, 285000, 261825, 238485, 215010,
-    191400, 167685, 143865, 119955, 95970, 71940, 47850, 23745,
-    -375, -24495, -48600, -72690, -96720, -120705, -144600, -168420,
-    -192150, -215745, -239220, -262545, -285720, -308715, -331530, -354135,
-    -376530, -398700, -420630, -442320, -463725, -484860, -505695, -526230,
-    -546450, -566340, -585885, -605085, -623925, -642375, -660435, -678105,
-    -695370, -712215, -728625, -744600, -760125, -775200, -789795, -803925,
-    -817575, -830715, -843375, -855510, -867135, -878235, -888810, -898845,
-    -908340, -917295, -925695, -933540, -940815, -947520, -953670, -959235,
-    -964215, -968625, -972450, -975690, -978330, -980400, -981870, -982740,
-    -983025, -982725, -981825, -980340, -978255, -975600, -972330, -968490,
-    -964065, -959070, -953475, -947325, -940590, -933300, -925440, -917025,
-    -908055, -898545, -888495, -877905, -866775, -855135, -842985, -830310,
-    -817155, -803490, -789360, -774735, -759660, -744120, -728130, -711690,
-    -694845, -677565, -659880, -641805, -623340, -604485, -585285, -565725,
-    -545820, -525600, -505050, -484200, -463065, -441645, -419955, -398010,
-    -375840, -353430, -330810, -307995, -285000, -261825, -238485, -215010,
-    -191400, -167685, -143865, -119955, -95970, -71940, -47850, -23745
-};
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-// CODE --------------------------------------------------------------------
-
-//--------------------------------------------------------------------------
-//
-// Environmental Action routines
-//
-//--------------------------------------------------------------------------
-
-//==========================================================================
-//
-// A_DripBlood
-//
-//==========================================================================
-
-/*
-void A_DripBlood(mobj_t *actor)
-{
-	mobj_t *mo;
-    int r;
-
-    r = P_SubRandom();
-
-	mo = P_SpawnMobj(actor->x+(r<<11),
-		actor->y+(P_SubRandom()<<11), actor->z, MT_BLOOD);
-	mo->momx = P_SubRandom()<<10;
-	mo->momy = P_SubRandom()<<10;
-	mo->flags2 |= MF2_LOGRAV;
-}
-*/
-
-//============================================================================
-//
-// A_PotteryExplode
-//
-//============================================================================
-
-void A_PotteryExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo = NULL;
-    int i;
-
-    for (i = (P_Random() & 3) + 3; i; i--)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_POTTERYBIT1);
-        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 5));
-        mo->momz = ((P_Random() & 7) + 5) * (3 * FRACUNIT / 4);
-        mo->momx = P_SubRandom() << (FRACBITS - 6);
-        mo->momy = P_SubRandom() << (FRACBITS - 6);
-    }
-    S_StartSound(mo, SFX_POTTERY_EXPLODE);
-    if (actor->args[0])
-    {                           // Spawn an item
-        if (!nomonsters
-            || !(mobjinfo[TranslateThingType[actor->args[0]]].
-                 flags & MF_COUNTKILL))
-        {                       // Only spawn monsters if not -nomonsters
-            P_SpawnMobj(actor->x, actor->y, actor->z,
-                        TranslateThingType[actor->args[0]]);
-        }
-    }
-    P_RemoveMobj(actor);
-}
-
-//============================================================================
-//
-// A_PotteryChooseBit
-//
-//============================================================================
-
-void A_PotteryChooseBit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SetMobjState(actor, actor->info->deathstate + (P_Random() % 5) + 1);
-    actor->tics = 256 + (P_Random() << 1);
-}
-
-//============================================================================
-//
-// A_PotteryCheck
-//
-//============================================================================
-
-void A_PotteryCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    mobj_t *pmo;
-
-    if (!netgame)
-    {
-        pmo = players[consoleplayer].mo;
-        if (P_CheckSight(actor, pmo)
-	  && (abs((int)R_PointToAngle2(pmo->x, pmo->y, actor->x, actor->y)
-           - (int)pmo->angle) <= ANG45))
-        {                       // Previous state (pottery bit waiting state)
-            P_SetMobjState(actor, actor->state - &states[0] - 1);
-        }
-        else
-        {
-            return;
-        }
-    }
-    else
-    {
-        for (i = 0; i < maxplayers; i++)
-        {
-            if (!playeringame[i])
-            {
-                continue;
-            }
-            pmo = players[i].mo;
-            if (P_CheckSight(actor, pmo) 
-              && (abs((int)R_PointToAngle2(pmo->x, pmo->y, actor->x, actor->y)
-               - (int)pmo->angle) <= ANG45))
-            {                   // Previous state (pottery bit waiting state)
-                P_SetMobjState(actor, actor->state - &states[0] - 1);
-                return;
-            }
-        }
-    }
-}
-
-//============================================================================
-//
-// A_CorpseBloodDrip
-//
-//============================================================================
-
-void A_CorpseBloodDrip(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_Random() > 128)
-    {
-        return;
-    }
-    P_SpawnMobj(actor->x, actor->y, actor->z + actor->height / 2,
-                MT_CORPSEBLOODDRIP);
-}
-
-//============================================================================
-//
-// A_CorpseExplode
-//
-//============================================================================
-
-void A_CorpseExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int i;
-
-    for (i = (P_Random() & 3) + 3; i; i--)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_CORPSEBIT);
-        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 3));
-        mo->momz = ((P_Random() & 7) + 5) * (3 * FRACUNIT / 4);
-        mo->momx = P_SubRandom() << (FRACBITS - 6);
-        mo->momy = P_SubRandom() << (FRACBITS - 6);
-    }
-    // Spawn a skull
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_CORPSEBIT);
-    P_SetMobjState(mo, S_CORPSEBIT_4);
-    if (mo)
-    {
-        mo->momz = ((P_Random() & 7) + 5) * (3 * FRACUNIT / 4);
-        mo->momx = P_SubRandom() << (FRACBITS - 6);
-        mo->momy = P_SubRandom() << (FRACBITS - 6);
-        S_StartSound(mo, SFX_FIRED_DEATH);
-    }
-    P_RemoveMobj(actor);
-}
-
-//============================================================================
-//
-// A_LeafSpawn
-//
-//============================================================================
-
-void A_LeafSpawn(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int i;
-
-    for (i = (P_Random() & 3) + 1; i; i--)
-    {
-        // Official release of Hexen's source code relies on unspecified behavior
-        // the in order of function's argument evaluation,
-        // see ISO-IEC 9899-1999, [6.5.2.2.10]
-        mobjtype_t type = MT_LEAF1 + (P_Random() & 1);
-        fixed_t z = actor->z + (P_Random() << 14);
-        fixed_t y = actor->y + (P_SubRandom() << 14);
-        fixed_t x = actor->x + (P_SubRandom() << 14);
-
-        mo = P_SpawnMobj(x, y, z, type);
-        if (mo)
-        {
-            P_ThrustMobj(mo, actor->angle, (P_Random() << 9) + 3 * FRACUNIT);
-            mo->target = actor;
-            mo->special1.i = 0;
-        }
-    }
-}
-
-//============================================================================
-//
-// A_LeafThrust
-//
-//============================================================================
-
-void A_LeafThrust(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_Random() > 96)
-    {
-        return;
-    }
-    actor->momz += (P_Random() << 9) + FRACUNIT;
-}
-
-//============================================================================
-//
-// A_LeafCheck
-//
-//============================================================================
-
-void A_LeafCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->special1.i++;
-    if (actor->special1.i >= 20)
-    {
-        P_SetMobjState(actor, S_NULL);
-        return;
-    }
-    if (P_Random() > 64)
-    {
-        if (!actor->momx && !actor->momy)
-        {
-            P_ThrustMobj(actor, actor->target->angle,
-                         (P_Random() << 9) + FRACUNIT);
-        }
-        return;
-    }
-    P_SetMobjState(actor, S_LEAF1_8);
-    actor->momz = (P_Random() << 9) + FRACUNIT;
-    P_ThrustMobj(actor, actor->target->angle,
-                 (P_Random() << 9) + 2 * FRACUNIT);
-    actor->flags |= MF_MISSILE;
-}
-
-/*
-#define ORBIT_RADIUS	(15*FRACUNIT)
-void GenerateOrbitTable(void)
-{
-	int angle;
-
-	for (angle=0; angle<256; angle++)
-	{
-		orbitTableX[angle] = FixedMul(ORBIT_RADIUS, finecosine[angle<<5]);
-		orbitTableY[angle] = FixedMul(ORBIT_RADIUS, finesine[angle<<5]);
-	}
-
-	printf("int orbitTableX[256]=\n{\n");
-	for (angle=0; angle<256; angle+=8)
-	{
-		printf("%d, %d, %d, %d, %d, %d, %d, %d,\n",
-			orbitTableX[angle],
-			orbitTableX[angle+1],
-			orbitTableX[angle+2],
-			orbitTableX[angle+3],
-			orbitTableX[angle+4],
-			orbitTableX[angle+5],
-			orbitTableX[angle+6],
-			orbitTableX[angle+7]);
-	}
-	printf("};\n\n");
-
-	printf("int orbitTableY[256]=\n{\n");
-	for (angle=0; angle<256; angle+=8)
-	{
-		printf("%d, %d, %d, %d, %d, %d, %d, %d,\n",
-			orbitTableY[angle],
-			orbitTableY[angle+1],
-			orbitTableY[angle+2],
-			orbitTableY[angle+3],
-			orbitTableY[angle+4],
-			orbitTableY[angle+5],
-			orbitTableY[angle+6],
-			orbitTableY[angle+7]);
-	}
-	printf("};\n");
-}
-*/
-
-// New bridge stuff
-//      Parent
-//              special1        true == removing from world
-//
-//      Child
-//              target          pointer to center mobj
-//              args[0]         angle of ball
-
-void A_BridgeOrbit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->target->special1.i)
-    {
-        P_SetMobjState(actor, S_NULL);
-    }
-    actor->args[0] += 3;
-    actor->x = actor->target->x + orbitTableX[actor->args[0]];
-    actor->y = actor->target->y + orbitTableY[actor->args[0]];
-    actor->z = actor->target->z;
-}
-
-
-void A_BridgeInit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    byte startangle;
-    mobj_t *ball1, *ball2, *ball3;
-    fixed_t cx, cy, cz;
-
-//      GenerateOrbitTable();
-
-    cx = actor->x;
-    cy = actor->y;
-    cz = actor->z;
-    startangle = P_Random();
-    actor->special1.i = 0;
-
-    // Spawn triad into world
-    ball1 = P_SpawnMobj(cx, cy, cz, MT_BRIDGEBALL);
-    ball1->args[0] = startangle;
-    ball1->target = actor;
-
-    ball2 = P_SpawnMobj(cx, cy, cz, MT_BRIDGEBALL);
-    ball2->args[0] = (startangle + 85) & 255;
-    ball2->target = actor;
-
-    ball3 = P_SpawnMobj(cx, cy, cz, MT_BRIDGEBALL);
-    ball3->args[0] = (startangle + 170) & 255;
-    ball3->target = actor;
-
-    A_BridgeOrbit(ball1, NULL, NULL);
-    A_BridgeOrbit(ball2, NULL, NULL);
-    A_BridgeOrbit(ball3, NULL, NULL);
-}
-
-void A_BridgeRemove(mobj_t * actor)
-{
-    actor->special1.i = true;     // Removing the bridge
-    actor->flags &= ~MF_SOLID;
-    P_SetMobjState(actor, S_FREE_BRIDGE1);
-}
-
-
-//==========================================================================
-//
-// A_GhostOn
-//
-//==========================================================================
-
-/*
-void A_GhostOn(mobj_t *actor)
-{
-	actor->flags |= MF_SHADOW;
-}
-*/
-
-//==========================================================================
-//
-// A_GhostOff
-//
-//==========================================================================
-
-/*
-void A_GhostOff(mobj_t *actor)
-{
-	actor->flags &= ~MF_SHADOW;
-}
-*/
-
-//==========================================================================
-//
-// A_HideThing
-//
-//==========================================================================
-
-void A_HideThing(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 |= MF2_DONTDRAW;
-}
-
-//==========================================================================
-//
-// A_UnHideThing
-//
-//==========================================================================
-
-void A_UnHideThing(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 &= ~MF2_DONTDRAW;
-}
-
-//==========================================================================
-//
-// A_SetShootable
-//
-//==========================================================================
-
-void A_SetShootable(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 &= ~MF2_NONSHOOTABLE;
-    actor->flags |= MF_SHOOTABLE;
-}
-
-//==========================================================================
-//
-// A_UnSetShootable
-//
-//==========================================================================
-
-void A_UnSetShootable(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 |= MF2_NONSHOOTABLE;
-    actor->flags &= ~MF_SHOOTABLE;
-}
-
-//==========================================================================
-//
-// A_SetAltShadow
-//
-//==========================================================================
-
-void A_SetAltShadow(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SHADOW;
-    actor->flags |= MF_ALTSHADOW;
-}
-
-//==========================================================================
-//
-// A_UnSetAltShadow
-//
-//==========================================================================
-
-/*
-void A_UnSetAltShadow(mobj_t *actor)
-{
-	actor->flags &= ~MF_ALTSHADOW;
-}
-*/
-
-//--------------------------------------------------------------------------
-//
-// Sound Action Routines
-//
-//--------------------------------------------------------------------------
-
-//==========================================================================
-//
-// A_ContMobjSound
-//
-//==========================================================================
-
-void A_ContMobjSound(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    switch (actor->type)
-    {
-        case MT_SERPENTFX:
-            S_StartSound(actor, SFX_SERPENTFX_CONTINUOUS);
-            break;
-        case MT_HAMMER_MISSILE:
-            S_StartSound(actor, SFX_FIGHTER_HAMMER_CONTINUOUS);
-            break;
-        case MT_QUAKE_FOCUS:
-            S_StartSound(actor, SFX_EARTHQUAKE);
-            break;
-        default:
-            break;
-    }
-}
-
-//==========================================================================
-//
-// PROC A_ESound
-//
-//==========================================================================
-
-void A_ESound(mobj_t *mo, player_t *player, pspdef_t *psp)
-{
-    int sound;
-
-    switch (mo->type)
-    {
-        case MT_SOUNDWIND:
-            sound = SFX_WIND;
-            break;
-        default:
-            sound = SFX_NONE;
-            break;
-    }
-    S_StartSound(mo, sound);
-}
-
-
-
-//==========================================================================
-// Summon Minotaur -- see p_enemy for variable descriptions
-//==========================================================================
-
-
-void A_Summon(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    mobj_t *master;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_MINOTAUR);
-    if (mo)
-    {
-        if (P_TestMobjLocation(mo) == false || !actor->special1.m)
-        {                       // Didn't fit - change back to artifact
-            P_SetMobjState(mo, S_NULL);
-            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SUMMONMAULATOR);
-            if (mo)
-                mo->flags2 |= MF2_DROPPED;
-            return;
-        }
-
-        // Store leveltime into mo->args. This must be stored in little-
-        // endian format for Vanilla savegame compatibility.
-        mo->args[0] = leveltime & 0xff;
-        mo->args[1] = (leveltime >> 8) & 0xff;
-        mo->args[2] = (leveltime >> 16) & 0xff;
-        mo->args[3] = (leveltime >> 24) & 0xff;
-        master = actor->special1.m;
-        if (master->flags & MF_CORPSE)
-        {                       // Master dead
-            mo->special1.m = NULL;   // No master
-        }
-        else
-        {
-            mo->special1.m = actor->special1.m;     // Pointer to master (mobj_t *)
-            P_GivePower(master->player, pw_minotaur);
-        }
-
-        // Make smoke puff
-        P_SpawnMobj(actor->x, actor->y, actor->z, MT_MNTRSMOKE);
-        S_StartSound(actor, SFX_MAULATOR_ACTIVE);
-    }
-}
-
-
-
-//==========================================================================
-// Fog Variables:
-//
-//              args[0]         Speed (0..10) of fog
-//              args[1]         Angle of spread (0..128)
-//              args[2]         Frequency of spawn (1..10)
-//              args[3]         Lifetime countdown
-//              args[4]         Boolean: fog moving?
-//              special1                Internal:  Counter for spawn frequency
-//              special2                Internal:  Index into floatbob table
-//
-//==========================================================================
-
-void A_FogSpawn(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo = NULL;
-    angle_t delta;
-
-    if (actor->special1.i-- > 0)
-        return;
-
-    actor->special1.i = actor->args[2];   // Reset frequency count
-
-    switch (P_Random() % 3)
-    {
-        case 0:
-            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FOGPATCHS);
-            break;
-        case 1:
-            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FOGPATCHM);
-            break;
-        case 2:
-            mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FOGPATCHL);
-            break;
-    }
-
-    if (mo)
-    {
-        delta = actor->args[1];
-        if (delta == 0)
-            delta = 1;
-        mo->angle =
-            actor->angle + (((P_Random() % delta) - (delta >> 1)) << 24);
-        mo->target = actor;
-        if (actor->args[0] < 1)
-            actor->args[0] = 1;
-        mo->args[0] = (P_Random() % (actor->args[0])) + 1;      // Random speed
-        mo->args[3] = actor->args[3];   // Set lifetime
-        mo->args[4] = 1;        // Set to moving
-        mo->special2.i = P_Random() & 63;
-    }
-}
-
-
-void A_FogMove(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int speed = actor->args[0] << FRACBITS;
-    angle_t angle;
-    int weaveindex;
-
-    if (!(actor->args[4]))
-        return;
-
-    if (actor->args[3]-- <= 0)
-    {
-        P_SetMobjStateNF(actor, actor->info->deathstate);
-        return;
-    }
-
-    if ((actor->args[3] % 4) == 0)
-    {
-        weaveindex = actor->special2.i;
-        actor->z += FloatBobOffsets[weaveindex] >> 1;
-        actor->special2.i = (weaveindex + 1) & 63;
-    }
-
-    angle = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(speed, finecosine[angle]);
-    actor->momy = FixedMul(speed, finesine[angle]);
-}
-
-//===========================================================================
-//
-// A_PoisonBagInit
-//
-//===========================================================================
-
-void A_PoisonBagInit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 28 * FRACUNIT,
-                     MT_POISONCLOUD);
-    if (!mo)
-    {
-        return;
-    }
-    mo->momx = 1;               // missile objects must move to impact other objects
-    mo->special1.i = 24 + (P_Random() & 7);
-    mo->special2.i = 0;
-    mo->target = actor->target;
-    mo->radius = 20 * FRACUNIT;
-    mo->height = 30 * FRACUNIT;
-    mo->flags &= ~MF_NOCLIP;
-}
-
-//===========================================================================
-//
-// A_PoisonBagCheck
-//
-//===========================================================================
-
-void A_PoisonBagCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!--actor->special1.i)
-    {
-        P_SetMobjState(actor, S_POISONCLOUD_X1);
-    }
-    else
-    {
-        return;
-    }
-}
-
-//===========================================================================
-//
-// A_PoisonBagDamage
-//
-//===========================================================================
-
-void A_PoisonBagDamage(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int bobIndex;
-
-    A_Explode(actor, player, psp);
-
-    bobIndex = actor->special2.i;
-    actor->z += FloatBobOffsets[bobIndex] >> 4;
-    actor->special2.i = (bobIndex + 1) & 63;
-}
-
-//===========================================================================
-//
-// A_PoisonShroom
-//
-//===========================================================================
-
-void A_PoisonShroom(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->tics = 128 + (P_Random() << 1);
-}
-
-//===========================================================================
-//
-// A_CheckThrowBomb
-//
-//===========================================================================
-
-void A_CheckThrowBomb(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (abs(actor->momx) < 1.5 * FRACUNIT && abs(actor->momy) < 1.5 * FRACUNIT
-        && actor->momz < 2 * FRACUNIT
-        && actor->state == &states[S_THROWINGBOMB6])
-    {
-        P_SetMobjState(actor, S_THROWINGBOMB7);
-        actor->z = actor->floorz;
-        actor->momz = 0;
-        actor->flags2 &= ~MF2_FLOORBOUNCE;
-        actor->flags &= ~MF_MISSILE;
-    }
-    if (!--actor->health)
-    {
-        P_SetMobjState(actor, actor->info->deathstate);
-    }
-}
-
-//===========================================================================
-// Quake variables
-//
-//              args[0]         Intensity on richter scale (2..9)
-//              args[1]         Duration in tics
-//              args[2]         Radius for damage
-//              args[3]         Radius for tremor
-//              args[4]         TID of map thing for focus of quake
-//
-//===========================================================================
-
-//===========================================================================
-//
-// A_LocalQuake
-//
-//===========================================================================
-
-boolean A_LocalQuake(byte * args, mobj_t * actor)
-{
-    mobj_t *focus, *target;
-    int lastfound = 0;
-    int success = false;
-
-    // Find all quake foci
-    do
-    {
-        target = P_FindMobjFromTID(args[4], &lastfound);
-        if (target)
-        {
-            focus = P_SpawnMobj(target->x,
-                                target->y, target->z, MT_QUAKE_FOCUS);
-            if (focus)
-            {
-                focus->args[0] = args[0];
-                focus->args[1] = args[1] >> 1;  // decremented every 2 tics
-                focus->args[2] = args[2];
-                focus->args[3] = args[3];
-                focus->args[4] = args[4];
-                success = true;
-            }
-        }
-    }
-    while (target != NULL);
-
-    return (success);
-}
-
-
-//===========================================================================
-//
-// A_Quake
-//
-//===========================================================================
-int localQuakeHappening[MAXPLAYERS];
-
-void A_Quake(mobj_t *actor, player_t *player_param, pspdef_t *psp)
-{
-    angle_t an;
-    player_t *player;
-    mobj_t *victim;
-    int richters = actor->args[0];
-    int playnum;
-    fixed_t dist;
-
-    if (actor->args[1]-- > 0)
-    {
-        for (playnum = 0; playnum < maxplayers; playnum++)
-        {
-            player = &players[playnum];
-            if (!playeringame[playnum])
-                continue;
-
-            victim = player->mo;
-            dist = P_AproxDistance(actor->x - victim->x,
-                                   actor->y - victim->y) >> (FRACBITS + 6);
-            // Tested in tile units (64 pixels)
-            if (dist < actor->args[3])  // In tremor radius
-            {
-                localQuakeHappening[playnum] = richters;
-            }
-            // Check if in damage radius
-            if ((dist < actor->args[2]) && (victim->z <= victim->floorz))
-            {
-                if (P_Random() < 50)
-                {
-                    P_DamageMobj(victim, NULL, NULL, HITDICE(1));
-                }
-                // Thrust player around
-                an = victim->angle + ANG1 * P_Random();
-                P_ThrustMobj(victim, an, richters << (FRACBITS - 1));
-            }
-        }
-    }
-    else
-    {
-        for (playnum = 0; playnum < maxplayers; playnum++)
-        {
-            localQuakeHappening[playnum] = false;
-        }
-        P_SetMobjState(actor, S_NULL);
-    }
-}
-
-
-
-
-//===========================================================================
-//
-// Teleport other stuff
-//
-//===========================================================================
-
-#define TELEPORT_LIFE 1
-
-void A_TeloSpawnA(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX2);
-    if (mo)
-    {
-        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
-        mo->angle = actor->angle;
-        mo->target = actor->target;
-        mo->momx = actor->momx >> 1;
-        mo->momy = actor->momy >> 1;
-        mo->momz = actor->momz >> 1;
-    }
-}
-
-void A_TeloSpawnB(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX3);
-    if (mo)
-    {
-        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
-        mo->angle = actor->angle;
-        mo->target = actor->target;
-        mo->momx = actor->momx >> 1;
-        mo->momy = actor->momy >> 1;
-        mo->momz = actor->momz >> 1;
-    }
-}
-
-void A_TeloSpawnC(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX4);
-    if (mo)
-    {
-        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
-        mo->angle = actor->angle;
-        mo->target = actor->target;
-        mo->momx = actor->momx >> 1;
-        mo->momy = actor->momy >> 1;
-        mo->momz = actor->momz >> 1;
-    }
-}
-
-void A_TeloSpawnD(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_TELOTHER_FX5);
-    if (mo)
-    {
-        mo->special1.i = TELEPORT_LIFE;   // Lifetime countdown
-        mo->angle = actor->angle;
-        mo->target = actor->target;
-        mo->momx = actor->momx >> 1;
-        mo->momy = actor->momy >> 1;
-        mo->momz = actor->momz >> 1;
-    }
-}
-
-void A_CheckTeleRing(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special1.i-- <= 0)
-    {
-        P_SetMobjState(actor, actor->info->deathstate);
-    }
-}
-
-
-
-
-// Dirt stuff
-
-void P_SpawnDirt(mobj_t * actor, fixed_t radius)
-{
-    fixed_t x, y, z;
-    int dtype = 0;
-    mobj_t *mo;
-    angle_t angle;
-
-    angle = P_Random() << 5;    // <<24 >>19
-    x = actor->x + FixedMul(radius, finecosine[angle]);
-    y = actor->y + FixedMul(radius, finesine[angle]);
-//      x = actor->x + (P_SubRandom()%radius)<<FRACBITS;
-//      y = actor->y + ((P_SubRandom()<<FRACBITS)%radius);
-    z = actor->z + (P_Random() << 9) + FRACUNIT;
-    switch (P_Random() % 6)
-    {
-        case 0:
-            dtype = MT_DIRT1;
-            break;
-        case 1:
-            dtype = MT_DIRT2;
-            break;
-        case 2:
-            dtype = MT_DIRT3;
-            break;
-        case 3:
-            dtype = MT_DIRT4;
-            break;
-        case 4:
-            dtype = MT_DIRT5;
-            break;
-        case 5:
-            dtype = MT_DIRT6;
-            break;
-    }
-    mo = P_SpawnMobj(x, y, z, dtype);
-    if (mo)
-    {
-        mo->momz = P_Random() << 10;
-    }
-}
-
-
-
-
-//===========================================================================
-//
-// Thrust floor stuff
-//
-// Thrust Spike Variables
-//              special1                pointer to dirt clump mobj
-//              special2                speed of raise
-//              args[0]         0 = lowered,  1 = raised
-//              args[1]         0 = normal,   1 = bloody
-//===========================================================================
-
-void A_ThrustInitUp(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->special2.i = 5;        // Raise speed
-    actor->args[0] = 1;         // Mark as up
-    actor->floorclip = 0;
-    actor->flags = MF_SOLID;
-    actor->flags2 = MF2_NOTELEPORT | MF2_FLOORCLIP;
-    actor->special1.m = NULL;
-}
-
-void A_ThrustInitDn(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    actor->special2.i = 5;        // Raise speed
-    actor->args[0] = 0;         // Mark as down
-    actor->floorclip = actor->info->height;
-    actor->flags = 0;
-    actor->flags2 = MF2_NOTELEPORT | MF2_FLOORCLIP | MF2_DONTDRAW;
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_DIRTCLUMP);
-    actor->special1.m = mo;
-}
-
-
-void A_ThrustRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (A_RaiseMobj(actor))
-    {                           // Reached it's target height
-        actor->args[0] = 1;
-        if (actor->args[1])
-            P_SetMobjStateNF(actor, S_BTHRUSTINIT2_1);
-        else
-            P_SetMobjStateNF(actor, S_THRUSTINIT2_1);
-    }
-
-    // Lose the dirt clump
-    if ((actor->floorclip < actor->height) && actor->special1.m)
-    {
-        P_RemoveMobj(actor->special1.m);
-        actor->special1.m = NULL;
-    }
-
-    // Spawn some dirt
-    if (P_Random() < 40)
-        P_SpawnDirt(actor, actor->radius);
-    actor->special2.i++;          // Increase raise speed
-}
-
-void A_ThrustLower(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (A_SinkMobj(actor))
-    {
-        actor->args[0] = 0;
-        if (actor->args[1])
-            P_SetMobjStateNF(actor, S_BTHRUSTINIT1_1);
-        else
-            P_SetMobjStateNF(actor, S_THRUSTINIT1_1);
-    }
-}
-
-void A_ThrustBlock(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags |= MF_SOLID;
-}
-
-void A_ThrustImpale(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    // Impale all shootables in radius
-    PIT_ThrustSpike(actor);
-}
-
-//===========================================================================
-//
-// A_SoAExplode - Suit of Armor Explode
-//
-//===========================================================================
-
-void A_SoAExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int i;
-    int r1,r2,r3;
-
-    for (i = 0; i < 10; i++)
-    {
-        r1 = P_Random();
-        r2 = P_Random();
-        r3 = P_Random();
-        mo = P_SpawnMobj(actor->x + ((r3 - 128) << 12),
-                         actor->y + ((r2 - 128) << 12),
-                         actor->z + (r1 * actor->height / 256),
-                         MT_ZARMORCHUNK);
-        P_SetMobjState(mo, mo->info->spawnstate + i);
-        mo->momz = ((P_Random() & 7) + 5) * FRACUNIT;
-        mo->momx = P_SubRandom() << (FRACBITS - 6);
-        mo->momy = P_SubRandom() << (FRACBITS - 6);
-    }
-    if (actor->args[0])
-    {                           // Spawn an item
-        if ((gameversion != exe_hexen_1_1r2) || !nomonsters
-            || !(mobjinfo[TranslateThingType[actor->args[0]]].
-                 flags & MF_COUNTKILL))
-        {                       // Only spawn monsters if not -nomonsters
-            P_SpawnMobj(actor->x, actor->y, actor->z,
-                        TranslateThingType[actor->args[0]]);
-        }
-    }
-    S_StartSound(mo, SFX_SUITOFARMOR_BREAK);
-    P_RemoveMobj(actor);
-}
-
-//===========================================================================
-//
-// A_BellReset1
-//
-//===========================================================================
-
-void A_BellReset1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags |= MF_NOGRAVITY;
-    actor->height <<= 2;
-}
-
-//===========================================================================
-//
-// A_BellReset2
-//
-//===========================================================================
-
-void A_BellReset2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags |= MF_SHOOTABLE;
-    actor->flags &= ~MF_CORPSE;
-    actor->health = 5;
-}
-
-
-//===========================================================================
-//
-// A_FlameCheck
-//
-//===========================================================================
-
-void A_FlameCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->args[0]--)      // Called every 8 tics
-    {
-        P_SetMobjState(actor, S_NULL);
-    }
-}
-
-
-//===========================================================================
-// Bat Spawner Variables
-//      special1        frequency counter
-//      special2        
-//      args[0]         frequency of spawn (1=fastest, 10=slowest)
-//      args[1]         spread angle (0..255)
-//      args[2]         
-//      args[3]         duration of bats (in octics)
-//      args[4]         turn amount per move (in degrees)
-//
-// Bat Variables
-//      special2        lifetime counter
-//      args[4]         turn amount per move (in degrees)
-//===========================================================================
-
-void A_BatSpawnInit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->special1.i = 0;        // Frequency count
-}
-
-void A_BatSpawn(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int delta;
-    angle_t angle;
-
-    // Countdown until next spawn
-    if (actor->special1.i-- > 0)
-        return;
-    actor->special1.i = actor->args[0];   // Reset frequency count
-
-    delta = actor->args[1];
-    if (delta == 0)
-        delta = 1;
-    angle = actor->angle + (((P_Random() % delta) - (delta >> 1)) << 24);
-    mo = P_SpawnMissileAngle(actor, MT_BAT, angle, 0);
-    if (mo)
-    {
-        mo->args[0] = P_Random() & 63;  // floatbob index
-        mo->args[4] = actor->args[4];   // turn degrees
-        mo->special2.i = actor->args[3] << 3;     // Set lifetime
-        mo->target = actor;
-    }
-}
-
-
-void A_BatMove(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t newangle;
-    fixed_t speed;
-
-    if (actor->special2.i < 0)
-    {
-        P_SetMobjState(actor, actor->info->deathstate);
-    }
-    actor->special2.i -= 2;       // Called every 2 tics
-
-    if (P_Random() < 128)
-    {
-        newangle = actor->angle + ANG1 * actor->args[4];
-    }
-    else
-    {
-        newangle = actor->angle - ANG1 * actor->args[4];
-    }
-
-    // Adjust momentum vector to new direction
-    newangle >>= ANGLETOFINESHIFT;
-    speed = FixedMul(actor->info->speed, P_Random() << 10);
-    actor->momx = FixedMul(speed, finecosine[newangle]);
-    actor->momy = FixedMul(speed, finesine[newangle]);
-
-    if (P_Random() < 15)
-        S_StartSound(actor, SFX_BAT_SCREAM);
-
-    // Handle Z movement
-    actor->z = actor->target->z + 2 * FloatBobOffsets[actor->args[0]];
-    actor->args[0] = (actor->args[0] + 3) & 63;
-}
-
-//===========================================================================
-//
-// A_TreeDeath
-//
-//===========================================================================
-
-void A_TreeDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!(actor->flags2 & MF2_FIREDAMAGE))
-    {
-        actor->height <<= 2;
-        actor->flags |= MF_SHOOTABLE;
-        actor->flags &= ~(MF_CORPSE + MF_DROPOFF);
-        actor->health = 35;
-        return;
-    }
-    else
-    {
-        P_SetMobjState(actor, actor->info->meleestate);
-    }
-}
-
-//===========================================================================
-//
-// A_NoGravity
-//
-//===========================================================================
-
-void A_NoGravity(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags |= MF_NOGRAVITY;
-}
diff --git a/games/NXDoom/src/hexen/am_data.h b/games/NXDoom/src/hexen/am_data.h
deleted file mode 100644
index 26589a25c..000000000
--- a/games/NXDoom/src/hexen/am_data.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef __AMDATA_H__
-#define __AMDATA_H__
-
-// a line drawing of the player pointing right, starting from the middle.
-
-#define R ((8*PLAYERRADIUS)/7)
-
-mline_t player_arrow[] = {
-  { { -R+R/4, 0 }, { 0, 0} }, // center line.
-  { { -R+R/4, R/8 }, { R, 0} }, // blade
-  { { -R+R/4, -R/8 }, { R, 0 } },
-  { { -R+R/4, -R/4 }, { -R+R/4, R/4 } }, // crosspiece
-  { { -R+R/8, -R/4 }, { -R+R/8, R/4 } },
-  { { -R+R/8, -R/4 }, { -R+R/4, -R/4} }, //crosspiece connectors
-  { { -R+R/8, R/4 }, { -R+R/4, R/4} },
-  { { -R-R/4, R/8 }, { -R-R/4, -R/8 } }, //pommel
-  { { -R-R/4, R/8 }, { -R+R/8, R/8 } },
-  { { -R-R/4, -R/8}, { -R+R/8, -R/8 } }
-  };
-
-/*
-mline_t keysquare[] = {
-	{ { 0, 0 }, { R/4, -R/2 } },
-	{ { R/4, -R/2 }, { R/2, -R/2 } },
-	{ { R/2, -R/2 }, { R/2, R/2 } },
-	{ { R/2, R/2 }, { R/4, R/2 } },
-	{ { R/4, R/2 }, { 0, 0 } }, // handle part type thing
-	{ { 0, 0 }, { -R, 0 } }, // stem
-	{ { -R, 0 }, { -R, -R/2 } }, // end lockpick part
-	{ { -3*R/4, 0 }, { -3*R/4, -R/4 } }
-	};
-*/
-
-/*mline_t player_arrow[] = {
-  { { -R+R/8, 0 }, { R, 0 } }, // -----
-  { { R, 0 }, { R-R/2, R/4 } },  // ----->
-  { { R, 0 }, { R-R/2, -R/4 } },
-  { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
-  { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
-  { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
-  { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
-  };
-*/
-#undef R
-#define NUMPLYRLINES (sizeof(player_arrow)/sizeof(mline_t))
-#define NUMKEYSQUARELINES (sizeof(keysquare)/sizeof(mline_t))
-
-/*
-#define R ((8*PLAYERRADIUS)/7)
-mline_t cheat_player_arrow[] = {
-  { { -R+R/8, 0 }, { R, 0 } }, // -----
-  { { R, 0 }, { R-R/2, R/6 } },  // ----->
-  { { R, 0 }, { R-R/2, -R/6 } },
-  { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
-  { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
-  { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
-  { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
-  { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
-  { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
-  { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
-  { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
-  { { -R/6, -R/6 }, { 0, -R/6 } },
-  { { 0, -R/6 }, { 0, R/4 } },
-  { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
-  { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
-  { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
-  };
-#undef R
-#define NUMCHEATPLYRLINES (sizeof(cheat_player_arrow)/sizeof(mline_t))
-*/
-
-
-/*
-#define R (FRACUNIT)
-mline_t triangle_guy[] = {
-  { { -.867*R, -.5*R }, { .867*R, -.5*R } },
-  { { .867*R, -.5*R } , { 0, R } },
-  { { 0, R }, { -.867*R, -.5*R } }
-  };
-#undef R
-#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
-*/
-
-#define R (FRACUNIT)
-mline_t thintriangle_guy[] = {
-  { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
-  { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
-  { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
-  };
-#undef R
-#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
-
-#endif
diff --git a/games/NXDoom/src/hexen/am_map.c b/games/NXDoom/src/hexen/am_map.c
deleted file mode 100644
index 34985dc5d..000000000
--- a/games/NXDoom/src/hexen/am_map.c
+++ /dev/null
@@ -1,1544 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-
-#include "h2def.h"
-#include "doomkeys.h"
-#include "i_video.h"
-#include "i_swap.h"
-#include "i_timer.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "am_map.h"
-#include "am_data.h"
-#include "v_video.h"
-
-#define NUMALIAS 3              // Number of antialiased lines.
-
-int cheating = 0;
-static int grid = 0;
-
-boolean automapactive = false;
-static int finit_width = SCREENWIDTH;
-static int finit_height = SCREENHEIGHT - SBARHEIGHT - 3;
-static int f_x, f_y;            // location of window on screen
-static int f_w, f_h;            // size of window on screen
-static int lightlev;            // used for funky strobing effect
-static byte *fb;                // pseudo-frame buffer
-static int amclock;
-
-static mpoint_t m_paninc;       // how far the window pans each tic (map coords)
-static fixed_t mtof_zoommul;    // how far the window zooms in each tic (map coords)
-static fixed_t ftom_zoommul;    // how far the window zooms in each tic (fb coords)
-
-static fixed_t m_x, m_y;        // LL x,y where the window is on the map (map coords)
-static fixed_t m_x2, m_y2;      // UR x,y where the window is on the map (map coords)
-
-// width/height of window on map (map coords)
-static fixed_t m_w, m_h;
-static fixed_t min_x, min_y;    // based on level size
-static fixed_t max_x, max_y;    // based on level size
-static fixed_t max_w, max_h;    // max_x-min_x, max_y-min_y
-static fixed_t min_w, min_h;    // based on player size
-static fixed_t min_scale_mtof;  // used to tell when to stop zooming out
-static fixed_t max_scale_mtof;  // used to tell when to stop zooming in
-
-// old stuff for recovery later
-static fixed_t old_m_w, old_m_h;
-static fixed_t old_m_x, old_m_y;
-
-// old location used by the Follower routine
-static mpoint_t f_oldloc;
-
-// used by MTOF to scale from map-to-frame-buffer coords
-static fixed_t scale_mtof = INITSCALEMTOF;
-// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
-static fixed_t scale_ftom;
-
-static player_t *plr;           // the player represented by an arrow
-static vertex_t oldplr;
-
-//static patch_t *marknums[10]; // numbers used for marking by the automap
-//static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
-//static int markpointnum = 0; // next point to be assigned
-
-static int followplayer = 1;    // specifies whether to follow the player around
-
-static char cheat_kills[] = { 'k', 'i', 'l', 'l', 's' };
-static boolean ShowKills = 0;
-static unsigned ShowKillsCount = 0;
-
-static byte antialias[NUMALIAS][8] = {
-    {83, 84, 85, 86, 87, 88, 89, 90},
-    {96, 96, 95, 94, 93, 92, 91, 90},
-    {107, 108, 109, 110, 111, 112, 89, 90}
-};
-
-/*
-static byte *aliasmax[NUMALIAS] = {
-	&antialias[0][7], &antialias[1][7], &antialias[2][7]
-};*/
-
-static byte *maplump;           // pointer to the raw data for the automap background.
-static short mapystart = 0;     // y-value for the start of the map bitmap...used in
-                                                                                //the parallax stuff.
-static short mapxstart = 0;     //x-value for the bitmap.
-
-//byte screens[][SCREENWIDTH*SCREENHEIGHT];
-//void V_MarkRect (int x, int y, int width, int height);
-
-// Functions
-
-void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
-                int NumLevels, unsigned short IntensityBits);
-
-void AM_DrawDeathmatchStats(void);
-static void DrawWorldTimer(void);
-
-// Calculates the slope and slope according to the x-axis of a line
-// segment in map coordinates (with the upright y-axis n' all) so
-// that it can be used with the brain-dead drawing stuff.
-
-// Ripped out for Heretic
-/*
-void AM_getIslope(mline_t *ml, islope_t *is)
-{
-  int dx, dy;
-
-  dy = ml->a.y - ml->b.y;
-  dx = ml->b.x - ml->a.x;
-  if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
-  else is->islp = FixedDiv(dx, dy);
-  if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
-  else is->slp = FixedDiv(dy, dx);
-}
-*/
-
-void AM_activateNewScale(void)
-{
-    m_x += m_w / 2;
-    m_y += m_h / 2;
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-    m_x -= m_w / 2;
-    m_y -= m_h / 2;
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-}
-
-void AM_saveScaleAndLoc(void)
-{
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
-}
-
-void AM_restoreScaleAndLoc(void)
-{
-
-    m_w = old_m_w;
-    m_h = old_m_h;
-    if (!followplayer)
-    {
-        m_x = old_m_x;
-        m_y = old_m_y;
-    }
-    else
-    {
-        m_x = plr->mo->x - m_w / 2;
-        m_y = plr->mo->y - m_h / 2;
-    }
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-
-    // Change the scaling multipliers
-    scale_mtof = FixedDiv(f_w << FRACBITS, m_w);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-// adds a marker at the current location
-
-/*
-void AM_addMark(void)
-{
-  markpoints[markpointnum].x = m_x + m_w/2;
-  markpoints[markpointnum].y = m_y + m_h/2;
-  markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
-
-}
-*/
-void AM_findMinMaxBoundaries(void)
-{
-    int i;
-    fixed_t a, b;
-
-    min_x = min_y = INT_MAX;
-    max_x = max_y = -INT_MAX;
-    for (i = 0; i < numvertexes; i++)
-    {
-        if (vertexes[i].x < min_x)
-            min_x = vertexes[i].x;
-        else if (vertexes[i].x > max_x)
-            max_x = vertexes[i].x;
-        if (vertexes[i].y < min_y)
-            min_y = vertexes[i].y;
-        else if (vertexes[i].y > max_y)
-            max_y = vertexes[i].y;
-    }
-    max_w = max_x - min_x;
-    max_h = max_y - min_y;
-    min_w = 2 * PLAYERRADIUS;
-    min_h = 2 * PLAYERRADIUS;
-
-    a = FixedDiv(f_w << FRACBITS, max_w);
-    b = FixedDiv(f_h << FRACBITS, max_h);
-    min_scale_mtof = a < b ? a : b;
-
-    max_scale_mtof = FixedDiv(f_h << FRACBITS, 2 * PLAYERRADIUS);
-
-}
-
-void AM_changeWindowLoc(void)
-{
-    if (m_paninc.x || m_paninc.y)
-    {
-        followplayer = 0;
-        f_oldloc.x = INT_MAX;
-    }
-
-    m_x += m_paninc.x;
-    m_y += m_paninc.y;
-
-    if (m_x + m_w / 2 > max_x)
-    {
-        m_x = max_x - m_w / 2;
-        m_paninc.x = 0;
-    }
-    else if (m_x + m_w / 2 < min_x)
-    {
-        m_x = min_x - m_w / 2;
-        m_paninc.x = 0;
-    }
-    if (m_y + m_h / 2 > max_y)
-    {
-        m_y = max_y - m_h / 2;
-        m_paninc.y = 0;
-    }
-    else if (m_y + m_h / 2 < min_y)
-    {
-        m_y = min_y - m_h / 2;
-        m_paninc.y = 0;
-    }
-
-    // The following code was commented out in the released Hexen source,
-    // but I believe we need to do this here to stop the background moving
-    // when we reach the map boundaries. (In the released source it's done
-    // in AM_clearFB).
-    mapxstart += MTOF(m_paninc.x+FRACUNIT/2);
-    mapystart -= MTOF(m_paninc.y+FRACUNIT/2);
-    if(mapxstart >= finit_width)
-        mapxstart -= finit_width;
-    if(mapxstart < 0)
-        mapxstart += finit_width;
-    if(mapystart >= finit_height)
-        mapystart -= finit_height;
-    if(mapystart < 0)
-        mapystart += finit_height;
-    // - end of code that was commented-out
-
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-}
-
-void AM_initVariables(void)
-{
-    int pnum;
-    thinker_t *think;
-
-    //static event_t st_notify = { ev_keyup, AM_MSGENTERED };
-
-    automapactive = true;
-    fb = I_VideoBuffer;
-
-    f_oldloc.x = INT_MAX;
-    amclock = 0;
-    lightlev = 0;
-
-    m_paninc.x = m_paninc.y = 0;
-    ftom_zoommul = FRACUNIT;
-    mtof_zoommul = FRACUNIT;
-
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-
-    // find player to center on initially
-    if (!playeringame[pnum = consoleplayer])
-        for (pnum = 0; pnum < maxplayers; pnum++)
-            if (playeringame[pnum])
-                break;
-    plr = &players[pnum];
-    oldplr.x = plr->mo->x;
-    oldplr.y = plr->mo->y;
-    m_x = plr->mo->x - m_w / 2;
-    m_y = plr->mo->y - m_h / 2;
-    AM_changeWindowLoc();
-
-    // for saving & restoring
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
-
-    // load in the location of keys, if in baby mode
-
-//      memset(KeyPoints, 0, sizeof(vertex_t)*3);
-    if (gameskill == sk_baby)
-    {
-        for (think = thinkercap.next; think != &thinkercap;
-             think = think->next)
-        {
-            if (think->function != P_MobjThinker)
-            {                   //not a mobj
-                continue;
-            }
-        }
-    }
-
-    // inform the status bar of the change
-//c  ST_Responder(&st_notify);
-}
-
-void AM_loadPics(void)
-{
-    maplump = W_CacheLumpName("AUTOPAGE", PU_STATIC);
-}
-
-
-/*
-void AM_clearMarks(void)
-{
-  int i;
-  for (i=0;i<AM_NUMMARKPOINTS;i++) markpoints[i].x = -1; // means empty
-  markpointnum = 0;
-}
-*/
-
-// should be called at the start of every level
-// right now, i figure it out myself
-
-void AM_LevelInit(void)
-{
-    f_x = f_y = 0;
-    f_w = finit_width;
-    f_h = finit_height;
-    mapxstart = mapystart = 0;
-
-
-//  AM_clearMarks();
-
-    AM_findMinMaxBoundaries();
-    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7 * FRACUNIT));
-    if (scale_mtof > max_scale_mtof)
-        scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-static boolean stopped = true;
-
-void AM_Stop(void)
-{
-    //static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
-
-//  AM_unloadPics();
-    automapactive = false;
-//  ST_Responder(&st_notify);
-    stopped = true;
-    BorderNeedRefresh = true;
-}
-
-void AM_Start(void)
-{
-    static int lastlevel = -1, lastepisode = -1;
-
-    if (!stopped)
-        AM_Stop();
-    stopped = false;
-    if (gamestate != GS_LEVEL)
-    {
-        return;                 // don't show automap if we aren't in a game!
-    }
-    if (lastlevel != gamemap || lastepisode != gameepisode)
-    {
-        AM_LevelInit();
-        lastlevel = gamemap;
-        lastepisode = gameepisode;
-    }
-    AM_initVariables();
-    AM_loadPics();
-}
-
-// set the window scale to the maximum size
-
-void AM_minOutWindowScale(void)
-{
-    scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-// set the window scale to the minimum size
-
-void AM_maxOutWindowScale(void)
-{
-    scale_mtof = max_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-boolean AM_Responder(event_t * ev)
-{
-    int rc;
-    int key;
-    static int bigstate = 0;
-    static int joywait = 0;
-
-    key = ev->data1;
-
-    if (ev->type == ev_joystick && joybautomap >= 0
-        && (ev->data1 & (1 << joybautomap)) != 0 && joywait < I_GetTime())
-    {
-        joywait = I_GetTime() + 5;
-
-        if (!automapactive)
-        {
-            AM_Start ();
-            SB_state = -1;
-            viewactive = false;
-        }
-        else
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop ();
-            SB_state = -1;
-        }
-
-        return true;
-    }
-
-
-    rc = false;
-    if (!automapactive)
-    {
-        if (ev->type == ev_keydown && key == key_map_toggle
-            && gamestate == GS_LEVEL)
-        {
-            AM_Start();
-            SB_state = -1;
-            viewactive = false;
-            rc = true;
-        }
-    }
-    else if (ev->type == ev_keydown)
-    {
-        rc = true;
-
-        if (key == key_map_east)                 // pan right
-        {
-            if (!followplayer)
-                m_paninc.x = FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_west)                   // pan left
-        {
-            if (!followplayer)
-                m_paninc.x = -FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_north)             // pan up
-        {
-            if (!followplayer)
-                m_paninc.y = FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_south)                   // pan down
-        {
-            if (!followplayer)
-                m_paninc.y = -FTOM(F_PANINC);
-            else
-                rc = false;
-        }
-        else if (key == key_map_zoomout)                   // zoom out
-        {
-            mtof_zoommul = M_ZOOMOUT;
-            ftom_zoommul = M_ZOOMIN;
-        }
-        else if (key == key_map_zoomin)            // zoom in
-        {
-            mtof_zoommul = M_ZOOMIN;
-            ftom_zoommul = M_ZOOMOUT;
-        }
-        else if (key == key_map_toggle)
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop();
-            SB_state = -1;
-        }
-        else if (key == key_map_maxzoom)
-        {
-            bigstate = !bigstate;
-            if (bigstate)
-            {
-                AM_saveScaleAndLoc();
-                AM_minOutWindowScale();
-            }
-            else
-                AM_restoreScaleAndLoc();
-        }
-        else if (key == key_map_follow)
-        {
-            followplayer = !followplayer;
-            f_oldloc.x = INT_MAX;
-            P_SetMessage(plr,
-                         followplayer ? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF,
-                         true);
-        }
-        else
-        {
-            rc = false;
-        }
-
-        if (cheat_kills[ShowKillsCount] == ev->data1 && netgame && deathmatch)
-        {
-            ShowKillsCount++;
-            if (ShowKillsCount == 5)
-            {
-                ShowKillsCount = 0;
-                rc = false;
-                ShowKills ^= 1;
-            }
-        }
-        else
-        {
-            ShowKillsCount = 0;
-        }
-    }
-    else if (ev->type == ev_keyup)
-    {
-        rc = false;
-
-        if (key == key_map_east)
-        {
-            if (!followplayer)
-                m_paninc.x = 0;
-        }
-        else if (key == key_map_west)
-        {
-            if (!followplayer)
-                m_paninc.x = 0;
-        }
-        else if (key == key_map_north)
-        {
-            if (!followplayer)
-                m_paninc.y = 0;
-        }
-        else if (key == key_map_south)
-        {
-            if (!followplayer)
-                m_paninc.y = 0;
-        }
-        else if (key == key_map_zoomin || key == key_map_zoomout)
-        {
-            mtof_zoommul = FRACUNIT;
-            ftom_zoommul = FRACUNIT;
-        }
-    }
-    return rc;
-}
-
-void AM_changeWindowScale(void)
-{
-
-    // Change the scaling multipliers
-    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-
-    if (scale_mtof < min_scale_mtof)
-        AM_minOutWindowScale();
-    else if (scale_mtof > max_scale_mtof)
-        AM_maxOutWindowScale();
-    else
-        AM_activateNewScale();
-}
-
-void AM_doFollowPlayer(void)
-{
-    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
-    {
-//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
-//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
-//  m_x = plr->mo->x - m_w/2;
-//  m_y = plr->mo->y - m_h/2;
-        m_x = FTOM(MTOF(plr->mo->x)) - m_w / 2;
-        m_y = FTOM(MTOF(plr->mo->y)) - m_h / 2;
-        m_x2 = m_x + m_w;
-        m_y2 = m_y + m_h;
-
-        // do the parallax parchment scrolling.
-/*
-	 dmapx = (MTOF(plr->mo->x)-MTOF(f_oldloc.x)); //fixed point
-	 dmapy = (MTOF(f_oldloc.y)-MTOF(plr->mo->y));
-
-	 if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
-		dmapx=0;  //goes into the automap.
-	 mapxstart += dmapx;
-	 mapystart += dmapy;
-
-  	 while(mapxstart >= finit_width)
-			mapxstart -= finit_width;
-    while(mapxstart < 0)
-			mapxstart += finit_width;
-    while(mapystart >= finit_height)
-			mapystart -= finit_height;
-    while(mapystart < 0)
-			mapystart += finit_height;
-*/
-        f_oldloc.x = plr->mo->x;
-        f_oldloc.y = plr->mo->y;
-    }
-}
-
-// Ripped out for Heretic
-/*
-void AM_updateLightLev(void)
-{
-  static nexttic = 0;
-//static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
-  static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
-  static int litelevelscnt = 0;
-
-  // Change light level
-  if (amclock>nexttic)
-  {
-    lightlev = litelevels[litelevelscnt++];
-    if (litelevelscnt == sizeof(litelevels)/sizeof(int)) litelevelscnt = 0;
-    nexttic = amclock + 6 - (amclock % 6);
-  }
-}
-*/
-
-void AM_Ticker(void)
-{
-
-    if (!automapactive)
-        return;
-
-    amclock++;
-
-    if (followplayer)
-        AM_doFollowPlayer();
-
-    // Change the zoom if necessary
-    if (ftom_zoommul != FRACUNIT)
-        AM_changeWindowScale();
-
-    // Change x,y location
-    if (m_paninc.x || m_paninc.y)
-        AM_changeWindowLoc();
-    // Update light level
-// AM_updateLightLev();
-
-}
-
-void AM_clearFB(int color)
-{
-    int i, j;
-    int dmapx;
-    int dmapy;
-
-    if (followplayer)
-    {
-        dmapx = (MTOF(plr->mo->x) - MTOF(oldplr.x));    //fixed point
-        dmapy = (MTOF(oldplr.y) - MTOF(plr->mo->y));
-
-        oldplr.x = plr->mo->x;
-        oldplr.y = plr->mo->y;
-//              if(f_oldloc.x == INT_MAX) //to eliminate an error when the user first
-//                      dmapx=0;  //goes into the automap.
-        mapxstart += dmapx >> 1;
-        mapystart += dmapy >> 1;
-
-        while (mapxstart >= finit_width)
-            mapxstart -= finit_width;
-        while (mapxstart < 0)
-            mapxstart += finit_width;
-        while (mapystart >= finit_height)
-            mapystart -= finit_height;
-        while (mapystart < 0)
-            mapystart += finit_height;
-    }
-    else
-    {
-        // The released Hexen source does this here, but this causes a bug
-        // where the map background keeps moving when we reach the map
-        // boundaries. This is instead done in AM_changeWindowLoc.
-        /*
-        mapxstart += (MTOF(m_paninc.x) >> 1);
-        mapystart -= (MTOF(m_paninc.y) >> 1);
-        if (mapxstart >= finit_width)
-            mapxstart -= finit_width;
-        if (mapxstart < 0)
-            mapxstart += finit_width;
-        if (mapystart >= finit_height)
-            mapystart -= finit_height;
-        if (mapystart < 0)
-            mapystart += finit_height;
-        */
-    }
-
-    //blit the automap background to the screen.
-    j = mapystart * finit_width;
-    for (i = 0; i < SCREENHEIGHT - SBARHEIGHT; i++)
-    {
-        memcpy(I_VideoBuffer + i * finit_width, maplump + j + mapxstart,
-               finit_width - mapxstart);
-        memcpy(I_VideoBuffer + i * finit_width + finit_width - mapxstart,
-               maplump + j, mapxstart);
-        j += finit_width;
-        if (j >= finit_height * finit_width)
-            j = 0;
-    }
-
-//       memcpy(I_VideoBuffer, maplump, finit_width*finit_height);
-//  memset(fb, color, f_w*f_h);
-}
-
-// Based on Cohen-Sutherland clipping algorithm but with a slightly
-// faster reject and precalculated slopes.  If I need the speed, will
-// hash algorithm to the common cases.
-
-boolean AM_clipMline(mline_t * ml, fline_t * fl)
-{
-    enum
-    { LEFT = 1, RIGHT = 2, BOTTOM = 4, TOP = 8 };
-    int outcode1 = 0, outcode2 = 0, outside;
-    fpoint_t tmp = { 0, 0 };
-    int dx, dy;
-
-#define DOOUTCODE(oc, mx, my) \
-  (oc) = 0; \
-  if ((my) < 0) (oc) |= TOP; \
-  else if ((my) >= f_h) (oc) |= BOTTOM; \
-  if ((mx) < 0) (oc) |= LEFT; \
-  else if ((mx) >= f_w) (oc) |= RIGHT
-
-    // do trivial rejects and outcodes
-    if (ml->a.y > m_y2)
-        outcode1 = TOP;
-    else if (ml->a.y < m_y)
-        outcode1 = BOTTOM;
-    if (ml->b.y > m_y2)
-        outcode2 = TOP;
-    else if (ml->b.y < m_y)
-        outcode2 = BOTTOM;
-    if (outcode1 & outcode2)
-        return false;           // trivially outside
-
-    if (ml->a.x < m_x)
-        outcode1 |= LEFT;
-    else if (ml->a.x > m_x2)
-        outcode1 |= RIGHT;
-    if (ml->b.x < m_x)
-        outcode2 |= LEFT;
-    else if (ml->b.x > m_x2)
-        outcode2 |= RIGHT;
-    if (outcode1 & outcode2)
-        return false;           // trivially outside
-
-    // transform to frame-buffer coordinates.
-    fl->a.x = CXMTOF(ml->a.x);
-    fl->a.y = CYMTOF(ml->a.y);
-    fl->b.x = CXMTOF(ml->b.x);
-    fl->b.y = CYMTOF(ml->b.y);
-    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-    if (outcode1 & outcode2)
-        return false;
-
-    while (outcode1 | outcode2)
-    {
-        // may be partially inside box
-        // find an outside point
-        if (outcode1)
-            outside = outcode1;
-        else
-            outside = outcode2;
-        // clip to each side
-        if (outside & TOP)
-        {
-            dy = fl->a.y - fl->b.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.x = fl->a.x + (dx * (fl->a.y)) / dy;
-            tmp.y = 0;
-        }
-        else if (outside & BOTTOM)
-        {
-            dy = fl->a.y - fl->b.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.x = fl->a.x + (dx * (fl->a.y - f_h)) / dy;
-            tmp.y = f_h - 1;
-        }
-        else if (outside & RIGHT)
-        {
-            dy = fl->b.y - fl->a.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.y = fl->a.y + (dy * (f_w - 1 - fl->a.x)) / dx;
-            tmp.x = f_w - 1;
-        }
-        else if (outside & LEFT)
-        {
-            dy = fl->b.y - fl->a.y;
-            dx = fl->b.x - fl->a.x;
-            tmp.y = fl->a.y + (dy * (-fl->a.x)) / dx;
-            tmp.x = 0;
-        }
-        if (outside == outcode1)
-        {
-            fl->a = tmp;
-            DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-        }
-        else
-        {
-            fl->b = tmp;
-            DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-        }
-        if (outcode1 & outcode2)
-            return false;       // trivially outside
-    }
-
-    return true;
-}
-
-#undef DOOUTCODE
-
-// Classic Bresenham w/ whatever optimizations I need for speed
-
-void AM_drawFline(fline_t * fl, int color)
-{
-    register int x, y, dx, dy, sx, sy, ax, ay, d;
-    //static fuck = 0;
-
-    switch (color)
-    {
-        case WALLCOLORS:
-            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y,
-                       &antialias[0][0], 8, 3);
-            break;
-        case FDWALLCOLORS:
-            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y,
-                       &antialias[1][0], 8, 3);
-            break;
-        case CDWALLCOLORS:
-            DrawWuLine(fl->a.x, fl->a.y, fl->b.x, fl->b.y,
-                       &antialias[2][0], 8, 3);
-            break;
-        default:
-            {
-                // For debugging only
-                if (fl->a.x < 0 || fl->a.x >= f_w
-                    || fl->a.y < 0 || fl->a.y >= f_h
-                    || fl->b.x < 0 || fl->b.x >= f_w
-                    || fl->b.y < 0 || fl->b.y >= f_h)
-                {
-                    //fprintf(stderr, "fuck %d \r", fuck++);
-                    return;
-                }
-
-#define DOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)    //the MACRO!
-
-                dx = fl->b.x - fl->a.x;
-                ax = 2 * (dx < 0 ? -dx : dx);
-                sx = dx < 0 ? -1 : 1;
-
-                dy = fl->b.y - fl->a.y;
-                ay = 2 * (dy < 0 ? -dy : dy);
-                sy = dy < 0 ? -1 : 1;
-
-                x = fl->a.x;
-                y = fl->a.y;
-
-                if (ax > ay)
-                {
-                    d = ay - ax / 2;
-                    while (1)
-                    {
-                        DOT(x, y, color);
-                        if (x == fl->b.x)
-                            return;
-                        if (d >= 0)
-                        {
-                            y += sy;
-                            d -= ax;
-                        }
-                        x += sx;
-                        d += ay;
-                    }
-                }
-                else
-                {
-                    d = ax - ay / 2;
-                    while (1)
-                    {
-                        DOT(x, y, color);
-                        if (y == fl->b.y)
-                            return;
-                        if (d >= 0)
-                        {
-                            x += sx;
-                            d -= ay;
-                        }
-                        y += sy;
-                        d += ax;
-                    }
-                }
-            }
-    }
-}
-
-/* Wu antialiased line drawer.
- * (X0,Y0),(X1,Y1) = line to draw
- * BaseColor = color # of first color in block used for antialiasing, the
- *          100% intensity version of the drawing color
- * NumLevels = size of color block, with BaseColor+NumLevels-1 being the
- *          0% intensity version of the drawing color
- * IntensityBits = log base 2 of NumLevels; the # of bits used to describe
- *          the intensity of the drawing color. 2**IntensityBits==NumLevels
- */
-void PUTDOT(short xx, short yy, byte * cc, byte * cm)
-{
-    static int oldyy;
-    static int oldyyshifted;
-    byte *oldcc = cc;
-
-    if (xx < 32)
-        cc += 7 - (xx >> 2);
-    else if (xx > (finit_width - 32))
-        cc += 7 - ((finit_width - xx) >> 2);
-//      if(cc==oldcc) //make sure that we don't double fade the corners.
-//      {
-    if (yy < 32)
-        cc += 7 - (yy >> 2);
-    else if (yy > (finit_height - 32))
-        cc += 7 - ((finit_height - yy) >> 2);
-//      }
-    if (cc > cm && cm != NULL)
-    {
-        cc = cm;
-    }
-    else if (cc > oldcc + 6)    // don't let the color escape from the fade table...
-    {
-        cc = oldcc + 6;
-    }
-    if (yy == oldyy + 1)
-    {
-        oldyy++;
-        oldyyshifted += 320;
-    }
-    else if (yy == oldyy - 1)
-    {
-        oldyy--;
-        oldyyshifted -= 320;
-    }
-    else if (yy != oldyy)
-    {
-        oldyy = yy;
-        oldyyshifted = yy * 320;
-    }
-    fb[oldyyshifted + xx] = *(cc);
-//      fb[(yy)*f_w+(xx)]=*(cc);
-}
-
-void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
-                int NumLevels, unsigned short IntensityBits)
-{
-    unsigned short IntensityShift, ErrorAdj, ErrorAcc;
-    unsigned short ErrorAccTemp, Weighting, WeightingComplementMask;
-    short DeltaX, DeltaY, Temp, XDir;
-
-    /* Make sure the line runs top to bottom */
-    if (Y0 > Y1)
-    {
-        Temp = Y0;
-        Y0 = Y1;
-        Y1 = Temp;
-        Temp = X0;
-        X0 = X1;
-        X1 = Temp;
-    }
-    /* Draw the initial pixel, which is always exactly intersected by
-       the line and so needs no weighting */
-    PUTDOT(X0, Y0, &BaseColor[0], NULL);
-
-    if ((DeltaX = X1 - X0) >= 0)
-    {
-        XDir = 1;
-    }
-    else
-    {
-        XDir = -1;
-        DeltaX = -DeltaX;       /* make DeltaX positive */
-    }
-    /* Special-case horizontal, vertical, and diagonal lines, which
-       require no weighting because they go right through the center of
-       every pixel */
-    if ((DeltaY = Y1 - Y0) == 0)
-    {
-        /* Horizontal line */
-        while (DeltaX-- != 0)
-        {
-            X0 += XDir;
-            PUTDOT(X0, Y0, &BaseColor[0], NULL);
-        }
-        return;
-    }
-    if (DeltaX == 0)
-    {
-        /* Vertical line */
-        do
-        {
-            Y0++;
-            PUTDOT(X0, Y0, &BaseColor[0], NULL);
-        }
-        while (--DeltaY != 0);
-        return;
-    }
-    //diagonal line.
-    if (DeltaX == DeltaY)
-    {
-        do
-        {
-            X0 += XDir;
-            Y0++;
-            PUTDOT(X0, Y0, &BaseColor[0], NULL);
-        }
-        while (--DeltaY != 0);
-        return;
-    }
-    /* Line is not horizontal, diagonal, or vertical */
-    ErrorAcc = 0;               /* initialize the line error accumulator to 0 */
-    /* # of bits by which to shift ErrorAcc to get intensity level */
-    IntensityShift = 16 - IntensityBits;
-    /* Mask used to flip all bits in an intensity weighting, producing the
-       result (1 - intensity weighting) */
-    WeightingComplementMask = NumLevels - 1;
-    /* Is this an X-major or Y-major line? */
-    if (DeltaY > DeltaX)
-    {
-        /* Y-major line; calculate 16-bit fixed-point fractional part of a
-           pixel that X advances each time Y advances 1 pixel, truncating the
-           result so that we won't overrun the endpoint along the X axis */
-        ErrorAdj = ((unsigned long) DeltaX << 16) / (unsigned long) DeltaY;
-        /* Draw all pixels other than the first and last */
-        while (--DeltaY)
-        {
-            ErrorAccTemp = ErrorAcc;    /* remember currrent accumulated error */
-            ErrorAcc += ErrorAdj;       /* calculate error for next pixel */
-            if (ErrorAcc <= ErrorAccTemp)
-            {
-                /* The error accumulator turned over, so advance the X coord */
-                X0 += XDir;
-            }
-            Y0++;               /* Y-major, so always advance Y */
-            /* The IntensityBits most significant bits of ErrorAcc give us the
-               intensity weighting for this pixel, and the complement of the
-               weighting for the paired pixel */
-            Weighting = ErrorAcc >> IntensityShift;
-            PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
-            PUTDOT(X0 + XDir, Y0,
-                   &BaseColor[(Weighting ^ WeightingComplementMask)],
-                   &BaseColor[7]);
-        }
-        /* Draw the final pixel, which is always exactly intersected by the line
-           and so needs no weighting */
-        PUTDOT(X1, Y1, &BaseColor[0], NULL);
-        return;
-    }
-    /* It's an X-major line; calculate 16-bit fixed-point fractional part of a
-       pixel that Y advances each time X advances 1 pixel, truncating the
-       result to avoid overrunning the endpoint along the X axis */
-    ErrorAdj = ((unsigned long) DeltaY << 16) / (unsigned long) DeltaX;
-    /* Draw all pixels other than the first and last */
-    while (--DeltaX)
-    {
-        ErrorAccTemp = ErrorAcc;        /* remember currrent accumulated error */
-        ErrorAcc += ErrorAdj;   /* calculate error for next pixel */
-        if (ErrorAcc <= ErrorAccTemp)
-        {
-            /* The error accumulator turned over, so advance the Y coord */
-            Y0++;
-        }
-        X0 += XDir;             /* X-major, so always advance X */
-        /* The IntensityBits most significant bits of ErrorAcc give us the
-           intensity weighting for this pixel, and the complement of the
-           weighting for the paired pixel */
-        Weighting = ErrorAcc >> IntensityShift;
-        PUTDOT(X0, Y0, &BaseColor[Weighting], &BaseColor[7]);
-        PUTDOT(X0, Y0 + 1,
-               &BaseColor[(Weighting ^ WeightingComplementMask)],
-               &BaseColor[7]);
-
-    }
-    /* Draw the final pixel, which is always exactly intersected by the line
-       and so needs no weighting */
-    PUTDOT(X1, Y1, &BaseColor[0], NULL);
-}
-
-void AM_drawMline(mline_t * ml, int color)
-{
-    static fline_t fl;
-
-    if (AM_clipMline(ml, &fl))
-        AM_drawFline(&fl, color);       // draws it on frame buffer using fb coords
-
-}
-
-void AM_drawGrid(int color)
-{
-    fixed_t x, y;
-    fixed_t start, end;
-    mline_t ml;
-
-    // Figure out start of vertical gridlines
-    start = m_x;
-    if ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS))
-        start += (MAPBLOCKUNITS << FRACBITS)
-            - ((start - bmaporgx) % (MAPBLOCKUNITS << FRACBITS));
-    end = m_x + m_w;
-
-    // draw vertical gridlines
-    ml.a.y = m_y;
-    ml.b.y = m_y + m_h;
-    for (x = start; x < end; x += (MAPBLOCKUNITS << FRACBITS))
-    {
-        ml.a.x = x;
-        ml.b.x = x;
-        AM_drawMline(&ml, color);
-    }
-
-    // Figure out start of horizontal gridlines
-    start = m_y;
-    if ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS))
-        start += (MAPBLOCKUNITS << FRACBITS)
-            - ((start - bmaporgy) % (MAPBLOCKUNITS << FRACBITS));
-    end = m_y + m_h;
-
-    // draw horizontal gridlines
-    ml.a.x = m_x;
-    ml.b.x = m_x + m_w;
-    for (y = start; y < end; y += (MAPBLOCKUNITS << FRACBITS))
-    {
-        ml.a.y = y;
-        ml.b.y = y;
-        AM_drawMline(&ml, color);
-    }
-}
-
-void AM_drawWalls(void)
-{
-    int i;
-    static mline_t l;
-
-    for (i = 0; i < numlines; i++)
-    {
-        l.a.x = lines[i].v1->x;
-        l.a.y = lines[i].v1->y;
-        l.b.x = lines[i].v2->x;
-        l.b.y = lines[i].v2->y;
-        if (cheating || (lines[i].flags & ML_MAPPED))
-        {
-            if ((lines[i].flags & LINE_NEVERSEE) && !cheating)
-                continue;
-            if (!lines[i].backsector)
-            {
-                AM_drawMline(&l, WALLCOLORS + lightlev);
-            }
-            else
-            {
-                if (lines[i].flags & ML_SECRET) // secret door
-                {
-                    if (cheating)
-                        AM_drawMline(&l, 0);
-                    else
-                        AM_drawMline(&l, WALLCOLORS + lightlev);
-                }
-                else if (lines[i].special == 13 || lines[i].special == 83)
-                {               // Locked door line -- all locked doors are greed
-                    AM_drawMline(&l, GREENKEY);
-                }
-                else if (lines[i].special == 70 || lines[i].special == 71)
-                {               // intra-level teleports are blue
-                    AM_drawMline(&l, BLUEKEY);
-                }
-                else if (lines[i].special == 74 || lines[i].special == 75)
-                {               // inter-level teleport/game-winning exit -- both are red
-                    AM_drawMline(&l, BLOODRED);
-                }
-                else if (lines[i].backsector->floorheight
-                         != lines[i].frontsector->floorheight)
-                {
-                    AM_drawMline(&l, FDWALLCOLORS + lightlev);  // floor level change
-                }
-                else if (lines[i].backsector->ceilingheight
-                         != lines[i].frontsector->ceilingheight)
-                {
-                    AM_drawMline(&l, CDWALLCOLORS + lightlev);  // ceiling level change
-                }
-                else if (cheating)
-                {
-                    AM_drawMline(&l, TSWALLCOLORS + lightlev);
-                }
-            }
-        }
-        else if (plr->powers[pw_allmap])
-        {
-            if (!(lines[i].flags & LINE_NEVERSEE))
-                AM_drawMline(&l, GRAYS + 3);
-        }
-    }
-
-}
-
-void AM_rotate(fixed_t * x, fixed_t * y, angle_t a)
-{
-    fixed_t tmpx;
-
-    tmpx = FixedMul(*x, finecosine[a >> ANGLETOFINESHIFT])
-        - FixedMul(*y, finesine[a >> ANGLETOFINESHIFT]);
-    *y = FixedMul(*x, finesine[a >> ANGLETOFINESHIFT])
-        + FixedMul(*y, finecosine[a >> ANGLETOFINESHIFT]);
-    *x = tmpx;
-}
-
-void AM_drawLineCharacter(mline_t * lineguy, int lineguylines, fixed_t scale,
-                          angle_t angle, int color, fixed_t x, fixed_t y)
-{
-    int i;
-    mline_t l;
-
-    for (i = 0; i < lineguylines; i++)
-    {
-        l.a.x = lineguy[i].a.x;
-        l.a.y = lineguy[i].a.y;
-        if (scale)
-        {
-            l.a.x = FixedMul(scale, l.a.x);
-            l.a.y = FixedMul(scale, l.a.y);
-        }
-        if (angle)
-            AM_rotate(&l.a.x, &l.a.y, angle);
-        l.a.x += x;
-        l.a.y += y;
-
-        l.b.x = lineguy[i].b.x;
-        l.b.y = lineguy[i].b.y;
-        if (scale)
-        {
-            l.b.x = FixedMul(scale, l.b.x);
-            l.b.y = FixedMul(scale, l.b.y);
-        }
-        if (angle)
-            AM_rotate(&l.b.x, &l.b.y, angle);
-        l.b.x += x;
-        l.b.y += y;
-
-        AM_drawMline(&l, color);
-    }
-}
-
-void AM_drawPlayers(void)
-{
-    int i;
-    player_t *p;
-    static int their_colors[] = {
-        AM_PLR1_COLOR,
-        AM_PLR2_COLOR,
-        AM_PLR3_COLOR,
-        AM_PLR4_COLOR,
-        AM_PLR5_COLOR,
-        AM_PLR6_COLOR,
-        AM_PLR7_COLOR,
-        AM_PLR8_COLOR
-    };
-    int their_color = -1;
-    int color;
-
-    if (!netgame)
-    {
-        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, plr->mo->angle,
-                             WHITE, plr->mo->x, plr->mo->y);
-        return;
-    }
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        their_color++;
-        p = &players[i];
-        if (deathmatch && !singledemo && p != plr)
-        {
-            continue;
-        }
-        if (!playeringame[i])
-            continue;
-        color = their_colors[their_color];
-        AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, p->mo->angle,
-                             color, p->mo->x, p->mo->y);
-    }
-}
-
-void AM_drawThings(int colors, int colorrange)
-{
-    int i;
-    mobj_t *t;
-
-    for (i = 0; i < numsectors; i++)
-    {
-        t = sectors[i].thinglist;
-        while (t)
-        {
-            AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES,
-                                 16 << FRACBITS, t->angle, colors + lightlev,
-                                 t->x, t->y);
-            t = t->snext;
-        }
-    }
-}
-
-/*
-void AM_drawMarks(void)
-{
-  int i, fx, fy, w, h;
-
-  for (i=0;i<AM_NUMMARKPOINTS;i++)
-  {
-    if (markpoints[i].x != -1)
-    {
-      w = SHORT(marknums[i]->width);
-      h = SHORT(marknums[i]->height);
-      fx = CXMTOF(markpoints[i].x);
-      fy = CYMTOF(markpoints[i].y);
-      if (fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
-  			V_DrawPatch(fx, fy, marknums[i]);
-    }
-  }
-}
-*/
-/*
-void AM_drawkeys(void)
-{
-	if(KeyPoints[0].x != 0 || KeyPoints[0].y != 0)
-	{
-		AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, YELLOWKEY,
-			KeyPoints[0].x, KeyPoints[0].y);
-	}
-	if(KeyPoints[1].x != 0 || KeyPoints[1].y != 0)
-	{
-		AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, GREENKEY,
-			KeyPoints[1].x, KeyPoints[1].y);
-	}
-	if(KeyPoints[2].x != 0 || KeyPoints[2].y != 0)
-	{
-		AM_drawLineCharacter(keysquare, NUMKEYSQUARELINES, 0, 0, BLUEKEY,
-			KeyPoints[2].x, KeyPoints[2].y);
-	}
-}
-*/
-
-/*
-void AM_drawCrosshair(int color)
-{
-  fb[(f_w*(f_h+1))/2] = color; // single point for now
-}
-*/
-
-void AM_Drawer(void)
-{
-    if (!automapactive)
-        return;
-
-    UpdateState |= I_FULLSCRN;
-    AM_clearFB(BACKGROUND);
-    if (grid)
-        AM_drawGrid(GRIDCOLORS);
-    AM_drawWalls();
-    AM_drawPlayers();
-    DrawWorldTimer();
-
-    if (cheating == 2)
-        AM_drawThings(THINGCOLORS, THINGRANGE);
-
-//  AM_drawCrosshair(XHAIRCOLORS);
-//  AM_drawMarks();
-//      if(gameskill == sk_baby) AM_drawkeys();
-
-    MN_DrTextA(P_GetMapName(gamemap), 38, 144);
-    if (ShowKills && netgame && deathmatch)
-    {
-        AM_DrawDeathmatchStats();
-    }
-//  I_Update();
-//  V_MarkRect(f_x, f_y, f_w, f_h);
-
-}
-
-//===========================================================================
-//
-// AM_DrawDeathmatchStats
-//
-//===========================================================================
-
-// 8-player note:  Proper player color names here, too
-
-const char *PlayerColorText[MAXPLAYERS] = {
-    "BLUE:",
-    "RED:",
-    "YELLOW:",
-    "GREEN:",
-    "JADE:",
-    "WHITE:",
-    "HAZEL:",
-    "PURPLE:"
-};
-
-void AM_DrawDeathmatchStats(void)
-{
-    int i, j, k, m;
-    int fragCount[MAXPLAYERS];
-    int order[MAXPLAYERS];
-    char textBuffer[80];
-    int yPosition;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        fragCount[i] = 0;
-        order[i] = -1;
-    }
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        else
-        {
-            for (j = 0; j < maxplayers; j++)
-            {
-                if (playeringame[j])
-                {
-                    fragCount[i] += players[i].frags[j];
-                }
-            }
-            for (k = 0; k < maxplayers; k++)
-            {
-                if (order[k] == -1)
-                {
-                    order[k] = i;
-                    break;
-                }
-                else if (fragCount[i] > fragCount[order[k]])
-                {
-                    for (m = maxplayers - 1; m > k; m--)
-                    {
-                        order[m] = order[m - 1];
-                    }
-                    order[k] = i;
-                    break;
-                }
-            }
-        }
-    }
-    yPosition = 15;
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[order[i]])
-        {
-            continue;
-        }
-        else
-        {
-            MN_DrTextA(PlayerColorText[order[i]], 8, yPosition);
-            M_snprintf(textBuffer, sizeof(textBuffer),
-                       "%d", fragCount[order[i]]);
-            MN_DrTextA(textBuffer, 80, yPosition);
-            yPosition += 10;
-        }
-    }
-}
-
-//===========================================================================
-//
-// DrawWorldTimer
-//
-//===========================================================================
-
-static void DrawWorldTimer(void)
-{
-    int days;
-    int hours;
-    int minutes;
-    int seconds;
-    int worldTimer;
-    char timeBuffer[15];
-    char dayBuffer[20];
-
-    worldTimer = players[consoleplayer].worldTimer;
-
-    worldTimer /= 35;
-    days = worldTimer / 86400;
-    worldTimer -= days * 86400;
-    hours = worldTimer / 3600;
-    worldTimer -= hours * 3600;
-    minutes = worldTimer / 60;
-    worldTimer -= minutes * 60;
-    seconds = worldTimer;
-
-    M_snprintf(timeBuffer, sizeof(timeBuffer),
-               "%.2d : %.2d : %.2d", hours, minutes, seconds);
-    MN_DrTextA(timeBuffer, 240, 8);
-
-    if (days)
-    {
-        if (days == 1)
-        {
-            M_snprintf(dayBuffer, sizeof(dayBuffer), "%.2d DAY", days);
-        }
-        else
-        {
-            M_snprintf(dayBuffer, sizeof(dayBuffer), "%.2d DAYS", days);
-        }
-        MN_DrTextA(dayBuffer, 240, 20);
-        if (days >= 5)
-        {
-            MN_DrTextA("YOU FREAK!!!", 230, 35);
-        }
-    }
-}
diff --git a/games/NXDoom/src/hexen/am_map.h b/games/NXDoom/src/hexen/am_map.h
deleted file mode 100644
index f6081a448..000000000
--- a/games/NXDoom/src/hexen/am_map.h
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __AMMAP_H__
-#define __AMMAP_H__
-
-// For use if I do walls with outsides/insides
-#define REDS		12*8
-#define REDRANGE	1       //16
-#define BLUES		(256-4*16+8)
-#define BLUERANGE	1       //8
-#define GREENS		(33*8)
-#define GREENRANGE	1       //16
-#define GRAYS		(5*8)
-#define GRAYSRANGE	1       //16
-#define BROWNS		(14*8)
-#define BROWNRANGE	1       //16
-#define YELLOWS		10*8
-#define YELLOWRANGE	1
-#define BLACK		0
-#define WHITE		4*8
-#define PARCH		13*8-1
-#define BLOODRED  	177
-#define BLUEKEY 	157
-#define YELLOWKEY 	137
-#define GREENKEY  	198
-
-// Automap colors
-
-#define AM_PLR1_COLOR 157       // Blue
-#define AM_PLR2_COLOR 177       // Red
-#define AM_PLR3_COLOR 137       // Yellow
-#define AM_PLR4_COLOR 198       // Green
-#define AM_PLR5_COLOR 215       // Jade
-#define AM_PLR6_COLOR 32        // White
-#define AM_PLR7_COLOR 106       // Hazel
-#define AM_PLR8_COLOR 234       // Purple
-
-#define BACKGROUND	PARCH
-#define YOURCOLORS	WHITE
-#define YOURRANGE	0
-#define WALLCOLORS	REDS
-#define WALLRANGE	REDRANGE
-#define TSWALLCOLORS	GRAYS
-#define TSWALLRANGE	GRAYSRANGE
-#define FDWALLCOLORS	BROWNS
-#define FDWALLRANGE	BROWNRANGE
-#define CDWALLCOLORS	YELLOWS
-#define CDWALLRANGE	YELLOWRANGE
-#define THINGCOLORS	GREENS
-#define THINGRANGE	GREENRANGE
-#define SECRETWALLCOLORS WALLCOLORS
-#define SECRETWALLRANGE WALLRANGE
-#define GRIDCOLORS	(GRAYS + GRAYSRANGE/2)
-#define GRIDRANGE	0
-#define XHAIRCOLORS	GRAYS
-
-// drawing stuff
-
-#define AM_NUMMARKPOINTS 10
-
-#define AM_MSGHEADER (('a'<<24)+('m'<<16))
-#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
-#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
-
-#define INITSCALEMTOF (.2*FRACUNIT)     // scale on entry
-// how much the automap moves window per tic in frame-buffer coordinates
-#define F_PANINC	4       // moves 140 pixels in 1 second
-// how much zoom-in per tic
-#define M_ZOOMIN        ((int) (1.02*FRACUNIT)) // goes to 2x in 1 second
-// how much zoom-out per tic
-#define M_ZOOMOUT       ((int) (FRACUNIT/1.02)) // pulls out to 0.5x in 1 second
-
-// translates between frame-buffer and map distances
-#define FTOM(x) FixedMul(((x)<<16),scale_ftom)
-#define MTOF(x) (FixedMul((x),scale_mtof)>>16)
-// translates between frame-buffer and map coordinates
-#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
-#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
-
-// the following is crap
-#define LINE_NEVERSEE ML_DONTDRAW
-
-typedef struct
-{
-    int x, y;
-} fpoint_t;
-
-typedef struct
-{
-    fpoint_t a, b;
-} fline_t;
-
-typedef vertex_t mpoint_t;
-
-typedef struct
-{
-    mpoint_t a, b;
-} mline_t;
-
-typedef struct
-{
-    fixed_t slp, islp;
-} islope_t;
-
-
-extern int cheating;
-extern boolean automapactive;
-
-
-void AM_Stop(void);
-
-
-#endif
diff --git a/games/NXDoom/src/hexen/ct_chat.c b/games/NXDoom/src/hexen/ct_chat.c
deleted file mode 100644
index cba051dc0..000000000
--- a/games/NXDoom/src/hexen/ct_chat.c
+++ /dev/null
@@ -1,497 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include <string.h>
-#include <ctype.h>
-#include "h2def.h"
-#include "i_input.h"
-#include "s_sound.h"
-#include "doomkeys.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "v_video.h"
-
-#define NUMKEYS 256
-
-#define QUEUESIZE		128
-#define MESSAGESIZE		128
-#define MESSAGELEN 		265
-
-// 8-player note:  Change this stuff (CT_PLR_*, and the key mappings)
-enum
-{
-    CT_PLR_BLUE = 1,
-    CT_PLR_RED,
-    CT_PLR_YELLOW,
-    CT_PLR_GREEN,
-    CT_PLR_PLAYER5,
-    CT_PLR_PLAYER6,
-    CT_PLR_PLAYER7,
-    CT_PLR_PLAYER8,
-    CT_PLR_ALL
-};
-
-#define CT_ESCAPE 6
-
-// Public data
-
-
-boolean chatmodeon;
-
-// Private data
-
-void CT_queueChatChar(char ch);
-void CT_ClearChatMessage(int player);
-void CT_AddChar(int player, char c);
-void CT_BackSpace(int player);
-
-int head;
-int tail;
-byte ChatQueue[QUEUESIZE];
-int chat_dest[MAXPLAYERS];
-char chat_msg[MAXPLAYERS][MESSAGESIZE];
-char plr_lastmsg[MAXPLAYERS][MESSAGESIZE + 9];
-int msgptr[MAXPLAYERS];
-int msglen[MAXPLAYERS];
-
-boolean cheated;
-
-static int FontABaseLump;
-
-const char *CT_FromPlrText[MAXPLAYERS] = {
-    "BLUE:  ",
-    "RED:  ",
-    "YELLOW:  ",
-    "GREEN:  ",
-    "JADE:  ",
-    "WHITE:  ",
-    "HAZEL:  ",
-    "PURPLE:  "
-};
-
-char *chat_macros[10];
-
-boolean altdown;
-boolean shiftdown;
-
-
-//===========================================================================
-//
-// CT_Init
-//
-//      Initialize chat mode data
-//===========================================================================
-
-void CT_Init(void)
-{
-    int i;
-
-    head = 0;                   //initialize the queue index
-    tail = 0;
-    chatmodeon = false;
-    memset(ChatQueue, 0, QUEUESIZE);
-    for (i = 0; i < maxplayers; i++)
-    {
-        chat_dest[i] = 0;
-        msgptr[i] = 0;
-        memset(plr_lastmsg[i], 0, MESSAGESIZE);
-        memset(chat_msg[i], 0, MESSAGESIZE);
-    }
-    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
-    return;
-}
-
-//===========================================================================
-//
-// CT_Stop
-//
-//===========================================================================
-
-void CT_Stop(void)
-{
-    chatmodeon = false;
-    I_StopTextInput();
-    return;
-}
-
-// These keys are allowed by Vanilla Heretic:
-
-static boolean ValidChatChar(char c)
-{
-    return (c >= 'a' && c <= 'z')
-        || (c >= 'A' && c <= 'Z')
-        || (c >= '0' && c <= '9')
-        || c == '!' || c == '?'
-        || c == ' ' || c == '\''
-        || c == ',' || c == '.'
-        || c == '-' || c == '=';
-}
-
-//===========================================================================
-//
-// CT_Responder
-//
-//===========================================================================
-
-boolean CT_Responder(event_t * ev)
-{
-    char *macro;
-
-    int sendto;
-
-    if (!netgame)
-    {
-        return false;
-    }
-    if (ev->data1 == KEY_RALT)
-    {
-        altdown = (ev->type == ev_keydown);
-        return false;
-    }
-    if (ev->data1 == KEY_RSHIFT)
-    {
-        shiftdown = (ev->type == ev_keydown);
-        return false;
-    }
-    if (gamestate != GS_LEVEL || ev->type != ev_keydown)
-    {
-        return false;
-    }
-    if (!chatmodeon)
-    {
-        sendto = 0;
-        if (ev->data1 == key_multi_msg)
-        {
-            sendto = CT_PLR_ALL;
-        }
-        else if (ev->data1 == key_multi_msgplayer[0])
-        {
-            sendto = CT_PLR_BLUE;
-        }
-        else if (ev->data1 == key_multi_msgplayer[1])
-        {
-            sendto = CT_PLR_RED;
-        }
-        else if (ev->data1 == key_multi_msgplayer[2])
-        {
-            sendto = CT_PLR_YELLOW;
-        }
-        else if (ev->data1 == key_multi_msgplayer[3])
-        {
-            sendto = CT_PLR_GREEN;
-        }
-        else if (ev->data1 == key_multi_msgplayer[4])
-        {
-            sendto = CT_PLR_PLAYER5;
-        }
-        else if (ev->data1 == key_multi_msgplayer[5])
-        {
-            sendto = CT_PLR_PLAYER6;
-        }
-        else if (ev->data1 == key_multi_msgplayer[6])
-        {
-            sendto = CT_PLR_PLAYER7;
-        }
-        else if (ev->data1 == key_multi_msgplayer[7])
-        {
-            sendto = CT_PLR_PLAYER8;
-        }
-        if (sendto == 0 || (sendto != CT_PLR_ALL && !playeringame[sendto - 1])
-            || sendto == consoleplayer + 1)
-        {
-            return false;
-        }
-        CT_queueChatChar(sendto);
-        chatmodeon = true;
-        I_StartTextInput(25, 10, SCREENWIDTH, 18);
-        return true;
-    }
-    else
-    {
-        if (altdown)
-        {
-            if (ev->data1 >= '0' && ev->data1 <= '9')
-            {
-                if (ev->data1 == '0')
-                {               // macro 0 comes after macro 9
-                    ev->data1 = '9' + 1;
-                }
-                macro = chat_macros[ev->data1 - '1'];
-                CT_queueChatChar(KEY_ENTER);    //send old message
-                CT_queueChatChar(chat_dest[consoleplayer]);     // chose the dest.
-                while (*macro)
-                {
-                    CT_queueChatChar(toupper(*macro++));
-                }
-                CT_queueChatChar(KEY_ENTER);    //send it off...
-                CT_Stop();
-                return true;
-            }
-        }
-        if (ev->data1 == KEY_ENTER)
-        {
-            CT_queueChatChar(KEY_ENTER);
-            usearti = false;
-            CT_Stop();
-            return true;
-        }
-        else if (ev->data1 == KEY_ESCAPE)
-        {
-            CT_queueChatChar(CT_ESCAPE);
-            CT_Stop();
-            return true;
-        }
-        else if (ev->data1 == KEY_BACKSPACE)
-        {
-            CT_queueChatChar(KEY_BACKSPACE);
-            return true;
-        }
-        else if (ValidChatChar(ev->data3))
-        {
-            CT_queueChatChar(toupper(ev->data3));
-            return true;
-        }
-    }
-    return false;
-}
-
-//===========================================================================
-//
-// CT_Ticker
-//
-//===========================================================================
-
-void CT_Ticker(void)
-{
-    int i;
-    int j;
-    char c;
-    int numplayers;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        if ((c = players[i].cmd.chatchar) != 0)
-        {
-            if (c <= CT_PLR_ALL)
-            {
-                chat_dest[i] = c;
-                continue;
-            }
-            else if (c == CT_ESCAPE)
-            {
-                CT_ClearChatMessage(i);
-            }
-            else if (c == KEY_ENTER)
-            {
-                numplayers = 0;
-                for (j = 0; j < maxplayers; j++)
-                {
-                    numplayers += playeringame[j];
-                }
-                CT_AddChar(i, 0);       // set the end of message character
-                if (numplayers > 2)
-                {
-                    M_StringCopy(plr_lastmsg[i], CT_FromPlrText[i],
-                                 sizeof(plr_lastmsg[i]));
-                    M_StringConcat(plr_lastmsg[i], chat_msg[i],
-                                   sizeof(plr_lastmsg[i]));
-                }
-                else
-                {
-                    M_StringCopy(plr_lastmsg[i], chat_msg[i],
-                                 sizeof(plr_lastmsg[i]));
-                }
-                if (i != consoleplayer && (chat_dest[i] == consoleplayer + 1
-                                           || chat_dest[i] == CT_PLR_ALL)
-                    && *chat_msg[i])
-                {
-                    P_SetMessage(&players[consoleplayer], plr_lastmsg[i],
-                                 true);
-                    S_StartSound(NULL, SFX_CHAT);
-                }
-                else if (i == consoleplayer && (*chat_msg[i]))
-                {
-                    if (numplayers <= 1)
-                    {
-                        P_SetMessage(&players[consoleplayer],
-                                     "THERE ARE NO OTHER PLAYERS IN THE GAME!",
-                                     true);
-                        S_StartSound(NULL, SFX_CHAT);
-                    }
-                }
-                CT_ClearChatMessage(i);
-            }
-            else if (c == KEY_BACKSPACE)
-            {
-                CT_BackSpace(i);
-            }
-            else
-            {
-                CT_AddChar(i, c);
-            }
-        }
-    }
-    return;
-}
-
-//===========================================================================
-//
-// CT_Drawer
-//
-//===========================================================================
-
-void CT_Drawer(void)
-{
-    int i;
-    int x;
-    patch_t *patch;
-
-    if (chatmodeon)
-    {
-        x = 25;
-        for (i = 0; i < msgptr[consoleplayer]; i++)
-        {
-            if (chat_msg[consoleplayer][i] < 33)
-            {
-                x += 6;
-            }
-            else
-            {
-                patch = W_CacheLumpNum(FontABaseLump +
-                                       chat_msg[consoleplayer][i] - 33,
-                                       PU_CACHE);
-                V_DrawPatch(x, 10, patch);
-                x += patch->width;
-            }
-        }
-        V_DrawPatch(x, 10, W_CacheLumpName("FONTA59", PU_CACHE));
-        BorderTopRefresh = true;
-        UpdateState |= I_MESSAGES;
-    }
-}
-
-//===========================================================================
-//
-// CT_queueChatChar
-//
-//===========================================================================
-
-void CT_queueChatChar(char ch)
-{
-    if (((tail + 1) & (QUEUESIZE - 1)) == head)
-    {                           // the queue is full
-        return;
-    }
-    ChatQueue[tail] = ch;
-    tail = (tail + 1) & (QUEUESIZE - 1);
-}
-
-//===========================================================================
-//
-// CT_dequeueChatChar
-//
-//===========================================================================
-
-char CT_dequeueChatChar(void)
-{
-    byte temp;
-
-    if (head == tail)
-    {                           // queue is empty
-        return 0;
-    }
-    temp = ChatQueue[head];
-    head = (head + 1) & (QUEUESIZE - 1);
-    return temp;
-}
-
-//===========================================================================
-//
-// CT_AddChar
-//
-//===========================================================================
-
-void CT_AddChar(int player, char c)
-{
-    patch_t *patch;
-
-    if (msgptr[player] + 1 >= MESSAGESIZE || msglen[player] >= MESSAGELEN)
-    {                           // full.
-        return;
-    }
-    chat_msg[player][msgptr[player]] = c;
-    msgptr[player]++;
-    if (c < 33)
-    {
-        msglen[player] += 6;
-    }
-    else
-    {
-        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        msglen[player] += patch->width;
-    }
-}
-
-//===========================================================================
-//
-// CT_BackSpace
-//
-//      Backs up a space, when the user hits (obviously) backspace
-//===========================================================================
-
-void CT_BackSpace(int player)
-{
-    patch_t *patch;
-    char c;
-
-    if (msgptr[player] == 0)
-    {                           // message is already blank
-        return;
-    }
-    msgptr[player]--;
-    c = chat_msg[player][msgptr[player]];
-    if (c < 33)
-    {
-        msglen[player] -= 6;
-    }
-    else
-    {
-        patch = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        msglen[player] -= patch->width;
-    }
-    chat_msg[player][msgptr[player]] = 0;
-}
-
-//===========================================================================
-//
-// CT_ClearChatMessage
-//
-//      Clears out the data for the chat message, but the player's message
-//              is still saved in plrmsg.
-//===========================================================================
-
-void CT_ClearChatMessage(int player)
-{
-    memset(chat_msg[player], 0, MESSAGESIZE);
-    msgptr[player] = 0;
-    msglen[player] = 0;
-}
diff --git a/games/NXDoom/src/hexen/ct_chat.h b/games/NXDoom/src/hexen/ct_chat.h
deleted file mode 100644
index c46fdfce8..000000000
--- a/games/NXDoom/src/hexen/ct_chat.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Chat mode stuff
-//
-
-#ifndef HEXEN_CT_CHAT_H
-#define HEXEN_CT_CHAT_H
-
-#define CT_PLR_GREEN	1
-#define CT_PLR_YELLOW	2
-#define CT_PLR_RED		3
-#define CT_PLR_BLUE		4
-#define CT_PLR_ALL		5
-
-#define CT_KEY_GREEN	'g'
-#define CT_KEY_YELLOW	'y'
-#define CT_KEY_RED		'r'
-#define CT_KEY_BLUE		'b'
-#define CT_KEY_ALL		't'
-
-extern char *chat_macros[10];
-
-#endif
-
diff --git a/games/NXDoom/src/hexen/d_net.c b/games/NXDoom/src/hexen/d_net.c
deleted file mode 100644
index 252914722..000000000
--- a/games/NXDoom/src/hexen/d_net.c
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM Network game communication and protocol,
-//	all OS independend parts.
-//
-
-#include <stdlib.h>
-
-#include "m_argv.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "i_videohr.h"
-#include "h2def.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "w_checksum.h"
-
-#include "deh_main.h"
-
-#include "d_loop.h"
-
-ticcmd_t *netcmds;
-
-
-// Called when a player leaves the game
-
-static void PlayerQuitGame(player_t *player)
-{
-    static char exitmsg[80];
-    unsigned int player_num;
-
-    player_num = player - players;
-
-    M_StringCopy(exitmsg, "PLAYER 1 LEFT THE GAME", sizeof(exitmsg));
-    exitmsg[7] += player_num;
-    P_SetMessage(&players[consoleplayer], exitmsg, true);
-    S_StartSound(NULL, SFX_CHAT);
-
-    playeringame[player_num] = false;
-
-    // TODO: check if it is sensible to do this:
-
-    if (demorecording) 
-    {
-        G_CheckDemoStatus ();
-    }
-}
-
-static void RunTic(ticcmd_t *cmds, boolean *ingame)
-{
-    unsigned int i;
-
-    // Check for player quits.
-
-    for (i = 0; i < maxplayers; ++i)
-    {
-        if (!demoplayback && playeringame[i] && !ingame[i])
-        {
-            PlayerQuitGame(&players[i]);
-        }
-    }
-
-    netcmds = cmds;
-
-    // check that there are players in the game.  if not, we cannot
-    // run a tic.
-
-    if (advancedemo)
-        H2_DoAdvanceDemo ();
-
-    G_Ticker ();
-}
-
-static loop_interface_t hexen_loop_interface = {
-    H2_ProcessEvents,
-    G_BuildTiccmd,
-    RunTic,
-    MN_Ticker
-};
-
-
-// Load game settings from the specified structure and 
-// set global variables.
-
-static void LoadGameSettings(net_gamesettings_t *settings)
-{
-    unsigned int i;
-
-    deathmatch = settings->deathmatch;
-    ticdup = settings->ticdup;
-    startepisode = settings->episode;
-    startmap = settings->map;
-    startskill = settings->skill;
-    // TODO startloadgame = settings->loadgame;
-    lowres_turn = settings->lowres_turn;
-    nomonsters = settings->nomonsters;
-    respawnparm = settings->respawn_monsters;
-    consoleplayer = settings->consoleplayer;
-
-    if (lowres_turn)
-    {
-        printf("NOTE: Turning resolution is reduced; this is probably "
-               "because there is a client recording a Vanilla demo.\n");
-    }
-
-    for (i=0; i<maxplayers; ++i)
-    {
-        playeringame[i] = i < settings->num_players;
-        PlayerClass[i] = settings->player_classes[i];
-
-        if (PlayerClass[i] >= NUMCLASSES)
-        {
-            PlayerClass[i] = PCLASS_FIGHTER;
-        }
-    }
-}
-
-// Save the game settings from global variables to the specified
-// game settings structure.
-
-static void SaveGameSettings(net_gamesettings_t *settings)
-{
-    // jhaley 20120715: Some parts of the structure are being left
-    // uninitialized. If -class is not used on the command line, this
-    // can lead to a crash in SB_Init due to player class == 0xCCCCCCCC.
-    memset(settings, 0, sizeof(*settings));
-
-    // Fill in game settings structure with appropriate parameters
-    // for the new game
-
-    settings->deathmatch = deathmatch;
-    settings->episode = startepisode;
-    settings->map = startmap;
-    settings->skill = startskill;
-    // TODO settings->loadgame = startloadgame;
-    settings->gameversion = exe_hexen_1_1;
-    settings->nomonsters = nomonsters;
-    settings->respawn_monsters = respawnparm;
-    settings->timelimit = 0;
-
-    settings->lowres_turn = M_ParmExists("-record")
-                         && !M_ParmExists("-longtics");
-}
-
-static void InitConnectData(net_connect_data_t *connect_data)
-{
-    int i;
-
-    //
-    // Connect data
-    //
-
-    // Game type fields:
-
-    connect_data->gamemode = gamemode;
-    connect_data->gamemission = hexen;
-
-    // Are we recording a demo? Possibly set lowres turn mode
-
-    connect_data->lowres_turn = M_ParmExists("-record")
-                             && !M_ParmExists("-longtics");
-
-    connect_data->drone = false;
-    connect_data->max_players = maxplayers;
-
-    //!
-    // @category net
-    // @arg <n>
-    //
-    // Specify player class: 0=fighter, 1=cleric, 2=mage, 3=pig.
-    //
-
-    i = M_CheckParmWithArgs("-class", 1);
-
-    if (i > 0)
-    {
-        connect_data->player_class = atoi(myargv[i + 1]);
-    }
-    else
-    {
-        connect_data->player_class = PCLASS_FIGHTER;
-    }
-
-    // Read checksums of our WAD directory and dehacked information
-
-    W_Checksum(connect_data->wad_sha1sum);
-    memset(connect_data->deh_sha1sum, 0, sizeof(sha1_digest_t));
-
-    connect_data->is_freedoom = 0;
-}
-
-void D_ConnectNetGame(void)
-{
-    net_connect_data_t connect_data;
-
-    InitConnectData(&connect_data);
-    netgame = D_InitNetGame(&connect_data);
-
-    //!
-    // @category net
-    //
-    // Start the game playing as though in a netgame with a single
-    // player.  This can also be used to play back single player netgame
-    // demos.
-    //
-
-    if (M_CheckParm("-solo-net") > 0)
-    {
-        netgame = true;
-    }
-}
-
-static boolean StartupProgress(int now_ready, int total)
-{
-    static int ready = 0;
-
-    while (ready < now_ready)
-    {
-        ST_NetProgress();
-        ++ready;
-    }
-
-    ready = now_ready;
-
-    // Allow the user to hit escape during netgame startup to abort.
-    return !I_CheckAbortHR();
-}
-
-//
-// D_CheckNetGame
-// Works out player numbers among the net participants
-//
-
-void D_CheckNetGame(void)
-{
-    net_gamesettings_t settings;
-
-    D_RegisterLoopCallbacks(&hexen_loop_interface);
-
-    if (netgame)
-    {
-        autostart = true;
-    }
-
-    SaveGameSettings(&settings);
-    D_StartNetGame(&settings, StartupProgress);
-    LoadGameSettings(&settings);
-
-    // Finish netgame progress on startup screen.
-
-    if (netgame)
-    {
-        StartupProgress(settings.num_players, settings.num_players);
-        ST_NetDone();
-    }
-}
-
-//==========================================================================
-//
-// NET_SendFrags
-//
-//==========================================================================
-
-void NET_SendFrags(player_t * player)
-{
-    // Not sure what this is intended for. Unused?
-}
-
diff --git a/games/NXDoom/src/hexen/f_finale.c b/games/NXDoom/src/hexen/f_finale.c
deleted file mode 100644
index 93af19e7a..000000000
--- a/games/NXDoom/src/hexen/f_finale.c
+++ /dev/null
@@ -1,387 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "i_system.h"
-#include "i_video.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include <ctype.h>
-#include "v_video.h"
-#include "i_swap.h"
-#include "am_map.h"
-
-
-// MACROS ------------------------------------------------------------------
-
-#define	TEXTSPEED	3
-#define	TEXTWAIT	250
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void TextWrite(void);
-static void DrawPic(void);
-static void InitializeFade(boolean fadeIn);
-static void DeInitializeFade(void);
-static void FadePic(void);
-static char *GetFinaleText(int sequence);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DECLARATIONS ------------------------------------------------
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int FinaleStage;
-static int FinaleCount;
-static int FinaleEndCount;
-static int FinaleLumpNum;
-static int FontABaseLump;
-static char *FinaleText;
-
-static fixed_t *Palette;
-static fixed_t *PaletteDelta;
-static byte *RealPalette;
-
-// CODE --------------------------------------------------------------------
-
-//===========================================================================
-//
-// F_StartFinale
-//
-//===========================================================================
-
-void F_StartFinale(void)
-{
-    gameaction = ga_nothing;
-    gamestate = GS_FINALE;
-    viewactive = false;
-    automapactive = false;
-    P_ClearMessage(&players[consoleplayer]);
-
-    FinaleStage = 0;
-    FinaleCount = 0;
-    FinaleText = GetFinaleText(0);
-    FinaleEndCount = 70;
-    FinaleLumpNum = W_GetNumForName("FINALE1");
-    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
-    InitializeFade(1);
-
-//      S_ChangeMusic(mus_victor, true);
-    S_StartSongName("hall", false);     // don't loop the song
-}
-
-//===========================================================================
-//
-// F_Responder
-//
-//===========================================================================
-
-boolean F_Responder(event_t * event)
-{
-    return false;
-}
-
-//===========================================================================
-//
-// F_Ticker
-//
-//===========================================================================
-
-void F_Ticker(void)
-{
-    FinaleCount++;
-    if (FinaleStage < 5 && FinaleCount >= FinaleEndCount)
-    {
-        FinaleCount = 0;
-        FinaleStage++;
-        switch (FinaleStage)
-        {
-            case 1:            // Text 1
-                FinaleEndCount = strlen(FinaleText) * TEXTSPEED + TEXTWAIT;
-                break;
-            case 2:            // Pic 2, Text 2
-                FinaleText = GetFinaleText(1);
-                FinaleEndCount = strlen(FinaleText) * TEXTSPEED + TEXTWAIT;
-                FinaleLumpNum = W_GetNumForName("FINALE2");
-                S_StartSongName("orb", false);
-                break;
-            case 3:            // Pic 2 -- Fade out
-                FinaleEndCount = 70;
-                DeInitializeFade();
-                InitializeFade(0);
-                break;
-            case 4:            // Pic 3 -- Fade in
-                FinaleLumpNum = W_GetNumForName("FINALE3");
-                FinaleEndCount = 71;
-                DeInitializeFade();
-                InitializeFade(1);
-                S_StartSongName("chess", true);
-                break;
-            case 5:            // Pic 3 , Text 3
-                FinaleText = GetFinaleText(2);
-                DeInitializeFade();
-                break;
-            default:
-                break;
-        }
-        return;
-    }
-    if (FinaleStage == 0 || FinaleStage == 3 || FinaleStage == 4)
-    {
-        FadePic();
-    }
-}
-
-//===========================================================================
-//
-// TextWrite
-//
-//===========================================================================
-
-static void TextWrite(void)
-{
-    int count;
-    char *ch;
-    int c;
-    int cx, cy;
-    patch_t *w;
-
-    memcpy(I_VideoBuffer, W_CacheLumpNum(FinaleLumpNum, PU_CACHE),
-           SCREENWIDTH * SCREENHEIGHT);
-    if (FinaleStage == 5)
-    {                           // Chess pic, draw the correct character graphic
-        if (netgame)
-        {
-            V_DrawPatch(20, 0, W_CacheLumpName("chessall", PU_CACHE));
-        }
-        else if (PlayerClass[consoleplayer])
-        {
-            V_DrawPatch(60, 0, W_CacheLumpNum(W_GetNumForName("chessc")
-                                              + PlayerClass[consoleplayer] -
-                                              1, PU_CACHE));
-        }
-    }
-    // Draw the actual text
-    if (FinaleStage == 5)
-    {
-        cy = 135;
-    }
-    else
-    {
-        cy = 5;
-    }
-    cx = 20;
-    ch = FinaleText;
-    count = (FinaleCount - 10) / TEXTSPEED;
-    if (count < 0)
-    {
-        count = 0;
-    }
-    for (; count; count--)
-    {
-        c = *ch++;
-        if (!c)
-        {
-            break;
-        }
-        if (c == '\n')
-        {
-            cx = 20;
-            cy += 9;
-            continue;
-        }
-        if (c < 32)
-        {
-            continue;
-        }
-        c = toupper(c);
-        if (c == 32)
-        {
-            cx += 5;
-            continue;
-        }
-        w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        if (cx + SHORT(w->width) > SCREENWIDTH)
-        {
-            break;
-        }
-        V_DrawPatch(cx, cy, w);
-        cx += SHORT(w->width);
-    }
-}
-
-//===========================================================================
-//
-// InitializeFade
-//
-//===========================================================================
-
-static void InitializeFade(boolean fadeIn)
-{
-    unsigned i;
-
-    Palette = Z_Malloc(768 * sizeof(fixed_t), PU_STATIC, 0);
-    PaletteDelta = Z_Malloc(768 * sizeof(fixed_t), PU_STATIC, 0);
-    RealPalette = Z_Malloc(768 * sizeof(byte), PU_STATIC, 0);
-
-    if (fadeIn)
-    {
-        memset(RealPalette, 0, 768 * sizeof(byte));
-        for (i = 0; i < 768; i++)
-        {
-            Palette[i] = 0;
-            PaletteDelta[i] = FixedDiv((*((byte *) W_CacheLumpName("playpal",
-                                                                   PU_CACHE) +
-                                          i)) << FRACBITS, 70 * FRACUNIT);
-        }
-    }
-    else
-    {
-        for (i = 0; i < 768; i++)
-        {
-            RealPalette[i] =
-                *((byte *) W_CacheLumpName("playpal", PU_CACHE) + i);
-            Palette[i] = RealPalette[i] << FRACBITS;
-            PaletteDelta[i] = FixedDiv(Palette[i], -70 * FRACUNIT);
-        }
-    }
-    I_SetPalette(RealPalette);
-}
-
-//===========================================================================
-//
-// DeInitializeFade
-//
-//===========================================================================
-
-static void DeInitializeFade(void)
-{
-    Z_Free(Palette);
-    Z_Free(PaletteDelta);
-    Z_Free(RealPalette);
-}
-
-//===========================================================================
-//
-// FadePic
-//
-//===========================================================================
-
-static void FadePic(void)
-{
-    unsigned i;
-
-    for (i = 0; i < 768; i++)
-    {
-        Palette[i] += PaletteDelta[i];
-        RealPalette[i] = Palette[i] >> FRACBITS;
-    }
-    I_SetPalette(RealPalette);
-}
-
-//===========================================================================
-//
-// DrawPic
-//
-//===========================================================================
-
-static void DrawPic(void)
-{
-    memcpy(I_VideoBuffer, W_CacheLumpNum(FinaleLumpNum, PU_CACHE),
-           SCREENWIDTH * SCREENHEIGHT);
-    if (FinaleStage == 4 || FinaleStage == 5)
-    {                           // Chess pic, draw the correct character graphic
-        if (netgame)
-        {
-            V_DrawPatch(20, 0, W_CacheLumpName("chessall", PU_CACHE));
-        }
-        else if (PlayerClass[consoleplayer])
-        {
-            V_DrawPatch(60, 0, W_CacheLumpNum(W_GetNumForName("chessc")
-                                              + PlayerClass[consoleplayer] -
-                                              1, PU_CACHE));
-        }
-    }
-}
-
-//===========================================================================
-//
-// F_Drawer
-//
-//===========================================================================
-
-void F_Drawer(void)
-{
-    switch (FinaleStage)
-    {
-        case 0:                // Fade in initial finale screen
-            DrawPic();
-            break;
-        case 1:
-        case 2:
-            TextWrite();
-            break;
-        case 3:                // Fade screen out
-            DrawPic();
-            break;
-        case 4:                // Fade in chess screen
-            DrawPic();
-            break;
-        case 5:
-            TextWrite();
-            break;
-    }
-    UpdateState |= I_FULLSCRN;
-}
-
-//==========================================================================
-//
-// GetFinaleText
-//
-//==========================================================================
-
-static char *GetFinaleText(int sequence)
-{
-    const char *msgLumpName;
-    int msgSize;
-    int msgLump;
-    static const char *winMsgLumpNames[] = {
-        "win1msg",
-        "win2msg",
-        "win3msg"
-    };
-
-    msgLumpName = winMsgLumpNames[sequence];
-    msgLump = W_GetNumForName(msgLumpName);
-    msgSize = W_LumpLength(msgLump);
-    if (msgSize >= MAX_INTRMSN_MESSAGE_SIZE)
-    {
-        I_Error("Finale message too long (%s)", msgLumpName);
-    }
-    W_ReadLump(msgLump, ClusterMessage);
-    ClusterMessage[msgSize] = 0;        // Append terminator
-    return ClusterMessage;
-}
diff --git a/games/NXDoom/src/hexen/g_game.c b/games/NXDoom/src/hexen/g_game.c
deleted file mode 100644
index ecfb38327..000000000
--- a/games/NXDoom/src/hexen/g_game.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include <string.h>
-#include "m_random.h"
-#include "h2def.h"
-#include "s_sound.h"
-#include "doomkeys.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_video.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "m_argv.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "v_video.h"
-
-#define AM_STARTKEY	9
-
-// External functions
-
-
-// Functions
-
-void G_ReadDemoTiccmd(ticcmd_t * cmd);
-void G_WriteDemoTiccmd(ticcmd_t * cmd);
-
-void G_DoReborn(int playernum);
-
-void G_DoLoadLevel(void);
-void G_DoInitNew(void);
-void G_DoNewGame(void);
-void G_DoPlayDemo(void);
-void G_DoTeleportNewMap(void);
-void G_DoCompleted(void);
-void G_DoVictory(void);
-void G_DoWorldDone(void);
-void G_DoSaveGame(void);
-void G_DoSingleReborn(void);
-
-void H2_PageTicker(void);
-void H2_AdvanceDemo(void);
-
-static boolean InventoryMoveLeft();
-static boolean InventoryMoveRight();
-
-
-gameaction_t gameaction;
-gamestate_t gamestate;
-skill_t gameskill;
-//boolean         respawnmonsters;
-int gameepisode;
-int gamemap;
-int prevmap;
-
-boolean paused;
-boolean sendpause;              // send a pause event next tic
-boolean sendsave;               // send a save event next tic
-boolean usergame;               // ok to save / end game
-
-boolean timingdemo;             // if true, exit with report on completion
-int starttime;                  // for comparative timing purposes      
-
-boolean viewactive;
-
-boolean deathmatch;             // only if started as net death
-boolean netgame;                // only true if packets are broadcast
-boolean playeringame[MAXPLAYERS];
-player_t players[MAXPLAYERS];
-pclass_t PlayerClass[MAXPLAYERS];
-
-// Position indicator for cooperative net-play reborn
-int RebornPosition;
-
-int consoleplayer;              // player taking events and displaying
-int displayplayer;              // view being displayed
-int levelstarttic;              // gametic at level start
-
-char *demoname;
-boolean demorecording;
-boolean longtics;               // specify high resolution turning in demos
-boolean lowres_turn;
-boolean shortticfix;            // calculate lowres turning like doom
-boolean demoplayback;
-boolean demoextend;
-boolean netdemo;
-byte *demobuffer, *demo_p, *demoend;
-boolean singledemo;             // quit after playing a demo from cmdline
-
-boolean precache = true;        // if true, load all graphics at start
-
-// TODO: Hexen uses 16-bit shorts for consistancy?
-byte consistancy[MAXPLAYERS][BACKUPTICS];
-
-int mouseSensitivity = 5;
-
-int LeaveMap;
-static int LeavePosition;
-
-//#define MAXPLMOVE       0x32 // Old Heretic Max move
-
-fixed_t MaxPlayerMove[NUMCLASSES] = { 0x3C, 0x32, 0x2D, 0x31 };
-fixed_t forwardmove[NUMCLASSES][2] = {
-    {0x1D, 0x3C},
-    {0x19, 0x32},
-    {0x16, 0x2E},
-    {0x18, 0x31}
-};
-
-fixed_t sidemove[NUMCLASSES][2] = {
-    {0x1B, 0x3B},
-    {0x18, 0x28},
-    {0x15, 0x25},
-    {0x17, 0x27}
-};
-
-fixed_t angleturn[3] = { 640, 1280, 320 };      // + slow turn
-
-static int *weapon_keys[] =
-{
-    &key_weapon1,
-    &key_weapon2,
-    &key_weapon3,
-    &key_weapon4,
-};
-
-static int next_weapon = 0;
-
-#define SLOWTURNTICS    6
-
-boolean gamekeydown[NUMKEYS];
-int turnheld;                   // for accelerative turning
-int lookheld;
-
-
-boolean mousearray[MAX_MOUSE_BUTTONS + 1];
-boolean *mousebuttons = &mousearray[1];
-        // allow [-1]
-int mousex, mousey;             // mouse values are used once
-int dclicktime, dclickstate, dclicks;
-int dclicktime2, dclickstate2, dclicks2;
-
-#define MAX_JOY_BUTTONS 20
-
-int joyxmove, joyymove;         // joystick values are repeated
-int joystrafemove;
-int joylook;
-boolean joyarray[MAX_JOY_BUTTONS + 1];
-boolean *joybuttons = &joyarray[1];     // allow [-1]
-
-int savegameslot;
-char savedescription[32];
-
-int vanilla_demo_limit = 1;
-
-int inventoryTics;
-
-// haleyjd: removed externdriver crap
-
-static skill_t TempSkill;
-static int TempEpisode;
-static int TempMap;
-
-boolean testcontrols = false;
-int testcontrols_mousespeed;
-
-//=============================================================================
-/*
-====================
-=
-= G_BuildTiccmd
-=
-= Builds a ticcmd from all of the available inputs or reads it from the
-= demo buffer.
-= If recording a demo, write it out
-====================
-*/
-
-boolean usearti = true;
-
-void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
-{
-    int i;
-    boolean strafe, bstrafe;
-    int speed, tspeed, lspeed;
-    int forward, side;
-    int look, arti;
-    int flyheight;
-    int pClass;
-
-    // haleyjd: removed externdriver crap
-
-    pClass = players[consoleplayer].class;
-    memset(cmd, 0, sizeof(*cmd));
-
-//      cmd->consistancy =
-//              consistancy[consoleplayer][(maketic*ticdup)%BACKUPTICS];
-
-    cmd->consistancy = consistancy[consoleplayer][maketic % BACKUPTICS];
-
-//printf ("cons: %i\n",cmd->consistancy);
-
-    strafe = gamekeydown[key_strafe]
-          || mousebuttons[mousebstrafe]
-          || joybuttons[joybstrafe];
-
-    // Allow joybspeed hack.
-
-    speed = key_speed >= NUMKEYS
-        || joybspeed >= MAX_JOY_BUTTONS
-        || gamekeydown[key_speed]
-        || joybuttons[joybspeed]
-        || mousebuttons[mousebspeed];
-
-    // haleyjd: removed externdriver crap
-    
-    forward = side = look = arti = flyheight = 0;
-
-//
-// use two stage accelerative turning on the keyboard and joystick
-//
-    if (joyxmove < 0 || joyxmove > 0
-        || gamekeydown[key_right] || gamekeydown[key_left]
-        || mousebuttons[mousebturnright] || mousebuttons[mousebturnleft])
-        turnheld += ticdup;
-    else
-        turnheld = 0;
-    if (turnheld < SLOWTURNTICS)
-        tspeed = 2;             // slow turn
-    else
-        tspeed = speed;
-
-    if (gamekeydown[key_lookdown] || gamekeydown[key_lookup])
-    {
-        lookheld += ticdup;
-    }
-    else
-    {
-        lookheld = 0;
-    }
-    if (lookheld < SLOWTURNTICS)
-    {
-        lspeed = 1;             // 3;
-    }
-    else
-    {
-        lspeed = 2;             // 5;
-    }
-
-//
-// let movement keys cancel each other out
-//
-    if (strafe)
-    {
-        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-        {
-            side += sidemove[pClass][speed];
-        }
-        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-        {
-            side -= sidemove[pClass][speed];
-        }
-        if (use_analog && joyxmove)
-        {
-            joyxmove = joyxmove * joystick_move_sensitivity / 10;
-            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
-            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
-            side += FixedMul(sidemove[pClass][speed], joyxmove);
-        }
-        else if (joystick_move_sensitivity)
-        {
-            if (joyxmove > 0)
-            {
-                side += sidemove[pClass][speed];
-            }
-            if (joyxmove < 0)
-            {
-                side -= sidemove[pClass][speed];
-            }
-        }
-    }
-    else
-    {
-        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-            cmd->angleturn -= angleturn[tspeed];
-        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-            cmd->angleturn += angleturn[tspeed];
-        if (use_analog && joyxmove)
-        {
-            // Cubic response curve allows for finer control when stick
-            // deflection is small.
-            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
-            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
-            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
-        }
-        else if (joystick_turn_sensitivity)
-        {
-            if (joyxmove > 0)
-                cmd->angleturn -= angleturn[tspeed];
-            if (joyxmove < 0)
-                cmd->angleturn += angleturn[tspeed];
-        }
-    }
-
-    if (gamekeydown[key_up])
-    {
-        forward += forwardmove[pClass][speed];
-    }
-    if (gamekeydown[key_down])
-    {
-        forward -= forwardmove[pClass][speed];
-    }
-    if (use_analog && joyymove)
-    {
-        joyymove = joyymove * joystick_move_sensitivity / 10;
-        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
-        joyymove = (joyymove < -FRACUNIT) ? FRACUNIT : joyymove;
-        forward -= FixedMul(forwardmove[pClass][speed], joyymove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joyymove < 0)
-        {
-            forward += forwardmove[pClass][speed];
-        }
-        if (joyymove > 0)
-        {
-            forward -= forwardmove[pClass][speed];
-        }
-    }
-    if (gamekeydown[key_straferight] || mousebuttons[mousebstraferight]
-     || joybuttons[joybstraferight])
-    {
-        side += sidemove[pClass][speed];
-    }
-    if (gamekeydown[key_strafeleft] || mousebuttons[mousebstrafeleft]
-     || joybuttons[joybstrafeleft])
-    {
-        side -= sidemove[pClass][speed];
-    }
-
-    if (use_analog && joystrafemove)
-    {
-        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
-        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
-        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
-        side += FixedMul(sidemove[pClass][speed], joystrafemove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joystrafemove < 0)
-            side -= sidemove[pClass][speed];
-        if (joystrafemove > 0)
-            side += sidemove[pClass][speed];
-    }
-
-    // Look up/down/center keys
-    if (gamekeydown[key_lookup])
-    {
-        look = lspeed;
-    }
-    if (gamekeydown[key_lookdown])
-    {
-        look = -lspeed;
-    }
-    if (use_analog && joylook)
-    {
-        joylook = joylook * joystick_look_sensitivity / 10;
-        joylook = (joylook > FRACUNIT) ? FRACUNIT : joylook;
-        joylook = (joylook < -FRACUNIT) ? -FRACUNIT : joylook;
-        look = -FixedMul(2, joylook);
-    }
-    else if (joystick_look_sensitivity)
-    {
-        if (joylook < 0)
-        {
-            look = lspeed;
-        }
-
-        if (joylook > 0)
-        {
-            look = -lspeed;
-        }
-    }
-    // haleyjd: removed externdriver crap
-    if (gamekeydown[key_lookcenter])
-    {
-        look = TOCENTER;
-    }
-
-    // haleyjd: removed externdriver crap
-
-    // Fly up/down/drop keys
-    if (gamekeydown[key_flyup] || joybuttons[joybflyup])
-    {
-        flyheight = 5;          // note that the actual flyheight will be twice this
-    }
-    if (gamekeydown[key_flydown] || joybuttons[joybflydown])
-    {
-        flyheight = -5;
-    }
-    if (gamekeydown[key_flycenter] || joybuttons[joybflycenter])
-    {
-        flyheight = TOCENTER;
-        // haleyjd: removed externdriver crap
-        look = TOCENTER;
-    }
-    // Use artifact key
-    if (gamekeydown[key_useartifact] || mousebuttons[mousebuseartifact]
-        || joybuttons[joybuseartifact])
-    {
-        if (gamekeydown[key_speed] && artiskip)
-        {
-            if (players[consoleplayer].inventory[inv_ptr].type != arti_none)
-            {                   // Skip an artifact
-                gamekeydown[key_useartifact] = false;
-                mousebuttons[mousebuseartifact] = false;
-                joybuttons[joybuseartifact] = false;
-                P_PlayerNextArtifact(&players[consoleplayer]);
-            }
-        }
-        else
-        {
-            if (inventory)
-            {
-                players[consoleplayer].readyArtifact =
-                    players[consoleplayer].inventory[inv_ptr].type;
-                inventory = false;
-                cmd->arti = 0;
-                usearti = false;
-            }
-            else if (usearti)
-            {
-                cmd->arti |=
-                    players[consoleplayer].inventory[inv_ptr].
-                    type & AFLAG_MASK;
-                usearti = false;
-            }
-        }
-    }
-    if (gamekeydown[key_jump] || mousebuttons[mousebjump]
-        || joybuttons[joybjump])
-    {
-        cmd->arti |= AFLAG_JUMP;
-    }
-    if (mn_SuicideConsole)
-    {
-        cmd->arti |= AFLAG_SUICIDE;
-        mn_SuicideConsole = false;
-    }
-
-    // Artifact hot keys
-    if (gamekeydown[key_arti_all] && !cmd->arti)
-    {
-        gamekeydown[key_arti_all] = false;     // Use one of each artifact
-        cmd->arti = NUMARTIFACTS;
-    }
-    else if (gamekeydown[key_arti_health] && !cmd->arti
-             && (players[consoleplayer].mo->health < MAXHEALTH))
-    {
-        gamekeydown[key_arti_health] = false;
-        cmd->arti = arti_health;
-    }
-    else if (gamekeydown[key_arti_poisonbag] && !cmd->arti)
-    {
-        gamekeydown[key_arti_poisonbag] = false;
-        cmd->arti = arti_poisonbag;
-    }
-    else if (gamekeydown[key_arti_blastradius] && !cmd->arti)
-    {
-        gamekeydown[key_arti_blastradius] = false;
-        cmd->arti = arti_blastradius;
-    }
-    else if (gamekeydown[key_arti_teleport] && !cmd->arti)
-    {
-        gamekeydown[key_arti_teleport] = false;
-        cmd->arti = arti_teleport;
-    }
-    else if (gamekeydown[key_arti_teleportother] && !cmd->arti)
-    {
-        gamekeydown[key_arti_teleportother] = false;
-        cmd->arti = arti_teleportother;
-    }
-    else if (gamekeydown[key_arti_egg] && !cmd->arti)
-    {
-        gamekeydown[key_arti_egg] = false;
-        cmd->arti = arti_egg;
-    }
-    else if (gamekeydown[key_arti_invulnerability] && !cmd->arti
-             && !players[consoleplayer].powers[pw_invulnerability])
-    {
-        gamekeydown[key_arti_invulnerability] = false;
-        cmd->arti = arti_invulnerability;
-    }
-
-//
-// buttons
-//
-    cmd->chatchar = CT_dequeueChatChar();
-
-    if (gamekeydown[key_fire] || mousebuttons[mousebfire]
-        || joybuttons[joybfire])
-        cmd->buttons |= BT_ATTACK;
-
-    if (gamekeydown[key_use] || joybuttons[joybuse] || mousebuttons[mousebuse])
-    {
-        cmd->buttons |= BT_USE;
-        dclicks = 0;            // clear double clicks if hit use button
-    }
-
-    // Weapon cycling. Switch to previous or next weapon.
-    // (Disabled when player is a pig).
-    if (gamestate == GS_LEVEL
-     && players[consoleplayer].morphTics == 0 && next_weapon != 0)
-    {
-        int start_i;
-
-        if (players[consoleplayer].pendingweapon == WP_NOCHANGE)
-        {
-            i = players[consoleplayer].readyweapon;
-        }
-        else
-        {
-            i = players[consoleplayer].pendingweapon;
-        }
-
-        // Don't loop forever.
-        start_i = i;
-        do {
-            i = (i + next_weapon + NUMWEAPONS) % NUMWEAPONS;
-        } while (i != start_i && !players[consoleplayer].weaponowned[i]);
-
-        cmd->buttons |= BT_CHANGE;
-        cmd->buttons |= i << BT_WEAPONSHIFT;
-    }
-    else
-    {
-        for (i=0; i<arrlen(weapon_keys); ++i)
-        {
-            int key = *weapon_keys[i];
-
-            if (gamekeydown[key])
-            {
-                cmd->buttons |= BT_CHANGE; 
-                cmd->buttons |= i<<BT_WEAPONSHIFT; 
-                break; 
-            }
-        }
-    }
-
-    next_weapon = 0;
-
-//
-// mouse
-//
-    if (mousebuttons[mousebforward])
-    {
-        forward += forwardmove[pClass][speed];
-    }
-    if (mousebuttons[mousebbackward])
-    {
-        forward -= forwardmove[pClass][speed];
-    }
-
-    // Double click to use can be disabled
-
-    if (dclick_use)
-    {
-        //
-        // forward double click
-        //
-        if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1)
-        {
-            dclickstate = mousebuttons[mousebforward];
-            if (dclickstate)
-                dclicks++;
-            if (dclicks == 2)
-            {
-                cmd->buttons |= BT_USE;
-                dclicks = 0;
-            }
-            else
-                dclicktime = 0;
-        }
-        else
-        {
-            dclicktime += ticdup;
-            if (dclicktime > 20)
-            {
-                dclicks = 0;
-                dclickstate = 0;
-            }
-        }
-
-        //
-        // strafe double click
-        //
-        bstrafe = mousebuttons[mousebstrafe] || joybuttons[joybstrafe];
-        if (bstrafe != dclickstate2 && dclicktime2 > 1)
-        {
-            dclickstate2 = bstrafe;
-            if (dclickstate2)
-                dclicks2++;
-            if (dclicks2 == 2)
-            {
-                cmd->buttons |= BT_USE;
-                dclicks2 = 0;
-            }
-            else
-                dclicktime2 = 0;
-        }
-        else
-        {
-            dclicktime2 += ticdup;
-            if (dclicktime2 > 20)
-            {
-                dclicks2 = 0;
-                dclickstate2 = 0;
-            }
-        }
-    }
-
-    if (strafe)
-    {
-        side += mousex * 2;
-    }
-    else
-    {
-        cmd->angleturn -= mousex * 0x8;
-    }
-
-    if (mousex == 0)
-    {
-        testcontrols_mousespeed = 0;
-    }
-
-    forward += mousey;
-    mousex = mousey = 0;
-
-    if (forward > MaxPlayerMove[pClass])
-    {
-        forward = MaxPlayerMove[pClass];
-    }
-    else if (forward < -MaxPlayerMove[pClass])
-    {
-        forward = -MaxPlayerMove[pClass];
-    }
-    if (side > MaxPlayerMove[pClass])
-    {
-        side = MaxPlayerMove[pClass];
-    }
-    else if (side < -MaxPlayerMove[pClass])
-    {
-        side = -MaxPlayerMove[pClass];
-    }
-    if (players[consoleplayer].powers[pw_speed]
-        && !players[consoleplayer].morphTics)
-    {                           // Adjust for a player with a speed artifact
-        forward = (3 * forward) >> 1;
-        side = (3 * side) >> 1;
-    }
-    cmd->forwardmove += forward;
-    cmd->sidemove += side;
-    if (players[consoleplayer].playerstate == PST_LIVE)
-    {
-        if (look < 0)
-        {
-            look += 16;
-        }
-        cmd->lookfly = look;
-    }
-    if (flyheight < 0)
-    {
-        flyheight += 16;
-    }
-    cmd->lookfly |= flyheight << 4;
-
-//
-// special buttons
-//
-    if (sendpause)
-    {
-        sendpause = false;
-        cmd->buttons = BT_SPECIAL | BTS_PAUSE;
-    }
-
-    if (sendsave)
-    {
-        sendsave = false;
-        cmd->buttons =
-            BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
-    }
-
-    if (lowres_turn)
-    {
-        if (shortticfix)
-        {
-            static signed short carry = 0;
-            signed short desired_angleturn;
-
-            desired_angleturn = cmd->angleturn + carry;
-
-            // round angleturn to the nearest 256 unit boundary
-            // for recording demos with single byte values for turn
-
-            cmd->angleturn = (desired_angleturn + 128) & 0xff00;
-
-            // Carry forward the error from the reduced resolution to the
-            // next tic, so that successive small movements can accumulate.
-
-            carry = desired_angleturn - cmd->angleturn;
-        }
-        else
-        {
-            // truncate angleturn to the nearest 256 boundary
-            // for recording demos with single byte values for turn
-            cmd->angleturn &= 0xff00;
-        }
-    }
-}
-
-
-/*
-==============
-=
-= G_DoLoadLevel
-=
-==============
-*/
-
-void G_DoLoadLevel(void)
-{
-    int i;
-
-    levelstarttic = gametic;    // for time calculation 
-    gamestate = GS_LEVEL;
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (playeringame[i] && players[i].playerstate == PST_DEAD)
-            players[i].playerstate = PST_REBORN;
-        memset(players[i].frags, 0, sizeof(players[i].frags));
-    }
-
-    SN_StopAllSequences();
-    P_SetupLevel(gameepisode, gamemap, 0, gameskill);
-    displayplayer = consoleplayer;      // view the guy you are playing   
-    gameaction = ga_nothing;
-    Z_CheckHeap();
-
-//
-// clear cmd building stuff
-// 
-
-    memset(gamekeydown, 0, sizeof(gamekeydown));
-    joyxmove = joyymove = joystrafemove = joylook = 0;
-    mousex = mousey = 0;
-    sendpause = sendsave = paused = false;
-    memset(mousearray, 0, sizeof(mousearray));
-    memset(joyarray, 0, sizeof(joyarray));
-
-    if (testcontrols)
-    {
-        P_SetMessage(&players[consoleplayer], "PRESS ESCAPE TO QUIT.", false);
-    }
-}
-
-static void SetJoyButtons(unsigned int buttons_mask)
-{
-    int i;
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-
-    for (i=0; i<MAX_JOY_BUTTONS; ++i)
-    {
-        int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!joybuttons[i] && button_on)
-        {
-            // Weapon cycling:
-
-            if (i == joybprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == joybnextweapon)
-            {
-                next_weapon = 1;
-            }
-            else if (i == joybinvleft)
-            {
-                InventoryMoveLeft();
-            }
-            else if (i == joybinvright)
-            {
-                InventoryMoveRight();
-            }
-            else if (i == joybuseartifact)
-            {
-                if (!inventory)
-                {
-                    plr->readyArtifact = plr->inventory[inv_ptr].type;
-                }
-                usearti = true;
-            }
-        }
-
-        joybuttons[i] = button_on;
-    }
-}
-
-// If an InventoryMove*() function is called when the inventory is not active,
-// it will instead activate the inventory without attempting to change the
-// selected item. This action is indicated by a return value of false.
-// Otherwise, it attempts to change items and will return a value of true.
-
-static boolean InventoryMoveLeft()
-{
-    inventoryTics = 5 * 35;
-    if (!inventory)
-    {
-        inventory = true;
-        return false;
-    }
-    inv_ptr--;
-    if (inv_ptr < 0)
-    {
-        inv_ptr = 0;
-    }
-    else
-    {
-        curpos--;
-        if (curpos < 0)
-        {
-            curpos = 0;
-        }
-    }
-    return true;
-}
-
-static boolean InventoryMoveRight()
-{
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-    inventoryTics = 5 * 35;
-    if (!inventory)
-    {
-        inventory = true;
-        return false;
-    }
-    inv_ptr++;
-    if (inv_ptr >= plr->inventorySlotNum)
-    {
-        inv_ptr--;
-        if (inv_ptr < 0)
-            inv_ptr = 0;
-    }
-    else
-    {
-        curpos++;
-        if (curpos > 6)
-        {
-            curpos = 6;
-        }
-    }
-    return true;
-}
-
-static void SetMouseButtons(unsigned int buttons_mask)
-{
-    int i;
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-
-    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
-    {
-        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!mousebuttons[i] && button_on)
-        {
-            if (i == mousebprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == mousebnextweapon)
-            {
-                next_weapon = 1;
-            }
-            else if (i == mousebinvleft)
-            {
-                InventoryMoveLeft();
-            }
-            else if (i == mousebinvright)
-            {
-                InventoryMoveRight();
-            }
-            else if (i == mousebuseartifact)
-            {
-                if (!inventory)
-                {
-                    plr->readyArtifact = plr->inventory[inv_ptr].type;
-                }
-                usearti = true;
-            }
-        }
-
-        mousebuttons[i] = button_on;
-    }
-}
-
-/*
-===============================================================================
-=
-= G_Responder 
-=
-= get info needed to make ticcmd_ts for the players
-=
-===============================================================================
-*/
-
-boolean G_Responder(event_t * ev)
-{
-    player_t *plr;
-
-    plr = &players[consoleplayer];
-    if (ev->type == ev_keyup && ev->data1 == key_useartifact)
-    {                           // flag to denote that it's okay to use an artifact
-        if (!inventory)
-        {
-            plr->readyArtifact = plr->inventory[inv_ptr].type;
-        }
-        usearti = true;
-    }
-
-    // Check for spy mode player cycle
-    if (gamestate == GS_LEVEL && ev->type == ev_keydown
-        && ev->data1 == key_spy && !deathmatch)
-    {                           // Cycle the display player
-        do
-        {
-            displayplayer++;
-            if (displayplayer == maxplayers)
-            {
-                displayplayer = 0;
-            }
-        }
-        while (!playeringame[displayplayer]
-               && displayplayer != consoleplayer);
-        return (true);
-    }
-
-    if (CT_Responder(ev))
-    {                           // Chat ate the event
-        return (true);
-    }
-    if (gamestate == GS_LEVEL)
-    {
-        if (SB_Responder(ev))
-        {                       // Status bar ate the event
-            return (true);
-        }
-        if (AM_Responder(ev))
-        {                       // Automap ate the event
-            return (true);
-        }
-    }
-
-    if (ev->type == ev_mouse)
-    {
-        testcontrols_mousespeed = abs(ev->data2);
-    }
-
-    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
-    {
-        next_weapon = -1;
-    }
-    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
-    {
-        next_weapon = 1;
-    }
-
-    switch (ev->type)
-    {
-        case ev_keydown:
-            if (ev->data1 == key_invleft)
-            {
-                if (InventoryMoveLeft())
-                {
-                    return (true);
-                }
-                break;
-            }
-            if (ev->data1 == key_invright)
-            {
-                if (InventoryMoveRight())
-                {
-                    return (true);
-                }
-                break;
-            }
-            if (ev->data1 == key_pause && !MenuActive)
-            {
-                sendpause = true;
-                return (true);
-            }
-            if (ev->data1 < NUMKEYS)
-            {
-                gamekeydown[ev->data1] = true;
-            }
-            return (true);      // eat key down events
-
-        case ev_keyup:
-            if (ev->data1 < NUMKEYS)
-            {
-                gamekeydown[ev->data1] = false;
-            }
-            return (false);     // always let key up events filter down
-
-        case ev_mouse:
-            SetMouseButtons(ev->data1);
-            mousex = ev->data2 * (mouseSensitivity + 5) / 10;
-            mousey = ev->data3 * (mouseSensitivity + 5) / 10;
-            return (true);      // eat events
-
-        case ev_joystick:
-            SetJoyButtons(ev->data1);
-            joyxmove = ev->data2;
-            joyymove = ev->data3;
-            joystrafemove = ev->data4;
-            joylook = ev->data5;
-            return (true);      // eat events
-
-        default:
-            break;
-    }
-    return (false);
-}
-
-
-//==========================================================================
-//
-// G_Ticker
-//
-//==========================================================================
-
-void G_Ticker(void)
-{
-    int i, buf;
-    ticcmd_t *cmd = NULL;
-
-//
-// do player reborns if needed
-//
-    for (i = 0; i < maxplayers; i++)
-        if (playeringame[i] && players[i].playerstate == PST_REBORN)
-            G_DoReborn(i);
-
-//
-// do things to change the game state
-//
-    while (gameaction != ga_nothing)
-    {
-        switch (gameaction)
-        {
-            case ga_loadlevel:
-                G_DoLoadLevel();
-                break;
-            case ga_initnew:
-                G_DoInitNew();
-                break;
-            case ga_newgame:
-                G_DoNewGame();
-                break;
-            case ga_loadgame:
-                Draw_LoadIcon();
-                G_DoLoadGame();
-                break;
-            case ga_savegame:
-                Draw_SaveIcon();
-                G_DoSaveGame();
-                break;
-            case ga_singlereborn:
-                G_DoSingleReborn();
-                break;
-            case ga_playdemo:
-                G_DoPlayDemo();
-                break;
-            case ga_screenshot:
-                V_ScreenShot("HEXEN%02i.%s");
-                P_SetMessage(&players[consoleplayer], "SCREEN SHOT", false);
-                gameaction = ga_nothing;
-                break;
-            case ga_leavemap:
-                Draw_TeleportIcon();
-                G_DoTeleportNewMap();
-                break;
-            case ga_completed:
-                G_DoCompleted();
-                break;
-            case ga_worlddone:
-                G_DoWorldDone();
-                break;
-            case ga_victory:
-                F_StartFinale();
-                break;
-            default:
-                break;
-        }
-    }
-
-
-//
-// get commands, check consistancy, and build new consistancy check
-//
-    //buf = gametic%BACKUPTICS;
-    buf = (gametic / ticdup) % BACKUPTICS;
-
-    for (i = 0; i < maxplayers; i++)
-        if (playeringame[i])
-        {
-            cmd = &players[i].cmd;
-
-            memcpy(cmd, &netcmds[i], sizeof(ticcmd_t));
-
-            if (demoplayback)
-                G_ReadDemoTiccmd(cmd);
-            if (demorecording)
-                G_WriteDemoTiccmd(cmd);
-
-            if (netgame && !netdemo && !(gametic % ticdup))
-            {
-                if (gametic > BACKUPTICS
-                    && consistancy[i][buf] != cmd->consistancy)
-                {
-                    I_Error("consistency failure (%i should be %i)",
-                            cmd->consistancy, consistancy[i][buf]);
-                }
-                if (players[i].mo)
-                    consistancy[i][buf] = players[i].mo->x;
-                else
-                    consistancy[i][buf] = rndindex;
-            }
-        }
-
-//
-// check for special buttons
-//
-    for (i = 0; i < maxplayers; i++)
-        if (playeringame[i])
-        {
-            if (players[i].cmd.buttons & BT_SPECIAL)
-            {
-                switch (players[i].cmd.buttons & BT_SPECIALMASK)
-                {
-                    case BTS_PAUSE:
-                        paused ^= 1;
-                        if (paused)
-                        {
-                            S_PauseSound();
-                        }
-                        else
-                        {
-                            S_ResumeSound();
-                        }
-                        break;
-
-                    case BTS_SAVEGAME:
-                        if (!savedescription[0])
-                        {
-                            if (netgame)
-                            {
-                                M_StringCopy(savedescription, "NET GAME",
-                                             sizeof(savedescription));
-                            }
-                            else
-                            {
-                                M_StringCopy(savedescription, "SAVE GAME",
-                                             sizeof(savedescription));
-                            }
-                        }
-                        savegameslot =
-                            (players[i].cmd.
-                             buttons & BTS_SAVEMASK) >> BTS_SAVESHIFT;
-                        gameaction = ga_savegame;
-                        break;
-                }
-            }
-        }
-    // turn inventory off after a certain amount of time
-    if (inventory && !(--inventoryTics))
-    {
-        players[consoleplayer].readyArtifact =
-            players[consoleplayer].inventory[inv_ptr].type;
-        inventory = false;
-        cmd->arti = 0;
-    }
-//
-// do main actions
-//
-//
-// do main actions
-//
-    switch (gamestate)
-    {
-        case GS_LEVEL:
-            P_Ticker();
-            SB_Ticker();
-            AM_Ticker();
-            CT_Ticker();
-            break;
-        case GS_INTERMISSION:
-            IN_Ticker();
-            break;
-        case GS_FINALE:
-            F_Ticker();
-            break;
-        case GS_DEMOSCREEN:
-            H2_PageTicker();
-            break;
-    }
-}
-
-
-/*
-==============================================================================
-
-						PLAYER STRUCTURE FUNCTIONS
-
-also see P_SpawnPlayer in P_Things
-==============================================================================
-*/
-
-//==========================================================================
-//
-// G_PlayerExitMap
-//
-// Called when the player leaves a map.
-//
-//==========================================================================
-
-void G_PlayerExitMap(int playerNumber)
-{
-    int i;
-    player_t *player;
-    int flightPower;
-
-    player = &players[playerNumber];
-
-//      if(deathmatch)
-//      {
-//              // Strip all but one of each type of artifact
-//              for(i = 0; i < player->inventorySlotNum; i++)
-//              {
-//                      player->inventory[i].count = 1;
-//              }
-//              player->artifactCount = player->inventorySlotNum;
-//      }
-//      else
-
-    // Strip all current powers (retain flight)
-    flightPower = player->powers[pw_flight];
-    memset(player->powers, 0, sizeof(player->powers));
-    player->powers[pw_flight] = flightPower;
-
-    if (deathmatch)
-    {
-        player->powers[pw_flight] = 0;
-    }
-    else
-    {
-        if (P_GetMapCluster(gamemap) != P_GetMapCluster(LeaveMap))
-        {                       // Entering new cluster
-            // Strip all keys
-            player->keys = 0;
-
-            // Strip flight artifact
-            for (i = 0; i < 25; i++)
-            {
-                player->powers[pw_flight] = 0;
-                P_PlayerUseArtifact(player, arti_fly);
-            }
-            player->powers[pw_flight] = 0;
-        }
-    }
-
-    if (player->morphTics)
-    {
-        player->readyweapon = player->mo->special1.i;     // Restore weapon
-        player->morphTics = 0;
-    }
-    player->messageTics = 0;
-    player->lookdir = 0;
-    player->mo->flags &= ~MF_SHADOW;    // Remove invisibility
-    player->extralight = 0;     // Remove weapon flashes
-    player->fixedcolormap = 0;  // Remove torch
-    player->damagecount = 0;    // No palette changes
-    player->bonuscount = 0;
-    player->poisoncount = 0;
-    if (player == &players[consoleplayer])
-    {
-        SB_state = -1;          // refresh the status bar
-        viewangleoffset = 0;
-    }
-}
-
-//==========================================================================
-//
-// G_PlayerReborn
-//
-// Called after a player dies.  Almost everything is cleared and
-// initialized.
-//
-//==========================================================================
-
-void G_PlayerReborn(int player)
-{
-    player_t *p;
-    int frags[MAXPLAYERS];
-    int killcount, itemcount, secretcount;
-    unsigned int worldTimer;
-
-    memcpy(frags, players[player].frags, sizeof(frags));
-    killcount = players[player].killcount;
-    itemcount = players[player].itemcount;
-    secretcount = players[player].secretcount;
-    worldTimer = players[player].worldTimer;
-
-    p = &players[player];
-    memset(p, 0, sizeof(*p));
-
-    memcpy(players[player].frags, frags, sizeof(players[player].frags));
-    players[player].killcount = killcount;
-    players[player].itemcount = itemcount;
-    players[player].secretcount = secretcount;
-    players[player].worldTimer = worldTimer;
-    players[player].class = PlayerClass[player];
-
-    p->usedown = p->attackdown = true;  // don't do anything immediately
-    p->playerstate = PST_LIVE;
-    p->health = MAXHEALTH;
-    p->readyweapon = p->pendingweapon = WP_FIRST;
-    p->weaponowned[WP_FIRST] = true;
-    p->messageTics = 0;
-    p->lookdir = 0;
-    localQuakeHappening[player] = false;
-    if (p == &players[consoleplayer])
-    {
-        SB_state = -1;          // refresh the status bar
-        inv_ptr = 0;            // reset the inventory pointer
-        curpos = 0;
-        viewangleoffset = 0;
-    }
-}
-
-/*
-====================
-=
-= G_CheckSpot 
-=
-= Returns false if the player cannot be respawned at the given mapthing_t spot 
-= because something is occupying it
-====================
-*/
-
-void P_SpawnPlayer(mapthing_t * mthing);
-
-boolean G_CheckSpot(int playernum, mapthing_t * mthing)
-{
-    fixed_t x, y;
-    subsector_t *ss;
-    unsigned an;
-    mobj_t *mo;
-
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-
-    players[playernum].mo->flags2 &= ~MF2_PASSMOBJ;
-    if (!P_CheckPosition(players[playernum].mo, x, y))
-    {
-        players[playernum].mo->flags2 |= MF2_PASSMOBJ;
-        return false;
-    }
-    players[playernum].mo->flags2 |= MF2_PASSMOBJ;
-
-// spawn a teleport fog
-    ss = R_PointInSubsector(x, y);
-    an = ((unsigned) ANG45 * (mthing->angle / 45)) >> ANGLETOFINESHIFT;
-
-    mo = P_SpawnMobj(x + 20 * finecosine[an], y + 20 * finesine[an],
-                     ss->sector->floorheight + TELEFOGHEIGHT, MT_TFOG);
-    if (players[consoleplayer].viewz != 1)
-        S_StartSound(mo, SFX_TELEPORT); // don't start sound on first frame
-
-    return true;
-}
-
-/*
-====================
-=
-= G_DeathMatchSpawnPlayer
-=
-= Spawns a player at one of the random death match spots
-= called at level load and each death
-====================
-*/
-
-void G_DeathMatchSpawnPlayer(int playernum)
-{
-    int i, j;
-    int selections;
-
-    selections = deathmatch_p - deathmatchstarts;
-
-    // This check has been moved to p_setup.c:P_LoadThings()
-    //if (selections < 8)
-    //      I_Error ("Only %i deathmatch spots, 8 required", selections);
-
-    for (j = 0; j < 20; j++)
-    {
-        i = P_Random() % selections;
-        if (G_CheckSpot(playernum, &deathmatchstarts[i]))
-        {
-            deathmatchstarts[i].type = playernum + 1;
-            P_SpawnPlayer(&deathmatchstarts[i]);
-            return;
-        }
-    }
-
-// no good spot, so the player will probably get stuck
-    P_SpawnPlayer(&playerstarts[0][playernum]);
-}
-
-//==========================================================================
-//
-// G_DoReborn
-//
-//==========================================================================
-
-void G_DoReborn(int playernum)
-{
-    int i;
-    boolean oldWeaponowned[NUMWEAPONS];
-    int oldKeys;
-    int oldPieces;
-    boolean foundSpot;
-    int bestWeapon;
-
-    // quit demo unless -demoextend
-    if (!demoextend && G_CheckDemoStatus())
-    {
-        return;
-    }
-    if (!netgame)
-    {
-        if (SV_RebornSlotAvailable())
-        {                       // Use the reborn code if the slot is available
-            gameaction = ga_singlereborn;
-        }
-        else
-        {                       // Start a new game if there's no reborn info
-            gameaction = ga_newgame;
-        }
-    }
-    else
-    {                           // Net-game
-        players[playernum].mo->player = NULL;   // Dissassociate the corpse
-
-        if (deathmatch)
-        {                       // Spawn at random spot if in death match
-            G_DeathMatchSpawnPlayer(playernum);
-            return;
-        }
-
-        // Cooperative net-play, retain keys and weapons
-        oldKeys = players[playernum].keys;
-        oldPieces = players[playernum].pieces;
-        for (i = 0; i < NUMWEAPONS; i++)
-        {
-            oldWeaponowned[i] = players[playernum].weaponowned[i];
-        }
-
-        foundSpot = false;
-        if (G_CheckSpot(playernum, &playerstarts[RebornPosition][playernum]))
-        {                       // Appropriate player start spot is open
-            P_SpawnPlayer(&playerstarts[RebornPosition][playernum]);
-            foundSpot = true;
-        }
-        else
-        {
-            // Try to spawn at one of the other player start spots
-            for (i = 0; i < maxplayers; i++)
-            {
-                if (G_CheckSpot(playernum, &playerstarts[RebornPosition][i]))
-                {               // Found an open start spot
-
-                    // Fake as other player
-                    playerstarts[RebornPosition][i].type = playernum + 1;
-                    P_SpawnPlayer(&playerstarts[RebornPosition][i]);
-
-                    // Restore proper player type
-                    playerstarts[RebornPosition][i].type = i + 1;
-
-                    foundSpot = true;
-                    break;
-                }
-            }
-        }
-
-        if (foundSpot == false)
-        {                       // Player's going to be inside something
-            P_SpawnPlayer(&playerstarts[RebornPosition][playernum]);
-        }
-
-        // Restore keys and weapons
-        players[playernum].keys = oldKeys;
-        players[playernum].pieces = oldPieces;
-        for (bestWeapon = 0, i = 0; i < NUMWEAPONS; i++)
-        {
-            if (oldWeaponowned[i])
-            {
-                bestWeapon = i;
-                players[playernum].weaponowned[i] = true;
-            }
-        }
-        players[playernum].mana[MANA_1] = 25;
-        players[playernum].mana[MANA_2] = 25;
-        if (bestWeapon)
-        {                       // Bring up the best weapon
-            players[playernum].pendingweapon = bestWeapon;
-        }
-    }
-}
-
-void G_ScreenShot(void)
-{
-    gameaction = ga_screenshot;
-}
-
-//==========================================================================
-//
-// G_StartNewInit
-//
-//==========================================================================
-
-void G_StartNewInit(void)
-{
-    SV_InitBaseSlot();
-    SV_ClearRebornSlot();
-    P_ACSInitNewGame();
-    // Default the player start spot group to 0
-    RebornPosition = 0;
-}
-
-//==========================================================================
-//
-// G_StartNewGame
-//
-//==========================================================================
-
-void G_StartNewGame(skill_t skill)
-{
-    int realMap;
-
-    G_StartNewInit();
-    realMap = P_TranslateMap(1);
-    if (realMap == -1)
-    {
-        realMap = 1;
-    }
-    G_InitNew(TempSkill, 1, realMap);
-}
-
-//==========================================================================
-//
-// G_TeleportNewMap
-//
-// Only called by the warp cheat code.  Works just like normal map to map
-// teleporting, but doesn't do any interlude stuff.
-//
-//==========================================================================
-
-void G_TeleportNewMap(int map, int position)
-{
-    gameaction = ga_leavemap;
-    LeaveMap = map;
-    LeavePosition = position;
-}
-
-//==========================================================================
-//
-// G_DoTeleportNewMap
-//
-//==========================================================================
-
-void G_DoTeleportNewMap(void)
-{
-    SV_MapTeleport(LeaveMap, LeavePosition);
-    gamestate = GS_LEVEL;
-    gameaction = ga_nothing;
-    RebornPosition = LeavePosition;
-}
-
-/*
-boolean secretexit;
-void G_ExitLevel (void)
-{
-	secretexit = false;
-	gameaction = ga_completed;
-}
-void G_SecretExitLevel (void)
-{
-	secretexit = true;
-	gameaction = ga_completed;
-}
-*/
-
-//==========================================================================
-//
-// G_Completed
-//
-// Starts intermission routine, which is used only during hub exits,
-// and DeathMatch games.
-//==========================================================================
-
-void G_Completed(int map, int position)
-{
-    if (gamemode == shareware && map > 4)
-    {
-        P_SetMessage(&players[consoleplayer], "ACCESS DENIED -- DEMO", true);
-        S_StartSound(NULL, SFX_CHAT);
-        return;
-    }
-
-    gameaction = ga_completed;
-    LeaveMap = map;
-    LeavePosition = position;
-}
-
-void G_DoCompleted(void)
-{
-    int i;
-
-    gameaction = ga_nothing;
-
-    // quit demo unless -demoextend
-    if (!demoextend && G_CheckDemoStatus())
-    {
-        return;
-    }
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (playeringame[i])
-        {
-            G_PlayerExitMap(i);
-        }
-    }
-    if (LeaveMap == -1 && LeavePosition == -1)
-    {
-        gameaction = ga_victory;
-        return;
-    }
-    else
-    {
-        gamestate = GS_INTERMISSION;
-        IN_Start();
-    }
-
-/*
-	int i;
-	static int afterSecret[3] = { 7, 5, 5 };
-
-	gameaction = ga_nothing;
-	if(G_CheckDemoStatus())
-	{
-		return;
-	}
-	for(i = 0; i < maxplayers; i++)
-	{
-		if(playeringame[i])
-		{
-			G_PlayerFinishLevel(i);
-		}
-	}
-	prevmap = gamemap;
-	if(secretexit == true)
-	{
-		gamemap = 9;
-	}
-	else if(gamemap == 9)
-	{ // Finished secret level
-		gamemap = afterSecret[gameepisode-1];
-	}
-	else if(gamemap == 8)
-	{
-		gameaction = ga_victory;
-		return;
-	}
-	else
-	{
-		gamemap++;
-	}
-	gamestate = GS_INTERMISSION;
-	IN_Start();
-*/
-}
-
-//============================================================================
-//
-// G_WorldDone
-//
-//============================================================================
-
-void G_WorldDone(void)
-{
-    gameaction = ga_worlddone;
-}
-
-//============================================================================
-//
-// G_DoWorldDone
-//
-//============================================================================
-
-void G_DoWorldDone(void)
-{
-    gamestate = GS_LEVEL;
-    G_DoLoadLevel();
-    gameaction = ga_nothing;
-    viewactive = true;
-}
-
-//==========================================================================
-//
-// G_DoSingleReborn
-//
-// Called by G_Ticker based on gameaction.  Loads a game from the reborn
-// save slot.
-//
-//==========================================================================
-
-void G_DoSingleReborn(void)
-{
-    gameaction = ga_nothing;
-    SV_LoadGame(SV_GetRebornSlot());
-    SB_SetClassData();
-}
-
-//==========================================================================
-//
-// G_LoadGame
-//
-// Can be called by the startup code or the menu task.
-//
-//==========================================================================
-
-static int GameLoadSlot;
-
-void G_LoadGame(int slot)
-{
-    GameLoadSlot = slot;
-    gameaction = ga_loadgame;
-}
-
-//==========================================================================
-//
-// G_DoLoadGame
-//
-// Called by G_Ticker based on gameaction.
-//
-//==========================================================================
-
-void G_DoLoadGame(void)
-{
-    gameaction = ga_nothing;
-    SV_LoadGame(GameLoadSlot);
-    if (!netgame)
-    {                           // Copy the base slot to the reborn slot
-        SV_UpdateRebornSlot();
-    }
-    SB_SetClassData();
-}
-
-//==========================================================================
-//
-// G_SaveGame
-//
-// Called by the menu task.  <description> is a 24 byte text string.
-//
-//==========================================================================
-
-void G_SaveGame(int slot, char *description)
-{
-    savegameslot = slot;
-    M_StringCopy(savedescription, description, sizeof(savedescription));
-    sendsave = true;
-}
-
-//==========================================================================
-//
-// G_DoSaveGame
-//
-// Called by G_Ticker based on gameaction.
-//
-//==========================================================================
-
-void G_DoSaveGame(void)
-{
-    SV_SaveGame(savegameslot, savedescription);
-    gameaction = ga_nothing;
-    savedescription[0] = 0;
-    P_SetMessage(&players[consoleplayer], TXT_GAMESAVED, true);
-}
-
-//==========================================================================
-//
-// G_DeferredNewGame
-//
-//==========================================================================
-
-void G_DeferredNewGame(skill_t skill)
-{
-    TempSkill = skill;
-    gameaction = ga_newgame;
-}
-
-//==========================================================================
-//
-// G_DoNewGame
-//
-//==========================================================================
-
-void G_DoNewGame(void)
-{
-    G_StartNewGame(TempSkill);
-    gameaction = ga_nothing;
-}
-
-/*
-====================
-=
-= G_InitNew
-=
-= Can be called by the startup code or the menu task
-= consoleplayer, displayplayer, playeringame[] should be set
-====================
-*/
-
-void G_DeferedInitNew(skill_t skill, int episode, int map)
-{
-    TempSkill = skill;
-    TempEpisode = episode;
-    TempMap = map;
-    gameaction = ga_initnew;
-}
-
-void G_DoInitNew(void)
-{
-    SV_InitBaseSlot();
-    G_InitNew(TempSkill, TempEpisode, TempMap);
-    gameaction = ga_nothing;
-}
-
-void G_InitNew(skill_t skill, int episode, int map)
-{
-    int i;
-
-    if (paused)
-    {
-        paused = false;
-        S_ResumeSound();
-    }
-    if (skill < sk_baby)
-    {
-        skill = sk_baby;
-    }
-    if (skill > sk_nightmare)
-    {
-        skill = sk_nightmare;
-    }
-    if (map < 1)
-    {
-        map = 1;
-    }
-    if (map > 99)
-    {
-        map = 99;
-    }
-    M_ClearRandom();
-    // Force players to be initialized upon first level load
-    for (i = 0; i < maxplayers; i++)
-    {
-        players[i].playerstate = PST_REBORN;
-        players[i].worldTimer = 0;
-    }
-
-    // Set up a bunch of globals
-    if (!demoextend)
-    {
-        // This prevents map-loading from interrupting a demo.
-        // demoextend is set back to false only if starting a new game or
-        // loading a saved one from the menu, and only during playback.
-        demorecording = false;
-        demoplayback = false;
-        netdemo = false;
-        usergame = true;            // will be set false if a demo
-    }
-    paused = false;
-    viewactive = true;
-    gameepisode = episode;
-    gamemap = map;
-    gameskill = skill;
-    BorderNeedRefresh = true;
-
-    // Initialize the sky
-    R_InitSky(map);
-
-    // Give one null ticcmd_t
-    //gametic = 0;
-    //maketic = 1;
-    //for (i=0 ; i<maxplayers ; i++)
-    //      nettics[i] = 1; // one null event for this gametic
-    //memset (localcmds,0,sizeof(localcmds));
-    //memset (netcmds,0,sizeof(netcmds));
-
-    G_DoLoadLevel();
-}
-
-/*
-===============================================================================
-
-							DEMO RECORDING
-
-===============================================================================
-*/
-
-#define DEMOMARKER      0x80
-#define DEMOHEADER_RESPAWN    0x20
-#define DEMOHEADER_LONGTICS   0x10
-#define DEMOHEADER_NOMONSTERS 0x02
-
-void G_ReadDemoTiccmd(ticcmd_t * cmd)
-{
-    if (*demo_p == DEMOMARKER)
-    {                           // end of demo data stream
-        G_CheckDemoStatus();
-        return;
-    }
-    cmd->forwardmove = ((signed char) *demo_p++);
-    cmd->sidemove = ((signed char) *demo_p++);
-
-    // If this is a longtics demo, read back in higher resolution
-
-    if (longtics)
-    {
-        cmd->angleturn = *demo_p++;
-        cmd->angleturn |= (*demo_p++) << 8;
-    }
-    else
-    {
-        cmd->angleturn = ((unsigned char) *demo_p++) << 8;
-    }
-
-    cmd->buttons = (unsigned char) *demo_p++;
-    cmd->lookfly = (unsigned char) *demo_p++;
-    cmd->arti = (unsigned char) *demo_p++;
-}
-
-// Increase the size of the demo buffer to allow unlimited demos
-
-static void IncreaseDemoBuffer(void)
-{
-    int current_length;
-    byte *new_demobuffer;
-    byte *new_demop;
-    int new_length;
-
-    // Find the current size
-
-    current_length = demoend - demobuffer;
-
-    // Generate a new buffer twice the size
-    new_length = current_length * 2;
-
-    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
-    new_demop = new_demobuffer + (demo_p - demobuffer);
-
-    // Copy over the old data
-
-    memcpy(new_demobuffer, demobuffer, current_length);
-
-    // Free the old buffer and point the demo pointers at the new buffer.
-
-    Z_Free(demobuffer);
-
-    demobuffer = new_demobuffer;
-    demo_p = new_demop;
-    demoend = demobuffer + new_length;
-}
-
-void G_WriteDemoTiccmd(ticcmd_t * cmd)
-{
-    byte *demo_start;
-
-    if (gamekeydown[key_demo_quit]) // press to end demo recording
-        G_CheckDemoStatus();
-
-    demo_start = demo_p;
-
-    *demo_p++ = cmd->forwardmove;
-    *demo_p++ = cmd->sidemove;
-
-    // If this is a longtics demo, record in higher resolution
-
-    if (longtics)
-    {
-        *demo_p++ = (cmd->angleturn & 0xff);
-        *demo_p++ = (cmd->angleturn >> 8) & 0xff;
-    }
-    else
-    {
-        *demo_p++ = cmd->angleturn >> 8;
-    }
-
-    *demo_p++ = cmd->buttons;
-    *demo_p++ = cmd->lookfly;
-    *demo_p++ = cmd->arti;
-
-    // reset demo pointer back
-    demo_p = demo_start;
-
-    if (demo_p > demoend - 16)
-    {
-        if (vanilla_demo_limit)
-        {
-            // no more space
-            G_CheckDemoStatus();
-            return;
-        }
-        else
-        {
-            // Vanilla demo limit disabled: unlimited
-            // demo lengths!
-
-            IncreaseDemoBuffer();
-        }
-    }
-
-    G_ReadDemoTiccmd(cmd);      // make SURE it is exactly the same
-}
-
-
-
-/*
-===================
-=
-= G_RecordDemo
-=
-===================
-*/
-
-void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
-                  const char *name)
-{
-    size_t demoname_size;
-    int i;
-    int maxsize;
-
-    //!
-    // @category demo
-    //
-    // Record or playback a demo with high resolution turning.
-    //
-
-    longtics = D_NonVanillaRecord(M_ParmExists("-longtics"),
-                                  "vvHeretic longtics demo");
-
-    // If not recording a longtics demo, record in low res
-
-    lowres_turn = !longtics;
-
-    //!
-    // @category demo
-    //
-    // Smooth out low resolution turning when recording a demo.
-    //
-
-    shortticfix = M_ParmExists("-shortticfix");
-
-    G_InitNew(skill, episode, map);
-    usergame = false;
-    demoname_size = strlen(name) + 5;
-    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
-    M_snprintf(demoname, demoname_size, "%s.lmp", name);
-    maxsize = 0x20000;
-
-    //!
-    // @arg <size>
-    // @category demo
-    // @vanilla
-    //
-    // Specify the demo buffer size (KiB)
-    //
-
-    i = M_CheckParmWithArgs("-maxdemo", 1);
-    if (i)
-        maxsize = atoi(myargv[i + 1]) * 1024;
-    demobuffer = Z_Malloc(maxsize, PU_STATIC, NULL);
-    demoend = demobuffer + maxsize;
-
-    demo_p = demobuffer;
-    *demo_p++ = skill;
-    *demo_p++ = episode;
-    *demo_p++ = map;
-
-    // Write special parameter bits onto player one byte.
-    // This aligns with vvHeretic demo usage. Hexen demo support has no
-    // precedent here so consistency with another game is chosen:
-    //   0x20 = -respawn
-    //   0x10 = -longtics
-    //   0x02 = -nomonsters
-
-    *demo_p = 1; // assume player one exists
-    if (D_NonVanillaRecord(respawnparm, "vvHeretic -respawn header flag"))
-    {
-        *demo_p |= DEMOHEADER_RESPAWN;
-    }
-    if (longtics)
-    {
-        *demo_p |= DEMOHEADER_LONGTICS;
-    }
-    if (D_NonVanillaRecord(nomonsters, "vvHeretic -nomonsters header flag"))
-    {
-        *demo_p |= DEMOHEADER_NOMONSTERS;
-    }
-    demo_p++;
-    *demo_p++ = PlayerClass[0];
-
-    for (i = 1; i < maxplayers; i++)
-    {
-        *demo_p++ = playeringame[i];
-        *demo_p++ = PlayerClass[i];
-    }
-
-    demorecording = true;
-}
-
-
-/*
-===================
-=
-= G_PlayDemo
-=
-===================
-*/
-
-static const char *defdemoname;
-
-void G_DeferedPlayDemo(const char *name)
-{
-    defdemoname = name;
-    gameaction = ga_playdemo;
-}
-
-void G_DoPlayDemo(void)
-{
-    skill_t skill;
-    int i, lumpnum, episode, map;
-
-    gameaction = ga_nothing;
-    lumpnum = W_GetNumForName(defdemoname);
-    demobuffer = W_CacheLumpNum(lumpnum, PU_STATIC);
-    demo_p = demobuffer;
-    skill = *demo_p++;
-    episode = *demo_p++;
-    map = *demo_p++;
-
-    // When recording we store some extra options inside the upper bits
-    // of the player 1 present byte. However, this is a non-vanilla extension.
-    // Note references to vvHeretic here; these are the extensions used by
-    // vvHeretic, which we're just reusing for Hexen demos too. There is no
-    // vvHexen.
-    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_LONGTICS) != 0,
-                             lumpnum, "vvHeretic longtics demo"))
-    {
-        longtics = true;
-    }
-    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_RESPAWN) != 0,
-                             lumpnum, "vvHeretic -respawn header flag"))
-    {
-        respawnparm = true;
-    }
-    if (D_NonVanillaPlayback((*demo_p & DEMOHEADER_NOMONSTERS) != 0,
-                             lumpnum, "vvHeretic -nomonsters header flag"))
-    {
-        nomonsters = true;
-    }
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        playeringame[i] = (*demo_p++) != 0;
-        PlayerClass[i] = *demo_p++;
-    }
-
-    if (playeringame[1] || M_ParmExists("-solo-net")
-                        || M_ParmExists("-netdemo"))
-    {
-        netgame = true;
-    }
-
-    // Initialize world info, etc.
-    G_StartNewInit();
-
-    precache = false;           // don't spend a lot of time in loadlevel
-    G_InitNew(skill, episode, map);
-    precache = true;
-    usergame = false;
-    demoplayback = true;
-
-    if (netgame)
-    {
-        netdemo = true;
-    }
-}
-
-
-/*
-===================
-=
-= G_TimeDemo
-=
-===================
-*/
-
-void G_TimeDemo(char *name)
-{
-    skill_t skill;
-    int episode, map, i;
-
-    demobuffer = demo_p = W_CacheLumpName(name, PU_STATIC);
-    skill = *demo_p++;
-    episode = *demo_p++;
-    map = *demo_p++;
-
-    // Read special parameter bits: see G_RecordDemo() for details.
-    longtics = (*demo_p & DEMOHEADER_LONGTICS) != 0;
-
-    // don't overwrite arguments from the command line
-    respawnparm |= (*demo_p & DEMOHEADER_RESPAWN) != 0;
-    nomonsters  |= (*demo_p & DEMOHEADER_NOMONSTERS) != 0;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        playeringame[i] = (*demo_p++) != 0;
-        PlayerClass[i] = *demo_p++;
-    }
-
-    if (playeringame[1] || M_ParmExists("-solo-net")
-                        || M_ParmExists("-netdemo"))
-    {
-        netgame = true;
-    }
-
-    G_InitNew(skill, episode, map);
-    starttime = I_GetTime();
-
-    usergame = false;
-    demoplayback = true;
-    timingdemo = true;
-    singletics = true;
-
-    if (netgame)
-    {
-        netdemo = true;
-    }
-}
-
-
-/*
-===================
-=
-= G_CheckDemoStatus
-=
-= Called after a death or level completion to allow demos to be cleaned up
-= Returns true if a new demo loop action will take place
-===================
-*/
-
-boolean G_CheckDemoStatus(void)
-{
-    int endtime, realtics;
-
-    if (timingdemo)
-    {
-        float fps;
-        endtime = I_GetTime();
-        realtics = endtime - starttime;
-        fps = ((float) gametic * TICRATE) / realtics;
-        I_Error("timed %i gametics in %i realtics (%f fps)",
-                gametic, realtics, fps);
-    }
-
-    if (demoplayback)
-    {
-        if (singledemo)
-            I_Quit();
-
-        W_ReleaseLumpName(defdemoname);
-        demoplayback = false;
-        netdemo = false;
-        netgame = false;
-        H2_AdvanceDemo();
-        return true;
-    }
-
-    if (demorecording)
-    {
-        *demo_p++ = DEMOMARKER;
-        M_WriteFile(demoname, demobuffer, demo_p - demobuffer);
-        Z_Free(demobuffer);
-        demorecording = false;
-        I_Error("Demo %s recorded", demoname);
-    }
-
-    return false;
-}
diff --git a/games/NXDoom/src/hexen/h2_main.c b/games/NXDoom/src/hexen/h2_main.c
deleted file mode 100644
index 0a7bff85f..000000000
--- a/games/NXDoom/src/hexen/h2_main.c
+++ /dev/null
@@ -1,1227 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-// haleyjd: removed WATCOMC
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include "config.h"
-
-#include "h2def.h"
-#include "ct_chat.h"
-#include "d_iwad.h"
-#include "d_mode.h"
-#include "m_misc.h"
-#include "s_sound.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "net_client.h"
-#include "p_local.h"
-#include "v_video.h"
-#include "w_main.h"
-#include "am_map.h"
-
-#include "hexen_icon.c"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAXWADFILES 20
-#define CT_KEY_BLUE         'b'
-#define CT_KEY_RED          'r'
-#define CT_KEY_YELLOW       'y'
-#define CT_KEY_GREEN        'g'
-#define CT_KEY_PLAYER5      'j'     // Jade
-#define CT_KEY_PLAYER6      'w'     // White
-#define CT_KEY_PLAYER7      'h'     // Hazel
-#define CT_KEY_PLAYER8      'p'     // Purple
-#define CT_KEY_ALL          't'
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-void R_ExecuteSetViewSize(void);
-void D_ConnectNetGame(void);
-void D_CheckNetGame(void);
-boolean F_Responder(event_t * ev);
-void I_StartupKeyboard(void);
-void I_StartupJoystick(void);
-void I_ShutdownKeyboard(void);
-void S_InitScript(void);
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-void H2_AdvanceDemo(void);
-void H2_PageTicker(void);
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void DrawMessage(void);
-static void PageDrawer(void);
-static void HandleArgs(void);
-static void CheckRecordFrom(void);
-static void DrawAndBlit(void);
-static void CreateSavePath(void);
-static void WarpCheck(void);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-GameMode_t gamemode;
-GameVersion_t gameversion = exe_hexen_1_1;
-static const char *gamedescription;
-char *iwadfile;
-static char demolumpname[9];    // Demo lump to start playing.
-boolean nomonsters;             // checkparm of -nomonsters
-boolean respawnparm;            // checkparm of -respawn
-boolean randomclass;            // checkparm of -randclass
-boolean debugmode;              // checkparm of -debug
-boolean ravpic;                 // checkparm of -ravpic
-boolean cdrom = false;          // true if cd-rom mode active
-boolean cmdfrag;                // true if a CMD_FRAG packet should be sent out
-boolean artiskip;               // whether shift-enter skips an artifact
-int maxzone = 0x800000;         // Maximum allocated for zone heap (8meg default)
-skill_t startskill;
-int startepisode;
-int startmap;
-boolean autostart;
-boolean advancedemo;
-FILE *debugfile;
-int UpdateState;
-int maxplayers = MAXPLAYERS;
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int WarpMap;
-static int demosequence;
-static int pagetic;
-static const char *pagename;
-static char *SavePathConfig;
-
-// CODE --------------------------------------------------------------------
-
-
-static const char * const chat_macro_defaults[10] =
-{
-    HUSTR_CHATMACRO0,
-    HUSTR_CHATMACRO1,
-    HUSTR_CHATMACRO2,
-    HUSTR_CHATMACRO3,
-    HUSTR_CHATMACRO4,
-    HUSTR_CHATMACRO5,
-    HUSTR_CHATMACRO6,
-    HUSTR_CHATMACRO7,
-    HUSTR_CHATMACRO8,
-    HUSTR_CHATMACRO9,
-};
-
-
-void D_BindVariables(void)
-{
-    int i;
-
-    M_ApplyPlatformDefaults();
-
-    I_BindInputVariables();
-    I_BindVideoVariables();
-    I_BindJoystickVariables();
-    I_BindSoundVariables();
-
-    M_BindBaseControls();
-    M_BindMapControls();
-    M_BindMenuControls();
-    M_BindWeaponControls();
-    M_BindChatControls(MAXPLAYERS);
-    M_BindHereticControls();
-    M_BindHexenControls();
-
-    key_multi_msgplayer[0] = CT_KEY_BLUE;
-    key_multi_msgplayer[1] = CT_KEY_RED;
-    key_multi_msgplayer[2] = CT_KEY_YELLOW;
-    key_multi_msgplayer[3] = CT_KEY_GREEN;
-    key_multi_msgplayer[4] = CT_KEY_PLAYER5;
-    key_multi_msgplayer[5] = CT_KEY_PLAYER6;
-    key_multi_msgplayer[6] = CT_KEY_PLAYER7;
-    key_multi_msgplayer[7] = CT_KEY_PLAYER8;
-
-    NET_BindVariables();
-
-    M_BindIntVariable("graphical_startup",      &graphical_startup);
-    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
-    M_BindIntVariable("sfx_volume",             &snd_MaxVolume);
-    M_BindIntVariable("music_volume",           &snd_MusicVolume);
-    M_BindIntVariable("messageson",             &messageson);
-    M_BindIntVariable("screenblocks",           &screenblocks);
-    M_BindIntVariable("snd_channels",           &snd_Channels);
-    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
-    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
-
-    M_BindStringVariable("savedir", &SavePathConfig);
-
-    // Multiplayer chat macros
-
-    for (i=0; i<10; ++i)
-    {
-        char buf[12];
-
-        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
-        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
-        M_BindStringVariable(buf, &chat_macros[i]);
-    }
-}
-
-// Set the default directory where hub savegames are saved.
-
-static void D_SetDefaultSavePath(void)
-{
-    SavePath = M_GetSaveGameDir("hexen.wad");
-
-    if (!strcmp(SavePath, ""))
-    {
-        // only get hexen.cfg path if one is not already found
-
-        if (SavePathConfig == NULL || !strcmp(SavePathConfig, ""))
-        {
-            // If we are not using a savegame path (probably because we are on
-            // Windows and not using a config dir), behave like Vanilla Hexen
-            // and use hexndata/:
-
-            SavePath = malloc(10);
-            M_snprintf(SavePath, 10, "hexndata%c", DIR_SEPARATOR);
-        }
-        else
-        {
-            SavePath = M_StringDuplicate(SavePathConfig);
-        }
-    }
-
-    // only set hexen.cfg path if using default handling
-
-    if (!M_ParmExists("-savedir") && !M_ParmExists("-cdrom"))
-    {
-        SavePathConfig = SavePath;
-    }
-}
-
-// The Mac version of the Hexen IWAD is different to the "normal" DOS
-// version - it doesn't include lumps used by the DOS DMX library.
-// This means that we can't do GUS or OPL emulation and need to apply
-// a workaround.
-static void AdjustForMacIWAD(void)
-{
-    boolean adjust_music = false;
-
-    switch (snd_musicdevice)
-    {
-        case SNDDEVICE_ADLIB:
-        case SNDDEVICE_SB:
-            adjust_music = W_CheckNumForName("GENMIDI") < 0;
-            break;
-
-        case SNDDEVICE_GUS:
-            adjust_music = W_CheckNumForName("DMXGUS") < 0;
-            break;
-
-        default:
-            break;
-    }
-
-    if (adjust_music)
-    {
-        printf("** Note: You appear to be using the Mac version of the Hexen\n"
-               "** IWAD file. This is missing the lumps required for OPL or\n"
-               "** GUS emulation. Your music configuration is being adjusted\n"
-               "** to a different setting that won't cause the game to "
-               "crash.\n");
-        snd_musicdevice = SNDDEVICE_GENMIDI;
-    }
-}
-
-//
-// D_GrabMouseCallback
-//
-// Called to determine whether to grab the mouse pointer
-//
-
-static boolean D_GrabMouseCallback(void)
-{
-    // when menu is active or game is paused, release the mouse
-
-    if (MenuActive || paused)
-        return false;
-
-    // only grab mouse when playing levels (but not demos)
-
-    return (gamestate == GS_LEVEL) && !advancedemo && !demoplayback;
-}
-
-// Message displayed when quitting Hexen
-
-static void D_HexenQuitMessage(void)
-{
-    printf("\nHexen: Beyond Heretic\n");
-}
-
-static void D_AddFile(char *filename)
-{
-    printf("  adding %s\n", filename);
-
-    W_AddFile(filename);
-}
-
-// Find out what version of Hexen is playing.
-
-void D_IdentifyVersion(void)
-{
-    // The Hexen Shareware, ne 4 Level Demo Version, is missing the SKY1 lump
-    // and uses the SKY2 lump instead. Let's use this fact and the missing
-    // levels from MAP05 onward to identify it and set gamemode accordingly.
-
-    if (W_CheckNumForName("SKY1") == -1 &&
-        W_CheckNumForName("MAP05") == -1 )
-    {
-	gamemode = shareware;
-	maxplayers = 4;
-    }
-
-    // The v1.0 IWAD file is missing a bunch of lumps that can cause the game
-    // to crash, so we exit with an error if the user tries to play with it.
-    // But we provide an override command line flag if they really want to
-    // do it.
-
-    //!
-    // If provided, the check for the v1.0 IWAD file is disabled, even though
-    // it will almost certainly cause the game to crash.
-    //
-    // @category compat
-    //
-
-    if (!M_ParmExists("-v10override")
-     && gamemode != shareware && W_CheckNumForName("CLUS1MSG") < 0)
-    {
-        I_Error(
-            "You are trying to use the Hexen v1.0 IWAD. This isn't\n"
-            "supported by " PACKAGE_NAME ". Please upgrade to the v1.1\n"
-            "IWAD file. See here for more information:\n"
-            "  https://www.doomworld.com/classicdoom/info/patches.php");
-    }
-}
-
-// Set the gamedescription string.
-
-void D_SetGameDescription(void)
-{
-/*
-    NB: The 4 Level Demo Version actually prints a four-lined banner
-    (and indeed waits for a keypress):
-
-    Hexen:  Beyond Heretic
-
-    4 Level Demo Version
-    Press any key to continue.
-*/
-
-    if (gamemode == shareware)
-    {
-	gamedescription = "Hexen: 4 Level Demo Version";
-    }
-    else
-    {
-	gamedescription = "Hexen";
-    }
-}
-
-static const struct
-{
-    const char *description;
-    const char *cmdline;
-    GameVersion_t version;
-} gameversions[] = {
-    {"Hexen 1.1",            "1.1",        exe_hexen_1_1},
-    {"Hexen 1.1 (alt)",      "1.1r2",      exe_hexen_1_1r2},
-    { NULL,                  NULL,         0},
-};
-
-// Initialize the game version
-
-static void InitGameVersion(void)
-{
-    int p;
-
-    //!
-    // @arg <version>
-    // @category compat
-    //
-    // Emulate a specific version of Hexen.
-    // Valid values are "1.1" and "1.1r2".
-    //
-
-    p = M_CheckParmWithArgs("-gameversion", 1);
-
-    if (p)
-    {
-        int i;
-        for (i=0; gameversions[i].description != NULL; ++i)
-        {
-            if (!strcmp(myargv[p+1], gameversions[i].cmdline))
-            {
-                gameversion = gameversions[i].version;
-                break;
-            }
-        }
-
-        if (gameversions[i].description == NULL)
-        {
-            printf("Supported game versions:\n");
-
-            for (i=0; gameversions[i].description != NULL; ++i)
-            {
-                printf("\t%s (%s)\n", gameversions[i].cmdline,
-                        gameversions[i].description);
-            }
-
-            I_Error("Unknown game version '%s'", myargv[p+1]);
-        }
-    }
-    else
-    {
-        // Determine automatically
-
-        gameversion = exe_hexen_1_1;
-    }
-}
-
-void PrintGameVersion(void)
-{
-    int i;
-
-    for (i=0; gameversions[i].description != NULL; ++i)
-    {
-        if (gameversions[i].version == gameversion)
-        {
-            printf("Emulating the behavior of the "
-                   "'%s' executable.\n", gameversions[i].description);
-            break;
-        }
-    }
-}
-
-//==========================================================================
-//
-// H2_Main
-//
-//==========================================================================
-void InitMapMusicInfo(void);
-
-void D_DoomMain(void)
-{
-    GameMission_t gamemission;
-    int p;
-
-    I_AtExit(D_HexenQuitMessage, false);
-    startepisode = 1;
-    autostart = false;
-    startskill = sk_medium;
-    startmap = 1;
-    gamemode = commercial;
-
-    I_PrintBanner(PACKAGE_STRING);
-
-    // Initialize subsystems
-
-    ST_Message("V_Init: allocate screens.\n");
-    V_Init();
-
-    // Load defaults before initing other systems
-    ST_Message("M_LoadDefaults: Load system defaults.\n");
-    D_BindVariables();
-
-#ifdef _WIN32
-
-    //!
-    // @category obscure
-    // @platform windows
-    // @vanilla
-    //
-    // Save configuration data and savegames in c:\hexndata,
-    // allowing play from CD.
-    //
-
-    cdrom = M_ParmExists("-cdrom");
-#endif
-
-    if (cdrom)
-    {
-        M_SetConfigDir("c:\\hexndata\\");
-    }
-    else
-    {
-        M_SetConfigDir(NULL);
-    }
-
-    M_SetConfigFilenames("hexen.cfg", PROGRAM_PREFIX "hexen.cfg");
-    M_LoadDefaults();
-
-    D_SetDefaultSavePath();
-
-    I_AtExit(M_SaveDefaults, false);
-
-    // Now that the savedir is loaded, make sure it exists
-    CreateSavePath();
-
-    ST_Message("Z_Init: Init zone memory allocation daemon.\n");
-    Z_Init();
-
-    // haleyjd: removed WATCOMC
-
-    ST_Message("W_Init: Init WADfiles.\n");
-
-    iwadfile = D_FindIWAD(IWAD_MASK_HEXEN, &gamemission);
-
-    if (iwadfile == NULL)
-    {
-        I_Error("Game mode indeterminate. No IWAD was found. Try specifying\n"
-                "one with the '-iwad' command line parameter.");
-    }
-
-    D_AddFile(iwadfile);
-    W_CheckCorrectIWAD(hexen);
-    D_IdentifyVersion();
-    InitGameVersion();
-    D_SetGameDescription();
-    AdjustForMacIWAD();
-
-    //!
-    // @category mod
-    //
-    // Disable auto-loading of .wad files.
-    //
-    if (!M_ParmExists("-noautoload"))
-    {
-        char *autoload_dir;
-        autoload_dir = M_GetAutoloadDir("hexen.wad");
-        if (autoload_dir != NULL)
-        {
-            // TODO? DEH_AutoLoadPatches(autoload_dir);
-            W_AutoLoadWADs(autoload_dir);
-            free(autoload_dir);
-        }
-    }
-
-    HandleArgs();
-
-    // Generate the WAD hash table.  Speed things up a bit.
-    W_GenerateHashTable();
-
-    I_PrintStartupBanner(gamedescription);
-
-    ST_Message("MN_Init: Init menu system.\n");
-    MN_Init();
-
-    ST_Message("CT_Init: Init chat mode data.\n");
-    CT_Init();
-
-    InitMapMusicInfo();         // Init music fields in mapinfo
-
-    ST_Message("S_InitScript\n");
-    S_InitScript();
-
-    ST_Message("SN_InitSequenceScript: Registering sound sequences.\n");
-    SN_InitSequenceScript();
-    ST_Message("I_Init: Setting up machine state.\n");
-    I_CheckIsScreensaver();
-    I_InitTimer();
-    I_InitJoystick();
-    I_InitSound(hexen);
-    I_InitMusic();
-
-    ST_Message("NET_Init: Init networking subsystem.\n");
-    NET_Init();
-    D_ConnectNetGame();
-
-    S_Init();
-    S_Start();
-
-    ST_Message("ST_Init: Init startup screen.\n");
-    ST_Init();
-
-    // Show version message now, so it's visible during R_Init()
-    ST_Message("R_Init: Init Hexen refresh daemon");
-    R_Init();
-    ST_Message("\n");
-
-    //if (M_CheckParm("-net"))
-    //    ST_NetProgress();       // Console player found
-
-    ST_Message("P_Init: Init Playloop state.\n");
-    P_Init();
-
-    // Check for command line warping. Follows P_Init() because the
-    // MAPINFO.TXT script must be already processed.
-    WarpCheck();
-
-    ST_Message("D_CheckNetGame: Checking network game status.\n");
-    D_CheckNetGame();
-
-    PrintGameVersion();
-
-    ST_Message("SB_Init: Loading patches.\n");
-    SB_Init();
-
-    ST_Done();
-
-    if (autostart)
-    {
-        ST_Message("Warp to Map %d (\"%s\":%d), Skill %d\n",
-                   WarpMap, P_GetMapName(startmap), startmap, startskill + 1);
-    }
-
-    CheckRecordFrom();
-
-    //!
-    // @arg <x>
-    // @category demo
-    // @vanilla
-    //
-    // Record a demo named x.lmp.
-    //
-
-    p = M_CheckParm("-record");
-    if (p && p < myargc - 1)
-    {
-        G_RecordDemo(startskill, 1, startepisode, startmap, myargv[p + 1]);
-        H2_GameLoop();          // Never returns
-    }
-
-    p = M_CheckParmWithArgs("-playdemo", 1);
-    if (p)
-    {
-        singledemo = true;      // Quit after one demo
-        G_DeferedPlayDemo(demolumpname);
-        H2_GameLoop();          // Never returns
-    }
-
-    p = M_CheckParmWithArgs("-timedemo", 1);
-    if (p)
-    {
-        G_TimeDemo(demolumpname);
-        H2_GameLoop();          // Never returns
-    }
-
-    //!
-    // @category game
-    // @arg <s>
-    // @vanilla
-    //
-    // Load the game in savegame slot s.
-    //
-
-    p = M_CheckParmWithArgs("-loadgame", 1);
-    if (p)
-    {
-        G_LoadGame(atoi(myargv[p + 1]));
-    }
-
-    if (gameaction != ga_loadgame)
-    {
-        UpdateState |= I_FULLSCRN;
-        BorderNeedRefresh = true;
-        if (autostart || netgame)
-        {
-            G_StartNewInit();
-            G_InitNew(startskill, startepisode, startmap);
-        }
-        else
-        {
-            H2_StartTitle();
-        }
-    }
-    H2_GameLoop();              // Never returns
-}
-
-//==========================================================================
-//
-// HandleArgs
-//
-//==========================================================================
-
-static void HandleArgs(void)
-{
-    int p;
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Disable monsters.
-    //
-
-    nomonsters = M_ParmExists("-nomonsters");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Monsters respawn after being killed.
-    //
-
-    respawnparm = M_ParmExists("-respawn");
-
-    //!
-    // @vanilla
-    // @category net
-    //
-    // In deathmatch mode, change a player's class each time the
-    // player respawns.
-    //
-
-    randomclass = M_ParmExists("-randclass");
-
-    //!
-    // @vanilla
-    //
-    // Take screenshots when F1 is pressed.
-    //
-
-    ravpic = M_ParmExists("-ravpic");
-
-    //!
-    // @category obscure
-    // @vanilla
-    //
-    // Don't allow artifacts to be used when the run key is held down.
-    //
-
-    artiskip = M_ParmExists("-artiskip");
-
-    debugmode = M_ParmExists("-debug");
-
-    //!
-    // @vanilla
-    // @category net
-    //
-    // Start a deathmatch game.
-    //
-
-    deathmatch = M_ParmExists("-deathmatch");
-
-    // currently broken or unused:
-    cmdfrag = M_ParmExists("-cmdfrag");
-
-    // Check WAD file command line options
-    W_ParseCommandLine();
-
-    //!
-    // @category obscure
-    // @vanilla
-    // @arg <path>
-    //
-    // Development option to specify path to level scripts.
-    //
-
-    p = M_CheckParmWithArgs("-scripts", 1);
-
-    if (p)
-    {
-        sc_FileScripts = true;
-        sc_ScriptsDir = myargv[p+1];
-    }
-
-    //!
-    // @category game
-    // @arg <skill>
-    // @vanilla
-    //
-    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
-    // 0 disables all monsters.
-    //
-
-    p = M_CheckParmWithArgs("-skill", 1);
-
-    if (p)
-    {
-        startskill = myargv[p+1][0] - '1';
-        autostart = true;
-    }
-
-    //!
-    // @arg <demo>
-    // @category demo
-    // @vanilla
-    //
-    // Play back the demo named demo.lmp.
-    //
-
-    p = M_CheckParmWithArgs("-playdemo", 1);
-
-    if (!p)
-    {
-        //!
-        // @arg <demo>
-        // @category demo
-        // @vanilla
-        //
-        // Play back the demo named demo.lmp, determining the framerate
-        // of the screen.
-        //
-
-        p = M_CheckParmWithArgs("-timedemo", 1);
-    }
-
-    if (p)
-    {
-        char *uc_filename;
-        char file[256];
-
-        M_StringCopy(file, myargv[p+1], sizeof(file));
-
-        // With Vanilla Hexen you have to specify the file without
-        // extension, but make that optional.
-        uc_filename = strdup(myargv[p + 1]);
-        M_ForceUppercase(uc_filename);
-
-        if (!M_StringEndsWith(uc_filename, ".LMP"))
-        {
-            M_StringConcat(file, ".lmp", sizeof(file));
-        }
-
-        free(uc_filename);
-
-        if (W_AddFile(file) != NULL)
-        {
-            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
-                         sizeof(demolumpname));
-        }
-        else
-        {
-            // The file failed to load, but copy the original arg as a
-            // demo name to make tricks like -playdemo demo1 possible.
-            M_StringCopy(demolumpname, myargv[p+1], sizeof(demolumpname));
-        }
-
-        ST_Message("Playing demo %s.\n", myargv[p+1]);
-    }
-
-    //!
-    // @category demo
-    //
-    // Record or playback a demo without automatically quitting
-    // after either level exit or player respawn.
-    //
-
-    demoextend = M_ParmExists("-demoextend");
-
-    if (M_ParmExists("-testcontrols"))
-    {
-        autostart = true;
-        testcontrols = true;
-    }
-}
-
-//==========================================================================
-//
-// WarpCheck
-//
-//==========================================================================
-
-static void WarpCheck(void)
-{
-    int p;
-    int map;
-
-    //!
-    // @category game
-    // @arg x
-    // @vanilla
-    //
-    // Start a game immediately, warping to MAPx.
-    //
-
-    p = M_CheckParm("-warp");
-    if (p && p < myargc - 1)
-    {
-        WarpMap = atoi(myargv[p + 1]);
-        map = P_TranslateMap(WarpMap);
-        if (map == -1)
-        {                       // Couldn't find real map number
-            startmap = 1;
-            ST_Message("-WARP: Invalid map number.\n");
-        }
-        else
-        {                       // Found a valid startmap
-            startmap = map;
-            autostart = true;
-        }
-    }
-    else
-    {
-        WarpMap = 1;
-        startmap = P_TranslateMap(1);
-        if (startmap == -1)
-        {
-            startmap = 1;
-        }
-    }
-}
-
-//==========================================================================
-//
-// H2_GameLoop
-//
-//==========================================================================
-
-void H2_GameLoop(void)
-{
-    if (M_CheckParm("-debugfile"))
-    {
-        char filename[20];
-        M_snprintf(filename, sizeof(filename), "debug%i.txt", consoleplayer);
-        debugfile = M_fopen(filename, "w");
-    }
-    I_SetWindowTitle(gamedescription);
-    I_GraphicsCheckCommandLine();
-    I_SetGrabMouseCallback(D_GrabMouseCallback);
-    I_RegisterWindowIcon(hexen_icon_data, hexen_icon_w, hexen_icon_h);
-    I_InitGraphics();
-
-    while (1)
-    {
-        // Frame syncronous IO operations
-        I_StartFrame();
-
-        // Process one or more tics
-        // Will run at least one tic
-        TryRunTics();
-
-        // Move positional sounds
-        S_UpdateSounds(players[displayplayer].mo);
-
-        DrawAndBlit();
-    }
-}
-
-//==========================================================================
-//
-// H2_ProcessEvents
-//
-// Send all the events of the given timestamp down the responder chain.
-//
-//==========================================================================
-
-void H2_ProcessEvents(void)
-{
-    event_t *ev;
-
-    for (;;)
-    {
-        ev = D_PopEvent();
-
-        if (ev == NULL)
-        {
-            break;
-        }
-
-        if (F_Responder(ev))
-        {
-            continue;
-        }
-        if (MN_Responder(ev))
-        {
-            continue;
-        }
-        G_Responder(ev);
-    }
-}
-
-//==========================================================================
-//
-// DrawAndBlit
-//
-//==========================================================================
-
-static void DrawAndBlit(void)
-{
-    // Change the view size if needed
-    if (setsizeneeded)
-    {
-        R_ExecuteSetViewSize();
-    }
-
-    // Do buffered drawing
-    switch (gamestate)
-    {
-        case GS_LEVEL:
-            if (!gametic)
-            {
-                break;
-            }
-            if (automapactive)
-            {
-                AM_Drawer();
-            }
-            else
-            {
-                R_RenderPlayerView(&players[displayplayer]);
-            }
-            CT_Drawer();
-            UpdateState |= I_FULLVIEW;
-            SB_Drawer();
-            break;
-        case GS_INTERMISSION:
-            IN_Drawer();
-            break;
-        case GS_FINALE:
-            F_Drawer();
-            break;
-        case GS_DEMOSCREEN:
-            PageDrawer();
-            break;
-    }
-
-    if (testcontrols)
-    {
-        V_DrawMouseSpeedBox(testcontrols_mousespeed);
-    }
-
-    if (paused && !MenuActive && !askforquit)
-    {
-        if (!netgame)
-        {
-            V_DrawPatch(160, viewwindowy + 5, W_CacheLumpName("PAUSED",
-                                                              PU_CACHE));
-        }
-        else
-        {
-            V_DrawPatch(160, 70, W_CacheLumpName("PAUSED", PU_CACHE));
-        }
-    }
-
-    // Draw current message
-    DrawMessage();
-
-    // Draw Menu
-    MN_Drawer();
-
-    // Send out any new accumulation
-    NetUpdate();
-
-    // Flush buffered stuff to screen
-    I_FinishUpdate();
-}
-
-//==========================================================================
-//
-// DrawMessage
-//
-//==========================================================================
-
-static void DrawMessage(void)
-{
-    player_t *player;
-
-    player = &players[consoleplayer];
-    if (player->messageTics <= 0)
-    {                           // No message
-        return;
-    }
-    if (player->yellowMessage)
-    {
-        MN_DrTextAYellow(player->message,
-                         160 - MN_TextAWidth(player->message) / 2, 1);
-    }
-    else
-    {
-        MN_DrTextA(player->message, 160 - MN_TextAWidth(player->message) / 2,
-                   1);
-    }
-}
-
-//==========================================================================
-//
-// H2_PageTicker
-//
-//==========================================================================
-
-void H2_PageTicker(void)
-{
-    if (--pagetic < 0)
-    {
-        H2_AdvanceDemo();
-    }
-}
-
-//==========================================================================
-//
-// PageDrawer
-//
-//==========================================================================
-
-static void PageDrawer(void)
-{
-    V_DrawRawScreen(W_CacheLumpName(pagename, PU_CACHE));
-    if (demosequence == 1)
-    {
-        V_DrawPatch(4, 160, W_CacheLumpName("ADVISOR", PU_CACHE));
-    }
-    UpdateState |= I_FULLSCRN;
-}
-
-//==========================================================================
-//
-// H2_AdvanceDemo
-//
-// Called after each demo or intro demosequence finishes.
-//
-//==========================================================================
-
-void H2_AdvanceDemo(void)
-{
-    advancedemo = true;
-}
-
-//==========================================================================
-//
-// H2_DoAdvanceDemo
-//
-//==========================================================================
-
-void H2_DoAdvanceDemo(void)
-{
-    players[consoleplayer].playerstate = PST_LIVE;      // don't reborn
-    advancedemo = false;
-    usergame = false;           // can't save/end game here
-    paused = false;
-    gameaction = ga_nothing;
-    demosequence = (demosequence + 1) % 7;
-    switch (demosequence)
-    {
-        case 0:
-            pagetic = 280;
-            gamestate = GS_DEMOSCREEN;
-            pagename = "TITLE";
-            S_StartSongName("hexen", true);
-            break;
-        case 1:
-            pagetic = 210;
-            gamestate = GS_DEMOSCREEN;
-            pagename = "TITLE";
-            break;
-        case 2:
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            G_DeferedPlayDemo("demo1");
-            break;
-        case 3:
-            pagetic = 200;
-            gamestate = GS_DEMOSCREEN;
-            pagename = "CREDIT";
-            break;
-        case 4:
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            G_DeferedPlayDemo("demo2");
-            break;
-        case 5:
-            pagetic = 200;
-            gamestate = GS_DEMOSCREEN;
-            pagename = "CREDIT";
-            break;
-        case 6:
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            G_DeferedPlayDemo("demo3");
-            break;
-    }
-}
-
-//==========================================================================
-//
-// H2_StartTitle
-//
-//==========================================================================
-
-void H2_StartTitle(void)
-{
-    gameaction = ga_nothing;
-    demosequence = -1;
-    H2_AdvanceDemo();
-}
-
-//==========================================================================
-//
-// CheckRecordFrom
-//
-// -recordfrom <save-num> <demo-name>
-//
-//==========================================================================
-
-static void CheckRecordFrom(void)
-{
-    int p;
-
-    //!
-    // @vanilla
-    // @category demo
-    // @arg <save-num> <demo-name>
-    //
-    // Load a game from the given savegame slot and record a demo from
-    // it.  Equivalent to -loadgame <save-num> -record <demo-name>.
-    //
-    p = M_CheckParm("-recordfrom");
-    if (!p || p > myargc - 2)
-    {                           // Bad args
-        return;
-    }
-    G_LoadGame(atoi(myargv[p + 1]));
-    G_DoLoadGame();             // Load the gameskill etc info from savegame
-    G_RecordDemo(gameskill, 1, gameepisode, gamemap, myargv[p + 2]);
-
-    H2_GameLoop();              // Never returns
-}
-
-// haleyjd: removed WATCOMC
-/*
-void CleanExit(void)
-{
-	union REGS regs;
-
-	I_ShutdownKeyboard();
-	regs.x.eax = 0x3;
-	int386(0x10, &regs, &regs);
-	printf("Exited from HEXEN: Beyond Heretic.\n");
-	exit(1);
-}
-*/
-
-//==========================================================================
-//
-// CreateSavePath
-//
-//==========================================================================
-
-static void CreateSavePath(void)
-{
-    M_MakeDirectory(SavePath);
-}
diff --git a/games/NXDoom/src/hexen/h2def.h b/games/NXDoom/src/hexen/h2def.h
deleted file mode 100644
index 2bfdfb513..000000000
--- a/games/NXDoom/src/hexen/h2def.h
+++ /dev/null
@@ -1,1121 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __H2DEF__
-#define __H2DEF__
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-//#include <values.h>
-
-#include "st_start.h"
-// haleyjd: removed WATCOMC
-
-// ticcmd:
-
-#include "d_ticcmd.h"
-
-// events
-
-#include "d_event.h"
-
-// gamemode/mission
-
-#include "d_mode.h"
-
-// for fixed_t:
-
-#include "m_fixed.h"
-
-// angle definitions:
-
-#include "tables.h"
-
-#include "d_loop.h"
-#include "net_defs.h"
-
-#define HEXEN_VERSION 110
-#define HEXEN_VERSION_TEXT "v1.1"
-
-// if rangecheck is undefined, most parameter validation debugging code
-// will not be compiled
-#ifndef NORANGECHECKING
-#define RANGECHECK
-#endif
-
-// Past distributions
-//#ifndef VER_ID
-//#define VER_ID "DVL"
-//#endif
-//#define HEXEN_VERSIONTEXT "ID V1.2"
-//#define HEXEN_VERSIONTEXT "RETAIL STORE BETA"               // 9/26/95
-//#define HEXEN_VERSIONTEXT "DVL BETA 10 05 95" // Used for GT for testing
-//#define HEXEN_VERSIONTEXT "DVL BETA 10 07 95" // Just an update for Romero
-//#define HEXEN_VERSIONTEXT "FINAL 1.0 (10 13 95)" // Just an update for Romero
-//#ifdef RANGECHECK
-//#define HEXEN_VERSIONTEXT "Version 1.1 +R "__DATE__" ("VER_ID")"
-//#else
-//#define HEXEN_VERSIONTEXT "Version 1.1 "__DATE__" ("VER_ID")"
-//#endif
-#define HEXEN_VERSIONTEXT ((gamemode == shareware) ? \
-                           "DEMO 10 16 95" : \
-                           (gameversion != exe_hexen_1_1r2) ? \
-                           "VERSION 1.1 MAR 12 1996 (CBI)" : \
-                           "VERSION 1.1 MAR 22 1996 (BCP)")
-
-// all exterior data is defined here
-#include "xddefs.h"
-
-// all important printed strings
-#include "textdefs.h"
-
-// header generated by multigen utility
-#include "info.h"
-
-/*
-===============================================================================
-
-						GLOBAL TYPES
-
-===============================================================================
-*/
-
-//#define NUMARTIFCTS   28
-#define MAXPLAYERS	8
-
-#define	BT_ATTACK		1
-#define	BT_USE			2
-#define	BT_CHANGE		4       // if true, the next 3 bits hold weapon num
-#define	BT_WEAPONMASK	(8+16+32)
-#define	BT_WEAPONSHIFT	3
-
-#define BT_SPECIAL		128     // game events, not really buttons
-#define	BTS_SAVEMASK	(4+8+16)
-#define	BTS_SAVESHIFT	2
-#define	BT_SPECIALMASK	3
-#define	BTS_PAUSE		1       // pause the game
-#define	BTS_SAVEGAME	2       // save the game at each console
-// savegame slot numbers occupy the second byte of buttons
-
-// The top 3 bits of the artifact field in the ticcmd_t struct are used
-//              as additional flags 
-#define AFLAG_MASK			0x3F
-#define AFLAG_SUICIDE		0x40
-#define AFLAG_JUMP			0x80
-
-typedef enum
-{
-    GS_LEVEL,
-    GS_INTERMISSION,
-    GS_FINALE,
-    GS_DEMOSCREEN
-} gamestate_t;
-
-typedef enum
-{
-    ga_nothing,
-    ga_loadlevel,
-    ga_initnew,
-    ga_newgame,
-    ga_loadgame,
-    ga_savegame,
-    ga_playdemo,
-    ga_completed,
-    ga_leavemap,
-    ga_singlereborn,
-    ga_victory,
-    ga_worlddone,
-    ga_screenshot
-} gameaction_t;
-
-typedef enum
-{
-    wipe_0,
-    wipe_1,
-    wipe_2,
-    wipe_3,
-    wipe_4,
-    NUMWIPES,
-    wipe_random
-} wipe_t;
-
-/*
-===============================================================================
-
-							MAPOBJ DATA
-
-===============================================================================
-*/
-
-
-struct thinker_s;
-
-
-// think_t is a function pointer to a routine to handle an actor
-typedef void (*think_t)(struct thinker_s *);
-
-typedef struct thinker_s
-{
-    struct thinker_s *prev, *next;
-    think_t function;
-} thinker_t;
-
-struct player_s;
-
-typedef union
-{
-    intptr_t i;
-    struct mobj_s *m;
-    struct player_s *p;
-} specialval_t;
-
-typedef struct mobj_s
-{
-    thinker_t thinker;          // thinker node
-
-// info for drawing
-    fixed_t x, y, z;
-    struct mobj_s *snext, *sprev;       // links in sector (if needed)
-    angle_t angle;
-    spritenum_t sprite;         // used to find patch_t and flip value
-    int frame;                  // might be ord with FF_FULLBRIGHT
-
-// interaction info
-    struct mobj_s *bnext, *bprev;       // links in blocks (if needed)
-    struct subsector_s *subsector;
-    fixed_t floorz, ceilingz;   // closest together of contacted secs
-    fixed_t floorpic;           // contacted sec floorpic
-    fixed_t radius, height;     // for movement checking
-    fixed_t momx, momy, momz;   // momentums
-    int validcount;             // if == validcount, already checked
-    mobjtype_t type;
-    mobjinfo_t *info;           // &mobjinfo[mobj->type]
-    int tics;                   // state tic counter
-    state_t *state;
-    int damage;                 // For missiles
-    int flags;
-    int flags2;                 // Heretic flags
-    specialval_t special1;      // Special info
-    specialval_t special2;      // Special info
-    int health;
-    int movedir;                // 0-7
-    int movecount;              // when 0, select a new dir
-    struct mobj_s *target;      // thing being chased/attacked (or NULL)
-    // also the originator for missiles
-    int reactiontime;           // if non 0, don't attack yet
-    // used by player to freeze a bit after
-    // teleporting
-    int threshold;              // if > 0, the target will be chased
-    // no matter what (even if shot)
-    struct player_s *player;    // only valid if type == MT_PLAYER
-    int lastlook;               // player number last looked for
-    fixed_t floorclip;          // value to use for floor clipping
-    int archiveNum;             // Identity during archive
-    short tid;                  // thing identifier
-    byte special;               // special
-    byte args[5];               // special arguments
-} mobj_t;
-
-// each sector has a degenmobj_t in it's center for sound origin purposes
-typedef struct
-{
-    thinker_t thinker;          // not used for anything
-    fixed_t x, y, z;
-} degenmobj_t;
-
-//
-// frame flags
-//
-#define	FF_FULLBRIGHT	0x8000  // flag in thing->frame
-#define FF_FRAMEMASK	0x7fff
-
-// --- mobj.flags ---
-
-#define	MF_SPECIAL		1       // call P_SpecialThing when touched
-#define	MF_SOLID		2
-#define	MF_SHOOTABLE	4
-#define	MF_NOSECTOR		8       // don't use the sector links
-                                                                        // (invisible but touchable)
-#define	MF_NOBLOCKMAP	16      // don't use the blocklinks
-                                                                        // (inert but displayable)
-#define	MF_AMBUSH		32
-#define	MF_JUSTHIT		64      // try to attack right back
-#define	MF_JUSTATTACKED	128     // take at least one step before attacking
-#define	MF_SPAWNCEILING	256     // hang from ceiling instead of floor
-#define	MF_NOGRAVITY	512     // don't apply gravity every tic
-
-// movement flags
-#define	MF_DROPOFF		0x400   // allow jumps from high places
-#define	MF_PICKUP		0x800   // for players to pick up items
-#define	MF_NOCLIP		0x1000  // player cheat
-#define	MF_SLIDE		0x2000  // keep info about sliding along walls
-#define	MF_FLOAT		0x4000  // allow moves to any height, no gravity
-#define	MF_TELEPORT		0x8000  // don't cross lines or look at heights
-#define MF_MISSILE		0x10000 // don't hit same species, explode on block
-
-#define	MF_ALTSHADOW	0x20000 // alternate translucent draw
-#define	MF_SHADOW		0x40000 // use translucent draw (shadow demons / invis)
-#define	MF_NOBLOOD		0x80000 // don't bleed when shot (use puff)
-#define	MF_CORPSE		0x100000        // don't stop moving halfway off a step
-#define	MF_INFLOAT		0x200000        // floating to a height for a move, don't
-                                                                        // auto float to target's height
-
-#define	MF_COUNTKILL	0x400000        // count towards intermission kill total
-#define	MF_ICECORPSE	0x800000        // a frozen corpse (for blasting)
-
-#define	MF_SKULLFLY		0x1000000       // skull in flight
-#define	MF_NOTDMATCH	0x2000000       // don't spawn in death match (key cards)
-
-//#define       MF_TRANSLATION  0xc000000       // if 0x4 0x8 or 0xc, use a translation
-#define	MF_TRANSLATION	0x1c000000      // use a translation table (>>MF_TRANSHIFT)
-#define	MF_TRANSSHIFT	26      // table for player colormaps
-
-
-// --- mobj.flags2 ---
-
-#define MF2_LOGRAV			0x00000001      // alternate gravity setting
-#define MF2_WINDTHRUST		0x00000002      // gets pushed around by the wind
-                                                                                // specials
-#define MF2_FLOORBOUNCE		0x00000004      // bounces off the floor
-#define MF2_BLASTED			0x00000008      // missile will pass through ghosts
-#define MF2_FLY				0x00000010      // fly mode is active
-#define MF2_FLOORCLIP		0x00000020      // if feet are allowed to be clipped
-#define MF2_SPAWNFLOAT		0x00000040      // spawn random float z
-#define MF2_NOTELEPORT		0x00000080      // does not teleport
-#define MF2_RIP				0x00000100      // missile rips through solid
-                                                                                // targets
-#define MF2_PUSHABLE		0x00000200      // can be pushed by other moving
-                                                                                // mobjs
-#define MF2_SLIDE			0x00000400      // slides against walls
-#define MF2_ONMOBJ			0x00000800      // mobj is resting on top of another
-                                                                                // mobj
-#define MF2_PASSMOBJ		0x00001000      // Enable z block checking.  If on,
-                                                                                // this flag will allow the mobj to
-                                                                                // pass over/under other mobjs.
-#define MF2_CANNOTPUSH		0x00002000      // cannot push other pushable mobjs
-#define MF2_DROPPED			0x00004000      // dropped by a demon
-#define MF2_BOSS			0x00008000      // mobj is a major boss
-#define MF2_FIREDAMAGE		0x00010000      // does fire damage
-#define MF2_NODMGTHRUST		0x00020000      // does not thrust target when
-                                                                                // damaging
-#define MF2_TELESTOMP		0x00040000      // mobj can stomp another
-#define MF2_FLOATBOB		0x00080000      // use float bobbing z movement
-#define MF2_DONTDRAW		0x00100000      // don't generate a vissprite
-#define MF2_IMPACT			0x00200000      // an MF_MISSILE mobj can activate
-                                                                                // SPAC_IMPACT
-#define MF2_PUSHWALL		0x00400000      // mobj can push walls
-#define MF2_MCROSS			0x00800000      // can activate monster cross lines
-#define MF2_PCROSS			0x01000000      // can activate projectile cross lines
-#define MF2_CANTLEAVEFLOORPIC 0x02000000        // stay within a certain floor type
-#define MF2_NONSHOOTABLE	0x04000000      // mobj is totally non-shootable,
-                                                                                // but still considered solid
-#define MF2_INVULNERABLE	0x08000000      // mobj is invulnerable
-#define MF2_DORMANT			0x10000000      // thing is dormant
-#define MF2_ICEDAMAGE		0x20000000      // does ice damage
-#define MF2_SEEKERMISSILE	0x40000000      // is a seeker (for reflection)
-#define MF2_REFLECTIVE		0x80000000      // reflects missiles
-
-//=============================================================================
-
-// ===== Player Class Types =====
-typedef enum
-{
-    PCLASS_FIGHTER,
-    PCLASS_CLERIC,
-    PCLASS_MAGE,
-    PCLASS_PIG,
-    NUMCLASSES
-} pclass_t;
-
-typedef enum
-{
-    PST_LIVE,                   // playing
-    PST_DEAD,                   // dead on the ground
-    PST_REBORN                  // ready to restart
-} playerstate_t;
-
-// psprites are scaled shapes directly on the view screen
-// coordinates are given for a 320*200 view screen
-typedef enum
-{
-    ps_weapon,
-    ps_flash,
-    NUMPSPRITES
-} psprnum_t;
-
-typedef struct pspdef_s
-{
-    state_t *state;             // a NULL state means not active
-    int tics;
-    fixed_t sx, sy;
-} pspdef_t;
-
-/* Old Heretic key type
-typedef enum
-{
-	key_yellow,
-	key_green,
-	key_blue,
-	NUM_KEY_TYPES
-} keytype_t;
-*/
-
-typedef enum
-{
-    KEY_1,
-    KEY_2,
-    KEY_3,
-    KEY_4,
-    KEY_5,
-    KEY_6,
-    KEY_7,
-    KEY_8,
-    KEY_9,
-    KEY_A,
-    KEY_B,
-    NUM_KEY_TYPES
-} keytype_t;
-
-typedef enum
-{
-    ARMOR_ARMOR,
-    ARMOR_SHIELD,
-    ARMOR_HELMET,
-    ARMOR_AMULET,
-    NUMARMOR
-} armortype_t;
-
-typedef enum
-{
-    WP_FIRST,
-    WP_SECOND,
-    WP_THIRD,
-    WP_FOURTH,
-    NUMWEAPONS,
-    WP_NOCHANGE
-} weapontype_t;
-
-typedef enum
-{
-    MANA_1,
-    MANA_2,
-    NUMMANA,
-    MANA_BOTH,
-    MANA_NONE
-} manatype_t;
-
-#define MAX_MANA	200
-
-#define WPIECE1		1
-#define WPIECE2		2
-#define WPIECE3		4
-
-typedef struct
-{
-    manatype_t mana;
-    int upstate;
-    int downstate;
-    int readystate;
-    int atkstate;
-    int holdatkstate;
-    int flashstate;
-} weaponinfo_t;
-
-extern weaponinfo_t WeaponInfo[NUMWEAPONS][NUMCLASSES];
-
-typedef enum
-{
-    arti_none,
-    arti_invulnerability,
-    arti_health,
-    arti_superhealth,
-    arti_healingradius,
-    arti_summon,
-    arti_torch,
-    arti_egg,
-    arti_fly,
-    arti_blastradius,
-    arti_poisonbag,
-    arti_teleportother,
-    arti_speed,
-    arti_boostmana,
-    arti_boostarmor,
-    arti_teleport,
-    // Puzzle artifacts
-    arti_firstpuzzitem,
-    arti_puzzskull = arti_firstpuzzitem,
-    arti_puzzgembig,
-    arti_puzzgemred,
-    arti_puzzgemgreen1,
-    arti_puzzgemgreen2,
-    arti_puzzgemblue1,
-    arti_puzzgemblue2,
-    arti_puzzbook1,
-    arti_puzzbook2,
-    arti_puzzskull2,
-    arti_puzzfweapon,
-    arti_puzzcweapon,
-    arti_puzzmweapon,
-    arti_puzzgear1,
-    arti_puzzgear2,
-    arti_puzzgear3,
-    arti_puzzgear4,
-    NUMARTIFACTS
-} artitype_t;
-
-typedef enum
-{
-    pw_None,
-    pw_invulnerability,
-    pw_allmap,
-    pw_infrared,
-    pw_flight,
-    pw_shield,
-    pw_health2,
-    pw_speed,
-    pw_minotaur,
-    NUMPOWERS
-} powertype_t;
-
-#define	INVULNTICS (30*35)
-#define	INVISTICS (60*35)
-#define	INFRATICS (120*35)
-#define	IRONTICS (60*35)
-#define WPNLEV2TICS (40*35)
-#define FLIGHTTICS (60*35)
-#define SPEEDTICS (45*35)
-#define MORPHTICS (40*35)
-#define MAULATORTICS (25*35)
-
-#define MESSAGETICS (4*35)
-#define BLINKTHRESHOLD (4*35)
-
-#define NUMINVENTORYSLOTS	NUMARTIFACTS
-
-typedef struct
-{
-    int type;
-    int count;
-} inventory_t;
-
-/*
-================
-=
-= player_t
-=
-================
-*/
-
-typedef struct player_s
-{
-    mobj_t *mo;
-    playerstate_t playerstate;
-    ticcmd_t cmd;
-
-    pclass_t class;             // player class type
-
-    fixed_t viewz;              // focal origin above r.z
-    fixed_t viewheight;         // base height above floor for viewz
-    fixed_t deltaviewheight;    // squat speed
-    fixed_t bob;                // bounded/scaled total momentum
-
-    int flyheight;
-    int lookdir;
-    boolean centering;
-    int health;                 // only used between levels, mo->health
-    // is used during levels
-    int armorpoints[NUMARMOR];
-
-    inventory_t inventory[NUMINVENTORYSLOTS];
-    artitype_t readyArtifact;
-    int artifactCount;
-    int inventorySlotNum;
-    int powers[NUMPOWERS];
-    int keys;
-    int pieces;                 // Fourth Weapon pieces
-    signed int frags[MAXPLAYERS];       // kills of other players
-    weapontype_t readyweapon;
-    weapontype_t pendingweapon; // wp_nochange if not changing
-    boolean weaponowned[NUMWEAPONS];
-    int mana[NUMMANA];
-    int attackdown, usedown;    // true if button down last tic
-    int cheats;                 // bit flags
-
-    int refire;                 // refired shots are less accurate
-
-    int killcount, itemcount, secretcount;      // for intermission
-    char message[80];           // hint messages
-    int messageTics;            // counter for showing messages
-    short ultimateMessage;
-    short yellowMessage;
-    int damagecount, bonuscount;        // for screen flashing
-    int poisoncount;            // screen flash for poison damage
-    mobj_t *poisoner;           // NULL for non-player mobjs
-    mobj_t *attacker;           // who did damage (NULL for floors)
-    int extralight;             // so gun flashes light up areas
-    int fixedcolormap;          // can be set to REDCOLORMAP, etc
-    int colormap;               // 0-3 for which color to draw player
-    pspdef_t psprites[NUMPSPRITES];     // view sprites (gun, etc)
-    int morphTics;              // player is a pig if > 0
-    unsigned int jumpTics;      // delay the next jump for a moment
-    unsigned int worldTimer;    // total time the player's been playing
-} player_t;
-
-#define CF_NOCLIP		1
-#define	CF_GODMODE		2
-#define	CF_NOMOMENTUM	4       // not really a cheat, just a debug aid
-
-#define	SBARHEIGHT	39      // status bar height at bottom of screen
-
-void NET_SendFrags(player_t * player);
-
-/*
-===============================================================================
-
-					GLOBAL VARIABLES
-
-===============================================================================
-*/
-
-#define TELEFOGHEIGHT (32*FRACUNIT)
-
-extern GameMode_t gamemode;
-extern GameVersion_t gameversion;
-
-extern gameaction_t gameaction;
-
-extern boolean paused;
-
-extern boolean DevMaps;         // true = map development mode
-extern char *DevMapsDir;        // development maps directory
-
-extern boolean nomonsters;      // checkparm of -nomonsters
-
-extern boolean respawnparm;     // checkparm of -respawn
-
-extern boolean randomclass;     // checkparm of -randclass
-
-extern boolean debugmode;       // checkparm of -debug
-
-extern boolean usergame;        // ok to save / end game
-
-extern boolean ravpic;          // checkparm of -ravpic
-
-extern boolean altpal;          // checkparm to use an alternate palette routine
-
-extern boolean cdrom;           // true if cd-rom mode active ("-cdrom")
-
-extern boolean viewactive;
-
-extern boolean deathmatch;      // only if started as net death
-
-extern boolean netgame;         // only true if >1 player
-
-extern boolean cmdfrag;         // true if a CMD_FRAG packet should be sent out every
-                                                // kill
-
-extern boolean playeringame[MAXPLAYERS];
-extern pclass_t PlayerClass[MAXPLAYERS];
-
-extern int consoleplayer;       // player taking events and displaying
-
-extern int displayplayer;
-
-extern int viewangleoffset;     // ANG90 = left side, ANG270 = right
-
-extern player_t players[MAXPLAYERS];
-
-extern boolean DebugSound;      // debug flag for displaying sound info
-
-extern boolean demorecording;
-extern boolean demoplayback;
-extern boolean demoextend;      // allow demos to persist through exit/respawn
-extern int maxzone;             // Maximum chunk allocated for zone heap
-
-// Truncate angleturn in ticcmds to nearest 256.
-// Used when recording Vanilla demos in netgames.
-extern boolean lowres_turn;
-
-extern int Sky1Texture;
-extern int Sky2Texture;
-
-extern gamestate_t gamestate;
-extern skill_t gameskill;
-//extern        boolean         respawnmonsters;
-extern int gameepisode;
-extern int gamemap;
-extern int prevmap;
-extern int levelstarttic;       // gametic at level start
-extern int leveltime;           // tics in game play for par
-
-extern ticcmd_t *netcmds;
-
-#define MAXDEATHMATCHSTARTS 16
-extern mapthing_t *deathmatch_p;
-extern mapthing_t deathmatchstarts[MAXDEATHMATCHSTARTS];
-
-// Position indicator for cooperative net-play reborn
-extern int RebornPosition;
-
-#define MAX_PLAYER_STARTS 8
-extern mapthing_t playerstarts[MAX_PLAYER_STARTS][MAXPLAYERS];
-extern int maxplayers;
-
-extern int mouseSensitivity;
-
-extern boolean precache;        // if true, load all graphics at level load
-
-extern byte *screen;            // off screen work buffer, from V_video.c
-
-extern boolean singledemo;      // quit after playing a demo from cmdline
-
-extern int bodyqueslot;
-extern skill_t startskill;
-extern int startepisode;
-extern int startmap;
-extern boolean autostart;
-extern boolean advancedemo;
-
-extern boolean testcontrols;
-extern int testcontrols_mousespeed;
-
-extern int vanilla_savegame_limit;
-extern int vanilla_demo_limit;
-
-extern boolean usearti;
-
-
-/*
-===============================================================================
-
-					GLOBAL FUNCTIONS
-
-===============================================================================
-*/
-
-#include "w_wad.h"
-#include "z_zone.h"
-
-//----------
-//BASE LEVEL
-//----------
-void H2_Main(void);
-// not a globally visible function, just included for source reference
-// calls all startup code
-// parses command line options
-// if not overrided, calls N_AdvanceDemo
-
-void H2_GameLoop(void);
-// not a globally visible function, just included for source reference
-// called by H2_Main, never exits
-// manages timing and IO
-// calls all ?_Responder, ?_Ticker, and ?_Drawer functions
-// calls I_GetTime, I_StartFrame, and I_StartTic
-
-void H2_StartTitle(void);
-
-
-extern boolean artiskip;
-
-
-//---------
-//SYSTEM IO
-//---------
-byte *I_AllocLow(int length);
-// allocates from low memory under dos, just mallocs under unix
-
-// haleyjd: was WATCOMC, again preserved for historical interest as in Heretic
-#if 0
-extern boolean useexterndriver;
-
-#define EBT_FIRE			1
-#define EBT_OPENDOOR 		2
-#define EBT_SPEED			4
-#define EBT_STRAFE			8
-#define EBT_MAP				0x10
-#define EBT_INVENTORYLEFT 	0x20
-#define EBT_INVENTORYRIGHT 	0x40
-#define EBT_USEARTIFACT		0x80
-#define EBT_FLYDROP			0x100
-#define EBT_CENTERVIEW		0x200
-#define EBT_PAUSE			0x400
-#define EBT_WEAPONCYCLE		0x800
-#define EBT_JUMP			0x1000
-
-typedef struct
-{
-    short vector;               // Interrupt vector
-
-    signed char moveForward;    // forward/backward (maxes at 50)
-    signed char moveSideways;   // strafe (maxes at 24)
-    short angleTurn;            // turning speed (640 [slow] 1280 [fast])
-    short angleHead;            // head angle (+2080 [left] : 0 [center] : -2048 [right])
-    signed char pitch;          // look up/down (-110 : +90)
-    signed char flyDirection;   // flyheight (+1/-1)
-    unsigned short buttons;     // EBT_* flags
-} externdata_t;
-#endif
-
-//----
-//GAME
-//----
-
-
-#define NUMKEYS 256
-
-
-void G_DeathMatchSpawnPlayer(int playernum);
-
-void G_InitNew(skill_t skill, int episode, int map);
-
-void G_DeferedInitNew(skill_t skill, int episode, int map);
-// can be called by the startup code or M_Responder
-// a normal game starts at map 1, but a warp test can start elsewhere
-
-void G_DeferredNewGame(skill_t skill);
-
-void G_DeferedPlayDemo(const char *demo);
-
-void G_LoadGame(int slot);
-// can be called by the startup code or M_Responder
-// calls P_SetupLevel or W_EnterWorld
-void G_DoLoadGame(void);
-
-void G_SaveGame(int slot, char *description);
-// called by M_Responder
-
-void H2_ProcessEvents(void);
-
-void H2_DoAdvanceDemo(void);
-
-boolean G_CheckDemoStatus(void);
-
-void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
-                  const char *name);
-// only called by startup code
-
-void G_PlayDemo(char *name);
-void G_TimeDemo(char *name);
-
-void G_TeleportNewMap(int map, int position);
-
-void G_Completed(int map, int position);
-//void G_ExitLevel (void);
-//void G_SecretExitLevel (void);
-
-void G_StartNewGame(skill_t skill);
-void G_StartNewInit(void);
-
-void G_WorldDone(void);
-
-void G_BuildTiccmd(ticcmd_t *cmd, int maketic);
-void G_Ticker(void);
-boolean G_Responder(event_t * ev);
-
-void G_ScreenShot(void);
-
-
-extern int LeaveMap;
-extern boolean gamekeydown[NUMKEYS];
-
-
-//-------
-//SV_SAVE
-//-------
-
-#define HXS_VERSION_TEXT "HXS Ver 2.37"
-#define HXS_VERSION_TEXT_LENGTH 16
-#define HXS_DESCRIPTION_LENGTH 24
-
-extern char *SavePath;
-
-void SV_SaveGame(int slot, const char *description);
-void SV_SaveMap(boolean savePlayers);
-void SV_LoadGame(int slot);
-void SV_MapTeleport(int map, int position);
-void SV_LoadMap(void);
-void SV_InitBaseSlot(void);
-void SV_UpdateRebornSlot(void);
-void SV_ClearRebornSlot(void);
-boolean SV_RebornSlotAvailable(void);
-int SV_GetRebornSlot(void);
-
-//-----
-//PLAY
-//-----
-
-extern lumpinfo_t *maplumpinfo;
-
-void P_Ticker(void);
-// called by C_Ticker
-// can call G_PlayerExited
-// carries out all thinking of monsters and players
-
-void P_SetupLevel(int episode, int map, int playermask, skill_t skill);
-// called by W_Ticker
-
-void P_Init(void);
-// called by startup code
-
-int P_GetMapCluster(int map);
-int P_TranslateMap(int map);
-int P_GetMapCDTrack(int map);
-int P_GetMapWarpTrans(int map);
-int P_GetMapNextMap(int map);
-int P_GetMapSky1Texture(int map);
-int P_GetMapSky2Texture(int map);
-char *P_GetMapName(int map);
-fixed_t P_GetMapSky1ScrollDelta(int map);
-fixed_t P_GetMapSky2ScrollDelta(int map);
-boolean P_GetMapDoubleSky(int map);
-boolean P_GetMapLightning(int map);
-boolean P_GetMapFadeTable(int map);
-char *P_GetMapSongLump(int map);
-void P_PutMapSongLump(int map, char *lumpName);
-int P_GetCDStartTrack(void);
-int P_GetCDEnd1Track(void);
-int P_GetCDEnd2Track(void);
-int P_GetCDEnd3Track(void);
-int P_GetCDIntermissionTrack(void);
-int P_GetCDTitleTrack(void);
-
-//-------
-//REFRESH
-//-------
-
-extern boolean setsizeneeded;
-
-extern boolean BorderNeedRefresh;
-extern boolean BorderTopRefresh;
-
-extern int UpdateState;
-// define the different areas for the dirty map
-#define I_NOUPDATE	0
-#define I_FULLVIEW	1
-#define I_STATBAR	2
-#define I_MESSAGES	4
-#define I_FULLSCRN	8
-
-void R_RenderPlayerView(player_t * player);
-// called by G_Drawer
-
-void R_Init(void);
-// called by startup code
-
-void R_DrawViewBorder(void);
-void R_DrawTopBorder(void);
-// if the view size is not full screen, draws a border around it
-
-void R_SetViewSize(int blocks, int detail);
-// called by M_Responder
-
-int R_FlatNumForName(const char *name);
-
-int R_TextureNumForName(const char *name);
-int R_CheckTextureNumForName(const char *name);
-// called by P_Ticker for switches and animations
-// returns the texture number for the texture name
-
-
-//----
-//MISC
-//----
-extern int localQuakeHappening[MAXPLAYERS];
-
-int M_DrawText(int x, int y, boolean direct, char *string);
-
-//------------------------------
-// SC_man.c
-//------------------------------
-
-void SC_Open(const char *name);
-void SC_OpenLump(const char *name);
-void SC_OpenFile(const char *name);
-void SC_Close(void);
-boolean SC_GetString(void);
-void SC_MustGetString(void);
-void SC_MustGetStringName(char *name);
-boolean SC_GetNumber(void);
-void SC_MustGetNumber(void);
-void SC_UnGet(void);
-//boolean SC_Check(void);
-boolean SC_Compare(const char *text);
-int SC_MatchString(const char **strings);
-int SC_MustMatchString(const char **strings);
-void SC_ScriptError(const char *message);
-
-extern char *sc_String;
-extern int sc_Number;
-extern int sc_Line;
-extern boolean sc_End;
-extern boolean sc_Crossed;
-extern boolean sc_FileScripts;
-extern const char *sc_ScriptsDir;
-
-//------------------------------
-// SN_sonix.c
-//------------------------------
-
-enum
-{
-    SEQ_PLATFORM,
-    SEQ_PLATFORM_HEAVY,         // same script as a normal platform
-    SEQ_PLATFORM_METAL,
-    SEQ_PLATFORM_CREAK,         // same script as a normal platform
-    SEQ_PLATFORM_SILENCE,
-    SEQ_PLATFORM_LAVA,
-    SEQ_PLATFORM_WATER,
-    SEQ_PLATFORM_ICE,
-    SEQ_PLATFORM_EARTH,
-    SEQ_PLATFORM_METAL2,
-    SEQ_DOOR_STONE,
-    SEQ_DOOR_HEAVY,
-    SEQ_DOOR_METAL,
-    SEQ_DOOR_CREAK,
-    SEQ_DOOR_SILENCE,
-    SEQ_DOOR_LAVA,
-    SEQ_DOOR_WATER,
-    SEQ_DOOR_ICE,
-    SEQ_DOOR_EARTH,
-    SEQ_DOOR_METAL2,
-    SEQ_ESOUND_WIND,
-    SEQ_NUMSEQ
-};
-
-typedef enum
-{
-    SEQTYPE_STONE,
-    SEQTYPE_HEAVY,
-    SEQTYPE_METAL,
-    SEQTYPE_CREAK,
-    SEQTYPE_SILENCE,
-    SEQTYPE_LAVA,
-    SEQTYPE_WATER,
-    SEQTYPE_ICE,
-    SEQTYPE_EARTH,
-    SEQTYPE_METAL2,
-    SEQTYPE_NUMSEQ
-} seqtype_t;
-
-void SN_InitSequenceScript(void);
-void SN_StartSequence(mobj_t * mobj, int sequence);
-void SN_StartSequenceName(mobj_t * mobj, char *name);
-void SN_StopSequence(mobj_t * mobj);
-void SN_UpdateActiveSequences(void);
-void SN_StopAllSequences(void);
-int SN_GetSequenceOffset(int sequence, int *sequencePtr);
-void SN_ChangeNodeData(int nodeNum, int seqOffset, int delayTics, int volume,
-                       int currentSoundID);
-
-
-typedef struct seqnode_s seqnode_t;
-struct seqnode_s
-{
-    int *sequencePtr;
-    int sequence;
-    mobj_t *mobj;
-    int currentSoundID;
-    int delayTics;
-    int volume;
-    int stopSound;
-    seqnode_t *prev;
-    seqnode_t *next;
-};
-
-extern int ActiveSequences;
-extern seqnode_t *SequenceListHead;
-
-//----------------------
-// Interlude (IN_lude.c)
-//----------------------
-
-#define MAX_INTRMSN_MESSAGE_SIZE 1024
-
-extern boolean intermission;
-extern char ClusterMessage[MAX_INTRMSN_MESSAGE_SIZE];
-
-void IN_Start(void);
-void IN_Ticker(void);
-void IN_Drawer(void);
-
-//----------------------
-// Chat mode (CT_chat.c)
-//----------------------
-
-void CT_Init(void);
-void CT_Drawer(void);
-boolean CT_Responder(event_t * ev);
-void CT_Ticker(void);
-char CT_dequeueChatChar(void);
-
-extern boolean chatmodeon;
-
-//--------------------
-// Finale (F_finale.c)
-//--------------------
-
-void F_Drawer(void);
-void F_Ticker(void);
-void F_StartFinale(void);
-
-//----------------------
-// STATUS BAR (SB_bar.c)
-//----------------------
-
-extern int inv_ptr;
-extern int curpos;
-extern boolean inventory;
-
-
-void SB_Init(void);
-void SB_SetClassData(void);
-boolean SB_Responder(event_t * event);
-void SB_Ticker(void);
-void SB_Drawer(void);
-void Draw_TeleportIcon(void);
-void Draw_SaveIcon(void);
-void Draw_LoadIcon(void);
-
-//-----------------
-// MENU (MN_menu.c)
-//-----------------
-
-void MN_Init(void);
-void MN_ActivateMenu(void);
-void MN_DeactivateMenu(void);
-boolean MN_Responder(event_t * event);
-void MN_Ticker(void);
-void MN_Drawer(void);
-void MN_DrTextA(const char *text, int x, int y);
-void MN_DrTextAYellow(const char *text, int x, int y);
-int MN_TextAWidth(const char *text);
-void MN_DrTextB(const char *text, int x, int y);
-int MN_TextBWidth(const char *text);
-
-extern int messageson;
-extern boolean MenuActive;
-extern boolean askforquit;
-extern boolean mn_SuicideConsole;
-extern int detailLevel;
-
-
-#include "sounds.h"
-
-#include "p_action.h"
-
-
-#endif // __H2DEF__
diff --git a/games/NXDoom/src/hexen/hexen_icon.c b/games/NXDoom/src/hexen/hexen_icon.c
deleted file mode 100644
index ae1082596..000000000
--- a/games/NXDoom/src/hexen/hexen_icon.c
+++ /dev/null
@@ -1,2736 +0,0 @@
-static int hexen_icon_w = 128;
-static int hexen_icon_h = 128;
-
-static const unsigned int hexen_icon_data[] = {
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
-    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
-    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
-    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
-    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
-    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
-    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
-    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
-    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
-    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
-    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
-    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
-    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
-    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
-    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
-    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
-    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
-    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
-    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
-    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
-    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
-    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
-    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
-    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
-    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
-    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
-    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
-    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
-    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
-    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
-    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
-    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
-    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
-    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
-    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
-    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
-    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
-    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
-    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
-    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
-    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
-    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
-    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
-    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
-    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
-    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x93756aff, 0x917469ff, 0x99796eff, 0xa07b70ff, 
-    0xa07b70ff, 0xa07b70ff, 0xa07b70ff, 0xa07b70ff, 0xa07b70ff, 0xa8887eff, 
-    0xb9a39dff, 0xb8a39cff, 0xb8a39cff, 0xb7a29bff, 0xb7a29bff, 0xb6a19aff, 
-    0xb5a099ff, 0xb5a099ff, 0xb49f98ff, 0xa78980ff, 0x9e7a6eff, 0x9d7a6eff, 
-    0x9d7a6eff, 0x9d7a6eff, 0x9b796dff, 0x99776bff, 0x977469ff, 0x957267ff, 
-    0x957368ff, 0xa18982ff, 0xa38e88ff, 0xa18d86ff, 0xa08c85ff, 0x9e8983ff, 
-    0x9c8781ff, 0x9a867fff, 0x99847dff, 0x97827bff, 0x917c74ff, 0x7e5d51ff, 
-    0x7c5b4fff, 0x7b594eff, 0x78574cff, 0x76554aff, 0x745348ff, 0x735246ff, 
-    0x715044ff, 0x6f4e42ff, 0x775c52ff, 0x816e67ff, 0x7f6c65ff, 0x7e6b63ff, 
-    0x7c6861ff, 0x7a6760ff, 0x79665eff, 0x76635cff, 0x74615aff, 0x736059ff, 
-    0x61443bff, 0x57382dff, 0x55362cff, 0x583a30ff, 0x5a3d36ff, 0x5d3f3cff, 
-    0x5f4141ff, 0x5f4447ff, 0x5f454bff, 0x674e55ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
-    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
-    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
-    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
-    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
-    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
-    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
-    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
-    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
-    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
-    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
-    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
-    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
-    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
-    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
-    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
-    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
-    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
-    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
-    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
-    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xc69e94ff, 0xc9a49bff, 
-    0xc8a39aff, 0xc7a39aff, 0xc6a198ff, 0xc5a198ff, 0xc4a097ff, 0xc4a096ff, 
-    0xc29f95ff, 0xbd948aff, 0xb07c6eff, 0xb07b6eff, 0xaf7b6dff, 0xae7b6dff, 
-    0xae7a6dff, 0xad7a6cff, 0xad7a6cff, 0xac7a6cff, 0xac7a6cff, 0xb38a80ff, 
-    0xb7978eff, 0xb6958cff, 0xb6958cff, 0xb5948bff, 0xb29289ff, 0xb19188ff, 
-    0xaf8f86ff, 0xad8d85ff, 0xab8c83ff, 0x9e7164ff, 0x9a6c5fff, 0x986a5dff, 
-    0x97695bff, 0x946759ff, 0x926558ff, 0x906356ff, 0x8e6155ff, 0x8b5f52ff, 
-    0x8d6458ff, 0x96786fff, 0x94776eff, 0x91756cff, 0x90736bff, 0x8e7269ff, 
-    0x8c7068ff, 0x8a6e66ff, 0x896d64ff, 0x866b62ff, 0x7d5d52ff, 0x734a3dff, 
-    0x70483bff, 0x6e473aff, 0x6c4438ff, 0x6b4337ff, 0x684134ff, 0x664033ff, 
-    0x643e31ff, 0x623c2fff, 0x6b4f45ff, 0x6f564eff, 0x6d544cff, 0x6e564fff, 
-    0x6e5652ff, 0x6e5753ff, 0x6f5857ff, 0x6f5958ff, 0x705a5cff, 0x705b5eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x903d27ff, 0x903d28ff, 0x8f3d28ff, 0x8e3c27ff, 0x8d3c27ff, 0x8c3b27ff, 
-    0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 
-    0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 
-    0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 
-    0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 
-    0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
-    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
-    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
-    0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 
-    0x572311ff, 0x572310ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x8f3d27ff, 0x8f3d28ff, 0x8e3c27ff, 0x8d3c27ff, 
-    0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 
-    0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 
-    0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 
-    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 
-    0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 
-    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
-    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
-    0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 
-    0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8e3d27ff, 0x8e3c27ff, 
-    0x8d3c27ff, 0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 
-    0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 
-    0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 
-    0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
-    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 
-    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
-    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
-    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
-    0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 
-    0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x8d3c26ff, 0x8d3c27ff, 0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 0x8a3a26ff, 
-    0x893a25ff, 0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 
-    0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 
-    0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 
-    0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
-    0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
-    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
-    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
-    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 
-    0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 
-    0x552210ff, 0x54220fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x8c3c26ff, 0x8c3b27ff, 0x8b3b26ff, 0x8a3b26ff, 
-    0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 
-    0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 
-    0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 
-    0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 
-    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
-    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
-    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
-    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 
-    0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 
-    0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8b3b26ff, 0x8b3b26ff, 
-    0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 0x863924ff, 
-    0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 
-    0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 
-    0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 
-    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
-    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
-    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 
-    0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 
-    0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x8a3b25ff, 0x8a3b26ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 0x873924ff, 
-    0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 
-    0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 0x7d3420ff, 
-    0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 
-    0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
-    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
-    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
-    0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 
-    0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 
-    0x52210fff, 0x51200eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x893b25ff, 0x8a3a26ff, 0x893a25ff, 0x883925ff, 
-    0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 
-    0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7e3521ff, 
-    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 
-    0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 
-    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
-    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
-    0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 
-    0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 
-    0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x893a25ff, 0x893a25ff, 
-    0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 0x843723ff, 
-    0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 
-    0x7e3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
-    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 
-    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
-    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
-    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
-    0x5e2614ff, 0x5e2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 
-    0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 
-    0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x883a24ff, 0x883925ff, 0x873924ff, 0x863924ff, 0x853824ff, 0x843823ff, 
-    0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x97361fff, 
-    0xe93819ff, 0xe53619ff, 0x92341fff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 
-    0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
-    0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
-    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
-    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
-    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x852112ff, 0xd31710ff, 0xea1310ff, 
-    0xcc150fff, 0x752110ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 
-    0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 
-    0x50200eff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x873924ff, 0x873924ff, 0x863924ff, 0x853824ff, 
-    0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 
-    0x7f3521ff, 0xcc371cff, 0xfe3718ff, 0xfe3617ff, 0xf23518ff, 0x91341eff, 
-    0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 
-    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
-    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
-    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
-    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xee0f0eff, 0x641e10ff, 0x572310ff, 
-    0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 
-    0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x863923ff, 0x863924ff, 
-    0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 0x813622ff, 
-    0x803622ff, 0x7f3521ff, 0x7e3521ff, 0xae361eff, 0xfe3617ff, 0xfe3517ff, 
-    0xfe3417ff, 0xf23318ff, 0x8f331eff, 0x78321eff, 0x77321eff, 0x77311eff, 
-    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
-    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
-    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 
-    0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0x9d1310ff, 0x501f10ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 
-    0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x853923ff, 0x853824ff, 0x843823ff, 0x843723ff, 0x833723ff, 0x823722ff, 
-    0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 
-    0xbd351cff, 0xfe3417ff, 0xfe3317ff, 0xfe3217ff, 0xf23217ff, 0x8d321dff, 
-    0xa8311bff, 0xd02f19ff, 0x9a311bff, 0x74301dff, 0x73301cff, 0x722f1cff, 
-    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
-    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
-    0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0xf70e11ff, 0xaf1211ff, 0x40190fff, 0x4e1f0fff, 0x53210fff, 
-    0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 
-    0x4d1e0cff, 0x4d1e0cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x843823ff, 0x843823ff, 0x843723ff, 0x833723ff, 
-    0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 
-    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0xbc331bff, 0xfe3217ff, 0xfe3216ff, 
-    0xfd3116ff, 0xf23016ff, 0xfc2f16ff, 0xfd2e15ff, 0xfb2d15ff, 0xa02e1aff, 
-    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
-    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
-    0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0x811411ff, 0x3f180eff, 
-    0x40180fff, 0x4d1e0fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 
-    0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4d1e0cff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x833822ff, 0x843723ff, 
-    0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 
-    0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
-    0xbb321aff, 0xfd3116ff, 0xfd3016ff, 0xfd2f16ff, 0xfd2e15ff, 0xfd2d15ff, 
-    0xfd2c15ff, 0xfb2b15ff, 0x9f2d19ff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
-    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
-    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
-    0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc41013ff, 
-    0x41180eff, 0x3f180eff, 0x3e180eff, 0x3f180eff, 0x4c1e0eff, 0x50200eff, 
-    0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1d0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x833722ff, 0x833723ff, 0x823722ff, 0x813622ff, 0x803622ff, 0x7f3521ff, 
-    0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7c331fff, 
-    0xaa321cff, 0xa4321bff, 0x78321eff, 0xba301aff, 0xfd2f16ff, 0xfd2e15ff, 
-    0xfd2d15ff, 0xfd2c15ff, 0xfd2b15ff, 0xfd2a15ff, 0xfa2914ff, 0x9e2c19ff, 
-    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
-    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
-    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
-    0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
-    0x3f180eff, 0x4a1d0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4b1d0dff, 0x4c1d0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x823722ff, 0x823722ff, 0x813622ff, 0x803622ff, 
-    0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 
-    0x7a331fff, 0xb9331bff, 0xfe3216ff, 0xfd3116ff, 0x9c2b18ff, 0x76311dff, 
-    0xb92f19ff, 0xfd2d15ff, 0xfd2c15ff, 0xfd2b15ff, 0xfd2a15ff, 0xfc2914ff, 
-    0xfc2814ff, 0xf72713ff, 0x742717ff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
-    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
-    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
-    0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 
-    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3f180eff, 0x491c0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4b1d0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x813721ff, 0x813622ff, 
-    0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 
-    0x7b331fff, 0x7a331fff, 0x79331fff, 0xc5321aff, 0xfd3116ff, 0xfd3016ff, 
-    0xa02615ff, 0x5c2617ff, 0x74301dff, 0xb82e19ff, 0xfd2b15ff, 0xfd2a15ff, 
-    0xfc2914ff, 0xfc2814ff, 0xfc2714ff, 0xfc2614ff, 0x691d12ff, 0x602717ff, 
-    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 
-    0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 
-    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3e180dff, 0x481c0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4b1c0eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x803621ff, 0x803622ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 0x7d3420ff, 
-    0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x84321dff, 
-    0xc12b16ff, 0xb72914ff, 0x531f13ff, 0x491d13ff, 0x5b2517ff, 0x722f1cff, 
-    0xb72c18ff, 0xfc2914ff, 0xfc2814ff, 0xfc2714ff, 0xfc2614ff, 0xb32112ff, 
-    0x441c11ff, 0x441b11ff, 0x5e2617ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 
-    0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 
-    0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x481b0dff, 0x4a1d0dff, 
-    0x4a1c0eff, 0x4a1c0eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x7f3621ff, 0x7f3521ff, 0x7e3521ff, 0x7d3521ff, 
-    0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 
-    0x77321eff, 0x77311eff, 0x712f1cff, 0x512115ff, 0x491d13ff, 0x481d13ff, 
-    0x481d13ff, 0x592416ff, 0x712f1bff, 0xb62b17ff, 0xfc2714ff, 0xfc2614ff, 
-    0xfc2513ff, 0xec2312ff, 0x621c11ff, 0x431b11ff, 0x431b10ff, 0x5c2516ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
-    0x5e2613ff, 0x932011ff, 0xf7120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xca1113ff, 0x47180eff, 
-    0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d180eff, 0x471a0eff, 0x491c0eff, 0x4a1c0eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7f3520ff, 0x7e3521ff, 
-    0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 0x79331fff, 
-    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x6f2e1cff, 
-    0x502114ff, 0x481d13ff, 0x591e12ff, 0xa92313ff, 0x9c2515ff, 0x702e1aff, 
-    0xb52a17ff, 0xfc2513ff, 0xfc2413ff, 0xfc2313ff, 0xeb2113ff, 0x611c10ff, 
-    0x421a10ff, 0x421b10ff, 0x5a2415ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
-    0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 
-    0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
-    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3e170fff, 0x461a0eff, 0x491b0fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x7e3520ff, 0x7d3521ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 0x7a331fff, 
-    0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
-    0x74301dff, 0x73301cff, 0x6e2d1bff, 0x4e2014ff, 0xc22514ff, 0xfc2814ff, 
-    0xfc2714ff, 0xb82615ff, 0x6e2d1aff, 0xb42816ff, 0xfc2313ff, 0xfc2213ff, 
-    0xfb2112ff, 0xea1f11ff, 0x601b10ff, 0x411a10ff, 0x411a10ff, 0x582414ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
-    0x5f2714ff, 0x5e2614ff, 0x5e2613ff, 0x971f12ff, 0xf8120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
-    0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
-    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3e1710ff, 0x461a0fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x7d3520ff, 0x7d3420ff, 0x7c3420ff, 0x7b331fff, 
-    0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 
-    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x6c2d1aff, 
-    0xc32514ff, 0xfc2714ff, 0xfc2614ff, 0xfc2513ff, 0xb82313ff, 0x6c2c19ff, 
-    0xb32716ff, 0xfb2112ff, 0xfb2012ff, 0xfb1f12ff, 0xea1d11ff, 0x5e1b10ff, 
-    0x401a0fff, 0x401a0fff, 0x592414ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x612714ff, 0xa02013ff, 0xe41711ff, 0xf9140fff, 0xfa130fff, 0xf9120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
-    0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 
-    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x401710ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7d341fff, 0x7c3420ff, 
-    0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 0x77311eff, 
-    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
-    0x712f1bff, 0x702e1bff, 0x7b2b18ff, 0xe42514ff, 0xfc2513ff, 0xfc2413ff, 
-    0xfc2313ff, 0xb72213ff, 0x6b2c18ff, 0xb22515ff, 0xfb1f12ff, 0xfb1e12ff, 
-    0xfb1d12ff, 0xea1b10ff, 0x5e1910ff, 0x3f190fff, 0x3f190fff, 0x562213ff, 
-    0x612815ff, 0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
-    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 
-    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3f1611ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x7c341fff, 0x7b331fff, 0x7a331fff, 0x79331fff, 0x78321eff, 0x77321eff, 
-    0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
-    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x7a2a18ff, 
-    0xe42312ff, 0xfc2313ff, 0xfc2213ff, 0xfb2112ff, 0x9b2113ff, 0x682b18ff, 
-    0xb12414ff, 0xfb1d12ff, 0xfb1c11ff, 0xfb1b11ff, 0xea1a10ff, 0x5e190fff, 
-    0x3e190eff, 0x3e190fff, 0x552112ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 
-    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 0x3f180eff, 
-    0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3e170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3f1611ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x7b331eff, 0x7a331fff, 0x79331fff, 0x78321eff, 
-    0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 
-    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
-    0x6d2d1aff, 0x6c2d19ff, 0x782917ff, 0xe42112ff, 0xfb2112ff, 0xfb2012ff, 
-    0xb11d11ff, 0x522013ff, 0x662a17ff, 0xb02314ff, 0xfb1b11ff, 0xfb1a11ff, 
-    0xfa1911ff, 0xeb1810ff, 0xc71810ff, 0xc81610ff, 0xd41610ff, 0xfa1410ff, 
-    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 0x47180eff, 
-    0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3f1711ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7a331eff, 0x79331fff, 
-    0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 0x74301dff, 
-    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
-    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x772916ff, 
-    0xc61f12ff, 0xcb1e11ff, 0x591b10ff, 0x441a10ff, 0x5f1f11ff, 0x642916ff, 
-    0xb02114ff, 0xfa1911ff, 0xfa1810ff, 0xfa1710ff, 0xfa1610ff, 0xfa1510ff, 
-    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xc81013ff, 
-    0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
-    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3f1712ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x79331eff, 0x78321eff, 0x77321eff, 0x77311eff, 0x76311dff, 0x75311dff, 
-    0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
-    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
-    0x6a2c18ff, 0x692b18ff, 0x642917ff, 0x471c11ff, 0x4d1a10ff, 0xe21c11ff, 
-    0xfb1b11ff, 0xb11d12ff, 0x642815ff, 0xba1f12ff, 0xfa1710ff, 0xfa1610ff, 
-    0xfa1510ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
-    0xda0f13ff, 0x47180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
-    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3f1712ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x78321dff, 0x77321eff, 0x77311eff, 0x76311dff, 
-    0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
-    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
-    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x622816ff, 
-    0x791c10ff, 0xfb1b11ff, 0xfb1a11ff, 0xfa1911ff, 0xbf1b10ff, 0xd41b11ff, 
-    0xfa1610ff, 0xfa1510ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
-    0xf60e12ff, 0xf50e14ff, 0xf20e15ff, 0x681510ff, 0x3e180eff, 0x3e180eff, 
-    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3f1712ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x77321dff, 0x77311eff, 
-    0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 0x712f1bff, 
-    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
-    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x692615ff, 0xe21a11ff, 0xfa1911ff, 0xfa1810ff, 
-    0xfa1710ff, 0xfa1610ff, 0xfa1510ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
-    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xa91214ff, 
-    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3f1613ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x77311dff, 0x76311dff, 0x75311dff, 0x74301dff, 0x73301cff, 0x722f1cff, 
-    0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
-    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x702514ff, 
-    0xe21910ff, 0xfa1710ff, 0xfa1610ff, 0xfa1510ff, 0xfa1410ff, 0xfa140fff, 
-    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 
-    0xf20e18ff, 0xaf1215ff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1513ff, 0x3e1613ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x76311cff, 0x75311dff, 0x74301dff, 0x73301cff, 
-    0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
-    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x6e2514ff, 0xe21710ff, 0xfa1510ff, 0xfa1410ff, 
-    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 
-    0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 0x781511ff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3e1714ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x75311cff, 0x74301dff, 
-    0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 
-    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
-    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xc11b11ff, 
-    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 
-    0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 0xae1215ff, 0x3e180eff, 
-    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3e1615ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x74301cff, 0x73301cff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 0x702e1bff, 
-    0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
-    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 
-    0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 
-    0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 0xb31116ff, 
-    0x41180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3f1614ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x73301bff, 0x722f1cff, 0x712f1bff, 0x712f1bff, 
-    0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
-    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
-    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xf70e11ff, 
-    0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xf10e19ff, 
-    0xb31116ff, 0x41180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3e1615ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x722f1bff, 0x712f1bff, 
-    0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 
-    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x612714ff, 0xbc1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
-    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 
-    0xf10e19ff, 0xec0e19ff, 0x5d1611ff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
-    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3f1515ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x712f1aff, 0x712f1bff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 0x6d2d1aff, 
-    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 
-    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0xf70e11ff, 0xf60e12ff, 0xf50e14ff, 0xf40e15ff, 0xf30e16ff, 
-    0xf20e18ff, 0xf10e19ff, 0xf00e1aff, 0xef0e1cff, 0xde0f1bff, 0x5c1610ff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
-    0x3d1415ff, 0x3e1615ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x712f1aff, 0x702e1bff, 0x6f2e1aff, 0x6e2e1aff, 
-    0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xbc1d12ff, 0xfa1410ff, 
-    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0xc01110ff, 0xec0e12ff, 0xf50e14ff, 0xf40e15ff, 
-    0xf30e16ff, 0xf20e18ff, 0xd90f18ff, 0xa31315ff, 0xef0e1cff, 0xee0e1dff, 
-    0xed0d1eff, 0xdd0e1eff, 0x5a1510ff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
-    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3e1616ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x702e1aff, 0x6f2e1aff, 
-    0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 
-    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xbc1d12ff, 
-    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x40180fff, 0xcb1012ff, 
-    0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xd90f18ff, 0x54170fff, 0x3e180eff, 
-    0x961215ff, 0xed0d1eff, 0xec0d20ff, 0xeb0d21ff, 0xdb0e20ff, 0x591512ff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
-    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3d1516ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6f2e19ff, 0x6e2e1aff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 
-    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 
-    0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 
-    0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 
-    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x8f1216ff, 0xeb0d21ff, 0xea0d22ff, 
-    0xe90d24ff, 0xd90e23ff, 0x5a1513ff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
-    0x3c1416ff, 0x3d1515ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x6e2e19ff, 0x6d2d1aff, 0x6c2d19ff, 0x6b2c19ff, 
-    0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
-    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 
-    0x40180fff, 0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 
-    0x56170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
-    0x8e1217ff, 0xe90d24ff, 0xe80d25ff, 0xe70d26ff, 0xd70e26ff, 0x5a1513ff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
-    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3d1516ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6d2d19ff, 0x6c2d19ff, 
-    0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
-    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0xa11210ff, 0x40180fff, 0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 
-    0xdc0f18ff, 0x56170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x8d1218ff, 0xe70d26ff, 0xe60d28ff, 
-    0xe50d29ff, 0xd50e27ff, 0x591415ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
-    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
-    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3d1416ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6c2d19ff, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 0x682b18ff, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 0xfa140fff, 
-    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0xa11210ff, 0x40180fff, 0xa91212ff, 0xf40e15ff, 0xf30e16ff, 
-    0xf20e18ff, 0xdc0f18ff, 0x56170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x8c121bff, 0xe50d29ff, 0xe40d2aff, 0xe30d2cff, 0xd40e2aff, 0x5a1515ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
-    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
-    0x3c1316ff, 0x3d1417ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x6b2c19ff, 0x6a2c19ff, 0x6a2c18ff, 0x692b18ff, 
-    0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 0xfa1410ff, 
-    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 0xa91212ff, 0xf40e15ff, 
-    0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x8b121cff, 0xe30d2cff, 0xe20d2dff, 
-    0xe10d2eff, 0xd20e2dff, 0x591416ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
-    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
-    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3d1418ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6a2c19ff, 0x6a2c18ff, 
-    0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 0xb91c11ff, 
-    0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 0xa91212ff, 
-    0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 0x3e180eff, 
-    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x8a121eff, 0xe10d2eff, 0xe00d30ff, 0xdf0d31ff, 0xd00e30ff, 0x591418ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
-    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
-    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3d1318ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x6a2c18ff, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 0x652a16ff, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x612714ff, 
-    0xb91c11ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0xa11210ff, 0x40180fff, 
-    0xa91212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xdc0f18ff, 0x56170fff, 
-    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x8a121fff, 0xdf0d31ff, 0xde0d33ff, 
-    0xdd0d34ff, 0xce0e32ff, 0x591418ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
-    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
-    0x3c1218ff, 0x3c1318ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x692b18ff, 0x682b18ff, 0x672a17ff, 0x662a17ff, 
-    0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 
-    0x3f180fff, 0xab1212ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 0xd90f18ff, 
-    0x54170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x8e1222ff, 0xdd0d34ff, 0xdc0d35ff, 0xdb0d37ff, 0xcc0e35ff, 0x571419ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
-    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
-    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3c1319ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x682b18ff, 0x672a17ff, 
-    0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 0xfa130fff, 
-    0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0x9b1310ff, 0x3f180fff, 0x691511ff, 0xf40e15ff, 0xf30e16ff, 0xf20e18ff, 
-    0xd90f18ff, 0x54170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x8d1224ff, 0xdb0d37ff, 0xda0d38ff, 
-    0xd90d39ff, 0xcb0e38ff, 0x56141cff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
-    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
-    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3c1218ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x672a17ff, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 0x632815ff, 
-    0x622815ff, 0x612815ff, 0x612714ff, 0xbb1d12ff, 0xfa1410ff, 0xfa140fff, 
-    0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 0x5d1610ff, 0xf10e16ff, 
-    0xf20e18ff, 0xd90f18ff, 0x54170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x8c1125ff, 0xd90d39ff, 0xd80d3bff, 0xd70d3cff, 0xc90e39ff, 0x56141cff, 
-    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
-    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
-    0x3b1118ff, 0x3c1218ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x662a17ff, 0x652a16ff, 0x642916ff, 0x642916ff, 
-    0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x9b2012ff, 0xfa1410ff, 
-    0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x40180fff, 0x7b1511ff, 0x801411ff, 
-    0x41180eff, 0x6e1610ff, 0x911313ff, 0x4e170fff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x8a1228ff, 0xd70d3cff, 0xd60d3dff, 
-    0xd50d3fff, 0xc70d3cff, 0x56141dff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
-    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
-    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3c1319ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x652a16ff, 0x642916ff, 
-    0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 
-    0xd81810ff, 0xfa140fff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 0xf9100eff, 
-    0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x851411ff, 
-    0xf40e15ff, 0xf30e16ff, 0x941412ff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
-    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
-    0x8a1129ff, 0xd50d3fff, 0xd40c40ff, 0xd30c41ff, 0xc50d3fff, 0x54131dff, 
-    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
-    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3b121aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x642916ff, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 0x602714ff, 
-    0x5f2714ff, 0x5e2614ff, 0xe41610ff, 0xfa130fff, 0xf9120fff, 0xf9110fff, 
-    0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 
-    0x3f180fff, 0x971311ff, 0xf30e16ff, 0xf20e18ff, 0xa51214ff, 0x3f180eff, 
-    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x88102aff, 0xd30c41ff, 0xd20c43ff, 
-    0xd10c44ff, 0xc20d41ff, 0x51131dff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
-    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
-    0x3a111aff, 0x3a1219ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x642916ff, 0x632815ff, 0x622815ff, 0x612815ff, 
-    0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 0xb61b11ff, 0xf9120fff, 
-    0xf9110fff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 
-    0x3f180fff, 0x5c1610ff, 0x4d170fff, 0x49180eff, 0xac1214ff, 0xb01215ff, 
-    0x50170fff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
-    0x87102dff, 0xd10c44ff, 0xd00c45ff, 0xcf0c47ff, 0x940f34ff, 0x3c1317ff, 
-    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
-    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3b1219ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x632815ff, 0x622815ff, 
-    0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 
-    0x652413ff, 0xd81510ff, 0xf9100eff, 0xf90f0eff, 0xf90e0eff, 0xf80e10ff, 
-    0x9b1310ff, 0x3f180fff, 0x961412ff, 0xf40e15ff, 0xea0e16ff, 0x591610ff, 
-    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
-    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
-    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x86102dff, 0xcf0c47ff, 0xce0c48ff, 
-    0x7a102cff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
-    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x3a1119ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x622815ff, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 
-    0x5d2613ff, 0x5c2513ff, 0x742211ff, 0xeb120fff, 0xf90f0eff, 0xf90e0eff, 
-    0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 0xc81113ff, 0xf30e16ff, 
-    0xf20e18ff, 0x811412ff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
-    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
-    0x5d1221ff, 0x621124ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
-    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
-    0x39101aff, 0x3a1119ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x612815ff, 0x602714ff, 0x5f2714ff, 0x5e2614ff, 
-    0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0xd4140fff, 0xf90f0eff, 
-    0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 0x3f180eff, 
-    0x761511ff, 0xe40f17ff, 0xc91016ff, 0x4b170fff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
-    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
-    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
-    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
-    0x3a111aff, 0x39101aff, 0x39101aff, 0x39111aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x602714ff, 0x5f2714ff, 
-    0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 
-    0xd4140fff, 0xf90e0eff, 0xf80e10ff, 0x9b1310ff, 0x3f180fff, 0x3f180fff, 
-    0x3f180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 
-    0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
-    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
-    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
-    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
-    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x39101aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5f2714ff, 0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 
-    0x5a2412ff, 0x592411ff, 0x6b1f10ff, 0xa71310ff, 0x801510ff, 0x3f180fff, 
-    0x3f180fff, 0x3f180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 0x3f180eff, 
-    0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
-    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
-    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
-    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
-    0x380f1bff, 0x39101aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x5e2614ff, 0x5d2613ff, 0x5d2613ff, 0x5c2513ff, 
-    0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x54210fff, 
-    0x41190eff, 0x3f180fff, 0x3f180eff, 0x3f180eff, 0x3e180eff, 0x3e180eff, 
-    0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 
-    0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
-    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
-    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
-    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
-    0x38101bff, 0x380f1bff, 0x380f1bff, 0x38101bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5d2613ff, 0x5d2613ff, 
-    0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 
-    0x572310ff, 0x562210ff, 0x52200fff, 0x40190fff, 0x3f180eff, 0x3e180eff, 
-    0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 0x3e170dff, 
-    0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
-    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
-    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
-    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
-    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
-    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x380f1bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5d2613ff, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 0x582411ff, 
-    0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x501f0fff, 
-    0x40190fff, 0x3e180eff, 0x3f180eff, 0x3e180eff, 0x3e170dff, 0x3e180dff, 
-    0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 
-    0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
-    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
-    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
-    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
-    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
-    0x370e1cff, 0x370f1cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x5c2513ff, 0x5b2512ff, 0x5a2412ff, 0x592411ff, 
-    0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 
-    0x53210fff, 0x52210fff, 0x4f1f0eff, 0x40190eff, 0x3e180eff, 0x3e170dff, 
-    0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 0x3d170eff, 
-    0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
-    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
-    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
-    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
-    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
-    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x370f1cff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5b2512ff, 0x5a2412ff, 
-    0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 
-    0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x4e1f0eff, 
-    0x3f180eff, 0x3e180dff, 0x3e170dff, 0x3d170dff, 0x3d170dff, 0x3d170eff, 
-    0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 
-    0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
-    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
-    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
-    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
-    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 
-    0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x360e1cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5a2412ff, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 0x562210ff, 
-    0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 
-    0x50200eff, 0x4f1f0dff, 0x4c1e0dff, 0x3f180dff, 0x3d170dff, 0x3d170dff, 
-    0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 0x3e170fff, 
-    0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
-    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
-    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
-    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
-    0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 
-    0x350d1dff, 0x360e1dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x592411ff, 0x582411ff, 0x572311ff, 0x572310ff, 
-    0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 
-    0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4a1d0dff, 
-    0x3f180dff, 0x3d170eff, 0x3d170eff, 0x3d170eff, 0x3d170fff, 0x3d170fff, 
-    0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 
-    0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
-    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
-    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
-    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
-    0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 
-    0x360e1dff, 0x350d1dff, 0x350d1eff, 0x350e1dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x582411ff, 0x572311ff, 
-    0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 
-    0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x491c0eff, 0x3f180eff, 0x3d170eff, 0x3d170fff, 
-    0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 0x3e1611ff, 
-    0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 
-    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
-    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
-    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
-    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
-    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 
-    0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x350d1dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x572311ff, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 0x53210fff, 
-    0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 
-    0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x481c0eff, 
-    0x3f170fff, 0x3d170fff, 0x3e170fff, 0x3d1610ff, 0x3e1710ff, 0x3e1710ff, 
-    0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
-    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
-    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
-    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
-    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
-    0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 
-    0x340c1eff, 0x340d1eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x572310ff, 0x562210ff, 0x552210ff, 0x54220fff, 
-    0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 
-    0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 
-    0x4a1d0dff, 0x4a1c0eff, 0x471b0fff, 0x3f180fff, 0x3d1610ff, 0x3e1710ff, 
-    0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 
-    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
-    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
-    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
-    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
-    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 
-    0x340d1eff, 0x340c1eff, 0x330c1fff, 0x340d1eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x562210ff, 0x552210ff, 
-    0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 
-    0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 
-    0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x471a10ff, 
-    0x3f1710ff, 0x3e1710ff, 0x3e1611ff, 0x3e1611ff, 0x3e1711ff, 0x3e1612ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 
-    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
-    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
-    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
-    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 
-    0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 
-    0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x340c1eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x552210ff, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 0x51200eff, 
-    0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 
-    0x481b0fff, 0x481b0fff, 0x471a10ff, 0x3f1711ff, 0x3e1611ff, 0x3e1711ff, 
-    0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 0x3d1614ff, 
-    0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 
-    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
-    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
-    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
-    0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 
-    0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 
-    0x330b1fff, 0x330c1fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x54220fff, 0x53210fff, 0x52210fff, 0x51200eff, 
-    0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 
-    0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 0x461911ff, 
-    0x3f1711ff, 0x3e1612ff, 0x3e1612ff, 0x3e1612ff, 0x3e1513ff, 0x3d1613ff, 
-    0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 
-    0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
-    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
-    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
-    0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 
-    0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 
-    0x330c1fff, 0x330b1fff, 0x320b20ff, 0x330c1fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x53210fff, 0x52210fff, 
-    0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 
-    0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 
-    0x471a10ff, 0x461a10ff, 0x441812ff, 0x3e1613ff, 0x3e1612ff, 0x3e1513ff, 
-    0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 
-    0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 
-    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
-    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
-    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 
-    0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 
-    0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 0x320b1fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x52210fff, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 
-    0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 
-    0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 
-    0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 0x431811ff, 
-    0x3e1613ff, 0x3d1613ff, 0x3d1614ff, 0x3d1515ff, 0x3e1514ff, 0x3d1515ff, 
-    0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 
-    0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
-    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
-    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
-    0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 
-    0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 
-    0x310a20ff, 0x320b20ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x51200eff, 0x51200eff, 0x50200eff, 0x4f1f0dff, 
-    0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 
-    0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 
-    0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 
-    0x451911ff, 0x441812ff, 0x421712ff, 0x3e1613ff, 0x3d1515ff, 0x3e1514ff, 
-    0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 0x3c1415ff, 
-    0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 
-    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
-    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
-    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 
-    0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 
-    0x320b20ff, 0x310a20ff, 0x310a21ff, 0x310b20ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x51200eff, 0x50200eff, 
-    0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 
-    0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 
-    0x481b0fff, 0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 
-    0x451911ff, 0x451911ff, 0x441812ff, 0x441812ff, 0x431812ff, 0x421713ff, 
-    0x3e1514ff, 0x3d1515ff, 0x3d1415ff, 0x3d1515ff, 0x3d1516ff, 0x3c1416ff, 
-    0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 
-    0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 
-    0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 
-    0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 
-    0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 
-    0x320b20ff, 0x320b20ff, 0x310a20ff, 0x310a21ff, 0x300a21ff, 0x310a20ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x50200eff, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 
-    0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 
-    0x461911ff, 0x451911ff, 0x451911ff, 0x441812ff, 0x441812ff, 0x431812ff, 
-    0x431713ff, 0x431713ff, 0x411714ff, 0x3d1515ff, 0x3d1515ff, 0x3d1516ff, 
-    0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 0x3c1318ff, 
-    0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 
-    0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 
-    0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 
-    0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 
-    0x330b1fff, 0x320b20ff, 0x320b20ff, 0x310a20ff, 0x310a21ff, 0x300a21ff, 
-    0x300921ff, 0x300a21ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4e1f0dff, 0x4d1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 
-    0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 0x471a10ff, 
-    0x461a10ff, 0x461911ff, 0x451911ff, 0x451911ff, 0x441812ff, 0x441812ff, 
-    0x431812ff, 0x431713ff, 0x431713ff, 0x421714ff, 0x421614ff, 0x401614ff, 
-    0x3d1515ff, 0x3c1416ff, 0x3c1415ff, 0x3c1416ff, 0x3c1316ff, 0x3c1317ff, 
-    0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 
-    0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 0x39101aff, 
-    0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 0x360e1dff, 
-    0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 0x330c1fff, 
-    0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 0x310a20ff, 0x310a21ff, 
-    0x300a21ff, 0x300921ff, 0x2f0922ff, 0x300a21ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0eff, 0x4d1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 0x4a1c0eff, 
-    0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 0x471a10ff, 
-    0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 0x451911ff, 0x441812ff, 
-    0x441812ff, 0x431812ff, 0x431713ff, 0x431713ff, 0x421714ff, 0x421614ff, 
-    0x411614ff, 0x411615ff, 0x3f1515ff, 0x3d1415ff, 0x3c1416ff, 0x3c1316ff, 
-    0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 0x3b1118ff, 
-    0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 0x39101aff, 
-    0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 0x370e1cff, 
-    0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 0x340c1eff, 
-    0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 0x310a20ff, 
-    0x310a21ff, 0x300a21ff, 0x300921ff, 0x2f0922ff, 0x2f0922ff, 0x330b20ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x5a250fea, 0x4c1e0cff, 0x4c1e0cff, 0x4b1d0dff, 0x4b1d0dff, 0x4a1d0dff, 
-    0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 0x481b0fff, 
-    0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 0x451911ff, 
-    0x441812ff, 0x441812ff, 0x431812ff, 0x431713ff, 0x431713ff, 0x421714ff, 
-    0x421614ff, 0x411614ff, 0x411615ff, 0x401515ff, 0x401515ff, 0x3e1516ff, 
-    0x3d1317ff, 0x3c1317ff, 0x3c1318ff, 0x3c1218ff, 0x3b1218ff, 0x3b1219ff, 
-    0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 0x3a111aff, 
-    0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 0x370f1cff, 
-    0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 0x340d1eff, 
-    0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 0x320b20ff, 
-    0x310a20ff, 0x310a21ff, 0x300a21ff, 0x300921ff, 0x2f0922ff, 0x2f0922ff, 
-    0x2e0822ff, 0x48171fe9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x782d1e22, 0x56220df7, 0x4b1d0dff, 0x4b1d0dff, 
-    0x4a1d0dff, 0x4a1c0eff, 0x491c0eff, 0x491c0eff, 0x481b0fff, 0x481b0fff, 
-    0x481b0fff, 0x471a10ff, 0x471a10ff, 0x461a10ff, 0x461911ff, 0x451911ff, 
-    0x451911ff, 0x441812ff, 0x441812ff, 0x431812ff, 0x431713ff, 0x431713ff, 
-    0x421714ff, 0x421614ff, 0x411614ff, 0x411615ff, 0x401515ff, 0x401515ff, 
-    0x3f1516ff, 0x3f1416ff, 0x3d1416ff, 0x3d1318ff, 0x3c1218ff, 0x3b1218ff, 
-    0x3b1219ff, 0x3b1118ff, 0x3b1118ff, 0x3b1219ff, 0x3a111aff, 0x391119ff, 
-    0x3a111aff, 0x39101aff, 0x39101aff, 0x38101bff, 0x380f1bff, 0x380f1bff, 
-    0x370f1cff, 0x370e1cff, 0x360e1dff, 0x360e1dff, 0x350d1dff, 0x350d1eff, 
-    0x340d1eff, 0x340c1eff, 0x330c1fff, 0x330c1fff, 0x330b1fff, 0x320b20ff, 
-    0x320b20ff, 0x310a20ff, 0x310a21ff, 0x300a21ff, 0x300921ff, 0x2f0922ff, 
-    0x2f0922ff, 0x2e0822ff, 0x40131ff6, 0x68282820, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x7030114b, 0x6a2e1397, 0x682b149b, 0x662b149b, 0x662b149b, 0x662b149b, 
-    0x662b149b, 0x662b149b, 0x662b149b, 0x662b149b, 0x662b149b, 0x662b159b, 
-    0x642b159b, 0x642b159b, 0x6429159b, 0x6429159b, 0x6429159b, 0x6429159b, 
-    0x6429159b, 0x6429159b, 0x6429159b, 0x6329159b, 0x6329179b, 0x6329179b, 
-    0x6329179b, 0x6329179b, 0x6327179b, 0x6327179b, 0x6327179b, 0x6027179c, 
-    0x5f27179c, 0x5f27179c, 0x6027179c, 0x6027179c, 0x6027199c, 0x6127199b, 
-    0x5f27199b, 0x5f27199b, 0x5f26199b, 0x5f26199b, 0x5f26199b, 0x5f26199b, 
-    0x5f26199b, 0x5f26199b, 0x5f26199b, 0x5e261a9b, 0x5e261a9b, 0x5e241a9b, 
-    0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 0x5e241a9b, 
-    0x5c241c9b, 0x5c241c9b, 0x5c241c9b, 0x5c241c9b, 0x5c241c9b, 0x5c231c9b, 
-    0x5c231c9b, 0x5c231c9b, 0x5f231d97, 0x66291b4b, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-};
diff --git a/games/NXDoom/src/hexen/in_lude.c b/games/NXDoom/src/hexen/in_lude.c
deleted file mode 100644
index 573dce5c8..000000000
--- a/games/NXDoom/src/hexen/in_lude.c
+++ /dev/null
@@ -1,607 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <ctype.h>
-
-#include "h2def.h"
-#include "s_sound.h"
-#include "i_system.h"
-#include "i_video.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "v_video.h"
-#include "i_swap.h"
-#include "am_map.h"
-
-
-// MACROS ------------------------------------------------------------------
-
-#define	TEXTSPEED 3
-#define	TEXTWAIT 140
-
-// TYPES -------------------------------------------------------------------
-
-typedef enum
-{
-    SINGLE,
-    COOPERATIVE,
-    DEATHMATCH
-} gametype_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void WaitStop(void);
-static void Stop(void);
-static void LoadPics(void);
-static void UnloadPics(void);
-static void CheckForSkip(void);
-static void InitStats(void);
-static void DrDeathTally(void);
-static void DrNumber(int val, int x, int y, int wrapThresh);
-static void DrNumberBold(int val, int x, int y, int wrapThresh);
-static void DrawHubText(void);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DECLARATIONS ------------------------------------------------
-
-boolean intermission;
-char ClusterMessage[MAX_INTRMSN_MESSAGE_SIZE];
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static boolean skipintermission;
-static int interstate = 0;
-static int intertime = -1;
-static gametype_t gametype;
-static int cnt;
-static int slaughterboy;        // in DM, the player with the most kills
-static patch_t *patchINTERPIC;
-static patch_t *FontBNumbers[10];
-static patch_t *FontBNegative;
-static patch_t *FontBSlash;
-static patch_t *FontBPercent;
-static int FontABaseLump;
-static int FontBLump;
-static int FontBLumpBase;
-
-static signed int totalFrags[MAXPLAYERS];
-
-static int HubCount;
-static char *HubText;
-
-// CODE --------------------------------------------------------------------
-
-//========================================================================
-//
-// IN_Start
-//
-//========================================================================
-
-
-void IN_Start(void)
-{
-    int i;
-    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
-    InitStats();
-    LoadPics();
-    intermission = true;
-    interstate = 0;
-    skipintermission = false;
-    intertime = 0;
-    AM_Stop();
-    for (i = 0; i < maxplayers; i++)
-    {
-        players[i].messageTics = 0;
-        players[i].message[0] = 0;
-    }
-    SN_StopAllSequences();
-}
-
-//========================================================================
-//
-// WaitStop
-//
-//========================================================================
-
-void WaitStop(void)
-{
-    if (!--cnt)
-    {
-        Stop();
-//              gamestate = GS_LEVEL;
-//              G_DoLoadLevel();
-        gameaction = ga_leavemap;
-//              G_WorldDone();
-    }
-}
-
-//========================================================================
-//
-// Stop
-//
-//========================================================================
-
-static void Stop(void)
-{
-    intermission = false;
-    UnloadPics();
-    SB_state = -1;
-    BorderNeedRefresh = true;
-}
-
-//========================================================================
-//
-// InitStats
-//
-//      Initializes the stats for single player mode
-//========================================================================
-
-static const char *ClusMsgLumpNames[] = {
-    "clus1msg",
-    "clus2msg",
-    "clus3msg",
-    "clus4msg",
-    "clus5msg"
-};
-
-static void InitStats(void)
-{
-    int i;
-    int j;
-    int oldCluster;
-    signed int slaughterfrags;
-    int slaughtercount;
-    int playercount;
-    const char *msgLumpName;
-    int msgSize;
-    int msgLump;
-
-    if (!deathmatch)
-    {
-        gametype = SINGLE;
-        HubCount = 0;
-        oldCluster = P_GetMapCluster(gamemap);
-        if (oldCluster != P_GetMapCluster(LeaveMap))
-        {
-            if (oldCluster >= 1 && oldCluster <= 5)
-            {
-                msgLumpName = ClusMsgLumpNames[oldCluster - 1];
-                msgLump = W_GetNumForName(msgLumpName);
-                msgSize = W_LumpLength(msgLump);
-                if (msgSize >= MAX_INTRMSN_MESSAGE_SIZE)
-                {
-                    I_Error("Cluster message too long (%s)", msgLumpName);
-                }
-                W_ReadLump(msgLump, ClusterMessage);
-                ClusterMessage[msgSize] = 0;    // Append terminator
-                HubText = ClusterMessage;
-                HubCount = strlen(HubText) * TEXTSPEED + TEXTWAIT;
-                S_StartSongName("hub", true);
-            }
-        }
-    }
-    else
-    {
-        gametype = DEATHMATCH;
-        slaughterboy = 0;
-        slaughterfrags = -9999;
-        playercount = 0;
-        slaughtercount = 0;
-        for (i = 0; i < maxplayers; i++)
-        {
-            totalFrags[i] = 0;
-            if (playeringame[i])
-            {
-                playercount++;
-                for (j = 0; j < maxplayers; j++)
-                {
-                    if (playeringame[j])
-                    {
-                        totalFrags[i] += players[i].frags[j];
-                    }
-                }
-            }
-            if (totalFrags[i] > slaughterfrags)
-            {
-                slaughterboy = 1 << i;
-                slaughterfrags = totalFrags[i];
-                slaughtercount = 1;
-            }
-            else if (totalFrags[i] == slaughterfrags)
-            {
-                slaughterboy |= 1 << i;
-                slaughtercount++;
-            }
-        }
-        if (playercount == slaughtercount)
-        {                       // don't do the slaughter stuff if everyone is equal
-            slaughterboy = 0;
-        }
-        S_StartSongName("hub", true);
-    }
-}
-
-//========================================================================
-//
-// LoadPics
-//
-//========================================================================
-
-static void LoadPics(void)
-{
-    int i;
-
-    if (HubCount || gametype == DEATHMATCH)
-    {
-        patchINTERPIC = W_CacheLumpName("INTERPIC", PU_STATIC);
-        FontBLumpBase = W_GetNumForName("FONTB16");
-        for (i = 0; i < 10; i++)
-        {
-            FontBNumbers[i] = W_CacheLumpNum(FontBLumpBase + i, PU_STATIC);
-        }
-        FontBLump = W_GetNumForName("FONTB_S") + 1;
-        FontBNegative = W_CacheLumpName("FONTB13", PU_STATIC);
-        FontABaseLump = W_GetNumForName("FONTA_S") + 1;
-
-        FontBSlash = W_CacheLumpName("FONTB15", PU_STATIC);
-        FontBPercent = W_CacheLumpName("FONTB05", PU_STATIC);
-    }
-}
-
-//========================================================================
-//
-// UnloadPics
-//
-//========================================================================
-
-static void UnloadPics(void)
-{
-    int i;
-
-    if (HubCount || gametype == DEATHMATCH)
-    {
-        W_ReleaseLumpName("INTERPIC");
-
-        patchINTERPIC = W_CacheLumpName("INTERPIC", PU_STATIC);
-        FontBLumpBase = W_GetNumForName("FONTB16");
-        for (i = 0; i < 10; i++)
-        {
-            W_ReleaseLumpNum(FontBLumpBase + i);
-        }
-        W_ReleaseLumpName("FONTB13");
-        W_ReleaseLumpName("FONTB15");
-        W_ReleaseLumpName("FONTB05");
-    }
-}
-
-//========================================================================
-//
-// IN_Ticker
-//
-//========================================================================
-
-void IN_Ticker(void)
-{
-    if (!intermission)
-    {
-        return;
-    }
-    if (interstate)
-    {
-        WaitStop();
-        return;
-    }
-    skipintermission = false;
-    CheckForSkip();
-    intertime++;
-    if (skipintermission || (gametype == SINGLE && !HubCount))
-    {
-        interstate = 1;
-        cnt = 10;
-        skipintermission = false;
-        //S_StartSound(NULL, sfx_dorcls);
-    }
-}
-
-//========================================================================
-//
-// CheckForSkip
-//
-//      Check to see if any player hit a key
-//========================================================================
-
-static void CheckForSkip(void)
-{
-    int i;
-    player_t *player;
-    static boolean triedToSkip;
-
-    for (i = 0, player = players; i < maxplayers; i++, player++)
-    {
-        if (playeringame[i])
-        {
-            if (player->cmd.buttons & BT_ATTACK)
-            {
-                if (!player->attackdown)
-                {
-                    skipintermission = 1;
-                }
-                player->attackdown = true;
-            }
-            else
-            {
-                player->attackdown = false;
-            }
-            if (player->cmd.buttons & BT_USE)
-            {
-                if (!player->usedown)
-                {
-                    skipintermission = 1;
-                }
-                player->usedown = true;
-            }
-            else
-            {
-                player->usedown = false;
-            }
-        }
-    }
-    if (deathmatch && intertime < 140)
-    {                           // wait for 4 seconds before allowing a skip
-        if (skipintermission == 1)
-        {
-            triedToSkip = true;
-            skipintermission = 0;
-        }
-    }
-    else
-    {
-        if (triedToSkip)
-        {
-            skipintermission = 1;
-            triedToSkip = false;
-        }
-    }
-}
-
-//========================================================================
-//
-// IN_Drawer
-//
-//========================================================================
-
-void IN_Drawer(void)
-{
-    if (!intermission)
-    {
-        return;
-    }
-    if (interstate)
-    {
-        return;
-    }
-    UpdateState |= I_FULLSCRN;
-    memcpy(I_VideoBuffer, (byte *) patchINTERPIC, SCREENWIDTH * SCREENHEIGHT);
-
-    if (gametype == SINGLE)
-    {
-        if (HubCount)
-        {
-            DrawHubText();
-        }
-    }
-    else
-    {
-        DrDeathTally();
-    }
-}
-
-//========================================================================
-//
-// DrDeathTally
-//
-//========================================================================
-
-#define TALLY_EFFECT_TICKS 20
-#define TALLY_FINAL_X_DELTA (23*FRACUNIT)
-#define TALLY_FINAL_Y_DELTA (13*FRACUNIT)
-#define TALLY_START_XPOS (178*FRACUNIT)
-#define TALLY_STOP_XPOS (90*FRACUNIT)
-#define TALLY_START_YPOS (132*FRACUNIT)
-#define TALLY_STOP_YPOS (83*FRACUNIT)
-#define TALLY_TOP_X 85
-#define TALLY_TOP_Y 9
-#define TALLY_LEFT_X 7
-#define TALLY_LEFT_Y 71
-#define TALLY_TOTALS_X 291
-
-static void DrDeathTally(void)
-{
-    int i, j;
-    fixed_t xPos, yPos;
-    fixed_t xDelta, yDelta;
-    fixed_t xStart, scale;
-    int x, y;
-    boolean bold;
-    static boolean showTotals;
-    int temp;
-
-    V_DrawPatch(TALLY_TOP_X, TALLY_TOP_Y,
-                W_CacheLumpName("tallytop", PU_CACHE));
-    V_DrawPatch(TALLY_LEFT_X, TALLY_LEFT_Y,
-                W_CacheLumpName("tallylft", PU_CACHE));
-    if (intertime < TALLY_EFFECT_TICKS)
-    {
-        showTotals = false;
-        scale = (intertime * FRACUNIT) / TALLY_EFFECT_TICKS;
-        xDelta = FixedMul(scale, TALLY_FINAL_X_DELTA);
-        yDelta = FixedMul(scale, TALLY_FINAL_Y_DELTA);
-        xStart = TALLY_START_XPOS - FixedMul(scale,
-                                             TALLY_START_XPOS -
-                                             TALLY_STOP_XPOS);
-        yPos =
-            TALLY_START_YPOS - FixedMul(scale,
-                                        TALLY_START_YPOS - TALLY_STOP_YPOS);
-    }
-    else
-    {
-        xDelta = TALLY_FINAL_X_DELTA;
-        yDelta = TALLY_FINAL_Y_DELTA;
-        xStart = TALLY_STOP_XPOS;
-        yPos = TALLY_STOP_YPOS;
-    }
-    if (intertime >= TALLY_EFFECT_TICKS && showTotals == false)
-    {
-        showTotals = true;
-        S_StartSound(NULL, SFX_PLATFORM_STOP);
-    }
-    y = yPos >> FRACBITS;
-    for (i = 0; i < maxplayers; i++)
-    {
-        xPos = xStart;
-        for (j = 0; j < maxplayers; j++, xPos += xDelta)
-        {
-            x = xPos >> FRACBITS;
-            bold = (i == consoleplayer || j == consoleplayer);
-            if (playeringame[i] && playeringame[j])
-            {
-                if (bold)
-                {
-                    DrNumberBold(players[i].frags[j], x, y, 100);
-                }
-                else
-                {
-                    DrNumber(players[i].frags[j], x, y, 100);
-                }
-            }
-            else
-            {
-                temp = MN_TextAWidth("--") / 2;
-                if (bold)
-                {
-                    MN_DrTextAYellow("--", x - temp, y);
-                }
-                else
-                {
-                    MN_DrTextA("--", x - temp, y);
-                }
-            }
-        }
-        if (showTotals && playeringame[i]
-            && !((slaughterboy & (1 << i)) && !(intertime & 16)))
-        {
-            DrNumber(totalFrags[i], TALLY_TOTALS_X, y, 1000);
-        }
-        yPos += yDelta;
-        y = yPos >> FRACBITS;
-    }
-}
-
-//==========================================================================
-//
-// DrNumber
-//
-//==========================================================================
-
-static void DrNumber(int val, int x, int y, int wrapThresh)
-{
-    char buff[8] = "XX";
-
-    if (!(val < -9 && wrapThresh < 1000))
-    {
-        M_snprintf(buff, sizeof(buff), "%d",
-                   val >= wrapThresh ? val % wrapThresh : val);
-    }
-    MN_DrTextA(buff, x - MN_TextAWidth(buff) / 2, y);
-}
-
-//==========================================================================
-//
-// DrNumberBold
-//
-//==========================================================================
-
-static void DrNumberBold(int val, int x, int y, int wrapThresh)
-{
-    char buff[8] = "XX";
-
-    if (!(val < -9 && wrapThresh < 1000))
-    {
-        M_snprintf(buff, sizeof(buff), "%d",
-                   val >= wrapThresh ? val % wrapThresh : val);
-    }
-    MN_DrTextAYellow(buff, x - MN_TextAWidth(buff) / 2, y);
-}
-
-//===========================================================================
-//
-// DrawHubText
-//
-//===========================================================================
-
-static void DrawHubText(void)
-{
-    int count;
-    char *ch;
-    int c;
-    int cx, cy;
-    patch_t *w;
-
-    cy = 5;
-    cx = 10;
-    ch = HubText;
-    count = (intertime - 10) / TEXTSPEED;
-    if (count < 0)
-    {
-        count = 0;
-    }
-    for (; count; count--)
-    {
-        c = *ch++;
-        if (!c)
-        {
-            break;
-        }
-        if (c == '\n')
-        {
-            cx = 10;
-            cy += 9;
-            continue;
-        }
-        if (c < 32)
-        {
-            continue;
-        }
-        c = toupper(c);
-        if (c == 32)
-        {
-            cx += 5;
-            continue;
-        }
-        w = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-        if (cx + SHORT(w->width) > SCREENWIDTH)
-        {
-            break;
-        }
-        V_DrawPatch(cx, cy, w);
-        cx += SHORT(w->width);
-    }
-}
diff --git a/games/NXDoom/src/hexen/info.c b/games/NXDoom/src/hexen/info.c
deleted file mode 100644
index ad579b629..000000000
--- a/games/NXDoom/src/hexen/info.c
+++ /dev/null
@@ -1,13654 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-#include "h2def.h"
-#include "i_swap.h"
-#include "p_local.h"
-
-// generated by stateco
-
-const char *sprnames[] = {
-    "MAN1","ACLO","TLGL","FBL1","XPL1","ARRW","DART","RIPP","CFCF","BLAD",
-    "SHRD","FFSM","FFLG","PTN1","PTN2","SOAR","INVU","SUMN","TSPK","TELO",
-    "TRNG","ROCK","FOGS","FOGM","FOGL","SGSA","SGSB","PORK","EGGM","FHFX",
-    "SPHL","STWN","GMPD","ASKU","ABGM","AGMR","AGMG","AGG2","AGMB","AGB2",
-    "ABK1","ABK2","ASK2","AFWP","ACWP","AMWP","AGER","AGR2","AGR3","AGR4",
-    "TRCH","PSBG","ATLP","THRW","SPED","BMAN","BRAC","BLST","HRAD","SPSH",
-    "LVAS","SLDG","STTW","RCK1","RCK2","RCK3","RCK4","CDLR","TRE1","TRDT",
-    "TRE2","TRE3","STM1","STM2","STM3","STM4","MSH1","MSH2","MSH3","MSH4",
-    "MSH5","MSH6","MSH7","MSH8","SGMP","SGM1","SGM2","SGM3","SLC1","SLC2",
-    "SLC3","MSS1","MSS2","SWMV","CPS1","CPS2","TMS1","TMS2","TMS3","TMS4",
-    "TMS5","TMS6","TMS7","CPS3","STT2","STT3","STT4","STT5","GAR1","GAR2",
-    "GAR3","GAR4","GAR5","GAR6","GAR7","GAR8","GAR9","BNR1","TRE4","TRE5",
-    "TRE6","TRE7","LOGG","ICT1","ICT2","ICT3","ICT4","ICM1","ICM2","ICM3",
-    "ICM4","RKBL","RKBS","RKBK","RBL1","RBL2","RBL3","VASE","POT1","POT2",
-    "POT3","PBIT","CPS4","CPS5","CPS6","CPB1","CPB2","CPB3","CPB4","BDRP",
-    "BDSH","BDPL","CNDL","LEF1","LEF3","LEF2","TWTR","WLTR","BARL","SHB1",
-    "SHB2","BCKT","SHRM","FBUL","FSKL","BRTR","SUIT","BBLL","CAND","IRON",
-    "XMAS","CDRN","CHNS","TST1","TST2","TST3","TST4","TST5","TST6","TST7",
-    "TST8","TST9","TST0","TELE","TSMK","FPCH","WFAX","FAXE","WFHM","FHMR",
-    "FSRD","FSFX","CMCE","WCSS","CSSF","WCFM","CFLM","CFFX","CHLY","SPIR",
-    "MWND","WMLG","MLNG","MLFX","MLF2","MSTF","MSP1","MSP2","WFR1","WFR2",
-    "WFR3","WCH1","WCH2","WCH3","WMS1","WMS2","WMS3","WPIG","WMCS","CONE",
-    "SHEX","BLOD","GIBS","PLAY","FDTH","BSKL","ICEC","CLER","MAGE","PIGY",
-    "CENT","CTXD","CTFX","CTDP","DEMN","DEMA","DEMB","DEMC","DEMD","DEME",
-    "DMFX","DEM2","DMBA","DMBB","DMBC","DMBD","DMBE","D2FX","WRTH","WRT2",
-    "WRBL","MNTR","FX12","FX13","MNSM","SSPT","SSDV","SSXD","SSFX","BISH",
-    "BPFX","DRAG","DRFX","ARM1","ARM2","ARM3","ARM4","MAN2","MAN3","KEY1",
-    "KEY2","KEY3","KEY4","KEY5","KEY6","KEY7","KEY8","KEY9","KEYA","KEYB",
-    "ETTN","ETTB","FDMN","FDMB","ICEY","ICPR","ICWS","SORC","SBMP","SBS4",
-    "SBMB","SBS3","SBMG","SBS1","SBS2","SBFX","RADE","WATR","KORX","ABAT",
-    NULL
-};
-
-
-state_t states[NUMSTATES] = {
-    {SPR_MAN1, 0, -1, NULL, S_NULL, 0, 0},      // S_NULL
-    {SPR_ACLO, 4, 1050, A_FreeTargMobj, S_NULL, 0, 0},  // S_FREETARGMOBJ
-    {SPR_TLGL, 0, -1, NULL, S_NULL, 0, 0},      // S_MAPSPOT
-    {SPR_FBL1, 32768, 4, NULL, S_FIREBALL1_2, 0, 0},    // S_FIREBALL1_1
-    {SPR_FBL1, 32769, 4, NULL, S_FIREBALL1_1, 0, 0},    // S_FIREBALL1_2
-    {SPR_XPL1, 32768, 4, NULL, S_FIREBALL1_X2, 0, 0},   // S_FIREBALL1_X1
-    {SPR_XPL1, 32769, 4, NULL, S_FIREBALL1_X3, 0, 0},   // S_FIREBALL1_X2
-    {SPR_XPL1, 32770, 4, NULL, S_FIREBALL1_X4, 0, 0},   // S_FIREBALL1_X3
-    {SPR_XPL1, 32771, 4, NULL, S_FIREBALL1_X5, 0, 0},   // S_FIREBALL1_X4
-    {SPR_XPL1, 32772, 4, NULL, S_FIREBALL1_X6, 0, 0},   // S_FIREBALL1_X5
-    {SPR_XPL1, 32773, 4, NULL, S_NULL, 0, 0},   // S_FIREBALL1_X6
-    {SPR_ARRW, 0, -1, NULL, S_NULL, 0, 0},      // S_ARROW_1
-    {SPR_ARRW, 0, 1, NULL, S_NULL, 0, 0},       // S_ARROW_X1
-    {SPR_DART, 0, -1, NULL, S_NULL, 0, 0},      // S_DART_1
-    {SPR_DART, 0, 1, NULL, S_NULL, 0, 0},       // S_DART_X1
-    {SPR_DART, 0, -1, NULL, S_NULL, 0, 0},      // S_POISONDART_1
-    {SPR_DART, 0, 1, NULL, S_NULL, 0, 0},       // S_POISONDART_X1
-    {SPR_RIPP, 0, 3, NULL, S_RIPPERBALL_2, 0, 0},       // S_RIPPERBALL_1
-    {SPR_RIPP, 1, 3, NULL, S_RIPPERBALL_3, 0, 0},       // S_RIPPERBALL_2
-    {SPR_RIPP, 2, 3, NULL, S_RIPPERBALL_1, 0, 0},       // S_RIPPERBALL_3
-    {SPR_CFCF, 32784, 4, NULL, S_RIPPERBALL_X2, 0, 0},  // S_RIPPERBALL_X1
-    {SPR_CFCF, 32785, 3, NULL, S_RIPPERBALL_X3, 0, 0},  // S_RIPPERBALL_X2
-    {SPR_CFCF, 32786, 4, NULL, S_RIPPERBALL_X4, 0, 0},  // S_RIPPERBALL_X3
-    {SPR_CFCF, 32787, 3, NULL, S_RIPPERBALL_X5, 0, 0},  // S_RIPPERBALL_X4
-    {SPR_CFCF, 32788, 4, NULL, S_RIPPERBALL_X6, 0, 0},  // S_RIPPERBALL_X5
-    {SPR_CFCF, 32789, 3, NULL, S_RIPPERBALL_X7, 0, 0},  // S_RIPPERBALL_X6
-    {SPR_CFCF, 32790, 4, NULL, S_RIPPERBALL_X8, 0, 0},  // S_RIPPERBALL_X7
-    {SPR_CFCF, 32791, 3, NULL, S_RIPPERBALL_X9, 0, 0},  // S_RIPPERBALL_X8
-    {SPR_CFCF, 32792, 4, NULL, S_RIPPERBALL_X10, 0, 0}, // S_RIPPERBALL_X9
-    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_RIPPERBALL_X10
-    {SPR_BLAD, 0, -1, NULL, S_NULL, 0, 0},      // S_PRJ_BLADE1
-    {SPR_BLAD, 0, 1, NULL, S_NULL, 0, 0},       // S_PRJ_BLADE_X1
-    {SPR_SHRD, 32768, 3, NULL, S_ICESHARD2, 0, 0},      // S_ICESHARD1
-    {SPR_SHRD, 32769, 3, NULL, S_ICESHARD3, 0, 0},      // S_ICESHARD2
-    {SPR_SHRD, 32770, 3, NULL, S_ICESHARD1, 0, 0},      // S_ICESHARD3
-    {SPR_FFSM, 32768, 3, NULL, S_FLAME_TSMALL2, 0, 0},  // S_FLAME_TSMALL1
-    {SPR_FFSM, 32769, 3, NULL, S_FLAME_TSMALL3, 0, 0},  // S_FLAME_TSMALL2
-    {SPR_FFSM, 32770, 2, A_FlameCheck, S_FLAME_TSMALL4, 0, 0},  // S_FLAME_TSMALL3
-    {SPR_FFSM, 32770, 2, NULL, S_FLAME_TSMALL5, 0, 0},  // S_FLAME_TSMALL4
-    {SPR_FFSM, 32771, 3, NULL, S_FLAME_TSMALL6, 0, 0},  // S_FLAME_TSMALL5
-    {SPR_FFSM, 32772, 3, A_FlameCheck, S_FLAME_TSMALL1, 0, 0},  // S_FLAME_TSMALL6
-    {SPR_FFLG, 32768, 4, NULL, S_FLAME_TLARGE2, 0, 0},  // S_FLAME_TLARGE1
-    {SPR_FFLG, 32769, 4, A_FlameCheck, S_FLAME_TLARGE3, 0, 0},  // S_FLAME_TLARGE2
-    {SPR_FFLG, 32770, 4, NULL, S_FLAME_TLARGE4, 0, 0},  // S_FLAME_TLARGE3
-    {SPR_FFLG, 32771, 4, A_FlameCheck, S_FLAME_TLARGE5, 0, 0},  // S_FLAME_TLARGE4
-    {SPR_FFLG, 32772, 4, NULL, S_FLAME_TLARGE6, 0, 0},  // S_FLAME_TLARGE5
-    {SPR_FFLG, 32773, 4, A_FlameCheck, S_FLAME_TLARGE7, 0, 0},  // S_FLAME_TLARGE6
-    {SPR_FFLG, 32774, 4, NULL, S_FLAME_TLARGE8, 0, 0},  // S_FLAME_TLARGE7
-    {SPR_FFLG, 32775, 4, A_FlameCheck, S_FLAME_TLARGE9, 0, 0},  // S_FLAME_TLARGE8
-    {SPR_FFLG, 32776, 4, NULL, S_FLAME_TLARGE10, 0, 0}, // S_FLAME_TLARGE9
-    {SPR_FFLG, 32777, 4, A_FlameCheck, S_FLAME_TLARGE11, 0, 0}, // S_FLAME_TLARGE10
-    {SPR_FFLG, 32778, 4, NULL, S_FLAME_TLARGE12, 0, 0}, // S_FLAME_TLARGE11
-    {SPR_FFLG, 32779, 4, A_FlameCheck, S_FLAME_TLARGE13, 0, 0}, // S_FLAME_TLARGE12
-    {SPR_FFLG, 32780, 4, NULL, S_FLAME_TLARGE14, 0, 0}, // S_FLAME_TLARGE13
-    {SPR_FFLG, 32781, 4, A_FlameCheck, S_FLAME_TLARGE15, 0, 0}, // S_FLAME_TLARGE14
-    {SPR_FFLG, 32782, 4, NULL, S_FLAME_TLARGE16, 0, 0}, // S_FLAME_TLARGE15
-    {SPR_FFLG, 32783, 4, A_FlameCheck, S_FLAME_TLARGE5, 0, 0},  // S_FLAME_TLARGE16
-    {SPR_FFSM, 0, 2, NULL, S_FLAME_SDORM2, 0, 0},       // S_FLAME_SDORM1
-    {SPR_FFSM, 1, 2, A_HideThing, S_FLAME_SDORM3, 0, 0},        // S_FLAME_SDORM2
-    {SPR_FFSM, 2, 200, NULL, S_FLAME_SDORM3, 0, 0},     // S_FLAME_SDORM3
-    {SPR_FFSM, 32768, 3, NULL, S_FLAME_SMALL2, 0, 0},   // S_FLAME_SMALL1
-    {SPR_FFSM, 32768, 3, A_UnHideThing, S_FLAME_SMALL3, 0, 0},  // S_FLAME_SMALL2
-    {SPR_FFSM, 32768, 3, NULL, S_FLAME_SMALL4, 0, 0},   // S_FLAME_SMALL3
-    {SPR_FFSM, 32769, 3, NULL, S_FLAME_SMALL5, 0, 0},   // S_FLAME_SMALL4
-    {SPR_FFSM, 32770, 3, NULL, S_FLAME_SMALL6, 0, 0},   // S_FLAME_SMALL5
-    {SPR_FFSM, 32771, 3, NULL, S_FLAME_SMALL7, 0, 0},   // S_FLAME_SMALL6
-    {SPR_FFSM, 32772, 3, NULL, S_FLAME_SMALL3, 0, 0},   // S_FLAME_SMALL7
-    {SPR_FFLG, 3, 2, NULL, S_FLAME_LDORM2, 0, 0},       // S_FLAME_LDORM1
-    {SPR_FFLG, 2, 2, NULL, S_FLAME_LDORM3, 0, 0},       // S_FLAME_LDORM2
-    {SPR_FFLG, 1, 2, NULL, S_FLAME_LDORM4, 0, 0},       // S_FLAME_LDORM3
-    {SPR_FFLG, 0, 2, A_HideThing, S_FLAME_LDORM5, 0, 0},        // S_FLAME_LDORM4
-    {SPR_FFLG, 0, 200, NULL, S_FLAME_LDORM5, 0, 0},     // S_FLAME_LDORM5
-    {SPR_FFLG, 32768, 2, NULL, S_FLAME_LARGE2, 0, 0},   // S_FLAME_LARGE1
-    {SPR_FFLG, 32768, 2, A_UnHideThing, S_FLAME_LARGE3, 0, 0},  // S_FLAME_LARGE2
-    {SPR_FFLG, 32768, 4, NULL, S_FLAME_LARGE4, 0, 0},   // S_FLAME_LARGE3
-    {SPR_FFLG, 32769, 4, NULL, S_FLAME_LARGE5, 0, 0},   // S_FLAME_LARGE4
-    {SPR_FFLG, 32770, 4, NULL, S_FLAME_LARGE6, 0, 0},   // S_FLAME_LARGE5
-    {SPR_FFLG, 32771, 4, NULL, S_FLAME_LARGE7, 0, 0},   // S_FLAME_LARGE6
-    {SPR_FFLG, 32772, 4, NULL, S_FLAME_LARGE8, 0, 0},   // S_FLAME_LARGE7
-    {SPR_FFLG, 32773, 4, NULL, S_FLAME_LARGE9, 0, 0},   // S_FLAME_LARGE8
-    {SPR_FFLG, 32774, 4, NULL, S_FLAME_LARGE10, 0, 0},  // S_FLAME_LARGE9
-    {SPR_FFLG, 32775, 4, NULL, S_FLAME_LARGE11, 0, 0},  // S_FLAME_LARGE10
-    {SPR_FFLG, 32776, 4, NULL, S_FLAME_LARGE12, 0, 0},  // S_FLAME_LARGE11
-    {SPR_FFLG, 32777, 4, NULL, S_FLAME_LARGE13, 0, 0},  // S_FLAME_LARGE12
-    {SPR_FFLG, 32778, 4, NULL, S_FLAME_LARGE14, 0, 0},  // S_FLAME_LARGE13
-    {SPR_FFLG, 32779, 4, NULL, S_FLAME_LARGE15, 0, 0},  // S_FLAME_LARGE14
-    {SPR_FFLG, 32780, 4, NULL, S_FLAME_LARGE16, 0, 0},  // S_FLAME_LARGE15
-    {SPR_FFLG, 32781, 4, NULL, S_FLAME_LARGE17, 0, 0},  // S_FLAME_LARGE16
-    {SPR_FFLG, 32782, 4, NULL, S_FLAME_LARGE18, 0, 0},  // S_FLAME_LARGE17
-    {SPR_FFLG, 32783, 4, NULL, S_FLAME_LARGE7, 0, 0},   // S_FLAME_LARGE18
-    {SPR_PTN1, 0, 3, NULL, S_ITEM_PTN1_2, 0, 0},        // S_ITEM_PTN1_1
-    {SPR_PTN1, 1, 3, NULL, S_ITEM_PTN1_3, 0, 0},        // S_ITEM_PTN1_2
-    {SPR_PTN1, 2, 3, NULL, S_ITEM_PTN1_1, 0, 0},        // S_ITEM_PTN1_3
-    {SPR_ACLO, 4, 1400, NULL, S_HIDESPECIAL2, 0, 0},    // S_HIDESPECIAL1
-    {SPR_ACLO, 0, 4, A_RestoreSpecialThing1, S_HIDESPECIAL3, 0, 0},     // S_HIDESPECIAL2
-    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL4, 0, 0},       // S_HIDESPECIAL3
-    {SPR_ACLO, 0, 4, NULL, S_HIDESPECIAL5, 0, 0},       // S_HIDESPECIAL4
-    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL6, 0, 0},       // S_HIDESPECIAL5
-    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL7, 0, 0},       // S_HIDESPECIAL6
-    {SPR_ACLO, 1, 4, NULL, S_HIDESPECIAL8, 0, 0},       // S_HIDESPECIAL7
-    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL9, 0, 0},       // S_HIDESPECIAL8
-    {SPR_ACLO, 3, 4, NULL, S_HIDESPECIAL10, 0, 0},      // S_HIDESPECIAL9
-    {SPR_ACLO, 2, 4, NULL, S_HIDESPECIAL11, 0, 0},      // S_HIDESPECIAL10
-    {SPR_ACLO, 3, 4, A_RestoreSpecialThing2, S_NULL, 0, 0},     // S_HIDESPECIAL11
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI1_2, 0, 0},     // S_DORMANTARTI1_1
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_3, 0, 0},     // S_DORMANTARTI1_2
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI1_4, 0, 0},     // S_DORMANTARTI1_3
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_5, 0, 0},     // S_DORMANTARTI1_4
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_6, 0, 0},     // S_DORMANTARTI1_5
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_7, 0, 0},     // S_DORMANTARTI1_6
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_8, 0, 0},     // S_DORMANTARTI1_7
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI1_9, 0, 0},     // S_DORMANTARTI1_8
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_10, 0, 0},    // S_DORMANTARTI1_9
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI1_11, 0, 0},    // S_DORMANTARTI1_10
-    {SPR_ACLO, 0, 1400, A_HideThing, S_DORMANTARTI1_12, 0, 0},  // S_DORMANTARTI1_11
-    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI1_13, 0, 0},   // S_DORMANTARTI1_12
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_14, 0, 0},    // S_DORMANTARTI1_13
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI1_15, 0, 0},    // S_DORMANTARTI1_14
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_16, 0, 0},    // S_DORMANTARTI1_15
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_17, 0, 0},    // S_DORMANTARTI1_16
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI1_18, 0, 0},    // S_DORMANTARTI1_17
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_19, 0, 0},    // S_DORMANTARTI1_18
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI1_20, 0, 0},    // S_DORMANTARTI1_19
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI1_21, 0, 0},    // S_DORMANTARTI1_20
-    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI1_21
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2_2, 0, 0},     // S_DORMANTARTI2_1
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_3, 0, 0},     // S_DORMANTARTI2_2
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2_4, 0, 0},     // S_DORMANTARTI2_3
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_5, 0, 0},     // S_DORMANTARTI2_4
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_6, 0, 0},     // S_DORMANTARTI2_5
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_7, 0, 0},     // S_DORMANTARTI2_6
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_8, 0, 0},     // S_DORMANTARTI2_7
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI2_9, 0, 0},     // S_DORMANTARTI2_8
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_10, 0, 0},    // S_DORMANTARTI2_9
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI2_11, 0, 0},    // S_DORMANTARTI2_10
-    {SPR_ACLO, 0, 4200, A_HideThing, S_DORMANTARTI2_12, 0, 0},  // S_DORMANTARTI2_11
-    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI2_13, 0, 0},   // S_DORMANTARTI2_12
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_14, 0, 0},    // S_DORMANTARTI2_13
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI2_15, 0, 0},    // S_DORMANTARTI2_14
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_16, 0, 0},    // S_DORMANTARTI2_15
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_17, 0, 0},    // S_DORMANTARTI2_16
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI2_18, 0, 0},    // S_DORMANTARTI2_17
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_19, 0, 0},    // S_DORMANTARTI2_18
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI2_20, 0, 0},    // S_DORMANTARTI2_19
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI2_21, 0, 0},    // S_DORMANTARTI2_20
-    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI2_21
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI3_2, 0, 0},     // S_DORMANTARTI3_1
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_3, 0, 0},     // S_DORMANTARTI3_2
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI3_4, 0, 0},     // S_DORMANTARTI3_3
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_5, 0, 0},     // S_DORMANTARTI3_4
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_6, 0, 0},     // S_DORMANTARTI3_5
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_7, 0, 0},     // S_DORMANTARTI3_6
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_8, 0, 0},     // S_DORMANTARTI3_7
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI3_9, 0, 0},     // S_DORMANTARTI3_8
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_10, 0, 0},    // S_DORMANTARTI3_9
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI3_11, 0, 0},    // S_DORMANTARTI3_10
-    {SPR_ACLO, 0, 21000, A_HideThing, S_DORMANTARTI3_12, 0, 0}, // S_DORMANTARTI3_11
-    {SPR_ACLO, 0, 3, A_UnHideThing, S_DORMANTARTI3_13, 0, 0},   // S_DORMANTARTI3_12
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_14, 0, 0},    // S_DORMANTARTI3_13
-    {SPR_ACLO, 0, 3, NULL, S_DORMANTARTI3_15, 0, 0},    // S_DORMANTARTI3_14
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_16, 0, 0},    // S_DORMANTARTI3_15
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_17, 0, 0},    // S_DORMANTARTI3_16
-    {SPR_ACLO, 1, 3, NULL, S_DORMANTARTI3_18, 0, 0},    // S_DORMANTARTI3_17
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_19, 0, 0},    // S_DORMANTARTI3_18
-    {SPR_ACLO, 3, 3, NULL, S_DORMANTARTI3_20, 0, 0},    // S_DORMANTARTI3_19
-    {SPR_ACLO, 2, 3, NULL, S_DORMANTARTI3_21, 0, 0},    // S_DORMANTARTI3_20
-    {SPR_ACLO, 3, 3, A_RestoreArtifact, S_NULL, 0, 0},  // S_DORMANTARTI3_21
-    {SPR_ACLO, 3, 3, NULL, S_DEADARTI2, 0, 0},  // S_DEADARTI1
-    {SPR_ACLO, 2, 3, NULL, S_DEADARTI3, 0, 0},  // S_DEADARTI2
-    {SPR_ACLO, 3, 3, NULL, S_DEADARTI4, 0, 0},  // S_DEADARTI3
-    {SPR_ACLO, 2, 3, NULL, S_DEADARTI5, 0, 0},  // S_DEADARTI4
-    {SPR_ACLO, 1, 3, NULL, S_DEADARTI6, 0, 0},  // S_DEADARTI5
-    {SPR_ACLO, 2, 3, NULL, S_DEADARTI7, 0, 0},  // S_DEADARTI6
-    {SPR_ACLO, 1, 3, NULL, S_DEADARTI8, 0, 0},  // S_DEADARTI7
-    {SPR_ACLO, 0, 3, NULL, S_DEADARTI9, 0, 0},  // S_DEADARTI8
-    {SPR_ACLO, 1, 3, NULL, S_DEADARTI10, 0, 0}, // S_DEADARTI9
-    {SPR_ACLO, 0, 3, NULL, S_NULL, 0, 0},       // S_DEADARTI10
-    {SPR_PTN2, 0, 4, NULL, S_ARTI_PTN2_2, 0, 0},        // S_ARTI_PTN2_1
-    {SPR_PTN2, 1, 4, NULL, S_ARTI_PTN2_3, 0, 0},        // S_ARTI_PTN2_2
-    {SPR_PTN2, 2, 4, NULL, S_ARTI_PTN2_1, 0, 0},        // S_ARTI_PTN2_3
-    {SPR_SOAR, 0, 5, NULL, S_ARTI_SOAR2, 0, 0}, // S_ARTI_SOAR1
-    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR3, 0, 0}, // S_ARTI_SOAR2
-    {SPR_SOAR, 2, 5, NULL, S_ARTI_SOAR4, 0, 0}, // S_ARTI_SOAR3
-    {SPR_SOAR, 1, 5, NULL, S_ARTI_SOAR1, 0, 0}, // S_ARTI_SOAR4
-    {SPR_INVU, 0, 3, NULL, S_ARTI_INVU2, 0, 0}, // S_ARTI_INVU1
-    {SPR_INVU, 1, 3, NULL, S_ARTI_INVU3, 0, 0}, // S_ARTI_INVU2
-    {SPR_INVU, 2, 3, NULL, S_ARTI_INVU4, 0, 0}, // S_ARTI_INVU3
-    {SPR_INVU, 3, 3, NULL, S_ARTI_INVU1, 0, 0}, // S_ARTI_INVU4
-    {SPR_SUMN, 0, 350, NULL, S_ARTI_SUMMON, 0, 0},      // S_ARTI_SUMMON
-    {SPR_SUMN, 0, 4, NULL, S_SUMMON_FX1_1, 0, 0},       // S_SUMMON_FX1_1
-    {SPR_SUMN, 0, 4, NULL, S_SUMMON_FX2_2, 0, 0},       // S_SUMMON_FX2_1
-    {SPR_SUMN, 0, 4, NULL, S_SUMMON_FX2_3, 0, 0},       // S_SUMMON_FX2_2
-    {SPR_SUMN, 0, 4, A_Summon, S_NULL, 0, 0},   // S_SUMMON_FX2_3
-    {SPR_TSPK, 0, 3, NULL, S_THRUSTINIT2_2, 0, 0},      // S_THRUSTINIT2_1
-    {SPR_TSPK, 0, 4, A_ThrustInitUp, S_THRUSTBLOCK, 0, 0},      // S_THRUSTINIT2_2
-    {SPR_TSPK, 1, 3, NULL, S_BTHRUSTINIT2_2, 0, 0},     // S_BTHRUSTINIT2_1
-    {SPR_TSPK, 1, 4, A_ThrustInitUp, S_BTHRUSTBLOCK, 0, 0},     // S_BTHRUSTINIT2_2
-    {SPR_TSPK, 0, 3, NULL, S_THRUSTINIT1_2, 0, 0},      // S_THRUSTINIT1_1
-    {SPR_TSPK, 0, 4, A_ThrustInitDn, S_THRUSTSTAY, 0, 0},       // S_THRUSTINIT1_2
-    {SPR_TSPK, 1, 3, NULL, S_BTHRUSTINIT1_2, 0, 0},     // S_BTHRUSTINIT1_1
-    {SPR_TSPK, 1, 4, A_ThrustInitDn, S_BTHRUSTSTAY, 0, 0},      // S_BTHRUSTINIT1_2
-    {SPR_TSPK, 0, 8, A_ThrustRaise, S_THRUSTRAISE2, 0, 0},      // S_THRUSTRAISE1
-    {SPR_TSPK, 0, 6, A_ThrustRaise, S_THRUSTRAISE3, 0, 0},      // S_THRUSTRAISE2
-    {SPR_TSPK, 0, 4, A_ThrustRaise, S_THRUSTRAISE4, 0, 0},      // S_THRUSTRAISE3
-    {SPR_TSPK, 0, 3, A_ThrustBlock, S_THRUSTIMPALE, 0, 0},      // S_THRUSTRAISE4
-    {SPR_TSPK, 1, 8, A_ThrustRaise, S_BTHRUSTRAISE2, 0, 0},     // S_BTHRUSTRAISE1
-    {SPR_TSPK, 1, 6, A_ThrustRaise, S_BTHRUSTRAISE3, 0, 0},     // S_BTHRUSTRAISE2
-    {SPR_TSPK, 1, 4, A_ThrustRaise, S_BTHRUSTRAISE4, 0, 0},     // S_BTHRUSTRAISE3
-    {SPR_TSPK, 1, 3, A_ThrustBlock, S_BTHRUSTIMPALE, 0, 0},     // S_BTHRUSTRAISE4
-    {SPR_TSPK, 0, 2, A_ThrustImpale, S_THRUSTRAISE, 0, 0},      // S_THRUSTIMPALE
-    {SPR_TSPK, 1, 2, A_ThrustImpale, S_BTHRUSTRAISE, 0, 0},     // S_BTHRUSTIMPALE
-    {SPR_TSPK, 0, 2, A_ThrustRaise, S_THRUSTRAISE, 0, 0},       // S_THRUSTRAISE
-    {SPR_TSPK, 1, 2, A_ThrustRaise, S_BTHRUSTRAISE, 0, 0},      // S_BTHRUSTRAISE
-    {SPR_TSPK, 0, 10, NULL, S_THRUSTBLOCK, 0, 0},       // S_THRUSTBLOCK
-    {SPR_TSPK, 1, 10, NULL, S_BTHRUSTBLOCK, 0, 0},      // S_BTHRUSTBLOCK
-    {SPR_TSPK, 0, 2, A_ThrustLower, S_THRUSTLOWER, 0, 0},       // S_THRUSTLOWER
-    {SPR_TSPK, 1, 2, A_ThrustLower, S_BTHRUSTLOWER, 0, 0},      // S_BTHRUSTLOWER
-    {SPR_TSPK, 0, -1, NULL, S_THRUSTSTAY, 0, 0},        // S_THRUSTSTAY
-    {SPR_TSPK, 1, -1, NULL, S_BTHRUSTSTAY, 0, 0},       // S_BTHRUSTSTAY
-    {SPR_TELO, 0, 5, NULL, S_ARTI_TELOTHER2, 0, 0},     // S_ARTI_TELOTHER1
-    {SPR_TELO, 1, 5, NULL, S_ARTI_TELOTHER3, 0, 0},     // S_ARTI_TELOTHER2
-    {SPR_TELO, 2, 5, NULL, S_ARTI_TELOTHER4, 0, 0},     // S_ARTI_TELOTHER3
-    {SPR_TELO, 3, 5, NULL, S_ARTI_TELOTHER1, 0, 0},     // S_ARTI_TELOTHER4
-    {SPR_TRNG, 32772, 5, NULL, S_TELO_FX2, 0, 0},       // S_TELO_FX1
-    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX3, 0, 0},       // S_TELO_FX2
-    {SPR_TRNG, 32770, 3, A_TeloSpawnC, S_TELO_FX4, 0, 0},       // S_TELO_FX3
-    {SPR_TRNG, 32769, 3, A_TeloSpawnB, S_TELO_FX5, 0, 0},       // S_TELO_FX4
-    {SPR_TRNG, 32768, 3, A_TeloSpawnA, S_TELO_FX6, 0, 0},       // S_TELO_FX5
-    {SPR_TRNG, 32769, 3, A_TeloSpawnB, S_TELO_FX7, 0, 0},       // S_TELO_FX6
-    {SPR_TRNG, 32770, 3, A_TeloSpawnC, S_TELO_FX8, 0, 0},       // S_TELO_FX7
-    {SPR_TRNG, 32771, 3, A_TeloSpawnD, S_TELO_FX3, 0, 0},       // S_TELO_FX8
-    {SPR_TRNG, 32772, 3, NULL, S_NULL, 0, 0},   // S_TELO_FX9
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX2_2, 0, 0},     // S_TELO_FX2_1
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX2_3, 0, 0},     // S_TELO_FX2_2
-    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX2_4, 0, 0},     // S_TELO_FX2_3
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX2_5, 0, 0},     // S_TELO_FX2_4
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX2_6, 0, 0},     // S_TELO_FX2_5
-    {SPR_TRNG, 32768, 4, A_CheckTeleRing, S_TELO_FX2_1, 0, 0},  // S_TELO_FX2_6
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX3_2, 0, 0},     // S_TELO_FX3_1
-    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX3_3, 0, 0},     // S_TELO_FX3_2
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX3_4, 0, 0},     // S_TELO_FX3_3
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX3_5, 0, 0},     // S_TELO_FX3_4
-    {SPR_TRNG, 32768, 4, NULL, S_TELO_FX3_6, 0, 0},     // S_TELO_FX3_5
-    {SPR_TRNG, 32769, 4, A_CheckTeleRing, S_TELO_FX3_1, 0, 0},  // S_TELO_FX3_6
-    {SPR_TRNG, 32771, 4, NULL, S_TELO_FX4_2, 0, 0},     // S_TELO_FX4_1
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX4_3, 0, 0},     // S_TELO_FX4_2
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX4_4, 0, 0},     // S_TELO_FX4_3
-    {SPR_TRNG, 32768, 4, NULL, S_TELO_FX4_5, 0, 0},     // S_TELO_FX4_4
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX4_6, 0, 0},     // S_TELO_FX4_5
-    {SPR_TRNG, 32770, 4, A_CheckTeleRing, S_TELO_FX4_1, 0, 0},  // S_TELO_FX4_6
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX5_2, 0, 0},     // S_TELO_FX5_1
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX5_3, 0, 0},     // S_TELO_FX5_2
-    {SPR_TRNG, 32768, 4, NULL, S_TELO_FX5_4, 0, 0},     // S_TELO_FX5_3
-    {SPR_TRNG, 32769, 4, NULL, S_TELO_FX5_5, 0, 0},     // S_TELO_FX5_4
-    {SPR_TRNG, 32770, 4, NULL, S_TELO_FX5_6, 0, 0},     // S_TELO_FX5_5
-    {SPR_TRNG, 32771, 4, A_CheckTeleRing, S_TELO_FX5_1, 0, 0},  // S_TELO_FX5_6
-    {SPR_ROCK, 3, 20, NULL, S_DIRT1_1, 0, 0},   // S_DIRT1_1
-    {SPR_ROCK, 3, 10, NULL, S_NULL, 0, 0},      // S_DIRT1_D
-    {SPR_ROCK, 4, 20, NULL, S_DIRT2_1, 0, 0},   // S_DIRT2_1
-    {SPR_ROCK, 4, 10, NULL, S_NULL, 0, 0},      // S_DIRT2_D
-    {SPR_ROCK, 5, 20, NULL, S_DIRT3_1, 0, 0},   // S_DIRT3_1
-    {SPR_ROCK, 5, 10, NULL, S_NULL, 0, 0},      // S_DIRT3_D
-    {SPR_ROCK, 6, 20, NULL, S_DIRT4_1, 0, 0},   // S_DIRT4_1
-    {SPR_ROCK, 6, 10, NULL, S_NULL, 0, 0},      // S_DIRT4_D
-    {SPR_ROCK, 7, 20, NULL, S_DIRT5_1, 0, 0},   // S_DIRT5_1
-    {SPR_ROCK, 7, 10, NULL, S_NULL, 0, 0},      // S_DIRT5_D
-    {SPR_ROCK, 8, 20, NULL, S_DIRT6_1, 0, 0},   // S_DIRT6_1
-    {SPR_ROCK, 8, 10, NULL, S_NULL, 0, 0},      // S_DIRT6_D
-    {SPR_TSPK, 2, 20, NULL, S_DIRTCLUMP1, 0, 0},        // S_DIRTCLUMP1
-    {SPR_ROCK, 0, 20, NULL, S_ROCK1_1, 0, 0},   // S_ROCK1_1
-    {SPR_ROCK, 0, 10, NULL, S_NULL, 0, 0},      // S_ROCK1_D
-    {SPR_ROCK, 1, 20, NULL, S_ROCK2_1, 0, 0},   // S_ROCK2_1
-    {SPR_ROCK, 1, 10, NULL, S_NULL, 0, 0},      // S_ROCK2_D
-    {SPR_ROCK, 2, 20, NULL, S_ROCK3_1, 0, 0},   // S_ROCK3_1
-    {SPR_ROCK, 2, 10, NULL, S_NULL, 0, 0},      // S_ROCK3_D
-    {SPR_MAN1, 0, 20, A_FogSpawn, S_SPAWNFOG1, 0, 0},   // S_SPAWNFOG1
-    {SPR_FOGS, 0, 7, A_FogMove, S_FOGPATCHS2, 0, 0},    // S_FOGPATCHS1
-    {SPR_FOGS, 1, 7, A_FogMove, S_FOGPATCHS3, 0, 0},    // S_FOGPATCHS2
-    {SPR_FOGS, 2, 7, A_FogMove, S_FOGPATCHS4, 0, 0},    // S_FOGPATCHS3
-    {SPR_FOGS, 3, 7, A_FogMove, S_FOGPATCHS5, 0, 0},    // S_FOGPATCHS4
-    {SPR_FOGS, 4, 7, A_FogMove, S_FOGPATCHS1, 0, 0},    // S_FOGPATCHS5
-    {SPR_FOGS, 4, 5, NULL, S_NULL, 0, 0},       // S_FOGPATCHS0
-    {SPR_FOGM, 0, 7, A_FogMove, S_FOGPATCHM2, 0, 0},    // S_FOGPATCHM1
-    {SPR_FOGM, 1, 7, A_FogMove, S_FOGPATCHM3, 0, 0},    // S_FOGPATCHM2
-    {SPR_FOGM, 2, 7, A_FogMove, S_FOGPATCHM4, 0, 0},    // S_FOGPATCHM3
-    {SPR_FOGM, 3, 7, A_FogMove, S_FOGPATCHM5, 0, 0},    // S_FOGPATCHM4
-    {SPR_FOGM, 4, 7, A_FogMove, S_FOGPATCHM1, 0, 0},    // S_FOGPATCHM5
-    {SPR_FOGS, 0, 5, NULL, S_FOGPATCHMA, 0, 0}, // S_FOGPATCHM0
-    {SPR_FOGS, 1, 5, NULL, S_FOGPATCHMB, 0, 0}, // S_FOGPATCHMA
-    {SPR_FOGS, 2, 5, NULL, S_FOGPATCHMC, 0, 0}, // S_FOGPATCHMB
-    {SPR_FOGS, 3, 5, NULL, S_FOGPATCHMD, 0, 0}, // S_FOGPATCHMC
-    {SPR_FOGS, 4, 5, NULL, S_FOGPATCHS0, 0, 0}, // S_FOGPATCHMD
-    {SPR_FOGL, 0, 7, A_FogMove, S_FOGPATCHL2, 0, 0},    // S_FOGPATCHL1
-    {SPR_FOGL, 1, 7, A_FogMove, S_FOGPATCHL3, 0, 0},    // S_FOGPATCHL2
-    {SPR_FOGL, 2, 7, A_FogMove, S_FOGPATCHL4, 0, 0},    // S_FOGPATCHL3
-    {SPR_FOGL, 3, 7, A_FogMove, S_FOGPATCHL5, 0, 0},    // S_FOGPATCHL4
-    {SPR_FOGL, 4, 7, A_FogMove, S_FOGPATCHL1, 0, 0},    // S_FOGPATCHL5
-    {SPR_FOGM, 0, 4, NULL, S_FOGPATCHLA, 0, 0}, // S_FOGPATCHL0
-    {SPR_FOGM, 1, 4, NULL, S_FOGPATCHLB, 0, 0}, // S_FOGPATCHLA
-    {SPR_FOGM, 2, 4, NULL, S_FOGPATCHLC, 0, 0}, // S_FOGPATCHLB
-    {SPR_FOGM, 3, 4, NULL, S_FOGPATCHLD, 0, 0}, // S_FOGPATCHLC
-    {SPR_FOGM, 4, 4, NULL, S_FOGPATCHM0, 0, 0}, // S_FOGPATCHLD
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE2, 0, 0},   // S_QUAKE_ACTIVE1
-    {SPR_MAN1, 0, 1, A_ContMobjSound, S_QUAKE_ACTIVE3, 0, 0},   // S_QUAKE_ACTIVE2
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE4, 0, 0},   // S_QUAKE_ACTIVE3
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE5, 0, 0},   // S_QUAKE_ACTIVE4
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE6, 0, 0},   // S_QUAKE_ACTIVE5
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE7, 0, 0},   // S_QUAKE_ACTIVE6
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE8, 0, 0},   // S_QUAKE_ACTIVE7
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE9, 0, 0},   // S_QUAKE_ACTIVE8
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE0, 0, 0},   // S_QUAKE_ACTIVE9
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEA, 0, 0},   // S_QUAKE_ACTIVE0
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEB, 0, 0},   // S_QUAKE_ACTIVEA
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEC, 0, 0},   // S_QUAKE_ACTIVEB
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVED, 0, 0},   // S_QUAKE_ACTIVEC
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEE, 0, 0},   // S_QUAKE_ACTIVED
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEF, 0, 0},   // S_QUAKE_ACTIVEE
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEG, 0, 0},   // S_QUAKE_ACTIVEF
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEH, 0, 0},   // S_QUAKE_ACTIVEG
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEI, 0, 0},   // S_QUAKE_ACTIVEH
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEJ, 0, 0},   // S_QUAKE_ACTIVEI
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEK, 0, 0},   // S_QUAKE_ACTIVEJ
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEL, 0, 0},   // S_QUAKE_ACTIVEK
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEM, 0, 0},   // S_QUAKE_ACTIVEL
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEN, 0, 0},   // S_QUAKE_ACTIVEM
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEO, 0, 0},   // S_QUAKE_ACTIVEN
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEP, 0, 0},   // S_QUAKE_ACTIVEO
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEQ, 0, 0},   // S_QUAKE_ACTIVEP
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVER, 0, 0},   // S_QUAKE_ACTIVEQ
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVES, 0, 0},   // S_QUAKE_ACTIVER
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVET, 0, 0},   // S_QUAKE_ACTIVES
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEU, 0, 0},   // S_QUAKE_ACTIVET
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEV, 0, 0},   // S_QUAKE_ACTIVEU
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEW, 0, 0},   // S_QUAKE_ACTIVEV
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEX, 0, 0},   // S_QUAKE_ACTIVEW
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEY, 0, 0},   // S_QUAKE_ACTIVEX
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVEZ, 0, 0},   // S_QUAKE_ACTIVEY
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT1, 0, 0},      // S_QUAKE_ACTIVEZ
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT2, 0, 0},      // S_QUAKE_ACT1
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT3, 0, 0},      // S_QUAKE_ACT2
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT4, 0, 0},      // S_QUAKE_ACT3
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT5, 0, 0},      // S_QUAKE_ACT4
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT6, 0, 0},      // S_QUAKE_ACT5
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT7, 0, 0},      // S_QUAKE_ACT6
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT8, 0, 0},      // S_QUAKE_ACT7
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT9, 0, 0},      // S_QUAKE_ACT8
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACT0, 0, 0},      // S_QUAKE_ACT9
-    {SPR_MAN1, 0, 2, A_Quake, S_QUAKE_ACTIVE1, 0, 0},   // S_QUAKE_ACT0
-    {SPR_SGSA, 0, 4, NULL, S_SGSHARD1_2, 0, 0}, // S_SGSHARD1_1
-    {SPR_SGSA, 1, 4, NULL, S_SGSHARD1_3, 0, 0}, // S_SGSHARD1_2
-    {SPR_SGSA, 2, 4, NULL, S_SGSHARD1_4, 0, 0}, // S_SGSHARD1_3
-    {SPR_SGSA, 3, 4, NULL, S_SGSHARD1_5, 0, 0}, // S_SGSHARD1_4
-    {SPR_SGSA, 4, 4, NULL, S_SGSHARD1_1, 0, 0}, // S_SGSHARD1_5
-    {SPR_SGSA, 4, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD1_D
-    {SPR_SGSA, 5, 4, NULL, S_SGSHARD2_2, 0, 0}, // S_SGSHARD2_1
-    {SPR_SGSA, 6, 4, NULL, S_SGSHARD2_3, 0, 0}, // S_SGSHARD2_2
-    {SPR_SGSA, 7, 4, NULL, S_SGSHARD2_4, 0, 0}, // S_SGSHARD2_3
-    {SPR_SGSA, 8, 4, NULL, S_SGSHARD2_5, 0, 0}, // S_SGSHARD2_4
-    {SPR_SGSA, 9, 4, NULL, S_SGSHARD2_1, 0, 0}, // S_SGSHARD2_5
-    {SPR_SGSA, 9, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD2_D
-    {SPR_SGSA, 10, 4, NULL, S_SGSHARD3_2, 0, 0},        // S_SGSHARD3_1
-    {SPR_SGSA, 11, 4, NULL, S_SGSHARD3_3, 0, 0},        // S_SGSHARD3_2
-    {SPR_SGSA, 12, 4, NULL, S_SGSHARD3_4, 0, 0},        // S_SGSHARD3_3
-    {SPR_SGSA, 13, 4, NULL, S_SGSHARD3_5, 0, 0},        // S_SGSHARD3_4
-    {SPR_SGSA, 14, 4, NULL, S_SGSHARD3_1, 0, 0},        // S_SGSHARD3_5
-    {SPR_SGSA, 14, 30, NULL, S_NULL, 0, 0},     // S_SGSHARD3_D
-    {SPR_SGSA, 15, 4, NULL, S_SGSHARD4_2, 0, 0},        // S_SGSHARD4_1
-    {SPR_SGSA, 16, 4, NULL, S_SGSHARD4_3, 0, 0},        // S_SGSHARD4_2
-    {SPR_SGSA, 17, 4, NULL, S_SGSHARD4_4, 0, 0},        // S_SGSHARD4_3
-    {SPR_SGSA, 18, 4, NULL, S_SGSHARD4_5, 0, 0},        // S_SGSHARD4_4
-    {SPR_SGSA, 19, 4, NULL, S_SGSHARD4_1, 0, 0},        // S_SGSHARD4_5
-    {SPR_SGSA, 19, 30, NULL, S_NULL, 0, 0},     // S_SGSHARD4_D
-    {SPR_SGSA, 20, 4, NULL, S_SGSHARD5_2, 0, 0},        // S_SGSHARD5_1
-    {SPR_SGSA, 21, 4, NULL, S_SGSHARD5_3, 0, 0},        // S_SGSHARD5_2
-    {SPR_SGSA, 22, 4, NULL, S_SGSHARD5_4, 0, 0},        // S_SGSHARD5_3
-    {SPR_SGSA, 23, 4, NULL, S_SGSHARD5_5, 0, 0},        // S_SGSHARD5_4
-    {SPR_SGSA, 24, 4, NULL, S_SGSHARD5_1, 0, 0},        // S_SGSHARD5_5
-    {SPR_SGSA, 24, 30, NULL, S_NULL, 0, 0},     // S_SGSHARD5_D
-    {SPR_SGSB, 0, 4, NULL, S_SGSHARD6_1, 0, 0}, // S_SGSHARD6_1
-    {SPR_SGSB, 0, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD6_D
-    {SPR_SGSB, 1, 4, NULL, S_SGSHARD7_1, 0, 0}, // S_SGSHARD7_1
-    {SPR_SGSB, 1, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD7_D
-    {SPR_SGSB, 2, 4, NULL, S_SGSHARD8_1, 0, 0}, // S_SGSHARD8_1
-    {SPR_SGSB, 2, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD8_D
-    {SPR_SGSB, 3, 4, NULL, S_SGSHARD9_1, 0, 0}, // S_SGSHARD9_1
-    {SPR_SGSB, 3, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD9_D
-    {SPR_SGSB, 4, 4, NULL, S_SGSHARD0_1, 0, 0}, // S_SGSHARD0_1
-    {SPR_SGSB, 4, 30, NULL, S_NULL, 0, 0},      // S_SGSHARD0_D
-    {SPR_PORK, 0, 5, NULL, S_ARTI_EGGC2, 0, 0}, // S_ARTI_EGGC1
-    {SPR_PORK, 1, 5, NULL, S_ARTI_EGGC3, 0, 0}, // S_ARTI_EGGC2
-    {SPR_PORK, 2, 5, NULL, S_ARTI_EGGC4, 0, 0}, // S_ARTI_EGGC3
-    {SPR_PORK, 3, 5, NULL, S_ARTI_EGGC5, 0, 0}, // S_ARTI_EGGC4
-    {SPR_PORK, 4, 5, NULL, S_ARTI_EGGC6, 0, 0}, // S_ARTI_EGGC5
-    {SPR_PORK, 5, 5, NULL, S_ARTI_EGGC7, 0, 0}, // S_ARTI_EGGC6
-    {SPR_PORK, 6, 5, NULL, S_ARTI_EGGC8, 0, 0}, // S_ARTI_EGGC7
-    {SPR_PORK, 7, 5, NULL, S_ARTI_EGGC1, 0, 0}, // S_ARTI_EGGC8
-    {SPR_EGGM, 0, 4, NULL, S_EGGFX2, 0, 0},     // S_EGGFX1
-    {SPR_EGGM, 1, 4, NULL, S_EGGFX3, 0, 0},     // S_EGGFX2
-    {SPR_EGGM, 2, 4, NULL, S_EGGFX4, 0, 0},     // S_EGGFX3
-    {SPR_EGGM, 3, 4, NULL, S_EGGFX5, 0, 0},     // S_EGGFX4
-    {SPR_EGGM, 4, 4, NULL, S_EGGFX1, 0, 0},     // S_EGGFX5
-    {SPR_FHFX, 32776, 3, NULL, S_EGGFXI1_2, 0, 0},      // S_EGGFXI1_1
-    {SPR_FHFX, 32777, 3, NULL, S_EGGFXI1_3, 0, 0},      // S_EGGFXI1_2
-    {SPR_FHFX, 32778, 3, NULL, S_EGGFXI1_4, 0, 0},      // S_EGGFXI1_3
-    {SPR_FHFX, 32779, 3, NULL, S_NULL, 0, 0},   // S_EGGFXI1_4
-    {SPR_SPHL, 0, 350, NULL, S_ARTI_SPHL1, 0, 0},       // S_ARTI_SPHL1
-    {SPR_STWN, 0, -1, NULL, S_NULL, 0, 0},      // S_ZWINGEDSTATUENOSKULL
-    {SPR_STWN, 1, -1, NULL, S_NULL, 0, 0},      // S_ZWINGEDSTATUENOSKULL2
-    {SPR_GMPD, 0, -1, NULL, S_NULL, 0, 0},      // S_ZGEMPEDESTAL1
-    {SPR_GMPD, 1, -1, NULL, S_NULL, 0, 0},      // S_ZGEMPEDESTAL2
-    {SPR_ASKU, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZSKULL
-    {SPR_ABGM, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMBIG
-    {SPR_AGMR, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMRED
-    {SPR_AGMG, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMGREEN1
-    {SPR_AGG2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMGREEN2
-    {SPR_AGMB, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMBLUE1
-    {SPR_AGB2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZGEMBLUE2
-    {SPR_ABK1, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZBOOK1
-    {SPR_ABK2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZBOOK2
-    {SPR_ASK2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZSKULL2
-    {SPR_AFWP, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZFWEAPON
-    {SPR_ACWP, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZCWEAPON
-    {SPR_AMWP, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTIPUZZMWEAPON
-    {SPR_AGER, 32768, 4, NULL, S_ARTIPUZZGEAR_2, 0, 0}, // S_ARTIPUZZGEAR_1
-    {SPR_AGER, 32769, 4, NULL, S_ARTIPUZZGEAR_3, 0, 0}, // S_ARTIPUZZGEAR_2
-    {SPR_AGER, 32770, 4, NULL, S_ARTIPUZZGEAR_4, 0, 0}, // S_ARTIPUZZGEAR_3
-    {SPR_AGER, 32771, 4, NULL, S_ARTIPUZZGEAR_5, 0, 0}, // S_ARTIPUZZGEAR_4
-    {SPR_AGER, 32772, 4, NULL, S_ARTIPUZZGEAR_6, 0, 0}, // S_ARTIPUZZGEAR_5
-    {SPR_AGER, 32773, 4, NULL, S_ARTIPUZZGEAR_7, 0, 0}, // S_ARTIPUZZGEAR_6
-    {SPR_AGER, 32774, 4, NULL, S_ARTIPUZZGEAR_8, 0, 0}, // S_ARTIPUZZGEAR_7
-    {SPR_AGER, 32775, 4, NULL, S_ARTIPUZZGEAR_1, 0, 0}, // S_ARTIPUZZGEAR_8
-    {SPR_AGR2, 32768, 4, NULL, S_ARTIPUZZGEAR2_2, 0, 0},        // S_ARTIPUZZGEAR2_1
-    {SPR_AGR2, 32769, 4, NULL, S_ARTIPUZZGEAR2_3, 0, 0},        // S_ARTIPUZZGEAR2_2
-    {SPR_AGR2, 32770, 4, NULL, S_ARTIPUZZGEAR2_4, 0, 0},        // S_ARTIPUZZGEAR2_3
-    {SPR_AGR2, 32771, 4, NULL, S_ARTIPUZZGEAR2_5, 0, 0},        // S_ARTIPUZZGEAR2_4
-    {SPR_AGR2, 32772, 4, NULL, S_ARTIPUZZGEAR2_6, 0, 0},        // S_ARTIPUZZGEAR2_5
-    {SPR_AGR2, 32773, 4, NULL, S_ARTIPUZZGEAR2_7, 0, 0},        // S_ARTIPUZZGEAR2_6
-    {SPR_AGR2, 32774, 4, NULL, S_ARTIPUZZGEAR2_8, 0, 0},        // S_ARTIPUZZGEAR2_7
-    {SPR_AGR2, 32775, 4, NULL, S_ARTIPUZZGEAR2_1, 0, 0},        // S_ARTIPUZZGEAR2_8
-    {SPR_AGR3, 32768, 4, NULL, S_ARTIPUZZGEAR3_2, 0, 0},        // S_ARTIPUZZGEAR3_1
-    {SPR_AGR3, 32769, 4, NULL, S_ARTIPUZZGEAR3_3, 0, 0},        // S_ARTIPUZZGEAR3_2
-    {SPR_AGR3, 32770, 4, NULL, S_ARTIPUZZGEAR3_4, 0, 0},        // S_ARTIPUZZGEAR3_3
-    {SPR_AGR3, 32771, 4, NULL, S_ARTIPUZZGEAR3_5, 0, 0},        // S_ARTIPUZZGEAR3_4
-    {SPR_AGR3, 32772, 4, NULL, S_ARTIPUZZGEAR3_6, 0, 0},        // S_ARTIPUZZGEAR3_5
-    {SPR_AGR3, 32773, 4, NULL, S_ARTIPUZZGEAR3_7, 0, 0},        // S_ARTIPUZZGEAR3_6
-    {SPR_AGR3, 32774, 4, NULL, S_ARTIPUZZGEAR3_8, 0, 0},        // S_ARTIPUZZGEAR3_7
-    {SPR_AGR3, 32775, 4, NULL, S_ARTIPUZZGEAR3_1, 0, 0},        // S_ARTIPUZZGEAR3_8
-    {SPR_AGR4, 32768, 4, NULL, S_ARTIPUZZGEAR4_2, 0, 0},        // S_ARTIPUZZGEAR4_1
-    {SPR_AGR4, 32769, 4, NULL, S_ARTIPUZZGEAR4_3, 0, 0},        // S_ARTIPUZZGEAR4_2
-    {SPR_AGR4, 32770, 4, NULL, S_ARTIPUZZGEAR4_4, 0, 0},        // S_ARTIPUZZGEAR4_3
-    {SPR_AGR4, 32771, 4, NULL, S_ARTIPUZZGEAR4_5, 0, 0},        // S_ARTIPUZZGEAR4_4
-    {SPR_AGR4, 32772, 4, NULL, S_ARTIPUZZGEAR4_6, 0, 0},        // S_ARTIPUZZGEAR4_5
-    {SPR_AGR4, 32773, 4, NULL, S_ARTIPUZZGEAR4_7, 0, 0},        // S_ARTIPUZZGEAR4_6
-    {SPR_AGR4, 32774, 4, NULL, S_ARTIPUZZGEAR4_8, 0, 0},        // S_ARTIPUZZGEAR4_7
-    {SPR_AGR4, 32775, 4, NULL, S_ARTIPUZZGEAR4_1, 0, 0},        // S_ARTIPUZZGEAR4_8
-    {SPR_TRCH, 32768, 3, NULL, S_ARTI_TRCH2, 0, 0},     // S_ARTI_TRCH1
-    {SPR_TRCH, 32769, 3, NULL, S_ARTI_TRCH3, 0, 0},     // S_ARTI_TRCH2
-    {SPR_TRCH, 32770, 3, NULL, S_ARTI_TRCH1, 0, 0},     // S_ARTI_TRCH3
-    {SPR_PSBG, 0, 20, NULL, S_FIREBOMB2, 0, 0}, // S_FIREBOMB1
-    {SPR_PSBG, 0, 10, NULL, S_FIREBOMB3, 0, 0}, // S_FIREBOMB2
-    {SPR_PSBG, 0, 10, NULL, S_FIREBOMB4, 0, 0}, // S_FIREBOMB3
-    {SPR_PSBG, 1, 4, NULL, S_FIREBOMB5, 0, 0},  // S_FIREBOMB4
-    {SPR_PSBG, 2, 4, A_Scream, S_FIREBOMB6, 0, 0},      // S_FIREBOMB5
-    {SPR_XPL1, 32768, 4, A_Explode, S_FIREBOMB7, 0, 0}, // S_FIREBOMB6
-    {SPR_XPL1, 32769, 4, NULL, S_FIREBOMB8, 0, 0},      // S_FIREBOMB7
-    {SPR_XPL1, 32770, 4, NULL, S_FIREBOMB9, 0, 0},      // S_FIREBOMB8
-    {SPR_XPL1, 32771, 4, NULL, S_FIREBOMB10, 0, 0},     // S_FIREBOMB9
-    {SPR_XPL1, 32772, 4, NULL, S_FIREBOMB11, 0, 0},     // S_FIREBOMB10
-    {SPR_XPL1, 32773, 4, NULL, S_NULL, 0, 0},   // S_FIREBOMB11
-    {SPR_ATLP, 0, 4, NULL, S_ARTI_ATLP2, 0, 0}, // S_ARTI_ATLP1
-    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP3, 0, 0}, // S_ARTI_ATLP2
-    {SPR_ATLP, 2, 4, NULL, S_ARTI_ATLP4, 0, 0}, // S_ARTI_ATLP3
-    {SPR_ATLP, 1, 4, NULL, S_ARTI_ATLP1, 0, 0}, // S_ARTI_ATLP4
-    {SPR_PSBG, 0, -1, NULL, S_NULL, 0, 0},      // S_ARTI_PSBG1
-    {SPR_PSBG, 32768, 18, NULL, S_POISONBAG2, 0, 0},    // S_POISONBAG1
-    {SPR_PSBG, 32769, 4, NULL, S_POISONBAG3, 0, 0},     // S_POISONBAG2
-    {SPR_PSBG, 2, 3, NULL, S_POISONBAG4, 0, 0}, // S_POISONBAG3
-    {SPR_PSBG, 2, 1, A_PoisonBagInit, S_NULL, 0, 0},    // S_POISONBAG4
-    {SPR_PSBG, 3, 1, NULL, S_POISONCLOUD2, 0, 0},       // S_POISONCLOUD1
-    {SPR_PSBG, 3, 1, A_Scream, S_POISONCLOUD3, 0, 0},   // S_POISONCLOUD2
-    {SPR_PSBG, 3, 2, A_PoisonBagDamage, S_POISONCLOUD4, 0, 0},  // S_POISONCLOUD3
-    {SPR_PSBG, 4, 2, A_PoisonBagDamage, S_POISONCLOUD5, 0, 0},  // S_POISONCLOUD4
-    {SPR_PSBG, 4, 2, A_PoisonBagDamage, S_POISONCLOUD6, 0, 0},  // S_POISONCLOUD5
-    {SPR_PSBG, 4, 2, A_PoisonBagDamage, S_POISONCLOUD7, 0, 0},  // S_POISONCLOUD6
-    {SPR_PSBG, 5, 2, A_PoisonBagDamage, S_POISONCLOUD8, 0, 0},  // S_POISONCLOUD7
-    {SPR_PSBG, 5, 2, A_PoisonBagDamage, S_POISONCLOUD9, 0, 0},  // S_POISONCLOUD8
-    {SPR_PSBG, 5, 2, A_PoisonBagDamage, S_POISONCLOUD10, 0, 0}, // S_POISONCLOUD9
-    {SPR_PSBG, 6, 2, A_PoisonBagDamage, S_POISONCLOUD11, 0, 0}, // S_POISONCLOUD10
-    {SPR_PSBG, 6, 2, A_PoisonBagDamage, S_POISONCLOUD12, 0, 0}, // S_POISONCLOUD11
-    {SPR_PSBG, 6, 2, A_PoisonBagDamage, S_POISONCLOUD13, 0, 0}, // S_POISONCLOUD12
-    {SPR_PSBG, 7, 2, A_PoisonBagDamage, S_POISONCLOUD14, 0, 0}, // S_POISONCLOUD13
-    {SPR_PSBG, 7, 2, A_PoisonBagDamage, S_POISONCLOUD15, 0, 0}, // S_POISONCLOUD14
-    {SPR_PSBG, 7, 2, A_PoisonBagDamage, S_POISONCLOUD16, 0, 0}, // S_POISONCLOUD15
-    {SPR_PSBG, 8, 2, A_PoisonBagDamage, S_POISONCLOUD17, 0, 0}, // S_POISONCLOUD16
-    {SPR_PSBG, 8, 1, A_PoisonBagDamage, S_POISONCLOUD18, 0, 0}, // S_POISONCLOUD17
-    {SPR_PSBG, 8, 1, A_PoisonBagCheck, S_POISONCLOUD4, 0, 0},   // S_POISONCLOUD18
-    {SPR_PSBG, 7, 7, NULL, S_POISONCLOUD_X2, 0, 0},     // S_POISONCLOUD_X1
-    {SPR_PSBG, 6, 7, NULL, S_POISONCLOUD_X3, 0, 0},     // S_POISONCLOUD_X2
-    {SPR_PSBG, 5, 6, NULL, S_POISONCLOUD_X4, 0, 0},     // S_POISONCLOUD_X3
-    {SPR_PSBG, 3, 6, NULL, S_NULL, 0, 0},       // S_POISONCLOUD_X4
-    {SPR_THRW, 0, 4, A_CheckThrowBomb, S_THROWINGBOMB2, 0, 0},  // S_THROWINGBOMB1
-    {SPR_THRW, 1, 3, A_CheckThrowBomb, S_THROWINGBOMB3, 0, 0},  // S_THROWINGBOMB2
-    {SPR_THRW, 2, 3, A_CheckThrowBomb, S_THROWINGBOMB4, 0, 0},  // S_THROWINGBOMB3
-    {SPR_THRW, 3, 3, A_CheckThrowBomb, S_THROWINGBOMB5, 0, 0},  // S_THROWINGBOMB4
-    {SPR_THRW, 4, 3, A_CheckThrowBomb, S_THROWINGBOMB6, 0, 0},  // S_THROWINGBOMB5
-    {SPR_THRW, 5, 3, A_CheckThrowBomb, S_THROWINGBOMB1, 0, 0},  // S_THROWINGBOMB6
-    {SPR_THRW, 6, 6, A_CheckThrowBomb, S_THROWINGBOMB8, 0, 0},  // S_THROWINGBOMB7
-    {SPR_THRW, 5, 4, A_CheckThrowBomb, S_THROWINGBOMB9, 0, 0},  // S_THROWINGBOMB8
-    {SPR_THRW, 7, 6, A_CheckThrowBomb, S_THROWINGBOMB10, 0, 0}, // S_THROWINGBOMB9
-    {SPR_THRW, 5, 4, A_CheckThrowBomb, S_THROWINGBOMB11, 0, 0}, // S_THROWINGBOMB10
-    {SPR_THRW, 6, 6, A_CheckThrowBomb, S_THROWINGBOMB12, 0, 0}, // S_THROWINGBOMB11
-    {SPR_THRW, 5, 3, A_CheckThrowBomb, S_THROWINGBOMB12, 0, 0}, // S_THROWINGBOMB12
-    {SPR_CFCF, 32784, 4, A_NoGravity, S_THROWINGBOMB_X2, 0, 0}, // S_THROWINGBOMB_X1
-    {SPR_CFCF, 32785, 3, A_Scream, S_THROWINGBOMB_X3, 0, 0},    // S_THROWINGBOMB_X2
-    {SPR_CFCF, 32786, 4, A_Explode, S_THROWINGBOMB_X4, 0, 0},   // S_THROWINGBOMB_X3
-    {SPR_CFCF, 32787, 3, NULL, S_THROWINGBOMB_X5, 0, 0},        // S_THROWINGBOMB_X4
-    {SPR_CFCF, 32788, 4, NULL, S_THROWINGBOMB_X6, 0, 0},        // S_THROWINGBOMB_X5
-    {SPR_CFCF, 32790, 3, NULL, S_THROWINGBOMB_X7, 0, 0},        // S_THROWINGBOMB_X6
-    {SPR_CFCF, 32791, 4, NULL, S_THROWINGBOMB_X8, 0, 0},        // S_THROWINGBOMB_X7
-    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_THROWINGBOMB_X8
-    {SPR_SPED, 32768, 3, NULL, S_ARTI_BOOTS2, 0, 0},    // S_ARTI_BOOTS1
-    {SPR_SPED, 32769, 3, NULL, S_ARTI_BOOTS3, 0, 0},    // S_ARTI_BOOTS2
-    {SPR_SPED, 32770, 3, NULL, S_ARTI_BOOTS4, 0, 0},    // S_ARTI_BOOTS3
-    {SPR_SPED, 32771, 3, NULL, S_ARTI_BOOTS5, 0, 0},    // S_ARTI_BOOTS4
-    {SPR_SPED, 32772, 3, NULL, S_ARTI_BOOTS6, 0, 0},    // S_ARTI_BOOTS5
-    {SPR_SPED, 32773, 3, NULL, S_ARTI_BOOTS7, 0, 0},    // S_ARTI_BOOTS6
-    {SPR_SPED, 32774, 3, NULL, S_ARTI_BOOTS8, 0, 0},    // S_ARTI_BOOTS7
-    {SPR_SPED, 32775, 3, NULL, S_ARTI_BOOTS1, 0, 0},    // S_ARTI_BOOTS8
-    {SPR_BMAN, 32768, -1, NULL, S_NULL, 0, 0},  // S_ARTI_MANA
-    {SPR_BRAC, 32768, 4, NULL, S_ARTI_ARMOR2, 0, 0},    // S_ARTI_ARMOR1
-    {SPR_BRAC, 32769, 4, NULL, S_ARTI_ARMOR3, 0, 0},    // S_ARTI_ARMOR2
-    {SPR_BRAC, 32770, 4, NULL, S_ARTI_ARMOR4, 0, 0},    // S_ARTI_ARMOR3
-    {SPR_BRAC, 32771, 4, NULL, S_ARTI_ARMOR5, 0, 0},    // S_ARTI_ARMOR4
-    {SPR_BRAC, 32772, 4, NULL, S_ARTI_ARMOR6, 0, 0},    // S_ARTI_ARMOR5
-    {SPR_BRAC, 32773, 4, NULL, S_ARTI_ARMOR7, 0, 0},    // S_ARTI_ARMOR6
-    {SPR_BRAC, 32774, 4, NULL, S_ARTI_ARMOR8, 0, 0},    // S_ARTI_ARMOR7
-    {SPR_BRAC, 32775, 4, NULL, S_ARTI_ARMOR1, 0, 0},    // S_ARTI_ARMOR8
-    {SPR_BLST, 32768, 4, NULL, S_ARTI_BLAST2, 0, 0},    // S_ARTI_BLAST1
-    {SPR_BLST, 32769, 4, NULL, S_ARTI_BLAST3, 0, 0},    // S_ARTI_BLAST2
-    {SPR_BLST, 32770, 4, NULL, S_ARTI_BLAST4, 0, 0},    // S_ARTI_BLAST3
-    {SPR_BLST, 32771, 4, NULL, S_ARTI_BLAST5, 0, 0},    // S_ARTI_BLAST4
-    {SPR_BLST, 32772, 4, NULL, S_ARTI_BLAST6, 0, 0},    // S_ARTI_BLAST5
-    {SPR_BLST, 32773, 4, NULL, S_ARTI_BLAST7, 0, 0},    // S_ARTI_BLAST6
-    {SPR_BLST, 32774, 4, NULL, S_ARTI_BLAST8, 0, 0},    // S_ARTI_BLAST7
-    {SPR_BLST, 32775, 4, NULL, S_ARTI_BLAST1, 0, 0},    // S_ARTI_BLAST8
-    {SPR_HRAD, 32768, 4, NULL, S_ARTI_HEALRAD2, 0, 0},  // S_ARTI_HEALRAD1
-    {SPR_HRAD, 32769, 4, NULL, S_ARTI_HEALRAD3, 0, 0},  // S_ARTI_HEALRAD2
-    {SPR_HRAD, 32770, 4, NULL, S_ARTI_HEALRAD4, 0, 0},  // S_ARTI_HEALRAD3
-    {SPR_HRAD, 32771, 4, NULL, S_ARTI_HEALRAD5, 0, 0},  // S_ARTI_HEALRAD4
-    {SPR_HRAD, 32772, 4, NULL, S_ARTI_HEALRAD6, 0, 0},  // S_ARTI_HEALRAD5
-    {SPR_HRAD, 32773, 4, NULL, S_ARTI_HEALRAD7, 0, 0},  // S_ARTI_HEALRAD6
-    {SPR_HRAD, 32774, 4, NULL, S_ARTI_HEALRAD8, 0, 0},  // S_ARTI_HEALRAD7
-    {SPR_HRAD, 32775, 4, NULL, S_ARTI_HEALRAD9, 0, 0},  // S_ARTI_HEALRAD8
-    {SPR_HRAD, 32776, 4, NULL, S_ARTI_HEALRAD0, 0, 0},  // S_ARTI_HEALRAD9
-    {SPR_HRAD, 32777, 4, NULL, S_ARTI_HEALRADA, 0, 0},  // S_ARTI_HEALRAD0
-    {SPR_HRAD, 32778, 4, NULL, S_ARTI_HEALRADB, 0, 0},  // S_ARTI_HEALRADA
-    {SPR_HRAD, 32779, 4, NULL, S_ARTI_HEALRADC, 0, 0},  // S_ARTI_HEALRADB
-    {SPR_HRAD, 32780, 4, NULL, S_ARTI_HEALRADD, 0, 0},  // S_ARTI_HEALRADC
-    {SPR_HRAD, 32781, 4, NULL, S_ARTI_HEALRADE, 0, 0},  // S_ARTI_HEALRADD
-    {SPR_HRAD, 32782, 4, NULL, S_ARTI_HEALRADF, 0, 0},  // S_ARTI_HEALRADE
-    {SPR_HRAD, 32783, 4, NULL, S_ARTI_HEALRAD1, 0, 0},  // S_ARTI_HEALRADF
-    {SPR_SPSH, 0, 8, NULL, S_SPLASH2, 0, 0},    // S_SPLASH1
-    {SPR_SPSH, 1, 8, NULL, S_SPLASH3, 0, 0},    // S_SPLASH2
-    {SPR_SPSH, 2, 8, NULL, S_SPLASH4, 0, 0},    // S_SPLASH3
-    {SPR_SPSH, 3, 16, NULL, S_NULL, 0, 0},      // S_SPLASH4
-    {SPR_SPSH, 3, 10, NULL, S_NULL, 0, 0},      // S_SPLASHX
-    {SPR_SPSH, 4, 5, NULL, S_SPLASHBASE2, 0, 0},        // S_SPLASHBASE1
-    {SPR_SPSH, 5, 5, NULL, S_SPLASHBASE3, 0, 0},        // S_SPLASHBASE2
-    {SPR_SPSH, 6, 5, NULL, S_SPLASHBASE4, 0, 0},        // S_SPLASHBASE3
-    {SPR_SPSH, 7, 5, NULL, S_SPLASHBASE5, 0, 0},        // S_SPLASHBASE4
-    {SPR_SPSH, 8, 5, NULL, S_SPLASHBASE6, 0, 0},        // S_SPLASHBASE5
-    {SPR_SPSH, 9, 5, NULL, S_SPLASHBASE7, 0, 0},        // S_SPLASHBASE6
-    {SPR_SPSH, 10, 5, NULL, S_NULL, 0, 0},      // S_SPLASHBASE7
-    {SPR_LVAS, 32768, 5, NULL, S_LAVASPLASH2, 0, 0},    // S_LAVASPLASH1
-    {SPR_LVAS, 32769, 5, NULL, S_LAVASPLASH3, 0, 0},    // S_LAVASPLASH2
-    {SPR_LVAS, 32770, 5, NULL, S_LAVASPLASH4, 0, 0},    // S_LAVASPLASH3
-    {SPR_LVAS, 32771, 5, NULL, S_LAVASPLASH5, 0, 0},    // S_LAVASPLASH4
-    {SPR_LVAS, 32772, 5, NULL, S_LAVASPLASH6, 0, 0},    // S_LAVASPLASH5
-    {SPR_LVAS, 32773, 5, NULL, S_NULL, 0, 0},   // S_LAVASPLASH6
-    {SPR_LVAS, 32774, 5, NULL, S_LAVASMOKE2, 0, 0},     // S_LAVASMOKE1
-    {SPR_LVAS, 32775, 5, NULL, S_LAVASMOKE3, 0, 0},     // S_LAVASMOKE2
-    {SPR_LVAS, 32776, 5, NULL, S_LAVASMOKE4, 0, 0},     // S_LAVASMOKE3
-    {SPR_LVAS, 32777, 5, NULL, S_LAVASMOKE5, 0, 0},     // S_LAVASMOKE4
-    {SPR_LVAS, 32778, 5, NULL, S_NULL, 0, 0},   // S_LAVASMOKE5
-    {SPR_SLDG, 0, 8, NULL, S_SLUDGECHUNK2, 0, 0},       // S_SLUDGECHUNK1
-    {SPR_SLDG, 1, 8, NULL, S_SLUDGECHUNK3, 0, 0},       // S_SLUDGECHUNK2
-    {SPR_SLDG, 2, 8, NULL, S_SLUDGECHUNK4, 0, 0},       // S_SLUDGECHUNK3
-    {SPR_SLDG, 3, 8, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNK4
-    {SPR_SLDG, 3, 6, NULL, S_NULL, 0, 0},       // S_SLUDGECHUNKX
-    {SPR_SLDG, 4, 6, NULL, S_SLUDGESPLASH2, 0, 0},      // S_SLUDGESPLASH1
-    {SPR_SLDG, 5, 6, NULL, S_SLUDGESPLASH3, 0, 0},      // S_SLUDGESPLASH2
-    {SPR_SLDG, 6, 6, NULL, S_SLUDGESPLASH4, 0, 0},      // S_SLUDGESPLASH3
-    {SPR_SLDG, 7, 6, NULL, S_NULL, 0, 0},       // S_SLUDGESPLASH4
-    {SPR_STTW, 0, -1, NULL, S_NULL, 0, 0},      // S_ZWINGEDSTATUE1
-    {SPR_RCK1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK1_1
-    {SPR_RCK2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK2_1
-    {SPR_RCK3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK3_1
-    {SPR_RCK4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCK4_1
-    {SPR_CDLR, 0, 4, NULL, S_ZCHANDELIER2, 0, 0},       // S_ZCHANDELIER1
-    {SPR_CDLR, 1, 4, NULL, S_ZCHANDELIER3, 0, 0},       // S_ZCHANDELIER2
-    {SPR_CDLR, 2, 4, NULL, S_ZCHANDELIER1, 0, 0},       // S_ZCHANDELIER3
-    {SPR_CDLR, 3, -1, NULL, S_NULL, 0, 0},      // S_ZCHANDELIER_U
-    {SPR_TRE1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEDEAD1
-    {SPR_TRE1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREE
-    {SPR_TRDT, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEDESTRUCTIBLE1
-    {SPR_TRDT, 1, 5, NULL, S_ZTREEDES_D2, 0, 0},        // S_ZTREEDES_D1
-    {SPR_TRDT, 2, 5, A_Scream, S_ZTREEDES_D3, 0, 0},    // S_ZTREEDES_D2
-    {SPR_TRDT, 3, 5, NULL, S_ZTREEDES_D4, 0, 0},        // S_ZTREEDES_D3
-    {SPR_TRDT, 4, 5, NULL, S_ZTREEDES_D5, 0, 0},        // S_ZTREEDES_D4
-    {SPR_TRDT, 5, 5, NULL, S_ZTREEDES_D6, 0, 0},        // S_ZTREEDES_D5
-    {SPR_TRDT, 6, -1, NULL, S_NULL, 0, 0},      // S_ZTREEDES_D6
-    {SPR_TRDT, 32775, 5, NULL, S_ZTREEDES_X2, 0, 0},    // S_ZTREEDES_X1
-    {SPR_TRDT, 32776, 5, NULL, S_ZTREEDES_X3, 0, 0},    // S_ZTREEDES_X2
-    {SPR_TRDT, 32777, 5, NULL, S_ZTREEDES_X4, 0, 0},    // S_ZTREEDES_X3
-    {SPR_TRDT, 32778, 5, NULL, S_ZTREEDES_X5, 0, 0},    // S_ZTREEDES_X4
-    {SPR_TRDT, 32779, 5, NULL, S_ZTREEDES_X6, 0, 0},    // S_ZTREEDES_X5
-    {SPR_TRDT, 32780, 5, A_Explode, S_ZTREEDES_X7, 0, 0},       // S_ZTREEDES_X6
-    {SPR_TRDT, 32781, 5, NULL, S_ZTREEDES_X8, 0, 0},    // S_ZTREEDES_X7
-    {SPR_TRDT, 14, 5, NULL, S_ZTREEDES_X9, 0, 0},       // S_ZTREEDES_X8
-    {SPR_TRDT, 15, 5, NULL, S_ZTREEDES_X10, 0, 0},      // S_ZTREEDES_X9
-    {SPR_TRDT, 16, -1, NULL, S_NULL, 0, 0},     // S_ZTREEDES_X10
-    {SPR_TRE2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREESWAMP182_1
-    {SPR_TRE3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREESWAMP172_1
-    {SPR_STM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPBURNED1
-    {SPR_STM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPBARE1
-    {SPR_STM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPSWAMP1_1
-    {SPR_STM4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTUMPSWAMP2_1
-    {SPR_MSH1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMLARGE1_1
-    {SPR_MSH2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMLARGE2_1
-    {SPR_MSH3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMLARGE3_1
-    {SPR_MSH4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL1_1
-    {SPR_MSH5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL2_1
-    {SPR_MSH6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL3_1
-    {SPR_MSH7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL4_1
-    {SPR_MSH8, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHROOMSMALL5_1
-    {SPR_SGMP, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEPILLAR1
-    {SPR_SGM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITELARGE1
-    {SPR_SGM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEMEDIUM1
-    {SPR_SGM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITESMALL1
-    {SPR_SLC1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITELARGE1
-    {SPR_SLC2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEMEDIUM1
-    {SPR_SLC3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITESMALL1
-    {SPR_MSS1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZMOSSCEILING1_1
-    {SPR_MSS2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZMOSSCEILING2_1
-    {SPR_SWMV, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSWAMPVINE1
-    {SPR_CPS1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSEKABOB1
-    {SPR_CPS2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSESLEEPING1
-    {SPR_TMS1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONERIP1
-    {SPR_TMS2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONESHANE1
-    {SPR_TMS3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONEBIGCROSS1
-    {SPR_TMS4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONEBRIANR1
-    {SPR_TMS5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONECROSSCIRCLE1
-    {SPR_TMS6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONESMALLCROSS1
-    {SPR_TMS7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTOMBSTONEBRIANP1
-    {SPR_CPS3, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEHANGING_1
-    {SPR_STT2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEGREENTALL_1
-    {SPR_STT3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEBLUETALL_1
-    {SPR_STT4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEGREENSHORT_1
-    {SPR_STT5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEBLUESHORT_1
-    {SPR_GAR1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLESTRIPETALL_1
-    {SPR_GAR2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEDARKREDTALL_1
-    {SPR_GAR3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEREDTALL_1
-    {SPR_GAR4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLETANTALL_1
-    {SPR_GAR5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLERUSTTALL_1
-    {SPR_GAR6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEDARKREDSHORT_1
-    {SPR_GAR7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLEREDSHORT_1
-    {SPR_GAR8, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLETANSHORT_1
-    {SPR_GAR9, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTATUEGARGOYLERUSTSHORT_1
-    {SPR_BNR1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZBANNERTATTERED_1
-    {SPR_TRE4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREELARGE1
-    {SPR_TRE5, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREELARGE2
-    {SPR_TRE6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEGNARLED1
-    {SPR_TRE7, 0, -1, NULL, S_NULL, 0, 0},      // S_ZTREEGNARLED2
-    {SPR_LOGG, 0, -1, NULL, S_NULL, 0, 0},      // S_ZLOG
-    {SPR_ICT1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICELARGE
-    {SPR_ICT2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICEMEDIUM
-    {SPR_ICT3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICESMALL
-    {SPR_ICT4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALACTITEICETINY
-    {SPR_ICM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICELARGE
-    {SPR_ICM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICEMEDIUM
-    {SPR_ICM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICESMALL
-    {SPR_ICM4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSTALAGMITEICETINY
-    {SPR_RKBL, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCKBROWN1
-    {SPR_RKBS, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCKBROWN2
-    {SPR_RKBK, 0, -1, NULL, S_NULL, 0, 0},      // S_ZROCKBLACK
-    {SPR_RBL1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZRUBBLE1
-    {SPR_RBL2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZRUBBLE2
-    {SPR_RBL3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZRUBBLE3
-    {SPR_VASE, 0, -1, NULL, S_NULL, 0, 0},      // S_ZVASEPILLAR
-    {SPR_POT1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZPOTTERY1
-    {SPR_POT2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZPOTTERY2
-    {SPR_POT3, 0, -1, NULL, S_NULL, 0, 0},      // S_ZPOTTERY3
-    {SPR_POT1, 0, 0, A_PotteryExplode, S_NULL, 0, 0},   // S_ZPOTTERY_EXPLODE
-    {SPR_PBIT, 0, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_1
-    {SPR_PBIT, 1, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_2
-    {SPR_PBIT, 2, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_3
-    {SPR_PBIT, 3, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_4
-    {SPR_PBIT, 4, -1, NULL, S_NULL, 0, 0},      // S_POTTERYBIT_5
-    {SPR_PBIT, 5, 0, A_PotteryChooseBit, S_NULL, 0, 0}, // S_POTTERYBIT_EX0
-    {SPR_PBIT, 5, 140, NULL, S_POTTERYBIT_EX1_2, 0, 0}, // S_POTTERYBIT_EX1
-    {SPR_PBIT, 5, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX1_2
-    {SPR_PBIT, 6, 140, NULL, S_POTTERYBIT_EX2_2, 0, 0}, // S_POTTERYBIT_EX2
-    {SPR_PBIT, 6, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX2_2
-    {SPR_PBIT, 7, 140, NULL, S_POTTERYBIT_EX3_2, 0, 0}, // S_POTTERYBIT_EX3
-    {SPR_PBIT, 7, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX3_2
-    {SPR_PBIT, 8, 140, NULL, S_POTTERYBIT_EX4_2, 0, 0}, // S_POTTERYBIT_EX4
-    {SPR_PBIT, 8, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX4_2
-    {SPR_PBIT, 9, 140, NULL, S_POTTERYBIT_EX5_2, 0, 0}, // S_POTTERYBIT_EX5
-    {SPR_PBIT, 9, 1, A_PotteryCheck, S_NULL, 0, 0},     // S_POTTERYBIT_EX5_2
-    {SPR_CPS4, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSELYNCHED1
-    {SPR_CPS5, 0, 140, A_CorpseBloodDrip, S_ZCORPSELYNCHED2, 0, 0},     // S_ZCORPSELYNCHED2
-    {SPR_CPS6, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCORPSESITTING
-    {SPR_CPS6, 0, 1, A_CorpseExplode, S_NULL, 0, 0},    // S_ZCORPSESITTING_X
-    {SPR_CPB1, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_1
-    {SPR_CPB2, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_2
-    {SPR_CPB3, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_3
-    {SPR_CPB4, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBIT_4
-    {SPR_BDRP, 0, -1, NULL, S_NULL, 0, 0},      // S_CORPSEBLOODDRIP
-    {SPR_BDSH, 0, 3, NULL, S_CORPSEBLOODDRIP_X2, 0, 0}, // S_CORPSEBLOODDRIP_X1
-    {SPR_BDSH, 1, 3, NULL, S_CORPSEBLOODDRIP_X3, 0, 0}, // S_CORPSEBLOODDRIP_X2
-    {SPR_BDSH, 2, 2, NULL, S_CORPSEBLOODDRIP_X4, 0, 0}, // S_CORPSEBLOODDRIP_X3
-    {SPR_BDSH, 3, 2, NULL, S_NULL, 0, 0},       // S_CORPSEBLOODDRIP_X4
-    {SPR_BDPL, 0, -1, NULL, S_NULL, 0, 0},      // S_BLOODPOOL
-    {SPR_CNDL, 32768, 4, NULL, S_ZCANDLE2, 0, 0},       // S_ZCANDLE1
-    {SPR_CNDL, 32769, 4, NULL, S_ZCANDLE3, 0, 0},       // S_ZCANDLE2
-    {SPR_CNDL, 32770, 4, NULL, S_ZCANDLE1, 0, 0},       // S_ZCANDLE3
-    {SPR_MAN1, 0, 20, A_LeafSpawn, S_ZLEAFSPAWNER, 0, 0},       // S_ZLEAFSPAWNER
-    {SPR_LEF1, 0, 4, NULL, S_LEAF1_2, 0, 0},    // S_LEAF1_1
-    {SPR_LEF1, 1, 4, NULL, S_LEAF1_3, 0, 0},    // S_LEAF1_2
-    {SPR_LEF1, 2, 4, NULL, S_LEAF1_4, 0, 0},    // S_LEAF1_3
-    {SPR_LEF1, 3, 4, A_LeafThrust, S_LEAF1_5, 0, 0},    // S_LEAF1_4
-    {SPR_LEF1, 4, 4, NULL, S_LEAF1_6, 0, 0},    // S_LEAF1_5
-    {SPR_LEF1, 5, 4, NULL, S_LEAF1_7, 0, 0},    // S_LEAF1_6
-    {SPR_LEF1, 6, 4, NULL, S_LEAF1_8, 0, 0},    // S_LEAF1_7
-    {SPR_LEF1, 7, 4, A_LeafThrust, S_LEAF1_9, 0, 0},    // S_LEAF1_8
-    {SPR_LEF1, 8, 4, NULL, S_LEAF1_10, 0, 0},   // S_LEAF1_9
-    {SPR_LEF1, 0, 4, NULL, S_LEAF1_11, 0, 0},   // S_LEAF1_10
-    {SPR_LEF1, 1, 4, NULL, S_LEAF1_12, 0, 0},   // S_LEAF1_11
-    {SPR_LEF1, 2, 4, A_LeafThrust, S_LEAF1_13, 0, 0},   // S_LEAF1_12
-    {SPR_LEF1, 3, 4, NULL, S_LEAF1_14, 0, 0},   // S_LEAF1_13
-    {SPR_LEF1, 4, 4, NULL, S_LEAF1_15, 0, 0},   // S_LEAF1_14
-    {SPR_LEF1, 5, 4, NULL, S_LEAF1_16, 0, 0},   // S_LEAF1_15
-    {SPR_LEF1, 6, 4, A_LeafThrust, S_LEAF1_17, 0, 0},   // S_LEAF1_16
-    {SPR_LEF1, 7, 4, NULL, S_LEAF1_18, 0, 0},   // S_LEAF1_17
-    {SPR_LEF1, 8, 4, NULL, S_NULL, 0, 0},       // S_LEAF1_18
-    {SPR_LEF3, 3, 10, A_LeafCheck, S_LEAF_X1, 0, 0},    // S_LEAF_X1
-    {SPR_LEF2, 0, 4, NULL, S_LEAF2_2, 0, 0},    // S_LEAF2_1
-    {SPR_LEF2, 1, 4, NULL, S_LEAF2_3, 0, 0},    // S_LEAF2_2
-    {SPR_LEF2, 2, 4, NULL, S_LEAF2_4, 0, 0},    // S_LEAF2_3
-    {SPR_LEF2, 3, 4, A_LeafThrust, S_LEAF2_5, 0, 0},    // S_LEAF2_4
-    {SPR_LEF2, 4, 4, NULL, S_LEAF2_6, 0, 0},    // S_LEAF2_5
-    {SPR_LEF2, 5, 4, NULL, S_LEAF2_7, 0, 0},    // S_LEAF2_6
-    {SPR_LEF2, 6, 4, NULL, S_LEAF2_8, 0, 0},    // S_LEAF2_7
-    {SPR_LEF2, 7, 4, A_LeafThrust, S_LEAF2_9, 0, 0},    // S_LEAF2_8
-    {SPR_LEF2, 8, 4, NULL, S_LEAF2_10, 0, 0},   // S_LEAF2_9
-    {SPR_LEF2, 0, 4, NULL, S_LEAF2_11, 0, 0},   // S_LEAF2_10
-    {SPR_LEF2, 1, 4, NULL, S_LEAF2_12, 0, 0},   // S_LEAF2_11
-    {SPR_LEF2, 2, 4, A_LeafThrust, S_LEAF2_13, 0, 0},   // S_LEAF2_12
-    {SPR_LEF2, 3, 4, NULL, S_LEAF2_14, 0, 0},   // S_LEAF2_13
-    {SPR_LEF2, 4, 4, NULL, S_LEAF2_15, 0, 0},   // S_LEAF2_14
-    {SPR_LEF2, 5, 4, NULL, S_LEAF2_16, 0, 0},   // S_LEAF2_15
-    {SPR_LEF2, 6, 4, A_LeafThrust, S_LEAF2_17, 0, 0},   // S_LEAF2_16
-    {SPR_LEF2, 7, 4, NULL, S_LEAF2_18, 0, 0},   // S_LEAF2_17
-    {SPR_LEF2, 8, 4, NULL, S_NULL, 0, 0},       // S_LEAF2_18
-    {SPR_TWTR, 32768, 4, NULL, S_ZTWINEDTORCH_2, 0, 0}, // S_ZTWINEDTORCH_1
-    {SPR_TWTR, 32769, 4, NULL, S_ZTWINEDTORCH_3, 0, 0}, // S_ZTWINEDTORCH_2
-    {SPR_TWTR, 32770, 4, NULL, S_ZTWINEDTORCH_4, 0, 0}, // S_ZTWINEDTORCH_3
-    {SPR_TWTR, 32771, 4, NULL, S_ZTWINEDTORCH_5, 0, 0}, // S_ZTWINEDTORCH_4
-    {SPR_TWTR, 32772, 4, NULL, S_ZTWINEDTORCH_6, 0, 0}, // S_ZTWINEDTORCH_5
-    {SPR_TWTR, 32773, 4, NULL, S_ZTWINEDTORCH_7, 0, 0}, // S_ZTWINEDTORCH_6
-    {SPR_TWTR, 32774, 4, NULL, S_ZTWINEDTORCH_8, 0, 0}, // S_ZTWINEDTORCH_7
-    {SPR_TWTR, 32775, 4, NULL, S_ZTWINEDTORCH_1, 0, 0}, // S_ZTWINEDTORCH_8
-    {SPR_TWTR, 8, -1, NULL, S_NULL, 0, 0},      // S_ZTWINEDTORCH_UNLIT
-    {SPR_TLGL, 0, 2, NULL, S_BRIDGE2, 0, 0},    // S_BRIDGE1
-    {SPR_TLGL, 0, 2, A_BridgeInit, S_BRIDGE3, 0, 0},    // S_BRIDGE2
-    {SPR_TLGL, 0, -1, NULL, S_NULL, 0, 0},      // S_BRIDGE3
-    {SPR_TLGL, 0, 2, NULL, S_FREE_BRIDGE2, 0, 0},       // S_FREE_BRIDGE1
-    {SPR_TLGL, 0, 300, NULL, S_NULL, 0, 0},     // S_FREE_BRIDGE2
-    {SPR_TLGL, 0, 2, NULL, S_BBALL2, 0, 0},     // S_BBALL1
-    {SPR_TLGL, 0, 5, A_BridgeOrbit, S_BBALL2, 0, 0},    // S_BBALL2
-    {SPR_WLTR, 32768, 5, NULL, S_ZWALLTORCH2, 0, 0},    // S_ZWALLTORCH1
-    {SPR_WLTR, 32769, 5, NULL, S_ZWALLTORCH3, 0, 0},    // S_ZWALLTORCH2
-    {SPR_WLTR, 32770, 5, NULL, S_ZWALLTORCH4, 0, 0},    // S_ZWALLTORCH3
-    {SPR_WLTR, 32771, 5, NULL, S_ZWALLTORCH5, 0, 0},    // S_ZWALLTORCH4
-    {SPR_WLTR, 32772, 5, NULL, S_ZWALLTORCH6, 0, 0},    // S_ZWALLTORCH5
-    {SPR_WLTR, 32773, 5, NULL, S_ZWALLTORCH7, 0, 0},    // S_ZWALLTORCH6
-    {SPR_WLTR, 32774, 5, NULL, S_ZWALLTORCH8, 0, 0},    // S_ZWALLTORCH7
-    {SPR_WLTR, 32775, 5, NULL, S_ZWALLTORCH1, 0, 0},    // S_ZWALLTORCH8
-    {SPR_WLTR, 8, -1, NULL, S_NULL, 0, 0},      // S_ZWALLTORCH_U
-    {SPR_BARL, 0, -1, NULL, S_NULL, 0, 0},      // S_ZBARREL1
-    {SPR_SHB1, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHRUB1
-    {SPR_SHB1, 0, 1, A_TreeDeath, S_ZSHRUB1, 0, 0},     // S_ZSHRUB1_DIE
-    {SPR_SHB1, 32769, 7, NULL, S_ZSHRUB1_X2, 0, 0},     // S_ZSHRUB1_X1
-    {SPR_SHB1, 32770, 6, A_Scream, S_ZSHRUB1_X3, 0, 0}, // S_ZSHRUB1_X2
-    {SPR_SHB1, 32771, 5, NULL, S_NULL, 0, 0},   // S_ZSHRUB1_X3
-    {SPR_SHB2, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSHRUB2
-    {SPR_SHB2, 0, 1, A_TreeDeath, S_ZSHRUB2, 0, 0},     // S_ZSHRUB2_DIE
-    {SPR_SHB2, 32769, 7, NULL, S_ZSHRUB2_X2, 0, 0},     // S_ZSHRUB2_X1
-    {SPR_SHB2, 32770, 6, A_Scream, S_ZSHRUB2_X3, 0, 0}, // S_ZSHRUB2_X2
-    {SPR_SHB2, 32771, 5, A_Explode, S_ZSHRUB2_X4, 0, 0},        // S_ZSHRUB2_X3
-    {SPR_SHB2, 32772, 5, NULL, S_NULL, 0, 0},   // S_ZSHRUB2_X4
-    {SPR_BCKT, 0, -1, NULL, S_NULL, 0, 0},      // S_ZBUCKET1
-    {SPR_SHRM, 0, 5, A_PoisonShroom, S_ZPOISONSHROOM_P2, 0, 0}, // S_ZPOISONSHROOM1
-    {SPR_SHRM, 0, 6, NULL, S_ZPOISONSHROOM_P2, 0, 0},   // S_ZPOISONSHROOM_P1
-    {SPR_SHRM, 1, 8, A_Pain, S_ZPOISONSHROOM1, 0, 0},   // S_ZPOISONSHROOM_P2
-    {SPR_SHRM, 2, 5, NULL, S_ZPOISONSHROOM_X2, 0, 0},   // S_ZPOISONSHROOM_X1
-    {SPR_SHRM, 3, 5, NULL, S_ZPOISONSHROOM_X3, 0, 0},   // S_ZPOISONSHROOM_X2
-    {SPR_SHRM, 4, 5, A_PoisonBagInit, S_ZPOISONSHROOM_X4, 0, 0},        // S_ZPOISONSHROOM_X3
-    {SPR_SHRM, 5, -1, NULL, S_NULL, 0, 0},      // S_ZPOISONSHROOM_X4
-    {SPR_FBUL, 32768, 4, NULL, S_ZFIREBULL2, 0, 0},     // S_ZFIREBULL1
-    {SPR_FBUL, 32769, 4, NULL, S_ZFIREBULL3, 0, 0},     // S_ZFIREBULL2
-    {SPR_FBUL, 32770, 4, NULL, S_ZFIREBULL4, 0, 0},     // S_ZFIREBULL3
-    {SPR_FBUL, 32771, 4, NULL, S_ZFIREBULL5, 0, 0},     // S_ZFIREBULL4
-    {SPR_FBUL, 32772, 4, NULL, S_ZFIREBULL6, 0, 0},     // S_ZFIREBULL5
-    {SPR_FBUL, 32773, 4, NULL, S_ZFIREBULL7, 0, 0},     // S_ZFIREBULL6
-    {SPR_FBUL, 32774, 4, NULL, S_ZFIREBULL1, 0, 0},     // S_ZFIREBULL7
-    {SPR_FBUL, 32777, 4, NULL, S_ZFIREBULL_DEATH2, 0, 0},       // S_ZFIREBULL_DEATH
-    {SPR_FBUL, 32776, 4, NULL, S_ZFIREBULL_U, 0, 0},    // S_ZFIREBULL_DEATH2
-    {SPR_FBUL, 7, -1, NULL, S_NULL, 0, 0},      // S_ZFIREBULL_U
-    {SPR_FBUL, 32776, 4, NULL, S_ZFIREBULL_BIRTH2, 0, 0},       // S_ZFIREBULL_BIRTH
-    {SPR_FBUL, 32777, 4, NULL, S_ZFIREBULL1, 0, 0},     // S_ZFIREBULL_BIRTH2
-    {SPR_FSKL, 32768, 4, NULL, S_ZFIRETHING2, 0, 0},    // S_ZFIRETHING1
-    {SPR_FSKL, 32769, 3, NULL, S_ZFIRETHING3, 0, 0},    // S_ZFIRETHING2
-    {SPR_FSKL, 32770, 4, NULL, S_ZFIRETHING4, 0, 0},    // S_ZFIRETHING3
-    {SPR_FSKL, 32771, 3, NULL, S_ZFIRETHING5, 0, 0},    // S_ZFIRETHING4
-    {SPR_FSKL, 32772, 4, NULL, S_ZFIRETHING6, 0, 0},    // S_ZFIRETHING5
-    {SPR_FSKL, 32773, 3, NULL, S_ZFIRETHING7, 0, 0},    // S_ZFIRETHING6
-    {SPR_FSKL, 32774, 4, NULL, S_ZFIRETHING8, 0, 0},    // S_ZFIRETHING7
-    {SPR_FSKL, 32775, 3, NULL, S_ZFIRETHING9, 0, 0},    // S_ZFIRETHING8
-    {SPR_FSKL, 32776, 4, NULL, S_ZFIRETHING1, 0, 0},    // S_ZFIRETHING9
-    {SPR_BRTR, 32768, 4, NULL, S_ZBRASSTORCH2, 0, 0},   // S_ZBRASSTORCH1
-    {SPR_BRTR, 32769, 4, NULL, S_ZBRASSTORCH3, 0, 0},   // S_ZBRASSTORCH2
-    {SPR_BRTR, 32770, 4, NULL, S_ZBRASSTORCH4, 0, 0},   // S_ZBRASSTORCH3
-    {SPR_BRTR, 32771, 4, NULL, S_ZBRASSTORCH5, 0, 0},   // S_ZBRASSTORCH4
-    {SPR_BRTR, 32772, 4, NULL, S_ZBRASSTORCH6, 0, 0},   // S_ZBRASSTORCH5
-    {SPR_BRTR, 32773, 4, NULL, S_ZBRASSTORCH7, 0, 0},   // S_ZBRASSTORCH6
-    {SPR_BRTR, 32774, 4, NULL, S_ZBRASSTORCH8, 0, 0},   // S_ZBRASSTORCH7
-    {SPR_BRTR, 32775, 4, NULL, S_ZBRASSTORCH9, 0, 0},   // S_ZBRASSTORCH8
-    {SPR_BRTR, 32776, 4, NULL, S_ZBRASSTORCH10, 0, 0},  // S_ZBRASSTORCH9
-    {SPR_BRTR, 32777, 4, NULL, S_ZBRASSTORCH11, 0, 0},  // S_ZBRASSTORCH10
-    {SPR_BRTR, 32778, 4, NULL, S_ZBRASSTORCH12, 0, 0},  // S_ZBRASSTORCH11
-    {SPR_BRTR, 32779, 4, NULL, S_ZBRASSTORCH13, 0, 0},  // S_ZBRASSTORCH12
-    {SPR_BRTR, 32780, 4, NULL, S_ZBRASSTORCH1, 0, 0},   // S_ZBRASSTORCH13
-    {SPR_SUIT, 0, -1, NULL, S_NULL, 0, 0},      // S_ZSUITOFARMOR
-    {SPR_SUIT, 0, 1, A_SoAExplode, S_NULL, 0, 0},       // S_ZSUITOFARMOR_X1
-    {SPR_SUIT, 1, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK1
-    {SPR_SUIT, 2, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK2
-    {SPR_SUIT, 3, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK3
-    {SPR_SUIT, 4, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK4
-    {SPR_SUIT, 5, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK5
-    {SPR_SUIT, 6, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK6
-    {SPR_SUIT, 7, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK7
-    {SPR_SUIT, 8, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK8
-    {SPR_SUIT, 9, -1, NULL, S_NULL, 0, 0},      // S_ZARMORCHUNK9
-    {SPR_SUIT, 10, -1, NULL, S_NULL, 0, 0},     // S_ZARMORCHUNK10
-    {SPR_BBLL, 5, -1, NULL, S_NULL, 0, 0},      // S_ZBELL
-    {SPR_BBLL, 0, 4, A_BellReset1, S_ZBELL_X2, 0, 0},   // S_ZBELL_X1
-    {SPR_BBLL, 1, 4, NULL, S_ZBELL_X3, 0, 0},   // S_ZBELL_X2
-    {SPR_BBLL, 2, 4, NULL, S_ZBELL_X4, 0, 0},   // S_ZBELL_X3
-    {SPR_BBLL, 3, 5, A_Scream, S_ZBELL_X5, 0, 0},       // S_ZBELL_X4
-    {SPR_BBLL, 2, 4, NULL, S_ZBELL_X6, 0, 0},   // S_ZBELL_X5
-    {SPR_BBLL, 1, 4, NULL, S_ZBELL_X7, 0, 0},   // S_ZBELL_X6
-    {SPR_BBLL, 0, 3, NULL, S_ZBELL_X8, 0, 0},   // S_ZBELL_X7
-    {SPR_BBLL, 4, 4, NULL, S_ZBELL_X9, 0, 0},   // S_ZBELL_X8
-    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X10, 0, 0},  // S_ZBELL_X9
-    {SPR_BBLL, 6, 6, A_Scream, S_ZBELL_X11, 0, 0},      // S_ZBELL_X10
-    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X12, 0, 0},  // S_ZBELL_X11
-    {SPR_BBLL, 4, 4, NULL, S_ZBELL_X13, 0, 0},  // S_ZBELL_X12
-    {SPR_BBLL, 0, 4, NULL, S_ZBELL_X14, 0, 0},  // S_ZBELL_X13
-    {SPR_BBLL, 1, 5, NULL, S_ZBELL_X15, 0, 0},  // S_ZBELL_X14
-    {SPR_BBLL, 2, 5, NULL, S_ZBELL_X16, 0, 0},  // S_ZBELL_X15
-    {SPR_BBLL, 3, 6, A_Scream, S_ZBELL_X17, 0, 0},      // S_ZBELL_X16
-    {SPR_BBLL, 2, 5, NULL, S_ZBELL_X18, 0, 0},  // S_ZBELL_X17
-    {SPR_BBLL, 1, 5, NULL, S_ZBELL_X19, 0, 0},  // S_ZBELL_X18
-    {SPR_BBLL, 0, 4, NULL, S_ZBELL_X20, 0, 0},  // S_ZBELL_X19
-    {SPR_BBLL, 4, 5, NULL, S_ZBELL_X21, 0, 0},  // S_ZBELL_X20
-    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X22, 0, 0},  // S_ZBELL_X21
-    {SPR_BBLL, 6, 7, A_Scream, S_ZBELL_X23, 0, 0},      // S_ZBELL_X22
-    {SPR_BBLL, 5, 5, NULL, S_ZBELL_X24, 0, 0},  // S_ZBELL_X23
-    {SPR_BBLL, 4, 5, NULL, S_ZBELL_X25, 0, 0},  // S_ZBELL_X24
-    {SPR_BBLL, 0, 5, NULL, S_ZBELL_X26, 0, 0},  // S_ZBELL_X25
-    {SPR_BBLL, 1, 6, NULL, S_ZBELL_X27, 0, 0},  // S_ZBELL_X26
-    {SPR_BBLL, 2, 6, NULL, S_ZBELL_X28, 0, 0},  // S_ZBELL_X27
-    {SPR_BBLL, 3, 7, A_Scream, S_ZBELL_X29, 0, 0},      // S_ZBELL_X28
-    {SPR_BBLL, 2, 6, NULL, S_ZBELL_X30, 0, 0},  // S_ZBELL_X29
-    {SPR_BBLL, 1, 6, NULL, S_ZBELL_X31, 0, 0},  // S_ZBELL_X30
-    {SPR_BBLL, 0, 5, NULL, S_ZBELL_X32, 0, 0},  // S_ZBELL_X31
-    {SPR_BBLL, 4, 6, NULL, S_ZBELL_X33, 0, 0},  // S_ZBELL_X32
-    {SPR_BBLL, 5, 6, NULL, S_ZBELL_X34, 0, 0},  // S_ZBELL_X33
-    {SPR_BBLL, 6, 7, A_Scream, S_ZBELL_X35, 0, 0},      // S_ZBELL_X34
-    {SPR_BBLL, 5, 6, NULL, S_ZBELL_X36, 0, 0},  // S_ZBELL_X35
-    {SPR_BBLL, 4, 6, NULL, S_ZBELL_X37, 0, 0},  // S_ZBELL_X36
-    {SPR_BBLL, 0, 6, NULL, S_ZBELL_X38, 0, 0},  // S_ZBELL_X37
-    {SPR_BBLL, 1, 6, NULL, S_ZBELL_X39, 0, 0},  // S_ZBELL_X38
-    {SPR_BBLL, 2, 6, NULL, S_ZBELL_X40, 0, 0},  // S_ZBELL_X39
-    {SPR_BBLL, 1, 7, NULL, S_ZBELL_X41, 0, 0},  // S_ZBELL_X40
-    {SPR_BBLL, 0, 8, NULL, S_ZBELL_X42, 0, 0},  // S_ZBELL_X41
-    {SPR_BBLL, 4, 12, NULL, S_ZBELL_X43, 0, 0}, // S_ZBELL_X42
-    {SPR_BBLL, 0, 10, NULL, S_ZBELL_X44, 0, 0}, // S_ZBELL_X43
-    {SPR_BBLL, 1, 12, NULL, S_ZBELL_X45, 0, 0}, // S_ZBELL_X44
-    {SPR_BBLL, 0, 12, NULL, S_ZBELL_X46, 0, 0}, // S_ZBELL_X45
-    {SPR_BBLL, 4, 14, NULL, S_ZBELL_X47, 0, 0}, // S_ZBELL_X46
-    {SPR_BBLL, 0, 1, A_BellReset2, S_ZBELL, 0, 0},      // S_ZBELL_X47
-    {SPR_CAND, 32768, 5, NULL, S_ZBLUE_CANDLE2, 0, 0},  // S_ZBLUE_CANDLE1
-    {SPR_CAND, 32769, 5, NULL, S_ZBLUE_CANDLE3, 0, 0},  // S_ZBLUE_CANDLE2
-    {SPR_CAND, 32770, 5, NULL, S_ZBLUE_CANDLE4, 0, 0},  // S_ZBLUE_CANDLE3
-    {SPR_CAND, 32771, 5, NULL, S_ZBLUE_CANDLE5, 0, 0},  // S_ZBLUE_CANDLE4
-    {SPR_CAND, 32772, 5, NULL, S_ZBLUE_CANDLE1, 0, 0},  // S_ZBLUE_CANDLE5
-    {SPR_IRON, 0, -1, NULL, S_NULL, 0, 0},      // S_ZIRON_MAIDEN
-    {SPR_XMAS, 0, -1, NULL, S_NULL, 0, 0},      // S_ZXMAS_TREE
-    {SPR_XMAS, 0, 4, A_TreeDeath, S_ZXMAS_TREE, 0, 0},  // S_ZXMAS_TREE_DIE
-    {SPR_XMAS, 32769, 6, NULL, S_ZXMAS_TREE_X2, 0, 0},  // S_ZXMAS_TREE_X1
-    {SPR_XMAS, 32770, 6, A_Scream, S_ZXMAS_TREE_X3, 0, 0},      // S_ZXMAS_TREE_X2
-    {SPR_XMAS, 32771, 5, NULL, S_ZXMAS_TREE_X4, 0, 0},  // S_ZXMAS_TREE_X3
-    {SPR_XMAS, 32772, 5, A_Explode, S_ZXMAS_TREE_X5, 0, 0},     // S_ZXMAS_TREE_X4
-    {SPR_XMAS, 32773, 5, NULL, S_ZXMAS_TREE_X6, 0, 0},  // S_ZXMAS_TREE_X5
-    {SPR_XMAS, 32774, 4, NULL, S_ZXMAS_TREE_X7, 0, 0},  // S_ZXMAS_TREE_X6
-    {SPR_XMAS, 7, 5, NULL, S_ZXMAS_TREE_X8, 0, 0},      // S_ZXMAS_TREE_X7
-    {SPR_XMAS, 8, 4, A_NoBlocking, S_ZXMAS_TREE_X9, 0, 0},      // S_ZXMAS_TREE_X8
-    {SPR_XMAS, 9, 4, NULL, S_ZXMAS_TREE_X10, 0, 0},     // S_ZXMAS_TREE_X9
-    {SPR_XMAS, 10, -1, NULL, S_NULL, 0, 0},     // S_ZXMAS_TREE_X10
-    {SPR_CDRN, 32769, 4, NULL, S_ZCAULDRON2, 0, 0},     // S_ZCAULDRON1
-    {SPR_CDRN, 32770, 4, NULL, S_ZCAULDRON3, 0, 0},     // S_ZCAULDRON2
-    {SPR_CDRN, 32771, 4, NULL, S_ZCAULDRON4, 0, 0},     // S_ZCAULDRON3
-    {SPR_CDRN, 32772, 4, NULL, S_ZCAULDRON5, 0, 0},     // S_ZCAULDRON4
-    {SPR_CDRN, 32773, 4, NULL, S_ZCAULDRON6, 0, 0},     // S_ZCAULDRON5
-    {SPR_CDRN, 32774, 4, NULL, S_ZCAULDRON7, 0, 0},     // S_ZCAULDRON6
-    {SPR_CDRN, 32775, 4, NULL, S_ZCAULDRON1, 0, 0},     // S_ZCAULDRON7
-    {SPR_CDRN, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCAULDRON_U
-    {SPR_CHNS, 0, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINBIT32
-    {SPR_CHNS, 1, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINBIT64
-    {SPR_CHNS, 2, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_HEART
-    {SPR_CHNS, 3, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_HOOK1
-    {SPR_CHNS, 4, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_HOOK2
-    {SPR_CHNS, 5, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_SPIKE
-    {SPR_CHNS, 6, -1, NULL, S_NULL, 0, 0},      // S_ZCHAINEND_SKULL
-    {SPR_TST1, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT1
-    {SPR_TST2, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT2
-    {SPR_TST3, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT3
-    {SPR_TST4, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT4
-    {SPR_TST5, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT5
-    {SPR_TST6, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT6
-    {SPR_TST7, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT7
-    {SPR_TST8, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT8
-    {SPR_TST9, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT9
-    {SPR_TST0, 0, -1, NULL, S_NULL, 0, 0},      // S_TABLE_SHIT10
-    {SPR_TELE, 32768, 6, NULL, S_TFOG2, 0, 0},  // S_TFOG1
-    {SPR_TELE, 32769, 6, NULL, S_TFOG3, 0, 0},  // S_TFOG2
-    {SPR_TELE, 32770, 6, NULL, S_TFOG4, 0, 0},  // S_TFOG3
-    {SPR_TELE, 32771, 6, NULL, S_TFOG5, 0, 0},  // S_TFOG4
-    {SPR_TELE, 32772, 6, NULL, S_TFOG6, 0, 0},  // S_TFOG5
-    {SPR_TELE, 32773, 6, NULL, S_TFOG7, 0, 0},  // S_TFOG6
-    {SPR_TELE, 32774, 6, NULL, S_TFOG8, 0, 0},  // S_TFOG7
-    {SPR_TELE, 32775, 6, NULL, S_TFOG9, 0, 0},  // S_TFOG8
-    {SPR_TELE, 32774, 6, NULL, S_TFOG10, 0, 0}, // S_TFOG9
-    {SPR_TELE, 32773, 6, NULL, S_TFOG11, 0, 0}, // S_TFOG10
-    {SPR_TELE, 32772, 6, NULL, S_TFOG12, 0, 0}, // S_TFOG11
-    {SPR_TELE, 32771, 6, NULL, S_TFOG13, 0, 0}, // S_TFOG12
-    {SPR_TELE, 32770, 6, NULL, S_NULL, 0, 0},   // S_TFOG13
-    {SPR_TSMK, 0, 4, NULL, S_TELESMOKE2, 0, 0}, // S_TELESMOKE1
-    {SPR_TSMK, 1, 3, NULL, S_TELESMOKE3, 0, 0}, // S_TELESMOKE2
-    {SPR_TSMK, 2, 4, NULL, S_TELESMOKE4, 0, 0}, // S_TELESMOKE3
-    {SPR_TSMK, 3, 3, NULL, S_TELESMOKE5, 0, 0}, // S_TELESMOKE4
-    {SPR_TSMK, 4, 4, NULL, S_TELESMOKE6, 0, 0}, // S_TELESMOKE5
-    {SPR_TSMK, 5, 3, NULL, S_TELESMOKE7, 0, 0}, // S_TELESMOKE6
-    {SPR_TSMK, 6, 4, NULL, S_TELESMOKE8, 0, 0}, // S_TELESMOKE7
-    {SPR_TSMK, 7, 3, NULL, S_TELESMOKE9, 0, 0}, // S_TELESMOKE8
-    {SPR_TSMK, 8, 4, NULL, S_TELESMOKE10, 0, 0},        // S_TELESMOKE9
-    {SPR_TSMK, 9, 3, NULL, S_TELESMOKE11, 0, 0},        // S_TELESMOKE10
-    {SPR_TSMK, 10, 4, NULL, S_TELESMOKE12, 0, 0},       // S_TELESMOKE11
-    {SPR_TSMK, 11, 3, NULL, S_TELESMOKE13, 0, 0},       // S_TELESMOKE12
-    {SPR_TSMK, 12, 4, NULL, S_TELESMOKE14, 0, 0},       // S_TELESMOKE13
-    {SPR_TSMK, 13, 3, NULL, S_TELESMOKE15, 0, 0},       // S_TELESMOKE14
-    {SPR_TSMK, 14, 4, NULL, S_TELESMOKE16, 0, 0},       // S_TELESMOKE15
-    {SPR_TSMK, 15, 3, NULL, S_TELESMOKE17, 0, 0},       // S_TELESMOKE16
-    {SPR_TSMK, 16, 4, NULL, S_TELESMOKE18, 0, 0},       // S_TELESMOKE17
-    {SPR_TSMK, 17, 3, NULL, S_TELESMOKE19, 0, 0},       // S_TELESMOKE18
-    {SPR_TSMK, 18, 4, NULL, S_TELESMOKE20, 0, 0},       // S_TELESMOKE19
-    {SPR_TSMK, 19, 3, NULL, S_TELESMOKE21, 0, 0},       // S_TELESMOKE20
-    {SPR_TSMK, 20, 4, NULL, S_TELESMOKE22, 0, 0},       // S_TELESMOKE21
-    {SPR_TSMK, 21, 3, NULL, S_TELESMOKE23, 0, 0},       // S_TELESMOKE22
-    {SPR_TSMK, 22, 4, NULL, S_TELESMOKE24, 0, 0},       // S_TELESMOKE23
-    {SPR_TSMK, 23, 3, NULL, S_TELESMOKE25, 0, 0},       // S_TELESMOKE24
-    {SPR_TSMK, 24, 4, NULL, S_TELESMOKE26, 0, 0},       // S_TELESMOKE25
-    {SPR_TSMK, 25, 3, NULL, S_TELESMOKE1, 0, 0},        // S_TELESMOKE26
-    {SPR_FPCH, 0, 0, A_Light0, S_NULL, 0, 0},   // S_LIGHTDONE
-    {SPR_FPCH, 0, 1, A_WeaponReady, S_PUNCHREADY, 0, 0},        // S_PUNCHREADY
-    {SPR_FPCH, 0, 1, A_Lower, S_PUNCHDOWN, 0, 0},       // S_PUNCHDOWN
-    {SPR_FPCH, 0, 1, A_Raise, S_PUNCHUP, 0, 0}, // S_PUNCHUP
-    {SPR_FPCH, 1, 5, NULL, S_PUNCHATK1_2, 5, 40},       // S_PUNCHATK1_1
-    {SPR_FPCH, 2, 4, NULL, S_PUNCHATK1_3, 5, 40},       // S_PUNCHATK1_2
-    {SPR_FPCH, 3, 4, A_FPunchAttack, S_PUNCHATK1_4, 5, 40},     // S_PUNCHATK1_3
-    {SPR_FPCH, 2, 4, NULL, S_PUNCHATK1_5, 5, 40},       // S_PUNCHATK1_4
-    {SPR_FPCH, 1, 5, A_ReFire, S_PUNCHREADY, 5, 40},    // S_PUNCHATK1_5
-    {SPR_FPCH, 3, 4, NULL, S_PUNCHATK2_2, 5, 40},       // S_PUNCHATK2_1
-    {SPR_FPCH, 4, 4, NULL, S_PUNCHATK2_3, 5, 40},       // S_PUNCHATK2_2
-    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_4, 15, 50},      // S_PUNCHATK2_3
-    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_5, 25, 60},      // S_PUNCHATK2_4
-    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_6, 35, 70},      // S_PUNCHATK2_5
-    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_7, 45, 80},      // S_PUNCHATK2_6
-    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_8, 55, 90},      // S_PUNCHATK2_7
-    {SPR_FPCH, 4, 1, NULL, S_PUNCHATK2_9, 65, 100},     // S_PUNCHATK2_8
-    {SPR_FPCH, 4, 10, NULL, S_PUNCHREADY, 0, 150},      // S_PUNCHATK2_9
-    {SPR_FHFX, 18, 4, NULL, S_PUNCHPUFF2, 0, 0},        // S_PUNCHPUFF1
-    {SPR_FHFX, 19, 4, NULL, S_PUNCHPUFF3, 0, 0},        // S_PUNCHPUFF2
-    {SPR_FHFX, 20, 4, NULL, S_PUNCHPUFF4, 0, 0},        // S_PUNCHPUFF3
-    {SPR_FHFX, 21, 4, NULL, S_PUNCHPUFF5, 0, 0},        // S_PUNCHPUFF4
-    {SPR_FHFX, 22, 4, NULL, S_NULL, 0, 0},      // S_PUNCHPUFF5
-    {SPR_WFAX, 0, -1, NULL, S_NULL, 0, 0},      // S_AXE
-    {SPR_FAXE, 0, 1, A_WeaponReady, S_FAXEREADY, 0, 0}, // S_FAXEREADY
-    {SPR_FAXE, 0, 1, A_Lower, S_FAXEDOWN, 0, 0},        // S_FAXEDOWN
-    {SPR_FAXE, 0, 1, A_Raise, S_FAXEUP, 0, 0},  // S_FAXEUP
-    {SPR_FAXE, 1, 4, NULL, S_FAXEATK_2, 15, 32},        // S_FAXEATK_1
-    {SPR_FAXE, 2, 3, NULL, S_FAXEATK_3, 15, 32},        // S_FAXEATK_2
-    {SPR_FAXE, 3, 2, NULL, S_FAXEATK_4, 15, 32},        // S_FAXEATK_3
-    {SPR_FAXE, 3, 1, A_FAxeAttack, S_FAXEATK_5, -5, 70},        // S_FAXEATK_4
-    {SPR_FAXE, 3, 2, NULL, S_FAXEATK_6, -25, 90},       // S_FAXEATK_5
-    {SPR_FAXE, 4, 1, NULL, S_FAXEATK_7, 15, 32},        // S_FAXEATK_6
-    {SPR_FAXE, 4, 2, NULL, S_FAXEATK_8, 10, 54},        // S_FAXEATK_7
-    {SPR_FAXE, 4, 7, NULL, S_FAXEATK_9, 10, 150},       // S_FAXEATK_8
-    {SPR_FAXE, 0, 1, A_ReFire, S_FAXEATK_10, 0, 60},    // S_FAXEATK_9
-    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_11, 0, 52},        // S_FAXEATK_10
-    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_12, 0, 44},        // S_FAXEATK_11
-    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_13, 0, 36},        // S_FAXEATK_12
-    {SPR_FAXE, 0, 1, NULL, S_FAXEREADY, 0, 0},  // S_FAXEATK_13
-    {SPR_FAXE, 11, 1, A_WeaponReady, S_FAXEREADY_G1, 0, 0},     // S_FAXEREADY_G
-    {SPR_FAXE, 11, 1, A_WeaponReady, S_FAXEREADY_G2, 0, 0},     // S_FAXEREADY_G1
-    {SPR_FAXE, 11, 1, A_WeaponReady, S_FAXEREADY_G3, 0, 0},     // S_FAXEREADY_G2
-    {SPR_FAXE, 12, 1, A_WeaponReady, S_FAXEREADY_G4, 0, 0},     // S_FAXEREADY_G3
-    {SPR_FAXE, 12, 1, A_WeaponReady, S_FAXEREADY_G5, 0, 0},     // S_FAXEREADY_G4
-    {SPR_FAXE, 12, 1, A_WeaponReady, S_FAXEREADY_G, 0, 0},      // S_FAXEREADY_G5
-    {SPR_FAXE, 11, 1, A_Lower, S_FAXEDOWN_G, 0, 0},     // S_FAXEDOWN_G
-    {SPR_FAXE, 11, 1, A_Raise, S_FAXEUP_G, 0, 0},       // S_FAXEUP_G
-    {SPR_FAXE, 13, 4, NULL, S_FAXEATK_G2, 15, 32},      // S_FAXEATK_G1
-    {SPR_FAXE, 14, 3, NULL, S_FAXEATK_G3, 15, 32},      // S_FAXEATK_G2
-    {SPR_FAXE, 15, 2, NULL, S_FAXEATK_G4, 15, 32},      // S_FAXEATK_G3
-    {SPR_FAXE, 15, 1, A_FAxeAttack, S_FAXEATK_G5, -5, 70},      // S_FAXEATK_G4
-    {SPR_FAXE, 15, 2, NULL, S_FAXEATK_G6, -25, 90},     // S_FAXEATK_G5
-    {SPR_FAXE, 16, 1, NULL, S_FAXEATK_G7, 15, 32},      // S_FAXEATK_G6
-    {SPR_FAXE, 16, 2, NULL, S_FAXEATK_G8, 10, 54},      // S_FAXEATK_G7
-    {SPR_FAXE, 16, 7, NULL, S_FAXEATK_G9, 10, 150},     // S_FAXEATK_G8
-    {SPR_FAXE, 0, 1, A_ReFire, S_FAXEATK_G10, 0, 60},   // S_FAXEATK_G9
-    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_G11, 0, 52},       // S_FAXEATK_G10
-    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_G12, 0, 44},       // S_FAXEATK_G11
-    {SPR_FAXE, 0, 1, NULL, S_FAXEATK_G13, 0, 36},       // S_FAXEATK_G12
-    {SPR_FAXE, 0, 1, NULL, S_FAXEREADY_G, 0, 0},        // S_FAXEATK_G13
-    {SPR_FAXE, 32785, 4, NULL, S_AXEPUFF_GLOW2, 0, 0},  // S_AXEPUFF_GLOW1
-    {SPR_FAXE, 32786, 4, NULL, S_AXEPUFF_GLOW3, 0, 0},  // S_AXEPUFF_GLOW2
-    {SPR_FAXE, 32787, 4, NULL, S_AXEPUFF_GLOW4, 0, 0},  // S_AXEPUFF_GLOW3
-    {SPR_FAXE, 32788, 4, NULL, S_AXEPUFF_GLOW5, 0, 0},  // S_AXEPUFF_GLOW4
-    {SPR_FAXE, 32789, 4, NULL, S_AXEPUFF_GLOW6, 0, 0},  // S_AXEPUFF_GLOW5
-    {SPR_FAXE, 32790, 4, NULL, S_AXEPUFF_GLOW7, 0, 0},  // S_AXEPUFF_GLOW6
-    {SPR_FAXE, 32791, 4, NULL, S_NULL, 0, 0},   // S_AXEPUFF_GLOW7
-    {SPR_FAXE, 5, 3, NULL, S_AXEBLOOD2, 0, 0},  // S_AXEBLOOD1
-    {SPR_FAXE, 6, 3, NULL, S_AXEBLOOD3, 0, 0},  // S_AXEBLOOD2
-    {SPR_FAXE, 7, 3, NULL, S_AXEBLOOD4, 0, 0},  // S_AXEBLOOD3
-    {SPR_FAXE, 8, 3, NULL, S_AXEBLOOD5, 0, 0},  // S_AXEBLOOD4
-    {SPR_FAXE, 9, 3, NULL, S_AXEBLOOD6, 0, 0},  // S_AXEBLOOD5
-    {SPR_FAXE, 10, 3, NULL, S_NULL, 0, 0},      // S_AXEBLOOD6
-    {SPR_WFHM, 0, -1, NULL, S_NULL, 0, 0},      // S_HAMM
-    {SPR_FHMR, 0, 1, A_WeaponReady, S_FHAMMERREADY, 0, 0},      // S_FHAMMERREADY
-    {SPR_FHMR, 0, 1, A_Lower, S_FHAMMERDOWN, 0, 0},     // S_FHAMMERDOWN
-    {SPR_FHMR, 0, 1, A_Raise, S_FHAMMERUP, 0, 0},       // S_FHAMMERUP
-    {SPR_FHMR, 1, 6, NULL, S_FHAMMERATK_2, 5, 0},       // S_FHAMMERATK_1
-    {SPR_FHMR, 2, 3, A_FHammerAttack, S_FHAMMERATK_3, 5, 0},    // S_FHAMMERATK_2
-    {SPR_FHMR, 3, 3, NULL, S_FHAMMERATK_4, 5, 0},       // S_FHAMMERATK_3
-    {SPR_FHMR, 4, 2, NULL, S_FHAMMERATK_5, 5, 0},       // S_FHAMMERATK_4
-    {SPR_FHMR, 4, 10, A_FHammerThrow, S_FHAMMERATK_6, 5, 150},  // S_FHAMMERATK_5
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_7, 0, 60},      // S_FHAMMERATK_6
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_8, 0, 55},      // S_FHAMMERATK_7
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_9, 0, 50},      // S_FHAMMERATK_8
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_10, 0, 45},     // S_FHAMMERATK_9
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_11, 0, 40},     // S_FHAMMERATK_10
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERATK_12, 0, 35},     // S_FHAMMERATK_11
-    {SPR_FHMR, 0, 1, NULL, S_FHAMMERREADY, 0, 0},       // S_FHAMMERATK_12
-    {SPR_FHFX, 32768, 2, NULL, S_HAMMER_MISSILE_2, 0, 0},       // S_HAMMER_MISSILE_1
-    {SPR_FHFX, 32769, 2, A_ContMobjSound, S_HAMMER_MISSILE_3, 0, 0},    // S_HAMMER_MISSILE_2
-    {SPR_FHFX, 32770, 2, NULL, S_HAMMER_MISSILE_4, 0, 0},       // S_HAMMER_MISSILE_3
-    {SPR_FHFX, 32771, 2, NULL, S_HAMMER_MISSILE_5, 0, 0},       // S_HAMMER_MISSILE_4
-    {SPR_FHFX, 32772, 2, NULL, S_HAMMER_MISSILE_6, 0, 0},       // S_HAMMER_MISSILE_5
-    {SPR_FHFX, 32773, 2, NULL, S_HAMMER_MISSILE_7, 0, 0},       // S_HAMMER_MISSILE_6
-    {SPR_FHFX, 32774, 2, NULL, S_HAMMER_MISSILE_8, 0, 0},       // S_HAMMER_MISSILE_7
-    {SPR_FHFX, 32775, 2, NULL, S_HAMMER_MISSILE_1, 0, 0},       // S_HAMMER_MISSILE_8
-    {SPR_FHFX, 32776, 3, NULL, S_HAMMER_MISSILE_X2, 0, 0},      // S_HAMMER_MISSILE_X1
-    {SPR_FHFX, 32777, 3, NULL, S_HAMMER_MISSILE_X3, 0, 0},      // S_HAMMER_MISSILE_X2
-    {SPR_FHFX, 32778, 3, A_Explode, S_HAMMER_MISSILE_X4, 0, 0}, // S_HAMMER_MISSILE_X3
-    {SPR_FHFX, 32779, 3, NULL, S_HAMMER_MISSILE_X5, 0, 0},      // S_HAMMER_MISSILE_X4
-    {SPR_FHFX, 32780, 3, NULL, S_HAMMER_MISSILE_X6, 0, 0},      // S_HAMMER_MISSILE_X5
-    {SPR_FHFX, 13, 3, NULL, S_HAMMER_MISSILE_X7, 0, 0}, // S_HAMMER_MISSILE_X6
-    {SPR_FHFX, 32782, 3, NULL, S_HAMMER_MISSILE_X8, 0, 0},      // S_HAMMER_MISSILE_X7
-    {SPR_FHFX, 32783, 3, NULL, S_HAMMER_MISSILE_X9, 0, 0},      // S_HAMMER_MISSILE_X8
-    {SPR_FHFX, 32784, 3, NULL, S_HAMMER_MISSILE_X10, 0, 0},     // S_HAMMER_MISSILE_X9
-    {SPR_FHFX, 32785, 3, NULL, S_NULL, 0, 0},   // S_HAMMER_MISSILE_X10
-    {SPR_FHFX, 18, 4, NULL, S_HAMMERPUFF2, 0, 0},       // S_HAMMERPUFF1
-    {SPR_FHFX, 19, 4, NULL, S_HAMMERPUFF3, 0, 0},       // S_HAMMERPUFF2
-    {SPR_FHFX, 20, 4, NULL, S_HAMMERPUFF4, 0, 0},       // S_HAMMERPUFF3
-    {SPR_FHFX, 21, 4, NULL, S_HAMMERPUFF5, 0, 0},       // S_HAMMERPUFF4
-    {SPR_FHFX, 22, 4, NULL, S_NULL, 0, 0},      // S_HAMMERPUFF5
-    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY1, 0, 0},  // S_FSWORDREADY
-    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY2, 0, 0},  // S_FSWORDREADY1
-    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY3, 0, 0},  // S_FSWORDREADY2
-    {SPR_FSRD, 32768, 1, A_WeaponReady, S_FSWORDREADY4, 0, 0},  // S_FSWORDREADY3
-    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY5, 0, 0},  // S_FSWORDREADY4
-    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY6, 0, 0},  // S_FSWORDREADY5
-    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY7, 0, 0},  // S_FSWORDREADY6
-    {SPR_FSRD, 32769, 1, A_WeaponReady, S_FSWORDREADY8, 0, 0},  // S_FSWORDREADY7
-    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY9, 0, 0},  // S_FSWORDREADY8
-    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY10, 0, 0}, // S_FSWORDREADY9
-    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY11, 0, 0}, // S_FSWORDREADY10
-    {SPR_FSRD, 32770, 1, A_WeaponReady, S_FSWORDREADY, 0, 0},   // S_FSWORDREADY11
-    {SPR_FSRD, 32768, 1, A_Lower, S_FSWORDDOWN, 0, 0},  // S_FSWORDDOWN
-    {SPR_FSRD, 32768, 1, A_Raise, S_FSWORDUP, 0, 0},    // S_FSWORDUP
-    {SPR_FSRD, 32771, 3, NULL, S_FSWORDATK_2, 5, 36},   // S_FSWORDATK_1
-    {SPR_FSRD, 32772, 3, NULL, S_FSWORDATK_3, 5, 36},   // S_FSWORDATK_2
-    {SPR_FSRD, 32773, 2, NULL, S_FSWORDATK_4, 5, 36},   // S_FSWORDATK_3
-    {SPR_FSRD, 32774, 3, A_FSwordAttack, S_FSWORDATK_5, 5, 36}, // S_FSWORDATK_4
-    {SPR_FSRD, 32775, 2, NULL, S_FSWORDATK_6, 5, 36},   // S_FSWORDATK_5
-    {SPR_FSRD, 32776, 2, NULL, S_FSWORDATK_7, 5, 36},   // S_FSWORDATK_6
-    {SPR_FSRD, 32776, 10, NULL, S_FSWORDATK_8, 5, 150}, // S_FSWORDATK_7
-    {SPR_FSRD, 32768, 1, NULL, S_FSWORDATK_9, 5, 60},   // S_FSWORDATK_8
-    {SPR_FSRD, 32769, 1, NULL, S_FSWORDATK_10, 5, 55},  // S_FSWORDATK_9
-    {SPR_FSRD, 32770, 1, NULL, S_FSWORDATK_11, 5, 50},  // S_FSWORDATK_10
-    {SPR_FSRD, 32768, 1, NULL, S_FSWORDATK_12, 5, 45},  // S_FSWORDATK_11
-    {SPR_FSRD, 32769, 1, NULL, S_FSWORDREADY, 5, 40},   // S_FSWORDATK_12
-    {SPR_FSFX, 32768, 3, NULL, S_FSWORD_MISSILE2, 0, 0},        // S_FSWORD_MISSILE1
-    {SPR_FSFX, 32769, 3, NULL, S_FSWORD_MISSILE3, 0, 0},        // S_FSWORD_MISSILE2
-    {SPR_FSFX, 32770, 3, NULL, S_FSWORD_MISSILE1, 0, 0},        // S_FSWORD_MISSILE3
-    {SPR_FSFX, 32771, 4, NULL, S_FSWORD_MISSILE_X2, 0, 0},      // S_FSWORD_MISSILE_X1
-    {SPR_FSFX, 32772, 3, A_FSwordFlames, S_FSWORD_MISSILE_X3, 0, 0},    // S_FSWORD_MISSILE_X2
-    {SPR_FSFX, 32773, 4, A_Explode, S_FSWORD_MISSILE_X4, 0, 0}, // S_FSWORD_MISSILE_X3
-    {SPR_FSFX, 32774, 3, NULL, S_FSWORD_MISSILE_X5, 0, 0},      // S_FSWORD_MISSILE_X4
-    {SPR_FSFX, 32775, 4, NULL, S_FSWORD_MISSILE_X6, 0, 0},      // S_FSWORD_MISSILE_X5
-    {SPR_FSFX, 32776, 3, NULL, S_FSWORD_MISSILE_X7, 0, 0},      // S_FSWORD_MISSILE_X6
-    {SPR_FSFX, 32777, 4, NULL, S_FSWORD_MISSILE_X8, 0, 0},      // S_FSWORD_MISSILE_X7
-    {SPR_FSFX, 32778, 3, NULL, S_FSWORD_MISSILE_X9, 0, 0},      // S_FSWORD_MISSILE_X8
-    {SPR_FSFX, 32779, 3, NULL, S_FSWORD_MISSILE_X10, 0, 0},     // S_FSWORD_MISSILE_X9
-    {SPR_FSFX, 32780, 3, NULL, S_NULL, 0, 0},   // S_FSWORD_MISSILE_X10
-    {SPR_FSFX, 32781, 3, NULL, S_FSWORD_FLAME2, 0, 0},  // S_FSWORD_FLAME1
-    {SPR_FSFX, 32782, 3, NULL, S_FSWORD_FLAME3, 0, 0},  // S_FSWORD_FLAME2
-    {SPR_FSFX, 32783, 3, NULL, S_FSWORD_FLAME4, 0, 0},  // S_FSWORD_FLAME3
-    {SPR_FSFX, 32784, 3, NULL, S_FSWORD_FLAME5, 0, 0},  // S_FSWORD_FLAME4
-    {SPR_FSFX, 32785, 3, NULL, S_FSWORD_FLAME6, 0, 0},  // S_FSWORD_FLAME5
-    {SPR_FSFX, 32786, 3, NULL, S_FSWORD_FLAME7, 0, 0},  // S_FSWORD_FLAME6
-    {SPR_FSFX, 32787, 3, NULL, S_FSWORD_FLAME8, 0, 0},  // S_FSWORD_FLAME7
-    {SPR_FSFX, 32788, 3, NULL, S_FSWORD_FLAME9, 0, 0},  // S_FSWORD_FLAME8
-    {SPR_FSFX, 32789, 3, NULL, S_FSWORD_FLAME10, 0, 0}, // S_FSWORD_FLAME9
-    {SPR_FSFX, 32790, 3, NULL, S_NULL, 0, 0},   // S_FSWORD_FLAME10
-    {SPR_CMCE, 0, 1, A_WeaponReady, S_CMACEREADY, 0, 0},        // S_CMACEREADY
-    {SPR_CMCE, 0, 1, A_Lower, S_CMACEDOWN, 0, 0},       // S_CMACEDOWN
-    {SPR_CMCE, 0, 1, A_Raise, S_CMACEUP, 0, 0}, // S_CMACEUP
-    {SPR_CMCE, 1, 2, NULL, S_CMACEATK_2, 60, 20},       // S_CMACEATK_1
-    {SPR_CMCE, 1, 1, NULL, S_CMACEATK_3, 30, 33},       // S_CMACEATK_2
-    {SPR_CMCE, 1, 2, NULL, S_CMACEATK_4, 8, 45},        // S_CMACEATK_3
-    {SPR_CMCE, 2, 1, NULL, S_CMACEATK_5, 8, 45},        // S_CMACEATK_4
-    {SPR_CMCE, 3, 1, NULL, S_CMACEATK_6, 8, 45},        // S_CMACEATK_5
-    {SPR_CMCE, 4, 1, NULL, S_CMACEATK_7, 8, 45},        // S_CMACEATK_6
-    {SPR_CMCE, 4, 1, A_CMaceAttack, S_CMACEATK_8, -11, 58},     // S_CMACEATK_7
-    {SPR_CMCE, 5, 1, NULL, S_CMACEATK_9, 8, 45},        // S_CMACEATK_8
-    {SPR_CMCE, 5, 2, NULL, S_CMACEATK_10, -8, 74},      // S_CMACEATK_9
-    {SPR_CMCE, 5, 1, NULL, S_CMACEATK_11, -20, 96},     // S_CMACEATK_10
-    {SPR_CMCE, 5, 8, NULL, S_CMACEATK_12, -33, 160},    // S_CMACEATK_11
-    {SPR_CMCE, 0, 2, A_ReFire, S_CMACEATK_13, 8, 75},   // S_CMACEATK_12
-    {SPR_CMCE, 0, 1, NULL, S_CMACEATK_14, 8, 65},       // S_CMACEATK_13
-    {SPR_CMCE, 0, 2, NULL, S_CMACEATK_15, 8, 60},       // S_CMACEATK_14
-    {SPR_CMCE, 0, 1, NULL, S_CMACEATK_16, 8, 55},       // S_CMACEATK_15
-    {SPR_CMCE, 0, 2, NULL, S_CMACEATK_17, 8, 50},       // S_CMACEATK_16
-    {SPR_CMCE, 0, 1, NULL, S_CMACEREADY, 8, 45},        // S_CMACEATK_17
-    {SPR_WCSS, 0, -1, NULL, S_NULL, 0, 0},      // S_CSTAFF
-    {SPR_CSSF, 2, 4, NULL, S_CSTAFFREADY1, 0, 0},       // S_CSTAFFREADY
-    {SPR_CSSF, 1, 3, A_CStaffInitBlink, S_CSTAFFREADY2, 0, 0},  // S_CSTAFFREADY1
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY3, 0, 0},      // S_CSTAFFREADY2
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY4, 0, 0},      // S_CSTAFFREADY3
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY5, 0, 0},      // S_CSTAFFREADY4
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY6, 0, 0},      // S_CSTAFFREADY5
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY7, 0, 0},      // S_CSTAFFREADY6
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY8, 0, 0},      // S_CSTAFFREADY7
-    {SPR_CSSF, 0, 1, A_WeaponReady, S_CSTAFFREADY9, 0, 0},      // S_CSTAFFREADY8
-    {SPR_CSSF, 0, 1, A_CStaffCheckBlink, S_CSTAFFREADY2, 0, 0}, // S_CSTAFFREADY9
-    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK2, 0, 0},      // S_CSTAFFBLINK1
-    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK3, 0, 0},      // S_CSTAFFBLINK2
-    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK4, 0, 0},      // S_CSTAFFBLINK3
-    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK5, 0, 0},      // S_CSTAFFBLINK4
-    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK6, 0, 0},      // S_CSTAFFBLINK5
-    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK7, 0, 0},      // S_CSTAFFBLINK6
-    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK8, 0, 0},      // S_CSTAFFBLINK7
-    {SPR_CSSF, 2, 1, A_WeaponReady, S_CSTAFFBLINK9, 0, 0},      // S_CSTAFFBLINK8
-    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK10, 0, 0},     // S_CSTAFFBLINK9
-    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFBLINK11, 0, 0},     // S_CSTAFFBLINK10
-    {SPR_CSSF, 1, 1, A_WeaponReady, S_CSTAFFREADY2, 0, 0},      // S_CSTAFFBLINK11
-    {SPR_CSSF, 1, 3, NULL, S_CSTAFFDOWN2, 0, 0},        // S_CSTAFFDOWN
-    {SPR_CSSF, 2, 4, NULL, S_CSTAFFDOWN3, 0, 0},        // S_CSTAFFDOWN2
-    {SPR_CSSF, 2, 1, A_Lower, S_CSTAFFDOWN3, 0, 0},     // S_CSTAFFDOWN3
-    {SPR_CSSF, 2, 1, A_Raise, S_CSTAFFUP, 0, 0},        // S_CSTAFFUP
-    {SPR_CSSF, 0, 1, A_CStaffCheck, S_CSTAFFATK_2, 0, 45},      // S_CSTAFFATK_1
-    {SPR_CSSF, 9, 1, A_CStaffAttack, S_CSTAFFATK_3, 0, 50},     // S_CSTAFFATK_2
-    {SPR_CSSF, 9, 2, NULL, S_CSTAFFATK_4, 0, 50},       // S_CSTAFFATK_3
-    {SPR_CSSF, 9, 2, NULL, S_CSTAFFATK_5, 0, 45},       // S_CSTAFFATK_4
-    {SPR_CSSF, 0, 2, NULL, S_CSTAFFATK_6, 0, 40},       // S_CSTAFFATK_5
-    {SPR_CSSF, 0, 2, NULL, S_CSTAFFREADY2, 0, 36},      // S_CSTAFFATK_6
-    {SPR_CSSF, 10, 10, NULL, S_CSTAFFREADY2, 0, 36},    // S_CSTAFFATK2_1
-    {SPR_CSSF, 32771, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE2, 0, 0},      // S_CSTAFF_MISSILE1
-    {SPR_CSSF, 32771, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE3, 0, 0},      // S_CSTAFF_MISSILE2
-    {SPR_CSSF, 32772, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE4, 0, 0},      // S_CSTAFF_MISSILE3
-    {SPR_CSSF, 32772, 1, A_CStaffMissileSlither, S_CSTAFF_MISSILE1, 0, 0},      // S_CSTAFF_MISSILE4
-    {SPR_CSSF, 32773, 4, NULL, S_CSTAFF_MISSILE_X2, 0, 0},      // S_CSTAFF_MISSILE_X1
-    {SPR_CSSF, 32774, 4, NULL, S_CSTAFF_MISSILE_X3, 0, 0},      // S_CSTAFF_MISSILE_X2
-    {SPR_CSSF, 32775, 3, NULL, S_CSTAFF_MISSILE_X4, 0, 0},      // S_CSTAFF_MISSILE_X3
-    {SPR_CSSF, 32776, 3, NULL, S_NULL, 0, 0},   // S_CSTAFF_MISSILE_X4
-    {SPR_FHFX, 18, 4, NULL, S_CSTAFFPUFF2, 0, 0},       // S_CSTAFFPUFF1
-    {SPR_FHFX, 19, 4, NULL, S_CSTAFFPUFF3, 0, 0},       // S_CSTAFFPUFF2
-    {SPR_FHFX, 20, 4, NULL, S_CSTAFFPUFF4, 0, 0},       // S_CSTAFFPUFF3
-    {SPR_FHFX, 21, 4, NULL, S_CSTAFFPUFF5, 0, 0},       // S_CSTAFFPUFF4
-    {SPR_FHFX, 22, 4, NULL, S_NULL, 0, 0},      // S_CSTAFFPUFF5
-    {SPR_WCFM, 32768, 4, NULL, S_CFLAME2, 0, 0},        // S_CFLAME1
-    {SPR_WCFM, 32769, 4, NULL, S_CFLAME3, 0, 0},        // S_CFLAME2
-    {SPR_WCFM, 32770, 4, NULL, S_CFLAME4, 0, 0},        // S_CFLAME3
-    {SPR_WCFM, 32771, 4, NULL, S_CFLAME5, 0, 0},        // S_CFLAME4
-    {SPR_WCFM, 32772, 4, NULL, S_CFLAME6, 0, 0},        // S_CFLAME5
-    {SPR_WCFM, 32773, 4, NULL, S_CFLAME7, 0, 0},        // S_CFLAME6
-    {SPR_WCFM, 32774, 4, NULL, S_CFLAME8, 0, 0},        // S_CFLAME7
-    {SPR_WCFM, 32775, 4, NULL, S_CFLAME1, 0, 0},        // S_CFLAME8
-    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY2, 0, 0},      // S_CFLAMEREADY1
-    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY3, 0, 0},      // S_CFLAMEREADY2
-    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY4, 0, 0},      // S_CFLAMEREADY3
-    {SPR_CFLM, 0, 1, A_WeaponReady, S_CFLAMEREADY5, 0, 0},      // S_CFLAMEREADY4
-    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY6, 0, 0},      // S_CFLAMEREADY5
-    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY7, 0, 0},      // S_CFLAMEREADY6
-    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY8, 0, 0},      // S_CFLAMEREADY7
-    {SPR_CFLM, 1, 1, A_WeaponReady, S_CFLAMEREADY9, 0, 0},      // S_CFLAMEREADY8
-    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY10, 0, 0},     // S_CFLAMEREADY9
-    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY11, 0, 0},     // S_CFLAMEREADY10
-    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY12, 0, 0},     // S_CFLAMEREADY11
-    {SPR_CFLM, 2, 1, A_WeaponReady, S_CFLAMEREADY1, 0, 0},      // S_CFLAMEREADY12
-    {SPR_CFLM, 0, 1, A_Lower, S_CFLAMEDOWN, 0, 0},      // S_CFLAMEDOWN
-    {SPR_CFLM, 0, 1, A_Raise, S_CFLAMEUP, 0, 0},        // S_CFLAMEUP
-    {SPR_CFLM, 0, 2, NULL, S_CFLAMEATK_2, 0, 40},       // S_CFLAMEATK_1
-    {SPR_CFLM, 3, 2, NULL, S_CFLAMEATK_3, 0, 50},       // S_CFLAMEATK_2
-    {SPR_CFLM, 3, 2, NULL, S_CFLAMEATK_4, 0, 36},       // S_CFLAMEATK_3
-    {SPR_CFLM, 32772, 4, NULL, S_CFLAMEATK_5, 0, 0},    // S_CFLAMEATK_4
-    {SPR_CFLM, 32773, 4, A_CFlameAttack, S_CFLAMEATK_6, 0, 0},  // S_CFLAMEATK_5
-    {SPR_CFLM, 32772, 4, NULL, S_CFLAMEATK_7, 0, 0},    // S_CFLAMEATK_6
-    {SPR_CFLM, 6, 2, NULL, S_CFLAMEATK_8, 0, 40},       // S_CFLAMEATK_7
-    {SPR_CFLM, 6, 2, NULL, S_CFLAMEREADY1, 0, 0},       // S_CFLAMEATK_8
-    {SPR_CFFX, 32781, 5, NULL, S_CFLAMEFLOOR2, 0, 0},   // S_CFLAMEFLOOR1
-    {SPR_CFFX, 32782, 4, NULL, S_CFLAMEFLOOR3, 0, 0},   // S_CFLAMEFLOOR2
-    {SPR_CFFX, 32783, 3, NULL, S_NULL, 0, 0},   // S_CFLAMEFLOOR3
-    {SPR_CFFX, 32768, 3, NULL, S_FLAMEPUFF2, 0, 0},     // S_FLAMEPUFF1
-    {SPR_CFFX, 32769, 3, NULL, S_FLAMEPUFF3, 0, 0},     // S_FLAMEPUFF2
-    {SPR_CFFX, 32770, 3, NULL, S_FLAMEPUFF4, 0, 0},     // S_FLAMEPUFF3
-    {SPR_CFFX, 32771, 4, NULL, S_FLAMEPUFF5, 0, 0},     // S_FLAMEPUFF4
-    {SPR_CFFX, 32772, 3, NULL, S_FLAMEPUFF6, 0, 0},     // S_FLAMEPUFF5
-    {SPR_CFFX, 32773, 4, NULL, S_FLAMEPUFF7, 0, 0},     // S_FLAMEPUFF6
-    {SPR_CFFX, 32774, 3, NULL, S_FLAMEPUFF8, 0, 0},     // S_FLAMEPUFF7
-    {SPR_CFFX, 32775, 4, NULL, S_FLAMEPUFF9, 0, 0},     // S_FLAMEPUFF8
-    {SPR_CFFX, 32776, 3, NULL, S_FLAMEPUFF10, 0, 0},    // S_FLAMEPUFF9
-    {SPR_CFFX, 32777, 4, NULL, S_FLAMEPUFF11, 0, 0},    // S_FLAMEPUFF10
-    {SPR_CFFX, 32778, 3, NULL, S_FLAMEPUFF12, 0, 0},    // S_FLAMEPUFF11
-    {SPR_CFFX, 32779, 4, NULL, S_FLAMEPUFF13, 0, 0},    // S_FLAMEPUFF12
-    {SPR_CFFX, 32780, 3, NULL, S_NULL, 0, 0},   // S_FLAMEPUFF13
-    {SPR_CFFX, 32768, 3, NULL, S_FLAMEPUFF2_2, 0, 0},   // S_FLAMEPUFF2_1
-    {SPR_CFFX, 32769, 3, NULL, S_FLAMEPUFF2_3, 0, 0},   // S_FLAMEPUFF2_2
-    {SPR_CFFX, 32770, 3, NULL, S_FLAMEPUFF2_4, 0, 0},   // S_FLAMEPUFF2_3
-    {SPR_CFFX, 32771, 4, NULL, S_FLAMEPUFF2_5, 0, 0},   // S_FLAMEPUFF2_4
-    {SPR_CFFX, 32772, 3, NULL, S_FLAMEPUFF2_6, 0, 0},   // S_FLAMEPUFF2_5
-    {SPR_CFFX, 32773, 4, NULL, S_FLAMEPUFF2_7, 0, 0},   // S_FLAMEPUFF2_6
-    {SPR_CFFX, 32774, 3, NULL, S_FLAMEPUFF2_8, 0, 0},   // S_FLAMEPUFF2_7
-    {SPR_CFFX, 32775, 4, NULL, S_FLAMEPUFF2_9, 0, 0},   // S_FLAMEPUFF2_8
-    {SPR_CFFX, 32776, 3, NULL, S_FLAMEPUFF2_10, 0, 0},  // S_FLAMEPUFF2_9
-    {SPR_CFFX, 32770, 3, NULL, S_FLAMEPUFF2_11, 0, 0},  // S_FLAMEPUFF2_10
-    {SPR_CFFX, 32771, 4, NULL, S_FLAMEPUFF2_12, 0, 0},  // S_FLAMEPUFF2_11
-    {SPR_CFFX, 32772, 3, NULL, S_FLAMEPUFF2_13, 0, 0},  // S_FLAMEPUFF2_12
-    {SPR_CFFX, 32773, 4, NULL, S_FLAMEPUFF2_14, 0, 0},  // S_FLAMEPUFF2_13
-    {SPR_CFFX, 32774, 3, NULL, S_FLAMEPUFF2_15, 0, 0},  // S_FLAMEPUFF2_14
-    {SPR_CFFX, 32775, 4, NULL, S_FLAMEPUFF2_16, 0, 0},  // S_FLAMEPUFF2_15
-    {SPR_CFFX, 32776, 3, NULL, S_FLAMEPUFF2_17, 0, 0},  // S_FLAMEPUFF2_16
-    {SPR_CFFX, 32777, 4, NULL, S_FLAMEPUFF2_18, 0, 0},  // S_FLAMEPUFF2_17
-    {SPR_CFFX, 32778, 3, NULL, S_FLAMEPUFF2_19, 0, 0},  // S_FLAMEPUFF2_18
-    {SPR_CFFX, 32779, 4, NULL, S_FLAMEPUFF2_20, 0, 0},  // S_FLAMEPUFF2_19
-    {SPR_CFFX, 32780, 3, NULL, S_NULL, 0, 0},   // S_FLAMEPUFF2_20
-    {SPR_CFCF, 32768, 4, NULL, S_CIRCLE_FLAME2, 0, 0},  // S_CIRCLE_FLAME1
-    {SPR_CFCF, 32769, 2, A_CFlameRotate, S_CIRCLE_FLAME3, 0, 0},        // S_CIRCLE_FLAME2
-    {SPR_CFCF, 32770, 2, NULL, S_CIRCLE_FLAME4, 0, 0},  // S_CIRCLE_FLAME3
-    {SPR_CFCF, 32771, 1, NULL, S_CIRCLE_FLAME5, 0, 0},  // S_CIRCLE_FLAME4
-    {SPR_CFCF, 32772, 2, NULL, S_CIRCLE_FLAME6, 0, 0},  // S_CIRCLE_FLAME5
-    {SPR_CFCF, 32773, 2, A_CFlameRotate, S_CIRCLE_FLAME7, 0, 0},        // S_CIRCLE_FLAME6
-    {SPR_CFCF, 32774, 1, NULL, S_CIRCLE_FLAME8, 0, 0},  // S_CIRCLE_FLAME7
-    {SPR_CFCF, 32775, 2, NULL, S_CIRCLE_FLAME9, 0, 0},  // S_CIRCLE_FLAME8
-    {SPR_CFCF, 32776, 2, NULL, S_CIRCLE_FLAME10, 0, 0}, // S_CIRCLE_FLAME9
-    {SPR_CFCF, 32777, 1, A_CFlameRotate, S_CIRCLE_FLAME11, 0, 0},       // S_CIRCLE_FLAME10
-    {SPR_CFCF, 32778, 2, NULL, S_CIRCLE_FLAME12, 0, 0}, // S_CIRCLE_FLAME11
-    {SPR_CFCF, 32779, 3, NULL, S_CIRCLE_FLAME13, 0, 0}, // S_CIRCLE_FLAME12
-    {SPR_CFCF, 32780, 3, NULL, S_CIRCLE_FLAME14, 0, 0}, // S_CIRCLE_FLAME13
-    {SPR_CFCF, 32781, 2, A_CFlameRotate, S_CIRCLE_FLAME15, 0, 0},       // S_CIRCLE_FLAME14
-    {SPR_CFCF, 32782, 3, NULL, S_CIRCLE_FLAME16, 0, 0}, // S_CIRCLE_FLAME15
-    {SPR_CFCF, 32783, 2, NULL, S_NULL, 0, 0},   // S_CIRCLE_FLAME16
-    {SPR_CFCF, 32784, 3, NULL, S_CIRCLE_FLAME_X2, 0, 0},        // S_CIRCLE_FLAME_X1
-    {SPR_CFCF, 32785, 3, NULL, S_CIRCLE_FLAME_X3, 0, 0},        // S_CIRCLE_FLAME_X2
-    {SPR_CFCF, 32786, 3, A_Explode, S_CIRCLE_FLAME_X4, 0, 0},   // S_CIRCLE_FLAME_X3
-    {SPR_CFCF, 32787, 3, NULL, S_CIRCLE_FLAME_X5, 0, 0},        // S_CIRCLE_FLAME_X4
-    {SPR_CFCF, 32788, 3, NULL, S_CIRCLE_FLAME_X6, 0, 0},        // S_CIRCLE_FLAME_X5
-    {SPR_CFCF, 32789, 3, NULL, S_CIRCLE_FLAME_X7, 0, 0},        // S_CIRCLE_FLAME_X6
-    {SPR_CFCF, 32790, 3, NULL, S_CIRCLE_FLAME_X8, 0, 0},        // S_CIRCLE_FLAME_X7
-    {SPR_CFCF, 32791, 3, NULL, S_CIRCLE_FLAME_X9, 0, 0},        // S_CIRCLE_FLAME_X8
-    {SPR_CFCF, 32792, 3, NULL, S_CIRCLE_FLAME_X10, 0, 0},       // S_CIRCLE_FLAME_X9
-    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_CIRCLE_FLAME_X10
-    {SPR_CFFX, 32768, 4, NULL, S_CFLAME_MISSILE2, 0, 0},        // S_CFLAME_MISSILE1
-    {SPR_CFFX, 0, 1, A_CFlamePuff, S_FLAMEPUFF1, 0, 0}, // S_CFLAME_MISSILE2
-    {SPR_CFFX, 32768, 1, A_CFlameMissile, S_FLAMEPUFF1, 0, 0},  // S_CFLAME_MISSILE_X
-    {SPR_CHLY, 0, 1, A_WeaponReady, S_CHOLYREADY, 0, 0},        // S_CHOLYREADY
-    {SPR_CHLY, 0, 1, A_Lower, S_CHOLYDOWN, 0, 0},       // S_CHOLYDOWN
-    {SPR_CHLY, 0, 1, A_Raise, S_CHOLYUP, 0, 0}, // S_CHOLYUP
-    {SPR_CHLY, 32768, 1, NULL, S_CHOLYATK_2, 0, 40},    // S_CHOLYATK_1
-    {SPR_CHLY, 32769, 1, NULL, S_CHOLYATK_3, 0, 40},    // S_CHOLYATK_2
-    {SPR_CHLY, 32770, 2, NULL, S_CHOLYATK_4, 0, 43},    // S_CHOLYATK_3
-    {SPR_CHLY, 32771, 2, NULL, S_CHOLYATK_5, 0, 43},    // S_CHOLYATK_4
-    {SPR_CHLY, 32772, 2, NULL, S_CHOLYATK_6, 0, 45},    // S_CHOLYATK_5
-    {SPR_CHLY, 32773, 6, A_CHolyAttack, S_CHOLYATK_7, 0, 48},   // S_CHOLYATK_6
-    {SPR_CHLY, 32774, 2, A_CHolyPalette, S_CHOLYATK_8, 0, 40},  // S_CHOLYATK_7
-    {SPR_CHLY, 32774, 2, A_CHolyPalette, S_CHOLYATK_9, 0, 40},  // S_CHOLYATK_8
-    {SPR_CHLY, 32774, 2, A_CHolyPalette, S_CHOLYREADY, 0, 36},  // S_CHOLYATK_9
-    {SPR_SPIR, 0, 2, A_CHolySeek, S_HOLY_FX2, 0, 0},    // S_HOLY_FX1
-    {SPR_SPIR, 0, 2, A_CHolySeek, S_HOLY_FX3, 0, 0},    // S_HOLY_FX2
-    {SPR_SPIR, 1, 2, A_CHolySeek, S_HOLY_FX4, 0, 0},    // S_HOLY_FX3
-    {SPR_SPIR, 1, 2, A_CHolyCheckScream, S_HOLY_FX1, 0, 0},     // S_HOLY_FX4
-    {SPR_SPIR, 3, 4, NULL, S_HOLY_FX_X2, 0, 0}, // S_HOLY_FX_X1
-    {SPR_SPIR, 4, 4, A_Scream, S_HOLY_FX_X3, 0, 0},     // S_HOLY_FX_X2
-    {SPR_SPIR, 5, 4, NULL, S_HOLY_FX_X4, 0, 0}, // S_HOLY_FX_X3
-    {SPR_SPIR, 6, 4, NULL, S_HOLY_FX_X5, 0, 0}, // S_HOLY_FX_X4
-    {SPR_SPIR, 7, 4, NULL, S_HOLY_FX_X6, 0, 0}, // S_HOLY_FX_X5
-    {SPR_SPIR, 8, 4, NULL, S_NULL, 0, 0},       // S_HOLY_FX_X6
-    {SPR_SPIR, 2, 1, A_CHolyTail, S_HOLY_TAIL1, 0, 0},  // S_HOLY_TAIL1
-    {SPR_SPIR, 3, -1, NULL, S_NULL, 0, 0},      // S_HOLY_TAIL2
-    {SPR_SPIR, 10, 3, NULL, S_HOLY_PUFF2, 0, 0},        // S_HOLY_PUFF1
-    {SPR_SPIR, 11, 3, NULL, S_HOLY_PUFF3, 0, 0},        // S_HOLY_PUFF2
-    {SPR_SPIR, 12, 3, NULL, S_HOLY_PUFF4, 0, 0},        // S_HOLY_PUFF3
-    {SPR_SPIR, 13, 3, NULL, S_HOLY_PUFF5, 0, 0},        // S_HOLY_PUFF4
-    {SPR_SPIR, 14, 3, NULL, S_NULL, 0, 0},      // S_HOLY_PUFF5
-    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE2, 0, 0},      // S_HOLY_MISSILE1
-    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE3, 0, 0},      // S_HOLY_MISSILE2
-    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE4, 0, 0},      // S_HOLY_MISSILE3
-    {SPR_SPIR, 32783, 3, A_CHolySpawnPuff, S_HOLY_MISSILE_X, 0, 0},     // S_HOLY_MISSILE4
-    {SPR_SPIR, 32783, 1, A_CHolyAttack2, S_NULL, 0, 0}, // S_HOLY_MISSILE_X
-    {SPR_SPIR, 16, 3, NULL, S_HOLY_MISSILE_P2, 0, 0},   // S_HOLY_MISSILE_P1
-    {SPR_SPIR, 17, 3, NULL, S_HOLY_MISSILE_P3, 0, 0},   // S_HOLY_MISSILE_P2
-    {SPR_SPIR, 18, 3, NULL, S_HOLY_MISSILE_P4, 0, 0},   // S_HOLY_MISSILE_P3
-    {SPR_SPIR, 19, 3, NULL, S_HOLY_MISSILE_P5, 0, 0},   // S_HOLY_MISSILE_P4
-    {SPR_SPIR, 20, 3, NULL, S_NULL, 0, 0},      // S_HOLY_MISSILE_P5
-    {SPR_MWND, 0, 1, A_WeaponReady, S_MWANDREADY, 0, 0},        // S_MWANDREADY
-    {SPR_MWND, 0, 1, A_Lower, S_MWANDDOWN, 0, 0},       // S_MWANDDOWN
-    {SPR_MWND, 0, 1, A_Raise, S_MWANDUP, 0, 0}, // S_MWANDUP
-    {SPR_MWND, 0, 6, NULL, S_MWANDATK_2, 0, 0}, // S_MWANDATK_1
-    {SPR_MWND, 32769, 6, A_MWandAttack, S_MWANDATK_3, 0, 48},   // S_MWANDATK_2
-    {SPR_MWND, 0, 3, NULL, S_MWANDATK_4, 0, 40},        // S_MWANDATK_3
-    {SPR_MWND, 0, 3, A_ReFire, S_MWANDREADY, 0, 36},    // S_MWANDATK_4
-    {SPR_MWND, 32772, 4, NULL, S_MWANDPUFF2, 0, 0},     // S_MWANDPUFF1
-    {SPR_MWND, 32773, 3, NULL, S_MWANDPUFF3, 0, 0},     // S_MWANDPUFF2
-    {SPR_MWND, 32774, 4, NULL, S_MWANDPUFF4, 0, 0},     // S_MWANDPUFF3
-    {SPR_MWND, 32775, 3, NULL, S_MWANDPUFF5, 0, 0},     // S_MWANDPUFF4
-    {SPR_MWND, 32776, 4, NULL, S_NULL, 0, 0},   // S_MWANDPUFF5
-    {SPR_MWND, 2, 4, NULL, S_MWANDSMOKE2, 0, 0},        // S_MWANDSMOKE1
-    {SPR_MWND, 3, 4, NULL, S_MWANDSMOKE3, 0, 0},        // S_MWANDSMOKE2
-    {SPR_MWND, 2, 4, NULL, S_MWANDSMOKE4, 0, 0},        // S_MWANDSMOKE3
-    {SPR_MWND, 3, 4, NULL, S_NULL, 0, 0},       // S_MWANDSMOKE4
-    {SPR_MWND, 32770, 4, NULL, S_MWAND_MISSILE2, 0, 0}, // S_MWAND_MISSILE1
-    {SPR_MWND, 32771, 4, NULL, S_MWAND_MISSILE1, 0, 0}, // S_MWAND_MISSILE2
-    {SPR_WMLG, 32768, 4, NULL, S_MW_LIGHTNING2, 0, 0},  // S_MW_LIGHTNING1
-    {SPR_WMLG, 32769, 4, NULL, S_MW_LIGHTNING3, 0, 0},  // S_MW_LIGHTNING2
-    {SPR_WMLG, 32770, 4, NULL, S_MW_LIGHTNING4, 0, 0},  // S_MW_LIGHTNING3
-    {SPR_WMLG, 32771, 4, NULL, S_MW_LIGHTNING5, 0, 0},  // S_MW_LIGHTNING4
-    {SPR_WMLG, 32772, 4, NULL, S_MW_LIGHTNING6, 0, 0},  // S_MW_LIGHTNING5
-    {SPR_WMLG, 32773, 4, NULL, S_MW_LIGHTNING7, 0, 0},  // S_MW_LIGHTNING6
-    {SPR_WMLG, 32774, 4, NULL, S_MW_LIGHTNING8, 0, 0},  // S_MW_LIGHTNING7
-    {SPR_WMLG, 32775, 4, NULL, S_MW_LIGHTNING1, 0, 0},  // S_MW_LIGHTNING8
-    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY2, 0, 0},      // S_MLIGHTNINGREADY
-    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY3, 0, 0},      // S_MLIGHTNINGREADY2
-    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY4, 0, 0},      // S_MLIGHTNINGREADY3
-    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY5, 0, 0},      // S_MLIGHTNINGREADY4
-    {SPR_MLNG, 32768, 1, A_WeaponReady, S_MLIGHTNINGREADY6, 0, 0},      // S_MLIGHTNINGREADY5
-    {SPR_MLNG, 32768, 1, A_LightningReady, S_MLIGHTNINGREADY7, 0, 0},   // S_MLIGHTNINGREADY6
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY8, 0, 0},      // S_MLIGHTNINGREADY7
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY9, 0, 0},      // S_MLIGHTNINGREADY8
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY10, 0, 0},     // S_MLIGHTNINGREADY9
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY11, 0, 0},     // S_MLIGHTNINGREADY10
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY12, 0, 0},     // S_MLIGHTNINGREADY11
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY13, 0, 0},     // S_MLIGHTNINGREADY12
-    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY14, 0, 0},     // S_MLIGHTNINGREADY13
-    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY15, 0, 0},     // S_MLIGHTNINGREADY14
-    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY16, 0, 0},     // S_MLIGHTNINGREADY15
-    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY17, 0, 0},     // S_MLIGHTNINGREADY16
-    {SPR_MLNG, 32770, 1, A_WeaponReady, S_MLIGHTNINGREADY18, 0, 0},     // S_MLIGHTNINGREADY17
-    {SPR_MLNG, 32770, 1, A_LightningReady, S_MLIGHTNINGREADY19, 0, 0},  // S_MLIGHTNINGREADY18
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY20, 0, 0},     // S_MLIGHTNINGREADY19
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY21, 0, 0},     // S_MLIGHTNINGREADY20
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY22, 0, 0},     // S_MLIGHTNINGREADY21
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY23, 0, 0},     // S_MLIGHTNINGREADY22
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY24, 0, 0},     // S_MLIGHTNINGREADY23
-    {SPR_MLNG, 32769, 1, A_WeaponReady, S_MLIGHTNINGREADY, 0, 0},       // S_MLIGHTNINGREADY24
-    {SPR_MLNG, 32768, 1, A_Lower, S_MLIGHTNINGDOWN, 0, 0},      // S_MLIGHTNINGDOWN
-    {SPR_MLNG, 32768, 1, A_Raise, S_MLIGHTNINGUP, 0, 0},        // S_MLIGHTNINGUP
-    {SPR_MLNG, 32771, 3, NULL, S_MLIGHTNINGATK_2, 0, 0},        // S_MLIGHTNINGATK_1
-    {SPR_MLNG, 32772, 3, NULL, S_MLIGHTNINGATK_3, 0, 0},        // S_MLIGHTNINGATK_2
-    {SPR_MLNG, 32773, 4, A_MLightningAttack, S_MLIGHTNINGATK_4, 0, 0},  // S_MLIGHTNINGATK_3
-    {SPR_MLNG, 32774, 4, NULL, S_MLIGHTNINGATK_5, 0, 0},        // S_MLIGHTNINGATK_4
-    {SPR_MLNG, 32775, 3, NULL, S_MLIGHTNINGATK_6, 0, 0},        // S_MLIGHTNINGATK_5
-    {SPR_MLNG, 32776, 3, NULL, S_MLIGHTNINGATK_7, 0, 0},        // S_MLIGHTNINGATK_6
-    {SPR_MLNG, 32776, 6, NULL, S_MLIGHTNINGATK_8, 0, 199},      // S_MLIGHTNINGATK_7
-    {SPR_MLNG, 32770, 2, NULL, S_MLIGHTNINGATK_9, 0, 55},       // S_MLIGHTNINGATK_8
-    {SPR_MLNG, 32769, 2, NULL, S_MLIGHTNINGATK_10, 0, 50},      // S_MLIGHTNINGATK_9
-    {SPR_MLNG, 32769, 2, NULL, S_MLIGHTNINGATK_11, 0, 45},      // S_MLIGHTNINGATK_10
-    {SPR_MLNG, 32769, 2, NULL, S_MLIGHTNINGREADY, 0, 40},       // S_MLIGHTNINGATK_11
-    {SPR_MLFX, 32768, 2, A_LightningZap, S_LIGHTNING_CEILING2, 0, 0},   // S_LIGHTNING_CEILING1
-    {SPR_MLFX, 32769, 2, A_LightningClip, S_LIGHTNING_CEILING3, 0, 0},  // S_LIGHTNING_CEILING2
-    {SPR_MLFX, 32770, 2, A_LightningClip, S_LIGHTNING_CEILING4, 0, 0},  // S_LIGHTNING_CEILING3
-    {SPR_MLFX, 32771, 2, A_LightningClip, S_LIGHTNING_CEILING1, 0, 0},  // S_LIGHTNING_CEILING4
-    {SPR_MLF2, 32768, 2, A_LightningRemove, S_LIGHTNING_C_X2, 0, 0},    // S_LIGHTNING_C_X1
-    {SPR_MLF2, 32769, 3, NULL, S_LIGHTNING_C_X3, 0, 0}, // S_LIGHTNING_C_X2
-    {SPR_MLF2, 32770, 3, NULL, S_LIGHTNING_C_X4, 0, 0}, // S_LIGHTNING_C_X3
-    {SPR_MLF2, 32771, 3, NULL, S_LIGHTNING_C_X5, 0, 0}, // S_LIGHTNING_C_X4
-    {SPR_MLF2, 32772, 3, NULL, S_LIGHTNING_C_X6, 0, 0}, // S_LIGHTNING_C_X5
-    {SPR_MLF2, 32778, 3, NULL, S_LIGHTNING_C_X7, 0, 0}, // S_LIGHTNING_C_X6
-    {SPR_MLF2, 32779, 3, NULL, S_LIGHTNING_C_X8, 0, 0}, // S_LIGHTNING_C_X7
-    {SPR_MLF2, 32780, 3, NULL, S_LIGHTNING_C_X9, 0, 0}, // S_LIGHTNING_C_X8
-    {SPR_ACLO, 4, 35, NULL, S_LIGHTNING_C_X10, 0, 0},   // S_LIGHTNING_C_X9
-    {SPR_MLF2, 32781, 3, NULL, S_LIGHTNING_C_X11, 0, 0},        // S_LIGHTNING_C_X10
-    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_C_X12, 0, 0},        // S_LIGHTNING_C_X11
-    {SPR_MLF2, 32783, 4, NULL, S_LIGHTNING_C_X13, 0, 0},        // S_LIGHTNING_C_X12
-    {SPR_MLF2, 32784, 3, NULL, S_LIGHTNING_C_X14, 0, 0},        // S_LIGHTNING_C_X13
-    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_C_X15, 0, 0},        // S_LIGHTNING_C_X14
-    {SPR_MLF2, 32784, 4, NULL, S_LIGHTNING_C_X16, 0, 0},        // S_LIGHTNING_C_X15
-    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_C_X17, 0, 0},        // S_LIGHTNING_C_X16
-    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_C_X18, 0, 0},        // S_LIGHTNING_C_X17
-    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_C_X19, 0, 0},        // S_LIGHTNING_C_X18
-    {SPR_MLF2, 32783, 1, A_HideThing, S_FREETARGMOBJ, 0, 0},    // S_LIGHTNING_C_X19
-    {SPR_MLFX, 32772, 2, A_LightningZap, S_LIGHTNING_FLOOR2, 0, 0},     // S_LIGHTNING_FLOOR1
-    {SPR_MLFX, 32773, 2, A_LightningClip, S_LIGHTNING_FLOOR3, 0, 0},    // S_LIGHTNING_FLOOR2
-    {SPR_MLFX, 32774, 2, A_LightningClip, S_LIGHTNING_FLOOR4, 0, 0},    // S_LIGHTNING_FLOOR3
-    {SPR_MLFX, 32775, 2, A_LightningClip, S_LIGHTNING_FLOOR1, 0, 0},    // S_LIGHTNING_FLOOR4
-    {SPR_MLF2, 32773, 2, A_LightningRemove, S_LIGHTNING_F_X2, 0, 0},    // S_LIGHTNING_F_X1
-    {SPR_MLF2, 32774, 3, NULL, S_LIGHTNING_F_X3, 0, 0}, // S_LIGHTNING_F_X2
-    {SPR_MLF2, 32775, 3, NULL, S_LIGHTNING_F_X4, 0, 0}, // S_LIGHTNING_F_X3
-    {SPR_MLF2, 32776, 3, NULL, S_LIGHTNING_F_X5, 0, 0}, // S_LIGHTNING_F_X4
-    {SPR_MLF2, 32777, 3, NULL, S_LIGHTNING_F_X6, 0, 0}, // S_LIGHTNING_F_X5
-    {SPR_MLF2, 32778, 3, NULL, S_LIGHTNING_F_X7, 0, 0}, // S_LIGHTNING_F_X6
-    {SPR_MLF2, 32779, 3, NULL, S_LIGHTNING_F_X8, 0, 0}, // S_LIGHTNING_F_X7
-    {SPR_MLF2, 32780, 3, NULL, S_LIGHTNING_F_X9, 0, 0}, // S_LIGHTNING_F_X8
-    {SPR_ACLO, 4, 20, NULL, S_LIGHTNING_F_X10, 0, 0},   // S_LIGHTNING_F_X9
-    {SPR_MLF2, 32781, 3, NULL, S_LIGHTNING_F_X11, 0, 0},        // S_LIGHTNING_F_X10
-    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_F_X12, 0, 0},        // S_LIGHTNING_F_X11
-    {SPR_MLF2, 32783, 4, NULL, S_LIGHTNING_F_X13, 0, 0},        // S_LIGHTNING_F_X12
-    {SPR_MLF2, 32784, 3, NULL, S_LIGHTNING_F_X14, 0, 0},        // S_LIGHTNING_F_X13
-    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_F_X15, 0, 0},        // S_LIGHTNING_F_X14
-    {SPR_MLF2, 32784, 4, A_LastZap, S_LIGHTNING_F_X16, 0, 0},   // S_LIGHTNING_F_X15
-    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_F_X17, 0, 0},        // S_LIGHTNING_F_X16
-    {SPR_MLF2, 32782, 3, NULL, S_LIGHTNING_F_X18, 0, 0},        // S_LIGHTNING_F_X17
-    {SPR_MLF2, 32783, 3, NULL, S_LIGHTNING_F_X19, 0, 0},        // S_LIGHTNING_F_X18
-    {SPR_MLF2, 32783, 1, A_HideThing, S_FREETARGMOBJ, 0, 0},    // S_LIGHTNING_F_X19
-    {SPR_MLFX, 32776, 2, A_ZapMimic, S_LIGHTNING_ZAP2, 0, 0},   // S_LIGHTNING_ZAP1
-    {SPR_MLFX, 32777, 2, A_ZapMimic, S_LIGHTNING_ZAP3, 0, 0},   // S_LIGHTNING_ZAP2
-    {SPR_MLFX, 32778, 2, A_ZapMimic, S_LIGHTNING_ZAP4, 0, 0},   // S_LIGHTNING_ZAP3
-    {SPR_MLFX, 32779, 2, A_ZapMimic, S_LIGHTNING_ZAP5, 0, 0},   // S_LIGHTNING_ZAP4
-    {SPR_MLFX, 32780, 2, A_ZapMimic, S_LIGHTNING_ZAP1, 0, 0},   // S_LIGHTNING_ZAP5
-    {SPR_MLFX, 32781, 2, NULL, S_LIGHTNING_ZAP_X2, 0, 0},       // S_LIGHTNING_ZAP_X1
-    {SPR_MLFX, 32782, 2, NULL, S_LIGHTNING_ZAP_X3, 0, 0},       // S_LIGHTNING_ZAP_X2
-    {SPR_MLFX, 32783, 2, NULL, S_LIGHTNING_ZAP_X4, 0, 0},       // S_LIGHTNING_ZAP_X3
-    {SPR_MLFX, 32784, 2, NULL, S_LIGHTNING_ZAP_X5, 0, 0},       // S_LIGHTNING_ZAP_X4
-    {SPR_MLFX, 32785, 2, NULL, S_LIGHTNING_ZAP_X6, 0, 0},       // S_LIGHTNING_ZAP_X5
-    {SPR_MLFX, 32786, 2, NULL, S_LIGHTNING_ZAP_X7, 0, 0},       // S_LIGHTNING_ZAP_X6
-    {SPR_MLFX, 32787, 2, NULL, S_LIGHTNING_ZAP_X8, 0, 0},       // S_LIGHTNING_ZAP_X7
-    {SPR_MLFX, 32788, 2, NULL, S_NULL, 0, 0},   // S_LIGHTNING_ZAP_X8
-    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY2, 0, 0},      // S_MSTAFFREADY
-    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY3, 0, 0},      // S_MSTAFFREADY2
-    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY4, 0, 0},      // S_MSTAFFREADY3
-    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY5, 0, 0},      // S_MSTAFFREADY4
-    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY6, 0, 0},      // S_MSTAFFREADY5
-    {SPR_MSTF, 0, 1, A_WeaponReady, S_MSTAFFREADY7, 0, 0},      // S_MSTAFFREADY6
-    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY8, 0, 0},      // S_MSTAFFREADY7
-    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY9, 0, 0},      // S_MSTAFFREADY8
-    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY10, 0, 0},     // S_MSTAFFREADY9
-    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY11, 0, 0},     // S_MSTAFFREADY10
-    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY12, 0, 0},     // S_MSTAFFREADY11
-    {SPR_MSTF, 1, 1, A_WeaponReady, S_MSTAFFREADY13, 0, 0},     // S_MSTAFFREADY12
-    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY14, 0, 0},     // S_MSTAFFREADY13
-    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY15, 0, 0},     // S_MSTAFFREADY14
-    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY16, 0, 0},     // S_MSTAFFREADY15
-    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY17, 0, 0},     // S_MSTAFFREADY16
-    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY18, 0, 0},     // S_MSTAFFREADY17
-    {SPR_MSTF, 2, 1, A_WeaponReady, S_MSTAFFREADY19, 0, 0},     // S_MSTAFFREADY18
-    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY20, 0, 0},     // S_MSTAFFREADY19
-    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY21, 0, 0},     // S_MSTAFFREADY20
-    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY22, 0, 0},     // S_MSTAFFREADY21
-    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY23, 0, 0},     // S_MSTAFFREADY22
-    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY24, 0, 0},     // S_MSTAFFREADY23
-    {SPR_MSTF, 3, 1, A_WeaponReady, S_MSTAFFREADY25, 0, 0},     // S_MSTAFFREADY24
-    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY26, 0, 0},     // S_MSTAFFREADY25
-    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY27, 0, 0},     // S_MSTAFFREADY26
-    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY28, 0, 0},     // S_MSTAFFREADY27
-    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY29, 0, 0},     // S_MSTAFFREADY28
-    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY30, 0, 0},     // S_MSTAFFREADY29
-    {SPR_MSTF, 4, 1, A_WeaponReady, S_MSTAFFREADY31, 0, 0},     // S_MSTAFFREADY30
-    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY32, 0, 0},     // S_MSTAFFREADY31
-    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY33, 0, 0},     // S_MSTAFFREADY32
-    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY34, 0, 0},     // S_MSTAFFREADY33
-    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY35, 0, 0},     // S_MSTAFFREADY34
-    {SPR_MSTF, 5, 1, A_WeaponReady, S_MSTAFFREADY, 0, 0},       // S_MSTAFFREADY35
-    {SPR_MSTF, 0, 1, A_Lower, S_MSTAFFDOWN, 0, 0},      // S_MSTAFFDOWN
-    {SPR_MSTF, 0, 1, A_Raise, S_MSTAFFUP, 0, 0},        // S_MSTAFFUP
-    {SPR_MSTF, 6, 4, NULL, S_MSTAFFATK_2, 0, 40},       // S_MSTAFFATK_1
-    {SPR_MSTF, 32775, 4, A_MStaffAttack, S_MSTAFFATK_3, 0, 48}, // S_MSTAFFATK_2
-    {SPR_MSTF, 32775, 2, A_MStaffPalette, S_MSTAFFATK_4, 0, 48},        // S_MSTAFFATK_3
-    {SPR_MSTF, 8, 2, A_MStaffPalette, S_MSTAFFATK_5, 0, 48},    // S_MSTAFFATK_4
-    {SPR_MSTF, 8, 2, A_MStaffPalette, S_MSTAFFATK_6, 0, 48},    // S_MSTAFFATK_5
-    {SPR_MSTF, 8, 1, NULL, S_MSTAFFATK_7, 0, 40},       // S_MSTAFFATK_6
-    {SPR_MSTF, 9, 5, NULL, S_MSTAFFREADY, 0, 36},       // S_MSTAFFATK_7
-    {SPR_MSP1, 32768, 3, A_MStaffWeave, S_MSTAFF_FX1_2, 0, 0},  // S_MSTAFF_FX1_1
-    {SPR_MSP1, 32769, 3, A_MStaffWeave, S_MSTAFF_FX1_3, 0, 0},  // S_MSTAFF_FX1_2
-    {SPR_MSP1, 32770, 3, A_MStaffWeave, S_MSTAFF_FX1_4, 0, 0},  // S_MSTAFF_FX1_3
-    {SPR_MSP1, 32771, 3, A_MStaffWeave, S_MSTAFF_FX1_5, 0, 0},  // S_MSTAFF_FX1_4
-    {SPR_MSP1, 32772, 3, A_MStaffWeave, S_MSTAFF_FX1_6, 0, 0},  // S_MSTAFF_FX1_5
-    {SPR_MSP1, 32773, 3, A_MStaffWeave, S_MSTAFF_FX1_1, 0, 0},  // S_MSTAFF_FX1_6
-    {SPR_MSP1, 32774, 4, NULL, S_MSTAFF_FX_X2, 0, 0},   // S_MSTAFF_FX_X1
-    {SPR_MSP1, 32775, 5, A_Explode, S_MSTAFF_FX_X3, 0, 0},      // S_MSTAFF_FX_X2
-    {SPR_MSP1, 32776, 4, NULL, S_MSTAFF_FX_X4, 0, 0},   // S_MSTAFF_FX_X3
-    {SPR_MSP1, 32777, 5, NULL, S_MSTAFF_FX_X5, 0, 0},   // S_MSTAFF_FX_X4
-    {SPR_MSP1, 32778, 4, NULL, S_MSTAFF_FX_X6, 0, 0},   // S_MSTAFF_FX_X5
-    {SPR_MSP1, 32779, 5, NULL, S_MSTAFF_FX_X7, 0, 0},   // S_MSTAFF_FX_X6
-    {SPR_MSP1, 32780, 4, NULL, S_MSTAFF_FX_X8, 0, 0},   // S_MSTAFF_FX_X7
-    {SPR_MSP1, 32781, 5, NULL, S_MSTAFF_FX_X9, 0, 0},   // S_MSTAFF_FX_X8
-    {SPR_MSP1, 32782, 4, NULL, S_MSTAFF_FX_X10, 0, 0},  // S_MSTAFF_FX_X9
-    {SPR_MSP1, 32783, 4, NULL, S_NULL, 0, 0},   // S_MSTAFF_FX_X10
-    {SPR_MSP2, 32768, 2, A_MStaffTrack, S_MSTAFF_FX2_2, 0, 0},  // S_MSTAFF_FX2_1
-    {SPR_MSP2, 32769, 2, A_MStaffTrack, S_MSTAFF_FX2_3, 0, 0},  // S_MSTAFF_FX2_2
-    {SPR_MSP2, 32770, 2, A_MStaffTrack, S_MSTAFF_FX2_4, 0, 0},  // S_MSTAFF_FX2_3
-    {SPR_MSP2, 32771, 2, A_MStaffTrack, S_MSTAFF_FX2_1, 0, 0},  // S_MSTAFF_FX2_4
-    {SPR_MSP2, 32772, 4, NULL, S_MSTAFF_FX2_X2, 0, 0},  // S_MSTAFF_FX2_X1
-    {SPR_MSP2, 32773, 5, A_Explode, S_MSTAFF_FX2_X3, 0, 0},     // S_MSTAFF_FX2_X2
-    {SPR_MSP2, 32774, 5, NULL, S_MSTAFF_FX2_X4, 0, 0},  // S_MSTAFF_FX2_X3
-    {SPR_MSP2, 32775, 5, NULL, S_MSTAFF_FX2_X5, 0, 0},  // S_MSTAFF_FX2_X4
-    {SPR_MSP2, 32776, 4, NULL, S_NULL, 0, 0},   // S_MSTAFF_FX2_X5
-    {SPR_WFR1, 32768, -1, NULL, S_NULL, 0, 0},  // S_FSWORD1
-    {SPR_WFR2, 32768, -1, NULL, S_NULL, 0, 0},  // S_FSWORD2
-    {SPR_WFR3, 32768, -1, NULL, S_NULL, 0, 0},  // S_FSWORD3
-    {SPR_WCH1, 32768, -1, NULL, S_NULL, 0, 0},  // S_CHOLY1
-    {SPR_WCH2, 32768, -1, NULL, S_NULL, 0, 0},  // S_CHOLY2
-    {SPR_WCH3, 32768, -1, NULL, S_NULL, 0, 0},  // S_CHOLY3
-    {SPR_WMS1, 32768, -1, NULL, S_NULL, 0, 0},  // S_MSTAFF1
-    {SPR_WMS2, 32768, -1, NULL, S_NULL, 0, 0},  // S_MSTAFF2
-    {SPR_WMS3, 32768, -1, NULL, S_NULL, 0, 0},  // S_MSTAFF3
-    {SPR_WPIG, 0, 1, A_WeaponReady, S_SNOUTREADY, 0, 0},        // S_SNOUTREADY
-    {SPR_WPIG, 0, 1, A_Lower, S_SNOUTDOWN, 0, 0},       // S_SNOUTDOWN
-    {SPR_WPIG, 0, 1, A_Raise, S_SNOUTUP, 0, 0}, // S_SNOUTUP
-    {SPR_WPIG, 0, 4, A_SnoutAttack, S_SNOUTATK2, 0, 0}, // S_SNOUTATK1
-    {SPR_WPIG, 1, 8, A_SnoutAttack, S_SNOUTREADY, 0, 0},        // S_SNOUTATK2
-    {SPR_WMCS, 32768, 8, NULL, S_COS2, 0, 0},   // S_COS1
-    {SPR_WMCS, 32769, 8, NULL, S_COS3, 0, 0},   // S_COS2
-    {SPR_WMCS, 32770, 8, NULL, S_COS1, 0, 0},   // S_COS3
-    {SPR_CONE, 0, 1, A_WeaponReady, S_CONEREADY, 0, 0}, // S_CONEREADY
-    {SPR_CONE, 0, 1, A_Lower, S_CONEDOWN, 0, 0},        // S_CONEDOWN
-    {SPR_CONE, 0, 1, A_Raise, S_CONEUP, 0, 0},  // S_CONEUP
-    {SPR_CONE, 1, 3, NULL, S_CONEATK1_2, 0, 0}, // S_CONEATK1_1
-    {SPR_CONE, 2, 4, NULL, S_CONEATK1_3, 0, 0}, // S_CONEATK1_2
-    {SPR_CONE, 3, 3, NULL, S_CONEATK1_4, 0, 0}, // S_CONEATK1_3
-    {SPR_CONE, 4, 5, NULL, S_CONEATK1_5, 0, 0}, // S_CONEATK1_4
-    {SPR_CONE, 5, 3, A_FireConePL1, S_CONEATK1_6, 0, 0},        // S_CONEATK1_5
-    {SPR_CONE, 6, 3, NULL, S_CONEATK1_7, 0, 0}, // S_CONEATK1_6
-    {SPR_CONE, 0, 9, NULL, S_CONEATK1_8, 0, 0}, // S_CONEATK1_7
-    {SPR_CONE, 0, 10, A_ReFire, S_CONEREADY, 0, 0},     // S_CONEATK1_8
-    {SPR_SHRD, 32768, 2, NULL, S_SHARDFX1_2, 0, 0},     // S_SHARDFX1_1
-    {SPR_SHRD, 32768, 3, A_ShedShard, S_SHARDFX1_3, 0, 0},      // S_SHARDFX1_2
-    {SPR_SHRD, 32769, 3, NULL, S_SHARDFX1_4, 0, 0},     // S_SHARDFX1_3
-    {SPR_SHRD, 32770, 3, NULL, S_SHARDFX1_1, 0, 0},     // S_SHARDFX1_4
-    {SPR_SHEX, 32768, 5, NULL, S_SHARDFXE1_2, 0, 0},    // S_SHARDFXE1_1
-    {SPR_SHEX, 32769, 5, NULL, S_SHARDFXE1_3, 0, 0},    // S_SHARDFXE1_2
-    {SPR_SHEX, 32770, 5, NULL, S_SHARDFXE1_4, 0, 0},    // S_SHARDFXE1_3
-    {SPR_SHEX, 32771, 5, NULL, S_SHARDFXE1_5, 0, 0},    // S_SHARDFXE1_4
-    {SPR_SHEX, 32772, 5, NULL, S_NULL, 0, 0},   // S_SHARDFXE1_5
-    {SPR_BLOD, 2, 8, NULL, S_BLOOD2, 0, 0},     // S_BLOOD1
-    {SPR_BLOD, 1, 8, NULL, S_BLOOD3, 0, 0},     // S_BLOOD2
-    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOOD3
-    {SPR_BLOD, 2, 8, NULL, S_BLOODSPLATTER2, 0, 0},     // S_BLOODSPLATTER1
-    {SPR_BLOD, 1, 8, NULL, S_BLOODSPLATTER3, 0, 0},     // S_BLOODSPLATTER2
-    {SPR_BLOD, 0, 8, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTER3
-    {SPR_BLOD, 0, 6, NULL, S_NULL, 0, 0},       // S_BLOODSPLATTERX
-    {SPR_GIBS, 0, -1, NULL, S_NULL, 0, 0},      // S_GIBS1
-    {SPR_PLAY, 0, -1, NULL, S_NULL, 0, 0},      // S_FPLAY
-    {SPR_PLAY, 0, 4, NULL, S_FPLAY_RUN2, 0, 0}, // S_FPLAY_RUN1
-    {SPR_PLAY, 1, 4, NULL, S_FPLAY_RUN3, 0, 0}, // S_FPLAY_RUN2
-    {SPR_PLAY, 2, 4, NULL, S_FPLAY_RUN4, 0, 0}, // S_FPLAY_RUN3
-    {SPR_PLAY, 3, 4, NULL, S_FPLAY_RUN1, 0, 0}, // S_FPLAY_RUN4
-    {SPR_PLAY, 4, 8, NULL, S_FPLAY_ATK2, 0, 0}, // S_FPLAY_ATK1
-    {SPR_PLAY, 5, 8, NULL, S_FPLAY, 0, 0},      // S_FPLAY_ATK2
-    {SPR_PLAY, 6, 4, NULL, S_FPLAY_PAIN2, 0, 0},        // S_FPLAY_PAIN
-    {SPR_PLAY, 6, 4, A_Pain, S_FPLAY, 0, 0},    // S_FPLAY_PAIN2
-    {SPR_PLAY, 7, 6, NULL, S_FPLAY_DIE2, 0, 0}, // S_FPLAY_DIE1
-    {SPR_PLAY, 8, 6, A_Scream, S_FPLAY_DIE3, 0, 0},     // S_FPLAY_DIE2
-    {SPR_PLAY, 9, 6, NULL, S_FPLAY_DIE4, 0, 0}, // S_FPLAY_DIE3
-    {SPR_PLAY, 10, 6, NULL, S_FPLAY_DIE5, 0, 0},        // S_FPLAY_DIE4
-    {SPR_PLAY, 11, 6, A_NoBlocking, S_FPLAY_DIE6, 0, 0},        // S_FPLAY_DIE5
-    {SPR_PLAY, 12, 6, NULL, S_FPLAY_DIE7, 0, 0},        // S_FPLAY_DIE6
-    {SPR_PLAY, 13, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_FPLAY_DIE7
-    {SPR_PLAY, 14, 5, A_Scream, S_FPLAY_XDIE2, 0, 0},   // S_FPLAY_XDIE1
-    {SPR_PLAY, 15, 5, A_SkullPop, S_FPLAY_XDIE3, 0, 0}, // S_FPLAY_XDIE2
-    {SPR_PLAY, 17, 5, A_NoBlocking, S_FPLAY_XDIE4, 0, 0},       // S_FPLAY_XDIE3
-    {SPR_PLAY, 18, 5, NULL, S_FPLAY_XDIE5, 0, 0},       // S_FPLAY_XDIE4
-    {SPR_PLAY, 19, 5, NULL, S_FPLAY_XDIE6, 0, 0},       // S_FPLAY_XDIE5
-    {SPR_PLAY, 20, 5, NULL, S_FPLAY_XDIE7, 0, 0},       // S_FPLAY_XDIE6
-    {SPR_PLAY, 21, 5, NULL, S_FPLAY_XDIE8, 0, 0},       // S_FPLAY_XDIE7
-    {SPR_PLAY, 22, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_FPLAY_XDIE8
-    {SPR_PLAY, 23, 5, A_FreezeDeath, S_FPLAY_ICE2, 0, 0},       // S_FPLAY_ICE
-    {SPR_PLAY, 23, 1, A_FreezeDeathChunks, S_FPLAY_ICE2, 0, 0}, // S_FPLAY_ICE2
-    {SPR_FDTH, 32768, 5, NULL, S_PLAY_F_FDTH2, 0, 0},   // S_PLAY_F_FDTH1
-    {SPR_FDTH, 32769, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_F_FDTH2
-    {SPR_FDTH, 32770, 5, NULL, S_PLAY_C_FDTH2, 0, 0},   // S_PLAY_C_FDTH1
-    {SPR_FDTH, 32771, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_C_FDTH2
-    {SPR_FDTH, 32772, 5, NULL, S_PLAY_M_FDTH2, 0, 0},   // S_PLAY_M_FDTH1
-    {SPR_FDTH, 32773, 4, NULL, S_PLAY_FDTH3, 0, 0},     // S_PLAY_M_FDTH2
-    {SPR_FDTH, 32774, 5, NULL, S_PLAY_FDTH4, 0, 0},     // S_PLAY_FDTH3
-    {SPR_FDTH, 32775, 4, A_Scream, S_PLAY_FDTH5, 0, 0}, // S_PLAY_FDTH4
-    {SPR_FDTH, 32776, 5, NULL, S_PLAY_FDTH6, 0, 0},     // S_PLAY_FDTH5
-    {SPR_FDTH, 32777, 4, NULL, S_PLAY_FDTH7, 0, 0},     // S_PLAY_FDTH6
-    {SPR_FDTH, 32778, 5, NULL, S_PLAY_FDTH8, 0, 0},     // S_PLAY_FDTH7
-    {SPR_FDTH, 32779, 4, NULL, S_PLAY_FDTH9, 0, 0},     // S_PLAY_FDTH8
-    {SPR_FDTH, 32780, 5, NULL, S_PLAY_FDTH10, 0, 0},    // S_PLAY_FDTH9
-    {SPR_FDTH, 32781, 4, NULL, S_PLAY_FDTH11, 0, 0},    // S_PLAY_FDTH10
-    {SPR_FDTH, 32782, 5, NULL, S_PLAY_FDTH12, 0, 0},    // S_PLAY_FDTH11
-    {SPR_FDTH, 32783, 4, NULL, S_PLAY_FDTH13, 0, 0},    // S_PLAY_FDTH12
-    {SPR_FDTH, 32784, 5, NULL, S_PLAY_FDTH14, 0, 0},    // S_PLAY_FDTH13
-    {SPR_FDTH, 32785, 4, NULL, S_PLAY_FDTH15, 0, 0},    // S_PLAY_FDTH14
-    {SPR_FDTH, 32786, 5, A_NoBlocking, S_PLAY_FDTH16, 0, 0},    // S_PLAY_FDTH15
-    {SPR_FDTH, 32787, 4, NULL, S_PLAY_FDTH17, 0, 0},    // S_PLAY_FDTH16
-    {SPR_FDTH, 32788, 5, NULL, S_PLAY_FDTH18, 0, 0},    // S_PLAY_FDTH17
-    {SPR_FDTH, 32789, 4, NULL, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH18
-    {SPR_ACLO, 4, 35, A_CheckBurnGone, S_PLAY_FDTH19, 0, 0},    // S_PLAY_FDTH19
-    {SPR_ACLO, 4, 8, NULL, S_NULL, 0, 0},       // S_PLAY_FDTH20
-    {SPR_BSKL, 0, 5, A_CheckSkullFloor, S_BLOODYSKULL2, 0, 0},  // S_BLOODYSKULL1
-    {SPR_BSKL, 1, 5, A_CheckSkullFloor, S_BLOODYSKULL3, 0, 0},  // S_BLOODYSKULL2
-    {SPR_BSKL, 2, 5, A_CheckSkullFloor, S_BLOODYSKULL4, 0, 0},  // S_BLOODYSKULL3
-    {SPR_BSKL, 3, 5, A_CheckSkullFloor, S_BLOODYSKULL5, 0, 0},  // S_BLOODYSKULL4
-    {SPR_BSKL, 5, 5, A_CheckSkullFloor, S_BLOODYSKULL6, 0, 0},  // S_BLOODYSKULL5
-    {SPR_BSKL, 6, 5, A_CheckSkullFloor, S_BLOODYSKULL7, 0, 0},  // S_BLOODYSKULL6
-    {SPR_BSKL, 7, 5, A_CheckSkullFloor, S_BLOODYSKULL1, 0, 0},  // S_BLOODYSKULL7
-    {SPR_BSKL, 8, 16, A_CheckSkullDone, S_BLOODYSKULLX1, 0, 0}, // S_BLOODYSKULLX1
-    {SPR_BSKL, 8, 1050, NULL, S_NULL, 0, 0},    // S_BLOODYSKULLX2
-    {SPR_PLAY, 0, 5, NULL, S_PLAYER_SPEED2, 0, 0},      // S_PLAYER_SPEED1
-    {SPR_PLAY, 0, 3, A_SpeedFade, S_NULL, 0, 0},        // S_PLAYER_SPEED2
-    {SPR_ICEC, 0, 10, NULL, S_ICECHUNK2, 0, 0}, // S_ICECHUNK1
-    {SPR_ICEC, 1, 10, A_IceSetTics, S_ICECHUNK3, 0, 0}, // S_ICECHUNK2
-    {SPR_ICEC, 2, 10, A_IceSetTics, S_ICECHUNK4, 0, 0}, // S_ICECHUNK3
-    {SPR_ICEC, 3, 10, A_IceSetTics, S_NULL, 0, 0},      // S_ICECHUNK4
-    {SPR_ICEC, 0, 10, A_IceCheckHeadDone, S_ICECHUNK_HEAD, 0, 0},       // S_ICECHUNK_HEAD
-    {SPR_ICEC, 0, 1050, NULL, S_NULL, 0, 0},    // S_ICECHUNK_HEAD2
-    {SPR_CLER, 0, -1, NULL, S_NULL, 0, 0},      // S_CPLAY
-    {SPR_CLER, 0, 4, NULL, S_CPLAY_RUN2, 0, 0}, // S_CPLAY_RUN1
-    {SPR_CLER, 1, 4, NULL, S_CPLAY_RUN3, 0, 0}, // S_CPLAY_RUN2
-    {SPR_CLER, 2, 4, NULL, S_CPLAY_RUN4, 0, 0}, // S_CPLAY_RUN3
-    {SPR_CLER, 3, 4, NULL, S_CPLAY_RUN1, 0, 0}, // S_CPLAY_RUN4
-    {SPR_CLER, 4, 6, NULL, S_CPLAY_ATK2, 0, 0}, // S_CPLAY_ATK1
-    {SPR_CLER, 5, 6, NULL, S_CPLAY_ATK3, 0, 0}, // S_CPLAY_ATK2
-    {SPR_CLER, 6, 6, NULL, S_CPLAY, 0, 0},      // S_CPLAY_ATK3
-    {SPR_CLER, 7, 4, NULL, S_CPLAY_PAIN2, 0, 0},        // S_CPLAY_PAIN
-    {SPR_CLER, 7, 4, A_Pain, S_CPLAY, 0, 0},    // S_CPLAY_PAIN2
-    {SPR_CLER, 8, 6, NULL, S_CPLAY_DIE2, 0, 0}, // S_CPLAY_DIE1
-    {SPR_CLER, 10, 6, A_Scream, S_CPLAY_DIE3, 0, 0},    // S_CPLAY_DIE2
-    {SPR_CLER, 11, 6, NULL, S_CPLAY_DIE4, 0, 0},        // S_CPLAY_DIE3
-    {SPR_CLER, 11, 6, NULL, S_CPLAY_DIE5, 0, 0},        // S_CPLAY_DIE4
-    {SPR_CLER, 12, 6, A_NoBlocking, S_CPLAY_DIE6, 0, 0},        // S_CPLAY_DIE5
-    {SPR_CLER, 13, 6, NULL, S_CPLAY_DIE7, 0, 0},        // S_CPLAY_DIE6
-    {SPR_CLER, 14, 6, NULL, S_CPLAY_DIE8, 0, 0},        // S_CPLAY_DIE7
-    {SPR_CLER, 15, 6, NULL, S_CPLAY_DIE9, 0, 0},        // S_CPLAY_DIE8
-    {SPR_CLER, 16, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_CPLAY_DIE9
-    {SPR_CLER, 17, 5, A_Scream, S_CPLAY_XDIE2, 0, 0},   // S_CPLAY_XDIE1
-    {SPR_CLER, 18, 5, NULL, S_CPLAY_XDIE3, 0, 0},       // S_CPLAY_XDIE2
-    {SPR_CLER, 19, 5, A_NoBlocking, S_CPLAY_XDIE4, 0, 0},       // S_CPLAY_XDIE3
-    {SPR_CLER, 20, 5, NULL, S_CPLAY_XDIE5, 0, 0},       // S_CPLAY_XDIE4
-    {SPR_CLER, 21, 5, NULL, S_CPLAY_XDIE6, 0, 0},       // S_CPLAY_XDIE5
-    {SPR_CLER, 22, 5, NULL, S_CPLAY_XDIE7, 0, 0},       // S_CPLAY_XDIE6
-    {SPR_CLER, 23, 5, NULL, S_CPLAY_XDIE8, 0, 0},       // S_CPLAY_XDIE7
-    {SPR_CLER, 24, 5, NULL, S_CPLAY_XDIE9, 0, 0},       // S_CPLAY_XDIE8
-    {SPR_CLER, 25, 5, NULL, S_CPLAY_XDIE10, 0, 0},      // S_CPLAY_XDIE9
-    {SPR_CLER, 26, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_CPLAY_XDIE10
-    {SPR_CLER, 27, 5, A_FreezeDeath, S_CPLAY_ICE2, 0, 0},       // S_CPLAY_ICE
-    {SPR_CLER, 27, 1, A_FreezeDeathChunks, S_CPLAY_ICE2, 0, 0}, // S_CPLAY_ICE2
-    {SPR_MAGE, 0, -1, NULL, S_NULL, 0, 0},      // S_MPLAY
-    {SPR_MAGE, 0, 4, NULL, S_MPLAY_RUN2, 0, 0}, // S_MPLAY_RUN1
-    {SPR_MAGE, 1, 4, NULL, S_MPLAY_RUN3, 0, 0}, // S_MPLAY_RUN2
-    {SPR_MAGE, 2, 4, NULL, S_MPLAY_RUN4, 0, 0}, // S_MPLAY_RUN3
-    {SPR_MAGE, 3, 4, NULL, S_MPLAY_RUN1, 0, 0}, // S_MPLAY_RUN4
-    {SPR_MAGE, 4, 8, NULL, S_MPLAY_ATK2, 0, 0}, // S_MPLAY_ATK1
-    {SPR_MAGE, 32773, 8, NULL, S_MPLAY, 0, 0},  // S_MPLAY_ATK2
-    {SPR_MAGE, 6, 4, NULL, S_MPLAY_PAIN2, 0, 0},        // S_MPLAY_PAIN
-    {SPR_MAGE, 6, 4, A_Pain, S_MPLAY, 0, 0},    // S_MPLAY_PAIN2
-    {SPR_MAGE, 7, 6, NULL, S_MPLAY_DIE2, 0, 0}, // S_MPLAY_DIE1
-    {SPR_MAGE, 8, 6, A_Scream, S_MPLAY_DIE3, 0, 0},     // S_MPLAY_DIE2
-    {SPR_MAGE, 9, 6, NULL, S_MPLAY_DIE4, 0, 0}, // S_MPLAY_DIE3
-    {SPR_MAGE, 10, 6, NULL, S_MPLAY_DIE5, 0, 0},        // S_MPLAY_DIE4
-    {SPR_MAGE, 11, 6, A_NoBlocking, S_MPLAY_DIE6, 0, 0},        // S_MPLAY_DIE5
-    {SPR_MAGE, 12, 6, NULL, S_MPLAY_DIE7, 0, 0},        // S_MPLAY_DIE6
-    {SPR_MAGE, 13, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_MPLAY_DIE7
-    {SPR_MAGE, 14, 5, A_Scream, S_MPLAY_XDIE2, 0, 0},   // S_MPLAY_XDIE1
-    {SPR_MAGE, 15, 5, NULL, S_MPLAY_XDIE3, 0, 0},       // S_MPLAY_XDIE2
-    {SPR_MAGE, 17, 5, A_NoBlocking, S_MPLAY_XDIE4, 0, 0},       // S_MPLAY_XDIE3
-    {SPR_MAGE, 18, 5, NULL, S_MPLAY_XDIE5, 0, 0},       // S_MPLAY_XDIE4
-    {SPR_MAGE, 19, 5, NULL, S_MPLAY_XDIE6, 0, 0},       // S_MPLAY_XDIE5
-    {SPR_MAGE, 20, 5, NULL, S_MPLAY_XDIE7, 0, 0},       // S_MPLAY_XDIE6
-    {SPR_MAGE, 21, 5, NULL, S_MPLAY_XDIE8, 0, 0},       // S_MPLAY_XDIE7
-    {SPR_MAGE, 22, 5, NULL, S_MPLAY_XDIE9, 0, 0},       // S_MPLAY_XDIE8
-    {SPR_MAGE, 23, -1, A_AddPlayerCorpse, S_NULL, 0, 0},        // S_MPLAY_XDIE9
-    {SPR_MAGE, 24, 5, A_FreezeDeath, S_MPLAY_ICE2, 0, 0},       // S_MPLAY_ICE
-    {SPR_MAGE, 24, 1, A_FreezeDeathChunks, S_MPLAY_ICE2, 0, 0}, // S_MPLAY_ICE2
-    {SPR_PIGY, 0, -1, NULL, S_NULL, 0, 0},      // S_PIGPLAY
-    {SPR_PIGY, 0, 3, NULL, S_PIGPLAY_RUN2, 0, 0},       // S_PIGPLAY_RUN1
-    {SPR_PIGY, 1, 3, NULL, S_PIGPLAY_RUN3, 0, 0},       // S_PIGPLAY_RUN2
-    {SPR_PIGY, 2, 3, NULL, S_PIGPLAY_RUN4, 0, 0},       // S_PIGPLAY_RUN3
-    {SPR_PIGY, 3, 3, NULL, S_PIGPLAY_RUN1, 0, 0},       // S_PIGPLAY_RUN4
-    {SPR_PIGY, 0, 12, NULL, S_PIGPLAY, 0, 0},   // S_PIGPLAY_ATK1
-    {SPR_PIGY, 3, 4, A_PigPain, S_PIGPLAY, 0, 0},       // S_PIGPLAY_PAIN
-    {SPR_PIGY, 1, 10, A_PigLook, S_PIG_LOOK1, 0, 0},    // S_PIG_LOOK1
-    {SPR_PIGY, 0, 3, A_PigChase, S_PIG_WALK2, 0, 0},    // S_PIG_WALK1
-    {SPR_PIGY, 1, 3, A_PigChase, S_PIG_WALK3, 0, 0},    // S_PIG_WALK2
-    {SPR_PIGY, 2, 3, A_PigChase, S_PIG_WALK4, 0, 0},    // S_PIG_WALK3
-    {SPR_PIGY, 3, 3, A_PigChase, S_PIG_WALK1, 0, 0},    // S_PIG_WALK4
-    {SPR_PIGY, 3, 4, A_PigPain, S_PIG_WALK1, 0, 0},     // S_PIG_PAIN
-    {SPR_PIGY, 0, 5, A_FaceTarget, S_PIG_ATK2, 0, 0},   // S_PIG_ATK1
-    {SPR_PIGY, 0, 10, A_PigAttack, S_PIG_WALK1, 0, 0},  // S_PIG_ATK2
-    {SPR_PIGY, 4, 4, A_Scream, S_PIG_DIE2, 0, 0},       // S_PIG_DIE1
-    {SPR_PIGY, 5, 3, A_NoBlocking, S_PIG_DIE3, 0, 0},   // S_PIG_DIE2
-    {SPR_PIGY, 6, 4, A_QueueCorpse, S_PIG_DIE4, 0, 0},  // S_PIG_DIE3
-    {SPR_PIGY, 7, 3, NULL, S_PIG_DIE5, 0, 0},   // S_PIG_DIE4
-    {SPR_PIGY, 8, 4, NULL, S_PIG_DIE6, 0, 0},   // S_PIG_DIE5
-    {SPR_PIGY, 9, 4, NULL, S_PIG_DIE7, 0, 0},   // S_PIG_DIE6
-    {SPR_PIGY, 10, 4, NULL, S_PIG_DIE8, 0, 0},  // S_PIG_DIE7
-    {SPR_PIGY, 11, -1, NULL, S_NULL, 0, 0},     // S_PIG_DIE8
-    {SPR_PIGY, 12, 5, A_FreezeDeath, S_PIG_ICE2, 0, 0}, // S_PIG_ICE
-    {SPR_PIGY, 12, 1, A_FreezeDeathChunks, S_PIG_ICE2, 0, 0},   // S_PIG_ICE2
-    {SPR_CENT, 0, 10, A_Look, S_CENTAUR_LOOK2, 0, 0},   // S_CENTAUR_LOOK1
-    {SPR_CENT, 1, 10, A_Look, S_CENTAUR_LOOK1, 0, 0},   // S_CENTAUR_LOOK2
-    {SPR_CENT, 0, 4, A_Chase, S_CENTAUR_WALK2, 0, 0},   // S_CENTAUR_WALK1
-    {SPR_CENT, 1, 4, A_Chase, S_CENTAUR_WALK3, 0, 0},   // S_CENTAUR_WALK2
-    {SPR_CENT, 2, 4, A_Chase, S_CENTAUR_WALK4, 0, 0},   // S_CENTAUR_WALK3
-    {SPR_CENT, 3, 4, A_Chase, S_CENTAUR_WALK1, 0, 0},   // S_CENTAUR_WALK4
-    {SPR_CENT, 7, 5, A_FaceTarget, S_CENTAUR_ATK2, 0, 0},       // S_CENTAUR_ATK1
-    {SPR_CENT, 8, 4, A_FaceTarget, S_CENTAUR_ATK3, 0, 0},       // S_CENTAUR_ATK2
-    {SPR_CENT, 9, 7, A_CentaurAttack, S_CENTAUR_WALK1, 0, 0},   // S_CENTAUR_ATK3
-    {SPR_CENT, 4, 10, A_FaceTarget, S_CENTAUR_MISSILE2, 0, 0},  // S_CENTAUR_MISSILE1
-    {SPR_CENT, 32773, 8, A_CentaurAttack2, S_CENTAUR_MISSILE3, 0, 0},   // S_CENTAUR_MISSILE2
-    {SPR_CENT, 4, 10, A_FaceTarget, S_CENTAUR_MISSILE4, 0, 0},  // S_CENTAUR_MISSILE3
-    {SPR_CENT, 32773, 8, A_CentaurAttack2, S_CENTAUR_WALK1, 0, 0},      // S_CENTAUR_MISSILE4
-    {SPR_CENT, 6, 6, A_Pain, S_CENTAUR_PAIN2, 0, 0},    // S_CENTAUR_PAIN1
-    {SPR_CENT, 6, 6, A_SetReflective, S_CENTAUR_PAIN3, 0, 0},   // S_CENTAUR_PAIN2
-    {SPR_CENT, 4, 15, A_CentaurDefend, S_CENTAUR_PAIN4, 0, 0},  // S_CENTAUR_PAIN3
-    {SPR_CENT, 4, 15, A_CentaurDefend, S_CENTAUR_PAIN5, 0, 0},  // S_CENTAUR_PAIN4
-    {SPR_CENT, 4, 15, A_CentaurDefend, S_CENTAUR_PAIN6, 0, 0},  // S_CENTAUR_PAIN5
-    {SPR_CENT, 4, 1, A_UnSetReflective, S_CENTAUR_WALK1, 0, 0}, // S_CENTAUR_PAIN6
-    {SPR_CENT, 10, 4, NULL, S_CENTAUR_DEATH2, 0, 0},    // S_CENTAUR_DEATH1
-    {SPR_CENT, 11, 4, A_Scream, S_CENTAUR_DEATH3, 0, 0},        // S_CENTAUR_DEATH2
-    {SPR_CENT, 12, 4, NULL, S_CENTAUR_DEATH4, 0, 0},    // S_CENTAUR_DEATH3
-    {SPR_CENT, 13, 4, NULL, S_CENTAUR_DEATH5, 0, 0},    // S_CENTAUR_DEATH4
-    {SPR_CENT, 14, 4, A_NoBlocking, S_CENTAUR_DEATH6, 0, 0},    // S_CENTAUR_DEATH5
-    {SPR_CENT, 15, 4, NULL, S_CENTAUR_DEATH7, 0, 0},    // S_CENTAUR_DEATH6
-    {SPR_CENT, 16, 4, NULL, S_CENTAUR_DEATH8, 0, 0},    // S_CENTAUR_DEATH7
-    {SPR_CENT, 17, 4, A_QueueCorpse, S_CENTAUR_DEATH9, 0, 0},   // S_CENTAUR_DEATH8
-    {SPR_CENT, 18, 4, NULL, S_CENTAUR_DEATH0, 0, 0},    // S_CENTAUR_DEATH9
-    {SPR_CENT, 19, -1, NULL, S_NULL, 0, 0},     // S_CENTAUR_DEATH0
-    {SPR_CTXD, 0, 4, NULL, S_CENTAUR_DEATH_X2, 0, 0},   // S_CENTAUR_DEATH_X1
-    {SPR_CTXD, 1, 4, A_NoBlocking, S_CENTAUR_DEATH_X3, 0, 0},   // S_CENTAUR_DEATH_X2
-    {SPR_CTXD, 2, 4, A_CentaurDropStuff, S_CENTAUR_DEATH_X4, 0, 0},     // S_CENTAUR_DEATH_X3
-    {SPR_CTXD, 3, 3, A_Scream, S_CENTAUR_DEATH_X5, 0, 0},       // S_CENTAUR_DEATH_X4
-    {SPR_CTXD, 4, 4, A_QueueCorpse, S_CENTAUR_DEATH_X6, 0, 0},  // S_CENTAUR_DEATH_X5
-    {SPR_CTXD, 5, 3, NULL, S_CENTAUR_DEATH_X7, 0, 0},   // S_CENTAUR_DEATH_X6
-    {SPR_CTXD, 6, 4, NULL, S_CENTAUR_DEATH_X8, 0, 0},   // S_CENTAUR_DEATH_X7
-    {SPR_CTXD, 7, 3, NULL, S_CENTAUR_DEATH_X9, 0, 0},   // S_CENTAUR_DEATH_X8
-    {SPR_CTXD, 8, 4, NULL, S_CENTAUR_DEATH_X10, 0, 0},  // S_CENTAUR_DEATH_X9
-    {SPR_CTXD, 9, 3, NULL, S_CENTAUR_DEATH_X11, 0, 0},  // S_CENTAUR_DEATH_X10
-    {SPR_CTXD, 10, -1, NULL, S_NULL, 0, 0},     // S_CENTAUR_DEATH_X11
-    {SPR_CENT, 20, 5, A_FreezeDeath, S_CENTAUR_ICE2, 0, 0},     // S_CENTAUR_ICE
-    {SPR_CENT, 20, 1, A_FreezeDeathChunks, S_CENTAUR_ICE2, 0, 0},       // S_CENTAUR_ICE2
-    {SPR_CTFX, 32768, -1, NULL, S_NULL, 0, 0},  // S_CENTAUR_FX1
-    {SPR_CTFX, 32769, 4, NULL, S_CENTAUR_FX_X2, 0, 0},  // S_CENTAUR_FX_X1
-    {SPR_CTFX, 32770, 3, NULL, S_CENTAUR_FX_X3, 0, 0},  // S_CENTAUR_FX_X2
-    {SPR_CTFX, 32771, 4, NULL, S_CENTAUR_FX_X4, 0, 0},  // S_CENTAUR_FX_X3
-    {SPR_CTFX, 32772, 3, NULL, S_CENTAUR_FX_X5, 0, 0},  // S_CENTAUR_FX_X4
-    {SPR_CTFX, 32773, 2, NULL, S_NULL, 0, 0},   // S_CENTAUR_FX_X5
-    {SPR_CTDP, 0, 3, A_CheckFloor, S_CENTAUR_SHIELD2, 0, 0},    // S_CENTAUR_SHIELD1
-    {SPR_CTDP, 1, 3, A_CheckFloor, S_CENTAUR_SHIELD3, 0, 0},    // S_CENTAUR_SHIELD2
-    {SPR_CTDP, 2, 3, A_CheckFloor, S_CENTAUR_SHIELD4, 0, 0},    // S_CENTAUR_SHIELD3
-    {SPR_CTDP, 3, 3, A_CheckFloor, S_CENTAUR_SHIELD5, 0, 0},    // S_CENTAUR_SHIELD4
-    {SPR_CTDP, 4, 3, A_CheckFloor, S_CENTAUR_SHIELD6, 0, 0},    // S_CENTAUR_SHIELD5
-    {SPR_CTDP, 5, 3, A_CheckFloor, S_CENTAUR_SHIELD3, 0, 0},    // S_CENTAUR_SHIELD6
-    {SPR_CTDP, 6, 4, NULL, S_CENTAUR_SHIELD_X2, 0, 0},  // S_CENTAUR_SHIELD_X1
-    {SPR_CTDP, 7, 4, A_QueueCorpse, S_CENTAUR_SHIELD_X3, 0, 0}, // S_CENTAUR_SHIELD_X2
-    {SPR_CTDP, 8, 4, NULL, S_CENTAUR_SHIELD_X4, 0, 0},  // S_CENTAUR_SHIELD_X3
-    {SPR_CTDP, 9, -1, NULL, S_NULL, 0, 0},      // S_CENTAUR_SHIELD_X4
-    {SPR_CTDP, 10, 3, A_CheckFloor, S_CENTAUR_SWORD2, 0, 0},    // S_CENTAUR_SWORD1
-    {SPR_CTDP, 11, 3, A_CheckFloor, S_CENTAUR_SWORD3, 0, 0},    // S_CENTAUR_SWORD2
-    {SPR_CTDP, 12, 3, A_CheckFloor, S_CENTAUR_SWORD4, 0, 0},    // S_CENTAUR_SWORD3
-    {SPR_CTDP, 13, 3, A_CheckFloor, S_CENTAUR_SWORD5, 0, 0},    // S_CENTAUR_SWORD4
-    {SPR_CTDP, 14, 3, A_CheckFloor, S_CENTAUR_SWORD6, 0, 0},    // S_CENTAUR_SWORD5
-    {SPR_CTDP, 15, 3, A_CheckFloor, S_CENTAUR_SWORD7, 0, 0},    // S_CENTAUR_SWORD6
-    {SPR_CTDP, 16, 3, A_CheckFloor, S_CENTAUR_SWORD3, 0, 0},    // S_CENTAUR_SWORD7
-    {SPR_CTDP, 17, 4, NULL, S_CENTAUR_SWORD_X2, 0, 0},  // S_CENTAUR_SWORD_X1
-    {SPR_CTDP, 18, 4, A_QueueCorpse, S_CENTAUR_SWORD_X3, 0, 0}, // S_CENTAUR_SWORD_X2
-    {SPR_CTDP, 19, -1, NULL, S_NULL, 0, 0},     // S_CENTAUR_SWORD_X3
-    {SPR_DEMN, 0, 10, A_Look, S_DEMN_LOOK2, 0, 0},      // S_DEMN_LOOK1
-    {SPR_DEMN, 0, 10, A_Look, S_DEMN_LOOK1, 0, 0},      // S_DEMN_LOOK2
-    {SPR_DEMN, 0, 4, A_Chase, S_DEMN_CHASE2, 0, 0},     // S_DEMN_CHASE1
-    {SPR_DEMN, 1, 4, A_Chase, S_DEMN_CHASE3, 0, 0},     // S_DEMN_CHASE2
-    {SPR_DEMN, 2, 4, A_Chase, S_DEMN_CHASE4, 0, 0},     // S_DEMN_CHASE3
-    {SPR_DEMN, 3, 4, A_Chase, S_DEMN_CHASE1, 0, 0},     // S_DEMN_CHASE4
-    {SPR_DEMN, 4, 6, A_FaceTarget, S_DEMN_ATK1_2, 0, 0},        // S_DEMN_ATK1_1
-    {SPR_DEMN, 5, 8, A_FaceTarget, S_DEMN_ATK1_3, 0, 0},        // S_DEMN_ATK1_2
-    {SPR_DEMN, 6, 6, A_DemonAttack1, S_DEMN_CHASE1, 0, 0},      // S_DEMN_ATK1_3
-    {SPR_DEMN, 4, 5, A_FaceTarget, S_DEMN_ATK2_2, 0, 0},        // S_DEMN_ATK2_1
-    {SPR_DEMN, 5, 6, A_FaceTarget, S_DEMN_ATK2_3, 0, 0},        // S_DEMN_ATK2_2
-    {SPR_DEMN, 6, 5, A_DemonAttack2, S_DEMN_CHASE1, 0, 0},      // S_DEMN_ATK2_3
-    {SPR_DEMN, 4, 4, NULL, S_DEMN_PAIN2, 0, 0}, // S_DEMN_PAIN1
-    {SPR_DEMN, 4, 4, A_Pain, S_DEMN_CHASE1, 0, 0},      // S_DEMN_PAIN2
-    {SPR_DEMN, 7, 6, NULL, S_DEMN_DEATH2, 0, 0},        // S_DEMN_DEATH1
-    {SPR_DEMN, 8, 6, NULL, S_DEMN_DEATH3, 0, 0},        // S_DEMN_DEATH2
-    {SPR_DEMN, 9, 6, A_Scream, S_DEMN_DEATH4, 0, 0},    // S_DEMN_DEATH3
-    {SPR_DEMN, 10, 6, A_NoBlocking, S_DEMN_DEATH5, 0, 0},       // S_DEMN_DEATH4
-    {SPR_DEMN, 11, 6, A_QueueCorpse, S_DEMN_DEATH6, 0, 0},      // S_DEMN_DEATH5
-    {SPR_DEMN, 12, 6, NULL, S_DEMN_DEATH7, 0, 0},       // S_DEMN_DEATH6
-    {SPR_DEMN, 13, 6, NULL, S_DEMN_DEATH8, 0, 0},       // S_DEMN_DEATH7
-    {SPR_DEMN, 14, 6, NULL, S_DEMN_DEATH9, 0, 0},       // S_DEMN_DEATH8
-    {SPR_DEMN, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN_DEATH9
-    {SPR_DEMN, 7, 6, NULL, S_DEMN_XDEATH2, 0, 0},       // S_DEMN_XDEATH1
-    {SPR_DEMN, 8, 6, A_DemonDeath, S_DEMN_XDEATH3, 0, 0},       // S_DEMN_XDEATH2
-    {SPR_DEMN, 9, 6, A_Scream, S_DEMN_XDEATH4, 0, 0},   // S_DEMN_XDEATH3
-    {SPR_DEMN, 10, 6, A_NoBlocking, S_DEMN_XDEATH5, 0, 0},      // S_DEMN_XDEATH4
-    {SPR_DEMN, 11, 6, A_QueueCorpse, S_DEMN_XDEATH6, 0, 0},     // S_DEMN_XDEATH5
-    {SPR_DEMN, 12, 6, NULL, S_DEMN_XDEATH7, 0, 0},      // S_DEMN_XDEATH6
-    {SPR_DEMN, 13, 6, NULL, S_DEMN_XDEATH8, 0, 0},      // S_DEMN_XDEATH7
-    {SPR_DEMN, 14, 6, NULL, S_DEMN_XDEATH9, 0, 0},      // S_DEMN_XDEATH8
-    {SPR_DEMN, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN_XDEATH9
-    {SPR_DEMN, 16, 5, A_FreezeDeath, S_DEMON_ICE2, 0, 0},       // S_DEMON_ICE
-    {SPR_DEMN, 16, 1, A_FreezeDeathChunks, S_DEMON_ICE2, 0, 0}, // S_DEMON_ICE2
-    {SPR_DEMA, 0, 4, NULL, S_DEMONCHUNK1_2, 0, 0},      // S_DEMONCHUNK1_1
-    {SPR_DEMA, 0, 10, A_QueueCorpse, S_DEMONCHUNK1_3, 0, 0},    // S_DEMONCHUNK1_2
-    {SPR_DEMA, 0, 20, NULL, S_DEMONCHUNK1_3, 0, 0},     // S_DEMONCHUNK1_3
-    {SPR_DEMA, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK1_4
-    {SPR_DEMB, 0, 4, NULL, S_DEMONCHUNK2_2, 0, 0},      // S_DEMONCHUNK2_1
-    {SPR_DEMB, 0, 10, A_QueueCorpse, S_DEMONCHUNK2_3, 0, 0},    // S_DEMONCHUNK2_2
-    {SPR_DEMB, 0, 20, NULL, S_DEMONCHUNK2_3, 0, 0},     // S_DEMONCHUNK2_3
-    {SPR_DEMB, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK2_4
-    {SPR_DEMC, 0, 4, NULL, S_DEMONCHUNK3_2, 0, 0},      // S_DEMONCHUNK3_1
-    {SPR_DEMC, 0, 10, A_QueueCorpse, S_DEMONCHUNK3_3, 0, 0},    // S_DEMONCHUNK3_2
-    {SPR_DEMC, 0, 20, NULL, S_DEMONCHUNK3_3, 0, 0},     // S_DEMONCHUNK3_3
-    {SPR_DEMC, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK3_4
-    {SPR_DEMD, 0, 4, NULL, S_DEMONCHUNK4_2, 0, 0},      // S_DEMONCHUNK4_1
-    {SPR_DEMD, 0, 10, A_QueueCorpse, S_DEMONCHUNK4_3, 0, 0},    // S_DEMONCHUNK4_2
-    {SPR_DEMD, 0, 20, NULL, S_DEMONCHUNK4_3, 0, 0},     // S_DEMONCHUNK4_3
-    {SPR_DEMD, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK4_4
-    {SPR_DEME, 0, 4, NULL, S_DEMONCHUNK5_2, 0, 0},      // S_DEMONCHUNK5_1
-    {SPR_DEME, 0, 10, A_QueueCorpse, S_DEMONCHUNK5_3, 0, 0},    // S_DEMONCHUNK5_2
-    {SPR_DEME, 0, 20, NULL, S_DEMONCHUNK5_3, 0, 0},     // S_DEMONCHUNK5_3
-    {SPR_DEME, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMONCHUNK5_4
-    {SPR_DMFX, 32768, 4, NULL, S_DEMONFX_MOVE2, 0, 0},  // S_DEMONFX_MOVE1
-    {SPR_DMFX, 32769, 4, NULL, S_DEMONFX_MOVE3, 0, 0},  // S_DEMONFX_MOVE2
-    {SPR_DMFX, 32770, 4, NULL, S_DEMONFX_MOVE1, 0, 0},  // S_DEMONFX_MOVE3
-    {SPR_DMFX, 32771, 4, NULL, S_DEMONFX_BOOM2, 0, 0},  // S_DEMONFX_BOOM1
-    {SPR_DMFX, 32772, 4, NULL, S_DEMONFX_BOOM3, 0, 0},  // S_DEMONFX_BOOM2
-    {SPR_DMFX, 32773, 3, NULL, S_DEMONFX_BOOM4, 0, 0},  // S_DEMONFX_BOOM3
-    {SPR_DMFX, 32774, 3, NULL, S_DEMONFX_BOOM5, 0, 0},  // S_DEMONFX_BOOM4
-    {SPR_DMFX, 32775, 3, NULL, S_NULL, 0, 0},   // S_DEMONFX_BOOM5
-    {SPR_DEM2, 0, 10, A_Look, S_DEMN2_LOOK2, 0, 0},     // S_DEMN2_LOOK1
-    {SPR_DEM2, 0, 10, A_Look, S_DEMN2_LOOK1, 0, 0},     // S_DEMN2_LOOK2
-    {SPR_DEM2, 0, 4, A_Chase, S_DEMN2_CHASE2, 0, 0},    // S_DEMN2_CHASE1
-    {SPR_DEM2, 1, 4, A_Chase, S_DEMN2_CHASE3, 0, 0},    // S_DEMN2_CHASE2
-    {SPR_DEM2, 2, 4, A_Chase, S_DEMN2_CHASE4, 0, 0},    // S_DEMN2_CHASE3
-    {SPR_DEM2, 3, 4, A_Chase, S_DEMN2_CHASE1, 0, 0},    // S_DEMN2_CHASE4
-    {SPR_DEM2, 4, 6, A_FaceTarget, S_DEMN2_ATK1_2, 0, 0},       // S_DEMN2_ATK1_1
-    {SPR_DEM2, 5, 8, A_FaceTarget, S_DEMN2_ATK1_3, 0, 0},       // S_DEMN2_ATK1_2
-    {SPR_DEM2, 6, 6, A_DemonAttack1, S_DEMN2_CHASE1, 0, 0},     // S_DEMN2_ATK1_3
-    {SPR_DEM2, 4, 5, A_FaceTarget, S_DEMN2_ATK2_2, 0, 0},       // S_DEMN2_ATK2_1
-    {SPR_DEM2, 5, 6, A_FaceTarget, S_DEMN2_ATK2_3, 0, 0},       // S_DEMN2_ATK2_2
-    {SPR_DEM2, 6, 5, A_DemonAttack2, S_DEMN2_CHASE1, 0, 0},     // S_DEMN2_ATK2_3
-    {SPR_DEM2, 4, 4, NULL, S_DEMN2_PAIN2, 0, 0},        // S_DEMN2_PAIN1
-    {SPR_DEM2, 4, 4, A_Pain, S_DEMN2_CHASE1, 0, 0},     // S_DEMN2_PAIN2
-    {SPR_DEM2, 7, 6, NULL, S_DEMN2_DEATH2, 0, 0},       // S_DEMN2_DEATH1
-    {SPR_DEM2, 8, 6, NULL, S_DEMN2_DEATH3, 0, 0},       // S_DEMN2_DEATH2
-    {SPR_DEM2, 9, 6, A_Scream, S_DEMN2_DEATH4, 0, 0},   // S_DEMN2_DEATH3
-    {SPR_DEM2, 10, 6, A_NoBlocking, S_DEMN2_DEATH5, 0, 0},      // S_DEMN2_DEATH4
-    {SPR_DEM2, 11, 6, A_QueueCorpse, S_DEMN2_DEATH6, 0, 0},     // S_DEMN2_DEATH5
-    {SPR_DEM2, 12, 6, NULL, S_DEMN2_DEATH7, 0, 0},      // S_DEMN2_DEATH6
-    {SPR_DEM2, 13, 6, NULL, S_DEMN2_DEATH8, 0, 0},      // S_DEMN2_DEATH7
-    {SPR_DEM2, 14, 6, NULL, S_DEMN2_DEATH9, 0, 0},      // S_DEMN2_DEATH8
-    {SPR_DEM2, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN2_DEATH9
-    {SPR_DEM2, 7, 6, NULL, S_DEMN2_XDEATH2, 0, 0},      // S_DEMN2_XDEATH1
-    {SPR_DEM2, 8, 6, A_Demon2Death, S_DEMN2_XDEATH3, 0, 0},     // S_DEMN2_XDEATH2
-    {SPR_DEM2, 9, 6, A_Scream, S_DEMN2_XDEATH4, 0, 0},  // S_DEMN2_XDEATH3
-    {SPR_DEM2, 10, 6, A_NoBlocking, S_DEMN2_XDEATH5, 0, 0},     // S_DEMN2_XDEATH4
-    {SPR_DEM2, 11, 6, A_QueueCorpse, S_DEMN2_XDEATH6, 0, 0},    // S_DEMN2_XDEATH5
-    {SPR_DEM2, 12, 6, NULL, S_DEMN2_XDEATH7, 0, 0},     // S_DEMN2_XDEATH6
-    {SPR_DEM2, 13, 6, NULL, S_DEMN2_XDEATH8, 0, 0},     // S_DEMN2_XDEATH7
-    {SPR_DEM2, 14, 6, NULL, S_DEMN2_XDEATH9, 0, 0},     // S_DEMN2_XDEATH8
-    {SPR_DEM2, 15, -1, NULL, S_NULL, 0, 0},     // S_DEMN2_XDEATH9
-    {SPR_DMBA, 0, 4, NULL, S_DEMON2CHUNK1_2, 0, 0},     // S_DEMON2CHUNK1_1
-    {SPR_DMBA, 0, 10, A_QueueCorpse, S_DEMON2CHUNK1_3, 0, 0},   // S_DEMON2CHUNK1_2
-    {SPR_DMBA, 0, 20, NULL, S_DEMON2CHUNK1_3, 0, 0},    // S_DEMON2CHUNK1_3
-    {SPR_DMBA, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK1_4
-    {SPR_DMBB, 0, 4, NULL, S_DEMON2CHUNK2_2, 0, 0},     // S_DEMON2CHUNK2_1
-    {SPR_DMBB, 0, 10, A_QueueCorpse, S_DEMON2CHUNK2_3, 0, 0},   // S_DEMON2CHUNK2_2
-    {SPR_DMBB, 0, 20, NULL, S_DEMON2CHUNK2_3, 0, 0},    // S_DEMON2CHUNK2_3
-    {SPR_DMBB, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK2_4
-    {SPR_DMBC, 0, 4, NULL, S_DEMON2CHUNK3_2, 0, 0},     // S_DEMON2CHUNK3_1
-    {SPR_DMBC, 0, 10, A_QueueCorpse, S_DEMON2CHUNK3_3, 0, 0},   // S_DEMON2CHUNK3_2
-    {SPR_DMBC, 0, 20, NULL, S_DEMON2CHUNK3_3, 0, 0},    // S_DEMON2CHUNK3_3
-    {SPR_DMBC, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK3_4
-    {SPR_DMBD, 0, 4, NULL, S_DEMON2CHUNK4_2, 0, 0},     // S_DEMON2CHUNK4_1
-    {SPR_DMBD, 0, 10, A_QueueCorpse, S_DEMON2CHUNK4_3, 0, 0},   // S_DEMON2CHUNK4_2
-    {SPR_DMBD, 0, 20, NULL, S_DEMON2CHUNK4_3, 0, 0},    // S_DEMON2CHUNK4_3
-    {SPR_DMBD, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK4_4
-    {SPR_DMBE, 0, 4, NULL, S_DEMON2CHUNK5_2, 0, 0},     // S_DEMON2CHUNK5_1
-    {SPR_DMBE, 0, 10, NULL, S_DEMON2CHUNK5_3, 0, 0},    // S_DEMON2CHUNK5_2
-    {SPR_DMBE, 0, 20, NULL, S_DEMON2CHUNK5_3, 0, 0},    // S_DEMON2CHUNK5_3
-    {SPR_DMBE, 0, -1, NULL, S_NULL, 0, 0},      // S_DEMON2CHUNK5_4
-    {SPR_D2FX, 32768, 4, NULL, S_DEMON2FX_MOVE2, 0, 0}, // S_DEMON2FX_MOVE1
-    {SPR_D2FX, 32769, 4, NULL, S_DEMON2FX_MOVE3, 0, 0}, // S_DEMON2FX_MOVE2
-    {SPR_D2FX, 32770, 4, NULL, S_DEMON2FX_MOVE4, 0, 0}, // S_DEMON2FX_MOVE3
-    {SPR_D2FX, 32771, 4, NULL, S_DEMON2FX_MOVE5, 0, 0}, // S_DEMON2FX_MOVE4
-    {SPR_D2FX, 32772, 4, NULL, S_DEMON2FX_MOVE6, 0, 0}, // S_DEMON2FX_MOVE5
-    {SPR_D2FX, 32773, 4, NULL, S_DEMON2FX_MOVE1, 0, 0}, // S_DEMON2FX_MOVE6
-    {SPR_D2FX, 32774, 4, NULL, S_DEMON2FX_BOOM2, 0, 0}, // S_DEMON2FX_BOOM1
-    {SPR_D2FX, 32775, 4, NULL, S_DEMON2FX_BOOM3, 0, 0}, // S_DEMON2FX_BOOM2
-    {SPR_D2FX, 32776, 4, NULL, S_DEMON2FX_BOOM4, 0, 0}, // S_DEMON2FX_BOOM3
-    {SPR_D2FX, 32777, 4, NULL, S_DEMON2FX_BOOM5, 0, 0}, // S_DEMON2FX_BOOM4
-    {SPR_D2FX, 32778, 3, NULL, S_DEMON2FX_BOOM6, 0, 0}, // S_DEMON2FX_BOOM5
-    {SPR_D2FX, 32779, 3, NULL, S_NULL, 0, 0},   // S_DEMON2FX_BOOM6
-    {SPR_WRTH, 0, 2, A_WraithRaiseInit, S_WRAITH_RAISE2, 0, 0}, // S_WRAITH_RAISE1
-    {SPR_WRTH, 0, 2, A_WraithRaise, S_WRAITH_RAISE3, 0, 0},     // S_WRAITH_RAISE2
-    {SPR_WRTH, 0, 2, A_FaceTarget, S_WRAITH_RAISE4, 0, 0},      // S_WRAITH_RAISE3
-    {SPR_WRTH, 1, 2, A_WraithRaise, S_WRAITH_RAISE5, 0, 0},     // S_WRAITH_RAISE4
-    {SPR_WRTH, 1, 2, A_WraithRaise, S_WRAITH_RAISE2, 0, 0},     // S_WRAITH_RAISE5
-    {SPR_WRTH, 0, 10, NULL, S_WRAITH_INIT2, 0, 0},      // S_WRAITH_INIT1
-    {SPR_WRTH, 1, 5, A_WraithInit, S_WRAITH_LOOK1, 0, 0},       // S_WRAITH_INIT2
-    {SPR_WRTH, 0, 15, A_WraithLook, S_WRAITH_LOOK2, 0, 0},      // S_WRAITH_LOOK1
-    {SPR_WRTH, 1, 15, A_WraithLook, S_WRAITH_LOOK1, 0, 0},      // S_WRAITH_LOOK2
-    {SPR_WRTH, 0, 4, A_WraithChase, S_WRAITH_CHASE2, 0, 0},     // S_WRAITH_CHASE1
-    {SPR_WRTH, 1, 4, A_WraithChase, S_WRAITH_CHASE3, 0, 0},     // S_WRAITH_CHASE2
-    {SPR_WRTH, 2, 4, A_WraithChase, S_WRAITH_CHASE4, 0, 0},     // S_WRAITH_CHASE3
-    {SPR_WRTH, 3, 4, A_WraithChase, S_WRAITH_CHASE1, 0, 0},     // S_WRAITH_CHASE4
-    {SPR_WRTH, 4, 6, A_FaceTarget, S_WRAITH_ATK1_2, 0, 0},      // S_WRAITH_ATK1_1
-    {SPR_WRTH, 5, 6, A_WraithFX3, S_WRAITH_ATK1_3, 0, 0},       // S_WRAITH_ATK1_2
-    {SPR_WRTH, 6, 6, A_WraithMelee, S_WRAITH_CHASE1, 0, 0},     // S_WRAITH_ATK1_3
-    {SPR_WRTH, 4, 6, A_FaceTarget, S_WRAITH_ATK2_2, 0, 0},      // S_WRAITH_ATK2_1
-    {SPR_WRTH, 5, 6, NULL, S_WRAITH_ATK2_3, 0, 0},      // S_WRAITH_ATK2_2
-    {SPR_WRTH, 6, 6, A_WraithMissile, S_WRAITH_CHASE1, 0, 0},   // S_WRAITH_ATK2_3
-    {SPR_WRTH, 0, 2, NULL, S_WRAITH_PAIN2, 0, 0},       // S_WRAITH_PAIN1
-    {SPR_WRTH, 7, 6, A_Pain, S_WRAITH_CHASE1, 0, 0},    // S_WRAITH_PAIN2
-    {SPR_WRTH, 8, 4, NULL, S_WRAITH_DEATH1_2, 0, 0},    // S_WRAITH_DEATH1_1
-    {SPR_WRTH, 9, 4, A_Scream, S_WRAITH_DEATH1_3, 0, 0},        // S_WRAITH_DEATH1_2
-    {SPR_WRTH, 10, 4, NULL, S_WRAITH_DEATH1_4, 0, 0},   // S_WRAITH_DEATH1_3
-    {SPR_WRTH, 11, 4, NULL, S_WRAITH_DEATH1_5, 0, 0},   // S_WRAITH_DEATH1_4
-    {SPR_WRTH, 12, 4, A_NoBlocking, S_WRAITH_DEATH1_6, 0, 0},   // S_WRAITH_DEATH1_5
-    {SPR_WRTH, 13, 4, A_QueueCorpse, S_WRAITH_DEATH1_7, 0, 0},  // S_WRAITH_DEATH1_6
-    {SPR_WRTH, 14, 4, NULL, S_WRAITH_DEATH1_8, 0, 0},   // S_WRAITH_DEATH1_7
-    {SPR_WRTH, 15, 5, NULL, S_WRAITH_DEATH1_9, 0, 0},   // S_WRAITH_DEATH1_8
-    {SPR_WRTH, 16, 5, NULL, S_WRAITH_DEATH1_0, 0, 0},   // S_WRAITH_DEATH1_9
-    {SPR_WRTH, 17, -1, NULL, S_NULL, 0, 0},     // S_WRAITH_DEATH1_0
-    {SPR_WRT2, 0, 5, NULL, S_WRAITH_DEATH2_2, 0, 0},    // S_WRAITH_DEATH2_1
-    {SPR_WRT2, 1, 5, A_Scream, S_WRAITH_DEATH2_3, 0, 0},        // S_WRAITH_DEATH2_2
-    {SPR_WRT2, 2, 5, NULL, S_WRAITH_DEATH2_4, 0, 0},    // S_WRAITH_DEATH2_3
-    {SPR_WRT2, 3, 5, NULL, S_WRAITH_DEATH2_5, 0, 0},    // S_WRAITH_DEATH2_4
-    {SPR_WRT2, 4, 5, A_NoBlocking, S_WRAITH_DEATH2_6, 0, 0},    // S_WRAITH_DEATH2_5
-    {SPR_WRT2, 5, 5, A_QueueCorpse, S_WRAITH_DEATH2_7, 0, 0},   // S_WRAITH_DEATH2_6
-    {SPR_WRT2, 6, 5, NULL, S_WRAITH_DEATH2_8, 0, 0},    // S_WRAITH_DEATH2_7
-    {SPR_WRT2, 7, -1, NULL, S_NULL, 0, 0},      // S_WRAITH_DEATH2_8
-    {SPR_WRT2, 8, 5, A_FreezeDeath, S_WRAITH_ICE2, 0, 0},       // S_WRAITH_ICE
-    {SPR_WRT2, 8, 1, A_FreezeDeathChunks, S_WRAITH_ICE2, 0, 0}, // S_WRAITH_ICE2
-    {SPR_WRBL, 32768, 3, NULL, S_WRTHFX_MOVE2, 0, 0},   // S_WRTHFX_MOVE1
-    {SPR_WRBL, 32769, 3, A_WraithFX2, S_WRTHFX_MOVE3, 0, 0},    // S_WRTHFX_MOVE2
-    {SPR_WRBL, 32770, 3, NULL, S_WRTHFX_MOVE1, 0, 0},   // S_WRTHFX_MOVE3
-    {SPR_WRBL, 32771, 4, NULL, S_WRTHFX_BOOM2, 0, 0},   // S_WRTHFX_BOOM1
-    {SPR_WRBL, 32772, 4, A_WraithFX2, S_WRTHFX_BOOM3, 0, 0},    // S_WRTHFX_BOOM2
-    {SPR_WRBL, 32773, 4, NULL, S_WRTHFX_BOOM4, 0, 0},   // S_WRTHFX_BOOM3
-    {SPR_WRBL, 32774, 3, A_WraithFX2, S_WRTHFX_BOOM5, 0, 0},    // S_WRTHFX_BOOM4
-    {SPR_WRBL, 32775, 3, A_WraithFX2, S_WRTHFX_BOOM6, 0, 0},    // S_WRTHFX_BOOM5
-    {SPR_WRBL, 32776, 3, NULL, S_NULL, 0, 0},   // S_WRTHFX_BOOM6
-    {SPR_WRBL, 32777, 4, NULL, S_WRTHFX_SIZZLE2, 0, 0}, // S_WRTHFX_SIZZLE1
-    {SPR_WRBL, 32778, 4, NULL, S_WRTHFX_SIZZLE3, 0, 0}, // S_WRTHFX_SIZZLE2
-    {SPR_WRBL, 32779, 4, NULL, S_WRTHFX_SIZZLE4, 0, 0}, // S_WRTHFX_SIZZLE3
-    {SPR_WRBL, 32780, 4, NULL, S_WRTHFX_SIZZLE5, 0, 0}, // S_WRTHFX_SIZZLE4
-    {SPR_WRBL, 32781, 4, NULL, S_WRTHFX_SIZZLE6, 0, 0}, // S_WRTHFX_SIZZLE5
-    {SPR_WRBL, 32782, 4, NULL, S_WRTHFX_SIZZLE7, 0, 0}, // S_WRTHFX_SIZZLE6
-    {SPR_WRBL, 32783, 4, NULL, S_NULL, 0, 0},   // S_WRTHFX_SIZZLE7
-    {SPR_WRBL, 32784, 4, NULL, S_WRTHFX_DROP2, 0, 0},   // S_WRTHFX_DROP1
-    {SPR_WRBL, 32785, 4, NULL, S_WRTHFX_DROP3, 0, 0},   // S_WRTHFX_DROP2
-    {SPR_WRBL, 32786, 4, NULL, S_WRTHFX_DROP1, 0, 0},   // S_WRTHFX_DROP3
-    {SPR_WRBL, 32786, 4, NULL, S_NULL, 0, 0},   // S_WRTHFX_DEAD1
-    {SPR_WRBL, 19, 4, NULL, S_WRTHFX_ADROP2, 0, 0},     // S_WRTHFX_ADROP1
-    {SPR_WRBL, 20, 4, NULL, S_WRTHFX_ADROP3, 0, 0},     // S_WRTHFX_ADROP2
-    {SPR_WRBL, 21, 4, NULL, S_WRTHFX_ADROP4, 0, 0},     // S_WRTHFX_ADROP3
-    {SPR_WRBL, 22, 4, NULL, S_WRTHFX_ADROP1, 0, 0},     // S_WRTHFX_ADROP4
-    {SPR_WRBL, 22, 10, NULL, S_NULL, 0, 0},     // S_WRTHFX_ADEAD1
-    {SPR_WRBL, 23, 7, NULL, S_WRTHFX_BDROP2, 0, 0},     // S_WRTHFX_BDROP1
-    {SPR_WRBL, 24, 7, NULL, S_WRTHFX_BDROP3, 0, 0},     // S_WRTHFX_BDROP2
-    {SPR_WRBL, 25, 7, NULL, S_WRTHFX_BDROP1, 0, 0},     // S_WRTHFX_BDROP3
-    {SPR_WRBL, 25, 35, NULL, S_NULL, 0, 0},     // S_WRTHFX_BDEAD1
-    {SPR_MNTR, 0, 15, NULL, S_MNTR_SPAWN2, 0, 0},       // S_MNTR_SPAWN1
-    {SPR_MNTR, 0, 15, A_MinotaurFade1, S_MNTR_SPAWN3, 0, 0},    // S_MNTR_SPAWN2
-    {SPR_MNTR, 0, 3, A_MinotaurFade2, S_MNTR_LOOK1, 0, 0},      // S_MNTR_SPAWN3
-    {SPR_MNTR, 0, 10, A_MinotaurLook, S_MNTR_LOOK2, 0, 0},      // S_MNTR_LOOK1
-    {SPR_MNTR, 1, 10, A_MinotaurLook, S_MNTR_LOOK1, 0, 0},      // S_MNTR_LOOK2
-    {SPR_MNTR, 0, 5, A_MinotaurChase, S_MNTR_WALK2, 0, 0},      // S_MNTR_WALK1
-    {SPR_MNTR, 1, 5, A_MinotaurChase, S_MNTR_WALK3, 0, 0},      // S_MNTR_WALK2
-    {SPR_MNTR, 2, 5, A_MinotaurChase, S_MNTR_WALK4, 0, 0},      // S_MNTR_WALK3
-    {SPR_MNTR, 3, 5, A_MinotaurChase, S_MNTR_WALK1, 0, 0},      // S_MNTR_WALK4
-    {SPR_MNTR, 0, 5, A_MinotaurRoam, S_MNTR_ROAM2, 0, 0},       // S_MNTR_ROAM1
-    {SPR_MNTR, 1, 5, A_MinotaurRoam, S_MNTR_ROAM3, 0, 0},       // S_MNTR_ROAM2
-    {SPR_MNTR, 2, 5, A_MinotaurRoam, S_MNTR_ROAM4, 0, 0},       // S_MNTR_ROAM3
-    {SPR_MNTR, 3, 5, A_MinotaurRoam, S_MNTR_ROAM1, 0, 0},       // S_MNTR_ROAM4
-    {SPR_MNTR, 6, 10, A_FaceTarget, S_MNTR_ATK1_2, 0, 0},       // S_MNTR_ATK1_1
-    {SPR_MNTR, 7, 7, A_FaceTarget, S_MNTR_ATK1_3, 0, 0},        // S_MNTR_ATK1_2
-    {SPR_MNTR, 8, 12, A_MinotaurAtk1, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK1_3
-    {SPR_MNTR, 6, 10, A_MinotaurDecide, S_MNTR_ATK2_2, 0, 0},   // S_MNTR_ATK2_1
-    {SPR_MNTR, 9, 4, A_FaceTarget, S_MNTR_ATK2_3, 0, 0},        // S_MNTR_ATK2_2
-    {SPR_MNTR, 10, 9, A_MinotaurAtk2, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK2_3
-    {SPR_MNTR, 6, 10, A_FaceTarget, S_MNTR_ATK3_2, 0, 0},       // S_MNTR_ATK3_1
-    {SPR_MNTR, 7, 7, A_FaceTarget, S_MNTR_ATK3_3, 0, 0},        // S_MNTR_ATK3_2
-    {SPR_MNTR, 8, 12, A_MinotaurAtk3, S_MNTR_WALK1, 0, 0},      // S_MNTR_ATK3_3
-    {SPR_MNTR, 8, 12, NULL, S_MNTR_ATK3_1, 0, 0},       // S_MNTR_ATK3_4
-    {SPR_MNTR, 5, 2, A_MinotaurCharge, S_MNTR_ATK4_1, 0, 0},    // S_MNTR_ATK4_1
-    {SPR_MNTR, 4, 3, NULL, S_MNTR_PAIN2, 0, 0}, // S_MNTR_PAIN1
-    {SPR_MNTR, 4, 6, A_Pain, S_MNTR_WALK1, 0, 0},       // S_MNTR_PAIN2
-    {SPR_MNTR, 4, 6, NULL, S_MNTR_DIE2, 0, 0},  // S_MNTR_DIE1
-    {SPR_MNTR, 4, 2, A_Scream, S_MNTR_DIE3, 0, 0},      // S_MNTR_DIE2
-    {SPR_MNTR, 4, 5, A_SmokePuffExit, S_MNTR_DIE4, 0, 0},       // S_MNTR_DIE3
-    {SPR_MNTR, 4, 5, NULL, S_MNTR_DIE5, 0, 0},  // S_MNTR_DIE4
-    {SPR_MNTR, 4, 5, A_NoBlocking, S_MNTR_DIE6, 0, 0},  // S_MNTR_DIE5
-    {SPR_MNTR, 4, 5, NULL, S_MNTR_DIE7, 0, 0},  // S_MNTR_DIE6
-    {SPR_MNTR, 4, 5, A_MinotaurFade1, S_MNTR_DIE8, 0, 0},       // S_MNTR_DIE7
-    {SPR_MNTR, 4, 5, A_MinotaurFade0, S_MNTR_DIE9, 0, 0},       // S_MNTR_DIE8
-    {SPR_MNTR, 4, 10, NULL, S_NULL, 0, 0},      // S_MNTR_DIE9
-    {SPR_FX12, 32768, 6, NULL, S_MNTRFX1_2, 0, 0},      // S_MNTRFX1_1
-    {SPR_FX12, 32769, 6, NULL, S_MNTRFX1_1, 0, 0},      // S_MNTRFX1_2
-    {SPR_FX12, 32770, 5, NULL, S_MNTRFXI1_2, 0, 0},     // S_MNTRFXI1_1
-    {SPR_FX12, 32771, 5, NULL, S_MNTRFXI1_3, 0, 0},     // S_MNTRFXI1_2
-    {SPR_FX12, 32772, 5, NULL, S_MNTRFXI1_4, 0, 0},     // S_MNTRFXI1_3
-    {SPR_FX12, 32773, 5, NULL, S_MNTRFXI1_5, 0, 0},     // S_MNTRFXI1_4
-    {SPR_FX12, 32774, 5, NULL, S_MNTRFXI1_6, 0, 0},     // S_MNTRFXI1_5
-    {SPR_FX12, 32775, 5, NULL, S_NULL, 0, 0},   // S_MNTRFXI1_6
-    {SPR_FX13, 0, 2, A_MntrFloorFire, S_MNTRFX2_1, 0, 0},       // S_MNTRFX2_1
-    {SPR_FX13, 32776, 4, A_Explode, S_MNTRFXI2_2, 0, 0},        // S_MNTRFXI2_1
-    {SPR_FX13, 32777, 4, NULL, S_MNTRFXI2_3, 0, 0},     // S_MNTRFXI2_2
-    {SPR_FX13, 32778, 4, NULL, S_MNTRFXI2_4, 0, 0},     // S_MNTRFXI2_3
-    {SPR_FX13, 32779, 4, NULL, S_MNTRFXI2_5, 0, 0},     // S_MNTRFXI2_4
-    {SPR_FX13, 32780, 4, NULL, S_NULL, 0, 0},   // S_MNTRFXI2_5
-    {SPR_FX13, 32771, 4, NULL, S_MNTRFX3_2, 0, 0},      // S_MNTRFX3_1
-    {SPR_FX13, 32770, 4, NULL, S_MNTRFX3_3, 0, 0},      // S_MNTRFX3_2
-    {SPR_FX13, 32769, 5, NULL, S_MNTRFX3_4, 0, 0},      // S_MNTRFX3_3
-    {SPR_FX13, 32770, 5, NULL, S_MNTRFX3_5, 0, 0},      // S_MNTRFX3_4
-    {SPR_FX13, 32771, 5, NULL, S_MNTRFX3_6, 0, 0},      // S_MNTRFX3_5
-    {SPR_FX13, 32772, 5, NULL, S_MNTRFX3_7, 0, 0},      // S_MNTRFX3_6
-    {SPR_FX13, 32773, 4, NULL, S_MNTRFX3_8, 0, 0},      // S_MNTRFX3_7
-    {SPR_FX13, 32774, 4, NULL, S_MNTRFX3_9, 0, 0},      // S_MNTRFX3_8
-    {SPR_FX13, 32775, 4, NULL, S_NULL, 0, 0},   // S_MNTRFX3_9
-    {SPR_MNSM, 0, 3, NULL, S_MINOSMOKE2, 0, 0}, // S_MINOSMOKE1
-    {SPR_MNSM, 1, 3, NULL, S_MINOSMOKE3, 0, 0}, // S_MINOSMOKE2
-    {SPR_MNSM, 2, 3, NULL, S_MINOSMOKE4, 0, 0}, // S_MINOSMOKE3
-    {SPR_MNSM, 3, 3, NULL, S_MINOSMOKE5, 0, 0}, // S_MINOSMOKE4
-    {SPR_MNSM, 4, 3, NULL, S_MINOSMOKE6, 0, 0}, // S_MINOSMOKE5
-    {SPR_MNSM, 5, 3, NULL, S_MINOSMOKE7, 0, 0}, // S_MINOSMOKE6
-    {SPR_MNSM, 6, 3, NULL, S_MINOSMOKE8, 0, 0}, // S_MINOSMOKE7
-    {SPR_MNSM, 7, 3, NULL, S_MINOSMOKE9, 0, 0}, // S_MINOSMOKE8
-    {SPR_MNSM, 8, 3, NULL, S_MINOSMOKE0, 0, 0}, // S_MINOSMOKE9
-    {SPR_MNSM, 9, 3, NULL, S_MINOSMOKEA, 0, 0}, // S_MINOSMOKE0
-    {SPR_MNSM, 10, 3, NULL, S_MINOSMOKEB, 0, 0},        // S_MINOSMOKEA
-    {SPR_MNSM, 11, 3, NULL, S_MINOSMOKEC, 0, 0},        // S_MINOSMOKEB
-    {SPR_MNSM, 12, 3, NULL, S_MINOSMOKED, 0, 0},        // S_MINOSMOKEC
-    {SPR_MNSM, 13, 3, NULL, S_MINOSMOKEE, 0, 0},        // S_MINOSMOKED
-    {SPR_MNSM, 14, 3, NULL, S_MINOSMOKEF, 0, 0},        // S_MINOSMOKEE
-    {SPR_MNSM, 15, 3, NULL, S_MINOSMOKEG, 0, 0},        // S_MINOSMOKEF
-    {SPR_MNSM, 16, 3, NULL, S_NULL, 0, 0},      // S_MINOSMOKEG
-    {SPR_MNSM, 0, 3, NULL, S_MINOSMOKEX2, 0, 0},        // S_MINOSMOKEX1
-    {SPR_MNSM, 1, 3, NULL, S_MINOSMOKEX3, 0, 0},        // S_MINOSMOKEX2
-    {SPR_MNSM, 2, 3, NULL, S_MINOSMOKEX4, 0, 0},        // S_MINOSMOKEX3
-    {SPR_MNSM, 3, 3, NULL, S_MINOSMOKEX5, 0, 0},        // S_MINOSMOKEX4
-    {SPR_MNSM, 4, 3, NULL, S_MINOSMOKEX6, 0, 0},        // S_MINOSMOKEX5
-    {SPR_MNSM, 5, 3, NULL, S_MINOSMOKEX7, 0, 0},        // S_MINOSMOKEX6
-    {SPR_MNSM, 6, 3, NULL, S_MINOSMOKEX8, 0, 0},        // S_MINOSMOKEX7
-    {SPR_MNSM, 7, 3, NULL, S_MINOSMOKEX9, 0, 0},        // S_MINOSMOKEX8
-    {SPR_MNSM, 8, 3, NULL, S_MINOSMOKEX0, 0, 0},        // S_MINOSMOKEX9
-    {SPR_MNSM, 9, 3, NULL, S_MINOSMOKEXA, 0, 0},        // S_MINOSMOKEX0
-    {SPR_MNSM, 8, 3, NULL, S_MINOSMOKEXB, 0, 0},        // S_MINOSMOKEXA
-    {SPR_MNSM, 7, 3, NULL, S_MINOSMOKEXC, 0, 0},        // S_MINOSMOKEXB
-    {SPR_MNSM, 6, 3, NULL, S_MINOSMOKEXD, 0, 0},        // S_MINOSMOKEXC
-    {SPR_MNSM, 5, 3, NULL, S_MINOSMOKEXE, 0, 0},        // S_MINOSMOKEXD
-    {SPR_MNSM, 4, 3, NULL, S_MINOSMOKEXF, 0, 0},        // S_MINOSMOKEXE
-    {SPR_MNSM, 3, 3, NULL, S_MINOSMOKEXG, 0, 0},        // S_MINOSMOKEXF
-    {SPR_MNSM, 2, 3, NULL, S_MINOSMOKEXH, 0, 0},        // S_MINOSMOKEXG
-    {SPR_MNSM, 1, 3, NULL, S_MINOSMOKEXI, 0, 0},        // S_MINOSMOKEXH
-    {SPR_MNSM, 0, 3, NULL, S_NULL, 0, 0},       // S_MINOSMOKEXI
-    {SPR_SSPT, 7, 10, A_Look, S_SERPENT_LOOK1, 0, 0},   // S_SERPENT_LOOK1
-    {SPR_SSPT, 7, 1, A_SerpentChase, S_SERPENT_SWIM2, 0, 0},    // S_SERPENT_SWIM1
-    {SPR_SSPT, 7, 1, A_SerpentChase, S_SERPENT_SWIM3, 0, 0},    // S_SERPENT_SWIM2
-    {SPR_SSPT, 7, 2, A_SerpentHumpDecide, S_SERPENT_SWIM1, 0, 0},       // S_SERPENT_SWIM3
-    {SPR_SSPT, 7, 3, A_SerpentUnHide, S_SERPENT_HUMP2, 0, 0},   // S_SERPENT_HUMP1
-    {SPR_SSPT, 4, 3, A_SerpentRaiseHump, S_SERPENT_HUMP3, 0, 0},        // S_SERPENT_HUMP2
-    {SPR_SSPT, 5, 3, A_SerpentRaiseHump, S_SERPENT_HUMP4, 0, 0},        // S_SERPENT_HUMP3
-    {SPR_SSPT, 6, 3, A_SerpentRaiseHump, S_SERPENT_HUMP5, 0, 0},        // S_SERPENT_HUMP4
-    {SPR_SSPT, 4, 3, A_SerpentRaiseHump, S_SERPENT_HUMP6, 0, 0},        // S_SERPENT_HUMP5
-    {SPR_SSPT, 5, 3, A_SerpentRaiseHump, S_SERPENT_HUMP7, 0, 0},        // S_SERPENT_HUMP6
-    {SPR_SSPT, 6, 3, NULL, S_SERPENT_HUMP8, 0, 0},      // S_SERPENT_HUMP7
-    {SPR_SSPT, 4, 3, NULL, S_SERPENT_HUMP9, 0, 0},      // S_SERPENT_HUMP8
-    {SPR_SSPT, 5, 3, NULL, S_SERPENT_HUMP10, 0, 0},     // S_SERPENT_HUMP9
-    {SPR_SSPT, 6, 3, A_SerpentLowerHump, S_SERPENT_HUMP11, 0, 0},       // S_SERPENT_HUMP10
-    {SPR_SSPT, 4, 3, A_SerpentLowerHump, S_SERPENT_HUMP12, 0, 0},       // S_SERPENT_HUMP11
-    {SPR_SSPT, 5, 3, A_SerpentLowerHump, S_SERPENT_HUMP13, 0, 0},       // S_SERPENT_HUMP12
-    {SPR_SSPT, 6, 3, A_SerpentLowerHump, S_SERPENT_HUMP14, 0, 0},       // S_SERPENT_HUMP13
-    {SPR_SSPT, 4, 3, A_SerpentLowerHump, S_SERPENT_HUMP15, 0, 0},       // S_SERPENT_HUMP14
-    {SPR_SSPT, 5, 3, A_SerpentHide, S_SERPENT_SWIM1, 0, 0},     // S_SERPENT_HUMP15
-    {SPR_SSPT, 0, 1, A_UnHideThing, S_SERPENT_SURFACE2, 0, 0},  // S_SERPENT_SURFACE1
-    {SPR_SSPT, 0, 1, A_SerpentBirthScream, S_SERPENT_SURFACE3, 0, 0},   // S_SERPENT_SURFACE2
-    {SPR_SSPT, 1, 3, A_SetShootable, S_SERPENT_SURFACE4, 0, 0}, // S_SERPENT_SURFACE3
-    {SPR_SSPT, 2, 3, NULL, S_SERPENT_SURFACE5, 0, 0},   // S_SERPENT_SURFACE4
-    {SPR_SSPT, 3, 4, A_SerpentCheckForAttack, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_SURFACE5
-    {SPR_SSDV, 0, 4, NULL, S_SERPENT_DIVE2, 0, 0},      // S_SERPENT_DIVE1
-    {SPR_SSDV, 1, 4, NULL, S_SERPENT_DIVE3, 0, 0},      // S_SERPENT_DIVE2
-    {SPR_SSDV, 2, 4, NULL, S_SERPENT_DIVE4, 0, 0},      // S_SERPENT_DIVE3
-    {SPR_SSDV, 3, 4, A_UnSetShootable, S_SERPENT_DIVE5, 0, 0},  // S_SERPENT_DIVE4
-    {SPR_SSDV, 4, 3, A_SerpentDiveSound, S_SERPENT_DIVE6, 0, 0},        // S_SERPENT_DIVE5
-    {SPR_SSDV, 5, 3, NULL, S_SERPENT_DIVE7, 0, 0},      // S_SERPENT_DIVE6
-    {SPR_SSDV, 6, 4, NULL, S_SERPENT_DIVE8, 0, 0},      // S_SERPENT_DIVE7
-    {SPR_SSDV, 7, 4, NULL, S_SERPENT_DIVE9, 0, 0},      // S_SERPENT_DIVE8
-    {SPR_SSDV, 8, 3, NULL, S_SERPENT_DIVE10, 0, 0},     // S_SERPENT_DIVE9
-    {SPR_SSDV, 9, 3, A_SerpentHide, S_SERPENT_SWIM1, 0, 0},     // S_SERPENT_DIVE10
-    {SPR_SSPT, 8, 5, A_SerpentWalk, S_SERPENT_WALK2, 0, 0},     // S_SERPENT_WALK1
-    {SPR_SSPT, 9, 5, A_SerpentWalk, S_SERPENT_WALK3, 0, 0},     // S_SERPENT_WALK2
-    {SPR_SSPT, 8, 5, A_SerpentWalk, S_SERPENT_WALK4, 0, 0},     // S_SERPENT_WALK3
-    {SPR_SSPT, 9, 5, A_SerpentCheckForAttack, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_WALK4
-    {SPR_SSPT, 11, 5, NULL, S_SERPENT_PAIN2, 0, 0},     // S_SERPENT_PAIN1
-    {SPR_SSPT, 11, 5, A_Pain, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_PAIN2
-    {SPR_SSPT, 10, 6, A_FaceTarget, S_SERPENT_ATK2, 0, 0},      // S_SERPENT_ATK1
-    {SPR_SSPT, 11, 5, A_SerpentChooseAttack, S_SERPENT_MELEE1, 0, 0},   // S_SERPENT_ATK2
-    {SPR_SSPT, 13, 5, A_SerpentMeleeAttack, S_SERPENT_DIVE1, 0, 0},     // S_SERPENT_MELEE1
-    {SPR_SSPT, 13, 5, A_SerpentMissileAttack, S_SERPENT_DIVE1, 0, 0},   // S_SERPENT_MISSILE1
-    {SPR_SSPT, 14, 4, NULL, S_SERPENT_DIE2, 0, 0},      // S_SERPENT_DIE1
-    {SPR_SSPT, 15, 4, A_Scream, S_SERPENT_DIE3, 0, 0},  // S_SERPENT_DIE2
-    {SPR_SSPT, 16, 4, A_NoBlocking, S_SERPENT_DIE4, 0, 0},      // S_SERPENT_DIE3
-    {SPR_SSPT, 17, 4, NULL, S_SERPENT_DIE5, 0, 0},      // S_SERPENT_DIE4
-    {SPR_SSPT, 18, 4, NULL, S_SERPENT_DIE6, 0, 0},      // S_SERPENT_DIE5
-    {SPR_SSPT, 19, 4, NULL, S_SERPENT_DIE7, 0, 0},      // S_SERPENT_DIE6
-    {SPR_SSPT, 20, 4, NULL, S_SERPENT_DIE8, 0, 0},      // S_SERPENT_DIE7
-    {SPR_SSPT, 21, 4, NULL, S_SERPENT_DIE9, 0, 0},      // S_SERPENT_DIE8
-    {SPR_SSPT, 22, 4, NULL, S_SERPENT_DIE10, 0, 0},     // S_SERPENT_DIE9
-    {SPR_SSPT, 23, 4, NULL, S_SERPENT_DIE11, 0, 0},     // S_SERPENT_DIE10
-    {SPR_SSPT, 24, 4, NULL, S_SERPENT_DIE12, 0, 0},     // S_SERPENT_DIE11
-    {SPR_SSPT, 25, 4, NULL, S_NULL, 0, 0},      // S_SERPENT_DIE12
-    {SPR_SSXD, 0, 4, NULL, S_SERPENT_XDIE2, 0, 0},      // S_SERPENT_XDIE1
-    {SPR_SSXD, 1, 4, A_SerpentHeadPop, S_SERPENT_XDIE3, 0, 0},  // S_SERPENT_XDIE2
-    {SPR_SSXD, 2, 4, A_NoBlocking, S_SERPENT_XDIE4, 0, 0},      // S_SERPENT_XDIE3
-    {SPR_SSXD, 3, 4, NULL, S_SERPENT_XDIE5, 0, 0},      // S_SERPENT_XDIE4
-    {SPR_SSXD, 4, 4, NULL, S_SERPENT_XDIE6, 0, 0},      // S_SERPENT_XDIE5
-    {SPR_SSXD, 5, 3, NULL, S_SERPENT_XDIE7, 0, 0},      // S_SERPENT_XDIE6
-    {SPR_SSXD, 6, 3, NULL, S_SERPENT_XDIE8, 0, 0},      // S_SERPENT_XDIE7
-    {SPR_SSXD, 7, 3, A_SerpentSpawnGibs, S_NULL, 0, 0}, // S_SERPENT_XDIE8
-    {SPR_SSPT, 26, 5, A_FreezeDeath, S_SERPENT_ICE2, 0, 0},     // S_SERPENT_ICE
-    {SPR_SSPT, 26, 1, A_FreezeDeathChunks, S_SERPENT_ICE2, 0, 0},       // S_SERPENT_ICE2
-    {SPR_SSFX, 32768, 3, A_ContMobjSound, S_SERPENT_FX2, 0, 0}, // S_SERPENT_FX1
-    {SPR_SSFX, 32769, 3, NULL, S_SERPENT_FX3, 0, 0},    // S_SERPENT_FX2
-    {SPR_SSFX, 32768, 3, NULL, S_SERPENT_FX4, 0, 0},    // S_SERPENT_FX3
-    {SPR_SSFX, 32769, 3, NULL, S_SERPENT_FX1, 0, 0},    // S_SERPENT_FX4
-    {SPR_SSFX, 32770, 4, NULL, S_SERPENT_FX_X2, 0, 0},  // S_SERPENT_FX_X1
-    {SPR_SSFX, 32771, 4, NULL, S_SERPENT_FX_X3, 0, 0},  // S_SERPENT_FX_X2
-    {SPR_SSFX, 32772, 4, NULL, S_SERPENT_FX_X4, 0, 0},  // S_SERPENT_FX_X3
-    {SPR_SSFX, 32773, 4, NULL, S_SERPENT_FX_X5, 0, 0},  // S_SERPENT_FX_X4
-    {SPR_SSFX, 32774, 4, NULL, S_SERPENT_FX_X6, 0, 0},  // S_SERPENT_FX_X5
-    {SPR_SSFX, 32775, 4, NULL, S_NULL, 0, 0},   // S_SERPENT_FX_X6
-    {SPR_SSXD, 8, 4, A_SerpentHeadCheck, S_SERPENT_HEAD2, 0, 0},        // S_SERPENT_HEAD1
-    {SPR_SSXD, 9, 4, A_SerpentHeadCheck, S_SERPENT_HEAD3, 0, 0},        // S_SERPENT_HEAD2
-    {SPR_SSXD, 10, 4, A_SerpentHeadCheck, S_SERPENT_HEAD4, 0, 0},       // S_SERPENT_HEAD3
-    {SPR_SSXD, 11, 4, A_SerpentHeadCheck, S_SERPENT_HEAD5, 0, 0},       // S_SERPENT_HEAD4
-    {SPR_SSXD, 12, 4, A_SerpentHeadCheck, S_SERPENT_HEAD6, 0, 0},       // S_SERPENT_HEAD5
-    {SPR_SSXD, 13, 4, A_SerpentHeadCheck, S_SERPENT_HEAD7, 0, 0},       // S_SERPENT_HEAD6
-    {SPR_SSXD, 14, 4, A_SerpentHeadCheck, S_SERPENT_HEAD8, 0, 0},       // S_SERPENT_HEAD7
-    {SPR_SSXD, 15, 4, A_SerpentHeadCheck, S_SERPENT_HEAD1, 0, 0},       // S_SERPENT_HEAD8
-    {SPR_SSXD, 18, -1, NULL, S_SERPENT_HEAD_X1, 0, 0},  // S_SERPENT_HEAD_X1
-    {SPR_SSXD, 16, 6, NULL, S_SERPENT_GIB1_2, 0, 0},    // S_SERPENT_GIB1_1
-    {SPR_SSXD, 16, 6, A_FloatGib, S_SERPENT_GIB1_3, 0, 0},      // S_SERPENT_GIB1_2
-    {SPR_SSXD, 16, 8, A_FloatGib, S_SERPENT_GIB1_4, 0, 0},      // S_SERPENT_GIB1_3
-    {SPR_SSXD, 16, 8, A_FloatGib, S_SERPENT_GIB1_5, 0, 0},      // S_SERPENT_GIB1_4
-    {SPR_SSXD, 16, 12, A_FloatGib, S_SERPENT_GIB1_6, 0, 0},     // S_SERPENT_GIB1_5
-    {SPR_SSXD, 16, 12, A_FloatGib, S_SERPENT_GIB1_7, 0, 0},     // S_SERPENT_GIB1_6
-    {SPR_SSXD, 16, 232, A_DelayGib, S_SERPENT_GIB1_8, 0, 0},    // S_SERPENT_GIB1_7
-    {SPR_SSXD, 16, 12, A_SinkGib, S_SERPENT_GIB1_9, 0, 0},      // S_SERPENT_GIB1_8
-    {SPR_SSXD, 16, 12, A_SinkGib, S_SERPENT_GIB1_10, 0, 0},     // S_SERPENT_GIB1_9
-    {SPR_SSXD, 16, 8, A_SinkGib, S_SERPENT_GIB1_11, 0, 0},      // S_SERPENT_GIB1_10
-    {SPR_SSXD, 16, 8, A_SinkGib, S_SERPENT_GIB1_12, 0, 0},      // S_SERPENT_GIB1_11
-    {SPR_SSXD, 16, 8, A_SinkGib, S_NULL, 0, 0}, // S_SERPENT_GIB1_12
-    {SPR_SSXD, 17, 6, NULL, S_SERPENT_GIB2_2, 0, 0},    // S_SERPENT_GIB2_1
-    {SPR_SSXD, 17, 6, A_FloatGib, S_SERPENT_GIB2_3, 0, 0},      // S_SERPENT_GIB2_2
-    {SPR_SSXD, 17, 8, A_FloatGib, S_SERPENT_GIB2_4, 0, 0},      // S_SERPENT_GIB2_3
-    {SPR_SSXD, 17, 8, A_FloatGib, S_SERPENT_GIB2_5, 0, 0},      // S_SERPENT_GIB2_4
-    {SPR_SSXD, 17, 12, A_FloatGib, S_SERPENT_GIB2_6, 0, 0},     // S_SERPENT_GIB2_5
-    {SPR_SSXD, 17, 12, A_FloatGib, S_SERPENT_GIB2_7, 0, 0},     // S_SERPENT_GIB2_6
-    {SPR_SSXD, 17, 232, A_DelayGib, S_SERPENT_GIB2_8, 0, 0},    // S_SERPENT_GIB2_7
-    {SPR_SSXD, 17, 12, A_SinkGib, S_SERPENT_GIB2_9, 0, 0},      // S_SERPENT_GIB2_8
-    {SPR_SSXD, 17, 12, A_SinkGib, S_SERPENT_GIB2_10, 0, 0},     // S_SERPENT_GIB2_9
-    {SPR_SSXD, 17, 8, A_SinkGib, S_SERPENT_GIB2_11, 0, 0},      // S_SERPENT_GIB2_10
-    {SPR_SSXD, 17, 8, A_SinkGib, S_SERPENT_GIB2_12, 0, 0},      // S_SERPENT_GIB2_11
-    {SPR_SSXD, 17, 8, A_SinkGib, S_NULL, 0, 0}, // S_SERPENT_GIB2_12
-    {SPR_SSXD, 19, 6, NULL, S_SERPENT_GIB3_2, 0, 0},    // S_SERPENT_GIB3_1
-    {SPR_SSXD, 19, 6, A_FloatGib, S_SERPENT_GIB3_3, 0, 0},      // S_SERPENT_GIB3_2
-    {SPR_SSXD, 19, 8, A_FloatGib, S_SERPENT_GIB3_4, 0, 0},      // S_SERPENT_GIB3_3
-    {SPR_SSXD, 19, 8, A_FloatGib, S_SERPENT_GIB3_5, 0, 0},      // S_SERPENT_GIB3_4
-    {SPR_SSXD, 19, 12, A_FloatGib, S_SERPENT_GIB3_6, 0, 0},     // S_SERPENT_GIB3_5
-    {SPR_SSXD, 19, 12, A_FloatGib, S_SERPENT_GIB3_7, 0, 0},     // S_SERPENT_GIB3_6
-    {SPR_SSXD, 19, 232, A_DelayGib, S_SERPENT_GIB3_8, 0, 0},    // S_SERPENT_GIB3_7
-    {SPR_SSXD, 19, 12, A_SinkGib, S_SERPENT_GIB3_9, 0, 0},      // S_SERPENT_GIB3_8
-    {SPR_SSXD, 19, 12, A_SinkGib, S_SERPENT_GIB3_10, 0, 0},     // S_SERPENT_GIB3_9
-    {SPR_SSXD, 19, 8, A_SinkGib, S_SERPENT_GIB3_11, 0, 0},      // S_SERPENT_GIB3_10
-    {SPR_SSXD, 19, 8, A_SinkGib, S_SERPENT_GIB3_12, 0, 0},      // S_SERPENT_GIB3_11
-    {SPR_SSXD, 19, 8, A_SinkGib, S_NULL, 0, 0}, // S_SERPENT_GIB3_12
-    {SPR_BISH, 0, 10, A_Look, S_BISHOP_LOOK1, 0, 0},    // S_BISHOP_LOOK1
-    {SPR_BISH, 0, 1, A_BishopDecide, S_BISHOP_WALK1, 0, 0},     // S_BISHOP_DECIDE
-    {SPR_BISH, 0, 2, A_BishopDoBlur, S_BISHOP_BLUR2, 0, 0},     // S_BISHOP_BLUR1
-    {SPR_BISH, 0, 4, A_BishopSpawnBlur, S_BISHOP_BLUR2, 0, 0},  // S_BISHOP_BLUR2
-    {SPR_BISH, 0, 2, A_Chase, S_BISHOP_WALK2, 0, 0},    // S_BISHOP_WALK1
-    {SPR_BISH, 0, 2, A_BishopChase, S_BISHOP_WALK3, 0, 0},      // S_BISHOP_WALK2
-    {SPR_BISH, 0, 2, NULL, S_BISHOP_WALK4, 0, 0},       // S_BISHOP_WALK3
-    {SPR_BISH, 1, 2, A_BishopChase, S_BISHOP_WALK5, 0, 0},      // S_BISHOP_WALK4
-    {SPR_BISH, 1, 2, A_Chase, S_BISHOP_WALK6, 0, 0},    // S_BISHOP_WALK5
-    {SPR_BISH, 1, 2, A_BishopChase, S_BISHOP_DECIDE, 0, 0},     // S_BISHOP_WALK6
-    {SPR_BISH, 0, 3, A_FaceTarget, S_BISHOP_ATK2, 0, 0},        // S_BISHOP_ATK1
-    {SPR_BISH, 32771, 3, A_FaceTarget, S_BISHOP_ATK3, 0, 0},    // S_BISHOP_ATK2
-    {SPR_BISH, 32772, 3, A_FaceTarget, S_BISHOP_ATK4, 0, 0},    // S_BISHOP_ATK3
-    {SPR_BISH, 32773, 3, A_BishopAttack, S_BISHOP_ATK5, 0, 0},  // S_BISHOP_ATK4
-    {SPR_BISH, 32773, 5, A_BishopAttack2, S_BISHOP_ATK5, 0, 0}, // S_BISHOP_ATK5
-    {SPR_BISH, 2, 6, A_Pain, S_BISHOP_PAIN2, 0, 0},     // S_BISHOP_PAIN1
-    {SPR_BISH, 2, 6, A_BishopPainBlur, S_BISHOP_PAIN3, 0, 0},   // S_BISHOP_PAIN2
-    {SPR_BISH, 2, 6, A_BishopPainBlur, S_BISHOP_PAIN4, 0, 0},   // S_BISHOP_PAIN3
-    {SPR_BISH, 2, 6, A_BishopPainBlur, S_BISHOP_PAIN5, 0, 0},   // S_BISHOP_PAIN4
-    {SPR_BISH, 2, 0, NULL, S_BISHOP_WALK1, 0, 0},       // S_BISHOP_PAIN5
-    {SPR_BISH, 6, 6, NULL, S_BISHOP_DEATH2, 0, 0},      // S_BISHOP_DEATH1
-    {SPR_BISH, 32775, 6, A_Scream, S_BISHOP_DEATH3, 0, 0},      // S_BISHOP_DEATH2
-    {SPR_BISH, 32776, 5, A_NoBlocking, S_BISHOP_DEATH4, 0, 0},  // S_BISHOP_DEATH3
-    {SPR_BISH, 32777, 5, A_Explode, S_BISHOP_DEATH5, 0, 0},     // S_BISHOP_DEATH4
-    {SPR_BISH, 32778, 5, NULL, S_BISHOP_DEATH6, 0, 0},  // S_BISHOP_DEATH5
-    {SPR_BISH, 32779, 4, NULL, S_BISHOP_DEATH7, 0, 0},  // S_BISHOP_DEATH6
-    {SPR_BISH, 32780, 4, NULL, S_BISHOP_DEATH8, 0, 0},  // S_BISHOP_DEATH7
-    {SPR_BISH, 13, 4, A_BishopPuff, S_BISHOP_DEATH9, 0, 0},     // S_BISHOP_DEATH8
-    {SPR_BISH, 14, 4, A_QueueCorpse, S_BISHOP_DEATH10, 0, 0},   // S_BISHOP_DEATH9
-    {SPR_BISH, 15, -1, NULL, S_NULL, 0, 0},     // S_BISHOP_DEATH10
-    {SPR_BISH, 23, 5, A_FreezeDeath, S_BISHOP_ICE2, 0, 0},      // S_BISHOP_ICE
-    {SPR_BISH, 23, 1, A_FreezeDeathChunks, S_BISHOP_ICE2, 0, 0},        // S_BISHOP_ICE2
-    {SPR_BISH, 16, 5, NULL, S_BISHOP_PUFF2, 0, 0},      // S_BISHOP_PUFF1
-    {SPR_BISH, 17, 5, NULL, S_BISHOP_PUFF3, 0, 0},      // S_BISHOP_PUFF2
-    {SPR_BISH, 18, 5, NULL, S_BISHOP_PUFF4, 0, 0},      // S_BISHOP_PUFF3
-    {SPR_BISH, 19, 5, NULL, S_BISHOP_PUFF5, 0, 0},      // S_BISHOP_PUFF4
-    {SPR_BISH, 20, 6, NULL, S_BISHOP_PUFF6, 0, 0},      // S_BISHOP_PUFF5
-    {SPR_BISH, 21, 6, NULL, S_BISHOP_PUFF7, 0, 0},      // S_BISHOP_PUFF6
-    {SPR_BISH, 22, 5, NULL, S_NULL, 0, 0},      // S_BISHOP_PUFF7
-    {SPR_BISH, 0, 16, NULL, S_BISHOPBLUR2, 0, 0},       // S_BISHOPBLUR1
-    {SPR_BISH, 0, 8, A_SetAltShadow, S_NULL, 0, 0},     // S_BISHOPBLUR2
-    {SPR_BISH, 2, 8, NULL, S_NULL, 0, 0},       // S_BISHOPPAINBLUR1
-    {SPR_BPFX, 32768, 1, A_BishopMissileWeave, S_BISHFX1_2, 0, 0},      // S_BISHFX1_1
-    {SPR_BPFX, 32769, 1, A_BishopMissileWeave, S_BISHFX1_3, 0, 0},      // S_BISHFX1_2
-    {SPR_BPFX, 32768, 1, A_BishopMissileWeave, S_BISHFX1_4, 0, 0},      // S_BISHFX1_3
-    {SPR_BPFX, 32769, 1, A_BishopMissileWeave, S_BISHFX1_5, 0, 0},      // S_BISHFX1_4
-    {SPR_BPFX, 32769, 0, A_BishopMissileSeek, S_BISHFX1_1, 0, 0},       // S_BISHFX1_5
-    {SPR_BPFX, 32770, 4, NULL, S_BISHFXI1_2, 0, 0},     // S_BISHFXI1_1
-    {SPR_BPFX, 32771, 4, NULL, S_BISHFXI1_3, 0, 0},     // S_BISHFXI1_2
-    {SPR_BPFX, 32772, 4, NULL, S_BISHFXI1_4, 0, 0},     // S_BISHFXI1_3
-    {SPR_BPFX, 32773, 4, NULL, S_BISHFXI1_5, 0, 0},     // S_BISHFXI1_4
-    {SPR_BPFX, 32774, 3, NULL, S_BISHFXI1_6, 0, 0},     // S_BISHFXI1_5
-    {SPR_BPFX, 32775, 3, NULL, S_NULL, 0, 0},   // S_BISHFXI1_6
-    {SPR_DRAG, 3, 10, A_Look, S_DRAGON_LOOK1, 0, 0},    // S_DRAGON_LOOK1
-    {SPR_DRAG, 2, 5, NULL, S_DRAGON_INIT2, 0, 0},       // S_DRAGON_INIT
-    {SPR_DRAG, 1, 5, NULL, S_DRAGON_INIT3, 0, 0},       // S_DRAGON_INIT2
-    {SPR_DRAG, 0, 5, A_DragonInitFlight, S_DRAGON_WALK1, 0, 0}, // S_DRAGON_INIT3
-    {SPR_DRAG, 1, 3, A_DragonFlap, S_DRAGON_WALK2, 0, 0},       // S_DRAGON_WALK1
-    {SPR_DRAG, 1, 3, A_DragonFlight, S_DRAGON_WALK3, 0, 0},     // S_DRAGON_WALK2
-    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK4, 0, 0},     // S_DRAGON_WALK3
-    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK5, 0, 0},     // S_DRAGON_WALK4
-    {SPR_DRAG, 3, 3, A_DragonFlight, S_DRAGON_WALK6, 0, 0},     // S_DRAGON_WALK5
-    {SPR_DRAG, 3, 3, A_DragonFlight, S_DRAGON_WALK7, 0, 0},     // S_DRAGON_WALK6
-    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK8, 0, 0},     // S_DRAGON_WALK7
-    {SPR_DRAG, 2, 3, A_DragonFlight, S_DRAGON_WALK9, 0, 0},     // S_DRAGON_WALK8
-    {SPR_DRAG, 1, 3, A_DragonFlight, S_DRAGON_WALK10, 0, 0},    // S_DRAGON_WALK9
-    {SPR_DRAG, 1, 3, A_DragonFlight, S_DRAGON_WALK11, 0, 0},    // S_DRAGON_WALK10
-    {SPR_DRAG, 0, 3, A_DragonFlight, S_DRAGON_WALK12, 0, 0},    // S_DRAGON_WALK11
-    {SPR_DRAG, 0, 3, A_DragonFlight, S_DRAGON_WALK1, 0, 0},     // S_DRAGON_WALK12
-    {SPR_DRAG, 4, 8, A_DragonAttack, S_DRAGON_WALK1, 0, 0},     // S_DRAGON_ATK1
-    {SPR_DRAG, 5, 10, A_DragonPain, S_DRAGON_WALK1, 0, 0},      // S_DRAGON_PAIN1
-    {SPR_DRAG, 6, 5, A_Scream, S_DRAGON_DEATH2, 0, 0},  // S_DRAGON_DEATH1
-    {SPR_DRAG, 7, 4, A_NoBlocking, S_DRAGON_DEATH3, 0, 0},      // S_DRAGON_DEATH2
-    {SPR_DRAG, 8, 4, NULL, S_DRAGON_DEATH4, 0, 0},      // S_DRAGON_DEATH3
-    {SPR_DRAG, 9, 4, A_DragonCheckCrash, S_DRAGON_DEATH4, 0, 0},        // S_DRAGON_DEATH4
-    {SPR_DRAG, 10, 5, NULL, S_DRAGON_CRASH2, 0, 0},     // S_DRAGON_CRASH1
-    {SPR_DRAG, 11, 5, NULL, S_DRAGON_CRASH3, 0, 0},     // S_DRAGON_CRASH2
-    {SPR_DRAG, 12, -1, NULL, S_NULL, 0, 0},     // S_DRAGON_CRASH3
-    {SPR_DRFX, 32768, 4, NULL, S_DRAGON_FX1_2, 0, 0},   // S_DRAGON_FX1_1
-    {SPR_DRFX, 32769, 4, NULL, S_DRAGON_FX1_3, 0, 0},   // S_DRAGON_FX1_2
-    {SPR_DRFX, 32770, 4, NULL, S_DRAGON_FX1_4, 0, 0},   // S_DRAGON_FX1_3
-    {SPR_DRFX, 32771, 4, NULL, S_DRAGON_FX1_5, 0, 0},   // S_DRAGON_FX1_4
-    {SPR_DRFX, 32772, 4, NULL, S_DRAGON_FX1_6, 0, 0},   // S_DRAGON_FX1_5
-    {SPR_DRFX, 32773, 4, NULL, S_DRAGON_FX1_1, 0, 0},   // S_DRAGON_FX1_6
-    {SPR_DRFX, 32774, 4, NULL, S_DRAGON_FX1_X2, 0, 0},  // S_DRAGON_FX1_X1
-    {SPR_DRFX, 32775, 4, NULL, S_DRAGON_FX1_X3, 0, 0},  // S_DRAGON_FX1_X2
-    {SPR_DRFX, 32776, 4, NULL, S_DRAGON_FX1_X4, 0, 0},  // S_DRAGON_FX1_X3
-    {SPR_DRFX, 32777, 4, A_DragonFX2, S_DRAGON_FX1_X5, 0, 0},   // S_DRAGON_FX1_X4
-    {SPR_DRFX, 32778, 3, NULL, S_DRAGON_FX1_X6, 0, 0},  // S_DRAGON_FX1_X5
-    {SPR_DRFX, 32779, 3, NULL, S_NULL, 0, 0},   // S_DRAGON_FX1_X6
-    {SPR_CFCF, 32784, 1, NULL, S_DRAGON_FX2_2, 0, 0},   // S_DRAGON_FX2_1
-    {SPR_CFCF, 32784, 4, A_UnHideThing, S_DRAGON_FX2_3, 0, 0},  // S_DRAGON_FX2_2
-    {SPR_CFCF, 32785, 3, A_Scream, S_DRAGON_FX2_4, 0, 0},       // S_DRAGON_FX2_3
-    {SPR_CFCF, 32786, 4, NULL, S_DRAGON_FX2_5, 0, 0},   // S_DRAGON_FX2_4
-    {SPR_CFCF, 32787, 3, A_Explode, S_DRAGON_FX2_6, 0, 0},      // S_DRAGON_FX2_5
-    {SPR_CFCF, 32788, 4, NULL, S_DRAGON_FX2_7, 0, 0},   // S_DRAGON_FX2_6
-    {SPR_CFCF, 32789, 3, NULL, S_DRAGON_FX2_8, 0, 0},   // S_DRAGON_FX2_7
-    {SPR_CFCF, 32790, 4, NULL, S_DRAGON_FX2_9, 0, 0},   // S_DRAGON_FX2_8
-    {SPR_CFCF, 32791, 3, NULL, S_DRAGON_FX2_10, 0, 0},  // S_DRAGON_FX2_9
-    {SPR_CFCF, 32792, 4, NULL, S_DRAGON_FX2_11, 0, 0},  // S_DRAGON_FX2_10
-    {SPR_CFCF, 32793, 3, NULL, S_NULL, 0, 0},   // S_DRAGON_FX2_11
-    {SPR_ARM1, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_1
-    {SPR_ARM2, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_2
-    {SPR_ARM3, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_3
-    {SPR_ARM4, 0, -1, NULL, S_NULL, 0, 0},      // S_ARMOR_4
-    {SPR_MAN1, 32768, 4, NULL, S_MANA1_2, 0, 0},        // S_MANA1_1
-    {SPR_MAN1, 32769, 4, NULL, S_MANA1_3, 0, 0},        // S_MANA1_2
-    {SPR_MAN1, 32770, 4, NULL, S_MANA1_4, 0, 0},        // S_MANA1_3
-    {SPR_MAN1, 32771, 4, NULL, S_MANA1_5, 0, 0},        // S_MANA1_4
-    {SPR_MAN1, 32772, 4, NULL, S_MANA1_6, 0, 0},        // S_MANA1_5
-    {SPR_MAN1, 32773, 4, NULL, S_MANA1_7, 0, 0},        // S_MANA1_6
-    {SPR_MAN1, 32774, 4, NULL, S_MANA1_8, 0, 0},        // S_MANA1_7
-    {SPR_MAN1, 32775, 4, NULL, S_MANA1_9, 0, 0},        // S_MANA1_8
-    {SPR_MAN1, 32776, 4, NULL, S_MANA1_1, 0, 0},        // S_MANA1_9
-    {SPR_MAN2, 32768, 4, NULL, S_MANA2_2, 0, 0},        // S_MANA2_1
-    {SPR_MAN2, 32769, 4, NULL, S_MANA2_3, 0, 0},        // S_MANA2_2
-    {SPR_MAN2, 32770, 4, NULL, S_MANA2_4, 0, 0},        // S_MANA2_3
-    {SPR_MAN2, 32771, 4, NULL, S_MANA2_5, 0, 0},        // S_MANA2_4
-    {SPR_MAN2, 32772, 4, NULL, S_MANA2_6, 0, 0},        // S_MANA2_5
-    {SPR_MAN2, 32773, 4, NULL, S_MANA2_7, 0, 0},        // S_MANA2_6
-    {SPR_MAN2, 32774, 4, NULL, S_MANA2_8, 0, 0},        // S_MANA2_7
-    {SPR_MAN2, 32775, 4, NULL, S_MANA2_9, 0, 0},        // S_MANA2_8
-    {SPR_MAN2, 32776, 4, NULL, S_MANA2_10, 0, 0},       // S_MANA2_9
-    {SPR_MAN2, 32777, 4, NULL, S_MANA2_11, 0, 0},       // S_MANA2_10
-    {SPR_MAN2, 32778, 4, NULL, S_MANA2_12, 0, 0},       // S_MANA2_11
-    {SPR_MAN2, 32779, 4, NULL, S_MANA2_13, 0, 0},       // S_MANA2_12
-    {SPR_MAN2, 32780, 4, NULL, S_MANA2_14, 0, 0},       // S_MANA2_13
-    {SPR_MAN2, 32781, 4, NULL, S_MANA2_15, 0, 0},       // S_MANA2_14
-    {SPR_MAN2, 32782, 4, NULL, S_MANA2_16, 0, 0},       // S_MANA2_15
-    {SPR_MAN2, 32783, 4, NULL, S_MANA2_1, 0, 0},        // S_MANA2_16
-    {SPR_MAN3, 32768, 4, NULL, S_MANA3_2, 0, 0},        // S_MANA3_1
-    {SPR_MAN3, 32769, 4, NULL, S_MANA3_3, 0, 0},        // S_MANA3_2
-    {SPR_MAN3, 32770, 4, NULL, S_MANA3_4, 0, 0},        // S_MANA3_3
-    {SPR_MAN3, 32771, 4, NULL, S_MANA3_5, 0, 0},        // S_MANA3_4
-    {SPR_MAN3, 32772, 4, NULL, S_MANA3_6, 0, 0},        // S_MANA3_5
-    {SPR_MAN3, 32773, 4, NULL, S_MANA3_7, 0, 0},        // S_MANA3_6
-    {SPR_MAN3, 32774, 4, NULL, S_MANA3_8, 0, 0},        // S_MANA3_7
-    {SPR_MAN3, 32775, 4, NULL, S_MANA3_9, 0, 0},        // S_MANA3_8
-    {SPR_MAN3, 32776, 4, NULL, S_MANA3_10, 0, 0},       // S_MANA3_9
-    {SPR_MAN3, 32777, 4, NULL, S_MANA3_11, 0, 0},       // S_MANA3_10
-    {SPR_MAN3, 32778, 4, NULL, S_MANA3_12, 0, 0},       // S_MANA3_11
-    {SPR_MAN3, 32779, 4, NULL, S_MANA3_13, 0, 0},       // S_MANA3_12
-    {SPR_MAN3, 32780, 4, NULL, S_MANA3_14, 0, 0},       // S_MANA3_13
-    {SPR_MAN3, 32781, 4, NULL, S_MANA3_15, 0, 0},       // S_MANA3_14
-    {SPR_MAN3, 32782, 4, NULL, S_MANA3_16, 0, 0},       // S_MANA3_15
-    {SPR_MAN3, 32783, 4, NULL, S_MANA3_1, 0, 0},        // S_MANA3_16
-    {SPR_KEY1, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY1
-    {SPR_KEY2, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY2
-    {SPR_KEY3, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY3
-    {SPR_KEY4, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY4
-    {SPR_KEY5, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY5
-    {SPR_KEY6, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY6
-    {SPR_KEY7, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY7
-    {SPR_KEY8, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY8
-    {SPR_KEY9, 0, -1, NULL, S_NULL, 0, 0},      // S_KEY9
-    {SPR_KEYA, 0, -1, NULL, S_NULL, 0, 0},      // S_KEYA
-    {SPR_KEYB, 0, -1, NULL, S_NULL, 0, 0},      // S_KEYB
-    {SPR_TLGL, 0, 1, NULL, S_SND_WIND2, 0, 0},  // S_SND_WIND1
-    {SPR_TLGL, 0, 200, A_ESound, S_SND_WIND2, 0, 0},    // S_SND_WIND2
-    {SPR_TLGL, 0, 85, A_ESound, S_SND_WATERFALL, 0, 0}, // S_SND_WATERFALL
-    {SPR_ETTN, 0, 10, A_Look, S_ETTIN_LOOK2, 0, 0},     // S_ETTIN_LOOK1
-    {SPR_ETTN, 0, 10, A_Look, S_ETTIN_LOOK1, 0, 0},     // S_ETTIN_LOOK2
-    {SPR_ETTN, 0, 5, A_Chase, S_ETTIN_CHASE2, 0, 0},    // S_ETTIN_CHASE1
-    {SPR_ETTN, 1, 5, A_Chase, S_ETTIN_CHASE3, 0, 0},    // S_ETTIN_CHASE2
-    {SPR_ETTN, 2, 5, A_Chase, S_ETTIN_CHASE4, 0, 0},    // S_ETTIN_CHASE3
-    {SPR_ETTN, 3, 5, A_Chase, S_ETTIN_CHASE1, 0, 0},    // S_ETTIN_CHASE4
-    {SPR_ETTN, 7, 7, A_Pain, S_ETTIN_CHASE1, 0, 0},     // S_ETTIN_PAIN1
-    {SPR_ETTN, 4, 6, A_FaceTarget, S_ETTIN_ATK1_2, 0, 0},       // S_ETTIN_ATK1_1
-    {SPR_ETTN, 5, 6, A_FaceTarget, S_ETTIN_ATK1_3, 0, 0},       // S_ETTIN_ATK1_2
-    {SPR_ETTN, 6, 8, A_EttinAttack, S_ETTIN_CHASE1, 0, 0},      // S_ETTIN_ATK1_3
-    {SPR_ETTN, 8, 4, NULL, S_ETTIN_DEATH1_2, 0, 0},     // S_ETTIN_DEATH1_1
-    {SPR_ETTN, 9, 4, NULL, S_ETTIN_DEATH1_3, 0, 0},     // S_ETTIN_DEATH1_2
-    {SPR_ETTN, 10, 4, A_Scream, S_ETTIN_DEATH1_4, 0, 0},        // S_ETTIN_DEATH1_3
-    {SPR_ETTN, 11, 4, A_NoBlocking, S_ETTIN_DEATH1_5, 0, 0},    // S_ETTIN_DEATH1_4
-    {SPR_ETTN, 12, 4, A_QueueCorpse, S_ETTIN_DEATH1_6, 0, 0},   // S_ETTIN_DEATH1_5
-    {SPR_ETTN, 13, 4, NULL, S_ETTIN_DEATH1_7, 0, 0},    // S_ETTIN_DEATH1_6
-    {SPR_ETTN, 14, 4, NULL, S_ETTIN_DEATH1_8, 0, 0},    // S_ETTIN_DEATH1_7
-    {SPR_ETTN, 15, 4, NULL, S_ETTIN_DEATH1_9, 0, 0},    // S_ETTIN_DEATH1_8
-    {SPR_ETTN, 16, -1, NULL, S_NULL, 0, 0},     // S_ETTIN_DEATH1_9
-    {SPR_ETTB, 0, 4, NULL, S_ETTIN_DEATH2_2, 0, 0},     // S_ETTIN_DEATH2_1
-    {SPR_ETTB, 1, 4, A_NoBlocking, S_ETTIN_DEATH2_3, 0, 0},     // S_ETTIN_DEATH2_2
-    {SPR_ETTB, 2, 4, A_DropMace, S_ETTIN_DEATH2_4, 0, 0},       // S_ETTIN_DEATH2_3
-    {SPR_ETTB, 3, 4, A_Scream, S_ETTIN_DEATH2_5, 0, 0}, // S_ETTIN_DEATH2_4
-    {SPR_ETTB, 4, 4, A_QueueCorpse, S_ETTIN_DEATH2_6, 0, 0},    // S_ETTIN_DEATH2_5
-    {SPR_ETTB, 5, 4, NULL, S_ETTIN_DEATH2_7, 0, 0},     // S_ETTIN_DEATH2_6
-    {SPR_ETTB, 6, 4, NULL, S_ETTIN_DEATH2_8, 0, 0},     // S_ETTIN_DEATH2_7
-    {SPR_ETTB, 7, 4, NULL, S_ETTIN_DEATH2_9, 0, 0},     // S_ETTIN_DEATH2_8
-    {SPR_ETTB, 8, 4, NULL, S_ETTIN_DEATH2_0, 0, 0},     // S_ETTIN_DEATH2_9
-    {SPR_ETTB, 9, 4, NULL, S_ETTIN_DEATH2_A, 0, 0},     // S_ETTIN_DEATH2_0
-    {SPR_ETTB, 10, 4, NULL, S_ETTIN_DEATH2_B, 0, 0},    // S_ETTIN_DEATH2_A
-    {SPR_ETTB, 11, -1, NULL, S_NULL, 0, 0},     // S_ETTIN_DEATH2_B
-    {SPR_ETTN, 17, 5, A_FreezeDeath, S_ETTIN_ICE2, 0, 0},       // S_ETTIN_ICE1
-    {SPR_ETTN, 17, 1, A_FreezeDeathChunks, S_ETTIN_ICE2, 0, 0}, // S_ETTIN_ICE2
-    {SPR_ETTB, 12, 5, A_CheckFloor, S_ETTIN_MACE2, 0, 0},       // S_ETTIN_MACE1
-    {SPR_ETTB, 13, 5, A_CheckFloor, S_ETTIN_MACE3, 0, 0},       // S_ETTIN_MACE2
-    {SPR_ETTB, 14, 5, A_CheckFloor, S_ETTIN_MACE4, 0, 0},       // S_ETTIN_MACE3
-    {SPR_ETTB, 15, 5, A_CheckFloor, S_ETTIN_MACE1, 0, 0},       // S_ETTIN_MACE4
-    {SPR_ETTB, 16, 5, NULL, S_ETTIN_MACE6, 0, 0},       // S_ETTIN_MACE5
-    {SPR_ETTB, 17, 5, A_QueueCorpse, S_ETTIN_MACE7, 0, 0},      // S_ETTIN_MACE6
-    {SPR_ETTB, 18, -1, NULL, S_NULL, 0, 0},     // S_ETTIN_MACE7
-    {SPR_FDMN, 32791, 5, NULL, S_FIRED_LOOK1, 0, 0},    // S_FIRED_SPAWN1
-    {SPR_FDMN, 32772, 10, A_Look, S_FIRED_LOOK2, 0, 0}, // S_FIRED_LOOK1
-    {SPR_FDMN, 32773, 10, A_Look, S_FIRED_LOOK3, 0, 0}, // S_FIRED_LOOK2
-    {SPR_FDMN, 32774, 10, A_Look, S_FIRED_LOOK1, 0, 0}, // S_FIRED_LOOK3
-    {SPR_FDMN, 32772, 8, NULL, S_FIRED_LOOK5, 0, 0},    // S_FIRED_LOOK4
-    {SPR_FDMN, 32773, 6, NULL, S_FIRED_LOOK6, 0, 0},    // S_FIRED_LOOK5
-    {SPR_FDMN, 32774, 5, NULL, S_FIRED_LOOK7, 0, 0},    // S_FIRED_LOOK6
-    {SPR_FDMN, 32773, 8, NULL, S_FIRED_LOOK8, 0, 0},    // S_FIRED_LOOK7
-    {SPR_FDMN, 32772, 6, NULL, S_FIRED_LOOK9, 0, 0},    // S_FIRED_LOOK8
-    {SPR_FDMN, 32773, 7, A_FiredRocks, S_FIRED_LOOK0, 0, 0},    // S_FIRED_LOOK9
-    {SPR_FDMN, 32775, 5, NULL, S_FIRED_LOOKA, 0, 0},    // S_FIRED_LOOK0
-    {SPR_FDMN, 32776, 5, NULL, S_FIRED_LOOKB, 0, 0},    // S_FIRED_LOOKA
-    {SPR_FDMN, 32777, 5, A_UnSetInvulnerable, S_FIRED_WALK1, 0, 0},     // S_FIRED_LOOKB
-    {SPR_FDMN, 32768, 5, A_FiredChase, S_FIRED_WALK2, 0, 0},    // S_FIRED_WALK1
-    {SPR_FDMN, 32769, 5, A_FiredChase, S_FIRED_WALK3, 0, 0},    // S_FIRED_WALK2
-    {SPR_FDMN, 32770, 5, A_FiredChase, S_FIRED_WALK1, 0, 0},    // S_FIRED_WALK3
-    {SPR_FDMN, 32771, 6, A_Pain, S_FIRED_WALK1, 0, 0},  // S_FIRED_PAIN1
-    {SPR_FDMN, 32778, 3, A_FaceTarget, S_FIRED_ATTACK2, 0, 0},  // S_FIRED_ATTACK1
-    {SPR_FDMN, 32778, 5, A_FiredAttack, S_FIRED_ATTACK3, 0, 0}, // S_FIRED_ATTACK2
-    {SPR_FDMN, 32778, 5, A_FiredAttack, S_FIRED_ATTACK4, 0, 0}, // S_FIRED_ATTACK3
-    {SPR_FDMN, 32778, 5, A_FiredAttack, S_FIRED_WALK1, 0, 0},   // S_FIRED_ATTACK4
-    {SPR_FDMN, 32771, 4, A_FaceTarget, S_FIRED_DEATH2, 0, 0},   // S_FIRED_DEATH1
-    {SPR_FDMN, 32779, 4, A_Scream, S_FIRED_DEATH3, 0, 0},       // S_FIRED_DEATH2
-    {SPR_FDMN, 32779, 4, A_NoBlocking, S_FIRED_DEATH4, 0, 0},   // S_FIRED_DEATH3
-    {SPR_FDMN, 32779, 200, NULL, S_NULL, 0, 0}, // S_FIRED_DEATH4
-    {SPR_FDMN, 12, 5, A_FaceTarget, S_FIRED_XDEATH2, 0, 0},     // S_FIRED_XDEATH1
-    {SPR_FDMN, 13, 5, A_NoBlocking, S_FIRED_XDEATH3, 0, 0},     // S_FIRED_XDEATH2
-    {SPR_FDMN, 14, 5, A_FiredSplotch, S_NULL, 0, 0},    // S_FIRED_XDEATH3
-    {SPR_FDMN, 17, 5, A_FreezeDeath, S_FIRED_ICE2, 0, 0},       // S_FIRED_ICE1
-    {SPR_FDMN, 17, 1, A_FreezeDeathChunks, S_FIRED_ICE2, 0, 0}, // S_FIRED_ICE2
-    {SPR_FDMN, 15, 3, NULL, S_FIRED_CORPSE2, 0, 0},     // S_FIRED_CORPSE1
-    {SPR_FDMN, 15, 6, A_QueueCorpse, S_FIRED_CORPSE3, 0, 0},    // S_FIRED_CORPSE2
-    {SPR_FDMN, 24, -1, NULL, S_NULL, 0, 0},     // S_FIRED_CORPSE3
-    {SPR_FDMN, 16, 3, NULL, S_FIRED_CORPSE5, 0, 0},     // S_FIRED_CORPSE4
-    {SPR_FDMN, 16, 6, A_QueueCorpse, S_FIRED_CORPSE6, 0, 0},    // S_FIRED_CORPSE5
-    {SPR_FDMN, 25, -1, NULL, S_NULL, 0, 0},     // S_FIRED_CORPSE6
-    {SPR_FDMN, 18, 4, NULL, S_FIRED_RDROP1, 0, 0},      // S_FIRED_RDROP1
-    {SPR_FDMN, 18, 5, A_SmBounce, S_FIRED_RDEAD1_2, 0, 0},      // S_FIRED_RDEAD1_1
-    {SPR_FDMN, 18, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD1_2
-    {SPR_FDMN, 19, 4, NULL, S_FIRED_RDROP2, 0, 0},      // S_FIRED_RDROP2
-    {SPR_FDMN, 19, 5, A_SmBounce, S_FIRED_RDEAD2_2, 0, 0},      // S_FIRED_RDEAD2_1
-    {SPR_FDMN, 19, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD2_2
-    {SPR_FDMN, 20, 4, NULL, S_FIRED_RDROP3, 0, 0},      // S_FIRED_RDROP3
-    {SPR_FDMN, 20, 5, A_SmBounce, S_FIRED_RDEAD3_2, 0, 0},      // S_FIRED_RDEAD3_1
-    {SPR_FDMN, 20, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD3_2
-    {SPR_FDMN, 21, 4, NULL, S_FIRED_RDROP4, 0, 0},      // S_FIRED_RDROP4
-    {SPR_FDMN, 21, 5, A_SmBounce, S_FIRED_RDEAD4_2, 0, 0},      // S_FIRED_RDEAD4_1
-    {SPR_FDMN, 21, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD4_2
-    {SPR_FDMN, 22, 4, NULL, S_FIRED_RDROP5, 0, 0},      // S_FIRED_RDROP5
-    {SPR_FDMN, 22, 5, A_SmBounce, S_FIRED_RDEAD5_2, 0, 0},      // S_FIRED_RDEAD5_1
-    {SPR_FDMN, 22, 200, NULL, S_NULL, 0, 0},    // S_FIRED_RDEAD5_2
-    {SPR_FDMB, 32768, 5, NULL, S_FIRED_FX6_1, 0, 0},    // S_FIRED_FX6_1
-    {SPR_FDMB, 32769, 5, NULL, S_FIRED_FX6_3, 0, 0},    // S_FIRED_FX6_2
-    {SPR_FDMB, 32770, 5, NULL, S_FIRED_FX6_4, 0, 0},    // S_FIRED_FX6_3
-    {SPR_FDMB, 32771, 5, NULL, S_FIRED_FX6_5, 0, 0},    // S_FIRED_FX6_4
-    {SPR_FDMB, 32772, 5, NULL, S_NULL, 0, 0},   // S_FIRED_FX6_5
-    {SPR_ICEY, 0, 10, A_IceGuyLook, S_ICEGUY_LOOK, 0, 0},       // S_ICEGUY_LOOK
-    {SPR_ICEY, 0, -1, NULL, S_ICEGUY_LOOK, 0, 0},       // S_ICEGUY_DORMANT
-    {SPR_ICEY, 0, 4, A_Chase, S_ICEGUY_WALK2, 0, 0},    // S_ICEGUY_WALK1
-    {SPR_ICEY, 1, 4, A_IceGuyChase, S_ICEGUY_WALK3, 0, 0},      // S_ICEGUY_WALK2
-    {SPR_ICEY, 2, 4, A_Chase, S_ICEGUY_WALK4, 0, 0},    // S_ICEGUY_WALK3
-    {SPR_ICEY, 3, 4, A_Chase, S_ICEGUY_WALK1, 0, 0},    // S_ICEGUY_WALK4
-    {SPR_ICEY, 4, 3, A_FaceTarget, S_ICEGUY_ATK2, 0, 0},        // S_ICEGUY_ATK1
-    {SPR_ICEY, 5, 3, A_FaceTarget, S_ICEGUY_ATK3, 0, 0},        // S_ICEGUY_ATK2
-    {SPR_ICEY, 32774, 8, A_IceGuyAttack, S_ICEGUY_ATK4, 0, 0},  // S_ICEGUY_ATK3
-    {SPR_ICEY, 5, 4, A_FaceTarget, S_ICEGUY_WALK1, 0, 0},       // S_ICEGUY_ATK4
-    {SPR_ICEY, 0, 1, A_Pain, S_ICEGUY_WALK1, 0, 0},     // S_ICEGUY_PAIN1
-    {SPR_ICEY, 0, 1, A_IceGuyDie, S_NULL, 0, 0},        // S_ICEGUY_DEATH
-    {SPR_ICPR, 32768, 3, A_IceGuyMissilePuff, S_ICEGUY_FX2, 0, 0},      // S_ICEGUY_FX1
-    {SPR_ICPR, 32769, 3, A_IceGuyMissilePuff, S_ICEGUY_FX3, 0, 0},      // S_ICEGUY_FX2
-    {SPR_ICPR, 32770, 3, A_IceGuyMissilePuff, S_ICEGUY_FX1, 0, 0},      // S_ICEGUY_FX3
-    {SPR_ICPR, 32771, 4, NULL, S_ICEGUY_FX_X2, 0, 0},   // S_ICEGUY_FX_X1
-    {SPR_ICPR, 32772, 4, A_IceGuyMissileExplode, S_ICEGUY_FX_X3, 0, 0}, // S_ICEGUY_FX_X2
-    {SPR_ICPR, 32773, 4, NULL, S_ICEGUY_FX_X4, 0, 0},   // S_ICEGUY_FX_X3
-    {SPR_ICPR, 32774, 4, NULL, S_ICEGUY_FX_X5, 0, 0},   // S_ICEGUY_FX_X4
-    {SPR_ICPR, 32775, 3, NULL, S_NULL, 0, 0},   // S_ICEGUY_FX_X5
-    {SPR_ICPR, 8, 3, NULL, S_ICEFX_PUFF2, 0, 0},        // S_ICEFX_PUFF1
-    {SPR_ICPR, 9, 3, NULL, S_ICEFX_PUFF3, 0, 0},        // S_ICEFX_PUFF2
-    {SPR_ICPR, 10, 3, NULL, S_ICEFX_PUFF4, 0, 0},       // S_ICEFX_PUFF3
-    {SPR_ICPR, 11, 2, NULL, S_ICEFX_PUFF5, 0, 0},       // S_ICEFX_PUFF4
-    {SPR_ICPR, 12, 2, NULL, S_NULL, 0, 0},      // S_ICEFX_PUFF5
-    {SPR_ICPR, 32781, 3, NULL, S_ICEGUY_FX2_2, 0, 0},   // S_ICEGUY_FX2_1
-    {SPR_ICPR, 32782, 3, NULL, S_ICEGUY_FX2_3, 0, 0},   // S_ICEGUY_FX2_2
-    {SPR_ICPR, 32783, 3, NULL, S_ICEGUY_FX2_1, 0, 0},   // S_ICEGUY_FX2_3
-    {SPR_ICPR, 32784, 50, NULL, S_NULL, 0, 0},  // S_ICEGUY_BIT1
-    {SPR_ICPR, 32785, 50, NULL, S_NULL, 0, 0},  // S_ICEGUY_BIT2
-    {SPR_ICWS, 0, 2, NULL, S_ICEGUY_WISP1_2, 0, 0},     // S_ICEGUY_WISP1_1
-    {SPR_ICWS, 1, 2, NULL, S_ICEGUY_WISP1_3, 0, 0},     // S_ICEGUY_WISP1_2
-    {SPR_ICWS, 2, 2, NULL, S_ICEGUY_WISP1_4, 0, 0},     // S_ICEGUY_WISP1_3
-    {SPR_ICWS, 3, 2, NULL, S_ICEGUY_WISP1_5, 0, 0},     // S_ICEGUY_WISP1_4
-    {SPR_ICWS, 4, 2, NULL, S_ICEGUY_WISP1_6, 0, 0},     // S_ICEGUY_WISP1_5
-    {SPR_ICWS, 5, 2, NULL, S_ICEGUY_WISP1_7, 0, 0},     // S_ICEGUY_WISP1_6
-    {SPR_ICWS, 6, 2, NULL, S_ICEGUY_WISP1_8, 0, 0},     // S_ICEGUY_WISP1_7
-    {SPR_ICWS, 7, 2, NULL, S_ICEGUY_WISP1_9, 0, 0},     // S_ICEGUY_WISP1_8
-    {SPR_ICWS, 8, 2, NULL, S_NULL, 0, 0},       // S_ICEGUY_WISP1_9
-    {SPR_ICWS, 9, 2, NULL, S_ICEGUY_WISP2_2, 0, 0},     // S_ICEGUY_WISP2_1
-    {SPR_ICWS, 10, 2, NULL, S_ICEGUY_WISP2_3, 0, 0},    // S_ICEGUY_WISP2_2
-    {SPR_ICWS, 11, 2, NULL, S_ICEGUY_WISP2_4, 0, 0},    // S_ICEGUY_WISP2_3
-    {SPR_ICWS, 12, 2, NULL, S_ICEGUY_WISP2_5, 0, 0},    // S_ICEGUY_WISP2_4
-    {SPR_ICWS, 13, 2, NULL, S_ICEGUY_WISP2_6, 0, 0},    // S_ICEGUY_WISP2_5
-    {SPR_ICWS, 14, 2, NULL, S_ICEGUY_WISP2_7, 0, 0},    // S_ICEGUY_WISP2_6
-    {SPR_ICWS, 15, 2, NULL, S_ICEGUY_WISP2_8, 0, 0},    // S_ICEGUY_WISP2_7
-    {SPR_ICWS, 16, 2, NULL, S_ICEGUY_WISP2_9, 0, 0},    // S_ICEGUY_WISP2_8
-    {SPR_ICWS, 17, 2, NULL, S_NULL, 0, 0},      // S_ICEGUY_WISP2_9
-    {SPR_PLAY, 0, 2, NULL, S_FIGHTER2, 0, 0},   // S_FIGHTER
-    {SPR_PLAY, 0, 3, A_ClassBossHealth, S_FIGHTERLOOK, 0, 0},   // S_FIGHTER2
-    {SPR_PLAY, 0, 5, A_Look, S_FIGHTERLOOK, 0, 0},      // S_FIGHTERLOOK
-    {SPR_PLAY, 0, 4, A_FastChase, S_FIGHTER_RUN2, 0, 0},        // S_FIGHTER_RUN1
-    {SPR_PLAY, 1, 4, A_FastChase, S_FIGHTER_RUN3, 0, 0},        // S_FIGHTER_RUN2
-    {SPR_PLAY, 2, 4, A_FastChase, S_FIGHTER_RUN4, 0, 0},        // S_FIGHTER_RUN3
-    {SPR_PLAY, 3, 4, A_FastChase, S_FIGHTER_RUN1, 0, 0},        // S_FIGHTER_RUN4
-    {SPR_PLAY, 4, 8, A_FaceTarget, S_FIGHTER_ATK2, 0, 0},       // S_FIGHTER_ATK1
-    {SPR_PLAY, 5, 8, A_FighterAttack, S_FIGHTER_RUN1, 0, 0},    // S_FIGHTER_ATK2
-    {SPR_PLAY, 6, 4, NULL, S_FIGHTER_PAIN2, 0, 0},      // S_FIGHTER_PAIN
-    {SPR_PLAY, 6, 4, A_Pain, S_FIGHTER_RUN1, 0, 0},     // S_FIGHTER_PAIN2
-    {SPR_PLAY, 7, 6, NULL, S_FIGHTER_DIE2, 0, 0},       // S_FIGHTER_DIE1
-    {SPR_PLAY, 8, 6, A_Scream, S_FIGHTER_DIE3, 0, 0},   // S_FIGHTER_DIE2
-    {SPR_PLAY, 9, 6, NULL, S_FIGHTER_DIE4, 0, 0},       // S_FIGHTER_DIE3
-    {SPR_PLAY, 10, 6, NULL, S_FIGHTER_DIE5, 0, 0},      // S_FIGHTER_DIE4
-    {SPR_PLAY, 11, 6, A_NoBlocking, S_FIGHTER_DIE6, 0, 0},      // S_FIGHTER_DIE5
-    {SPR_PLAY, 12, 6, NULL, S_FIGHTER_DIE7, 0, 0},      // S_FIGHTER_DIE6
-    {SPR_PLAY, 13, -1, NULL, S_NULL, 0, 0},     // S_FIGHTER_DIE7
-    {SPR_PLAY, 14, 5, A_Scream, S_FIGHTER_XDIE2, 0, 0}, // S_FIGHTER_XDIE1
-    {SPR_PLAY, 15, 5, A_SkullPop, S_FIGHTER_XDIE3, 0, 0},       // S_FIGHTER_XDIE2
-    {SPR_PLAY, 17, 5, A_NoBlocking, S_FIGHTER_XDIE4, 0, 0},     // S_FIGHTER_XDIE3
-    {SPR_PLAY, 18, 5, NULL, S_FIGHTER_XDIE5, 0, 0},     // S_FIGHTER_XDIE4
-    {SPR_PLAY, 19, 5, NULL, S_FIGHTER_XDIE6, 0, 0},     // S_FIGHTER_XDIE5
-    {SPR_PLAY, 20, 5, NULL, S_FIGHTER_XDIE7, 0, 0},     // S_FIGHTER_XDIE6
-    {SPR_PLAY, 21, 5, NULL, S_FIGHTER_XDIE8, 0, 0},     // S_FIGHTER_XDIE7
-    {SPR_PLAY, 22, -1, NULL, S_NULL, 0, 0},     // S_FIGHTER_XDIE8
-    {SPR_PLAY, 23, 5, A_FreezeDeath, S_FIGHTER_ICE2, 0, 0},     // S_FIGHTER_ICE
-    {SPR_PLAY, 23, 1, A_FreezeDeathChunks, S_FIGHTER_ICE2, 0, 0},       // S_FIGHTER_ICE2
-    {SPR_CLER, 0, 2, NULL, S_CLERIC2, 0, 0},    // S_CLERIC
-    {SPR_CLER, 0, 3, A_ClassBossHealth, S_CLERICLOOK, 0, 0},    // S_CLERIC2
-    {SPR_CLER, 0, 5, A_Look, S_CLERICLOOK, 0, 0},       // S_CLERICLOOK
-    {SPR_CLER, 0, 4, A_FastChase, S_CLERIC_RUN2, 0, 0}, // S_CLERIC_RUN1
-    {SPR_CLER, 1, 4, A_FastChase, S_CLERIC_RUN3, 0, 0}, // S_CLERIC_RUN2
-    {SPR_CLER, 2, 4, A_FastChase, S_CLERIC_RUN4, 0, 0}, // S_CLERIC_RUN3
-    {SPR_CLER, 3, 4, A_FastChase, S_CLERIC_RUN1, 0, 0}, // S_CLERIC_RUN4
-    {SPR_CLER, 4, 8, A_FaceTarget, S_CLERIC_ATK2, 0, 0},        // S_CLERIC_ATK1
-    {SPR_CLER, 5, 8, A_FaceTarget, S_CLERIC_ATK3, 0, 0},        // S_CLERIC_ATK2
-    {SPR_CLER, 6, 10, A_ClericAttack, S_CLERIC_RUN1, 0, 0},     // S_CLERIC_ATK3
-    {SPR_CLER, 7, 4, NULL, S_CLERIC_PAIN2, 0, 0},       // S_CLERIC_PAIN
-    {SPR_CLER, 7, 4, A_Pain, S_CLERIC_RUN1, 0, 0},      // S_CLERIC_PAIN2
-    {SPR_CLER, 8, 6, NULL, S_CLERIC_DIE2, 0, 0},        // S_CLERIC_DIE1
-    {SPR_CLER, 10, 6, A_Scream, S_CLERIC_DIE3, 0, 0},   // S_CLERIC_DIE2
-    {SPR_CLER, 11, 6, NULL, S_CLERIC_DIE4, 0, 0},       // S_CLERIC_DIE3
-    {SPR_CLER, 11, 6, NULL, S_CLERIC_DIE5, 0, 0},       // S_CLERIC_DIE4
-    {SPR_CLER, 12, 6, A_NoBlocking, S_CLERIC_DIE6, 0, 0},       // S_CLERIC_DIE5
-    {SPR_CLER, 13, 6, NULL, S_CLERIC_DIE7, 0, 0},       // S_CLERIC_DIE6
-    {SPR_CLER, 14, 6, NULL, S_CLERIC_DIE8, 0, 0},       // S_CLERIC_DIE7
-    {SPR_CLER, 15, 6, NULL, S_CLERIC_DIE9, 0, 0},       // S_CLERIC_DIE8
-    {SPR_CLER, 16, -1, NULL, S_NULL, 0, 0},     // S_CLERIC_DIE9
-    {SPR_CLER, 17, 5, A_Scream, S_CLERIC_XDIE2, 0, 0},  // S_CLERIC_XDIE1
-    {SPR_CLER, 18, 5, NULL, S_CLERIC_XDIE3, 0, 0},      // S_CLERIC_XDIE2
-    {SPR_CLER, 19, 5, A_NoBlocking, S_CLERIC_XDIE4, 0, 0},      // S_CLERIC_XDIE3
-    {SPR_CLER, 20, 5, NULL, S_CLERIC_XDIE5, 0, 0},      // S_CLERIC_XDIE4
-    {SPR_CLER, 21, 5, NULL, S_CLERIC_XDIE6, 0, 0},      // S_CLERIC_XDIE5
-    {SPR_CLER, 22, 5, NULL, S_CLERIC_XDIE7, 0, 0},      // S_CLERIC_XDIE6
-    {SPR_CLER, 23, 5, NULL, S_CLERIC_XDIE8, 0, 0},      // S_CLERIC_XDIE7
-    {SPR_CLER, 24, 5, NULL, S_CLERIC_XDIE9, 0, 0},      // S_CLERIC_XDIE8
-    {SPR_CLER, 25, 5, NULL, S_CLERIC_XDIE10, 0, 0},     // S_CLERIC_XDIE9
-    {SPR_CLER, 26, -1, NULL, S_NULL, 0, 0},     // S_CLERIC_XDIE10
-    {SPR_CLER, 27, 5, A_FreezeDeath, S_CLERIC_ICE2, 0, 0},      // S_CLERIC_ICE
-    {SPR_CLER, 27, 1, A_FreezeDeathChunks, S_CLERIC_ICE2, 0, 0},        // S_CLERIC_ICE2
-    {SPR_MAGE, 0, 2, NULL, S_MAGE2, 0, 0},      // S_MAGE
-    {SPR_MAGE, 0, 3, A_ClassBossHealth, S_MAGELOOK, 0, 0},      // S_MAGE2
-    {SPR_MAGE, 0, 5, A_Look, S_MAGELOOK, 0, 0}, // S_MAGELOOK
-    {SPR_MAGE, 0, 4, A_FastChase, S_MAGE_RUN2, 0, 0},   // S_MAGE_RUN1
-    {SPR_MAGE, 1, 4, A_FastChase, S_MAGE_RUN3, 0, 0},   // S_MAGE_RUN2
-    {SPR_MAGE, 2, 4, A_FastChase, S_MAGE_RUN4, 0, 0},   // S_MAGE_RUN3
-    {SPR_MAGE, 3, 4, A_FastChase, S_MAGE_RUN1, 0, 0},   // S_MAGE_RUN4
-    {SPR_MAGE, 4, 8, A_FaceTarget, S_MAGE_ATK2, 0, 0},  // S_MAGE_ATK1
-    {SPR_MAGE, 32773, 8, A_MageAttack, S_MAGE_RUN1, 0, 0},      // S_MAGE_ATK2
-    {SPR_MAGE, 6, 4, NULL, S_MAGE_PAIN2, 0, 0}, // S_MAGE_PAIN
-    {SPR_MAGE, 6, 4, A_Pain, S_MAGE_RUN1, 0, 0},        // S_MAGE_PAIN2
-    {SPR_MAGE, 7, 6, NULL, S_MAGE_DIE2, 0, 0},  // S_MAGE_DIE1
-    {SPR_MAGE, 8, 6, A_Scream, S_MAGE_DIE3, 0, 0},      // S_MAGE_DIE2
-    {SPR_MAGE, 9, 6, NULL, S_MAGE_DIE4, 0, 0},  // S_MAGE_DIE3
-    {SPR_MAGE, 10, 6, NULL, S_MAGE_DIE5, 0, 0}, // S_MAGE_DIE4
-    {SPR_MAGE, 11, 6, A_NoBlocking, S_MAGE_DIE6, 0, 0}, // S_MAGE_DIE5
-    {SPR_MAGE, 12, 6, NULL, S_MAGE_DIE7, 0, 0}, // S_MAGE_DIE6
-    {SPR_MAGE, 13, -1, NULL, S_NULL, 0, 0},     // S_MAGE_DIE7
-    {SPR_MAGE, 14, 5, A_Scream, S_MAGE_XDIE2, 0, 0},    // S_MAGE_XDIE1
-    {SPR_MAGE, 15, 5, NULL, S_MAGE_XDIE3, 0, 0},        // S_MAGE_XDIE2
-    {SPR_MAGE, 17, 5, A_NoBlocking, S_MAGE_XDIE4, 0, 0},        // S_MAGE_XDIE3
-    {SPR_MAGE, 18, 5, NULL, S_MAGE_XDIE5, 0, 0},        // S_MAGE_XDIE4
-    {SPR_MAGE, 19, 5, NULL, S_MAGE_XDIE6, 0, 0},        // S_MAGE_XDIE5
-    {SPR_MAGE, 20, 5, NULL, S_MAGE_XDIE7, 0, 0},        // S_MAGE_XDIE6
-    {SPR_MAGE, 21, 5, NULL, S_MAGE_XDIE8, 0, 0},        // S_MAGE_XDIE7
-    {SPR_MAGE, 22, 5, NULL, S_MAGE_XDIE9, 0, 0},        // S_MAGE_XDIE8
-    {SPR_MAGE, 23, -1, NULL, S_NULL, 0, 0},     // S_MAGE_XDIE9
-    {SPR_MAGE, 24, 5, A_FreezeDeath, S_MAGE_ICE2, 0, 0},        // S_MAGE_ICE
-    {SPR_MAGE, 24, 1, A_FreezeDeathChunks, S_MAGE_ICE2, 0, 0},  // S_MAGE_ICE2
-    {SPR_SORC, 0, 3, NULL, S_SORC_SPAWN2, 0, 0},        // S_SORC_SPAWN1
-    {SPR_SORC, 0, 2, A_SorcSpinBalls, S_SORC_LOOK1, 0, 0},      // S_SORC_SPAWN2
-    {SPR_SORC, 0, 10, A_Look, S_SORC_LOOK1, 0, 0},      // S_SORC_LOOK1
-    {SPR_SORC, 0, 5, A_Chase, S_SORC_WALK2, 0, 0},      // S_SORC_WALK1
-    {SPR_SORC, 1, 5, A_Chase, S_SORC_WALK3, 0, 0},      // S_SORC_WALK2
-    {SPR_SORC, 2, 5, A_Chase, S_SORC_WALK4, 0, 0},      // S_SORC_WALK3
-    {SPR_SORC, 3, 5, A_Chase, S_SORC_WALK1, 0, 0},      // S_SORC_WALK4
-    {SPR_SORC, 6, 8, NULL, S_SORC_PAIN2, 0, 0}, // S_SORC_PAIN1
-    {SPR_SORC, 6, 8, A_Pain, S_SORC_WALK1, 0, 0},       // S_SORC_PAIN2
-    {SPR_SORC, 32773, 6, A_FaceTarget, S_SORC_ATK2_2, 0, 0},    // S_SORC_ATK2_1
-    {SPR_SORC, 32773, 6, A_SpeedBalls, S_SORC_ATK2_3, 0, 0},    // S_SORC_ATK2_2
-    {SPR_SORC, 32773, 6, A_FaceTarget, S_SORC_ATK2_3, 0, 0},    // S_SORC_ATK2_3
-    {SPR_SORC, 32772, 6, NULL, S_SORC_ATTACK2, 0, 0},   // S_SORC_ATTACK1
-    {SPR_SORC, 32772, 6, A_SpawnFizzle, S_SORC_ATTACK3, 0, 0},  // S_SORC_ATTACK2
-    {SPR_SORC, 32772, 5, A_FaceTarget, S_SORC_ATTACK2, 0, 0},   // S_SORC_ATTACK3
-    {SPR_SORC, 32772, 2, NULL, S_SORC_ATTACK5, 0, 0},   // S_SORC_ATTACK4
-    {SPR_SORC, 32772, 2, A_SorcBossAttack, S_SORC_WALK1, 0, 0}, // S_SORC_ATTACK5
-    {SPR_SORC, 32775, 5, NULL, S_SORC_DIE2, 0, 0},      // S_SORC_DIE1
-    {SPR_SORC, 32776, 5, A_FaceTarget, S_SORC_DIE3, 0, 0},      // S_SORC_DIE2
-    {SPR_SORC, 32777, 5, A_Scream, S_SORC_DIE4, 0, 0},  // S_SORC_DIE3
-    {SPR_SORC, 32778, 5, NULL, S_SORC_DIE5, 0, 0},      // S_SORC_DIE4
-    {SPR_SORC, 32779, 5, NULL, S_SORC_DIE6, 0, 0},      // S_SORC_DIE5
-    {SPR_SORC, 32780, 5, NULL, S_SORC_DIE7, 0, 0},      // S_SORC_DIE6
-    {SPR_SORC, 32781, 5, NULL, S_SORC_DIE8, 0, 0},      // S_SORC_DIE7
-    {SPR_SORC, 32782, 5, NULL, S_SORC_DIE9, 0, 0},      // S_SORC_DIE8
-    {SPR_SORC, 32783, 5, NULL, S_SORC_DIE0, 0, 0},      // S_SORC_DIE9
-    {SPR_SORC, 32784, 5, NULL, S_SORC_DIEA, 0, 0},      // S_SORC_DIE0
-    {SPR_SORC, 32785, 5, NULL, S_SORC_DIEB, 0, 0},      // S_SORC_DIEA
-    {SPR_SORC, 32786, 5, NULL, S_SORC_DIEC, 0, 0},      // S_SORC_DIEB
-    {SPR_SORC, 32787, 5, NULL, S_SORC_DIED, 0, 0},      // S_SORC_DIEC
-    {SPR_SORC, 32788, 5, A_NoBlocking, S_SORC_DIEE, 0, 0},      // S_SORC_DIED
-    {SPR_SORC, 32789, 5, NULL, S_SORC_DIEF, 0, 0},      // S_SORC_DIEE
-    {SPR_SORC, 32790, 5, NULL, S_SORC_DIEG, 0, 0},      // S_SORC_DIEF
-    {SPR_SORC, 32791, 5, NULL, S_SORC_DIEH, 0, 0},      // S_SORC_DIEG
-    {SPR_SORC, 32792, 5, NULL, S_SORC_DIEI, 0, 0},      // S_SORC_DIEH
-    {SPR_SORC, 32793, -1, NULL, S_NULL, 0, 0},  // S_SORC_DIEI
-    {SPR_SBMP, 0, 2, A_SorcBallOrbit, S_SORCBALL1_2, 0, 0},     // S_SORCBALL1_1
-    {SPR_SBMP, 1, 2, A_SorcBallOrbit, S_SORCBALL1_3, 0, 0},     // S_SORCBALL1_2
-    {SPR_SBMP, 2, 2, A_SorcBallOrbit, S_SORCBALL1_4, 0, 0},     // S_SORCBALL1_3
-    {SPR_SBMP, 3, 2, A_SorcBallOrbit, S_SORCBALL1_5, 0, 0},     // S_SORCBALL1_4
-    {SPR_SBMP, 4, 2, A_SorcBallOrbit, S_SORCBALL1_6, 0, 0},     // S_SORCBALL1_5
-    {SPR_SBMP, 5, 2, A_SorcBallOrbit, S_SORCBALL1_7, 0, 0},     // S_SORCBALL1_6
-    {SPR_SBMP, 6, 2, A_SorcBallOrbit, S_SORCBALL1_8, 0, 0},     // S_SORCBALL1_7
-    {SPR_SBMP, 7, 2, A_SorcBallOrbit, S_SORCBALL1_9, 0, 0},     // S_SORCBALL1_8
-    {SPR_SBMP, 8, 2, A_SorcBallOrbit, S_SORCBALL1_0, 0, 0},     // S_SORCBALL1_9
-    {SPR_SBMP, 9, 2, A_SorcBallOrbit, S_SORCBALL1_A, 0, 0},     // S_SORCBALL1_0
-    {SPR_SBMP, 10, 2, A_SorcBallOrbit, S_SORCBALL1_B, 0, 0},    // S_SORCBALL1_A
-    {SPR_SBMP, 11, 2, A_SorcBallOrbit, S_SORCBALL1_C, 0, 0},    // S_SORCBALL1_B
-    {SPR_SBMP, 12, 2, A_SorcBallOrbit, S_SORCBALL1_D, 0, 0},    // S_SORCBALL1_C
-    {SPR_SBMP, 13, 2, A_SorcBallOrbit, S_SORCBALL1_E, 0, 0},    // S_SORCBALL1_D
-    {SPR_SBMP, 14, 2, A_SorcBallOrbit, S_SORCBALL1_F, 0, 0},    // S_SORCBALL1_E
-    {SPR_SBMP, 15, 2, A_SorcBallOrbit, S_SORCBALL1_1, 0, 0},    // S_SORCBALL1_F
-    {SPR_SBMP, 0, 5, A_SorcBallPop, S_SORCBALL1_D2, 0, 0},      // S_SORCBALL1_D1
-    {SPR_SBMP, 1, 2, A_BounceCheck, S_SORCBALL1_D2, 0, 0},      // S_SORCBALL1_D2
-    {SPR_SBS4, 3, 5, A_Explode, S_SORCBALL1_D6, 0, 0},  // S_SORCBALL1_D5
-    {SPR_SBS4, 4, 5, NULL, S_SORCBALL1_D7, 0, 0},       // S_SORCBALL1_D6
-    {SPR_SBS4, 5, 6, NULL, S_SORCBALL1_D8, 0, 0},       // S_SORCBALL1_D7
-    {SPR_SBS4, 6, 6, NULL, S_SORCBALL1_D9, 0, 0},       // S_SORCBALL1_D8
-    {SPR_SBS4, 7, 6, NULL, S_NULL, 0, 0},       // S_SORCBALL1_D9
-    {SPR_SBMB, 0, 2, A_SorcBallOrbit, S_SORCBALL2_2, 0, 0},     // S_SORCBALL2_1
-    {SPR_SBMB, 1, 2, A_SorcBallOrbit, S_SORCBALL2_3, 0, 0},     // S_SORCBALL2_2
-    {SPR_SBMB, 2, 2, A_SorcBallOrbit, S_SORCBALL2_4, 0, 0},     // S_SORCBALL2_3
-    {SPR_SBMB, 3, 2, A_SorcBallOrbit, S_SORCBALL2_5, 0, 0},     // S_SORCBALL2_4
-    {SPR_SBMB, 4, 2, A_SorcBallOrbit, S_SORCBALL2_6, 0, 0},     // S_SORCBALL2_5
-    {SPR_SBMB, 5, 2, A_SorcBallOrbit, S_SORCBALL2_7, 0, 0},     // S_SORCBALL2_6
-    {SPR_SBMB, 6, 2, A_SorcBallOrbit, S_SORCBALL2_8, 0, 0},     // S_SORCBALL2_7
-    {SPR_SBMB, 7, 2, A_SorcBallOrbit, S_SORCBALL2_9, 0, 0},     // S_SORCBALL2_8
-    {SPR_SBMB, 8, 2, A_SorcBallOrbit, S_SORCBALL2_0, 0, 0},     // S_SORCBALL2_9
-    {SPR_SBMB, 9, 2, A_SorcBallOrbit, S_SORCBALL2_A, 0, 0},     // S_SORCBALL2_0
-    {SPR_SBMB, 10, 2, A_SorcBallOrbit, S_SORCBALL2_B, 0, 0},    // S_SORCBALL2_A
-    {SPR_SBMB, 11, 2, A_SorcBallOrbit, S_SORCBALL2_C, 0, 0},    // S_SORCBALL2_B
-    {SPR_SBMB, 12, 2, A_SorcBallOrbit, S_SORCBALL2_D, 0, 0},    // S_SORCBALL2_C
-    {SPR_SBMB, 13, 2, A_SorcBallOrbit, S_SORCBALL2_E, 0, 0},    // S_SORCBALL2_D
-    {SPR_SBMB, 14, 2, A_SorcBallOrbit, S_SORCBALL2_F, 0, 0},    // S_SORCBALL2_E
-    {SPR_SBMB, 15, 2, A_SorcBallOrbit, S_SORCBALL2_1, 0, 0},    // S_SORCBALL2_F
-    {SPR_SBMB, 0, 5, A_SorcBallPop, S_SORCBALL2_D2, 0, 0},      // S_SORCBALL2_D1
-    {SPR_SBMB, 1, 2, A_BounceCheck, S_SORCBALL2_D2, 0, 0},      // S_SORCBALL2_D2
-    {SPR_SBS3, 3, 5, A_Explode, S_SORCBALL2_D6, 0, 0},  // S_SORCBALL2_D5
-    {SPR_SBS3, 4, 5, NULL, S_SORCBALL2_D7, 0, 0},       // S_SORCBALL2_D6
-    {SPR_SBS3, 5, 6, NULL, S_SORCBALL2_D8, 0, 0},       // S_SORCBALL2_D7
-    {SPR_SBS3, 6, 6, NULL, S_SORCBALL2_D9, 0, 0},       // S_SORCBALL2_D8
-    {SPR_SBS3, 7, 6, NULL, S_NULL, 0, 0},       // S_SORCBALL2_D9
-    {SPR_SBMG, 0, 2, A_SorcBallOrbit, S_SORCBALL3_2, 0, 0},     // S_SORCBALL3_1
-    {SPR_SBMG, 1, 2, A_SorcBallOrbit, S_SORCBALL3_3, 0, 0},     // S_SORCBALL3_2
-    {SPR_SBMG, 2, 2, A_SorcBallOrbit, S_SORCBALL3_4, 0, 0},     // S_SORCBALL3_3
-    {SPR_SBMG, 3, 2, A_SorcBallOrbit, S_SORCBALL3_5, 0, 0},     // S_SORCBALL3_4
-    {SPR_SBMG, 4, 2, A_SorcBallOrbit, S_SORCBALL3_6, 0, 0},     // S_SORCBALL3_5
-    {SPR_SBMG, 5, 2, A_SorcBallOrbit, S_SORCBALL3_7, 0, 0},     // S_SORCBALL3_6
-    {SPR_SBMG, 6, 2, A_SorcBallOrbit, S_SORCBALL3_8, 0, 0},     // S_SORCBALL3_7
-    {SPR_SBMG, 7, 2, A_SorcBallOrbit, S_SORCBALL3_9, 0, 0},     // S_SORCBALL3_8
-    {SPR_SBMG, 8, 2, A_SorcBallOrbit, S_SORCBALL3_0, 0, 0},     // S_SORCBALL3_9
-    {SPR_SBMG, 9, 2, A_SorcBallOrbit, S_SORCBALL3_A, 0, 0},     // S_SORCBALL3_0
-    {SPR_SBMG, 10, 2, A_SorcBallOrbit, S_SORCBALL3_B, 0, 0},    // S_SORCBALL3_A
-    {SPR_SBMG, 11, 2, A_SorcBallOrbit, S_SORCBALL3_C, 0, 0},    // S_SORCBALL3_B
-    {SPR_SBMG, 12, 2, A_SorcBallOrbit, S_SORCBALL3_D, 0, 0},    // S_SORCBALL3_C
-    {SPR_SBMG, 13, 2, A_SorcBallOrbit, S_SORCBALL3_E, 0, 0},    // S_SORCBALL3_D
-    {SPR_SBMG, 14, 2, A_SorcBallOrbit, S_SORCBALL3_F, 0, 0},    // S_SORCBALL3_E
-    {SPR_SBMG, 15, 2, A_SorcBallOrbit, S_SORCBALL3_1, 0, 0},    // S_SORCBALL3_F
-    {SPR_SBMG, 0, 5, A_SorcBallPop, S_SORCBALL3_D2, 0, 0},      // S_SORCBALL3_D1
-    {SPR_SBMG, 1, 2, A_BounceCheck, S_SORCBALL3_D2, 0, 0},      // S_SORCBALL3_D2
-    {SPR_SBS3, 3, 5, A_Explode, S_SORCBALL3_D6, 0, 0},  // S_SORCBALL3_D5
-    {SPR_SBS3, 4, 5, NULL, S_SORCBALL3_D7, 0, 0},       // S_SORCBALL3_D6
-    {SPR_SBS3, 5, 6, NULL, S_SORCBALL3_D8, 0, 0},       // S_SORCBALL3_D7
-    {SPR_SBS3, 6, 6, NULL, S_SORCBALL3_D9, 0, 0},       // S_SORCBALL3_D8
-    {SPR_SBS3, 7, 6, NULL, S_NULL, 0, 0},       // S_SORCBALL3_D9
-    {SPR_SBS1, 32768, 2, NULL, S_SORCFX1_2, 0, 0},      // S_SORCFX1_1
-    {SPR_SBS1, 32769, 3, A_SorcFX1Seek, S_SORCFX1_3, 0, 0},     // S_SORCFX1_2
-    {SPR_SBS1, 32770, 3, A_SorcFX1Seek, S_SORCFX1_4, 0, 0},     // S_SORCFX1_3
-    {SPR_SBS1, 32771, 3, A_SorcFX1Seek, S_SORCFX1_1, 0, 0},     // S_SORCFX1_4
-    {SPR_FHFX, 32786, 2, A_Explode, S_SORCFX1_D2, 0, 0},        // S_SORCFX1_D1
-    {SPR_FHFX, 32786, 6, NULL, S_SORCFX1_D3, 0, 0},     // S_SORCFX1_D2
-    {SPR_FHFX, 32786, 6, NULL, S_NULL, 0, 0},   // S_SORCFX1_D3
-    {SPR_SBS2, 32768, 3, A_SorcFX2Split, S_SORCFX2_SPLIT1, 0, 0},       // S_SORCFX2_SPLIT1
-    {SPR_SBS2, 32768, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT2, 0, 0},       // S_SORCFX2_ORBIT1
-    {SPR_SBS2, 32769, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT3, 0, 0},       // S_SORCFX2_ORBIT2
-    {SPR_SBS2, 32770, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT4, 0, 0},       // S_SORCFX2_ORBIT3
-    {SPR_SBS2, 32771, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT5, 0, 0},       // S_SORCFX2_ORBIT4
-    {SPR_SBS2, 32772, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT6, 0, 0},       // S_SORCFX2_ORBIT5
-    {SPR_SBS2, 32773, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT7, 0, 0},       // S_SORCFX2_ORBIT6
-    {SPR_SBS2, 32774, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT8, 0, 0},       // S_SORCFX2_ORBIT7
-    {SPR_SBS2, 32775, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT9, 0, 0},       // S_SORCFX2_ORBIT8
-    {SPR_SBS2, 32776, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT0, 0, 0},       // S_SORCFX2_ORBIT9
-    {SPR_SBS2, 32777, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITA, 0, 0},       // S_SORCFX2_ORBIT0
-    {SPR_SBS2, 32778, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITB, 0, 0},       // S_SORCFX2_ORBITA
-    {SPR_SBS2, 32779, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITC, 0, 0},       // S_SORCFX2_ORBITB
-    {SPR_SBS2, 32780, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITD, 0, 0},       // S_SORCFX2_ORBITC
-    {SPR_SBS2, 32781, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITE, 0, 0},       // S_SORCFX2_ORBITD
-    {SPR_SBS2, 32782, 2, A_SorcFX2Orbit, S_SORCFX2_ORBITF, 0, 0},       // S_SORCFX2_ORBITE
-    {SPR_SBS2, 32783, 2, A_SorcFX2Orbit, S_SORCFX2_ORBIT1, 0, 0},       // S_SORCFX2_ORBITF
-    {SPR_SBS2, 0, 10, NULL, S_NULL, 0, 0},      // S_SORCFX2T1
-    {SPR_SBS3, 32768, 2, NULL, S_SORCFX3_2, 0, 0},      // S_SORCFX3_1
-    {SPR_SBS3, 32769, 2, NULL, S_SORCFX3_3, 0, 0},      // S_SORCFX3_2
-    {SPR_SBS3, 32770, 2, NULL, S_SORCFX3_1, 0, 0},      // S_SORCFX3_3
-    {SPR_SBS3, 32768, 4, NULL, S_BISHMORPHA, 0, 0},     // S_BISHMORPH1
-    {SPR_BISH, 15, 4, A_SorcererBishopEntry, S_BISHMORPHB, 0, 0},       // S_BISHMORPHA
-    {SPR_BISH, 14, 4, NULL, S_BISHMORPHC, 0, 0},        // S_BISHMORPHB
-    {SPR_BISH, 13, 4, NULL, S_BISHMORPHD, 0, 0},        // S_BISHMORPHC
-    {SPR_BISH, 12, 3, NULL, S_BISHMORPHE, 0, 0},        // S_BISHMORPHD
-    {SPR_BISH, 11, 3, NULL, S_BISHMORPHF, 0, 0},        // S_BISHMORPHE
-    {SPR_BISH, 10, 3, NULL, S_BISHMORPHG, 0, 0},        // S_BISHMORPHF
-    {SPR_BISH, 9, 3, NULL, S_BISHMORPHH, 0, 0}, // S_BISHMORPHG
-    {SPR_BISH, 8, 3, NULL, S_BISHMORPHI, 0, 0}, // S_BISHMORPHH
-    {SPR_BISH, 7, 3, NULL, S_BISHMORPHJ, 0, 0}, // S_BISHMORPHI
-    {SPR_BISH, 6, 3, A_SpawnBishop, S_NULL, 0, 0},      // S_BISHMORPHJ
-    {SPR_SBS3, 3, 3, NULL, S_SORCFX3_EXP2, 0, 0},       // S_SORCFX3_EXP1
-    {SPR_SBS3, 4, 3, NULL, S_SORCFX3_EXP3, 0, 0},       // S_SORCFX3_EXP2
-    {SPR_SBS3, 5, 3, NULL, S_SORCFX3_EXP4, 0, 0},       // S_SORCFX3_EXP3
-    {SPR_SBS3, 6, 3, NULL, S_SORCFX3_EXP5, 0, 0},       // S_SORCFX3_EXP4
-    {SPR_SBS3, 7, 3, NULL, S_NULL, 0, 0},       // S_SORCFX3_EXP5
-    {SPR_SBS4, 32768, 2, A_SorcFX4Check, S_SORCFX4_2, 0, 0},    // S_SORCFX4_1
-    {SPR_SBS4, 32769, 2, A_SorcFX4Check, S_SORCFX4_3, 0, 0},    // S_SORCFX4_2
-    {SPR_SBS4, 32770, 2, A_SorcFX4Check, S_SORCFX4_1, 0, 0},    // S_SORCFX4_3
-    {SPR_SBS4, 32771, 2, NULL, S_SORCFX4_D2, 0, 0},     // S_SORCFX4_D1
-    {SPR_SBS4, 32772, 2, A_Explode, S_SORCFX4_D3, 0, 0},        // S_SORCFX4_D2
-    {SPR_SBS4, 32773, 2, NULL, S_SORCFX4_D4, 0, 0},     // S_SORCFX4_D3
-    {SPR_SBS4, 32774, 2, NULL, S_SORCFX4_D5, 0, 0},     // S_SORCFX4_D4
-    {SPR_SBS4, 32775, 2, NULL, S_NULL, 0, 0},   // S_SORCFX4_D5
-    {SPR_SBFX, 32768, 4, NULL, S_SORCSPARK2, 0, 0},     // S_SORCSPARK1
-    {SPR_SBFX, 32769, 4, NULL, S_SORCSPARK3, 0, 0},     // S_SORCSPARK2
-    {SPR_SBFX, 32770, 4, NULL, S_SORCSPARK4, 0, 0},     // S_SORCSPARK3
-    {SPR_SBFX, 32771, 4, NULL, S_SORCSPARK5, 0, 0},     // S_SORCSPARK4
-    {SPR_SBFX, 32772, 4, NULL, S_SORCSPARK6, 0, 0},     // S_SORCSPARK5
-    {SPR_SBFX, 32773, 4, NULL, S_SORCSPARK7, 0, 0},     // S_SORCSPARK6
-    {SPR_SBFX, 32774, 4, NULL, S_NULL, 0, 0},   // S_SORCSPARK7
-    {SPR_RADE, 0, 4, NULL, S_BLASTEFFECT2, 0, 0},       // S_BLASTEFFECT1
-    {SPR_RADE, 1, 4, NULL, S_BLASTEFFECT3, 0, 0},       // S_BLASTEFFECT2
-    {SPR_RADE, 2, 4, NULL, S_BLASTEFFECT4, 0, 0},       // S_BLASTEFFECT3
-    {SPR_RADE, 3, 4, NULL, S_BLASTEFFECT5, 0, 0},       // S_BLASTEFFECT4
-    {SPR_RADE, 4, 4, NULL, S_BLASTEFFECT6, 0, 0},       // S_BLASTEFFECT5
-    {SPR_RADE, 5, 4, NULL, S_BLASTEFFECT7, 0, 0},       // S_BLASTEFFECT6
-    {SPR_RADE, 6, 4, NULL, S_BLASTEFFECT8, 0, 0},       // S_BLASTEFFECT7
-    {SPR_RADE, 7, 4, NULL, S_BLASTEFFECT9, 0, 0},       // S_BLASTEFFECT8
-    {SPR_RADE, 8, 4, NULL, S_NULL, 0, 0},       // S_BLASTEFFECT9
-    {SPR_WATR, 0, 5, NULL, S_WATERDRIP1, 0, 0}, // S_WATERDRIP1
-    {SPR_KORX, 0, 5, A_Look, S_KORAX_LOOK1, 0, 0},      // S_KORAX_LOOK1
-    {SPR_KORX, 0, 3, A_KoraxStep2, S_KORAX_CHASE2, 0, 0},       // S_KORAX_CHASE1
-    {SPR_KORX, 0, 3, A_KoraxChase, S_KORAX_CHASE3, 0, 0},       // S_KORAX_CHASE2
-    {SPR_KORX, 0, 3, A_KoraxChase, S_KORAX_CHASE4, 0, 0},       // S_KORAX_CHASE3
-    {SPR_KORX, 0, 3, A_KoraxChase, S_KORAX_CHASE5, 0, 0},       // S_KORAX_CHASE4
-    {SPR_KORX, 1, 3, A_KoraxStep, S_KORAX_CHASE6, 0, 0},        // S_KORAX_CHASE5
-    {SPR_KORX, 1, 3, A_KoraxChase, S_KORAX_CHASE7, 0, 0},       // S_KORAX_CHASE6
-    {SPR_KORX, 1, 3, A_KoraxChase, S_KORAX_CHASE8, 0, 0},       // S_KORAX_CHASE7
-    {SPR_KORX, 1, 3, A_KoraxChase, S_KORAX_CHASE9, 0, 0},       // S_KORAX_CHASE8
-    {SPR_KORX, 2, 3, A_KoraxStep2, S_KORAX_CHASE0, 0, 0},       // S_KORAX_CHASE9
-    {SPR_KORX, 2, 3, A_KoraxChase, S_KORAX_CHASEA, 0, 0},       // S_KORAX_CHASE0
-    {SPR_KORX, 2, 3, A_KoraxChase, S_KORAX_CHASEB, 0, 0},       // S_KORAX_CHASEA
-    {SPR_KORX, 2, 3, A_KoraxChase, S_KORAX_CHASEC, 0, 0},       // S_KORAX_CHASEB
-    {SPR_KORX, 3, 3, A_KoraxStep, S_KORAX_CHASED, 0, 0},        // S_KORAX_CHASEC
-    {SPR_KORX, 3, 3, A_KoraxChase, S_KORAX_CHASEE, 0, 0},       // S_KORAX_CHASED
-    {SPR_KORX, 3, 3, A_KoraxChase, S_KORAX_CHASEF, 0, 0},       // S_KORAX_CHASEE
-    {SPR_KORX, 3, 3, A_KoraxChase, S_KORAX_CHASE1, 0, 0},       // S_KORAX_CHASEF
-    {SPR_KORX, 7, 5, A_Pain, S_KORAX_PAIN2, 0, 0},      // S_KORAX_PAIN1
-    {SPR_KORX, 7, 5, NULL, S_KORAX_CHASE2, 0, 0},       // S_KORAX_PAIN2
-    {SPR_KORX, 32772, 2, A_FaceTarget, S_KORAX_ATTACK2, 0, 0},  // S_KORAX_ATTACK1
-    {SPR_KORX, 32772, 5, A_KoraxDecide, S_KORAX_ATTACK2, 0, 0}, // S_KORAX_ATTACK2
-    {SPR_KORX, 32772, 4, A_FaceTarget, S_KORAX_MISSILE2, 0, 0}, // S_KORAX_MISSILE1
-    {SPR_KORX, 32773, 8, A_KoraxMissile, S_KORAX_MISSILE3, 0, 0},       // S_KORAX_MISSILE2
-    {SPR_KORX, 32772, 8, NULL, S_KORAX_CHASE2, 0, 0},   // S_KORAX_MISSILE3
-    {SPR_KORX, 32772, 5, A_FaceTarget, S_KORAX_COMMAND2, 0, 0}, // S_KORAX_COMMAND1
-    {SPR_KORX, 32790, 10, A_FaceTarget, S_KORAX_COMMAND3, 0, 0},        // S_KORAX_COMMAND2
-    {SPR_KORX, 32774, 15, A_KoraxCommand, S_KORAX_COMMAND4, 0, 0},      // S_KORAX_COMMAND3
-    {SPR_KORX, 32790, 10, NULL, S_KORAX_COMMAND5, 0, 0},        // S_KORAX_COMMAND4
-    {SPR_KORX, 32772, 5, NULL, S_KORAX_CHASE2, 0, 0},   // S_KORAX_COMMAND5
-    {SPR_KORX, 8, 5, NULL, S_KORAX_DEATH2, 0, 0},       // S_KORAX_DEATH1
-    {SPR_KORX, 9, 5, A_FaceTarget, S_KORAX_DEATH3, 0, 0},       // S_KORAX_DEATH2
-    {SPR_KORX, 10, 5, A_Scream, S_KORAX_DEATH4, 0, 0},  // S_KORAX_DEATH3
-    {SPR_KORX, 11, 5, NULL, S_KORAX_DEATH5, 0, 0},      // S_KORAX_DEATH4
-    {SPR_KORX, 12, 5, NULL, S_KORAX_DEATH6, 0, 0},      // S_KORAX_DEATH5
-    {SPR_KORX, 13, 5, NULL, S_KORAX_DEATH7, 0, 0},      // S_KORAX_DEATH6
-    {SPR_KORX, 14, 5, NULL, S_KORAX_DEATH8, 0, 0},      // S_KORAX_DEATH7
-    {SPR_KORX, 15, 5, NULL, S_KORAX_DEATH9, 0, 0},      // S_KORAX_DEATH8
-    {SPR_KORX, 16, 10, NULL, S_KORAX_DEATH0, 0, 0},     // S_KORAX_DEATH9
-    {SPR_KORX, 17, 5, A_KoraxBonePop, S_KORAX_DEATHA, 0, 0},    // S_KORAX_DEATH0
-    {SPR_KORX, 18, 5, A_NoBlocking, S_KORAX_DEATHB, 0, 0},      // S_KORAX_DEATHA
-    {SPR_KORX, 19, 5, NULL, S_KORAX_DEATHC, 0, 0},      // S_KORAX_DEATHB
-    {SPR_KORX, 20, 5, NULL, S_KORAX_DEATHD, 0, 0},      // S_KORAX_DEATHC
-    {SPR_KORX, 21, -1, NULL, S_NULL, 0, 0},     // S_KORAX_DEATHD
-    {SPR_SPIR, 0, 5, A_KSpiritRoam, S_KSPIRIT_ROAM2, 0, 0},     // S_KSPIRIT_ROAM1
-    {SPR_SPIR, 1, 5, A_KSpiritRoam, S_KSPIRIT_ROAM1, 0, 0},     // S_KSPIRIT_ROAM2
-    {SPR_SPIR, 3, 5, NULL, S_KSPIRIT_DEATH2, 0, 0},     // S_KSPIRIT_DEATH1
-    {SPR_SPIR, 4, 5, NULL, S_KSPIRIT_DEATH3, 0, 0},     // S_KSPIRIT_DEATH2
-    {SPR_SPIR, 5, 5, NULL, S_KSPIRIT_DEATH4, 0, 0},     // S_KSPIRIT_DEATH3
-    {SPR_SPIR, 6, 5, NULL, S_KSPIRIT_DEATH5, 0, 0},     // S_KSPIRIT_DEATH4
-    {SPR_SPIR, 7, 5, NULL, S_KSPIRIT_DEATH6, 0, 0},     // S_KSPIRIT_DEATH5
-    {SPR_SPIR, 8, 5, NULL, S_NULL, 0, 0},       // S_KSPIRIT_DEATH6
-    {SPR_MLFX, 32776, 2, NULL, S_KBOLT2, 0, 0}, // S_KBOLT1
-    {SPR_MLFX, 32777, 2, A_KBoltRaise, S_KBOLT3, 0, 0}, // S_KBOLT2
-    {SPR_MLFX, 32776, 2, A_KBolt, S_KBOLT4, 0, 0},      // S_KBOLT3
-    {SPR_MLFX, 32777, 2, A_KBolt, S_KBOLT5, 0, 0},      // S_KBOLT4
-    {SPR_MLFX, 32778, 2, A_KBolt, S_KBOLT6, 0, 0},      // S_KBOLT5
-    {SPR_MLFX, 32779, 2, A_KBolt, S_KBOLT7, 0, 0},      // S_KBOLT6
-    {SPR_MLFX, 32780, 2, A_KBolt, S_KBOLT3, 0, 0},      // S_KBOLT7
-    {SPR_MAN1, 0, 2, NULL, S_SPAWNBATS2, 0, 0}, // S_SPAWNBATS1
-    {SPR_MAN1, 0, 2, A_BatSpawnInit, S_SPAWNBATS3, 0, 0},       // S_SPAWNBATS2
-    {SPR_MAN1, 0, 2, A_BatSpawn, S_SPAWNBATS3, 0, 0},   // S_SPAWNBATS3
-    {SPR_MAN1, 0, -1, NULL, S_NULL, 0, 0},      // S_SPAWNBATS_OFF
-    {SPR_ABAT, 0, 2, A_BatMove, S_BAT2, 0, 0},  // S_BAT1
-    {SPR_ABAT, 1, 2, A_BatMove, S_BAT3, 0, 0},  // S_BAT2
-    {SPR_ABAT, 2, 2, A_BatMove, S_BAT1, 0, 0},  // S_BAT3
-    {SPR_ABAT, 0, 2, NULL, S_NULL, 0, 0}        // S_BAT_DEATH
-};
-
-
-mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
-
-    {                           // MT_MAPSPOT
-     9001,                      // doomednum
-     S_MAPSPOT,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR | MF_NOGRAVITY,        // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MAPSPOTGRAVITY
-     9013,                      // doomednum
-     S_MAPSPOT,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     MF2_DONTDRAW               // flags2
-     },
-
-    {                           // MT_FIREBALL1
-     -1,                        // doomednum
-     S_FIREBALL1_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIREBALL1_X1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_FIREBALL,              // deathsound
-     2 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_ARROW
-     -1,                        // doomednum
-     S_ARROW_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ARROW_X1,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     6 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DART
-     -1,                        // doomednum
-     S_DART_1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DART_X1,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     6 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_POISONDART
-     -1,                        // doomednum
-     S_POISONDART_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_POISONDART_X1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     6 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_RIPPERBALL
-     -1,                        // doomednum
-     S_RIPPERBALL_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_RIPPERBALL_X1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     6 * FRACUNIT,              // speed
-     8 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     2,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_RIP   // flags2
-     },
-
-    {                           // MT_PROJECTILE_BLADE
-     -1,                        // doomednum
-     S_PRJ_BLADE1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_PRJ_BLADE_X1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     6 * FRACUNIT,              // speed
-     6 * FRACUNIT,              // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ICESHARD
-     -1,                        // doomednum
-     S_ICESHARD1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SHARDFXE1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_MAGE_SHARDS_EXPLODE,   // deathsound
-     25 * FRACUNIT,             // speed
-     13 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_ICEDAMAGE     // flags2
-     },
-
-    {                           // MT_FLAME_SMALL_TEMP
-     10500,                     // doomednum
-     S_FLAME_TSMALL1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FLAME_LARGE_TEMP
-     10502,                     // doomednum
-     S_FLAME_TLARGE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FLAME_SMALL
-     10501,                     // doomednum
-     S_FLAME_SMALL1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     MF2_NOTELEPORT | MF2_DONTDRAW      // flags2
-     },
-
-    {                           // MT_FLAME_LARGE
-     10503,                     // doomednum
-     S_FLAME_LARGE1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     MF2_NOTELEPORT | MF2_DONTDRAW      // flags2
-     },
-
-    {                           // MT_HEALINGBOTTLE
-     81,                        // doomednum
-     S_ITEM_PTN1_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_HEALTHFLASK
-     82,                        // doomednum
-     S_ARTI_PTN2_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIFLY
-     83,                        // doomednum
-     S_ARTI_SOAR1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIINVULNERABILITY
-     84,                        // doomednum
-     S_ARTI_INVU1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_SUMMONMAULATOR
-     86,                        // doomednum
-     S_ARTI_SUMMON,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_SUMMON_FX
-     -1,                        // doomednum
-     S_SUMMON_FX1_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SUMMON_FX2_1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     20 * FRACUNIT,             // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_DROPOFF | MF_NOBLOCKMAP,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_THRUSTFLOOR_UP
-     10091,                     // doomednum
-     S_THRUSTINIT2_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     128 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_THRUSTFLOOR_DOWN
-     10090,                     // doomednum
-     S_THRUSTINIT1_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     128 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP | MF2_DONTDRAW      // flags2
-     },
-
-    {                           // MT_TELEPORTOTHER
-     10040,                     // doomednum
-     S_ARTI_TELOTHER1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_TELOTHER_FX1
-     -1,                        // doomednum
-     S_TELO_FX1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_TELO_FX9,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     20 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     10001,                     // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_TELOTHER_FX2
-     -1,                        // doomednum
-     S_TELO_FX2_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_TELO_FX9,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     16 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     10001,                     // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_TELOTHER_FX3
-     -1,                        // doomednum
-     S_TELO_FX3_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_TELO_FX9,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     16 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     10001,                     // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_TELOTHER_FX4
-     -1,                        // doomednum
-     S_TELO_FX4_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_TELO_FX9,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     16 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     10001,                     // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_TELOTHER_FX5
-     -1,                        // doomednum
-     S_TELO_FX5_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_TELO_FX9,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     16 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     10001,                     // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY | MF_NOBLOCKMAP,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DIRT1
-     -1,                        // doomednum
-     S_DIRT1_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DIRT1_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DIRT2
-     -1,                        // doomednum
-     S_DIRT2_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DIRT2_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DIRT3
-     -1,                        // doomednum
-     S_DIRT3_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DIRT3_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DIRT4
-     -1,                        // doomednum
-     S_DIRT4_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DIRT4_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_DIRT5
-     -1,                        // doomednum
-     S_DIRT5_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DIRT5_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_DIRT6
-     -1,                        // doomednum
-     S_DIRT6_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DIRT6_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_DIRTCLUMP
-     -1,                        // doomednum
-     S_DIRTCLUMP1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ROCK1
-     -1,                        // doomednum
-     S_ROCK1_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ROCK1_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ROCK2
-     -1,                        // doomednum
-     S_ROCK2_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ROCK2_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ROCK3
-     -1,                        // doomednum
-     S_ROCK3_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ROCK3_D,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FOGSPAWNER
-     10000,                     // doomednum
-     S_SPAWNFOG1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     MF2_DONTDRAW | MF2_FLOATBOB        // flags2
-     },
-
-    {                           // MT_FOGPATCHS
-     10001,                     // doomednum
-     S_FOGPATCHS1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FOGPATCHS0,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     FRACUNIT,                  // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_FLOAT | MF_NOGRAVITY | MF_SHADOW | MF_NOCLIP,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FOGPATCHM
-     10002,                     // doomednum
-     S_FOGPATCHM1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FOGPATCHM0,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     FRACUNIT,                  // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_FLOAT | MF_NOGRAVITY | MF_SHADOW | MF_NOCLIP,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FOGPATCHL
-     10003,                     // doomednum
-     S_FOGPATCHL1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FOGPATCHL0,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     FRACUNIT,                  // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_FLOAT | MF_NOGRAVITY | MF_SHADOW | MF_NOCLIP,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_QUAKE_FOCUS
-     -1,                        // doomednum
-     S_QUAKE_ACTIVE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     MF2_DONTDRAW               // flags2
-     },
-
-    {                           // MT_SGSHARD1
-     -1,                        // doomednum
-     S_SGSHARD1_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD1_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD2
-     -1,                        // doomednum
-     S_SGSHARD2_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD2_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD3
-     -1,                        // doomednum
-     S_SGSHARD3_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD3_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD4
-     -1,                        // doomednum
-     S_SGSHARD4_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD4_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD5
-     -1,                        // doomednum
-     S_SGSHARD5_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD5_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD6
-     -1,                        // doomednum
-     S_SGSHARD6_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD6_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD7
-     -1,                        // doomednum
-     S_SGSHARD7_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD7_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD8
-     -1,                        // doomednum
-     S_SGSHARD8_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD8_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD9
-     -1,                        // doomednum
-     S_SGSHARD9_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD9_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SGSHARD0
-     -1,                        // doomednum
-     S_SGSHARD0_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SGSHARD0_D,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_ARTIEGG
-     30,                        // doomednum
-     S_ARTI_EGGC1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_EGGFX
-     -1,                        // doomednum
-     S_EGGFX1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_EGGFXI1_1,               // deathstate
-     S_NULL,                    // xdeathstate
-     0,                         // deathsound
-     18 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ARTISUPERHEAL
-     32,                        // doomednum
-     S_ARTI_SPHL1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ZWINGEDSTATUENOSKULL
-     9011,                      // doomednum
-     S_ZWINGEDSTATUENOSKULL,    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZGEMPEDESTAL
-     9012,                      // doomednum
-     S_ZGEMPEDESTAL1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     40 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZSKULL
-     9002,                      // doomednum
-     S_ARTIPUZZSKULL,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEMBIG
-     9003,                      // doomednum
-     S_ARTIPUZZGEMBIG,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEMRED
-     9004,                      // doomednum
-     S_ARTIPUZZGEMRED,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEMGREEN1
-     9005,                      // doomednum
-     S_ARTIPUZZGEMGREEN1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEMGREEN2
-     9009,                      // doomednum
-     S_ARTIPUZZGEMGREEN2,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEMBLUE1
-     9006,                      // doomednum
-     S_ARTIPUZZGEMBLUE1,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEMBLUE2
-     9010,                      // doomednum
-     S_ARTIPUZZGEMBLUE2,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZBOOK1
-     9007,                      // doomednum
-     S_ARTIPUZZBOOK1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZBOOK2
-     9008,                      // doomednum
-     S_ARTIPUZZBOOK2,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZSKULL2
-     9014,                      // doomednum
-     S_ARTIPUZZSKULL2,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZFWEAPON
-     9015,                      // doomednum
-     S_ARTIPUZZFWEAPON,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZCWEAPON
-     9016,                      // doomednum
-     S_ARTIPUZZCWEAPON,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZMWEAPON
-     9017,                      // doomednum
-     S_ARTIPUZZMWEAPON,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEAR
-     9018,                      // doomednum
-     S_ARTIPUZZGEAR_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEAR2
-     9019,                      // doomednum
-     S_ARTIPUZZGEAR2_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEAR3
-     9020,                      // doomednum
-     S_ARTIPUZZGEAR3_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTIPUZZGEAR4
-     9021,                      // doomednum
-     S_ARTIPUZZGEAR4_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARTITORCH
-     33,                        // doomednum
-     S_ARTI_TRCH1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_FIREBOMB
-     -1,                        // doomednum
-     S_FIREBOMB1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_FLECHETTE_EXPLODE,     // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOGRAVITY | MF_ALTSHADOW,       // flags
-     MF2_FIREDAMAGE             // flags2
-     },
-
-    {                           // MT_ARTITELEPORT
-     36,                        // doomednum
-     S_ARTI_ATLP1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_ARTIPOISONBAG
-     8000,                      // doomednum
-     S_ARTI_PSBG1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_POISONBAG
-     -1,                        // doomednum
-     S_POISONBAG1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOGRAVITY | MF_NOBLOCKMAP,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_POISONCLOUD
-     -1,                        // doomednum
-     S_POISONCLOUD1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_POISONSHROOM_DEATH,    // deathsound
-     0,                         // speed
-     1,                         // radius
-     1,                         // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOGRAVITY | MF_NOBLOCKMAP | MF_SHADOW | MF_NOCLIP | MF_DROPOFF, // flags
-     MF2_NODMGTHRUST            // flags2
-     },
-
-    {                           // MT_THROWINGBOMB
-     -1,                        // doomednum
-     S_THROWINGBOMB1,           // spawnstate
-     48,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_FLECHETTE_BOUNCE,      // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_THROWINGBOMB_X1,         // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_FLECHETTE_EXPLODE,     // deathsound
-     12 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_FLOORBOUNCE | MF2_FIREDAMAGE   // flags2
-     },
-
-    {                           // MT_SPEEDBOOTS
-     8002,                      // doomednum
-     S_ARTI_BOOTS1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_BOOSTMANA
-     8003,                      // doomednum
-     S_ARTI_MANA,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_BOOSTARMOR
-     8041,                      // doomednum
-     S_ARTI_ARMOR1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_BLASTRADIUS
-     10110,                     // doomednum
-     S_ARTI_BLAST1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_HEALRADIUS
-     10120,                     // doomednum
-     S_ARTI_HEALRAD1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_SPLASH
-     -1,                        // doomednum
-     S_SPLASH1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SPLASHX,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
-     },
-
-    {                           // MT_SPLASHBASE
-     -1,                        // doomednum
-     S_SPLASHBASE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_LAVASPLASH
-     -1,                        // doomednum
-     S_LAVASPLASH1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_LAVASMOKE
-     -1,                        // doomednum
-     S_LAVASMOKE1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SLUDGECHUNK
-     -1,                        // doomednum
-     S_SLUDGECHUNK1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SLUDGECHUNKX,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_CANNOTPUSH       // flags2
-     },
-
-    {                           // MT_SLUDGESPLASH
-     -1,                        // doomednum
-     S_SLUDGESPLASH1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC0
-     5,                         // doomednum
-     S_ZWINGEDSTATUE1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC1
-     6,                         // doomednum
-     S_ZROCK1_1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC2
-     7,                         // doomednum
-     S_ZROCK2_1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC3
-     9,                         // doomednum
-     S_ZROCK3_1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC4
-     15,                        // doomednum
-     S_ZROCK4_1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC5
-     17,                        // doomednum
-     S_ZCHANDELIER1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     60 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC6
-     8063,                      // doomednum
-     S_ZCHANDELIER_U,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     60 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC7
-     24,                        // doomednum
-     S_ZTREEDEAD1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     96 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC8
-     25,                        // doomednum
-     S_ZTREE,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     128 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TREEDESTRUCTIBLE
-     8062,                      // doomednum
-     S_ZTREEDESTRUCTIBLE1,      // spawnstate
-     70,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZTREEDES_D1,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_TREE_BREAK,            // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     180 * FRACUNIT,            // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC9
-     26,                        // doomednum
-     S_ZTREESWAMP182_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     150 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC10
-     27,                        // doomednum
-     S_ZTREESWAMP172_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     120 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC11
-     28,                        // doomednum
-     S_ZSTUMPBURNED1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC12
-     29,                        // doomednum
-     S_ZSTUMPBARE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC13
-     37,                        // doomednum
-     S_ZSTUMPSWAMP1_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC14
-     38,                        // doomednum
-     S_ZSTUMPSWAMP2_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC15
-     39,                        // doomednum
-     S_ZSHROOMLARGE1_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC16
-     40,                        // doomednum
-     S_ZSHROOMLARGE2_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC17
-     41,                        // doomednum
-     S_ZSHROOMLARGE3_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC18
-     42,                        // doomednum
-     S_ZSHROOMSMALL1_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC19
-     44,                        // doomednum
-     S_ZSHROOMSMALL2_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC20
-     45,                        // doomednum
-     S_ZSHROOMSMALL3_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC21
-     46,                        // doomednum
-     S_ZSHROOMSMALL4_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC22
-     47,                        // doomednum
-     S_ZSHROOMSMALL5_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC23
-     48,                        // doomednum
-     S_ZSTALAGMITEPILLAR1,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     138 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC24
-     49,                        // doomednum
-     S_ZSTALAGMITELARGE1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     48 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC25
-     50,                        // doomednum
-     S_ZSTALAGMITEMEDIUM1,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     6 * FRACUNIT,              // radius
-     40 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC26
-     51,                        // doomednum
-     S_ZSTALAGMITESMALL1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     36 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC27
-     52,                        // doomednum
-     S_ZSTALACTITELARGE1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     66 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC28
-     56,                        // doomednum
-     S_ZSTALACTITEMEDIUM1,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     6 * FRACUNIT,              // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC29
-     57,                        // doomednum
-     S_ZSTALACTITESMALL1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     40 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC30
-     58,                        // doomednum
-     S_ZMOSSCEILING1_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC31
-     59,                        // doomednum
-     S_ZMOSSCEILING2_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     24 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPAWNCEILING | MF_NOGRAVITY,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC32
-     60,                        // doomednum
-     S_ZSWAMPVINE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     52 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC33
-     61,                        // doomednum
-     S_ZCORPSEKABOB1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     92 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC34
-     62,                        // doomednum
-     S_ZCORPSESLEEPING1,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC35
-     63,                        // doomednum
-     S_ZTOMBSTONERIP1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     46 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC36
-     64,                        // doomednum
-     S_ZTOMBSTONESHANE1,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     46 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC37
-     65,                        // doomednum
-     S_ZTOMBSTONEBIGCROSS1,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     46 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC38
-     66,                        // doomednum
-     S_ZTOMBSTONEBRIANR1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     52 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC39
-     67,                        // doomednum
-     S_ZTOMBSTONECROSSCIRCLE1,  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     52 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC40
-     68,                        // doomednum
-     S_ZTOMBSTONESMALLCROSS1,   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     46 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC41
-     69,                        // doomednum
-     S_ZTOMBSTONEBRIANP1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     46 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC42
-     71,                        // doomednum
-     S_CORPSEHANGING_1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     6 * FRACUNIT,              // radius
-     75 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC43
-     72,                        // doomednum
-     S_ZSTATUEGARGOYLEGREENTALL_1,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC44
-     73,                        // doomednum
-     S_ZSTATUEGARGOYLEBLUETALL_1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC45
-     74,                        // doomednum
-     S_ZSTATUEGARGOYLEGREENSHORT_1,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC46
-     76,                        // doomednum
-     S_ZSTATUEGARGOYLEBLUESHORT_1,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC47
-     8044,                      // doomednum
-     S_ZSTATUEGARGOYLESTRIPETALL_1,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC48
-     8045,                      // doomednum
-     S_ZSTATUEGARGOYLEDARKREDTALL_1,    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC49
-     8046,                      // doomednum
-     S_ZSTATUEGARGOYLEREDTALL_1,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC50
-     8047,                      // doomednum
-     S_ZSTATUEGARGOYLETANTALL_1,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC51
-     8048,                      // doomednum
-     S_ZSTATUEGARGOYLERUSTTALL_1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     108 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC52
-     8049,                      // doomednum
-     S_ZSTATUEGARGOYLEDARKREDSHORT_1,   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC53
-     8050,                      // doomednum
-     S_ZSTATUEGARGOYLEREDSHORT_1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC54
-     8051,                      // doomednum
-     S_ZSTATUEGARGOYLETANSHORT_1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC55
-     8052,                      // doomednum
-     S_ZSTATUEGARGOYLERUSTSHORT_1,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     14 * FRACUNIT,             // radius
-     62 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC56
-     77,                        // doomednum
-     S_ZBANNERTATTERED_1,       // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     120 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC57
-     78,                        // doomednum
-     S_ZTREELARGE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZTREELARGE1,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     180 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC58
-     79,                        // doomednum
-     S_ZTREELARGE2,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZTREELARGE2,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     180 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC59
-     80,                        // doomednum
-     S_ZTREEGNARLED1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     22 * FRACUNIT,             // radius
-     100 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC60
-     87,                        // doomednum
-     S_ZTREEGNARLED2,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     22 * FRACUNIT,             // radius
-     100 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC61
-     88,                        // doomednum
-     S_ZLOG,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     25 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC62
-     89,                        // doomednum
-     S_ZSTALACTITEICELARGE,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     66 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC63
-     90,                        // doomednum
-     S_ZSTALACTITEICEMEDIUM,    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC64
-     91,                        // doomednum
-     S_ZSTALACTITEICESMALL,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC65
-     92,                        // doomednum
-     S_ZSTALACTITEICETINY,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC66
-     93,                        // doomednum
-     S_ZSTALAGMITEICELARGE,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     66 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC67
-     94,                        // doomednum
-     S_ZSTALAGMITEICEMEDIUM,    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC68
-     95,                        // doomednum
-     S_ZSTALAGMITEICESMALL,     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC69
-     96,                        // doomednum
-     S_ZSTALAGMITEICETINY,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC70
-     97,                        // doomednum
-     S_ZROCKBROWN1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     17 * FRACUNIT,             // radius
-     72 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC71
-     98,                        // doomednum
-     S_ZROCKBROWN2,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     50 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC72
-     99,                        // doomednum
-     S_ZROCKBLACK,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     40 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC73
-     100,                       // doomednum
-     S_ZRUBBLE1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC74
-     101,                       // doomednum
-     S_ZRUBBLE2,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC75
-     102,                       // doomednum
-     S_ZRUBBLE3,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC76
-     103,                       // doomednum
-     S_ZVASEPILLAR,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     54 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_POTTERY1
-     104,                       // doomednum
-     S_ZPOTTERY1,               // spawnstate
-     15,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZPOTTERY_EXPLODE,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_DROPOFF, // flags
-     MF2_SLIDE | MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ    // flags2
-     },
-
-    {                           // MT_POTTERY2
-     105,                       // doomednum
-     S_ZPOTTERY2,               // spawnstate
-     15,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZPOTTERY_EXPLODE,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     25 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_DROPOFF, // flags
-     MF2_SLIDE | MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ    // flags2
-     },
-
-    {                           // MT_POTTERY3
-     106,                       // doomednum
-     S_ZPOTTERY3,               // spawnstate
-     15,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZPOTTERY_EXPLODE,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     25 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_DROPOFF, // flags
-     MF2_SLIDE | MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ    // flags2
-     },
-
-    {                           // MT_POTTERYBIT1
-     -1,                        // doomednum
-     S_POTTERYBIT_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_POTTERYBIT_EX0,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE,                // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_MISC77
-     108,                       // doomednum
-     S_ZCORPSELYNCHED1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     11 * FRACUNIT,             // radius
-     95 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZLYNCHED_NOHEART
-     109,                       // doomednum
-     S_ZCORPSELYNCHED2,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     100 * FRACUNIT,            // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC78
-     110,                       // doomednum
-     S_ZCORPSESITTING,          // spawnstate
-     30,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZCORPSESITTING_X,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     35 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CORPSEBIT
-     -1,                        // doomednum
-     S_CORPSEBIT_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     MF2_TELESTOMP              // flags2
-     },
-
-    {                           // MT_CORPSEBLOODDRIP
-     -1,                        // doomednum
-     S_CORPSEBLOODDRIP,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CORPSEBLOODDRIP_X1,      // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRIP,                  // deathsound
-     0,                         // speed
-     FRACUNIT,                  // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE,                // flags
-     MF2_LOGRAV                 // flags2
-     },
-
-    {                           // MT_BLOODPOOL
-     111,                       // doomednum
-     S_BLOODPOOL,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC79
-     119,                       // doomednum
-     S_ZCANDLE1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC80
-     113,                       // doomednum
-     S_ZLEAFSPAWNER,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     MF2_DONTDRAW               // flags2
-     },
-
-    {                           // MT_LEAF1
-     -1,                        // doomednum
-     S_LEAF1_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_LEAF_X1,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE,        // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_LEAF2
-     -1,                        // doomednum
-     S_LEAF2_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_LEAF_X1,                 // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE,        // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_ZTWINEDTORCH
-     116,                       // doomednum
-     S_ZTWINEDTORCH_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZTWINEDTORCH_UNLIT
-     117,                       // doomednum
-     S_ZTWINEDTORCH_UNLIT,      // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     10 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BRIDGE
-     118,                       // doomednum
-     S_BRIDGE1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     32 * FRACUNIT,             // radius
-     2 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_NOGRAVITY,   // flags
-     MF2_DONTDRAW               // flags2
-     },
-
-    {                           // MT_BRIDGEBALL
-     -1,                        // doomednum
-     S_BBALL1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ZWALLTORCH
-     54,                        // doomednum
-     S_ZWALLTORCH1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZWALLTORCH_UNLIT
-     55,                        // doomednum
-     S_ZWALLTORCH_U,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZBARREL
-     8100,                      // doomednum
-     S_ZBARREL1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZSHRUB1
-     8101,                      // doomednum
-     S_ZSHRUB1,                 // spawnstate
-     20,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_ZSHRUB1_X1,              // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZSHRUB1_DIE,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_TREE_EXPLODE,          // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     24 * FRACUNIT,             // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZSHRUB2
-     8102,                      // doomednum
-     S_ZSHRUB2,                 // spawnstate
-     10,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_ZSHRUB2_X1,              // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZSHRUB2_DIE,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_TREE_EXPLODE,          // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     40 * FRACUNIT,             // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZBUCKET
-     8103,                      // doomednum
-     S_ZBUCKET1,                // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     72 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZPOISONSHROOM
-     8104,                      // doomednum
-     S_ZPOISONSHROOM1,          // spawnstate
-     30,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_ZPOISONSHROOM_P1,        // painstate
-     255,                       // painchance
-     SFX_POISONSHROOM_PAIN,     // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZPOISONSHROOM_X1,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_POISONSHROOM_DEATH,    // deathsound
-     0,                         // speed
-     6 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SHOOTABLE | MF_SOLID | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZFIREBULL
-     8042,                      // doomednum
-     S_ZFIREBULL1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     80 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZFIREBULL_UNLIT
-     8043,                      // doomednum
-     S_ZFIREBULL_U,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     80 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_FIRETHING
-     8060,                      // doomednum
-     S_ZFIRETHING1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BRASSTORCH
-     8061,                      // doomednum
-     S_ZBRASSTORCH1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     6 * FRACUNIT,              // radius
-     35 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZSUITOFARMOR
-     8064,                      // doomednum
-     S_ZSUITOFARMOR,            // spawnstate
-     60,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZSUITOFARMOR_X1,         // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_SUITOFARMOR_BREAK,     // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     72 * FRACUNIT,             // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZARMORCHUNK
-     -1,                        // doomednum
-     S_ZARMORCHUNK1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     0,                         // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZBELL
-     8065,                      // doomednum
-     S_ZBELL,                   // spawnstate
-     5,                         // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZBELL_X1,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_BELLRING,              // deathsound
-     0,                         // speed
-     56 * FRACUNIT,             // radius
-     120 * FRACUNIT,            // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD | MF_NOGRAVITY | MF_SPAWNCEILING,     // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZBLUE_CANDLE
-     8066,                      // doomednum
-     S_ZBLUE_CANDLE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZIRON_MAIDEN
-     8067,                      // doomednum
-     S_ZIRON_MAIDEN,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     60 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZXMAS_TREE
-     8068,                      // doomednum
-     S_ZXMAS_TREE,              // spawnstate
-     20,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_ZXMAS_TREE_X1,           // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ZXMAS_TREE_DIE,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_TREE_EXPLODE,          // deathsound
-     0,                         // speed
-     11 * FRACUNIT,             // radius
-     130 * FRACUNIT,            // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCAULDRON
-     8069,                      // doomednum
-     S_ZCAULDRON1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     26 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCAULDRON_UNLIT
-     8070,                      // doomednum
-     S_ZCAULDRON_U,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     12 * FRACUNIT,             // radius
-     26 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID,                  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINBIT32
-     8071,                      // doomednum
-     S_ZCHAINBIT32,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINBIT64
-     8072,                      // doomednum
-     S_ZCHAINBIT64,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINEND_HEART
-     8073,                      // doomednum
-     S_ZCHAINEND_HEART,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINEND_HOOK1
-     8074,                      // doomednum
-     S_ZCHAINEND_HOOK1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINEND_HOOK2
-     8075,                      // doomednum
-     S_ZCHAINEND_HOOK2,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINEND_SPIKE
-     8076,                      // doomednum
-     S_ZCHAINEND_SPIKE,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ZCHAINEND_SKULL
-     8077,                      // doomednum
-     S_ZCHAINEND_SKULL,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     32 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SPAWNCEILING,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT1
-     8500,                      // doomednum
-     S_TABLE_SHIT1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT2
-     8501,                      // doomednum
-     S_TABLE_SHIT2,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT3
-     8502,                      // doomednum
-     S_TABLE_SHIT3,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT4
-     8503,                      // doomednum
-     S_TABLE_SHIT4,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT5
-     8504,                      // doomednum
-     S_TABLE_SHIT5,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT6
-     8505,                      // doomednum
-     S_TABLE_SHIT6,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT7
-     8506,                      // doomednum
-     S_TABLE_SHIT7,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT8
-     8507,                      // doomednum
-     S_TABLE_SHIT8,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT9
-     8508,                      // doomednum
-     S_TABLE_SHIT9,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TABLE_SHIT10
-     8509,                      // doomednum
-     S_TABLE_SHIT10,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TFOG
-     -1,                        // doomednum
-     S_TFOG1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MISC81
-     140,                       // doomednum
-     S_TELESMOKE1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_TELEPORTMAN
-     14,                        // doomednum
-     S_NULL,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_PUNCHPUFF
-     -1,                        // doomednum
-     S_PUNCHPUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_FIGHTER_PUNCH_HITTHING,        // seesound
-     8,                         // reactiontime
-     SFX_FIGHTER_PUNCH_HITWALL, // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_FW_AXE
-     8010,                      // doomednum
-     S_AXE,                     // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AXEPUFF
-     -1,                        // doomednum
-     S_HAMMERPUFF1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_FIGHTER_AXE_HITTHING,  // seesound
-     8,                         // reactiontime
-     SFX_FIGHTER_HAMMER_HITWALL,        // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AXEPUFF_GLOW
-     -1,                        // doomednum
-     S_AXEPUFF_GLOW1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_FIGHTER_AXE_HITTHING,  // seesound
-     8,                         // reactiontime
-     SFX_FIGHTER_HAMMER_HITWALL,        // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_AXEBLOOD
-     -1,                        // doomednum
-     S_AXEBLOOD1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_AXEBLOOD6,               // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF, // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
-     },
-
-    {                           // MT_FW_HAMMER
-     123,                       // doomednum
-     S_HAMM,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_HAMMER_MISSILE
-     -1,                        // doomednum
-     S_HAMMER_MISSILE_1,        // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HAMMER_MISSILE_X1,       // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_FIGHTER_HAMMER_EXPLODE,        // deathsound
-     25 * FRACUNIT,             // speed
-     14 * FRACUNIT,             // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     10,                        // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FIREDAMAGE  // flags2
-     },
-
-    {                           // MT_HAMMERPUFF
-     -1,                        // doomednum
-     S_HAMMERPUFF1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_FIGHTER_HAMMER_HITTHING,       // seesound
-     8,                         // reactiontime
-     SFX_FIGHTER_HAMMER_HITWALL,        // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_FSWORD_MISSILE
-     -1,                        // doomednum
-     S_FSWORD_MISSILE1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FSWORD_MISSILE_X1,       // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_FIGHTER_SWORD_EXPLODE, // deathsound
-     30 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     8,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
-     },
-
-    {                           // MT_FSWORD_FLAME
-     -1,                        // doomednum
-     S_FSWORD_FLAME1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CW_SERPSTAFF
-     10,                        // doomednum
-     S_CSTAFF,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CSTAFF_MISSILE
-     -1,                        // doomednum
-     S_CSTAFF_MISSILE1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CSTAFF_MISSILE_X1,       // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_CLERIC_CSTAFF_EXPLODE, // deathsound
-     22 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     5,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
-     },
-
-    {                           // MT_CSTAFFPUFF
-     -1,                        // doomednum
-     S_CSTAFFPUFF1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_CLERIC_CSTAFF_HITTHING,        // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CW_FLAME
-     8009,                      // doomednum
-     S_CFLAME1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CFLAMEFLOOR
-     -1,                        // doomednum
-     S_CFLAMEFLOOR1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_FLAMEPUFF
-     -1,                        // doomednum
-     S_FLAMEPUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_CLERIC_FLAME_EXPLODE,  // seesound
-     8,                         // reactiontime
-     SFX_CLERIC_FLAME_EXPLODE,  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     FRACUNIT,                  // radius
-     FRACUNIT,                  // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_FLAMEPUFF2
-     -1,                        // doomednum
-     S_FLAMEPUFF2_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_CLERIC_FLAME_EXPLODE,  // seesound
-     8,                         // reactiontime
-     SFX_CLERIC_FLAME_EXPLODE,  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     FRACUNIT,                  // radius
-     FRACUNIT,                  // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_CIRCLEFLAME
-     -1,                        // doomednum
-     S_CIRCLE_FLAME1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CIRCLE_FLAME_X1,         // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_CLERIC_FLAME_CIRCLE,   // deathsound
-     0,                         // speed
-     6 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     2,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_CFLAME_MISSILE
-     -1,                        // doomednum
-     S_CFLAME_MISSILE1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CFLAME_MISSILE_X,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     200 * FRACUNIT,            // speed
-     14 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     8,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_DONTDRAW | MF2_FIREDAMAGE   // flags2
-     },
-
-    {                           // MT_HOLY_FX
-     -1,                        // doomednum
-     S_HOLY_FX1,                // spawnstate
-     105,                       // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HOLY_FX_X1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_SPIRIT_DIE,            // deathsound
-     12 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE,     // flags
-     MF2_NOTELEPORT | MF2_SEEKERMISSILE | MF2_RIP | MF2_IMPACT | MF2_PCROSS     // flags2
-     },
-
-    {                           // MT_HOLY_TAIL
-     -1,                        // doomednum
-     S_HOLY_TAIL1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     FRACUNIT,                  // radius
-     FRACUNIT,                  // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_NOCLIP | MF_ALTSHADOW,      // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_HOLY_PUFF
-     -1,                        // doomednum
-     S_HOLY_PUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_HOLY_MISSILE
-     -1,                        // doomednum
-     S_HOLY_MISSILE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_HOLY_MISSILE_X,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     30 * FRACUNIT,             // speed
-     15 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_MISSILE,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_HOLY_MISSILE_PUFF
-     -1,                        // doomednum
-     S_HOLY_MISSILE_P1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW,  // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_MWANDPUFF
-     -1,                        // doomednum
-     S_MWANDPUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH | MF2_NODMGTHRUST  // flags2
-     },
-
-    {                           // MT_MWANDSMOKE
-     -1,                        // doomednum
-     S_MWANDSMOKE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH | MF2_NODMGTHRUST  // flags2
-     },
-
-    {                           // MT_MWAND_MISSILE
-     -1,                        // doomednum
-     S_MWAND_MISSILE1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MWANDPUFF1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     184 * FRACUNIT,            // speed
-     12 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     2,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_RIP | MF2_IMPACT | MF2_PCROSS | MF2_NODMGTHRUST | MF2_CANNOTPUSH      // flags2
-     },
-
-    {                           // MT_MW_LIGHTNING
-     8040,                      // doomednum
-     S_MW_LIGHTNING1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_LIGHTNING_CEILING
-     -1,                        // doomednum
-     S_LIGHTNING_CEILING1,      // spawnstate
-     144,                       // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_LIGHTNING_C_X1,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     25 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     40 * FRACUNIT,             // height
-     100,                       // mass
-     8,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
-     },
-
-    {                           // MT_LIGHTNING_FLOOR
-     -1,                        // doomednum
-     S_LIGHTNING_FLOOR1,        // spawnstate
-     144,                       // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_LIGHTNING_F_X1,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     25 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     40 * FRACUNIT,             // height
-     100,                       // mass
-     8,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
-     },
-
-    {                           // MT_LIGHTNING_ZAP
-     -1,                        // doomednum
-     S_LIGHTNING_ZAP1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_LIGHTNING_ZAP_X8,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     35 * FRACUNIT,             // height
-     100,                       // mass
-     2,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MSTAFF_FX
-     -1,                        // doomednum
-     S_MSTAFF_FX1_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MSTAFF_FX_X1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_MAGE_STAFF_EXPLODE,    // deathsound
-     20 * FRACUNIT,             // speed
-     16 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     6,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE | MF2_RIP | MF2_IMPACT | MF2_PCROSS        // flags2
-     },
-
-    {                           // MT_MSTAFF_FX2
-     -1,                        // doomednum
-     S_MSTAFF_FX2_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MSTAFF_FX2_X1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_MAGE_STAFF_EXPLODE,    // deathsound
-     17 * FRACUNIT,             // speed
-     20 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE | MF2_IMPACT | MF2_PCROSS | MF2_SEEKERMISSILE      // flags2
-     },
-
-    {                           // MT_FW_SWORD1
-     12,                        // doomednum
-     S_FSWORD1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_FW_SWORD2
-     13,                        // doomednum
-     S_FSWORD2,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_FW_SWORD3
-     16,                        // doomednum
-     S_FSWORD3,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_CW_HOLY1
-     18,                        // doomednum
-     S_CHOLY1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_CW_HOLY2
-     19,                        // doomednum
-     S_CHOLY2,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_CW_HOLY3
-     20,                        // doomednum
-     S_CHOLY3,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MW_STAFF1
-     21,                        // doomednum
-     S_MSTAFF1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MW_STAFF2
-     22,                        // doomednum
-     S_MSTAFF2,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MW_STAFF3
-     23,                        // doomednum
-     S_MSTAFF3,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_SNOUTPUFF
-     -1,                        // doomednum
-     S_PUNCHPUFF1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MW_CONE
-     53,                        // doomednum
-     S_COS1,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SHARDFX1
-     -1,                        // doomednum
-     S_SHARDFX1_1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SHARDFXE1_1,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_MAGE_SHARDS_EXPLODE,   // deathsound
-     25 * FRACUNIT,             // speed
-     13 * FRACUNIT,             // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_ICEDAMAGE   // flags2
-     },
-
-    {                           // MT_BLOOD
-     -1,                        // doomednum
-     S_BLOOD1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BLOODSPLATTER
-     -1,                        // doomednum
-     S_BLOODSPLATTER1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BLOODSPLATTERX,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF,   // flags
-     MF2_NOTELEPORT | MF2_CANNOTPUSH    // flags2
-     },
-
-    {                           // MT_GIBS
-     -1,                        // doomednum
-     S_GIBS1,                   // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_CORPSE,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_PLAYER_FIGHTER
-     -1,                        // doomednum
-     S_FPLAY,                   // spawnstate
-     100,                       // spawnhealth
-     S_FPLAY_RUN1,              // seestate
-     SFX_NONE,                  // seesound
-     0,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_FPLAY_PAIN,              // painstate
-     255,                       // painchance
-     SFX_PLAYER_FIGHTER_PAIN,   // painsound
-     S_NULL,                    // meleestate
-     S_FPLAY_ATK1,              // missilestate
-     S_NULL,                    // crashstate
-     S_FPLAY_DIE1,              // deathstate
-     S_FPLAY_XDIE1,             // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
-     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
-     },
-
-    {                           // MT_BLOODYSKULL
-     -1,                        // doomednum
-     S_BLOODYSKULL1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     4 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
-     MF2_LOGRAV | MF2_CANNOTPUSH        // flags2
-     },
-
-    {                           // MT_PLAYER_SPEED
-     -1,                        // doomednum
-     S_PLAYER_SPEED1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_ALTSHADOW,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ICECHUNK
-     -1,                        // doomednum
-     S_ICECHUNK1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
-     MF2_LOGRAV | MF2_CANNOTPUSH | MF2_FLOORCLIP        // flags2
-     },
-
-    {                           // MT_PLAYER_CLERIC
-     -1,                        // doomednum
-     S_CPLAY,                   // spawnstate
-     100,                       // spawnhealth
-     S_CPLAY_RUN1,              // seestate
-     SFX_NONE,                  // seesound
-     0,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_CPLAY_PAIN,              // painstate
-     255,                       // painchance
-     SFX_PLAYER_CLERIC_PAIN,    // painsound
-     S_NULL,                    // meleestate
-     S_CPLAY_ATK1,              // missilestate
-     S_NULL,                    // crashstate
-     S_CPLAY_DIE1,              // deathstate
-     S_CPLAY_XDIE1,             // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
-     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
-     },
-
-    {                           // MT_PLAYER_MAGE
-     -1,                        // doomednum
-     S_MPLAY,                   // spawnstate
-     100,                       // spawnhealth
-     S_MPLAY_RUN1,              // seestate
-     SFX_NONE,                  // seesound
-     0,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_MPLAY_PAIN,              // painstate
-     255,                       // painchance
-     SFX_PLAYER_MAGE_PAIN,      // painsound
-     S_NULL,                    // meleestate
-     S_MPLAY_ATK1,              // missilestate
-     S_NULL,                    // crashstate
-     S_MPLAY_DIE1,              // deathstate
-     S_MPLAY_XDIE1,             // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_PICKUP | MF_NOTDMATCH,   // flags
-     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_SLIDE | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
-     },
-
-    {                           // MT_PIGPLAYER
-     -1,                        // doomednum
-     S_PIGPLAY,                 // spawnstate
-     100,                       // spawnhealth
-     S_PIGPLAY_RUN1,            // seestate
-     SFX_NONE,                  // seesound
-     0,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_PIGPLAY_PAIN,            // painstate
-     255,                       // painchance
-     SFX_PIG_PAIN,              // painsound
-     S_NULL,                    // meleestate
-     S_PIGPLAY_ATK1,            // missilestate
-     S_NULL,                    // crashstate
-     S_PIG_DIE1,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_PIG_DEATH,             // deathsound
-     0,                         // speed
-     16 * FRACUNIT,             // radius
-     24 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_DROPOFF | MF_NOTDMATCH,       // flags
-     MF2_WINDTHRUST | MF2_SLIDE | MF2_PASSMOBJ | MF2_FLOORCLIP | MF2_TELESTOMP | MF2_PUSHWALL   // flags2
-     },
-
-    {                           // MT_PIG
-     -1,                        // doomednum
-     S_PIG_LOOK1,               // spawnstate
-     25,                        // spawnhealth
-     S_PIG_WALK1,               // seestate
-     SFX_PIG_ACTIVE1,           // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_PIG_PAIN,                // painstate
-     128,                       // painchance
-     SFX_PIG_PAIN,              // painsound
-     S_PIG_ATK1,                // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_PIG_DIE1,                // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_PIG_DEATH,             // deathsound
-     10,                        // speed
-     12 * FRACUNIT,             // radius
-     22 * FRACUNIT,             // height
-     60,                        // mass
-     0,                         // damage
-     SFX_PIG_ACTIVE1,           // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_WINDTHRUST | MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP       // flags2
-     },
-
-    {                           // MT_CENTAUR
-     107,                       // doomednum
-     S_CENTAUR_LOOK1,           // spawnstate
-     200,                       // spawnhealth
-     S_CENTAUR_WALK1,           // seestate
-     SFX_CENTAUR_SIGHT,         // seesound
-     8,                         // reactiontime
-     SFX_CENTAUR_ATTACK,        // attacksound
-     S_CENTAUR_PAIN1,           // painstate
-     135,                       // painchance
-     SFX_CENTAUR_PAIN,          // painsound
-     S_CENTAUR_ATK1,            // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_CENTAUR_DEATH1,          // deathstate
-     S_CENTAUR_DEATH_X1,        // xdeathstate
-     SFX_CENTAUR_DEATH,         // deathsound
-     13,                        // speed
-     20 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     120,                       // mass
-     0,                         // damage
-     SFX_CENTAUR_ACTIVE,        // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP   // flags2
-     },
-
-    {                           // MT_CENTAURLEADER
-     115,                       // doomednum
-     S_CENTAUR_LOOK1,           // spawnstate
-     250,                       // spawnhealth
-     S_CENTAUR_WALK1,           // seestate
-     SFX_CENTAUR_SIGHT,         // seesound
-     8,                         // reactiontime
-     SFX_CENTAUR_ATTACK,        // attacksound
-     S_CENTAUR_PAIN1,           // painstate
-     96,                        // painchance
-     SFX_CENTAUR_PAIN,          // painsound
-     S_CENTAUR_ATK1,            // meleestate
-     S_CENTAUR_MISSILE1,        // missilestate
-     S_NULL,                    // crashstate
-     S_CENTAUR_DEATH1,          // deathstate
-     S_CENTAUR_DEATH_X1,        // xdeathstate
-     SFX_CENTAUR_DEATH,         // deathsound
-     10,                        // speed
-     20 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     120,                       // mass
-     0,                         // damage
-     SFX_CENTAUR_ACTIVE,        // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP   // flags2
-     },
-
-    {                           // MT_CENTAUR_FX
-     -1,                        // doomednum
-     S_CENTAUR_FX1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CENTAUR_FX_X1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_CENTAUR_MISSILE_EXPLODE,       // deathsound
-     20 * FRACUNIT,             // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS   // flags2
-     },
-
-    {                           // MT_CENTAUR_SHIELD
-     -1,                        // doomednum
-     S_CENTAUR_SHIELD1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CENTAUR_SHIELD_X1,       // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_DROPOFF | MF_CORPSE,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_CENTAUR_SWORD
-     -1,                        // doomednum
-     S_CENTAUR_SWORD1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_CENTAUR_SWORD_X1,        // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_DROPOFF | MF_CORPSE,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DEMON
-     31,                        // doomednum
-     S_DEMN_LOOK1,              // spawnstate
-     250,                       // spawnhealth
-     S_DEMN_CHASE1,             // seestate
-     SFX_DEMON_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_DEMON_ATTACK,          // attacksound
-     S_DEMN_PAIN1,              // painstate
-     50,                        // painchance
-     SFX_DEMON_PAIN,            // painsound
-     S_DEMN_ATK1_1,             // meleestate
-     S_DEMN_ATK2_1,             // missilestate
-     S_NULL,                    // crashstate
-     S_DEMN_DEATH1,             // deathstate
-     S_DEMN_XDEATH1,            // xdeathstate
-     SFX_DEMON_DEATH,           // deathsound
-     13,                        // speed
-     32 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     220,                       // mass
-     0,                         // damage
-     SFX_DEMON_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_TELESTOMP  // flags2
-     },
-
-    {                           // MT_DEMONCHUNK1
-     -1,                        // doomednum
-     S_DEMONCHUNK1_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMONCHUNK1_4,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMONCHUNK2
-     -1,                        // doomednum
-     S_DEMONCHUNK2_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMONCHUNK2_4,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMONCHUNK3
-     -1,                        // doomednum
-     S_DEMONCHUNK3_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMONCHUNK3_4,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMONCHUNK4
-     -1,                        // doomednum
-     S_DEMONCHUNK4_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMONCHUNK4_4,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMONCHUNK5
-     -1,                        // doomednum
-     S_DEMONCHUNK5_1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMONCHUNK5_4,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMONFX1
-     -1,                        // doomednum
-     S_DEMONFX_MOVE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMONFX_BOOM1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DEMON_MISSILE_EXPLODE, // deathsound
-     15 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     5,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FIREDAMAGE  // flags2
-     },
-
-    {                           // MT_DEMON2
-     8080,                      // doomednum
-     S_DEMN2_LOOK1,             // spawnstate
-     250,                       // spawnhealth
-     S_DEMN2_CHASE1,            // seestate
-     SFX_DEMON_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_DEMON_ATTACK,          // attacksound
-     S_DEMN2_PAIN1,             // painstate
-     50,                        // painchance
-     SFX_DEMON_PAIN,            // painsound
-     S_DEMN2_ATK1_1,            // meleestate
-     S_DEMN2_ATK2_1,            // missilestate
-     S_NULL,                    // crashstate
-     S_DEMN2_DEATH1,            // deathstate
-     S_DEMN2_XDEATH1,           // xdeathstate
-     SFX_DEMON_DEATH,           // deathsound
-     13,                        // speed
-     32 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     220,                       // mass
-     0,                         // damage
-     SFX_DEMON_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_TELESTOMP  // flags2
-     },
-
-    {                           // MT_DEMON2CHUNK1
-     -1,                        // doomednum
-     S_DEMON2CHUNK1_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMON2CHUNK1_4,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMON2CHUNK2
-     -1,                        // doomednum
-     S_DEMON2CHUNK2_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMON2CHUNK2_4,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMON2CHUNK3
-     -1,                        // doomednum
-     S_DEMON2CHUNK3_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMON2CHUNK3_4,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMON2CHUNK4
-     -1,                        // doomednum
-     S_DEMON2CHUNK4_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMON2CHUNK4_4,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMON2CHUNK5
-     -1,                        // doomednum
-     S_DEMON2CHUNK5_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMON2CHUNK5_4,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_CORPSE,       // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_DEMON2FX1
-     -1,                        // doomednum
-     S_DEMON2FX_MOVE1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DEMON2FX_BOOM1,          // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DEMON_MISSILE_EXPLODE, // deathsound
-     15 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     5,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE | MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FIREDAMAGE  // flags2
-     },
-
-    {                           // MT_WRAITHB
-     10011,                     // doomednum
-     S_WRAITH_LOOK1,            // spawnstate
-     150,                       // spawnhealth
-     S_WRAITH_RAISE1,           // seestate
-     SFX_WRAITH_SIGHT,          // seesound
-     8,                         // reactiontime
-     SFX_WRAITH_ATTACK,         // attacksound
-     S_WRAITH_PAIN1,            // painstate
-     25,                        // painchance
-     SFX_WRAITH_PAIN,           // painsound
-     S_WRAITH_ATK1_1,           // meleestate
-     S_WRAITH_ATK2_1,           // missilestate
-     S_NULL,                    // crashstate
-     S_WRAITH_DEATH1_1,         // deathstate
-     S_WRAITH_DEATH2_1,         // xdeathstate
-     SFX_WRAITH_DEATH,          // deathsound
-     11,                        // speed
-     20 * FRACUNIT,             // radius
-     68 * FRACUNIT,             // height
-     75,                        // mass
-     10,                        // damage
-     SFX_WRAITH_ACTIVE,         // activesound
-     MF_DROPOFF | MF_NOGRAVITY | MF_FLOAT | MF_COUNTKILL,       // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP | MF2_DONTDRAW // flags2
-     },
-
-    {                           // MT_WRAITH
-     34,                        // doomednum
-     S_WRAITH_INIT1,            // spawnstate
-     150,                       // spawnhealth
-     S_WRAITH_CHASE1,           // seestate
-     SFX_WRAITH_SIGHT,          // seesound
-     8,                         // reactiontime
-     SFX_WRAITH_ATTACK,         // attacksound
-     S_WRAITH_PAIN1,            // painstate
-     25,                        // painchance
-     SFX_WRAITH_PAIN,           // painsound
-     S_WRAITH_ATK1_1,           // meleestate
-     S_WRAITH_ATK2_1,           // missilestate
-     S_NULL,                    // crashstate
-     S_WRAITH_DEATH1_1,         // deathstate
-     S_WRAITH_DEATH2_1,         // xdeathstate
-     SFX_WRAITH_DEATH,          // deathsound
-     11,                        // speed
-     20 * FRACUNIT,             // radius
-     55 * FRACUNIT,             // height
-     75,                        // mass
-     10,                        // damage
-     SFX_WRAITH_ACTIVE,         // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF | MF_NOGRAVITY | MF_FLOAT,     // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP        // flags2
-     },
-
-    {                           // MT_WRAITHFX1
-     -1,                        // doomednum
-     S_WRTHFX_MOVE1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_WRTHFX_BOOM1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_WRAITH_MISSILE_EXPLODE,        // deathsound
-     14 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     5,                         // mass
-     5,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF | MF_MISSILE,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FLOORCLIP | MF2_FIREDAMAGE  // flags2
-     },
-
-    {                           // MT_WRAITHFX2
-     -1,                        // doomednum
-     S_WRTHFX_SIZZLE1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_WRAITHFX3
-     -1,                        // doomednum
-     S_WRTHFX_DROP1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_WRTHFX_DEAD1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRIP,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_WRAITHFX4
-     -1,                        // doomednum
-     S_WRTHFX_ADROP1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_WRTHFX_ADEAD1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRIP,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_WRAITHFX5
-     -1,                        // doomednum
-     S_WRTHFX_BDROP1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_WRTHFX_BDEAD1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRIP,                  // deathsound
-     0,                         // speed
-     2 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     5,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_MINOTAUR
-     9,                         // doomednum
-     S_MNTR_SPAWN1,             // spawnstate
-     2500,                      // spawnhealth
-     S_MNTR_WALK1,              // seestate
-     SFX_MAULATOR_SIGHT,        // seesound
-     8,                         // reactiontime
-     SFX_MAULATOR_HAMMER_SWING, // attacksound
-     S_MNTR_PAIN1,              // painstate
-     25,                        // painchance
-     SFX_MAULATOR_PAIN,         // painsound
-     S_MNTR_ATK1_1,             // meleestate
-     S_MNTR_ATK2_1,             // missilestate
-     S_NULL,                    // crashstate
-     S_MNTR_DIE1,               // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_MAULATOR_DEATH,        // deathsound
-     16,                        // speed
-     28 * FRACUNIT,             // radius
-     100 * FRACUNIT,            // height
-     800,                       // mass
-     7,                         // damage
-     SFX_MAULATOR_ACTIVE,       // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_SHADOW,        // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP        // flags2
-     },
-
-    {                           // MT_MNTRFX1
-     -1,                        // doomednum
-     S_MNTRFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MNTRFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     20 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     3,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_MNTRFX2
-     -1,                        // doomednum
-     S_MNTRFX2_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MNTRFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     14 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     12 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_MNTRFX3
-     -1,                        // doomednum
-     S_MNTRFX3_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_MNTRFXI2_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_MNTRSMOKE
-     -1,                        // doomednum
-     S_MINOSMOKE1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_MNTRSMOKEEXIT
-     -1,                        // doomednum
-     S_MINOSMOKEX1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SERPENT
-     121,                       // doomednum
-     S_SERPENT_LOOK1,           // spawnstate
-     90,                        // spawnhealth
-     S_SERPENT_SWIM1,           // seestate
-     SFX_SERPENT_SIGHT,         // seesound
-     8,                         // reactiontime
-     SFX_SERPENT_ATTACK,        // attacksound
-     S_SERPENT_PAIN1,           // painstate
-     96,                        // painchance
-     SFX_SERPENT_PAIN,          // painsound
-     S_SERPENT_SURFACE1,        // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SERPENT_DIE1,            // deathstate
-     S_SERPENT_XDIE1,           // xdeathstate
-     SFX_SERPENT_DEATH,         // deathsound
-     12,                        // speed
-     32 * FRACUNIT,             // radius
-     70 * FRACUNIT,             // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_COUNTKILL | MF_NOBLOOD,      // flags
-     MF2_PASSMOBJ | MF2_DONTDRAW | MF2_CANTLEAVEFLOORPIC | MF2_NONSHOOTABLE | MF2_MCROSS        // flags2
-     },
-
-    {                           // MT_SERPENTLEADER
-     120,                       // doomednum
-     S_SERPENT_LOOK1,           // spawnstate
-     90,                        // spawnhealth
-     S_SERPENT_SWIM1,           // seestate
-     SFX_SERPENT_SIGHT,         // seesound
-     8,                         // reactiontime
-     SFX_SERPENT_ATTACK,        // attacksound
-     S_SERPENT_PAIN1,           // painstate
-     96,                        // painchance
-     SFX_SERPENT_PAIN,          // painsound
-     S_SERPENT_SURFACE1,        // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SERPENT_DIE1,            // deathstate
-     S_SERPENT_XDIE1,           // xdeathstate
-     SFX_SERPENT_DEATH,         // deathsound
-     12,                        // speed
-     32 * FRACUNIT,             // radius
-     70 * FRACUNIT,             // height
-     200,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_COUNTKILL | MF_NOBLOOD,      // flags
-     MF2_PASSMOBJ | MF2_DONTDRAW | MF2_CANTLEAVEFLOORPIC | MF2_NONSHOOTABLE | MF2_MCROSS        // flags2
-     },
-
-    {                           // MT_SERPENTFX
-     -1,                        // doomednum
-     S_SERPENT_FX1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     0,                         // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SERPENT_FX_X1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_SERPENTFX_HIT,         // deathsound
-     15 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     4,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SERPENT_HEAD
-     -1,                        // doomednum
-     S_SERPENT_HEAD1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     MF2_LOGRAV                 // flags2
-     },
-
-    {                           // MT_SERPENT_GIB1
-     -1,                        // doomednum
-     S_SERPENT_GIB1_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     3 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SERPENT_GIB2
-     -1,                        // doomednum
-     S_SERPENT_GIB2_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     3 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SERPENT_GIB3
-     -1,                        // doomednum
-     S_SERPENT_GIB3_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     3 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BISHOP
-     114,                       // doomednum
-     S_BISHOP_LOOK1,            // spawnstate
-     130,                       // spawnhealth
-     S_BISHOP_WALK1,            // seestate
-     SFX_BISHOP_SIGHT,          // seesound
-     8,                         // reactiontime
-     SFX_BISHOP_ATTACK,         // attacksound
-     S_BISHOP_PAIN1,            // painstate
-     110,                       // painchance
-     SFX_BISHOP_PAIN,           // painsound
-     0,                         // meleestate
-     S_BISHOP_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_BISHOP_DEATH1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_BISHOP_DEATH,          // deathsound
-     10,                        // speed
-     22 * FRACUNIT,             // radius
-     65 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_BISHOP_ACTIVE,         // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_FLOAT | MF_NOGRAVITY | MF_NOBLOOD,     // flags
-     MF2_PASSMOBJ | MF2_PUSHWALL | MF2_TELESTOMP        // flags2
-     },
-
-    {                           // MT_BISHOP_PUFF
-     -1,                        // doomednum
-     S_BISHOP_PUFF1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SHADOW | MF_NOBLOCKMAP | MF_NOGRAVITY,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BISHOPBLUR
-     -1,                        // doomednum
-     S_BISHOPBLUR1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BISHOPPAINBLUR
-     -1,                        // doomednum
-     S_BISHOPPAINBLUR1,         // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW,  // flags
-     0                          // flags2
-     },
-
-    {                           // MT_BISH_FX
-     -1,                        // doomednum
-     S_BISHFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BISHFXI1_1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_BISHOP_MISSILE_EXPLODE,        // deathsound
-     10 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_SEEKERMISSILE // flags2
-     },
-
-    {                           // MT_DRAGON
-     254,                       // doomednum
-     S_DRAGON_LOOK1,            // spawnstate
-     640,                       // spawnhealth
-     S_DRAGON_INIT,             // seestate
-     SFX_DRAGON_SIGHT,          // seesound
-     8,                         // reactiontime
-     SFX_DRAGON_ATTACK,         // attacksound
-     S_DRAGON_PAIN1,            // painstate
-     128,                       // painchance
-     SFX_DRAGON_PAIN,           // painsound
-     S_NULL,                    // meleestate
-     S_DRAGON_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_DRAGON_DEATH1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRAGON_DEATH,          // deathsound
-     10 * FRACUNIT,             // speed
-     20 * FRACUNIT,             // radius
-     65 * FRACUNIT,             // height
-     INT_MAX,                    // mass
-     0,                         // damage
-     SFX_DRAGON_ACTIVE,         // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_FLOAT | MF_NOGRAVITY | MF_NOBLOOD,     // flags
-     MF2_PASSMOBJ | MF2_BOSS    // flags2
-     },
-
-    {                           // MT_DRAGON_FX
-     -1,                        // doomednum
-     S_DRAGON_FX1_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_DRAGON_FX1_X1,           // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRAGON_FIREBALL_EXPLODE,       // deathsound
-     24 * FRACUNIT,             // speed
-     12 * FRACUNIT,             // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     6,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE    // flags2
-     },
-
-    {                           // MT_DRAGON_FX2
-     -1,                        // doomednum
-     S_DRAGON_FX2_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRAGON_FIREBALL_EXPLODE,       // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP,             // flags
-     MF2_NOTELEPORT | MF2_FIREDAMAGE | MF2_DONTDRAW     // flags2
-     },
-
-    {                           // MT_ARMOR_1
-     8005,                      // doomednum
-     S_ARMOR_1,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARMOR_2
-     8006,                      // doomednum
-     S_ARMOR_2,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARMOR_3
-     8007,                      // doomednum
-     S_ARMOR_3,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ARMOR_4
-     8008,                      // doomednum
-     S_ARMOR_4,                 // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL | MF_NOGRAVITY, // flags
-     0                          // flags2
-     },
-
-    {                           // MT_MANA1
-     122,                       // doomednum
-     S_MANA1_1,                 // spawnstate
-     10,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MANA2
-     124,                       // doomednum
-     S_MANA2_1,                 // spawnstate
-     10,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_MANA3
-     8004,                      // doomednum
-     S_MANA3_1,                 // spawnstate
-     20,                        // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     8 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     MF2_FLOATBOB               // flags2
-     },
-
-    {                           // MT_KEY1
-     8030,                      // doomednum
-     S_KEY1,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY2
-     8031,                      // doomednum
-     S_KEY2,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY3
-     8032,                      // doomednum
-     S_KEY3,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY4
-     8033,                      // doomednum
-     S_KEY4,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY5
-     8034,                      // doomednum
-     S_KEY5,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY6
-     8035,                      // doomednum
-     S_KEY6,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY7
-     8036,                      // doomednum
-     S_KEY7,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY8
-     8037,                      // doomednum
-     S_KEY8,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEY9
-     8038,                      // doomednum
-     S_KEY9,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEYA
-     8039,                      // doomednum
-     S_KEYA,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_KEYB
-     8200,                      // doomednum
-     S_KEYB,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     8 * FRACUNIT,              // radius
-     20 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SPECIAL,                // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SOUNDWIND
-     1410,                      // doomednum
-     S_SND_WIND1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_SOUNDWATERFALL
-     41,                        // doomednum
-     S_SND_WATERFALL,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR,       // flags
-     0                          // flags2
-     },
-
-    {                           // MT_ETTIN
-     10030,                     // doomednum
-     S_ETTIN_LOOK1,             // spawnstate
-     175,                       // spawnhealth
-     S_ETTIN_CHASE1,            // seestate
-     SFX_ETTIN_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_ETTIN_ATTACK,          // attacksound
-     S_ETTIN_PAIN1,             // painstate
-     60,                        // painchance
-     SFX_ETTIN_PAIN,            // painsound
-     S_ETTIN_ATK1_1,            // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ETTIN_DEATH1_1,          // deathstate
-     S_ETTIN_DEATH2_1,          // xdeathstate
-     SFX_ETTIN_DEATH,           // deathsound
-     13,                        // speed
-     25 * FRACUNIT,             // radius
-     68 * FRACUNIT,             // height
-     175,                       // mass
-     3,                         // damage
-     SFX_ETTIN_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP  // flags2
-     },
-
-    {                           // MT_ETTIN_MACE
-     -1,                        // doomednum
-     S_ETTIN_MACE1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ETTIN_MACE5,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_DROPOFF | MF_CORPSE,    // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_FIREDEMON
-     10060,                     // doomednum
-     S_FIRED_SPAWN1,            // spawnstate
-     80,                        // spawnhealth
-     S_FIRED_LOOK4,             // seestate
-     SFX_FIRED_SPAWN,           // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_FIRED_PAIN1,             // painstate
-     1,                         // painchance
-     SFX_FIRED_PAIN,            // painsound
-     S_NULL,                    // meleestate
-     S_FIRED_ATTACK1,           // missilestate
-     S_FIRED_XDEATH1,           // crashstate
-     S_FIRED_DEATH1,            // deathstate
-     S_FIRED_XDEATH1,           // xdeathstate
-     SFX_FIRED_DEATH,           // deathsound
-     13,                        // speed
-     20 * FRACUNIT,             // radius
-     68 * FRACUNIT,             // height
-     75,                        // mass
-     1,                         // damage
-     SFX_FIRED_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_DROPOFF | MF_NOGRAVITY | MF_FLOAT,     // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_INVULNERABLE | MF2_MCROSS | MF2_TELESTOMP        // flags2
-     },
-
-    {                           // MT_FIREDEMON_SPLOTCH1
-     -1,                        // doomednum
-     S_FIRED_CORPSE1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_DROPOFF | MF_CORPSE,    // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_FIREDEMON_SPLOTCH2
-     -1,                        // doomednum
-     S_FIRED_CORPSE4,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_DROPOFF | MF_CORPSE,    // flags
-     MF2_NOTELEPORT | MF2_FLOORCLIP     // flags2
-     },
-
-    {                           // MT_FIREDEMON_FX1
-     -1,                        // doomednum
-     S_FIRED_RDROP1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIRED_RDEAD1_1,          // deathstate
-     S_FIRED_RDEAD1_2,          // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     16,                        // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FIREDEMON_FX2
-     -1,                        // doomednum
-     S_FIRED_RDROP2,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIRED_RDEAD2_1,          // deathstate
-     S_FIRED_RDEAD2_2,          // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     16,                        // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FIREDEMON_FX3
-     -1,                        // doomednum
-     S_FIRED_RDROP3,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIRED_RDEAD3_1,          // deathstate
-     S_FIRED_RDEAD3_2,          // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     16,                        // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FIREDEMON_FX4
-     -1,                        // doomednum
-     S_FIRED_RDROP4,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIRED_RDEAD4_1,          // deathstate
-     S_FIRED_RDEAD4_2,          // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     16,                        // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FIREDEMON_FX5
-     -1,                        // doomednum
-     S_FIRED_RDROP5,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIRED_RDEAD5_1,          // deathstate
-     S_FIRED_RDEAD5_2,          // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     3 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     16,                        // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FIREDEMON_FX6
-     -1,                        // doomednum
-     S_FIRED_FX6_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_FIRED_FX6_2,             // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_FIRED_MISSILE_HIT,     // deathsound
-     10 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     6 * FRACUNIT,              // height
-     15,                        // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_DROPOFF | MF_MISSILE,    // flags
-     MF2_NOTELEPORT | MF2_IMPACT | MF2_PCROSS | MF2_FLOORCLIP | MF2_FIREDAMAGE  // flags2
-     },
-
-    {                           // MT_ICEGUY
-     8020,                      // doomednum
-     S_ICEGUY_LOOK,             // spawnstate
-     120,                       // spawnhealth
-     S_ICEGUY_WALK1,            // seestate
-     SFX_ICEGUY_SIGHT,          // seesound
-     8,                         // reactiontime
-     SFX_ICEGUY_ATTACK,         // attacksound
-     S_ICEGUY_PAIN1,            // painstate
-     144,                       // painchance
-     SFX_NONE,                  // painsound
-     0,                         // meleestate
-     S_ICEGUY_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_ICEGUY_DEATH,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     14,                        // speed
-     22 * FRACUNIT,             // radius
-     75 * FRACUNIT,             // height
-     150,                       // mass
-     0,                         // damage
-     SFX_ICEGUY_ACTIVE,         // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
-     MF2_PASSMOBJ | MF2_PUSHWALL | MF2_ICEDAMAGE | MF2_MCROSS | MF2_TELESTOMP   // flags2
-     },
-
-    {                           // MT_ICEGUY_FX
-     -1,                        // doomednum
-     S_ICEGUY_FX1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_ICEGUY_FX_X1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_ICEGUY_FX_EXPLODE,     // deathsound
-     14 * FRACUNIT,             // speed
-     8 * FRACUNIT,              // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY,    // flags
-     MF2_NOTELEPORT | MF2_ICEDAMAGE     // flags2
-     },
-
-    {                           // MT_ICEFX_PUFF
-     -1,                        // doomednum
-     S_ICEFX_PUFF1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     FRACUNIT,                  // radius
-     FRACUNIT,                  // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_SHADOW | MF_DROPOFF,     // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ICEGUY_FX2
-     -1,                        // doomednum
-     S_ICEGUY_FX2_1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     10 * FRACUNIT,             // speed
-     4 * FRACUNIT,              // radius
-     4 * FRACUNIT,              // height
-     100,                       // mass
-     1,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_MISSILE,   // flags
-     MF2_NOTELEPORT | MF2_LOGRAV | MF2_ICEDAMAGE        // flags2
-     },
-
-    {                           // MT_ICEGUY_BIT
-     -1,                        // doomednum
-     S_ICEGUY_BIT1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     FRACUNIT,                  // radius
-     FRACUNIT,                  // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_ICEGUY_WISP1
-     -1,                        // doomednum
-     S_ICEGUY_WISP1_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE,     // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_ICEGUY_WISP2
-     -1,                        // doomednum
-     S_ICEGUY_WISP2_1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE,     // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_FIGHTER_BOSS
-     10100,                     // doomednum
-     S_FIGHTER,                 // spawnstate
-     800,                       // spawnhealth
-     S_FIGHTER_RUN1,            // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_FIGHTER_PAIN,            // painstate
-     50,                        // painchance
-     SFX_PLAYER_FIGHTER_PAIN,   // painsound
-     S_FIGHTER_ATK1,            // meleestate
-     S_FIGHTER_ATK1,            // missilestate
-     S_NULL,                    // crashstate
-     S_FIGHTER_DIE1,            // deathstate
-     S_FIGHTER_XDIE1,           // xdeathstate
-     SFX_PLAYER_FIGHTER_CRAZY_DEATH,    // deathsound
-     25,                        // speed
-     16 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL | MF2_MCROSS   // flags2
-     },
-
-    {                           // MT_CLERIC_BOSS
-     10101,                     // doomednum
-     S_CLERIC,                  // spawnstate
-     800,                       // spawnhealth
-     S_CLERIC_RUN1,             // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_CLERIC_PAIN,             // painstate
-     50,                        // painchance
-     SFX_PLAYER_CLERIC_PAIN,    // painsound
-     S_CLERIC_ATK1,             // meleestate
-     S_CLERIC_ATK1,             // missilestate
-     S_NULL,                    // crashstate
-     S_CLERIC_DIE1,             // deathstate
-     S_CLERIC_XDIE1,            // xdeathstate
-     SFX_PLAYER_CLERIC_CRAZY_DEATH,     // deathsound
-     25,                        // speed
-     16 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL | MF2_MCROSS   // flags2
-     },
-
-    {                           // MT_MAGE_BOSS
-     10102,                     // doomednum
-     S_MAGE,                    // spawnstate
-     800,                       // spawnhealth
-     S_MAGE_RUN1,               // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_MAGE_PAIN,               // painstate
-     50,                        // painchance
-     SFX_PLAYER_MAGE_PAIN,      // painsound
-     S_MAGE_ATK1,               // meleestate
-     S_MAGE_ATK1,               // missilestate
-     S_NULL,                    // crashstate
-     S_MAGE_DIE1,               // deathstate
-     S_MAGE_XDIE1,              // xdeathstate
-     SFX_PLAYER_MAGE_CRAZY_DEATH,       // deathsound
-     25,                        // speed
-     16 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_TELESTOMP | MF2_PUSHWALL | MF2_MCROSS   // flags2
-     },
-
-    {                           // MT_SORCBOSS
-     10080,                     // doomednum
-     S_SORC_SPAWN1,             // spawnstate
-     5000,                      // spawnhealth
-     S_SORC_WALK1,              // seestate
-     SFX_SORCERER_SIGHT,        // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_SORC_PAIN1,              // painstate
-     10,                        // painchance
-     SFX_SORCERER_PAIN,         // painsound
-     S_NULL,                    // meleestate
-     S_SORC_ATK2_1,             // missilestate
-     S_NULL,                    // crashstate
-     S_SORC_DIE1,               // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_SORCERER_DEATHSCREAM,  // deathsound
-     16,                        // speed
-     40 * FRACUNIT,             // radius
-     110 * FRACUNIT,            // height
-     500,                       // mass
-     9,                         // damage
-     SFX_SORCERER_ACTIVE,       // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOBLOOD,       // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_PUSHWALL | MF2_BOSS | MF2_MCROSS        // flags2
-     },
-
-    {                           // MT_SORCBALL1
-     -1,                        // doomednum
-     S_SORCBALL1_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_SORCERER_BALLBOUNCE,   // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_SORCBALL1_D1,            // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SORCBALL1_D5,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     10 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SORCBALL2
-     -1,                        // doomednum
-     S_SORCBALL2_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_SORCERER_BALLBOUNCE,   // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_SORCBALL2_D1,            // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SORCBALL2_D5,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     10 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SORCBALL3
-     -1,                        // doomednum
-     S_SORCBALL3_1,             // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_SORCERER_BALLBOUNCE,   // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_SORCBALL3_D1,            // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SORCBALL3_D5,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     10 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SORCFX1
-     -1,                        // doomednum
-     S_SORCFX1_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_SORCERER_BALLBOUNCE,   // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SORCFX1_D1,              // deathstate
-     S_SORCFX1_D1,              // xdeathstate
-     SFX_NONE,                  // deathsound
-     7 * FRACUNIT,              // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE,        // flags
-     MF2_NOTELEPORT | MF2_FLOORBOUNCE   // flags2
-     },
-
-    {                           // MT_SORCFX2
-     -1,                        // doomednum
-     S_SORCFX2_SPLIT1,          // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SORCFX2T1,               // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     15 * FRACUNIT,             // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY,      // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SORCFX2_T1
-     -1,                        // doomednum
-     S_SORCFX2T1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_ALTSHADOW,       // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SORCFX3
-     -1,                        // doomednum
-     S_SORCFX3_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_SORCERER_BISHOPSPAWN,  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BISHMORPH1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     15 * FRACUNIT,             // speed
-     22 * FRACUNIT,             // radius
-     65 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE,        // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SORCFX3_EXPLOSION
-     -1,                        // doomednum
-     S_SORCFX3_EXP1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_ALTSHADOW,       // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SORCFX4
-     -1,                        // doomednum
-     S_SORCFX4_1,               // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_SORCFX4_D1,              // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_SORCERER_BALLEXPLODE,  // deathsound
-     12 * FRACUNIT,             // speed
-     10 * FRACUNIT,             // radius
-     10 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_MISSILE | MF_NOGRAVITY, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_SORCSPARK1
-     -1,                        // doomednum
-     S_SORCSPARK1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     5 * FRACUNIT,              // radius
-     5 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF,        // flags
-     MF2_NOTELEPORT | MF2_LOGRAV        // flags2
-     },
-
-    {                           // MT_BLASTEFFECT
-     -1,                        // doomednum
-     S_BLASTEFFECT1,            // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_NOCLIP | MF_ALTSHADOW,   // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_WATER_DRIP
-     -1,                        // doomednum
-     S_WATERDRIP1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DRIP,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     1,                         // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_MISSILE,                // flags
-     MF2_LOGRAV | MF2_NOTELEPORT        // flags2
-     },
-
-    {                           // MT_KORAX
-     10200,                     // doomednum
-     S_KORAX_LOOK1,             // spawnstate
-     5000,                      // spawnhealth
-     S_KORAX_CHASE2,            // seestate
-     SFX_KORAX_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_KORAX_ATTACK,          // attacksound
-     S_KORAX_PAIN1,             // painstate
-     20,                        // painchance
-     SFX_KORAX_PAIN,            // painsound
-     S_NULL,                    // meleestate
-     S_KORAX_ATTACK1,           // missilestate
-     S_NULL,                    // crashstate
-     S_KORAX_DEATH1,            // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_KORAX_DEATH,           // deathsound
-     10,                        // speed
-     65 * FRACUNIT,             // radius
-     115 * FRACUNIT,            // height
-     2000,                      // mass
-     15,                        // damage
-     SFX_KORAX_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,    // flags
-     MF2_FLOORCLIP | MF2_PUSHWALL | MF2_MCROSS | MF2_TELESTOMP | MF2_BOSS       // flags2
-     },
-
-    {                           // MT_KORAX_SPIRIT1
-     -1,                        // doomednum
-     S_KSPIRIT_ROAM1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     8 * FRACUNIT,              // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_KORAX_SPIRIT2
-     -1,                        // doomednum
-     S_KSPIRIT_ROAM1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     8 * FRACUNIT,              // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_KORAX_SPIRIT3
-     -1,                        // doomednum
-     S_KSPIRIT_ROAM1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     8 * FRACUNIT,              // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_KORAX_SPIRIT4
-     -1,                        // doomednum
-     S_KSPIRIT_ROAM1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     8 * FRACUNIT,              // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_KORAX_SPIRIT5
-     -1,                        // doomednum
-     S_KSPIRIT_ROAM1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     8 * FRACUNIT,              // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_KORAX_SPIRIT6
-     -1,                        // doomednum
-     S_KSPIRIT_ROAM1,           // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     8 * FRACUNIT,              // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_DROPOFF | MF_NOGRAVITY | MF_ALTSHADOW | MF_MISSILE | MF_NOCLIP, // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_DEMON_MASH
-     -1,                        // doomednum
-     S_DEMN_LOOK1,              // spawnstate
-     250,                       // spawnhealth
-     S_DEMN_CHASE1,             // seestate
-     SFX_DEMON_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_DEMON_ATTACK,          // attacksound
-     S_DEMN_PAIN1,              // painstate
-     50,                        // painchance
-     SFX_DEMON_PAIN,            // painsound
-     S_DEMN_ATK1_1,             // meleestate
-     S_DEMN_ATK2_1,             // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DEMON_DEATH,           // deathsound
-     13,                        // speed
-     32 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     220,                       // mass
-     0,                         // damage
-     SFX_DEMON_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
-     },
-
-    {                           // MT_DEMON2_MASH
-     -1,                        // doomednum
-     S_DEMN2_LOOK1,             // spawnstate
-     250,                       // spawnhealth
-     S_DEMN2_CHASE1,            // seestate
-     SFX_DEMON_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_DEMON_ATTACK,          // attacksound
-     S_DEMN2_PAIN1,             // painstate
-     50,                        // painchance
-     SFX_DEMON_PAIN,            // painsound
-     S_DEMN2_ATK1_1,            // meleestate
-     S_DEMN2_ATK2_1,            // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_DEMON_DEATH,           // deathsound
-     13,                        // speed
-     32 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     220,                       // mass
-     0,                         // damage
-     SFX_DEMON_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
-     },
-
-    {                           // MT_ETTIN_MASH
-     -1,                        // doomednum
-     S_ETTIN_LOOK1,             // spawnstate
-     175,                       // spawnhealth
-     S_ETTIN_CHASE1,            // seestate
-     SFX_ETTIN_SIGHT,           // seesound
-     8,                         // reactiontime
-     SFX_ETTIN_ATTACK,          // attacksound
-     S_ETTIN_PAIN1,             // painstate
-     60,                        // painchance
-     SFX_ETTIN_PAIN,            // painsound
-     S_ETTIN_ATK1_1,            // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_ETTIN_DEATH,           // deathsound
-     13,                        // speed
-     25 * FRACUNIT,             // radius
-     68 * FRACUNIT,             // height
-     175,                       // mass
-     3,                         // damage
-     SFX_ETTIN_ACTIVE,          // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
-     },
-
-    {                           // MT_CENTAUR_MASH
-     -1,                        // doomednum
-     S_CENTAUR_LOOK1,           // spawnstate
-     200,                       // spawnhealth
-     S_CENTAUR_WALK1,           // seestate
-     SFX_CENTAUR_SIGHT,         // seesound
-     8,                         // reactiontime
-     SFX_CENTAUR_ATTACK,        // attacksound
-     S_CENTAUR_PAIN1,           // painstate
-     135,                       // painchance
-     SFX_CENTAUR_PAIN,          // painsound
-     S_CENTAUR_ATK1,            // meleestate
-     0,                         // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_CENTAUR_DEATH,         // deathsound
-     13,                        // speed
-     20 * FRACUNIT,             // radius
-     64 * FRACUNIT,             // height
-     120,                       // mass
-     0,                         // damage
-     SFX_CENTAUR_ACTIVE,        // activesound
-     MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_ALTSHADOW | MF_NOBLOOD,        // flags
-     MF2_FLOORCLIP | MF2_PASSMOBJ | MF2_MCROSS | MF2_PUSHWALL | MF2_BLASTED     // flags2
-     },
-
-    {                           // MT_KORAX_BOLT
-     -1,                        // doomednum
-     S_KBOLT1,                  // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     15 * FRACUNIT,             // radius
-     35 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE | MF_DROPOFF,    // flags
-     MF2_NOTELEPORT             // flags2
-     },
-
-    {                           // MT_BAT_SPAWNER
-     10225,                     // doomednum
-     S_SPAWNBATS1,              // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_NULL,                    // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     0,                         // speed
-     20 * FRACUNIT,             // radius
-     16 * FRACUNIT,             // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOSECTOR | MF_NOGRAVITY,        // flags
-     MF2_DONTDRAW               // flags2
-     },
-
-    {                           // MT_BAT
-     -1,                        // doomednum
-     S_BAT1,                    // spawnstate
-     1000,                      // spawnhealth
-     S_NULL,                    // seestate
-     SFX_NONE,                  // seesound
-     8,                         // reactiontime
-     SFX_NONE,                  // attacksound
-     S_NULL,                    // painstate
-     0,                         // painchance
-     SFX_NONE,                  // painsound
-     S_NULL,                    // meleestate
-     S_NULL,                    // missilestate
-     S_NULL,                    // crashstate
-     S_BAT_DEATH,               // deathstate
-     S_NULL,                    // xdeathstate
-     SFX_NONE,                  // deathsound
-     5 * FRACUNIT,              // speed
-     3 * FRACUNIT,              // radius
-     3 * FRACUNIT,              // height
-     100,                       // mass
-     0,                         // damage
-     SFX_NONE,                  // activesound
-     MF_NOBLOCKMAP | MF_NOGRAVITY | MF_MISSILE, // flags
-     MF2_PASSMOBJ | MF2_NOTELEPORT      // flags2
-     }
-};
diff --git a/games/NXDoom/src/hexen/info.h b/games/NXDoom/src/hexen/info.h
deleted file mode 100644
index 18872fae9..000000000
--- a/games/NXDoom/src/hexen/info.h
+++ /dev/null
@@ -1,3626 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// generated by stateco
-
-typedef enum
-{
-    SPR_MAN1,
-    SPR_ACLO,
-    SPR_TLGL,
-    SPR_FBL1,
-    SPR_XPL1,
-    SPR_ARRW,
-    SPR_DART,
-    SPR_RIPP,
-    SPR_CFCF,
-    SPR_BLAD,
-    SPR_SHRD,
-    SPR_FFSM,
-    SPR_FFLG,
-    SPR_PTN1,
-    SPR_PTN2,
-    SPR_SOAR,
-    SPR_INVU,
-    SPR_SUMN,
-    SPR_TSPK,
-    SPR_TELO,
-    SPR_TRNG,
-    SPR_ROCK,
-    SPR_FOGS,
-    SPR_FOGM,
-    SPR_FOGL,
-    SPR_SGSA,
-    SPR_SGSB,
-    SPR_PORK,
-    SPR_EGGM,
-    SPR_FHFX,
-    SPR_SPHL,
-    SPR_STWN,
-    SPR_GMPD,
-    SPR_ASKU,
-    SPR_ABGM,
-    SPR_AGMR,
-    SPR_AGMG,
-    SPR_AGG2,
-    SPR_AGMB,
-    SPR_AGB2,
-    SPR_ABK1,
-    SPR_ABK2,
-    SPR_ASK2,
-    SPR_AFWP,
-    SPR_ACWP,
-    SPR_AMWP,
-    SPR_AGER,
-    SPR_AGR2,
-    SPR_AGR3,
-    SPR_AGR4,
-    SPR_TRCH,
-    SPR_PSBG,
-    SPR_ATLP,
-    SPR_THRW,
-    SPR_SPED,
-    SPR_BMAN,
-    SPR_BRAC,
-    SPR_BLST,
-    SPR_HRAD,
-    SPR_SPSH,
-    SPR_LVAS,
-    SPR_SLDG,
-    SPR_STTW,
-    SPR_RCK1,
-    SPR_RCK2,
-    SPR_RCK3,
-    SPR_RCK4,
-    SPR_CDLR,
-    SPR_TRE1,
-    SPR_TRDT,
-    SPR_TRE2,
-    SPR_TRE3,
-    SPR_STM1,
-    SPR_STM2,
-    SPR_STM3,
-    SPR_STM4,
-    SPR_MSH1,
-    SPR_MSH2,
-    SPR_MSH3,
-    SPR_MSH4,
-    SPR_MSH5,
-    SPR_MSH6,
-    SPR_MSH7,
-    SPR_MSH8,
-    SPR_SGMP,
-    SPR_SGM1,
-    SPR_SGM2,
-    SPR_SGM3,
-    SPR_SLC1,
-    SPR_SLC2,
-    SPR_SLC3,
-    SPR_MSS1,
-    SPR_MSS2,
-    SPR_SWMV,
-    SPR_CPS1,
-    SPR_CPS2,
-    SPR_TMS1,
-    SPR_TMS2,
-    SPR_TMS3,
-    SPR_TMS4,
-    SPR_TMS5,
-    SPR_TMS6,
-    SPR_TMS7,
-    SPR_CPS3,
-    SPR_STT2,
-    SPR_STT3,
-    SPR_STT4,
-    SPR_STT5,
-    SPR_GAR1,
-    SPR_GAR2,
-    SPR_GAR3,
-    SPR_GAR4,
-    SPR_GAR5,
-    SPR_GAR6,
-    SPR_GAR7,
-    SPR_GAR8,
-    SPR_GAR9,
-    SPR_BNR1,
-    SPR_TRE4,
-    SPR_TRE5,
-    SPR_TRE6,
-    SPR_TRE7,
-    SPR_LOGG,
-    SPR_ICT1,
-    SPR_ICT2,
-    SPR_ICT3,
-    SPR_ICT4,
-    SPR_ICM1,
-    SPR_ICM2,
-    SPR_ICM3,
-    SPR_ICM4,
-    SPR_RKBL,
-    SPR_RKBS,
-    SPR_RKBK,
-    SPR_RBL1,
-    SPR_RBL2,
-    SPR_RBL3,
-    SPR_VASE,
-    SPR_POT1,
-    SPR_POT2,
-    SPR_POT3,
-    SPR_PBIT,
-    SPR_CPS4,
-    SPR_CPS5,
-    SPR_CPS6,
-    SPR_CPB1,
-    SPR_CPB2,
-    SPR_CPB3,
-    SPR_CPB4,
-    SPR_BDRP,
-    SPR_BDSH,
-    SPR_BDPL,
-    SPR_CNDL,
-    SPR_LEF1,
-    SPR_LEF3,
-    SPR_LEF2,
-    SPR_TWTR,
-    SPR_WLTR,
-    SPR_BARL,
-    SPR_SHB1,
-    SPR_SHB2,
-    SPR_BCKT,
-    SPR_SHRM,
-    SPR_FBUL,
-    SPR_FSKL,
-    SPR_BRTR,
-    SPR_SUIT,
-    SPR_BBLL,
-    SPR_CAND,
-    SPR_IRON,
-    SPR_XMAS,
-    SPR_CDRN,
-    SPR_CHNS,
-    SPR_TST1,
-    SPR_TST2,
-    SPR_TST3,
-    SPR_TST4,
-    SPR_TST5,
-    SPR_TST6,
-    SPR_TST7,
-    SPR_TST8,
-    SPR_TST9,
-    SPR_TST0,
-    SPR_TELE,
-    SPR_TSMK,
-    SPR_FPCH,
-    SPR_WFAX,
-    SPR_FAXE,
-    SPR_WFHM,
-    SPR_FHMR,
-    SPR_FSRD,
-    SPR_FSFX,
-    SPR_CMCE,
-    SPR_WCSS,
-    SPR_CSSF,
-    SPR_WCFM,
-    SPR_CFLM,
-    SPR_CFFX,
-    SPR_CHLY,
-    SPR_SPIR,
-    SPR_MWND,
-    SPR_WMLG,
-    SPR_MLNG,
-    SPR_MLFX,
-    SPR_MLF2,
-    SPR_MSTF,
-    SPR_MSP1,
-    SPR_MSP2,
-    SPR_WFR1,
-    SPR_WFR2,
-    SPR_WFR3,
-    SPR_WCH1,
-    SPR_WCH2,
-    SPR_WCH3,
-    SPR_WMS1,
-    SPR_WMS2,
-    SPR_WMS3,
-    SPR_WPIG,
-    SPR_WMCS,
-    SPR_CONE,
-    SPR_SHEX,
-    SPR_BLOD,
-    SPR_GIBS,
-    SPR_PLAY,
-    SPR_FDTH,
-    SPR_BSKL,
-    SPR_ICEC,
-    SPR_CLER,
-    SPR_MAGE,
-    SPR_PIGY,
-    SPR_CENT,
-    SPR_CTXD,
-    SPR_CTFX,
-    SPR_CTDP,
-    SPR_DEMN,
-    SPR_DEMA,
-    SPR_DEMB,
-    SPR_DEMC,
-    SPR_DEMD,
-    SPR_DEME,
-    SPR_DMFX,
-    SPR_DEM2,
-    SPR_DMBA,
-    SPR_DMBB,
-    SPR_DMBC,
-    SPR_DMBD,
-    SPR_DMBE,
-    SPR_D2FX,
-    SPR_WRTH,
-    SPR_WRT2,
-    SPR_WRBL,
-    SPR_MNTR,
-    SPR_FX12,
-    SPR_FX13,
-    SPR_MNSM,
-    SPR_SSPT,
-    SPR_SSDV,
-    SPR_SSXD,
-    SPR_SSFX,
-    SPR_BISH,
-    SPR_BPFX,
-    SPR_DRAG,
-    SPR_DRFX,
-    SPR_ARM1,
-    SPR_ARM2,
-    SPR_ARM3,
-    SPR_ARM4,
-    SPR_MAN2,
-    SPR_MAN3,
-    SPR_KEY1,
-    SPR_KEY2,
-    SPR_KEY3,
-    SPR_KEY4,
-    SPR_KEY5,
-    SPR_KEY6,
-    SPR_KEY7,
-    SPR_KEY8,
-    SPR_KEY9,
-    SPR_KEYA,
-    SPR_KEYB,
-    SPR_ETTN,
-    SPR_ETTB,
-    SPR_FDMN,
-    SPR_FDMB,
-    SPR_ICEY,
-    SPR_ICPR,
-    SPR_ICWS,
-    SPR_SORC,
-    SPR_SBMP,
-    SPR_SBS4,
-    SPR_SBMB,
-    SPR_SBS3,
-    SPR_SBMG,
-    SPR_SBS1,
-    SPR_SBS2,
-    SPR_SBFX,
-    SPR_RADE,
-    SPR_WATR,
-    SPR_KORX,
-    SPR_ABAT,
-    NUMSPRITES
-} spritenum_t;
-
-typedef enum
-{
-    S_NULL,
-    S_FREETARGMOBJ,
-    S_MAPSPOT,
-    S_FIREBALL1_1,
-    S_FIREBALL1_2,
-    S_FIREBALL1_X1,
-    S_FIREBALL1_X2,
-    S_FIREBALL1_X3,
-    S_FIREBALL1_X4,
-    S_FIREBALL1_X5,
-    S_FIREBALL1_X6,
-    S_ARROW_1,
-    S_ARROW_X1,
-    S_DART_1,
-    S_DART_X1,
-    S_POISONDART_1,
-    S_POISONDART_X1,
-    S_RIPPERBALL_1,
-    S_RIPPERBALL_2,
-    S_RIPPERBALL_3,
-    S_RIPPERBALL_X1,
-    S_RIPPERBALL_X2,
-    S_RIPPERBALL_X3,
-    S_RIPPERBALL_X4,
-    S_RIPPERBALL_X5,
-    S_RIPPERBALL_X6,
-    S_RIPPERBALL_X7,
-    S_RIPPERBALL_X8,
-    S_RIPPERBALL_X9,
-    S_RIPPERBALL_X10,
-    S_PRJ_BLADE1,
-    S_PRJ_BLADE_X1,
-    S_ICESHARD1,
-    S_ICESHARD2,
-    S_ICESHARD3,
-    S_FLAME_TSMALL1,
-    S_FLAME_TSMALL2,
-    S_FLAME_TSMALL3,
-    S_FLAME_TSMALL4,
-    S_FLAME_TSMALL5,
-    S_FLAME_TSMALL6,
-    S_FLAME_TLARGE1,
-    S_FLAME_TLARGE2,
-    S_FLAME_TLARGE3,
-    S_FLAME_TLARGE4,
-    S_FLAME_TLARGE5,
-    S_FLAME_TLARGE6,
-    S_FLAME_TLARGE7,
-    S_FLAME_TLARGE8,
-    S_FLAME_TLARGE9,
-    S_FLAME_TLARGE10,
-    S_FLAME_TLARGE11,
-    S_FLAME_TLARGE12,
-    S_FLAME_TLARGE13,
-    S_FLAME_TLARGE14,
-    S_FLAME_TLARGE15,
-    S_FLAME_TLARGE16,
-    S_FLAME_SDORM1,
-    S_FLAME_SDORM2,
-    S_FLAME_SDORM3,
-    S_FLAME_SMALL1,
-    S_FLAME_SMALL2,
-    S_FLAME_SMALL3,
-    S_FLAME_SMALL4,
-    S_FLAME_SMALL5,
-    S_FLAME_SMALL6,
-    S_FLAME_SMALL7,
-    S_FLAME_LDORM1,
-    S_FLAME_LDORM2,
-    S_FLAME_LDORM3,
-    S_FLAME_LDORM4,
-    S_FLAME_LDORM5,
-    S_FLAME_LARGE1,
-    S_FLAME_LARGE2,
-    S_FLAME_LARGE3,
-    S_FLAME_LARGE4,
-    S_FLAME_LARGE5,
-    S_FLAME_LARGE6,
-    S_FLAME_LARGE7,
-    S_FLAME_LARGE8,
-    S_FLAME_LARGE9,
-    S_FLAME_LARGE10,
-    S_FLAME_LARGE11,
-    S_FLAME_LARGE12,
-    S_FLAME_LARGE13,
-    S_FLAME_LARGE14,
-    S_FLAME_LARGE15,
-    S_FLAME_LARGE16,
-    S_FLAME_LARGE17,
-    S_FLAME_LARGE18,
-    S_ITEM_PTN1_1,
-    S_ITEM_PTN1_2,
-    S_ITEM_PTN1_3,
-    S_HIDESPECIAL1,
-    S_HIDESPECIAL2,
-    S_HIDESPECIAL3,
-    S_HIDESPECIAL4,
-    S_HIDESPECIAL5,
-    S_HIDESPECIAL6,
-    S_HIDESPECIAL7,
-    S_HIDESPECIAL8,
-    S_HIDESPECIAL9,
-    S_HIDESPECIAL10,
-    S_HIDESPECIAL11,
-    S_DORMANTARTI1_1,
-    S_DORMANTARTI1_2,
-    S_DORMANTARTI1_3,
-    S_DORMANTARTI1_4,
-    S_DORMANTARTI1_5,
-    S_DORMANTARTI1_6,
-    S_DORMANTARTI1_7,
-    S_DORMANTARTI1_8,
-    S_DORMANTARTI1_9,
-    S_DORMANTARTI1_10,
-    S_DORMANTARTI1_11,
-    S_DORMANTARTI1_12,
-    S_DORMANTARTI1_13,
-    S_DORMANTARTI1_14,
-    S_DORMANTARTI1_15,
-    S_DORMANTARTI1_16,
-    S_DORMANTARTI1_17,
-    S_DORMANTARTI1_18,
-    S_DORMANTARTI1_19,
-    S_DORMANTARTI1_20,
-    S_DORMANTARTI1_21,
-    S_DORMANTARTI2_1,
-    S_DORMANTARTI2_2,
-    S_DORMANTARTI2_3,
-    S_DORMANTARTI2_4,
-    S_DORMANTARTI2_5,
-    S_DORMANTARTI2_6,
-    S_DORMANTARTI2_7,
-    S_DORMANTARTI2_8,
-    S_DORMANTARTI2_9,
-    S_DORMANTARTI2_10,
-    S_DORMANTARTI2_11,
-    S_DORMANTARTI2_12,
-    S_DORMANTARTI2_13,
-    S_DORMANTARTI2_14,
-    S_DORMANTARTI2_15,
-    S_DORMANTARTI2_16,
-    S_DORMANTARTI2_17,
-    S_DORMANTARTI2_18,
-    S_DORMANTARTI2_19,
-    S_DORMANTARTI2_20,
-    S_DORMANTARTI2_21,
-    S_DORMANTARTI3_1,
-    S_DORMANTARTI3_2,
-    S_DORMANTARTI3_3,
-    S_DORMANTARTI3_4,
-    S_DORMANTARTI3_5,
-    S_DORMANTARTI3_6,
-    S_DORMANTARTI3_7,
-    S_DORMANTARTI3_8,
-    S_DORMANTARTI3_9,
-    S_DORMANTARTI3_10,
-    S_DORMANTARTI3_11,
-    S_DORMANTARTI3_12,
-    S_DORMANTARTI3_13,
-    S_DORMANTARTI3_14,
-    S_DORMANTARTI3_15,
-    S_DORMANTARTI3_16,
-    S_DORMANTARTI3_17,
-    S_DORMANTARTI3_18,
-    S_DORMANTARTI3_19,
-    S_DORMANTARTI3_20,
-    S_DORMANTARTI3_21,
-    S_DEADARTI1,
-    S_DEADARTI2,
-    S_DEADARTI3,
-    S_DEADARTI4,
-    S_DEADARTI5,
-    S_DEADARTI6,
-    S_DEADARTI7,
-    S_DEADARTI8,
-    S_DEADARTI9,
-    S_DEADARTI10,
-    S_ARTI_PTN2_1,
-    S_ARTI_PTN2_2,
-    S_ARTI_PTN2_3,
-    S_ARTI_SOAR1,
-    S_ARTI_SOAR2,
-    S_ARTI_SOAR3,
-    S_ARTI_SOAR4,
-    S_ARTI_INVU1,
-    S_ARTI_INVU2,
-    S_ARTI_INVU3,
-    S_ARTI_INVU4,
-    S_ARTI_SUMMON,
-    S_SUMMON_FX1_1,
-    S_SUMMON_FX2_1,
-    S_SUMMON_FX2_2,
-    S_SUMMON_FX2_3,
-    S_THRUSTINIT2_1,
-    S_THRUSTINIT2_2,
-    S_BTHRUSTINIT2_1,
-    S_BTHRUSTINIT2_2,
-    S_THRUSTINIT1_1,
-    S_THRUSTINIT1_2,
-    S_BTHRUSTINIT1_1,
-    S_BTHRUSTINIT1_2,
-    S_THRUSTRAISE1,
-    S_THRUSTRAISE2,
-    S_THRUSTRAISE3,
-    S_THRUSTRAISE4,
-    S_BTHRUSTRAISE1,
-    S_BTHRUSTRAISE2,
-    S_BTHRUSTRAISE3,
-    S_BTHRUSTRAISE4,
-    S_THRUSTIMPALE,
-    S_BTHRUSTIMPALE,
-    S_THRUSTRAISE,
-    S_BTHRUSTRAISE,
-    S_THRUSTBLOCK,
-    S_BTHRUSTBLOCK,
-    S_THRUSTLOWER,
-    S_BTHRUSTLOWER,
-    S_THRUSTSTAY,
-    S_BTHRUSTSTAY,
-    S_ARTI_TELOTHER1,
-    S_ARTI_TELOTHER2,
-    S_ARTI_TELOTHER3,
-    S_ARTI_TELOTHER4,
-    S_TELO_FX1,
-    S_TELO_FX2,
-    S_TELO_FX3,
-    S_TELO_FX4,
-    S_TELO_FX5,
-    S_TELO_FX6,
-    S_TELO_FX7,
-    S_TELO_FX8,
-    S_TELO_FX9,
-    S_TELO_FX2_1,
-    S_TELO_FX2_2,
-    S_TELO_FX2_3,
-    S_TELO_FX2_4,
-    S_TELO_FX2_5,
-    S_TELO_FX2_6,
-    S_TELO_FX3_1,
-    S_TELO_FX3_2,
-    S_TELO_FX3_3,
-    S_TELO_FX3_4,
-    S_TELO_FX3_5,
-    S_TELO_FX3_6,
-    S_TELO_FX4_1,
-    S_TELO_FX4_2,
-    S_TELO_FX4_3,
-    S_TELO_FX4_4,
-    S_TELO_FX4_5,
-    S_TELO_FX4_6,
-    S_TELO_FX5_1,
-    S_TELO_FX5_2,
-    S_TELO_FX5_3,
-    S_TELO_FX5_4,
-    S_TELO_FX5_5,
-    S_TELO_FX5_6,
-    S_DIRT1_1,
-    S_DIRT1_D,
-    S_DIRT2_1,
-    S_DIRT2_D,
-    S_DIRT3_1,
-    S_DIRT3_D,
-    S_DIRT4_1,
-    S_DIRT4_D,
-    S_DIRT5_1,
-    S_DIRT5_D,
-    S_DIRT6_1,
-    S_DIRT6_D,
-    S_DIRTCLUMP1,
-    S_ROCK1_1,
-    S_ROCK1_D,
-    S_ROCK2_1,
-    S_ROCK2_D,
-    S_ROCK3_1,
-    S_ROCK3_D,
-    S_SPAWNFOG1,
-    S_FOGPATCHS1,
-    S_FOGPATCHS2,
-    S_FOGPATCHS3,
-    S_FOGPATCHS4,
-    S_FOGPATCHS5,
-    S_FOGPATCHS0,
-    S_FOGPATCHM1,
-    S_FOGPATCHM2,
-    S_FOGPATCHM3,
-    S_FOGPATCHM4,
-    S_FOGPATCHM5,
-    S_FOGPATCHM0,
-    S_FOGPATCHMA,
-    S_FOGPATCHMB,
-    S_FOGPATCHMC,
-    S_FOGPATCHMD,
-    S_FOGPATCHL1,
-    S_FOGPATCHL2,
-    S_FOGPATCHL3,
-    S_FOGPATCHL4,
-    S_FOGPATCHL5,
-    S_FOGPATCHL0,
-    S_FOGPATCHLA,
-    S_FOGPATCHLB,
-    S_FOGPATCHLC,
-    S_FOGPATCHLD,
-    S_QUAKE_ACTIVE1,
-    S_QUAKE_ACTIVE2,
-    S_QUAKE_ACTIVE3,
-    S_QUAKE_ACTIVE4,
-    S_QUAKE_ACTIVE5,
-    S_QUAKE_ACTIVE6,
-    S_QUAKE_ACTIVE7,
-    S_QUAKE_ACTIVE8,
-    S_QUAKE_ACTIVE9,
-    S_QUAKE_ACTIVE0,
-    S_QUAKE_ACTIVEA,
-    S_QUAKE_ACTIVEB,
-    S_QUAKE_ACTIVEC,
-    S_QUAKE_ACTIVED,
-    S_QUAKE_ACTIVEE,
-    S_QUAKE_ACTIVEF,
-    S_QUAKE_ACTIVEG,
-    S_QUAKE_ACTIVEH,
-    S_QUAKE_ACTIVEI,
-    S_QUAKE_ACTIVEJ,
-    S_QUAKE_ACTIVEK,
-    S_QUAKE_ACTIVEL,
-    S_QUAKE_ACTIVEM,
-    S_QUAKE_ACTIVEN,
-    S_QUAKE_ACTIVEO,
-    S_QUAKE_ACTIVEP,
-    S_QUAKE_ACTIVEQ,
-    S_QUAKE_ACTIVER,
-    S_QUAKE_ACTIVES,
-    S_QUAKE_ACTIVET,
-    S_QUAKE_ACTIVEU,
-    S_QUAKE_ACTIVEV,
-    S_QUAKE_ACTIVEW,
-    S_QUAKE_ACTIVEX,
-    S_QUAKE_ACTIVEY,
-    S_QUAKE_ACTIVEZ,
-    S_QUAKE_ACT1,
-    S_QUAKE_ACT2,
-    S_QUAKE_ACT3,
-    S_QUAKE_ACT4,
-    S_QUAKE_ACT5,
-    S_QUAKE_ACT6,
-    S_QUAKE_ACT7,
-    S_QUAKE_ACT8,
-    S_QUAKE_ACT9,
-    S_QUAKE_ACT0,
-    S_SGSHARD1_1,
-    S_SGSHARD1_2,
-    S_SGSHARD1_3,
-    S_SGSHARD1_4,
-    S_SGSHARD1_5,
-    S_SGSHARD1_D,
-    S_SGSHARD2_1,
-    S_SGSHARD2_2,
-    S_SGSHARD2_3,
-    S_SGSHARD2_4,
-    S_SGSHARD2_5,
-    S_SGSHARD2_D,
-    S_SGSHARD3_1,
-    S_SGSHARD3_2,
-    S_SGSHARD3_3,
-    S_SGSHARD3_4,
-    S_SGSHARD3_5,
-    S_SGSHARD3_D,
-    S_SGSHARD4_1,
-    S_SGSHARD4_2,
-    S_SGSHARD4_3,
-    S_SGSHARD4_4,
-    S_SGSHARD4_5,
-    S_SGSHARD4_D,
-    S_SGSHARD5_1,
-    S_SGSHARD5_2,
-    S_SGSHARD5_3,
-    S_SGSHARD5_4,
-    S_SGSHARD5_5,
-    S_SGSHARD5_D,
-    S_SGSHARD6_1,
-    S_SGSHARD6_D,
-    S_SGSHARD7_1,
-    S_SGSHARD7_D,
-    S_SGSHARD8_1,
-    S_SGSHARD8_D,
-    S_SGSHARD9_1,
-    S_SGSHARD9_D,
-    S_SGSHARD0_1,
-    S_SGSHARD0_D,
-    S_ARTI_EGGC1,
-    S_ARTI_EGGC2,
-    S_ARTI_EGGC3,
-    S_ARTI_EGGC4,
-    S_ARTI_EGGC5,
-    S_ARTI_EGGC6,
-    S_ARTI_EGGC7,
-    S_ARTI_EGGC8,
-    S_EGGFX1,
-    S_EGGFX2,
-    S_EGGFX3,
-    S_EGGFX4,
-    S_EGGFX5,
-    S_EGGFXI1_1,
-    S_EGGFXI1_2,
-    S_EGGFXI1_3,
-    S_EGGFXI1_4,
-    S_ARTI_SPHL1,
-    S_ZWINGEDSTATUENOSKULL,
-    S_ZWINGEDSTATUENOSKULL2,
-    S_ZGEMPEDESTAL1,
-    S_ZGEMPEDESTAL2,
-    S_ARTIPUZZSKULL,
-    S_ARTIPUZZGEMBIG,
-    S_ARTIPUZZGEMRED,
-    S_ARTIPUZZGEMGREEN1,
-    S_ARTIPUZZGEMGREEN2,
-    S_ARTIPUZZGEMBLUE1,
-    S_ARTIPUZZGEMBLUE2,
-    S_ARTIPUZZBOOK1,
-    S_ARTIPUZZBOOK2,
-    S_ARTIPUZZSKULL2,
-    S_ARTIPUZZFWEAPON,
-    S_ARTIPUZZCWEAPON,
-    S_ARTIPUZZMWEAPON,
-    S_ARTIPUZZGEAR_1,
-    S_ARTIPUZZGEAR_2,
-    S_ARTIPUZZGEAR_3,
-    S_ARTIPUZZGEAR_4,
-    S_ARTIPUZZGEAR_5,
-    S_ARTIPUZZGEAR_6,
-    S_ARTIPUZZGEAR_7,
-    S_ARTIPUZZGEAR_8,
-    S_ARTIPUZZGEAR2_1,
-    S_ARTIPUZZGEAR2_2,
-    S_ARTIPUZZGEAR2_3,
-    S_ARTIPUZZGEAR2_4,
-    S_ARTIPUZZGEAR2_5,
-    S_ARTIPUZZGEAR2_6,
-    S_ARTIPUZZGEAR2_7,
-    S_ARTIPUZZGEAR2_8,
-    S_ARTIPUZZGEAR3_1,
-    S_ARTIPUZZGEAR3_2,
-    S_ARTIPUZZGEAR3_3,
-    S_ARTIPUZZGEAR3_4,
-    S_ARTIPUZZGEAR3_5,
-    S_ARTIPUZZGEAR3_6,
-    S_ARTIPUZZGEAR3_7,
-    S_ARTIPUZZGEAR3_8,
-    S_ARTIPUZZGEAR4_1,
-    S_ARTIPUZZGEAR4_2,
-    S_ARTIPUZZGEAR4_3,
-    S_ARTIPUZZGEAR4_4,
-    S_ARTIPUZZGEAR4_5,
-    S_ARTIPUZZGEAR4_6,
-    S_ARTIPUZZGEAR4_7,
-    S_ARTIPUZZGEAR4_8,
-    S_ARTI_TRCH1,
-    S_ARTI_TRCH2,
-    S_ARTI_TRCH3,
-    S_FIREBOMB1,
-    S_FIREBOMB2,
-    S_FIREBOMB3,
-    S_FIREBOMB4,
-    S_FIREBOMB5,
-    S_FIREBOMB6,
-    S_FIREBOMB7,
-    S_FIREBOMB8,
-    S_FIREBOMB9,
-    S_FIREBOMB10,
-    S_FIREBOMB11,
-    S_ARTI_ATLP1,
-    S_ARTI_ATLP2,
-    S_ARTI_ATLP3,
-    S_ARTI_ATLP4,
-    S_ARTI_PSBG1,
-    S_POISONBAG1,
-    S_POISONBAG2,
-    S_POISONBAG3,
-    S_POISONBAG4,
-    S_POISONCLOUD1,
-    S_POISONCLOUD2,
-    S_POISONCLOUD3,
-    S_POISONCLOUD4,
-    S_POISONCLOUD5,
-    S_POISONCLOUD6,
-    S_POISONCLOUD7,
-    S_POISONCLOUD8,
-    S_POISONCLOUD9,
-    S_POISONCLOUD10,
-    S_POISONCLOUD11,
-    S_POISONCLOUD12,
-    S_POISONCLOUD13,
-    S_POISONCLOUD14,
-    S_POISONCLOUD15,
-    S_POISONCLOUD16,
-    S_POISONCLOUD17,
-    S_POISONCLOUD18,
-    S_POISONCLOUD_X1,
-    S_POISONCLOUD_X2,
-    S_POISONCLOUD_X3,
-    S_POISONCLOUD_X4,
-    S_THROWINGBOMB1,
-    S_THROWINGBOMB2,
-    S_THROWINGBOMB3,
-    S_THROWINGBOMB4,
-    S_THROWINGBOMB5,
-    S_THROWINGBOMB6,
-    S_THROWINGBOMB7,
-    S_THROWINGBOMB8,
-    S_THROWINGBOMB9,
-    S_THROWINGBOMB10,
-    S_THROWINGBOMB11,
-    S_THROWINGBOMB12,
-    S_THROWINGBOMB_X1,
-    S_THROWINGBOMB_X2,
-    S_THROWINGBOMB_X3,
-    S_THROWINGBOMB_X4,
-    S_THROWINGBOMB_X5,
-    S_THROWINGBOMB_X6,
-    S_THROWINGBOMB_X7,
-    S_THROWINGBOMB_X8,
-    S_ARTI_BOOTS1,
-    S_ARTI_BOOTS2,
-    S_ARTI_BOOTS3,
-    S_ARTI_BOOTS4,
-    S_ARTI_BOOTS5,
-    S_ARTI_BOOTS6,
-    S_ARTI_BOOTS7,
-    S_ARTI_BOOTS8,
-    S_ARTI_MANA,
-    S_ARTI_ARMOR1,
-    S_ARTI_ARMOR2,
-    S_ARTI_ARMOR3,
-    S_ARTI_ARMOR4,
-    S_ARTI_ARMOR5,
-    S_ARTI_ARMOR6,
-    S_ARTI_ARMOR7,
-    S_ARTI_ARMOR8,
-    S_ARTI_BLAST1,
-    S_ARTI_BLAST2,
-    S_ARTI_BLAST3,
-    S_ARTI_BLAST4,
-    S_ARTI_BLAST5,
-    S_ARTI_BLAST6,
-    S_ARTI_BLAST7,
-    S_ARTI_BLAST8,
-    S_ARTI_HEALRAD1,
-    S_ARTI_HEALRAD2,
-    S_ARTI_HEALRAD3,
-    S_ARTI_HEALRAD4,
-    S_ARTI_HEALRAD5,
-    S_ARTI_HEALRAD6,
-    S_ARTI_HEALRAD7,
-    S_ARTI_HEALRAD8,
-    S_ARTI_HEALRAD9,
-    S_ARTI_HEALRAD0,
-    S_ARTI_HEALRADA,
-    S_ARTI_HEALRADB,
-    S_ARTI_HEALRADC,
-    S_ARTI_HEALRADD,
-    S_ARTI_HEALRADE,
-    S_ARTI_HEALRADF,
-    S_SPLASH1,
-    S_SPLASH2,
-    S_SPLASH3,
-    S_SPLASH4,
-    S_SPLASHX,
-    S_SPLASHBASE1,
-    S_SPLASHBASE2,
-    S_SPLASHBASE3,
-    S_SPLASHBASE4,
-    S_SPLASHBASE5,
-    S_SPLASHBASE6,
-    S_SPLASHBASE7,
-    S_LAVASPLASH1,
-    S_LAVASPLASH2,
-    S_LAVASPLASH3,
-    S_LAVASPLASH4,
-    S_LAVASPLASH5,
-    S_LAVASPLASH6,
-    S_LAVASMOKE1,
-    S_LAVASMOKE2,
-    S_LAVASMOKE3,
-    S_LAVASMOKE4,
-    S_LAVASMOKE5,
-    S_SLUDGECHUNK1,
-    S_SLUDGECHUNK2,
-    S_SLUDGECHUNK3,
-    S_SLUDGECHUNK4,
-    S_SLUDGECHUNKX,
-    S_SLUDGESPLASH1,
-    S_SLUDGESPLASH2,
-    S_SLUDGESPLASH3,
-    S_SLUDGESPLASH4,
-    S_ZWINGEDSTATUE1,
-    S_ZROCK1_1,
-    S_ZROCK2_1,
-    S_ZROCK3_1,
-    S_ZROCK4_1,
-    S_ZCHANDELIER1,
-    S_ZCHANDELIER2,
-    S_ZCHANDELIER3,
-    S_ZCHANDELIER_U,
-    S_ZTREEDEAD1,
-    S_ZTREE,
-    S_ZTREEDESTRUCTIBLE1,
-    S_ZTREEDES_D1,
-    S_ZTREEDES_D2,
-    S_ZTREEDES_D3,
-    S_ZTREEDES_D4,
-    S_ZTREEDES_D5,
-    S_ZTREEDES_D6,
-    S_ZTREEDES_X1,
-    S_ZTREEDES_X2,
-    S_ZTREEDES_X3,
-    S_ZTREEDES_X4,
-    S_ZTREEDES_X5,
-    S_ZTREEDES_X6,
-    S_ZTREEDES_X7,
-    S_ZTREEDES_X8,
-    S_ZTREEDES_X9,
-    S_ZTREEDES_X10,
-    S_ZTREESWAMP182_1,
-    S_ZTREESWAMP172_1,
-    S_ZSTUMPBURNED1,
-    S_ZSTUMPBARE1,
-    S_ZSTUMPSWAMP1_1,
-    S_ZSTUMPSWAMP2_1,
-    S_ZSHROOMLARGE1_1,
-    S_ZSHROOMLARGE2_1,
-    S_ZSHROOMLARGE3_1,
-    S_ZSHROOMSMALL1_1,
-    S_ZSHROOMSMALL2_1,
-    S_ZSHROOMSMALL3_1,
-    S_ZSHROOMSMALL4_1,
-    S_ZSHROOMSMALL5_1,
-    S_ZSTALAGMITEPILLAR1,
-    S_ZSTALAGMITELARGE1,
-    S_ZSTALAGMITEMEDIUM1,
-    S_ZSTALAGMITESMALL1,
-    S_ZSTALACTITELARGE1,
-    S_ZSTALACTITEMEDIUM1,
-    S_ZSTALACTITESMALL1,
-    S_ZMOSSCEILING1_1,
-    S_ZMOSSCEILING2_1,
-    S_ZSWAMPVINE1,
-    S_ZCORPSEKABOB1,
-    S_ZCORPSESLEEPING1,
-    S_ZTOMBSTONERIP1,
-    S_ZTOMBSTONESHANE1,
-    S_ZTOMBSTONEBIGCROSS1,
-    S_ZTOMBSTONEBRIANR1,
-    S_ZTOMBSTONECROSSCIRCLE1,
-    S_ZTOMBSTONESMALLCROSS1,
-    S_ZTOMBSTONEBRIANP1,
-    S_CORPSEHANGING_1,
-    S_ZSTATUEGARGOYLEGREENTALL_1,
-    S_ZSTATUEGARGOYLEBLUETALL_1,
-    S_ZSTATUEGARGOYLEGREENSHORT_1,
-    S_ZSTATUEGARGOYLEBLUESHORT_1,
-    S_ZSTATUEGARGOYLESTRIPETALL_1,
-    S_ZSTATUEGARGOYLEDARKREDTALL_1,
-    S_ZSTATUEGARGOYLEREDTALL_1,
-    S_ZSTATUEGARGOYLETANTALL_1,
-    S_ZSTATUEGARGOYLERUSTTALL_1,
-    S_ZSTATUEGARGOYLEDARKREDSHORT_1,
-    S_ZSTATUEGARGOYLEREDSHORT_1,
-    S_ZSTATUEGARGOYLETANSHORT_1,
-    S_ZSTATUEGARGOYLERUSTSHORT_1,
-    S_ZBANNERTATTERED_1,
-    S_ZTREELARGE1,
-    S_ZTREELARGE2,
-    S_ZTREEGNARLED1,
-    S_ZTREEGNARLED2,
-    S_ZLOG,
-    S_ZSTALACTITEICELARGE,
-    S_ZSTALACTITEICEMEDIUM,
-    S_ZSTALACTITEICESMALL,
-    S_ZSTALACTITEICETINY,
-    S_ZSTALAGMITEICELARGE,
-    S_ZSTALAGMITEICEMEDIUM,
-    S_ZSTALAGMITEICESMALL,
-    S_ZSTALAGMITEICETINY,
-    S_ZROCKBROWN1,
-    S_ZROCKBROWN2,
-    S_ZROCKBLACK,
-    S_ZRUBBLE1,
-    S_ZRUBBLE2,
-    S_ZRUBBLE3,
-    S_ZVASEPILLAR,
-    S_ZPOTTERY1,
-    S_ZPOTTERY2,
-    S_ZPOTTERY3,
-    S_ZPOTTERY_EXPLODE,
-    S_POTTERYBIT_1,
-    S_POTTERYBIT_2,
-    S_POTTERYBIT_3,
-    S_POTTERYBIT_4,
-    S_POTTERYBIT_5,
-    S_POTTERYBIT_EX0,
-    S_POTTERYBIT_EX1,
-    S_POTTERYBIT_EX1_2,
-    S_POTTERYBIT_EX2,
-    S_POTTERYBIT_EX2_2,
-    S_POTTERYBIT_EX3,
-    S_POTTERYBIT_EX3_2,
-    S_POTTERYBIT_EX4,
-    S_POTTERYBIT_EX4_2,
-    S_POTTERYBIT_EX5,
-    S_POTTERYBIT_EX5_2,
-    S_ZCORPSELYNCHED1,
-    S_ZCORPSELYNCHED2,
-    S_ZCORPSESITTING,
-    S_ZCORPSESITTING_X,
-    S_CORPSEBIT_1,
-    S_CORPSEBIT_2,
-    S_CORPSEBIT_3,
-    S_CORPSEBIT_4,
-    S_CORPSEBLOODDRIP,
-    S_CORPSEBLOODDRIP_X1,
-    S_CORPSEBLOODDRIP_X2,
-    S_CORPSEBLOODDRIP_X3,
-    S_CORPSEBLOODDRIP_X4,
-    S_BLOODPOOL,
-    S_ZCANDLE1,
-    S_ZCANDLE2,
-    S_ZCANDLE3,
-    S_ZLEAFSPAWNER,
-    S_LEAF1_1,
-    S_LEAF1_2,
-    S_LEAF1_3,
-    S_LEAF1_4,
-    S_LEAF1_5,
-    S_LEAF1_6,
-    S_LEAF1_7,
-    S_LEAF1_8,
-    S_LEAF1_9,
-    S_LEAF1_10,
-    S_LEAF1_11,
-    S_LEAF1_12,
-    S_LEAF1_13,
-    S_LEAF1_14,
-    S_LEAF1_15,
-    S_LEAF1_16,
-    S_LEAF1_17,
-    S_LEAF1_18,
-    S_LEAF_X1,
-    S_LEAF2_1,
-    S_LEAF2_2,
-    S_LEAF2_3,
-    S_LEAF2_4,
-    S_LEAF2_5,
-    S_LEAF2_6,
-    S_LEAF2_7,
-    S_LEAF2_8,
-    S_LEAF2_9,
-    S_LEAF2_10,
-    S_LEAF2_11,
-    S_LEAF2_12,
-    S_LEAF2_13,
-    S_LEAF2_14,
-    S_LEAF2_15,
-    S_LEAF2_16,
-    S_LEAF2_17,
-    S_LEAF2_18,
-    S_ZTWINEDTORCH_1,
-    S_ZTWINEDTORCH_2,
-    S_ZTWINEDTORCH_3,
-    S_ZTWINEDTORCH_4,
-    S_ZTWINEDTORCH_5,
-    S_ZTWINEDTORCH_6,
-    S_ZTWINEDTORCH_7,
-    S_ZTWINEDTORCH_8,
-    S_ZTWINEDTORCH_UNLIT,
-    S_BRIDGE1,
-    S_BRIDGE2,
-    S_BRIDGE3,
-    S_FREE_BRIDGE1,
-    S_FREE_BRIDGE2,
-    S_BBALL1,
-    S_BBALL2,
-    S_ZWALLTORCH1,
-    S_ZWALLTORCH2,
-    S_ZWALLTORCH3,
-    S_ZWALLTORCH4,
-    S_ZWALLTORCH5,
-    S_ZWALLTORCH6,
-    S_ZWALLTORCH7,
-    S_ZWALLTORCH8,
-    S_ZWALLTORCH_U,
-    S_ZBARREL1,
-    S_ZSHRUB1,
-    S_ZSHRUB1_DIE,
-    S_ZSHRUB1_X1,
-    S_ZSHRUB1_X2,
-    S_ZSHRUB1_X3,
-    S_ZSHRUB2,
-    S_ZSHRUB2_DIE,
-    S_ZSHRUB2_X1,
-    S_ZSHRUB2_X2,
-    S_ZSHRUB2_X3,
-    S_ZSHRUB2_X4,
-    S_ZBUCKET1,
-    S_ZPOISONSHROOM1,
-    S_ZPOISONSHROOM_P1,
-    S_ZPOISONSHROOM_P2,
-    S_ZPOISONSHROOM_X1,
-    S_ZPOISONSHROOM_X2,
-    S_ZPOISONSHROOM_X3,
-    S_ZPOISONSHROOM_X4,
-    S_ZFIREBULL1,
-    S_ZFIREBULL2,
-    S_ZFIREBULL3,
-    S_ZFIREBULL4,
-    S_ZFIREBULL5,
-    S_ZFIREBULL6,
-    S_ZFIREBULL7,
-    S_ZFIREBULL_DEATH,
-    S_ZFIREBULL_DEATH2,
-    S_ZFIREBULL_U,
-    S_ZFIREBULL_BIRTH,
-    S_ZFIREBULL_BIRTH2,
-    S_ZFIRETHING1,
-    S_ZFIRETHING2,
-    S_ZFIRETHING3,
-    S_ZFIRETHING4,
-    S_ZFIRETHING5,
-    S_ZFIRETHING6,
-    S_ZFIRETHING7,
-    S_ZFIRETHING8,
-    S_ZFIRETHING9,
-    S_ZBRASSTORCH1,
-    S_ZBRASSTORCH2,
-    S_ZBRASSTORCH3,
-    S_ZBRASSTORCH4,
-    S_ZBRASSTORCH5,
-    S_ZBRASSTORCH6,
-    S_ZBRASSTORCH7,
-    S_ZBRASSTORCH8,
-    S_ZBRASSTORCH9,
-    S_ZBRASSTORCH10,
-    S_ZBRASSTORCH11,
-    S_ZBRASSTORCH12,
-    S_ZBRASSTORCH13,
-    S_ZSUITOFARMOR,
-    S_ZSUITOFARMOR_X1,
-    S_ZARMORCHUNK1,
-    S_ZARMORCHUNK2,
-    S_ZARMORCHUNK3,
-    S_ZARMORCHUNK4,
-    S_ZARMORCHUNK5,
-    S_ZARMORCHUNK6,
-    S_ZARMORCHUNK7,
-    S_ZARMORCHUNK8,
-    S_ZARMORCHUNK9,
-    S_ZARMORCHUNK10,
-    S_ZBELL,
-    S_ZBELL_X1,
-    S_ZBELL_X2,
-    S_ZBELL_X3,
-    S_ZBELL_X4,
-    S_ZBELL_X5,
-    S_ZBELL_X6,
-    S_ZBELL_X7,
-    S_ZBELL_X8,
-    S_ZBELL_X9,
-    S_ZBELL_X10,
-    S_ZBELL_X11,
-    S_ZBELL_X12,
-    S_ZBELL_X13,
-    S_ZBELL_X14,
-    S_ZBELL_X15,
-    S_ZBELL_X16,
-    S_ZBELL_X17,
-    S_ZBELL_X18,
-    S_ZBELL_X19,
-    S_ZBELL_X20,
-    S_ZBELL_X21,
-    S_ZBELL_X22,
-    S_ZBELL_X23,
-    S_ZBELL_X24,
-    S_ZBELL_X25,
-    S_ZBELL_X26,
-    S_ZBELL_X27,
-    S_ZBELL_X28,
-    S_ZBELL_X29,
-    S_ZBELL_X30,
-    S_ZBELL_X31,
-    S_ZBELL_X32,
-    S_ZBELL_X33,
-    S_ZBELL_X34,
-    S_ZBELL_X35,
-    S_ZBELL_X36,
-    S_ZBELL_X37,
-    S_ZBELL_X38,
-    S_ZBELL_X39,
-    S_ZBELL_X40,
-    S_ZBELL_X41,
-    S_ZBELL_X42,
-    S_ZBELL_X43,
-    S_ZBELL_X44,
-    S_ZBELL_X45,
-    S_ZBELL_X46,
-    S_ZBELL_X47,
-    S_ZBLUE_CANDLE1,
-    S_ZBLUE_CANDLE2,
-    S_ZBLUE_CANDLE3,
-    S_ZBLUE_CANDLE4,
-    S_ZBLUE_CANDLE5,
-    S_ZIRON_MAIDEN,
-    S_ZXMAS_TREE,
-    S_ZXMAS_TREE_DIE,
-    S_ZXMAS_TREE_X1,
-    S_ZXMAS_TREE_X2,
-    S_ZXMAS_TREE_X3,
-    S_ZXMAS_TREE_X4,
-    S_ZXMAS_TREE_X5,
-    S_ZXMAS_TREE_X6,
-    S_ZXMAS_TREE_X7,
-    S_ZXMAS_TREE_X8,
-    S_ZXMAS_TREE_X9,
-    S_ZXMAS_TREE_X10,
-    S_ZCAULDRON1,
-    S_ZCAULDRON2,
-    S_ZCAULDRON3,
-    S_ZCAULDRON4,
-    S_ZCAULDRON5,
-    S_ZCAULDRON6,
-    S_ZCAULDRON7,
-    S_ZCAULDRON_U,
-    S_ZCHAINBIT32,
-    S_ZCHAINBIT64,
-    S_ZCHAINEND_HEART,
-    S_ZCHAINEND_HOOK1,
-    S_ZCHAINEND_HOOK2,
-    S_ZCHAINEND_SPIKE,
-    S_ZCHAINEND_SKULL,
-    S_TABLE_SHIT1,
-    S_TABLE_SHIT2,
-    S_TABLE_SHIT3,
-    S_TABLE_SHIT4,
-    S_TABLE_SHIT5,
-    S_TABLE_SHIT6,
-    S_TABLE_SHIT7,
-    S_TABLE_SHIT8,
-    S_TABLE_SHIT9,
-    S_TABLE_SHIT10,
-    S_TFOG1,
-    S_TFOG2,
-    S_TFOG3,
-    S_TFOG4,
-    S_TFOG5,
-    S_TFOG6,
-    S_TFOG7,
-    S_TFOG8,
-    S_TFOG9,
-    S_TFOG10,
-    S_TFOG11,
-    S_TFOG12,
-    S_TFOG13,
-    S_TELESMOKE1,
-    S_TELESMOKE2,
-    S_TELESMOKE3,
-    S_TELESMOKE4,
-    S_TELESMOKE5,
-    S_TELESMOKE6,
-    S_TELESMOKE7,
-    S_TELESMOKE8,
-    S_TELESMOKE9,
-    S_TELESMOKE10,
-    S_TELESMOKE11,
-    S_TELESMOKE12,
-    S_TELESMOKE13,
-    S_TELESMOKE14,
-    S_TELESMOKE15,
-    S_TELESMOKE16,
-    S_TELESMOKE17,
-    S_TELESMOKE18,
-    S_TELESMOKE19,
-    S_TELESMOKE20,
-    S_TELESMOKE21,
-    S_TELESMOKE22,
-    S_TELESMOKE23,
-    S_TELESMOKE24,
-    S_TELESMOKE25,
-    S_TELESMOKE26,
-    S_LIGHTDONE,
-    S_PUNCHREADY,
-    S_PUNCHDOWN,
-    S_PUNCHUP,
-    S_PUNCHATK1_1,
-    S_PUNCHATK1_2,
-    S_PUNCHATK1_3,
-    S_PUNCHATK1_4,
-    S_PUNCHATK1_5,
-    S_PUNCHATK2_1,
-    S_PUNCHATK2_2,
-    S_PUNCHATK2_3,
-    S_PUNCHATK2_4,
-    S_PUNCHATK2_5,
-    S_PUNCHATK2_6,
-    S_PUNCHATK2_7,
-    S_PUNCHATK2_8,
-    S_PUNCHATK2_9,
-    S_PUNCHPUFF1,
-    S_PUNCHPUFF2,
-    S_PUNCHPUFF3,
-    S_PUNCHPUFF4,
-    S_PUNCHPUFF5,
-    S_AXE,
-    S_FAXEREADY,
-    S_FAXEDOWN,
-    S_FAXEUP,
-    S_FAXEATK_1,
-    S_FAXEATK_2,
-    S_FAXEATK_3,
-    S_FAXEATK_4,
-    S_FAXEATK_5,
-    S_FAXEATK_6,
-    S_FAXEATK_7,
-    S_FAXEATK_8,
-    S_FAXEATK_9,
-    S_FAXEATK_10,
-    S_FAXEATK_11,
-    S_FAXEATK_12,
-    S_FAXEATK_13,
-    S_FAXEREADY_G,
-    S_FAXEREADY_G1,
-    S_FAXEREADY_G2,
-    S_FAXEREADY_G3,
-    S_FAXEREADY_G4,
-    S_FAXEREADY_G5,
-    S_FAXEDOWN_G,
-    S_FAXEUP_G,
-    S_FAXEATK_G1,
-    S_FAXEATK_G2,
-    S_FAXEATK_G3,
-    S_FAXEATK_G4,
-    S_FAXEATK_G5,
-    S_FAXEATK_G6,
-    S_FAXEATK_G7,
-    S_FAXEATK_G8,
-    S_FAXEATK_G9,
-    S_FAXEATK_G10,
-    S_FAXEATK_G11,
-    S_FAXEATK_G12,
-    S_FAXEATK_G13,
-    S_AXEPUFF_GLOW1,
-    S_AXEPUFF_GLOW2,
-    S_AXEPUFF_GLOW3,
-    S_AXEPUFF_GLOW4,
-    S_AXEPUFF_GLOW5,
-    S_AXEPUFF_GLOW6,
-    S_AXEPUFF_GLOW7,
-    S_AXEBLOOD1,
-    S_AXEBLOOD2,
-    S_AXEBLOOD3,
-    S_AXEBLOOD4,
-    S_AXEBLOOD5,
-    S_AXEBLOOD6,
-    S_HAMM,
-    S_FHAMMERREADY,
-    S_FHAMMERDOWN,
-    S_FHAMMERUP,
-    S_FHAMMERATK_1,
-    S_FHAMMERATK_2,
-    S_FHAMMERATK_3,
-    S_FHAMMERATK_4,
-    S_FHAMMERATK_5,
-    S_FHAMMERATK_6,
-    S_FHAMMERATK_7,
-    S_FHAMMERATK_8,
-    S_FHAMMERATK_9,
-    S_FHAMMERATK_10,
-    S_FHAMMERATK_11,
-    S_FHAMMERATK_12,
-    S_HAMMER_MISSILE_1,
-    S_HAMMER_MISSILE_2,
-    S_HAMMER_MISSILE_3,
-    S_HAMMER_MISSILE_4,
-    S_HAMMER_MISSILE_5,
-    S_HAMMER_MISSILE_6,
-    S_HAMMER_MISSILE_7,
-    S_HAMMER_MISSILE_8,
-    S_HAMMER_MISSILE_X1,
-    S_HAMMER_MISSILE_X2,
-    S_HAMMER_MISSILE_X3,
-    S_HAMMER_MISSILE_X4,
-    S_HAMMER_MISSILE_X5,
-    S_HAMMER_MISSILE_X6,
-    S_HAMMER_MISSILE_X7,
-    S_HAMMER_MISSILE_X8,
-    S_HAMMER_MISSILE_X9,
-    S_HAMMER_MISSILE_X10,
-    S_HAMMERPUFF1,
-    S_HAMMERPUFF2,
-    S_HAMMERPUFF3,
-    S_HAMMERPUFF4,
-    S_HAMMERPUFF5,
-    S_FSWORDREADY,
-    S_FSWORDREADY1,
-    S_FSWORDREADY2,
-    S_FSWORDREADY3,
-    S_FSWORDREADY4,
-    S_FSWORDREADY5,
-    S_FSWORDREADY6,
-    S_FSWORDREADY7,
-    S_FSWORDREADY8,
-    S_FSWORDREADY9,
-    S_FSWORDREADY10,
-    S_FSWORDREADY11,
-    S_FSWORDDOWN,
-    S_FSWORDUP,
-    S_FSWORDATK_1,
-    S_FSWORDATK_2,
-    S_FSWORDATK_3,
-    S_FSWORDATK_4,
-    S_FSWORDATK_5,
-    S_FSWORDATK_6,
-    S_FSWORDATK_7,
-    S_FSWORDATK_8,
-    S_FSWORDATK_9,
-    S_FSWORDATK_10,
-    S_FSWORDATK_11,
-    S_FSWORDATK_12,
-    S_FSWORD_MISSILE1,
-    S_FSWORD_MISSILE2,
-    S_FSWORD_MISSILE3,
-    S_FSWORD_MISSILE_X1,
-    S_FSWORD_MISSILE_X2,
-    S_FSWORD_MISSILE_X3,
-    S_FSWORD_MISSILE_X4,
-    S_FSWORD_MISSILE_X5,
-    S_FSWORD_MISSILE_X6,
-    S_FSWORD_MISSILE_X7,
-    S_FSWORD_MISSILE_X8,
-    S_FSWORD_MISSILE_X9,
-    S_FSWORD_MISSILE_X10,
-    S_FSWORD_FLAME1,
-    S_FSWORD_FLAME2,
-    S_FSWORD_FLAME3,
-    S_FSWORD_FLAME4,
-    S_FSWORD_FLAME5,
-    S_FSWORD_FLAME6,
-    S_FSWORD_FLAME7,
-    S_FSWORD_FLAME8,
-    S_FSWORD_FLAME9,
-    S_FSWORD_FLAME10,
-    S_CMACEREADY,
-    S_CMACEDOWN,
-    S_CMACEUP,
-    S_CMACEATK_1,
-    S_CMACEATK_2,
-    S_CMACEATK_3,
-    S_CMACEATK_4,
-    S_CMACEATK_5,
-    S_CMACEATK_6,
-    S_CMACEATK_7,
-    S_CMACEATK_8,
-    S_CMACEATK_9,
-    S_CMACEATK_10,
-    S_CMACEATK_11,
-    S_CMACEATK_12,
-    S_CMACEATK_13,
-    S_CMACEATK_14,
-    S_CMACEATK_15,
-    S_CMACEATK_16,
-    S_CMACEATK_17,
-    S_CSTAFF,
-    S_CSTAFFREADY,
-    S_CSTAFFREADY1,
-    S_CSTAFFREADY2,
-    S_CSTAFFREADY3,
-    S_CSTAFFREADY4,
-    S_CSTAFFREADY5,
-    S_CSTAFFREADY6,
-    S_CSTAFFREADY7,
-    S_CSTAFFREADY8,
-    S_CSTAFFREADY9,
-    S_CSTAFFBLINK1,
-    S_CSTAFFBLINK2,
-    S_CSTAFFBLINK3,
-    S_CSTAFFBLINK4,
-    S_CSTAFFBLINK5,
-    S_CSTAFFBLINK6,
-    S_CSTAFFBLINK7,
-    S_CSTAFFBLINK8,
-    S_CSTAFFBLINK9,
-    S_CSTAFFBLINK10,
-    S_CSTAFFBLINK11,
-    S_CSTAFFDOWN,
-    S_CSTAFFDOWN2,
-    S_CSTAFFDOWN3,
-    S_CSTAFFUP,
-    S_CSTAFFATK_1,
-    S_CSTAFFATK_2,
-    S_CSTAFFATK_3,
-    S_CSTAFFATK_4,
-    S_CSTAFFATK_5,
-    S_CSTAFFATK_6,
-    S_CSTAFFATK2_1,
-    S_CSTAFF_MISSILE1,
-    S_CSTAFF_MISSILE2,
-    S_CSTAFF_MISSILE3,
-    S_CSTAFF_MISSILE4,
-    S_CSTAFF_MISSILE_X1,
-    S_CSTAFF_MISSILE_X2,
-    S_CSTAFF_MISSILE_X3,
-    S_CSTAFF_MISSILE_X4,
-    S_CSTAFFPUFF1,
-    S_CSTAFFPUFF2,
-    S_CSTAFFPUFF3,
-    S_CSTAFFPUFF4,
-    S_CSTAFFPUFF5,
-    S_CFLAME1,
-    S_CFLAME2,
-    S_CFLAME3,
-    S_CFLAME4,
-    S_CFLAME5,
-    S_CFLAME6,
-    S_CFLAME7,
-    S_CFLAME8,
-    S_CFLAMEREADY1,
-    S_CFLAMEREADY2,
-    S_CFLAMEREADY3,
-    S_CFLAMEREADY4,
-    S_CFLAMEREADY5,
-    S_CFLAMEREADY6,
-    S_CFLAMEREADY7,
-    S_CFLAMEREADY8,
-    S_CFLAMEREADY9,
-    S_CFLAMEREADY10,
-    S_CFLAMEREADY11,
-    S_CFLAMEREADY12,
-    S_CFLAMEDOWN,
-    S_CFLAMEUP,
-    S_CFLAMEATK_1,
-    S_CFLAMEATK_2,
-    S_CFLAMEATK_3,
-    S_CFLAMEATK_4,
-    S_CFLAMEATK_5,
-    S_CFLAMEATK_6,
-    S_CFLAMEATK_7,
-    S_CFLAMEATK_8,
-    S_CFLAMEFLOOR1,
-    S_CFLAMEFLOOR2,
-    S_CFLAMEFLOOR3,
-    S_FLAMEPUFF1,
-    S_FLAMEPUFF2,
-    S_FLAMEPUFF3,
-    S_FLAMEPUFF4,
-    S_FLAMEPUFF5,
-    S_FLAMEPUFF6,
-    S_FLAMEPUFF7,
-    S_FLAMEPUFF8,
-    S_FLAMEPUFF9,
-    S_FLAMEPUFF10,
-    S_FLAMEPUFF11,
-    S_FLAMEPUFF12,
-    S_FLAMEPUFF13,
-    S_FLAMEPUFF2_1,
-    S_FLAMEPUFF2_2,
-    S_FLAMEPUFF2_3,
-    S_FLAMEPUFF2_4,
-    S_FLAMEPUFF2_5,
-    S_FLAMEPUFF2_6,
-    S_FLAMEPUFF2_7,
-    S_FLAMEPUFF2_8,
-    S_FLAMEPUFF2_9,
-    S_FLAMEPUFF2_10,
-    S_FLAMEPUFF2_11,
-    S_FLAMEPUFF2_12,
-    S_FLAMEPUFF2_13,
-    S_FLAMEPUFF2_14,
-    S_FLAMEPUFF2_15,
-    S_FLAMEPUFF2_16,
-    S_FLAMEPUFF2_17,
-    S_FLAMEPUFF2_18,
-    S_FLAMEPUFF2_19,
-    S_FLAMEPUFF2_20,
-    S_CIRCLE_FLAME1,
-    S_CIRCLE_FLAME2,
-    S_CIRCLE_FLAME3,
-    S_CIRCLE_FLAME4,
-    S_CIRCLE_FLAME5,
-    S_CIRCLE_FLAME6,
-    S_CIRCLE_FLAME7,
-    S_CIRCLE_FLAME8,
-    S_CIRCLE_FLAME9,
-    S_CIRCLE_FLAME10,
-    S_CIRCLE_FLAME11,
-    S_CIRCLE_FLAME12,
-    S_CIRCLE_FLAME13,
-    S_CIRCLE_FLAME14,
-    S_CIRCLE_FLAME15,
-    S_CIRCLE_FLAME16,
-    S_CIRCLE_FLAME_X1,
-    S_CIRCLE_FLAME_X2,
-    S_CIRCLE_FLAME_X3,
-    S_CIRCLE_FLAME_X4,
-    S_CIRCLE_FLAME_X5,
-    S_CIRCLE_FLAME_X6,
-    S_CIRCLE_FLAME_X7,
-    S_CIRCLE_FLAME_X8,
-    S_CIRCLE_FLAME_X9,
-    S_CIRCLE_FLAME_X10,
-    S_CFLAME_MISSILE1,
-    S_CFLAME_MISSILE2,
-    S_CFLAME_MISSILE_X,
-    S_CHOLYREADY,
-    S_CHOLYDOWN,
-    S_CHOLYUP,
-    S_CHOLYATK_1,
-    S_CHOLYATK_2,
-    S_CHOLYATK_3,
-    S_CHOLYATK_4,
-    S_CHOLYATK_5,
-    S_CHOLYATK_6,
-    S_CHOLYATK_7,
-    S_CHOLYATK_8,
-    S_CHOLYATK_9,
-    S_HOLY_FX1,
-    S_HOLY_FX2,
-    S_HOLY_FX3,
-    S_HOLY_FX4,
-    S_HOLY_FX_X1,
-    S_HOLY_FX_X2,
-    S_HOLY_FX_X3,
-    S_HOLY_FX_X4,
-    S_HOLY_FX_X5,
-    S_HOLY_FX_X6,
-    S_HOLY_TAIL1,
-    S_HOLY_TAIL2,
-    S_HOLY_PUFF1,
-    S_HOLY_PUFF2,
-    S_HOLY_PUFF3,
-    S_HOLY_PUFF4,
-    S_HOLY_PUFF5,
-    S_HOLY_MISSILE1,
-    S_HOLY_MISSILE2,
-    S_HOLY_MISSILE3,
-    S_HOLY_MISSILE4,
-    S_HOLY_MISSILE_X,
-    S_HOLY_MISSILE_P1,
-    S_HOLY_MISSILE_P2,
-    S_HOLY_MISSILE_P3,
-    S_HOLY_MISSILE_P4,
-    S_HOLY_MISSILE_P5,
-    S_MWANDREADY,
-    S_MWANDDOWN,
-    S_MWANDUP,
-    S_MWANDATK_1,
-    S_MWANDATK_2,
-    S_MWANDATK_3,
-    S_MWANDATK_4,
-    S_MWANDPUFF1,
-    S_MWANDPUFF2,
-    S_MWANDPUFF3,
-    S_MWANDPUFF4,
-    S_MWANDPUFF5,
-    S_MWANDSMOKE1,
-    S_MWANDSMOKE2,
-    S_MWANDSMOKE3,
-    S_MWANDSMOKE4,
-    S_MWAND_MISSILE1,
-    S_MWAND_MISSILE2,
-    S_MW_LIGHTNING1,
-    S_MW_LIGHTNING2,
-    S_MW_LIGHTNING3,
-    S_MW_LIGHTNING4,
-    S_MW_LIGHTNING5,
-    S_MW_LIGHTNING6,
-    S_MW_LIGHTNING7,
-    S_MW_LIGHTNING8,
-    S_MLIGHTNINGREADY,
-    S_MLIGHTNINGREADY2,
-    S_MLIGHTNINGREADY3,
-    S_MLIGHTNINGREADY4,
-    S_MLIGHTNINGREADY5,
-    S_MLIGHTNINGREADY6,
-    S_MLIGHTNINGREADY7,
-    S_MLIGHTNINGREADY8,
-    S_MLIGHTNINGREADY9,
-    S_MLIGHTNINGREADY10,
-    S_MLIGHTNINGREADY11,
-    S_MLIGHTNINGREADY12,
-    S_MLIGHTNINGREADY13,
-    S_MLIGHTNINGREADY14,
-    S_MLIGHTNINGREADY15,
-    S_MLIGHTNINGREADY16,
-    S_MLIGHTNINGREADY17,
-    S_MLIGHTNINGREADY18,
-    S_MLIGHTNINGREADY19,
-    S_MLIGHTNINGREADY20,
-    S_MLIGHTNINGREADY21,
-    S_MLIGHTNINGREADY22,
-    S_MLIGHTNINGREADY23,
-    S_MLIGHTNINGREADY24,
-    S_MLIGHTNINGDOWN,
-    S_MLIGHTNINGUP,
-    S_MLIGHTNINGATK_1,
-    S_MLIGHTNINGATK_2,
-    S_MLIGHTNINGATK_3,
-    S_MLIGHTNINGATK_4,
-    S_MLIGHTNINGATK_5,
-    S_MLIGHTNINGATK_6,
-    S_MLIGHTNINGATK_7,
-    S_MLIGHTNINGATK_8,
-    S_MLIGHTNINGATK_9,
-    S_MLIGHTNINGATK_10,
-    S_MLIGHTNINGATK_11,
-    S_LIGHTNING_CEILING1,
-    S_LIGHTNING_CEILING2,
-    S_LIGHTNING_CEILING3,
-    S_LIGHTNING_CEILING4,
-    S_LIGHTNING_C_X1,
-    S_LIGHTNING_C_X2,
-    S_LIGHTNING_C_X3,
-    S_LIGHTNING_C_X4,
-    S_LIGHTNING_C_X5,
-    S_LIGHTNING_C_X6,
-    S_LIGHTNING_C_X7,
-    S_LIGHTNING_C_X8,
-    S_LIGHTNING_C_X9,
-    S_LIGHTNING_C_X10,
-    S_LIGHTNING_C_X11,
-    S_LIGHTNING_C_X12,
-    S_LIGHTNING_C_X13,
-    S_LIGHTNING_C_X14,
-    S_LIGHTNING_C_X15,
-    S_LIGHTNING_C_X16,
-    S_LIGHTNING_C_X17,
-    S_LIGHTNING_C_X18,
-    S_LIGHTNING_C_X19,
-    S_LIGHTNING_FLOOR1,
-    S_LIGHTNING_FLOOR2,
-    S_LIGHTNING_FLOOR3,
-    S_LIGHTNING_FLOOR4,
-    S_LIGHTNING_F_X1,
-    S_LIGHTNING_F_X2,
-    S_LIGHTNING_F_X3,
-    S_LIGHTNING_F_X4,
-    S_LIGHTNING_F_X5,
-    S_LIGHTNING_F_X6,
-    S_LIGHTNING_F_X7,
-    S_LIGHTNING_F_X8,
-    S_LIGHTNING_F_X9,
-    S_LIGHTNING_F_X10,
-    S_LIGHTNING_F_X11,
-    S_LIGHTNING_F_X12,
-    S_LIGHTNING_F_X13,
-    S_LIGHTNING_F_X14,
-    S_LIGHTNING_F_X15,
-    S_LIGHTNING_F_X16,
-    S_LIGHTNING_F_X17,
-    S_LIGHTNING_F_X18,
-    S_LIGHTNING_F_X19,
-    S_LIGHTNING_ZAP1,
-    S_LIGHTNING_ZAP2,
-    S_LIGHTNING_ZAP3,
-    S_LIGHTNING_ZAP4,
-    S_LIGHTNING_ZAP5,
-    S_LIGHTNING_ZAP_X1,
-    S_LIGHTNING_ZAP_X2,
-    S_LIGHTNING_ZAP_X3,
-    S_LIGHTNING_ZAP_X4,
-    S_LIGHTNING_ZAP_X5,
-    S_LIGHTNING_ZAP_X6,
-    S_LIGHTNING_ZAP_X7,
-    S_LIGHTNING_ZAP_X8,
-    S_MSTAFFREADY,
-    S_MSTAFFREADY2,
-    S_MSTAFFREADY3,
-    S_MSTAFFREADY4,
-    S_MSTAFFREADY5,
-    S_MSTAFFREADY6,
-    S_MSTAFFREADY7,
-    S_MSTAFFREADY8,
-    S_MSTAFFREADY9,
-    S_MSTAFFREADY10,
-    S_MSTAFFREADY11,
-    S_MSTAFFREADY12,
-    S_MSTAFFREADY13,
-    S_MSTAFFREADY14,
-    S_MSTAFFREADY15,
-    S_MSTAFFREADY16,
-    S_MSTAFFREADY17,
-    S_MSTAFFREADY18,
-    S_MSTAFFREADY19,
-    S_MSTAFFREADY20,
-    S_MSTAFFREADY21,
-    S_MSTAFFREADY22,
-    S_MSTAFFREADY23,
-    S_MSTAFFREADY24,
-    S_MSTAFFREADY25,
-    S_MSTAFFREADY26,
-    S_MSTAFFREADY27,
-    S_MSTAFFREADY28,
-    S_MSTAFFREADY29,
-    S_MSTAFFREADY30,
-    S_MSTAFFREADY31,
-    S_MSTAFFREADY32,
-    S_MSTAFFREADY33,
-    S_MSTAFFREADY34,
-    S_MSTAFFREADY35,
-    S_MSTAFFDOWN,
-    S_MSTAFFUP,
-    S_MSTAFFATK_1,
-    S_MSTAFFATK_2,
-    S_MSTAFFATK_3,
-    S_MSTAFFATK_4,
-    S_MSTAFFATK_5,
-    S_MSTAFFATK_6,
-    S_MSTAFFATK_7,
-    S_MSTAFF_FX1_1,
-    S_MSTAFF_FX1_2,
-    S_MSTAFF_FX1_3,
-    S_MSTAFF_FX1_4,
-    S_MSTAFF_FX1_5,
-    S_MSTAFF_FX1_6,
-    S_MSTAFF_FX_X1,
-    S_MSTAFF_FX_X2,
-    S_MSTAFF_FX_X3,
-    S_MSTAFF_FX_X4,
-    S_MSTAFF_FX_X5,
-    S_MSTAFF_FX_X6,
-    S_MSTAFF_FX_X7,
-    S_MSTAFF_FX_X8,
-    S_MSTAFF_FX_X9,
-    S_MSTAFF_FX_X10,
-    S_MSTAFF_FX2_1,
-    S_MSTAFF_FX2_2,
-    S_MSTAFF_FX2_3,
-    S_MSTAFF_FX2_4,
-    S_MSTAFF_FX2_X1,
-    S_MSTAFF_FX2_X2,
-    S_MSTAFF_FX2_X3,
-    S_MSTAFF_FX2_X4,
-    S_MSTAFF_FX2_X5,
-    S_FSWORD1,
-    S_FSWORD2,
-    S_FSWORD3,
-    S_CHOLY1,
-    S_CHOLY2,
-    S_CHOLY3,
-    S_MSTAFF1,
-    S_MSTAFF2,
-    S_MSTAFF3,
-    S_SNOUTREADY,
-    S_SNOUTDOWN,
-    S_SNOUTUP,
-    S_SNOUTATK1,
-    S_SNOUTATK2,
-    S_COS1,
-    S_COS2,
-    S_COS3,
-    S_CONEREADY,
-    S_CONEDOWN,
-    S_CONEUP,
-    S_CONEATK1_1,
-    S_CONEATK1_2,
-    S_CONEATK1_3,
-    S_CONEATK1_4,
-    S_CONEATK1_5,
-    S_CONEATK1_6,
-    S_CONEATK1_7,
-    S_CONEATK1_8,
-    S_SHARDFX1_1,
-    S_SHARDFX1_2,
-    S_SHARDFX1_3,
-    S_SHARDFX1_4,
-    S_SHARDFXE1_1,
-    S_SHARDFXE1_2,
-    S_SHARDFXE1_3,
-    S_SHARDFXE1_4,
-    S_SHARDFXE1_5,
-    S_BLOOD1,
-    S_BLOOD2,
-    S_BLOOD3,
-    S_BLOODSPLATTER1,
-    S_BLOODSPLATTER2,
-    S_BLOODSPLATTER3,
-    S_BLOODSPLATTERX,
-    S_GIBS1,
-    S_FPLAY,
-    S_FPLAY_RUN1,
-    S_FPLAY_RUN2,
-    S_FPLAY_RUN3,
-    S_FPLAY_RUN4,
-    S_FPLAY_ATK1,
-    S_FPLAY_ATK2,
-    S_FPLAY_PAIN,
-    S_FPLAY_PAIN2,
-    S_FPLAY_DIE1,
-    S_FPLAY_DIE2,
-    S_FPLAY_DIE3,
-    S_FPLAY_DIE4,
-    S_FPLAY_DIE5,
-    S_FPLAY_DIE6,
-    S_FPLAY_DIE7,
-    S_FPLAY_XDIE1,
-    S_FPLAY_XDIE2,
-    S_FPLAY_XDIE3,
-    S_FPLAY_XDIE4,
-    S_FPLAY_XDIE5,
-    S_FPLAY_XDIE6,
-    S_FPLAY_XDIE7,
-    S_FPLAY_XDIE8,
-    S_FPLAY_ICE,
-    S_FPLAY_ICE2,
-    S_PLAY_F_FDTH1,
-    S_PLAY_F_FDTH2,
-    S_PLAY_C_FDTH1,
-    S_PLAY_C_FDTH2,
-    S_PLAY_M_FDTH1,
-    S_PLAY_M_FDTH2,
-    S_PLAY_FDTH3,
-    S_PLAY_FDTH4,
-    S_PLAY_FDTH5,
-    S_PLAY_FDTH6,
-    S_PLAY_FDTH7,
-    S_PLAY_FDTH8,
-    S_PLAY_FDTH9,
-    S_PLAY_FDTH10,
-    S_PLAY_FDTH11,
-    S_PLAY_FDTH12,
-    S_PLAY_FDTH13,
-    S_PLAY_FDTH14,
-    S_PLAY_FDTH15,
-    S_PLAY_FDTH16,
-    S_PLAY_FDTH17,
-    S_PLAY_FDTH18,
-    S_PLAY_FDTH19,
-    S_PLAY_FDTH20,
-    S_BLOODYSKULL1,
-    S_BLOODYSKULL2,
-    S_BLOODYSKULL3,
-    S_BLOODYSKULL4,
-    S_BLOODYSKULL5,
-    S_BLOODYSKULL6,
-    S_BLOODYSKULL7,
-    S_BLOODYSKULLX1,
-    S_BLOODYSKULLX2,
-    S_PLAYER_SPEED1,
-    S_PLAYER_SPEED2,
-    S_ICECHUNK1,
-    S_ICECHUNK2,
-    S_ICECHUNK3,
-    S_ICECHUNK4,
-    S_ICECHUNK_HEAD,
-    S_ICECHUNK_HEAD2,
-    S_CPLAY,
-    S_CPLAY_RUN1,
-    S_CPLAY_RUN2,
-    S_CPLAY_RUN3,
-    S_CPLAY_RUN4,
-    S_CPLAY_ATK1,
-    S_CPLAY_ATK2,
-    S_CPLAY_ATK3,
-    S_CPLAY_PAIN,
-    S_CPLAY_PAIN2,
-    S_CPLAY_DIE1,
-    S_CPLAY_DIE2,
-    S_CPLAY_DIE3,
-    S_CPLAY_DIE4,
-    S_CPLAY_DIE5,
-    S_CPLAY_DIE6,
-    S_CPLAY_DIE7,
-    S_CPLAY_DIE8,
-    S_CPLAY_DIE9,
-    S_CPLAY_XDIE1,
-    S_CPLAY_XDIE2,
-    S_CPLAY_XDIE3,
-    S_CPLAY_XDIE4,
-    S_CPLAY_XDIE5,
-    S_CPLAY_XDIE6,
-    S_CPLAY_XDIE7,
-    S_CPLAY_XDIE8,
-    S_CPLAY_XDIE9,
-    S_CPLAY_XDIE10,
-    S_CPLAY_ICE,
-    S_CPLAY_ICE2,
-    S_MPLAY,
-    S_MPLAY_RUN1,
-    S_MPLAY_RUN2,
-    S_MPLAY_RUN3,
-    S_MPLAY_RUN4,
-    S_MPLAY_ATK1,
-    S_MPLAY_ATK2,
-    S_MPLAY_PAIN,
-    S_MPLAY_PAIN2,
-    S_MPLAY_DIE1,
-    S_MPLAY_DIE2,
-    S_MPLAY_DIE3,
-    S_MPLAY_DIE4,
-    S_MPLAY_DIE5,
-    S_MPLAY_DIE6,
-    S_MPLAY_DIE7,
-    S_MPLAY_XDIE1,
-    S_MPLAY_XDIE2,
-    S_MPLAY_XDIE3,
-    S_MPLAY_XDIE4,
-    S_MPLAY_XDIE5,
-    S_MPLAY_XDIE6,
-    S_MPLAY_XDIE7,
-    S_MPLAY_XDIE8,
-    S_MPLAY_XDIE9,
-    S_MPLAY_ICE,
-    S_MPLAY_ICE2,
-    S_PIGPLAY,
-    S_PIGPLAY_RUN1,
-    S_PIGPLAY_RUN2,
-    S_PIGPLAY_RUN3,
-    S_PIGPLAY_RUN4,
-    S_PIGPLAY_ATK1,
-    S_PIGPLAY_PAIN,
-    S_PIG_LOOK1,
-    S_PIG_WALK1,
-    S_PIG_WALK2,
-    S_PIG_WALK3,
-    S_PIG_WALK4,
-    S_PIG_PAIN,
-    S_PIG_ATK1,
-    S_PIG_ATK2,
-    S_PIG_DIE1,
-    S_PIG_DIE2,
-    S_PIG_DIE3,
-    S_PIG_DIE4,
-    S_PIG_DIE5,
-    S_PIG_DIE6,
-    S_PIG_DIE7,
-    S_PIG_DIE8,
-    S_PIG_ICE,
-    S_PIG_ICE2,
-    S_CENTAUR_LOOK1,
-    S_CENTAUR_LOOK2,
-    S_CENTAUR_WALK1,
-    S_CENTAUR_WALK2,
-    S_CENTAUR_WALK3,
-    S_CENTAUR_WALK4,
-    S_CENTAUR_ATK1,
-    S_CENTAUR_ATK2,
-    S_CENTAUR_ATK3,
-    S_CENTAUR_MISSILE1,
-    S_CENTAUR_MISSILE2,
-    S_CENTAUR_MISSILE3,
-    S_CENTAUR_MISSILE4,
-    S_CENTAUR_PAIN1,
-    S_CENTAUR_PAIN2,
-    S_CENTAUR_PAIN3,
-    S_CENTAUR_PAIN4,
-    S_CENTAUR_PAIN5,
-    S_CENTAUR_PAIN6,
-    S_CENTAUR_DEATH1,
-    S_CENTAUR_DEATH2,
-    S_CENTAUR_DEATH3,
-    S_CENTAUR_DEATH4,
-    S_CENTAUR_DEATH5,
-    S_CENTAUR_DEATH6,
-    S_CENTAUR_DEATH7,
-    S_CENTAUR_DEATH8,
-    S_CENTAUR_DEATH9,
-    S_CENTAUR_DEATH0,
-    S_CENTAUR_DEATH_X1,
-    S_CENTAUR_DEATH_X2,
-    S_CENTAUR_DEATH_X3,
-    S_CENTAUR_DEATH_X4,
-    S_CENTAUR_DEATH_X5,
-    S_CENTAUR_DEATH_X6,
-    S_CENTAUR_DEATH_X7,
-    S_CENTAUR_DEATH_X8,
-    S_CENTAUR_DEATH_X9,
-    S_CENTAUR_DEATH_X10,
-    S_CENTAUR_DEATH_X11,
-    S_CENTAUR_ICE,
-    S_CENTAUR_ICE2,
-    S_CENTAUR_FX1,
-    S_CENTAUR_FX_X1,
-    S_CENTAUR_FX_X2,
-    S_CENTAUR_FX_X3,
-    S_CENTAUR_FX_X4,
-    S_CENTAUR_FX_X5,
-    S_CENTAUR_SHIELD1,
-    S_CENTAUR_SHIELD2,
-    S_CENTAUR_SHIELD3,
-    S_CENTAUR_SHIELD4,
-    S_CENTAUR_SHIELD5,
-    S_CENTAUR_SHIELD6,
-    S_CENTAUR_SHIELD_X1,
-    S_CENTAUR_SHIELD_X2,
-    S_CENTAUR_SHIELD_X3,
-    S_CENTAUR_SHIELD_X4,
-    S_CENTAUR_SWORD1,
-    S_CENTAUR_SWORD2,
-    S_CENTAUR_SWORD3,
-    S_CENTAUR_SWORD4,
-    S_CENTAUR_SWORD5,
-    S_CENTAUR_SWORD6,
-    S_CENTAUR_SWORD7,
-    S_CENTAUR_SWORD_X1,
-    S_CENTAUR_SWORD_X2,
-    S_CENTAUR_SWORD_X3,
-    S_DEMN_LOOK1,
-    S_DEMN_LOOK2,
-    S_DEMN_CHASE1,
-    S_DEMN_CHASE2,
-    S_DEMN_CHASE3,
-    S_DEMN_CHASE4,
-    S_DEMN_ATK1_1,
-    S_DEMN_ATK1_2,
-    S_DEMN_ATK1_3,
-    S_DEMN_ATK2_1,
-    S_DEMN_ATK2_2,
-    S_DEMN_ATK2_3,
-    S_DEMN_PAIN1,
-    S_DEMN_PAIN2,
-    S_DEMN_DEATH1,
-    S_DEMN_DEATH2,
-    S_DEMN_DEATH3,
-    S_DEMN_DEATH4,
-    S_DEMN_DEATH5,
-    S_DEMN_DEATH6,
-    S_DEMN_DEATH7,
-    S_DEMN_DEATH8,
-    S_DEMN_DEATH9,
-    S_DEMN_XDEATH1,
-    S_DEMN_XDEATH2,
-    S_DEMN_XDEATH3,
-    S_DEMN_XDEATH4,
-    S_DEMN_XDEATH5,
-    S_DEMN_XDEATH6,
-    S_DEMN_XDEATH7,
-    S_DEMN_XDEATH8,
-    S_DEMN_XDEATH9,
-    S_DEMON_ICE,
-    S_DEMON_ICE2,
-    S_DEMONCHUNK1_1,
-    S_DEMONCHUNK1_2,
-    S_DEMONCHUNK1_3,
-    S_DEMONCHUNK1_4,
-    S_DEMONCHUNK2_1,
-    S_DEMONCHUNK2_2,
-    S_DEMONCHUNK2_3,
-    S_DEMONCHUNK2_4,
-    S_DEMONCHUNK3_1,
-    S_DEMONCHUNK3_2,
-    S_DEMONCHUNK3_3,
-    S_DEMONCHUNK3_4,
-    S_DEMONCHUNK4_1,
-    S_DEMONCHUNK4_2,
-    S_DEMONCHUNK4_3,
-    S_DEMONCHUNK4_4,
-    S_DEMONCHUNK5_1,
-    S_DEMONCHUNK5_2,
-    S_DEMONCHUNK5_3,
-    S_DEMONCHUNK5_4,
-    S_DEMONFX_MOVE1,
-    S_DEMONFX_MOVE2,
-    S_DEMONFX_MOVE3,
-    S_DEMONFX_BOOM1,
-    S_DEMONFX_BOOM2,
-    S_DEMONFX_BOOM3,
-    S_DEMONFX_BOOM4,
-    S_DEMONFX_BOOM5,
-    S_DEMN2_LOOK1,
-    S_DEMN2_LOOK2,
-    S_DEMN2_CHASE1,
-    S_DEMN2_CHASE2,
-    S_DEMN2_CHASE3,
-    S_DEMN2_CHASE4,
-    S_DEMN2_ATK1_1,
-    S_DEMN2_ATK1_2,
-    S_DEMN2_ATK1_3,
-    S_DEMN2_ATK2_1,
-    S_DEMN2_ATK2_2,
-    S_DEMN2_ATK2_3,
-    S_DEMN2_PAIN1,
-    S_DEMN2_PAIN2,
-    S_DEMN2_DEATH1,
-    S_DEMN2_DEATH2,
-    S_DEMN2_DEATH3,
-    S_DEMN2_DEATH4,
-    S_DEMN2_DEATH5,
-    S_DEMN2_DEATH6,
-    S_DEMN2_DEATH7,
-    S_DEMN2_DEATH8,
-    S_DEMN2_DEATH9,
-    S_DEMN2_XDEATH1,
-    S_DEMN2_XDEATH2,
-    S_DEMN2_XDEATH3,
-    S_DEMN2_XDEATH4,
-    S_DEMN2_XDEATH5,
-    S_DEMN2_XDEATH6,
-    S_DEMN2_XDEATH7,
-    S_DEMN2_XDEATH8,
-    S_DEMN2_XDEATH9,
-    S_DEMON2CHUNK1_1,
-    S_DEMON2CHUNK1_2,
-    S_DEMON2CHUNK1_3,
-    S_DEMON2CHUNK1_4,
-    S_DEMON2CHUNK2_1,
-    S_DEMON2CHUNK2_2,
-    S_DEMON2CHUNK2_3,
-    S_DEMON2CHUNK2_4,
-    S_DEMON2CHUNK3_1,
-    S_DEMON2CHUNK3_2,
-    S_DEMON2CHUNK3_3,
-    S_DEMON2CHUNK3_4,
-    S_DEMON2CHUNK4_1,
-    S_DEMON2CHUNK4_2,
-    S_DEMON2CHUNK4_3,
-    S_DEMON2CHUNK4_4,
-    S_DEMON2CHUNK5_1,
-    S_DEMON2CHUNK5_2,
-    S_DEMON2CHUNK5_3,
-    S_DEMON2CHUNK5_4,
-    S_DEMON2FX_MOVE1,
-    S_DEMON2FX_MOVE2,
-    S_DEMON2FX_MOVE3,
-    S_DEMON2FX_MOVE4,
-    S_DEMON2FX_MOVE5,
-    S_DEMON2FX_MOVE6,
-    S_DEMON2FX_BOOM1,
-    S_DEMON2FX_BOOM2,
-    S_DEMON2FX_BOOM3,
-    S_DEMON2FX_BOOM4,
-    S_DEMON2FX_BOOM5,
-    S_DEMON2FX_BOOM6,
-    S_WRAITH_RAISE1,
-    S_WRAITH_RAISE2,
-    S_WRAITH_RAISE3,
-    S_WRAITH_RAISE4,
-    S_WRAITH_RAISE5,
-    S_WRAITH_INIT1,
-    S_WRAITH_INIT2,
-    S_WRAITH_LOOK1,
-    S_WRAITH_LOOK2,
-    S_WRAITH_CHASE1,
-    S_WRAITH_CHASE2,
-    S_WRAITH_CHASE3,
-    S_WRAITH_CHASE4,
-    S_WRAITH_ATK1_1,
-    S_WRAITH_ATK1_2,
-    S_WRAITH_ATK1_3,
-    S_WRAITH_ATK2_1,
-    S_WRAITH_ATK2_2,
-    S_WRAITH_ATK2_3,
-    S_WRAITH_PAIN1,
-    S_WRAITH_PAIN2,
-    S_WRAITH_DEATH1_1,
-    S_WRAITH_DEATH1_2,
-    S_WRAITH_DEATH1_3,
-    S_WRAITH_DEATH1_4,
-    S_WRAITH_DEATH1_5,
-    S_WRAITH_DEATH1_6,
-    S_WRAITH_DEATH1_7,
-    S_WRAITH_DEATH1_8,
-    S_WRAITH_DEATH1_9,
-    S_WRAITH_DEATH1_0,
-    S_WRAITH_DEATH2_1,
-    S_WRAITH_DEATH2_2,
-    S_WRAITH_DEATH2_3,
-    S_WRAITH_DEATH2_4,
-    S_WRAITH_DEATH2_5,
-    S_WRAITH_DEATH2_6,
-    S_WRAITH_DEATH2_7,
-    S_WRAITH_DEATH2_8,
-    S_WRAITH_ICE,
-    S_WRAITH_ICE2,
-    S_WRTHFX_MOVE1,
-    S_WRTHFX_MOVE2,
-    S_WRTHFX_MOVE3,
-    S_WRTHFX_BOOM1,
-    S_WRTHFX_BOOM2,
-    S_WRTHFX_BOOM3,
-    S_WRTHFX_BOOM4,
-    S_WRTHFX_BOOM5,
-    S_WRTHFX_BOOM6,
-    S_WRTHFX_SIZZLE1,
-    S_WRTHFX_SIZZLE2,
-    S_WRTHFX_SIZZLE3,
-    S_WRTHFX_SIZZLE4,
-    S_WRTHFX_SIZZLE5,
-    S_WRTHFX_SIZZLE6,
-    S_WRTHFX_SIZZLE7,
-    S_WRTHFX_DROP1,
-    S_WRTHFX_DROP2,
-    S_WRTHFX_DROP3,
-    S_WRTHFX_DEAD1,
-    S_WRTHFX_ADROP1,
-    S_WRTHFX_ADROP2,
-    S_WRTHFX_ADROP3,
-    S_WRTHFX_ADROP4,
-    S_WRTHFX_ADEAD1,
-    S_WRTHFX_BDROP1,
-    S_WRTHFX_BDROP2,
-    S_WRTHFX_BDROP3,
-    S_WRTHFX_BDEAD1,
-    S_MNTR_SPAWN1,
-    S_MNTR_SPAWN2,
-    S_MNTR_SPAWN3,
-    S_MNTR_LOOK1,
-    S_MNTR_LOOK2,
-    S_MNTR_WALK1,
-    S_MNTR_WALK2,
-    S_MNTR_WALK3,
-    S_MNTR_WALK4,
-    S_MNTR_ROAM1,
-    S_MNTR_ROAM2,
-    S_MNTR_ROAM3,
-    S_MNTR_ROAM4,
-    S_MNTR_ATK1_1,
-    S_MNTR_ATK1_2,
-    S_MNTR_ATK1_3,
-    S_MNTR_ATK2_1,
-    S_MNTR_ATK2_2,
-    S_MNTR_ATK2_3,
-    S_MNTR_ATK3_1,
-    S_MNTR_ATK3_2,
-    S_MNTR_ATK3_3,
-    S_MNTR_ATK3_4,
-    S_MNTR_ATK4_1,
-    S_MNTR_PAIN1,
-    S_MNTR_PAIN2,
-    S_MNTR_DIE1,
-    S_MNTR_DIE2,
-    S_MNTR_DIE3,
-    S_MNTR_DIE4,
-    S_MNTR_DIE5,
-    S_MNTR_DIE6,
-    S_MNTR_DIE7,
-    S_MNTR_DIE8,
-    S_MNTR_DIE9,
-    S_MNTRFX1_1,
-    S_MNTRFX1_2,
-    S_MNTRFXI1_1,
-    S_MNTRFXI1_2,
-    S_MNTRFXI1_3,
-    S_MNTRFXI1_4,
-    S_MNTRFXI1_5,
-    S_MNTRFXI1_6,
-    S_MNTRFX2_1,
-    S_MNTRFXI2_1,
-    S_MNTRFXI2_2,
-    S_MNTRFXI2_3,
-    S_MNTRFXI2_4,
-    S_MNTRFXI2_5,
-    S_MNTRFX3_1,
-    S_MNTRFX3_2,
-    S_MNTRFX3_3,
-    S_MNTRFX3_4,
-    S_MNTRFX3_5,
-    S_MNTRFX3_6,
-    S_MNTRFX3_7,
-    S_MNTRFX3_8,
-    S_MNTRFX3_9,
-    S_MINOSMOKE1,
-    S_MINOSMOKE2,
-    S_MINOSMOKE3,
-    S_MINOSMOKE4,
-    S_MINOSMOKE5,
-    S_MINOSMOKE6,
-    S_MINOSMOKE7,
-    S_MINOSMOKE8,
-    S_MINOSMOKE9,
-    S_MINOSMOKE0,
-    S_MINOSMOKEA,
-    S_MINOSMOKEB,
-    S_MINOSMOKEC,
-    S_MINOSMOKED,
-    S_MINOSMOKEE,
-    S_MINOSMOKEF,
-    S_MINOSMOKEG,
-    S_MINOSMOKEX1,
-    S_MINOSMOKEX2,
-    S_MINOSMOKEX3,
-    S_MINOSMOKEX4,
-    S_MINOSMOKEX5,
-    S_MINOSMOKEX6,
-    S_MINOSMOKEX7,
-    S_MINOSMOKEX8,
-    S_MINOSMOKEX9,
-    S_MINOSMOKEX0,
-    S_MINOSMOKEXA,
-    S_MINOSMOKEXB,
-    S_MINOSMOKEXC,
-    S_MINOSMOKEXD,
-    S_MINOSMOKEXE,
-    S_MINOSMOKEXF,
-    S_MINOSMOKEXG,
-    S_MINOSMOKEXH,
-    S_MINOSMOKEXI,
-    S_SERPENT_LOOK1,
-    S_SERPENT_SWIM1,
-    S_SERPENT_SWIM2,
-    S_SERPENT_SWIM3,
-    S_SERPENT_HUMP1,
-    S_SERPENT_HUMP2,
-    S_SERPENT_HUMP3,
-    S_SERPENT_HUMP4,
-    S_SERPENT_HUMP5,
-    S_SERPENT_HUMP6,
-    S_SERPENT_HUMP7,
-    S_SERPENT_HUMP8,
-    S_SERPENT_HUMP9,
-    S_SERPENT_HUMP10,
-    S_SERPENT_HUMP11,
-    S_SERPENT_HUMP12,
-    S_SERPENT_HUMP13,
-    S_SERPENT_HUMP14,
-    S_SERPENT_HUMP15,
-    S_SERPENT_SURFACE1,
-    S_SERPENT_SURFACE2,
-    S_SERPENT_SURFACE3,
-    S_SERPENT_SURFACE4,
-    S_SERPENT_SURFACE5,
-    S_SERPENT_DIVE1,
-    S_SERPENT_DIVE2,
-    S_SERPENT_DIVE3,
-    S_SERPENT_DIVE4,
-    S_SERPENT_DIVE5,
-    S_SERPENT_DIVE6,
-    S_SERPENT_DIVE7,
-    S_SERPENT_DIVE8,
-    S_SERPENT_DIVE9,
-    S_SERPENT_DIVE10,
-    S_SERPENT_WALK1,
-    S_SERPENT_WALK2,
-    S_SERPENT_WALK3,
-    S_SERPENT_WALK4,
-    S_SERPENT_PAIN1,
-    S_SERPENT_PAIN2,
-    S_SERPENT_ATK1,
-    S_SERPENT_ATK2,
-    S_SERPENT_MELEE1,
-    S_SERPENT_MISSILE1,
-    S_SERPENT_DIE1,
-    S_SERPENT_DIE2,
-    S_SERPENT_DIE3,
-    S_SERPENT_DIE4,
-    S_SERPENT_DIE5,
-    S_SERPENT_DIE6,
-    S_SERPENT_DIE7,
-    S_SERPENT_DIE8,
-    S_SERPENT_DIE9,
-    S_SERPENT_DIE10,
-    S_SERPENT_DIE11,
-    S_SERPENT_DIE12,
-    S_SERPENT_XDIE1,
-    S_SERPENT_XDIE2,
-    S_SERPENT_XDIE3,
-    S_SERPENT_XDIE4,
-    S_SERPENT_XDIE5,
-    S_SERPENT_XDIE6,
-    S_SERPENT_XDIE7,
-    S_SERPENT_XDIE8,
-    S_SERPENT_ICE,
-    S_SERPENT_ICE2,
-    S_SERPENT_FX1,
-    S_SERPENT_FX2,
-    S_SERPENT_FX3,
-    S_SERPENT_FX4,
-    S_SERPENT_FX_X1,
-    S_SERPENT_FX_X2,
-    S_SERPENT_FX_X3,
-    S_SERPENT_FX_X4,
-    S_SERPENT_FX_X5,
-    S_SERPENT_FX_X6,
-    S_SERPENT_HEAD1,
-    S_SERPENT_HEAD2,
-    S_SERPENT_HEAD3,
-    S_SERPENT_HEAD4,
-    S_SERPENT_HEAD5,
-    S_SERPENT_HEAD6,
-    S_SERPENT_HEAD7,
-    S_SERPENT_HEAD8,
-    S_SERPENT_HEAD_X1,
-    S_SERPENT_GIB1_1,
-    S_SERPENT_GIB1_2,
-    S_SERPENT_GIB1_3,
-    S_SERPENT_GIB1_4,
-    S_SERPENT_GIB1_5,
-    S_SERPENT_GIB1_6,
-    S_SERPENT_GIB1_7,
-    S_SERPENT_GIB1_8,
-    S_SERPENT_GIB1_9,
-    S_SERPENT_GIB1_10,
-    S_SERPENT_GIB1_11,
-    S_SERPENT_GIB1_12,
-    S_SERPENT_GIB2_1,
-    S_SERPENT_GIB2_2,
-    S_SERPENT_GIB2_3,
-    S_SERPENT_GIB2_4,
-    S_SERPENT_GIB2_5,
-    S_SERPENT_GIB2_6,
-    S_SERPENT_GIB2_7,
-    S_SERPENT_GIB2_8,
-    S_SERPENT_GIB2_9,
-    S_SERPENT_GIB2_10,
-    S_SERPENT_GIB2_11,
-    S_SERPENT_GIB2_12,
-    S_SERPENT_GIB3_1,
-    S_SERPENT_GIB3_2,
-    S_SERPENT_GIB3_3,
-    S_SERPENT_GIB3_4,
-    S_SERPENT_GIB3_5,
-    S_SERPENT_GIB3_6,
-    S_SERPENT_GIB3_7,
-    S_SERPENT_GIB3_8,
-    S_SERPENT_GIB3_9,
-    S_SERPENT_GIB3_10,
-    S_SERPENT_GIB3_11,
-    S_SERPENT_GIB3_12,
-    S_BISHOP_LOOK1,
-    S_BISHOP_DECIDE,
-    S_BISHOP_BLUR1,
-    S_BISHOP_BLUR2,
-    S_BISHOP_WALK1,
-    S_BISHOP_WALK2,
-    S_BISHOP_WALK3,
-    S_BISHOP_WALK4,
-    S_BISHOP_WALK5,
-    S_BISHOP_WALK6,
-    S_BISHOP_ATK1,
-    S_BISHOP_ATK2,
-    S_BISHOP_ATK3,
-    S_BISHOP_ATK4,
-    S_BISHOP_ATK5,
-    S_BISHOP_PAIN1,
-    S_BISHOP_PAIN2,
-    S_BISHOP_PAIN3,
-    S_BISHOP_PAIN4,
-    S_BISHOP_PAIN5,
-    S_BISHOP_DEATH1,
-    S_BISHOP_DEATH2,
-    S_BISHOP_DEATH3,
-    S_BISHOP_DEATH4,
-    S_BISHOP_DEATH5,
-    S_BISHOP_DEATH6,
-    S_BISHOP_DEATH7,
-    S_BISHOP_DEATH8,
-    S_BISHOP_DEATH9,
-    S_BISHOP_DEATH10,
-    S_BISHOP_ICE,
-    S_BISHOP_ICE2,
-    S_BISHOP_PUFF1,
-    S_BISHOP_PUFF2,
-    S_BISHOP_PUFF3,
-    S_BISHOP_PUFF4,
-    S_BISHOP_PUFF5,
-    S_BISHOP_PUFF6,
-    S_BISHOP_PUFF7,
-    S_BISHOPBLUR1,
-    S_BISHOPBLUR2,
-    S_BISHOPPAINBLUR1,
-    S_BISHFX1_1,
-    S_BISHFX1_2,
-    S_BISHFX1_3,
-    S_BISHFX1_4,
-    S_BISHFX1_5,
-    S_BISHFXI1_1,
-    S_BISHFXI1_2,
-    S_BISHFXI1_3,
-    S_BISHFXI1_4,
-    S_BISHFXI1_5,
-    S_BISHFXI1_6,
-    S_DRAGON_LOOK1,
-    S_DRAGON_INIT,
-    S_DRAGON_INIT2,
-    S_DRAGON_INIT3,
-    S_DRAGON_WALK1,
-    S_DRAGON_WALK2,
-    S_DRAGON_WALK3,
-    S_DRAGON_WALK4,
-    S_DRAGON_WALK5,
-    S_DRAGON_WALK6,
-    S_DRAGON_WALK7,
-    S_DRAGON_WALK8,
-    S_DRAGON_WALK9,
-    S_DRAGON_WALK10,
-    S_DRAGON_WALK11,
-    S_DRAGON_WALK12,
-    S_DRAGON_ATK1,
-    S_DRAGON_PAIN1,
-    S_DRAGON_DEATH1,
-    S_DRAGON_DEATH2,
-    S_DRAGON_DEATH3,
-    S_DRAGON_DEATH4,
-    S_DRAGON_CRASH1,
-    S_DRAGON_CRASH2,
-    S_DRAGON_CRASH3,
-    S_DRAGON_FX1_1,
-    S_DRAGON_FX1_2,
-    S_DRAGON_FX1_3,
-    S_DRAGON_FX1_4,
-    S_DRAGON_FX1_5,
-    S_DRAGON_FX1_6,
-    S_DRAGON_FX1_X1,
-    S_DRAGON_FX1_X2,
-    S_DRAGON_FX1_X3,
-    S_DRAGON_FX1_X4,
-    S_DRAGON_FX1_X5,
-    S_DRAGON_FX1_X6,
-    S_DRAGON_FX2_1,
-    S_DRAGON_FX2_2,
-    S_DRAGON_FX2_3,
-    S_DRAGON_FX2_4,
-    S_DRAGON_FX2_5,
-    S_DRAGON_FX2_6,
-    S_DRAGON_FX2_7,
-    S_DRAGON_FX2_8,
-    S_DRAGON_FX2_9,
-    S_DRAGON_FX2_10,
-    S_DRAGON_FX2_11,
-    S_ARMOR_1,
-    S_ARMOR_2,
-    S_ARMOR_3,
-    S_ARMOR_4,
-    S_MANA1_1,
-    S_MANA1_2,
-    S_MANA1_3,
-    S_MANA1_4,
-    S_MANA1_5,
-    S_MANA1_6,
-    S_MANA1_7,
-    S_MANA1_8,
-    S_MANA1_9,
-    S_MANA2_1,
-    S_MANA2_2,
-    S_MANA2_3,
-    S_MANA2_4,
-    S_MANA2_5,
-    S_MANA2_6,
-    S_MANA2_7,
-    S_MANA2_8,
-    S_MANA2_9,
-    S_MANA2_10,
-    S_MANA2_11,
-    S_MANA2_12,
-    S_MANA2_13,
-    S_MANA2_14,
-    S_MANA2_15,
-    S_MANA2_16,
-    S_MANA3_1,
-    S_MANA3_2,
-    S_MANA3_3,
-    S_MANA3_4,
-    S_MANA3_5,
-    S_MANA3_6,
-    S_MANA3_7,
-    S_MANA3_8,
-    S_MANA3_9,
-    S_MANA3_10,
-    S_MANA3_11,
-    S_MANA3_12,
-    S_MANA3_13,
-    S_MANA3_14,
-    S_MANA3_15,
-    S_MANA3_16,
-    S_KEY1,
-    S_KEY2,
-    S_KEY3,
-    S_KEY4,
-    S_KEY5,
-    S_KEY6,
-    S_KEY7,
-    S_KEY8,
-    S_KEY9,
-    S_KEYA,
-    S_KEYB,
-    S_SND_WIND1,
-    S_SND_WIND2,
-    S_SND_WATERFALL,
-    S_ETTIN_LOOK1,
-    S_ETTIN_LOOK2,
-    S_ETTIN_CHASE1,
-    S_ETTIN_CHASE2,
-    S_ETTIN_CHASE3,
-    S_ETTIN_CHASE4,
-    S_ETTIN_PAIN1,
-    S_ETTIN_ATK1_1,
-    S_ETTIN_ATK1_2,
-    S_ETTIN_ATK1_3,
-    S_ETTIN_DEATH1_1,
-    S_ETTIN_DEATH1_2,
-    S_ETTIN_DEATH1_3,
-    S_ETTIN_DEATH1_4,
-    S_ETTIN_DEATH1_5,
-    S_ETTIN_DEATH1_6,
-    S_ETTIN_DEATH1_7,
-    S_ETTIN_DEATH1_8,
-    S_ETTIN_DEATH1_9,
-    S_ETTIN_DEATH2_1,
-    S_ETTIN_DEATH2_2,
-    S_ETTIN_DEATH2_3,
-    S_ETTIN_DEATH2_4,
-    S_ETTIN_DEATH2_5,
-    S_ETTIN_DEATH2_6,
-    S_ETTIN_DEATH2_7,
-    S_ETTIN_DEATH2_8,
-    S_ETTIN_DEATH2_9,
-    S_ETTIN_DEATH2_0,
-    S_ETTIN_DEATH2_A,
-    S_ETTIN_DEATH2_B,
-    S_ETTIN_ICE1,
-    S_ETTIN_ICE2,
-    S_ETTIN_MACE1,
-    S_ETTIN_MACE2,
-    S_ETTIN_MACE3,
-    S_ETTIN_MACE4,
-    S_ETTIN_MACE5,
-    S_ETTIN_MACE6,
-    S_ETTIN_MACE7,
-    S_FIRED_SPAWN1,
-    S_FIRED_LOOK1,
-    S_FIRED_LOOK2,
-    S_FIRED_LOOK3,
-    S_FIRED_LOOK4,
-    S_FIRED_LOOK5,
-    S_FIRED_LOOK6,
-    S_FIRED_LOOK7,
-    S_FIRED_LOOK8,
-    S_FIRED_LOOK9,
-    S_FIRED_LOOK0,
-    S_FIRED_LOOKA,
-    S_FIRED_LOOKB,
-    S_FIRED_WALK1,
-    S_FIRED_WALK2,
-    S_FIRED_WALK3,
-    S_FIRED_PAIN1,
-    S_FIRED_ATTACK1,
-    S_FIRED_ATTACK2,
-    S_FIRED_ATTACK3,
-    S_FIRED_ATTACK4,
-    S_FIRED_DEATH1,
-    S_FIRED_DEATH2,
-    S_FIRED_DEATH3,
-    S_FIRED_DEATH4,
-    S_FIRED_XDEATH1,
-    S_FIRED_XDEATH2,
-    S_FIRED_XDEATH3,
-    S_FIRED_ICE1,
-    S_FIRED_ICE2,
-    S_FIRED_CORPSE1,
-    S_FIRED_CORPSE2,
-    S_FIRED_CORPSE3,
-    S_FIRED_CORPSE4,
-    S_FIRED_CORPSE5,
-    S_FIRED_CORPSE6,
-    S_FIRED_RDROP1,
-    S_FIRED_RDEAD1_1,
-    S_FIRED_RDEAD1_2,
-    S_FIRED_RDROP2,
-    S_FIRED_RDEAD2_1,
-    S_FIRED_RDEAD2_2,
-    S_FIRED_RDROP3,
-    S_FIRED_RDEAD3_1,
-    S_FIRED_RDEAD3_2,
-    S_FIRED_RDROP4,
-    S_FIRED_RDEAD4_1,
-    S_FIRED_RDEAD4_2,
-    S_FIRED_RDROP5,
-    S_FIRED_RDEAD5_1,
-    S_FIRED_RDEAD5_2,
-    S_FIRED_FX6_1,
-    S_FIRED_FX6_2,
-    S_FIRED_FX6_3,
-    S_FIRED_FX6_4,
-    S_FIRED_FX6_5,
-    S_ICEGUY_LOOK,
-    S_ICEGUY_DORMANT,
-    S_ICEGUY_WALK1,
-    S_ICEGUY_WALK2,
-    S_ICEGUY_WALK3,
-    S_ICEGUY_WALK4,
-    S_ICEGUY_ATK1,
-    S_ICEGUY_ATK2,
-    S_ICEGUY_ATK3,
-    S_ICEGUY_ATK4,
-    S_ICEGUY_PAIN1,
-    S_ICEGUY_DEATH,
-    S_ICEGUY_FX1,
-    S_ICEGUY_FX2,
-    S_ICEGUY_FX3,
-    S_ICEGUY_FX_X1,
-    S_ICEGUY_FX_X2,
-    S_ICEGUY_FX_X3,
-    S_ICEGUY_FX_X4,
-    S_ICEGUY_FX_X5,
-    S_ICEFX_PUFF1,
-    S_ICEFX_PUFF2,
-    S_ICEFX_PUFF3,
-    S_ICEFX_PUFF4,
-    S_ICEFX_PUFF5,
-    S_ICEGUY_FX2_1,
-    S_ICEGUY_FX2_2,
-    S_ICEGUY_FX2_3,
-    S_ICEGUY_BIT1,
-    S_ICEGUY_BIT2,
-    S_ICEGUY_WISP1_1,
-    S_ICEGUY_WISP1_2,
-    S_ICEGUY_WISP1_3,
-    S_ICEGUY_WISP1_4,
-    S_ICEGUY_WISP1_5,
-    S_ICEGUY_WISP1_6,
-    S_ICEGUY_WISP1_7,
-    S_ICEGUY_WISP1_8,
-    S_ICEGUY_WISP1_9,
-    S_ICEGUY_WISP2_1,
-    S_ICEGUY_WISP2_2,
-    S_ICEGUY_WISP2_3,
-    S_ICEGUY_WISP2_4,
-    S_ICEGUY_WISP2_5,
-    S_ICEGUY_WISP2_6,
-    S_ICEGUY_WISP2_7,
-    S_ICEGUY_WISP2_8,
-    S_ICEGUY_WISP2_9,
-    S_FIGHTER,
-    S_FIGHTER2,
-    S_FIGHTERLOOK,
-    S_FIGHTER_RUN1,
-    S_FIGHTER_RUN2,
-    S_FIGHTER_RUN3,
-    S_FIGHTER_RUN4,
-    S_FIGHTER_ATK1,
-    S_FIGHTER_ATK2,
-    S_FIGHTER_PAIN,
-    S_FIGHTER_PAIN2,
-    S_FIGHTER_DIE1,
-    S_FIGHTER_DIE2,
-    S_FIGHTER_DIE3,
-    S_FIGHTER_DIE4,
-    S_FIGHTER_DIE5,
-    S_FIGHTER_DIE6,
-    S_FIGHTER_DIE7,
-    S_FIGHTER_XDIE1,
-    S_FIGHTER_XDIE2,
-    S_FIGHTER_XDIE3,
-    S_FIGHTER_XDIE4,
-    S_FIGHTER_XDIE5,
-    S_FIGHTER_XDIE6,
-    S_FIGHTER_XDIE7,
-    S_FIGHTER_XDIE8,
-    S_FIGHTER_ICE,
-    S_FIGHTER_ICE2,
-    S_CLERIC,
-    S_CLERIC2,
-    S_CLERICLOOK,
-    S_CLERIC_RUN1,
-    S_CLERIC_RUN2,
-    S_CLERIC_RUN3,
-    S_CLERIC_RUN4,
-    S_CLERIC_ATK1,
-    S_CLERIC_ATK2,
-    S_CLERIC_ATK3,
-    S_CLERIC_PAIN,
-    S_CLERIC_PAIN2,
-    S_CLERIC_DIE1,
-    S_CLERIC_DIE2,
-    S_CLERIC_DIE3,
-    S_CLERIC_DIE4,
-    S_CLERIC_DIE5,
-    S_CLERIC_DIE6,
-    S_CLERIC_DIE7,
-    S_CLERIC_DIE8,
-    S_CLERIC_DIE9,
-    S_CLERIC_XDIE1,
-    S_CLERIC_XDIE2,
-    S_CLERIC_XDIE3,
-    S_CLERIC_XDIE4,
-    S_CLERIC_XDIE5,
-    S_CLERIC_XDIE6,
-    S_CLERIC_XDIE7,
-    S_CLERIC_XDIE8,
-    S_CLERIC_XDIE9,
-    S_CLERIC_XDIE10,
-    S_CLERIC_ICE,
-    S_CLERIC_ICE2,
-    S_MAGE,
-    S_MAGE2,
-    S_MAGELOOK,
-    S_MAGE_RUN1,
-    S_MAGE_RUN2,
-    S_MAGE_RUN3,
-    S_MAGE_RUN4,
-    S_MAGE_ATK1,
-    S_MAGE_ATK2,
-    S_MAGE_PAIN,
-    S_MAGE_PAIN2,
-    S_MAGE_DIE1,
-    S_MAGE_DIE2,
-    S_MAGE_DIE3,
-    S_MAGE_DIE4,
-    S_MAGE_DIE5,
-    S_MAGE_DIE6,
-    S_MAGE_DIE7,
-    S_MAGE_XDIE1,
-    S_MAGE_XDIE2,
-    S_MAGE_XDIE3,
-    S_MAGE_XDIE4,
-    S_MAGE_XDIE5,
-    S_MAGE_XDIE6,
-    S_MAGE_XDIE7,
-    S_MAGE_XDIE8,
-    S_MAGE_XDIE9,
-    S_MAGE_ICE,
-    S_MAGE_ICE2,
-    S_SORC_SPAWN1,
-    S_SORC_SPAWN2,
-    S_SORC_LOOK1,
-    S_SORC_WALK1,
-    S_SORC_WALK2,
-    S_SORC_WALK3,
-    S_SORC_WALK4,
-    S_SORC_PAIN1,
-    S_SORC_PAIN2,
-    S_SORC_ATK2_1,
-    S_SORC_ATK2_2,
-    S_SORC_ATK2_3,
-    S_SORC_ATTACK1,
-    S_SORC_ATTACK2,
-    S_SORC_ATTACK3,
-    S_SORC_ATTACK4,
-    S_SORC_ATTACK5,
-    S_SORC_DIE1,
-    S_SORC_DIE2,
-    S_SORC_DIE3,
-    S_SORC_DIE4,
-    S_SORC_DIE5,
-    S_SORC_DIE6,
-    S_SORC_DIE7,
-    S_SORC_DIE8,
-    S_SORC_DIE9,
-    S_SORC_DIE0,
-    S_SORC_DIEA,
-    S_SORC_DIEB,
-    S_SORC_DIEC,
-    S_SORC_DIED,
-    S_SORC_DIEE,
-    S_SORC_DIEF,
-    S_SORC_DIEG,
-    S_SORC_DIEH,
-    S_SORC_DIEI,
-    S_SORCBALL1_1,
-    S_SORCBALL1_2,
-    S_SORCBALL1_3,
-    S_SORCBALL1_4,
-    S_SORCBALL1_5,
-    S_SORCBALL1_6,
-    S_SORCBALL1_7,
-    S_SORCBALL1_8,
-    S_SORCBALL1_9,
-    S_SORCBALL1_0,
-    S_SORCBALL1_A,
-    S_SORCBALL1_B,
-    S_SORCBALL1_C,
-    S_SORCBALL1_D,
-    S_SORCBALL1_E,
-    S_SORCBALL1_F,
-    S_SORCBALL1_D1,
-    S_SORCBALL1_D2,
-    S_SORCBALL1_D5,
-    S_SORCBALL1_D6,
-    S_SORCBALL1_D7,
-    S_SORCBALL1_D8,
-    S_SORCBALL1_D9,
-    S_SORCBALL2_1,
-    S_SORCBALL2_2,
-    S_SORCBALL2_3,
-    S_SORCBALL2_4,
-    S_SORCBALL2_5,
-    S_SORCBALL2_6,
-    S_SORCBALL2_7,
-    S_SORCBALL2_8,
-    S_SORCBALL2_9,
-    S_SORCBALL2_0,
-    S_SORCBALL2_A,
-    S_SORCBALL2_B,
-    S_SORCBALL2_C,
-    S_SORCBALL2_D,
-    S_SORCBALL2_E,
-    S_SORCBALL2_F,
-    S_SORCBALL2_D1,
-    S_SORCBALL2_D2,
-    S_SORCBALL2_D5,
-    S_SORCBALL2_D6,
-    S_SORCBALL2_D7,
-    S_SORCBALL2_D8,
-    S_SORCBALL2_D9,
-    S_SORCBALL3_1,
-    S_SORCBALL3_2,
-    S_SORCBALL3_3,
-    S_SORCBALL3_4,
-    S_SORCBALL3_5,
-    S_SORCBALL3_6,
-    S_SORCBALL3_7,
-    S_SORCBALL3_8,
-    S_SORCBALL3_9,
-    S_SORCBALL3_0,
-    S_SORCBALL3_A,
-    S_SORCBALL3_B,
-    S_SORCBALL3_C,
-    S_SORCBALL3_D,
-    S_SORCBALL3_E,
-    S_SORCBALL3_F,
-    S_SORCBALL3_D1,
-    S_SORCBALL3_D2,
-    S_SORCBALL3_D5,
-    S_SORCBALL3_D6,
-    S_SORCBALL3_D7,
-    S_SORCBALL3_D8,
-    S_SORCBALL3_D9,
-    S_SORCFX1_1,
-    S_SORCFX1_2,
-    S_SORCFX1_3,
-    S_SORCFX1_4,
-    S_SORCFX1_D1,
-    S_SORCFX1_D2,
-    S_SORCFX1_D3,
-    S_SORCFX2_SPLIT1,
-    S_SORCFX2_ORBIT1,
-    S_SORCFX2_ORBIT2,
-    S_SORCFX2_ORBIT3,
-    S_SORCFX2_ORBIT4,
-    S_SORCFX2_ORBIT5,
-    S_SORCFX2_ORBIT6,
-    S_SORCFX2_ORBIT7,
-    S_SORCFX2_ORBIT8,
-    S_SORCFX2_ORBIT9,
-    S_SORCFX2_ORBIT0,
-    S_SORCFX2_ORBITA,
-    S_SORCFX2_ORBITB,
-    S_SORCFX2_ORBITC,
-    S_SORCFX2_ORBITD,
-    S_SORCFX2_ORBITE,
-    S_SORCFX2_ORBITF,
-    S_SORCFX2T1,
-    S_SORCFX3_1,
-    S_SORCFX3_2,
-    S_SORCFX3_3,
-    S_BISHMORPH1,
-    S_BISHMORPHA,
-    S_BISHMORPHB,
-    S_BISHMORPHC,
-    S_BISHMORPHD,
-    S_BISHMORPHE,
-    S_BISHMORPHF,
-    S_BISHMORPHG,
-    S_BISHMORPHH,
-    S_BISHMORPHI,
-    S_BISHMORPHJ,
-    S_SORCFX3_EXP1,
-    S_SORCFX3_EXP2,
-    S_SORCFX3_EXP3,
-    S_SORCFX3_EXP4,
-    S_SORCFX3_EXP5,
-    S_SORCFX4_1,
-    S_SORCFX4_2,
-    S_SORCFX4_3,
-    S_SORCFX4_D1,
-    S_SORCFX4_D2,
-    S_SORCFX4_D3,
-    S_SORCFX4_D4,
-    S_SORCFX4_D5,
-    S_SORCSPARK1,
-    S_SORCSPARK2,
-    S_SORCSPARK3,
-    S_SORCSPARK4,
-    S_SORCSPARK5,
-    S_SORCSPARK6,
-    S_SORCSPARK7,
-    S_BLASTEFFECT1,
-    S_BLASTEFFECT2,
-    S_BLASTEFFECT3,
-    S_BLASTEFFECT4,
-    S_BLASTEFFECT5,
-    S_BLASTEFFECT6,
-    S_BLASTEFFECT7,
-    S_BLASTEFFECT8,
-    S_BLASTEFFECT9,
-    S_WATERDRIP1,
-    S_KORAX_LOOK1,
-    S_KORAX_CHASE1,
-    S_KORAX_CHASE2,
-    S_KORAX_CHASE3,
-    S_KORAX_CHASE4,
-    S_KORAX_CHASE5,
-    S_KORAX_CHASE6,
-    S_KORAX_CHASE7,
-    S_KORAX_CHASE8,
-    S_KORAX_CHASE9,
-    S_KORAX_CHASE0,
-    S_KORAX_CHASEA,
-    S_KORAX_CHASEB,
-    S_KORAX_CHASEC,
-    S_KORAX_CHASED,
-    S_KORAX_CHASEE,
-    S_KORAX_CHASEF,
-    S_KORAX_PAIN1,
-    S_KORAX_PAIN2,
-    S_KORAX_ATTACK1,
-    S_KORAX_ATTACK2,
-    S_KORAX_MISSILE1,
-    S_KORAX_MISSILE2,
-    S_KORAX_MISSILE3,
-    S_KORAX_COMMAND1,
-    S_KORAX_COMMAND2,
-    S_KORAX_COMMAND3,
-    S_KORAX_COMMAND4,
-    S_KORAX_COMMAND5,
-    S_KORAX_DEATH1,
-    S_KORAX_DEATH2,
-    S_KORAX_DEATH3,
-    S_KORAX_DEATH4,
-    S_KORAX_DEATH5,
-    S_KORAX_DEATH6,
-    S_KORAX_DEATH7,
-    S_KORAX_DEATH8,
-    S_KORAX_DEATH9,
-    S_KORAX_DEATH0,
-    S_KORAX_DEATHA,
-    S_KORAX_DEATHB,
-    S_KORAX_DEATHC,
-    S_KORAX_DEATHD,
-    S_KSPIRIT_ROAM1,
-    S_KSPIRIT_ROAM2,
-    S_KSPIRIT_DEATH1,
-    S_KSPIRIT_DEATH2,
-    S_KSPIRIT_DEATH3,
-    S_KSPIRIT_DEATH4,
-    S_KSPIRIT_DEATH5,
-    S_KSPIRIT_DEATH6,
-    S_KBOLT1,
-    S_KBOLT2,
-    S_KBOLT3,
-    S_KBOLT4,
-    S_KBOLT5,
-    S_KBOLT6,
-    S_KBOLT7,
-    S_SPAWNBATS1,
-    S_SPAWNBATS2,
-    S_SPAWNBATS3,
-    S_SPAWNBATS_OFF,
-    S_BAT1,
-    S_BAT2,
-    S_BAT3,
-    S_BAT_DEATH,
-    NUMSTATES
-} statenum_t;
-
-
-struct mobj_s;
-struct player_s;
-struct pspdef_s;
-
-
-typedef struct
-{
-    spritenum_t sprite;
-    int frame;
-    int tics;
-    void (*action) (struct mobj_s *, struct player_s *, struct pspdef_s *);
-    statenum_t nextstate;
-    int misc1, misc2;
-} state_t;
-
-extern state_t states[NUMSTATES];
-extern const char *sprnames[];
-
-
-
-typedef enum
-{
-    MT_MAPSPOT,
-    MT_MAPSPOTGRAVITY,
-    MT_FIREBALL1,
-    MT_ARROW,
-    MT_DART,
-    MT_POISONDART,
-    MT_RIPPERBALL,
-    MT_PROJECTILE_BLADE,
-    MT_ICESHARD,
-    MT_FLAME_SMALL_TEMP,
-    MT_FLAME_LARGE_TEMP,
-    MT_FLAME_SMALL,
-    MT_FLAME_LARGE,
-    MT_HEALINGBOTTLE,
-    MT_HEALTHFLASK,
-    MT_ARTIFLY,
-    MT_ARTIINVULNERABILITY,
-    MT_SUMMONMAULATOR,
-    MT_SUMMON_FX,
-    MT_THRUSTFLOOR_UP,
-    MT_THRUSTFLOOR_DOWN,
-    MT_TELEPORTOTHER,
-    MT_TELOTHER_FX1,
-    MT_TELOTHER_FX2,
-    MT_TELOTHER_FX3,
-    MT_TELOTHER_FX4,
-    MT_TELOTHER_FX5,
-    MT_DIRT1,
-    MT_DIRT2,
-    MT_DIRT3,
-    MT_DIRT4,
-    MT_DIRT5,
-    MT_DIRT6,
-    MT_DIRTCLUMP,
-    MT_ROCK1,
-    MT_ROCK2,
-    MT_ROCK3,
-    MT_FOGSPAWNER,
-    MT_FOGPATCHS,
-    MT_FOGPATCHM,
-    MT_FOGPATCHL,
-    MT_QUAKE_FOCUS,
-    MT_SGSHARD1,
-    MT_SGSHARD2,
-    MT_SGSHARD3,
-    MT_SGSHARD4,
-    MT_SGSHARD5,
-    MT_SGSHARD6,
-    MT_SGSHARD7,
-    MT_SGSHARD8,
-    MT_SGSHARD9,
-    MT_SGSHARD0,
-    MT_ARTIEGG,
-    MT_EGGFX,
-    MT_ARTISUPERHEAL,
-    MT_ZWINGEDSTATUENOSKULL,
-    MT_ZGEMPEDESTAL,
-    MT_ARTIPUZZSKULL,
-    MT_ARTIPUZZGEMBIG,
-    MT_ARTIPUZZGEMRED,
-    MT_ARTIPUZZGEMGREEN1,
-    MT_ARTIPUZZGEMGREEN2,
-    MT_ARTIPUZZGEMBLUE1,
-    MT_ARTIPUZZGEMBLUE2,
-    MT_ARTIPUZZBOOK1,
-    MT_ARTIPUZZBOOK2,
-    MT_ARTIPUZZSKULL2,
-    MT_ARTIPUZZFWEAPON,
-    MT_ARTIPUZZCWEAPON,
-    MT_ARTIPUZZMWEAPON,
-    MT_ARTIPUZZGEAR,
-    MT_ARTIPUZZGEAR2,
-    MT_ARTIPUZZGEAR3,
-    MT_ARTIPUZZGEAR4,
-    MT_ARTITORCH,
-    MT_FIREBOMB,
-    MT_ARTITELEPORT,
-    MT_ARTIPOISONBAG,
-    MT_POISONBAG,
-    MT_POISONCLOUD,
-    MT_THROWINGBOMB,
-    MT_SPEEDBOOTS,
-    MT_BOOSTMANA,
-    MT_BOOSTARMOR,
-    MT_BLASTRADIUS,
-    MT_HEALRADIUS,
-    MT_SPLASH,
-    MT_SPLASHBASE,
-    MT_LAVASPLASH,
-    MT_LAVASMOKE,
-    MT_SLUDGECHUNK,
-    MT_SLUDGESPLASH,
-    MT_MISC0,
-    MT_MISC1,
-    MT_MISC2,
-    MT_MISC3,
-    MT_MISC4,
-    MT_MISC5,
-    MT_MISC6,
-    MT_MISC7,
-    MT_MISC8,
-    MT_TREEDESTRUCTIBLE,
-    MT_MISC9,
-    MT_MISC10,
-    MT_MISC11,
-    MT_MISC12,
-    MT_MISC13,
-    MT_MISC14,
-    MT_MISC15,
-    MT_MISC16,
-    MT_MISC17,
-    MT_MISC18,
-    MT_MISC19,
-    MT_MISC20,
-    MT_MISC21,
-    MT_MISC22,
-    MT_MISC23,
-    MT_MISC24,
-    MT_MISC25,
-    MT_MISC26,
-    MT_MISC27,
-    MT_MISC28,
-    MT_MISC29,
-    MT_MISC30,
-    MT_MISC31,
-    MT_MISC32,
-    MT_MISC33,
-    MT_MISC34,
-    MT_MISC35,
-    MT_MISC36,
-    MT_MISC37,
-    MT_MISC38,
-    MT_MISC39,
-    MT_MISC40,
-    MT_MISC41,
-    MT_MISC42,
-    MT_MISC43,
-    MT_MISC44,
-    MT_MISC45,
-    MT_MISC46,
-    MT_MISC47,
-    MT_MISC48,
-    MT_MISC49,
-    MT_MISC50,
-    MT_MISC51,
-    MT_MISC52,
-    MT_MISC53,
-    MT_MISC54,
-    MT_MISC55,
-    MT_MISC56,
-    MT_MISC57,
-    MT_MISC58,
-    MT_MISC59,
-    MT_MISC60,
-    MT_MISC61,
-    MT_MISC62,
-    MT_MISC63,
-    MT_MISC64,
-    MT_MISC65,
-    MT_MISC66,
-    MT_MISC67,
-    MT_MISC68,
-    MT_MISC69,
-    MT_MISC70,
-    MT_MISC71,
-    MT_MISC72,
-    MT_MISC73,
-    MT_MISC74,
-    MT_MISC75,
-    MT_MISC76,
-    MT_POTTERY1,
-    MT_POTTERY2,
-    MT_POTTERY3,
-    MT_POTTERYBIT1,
-    MT_MISC77,
-    MT_ZLYNCHED_NOHEART,
-    MT_MISC78,
-    MT_CORPSEBIT,
-    MT_CORPSEBLOODDRIP,
-    MT_BLOODPOOL,
-    MT_MISC79,
-    MT_MISC80,
-    MT_LEAF1,
-    MT_LEAF2,
-    MT_ZTWINEDTORCH,
-    MT_ZTWINEDTORCH_UNLIT,
-    MT_BRIDGE,
-    MT_BRIDGEBALL,
-    MT_ZWALLTORCH,
-    MT_ZWALLTORCH_UNLIT,
-    MT_ZBARREL,
-    MT_ZSHRUB1,
-    MT_ZSHRUB2,
-    MT_ZBUCKET,
-    MT_ZPOISONSHROOM,
-    MT_ZFIREBULL,
-    MT_ZFIREBULL_UNLIT,
-    MT_FIRETHING,
-    MT_BRASSTORCH,
-    MT_ZSUITOFARMOR,
-    MT_ZARMORCHUNK,
-    MT_ZBELL,
-    MT_ZBLUE_CANDLE,
-    MT_ZIRON_MAIDEN,
-    MT_ZXMAS_TREE,
-    MT_ZCAULDRON,
-    MT_ZCAULDRON_UNLIT,
-    MT_ZCHAINBIT32,
-    MT_ZCHAINBIT64,
-    MT_ZCHAINEND_HEART,
-    MT_ZCHAINEND_HOOK1,
-    MT_ZCHAINEND_HOOK2,
-    MT_ZCHAINEND_SPIKE,
-    MT_ZCHAINEND_SKULL,
-    MT_TABLE_SHIT1,
-    MT_TABLE_SHIT2,
-    MT_TABLE_SHIT3,
-    MT_TABLE_SHIT4,
-    MT_TABLE_SHIT5,
-    MT_TABLE_SHIT6,
-    MT_TABLE_SHIT7,
-    MT_TABLE_SHIT8,
-    MT_TABLE_SHIT9,
-    MT_TABLE_SHIT10,
-    MT_TFOG,
-    MT_MISC81,
-    MT_TELEPORTMAN,
-    MT_PUNCHPUFF,
-    MT_FW_AXE,
-    MT_AXEPUFF,
-    MT_AXEPUFF_GLOW,
-    MT_AXEBLOOD,
-    MT_FW_HAMMER,
-    MT_HAMMER_MISSILE,
-    MT_HAMMERPUFF,
-    MT_FSWORD_MISSILE,
-    MT_FSWORD_FLAME,
-    MT_CW_SERPSTAFF,
-    MT_CSTAFF_MISSILE,
-    MT_CSTAFFPUFF,
-    MT_CW_FLAME,
-    MT_CFLAMEFLOOR,
-    MT_FLAMEPUFF,
-    MT_FLAMEPUFF2,
-    MT_CIRCLEFLAME,
-    MT_CFLAME_MISSILE,
-    MT_HOLY_FX,
-    MT_HOLY_TAIL,
-    MT_HOLY_PUFF,
-    MT_HOLY_MISSILE,
-    MT_HOLY_MISSILE_PUFF,
-    MT_MWANDPUFF,
-    MT_MWANDSMOKE,
-    MT_MWAND_MISSILE,
-    MT_MW_LIGHTNING,
-    MT_LIGHTNING_CEILING,
-    MT_LIGHTNING_FLOOR,
-    MT_LIGHTNING_ZAP,
-    MT_MSTAFF_FX,
-    MT_MSTAFF_FX2,
-    MT_FW_SWORD1,
-    MT_FW_SWORD2,
-    MT_FW_SWORD3,
-    MT_CW_HOLY1,
-    MT_CW_HOLY2,
-    MT_CW_HOLY3,
-    MT_MW_STAFF1,
-    MT_MW_STAFF2,
-    MT_MW_STAFF3,
-    MT_SNOUTPUFF,
-    MT_MW_CONE,
-    MT_SHARDFX1,
-    MT_BLOOD,
-    MT_BLOODSPLATTER,
-    MT_GIBS,
-    MT_PLAYER_FIGHTER,
-    MT_BLOODYSKULL,
-    MT_PLAYER_SPEED,
-    MT_ICECHUNK,
-    MT_PLAYER_CLERIC,
-    MT_PLAYER_MAGE,
-    MT_PIGPLAYER,
-    MT_PIG,
-    MT_CENTAUR,
-    MT_CENTAURLEADER,
-    MT_CENTAUR_FX,
-    MT_CENTAUR_SHIELD,
-    MT_CENTAUR_SWORD,
-    MT_DEMON,
-    MT_DEMONCHUNK1,
-    MT_DEMONCHUNK2,
-    MT_DEMONCHUNK3,
-    MT_DEMONCHUNK4,
-    MT_DEMONCHUNK5,
-    MT_DEMONFX1,
-    MT_DEMON2,
-    MT_DEMON2CHUNK1,
-    MT_DEMON2CHUNK2,
-    MT_DEMON2CHUNK3,
-    MT_DEMON2CHUNK4,
-    MT_DEMON2CHUNK5,
-    MT_DEMON2FX1,
-    MT_WRAITHB,
-    MT_WRAITH,
-    MT_WRAITHFX1,
-    MT_WRAITHFX2,
-    MT_WRAITHFX3,
-    MT_WRAITHFX4,
-    MT_WRAITHFX5,
-    MT_MINOTAUR,
-    MT_MNTRFX1,
-    MT_MNTRFX2,
-    MT_MNTRFX3,
-    MT_MNTRSMOKE,
-    MT_MNTRSMOKEEXIT,
-    MT_SERPENT,
-    MT_SERPENTLEADER,
-    MT_SERPENTFX,
-    MT_SERPENT_HEAD,
-    MT_SERPENT_GIB1,
-    MT_SERPENT_GIB2,
-    MT_SERPENT_GIB3,
-    MT_BISHOP,
-    MT_BISHOP_PUFF,
-    MT_BISHOPBLUR,
-    MT_BISHOPPAINBLUR,
-    MT_BISH_FX,
-    MT_DRAGON,
-    MT_DRAGON_FX,
-    MT_DRAGON_FX2,
-    MT_ARMOR_1,
-    MT_ARMOR_2,
-    MT_ARMOR_3,
-    MT_ARMOR_4,
-    MT_MANA1,
-    MT_MANA2,
-    MT_MANA3,
-    MT_KEY1,
-    MT_KEY2,
-    MT_KEY3,
-    MT_KEY4,
-    MT_KEY5,
-    MT_KEY6,
-    MT_KEY7,
-    MT_KEY8,
-    MT_KEY9,
-    MT_KEYA,
-    MT_KEYB,
-    MT_SOUNDWIND,
-    MT_SOUNDWATERFALL,
-    MT_ETTIN,
-    MT_ETTIN_MACE,
-    MT_FIREDEMON,
-    MT_FIREDEMON_SPLOTCH1,
-    MT_FIREDEMON_SPLOTCH2,
-    MT_FIREDEMON_FX1,
-    MT_FIREDEMON_FX2,
-    MT_FIREDEMON_FX3,
-    MT_FIREDEMON_FX4,
-    MT_FIREDEMON_FX5,
-    MT_FIREDEMON_FX6,
-    MT_ICEGUY,
-    MT_ICEGUY_FX,
-    MT_ICEFX_PUFF,
-    MT_ICEGUY_FX2,
-    MT_ICEGUY_BIT,
-    MT_ICEGUY_WISP1,
-    MT_ICEGUY_WISP2,
-    MT_FIGHTER_BOSS,
-    MT_CLERIC_BOSS,
-    MT_MAGE_BOSS,
-    MT_SORCBOSS,
-    MT_SORCBALL1,
-    MT_SORCBALL2,
-    MT_SORCBALL3,
-    MT_SORCFX1,
-    MT_SORCFX2,
-    MT_SORCFX2_T1,
-    MT_SORCFX3,
-    MT_SORCFX3_EXPLOSION,
-    MT_SORCFX4,
-    MT_SORCSPARK1,
-    MT_BLASTEFFECT,
-    MT_WATER_DRIP,
-    MT_KORAX,
-    MT_KORAX_SPIRIT1,
-    MT_KORAX_SPIRIT2,
-    MT_KORAX_SPIRIT3,
-    MT_KORAX_SPIRIT4,
-    MT_KORAX_SPIRIT5,
-    MT_KORAX_SPIRIT6,
-    MT_DEMON_MASH,
-    MT_DEMON2_MASH,
-    MT_ETTIN_MASH,
-    MT_CENTAUR_MASH,
-    MT_KORAX_BOLT,
-    MT_BAT_SPAWNER,
-    MT_BAT,
-    NUMMOBJTYPES
-} mobjtype_t;
-
-typedef struct
-{
-    int doomednum;
-    int spawnstate;
-    int spawnhealth;
-    int seestate;
-    int seesound;
-    int reactiontime;
-    int attacksound;
-    int painstate;
-    int painchance;
-    int painsound;
-    int meleestate;
-    int missilestate;
-    int crashstate;
-    int deathstate;
-    int xdeathstate;
-    int deathsound;
-    int speed;
-    int radius;
-    int height;
-    int mass;
-    int damage;
-    int activesound;
-    int flags;
-    int flags2;
-} mobjinfo_t;
-
-extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
diff --git a/games/NXDoom/src/hexen/m_random.c b/games/NXDoom/src/hexen/m_random.c
deleted file mode 100644
index 422b1a5d4..000000000
--- a/games/NXDoom/src/hexen/m_random.c
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "m_random.h"
-
-// This is the new flat distribution table
-
-static const unsigned char rndtable[256] = {
-    201, 1, 243, 19, 18, 42, 183, 203, 101, 123, 154, 137, 34, 118, 10, 216,
-    135, 246, 0, 107, 133, 229, 35, 113, 177, 211, 110, 17, 139, 84, 251, 235,
-    182, 166, 161, 230, 143, 91, 24, 81, 22, 94, 7, 51, 232, 104, 122, 248,
-    175, 138, 127, 171, 222, 213, 44, 16, 9, 33, 88, 102, 170, 150, 136, 114,
-    62, 3, 142, 237, 6, 252, 249, 56, 74, 30, 13, 21, 180, 199, 32, 132,
-    187, 234, 78, 210, 46, 131, 197, 8, 206, 244, 73, 4, 236, 178, 195, 70,
-    121, 97, 167, 217, 103, 40, 247, 186, 105, 39, 95, 163, 99, 149, 253, 29,
-    119, 83, 254, 26, 202, 65, 130, 155, 60, 64, 184, 106, 221, 93, 164, 196,
-    112, 108, 179, 141, 54, 109, 11, 126, 75, 165, 191, 227, 87, 225, 156, 15,
-    98, 162, 116, 79, 169, 140, 190, 205, 168, 194, 41, 250, 27, 20, 14, 241,
-    50, 214, 72, 192, 220, 233, 67, 148, 96, 185, 176, 181, 215, 207, 172, 85,
-    89, 90, 209, 128, 124, 2, 55, 173, 66, 152, 47, 129, 59, 43, 159, 240,
-    239, 12, 189, 212, 144, 28, 200, 77, 219, 198, 134, 228, 45, 92, 125, 151,
-    5, 53, 255, 52, 68, 245, 160, 158, 61, 86, 58, 82, 117, 37, 242, 145,
-    69, 188, 115, 76, 63, 100, 49, 111, 153, 80, 38, 57, 174, 224, 71, 231,
-    23, 25, 48, 218, 120, 147, 208, 36, 226, 223, 193, 238, 157, 204, 146, 31
-};
-
-
-int rndindex = 0;
-int prndindex = 0;
-
-/*
-===============
-=
-= M_Random
-=
-= Returns a 0-255 number
-=
-===============
-*/
-
-
-int P_Random(void)
-{
-    prndindex = (prndindex + 1) & 0xff;
-    return rndtable[prndindex];
-}
-
-int M_Random(void)
-{
-    rndindex = (rndindex + 1) & 0xff;
-    return rndtable[rndindex];
-}
-
-void M_ClearRandom(void)
-{
-    rndindex = prndindex = 0;
-}
-
-// inspired by the same routine in Eternity, thanks haleyjd
-int P_SubRandom (void)
-{
-    int r = P_Random();
-    return r - P_Random();
-}
diff --git a/games/NXDoom/src/hexen/m_random.h b/games/NXDoom/src/hexen/m_random.h
deleted file mode 100644
index 2de763001..000000000
--- a/games/NXDoom/src/hexen/m_random.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef HEXEN_M_RANDOM_H
-#define HEXEN_M_RANDOM_H
-
-// Most damage defined using HITDICE
-#define HITDICE(a) ((1+(P_Random()&7))*a)
-
-int M_Random(void);
-// returns a number from 0 to 255
-int P_Random(void);
-// as M_Random, but used only by the play simulation
-
-void M_ClearRandom(void);
-// fix randoms for demos
-
-extern int rndindex;
-
-// Defined version of P_Random() - P_Random()
-int P_SubRandom (void);
-
-#endif // HEXEN_M_RANDOM_H
-
diff --git a/games/NXDoom/src/hexen/mn_menu.c b/games/NXDoom/src/hexen/mn_menu.c
deleted file mode 100644
index 57be51c9c..000000000
--- a/games/NXDoom/src/hexen/mn_menu.c
+++ /dev/null
@@ -1,1952 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include <ctype.h>
-#include "h2def.h"
-#include "doomkeys.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_swap.h"
-#include "i_video.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "r_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-#include "am_map.h"
-
-
-// MACROS ------------------------------------------------------------------
-
-#define LEFT_DIR 0
-#define RIGHT_DIR 1
-#define ITEM_HEIGHT 20
-#define SELECTOR_XOFFSET (-28)
-#define SELECTOR_YOFFSET (-1)
-#define SLOTTEXTLEN	16
-#define ASCII_CURSOR '['
-
-// TYPES -------------------------------------------------------------------
-
-typedef enum
-{
-    ITT_EMPTY,
-    ITT_EFUNC,
-    ITT_LRFUNC,
-    ITT_SETMENU,
-    ITT_INERT
-} ItemType_t;
-
-typedef enum
-{
-    MENU_MAIN,
-    MENU_CLASS,
-    MENU_SKILL,
-    MENU_OPTIONS,
-    MENU_OPTIONS2,
-    MENU_FILES,
-    MENU_LOAD,
-    MENU_SAVE,
-    MENU_NONE
-} MenuType_t;
-
-typedef struct
-{
-    ItemType_t type;
-    const char *text;
-    void (*func) (int option);
-    int option;
-    MenuType_t menu;
-} MenuItem_t;
-
-typedef struct
-{
-    int x;
-    int y;
-    void (*drawFunc) (void);
-    int itemCount;
-    MenuItem_t *items;
-    int oldItPos;
-    MenuType_t prevMenu;
-} Menu_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void InitFonts(void);
-static void SetMenu(MenuType_t menu);
-static void SCQuitGame(int option);
-static void SCClass(int option);
-static void SCSkill(int option);
-static void SCMouseSensi(int option);
-static void SCSfxVolume(int option);
-static void SCMusicVolume(int option);
-static void SCScreenSize(int option);
-static boolean SCNetCheck(int option);
-static void SCNetCheck2(int option);
-static void SCLoadGame(int option);
-static void SCSaveGame(int option);
-static void SCMessages(int option);
-static void SCEndGame(int option);
-static void SCInfo(int option);
-static void DrawMainMenu(void);
-static void DrawClassMenu(void);
-static void DrawSkillMenu(void);
-static void DrawOptionsMenu(void);
-static void DrawOptions2Menu(void);
-static void DrawFileSlots(Menu_t * menu);
-static void DrawFilesMenu(void);
-static void MN_DrawInfo(void);
-static void DrawLoadMenu(void);
-static void DrawSaveMenu(void);
-static void DrawSlider(Menu_t * menu, int item, int width, int slot);
-void MN_LoadSlotText(void);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-boolean MenuActive;
-int InfoType;
-int messageson = true;
-boolean mn_SuicideConsole;
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int FontABaseLump;
-static int FontAYellowBaseLump;
-static int FontBBaseLump;
-static int MauloBaseLump;
-static Menu_t *CurrentMenu;
-static int CurrentItPos;
-static int MenuPClass;
-static int MenuTime;
-static boolean soundchanged;
-
-boolean askforquit;
-static int typeofask;
-static boolean FileMenuKeySteal;
-static boolean slottextloaded;
-static boolean joypadsave;
-static char SlotText[6][SLOTTEXTLEN + 2];
-static char oldSlotText[SLOTTEXTLEN + 2];
-static int SlotStatus[6];
-static int slotptr;
-static int currentSlot;
-static int quicksave;
-static int quickload;
-
-static MenuItem_t MainItems[] = {
-    {ITT_SETMENU, "NEW GAME", SCNetCheck2, 1, MENU_CLASS},
-    {ITT_SETMENU, "OPTIONS", NULL, 0, MENU_OPTIONS},
-    {ITT_SETMENU, "GAME FILES", NULL, 0, MENU_FILES},
-    {ITT_EFUNC, "INFO", SCInfo, 0, MENU_NONE},
-    {ITT_EFUNC, "QUIT GAME", SCQuitGame, 0, MENU_NONE}
-};
-
-static Menu_t MainMenu = {
-    110, 56,
-    DrawMainMenu,
-    5, MainItems,
-    0,
-    MENU_NONE
-};
-
-static MenuItem_t ClassItems[] = {
-    {ITT_EFUNC, "FIGHTER", SCClass, 0, MENU_NONE},
-    {ITT_EFUNC, "CLERIC", SCClass, 1, MENU_NONE},
-    {ITT_EFUNC, "MAGE", SCClass, 2, MENU_NONE}
-};
-
-static Menu_t ClassMenu = {
-    66, 66,
-    DrawClassMenu,
-    3, ClassItems,
-    0,
-    MENU_MAIN
-};
-
-static MenuItem_t FilesItems[] = {
-    {ITT_SETMENU, "LOAD GAME", SCNetCheck2, 2, MENU_LOAD},
-    {ITT_SETMENU, "SAVE GAME", NULL, 0, MENU_SAVE}
-};
-
-static Menu_t FilesMenu = {
-    110, 60,
-    DrawFilesMenu,
-    2, FilesItems,
-    0,
-    MENU_MAIN
-};
-
-static MenuItem_t LoadItems[] = {
-    {ITT_EFUNC, NULL, SCLoadGame, 0, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 1, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 2, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 3, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 4, MENU_NONE},
-    {ITT_EFUNC, NULL, SCLoadGame, 5, MENU_NONE}
-};
-
-static Menu_t LoadMenu = {
-    70, 30,
-    DrawLoadMenu,
-    6, LoadItems,
-    0,
-    MENU_FILES
-};
-
-static MenuItem_t SaveItems[] = {
-    {ITT_EFUNC, NULL, SCSaveGame, 0, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 1, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 2, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 3, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 4, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSaveGame, 5, MENU_NONE}
-};
-
-static Menu_t SaveMenu = {
-    70, 30,
-    DrawSaveMenu,
-    6, SaveItems,
-    0,
-    MENU_FILES
-};
-
-static MenuItem_t SkillItems[] = {
-    {ITT_EFUNC, NULL, SCSkill, sk_baby, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSkill, sk_easy, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSkill, sk_medium, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSkill, sk_hard, MENU_NONE},
-    {ITT_EFUNC, NULL, SCSkill, sk_nightmare, MENU_NONE}
-};
-
-static Menu_t SkillMenu = {
-    120, 44,
-    DrawSkillMenu,
-    5, SkillItems,
-    2,
-    MENU_CLASS
-};
-
-static MenuItem_t OptionsItems[] = {
-    {ITT_EFUNC, "END GAME", SCEndGame, 0, MENU_NONE},
-    {ITT_EFUNC, "MESSAGES : ", SCMessages, 0, MENU_NONE},
-    {ITT_LRFUNC, "MOUSE SENSITIVITY", SCMouseSensi, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_SETMENU, "MORE...", NULL, 0, MENU_OPTIONS2}
-};
-
-static Menu_t OptionsMenu = {
-    88, 30,
-    DrawOptionsMenu,
-    5, OptionsItems,
-    0,
-    MENU_MAIN
-};
-
-static MenuItem_t Options2Items[] = {
-    {ITT_LRFUNC, "SCREEN SIZE", SCScreenSize, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_LRFUNC, "SFX VOLUME", SCSfxVolume, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_LRFUNC, "MUSIC VOLUME", SCMusicVolume, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE}
-};
-
-static Menu_t Options2Menu = {
-    90, 20,
-    DrawOptions2Menu,
-    6, Options2Items,
-    0,
-    MENU_OPTIONS
-};
-
-static Menu_t *Menus[] = {
-    &MainMenu,
-    &ClassMenu,
-    &SkillMenu,
-    &OptionsMenu,
-    &Options2Menu,
-    &FilesMenu,
-    &LoadMenu,
-    &SaveMenu
-};
-
-static const char *GammaText[] = {
-    TXT_GAMMA_LEVEL_OFF,
-    TXT_GAMMA_LEVEL_1,
-    TXT_GAMMA_LEVEL_2,
-    TXT_GAMMA_LEVEL_3,
-    TXT_GAMMA_LEVEL_4
-};
-
-// CODE --------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_Init
-//
-//---------------------------------------------------------------------------
-
-void MN_Init(void)
-{
-    InitFonts();
-    MenuActive = false;
-//      messageson = true;              // Set by defaults in .CFG
-    MauloBaseLump = W_GetNumForName("FBULA0");  // ("M_SKL00");
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC InitFonts
-//
-//---------------------------------------------------------------------------
-
-static void InitFonts(void)
-{
-    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
-    FontAYellowBaseLump = W_GetNumForName("FONTAY_S") + 1;
-    FontBBaseLump = W_GetNumForName("FONTB_S") + 1;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DrTextA
-//
-// Draw text using font A.
-//
-//---------------------------------------------------------------------------
-
-void MN_DrTextA(const char *text, int x, int y)
-{
-    char c;
-    patch_t *p;
-
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            x += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-            V_DrawPatch(x, y, p);
-            x += SHORT(p->width) - 1;
-        }
-    }
-}
-
-//==========================================================================
-//
-// MN_DrTextAYellow
-//
-//==========================================================================
-
-void MN_DrTextAYellow(const char *text, int x, int y)
-{
-    char c;
-    patch_t *p;
-
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            x += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontAYellowBaseLump + c - 33, PU_CACHE);
-            V_DrawPatch(x, y, p);
-            x += SHORT(p->width) - 1;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC MN_TextAWidth
-//
-// Returns the pixel width of a string using font A.
-//
-//---------------------------------------------------------------------------
-
-int MN_TextAWidth(const char *text)
-{
-    char c;
-    int width;
-    patch_t *p;
-
-    width = 0;
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            width += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontABaseLump + c - 33, PU_CACHE);
-            width += SHORT(p->width) - 1;
-        }
-    }
-    return (width);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DrTextB
-//
-// Draw text using font B.
-//
-//---------------------------------------------------------------------------
-
-void MN_DrTextB(const char *text, int x, int y)
-{
-    char c;
-    patch_t *p;
-
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            x += 8;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
-            V_DrawPatch(x, y, p);
-            x += SHORT(p->width) - 1;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC MN_TextBWidth
-//
-// Returns the pixel width of a string using font B.
-//
-//---------------------------------------------------------------------------
-
-int MN_TextBWidth(const char *text)
-{
-    char c;
-    int width;
-    patch_t *p;
-
-    width = 0;
-    while ((c = *text++) != 0)
-    {
-        if (c < 33)
-        {
-            width += 5;
-        }
-        else
-        {
-            p = W_CacheLumpNum(FontBBaseLump + c - 33, PU_CACHE);
-            width += SHORT(p->width) - 1;
-        }
-    }
-    return (width);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_Ticker
-//
-//---------------------------------------------------------------------------
-
-void MN_Ticker(void)
-{
-    if (MenuActive == false)
-    {
-        return;
-    }
-    MenuTime++;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_Drawer
-//
-//---------------------------------------------------------------------------
-
-const char *QuitEndMsg[] = {
-    "ARE YOU SURE YOU WANT TO QUIT?",
-    "ARE YOU SURE YOU WANT TO END THE GAME?",
-    "DO YOU WANT TO QUICKSAVE THE GAME NAMED",
-    "DO YOU WANT TO QUICKLOAD THE GAME NAMED",
-    "ARE YOU SURE YOU WANT TO SUICIDE?"
-};
-
-void MN_Drawer(void)
-{
-    int i;
-    int x;
-    int y;
-    MenuItem_t *item;
-    const char *selName;
-
-    if (MenuActive == false)
-    {
-        if (askforquit)
-        {
-            MN_DrTextA(QuitEndMsg[typeofask - 1], 160 -
-                       MN_TextAWidth(QuitEndMsg[typeofask - 1]) / 2, 80);
-            if (typeofask == 3)
-            {
-                MN_DrTextA(SlotText[quicksave - 1], 160 -
-                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
-                MN_DrTextA("?", 160 +
-                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
-            }
-            if (typeofask == 4)
-            {
-                MN_DrTextA(SlotText[quickload - 1], 160 -
-                           MN_TextAWidth(SlotText[quickload - 1]) / 2, 90);
-                MN_DrTextA("?", 160 +
-                           MN_TextAWidth(SlotText[quicksave - 1]) / 2, 90);
-            }
-            UpdateState |= I_FULLSCRN;
-        }
-        return;
-    }
-    else
-    {
-        UpdateState |= I_FULLSCRN;
-        if (InfoType)
-        {
-            MN_DrawInfo();
-            return;
-        }
-        if (screenblocks < 10)
-        {
-            BorderNeedRefresh = true;
-        }
-        if (CurrentMenu->drawFunc != NULL)
-        {
-            CurrentMenu->drawFunc();
-        }
-        x = CurrentMenu->x;
-        y = CurrentMenu->y;
-        item = CurrentMenu->items;
-        for (i = 0; i < CurrentMenu->itemCount; i++)
-        {
-            if (item->type != ITT_EMPTY && item->text)
-            {
-                MN_DrTextB(item->text, x, y);
-            }
-            y += ITEM_HEIGHT;
-            item++;
-        }
-        y = CurrentMenu->y + (CurrentItPos * ITEM_HEIGHT) + SELECTOR_YOFFSET;
-        selName = MenuTime & 16 ? "M_SLCTR1" : "M_SLCTR2";
-        V_DrawPatch(x + SELECTOR_XOFFSET, y,
-                    W_CacheLumpName(selName, PU_CACHE));
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawMainMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawMainMenu(void)
-{
-    int frame;
-
-    frame = (MenuTime / 5) % 7;
-    V_DrawPatch(88, 0, W_CacheLumpName("M_HTIC", PU_CACHE));
-// Old Gold skull positions: (40, 10) and (232, 10)
-    V_DrawPatch(37, 80, W_CacheLumpNum(MauloBaseLump + (frame + 2) % 7,
-                                       PU_CACHE));
-    V_DrawPatch(278, 80, W_CacheLumpNum(MauloBaseLump + frame, PU_CACHE));
-}
-
-//==========================================================================
-//
-// DrawClassMenu
-//
-//==========================================================================
-
-static void DrawClassMenu(void)
-{
-    pclass_t class;
-    static const char *boxLumpName[3] = {
-        "m_fbox",
-        "m_cbox",
-        "m_mbox"
-    };
-    static const char *walkLumpName[3] = {
-        "m_fwalk1",
-        "m_cwalk1",
-        "m_mwalk1"
-    };
-
-    MN_DrTextB("CHOOSE CLASS:", 34, 24);
-    class = (pclass_t) CurrentMenu->items[CurrentItPos].option;
-    V_DrawPatch(174, 8, W_CacheLumpName(boxLumpName[class], PU_CACHE));
-    V_DrawPatch(174 + 24, 8 + 12,
-                W_CacheLumpNum(W_GetNumForName(walkLumpName[class])
-                               + ((MenuTime >> 3) & 3), PU_CACHE));
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSkillMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawSkillMenu(void)
-{
-    MN_DrTextB("CHOOSE SKILL LEVEL:", 74, 16);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawFilesMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawFilesMenu(void)
-{
-// clear out the quicksave/quickload stuff
-    quicksave = 0;
-    quickload = 0;
-    P_ClearMessage(&players[consoleplayer]);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawLoadMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawLoadMenu(void)
-{
-    MN_DrTextB("LOAD GAME", 160 - MN_TextBWidth("LOAD GAME") / 2, 10);
-    if (!slottextloaded)
-    {
-        MN_LoadSlotText();
-    }
-    DrawFileSlots(&LoadMenu);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSaveMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawSaveMenu(void)
-{
-    MN_DrTextB("SAVE GAME", 160 - MN_TextBWidth("SAVE GAME") / 2, 10);
-    if (!slottextloaded)
-    {
-        MN_LoadSlotText();
-    }
-    DrawFileSlots(&SaveMenu);
-}
-
-static boolean ReadDescriptionForSlot(int slot, char *description)
-{
-    FILE *fp;
-    boolean found;
-    char name[100];
-    char versionText[HXS_VERSION_TEXT_LENGTH];
-
-    M_snprintf(name, sizeof(name), "%shex%d.hxs", SavePath, slot);
-
-    fp = M_fopen(name, "rb");
-
-    if (fp == NULL)
-    {
-        return false;
-    }
-
-    found = fread(description, HXS_DESCRIPTION_LENGTH, 1, fp) == 1
-         && fread(versionText, HXS_VERSION_TEXT_LENGTH, 1, fp) == 1;
-
-    found = found && strcmp(versionText, HXS_VERSION_TEXT) == 0;
-
-    fclose(fp);
-
-    return found;
-}
-
-//===========================================================================
-//
-// MN_LoadSlotText
-//
-// For each slot, looks for save games and reads the description field.
-//
-//===========================================================================
-
-void MN_LoadSlotText(void)
-{
-    char description[HXS_DESCRIPTION_LENGTH];
-    int slot;
-
-    for (slot = 0; slot < 6; slot++)
-    {
-        if (ReadDescriptionForSlot(slot, description))
-        {
-            memcpy(SlotText[slot], description, SLOTTEXTLEN);
-            SlotStatus[slot] = 1;
-        }
-        else
-        {
-            memset(SlotText[slot], 0, SLOTTEXTLEN);
-            SlotStatus[slot] = 0;
-        }
-    }
-    slottextloaded = true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawFileSlots
-//
-//---------------------------------------------------------------------------
-
-static void DrawFileSlots(Menu_t * menu)
-{
-    int i;
-    int x;
-    int y;
-
-    x = menu->x;
-    y = menu->y;
-    for (i = 0; i < 6; i++)
-    {
-        V_DrawPatch(x, y, W_CacheLumpName("M_FSLOT", PU_CACHE));
-        if (SlotStatus[i])
-        {
-            MN_DrTextA(SlotText[i], x + 5, y + 5);
-        }
-        y += ITEM_HEIGHT;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawOptionsMenu
-//
-//---------------------------------------------------------------------------
-
-static void DrawOptionsMenu(void)
-{
-    if (messageson)
-    {
-        MN_DrTextB("ON", 196, 50);
-    }
-    else
-    {
-        MN_DrTextB("OFF", 196, 50);
-    }
-    DrawSlider(&OptionsMenu, 3, 10, mouseSensitivity);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawOptions2Menu
-//
-//---------------------------------------------------------------------------
-
-static void DrawOptions2Menu(void)
-{
-    DrawSlider(&Options2Menu, 1, 9, screenblocks - 3);
-    DrawSlider(&Options2Menu, 3, 16, snd_MaxVolume);
-    DrawSlider(&Options2Menu, 5, 16, snd_MusicVolume);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCQuitGame
-//
-//---------------------------------------------------------------------------
-
-static void SCQuitGame(int option)
-{
-    MenuActive = false;
-    askforquit = true;
-    typeofask = 1;              //quit game
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCEndGame
-//
-//---------------------------------------------------------------------------
-
-static void SCEndGame(int option)
-{
-    if (demoplayback)
-    {
-        return;
-    }
-    if (SCNetCheck(3))
-    {
-        MenuActive = false;
-        askforquit = true;
-        typeofask = 2;          //endgame
-        if (!netgame && !demoplayback)
-        {
-            paused = true;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCMessages
-//
-//---------------------------------------------------------------------------
-
-static void SCMessages(int option)
-{
-    messageson ^= 1;
-    if (messageson)
-    {
-        P_SetMessage(&players[consoleplayer], "MESSAGES ON", true);
-    }
-    else
-    {
-        P_SetMessage(&players[consoleplayer], "MESSAGES OFF", true);
-    }
-    S_StartSound(NULL, SFX_CHAT);
-}
-
-//===========================================================================
-//
-// SCNetCheck
-//
-//===========================================================================
-
-static boolean SCNetCheck(int option)
-{
-    if (!netgame)
-    {
-        return true;
-    }
-    switch (option)
-    {
-        case 1:                // new game
-            P_SetMessage(&players[consoleplayer],
-                         "YOU CAN'T START A NEW GAME IN NETPLAY!", true);
-            break;
-        case 2:                // load game
-            P_SetMessage(&players[consoleplayer],
-                         "YOU CAN'T LOAD A GAME IN NETPLAY!", true);
-            break;
-        case 3:                // end game
-            P_SetMessage(&players[consoleplayer],
-                         "YOU CAN'T END A GAME IN NETPLAY!", true);
-            break;
-    }
-    MenuActive = false;
-    S_StartSound(NULL, SFX_CHAT);
-    return false;
-}
-
-//===========================================================================
-//
-// SCNetCheck2
-//
-//===========================================================================
-
-static void SCNetCheck2(int option)
-{
-    SCNetCheck(option);
-    return;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCLoadGame
-//
-//---------------------------------------------------------------------------
-
-static void SCLoadGame(int option)
-{
-    if (demoplayback)
-    {
-        // deactivate playback, return control to player
-        demoextend = false;
-    }
-    if (!SlotStatus[option])
-    {                           // Don't try to load from an empty slot
-        return;
-    }
-    G_LoadGame(option);
-    MN_DeactivateMenu();
-    BorderNeedRefresh = true;
-    if (quickload == -1)
-    {
-        quickload = option + 1;
-        P_ClearMessage(&players[consoleplayer]);
-    }
-}
-
-//
-// Generate a default save slot name when the user saves to
-// an empty slot via the joypad.
-//
-static void SetDefaultSaveName(int slot)
-{
-    // map from IWAD or PWAD?
-    if (W_IsIWADLump(maplumpinfo) && strcmp(SavePath, ""))
-    {
-        M_snprintf(SlotText[slot], SLOTTEXTLEN,
-                   "%s", maplumpinfo->name);
-    }
-    else
-    {
-        char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpinfo));
-        char *ext = strrchr(wadname, '.');
-
-        if (ext != NULL)
-        {
-            *ext = '\0';
-        }
-
-        M_snprintf(SlotText[slot], SLOTTEXTLEN,
-                   "%s (%s)", maplumpinfo->name,
-                   wadname);
-        free(wadname);
-    }
-    M_ForceUppercase(SlotText[slot]);
-    joypadsave = false;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCSaveGame
-//
-//---------------------------------------------------------------------------
-
-static void SCSaveGame(int option)
-{
-    char *ptr;
-
-    if (!FileMenuKeySteal)
-    {
-        int x, y;
-
-        FileMenuKeySteal = true;
-        // We need to activate the text input interface to type the save
-        // game name:
-        x = SaveMenu.x + 1;
-        y = SaveMenu.y + 1 + option * ITEM_HEIGHT;
-        I_StartTextInput(x, y, x + 190, y + ITEM_HEIGHT - 2);
-
-        M_StringCopy(oldSlotText, SlotText[option], sizeof(oldSlotText));
-        ptr = SlotText[option];
-
-        if (!strcmp(ptr, "") && joypadsave)
-        {
-            SetDefaultSaveName(option);
-        }
-
-        while (*ptr)
-        {
-            ptr++;
-        }
-        *ptr = '[';
-        *(ptr + 1) = 0;
-        SlotStatus[option]++;
-        currentSlot = option;
-        slotptr = ptr - SlotText[option];
-        return;
-    }
-    else
-    {
-        G_SaveGame(option, SlotText[option]);
-        FileMenuKeySteal = false;
-        I_StopTextInput();
-        MN_DeactivateMenu();
-    }
-    BorderNeedRefresh = true;
-    if (quicksave == -1)
-    {
-        quicksave = option + 1;
-        P_ClearMessage(&players[consoleplayer]);
-    }
-}
-
-//==========================================================================
-//
-// SCClass
-//
-//==========================================================================
-
-static void SCClass(int option)
-{
-    if (netgame)
-    {
-        P_SetMessage(&players[consoleplayer],
-                     "YOU CAN'T START A NEW GAME FROM WITHIN A NETGAME!",
-                     true);
-        return;
-    }
-    MenuPClass = option;
-    switch (MenuPClass)
-    {
-        case PCLASS_FIGHTER:
-            SkillMenu.x = 120;
-            SkillItems[0].text = "SQUIRE";
-            SkillItems[1].text = "KNIGHT";
-            SkillItems[2].text = "WARRIOR";
-            SkillItems[3].text = "BERSERKER";
-            SkillItems[4].text = "TITAN";
-            break;
-        case PCLASS_CLERIC:
-            SkillMenu.x = 116;
-            SkillItems[0].text = "ALTAR BOY";
-            SkillItems[1].text = "ACOLYTE";
-            SkillItems[2].text = "PRIEST";
-            SkillItems[3].text = "CARDINAL";
-            SkillItems[4].text = "POPE";
-            break;
-        case PCLASS_MAGE:
-            SkillMenu.x = 112;
-            SkillItems[0].text = "APPRENTICE";
-            SkillItems[1].text = "ENCHANTER";
-            SkillItems[2].text = "SORCERER";
-            SkillItems[3].text = "WARLOCK";
-            SkillItems[4].text = "ARCHIMAGE";
-            break;
-    }
-    SetMenu(MENU_SKILL);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCSkill
-//
-//---------------------------------------------------------------------------
-
-static void SCSkill(int option)
-{
-    if (demoplayback)
-    {
-        // deactivate playback, return control to player
-        demoextend = false;
-    }
-
-    PlayerClass[consoleplayer] = MenuPClass;
-    G_DeferredNewGame(option);
-    SB_SetClassData();
-    SB_state = -1;
-    MN_DeactivateMenu();
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCMouseSensi
-//
-//---------------------------------------------------------------------------
-
-static void SCMouseSensi(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (mouseSensitivity < 9)
-        {
-            mouseSensitivity++;
-        }
-    }
-    else if (mouseSensitivity)
-    {
-        mouseSensitivity--;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCSfxVolume
-//
-//---------------------------------------------------------------------------
-
-static void SCSfxVolume(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (snd_MaxVolume < 15)
-        {
-            snd_MaxVolume++;
-        }
-    }
-    else if (snd_MaxVolume)
-    {
-        snd_MaxVolume--;
-    }
-    soundchanged = true;        // we'll set it when we leave the menu
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCMusicVolume
-//
-//---------------------------------------------------------------------------
-
-static void SCMusicVolume(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (snd_MusicVolume < 15)
-        {
-            snd_MusicVolume++;
-        }
-    }
-    else if (snd_MusicVolume)
-    {
-        snd_MusicVolume--;
-    }
-    S_SetMusicVolume();
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCScreenSize
-//
-//---------------------------------------------------------------------------
-
-static void SCScreenSize(int option)
-{
-    if (option == RIGHT_DIR)
-    {
-        if (screenblocks < 11)
-        {
-            screenblocks++;
-        }
-    }
-    else if (screenblocks > 3)
-    {
-        screenblocks--;
-    }
-    R_SetViewSize(screenblocks, detailLevel);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC SCInfo
-//
-//---------------------------------------------------------------------------
-
-static void SCInfo(int option)
-{
-    InfoType = 1;
-    S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC MN_Responder
-//
-//---------------------------------------------------------------------------
-
-boolean MN_Responder(event_t * event)
-{
-    int key;
-    int charTyped;
-    int i;
-    MenuItem_t *item;
-    char *textBuffer;
-    int dir;
-
-    // In testcontrols mode, none of the function keys should do anything
-    // - the only key is escape to quit.
-
-    if (testcontrols)
-    {
-        if (event->type == ev_quit
-         || (event->type == ev_keydown
-          && (event->data1 == key_menu_activate
-           || event->data1 == key_menu_quit)))
-        {
-            I_Quit();
-            return true;
-        }
-
-        return false;
-    }
-
-    // "close" button pressed on window?
-    if (event->type == ev_quit)
-    {
-        // First click on close = bring up quit confirm message.
-        // Second click = confirm quit.
-
-        if (!MenuActive && askforquit && typeofask == 1)
-        {
-            G_CheckDemoStatus();
-            I_Quit();
-        }
-        else
-        {
-            SCQuitGame(0);
-            S_StartSound(NULL, SFX_CHAT);
-        }
-
-        return true;
-    }
-
-    charTyped = 0;
-    key = -1;
-
-    if (event->type == ev_joystick)
-    {
-        // Simulate key presses from joystick events to interact with the menu.
-
-        if (MenuActive)
-        {
-            if (JOY_GET_DPAD(event->data6) != JOY_DIR_NONE)
-            {
-                dir = JOY_GET_DPAD(event->data6);
-            }
-            else if (JOY_GET_LSTICK(event->data6) != JOY_DIR_NONE)
-            {
-                dir = JOY_GET_LSTICK(event->data6);
-            }
-            else
-            {
-                dir = JOY_GET_RSTICK(event->data6);
-            }
-
-            if (dir & JOY_DIR_UP)
-            {
-                key = key_menu_up;
-                joywait = I_GetTime() + 5;
-            }
-            else if (dir & JOY_DIR_DOWN)
-            {
-                key = key_menu_down;
-                joywait = I_GetTime() + 5;
-            }
-            if (dir & JOY_DIR_LEFT)
-            {
-                key = key_menu_left;
-                joywait = I_GetTime() + 5;
-            }
-            else if (dir & JOY_DIR_RIGHT)
-            {
-                key = key_menu_right;
-                joywait = I_GetTime() + 5;
-            }
-
-#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
-#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (event->data1 & (1 << (x))) != 0)
-
-            if (JOY_BUTTON_PRESSED(joybfire))
-            {
-                // Simulate pressing "Enter" when we are supplying a save slot name
-                if (FileMenuKeySteal)
-                {
-                    key = KEY_ENTER;
-                }
-                else
-                {
-                    // if selecting a save slot via joypad, set a flag
-                    if (CurrentMenu == &SaveMenu)
-                    {
-                        joypadsave = true;
-                    }
-                    key = key_menu_forward;
-                }
-                joywait = I_GetTime() + 5;
-            }
-            if (JOY_BUTTON_PRESSED(joybuse))
-            {
-                // If user was entering a save name, back out
-                if (FileMenuKeySteal)
-                {
-                    key = KEY_ESCAPE;
-                }
-                else
-                {
-                    key = key_menu_back;
-                }
-                joywait = I_GetTime() + 5;
-            }
-        }
-        else if (askforquit)
-        {
-            if (JOY_BUTTON_PRESSED(joybfire))
-            {
-                // Simulate a 'Y' keypress
-                key = key_menu_confirm;
-                joywait = I_GetTime() + 5;
-            }
-            if (JOY_BUTTON_PRESSED(joybuse))
-            {
-                // Simulate a 'N' keypress
-                key = key_menu_abort;
-                joywait = I_GetTime() + 5;
-            }
-        }
-        if (JOY_BUTTON_PRESSED(joybmenu))
-        {
-            MN_ActivateMenu();
-            joywait = I_GetTime() + 5;
-            return true;
-        }
-    }
-
-    if (event->type != ev_keydown && key == -1)
-    {
-        return false;
-    }
-
-    if (event->type == ev_keydown)
-    {
-        key = event->data1;
-        charTyped = event->data2;
-    }
-
-    if (InfoType)
-    {
-        /* The 4-Level Demo Version also has 3 Info pages
-        if (gamemode == shareware)
-        {
-            InfoType = (InfoType + 1) % 5;
-        }
-        else
-        */
-        {
-            InfoType = (InfoType + 1) % 4;
-        }
-        if (key == KEY_ESCAPE)
-        {
-            InfoType = 0;
-        }
-        if (!InfoType)
-        {
-            if (!netgame && !demoplayback)
-            {
-                paused = false;
-            }
-            MN_DeactivateMenu();
-            SB_state = -1;      //refresh the statbar
-            BorderNeedRefresh = true;
-        }
-        S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-        return (true);          //make the info screen eat the keypress
-    }
-
-    if ((ravpic && key == KEY_F1) ||
-        (key != 0 && key == key_menu_screenshot))
-    {
-        G_ScreenShot();
-        return (true);
-    }
-
-    if (askforquit)
-    {
-        if (key == key_menu_confirm)
-        {
-            switch (typeofask)
-            {
-                case 1:
-                    G_CheckDemoStatus();
-                    I_Quit();
-                    return false;
-                case 2:
-                    P_ClearMessage(&players[consoleplayer]);
-                    askforquit = false;
-                    typeofask = 0;
-                    paused = false;
-                    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
-                    H2_StartTitle();    // go to intro/demo mode.
-                    return false;
-                case 3:
-                    P_SetMessage(&players[consoleplayer],
-                                 "QUICKSAVING....", false);
-                    FileMenuKeySteal = true;
-                    SCSaveGame(quicksave - 1);
-                    BorderNeedRefresh = true;
-                    break;
-                case 4:
-                    P_SetMessage(&players[consoleplayer],
-                                 "QUICKLOADING....", false);
-                    SCLoadGame(quickload - 1);
-                    BorderNeedRefresh = true;
-                    break;
-                case 5:
-                    BorderNeedRefresh = true;
-                    mn_SuicideConsole = true;
-                    break;
-                default:
-                    break;
-            }
-
-            askforquit = false;
-            typeofask = 0;
-
-            return true;
-        }
-        else if (key == key_menu_abort || key == KEY_ESCAPE)
-        {
-            players[consoleplayer].messageTics = 0;
-            askforquit = false;
-            typeofask = 0;
-            paused = false;
-            UpdateState |= I_FULLSCRN;
-            BorderNeedRefresh = true;
-            return true;
-        }
-
-        return false;           // don't let the keys filter thru
-    }
-    if (!MenuActive && !chatmodeon)
-    {
-        if (key == key_menu_decscreen)
-        {
-            if (automapactive)
-            {               // Don't screen size in automap
-                return (false);
-            }
-            SCScreenSize(LEFT_DIR);
-            S_StartSound(NULL, SFX_PICKUP_KEY);
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            return (true);
-        }
-        else if (key == key_menu_incscreen)
-        {
-            if (automapactive)
-            {               // Don't screen size in automap
-                return (false);
-            }
-            SCScreenSize(RIGHT_DIR);
-            S_StartSound(NULL, SFX_PICKUP_KEY);
-            BorderNeedRefresh = true;
-            UpdateState |= I_FULLSCRN;
-            return (true);
-        }
-        else if (key == key_menu_help)           // F1 (help screen)
-        {
-            SCInfo(0);      // start up info screens
-            MenuActive = true;
-            return (true);
-        }
-        else if (key == key_menu_save)           // F2 (save game)
-        {
-            if (gamestate == GS_LEVEL && !demoplayback)
-            {
-                MenuActive = true;
-                FileMenuKeySteal = false;
-                MenuTime = 0;
-                CurrentMenu = &SaveMenu;
-                CurrentItPos = CurrentMenu->oldItPos;
-                if (!netgame && !demoplayback)
-                {
-                    paused = true;
-                }
-                S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-                slottextloaded = false;     //reload the slot text, when needed
-            }
-            return true;
-        }
-        else if (key == key_menu_load)           // F3 (load game)
-        {
-            if (SCNetCheck(2))
-            {
-                MenuActive = true;
-                FileMenuKeySteal = false;
-                MenuTime = 0;
-                CurrentMenu = &LoadMenu;
-                CurrentItPos = CurrentMenu->oldItPos;
-                if (!netgame && !demoplayback)
-                {
-                    paused = true;
-                }
-                S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-                slottextloaded = false;     //reload the slot text, when needed
-            }
-            return true;
-        }
-        else if (key == key_menu_volume)         // F4 (volume)
-        {
-            MenuActive = true;
-            FileMenuKeySteal = false;
-            MenuTime = 0;
-            CurrentMenu = &Options2Menu;
-            CurrentItPos = CurrentMenu->oldItPos;
-            if (!netgame && !demoplayback)
-            {
-                paused = true;
-            }
-            S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-            slottextloaded = false; //reload the slot text, when needed
-            return true;
-        }
-        else if (key == key_menu_detail)         // F5 (suicide)
-        {
-            MenuActive = false;
-            askforquit = true;
-            typeofask = 5;  // suicide
-            return true;
-        }
-        else if (key == key_menu_qsave)          // F6 (quicksave)
-        {
-            if (gamestate == GS_LEVEL && !demoplayback)
-            {
-                if (!quicksave || quicksave == -1)
-                {
-                    MenuActive = true;
-                    FileMenuKeySteal = false;
-                    MenuTime = 0;
-                    CurrentMenu = &SaveMenu;
-                    CurrentItPos = CurrentMenu->oldItPos;
-                    if (!netgame && !demoplayback)
-                    {
-                        paused = true;
-                    }
-                    S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-                    slottextloaded = false; //reload the slot text
-                    quicksave = -1;
-                    P_SetMessage(&players[consoleplayer],
-                                 "CHOOSE A QUICKSAVE SLOT", true);
-                }
-                else
-                {
-                    askforquit = true;
-                    typeofask = 3;
-                    if (!netgame && !demoplayback)
-                    {
-                        paused = true;
-                    }
-                    S_StartSound(NULL, SFX_CHAT);
-                }
-            }
-            return true;
-        }
-        else if (key == key_menu_endgame)        // F7 (end game)
-        {
-            if (SCNetCheck(3))
-            {
-                if (gamestate == GS_LEVEL && !demoplayback)
-                {
-                    S_StartSound(NULL, SFX_CHAT);
-                    SCEndGame(0);
-                }
-            }
-            return true;
-        }
-        else if (key == key_menu_messages)       // F8 (toggle messages)
-        {
-            SCMessages(0);
-            return true;
-        }
-        else if (key == key_menu_qload)          // F9 (quickload)
-        {
-            if (SCNetCheck(2))
-            {
-                if (!quickload || quickload == -1)
-                {
-                    MenuActive = true;
-                    FileMenuKeySteal = false;
-                    MenuTime = 0;
-                    CurrentMenu = &LoadMenu;
-                    CurrentItPos = CurrentMenu->oldItPos;
-                    if (!netgame && !demoplayback)
-                    {
-                        paused = true;
-                    }
-                    S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-                    slottextloaded = false; // reload the slot text
-                    quickload = -1;
-                    P_SetMessage(&players[consoleplayer],
-                                 "CHOOSE A QUICKLOAD SLOT", true);
-                }
-                else
-                {
-                    askforquit = true;
-                    if (!netgame && !demoplayback)
-                    {
-                        paused = true;
-                    }
-                    typeofask = 4;
-                    S_StartSound(NULL, SFX_CHAT);
-                }
-            }
-            return true;
-        }
-        else if (key == key_menu_quit)           // F10 (quit)
-        {
-            if (gamestate == GS_LEVEL || gamestate == GS_FINALE)
-            {
-                SCQuitGame(0);
-                S_StartSound(NULL, SFX_CHAT);
-            }
-            return true;
-        }
-        else if (key == key_menu_gamma)          // F11 (gamma correction)
-        {
-            usegamma++;
-            if (usegamma > 4)
-            {
-                usegamma = 0;
-            }
-            SB_PaletteFlash(true);  // force change
-            P_SetMessage(&players[consoleplayer], GammaText[usegamma],
-                         false);
-            return true;
-        }
-        else if (key == KEY_F12)                 // F12 (???)
-        {
-            // F12 - reload current map (devmaps mode)
-
-            if (netgame)
-            {
-                return false;
-            }
-            if (gamekeydown[key_speed])
-            {               // Monsters ON
-                nomonsters = false;
-            }
-            if (gamekeydown[key_strafe])
-            {               // Monsters OFF
-                nomonsters = true;
-            }
-            G_DeferedInitNew(gameskill, gameepisode, gamemap);
-            P_SetMessage(&players[consoleplayer], TXT_CHEATWARP, false);
-            return true;
-        }
-    }
-
-    if (!MenuActive)
-    {
-        if (key == key_menu_activate || gamestate == GS_DEMOSCREEN || demoplayback)
-        {
-            MN_ActivateMenu();
-            return (true);
-        }
-        return (false);
-    }
-    if (!FileMenuKeySteal)
-    {
-        item = &CurrentMenu->items[CurrentItPos];
-
-        if (key == key_menu_down)                // Next menu item
-        {
-            do
-            {
-                if (CurrentItPos + 1 > CurrentMenu->itemCount - 1)
-                {
-                    CurrentItPos = 0;
-                }
-                else
-                {
-                    CurrentItPos++;
-                }
-            }
-            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
-            S_StartSound(NULL, SFX_FIGHTER_HAMMER_HITWALL);
-            return (true);
-        }
-        else if (key == key_menu_up)             // Previous menu item
-        {
-            do
-            {
-                if (CurrentItPos == 0)
-                {
-                    CurrentItPos = CurrentMenu->itemCount - 1;
-                }
-                else
-                {
-                    CurrentItPos--;
-                }
-            }
-            while (CurrentMenu->items[CurrentItPos].type == ITT_EMPTY);
-            S_StartSound(NULL, SFX_FIGHTER_HAMMER_HITWALL);
-            return (true);
-        }
-        else if (key == key_menu_left)           // Slider left
-        {
-            if (item->type == ITT_LRFUNC && item->func != NULL)
-            {
-                item->func(LEFT_DIR);
-                S_StartSound(NULL, SFX_PICKUP_KEY);
-            }
-            return (true);
-        }
-        else if (key == key_menu_right)          // Slider right
-        {
-            if (item->type == ITT_LRFUNC && item->func != NULL)
-            {
-                item->func(RIGHT_DIR);
-                S_StartSound(NULL, SFX_PICKUP_KEY);
-            }
-            return (true);
-        }
-        else if (key == key_menu_forward)        // Activate item (enter)
-        {
-            if (item->type == ITT_SETMENU)
-            {
-                if (item->func != NULL)
-                {
-                    item->func(item->option);
-                }
-                SetMenu(item->menu);
-            }
-            else if (item->func != NULL)
-            {
-                CurrentMenu->oldItPos = CurrentItPos;
-                if (item->type == ITT_LRFUNC)
-                {
-                    item->func(RIGHT_DIR);
-                }
-                else if (item->type == ITT_EFUNC)
-                {
-                    item->func(item->option);
-                }
-            }
-            S_StartSound(NULL, SFX_DOOR_LIGHT_CLOSE);
-            return (true);
-        }
-        else if (key == key_menu_activate)
-        {
-            MN_DeactivateMenu();
-            return (true);
-        }
-        else if (key == key_menu_back)
-        {
-            S_StartSound(NULL, SFX_PICKUP_KEY);
-
-            if (CurrentMenu->prevMenu == MENU_NONE)
-            {
-                MN_DeactivateMenu();
-            }
-            else
-            {
-                SetMenu(CurrentMenu->prevMenu);
-            }
-            return (true);
-        }
-        else if (charTyped != 0)
-        {
-            for (i = 0; i < CurrentMenu->itemCount; i++)
-            {
-                if (CurrentMenu->items[i].text)
-                {
-                    if (toupper(charTyped)
-                        == toupper(CurrentMenu->items[i].text[0]))
-                    {
-                        CurrentItPos = i;
-                        return (true);
-                    }
-                }
-            }
-        }
-        return (false);
-    }
-    else
-    {
-        // Editing file names
-        // When typing a savegame name, we use the fully shifted and
-        // translated input value from event->data3.
-        charTyped = event->data3;
-        textBuffer = &SlotText[currentSlot][slotptr];
-        if (key == KEY_BACKSPACE)
-        {
-            if (slotptr)
-            {
-                *textBuffer = 0;
-                slotptr--;
-                textBuffer = &SlotText[currentSlot][slotptr];
-                *textBuffer = ASCII_CURSOR;
-            }
-            return (true);
-        }
-        if (key == KEY_ESCAPE)
-        {
-            M_StringCopy(SlotText[currentSlot], oldSlotText,
-                         sizeof(SlotText[currentSlot]));
-            SlotStatus[currentSlot]--;
-            MN_DeactivateMenu();
-            return (true);
-        }
-        if (key == KEY_ENTER)
-        {
-            SlotText[currentSlot][slotptr] = 0; // clear the cursor
-            item = &CurrentMenu->items[CurrentItPos];
-            CurrentMenu->oldItPos = CurrentItPos;
-            if (item->type == ITT_EFUNC)
-            {
-                item->func(item->option);
-                if (item->menu != MENU_NONE)
-                {
-                    SetMenu(item->menu);
-                }
-            }
-            return (true);
-        }
-        if (slotptr < SLOTTEXTLEN && key != KEY_BACKSPACE)
-        {
-            if (isalpha(charTyped))
-            {
-                *textBuffer++ = toupper(charTyped);
-                *textBuffer = ASCII_CURSOR;
-                slotptr++;
-                return (true);
-            }
-            if (isdigit(charTyped) || charTyped == ' '
-             || charTyped == ',' || charTyped == '.' || charTyped == '-'
-             || charTyped == '!')
-            {
-                *textBuffer++ = charTyped;
-                *textBuffer = ASCII_CURSOR;
-                slotptr++;
-                return (true);
-            }
-        }
-        return (true);
-    }
-    return (false);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_ActivateMenu
-//
-//---------------------------------------------------------------------------
-
-void MN_ActivateMenu(void)
-{
-    if (MenuActive)
-    {
-        return;
-    }
-    if (paused)
-    {
-        S_ResumeSound();
-    }
-    MenuActive = true;
-    FileMenuKeySteal = false;
-    MenuTime = 0;
-    CurrentMenu = &MainMenu;
-    CurrentItPos = CurrentMenu->oldItPos;
-    if (!netgame && !demoplayback)
-    {
-        paused = true;
-    }
-    S_StartSound(NULL, SFX_PLATFORM_STOP);
-    slottextloaded = false;     //reload the slot text, when needed
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DeactivateMenu
-//
-//---------------------------------------------------------------------------
-
-void MN_DeactivateMenu(void)
-{
-    if (CurrentMenu != NULL)
-    {
-        CurrentMenu->oldItPos = CurrentItPos;
-    }
-    MenuActive = false;
-    if (FileMenuKeySteal)
-    {
-        I_StopTextInput();
-    }
-    if (!netgame)
-    {
-        paused = false;
-    }
-    S_StartSound(NULL, SFX_PLATFORM_STOP);
-    P_ClearMessage(&players[consoleplayer]);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC MN_DrawInfo
-//
-//---------------------------------------------------------------------------
-
-void MN_DrawInfo(void)
-{
-    I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));
-    memcpy(I_VideoBuffer,
-           (byte *) W_CacheLumpNum(W_GetNumForName("TITLE") + InfoType,
-                                   PU_CACHE), SCREENWIDTH * SCREENHEIGHT);
-//      V_DrawPatch(0, 0, W_CacheLumpNum(W_GetNumForName("TITLE")+InfoType,
-//              PU_CACHE));
-}
-
-
-//---------------------------------------------------------------------------
-//
-// PROC SetMenu
-//
-//---------------------------------------------------------------------------
-
-static void SetMenu(MenuType_t menu)
-{
-    CurrentMenu->oldItPos = CurrentItPos;
-    CurrentMenu = Menus[menu];
-    CurrentItPos = CurrentMenu->oldItPos;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC DrawSlider
-//
-//---------------------------------------------------------------------------
-
-static void DrawSlider(Menu_t * menu, int item, int width, int slot)
-{
-    int x;
-    int y;
-    int x2;
-    int count;
-
-    x = menu->x + 24;
-    y = menu->y + 2 + (item * ITEM_HEIGHT);
-    V_DrawPatch(x - 32, y, W_CacheLumpName("M_SLDLT", PU_CACHE));
-    for (x2 = x, count = width; count--; x2 += 8)
-    {
-        V_DrawPatch(x2, y, W_CacheLumpName(count & 1 ? "M_SLDMD1"
-                                           : "M_SLDMD2", PU_CACHE));
-    }
-    V_DrawPatch(x2, y, W_CacheLumpName("M_SLDRT", PU_CACHE));
-    V_DrawPatch(x + 4 + slot * 8, y + 7,
-                W_CacheLumpName("M_SLDKB", PU_CACHE));
-}
diff --git a/games/NXDoom/src/hexen/p_acs.c b/games/NXDoom/src/hexen/p_acs.c
deleted file mode 100644
index 33d0480b6..000000000
--- a/games/NXDoom/src/hexen/p_acs.c
+++ /dev/null
@@ -1,1996 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "s_sound.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "p_local.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAX_SCRIPT_ARGS 3
-#define SCRIPT_CONTINUE 0
-#define SCRIPT_STOP 1
-#define SCRIPT_TERMINATE 2
-#define OPEN_SCRIPTS_BASE 1000
-#define PRINT_BUFFER_SIZE 256
-#define GAME_SINGLE_PLAYER 0
-#define GAME_NET_COOPERATIVE 1
-#define GAME_NET_DEATHMATCH 2
-#define TEXTURE_TOP 0
-#define TEXTURE_MIDDLE 1
-#define TEXTURE_BOTTOM 2
-
-// TYPES -------------------------------------------------------------------
-
-typedef PACKED_STRUCT (
-{
-    int marker;
-    int infoOffset;
-    int code;
-}) acsHeader_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void StartOpenACS(int number, int infoIndex, int offset);
-static void ScriptFinished(int number);
-static boolean TagBusy(int tag);
-static boolean AddToACSStore(int map, int number, byte * args);
-static int GetACSIndex(int number);
-static void Push(int value);
-static int Pop(void);
-static int Top(void);
-static void Drop(void);
-
-static int CmdNOP(void);
-static int CmdTerminate(void);
-static int CmdSuspend(void);
-static int CmdPushNumber(void);
-static int CmdLSpec1(void);
-static int CmdLSpec2(void);
-static int CmdLSpec3(void);
-static int CmdLSpec4(void);
-static int CmdLSpec5(void);
-static int CmdLSpec1Direct(void);
-static int CmdLSpec2Direct(void);
-static int CmdLSpec3Direct(void);
-static int CmdLSpec4Direct(void);
-static int CmdLSpec5Direct(void);
-static int CmdAdd(void);
-static int CmdSubtract(void);
-static int CmdMultiply(void);
-static int CmdDivide(void);
-static int CmdModulus(void);
-static int CmdEQ(void);
-static int CmdNE(void);
-static int CmdLT(void);
-static int CmdGT(void);
-static int CmdLE(void);
-static int CmdGE(void);
-static int CmdAssignScriptVar(void);
-static int CmdAssignMapVar(void);
-static int CmdAssignWorldVar(void);
-static int CmdPushScriptVar(void);
-static int CmdPushMapVar(void);
-static int CmdPushWorldVar(void);
-static int CmdAddScriptVar(void);
-static int CmdAddMapVar(void);
-static int CmdAddWorldVar(void);
-static int CmdSubScriptVar(void);
-static int CmdSubMapVar(void);
-static int CmdSubWorldVar(void);
-static int CmdMulScriptVar(void);
-static int CmdMulMapVar(void);
-static int CmdMulWorldVar(void);
-static int CmdDivScriptVar(void);
-static int CmdDivMapVar(void);
-static int CmdDivWorldVar(void);
-static int CmdModScriptVar(void);
-static int CmdModMapVar(void);
-static int CmdModWorldVar(void);
-static int CmdIncScriptVar(void);
-static int CmdIncMapVar(void);
-static int CmdIncWorldVar(void);
-static int CmdDecScriptVar(void);
-static int CmdDecMapVar(void);
-static int CmdDecWorldVar(void);
-static int CmdGoto(void);
-static int CmdIfGoto(void);
-static int CmdDrop(void);
-static int CmdDelay(void);
-static int CmdDelayDirect(void);
-static int CmdRandom(void);
-static int CmdRandomDirect(void);
-static int CmdThingCount(void);
-static int CmdThingCountDirect(void);
-static int CmdTagWait(void);
-static int CmdTagWaitDirect(void);
-static int CmdPolyWait(void);
-static int CmdPolyWaitDirect(void);
-static int CmdChangeFloor(void);
-static int CmdChangeFloorDirect(void);
-static int CmdChangeCeiling(void);
-static int CmdChangeCeilingDirect(void);
-static int CmdRestart(void);
-static int CmdAndLogical(void);
-static int CmdOrLogical(void);
-static int CmdAndBitwise(void);
-static int CmdOrBitwise(void);
-static int CmdEorBitwise(void);
-static int CmdNegateLogical(void);
-static int CmdLShift(void);
-static int CmdRShift(void);
-static int CmdUnaryMinus(void);
-static int CmdIfNotGoto(void);
-static int CmdLineSide(void);
-static int CmdScriptWait(void);
-static int CmdScriptWaitDirect(void);
-static int CmdClearLineSpecial(void);
-static int CmdCaseGoto(void);
-static int CmdBeginPrint(void);
-static int CmdEndPrint(void);
-static int CmdPrintString(void);
-static int CmdPrintNumber(void);
-static int CmdPrintCharacter(void);
-static int CmdPlayerCount(void);
-static int CmdGameType(void);
-static int CmdGameSkill(void);
-static int CmdTimer(void);
-static int CmdSectorSound(void);
-static int CmdAmbientSound(void);
-static int CmdSoundSequence(void);
-static int CmdSetLineTexture(void);
-static int CmdSetLineBlocking(void);
-static int CmdSetLineSpecial(void);
-static int CmdThingSound(void);
-static int CmdEndPrintBold(void);
-
-static void ThingCount(int type, int tid);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-int ACScriptCount;
-byte *ActionCodeBase;
-static int ActionCodeSize;
-acsInfo_t *ACSInfo;
-int MapVars[MAX_ACS_MAP_VARS];
-int WorldVars[MAX_ACS_WORLD_VARS];
-acsstore_t ACSStore[MAX_ACS_STORE + 1]; // +1 for termination marker
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static char EvalContext[64];
-static acs_t *ACScript;
-static unsigned int PCodeOffset;
-static byte SpecArgs[8];
-static int ACStringCount;
-static char **ACStrings;
-static char PrintBuffer[PRINT_BUFFER_SIZE];
-static acs_t *NewScript;
-
-static int (*PCodeCmds[]) (void) =
-{
-        CmdNOP,
-        CmdTerminate,
-        CmdSuspend,
-        CmdPushNumber,
-        CmdLSpec1,
-        CmdLSpec2,
-        CmdLSpec3,
-        CmdLSpec4,
-        CmdLSpec5,
-        CmdLSpec1Direct,
-        CmdLSpec2Direct,
-        CmdLSpec3Direct,
-        CmdLSpec4Direct,
-        CmdLSpec5Direct,
-        CmdAdd,
-        CmdSubtract,
-        CmdMultiply,
-        CmdDivide,
-        CmdModulus,
-        CmdEQ,
-        CmdNE,
-        CmdLT,
-        CmdGT,
-        CmdLE,
-        CmdGE,
-        CmdAssignScriptVar,
-        CmdAssignMapVar,
-        CmdAssignWorldVar,
-        CmdPushScriptVar,
-        CmdPushMapVar,
-        CmdPushWorldVar,
-        CmdAddScriptVar,
-        CmdAddMapVar,
-        CmdAddWorldVar,
-        CmdSubScriptVar,
-        CmdSubMapVar,
-        CmdSubWorldVar,
-        CmdMulScriptVar,
-        CmdMulMapVar,
-        CmdMulWorldVar,
-        CmdDivScriptVar,
-        CmdDivMapVar,
-        CmdDivWorldVar,
-        CmdModScriptVar,
-        CmdModMapVar,
-        CmdModWorldVar,
-        CmdIncScriptVar,
-        CmdIncMapVar,
-        CmdIncWorldVar,
-        CmdDecScriptVar,
-        CmdDecMapVar,
-        CmdDecWorldVar,
-        CmdGoto,
-        CmdIfGoto,
-        CmdDrop,
-        CmdDelay,
-        CmdDelayDirect,
-        CmdRandom,
-        CmdRandomDirect,
-        CmdThingCount,
-        CmdThingCountDirect,
-        CmdTagWait,
-        CmdTagWaitDirect,
-        CmdPolyWait,
-        CmdPolyWaitDirect,
-        CmdChangeFloor,
-        CmdChangeFloorDirect,
-        CmdChangeCeiling,
-        CmdChangeCeilingDirect,
-        CmdRestart,
-        CmdAndLogical,
-        CmdOrLogical,
-        CmdAndBitwise,
-        CmdOrBitwise,
-        CmdEorBitwise,
-        CmdNegateLogical,
-        CmdLShift,
-        CmdRShift,
-        CmdUnaryMinus,
-        CmdIfNotGoto,
-        CmdLineSide,
-        CmdScriptWait,
-        CmdScriptWaitDirect,
-        CmdClearLineSpecial,
-        CmdCaseGoto,
-        CmdBeginPrint,
-        CmdEndPrint,
-        CmdPrintString,
-        CmdPrintNumber,
-        CmdPrintCharacter,
-        CmdPlayerCount,
-        CmdGameType,
-        CmdGameSkill,
-        CmdTimer,
-        CmdSectorSound,
-        CmdAmbientSound,
-        CmdSoundSequence,
-        CmdSetLineTexture,
-        CmdSetLineBlocking,
-        CmdSetLineSpecial,
-        CmdThingSound,
-        CmdEndPrintBold,
-};
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// ACSAssert
-//
-// Check that the given condition evaluates to true. If it does not, exit
-// with an I_Error() printing the given message.
-//
-//==========================================================================
-
-static void ACSAssert(int condition, const char *fmt, ...)
-{
-    char buf[128];
-    va_list args;
-
-    if (condition)
-    {
-        return;
-    }
-
-    va_start(args, fmt);
-    M_vsnprintf(buf, sizeof(buf), fmt, args);
-    va_end(args);
-    I_Error("ACS assertion failure: in %s: %s", EvalContext, buf);
-}
-
-//==========================================================================
-//
-// ReadCodeInt
-//
-// Read a 32-bit value from the loaded ACS lump at the location pointed to
-// by PCodeOffset, advancing PCodeOffset to the next value in the process.
-//
-//==========================================================================
-
-static int ReadCodeInt(void)
-{
-    int result;
-    int *ptr;
-
-    ACSAssert(PCodeOffset + 3 < ActionCodeSize,
-              "unexpectedly reached end of ACS lump");
-
-    ptr = (int *) (ActionCodeBase + PCodeOffset);
-    result = LONG(*ptr);
-    PCodeOffset += 4;
-
-    return result;
-}
-
-//==========================================================================
-//
-// ReadScriptVar
-//
-// Read a script variable index as an immediate value, validating the
-// result is a valid script variable number.
-//
-//==========================================================================
-
-static int ReadScriptVar(void)
-{
-    int var = ReadCodeInt();
-    ACSAssert(var >= 0, "negative script variable: %d < 0", var);
-    ACSAssert(var < MAX_ACS_SCRIPT_VARS,
-              "invalid script variable: %d >= %d", var, MAX_ACS_SCRIPT_VARS);
-    return var;
-}
-
-//==========================================================================
-//
-// ReadMapVar
-//
-// Read a map variable index as an immediate value, validating the
-// result is a valid map variable number.
-//
-//==========================================================================
-
-static int ReadMapVar(void)
-{
-    int var = ReadCodeInt();
-    ACSAssert(var >= 0, "negative map variable: %d < 0", var);
-    ACSAssert(var < MAX_ACS_MAP_VARS,
-              "invalid map variable: %d >= %d", var, MAX_ACS_MAP_VARS);
-    return var;
-}
-
-//==========================================================================
-//
-// ReadWorldVar
-//
-// Read a world variable index as an immediate value, validating the
-// result is a valid world variable number.
-//
-//==========================================================================
-
-static int ReadWorldVar(void)
-{
-    int var = ReadCodeInt();
-    ACSAssert(var >= 0, "negative world variable: %d < 0", var);
-    ACSAssert(var < MAX_ACS_WORLD_VARS,
-              "invalid world variable: %d >= %d", var, MAX_ACS_WORLD_VARS);
-    return var;
-}
-
-//==========================================================================
-//
-// StringLookup
-//
-// Look up the given string in the strings table by index, validating that
-// it is a valid string index.
-//
-//==========================================================================
-
-static char *StringLookup(int string_index)
-{
-    ACSAssert(string_index >= 0,
-              "negative string index: %d < 0", string_index);
-    ACSAssert(string_index < ACStringCount,
-              "invalid string index: %d >= %d", string_index, ACStringCount);
-    return ACStrings[string_index];
-}
-
-//==========================================================================
-//
-// ReadOffset
-//
-// Read a lump offset value, validating that it is an offset within the
-// range of the lump.
-//
-//==========================================================================
-
-static int ReadOffset(void)
-{
-    int offset = ReadCodeInt();
-    ACSAssert(offset >= 0, "negative lump offset %d", offset);
-    ACSAssert(offset < ActionCodeSize, "invalid lump offset: %d >= %d",
-              offset, ActionCodeSize);
-    return offset;
-}
-
-//==========================================================================
-//
-// P_LoadACScripts
-//
-//==========================================================================
-
-void P_LoadACScripts(int lump)
-{
-    int i, offset;
-    acsHeader_t *header;
-    acsInfo_t *info;
-
-    ActionCodeBase = W_CacheLumpNum(lump, PU_LEVEL);
-    ActionCodeSize = W_LumpLength(lump);
-
-    M_snprintf(EvalContext, sizeof(EvalContext),
-               "header parsing of lump #%d", lump);
-
-    header = (acsHeader_t *) ActionCodeBase;
-    PCodeOffset = LONG(header->infoOffset);
-
-    ACScriptCount = ReadCodeInt();
-
-    if (ACScriptCount == 0)
-    {                           // Empty behavior lump
-        return;
-    }
-
-    ACSInfo = Z_Malloc(ACScriptCount * sizeof(acsInfo_t), PU_LEVEL, 0);
-    memset(ACSInfo, 0, ACScriptCount * sizeof(acsInfo_t));
-    for (i = 0, info = ACSInfo; i < ACScriptCount; i++, info++)
-    {
-        info->number = ReadCodeInt();
-        info->offset = ReadOffset();
-        info->argCount = ReadCodeInt();
-
-        if (info->argCount > MAX_SCRIPT_ARGS)
-        {
-            fprintf(stderr, "Warning: ACS script #%i has %i arguments, more "
-                            "than the maximum of %i. Enforcing limit.\n"
-                            "If you are seeing this message, please report "
-                            "the name of the WAD where you saw it.\n",
-                            i, info->argCount, MAX_SCRIPT_ARGS);
-            info->argCount = MAX_SCRIPT_ARGS;
-        }
-
-        if (info->number >= OPEN_SCRIPTS_BASE)
-        {                       // Auto-activate
-            info->number -= OPEN_SCRIPTS_BASE;
-            StartOpenACS(info->number, i, info->offset);
-            info->state = ASTE_RUNNING;
-        }
-        else
-        {
-            info->state = ASTE_INACTIVE;
-        }
-    }
-
-    ACStringCount = ReadCodeInt();
-    ACSAssert(ACStringCount >= 0, "negative string count %d", ACStringCount);
-    ACStrings = Z_Malloc(ACStringCount * sizeof(char *), PU_LEVEL, NULL);
-
-    for (i=0; i<ACStringCount; ++i)
-    {
-        offset = ReadOffset();
-        ACStrings[i] = (char *) ActionCodeBase + offset;
-        ACSAssert(memchr(ACStrings[i], '\0', ActionCodeSize - offset) != NULL,
-                  "string %d missing terminating NUL", i);
-    }
-
-    memset(MapVars, 0, sizeof(MapVars));
-}
-
-//==========================================================================
-//
-// StartOpenACS
-//
-//==========================================================================
-
-static void StartOpenACS(int number, int infoIndex, int offset)
-{
-    acs_t *script;
-
-    script = Z_Malloc(sizeof(acs_t), PU_LEVSPEC, 0);
-    memset(script, 0, sizeof(acs_t));
-    script->number = number;
-
-    // World objects are allotted 1 second for initialization
-    script->delayCount = 35;
-
-    script->infoIndex = infoIndex;
-    script->ip = offset;
-    script->thinker.function = T_InterpretACS;
-    P_AddThinker(&script->thinker);
-}
-
-//==========================================================================
-//
-// P_CheckACSStore
-//
-// Scans the ACS store and executes all scripts belonging to the current
-// map.
-//
-//==========================================================================
-
-void P_CheckACSStore(void)
-{
-    acsstore_t *store;
-
-    for (store = ACSStore; store->map != 0; store++)
-    {
-        if (store->map == gamemap)
-        {
-            P_StartACS(store->script, 0, store->args, NULL, NULL, 0);
-            if (NewScript)
-            {
-                NewScript->delayCount = 35;
-            }
-            store->map = -1;
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_StartACS
-//
-// Start an ACS script. The 'args' array should be at least MAX_SCRIPT_ARGS
-// elements in length.
-//
-//==========================================================================
-
-static char ErrorMsg[128];
-
-boolean P_StartACS(int number, int map, byte * args, mobj_t * activator,
-                   line_t * line, int side)
-{
-    int i;
-    acs_t *script;
-    int infoIndex;
-    aste_t *statePtr;
-
-    NewScript = NULL;
-    if (map && map != gamemap)
-    {                           // Add to the script store
-        return AddToACSStore(map, number, args);
-    }
-    infoIndex = GetACSIndex(number);
-    if (infoIndex == -1)
-    {                           // Script not found
-        //I_Error("P_StartACS: Unknown script number %d", number);
-        M_snprintf(ErrorMsg, sizeof(ErrorMsg),
-                   "P_STARTACS ERROR: UNKNOWN SCRIPT %d", number);
-        P_SetMessage(&players[consoleplayer], ErrorMsg, true);
-    }
-    statePtr = &ACSInfo[infoIndex].state;
-    if (*statePtr == ASTE_SUSPENDED)
-    {                           // Resume a suspended script
-        *statePtr = ASTE_RUNNING;
-        return true;
-    }
-    if (*statePtr != ASTE_INACTIVE)
-    {                           // Script is already executing
-        return false;
-    }
-    script = Z_Malloc(sizeof(acs_t), PU_LEVSPEC, 0);
-    memset(script, 0, sizeof(acs_t));
-    script->number = number;
-    script->infoIndex = infoIndex;
-    script->activator = activator;
-    script->line = line;
-    script->side = side;
-    script->ip = ACSInfo[infoIndex].offset;
-    script->thinker.function = T_InterpretACS;
-    for (i = 0; i < MAX_SCRIPT_ARGS && i < ACSInfo[infoIndex].argCount; i++)
-    {
-        script->vars[i] = args[i];
-    }
-    *statePtr = ASTE_RUNNING;
-    P_AddThinker(&script->thinker);
-    NewScript = script;
-    return true;
-}
-
-//==========================================================================
-//
-// AddToACSStore
-//
-//==========================================================================
-
-static boolean AddToACSStore(int map, int number, byte * args)
-{
-    int i;
-    int index;
-
-    index = -1;
-    for (i = 0; ACSStore[i].map != 0; i++)
-    {
-        if (ACSStore[i].script == number && ACSStore[i].map == map)
-        {                       // Don't allow duplicates
-            return false;
-        }
-        if (index == -1 && ACSStore[i].map == -1)
-        {                       // Remember first empty slot
-            index = i;
-        }
-    }
-    if (index == -1)
-    {                           // Append required
-        if (i == MAX_ACS_STORE)
-        {
-            I_Error("AddToACSStore: MAX_ACS_STORE (%d) exceeded.",
-                    MAX_ACS_STORE);
-        }
-        index = i;
-        ACSStore[index + 1].map = 0;
-    }
-    ACSStore[index].map = map;
-    ACSStore[index].script = number;
-    memcpy(ACSStore[index].args, args, MAX_SCRIPT_ARGS);
-    return true;
-}
-
-//==========================================================================
-//
-// P_StartLockedACS
-//
-//==========================================================================
-
-
-boolean P_StartLockedACS(line_t * line, byte * args, mobj_t * mo, int side)
-{
-    int i;
-    int lock;
-    byte newArgs[5];
-    char LockedBuffer[80];
-
-    lock = args[4];
-    if (!mo->player)
-    {
-        return false;
-    }
-    if (lock)
-    {
-        if (!(mo->player->keys & (1 << (lock - 1))))
-        {
-            M_snprintf(LockedBuffer, sizeof(LockedBuffer),
-                       "YOU NEED THE %s\n", TextKeyMessages[lock - 1]);
-            P_SetMessage(mo->player, LockedBuffer, true);
-            S_StartSound(mo, SFX_DOOR_LOCKED);
-            return false;
-        }
-    }
-    for (i = 0; i < 4; i++)
-    {
-        newArgs[i] = args[i];
-    }
-    newArgs[4] = 0;
-    return P_StartACS(newArgs[0], newArgs[1], &newArgs[2], mo, line, side);
-}
-
-//==========================================================================
-//
-// P_TerminateACS
-//
-//==========================================================================
-
-boolean P_TerminateACS(int number, int map)
-{
-    int infoIndex;
-
-    infoIndex = GetACSIndex(number);
-    if (infoIndex == -1)
-    {                           // Script not found
-        return false;
-    }
-    if (ACSInfo[infoIndex].state == ASTE_INACTIVE
-        || ACSInfo[infoIndex].state == ASTE_TERMINATING)
-    {                           // States that disallow termination
-        return false;
-    }
-    ACSInfo[infoIndex].state = ASTE_TERMINATING;
-    return true;
-}
-
-//==========================================================================
-//
-// P_SuspendACS
-//
-//==========================================================================
-
-boolean P_SuspendACS(int number, int map)
-{
-    int infoIndex;
-
-    infoIndex = GetACSIndex(number);
-    if (infoIndex == -1)
-    {                           // Script not found
-        return false;
-    }
-    if (ACSInfo[infoIndex].state == ASTE_INACTIVE
-        || ACSInfo[infoIndex].state == ASTE_SUSPENDED
-        || ACSInfo[infoIndex].state == ASTE_TERMINATING)
-    {                           // States that disallow suspension
-        return false;
-    }
-    ACSInfo[infoIndex].state = ASTE_SUSPENDED;
-    return true;
-}
-
-//==========================================================================
-//
-// P_Init
-//
-//==========================================================================
-
-void P_ACSInitNewGame(void)
-{
-    memset(WorldVars, 0, sizeof(WorldVars));
-    memset(ACSStore, 0, sizeof(ACSStore));
-}
-
-//==========================================================================
-//
-// T_InterpretACS
-//
-//==========================================================================
-
-void T_InterpretACS(thinker_t *thinker)
-{
-    acs_t *script = (acs_t *) thinker;
-    int cmd;
-    int action;
-
-    if (ACSInfo[script->infoIndex].state == ASTE_TERMINATING)
-    {
-        ACSInfo[script->infoIndex].state = ASTE_INACTIVE;
-        ScriptFinished(ACScript->number);
-        P_RemoveThinker(&ACScript->thinker);
-        return;
-    }
-    if (ACSInfo[script->infoIndex].state != ASTE_RUNNING)
-    {
-        return;
-    }
-    if (script->delayCount)
-    {
-        script->delayCount--;
-        return;
-    }
-    ACScript = script;
-    PCodeOffset = ACScript->ip;
-
-    do
-    {
-        M_snprintf(EvalContext, sizeof(EvalContext), "script %d @0x%x",
-                   ACSInfo[script->infoIndex].number, PCodeOffset);
-        cmd = ReadCodeInt();
-        M_snprintf(EvalContext, sizeof(EvalContext), "script %d @0x%x, cmd=%d",
-                   ACSInfo[script->infoIndex].number, PCodeOffset, cmd);
-        ACSAssert(cmd >= 0, "negative ACS instruction %d", cmd);
-        ACSAssert(cmd < arrlen(PCodeCmds),
-                  "invalid ACS instruction %d (maybe this WAD is designed "
-                  "for an advanced source port and is not vanilla "
-                  "compatible)", cmd);
-        action = PCodeCmds[cmd]();
-    } while (action == SCRIPT_CONTINUE);
-
-    ACScript->ip = PCodeOffset;
-
-    if (action == SCRIPT_TERMINATE)
-    {
-        ACSInfo[script->infoIndex].state = ASTE_INACTIVE;
-        ScriptFinished(ACScript->number);
-        P_RemoveThinker(&ACScript->thinker);
-    }
-}
-
-//==========================================================================
-//
-// P_TagFinished
-//
-//==========================================================================
-
-void P_TagFinished(int tag)
-{
-    int i;
-
-    if (TagBusy(tag) == true)
-    {
-        return;
-    }
-    for (i = 0; i < ACScriptCount; i++)
-    {
-        if (ACSInfo[i].state == ASTE_WAITINGFORTAG
-            && ACSInfo[i].waitValue == tag)
-        {
-            ACSInfo[i].state = ASTE_RUNNING;
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_PolyobjFinished
-//
-//==========================================================================
-
-void P_PolyobjFinished(int po)
-{
-    int i;
-
-    if (PO_Busy(po) == true)
-    {
-        return;
-    }
-    for (i = 0; i < ACScriptCount; i++)
-    {
-        if (ACSInfo[i].state == ASTE_WAITINGFORPOLY
-            && ACSInfo[i].waitValue == po)
-        {
-            ACSInfo[i].state = ASTE_RUNNING;
-        }
-    }
-}
-
-//==========================================================================
-//
-// ScriptFinished
-//
-//==========================================================================
-
-static void ScriptFinished(int number)
-{
-    int i;
-
-    for (i = 0; i < ACScriptCount; i++)
-    {
-        if (ACSInfo[i].state == ASTE_WAITINGFORSCRIPT
-            && ACSInfo[i].waitValue == number)
-        {
-            ACSInfo[i].state = ASTE_RUNNING;
-        }
-    }
-}
-
-//==========================================================================
-//
-// TagBusy
-//
-//==========================================================================
-
-static boolean TagBusy(int tag)
-{
-    int sectorIndex;
-
-    sectorIndex = -1;
-    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
-    {
-        if (sectors[sectorIndex].specialdata)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-//==========================================================================
-//
-// GetACSIndex
-//
-// Returns the index of a script number.  Returns -1 if the script number
-// is not found.
-//
-//==========================================================================
-
-static int GetACSIndex(int number)
-{
-    int i;
-
-    for (i = 0; i < ACScriptCount; i++)
-    {
-        if (ACSInfo[i].number == number)
-        {
-            return i;
-        }
-    }
-    return -1;
-}
-
-//==========================================================================
-//
-// CheckACSPresent
-//
-// Placing Korax in a PWAD without extra steps will result in a crash in
-// Vanilla because the relevant ACS scripts are not initialized
-//
-//==========================================================================
-
-void CheckACSPresent(int number)
-{
-    if (GetACSIndex(number) == -1)
-    {
-        I_Error("Required ACS script %d not initialized", number);
-    }
-}
-
-//==========================================================================
-//
-// Push
-//
-//==========================================================================
-
-static void Push(int value)
-{
-    ACSAssert(ACScript->stackPtr < ACS_STACK_DEPTH,
-              "maximum stack depth exceeded: %d >= %d",
-              ACScript->stackPtr, ACS_STACK_DEPTH);
-    ACScript->stack[ACScript->stackPtr++] = value;
-}
-
-//==========================================================================
-//
-// Pop
-//
-//==========================================================================
-
-static int Pop(void)
-{
-    ACSAssert(ACScript->stackPtr > 0, "pop of empty stack");
-    return ACScript->stack[--ACScript->stackPtr];
-}
-
-//==========================================================================
-//
-// Top
-//
-//==========================================================================
-
-static int Top(void)
-{
-    ACSAssert(ACScript->stackPtr > 0, "read from top of empty stack");
-    return ACScript->stack[ACScript->stackPtr - 1];
-}
-
-//==========================================================================
-//
-// Drop
-//
-//==========================================================================
-
-static void Drop(void)
-{
-    ACSAssert(ACScript->stackPtr > 0, "drop on empty stack");
-    ACScript->stackPtr--;
-}
-
-//==========================================================================
-//
-// P-Code Commands
-//
-//==========================================================================
-
-static int CmdNOP(void)
-{
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdTerminate(void)
-{
-    return SCRIPT_TERMINATE;
-}
-
-static int CmdSuspend(void)
-{
-    ACSInfo[ACScript->infoIndex].state = ASTE_SUSPENDED;
-    return SCRIPT_STOP;
-}
-
-static int CmdPushNumber(void)
-{
-    Push(ReadCodeInt());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec1(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[0] = Pop();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec2(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[1] = Pop();
-    SpecArgs[0] = Pop();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec3(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[2] = Pop();
-    SpecArgs[1] = Pop();
-    SpecArgs[0] = Pop();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec4(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[3] = Pop();
-    SpecArgs[2] = Pop();
-    SpecArgs[1] = Pop();
-    SpecArgs[0] = Pop();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec5(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[4] = Pop();
-    SpecArgs[3] = Pop();
-    SpecArgs[2] = Pop();
-    SpecArgs[1] = Pop();
-    SpecArgs[0] = Pop();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec1Direct(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[0] = ReadCodeInt();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec2Direct(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[0] = ReadCodeInt();
-    SpecArgs[1] = ReadCodeInt();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec3Direct(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[0] = ReadCodeInt();
-    SpecArgs[1] = ReadCodeInt();
-    SpecArgs[2] = ReadCodeInt();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec4Direct(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[0] = ReadCodeInt();
-    SpecArgs[1] = ReadCodeInt();
-    SpecArgs[2] = ReadCodeInt();
-    SpecArgs[3] = ReadCodeInt();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLSpec5Direct(void)
-{
-    int special;
-
-    special = ReadCodeInt();
-    SpecArgs[0] = ReadCodeInt();
-    SpecArgs[1] = ReadCodeInt();
-    SpecArgs[2] = ReadCodeInt();
-    SpecArgs[3] = ReadCodeInt();
-    SpecArgs[4] = ReadCodeInt();
-    P_ExecuteLineSpecial(special, SpecArgs, ACScript->line,
-                         ACScript->side, ACScript->activator);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAdd(void)
-{
-    Push(Pop() + Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSubtract(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() - operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdMultiply(void)
-{
-    Push(Pop() * Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDivide(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() / operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdModulus(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() % operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdEQ(void)
-{
-    Push(Pop() == Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdNE(void)
-{
-    Push(Pop() != Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLT(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() < operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdGT(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() > operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLE(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() <= operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdGE(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() >= operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAssignScriptVar(void)
-{
-    ACScript->vars[ReadScriptVar()] = Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAssignMapVar(void)
-{
-    MapVars[ReadMapVar()] = Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAssignWorldVar(void)
-{
-    WorldVars[ReadWorldVar()] = Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPushScriptVar(void)
-{
-    Push(ACScript->vars[ReadScriptVar()]);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPushMapVar(void)
-{
-    Push(MapVars[ReadMapVar()]);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPushWorldVar(void)
-{
-    Push(WorldVars[ReadWorldVar()]);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAddScriptVar(void)
-{
-    ACScript->vars[ReadScriptVar()] += Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAddMapVar(void)
-{
-    MapVars[ReadMapVar()] += Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAddWorldVar(void)
-{
-    WorldVars[ReadWorldVar()] += Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSubScriptVar(void)
-{
-    ACScript->vars[ReadScriptVar()] -= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSubMapVar(void)
-{
-    MapVars[ReadMapVar()] -= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSubWorldVar(void)
-{
-    WorldVars[ReadWorldVar()] -= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdMulScriptVar(void)
-{
-    ACScript->vars[ReadScriptVar()] *= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdMulMapVar(void)
-{
-    MapVars[ReadMapVar()] *= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdMulWorldVar(void)
-{
-    WorldVars[ReadWorldVar()] *= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDivScriptVar(void)
-{
-    ACScript->vars[ReadScriptVar()] /= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDivMapVar(void)
-{
-    MapVars[ReadMapVar()] /= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDivWorldVar(void)
-{
-    WorldVars[ReadWorldVar()] /= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdModScriptVar(void)
-{
-    ACScript->vars[ReadScriptVar()] %= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdModMapVar(void)
-{
-    MapVars[ReadMapVar()] %= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdModWorldVar(void)
-{
-    WorldVars[ReadWorldVar()] %= Pop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdIncScriptVar(void)
-{
-    ++ACScript->vars[ReadScriptVar()];
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdIncMapVar(void)
-{
-    ++MapVars[ReadMapVar()];
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdIncWorldVar(void)
-{
-    ++WorldVars[ReadWorldVar()];
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDecScriptVar(void)
-{
-    --ACScript->vars[ReadScriptVar()];
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDecMapVar(void)
-{
-    --MapVars[ReadMapVar()];
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDecWorldVar(void)
-{
-    --WorldVars[ReadWorldVar()];
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdGoto(void)
-{
-    PCodeOffset = ReadOffset();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdIfGoto(void)
-{
-    int offset;
-
-    offset = ReadOffset();
-
-    if (Pop() != 0)
-    {
-        PCodeOffset = offset;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDrop(void)
-{
-    Drop();
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdDelay(void)
-{
-    ACScript->delayCount = Pop();
-    return SCRIPT_STOP;
-}
-
-static int CmdDelayDirect(void)
-{
-    ACScript->delayCount = ReadCodeInt();
-    return SCRIPT_STOP;
-}
-
-static int CmdRandom(void)
-{
-    int low;
-    int high;
-
-    high = Pop();
-    low = Pop();
-    Push(low + (P_Random() % (high - low + 1)));
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdRandomDirect(void)
-{
-    int low;
-    int high;
-
-    low = ReadCodeInt();
-    high = ReadCodeInt();
-    Push(low + (P_Random() % (high - low + 1)));
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdThingCount(void)
-{
-    int tid;
-
-    tid = Pop();
-    ThingCount(Pop(), tid);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdThingCountDirect(void)
-{
-    int type;
-
-    type = ReadCodeInt();
-    ThingCount(type, ReadCodeInt());
-    return SCRIPT_CONTINUE;
-}
-
-static void ThingCount(int type, int tid)
-{
-    int count;
-    int searcher;
-    mobj_t *mobj;
-    mobjtype_t moType;
-    thinker_t *think;
-
-    if (!(type + tid))
-    {                           // Nothing to count
-        return;
-    }
-    moType = TranslateThingType[type];
-    count = 0;
-    searcher = -1;
-    if (tid)
-    {                           // Count TID things
-        while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-        {
-            if (type == 0)
-            {                   // Just count TIDs
-                count++;
-            }
-            else if (moType == mobj->type)
-            {
-                if (mobj->flags & MF_COUNTKILL && mobj->health <= 0)
-                {               // Don't count dead monsters
-                    continue;
-                }
-                count++;
-            }
-        }
-    }
-    else
-    {                           // Count only types
-        for (think = thinkercap.next; think != &thinkercap;
-             think = think->next)
-        {
-            if (think->function != P_MobjThinker)
-            {                   // Not a mobj thinker
-                continue;
-            }
-            mobj = (mobj_t *) think;
-            if (mobj->type != moType)
-            {                   // Doesn't match
-                continue;
-            }
-            if (mobj->flags & MF_COUNTKILL && mobj->health <= 0)
-            {                   // Don't count dead monsters
-                continue;
-            }
-            count++;
-        }
-    }
-    Push(count);
-}
-
-static int CmdTagWait(void)
-{
-    ACSInfo[ACScript->infoIndex].waitValue = Pop();
-    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORTAG;
-    return SCRIPT_STOP;
-}
-
-static int CmdTagWaitDirect(void)
-{
-    ACSInfo[ACScript->infoIndex].waitValue = ReadCodeInt();
-    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORTAG;
-    return SCRIPT_STOP;
-}
-
-static int CmdPolyWait(void)
-{
-    ACSInfo[ACScript->infoIndex].waitValue = Pop();
-    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORPOLY;
-    return SCRIPT_STOP;
-}
-
-static int CmdPolyWaitDirect(void)
-{
-    ACSInfo[ACScript->infoIndex].waitValue = ReadCodeInt();
-    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORPOLY;
-    return SCRIPT_STOP;
-}
-
-static int CmdChangeFloor(void)
-{
-    int tag;
-    int flat;
-    int sectorIndex;
-
-    flat = R_FlatNumForName(StringLookup(Pop()));
-    tag = Pop();
-    sectorIndex = -1;
-    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
-    {
-        sectors[sectorIndex].floorpic = flat;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdChangeFloorDirect(void)
-{
-    int tag;
-    int flat;
-    int sectorIndex;
-
-    tag = ReadCodeInt();
-    flat = R_FlatNumForName(StringLookup(ReadCodeInt()));
-    sectorIndex = -1;
-    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
-    {
-        sectors[sectorIndex].floorpic = flat;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdChangeCeiling(void)
-{
-    int tag;
-    int flat;
-    int sectorIndex;
-
-    flat = R_FlatNumForName(StringLookup(Pop()));
-    tag = Pop();
-    sectorIndex = -1;
-    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
-    {
-        sectors[sectorIndex].ceilingpic = flat;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdChangeCeilingDirect(void)
-{
-    int tag;
-    int flat;
-    int sectorIndex;
-
-    tag = ReadCodeInt();
-    flat = R_FlatNumForName(StringLookup(ReadCodeInt()));
-    sectorIndex = -1;
-    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
-    {
-        sectors[sectorIndex].ceilingpic = flat;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdRestart(void)
-{
-    PCodeOffset = ACSInfo[ACScript->infoIndex].offset;
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAndLogical(void)
-{
-    Push(Pop() && Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdOrLogical(void)
-{
-    Push(Pop() || Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAndBitwise(void)
-{
-    Push(Pop() & Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdOrBitwise(void)
-{
-    Push(Pop() | Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdEorBitwise(void)
-{
-    Push(Pop() ^ Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdNegateLogical(void)
-{
-    Push(!Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLShift(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() << operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdRShift(void)
-{
-    int operand2;
-
-    operand2 = Pop();
-    Push(Pop() >> operand2);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdUnaryMinus(void)
-{
-    Push(-Pop());
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdIfNotGoto(void)
-{
-    int offset;
-
-    offset = ReadOffset();
-
-    if (Pop() == 0)
-    {
-        PCodeOffset = offset;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdLineSide(void)
-{
-    Push(ACScript->side);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdScriptWait(void)
-{
-    ACSInfo[ACScript->infoIndex].waitValue = Pop();
-    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORSCRIPT;
-    return SCRIPT_STOP;
-}
-
-static int CmdScriptWaitDirect(void)
-{
-    ACSInfo[ACScript->infoIndex].waitValue = ReadCodeInt();
-    ACSInfo[ACScript->infoIndex].state = ASTE_WAITINGFORSCRIPT;
-    return SCRIPT_STOP;
-}
-
-static int CmdClearLineSpecial(void)
-{
-    if (ACScript->line)
-    {
-        ACScript->line->special = 0;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdCaseGoto(void)
-{
-    int value;
-    int offset;
-
-    value = ReadCodeInt();
-    offset = ReadOffset();
-
-    if (Top() == value)
-    {
-        PCodeOffset = offset;
-        Drop();
-    }
-
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdBeginPrint(void)
-{
-    *PrintBuffer = 0;
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdEndPrint(void)
-{
-    player_t *player;
-
-    if (ACScript->activator && ACScript->activator->player)
-    {
-        player = ACScript->activator->player;
-    }
-    else
-    {
-        player = &players[consoleplayer];
-    }
-    P_SetMessage(player, PrintBuffer, true);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdEndPrintBold(void)
-{
-    int i;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (playeringame[i])
-        {
-            P_SetYellowMessage(&players[i], PrintBuffer, true);
-        }
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPrintString(void)
-{
-    M_StringConcat(PrintBuffer, StringLookup(Pop()), sizeof(PrintBuffer));
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPrintNumber(void)
-{
-    char tempStr[16];
-
-    M_snprintf(tempStr, sizeof(tempStr), "%d", Pop());
-    M_StringConcat(PrintBuffer, tempStr, sizeof(PrintBuffer));
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPrintCharacter(void)
-{
-    char tempStr[2];
-
-    tempStr[0] = Pop();
-    tempStr[1] = '\0';
-    M_StringConcat(PrintBuffer, tempStr, sizeof(PrintBuffer));
-
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdPlayerCount(void)
-{
-    int i;
-    int count;
-
-    count = 0;
-    for (i = 0; i < maxplayers; i++)
-    {
-        count += playeringame[i];
-    }
-    Push(count);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdGameType(void)
-{
-    int gametype;
-
-    if (netgame == false)
-    {
-        gametype = GAME_SINGLE_PLAYER;
-    }
-    else if (deathmatch)
-    {
-        gametype = GAME_NET_DEATHMATCH;
-    }
-    else
-    {
-        gametype = GAME_NET_COOPERATIVE;
-    }
-    Push(gametype);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdGameSkill(void)
-{
-    Push(gameskill);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdTimer(void)
-{
-    Push(leveltime);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSectorSound(void)
-{
-    int volume;
-    mobj_t *mobj;
-
-    mobj = NULL;
-    if (ACScript->line)
-    {
-        mobj = (mobj_t *) & ACScript->line->frontsector->soundorg;
-    }
-    volume = Pop();
-    S_StartSoundAtVolume(mobj, S_GetSoundID(StringLookup(Pop())), volume);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdThingSound(void)
-{
-    int tid;
-    int sound;
-    int volume;
-    mobj_t *mobj;
-    int searcher;
-
-    volume = Pop();
-    sound = S_GetSoundID(StringLookup(Pop()));
-    tid = Pop();
-    searcher = -1;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        S_StartSoundAtVolume(mobj, sound, volume);
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdAmbientSound(void)
-{
-    int volume;
-
-    volume = Pop();
-    S_StartSoundAtVolume(NULL, S_GetSoundID(StringLookup(Pop())), volume);
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSoundSequence(void)
-{
-    mobj_t *mobj;
-
-    mobj = NULL;
-    if (ACScript->line)
-    {
-        mobj = (mobj_t *) & ACScript->line->frontsector->soundorg;
-    }
-    SN_StartSequenceName(mobj, StringLookup(Pop()));
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSetLineTexture(void)
-{
-    line_t *line;
-    int lineTag;
-    int side;
-    int position;
-    int texture;
-    int searcher;
-
-    texture = R_TextureNumForName(StringLookup(Pop()));
-    position = Pop();
-    side = Pop();
-    lineTag = Pop();
-    searcher = -1;
-    while ((line = P_FindLine(lineTag, &searcher)) != NULL)
-    {
-        if (position == TEXTURE_MIDDLE)
-        {
-            sides[line->sidenum[side]].midtexture = texture;
-        }
-        else if (position == TEXTURE_BOTTOM)
-        {
-            sides[line->sidenum[side]].bottomtexture = texture;
-        }
-        else
-        {                       // TEXTURE_TOP
-            sides[line->sidenum[side]].toptexture = texture;
-        }
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSetLineBlocking(void)
-{
-    line_t *line;
-    int lineTag;
-    boolean blocking;
-    int searcher;
-
-    blocking = Pop()? ML_BLOCKING : 0;
-    lineTag = Pop();
-    searcher = -1;
-    while ((line = P_FindLine(lineTag, &searcher)) != NULL)
-    {
-        line->flags = (line->flags & ~ML_BLOCKING) | blocking;
-    }
-    return SCRIPT_CONTINUE;
-}
-
-static int CmdSetLineSpecial(void)
-{
-    line_t *line;
-    int lineTag;
-    int special, arg1, arg2, arg3, arg4, arg5;
-    int searcher;
-
-    arg5 = Pop();
-    arg4 = Pop();
-    arg3 = Pop();
-    arg2 = Pop();
-    arg1 = Pop();
-    special = Pop();
-    lineTag = Pop();
-    searcher = -1;
-    while ((line = P_FindLine(lineTag, &searcher)) != NULL)
-    {
-        line->special = special;
-        line->arg1 = arg1;
-        line->arg2 = arg2;
-        line->arg3 = arg3;
-        line->arg4 = arg4;
-        line->arg5 = arg5;
-    }
-    return SCRIPT_CONTINUE;
-}
diff --git a/games/NXDoom/src/hexen/p_action.h b/games/NXDoom/src/hexen/p_action.h
deleted file mode 100644
index 8336fbe58..000000000
--- a/games/NXDoom/src/hexen/p_action.h
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// External definitions for action pointer functions.
-//
-
-#ifndef HEXEN_P_ACTION_H
-#define HEXEN_P_ACTION_H
-
-
-void A_FreeTargMobj(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FlameCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_HideThing(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_RestoreSpecialThing1(mobj_t *thing, player_t *player, pspdef_t *psp);
-void A_RestoreSpecialThing2(mobj_t *thing, player_t *player, pspdef_t *psp);
-void A_RestoreArtifact(mobj_t *arti, player_t *player, pspdef_t *psp);
-void A_Summon(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ThrustInitUp(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ThrustInitDn(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ThrustRaise(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ThrustBlock(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ThrustImpale(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ThrustLower(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_TeloSpawnC(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_TeloSpawnB(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_TeloSpawnA(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_TeloSpawnD(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CheckTeleRing(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FogSpawn(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FogMove(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Quake(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ContMobjSound(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Scream(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PoisonBagInit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PoisonBagDamage(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PoisonBagCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CheckThrowBomb(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_NoGravity(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PotteryExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PotteryChooseBit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PotteryCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CorpseBloodDrip(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CorpseExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LeafSpawn(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LeafThrust(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LeafCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BridgeInit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BridgeOrbit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_TreeDeath(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PoisonShroom(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Pain(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SoAExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BellReset1(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BellReset2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Light0(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WeaponReady(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Lower(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Raise(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FPunchAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ReFire(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FAxeAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FHammerAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FHammerThrow(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FSwordAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FSwordFlames(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CMaceAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CStaffInitBlink(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CStaffCheckBlink(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CStaffCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CStaffMissileSlither(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CFlameAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CFlameRotate(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CFlamePuff(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CFlameMissile(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolyAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolyPalette(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolySeek(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolyCheckScream(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolyTail(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolySpawnPuff(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolyAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MWandAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LightningReady(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MLightningAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LightningZap(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LightningClip(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LightningRemove(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_LastZap(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ZapMimic(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MStaffPalette(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MStaffWeave(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MStaffTrack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SnoutAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FireConePL1(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ShedShard(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_AddPlayerCorpse(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SkullPop(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FreezeDeath(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CheckBurnGone(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CheckSkullFloor(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CheckSkullDone(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SpeedFade(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceSetTics(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceCheckHeadDone(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PigPain(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PigLook(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PigChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_PigAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_QueueCorpse(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CentaurAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CentaurAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SetReflective(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CentaurDefend(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_UnSetReflective(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CentaurDropStuff(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CheckFloor(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DemonAttack1(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DemonAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DemonDeath(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_Demon2Death(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithRaiseInit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithRaise(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithInit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithLook(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithFX3(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithMelee(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithMissile(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_WraithFX2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurFade1(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurFade2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurRoam(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurAtk1(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurAtk2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurAtk3(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurCharge(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SmokePuffExit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurFade0(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MntrFloorFire(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentHumpDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentUnHide(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentRaiseHump(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentLowerHump(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentHide(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentBirthScream(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SetShootable(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentCheckForAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_UnSetShootable(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentDiveSound(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentWalk(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentChooseAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentMeleeAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentMissileAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentHeadPop(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentSpawnGibs(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SerpentHeadCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FloatGib(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DelayGib(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SinkGib(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopDoBlur(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopSpawnBlur(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopPainBlur(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopPuff(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SetAltShadow(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopMissileWeave(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BishopMissileSeek(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonInitFlight(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonFlap(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonFlight(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonPain(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonCheckCrash(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DragonFX2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ESound(mobj_t *mo, player_t *player, pspdef_t *psp);
-void A_EttinAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DropMace(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FiredRocks(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_UnSetInvulnerable(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FiredChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FiredAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FiredSplotch(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SmBounce(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceGuyLook(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceGuyChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceGuyAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceGuyDie(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceGuyMissilePuff(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_IceGuyMissileExplode(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ClassBossHealth(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FastChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FighterAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_ClericAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MageAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcBallPop(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcFX2Split(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcFX2Orbit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcererBishopEntry(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SpawnBishop(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcFX4Check(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxStep2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxChase(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxStep(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxDecide(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxMissile(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxCommand(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KoraxBonePop(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KSpiritRoam(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KBoltRaise(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_KBolt(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BatSpawnInit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BatSpawn(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BatMove(mobj_t *actor, player_t *player, pspdef_t *psp);
-
-
-#endif // HEXEN_P_ACTION_H
diff --git a/games/NXDoom/src/hexen/p_anim.c b/games/NXDoom/src/hexen/p_anim.c
deleted file mode 100644
index 12f90a5ed..000000000
--- a/games/NXDoom/src/hexen/p_anim.c
+++ /dev/null
@@ -1,477 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define ANIM_SCRIPT_NAME "ANIMDEFS"
-#define MAX_ANIM_DEFS 20
-#define MAX_FRAME_DEFS 96
-#define ANIM_FLAT 0
-#define ANIM_TEXTURE 1
-#define SCI_FLAT "flat"
-#define SCI_TEXTURE "texture"
-#define SCI_PIC "pic"
-#define SCI_TICS "tics"
-#define SCI_RAND "rand"
-
-#define LIGHTNING_SPECIAL 	198
-#define LIGHTNING_SPECIAL2 	199
-#define SKYCHANGE_SPECIAL 	200
-
-// TYPES -------------------------------------------------------------------
-
-typedef struct
-{
-    int index;
-    int tics;
-} frameDef_t;
-
-typedef struct
-{
-    int type;
-    int index;
-    int tics;
-    int currentFrameDef;
-    int startFrameDef;
-    int endFrameDef;
-} animDef_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void P_LightningFlash(void);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-fixed_t Sky1ScrollDelta;
-fixed_t Sky2ScrollDelta;
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static animDef_t AnimDefs[MAX_ANIM_DEFS];
-static frameDef_t FrameDefs[MAX_FRAME_DEFS];
-static int AnimDefCount;
-static boolean LevelHasLightning;
-static int NextLightningFlash;
-static int LightningFlash;
-static int *LightningLightLevels;
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// P_AnimateSurfaces
-//
-//==========================================================================
-
-void P_AnimateSurfaces(void)
-{
-    int i;
-    animDef_t *ad;
-    line_t *line;
-
-    // Animate flats and textures
-    for (i = 0; i < AnimDefCount; i++)
-    {
-        ad = &AnimDefs[i];
-        ad->tics--;
-        if (ad->tics == 0)
-        {
-            if (ad->currentFrameDef == ad->endFrameDef)
-            {
-                ad->currentFrameDef = ad->startFrameDef;
-            }
-            else
-            {
-                ad->currentFrameDef++;
-            }
-            ad->tics = FrameDefs[ad->currentFrameDef].tics;
-            if (ad->tics > 255)
-            {                   // Random tics
-                ad->tics = (ad->tics >> 16)
-                    + P_Random() % ((ad->tics & 0xff00) >> 8);
-            }
-            if (ad->type == ANIM_FLAT)
-            {
-                flattranslation[ad->index] =
-                    FrameDefs[ad->currentFrameDef].index;
-            }
-            else
-            {                   // Texture
-                texturetranslation[ad->index] =
-                    FrameDefs[ad->currentFrameDef].index;
-            }
-        }
-    }
-
-    // Update scrolling textures
-    for (i = 0; i < numlinespecials; i++)
-    {
-        line = linespeciallist[i];
-        switch (line->special)
-        {
-            case 100:          // Scroll_Texture_Left
-                sides[line->sidenum[0]].textureoffset += line->arg1 << 10;
-                break;
-            case 101:          // Scroll_Texture_Right
-                sides[line->sidenum[0]].textureoffset -= line->arg1 << 10;
-                break;
-            case 102:          // Scroll_Texture_Up
-                sides[line->sidenum[0]].rowoffset += line->arg1 << 10;
-                break;
-            case 103:          // Scroll_Texture_Down
-                sides[line->sidenum[0]].rowoffset -= line->arg1 << 10;
-                break;
-        }
-    }
-
-    // Update sky column offsets
-    Sky1ColumnOffset += Sky1ScrollDelta;
-    Sky2ColumnOffset += Sky2ScrollDelta;
-
-    if (LevelHasLightning)
-    {
-        if (!NextLightningFlash || LightningFlash)
-        {
-            P_LightningFlash();
-        }
-        else
-        {
-            NextLightningFlash--;
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_LightningFlash
-//
-//==========================================================================
-
-static void P_LightningFlash(void)
-{
-    int i;
-    sector_t *tempSec;
-    int *tempLight;
-    boolean foundSec;
-    int flashLight;
-
-    if (LightningFlash)
-    {
-        LightningFlash--;
-        if (LightningFlash)
-        {
-            tempLight = LightningLightLevels;
-            tempSec = sectors;
-            for (i = 0; i < numsectors; i++, tempSec++)
-            {
-                if (tempSec->ceilingpic == skyflatnum
-                    || tempSec->special == LIGHTNING_SPECIAL
-                    || tempSec->special == LIGHTNING_SPECIAL2)
-                {
-                    if (*tempLight < tempSec->lightlevel - 4)
-                    {
-                        tempSec->lightlevel -= 4;
-                    }
-                    tempLight++;
-                }
-            }
-        }
-        else
-        {                       // remove the alternate lightning flash special
-            tempLight = LightningLightLevels;
-            tempSec = sectors;
-            for (i = 0; i < numsectors; i++, tempSec++)
-            {
-                if (tempSec->ceilingpic == skyflatnum
-                    || tempSec->special == LIGHTNING_SPECIAL
-                    || tempSec->special == LIGHTNING_SPECIAL2)
-                {
-                    tempSec->lightlevel = *tempLight;
-                    tempLight++;
-                }
-            }
-            Sky1Texture = P_GetMapSky1Texture(gamemap);
-        }
-        return;
-    }
-    LightningFlash = (P_Random() & 7) + 8;
-    flashLight = 200 + (P_Random() & 31);
-    tempSec = sectors;
-    tempLight = LightningLightLevels;
-    foundSec = false;
-    for (i = 0; i < numsectors; i++, tempSec++)
-    {
-        if (tempSec->ceilingpic == skyflatnum
-            || tempSec->special == LIGHTNING_SPECIAL
-            || tempSec->special == LIGHTNING_SPECIAL2)
-        {
-            *tempLight = tempSec->lightlevel;
-            if (tempSec->special == LIGHTNING_SPECIAL)
-            {
-                tempSec->lightlevel += 64;
-                if (tempSec->lightlevel > flashLight)
-                {
-                    tempSec->lightlevel = flashLight;
-                }
-            }
-            else if (tempSec->special == LIGHTNING_SPECIAL2)
-            {
-                tempSec->lightlevel += 32;
-                if (tempSec->lightlevel > flashLight)
-                {
-                    tempSec->lightlevel = flashLight;
-                }
-            }
-            else
-            {
-                tempSec->lightlevel = flashLight;
-            }
-            if (tempSec->lightlevel < *tempLight)
-            {
-                tempSec->lightlevel = *tempLight;
-            }
-            tempLight++;
-            foundSec = true;
-        }
-    }
-    if (foundSec)
-    {
-        Sky1Texture = P_GetMapSky2Texture(gamemap);     // set alternate sky                
-        S_StartSound(NULL, SFX_THUNDER_CRASH);
-    }
-    // Calculate the next lighting flash
-    if (!NextLightningFlash)
-    {
-        if (P_Random() < 50)
-        {                       // Immediate Quick flash
-            NextLightningFlash = (P_Random() & 15) + 16;
-        }
-        else
-        {
-            if (P_Random() < 128 && !(leveltime & 32))
-            {
-                NextLightningFlash = ((P_Random() & 7) + 2) * 35;
-            }
-            else
-            {
-                NextLightningFlash = ((P_Random() & 15) + 5) * 35;
-            }
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_ForceLightning
-//
-//==========================================================================
-
-void P_ForceLightning(void)
-{
-    NextLightningFlash = 0;
-}
-
-//==========================================================================
-//
-// P_InitLightning
-//
-//==========================================================================
-
-void P_InitLightning(void)
-{
-    int i;
-    int secCount;
-
-    if (!P_GetMapLightning(gamemap))
-    {
-        LevelHasLightning = false;
-        LightningFlash = 0;
-        return;
-    }
-    LightningFlash = 0;
-    secCount = 0;
-    for (i = 0; i < numsectors; i++)
-    {
-        if (sectors[i].ceilingpic == skyflatnum
-            || sectors[i].special == LIGHTNING_SPECIAL
-            || sectors[i].special == LIGHTNING_SPECIAL2)
-        {
-            secCount++;
-        }
-    }
-    if (secCount)
-    {
-        LevelHasLightning = true;
-    }
-    else
-    {
-        LevelHasLightning = false;
-        return;
-    }
-    LightningLightLevels = (int *) Z_Malloc(secCount * sizeof(int), PU_LEVEL,
-                                            NULL);
-    NextLightningFlash = ((P_Random() & 15) + 5) * 35;  // don't flash at level start
-}
-
-//==========================================================================
-//
-// P_InitFTAnims
-//
-// Initialize flat and texture animation lists.
-//
-//==========================================================================
-
-void P_InitFTAnims(void)
-{
-    int base;
-    int mod;
-    int fd;
-    animDef_t *ad;
-    boolean ignore;
-    boolean done;
-
-    fd = 0;
-    ad = AnimDefs;
-    AnimDefCount = 0;
-    SC_Open(ANIM_SCRIPT_NAME);
-    while (SC_GetString())
-    {
-        if (AnimDefCount == MAX_ANIM_DEFS)
-        {
-            I_Error("P_InitFTAnims: too many AnimDefs.");
-        }
-        if (SC_Compare(SCI_FLAT))
-        {
-            ad->type = ANIM_FLAT;
-        }
-        else if (SC_Compare(SCI_TEXTURE))
-        {
-            ad->type = ANIM_TEXTURE;
-        }
-        else
-        {
-            SC_ScriptError(NULL);
-        }
-        SC_MustGetString();     // Name
-        ignore = false;
-        if (ad->type == ANIM_FLAT)
-        {
-            if (W_CheckNumForName(sc_String) == -1)
-            {
-                ignore = true;
-            }
-            else
-            {
-                ad->index = R_FlatNumForName(sc_String);
-            }
-        }
-        else
-        {                       // Texture
-            if (R_CheckTextureNumForName(sc_String) == -1)
-            {
-                ignore = true;
-            }
-            else
-            {
-                ad->index = R_TextureNumForName(sc_String);
-            }
-        }
-        ad->startFrameDef = fd;
-        done = false;
-        while (done == false)
-        {
-            if (SC_GetString())
-            {
-                if (SC_Compare(SCI_PIC))
-                {
-                    if (fd == MAX_FRAME_DEFS)
-                    {
-                        I_Error("P_InitFTAnims: too many FrameDefs.");
-                    }
-                    SC_MustGetNumber();
-                    if (ignore == false)
-                    {
-                        FrameDefs[fd].index = ad->index + sc_Number - 1;
-                    }
-                    SC_MustGetString();
-                    if (SC_Compare(SCI_TICS))
-                    {
-                        SC_MustGetNumber();
-                        if (ignore == false)
-                        {
-                            FrameDefs[fd].tics = sc_Number;
-                            fd++;
-                        }
-                    }
-                    else if (SC_Compare(SCI_RAND))
-                    {
-                        SC_MustGetNumber();
-                        base = sc_Number;
-                        SC_MustGetNumber();
-                        if (ignore == false)
-                        {
-                            mod = sc_Number - base + 1;
-                            FrameDefs[fd].tics = (base << 16) + (mod << 8);
-                            fd++;
-                        }
-                    }
-                    else
-                    {
-                        SC_ScriptError(NULL);
-                    }
-                }
-                else
-                {
-                    SC_UnGet();
-                    done = true;
-                }
-            }
-            else
-            {
-                done = true;
-            }
-        }
-        if ((ignore == false) && (fd - ad->startFrameDef < 2))
-        {
-            I_Error("P_InitFTAnims: AnimDef has framecount < 2.");
-        }
-        if (ignore == false)
-        {
-            ad->endFrameDef = fd - 1;
-            ad->currentFrameDef = ad->endFrameDef;
-            ad->tics = 1;       // Force 1st game tic to animate
-            AnimDefCount++;
-            ad++;
-        }
-    }
-    SC_Close();
-}
diff --git a/games/NXDoom/src/hexen/p_ceilng.c b/games/NXDoom/src/hexen/p_ceilng.c
deleted file mode 100644
index dfe0ba66f..000000000
--- a/games/NXDoom/src/hexen/p_ceilng.c
+++ /dev/null
@@ -1,303 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "p_local.h"
-
-//==================================================================
-//==================================================================
-//
-//                                                      CEILINGS
-//
-//==================================================================
-//==================================================================
-
-ceiling_t *activeceilings[MAXCEILINGS];
-
-//==================================================================
-//
-//      T_MoveCeiling
-//
-//==================================================================
-void T_MoveCeiling(thinker_t *thinker)
-{
-    ceiling_t *ceiling = (ceiling_t *) thinker;
-    result_e res;
-
-    switch (ceiling->direction)
-    {
-//              case 0:         // IN STASIS
-//                      break;
-        case 1:                // UP
-            res = T_MovePlane(ceiling->sector, ceiling->speed,
-                              ceiling->topheight, false, 1,
-                              ceiling->direction);
-            if (res == RES_PASTDEST)
-            {
-                SN_StopSequence((mobj_t *) & ceiling->sector->soundorg);
-                switch (ceiling->type)
-                {
-                    case CLEV_CRUSHANDRAISE:
-                        ceiling->direction = -1;
-                        ceiling->speed = ceiling->speed * 2;
-                        break;
-                    default:
-                        P_RemoveActiveCeiling(ceiling);
-                        break;
-                }
-            }
-            break;
-        case -1:               // DOWN
-            res = T_MovePlane(ceiling->sector, ceiling->speed,
-                              ceiling->bottomheight, ceiling->crush, 1,
-                              ceiling->direction);
-            if (res == RES_PASTDEST)
-            {
-                SN_StopSequence((mobj_t *) & ceiling->sector->soundorg);
-                switch (ceiling->type)
-                {
-                    case CLEV_CRUSHANDRAISE:
-                    case CLEV_CRUSHRAISEANDSTAY:
-                        ceiling->direction = 1;
-                        ceiling->speed = ceiling->speed / 2;
-                        break;
-                    default:
-                        P_RemoveActiveCeiling(ceiling);
-                        break;
-                }
-            }
-            else if (res == RES_CRUSHED)
-            {
-                switch (ceiling->type)
-                {
-                    case CLEV_CRUSHANDRAISE:
-                    case CLEV_LOWERANDCRUSH:
-                    case CLEV_CRUSHRAISEANDSTAY:
-                        //ceiling->speed = ceiling->speed/4;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-    }
-}
-
-//==================================================================
-//
-//              EV_DoCeiling
-//              Move a ceiling up/down and all around!
-//
-//==================================================================
-int EV_DoCeiling(line_t * line, byte * arg, ceiling_e type)
-{
-    int secnum, rtn;
-    sector_t *sec;
-    ceiling_t *ceiling;
-
-    secnum = -1;
-    rtn = 0;
-
-/* Old Ceiling stasis code
-	//
-	//      Reactivate in-stasis ceilings...for certain types.
-	//
-	switch(type)
-	{
-		case CLEV_CRUSHANDRAISE:
-			P_ActivateInStasisCeiling(line);
-		default:
-			break;
-	}
-*/
-    while ((secnum = P_FindSectorFromTag(arg[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        //
-        // new door thinker
-        //
-        rtn = 1;
-        ceiling = Z_Malloc(sizeof(*ceiling), PU_LEVSPEC, 0);
-        P_AddThinker(&ceiling->thinker);
-        sec->specialdata = ceiling;
-        ceiling->thinker.function = T_MoveCeiling;
-        ceiling->sector = sec;
-        ceiling->crush = 0;
-        ceiling->speed = arg[1] * (FRACUNIT / 8);
-        switch (type)
-        {
-            case CLEV_CRUSHRAISEANDSTAY:
-                ceiling->crush = arg[2];        // arg[2] = crushing value
-                ceiling->topheight = sec->ceilingheight;
-                ceiling->bottomheight = sec->floorheight + (8 * FRACUNIT);
-                ceiling->direction = -1;
-                break;
-            case CLEV_CRUSHANDRAISE:
-                ceiling->topheight = sec->ceilingheight;
-            case CLEV_LOWERANDCRUSH:
-                ceiling->crush = arg[2];        // arg[2] = crushing value
-            case CLEV_LOWERTOFLOOR:
-                ceiling->bottomheight = sec->floorheight;
-                if (type != CLEV_LOWERTOFLOOR)
-                {
-                    ceiling->bottomheight += 8 * FRACUNIT;
-                }
-                ceiling->direction = -1;
-                break;
-            case CLEV_RAISETOHIGHEST:
-                ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
-                ceiling->direction = 1;
-                break;
-            case CLEV_LOWERBYVALUE:
-                ceiling->bottomheight =
-                    sec->ceilingheight - arg[2] * FRACUNIT;
-                ceiling->direction = -1;
-                break;
-            case CLEV_RAISEBYVALUE:
-                ceiling->topheight = sec->ceilingheight + arg[2] * FRACUNIT;
-                ceiling->direction = 1;
-                break;
-            case CLEV_MOVETOVALUETIMES8:
-                {
-                    int destHeight = arg[2] * FRACUNIT * 8;
-
-                    if (arg[3])
-                    {
-                        destHeight = -destHeight;
-                    }
-                    if (sec->ceilingheight <= destHeight)
-                    {
-                        ceiling->direction = 1;
-                        ceiling->topheight = destHeight;
-                        if (sec->ceilingheight == destHeight)
-                        {
-                            rtn = 0;
-                        }
-                    }
-                    else if (sec->ceilingheight > destHeight)
-                    {
-                        ceiling->direction = -1;
-                        ceiling->bottomheight = destHeight;
-                    }
-                    break;
-                }
-            default:
-                rtn = 0;
-                break;
-        }
-        ceiling->tag = sec->tag;
-        ceiling->type = type;
-        P_AddActiveCeiling(ceiling);
-        if (rtn)
-        {
-            SN_StartSequence((mobj_t *) & ceiling->sector->soundorg,
-                             SEQ_PLATFORM + ceiling->sector->seqType);
-        }
-    }
-    return rtn;
-}
-
-//==================================================================
-//
-//              Add an active ceiling
-//
-//==================================================================
-void P_AddActiveCeiling(ceiling_t * c)
-{
-    int i;
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] == NULL)
-        {
-            activeceilings[i] = c;
-            return;
-        }
-}
-
-//==================================================================
-//
-//              Remove a ceiling's thinker
-//
-//==================================================================
-void P_RemoveActiveCeiling(ceiling_t * c)
-{
-    int i;
-
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] == c)
-        {
-            activeceilings[i]->sector->specialdata = NULL;
-            P_RemoveThinker(&activeceilings[i]->thinker);
-            P_TagFinished(activeceilings[i]->sector->tag);
-            activeceilings[i] = NULL;
-            break;
-        }
-}
-
-#if 0
-//==================================================================
-//
-//              Restart a ceiling that's in-stasis
-//
-//==================================================================
-void P_ActivateInStasisCeiling(line_t * line)
-{
-    int i;
-
-    for (i = 0; i < MAXCEILINGS; i++)
-        if (activeceilings[i] && (activeceilings[i]->tag == line->arg1) &&
-            (activeceilings[i]->direction == 0))
-        {
-            activeceilings[i]->direction = activeceilings[i]->olddirection;
-            activeceilings[i]->thinker.function = T_MoveCeiling;
-            SN_StartSequence((mobj_t *) & activeceilings[i]->sector->soundorg,
-                             SEQ_PLATFORM +
-                             activeceilings[i]->sector->seqType);
-        }
-}
-#endif
-
-//==================================================================
-//
-//              EV_CeilingCrushStop
-//              Stop a ceiling from crushing!
-//
-//==================================================================
-
-int EV_CeilingCrushStop(line_t * line, byte * args)
-{
-    int i;
-    int rtn;
-
-    rtn = 0;
-    for (i = 0; i < MAXCEILINGS; i++)
-    {
-        if (activeceilings[i] && activeceilings[i]->tag == args[0])
-        {
-            rtn = 1;
-            SN_StopSequence((mobj_t *) & activeceilings[i]->sector->soundorg);
-            activeceilings[i]->sector->specialdata = NULL;
-            P_RemoveThinker(&activeceilings[i]->thinker);
-            P_TagFinished(activeceilings[i]->sector->tag);
-            activeceilings[i] = NULL;
-            break;
-        }
-    }
-    return rtn;
-}
diff --git a/games/NXDoom/src/hexen/p_doors.c b/games/NXDoom/src/hexen/p_doors.c
deleted file mode 100644
index eb526f2d5..000000000
--- a/games/NXDoom/src/hexen/p_doors.c
+++ /dev/null
@@ -1,319 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "p_local.h"
-
-//==================================================================
-//==================================================================
-//
-//                                                      VERTICAL DOORS
-//
-//==================================================================
-//==================================================================
-
-//==================================================================
-//
-//      T_VerticalDoor
-//
-//==================================================================
-void T_VerticalDoor(thinker_t *thinker)
-{
-    vldoor_t *door = (vldoor_t *) thinker;
-    result_e res;
-
-    switch (door->direction)
-    {
-        case 0:                // WAITING
-            if (!--door->topcountdown)
-                switch (door->type)
-                {
-                    case DREV_NORMAL:
-                        door->direction = -1;   // time to go back down
-                        SN_StartSequence((mobj_t *) & door->sector->soundorg,
-                                         SEQ_DOOR_STONE +
-                                         door->sector->seqType);
-                        break;
-                    case DREV_CLOSE30THENOPEN:
-                        door->direction = 1;
-                        break;
-                    default:
-                        break;
-                }
-            break;
-        case 2:                // INITIAL WAIT
-            if (!--door->topcountdown)
-            {
-                switch (door->type)
-                {
-                    case DREV_RAISEIN5MINS:
-                        door->direction = 1;
-                        door->type = DREV_NORMAL;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-        case -1:               // DOWN
-            res = T_MovePlane(door->sector, door->speed,
-                              door->sector->floorheight, false, 1,
-                              door->direction);
-            if (res == RES_PASTDEST)
-            {
-                SN_StopSequence((mobj_t *) & door->sector->soundorg);
-                switch (door->type)
-                {
-                    case DREV_NORMAL:
-                    case DREV_CLOSE:
-                        door->sector->specialdata = NULL;
-                        P_TagFinished(door->sector->tag);
-                        P_RemoveThinker(&door->thinker);        // unlink and free
-                        break;
-                    case DREV_CLOSE30THENOPEN:
-                        door->direction = 0;
-                        door->topcountdown = 35 * 30;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            else if (res == RES_CRUSHED)
-            {
-                switch (door->type)
-                {
-                    case DREV_CLOSE:   // DON'T GO BACK UP!
-                        break;
-                    default:
-                        door->direction = 1;
-                        break;
-                }
-            }
-            break;
-        case 1:                // UP
-            res = T_MovePlane(door->sector, door->speed,
-                              door->topheight, false, 1, door->direction);
-            if (res == RES_PASTDEST)
-            {
-                SN_StopSequence((mobj_t *) & door->sector->soundorg);
-                switch (door->type)
-                {
-                    case DREV_NORMAL:
-                        door->direction = 0;    // wait at top
-                        door->topcountdown = door->topwait;
-                        break;
-                    case DREV_CLOSE30THENOPEN:
-                    case DREV_OPEN:
-                        door->sector->specialdata = NULL;
-                        P_TagFinished(door->sector->tag);
-                        P_RemoveThinker(&door->thinker);        // unlink and free
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// EV_DoDoor
-//
-// Move a door up/down
-//
-//----------------------------------------------------------------------------
-
-int EV_DoDoor(line_t * line, byte * args, vldoor_e type)
-{
-    int secnum;
-    int retcode;
-    sector_t *sec;
-    vldoor_t *door;
-    fixed_t speed;
-
-    speed = args[1] * FRACUNIT / 8;
-    secnum = -1;
-    retcode = 0;
-    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-        {
-            continue;
-        }
-        // Add new door thinker
-        retcode = 1;
-        door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-        P_AddThinker(&door->thinker);
-        sec->specialdata = door;
-        door->thinker.function = T_VerticalDoor;
-        door->sector = sec;
-        switch (type)
-        {
-            case DREV_CLOSE:
-                door->topheight = P_FindLowestCeilingSurrounding(sec);
-                door->topheight -= 4 * FRACUNIT;
-                door->direction = -1;
-                break;
-            case DREV_CLOSE30THENOPEN:
-                door->topheight = sec->ceilingheight;
-                door->direction = -1;
-                break;
-            case DREV_NORMAL:
-            case DREV_OPEN:
-                door->direction = 1;
-                door->topheight = P_FindLowestCeilingSurrounding(sec);
-                door->topheight -= 4 * FRACUNIT;
-                break;
-            default:
-                break;
-        }
-        door->type = type;
-        door->speed = speed;
-        door->topwait = args[2];        // line->arg3
-        SN_StartSequence((mobj_t *) & door->sector->soundorg,
-                         SEQ_DOOR_STONE + door->sector->seqType);
-    }
-    return (retcode);
-}
-
-//==================================================================
-//
-//      EV_VerticalDoor : open a door manually, no tag value
-//
-//==================================================================
-boolean EV_VerticalDoor(line_t * line, mobj_t * thing)
-{
-    sector_t *sec;
-    vldoor_t *door;
-    int side;
-
-    side = 0;                   // only front sides can be used
-
-    // if the sector has an active thinker, use it
-    sec = sides[line->sidenum[side ^ 1]].sector;
-    if (sec->specialdata)
-    {
-        return false;
-/*
-		door = sec->specialdata;
-		switch(line->special)
-		{	// only for raise doors
-			case 12:
-			 	if(door->direction == -1)
-			 	{
-			 		door->direction = 1; // go back up
-			 	}
-			 	else
-			 	{
-			 		if(!thing->player)
-			 		{ // Monsters don't close doors
-			 			return;
-			 		}
-			 		door->direction = -1; // start going down immediately
-			 	}
-			 	return;
-		}
-*/
-    }
-    //
-    // new door thinker
-    //
-    door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-    P_AddThinker(&door->thinker);
-    sec->specialdata = door;
-    door->thinker.function = T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 1;
-    switch (line->special)
-    {
-        case 11:
-            door->type = DREV_OPEN;
-            line->special = 0;
-            break;
-        case 12:
-        case 13:
-            door->type = DREV_NORMAL;
-            break;
-        default:
-            door->type = DREV_NORMAL;
-            break;
-    }
-    door->speed = line->arg2 * (FRACUNIT / 8);
-    door->topwait = line->arg3;
-
-    //
-    // find the top and bottom of the movement range
-    //
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4 * FRACUNIT;
-    SN_StartSequence((mobj_t *) & door->sector->soundorg,
-                     SEQ_DOOR_STONE + door->sector->seqType);
-    return true;
-}
-
-//==================================================================
-//
-//      Spawn a door that closes after 30 seconds
-//
-//==================================================================
-
-/*
-void P_SpawnDoorCloseIn30(sector_t *sec)
-{
-	vldoor_t *door;
-
-	door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-	P_AddThinker(&door->thinker);
-	sec->specialdata = door;
-	sec->special = 0;
-	door->thinker.function = T_VerticalDoor;
-	door->sector = sec;
-	door->direction = 0;
-	door->type = DREV_NORMAL;
-	door->speed = VDOORSPEED;
-	door->topcountdown = 30*35;
-}
-*/
-
-//==================================================================
-//
-//      Spawn a door that opens after 5 minutes
-//
-//==================================================================
-
-/*
-void P_SpawnDoorRaiseIn5Mins(sector_t *sec, int secnum)
-{
-	vldoor_t *door;
-
-	door = Z_Malloc(sizeof(*door), PU_LEVSPEC, 0);
-	P_AddThinker(&door->thinker);
-	sec->specialdata = door;
-	sec->special = 0;
-	door->thinker.function = T_VerticalDoor;
-	door->sector = sec;
-	door->direction = 2;
-	door->type = DREV_RAISEIN5MINS;
-	door->speed = VDOORSPEED;
-	door->topheight = P_FindLowestCeilingSurrounding(sec);
-	door->topheight -= 4*FRACUNIT;
-	door->topwait = VDOORWAIT;
-	door->topcountdown = 5*60*35;
-}
-*/
diff --git a/games/NXDoom/src/hexen/p_enemy.c b/games/NXDoom/src/hexen/p_enemy.c
deleted file mode 100644
index fa8d09423..000000000
--- a/games/NXDoom/src/hexen/p_enemy.c
+++ /dev/null
@@ -1,5428 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "i_swap.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// Macros
-// Types
-// Private Data
-// External Data
-
-
-//----------------------------------------------------------------------------
-//
-// PROC P_RecursiveSound
-//
-//----------------------------------------------------------------------------
-
-mobj_t *soundtarget;
-
-void P_RecursiveSound(sector_t * sec, int soundblocks)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-
-    // Wake up all monsters in this sector
-    if (sec->validcount == validcount
-        && sec->soundtraversed <= soundblocks + 1)
-    {                           // Already flooded
-        return;
-    }
-    sec->validcount = validcount;
-    sec->soundtraversed = soundblocks + 1;
-    sec->soundtarget = soundtarget;
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        if (!(check->flags & ML_TWOSIDED))
-        {
-            continue;
-        }
-        P_LineOpening(check);
-        if (openrange <= 0)
-        {                       // Closed door
-            continue;
-        }
-        if (sides[check->sidenum[0]].sector == sec)
-        {
-            other = sides[check->sidenum[1]].sector;
-        }
-        else
-        {
-            other = sides[check->sidenum[0]].sector;
-        }
-        if (check->flags & ML_SOUNDBLOCK)
-        {
-            if (!soundblocks)
-            {
-                P_RecursiveSound(other, 1);
-            }
-        }
-        else
-        {
-            P_RecursiveSound(other, soundblocks);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_NoiseAlert
-//
-// If a monster yells at a player, it will alert other monsters to the
-// player.
-//
-//----------------------------------------------------------------------------
-
-void P_NoiseAlert(mobj_t * target, mobj_t * emmiter)
-{
-    soundtarget = target;
-    validcount++;
-    P_RecursiveSound(emmiter->subsector->sector, 0);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_CheckMeleeRange
-//
-//----------------------------------------------------------------------------
-
-boolean P_CheckMeleeRange(mobj_t * actor)
-{
-    mobj_t *mo;
-    fixed_t dist;
-
-    if (!actor->target)
-    {
-        return (false);
-    }
-    mo = actor->target;
-    dist = P_AproxDistance(mo->x - actor->x, mo->y - actor->y);
-    if (dist >= MELEERANGE)
-    {
-        return (false);
-    }
-    if (!P_CheckSight(actor, mo))
-    {
-        return (false);
-    }
-    if (mo->z > actor->z + actor->height)
-    {                           // Target is higher than the attacker
-        return (false);
-    }
-    else if (actor->z > mo->z + mo->height)
-    {                           // Attacker is higher
-        return (false);
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_CheckMeleeRange2
-//
-//----------------------------------------------------------------------------
-
-boolean P_CheckMeleeRange2(mobj_t * actor)
-{
-    mobj_t *mo;
-    fixed_t dist;
-
-    if (!actor->target)
-    {
-        return (false);
-    }
-    mo = actor->target;
-    dist = P_AproxDistance(mo->x - actor->x, mo->y - actor->y);
-    if (dist >= MELEERANGE * 2 || dist < MELEERANGE)
-    {
-        return (false);
-    }
-    if (!P_CheckSight(actor, mo))
-    {
-        return (false);
-    }
-    if (mo->z > actor->z + actor->height)
-    {                           // Target is higher than the attacker
-        return (false);
-    }
-    else if (actor->z > mo->z + mo->height)
-    {                           // Attacker is higher
-        return (false);
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_CheckMissileRange
-//
-//----------------------------------------------------------------------------
-
-boolean P_CheckMissileRange(mobj_t * actor)
-{
-    fixed_t dist;
-
-    if (!P_CheckSight(actor, actor->target))
-    {
-        return (false);
-    }
-    if (actor->flags & MF_JUSTHIT)
-    {                           // The target just hit the enemy, so fight back!
-        actor->flags &= ~MF_JUSTHIT;
-        return (true);
-    }
-    if (actor->reactiontime)
-    {                           // Don't attack yet
-        return (false);
-    }
-    dist = (P_AproxDistance(actor->x - actor->target->x,
-                            actor->y - actor->target->y) >> FRACBITS) - 64;
-    if (!actor->info->meleestate)
-    {                           // No melee attack, so fire more frequently
-        dist -= 128;
-    }
-    if (dist > 200)
-    {
-        dist = 200;
-    }
-    if (P_Random() < dist)
-    {
-        return (false);
-    }
-    return (true);
-}
-
-/*
-================
-=
-= P_Move
-=
-= Move in the current direction
-= returns false if the move is blocked
-================
-*/
-
-fixed_t xspeed[8] =
-    { FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000, 0, 47000 };
-fixed_t yspeed[8] =
-    { 0, 47000, FRACUNIT, 47000, 0, -47000, -FRACUNIT, -47000 };
-
-
-boolean P_Move(mobj_t * actor)
-{
-    fixed_t tryx, tryy;
-    line_t *ld;
-    boolean good;
-
-    if (actor->flags2 & MF2_BLASTED)
-        return (true);
-    if (actor->movedir == DI_NODIR)
-    {
-        return (false);
-    }
-    tryx = actor->x + actor->info->speed * xspeed[actor->movedir];
-    tryy = actor->y + actor->info->speed * yspeed[actor->movedir];
-    if (!P_TryMove(actor, tryx, tryy))
-    {                           // open any specials
-        if (actor->flags & MF_FLOAT && floatok)
-        {                       // must adjust height
-            if (actor->z < tmfloorz)
-            {
-                actor->z += FLOATSPEED;
-            }
-            else
-            {
-                actor->z -= FLOATSPEED;
-            }
-            actor->flags |= MF_INFLOAT;
-            return (true);
-        }
-        if (!numspechit)
-        {
-            return false;
-        }
-        actor->movedir = DI_NODIR;
-        good = false;
-        while (numspechit--)
-        {
-            ld = spechit[numspechit];
-            // if the special isn't a door that can be opened, return false
-            if (P_ActivateLine(ld, actor, 0, SPAC_USE))
-            {
-                good = true;
-            }
-/* Old version before use/cross/impact specials were combined
-			if(P_UseSpecialLine(actor, ld))
-			{
-				good = true;
-			}
-*/
-        }
-        return (good);
-    }
-    else
-    {
-        actor->flags &= ~MF_INFLOAT;
-    }
-    if (!(actor->flags & MF_FLOAT))
-    {
-        if (actor->z > actor->floorz)
-        {
-            P_HitFloor(actor);
-        }
-        actor->z = actor->floorz;
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_TryWalk
-//
-// Attempts to move actor in its current (ob->moveangle) direction.
-// If blocked by either a wall or an actor returns FALSE.
-// If move is either clear of block only by a door, returns TRUE and sets.
-// If a door is in the way, an OpenDoor call is made to start it opening.
-//
-//----------------------------------------------------------------------------
-
-boolean P_TryWalk(mobj_t * actor)
-{
-    if (!P_Move(actor))
-    {
-        return (false);
-    }
-    actor->movecount = P_Random() & 15;
-    return (true);
-}
-
-/*
-================
-=
-= P_NewChaseDir
-=
-================
-*/
-
-dirtype_t opposite[] =
-    { DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST, DI_EAST, DI_NORTHEAST,
-    DI_NORTH, DI_NORTHWEST, DI_NODIR
-};
-
-dirtype_t diags[] =
-    { DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST };
-
-void P_NewChaseDir(mobj_t * actor)
-{
-    fixed_t deltax, deltay;
-    dirtype_t d[3];
-    dirtype_t tdir, olddir, turnaround;
-
-    if (!actor->target)
-        I_Error("P_NewChaseDir: called with no target");
-
-    olddir = actor->movedir;
-    turnaround = opposite[olddir];
-
-    deltax = actor->target->x - actor->x;
-    deltay = actor->target->y - actor->y;
-    if (deltax > 10 * FRACUNIT)
-        d[1] = DI_EAST;
-    else if (deltax < -10 * FRACUNIT)
-        d[1] = DI_WEST;
-    else
-        d[1] = DI_NODIR;
-    if (deltay < -10 * FRACUNIT)
-        d[2] = DI_SOUTH;
-    else if (deltay > 10 * FRACUNIT)
-        d[2] = DI_NORTH;
-    else
-        d[2] = DI_NODIR;
-
-// try direct route
-    if (d[1] != DI_NODIR && d[2] != DI_NODIR)
-    {
-        actor->movedir = diags[((deltay < 0) << 1) + (deltax > 0)];
-        if (actor->movedir != turnaround && P_TryWalk(actor))
-            return;
-    }
-
-// try other directions
-    if (P_Random() > 200 || abs(deltay) > abs(deltax))
-    {
-        tdir = d[1];
-        d[1] = d[2];
-        d[2] = tdir;
-    }
-
-    if (d[1] == turnaround)
-        d[1] = DI_NODIR;
-    if (d[2] == turnaround)
-        d[2] = DI_NODIR;
-
-    if (d[1] != DI_NODIR)
-    {
-        actor->movedir = d[1];
-        if (P_TryWalk(actor))
-            return;             /*either moved forward or attacked */
-    }
-
-    if (d[2] != DI_NODIR)
-    {
-        actor->movedir = d[2];
-        if (P_TryWalk(actor))
-            return;
-    }
-
-/* there is no direct path to the player, so pick another direction */
-
-    if (olddir != DI_NODIR)
-    {
-        actor->movedir = olddir;
-        if (P_TryWalk(actor))
-            return;
-    }
-
-    if (P_Random() & 1)         /*randomly determine direction of search */
-    {
-        for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
-        {
-            if (tdir != turnaround)
-            {
-                actor->movedir = tdir;
-                if (P_TryWalk(actor))
-                    return;
-            }
-        }
-    }
-    else
-    {
-        tdir = DI_SOUTHEAST;
-
-        for (;;)
-        {
-            if (tdir != turnaround)
-            {
-                actor->movedir = tdir;
-                if (P_TryWalk(actor))
-                    return;
-            }
-
-            if (tdir == DI_EAST)
-            {
-                break;
-            }
-
-            --tdir;
-        }
-    }
-
-    if (turnaround != DI_NODIR)
-    {
-        actor->movedir = turnaround;
-        if (P_TryWalk(actor))
-            return;
-    }
-
-    actor->movedir = DI_NODIR;  // can't move
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_LookForMonsters
-//
-//---------------------------------------------------------------------------
-
-#define MONS_LOOK_RANGE (16*64*FRACUNIT)
-#define MONS_LOOK_LIMIT 64
-
-boolean P_LookForMonsters(mobj_t * actor)
-{
-    int count;
-    mobj_t *mo;
-    thinker_t *think;
-
-    if (!P_CheckSight(players[0].mo, actor))
-    {                           // Player can't see monster
-        return (false);
-    }
-    count = 0;
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-        if (!(mo->flags & MF_COUNTKILL) || (mo == actor) || (mo->health <= 0))
-        {                       // Not a valid monster
-            continue;
-        }
-        if (P_AproxDistance(actor->x - mo->x, actor->y - mo->y)
-            > MONS_LOOK_RANGE)
-        {                       // Out of range
-            continue;
-        }
-        if (P_Random() < 16)
-        {                       // Skip
-            continue;
-        }
-        if (count++ > MONS_LOOK_LIMIT)
-        {                       // Stop searching
-            return (false);
-        }
-        if (!P_CheckSight(actor, mo))
-        {                       // Out of sight
-            continue;
-        }
-        if (actor->type == MT_MINOTAUR)
-        {
-            if ((mo->type == MT_MINOTAUR) &&
-                (mo->target != actor->special1.p->mo))
-            {
-                continue;
-            }
-        }
-        // Found a target monster
-        actor->target = mo;
-        return (true);
-    }
-    return (false);
-}
-
-/*
-================
-=
-= P_LookForPlayers
-=
-= If allaround is false, only look 180 degrees in front
-= returns true if a player is targeted
-================
-*/
-
-boolean P_LookForPlayers(mobj_t * actor, boolean allaround)
-{
-    int c;
-    int stop;
-    player_t *player;
-    angle_t an;
-    fixed_t dist;
-    int consecutive_missing = 0; // for breaking infinite loop
-
-    if (!netgame && players[0].health <= 0)
-    {                           // Single player game and player is dead, look for monsters
-        return (P_LookForMonsters(actor));
-    }
-    c = 0;
-
-    // The 3 below is probably a mistake (it should be MAXPLAYERS - 1, or 7)
-    // and in vanilla this can potentially cause an infinite loop in
-    // multiplayer. Unfortunately we can't correct the mistake - doing so will
-    // cause desyncs. Upon spawning, each enemy's lastlook is initialized to a
-    // random value between 0 and 7 (i.e MAXPLAYERS - 1). There's a chance
-    // that the first call of this function for that enemy will return early
-    // courtesy of the actor->lastlook == stop condition. In a single-player
-    // game this occurs when (actor->lastlook - 1) & 3 equals 0, or when
-    // lastlook equals 1 or 5.
-
-    // If you use MAXPLAYERS - 1, it has the side effect of altering which
-    // enemies are affected by an early actor->lastlook == stop return. Now it
-    // happens when (actor->lastlook - 1) & 7 equals 0, or when lastlook equals
-    // 1, *not* 1 and 5 as above.
-
-    stop = (actor->lastlook - 1) & 3;
-    for (;; actor->lastlook = (actor->lastlook + 1) & 3)
-    {
-        if (!playeringame[actor->lastlook])
-        {
-            // Break the vanilla infinite loop here. It can occur if there are
-            // > 4 players and players 0 - 3 all quit the game. Error out
-            // instead.
-            if (consecutive_missing == 4)
-            {
-                I_Error("P_LookForPlayers: No player 1 - 4.\n");
-            }
-            consecutive_missing++;
-            continue;
-        }
-
-        consecutive_missing = 0;
-
-        if (c++ == 2 || actor->lastlook == stop)
-            return false;       // done looking
-
-        player = &players[actor->lastlook];
-        if (player->health <= 0)
-            continue;           // dead
-        if (!P_CheckSight(actor, player->mo))
-            continue;           // out of sight
-
-        if (!allaround)
-        {
-            an = R_PointToAngle2(actor->x, actor->y,
-                                 player->mo->x, player->mo->y) - actor->angle;
-            if (an > ANG90 && an < ANG270)
-            {
-                dist = P_AproxDistance(player->mo->x - actor->x,
-                                       player->mo->y - actor->y);
-                // if real close, react anyway
-                if (dist > MELEERANGE)
-                    continue;   // behind back
-            }
-        }
-        if (player->mo->flags & MF_SHADOW)
-        {                       // Player is invisible
-            if ((P_AproxDistance(player->mo->x - actor->x,
-                                 player->mo->y - actor->y) > 2 * MELEERANGE)
-                && P_AproxDistance(player->mo->momx, player->mo->momy)
-                < 5 * FRACUNIT)
-            {                   // Player is sneaking - can't detect
-                return (false);
-            }
-            if (P_Random() < 225)
-            {                   // Player isn't sneaking, but still didn't detect
-                return (false);
-            }
-        }
-        if (actor->type == MT_MINOTAUR)
-        {
-            if (actor->special1.p == player)
-            {
-                continue;       // Don't target master
-            }
-        }
-
-        actor->target = player->mo;
-        return (true);
-    }
-    return (false);
-}
-
-/*
-===============================================================================
-
-						ACTION ROUTINES
-
-===============================================================================
-*/
-
-/*
-==============
-=
-= A_Look
-=
-= Stay in state until a player is sighted
-=
-==============
-*/
-
-void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *targ;
-
-    actor->threshold = 0;       // any shot will wake up
-    targ = actor->subsector->sector->soundtarget;
-    if (targ && (targ->flags & MF_SHOOTABLE))
-    {
-        actor->target = targ;
-        if (actor->flags & MF_AMBUSH)
-        {
-            if (P_CheckSight(actor, actor->target))
-                goto seeyou;
-        }
-        else
-            goto seeyou;
-    }
-
-
-    if (!P_LookForPlayers(actor, false))
-        return;
-
-// go into chase state
-  seeyou:
-    if (actor->info->seesound)
-    {
-        int sound;
-
-        sound = actor->info->seesound;
-        if (actor->flags2 & MF2_BOSS)
-        {                       // Full volume
-            S_StartSound(NULL, sound);
-        }
-        else
-        {
-            S_StartSound(actor, sound);
-        }
-    }
-    P_SetMobjState(actor, actor->info->seestate);
-}
-
-
-/*
-==============
-=
-= A_Chase
-=
-= Actor has a melee attack, so it tries to close as fast as possible
-=
-==============
-*/
-
-void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int delta;
-
-    if (actor->reactiontime)
-    {
-        actor->reactiontime--;
-    }
-
-    // Modify target threshold
-    if (actor->threshold)
-    {
-        actor->threshold--;
-    }
-
-    if (gameskill == sk_nightmare)
-    {                           // Monsters move faster in nightmare mode
-        actor->tics -= actor->tics / 2;
-        if (actor->tics < 3)
-        {
-            actor->tics = 3;
-        }
-    }
-
-//
-// turn towards movement direction if not there yet
-//
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-        delta = actor->angle - (actor->movedir << 29);
-        if (delta > 0)
-        {
-            actor->angle -= ANG90 / 2;
-        }
-        else if (delta < 0)
-        {
-            actor->angle += ANG90 / 2;
-        }
-    }
-
-    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
-    {                           // look for a new target
-        if (P_LookForPlayers(actor, true))
-        {                       // got a new target
-            return;
-        }
-        P_SetMobjState(actor, actor->info->spawnstate);
-        return;
-    }
-
-//
-// don't attack twice in a row
-//
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-        if (gameskill != sk_nightmare)
-            P_NewChaseDir(actor);
-        return;
-    }
-
-//
-// check for melee attack
-//
-    if (actor->info->meleestate && P_CheckMeleeRange(actor))
-    {
-        if (actor->info->attacksound)
-        {
-            S_StartSound(actor, actor->info->attacksound);
-        }
-        P_SetMobjState(actor, actor->info->meleestate);
-        return;
-    }
-
-//
-// check for missile attack
-//
-    if (actor->info->missilestate)
-    {
-        if (gameskill < sk_nightmare && actor->movecount)
-            goto nomissile;
-        if (!P_CheckMissileRange(actor))
-            goto nomissile;
-        P_SetMobjState(actor, actor->info->missilestate);
-        actor->flags |= MF_JUSTATTACKED;
-        return;
-    }
-  nomissile:
-
-//
-// possibly choose another target
-//
-    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
-    {
-        if (P_LookForPlayers(actor, true))
-            return;             // got a new target
-    }
-
-//
-// chase towards player
-//
-    if (--actor->movecount < 0 || !P_Move(actor))
-    {
-        P_NewChaseDir(actor);
-    }
-
-//
-// make active sound
-//
-    if (actor->info->activesound && P_Random() < 3)
-    {
-        if (actor->type == MT_BISHOP && P_Random() < 128)
-        {
-            S_StartSound(actor, actor->info->seesound);
-        }
-        else if (actor->type == MT_PIG)
-        {
-            S_StartSound(actor, SFX_PIG_ACTIVE1 + (P_Random() & 1));
-        }
-        else if (actor->flags2 & MF2_BOSS)
-        {
-            S_StartSound(NULL, actor->info->activesound);
-        }
-        else
-        {
-            S_StartSound(actor, actor->info->activesound);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FaceTarget
-//
-//----------------------------------------------------------------------------
-
-void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    actor->flags &= ~MF_AMBUSH;
-    actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x,
-                                   actor->target->y);
-    if (actor->target->flags & MF_SHADOW)
-    {                           // Target is a ghost
-        actor->angle += P_SubRandom() << 21;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Pain
-//
-//----------------------------------------------------------------------------
-
-void A_Pain(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->info->painsound)
-    {
-        S_StartSound(actor, actor->info->painsound);
-    }
-}
-
-//============================================================================
-//
-// A_SetInvulnerable
-//
-//============================================================================
-
-void A_SetInvulnerable(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 |= MF2_INVULNERABLE;
-}
-
-//============================================================================
-//
-// A_UnSetInvulnerable
-//
-//============================================================================
-
-void A_UnSetInvulnerable(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 &= ~MF2_INVULNERABLE;
-}
-
-//============================================================================
-//
-// A_SetReflective
-//
-//============================================================================
-
-void A_SetReflective(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 |= MF2_REFLECTIVE;
-
-    if ((actor->type == MT_CENTAUR) || (actor->type == MT_CENTAURLEADER))
-    {
-        A_SetInvulnerable(actor, player, psp);
-    }
-}
-
-//============================================================================
-//
-// A_UnSetReflective
-//
-//============================================================================
-
-void A_UnSetReflective(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 &= ~MF2_REFLECTIVE;
-
-    if ((actor->type == MT_CENTAUR) || (actor->type == MT_CENTAURLEADER))
-    {
-        A_UnSetInvulnerable(actor, player, psp);
-    }
-}
-
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_UpdateMorphedMonster
-//
-// Returns true if the pig morphs.
-//
-//----------------------------------------------------------------------------
-
-boolean P_UpdateMorphedMonster(mobj_t * actor, int tics)
-{
-    mobj_t *fog;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    mobjtype_t moType;
-    mobj_t *mo;
-    mobj_t oldMonster;
-
-    actor->special1.i -= tics;
-    if (actor->special1.i > 0)
-    {
-        return (false);
-    }
-    moType = actor->special2.i;
-    switch (moType)
-    {
-        case MT_WRAITHB:       // These must remain morphed
-        case MT_SERPENT:
-        case MT_SERPENTLEADER:
-        case MT_MINOTAUR:
-            return (false);
-        default:
-            break;
-    }
-    x = actor->x;
-    y = actor->y;
-    z = actor->z;
-    oldMonster = *actor;        // Save pig vars
-
-    P_RemoveMobjFromTIDList(actor);
-    P_SetMobjState(actor, S_FREETARGMOBJ);
-    mo = P_SpawnMobj(x, y, z, moType);
-
-    if (P_TestMobjLocation(mo) == false)
-    {                           // Didn't fit
-        P_RemoveMobj(mo);
-        mo = P_SpawnMobj(x, y, z, oldMonster.type);
-        mo->angle = oldMonster.angle;
-        mo->flags = oldMonster.flags;
-        mo->health = oldMonster.health;
-        mo->target = oldMonster.target;
-        mo->special = oldMonster.special;
-        mo->special1.i = 5 * 35;  // Next try in 5 seconds
-        mo->special2.i = moType;
-        mo->tid = oldMonster.tid;
-        memcpy(mo->args, oldMonster.args, 5);
-        P_InsertMobjIntoTIDList(mo, oldMonster.tid);
-        return (false);
-    }
-    mo->angle = oldMonster.angle;
-    mo->target = oldMonster.target;
-    mo->tid = oldMonster.tid;
-    mo->special = oldMonster.special;
-    memcpy(mo->args, oldMonster.args, 5);
-    P_InsertMobjIntoTIDList(mo, oldMonster.tid);
-    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, SFX_TELEPORT);
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_PigLook
-//
-//----------------------------------------------------------------------------
-
-void A_PigLook(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateMorphedMonster(actor, 10))
-    {
-        return;
-    }
-    A_Look(actor, player, psp);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_PigChase
-//
-//----------------------------------------------------------------------------
-
-void A_PigChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateMorphedMonster(actor, 3))
-    {
-        return;
-    }
-    A_Chase(actor, player, psp);
-}
-
-//============================================================================
-//
-// A_PigAttack
-//
-//============================================================================
-
-void A_PigAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_UpdateMorphedMonster(actor, 18))
-    {
-        return;
-    }
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, 2 + (P_Random() & 1));
-        S_StartSound(actor, SFX_PIG_ATTACK);
-    }
-}
-
-//============================================================================
-//
-// A_PigPain
-//
-//============================================================================
-
-void A_PigPain(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_Pain(actor, player, psp);
-    if (actor->z <= actor->floorz)
-    {
-        actor->momz = 3.5 * FRACUNIT;
-    }
-}
-
-
-
-void FaceMovementDirection(mobj_t * actor)
-{
-    switch (actor->movedir)
-    {
-        case DI_EAST:
-            actor->angle = 0u << 24;
-            break;
-        case DI_NORTHEAST:
-            actor->angle = 32u << 24;
-            break;
-        case DI_NORTH:
-            actor->angle = 64u << 24;
-            break;
-        case DI_NORTHWEST:
-            actor->angle = 96u << 24;
-            break;
-        case DI_WEST:
-            actor->angle = 128u << 24;
-            break;
-        case DI_SOUTHWEST:
-            actor->angle = 160u << 24;
-            break;
-        case DI_SOUTH:
-            actor->angle = 192u << 24;
-            break;
-        case DI_SOUTHEAST:
-            actor->angle = 224u << 24;
-            break;
-    }
-}
-
-
-//----------------------------------------------------------------------------
-//
-// Minotaur variables
-//
-//      special1                pointer to player that spawned it (mobj_t)
-//      special2                internal to minotaur AI
-//      args[0]                 args[0]-args[3] together make up minotaur start time
-//      args[1]                 |
-//      args[2]                 |
-//      args[3]                 V
-//      args[4]                 charge duration countdown
-//----------------------------------------------------------------------------
-
-void A_MinotaurFade0(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_ALTSHADOW;
-    actor->flags |= MF_SHADOW;
-}
-
-void A_MinotaurFade1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    // Second level of transparency
-    actor->flags &= ~MF_SHADOW;
-    actor->flags |= MF_ALTSHADOW;
-}
-
-void A_MinotaurFade2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    // Make fully visible
-    actor->flags &= ~MF_SHADOW;
-    actor->flags &= ~MF_ALTSHADOW;
-}
-
-
-//----------------------------------------------------------------------------
-//
-// A_MinotaurRoam - 
-//
-// 
-//----------------------------------------------------------------------------
-
-
-// Check the age of the minotaur and stomp it after MAULATORTICS of time
-// have passed. Returns false if killed.
-static boolean CheckMinotaurAge(mobj_t *mo)
-{
-    unsigned int starttime;
-
-    // The start time is stored in the mobj_t structure, but it is stored
-    // in little endian format. For Vanilla savegame compatibility we must
-    // swap it to the native endianness.
-    memcpy(&starttime, mo->args, sizeof(unsigned int));
-
-    if (leveltime - LONG(starttime) >= MAULATORTICS)
-    {
-        P_DamageMobj(mo, NULL, NULL, 10000);
-        return false;
-    }
-
-    return true;
-}
-
-void A_MinotaurRoam(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SHADOW; // In case pain caused him to 
-    actor->flags &= ~MF_ALTSHADOW;      // skip his fade in.
-
-    if (!CheckMinotaurAge(actor))
-    {
-        return;
-    }
-
-    if (P_Random() < 30)
-        A_MinotaurLook(actor, player, psp);  // adjust to closest target
-
-    if (P_Random() < 6)
-    {
-        //Choose new direction
-        actor->movedir = P_Random() % 8;
-        FaceMovementDirection(actor);
-    }
-    if (!P_Move(actor))
-    {
-        // Turn
-        if (P_Random() & 1)
-            actor->movedir = (actor->movedir + 1) % 8;
-        else
-            actor->movedir = (actor->movedir + 7) % 8;
-        FaceMovementDirection(actor);
-    }
-}
-
-
-//----------------------------------------------------------------------------
-//
-//      PROC A_MinotaurLook
-//
-// Look for enemy of player
-//----------------------------------------------------------------------------
-#define MINOTAUR_LOOK_DIST		(16*54*FRACUNIT)
-
-void A_MinotaurLook(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    mobj_t *mo = NULL;
-    player_t *player;
-    thinker_t *think;
-    fixed_t dist;
-    int i;
-    mobj_t *master = actor->special1.m;
-
-    actor->target = NULL;
-    if (deathmatch)             // Quick search for players
-    {
-        for (i = 0; i < maxplayers; i++)
-        {
-            if (!playeringame[i])
-                continue;
-            player = &players[i];
-            mo = player->mo;
-            if (mo == master)
-                continue;
-            if (mo->health <= 0)
-                continue;
-            dist = P_AproxDistance(actor->x - mo->x, actor->y - mo->y);
-            if (dist > MINOTAUR_LOOK_DIST)
-                continue;
-            actor->target = mo;
-            break;
-        }
-    }
-
-    if (!actor->target)         // Near player monster search
-    {
-        if (master && (master->health > 0) && (master->player))
-            mo = P_RoughMonsterSearch(master, 20);
-        else
-            mo = P_RoughMonsterSearch(actor, 20);
-        actor->target = mo;
-    }
-
-    if (!actor->target)         // Normal monster search
-    {
-        for (think = thinkercap.next; think != &thinkercap;
-             think = think->next)
-        {
-            if (think->function != P_MobjThinker)
-                continue;
-            mo = (mobj_t *) think;
-            if (!(mo->flags & MF_COUNTKILL))
-                continue;
-            if (mo->health <= 0)
-                continue;
-            if (!(mo->flags & MF_SHOOTABLE))
-                continue;
-            dist = P_AproxDistance(actor->x - mo->x, actor->y - mo->y);
-            if (dist > MINOTAUR_LOOK_DIST)
-                continue;
-            if ((mo == master) || (mo == actor))
-                continue;
-            if ((mo->type == MT_MINOTAUR) &&
-                (mo->special1.m == actor->special1.m))
-                continue;
-            actor->target = mo;
-            break;              // Found mobj to attack
-        }
-    }
-
-    if (actor->target)
-    {
-        P_SetMobjStateNF(actor, S_MNTR_WALK1);
-    }
-    else
-    {
-        P_SetMobjStateNF(actor, S_MNTR_ROAM1);
-    }
-}
-
-
-
-
-void A_MinotaurChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SHADOW; // In case pain caused him to 
-    actor->flags &= ~MF_ALTSHADOW;      // skip his fade in.
-
-    if (!CheckMinotaurAge(actor))
-    {
-        return;
-    }
-
-    if (P_Random() < 30)
-        A_MinotaurLook(actor, player, psp);  // adjust to closest target
-
-    if (!actor->target || (actor->target->health <= 0) ||
-        !(actor->target->flags & MF_SHOOTABLE))
-    {                           // look for a new target
-        P_SetMobjState(actor, S_MNTR_LOOK1);
-        return;
-    }
-
-    FaceMovementDirection(actor);
-    actor->reactiontime = 0;
-
-    // Melee attack
-    if (actor->info->meleestate && P_CheckMeleeRange(actor))
-    {
-        if (actor->info->attacksound)
-        {
-            S_StartSound(actor, actor->info->attacksound);
-        }
-        P_SetMobjState(actor, actor->info->meleestate);
-        return;
-    }
-
-    // Missile attack
-    if (actor->info->missilestate && P_CheckMissileRange(actor))
-    {
-        P_SetMobjState(actor, actor->info->missilestate);
-        return;
-    }
-
-    // chase towards target
-    if (!P_Move(actor))
-    {
-        P_NewChaseDir(actor);
-    }
-
-    // Active sound
-    if (actor->info->activesound && P_Random() < 6)
-    {
-        S_StartSound(actor, actor->info->activesound);
-    }
-
-}
-
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurAtk1
-//
-// Melee attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurAtk1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-        return;
-
-    S_StartSound(actor, SFX_MAULATOR_HAMMER_SWING);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurDecide
-//
-// Choose a missile attack.
-//
-//----------------------------------------------------------------------------
-
-#define MNTR_CHARGE_SPEED (23*FRACUNIT)
-
-void A_MinotaurDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    mobj_t *target = actor->target;
-    int dist;
-
-    if (!target)
-        return;
-    dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
-
-    if (target->z + target->height > actor->z
-        && target->z + target->height < actor->z + actor->height
-        && dist < 16 * 64 * FRACUNIT
-        && dist > 1 * 64 * FRACUNIT && P_Random() < 230)
-    {                           // Charge attack
-        // Don't call the state function right away
-        P_SetMobjStateNF(actor, S_MNTR_ATK4_1);
-        actor->flags |= MF_SKULLFLY;
-        A_FaceTarget(actor, player, psp);
-        angle = actor->angle >> ANGLETOFINESHIFT;
-        actor->momx = FixedMul(MNTR_CHARGE_SPEED, finecosine[angle]);
-        actor->momy = FixedMul(MNTR_CHARGE_SPEED, finesine[angle]);
-        actor->args[4] = 35 / 2;        // Charge duration
-    }
-    else if (target->z == target->floorz
-             && dist < 9 * 64 * FRACUNIT && P_Random() < 100)
-    {                           // Floor fire attack
-        P_SetMobjState(actor, S_MNTR_ATK3_1);
-        actor->special2.i = 0;
-    }
-    else
-    {                           // Swing attack
-        A_FaceTarget(actor, player, psp);
-        // Don't need to call P_SetMobjState because the current state
-        // falls through to the swing attack
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurCharge
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurCharge(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *puff;
-
-    if (!actor->target)
-        return;
-
-    if (actor->args[4] > 0)
-    {
-        puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PUNCHPUFF);
-        puff->momz = 2 * FRACUNIT;
-        actor->args[4]--;
-    }
-    else
-    {
-        actor->flags &= ~MF_SKULLFLY;
-        P_SetMobjState(actor, actor->info->seestate);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurAtk2
-//
-// Swing attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurAtk2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-    fixed_t momz;
-
-    if (!actor->target)
-        return;
-
-    S_StartSound(actor, SFX_MAULATOR_HAMMER_SWING);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
-        return;
-    }
-    mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX1);
-    if (mo)
-    {
-        //S_StartSound(mo, sfx_minat2);
-        momz = mo->momz;
-        angle = mo->angle;
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 8), momz);
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 8), momz);
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle - (ANG45 / 16), momz);
-        P_SpawnMissileAngle(actor, MT_MNTRFX1, angle + (ANG45 / 16), momz);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MinotaurAtk3
-//
-// Floor fire attack.
-//
-//----------------------------------------------------------------------------
-
-void A_MinotaurAtk3(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    mobj_t *mo;
-    player_t *player;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(3));
-        if ((player = actor->target->player) != NULL)
-        {                       // Squish the player
-            player->deltaviewheight = -16 * FRACUNIT;
-        }
-    }
-    else
-    {
-        mo = P_SpawnMissile(actor, actor->target, MT_MNTRFX2);
-        if (mo != NULL)
-        {
-            S_StartSound(mo, SFX_MAULATOR_HAMMER_HIT);
-        }
-    }
-    if (P_Random() < 192 && actor->special2.i == 0)
-    {
-        P_SetMobjState(actor, S_MNTR_ATK3_4);
-        actor->special2.i = 1;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_MntrFloorFire
-//
-//----------------------------------------------------------------------------
-
-void A_MntrFloorFire(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1, r2;
-
-    r1 = P_SubRandom();
-    r2 = P_SubRandom();
-
-    actor->z = actor->floorz;
-    mo = P_SpawnMobj(actor->x + (r2 << 10),
-                     actor->y + (r1 << 10), ONFLOORZ,
-                     MT_MNTRFX3);
-    mo->target = actor->target;
-    mo->momx = 1;               // Force block checking
-    P_CheckMissileSpawn(mo);
-}
-
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Scream
-//
-//----------------------------------------------------------------------------
-
-void A_Scream(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int sound;
-
-    S_StopSound(actor);
-    if (actor->player)
-    {
-        if (actor->player->morphTics)
-        {
-            S_StartSound(actor, actor->info->deathsound);
-        }
-        else
-        {
-            // Handle the different player death screams
-            if (actor->momz <= -39 * FRACUNIT)
-            {                   // Falling splat
-                sound = SFX_PLAYER_FALLING_SPLAT;
-            }
-            else if (actor->health > -50)
-            {                   // Normal death sound
-                switch (actor->player->class)
-                {
-                    case PCLASS_FIGHTER:
-                        sound = SFX_PLAYER_FIGHTER_NORMAL_DEATH;
-                        break;
-                    case PCLASS_CLERIC:
-                        sound = SFX_PLAYER_CLERIC_NORMAL_DEATH;
-                        break;
-                    case PCLASS_MAGE:
-                        sound = SFX_PLAYER_MAGE_NORMAL_DEATH;
-                        break;
-                    default:
-                        sound = SFX_NONE;
-                        break;
-                }
-            }
-            else if (actor->health > -100)
-            {                   // Crazy death sound
-                switch (actor->player->class)
-                {
-                    case PCLASS_FIGHTER:
-                        sound = SFX_PLAYER_FIGHTER_CRAZY_DEATH;
-                        break;
-                    case PCLASS_CLERIC:
-                        sound = SFX_PLAYER_CLERIC_CRAZY_DEATH;
-                        break;
-                    case PCLASS_MAGE:
-                        sound = SFX_PLAYER_MAGE_CRAZY_DEATH;
-                        break;
-                    default:
-                        sound = SFX_NONE;
-                        break;
-                }
-            }
-            else
-            {                   // Extreme death sound
-                switch (actor->player->class)
-                {
-                    case PCLASS_FIGHTER:
-                        sound = SFX_PLAYER_FIGHTER_EXTREME1_DEATH;
-                        break;
-                    case PCLASS_CLERIC:
-                        sound = SFX_PLAYER_CLERIC_EXTREME1_DEATH;
-                        break;
-                    case PCLASS_MAGE:
-                        sound = SFX_PLAYER_MAGE_EXTREME1_DEATH;
-                        break;
-                    default:
-                        sound = SFX_NONE;
-                        break;
-                }
-                sound += P_Random() % 3;        // Three different extreme deaths
-            }
-            S_StartSound(actor, sound);
-        }
-    }
-    else
-    {
-        S_StartSound(actor, actor->info->deathsound);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_DropItem
-//
-//---------------------------------------------------------------------------
-
-/*
-void P_DropItem(mobj_t *source, mobjtype_t type, int special, int chance)
-{
-	mobj_t *mo;
-
-	if(P_Random() > chance)
-	{
-		return;
-	}
-	mo = P_SpawnMobj(source->x, source->y,
-		source->z+(source->height>>1), type);
-	mo->momx = P_SubRandom()<<8;
-	mo->momy = P_SubRandom()<<8;
-	mo->momz = FRACUNIT*5+(P_Random()<<10);
-	mo->flags2 |= MF2_DROPPED;
-	mo->health = special;
-}
-*/
-
-//----------------------------------------------------------------------------
-//
-// PROC A_NoBlocking
-//
-//----------------------------------------------------------------------------
-
-void A_NoBlocking(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags &= ~MF_SOLID;
-
-    // Check for monsters dropping things
-/*	switch(actor->type)
-	{
-		// Add the monster dropped items here
-		case MT_MUMMYLEADERGHOST:
-			P_DropItem(actor, MT_AMGWNDWIMPY, 3, 84);
-			break;
-		default:
-			break;
-	}
-*/
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_Explode
-//
-// Handles a bunch of exploding things.
-//
-//----------------------------------------------------------------------------
-
-void A_Explode(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int damage;
-    int distance;
-    boolean damageSelf;
-
-    damage = 128;
-    distance = 128;
-    damageSelf = true;
-    switch (actor->type)
-    {
-        case MT_FIREBOMB:      // Time Bombs
-            actor->z += 32 * FRACUNIT;
-            actor->flags &= ~MF_SHADOW;
-            break;
-        case MT_MNTRFX2:       // Minotaur floor fire
-            damage = 24;
-            break;
-        case MT_BISHOP:        // Bishop radius death
-            damage = 25 + (P_Random() & 15);
-            break;
-        case MT_HAMMER_MISSILE:        // Fighter Hammer
-            damage = 128;
-            damageSelf = false;
-            break;
-        case MT_FSWORD_MISSILE:        // Fighter Runesword
-            damage = 64;
-            damageSelf = false;
-            break;
-        case MT_CIRCLEFLAME:   // Cleric Flame secondary flames
-            damage = 20;
-            damageSelf = false;
-            break;
-        case MT_SORCBALL1:     // Sorcerer balls
-        case MT_SORCBALL2:
-        case MT_SORCBALL3:
-            distance = 255;
-            damage = 255;
-            actor->args[0] = 1; // don't play bounce
-            break;
-        case MT_SORCFX1:       // Sorcerer spell 1
-            damage = 30;
-            break;
-        case MT_SORCFX4:       // Sorcerer spell 4
-            damage = 20;
-            break;
-        case MT_TREEDESTRUCTIBLE:
-            damage = 10;
-            break;
-        case MT_DRAGON_FX2:
-            damage = 80;
-            damageSelf = false;
-            break;
-        case MT_MSTAFF_FX:
-            damage = 64;
-            distance = 192;
-            damageSelf = false;
-            break;
-        case MT_MSTAFF_FX2:
-            damage = 80;
-            distance = 192;
-            damageSelf = false;
-            break;
-        case MT_POISONCLOUD:
-            damage = 4;
-            distance = 40;
-            break;
-        case MT_ZXMAS_TREE:
-        case MT_ZSHRUB2:
-            damage = 30;
-            distance = 64;
-            break;
-        default:
-            break;
-    }
-    P_RadiusAttack(actor, actor->target, damage, distance, damageSelf);
-    if (actor->z <= actor->floorz + (distance << FRACBITS)
-        && actor->type != MT_POISONCLOUD)
-    {
-        P_HitFloor(actor);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_Massacre
-//
-// Kills all monsters.
-//
-//----------------------------------------------------------------------------
-
-int P_Massacre(void)
-{
-    int count;
-    mobj_t *mo;
-    thinker_t *think;
-
-    count = 0;
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-        if ((mo->flags & MF_COUNTKILL) && (mo->health > 0))
-        {
-            mo->flags2 &= ~(MF2_NONSHOOTABLE + MF2_INVULNERABLE);
-            mo->flags |= MF_SHOOTABLE;
-            P_DamageMobj(mo, NULL, NULL, 10000);
-            count++;
-        }
-    }
-    return count;
-}
-
-
-
-//----------------------------------------------------------------------------
-//
-// PROC A_SkullPop
-//
-//----------------------------------------------------------------------------
-
-void A_SkullPop(mobj_t *actor, player_t *player_, pspdef_t *psp)
-{
-    mobj_t *mo;
-    player_t *player;
-
-    if (!actor->player)
-    {
-        return;
-    }
-    actor->flags &= ~MF_SOLID;
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 48 * FRACUNIT,
-                     MT_BLOODYSKULL);
-    //mo->target = actor;
-    mo->momx = P_SubRandom() << 9;
-    mo->momy = P_SubRandom() << 9;
-    mo->momz = FRACUNIT * 2 + (P_Random() << 6);
-    // Attach player mobj to bloody skull
-    player = actor->player;
-    actor->player = NULL;
-    actor->special1.i = player->class;
-    mo->player = player;
-    mo->health = actor->health;
-    mo->angle = actor->angle;
-    player->mo = mo;
-    player->lookdir = 0;
-    player->damagecount = 32;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_CheckSkullFloor
-//
-//----------------------------------------------------------------------------
-
-void A_CheckSkullFloor(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->z <= actor->floorz)
-    {
-        P_SetMobjState(actor, S_BLOODYSKULLX1);
-        S_StartSound(actor, SFX_DRIP);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_CheckSkullDone
-//
-//----------------------------------------------------------------------------
-
-void A_CheckSkullDone(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special2.i == 666)
-    {
-        P_SetMobjState(actor, S_BLOODYSKULLX2);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_CheckBurnGone
-//
-//----------------------------------------------------------------------------
-
-void A_CheckBurnGone(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special2.i == 666)
-    {
-        P_SetMobjState(actor, S_PLAY_FDTH20);
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FreeTargMobj
-//
-//----------------------------------------------------------------------------
-
-void A_FreeTargMobj(mobj_t *mo, player_t *player, pspdef_t *psp)
-{
-    mo->momx = mo->momy = mo->momz = 0;
-    mo->z = mo->ceilingz + 4 * FRACUNIT;
-    mo->flags &=
-        ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_SOLID | MF_COUNTKILL);
-    mo->flags |= MF_CORPSE | MF_DROPOFF | MF_NOGRAVITY;
-    mo->flags2 &= ~(MF2_PASSMOBJ | MF2_LOGRAV);
-    mo->flags2 |= MF2_DONTDRAW;
-    mo->player = NULL;
-    mo->health = -1000;         // Don't resurrect
-}
-
-
-//----------------------------------------------------------------------------
-//
-// CorpseQueue Routines
-//
-//----------------------------------------------------------------------------
-
-// Corpse queue for monsters - this should be saved out
-#define CORPSEQUEUESIZE	64
-mobj_t *corpseQueue[CORPSEQUEUESIZE];
-int corpseQueueSlot;
-
-// throw another corpse on the queue
-void A_QueueCorpse(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *corpse;
-
-    if (corpseQueueSlot >= CORPSEQUEUESIZE)
-    {                           // Too many corpses - remove an old one
-        corpse = corpseQueue[corpseQueueSlot % CORPSEQUEUESIZE];
-        if (corpse)
-            P_RemoveMobj(corpse);
-    }
-    corpseQueue[corpseQueueSlot % CORPSEQUEUESIZE] = actor;
-    corpseQueueSlot++;
-}
-
-// Remove a mobj from the queue (for resurrection)
-void A_DeQueueCorpse(mobj_t *actor)
-{
-    int slot;
-
-    for (slot = 0; slot < CORPSEQUEUESIZE; slot++)
-    {
-        if (corpseQueue[slot] == actor)
-        {
-            corpseQueue[slot] = NULL;
-            break;
-        }
-    }
-}
-
-void P_InitCreatureCorpseQueue(boolean corpseScan)
-{
-    thinker_t *think;
-    mobj_t *mo;
-
-    // Initialize queue
-    corpseQueueSlot = 0;
-    memset(corpseQueue, 0, sizeof(mobj_t *) * CORPSEQUEUESIZE);
-
-    if (!corpseScan)
-        return;
-
-    // Search mobj list for corpses and place them in this queue
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-            continue;
-        mo = (mobj_t *) think;
-        if (!(mo->flags & MF_CORPSE))
-            continue;           // Must be a corpse
-        if (mo->flags & MF_ICECORPSE)
-            continue;           // Not ice corpses
-        // Only corpses that call A_QueueCorpse from death routine
-        switch (mo->type)
-        {
-            case MT_CENTAUR:
-            case MT_CENTAURLEADER:
-            case MT_DEMON:
-            case MT_DEMON2:
-            case MT_WRAITH:
-            case MT_WRAITHB:
-            case MT_BISHOP:
-            case MT_ETTIN:
-            case MT_PIG:
-            case MT_CENTAUR_SHIELD:
-            case MT_CENTAUR_SWORD:
-            case MT_DEMONCHUNK1:
-            case MT_DEMONCHUNK2:
-            case MT_DEMONCHUNK3:
-            case MT_DEMONCHUNK4:
-            case MT_DEMONCHUNK5:
-            case MT_DEMON2CHUNK1:
-            case MT_DEMON2CHUNK2:
-            case MT_DEMON2CHUNK3:
-            case MT_DEMON2CHUNK4:
-            case MT_DEMON2CHUNK5:
-            case MT_FIREDEMON_SPLOTCH1:
-            case MT_FIREDEMON_SPLOTCH2:
-                A_QueueCorpse(mo, NULL, NULL);      // Add corpse to queue
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-
-//----------------------------------------------------------------------------
-//
-// PROC A_AddPlayerCorpse
-//
-//----------------------------------------------------------------------------
-
-#define BODYQUESIZE 32
-mobj_t *bodyque[BODYQUESIZE];
-int bodyqueslot;
-
-void A_AddPlayerCorpse(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (bodyqueslot >= BODYQUESIZE)
-    {                           // Too many player corpses - remove an old one
-        P_RemoveMobj(bodyque[bodyqueslot % BODYQUESIZE]);
-    }
-    bodyque[bodyqueslot % BODYQUESIZE] = actor;
-    bodyqueslot++;
-}
-
-//============================================================================
-//
-// A_SerpentUnHide
-//
-//============================================================================
-
-void A_SerpentUnHide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 &= ~MF2_DONTDRAW;
-    actor->floorclip = 24 * FRACUNIT;
-}
-
-//============================================================================
-//
-// A_SerpentHide
-//
-//============================================================================
-
-void A_SerpentHide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 |= MF2_DONTDRAW;
-    actor->floorclip = 0;
-}
-
-//============================================================================
-//
-// A_SerpentChase
-//
-//============================================================================
-
-void A_SerpentChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int delta;
-    int oldX, oldY, oldFloor;
-
-    if (actor->reactiontime)
-    {
-        actor->reactiontime--;
-    }
-
-    // Modify target threshold
-    if (actor->threshold)
-    {
-        actor->threshold--;
-    }
-
-    if (gameskill == sk_nightmare)
-    {                           // Monsters move faster in nightmare mode
-        actor->tics -= actor->tics / 2;
-        if (actor->tics < 3)
-        {
-            actor->tics = 3;
-        }
-    }
-
-//
-// turn towards movement direction if not there yet
-//
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-        delta = actor->angle - (actor->movedir << 29);
-        if (delta > 0)
-        {
-            actor->angle -= ANG90 / 2;
-        }
-        else if (delta < 0)
-        {
-            actor->angle += ANG90 / 2;
-        }
-    }
-
-    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
-    {                           // look for a new target
-        if (P_LookForPlayers(actor, true))
-        {                       // got a new target
-            return;
-        }
-        P_SetMobjState(actor, actor->info->spawnstate);
-        return;
-    }
-
-//
-// don't attack twice in a row
-//
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-        if (gameskill != sk_nightmare)
-            P_NewChaseDir(actor);
-        return;
-    }
-
-//
-// check for melee attack
-//
-    if (actor->info->meleestate && P_CheckMeleeRange(actor))
-    {
-        if (actor->info->attacksound)
-        {
-            S_StartSound(actor, actor->info->attacksound);
-        }
-        P_SetMobjState(actor, actor->info->meleestate);
-        return;
-    }
-
-//
-// possibly choose another target
-//
-    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
-    {
-        if (P_LookForPlayers(actor, true))
-            return;             // got a new target
-    }
-
-//
-// chase towards player
-//
-    oldX = actor->x;
-    oldY = actor->y;
-    oldFloor = actor->subsector->sector->floorpic;
-    if (--actor->movecount < 0 || !P_Move(actor))
-    {
-        P_NewChaseDir(actor);
-    }
-    if (actor->subsector->sector->floorpic != oldFloor)
-    {
-        P_TryMove(actor, oldX, oldY);
-        P_NewChaseDir(actor);
-    }
-
-//
-// make active sound
-//
-    if (actor->info->activesound && P_Random() < 3)
-    {
-        S_StartSound(actor, actor->info->activesound);
-    }
-}
-
-//============================================================================
-//
-// A_SerpentRaiseHump
-// 
-// Raises the hump above the surface by raising the floorclip level
-//============================================================================
-
-void A_SerpentRaiseHump(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->floorclip -= 4 * FRACUNIT;
-}
-
-//============================================================================
-//
-// A_SerpentLowerHump
-// 
-//============================================================================
-
-void A_SerpentLowerHump(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->floorclip += 4 * FRACUNIT;
-}
-
-//============================================================================
-//
-// A_SerpentHumpDecide
-//
-//              Decided whether to hump up, or if the mobj is a serpent leader, 
-//                      to missile attack
-//============================================================================
-
-void A_SerpentHumpDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->type == MT_SERPENTLEADER)
-    {
-        if (P_Random() > 30)
-        {
-            return;
-        }
-        else if (P_Random() < 40)
-        {                       // Missile attack
-            P_SetMobjState(actor, S_SERPENT_SURFACE1);
-            return;
-        }
-    }
-    else if (P_Random() > 3)
-    {
-        return;
-    }
-    if (!P_CheckMeleeRange(actor))
-    {                           // The hump shouldn't occur when within melee range
-        if (actor->type == MT_SERPENTLEADER && P_Random() < 128)
-        {
-            P_SetMobjState(actor, S_SERPENT_SURFACE1);
-        }
-        else
-        {
-            P_SetMobjState(actor, S_SERPENT_HUMP1);
-            S_StartSound(actor, SFX_SERPENT_ACTIVE);
-        }
-    }
-}
-
-//============================================================================
-//
-// A_SerpentBirthScream
-//
-//============================================================================
-
-void A_SerpentBirthScream(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(actor, SFX_SERPENT_BIRTH);
-}
-
-//============================================================================
-//
-// A_SerpentDiveSound
-//
-//============================================================================
-
-void A_SerpentDiveSound(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(actor, SFX_SERPENT_ACTIVE);
-}
-
-//============================================================================
-//
-// A_SerpentWalk
-//
-// Similar to A_Chase, only has a hardcoded entering of meleestate
-//============================================================================
-
-void A_SerpentWalk(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int delta;
-
-    if (actor->reactiontime)
-    {
-        actor->reactiontime--;
-    }
-
-    // Modify target threshold
-    if (actor->threshold)
-    {
-        actor->threshold--;
-    }
-
-    if (gameskill == sk_nightmare)
-    {                           // Monsters move faster in nightmare mode
-        actor->tics -= actor->tics / 2;
-        if (actor->tics < 3)
-        {
-            actor->tics = 3;
-        }
-    }
-
-//
-// turn towards movement direction if not there yet
-//
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-        delta = actor->angle - (actor->movedir << 29);
-        if (delta > 0)
-        {
-            actor->angle -= ANG90 / 2;
-        }
-        else if (delta < 0)
-        {
-            actor->angle += ANG90 / 2;
-        }
-    }
-
-    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
-    {                           // look for a new target
-        if (P_LookForPlayers(actor, true))
-        {                       // got a new target
-            return;
-        }
-        P_SetMobjState(actor, actor->info->spawnstate);
-        return;
-    }
-
-//
-// don't attack twice in a row
-//
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-        if (gameskill != sk_nightmare)
-            P_NewChaseDir(actor);
-        return;
-    }
-
-//
-// check for melee attack
-//
-    if (actor->info->meleestate && P_CheckMeleeRange(actor))
-    {
-        if (actor->info->attacksound)
-        {
-            S_StartSound(actor, actor->info->attacksound);
-        }
-        P_SetMobjState(actor, S_SERPENT_ATK1);
-        return;
-    }
-//
-// possibly choose another target
-//
-    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
-    {
-        if (P_LookForPlayers(actor, true))
-            return;             // got a new target
-    }
-
-//
-// chase towards player
-//
-    if (--actor->movecount < 0 || !P_Move(actor))
-    {
-        P_NewChaseDir(actor);
-    }
-}
-
-//============================================================================
-//
-// A_SerpentCheckForAttack
-//
-//============================================================================
-
-void A_SerpentCheckForAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    if (actor->type == MT_SERPENTLEADER)
-    {
-        if (!P_CheckMeleeRange(actor))
-        {
-            P_SetMobjState(actor, S_SERPENT_ATK1);
-            return;
-        }
-    }
-    if (P_CheckMeleeRange2(actor))
-    {
-        P_SetMobjState(actor, S_SERPENT_WALK1);
-    }
-    else if (P_CheckMeleeRange(actor))
-    {
-        if (P_Random() < 32)
-        {
-            P_SetMobjState(actor, S_SERPENT_WALK1);
-        }
-        else
-        {
-            P_SetMobjState(actor, S_SERPENT_ATK1);
-        }
-    }
-}
-
-//============================================================================
-//
-// A_SerpentChooseAttack
-//
-//============================================================================
-
-void A_SerpentChooseAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target || P_CheckMeleeRange(actor))
-    {
-        return;
-    }
-    if (actor->type == MT_SERPENTLEADER)
-    {
-        P_SetMobjState(actor, S_SERPENT_MISSILE1);
-    }
-}
-
-//============================================================================
-//
-// A_SerpentMeleeAttack
-//
-//============================================================================
-
-void A_SerpentMeleeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(5));
-        S_StartSound(actor, SFX_SERPENT_MELEEHIT);
-    }
-    if (P_Random() < 96)
-    {
-        A_SerpentCheckForAttack(actor, player, psp);
-    }
-}
-
-//============================================================================
-//
-// A_SerpentMissileAttack
-//
-//============================================================================
-
-void A_SerpentMissileAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-
-    P_SpawnMissile(actor, actor->target, MT_SERPENTFX);
-}
-
-//============================================================================
-//
-// A_SerpentHeadPop
-//
-//============================================================================
-
-void A_SerpentHeadPop(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                MT_SERPENT_HEAD);
-}
-
-//============================================================================
-//
-// A_SerpentSpawnGibs
-//
-//============================================================================
-
-void A_SerpentSpawnGibs(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1, r2;
-
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(actor->x + ((r2 - 128) << 12),
-                     actor->y + ((r1 - 128) << 12),
-                     actor->floorz + FRACUNIT, MT_SERPENT_GIB1);
-    if (mo)
-    {
-        mo->momx = (P_Random() - 128) << 6;
-        mo->momy = (P_Random() - 128) << 6;
-        mo->floorclip = 6 * FRACUNIT;
-    }
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(actor->x + ((r2 - 128) << 12),
-                     actor->y + ((r1 - 128) << 12),
-                     actor->floorz + FRACUNIT, MT_SERPENT_GIB2);
-    if (mo)
-    {
-        mo->momx = (P_Random() - 128) << 6;
-        mo->momy = (P_Random() - 128) << 6;
-        mo->floorclip = 6 * FRACUNIT;
-    }
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(actor->x + ((r2 - 128) << 12),
-                     actor->y + ((r1 - 128) << 12),
-                     actor->floorz + FRACUNIT, MT_SERPENT_GIB3);
-    if (mo)
-    {
-        mo->momx = (P_Random() - 128) << 6;
-        mo->momy = (P_Random() - 128) << 6;
-        mo->floorclip = 6 * FRACUNIT;
-    }
-}
-
-//============================================================================
-//
-// A_FloatGib
-//
-//============================================================================
-
-void A_FloatGib(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->floorclip -= FRACUNIT;
-}
-
-//============================================================================
-//
-// A_SinkGib
-//
-//============================================================================
-
-void A_SinkGib(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->floorclip += FRACUNIT;
-}
-
-//============================================================================
-//
-// A_DelayGib
-//
-//============================================================================
-
-void A_DelayGib(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->tics -= P_Random() >> 2;
-}
-
-//============================================================================
-//
-// A_SerpentHeadCheck
-//
-//============================================================================
-
-void A_SerpentHeadCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->z <= actor->floorz)
-    {
-        if (P_GetThingFloorType(actor) >= FLOOR_LIQUID)
-        {
-            P_HitFloor(actor);
-            P_SetMobjState(actor, S_NULL);
-        }
-        else
-        {
-            P_SetMobjState(actor, S_SERPENT_HEAD_X1);
-        }
-    }
-}
-
-//============================================================================
-//
-// A_CentaurAttack
-//
-//============================================================================
-
-void A_CentaurAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, P_Random() % 7 + 3);
-    }
-}
-
-//============================================================================
-//
-// A_CentaurAttack2
-//
-//============================================================================
-
-void A_CentaurAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    P_SpawnMissile(actor, actor->target, MT_CENTAUR_FX);
-    S_StartSound(actor, SFX_CENTAURLEADER_ATTACK);
-}
-
-//============================================================================
-//
-// A_CentaurDropStuff
-//
-//      Spawn shield/sword sprites when the centaur pulps //============================================================================
-
-void A_CentaurDropStuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_CENTAUR_SHIELD);
-    if (mo)
-    {
-        angle = actor->angle + ANG90;
-        mo->momz = FRACUNIT * 8 + (P_Random() << 10);
-        mo->momx = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_CENTAUR_SWORD);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = FRACUNIT * 8 + (P_Random() << 10);
-        mo->momx = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul(((P_Random() - 128) << 11) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-}
-
-//============================================================================
-//
-// A_CentaurDefend
-//
-//============================================================================
-
-void A_CentaurDefend(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_FaceTarget(actor, player, psp);
-    if (P_CheckMeleeRange(actor) && P_Random() < 32)
-    {
-        A_UnSetInvulnerable(actor, player, psp);
-        P_SetMobjState(actor, actor->info->meleestate);
-    }
-}
-
-//============================================================================
-//
-// A_BishopAttack
-//
-//============================================================================
-
-void A_BishopAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-    {
-        return;
-    }
-    S_StartSound(actor, actor->info->attacksound);
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(4));
-        return;
-    }
-    actor->special1.i = (P_Random() & 3) + 5;
-}
-
-//============================================================================
-//
-// A_BishopAttack2
-//
-//              Spawns one of a string of bishop missiles
-//============================================================================
-
-void A_BishopAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    if (!actor->target || !actor->special1.i)
-    {
-        actor->special1.i = 0;
-        P_SetMobjState(actor, S_BISHOP_WALK1);
-        return;
-    }
-    mo = P_SpawnMissile(actor, actor->target, MT_BISH_FX);
-    if (mo)
-    {
-        mo->special1.m = actor->target;
-        mo->special2.i = 16;      // High word == x/y, Low word == z
-    }
-    actor->special1.i--;
-}
-
-//============================================================================
-//
-// A_BishopMissileWeave
-//
-//============================================================================
-
-void A_BishopMissileWeave(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t newX, newY;
-    int weaveXY, weaveZ;
-    int angle;
-
-    weaveXY = actor->special2.i >> 16;
-    weaveZ = actor->special2.i & 0xFFFF;
-    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    newX = actor->x - FixedMul(finecosine[angle],
-                               FloatBobOffsets[weaveXY] << 1);
-    newY = actor->y - FixedMul(finesine[angle],
-                               FloatBobOffsets[weaveXY] << 1);
-    weaveXY = (weaveXY + 2) & 63;
-    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 1);
-    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 1);
-    P_TryMove(actor, newX, newY);
-    actor->z -= FloatBobOffsets[weaveZ];
-    weaveZ = (weaveZ + 2) & 63;
-    actor->z += FloatBobOffsets[weaveZ];
-    actor->special2.i = weaveZ + (weaveXY << 16);
-}
-
-//============================================================================
-//
-// A_BishopMissileSeek
-//
-//============================================================================
-
-void A_BishopMissileSeek(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SeekerMissile(actor, ANG1 * 2, ANG1 * 3);
-}
-
-//============================================================================
-//
-// A_BishopDecide
-//
-//============================================================================
-
-void A_BishopDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_Random() < 220)
-    {
-        return;
-    }
-    else
-    {
-        P_SetMobjState(actor, S_BISHOP_BLUR1);
-    }
-}
-
-//============================================================================
-//
-// A_BishopDoBlur
-//
-//============================================================================
-
-void A_BishopDoBlur(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->special1.i = (P_Random() & 3) + 3;     // Random number of blurs
-    if (P_Random() < 120)
-    {
-        P_ThrustMobj(actor, actor->angle + ANG90, 11 * FRACUNIT);
-    }
-    else if (P_Random() > 125)
-    {
-        P_ThrustMobj(actor, actor->angle - ANG90, 11 * FRACUNIT);
-    }
-    else
-    {                           // Thrust forward
-        P_ThrustMobj(actor, actor->angle, 11 * FRACUNIT);
-    }
-    S_StartSound(actor, SFX_BISHOP_BLUR);
-}
-
-//============================================================================
-//
-// A_BishopSpawnBlur
-//
-//============================================================================
-
-void A_BishopSpawnBlur(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    if (!--actor->special1.i)
-    {
-        actor->momx = 0;
-        actor->momy = 0;
-        if (P_Random() > 96)
-        {
-            P_SetMobjState(actor, S_BISHOP_WALK1);
-        }
-        else
-        {
-            P_SetMobjState(actor, S_BISHOP_ATK1);
-        }
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_BISHOPBLUR);
-    if (mo)
-    {
-        mo->angle = actor->angle;
-    }
-}
-
-//============================================================================
-//
-// A_BishopChase
-//
-//============================================================================
-
-void A_BishopChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->z -= FloatBobOffsets[actor->special2.i] >> 1;
-    actor->special2.i = (actor->special2.i + 4) & 63;
-    actor->z += FloatBobOffsets[actor->special2.i] >> 1;
-}
-
-//============================================================================
-//
-// A_BishopPuff
-//
-//============================================================================
-
-void A_BishopPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 40 * FRACUNIT,
-                     MT_BISHOP_PUFF);
-    if (mo)
-    {
-        mo->momz = FRACUNIT / 2;
-    }
-}
-
-//============================================================================
-//
-// A_BishopPainBlur
-//
-//============================================================================
-
-void A_BishopPainBlur(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int r1,r2,r3;
-
-    if (P_Random() < 64)
-    {
-        P_SetMobjState(actor, S_BISHOP_BLUR1);
-        return;
-    }
-
-    r1 = P_SubRandom();
-    r2 = P_SubRandom();
-    r3 = P_SubRandom();
-
-    mo = P_SpawnMobj(actor->x + (r3 << 12), actor->y
-                     + (r2 << 12),
-                     actor->z + (r1 << 11),
-                     MT_BISHOPPAINBLUR);
-    if (mo)
-    {
-        mo->angle = actor->angle;
-    }
-}
-
-//============================================================================
-//
-// DragonSeek
-//
-//============================================================================
-
-static void DragonSeek(mobj_t * actor, angle_t thresh, angle_t turnMax)
-{
-    int dir;
-    int dist;
-    angle_t delta;
-    angle_t angle;
-    mobj_t *target;
-    int search;
-    int i;
-    int bestArg;
-    angle_t bestAngle;
-    angle_t angleToSpot, angleToTarget;
-    mobj_t *mo;
-
-    target = actor->special1.m;
-    if (target == NULL)
-    {
-        return;
-    }
-    dir = P_FaceMobj(actor, target, &delta);
-    if (delta > thresh)
-    {
-        delta >>= 1;
-        if (delta > turnMax)
-        {
-            delta = turnMax;
-        }
-    }
-    if (dir)
-    {                           // Turn clockwise
-        actor->angle += delta;
-    }
-    else
-    {                           // Turn counter clockwise
-        actor->angle -= delta;
-    }
-    angle = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
-    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
-    if (actor->z + actor->height < target->z
-        || target->z + target->height < actor->z)
-    {
-        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
-        dist = dist / actor->info->speed;
-        if (dist < 1)
-        {
-            dist = 1;
-        }
-        actor->momz = (target->z - actor->z) / dist;
-    }
-    else
-    {
-        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
-        dist = dist / actor->info->speed;
-    }
-    if (target->flags & MF_SHOOTABLE && P_Random() < 64)
-    {                           // attack the destination mobj if it's attackable
-        mobj_t *oldTarget;
-
-        if (abs((int) actor->angle - (int) R_PointToAngle2(actor->x, actor->y,
-                                               target->x,
-                                               target->y)) < ANG45 / 2)
-        {
-            oldTarget = actor->target;
-            actor->target = target;
-            if (P_CheckMeleeRange(actor))
-            {
-                P_DamageMobj(actor->target, actor, actor, HITDICE(10));
-                S_StartSound(actor, SFX_DRAGON_ATTACK);
-            }
-            else if (P_Random() < 128 && P_CheckMissileRange(actor))
-            {
-                P_SpawnMissile(actor, target, MT_DRAGON_FX);
-                S_StartSound(actor, SFX_DRAGON_ATTACK);
-            }
-            actor->target = oldTarget;
-        }
-    }
-    if (dist < 4)
-    {                           // Hit the target thing
-        if (actor->target && P_Random() < 200)
-        {
-            bestArg = -1;
-            bestAngle = ANG_MAX;
-            angleToTarget = R_PointToAngle2(actor->x, actor->y,
-                                            actor->target->x,
-                                            actor->target->y);
-            for (i = 0; i < 5; i++)
-            {
-                if (!target->args[i])
-                {
-                    continue;
-                }
-                search = -1;
-                mo = P_FindMobjFromTID(target->args[i], &search);
-                angleToSpot = R_PointToAngle2(actor->x, actor->y,
-                                              mo->x, mo->y);
-                if (abs((int) angleToSpot - (int) angleToTarget) < bestAngle)
-                {
-                    bestAngle = abs((int) angleToSpot - (int) angleToTarget);
-                    bestArg = i;
-                }
-            }
-            if (bestArg != -1)
-            {
-                search = -1;
-                actor->special1.m =
-                    P_FindMobjFromTID(target->args[bestArg], &search);
-            }
-        }
-        else
-        {
-            do
-            {
-                i = (P_Random() >> 2) % 5;
-            }
-            while (!target->args[i]);
-            search = -1;
-            actor->special1.m =
-                P_FindMobjFromTID(target->args[i], &search);
-        }
-    }
-}
-
-//============================================================================
-//
-// A_DragonInitFlight
-//
-//============================================================================
-
-void A_DragonInitFlight(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int search;
-
-    search = -1;
-    do
-    {                           // find the first tid identical to the dragon's tid
-        actor->special1.m = P_FindMobjFromTID(actor->tid, &search);
-        if (search == -1)
-        {
-            P_SetMobjState(actor, actor->info->spawnstate);
-            return;
-        }
-    }
-    while (actor->special1.m == actor);
-    P_RemoveMobjFromTIDList(actor);
-}
-
-//============================================================================
-//
-// A_DragonFlight
-//
-//============================================================================
-
-void A_DragonFlight(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-
-    DragonSeek(actor, 4 * ANG1, 8 * ANG1);
-    if (actor->target)
-    {
-        if (!(actor->target->flags & MF_SHOOTABLE))
-        {                       // target died
-            actor->target = NULL;
-            return;
-        }
-        angle = R_PointToAngle2(actor->x, actor->y, actor->target->x,
-                                actor->target->y);
-        if (abs((int) actor->angle - (int) angle) < ANG45 / 2
-            && P_CheckMeleeRange(actor))
-        {
-            P_DamageMobj(actor->target, actor, actor, HITDICE(8));
-            S_StartSound(actor, SFX_DRAGON_ATTACK);
-        }
-        else if (abs((int) actor->angle - (int) angle) <= ANG1 * 20)
-        {
-            P_SetMobjState(actor, actor->info->missilestate);
-            S_StartSound(actor, SFX_DRAGON_ATTACK);
-        }
-    }
-    else
-    {
-        P_LookForPlayers(actor, true);
-    }
-}
-
-//============================================================================
-//
-// A_DragonFlap
-//
-//============================================================================
-
-void A_DragonFlap(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_DragonFlight(actor, player, psp);
-    if (P_Random() < 240)
-    {
-        S_StartSound(actor, SFX_DRAGON_WINGFLAP);
-    }
-    else
-    {
-        S_StartSound(actor, actor->info->activesound);
-    }
-}
-
-//============================================================================
-//
-// A_DragonAttack
-//
-//============================================================================
-
-void A_DragonAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMissile(actor, actor->target, MT_DRAGON_FX);
-}
-
-//============================================================================
-//
-// A_DragonFX2
-//
-//============================================================================
-
-void A_DragonFX2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int i;
-    int r1,r2,r3;
-    int delay;
-
-    delay = 16 + (P_Random() >> 3);
-    for (i = 1 + (P_Random() & 3); i; i--)
-    {
-        r1 = P_Random();
-        r2 = P_Random();
-        r3 = P_Random();
-        mo = P_SpawnMobj(actor->x + ((r3 - 128) << 14),
-                         actor->y + ((r2 - 128) << 14),
-                         actor->z + ((r1 - 128) << 12),
-                         MT_DRAGON_FX2);
-        if (mo)
-        {
-            mo->tics = delay + (P_Random() & 3) * i * 2;
-            mo->target = actor->target;
-        }
-    }
-}
-
-//============================================================================
-//
-// A_DragonPain
-//
-//============================================================================
-
-void A_DragonPain(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_Pain(actor, player, psp);
-    if (!actor->special1.i)
-    {                           // no destination spot yet
-        P_SetMobjState(actor, S_DRAGON_INIT);
-    }
-}
-
-//============================================================================
-//
-// A_DragonCheckCrash
-//
-//============================================================================
-
-void A_DragonCheckCrash(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->z <= actor->floorz)
-    {
-        P_SetMobjState(actor, S_DRAGON_CRASH1);
-    }
-}
-
-//============================================================================
-// Demon AI
-//============================================================================
-
-//
-// A_DemonAttack1 (melee)
-//
-void A_DemonAttack1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
-    }
-}
-
-
-//
-// A_DemonAttack2 (missile)
-//
-void A_DemonAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int fireBall;
-
-    if (actor->type == MT_DEMON)
-    {
-        fireBall = MT_DEMONFX1;
-    }
-    else
-    {
-        fireBall = MT_DEMON2FX1;
-    }
-    mo = P_SpawnMissile(actor, actor->target, fireBall);
-    if (mo)
-    {
-        mo->z += 30 * FRACUNIT;
-        S_StartSound(actor, SFX_DEMON_MISSILE_FIRE);
-    }
-}
-
-//
-// A_DemonDeath
-//
-
-void A_DemonDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMONCHUNK1);
-    if (mo)
-    {
-        angle = actor->angle + ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMONCHUNK2);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMONCHUNK3);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMONCHUNK4);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMONCHUNK5);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-}
-
-//===========================================================================
-//
-// A_Demon2Death
-//
-//===========================================================================
-
-void A_Demon2Death(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMON2CHUNK1);
-    if (mo)
-    {
-        angle = actor->angle + ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMON2CHUNK2);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMON2CHUNK3);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMON2CHUNK4);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 45 * FRACUNIT,
-                     MT_DEMON2CHUNK5);
-    if (mo)
-    {
-        angle = actor->angle - ANG90;
-        mo->momz = 8 * FRACUNIT;
-        mo->momx = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finecosine[angle >> ANGLETOFINESHIFT]);
-        mo->momy = FixedMul((P_Random() << 10) + FRACUNIT,
-                            finesine[angle >> ANGLETOFINESHIFT]);
-        mo->target = actor;
-    }
-}
-
-
-
-//
-// A_SinkMobj
-// Sink a mobj incrementally into the floor
-//
-
-boolean A_SinkMobj(mobj_t * actor)
-{
-    if (actor->floorclip < actor->info->height)
-    {
-        switch (actor->type)
-        {
-            case MT_THRUSTFLOOR_DOWN:
-            case MT_THRUSTFLOOR_UP:
-                actor->floorclip += 6 * FRACUNIT;
-                break;
-            default:
-                actor->floorclip += FRACUNIT;
-                break;
-        }
-        return false;
-    }
-    return true;
-}
-
-//
-// A_RaiseMobj
-// Raise a mobj incrementally from the floor to 
-// 
-
-boolean A_RaiseMobj(mobj_t * actor)
-{
-    int done = true;
-
-    // Raise a mobj from the ground
-    if (actor->floorclip > 0)
-    {
-        switch (actor->type)
-        {
-            case MT_WRAITHB:
-                actor->floorclip -= 2 * FRACUNIT;
-                break;
-            case MT_THRUSTFLOOR_DOWN:
-            case MT_THRUSTFLOOR_UP:
-                actor->floorclip -= actor->special2.i * FRACUNIT;
-                break;
-            default:
-                actor->floorclip -= 2 * FRACUNIT;
-                break;
-        }
-        if (actor->floorclip <= 0)
-        {
-            actor->floorclip = 0;
-            done = true;
-        }
-        else
-        {
-            done = false;
-        }
-    }
-    return done;                // Reached target height
-}
-
-
-//============================================================================
-// Wraith Variables
-//
-//      special1                                Internal index into floatbob
-//      special2
-//============================================================================
-
-//
-// A_WraithInit
-//
-
-void A_WraithInit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->z += 48 << FRACBITS;
-    actor->special1.i = 0;        // index into floatbob
-}
-
-void A_WraithRaiseInit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags2 &= ~MF2_DONTDRAW;
-    actor->flags2 &= ~MF2_NONSHOOTABLE;
-    actor->flags |= MF_SHOOTABLE | MF_SOLID;
-    actor->floorclip = actor->info->height;
-}
-
-void A_WraithRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (A_RaiseMobj(actor))
-    {
-        // Reached it's target height
-        P_SetMobjState(actor, S_WRAITH_CHASE1);
-    }
-
-    P_SpawnDirt(actor, actor->radius);
-}
-
-
-void A_WraithMelee(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int amount;
-
-    // Steal health from target and give to player
-    if (P_CheckMeleeRange(actor) && (P_Random() < 220))
-    {
-        amount = HITDICE(2);
-        P_DamageMobj(actor->target, actor, actor, amount);
-        actor->health += amount;
-    }
-}
-
-void A_WraithMissile(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMissile(actor, actor->target, MT_WRAITHFX1);
-    if (mo)
-    {
-        S_StartSound(actor, SFX_WRAITH_MISSILE_FIRE);
-    }
-}
-
-
-//
-// A_WraithFX2 - spawns sparkle tail of missile
-//
-
-void A_WraithFX2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t angle;
-    int i;
-
-    for (i = 0; i < 2; i++)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX2);
-        if (mo)
-        {
-            if (P_Random() < 128)
-            {
-                angle = actor->angle + (P_Random() << 22);
-            }
-            else
-            {
-                angle = actor->angle - (P_Random() << 22);
-            }
-            mo->momz = 0;
-            mo->momx = FixedMul((P_Random() << 7) + FRACUNIT,
-                                finecosine[angle >> ANGLETOFINESHIFT]);
-            mo->momy = FixedMul((P_Random() << 7) + FRACUNIT,
-                                finesine[angle >> ANGLETOFINESHIFT]);
-            mo->target = actor;
-            mo->floorclip = 10 * FRACUNIT;
-        }
-    }
-}
-
-
-// Spawn an FX3 around the actor during attacks
-void A_WraithFX3(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int numdropped = P_Random() % 15;
-    int i;
-
-    for (i = 0; i < numdropped; i++)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX3);
-        if (mo)
-        {
-            mo->x += (P_Random() - 128) << 11;
-            mo->y += (P_Random() - 128) << 11;
-            mo->z += (P_Random() << 10);
-            mo->target = actor;
-        }
-    }
-}
-
-// Spawn an FX4 during movement
-void A_WraithFX4(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int chance = P_Random();
-    int spawn4, spawn5;
-
-    if (chance < 10)
-    {
-        spawn4 = true;
-        spawn5 = false;
-    }
-    else if (chance < 20)
-    {
-        spawn4 = false;
-        spawn5 = true;
-    }
-    else if (chance < 25)
-    {
-        spawn4 = true;
-        spawn5 = true;
-    }
-    else
-    {
-        spawn4 = false;
-        spawn5 = false;
-    }
-
-    if (spawn4)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX4);
-        if (mo)
-        {
-            mo->x += (P_Random() - 128) << 12;
-            mo->y += (P_Random() - 128) << 12;
-            mo->z += (P_Random() << 10);
-            mo->target = actor;
-        }
-    }
-    if (spawn5)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_WRAITHFX5);
-        if (mo)
-        {
-            mo->x += (P_Random() - 128) << 11;
-            mo->y += (P_Random() - 128) << 11;
-            mo->z += (P_Random() << 10);
-            mo->target = actor;
-        }
-    }
-}
-
-
-void A_WraithLook(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-//      A_WraithFX4(actor);             // too expensive
-    A_Look(actor, player, psp);
-}
-
-
-void A_WraithChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int weaveindex = actor->special1.i;
-    actor->z += FloatBobOffsets[weaveindex];
-    actor->special1.i = (weaveindex + 2) & 63;
-//      if (actor->floorclip > 0)
-//      {
-//              P_SetMobjState(actor, S_WRAITH_RAISE2);
-//              return;
-//      }
-    A_Chase(actor, player, psp);
-    A_WraithFX4(actor, player, psp);
-}
-
-
-
-//============================================================================
-// Ettin AI
-//============================================================================
-
-void A_EttinAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_CheckMeleeRange(actor))
-    {
-        P_DamageMobj(actor->target, actor, actor, HITDICE(2));
-    }
-}
-
-
-void A_DropMace(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y,
-                     actor->z + (actor->height >> 1), MT_ETTIN_MACE);
-    if (mo)
-    {
-        mo->momx = (P_Random() - 128) << 11;
-        mo->momy = (P_Random() - 128) << 11;
-        mo->momz = FRACUNIT * 10 + (P_Random() << 10);
-        mo->target = actor;
-    }
-}
-
-
-//============================================================================
-// Fire Demon AI
-//
-// special1                     index into floatbob
-// special2                     whether strafing or not
-//============================================================================
-
-void A_FiredSpawnRock(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int x, y, z;
-    int rtype = 0;
-
-    switch (P_Random() % 5)
-    {
-        case 0:
-            rtype = MT_FIREDEMON_FX1;
-            break;
-        case 1:
-            rtype = MT_FIREDEMON_FX2;
-            break;
-        case 2:
-            rtype = MT_FIREDEMON_FX3;
-            break;
-        case 3:
-            rtype = MT_FIREDEMON_FX4;
-            break;
-        case 4:
-            rtype = MT_FIREDEMON_FX5;
-            break;
-    }
-
-    x = actor->x + ((P_Random() - 128) << 12);
-    y = actor->y + ((P_Random() - 128) << 12);
-    z = actor->z + ((P_Random()) << 11);
-    mo = P_SpawnMobj(x, y, z, rtype);
-    if (mo)
-    {
-        mo->target = actor;
-        mo->momx = (P_Random() - 128) << 10;
-        mo->momy = (P_Random() - 128) << 10;
-        mo->momz = (P_Random() << 10);
-        mo->special1.i = 2;       // Number bounces
-    }
-
-    // Initialize fire demon
-    actor->special2.i = 0;
-    actor->flags &= ~MF_JUSTATTACKED;
-}
-
-void A_FiredRocks(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_FiredSpawnRock(actor, player, psp);
-    A_FiredSpawnRock(actor, player, psp);
-    A_FiredSpawnRock(actor, player, psp);
-    A_FiredSpawnRock(actor, player, psp);
-    A_FiredSpawnRock(actor, player, psp);
-}
-
-void A_FiredAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    mo = P_SpawnMissile(actor, actor->target, MT_FIREDEMON_FX6);
-    if (mo)
-        S_StartSound(actor, SFX_FIRED_ATTACK);
-}
-
-void A_SmBounce(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    // give some more momentum (x,y,&z)
-    actor->z = actor->floorz + FRACUNIT;
-    actor->momz = (2 * FRACUNIT) + (P_Random() << 10);
-    actor->momx = P_Random() % 3 << FRACBITS;
-    actor->momy = P_Random() % 3 << FRACBITS;
-}
-
-
-#define FIREDEMON_ATTACK_RANGE	64*8*FRACUNIT
-
-void A_FiredChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int weaveindex = actor->special1.i;
-    mobj_t *target = actor->target;
-    angle_t ang;
-    fixed_t dist;
-
-    if (actor->reactiontime)
-        actor->reactiontime--;
-    if (actor->threshold)
-        actor->threshold--;
-
-    // Float up and down
-    actor->z += FloatBobOffsets[weaveindex];
-    actor->special1.i = (weaveindex + 2) & 63;
-
-    // Insure it stays above certain height
-    if (actor->z < actor->floorz + (64 * FRACUNIT))
-    {
-        actor->z += 2 * FRACUNIT;
-    }
-
-    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
-    {                           // Invalid target
-        P_LookForPlayers(actor, true);
-        return;
-    }
-
-    // Strafe
-    if (actor->special2.i > 0)
-    {
-        actor->special2.i--;
-    }
-    else
-    {
-        actor->special2.i = 0;
-        actor->momx = actor->momy = 0;
-        dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
-        if (dist < FIREDEMON_ATTACK_RANGE)
-        {
-            if (P_Random() < 30)
-            {
-                ang =
-                    R_PointToAngle2(actor->x, actor->y, target->x, target->y);
-                if (P_Random() < 128)
-                    ang += ANG90;
-                else
-                    ang -= ANG90;
-                ang >>= ANGLETOFINESHIFT;
-                actor->momx = FixedMul(8 * FRACUNIT, finecosine[ang]);
-                actor->momy = FixedMul(8 * FRACUNIT, finesine[ang]);
-                actor->special2.i = 3;    // strafe time
-            }
-        }
-    }
-
-    FaceMovementDirection(actor);
-
-    // Normal movement
-    if (!actor->special2.i)
-    {
-        if (--actor->movecount < 0 || !P_Move(actor))
-        {
-            P_NewChaseDir(actor);
-        }
-    }
-
-    // Do missile attack
-    if (!(actor->flags & MF_JUSTATTACKED))
-    {
-        if (P_CheckMissileRange(actor) && (P_Random() < 20))
-        {
-            P_SetMobjState(actor, actor->info->missilestate);
-            actor->flags |= MF_JUSTATTACKED;
-            return;
-        }
-    }
-    else
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-    }
-
-    // make active sound
-    if (actor->info->activesound && P_Random() < 3)
-    {
-        S_StartSound(actor, actor->info->activesound);
-    }
-}
-
-void A_FiredSplotch(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FIREDEMON_SPLOTCH1);
-    if (mo)
-    {
-        mo->momx = (P_Random() - 128) << 11;
-        mo->momy = (P_Random() - 128) << 11;
-        mo->momz = FRACUNIT * 3 + (P_Random() << 10);
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FIREDEMON_SPLOTCH2);
-    if (mo)
-    {
-        mo->momx = (P_Random() - 128) << 11;
-        mo->momy = (P_Random() - 128) << 11;
-        mo->momz = FRACUNIT * 3 + (P_Random() << 10);
-    }
-}
-
-
-//============================================================================
-//
-// A_IceGuyLook
-//
-//============================================================================
-
-void A_IceGuyLook(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t dist;
-    fixed_t an;
-
-    A_Look(actor, player, psp);
-    if (P_Random() < 64)
-    {
-        dist = ((P_Random() - 128) * actor->radius) >> 7;
-        an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-
-        P_SpawnMobj(actor->x + FixedMul(dist, finecosine[an]),
-                    actor->y + FixedMul(dist, finesine[an]),
-                    actor->z + 60 * FRACUNIT,
-                    MT_ICEGUY_WISP1 + (P_Random() & 1));
-    }
-}
-
-//============================================================================
-//
-// A_IceGuyChase
-//
-//============================================================================
-
-void A_IceGuyChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t dist;
-    fixed_t an;
-    mobj_t *mo;
-
-    A_Chase(actor, player, psp);
-    if (P_Random() < 128)
-    {
-        dist = ((P_Random() - 128) * actor->radius) >> 7;
-        an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-
-        mo = P_SpawnMobj(actor->x + FixedMul(dist, finecosine[an]),
-                         actor->y + FixedMul(dist, finesine[an]),
-                         actor->z + 60 * FRACUNIT,
-                         MT_ICEGUY_WISP1 + (P_Random() & 1));
-        if (mo)
-        {
-            mo->momx = actor->momx;
-            mo->momy = actor->momy;
-            mo->momz = actor->momz;
-            mo->target = actor;
-        }
-    }
-}
-
-//============================================================================
-//
-// A_IceGuyAttack
-//
-//============================================================================
-
-void A_IceGuyAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t an;
-
-    if (!actor->target)
-    {
-        return;
-    }
-    an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    P_SpawnMissileXYZ(actor->x + FixedMul(actor->radius >> 1,
-                                          finecosine[an]),
-                      actor->y + FixedMul(actor->radius >> 1, finesine[an]),
-                      actor->z + 40 * FRACUNIT, actor, actor->target,
-                      MT_ICEGUY_FX);
-    an = (actor->angle - ANG90) >> ANGLETOFINESHIFT;
-    P_SpawnMissileXYZ(actor->x + FixedMul(actor->radius >> 1,
-                                          finecosine[an]),
-                      actor->y + FixedMul(actor->radius >> 1, finesine[an]),
-                      actor->z + 40 * FRACUNIT, actor, actor->target,
-                      MT_ICEGUY_FX);
-    S_StartSound(actor, actor->info->attacksound);
-}
-
-//============================================================================
-//
-// A_IceGuyMissilePuff
-//
-//============================================================================
-
-void A_IceGuyMissilePuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z + 2 * FRACUNIT, MT_ICEFX_PUFF);
-}
-
-//============================================================================
-//
-// A_IceGuyDie
-//
-//============================================================================
-
-void A_IceGuyDie(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->momx = 0;
-    actor->momy = 0;
-    actor->momz = 0;
-    actor->height <<= 2;
-    A_FreezeDeathChunks(actor, player, psp);
-}
-
-//============================================================================
-//
-// A_IceGuyMissileExplode
-//
-//============================================================================
-
-void A_IceGuyMissileExplode(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    unsigned int i;
-
-    for (i = 0; i < 8; i++)
-    {
-        mo = P_SpawnMissileAngle(actor, MT_ICEGUY_FX2, i * ANG45,
-                                 -0.3 * FRACUNIT);
-        if (mo)
-        {
-            mo->target = actor->target;
-        }
-    }
-}
-
-
-
-
-
-
-
-
-
-//============================================================================
-//
-//      Sorcerer stuff
-//
-// Sorcerer Variables
-//              special1                Angle of ball 1 (all others relative to that)
-//              special2                which ball to stop at in stop mode (MT_???)
-//              args[0]                 Denfense time
-//              args[1]                 Number of full rotations since stopping mode
-//              args[2]                 Target orbit speed for acceleration/deceleration
-//              args[3]                 Movement mode (see SORC_ macros)
-//              args[4]                 Current ball orbit speed
-//      Sorcerer Ball Variables
-//              special1                Previous angle of ball (for woosh)
-//              special2                Countdown of rapid fire (FX4)
-//              args[0]                 If set, don't play the bounce sound when bouncing
-//============================================================================
-
-#define SORCBALL_INITIAL_SPEED 		7
-#define SORCBALL_TERMINAL_SPEED		25
-#define SORCBALL_SPEED_ROTATIONS 	5
-#define SORC_DEFENSE_TIME			255
-#define SORC_DEFENSE_HEIGHT			45
-#define BOUNCE_TIME_UNIT			(35/2)
-#define SORCFX4_RAPIDFIRE_TIME		(6*3)   // 3 seconds
-#define SORCFX4_SPREAD_ANGLE		20
-
-#define SORC_DECELERATE		0
-#define SORC_ACCELERATE 	1
-#define SORC_STOPPING		2
-#define SORC_FIRESPELL		3
-#define SORC_STOPPED		4
-#define SORC_NORMAL			5
-#define SORC_FIRING_SPELL	6
-
-#define BALL1_ANGLEOFFSET	0
-#define BALL2_ANGLEOFFSET	(ANG_MAX/3)
-#define BALL3_ANGLEOFFSET	((ANG_MAX/3)*2)
-
-
-// Spawn spinning balls above head - actor is sorcerer
-void A_SorcSpinBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    fixed_t z;
-
-    A_SlowBalls(actor, player, psp);
-    actor->args[0] = 0;         // Currently no defense
-    actor->args[3] = SORC_NORMAL;
-    actor->args[4] = SORCBALL_INITIAL_SPEED;    // Initial orbit speed
-    actor->special1.i = ANG1;
-    z = actor->z - actor->floorclip + actor->info->height;
-
-    mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCBALL1);
-    if (mo)
-    {
-        mo->target = actor;
-        mo->special2.i = SORCFX4_RAPIDFIRE_TIME;
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCBALL2);
-    if (mo)
-        mo->target = actor;
-    mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCBALL3);
-    if (mo)
-        mo->target = actor;
-}
-
-
-//
-// A_SorcBallOrbit() ==========================================
-//
-
-void A_SorcBallOrbit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int x, y;
-    angle_t angle, baseangle;
-    int mode = actor->target->args[3];
-    mobj_t *parent = (mobj_t *) actor->target;
-    int dist = parent->radius - (actor->radius << 1);
-    angle_t prevangle = actor->special1.i;
-
-    if (actor->target->health <= 0)
-        P_SetMobjState(actor, actor->info->painstate);
-
-    baseangle = (angle_t) parent->special1.i;
-    switch (actor->type)
-    {
-        case MT_SORCBALL1:
-            angle = baseangle + BALL1_ANGLEOFFSET;
-            break;
-        case MT_SORCBALL2:
-            angle = baseangle + BALL2_ANGLEOFFSET;
-            break;
-        case MT_SORCBALL3:
-            angle = baseangle + BALL3_ANGLEOFFSET;
-            break;
-        default:
-            I_Error("corrupted sorcerer");
-            return;
-    }
-    actor->angle = angle;
-    angle >>= ANGLETOFINESHIFT;
-
-    switch (mode)
-    {
-        case SORC_NORMAL:      // Balls rotating normally
-            A_SorcUpdateBallAngle(actor, player, psp);
-            break;
-        case SORC_DECELERATE:  // Balls decelerating
-            A_DecelBalls(actor, player, psp);
-            A_SorcUpdateBallAngle(actor, player, psp);
-            break;
-        case SORC_ACCELERATE:  // Balls accelerating
-            A_AccelBalls(actor, player, psp);
-            A_SorcUpdateBallAngle(actor, player, psp);
-            break;
-        case SORC_STOPPING:    // Balls stopping
-            if ((parent->special2.i == actor->type) &&
-                (parent->args[1] > SORCBALL_SPEED_ROTATIONS) &&
-                (abs((int) angle - (int) (parent->angle >> ANGLETOFINESHIFT)) <
-                 (30 << 5)))
-            {
-                // Can stop now
-                actor->target->args[3] = SORC_FIRESPELL;
-                actor->target->args[4] = 0;
-                // Set angle so ball angle == sorcerer angle
-                switch (actor->type)
-                {
-                    case MT_SORCBALL1:
-                        parent->special1.i = (int) (parent->angle -
-                                                    BALL1_ANGLEOFFSET);
-                        break;
-                    case MT_SORCBALL2:
-                        parent->special1.i = (int) (parent->angle -
-                                                    BALL2_ANGLEOFFSET);
-                        break;
-                    case MT_SORCBALL3:
-                        parent->special1.i = (int) (parent->angle -
-                                                    BALL3_ANGLEOFFSET);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            else
-            {
-                A_SorcUpdateBallAngle(actor, player, psp);
-            }
-            break;
-        case SORC_FIRESPELL:   // Casting spell
-            if (parent->special2.i == actor->type)
-            {
-                // Put sorcerer into special throw spell anim
-                if (parent->health > 0)
-                    P_SetMobjStateNF(parent, S_SORC_ATTACK1);
-
-                if (actor->type == MT_SORCBALL1 && P_Random() < 200)
-                {
-                    S_StartSound(NULL, SFX_SORCERER_SPELLCAST);
-                    actor->special2.i = SORCFX4_RAPIDFIRE_TIME;
-                    actor->args[4] = 128;
-                    parent->args[3] = SORC_FIRING_SPELL;
-                }
-                else
-                {
-                    A_CastSorcererSpell(actor, player, psp);
-                    parent->args[3] = SORC_STOPPED;
-                }
-            }
-            break;
-        case SORC_FIRING_SPELL:
-            if (parent->special2.i == actor->type)
-            {
-                if (actor->special2.i-- <= 0)
-                {
-                    // Done rapid firing 
-                    parent->args[3] = SORC_STOPPED;
-                    // Back to orbit balls
-                    if (parent->health > 0)
-                        P_SetMobjStateNF(parent, S_SORC_ATTACK4);
-                }
-                else
-                {
-                    // Do rapid fire spell
-                    A_SorcOffense2(actor, player, psp);
-                }
-            }
-            break;
-        case SORC_STOPPED:     // Balls stopped
-        default:
-            break;
-    }
-
-    if ((angle < prevangle) && (parent->args[4] == SORCBALL_TERMINAL_SPEED))
-    {
-        parent->args[1]++;      // Bump rotation counter
-        // Completed full rotation - make woosh sound
-        S_StartSound(actor, SFX_SORCERER_BALLWOOSH);
-    }
-    actor->special1.i = angle;    // Set previous angle
-    x = parent->x + FixedMul(dist, finecosine[angle]);
-    y = parent->y + FixedMul(dist, finesine[angle]);
-    actor->x = x;
-    actor->y = y;
-    actor->z = parent->z - parent->floorclip + parent->info->height;
-}
-
-
-//
-// Set balls to speed mode - actor is sorcerer
-//
-void A_SpeedBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->args[3] = SORC_ACCELERATE;   // speed mode
-    actor->args[2] = SORCBALL_TERMINAL_SPEED;   // target speed
-}
-
-
-//
-// Set balls to slow mode - actor is sorcerer
-//
-void A_SlowBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->args[3] = SORC_DECELERATE;   // slow mode
-    actor->args[2] = SORCBALL_INITIAL_SPEED;    // target speed
-}
-
-
-//
-// Instant stop when rotation gets to ball in special2
-//              actor is sorcerer
-//
-void A_StopBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int chance = P_Random();
-    actor->args[3] = SORC_STOPPING;     // stopping mode
-    actor->args[1] = 0;         // Reset rotation counter
-
-    if ((actor->args[0] <= 0) && (chance < 200))
-    {
-        actor->special2.i = MT_SORCBALL2; // Blue
-    }
-    else if ((actor->health < (actor->info->spawnhealth >> 1)) &&
-             (chance < 200))
-    {
-        actor->special2.i = MT_SORCBALL3; // Green
-    }
-    else
-    {
-        actor->special2.i = MT_SORCBALL1; // Yellow
-    }
-
-
-}
-
-
-//
-// Increase ball orbit speed - actor is ball
-//
-void A_AccelBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *sorc = actor->target;
-
-    if (sorc->args[4] < sorc->args[2])
-    {
-        sorc->args[4]++;
-    }
-    else
-    {
-        sorc->args[3] = SORC_NORMAL;
-        if (sorc->args[4] >= SORCBALL_TERMINAL_SPEED)
-        {
-            // Reached terminal velocity - stop balls
-            A_StopBalls(sorc, player, psp);
-        }
-    }
-}
-
-
-// Decrease ball orbit speed - actor is ball
-void A_DecelBalls(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *sorc = actor->target;
-
-    if (sorc->args[4] > sorc->args[2])
-    {
-        sorc->args[4]--;
-    }
-    else
-    {
-        sorc->args[3] = SORC_NORMAL;
-    }
-}
-
-
-// Update angle if first ball - actor is ball
-void A_SorcUpdateBallAngle(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->type == MT_SORCBALL1)
-    {
-        actor->target->special1.i += ANG1 * actor->target->args[4];
-    }
-}
-
-
-// actor is ball
-void A_CastSorcererSpell(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int spell = actor->type;
-    angle_t ang1, ang2;
-    fixed_t z;
-    mobj_t *parent = actor->target;
-
-    S_StartSound(NULL, SFX_SORCERER_SPELLCAST);
-
-    // Put sorcerer into throw spell animation
-    if (parent->health > 0)
-        P_SetMobjStateNF(parent, S_SORC_ATTACK4);
-
-    switch (spell)
-    {
-        case MT_SORCBALL1:     // Offensive
-            A_SorcOffense1(actor, player, psp);
-            break;
-        case MT_SORCBALL2:     // Defensive
-            z = parent->z - parent->floorclip +
-                SORC_DEFENSE_HEIGHT * FRACUNIT;
-            mo = P_SpawnMobj(actor->x, actor->y, z, MT_SORCFX2);
-            parent->flags2 |= MF2_REFLECTIVE | MF2_INVULNERABLE;
-            parent->args[0] = SORC_DEFENSE_TIME;
-            if (mo)
-                mo->target = parent;
-            break;
-        case MT_SORCBALL3:     // Reinforcements
-            ang1 = actor->angle - ANG45;
-            ang2 = actor->angle + ANG45;
-            if (actor->health < (actor->info->spawnhealth / 3))
-            {                   // Spawn 2 at a time
-                mo = P_SpawnMissileAngle(parent, MT_SORCFX3, ang1,
-                                         4 * FRACUNIT);
-                if (mo)
-                    mo->target = parent;
-                mo = P_SpawnMissileAngle(parent, MT_SORCFX3, ang2,
-                                         4 * FRACUNIT);
-                if (mo)
-                    mo->target = parent;
-            }
-            else
-            {
-                if (P_Random() < 128)
-                    ang1 = ang2;
-                mo = P_SpawnMissileAngle(parent, MT_SORCFX3, ang1,
-                                         4 * FRACUNIT);
-                if (mo)
-                    mo->target = parent;
-            }
-            break;
-        default:
-            break;
-    }
-}
-
-/*
-void A_SpawnReinforcements(mobj_t *actor)
-{
-	mobj_t *parent = actor->target;
-	mobj_t *mo;
-	angle_t ang;
-
-	ang = ANG1 * P_Random();
-	mo = P_SpawnMissileAngle(actor, MT_SORCFX3, ang, 5*FRACUNIT);
-	if (mo) mo->target = parent;
-}
-*/
-
-// actor is ball
-void A_SorcOffense1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    angle_t ang1, ang2;
-    mobj_t *parent = (mobj_t *) actor->target;
-
-    ang1 = actor->angle + ANG1 * 70;
-    ang2 = actor->angle - ANG1 * 70;
-    mo = P_SpawnMissileAngle(parent, MT_SORCFX1, ang1, 0);
-    if (mo)
-    {
-        mo->target = parent;
-        mo->special1.m = parent->target;
-        mo->args[4] = BOUNCE_TIME_UNIT;
-        mo->args[3] = 15;       // Bounce time in seconds
-    }
-    mo = P_SpawnMissileAngle(parent, MT_SORCFX1, ang2, 0);
-    if (mo)
-    {
-        mo->target = parent;
-        mo->special1.m = parent->target;
-        mo->args[4] = BOUNCE_TIME_UNIT;
-        mo->args[3] = 15;       // Bounce time in seconds
-    }
-}
-
-
-// Actor is ball
-void A_SorcOffense2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t ang1;
-    mobj_t *mo;
-    int delta, index;
-    mobj_t *parent = actor->target;
-    mobj_t *dest = parent->target;
-    int dist;
-
-    index = actor->args[4] << 5;
-    actor->args[4] += 15;
-    delta = (finesine[index]) * SORCFX4_SPREAD_ANGLE;
-    delta = (delta >> FRACBITS) * ANG1;
-    ang1 = actor->angle + delta;
-    mo = P_SpawnMissileAngle(parent, MT_SORCFX4, ang1, 0);
-    if (mo)
-    {
-        mo->special2.i = 35 * 5 / 2;      // 5 seconds
-        dist = P_AproxDistance(dest->x - mo->x, dest->y - mo->y);
-        dist = dist / mo->info->speed;
-        if (dist < 1)
-            dist = 1;
-        mo->momz = (dest->z - mo->z) / dist;
-    }
-}
-
-
-// Resume ball spinning
-void A_SorcBossAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->args[3] = SORC_ACCELERATE;
-    actor->args[2] = SORCBALL_INITIAL_SPEED;
-}
-
-
-// spell cast magic fizzle
-void A_SpawnFizzle(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t x, y, z;
-    fixed_t dist = 5 * FRACUNIT;
-    angle_t angle = actor->angle >> ANGLETOFINESHIFT;
-    fixed_t speed = actor->info->speed;
-    angle_t rangle;
-    mobj_t *mo;
-    int ix;
-
-    x = actor->x + FixedMul(dist, finecosine[angle]);
-    y = actor->y + FixedMul(dist, finesine[angle]);
-    z = actor->z - actor->floorclip + (actor->height >> 1);
-    for (ix = 0; ix < 5; ix++)
-    {
-        mo = P_SpawnMobj(x, y, z, MT_SORCSPARK1);
-        if (mo)
-        {
-            rangle = angle + ((P_Random() % 5) << 1);
-            mo->momx = FixedMul(P_Random() % speed, finecosine[rangle]);
-            mo->momy = FixedMul(P_Random() % speed, finesine[rangle]);
-            mo->momz = FRACUNIT * 2;
-        }
-    }
-}
-
-
-//============================================================================
-// Yellow spell - offense
-//============================================================================
-
-void A_SorcFX1Seek(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_BounceCheck(actor, player, psp);
-    P_SeekerMissile(actor, ANG1 * 2, ANG1 * 6);
-}
-
-
-//============================================================================
-// Blue spell - defense
-//============================================================================
-//
-// FX2 Variables
-//              special1                current angle
-//              special2
-//              args[0]         0 = CW,  1 = CCW
-//              args[1]         
-//============================================================================
-
-// Split ball in two
-void A_SorcFX2Split(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCFX2);
-    if (mo)
-    {
-        mo->target = actor->target;
-        mo->args[0] = 0;        // CW
-        mo->special1.i = actor->angle;    // Set angle
-        P_SetMobjStateNF(mo, S_SORCFX2_ORBIT1);
-    }
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCFX2);
-    if (mo)
-    {
-        mo->target = actor->target;
-        mo->args[0] = 1;        // CCW
-        mo->special1.i = actor->angle;    // Set angle
-        P_SetMobjStateNF(mo, S_SORCFX2_ORBIT1);
-    }
-    P_SetMobjStateNF(actor, S_NULL);
-}
-
-
-// Orbit FX2 about sorcerer
-void A_SorcFX2Orbit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    fixed_t x, y, z;
-    mobj_t *parent = actor->target;
-    fixed_t dist = parent->info->radius;
-
-    if ((parent->health <= 0) ||        // Sorcerer is dead
-        (!parent->args[0]))     // Time expired
-    {
-        P_SetMobjStateNF(actor, actor->info->deathstate);
-        parent->args[0] = 0;
-        parent->flags2 &= ~MF2_REFLECTIVE;
-        parent->flags2 &= ~MF2_INVULNERABLE;
-    }
-
-    if (actor->args[0] && (parent->args[0]-- <= 0))     // Time expired
-    {
-        P_SetMobjStateNF(actor, actor->info->deathstate);
-        parent->args[0] = 0;
-        parent->flags2 &= ~MF2_REFLECTIVE;
-    }
-
-    // Move to new position based on angle
-    if (actor->args[0])         // Counter clock-wise
-    {
-        actor->special1.i += ANG1 * 10;
-        angle = ((angle_t) actor->special1.i) >> ANGLETOFINESHIFT;
-        x = parent->x + FixedMul(dist, finecosine[angle]);
-        y = parent->y + FixedMul(dist, finesine[angle]);
-        z = parent->z - parent->floorclip + SORC_DEFENSE_HEIGHT * FRACUNIT;
-        z += FixedMul(15 * FRACUNIT, finecosine[angle]);
-        // Spawn trailer
-        P_SpawnMobj(x, y, z, MT_SORCFX2_T1);
-    }
-    else                        // Clock wise
-    {
-        actor->special1.i -= ANG1 * 10;
-        angle = ((angle_t) actor->special1.i) >> ANGLETOFINESHIFT;
-        x = parent->x + FixedMul(dist, finecosine[angle]);
-        y = parent->y + FixedMul(dist, finesine[angle]);
-        z = parent->z - parent->floorclip + SORC_DEFENSE_HEIGHT * FRACUNIT;
-        z += FixedMul(20 * FRACUNIT, finesine[angle]);
-        // Spawn trailer
-        P_SpawnMobj(x, y, z, MT_SORCFX2_T1);
-    }
-
-    actor->x = x;
-    actor->y = y;
-    actor->z = z;
-}
-
-
-
-//============================================================================
-// Green spell - spawn bishops
-//============================================================================
-
-void A_SpawnBishop(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_BISHOP);
-    if (mo)
-    {
-        if (!P_TestMobjLocation(mo))
-        {
-            P_SetMobjState(mo, S_NULL);
-        }
-    }
-    P_SetMobjState(actor, S_NULL);
-}
-
-/*
-void A_SmokePuffEntry(mobj_t *actor)
-{
-	P_SpawnMobj(actor->x, actor->y, actor->z, MT_MNTRSMOKE);
-}
-*/
-
-void A_SmokePuffExit(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z, MT_MNTRSMOKEEXIT);
-}
-
-void A_SorcererBishopEntry(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z, MT_SORCFX3_EXPLOSION);
-    S_StartSound(actor, actor->info->seesound);
-}
-
-
-//============================================================================
-// FX4 - rapid fire balls
-//============================================================================
-
-void A_SorcFX4Check(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special2.i-- <= 0)
-    {
-        P_SetMobjStateNF(actor, actor->info->deathstate);
-    }
-}
-
-//============================================================================
-// Ball death - spawn stuff
-//============================================================================
-
-void A_SorcBallPop(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, SFX_SORCERER_BALLPOP);
-    actor->flags &= ~MF_NOGRAVITY;
-    actor->flags2 |= MF2_LOGRAV;
-    actor->momx = ((P_Random() % 10) - 5) << FRACBITS;
-    actor->momy = ((P_Random() % 10) - 5) << FRACBITS;
-    actor->momz = (2 + (P_Random() % 3)) << FRACBITS;
-    actor->special2.i = 4 * FRACUNIT;     // Initial bounce factor
-    actor->args[4] = BOUNCE_TIME_UNIT;  // Bounce time unit
-    actor->args[3] = 5;         // Bounce time in seconds
-}
-
-
-
-void A_BounceCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->args[4]-- <= 0)
-    {
-        if (actor->args[3]-- <= 0)
-        {
-            P_SetMobjState(actor, actor->info->deathstate);
-            switch (actor->type)
-            {
-                case MT_SORCBALL1:
-                case MT_SORCBALL2:
-                case MT_SORCBALL3:
-                    S_StartSound(NULL, SFX_SORCERER_BIGBALLEXPLODE);
-                    break;
-                case MT_SORCFX1:
-                    S_StartSound(NULL, SFX_SORCERER_HEADSCREAM);
-                    break;
-                default:
-                    break;
-            }
-        }
-        else
-        {
-            actor->args[4] = BOUNCE_TIME_UNIT;
-        }
-    }
-}
-
-
-
-
-//============================================================================
-// Class Bosses
-//============================================================================
-#define CLASS_BOSS_STRAFE_RANGE	64*10*FRACUNIT
-
-void A_FastChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int delta;
-    fixed_t dist;
-    angle_t ang;
-    mobj_t *target;
-
-    if (actor->reactiontime)
-    {
-        actor->reactiontime--;
-    }
-
-    // Modify target threshold
-    if (actor->threshold)
-    {
-        actor->threshold--;
-    }
-
-    if (gameskill == sk_nightmare)
-    {                           // Monsters move faster in nightmare mode
-        actor->tics -= actor->tics / 2;
-        if (actor->tics < 3)
-        {
-            actor->tics = 3;
-        }
-    }
-
-//
-// turn towards movement direction if not there yet
-//
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-        delta = actor->angle - (actor->movedir << 29);
-        if (delta > 0)
-        {
-            actor->angle -= ANG90 / 2;
-        }
-        else if (delta < 0)
-        {
-            actor->angle += ANG90 / 2;
-        }
-    }
-
-    if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
-    {                           // look for a new target
-        if (P_LookForPlayers(actor, true))
-        {                       // got a new target
-            return;
-        }
-        P_SetMobjState(actor, actor->info->spawnstate);
-        return;
-    }
-
-//
-// don't attack twice in a row
-//
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-        if (gameskill != sk_nightmare)
-            P_NewChaseDir(actor);
-        return;
-    }
-
-    // Strafe
-    if (actor->special2.i > 0)
-    {
-        actor->special2.i--;
-    }
-    else
-    {
-        target = actor->target;
-        actor->special2.i = 0;
-        actor->momx = actor->momy = 0;
-        dist = P_AproxDistance(actor->x - target->x, actor->y - target->y);
-        if (dist < CLASS_BOSS_STRAFE_RANGE)
-        {
-            if (P_Random() < 100)
-            {
-                ang = R_PointToAngle2(actor->x, actor->y,
-                                      target->x, target->y);
-                if (P_Random() < 128)
-                    ang += ANG90;
-                else
-                    ang -= ANG90;
-                ang >>= ANGLETOFINESHIFT;
-                actor->momx = FixedMul(13 * FRACUNIT, finecosine[ang]);
-                actor->momy = FixedMul(13 * FRACUNIT, finesine[ang]);
-                actor->special2.i = 3;    // strafe time
-            }
-        }
-    }
-
-//
-// check for missile attack
-//
-    if (actor->info->missilestate)
-    {
-        if (gameskill < sk_nightmare && actor->movecount)
-            goto nomissile;
-        if (!P_CheckMissileRange(actor))
-            goto nomissile;
-        P_SetMobjState(actor, actor->info->missilestate);
-        actor->flags |= MF_JUSTATTACKED;
-        return;
-    }
-  nomissile:
-
-//
-// possibly choose another target
-//
-    if (netgame && !actor->threshold && !P_CheckSight(actor, actor->target))
-    {
-        if (P_LookForPlayers(actor, true))
-            return;             // got a new target
-    }
-
-//
-// chase towards player
-//
-    if (!actor->special2.i)
-    {
-        if (--actor->movecount < 0 || !P_Move(actor))
-        {
-            P_NewChaseDir(actor);
-        }
-    }
-}
-
-
-void A_FighterAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-        return;
-    A_FSwordAttack2(actor, player, psp);
-}
-
-
-void A_ClericAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-        return;
-    A_CHolyAttack3(actor, player, psp);
-}
-
-
-
-void A_MageAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!actor->target)
-        return;
-    A_MStaffAttack2(actor, player, psp);
-}
-
-void A_ClassBossHealth(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (netgame && !deathmatch) // co-op only
-    {
-        if (!actor->special1.i)
-        {
-            actor->health *= 5;
-            actor->special1.i = true;     // has been initialized
-        }
-    }
-}
-
-
-//===========================================================================
-//
-// A_CheckFloor - Checks if an object hit the floor
-//
-//===========================================================================
-
-void A_CheckFloor(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->z <= actor->floorz)
-    {
-        actor->z = actor->floorz;
-        actor->flags2 &= ~MF2_LOGRAV;
-        P_SetMobjState(actor, actor->info->deathstate);
-    }
-}
-
-//============================================================================
-//
-// A_FreezeDeath
-//
-//============================================================================
-
-void A_FreezeDeath(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int r = P_Random();
-    actor->tics = 75 + r + P_Random();
-    actor->flags |= MF_SOLID | MF_SHOOTABLE | MF_NOBLOOD;
-    actor->flags2 |= MF2_PUSHABLE | MF2_TELESTOMP | MF2_PASSMOBJ | MF2_SLIDE;
-    actor->height <<= 2;
-    S_StartSound(actor, SFX_FREEZE_DEATH);
-
-    if (actor->player)
-    {
-        actor->player->damagecount = 0;
-        actor->player->poisoncount = 0;
-        actor->player->bonuscount = 0;
-        if (actor->player == &players[consoleplayer])
-        {
-            SB_PaletteFlash(false);
-        }
-    }
-    else if (actor->flags & MF_COUNTKILL && actor->special)
-    {
-        // Initiate monster death actions.
-        P_ExecuteLineSpecial(actor->special, actor->args, NULL, 0, actor);
-    }
-}
-
-//============================================================================
-//
-// A_IceSetTics
-//
-//============================================================================
-
-void A_IceSetTics(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int floor;
-
-    actor->tics = 70 + (P_Random() & 63);
-    floor = P_GetThingFloorType(actor);
-    if (floor == FLOOR_LAVA)
-    {
-        actor->tics >>= 2;
-    }
-    else if (floor == FLOOR_ICE)
-    {
-        actor->tics <<= 1;
-    }
-}
-
-//============================================================================
-//
-// A_IceCheckHeadDone
-//
-//============================================================================
-
-void A_IceCheckHeadDone(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->special2.i == 666)
-    {
-        P_SetMobjState(actor, S_ICECHUNK_HEAD2);
-    }
-}
-
-//============================================================================
-//
-// A_FreezeDeathChunks
-//
-//============================================================================
-
-void A_FreezeDeathChunks(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    int r1,r2,r3;
-    mobj_t *mo;
-
-    if (actor->momx || actor->momy || actor->momz)
-    {
-        actor->tics = 105;
-        return;
-    }
-    S_StartSound(actor, SFX_FREEZE_SHATTER);
-
-    for (i = 12 + (P_Random() & 15); i >= 0; i--)
-    {
-        r1 = P_Random();
-        r2 = P_Random();
-        r3 = P_Random();
-        mo = P_SpawnMobj(actor->x +
-                         (((r3 - 128) * actor->radius) >> 7),
-                         actor->y +
-                         (((r2 - 128) * actor->radius) >> 7),
-                         actor->z + (r1 * actor->height / 255),
-                         MT_ICECHUNK);
-        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 3));
-        mo->momz = FixedDiv(mo->z - actor->z, actor->height) << 2;
-        mo->momx = P_SubRandom() << (FRACBITS - 7);
-        mo->momy = P_SubRandom() << (FRACBITS - 7);
-        A_IceSetTics(mo, NULL, NULL);   // set a random tic wait
-    }
-    for (i = 12 + (P_Random() & 15); i >= 0; i--)
-    {
-        r1 = P_Random();
-        r2 = P_Random();
-        r3 = P_Random();
-        mo = P_SpawnMobj(actor->x +
-                         (((r3 - 128) * actor->radius) >> 7),
-                         actor->y +
-                         (((r2 - 128) * actor->radius) >> 7),
-                         actor->z + (r1 * actor->height / 255),
-                         MT_ICECHUNK);
-        P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 3));
-        mo->momz = FixedDiv(mo->z - actor->z, actor->height) << 2;
-        mo->momx = P_SubRandom() << (FRACBITS - 7);
-        mo->momy = P_SubRandom() << (FRACBITS - 7);
-        A_IceSetTics(mo, NULL, NULL);   // set a random tic wait
-    }
-    if (actor->player)
-    {                           // attach the player's view to a chunk of ice
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z + VIEWHEIGHT,
-                         MT_ICECHUNK);
-        P_SetMobjState(mo, S_ICECHUNK_HEAD);
-        mo->momz = FixedDiv(mo->z - actor->z, actor->height) << 2;
-        mo->momx = P_SubRandom() << (FRACBITS - 7);
-        mo->momy = P_SubRandom() << (FRACBITS - 7);
-        mo->flags2 |= MF2_ICEDAMAGE;    // used to force blue palette
-        mo->flags2 &= ~MF2_FLOORCLIP;
-        mo->player = actor->player;
-        actor->player = NULL;
-        mo->health = actor->health;
-        mo->angle = actor->angle;
-        mo->player->mo = mo;
-        mo->player->lookdir = 0;
-    }
-    P_RemoveMobjFromTIDList(actor);
-    P_SetMobjState(actor, S_FREETARGMOBJ);
-    actor->flags2 |= MF2_DONTDRAW;
-}
-
-//===========================================================================
-// Korax Variables
-//      special1        last teleport destination
-//      special2        set if "below half" script not yet run
-//
-// Korax Scripts (reserved)
-//      249             Tell scripts that we are below half health
-//      250-254 Control scripts
-//      255             Death script
-//
-// Korax TIDs (reserved)
-//      245             Reserved for Korax himself
-//  248         Initial teleport destination
-//      249             Teleport destination
-//      250-254 For use in respective control scripts
-//      255             For use in death script (spawn spots)
-//===========================================================================
-#define KORAX_SPIRIT_LIFETIME	(5*(35/5))      // 5 seconds
-#define KORAX_COMMAND_HEIGHT	(120*FRACUNIT)
-#define KORAX_COMMAND_OFFSET	(27*FRACUNIT)
-
-void KoraxFire1(mobj_t * actor, int type);
-void KoraxFire2(mobj_t * actor, int type);
-void KoraxFire3(mobj_t * actor, int type);
-void KoraxFire4(mobj_t * actor, int type);
-void KoraxFire5(mobj_t * actor, int type);
-void KoraxFire6(mobj_t * actor, int type);
-void KSpiritInit(mobj_t * spirit, mobj_t * korax);
-
-#define KORAX_TID					(245)
-#define KORAX_FIRST_TELEPORT_TID	(248)
-#define KORAX_TELEPORT_TID			(249)
-
-void A_KoraxChase(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *spot;
-    int lastfound;
-    byte args[3] = {0, 0, 0};
-
-    if ((!actor->special2.i) &&
-        (actor->health <= (actor->info->spawnhealth / 2)))
-    {
-        lastfound = 0;
-        spot = P_FindMobjFromTID(KORAX_FIRST_TELEPORT_TID, &lastfound);
-        if (spot)
-        {
-            P_Teleport(actor, spot->x, spot->y, spot->angle, true);
-        }
-
-        CheckACSPresent(249);
-        P_StartACS(249, 0, args, actor, NULL, 0);
-        actor->special2.i = 1;    // Don't run again
-
-        return;
-    }
-
-    if (!actor->target)
-        return;
-    if (P_Random() < 30)
-    {
-        P_SetMobjState(actor, actor->info->missilestate);
-    }
-    else if (P_Random() < 30)
-    {
-        S_StartSound(NULL, SFX_KORAX_ACTIVE);
-    }
-
-    // Teleport away
-    if (actor->health < (actor->info->spawnhealth >> 1))
-    {
-        if (P_Random() < 10)
-        {
-            lastfound = actor->special1.i;
-            spot = P_FindMobjFromTID(KORAX_TELEPORT_TID, &lastfound);
-            actor->special1.i = lastfound;
-            if (spot)
-            {
-                P_Teleport(actor, spot->x, spot->y, spot->angle, true);
-            }
-        }
-    }
-}
-
-void A_KoraxStep(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_Chase(actor, player, psp);
-}
-
-void A_KoraxStep2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    S_StartSound(NULL, SFX_KORAX_STEP);
-    A_Chase(actor, player, psp);
-}
-
-void A_KoraxBonePop(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    byte args[5];
-
-    args[0] = args[1] = args[2] = args[3] = args[4] = 0;
-
-    // Spawn 6 spirits equalangularly
-    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT1, ANG60 * 0,
-                             5 * FRACUNIT);
-    if (mo)
-        KSpiritInit(mo, actor);
-    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT2, ANG60 * 1,
-                             5 * FRACUNIT);
-    if (mo)
-        KSpiritInit(mo, actor);
-    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT3, ANG60 * 2,
-                             5 * FRACUNIT);
-    if (mo)
-        KSpiritInit(mo, actor);
-    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT4, ANG60 * 3,
-                             5 * FRACUNIT);
-    if (mo)
-        KSpiritInit(mo, actor);
-    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT5, ANG60 * 4,
-                             5 * FRACUNIT);
-    if (mo)
-        KSpiritInit(mo, actor);
-    mo = P_SpawnMissileAngle(actor, MT_KORAX_SPIRIT6, ANG60 * 5,
-                             5 * FRACUNIT);
-    if (mo)
-        KSpiritInit(mo, actor);
-
-    CheckACSPresent(255);
-    P_StartACS(255, 0, args, actor, NULL, 0);   // Death script
-}
-
-void KSpiritInit(mobj_t * spirit, mobj_t * korax)
-{
-    int i;
-    mobj_t *tail, *next;
-
-    spirit->health = KORAX_SPIRIT_LIFETIME;
-
-    spirit->special1.m = korax;     // Swarm around korax
-    spirit->special2.i = 32 + (P_Random() & 7);   // Float bob index
-    spirit->args[0] = 10;       // initial turn value
-    spirit->args[1] = 0;        // initial look angle
-
-    // Spawn a tail for spirit
-    tail = P_SpawnMobj(spirit->x, spirit->y, spirit->z, MT_HOLY_TAIL);
-    tail->special2.m = spirit;      // parent
-    for (i = 1; i < 3; i++)
-    {
-        next = P_SpawnMobj(spirit->x, spirit->y, spirit->z, MT_HOLY_TAIL);
-        P_SetMobjState(next, next->info->spawnstate + 1);
-        tail->special1.m = next;
-        tail = next;
-    }
-    tail->special1.m = NULL;         // last tail bit
-}
-
-void A_KoraxDecide(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (P_Random() < 220)
-    {
-        P_SetMobjState(actor, S_KORAX_MISSILE1);
-    }
-    else
-    {
-        P_SetMobjState(actor, S_KORAX_COMMAND1);
-    }
-}
-
-void A_KoraxMissile(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int type = P_Random() % 6;
-    int sound = 0;
-
-    S_StartSound(actor, SFX_KORAX_ATTACK);
-
-    switch (type)
-    {
-        case 0:
-            type = MT_WRAITHFX1;
-            sound = SFX_WRAITH_MISSILE_FIRE;
-            break;
-        case 1:
-            type = MT_DEMONFX1;
-            sound = SFX_DEMON_MISSILE_FIRE;
-            break;
-        case 2:
-            type = MT_DEMON2FX1;
-            sound = SFX_DEMON_MISSILE_FIRE;
-            break;
-        case 3:
-            type = MT_FIREDEMON_FX6;
-            sound = SFX_FIRED_ATTACK;
-            break;
-        case 4:
-            type = MT_CENTAUR_FX;
-            sound = SFX_CENTAURLEADER_ATTACK;
-            break;
-        case 5:
-            type = MT_SERPENTFX;
-            sound = SFX_CENTAURLEADER_ATTACK;
-            break;
-    }
-
-    // Fire all 6 missiles at once
-    S_StartSound(NULL, sound);
-    KoraxFire1(actor, type);
-    KoraxFire2(actor, type);
-    KoraxFire3(actor, type);
-    KoraxFire4(actor, type);
-    KoraxFire5(actor, type);
-    KoraxFire6(actor, type);
-}
-
-
-// Call action code scripts (250-254)
-void A_KoraxCommand(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    byte args[5];
-    fixed_t x, y, z;
-    angle_t ang;
-    int numcommands;
-
-    S_StartSound(actor, SFX_KORAX_COMMAND);
-
-    // Shoot stream of lightning to ceiling
-    ang = (actor->angle - ANG90) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_COMMAND_OFFSET, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_COMMAND_OFFSET, finesine[ang]);
-    z = actor->z + KORAX_COMMAND_HEIGHT;
-    P_SpawnMobj(x, y, z, MT_KORAX_BOLT);
-
-    args[0] = args[1] = args[2] = args[3] = args[4] = 0;
-
-    if (actor->health <= (actor->info->spawnhealth >> 1))
-    {
-        numcommands = 5;
-    }
-    else
-    {
-        numcommands = 4;
-    }
-
-    switch (P_Random() % numcommands)
-    {
-        case 0:
-            CheckACSPresent(250);
-            P_StartACS(250, 0, args, actor, NULL, 0);
-            break;
-        case 1:
-            CheckACSPresent(251);
-            P_StartACS(251, 0, args, actor, NULL, 0);
-            break;
-        case 2:
-            CheckACSPresent(252);
-            P_StartACS(252, 0, args, actor, NULL, 0);
-            break;
-        case 3:
-            CheckACSPresent(253);
-            P_StartACS(253, 0, args, actor, NULL, 0);
-            break;
-        case 4:
-            CheckACSPresent(254);
-            P_StartACS(254, 0, args, actor, NULL, 0);
-            break;
-    }
-}
-
-
-#define KORAX_DELTAANGLE			(85*ANG1)
-#define KORAX_ARM_EXTENSION_SHORT	(40*FRACUNIT)
-#define KORAX_ARM_EXTENSION_LONG	(55*FRACUNIT)
-
-#define KORAX_ARM1_HEIGHT			(108*FRACUNIT)
-#define KORAX_ARM2_HEIGHT			(82*FRACUNIT)
-#define KORAX_ARM3_HEIGHT			(54*FRACUNIT)
-#define KORAX_ARM4_HEIGHT			(104*FRACUNIT)
-#define KORAX_ARM5_HEIGHT			(86*FRACUNIT)
-#define KORAX_ARM6_HEIGHT			(53*FRACUNIT)
-
-
-// Arm projectiles
-//              arm positions numbered:
-//                      1       top left
-//                      2       middle left
-//                      3       lower left
-//                      4       top right
-//                      5       middle right
-//                      6       lower right
-
-
-// Arm 1 projectile
-void KoraxFire1(mobj_t * actor, int type)
-{
-    angle_t ang;
-    fixed_t x, y, z;
-
-    ang = (actor->angle - KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_SHORT, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_SHORT, finesine[ang]);
-    z = actor->z - actor->floorclip + KORAX_ARM1_HEIGHT;
-    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
-}
-
-
-// Arm 2 projectile
-void KoraxFire2(mobj_t * actor, int type)
-{
-    angle_t ang;
-    fixed_t x, y, z;
-
-    ang = (actor->angle - KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
-    z = actor->z - actor->floorclip + KORAX_ARM2_HEIGHT;
-    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
-}
-
-// Arm 3 projectile
-void KoraxFire3(mobj_t * actor, int type)
-{
-    angle_t ang;
-    fixed_t x, y, z;
-
-    ang = (actor->angle - KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
-    z = actor->z - actor->floorclip + KORAX_ARM3_HEIGHT;
-    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
-}
-
-// Arm 4 projectile
-void KoraxFire4(mobj_t * actor, int type)
-{
-    angle_t ang;
-    fixed_t x, y, z;
-
-    ang = (actor->angle + KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_SHORT, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_SHORT, finesine[ang]);
-    z = actor->z - actor->floorclip + KORAX_ARM4_HEIGHT;
-    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
-}
-
-// Arm 5 projectile
-void KoraxFire5(mobj_t * actor, int type)
-{
-    angle_t ang;
-    fixed_t x, y, z;
-
-    ang = (actor->angle + KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
-    z = actor->z - actor->floorclip + KORAX_ARM5_HEIGHT;
-    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
-}
-
-// Arm 6 projectile
-void KoraxFire6(mobj_t * actor, int type)
-{
-    angle_t ang;
-    fixed_t x, y, z;
-
-    ang = (actor->angle + KORAX_DELTAANGLE) >> ANGLETOFINESHIFT;
-    x = actor->x + FixedMul(KORAX_ARM_EXTENSION_LONG, finecosine[ang]);
-    y = actor->y + FixedMul(KORAX_ARM_EXTENSION_LONG, finesine[ang]);
-    z = actor->z - actor->floorclip + KORAX_ARM6_HEIGHT;
-    P_SpawnKoraxMissile(x, y, z, actor, actor->target, type);
-}
-
-
-void A_KSpiritWeave(mobj_t *actor)
-{
-    fixed_t newX, newY;
-    int weaveXY, weaveZ;
-    int angle;
-
-    weaveXY = actor->special2.i >> 16;
-    weaveZ = actor->special2.i & 0xFFFF;
-    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    newX = actor->x - FixedMul(finecosine[angle],
-                               FloatBobOffsets[weaveXY] << 2);
-    newY = actor->y - FixedMul(finesine[angle],
-                               FloatBobOffsets[weaveXY] << 2);
-    weaveXY = (weaveXY + (P_Random() % 5)) & 63;
-    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 2);
-    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 2);
-    P_TryMove(actor, newX, newY);
-    actor->z -= FloatBobOffsets[weaveZ] << 1;
-    weaveZ = (weaveZ + (P_Random() % 5)) & 63;
-    actor->z += FloatBobOffsets[weaveZ] << 1;
-    actor->special2.i = weaveZ + (weaveXY << 16);
-}
-
-void A_KSpiritSeeker(mobj_t * actor, angle_t thresh, angle_t turnMax)
-{
-    int dir;
-    int dist;
-    angle_t delta;
-    angle_t angle;
-    mobj_t *target;
-    fixed_t newZ;
-    fixed_t deltaZ;
-
-    target = actor->special1.m;
-    if (target == NULL)
-    {
-        return;
-    }
-    dir = P_FaceMobj(actor, target, &delta);
-    if (delta > thresh)
-    {
-        delta >>= 1;
-        if (delta > turnMax)
-        {
-            delta = turnMax;
-        }
-    }
-    if (dir)
-    {                           // Turn clockwise
-        actor->angle += delta;
-    }
-    else
-    {                           // Turn counter clockwise
-        actor->angle -= delta;
-    }
-    angle = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
-    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
-
-    if (!(leveltime & 15)
-        || actor->z > target->z + (target->info->height)
-        || actor->z + actor->height < target->z)
-    {
-        newZ = target->z + ((P_Random() * target->info->height) >> 8);
-        deltaZ = newZ - actor->z;
-        if (abs(deltaZ) > 15 * FRACUNIT)
-        {
-            if (deltaZ > 0)
-            {
-                deltaZ = 15 * FRACUNIT;
-            }
-            else
-            {
-                deltaZ = -15 * FRACUNIT;
-            }
-        }
-        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
-        dist = dist / actor->info->speed;
-        if (dist < 1)
-        {
-            dist = 1;
-        }
-        actor->momz = deltaZ / dist;
-    }
-    return;
-}
-
-
-void A_KSpiritRoam(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (actor->health-- <= 0)
-    {
-        S_StartSound(actor, SFX_SPIRIT_DIE);
-        P_SetMobjState(actor, S_KSPIRIT_DEATH1);
-    }
-    else
-    {
-        if (actor->special1.m)
-        {
-            A_KSpiritSeeker(actor, actor->args[0] * ANG1,
-                            actor->args[0] * ANG1 * 2);
-        }
-        A_KSpiritWeave(actor);
-        if (P_Random() < 50)
-        {
-            S_StartSound(NULL, SFX_SPIRIT_ACTIVE);
-        }
-    }
-}
-
-void A_KBolt(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    // Countdown lifetime
-    if (actor->special1.i-- <= 0)
-    {
-        P_SetMobjState(actor, S_NULL);
-    }
-}
-
-
-#define KORAX_BOLT_HEIGHT		48*FRACUNIT
-#define KORAX_BOLT_LIFETIME		3
-
-void A_KBoltRaise(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    fixed_t z;
-
-    // Spawn a child upward
-    z = actor->z + KORAX_BOLT_HEIGHT;
-
-    if ((z + KORAX_BOLT_HEIGHT) < actor->ceilingz)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, z, MT_KORAX_BOLT);
-        if (mo)
-        {
-            mo->special1.i = KORAX_BOLT_LIFETIME;
-        }
-    }
-    else
-    {
-        // Maybe cap it off here
-    }
-}
diff --git a/games/NXDoom/src/hexen/p_floor.c b/games/NXDoom/src/hexen/p_floor.c
deleted file mode 100644
index 370cb173f..000000000
--- a/games/NXDoom/src/hexen/p_floor.c
+++ /dev/null
@@ -1,946 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "p_local.h"
-
-
-//==================================================================
-//==================================================================
-//
-//                                                              FLOORS
-//
-//==================================================================
-//==================================================================
-
-//==================================================================
-//
-//      Move a plane (floor or ceiling) and check for crushing
-//
-//==================================================================
-result_e T_MovePlane(sector_t * sector, fixed_t speed,
-                     fixed_t dest, int crush, int floorOrCeiling,
-                     int direction)
-{
-    boolean flag;
-    fixed_t lastpos;
-
-    switch (floorOrCeiling)
-    {
-        case 0:                // FLOOR
-            switch (direction)
-            {
-                case -1:       // DOWN
-                    if (sector->floorheight - speed < dest)
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return RES_CRUSHED;
-                        }
-                        return RES_PASTDEST;
-                    }
-                    else
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight -= speed;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return RES_CRUSHED;
-                        }
-                    }
-                    break;
-
-                case 1:        // UP
-                    if (sector->floorheight + speed > dest)
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return RES_CRUSHED;
-                        }
-                        return RES_PASTDEST;
-                    }
-                    else        // COULD GET CRUSHED
-                    {
-                        lastpos = sector->floorheight;
-                        sector->floorheight += speed;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            //if (crush == true)
-                            //{
-                            //      return RES_CRUSHED;
-                            //}
-                            sector->floorheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return RES_CRUSHED;
-                        }
-                    }
-                    break;
-            }
-            break;
-
-        case 1:                // CEILING
-            switch (direction)
-            {
-                case -1:       // DOWN
-                    if (sector->ceilingheight - speed < dest)
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return RES_CRUSHED;
-                        }
-                        return RES_PASTDEST;
-                    }
-                    else        // COULD GET CRUSHED
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight -= speed;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            //if (crush == true)
-                            //{
-                            //      return RES_CRUSHED;
-                            //}
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return RES_CRUSHED;
-                        }
-                    }
-                    break;
-
-                case 1:        // UP
-                    if (sector->ceilingheight + speed > dest)
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight = dest;
-                        flag = P_ChangeSector(sector, crush);
-                        if (flag == true)
-                        {
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            //return RES_CRUSHED;
-                        }
-                        return RES_PASTDEST;
-                    }
-                    else
-                    {
-                        lastpos = sector->ceilingheight;
-                        sector->ceilingheight += speed;
-                        flag = P_ChangeSector(sector, crush);
-#if 0
-                        if (flag == true)
-                        {
-                            sector->ceilingheight = lastpos;
-                            P_ChangeSector(sector, crush);
-                            return RES_CRUSHED;
-                        }
-#endif
-                    }
-                    break;
-            }
-            break;
-
-    }
-    return RES_OK;
-}
-
-//==================================================================
-//
-//      MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
-//
-//==================================================================
-void T_MoveFloor(thinker_t *thinker)
-{
-    floormove_t *floor = (floormove_t *) thinker;
-    result_e res;
-
-    if (floor->resetDelayCount)
-    {
-        floor->resetDelayCount--;
-        if (!floor->resetDelayCount)
-        {
-            floor->floordestheight = floor->resetHeight;
-            floor->direction = -floor->direction;
-            floor->resetDelay = 0;
-            floor->delayCount = 0;
-            floor->delayTotal = 0;
-        }
-    }
-    if (floor->delayCount)
-    {
-        floor->delayCount--;
-        if (!floor->delayCount && floor->textureChange)
-        {
-            floor->sector->floorpic += floor->textureChange;
-        }
-        return;
-    }
-
-    res = T_MovePlane(floor->sector, floor->speed,
-                      floor->floordestheight, floor->crush, 0,
-                      floor->direction);
-
-    if (floor->type == FLEV_RAISEBUILDSTEP)
-    {
-        if ((floor->direction == 1 && floor->sector->floorheight >=
-             floor->stairsDelayHeight) || (floor->direction == -1 &&
-                                           floor->sector->floorheight <=
-                                           floor->stairsDelayHeight))
-        {
-            floor->delayCount = floor->delayTotal;
-            floor->stairsDelayHeight += floor->stairsDelayHeightDelta;
-        }
-    }
-    if (res == RES_PASTDEST)
-    {
-        SN_StopSequence((mobj_t *) & floor->sector->soundorg);
-        if (floor->delayTotal)
-        {
-            floor->delayTotal = 0;
-        }
-        if (floor->resetDelay)
-        {
-//                      floor->resetDelayCount = floor->resetDelay;
-//                      floor->resetDelay = 0;
-            return;
-        }
-        floor->sector->specialdata = NULL;
-        /*
-           if (floor->direction == 1)
-           switch(floor->type)
-           {
-           case donutRaise:
-           floor->sector->special = floor->newspecial;
-           floor->sector->floorpic = floor->texture;
-           default:
-           break;
-           }
-           else if (floor->direction == -1)
-           switch(floor->type)
-           {
-           case lowerAndChange:
-           floor->sector->special = floor->newspecial;
-           floor->sector->floorpic = floor->texture;
-           default:
-           break;
-           }
-         */
-        if (floor->textureChange)
-        {
-            floor->sector->floorpic -= floor->textureChange;
-        }
-        P_TagFinished(floor->sector->tag);
-        P_RemoveThinker(&floor->thinker);
-    }
-}
-
-//==================================================================
-//
-//      HANDLE FLOOR TYPES
-//
-//==================================================================
-int EV_DoFloor(line_t * line, byte * args, floor_e floortype)
-{
-    int secnum;
-    int rtn;
-    sector_t *sec;
-    floormove_t *floor = NULL;
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        //      ALREADY MOVING?  IF SO, KEEP GOING...
-        if (sec->specialdata)
-            continue;
-
-        //
-        //      new floor thinker
-        //
-        rtn = 1;
-        floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-        memset(floor, 0, sizeof(*floor));
-        P_AddThinker(&floor->thinker);
-        sec->specialdata = floor;
-        floor->thinker.function = T_MoveFloor;
-        floor->type = floortype;
-        floor->crush = 0;
-        floor->speed = args[1] * (FRACUNIT / 8);
-        if (floortype == FLEV_LOWERTIMES8INSTANT ||
-            floortype == FLEV_RAISETIMES8INSTANT)
-        {
-            floor->speed = 2000 << FRACBITS;
-        }
-        switch (floortype)
-        {
-            case FLEV_LOWERFLOOR:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->floordestheight = P_FindHighestFloorSurrounding(sec);
-                break;
-            case FLEV_LOWERFLOORTOLOWEST:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->floordestheight = P_FindLowestFloorSurrounding(sec);
-                break;
-            case FLEV_LOWERFLOORBYVALUE:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->floordestheight = floor->sector->floorheight -
-                    args[2] * FRACUNIT;
-                break;
-            case FLEV_LOWERTIMES8INSTANT:
-            case FLEV_LOWERBYVALUETIMES8:
-                floor->direction = -1;
-                floor->sector = sec;
-                floor->floordestheight = floor->sector->floorheight -
-                    args[2] * FRACUNIT * 8;
-                break;
-            case FLEV_RAISEFLOORCRUSH:
-                floor->crush = args[2]; // arg[2] = crushing value
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->floordestheight = sec->ceilingheight - 8 * FRACUNIT;
-                break;
-            case FLEV_RAISEFLOOR:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->floordestheight = P_FindLowestCeilingSurrounding(sec);
-                if (floor->floordestheight > sec->ceilingheight)
-                    floor->floordestheight = sec->ceilingheight;
-                break;
-            case FLEV_RAISEFLOORTONEAREST:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->floordestheight =
-                    P_FindNextHighestFloor(sec, sec->floorheight);
-                break;
-            case FLEV_RAISEFLOORBYVALUE:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->floordestheight = floor->sector->floorheight +
-                    args[2] * FRACUNIT;
-                break;
-            case FLEV_RAISETIMES8INSTANT:
-            case FLEV_RAISEBYVALUETIMES8:
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->floordestheight = floor->sector->floorheight +
-                    args[2] * FRACUNIT * 8;
-                break;
-            case FLEV_MOVETOVALUETIMES8:
-                floor->sector = sec;
-                floor->floordestheight = args[2] * FRACUNIT * 8;
-                if (args[3])
-                {
-                    floor->floordestheight = -floor->floordestheight;
-                }
-                if (floor->floordestheight > floor->sector->floorheight)
-                {
-                    floor->direction = 1;
-                }
-                else if (floor->floordestheight < floor->sector->floorheight)
-                {
-                    floor->direction = -1;
-                }
-                else
-                {               // already at lowest position
-                    rtn = 0;
-                }
-                break;
-            default:
-                rtn = 0;
-                break;
-        }
-    }
-    if (rtn)
-    {
-        SN_StartSequence((mobj_t *) & floor->sector->soundorg,
-                         SEQ_PLATFORM + floor->sector->seqType);
-    }
-    return rtn;
-}
-
-//============================================================================
-//
-// EV_DoFloorAndCeiling
-//
-//============================================================================
-
-int EV_DoFloorAndCeiling(line_t * line, byte * args, boolean raise)
-{
-    boolean floor, ceiling;
-    int secnum;
-    sector_t *sec;
-
-    if (raise)
-    {
-        floor = EV_DoFloor(line, args, FLEV_RAISEFLOORBYVALUE);
-        secnum = -1;
-        while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-        {
-            sec = &sectors[secnum];
-            sec->specialdata = NULL;
-        }
-        ceiling = EV_DoCeiling(line, args, CLEV_RAISEBYVALUE);
-    }
-    else
-    {
-        floor = EV_DoFloor(line, args, FLEV_LOWERFLOORBYVALUE);
-        secnum = -1;
-        while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-        {
-            sec = &sectors[secnum];
-            sec->specialdata = NULL;
-        }
-        ceiling = EV_DoCeiling(line, args, CLEV_LOWERBYVALUE);
-    }
-    return (floor | ceiling);
-}
-
-// ===== Build Stairs Private Data =====
-
-#define STAIR_SECTOR_TYPE       26
-#define STAIR_QUEUE_SIZE        32
-
-struct
-{
-    sector_t *sector;
-    int type;
-    int height;
-} StairQueue[STAIR_QUEUE_SIZE];
-
-static int QueueHead;
-static int QueueTail;
-
-static int StepDelta;
-static int Direction;
-static int Speed;
-static int Texture;
-static int StartDelay;
-static int StartDelayDelta;
-static int TextureChange;
-static int StartHeight;
-
-//==========================================================================
-//
-// QueueStairSector
-//
-//==========================================================================
-
-static void QueueStairSector(sector_t * sec, int type, int height)
-{
-    if ((QueueTail + 1) % STAIR_QUEUE_SIZE == QueueHead)
-    {
-        I_Error("BuildStairs:  Too many branches located.\n");
-    }
-    StairQueue[QueueTail].sector = sec;
-    StairQueue[QueueTail].type = type;
-    StairQueue[QueueTail].height = height;
-
-    QueueTail = (QueueTail + 1) % STAIR_QUEUE_SIZE;
-}
-
-//==========================================================================
-//
-// DequeueStairSector
-//
-//==========================================================================
-
-static sector_t *DequeueStairSector(int *type, int *height)
-{
-    sector_t *sec;
-
-    if (QueueHead == QueueTail)
-    {                           // queue is empty
-        return NULL;
-    }
-    *type = StairQueue[QueueHead].type;
-    *height = StairQueue[QueueHead].height;
-    sec = StairQueue[QueueHead].sector;
-    QueueHead = (QueueHead + 1) % STAIR_QUEUE_SIZE;
-
-    return sec;
-}
-
-//==========================================================================
-//
-// ProcessStairSector
-//
-//==========================================================================
-
-static void ProcessStairSector(sector_t * sec, int type, int height,
-                               stairs_e stairsType, int delay, int resetDelay)
-{
-    int i;
-    sector_t *tsec;
-    floormove_t *floor;
-
-    //
-    // new floor thinker
-    //
-    height += StepDelta;
-    floor = Z_Malloc(sizeof(*floor), PU_LEVSPEC, 0);
-    memset(floor, 0, sizeof(*floor));
-    P_AddThinker(&floor->thinker);
-    sec->specialdata = floor;
-    floor->thinker.function = T_MoveFloor;
-    floor->type = FLEV_RAISEBUILDSTEP;
-    floor->direction = Direction;
-    floor->sector = sec;
-    floor->floordestheight = height;
-    switch (stairsType)
-    {
-        case STAIRS_NORMAL:
-            floor->speed = Speed;
-            if (delay)
-            {
-                floor->delayTotal = delay;
-                floor->stairsDelayHeight = sec->floorheight + StepDelta;
-                floor->stairsDelayHeightDelta = StepDelta;
-            }
-            floor->resetDelay = resetDelay;
-            floor->resetDelayCount = resetDelay;
-            floor->resetHeight = sec->floorheight;
-            break;
-        case STAIRS_SYNC:
-            floor->speed = FixedMul(Speed, FixedDiv(height - StartHeight,
-                                                    StepDelta));
-            floor->resetDelay = delay;  //arg4
-            floor->resetDelayCount = delay;
-            floor->resetHeight = sec->floorheight;
-            break;
-/*
-		case STAIRS_PHASED:
-			floor->floordestheight = sec->floorheight+StepDelta;
-			floor->speed = Speed;
-			floor->delayCount = StartDelay;
-			StartDelay += StartDelayDelta;
-			floor->textureChange = TextureChange;
-			floor->resetDelayCount = StartDelay;
-			break;
-*/
-        default:
-            break;
-    }
-    SN_StartSequence((mobj_t *) & sec->soundorg, SEQ_PLATFORM + sec->seqType);
-    //
-    // Find next sector to raise
-    // Find nearby sector with sector special equal to type
-    //
-    for (i = 0; i < sec->linecount; i++)
-    {
-        if (!((sec->lines[i])->flags & ML_TWOSIDED))
-        {
-            continue;
-        }
-        tsec = (sec->lines[i])->frontsector;
-        if (tsec->special == type + STAIR_SECTOR_TYPE && !tsec->specialdata
-            && tsec->floorpic == Texture && tsec->validcount != validcount)
-        {
-            QueueStairSector(tsec, type ^ 1, height);
-            tsec->validcount = validcount;
-            //tsec->special = 0;
-        }
-        tsec = (sec->lines[i])->backsector;
-        if (tsec->special == type + STAIR_SECTOR_TYPE && !tsec->specialdata
-            && tsec->floorpic == Texture && tsec->validcount != validcount)
-        {
-            QueueStairSector(tsec, type ^ 1, height);
-            tsec->validcount = validcount;
-            //tsec->special = 0;
-        }
-    }
-}
-
-//==================================================================
-//
-//      BUILD A STAIRCASE!
-//
-// Direction is either positive or negative, denoting build stairs
-//      up or down.
-//==================================================================
-
-int EV_BuildStairs(line_t * line, byte * args, int direction,
-                   stairs_e stairsType)
-{
-    int secnum;
-    int height;
-    int delay;
-    int resetDelay;
-    sector_t *sec;
-    sector_t *qSec;
-    int type;
-
-    // Set global stairs variables
-    TextureChange = 0;
-    Direction = direction;
-    StepDelta = Direction * (args[2] * FRACUNIT);
-    Speed = args[1] * (FRACUNIT / 8);
-    resetDelay = args[4];
-    delay = args[3];
-    if (stairsType == STAIRS_PHASED)
-    {
-        StartDelayDelta = args[3];
-        StartDelay = StartDelayDelta;
-        resetDelay = StartDelayDelta;
-        delay = 0;
-        TextureChange = args[4];
-    }
-
-    secnum = -1;
-
-    validcount++;
-    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        Texture = sec->floorpic;
-        StartHeight = sec->floorheight;
-
-        // ALREADY MOVING?  IF SO, KEEP GOING...
-        if (sec->specialdata)
-            continue;
-
-        QueueStairSector(sec, 0, sec->floorheight);
-        sec->special = 0;
-    }
-    while ((qSec = DequeueStairSector(&type, &height)) != NULL)
-    {
-        ProcessStairSector(qSec, type, height, stairsType, delay, resetDelay);
-    }
-    return (1);
-}
-
-//=========================================================================
-//
-// T_BuildPillar
-//
-//=========================================================================
-
-void T_BuildPillar(thinker_t *thinker)
-{
-	pillar_t *pillar = (pillar_t *) thinker;
-    result_e res1;
-    result_e res2;
-
-    // First, raise the floor
-    res1 = T_MovePlane(pillar->sector, pillar->floorSpeed, pillar->floordest, pillar->crush, 0, pillar->direction);     // floorOrCeiling, direction
-    // Then, lower the ceiling
-    res2 = T_MovePlane(pillar->sector, pillar->ceilingSpeed,
-                       pillar->ceilingdest, pillar->crush, 1,
-                       -pillar->direction);
-    if (res1 == RES_PASTDEST && res2 == RES_PASTDEST)
-    {
-        pillar->sector->specialdata = NULL;
-        SN_StopSequence((mobj_t *) & pillar->sector->soundorg);
-        P_TagFinished(pillar->sector->tag);
-        P_RemoveThinker(&pillar->thinker);
-    }
-}
-
-//=========================================================================
-//
-// EV_BuildPillar
-//
-//=========================================================================
-
-int EV_BuildPillar(line_t * line, byte * args, boolean crush)
-{
-    int secnum;
-    sector_t *sec;
-    pillar_t *pillar;
-    int newHeight;
-    int rtn;
-
-    rtn = 0;
-    secnum = -1;
-    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;           // already moving
-        if (sec->floorheight == sec->ceilingheight)
-        {                       // pillar is already closed
-            continue;
-        }
-        rtn = 1;
-        if (!args[2])
-        {
-            newHeight = sec->floorheight +
-                ((sec->ceilingheight - sec->floorheight) / 2);
-        }
-        else
-        {
-            newHeight = sec->floorheight + (args[2] << FRACBITS);
-        }
-
-        pillar = Z_Malloc(sizeof(*pillar), PU_LEVSPEC, 0);
-        sec->specialdata = pillar;
-        P_AddThinker(&pillar->thinker);
-        pillar->thinker.function = T_BuildPillar;
-        pillar->sector = sec;
-        if (!args[2])
-        {
-            pillar->ceilingSpeed = pillar->floorSpeed =
-                args[1] * (FRACUNIT / 8);
-        }
-        else if (newHeight - sec->floorheight >
-                 sec->ceilingheight - newHeight)
-        {
-            pillar->floorSpeed = args[1] * (FRACUNIT / 8);
-            pillar->ceilingSpeed = FixedMul(sec->ceilingheight - newHeight,
-                                            FixedDiv(pillar->floorSpeed,
-                                                     newHeight -
-                                                     sec->floorheight));
-        }
-        else
-        {
-            pillar->ceilingSpeed = args[1] * (FRACUNIT / 8);
-            pillar->floorSpeed = FixedMul(newHeight - sec->floorheight,
-                                          FixedDiv(pillar->ceilingSpeed,
-                                                   sec->ceilingheight -
-                                                   newHeight));
-        }
-        pillar->floordest = newHeight;
-        pillar->ceilingdest = newHeight;
-        pillar->direction = 1;
-        pillar->crush = crush * args[3];
-        SN_StartSequence((mobj_t *) & pillar->sector->soundorg,
-                         SEQ_PLATFORM + pillar->sector->seqType);
-    }
-    return rtn;
-}
-
-//=========================================================================
-//
-// EV_OpenPillar
-//
-//=========================================================================
-
-int EV_OpenPillar(line_t * line, byte * args)
-{
-    int secnum;
-    sector_t *sec;
-    pillar_t *pillar;
-    int rtn;
-
-    rtn = 0;
-    secnum = -1;
-    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;           // already moving
-        if (sec->floorheight != sec->ceilingheight)
-        {                       // pillar isn't closed
-            continue;
-        }
-        rtn = 1;
-        pillar = Z_Malloc(sizeof(*pillar), PU_LEVSPEC, 0);
-        sec->specialdata = pillar;
-        P_AddThinker(&pillar->thinker);
-        pillar->thinker.function = T_BuildPillar;
-        pillar->sector = sec;
-        if (!args[2])
-        {
-            pillar->floordest = P_FindLowestFloorSurrounding(sec);
-        }
-        else
-        {
-            pillar->floordest = sec->floorheight - (args[2] << FRACBITS);
-        }
-        if (!args[3])
-        {
-            pillar->ceilingdest = P_FindHighestCeilingSurrounding(sec);
-        }
-        else
-        {
-            pillar->ceilingdest = sec->ceilingheight + (args[3] << FRACBITS);
-        }
-        if (sec->floorheight - pillar->floordest >= pillar->ceilingdest -
-            sec->ceilingheight)
-        {
-            pillar->floorSpeed = args[1] * (FRACUNIT / 8);
-            pillar->ceilingSpeed = FixedMul(sec->ceilingheight -
-                                            pillar->ceilingdest,
-                                            FixedDiv(pillar->floorSpeed,
-                                                     pillar->floordest -
-                                                     sec->floorheight));
-        }
-        else
-        {
-            pillar->ceilingSpeed = args[1] * (FRACUNIT / 8);
-            pillar->floorSpeed =
-                FixedMul(pillar->floordest - sec->floorheight,
-                         FixedDiv(pillar->ceilingSpeed,
-                                  sec->ceilingheight - pillar->ceilingdest));
-        }
-        pillar->direction = -1; // open the pillar
-        SN_StartSequence((mobj_t *) & pillar->sector->soundorg,
-                         SEQ_PLATFORM + pillar->sector->seqType);
-    }
-    return rtn;
-}
-
-//=========================================================================
-//
-// EV_FloorCrushStop
-//
-//=========================================================================
-
-int EV_FloorCrushStop(line_t * line, byte * args)
-{
-    thinker_t *think;
-    floormove_t *floor;
-    boolean rtn;
-
-    rtn = 0;
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != T_MoveFloor)
-        {
-            continue;
-        }
-        floor = (floormove_t *) think;
-        if (floor->type != FLEV_RAISEFLOORCRUSH)
-        {
-            continue;
-        }
-        // Completely remove the crushing floor
-        SN_StopSequence((mobj_t *) & floor->sector->soundorg);
-        floor->sector->specialdata = NULL;
-        P_TagFinished(floor->sector->tag);
-        P_RemoveThinker(&floor->thinker);
-        rtn = 1;
-    }
-    return rtn;
-}
-
-//==========================================================================
-//
-// T_FloorWaggle
-//
-//==========================================================================
-
-#define WGLSTATE_EXPAND 1
-#define WGLSTATE_STABLE 2
-#define WGLSTATE_REDUCE 3
-
-void T_FloorWaggle(thinker_t *thinker)
-{
-	floorWaggle_t *waggle = (floorWaggle_t *) thinker;
-    switch (waggle->state)
-    {
-        case WGLSTATE_EXPAND:
-            if ((waggle->scale += waggle->scaleDelta) >= waggle->targetScale)
-            {
-                waggle->scale = waggle->targetScale;
-                waggle->state = WGLSTATE_STABLE;
-            }
-            break;
-        case WGLSTATE_REDUCE:
-            if ((waggle->scale -= waggle->scaleDelta) <= 0)
-            {                   // Remove
-                waggle->sector->floorheight = waggle->originalHeight;
-                P_ChangeSector(waggle->sector, true);
-                waggle->sector->specialdata = NULL;
-                P_TagFinished(waggle->sector->tag);
-                P_RemoveThinker(&waggle->thinker);
-                return;
-            }
-            break;
-        case WGLSTATE_STABLE:
-            if (waggle->ticker != -1)
-            {
-                if (!--waggle->ticker)
-                {
-                    waggle->state = WGLSTATE_REDUCE;
-                }
-            }
-            break;
-    }
-    waggle->accumulator += waggle->accDelta;
-    waggle->sector->floorheight = waggle->originalHeight
-        + FixedMul(FloatBobOffsets[(waggle->accumulator >> FRACBITS) & 63],
-                   waggle->scale);
-    P_ChangeSector(waggle->sector, true);
-}
-
-//==========================================================================
-//
-// EV_StartFloorWaggle
-//
-//==========================================================================
-
-boolean EV_StartFloorWaggle(int tag, int height, int speed, int offset,
-                            int timer)
-{
-    int sectorIndex;
-    sector_t *sector;
-    floorWaggle_t *waggle;
-    boolean retCode;
-
-    retCode = false;
-    sectorIndex = -1;
-    while ((sectorIndex = P_FindSectorFromTag(tag, sectorIndex)) >= 0)
-    {
-        sector = &sectors[sectorIndex];
-        if (sector->specialdata)
-        {                       // Already busy with another thinker
-            continue;
-        }
-        retCode = true;
-        waggle = Z_Malloc(sizeof(*waggle), PU_LEVSPEC, 0);
-        sector->specialdata = waggle;
-        waggle->thinker.function = T_FloorWaggle;
-        waggle->sector = sector;
-        waggle->originalHeight = sector->floorheight;
-        waggle->accumulator = offset * FRACUNIT;
-        waggle->accDelta = speed << 10;
-        waggle->scale = 0;
-        waggle->targetScale = height << 10;
-        waggle->scaleDelta = waggle->targetScale
-            / (35 + ((3 * 35) * height) / 255);
-        waggle->ticker = timer ? timer * 35 : -1;
-        waggle->state = WGLSTATE_EXPAND;
-        P_AddThinker(&waggle->thinker);
-    }
-    return retCode;
-}
diff --git a/games/NXDoom/src/hexen/p_inter.c b/games/NXDoom/src/hexen/p_inter.c
deleted file mode 100644
index fab06674c..000000000
--- a/games/NXDoom/src/hexen/p_inter.c
+++ /dev/null
@@ -1,2231 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-#define BONUSADD 6
-
-int ArmorIncrement[NUMCLASSES][NUMARMOR] = {
-    {25 * FRACUNIT, 20 * FRACUNIT, 15 * FRACUNIT, 5 * FRACUNIT},
-    {10 * FRACUNIT, 25 * FRACUNIT, 5 * FRACUNIT, 20 * FRACUNIT},
-    {5 * FRACUNIT, 15 * FRACUNIT, 10 * FRACUNIT, 25 * FRACUNIT},
-    {0, 0, 0, 0}
-};
-
-int AutoArmorSave[NUMCLASSES] =
-    { 15 * FRACUNIT, 10 * FRACUNIT, 5 * FRACUNIT, 0 };
-
-const char *TextKeyMessages[] = {
-    TXT_KEY_STEEL,
-    TXT_KEY_CAVE,
-    TXT_KEY_AXE,
-    TXT_KEY_FIRE,
-    TXT_KEY_EMERALD,
-    TXT_KEY_DUNGEON,
-    TXT_KEY_SILVER,
-    TXT_KEY_RUSTED,
-    TXT_KEY_HORN,
-    TXT_KEY_SWAMP,
-    TXT_KEY_CASTLE
-};
-
-static void SetDormantArtifact(mobj_t * arti);
-static void TryPickupArtifact(player_t * player, artitype_t artifactType,
-                              mobj_t * artifact);
-static void TryPickupWeapon(player_t * player, pclass_t weaponClass,
-                            weapontype_t weaponType, mobj_t * weapon,
-                            const char *message);
-static void TryPickupWeaponPiece(player_t * player, pclass_t matchClass,
-                                 int pieceValue, mobj_t * pieceMobj);
-
-//--------------------------------------------------------------------------
-//
-// PROC P_SetMessage
-//
-//--------------------------------------------------------------------------
-
-void P_SetMessage(player_t * player, const char *message, boolean ultmsg)
-{
-    if ((player->ultimateMessage || !messageson) && !ultmsg)
-    {
-        return;
-    }
-
-    M_StringCopy(player->message, message, sizeof(player->message));
-//    strupr(player->message);
-    player->messageTics = MESSAGETICS;
-    player->yellowMessage = false;
-    if (ultmsg)
-    {
-        player->ultimateMessage = true;
-    }
-    if (player == &players[consoleplayer])
-    {
-        BorderTopRefresh = true;
-    }
-}
-
-//==========================================================================
-//
-// P_SetYellowMessage
-//
-//==========================================================================
-
-void P_SetYellowMessage(player_t * player, const char *message, boolean ultmsg)
-{
-    if ((player->ultimateMessage || !messageson) && !ultmsg)
-    {
-        return;
-    }
-    M_StringCopy(player->message, message, sizeof(player->message));
-    player->messageTics = 5 * MESSAGETICS;      // Bold messages last longer
-    player->yellowMessage = true;
-    if (ultmsg)
-    {
-        player->ultimateMessage = true;
-    }
-    if (player == &players[consoleplayer])
-    {
-        BorderTopRefresh = true;
-    }
-}
-
-//==========================================================================
-//
-// P_ClearMessage
-//
-//==========================================================================
-
-void P_ClearMessage(player_t * player)
-{
-    player->messageTics = 0;
-    if (player == &players[consoleplayer])
-    {
-        BorderTopRefresh = true;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_HideSpecialThing
-//
-//----------------------------------------------------------------------------
-
-void P_HideSpecialThing(mobj_t * thing)
-{
-    thing->flags &= ~MF_SPECIAL;
-    thing->flags2 |= MF2_DONTDRAW;
-    P_SetMobjState(thing, S_HIDESPECIAL1);
-}
-
-//--------------------------------------------------------------------------
-//
-// FUNC P_GiveMana
-//
-// Returns true if the player accepted the mana, false if it was
-// refused (player has MAX_MANA).
-//
-//--------------------------------------------------------------------------
-
-boolean P_GiveMana(player_t * player, manatype_t mana, int count)
-{
-    int prevMana;
-    //weapontype_t changeWeapon;
-
-    if (mana == MANA_NONE || mana == MANA_BOTH)
-    {
-        return (false);
-    }
-    if ((unsigned int) mana > NUMMANA)
-    {
-        I_Error("P_GiveMana: bad type %i", mana);
-    }
-    if (player->mana[mana] == MAX_MANA)
-    {
-        return (false);
-    }
-    if (gameskill == sk_baby || gameskill == sk_nightmare)
-    {                           // extra mana in baby mode and nightmare mode
-        count += count >> 1;
-    }
-    prevMana = player->mana[mana];
-
-    player->mana[mana] += count;
-    if (player->mana[mana] > MAX_MANA)
-    {
-        player->mana[mana] = MAX_MANA;
-    }
-    if (player->class == PCLASS_FIGHTER && player->readyweapon == WP_SECOND
-        && mana == MANA_1 && prevMana <= 0)
-    {
-        P_SetPsprite(player, ps_weapon, S_FAXEREADY_G);
-    }
-    return (true);
-}
-
-//==========================================================================
-//
-// TryPickupWeapon
-//
-//==========================================================================
-
-static void TryPickupWeapon(player_t * player, pclass_t weaponClass,
-                            weapontype_t weaponType, mobj_t * weapon,
-                            const char *message)
-{
-    boolean remove;
-    boolean gaveMana;
-    boolean gaveWeapon;
-
-    remove = true;
-    if (player->class != weaponClass)
-    {                           // Wrong class, but try to pick up for mana
-        if (netgame && !deathmatch)
-        {                       // Can't pick up weapons for other classes in coop netplay
-            return;
-        }
-        if (weaponType == WP_SECOND)
-        {
-            if (!P_GiveMana(player, MANA_1, 25))
-            {
-                return;
-            }
-        }
-        else
-        {
-            if (!P_GiveMana(player, MANA_2, 25))
-            {
-                return;
-            }
-        }
-    }
-    else if (netgame && !deathmatch)
-    {                           // Cooperative net-game
-        if (player->weaponowned[weaponType])
-        {
-            return;
-        }
-        player->weaponowned[weaponType] = true;
-        if (weaponType == WP_SECOND)
-        {
-            P_GiveMana(player, MANA_1, 25);
-        }
-        else
-        {
-            P_GiveMana(player, MANA_2, 25);
-        }
-        player->pendingweapon = weaponType;
-        remove = false;
-    }
-    else
-    {                           // Deathmatch or single player game
-        if (weaponType == WP_SECOND)
-        {
-            gaveMana = P_GiveMana(player, MANA_1, 25);
-        }
-        else
-        {
-            gaveMana = P_GiveMana(player, MANA_2, 25);
-        }
-        if (player->weaponowned[weaponType])
-        {
-            gaveWeapon = false;
-        }
-        else
-        {
-            gaveWeapon = true;
-            player->weaponowned[weaponType] = true;
-            if (weaponType > player->readyweapon)
-            {                   // Only switch to more powerful weapons
-                player->pendingweapon = weaponType;
-            }
-        }
-        if (!(gaveWeapon || gaveMana))
-        {                       // Player didn't need the weapon or any mana
-            return;
-        }
-    }
-
-    P_SetMessage(player, message, false);
-    if (weapon->special)
-    {
-        P_ExecuteLineSpecial(weapon->special, weapon->args,
-                             NULL, 0, player->mo);
-        weapon->special = 0;
-    }
-
-    if (remove)
-    {
-        if (deathmatch && !(weapon->flags2 & MF2_DROPPED))
-        {
-            P_HideSpecialThing(weapon);
-        }
-        else
-        {
-            P_RemoveMobj(weapon);
-        }
-    }
-
-    player->bonuscount += BONUSADD;
-    if (player == &players[consoleplayer])
-    {
-        S_StartSound(NULL, SFX_PICKUP_WEAPON);
-        SB_PaletteFlash(false);
-    }
-}
-
-//--------------------------------------------------------------------------
-//
-// FUNC P_GiveWeapon
-//
-// Returns true if the weapon or its mana was accepted.
-//
-//--------------------------------------------------------------------------
-
-/*
-boolean P_GiveWeapon(player_t *player, pclass_t class, weapontype_t weapon)
-{
-	boolean gaveMana;
-	boolean gaveWeapon;
-
-	if(player->class != class)
-	{ // player cannot use this weapon, take it anyway, and get mana
-		if(netgame && !deathmatch)
-		{ // Can't pick up weapons for other classes in coop netplay
-			return false;
-		}
-		if(weapon == WP_SECOND)
-		{
-			return P_GiveMana(player, MANA_1, 25);
-		}
-		else
-		{
-			return P_GiveMana(player, MANA_2, 25);
-		}		
-	}
-	if(netgame && !deathmatch)
-	{ // Cooperative net-game
-		if(player->weaponowned[weapon])
-		{
-			return(false);
-		}
-		player->bonuscount += BONUSADD;
-		player->weaponowned[weapon] = true;
-		if(weapon == WP_SECOND)
-		{
-			P_GiveMana(player, MANA_1, 25);
-		}
-		else 
-		{
-			P_GiveMana(player, MANA_2, 25);
-		}
-		player->pendingweapon = weapon;
-		if(player == &players[consoleplayer])
-		{
-			S_StartSound(NULL, SFX_PICKUP_WEAPON);
-		}
-		return(false);
-	}
-	if(weapon == WP_SECOND)
-	{
-		gaveMana = P_GiveMana(player, MANA_1, 25);
-	}
-	else 
-	{
-		gaveMana = P_GiveMana(player, MANA_2, 25);
-	}
-	if(player->weaponowned[weapon])
-	{
-		gaveWeapon = false;
-	}
-	else
-	{
-		gaveWeapon = true;
-		player->weaponowned[weapon] = true;
-		if(weapon > player->readyweapon)
-		{ // Only switch to more powerful weapons
-			player->pendingweapon = weapon;
-		}
-	}
-	return(gaveWeapon || gaveMana);
-}
-*/
-
-//===========================================================================
-//
-// P_GiveWeaponPiece
-//
-//===========================================================================
-
-/*
-boolean P_GiveWeaponPiece(player_t *player, pclass_t class, int piece)
-{
-	P_GiveMana(player, MANA_1, 20);
-	P_GiveMana(player, MANA_2, 20);
-	if(player->class != class)
-	{
-		return true;
-	}
-	else if(player->pieces&piece)
-	{ // player already has that weapon piece
-		return true;
-	}
-	player->pieces |= piece;
-	if(player->pieces == 7)
-	{ // player has built the fourth weapon!
-		P_GiveWeapon(player, class, WP_FOURTH);
-		S_StartSound(player->mo, SFX_WEAPON_BUILD);
-	}
-	return true;
-}
-*/
-
-//==========================================================================
-//
-// TryPickupWeaponPiece
-//
-//==========================================================================
-
-static void TryPickupWeaponPiece(player_t * player, pclass_t matchClass,
-                                 int pieceValue, mobj_t * pieceMobj)
-{
-    boolean remove;
-    boolean checkAssembled;
-    boolean gaveWeapon;
-    int gaveMana;
-    static const char *fourthWeaponText[] = {
-        TXT_WEAPON_F4,
-        TXT_WEAPON_C4,
-        TXT_WEAPON_M4
-    };
-    static const char *weaponPieceText[] = {
-        TXT_QUIETUS_PIECE,
-        TXT_WRAITHVERGE_PIECE,
-        TXT_BLOODSCOURGE_PIECE
-    };
-    static int pieceValueTrans[] = {
-        0,                      // 0: never
-        WPIECE1 | WPIECE2 | WPIECE3,    // WPIECE1 (1)
-        WPIECE2 | WPIECE3,      // WPIECE2 (2)
-        0,                      // 3: never
-        WPIECE3                 // WPIECE3 (4)
-    };
-
-    remove = true;
-    checkAssembled = true;
-    gaveWeapon = false;
-    if (player->class != matchClass)
-    {                           // Wrong class, but try to pick up for mana
-        if (netgame && !deathmatch)
-        {                       // Can't pick up wrong-class weapons in coop netplay
-            return;
-        }
-        checkAssembled = false;
-        gaveMana = P_GiveMana(player, MANA_1, 20) +
-            P_GiveMana(player, MANA_2, 20);
-        if (!gaveMana)
-        {                       // Didn't need the mana, so don't pick it up
-            return;
-        }
-    }
-    else if (netgame && !deathmatch)
-    {                           // Cooperative net-game
-        if (player->pieces & pieceValue)
-        {                       // Already has the piece
-            return;
-        }
-        pieceValue = pieceValueTrans[pieceValue];
-        P_GiveMana(player, MANA_1, 20);
-        P_GiveMana(player, MANA_2, 20);
-        remove = false;
-    }
-    else
-    {                           // Deathmatch or single player game
-        gaveMana = P_GiveMana(player, MANA_1, 20) +
-            P_GiveMana(player, MANA_2, 20);
-        if (player->pieces & pieceValue)
-        {                       // Already has the piece, check if mana needed
-            if (!gaveMana)
-            {                   // Didn't need the mana, so don't pick it up
-                return;
-            }
-            checkAssembled = false;
-        }
-    }
-
-    // Pick up the weapon piece
-    if (pieceMobj->special)
-    {
-        P_ExecuteLineSpecial(pieceMobj->special, pieceMobj->args,
-                             NULL, 0, player->mo);
-        pieceMobj->special = 0;
-    }
-    if (remove)
-    {
-        if (deathmatch && !(pieceMobj->flags2 & MF2_DROPPED))
-        {
-            P_HideSpecialThing(pieceMobj);
-        }
-        else
-        {
-            P_RemoveMobj(pieceMobj);
-        }
-    }
-    player->bonuscount += BONUSADD;
-    if (player == &players[consoleplayer])
-    {
-        SB_PaletteFlash(false);
-    }
-
-    // Check if fourth weapon assembled
-    if (checkAssembled)
-    {
-        player->pieces |= pieceValue;
-        if (player->pieces == (WPIECE1 | WPIECE2 | WPIECE3))
-        {
-            gaveWeapon = true;
-            player->weaponowned[WP_FOURTH] = true;
-            player->pendingweapon = WP_FOURTH;
-        }
-    }
-
-    if (gaveWeapon)
-    {
-        P_SetMessage(player, fourthWeaponText[matchClass], false);
-        // Play the build-sound full volume for all players
-        S_StartSound(NULL, SFX_WEAPON_BUILD);
-    }
-    else
-    {
-        P_SetMessage(player, weaponPieceText[matchClass], false);
-        if (player == &players[consoleplayer])
-        {
-            S_StartSound(NULL, SFX_PICKUP_WEAPON);
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GiveBody
-//
-// Returns false if the body isn't needed at all.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GiveBody(player_t * player, int num)
-{
-    int max;
-
-    max = MAXHEALTH;
-    if (player->morphTics)
-    {
-        max = MAXMORPHHEALTH;
-    }
-    if (player->health >= max)
-    {
-        return (false);
-    }
-    player->health += num;
-    if (player->health > max)
-    {
-        player->health = max;
-    }
-    player->mo->health = player->health;
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GiveArmor
-//
-// Returns false if the armor is worse than the current armor.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GiveArmor(player_t * player, armortype_t armortype, int amount)
-{
-    int hits;
-    int totalArmor;
-
-    if (amount == -1)
-    {
-        hits = ArmorIncrement[player->class][armortype];
-        if (player->armorpoints[armortype] >= hits)
-        {
-            return false;
-        }
-        else
-        {
-            player->armorpoints[armortype] = hits;
-        }
-    }
-    else
-    {
-        hits = amount * 5 * FRACUNIT;
-        totalArmor = player->armorpoints[ARMOR_ARMOR]
-            + player->armorpoints[ARMOR_SHIELD]
-            + player->armorpoints[ARMOR_HELMET]
-            + player->armorpoints[ARMOR_AMULET]
-            + AutoArmorSave[player->class];
-        if (totalArmor < ArmorMax[player->class] * 5 * FRACUNIT)
-        {
-            player->armorpoints[armortype] += hits;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_GiveKey
-//
-//---------------------------------------------------------------------------
-
-int P_GiveKey(player_t * player, keytype_t key)
-{
-    if (player->keys & (1 << key))
-    {
-        return false;
-    }
-    player->bonuscount += BONUSADD;
-    player->keys |= 1 << key;
-    return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GivePower
-//
-// Returns true if power accepted.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GivePower(player_t * player, powertype_t power)
-{
-    if (power == pw_invulnerability)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = INVULNTICS;
-        player->mo->flags2 |= MF2_INVULNERABLE;
-        if (player->class == PCLASS_MAGE)
-        {
-            player->mo->flags2 |= MF2_REFLECTIVE;
-        }
-        return (true);
-    }
-    if (power == pw_flight)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = FLIGHTTICS;
-        player->mo->flags2 |= MF2_FLY;
-        player->mo->flags |= MF_NOGRAVITY;
-        if (player->mo->z <= player->mo->floorz)
-        {
-            player->flyheight = 10;     // thrust the player in the air a bit
-        }
-        return (true);
-    }
-    if (power == pw_infrared)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = INFRATICS;
-        return (true);
-    }
-    if (power == pw_speed)
-    {
-        if (player->powers[power] > BLINKTHRESHOLD)
-        {                       // Already have it
-            return (false);
-        }
-        player->powers[power] = SPEEDTICS;
-        return (true);
-    }
-    if (power == pw_minotaur)
-    {
-        // Doesn't matter if already have power, renew ticker
-        player->powers[power] = MAULATORTICS;
-        return (true);
-    }
-/*
-	if(power == pw_ironfeet)
-	{
-		player->powers[power] = IRONTICS;
-		return(true);
-	}
-	if(power == pw_strength)
-	{
-		P_GiveBody(player, 100);
-		player->powers[power] = 1;
-		return(true);
-	}
-*/
-    if (player->powers[power])
-    {
-        return (false);         // already got it
-    }
-    player->powers[power] = 1;
-    return (true);
-}
-
-//==========================================================================
-//
-// TryPickupArtifact
-//
-//==========================================================================
-
-static void TryPickupArtifact(player_t * player, artitype_t artifactType,
-                              mobj_t * artifact)
-{
-    static const char *artifactMessages[NUMARTIFACTS] = {
-        NULL,
-        TXT_ARTIINVULNERABILITY,
-        TXT_ARTIHEALTH,
-        TXT_ARTISUPERHEALTH,
-        TXT_ARTIHEALINGRADIUS,
-        TXT_ARTISUMMON,
-        TXT_ARTITORCH,
-        TXT_ARTIEGG,
-        TXT_ARTIFLY,
-        TXT_ARTIBLASTRADIUS,
-        TXT_ARTIPOISONBAG,
-        TXT_ARTITELEPORTOTHER,
-        TXT_ARTISPEED,
-        TXT_ARTIBOOSTMANA,
-        TXT_ARTIBOOSTARMOR,
-        TXT_ARTITELEPORT,
-        TXT_ARTIPUZZSKULL,
-        TXT_ARTIPUZZGEMBIG,
-        TXT_ARTIPUZZGEMRED,
-        TXT_ARTIPUZZGEMGREEN1,
-        TXT_ARTIPUZZGEMGREEN2,
-        TXT_ARTIPUZZGEMBLUE1,
-        TXT_ARTIPUZZGEMBLUE2,
-        TXT_ARTIPUZZBOOK1,
-        TXT_ARTIPUZZBOOK2,
-        TXT_ARTIPUZZSKULL2,
-        TXT_ARTIPUZZFWEAPON,
-        TXT_ARTIPUZZCWEAPON,
-        TXT_ARTIPUZZMWEAPON,
-        TXT_ARTIPUZZGEAR,       // All gear pickups use the same text
-        TXT_ARTIPUZZGEAR,
-        TXT_ARTIPUZZGEAR,
-        TXT_ARTIPUZZGEAR
-    };
-
-    if (gamemode == shareware)
-    {
-        artifactMessages[arti_blastradius] = TXT_ARTITELEPORT;
-        artifactMessages[arti_teleport] = TXT_ARTIBLASTRADIUS;
-    }
-
-    if (P_GiveArtifact(player, artifactType, artifact))
-    {
-        if (artifact->special)
-        {
-            P_ExecuteLineSpecial(artifact->special, artifact->args,
-                                 NULL, 0, NULL);
-            artifact->special = 0;
-        }
-        player->bonuscount += BONUSADD;
-        if (artifactType < arti_firstpuzzitem)
-        {
-            SetDormantArtifact(artifact);
-            S_StartSound(artifact, SFX_PICKUP_ARTIFACT);
-            P_SetMessage(player, artifactMessages[artifactType], false);
-        }
-        else
-        {                       // Puzzle item
-            S_StartSound(NULL, SFX_PICKUP_ITEM);
-            P_SetMessage(player, artifactMessages[artifactType], true);
-            if (!netgame || deathmatch)
-            {                   // Remove puzzle items if not cooperative netplay
-                P_RemoveMobj(artifact);
-            }
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GiveArtifact
-//
-// Returns true if artifact accepted.
-//
-//---------------------------------------------------------------------------
-
-boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo)
-{
-    int i;
-    int j;
-    boolean slidePointer;
-
-    slidePointer = false;
-    i = 0;
-    while (player->inventory[i].type != arti && i < player->inventorySlotNum)
-    {
-        i++;
-    }
-    if (i == player->inventorySlotNum)
-    {
-        if (arti < arti_firstpuzzitem)
-        {
-            i = 0;
-            while (player->inventory[i].type < arti_firstpuzzitem
-                   && i < player->inventorySlotNum)
-            {
-                i++;
-            }
-            if (i != player->inventorySlotNum)
-            {
-                for (j = player->inventorySlotNum; j > i; j--)
-                {
-                    player->inventory[j].count =
-                        player->inventory[j - 1].count;
-                    player->inventory[j].type = player->inventory[j - 1].type;
-                    slidePointer = true;
-                }
-            }
-        }
-        player->inventory[i].count = 1;
-        player->inventory[i].type = arti;
-        player->inventorySlotNum++;
-    }
-    else
-    {
-        if (arti >= arti_firstpuzzitem && netgame && !deathmatch)
-        {                       // Can't carry more than 1 puzzle item in coop netplay
-            return false;
-        }
-        if (player->inventory[i].count >= 25)
-        {                       // Player already has 25 of this item
-            return false;
-        }
-        player->inventory[i].count++;
-    }
-    if (!player->artifactCount)
-    {
-        player->readyArtifact = arti;
-    }
-    else if (player == &players[consoleplayer] && slidePointer
-             && i <= inv_ptr)
-    {
-        inv_ptr++;
-        curpos++;
-        if (curpos > 6)
-        {
-            curpos = 6;
-        }
-    }
-    player->artifactCount++;
-    return (true);
-}
-
-//==========================================================================
-//
-// SetDormantArtifact
-//
-// Removes the MF_SPECIAL flag and initiates the artifact pickup
-// animation.
-//
-//==========================================================================
-
-static void SetDormantArtifact(mobj_t * arti)
-{
-    arti->flags &= ~MF_SPECIAL;
-    if (deathmatch && !(arti->flags2 & MF2_DROPPED))
-    {
-        if (arti->type == MT_ARTIINVULNERABILITY)
-        {
-            P_SetMobjState(arti, S_DORMANTARTI3_1);
-        }
-        else if (arti->type == MT_SUMMONMAULATOR || arti->type == MT_ARTIFLY)
-        {
-            P_SetMobjState(arti, S_DORMANTARTI2_1);
-        }
-        else
-        {
-            P_SetMobjState(arti, S_DORMANTARTI1_1);
-        }
-    }
-    else
-    {                           // Don't respawn
-        P_SetMobjState(arti, S_DEADARTI1);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_RestoreArtifact
-//
-//---------------------------------------------------------------------------
-
-void A_RestoreArtifact(mobj_t *arti, player_t *player, pspdef_t *psp)
-{
-    arti->flags |= MF_SPECIAL;
-    P_SetMobjState(arti, arti->info->spawnstate);
-    S_StartSound(arti, SFX_RESPAWN);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_RestoreSpecialThing1
-//
-// Make a special thing visible again.
-//
-//---------------------------------------------------------------------------
-
-void A_RestoreSpecialThing1(mobj_t * thing, player_t *player, pspdef_t *psp)
-{
-    thing->flags2 &= ~MF2_DONTDRAW;
-    S_StartSound(thing, SFX_RESPAWN);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_RestoreSpecialThing2
-//
-//---------------------------------------------------------------------------
-
-void A_RestoreSpecialThing2(mobj_t * thing, player_t *player, pspdef_t *psp)
-{
-    thing->flags |= MF_SPECIAL;
-    P_SetMobjState(thing, thing->info->spawnstate);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_TouchSpecialThing
-//
-//---------------------------------------------------------------------------
-
-void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher)
-{
-    player_t *player;
-    fixed_t delta;
-    int sound;
-    boolean respawn;
-
-    delta = special->z - toucher->z;
-    if (delta > toucher->height || delta < -32 * FRACUNIT)
-    {                           // Out of reach
-        return;
-    }
-    if (toucher->health <= 0)
-    {                           // Toucher is dead
-        return;
-    }
-    sound = SFX_PICKUP_ITEM;
-    player = toucher->player;
-    respawn = true;
-    switch (special->sprite)
-    {
-            // Items
-        case SPR_PTN1:         // Item_HealingPotion
-            if (!P_GiveBody(player, 10))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_ITEMHEALTH, false);
-            break;
-        case SPR_ARM1:
-            if (!P_GiveArmor(player, ARMOR_ARMOR, -1))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_ARMOR1, false);
-            break;
-        case SPR_ARM2:
-            if (!P_GiveArmor(player, ARMOR_SHIELD, -1))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_ARMOR2, false);
-            break;
-        case SPR_ARM3:
-            if (!P_GiveArmor(player, ARMOR_HELMET, -1))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_ARMOR3, false);
-            break;
-        case SPR_ARM4:
-            if (!P_GiveArmor(player, ARMOR_AMULET, -1))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_ARMOR4, false);
-            break;
-
-            // Keys
-        case SPR_KEY1:
-        case SPR_KEY2:
-        case SPR_KEY3:
-        case SPR_KEY4:
-        case SPR_KEY5:
-        case SPR_KEY6:
-        case SPR_KEY7:
-        case SPR_KEY8:
-        case SPR_KEY9:
-        case SPR_KEYA:
-        case SPR_KEYB:
-            if (!P_GiveKey(player, special->sprite - SPR_KEY1))
-            {
-                return;
-            }
-            P_SetMessage(player, TextKeyMessages[special->sprite - SPR_KEY1],
-                         true);
-            sound = SFX_PICKUP_KEY;
-
-            // Check and process the special now in case the key doesn't
-            // get removed for coop netplay
-            if (special->special)
-            {
-                P_ExecuteLineSpecial(special->special, special->args,
-                                     NULL, 0, toucher);
-                special->special = 0;
-            }
-
-            if (!netgame)
-            {                   // Only remove keys in single player game
-                break;
-            }
-            player->bonuscount += BONUSADD;
-            if (player == &players[consoleplayer])
-            {
-                S_StartSound(NULL, sound);
-                SB_PaletteFlash(false);
-            }
-            return;
-
-            // Artifacts
-        case SPR_PTN2:
-            TryPickupArtifact(player, arti_health, special);
-            return;
-        case SPR_SOAR:
-            TryPickupArtifact(player, arti_fly, special);
-            return;
-        case SPR_INVU:
-            TryPickupArtifact(player, arti_invulnerability, special);
-            return;
-        case SPR_SUMN:
-            TryPickupArtifact(player, arti_summon, special);
-            return;
-        case SPR_PORK:
-            TryPickupArtifact(player, arti_egg, special);
-            return;
-        case SPR_SPHL:
-            TryPickupArtifact(player, arti_superhealth, special);
-            return;
-        case SPR_HRAD:
-            TryPickupArtifact(player, arti_healingradius, special);
-            return;
-        case SPR_TRCH:
-            TryPickupArtifact(player, arti_torch, special);
-            return;
-        case SPR_ATLP:
-            TryPickupArtifact(player, arti_teleport, special);
-            return;
-        case SPR_TELO:
-            TryPickupArtifact(player, arti_teleportother, special);
-            return;
-        case SPR_PSBG:
-            TryPickupArtifact(player, arti_poisonbag, special);
-            return;
-        case SPR_SPED:
-            TryPickupArtifact(player, arti_speed, special);
-            return;
-        case SPR_BMAN:
-            TryPickupArtifact(player, arti_boostmana, special);
-            return;
-        case SPR_BRAC:
-            TryPickupArtifact(player, arti_boostarmor, special);
-            return;
-        case SPR_BLST:
-            TryPickupArtifact(player, arti_blastradius, special);
-            return;
-
-            // Puzzle artifacts
-        case SPR_ASKU:
-            TryPickupArtifact(player, arti_puzzskull, special);
-            return;
-        case SPR_ABGM:
-            TryPickupArtifact(player, arti_puzzgembig, special);
-            return;
-        case SPR_AGMR:
-            TryPickupArtifact(player, arti_puzzgemred, special);
-            return;
-        case SPR_AGMG:
-            TryPickupArtifact(player, arti_puzzgemgreen1, special);
-            return;
-        case SPR_AGG2:
-            TryPickupArtifact(player, arti_puzzgemgreen2, special);
-            return;
-        case SPR_AGMB:
-            TryPickupArtifact(player, arti_puzzgemblue1, special);
-            return;
-        case SPR_AGB2:
-            TryPickupArtifact(player, arti_puzzgemblue2, special);
-            return;
-        case SPR_ABK1:
-            TryPickupArtifact(player, arti_puzzbook1, special);
-            return;
-        case SPR_ABK2:
-            TryPickupArtifact(player, arti_puzzbook2, special);
-            return;
-        case SPR_ASK2:
-            TryPickupArtifact(player, arti_puzzskull2, special);
-            return;
-        case SPR_AFWP:
-            TryPickupArtifact(player, arti_puzzfweapon, special);
-            return;
-        case SPR_ACWP:
-            TryPickupArtifact(player, arti_puzzcweapon, special);
-            return;
-        case SPR_AMWP:
-            TryPickupArtifact(player, arti_puzzmweapon, special);
-            return;
-        case SPR_AGER:
-            TryPickupArtifact(player, arti_puzzgear1, special);
-            return;
-        case SPR_AGR2:
-            TryPickupArtifact(player, arti_puzzgear2, special);
-            return;
-        case SPR_AGR3:
-            TryPickupArtifact(player, arti_puzzgear3, special);
-            return;
-        case SPR_AGR4:
-            TryPickupArtifact(player, arti_puzzgear4, special);
-            return;
-
-            // Mana
-        case SPR_MAN1:
-            if (!P_GiveMana(player, MANA_1, 15))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_MANA_1, false);
-            break;
-        case SPR_MAN2:
-            if (!P_GiveMana(player, MANA_2, 15))
-            {
-                return;
-            }
-            P_SetMessage(player, TXT_MANA_2, false);
-            break;
-        case SPR_MAN3:         // Double Mana Dodecahedron
-            if (!P_GiveMana(player, MANA_1, 20))
-            {
-                if (!P_GiveMana(player, MANA_2, 20))
-                {
-                    return;
-                }
-            }
-            else
-            {
-                P_GiveMana(player, MANA_2, 20);
-            }
-            P_SetMessage(player, TXT_MANA_BOTH, false);
-            break;
-
-            // 2nd and 3rd Mage Weapons
-        case SPR_WMCS:         // Frost Shards
-            TryPickupWeapon(player, PCLASS_MAGE, WP_SECOND,
-                            special, TXT_WEAPON_M2);
-            return;
-        case SPR_WMLG:         // Arc of Death
-            TryPickupWeapon(player, PCLASS_MAGE, WP_THIRD,
-                            special, TXT_WEAPON_M3);
-            return;
-
-            // 2nd and 3rd Fighter Weapons
-        case SPR_WFAX:         // Timon's Axe
-            TryPickupWeapon(player, PCLASS_FIGHTER, WP_SECOND,
-                            special, TXT_WEAPON_F2);
-            return;
-        case SPR_WFHM:         // Hammer of Retribution
-            TryPickupWeapon(player, PCLASS_FIGHTER, WP_THIRD,
-                            special, TXT_WEAPON_F3);
-            return;
-
-            // 2nd and 3rd Cleric Weapons
-        case SPR_WCSS:         // Serpent Staff
-            TryPickupWeapon(player, PCLASS_CLERIC, WP_SECOND,
-                            special, TXT_WEAPON_C2);
-            return;
-        case SPR_WCFM:         // Firestorm
-            TryPickupWeapon(player, PCLASS_CLERIC, WP_THIRD,
-                            special, TXT_WEAPON_C3);
-            return;
-
-            // Fourth Weapon Pieces
-        case SPR_WFR1:
-            TryPickupWeaponPiece(player, PCLASS_FIGHTER, WPIECE1, special);
-            return;
-        case SPR_WFR2:
-            TryPickupWeaponPiece(player, PCLASS_FIGHTER, WPIECE2, special);
-            return;
-        case SPR_WFR3:
-            TryPickupWeaponPiece(player, PCLASS_FIGHTER, WPIECE3, special);
-            return;
-        case SPR_WCH1:
-            TryPickupWeaponPiece(player, PCLASS_CLERIC, WPIECE1, special);
-            return;
-        case SPR_WCH2:
-            TryPickupWeaponPiece(player, PCLASS_CLERIC, WPIECE2, special);
-            return;
-        case SPR_WCH3:
-            TryPickupWeaponPiece(player, PCLASS_CLERIC, WPIECE3, special);
-            return;
-        case SPR_WMS1:
-            TryPickupWeaponPiece(player, PCLASS_MAGE, WPIECE1, special);
-            return;
-        case SPR_WMS2:
-            TryPickupWeaponPiece(player, PCLASS_MAGE, WPIECE2, special);
-            return;
-        case SPR_WMS3:
-            TryPickupWeaponPiece(player, PCLASS_MAGE, WPIECE3, special);
-            return;
-
-        default:
-            I_Error("P_SpecialThing: Unknown gettable thing");
-    }
-    if (special->special)
-    {
-        P_ExecuteLineSpecial(special->special, special->args, NULL,
-                             0, toucher);
-        special->special = 0;
-    }
-    if (deathmatch && respawn && !(special->flags2 & MF2_DROPPED))
-    {
-        P_HideSpecialThing(special);
-    }
-    else
-    {
-        P_RemoveMobj(special);
-    }
-    player->bonuscount += BONUSADD;
-    if (player == &players[consoleplayer])
-    {
-        S_StartSound(NULL, sound);
-        SB_PaletteFlash(false);
-    }
-}
-
-// Search thinker list for minotaur
-mobj_t *ActiveMinotaur(player_t * master)
-{
-    mobj_t *mo;
-    player_t *plr;
-    thinker_t *think;
-    unsigned int *starttime;
-
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-            continue;
-        mo = (mobj_t *) think;
-        if (mo->type != MT_MINOTAUR)
-            continue;
-        if (mo->health <= 0)
-            continue;
-        if (!(mo->flags & MF_COUNTKILL))
-            continue;           // for morphed minotaurs
-        if (mo->flags & MF_CORPSE)
-            continue;
-        starttime = (unsigned int *) mo->args;
-        if ((leveltime - *starttime) >= MAULATORTICS)
-            continue;
-        plr = mo->special1.m->player;
-        if (plr == master)
-            return (mo);
-    }
-    return (NULL);
-}
-
-
-//---------------------------------------------------------------------------
-//
-// PROC P_KillMobj
-//
-//---------------------------------------------------------------------------
-
-void P_KillMobj(mobj_t * source, mobj_t * target)
-{
-    byte dummyArgs[3] = {0, 0, 0};
-    mobj_t *master;
-
-    target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_NOGRAVITY);
-    target->flags |= MF_CORPSE | MF_DROPOFF;
-    target->flags2 &= ~MF2_PASSMOBJ;
-    target->height >>= 2;
-    if ((target->flags & MF_COUNTKILL || target->type == MT_ZBELL)
-        && target->special)
-    {                           // Initiate monster death actions
-        if (target->type == MT_SORCBOSS)
-        {
-            P_StartACS(target->special, 0, dummyArgs, target, NULL, 0);
-        }
-        else
-        {
-            P_ExecuteLineSpecial(target->special, target->args,
-                                 NULL, 0, target);
-        }
-    }
-    if (source && source->player)
-    {                           // Check for frag changes
-        if (target->player)
-        {
-            if (target == source)
-            {                   // Self-frag
-                target->player->frags[target->player - players]--;
-                if (cmdfrag && netgame
-                    && source->player == &players[consoleplayer])
-                {               // Send out a frag count packet
-                    NET_SendFrags(source->player);
-                }
-            }
-            else
-            {
-                source->player->frags[target->player - players]++;
-                if (cmdfrag && netgame
-                    && source->player == &players[consoleplayer])
-                {               // Send out a frag count packet
-                    NET_SendFrags(source->player);
-                }
-            }
-        }
-    }
-    if (target->player)
-    {                           // Player death
-        if (!source)
-        {                       // Self-frag
-            target->player->frags[target->player - players]--;
-            if (cmdfrag && netgame
-                && target->player == &players[consoleplayer])
-            {                   // Send out a frag count packet
-                NET_SendFrags(target->player);
-            }
-        }
-        target->flags &= ~MF_SOLID;
-        target->flags2 &= ~MF2_FLY;
-        target->player->powers[pw_flight] = 0;
-        target->player->playerstate = PST_DEAD;
-        P_DropWeapon(target->player);
-        if (target->flags2 & MF2_FIREDAMAGE)
-        {                       // Player flame death
-            switch (target->player->class)
-            {
-                case PCLASS_FIGHTER:
-                    S_StartSound(target, SFX_PLAYER_FIGHTER_BURN_DEATH);
-                    P_SetMobjState(target, S_PLAY_F_FDTH1);
-                    return;
-                case PCLASS_CLERIC:
-                    S_StartSound(target, SFX_PLAYER_CLERIC_BURN_DEATH);
-                    P_SetMobjState(target, S_PLAY_C_FDTH1);
-                    return;
-                case PCLASS_MAGE:
-                    S_StartSound(target, SFX_PLAYER_MAGE_BURN_DEATH);
-                    P_SetMobjState(target, S_PLAY_M_FDTH1);
-                    return;
-                default:
-                    break;
-            }
-        }
-        if (target->flags2 & MF2_ICEDAMAGE)
-        {                       // Player ice death
-            target->flags &= ~(7 << MF_TRANSSHIFT);     //no translation
-            target->flags |= MF_ICECORPSE;
-            switch (target->player->class)
-            {
-                case PCLASS_FIGHTER:
-                    P_SetMobjState(target, S_FPLAY_ICE);
-                    return;
-                case PCLASS_CLERIC:
-                    P_SetMobjState(target, S_CPLAY_ICE);
-                    return;
-                case PCLASS_MAGE:
-                    P_SetMobjState(target, S_MPLAY_ICE);
-                    return;
-                case PCLASS_PIG:
-                    P_SetMobjState(target, S_PIG_ICE);
-                    return;
-                default:
-                    break;
-            }
-        }
-    }
-    if (target->flags2 & MF2_FIREDAMAGE)
-    {
-        if (target->type == MT_FIGHTER_BOSS
-            || target->type == MT_CLERIC_BOSS || target->type == MT_MAGE_BOSS)
-        {
-            switch (target->type)
-            {
-                case MT_FIGHTER_BOSS:
-                    S_StartSound(target, SFX_PLAYER_FIGHTER_BURN_DEATH);
-                    P_SetMobjState(target, S_PLAY_F_FDTH1);
-                    return;
-                case MT_CLERIC_BOSS:
-                    S_StartSound(target, SFX_PLAYER_CLERIC_BURN_DEATH);
-                    P_SetMobjState(target, S_PLAY_C_FDTH1);
-                    return;
-                case MT_MAGE_BOSS:
-                    S_StartSound(target, SFX_PLAYER_MAGE_BURN_DEATH);
-                    P_SetMobjState(target, S_PLAY_M_FDTH1);
-                    return;
-                default:
-                    break;
-            }
-        }
-        else if (target->type == MT_TREEDESTRUCTIBLE)
-        {
-            P_SetMobjState(target, S_ZTREEDES_X1);
-            target->height = 24 * FRACUNIT;
-            S_StartSound(target, SFX_TREE_EXPLODE);
-            return;
-        }
-    }
-    if (target->flags2 & MF2_ICEDAMAGE)
-    {
-        target->flags |= MF_ICECORPSE;
-        switch (target->type)
-        {
-            case MT_BISHOP:
-                P_SetMobjState(target, S_BISHOP_ICE);
-                return;
-            case MT_CENTAUR:
-            case MT_CENTAURLEADER:
-                P_SetMobjState(target, S_CENTAUR_ICE);
-                return;
-            case MT_DEMON:
-            case MT_DEMON2:
-                P_SetMobjState(target, S_DEMON_ICE);
-                return;
-            case MT_SERPENT:
-            case MT_SERPENTLEADER:
-                P_SetMobjState(target, S_SERPENT_ICE);
-                return;
-            case MT_WRAITH:
-            case MT_WRAITHB:
-                P_SetMobjState(target, S_WRAITH_ICE);
-                return;
-            case MT_ETTIN:
-                P_SetMobjState(target, S_ETTIN_ICE1);
-                return;
-            case MT_FIREDEMON:
-                P_SetMobjState(target, S_FIRED_ICE1);
-                return;
-            case MT_FIGHTER_BOSS:
-                P_SetMobjState(target, S_FIGHTER_ICE);
-                return;
-            case MT_CLERIC_BOSS:
-                P_SetMobjState(target, S_CLERIC_ICE);
-                return;
-            case MT_MAGE_BOSS:
-                P_SetMobjState(target, S_MAGE_ICE);
-                return;
-            case MT_PIG:
-                P_SetMobjState(target, S_PIG_ICE);
-                return;
-            default:
-                target->flags &= ~MF_ICECORPSE;
-                break;
-        }
-    }
-
-    if (target->type == MT_MINOTAUR)
-    {
-        master = target->special1.m;
-        if (master->health > 0)
-        {
-            if (!ActiveMinotaur(master->player))
-            {
-                master->player->powers[pw_minotaur] = 0;
-            }
-        }
-    }
-    else if (target->type == MT_TREEDESTRUCTIBLE)
-    {
-        target->height = 24 * FRACUNIT;
-    }
-    if (target->health < -(target->info->spawnhealth >> 1)
-        && target->info->xdeathstate)
-    {                           // Extreme death
-        P_SetMobjState(target, target->info->xdeathstate);
-    }
-    else
-    {                           // Normal death
-        if ((target->type == MT_FIREDEMON) &&
-            (target->z <= target->floorz + 2 * FRACUNIT) &&
-            (target->info->xdeathstate))
-        {
-            // This is to fix the imps' staying in fall state
-            P_SetMobjState(target, target->info->xdeathstate);
-        }
-        else
-        {
-            P_SetMobjState(target, target->info->deathstate);
-        }
-    }
-    target->tics -= P_Random() & 3;
-//      I_StartSound(&actor->r, actor->info->deathsound);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_MinotaurSlam
-//
-//---------------------------------------------------------------------------
-
-void P_MinotaurSlam(mobj_t * source, mobj_t * target)
-{
-    angle_t angle;
-    fixed_t thrust;
-
-    angle = R_PointToAngle2(source->x, source->y, target->x, target->y);
-    angle >>= ANGLETOFINESHIFT;
-    thrust = 16 * FRACUNIT + (P_Random() << 10);
-    target->momx += FixedMul(thrust, finecosine[angle]);
-    target->momy += FixedMul(thrust, finesine[angle]);
-    P_DamageMobj(target, NULL, source, HITDICE(4));
-    if (target->player)
-    {
-        target->reactiontime = 14 + (P_Random() & 7);
-    }
-    source->args[0] = 0;        // Stop charging
-}
-
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_MorphPlayer
-//
-// Returns true if the player gets turned into a pig
-//
-//---------------------------------------------------------------------------
-
-boolean P_MorphPlayer(player_t * player)
-{
-    mobj_t *pmo;
-    mobj_t *fog;
-    mobj_t *beastMo;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    angle_t angle;
-    int oldFlags2;
-
-    if (player->powers[pw_invulnerability])
-    {                           // Immune when invulnerable
-        return (false);
-    }
-    if (player->morphTics)
-    {                           // Player is already a beast
-        return false;
-    }
-    pmo = player->mo;
-    x = pmo->x;
-    y = pmo->y;
-    z = pmo->z;
-    angle = pmo->angle;
-    oldFlags2 = pmo->flags2;
-    P_SetMobjState(pmo, S_FREETARGMOBJ);
-    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, SFX_TELEPORT);
-    beastMo = P_SpawnMobj(x, y, z, MT_PIGPLAYER);
-    beastMo->special1.i = player->readyweapon;
-    beastMo->angle = angle;
-    beastMo->player = player;
-    player->health = beastMo->health = MAXMORPHHEALTH;
-    player->mo = beastMo;
-    memset(&player->armorpoints[0], 0, NUMARMOR * sizeof(int));
-    player->class = PCLASS_PIG;
-    if (oldFlags2 & MF2_FLY)
-    {
-        beastMo->flags2 |= MF2_FLY;
-    }
-    player->morphTics = MORPHTICS;
-    P_ActivateMorphWeapon(player);
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_MorphMonster
-//
-//---------------------------------------------------------------------------
-
-boolean P_MorphMonster(mobj_t * actor)
-{
-    mobj_t *master, *monster, *fog;
-    mobjtype_t moType;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    mobj_t oldMonster;
-
-    if (actor->player)
-        return (false);
-    if (!(actor->flags & MF_COUNTKILL))
-        return false;
-    if (actor->flags2 & MF2_BOSS)
-        return false;
-    moType = actor->type;
-    switch (moType)
-    {
-        case MT_PIG:
-            return (false);
-        case MT_FIGHTER_BOSS:
-        case MT_CLERIC_BOSS:
-        case MT_MAGE_BOSS:
-            return (false);
-        default:
-            break;
-    }
-
-    oldMonster = *actor;
-    x = oldMonster.x;
-    y = oldMonster.y;
-    z = oldMonster.z;
-    P_RemoveMobjFromTIDList(actor);
-    P_SetMobjState(actor, S_FREETARGMOBJ);
-    fog = P_SpawnMobj(x, y, z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, SFX_TELEPORT);
-    monster = P_SpawnMobj(x, y, z, MT_PIG);
-    monster->special2.i = moType;
-    monster->special1.i = MORPHTICS + P_Random();
-    monster->flags |= (oldMonster.flags & MF_SHADOW);
-    monster->target = oldMonster.target;
-    monster->angle = oldMonster.angle;
-    monster->tid = oldMonster.tid;
-    monster->special = oldMonster.special;
-    P_InsertMobjIntoTIDList(monster, oldMonster.tid);
-    memcpy(monster->args, oldMonster.args, 5);
-
-    // check for turning off minotaur power for active icon
-    if (moType == MT_MINOTAUR)
-    {
-        master = oldMonster.special1.m;
-        if (master->health > 0)
-        {
-            if (!ActiveMinotaur(master->player))
-            {
-                master->player->powers[pw_minotaur] = 0;
-            }
-        }
-    }
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_AutoUseHealth
-//
-//---------------------------------------------------------------------------
-
-void P_AutoUseHealth(player_t * player, int saveHealth)
-{
-    int i;
-    int count;
-    int normalCount;
-    int normalSlot = 0;
-    int superCount;
-    int superSlot = 0;
-
-    normalCount = superCount = 0;
-    for (i = 0; i < player->inventorySlotNum; i++)
-    {
-        if (player->inventory[i].type == arti_health)
-        {
-            normalSlot = i;
-            normalCount = player->inventory[i].count;
-        }
-        else if (player->inventory[i].type == arti_superhealth)
-        {
-            superSlot = i;
-            superCount = player->inventory[i].count;
-        }
-    }
-    if ((gameskill == sk_baby) && (normalCount * 25 >= saveHealth))
-    {                           // Use quartz flasks
-        count = (saveHealth + 24) / 25;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 25;
-            P_PlayerRemoveArtifact(player, normalSlot);
-        }
-    }
-    else if (superCount * 100 >= saveHealth)
-    {                           // Use mystic urns
-        count = (saveHealth + 99) / 100;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 100;
-            P_PlayerRemoveArtifact(player, superSlot);
-        }
-    }
-    else if ((gameskill == sk_baby)
-             && (superCount * 100 + normalCount * 25 >= saveHealth))
-    {                           // Use mystic urns and quartz flasks
-        count = (saveHealth + 24) / 25;
-        saveHealth -= count * 25;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 25;
-            P_PlayerRemoveArtifact(player, normalSlot);
-        }
-        count = (saveHealth + 99) / 100;
-        for (i = 0; i < count; i++)
-        {
-            player->health += 100;
-            P_PlayerRemoveArtifact(player, normalSlot);
-        }
-    }
-    player->mo->health = player->health;
-}
-
-/*
-=================
-=
-= P_DamageMobj
-=
-= Damages both enemies and players
-= inflictor is the thing that caused the damage
-= 		creature or missile, can be NULL (slime, etc)
-= source is the thing to target after taking damage
-=		creature or NULL
-= Source and inflictor are the same for melee attacks
-= source can be null for barrel explosions and other environmental stuff
-==================
-*/
-
-void P_DamageMobj
-    (mobj_t * target, mobj_t * inflictor, mobj_t * source, int damage)
-{
-    unsigned ang;
-    int saved;
-    fixed_t savedPercent;
-    player_t *player;
-    mobj_t *master;
-    fixed_t thrust;
-    int temp;
-    int i;
-
-    if (!(target->flags & MF_SHOOTABLE))
-    {
-        // Shouldn't happen
-        return;
-    }
-    if (target->health <= 0)
-    {
-        if (inflictor && inflictor->flags2 & MF2_ICEDAMAGE)
-        {
-            return;
-        }
-        else if (target->flags & MF_ICECORPSE)  // frozen
-        {
-            target->tics = 1;
-            target->momx = target->momy = 0;
-        }
-        return;
-    }
-    if ((target->flags2 & MF2_INVULNERABLE) && damage < 10000)
-    {                           // mobj is invulnerable
-        if (target->player)
-            return;             // for player, no exceptions
-        if (inflictor)
-        {
-            switch (inflictor->type)
-            {
-                    // These inflictors aren't foiled by invulnerability
-                case MT_HOLY_FX:
-                case MT_POISONCLOUD:
-                case MT_FIREBOMB:
-                    break;
-                default:
-                    return;
-            }
-        }
-        else
-        {
-            return;
-        }
-    }
-    if (target->player)
-    {
-        if (damage < 1000 && ((target->player->cheats & CF_GODMODE)
-                              || target->player->powers[pw_invulnerability]))
-        {
-            return;
-        }
-    }
-    if (target->flags & MF_SKULLFLY)
-    {
-        target->momx = target->momy = target->momz = 0;
-    }
-    if (target->flags2 & MF2_DORMANT)
-    {
-        // Invulnerable, and won't wake up
-        return;
-    }
-    player = target->player;
-    if (player && gameskill == sk_baby)
-    {
-        // Take half damage in trainer mode
-        damage >>= 1;
-    }
-    // Special damage types
-    if (inflictor)
-    {
-        switch (inflictor->type)
-        {
-            case MT_EGGFX:
-                if (player)
-                {
-                    P_MorphPlayer(player);
-                }
-                else
-                {
-                    P_MorphMonster(target);
-                }
-                return;         // Always return
-            case MT_TELOTHER_FX1:
-            case MT_TELOTHER_FX2:
-            case MT_TELOTHER_FX3:
-            case MT_TELOTHER_FX4:
-            case MT_TELOTHER_FX5:
-                if ((target->flags & MF_COUNTKILL) &&
-                    (target->type != MT_SERPENT) &&
-                    (target->type != MT_SERPENTLEADER) &&
-                    (!(target->flags2 & MF2_BOSS)))
-                {
-                    P_TeleportOther(target);
-                }
-                return;
-            case MT_MINOTAUR:
-                if (inflictor->flags & MF_SKULLFLY)
-                {               // Slam only when in charge mode
-                    P_MinotaurSlam(inflictor, target);
-                    return;
-                }
-                break;
-            case MT_BISH_FX:
-                // Bishops are just too nasty
-                damage >>= 1;
-                break;
-            case MT_SHARDFX1:
-                switch (inflictor->special2.i)
-                {
-                    case 3:
-                        damage <<= 3;
-                        break;
-                    case 2:
-                        damage <<= 2;
-                        break;
-                    case 1:
-                        damage <<= 1;
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            case MT_CSTAFF_MISSILE:
-                // Cleric Serpent Staff does poison damage
-                if (target->player)
-                {
-                    P_PoisonPlayer(target->player, source, 20);
-                    damage >>= 1;
-                }
-                break;
-            case MT_ICEGUY_FX2:
-                damage >>= 1;
-                break;
-            case MT_POISONDART:
-                if (target->player)
-                {
-                    P_PoisonPlayer(target->player, source, 20);
-                    damage >>= 1;
-                }
-                break;
-            case MT_POISONCLOUD:
-                if (target->player)
-                {
-                    if (target->player->poisoncount < 4)
-                    {
-                        P_PoisonDamage(target->player, source, 15 + (P_Random() & 15), false);  // Don't play painsound
-                        P_PoisonPlayer(target->player, source, 50);
-                        S_StartSound(target, SFX_PLAYER_POISONCOUGH);
-                    }
-                    return;
-                }
-                else if (!(target->flags & MF_COUNTKILL))
-                {               // only damage monsters/players with the poison cloud
-                    return;
-                }
-                break;
-            case MT_FSWORD_MISSILE:
-                if (target->player)
-                {
-                    damage -= damage >> 2;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    // Push the target unless source is using the gauntlets
-    if (inflictor && (!source || !source->player)
-        && !(inflictor->flags2 & MF2_NODMGTHRUST))
-    {
-        ang = R_PointToAngle2(inflictor->x, inflictor->y,
-                              target->x, target->y);
-        //thrust = damage*(FRACUNIT>>3)*100/target->info->mass;
-        thrust = damage * (FRACUNIT >> 3) * 150 / target->info->mass;
-        // make fall forwards sometimes
-        if ((damage < 40) && (damage > target->health)
-            && (target->z - inflictor->z > 64 * FRACUNIT) && (P_Random() & 1))
-        {
-            ang += ANG180;
-            thrust *= 4;
-        }
-        ang >>= ANGLETOFINESHIFT;
-        target->momx += FixedMul(thrust, finecosine[ang]);
-        target->momy += FixedMul(thrust, finesine[ang]);
-    }
-
-    //
-    // player specific
-    //
-    if (player)
-    {
-        savedPercent = AutoArmorSave[player->class]
-            + player->armorpoints[ARMOR_ARMOR] +
-            player->armorpoints[ARMOR_SHIELD] +
-            player->armorpoints[ARMOR_HELMET] +
-            player->armorpoints[ARMOR_AMULET];
-        if (savedPercent)
-        {                       // armor absorbed some damage
-            if (savedPercent > 100 * FRACUNIT)
-            {
-                savedPercent = 100 * FRACUNIT;
-            }
-            for (i = 0; i < NUMARMOR; i++)
-            {
-                if (player->armorpoints[i])
-                {
-                    player->armorpoints[i] -=
-                        FixedDiv(FixedMul(damage << FRACBITS,
-                                          ArmorIncrement[player->class][i]),
-                                 300 * FRACUNIT);
-                    if (player->armorpoints[i] < 2 * FRACUNIT)
-                    {
-                        player->armorpoints[i] = 0;
-                    }
-                }
-            }
-            saved = FixedDiv(FixedMul(damage << FRACBITS, savedPercent),
-                             100 * FRACUNIT);
-            if (saved > savedPercent * 2)
-            {
-                saved = savedPercent * 2;
-            }
-            damage -= saved >> FRACBITS;
-        }
-        if (damage >= player->health
-            && ((gameskill == sk_baby) || deathmatch) && !player->morphTics)
-        {                       // Try to use some inventory health
-            P_AutoUseHealth(player, damage - player->health + 1);
-        }
-        player->health -= damage;       // mirror mobj health here for Dave
-        if (player->health < 0)
-        {
-            player->health = 0;
-        }
-        player->attacker = source;
-        player->damagecount += damage;  // add damage after armor / invuln
-        if (player->damagecount > 100)
-        {
-            player->damagecount = 100;  // teleport stomp does 10k points...
-        }
-        temp = damage < 100 ? damage : 100;
-        if (player == &players[consoleplayer])
-        {
-            I_Tactile(40, 10, 40 + temp * 2);
-            SB_PaletteFlash(false);
-        }
-    }
-
-    //
-    // do the damage
-    //
-    target->health -= damage;
-    if (target->health <= 0)
-    {                           // Death
-        if (inflictor)
-        {                       // check for special fire damage or ice damage deaths
-            if (inflictor->flags2 & MF2_FIREDAMAGE)
-            {
-                if (player && !player->morphTics)
-                {               // Check for flame death
-                    if (target->health > -50 && damage > 25)
-                    {
-                        target->flags2 |= MF2_FIREDAMAGE;
-                    }
-                }
-                else
-                {
-                    target->flags2 |= MF2_FIREDAMAGE;
-                }
-            }
-            else if (inflictor->flags2 & MF2_ICEDAMAGE)
-            {
-                target->flags2 |= MF2_ICEDAMAGE;
-            }
-        }
-        if (source && (source->type == MT_MINOTAUR))
-        {                       // Minotaur's kills go to his master
-            master = source->special1.m;
-            // Make sure still alive and not a pointer to fighter head
-            if (master->player && (master->player->mo == master))
-            {
-                source = master;
-            }
-        }
-        if (source && (source->player) &&
-            (source->player->readyweapon == WP_FOURTH))
-        {
-            // Always extreme death from fourth weapon
-            target->health = -5000;
-        }
-        P_KillMobj(source, target);
-        return;
-    }
-    if ((P_Random() < target->info->painchance)
-        && !(target->flags & MF_SKULLFLY))
-    {
-        if (inflictor && (inflictor->type >= MT_LIGHTNING_FLOOR
-                          && inflictor->type <= MT_LIGHTNING_ZAP))
-        {
-            if (P_Random() < 96)
-            {
-                target->flags |= MF_JUSTHIT;    // fight back!
-                P_SetMobjState(target, target->info->painstate);
-            }
-            else
-            {                   // "electrocute" the target
-                target->frame |= FF_FULLBRIGHT;
-                if (target->flags & MF_COUNTKILL && P_Random() < 128
-                    && !S_GetSoundPlayingInfo(target, SFX_PUPPYBEAT))
-                {
-                    if ((target->type == MT_CENTAUR) ||
-                        (target->type == MT_CENTAURLEADER) ||
-                        (target->type == MT_ETTIN))
-                    {
-                        S_StartSound(target, SFX_PUPPYBEAT);
-                    }
-                }
-            }
-        }
-        else
-        {
-            target->flags |= MF_JUSTHIT;        // fight back!
-            P_SetMobjState(target, target->info->painstate);
-            if (inflictor && inflictor->type == MT_POISONCLOUD)
-            {
-                if (target->flags & MF_COUNTKILL && P_Random() < 128
-                    && !S_GetSoundPlayingInfo(target, SFX_PUPPYBEAT))
-                {
-                    if ((target->type == MT_CENTAUR) ||
-                        (target->type == MT_CENTAURLEADER) ||
-                        (target->type == MT_ETTIN))
-                    {
-                        S_StartSound(target, SFX_PUPPYBEAT);
-                    }
-                }
-            }
-        }
-    }
-    target->reactiontime = 0;   // we're awake now...
-    if (!target->threshold && source && !(source->flags2 & MF2_BOSS)
-        && !(target->type == MT_BISHOP) && !(target->type == MT_MINOTAUR))
-    {
-        // Target actor is not intent on another actor,
-        // so make him chase after source
-        if ((target->type == MT_CENTAUR && source->type == MT_CENTAURLEADER)
-            || (target->type == MT_CENTAURLEADER
-                && source->type == MT_CENTAUR))
-        {
-            return;
-        }
-        target->target = source;
-        target->threshold = BASETHRESHOLD;
-        if (target->state == &states[target->info->spawnstate]
-            && target->info->seestate != S_NULL)
-        {
-            P_SetMobjState(target, target->info->seestate);
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_FallingDamage
-//
-//==========================================================================
-
-void P_FallingDamage(player_t * player)
-{
-    int damage;
-    int mom;
-    int dist;
-
-    mom = abs(player->mo->momz);
-    dist = FixedMul(mom, 16 * FRACUNIT / 23);
-
-    if (mom >= 63 * FRACUNIT)
-    {                           // automatic death
-        P_DamageMobj(player->mo, NULL, NULL, 10000);
-        return;
-    }
-    damage = ((FixedMul(dist, dist) / 10) >> FRACBITS) - 24;
-    if (player->mo->momz > -39 * FRACUNIT && damage > player->mo->health
-        && player->mo->health != 1)
-    {                           // No-death threshold
-        damage = player->mo->health - 1;
-    }
-    S_StartSound(player->mo, SFX_PLAYER_LAND);
-    P_DamageMobj(player->mo, NULL, NULL, damage);
-}
-
-//==========================================================================
-//
-// P_PoisonPlayer - Sets up all data concerning poisoning
-//
-//==========================================================================
-
-void P_PoisonPlayer(player_t * player, mobj_t * poisoner, int poison)
-{
-    if ((player->cheats & CF_GODMODE) || player->powers[pw_invulnerability])
-    {
-        return;
-    }
-    player->poisoncount += poison;
-    player->poisoner = poisoner;
-    if (player->poisoncount > 100)
-    {
-        player->poisoncount = 100;
-    }
-}
-
-//==========================================================================
-//
-// P_PoisonDamage - Similar to P_DamageMobj
-//
-//==========================================================================
-
-void P_PoisonDamage(player_t * player, mobj_t * source, int damage,
-                    boolean playPainSound)
-{
-    mobj_t *target;
-    mobj_t *inflictor;
-
-    target = player->mo;
-    inflictor = source;
-    if (target->health <= 0)
-    {
-        return;
-    }
-    if (target->flags2 & MF2_INVULNERABLE && damage < 10000)
-    {                           // mobj is invulnerable
-        return;
-    }
-    if (gameskill == sk_baby)
-    {
-        // Take half damage in trainer mode
-        damage >>= 1;
-    }
-    if (damage < 1000 && ((player->cheats & CF_GODMODE)
-                          || player->powers[pw_invulnerability]))
-    {
-        return;
-    }
-    if (damage >= player->health
-        && ((gameskill == sk_baby) || deathmatch) && !player->morphTics)
-    {                           // Try to use some inventory health
-        P_AutoUseHealth(player, damage - player->health + 1);
-    }
-    player->health -= damage;   // mirror mobj health here for Dave
-    if (player->health < 0)
-    {
-        player->health = 0;
-    }
-    player->attacker = source;
-
-    //
-    // do the damage
-    //
-    target->health -= damage;
-    if (target->health <= 0)
-    {                           // Death
-        target->special1.i = damage;
-        if (inflictor && !player->morphTics)
-        {                       // Check for flame death
-            if ((inflictor->flags2 & MF2_FIREDAMAGE)
-                && (target->health > -50) && (damage > 25))
-            {
-                target->flags2 |= MF2_FIREDAMAGE;
-            }
-            if (inflictor->flags2 & MF2_ICEDAMAGE)
-            {
-                target->flags2 |= MF2_ICEDAMAGE;
-            }
-        }
-        P_KillMobj(source, target);
-        return;
-    }
-    if (!(leveltime & 63) && playPainSound)
-    {
-        P_SetMobjState(target, target->info->painstate);
-    }
-/*
-	if((P_Random() < target->info->painchance)
-		&& !(target->flags&MF_SKULLFLY))
-	{
-		target->flags |= MF_JUSTHIT; // fight back!
-		P_SetMobjState(target, target->info->painstate);
-	}
-*/
-}
diff --git a/games/NXDoom/src/hexen/p_lights.c b/games/NXDoom/src/hexen/p_lights.c
deleted file mode 100644
index aae27212f..000000000
--- a/games/NXDoom/src/hexen/p_lights.c
+++ /dev/null
@@ -1,369 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "m_random.h"
-#include "p_local.h"
-
-//============================================================================
-//
-//      T_Light
-//
-//============================================================================
-
-void T_Light(thinker_t *thinker)
-{
-    light_t *light = (light_t *) thinker;
-    if (light->count)
-    {
-        light->count--;
-        return;
-    }
-    switch (light->type)
-    {
-        case LITE_FADE:
-            light->sector->lightlevel =
-                ((light->sector->lightlevel << FRACBITS) +
-                 light->value2) >> FRACBITS;
-            if (light->tics2 == 1)
-            {
-                if (light->sector->lightlevel >= light->value1)
-                {
-                    light->sector->lightlevel = light->value1;
-                    P_RemoveThinker(&light->thinker);
-                }
-            }
-            else if (light->sector->lightlevel <= light->value1)
-            {
-                light->sector->lightlevel = light->value1;
-                P_RemoveThinker(&light->thinker);
-            }
-            break;
-        case LITE_GLOW:
-            light->sector->lightlevel =
-                ((light->sector->lightlevel << FRACBITS) +
-                 light->tics1) >> FRACBITS;
-            if (light->tics2 == 1)
-            {
-                if (light->sector->lightlevel >= light->value1)
-                {
-                    light->sector->lightlevel = light->value1;
-                    light->tics1 = -light->tics1;
-                    light->tics2 = -1;  // reverse direction
-                }
-            }
-            else if (light->sector->lightlevel <= light->value2)
-            {
-                light->sector->lightlevel = light->value2;
-                light->tics1 = -light->tics1;
-                light->tics2 = 1;       // reverse direction
-            }
-            break;
-        case LITE_FLICKER:
-            if (light->sector->lightlevel == light->value1)
-            {
-                light->sector->lightlevel = light->value2;
-                light->count = (P_Random() & 7) + 1;
-            }
-            else
-            {
-                light->sector->lightlevel = light->value1;
-                light->count = (P_Random() & 31) + 1;
-            }
-            break;
-        case LITE_STROBE:
-            if (light->sector->lightlevel == light->value1)
-            {
-                light->sector->lightlevel = light->value2;
-                light->count = light->tics2;
-            }
-            else
-            {
-                light->sector->lightlevel = light->value1;
-                light->count = light->tics1;
-            }
-            break;
-        default:
-            break;
-    }
-}
-
-//============================================================================
-//
-//      EV_SpawnLight
-//
-//============================================================================
-
-boolean EV_SpawnLight(line_t * line, byte * arg, lighttype_t type)
-{
-    light_t *light;
-    sector_t *sec;
-    int secNum;
-    int arg1, arg2, arg3, arg4;
-    boolean think;
-    boolean rtn;
-
-    /*
-    Original code; redundant considering that a byte value is always
-    in the range 0-255:
-
-    arg1 = arg[1] > 255 ? 255 : arg[1];
-    arg1 = arg1 < 0 ? 0 : arg1;
-    arg2 = arg[2] > 255 ? 255 : arg[2];
-    arg2 = arg2 < 0 ? 0 : arg2;
-    arg3 = arg[3] > 255 ? 255 : arg[3];
-    arg3 = arg3 < 0 ? 0 : arg3;
-    arg4 = arg[4] > 255 ? 255 : arg[4];
-    arg4 = arg4 < 0 ? 0 : arg4;
-    */
-
-    arg1 = arg[1];
-    arg2 = arg[2];
-    arg3 = arg[3];
-    arg4 = arg[4];
-
-    secNum = -1;
-    rtn = false;
-    while ((secNum = P_FindSectorFromTag(arg[0], secNum)) >= 0)
-    {
-        think = false;
-        sec = &sectors[secNum];
-
-        light = (light_t *) Z_Malloc(sizeof(light_t), PU_LEVSPEC, 0);
-        light->type = type;
-        light->sector = sec;
-        light->count = 0;
-        rtn = true;
-        switch (type)
-        {
-            case LITE_RAISEBYVALUE:
-                sec->lightlevel += arg1;
-                if (sec->lightlevel > 255)
-                {
-                    sec->lightlevel = 255;
-                }
-                break;
-            case LITE_LOWERBYVALUE:
-                sec->lightlevel -= arg1;
-                if (sec->lightlevel < 0)
-                {
-                    sec->lightlevel = 0;
-                }
-                break;
-            case LITE_CHANGETOVALUE:
-                sec->lightlevel = arg1;
-                if (sec->lightlevel < 0)
-                {
-                    sec->lightlevel = 0;
-                }
-                else if (sec->lightlevel > 255)
-                {
-                    sec->lightlevel = 255;
-                }
-                break;
-            case LITE_FADE:
-                think = true;
-                light->value1 = arg1;   // destination lightlevel
-                light->value2 = FixedDiv((arg1 - sec->lightlevel) << FRACBITS, arg2 << FRACBITS);       // delta lightlevel
-                if (sec->lightlevel <= arg1)
-                {
-                    light->tics2 = 1;   // get brighter
-                }
-                else
-                {
-                    light->tics2 = -1;
-                }
-                break;
-            case LITE_GLOW:
-                think = true;
-                light->value1 = arg1;   // upper lightlevel
-                light->value2 = arg2;   // lower lightlevel
-                light->tics1 = FixedDiv((arg1 - sec->lightlevel) << FRACBITS, arg3 << FRACBITS);        // lightlevel delta
-                if (sec->lightlevel <= arg1)
-                {
-                    light->tics2 = 1;   // get brighter
-                }
-                else
-                {
-                    light->tics2 = -1;
-                }
-                break;
-            case LITE_FLICKER:
-                think = true;
-                light->value1 = arg1;   // upper lightlevel
-                light->value2 = arg2;   // lower lightlevel
-                sec->lightlevel = light->value1;
-                light->count = (P_Random() & 64) + 1;
-                break;
-            case LITE_STROBE:
-                think = true;
-                light->value1 = arg1;   // upper lightlevel
-                light->value2 = arg2;   // lower lightlevel
-                light->tics1 = arg3;    // upper tics
-                light->tics2 = arg4;    // lower tics
-                light->count = arg3;
-                sec->lightlevel = light->value1;
-                break;
-            default:
-                rtn = false;
-                break;
-        }
-        if (think)
-        {
-            P_AddThinker(&light->thinker);
-            light->thinker.function = T_Light;
-        }
-        else
-        {
-            Z_Free(light);
-        }
-    }
-    return rtn;
-}
-
-//============================================================================
-//
-//      T_Phase
-//
-//============================================================================
-
-int PhaseTable[64] = {
-    128, 112, 96, 80, 64, 48, 32, 32,
-    16, 16, 16, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 16, 16, 16,
-    32, 32, 48, 64, 80, 96, 112, 128
-};
-
-void T_Phase(thinker_t *thinker)
-{
-    phase_t *phase = (phase_t *) thinker;
-    phase->index = (phase->index + 1) & 63;
-    phase->sector->lightlevel = phase->base + PhaseTable[phase->index];
-}
-
-//==========================================================================
-//
-// P_SpawnPhasedLight
-//
-//==========================================================================
-
-void P_SpawnPhasedLight(sector_t * sector, int base, int index)
-{
-    phase_t *phase;
-
-    phase = Z_Malloc(sizeof(*phase), PU_LEVSPEC, 0);
-    P_AddThinker(&phase->thinker);
-    phase->sector = sector;
-    if (index == -1)
-    {                           // sector->lightlevel as the index
-        phase->index = sector->lightlevel & 63;
-    }
-    else
-    {
-        phase->index = index & 63;
-    }
-    phase->base = base & 255;
-    sector->lightlevel = phase->base + PhaseTable[phase->index];
-    phase->thinker.function = T_Phase;
-
-    sector->special = 0;
-}
-
-//==========================================================================
-//
-// P_SpawnLightSequence
-//
-//==========================================================================
-
-void P_SpawnLightSequence(sector_t * sector, int indexStep)
-{
-    sector_t *sec;
-    sector_t *nextSec;
-    sector_t *tempSec;
-    int seqSpecial;
-    int i;
-    int count;
-    fixed_t index;
-    fixed_t indexDelta;
-    int base;
-
-    seqSpecial = LIGHT_SEQUENCE;        // look for Light_Sequence, first
-    sec = sector;
-    count = 1;
-    do
-    {
-        nextSec = NULL;
-        sec->special = LIGHT_SEQUENCE_START;    // make sure that the search doesn't back up.
-        for (i = 0; i < sec->linecount; i++)
-        {
-            tempSec = getNextSector(sec->lines[i], sec);
-            if (!tempSec)
-            {
-                continue;
-            }
-            if (tempSec->special == seqSpecial)
-            {
-                if (seqSpecial == LIGHT_SEQUENCE)
-                {
-                    seqSpecial = LIGHT_SEQUENCE_ALT;
-                }
-                else
-                {
-                    seqSpecial = LIGHT_SEQUENCE;
-                }
-                nextSec = tempSec;
-                count++;
-            }
-        }
-        sec = nextSec;
-    }
-    while (sec);
-
-    sec = sector;
-    count *= indexStep;
-    index = 0;
-    indexDelta = FixedDiv(64 * FRACUNIT, count * FRACUNIT);
-    base = sector->lightlevel;
-    do
-    {
-        nextSec = NULL;
-        if (sec->lightlevel)
-        {
-            base = sec->lightlevel;
-        }
-        P_SpawnPhasedLight(sec, base, index >> FRACBITS);
-        index += indexDelta;
-        for (i = 0; i < sec->linecount; i++)
-        {
-            tempSec = getNextSector(sec->lines[i], sec);
-            if (!tempSec)
-            {
-                continue;
-            }
-            if (tempSec->special == LIGHT_SEQUENCE_START)
-            {
-                nextSec = tempSec;
-            }
-        }
-        sec = nextSec;
-    }
-    while (sec);
-}
diff --git a/games/NXDoom/src/hexen/p_local.h b/games/NXDoom/src/hexen/p_local.h
deleted file mode 100644
index 9bd92dd96..000000000
--- a/games/NXDoom/src/hexen/p_local.h
+++ /dev/null
@@ -1,429 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __P_LOCAL__
-#define __P_LOCAL__
-
-#ifndef __R_LOCAL__
-#include "r_local.h"
-#endif
-
-#define STARTREDPALS    1
-#define STARTBONUSPALS  9
-#define STARTPOISONPALS 13
-#define STARTICEPAL		21
-#define STARTHOLYPAL	22
-#define STARTSCOURGEPAL 25
-#define NUMREDPALS      8
-#define NUMBONUSPALS    4
-#define NUMPOISONPALS	8
-
-#define TOCENTER -8
-#define FLOATSPEED (FRACUNIT*4)
-
-#define MAXHEALTH 100
-#define MAXMORPHHEALTH 30
-#define VIEWHEIGHT (48*FRACUNIT)
-
-// mapblocks are used to check movement against lines and things
-#define MAPBLOCKUNITS   128
-#define MAPBLOCKSIZE    (MAPBLOCKUNITS*FRACUNIT)
-#define MAPBLOCKSHIFT   (FRACBITS+7)
-#define MAPBMASK                (MAPBLOCKSIZE-1)
-#define MAPBTOFRAC              (MAPBLOCKSHIFT-FRACBITS)
-
-// player radius for movement checking
-#define PLAYERRADIUS 16*FRACUNIT
-
-// MAXRADIUS is for precalculated sector block boxes
-// the spider demon is larger, but we don't have any moving sectors
-// nearby
-#define MAXRADIUS 32*FRACUNIT
-
-#define GRAVITY FRACUNIT
-#define MAXMOVE (30*FRACUNIT)
-
-#define USERANGE (64*FRACUNIT)
-#define MELEERANGE (64*FRACUNIT)
-#define MISSILERANGE (32*64*FRACUNIT)
-
-typedef enum
-{
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-} dirtype_t;
-
-#define BASETHRESHOLD 100       // follow a player exlusively for 3 seconds
-
-// ***** P_TICK *****
-
-extern thinker_t thinkercap;    // both the head and tail of the thinker list
-extern int TimerGame;           // tic countdown for deathmatch
-
-void P_InitThinkers(void);
-void P_AddThinker(thinker_t * thinker);
-void P_RemoveThinker(thinker_t * thinker);
-
-// ***** P_PSPR *****
-
-#define USE_MANA1	1
-#define USE_MANA2	1
-
-void P_SetPsprite(player_t * player, int position, statenum_t stnum);
-void P_SetPspriteNF(player_t * player, int position, statenum_t stnum);
-void P_SetupPsprites(player_t * curplayer);
-void P_MovePsprites(player_t * curplayer);
-void P_DropWeapon(player_t * player);
-void P_ActivateMorphWeapon(player_t * player);
-void P_PostMorphWeapon(player_t * player, weapontype_t weapon);
-
-// ***** P_USER *****
-
-
-extern int ArmorMax[NUMCLASSES];
-extern int PStateNormal[NUMCLASSES];
-extern int PStateRun[NUMCLASSES];
-extern int PStateAttack[NUMCLASSES];
-extern int PStateAttackEnd[NUMCLASSES];
-
-void P_PlayerThink(player_t * player);
-void P_Thrust(player_t * player, angle_t angle, fixed_t move);
-void P_PlayerNextArtifact(player_t *player);
-void P_PlayerRemoveArtifact(player_t * player, int slot);
-void P_PlayerUseArtifact(player_t * player, artitype_t arti);
-boolean P_UseArtifact(player_t * player, artitype_t arti);
-int P_GetPlayerNum(player_t * player);
-void P_TeleportOther(mobj_t * victim);
-void ResetBlasted(mobj_t * mo);
-boolean P_UndoPlayerMorph(player_t *player);
-
-
-// ***** P_MOBJ *****
-
-// Any floor type >= FLOOR_LIQUID will floorclip sprites
-enum
-{
-    FLOOR_SOLID,
-    FLOOR_ICE,
-    FLOOR_LIQUID,
-    FLOOR_WATER,
-    FLOOR_LAVA,
-    FLOOR_SLUDGE
-};
-
-#define ONFLOORZ INT_MIN
-#define ONCEILINGZ INT_MAX
-#define FLOATRANDZ (INT_MAX-1)
-#define FROMCEILINGZ128 (INT_MAX-2)
-
-extern mobjtype_t PuffType;
-extern mobj_t *MissileMobj;
-
-extern fixed_t FloatBobOffsets[64];
-
-
-mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
-void P_RemoveMobj(mobj_t * th);
-boolean P_SetMobjState(mobj_t * mobj, statenum_t state);
-boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state);
-void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move);
-int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta);
-boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax);
-void P_MobjThinker(thinker_t *thinker);
-void P_DegenMobjThinker(thinker_t *thinker);
-void P_BlasterMobjThinker(thinker_t *thinker);
-void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z);
-void P_SpawnBlood(fixed_t x, fixed_t y, fixed_t z, int damage);
-void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator);
-void P_BloodSplatter2(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator);
-void P_RipperBlood(mobj_t * mo);
-int P_GetThingFloorType(mobj_t * thing);
-int P_HitFloor(mobj_t * thing);
-boolean P_CheckMissileSpawn(mobj_t * missile);
-mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type);
-mobj_t *P_SpawnMissileXYZ(fixed_t x, fixed_t y, fixed_t z,
-                          mobj_t * source, mobj_t * dest, mobjtype_t type);
-mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
-                            angle_t angle, fixed_t momz);
-mobj_t *P_SpawnMissileAngleSpeed(mobj_t * source, mobjtype_t type,
-                                 angle_t angle, fixed_t momz, fixed_t speed);
-mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type);
-mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle);
-mobj_t *P_SPMAngleXYZ(mobj_t * source, fixed_t x, fixed_t y,
-                      fixed_t z, mobjtype_t type, angle_t angle);
-void P_CreateTIDList(void);
-void P_RemoveMobjFromTIDList(mobj_t * mobj);
-void P_InsertMobjIntoTIDList(mobj_t * mobj, int tid);
-mobj_t *P_FindMobjFromTID(int tid, int *searchPosition);
-void P_ExplodeMissile(mobj_t *mo);
-mobj_t *P_SpawnKoraxMissile(fixed_t x, fixed_t y, fixed_t z,
-                            mobj_t * source, mobj_t * dest, mobjtype_t type);
-
-// ***** P_ENEMY *****
-
-void P_NoiseAlert(mobj_t * target, mobj_t * emmiter);
-int P_Massacre(void);
-boolean A_RaiseMobj(mobj_t * actor);
-boolean A_SinkMobj(mobj_t * actor);
-void A_NoBlocking(mobj_t *actor, player_t *player, pspdef_t *psp);
-boolean P_LookForMonsters(mobj_t * actor);
-void P_InitCreatureCorpseQueue(boolean corpseScan);
-void A_DeQueueCorpse(mobj_t * actor);
-void A_Explode(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CHolyAttack3(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FSwordAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MStaffAttack2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_FreezeDeathChunks(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcBallOrbit(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcSpinBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SpeedBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SlowBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_StopBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_AccelBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_DecelBalls(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcBossAttack(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SpawnFizzle(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_CastSorcererSpell(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcUpdateBallAngle(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_BounceCheck(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcFX1Seek(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcOffense1(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_SorcOffense2(mobj_t *actor, player_t *player, pspdef_t *psp);
-void A_MinotaurLook(mobj_t *actor, player_t *player, pspdef_t *psp);
-
-
-// ***** P_MAPUTL *****
-
-typedef struct
-{
-    fixed_t x, y, dx, dy;
-} divline_t;
-
-typedef struct
-{
-    fixed_t frac;               // along trace line
-    boolean isaline;
-    union
-    {
-        mobj_t *thing;
-        line_t *line;
-    } d;
-} intercept_t;
-
-#define MAXINTERCEPTS   128
-extern intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
-typedef boolean(*traverser_t) (intercept_t * in);
-
-
-fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
-int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line);
-int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line);
-void P_MakeDivline(line_t * li, divline_t * dl);
-fixed_t P_InterceptVector(divline_t * v2, divline_t * v1);
-int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld);
-
-extern fixed_t opentop, openbottom, openrange;
-extern fixed_t lowfloor;
-void P_LineOpening(line_t * linedef);
-
-boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *));
-boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *));
-
-#define PT_ADDLINES             1
-#define PT_ADDTHINGS    2
-#define PT_EARLYOUT             4
-
-extern divline_t trace;
-boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
-                       int flags, boolean(*trav) (intercept_t *));
-
-void P_UnsetThingPosition(mobj_t * thing);
-void P_SetThingPosition(mobj_t * thing);
-mobj_t *P_RoughMonsterSearch(mobj_t * mo, int distance);
-
-// ***** P_MAP *****
-
-
-#define MAXSPECIALCROSS         8
-
-
-extern boolean floatok;         // if true, move would be ok if
-extern fixed_t tmfloorz, tmceilingz;    // within tmfloorz - tmceilingz
-extern int tmfloorpic;
-extern mobj_t *BlockingMobj;
-
-extern line_t *ceilingline;
-extern line_t *spechit[MAXSPECIALCROSS];
-extern int numspechit;
-
-extern fixed_t topslope, bottomslope;   // slopes to top and bottom of target
-
-
-boolean P_TestMobjLocation(mobj_t * mobj);
-boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y);
-mobj_t *P_CheckOnmobj(mobj_t * thing);
-void P_FakeZMovement(mobj_t * mo);
-boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y);
-boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y);
-void P_SlideMove(mobj_t * mo);
-void P_BounceWall(mobj_t * mo);
-boolean P_CheckSight(mobj_t * t1, mobj_t * t2);
-void P_UseLines(player_t * player);
-boolean P_UsePuzzleItem(player_t * player, int itemType);
-void PIT_ThrustSpike(mobj_t * actor);
-void P_InitSlideLine(void);
-
-boolean P_ChangeSector(sector_t * sector, int crunch);
-
-extern mobj_t *PuffSpawned;     // true if a puff was spawned
-extern mobj_t *linetarget;      // who got hit (or NULL)
-fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance);
-
-void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
-                  int damage);
-
-void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage, int distance,
-                    boolean damageSource);
-
-// ***** P_SETUP *****
-
-extern byte *rejectmatrix;      // for fast sight rejection
-extern short *blockmaplump;     // offsets in blockmap are from here
-extern short *blockmap;
-extern int bmapwidth, bmapheight;       // in mapblocks
-extern fixed_t bmaporgx, bmaporgy;      // origin of block map
-extern mobj_t **blocklinks;     // for thing chains
-
-// ***** P_INTER *****
-
-extern int clipmana[NUMMANA];
-extern int ArmorIncrement[NUMCLASSES][NUMARMOR];
-extern int AutoArmorSave[NUMCLASSES];
-extern const char *TextKeyMessages[];
-
-
-void P_SetMessage(player_t * player, const char *message, boolean ultmsg);
-void P_SetYellowMessage(player_t * player, const char *message, boolean ultmsg);
-void P_ClearMessage(player_t * player);
-void P_TouchSpecialThing(mobj_t * special, mobj_t * toucher);
-void P_DamageMobj(mobj_t * target, mobj_t * inflictor, mobj_t * source,
-                  int damage);
-void P_FallingDamage(player_t * player);
-void P_PoisonPlayer(player_t * player, mobj_t * poisoner, int poison);
-void P_PoisonDamage(player_t * player, mobj_t * source, int damage,
-                    boolean playPainSound);
-boolean P_GiveMana(player_t * player, manatype_t mana, int count);
-boolean P_GiveArtifact(player_t * player, artitype_t arti, mobj_t * mo);
-boolean P_GiveArmor(player_t * player, armortype_t armortype, int amount);
-boolean P_GiveBody(player_t * player, int num);
-boolean P_GivePower(player_t * player, powertype_t power);
-boolean P_MorphPlayer(player_t * player);
-
-// ***** AM_MAP *****
-
-boolean AM_Responder(event_t * ev);
-void AM_Ticker(void);
-void AM_Drawer(void);
-
-// ***** A_ACTION *****
-boolean A_LocalQuake(byte * args, mobj_t * victim);
-void P_SpawnDirt(mobj_t * actor, fixed_t radius);
-void A_BridgeRemove(mobj_t * actor);
-void A_UnHideThing(mobj_t *actor, player_t *player, pspdef_t *psp);
-
-
-// ***** SB_BAR *****
-
-extern int SB_state;
-extern int ArtifactFlash;
-void SB_PaletteFlash(boolean forceChange);
-
-// ===== PO_MAN =====
-
-typedef enum
-{
-    PODOOR_NONE,
-    PODOOR_SLIDE,
-    PODOOR_SWING,
-} podoortype_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    int polyobj;
-    int speed;
-    unsigned int dist;
-    int angle;
-    fixed_t xSpeed;             // for sliding walls
-    fixed_t ySpeed;
-} polyevent_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    int polyobj;
-    int speed;
-    int dist;
-    int totalDist;
-    int direction;
-    fixed_t xSpeed, ySpeed;
-    int tics;
-    int waitTics;
-    podoortype_t type;
-    boolean close;
-} polydoor_t;
-
-enum
-{
-    PO_ANCHOR_TYPE = 3000,
-    PO_SPAWN_TYPE,
-    PO_SPAWNCRUSH_TYPE
-};
-
-#define PO_LINE_START 1         // polyobj line start special
-#define PO_LINE_EXPLICIT 5
-
-extern polyobj_t *polyobjs;     // list of all poly-objects on the level
-extern int po_NumPolyobjs;
-extern polyblock_t **PolyBlockMap;
-
-
-void T_PolyDoor(thinker_t *thinker);
-void T_RotatePoly(thinker_t *thinker);
-boolean EV_RotatePoly(line_t * line, byte * args, int direction, boolean
-                      overRide);
-void T_MovePoly(thinker_t *thinker);
-boolean EV_MovePoly(line_t * line, byte * args, boolean timesEight, boolean
-                    overRide);
-boolean EV_OpenPolyDoor(line_t * line, byte * args, podoortype_t type);
-
-boolean PO_MovePolyobj(int num, int x, int y);
-boolean PO_RotatePolyobj(int num, angle_t angle);
-void PO_Init(int lump);
-boolean PO_Busy(int polyobj);
-
-#include "p_spec.h"
-
-#endif // __P_LOCAL__
diff --git a/games/NXDoom/src/hexen/p_map.c b/games/NXDoom/src/hexen/p_map.c
deleted file mode 100644
index 6a3886015..000000000
--- a/games/NXDoom/src/hexen/p_map.c
+++ /dev/null
@@ -1,2338 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "m_bbox.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-static void CheckForPushSpecial(line_t * line, int side, mobj_t * mobj);
-
-/*
-===============================================================================
-
-NOTES:
-
-
-===============================================================================
-*/
-
-/*
-===============================================================================
-
-mobj_t NOTES
-
-mobj_ts are used to tell the refresh where to draw an image, tell the world simulation when objects are contacted, and tell the sound driver how to position a sound.
-
-The refresh uses the next and prev links to follow lists of things in sectors as they are being drawn.  The sprite, frame, and angle elements determine which patch_t is used to draw the sprite if it is visible.  The sprite and frame values are allmost allways set from state_t structures.  The statescr.exe utility generates the states.h and states.c files that contain the sprite/frame numbers from the statescr.txt source file.  The xyz origin point represents a point at the bottom middle of the sprite (between the feet of a biped).  This is the default origin position for patch_ts grabbed with lumpy.exe.  A walking creature will have its z equal to the floor it is standing on.
-
-The sound code uses the x,y, and subsector fields to do stereo positioning of any sound effited by the mobj_t.
-
-The play simulation uses the blocklinks, x,y,z, radius, height to determine when mobj_ts are touching each other, touching lines in the map, or hit by trace lines (gunshots, lines of sight, etc). The mobj_t->flags element has various bit flags used by the simulation.
-
-
-Every mobj_t is linked into a single sector based on it's origin coordinates.
-The subsector_t is found with R_PointInSubsector(x,y), and the sector_t can be found with subsector->sector.  The sector links are only used by the rendering code,  the play simulation does not care about them at all.
-
-Any mobj_t that needs to be acted upon be something else in the play world (block movement, be shot, etc) will also need to be linked into the blockmap.  If the thing has the MF_NOBLOCK flag set, it will not use the block links. It can still interact with other things, but only as the instigator (missiles will run into other things, but nothing can run into a missile).   Each block in the grid is 128*128 units, and knows about every line_t that it contains a piece of, and every interactable mobj_t that has it's origin contained.
-
-A valid mobj_t is a mobj_t that has the proper subsector_t filled in for it's xy coordinates and is linked into the subsector's sector or has the MF_NOSECTOR flag set (the subsector_t needs to be valid even if MF_NOSECTOR is set), and is linked into a blockmap block or has the MF_NOBLOCKMAP flag set.  Links should only be modified by the P_[Un]SetThingPosition () functions.  Do not change the MF_NO? flags while a thing is valid.
-
-
-===============================================================================
-*/
-
-fixed_t tmbbox[4];
-mobj_t *tmthing;
-mobj_t *tsthing;
-int tmflags;
-fixed_t tmx, tmy;
-
-boolean floatok;                // if true, move would be ok if
-                                                        // within tmfloorz - tmceilingz
-
-fixed_t tmfloorz, tmceilingz, tmdropoffz;
-int tmfloorpic;
-
-// keep track of the line that lowers the ceiling, so missiles don't explode
-// against sky hack walls
-line_t *ceilingline;
-
-// keep track of special lines as they are hit, but don't process them
-// until the move is proven valid
-
-line_t *spechit[MAXSPECIALCROSS];
-int numspechit;
-
-mobj_t *onmobj;                 // generic global onmobj...used for landing on pods/players
-mobj_t *BlockingMobj;
-
-/*
-===============================================================================
-
-					TELEPORT MOVE
-
-===============================================================================
-*/
-
-/*
-==================
-=
-= PIT_StompThing
-=
-==================
-*/
-
-boolean PIT_StompThing(mobj_t * thing)
-{
-    fixed_t blockdist;
-
-    if (!(thing->flags & MF_SHOOTABLE))
-        return true;
-
-    blockdist = thing->radius + tmthing->radius;
-    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
-        return true;            // didn't hit it
-
-    if (thing == tmthing)
-        return true;            // don't clip against self
-
-    if (!(tmthing->flags2 & MF2_TELESTOMP))
-    {                           // Not allowed to stomp things
-        return (false);
-    }
-
-    P_DamageMobj(thing, tmthing, tmthing, 10000);
-
-    return true;
-}
-
-
-/*
-===================
-=
-= P_TeleportMove
-=
-===================
-*/
-
-boolean P_TeleportMove(mobj_t * thing, fixed_t x, fixed_t y)
-{
-    int xl, xh, yl, yh, bx, by;
-    subsector_t *newsubsec;
-
-//
-// kill anything occupying the position
-//
-
-    tmthing = thing;
-    tmflags = thing->flags;
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector(x, y);
-    ceilingline = NULL;
-
-//
-// the base floor / ceiling is from the subsector that contains the
-// point.  Any contacted lines the step closer together will adjust them
-//
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-    tmfloorpic = newsubsec->sector->floorpic;
-
-    validcount++;
-    numspechit = 0;
-
-//
-// stomp on any things contacted
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockThingsIterator(bx, by, PIT_StompThing))
-                return false;
-
-//
-// the move is ok, so link the thing into its new position
-//
-    P_UnsetThingPosition(thing);
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition(thing);
-
-    return true;
-}
-
-
-boolean PIT_ThrustStompThing(mobj_t * thing)
-{
-    fixed_t blockdist;
-
-    if (!(thing->flags & MF_SHOOTABLE))
-        return true;
-
-    blockdist = thing->radius + tsthing->radius;
-    if (abs(thing->x - tsthing->x) >= blockdist ||
-        abs(thing->y - tsthing->y) >= blockdist ||
-        (thing->z > tsthing->z + tsthing->height))
-        return true;            // didn't hit it
-
-    if (thing == tsthing)
-        return true;            // don't clip against self
-
-    P_DamageMobj(thing, tsthing, tsthing, 10001);
-    tsthing->args[1] = 1;       // Mark thrust thing as bloody
-
-    return true;
-}
-
-
-
-void PIT_ThrustSpike(mobj_t * actor)
-{
-    int xl, xh, yl, yh, bx, by;
-    int x0, x2, y0, y2;
-
-    tsthing = actor;
-
-    x0 = actor->x - actor->info->radius;
-    x2 = actor->x + actor->info->radius;
-    y0 = actor->y - actor->info->radius;
-    y2 = actor->y + actor->info->radius;
-
-    xl = (x0 - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (x2 - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (y0 - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (y2 - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    // stomp on any things contacted
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            P_BlockThingsIterator(bx, by, PIT_ThrustStompThing);
-}
-
-
-
-/*
-===============================================================================
-
-					MOVEMENT ITERATOR FUNCTIONS
-
-===============================================================================
-*/
-
-/*
-==================
-=
-= PIT_CheckLine
-=
-= Adjusts tmfloorz and tmceilingz as lines are contacted
-==================
-*/
-
-boolean PIT_CheckLine(line_t * ld)
-{
-    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
-        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
-        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
-    {
-        return (true);
-    }
-    if (P_BoxOnLineSide(tmbbox, ld) != -1)
-    {
-        return (true);
-    }
-
-// a line has been hit
-/*
-=
-= The moving thing's destination position will cross the given line.
-= If this should not be allowed, return false.
-= If the line is special, keep track of it to process later if the move
-=       is proven ok.  NOTE: specials are NOT sorted by order, so two special lines
-=       that are only 8 pixels apart could be crossed in either order.
-*/
-
-    if (!ld->backsector)
-    {                           // One sided line
-        if (tmthing->flags2 & MF2_BLASTED)
-        {
-            P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
-        }
-        CheckForPushSpecial(ld, 0, tmthing);
-        return (false);
-    }
-    if (!(tmthing->flags & MF_MISSILE))
-    {
-        if (ld->flags & ML_BLOCKING)
-        {                       // Explicitly blocking everything
-            if (tmthing->flags2 & MF2_BLASTED)
-            {
-                P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
-            }
-            CheckForPushSpecial(ld, 0, tmthing);
-            return (false);
-        }
-        if (!tmthing->player && ld->flags & ML_BLOCKMONSTERS)
-        {                       // Block monsters only
-            if (tmthing->flags2 & MF2_BLASTED)
-            {
-                P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
-            }
-            return (false);
-        }
-    }
-    P_LineOpening(ld);          // set openrange, opentop, openbottom
-    // adjust floor / ceiling heights
-    if (opentop < tmceilingz)
-    {
-        tmceilingz = opentop;
-        ceilingline = ld;
-    }
-    if (openbottom > tmfloorz)
-    {
-        tmfloorz = openbottom;
-    }
-    if (lowfloor < tmdropoffz)
-    {
-        tmdropoffz = lowfloor;
-    }
-    if (ld->special)
-    {                           // Contacted a special line, add it to the list
-        spechit[numspechit] = ld;
-        numspechit++;
-    }
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC PIT_CheckThing
-//
-//---------------------------------------------------------------------------
-
-boolean PIT_CheckThing(mobj_t * thing)
-{
-    fixed_t blockdist;
-    boolean solid;
-    int damage;
-
-    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
-    {                           // Can't hit thing
-        return (true);
-    }
-    blockdist = thing->radius + tmthing->radius;
-    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
-    {                           // Didn't hit thing
-        return (true);
-    }
-    if (thing == tmthing)
-    {                           // Don't clip against self
-        return (true);
-    }
-    BlockingMobj = thing;
-    if (tmthing->flags2 & MF2_PASSMOBJ)
-    {                           // check if a mobj passed over/under another object
-        if (tmthing->type == MT_BISHOP && thing->type == MT_BISHOP)
-        {                       // don't let bishops fly over other bishops
-            return false;
-        }
-        if (tmthing->z >= thing->z + thing->height
-            && !(thing->flags & MF_SPECIAL))
-        {
-            return (true);
-        }
-        else if (tmthing->z + tmthing->height < thing->z
-                 && !(thing->flags & MF_SPECIAL))
-        {                       // under thing
-            return (true);
-        }
-    }
-    // Check for skulls slamming into things
-    if (tmthing->flags & MF_SKULLFLY)
-    {
-        if (tmthing->type == MT_MINOTAUR)
-        {
-            // Slamming minotaurs shouldn't move non-creatures
-            if (!(thing->flags & MF_COUNTKILL))
-            {
-                return (false);
-            }
-        }
-        else if (tmthing->type == MT_HOLY_FX)
-        {
-            if (thing->flags & MF_SHOOTABLE && thing != tmthing->target)
-            {
-                if (netgame && !deathmatch && thing->player)
-                {               // don't attack other co-op players
-                    return true;
-                }
-                if (thing->flags2 & MF2_REFLECTIVE
-                    && (thing->player || thing->flags2 & MF2_BOSS))
-                {
-                    tmthing->special1.m = tmthing->target;
-                    tmthing->target = thing;
-                    return true;
-                }
-                if (thing->flags & MF_COUNTKILL || thing->player)
-                {
-                    tmthing->special1.m = thing;
-                }
-                if (P_Random() < 96)
-                {
-                    damage = 12;
-                    if (thing->player || thing->flags2 & MF2_BOSS)
-                    {
-                        damage = 3;
-                        // ghost burns out faster when attacking players/bosses
-                        tmthing->health -= 6;
-                    }
-                    P_DamageMobj(thing, tmthing, tmthing->target, damage);
-                    if (P_Random() < 128)
-                    {
-                        P_SpawnMobj(tmthing->x, tmthing->y, tmthing->z,
-                                    MT_HOLY_PUFF);
-                        S_StartSound(tmthing, SFX_SPIRIT_ATTACK);
-                        if (thing->flags & MF_COUNTKILL && P_Random() < 128
-                            && !S_GetSoundPlayingInfo(thing, SFX_PUPPYBEAT))
-                        {
-                            if ((thing->type == MT_CENTAUR) ||
-                                (thing->type == MT_CENTAURLEADER) ||
-                                (thing->type == MT_ETTIN))
-                            {
-                                S_StartSound(thing, SFX_PUPPYBEAT);
-                            }
-                        }
-                    }
-                }
-                if (thing->health <= 0)
-                {
-                    tmthing->special1.i = 0;
-                }
-            }
-            return true;
-        }
-        damage = ((P_Random() % 8) + 1) * tmthing->damage;
-        P_DamageMobj(thing, tmthing, tmthing, damage);
-        tmthing->flags &= ~MF_SKULLFLY;
-        tmthing->momx = tmthing->momy = tmthing->momz = 0;
-        P_SetMobjState(tmthing, tmthing->info->seestate);
-        return (false);
-    }
-    // Check for blasted thing running into another
-    if (tmthing->flags2 & MF2_BLASTED && thing->flags & MF_SHOOTABLE)
-    {
-        if (!(thing->flags2 & MF2_BOSS) && (thing->flags & MF_COUNTKILL))
-        {
-            thing->momx += tmthing->momx;
-            thing->momy += tmthing->momy;
-            if ((thing->momx + thing->momy) > 3 * FRACUNIT)
-            {
-                damage = (tmthing->info->mass / 100) + 1;
-                P_DamageMobj(thing, tmthing, tmthing, damage);
-                damage = (thing->info->mass / 100) + 1;
-                P_DamageMobj(tmthing, thing, thing, damage >> 2);
-            }
-            return (false);
-        }
-    }
-    // Check for missile
-    if (tmthing->flags & MF_MISSILE)
-    {
-        // Check for a non-shootable mobj
-        if (thing->flags2 & MF2_NONSHOOTABLE)
-        {
-            return true;
-        }
-        // Check if it went over / under
-        if (tmthing->z > thing->z + thing->height)
-        {                       // Over thing
-            return (true);
-        }
-        if (tmthing->z + tmthing->height < thing->z)
-        {                       // Under thing
-            return (true);
-        }
-        if (tmthing->flags2 & MF2_FLOORBOUNCE)
-        {
-            if (tmthing->target == thing || !(thing->flags & MF_SOLID))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        if (tmthing->type == MT_LIGHTNING_FLOOR
-            || tmthing->type == MT_LIGHTNING_CEILING)
-        {
-            if (thing->flags & MF_SHOOTABLE && thing != tmthing->target)
-            {
-                if (thing->info->mass != INT_MAX)
-                {
-                    thing->momx += tmthing->momx >> 4;
-                    thing->momy += tmthing->momy >> 4;
-                }
-                if ((!thing->player && !(thing->flags2 & MF2_BOSS))
-                    || !(leveltime & 1))
-                {
-                    if (thing->type == MT_CENTAUR
-                        || thing->type == MT_CENTAURLEADER)
-                    {           // Lightning does more damage to centaurs
-                        P_DamageMobj(thing, tmthing, tmthing->target, 9);
-                    }
-                    else
-                    {
-                        P_DamageMobj(thing, tmthing, tmthing->target, 3);
-                    }
-                    if (!(S_GetSoundPlayingInfo(tmthing,
-                                                SFX_MAGE_LIGHTNING_ZAP)))
-                    {
-                        S_StartSound(tmthing, SFX_MAGE_LIGHTNING_ZAP);
-                    }
-                    if (thing->flags & MF_COUNTKILL && P_Random() < 64
-                        && !S_GetSoundPlayingInfo(thing, SFX_PUPPYBEAT))
-                    {
-                        if ((thing->type == MT_CENTAUR) ||
-                            (thing->type == MT_CENTAURLEADER) ||
-                            (thing->type == MT_ETTIN))
-                        {
-                            S_StartSound(thing, SFX_PUPPYBEAT);
-                        }
-                    }
-                }
-                tmthing->health--;
-                if (tmthing->health <= 0 || thing->health <= 0)
-                {
-                    return false;
-                }
-                if (tmthing->type == MT_LIGHTNING_FLOOR)
-                {
-                    if (tmthing->special2.m
-                        && !tmthing->special2.m->special1.m)
-                    {
-                        tmthing->special2.m->special1.m = thing;
-                    }
-                }
-                else if (!tmthing->special1.m)
-                {
-                    tmthing->special1.m = thing;
-                }
-            }
-            return true;        // lightning zaps through all sprites
-        }
-        else if (tmthing->type == MT_LIGHTNING_ZAP)
-        {
-            mobj_t *lmo;
-
-            if (thing->flags & MF_SHOOTABLE && thing != tmthing->target)
-            {
-                lmo = tmthing->special2.m;
-                if (lmo)
-                {
-                    if (lmo->type == MT_LIGHTNING_FLOOR)
-                    {
-                        if (lmo->special2.m
-                            && !lmo->special2.m->special1.m)
-                        {
-                            lmo->special2.m->special1.m = thing;
-                        }
-                    }
-                    else if (!lmo->special1.m)
-                    {
-                        lmo->special1.m = thing;
-                    }
-                    if (!(leveltime & 3))
-                    {
-                        lmo->health--;
-                    }
-                }
-            }
-        }
-        else if (tmthing->type == MT_MSTAFF_FX2 && thing != tmthing->target)
-        {
-            if (!thing->player && !(thing->flags2 & MF2_BOSS))
-            {
-                switch (thing->type)
-                {
-                    case MT_FIGHTER_BOSS:      // these not flagged boss
-                    case MT_CLERIC_BOSS:       // so they can be blasted
-                    case MT_MAGE_BOSS:
-                        break;
-                    default:
-                        P_DamageMobj(thing, tmthing, tmthing->target, 10);
-                        return true;
-                        break;
-                }
-            }
-        }
-        if (tmthing->target && tmthing->target->type == thing->type)
-        {                       // Don't hit same species as originator
-            if (thing == tmthing->target)
-            {                   // Don't missile self
-                return (true);
-            }
-            if (!thing->player)
-            {                   // Hit same species as originator, explode, no damage
-                return (false);
-            }
-        }
-        if (!(thing->flags & MF_SHOOTABLE))
-        {                       // Didn't do any damage
-            return !(thing->flags & MF_SOLID);
-        }
-        if (tmthing->flags2 & MF2_RIP)
-        {
-            if (!(thing->flags & MF_NOBLOOD) &&
-                !(thing->flags2 & MF2_REFLECTIVE) &&
-                !(thing->flags2 & MF2_INVULNERABLE))
-            {                   // Ok to spawn some blood
-                P_RipperBlood(tmthing);
-            }
-            //S_StartSound(tmthing, sfx_ripslop);
-            damage = ((P_Random() & 3) + 2) * tmthing->damage;
-            P_DamageMobj(thing, tmthing, tmthing->target, damage);
-            if (thing->flags2 & MF2_PUSHABLE
-                && !(tmthing->flags2 & MF2_CANNOTPUSH))
-            {                   // Push thing
-                thing->momx += tmthing->momx >> 2;
-                thing->momy += tmthing->momy >> 2;
-            }
-            numspechit = 0;
-            return (true);
-        }
-        // Do damage
-        damage = ((P_Random() % 8) + 1) * tmthing->damage;
-        if (damage)
-        {
-            if (!(thing->flags & MF_NOBLOOD) &&
-                !(thing->flags2 & MF2_REFLECTIVE) &&
-                !(thing->flags2 & MF2_INVULNERABLE) &&
-                !(tmthing->type == MT_TELOTHER_FX1) &&
-                !(tmthing->type == MT_TELOTHER_FX2) &&
-                !(tmthing->type == MT_TELOTHER_FX3) &&
-                !(tmthing->type == MT_TELOTHER_FX4) &&
-                !(tmthing->type == MT_TELOTHER_FX5) && (P_Random() < 192))
-            {
-                P_BloodSplatter(tmthing->x, tmthing->y, tmthing->z, thing);
-            }
-            P_DamageMobj(thing, tmthing, tmthing->target, damage);
-        }
-        return (false);
-    }
-    if (thing->flags2 & MF2_PUSHABLE && !(tmthing->flags2 & MF2_CANNOTPUSH))
-    {                           // Push thing
-        thing->momx += tmthing->momx >> 2;
-        thing->momy += tmthing->momy >> 2;
-    }
-    // Check for special thing
-    if (thing->flags & MF_SPECIAL)
-    {
-        solid = (thing->flags & MF_SOLID) != 0;
-        if (tmflags & MF_PICKUP)
-        {                       // Can be picked up by tmthing
-            P_TouchSpecialThing(thing, tmthing);        // Can remove thing
-        }
-        return (!solid);
-    }
-    return (!(thing->flags & MF_SOLID));
-}
-
-//---------------------------------------------------------------------------
-//
-// PIT_CheckOnmobjZ
-//
-//---------------------------------------------------------------------------
-
-boolean PIT_CheckOnmobjZ(mobj_t * thing)
-{
-    fixed_t blockdist;
-
-    if (!(thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)))
-    {                           // Can't hit thing
-        return (true);
-    }
-    blockdist = thing->radius + tmthing->radius;
-    if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
-    {                           // Didn't hit thing
-        return (true);
-    }
-    if (thing == tmthing)
-    {                           // Don't clip against self
-        return (true);
-    }
-    if (tmthing->z > thing->z + thing->height)
-    {
-        return (true);
-    }
-    else if (tmthing->z + tmthing->height < thing->z)
-    {                           // under thing
-        return (true);
-    }
-    if (thing->flags & MF_SOLID)
-    {
-        onmobj = thing;
-    }
-    return (!(thing->flags & MF_SOLID));
-}
-
-/*
-===============================================================================
-
-						MOVEMENT CLIPPING
-
-===============================================================================
-*/
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_TestMobjLocation
-//
-// Returns true if the mobj is not blocked by anything at its current
-// location, otherwise returns false.
-//
-//----------------------------------------------------------------------------
-
-boolean P_TestMobjLocation(mobj_t * mobj)
-{
-    int flags;
-
-    flags = mobj->flags;
-    mobj->flags &= ~MF_PICKUP;
-    if (P_CheckPosition(mobj, mobj->x, mobj->y))
-    {                           // XY is ok, now check Z
-        mobj->flags = flags;
-        if ((mobj->z < mobj->floorz)
-            || (mobj->z + mobj->height > mobj->ceilingz))
-        {                       // Bad Z
-            return (false);
-        }
-        return (true);
-    }
-    mobj->flags = flags;
-    return (false);
-}
-
-/*
-==================
-=
-= P_CheckPosition
-=
-= This is purely informative, nothing is modified (except things picked up)
-
-in:
-a mobj_t (can be valid or invalid)
-a position to be checked (doesn't need to be related to the mobj_t->x,y)
-
-during:
-special things are touched if MF_PICKUP
-early out on solid lines?
-
-out:
-newsubsec
-floorz
-ceilingz
-tmdropoffz = the lowest point contacted (monsters won't move to a dropoff)
-speciallines[]
-numspeciallines
-mobj_t *BlockingMobj = pointer to thing that blocked position (NULL if not
-blocked, or blocked by a line).
-
-==================
-*/
-
-boolean P_CheckPosition(mobj_t * thing, fixed_t x, fixed_t y)
-{
-    int xl, xh, yl, yh, bx, by;
-    subsector_t *newsubsec;
-
-    tmthing = thing;
-    tmflags = thing->flags;
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector(x, y);
-    ceilingline = NULL;
-
-//
-// the base floor / ceiling is from the subsector that contains the
-// point.  Any contacted lines the step closer together will adjust them
-//
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-    tmfloorpic = newsubsec->sector->floorpic;
-
-    validcount++;
-    numspechit = 0;
-
-    if (tmflags & MF_NOCLIP && !(tmflags & MF_SKULLFLY))
-    {
-        return true;
-    }
-
-//
-// check things first, possibly picking things up
-// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
-// into mapblocks based on their origin point, and can overlap into adjacent
-// blocks by up to MAXRADIUS units
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    BlockingMobj = NULL;
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
-                return false;
-//
-// check lines
-//
-    if (tmflags & MF_NOCLIP)
-    {
-        return true;
-    }
-
-    BlockingMobj = NULL;
-    xl = (tmbbox[BOXLEFT] - bmaporgx) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockLinesIterator(bx, by, PIT_CheckLine))
-                return false;
-    return true;
-}
-
-//=============================================================================
-//
-// P_CheckOnmobj(mobj_t *thing)
-//
-//              Checks if the new Z position is legal
-//=============================================================================
-
-mobj_t *P_CheckOnmobj(mobj_t * thing)
-{
-    int xl, xh, yl, yh, bx, by;
-    subsector_t *newsubsec;
-    fixed_t x;
-    fixed_t y;
-    mobj_t oldmo;
-
-    x = thing->x;
-    y = thing->y;
-    tmthing = thing;
-    tmflags = thing->flags;
-    oldmo = *thing;             // save the old mobj before the fake zmovement
-    P_FakeZMovement(tmthing);
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector(x, y);
-    ceilingline = NULL;
-
-//
-// the base floor / ceiling is from the subsector that contains the
-// point.  Any contacted lines the step closer together will adjust them
-//
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-    tmfloorpic = newsubsec->sector->floorpic;
-
-    validcount++;
-    numspechit = 0;
-
-    if (tmflags & MF_NOCLIP)
-        return NULL;
-
-//
-// check things first, possibly picking things up
-// the bounding box is extended by MAXRADIUS because mobj_ts are grouped
-// into mapblocks based on their origin point, and can overlap into adjacent
-// blocks by up to MAXRADIUS units
-//
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    for (bx = xl; bx <= xh; bx++)
-        for (by = yl; by <= yh; by++)
-            if (!P_BlockThingsIterator(bx, by, PIT_CheckOnmobjZ))
-            {
-                *tmthing = oldmo;
-                return onmobj;
-            }
-    *tmthing = oldmo;
-    return NULL;
-}
-
-//=============================================================================
-//
-// P_FakeZMovement
-//
-//              Fake the zmovement so that we can check if a move is legal
-//=============================================================================
-
-void P_FakeZMovement(mobj_t * mo)
-{
-    int dist;
-    int delta;
-//
-// adjust height
-//
-    mo->z += mo->momz;
-    if (mo->flags & MF_FLOAT && mo->target)
-    {                           // float down towards target if too close
-        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
-        {
-            dist =
-                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
-            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
-            if (delta < 0 && dist < -(delta * 3))
-                mo->z -= FLOATSPEED;
-            else if (delta > 0 && dist < (delta * 3))
-                mo->z += FLOATSPEED;
-        }
-    }
-    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
-        && leveltime & 2)
-    {
-        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
-    }
-
-//
-// clip movement
-//
-    if (mo->z <= mo->floorz)
-    {                           // Hit the floor
-        mo->z = mo->floorz;
-        if (mo->momz < 0)
-        {
-            mo->momz = 0;
-        }
-        if (mo->flags & MF_SKULLFLY)
-        {                       // The skull slammed into something
-            mo->momz = -mo->momz;
-        }
-        if (mo->info->crashstate && (mo->flags & MF_CORPSE))
-        {
-            return;
-        }
-    }
-    else if (mo->flags2 & MF2_LOGRAV)
-    {
-        if (mo->momz == 0)
-            mo->momz = -(GRAVITY >> 3) * 2;
-        else
-            mo->momz -= GRAVITY >> 3;
-    }
-    else if (!(mo->flags & MF_NOGRAVITY))
-    {
-        if (mo->momz == 0)
-            mo->momz = -GRAVITY * 2;
-        else
-            mo->momz -= GRAVITY;
-    }
-
-    if (mo->z + mo->height > mo->ceilingz)
-    {                           // hit the ceiling
-        if (mo->momz > 0)
-            mo->momz = 0;
-        mo->z = mo->ceilingz - mo->height;
-        if (mo->flags & MF_SKULLFLY)
-        {                       // the skull slammed into something
-            mo->momz = -mo->momz;
-        }
-    }
-}
-
-//===========================================================================
-//
-// CheckForPushSpecial
-//
-//===========================================================================
-
-static void CheckForPushSpecial(line_t * line, int side, mobj_t * mobj)
-{
-    if (line->special)
-    {
-        if (mobj->flags2 & MF2_PUSHWALL)
-        {
-            P_ActivateLine(line, mobj, side, SPAC_PUSH);
-        }
-        else if (mobj->flags2 & MF2_IMPACT)
-        {
-            P_ActivateLine(line, mobj, side, SPAC_IMPACT);
-        }
-    }
-}
-
-/*
-===================
-=
-= P_TryMove
-=
-= Attempt to move to a new position, crossing special lines unless MF_TELEPORT
-= is set
-=
-===================
-*/
-
-boolean P_TryMove(mobj_t * thing, fixed_t x, fixed_t y)
-{
-    fixed_t oldx, oldy;
-    int side, oldside;
-    line_t *ld;
-
-    floatok = false;
-    if (!P_CheckPosition(thing, x, y))
-    {                           // Solid wall or thing
-        if (!BlockingMobj || BlockingMobj->player || !thing->player)
-        {
-            goto pushline;
-        }
-        else if (BlockingMobj->z + BlockingMobj->height - thing->z
-                 > 24 * FRACUNIT
-                 || (BlockingMobj->subsector->sector->ceilingheight
-                     - (BlockingMobj->z + BlockingMobj->height) <
-                     thing->height)
-                 || (tmceilingz - (BlockingMobj->z + BlockingMobj->height) <
-                     thing->height))
-        {
-            goto pushline;
-        }
-    }
-    if (!(thing->flags & MF_NOCLIP))
-    {
-        if (tmceilingz - tmfloorz < thing->height)
-        {                       // Doesn't fit
-            goto pushline;
-        }
-        floatok = true;
-        if (!(thing->flags & MF_TELEPORT)
-            && tmceilingz - thing->z < thing->height
-            && thing->type != MT_LIGHTNING_CEILING
-            && !(thing->flags2 & MF2_FLY))
-        {                       // mobj must lower itself to fit
-            goto pushline;
-        }
-        if (thing->flags2 & MF2_FLY)
-        {
-            if (thing->z + thing->height > tmceilingz)
-            {
-                thing->momz = -8 * FRACUNIT;
-                goto pushline;
-            }
-            else if (thing->z < tmfloorz
-                     && tmfloorz - tmdropoffz > 24 * FRACUNIT)
-            {
-                thing->momz = 8 * FRACUNIT;
-                goto pushline;
-            }
-        }
-        if (!(thing->flags & MF_TELEPORT)
-            // The Minotaur floor fire (MT_MNTRFX2) can step up any amount
-            && thing->type != MT_MNTRFX2 && thing->type != MT_LIGHTNING_FLOOR
-            && tmfloorz - thing->z > 24 * FRACUNIT)
-        {
-            goto pushline;
-        }
-        if (!(thing->flags & (MF_DROPOFF | MF_FLOAT)) &&
-            (tmfloorz - tmdropoffz > 24 * FRACUNIT) &&
-            !(thing->flags2 & MF2_BLASTED))
-        {                       // Can't move over a dropoff unless it's been blasted
-            return (false);
-        }
-        if (thing->flags2 & MF2_CANTLEAVEFLOORPIC
-            && (tmfloorpic != thing->subsector->sector->floorpic
-                || tmfloorz - thing->z != 0))
-        {                       // must stay within a sector of a certain floor type
-            return false;
-        }
-    }
-
-//
-// the move is ok, so link the thing into its new position
-//
-    P_UnsetThingPosition(thing);
-
-    oldx = thing->x;
-    oldy = thing->y;
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->floorpic = tmfloorpic;
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition(thing);
-
-    if (thing->flags2 & MF2_FLOORCLIP)
-    {
-        if (thing->z == thing->subsector->sector->floorheight
-            && P_GetThingFloorType(thing) >= FLOOR_LIQUID)
-        {
-            thing->floorclip = 10 * FRACUNIT;
-        }
-        else
-        {
-            thing->floorclip = 0;
-        }
-    }
-
-//
-// if any special lines were hit, do the effect
-//
-    if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
-    {
-        while (numspechit > 0)
-        {
-            numspechit--;
-            // see if the line was crossed
-            ld = spechit[numspechit];
-            side = P_PointOnLineSide(thing->x, thing->y, ld);
-            oldside = P_PointOnLineSide(oldx, oldy, ld);
-            if (side != oldside)
-            {
-                if (ld->special)
-                {
-                    if (thing->player)
-                    {
-                        P_ActivateLine(ld, thing, oldside, SPAC_CROSS);
-                    }
-                    else if (thing->flags2 & MF2_MCROSS)
-                    {
-                        P_ActivateLine(ld, thing, oldside, SPAC_MCROSS);
-                    }
-                    else if (thing->flags2 & MF2_PCROSS)
-                    {
-                        P_ActivateLine(ld, thing, oldside, SPAC_PCROSS);
-                    }
-                }
-            }
-        }
-    }
-    return true;
-
-  pushline:
-    if (!(thing->flags & (MF_TELEPORT | MF_NOCLIP)))
-    {
-        int numSpecHitTemp;
-
-        if (tmthing->flags2 & MF2_BLASTED)
-        {
-            P_DamageMobj(tmthing, NULL, NULL, tmthing->info->mass >> 5);
-        }
-        numSpecHitTemp = numspechit;
-        while (numSpecHitTemp > 0)
-        {
-            numSpecHitTemp--;
-            // see if the line was crossed
-            ld = spechit[numSpecHitTemp];
-            side = P_PointOnLineSide(thing->x, thing->y, ld);
-            CheckForPushSpecial(ld, side, thing);
-        }
-    }
-    return false;
-}
-
-/*
-==================
-=
-= P_ThingHeightClip
-=
-= Takes a valid thing and adjusts the thing->floorz, thing->ceilingz,
-= anf possibly thing->z
-=
-= This is called for all nearby monsters whenever a sector changes height
-=
-= If the thing doesn't fit, the z will be set to the lowest value and
-= false will be returned
-==================
-*/
-
-boolean P_ThingHeightClip(mobj_t * thing)
-{
-    boolean onfloor;
-
-    onfloor = (thing->z == thing->floorz);
-
-    P_CheckPosition(thing, thing->x, thing->y);
-    // what about stranding a monster partially off an edge?
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->floorpic = tmfloorpic;
-
-    if (onfloor)
-    {                           // walking monsters rise and fall with the floor
-        if ((thing->z - thing->floorz < 9 * FRACUNIT)
-            || (thing->flags & MF_NOGRAVITY))
-        {
-            thing->z = thing->floorz;
-        }
-    }
-    else
-    {                           // don't adjust a floating monster unless forced to
-        if (thing->z + thing->height > thing->ceilingz)
-            thing->z = thing->ceilingz - thing->height;
-    }
-
-    if (thing->ceilingz - thing->floorz < thing->height)
-        return false;
-
-    return true;
-}
-
-
-/*
-==============================================================================
-
-							SLIDE MOVE
-
-Allows the player to slide along any angled walls
-
-==============================================================================
-*/
-
-fixed_t bestslidefrac, secondslidefrac;
-line_t *bestslideline, *secondslideline;
-mobj_t *slidemo;
-
-fixed_t tmxmove, tmymove;
-
-/*
-==================
-=
-= P_HitSlideLine
-=
-= Adjusts the xmove / ymove so that the next move will slide along the wall
-==================
-*/
-
-void P_HitSlideLine(line_t * ld)
-{
-    int side;
-    angle_t lineangle, moveangle, deltaangle;
-    fixed_t movelen, newlen;
-
-
-    if (ld->slopetype == ST_HORIZONTAL)
-    {
-        tmymove = 0;
-        return;
-    }
-    if (ld->slopetype == ST_VERTICAL)
-    {
-        tmxmove = 0;
-        return;
-    }
-
-    side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
-
-    lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
-    if (side == 1)
-        lineangle += ANG180;
-    moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
-    deltaangle = moveangle - lineangle;
-    if (deltaangle > ANG180)
-        deltaangle += ANG180;
-//              I_Error ("SlideLine: ang>ANG180");
-
-    lineangle >>= ANGLETOFINESHIFT;
-    deltaangle >>= ANGLETOFINESHIFT;
-
-    movelen = P_AproxDistance(tmxmove, tmymove);
-    newlen = FixedMul(movelen, finecosine[deltaangle]);
-    tmxmove = FixedMul(newlen, finecosine[lineangle]);
-    tmymove = FixedMul(newlen, finesine[lineangle]);
-}
-
-/*
-==============
-=
-= PTR_SlideTraverse
-=
-==============
-*/
-
-boolean PTR_SlideTraverse(intercept_t * in)
-{
-    line_t *li;
-
-    if (!in->isaline)
-        I_Error("PTR_SlideTraverse: not a line?");
-
-    li = in->d.line;
-    if (!(li->flags & ML_TWOSIDED))
-    {
-        if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
-            return true;        // don't hit the back side
-        goto isblocking;
-    }
-
-    P_LineOpening(li);          // set openrange, opentop, openbottom
-    if (openrange < slidemo->height)
-        goto isblocking;        // doesn't fit
-
-    if (opentop - slidemo->z < slidemo->height)
-        goto isblocking;        // mobj is too high
-
-    if (openbottom - slidemo->z > 24 * FRACUNIT)
-        goto isblocking;        // too big a step up
-
-    return true;                // this line doesn't block movement
-
-// the line does block movement, see if it is closer than best so far
-  isblocking:
-    if (in->frac < bestslidefrac)
-    {
-        secondslidefrac = bestslidefrac;
-        secondslideline = bestslideline;
-        bestslidefrac = in->frac;
-        bestslideline = li;
-    }
-
-    return false;               // stop
-}
-
-
-/*
-==================
-=
-= P_SlideMove
-=
-= The momx / momy move is bad, so try to slide along a wall
-=
-= Find the first line hit, move flush to it, and slide along it
-=
-= This is a kludgy mess.
-==================
-*/
-
-void P_SlideMove(mobj_t * mo)
-{
-    fixed_t leadx, leady;
-    fixed_t trailx, traily;
-    fixed_t newx, newy;
-    int hitcount;
-
-    slidemo = mo;
-    hitcount = 0;
-  retry:
-    if (++hitcount == 3)
-        goto stairstep;         // don't loop forever
-
-//
-// trace along the three leading corners
-//
-    if (mo->momx > 0)
-    {
-        leadx = mo->x + mo->radius;
-        trailx = mo->x - mo->radius;
-    }
-    else
-    {
-        leadx = mo->x - mo->radius;
-        trailx = mo->x + mo->radius;
-    }
-
-    if (mo->momy > 0)
-    {
-        leady = mo->y + mo->radius;
-        traily = mo->y - mo->radius;
-    }
-    else
-    {
-        leady = mo->y - mo->radius;
-        traily = mo->y + mo->radius;
-    }
-
-    bestslidefrac = FRACUNIT + 1;
-
-    P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
-                   PT_ADDLINES, PTR_SlideTraverse);
-    P_PathTraverse(trailx, leady, trailx + mo->momx, leady + mo->momy,
-                   PT_ADDLINES, PTR_SlideTraverse);
-    P_PathTraverse(leadx, traily, leadx + mo->momx, traily + mo->momy,
-                   PT_ADDLINES, PTR_SlideTraverse);
-
-//
-// move up to the wall
-//
-    if (bestslidefrac == FRACUNIT + 1)
-    {                           // the move must have hit the middle, so stairstep
-      stairstep:
-        if (!P_TryMove(mo, mo->x, mo->y + mo->momy))
-        {
-            P_TryMove(mo, mo->x + mo->momx, mo->y);
-        }
-        return;
-    }
-
-    bestslidefrac -= 0x800;     // fudge a bit to make sure it doesn't hit
-    if (bestslidefrac > 0)
-    {
-        newx = FixedMul(mo->momx, bestslidefrac);
-        newy = FixedMul(mo->momy, bestslidefrac);
-        if (!P_TryMove(mo, mo->x + newx, mo->y + newy))
-            goto stairstep;
-    }
-
-//
-// now continue along the wall
-//
-    bestslidefrac = FRACUNIT - (bestslidefrac + 0x800); // remainder
-    if (bestslidefrac > FRACUNIT)
-        bestslidefrac = FRACUNIT;
-    if (bestslidefrac <= 0)
-        return;
-
-    tmxmove = FixedMul(mo->momx, bestslidefrac);
-    tmymove = FixedMul(mo->momy, bestslidefrac);
-
-    P_HitSlideLine(bestslideline);      // clip the moves
-
-    mo->momx = tmxmove;
-    mo->momy = tmymove;
-
-    if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove))
-    {
-        goto retry;
-    }
-}
-
-//============================================================================
-//
-// P_InitSlideLine
-//
-//============================================================================
-
-void P_InitSlideLine(void)
-{
-    // use relevant parts from first bestslideline in demo1 (hexen.wad)
-    static vertex_t initvertex1 = {-77594624, 37748736};
-    static line_t initslideline = {&initvertex1, NULL, 0, 6291456, 0, 0, 0, 0,
-                    0, 0, 0, { 0, 0 }, { 0, 0, 0, 0 }, 0, NULL, NULL, 0, NULL};
-    
-    if (bestslideline == NULL)
-    {
-        bestslideline = &initslideline;
-    }
-}
-
-//============================================================================
-//
-// PTR_BounceTraverse
-//
-//============================================================================
-
-boolean PTR_BounceTraverse(intercept_t * in)
-{
-    line_t *li;
-
-    if (!in->isaline)
-        I_Error("PTR_BounceTraverse: not a line?");
-
-    li = in->d.line;
-    if (!(li->flags & ML_TWOSIDED))
-    {
-        if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
-            return true;        // don't hit the back side
-        goto bounceblocking;
-    }
-
-    P_LineOpening(li);          // set openrange, opentop, openbottom
-    if (openrange < slidemo->height)
-        goto bounceblocking;    // doesn't fit
-
-    if (opentop - slidemo->z < slidemo->height)
-        goto bounceblocking;    // mobj is too high
-    return true;                // this line doesn't block movement
-
-// the line does block movement, see if it is closer than best so far
-  bounceblocking:
-    if (in->frac < bestslidefrac)
-    {
-        secondslidefrac = bestslidefrac;
-        secondslideline = bestslideline;
-        bestslidefrac = in->frac;
-        bestslideline = li;
-    }
-    return false;               // stop
-}
-
-//============================================================================
-//
-// P_BounceWall
-//
-//============================================================================
-
-void P_BounceWall(mobj_t * mo)
-{
-    fixed_t leadx, leady;
-    int side;
-    angle_t lineangle, moveangle, deltaangle;
-    fixed_t movelen;
-
-    slidemo = mo;
-
-//
-// trace along the three leading corners
-//
-    if (mo->momx > 0)
-    {
-        leadx = mo->x + mo->radius;
-    }
-    else
-    {
-        leadx = mo->x - mo->radius;
-    }
-    if (mo->momy > 0)
-    {
-        leady = mo->y + mo->radius;
-    }
-    else
-    {
-        leady = mo->y - mo->radius;
-    }
-    bestslidefrac = FRACUNIT + 1;
-    P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
-                   PT_ADDLINES, PTR_BounceTraverse);
-
-    // P_BounceWall call on a tall sector after fresh game start
-    // without the player sliding along any walls before.
-    // For more details check:
-    // https://github.com/chocolate-doom/chocolate-doom/issues/1732
-    // https://github.com/chocolate-doom/chocolate-doom/issues/1160
-    if (bestslideline == NULL)
-    {
-        I_Error("P_BounceWall: No bestslideline was set. Try bumping walls.");
-    }
-    
-    side = P_PointOnLineSide(mo->x, mo->y, bestslideline);
-    lineangle = R_PointToAngle2(0, 0, bestslideline->dx, bestslideline->dy);
-    if (side == 1)
-        lineangle += ANG180;
-    moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
-    deltaangle = (2 * lineangle) - moveangle;
-//      if (deltaangle > ANG180)
-//              deltaangle += ANG180;
-//              I_Error ("SlideLine: ang>ANG180");
-
-    lineangle >>= ANGLETOFINESHIFT;
-    deltaangle >>= ANGLETOFINESHIFT;
-
-    movelen = P_AproxDistance(mo->momx, mo->momy);
-    movelen = FixedMul(movelen, 0.75 * FRACUNIT);       // friction
-    if (movelen < FRACUNIT)
-        movelen = 2 * FRACUNIT;
-    mo->momx = FixedMul(movelen, finecosine[deltaangle]);
-    mo->momy = FixedMul(movelen, finesine[deltaangle]);
-}
-
-
-/*
-==============================================================================
-
-							P_LineAttack
-
-==============================================================================
-*/
-
-
-mobj_t *PuffSpawned;
-mobj_t *linetarget;             // who got hit (or NULL)
-mobj_t *shootthing;
-fixed_t shootz;                 // height if not aiming up or down
-                                                                        // ???: use slope for monsters?
-int la_damage;
-fixed_t attackrange;
-
-fixed_t aimslope;
-
-
-/*
-===============================================================================
-=
-= PTR_AimTraverse
-=
-= Sets linetaget and aimslope when a target is aimed at
-===============================================================================
-*/
-
-boolean PTR_AimTraverse(intercept_t * in)
-{
-    line_t *li;
-    mobj_t *th;
-    fixed_t slope, thingtopslope, thingbottomslope;
-    fixed_t dist;
-
-    if (in->isaline)
-    {
-        li = in->d.line;
-        if (!(li->flags & ML_TWOSIDED))
-            return false;       // stop
-//
-// crosses a two sided line
-// a two sided line will restrict the possible target ranges
-        P_LineOpening(li);
-
-        if (openbottom >= opentop)
-            return false;       // stop
-
-        dist = FixedMul(attackrange, in->frac);
-
-        if (li->frontsector->floorheight != li->backsector->floorheight)
-        {
-            slope = FixedDiv(openbottom - shootz, dist);
-            if (slope > bottomslope)
-                bottomslope = slope;
-        }
-
-        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-        {
-            slope = FixedDiv(opentop - shootz, dist);
-            if (slope < topslope)
-                topslope = slope;
-        }
-
-        if (topslope <= bottomslope)
-            return false;       // stop
-
-        return true;            // shot continues
-    }
-
-//
-// shoot a thing
-//
-    th = in->d.thing;
-    if (th == shootthing)
-        return true;            // can't shoot self
-    if (!(th->flags & MF_SHOOTABLE))
-    {                           // corpse or something
-        return true;
-    }
-    if (th->player && netgame && !deathmatch)
-    {                           // don't aim at fellow co-op players
-        return true;
-    }
-
-// check angles to see if the thing can be aimed at
-
-    dist = FixedMul(attackrange, in->frac);
-    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
-    if (thingtopslope < bottomslope)
-        return true;            // shot over the thing
-    thingbottomslope = FixedDiv(th->z - shootz, dist);
-    if (thingbottomslope > topslope)
-        return true;            // shot under the thing
-
-//
-// this thing can be hit!
-//
-    if (thingtopslope > topslope)
-        thingtopslope = topslope;
-    if (thingbottomslope < bottomslope)
-        thingbottomslope = bottomslope;
-
-    aimslope = (thingtopslope + thingbottomslope) / 2;
-    linetarget = th;
-
-    return false;               // don't go any farther
-}
-
-
-/*
-==============================================================================
-=
-= PTR_ShootTraverse
-=
-==============================================================================
-*/
-
-boolean PTR_ShootTraverse(intercept_t * in)
-{
-    fixed_t x, y, z;
-    fixed_t frac;
-    line_t *li;
-    mobj_t *th;
-    fixed_t slope;
-    fixed_t dist;
-    fixed_t thingtopslope, thingbottomslope;
-
-    if (in->isaline)
-    {
-        li = in->d.line;
-        if (li->special)
-        {
-            P_ActivateLine(li, shootthing, 0, SPAC_IMPACT);
-//                      P_ShootSpecialLine (shootthing, li);
-        }
-        if (!(li->flags & ML_TWOSIDED))
-            goto hitline;
-
-//
-// crosses a two sided line
-//
-        P_LineOpening(li);
-
-        dist = FixedMul(attackrange, in->frac);
-
-        if (li->frontsector->floorheight != li->backsector->floorheight)
-        {
-            slope = FixedDiv(openbottom - shootz, dist);
-            if (slope > aimslope)
-                goto hitline;
-        }
-
-        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-        {
-            slope = FixedDiv(opentop - shootz, dist);
-            if (slope < aimslope)
-                goto hitline;
-        }
-
-        return true;            // shot continues
-//
-// hit line
-//
-      hitline:
-        // position a bit closer
-        frac = in->frac - FixedDiv(4 * FRACUNIT, attackrange);
-        x = trace.x + FixedMul(trace.dx, frac);
-        y = trace.y + FixedMul(trace.dy, frac);
-        z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
-
-        if (li->frontsector->ceilingpic == skyflatnum)
-        {
-            if (z > li->frontsector->ceilingheight)
-                return false;   // don't shoot the sky!
-            if (li->backsector && li->backsector->ceilingpic == skyflatnum)
-                return false;   // it's a sky hack wall
-        }
-
-        P_SpawnPuff(x, y, z);
-        return false;           // don't go any farther
-    }
-
-//
-// shoot a thing
-//
-    th = in->d.thing;
-    if (th == shootthing)
-        return true;            // can't shoot self
-    if (!(th->flags & MF_SHOOTABLE))
-        return true;            // corpse or something
-
-//
-// check for physical attacks on a ghost
-//
-/*  FIX:  Impliment Heretic 2 weapons here
-	if(th->flags&MF_SHADOW && shootthing->player->readyweapon == wp_staff)
-	{
-		return(true);
-	}
-*/
-
-// check angles to see if the thing can be aimed at
-    dist = FixedMul(attackrange, in->frac);
-    thingtopslope = FixedDiv(th->z + th->height - shootz, dist);
-    if (thingtopslope < aimslope)
-        return true;            // shot over the thing
-    thingbottomslope = FixedDiv(th->z - shootz, dist);
-    if (thingbottomslope > aimslope)
-        return true;            // shot under the thing
-
-//
-// hit thing
-//
-    // position a bit closer
-    frac = in->frac - FixedDiv(10 * FRACUNIT, attackrange);
-    x = trace.x + FixedMul(trace.dx, frac);
-    y = trace.y + FixedMul(trace.dy, frac);
-    z = shootz + FixedMul(aimslope, FixedMul(frac, attackrange));
-    P_SpawnPuff(x, y, z);
-    if (la_damage)
-    {
-        if (!(in->d.thing->flags & MF_NOBLOOD) &&
-            !(in->d.thing->flags2 & MF2_INVULNERABLE))
-        {
-            if (PuffType == MT_AXEPUFF || PuffType == MT_AXEPUFF_GLOW)
-            {
-                P_BloodSplatter2(x, y, z, in->d.thing);
-            }
-            if (P_Random() < 192)
-            {
-                P_BloodSplatter(x, y, z, in->d.thing);
-            }
-        }
-        if (PuffType == MT_FLAMEPUFF2)
-        {                       // Cleric FlameStrike does fire damage
-            P_DamageMobj(th, &LavaInflictor, shootthing, la_damage);
-        }
-        else
-        {
-            P_DamageMobj(th, shootthing, shootthing, la_damage);
-        }
-    }
-    return (false);             // don't go any farther
-}
-
-/*
-=================
-=
-= P_AimLineAttack
-=
-=================
-*/
-
-fixed_t P_AimLineAttack(mobj_t * t1, angle_t angle, fixed_t distance)
-{
-    fixed_t x2, y2;
-
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
-    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
-    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
-    topslope = 100 * FRACUNIT / 160;    // can't shoot outside view angles
-    bottomslope = -100 * FRACUNIT / 160;
-    attackrange = distance;
-    linetarget = NULL;
-
-    P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
-                   PTR_AimTraverse);
-
-    if (linetarget)
-        return aimslope;
-    return 0;
-}
-
-
-
-/*
-=================
-=
-= P_LineAttack
-=
-= if damage == 0, it is just a test trace that will leave linetarget set
-=
-=================
-*/
-
-void P_LineAttack(mobj_t * t1, angle_t angle, fixed_t distance, fixed_t slope,
-                  int damage)
-{
-    fixed_t x2, y2;
-
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    la_damage = damage;
-    x2 = t1->x + (distance >> FRACBITS) * finecosine[angle];
-    y2 = t1->y + (distance >> FRACBITS) * finesine[angle];
-    shootz = t1->z + (t1->height >> 1) + 8 * FRACUNIT;
-    shootz -= t1->floorclip;
-    attackrange = distance;
-    aimslope = slope;
-
-    if (P_PathTraverse(t1->x, t1->y, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
-                       PTR_ShootTraverse))
-    {
-        switch (PuffType)
-        {
-            case MT_PUNCHPUFF:
-                S_StartSound(t1, SFX_FIGHTER_PUNCH_MISS);
-                break;
-            case MT_HAMMERPUFF:
-            case MT_AXEPUFF:
-            case MT_AXEPUFF_GLOW:
-                S_StartSound(t1, SFX_FIGHTER_HAMMER_MISS);
-                break;
-            case MT_FLAMEPUFF:
-                P_SpawnPuff(x2, y2, shootz + FixedMul(slope, distance));
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-/*
-==============================================================================
-
-							USE LINES
-
-==============================================================================
-*/
-
-mobj_t *usething;
-
-boolean PTR_UseTraverse(intercept_t * in)
-{
-    int sound;
-    fixed_t pheight;
-
-    if (!in->d.line->special)
-    {
-        P_LineOpening(in->d.line);
-        if (openrange <= 0)
-        {
-            if (usething->player)
-            {
-                switch (usething->player->class)
-                {
-                    case PCLASS_FIGHTER:
-                        sound = SFX_PLAYER_FIGHTER_FAILED_USE;
-                        break;
-                    case PCLASS_CLERIC:
-                        sound = SFX_PLAYER_CLERIC_FAILED_USE;
-                        break;
-                    case PCLASS_MAGE:
-                        sound = SFX_PLAYER_MAGE_FAILED_USE;
-                        break;
-                    case PCLASS_PIG:
-                        sound = SFX_PIG_ACTIVE1;
-                        break;
-                    default:
-                        sound = SFX_NONE;
-                        break;
-                }
-                S_StartSound(usething, sound);
-            }
-            return false;       // can't use through a wall
-        }
-        if (usething->player)
-        {
-            pheight = usething->z + (usething->height / 2);
-            if ((opentop < pheight) || (openbottom > pheight))
-            {
-                switch (usething->player->class)
-                {
-                    case PCLASS_FIGHTER:
-                        sound = SFX_PLAYER_FIGHTER_FAILED_USE;
-                        break;
-                    case PCLASS_CLERIC:
-                        sound = SFX_PLAYER_CLERIC_FAILED_USE;
-                        break;
-                    case PCLASS_MAGE:
-                        sound = SFX_PLAYER_MAGE_FAILED_USE;
-                        break;
-                    case PCLASS_PIG:
-                        sound = SFX_PIG_ACTIVE1;
-                        break;
-                    default:
-                        sound = SFX_NONE;
-                        break;
-                }
-                S_StartSound(usething, sound);
-            }
-        }
-        return true;            // not a special line, but keep checking
-    }
-
-    if (P_PointOnLineSide(usething->x, usething->y, in->d.line) == 1)
-        return false;           // don't use back sides
-
-//      P_UseSpecialLine (usething, in->d.line);
-    P_ActivateLine(in->d.line, usething, 0, SPAC_USE);
-
-    return false;               // can't use for than one special line in a row
-}
-
-
-/*
-================
-=
-= P_UseLines
-=
-= Looks for special lines in front of the player to activate
-================
-*/
-
-void P_UseLines(player_t * player)
-{
-    int angle;
-    fixed_t x1, y1, x2, y2;
-
-    usething = player->mo;
-
-    angle = player->mo->angle >> ANGLETOFINESHIFT;
-    x1 = player->mo->x;
-    y1 = player->mo->y;
-    x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
-    y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
-
-    P_PathTraverse(x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse);
-}
-
-//==========================================================================
-//
-// PTR_PuzzleItemTraverse
-//
-//==========================================================================
-
-#define USE_PUZZLE_ITEM_SPECIAL 129
-
-static mobj_t *PuzzleItemUser;
-static int PuzzleItemType;
-static boolean PuzzleActivated;
-
-boolean PTR_PuzzleItemTraverse(intercept_t * in)
-{
-    mobj_t *mobj;
-    byte args[3];
-    int sound;
-
-    if (in->isaline)
-    {                           // Check line
-        if (in->d.line->special != USE_PUZZLE_ITEM_SPECIAL)
-        {
-            P_LineOpening(in->d.line);
-            if (openrange <= 0)
-            {
-                sound = SFX_NONE;
-                if (PuzzleItemUser->player)
-                {
-                    switch (PuzzleItemUser->player->class)
-                    {
-                        case PCLASS_FIGHTER:
-                            sound = SFX_PUZZLE_FAIL_FIGHTER;
-                            break;
-                        case PCLASS_CLERIC:
-                            sound = SFX_PUZZLE_FAIL_CLERIC;
-                            break;
-                        case PCLASS_MAGE:
-                            sound = SFX_PUZZLE_FAIL_MAGE;
-                            break;
-                        default:
-                            sound = SFX_NONE;
-                            break;
-                    }
-                }
-                S_StartSound(PuzzleItemUser, sound);
-                return false;   // can't use through a wall
-            }
-            return true;        // Continue searching
-        }
-        if (P_PointOnLineSide(PuzzleItemUser->x, PuzzleItemUser->y,
-                              in->d.line) == 1)
-        {                       // Don't use back sides
-            return false;
-        }
-        if (PuzzleItemType != in->d.line->arg1)
-        {                       // Item type doesn't match
-            return false;
-        }
-
-        // Construct an args[] array that would contain the values from
-        // the line that would be passed by Vanilla Hexen.
-        args[0] = in->d.line->arg3;
-        args[1] = in->d.line->arg4;
-        args[2] = in->d.line->arg5;
-
-        P_StartACS(in->d.line->arg2, 0, args, PuzzleItemUser, in->d.line, 0);
-        in->d.line->special = 0;
-        PuzzleActivated = true;
-        return false;           // Stop searching
-    }
-    // Check thing
-    mobj = in->d.thing;
-    if (mobj->special != USE_PUZZLE_ITEM_SPECIAL)
-    {                           // Wrong special
-        return true;
-    }
-    if (PuzzleItemType != mobj->args[0])
-    {                           // Item type doesn't match
-        return true;
-    }
-
-    P_StartACS(mobj->args[1], 0, &mobj->args[2], PuzzleItemUser, NULL, 0);
-    mobj->special = 0;
-    PuzzleActivated = true;
-    return false;               // Stop searching
-}
-
-//==========================================================================
-//
-// P_UsePuzzleItem
-//
-// Returns true if the puzzle item was used on a line or a thing.
-//
-//==========================================================================
-
-boolean P_UsePuzzleItem(player_t * player, int itemType)
-{
-    int angle;
-    fixed_t x1, y1, x2, y2;
-
-    PuzzleItemType = itemType;
-    PuzzleItemUser = player->mo;
-    PuzzleActivated = false;
-    angle = player->mo->angle >> ANGLETOFINESHIFT;
-    x1 = player->mo->x;
-    y1 = player->mo->y;
-    x2 = x1 + (USERANGE >> FRACBITS) * finecosine[angle];
-    y2 = y1 + (USERANGE >> FRACBITS) * finesine[angle];
-    P_PathTraverse(x1, y1, x2, y2, PT_ADDLINES | PT_ADDTHINGS,
-                   PTR_PuzzleItemTraverse);
-    return PuzzleActivated;
-}
-
-/*
-==============================================================================
-
-							RADIUS ATTACK
-
-==============================================================================
-*/
-
-mobj_t *bombsource;
-mobj_t *bombspot;
-int bombdamage;
-int bombdistance;
-boolean DamageSource;
-
-/*
-=================
-=
-= PIT_RadiusAttack
-=
-= Source is the creature that casued the explosion at spot
-=================
-*/
-
-boolean PIT_RadiusAttack(mobj_t * thing)
-{
-    fixed_t dx, dy, dist;
-    int damage;
-
-    if (!(thing->flags & MF_SHOOTABLE))
-    {
-        return true;
-    }
-//      if(thing->flags2&MF2_BOSS)
-//      {       // Bosses take no damage from PIT_RadiusAttack
-//              return(true);
-//      }
-    if (!DamageSource && thing == bombsource)
-    {                           // don't damage the source of the explosion
-        return true;
-    }
-    if (abs((thing->z - bombspot->z) >> FRACBITS) > 2 * bombdistance)
-    {                           // too high/low
-        return true;
-    }
-    dx = abs(thing->x - bombspot->x);
-    dy = abs(thing->y - bombspot->y);
-    dist = dx > dy ? dx : dy;
-    dist = (dist - thing->radius) >> FRACBITS;
-    if (dist < 0)
-    {
-        dist = 0;
-    }
-    if (dist >= bombdistance)
-    {                           // Out of range
-        return true;
-    }
-    if (P_CheckSight(thing, bombspot))
-    {                           // OK to damage, target is in direct path
-        damage = (bombdamage * (bombdistance - dist) / bombdistance) + 1;
-        if (thing->player)
-        {
-            damage >>= 2;
-        }
-        P_DamageMobj(thing, bombspot, bombsource, damage);
-    }
-    return (true);
-}
-
-/*
-=================
-=
-= P_RadiusAttack
-=
-= Source is the creature that caused the explosion at spot
-=================
-*/
-
-void P_RadiusAttack(mobj_t * spot, mobj_t * source, int damage, int distance,
-                    boolean damageSource)
-{
-    int x, y, xl, xh, yl, yh;
-    fixed_t dist;
-
-    dist = (distance + MAXRADIUS) << FRACBITS;
-    yh = (spot->y + dist - bmaporgy) >> MAPBLOCKSHIFT;
-    yl = (spot->y - dist - bmaporgy) >> MAPBLOCKSHIFT;
-    xh = (spot->x + dist - bmaporgx) >> MAPBLOCKSHIFT;
-    xl = (spot->x - dist - bmaporgx) >> MAPBLOCKSHIFT;
-    bombspot = spot;
-    bombsource = source;
-    bombdamage = damage;
-    bombdistance = distance;
-    DamageSource = damageSource;
-    for (y = yl; y <= yh; y++)
-    {
-        for (x = xl; x <= xh; x++)
-        {
-            P_BlockThingsIterator(x, y, PIT_RadiusAttack);
-        }
-    }
-}
-
-/*
-==============================================================================
-
-						SECTOR HEIGHT CHANGING
-
-= After modifying a sectors floor or ceiling height, call this
-= routine to adjust the positions of all things that touch the
-= sector.
-=
-= If anything doesn't fit anymore, true will be returned.
-= If crunch is true, they will take damage as they are being crushed
-= If Crunch is false, you should set the sector height back the way it
-= was and call P_ChangeSector again to undo the changes
-==============================================================================
-*/
-
-int crushchange;
-boolean nofit;
-
-/*
-===============
-=
-= PIT_ChangeSector
-=
-===============
-*/
-
-boolean PIT_ChangeSector(mobj_t * thing)
-{
-    mobj_t *mo;
-
-    if (P_ThingHeightClip(thing))
-        return true;            // keep checking
-
-    // crunch bodies to giblets
-    if ((thing->flags & MF_CORPSE) && (thing->health <= 0))
-    {
-        if (thing->flags & MF_NOBLOOD)
-        {
-            P_RemoveMobj(thing);
-        }
-        else
-        {
-            if (thing->state != &states[S_GIBS1])
-            {
-                P_SetMobjState(thing, S_GIBS1);
-                thing->height = 0;
-                thing->radius = 0;
-                S_StartSound(thing, SFX_PLAYER_FALLING_SPLAT);
-            }
-        }
-        return true;            // keep checking
-    }
-
-    // crunch dropped items
-    if (thing->flags2 & MF2_DROPPED)
-    {
-        P_RemoveMobj(thing);
-        return true;            // keep checking
-    }
-
-    if (!(thing->flags & MF_SHOOTABLE))
-        return true;            // assume it is bloody gibs or something
-
-    nofit = true;
-    if (crushchange && !(leveltime & 3))
-    {
-        P_DamageMobj(thing, NULL, NULL, crushchange);
-        // spray blood in a random direction
-        if ((!(thing->flags & MF_NOBLOOD)) &&
-            (!(thing->flags2 & MF2_INVULNERABLE)))
-        {
-            mo = P_SpawnMobj(thing->x, thing->y, thing->z + thing->height / 2,
-                             MT_BLOOD);
-            mo->momx = P_SubRandom() << 12;
-            mo->momy = P_SubRandom() << 12;
-        }
-    }
-
-    return true;                // keep checking (crush other things)
-}
-
-/*
-===============
-=
-= P_ChangeSector
-=
-===============
-*/
-
-boolean P_ChangeSector(sector_t * sector, int crunch)
-{
-    int x, y;
-
-    nofit = false;
-    crushchange = crunch;
-
-// recheck heights for all things near the moving sector
-
-    for (x = sector->blockbox[BOXLEFT]; x <= sector->blockbox[BOXRIGHT]; x++)
-        for (y = sector->blockbox[BOXBOTTOM]; y <= sector->blockbox[BOXTOP];
-             y++)
-            P_BlockThingsIterator(x, y, PIT_ChangeSector);
-
-
-    return nofit;
-}
diff --git a/games/NXDoom/src/hexen/p_maputl.c b/games/NXDoom/src/hexen/p_maputl.c
deleted file mode 100644
index 1ed0aa968..000000000
--- a/games/NXDoom/src/hexen/p_maputl.c
+++ /dev/null
@@ -1,1072 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "m_bbox.h"
-#include "m_misc.h"
-#include "p_local.h"
-
-static mobj_t *RoughBlockCheck(mobj_t * mo, int index);
-
-/*
-===================
-=
-= P_AproxDistance
-=
-= Gives an estimation of distance (not exact)
-=
-===================
-*/
-
-fixed_t P_AproxDistance(fixed_t dx, fixed_t dy)
-{
-    dx = abs(dx);
-    dy = abs(dy);
-    if (dx < dy)
-        return dx + dy - (dx >> 1);
-    return dx + dy - (dy >> 1);
-}
-
-
-/*
-==================
-=
-= P_PointOnLineSide
-=
-= Returns 0 or 1
-==================
-*/
-
-int P_PointOnLineSide(fixed_t x, fixed_t y, line_t * line)
-{
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    if (!line->dx)
-    {
-        if (x <= line->v1->x)
-            return line->dy > 0;
-        return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-        if (y <= line->v1->y)
-            return line->dx < 0;
-        return line->dx > 0;
-    }
-
-    dx = (x - line->v1->x);
-    dy = (y - line->v1->y);
-
-    left = FixedMul(line->dy >> FRACBITS, dx);
-    right = FixedMul(dy, line->dx >> FRACBITS);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-/*
-=================
-=
-= P_BoxOnLineSide
-=
-= Considers the line to be infinite
-= Returns side 0 or 1, -1 if box crosses the line
-=================
-*/
-
-int P_BoxOnLineSide(fixed_t * tmbox, line_t * ld)
-{
-    int p1 = 0, p2 = 0;
-
-    switch (ld->slopetype)
-    {
-        case ST_HORIZONTAL:
-            p1 = tmbox[BOXTOP] > ld->v1->y;
-            p2 = tmbox[BOXBOTTOM] > ld->v1->y;
-            if (ld->dx < 0)
-            {
-                p1 ^= 1;
-                p2 ^= 1;
-            }
-            break;
-        case ST_VERTICAL:
-            p1 = tmbox[BOXRIGHT] < ld->v1->x;
-            p2 = tmbox[BOXLEFT] < ld->v1->x;
-            if (ld->dy < 0)
-            {
-                p1 ^= 1;
-                p2 ^= 1;
-            }
-            break;
-        case ST_POSITIVE:
-            p1 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXTOP], ld);
-            p2 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
-            break;
-        case ST_NEGATIVE:
-            p1 = P_PointOnLineSide(tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
-            p2 = P_PointOnLineSide(tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
-            break;
-    }
-
-    if (p1 == p2)
-        return p1;
-    return -1;
-}
-
-/*
-==================
-=
-= P_PointOnDivlineSide
-=
-= Returns 0 or 1
-==================
-*/
-
-int P_PointOnDivlineSide(fixed_t x, fixed_t y, divline_t * line)
-{
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    if (!line->dx)
-    {
-        if (x <= line->x)
-            return line->dy > 0;
-        return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-        if (y <= line->y)
-            return line->dx < 0;
-        return line->dx > 0;
-    }
-
-    dx = (x - line->x);
-    dy = (y - line->y);
-
-// try to quickly decide by looking at sign bits
-    if ((line->dy ^ line->dx ^ dx ^ dy) & 0x80000000)
-    {
-        if ((line->dy ^ dx) & 0x80000000)
-            return 1;           // (left is negative)
-        return 0;
-    }
-
-    left = FixedMul(line->dy >> 8, dx >> 8);
-    right = FixedMul(dy >> 8, line->dx >> 8);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-
-/*
-==============
-=
-= P_MakeDivline
-=
-==============
-*/
-
-void P_MakeDivline(line_t * li, divline_t * dl)
-{
-    dl->x = li->v1->x;
-    dl->y = li->v1->y;
-    dl->dx = li->dx;
-    dl->dy = li->dy;
-}
-
-
-/*
-===============
-=
-= P_InterceptVector
-=
-= Returns the fractional intercept point along the first divline
-=
-= This is only called by the addthings and addlines traversers
-===============
-*/
-
-fixed_t P_InterceptVector(divline_t * v2, divline_t * v1)
-{
-#if 1
-    fixed_t frac, num, den;
-
-    den = FixedMul(v1->dy >> 8, v2->dx) - FixedMul(v1->dx >> 8, v2->dy);
-    if (den == 0)
-        return 0;
-//              I_Error ("P_InterceptVector: parallel");
-    num = FixedMul((v1->x - v2->x) >> 8, v1->dy) +
-        FixedMul((v2->y - v1->y) >> 8, v1->dx);
-    frac = FixedDiv(num, den);
-
-    return frac;
-#else
-    float frac, num, den, v1x, v1y, v1dx, v1dy, v2x, v2y, v2dx, v2dy;
-
-    v1x = (float) v1->x / FRACUNIT;
-    v1y = (float) v1->y / FRACUNIT;
-    v1dx = (float) v1->dx / FRACUNIT;
-    v1dy = (float) v1->dy / FRACUNIT;
-    v2x = (float) v2->x / FRACUNIT;
-    v2y = (float) v2->y / FRACUNIT;
-    v2dx = (float) v2->dx / FRACUNIT;
-    v2dy = (float) v2->dy / FRACUNIT;
-
-    den = v1dy * v2dx - v1dx * v2dy;
-    if (den == 0)
-        return 0;               // parallel
-    num = (v1x - v2x) * v1dy + (v2y - v1y) * v1dx;
-    frac = num / den;
-
-    return frac * FRACUNIT;
-#endif
-}
-
-/*
-==================
-=
-= P_LineOpening
-=
-= Sets opentop and openbottom to the window through a two sided line
-= OPTIMIZE: keep this precalculated
-==================
-*/
-
-fixed_t opentop, openbottom, openrange;
-fixed_t lowfloor;
-
-void P_LineOpening(line_t * linedef)
-{
-    sector_t *front, *back;
-
-    if (linedef->sidenum[1] == -1)
-    {                           // single sided line
-        openrange = 0;
-        return;
-    }
-
-    front = linedef->frontsector;
-    back = linedef->backsector;
-
-    if (front->ceilingheight < back->ceilingheight)
-        opentop = front->ceilingheight;
-    else
-        opentop = back->ceilingheight;
-    if (front->floorheight > back->floorheight)
-    {
-        openbottom = front->floorheight;
-        lowfloor = back->floorheight;
-        tmfloorpic = front->floorpic;
-    }
-    else
-    {
-        openbottom = back->floorheight;
-        lowfloor = front->floorheight;
-        tmfloorpic = back->floorpic;
-    }
-
-    openrange = opentop - openbottom;
-}
-
-/*
-===============================================================================
-
-						THING POSITION SETTING
-
-===============================================================================
-*/
-
-/*
-===================
-=
-= P_UnsetThingPosition
-=
-= Unlinks a thing from block map and sectors
-=
-===================
-*/
-
-void P_UnsetThingPosition(mobj_t * thing)
-{
-    int blockx, blocky;
-
-    if (!(thing->flags & MF_NOSECTOR))
-    {                           // inert things don't need to be in blockmap
-// unlink from subsector
-        if (thing->snext)
-            thing->snext->sprev = thing->sprev;
-        if (thing->sprev)
-            thing->sprev->snext = thing->snext;
-        else
-            thing->subsector->sector->thinglist = thing->snext;
-    }
-
-    if (!(thing->flags & MF_NOBLOCKMAP))
-    {                           // inert things don't need to be in blockmap
-// unlink from block map
-        if (thing->bnext)
-            thing->bnext->bprev = thing->bprev;
-        if (thing->bprev)
-            thing->bprev->bnext = thing->bnext;
-        else
-        {
-            blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
-            blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
-            if (blockx >= 0 && blockx < bmapwidth
-                && blocky >= 0 && blocky < bmapheight)
-                blocklinks[blocky * bmapwidth + blockx] = thing->bnext;
-        }
-    }
-}
-
-
-/*
-===================
-=
-= P_SetThingPosition
-=
-= Links a thing into both a block and a subsector based on it's x y
-= Sets thing->subsector properly
-=
-===================
-*/
-
-void P_SetThingPosition(mobj_t * thing)
-{
-    subsector_t *ss;
-    sector_t *sec;
-    int blockx, blocky;
-    mobj_t **link;
-
-//
-// link into subsector
-//
-    ss = R_PointInSubsector(thing->x, thing->y);
-    thing->subsector = ss;
-    if (!(thing->flags & MF_NOSECTOR))
-    {                           // invisible things don't go into the sector links
-        sec = ss->sector;
-
-        thing->sprev = NULL;
-        thing->snext = sec->thinglist;
-        if (sec->thinglist)
-            sec->thinglist->sprev = thing;
-        sec->thinglist = thing;
-    }
-
-//
-// link into blockmap
-//
-    if (!(thing->flags & MF_NOBLOCKMAP))
-    {                           // inert things don't need to be in blockmap
-        blockx = (thing->x - bmaporgx) >> MAPBLOCKSHIFT;
-        blocky = (thing->y - bmaporgy) >> MAPBLOCKSHIFT;
-        if (blockx >= 0 && blockx < bmapwidth && blocky >= 0
-            && blocky < bmapheight)
-        {
-            link = &blocklinks[blocky * bmapwidth + blockx];
-            thing->bprev = NULL;
-            thing->bnext = *link;
-            if (*link)
-                (*link)->bprev = thing;
-            *link = thing;
-        }
-        else
-        {                       // thing is off the map
-            thing->bnext = thing->bprev = NULL;
-        }
-    }
-}
-
-
-
-/*
-===============================================================================
-
-						BLOCK MAP ITERATORS
-
-For each line/thing in the given mapblock, call the passed function.
-If the function returns false, exit with false without checking anything else.
-
-===============================================================================
-*/
-
-/*
-==================
-=
-= P_BlockLinesIterator
-=
-= The validcount flags are used to avoid checking lines
-= that are marked in multiple mapblocks, so increment validcount before
-= the first call to P_BlockLinesIterator, then make one or more calls to it
-===================
-*/
-
-boolean P_BlockLinesIterator(int x, int y, boolean(*func) (line_t *))
-{
-    int offset;
-    short *list;
-    line_t *ld;
-
-    int i;
-    polyblock_t *polyLink;
-    seg_t **tempSeg;
-
-    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
-        return true;
-    offset = y * bmapwidth + x;
-
-    polyLink = PolyBlockMap[offset];
-    while (polyLink)
-    {
-        if (polyLink->polyobj)
-        {
-            if (polyLink->polyobj->validcount != validcount)
-            {
-                polyLink->polyobj->validcount = validcount;
-                tempSeg = polyLink->polyobj->segs;
-                for (i = 0; i < polyLink->polyobj->numsegs; i++, tempSeg++)
-                {
-                    if ((*tempSeg)->linedef->validcount == validcount)
-                    {
-                        continue;
-                    }
-                    (*tempSeg)->linedef->validcount = validcount;
-                    if (!func((*tempSeg)->linedef))
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        polyLink = polyLink->next;
-    }
-
-    offset = *(blockmap + offset);
-
-    for (list = blockmaplump + offset; *list != -1; list++)
-    {
-        ld = &lines[*list];
-        if (ld->validcount == validcount)
-            continue;           // line has already been checked
-        ld->validcount = validcount;
-
-        if (!func(ld))
-            return false;
-    }
-
-    return true;                // everything was checked
-}
-
-
-/*
-==================
-=
-= P_BlockThingsIterator
-=
-==================
-*/
-
-boolean P_BlockThingsIterator(int x, int y, boolean(*func) (mobj_t *))
-{
-    mobj_t *mobj;
-
-    if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
-        return true;
-
-    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
-
-    for (mobj = blocklinks[y * bmapwidth + x]; mobj; mobj = mobj->bnext)
-        if (!func(mobj))
-            return false;
-
-    return true;
-}
-
-/*
-===============================================================================
-
-					INTERCEPT ROUTINES
-
-===============================================================================
-*/
-
-intercept_t intercepts[MAXINTERCEPTS], *intercept_p;
-
-divline_t trace;
-boolean earlyout;
-int ptflags;
-
-/*
-==================
-=
-= PIT_AddLineIntercepts
-=
-= Looks for lines in the given block that intercept the given trace
-= to add to the intercepts list
-= A line is crossed if its endpoints are on opposite sides of the trace
-= Returns true if earlyout and a solid line hit
-==================
-*/
-
-boolean PIT_AddLineIntercepts(line_t * ld)
-{
-    int s1, s2;
-    fixed_t frac;
-    divline_t dl;
-
-// avoid precision problems with two routines
-    if (trace.dx > FRACUNIT * 16 || trace.dy > FRACUNIT * 16
-        || trace.dx < -FRACUNIT * 16 || trace.dy < -FRACUNIT * 16)
-    {
-        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
-        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
-    }
-    else
-    {
-        s1 = P_PointOnLineSide(trace.x, trace.y, ld);
-        s2 = P_PointOnLineSide(trace.x + trace.dx, trace.y + trace.dy, ld);
-    }
-    if (s1 == s2)
-        return true;            // line isn't crossed
-
-//
-// hit the line
-//
-    P_MakeDivline(ld, &dl);
-    frac = P_InterceptVector(&trace, &dl);
-    if (frac < 0)
-        return true;            // behind source
-
-// try to early out the check
-    if (earlyout && frac < FRACUNIT && !ld->backsector)
-        return false;           // stop checking
-
-    intercept_p->frac = frac;
-    intercept_p->isaline = true;
-    intercept_p->d.line = ld;
-    intercept_p++;
-
-    return true;                // continue
-}
-
-
-
-/*
-==================
-=
-= PIT_AddThingIntercepts
-=
-==================
-*/
-
-boolean PIT_AddThingIntercepts(mobj_t * thing)
-{
-    fixed_t x1, y1, x2, y2;
-    int s1, s2;
-    boolean tracepositive;
-    divline_t dl;
-    fixed_t frac;
-
-    tracepositive = (trace.dx ^ trace.dy) > 0;
-
-    // check a corner to corner crossection for hit
-
-    if (tracepositive)
-    {
-        x1 = thing->x - thing->radius;
-        y1 = thing->y + thing->radius;
-
-        x2 = thing->x + thing->radius;
-        y2 = thing->y - thing->radius;
-    }
-    else
-    {
-        x1 = thing->x - thing->radius;
-        y1 = thing->y - thing->radius;
-
-        x2 = thing->x + thing->radius;
-        y2 = thing->y + thing->radius;
-    }
-    s1 = P_PointOnDivlineSide(x1, y1, &trace);
-    s2 = P_PointOnDivlineSide(x2, y2, &trace);
-    if (s1 == s2)
-        return true;            // line isn't crossed
-
-    dl.x = x1;
-    dl.y = y1;
-    dl.dx = x2 - x1;
-    dl.dy = y2 - y1;
-    frac = P_InterceptVector(&trace, &dl);
-    if (frac < 0)
-        return true;            // behind source
-    intercept_p->frac = frac;
-    intercept_p->isaline = false;
-    intercept_p->d.thing = thing;
-    intercept_p++;
-
-    return true;                // keep going
-}
-
-
-/*
-====================
-=
-= P_TraverseIntercepts
-=
-= Returns true if the traverser function returns true for all lines
-====================
-*/
-
-boolean P_TraverseIntercepts(traverser_t func, fixed_t maxfrac)
-{
-    int count;
-    fixed_t dist;
-    intercept_t *scan, *in;
-
-    count = intercept_p - intercepts;
-    in = 0;                     // shut up compiler warning
-
-    while (count--)
-    {
-        dist = INT_MAX;
-        for (scan = intercepts; scan < intercept_p; scan++)
-            if (scan->frac < dist)
-            {
-                dist = scan->frac;
-                in = scan;
-            }
-
-        if (dist > maxfrac)
-            return true;        // checked everything in range
-#if 0
-        {                       // don't check these yet, ther may be others inserted
-            in = scan = intercepts;
-            for (scan = intercepts; scan < intercept_p; scan++)
-                if (scan->frac > maxfrac)
-                    *in++ = *scan;
-            intercept_p = in;
-            return false;
-        }
-#endif
-
-        if (!func(in))
-            return false;       // don't bother going farther
-        in->frac = INT_MAX;
-    }
-
-    return true;                // everything was traversed
-}
-
-
-
-/*
-==================
-=
-= P_PathTraverse
-=
-= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
-= Returns true if the traverser function returns true for all lines
-==================
-*/
-
-boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
-                       int flags, boolean(*trav) (intercept_t *))
-{
-    fixed_t xt1, yt1, xt2, yt2;
-    fixed_t xstep, ystep;
-    fixed_t partial;
-    fixed_t xintercept, yintercept;
-    int mapx, mapy, mapxstep, mapystep;
-    int count;
-
-    earlyout = (flags & PT_EARLYOUT) != 0;
-
-    validcount++;
-    intercept_p = intercepts;
-
-    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
-        x1 += FRACUNIT;         // don't side exactly on a line
-    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
-        y1 += FRACUNIT;         // don't side exactly on a line
-    trace.x = x1;
-    trace.y = y1;
-    trace.dx = x2 - x1;
-    trace.dy = y2 - y1;
-
-    x1 -= bmaporgx;
-    y1 -= bmaporgy;
-    xt1 = x1 >> MAPBLOCKSHIFT;
-    yt1 = y1 >> MAPBLOCKSHIFT;
-
-    x2 -= bmaporgx;
-    y2 -= bmaporgy;
-    xt2 = x2 >> MAPBLOCKSHIFT;
-    yt2 = y2 >> MAPBLOCKSHIFT;
-
-    if (xt2 > xt1)
-    {
-        mapxstep = 1;
-        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else if (xt2 < xt1)
-    {
-        mapxstep = -1;
-        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else
-    {
-        mapxstep = 0;
-        partial = FRACUNIT;
-        ystep = 256 * FRACUNIT;
-    }
-    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
-
-
-    if (yt2 > yt1)
-    {
-        mapystep = 1;
-        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else if (yt2 < yt1)
-    {
-        mapystep = -1;
-        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else
-    {
-        mapystep = 0;
-        partial = FRACUNIT;
-        xstep = 256 * FRACUNIT;
-    }
-    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
-
-
-//
-// step through map blocks
-// Count is present to prevent a round off error from skipping the break
-    mapx = xt1;
-    mapy = yt1;
-
-    for (count = 0; count < 64; count++)
-    {
-        if (flags & PT_ADDLINES)
-        {
-            if (!P_BlockLinesIterator(mapx, mapy, PIT_AddLineIntercepts))
-                return false;   // early out
-        }
-        if (flags & PT_ADDTHINGS)
-        {
-            if (!P_BlockThingsIterator(mapx, mapy, PIT_AddThingIntercepts))
-                return false;   // early out
-        }
-
-        if (mapx == xt2 && mapy == yt2)
-            break;
-
-        if ((yintercept >> FRACBITS) == mapy)
-        {
-            yintercept += ystep;
-            mapx += mapxstep;
-        }
-        else if ((xintercept >> FRACBITS) == mapx)
-        {
-            xintercept += xstep;
-            mapy += mapystep;
-        }
-
-    }
-
-
-//
-// go through the sorted list
-//
-    return P_TraverseIntercepts(trav, FRACUNIT);
-}
-
-//===========================================================================
-//
-// P_RoughMonsterSearch
-//
-// Searches though the surrounding mapblocks for monsters/players
-//              distance is in MAPBLOCKUNITS
-//===========================================================================
-
-mobj_t *P_RoughMonsterSearch(mobj_t * mo, int distance)
-{
-    int blockX;
-    int blockY;
-    int startX, startY;
-    int blockIndex;
-    int firstStop;
-    int secondStop;
-    int thirdStop;
-    int finalStop;
-    int count;
-    mobj_t *target;
-
-    startX = (mo->x - bmaporgx) >> MAPBLOCKSHIFT;
-    startY = (mo->y - bmaporgy) >> MAPBLOCKSHIFT;
-
-    if (startX >= 0 && startX < bmapwidth && startY >= 0
-        && startY < bmapheight)
-    {
-        target = RoughBlockCheck(mo, startY * bmapwidth + startX);
-        if (target != NULL)
-        {                       // found a target right away
-            return target;
-        }
-    }
-    for (count = 1; count <= distance; count++)
-    {
-        blockX = startX - count;
-        blockY = startY - count;
-
-        if (blockY < 0)
-        {
-            blockY = 0;
-        }
-        else if (blockY >= bmapheight)
-        {
-            blockY = bmapheight - 1;
-        }
-        if (blockX < 0)
-        {
-            blockX = 0;
-        }
-        else if (blockX >= bmapwidth)
-        {
-            blockX = bmapwidth - 1;
-        }
-        blockIndex = blockY * bmapwidth + blockX;
-        firstStop = startX + count;
-        if (firstStop < 0)
-        {
-            continue;
-        }
-        if (firstStop >= bmapwidth)
-        {
-            firstStop = bmapwidth - 1;
-        }
-        secondStop = startY + count;
-        if (secondStop < 0)
-        {
-            continue;
-        }
-        if (secondStop >= bmapheight)
-        {
-            secondStop = bmapheight - 1;
-        }
-        thirdStop = secondStop * bmapwidth + blockX;
-        secondStop = secondStop * bmapwidth + firstStop;
-        firstStop += blockY * bmapwidth;
-        finalStop = blockIndex;
-
-        // Trace the first block section (along the top)
-        for (; blockIndex <= firstStop; blockIndex++)
-        {
-            target = RoughBlockCheck(mo, blockIndex);
-            if (target != NULL)
-            {
-                return target;
-            }
-        }
-        // Trace the second block section (right edge)
-        for (blockIndex--; blockIndex <= secondStop; blockIndex += bmapwidth)
-        {
-            target = RoughBlockCheck(mo, blockIndex);
-            if (target != NULL)
-            {
-                return target;
-            }
-        }
-        // Trace the third block section (bottom edge)
-        for (blockIndex -= bmapwidth; blockIndex >= thirdStop; blockIndex--)
-        {
-            target = RoughBlockCheck(mo, blockIndex);
-            if (target != NULL)
-            {
-                return target;
-            }
-        }
-        // Trace the final block section (left edge)
-        for (blockIndex++; blockIndex > finalStop; blockIndex -= bmapwidth)
-        {
-            target = RoughBlockCheck(mo, blockIndex);
-            if (target != NULL)
-            {
-                return target;
-            }
-        }
-    }
-    return NULL;
-}
-
-//===========================================================================
-//
-// RoughBlockCheck
-//
-//===========================================================================
-
-static mobj_t *RoughBlockCheck(mobj_t * mo, int index)
-{
-    mobj_t *link;
-    mobj_t *master;
-    angle_t angle;
-
-    link = blocklinks[index];
-    while (link)
-    {
-        if (mo->player)         // Minotaur looking around player
-        {
-            if ((link->flags & MF_COUNTKILL) ||
-                (link->player && (link != mo)))
-            {
-                if (!(link->flags & MF_SHOOTABLE))
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (link->flags2 & MF2_DORMANT)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if ((link->type == MT_MINOTAUR) &&
-                    (link->special1.m == mo))
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (netgame && !deathmatch && link->player)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (P_CheckSight(mo, link))
-                {
-                    return link;
-                }
-            }
-            link = link->bnext;
-        }
-        else if (mo->type == MT_MINOTAUR)       // looking around minotaur
-        {
-            master = mo->special1.m;
-            if ((link->flags & MF_COUNTKILL) ||
-                (link->player && (link != master)))
-            {
-                if (!(link->flags & MF_SHOOTABLE))
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (link->flags2 & MF2_DORMANT)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if ((link->type == MT_MINOTAUR) &&
-                    (link->special1.m == mo->special1.m))
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (netgame && !deathmatch && link->player)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (P_CheckSight(mo, link))
-                {
-                    return link;
-                }
-            }
-            link = link->bnext;
-        }
-        else if (mo->type == MT_MSTAFF_FX2)     // bloodscourge
-        {
-            if ((link->flags & MF_COUNTKILL ||
-                 (link->player && link != mo->target))
-                && !(link->flags2 & MF2_DORMANT))
-            {
-                if (!(link->flags & MF_SHOOTABLE))
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (netgame && !deathmatch && link->player)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                else if (P_CheckSight(mo, link))
-                {
-                    master = mo->target;
-                    angle = R_PointToAngle2(master->x, master->y,
-                                            link->x, link->y) - master->angle;
-                    angle >>= 24;
-                    if (angle > 226 || angle < 30)
-                    {
-                        return link;
-                    }
-                }
-            }
-            link = link->bnext;
-        }
-        else                    // spirits
-        {
-            if ((link->flags & MF_COUNTKILL ||
-                 (link->player && link != mo->target))
-                && !(link->flags2 & MF2_DORMANT))
-            {
-                if (!(link->flags & MF_SHOOTABLE))
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (netgame && !deathmatch && link->player)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                if (link == mo->target)
-                {
-                    link = link->bnext;
-                    continue;
-                }
-                else if (P_CheckSight(mo, link))
-                {
-                    return link;
-                }
-            }
-            link = link->bnext;
-        }
-    }
-    return NULL;
-}
diff --git a/games/NXDoom/src/hexen/p_mobj.c b/games/NXDoom/src/hexen/p_mobj.c
deleted file mode 100644
index 0c302ed14..000000000
--- a/games/NXDoom/src/hexen/p_mobj.c
+++ /dev/null
@@ -1,2469 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "sounds.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAX_TID_COUNT 200
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-void G_PlayerReborn(int player);
-void P_MarkAsLeaving(mobj_t * corpse);
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-void P_SpawnMapThing(mapthing_t * mthing);
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void PlayerLandedOnThing(mobj_t * mo, mobj_t * onmobj);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-mobjtype_t PuffType;
-mobj_t *MissileMobj;
-
-fixed_t FloatBobOffsets[64] = {
-    0, 51389, 102283, 152192,
-    200636, 247147, 291278, 332604,
-    370727, 405280, 435929, 462380,
-    484378, 501712, 514213, 521763,
-    524287, 521763, 514213, 501712,
-    484378, 462380, 435929, 405280,
-    370727, 332604, 291278, 247147,
-    200636, 152192, 102283, 51389,
-    -1, -51390, -102284, -152193,
-    -200637, -247148, -291279, -332605,
-    -370728, -405281, -435930, -462381,
-    -484380, -501713, -514215, -521764,
-    -524288, -521764, -514214, -501713,
-    -484379, -462381, -435930, -405280,
-    -370728, -332605, -291279, -247148,
-    -200637, -152193, -102284, -51389
-};
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int TIDList[MAX_TID_COUNT + 1];  // +1 for termination marker
-static mobj_t *TIDMobj[MAX_TID_COUNT];
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// P_SetMobjState
-//
-// Returns true if the mobj is still present.
-//
-//==========================================================================
-
-boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
-{
-    state_t *st;
-
-    if (state == S_NULL)
-    {                           // Remove mobj
-        mobj->state = (state_t *) S_NULL;
-        P_RemoveMobj(mobj);
-        return (false);
-    }
-    st = &states[state];
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-    if (st->action)
-    {                           // Call action function
-        st->action(mobj, NULL, NULL);
-    }
-    return (true);
-}
-
-//==========================================================================
-//
-// P_SetMobjStateNF
-//
-// Same as P_SetMobjState, but does not call the state function.
-//
-//==========================================================================
-
-boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
-{
-    state_t *st;
-
-    if (state == S_NULL)
-    {                           // Remove mobj
-        mobj->state = (state_t *) S_NULL;
-        P_RemoveMobj(mobj);
-        return (false);
-    }
-    st = &states[state];
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ExplodeMissile
-//
-//----------------------------------------------------------------------------
-
-void P_ExplodeMissile(mobj_t * mo)
-{
-    mo->momx = mo->momy = mo->momz = 0;
-    P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
-    //mo->tics -= P_Random()&3;
-    mo->flags &= ~MF_MISSILE;
-
-    switch (mo->type)
-    {
-        case MT_SORCBALL1:
-        case MT_SORCBALL2:
-        case MT_SORCBALL3:
-            S_StartSound(NULL, SFX_SORCERER_BIGBALLEXPLODE);
-            break;
-        case MT_SORCFX1:
-            S_StartSound(NULL, SFX_SORCERER_HEADSCREAM);
-            break;
-        default:
-            if (mo->info->deathsound)
-            {
-                S_StartSound(mo, mo->info->deathsound);
-            }
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_FloorBounceMissile
-//
-//----------------------------------------------------------------------------
-
-void P_FloorBounceMissile(mobj_t * mo)
-{
-    if (P_HitFloor(mo) >= FLOOR_LIQUID)
-    {
-        switch (mo->type)
-        {
-            case MT_SORCFX1:
-            case MT_SORCBALL1:
-            case MT_SORCBALL2:
-            case MT_SORCBALL3:
-                break;
-            default:
-                P_RemoveMobj(mo);
-                return;
-        }
-    }
-    switch (mo->type)
-    {
-        case MT_SORCFX1:
-            mo->momz = -mo->momz;       // no energy absorbed
-            break;
-        case MT_SGSHARD1:
-        case MT_SGSHARD2:
-        case MT_SGSHARD3:
-        case MT_SGSHARD4:
-        case MT_SGSHARD5:
-        case MT_SGSHARD6:
-        case MT_SGSHARD7:
-        case MT_SGSHARD8:
-        case MT_SGSHARD9:
-        case MT_SGSHARD0:
-            mo->momz = FixedMul(mo->momz, -0.3 * FRACUNIT);
-            if (abs(mo->momz) < (FRACUNIT / 2))
-            {
-                P_SetMobjState(mo, S_NULL);
-                return;
-            }
-            break;
-        default:
-            mo->momz = FixedMul(mo->momz, -0.7 * FRACUNIT);
-            break;
-    }
-    mo->momx = 2 * mo->momx / 3;
-    mo->momy = 2 * mo->momy / 3;
-    if (mo->info->seesound)
-    {
-        switch (mo->type)
-        {
-            case MT_SORCBALL1:
-            case MT_SORCBALL2:
-            case MT_SORCBALL3:
-                if (!mo->args[0])
-                    S_StartSound(mo, mo->info->seesound);
-                break;
-            default:
-                S_StartSound(mo, mo->info->seesound);
-                break;
-        }
-        S_StartSound(mo, mo->info->seesound);
-    }
-//      P_SetMobjState(mo, mobjinfo[mo->type].deathstate);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ThrustMobj
-//
-//----------------------------------------------------------------------------
-
-void P_ThrustMobj(mobj_t * mo, angle_t angle, fixed_t move)
-{
-    angle >>= ANGLETOFINESHIFT;
-    mo->momx += FixedMul(move, finecosine[angle]);
-    mo->momy += FixedMul(move, finesine[angle]);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_FaceMobj
-//
-// Returns 1 if 'source' needs to turn clockwise, or 0 if 'source' needs
-// to turn counter clockwise.  'delta' is set to the amount 'source'
-// needs to turn.
-//
-//----------------------------------------------------------------------------
-
-int P_FaceMobj(mobj_t * source, mobj_t * target, angle_t * delta)
-{
-    angle_t diff;
-    angle_t angle1;
-    angle_t angle2;
-
-    angle1 = source->angle;
-    angle2 = R_PointToAngle2(source->x, source->y, target->x, target->y);
-    if (angle2 > angle1)
-    {
-        diff = angle2 - angle1;
-        if (diff > ANG180)
-        {
-            *delta = ANG_MAX - diff;
-            return (0);
-        }
-        else
-        {
-            *delta = diff;
-            return (1);
-        }
-    }
-    else
-    {
-        diff = angle1 - angle2;
-        if (diff > ANG180)
-        {
-            *delta = ANG_MAX - diff;
-            return (1);
-        }
-        else
-        {
-            *delta = diff;
-            return (0);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-//
-// The missile special1 field must be mobj_t *target.  Returns true if
-// target was tracked, false if not.
-//
-//----------------------------------------------------------------------------
-
-boolean P_SeekerMissile(mobj_t * actor, angle_t thresh, angle_t turnMax)
-{
-    int dir;
-    int dist;
-    angle_t delta;
-    angle_t angle;
-    mobj_t *target;
-
-    target = actor->special1.m;
-    if (target == NULL)
-    {
-        return (false);
-    }
-    if (!(target->flags & MF_SHOOTABLE))
-    {                           // Target died
-        actor->special1.m = NULL;
-        return (false);
-    }
-    dir = P_FaceMobj(actor, target, &delta);
-    if (delta > thresh)
-    {
-        delta >>= 1;
-        if (delta > turnMax)
-        {
-            delta = turnMax;
-        }
-    }
-    if (dir)
-    {                           // Turn clockwise
-        actor->angle += delta;
-    }
-    else
-    {                           // Turn counter clockwise
-        actor->angle -= delta;
-    }
-    angle = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
-    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
-    if (actor->z + actor->height < target->z
-        || target->z + target->height < actor->z)
-    {                           // Need to seek vertically
-        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
-        dist = dist / actor->info->speed;
-        if (dist < 1)
-        {
-            dist = 1;
-        }
-        actor->momz = (target->z + (target->height >> 1)
-                       - (actor->z + (actor->height >> 1))) / dist;
-    }
-    return (true);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_XYMovement
-//
-//----------------------------------------------------------------------------
-
-#define STOPSPEED			0x1000
-#define FRICTION_NORMAL		0xe800
-#define FRICTION_LOW		0xf900
-#define FRICTION_FLY		0xeb00
-
-void P_XYMovement(mobj_t * mo)
-{
-    fixed_t ptryx, ptryy;
-    player_t *player;
-    fixed_t xmove, ymove;
-    int special;
-    angle_t angle;
-    static int windTab[3] = { 2048 * 5, 2048 * 10, 2048 * 25 };
-
-    if (!mo->momx && !mo->momy)
-    {
-        if (mo->flags & MF_SKULLFLY)
-        {                       // A flying mobj slammed into something
-            mo->flags &= ~MF_SKULLFLY;
-            mo->momx = mo->momy = mo->momz = 0;
-            P_SetMobjState(mo, mo->info->seestate);
-        }
-        return;
-    }
-    special = mo->subsector->sector->special;
-    if (mo->flags2 & MF2_WINDTHRUST)
-    {
-        switch (special)
-        {
-            case 40:
-            case 41:
-            case 42:           // Wind_East
-                P_ThrustMobj(mo, 0, windTab[special - 40]);
-                break;
-            case 43:
-            case 44:
-            case 45:           // Wind_North
-                P_ThrustMobj(mo, ANG90, windTab[special - 43]);
-                break;
-            case 46:
-            case 47:
-            case 48:           // Wind_South
-                P_ThrustMobj(mo, ANG270, windTab[special - 46]);
-                break;
-            case 49:
-            case 50:
-            case 51:           // Wind_West
-                P_ThrustMobj(mo, ANG180, windTab[special - 49]);
-                break;
-        }
-    }
-    player = mo->player;
-    if (mo->momx > MAXMOVE)
-    {
-        mo->momx = MAXMOVE;
-    }
-    else if (mo->momx < -MAXMOVE)
-    {
-        mo->momx = -MAXMOVE;
-    }
-    if (mo->momy > MAXMOVE)
-    {
-        mo->momy = MAXMOVE;
-    }
-    else if (mo->momy < -MAXMOVE)
-    {
-        mo->momy = -MAXMOVE;
-    }
-    xmove = mo->momx;
-    ymove = mo->momy;
-    do
-    {
-        if (xmove > MAXMOVE / 2 || ymove > MAXMOVE / 2)
-        {
-            ptryx = mo->x + xmove / 2;
-            ptryy = mo->y + ymove / 2;
-            xmove >>= 1;
-            ymove >>= 1;
-        }
-        else
-        {
-            ptryx = mo->x + xmove;
-            ptryy = mo->y + ymove;
-            xmove = ymove = 0;
-        }
-        if (!P_TryMove(mo, ptryx, ptryy))
-        {                       // Blocked move
-            if (mo->flags2 & MF2_SLIDE)
-            {                   // Try to slide along it
-                if (BlockingMobj == NULL)
-                {               // Slide against wall
-                    P_SlideMove(mo);
-                }
-                else
-                {               // Slide against mobj
-                    //if(P_TryMove(mo, mo->x, mo->y+mo->momy))
-                    if (P_TryMove(mo, mo->x, ptryy))
-                    {
-                        mo->momx = 0;
-                    }
-                    //else if(P_TryMove(mo, mo->x+mo->momx, mo->y))
-                    else if (P_TryMove(mo, ptryx, mo->y))
-                    {
-                        mo->momy = 0;
-                    }
-                    else
-                    {
-                        mo->momx = mo->momy = 0;
-                    }
-                }
-            }
-            else if (mo->flags & MF_MISSILE)
-            {
-                if (mo->flags2 & MF2_FLOORBOUNCE)
-                {
-                    if (BlockingMobj)
-                    {
-                        if ((BlockingMobj->flags2 & MF2_REFLECTIVE) ||
-                            ((!BlockingMobj->player) &&
-                             (!(BlockingMobj->flags & MF_COUNTKILL))))
-                        {
-                            fixed_t speed;
-
-                            angle = R_PointToAngle2(BlockingMobj->x,
-                                                    BlockingMobj->y, mo->x,
-                                                    mo->y) +
-                                ANG1 * ((P_Random() % 16) - 8);
-                            speed = P_AproxDistance(mo->momx, mo->momy);
-                            speed = FixedMul(speed, 0.75 * FRACUNIT);
-                            mo->angle = angle;
-                            angle >>= ANGLETOFINESHIFT;
-                            mo->momx = FixedMul(speed, finecosine[angle]);
-                            mo->momy = FixedMul(speed, finesine[angle]);
-                            if (mo->info->seesound)
-                            {
-                                S_StartSound(mo, mo->info->seesound);
-                            }
-                            return;
-                        }
-                        else
-                        {       // Struck a player/creature
-                            P_ExplodeMissile(mo);
-                        }
-                    }
-                    else
-                    {           // Struck a wall
-                        P_BounceWall(mo);
-                        switch (mo->type)
-                        {
-                            case MT_SORCBALL1:
-                            case MT_SORCBALL2:
-                            case MT_SORCBALL3:
-                            case MT_SORCFX1:
-                                break;
-                            default:
-                                if (mo->info->seesound)
-                                {
-                                    S_StartSound(mo, mo->info->seesound);
-                                }
-                                break;
-                        }
-                        return;
-                    }
-                }
-                if (BlockingMobj && (BlockingMobj->flags2 & MF2_REFLECTIVE))
-                {
-                    angle = R_PointToAngle2(BlockingMobj->x,
-                                            BlockingMobj->y, mo->x, mo->y);
-
-                    // Change angle for delflection/reflection
-                    switch (BlockingMobj->type)
-                    {
-                        case MT_CENTAUR:
-                        case MT_CENTAURLEADER:
-                            if (abs((int) angle - (int) BlockingMobj->angle) >> 24 > 45)
-                                goto explode;
-                            if (mo->type == MT_HOLY_FX)
-                                goto explode;
-                            // Drop through to sorcerer full reflection
-                        case MT_SORCBOSS:
-                            // Deflection
-                            if (P_Random() < 128)
-                                angle += ANG45;
-                            else
-                                angle -= ANG45;
-                            break;
-                        default:
-                            // Reflection
-                            angle += ANG1 * ((P_Random() % 16) - 8);
-                            break;
-                    }
-
-                    // Reflect the missile along angle
-                    mo->angle = angle;
-                    angle >>= ANGLETOFINESHIFT;
-                    mo->momx =
-                        FixedMul(mo->info->speed >> 1, finecosine[angle]);
-                    mo->momy =
-                        FixedMul(mo->info->speed >> 1, finesine[angle]);
-//                                      mo->momz = -mo->momz;
-                    if (mo->flags2 & MF2_SEEKERMISSILE)
-                    {
-                        mo->special1.m = mo->target;
-                    }
-                    mo->target = BlockingMobj;
-                    return;
-                }
-              explode:
-                // Explode a missile
-                if (ceilingline && ceilingline->backsector
-                    && ceilingline->backsector->ceilingpic == skyflatnum)
-                {               // Hack to prevent missiles exploding against the sky
-                    if (mo->type == MT_BLOODYSKULL)
-                    {
-                        mo->momx = mo->momy = 0;
-                        mo->momz = -FRACUNIT;
-                    }
-                    else if (mo->type == MT_HOLY_FX)
-                    {
-                        P_ExplodeMissile(mo);
-                    }
-                    else
-                    {
-                        P_RemoveMobj(mo);
-                    }
-                    return;
-                }
-                P_ExplodeMissile(mo);
-            }
-            //else if(mo->info->crashstate)
-            //{
-            //      mo->momx = mo->momy = 0;
-            //      P_SetMobjState(mo, mo->info->crashstate);
-            //      return;
-            //}
-            else
-            {
-                mo->momx = mo->momy = 0;
-            }
-        }
-    }
-    while (xmove || ymove);
-
-    // Friction
-
-    if (player && player->cheats & CF_NOMOMENTUM)
-    {                           // Debug option for no sliding at all
-        mo->momx = mo->momy = 0;
-        return;
-    }
-    if (mo->flags & (MF_MISSILE | MF_SKULLFLY))
-    {                           // No friction for missiles
-        return;
-    }
-    if (mo->z > mo->floorz && !(mo->flags2 & MF2_FLY)
-        && !(mo->flags2 & MF2_ONMOBJ))
-    {                           // No friction when falling
-        if (mo->type != MT_BLASTEFFECT)
-            return;
-    }
-    if (mo->flags & MF_CORPSE)
-    {                           // Don't stop sliding if halfway off a step with some momentum
-        if (mo->momx > FRACUNIT / 4 || mo->momx < -FRACUNIT / 4
-            || mo->momy > FRACUNIT / 4 || mo->momy < -FRACUNIT / 4)
-        {
-            if (mo->floorz != mo->subsector->sector->floorheight)
-            {
-                return;
-            }
-        }
-    }
-    if (mo->momx > -STOPSPEED && mo->momx < STOPSPEED
-        && mo->momy > -STOPSPEED && mo->momy < STOPSPEED
-        && (!player || (player->cmd.forwardmove == 0
-                        && player->cmd.sidemove == 0)))
-    {                           // If in a walking frame, stop moving
-        if (player)
-        {
-            if ((unsigned) ((player->mo->state - states)
-                            - PStateRun[player->class]) < 4)
-            {
-                P_SetMobjState(player->mo, PStateNormal[player->class]);
-            }
-        }
-        mo->momx = 0;
-        mo->momy = 0;
-    }
-    else
-    {
-        if (mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
-            && !(mo->flags2 & MF2_ONMOBJ))
-        {
-            mo->momx = FixedMul(mo->momx, FRICTION_FLY);
-            mo->momy = FixedMul(mo->momy, FRICTION_FLY);
-        }
-        else if (P_GetThingFloorType(mo) == FLOOR_ICE)
-        {
-            mo->momx = FixedMul(mo->momx, FRICTION_LOW);
-            mo->momy = FixedMul(mo->momy, FRICTION_LOW);
-        }
-        else
-        {
-            mo->momx = FixedMul(mo->momx, FRICTION_NORMAL);
-            mo->momy = FixedMul(mo->momy, FRICTION_NORMAL);
-        }
-    }
-}
-
-
-// Move this to p_inter ***
-void P_MonsterFallingDamage(mobj_t * mo)
-{
-    int damage;
-    int mom;
-
-    mom = abs(mo->momz);
-    if (mom > 35 * FRACUNIT)
-    {                           // automatic death
-        damage = 10000;
-    }
-    else
-    {
-        damage = ((mom - (23 * FRACUNIT)) * 6) >> FRACBITS;
-    }
-    damage = 10000;             // always kill 'em
-    P_DamageMobj(mo, NULL, NULL, damage);
-}
-
-
-
-/*
-===============
-=
-= P_ZMovement
-=
-===============
-*/
-
-void P_ZMovement(mobj_t * mo)
-{
-    int dist;
-    int delta;
-//
-// check for smooth step up
-//
-    if (mo->player && mo->z < mo->floorz)
-    {
-        mo->player->viewheight -= mo->floorz - mo->z;
-        mo->player->deltaviewheight =
-            (VIEWHEIGHT - mo->player->viewheight) >> 3;
-    }
-//
-// adjust height
-//
-    mo->z += mo->momz;
-    if (mo->flags & MF_FLOAT && mo->target)
-    {                           // float down towards target if too close
-        if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
-        {
-            dist =
-                P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y);
-            delta = (mo->target->z + (mo->height >> 1)) - mo->z;
-            if (delta < 0 && dist < -(delta * 3))
-                mo->z -= FLOATSPEED;
-            else if (delta > 0 && dist < (delta * 3))
-                mo->z += FLOATSPEED;
-        }
-    }
-    if (mo->player && mo->flags2 & MF2_FLY && !(mo->z <= mo->floorz)
-        && leveltime & 2)
-    {
-        mo->z += finesine[(FINEANGLES / 20 * leveltime >> 2) & FINEMASK];
-    }
-
-//
-// clip movement
-//
-    if (mo->z <= mo->floorz)
-    {                           // Hit the floor
-        if (mo->flags & MF_MISSILE)
-        {
-            mo->z = mo->floorz;
-            if (mo->flags2 & MF2_FLOORBOUNCE)
-            {
-                P_FloorBounceMissile(mo);
-                return;
-            }
-            else if (mo->type == MT_HOLY_FX)
-            {                   // The spirit struck the ground
-                mo->momz = 0;
-                P_HitFloor(mo);
-                return;
-            }
-            else if (mo->type == MT_MNTRFX2 || mo->type == MT_LIGHTNING_FLOOR)
-            {                   // Minotaur floor fire can go up steps
-                return;
-            }
-            else
-            {
-                P_HitFloor(mo);
-                P_ExplodeMissile(mo);
-                return;
-            }
-        }
-        if (mo->flags & MF_COUNTKILL)   // Blasted mobj falling
-        {
-            if (mo->momz < -(23 * FRACUNIT))
-            {
-                P_MonsterFallingDamage(mo);
-            }
-        }
-        if (mo->z - mo->momz > mo->floorz)
-        {                       // Spawn splashes, etc.
-            P_HitFloor(mo);
-        }
-        mo->z = mo->floorz;
-        if (mo->momz < 0)
-        {
-            if (mo->flags2 & MF2_ICEDAMAGE && mo->momz < -GRAVITY * 8)
-            {
-                mo->tics = 1;
-                mo->momx = 0;
-                mo->momy = 0;
-                mo->momz = 0;
-                return;
-            }
-            if (mo->player)
-            {
-                mo->player->jumpTics = 7;       // delay any jumping for a short time
-                if (mo->momz < -GRAVITY * 8 && !(mo->flags2 & MF2_FLY))
-                {               // squat down
-                    mo->player->deltaviewheight = mo->momz >> 3;
-                    if (mo->momz < -23 * FRACUNIT)
-                    {
-                        P_FallingDamage(mo->player);
-                        P_NoiseAlert(mo, mo);
-                    }
-                    else if (mo->momz < -GRAVITY * 12
-                             && !mo->player->morphTics)
-                    {
-                        S_StartSound(mo, SFX_PLAYER_LAND);
-                        switch (mo->player->class)
-                        {
-                            case PCLASS_FIGHTER:
-                                S_StartSound(mo, SFX_PLAYER_FIGHTER_GRUNT);
-                                break;
-                            case PCLASS_CLERIC:
-                                S_StartSound(mo, SFX_PLAYER_CLERIC_GRUNT);
-                                break;
-                            case PCLASS_MAGE:
-                                S_StartSound(mo, SFX_PLAYER_MAGE_GRUNT);
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                    else if ((P_GetThingFloorType(mo) < FLOOR_LIQUID) &&
-                             (!mo->player->morphTics))
-                    {
-                        S_StartSound(mo, SFX_PLAYER_LAND);
-                    }
-                    // haleyjd: removed externdriver crap
-                    mo->player->centering = true;
-                }
-            }
-            else if (mo->type >= MT_POTTERY1 && mo->type <= MT_POTTERY3)
-            {
-                P_DamageMobj(mo, NULL, NULL, 25);
-            }
-            else if (mo->flags & MF_COUNTKILL)
-            {
-                if (mo->momz < -23 * FRACUNIT)
-                {
-                    // Doesn't get here
-                }
-            }
-            mo->momz = 0;
-        }
-        if (mo->flags & MF_SKULLFLY)
-        {                       // The skull slammed into something
-            mo->momz = -mo->momz;
-        }
-        if (mo->info->crashstate &&
-            (mo->flags & MF_CORPSE) && !(mo->flags2 & MF2_ICEDAMAGE))
-        {
-            P_SetMobjState(mo, mo->info->crashstate);
-            return;
-        }
-    }
-    else if (mo->flags2 & MF2_LOGRAV)
-    {
-        if (mo->momz == 0)
-            mo->momz = -(GRAVITY >> 3) * 2;
-        else
-            mo->momz -= GRAVITY >> 3;
-    }
-    else if (!(mo->flags & MF_NOGRAVITY))
-    {
-        if (mo->momz == 0)
-            mo->momz = -GRAVITY * 2;
-        else
-            mo->momz -= GRAVITY;
-    }
-
-    if (mo->z + mo->height > mo->ceilingz)
-    {                           // hit the ceiling
-        if (mo->momz > 0)
-            mo->momz = 0;
-        mo->z = mo->ceilingz - mo->height;
-        if (mo->flags2 & MF2_FLOORBOUNCE)
-        {
-            // Maybe reverse momentum here for ceiling bounce
-            // Currently won't happen
-
-            if (mo->info->seesound)
-            {
-                S_StartSound(mo, mo->info->seesound);
-            }
-            return;
-        }
-        if (mo->flags & MF_SKULLFLY)
-        {                       // the skull slammed into something
-            mo->momz = -mo->momz;
-        }
-        if (mo->flags & MF_MISSILE)
-        {
-            if (mo->type == MT_LIGHTNING_CEILING)
-            {
-                return;
-            }
-            if (mo->subsector->sector->ceilingpic == skyflatnum)
-            {
-                if (mo->type == MT_BLOODYSKULL)
-                {
-                    mo->momx = mo->momy = 0;
-                    mo->momz = -FRACUNIT;
-                }
-                else if (mo->type == MT_HOLY_FX)
-                {
-                    P_ExplodeMissile(mo);
-                }
-                else
-                {
-                    P_RemoveMobj(mo);
-                }
-                return;
-            }
-            P_ExplodeMissile(mo);
-            return;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_BlasterMobjThinker
-//
-//
-//----------------------------------------------------------------------------
-
-void P_BlasterMobjThinker(thinker_t *thinker)
-{
-    mobj_t *mobj = (mobj_t *) thinker;
-    int i;
-    fixed_t xfrac;
-    fixed_t yfrac;
-    fixed_t zfrac;
-    fixed_t z;
-    boolean changexy;
-    mobj_t *mo;
-
-    // Handle movement
-    if (mobj->momx || mobj->momy || (mobj->z != mobj->floorz) || mobj->momz)
-    {
-        xfrac = mobj->momx >> 3;
-        yfrac = mobj->momy >> 3;
-        zfrac = mobj->momz >> 3;
-        changexy = xfrac || yfrac;
-        for (i = 0; i < 8; i++)
-        {
-            if (changexy)
-            {
-                if (!P_TryMove(mobj, mobj->x + xfrac, mobj->y + yfrac))
-                {               // Blocked move
-                    P_ExplodeMissile(mobj);
-                    return;
-                }
-            }
-            mobj->z += zfrac;
-            if (mobj->z <= mobj->floorz)
-            {                   // Hit the floor
-                mobj->z = mobj->floorz;
-                P_HitFloor(mobj);
-                P_ExplodeMissile(mobj);
-                return;
-            }
-            if (mobj->z + mobj->height > mobj->ceilingz)
-            {                   // Hit the ceiling
-                mobj->z = mobj->ceilingz - mobj->height;
-                P_ExplodeMissile(mobj);
-                return;
-            }
-            if (changexy)
-            {
-                if (mobj->type == MT_MWAND_MISSILE && (P_Random() < 128))
-                {
-                    z = mobj->z - 8 * FRACUNIT;
-                    if (z < mobj->floorz)
-                    {
-                        z = mobj->floorz;
-                    }
-                    P_SpawnMobj(mobj->x, mobj->y, z, MT_MWANDSMOKE);
-                }
-                else if (!--mobj->special1.i)
-                {
-                    mobj->special1.i = 4;
-                    z = mobj->z - 12 * FRACUNIT;
-                    if (z < mobj->floorz)
-                    {
-                        z = mobj->floorz;
-                    }
-                    mo = P_SpawnMobj(mobj->x, mobj->y, z, MT_CFLAMEFLOOR);
-                    if (mo)
-                    {
-                        mo->angle = mobj->angle;
-                    }
-                }
-            }
-        }
-    }
-    // Advance the state
-    if (mobj->tics != -1)
-    {
-        mobj->tics--;
-        while (!mobj->tics)
-        {
-            if (!P_SetMobjState(mobj, mobj->state->nextstate))
-            {                   // mobj was removed
-                return;
-            }
-        }
-    }
-}
-
-//===========================================================================
-//
-// PlayerLandedOnThing
-//
-//===========================================================================
-
-static void PlayerLandedOnThing(mobj_t * mo, mobj_t * onmobj)
-{
-    mo->player->deltaviewheight = mo->momz >> 3;
-    if (mo->momz < -23 * FRACUNIT)
-    {
-        P_FallingDamage(mo->player);
-        P_NoiseAlert(mo, mo);
-    }
-    else if (mo->momz < -GRAVITY * 12 && !mo->player->morphTics)
-    {
-        S_StartSound(mo, SFX_PLAYER_LAND);
-        switch (mo->player->class)
-        {
-            case PCLASS_FIGHTER:
-                S_StartSound(mo, SFX_PLAYER_FIGHTER_GRUNT);
-                break;
-            case PCLASS_CLERIC:
-                S_StartSound(mo, SFX_PLAYER_CLERIC_GRUNT);
-                break;
-            case PCLASS_MAGE:
-                S_StartSound(mo, SFX_PLAYER_MAGE_GRUNT);
-                break;
-            default:
-                break;
-        }
-    }
-    else if (!mo->player->morphTics)
-    {
-        S_StartSound(mo, SFX_PLAYER_LAND);
-    }
-    // haleyjd: removed externdriver crap
-    mo->player->centering = true;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_MobjThinker
-//
-//----------------------------------------------------------------------------
-
-void P_MobjThinker(thinker_t *thinker)
-{
-    mobj_t *mobj = (mobj_t *) thinker;
-    mobj_t *onmo;
-/*
-	// Reset to not blasted when momentums are gone
-	if((mobj->flags2&MF2_BLASTED) && (!(mobj->momx)) && (!(mobj->momy)))
-		ResetBlasted(mobj);
-*/
-    // Handle X and Y momentums
-    BlockingMobj = NULL;
-    if (mobj->momx || mobj->momy || (mobj->flags & MF_SKULLFLY))
-    {
-        P_XYMovement(mobj);
-        if (mobj->thinker.function == (think_t) - 1)
-        {                       // mobj was removed
-            return;
-        }
-    }
-    else if (mobj->flags2 & MF2_BLASTED)
-    {                           // Reset to not blasted when momentums are gone
-        ResetBlasted(mobj);
-    }
-    if (mobj->flags2 & MF2_FLOATBOB)
-    {                           // Floating item bobbing motion (special1 is height)
-        mobj->z = mobj->floorz +
-            mobj->special1.i + FloatBobOffsets[(mobj->health++) & 63];
-    }
-    else if ((mobj->z != mobj->floorz) || mobj->momz || BlockingMobj)
-    {                           // Handle Z momentum and gravity
-        if (mobj->flags2 & MF2_PASSMOBJ)
-        {
-            if (!(onmo = P_CheckOnmobj(mobj)))
-            {
-                P_ZMovement(mobj);
-                if (mobj->player && mobj->flags & MF2_ONMOBJ)
-                {
-                    mobj->flags2 &= ~MF2_ONMOBJ;
-                }
-            }
-            else
-            {
-                if (mobj->player)
-                {
-                    if (mobj->momz < -GRAVITY * 8
-                        && !(mobj->flags2 & MF2_FLY))
-                    {
-                        PlayerLandedOnThing(mobj, onmo);
-                    }
-                    if (onmo->z + onmo->height - mobj->z <= 24 * FRACUNIT)
-                    {
-                        mobj->player->viewheight -= onmo->z + onmo->height
-                            - mobj->z;
-                        mobj->player->deltaviewheight =
-                            (VIEWHEIGHT - mobj->player->viewheight) >> 3;
-                        mobj->z = onmo->z + onmo->height;
-                        mobj->flags2 |= MF2_ONMOBJ;
-                        mobj->momz = 0;
-                    }
-                    else
-                    {           // hit the bottom of the blocking mobj
-                        mobj->momz = 0;
-                    }
-                }
-/* Landing on another player, and mimicking his movements
-				if(mobj->player && onmo->player)
-				{
-					mobj->momx = onmo->momx;
-					mobj->momy = onmo->momy;
-					if(onmo->z < onmo->floorz)
-					{
-						mobj->z += onmo->floorz-onmo->z;
-						if(onmo->player)
-						{
-							onmo->player->viewheight -= onmo->floorz-onmo->z;
-							onmo->player->deltaviewheight = (VIEWHEIGHT-
-								onmo->player->viewheight)>>3;
-						}
-						onmo->z = onmo->floorz;
-					}
-				}
-*/
-            }
-        }
-        else
-        {
-            P_ZMovement(mobj);
-        }
-        if (mobj->thinker.function == (think_t) - 1)
-        {                       // mobj was removed
-            return;
-        }
-    }
-
-    // Cycle through states, calling action functions at transitions
-    if (mobj->tics != -1)
-    {
-        mobj->tics--;
-        // you can cycle through multiple states in a tic
-        while (!mobj->tics)
-        {
-            if (!P_SetMobjState(mobj, mobj->state->nextstate))
-            {                   // mobj was removed
-                return;
-            }
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_SpawnMobj
-//
-//==========================================================================
-
-mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
-{
-    mobj_t *mobj;
-    state_t *st;
-    mobjinfo_t *info;
-    fixed_t space;
-
-    mobj = Z_Malloc(sizeof(*mobj), PU_LEVEL, NULL);
-    memset(mobj, 0, sizeof(*mobj));
-    info = &mobjinfo[type];
-    mobj->type = type;
-    mobj->info = info;
-    mobj->x = x;
-    mobj->y = y;
-    mobj->radius = info->radius;
-    mobj->height = info->height;
-    mobj->flags = info->flags;
-    mobj->flags2 = info->flags2;
-    mobj->damage = info->damage;
-    mobj->health = info->spawnhealth;
-    if (gameskill != sk_nightmare)
-    {
-        mobj->reactiontime = info->reactiontime;
-    }
-    mobj->lastlook = P_Random() % maxplayers;
-
-    // Set the state, but do not use P_SetMobjState, because action
-    // routines can't be called yet.  If the spawnstate has an action
-    // routine, it will not be called.
-    st = &states[info->spawnstate];
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-
-    // Set subsector and/or block links.
-    P_SetThingPosition(mobj);
-    mobj->floorz = mobj->subsector->sector->floorheight;
-    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-    if (z == ONFLOORZ)
-    {
-        mobj->z = mobj->floorz;
-    }
-    else if (z == ONCEILINGZ)
-    {
-        mobj->z = mobj->ceilingz - mobj->info->height;
-    }
-    else if (z == FLOATRANDZ)
-    {
-        space = ((mobj->ceilingz) - (mobj->info->height)) - mobj->floorz;
-        if (space > 48 * FRACUNIT)
-        {
-            space -= 40 * FRACUNIT;
-            mobj->z =
-                ((space * P_Random()) >> 8) + mobj->floorz + 40 * FRACUNIT;
-        }
-        else
-        {
-            mobj->z = mobj->floorz;
-        }
-    }
-    else if (mobj->flags2 & MF2_FLOATBOB)
-    {
-        mobj->z = mobj->floorz + z;     // artifact z passed in as height
-    }
-    else
-    {
-        mobj->z = z;
-    }
-    if (mobj->flags2 & MF2_FLOORCLIP
-        && P_GetThingFloorType(mobj) >= FLOOR_LIQUID
-        && mobj->z == mobj->subsector->sector->floorheight)
-    {
-        mobj->floorclip = 10 * FRACUNIT;
-    }
-    else
-    {
-        mobj->floorclip = 0;
-    }
-
-    mobj->thinker.function = P_MobjThinker;
-    P_AddThinker(&mobj->thinker);
-    return (mobj);
-}
-
-//==========================================================================
-//
-// P_RemoveMobj
-//
-//==========================================================================
-
-void P_RemoveMobj(mobj_t * mobj)
-{
-    // Remove from creature queue
-    if (mobj->flags & MF_COUNTKILL && mobj->flags & MF_CORPSE)
-    {
-        A_DeQueueCorpse(mobj);
-    }
-
-    if (mobj->tid)
-    {                           // Remove from TID list
-        P_RemoveMobjFromTIDList(mobj);
-    }
-
-    // Unlink from sector and block lists
-    P_UnsetThingPosition(mobj);
-
-    // Stop any playing sound
-    S_StopSound(mobj);
-
-    // Free block
-    P_RemoveThinker((thinker_t *) mobj);
-}
-
-//==========================================================================
-//
-// P_SpawnPlayer
-//
-// Called when a player is spawned on the level.  Most of the player
-// structure stays unchanged between levels.
-//
-//==========================================================================
-
-void P_SpawnPlayer(mapthing_t * mthing)
-{
-    player_t *p;
-    fixed_t x, y, z;
-    mobj_t *mobj;
-
-    if (mthing->type - 1 >= maxplayers || !playeringame[mthing->type - 1])
-    {                           // Not playing
-        return;
-    }
-
-    p = &players[mthing->type - 1];
-    if (p->playerstate == PST_REBORN)
-    {
-        G_PlayerReborn(mthing->type - 1);
-    }
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-    z = ONFLOORZ;
-    if (randomclass && deathmatch)
-    {
-        p->class = P_Random() % 3;
-        if (p->class == PlayerClass[mthing->type - 1])
-        {
-            p->class = (p->class + 1) % 3;
-        }
-        PlayerClass[mthing->type - 1] = p->class;
-        SB_SetClassData();
-    }
-    else
-    {
-        p->class = PlayerClass[mthing->type - 1];
-    }
-    switch (p->class)
-    {
-        case PCLASS_FIGHTER:
-            mobj = P_SpawnMobj(x, y, z, MT_PLAYER_FIGHTER);
-            break;
-        case PCLASS_CLERIC:
-            mobj = P_SpawnMobj(x, y, z, MT_PLAYER_CLERIC);
-            break;
-        case PCLASS_MAGE:
-            mobj = P_SpawnMobj(x, y, z, MT_PLAYER_MAGE);
-            break;
-        default:
-            I_Error("P_SpawnPlayer: Unknown class type");
-            return;
-    }
-
-    // Set translation table data
-    if (p->class == PCLASS_FIGHTER
-        && (mthing->type == 1 || mthing->type == 3))
-    {
-        // The first type should be blue, and the third should be the
-        // Fighter's original gold color
-        if (mthing->type == 1)
-        {
-            mobj->flags |= 2 << MF_TRANSSHIFT;
-        }
-    }
-    else if (mthing->type > 1)
-    {                           // Set color translation bits for player sprites
-        mobj->flags |= (mthing->type - 1) << MF_TRANSSHIFT;
-    }
-
-    mobj->angle = ANG45 * (mthing->angle / 45);
-    mobj->player = p;
-    mobj->health = p->health;
-    p->mo = mobj;
-    p->playerstate = PST_LIVE;
-    p->refire = 0;
-    P_ClearMessage(p);
-    p->damagecount = 0;
-    p->bonuscount = 0;
-    p->poisoncount = 0;
-    p->morphTics = 0;
-    p->extralight = 0;
-    p->fixedcolormap = 0;
-    p->viewheight = VIEWHEIGHT;
-    P_SetupPsprites(p);
-    if (deathmatch)
-    {                           // Give all keys in death match mode
-        p->keys = 2047;
-    }
-}
-
-//==========================================================================
-//
-// P_SpawnMapThing
-//
-// The fields of the mapthing should already be in host byte order.
-//
-//==========================================================================
-
-void P_SpawnMapThing(mapthing_t * mthing)
-{
-    int i;
-    unsigned int spawnMask;
-    mobj_t *mobj;
-    fixed_t x, y, z;
-    static unsigned int classFlags[] = {
-        MTF_FIGHTER,
-        MTF_CLERIC,
-        MTF_MAGE
-    };
-
-    // Count deathmatch start positions
-    if (mthing->type == 11)
-    {
-        if (deathmatch_p < &deathmatchstarts[MAXDEATHMATCHSTARTS])
-        {
-            memcpy(deathmatch_p, mthing, sizeof(*mthing));
-            deathmatch_p++;
-        }
-        return;
-    }
-    if (mthing->type == PO_ANCHOR_TYPE)
-    {                           // Polyobj Anchor Pt.
-        return;
-    }
-    else if (mthing->type == PO_SPAWN_TYPE
-             || mthing->type == PO_SPAWNCRUSH_TYPE)
-    {                           // Polyobj Anchor Pt.
-        po_NumPolyobjs++;
-        return;
-    }
-
-    // Check for player starts 1 to 4
-    if (mthing->type <= 4)
-    {
-        playerstarts[mthing->arg1][mthing->type - 1] = *mthing;
-        if (!deathmatch && !mthing->arg1)
-        {
-            P_SpawnPlayer(mthing);
-        }
-        return;
-    }
-    // Check for player starts 5 to 8
-    if (mthing->type >= 9100 && mthing->type <= 9103)
-    {
-        mapthing_t *player_start;
-        int player;
-
-        player = 4 + mthing->type - 9100;
-
-        player_start = &playerstarts[mthing->arg1][player];
-        memcpy(player_start, mthing, sizeof(mapthing_t));
-        player_start->type = player + 1;
-
-        if (!deathmatch && !player_start->arg1)
-        {
-            P_SpawnPlayer(player_start);
-        }
-        return;
-    }
-
-    if (mthing->type >= 1400 && mthing->type < 1410)
-    {
-        R_PointInSubsector(mthing->x << FRACBITS,
-                           mthing->y << FRACBITS)->sector->seqType =
-            mthing->type - 1400;
-        return;
-    }
-
-    // Check current game type with spawn flags
-    if (netgame == false)
-    {
-        spawnMask = MTF_GSINGLE;
-    }
-    else if (deathmatch)
-    {
-        spawnMask = MTF_GDEATHMATCH;
-    }
-    else
-    {
-        spawnMask = MTF_GCOOP;
-    }
-    if (!(mthing->options & spawnMask))
-    {
-        return;
-    }
-
-    // Check current skill with spawn flags
-    if (gameskill == sk_baby || gameskill == sk_easy)
-    {
-        spawnMask = MTF_EASY;
-    }
-    else if (gameskill == sk_hard || gameskill == sk_nightmare)
-    {
-        spawnMask = MTF_HARD;
-    }
-    else
-    {
-        spawnMask = MTF_NORMAL;
-    }
-    if (!(mthing->options & spawnMask))
-    {
-        return;
-    }
-
-    // Check current character classes with spawn flags
-    if (netgame == false)
-    {                           // Single player
-        if ((mthing->options & classFlags[PlayerClass[0]]) == 0)
-        {                       // Not for current class
-            return;
-        }
-    }
-    else if (deathmatch == false)
-    {                           // Cooperative
-        spawnMask = 0;
-        for (i = 0; i < maxplayers; i++)
-        {
-            if (playeringame[i])
-            {
-                spawnMask |= classFlags[PlayerClass[i]];
-            }
-        }
-        if ((mthing->options & spawnMask) == 0)
-        {
-            return;
-        }
-    }
-
-    // Find which type to spawn
-    for (i = 0; i < NUMMOBJTYPES; i++)
-    {
-        if (mthing->type == mobjinfo[i].doomednum)
-        {
-            break;
-        }
-    }
-
-    if (i == NUMMOBJTYPES)
-    {                           // Can't find thing type
-        I_Error("P_SpawnMapThing: Unknown type %i at (%i, %i)",
-                mthing->type, mthing->x, mthing->y);
-    }
-
-    // Don't spawn keys and players in deathmatch
-    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
-    {
-        return;
-    }
-
-    // Don't spawn monsters if -nomonsters
-    if (nomonsters && (mobjinfo[i].flags & MF_COUNTKILL))
-    {
-        return;
-    }
-
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-    if (mobjinfo[i].flags & MF_SPAWNCEILING)
-    {
-        z = ONCEILINGZ;
-    }
-    else if (mobjinfo[i].flags2 & MF2_SPAWNFLOAT)
-    {
-        z = FLOATRANDZ;
-    }
-    else if (mobjinfo[i].flags2 & MF2_FLOATBOB)
-    {
-        z = mthing->height << FRACBITS;
-    }
-    else
-    {
-        z = ONFLOORZ;
-    }
-    switch (i)
-    {                           // Special stuff
-        case MT_ZLYNCHED_NOHEART:
-            P_SpawnMobj(x, y, ONFLOORZ, MT_BLOODPOOL);
-            break;
-        default:
-            break;
-    }
-    mobj = P_SpawnMobj(x, y, z, i);
-    if (z == ONFLOORZ)
-    {
-        mobj->z += mthing->height << FRACBITS;
-    }
-    else if (z == ONCEILINGZ)
-    {
-        mobj->z -= mthing->height << FRACBITS;
-    }
-    mobj->tid = mthing->tid;
-    mobj->special = mthing->special;
-    mobj->args[0] = mthing->arg1;
-    mobj->args[1] = mthing->arg2;
-    mobj->args[2] = mthing->arg3;
-    mobj->args[3] = mthing->arg4;
-    mobj->args[4] = mthing->arg5;
-    if (mobj->flags2 & MF2_FLOATBOB)
-    {                           // Seed random starting index for bobbing motion
-        mobj->health = P_Random();
-        mobj->special1.i = mthing->height << FRACBITS;
-    }
-    if (mobj->tics > 0)
-    {
-        mobj->tics = 1 + (P_Random() % mobj->tics);
-    }
-//      if(mobj->flags&MF_COUNTITEM)
-//      {
-//              totalitems++;
-//      }
-    if (mobj->flags & MF_COUNTKILL)
-    {
-        // Quantize angle to 45 degree increments
-        mobj->angle = ANG45 * (mthing->angle / 45);
-    }
-    else
-    {
-        // Scale angle correctly (source is 0..359)
-        mobj->angle = ((mthing->angle << 8) / 360) << 24;
-    }
-    if (mthing->options & MTF_AMBUSH)
-    {
-        mobj->flags |= MF_AMBUSH;
-    }
-    if (mthing->options & MTF_DORMANT)
-    {
-        mobj->flags2 |= MF2_DORMANT;
-        if (mobj->type == MT_ICEGUY)
-        {
-            P_SetMobjState(mobj, S_ICEGUY_DORMANT);
-        }
-        mobj->tics = -1;
-    }
-}
-
-//==========================================================================
-//
-// P_CreateTIDList
-//
-//==========================================================================
-
-void P_CreateTIDList(void)
-{
-    int i;
-    mobj_t *mobj;
-    thinker_t *t;
-
-    i = 0;
-    for (t = thinkercap.next; t != &thinkercap; t = t->next)
-    {                           // Search all current thinkers
-        if (t->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mobj = (mobj_t *) t;
-        if (mobj->tid != 0)
-        {                       // Add to list
-            if (i == MAX_TID_COUNT)
-            {
-                I_Error("P_CreateTIDList: MAX_TID_COUNT (%d) exceeded.",
-                        MAX_TID_COUNT);
-            }
-            TIDList[i] = mobj->tid;
-            TIDMobj[i++] = mobj;
-        }
-    }
-    // Add termination marker
-    TIDList[i] = 0;
-}
-
-//==========================================================================
-//
-// P_InsertMobjIntoTIDList
-//
-//==========================================================================
-
-void P_InsertMobjIntoTIDList(mobj_t * mobj, int tid)
-{
-    int i;
-    int index;
-
-    index = -1;
-    for (i = 0; TIDList[i] != 0; i++)
-    {
-        if (TIDList[i] == -1)
-        {                       // Found empty slot
-            index = i;
-            break;
-        }
-    }
-    if (index == -1)
-    {                           // Append required
-        if (i == MAX_TID_COUNT)
-        {
-            I_Error("P_InsertMobjIntoTIDList: MAX_TID_COUNT (%d)"
-                    "exceeded.", MAX_TID_COUNT);
-        }
-        index = i;
-        TIDList[index + 1] = 0;
-    }
-    mobj->tid = tid;
-    TIDList[index] = tid;
-    TIDMobj[index] = mobj;
-}
-
-//==========================================================================
-//
-// P_RemoveMobjFromTIDList
-//
-//==========================================================================
-
-void P_RemoveMobjFromTIDList(mobj_t * mobj)
-{
-    int i;
-
-    for (i = 0; TIDList[i] != 0; i++)
-    {
-        if (TIDMobj[i] == mobj)
-        {
-            TIDList[i] = -1;
-            TIDMobj[i] = NULL;
-            mobj->tid = 0;
-            return;
-        }
-    }
-    mobj->tid = 0;
-}
-
-//==========================================================================
-//
-// P_FindMobjFromTID
-//
-//==========================================================================
-
-mobj_t *P_FindMobjFromTID(int tid, int *searchPosition)
-{
-    int i;
-
-    for (i = *searchPosition + 1; TIDList[i] != 0; i++)
-    {
-        if (TIDList[i] == tid)
-        {
-            *searchPosition = i;
-            return TIDMobj[i];
-        }
-    }
-    *searchPosition = -1;
-    return NULL;
-}
-
-/*
-===============================================================================
-
-						GAME SPAWN FUNCTIONS
-
-===============================================================================
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SpawnPuff
-//
-//---------------------------------------------------------------------------
-
-
-void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z)
-{
-    mobj_t *puff;
-
-    z += (P_SubRandom() << 10);
-    puff = P_SpawnMobj(x, y, z, PuffType);
-    if (linetarget && puff->info->seesound)
-    {                           // Hit thing sound
-        S_StartSound(puff, puff->info->seesound);
-    }
-    else if (puff->info->attacksound)
-    {
-        S_StartSound(puff, puff->info->attacksound);
-    }
-    switch (PuffType)
-    {
-        case MT_PUNCHPUFF:
-            puff->momz = FRACUNIT;
-            break;
-        case MT_HAMMERPUFF:
-            puff->momz = .8 * FRACUNIT;
-            break;
-        default:
-            break;
-    }
-    PuffSpawned = puff;
-}
-
-/*
-================
-=
-= P_SpawnBlood
-=
-================
-*/
-
-/*
-void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage)
-{
-	mobj_t	*th;
-	
-	z += (P_SubRandom()<<10);
-	th = P_SpawnMobj (x,y,z, MT_BLOOD);
-	th->momz = FRACUNIT*2;
-	th->tics -= P_Random()&3;
-
-	if (damage <= 12 && damage >= 9)
-		P_SetMobjState (th,S_BLOOD2);
-	else if (damage < 9)
-		P_SetMobjState (th,S_BLOOD3);
-}
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_BloodSplatter
-//
-//---------------------------------------------------------------------------
-
-void P_BloodSplatter(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(x, y, z, MT_BLOODSPLATTER);
-    mo->target = originator;
-    mo->momx = P_SubRandom() << 10;
-    mo->momy = P_SubRandom() << 10;
-    mo->momz = 3 * FRACUNIT;
-}
-
-//===========================================================================
-//
-//  P_BloodSplatter2
-//
-//===========================================================================
-
-void P_BloodSplatter2(fixed_t x, fixed_t y, fixed_t z, mobj_t * originator)
-{
-    mobj_t *mo;
-    int r1, r2;
-
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(x + ((r2 - 128) << 11),
-                     y + ((r1 - 128) << 11), z, MT_AXEBLOOD);
-    mo->target = originator;
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_RipperBlood
-//
-//---------------------------------------------------------------------------
-
-void P_RipperBlood(mobj_t * mo)
-{
-    mobj_t *th;
-    fixed_t x, y, z;
-
-    x = mo->x + (P_SubRandom() << 12);
-    y = mo->y + (P_SubRandom() << 12);
-    z = mo->z + (P_SubRandom() << 12);
-    th = P_SpawnMobj(x, y, z, MT_BLOOD);
-//      th->flags |= MF_NOGRAVITY;
-    th->momx = mo->momx >> 1;
-    th->momy = mo->momy >> 1;
-    th->tics += P_Random() & 3;
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_GetThingFloorType
-//
-//---------------------------------------------------------------------------
-
-int P_GetThingFloorType(mobj_t * thing)
-{
-    if (thing->floorpic)
-    {
-        return (TerrainTypes[thing->floorpic]);
-    }
-    else
-    {
-        return (TerrainTypes[thing->subsector->sector->floorpic]);
-    }
-/*
-	if(thing->subsector->sector->floorpic
-		== W_GetNumForName("FLTWAWA1")-firstflat)
-	{
-		return(FLOOR_WATER);
-	}
-	else
-	{
-		return(FLOOR_SOLID);
-	}
-*/
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_HitFloor
-//
-//---------------------------------------------------------------------------
-#define SMALLSPLASHCLIP 12<<FRACBITS;
-
-int P_HitFloor(mobj_t * thing)
-{
-    mobj_t *mo;
-    int smallsplash = false;
-
-    if (thing->floorz != thing->subsector->sector->floorheight)
-    {                           // don't splash if landing on the edge above water/lava/etc....
-        return (FLOOR_SOLID);
-    }
-
-    // Things that don't splash go here
-    switch (thing->type)
-    {
-        case MT_LEAF1:
-        case MT_LEAF2:
-//              case MT_BLOOD:                  // I set these to low mass -- pm
-//              case MT_BLOODSPLATTER:
-        case MT_SPLASH:
-        case MT_SLUDGECHUNK:
-            return (FLOOR_SOLID);
-        default:
-            break;
-    }
-
-    // Small splash for small masses
-    if (thing->info->mass < 10)
-        smallsplash = true;
-
-    switch (P_GetThingFloorType(thing))
-    {
-        case FLOOR_WATER:
-            if (smallsplash)
-            {
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASHBASE);
-                if (mo)
-                    mo->floorclip += SMALLSPLASHCLIP;
-                S_StartSound(mo, SFX_AMBIENT10);        // small drip
-            }
-            else
-            {
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASH);
-                mo->target = thing;
-                mo->momx = P_SubRandom() << 8;
-                mo->momy = P_SubRandom() << 8;
-                mo->momz = 2 * FRACUNIT + (P_Random() << 8);
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_SPLASHBASE);
-                if (thing->player)
-                    P_NoiseAlert(thing, thing);
-                S_StartSound(mo, SFX_WATER_SPLASH);
-            }
-            return (FLOOR_WATER);
-        case FLOOR_LAVA:
-            if (smallsplash)
-            {
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASPLASH);
-                if (mo)
-                    mo->floorclip += SMALLSPLASHCLIP;
-            }
-            else
-            {
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASMOKE);
-                mo->momz = FRACUNIT + (P_Random() << 7);
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ, MT_LAVASPLASH);
-                if (thing->player)
-                    P_NoiseAlert(thing, thing);
-            }
-            S_StartSound(mo, SFX_LAVA_SIZZLE);
-            if (thing->player && leveltime & 31)
-            {
-                P_DamageMobj(thing, &LavaInflictor, NULL, 5);
-            }
-            return (FLOOR_LAVA);
-        case FLOOR_SLUDGE:
-            if (smallsplash)
-            {
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ,
-                                 MT_SLUDGESPLASH);
-                if (mo)
-                    mo->floorclip += SMALLSPLASHCLIP;
-            }
-            else
-            {
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ,
-                                 MT_SLUDGECHUNK);
-                mo->target = thing;
-                mo->momx = P_SubRandom() << 8;
-                mo->momy = P_SubRandom() << 8;
-                mo->momz = FRACUNIT + (P_Random() << 8);
-                mo = P_SpawnMobj(thing->x, thing->y, ONFLOORZ,
-                                 MT_SLUDGESPLASH);
-                if (thing->player)
-                    P_NoiseAlert(thing, thing);
-            }
-            S_StartSound(mo, SFX_SLUDGE_GLOOP);
-            return (FLOOR_SLUDGE);
-    }
-    return (FLOOR_SOLID);
-}
-
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_CheckMissileSpawn
-//
-// Returns true if the missile is at a valid spawn point, otherwise
-// explodes it and returns false.
-//
-//---------------------------------------------------------------------------
-
-boolean P_CheckMissileSpawn(mobj_t * missile)
-{
-    //missile->tics -= P_Random()&3;
-
-    // move a little forward so an angle can be computed if it
-    // immediately explodes
-    missile->x += (missile->momx >> 1);
-    missile->y += (missile->momy >> 1);
-    missile->z += (missile->momz >> 1);
-    if (!P_TryMove(missile, missile->x, missile->y))
-    {
-        P_ExplodeMissile(missile);
-        return (false);
-    }
-    return (true);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_SpawnMissile
-//
-// Returns NULL if the missile exploded immediately, otherwise returns
-// a mobj_t pointer to the missile.
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SpawnMissile(mobj_t * source, mobj_t * dest, mobjtype_t type)
-{
-    fixed_t z;
-    mobj_t *th;
-    angle_t an;
-    int dist;
-
-    switch (type)
-    {
-        case MT_MNTRFX1:       // Minotaur swing attack missile
-            z = source->z + 40 * FRACUNIT;
-            break;
-        case MT_MNTRFX2:       // Minotaur floor fire missile
-            z = ONFLOORZ + source->floorclip;
-            break;
-        case MT_CENTAUR_FX:
-            z = source->z + 45 * FRACUNIT;
-            break;
-        case MT_ICEGUY_FX:
-            z = source->z + 40 * FRACUNIT;
-            break;
-        case MT_HOLY_MISSILE:
-            z = source->z + 40 * FRACUNIT;
-            break;
-        default:
-            z = source->z + 32 * FRACUNIT;
-            break;
-    }
-    z -= source->floorclip;
-    th = P_SpawnMobj(source->x, source->y, z, type);
-    if (th->info->seesound)
-    {
-        S_StartSound(th, th->info->seesound);
-    }
-    th->target = source;        // Originator
-    an = R_PointToAngle2(source->x, source->y, dest->x, dest->y);
-    if (dest->flags & MF_SHADOW)
-    {                           // Invisible target
-        an += P_SubRandom() << 21;
-    }
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul(th->info->speed, finecosine[an]);
-    th->momy = FixedMul(th->info->speed, finesine[an]);
-    dist = P_AproxDistance(dest->x - source->x, dest->y - source->y);
-    dist = dist / th->info->speed;
-    if (dist < 1)
-    {
-        dist = 1;
-    }
-    th->momz = (dest->z - source->z) / dist;
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_SpawnMissileXYZ
-//
-// Returns NULL if the missile exploded immediately, otherwise returns
-// a mobj_t pointer to the missile.
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SpawnMissileXYZ(fixed_t x, fixed_t y, fixed_t z,
-                          mobj_t * source, mobj_t * dest, mobjtype_t type)
-{
-    mobj_t *th;
-    angle_t an;
-    int dist;
-
-    z -= source->floorclip;
-    th = P_SpawnMobj(x, y, z, type);
-    if (th->info->seesound)
-    {
-        S_StartSound(th, th->info->seesound);
-    }
-    th->target = source;        // Originator
-    an = R_PointToAngle2(source->x, source->y, dest->x, dest->y);
-    if (dest->flags & MF_SHADOW)
-    {                           // Invisible target
-        an += P_SubRandom() << 21;
-    }
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul(th->info->speed, finecosine[an]);
-    th->momy = FixedMul(th->info->speed, finesine[an]);
-    dist = P_AproxDistance(dest->x - source->x, dest->y - source->y);
-    dist = dist / th->info->speed;
-    if (dist < 1)
-    {
-        dist = 1;
-    }
-    th->momz = (dest->z - source->z) / dist;
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_SpawnMissileAngle
-//
-// Returns NULL if the missile exploded immediately, otherwise returns
-// a mobj_t pointer to the missile.
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SpawnMissileAngle(mobj_t * source, mobjtype_t type,
-                            angle_t angle, fixed_t momz)
-{
-    fixed_t z;
-    mobj_t *mo;
-
-    switch (type)
-    {
-        case MT_MNTRFX1:       // Minotaur swing attack missile
-            z = source->z + 40 * FRACUNIT;
-            break;
-        case MT_MNTRFX2:       // Minotaur floor fire missile
-            z = ONFLOORZ + source->floorclip;
-            break;
-        case MT_ICEGUY_FX2:    // Secondary Projectiles of the Ice Guy
-            z = source->z + 3 * FRACUNIT;
-            break;
-        case MT_MSTAFF_FX2:
-            z = source->z + 40 * FRACUNIT;
-            break;
-        default:
-            z = source->z + 32 * FRACUNIT;
-            break;
-    }
-    z -= source->floorclip;
-    mo = P_SpawnMobj(source->x, source->y, z, type);
-    if (mo->info->seesound)
-    {
-        S_StartSound(mo, mo->info->seesound);
-    }
-    mo->target = source;        // Originator
-    mo->angle = angle;
-    angle >>= ANGLETOFINESHIFT;
-    mo->momx = FixedMul(mo->info->speed, finecosine[angle]);
-    mo->momy = FixedMul(mo->info->speed, finesine[angle]);
-    mo->momz = momz;
-    return (P_CheckMissileSpawn(mo) ? mo : NULL);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_SpawnMissileAngleSpeed
-//
-// Returns NULL if the missile exploded immediately, otherwise returns
-// a mobj_t pointer to the missile.
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SpawnMissileAngleSpeed(mobj_t * source, mobjtype_t type,
-                                 angle_t angle, fixed_t momz, fixed_t speed)
-{
-    fixed_t z;
-    mobj_t *mo;
-
-    z = source->z;
-    z -= source->floorclip;
-    mo = P_SpawnMobj(source->x, source->y, z, type);
-    if (mo->info->seesound)
-    {
-        //S_StartSound(mo, mo->info->seesound);
-    }
-    mo->target = source;        // Originator
-    mo->angle = angle;
-    angle >>= ANGLETOFINESHIFT;
-    mo->momx = FixedMul(speed, finecosine[angle]);
-    mo->momy = FixedMul(speed, finesine[angle]);
-    mo->momz = momz;
-    return (P_CheckMissileSpawn(mo) ? mo : NULL);
-}
-
-
-
-/*
-================
-=
-= P_SpawnPlayerMissile
-=
-= Tries to aim at a nearby monster
-================
-*/
-
-mobj_t *P_SpawnPlayerMissile(mobj_t * source, mobjtype_t type)
-{
-    angle_t an;
-    fixed_t x, y, z, slope;
-
-    // Try to find a target
-    an = source->angle;
-    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-    if (!linetarget)
-    {
-        an += 1 << 26;
-        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2 << 26;
-            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        }
-        if (!linetarget)
-        {
-            an = source->angle;
-            slope = ((source->player->lookdir) << FRACBITS) / 173;
-        }
-    }
-    x = source->x;
-    y = source->y;
-    if (type == MT_LIGHTNING_FLOOR)
-    {
-        z = ONFLOORZ;
-        slope = 0;
-    }
-    else if (type == MT_LIGHTNING_CEILING)
-    {
-        z = ONCEILINGZ;
-        slope = 0;
-    }
-    else
-    {
-        z = source->z + 4 * 8 * FRACUNIT +
-            ((source->player->lookdir) << FRACBITS) / 173;
-        z -= source->floorclip;
-    }
-    MissileMobj = P_SpawnMobj(x, y, z, type);
-    if (MissileMobj->info->seesound)
-    {
-        //S_StartSound(MissileMobj, MissileMobj->info->seesound);
-    }
-    MissileMobj->target = source;
-    MissileMobj->angle = an;
-    MissileMobj->momx = FixedMul(MissileMobj->info->speed,
-                                 finecosine[an >> ANGLETOFINESHIFT]);
-    MissileMobj->momy = FixedMul(MissileMobj->info->speed,
-                                 finesine[an >> ANGLETOFINESHIFT]);
-    MissileMobj->momz = FixedMul(MissileMobj->info->speed, slope);
-    if (MissileMobj->type == MT_MWAND_MISSILE
-        || MissileMobj->type == MT_CFLAME_MISSILE)
-    {                           // Ultra-fast ripper spawning missile
-        MissileMobj->x += (MissileMobj->momx >> 3);
-        MissileMobj->y += (MissileMobj->momy >> 3);
-        MissileMobj->z += (MissileMobj->momz >> 3);
-    }
-    else
-    {                           // Normal missile
-        MissileMobj->x += (MissileMobj->momx >> 1);
-        MissileMobj->y += (MissileMobj->momy >> 1);
-        MissileMobj->z += (MissileMobj->momz >> 1);
-    }
-    if (!P_TryMove(MissileMobj, MissileMobj->x, MissileMobj->y))
-    {                           // Exploded immediately
-        P_ExplodeMissile(MissileMobj);
-        return (NULL);
-    }
-    return (MissileMobj);
-}
-
-
-//----------------------------------------------------------------------------
-//
-// P_SpawnPlayerMinotaur - 
-//
-//      Special missile that has larger blocking than player
-//----------------------------------------------------------------------------
-
-/*
-mobj_t *P_SpawnPlayerMinotaur(mobj_t *source, mobjtype_t type)
-{
-	angle_t an;
-	fixed_t x, y, z;
-	fixed_t dist=0 *FRACUNIT;
-
-	an = source->angle;
-	x = source->x + FixedMul(dist, finecosine[an>>ANGLETOFINESHIFT]);
-	y = source->y + FixedMul(dist, finesine[an>>ANGLETOFINESHIFT]);
-	z = source->z + 4*8*FRACUNIT+((source->player->lookdir)<<FRACBITS)/173;
-	z -= source->floorclip;
-	MissileMobj = P_SpawnMobj(x, y, z, type);
-	if(MissileMobj->info->seesound)
-	{
-		//S_StartSound(MissileMobj, MissileMobj->info->seesound);
-	}
-	MissileMobj->target = source;
-	MissileMobj->angle = an;
-	MissileMobj->momx = FixedMul(MissileMobj->info->speed,
-		finecosine[an>>ANGLETOFINESHIFT]);
-	MissileMobj->momy = FixedMul(MissileMobj->info->speed,
-		finesine[an>>ANGLETOFINESHIFT]);
-	MissileMobj->momz = 0;
-
-//	MissileMobj->x += (MissileMobj->momx>>3);
-//	MissileMobj->y += (MissileMobj->momy>>3);
-//	MissileMobj->z += (MissileMobj->momz>>3);
-
-	if(!P_TryMove(MissileMobj, MissileMobj->x, MissileMobj->y))
-	{ // Wouln't fit
-
-		return(NULL);
-	}
-	return(MissileMobj);
-}
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SPMAngle
-//
-//---------------------------------------------------------------------------
-
-mobj_t *P_SPMAngle(mobj_t * source, mobjtype_t type, angle_t angle)
-{
-    mobj_t *th;
-    angle_t an;
-    fixed_t x, y, z, slope;
-
-//
-// see which target is to be aimed at
-//
-    an = angle;
-    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-    if (!linetarget)
-    {
-        an += 1 << 26;
-        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2 << 26;
-            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        }
-        if (!linetarget)
-        {
-            an = angle;
-            slope = ((source->player->lookdir) << FRACBITS) / 173;
-        }
-    }
-    x = source->x;
-    y = source->y;
-    z = source->z + 4 * 8 * FRACUNIT +
-        ((source->player->lookdir) << FRACBITS) / 173;
-    z -= source->floorclip;
-    th = P_SpawnMobj(x, y, z, type);
-//      if(th->info->seesound)
-//      {
-//              S_StartSound(th, th->info->seesound);
-//      }
-    th->target = source;
-    th->angle = an;
-    th->momx = FixedMul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
-    th->momy = FixedMul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
-    th->momz = FixedMul(th->info->speed, slope);
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
-
-//===========================================================================
-//
-// P_SPMAngleXYZ
-//
-//===========================================================================
-
-mobj_t *P_SPMAngleXYZ(mobj_t * source, fixed_t x, fixed_t y,
-                      fixed_t z, mobjtype_t type, angle_t angle)
-{
-    mobj_t *th;
-    angle_t an;
-    fixed_t slope;
-
-//
-// see which target is to be aimed at
-//
-    an = angle;
-    slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-    if (!linetarget)
-    {
-        an += 1 << 26;
-        slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2 << 26;
-            slope = P_AimLineAttack(source, an, 16 * 64 * FRACUNIT);
-        }
-        if (!linetarget)
-        {
-            an = angle;
-            slope = ((source->player->lookdir) << FRACBITS) / 173;
-        }
-    }
-    z += 4 * 8 * FRACUNIT + ((source->player->lookdir) << FRACBITS) / 173;
-    z -= source->floorclip;
-    th = P_SpawnMobj(x, y, z, type);
-//      if(th->info->seesound)
-//      {
-//              S_StartSound(th, th->info->seesound);
-//      }
-    th->target = source;
-    th->angle = an;
-    th->momx = FixedMul(th->info->speed, finecosine[an >> ANGLETOFINESHIFT]);
-    th->momy = FixedMul(th->info->speed, finesine[an >> ANGLETOFINESHIFT]);
-    th->momz = FixedMul(th->info->speed, slope);
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
-
-mobj_t *P_SpawnKoraxMissile(fixed_t x, fixed_t y, fixed_t z,
-                            mobj_t * source, mobj_t * dest, mobjtype_t type)
-{
-    mobj_t *th;
-    angle_t an;
-    int dist;
-
-    z -= source->floorclip;
-    th = P_SpawnMobj(x, y, z, type);
-    if (th->info->seesound)
-    {
-        S_StartSound(th, th->info->seesound);
-    }
-    th->target = source;        // Originator
-    an = R_PointToAngle2(x, y, dest->x, dest->y);
-    if (dest->flags & MF_SHADOW)
-    {                           // Invisible target
-        an += P_SubRandom() << 21;
-    }
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul(th->info->speed, finecosine[an]);
-    th->momy = FixedMul(th->info->speed, finesine[an]);
-    dist = P_AproxDistance(dest->x - x, dest->y - y);
-    dist = dist / th->info->speed;
-    if (dist < 1)
-    {
-        dist = 1;
-    }
-    th->momz = (dest->z - z + (30 * FRACUNIT)) / dist;
-    return (P_CheckMissileSpawn(th) ? th : NULL);
-}
diff --git a/games/NXDoom/src/hexen/p_plats.c b/games/NXDoom/src/hexen/p_plats.c
deleted file mode 100644
index 8c91b3575..000000000
--- a/games/NXDoom/src/hexen/p_plats.c
+++ /dev/null
@@ -1,277 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "p_local.h"
-
-plat_t *activeplats[MAXPLATS];
-
-//==================================================================
-//
-//      Move a plat up and down
-//
-//==================================================================
-void T_PlatRaise(thinker_t *thinker)
-{
-    plat_t *plat = (plat_t *) thinker;
-    result_e res;
-
-    switch (plat->status)
-    {
-        case PLAT_UP:
-            res = T_MovePlane(plat->sector, plat->speed,
-                              plat->high, plat->crush, 0, 1);
-            if (res == RES_CRUSHED && (!plat->crush))
-            {
-                plat->count = plat->wait;
-                plat->status = PLAT_DOWN;
-                SN_StartSequence((mobj_t *) & plat->sector->soundorg,
-                                 SEQ_PLATFORM + plat->sector->seqType);
-            }
-            else if (res == RES_PASTDEST)
-            {
-                plat->count = plat->wait;
-                plat->status = PLAT_WAITING;
-                SN_StopSequence((mobj_t *) & plat->sector->soundorg);
-                switch (plat->type)
-                {
-                    case PLAT_DOWNWAITUPSTAY:
-                    case PLAT_DOWNBYVALUEWAITUPSTAY:
-                        P_RemoveActivePlat(plat);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-        case PLAT_DOWN:
-            res =
-                T_MovePlane(plat->sector, plat->speed, plat->low, false, 0,
-                            -1);
-            if (res == RES_PASTDEST)
-            {
-                plat->count = plat->wait;
-                plat->status = PLAT_WAITING;
-                switch (plat->type)
-                {
-                    case PLAT_UPWAITDOWNSTAY:
-                    case PLAT_UPBYVALUEWAITDOWNSTAY:
-                        P_RemoveActivePlat(plat);
-                        break;
-                    default:
-                        break;
-                }
-                SN_StopSequence((mobj_t *) & plat->sector->soundorg);
-            }
-            break;
-        case PLAT_WAITING:
-            if (!--plat->count)
-            {
-                if (plat->sector->floorheight == plat->low)
-                    plat->status = PLAT_UP;
-                else
-                    plat->status = PLAT_DOWN;
-                SN_StartSequence((mobj_t *) & plat->sector->soundorg,
-                                 SEQ_PLATFORM + plat->sector->seqType);
-            }
-//              case PLAT_IN_STASIS:
-//                      break;
-    }
-}
-
-//==================================================================
-//
-//      Do Platforms
-//      "amount" is only used for SOME platforms.
-//
-//==================================================================
-int EV_DoPlat(line_t * line, byte * args, plattype_e type, int amount)
-{
-    plat_t *plat;
-    int secnum;
-    int rtn;
-    sector_t *sec;
-
-    secnum = -1;
-    rtn = 0;
-
-/*
-	//
-	//      Activate all <type> plats that are in_stasis
-	//
-	switch(type)
-	{
-		case PLAT_PERPETUALRAISE:
-			P_ActivateInStasis(args[0]);
-			break;
-		default:
-			break;
-	}
-*/
-
-    while ((secnum = P_FindSectorFromTag(args[0], secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        //
-        // Find lowest & highest floors around sector
-        //
-        rtn = 1;
-        plat = Z_Malloc(sizeof(*plat), PU_LEVSPEC, 0);
-        P_AddThinker(&plat->thinker);
-
-        plat->type = type;
-        plat->sector = sec;
-        plat->sector->specialdata = plat;
-        plat->thinker.function = T_PlatRaise;
-        plat->crush = false;
-        plat->tag = args[0];
-        plat->speed = args[1] * (FRACUNIT / 8);
-        switch (type)
-        {
-            case PLAT_DOWNWAITUPSTAY:
-                plat->low = P_FindLowestFloorSurrounding(sec) + 8 * FRACUNIT;
-                if (plat->low > sec->floorheight)
-                    plat->low = sec->floorheight;
-                plat->high = sec->floorheight;
-                plat->wait = args[2];
-                plat->status = PLAT_DOWN;
-                break;
-            case PLAT_DOWNBYVALUEWAITUPSTAY:
-                plat->low = sec->floorheight - args[3] * 8 * FRACUNIT;
-                if (plat->low > sec->floorheight)
-                    plat->low = sec->floorheight;
-                plat->high = sec->floorheight;
-                plat->wait = args[2];
-                plat->status = PLAT_DOWN;
-                break;
-            case PLAT_UPWAITDOWNSTAY:
-                plat->high = P_FindHighestFloorSurrounding(sec);
-                if (plat->high < sec->floorheight)
-                    plat->high = sec->floorheight;
-                plat->low = sec->floorheight;
-                plat->wait = args[2];
-                plat->status = PLAT_UP;
-                break;
-            case PLAT_UPBYVALUEWAITDOWNSTAY:
-                plat->high = sec->floorheight + args[3] * 8 * FRACUNIT;
-                if (plat->high < sec->floorheight)
-                    plat->high = sec->floorheight;
-                plat->low = sec->floorheight;
-                plat->wait = args[2];
-                plat->status = PLAT_UP;
-                break;
-            case PLAT_PERPETUALRAISE:
-                plat->low = P_FindLowestFloorSurrounding(sec) + 8 * FRACUNIT;
-                if (plat->low > sec->floorheight)
-                    plat->low = sec->floorheight;
-                plat->high = P_FindHighestFloorSurrounding(sec);
-                if (plat->high < sec->floorheight)
-                    plat->high = sec->floorheight;
-                plat->wait = args[2];
-                plat->status = P_Random() & 1;
-                break;
-        }
-        P_AddActivePlat(plat);
-        SN_StartSequence((mobj_t *) & sec->soundorg,
-                         SEQ_PLATFORM + sec->seqType);
-    }
-    return rtn;
-}
-
-#if 0
-void P_ActivateInStasis(int tag)
-{
-    int i;
-
-    for (i = 0; i < MAXPLATS; i++)
-        if (activeplats[i] &&
-            (activeplats[i])->tag == tag &&
-            (activeplats[i])->status == PLAT_IN_STASIS)
-        {
-            (activeplats[i])->status = (activeplats[i])->oldstatus;
-            (activeplats[i])->thinker.function = T_PlatRaise;
-        }
-}
-#endif
-
-void EV_StopPlat(line_t * line, byte * args)
-{
-    int i;
-
-    for (i = 0; i < MAXPLATS; i++)
-    {
-        activeplats[i]->tag = args[0];
-
-        if (activeplats[i]->tag != 0)
-        {
-            activeplats[i]->sector->specialdata = NULL;
-            P_TagFinished(activeplats[i]->sector->tag);
-            P_RemoveThinker(&activeplats[i]->thinker);
-            activeplats[i] = NULL;
-
-            return;
-        }
-    }
-
-/*
-	int             j;
-
-	for (j = 0;j < MAXPLATS;j++)
-	{
-		if (activeplats[j] && ((activeplats[j])->status != PLAT_IN_STASIS) &&
-			((activeplats[j])->tag == args[0]))
-		{
-			(activeplats[j])->oldstatus = (activeplats[j])->status;
-			(activeplats[j])->status = PLAT_IN_STASIS;
-			(activeplats[j])->thinker.function = NULL;
-			SN_StopSequence((mobj_t *)&(activeplats[j])->sector->soundorg);
-		}
-	}
-*/
-}
-
-void P_AddActivePlat(plat_t * plat)
-{
-    int i;
-    for (i = 0; i < MAXPLATS; i++)
-        if (activeplats[i] == NULL)
-        {
-            activeplats[i] = plat;
-            return;
-        }
-    I_Error("P_AddActivePlat: no more plats!");
-}
-
-void P_RemoveActivePlat(plat_t * plat)
-{
-    int i;
-    for (i = 0; i < MAXPLATS; i++)
-        if (plat == activeplats[i])
-        {
-            (activeplats[i])->sector->specialdata = NULL;
-            P_TagFinished(plat->sector->tag);
-            P_RemoveThinker(&(activeplats[i])->thinker);
-            activeplats[i] = NULL;
-            return;
-        }
-    I_Error("P_RemoveActivePlat: can't find plat!");
-}
diff --git a/games/NXDoom/src/hexen/p_pspr.c b/games/NXDoom/src/hexen/p_pspr.c
deleted file mode 100644
index 230841344..000000000
--- a/games/NXDoom/src/hexen/p_pspr.c
+++ /dev/null
@@ -1,2476 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define LOWERSPEED FRACUNIT*6
-#define RAISESPEED FRACUNIT*6
-#define WEAPONBOTTOM 128*FRACUNIT
-#define WEAPONTOP 32*FRACUNIT
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-fixed_t bulletslope;
-
-weaponinfo_t WeaponInfo[NUMWEAPONS][NUMCLASSES] = {
-    {                           // First Weapons
-     {                          // Fighter First Weapon - Punch
-      MANA_NONE,                // mana
-      S_PUNCHUP,                // upstate
-      S_PUNCHDOWN,              // downstate
-      S_PUNCHREADY,             // readystate
-      S_PUNCHATK1_1,            // atkstate
-      S_PUNCHATK1_1,            // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Cleric First Weapon - Mace
-      MANA_NONE,                // mana
-      S_CMACEUP,                // upstate
-      S_CMACEDOWN,              // downstate
-      S_CMACEREADY,             // readystate
-      S_CMACEATK_1,             // atkstate
-      S_CMACEATK_1,             // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Mage First Weapon - Wand
-      MANA_NONE,
-      S_MWANDUP,
-      S_MWANDDOWN,
-      S_MWANDREADY,
-      S_MWANDATK_1,
-      S_MWANDATK_1,
-      S_NULL},
-     {                          // Pig - Snout
-      MANA_NONE,                // mana
-      S_SNOUTUP,                // upstate
-      S_SNOUTDOWN,              // downstate
-      S_SNOUTREADY,             // readystate
-      S_SNOUTATK1,              // atkstate
-      S_SNOUTATK1,              // holdatkstate
-      S_NULL                    // flashstate
-      }
-     },
-    {                           // Second Weapons
-     {                          // Fighter - Axe
-      MANA_NONE,                // mana
-      S_FAXEUP,                 // upstate
-      S_FAXEDOWN,               // downstate
-      S_FAXEREADY,              // readystate
-      S_FAXEATK_1,              // atkstate
-      S_FAXEATK_1,              // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Cleric - Serpent Staff
-      MANA_1,                   // mana
-      S_CSTAFFUP,               // upstate
-      S_CSTAFFDOWN,             // downstate
-      S_CSTAFFREADY,            // readystate
-      S_CSTAFFATK_1,            // atkstate
-      S_CSTAFFATK_1,            // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Mage - Cone of shards
-      MANA_1,                   // mana
-      S_CONEUP,                 // upstate
-      S_CONEDOWN,               // downstate
-      S_CONEREADY,              // readystate
-      S_CONEATK1_1,             // atkstate
-      S_CONEATK1_3,             // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Pig - Snout
-      MANA_NONE,                // mana
-      S_SNOUTUP,                // upstate
-      S_SNOUTDOWN,              // downstate
-      S_SNOUTREADY,             // readystate
-      S_SNOUTATK1,              // atkstate
-      S_SNOUTATK1,              // holdatkstate
-      S_NULL                    // flashstate
-      }
-     },
-    {                           // Third Weapons
-     {                          // Fighter - Hammer
-      MANA_NONE,                // mana
-      S_FHAMMERUP,              // upstate
-      S_FHAMMERDOWN,            // downstate
-      S_FHAMMERREADY,           // readystate
-      S_FHAMMERATK_1,           // atkstate
-      S_FHAMMERATK_1,           // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Cleric - Flame Strike
-      MANA_2,                   // mana
-      S_CFLAMEUP,               // upstate
-      S_CFLAMEDOWN,             // downstate
-      S_CFLAMEREADY1,           // readystate
-      S_CFLAMEATK_1,            // atkstate
-      S_CFLAMEATK_1,            // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Mage - Lightning
-      MANA_2,                   // mana
-      S_MLIGHTNINGUP,           // upstate
-      S_MLIGHTNINGDOWN,         // downstate
-      S_MLIGHTNINGREADY,        // readystate
-      S_MLIGHTNINGATK_1,        // atkstate
-      S_MLIGHTNINGATK_1,        // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Pig - Snout
-      MANA_NONE,                // mana
-      S_SNOUTUP,                // upstate
-      S_SNOUTDOWN,              // downstate
-      S_SNOUTREADY,             // readystate
-      S_SNOUTATK1,              // atkstate
-      S_SNOUTATK1,              // holdatkstate
-      S_NULL                    // flashstate
-      }
-     },
-    {                           // Fourth Weapons
-     {                          // Fighter - Rune Sword
-      MANA_BOTH,                // mana
-      S_FSWORDUP,               // upstate
-      S_FSWORDDOWN,             // downstate
-      S_FSWORDREADY,            // readystate
-      S_FSWORDATK_1,            // atkstate
-      S_FSWORDATK_1,            // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Cleric - Holy Symbol
-      MANA_BOTH,                // mana
-      S_CHOLYUP,                // upstate
-      S_CHOLYDOWN,              // downstate
-      S_CHOLYREADY,             // readystate
-      S_CHOLYATK_1,             // atkstate
-      S_CHOLYATK_1,             // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Mage - Staff
-      MANA_BOTH,                // mana
-      S_MSTAFFUP,               // upstate
-      S_MSTAFFDOWN,             // downstate
-      S_MSTAFFREADY,            // readystate
-      S_MSTAFFATK_1,            // atkstate
-      S_MSTAFFATK_1,            // holdatkstate
-      S_NULL                    // flashstate
-      },
-     {                          // Pig - Snout
-      MANA_NONE,                // mana
-      S_SNOUTUP,                // upstate
-      S_SNOUTDOWN,              // downstate
-      S_SNOUTREADY,             // readystate
-      S_SNOUTATK1,              // atkstate
-      S_SNOUTATK1,              // holdatkstate
-      S_NULL                    // flashstate
-      }
-     }
-};
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int WeaponManaUse[NUMCLASSES][NUMWEAPONS] = {
-    {0, 2, 3, 14},
-    {0, 1, 4, 18},
-    {0, 3, 5, 15},
-    {0, 0, 0, 0}
-};
-
-// CODE --------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SetPsprite
-//
-//---------------------------------------------------------------------------
-
-void P_SetPsprite(player_t * player, int position, statenum_t stnum)
-{
-    pspdef_t *psp;
-    state_t *state;
-
-    psp = &player->psprites[position];
-    do
-    {
-        if (!stnum)
-        {                       // Object removed itself.
-            psp->state = NULL;
-            break;
-        }
-        state = &states[stnum];
-        psp->state = state;
-        psp->tics = state->tics;        // could be 0
-        if (state->misc1)
-        {                       // Set coordinates.
-            psp->sx = state->misc1 << FRACBITS;
-        }
-        if (state->misc2)
-        {
-            psp->sy = state->misc2 << FRACBITS;
-        }
-        if (state->action)
-        {                       // Call action routine.
-            state->action(NULL, player, psp);
-            if (!psp->state)
-            {
-                break;
-            }
-        }
-        stnum = psp->state->nextstate;
-    }
-    while (!psp->tics);         // An initial state of 0 could cycle through.
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_SetPspriteNF
-//
-// Identical to P_SetPsprite, without calling the action function
-//---------------------------------------------------------------------------
-
-void P_SetPspriteNF(player_t * player, int position, statenum_t stnum)
-{
-    pspdef_t *psp;
-    state_t *state;
-
-    psp = &player->psprites[position];
-    do
-    {
-        if (!stnum)
-        {                       // Object removed itself.
-            psp->state = NULL;
-            break;
-        }
-        state = &states[stnum];
-        psp->state = state;
-        psp->tics = state->tics;        // could be 0
-        if (state->misc1)
-        {                       // Set coordinates.
-            psp->sx = state->misc1 << FRACBITS;
-        }
-        if (state->misc2)
-        {
-            psp->sy = state->misc2 << FRACBITS;
-        }
-        stnum = psp->state->nextstate;
-    }
-    while (!psp->tics);         // An initial state of 0 could cycle through.
-}
-
-/*
-=================
-=
-= P_CalcSwing
-=
-=================
-*/
-
-/*
-fixed_t	swingx, swingy;
-void P_CalcSwing (player_t *player)
-{
-	fixed_t	swing;
-	int		angle;
-
-// OPTIMIZE: tablify this
-
-	swing = player->bob;
-
-	angle = (FINEANGLES/70*leveltime)&FINEMASK;
-	swingx = FixedMul ( swing, finesine[angle]);
-
-	angle = (FINEANGLES/70*leveltime+FINEANGLES/2)&FINEMASK;
-	swingy = -FixedMul ( swingx, finesine[angle]);
-}
-*/
-
-//---------------------------------------------------------------------------
-//
-// PROC P_ActivateMorphWeapon
-//
-//---------------------------------------------------------------------------
-
-void P_ActivateMorphWeapon(player_t * player)
-{
-    player->pendingweapon = WP_NOCHANGE;
-    player->psprites[ps_weapon].sy = WEAPONTOP;
-    player->readyweapon = WP_FIRST;     // Snout is the first weapon
-    P_SetPsprite(player, ps_weapon, S_SNOUTREADY);
-}
-
-
-//---------------------------------------------------------------------------
-//
-// PROC P_PostMorphWeapon
-//
-//---------------------------------------------------------------------------
-
-void P_PostMorphWeapon(player_t * player, weapontype_t weapon)
-{
-    player->pendingweapon = WP_NOCHANGE;
-    player->readyweapon = weapon;
-    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
-    P_SetPsprite(player, ps_weapon,
-                 WeaponInfo[weapon][player->class].upstate);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_BringUpWeapon
-//
-// Starts bringing the pending weapon up from the bottom of the screen.
-//
-//---------------------------------------------------------------------------
-
-void P_BringUpWeapon(player_t * player)
-{
-    statenum_t new;
-
-    if (player->pendingweapon == WP_NOCHANGE)
-    {
-        player->pendingweapon = player->readyweapon;
-    }
-    if (player->class == PCLASS_FIGHTER && player->pendingweapon == WP_SECOND
-        && player->mana[MANA_1])
-    {
-        new = S_FAXEUP_G;
-    }
-    else
-    {
-        new = WeaponInfo[player->pendingweapon][player->class].upstate;
-    }
-    player->pendingweapon = WP_NOCHANGE;
-    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
-    P_SetPsprite(player, ps_weapon, new);
-}
-
-//---------------------------------------------------------------------------
-//
-// FUNC P_CheckMana
-//
-// Returns true if there is enough mana to shoot.  If not, selects the
-// next weapon to use.
-//
-//---------------------------------------------------------------------------
-
-boolean P_CheckMana(player_t * player)
-{
-    manatype_t mana;
-    int count;
-
-    mana = WeaponInfo[player->readyweapon][player->class].mana;
-    count = WeaponManaUse[player->class][player->readyweapon];
-    if (mana == MANA_BOTH)
-    {
-        if (player->mana[MANA_1] >= count && player->mana[MANA_2] >= count)
-        {
-            return true;
-        }
-    }
-    else if (mana == MANA_NONE || player->mana[mana] >= count)
-    {
-        return (true);
-    }
-    // out of mana, pick a weapon to change to
-    do
-    {
-        if (player->weaponowned[WP_THIRD]
-            && player->mana[MANA_2] >= WeaponManaUse[player->class][WP_THIRD])
-        {
-            player->pendingweapon = WP_THIRD;
-        }
-        else if (player->weaponowned[WP_SECOND]
-                 && player->mana[MANA_1] >=
-                 WeaponManaUse[player->class][WP_SECOND])
-        {
-            player->pendingweapon = WP_SECOND;
-        }
-        else if (player->weaponowned[WP_FOURTH]
-                 && player->mana[MANA_1] >=
-                 WeaponManaUse[player->class][WP_FOURTH]
-                 && player->mana[MANA_2] >=
-                 WeaponManaUse[player->class][WP_FOURTH])
-        {
-            player->pendingweapon = WP_FOURTH;
-        }
-        else
-        {
-            player->pendingweapon = WP_FIRST;
-        }
-    }
-    while (player->pendingweapon == WP_NOCHANGE);
-    P_SetPsprite(player, ps_weapon,
-                 WeaponInfo[player->readyweapon][player->class].downstate);
-    return (false);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_FireWeapon
-//
-//---------------------------------------------------------------------------
-
-void P_FireWeapon(player_t * player)
-{
-    statenum_t attackState;
-
-    if (!P_CheckMana(player))
-    {
-        return;
-    }
-    P_SetMobjState(player->mo, PStateAttack[player->class]);    // S_PLAY_ATK1);
-    if (player->class == PCLASS_FIGHTER && player->readyweapon == WP_SECOND
-        && player->mana[MANA_1] > 0)
-    {                           // Glowing axe
-        attackState = S_FAXEATK_G1;
-    }
-    else
-    {
-        attackState = player->refire ?
-            WeaponInfo[player->readyweapon][player->class].holdatkstate
-            : WeaponInfo[player->readyweapon][player->class].atkstate;
-    }
-    P_SetPsprite(player, ps_weapon, attackState);
-    P_NoiseAlert(player->mo, player->mo);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC P_DropWeapon
-//
-// The player died, so put the weapon away.
-//
-//---------------------------------------------------------------------------
-
-void P_DropWeapon(player_t * player)
-{
-    P_SetPsprite(player, ps_weapon,
-                 WeaponInfo[player->readyweapon][player->class].downstate);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_WeaponReady
-//
-// The player can fire the weapon or change to another weapon at this time.
-//
-//---------------------------------------------------------------------------
-
-void A_WeaponReady(mobj_t *obj, player_t *player, pspdef_t *psp)
-{
-    int angle;
-
-    // Change player from attack state
-    if (player->mo->state >= &states[PStateAttack[player->class]]
-        && player->mo->state <= &states[PStateAttackEnd[player->class]])
-    {
-        P_SetMobjState(player->mo, PStateNormal[player->class]);
-    }
-    // Put the weapon away if the player has a pending weapon or has
-    // died.
-    if (player->pendingweapon != WP_NOCHANGE || !player->health)
-    {
-        P_SetPsprite(player, ps_weapon,
-                     WeaponInfo[player->readyweapon][player->class].
-                     downstate);
-        return;
-    }
-
-    // Check for fire. 
-    if (player->cmd.buttons & BT_ATTACK)
-    {
-        player->attackdown = true;
-        P_FireWeapon(player);
-        return;
-    }
-    else
-    {
-        player->attackdown = false;
-    }
-
-    if (!player->morphTics)
-    {
-        // Bob the weapon based on movement speed.
-        angle = (128 * leveltime) & FINEMASK;
-        psp->sx = FRACUNIT + FixedMul(player->bob, finecosine[angle]);
-        angle &= FINEANGLES / 2 - 1;
-        psp->sy = WEAPONTOP + FixedMul(player->bob, finesine[angle]);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_ReFire
-//
-// The player can re fire the weapon without lowering it entirely.
-//
-//---------------------------------------------------------------------------
-
-void A_ReFire(mobj_t *mobj, player_t *player, pspdef_t *psp)
-{
-    if ((player->cmd.buttons & BT_ATTACK)
-        && player->pendingweapon == WP_NOCHANGE && player->health)
-    {
-        player->refire++;
-        P_FireWeapon(player);
-    }
-    else
-    {
-        player->refire = 0;
-        P_CheckMana(player);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_Lower
-//
-//---------------------------------------------------------------------------
-
-void A_Lower(mobj_t *mobj, player_t *player, pspdef_t *psp)
-{
-    if (player->morphTics)
-    {
-        psp->sy = WEAPONBOTTOM;
-    }
-    else
-    {
-        psp->sy += LOWERSPEED;
-    }
-    if (psp->sy < WEAPONBOTTOM)
-    {                           // Not lowered all the way yet
-        return;
-    }
-    if (player->playerstate == PST_DEAD)
-    {                           // Player is dead, so don't bring up a pending weapon
-        psp->sy = WEAPONBOTTOM;
-        return;
-    }
-    if (!player->health)
-    {                           // Player is dead, so keep the weapon off screen
-        P_SetPsprite(player, ps_weapon, S_NULL);
-        return;
-    }
-    player->readyweapon = player->pendingweapon;
-    P_BringUpWeapon(player);
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC A_Raise
-//
-//---------------------------------------------------------------------------
-
-void A_Raise(mobj_t *mobj, player_t *player, pspdef_t *psp)
-{
-    psp->sy -= RAISESPEED;
-    if (psp->sy > WEAPONTOP)
-    {                           // Not raised all the way yet
-        return;
-    }
-    psp->sy = WEAPONTOP;
-    if (player->class == PCLASS_FIGHTER && player->readyweapon == WP_SECOND
-        && player->mana[MANA_1])
-    {
-        P_SetPsprite(player, ps_weapon, S_FAXEREADY_G);
-    }
-    else
-    {
-        P_SetPsprite(player, ps_weapon,
-                     WeaponInfo[player->readyweapon][player->class].
-                     readystate);
-    }
-}
-
-/*
-===============
-=
-= P_BulletSlope
-=
-= Sets a slope so a near miss is at aproximately the height of the
-= intended target
-=
-===============
-*/
-
-/*
-void P_BulletSlope (mobj_t *mo)
-{
-	angle_t		an;
-
-//
-// see which target is to be aimed at
-//
-	an = mo->angle;
-	bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-	if (!linetarget)
-	{
-		an += 1<<26;
-		bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-		if (!linetarget)
-		{
-			an -= 2<<26;
-			bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-		}
-		if (!linetarget)
-		{
-			an += 1<<26;
-			bulletslope = (mo->player->lookdir<<FRACBITS)/173;
-		}
-	}
-}
-*/
-
-//
-// WEAPON ATTACKS
-//
-
-//============================================================================
-//
-//      AdjustPlayerAngle
-//
-//============================================================================
-
-#define MAX_ANGADJUST (5*ANG1)
-
-void AdjustPlayerAngle(mobj_t * pmo)
-{
-    angle_t angle;
-    int difference;
-
-    angle = R_PointToAngle2(pmo->x, pmo->y, linetarget->x, linetarget->y);
-    difference = (int) angle - (int) pmo->angle;
-    if (abs(difference) > MAX_ANGADJUST)
-    {
-        pmo->angle += difference > 0 ? MAX_ANGADJUST : -MAX_ANGADJUST;
-    }
-    else
-    {
-        pmo->angle = angle;
-    }
-}
-
-//============================================================================
-//
-// A_SnoutAttack
-//
-//============================================================================
-
-void A_SnoutAttack(mobj_t *mobj, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-
-    damage = 3 + (P_Random() & 3);
-    angle = player->mo->angle;
-    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
-    PuffType = MT_SNOUTPUFF;
-    PuffSpawned = NULL;
-    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
-    S_StartSound(player->mo, SFX_PIG_ACTIVE1 + (P_Random() & 1));
-    if (linetarget)
-    {
-        AdjustPlayerAngle(player->mo);
-//              player->mo->angle = R_PointToAngle2(player->mo->x,
-//                      player->mo->y, linetarget->x, linetarget->y);
-        if (PuffSpawned)
-        {                       // Bit something
-            S_StartSound(player->mo, SFX_PIG_ATTACK);
-        }
-    }
-}
-
-//============================================================================
-//
-// A_FHammerAttack
-//
-//============================================================================
-
-#define HAMMER_RANGE	(MELEERANGE+MELEERANGE/2)
-
-void A_FHammerAttack(mobj_t *mobj, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    mobj_t *pmo = player->mo;
-    int damage;
-    fixed_t power;
-    int slope;
-    int i;
-
-    damage = 60 + (P_Random() & 63);
-    power = 10 * FRACUNIT;
-    PuffType = MT_HAMMERPUFF;
-    for (i = 0; i < 16; i++)
-    {
-        angle = pmo->angle + i * (ANG45 / 32);
-        slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE);
-        if (linetarget)
-        {
-            P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage);
-            AdjustPlayerAngle(pmo);
-            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
-            {
-                P_ThrustMobj(linetarget, angle, power);
-            }
-            pmo->special1.i = false;      // Don't throw a hammer
-            goto hammerdone;
-        }
-        angle = pmo->angle - i * (ANG45 / 32);
-        slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE);
-        if (linetarget)
-        {
-            P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage);
-            AdjustPlayerAngle(pmo);
-            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
-            {
-                P_ThrustMobj(linetarget, angle, power);
-            }
-            pmo->special1.i = false;      // Don't throw a hammer
-            goto hammerdone;
-        }
-    }
-    // didn't find any targets in meleerange, so set to throw out a hammer
-    PuffSpawned = NULL;
-    angle = pmo->angle;
-    slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE);
-    P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage);
-    if (PuffSpawned)
-    {
-        pmo->special1.i = false;
-    }
-    else
-    {
-        pmo->special1.i = true;
-    }
-  hammerdone:
-    if (player->mana[MANA_2] <
-        WeaponManaUse[player->class][player->readyweapon])
-    {                           // Don't spawn a hammer if the player doesn't have enough mana
-        pmo->special1.i = false;
-    }
-    return;
-}
-
-//============================================================================
-//
-// A_FHammerThrow
-//
-//============================================================================
-
-void A_FHammerThrow(mobj_t *mobj, player_t * player, pspdef_t * psp)
-{
-    mobj_t *mo;
-
-    if (!player->mo->special1.i)
-    {
-        return;
-    }
-    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-    mo = P_SpawnPlayerMissile(player->mo, MT_HAMMER_MISSILE);
-    if (mo)
-    {
-        mo->special1.i = 0;
-    }
-}
-
-//============================================================================
-//
-// A_FSwordAttack
-//
-//============================================================================
-
-void A_FSwordAttack(mobj_t *mobj, player_t *player, pspdef_t *psp)
-{
-    mobj_t *pmo;
-
-    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
-    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-    pmo = player->mo;
-    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z - 10 * FRACUNIT,
-                  MT_FSWORD_MISSILE, pmo->angle + ANG45 / 4);
-    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z - 5 * FRACUNIT,
-                  MT_FSWORD_MISSILE, pmo->angle + ANG45 / 8);
-    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z, MT_FSWORD_MISSILE, pmo->angle);
-    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z + 5 * FRACUNIT,
-                  MT_FSWORD_MISSILE, pmo->angle - ANG45 / 8);
-    P_SPMAngleXYZ(pmo, pmo->x, pmo->y, pmo->z + 10 * FRACUNIT,
-                  MT_FSWORD_MISSILE, pmo->angle - ANG45 / 4);
-    S_StartSound(pmo, SFX_FIGHTER_SWORD_FIRE);
-}
-
-//============================================================================
-//
-// A_FSwordAttack2
-//
-//============================================================================
-
-void A_FSwordAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle = actor->angle;
-
-    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle + ANG45 / 4, 0);
-    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle + ANG45 / 8, 0);
-    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle, 0);
-    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle - ANG45 / 8, 0);
-    P_SpawnMissileAngle(actor, MT_FSWORD_MISSILE, angle - ANG45 / 4, 0);
-    S_StartSound(actor, SFX_FIGHTER_SWORD_FIRE);
-}
-
-//============================================================================
-//
-// A_FSwordFlames
-//
-//============================================================================
-
-void A_FSwordFlames(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    int r1,r2,r3;
-
-    for (i = 1 + (P_Random() & 3); i; i--)
-    {
-        r1 = P_Random();
-        r2 = P_Random();
-        r3 = P_Random();
-        P_SpawnMobj(actor->x + ((r3 - 128) << 12), actor->y
-                    + ((r2 - 128) << 12),
-                    actor->z + ((r1 - 128) << 11), MT_FSWORD_FLAME);
-    }
-}
-
-//============================================================================
-//
-// A_MWandAttack
-//
-//============================================================================
-
-void A_MWandAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnPlayerMissile(player->mo, MT_MWAND_MISSILE);
-    if (mo)
-    {
-        mo->thinker.function = P_BlasterMobjThinker;
-    }
-    S_StartSound(player->mo, SFX_MAGE_WAND_FIRE);
-}
-
-// ===== Mage Lightning Weapon =====
-
-//============================================================================
-//
-// A_LightningReady
-//
-//============================================================================
-
-void A_LightningReady(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_WeaponReady(actor, player, psp);
-    if (P_Random() < 160)
-    {
-        S_StartSound(player->mo, SFX_MAGE_LIGHTNING_READY);
-    }
-}
-
-//============================================================================
-//
-// A_LightningClip
-//
-//============================================================================
-
-#define ZAGSPEED	FRACUNIT
-
-void A_LightningClip(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *cMo;
-    mobj_t *target = NULL;
-    int zigZag;
-
-    if (actor->type == MT_LIGHTNING_FLOOR)
-    {
-        actor->z = actor->floorz;
-        target = actor->special2.m->special1.m;
-    }
-    else if (actor->type == MT_LIGHTNING_CEILING)
-    {
-        actor->z = actor->ceilingz - actor->height;
-        target = actor->special1.m;
-    }
-    if (actor->type == MT_LIGHTNING_FLOOR)
-    {                           // floor lightning zig-zags, and forces the ceiling lightning to mimic
-        cMo = actor->special2.m;
-        zigZag = P_Random();
-        if ((zigZag > 128 && actor->special1.i < 2) || actor->special1.i < -2)
-        {
-            P_ThrustMobj(actor, actor->angle + ANG90, ZAGSPEED);
-            if (cMo)
-            {
-                P_ThrustMobj(cMo, actor->angle + ANG90, ZAGSPEED);
-            }
-            actor->special1.i++;
-        }
-        else
-        {
-            P_ThrustMobj(actor, actor->angle - ANG90, ZAGSPEED);
-            if (cMo)
-            {
-                P_ThrustMobj(cMo, cMo->angle - ANG90, ZAGSPEED);
-            }
-            actor->special1.i--;
-        }
-    }
-    if (target)
-    {
-        if (target->health <= 0)
-        {
-            P_ExplodeMissile(actor);
-        }
-        else
-        {
-            actor->angle = R_PointToAngle2(actor->x, actor->y, target->x,
-                                           target->y);
-            actor->momx = 0;
-            actor->momy = 0;
-            P_ThrustMobj(actor, actor->angle, actor->info->speed >> 1);
-        }
-    }
-}
-
-//============================================================================
-//
-// A_LightningZap
-//
-//============================================================================
-
-void A_LightningZap(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    fixed_t deltaZ;
-    int r1,r2;
-
-    A_LightningClip(actor, player, psp);
-
-    actor->health -= 8;
-    if (actor->health <= 0)
-    {
-        P_SetMobjState(actor, actor->info->deathstate);
-        return;
-    }
-    if (actor->type == MT_LIGHTNING_FLOOR)
-    {
-        deltaZ = 10 * FRACUNIT;
-    }
-    else
-    {
-        deltaZ = -10 * FRACUNIT;
-    }
-    r1 = P_Random();
-    r2 = P_Random();
-    mo = P_SpawnMobj(actor->x + ((r2 - 128) * actor->radius / 256),
-                     actor->y + ((r1 - 128) * actor->radius / 256),
-                     actor->z + deltaZ, MT_LIGHTNING_ZAP);
-    if (mo)
-    {
-        mo->special2.m = actor;
-        mo->momx = actor->momx;
-        mo->momy = actor->momy;
-        mo->target = actor->target;
-        if (actor->type == MT_LIGHTNING_FLOOR)
-        {
-            mo->momz = 20 * FRACUNIT;
-        }
-        else
-        {
-            mo->momz = -20 * FRACUNIT;
-        }
-    }
-/*
-	mo = P_SpawnMobj(actor->x+((P_Random()-128)*actor->radius/256), 
-		actor->y+((P_Random()-128)*actor->radius/256), 
-		actor->z+deltaZ, MT_LIGHTNING_ZAP);
-	if(mo)
-	{
-		mo->special2.m = actor;
-		mo->momx = actor->momx;
-		mo->momy = actor->momy;
-		mo->target = actor->target;
-		if(actor->type == MT_LIGHTNING_FLOOR)
-		{
-			mo->momz = 16*FRACUNIT;
-		}
-		else 
-		{
-			mo->momz = -16*FRACUNIT;
-		}
-	}
-*/
-    if (actor->type == MT_LIGHTNING_FLOOR && P_Random() < 160)
-    {
-        S_StartSound(actor, SFX_MAGE_LIGHTNING_CONTINUOUS);
-    }
-}
-
-//============================================================================
-//
-// A_MLightningAttack2
-//
-//============================================================================
-
-void A_MLightningAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *fmo, *cmo;
-
-    fmo = P_SpawnPlayerMissile(actor, MT_LIGHTNING_FLOOR);
-    cmo = P_SpawnPlayerMissile(actor, MT_LIGHTNING_CEILING);
-    if (fmo)
-    {
-        fmo->special1.m = NULL;
-        fmo->special2.m = cmo;
-        A_LightningZap(fmo, player, psp);
-    }
-    if (cmo)
-    {
-        cmo->special1.m = NULL;      // mobj that it will track
-        cmo->special2.m = fmo;
-        A_LightningZap(cmo, player, psp);
-    }
-    S_StartSound(actor, SFX_MAGE_LIGHTNING_FIRE);
-}
-
-//============================================================================
-//
-// A_MLightningAttack
-//
-//============================================================================
-
-void A_MLightningAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_MLightningAttack2(player->mo, player, psp);
-    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-}
-
-//============================================================================
-//
-// A_ZapMimic
-//
-//============================================================================
-
-void A_ZapMimic(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = actor->special2.m;
-    if (mo)
-    {
-        if (mo->state >= &states[mo->info->deathstate]
-            || mo->state == &states[S_FREETARGMOBJ])
-        {
-            P_ExplodeMissile(actor);
-        }
-        else
-        {
-            actor->momx = mo->momx;
-            actor->momy = mo->momy;
-        }
-    }
-}
-
-//============================================================================
-//
-// A_LastZap
-//
-//============================================================================
-
-void A_LastZap(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_LIGHTNING_ZAP);
-    if (mo)
-    {
-        P_SetMobjState(mo, S_LIGHTNING_ZAP_X1);
-        mo->momz = 40 * FRACUNIT;
-    }
-}
-
-//============================================================================
-//
-// A_LightningRemove
-//
-//============================================================================
-
-void A_LightningRemove(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = actor->special2.m;
-    if (mo)
-    {
-        mo->special2.m = NULL;
-        P_ExplodeMissile(mo);
-    }
-}
-
-
-//============================================================================
-//
-// MStaffSpawn
-//
-//============================================================================
-void MStaffSpawn(mobj_t * pmo, angle_t angle)
-{
-    mobj_t *mo;
-
-    mo = P_SPMAngle(pmo, MT_MSTAFF_FX2, angle);
-    if (mo)
-    {
-        mo->target = pmo;
-        mo->special1.m = P_RoughMonsterSearch(mo, 10);
-    }
-}
-
-//============================================================================
-//
-// A_MStaffAttack
-//
-//============================================================================
-
-void A_MStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    mobj_t *pmo;
-
-    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
-    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-    pmo = player->mo;
-    angle = pmo->angle;
-
-    MStaffSpawn(pmo, angle);
-    MStaffSpawn(pmo, angle - ANG1 * 5);
-    MStaffSpawn(pmo, angle + ANG1 * 5);
-    S_StartSound(player->mo, SFX_MAGE_STAFF_FIRE);
-    if (player == &players[consoleplayer])
-    {
-        player->damagecount = 0;
-        player->bonuscount = 0;
-        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
-                                             PU_CACHE) +
-                     STARTSCOURGEPAL * 768);
-    }
-}
-
-//============================================================================
-//
-// A_MStaffPalette
-//
-//============================================================================
-
-void A_MStaffPalette(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int pal;
-
-    if (player == &players[consoleplayer])
-    {
-        pal = STARTSCOURGEPAL + psp->state - (&states[S_MSTAFFATK_2]);
-        if (pal == STARTSCOURGEPAL + 3)
-        {                       // reset back to original playpal
-            pal = 0;
-        }
-        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
-                                             PU_CACHE) + pal * 768);
-    }
-}
-
-//============================================================================
-//
-// A_MStaffWeave
-//
-//============================================================================
-
-void A_MStaffWeave(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t newX, newY;
-    int weaveXY, weaveZ;
-    int angle;
-
-    weaveXY = actor->special2.i >> 16;
-    weaveZ = actor->special2.i & 0xFFFF;
-    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    newX = actor->x - FixedMul(finecosine[angle],
-                               FloatBobOffsets[weaveXY] << 2);
-    newY = actor->y - FixedMul(finesine[angle],
-                               FloatBobOffsets[weaveXY] << 2);
-    weaveXY = (weaveXY + 6) & 63;
-    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 2);
-    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 2);
-    P_TryMove(actor, newX, newY);
-    actor->z -= FloatBobOffsets[weaveZ] << 1;
-    weaveZ = (weaveZ + 3) & 63;
-    actor->z += FloatBobOffsets[weaveZ] << 1;
-    if (actor->z <= actor->floorz)
-    {
-        actor->z = actor->floorz + FRACUNIT;
-    }
-    actor->special2.i = weaveZ + (weaveXY << 16);
-}
-
-
-//============================================================================
-//
-// A_MStaffTrack
-//
-//============================================================================
-
-void A_MStaffTrack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if ((actor->special1.m == NULL) && (P_Random() < 50))
-    {
-        actor->special1.m = P_RoughMonsterSearch(actor, 10);
-    }
-    P_SeekerMissile(actor, ANG1 * 2, ANG1 * 10);
-}
-
-
-//============================================================================
-//
-// MStaffSpawn2 - for use by mage class boss
-//
-//============================================================================
-
-void MStaffSpawn2(mobj_t * actor, angle_t angle)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnMissileAngle(actor, MT_MSTAFF_FX2, angle, 0);
-    if (mo)
-    {
-        mo->target = actor;
-        mo->special1.m = P_RoughMonsterSearch(mo, 10);
-    }
-}
-
-//============================================================================
-//
-// A_MStaffAttack2 - for use by mage class boss
-//
-//============================================================================
-
-void A_MStaffAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    angle = actor->angle;
-    MStaffSpawn2(actor, angle);
-    MStaffSpawn2(actor, angle - ANG1 * 5);
-    MStaffSpawn2(actor, angle + ANG1 * 5);
-    S_StartSound(actor, SFX_MAGE_STAFF_FIRE);
-}
-
-//============================================================================
-//
-// A_FPunchAttack
-//
-//============================================================================
-
-void A_FPunchAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-    mobj_t *pmo = player->mo;
-    fixed_t power;
-    int i;
-
-    damage = 40 + (P_Random() & 15);
-    power = 2 * FRACUNIT;
-    PuffType = MT_PUNCHPUFF;
-    for (i = 0; i < 16; i++)
-    {
-        angle = pmo->angle + i * (ANG45 / 16);
-        slope = P_AimLineAttack(pmo, angle, 2 * MELEERANGE);
-        if (linetarget)
-        {
-            player->mo->special1.i++;
-            if (pmo->special1.i == 3)
-            {
-                damage <<= 1;
-                power = 6 * FRACUNIT;
-                PuffType = MT_HAMMERPUFF;
-            }
-            P_LineAttack(pmo, angle, 2 * MELEERANGE, slope, damage);
-            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
-            {
-                P_ThrustMobj(linetarget, angle, power);
-            }
-            AdjustPlayerAngle(pmo);
-            goto punchdone;
-        }
-        angle = pmo->angle - i * (ANG45 / 16);
-        slope = P_AimLineAttack(pmo, angle, 2 * MELEERANGE);
-        if (linetarget)
-        {
-            pmo->special1.i++;
-            if (pmo->special1.i == 3)
-            {
-                damage <<= 1;
-                power = 6 * FRACUNIT;
-                PuffType = MT_HAMMERPUFF;
-            }
-            P_LineAttack(pmo, angle, 2 * MELEERANGE, slope, damage);
-            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
-            {
-                P_ThrustMobj(linetarget, angle, power);
-            }
-            AdjustPlayerAngle(pmo);
-            goto punchdone;
-        }
-    }
-    // didn't find any creatures, so try to strike any walls
-    pmo->special1.i = 0;
-
-    angle = pmo->angle;
-    slope = P_AimLineAttack(pmo, angle, MELEERANGE);
-    P_LineAttack(pmo, angle, MELEERANGE, slope, damage);
-
-  punchdone:
-    if (pmo->special1.i == 3)
-    {
-        pmo->special1.i = 0;
-        P_SetPsprite(player, ps_weapon, S_PUNCHATK2_1);
-        S_StartSound(pmo, SFX_FIGHTER_GRUNT);
-    }
-    return;
-}
-
-//============================================================================
-//
-// A_FAxeAttack
-//
-//============================================================================
-
-#define AXERANGE	2.25*MELEERANGE
-
-void A_FAxeAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    mobj_t *pmo = player->mo;
-    fixed_t power;
-    int damage;
-    int slope;
-    int i;
-    int useMana;
-    int r;
-
-    r = P_Random();
-    damage = 40 + (r & 15) + (P_Random() & 7);
-    power = 0;
-    if (player->mana[MANA_1] > 0)
-    {
-        damage <<= 1;
-        power = 6 * FRACUNIT;
-        PuffType = MT_AXEPUFF_GLOW;
-        useMana = 1;
-    }
-    else
-    {
-        PuffType = MT_AXEPUFF;
-        useMana = 0;
-    }
-    for (i = 0; i < 16; i++)
-    {
-        angle = pmo->angle + i * (ANG45 / 16);
-        slope = P_AimLineAttack(pmo, angle, AXERANGE);
-        if (linetarget)
-        {
-            P_LineAttack(pmo, angle, AXERANGE, slope, damage);
-            if (linetarget->flags & MF_COUNTKILL || linetarget->player)
-            {
-                P_ThrustMobj(linetarget, angle, power);
-            }
-            AdjustPlayerAngle(pmo);
-            useMana++;
-            goto axedone;
-        }
-        angle = pmo->angle - i * (ANG45 / 16);
-        slope = P_AimLineAttack(pmo, angle, AXERANGE);
-        if (linetarget)
-        {
-            P_LineAttack(pmo, angle, AXERANGE, slope, damage);
-            if (linetarget->flags & MF_COUNTKILL)
-            {
-                P_ThrustMobj(linetarget, angle, power);
-            }
-            AdjustPlayerAngle(pmo);
-            useMana++;
-            goto axedone;
-        }
-    }
-    // didn't find any creatures, so try to strike any walls
-    pmo->special1.m = NULL;
-
-    angle = pmo->angle;
-    slope = P_AimLineAttack(pmo, angle, MELEERANGE);
-    P_LineAttack(pmo, angle, MELEERANGE, slope, damage);
-
-  axedone:
-    if (useMana == 2)
-    {
-        player->mana[MANA_1] -=
-            WeaponManaUse[player->class][player->readyweapon];
-        if (player->mana[MANA_1] <= 0)
-        {
-            P_SetPsprite(player, ps_weapon, S_FAXEATK_5);
-        }
-    }
-    return;
-}
-
-//===========================================================================
-//
-// A_CMaceAttack
-//
-//===========================================================================
-
-void A_CMaceAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int slope;
-    int i;
-
-    damage = 25 + (P_Random() & 15);
-    PuffType = MT_HAMMERPUFF;
-    for (i = 0; i < 16; i++)
-    {
-        angle = player->mo->angle + i * (ANG45 / 16);
-        slope = P_AimLineAttack(player->mo, angle, 2 * MELEERANGE);
-        if (linetarget)
-        {
-            P_LineAttack(player->mo, angle, 2 * MELEERANGE, slope, damage);
-            AdjustPlayerAngle(player->mo);
-//                      player->mo->angle = R_PointToAngle2(player->mo->x,
-//                              player->mo->y, linetarget->x, linetarget->y);
-            goto macedone;
-        }
-        angle = player->mo->angle - i * (ANG45 / 16);
-        slope = P_AimLineAttack(player->mo, angle, 2 * MELEERANGE);
-        if (linetarget)
-        {
-            P_LineAttack(player->mo, angle, 2 * MELEERANGE, slope, damage);
-            AdjustPlayerAngle(player->mo);
-//                      player->mo->angle = R_PointToAngle2(player->mo->x,
-//                              player->mo->y, linetarget->x, linetarget->y);
-            goto macedone;
-        }
-    }
-    // didn't find any creatures, so try to strike any walls
-    player->mo->special1.m = NULL;
-
-    angle = player->mo->angle;
-    slope = P_AimLineAttack(player->mo, angle, MELEERANGE);
-    P_LineAttack(player->mo, angle, MELEERANGE, slope, damage);
-  macedone:
-    return;
-}
-
-//============================================================================
-//
-// A_CStaffCheck
-//
-//============================================================================
-
-void A_CStaffCheck(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *pmo;
-    int damage;
-    int newLife;
-    angle_t angle;
-    int slope;
-    int i;
-
-    pmo = player->mo;
-    damage = 20 + (P_Random() & 15);
-    PuffType = MT_CSTAFFPUFF;
-    for (i = 0; i < 3; i++)
-    {
-        angle = pmo->angle + i * (ANG45 / 16);
-        slope = P_AimLineAttack(pmo, angle, 1.5 * MELEERANGE);
-        if (linetarget)
-        {
-            P_LineAttack(pmo, angle, 1.5 * MELEERANGE, slope, damage);
-            pmo->angle = R_PointToAngle2(pmo->x, pmo->y,
-                                         linetarget->x, linetarget->y);
-            if ((linetarget->player || linetarget->flags & MF_COUNTKILL)
-                && (!(linetarget->flags2 & (MF2_DORMANT + MF2_INVULNERABLE))))
-            {
-                newLife = player->health + (damage >> 3);
-                newLife = newLife > 100 ? 100 : newLife;
-                pmo->health = player->health = newLife;
-                P_SetPsprite(player, ps_weapon, S_CSTAFFATK2_1);
-            }
-            player->mana[MANA_1] -=
-                WeaponManaUse[player->class][player->readyweapon];
-            break;
-        }
-        angle = pmo->angle - i * (ANG45 / 16);
-        slope = P_AimLineAttack(player->mo, angle, 1.5 * MELEERANGE);
-        if (linetarget)
-        {
-            P_LineAttack(pmo, angle, 1.5 * MELEERANGE, slope, damage);
-            pmo->angle = R_PointToAngle2(pmo->x, pmo->y,
-                                         linetarget->x, linetarget->y);
-            if (linetarget->player || linetarget->flags & MF_COUNTKILL)
-            {
-                newLife = player->health + (damage >> 4);
-                newLife = newLife > 100 ? 100 : newLife;
-                pmo->health = player->health = newLife;
-                P_SetPsprite(player, ps_weapon, S_CSTAFFATK2_1);
-            }
-            player->mana[MANA_1] -=
-                WeaponManaUse[player->class][player->readyweapon];
-            break;
-        }
-    }
-}
-
-//============================================================================
-//
-// A_CStaffAttack
-//
-//============================================================================
-
-void A_CStaffAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    mobj_t *pmo;
-
-    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
-    pmo = player->mo;
-    mo = P_SPMAngle(pmo, MT_CSTAFF_MISSILE, pmo->angle - (ANG45 / 15));
-    if (mo)
-    {
-        mo->special2.i = 32;
-    }
-    mo = P_SPMAngle(pmo, MT_CSTAFF_MISSILE, pmo->angle + (ANG45 / 15));
-    if (mo)
-    {
-        mo->special2.i = 0;
-    }
-    S_StartSound(player->mo, SFX_CLERIC_CSTAFF_FIRE);
-}
-
-//============================================================================
-//
-// A_CStaffMissileSlither
-//
-//============================================================================
-
-void A_CStaffMissileSlither(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    fixed_t newX, newY;
-    int weaveXY;
-    int angle;
-
-    weaveXY = actor->special2.i;
-    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    newX = actor->x - FixedMul(finecosine[angle], FloatBobOffsets[weaveXY]);
-    newY = actor->y - FixedMul(finesine[angle], FloatBobOffsets[weaveXY]);
-    weaveXY = (weaveXY + 3) & 63;
-    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY]);
-    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY]);
-    P_TryMove(actor, newX, newY);
-    actor->special2.i = weaveXY;
-}
-
-//============================================================================
-//
-// A_CStaffInitBlink
-//
-//============================================================================
-
-void A_CStaffInitBlink(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->mo->special1.i = (P_Random() >> 1) + 20;
-}
-
-//============================================================================
-//
-// A_CStaffCheckBlink
-//
-//============================================================================
-
-void A_CStaffCheckBlink(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    if (!--player->mo->special1.i)
-    {
-        P_SetPsprite(player, ps_weapon, S_CSTAFFBLINK1);
-        player->mo->special1.i = (P_Random() + 50) >> 2;
-    }
-}
-
-//============================================================================
-//
-// A_CFlameAttack
-//
-//============================================================================
-
-#define FLAMESPEED	(0.45*FRACUNIT)
-#define CFLAMERANGE	(12*64*FRACUNIT)
-
-void A_CFlameAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnPlayerMissile(player->mo, MT_CFLAME_MISSILE);
-    if (mo)
-    {
-        mo->thinker.function = P_BlasterMobjThinker;
-        mo->special1.i = 2;
-    }
-
-    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-    S_StartSound(player->mo, SFX_CLERIC_FLAME_FIRE);
-}
-
-//============================================================================
-//
-// A_CFlamePuff
-//
-//============================================================================
-
-void A_CFlamePuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_UnHideThing(actor, player, psp);
-    actor->momx = 0;
-    actor->momy = 0;
-    actor->momz = 0;
-    S_StartSound(actor, SFX_CLERIC_FLAME_EXPLODE);
-}
-
-//============================================================================
-//
-// A_CFlameMissile
-//
-//============================================================================
-
-void A_CFlameMissile(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int i;
-    int an;
-    fixed_t dist;
-    mobj_t *mo;
-
-    A_UnHideThing(actor, player, psp);
-    S_StartSound(actor, SFX_CLERIC_FLAME_EXPLODE);
-    if (BlockingMobj && BlockingMobj->flags & MF_SHOOTABLE)
-    {                           // Hit something, so spawn the flame circle around the thing
-        dist = BlockingMobj->radius + 18 * FRACUNIT;
-        for (i = 0; i < 4; i++)
-        {
-            an = (i * ANG45) >> ANGLETOFINESHIFT;
-            mo = P_SpawnMobj(BlockingMobj->x + FixedMul(dist, finecosine[an]),
-                             BlockingMobj->y + FixedMul(dist, finesine[an]),
-                             BlockingMobj->z + 5 * FRACUNIT, MT_CIRCLEFLAME);
-            if (mo)
-            {
-                mo->angle = an << ANGLETOFINESHIFT;
-                mo->target = actor->target;
-                mo->momx = mo->special1.i =
-                    FixedMul(FLAMESPEED, finecosine[an]);
-                mo->momy = mo->special2.i = FixedMul(FLAMESPEED, finesine[an]);
-                mo->tics -= P_Random() & 3;
-            }
-            mo = P_SpawnMobj(BlockingMobj->x - FixedMul(dist, finecosine[an]),
-                             BlockingMobj->y - FixedMul(dist, finesine[an]),
-                             BlockingMobj->z + 5 * FRACUNIT, MT_CIRCLEFLAME);
-            if (mo)
-            {
-                mo->angle = ANG180 + (an << ANGLETOFINESHIFT);
-                mo->target = actor->target;
-                mo->momx = mo->special1.i = FixedMul(-FLAMESPEED,
-                                                     finecosine[an]);
-                mo->momy = mo->special2.i = FixedMul(-FLAMESPEED, finesine[an]);
-                mo->tics -= P_Random() & 3;
-            }
-        }
-        P_SetMobjState(actor, S_FLAMEPUFF2_1);
-    }
-}
-
-/*
-void A_CFlameAttack(player_t *player, pspdef_t *psp)
-{
-	mobj_t *pmo;
-	angle_t angle;
-	int damage;
-	int i;
-	int an, an90;
-	fixed_t dist;
-	mobj_t *mo;
-
-	pmo = player->mo;
-	P_BulletSlope(pmo);
-	damage = 25+HITDICE(3);
-	angle = pmo->angle;
-	if(player->refire)
-	{
-		angle += P_SubRandom()<<17;
-	}
-	P_AimLineAttack(pmo, angle, CFLAMERANGE); // Correctly set linetarget
-	if(!linetarget)
-	{
-		angle += ANG1*2;
-		P_AimLineAttack(pmo, angle, CFLAMERANGE);
-		if(!linetarget)
-		{
-			angle -= ANG1*4;
-			P_AimLineAttack(pmo, angle, CFLAMERANGE);
-			if(!linetarget)
-			{
-				angle += ANG1*2;
-			}
-		}		
-	}
-	if(linetarget)
-	{
-		PuffType = MT_FLAMEPUFF2;
-	}
-	else
-	{
-		PuffType = MT_FLAMEPUFF;
-	}
-	P_LineAttack(pmo, angle, CFLAMERANGE, bulletslope, damage);
-	if(linetarget)
-	{ // Hit something, so spawn the flame circle around the thing
-		dist = linetarget->radius+18*FRACUNIT;
-		for(i = 0; i < 4; i++)
-		{
-			an = (i*ANG45)>>ANGLETOFINESHIFT;
-			an90 = (i*ANG45+ANG90)>>ANGLETOFINESHIFT;
-			mo = P_SpawnMobj(linetarget->x+FixedMul(dist, finecosine[an]),
-				linetarget->y+FixedMul(dist, finesine[an]), 
-				linetarget->z+5*FRACUNIT, MT_CIRCLEFLAME);
-			if(mo)
-			{
-				mo->angle = an<<ANGLETOFINESHIFT;
-				mo->target = pmo;
-				mo->momx = mo->special1.i = FixedMul(FLAMESPEED, finecosine[an]);
-				mo->momy = mo->special2.i = FixedMul(FLAMESPEED, finesine[an]);
-				mo->tics -= P_Random()&3;
-			}
-			mo = P_SpawnMobj(linetarget->x-FixedMul(dist, finecosine[an]),
-				linetarget->y-FixedMul(dist, finesine[an]), 
-				linetarget->z+5*FRACUNIT, MT_CIRCLEFLAME);
-			if(mo)
-			{
-				mo->angle = ANG180+(an<<ANGLETOFINESHIFT);
-				mo->target = pmo;
-				mo->momx = mo->special1.i = FixedMul(-FLAMESPEED, 
-					finecosine[an]);
-				mo->momy = mo->special2.i = FixedMul(-FLAMESPEED, finesine[an]);
-				mo->tics -= P_Random()&3;
-			}
-		}
-	}
-// Create a line of flames from the player to the flame puff
-	CFlameCreateFlames(player->mo);
-
-	player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-	S_StartSound(player->mo, SFX_CLERIC_FLAME_FIRE);
-}
-*/
-
-//============================================================================
-//
-// A_CFlameRotate
-//
-//============================================================================
-
-#define FLAMEROTSPEED	2*FRACUNIT
-
-void A_CFlameRotate(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int an;
-
-    an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    actor->momx = actor->special1.i + FixedMul(FLAMEROTSPEED, finecosine[an]);
-    actor->momy = actor->special2.i + FixedMul(FLAMEROTSPEED, finesine[an]);
-    actor->angle += ANG90 / 15;
-}
-
-
-//============================================================================
-//
-// A_CHolyAttack3
-//
-//      Spawns the spirits
-//============================================================================
-
-void A_CHolyAttack3(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMissile(actor, actor->target, MT_HOLY_MISSILE);
-    S_StartSound(actor, SFX_CHOLY_FIRE);
-}
-
-
-//============================================================================
-//
-// A_CHolyAttack2 
-//
-//      Spawns the spirits
-//============================================================================
-
-void A_CHolyAttack2(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int j;
-    int i;
-    int r;
-    mobj_t *mo;
-    mobj_t *tail, *next;
-
-    for (j = 0; j < 4; j++)
-    {
-        mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_HOLY_FX);
-        if (!mo)
-        {
-            continue;
-        }
-        switch (j)
-        {                       // float bob index
-            case 0:
-                mo->special2.i = P_Random() & 7;  // upper-left
-                break;
-            case 1:
-                mo->special2.i = 32 + (P_Random() & 7);   // upper-right
-                break;
-            case 2:
-                mo->special2.i = (32 + (P_Random() & 7)) << 16;   // lower-left
-                break;
-            case 3:
-                r = P_Random();
-                mo->special2.i =
-                    ((32 + (r & 7)) << 16) + 32 + (P_Random() & 7);
-                break;
-        }
-        mo->z = actor->z;
-        mo->angle = actor->angle + (ANG45 + ANG45 / 2) - ANG45 * j;
-        P_ThrustMobj(mo, mo->angle, mo->info->speed);
-        mo->target = actor->target;
-        mo->args[0] = 10;       // initial turn value
-        mo->args[1] = 0;        // initial look angle
-        if (deathmatch)
-        {                       // Ghosts last slightly less longer in DeathMatch
-            mo->health = 85;
-        }
-        if (linetarget)
-        {
-            mo->special1.m = linetarget;
-            mo->flags |= MF_NOCLIP | MF_SKULLFLY;
-            mo->flags &= ~MF_MISSILE;
-        }
-        tail = P_SpawnMobj(mo->x, mo->y, mo->z, MT_HOLY_TAIL);
-        tail->special2.m = mo;      // parent
-        for (i = 1; i < 3; i++)
-        {
-            next = P_SpawnMobj(mo->x, mo->y, mo->z, MT_HOLY_TAIL);
-            P_SetMobjState(next, next->info->spawnstate + 1);
-            tail->special1.m = next;
-            tail = next;
-        }
-        tail->special1.m = NULL;     // last tail bit
-    }
-}
-
-//============================================================================
-//
-// A_CHolyAttack
-//
-//============================================================================
-
-void A_CHolyAttack(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
-    player->mana[MANA_2] -= WeaponManaUse[player->class][player->readyweapon];
-    P_SpawnPlayerMissile(player->mo, MT_HOLY_MISSILE);
-    if (player == &players[consoleplayer])
-    {
-        player->damagecount = 0;
-        player->bonuscount = 0;
-        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
-                                             PU_CACHE) + STARTHOLYPAL * 768);
-    }
-    S_StartSound(player->mo, SFX_CHOLY_FIRE);
-}
-
-//============================================================================
-//
-// A_CHolyPalette
-//
-//============================================================================
-
-void A_CHolyPalette(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    int pal;
-
-    if (player == &players[consoleplayer])
-    {
-        pal = STARTHOLYPAL + psp->state - (&states[S_CHOLYATK_6]);
-        if (pal == STARTHOLYPAL + 3)
-        {                       // reset back to original playpal
-            pal = 0;
-        }
-        I_SetPalette((byte *) W_CacheLumpNum(W_GetNumForName("playpal"),
-                                             PU_CACHE) + pal * 768);
-    }
-}
-
-//============================================================================
-//
-// CHolyFindTarget
-//
-//============================================================================
-
-static void CHolyFindTarget(mobj_t * actor)
-{
-    mobj_t *target;
-
-    target = P_RoughMonsterSearch(actor, 6);
-    if (target != NULL)
-    {
-        actor->special1.m = target;
-        actor->flags |= MF_NOCLIP | MF_SKULLFLY;
-        actor->flags &= ~MF_MISSILE;
-    }
-}
-
-//============================================================================
-//
-// CHolySeekerMissile
-//
-//       Similar to P_SeekerMissile, but seeks to a random Z on the target
-//============================================================================
-
-static void CHolySeekerMissile(mobj_t * actor, angle_t thresh,
-                               angle_t turnMax)
-{
-    int dir;
-    int dist;
-    angle_t delta;
-    angle_t angle;
-    mobj_t *target;
-    fixed_t newZ;
-    fixed_t deltaZ;
-
-    target = actor->special1.m;
-    if (target == NULL)
-    {
-        return;
-    }
-    if (!(target->flags & MF_SHOOTABLE)
-        || (!(target->flags & MF_COUNTKILL) && !target->player))
-    {                           // Target died/target isn't a player or creature
-        actor->special1.m = NULL;
-        actor->flags &= ~(MF_NOCLIP | MF_SKULLFLY);
-        actor->flags |= MF_MISSILE;
-        CHolyFindTarget(actor);
-        return;
-    }
-    dir = P_FaceMobj(actor, target, &delta);
-    if (delta > thresh)
-    {
-        delta >>= 1;
-        if (delta > turnMax)
-        {
-            delta = turnMax;
-        }
-    }
-    if (dir)
-    {                           // Turn clockwise
-        actor->angle += delta;
-    }
-    else
-    {                           // Turn counter clockwise
-        actor->angle -= delta;
-    }
-    angle = actor->angle >> ANGLETOFINESHIFT;
-    actor->momx = FixedMul(actor->info->speed, finecosine[angle]);
-    actor->momy = FixedMul(actor->info->speed, finesine[angle]);
-    if (!(leveltime & 15)
-        || actor->z > target->z + (target->height)
-        || actor->z + actor->height < target->z)
-    {
-        newZ = target->z + ((P_Random() * target->height) >> 8);
-        deltaZ = newZ - actor->z;
-        if (abs(deltaZ) > 15 * FRACUNIT)
-        {
-            if (deltaZ > 0)
-            {
-                deltaZ = 15 * FRACUNIT;
-            }
-            else
-            {
-                deltaZ = -15 * FRACUNIT;
-            }
-        }
-        dist = P_AproxDistance(target->x - actor->x, target->y - actor->y);
-        dist = dist / actor->info->speed;
-        if (dist < 1)
-        {
-            dist = 1;
-        }
-        actor->momz = deltaZ / dist;
-    }
-    return;
-}
-
-//============================================================================
-//
-// A_CHolyWeave
-//
-//============================================================================
-
-static void CHolyWeave(mobj_t * actor)
-{
-    fixed_t newX, newY;
-    int weaveXY, weaveZ;
-    int angle;
-
-    weaveXY = actor->special2.i >> 16;
-    weaveZ = actor->special2.i & 0xFFFF;
-    angle = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    newX = actor->x - FixedMul(finecosine[angle],
-                               FloatBobOffsets[weaveXY] << 2);
-    newY = actor->y - FixedMul(finesine[angle],
-                               FloatBobOffsets[weaveXY] << 2);
-    weaveXY = (weaveXY + (P_Random() % 5)) & 63;
-    newX += FixedMul(finecosine[angle], FloatBobOffsets[weaveXY] << 2);
-    newY += FixedMul(finesine[angle], FloatBobOffsets[weaveXY] << 2);
-    P_TryMove(actor, newX, newY);
-    actor->z -= FloatBobOffsets[weaveZ] << 1;
-    weaveZ = (weaveZ + (P_Random() % 5)) & 63;
-    actor->z += FloatBobOffsets[weaveZ] << 1;
-    actor->special2.i = weaveZ + (weaveXY << 16);
-}
-
-//============================================================================
-//
-// A_CHolySeek
-//
-//============================================================================
-
-void A_CHolySeek(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->health--;
-    if (actor->health <= 0)
-    {
-        actor->momx >>= 2;
-        actor->momy >>= 2;
-        actor->momz = 0;
-        P_SetMobjState(actor, actor->info->deathstate);
-        actor->tics -= P_Random() & 3;
-        return;
-    }
-    if (actor->special1.m)
-    {
-        CHolySeekerMissile(actor, actor->args[0] * ANG1,
-                           actor->args[0] * ANG1 * 2);
-        if (!((leveltime + 7) & 15))
-        {
-            actor->args[0] = 5 + (P_Random() / 20);
-        }
-    }
-    CHolyWeave(actor);
-}
-
-//============================================================================
-//
-// CHolyTailFollow
-//
-//============================================================================
-
-static void CHolyTailFollow(mobj_t * actor, fixed_t dist)
-{
-    mobj_t *child;
-    int an;
-    fixed_t oldDistance, newDistance;
-
-    child = actor->special1.m;
-    if (child)
-    {
-        an = R_PointToAngle2(actor->x, actor->y, child->x,
-                             child->y) >> ANGLETOFINESHIFT;
-        oldDistance =
-            P_AproxDistance(child->x - actor->x, child->y - actor->y);
-        if (P_TryMove
-            (child, actor->x + FixedMul(dist, finecosine[an]),
-             actor->y + FixedMul(dist, finesine[an])))
-        {
-            newDistance = P_AproxDistance(child->x - actor->x,
-                                          child->y - actor->y) - FRACUNIT;
-            if (oldDistance < FRACUNIT)
-            {
-                if (child->z < actor->z)
-                {
-                    child->z = actor->z - dist;
-                }
-                else
-                {
-                    child->z = actor->z + dist;
-                }
-            }
-            else
-            {
-                child->z = actor->z + FixedMul(FixedDiv(newDistance,
-                                                        oldDistance),
-                                               child->z - actor->z);
-            }
-        }
-        CHolyTailFollow(child, dist - FRACUNIT);
-    }
-}
-
-//============================================================================
-//
-// CHolyTailRemove
-//
-//============================================================================
-
-static void CHolyTailRemove(mobj_t * actor)
-{
-    mobj_t *child;
-
-    child = actor->special1.m;
-    if (child)
-    {
-        CHolyTailRemove(child);
-    }
-    P_RemoveMobj(actor);
-}
-
-//============================================================================
-//
-// A_CHolyTail
-//
-//============================================================================
-
-void A_CHolyTail(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *parent;
-
-    parent = actor->special2.m;
-
-    if (parent)
-    {
-        if (parent->state >= &states[parent->info->deathstate])
-        {                       // Ghost removed, so remove all tail parts
-            CHolyTailRemove(actor);
-            return;
-        }
-        else if (P_TryMove(actor, parent->x - FixedMul(14 * FRACUNIT,
-                                                       finecosine[parent->
-                                                                  angle >>
-                                                                  ANGLETOFINESHIFT]),
-                           parent->y - FixedMul(14 * FRACUNIT,
-                                                finesine[parent->
-                                                         angle >>
-                                                         ANGLETOFINESHIFT])))
-        {
-            actor->z = parent->z - 5 * FRACUNIT;
-        }
-        CHolyTailFollow(actor, 10 * FRACUNIT);
-    }
-}
-
-//============================================================================
-//
-// A_CHolyCheckScream
-//
-//============================================================================
-
-void A_CHolyCheckScream(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    A_CHolySeek(actor, player, psp);
-    if (P_Random() < 20)
-    {
-        S_StartSound(actor, SFX_SPIRIT_ACTIVE);
-    }
-    if (!actor->special1.m)
-    {
-        CHolyFindTarget(actor);
-    }
-}
-
-//============================================================================
-//
-// A_CHolySpawnPuff
-//
-//============================================================================
-
-void A_CHolySpawnPuff(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z, MT_HOLY_MISSILE_PUFF);
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FireConePL1
-//
-//----------------------------------------------------------------------------
-
-#define SHARDSPAWN_LEFT		1
-#define SHARDSPAWN_RIGHT	2
-#define SHARDSPAWN_UP		4
-#define SHARDSPAWN_DOWN		8
-
-void A_FireConePL1(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    angle_t angle;
-    int damage;
-    int i;
-    mobj_t *pmo, *mo;
-    int conedone = false;
-
-    pmo = player->mo;
-    player->mana[MANA_1] -= WeaponManaUse[player->class][player->readyweapon];
-    S_StartSound(pmo, SFX_MAGE_SHARDS_FIRE);
-
-    damage = 90 + (P_Random() & 15);
-    for (i = 0; i < 16; i++)
-    {
-        angle = pmo->angle + i * (ANG45 / 16);
-        P_AimLineAttack(pmo, angle, MELEERANGE);
-        if (linetarget)
-        {
-            pmo->flags2 |= MF2_ICEDAMAGE;
-            P_DamageMobj(linetarget, pmo, pmo, damage);
-            pmo->flags2 &= ~MF2_ICEDAMAGE;
-            conedone = true;
-            break;
-        }
-    }
-
-    // didn't find any creatures, so fire projectiles
-    if (!conedone)
-    {
-        mo = P_SpawnPlayerMissile(pmo, MT_SHARDFX1);
-        if (mo)
-        {
-            mo->special1.i = SHARDSPAWN_LEFT | SHARDSPAWN_DOWN | SHARDSPAWN_UP
-                | SHARDSPAWN_RIGHT;
-            mo->special2.i = 3;   // Set sperm count (levels of reproductivity)
-            mo->target = pmo;
-            mo->args[0] = 3;    // Mark Initial shard as super damage
-        }
-    }
-}
-
-void A_ShedShard(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    mobj_t *mo;
-    int spawndir = actor->special1.i;
-    int spermcount = actor->special2.i;
-
-    if (spermcount <= 0)
-        return;                 // No sperm left
-    actor->special2.i = 0;
-    spermcount--;
-
-    // every so many calls, spawn a new missile in it's set directions
-    if (spawndir & SHARDSPAWN_LEFT)
-    {
-        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1,
-                                      actor->angle + (ANG45 / 9), 0,
-                                      (20 + 2 * spermcount) << FRACBITS);
-        if (mo)
-        {
-            mo->special1.i = SHARDSPAWN_LEFT;
-            mo->special2.i = spermcount;
-            mo->momz = actor->momz;
-            mo->target = actor->target;
-            mo->args[0] = (spermcount == 3) ? 2 : 0;
-        }
-    }
-    if (spawndir & SHARDSPAWN_RIGHT)
-    {
-        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1,
-                                      actor->angle - (ANG45 / 9), 0,
-                                      (20 + 2 * spermcount) << FRACBITS);
-        if (mo)
-        {
-            mo->special1.i = SHARDSPAWN_RIGHT;
-            mo->special2.i = spermcount;
-            mo->momz = actor->momz;
-            mo->target = actor->target;
-            mo->args[0] = (spermcount == 3) ? 2 : 0;
-        }
-    }
-    if (spawndir & SHARDSPAWN_UP)
-    {
-        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1, actor->angle,
-                                      0, (15 + 2 * spermcount) << FRACBITS);
-        if (mo)
-        {
-            mo->momz = actor->momz;
-            mo->z += 8 * FRACUNIT;
-            if (spermcount & 1) // Every other reproduction
-                mo->special1.i =
-                    SHARDSPAWN_UP | SHARDSPAWN_LEFT | SHARDSPAWN_RIGHT;
-            else
-                mo->special1.i = SHARDSPAWN_UP;
-            mo->special2.i = spermcount;
-            mo->target = actor->target;
-            mo->args[0] = (spermcount == 3) ? 2 : 0;
-        }
-    }
-    if (spawndir & SHARDSPAWN_DOWN)
-    {
-        mo = P_SpawnMissileAngleSpeed(actor, MT_SHARDFX1, actor->angle,
-                                      0, (15 + 2 * spermcount) << FRACBITS);
-        if (mo)
-        {
-            mo->momz = actor->momz;
-            mo->z -= 4 * FRACUNIT;
-            if (spermcount & 1) // Every other reproduction
-                mo->special1.i =
-                    SHARDSPAWN_DOWN | SHARDSPAWN_LEFT | SHARDSPAWN_RIGHT;
-            else
-                mo->special1.i = SHARDSPAWN_DOWN;
-            mo->special2.i = spermcount;
-            mo->target = actor->target;
-            mo->args[0] = (spermcount == 3) ? 2 : 0;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC A_HideInCeiling
-//
-//----------------------------------------------------------------------------
-
-/*
-void A_HideInCeiling(mobj_t *actor)
-{
-	actor->z = actor->ceilingz+4*FRACUNIT;
-}
-*/
-
-//----------------------------------------------------------------------------
-//
-// PROC A_FloatPuff
-//
-//----------------------------------------------------------------------------
-
-/*
-void A_FloatPuff(mobj_t *puff)
-{
-	puff->momz += 1.8*FRACUNIT;
-}
-*/
-
-void A_Light0(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    player->extralight = 0;
-}
-
-/*
-void A_Light1(player_t *player, pspdef_t *psp)
-{
-	player->extralight = 1;
-}
-*/
-
-/*
-void A_Light2(player_t *player, pspdef_t *psp)
-{
-	player->extralight = 2;
-}
-*/
-
-//------------------------------------------------------------------------
-//
-// PROC P_SetupPsprites
-//
-// Called at start of level for each player
-//
-//------------------------------------------------------------------------
-
-void P_SetupPsprites(player_t * player)
-{
-    int i;
-
-    // Remove all psprites
-    for (i = 0; i < NUMPSPRITES; i++)
-    {
-        player->psprites[i].state = NULL;
-    }
-    // Spawn the ready weapon
-    player->pendingweapon = player->readyweapon;
-    P_BringUpWeapon(player);
-}
-
-//------------------------------------------------------------------------
-//
-// PROC P_MovePsprites
-//
-// Called every tic by player thinking routine
-//
-//------------------------------------------------------------------------
-
-void P_MovePsprites(player_t * player)
-{
-    int i;
-    pspdef_t *psp;
-
-    psp = &player->psprites[0];
-    for (i = 0; i < NUMPSPRITES; i++, psp++)
-    {
-        if (psp->state != 0)  // a null state means not active
-        {
-            // drop tic count and possibly change state
-            if (psp->tics != -1)        // a -1 tic count never changes
-            {
-                psp->tics--;
-                if (!psp->tics)
-                {
-                    P_SetPsprite(player, i, psp->state->nextstate);
-                }
-            }
-        }
-    }
-    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
-    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
-}
diff --git a/games/NXDoom/src/hexen/p_setup.c b/games/NXDoom/src/hexen/p_setup.c
deleted file mode 100644
index d71907727..000000000
--- a/games/NXDoom/src/hexen/p_setup.c
+++ /dev/null
@@ -1,1273 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include <math.h>
-#include <stdlib.h>
-#include "h2def.h"
-#include "i_system.h"
-#include "m_argv.h"
-#include "m_bbox.h"
-#include "m_misc.h"
-#include "i_swap.h"
-#include "s_sound.h"
-#include "p_local.h"
-#include "p_rejectpad.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAPINFO_SCRIPT_NAME "MAPINFO"
-#define MCMD_SKY1 1
-#define MCMD_SKY2 2
-#define MCMD_LIGHTNING 3
-#define MCMD_FADETABLE 4
-#define MCMD_DOUBLESKY 5
-#define MCMD_CLUSTER 6
-#define MCMD_WARPTRANS 7
-#define MCMD_NEXT 8
-#define MCMD_CDTRACK 9
-#define MCMD_CD_STARTTRACK 10
-#define MCMD_CD_END1TRACK 11
-#define MCMD_CD_END2TRACK 12
-#define MCMD_CD_END3TRACK 13
-#define MCMD_CD_INTERTRACK 14
-#define MCMD_CD_TITLETRACK 15
-
-#define UNKNOWN_MAP_NAME "DEVELOPMENT MAP"
-#define DEFAULT_SKY_NAME "SKY1"
-#define DEFAULT_SONG_LUMP "DEFSONG"
-#define DEFAULT_FADE_TABLE "COLORMAP"
-
-// TYPES -------------------------------------------------------------------
-
-typedef struct mapInfo_s mapInfo_t;
-struct mapInfo_s
-{
-    short cluster;
-    short warpTrans;
-    short nextMap;
-    short cdTrack;
-    char name[32];
-    short sky1Texture;
-    short sky2Texture;
-    fixed_t sky1ScrollDelta;
-    fixed_t sky2ScrollDelta;
-    boolean doubleSky;
-    boolean lightning;
-    int fadetable;
-    char songLump[10];
-};
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-void P_SpawnMapThing(mapthing_t * mthing);
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static int QualifyMap(int map);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-int MapCount;
-mapthing_t deathmatchstarts[MAXDEATHMATCHSTARTS], *deathmatch_p;
-mapthing_t playerstarts[MAX_PLAYER_STARTS][MAXPLAYERS];
-int numvertexes;
-vertex_t *vertexes;
-int numsegs;
-seg_t *segs;
-int numsectors;
-sector_t *sectors;
-int numsubsectors;
-subsector_t *subsectors;
-int numnodes;
-node_t *nodes;
-int numlines;
-line_t *lines;
-int numsides;
-side_t *sides;
-static int totallines;
-short *blockmaplump;            // offsets in blockmap are from here
-short *blockmap;
-int bmapwidth, bmapheight;      // in mapblocks
-fixed_t bmaporgx, bmaporgy;     // origin of block map
-mobj_t **blocklinks;            // for thing chains
-byte *rejectmatrix;             // for fast sight rejection
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static mapInfo_t MapInfo[99];
-static const char *MapCmdNames[] = {
-    "SKY1",
-    "SKY2",
-    "DOUBLESKY",
-    "LIGHTNING",
-    "FADETABLE",
-    "CLUSTER",
-    "WARPTRANS",
-    "NEXT",
-    "CDTRACK",
-    "CD_START_TRACK",
-    "CD_END1_TRACK",
-    "CD_END2_TRACK",
-    "CD_END3_TRACK",
-    "CD_INTERMISSION_TRACK",
-    "CD_TITLE_TRACK",
-    NULL
-};
-static int MapCmdIDs[] = {
-    MCMD_SKY1,
-    MCMD_SKY2,
-    MCMD_DOUBLESKY,
-    MCMD_LIGHTNING,
-    MCMD_FADETABLE,
-    MCMD_CLUSTER,
-    MCMD_WARPTRANS,
-    MCMD_NEXT,
-    MCMD_CDTRACK,
-    MCMD_CD_STARTTRACK,
-    MCMD_CD_END1TRACK,
-    MCMD_CD_END2TRACK,
-    MCMD_CD_END3TRACK,
-    MCMD_CD_INTERTRACK,
-    MCMD_CD_TITLETRACK
-};
-
-static int cd_NonLevelTracks[6];        // Non-level specific song cd track numbers 
-
-// CODE --------------------------------------------------------------------
-
-/*
-=================
-=
-= P_LoadVertexes
-=
-=================
-*/
-
-void P_LoadVertexes(int lump)
-{
-    byte *data;
-    int i;
-    mapvertex_t *ml;
-    vertex_t *li;
-
-    numvertexes = W_LumpLength(lump) / sizeof(mapvertex_t);
-    vertexes = Z_Malloc(numvertexes * sizeof(vertex_t), PU_LEVEL, 0);
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ml = (mapvertex_t *) data;
-    li = vertexes;
-    for (i = 0; i < numvertexes; i++, li++, ml++)
-    {
-        li->x = SHORT(ml->x) << FRACBITS;
-        li->y = SHORT(ml->y) << FRACBITS;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSegs
-=
-=================
-*/
-
-void P_LoadSegs(int lump)
-{
-    byte *data;
-    int i;
-    mapseg_t *ml;
-    seg_t *li;
-    line_t *ldef;
-    int linedef, side;
-
-    numsegs = W_LumpLength(lump) / sizeof(mapseg_t);
-    segs = Z_Malloc(numsegs * sizeof(seg_t), PU_LEVEL, 0);
-    memset(segs, 0, numsegs * sizeof(seg_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ml = (mapseg_t *) data;
-    li = segs;
-    for (i = 0; i < numsegs; i++, li++, ml++)
-    {
-        li->v1 = &vertexes[SHORT(ml->v1)];
-        li->v2 = &vertexes[SHORT(ml->v2)];
-
-        li->angle = (SHORT(ml->angle)) << 16;
-        li->offset = (SHORT(ml->offset)) << 16;
-        linedef = SHORT(ml->linedef);
-        ldef = &lines[linedef];
-        li->linedef = ldef;
-        side = SHORT(ml->side);
-        li->sidedef = &sides[ldef->sidenum[side]];
-        li->frontsector = sides[ldef->sidenum[side]].sector;
-        if (ldef->flags & ML_TWOSIDED)
-            li->backsector = sides[ldef->sidenum[side ^ 1]].sector;
-        else
-            li->backsector = 0;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSubsectors
-=
-=================
-*/
-
-void P_LoadSubsectors(int lump)
-{
-    byte *data;
-    int i;
-    mapsubsector_t *ms;
-    subsector_t *ss;
-
-    numsubsectors = W_LumpLength(lump) / sizeof(mapsubsector_t);
-    subsectors = Z_Malloc(numsubsectors * sizeof(subsector_t), PU_LEVEL, 0);
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ms = (mapsubsector_t *) data;
-    memset(subsectors, 0, numsubsectors * sizeof(subsector_t));
-    ss = subsectors;
-    for (i = 0; i < numsubsectors; i++, ss++, ms++)
-    {
-        ss->numlines = SHORT(ms->numsegs);
-        ss->firstline = SHORT(ms->firstseg);
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSectors
-=
-=================
-*/
-
-void P_LoadSectors(int lump)
-{
-    byte *data;
-    int i;
-    mapsector_t *ms;
-    sector_t *ss;
-
-    numsectors = W_LumpLength(lump) / sizeof(mapsector_t);
-    sectors = Z_Malloc(numsectors * sizeof(sector_t), PU_LEVEL, 0);
-    memset(sectors, 0, numsectors * sizeof(sector_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    ms = (mapsector_t *) data;
-    ss = sectors;
-
-    for (i = 0; i < numsectors; i++, ss++, ms++)
-    {
-        ss->floorheight = SHORT(ms->floorheight) << FRACBITS;
-        ss->ceilingheight = SHORT(ms->ceilingheight) << FRACBITS;
-        ss->floorpic = R_FlatNumForName(ms->floorpic);
-        ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
-        ss->lightlevel = SHORT(ms->lightlevel);
-        ss->special = SHORT(ms->special);
-        ss->tag = SHORT(ms->tag);
-        ss->thinglist = NULL;
-        ss->seqType = SEQTYPE_STONE;    // default seqType
-    }
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadNodes
-=
-=================
-*/
-
-void P_LoadNodes(int lump)
-{
-    byte *data;
-    int i, j, k;
-    mapnode_t *mn;
-    node_t *no;
-
-    numnodes = W_LumpLength(lump) / sizeof(mapnode_t);
-    nodes = Z_Malloc(numnodes * sizeof(node_t), PU_LEVEL, 0);
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    mn = (mapnode_t *) data;
-    no = nodes;
-    for (i = 0; i < numnodes; i++, no++, mn++)
-    {
-        no->x = SHORT(mn->x) << FRACBITS;
-        no->y = SHORT(mn->y) << FRACBITS;
-        no->dx = SHORT(mn->dx) << FRACBITS;
-        no->dy = SHORT(mn->dy) << FRACBITS;
-        for (j = 0; j < 2; j++)
-        {
-            no->children[j] = SHORT(mn->children[j]);
-            for (k = 0; k < 4; k++)
-                no->bbox[j][k] = SHORT(mn->bbox[j][k]) << FRACBITS;
-        }
-    }
-    W_ReleaseLumpNum(lump);
-}
-
-//==========================================================================
-//
-// P_LoadThings
-//
-//==========================================================================
-
-void P_LoadThings(int lump)
-{
-    byte *data;
-    int i;
-    mapthing_t spawnthing;
-    mapthing_t *mt;
-    int numthings;
-    int playerCount;
-    int deathSpotsCount;
-
-    data = W_CacheLumpNum(lump, PU_STATIC);
-    numthings = W_LumpLength(lump) / sizeof(mapthing_t);
-
-    mt = (mapthing_t *) data;
-    for (i = 0; i < numthings; i++, mt++)
-    {
-        spawnthing.tid = SHORT(mt->tid);
-        spawnthing.x = SHORT(mt->x);
-        spawnthing.y = SHORT(mt->y);
-        spawnthing.height = SHORT(mt->height);
-        spawnthing.angle = SHORT(mt->angle);
-        spawnthing.type = SHORT(mt->type);
-        spawnthing.options = SHORT(mt->options);
-
-        spawnthing.special = mt->special;
-        spawnthing.arg1 = mt->arg1;
-        spawnthing.arg2 = mt->arg2;
-        spawnthing.arg3 = mt->arg3;
-        spawnthing.arg4 = mt->arg4;
-        spawnthing.arg5 = mt->arg5;
-
-        P_SpawnMapThing(&spawnthing);
-    }
-    P_CreateTIDList();
-    P_InitCreatureCorpseQueue(false);   // false = do NOT scan for corpses
-    W_ReleaseLumpNum(lump);
-
-    if (!deathmatch)
-    {                           // Don't need to check deathmatch spots
-        return;
-    }
-    playerCount = 0;
-    for (i = 0; i < maxplayers; i++)
-    {
-        playerCount += playeringame[i];
-    }
-    deathSpotsCount = deathmatch_p - deathmatchstarts;
-    if (deathSpotsCount < playerCount)
-    {
-        I_Error("P_LoadThings: Player count (%d) exceeds deathmatch "
-                "spots (%d)", playerCount, deathSpotsCount);
-    }
-}
-
-/*
-=================
-=
-= P_LoadLineDefs
-=
-=================
-*/
-
-void P_LoadLineDefs(int lump)
-{
-    byte *data;
-    int i;
-    maplinedef_t *mld;
-    line_t *ld;
-    vertex_t *v1, *v2;
-
-    numlines = W_LumpLength(lump) / sizeof(maplinedef_t);
-    lines = Z_Malloc(numlines * sizeof(line_t), PU_LEVEL, 0);
-    memset(lines, 0, numlines * sizeof(line_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    mld = (maplinedef_t *) data;
-    ld = lines;
-    for (i = 0; i < numlines; i++, mld++, ld++)
-    {
-        ld->flags = SHORT(mld->flags);
-
-        // Old line special info ...
-        //ld->special = SHORT(mld->special);
-        //ld->tag = SHORT(mld->tag);
-
-        // New line special info ...
-        ld->special = mld->special;
-        ld->arg1 = mld->arg1;
-        ld->arg2 = mld->arg2;
-        ld->arg3 = mld->arg3;
-        ld->arg4 = mld->arg4;
-        ld->arg5 = mld->arg5;
-
-        v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
-        v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
-        ld->dx = v2->x - v1->x;
-        ld->dy = v2->y - v1->y;
-        if (!ld->dx)
-            ld->slopetype = ST_VERTICAL;
-        else if (!ld->dy)
-            ld->slopetype = ST_HORIZONTAL;
-        else
-        {
-            if (FixedDiv(ld->dy, ld->dx) > 0)
-                ld->slopetype = ST_POSITIVE;
-            else
-                ld->slopetype = ST_NEGATIVE;
-        }
-
-        if (v1->x < v2->x)
-        {
-            ld->bbox[BOXLEFT] = v1->x;
-            ld->bbox[BOXRIGHT] = v2->x;
-        }
-        else
-        {
-            ld->bbox[BOXLEFT] = v2->x;
-            ld->bbox[BOXRIGHT] = v1->x;
-        }
-        if (v1->y < v2->y)
-        {
-            ld->bbox[BOXBOTTOM] = v1->y;
-            ld->bbox[BOXTOP] = v2->y;
-        }
-        else
-        {
-            ld->bbox[BOXBOTTOM] = v2->y;
-            ld->bbox[BOXTOP] = v1->y;
-        }
-        ld->sidenum[0] = SHORT(mld->sidenum[0]);
-        ld->sidenum[1] = SHORT(mld->sidenum[1]);
-        if (ld->sidenum[0] != -1)
-            ld->frontsector = sides[ld->sidenum[0]].sector;
-        else
-            ld->frontsector = 0;
-        if (ld->sidenum[1] != -1)
-            ld->backsector = sides[ld->sidenum[1]].sector;
-        else
-            ld->backsector = 0;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-/*
-=================
-=
-= P_LoadSideDefs
-=
-=================
-*/
-
-void P_LoadSideDefs(int lump)
-{
-    byte *data;
-    int i;
-    mapsidedef_t *msd;
-    side_t *sd;
-
-    numsides = W_LumpLength(lump) / sizeof(mapsidedef_t);
-    sides = Z_Malloc(numsides * sizeof(side_t), PU_LEVEL, 0);
-    memset(sides, 0, numsides * sizeof(side_t));
-    data = W_CacheLumpNum(lump, PU_STATIC);
-
-    msd = (mapsidedef_t *) data;
-    sd = sides;
-
-    for (i = 0; i < numsides; i++, msd++, sd++)
-    {
-        sd->textureoffset = SHORT(msd->textureoffset) << FRACBITS;
-        sd->rowoffset = SHORT(msd->rowoffset) << FRACBITS;
-        sd->toptexture = R_TextureNumForName(msd->toptexture);
-        sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
-        sd->midtexture = R_TextureNumForName(msd->midtexture);
-        sd->sector = &sectors[SHORT(msd->sector)];
-    }
-    W_ReleaseLumpNum(lump);
-}
-
-/*
-=================
-=
-= P_LoadBlockMap
-=
-=================
-*/
-
-void P_LoadBlockMap(int lump)
-{
-    int i, count;
-    int lumplen;
-
-    lumplen = W_LumpLength(lump);
-
-    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
-    W_ReadLump(lump, blockmaplump);
-    blockmap = blockmaplump + 4;
-
-    // Swap all short integers to native byte ordering:
-
-    count = lumplen / 2;
-
-    for (i = 0; i < count; i++)
-        blockmaplump[i] = SHORT(blockmaplump[i]);
-
-    bmaporgx = blockmaplump[0] << FRACBITS;
-    bmaporgy = blockmaplump[1] << FRACBITS;
-    bmapwidth = blockmaplump[2];
-    bmapheight = blockmaplump[3];
-
-    // clear out mobj chains
-
-    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
-    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
-    memset(blocklinks, 0, count);
-}
-
-
-
-
-/*
-=================
-=
-= P_GroupLines
-=
-= Builds sector line lists and subsector sector numbers
-= Finds block bounding boxes for sectors
-=================
-*/
-
-void P_DegenMobjThinker(thinker_t *thinker)
-{
-  (void) thinker;
-  I_Error("This function should never get called.");
-}
-
-void P_GroupLines(void)
-{
-    line_t **linebuffer;
-    int i, j;
-    line_t *li;
-    sector_t *sector;
-    subsector_t *ss;
-    seg_t *seg;
-    fixed_t bbox[4];
-    int block;
-
-// look up sector number for each subsector
-    ss = subsectors;
-    for (i = 0; i < numsubsectors; i++, ss++)
-    {
-        seg = &segs[ss->firstline];
-        ss->sector = seg->sidedef->sector;
-    }
-
-// count number of lines in each sector
-    li = lines;
-    totallines = 0;
-    for (i = 0; i < numlines; i++, li++)
-    {
-        totallines++;
-        li->frontsector->linecount++;
-        if (li->backsector && li->backsector != li->frontsector)
-        {
-            li->backsector->linecount++;
-            totallines++;
-        }
-    }
-
-// build line tables for each sector
-    linebuffer = Z_Malloc(totallines * sizeof(line_t *), PU_LEVEL, 0);
-    sector = sectors;
-    for (i = 0; i < numsectors; i++, sector++)
-    {
-        M_ClearBox(bbox);
-        sector->lines = linebuffer;
-        li = lines;
-        for (j = 0; j < numlines; j++, li++)
-        {
-            if (li->frontsector == sector || li->backsector == sector)
-            {
-                *linebuffer++ = li;
-                M_AddToBox(bbox, li->v1->x, li->v1->y);
-                M_AddToBox(bbox, li->v2->x, li->v2->y);
-            }
-        }
-        if (linebuffer - sector->lines != sector->linecount)
-            I_Error("P_GroupLines: miscounted");
-
-        // set the degenmobj_t to the middle of the bounding box
-        sector->soundorg.x = (bbox[BOXRIGHT] + bbox[BOXLEFT]) / 2;
-        sector->soundorg.y = (bbox[BOXTOP] + bbox[BOXBOTTOM]) / 2;
-        sector->soundorg.thinker.function = (think_t) P_DegenMobjThinker;
-
-        // adjust bounding box to map blocks
-        block = (bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block >= bmapheight ? bmapheight - 1 : block;
-        sector->blockbox[BOXTOP] = block;
-
-        block = (bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block < 0 ? 0 : block;
-        sector->blockbox[BOXBOTTOM] = block;
-
-        block = (bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block >= bmapwidth ? bmapwidth - 1 : block;
-        sector->blockbox[BOXRIGHT] = block;
-
-        block = (bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-        block = block < 0 ? 0 : block;
-        sector->blockbox[BOXLEFT] = block;
-    }
-
-}
-
-
-static void P_LoadReject(int lumpnum)
-{
-    int minlength;
-    int lumplen;
-
-    // Calculate the size that the REJECT lump *should* be.
-
-    minlength = (numsectors * numsectors + 7) / 8;
-
-    // If the lump meets the minimum length, it can be loaded directly.
-    // Otherwise, we need to allocate a buffer of the correct size
-    // and pad it with appropriate data.
-
-    lumplen = W_LumpLength(lumpnum);
-
-    if (lumplen >= minlength)
-    {
-        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
-    }
-    else
-    {
-        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
-        W_ReadLump(lumpnum, rejectmatrix);
-
-        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
-    }
-}
-
-//=============================================================================
-
-lumpinfo_t *maplumpinfo;
-
-/*
-=================
-=
-= P_SetupLevel
-=
-=================
-*/
-
-void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
-{
-    int i;
-    int parm;
-    char lumpname[9];
-    int lumpnum;
-    mobj_t *mobj;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        players[i].killcount = players[i].secretcount
-            = players[i].itemcount = 0;
-    }
-    players[consoleplayer].viewz = 1;   // will be set by player think
-
-    // Waiting-for-level-load song; not played if playing music from CD
-    // (the seek time will be so long it will just make loading take
-    // longer)
-    if (!cdmusic)
-    {
-        S_StartSongName("chess", true);
-    }
-
-    Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
-
-    P_InitThinkers();
-    leveltime = 0;
-
-    M_snprintf(lumpname, sizeof(lumpname), "MAP%02d", map);
-    lumpnum = W_GetNumForName(lumpname);
-
-    maplumpinfo = lumpinfo[lumpnum];
-
-    //
-    // Begin processing map lumps
-    // Note: most of this ordering is important
-    //
-    P_LoadBlockMap(lumpnum + ML_BLOCKMAP);
-    P_LoadVertexes(lumpnum + ML_VERTEXES);
-    P_LoadSectors(lumpnum + ML_SECTORS);
-    P_LoadSideDefs(lumpnum + ML_SIDEDEFS);
-    P_LoadLineDefs(lumpnum + ML_LINEDEFS);
-    P_LoadSubsectors(lumpnum + ML_SSECTORS);
-    P_LoadNodes(lumpnum + ML_NODES);
-    P_LoadSegs(lumpnum + ML_SEGS);
-    P_GroupLines();
-    P_LoadReject(lumpnum + ML_REJECT);
-    bodyqueslot = 0;
-    po_NumPolyobjs = 0;
-    deathmatch_p = deathmatchstarts;
-    P_LoadThings(lumpnum + ML_THINGS);
-    PO_Init(lumpnum + ML_THINGS);       // Initialize the polyobjs
-    P_LoadACScripts(lumpnum + ML_BEHAVIOR);     // ACS object code
-    //
-    // End of map lump processing
-    //
-
-    // If deathmatch, randomly spawn the active players
-    TimerGame = 0;
-    if (deathmatch)
-    {
-        for (i = 0; i < maxplayers; i++)
-        {
-            if (playeringame[i])
-            {                   // must give a player spot before deathmatchspawn
-                mobj = P_SpawnMobj(playerstarts[0][i].x << 16,
-                                   playerstarts[0][i].y << 16, 0,
-                                   MT_PLAYER_FIGHTER);
-                players[i].mo = mobj;
-                G_DeathMatchSpawnPlayer(i);
-                P_RemoveMobj(mobj);
-            }
-        }
-
-        //!
-        // @arg <n>
-        // @category net
-        // @vanilla
-        //
-        // For multiplayer games: exit each level after n minutes.
-        //
-
-        parm = M_CheckParmWithArgs("-timer", 1);
-        if (parm)
-        {
-            TimerGame = atoi(myargv[parm + 1]) * 35 * 60;
-        }
-    }
-
-// set up world state
-    P_SpawnSpecials();
-
-// build subsector connect matrix
-//      P_ConnectSubsectors ();
-
-// Load colormap and set the fullbright flag
-    i = P_GetMapFadeTable(gamemap);
-    W_ReadLump(i, colormaps);
-    if (i == W_GetNumForName("COLORMAP"))
-    {
-        LevelUseFullBright = true;
-    }
-    else
-    {                           // Probably fog ... don't use fullbright sprites
-        LevelUseFullBright = false;
-    }
-
-// preload graphics
-    if (precache)
-        R_PrecacheLevel();
-
-    // Check if the level is a lightning level
-    P_InitLightning();
-
-    S_StopAllSound();
-    SN_StopAllSequences();
-    S_StartSong(gamemap, true);
-
-//printf ("free memory: 0x%x\n", Z_FreeMemory());
-
-}
-
-//==========================================================================
-//
-// InitMapInfo
-//
-//==========================================================================
-
-static void InitMapInfo(void)
-{
-    int map;
-    int mapMax;
-    int mcmdValue;
-    mapInfo_t *info;
-    char songMulch[10];
-    const char *default_sky_name = DEFAULT_SKY_NAME;
-
-    mapMax = 1;
-
-    if (gamemode == shareware)
-    {
-	default_sky_name = "SKY2";
-    }
-
-    // Put defaults into MapInfo[0]
-    info = MapInfo;
-    info->cluster = 0;
-    info->warpTrans = 0;
-    info->nextMap = 1;          // Always go to map 1 if not specified
-    info->cdTrack = 1;
-    info->sky1Texture = R_TextureNumForName(default_sky_name);
-    info->sky2Texture = info->sky1Texture;
-    info->sky1ScrollDelta = 0;
-    info->sky2ScrollDelta = 0;
-    info->doubleSky = false;
-    info->lightning = false;
-    info->fadetable = W_GetNumForName(DEFAULT_FADE_TABLE);
-    M_StringCopy(info->name, UNKNOWN_MAP_NAME, sizeof(info->name));
-
-//    M_StringCopy(info->songLump, DEFAULT_SONG_LUMP, sizeof(info->songLump));
-    SC_Open(MAPINFO_SCRIPT_NAME);
-    while (SC_GetString())
-    {
-        if (SC_Compare("MAP") == false)
-        {
-            SC_ScriptError(NULL);
-        }
-        SC_MustGetNumber();
-        if (sc_Number < 1 || sc_Number > 99)
-        {                       // 
-            SC_ScriptError(NULL);
-        }
-        map = sc_Number;
-
-        info = &MapInfo[map];
-
-        // Save song lump name
-        M_StringCopy(songMulch, info->songLump, sizeof(songMulch));
-
-        // Copy defaults to current map definition
-        memcpy(info, &MapInfo[0], sizeof(*info));
-
-        // Restore song lump name
-        M_StringCopy(info->songLump, songMulch, sizeof(info->songLump));
-
-        // The warp translation defaults to the map number
-        info->warpTrans = map;
-
-        // Map name must follow the number
-        SC_MustGetString();
-        M_StringCopy(info->name, sc_String, sizeof(info->name));
-
-        // Process optional tokens
-        while (SC_GetString())
-        {
-            if (SC_Compare("MAP"))
-            {                   // Start next map definition
-                SC_UnGet();
-                break;
-            }
-            mcmdValue = MapCmdIDs[SC_MustMatchString(MapCmdNames)];
-            switch (mcmdValue)
-            {
-                case MCMD_CLUSTER:
-                    SC_MustGetNumber();
-                    info->cluster = sc_Number;
-                    break;
-                case MCMD_WARPTRANS:
-                    SC_MustGetNumber();
-                    info->warpTrans = sc_Number;
-                    break;
-                case MCMD_NEXT:
-                    SC_MustGetNumber();
-                    info->nextMap = sc_Number;
-                    break;
-                case MCMD_CDTRACK:
-                    SC_MustGetNumber();
-                    info->cdTrack = sc_Number;
-                    break;
-                case MCMD_SKY1:
-                    SC_MustGetString();
-                    info->sky1Texture = R_TextureNumForName(sc_String);
-                    SC_MustGetNumber();
-                    info->sky1ScrollDelta = sc_Number << 8;
-                    break;
-                case MCMD_SKY2:
-                    SC_MustGetString();
-                    info->sky2Texture = R_TextureNumForName(sc_String);
-                    SC_MustGetNumber();
-                    info->sky2ScrollDelta = sc_Number << 8;
-                    break;
-                case MCMD_DOUBLESKY:
-                    info->doubleSky = true;
-                    break;
-                case MCMD_LIGHTNING:
-                    info->lightning = true;
-                    break;
-                case MCMD_FADETABLE:
-                    SC_MustGetString();
-                    info->fadetable = W_GetNumForName(sc_String);
-                    break;
-                case MCMD_CD_STARTTRACK:
-                case MCMD_CD_END1TRACK:
-                case MCMD_CD_END2TRACK:
-                case MCMD_CD_END3TRACK:
-                case MCMD_CD_INTERTRACK:
-                case MCMD_CD_TITLETRACK:
-                    SC_MustGetNumber();
-                    cd_NonLevelTracks[mcmdValue - MCMD_CD_STARTTRACK] =
-                        sc_Number;
-                    break;
-            }
-        }
-        mapMax = map > mapMax ? map : mapMax;
-    }
-    SC_Close();
-    MapCount = mapMax;
-}
-
-//==========================================================================
-//
-// P_GetMapCluster
-//
-//==========================================================================
-
-int P_GetMapCluster(int map)
-{
-    return MapInfo[QualifyMap(map)].cluster;
-}
-
-//==========================================================================
-//
-// P_GetMapCDTrack
-//
-//==========================================================================
-
-int P_GetMapCDTrack(int map)
-{
-    return MapInfo[QualifyMap(map)].cdTrack;
-}
-
-//==========================================================================
-//
-// P_GetMapWarpTrans
-//
-//==========================================================================
-
-int P_GetMapWarpTrans(int map)
-{
-    return MapInfo[QualifyMap(map)].warpTrans;
-}
-
-//==========================================================================
-//
-// P_GetMapNextMap
-//
-//==========================================================================
-
-int P_GetMapNextMap(int map)
-{
-    return MapInfo[QualifyMap(map)].nextMap;
-}
-
-//==========================================================================
-//
-// P_TranslateMap
-//
-// Returns the actual map number given a warp map number.
-//
-//==========================================================================
-
-int P_TranslateMap(int map)
-{
-    int i;
-
-    for (i = 1; i < 99; i++)    // Make this a macro
-    {
-        if (MapInfo[i].warpTrans == map)
-        {
-            return i;
-        }
-    }
-    // Not found
-    return -1;
-}
-
-//==========================================================================
-//
-// P_GetMapSky1Texture
-//
-//==========================================================================
-
-int P_GetMapSky1Texture(int map)
-{
-    return MapInfo[QualifyMap(map)].sky1Texture;
-}
-
-//==========================================================================
-//
-// P_GetMapSky2Texture
-//
-//==========================================================================
-
-int P_GetMapSky2Texture(int map)
-{
-    return MapInfo[QualifyMap(map)].sky2Texture;
-}
-
-//==========================================================================
-//
-// P_GetMapName
-//
-//==========================================================================
-
-char *P_GetMapName(int map)
-{
-    return MapInfo[QualifyMap(map)].name;
-}
-
-//==========================================================================
-//
-// P_GetMapSky1ScrollDelta
-//
-//==========================================================================
-
-fixed_t P_GetMapSky1ScrollDelta(int map)
-{
-    return MapInfo[QualifyMap(map)].sky1ScrollDelta;
-}
-
-//==========================================================================
-//
-// P_GetMapSky2ScrollDelta
-//
-//==========================================================================
-
-fixed_t P_GetMapSky2ScrollDelta(int map)
-{
-    return MapInfo[QualifyMap(map)].sky2ScrollDelta;
-}
-
-//==========================================================================
-//
-// P_GetMapDoubleSky
-//
-//==========================================================================
-
-boolean P_GetMapDoubleSky(int map)
-{
-    return MapInfo[QualifyMap(map)].doubleSky;
-}
-
-//==========================================================================
-//
-// P_GetMapLightning
-//
-//==========================================================================
-
-boolean P_GetMapLightning(int map)
-{
-    return MapInfo[QualifyMap(map)].lightning;
-}
-
-//==========================================================================
-//
-// P_GetMapFadeTable
-//
-//==========================================================================
-
-boolean P_GetMapFadeTable(int map)
-{
-    return MapInfo[QualifyMap(map)].fadetable;
-}
-
-//==========================================================================
-//
-// P_GetMapSongLump
-//
-//==========================================================================
-
-char *P_GetMapSongLump(int map)
-{
-    if (!strcasecmp(MapInfo[QualifyMap(map)].songLump, DEFAULT_SONG_LUMP))
-    {
-        return NULL;
-    }
-    else
-    {
-        return MapInfo[QualifyMap(map)].songLump;
-    }
-}
-
-//==========================================================================
-//
-// P_PutMapSongLump
-//
-//==========================================================================
-
-void P_PutMapSongLump(int map, char *lumpName)
-{
-    if (map < 1 || map > MapCount)
-    {
-        return;
-    }
-    M_StringCopy(MapInfo[map].songLump, lumpName,
-                 sizeof(MapInfo[map].songLump));
-}
-
-//==========================================================================
-//
-// P_GetCDStartTrack
-//
-//==========================================================================
-
-int P_GetCDStartTrack(void)
-{
-    return cd_NonLevelTracks[MCMD_CD_STARTTRACK - MCMD_CD_STARTTRACK];
-}
-
-//==========================================================================
-//
-// P_GetCDEnd1Track
-//
-//==========================================================================
-
-int P_GetCDEnd1Track(void)
-{
-    return cd_NonLevelTracks[MCMD_CD_END1TRACK - MCMD_CD_STARTTRACK];
-}
-
-//==========================================================================
-//
-// P_GetCDEnd2Track
-//
-//==========================================================================
-
-int P_GetCDEnd2Track(void)
-{
-    return cd_NonLevelTracks[MCMD_CD_END2TRACK - MCMD_CD_STARTTRACK];
-}
-
-//==========================================================================
-//
-// P_GetCDEnd3Track
-//
-//==========================================================================
-
-int P_GetCDEnd3Track(void)
-{
-    return cd_NonLevelTracks[MCMD_CD_END3TRACK - MCMD_CD_STARTTRACK];
-}
-
-//==========================================================================
-//
-// P_GetCDIntermissionTrack
-//
-//==========================================================================
-
-int P_GetCDIntermissionTrack(void)
-{
-    return cd_NonLevelTracks[MCMD_CD_INTERTRACK - MCMD_CD_STARTTRACK];
-}
-
-//==========================================================================
-//
-// P_GetCDTitleTrack
-//
-//==========================================================================
-
-int P_GetCDTitleTrack(void)
-{
-    return cd_NonLevelTracks[MCMD_CD_TITLETRACK - MCMD_CD_STARTTRACK];
-}
-
-//==========================================================================
-//
-// QualifyMap
-//
-//==========================================================================
-
-static int QualifyMap(int map)
-{
-    return (map < 1 || map > MapCount) ? 0 : map;
-}
-
-//==========================================================================
-//
-// P_Init
-//
-//==========================================================================
-
-void P_Init(void)
-{
-    InitMapInfo();
-    P_InitSwitchList();
-    P_InitFTAnims();            // Init flat and texture animations
-    P_InitTerrainTypes();
-    P_InitLava();
-    R_InitSprites(sprnames);
-}
-
-
-// Special early initializer needed to start sound before R_Init()
-void InitMapMusicInfo(void)
-{
-    int i;
-
-    for (i = 0; i < 99; i++)
-    {
-        M_StringCopy(MapInfo[i].songLump, DEFAULT_SONG_LUMP,
-                     sizeof(MapInfo[i].songLump));
-    }
-    MapCount = 98;
-}
-
-/*
-void My_Debug(void)
-{
-	int i;
-
-	printf("My debug stuff ----------------------\n");
-	printf("gamemap=%d\n",gamemap);
-	for (i=0; i<10; i++)
-	{
-		printf("i=%d  songlump=%s\n",i,MapInfo[i].songLump);
-	}
-}
-*/
diff --git a/games/NXDoom/src/hexen/p_sight.c b/games/NXDoom/src/hexen/p_sight.c
deleted file mode 100644
index b5efd07f6..000000000
--- a/games/NXDoom/src/hexen/p_sight.c
+++ /dev/null
@@ -1,398 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "p_local.h"
-
-/*
-==============================================================================
-
-							P_CheckSight
-
-This uses specialized forms of the maputils routines for optimized performance
-
-==============================================================================
-*/
-
-fixed_t sightzstart;            // eye z of looker
-fixed_t topslope, bottomslope;  // slopes to top and bottom of target
-
-int sightcounts[3];
-
-/*
-==============
-=
-= PTR_SightTraverse
-=
-==============
-*/
-
-boolean PTR_SightTraverse(intercept_t * in)
-{
-    line_t *li;
-    fixed_t slope;
-
-    li = in->d.line;
-
-//
-// crosses a two sided line
-//
-    P_LineOpening(li);
-
-    if (openbottom >= opentop)  // quick test for totally closed doors
-        return false;           // stop
-
-    if (li->frontsector->floorheight != li->backsector->floorheight)
-    {
-        slope = FixedDiv(openbottom - sightzstart, in->frac);
-        if (slope > bottomslope)
-            bottomslope = slope;
-    }
-
-    if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-    {
-        slope = FixedDiv(opentop - sightzstart, in->frac);
-        if (slope < topslope)
-            topslope = slope;
-    }
-
-    if (topslope <= bottomslope)
-        return false;           // stop
-
-    return true;                // keep going
-}
-
-
-
-/*
-==================
-=
-= P_SightBlockLinesIterator
-=
-===================
-*/
-
-boolean P_SightBlockLinesIterator(int x, int y)
-{
-    int offset;
-    short *list;
-    line_t *ld;
-    int s1, s2;
-    divline_t dl;
-
-    polyblock_t *polyLink;
-    seg_t **segList;
-    int i;
-
-    offset = y * bmapwidth + x;
-
-    polyLink = PolyBlockMap[offset];
-    while (polyLink)
-    {
-        if (polyLink->polyobj)
-        {                       // only check non-empty links
-            if (polyLink->polyobj->validcount != validcount)
-            {
-                segList = polyLink->polyobj->segs;
-                for (i = 0; i < polyLink->polyobj->numsegs; i++, segList++)
-                {
-                    ld = (*segList)->linedef;
-                    if (ld->validcount == validcount)
-                    {
-                        continue;
-                    }
-                    ld->validcount = validcount;
-                    s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
-                    s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
-                    if (s1 == s2)
-                        continue;       // line isn't crossed
-                    P_MakeDivline(ld, &dl);
-                    s1 = P_PointOnDivlineSide(trace.x, trace.y, &dl);
-                    s2 = P_PointOnDivlineSide(trace.x + trace.dx,
-                                              trace.y + trace.dy, &dl);
-                    if (s1 == s2)
-                        continue;       // line isn't crossed
-
-                    // try to early out the check
-                    if (!ld->backsector)
-                        return false;   // stop checking
-
-                    // store the line for later intersection testing
-                    intercept_p->d.line = ld;
-                    intercept_p++;
-                }
-                polyLink->polyobj->validcount = validcount;
-            }
-        }
-        polyLink = polyLink->next;
-    }
-
-    offset = *(blockmap + offset);
-
-    for (list = blockmaplump + offset; *list != -1; list++)
-    {
-        ld = &lines[*list];
-        if (ld->validcount == validcount)
-            continue;           // line has already been checked
-        ld->validcount = validcount;
-
-        s1 = P_PointOnDivlineSide(ld->v1->x, ld->v1->y, &trace);
-        s2 = P_PointOnDivlineSide(ld->v2->x, ld->v2->y, &trace);
-        if (s1 == s2)
-            continue;           // line isn't crossed
-        P_MakeDivline(ld, &dl);
-        s1 = P_PointOnDivlineSide(trace.x, trace.y, &dl);
-        s2 = P_PointOnDivlineSide(trace.x + trace.dx, trace.y + trace.dy,
-                                  &dl);
-        if (s1 == s2)
-            continue;           // line isn't crossed
-
-        // try to early out the check
-        if (!ld->backsector)
-            return false;       // stop checking
-
-        // store the line for later intersection testing
-        intercept_p->d.line = ld;
-        intercept_p++;
-
-    }
-
-    return true;                // everything was checked
-}
-
-/*
-====================
-=
-= P_SightTraverseIntercepts
-=
-= Returns true if the traverser function returns true for all lines
-====================
-*/
-
-boolean P_SightTraverseIntercepts(void)
-{
-    int count;
-    fixed_t dist;
-    intercept_t *scan, *in;
-    divline_t dl;
-
-    count = intercept_p - intercepts;
-//
-// calculate intercept distance
-//
-    for (scan = intercepts; scan < intercept_p; scan++)
-    {
-        P_MakeDivline(scan->d.line, &dl);
-        scan->frac = P_InterceptVector(&trace, &dl);
-    }
-
-//
-// go through in order
-//
-    in = 0;                     // shut up compiler warning
-
-    while (count--)
-    {
-        dist = INT_MAX;
-        for (scan = intercepts; scan < intercept_p; scan++)
-            if (scan->frac < dist)
-            {
-                dist = scan->frac;
-                in = scan;
-            }
-
-        if (!PTR_SightTraverse(in))
-            return false;       // don't bother going farther
-        in->frac = INT_MAX;
-    }
-
-    return true;                // everything was traversed
-}
-
-
-
-/*
-==================
-=
-= P_SightPathTraverse
-=
-= Traces a line from x1,y1 to x2,y2, calling the traverser function for each
-= Returns true if the traverser function returns true for all lines
-==================
-*/
-
-boolean P_SightPathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
-{
-    fixed_t xt1, yt1, xt2, yt2;
-    fixed_t xstep, ystep;
-    fixed_t partial;
-    fixed_t xintercept, yintercept;
-    int mapx, mapy, mapxstep, mapystep;
-    int count;
-
-    validcount++;
-    intercept_p = intercepts;
-
-    if (((x1 - bmaporgx) & (MAPBLOCKSIZE - 1)) == 0)
-        x1 += FRACUNIT;         // don't side exactly on a line
-    if (((y1 - bmaporgy) & (MAPBLOCKSIZE - 1)) == 0)
-        y1 += FRACUNIT;         // don't side exactly on a line
-    trace.x = x1;
-    trace.y = y1;
-    trace.dx = x2 - x1;
-    trace.dy = y2 - y1;
-
-    x1 -= bmaporgx;
-    y1 -= bmaporgy;
-    xt1 = x1 >> MAPBLOCKSHIFT;
-    yt1 = y1 >> MAPBLOCKSHIFT;
-
-    x2 -= bmaporgx;
-    y2 -= bmaporgy;
-    xt2 = x2 >> MAPBLOCKSHIFT;
-    yt2 = y2 >> MAPBLOCKSHIFT;
-
-// points should never be out of bounds, but check once instead of
-// each block
-    if (xt1 < 0 || yt1 < 0 || xt1 >= bmapwidth || yt1 >= bmapheight
-        || xt2 < 0 || yt2 < 0 || xt2 >= bmapwidth || yt2 >= bmapheight)
-        return false;
-
-    if (xt2 > xt1)
-    {
-        mapxstep = 1;
-        partial = FRACUNIT - ((x1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else if (xt2 < xt1)
-    {
-        mapxstep = -1;
-        partial = (x1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        ystep = FixedDiv(y2 - y1, abs(x2 - x1));
-    }
-    else
-    {
-        mapxstep = 0;
-        partial = FRACUNIT;
-        ystep = 256 * FRACUNIT;
-    }
-    yintercept = (y1 >> MAPBTOFRAC) + FixedMul(partial, ystep);
-
-
-    if (yt2 > yt1)
-    {
-        mapystep = 1;
-        partial = FRACUNIT - ((y1 >> MAPBTOFRAC) & (FRACUNIT - 1));
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else if (yt2 < yt1)
-    {
-        mapystep = -1;
-        partial = (y1 >> MAPBTOFRAC) & (FRACUNIT - 1);
-        xstep = FixedDiv(x2 - x1, abs(y2 - y1));
-    }
-    else
-    {
-        mapystep = 0;
-        partial = FRACUNIT;
-        xstep = 256 * FRACUNIT;
-    }
-    xintercept = (x1 >> MAPBTOFRAC) + FixedMul(partial, xstep);
-
-
-//
-// step through map blocks
-// Count is present to prevent a round off error from skipping the break
-    mapx = xt1;
-    mapy = yt1;
-
-
-    for (count = 0; count < 64; count++)
-    {
-        if (!P_SightBlockLinesIterator(mapx, mapy))
-        {
-            sightcounts[1]++;
-            return false;       // early out
-        }
-
-        if (mapx == xt2 && mapy == yt2)
-            break;
-
-        if ((yintercept >> FRACBITS) == mapy)
-        {
-            yintercept += ystep;
-            mapx += mapxstep;
-        }
-        else if ((xintercept >> FRACBITS) == mapx)
-        {
-            xintercept += xstep;
-            mapy += mapystep;
-        }
-
-    }
-
-
-//
-// couldn't early out, so go through the sorted list
-//
-    sightcounts[2]++;
-
-    return P_SightTraverseIntercepts();
-}
-
-
-
-/*
-=====================
-=
-= P_CheckSight
-=
-= Returns true if a straight line between t1 and t2 is unobstructed
-= look from eyes of t1 to any part of t2
-=
-=====================
-*/
-
-boolean P_CheckSight(mobj_t * t1, mobj_t * t2)
-{
-    int s1, s2;
-    int pnum, bytenum, bitnum;
-
-//
-// check for trivial rejection
-//
-    s1 = (t1->subsector->sector - sectors);
-    s2 = (t2->subsector->sector - sectors);
-    pnum = s1 * numsectors + s2;
-    bytenum = pnum >> 3;
-    bitnum = 1 << (pnum & 7);
-
-    if (rejectmatrix[bytenum] & bitnum)
-    {
-        sightcounts[0]++;
-        return false;           // can't possibly be connected
-    }
-
-//
-// check precisely
-//
-    sightzstart = t1->z + t1->height - (t1->height >> 2);
-    topslope = (t2->z + t2->height) - sightzstart;
-    bottomslope = (t2->z) - sightzstart;
-
-    return P_SightPathTraverse(t1->x, t1->y, t2->x, t2->y);
-}
diff --git a/games/NXDoom/src/hexen/p_spec.c b/games/NXDoom/src/hexen/p_spec.c
deleted file mode 100644
index 400bf70df..000000000
--- a/games/NXDoom/src/hexen/p_spec.c
+++ /dev/null
@@ -1,1202 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "i_system.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAX_TAGGED_LINES 64
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static boolean CheckedLockedDoor(mobj_t * mo, byte lock);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-int *TerrainTypes;
-struct
-{
-    const char *name;
-    int type;
-} TerrainTypeDefs[] =
-{
-    {
-    "X_005", FLOOR_WATER},
-    {
-    "X_001", FLOOR_LAVA},
-    {
-    "X_009", FLOOR_SLUDGE},
-    {
-    "F_033", FLOOR_ICE},
-    {
-    "END", -1}
-};
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static struct
-{
-    line_t *line;
-    int lineTag;
-} TaggedLines[MAX_TAGGED_LINES];
-static int TaggedLineCount;
-
-mobj_t LavaInflictor;
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// P_InitLava
-//
-//==========================================================================
-
-void P_InitLava(void)
-{
-    memset(&LavaInflictor, 0, sizeof(mobj_t));
-    LavaInflictor.type = MT_CIRCLEFLAME;
-    LavaInflictor.flags2 = MF2_FIREDAMAGE | MF2_NODMGTHRUST;
-}
-
-//==========================================================================
-//
-// P_InitTerrainTypes
-//
-//==========================================================================
-
-void P_InitTerrainTypes(void)
-{
-    int i;
-    int lump;
-    int size;
-
-    size = (numflats + 1) * sizeof(int);
-    TerrainTypes = Z_Malloc(size, PU_STATIC, 0);
-    memset(TerrainTypes, 0, size);
-    for (i = 0; TerrainTypeDefs[i].type != -1; i++)
-    {
-        lump = W_CheckNumForName(TerrainTypeDefs[i].name);
-        if (lump != -1)
-        {
-            TerrainTypes[lump - firstflat] = TerrainTypeDefs[i].type;
-        }
-    }
-}
-
-//==========================================================================
-//
-// getSide
-//
-// Will return a side_t* given the number of the current sector, the
-// line number, and the side (0/1) that you want.
-//
-//==========================================================================
-
-/*
-side_t *getSide(int currentSector, int line, int side)
-{
-	return &sides[ (sectors[currentSector].lines[line])->sidenum[side] ];
-}
-*/
-
-//==========================================================================
-//
-// getSector
-//
-// Will return a sector_t* given the number of the current sector, the
-// line number, and the side (0/1) that you want.
-//
-//==========================================================================
-
-/*
-sector_t *getSector(int currentSector, int line, int side)
-{
-	return sides[ (sectors[currentSector].lines[line])->sidenum[side] ].sector;
-}
-*/
-
-//==========================================================================
-//
-// twoSided
-//
-// Given the sector number and the line number, will tell you whether
-// the line is two-sided or not.
-//
-//==========================================================================
-
-/*
-int     twoSided(int sector, int line)
-{
-	return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
-}
-*/
-
-//==================================================================
-//
-//      Return sector_t * of sector next to current. NULL if not two-sided line
-//
-//==================================================================
-sector_t *getNextSector(line_t * line, sector_t * sec)
-{
-    if (!(line->flags & ML_TWOSIDED))
-        return NULL;
-
-    if (line->frontsector == sec)
-        return line->backsector;
-
-    return line->frontsector;
-}
-
-//==================================================================
-//
-//      FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindLowestFloorSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t floor = sec->floorheight;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->floorheight < floor)
-            floor = other->floorheight;
-    }
-    return floor;
-}
-
-//==================================================================
-//
-//      FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindHighestFloorSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t floor = -500 * FRACUNIT;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->floorheight > floor)
-            floor = other->floorheight;
-    }
-    return floor;
-}
-
-//==================================================================
-//
-//      FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight)
-{
-    int i;
-    int h;
-    int min;
-    line_t *check;
-    sector_t *other;
-    fixed_t height = currentheight;
-    fixed_t heightlist[20];     // 20 adjoining sectors max!
-
-    heightlist[0] = 0;
-
-    for (i = 0, h = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->floorheight > height)
-            heightlist[h++] = other->floorheight;
-    }
-
-    //
-    // Find lowest height in list
-    //
-    min = heightlist[0];
-    for (i = 1; i < h; i++)
-        if (heightlist[i] < min)
-            min = heightlist[i];
-
-    return min;
-}
-
-//==================================================================
-//
-//      FIND LOWEST CEILING IN THE SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindLowestCeilingSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t height = INT_MAX;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->ceilingheight < height)
-            height = other->ceilingheight;
-    }
-    return height;
-}
-
-//==================================================================
-//
-//      FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
-//
-//==================================================================
-fixed_t P_FindHighestCeilingSurrounding(sector_t * sec)
-{
-    int i;
-    line_t *check;
-    sector_t *other;
-    fixed_t height = 0;
-
-    for (i = 0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check, sec);
-        if (!other)
-            continue;
-        if (other->ceilingheight > height)
-            height = other->ceilingheight;
-    }
-    return height;
-}
-
-//==================================================================
-//
-//      RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
-//
-//==================================================================
-
-/*
-int     P_FindSectorFromLineTag(line_t  *line,int start)
-{
-	int     i;
-
-	for (i=start+1;i<numsectors;i++)
-		if (sectors[i].tag == line->arg1)
-			return i;
-	return -1;
-}
-*/
-
-//=========================================================================
-//
-// P_FindSectorFromTag
-//
-//=========================================================================
-
-int P_FindSectorFromTag(int tag, int start)
-{
-    int i;
-
-    for (i = start + 1; i < numsectors; i++)
-    {
-        if (sectors[i].tag == tag)
-        {
-            return i;
-        }
-    }
-    return -1;
-}
-
-//==================================================================
-//
-//      Find minimum light from an adjacent sector
-//
-//==================================================================
-
-/*
-int     P_FindMinSurroundingLight(sector_t *sector,int max)
-{
-	int                     i;
-	int                     min;
-	line_t          *line;
-	sector_t        *check;
-
-	min = max;
-	for (i=0 ; i < sector->linecount ; i++)
-	{
-		line = sector->lines[i];
-		check = getNextSector(line,sector);
-		if (!check)
-			continue;
-		if (check->lightlevel < min)
-			min = check->lightlevel;
-	}
-	return min;
-}
-*/
-
-//=========================================================================
-//
-// EV_SectorSoundChange
-//
-//=========================================================================
-
-boolean EV_SectorSoundChange(byte * args)
-{
-    int secNum;
-    boolean rtn;
-
-    if (!args[0])
-    {
-        return false;
-    }
-    secNum = -1;
-    rtn = false;
-    while ((secNum = P_FindSectorFromTag(args[0], secNum)) >= 0)
-    {
-        sectors[secNum].seqType = args[1];
-        rtn = true;
-    }
-    return rtn;
-}
-
-//============================================================================
-//
-// CheckedLockedDoor
-//
-//============================================================================
-
-static boolean CheckedLockedDoor(mobj_t * mo, byte lock)
-{
-    char LockedBuffer[80];
-
-    if (!mo->player)
-    {
-        return false;
-    }
-    if (!lock)
-    {
-        return true;
-    }
-    if (!(mo->player->keys & (1 << (lock - 1))))
-    {
-        M_snprintf(LockedBuffer, sizeof(LockedBuffer),
-                   "YOU NEED THE %s\n", TextKeyMessages[lock - 1]);
-        P_SetMessage(mo->player, LockedBuffer, true);
-        S_StartSound(mo, SFX_DOOR_LOCKED);
-        return false;
-    }
-    return true;
-}
-
-
-//==========================================================================
-//
-// EV_LineSearchForPuzzleItem
-//
-//==========================================================================
-
-boolean EV_LineSearchForPuzzleItem(line_t * line, byte * args, mobj_t * mo)
-{
-    player_t *player;
-    int i;
-    int type;
-    artitype_t arti;
-
-    if (!mo)
-        return false;
-    player = mo->player;
-    if (!player)
-        return false;
-
-    // Search player's inventory for puzzle items
-    for (i = 0; i < player->artifactCount; i++)
-    {
-        arti = player->inventory[i].type;
-        type = arti - arti_firstpuzzitem;
-        if (type < 0)
-            continue;
-        if (type == line->arg1)
-        {
-            // A puzzle item was found for the line
-            if (P_UseArtifact(player, arti))
-            {
-                // A puzzle item was found for the line
-                P_PlayerRemoveArtifact(player, i);
-                if (player == &players[consoleplayer])
-                {
-                    if (arti < arti_firstpuzzitem)
-                    {
-                        S_StartSound(NULL, SFX_ARTIFACT_USE);
-                    }
-                    else
-                    {
-                        S_StartSound(NULL, SFX_PUZZLE_SUCCESS);
-                    }
-                    ArtifactFlash = 4;
-                }
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-
-
-/*
-==============================================================================
-
-							EVENTS
-
-Events are operations triggered by using, crossing, or shooting special lines, or by timed thinkers
-
-==============================================================================
-*/
-//============================================================================
-//
-// P_ExecuteLineSpecial
-//
-// Invoked when crossing a linedef. The args[] array should be at least
-// 5 elements in length.
-//
-//============================================================================
-
-boolean P_ExecuteLineSpecial(int special, byte * args, line_t * line,
-                             int side, mobj_t * mo)
-{
-    boolean buttonSuccess;
-
-    buttonSuccess = false;
-    switch (special)
-    {
-        case 1:                // Poly Start Line
-            break;
-        case 2:                // Poly Rotate Left
-            buttonSuccess = EV_RotatePoly(line, args, 1, false);
-            break;
-        case 3:                // Poly Rotate Right
-            buttonSuccess = EV_RotatePoly(line, args, -1, false);
-            break;
-        case 4:                // Poly Move
-            buttonSuccess = EV_MovePoly(line, args, false, false);
-            break;
-        case 5:                // Poly Explicit Line:  Only used in initialization
-            break;
-        case 6:                // Poly Move Times 8
-            buttonSuccess = EV_MovePoly(line, args, true, false);
-            break;
-        case 7:                // Poly Door Swing
-            buttonSuccess = EV_OpenPolyDoor(line, args, PODOOR_SWING);
-            break;
-        case 8:                // Poly Door Slide
-            buttonSuccess = EV_OpenPolyDoor(line, args, PODOOR_SLIDE);
-            break;
-        case 10:               // Door Close
-            buttonSuccess = EV_DoDoor(line, args, DREV_CLOSE);
-            break;
-        case 11:               // Door Open
-            if (!args[0])
-            {
-                buttonSuccess = EV_VerticalDoor(line, mo);
-            }
-            else
-            {
-                buttonSuccess = EV_DoDoor(line, args, DREV_OPEN);
-            }
-            break;
-        case 12:               // Door Raise
-            if (!args[0])
-            {
-                buttonSuccess = EV_VerticalDoor(line, mo);
-            }
-            else
-            {
-                buttonSuccess = EV_DoDoor(line, args, DREV_NORMAL);
-            }
-            break;
-        case 13:               // Door Locked_Raise
-            if (CheckedLockedDoor(mo, args[3]))
-            {
-                if (!args[0])
-                {
-                    buttonSuccess = EV_VerticalDoor(line, mo);
-                }
-                else
-                {
-                    buttonSuccess = EV_DoDoor(line, args, DREV_NORMAL);
-                }
-            }
-            break;
-        case 20:               // Floor Lower by Value
-            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERFLOORBYVALUE);
-            break;
-        case 21:               // Floor Lower to Lowest
-            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERFLOORTOLOWEST);
-            break;
-        case 22:               // Floor Lower to Nearest
-            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERFLOOR);
-            break;
-        case 23:               // Floor Raise by Value
-            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOORBYVALUE);
-            break;
-        case 24:               // Floor Raise to Highest
-            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOOR);
-            break;
-        case 25:               // Floor Raise to Nearest
-            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOORTONEAREST);
-            break;
-        case 26:               // Stairs Build Down Normal
-            buttonSuccess = EV_BuildStairs(line, args, -1, STAIRS_NORMAL);
-            break;
-        case 27:               // Build Stairs Up Normal
-            buttonSuccess = EV_BuildStairs(line, args, 1, STAIRS_NORMAL);
-            break;
-        case 28:               // Floor Raise and Crush
-            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEFLOORCRUSH);
-            break;
-        case 29:               // Build Pillar (no crushing)
-            buttonSuccess = EV_BuildPillar(line, args, false);
-            break;
-        case 30:               // Open Pillar
-            buttonSuccess = EV_OpenPillar(line, args);
-            break;
-        case 31:               // Stairs Build Down Sync
-            buttonSuccess = EV_BuildStairs(line, args, -1, STAIRS_SYNC);
-            break;
-        case 32:               // Build Stairs Up Sync
-            buttonSuccess = EV_BuildStairs(line, args, 1, STAIRS_SYNC);
-            break;
-        case 35:               // Raise Floor by Value Times 8
-            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISEBYVALUETIMES8);
-            break;
-        case 36:               // Lower Floor by Value Times 8
-            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERBYVALUETIMES8);
-            break;
-        case 40:               // Ceiling Lower by Value
-            buttonSuccess = EV_DoCeiling(line, args, CLEV_LOWERBYVALUE);
-            break;
-        case 41:               // Ceiling Raise by Value
-            buttonSuccess = EV_DoCeiling(line, args, CLEV_RAISEBYVALUE);
-            break;
-        case 42:               // Ceiling Crush and Raise
-            buttonSuccess = EV_DoCeiling(line, args, CLEV_CRUSHANDRAISE);
-            break;
-        case 43:               // Ceiling Lower and Crush
-            buttonSuccess = EV_DoCeiling(line, args, CLEV_LOWERANDCRUSH);
-            break;
-        case 44:               // Ceiling Crush Stop
-            buttonSuccess = EV_CeilingCrushStop(line, args);
-            break;
-        case 45:               // Ceiling Crush Raise and Stay
-            buttonSuccess = EV_DoCeiling(line, args, CLEV_CRUSHRAISEANDSTAY);
-            break;
-        case 46:               // Floor Crush Stop
-            buttonSuccess = EV_FloorCrushStop(line, args);
-            break;
-        case 60:               // Plat Perpetual Raise
-            buttonSuccess = EV_DoPlat(line, args, PLAT_PERPETUALRAISE, 0);
-            break;
-        case 61:               // Plat Stop
-            EV_StopPlat(line, args);
-            break;
-        case 62:               // Plat Down-Wait-Up-Stay
-            buttonSuccess = EV_DoPlat(line, args, PLAT_DOWNWAITUPSTAY, 0);
-            break;
-        case 63:               // Plat Down-by-Value*8-Wait-Up-Stay
-            buttonSuccess = EV_DoPlat(line, args, PLAT_DOWNBYVALUEWAITUPSTAY,
-                                      0);
-            break;
-        case 64:               // Plat Up-Wait-Down-Stay
-            buttonSuccess = EV_DoPlat(line, args, PLAT_UPWAITDOWNSTAY, 0);
-            break;
-        case 65:               // Plat Up-by-Value*8-Wait-Down-Stay
-            buttonSuccess = EV_DoPlat(line, args, PLAT_UPBYVALUEWAITDOWNSTAY,
-                                      0);
-            break;
-        case 66:               // Floor Lower Instant * 8
-            buttonSuccess = EV_DoFloor(line, args, FLEV_LOWERTIMES8INSTANT);
-            break;
-        case 67:               // Floor Raise Instant * 8
-            buttonSuccess = EV_DoFloor(line, args, FLEV_RAISETIMES8INSTANT);
-            break;
-        case 68:               // Floor Move to Value * 8
-            buttonSuccess = EV_DoFloor(line, args, FLEV_MOVETOVALUETIMES8);
-            break;
-        case 69:               // Ceiling Move to Value * 8
-            buttonSuccess = EV_DoCeiling(line, args, CLEV_MOVETOVALUETIMES8);
-            break;
-        case 70:               // Teleport
-            if (side == 0)
-            {                   // Only teleport when crossing the front side of a line
-                buttonSuccess = EV_Teleport(args[0], mo, true);
-            }
-            break;
-        case 71:               // Teleport, no fog
-            if (side == 0)
-            {                   // Only teleport when crossing the front side of a line
-                buttonSuccess = EV_Teleport(args[0], mo, false);
-            }
-            break;
-        case 72:               // Thrust Mobj
-            if (!side)          // Only thrust on side 0
-            {
-                P_ThrustMobj(mo, args[0] * (ANG90 / 64),
-                             args[1] << FRACBITS);
-                buttonSuccess = 1;
-            }
-            break;
-        case 73:               // Damage Mobj
-            if (args[0])
-            {
-                P_DamageMobj(mo, NULL, NULL, args[0]);
-            }
-            else
-            {                   // If arg1 is zero, then guarantee a kill
-                P_DamageMobj(mo, NULL, NULL, 10000);
-            }
-            buttonSuccess = 1;
-            break;
-        case 74:               // Teleport_NewMap
-            if (side == 0)
-            {                   // Only teleport when crossing the front side of a line
-                if (!(mo && mo->player && mo->player->playerstate == PST_DEAD)) // Players must be alive to teleport
-                {
-                    G_Completed(args[0], args[1]);
-                    buttonSuccess = true;
-                }
-            }
-            break;
-        case 75:               // Teleport_EndGame
-            if (side == 0)
-            {                   // Only teleport when crossing the front side of a line
-                if (!(mo && mo->player && mo->player->playerstate == PST_DEAD)) // Players must be alive to teleport
-                {
-                    buttonSuccess = true;
-                    if (deathmatch)
-                    {           // Winning in deathmatch just goes back to map 1
-                        G_Completed(1, 0);
-                    }
-                    else
-                    {           // Passing -1, -1 to G_Completed() starts the Finale
-                        G_Completed(-1, -1);
-                    }
-                }
-            }
-            break;
-        case 80:               // ACS_Execute
-            buttonSuccess =
-                P_StartACS(args[0], args[1], &args[2], mo, line, side);
-            break;
-        case 81:               // ACS_Suspend
-            buttonSuccess = P_SuspendACS(args[0], args[1]);
-            break;
-        case 82:               // ACS_Terminate
-            buttonSuccess = P_TerminateACS(args[0], args[1]);
-            break;
-        case 83:               // ACS_LockedExecute
-            buttonSuccess = P_StartLockedACS(line, args, mo, side);
-            break;
-        case 90:               // Poly Rotate Left Override
-            buttonSuccess = EV_RotatePoly(line, args, 1, true);
-            break;
-        case 91:               // Poly Rotate Right Override
-            buttonSuccess = EV_RotatePoly(line, args, -1, true);
-            break;
-        case 92:               // Poly Move Override
-            buttonSuccess = EV_MovePoly(line, args, false, true);
-            break;
-        case 93:               // Poly Move Times 8 Override
-            buttonSuccess = EV_MovePoly(line, args, true, true);
-            break;
-        case 94:               // Build Pillar Crush 
-            buttonSuccess = EV_BuildPillar(line, args, true);
-            break;
-        case 95:               // Lower Floor and Ceiling
-            buttonSuccess = EV_DoFloorAndCeiling(line, args, false);
-            break;
-        case 96:               // Raise Floor and Ceiling
-            buttonSuccess = EV_DoFloorAndCeiling(line, args, true);
-            break;
-        case 109:              // Force Lightning
-            buttonSuccess = true;
-            P_ForceLightning();
-            break;
-        case 110:              // Light Raise by Value
-            buttonSuccess = EV_SpawnLight(line, args, LITE_RAISEBYVALUE);
-            break;
-        case 111:              // Light Lower by Value
-            buttonSuccess = EV_SpawnLight(line, args, LITE_LOWERBYVALUE);
-            break;
-        case 112:              // Light Change to Value
-            buttonSuccess = EV_SpawnLight(line, args, LITE_CHANGETOVALUE);
-            break;
-        case 113:              // Light Fade
-            buttonSuccess = EV_SpawnLight(line, args, LITE_FADE);
-            break;
-        case 114:              // Light Glow
-            buttonSuccess = EV_SpawnLight(line, args, LITE_GLOW);
-            break;
-        case 115:              // Light Flicker
-            buttonSuccess = EV_SpawnLight(line, args, LITE_FLICKER);
-            break;
-        case 116:              // Light Strobe
-            buttonSuccess = EV_SpawnLight(line, args, LITE_STROBE);
-            break;
-        case 120:              // Quake Tremor
-            buttonSuccess = A_LocalQuake(args, mo);
-            break;
-        case 129:              // UsePuzzleItem
-            buttonSuccess = EV_LineSearchForPuzzleItem(line, args, mo);
-            break;
-        case 130:              // Thing_Activate
-            buttonSuccess = EV_ThingActivate(args[0]);
-            break;
-        case 131:              // Thing_Deactivate
-            buttonSuccess = EV_ThingDeactivate(args[0]);
-            break;
-        case 132:              // Thing_Remove
-            buttonSuccess = EV_ThingRemove(args[0]);
-            break;
-        case 133:              // Thing_Destroy
-            buttonSuccess = EV_ThingDestroy(args[0]);
-            break;
-        case 134:              // Thing_Projectile
-            buttonSuccess = EV_ThingProjectile(args, 0);
-            break;
-        case 135:              // Thing_Spawn
-            buttonSuccess = EV_ThingSpawn(args, 1);
-            break;
-        case 136:              // Thing_ProjectileGravity
-            buttonSuccess = EV_ThingProjectile(args, 1);
-            break;
-        case 137:              // Thing_SpawnNoFog
-            buttonSuccess = EV_ThingSpawn(args, 0);
-            break;
-        case 138:              // Floor_Waggle
-            buttonSuccess = EV_StartFloorWaggle(args[0], args[1],
-                                                args[2], args[3], args[4]);
-            break;
-        case 140:              // Sector_SoundChange
-            buttonSuccess = EV_SectorSoundChange(args);
-            break;
-
-            // Line specials only processed during level initialization
-            // 100: Scroll_Texture_Left
-            // 101: Scroll_Texture_Right
-            // 102: Scroll_Texture_Up
-            // 103: Scroll_Texture_Down
-            // 121: Line_SetIdentification
-
-            // Inert Line specials
-        default:
-            break;
-    }
-    return buttonSuccess;
-}
-
-//============================================================================
-//
-// P_ActivateLine
-//
-//============================================================================
-
-boolean P_ActivateLine(line_t * line, mobj_t * mo, int side,
-                       int activationType)
-{
-    byte args[5];
-    int lineActivation;
-    boolean repeat;
-    boolean buttonSuccess;
-
-    lineActivation = GET_SPAC(line->flags);
-    if (lineActivation != activationType)
-    {
-        return false;
-    }
-    if (!mo->player && !(mo->flags & MF_MISSILE))
-    {
-        if (lineActivation != SPAC_MCROSS)
-        {                       // currently, monsters can only activate the MCROSS activation type
-            return false;
-        }
-        if (line->flags & ML_SECRET)
-            return false;       // never open secret doors
-    }
-    repeat = (line->flags & ML_REPEAT_SPECIAL) != 0;
-
-    // Construct args[] array to contain the arguments from the line, as we
-    // cannot rely on struct field ordering and layout.
-    args[0] = line->arg1;
-    args[1] = line->arg2;
-    args[2] = line->arg3;
-    args[3] = line->arg4;
-    args[4] = line->arg5;
-    buttonSuccess = P_ExecuteLineSpecial(line->special, args, line, side, mo);
-    if (!repeat && buttonSuccess)
-    {                           // clear the special on non-retriggerable lines
-        line->special = 0;
-    }
-    if ((lineActivation == SPAC_USE || lineActivation == SPAC_IMPACT)
-        && buttonSuccess)
-    {
-        P_ChangeSwitchTexture(line, repeat);
-    }
-    return true;
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerInSpecialSector
-//
-// Called every tic frame that the player origin is in a special sector.
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerInSpecialSector(player_t * player)
-{
-    sector_t *sector;
-    static int pushTab[3] = {
-        2048 * 5,
-        2048 * 10,
-        2048 * 25
-    };
-
-    sector = player->mo->subsector->sector;
-    if (player->mo->z != sector->floorheight)
-    {                           // Player is not touching the floor
-        return;
-    }
-    switch (sector->special)
-    {
-        case 9:                // SecretArea
-            player->secretcount++;
-            sector->special = 0;
-            break;
-
-        case 201:
-        case 202:
-        case 203:              // Scroll_North_xxx
-            P_Thrust(player, ANG90, pushTab[sector->special - 201]);
-            break;
-        case 204:
-        case 205:
-        case 206:              // Scroll_East_xxx
-            P_Thrust(player, 0, pushTab[sector->special - 204]);
-            break;
-        case 207:
-        case 208:
-        case 209:              // Scroll_South_xxx
-            P_Thrust(player, ANG270, pushTab[sector->special - 207]);
-            break;
-        case 210:
-        case 211:
-        case 212:              // Scroll_West_xxx
-            P_Thrust(player, ANG180, pushTab[sector->special - 210]);
-            break;
-        case 213:
-        case 214:
-        case 215:              // Scroll_NorthWest_xxx
-            P_Thrust(player, ANG90 + ANG45, pushTab[sector->special - 213]);
-            break;
-        case 216:
-        case 217:
-        case 218:              // Scroll_NorthEast_xxx
-            P_Thrust(player, ANG45, pushTab[sector->special - 216]);
-            break;
-        case 219:
-        case 220:
-        case 221:              // Scroll_SouthEast_xxx
-            P_Thrust(player, ANG270 + ANG45, pushTab[sector->special - 219]);
-            break;
-        case 222:
-        case 223:
-        case 224:              // Scroll_SouthWest_xxx
-            P_Thrust(player, ANG180 + ANG45, pushTab[sector->special - 222]);
-            break;
-
-        case 40:
-        case 41:
-        case 42:
-        case 43:
-        case 44:
-        case 45:
-        case 46:
-        case 47:
-        case 48:
-        case 49:
-        case 50:
-        case 51:
-            // Wind specials are handled in (P_mobj):P_XYMovement
-            break;
-
-        case 26:               // Stairs_Special1
-        case 27:               // Stairs_Special2
-            // Used in (P_floor):ProcessStairSector
-            break;
-
-        case 198:              // Lightning Special
-        case 199:              // Lightning Flash special
-        case 200:              // Sky2
-            // Used in (R_plane):R_Drawplanes
-            break;
-        default:
-            I_Error("P_PlayerInSpecialSector: "
-                    "unknown special %i", sector->special);
-    }
-}
-
-//============================================================================
-//
-// P_PlayerOnSpecialFlat
-//
-//============================================================================
-
-void P_PlayerOnSpecialFlat(player_t * player, int floorType)
-{
-    if (player->mo->z != player->mo->floorz)
-    {                           // Player is not touching the floor
-        return;
-    }
-    switch (floorType)
-    {
-        case FLOOR_LAVA:
-            if (!(leveltime & 31))
-            {
-                P_DamageMobj(player->mo, &LavaInflictor, NULL, 10);
-                S_StartSound(player->mo, SFX_LAVA_SIZZLE);
-            }
-            break;
-        default:
-            break;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_UpdateSpecials
-//
-//----------------------------------------------------------------------------
-
-void P_UpdateSpecials(void)
-{
-    int i;
-
-    // Handle buttons
-    for (i = 0; i < MAXBUTTONS; i++)
-    {
-        if (buttonlist[i].btimer)
-        {
-            buttonlist[i].btimer--;
-            if (!buttonlist[i].btimer)
-            {
-                switch (buttonlist[i].where)
-                {
-                    case SWTCH_TOP:
-                        sides[buttonlist[i].line->sidenum[0]].toptexture =
-                            buttonlist[i].btexture;
-                        break;
-                    case SWTCH_MIDDLE:
-                        sides[buttonlist[i].line->sidenum[0]].midtexture =
-                            buttonlist[i].btexture;
-                        break;
-                    case SWTCH_BOTTOM:
-                        sides[buttonlist[i].line->sidenum[0]].bottomtexture =
-                            buttonlist[i].btexture;
-                        break;
-                }
-                //S_StartSound((mobj_t *)&buttonlist[i].soundorg, sfx_switch);
-                memset(&buttonlist[i], 0, sizeof(button_t));
-            }
-        }
-    }
-}
-
-/*
-==============================================================================
-
-							SPECIAL SPAWNING
-
-==============================================================================
-*/
-/*
-================================================================================
-= P_SpawnSpecials
-=
-= After the map has been loaded, scan for specials that
-= spawn thinkers
-=
-===============================================================================
-*/
-
-short numlinespecials;
-line_t *linespeciallist[MAXLINEANIMS];
-
-void P_SpawnSpecials(void)
-{
-    sector_t *sector;
-    int i;
-
-    //
-    //      Init special SECTORs
-    //
-    sector = sectors;
-    for (i = 0; i < numsectors; i++, sector++)
-    {
-        if (!sector->special)
-            continue;
-        switch (sector->special)
-        {
-            case 1:            // Phased light
-                // Hardcoded base, use sector->lightlevel as the index
-                P_SpawnPhasedLight(sector, 80, -1);
-                break;
-            case 2:            // Phased light sequence start
-                P_SpawnLightSequence(sector, 1);
-                break;
-                // Specials 3 & 4 are used by the phased light sequences
-
-                /*
-                   case 1:         // FLICKERING LIGHTS
-                   P_SpawnLightFlash (sector);
-                   break;
-                   case 2:         // STROBE FAST
-                   P_SpawnStrobeFlash(sector,FASTDARK,0);
-                   break;
-                   case 3:         // STROBE SLOW
-                   P_SpawnStrobeFlash(sector,SLOWDARK,0);
-                   break;
-                   case 4:         // STROBE FAST/DEATH SLIME
-                   P_SpawnStrobeFlash(sector,FASTDARK,0);
-                   sector->special = 4;
-                   break;
-                   case 8:         // GLOWING LIGHT
-                   P_SpawnGlowingLight(sector);
-                   break;
-                   case 9:         // SECRET SECTOR
-                   totalsecret++;
-                   break;
-                   case 10:        // DOOR CLOSE IN 30 SECONDS
-                   P_SpawnDoorCloseIn30 (sector);
-                   break;
-                   case 12:        // SYNC STROBE SLOW
-                   P_SpawnStrobeFlash (sector, SLOWDARK, 1);
-                   break;
-                   case 13:        // SYNC STROBE FAST
-                   P_SpawnStrobeFlash (sector, FASTDARK, 1);
-                   break;
-                   case 14:        // DOOR RAISE IN 5 MINUTES
-                   P_SpawnDoorRaiseIn5Mins (sector, i);
-                   break;
-                 */
-        }
-    }
-
-
-    //
-    //      Init line EFFECTs
-    //
-    numlinespecials = 0;
-    TaggedLineCount = 0;
-    for (i = 0; i < numlines; i++)
-    {
-        switch (lines[i].special)
-        {
-            case 100:          // Scroll_Texture_Left
-            case 101:          // Scroll_Texture_Right
-            case 102:          // Scroll_Texture_Up
-            case 103:          // Scroll_Texture_Down
-                linespeciallist[numlinespecials] = &lines[i];
-                numlinespecials++;
-                break;
-            case 121:          // Line_SetIdentification
-                if (lines[i].arg1)
-                {
-                    if (TaggedLineCount == MAX_TAGGED_LINES)
-                    {
-                        I_Error("P_SpawnSpecials: MAX_TAGGED_LINES "
-                                "(%d) exceeded.", MAX_TAGGED_LINES);
-                    }
-                    TaggedLines[TaggedLineCount].line = &lines[i];
-                    TaggedLines[TaggedLineCount++].lineTag = lines[i].arg1;
-                }
-                lines[i].special = 0;
-                break;
-        }
-    }
-
-    //
-    //      Init other misc stuff
-    //
-    for (i = 0; i < MAXCEILINGS; i++)
-        activeceilings[i] = NULL;
-    for (i = 0; i < MAXPLATS; i++)
-        activeplats[i] = NULL;
-    for (i = 0; i < MAXBUTTONS; i++)
-        memset(&buttonlist[i], 0, sizeof(button_t));
-
-    // Initialize flat and texture animations
-    P_InitFTAnims();
-}
-
-//==========================================================================
-//
-// P_FindLine
-//
-//==========================================================================
-
-line_t *P_FindLine(int lineTag, int *searchPosition)
-{
-    int i;
-
-    for (i = *searchPosition + 1; i < TaggedLineCount; i++)
-    {
-        if (TaggedLines[i].lineTag == lineTag)
-        {
-            *searchPosition = i;
-            return TaggedLines[i].line;
-        }
-    }
-    *searchPosition = -1;
-    return NULL;
-}
diff --git a/games/NXDoom/src/hexen/p_spec.h b/games/NXDoom/src/hexen/p_spec.h
deleted file mode 100644
index 3814484ba..000000000
--- a/games/NXDoom/src/hexen/p_spec.h
+++ /dev/null
@@ -1,586 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef P_SPEC_H
-#define P_SPEC_H
-
-
-extern int *TerrainTypes;
-
-//
-//      scrolling line specials
-//
-
-#define MAXLINEANIMS 64
-extern short numlinespecials;
-extern line_t *linespeciallist[MAXLINEANIMS];
-
-extern mobj_t LavaInflictor;
-
-
-//      Define values for map objects
-#define MO_TELEPORTMAN 14
-
-// at game start
-void P_InitTerrainTypes(void);
-void P_InitLava(void);
-
-// at map load
-void P_SpawnSpecials(void);
-
-// every tic
-void P_UpdateSpecials(void);
-
-// when needed
-boolean P_ExecuteLineSpecial(int special, byte * args, line_t * line,
-                             int side, mobj_t * mo);
-boolean P_ActivateLine(line_t * ld, mobj_t * mo, int side,
-                       int activationType);
-//boolean P_UseSpecialLine ( mobj_t *thing, line_t *line);
-//void    P_ShootSpecialLine ( mobj_t *thing, line_t *line);
-//void    P_CrossSpecialLine (int linenum, int side, mobj_t *thing);
-
-void P_PlayerInSpecialSector(player_t * player);
-void P_PlayerOnSpecialFlat(player_t * player, int floorType);
-
-//int twoSided(int sector,int line);
-//sector_t *getSector(int currentSector,int line,int side);
-//side_t  *getSide(int currentSector,int line, int side);
-fixed_t P_FindLowestFloorSurrounding(sector_t * sec);
-fixed_t P_FindHighestFloorSurrounding(sector_t * sec);
-fixed_t P_FindNextHighestFloor(sector_t * sec, int currentheight);
-fixed_t P_FindLowestCeilingSurrounding(sector_t * sec);
-fixed_t P_FindHighestCeilingSurrounding(sector_t * sec);
-//int P_FindSectorFromLineTag(line_t  *line,int start);
-int P_FindSectorFromTag(int tag, int start);
-//int P_FindMinSurroundingLight(sector_t *sector,int max);
-sector_t *getNextSector(line_t * line, sector_t * sec);
-line_t *P_FindLine(int lineTag, int *searchPosition);
-
-//
-//      SPECIAL
-//
-//int EV_DoDonut(line_t *line);
-
-//-------------------------------
-// P_anim.c
-//-------------------------------
-
-
-extern fixed_t Sky1ScrollDelta;
-extern fixed_t Sky2ScrollDelta;
-
-
-void P_AnimateSurfaces(void);
-void P_InitFTAnims(void);
-void P_InitLightning(void);
-void P_ForceLightning(void);
-
-/*
-===============================================================================
-
-							P_LIGHTS
-
-===============================================================================
-*/
-
-typedef enum
-{
-    LITE_RAISEBYVALUE,
-    LITE_LOWERBYVALUE,
-    LITE_CHANGETOVALUE,
-    LITE_FADE,
-    LITE_GLOW,
-    LITE_FLICKER,
-    LITE_STROBE
-} lighttype_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    lighttype_t type;
-    int value1;
-    int value2;
-    int tics1;
-    int tics2;
-    int count;
-} light_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int index;
-    int base;
-} phase_t;
-
-#define LIGHT_SEQUENCE_START    2
-#define LIGHT_SEQUENCE          3
-#define LIGHT_SEQUENCE_ALT      4
-
-void T_Phase(thinker_t *thinker);
-void T_Light(thinker_t *thinker);
-void P_SpawnPhasedLight(sector_t * sector, int base, int index);
-void P_SpawnLightSequence(sector_t * sector, int indexStep);
-boolean EV_SpawnLight(line_t * line, byte * arg, lighttype_t type);
-
-#if 0
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int count;
-    int maxlight;
-    int minlight;
-    int maxtime;
-    int mintime;
-} lightflash_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int count;
-    int minlight;
-    int maxlight;
-    int darktime;
-    int brighttime;
-} strobe_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int minlight;
-    int maxlight;
-    int direction;
-} glow_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int index;
-    int base;
-} phase_t;
-
-#define GLOWSPEED 8
-#define STROBEBRIGHT 5
-#define FASTDARK 15
-#define SLOWDARK 35
-
-#define LIGHT_SEQUENCE_START    2
-#define LIGHT_SEQUENCE                  3
-#define LIGHT_SEQUENCE_ALT      4
-
-void T_LightFlash(lightflash_t * flash);
-void P_SpawnLightFlash(sector_t * sector);
-void T_StrobeFlash(strobe_t * flash);
-void P_SpawnStrobeFlash(sector_t * sector, int fastOrSlow, int inSync);
-void EV_StartLightStrobing(line_t * line);
-void EV_TurnTagLightsOff(line_t * line);
-void EV_LightTurnOn(line_t * line, int bright);
-void T_Glow(glow_t * g);
-void P_SpawnGlowingLight(sector_t * sector);
-void T_Phase(phase_t * phase);
-void P_SpawnPhasedLight(sector_t * sector, int base, int index);
-void P_SpawnLightSequence(sector_t * sector, int indexStep);
-#endif
-
-/*
-===============================================================================
-
-							P_SWITCH
-
-===============================================================================
-*/
-typedef struct
-{
-    char name1[9];
-    char name2[9];
-    int soundID;
-} switchlist_t;
-
-typedef enum
-{
-    SWTCH_TOP,
-    SWTCH_MIDDLE,
-    SWTCH_BOTTOM
-} bwhere_e;
-
-typedef struct
-{
-    line_t *line;
-    bwhere_e where;
-    int btexture;
-    int btimer;
-    mobj_t *soundorg;
-} button_t;
-
-#define MAXSWITCHES 50          // max # of wall switches in a level
-#define MAXBUTTONS 16           // 4 players, 4 buttons each at once, max.
-#define BUTTONTIME 35           // 1 second
-
-extern button_t buttonlist[MAXBUTTONS];
-
-void P_ChangeSwitchTexture(line_t * line, int useAgain);
-void P_InitSwitchList(void);
-
-/*
-===============================================================================
-
-							P_PLATS
-
-===============================================================================
-*/
-
-typedef enum
-{
-    PLAT_UP,
-    PLAT_DOWN,
-    PLAT_WAITING,
-//      PLAT_IN_STASIS
-} plat_e;
-
-typedef enum
-{
-    PLAT_PERPETUALRAISE,
-    PLAT_DOWNWAITUPSTAY,
-    PLAT_DOWNBYVALUEWAITUPSTAY,
-    PLAT_UPWAITDOWNSTAY,
-    PLAT_UPBYVALUEWAITDOWNSTAY,
-    //PLAT_RAISEANDCHANGE,
-    //PLAT_RAISETONEARESTANDCHANGE
-} plattype_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    fixed_t speed;
-    fixed_t low;
-    fixed_t high;
-    int wait;
-    int count;
-    plat_e status;
-    plat_e oldstatus;
-    int crush;
-    int tag;
-    plattype_e type;
-} plat_t;
-
-#define PLATWAIT 3
-#define PLATSPEED FRACUNIT
-#define MAXPLATS 30
-
-extern plat_t *activeplats[MAXPLATS];
-
-void T_PlatRaise(thinker_t *thinker);
-int EV_DoPlat(line_t * line, byte * args, plattype_e type, int amount);
-void P_AddActivePlat(plat_t * plat);
-void P_RemoveActivePlat(plat_t * plat);
-void EV_StopPlat(line_t * line, byte * args);
-
-/*
-===============================================================================
-
-							P_DOORS
-
-===============================================================================
-*/
-typedef enum
-{
-    DREV_NORMAL,
-    DREV_CLOSE30THENOPEN,
-    DREV_CLOSE,
-    DREV_OPEN,
-    DREV_RAISEIN5MINS,
-} vldoor_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    vldoor_e type;
-    fixed_t topheight;
-    fixed_t speed;
-    int direction;              // 1 = up, 0 = waiting at top, -1 = down
-    int topwait;                // tics to wait at the top (keep in case a door going down is reset)
-    int topcountdown;           // when it reaches 0, start going down
-} vldoor_t;
-
-#define VDOORSPEED FRACUNIT*2
-#define VDOORWAIT 150
-
-boolean EV_VerticalDoor(line_t * line, mobj_t * thing);
-int EV_DoDoor(line_t * line, byte * args, vldoor_e type);
-void T_VerticalDoor(thinker_t *thinker);
-//void P_SpawnDoorCloseIn30(sector_t *sec);
-//void P_SpawnDoorRaiseIn5Mins(sector_t *sec, int secnum);
-
-/*
-===============================================================================
-
-							P_CEILNG
-
-===============================================================================
-*/
-typedef enum
-{
-    CLEV_LOWERTOFLOOR,
-    CLEV_RAISETOHIGHEST,
-    CLEV_LOWERANDCRUSH,
-    CLEV_CRUSHANDRAISE,
-    CLEV_LOWERBYVALUE,
-    CLEV_RAISEBYVALUE,
-    CLEV_CRUSHRAISEANDSTAY,
-    CLEV_MOVETOVALUETIMES8
-} ceiling_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    ceiling_e type;
-    fixed_t bottomheight, topheight;
-    fixed_t speed;
-    int crush;
-    int direction;              // 1 = up, 0 = waiting, -1 = down
-    int tag;                    // ID
-    int olddirection;
-} ceiling_t;
-
-#define CEILSPEED FRACUNIT
-#define CEILWAIT 150
-#define MAXCEILINGS 30
-
-extern ceiling_t *activeceilings[MAXCEILINGS];
-
-int EV_DoCeiling(line_t * line, byte * args, ceiling_e type);
-void T_MoveCeiling(thinker_t *thinker);
-void P_AddActiveCeiling(ceiling_t * c);
-void P_RemoveActiveCeiling(ceiling_t * c);
-int EV_CeilingCrushStop(line_t * line, byte * args);
-
-/*
-===============================================================================
-
-							P_FLOOR
-
-===============================================================================
-*/
-typedef enum
-{
-    FLEV_LOWERFLOOR,            // lower floor to highest surrounding floor
-    FLEV_LOWERFLOORTOLOWEST,    // lower floor to lowest surrounding floor
-    FLEV_LOWERFLOORBYVALUE,
-    FLEV_RAISEFLOOR,            // raise floor to lowest surrounding CEILING
-    FLEV_RAISEFLOORTONEAREST,   // raise floor to next highest surrounding floor
-    FLEV_RAISEFLOORBYVALUE,
-    FLEV_RAISEFLOORCRUSH,
-    FLEV_RAISEBUILDSTEP,        // One step of a staircase
-    FLEV_RAISEBYVALUETIMES8,
-    FLEV_LOWERBYVALUETIMES8,
-    FLEV_LOWERTIMES8INSTANT,
-    FLEV_RAISETIMES8INSTANT,
-    FLEV_MOVETOVALUETIMES8
-} floor_e;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    floor_e type;
-    int crush;
-    int direction;
-    int newspecial;
-    short texture;
-    fixed_t floordestheight;
-    fixed_t speed;
-    int delayCount;
-    int delayTotal;
-    fixed_t stairsDelayHeight;
-    fixed_t stairsDelayHeightDelta;
-    fixed_t resetHeight;
-    short resetDelay;
-    short resetDelayCount;
-    byte textureChange;
-} floormove_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    int ceilingSpeed;
-    int floorSpeed;
-    int floordest;
-    int ceilingdest;
-    int direction;
-    int crush;
-} pillar_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-    fixed_t originalHeight;
-    fixed_t accumulator;
-    fixed_t accDelta;
-    fixed_t targetScale;
-    fixed_t scale;
-    fixed_t scaleDelta;
-    int ticker;
-    int state;
-} floorWaggle_t;
-
-#define FLOORSPEED FRACUNIT
-
-typedef enum
-{
-    RES_OK,
-    RES_CRUSHED,
-    RES_PASTDEST
-} result_e;
-
-typedef enum
-{
-    STAIRS_NORMAL,
-    STAIRS_SYNC,
-    STAIRS_PHASED
-} stairs_e;
-
-result_e T_MovePlane(sector_t * sector, fixed_t speed,
-                     fixed_t dest, int crush, int floorOrCeiling,
-                     int direction);
-
-int EV_BuildStairs(line_t * line, byte * args, int direction, stairs_e type);
-int EV_DoFloor(line_t * line, byte * args, floor_e floortype);
-void T_MoveFloor(thinker_t *thinker);
-void T_BuildPillar(thinker_t *thinker);
-void T_FloorWaggle(thinker_t *thinker);
-int EV_BuildPillar(line_t * line, byte * args, boolean crush);
-int EV_OpenPillar(line_t * line, byte * args);
-int EV_DoFloorAndCeiling(line_t * line, byte * args, boolean raise);
-int EV_FloorCrushStop(line_t * line, byte * args);
-boolean EV_StartFloorWaggle(int tag, int height, int speed, int offset,
-                            int timer);
-
-//--------------------------------------------------------------------------
-//
-// p_telept
-//
-//--------------------------------------------------------------------------
-
-boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle,
-                   boolean useFog);
-boolean EV_Teleport(int tid, mobj_t * thing, boolean fog);
-
-//--------------------------------------------------------------------------
-//
-// p_acs
-//
-//--------------------------------------------------------------------------
-
-#define MAX_ACS_SCRIPT_VARS 10
-#define MAX_ACS_MAP_VARS 32
-#define MAX_ACS_WORLD_VARS 64
-#define ACS_STACK_DEPTH 32
-#define MAX_ACS_STORE 20
-
-typedef enum
-{
-    ASTE_INACTIVE,
-    ASTE_RUNNING,
-    ASTE_SUSPENDED,
-    ASTE_WAITINGFORTAG,
-    ASTE_WAITINGFORPOLY,
-    ASTE_WAITINGFORSCRIPT,
-    ASTE_TERMINATING
-} aste_t;
-
-typedef struct acs_s acs_t;
-typedef struct acsInfo_s acsInfo_t;
-
-struct acsInfo_s
-{
-    int number;
-    int offset;
-    int argCount;
-    aste_t state;
-    int waitValue;
-};
-
-struct acs_s
-{
-    thinker_t thinker;
-    mobj_t *activator;
-    line_t *line;
-    int side;
-    int number;
-    int infoIndex;
-    int delayCount;
-    int stack[ACS_STACK_DEPTH];
-    int stackPtr;
-    int vars[MAX_ACS_SCRIPT_VARS];
-    int ip;
-};
-
-typedef struct
-{
-    int map;                    // Target map
-    int script;                 // Script number on target map
-    byte args[4];               // Padded to 4 for alignment
-} acsstore_t;
-
-void P_LoadACScripts(int lump);
-boolean P_StartACS(int number, int map, byte * args, mobj_t * activator,
-                   line_t * line, int side);
-boolean P_StartLockedACS(line_t * line, byte * args, mobj_t * mo, int side);
-boolean P_TerminateACS(int number, int map);
-boolean P_SuspendACS(int number, int map);
-void T_InterpretACS(thinker_t *thinker);
-void P_TagFinished(int tag);
-void P_PolyobjFinished(int po);
-void P_ACSInitNewGame(void);
-void P_CheckACSStore(void);
-void CheckACSPresent(int number);
-
-extern int ACScriptCount;
-extern byte *ActionCodeBase;
-extern acsInfo_t *ACSInfo;
-extern int MapVars[MAX_ACS_MAP_VARS];
-extern int WorldVars[MAX_ACS_WORLD_VARS];
-extern acsstore_t ACSStore[MAX_ACS_STORE + 1];  // +1 for termination marker
-
-//--------------------------------------------------------------------------
-//
-// p_things
-//
-//--------------------------------------------------------------------------
-
-extern mobjtype_t TranslateThingType[];
-
-boolean EV_ThingProjectile(byte * args, boolean gravity);
-boolean EV_ThingSpawn(byte * args, boolean fog);
-boolean EV_ThingActivate(int tid);
-boolean EV_ThingDeactivate(int tid);
-boolean EV_ThingRemove(int tid);
-boolean EV_ThingDestroy(int tid);
-
-
-#endif // P_SPEC_H
diff --git a/games/NXDoom/src/hexen/p_switch.c b/games/NXDoom/src/hexen/p_switch.c
deleted file mode 100644
index a90269a79..000000000
--- a/games/NXDoom/src/hexen/p_switch.c
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-//==================================================================
-//
-//      CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
-//
-//==================================================================
-switchlist_t alphSwitchListDemo[] = {
-    {"SW_1_UP", "SW_1_DN", SFX_SWITCH1},
-    {"SW_2_UP", "SW_2_DN", SFX_SWITCH1},
-    {"SW52_OFF", "SW52_ON", SFX_SWITCH2},
-    {"\0", "\0", 0}
-};
-
-switchlist_t alphSwitchListFull[] = {
-    {"SW_1_UP", "SW_1_DN", SFX_SWITCH1},
-    {"SW_2_UP", "SW_2_DN", SFX_SWITCH1},
-    {"VALVE1", "VALVE2", SFX_VALVE_TURN},
-    {"SW51_OFF", "SW51_ON", SFX_SWITCH2},
-    {"SW52_OFF", "SW52_ON", SFX_SWITCH2},
-    {"SW53_UP", "SW53_DN", SFX_ROPE_PULL},
-    {"PUZZLE5", "PUZZLE9", SFX_SWITCH1},
-    {"PUZZLE6", "PUZZLE10", SFX_SWITCH1},
-    {"PUZZLE7", "PUZZLE11", SFX_SWITCH1},
-    {"PUZZLE8", "PUZZLE12", SFX_SWITCH1},
-    {"\0", "\0", 0}
-};
-
-switchlist_t *alphSwitchList = NULL;
-
-int switchlist[MAXSWITCHES * 2];
-int numswitches;
-button_t buttonlist[MAXBUTTONS];
-
-/*
-===============
-=
-= P_InitSwitchList
-=
-= Only called at game initialization
-=
-===============
-*/
-
-void P_InitSwitchList(void)
-{
-    int i;
-    int index;
-
-    if (!alphSwitchList)
-    {
-        if (gamemode == shareware)
-        {
-            alphSwitchList = alphSwitchListDemo;
-        }
-        else
-        {
-            alphSwitchList = alphSwitchListFull;
-        }
-    }
-
-    for (index = 0, i = 0; i < MAXSWITCHES; i++)
-    {
-        if (!alphSwitchList[i].soundID)
-        {
-            numswitches = index / 2;
-            switchlist[index] = -1;
-            break;
-        }
-        switchlist[index++] = R_TextureNumForName(alphSwitchList[i].name1);
-        switchlist[index++] = R_TextureNumForName(alphSwitchList[i].name2);
-    }
-}
-
-//==================================================================
-//
-//      Start a button counting down till it turns off.
-//
-//==================================================================
-void P_StartButton(line_t * line, bwhere_e w, int texture, int time)
-{
-    int i;
-
-    for (i = 0; i < MAXBUTTONS; i++)
-    {
-        if (!buttonlist[i].btimer)
-        {
-            buttonlist[i].line = line;
-            buttonlist[i].where = w;
-            buttonlist[i].btexture = texture;
-            buttonlist[i].btimer = time;
-            buttonlist[i].soundorg = (mobj_t *) & line->frontsector->soundorg;
-            return;
-        }
-    }
-    I_Error("P_StartButton: no button slots left!");
-}
-
-//==================================================================
-//
-//      Function that changes wall texture.
-//      Tell it if switch is ok to use again (1=yes, it's a button).
-//
-//==================================================================
-void P_ChangeSwitchTexture(line_t * line, int useAgain)
-{
-    int texTop;
-    int texMid;
-    int texBot;
-    int i;
-
-    texTop = sides[line->sidenum[0]].toptexture;
-    texMid = sides[line->sidenum[0]].midtexture;
-    texBot = sides[line->sidenum[0]].bottomtexture;
-
-    for (i = 0; i < numswitches * 2; i++)
-    {
-        if (switchlist[i] == texTop)
-        {
-            S_StartSound((mobj_t *) & line->frontsector->soundorg,
-                         alphSwitchList[i / 2].soundID);
-            sides[line->sidenum[0]].toptexture = switchlist[i ^ 1];
-            if (useAgain)
-            {
-                P_StartButton(line, SWTCH_TOP, switchlist[i], BUTTONTIME);
-            }
-            return;
-        }
-        else if (switchlist[i] == texMid)
-        {
-            S_StartSound((mobj_t *) & line->frontsector->soundorg,
-                         alphSwitchList[i / 2].soundID);
-            sides[line->sidenum[0]].midtexture = switchlist[i ^ 1];
-            if (useAgain)
-            {
-                P_StartButton(line, SWTCH_MIDDLE, switchlist[i], BUTTONTIME);
-            }
-            return;
-        }
-        else if (switchlist[i] == texBot)
-        {
-            S_StartSound((mobj_t *) & line->frontsector->soundorg,
-                         alphSwitchList[i / 2].soundID);
-            sides[line->sidenum[0]].bottomtexture = switchlist[i ^ 1];
-            if (useAgain)
-            {
-                P_StartButton(line, SWTCH_BOTTOM, switchlist[i], BUTTONTIME);
-            }
-            return;
-        }
-    }
-}
diff --git a/games/NXDoom/src/hexen/p_telept.c b/games/NXDoom/src/hexen/p_telept.c
deleted file mode 100644
index ba5416b27..000000000
--- a/games/NXDoom/src/hexen/p_telept.c
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// P_Teleport
-//
-//==========================================================================
-
-boolean P_Teleport(mobj_t * thing, fixed_t x, fixed_t y, angle_t angle,
-                   boolean useFog)
-{
-    fixed_t oldx;
-    fixed_t oldy;
-    fixed_t oldz;
-    fixed_t aboveFloor;
-    fixed_t fogDelta;
-    player_t *player;
-    unsigned an;
-    mobj_t *fog;
-
-    oldx = thing->x;
-    oldy = thing->y;
-    oldz = thing->z;
-    aboveFloor = thing->z - thing->floorz;
-    if (!P_TeleportMove(thing, x, y))
-    {
-        return false;
-    }
-    if (thing->player)
-    {
-        player = thing->player;
-        if (player->powers[pw_flight] && aboveFloor)
-        {
-            thing->z = thing->floorz + aboveFloor;
-            if (thing->z + thing->height > thing->ceilingz)
-            {
-                thing->z = thing->ceilingz - thing->height;
-            }
-            player->viewz = thing->z + player->viewheight;
-        }
-        else
-        {
-            thing->z = thing->floorz;
-            player->viewz = thing->z + player->viewheight;
-            if (useFog)
-            {
-                player->lookdir = 0;
-            }
-        }
-    }
-    else if (thing->flags & MF_MISSILE)
-    {
-        thing->z = thing->floorz + aboveFloor;
-        if (thing->z + thing->height > thing->ceilingz)
-        {
-            thing->z = thing->ceilingz - thing->height;
-        }
-    }
-    else
-    {
-        thing->z = thing->floorz;
-    }
-    // Spawn teleport fog at source and destination
-    if (useFog)
-    {
-        fogDelta = thing->flags & MF_MISSILE ? 0 : TELEFOGHEIGHT;
-        fog = P_SpawnMobj(oldx, oldy, oldz + fogDelta, MT_TFOG);
-        S_StartSound(fog, SFX_TELEPORT);
-        an = angle >> ANGLETOFINESHIFT;
-        fog = P_SpawnMobj(x + 20 * finecosine[an],
-                          y + 20 * finesine[an], thing->z + fogDelta,
-                          MT_TFOG);
-        S_StartSound(fog, SFX_TELEPORT);
-        if (thing->player && !thing->player->powers[pw_speed])
-        {                       // Freeze player for about .5 sec
-            thing->reactiontime = 18;
-        }
-        thing->angle = angle;
-    }
-    if (thing->flags2 & MF2_FLOORCLIP)
-    {
-        if (thing->z == thing->subsector->sector->floorheight
-            && P_GetThingFloorType(thing) > FLOOR_SOLID)
-        {
-            thing->floorclip = 10 * FRACUNIT;
-        }
-        else
-        {
-            thing->floorclip = 0;
-        }
-    }
-    if (thing->flags & MF_MISSILE)
-    {
-        angle >>= ANGLETOFINESHIFT;
-        thing->momx = FixedMul(thing->info->speed, finecosine[angle]);
-        thing->momy = FixedMul(thing->info->speed, finesine[angle]);
-    }
-    else if (useFog)            // no fog doesn't alter the player's momentums
-    {
-        thing->momx = thing->momy = thing->momz = 0;
-    }
-    return true;
-}
-
-//==========================================================================
-//
-// EV_Teleport
-//
-//==========================================================================
-
-boolean EV_Teleport(int tid, mobj_t * thing, boolean fog)
-{
-    int i;
-    int count;
-    mobj_t *mo;
-    int searcher;
-
-    if (!thing)
-    {                           // Teleport function called with an invalid mobj
-        return false;
-    }
-    if (thing->flags2 & MF2_NOTELEPORT)
-    {
-        return false;
-    }
-    count = 0;
-    searcher = -1;
-    while (P_FindMobjFromTID(tid, &searcher) != NULL)
-    {
-        count++;
-    }
-    if (count == 0)
-    {
-        return false;
-    }
-    count = 1 + (P_Random() % count);
-    searcher = -1;
-    mo = NULL;
-
-    for (i = 0; i < count; i++)
-    {
-        mo = P_FindMobjFromTID(tid, &searcher);
-    }
-    if (mo == NULL)
-    {
-        I_Error("Can't find teleport mapspot\n");
-    }
-    return P_Teleport(thing, mo->x, mo->y, mo->angle, fog);
-}
diff --git a/games/NXDoom/src/hexen/p_things.c b/games/NXDoom/src/hexen/p_things.c
deleted file mode 100644
index 12ec8547e..000000000
--- a/games/NXDoom/src/hexen/p_things.c
+++ /dev/null
@@ -1,537 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static boolean ActivateThing(mobj_t * mobj);
-static boolean DeactivateThing(mobj_t * mobj);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-mobjtype_t TranslateThingType[] = {
-    MT_MAPSPOT,                 // T_NONE
-    MT_CENTAUR,                 // T_CENTAUR
-    MT_CENTAURLEADER,           // T_CENTAURLEADER
-    MT_DEMON,                   // T_DEMON
-    MT_ETTIN,                   // T_ETTIN
-    MT_FIREDEMON,               // T_FIREGARGOYLE
-    MT_SERPENT,                 // T_WATERLURKER
-    MT_SERPENTLEADER,           // T_WATERLURKERLEADER
-    MT_WRAITH,                  // T_WRAITH
-    MT_WRAITHB,                 // T_WRAITHBURIED
-    MT_FIREBALL1,               // T_FIREBALL1
-    MT_MANA1,                   // T_MANA1
-    MT_MANA2,                   // T_MANA2
-    MT_SPEEDBOOTS,              // T_ITEMBOOTS
-    MT_ARTIEGG,                 // T_ITEMEGG
-    MT_ARTIFLY,                 // T_ITEMFLIGHT
-    MT_SUMMONMAULATOR,          // T_ITEMSUMMON
-    MT_TELEPORTOTHER,           // T_ITEMTPORTOTHER
-    MT_ARTITELEPORT,            // T_ITEMTELEPORT
-    MT_BISHOP,                  // T_BISHOP
-    MT_ICEGUY,                  // T_ICEGOLEM
-    MT_BRIDGE,                  // T_BRIDGE
-    MT_BOOSTARMOR,              // T_DRAGONSKINBRACERS
-    MT_HEALINGBOTTLE,           // T_ITEMHEALTHPOTION
-    MT_HEALTHFLASK,             // T_ITEMHEALTHFLASK
-    MT_ARTISUPERHEAL,           // T_ITEMHEALTHFULL
-    MT_BOOSTMANA,               // T_ITEMBOOSTMANA
-    MT_FW_AXE,                  // T_FIGHTERAXE
-    MT_FW_HAMMER,               // T_FIGHTERHAMMER
-    MT_FW_SWORD1,               // T_FIGHTERSWORD1
-    MT_FW_SWORD2,               // T_FIGHTERSWORD2
-    MT_FW_SWORD3,               // T_FIGHTERSWORD3
-    MT_CW_SERPSTAFF,            // T_CLERICSTAFF
-    MT_CW_HOLY1,                // T_CLERICHOLY1
-    MT_CW_HOLY2,                // T_CLERICHOLY2
-    MT_CW_HOLY3,                // T_CLERICHOLY3
-    MT_MW_CONE,                 // T_MAGESHARDS
-    MT_MW_STAFF1,               // T_MAGESTAFF1
-    MT_MW_STAFF2,               // T_MAGESTAFF2
-    MT_MW_STAFF3,               // T_MAGESTAFF3
-    MT_EGGFX,                   // T_MORPHBLAST
-    MT_ROCK1,                   // T_ROCK1
-    MT_ROCK2,                   // T_ROCK2
-    MT_ROCK3,                   // T_ROCK3
-    MT_DIRT1,                   // T_DIRT1
-    MT_DIRT2,                   // T_DIRT2
-    MT_DIRT3,                   // T_DIRT3
-    MT_DIRT4,                   // T_DIRT4
-    MT_DIRT5,                   // T_DIRT5
-    MT_DIRT6,                   // T_DIRT6
-    MT_ARROW,                   // T_ARROW
-    MT_DART,                    // T_DART
-    MT_POISONDART,              // T_POISONDART
-    MT_RIPPERBALL,              // T_RIPPERBALL
-    MT_SGSHARD1,                // T_STAINEDGLASS1
-    MT_SGSHARD2,                // T_STAINEDGLASS2
-    MT_SGSHARD3,                // T_STAINEDGLASS3
-    MT_SGSHARD4,                // T_STAINEDGLASS4
-    MT_SGSHARD5,                // T_STAINEDGLASS5
-    MT_SGSHARD6,                // T_STAINEDGLASS6
-    MT_SGSHARD7,                // T_STAINEDGLASS7
-    MT_SGSHARD8,                // T_STAINEDGLASS8
-    MT_SGSHARD9,                // T_STAINEDGLASS9
-    MT_SGSHARD0,                // T_STAINEDGLASS0
-    MT_PROJECTILE_BLADE,        // T_BLADE
-    MT_ICESHARD,                // T_ICESHARD
-    MT_FLAME_SMALL,             // T_FLAME_SMALL
-    MT_FLAME_LARGE,             // T_FLAME_LARGE
-    MT_ARMOR_1,                 // T_MESHARMOR
-    MT_ARMOR_2,                 // T_FALCONSHIELD
-    MT_ARMOR_3,                 // T_PLATINUMHELM
-    MT_ARMOR_4,                 // T_AMULETOFWARDING
-    MT_ARTIPOISONBAG,           // T_ITEMFLECHETTE
-    MT_ARTITORCH,               // T_ITEMTORCH
-    MT_BLASTRADIUS,             // T_ITEMREPULSION
-    MT_MANA3,                   // T_MANA3
-    MT_ARTIPUZZSKULL,           // T_PUZZSKULL
-    MT_ARTIPUZZGEMBIG,          // T_PUZZGEMBIG
-    MT_ARTIPUZZGEMRED,          // T_PUZZGEMRED
-    MT_ARTIPUZZGEMGREEN1,       // T_PUZZGEMGREEN1
-    MT_ARTIPUZZGEMGREEN2,       // T_PUZZGEMGREEN2
-    MT_ARTIPUZZGEMBLUE1,        // T_PUZZGEMBLUE1
-    MT_ARTIPUZZGEMBLUE2,        // T_PUZZGEMBLUE2
-    MT_ARTIPUZZBOOK1,           // T_PUZZBOOK1
-    MT_ARTIPUZZBOOK2,           // T_PUZZBOOK2
-    MT_KEY1,                    // T_METALKEY
-    MT_KEY2,                    // T_SMALLMETALKEY
-    MT_KEY3,                    // T_AXEKEY
-    MT_KEY4,                    // T_FIREKEY
-    MT_KEY5,                    // T_GREENKEY
-    MT_KEY6,                    // T_MACEKEY
-    MT_KEY7,                    // T_SILVERKEY
-    MT_KEY8,                    // T_RUSTYKEY
-    MT_KEY9,                    // T_HORNKEY
-    MT_KEYA,                    // T_SERPENTKEY
-    MT_WATER_DRIP,              // T_WATERDRIP
-    MT_FLAME_SMALL_TEMP,        // T_TEMPSMALLFLAME
-    MT_FLAME_SMALL,             // T_PERMSMALLFLAME
-    MT_FLAME_LARGE_TEMP,        // T_TEMPLARGEFLAME
-    MT_FLAME_LARGE,             // T_PERMLARGEFLAME
-    MT_DEMON_MASH,              // T_DEMON_MASH
-    MT_DEMON2_MASH,             // T_DEMON2_MASH
-    MT_ETTIN_MASH,              // T_ETTIN_MASH
-    MT_CENTAUR_MASH,            // T_CENTAUR_MASH
-    MT_THRUSTFLOOR_UP,          // T_THRUSTSPIKEUP
-    MT_THRUSTFLOOR_DOWN,        // T_THRUSTSPIKEDOWN
-    MT_WRAITHFX4,               // T_FLESH_DRIP1
-    MT_WRAITHFX5,               // T_FLESH_DRIP2
-    MT_WRAITHFX2                // T_SPARK_DRIP
-};
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// EV_ThingProjectile
-//
-//==========================================================================
-
-boolean EV_ThingProjectile(byte * args, boolean gravity)
-{
-    int tid;
-    angle_t angle;
-    int fineAngle;
-    fixed_t speed;
-    fixed_t vspeed;
-    mobjtype_t moType;
-    mobj_t *mobj;
-    mobj_t *newMobj;
-    int searcher;
-    boolean success;
-
-    success = false;
-    searcher = -1;
-    tid = args[0];
-    moType = TranslateThingType[args[1]];
-    if (nomonsters && (mobjinfo[moType].flags & MF_COUNTKILL))
-    {                           // Don't spawn monsters if -nomonsters
-        return false;
-    }
-    angle = (int) args[2] << 24;
-    fineAngle = angle >> ANGLETOFINESHIFT;
-    speed = (int) args[3] << 13;
-    vspeed = (int) args[4] << 13;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        newMobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, moType);
-        if (newMobj->info->seesound)
-        {
-            S_StartSound(newMobj, newMobj->info->seesound);
-        }
-        newMobj->target = mobj; // Originator
-        newMobj->angle = angle;
-        newMobj->momx = FixedMul(speed, finecosine[fineAngle]);
-        newMobj->momy = FixedMul(speed, finesine[fineAngle]);
-        newMobj->momz = vspeed;
-        newMobj->flags2 |= MF2_DROPPED; // Don't respawn
-        if (gravity == true)
-        {
-            newMobj->flags &= ~MF_NOGRAVITY;
-            newMobj->flags2 |= MF2_LOGRAV;
-        }
-        if (P_CheckMissileSpawn(newMobj) == true)
-        {
-            success = true;
-        }
-    }
-    return success;
-}
-
-//==========================================================================
-//
-// EV_ThingSpawn
-//
-//==========================================================================
-
-boolean EV_ThingSpawn(byte * args, boolean fog)
-{
-    int tid;
-    angle_t angle;
-    mobj_t *mobj;
-    mobj_t *newMobj;
-    mobj_t *fogMobj;
-    mobjtype_t moType;
-    int searcher;
-    boolean success;
-    fixed_t z;
-
-    success = false;
-    searcher = -1;
-    tid = args[0];
-    moType = TranslateThingType[args[1]];
-    if (nomonsters && (mobjinfo[moType].flags & MF_COUNTKILL))
-    {                           // Don't spawn monsters if -nomonsters
-        return false;
-    }
-    angle = (int) args[2] << 24;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        if (mobjinfo[moType].flags2 & MF2_FLOATBOB)
-        {
-            z = mobj->z - mobj->floorz;
-        }
-        else
-        {
-            z = mobj->z;
-        }
-        newMobj = P_SpawnMobj(mobj->x, mobj->y, z, moType);
-        if (P_TestMobjLocation(newMobj) == false)
-        {                       // Didn't fit
-            P_RemoveMobj(newMobj);
-        }
-        else
-        {
-            newMobj->angle = angle;
-            if (fog == true)
-            {
-                fogMobj = P_SpawnMobj(mobj->x, mobj->y,
-                                      mobj->z + TELEFOGHEIGHT, MT_TFOG);
-                S_StartSound(fogMobj, SFX_TELEPORT);
-            }
-            newMobj->flags2 |= MF2_DROPPED;     // Don't respawn
-            if (newMobj->flags2 & MF2_FLOATBOB)
-            {
-                newMobj->special1.i = newMobj->z - newMobj->floorz;
-            }
-            success = true;
-        }
-    }
-    return success;
-}
-
-//==========================================================================
-//
-// EV_ThingActivate
-//
-//==========================================================================
-
-boolean EV_ThingActivate(int tid)
-{
-    mobj_t *mobj;
-    int searcher;
-    boolean success;
-
-    success = false;
-    searcher = -1;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        if (ActivateThing(mobj) == true)
-        {
-            success = true;
-        }
-    }
-    return success;
-}
-
-//==========================================================================
-//
-// EV_ThingDeactivate
-//
-//==========================================================================
-
-boolean EV_ThingDeactivate(int tid)
-{
-    mobj_t *mobj;
-    int searcher;
-    boolean success;
-
-    success = false;
-    searcher = -1;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        if (DeactivateThing(mobj) == true)
-        {
-            success = true;
-        }
-    }
-    return success;
-}
-
-//==========================================================================
-//
-// EV_ThingRemove
-//
-//==========================================================================
-
-boolean EV_ThingRemove(int tid)
-{
-    mobj_t *mobj;
-    int searcher;
-    boolean success;
-
-    success = false;
-    searcher = -1;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        if (mobj->type == MT_BRIDGE)
-        {
-            A_BridgeRemove(mobj);
-            return true;
-        }
-        P_RemoveMobj(mobj);
-        success = true;
-    }
-    return success;
-}
-
-//==========================================================================
-//
-// EV_ThingDestroy
-//
-//==========================================================================
-
-boolean EV_ThingDestroy(int tid)
-{
-    mobj_t *mobj;
-    int searcher;
-    boolean success;
-
-    success = false;
-    searcher = -1;
-    while ((mobj = P_FindMobjFromTID(tid, &searcher)) != NULL)
-    {
-        if (mobj->flags & MF_SHOOTABLE)
-        {
-            P_DamageMobj(mobj, NULL, NULL, 10000);
-            success = true;
-        }
-    }
-    return success;
-}
-
-//==========================================================================
-//
-// EV_ThingMove
-//
-// arg[0] = tid
-// arg[1] = speed
-// arg[2] = angle (255 = use mobj angle)
-// arg[3] = distance (pixels>>2)
-//
-//==========================================================================
-
-/*
-boolean EV_ThingMove(byte *args)
-{
-	return false;
-}
-*/
-
-//==========================================================================
-//
-// ActivateThing
-//
-//==========================================================================
-
-static boolean ActivateThing(mobj_t * mobj)
-{
-    if (mobj->flags & MF_COUNTKILL)
-    {                           // Monster
-        if (mobj->flags2 & MF2_DORMANT)
-        {
-            mobj->flags2 &= ~MF2_DORMANT;
-            mobj->tics = 1;
-            return true;
-        }
-        return false;
-    }
-    switch (mobj->type)
-    {
-        case MT_ZTWINEDTORCH:
-        case MT_ZTWINEDTORCH_UNLIT:
-            P_SetMobjState(mobj, S_ZTWINEDTORCH_1);
-            S_StartSound(mobj, SFX_IGNITE);
-            break;
-        case MT_ZWALLTORCH:
-        case MT_ZWALLTORCH_UNLIT:
-            P_SetMobjState(mobj, S_ZWALLTORCH1);
-            S_StartSound(mobj, SFX_IGNITE);
-            break;
-        case MT_ZGEMPEDESTAL:
-            P_SetMobjState(mobj, S_ZGEMPEDESTAL2);
-            break;
-        case MT_ZWINGEDSTATUENOSKULL:
-            P_SetMobjState(mobj, S_ZWINGEDSTATUENOSKULL2);
-            break;
-        case MT_THRUSTFLOOR_UP:
-        case MT_THRUSTFLOOR_DOWN:
-            if (mobj->args[0] == 0)
-            {
-                S_StartSound(mobj, SFX_THRUSTSPIKE_LOWER);
-                mobj->flags2 &= ~MF2_DONTDRAW;
-                if (mobj->args[1])
-                    P_SetMobjState(mobj, S_BTHRUSTRAISE1);
-                else
-                    P_SetMobjState(mobj, S_THRUSTRAISE1);
-            }
-            break;
-        case MT_ZFIREBULL:
-        case MT_ZFIREBULL_UNLIT:
-            P_SetMobjState(mobj, S_ZFIREBULL_BIRTH);
-            S_StartSound(mobj, SFX_IGNITE);
-            break;
-        case MT_ZBELL:
-            if (mobj->health > 0)
-            {
-                P_DamageMobj(mobj, NULL, NULL, 10);     // 'ring' the bell
-            }
-            break;
-        case MT_ZCAULDRON:
-        case MT_ZCAULDRON_UNLIT:
-            P_SetMobjState(mobj, S_ZCAULDRON1);
-            S_StartSound(mobj, SFX_IGNITE);
-            break;
-        case MT_FLAME_SMALL:
-            S_StartSound(mobj, SFX_IGNITE);
-            P_SetMobjState(mobj, S_FLAME_SMALL1);
-            break;
-        case MT_FLAME_LARGE:
-            S_StartSound(mobj, SFX_IGNITE);
-            P_SetMobjState(mobj, S_FLAME_LARGE1);
-            break;
-        case MT_BAT_SPAWNER:
-            P_SetMobjState(mobj, S_SPAWNBATS1);
-            break;
-        default:
-            return false;
-            break;
-    }
-    return true;
-}
-
-//==========================================================================
-//
-// DeactivateThing
-//
-//==========================================================================
-
-static boolean DeactivateThing(mobj_t * mobj)
-{
-    if (mobj->flags & MF_COUNTKILL)
-    {                           // Monster
-        if (!(mobj->flags2 & MF2_DORMANT))
-        {
-            mobj->flags2 |= MF2_DORMANT;
-            mobj->tics = -1;
-            return true;
-        }
-        return false;
-    }
-    switch (mobj->type)
-    {
-        case MT_ZTWINEDTORCH:
-        case MT_ZTWINEDTORCH_UNLIT:
-            P_SetMobjState(mobj, S_ZTWINEDTORCH_UNLIT);
-            break;
-        case MT_ZWALLTORCH:
-        case MT_ZWALLTORCH_UNLIT:
-            P_SetMobjState(mobj, S_ZWALLTORCH_U);
-            break;
-        case MT_THRUSTFLOOR_UP:
-        case MT_THRUSTFLOOR_DOWN:
-            if (mobj->args[0] == 1)
-            {
-                S_StartSound(mobj, SFX_THRUSTSPIKE_RAISE);
-                if (mobj->args[1])
-                    P_SetMobjState(mobj, S_BTHRUSTLOWER);
-                else
-                    P_SetMobjState(mobj, S_THRUSTLOWER);
-            }
-            break;
-        case MT_ZFIREBULL:
-        case MT_ZFIREBULL_UNLIT:
-            P_SetMobjState(mobj, S_ZFIREBULL_DEATH);
-            break;
-        case MT_ZCAULDRON:
-        case MT_ZCAULDRON_UNLIT:
-            P_SetMobjState(mobj, S_ZCAULDRON_U);
-            break;
-        case MT_FLAME_SMALL:
-            P_SetMobjState(mobj, S_FLAME_SDORM1);
-            break;
-        case MT_FLAME_LARGE:
-            P_SetMobjState(mobj, S_FLAME_LDORM1);
-            break;
-        case MT_BAT_SPAWNER:
-            P_SetMobjState(mobj, S_SPAWNBATS_OFF);
-            break;
-        default:
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/games/NXDoom/src/hexen/p_tick.c b/games/NXDoom/src/hexen/p_tick.c
deleted file mode 100644
index 3d3dd389c..000000000
--- a/games/NXDoom/src/hexen/p_tick.c
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "p_local.h"
-
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void RunThinkers(void);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-int leveltime;
-int TimerGame;
-thinker_t thinkercap;           // The head and tail of the thinker list
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// P_Ticker
-//
-//==========================================================================
-
-void P_Ticker(void)
-{
-    int i;
-
-    if (paused)
-    {
-        return;
-    }
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (playeringame[i])
-        {
-            P_PlayerThink(&players[i]);
-        }
-    }
-    if (TimerGame)
-    {
-        if (!--TimerGame)
-        {
-            G_Completed(P_TranslateMap(P_GetMapNextMap(gamemap)), 0);
-        }
-    }
-    RunThinkers();
-    P_UpdateSpecials();
-    P_AnimateSurfaces();
-    leveltime++;
-}
-
-//==========================================================================
-//
-// RunThinkers
-//
-//==========================================================================
-
-static void RunThinkers(void)
-{
-    thinker_t *currentthinker, *nextthinker;
-
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
-    {
-        if (currentthinker->function == (think_t) - 1)
-        {                       // Time to remove it
-            nextthinker = currentthinker->next;
-            currentthinker->next->prev = currentthinker->prev;
-            currentthinker->prev->next = currentthinker->next;
-            Z_Free(currentthinker);
-        }
-        else
-        {
-            if (currentthinker->function)
-                currentthinker->function(currentthinker);
-            nextthinker = currentthinker->next;
-        }
-
-        currentthinker = nextthinker;
-    }
-}
-
-//==========================================================================
-//
-// P_InitThinkers
-//
-//==========================================================================
-
-void P_InitThinkers(void)
-{
-    thinkercap.prev = thinkercap.next = &thinkercap;
-}
-
-//==========================================================================
-//
-// P_AddThinker
-//
-// Adds a new thinker at the end of the list.
-//
-//==========================================================================
-
-void P_AddThinker(thinker_t * thinker)
-{
-    thinkercap.prev->next = thinker;
-    thinker->next = &thinkercap;
-    thinker->prev = thinkercap.prev;
-    thinkercap.prev = thinker;
-}
-
-//==========================================================================
-//
-// P_RemoveThinker
-//
-// Deallocation is lazy -- it will not actually be freed until its
-// thinking turn comes up.
-//
-//==========================================================================
-
-void P_RemoveThinker(thinker_t * thinker)
-{
-    thinker->function = (think_t) - 1;
-}
diff --git a/games/NXDoom/src/hexen/p_user.c b/games/NXDoom/src/hexen/p_user.c
deleted file mode 100644
index 52986bd23..000000000
--- a/games/NXDoom/src/hexen/p_user.c
+++ /dev/null
@@ -1,1643 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-
-// Macros
-
-#define MAXBOB 0x100000         // 16 pixels of bob
-
-// Data
-
-boolean onground;
-int newtorch;                   // used in the torch flicker effect.
-int newtorchdelta;
-
-int PStateNormal[NUMCLASSES] = {
-    S_FPLAY,
-    S_CPLAY,
-    S_MPLAY,
-    S_PIGPLAY
-};
-
-int PStateRun[NUMCLASSES] = {
-    S_FPLAY_RUN1,
-    S_CPLAY_RUN1,
-    S_MPLAY_RUN1,
-    S_PIGPLAY_RUN1
-};
-
-int PStateAttack[NUMCLASSES] = {
-    S_FPLAY_ATK1,
-    S_CPLAY_ATK1,
-    S_MPLAY_ATK1,
-    S_PIGPLAY_ATK1
-};
-
-int PStateAttackEnd[NUMCLASSES] = {
-    S_FPLAY_ATK2,
-    S_CPLAY_ATK3,
-    S_MPLAY_ATK2,
-    S_PIGPLAY_ATK1
-};
-
-int ArmorMax[NUMCLASSES] = { 20, 18, 16, 1 };
-
-/*
-==================
-=
-= P_Thrust
-=
-= moves the given origin along a given angle
-=
-==================
-*/
-
-void P_Thrust(player_t * player, angle_t angle, fixed_t move)
-{
-    angle >>= ANGLETOFINESHIFT;
-    if (player->powers[pw_flight] && !(player->mo->z <= player->mo->floorz))
-    {
-        player->mo->momx += FixedMul(move, finecosine[angle]);
-        player->mo->momy += FixedMul(move, finesine[angle]);
-    }
-    else if (P_GetThingFloorType(player->mo) == FLOOR_ICE)      // Friction_Low
-    {
-        player->mo->momx += FixedMul(move >> 1, finecosine[angle]);
-        player->mo->momy += FixedMul(move >> 1, finesine[angle]);
-    }
-    else
-    {
-        player->mo->momx += FixedMul(move, finecosine[angle]);
-        player->mo->momy += FixedMul(move, finesine[angle]);
-    }
-}
-
-
-/*
-==================
-=
-= P_CalcHeight
-=
-=Calculate the walking / running height adjustment
-=
-==================
-*/
-
-void P_CalcHeight(player_t * player)
-{
-    int angle;
-    fixed_t bob;
-
-//
-// regular movement bobbing (needs to be calculated for gun swing even
-// if not on ground)
-// OPTIMIZE: tablify angle
-
-    player->bob = FixedMul(player->mo->momx, player->mo->momx) +
-        FixedMul(player->mo->momy, player->mo->momy);
-    player->bob >>= 2;
-    if (player->bob > MAXBOB)
-        player->bob = MAXBOB;
-    if (player->mo->flags2 & MF2_FLY && !onground)
-    {
-        player->bob = FRACUNIT / 2;
-    }
-
-    if ((player->cheats & CF_NOMOMENTUM))
-    {
-        player->viewz = player->mo->z + VIEWHEIGHT;
-        if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
-            player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
-        player->viewz = player->mo->z + player->viewheight;
-        return;
-    }
-
-    angle = (FINEANGLES / 20 * leveltime) & FINEMASK;
-    bob = FixedMul(player->bob / 2, finesine[angle]);
-
-//
-// move viewheight
-//
-    if (player->playerstate == PST_LIVE)
-    {
-        player->viewheight += player->deltaviewheight;
-        if (player->viewheight > VIEWHEIGHT)
-        {
-            player->viewheight = VIEWHEIGHT;
-            player->deltaviewheight = 0;
-        }
-        if (player->viewheight < VIEWHEIGHT / 2)
-        {
-            player->viewheight = VIEWHEIGHT / 2;
-            if (player->deltaviewheight <= 0)
-                player->deltaviewheight = 1;
-        }
-
-        if (player->deltaviewheight)
-        {
-            player->deltaviewheight += FRACUNIT / 4;
-            if (!player->deltaviewheight)
-                player->deltaviewheight = 1;
-        }
-    }
-
-    if (player->morphTics)
-    {
-        player->viewz = player->mo->z + player->viewheight - (20 * FRACUNIT);
-    }
-    else
-    {
-        player->viewz = player->mo->z + player->viewheight + bob;
-    }
-    if (player->mo->floorclip && player->playerstate != PST_DEAD
-        && player->mo->z <= player->mo->floorz)
-    {
-        player->viewz -= player->mo->floorclip;
-    }
-    if (player->viewz > player->mo->ceilingz - 4 * FRACUNIT)
-    {
-        player->viewz = player->mo->ceilingz - 4 * FRACUNIT;
-    }
-    if (player->viewz < player->mo->floorz + 4 * FRACUNIT)
-    {
-        player->viewz = player->mo->floorz + 4 * FRACUNIT;
-    }
-}
-
-/*
-=================
-=
-= P_MovePlayer
-=
-=================
-*/
-
-void P_MovePlayer(player_t * player)
-{
-    int look;
-    int fly;
-    ticcmd_t *cmd;
-
-    cmd = &player->cmd;
-    player->mo->angle += (cmd->angleturn << 16);
-
-    onground = (player->mo->z <= player->mo->floorz
-                || (player->mo->flags2 & MF2_ONMOBJ));
-
-    if (cmd->forwardmove)
-    {
-        if (onground || player->mo->flags2 & MF2_FLY)
-        {
-            P_Thrust(player, player->mo->angle, cmd->forwardmove * 2048);
-        }
-        else
-        {
-            P_Thrust(player, player->mo->angle, FRACUNIT >> 8);
-        }
-    }
-    if (cmd->sidemove)
-    {
-        if (onground || player->mo->flags2 & MF2_FLY)
-        {
-            P_Thrust(player, player->mo->angle - ANG90, cmd->sidemove * 2048);
-        }
-        else
-        {
-            P_Thrust(player, player->mo->angle, FRACUNIT >> 8);
-        }
-    }
-    if (cmd->forwardmove || cmd->sidemove)
-    {
-        if (player->mo->state == &states[PStateNormal[player->class]])
-        {
-            P_SetMobjState(player->mo, PStateRun[player->class]);
-        }
-    }
-
-    look = cmd->lookfly & 15;
-    if (look > 7)
-    {
-        look -= 16;
-    }
-    if (look)
-    {
-        if (look == TOCENTER)
-        {
-            player->centering = true;
-        }
-        else
-        {
-            player->lookdir += 5 * look;
-            if (player->lookdir > 90 || player->lookdir < -110)
-            {
-                player->lookdir -= 5 * look;
-            }
-        }
-    }
-    if (player->centering)
-    {
-        if (player->lookdir > 0)
-        {
-            player->lookdir -= 8;
-        }
-        else if (player->lookdir < 0)
-        {
-            player->lookdir += 8;
-        }
-        if (abs(player->lookdir) < 8)
-        {
-            player->lookdir = 0;
-            player->centering = false;
-        }
-    }
-    fly = cmd->lookfly >> 4;
-    if (fly > 7)
-    {
-        fly -= 16;
-    }
-    if (fly && player->powers[pw_flight])
-    {
-        if (fly != TOCENTER)
-        {
-            player->flyheight = fly * 2;
-            if (!(player->mo->flags2 & MF2_FLY))
-            {
-                player->mo->flags2 |= MF2_FLY;
-                player->mo->flags |= MF_NOGRAVITY;
-                if (player->mo->momz <= -39 * FRACUNIT)
-                {               // stop falling scream
-                    S_StopSound(player->mo);
-                }
-            }
-        }
-        else
-        {
-            player->mo->flags2 &= ~MF2_FLY;
-            player->mo->flags &= ~MF_NOGRAVITY;
-        }
-    }
-    else if (fly > 0)
-    {
-        P_PlayerUseArtifact(player, arti_fly);
-    }
-    if (player->mo->flags2 & MF2_FLY)
-    {
-        player->mo->momz = player->flyheight * FRACUNIT;
-        if (player->flyheight)
-        {
-            player->flyheight /= 2;
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_DeathThink
-//
-//==========================================================================
-
-void P_DeathThink(player_t * player)
-{
-    int dir;
-    angle_t delta;
-    int lookDelta;
-
-    P_MovePsprites(player);
-
-    onground = (player->mo->z <= player->mo->floorz);
-    if (player->mo->type == MT_BLOODYSKULL || player->mo->type == MT_ICECHUNK)
-    {                           // Flying bloody skull or flying ice chunk
-        player->viewheight = 6 * FRACUNIT;
-        player->deltaviewheight = 0;
-        //player->damagecount = 20;
-        if (onground)
-        {
-            if (player->lookdir < 60)
-            {
-                lookDelta = (60 - player->lookdir) / 8;
-                if (lookDelta < 1 && (leveltime & 1))
-                {
-                    lookDelta = 1;
-                }
-                else if (lookDelta > 6)
-                {
-                    lookDelta = 6;
-                }
-                player->lookdir += lookDelta;
-            }
-        }
-    }
-    else if (!(player->mo->flags2 & MF2_ICEDAMAGE))
-    {                           // Fall to ground (if not frozen)
-        player->deltaviewheight = 0;
-        if (player->viewheight > 6 * FRACUNIT)
-        {
-            player->viewheight -= FRACUNIT;
-        }
-        if (player->viewheight < 6 * FRACUNIT)
-        {
-            player->viewheight = 6 * FRACUNIT;
-        }
-        if (player->lookdir > 0)
-        {
-            player->lookdir -= 6;
-        }
-        else if (player->lookdir < 0)
-        {
-            player->lookdir += 6;
-        }
-        if (abs(player->lookdir) < 6)
-        {
-            player->lookdir = 0;
-        }
-    }
-    P_CalcHeight(player);
-
-    if (player->attacker && player->attacker != player->mo)
-    {                           // Watch killer
-        dir = P_FaceMobj(player->mo, player->attacker, &delta);
-        if (delta < ANG1 * 10)
-        {                       // Looking at killer, so fade damage and poison counters
-            if (player->damagecount)
-            {
-                player->damagecount--;
-            }
-            if (player->poisoncount)
-            {
-                player->poisoncount--;
-            }
-        }
-        delta = delta / 8;
-        if (delta > ANG1 * 5)
-        {
-            delta = ANG1 * 5;
-        }
-        if (dir)
-        {                       // Turn clockwise
-            player->mo->angle += delta;
-        }
-        else
-        {                       // Turn counter clockwise
-            player->mo->angle -= delta;
-        }
-    }
-    else if (player->damagecount || player->poisoncount)
-    {
-        if (player->damagecount)
-        {
-            player->damagecount--;
-        }
-        else
-        {
-            player->poisoncount--;
-        }
-    }
-
-    if (player->cmd.buttons & BT_USE)
-    {
-        if (player == &players[consoleplayer])
-        {
-            I_SetPalette((byte *) W_CacheLumpName("PLAYPAL", PU_CACHE));
-            inv_ptr = 0;
-            curpos = 0;
-            newtorch = 0;
-            newtorchdelta = 0;
-        }
-        player->playerstate = PST_REBORN;
-        player->mo->special1.i = player->class;
-        if (player->mo->special1.i > 2)
-        {
-            player->mo->special1.i = 0;
-        }
-        // Let the mobj know the player has entered the reborn state.  Some
-        // mobjs need to know when it's ok to remove themselves.
-        player->mo->special2.i = 666;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_MorphPlayerThink
-//
-//----------------------------------------------------------------------------
-
-void P_MorphPlayerThink(player_t * player)
-{
-    mobj_t *pmo;
-
-    if (player->morphTics & 15)
-    {
-        return;
-    }
-    pmo = player->mo;
-    if (!(pmo->momx + pmo->momy) && P_Random() < 64)
-    {                           // Snout sniff
-        P_SetPspriteNF(player, ps_weapon, S_SNOUTATK2);
-        S_StartSound(pmo, SFX_PIG_ACTIVE1);     // snort
-        return;
-    }
-    if (P_Random() < 48)
-    {
-        if (P_Random() < 128)
-        {
-            S_StartSound(pmo, SFX_PIG_ACTIVE1);
-        }
-        else
-        {
-            S_StartSound(pmo, SFX_PIG_ACTIVE2);
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_GetPlayerNum
-//
-//----------------------------------------------------------------------------
-
-int P_GetPlayerNum(player_t * player)
-{
-    int i;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (player == &players[i])
-        {
-            return (i);
-        }
-    }
-    return (0);
-}
-
-//----------------------------------------------------------------------------
-//
-// FUNC P_UndoPlayerMorph
-//
-//----------------------------------------------------------------------------
-
-boolean P_UndoPlayerMorph(player_t * player)
-{
-    mobj_t *fog;
-    mobj_t *mo;
-    mobj_t *pmo;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    angle_t angle;
-    int playerNum;
-    weapontype_t weapon;
-    int oldFlags;
-    int oldFlags2;
-    int oldBeast;
-
-    pmo = player->mo;
-    x = pmo->x;
-    y = pmo->y;
-    z = pmo->z;
-    angle = pmo->angle;
-    weapon = pmo->special1.i;
-    oldFlags = pmo->flags;
-    oldFlags2 = pmo->flags2;
-    oldBeast = pmo->type;
-    P_SetMobjState(pmo, S_FREETARGMOBJ);
-    playerNum = P_GetPlayerNum(player);
-    switch (PlayerClass[playerNum])
-    {
-        case PCLASS_FIGHTER:
-            mo = P_SpawnMobj(x, y, z, MT_PLAYER_FIGHTER);
-            break;
-        case PCLASS_CLERIC:
-            mo = P_SpawnMobj(x, y, z, MT_PLAYER_CLERIC);
-            break;
-        case PCLASS_MAGE:
-            mo = P_SpawnMobj(x, y, z, MT_PLAYER_MAGE);
-            break;
-        default:
-            I_Error("P_UndoPlayerMorph:  Unknown player class %d\n",
-                    player->class);
-            return false;
-    }
-    if (P_TestMobjLocation(mo) == false)
-    {                           // Didn't fit
-        P_RemoveMobj(mo);
-        mo = P_SpawnMobj(x, y, z, oldBeast);
-        mo->angle = angle;
-        mo->health = player->health;
-        mo->special1.i = weapon;
-        mo->player = player;
-        mo->flags = oldFlags;
-        mo->flags2 = oldFlags2;
-        player->mo = mo;
-        player->morphTics = 2 * 35;
-        return (false);
-    }
-    if (player->class == PCLASS_FIGHTER)
-    {
-        // The first type should be blue, and the third should be the
-        // Fighter's original gold color
-        if (playerNum == 0)
-        {
-            mo->flags |= 2 << MF_TRANSSHIFT;
-        }
-        else if (playerNum != 2)
-        {
-            mo->flags |= playerNum << MF_TRANSSHIFT;
-        }
-    }
-    else if (playerNum)
-    {                           // Set color translation bits for player sprites
-        mo->flags |= playerNum << MF_TRANSSHIFT;
-    }
-    mo->angle = angle;
-    mo->player = player;
-    mo->reactiontime = 18;
-    if (oldFlags2 & MF2_FLY)
-    {
-        mo->flags2 |= MF2_FLY;
-        mo->flags |= MF_NOGRAVITY;
-    }
-    player->morphTics = 0;
-    player->health = mo->health = MAXHEALTH;
-    player->mo = mo;
-    player->class = PlayerClass[playerNum];
-    angle >>= ANGLETOFINESHIFT;
-    fog = P_SpawnMobj(x + 20 * finecosine[angle],
-                      y + 20 * finesine[angle], z + TELEFOGHEIGHT, MT_TFOG);
-    S_StartSound(fog, SFX_TELEPORT);
-    P_PostMorphWeapon(player, weapon);
-    return (true);
-}
-
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerThink
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerThink(player_t * player)
-{
-    ticcmd_t *cmd;
-    weapontype_t newweapon;
-    int floorType;
-    mobj_t *pmo;
-
-    // No-clip cheat
-    if (player->cheats & CF_NOCLIP)
-    {
-        player->mo->flags |= MF_NOCLIP;
-    }
-    else
-    {
-        player->mo->flags &= ~MF_NOCLIP;
-    }
-    cmd = &player->cmd;
-    if (player->mo->flags & MF_JUSTATTACKED)
-    {                           // Gauntlets attack auto forward motion
-        cmd->angleturn = 0;
-        cmd->forwardmove = 0xc800 / 512;
-        cmd->sidemove = 0;
-        player->mo->flags &= ~MF_JUSTATTACKED;
-    }
-// messageTics is above the rest of the counters so that messages will 
-//              go away, even in death.
-    player->messageTics--;      // Can go negative
-    if (!player->messageTics || player->messageTics == -1)
-    {                           // Refresh the screen when a message goes away
-        player->ultimateMessage = false;        // clear out any chat messages.
-        player->yellowMessage = false;
-        if (player == &players[consoleplayer])
-        {
-            BorderTopRefresh = true;
-        }
-    }
-    player->worldTimer++;
-    if (player->playerstate == PST_DEAD)
-    {
-        P_DeathThink(player);
-        return;
-    }
-    if (player->jumpTics)
-    {
-        player->jumpTics--;
-    }
-    if (player->morphTics)
-    {
-        P_MorphPlayerThink(player);
-    }
-    // Handle movement
-    if (player->mo->reactiontime)
-    {                           // Player is frozen
-        player->mo->reactiontime--;
-    }
-    else
-    {
-        P_MovePlayer(player);
-        pmo = player->mo;
-        if (player->powers[pw_speed] && !(leveltime & 1)
-            && P_AproxDistance(pmo->momx, pmo->momy) > 12 * FRACUNIT)
-        {
-            mobj_t *speedMo;
-            int playerNum;
-
-            speedMo = P_SpawnMobj(pmo->x, pmo->y, pmo->z, MT_PLAYER_SPEED);
-            if (speedMo)
-            {
-                speedMo->angle = pmo->angle;
-                playerNum = P_GetPlayerNum(player);
-                if (player->class == PCLASS_FIGHTER)
-                {
-                    // The first type should be blue, and the 
-                    // third should be the Fighter's original gold color
-                    if (playerNum == 0)
-                    {
-                        speedMo->flags |= 2 << MF_TRANSSHIFT;
-                    }
-                    else if (playerNum != 2)
-                    {
-                        speedMo->flags |= playerNum << MF_TRANSSHIFT;
-                    }
-                }
-                else if (playerNum)
-                {               // Set color translation bits for player sprites
-                    speedMo->flags |= playerNum << MF_TRANSSHIFT;
-                }
-                speedMo->target = pmo;
-                speedMo->special1.i = player->class;
-                if (speedMo->special1.i > 2)
-                {
-                    speedMo->special1.i = 0;
-                }
-                speedMo->sprite = pmo->sprite;
-                speedMo->floorclip = pmo->floorclip;
-                if (player == &players[consoleplayer])
-                {
-                    speedMo->flags2 |= MF2_DONTDRAW;
-                }
-            }
-        }
-    }
-    P_CalcHeight(player);
-    if (player->mo->subsector->sector->special)
-    {
-        P_PlayerInSpecialSector(player);
-    }
-    if ((floorType = P_GetThingFloorType(player->mo)) != FLOOR_SOLID)
-    {
-        P_PlayerOnSpecialFlat(player, floorType);
-    }
-    switch (player->class)
-    {
-        case PCLASS_FIGHTER:
-            if (player->mo->momz <= -35 * FRACUNIT
-                && player->mo->momz >= -40 * FRACUNIT && !player->morphTics
-                && !S_GetSoundPlayingInfo(player->mo,
-                                          SFX_PLAYER_FIGHTER_FALLING_SCREAM))
-            {
-                S_StartSound(player->mo, SFX_PLAYER_FIGHTER_FALLING_SCREAM);
-            }
-            break;
-        case PCLASS_CLERIC:
-            if (player->mo->momz <= -35 * FRACUNIT
-                && player->mo->momz >= -40 * FRACUNIT && !player->morphTics
-                && !S_GetSoundPlayingInfo(player->mo,
-                                          SFX_PLAYER_CLERIC_FALLING_SCREAM))
-            {
-                S_StartSound(player->mo, SFX_PLAYER_CLERIC_FALLING_SCREAM);
-            }
-            break;
-        case PCLASS_MAGE:
-            if (player->mo->momz <= -35 * FRACUNIT
-                && player->mo->momz >= -40 * FRACUNIT && !player->morphTics
-                && !S_GetSoundPlayingInfo(player->mo,
-                                          SFX_PLAYER_MAGE_FALLING_SCREAM))
-            {
-                S_StartSound(player->mo, SFX_PLAYER_MAGE_FALLING_SCREAM);
-            }
-            break;
-        default:
-            break;
-    }
-    if (cmd->arti)
-    {                           // Use an artifact
-        if ((cmd->arti & AFLAG_JUMP) && onground && !player->jumpTics)
-        {
-            if (player->morphTics)
-            {
-                player->mo->momz = 6 * FRACUNIT;
-            }
-            else
-            {
-                player->mo->momz = 9 * FRACUNIT;
-            }
-            player->mo->flags2 &= ~MF2_ONMOBJ;
-            player->jumpTics = 18;
-        }
-        else if (cmd->arti & AFLAG_SUICIDE)
-        {
-            P_DamageMobj(player->mo, NULL, NULL, 10000);
-        }
-        if (cmd->arti == NUMARTIFACTS)
-        {                       // use one of each artifact (except puzzle artifacts)
-            int i;
-
-            for (i = 1; i < arti_firstpuzzitem; i++)
-            {
-                P_PlayerUseArtifact(player, i);
-            }
-        }
-        else
-        {
-            P_PlayerUseArtifact(player, cmd->arti & AFLAG_MASK);
-        }
-    }
-    // Check for weapon change
-    if (cmd->buttons & BT_SPECIAL)
-    {                           // A special event has no other buttons
-        cmd->buttons = 0;
-    }
-    if (cmd->buttons & BT_CHANGE && !player->morphTics)
-    {
-        // The actual changing of the weapon is done when the weapon
-        // psprite can do it (A_WeaponReady), so it doesn't happen in
-        // the middle of an attack.
-        newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
-        if (player->weaponowned[newweapon]
-            && newweapon != player->readyweapon)
-        {
-            player->pendingweapon = newweapon;
-        }
-    }
-    // Check for use
-    if (cmd->buttons & BT_USE)
-    {
-        if (!player->usedown)
-        {
-            P_UseLines(player);
-            player->usedown = true;
-        }
-    }
-    else
-    {
-        player->usedown = false;
-    }
-    // Morph counter
-    if (player->morphTics)
-    {
-        if (!--player->morphTics)
-        {                       // Attempt to undo the pig
-            P_UndoPlayerMorph(player);
-        }
-    }
-    // Cycle psprites
-    P_MovePsprites(player);
-    // Other Counters
-    if (player->powers[pw_invulnerability])
-    {
-        if (player->class == PCLASS_CLERIC)
-        {
-            if (!(leveltime & 7) && player->mo->flags & MF_SHADOW
-                && !(player->mo->flags2 & MF2_DONTDRAW))
-            {
-                player->mo->flags &= ~MF_SHADOW;
-                if (!(player->mo->flags & MF_ALTSHADOW))
-                {
-                    player->mo->flags2 |= MF2_DONTDRAW | MF2_NONSHOOTABLE;
-                }
-            }
-            if (!(leveltime & 31))
-            {
-                if (player->mo->flags2 & MF2_DONTDRAW)
-                {
-                    if (!(player->mo->flags & MF_SHADOW))
-                    {
-                        player->mo->flags |= MF_SHADOW | MF_ALTSHADOW;
-                    }
-                    else
-                    {
-                        player->mo->flags2 &=
-                            ~(MF2_DONTDRAW | MF2_NONSHOOTABLE);
-                    }
-                }
-                else
-                {
-                    player->mo->flags |= MF_SHADOW;
-                    player->mo->flags &= ~MF_ALTSHADOW;
-                }
-            }
-        }
-        if (!(--player->powers[pw_invulnerability]))
-        {
-            player->mo->flags2 &= ~(MF2_INVULNERABLE | MF2_REFLECTIVE);
-            if (player->class == PCLASS_CLERIC)
-            {
-                player->mo->flags2 &= ~(MF2_DONTDRAW | MF2_NONSHOOTABLE);
-                player->mo->flags &= ~(MF_SHADOW | MF_ALTSHADOW);
-            }
-        }
-    }
-    if (player->powers[pw_minotaur])
-    {
-        player->powers[pw_minotaur]--;
-    }
-    if (player->powers[pw_infrared])
-    {
-        player->powers[pw_infrared]--;
-    }
-    if (player->powers[pw_flight] && netgame)
-    {
-        if (!--player->powers[pw_flight])
-        {
-            if (player->mo->z != player->mo->floorz)
-            {
-                // haleyjd: removed externdriver crap
-                player->centering = true;
-            }
-            player->mo->flags2 &= ~MF2_FLY;
-            player->mo->flags &= ~MF_NOGRAVITY;
-            BorderTopRefresh = true;    //make sure the sprite's cleared out
-        }
-    }
-    if (player->powers[pw_speed])
-    {
-        player->powers[pw_speed]--;
-    }
-    if (player->damagecount)
-    {
-        player->damagecount--;
-    }
-    if (player->bonuscount)
-    {
-        player->bonuscount--;
-    }
-    if (player->poisoncount && !(leveltime & 15))
-    {
-        player->poisoncount -= 5;
-        if (player->poisoncount < 0)
-        {
-            player->poisoncount = 0;
-        }
-        P_PoisonDamage(player, player->poisoner, 1, true);
-    }
-    // Colormaps
-//      if(player->powers[pw_invulnerability])
-//      {
-//              if(player->powers[pw_invulnerability] > BLINKTHRESHOLD
-//                      || (player->powers[pw_invulnerability]&8))
-//              {
-//                      player->fixedcolormap = INVERSECOLORMAP;
-//              }
-//              else
-//              {
-//                      player->fixedcolormap = 0;
-//              }
-//      }
-//      else 
-    if (player->powers[pw_infrared])
-    {
-        if (player->powers[pw_infrared] <= BLINKTHRESHOLD)
-        {
-            if (player->powers[pw_infrared] & 8)
-            {
-                player->fixedcolormap = 0;
-            }
-            else
-            {
-                player->fixedcolormap = 1;
-            }
-        }
-        else if (!(leveltime & 16) && player == &players[consoleplayer])
-        {
-            if (newtorch)
-            {
-                if (player->fixedcolormap + newtorchdelta > 7
-                    || player->fixedcolormap + newtorchdelta < 1
-                    || newtorch == player->fixedcolormap)
-                {
-                    newtorch = 0;
-                }
-                else
-                {
-                    player->fixedcolormap += newtorchdelta;
-                }
-            }
-            else
-            {
-                newtorch = (M_Random() & 7) + 1;
-                newtorchdelta = (newtorch == player->fixedcolormap) ?
-                    0 : ((newtorch > player->fixedcolormap) ? 1 : -1);
-            }
-        }
-    }
-    else
-    {
-        player->fixedcolormap = 0;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ArtiTele
-//
-//----------------------------------------------------------------------------
-
-void P_ArtiTele(player_t * player)
-{
-    int i;
-    int selections;
-    fixed_t destX;
-    fixed_t destY;
-    angle_t destAngle;
-
-    if (deathmatch)
-    {
-        selections = deathmatch_p - deathmatchstarts;
-        i = P_Random() % selections;
-        destX = deathmatchstarts[i].x << FRACBITS;
-        destY = deathmatchstarts[i].y << FRACBITS;
-        destAngle = ANG45 * (deathmatchstarts[i].angle / 45);
-    }
-    else
-    {
-        destX = playerstarts[0][0].x << FRACBITS;
-        destY = playerstarts[0][0].y << FRACBITS;
-        destAngle = ANG45 * (playerstarts[0][0].angle / 45);
-    }
-    P_Teleport(player->mo, destX, destY, destAngle, true);
-    if (player->morphTics)
-    {                           // Teleporting away will undo any morph effects (pig)
-        P_UndoPlayerMorph(player);
-    }
-    //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
-}
-
-
-//----------------------------------------------------------------------------
-//
-// PROC P_ArtiTeleportOther
-//
-//----------------------------------------------------------------------------
-
-void P_ArtiTeleportOther(player_t * player)
-{
-    mobj_t *mo;
-
-    mo = P_SpawnPlayerMissile(player->mo, MT_TELOTHER_FX1);
-    if (mo)
-    {
-        mo->target = player->mo;
-    }
-}
-
-
-void P_TeleportToPlayerStarts(mobj_t * victim)
-{
-    int i, selections = 0;
-    fixed_t destX, destY;
-    angle_t destAngle;
-
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[i])
-            continue;
-        selections++;
-    }
-    i = P_Random() % selections;
-    destX = playerstarts[0][i].x << FRACBITS;
-    destY = playerstarts[0][i].y << FRACBITS;
-    destAngle = ANG45 * (playerstarts[0][i].angle / 45);
-    P_Teleport(victim, destX, destY, destAngle, true);
-    //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
-}
-
-void P_TeleportToDeathmatchStarts(mobj_t * victim)
-{
-    int i, selections;
-    fixed_t destX, destY;
-    angle_t destAngle;
-
-    selections = deathmatch_p - deathmatchstarts;
-    if (selections)
-    {
-        i = P_Random() % selections;
-        destX = deathmatchstarts[i].x << FRACBITS;
-        destY = deathmatchstarts[i].y << FRACBITS;
-        destAngle = ANG45 * (deathmatchstarts[i].angle / 45);
-        P_Teleport(victim, destX, destY, destAngle, true);
-        //S_StartSound(NULL, sfx_wpnup); // Full volume laugh
-    }
-    else
-    {
-        P_TeleportToPlayerStarts(victim);
-    }
-}
-
-
-
-//----------------------------------------------------------------------------
-//
-// PROC P_TeleportOther
-//
-//----------------------------------------------------------------------------
-void P_TeleportOther(mobj_t * victim)
-{
-    if (victim->player)
-    {
-        if (deathmatch)
-            P_TeleportToDeathmatchStarts(victim);
-        else
-            P_TeleportToPlayerStarts(victim);
-    }
-    else
-    {
-        // If death action, run it upon teleport
-        if (victim->flags & MF_COUNTKILL && victim->special)
-        {
-            P_RemoveMobjFromTIDList(victim);
-            P_ExecuteLineSpecial(victim->special, victim->args,
-                                 NULL, 0, victim);
-            victim->special = 0;
-        }
-
-        // Send all monsters to deathmatch spots
-        P_TeleportToDeathmatchStarts(victim);
-    }
-}
-
-
-
-#define BLAST_RADIUS_DIST	255*FRACUNIT
-#define BLAST_SPEED			20*FRACUNIT
-#define BLAST_FULLSTRENGTH	255
-
-void ResetBlasted(mobj_t * mo)
-{
-    mo->flags2 &= ~MF2_BLASTED;
-    if (!(mo->flags & MF_ICECORPSE))
-    {
-        mo->flags2 &= ~MF2_SLIDE;
-    }
-}
-
-void P_BlastMobj(mobj_t * source, mobj_t * victim, fixed_t strength)
-{
-    angle_t angle, ang;
-    mobj_t *mo;
-    fixed_t x, y, z;
-
-    angle = R_PointToAngle2(source->x, source->y, victim->x, victim->y);
-    angle >>= ANGLETOFINESHIFT;
-    if (strength < BLAST_FULLSTRENGTH)
-    {
-        victim->momx = FixedMul(strength, finecosine[angle]);
-        victim->momy = FixedMul(strength, finesine[angle]);
-        if (victim->player)
-        {
-            // Players handled automatically
-        }
-        else
-        {
-            victim->flags2 |= MF2_SLIDE;
-            victim->flags2 |= MF2_BLASTED;
-        }
-    }
-    else                        // full strength blast from artifact
-    {
-        if (victim->flags & MF_MISSILE)
-        {
-            switch (victim->type)
-            {
-                case MT_SORCBALL1:     // don't blast sorcerer balls
-                case MT_SORCBALL2:
-                case MT_SORCBALL3:
-                    return;
-                    break;
-                case MT_MSTAFF_FX2:    // Reflect to originator
-                    victim->special1.m = victim->target;
-                    victim->target = source;
-                    break;
-                default:
-                    break;
-            }
-        }
-        if (victim->type == MT_HOLY_FX)
-        {
-            if (victim->special1.m == source)
-            {
-                victim->special1.m = victim->target;
-                victim->target = source;
-            }
-        }
-        victim->momx = FixedMul(BLAST_SPEED, finecosine[angle]);
-        victim->momy = FixedMul(BLAST_SPEED, finesine[angle]);
-
-        // Spawn blast puff
-        ang = R_PointToAngle2(victim->x, victim->y, source->x, source->y);
-        ang >>= ANGLETOFINESHIFT;
-        x = victim->x + FixedMul(victim->radius + FRACUNIT, finecosine[ang]);
-        y = victim->y + FixedMul(victim->radius + FRACUNIT, finesine[ang]);
-        z = victim->z - victim->floorclip + (victim->height >> 1);
-        mo = P_SpawnMobj(x, y, z, MT_BLASTEFFECT);
-        if (mo)
-        {
-            mo->momx = victim->momx;
-            mo->momy = victim->momy;
-        }
-
-        if (victim->flags & MF_MISSILE)
-        {
-            victim->momz = 8 * FRACUNIT;
-            mo->momz = victim->momz;
-        }
-        else
-        {
-            victim->momz = (1000 / victim->info->mass) << FRACBITS;
-        }
-        if (victim->player)
-        {
-            // Players handled automatically
-        }
-        else
-        {
-            victim->flags2 |= MF2_SLIDE;
-            victim->flags2 |= MF2_BLASTED;
-        }
-    }
-}
-
-
-// Blast all mobj things away
-void P_BlastRadius(player_t * player)
-{
-    mobj_t *mo;
-    mobj_t *pmo = player->mo;
-    thinker_t *think;
-    fixed_t dist;
-
-    S_StartSound(pmo, SFX_ARTIFACT_BLAST);
-    P_NoiseAlert(player->mo, player->mo);
-
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-        if ((mo == pmo) || (mo->flags2 & MF2_BOSS))
-        {                       // Not a valid monster
-            continue;
-        }
-        if ((mo->type == MT_POISONCLOUD) ||     // poison cloud
-            (mo->type == MT_HOLY_FX) || // holy fx
-            (mo->flags & MF_ICECORPSE)) // frozen corpse
-        {
-            // Let these special cases go
-        }
-        else if ((mo->flags & MF_COUNTKILL) && (mo->health <= 0))
-        {
-            continue;
-        }
-        else if (!(mo->flags & MF_COUNTKILL) &&
-                 !(mo->player) && !(mo->flags & MF_MISSILE))
-        {                       // Must be monster, player, or missile
-            continue;
-        }
-        if (mo->flags2 & MF2_DORMANT)
-        {
-            continue;           // no dormant creatures
-        }
-        if ((mo->type == MT_WRAITHB) && (mo->flags2 & MF2_DONTDRAW))
-        {
-            continue;           // no underground wraiths
-        }
-        if ((mo->type == MT_SPLASHBASE) || (mo->type == MT_SPLASH))
-        {
-            continue;
-        }
-        if (mo->type == MT_SERPENT || mo->type == MT_SERPENTLEADER)
-        {
-            continue;
-        }
-        dist = P_AproxDistance(pmo->x - mo->x, pmo->y - mo->y);
-        if (dist > BLAST_RADIUS_DIST)
-        {                       // Out of range
-            continue;
-        }
-        P_BlastMobj(pmo, mo, BLAST_FULLSTRENGTH);
-    }
-}
-
-
-#define HEAL_RADIUS_DIST	255*FRACUNIT
-
-// Do class specific effect for everyone in radius
-boolean P_HealRadius(player_t * player)
-{
-    mobj_t *mo;
-    mobj_t *pmo = player->mo;
-    thinker_t *think;
-    fixed_t dist;
-    int effective = false;
-    int amount;
-
-    for (think = thinkercap.next; think != &thinkercap; think = think->next)
-    {
-        if (think->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        mo = (mobj_t *) think;
-
-        if (!mo->player)
-            continue;
-        if (mo->health <= 0)
-            continue;
-        dist = P_AproxDistance(pmo->x - mo->x, pmo->y - mo->y);
-        if (dist > HEAL_RADIUS_DIST)
-        {                       // Out of range
-            continue;
-        }
-
-        switch (player->class)
-        {
-            case PCLASS_FIGHTER:       // Radius armor boost
-                if ((P_GiveArmor(mo->player, ARMOR_ARMOR, 1)) ||
-                    (P_GiveArmor(mo->player, ARMOR_SHIELD, 1)) ||
-                    (P_GiveArmor(mo->player, ARMOR_HELMET, 1)) ||
-                    (P_GiveArmor(mo->player, ARMOR_AMULET, 1)))
-                {
-                    effective = true;
-                    S_StartSound(mo, SFX_MYSTICINCANT);
-                }
-                break;
-            case PCLASS_CLERIC:        // Radius heal
-                amount = 50 + (P_Random() % 50);
-                if (P_GiveBody(mo->player, amount))
-                {
-                    effective = true;
-                    S_StartSound(mo, SFX_MYSTICINCANT);
-                }
-                break;
-            case PCLASS_MAGE:  // Radius mana boost
-                amount = 50 + (P_Random() % 50);
-                if ((P_GiveMana(mo->player, MANA_1, amount)) ||
-                    (P_GiveMana(mo->player, MANA_2, amount)))
-                {
-                    effective = true;
-                    S_StartSound(mo, SFX_MYSTICINCANT);
-                }
-                break;
-            case PCLASS_PIG:
-            default:
-                break;
-        }
-    }
-    return (effective);
-}
-
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerNextArtifact
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerNextArtifact(player_t * player)
-{
-    if (player == &players[consoleplayer])
-    {
-        inv_ptr--;
-        if (inv_ptr < 6)
-        {
-            curpos--;
-            if (curpos < 0)
-            {
-                curpos = 0;
-            }
-        }
-        if (inv_ptr < 0)
-        {
-            inv_ptr = player->inventorySlotNum - 1;
-            if (inv_ptr < 6)
-            {
-                curpos = inv_ptr;
-            }
-            else
-            {
-                curpos = 6;
-            }
-        }
-        player->readyArtifact = player->inventory[inv_ptr].type;
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerRemoveArtifact
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerRemoveArtifact(player_t * player, int slot)
-{
-    int i;
-
-    player->artifactCount--;
-    if (!(--player->inventory[slot].count))
-    {                           // Used last of a type - compact the artifact list
-        player->readyArtifact = arti_none;
-        player->inventory[slot].type = arti_none;
-        for (i = slot + 1; i < player->inventorySlotNum; i++)
-        {
-            player->inventory[i - 1] = player->inventory[i];
-        }
-        player->inventorySlotNum--;
-        if (player == &players[consoleplayer])
-        {                       // Set position markers and get next readyArtifact
-            inv_ptr--;
-            if (inv_ptr < 6)
-            {
-                curpos--;
-                if (curpos < 0)
-                {
-                    curpos = 0;
-                }
-            }
-            if (inv_ptr >= player->inventorySlotNum)
-            {
-                inv_ptr = player->inventorySlotNum - 1;
-            }
-            if (inv_ptr < 0)
-            {
-                inv_ptr = 0;
-            }
-            player->readyArtifact = player->inventory[inv_ptr].type;
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC P_PlayerUseArtifact
-//
-//----------------------------------------------------------------------------
-
-void P_PlayerUseArtifact(player_t * player, artitype_t arti)
-{
-    int i;
-
-    for (i = 0; i < player->inventorySlotNum; i++)
-    {
-        if (player->inventory[i].type == arti)
-        {                       // Found match - try to use
-            if (P_UseArtifact(player, arti))
-            {                   // Artifact was used - remove it from inventory
-                P_PlayerRemoveArtifact(player, i);
-                if (player == &players[consoleplayer])
-                {
-                    if (arti < arti_firstpuzzitem)
-                    {
-                        S_StartSound(NULL, SFX_ARTIFACT_USE);
-                    }
-                    else
-                    {
-                        S_StartSound(NULL, SFX_PUZZLE_SUCCESS);
-                    }
-                    ArtifactFlash = 4;
-                }
-            }
-            else if (arti < arti_firstpuzzitem)
-            {                   // Unable to use artifact, advance pointer
-                P_PlayerNextArtifact(player);
-            }
-            break;
-        }
-    }
-}
-
-//==========================================================================
-//
-// P_UseArtifact
-//
-// Returns true if the artifact was used.
-//
-//==========================================================================
-
-boolean P_UseArtifact(player_t * player, artitype_t arti)
-{
-    mobj_t *mo;
-    angle_t angle;
-    int i;
-    int count;
-
-    switch (arti)
-    {
-        case arti_invulnerability:
-            if (!P_GivePower(player, pw_invulnerability))
-            {
-                return (false);
-            }
-            break;
-        case arti_health:
-            if (!P_GiveBody(player, 25))
-            {
-                return (false);
-            }
-            break;
-        case arti_superhealth:
-            if (!P_GiveBody(player, 100))
-            {
-                return (false);
-            }
-            break;
-        case arti_healingradius:
-            if (!P_HealRadius(player))
-            {
-                return (false);
-            }
-            break;
-        case arti_torch:
-            if (!P_GivePower(player, pw_infrared))
-            {
-                return (false);
-            }
-            break;
-        case arti_egg:
-            mo = player->mo;
-            P_SpawnPlayerMissile(mo, MT_EGGFX);
-            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 6));
-            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 6));
-            P_SPMAngle(mo, MT_EGGFX, mo->angle - (ANG45 / 3));
-            P_SPMAngle(mo, MT_EGGFX, mo->angle + (ANG45 / 3));
-            break;
-        case arti_fly:
-            if (!P_GivePower(player, pw_flight))
-            {
-                return (false);
-            }
-            if (player->mo->momz <= -35 * FRACUNIT)
-            {                   // stop falling scream
-                S_StopSound(player->mo);
-            }
-            break;
-        case arti_summon:
-            mo = P_SpawnPlayerMissile(player->mo, MT_SUMMON_FX);
-            if (mo)
-            {
-                mo->target = player->mo;
-                mo->special1.m = (player->mo);
-                mo->momz = 5 * FRACUNIT;
-            }
-            break;
-        case arti_teleport:
-            P_ArtiTele(player);
-            break;
-        case arti_teleportother:
-            P_ArtiTeleportOther(player);
-            break;
-        case arti_poisonbag:
-            angle = player->mo->angle >> ANGLETOFINESHIFT;
-            if (player->class == PCLASS_CLERIC)
-            {
-                mo = P_SpawnMobj(player->mo->x + 16 * finecosine[angle],
-                                 player->mo->y + 24 * finesine[angle],
-                                 player->mo->z - player->mo->floorclip +
-                                 8 * FRACUNIT, MT_POISONBAG);
-                if (mo)
-                {
-                    mo->target = player->mo;
-                }
-            }
-            else if (player->class == PCLASS_MAGE)
-            {
-                mo = P_SpawnMobj(player->mo->x + 16 * finecosine[angle],
-                                 player->mo->y + 24 * finesine[angle],
-                                 player->mo->z - player->mo->floorclip +
-                                 8 * FRACUNIT, MT_FIREBOMB);
-                if (mo)
-                {
-                    mo->target = player->mo;
-                }
-            }
-            else                // PCLASS_FIGHTER, obviously (also pig, not so obviously)
-            {
-                mo = P_SpawnMobj(player->mo->x, player->mo->y,
-                                 player->mo->z - player->mo->floorclip +
-                                 35 * FRACUNIT, MT_THROWINGBOMB);
-                if (mo)
-                {
-                    mo->angle =
-                        player->mo->angle + (((P_Random() & 7) - 4) << 24);
-                    mo->momz =
-                        4 * FRACUNIT + ((player->lookdir) << (FRACBITS - 4));
-                    mo->z += player->lookdir << (FRACBITS - 4);
-                    P_ThrustMobj(mo, mo->angle, mo->info->speed);
-                    mo->momx += player->mo->momx >> 1;
-                    mo->momy += player->mo->momy >> 1;
-                    mo->target = player->mo;
-                    mo->tics -= P_Random() & 3;
-                    P_CheckMissileSpawn(mo);
-                }
-            }
-            break;
-        case arti_speed:
-            if (!P_GivePower(player, pw_speed))
-            {
-                return (false);
-            }
-            break;
-        case arti_boostmana:
-            if (!P_GiveMana(player, MANA_1, MAX_MANA))
-            {
-                if (!P_GiveMana(player, MANA_2, MAX_MANA))
-                {
-                    return false;
-                }
-
-            }
-            else
-            {
-                P_GiveMana(player, MANA_2, MAX_MANA);
-            }
-            break;
-        case arti_boostarmor:
-            count = 0;
-
-            for (i = 0; i < NUMARMOR; i++)
-            {
-                count += P_GiveArmor(player, i, 1);     // 1 point per armor type
-            }
-            if (!count)
-            {
-                return false;
-            }
-            break;
-        case arti_blastradius:
-            P_BlastRadius(player);
-            break;
-
-        case arti_puzzskull:
-        case arti_puzzgembig:
-        case arti_puzzgemred:
-        case arti_puzzgemgreen1:
-        case arti_puzzgemgreen2:
-        case arti_puzzgemblue1:
-        case arti_puzzgemblue2:
-        case arti_puzzbook1:
-        case arti_puzzbook2:
-        case arti_puzzskull2:
-        case arti_puzzfweapon:
-        case arti_puzzcweapon:
-        case arti_puzzmweapon:
-        case arti_puzzgear1:
-        case arti_puzzgear2:
-        case arti_puzzgear3:
-        case arti_puzzgear4:
-            if (P_UsePuzzleItem(player, arti - arti_firstpuzzitem))
-            {
-                return true;
-            }
-            else
-            {
-                P_SetYellowMessage(player, TXT_USEPUZZLEFAILED, false);
-                return false;
-            }
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
-//============================================================================
-//
-// A_SpeedFade
-//
-//============================================================================
-
-void A_SpeedFade(mobj_t *actor, player_t *player, pspdef_t *psp)
-{
-    actor->flags |= MF_SHADOW;
-    actor->flags &= ~MF_ALTSHADOW;
-    actor->sprite = actor->target->sprite;
-}
diff --git a/games/NXDoom/src/hexen/po_man.c b/games/NXDoom/src/hexen/po_man.c
deleted file mode 100644
index 89364ad53..000000000
--- a/games/NXDoom/src/hexen/po_man.c
+++ /dev/null
@@ -1,1505 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "i_system.h"
-#include "m_bbox.h"
-#include "i_swap.h"
-#include "p_local.h"
-#include "r_local.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define PO_MAXPOLYSEGS 64
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static polyobj_t *GetPolyobj(int polyNum);
-static int GetPolyobjMirror(int poly);
-static void ThrustMobj(mobj_t * mobj, seg_t * seg, polyobj_t * po);
-static void UpdateSegBBox(seg_t * seg);
-static void RotatePt(int an, fixed_t * x, fixed_t * y, fixed_t startSpotX,
-                     fixed_t startSpotY);
-static void UnLinkPolyobj(polyobj_t * po);
-static void LinkPolyobj(polyobj_t * po);
-static boolean CheckMobjBlocking(seg_t * seg, polyobj_t * po);
-static void InitBlockMap(void);
-static void IterFindPolySegs(int x, int y, seg_t ** segList);
-static void SpawnPolyobj(int index, int tag, boolean crush);
-static void TranslateToStartSpot(int tag, int originX, int originY);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-polyblock_t **PolyBlockMap;
-polyobj_t *polyobjs;            // list of all poly-objects on the level
-int po_NumPolyobjs;
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int PolySegCount;
-static fixed_t PolyStartX;
-static fixed_t PolyStartY;
-
-// CODE --------------------------------------------------------------------
-
-// ===== Polyobj Event Code =====
-
-//==========================================================================
-//
-// T_RotatePoly
-//
-//==========================================================================
-
-void T_RotatePoly(thinker_t *thinker)
-{
-    polyevent_t *pe = (polyevent_t *) thinker;
-    int absSpeed;
-    polyobj_t *poly;
-
-    if (PO_RotatePolyobj(pe->polyobj, pe->speed))
-    {
-        absSpeed = abs(pe->speed);
-
-        if (pe->dist == -1)
-        {                       // perpetual polyobj
-            return;
-        }
-        pe->dist -= absSpeed;
-        if (pe->dist <= 0)
-        {
-            poly = GetPolyobj(pe->polyobj);
-            if (poly->specialdata == pe)
-            {
-                poly->specialdata = NULL;
-            }
-            SN_StopSequence((mobj_t *) & poly->startSpot);
-            P_PolyobjFinished(poly->tag);
-            P_RemoveThinker(&pe->thinker);
-        }
-        if (pe->dist < absSpeed)
-        {
-            pe->speed = pe->dist * (pe->speed < 0 ? -1 : 1);
-        }
-    }
-}
-
-//==========================================================================
-//
-// EV_RotatePoly
-//
-//==========================================================================
-
-boolean EV_RotatePoly(line_t * line, byte * args, int direction, boolean
-                      overRide)
-{
-    int mirror;
-    int polyNum;
-    polyevent_t *pe;
-    polyobj_t *poly;
-
-    polyNum = args[0];
-    poly = GetPolyobj(polyNum);
-    if (poly != NULL)
-    {
-        if (poly->specialdata && !overRide)
-        {                       // poly is already moving
-            return false;
-        }
-    }
-    else
-    {
-        I_Error("EV_RotatePoly:  Invalid polyobj num: %d\n", polyNum);
-    }
-    pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
-    P_AddThinker(&pe->thinker);
-    pe->thinker.function = T_RotatePoly;
-    pe->polyobj = polyNum;
-    if (args[2])
-    {
-        if (args[2] == 255)
-        {
-            pe->dist = -1;
-        }
-        else
-        {
-            pe->dist = args[2] * (ANG90 / 64);       // Angle
-        }
-    }
-    else
-    {
-        pe->dist = ANG_MAX - 1;
-    }
-    pe->speed = (args[1] * direction * (ANG90 / 64)) >> 3;
-    poly->specialdata = pe;
-    SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                     poly->seqType);
-
-    while ((mirror = GetPolyobjMirror(polyNum)) != 0)
-    {
-        poly = GetPolyobj(mirror);
-        if (poly && poly->specialdata && !overRide)
-        {                       // mirroring poly is already in motion
-            break;
-        }
-        pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
-        P_AddThinker(&pe->thinker);
-        pe->thinker.function = T_RotatePoly;
-        poly->specialdata = pe;
-        pe->polyobj = mirror;
-        if (args[2])
-        {
-            if (args[2] == 255)
-            {
-                pe->dist = -1;
-            }
-            else
-            {
-                pe->dist = args[2] * (ANG90 / 64);   // Angle
-            }
-        }
-        else
-        {
-            pe->dist = ANG_MAX - 1;
-        }
-        poly = GetPolyobj(polyNum);
-        if (poly != NULL)
-        {
-            poly->specialdata = pe;
-        }
-        else
-        {
-            I_Error("EV_RotatePoly:  Invalid polyobj num: %d\n", polyNum);
-        }
-        direction = -direction;
-        pe->speed = (args[1] * direction * (ANG90 / 64)) >> 3;
-        polyNum = mirror;
-        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                         poly->seqType);
-    }
-    return true;
-}
-
-//==========================================================================
-//
-// T_MovePoly
-//
-//==========================================================================
-
-void T_MovePoly(thinker_t *thinker)
-{
-    polyevent_t *pe = (polyevent_t *) thinker;
-    int absSpeed;
-    polyobj_t *poly;
-
-    if (PO_MovePolyobj(pe->polyobj, pe->xSpeed, pe->ySpeed))
-    {
-        absSpeed = abs(pe->speed);
-        pe->dist -= absSpeed;
-        if (pe->dist <= 0)
-        {
-            poly = GetPolyobj(pe->polyobj);
-            if (poly->specialdata == pe)
-            {
-                poly->specialdata = NULL;
-            }
-            SN_StopSequence((mobj_t *) & poly->startSpot);
-            P_PolyobjFinished(poly->tag);
-            P_RemoveThinker(&pe->thinker);
-        }
-        if (pe->dist < absSpeed)
-        {
-            pe->speed = pe->dist * (pe->speed < 0 ? -1 : 1);
-            pe->xSpeed = FixedMul(pe->speed, finecosine[pe->angle]);
-            pe->ySpeed = FixedMul(pe->speed, finesine[pe->angle]);
-        }
-    }
-}
-
-//==========================================================================
-//
-// EV_MovePoly
-//
-//==========================================================================
-
-boolean EV_MovePoly(line_t * line, byte * args, boolean timesEight, boolean
-                    overRide)
-{
-    int mirror;
-    int polyNum;
-    polyevent_t *pe;
-    polyobj_t *poly;
-    angle_t an;
-
-    polyNum = args[0];
-    poly = GetPolyobj(polyNum);
-    if (poly != NULL)
-    {
-        if (poly->specialdata && !overRide)
-        {                       // poly is already moving
-            return false;
-        }
-    }
-    else
-    {
-        I_Error("EV_MovePoly:  Invalid polyobj num: %d\n", polyNum);
-    }
-    pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
-    P_AddThinker(&pe->thinker);
-    pe->thinker.function = T_MovePoly;
-    pe->polyobj = polyNum;
-    if (timesEight)
-    {
-        pe->dist = args[3] * 8 * FRACUNIT;
-    }
-    else
-    {
-        pe->dist = args[3] * FRACUNIT;  // Distance
-    }
-    pe->speed = args[1] * (FRACUNIT / 8);
-    poly->specialdata = pe;
-
-    an = args[2] * (ANG90 / 64);
-
-    pe->angle = an >> ANGLETOFINESHIFT;
-    pe->xSpeed = FixedMul(pe->speed, finecosine[pe->angle]);
-    pe->ySpeed = FixedMul(pe->speed, finesine[pe->angle]);
-    SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                     poly->seqType);
-
-    while ((mirror = GetPolyobjMirror(polyNum)) != 0)
-    {
-        poly = GetPolyobj(mirror);
-        if (poly && poly->specialdata && !overRide)
-        {                       // mirroring poly is already in motion
-            break;
-        }
-        pe = Z_Malloc(sizeof(polyevent_t), PU_LEVSPEC, 0);
-        P_AddThinker(&pe->thinker);
-        pe->thinker.function = T_MovePoly;
-        pe->polyobj = mirror;
-        poly->specialdata = pe;
-        if (timesEight)
-        {
-            pe->dist = args[3] * 8 * FRACUNIT;
-        }
-        else
-        {
-            pe->dist = args[3] * FRACUNIT;      // Distance
-        }
-        pe->speed = args[1] * (FRACUNIT / 8);
-        an = an + ANG180;    // reverse the angle
-        pe->angle = an >> ANGLETOFINESHIFT;
-        pe->xSpeed = FixedMul(pe->speed, finecosine[pe->angle]);
-        pe->ySpeed = FixedMul(pe->speed, finesine[pe->angle]);
-        polyNum = mirror;
-        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                         poly->seqType);
-    }
-    return true;
-}
-
-//==========================================================================
-//
-// T_PolyDoor
-//
-//==========================================================================
-
-void T_PolyDoor(thinker_t *thinker)
-{
-    polydoor_t *pd = (polydoor_t *) thinker;
-    int absSpeed;
-    polyobj_t *poly;
-
-    if (pd->tics)
-    {
-        if (!--pd->tics)
-        {
-            poly = GetPolyobj(pd->polyobj);
-            SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                             poly->seqType);
-        }
-        return;
-    }
-    switch (pd->type)
-    {
-        case PODOOR_SLIDE:
-            if (PO_MovePolyobj(pd->polyobj, pd->xSpeed, pd->ySpeed))
-            {
-                absSpeed = abs(pd->speed);
-                pd->dist -= absSpeed;
-                if (pd->dist <= 0)
-                {
-                    poly = GetPolyobj(pd->polyobj);
-                    SN_StopSequence((mobj_t *) & poly->startSpot);
-                    if (!pd->close)
-                    {
-                        pd->dist = pd->totalDist;
-                        pd->close = true;
-                        pd->tics = pd->waitTics;
-                        pd->direction = (ANG_MAX >> ANGLETOFINESHIFT) -
-                            pd->direction;
-                        pd->xSpeed = -pd->xSpeed;
-                        pd->ySpeed = -pd->ySpeed;
-                    }
-                    else
-                    {
-                        if (poly->specialdata == pd)
-                        {
-                            poly->specialdata = NULL;
-                        }
-                        P_PolyobjFinished(poly->tag);
-                        P_RemoveThinker(&pd->thinker);
-                    }
-                }
-            }
-            else
-            {
-                poly = GetPolyobj(pd->polyobj);
-                if (poly->crush || !pd->close)
-                {               // continue moving if the poly is a crusher, or is opening
-                    return;
-                }
-                else
-                {               // open back up
-                    pd->dist = pd->totalDist - pd->dist;
-                    pd->direction = (ANG_MAX >> ANGLETOFINESHIFT) -
-                        pd->direction;
-                    pd->xSpeed = -pd->xSpeed;
-                    pd->ySpeed = -pd->ySpeed;
-                    pd->close = false;
-                    SN_StartSequence((mobj_t *) & poly->startSpot,
-                                     SEQ_DOOR_STONE + poly->seqType);
-                }
-            }
-            break;
-        case PODOOR_SWING:
-            if (PO_RotatePolyobj(pd->polyobj, pd->speed))
-            {
-                absSpeed = abs(pd->speed);
-                if (pd->dist == -1)
-                {               // perpetual polyobj
-                    return;
-                }
-                pd->dist -= absSpeed;
-                if (pd->dist <= 0)
-                {
-                    poly = GetPolyobj(pd->polyobj);
-                    SN_StopSequence((mobj_t *) & poly->startSpot);
-                    if (!pd->close)
-                    {
-                        pd->dist = pd->totalDist;
-                        pd->close = true;
-                        pd->tics = pd->waitTics;
-                        pd->speed = -pd->speed;
-                    }
-                    else
-                    {
-                        if (poly->specialdata == pd)
-                        {
-                            poly->specialdata = NULL;
-                        }
-                        P_PolyobjFinished(poly->tag);
-                        P_RemoveThinker(&pd->thinker);
-                    }
-                }
-            }
-            else
-            {
-                poly = GetPolyobj(pd->polyobj);
-                if (poly->crush || !pd->close)
-                {               // continue moving if the poly is a crusher, or is opening
-                    return;
-                }
-                else
-                {               // open back up and rewait
-                    pd->dist = pd->totalDist - pd->dist;
-                    pd->speed = -pd->speed;
-                    pd->close = false;
-                    SN_StartSequence((mobj_t *) & poly->startSpot,
-                                     SEQ_DOOR_STONE + poly->seqType);
-                }
-            }
-            break;
-        default:
-            break;
-    }
-}
-
-//==========================================================================
-//
-// EV_OpenPolyDoor
-//
-//==========================================================================
-
-boolean EV_OpenPolyDoor(line_t * line, byte * args, podoortype_t type)
-{
-    int mirror;
-    int polyNum;
-    polydoor_t *pd;
-    polyobj_t *poly;
-    angle_t an = 0;
-
-    polyNum = args[0];
-    poly = GetPolyobj(polyNum);
-    if (poly != NULL)
-    {
-        if (poly->specialdata)
-        {                       // poly is already moving
-            return false;
-        }
-    }
-    else
-    {
-        I_Error("EV_OpenPolyDoor:  Invalid polyobj num: %d\n", polyNum);
-    }
-    pd = Z_Malloc(sizeof(polydoor_t), PU_LEVSPEC, 0);
-    memset(pd, 0, sizeof(polydoor_t));
-    P_AddThinker(&pd->thinker);
-    pd->thinker.function = T_PolyDoor;
-    pd->type = type;
-    pd->polyobj = polyNum;
-    if (type == PODOOR_SLIDE)
-    {
-        pd->waitTics = args[4];
-        pd->speed = args[1] * (FRACUNIT / 8);
-        pd->totalDist = args[3] * FRACUNIT;     // Distance
-        pd->dist = pd->totalDist;
-        an = args[2] * (ANG90 / 64);
-        pd->direction = an >> ANGLETOFINESHIFT;
-        pd->xSpeed = FixedMul(pd->speed, finecosine[pd->direction]);
-        pd->ySpeed = FixedMul(pd->speed, finesine[pd->direction]);
-        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                         poly->seqType);
-    }
-    else if (type == PODOOR_SWING)
-    {
-        pd->waitTics = args[3];
-        pd->direction = 1;      // ADD:  PODOOR_SWINGL, PODOOR_SWINGR
-        pd->speed = (args[1] * pd->direction * (ANG90 / 64)) >> 3;
-        pd->totalDist = args[2] * (ANG90 / 64);
-        pd->dist = pd->totalDist;
-        SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                         poly->seqType);
-    }
-
-    poly->specialdata = pd;
-
-    while ((mirror = GetPolyobjMirror(polyNum)) != 0)
-    {
-        poly = GetPolyobj(mirror);
-        if (poly && poly->specialdata)
-        {                       // mirroring poly is already in motion
-            break;
-        }
-        pd = Z_Malloc(sizeof(polydoor_t), PU_LEVSPEC, 0);
-        memset(pd, 0, sizeof(polydoor_t));
-        P_AddThinker(&pd->thinker);
-        pd->thinker.function = T_PolyDoor;
-        pd->polyobj = mirror;
-        pd->type = type;
-        poly->specialdata = pd;
-        if (type == PODOOR_SLIDE)
-        {
-            pd->waitTics = args[4];
-            pd->speed = args[1] * (FRACUNIT / 8);
-            pd->totalDist = args[3] * FRACUNIT; // Distance
-            pd->dist = pd->totalDist;
-            an = an + ANG180;        // reverse the angle
-            pd->direction = an >> ANGLETOFINESHIFT;
-            pd->xSpeed = FixedMul(pd->speed, finecosine[pd->direction]);
-            pd->ySpeed = FixedMul(pd->speed, finesine[pd->direction]);
-            SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                             poly->seqType);
-        }
-        else if (type == PODOOR_SWING)
-        {
-            pd->waitTics = args[3];
-            pd->direction = -1; // ADD:  same as above
-            pd->speed = (args[1] * pd->direction * (ANG90 / 64)) >> 3;
-            pd->totalDist = args[2] * (ANG90 / 64);
-            pd->dist = pd->totalDist;
-            SN_StartSequence((mobj_t *) & poly->startSpot, SEQ_DOOR_STONE +
-                             poly->seqType);
-        }
-        polyNum = mirror;
-    }
-    return true;
-}
-
-// ===== Higher Level Poly Interface code =====
-
-//==========================================================================
-//
-// GetPolyobj
-//
-//==========================================================================
-
-static polyobj_t *GetPolyobj(int polyNum)
-{
-    int i;
-
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        if (polyobjs[i].tag == polyNum)
-        {
-            return &polyobjs[i];
-        }
-    }
-    return NULL;
-}
-
-//==========================================================================
-//
-// GetPolyobjMirror
-//
-//==========================================================================
-
-static int GetPolyobjMirror(int poly)
-{
-    int i;
-
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        if (polyobjs[i].tag == poly)
-        {
-            return ((*polyobjs[i].segs)->linedef->arg2);
-        }
-    }
-    return 0;
-}
-
-//==========================================================================
-//
-// ThrustMobj
-//
-//==========================================================================
-
-static void ThrustMobj(mobj_t * mobj, seg_t * seg, polyobj_t * po)
-{
-    int thrustAngle;
-    int thrustX;
-    int thrustY;
-    polyevent_t *pe;
-
-    int force;
-
-    if (!(mobj->flags & MF_SHOOTABLE) && !mobj->player)
-    {
-        return;
-    }
-    thrustAngle = (seg->angle - ANG90) >> ANGLETOFINESHIFT;
-
-    pe = po->specialdata;
-    if (pe)
-    {
-        if (pe->thinker.function == T_RotatePoly)
-        {
-            force = pe->speed >> 8;
-        }
-        else
-        {
-            force = pe->speed >> 3;
-        }
-        if (force < FRACUNIT)
-        {
-            force = FRACUNIT;
-        }
-        else if (force > 4 * FRACUNIT)
-        {
-            force = 4 * FRACUNIT;
-        }
-    }
-    else
-    {
-        force = FRACUNIT;
-    }
-
-    thrustX = FixedMul(force, finecosine[thrustAngle]);
-    thrustY = FixedMul(force, finesine[thrustAngle]);
-    mobj->momx += thrustX;
-    mobj->momy += thrustY;
-    if (po->crush)
-    {
-        if (!P_CheckPosition(mobj, mobj->x + thrustX, mobj->y + thrustY))
-        {
-            P_DamageMobj(mobj, NULL, NULL, 3);
-        }
-    }
-}
-
-//==========================================================================
-//
-// UpdateSegBBox
-//
-//==========================================================================
-
-static void UpdateSegBBox(seg_t * seg)
-{
-    line_t *line;
-
-    line = seg->linedef;
-
-    if (seg->v1->x < seg->v2->x)
-    {
-        line->bbox[BOXLEFT] = seg->v1->x;
-        line->bbox[BOXRIGHT] = seg->v2->x;
-    }
-    else
-    {
-        line->bbox[BOXLEFT] = seg->v2->x;
-        line->bbox[BOXRIGHT] = seg->v1->x;
-    }
-    if (seg->v1->y < seg->v2->y)
-    {
-        line->bbox[BOXBOTTOM] = seg->v1->y;
-        line->bbox[BOXTOP] = seg->v2->y;
-    }
-    else
-    {
-        line->bbox[BOXBOTTOM] = seg->v2->y;
-        line->bbox[BOXTOP] = seg->v1->y;
-    }
-
-    // Update the line's slopetype
-    line->dx = line->v2->x - line->v1->x;
-    line->dy = line->v2->y - line->v1->y;
-    if (!line->dx)
-    {
-        line->slopetype = ST_VERTICAL;
-    }
-    else if (!line->dy)
-    {
-        line->slopetype = ST_HORIZONTAL;
-    }
-    else
-    {
-        if (FixedDiv(line->dy, line->dx) > 0)
-        {
-            line->slopetype = ST_POSITIVE;
-        }
-        else
-        {
-            line->slopetype = ST_NEGATIVE;
-        }
-    }
-}
-
-//==========================================================================
-//
-// PO_MovePolyobj
-//
-//==========================================================================
-
-boolean PO_MovePolyobj(int num, int x, int y)
-{
-    int count;
-    seg_t **segList;
-    seg_t **veryTempSeg;
-    polyobj_t *po;
-    vertex_t *prevPts;
-    boolean blocked;
-
-    if (!(po = GetPolyobj(num)))
-    {
-        I_Error("PO_MovePolyobj:  Invalid polyobj number: %d\n", num);
-    }
-
-    UnLinkPolyobj(po);
-
-    segList = po->segs;
-    prevPts = po->prevPts;
-    blocked = false;
-
-    validcount++;
-    for (count = po->numsegs; count; count--, segList++, prevPts++)
-    {
-        if ((*segList)->linedef->validcount != validcount)
-        {
-            (*segList)->linedef->bbox[BOXTOP] += y;
-            (*segList)->linedef->bbox[BOXBOTTOM] += y;
-            (*segList)->linedef->bbox[BOXLEFT] += x;
-            (*segList)->linedef->bbox[BOXRIGHT] += x;
-            (*segList)->linedef->validcount = validcount;
-        }
-        for (veryTempSeg = po->segs; veryTempSeg != segList; veryTempSeg++)
-        {
-            if ((*veryTempSeg)->v1 == (*segList)->v1)
-            {
-                break;
-            }
-        }
-        if (veryTempSeg == segList)
-        {
-            (*segList)->v1->x += x;
-            (*segList)->v1->y += y;
-        }
-        (*prevPts).x += x;      // previous points are unique for each seg
-        (*prevPts).y += y;
-    }
-    segList = po->segs;
-    for (count = po->numsegs; count; count--, segList++)
-    {
-        if (CheckMobjBlocking(*segList, po))
-        {
-            blocked = true;
-        }
-    }
-    if (blocked)
-    {
-        count = po->numsegs;
-        segList = po->segs;
-        prevPts = po->prevPts;
-        validcount++;
-        while (count--)
-        {
-            if ((*segList)->linedef->validcount != validcount)
-            {
-                (*segList)->linedef->bbox[BOXTOP] -= y;
-                (*segList)->linedef->bbox[BOXBOTTOM] -= y;
-                (*segList)->linedef->bbox[BOXLEFT] -= x;
-                (*segList)->linedef->bbox[BOXRIGHT] -= x;
-                (*segList)->linedef->validcount = validcount;
-            }
-            for (veryTempSeg = po->segs; veryTempSeg != segList;
-                 veryTempSeg++)
-            {
-                if ((*veryTempSeg)->v1 == (*segList)->v1)
-                {
-                    break;
-                }
-            }
-            if (veryTempSeg == segList)
-            {
-                (*segList)->v1->x -= x;
-                (*segList)->v1->y -= y;
-            }
-            (*prevPts).x -= x;
-            (*prevPts).y -= y;
-            segList++;
-            prevPts++;
-        }
-        LinkPolyobj(po);
-        return false;
-    }
-    po->startSpot.x += x;
-    po->startSpot.y += y;
-    LinkPolyobj(po);
-    return true;
-}
-
-//==========================================================================
-//
-// RotatePt
-//
-//==========================================================================
-
-static void RotatePt(int an, fixed_t * x, fixed_t * y, fixed_t startSpotX,
-                     fixed_t startSpotY)
-{
-    fixed_t trx, try;
-    fixed_t gxt, gyt;
-
-    trx = *x;
-    try = *y;
-
-    gxt = FixedMul(trx, finecosine[an]);
-    gyt = FixedMul(try, finesine[an]);
-    *x = (gxt - gyt) + startSpotX;
-
-    gxt = FixedMul(trx, finesine[an]);
-    gyt = FixedMul(try, finecosine[an]);
-    *y = (gyt + gxt) + startSpotY;
-}
-
-//==========================================================================
-//
-// PO_RotatePolyobj
-//
-//==========================================================================
-
-boolean PO_RotatePolyobj(int num, angle_t angle)
-{
-    int count;
-    seg_t **segList;
-    vertex_t *originalPts;
-    vertex_t *prevPts;
-    int an;
-    polyobj_t *po;
-    boolean blocked;
-
-    if (!(po = GetPolyobj(num)))
-    {
-        I_Error("PO_RotatePolyobj:  Invalid polyobj number: %d\n", num);
-    }
-    an = (po->angle + angle) >> ANGLETOFINESHIFT;
-
-    UnLinkPolyobj(po);
-
-    segList = po->segs;
-    originalPts = po->originalPts;
-    prevPts = po->prevPts;
-
-    for (count = po->numsegs; count; count--, segList++, originalPts++,
-         prevPts++)
-    {
-        prevPts->x = (*segList)->v1->x;
-        prevPts->y = (*segList)->v1->y;
-        (*segList)->v1->x = originalPts->x;
-        (*segList)->v1->y = originalPts->y;
-        RotatePt(an, &(*segList)->v1->x, &(*segList)->v1->y, po->startSpot.x,
-                 po->startSpot.y);
-    }
-    segList = po->segs;
-    blocked = false;
-    validcount++;
-    for (count = po->numsegs; count; count--, segList++)
-    {
-        if (CheckMobjBlocking(*segList, po))
-        {
-            blocked = true;
-        }
-        if ((*segList)->linedef->validcount != validcount)
-        {
-            UpdateSegBBox(*segList);
-            (*segList)->linedef->validcount = validcount;
-        }
-        (*segList)->angle += angle;
-    }
-    if (blocked)
-    {
-        segList = po->segs;
-        prevPts = po->prevPts;
-        for (count = po->numsegs; count; count--, segList++, prevPts++)
-        {
-            (*segList)->v1->x = prevPts->x;
-            (*segList)->v1->y = prevPts->y;
-        }
-        segList = po->segs;
-        validcount++;
-        for (count = po->numsegs; count; count--, segList++, prevPts++)
-        {
-            if ((*segList)->linedef->validcount != validcount)
-            {
-                UpdateSegBBox(*segList);
-                (*segList)->linedef->validcount = validcount;
-            }
-            (*segList)->angle -= angle;
-        }
-        LinkPolyobj(po);
-        return false;
-    }
-    po->angle += angle;
-    LinkPolyobj(po);
-    return true;
-}
-
-//==========================================================================
-//
-// UnLinkPolyobj
-//
-//==========================================================================
-
-static void UnLinkPolyobj(polyobj_t * po)
-{
-    polyblock_t *link;
-    int i, j;
-    int index;
-
-    // remove the polyobj from each blockmap section
-    for (j = po->bbox[BOXBOTTOM]; j <= po->bbox[BOXTOP]; j++)
-    {
-        index = j * bmapwidth;
-        for (i = po->bbox[BOXLEFT]; i <= po->bbox[BOXRIGHT]; i++)
-        {
-            if (i >= 0 && i < bmapwidth && j >= 0 && j < bmapheight)
-            {
-                link = PolyBlockMap[index + i];
-                while (link != NULL && link->polyobj != po)
-                {
-                    link = link->next;
-                }
-                if (link == NULL)
-                {               // polyobj not located in the link cell
-                    continue;
-                }
-                link->polyobj = NULL;
-            }
-        }
-    }
-}
-
-//==========================================================================
-//
-// LinkPolyobj
-//
-//==========================================================================
-
-static void LinkPolyobj(polyobj_t * po)
-{
-    int leftX, rightX;
-    int topY, bottomY;
-    seg_t **tempSeg;
-    polyblock_t **link;
-    polyblock_t *tempLink;
-    int i, j;
-
-    // calculate the polyobj bbox
-    tempSeg = po->segs;
-    rightX = leftX = (*tempSeg)->v1->x;
-    topY = bottomY = (*tempSeg)->v1->y;
-
-    for (i = 0; i < po->numsegs; i++, tempSeg++)
-    {
-        if ((*tempSeg)->v1->x > rightX)
-        {
-            rightX = (*tempSeg)->v1->x;
-        }
-        if ((*tempSeg)->v1->x < leftX)
-        {
-            leftX = (*tempSeg)->v1->x;
-        }
-        if ((*tempSeg)->v1->y > topY)
-        {
-            topY = (*tempSeg)->v1->y;
-        }
-        if ((*tempSeg)->v1->y < bottomY)
-        {
-            bottomY = (*tempSeg)->v1->y;
-        }
-    }
-    po->bbox[BOXRIGHT] = (rightX - bmaporgx) >> MAPBLOCKSHIFT;
-    po->bbox[BOXLEFT] = (leftX - bmaporgx) >> MAPBLOCKSHIFT;
-    po->bbox[BOXTOP] = (topY - bmaporgy) >> MAPBLOCKSHIFT;
-    po->bbox[BOXBOTTOM] = (bottomY - bmaporgy) >> MAPBLOCKSHIFT;
-    // add the polyobj to each blockmap section
-    for (j = po->bbox[BOXBOTTOM] * bmapwidth;
-         j <= po->bbox[BOXTOP] * bmapwidth; j += bmapwidth)
-    {
-        for (i = po->bbox[BOXLEFT]; i <= po->bbox[BOXRIGHT]; i++)
-        {
-            if (i >= 0 && i < bmapwidth && j >= 0
-                && j < bmapheight * bmapwidth)
-            {
-                link = &PolyBlockMap[j + i];
-                if (!(*link))
-                {               // Create a new link at the current block cell
-                    *link = Z_Malloc(sizeof(polyblock_t), PU_LEVEL, 0);
-                    (*link)->next = NULL;
-                    (*link)->prev = NULL;
-                    (*link)->polyobj = po;
-                    continue;
-                }
-                else
-                {
-                    tempLink = *link;
-                    while (tempLink->next != NULL
-                           && tempLink->polyobj != NULL)
-                    {
-                        tempLink = tempLink->next;
-                    }
-                }
-                if (tempLink->polyobj == NULL)
-                {
-                    tempLink->polyobj = po;
-                    continue;
-                }
-                else
-                {
-                    tempLink->next = Z_Malloc(sizeof(polyblock_t),
-                                              PU_LEVEL, 0);
-                    tempLink->next->next = NULL;
-                    tempLink->next->prev = tempLink;
-                    tempLink->next->polyobj = po;
-                }
-            }
-            // else, don't link the polyobj, since it's off the map
-        }
-    }
-}
-
-//==========================================================================
-//
-// CheckMobjBlocking
-//
-//==========================================================================
-
-static boolean CheckMobjBlocking(seg_t * seg, polyobj_t * po)
-{
-    mobj_t *mobj;
-    int i, j;
-    int left, right, top, bottom;
-    int tmbbox[4];
-    line_t *ld;
-    boolean blocked;
-
-    ld = seg->linedef;
-
-    top = (ld->bbox[BOXTOP] - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
-    bottom = (ld->bbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
-    left = (ld->bbox[BOXLEFT] - bmaporgx - MAXRADIUS) >> MAPBLOCKSHIFT;
-    right = (ld->bbox[BOXRIGHT] - bmaporgx + MAXRADIUS) >> MAPBLOCKSHIFT;
-
-    blocked = false;
-
-    bottom = bottom < 0 ? 0 : bottom;
-    bottom = bottom >= bmapheight ? bmapheight - 1 : bottom;
-    top = top < 0 ? 0 : top;
-    top = top >= bmapheight ? bmapheight - 1 : top;
-    left = left < 0 ? 0 : left;
-    left = left >= bmapwidth ? bmapwidth - 1 : left;
-    right = right < 0 ? 0 : right;
-    right = right >= bmapwidth ? bmapwidth - 1 : right;
-
-    for (j = bottom * bmapwidth; j <= top * bmapwidth; j += bmapwidth)
-    {
-        for (i = left; i <= right; i++)
-        {
-            for (mobj = blocklinks[j + i]; mobj; mobj = mobj->bnext)
-            {
-                if (mobj->flags & MF_SOLID || mobj->player)
-                {
-                    tmbbox[BOXTOP] = mobj->y + mobj->radius;
-                    tmbbox[BOXBOTTOM] = mobj->y - mobj->radius;
-                    tmbbox[BOXLEFT] = mobj->x - mobj->radius;
-                    tmbbox[BOXRIGHT] = mobj->x + mobj->radius;
-
-                    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
-                        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-                        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
-                        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
-                    {
-                        continue;
-                    }
-                    if (P_BoxOnLineSide(tmbbox, ld) != -1)
-                    {
-                        continue;
-                    }
-                    ThrustMobj(mobj, seg, po);
-                    blocked = true;
-                }
-            }
-        }
-    }
-    return blocked;
-}
-
-//==========================================================================
-//
-// InitBlockMap
-//
-//==========================================================================
-
-static void InitBlockMap(void)
-{
-    int i;
-    int j;
-    seg_t **segList;
-    int leftX, rightX;
-    int topY, bottomY;
-
-    PolyBlockMap = Z_Malloc(bmapwidth * bmapheight * sizeof(polyblock_t *),
-                            PU_LEVEL, 0);
-    memset(PolyBlockMap, 0, bmapwidth * bmapheight * sizeof(polyblock_t *));
-
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        LinkPolyobj(&polyobjs[i]);
-
-        // calculate a rough area
-        // right now, working like shit...gotta fix this...
-        segList = polyobjs[i].segs;
-        leftX = rightX = (*segList)->v1->x;
-        topY = bottomY = (*segList)->v1->y;
-        for (j = 0; j < polyobjs[i].numsegs; j++, segList++)
-        {
-            if ((*segList)->v1->x < leftX)
-            {
-                leftX = (*segList)->v1->x;
-            }
-            if ((*segList)->v1->x > rightX)
-            {
-                rightX = (*segList)->v1->x;
-            }
-            if ((*segList)->v1->y < bottomY)
-            {
-                bottomY = (*segList)->v1->y;
-            }
-            if ((*segList)->v1->y > topY)
-            {
-                topY = (*segList)->v1->y;
-            }
-        }
-//    area = ((rightX >> FRACBITS) - (leftX >> FRACBITS)) *
-//        ((topY >> FRACBITS) - (bottomY >> FRACBITS));
-
-//    fprintf(stdaux, "Area of Polyobj[%d]: %d\n", polyobjs[i].tag, area);
-//    fprintf(stdaux, "\t[%d]\n[%d]\t\t[%d]\n\t[%d]\n", topY>>FRACBITS, 
-//              leftX>>FRACBITS,
-//      rightX>>FRACBITS, bottomY>>FRACBITS);
-    }
-}
-
-//==========================================================================
-//
-// IterFindPolySegs
-//
-//              Passing NULL for segList will cause IterFindPolySegs to
-//      count the number of segs in the polyobj
-//==========================================================================
-
-static void IterFindPolySegs(int x, int y, seg_t ** segList)
-{
-    int i;
-
-    if (x == PolyStartX && y == PolyStartY)
-    {
-        return;
-    }
-    for (i = 0; i < numsegs; i++)
-    {
-        if (segs[i].v1->x == x && segs[i].v1->y == y)
-        {
-            if (!segList)
-            {
-                PolySegCount++;
-            }
-            else
-            {
-                *segList++ = &segs[i];
-            }
-            IterFindPolySegs(segs[i].v2->x, segs[i].v2->y, segList);
-            return;
-        }
-    }
-    I_Error("IterFindPolySegs:  Non-closed Polyobj located.\n");
-}
-
-
-//==========================================================================
-//
-// SpawnPolyobj
-//
-//==========================================================================
-
-static void SpawnPolyobj(int index, int tag, boolean crush)
-{
-    int i;
-    int j;
-    int psIndex;
-    int psIndexOld;
-    seg_t *polySegList[PO_MAXPOLYSEGS];
-
-    for (i = 0; i < numsegs; i++)
-    {
-        if (segs[i].linedef->special == PO_LINE_START &&
-            segs[i].linedef->arg1 == tag)
-        {
-            if (polyobjs[index].segs)
-            {
-                I_Error("SpawnPolyobj:  Polyobj %d already spawned.\n", tag);
-            }
-            segs[i].linedef->special = 0;
-            segs[i].linedef->arg1 = 0;
-            PolySegCount = 1;
-            PolyStartX = segs[i].v1->x;
-            PolyStartY = segs[i].v1->y;
-            IterFindPolySegs(segs[i].v2->x, segs[i].v2->y, NULL);
-
-            polyobjs[index].numsegs = PolySegCount;
-            polyobjs[index].segs = Z_Malloc(PolySegCount * sizeof(seg_t *),
-                                            PU_LEVEL, 0);
-            *(polyobjs[index].segs) = &segs[i]; // insert the first seg
-            IterFindPolySegs(segs[i].v2->x, segs[i].v2->y,
-                             polyobjs[index].segs + 1);
-            polyobjs[index].crush = crush;
-            polyobjs[index].tag = tag;
-            polyobjs[index].seqType = segs[i].linedef->arg3;
-            if (polyobjs[index].seqType < 0
-                || polyobjs[index].seqType >= SEQTYPE_NUMSEQ)
-            {
-                polyobjs[index].seqType = 0;
-            }
-            break;
-        }
-    }
-    if (!polyobjs[index].segs)
-    {                           // didn't find a polyobj through PO_LINE_START
-        psIndex = 0;
-        polyobjs[index].numsegs = 0;
-        for (j = 1; j < PO_MAXPOLYSEGS; j++)
-        {
-            psIndexOld = psIndex;
-            for (i = 0; i < numsegs; i++)
-            {
-                if (segs[i].linedef->special == PO_LINE_EXPLICIT &&
-                    segs[i].linedef->arg1 == tag)
-                {
-                    if (!segs[i].linedef->arg2)
-                    {
-                        I_Error
-                            ("SpawnPolyobj:  Explicit line missing order number (probably %d) in poly %d.\n",
-                             j + 1, tag);
-                    }
-                    if (segs[i].linedef->arg2 == j)
-                    {
-                        polySegList[psIndex] = &segs[i];
-                        polyobjs[index].numsegs++;
-                        psIndex++;
-                        if (psIndex > PO_MAXPOLYSEGS)
-                        {
-                            I_Error
-                                ("SpawnPolyobj:  psIndex > PO_MAXPOLYSEGS\n");
-                        }
-                    }
-                }
-            }
-            // Clear out any specials for these segs...we cannot clear them out
-            //      in the above loop, since we aren't guaranteed one seg per
-            //              linedef.
-            for (i = 0; i < numsegs; i++)
-            {
-                if (segs[i].linedef->special == PO_LINE_EXPLICIT &&
-                    segs[i].linedef->arg1 == tag
-                    && segs[i].linedef->arg2 == j)
-                {
-                    segs[i].linedef->special = 0;
-                    segs[i].linedef->arg1 = 0;
-                }
-            }
-            if (psIndex == psIndexOld)
-            {                   // Check if an explicit line order has been skipped
-                // A line has been skipped if there are any more explicit
-                // lines with the current tag value
-                for (i = 0; i < numsegs; i++)
-                {
-                    if (segs[i].linedef->special == PO_LINE_EXPLICIT &&
-                        segs[i].linedef->arg1 == tag)
-                    {
-                        I_Error
-                            ("SpawnPolyobj:  Missing explicit line %d for poly %d\n",
-                             j, tag);
-                    }
-                }
-            }
-        }
-        if (polyobjs[index].numsegs)
-        {
-            PolySegCount = polyobjs[index].numsegs;     // PolySegCount used globally
-            polyobjs[index].crush = crush;
-            polyobjs[index].tag = tag;
-            polyobjs[index].segs = Z_Malloc(polyobjs[index].numsegs
-                                            * sizeof(seg_t *), PU_LEVEL, 0);
-            for (i = 0; i < polyobjs[index].numsegs; i++)
-            {
-                polyobjs[index].segs[i] = polySegList[i];
-            }
-            polyobjs[index].seqType = (*polyobjs[index].segs)->linedef->arg4;
-        }
-        // Next, change the polyobjs first line to point to a mirror
-        //              if it exists
-        (*polyobjs[index].segs)->linedef->arg2 =
-            (*polyobjs[index].segs)->linedef->arg3;
-    }
-}
-
-//==========================================================================
-//
-// TranslateToStartSpot
-//
-//==========================================================================
-
-static void TranslateToStartSpot(int tag, int originX, int originY)
-{
-    seg_t **tempSeg;
-    seg_t **veryTempSeg;
-    vertex_t *tempPt;
-    subsector_t *sub;
-    polyobj_t *po;
-    int deltaX;
-    int deltaY;
-    vertex_t avg;               // used to find a polyobj's center, and hence subsector
-    int i;
-
-    po = NULL;
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        if (polyobjs[i].tag == tag)
-        {
-            po = &polyobjs[i];
-            break;
-        }
-    }
-    if (!po)
-    {                           // didn't match the tag with a polyobj tag
-        I_Error("TranslateToStartSpot:  Unable to match polyobj tag: %d\n",
-                tag);
-    }
-    if (po->segs == NULL)
-    {
-        I_Error
-            ("TranslateToStartSpot:  Anchor point located without a StartSpot point: %d\n",
-             tag);
-    }
-    po->originalPts = Z_Malloc(po->numsegs * sizeof(vertex_t), PU_LEVEL, 0);
-    po->prevPts = Z_Malloc(po->numsegs * sizeof(vertex_t), PU_LEVEL, 0);
-    deltaX = originX - po->startSpot.x;
-    deltaY = originY - po->startSpot.y;
-
-    tempSeg = po->segs;
-    tempPt = po->originalPts;
-    avg.x = 0;
-    avg.y = 0;
-
-    validcount++;
-    for (i = 0; i < po->numsegs; i++, tempSeg++, tempPt++)
-    {
-        if ((*tempSeg)->linedef->validcount != validcount)
-        {
-            (*tempSeg)->linedef->bbox[BOXTOP] -= deltaY;
-            (*tempSeg)->linedef->bbox[BOXBOTTOM] -= deltaY;
-            (*tempSeg)->linedef->bbox[BOXLEFT] -= deltaX;
-            (*tempSeg)->linedef->bbox[BOXRIGHT] -= deltaX;
-            (*tempSeg)->linedef->validcount = validcount;
-        }
-        for (veryTempSeg = po->segs; veryTempSeg != tempSeg; veryTempSeg++)
-        {
-            if ((*veryTempSeg)->v1 == (*tempSeg)->v1)
-            {
-                break;
-            }
-        }
-        if (veryTempSeg == tempSeg)
-        {                       // the point hasn't been translated, yet
-            (*tempSeg)->v1->x -= deltaX;
-            (*tempSeg)->v1->y -= deltaY;
-        }
-        avg.x += (*tempSeg)->v1->x >> FRACBITS;
-        avg.y += (*tempSeg)->v1->y >> FRACBITS;
-        // the original Pts are based off the startSpot Pt, and are
-        // unique to each seg, not each linedef
-        tempPt->x = (*tempSeg)->v1->x - po->startSpot.x;
-        tempPt->y = (*tempSeg)->v1->y - po->startSpot.y;
-    }
-    avg.x /= po->numsegs;
-    avg.y /= po->numsegs;
-    sub = R_PointInSubsector(avg.x << FRACBITS, avg.y << FRACBITS);
-    if (sub->poly != NULL)
-    {
-        I_Error
-            ("PO_TranslateToStartSpot:  Multiple polyobjs in a single subsector.\n");
-    }
-    sub->poly = po;
-}
-
-//==========================================================================
-//
-// PO_Init
-//
-//==========================================================================
-
-void PO_Init(int lump)
-{
-    byte *data;
-    int i;
-    mapthing_t spawnthing;
-    mapthing_t *mt;
-    int numthings;
-    int polyIndex;
-
-    polyobjs = Z_Malloc(po_NumPolyobjs * sizeof(polyobj_t), PU_LEVEL, 0);
-    memset(polyobjs, 0, po_NumPolyobjs * sizeof(polyobj_t));
-
-    data = W_CacheLumpNum(lump, PU_STATIC);
-    numthings = W_LumpLength(lump) / sizeof(mapthing_t);
-    mt = (mapthing_t *) data;
-    polyIndex = 0;              // index polyobj number
-    // Find the startSpot points, and spawn each polyobj
-    for (i = 0; i < numthings; i++, mt++)
-    {
-        spawnthing.x = SHORT(mt->x);
-        spawnthing.y = SHORT(mt->y);
-        spawnthing.angle = SHORT(mt->angle);
-        spawnthing.type = SHORT(mt->type);
-
-        // 3001 = no crush, 3002 = crushing
-        if (spawnthing.type == PO_SPAWN_TYPE
-         || spawnthing.type == PO_SPAWNCRUSH_TYPE)
-        {                       // Polyobj StartSpot Pt.
-            polyobjs[polyIndex].startSpot.x = spawnthing.x << FRACBITS;
-            polyobjs[polyIndex].startSpot.y = spawnthing.y << FRACBITS;
-            polyobjs[polyIndex].startSpot.thinker.function = (think_t) P_DegenMobjThinker;
-            SpawnPolyobj(polyIndex, spawnthing.angle,
-                         (spawnthing.type == PO_SPAWNCRUSH_TYPE));
-            polyIndex++;
-        }
-    }
-    mt = (mapthing_t *) data;
-    for (i = 0; i < numthings; i++, mt++)
-    {
-        spawnthing.x = SHORT(mt->x);
-        spawnthing.y = SHORT(mt->y);
-        spawnthing.angle = SHORT(mt->angle);
-        spawnthing.type = SHORT(mt->type);
-        if (spawnthing.type == PO_ANCHOR_TYPE)
-        {                       // Polyobj Anchor Pt.
-            TranslateToStartSpot(spawnthing.angle,
-                                 spawnthing.x << FRACBITS,
-                                 spawnthing.y << FRACBITS);
-        }
-    }
-    W_ReleaseLumpNum(lump);
-    // check for a startspot without an anchor point
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        if (!polyobjs[i].originalPts)
-        {
-            I_Error
-                ("PO_Init:  StartSpot located without an Anchor point: %d\n",
-                 polyobjs[i].tag);
-        }
-    }
-    InitBlockMap();
-}
-
-//==========================================================================
-//
-// PO_Busy
-//
-//==========================================================================
-
-boolean PO_Busy(int polyobj)
-{
-    polyobj_t *poly;
-
-    poly = GetPolyobj(polyobj);
-    if (!poly->specialdata)
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
-}
diff --git a/games/NXDoom/src/hexen/r_bsp.c b/games/NXDoom/src/hexen/r_bsp.c
deleted file mode 100644
index cae9cbfd4..000000000
--- a/games/NXDoom/src/hexen/r_bsp.c
+++ /dev/null
@@ -1,508 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "m_bbox.h"
-#include "r_local.h"
-
-seg_t *curline;
-side_t *sidedef;
-line_t *linedef;
-sector_t *frontsector, *backsector;
-
-drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
-
-void R_StoreWallRange(int start, int stop);
-
-/*
-====================
-=
-= R_ClearDrawSegs
-=
-====================
-*/
-
-void R_ClearDrawSegs(void)
-{
-    ds_p = drawsegs;
-}
-
-//=============================================================================
-
-
-/*
-===============================================================================
-=
-= ClipWallSegment
-=
-= Clips the given range of columns and includes it in the new clip list
-===============================================================================
-*/
-
-typedef struct
-{
-    int first, last;
-} cliprange_t;
-
-// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
-// that can be generated in a scene by the DOOM engine. This was determined by
-// Lee Killough during BOOM development to be a function of the screensize.
-// The simplest thing we can do, other than fix this bug, is to let the game
-// render overage and then bomb out by detecting the overflow after the 
-// fact. -haleyjd
-//#define MAXSEGS 32
-#define MAXSEGS (SCREENWIDTH / 2 + 1)
-
-cliprange_t solidsegs[MAXSEGS], *newend;        // newend is one past the last valid seg
-
-
-void R_ClipSolidWallSegment(int first, int last)
-{
-    cliprange_t *next, *start;
-
-// find the first range that touches the range (adjacent pixels are touching)
-    start = solidsegs;
-    while (start->last < first - 1)
-        start++;
-
-    if (first < start->first)
-    {
-        if (last < start->first - 1)
-        {                       // post is entirely visible (above start), so insert a new clippost
-            R_StoreWallRange(first, last);
-            next = newend;
-            newend++;
-            while (next != start)
-            {
-                *next = *(next - 1);
-                next--;
-            }
-            next->first = first;
-            next->last = last;
-            return;
-        }
-
-        // there is a fragment above *start
-        R_StoreWallRange(first, start->first - 1);
-        start->first = first;   // adjust the clip size
-    }
-
-    if (last <= start->last)
-        return;                 // bottom contained in start
-
-    next = start;
-    while (last >= (next + 1)->first - 1)
-    {
-        // there is a fragment between two posts
-        R_StoreWallRange(next->last + 1, (next + 1)->first - 1);
-        next++;
-        if (last <= next->last)
-        {                       // bottom is contained in next
-            start->last = next->last;   // adjust the clip size
-            goto crunch;
-        }
-    }
-
-    // there is a fragment after *next
-    R_StoreWallRange(next->last + 1, last);
-    start->last = last;         // adjust the clip size
-
-
-// remove start+1 to next from the clip list,
-// because start now covers their area
-  crunch:
-    if (next == start)
-        return;                 // post just extended past the bottom of one post
-
-    while (next++ != newend)    // remove a post
-        *++start = *next;
-    newend = start + 1;
-}
-
-/*
-===============================================================================
-=
-= R_ClipPassWallSegment
-=
-= Clips the given range of columns, but does not includes it in the clip list
-===============================================================================
-*/
-
-void R_ClipPassWallSegment(int first, int last)
-{
-    cliprange_t *start;
-
-// find the first range that touches the range (adjacent pixels are touching)
-    start = solidsegs;
-    while (start->last < first - 1)
-        start++;
-
-    if (first < start->first)
-    {
-        if (last < start->first - 1)
-        {                       // post is entirely visible (above start)
-            R_StoreWallRange(first, last);
-            return;
-        }
-
-        // there is a fragment above *start
-        R_StoreWallRange(first, start->first - 1);
-    }
-
-    if (last <= start->last)
-        return;                 // bottom contained in start
-
-    while (last >= (start + 1)->first - 1)
-    {
-        // there is a fragment between two posts
-        R_StoreWallRange(start->last + 1, (start + 1)->first - 1);
-        start++;
-        if (last <= start->last)
-            return;
-    }
-
-    // there is a fragment after *next
-    R_StoreWallRange(start->last + 1, last);
-}
-
-
-
-/*
-====================
-=
-= R_ClearClipSegs
-=
-====================
-*/
-
-void R_ClearClipSegs(void)
-{
-    solidsegs[0].first = -0x7fffffff;
-    solidsegs[0].last = -1;
-    solidsegs[1].first = viewwidth;
-    solidsegs[1].last = 0x7fffffff;
-    newend = solidsegs + 2;
-}
-
-
-//=============================================================================
-
-/*
-======================
-=
-= R_AddLine
-=
-= Clips the given segment and adds any visible pieces to the line list
-=
-======================
-*/
-
-void R_AddLine(seg_t * line)
-{
-    int x1, x2;
-    angle_t angle1, angle2, span, tspan;
-
-    curline = line;
-
-// OPTIMIZE: quickly reject orthogonal back sides
-
-    angle1 = R_PointToAngle(line->v1->x, line->v1->y);
-    angle2 = R_PointToAngle(line->v2->x, line->v2->y);
-
-//
-// clip to view edges
-// OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW)
-    span = angle1 - angle2;
-    if (span >= ANG180)
-        return;                 // back side
-
-    rw_angle1 = angle1;         // global angle needed by segcalc
-    angle1 -= viewangle;
-    angle2 -= viewangle;
-
-    tspan = angle1 + clipangle;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return;             // totally off the left edge
-        angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return;             // totally off the left edge
-        angle2 = -clipangle;
-    }
-
-//
-// the seg is in the view range, but not necessarily visible
-//
-    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
-    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
-    x1 = viewangletox[angle1];
-    x2 = viewangletox[angle2];
-    if (x1 == x2)
-        return;                 // does not cross a pixel
-
-    backsector = line->backsector;
-
-    if (!backsector)
-        goto clipsolid;         // single sided line
-
-    if (backsector->ceilingheight <= frontsector->floorheight
-        || backsector->floorheight >= frontsector->ceilingheight)
-        goto clipsolid;         // closed door
-
-    if (backsector->ceilingheight != frontsector->ceilingheight
-        || backsector->floorheight != frontsector->floorheight)
-        goto clippass;          // window
-
-// reject empty lines used for triggers and special events
-    if (backsector->ceilingpic == frontsector->ceilingpic
-        && backsector->floorpic == frontsector->floorpic
-        && backsector->lightlevel == frontsector->lightlevel
-        && backsector->special == frontsector->special
-        && curline->sidedef->midtexture == 0)
-        return;
-
-  clippass:
-    R_ClipPassWallSegment(x1, x2 - 1);
-    return;
-
-  clipsolid:
-    R_ClipSolidWallSegment(x1, x2 - 1);
-}
-
-//============================================================================
-
-
-/*
-===============================================================================
-=
-= R_CheckBBox
-=
-= Returns true if some part of the bbox might be visible
-=
-===============================================================================
-*/
-
-int checkcoord[12][4] = {
-    {3, 0, 2, 1},
-    {3, 0, 2, 0},
-    {3, 1, 2, 0},
-    {0},
-    {2, 0, 2, 1},
-    {0, 0, 0, 0},
-    {3, 1, 3, 0},
-    {0},
-    {2, 0, 3, 1},
-    {2, 1, 3, 1},
-    {2, 1, 3, 0}
-};
-
-
-boolean R_CheckBBox(fixed_t * bspcoord)
-{
-    int boxx, boxy, boxpos;
-    fixed_t x1, y1, x2, y2;
-    angle_t angle1, angle2, span, tspan;
-    cliprange_t *start;
-    int sx1, sx2;
-
-// find the corners of the box that define the edges from current viewpoint
-    if (viewx <= bspcoord[BOXLEFT])
-        boxx = 0;
-    else if (viewx < bspcoord[BOXRIGHT])
-        boxx = 1;
-    else
-        boxx = 2;
-
-    if (viewy >= bspcoord[BOXTOP])
-        boxy = 0;
-    else if (viewy > bspcoord[BOXBOTTOM])
-        boxy = 1;
-    else
-        boxy = 2;
-
-    boxpos = (boxy << 2) + boxx;
-    if (boxpos == 5)
-        return true;
-
-    x1 = bspcoord[checkcoord[boxpos][0]];
-    y1 = bspcoord[checkcoord[boxpos][1]];
-    x2 = bspcoord[checkcoord[boxpos][2]];
-    y2 = bspcoord[checkcoord[boxpos][3]];
-
-
-//
-// check clip list for an open space
-//
-    angle1 = R_PointToAngle(x1, y1) - viewangle;
-    angle2 = R_PointToAngle(x2, y2) - viewangle;
-
-    span = angle1 - angle2;
-    if (span >= ANG180)
-        return true;            // sitting on a line
-    tspan = angle1 + clipangle;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return false;       // totally off the left edge
-        angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2 * clipangle)
-    {
-        tspan -= 2 * clipangle;
-        if (tspan >= span)
-            return false;       // totally off the left edge
-        angle2 = -clipangle;
-    }
-
-
-// find the first clippost that touches the source post (adjacent pixels are touching)
-    angle1 = (angle1 + ANG90) >> ANGLETOFINESHIFT;
-    angle2 = (angle2 + ANG90) >> ANGLETOFINESHIFT;
-    sx1 = viewangletox[angle1];
-    sx2 = viewangletox[angle2];
-    if (sx1 == sx2)
-        return false;           // does not cross a pixel
-    sx2--;
-
-    start = solidsegs;
-    while (start->last < sx2)
-        start++;
-    if (sx1 >= start->first && sx2 <= start->last)
-        return false;           // the clippost contains the new span
-
-    return true;
-}
-
-
-/*
-================
-=
-= R_Subsector
-=
-= Draw one or more segments
-================
-*/
-
-void R_Subsector(int num)
-{
-    int count;
-    seg_t *line;
-    subsector_t *sub;
-    int polyCount;
-    seg_t **polySeg;
-
-#ifdef RANGECHECK
-    if (num >= numsubsectors)
-        I_Error("R_Subsector: ss %i with numss = %i", num, numsubsectors);
-#endif
-
-    sscount++;
-    sub = &subsectors[num];
-    frontsector = sub->sector;
-    count = sub->numlines;
-    line = &segs[sub->firstline];
-
-    if (frontsector->floorheight < viewz)
-    {
-        floorplane = R_FindPlane(frontsector->floorheight,
-                                 frontsector->floorpic,
-                                 frontsector->lightlevel,
-                                 frontsector->special);
-    }
-    else
-    {
-        floorplane = NULL;
-    }
-
-    if (frontsector->ceilingheight > viewz
-        || frontsector->ceilingpic == skyflatnum)
-    {
-        ceilingplane = R_FindPlane(frontsector->ceilingheight,
-                                   frontsector->ceilingpic,
-                                   frontsector->lightlevel, 0);
-    }
-    else
-    {
-        ceilingplane = NULL;
-    }
-
-    R_AddSprites(frontsector);
-    if (sub->poly)
-    {                           // Render the polyobj in the subsector first
-        polyCount = sub->poly->numsegs;
-        polySeg = sub->poly->segs;
-        while (polyCount--)
-        {
-            R_AddLine(*polySeg++);
-        }
-    }
-    while (count--)
-    {
-        R_AddLine(line);
-        line++;
-    }
-
-    // check for solidsegs overflow - extremely unsatisfactory!
-    if(newend > &solidsegs[32])
-        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
-}
-
-
-/*
-===============================================================================
-=
-= RenderBSPNode
-=
-===============================================================================
-*/
-
-void R_RenderBSPNode(int bspnum)
-{
-    node_t *bsp;
-    int side;
-
-    if (bspnum & NF_SUBSECTOR)
-    {
-        if (bspnum == -1)
-            R_Subsector(0);
-        else
-            R_Subsector(bspnum & (~NF_SUBSECTOR));
-        return;
-    }
-
-    bsp = &nodes[bspnum];
-
-//
-// decide which side the view point is on
-//
-    side = R_PointOnSide(viewx, viewy, bsp);
-
-    R_RenderBSPNode(bsp->children[side]);       // recursively divide front space
-
-    if (R_CheckBBox(bsp->bbox[side ^ 1]))       // possibly divide back space
-        R_RenderBSPNode(bsp->children[side ^ 1]);
-}
diff --git a/games/NXDoom/src/hexen/r_data.c b/games/NXDoom/src/hexen/r_data.c
deleted file mode 100644
index 1c4ef7c36..000000000
--- a/games/NXDoom/src/hexen/r_data.c
+++ /dev/null
@@ -1,689 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "i_swap.h"
-#include "m_misc.h"
-#include "r_local.h"
-#include "p_local.h"
-
-typedef struct
-{
-    int originx;                // block origin (allways UL), which has allready
-    int originy;                // accounted  for the patch's internal origin
-    int patch;
-} texpatch_t;
-
-// a maptexturedef_t describes a rectangular texture, which is composed of one
-// or more mappatch_t structures that arrange graphic patches
-typedef struct
-{
-    char name[8];               // for switch changing, etc
-    short width;
-    short height;
-    short patchcount;
-    texpatch_t patches[1];      // [patchcount] drawn back to front
-    //  into the cached texture
-} texture_t;
-
-
-
-int firstflat, lastflat, numflats;
-int firstpatch, lastpatch, numpatches;
-int firstspritelump, lastspritelump, numspritelumps;
-
-int numtextures;
-texture_t **textures;
-int *texturewidthmask;
-fixed_t *textureheight;         // needed for texture pegging
-int *texturecompositesize;
-short **texturecolumnlump;
-unsigned short **texturecolumnofs;
-byte **texturecomposite;
-
-int *flattranslation;           // for global animation
-int *texturetranslation;        // for global animation
-
-fixed_t *spritewidth;           // needed for pre rendering
-fixed_t *spriteoffset;
-fixed_t *spritetopoffset;
-
-lighttable_t *colormaps;
-
-
-/*
-==============================================================================
-
-						MAPTEXTURE_T CACHING
-
-when a texture is first needed, it counts the number of composite columns
-required in the texture and allocates space for a column directory and any
-new columns.  The directory will simply point inside other patches if there
-is only one patch in a given column, but any columns with multiple patches
-will have new column_ts generated.
-
-==============================================================================
-*/
-
-/*
-===================
-=
-= R_DrawColumnInCache
-=
-= Clip and draw a column from a patch into a cached post
-=
-===================
-*/
-
-void R_DrawColumnInCache(column_t * patch, byte * cache, int originy,
-                         int cacheheight)
-{
-    int count, position;
-    byte *source;
-
-    while (patch->topdelta != 0xff)
-    {
-        source = (byte *) patch + 3;
-        count = patch->length;
-        position = originy + patch->topdelta;
-        if (position < 0)
-        {
-            count += position;
-            position = 0;
-        }
-        if (position + count > cacheheight)
-            count = cacheheight - position;
-        if (count > 0)
-            memcpy(cache + position, source, count);
-
-        patch = (column_t *) ((byte *) patch + patch->length + 4);
-    }
-}
-
-
-/*
-===================
-=
-= R_GenerateComposite
-=
-===================
-*/
-
-void R_GenerateComposite(int texnum)
-{
-    byte *block;
-    texture_t *texture;
-    texpatch_t *patch;
-    patch_t *realpatch;
-    int x, x1, x2;
-    int i;
-    column_t *patchcol;
-    short *collump;
-    unsigned short *colofs;
-
-    texture = textures[texnum];
-    block = Z_Malloc(texturecompositesize[texnum], PU_STATIC,
-                     &texturecomposite[texnum]);
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-
-//
-// composite the columns together
-//
-    for (i = 0, patch = texture->patches; i < texture->patchcount;
-         i++, patch++)
-    {
-        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
-        x1 = patch->originx;
-        x2 = x1 + SHORT(realpatch->width);
-
-        if (x1 < 0)
-            x = 0;
-        else
-            x = x1;
-        if (x2 > texture->width)
-            x2 = texture->width;
-
-        for (; x < x2; x++)
-        {
-            if (collump[x] >= 0)
-                continue;       // column does not have multiple patches
-            patchcol = (column_t *) ((byte *) realpatch +
-                                     LONG(realpatch->columnofs[x - x1]));
-            R_DrawColumnInCache(patchcol, block + colofs[x], patch->originy,
-                                texture->height);
-        }
-
-    }
-
-// now that the texture has been built, it is purgable
-    Z_ChangeTag(block, PU_CACHE);
-}
-
-
-/*
-===================
-=
-= R_GenerateLookup
-=
-===================
-*/
-
-void R_GenerateLookup(int texnum)
-{
-    texture_t *texture;
-    byte *patchcount;           // [texture->width]
-    texpatch_t *patch;
-    patch_t *realpatch;
-    int x, x1, x2;
-    int i;
-    short *collump;
-    unsigned short *colofs;
-
-    texture = textures[texnum];
-
-    texturecomposite[texnum] = 0;       // composited not created yet
-    texturecompositesize[texnum] = 0;
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-
-//
-// count the number of columns that are covered by more than one patch
-// fill in the lump / offset, so columns with only a single patch are
-// all done
-//
-    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
-    memset(patchcount, 0, texture->width);
-    for (i = 0, patch = texture->patches; i < texture->patchcount;
-         i++, patch++)
-    {
-        realpatch = W_CacheLumpNum(patch->patch, PU_CACHE);
-        x1 = patch->originx;
-        x2 = x1 + SHORT(realpatch->width);
-        if (x1 < 0)
-            x = 0;
-        else
-            x = x1;
-        if (x2 > texture->width)
-            x2 = texture->width;
-        for (; x < x2; x++)
-        {
-            patchcount[x]++;
-            collump[x] = patch->patch;
-            colofs[x] = LONG(realpatch->columnofs[x - x1]) + 3;
-        }
-    }
-
-    for (x = 0; x < texture->width; x++)
-    {
-        if (!patchcount[x])
-        {
-            ST_Message("R_GenerateLookup: column without a patch (%s)\n",
-                       texture->name);
-            return;
-        }
-//                      I_Error ("R_GenerateLookup: column without a patch");
-        if (patchcount[x] > 1)
-        {
-            collump[x] = -1;    // use the cached block
-            colofs[x] = texturecompositesize[texnum];
-            if (texturecompositesize[texnum] > 0x10000 - texture->height)
-                I_Error("R_GenerateLookup: texture %i is >64k", texnum);
-            texturecompositesize[texnum] += texture->height;
-        }
-    }
-
-    Z_Free(patchcount);
-}
-
-
-/*
-================
-=
-= R_GetColumn
-=
-================
-*/
-
-byte *R_GetColumn(int tex, int col)
-{
-    int lump, ofs;
-
-    col &= texturewidthmask[tex];
-    lump = texturecolumnlump[tex][col];
-    ofs = texturecolumnofs[tex][col];
-    if (lump > 0)
-        return (byte *) W_CacheLumpNum(lump, PU_CACHE) + ofs;
-    if (!texturecomposite[tex])
-        R_GenerateComposite(tex);
-    return texturecomposite[tex] + ofs;
-}
-
-
-/*
-==================
-=
-= R_InitTextures
-=
-= Initializes the texture list with the textures from the world map
-=
-==================
-*/
-
-void R_InitTextures(void)
-{
-    maptexture_t *mtexture;
-    texture_t *texture;
-    mappatch_t *mpatch;
-    texpatch_t *patch;
-    int i, j;
-    int *maptex, *maptex2, *maptex1;
-    char name[9], *names, *name_p;
-    int *patchlookup;
-    int nummappatches;
-    int offset, maxoff, maxoff2;
-    int numtextures1, numtextures2;
-    int *directory;
-
-//
-// load the patch names from pnames.lmp
-//
-    names = W_CacheLumpName("PNAMES", PU_STATIC);
-    nummappatches = LONG(*((int *) names));
-    name_p = names + 4;
-    patchlookup = Z_Malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
-    for (i = 0; i < nummappatches; i++)
-    {
-        M_StringCopy(name, name_p + i * 8, sizeof(name));
-        patchlookup[i] = W_CheckNumForName(name);
-    }
-    W_ReleaseLumpName("PNAMES");
-
-//
-// load the map texture definitions from textures.lmp
-//
-    maptex = maptex1 = W_CacheLumpName("TEXTURE1", PU_STATIC);
-    numtextures1 = LONG(*maptex);
-    maxoff = W_LumpLength(W_GetNumForName("TEXTURE1"));
-    directory = maptex + 1;
-
-    if (W_CheckNumForName("TEXTURE2") != -1)
-    {
-        maptex2 = W_CacheLumpName("TEXTURE2", PU_STATIC);
-        numtextures2 = LONG(*maptex2);
-        maxoff2 = W_LumpLength(W_GetNumForName("TEXTURE2"));
-    }
-    else
-    {
-        maptex2 = NULL;
-        numtextures2 = 0;
-        maxoff2 = 0;
-    }
-    numtextures = numtextures1 + numtextures2;
-
-    textures = Z_Malloc(numtextures * sizeof(texture_t *), PU_STATIC, 0);
-    texturecolumnlump = Z_Malloc(numtextures * sizeof(short *), PU_STATIC, 0);
-    texturecolumnofs = Z_Malloc(numtextures * sizeof(short *), PU_STATIC, 0);
-    texturecomposite = Z_Malloc(numtextures * sizeof(byte *), PU_STATIC, 0);
-    texturecompositesize = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
-    texturewidthmask = Z_Malloc(numtextures * sizeof(int), PU_STATIC, 0);
-    textureheight = Z_Malloc(numtextures * sizeof(fixed_t), PU_STATIC, 0);
-
-    for (i = 0; i < numtextures; i++, directory++)
-    {
-        if (i == numtextures1)
-        {                       // start looking in second texture file
-            maptex = maptex2;
-            maxoff = maxoff2;
-            directory = maptex + 1;
-        }
-
-        offset = LONG(*directory);
-        if (offset > maxoff)
-            I_Error("R_InitTextures: bad texture directory");
-        mtexture = (maptexture_t *) ((byte *) maptex + offset);
-        texture = textures[i] = Z_Malloc(sizeof(texture_t)
-                                         +
-                                         sizeof(texpatch_t) *
-                                         (SHORT(mtexture->patchcount) - 1),
-                                         PU_STATIC, 0);
-        texture->width = SHORT(mtexture->width);
-        texture->height = SHORT(mtexture->height);
-        texture->patchcount = SHORT(mtexture->patchcount);
-        memcpy(texture->name, mtexture->name, sizeof(texture->name));
-        mpatch = &mtexture->patches[0];
-        patch = &texture->patches[0];
-        for (j = 0; j < texture->patchcount; j++, mpatch++, patch++)
-        {
-            patch->originx = SHORT(mpatch->originx);
-            patch->originy = SHORT(mpatch->originy);
-            patch->patch = patchlookup[SHORT(mpatch->patch)];
-            if (patch->patch == -1)
-                I_Error("R_InitTextures: Missing patch in texture %s",
-                        texture->name);
-        }
-        texturecolumnlump[i] = Z_Malloc(texture->width * sizeof(short), PU_STATIC, 0);
-        texturecolumnofs[i] = Z_Malloc(texture->width * sizeof(short), PU_STATIC, 0);
-        j = 1;
-        while (j * 2 <= texture->width)
-            j <<= 1;
-        texturewidthmask[i] = j - 1;
-        textureheight[i] = texture->height << FRACBITS;
-    }
-
-    Z_Free(patchlookup);
-
-    W_ReleaseLumpName("TEXTURE1");
-    if (maptex2)
-        W_ReleaseLumpName("TEXTURE2");
-
-//
-// precalculate whatever possible
-//              
-    for (i = 0; i < numtextures; i++)
-    {
-        R_GenerateLookup(i);
-        if (!(i & 31))
-            ST_Progress();
-    }
-
-//
-// translation table for global animation
-//
-    texturetranslation = Z_Malloc((numtextures + 1) * sizeof(int), PU_STATIC, 0);
-    for (i = 0; i < numtextures; i++)
-        texturetranslation[i] = i;
-}
-
-
-/*
-================
-=
-= R_InitFlats
-=
-=================
-*/
-
-void R_InitFlats(void)
-{
-    int i;
-
-    firstflat = W_GetNumForName("F_START") + 1;
-    lastflat = W_GetNumForName("F_END") - 1;
-    numflats = lastflat - firstflat + 1;
-
-// translation table for global animation
-    flattranslation = Z_Malloc((numflats + 1) * sizeof(int), PU_STATIC, 0);
-    for (i = 0; i < numflats; i++)
-        flattranslation[i] = i;
-}
-
-
-/*
-================
-=
-= R_InitSpriteLumps
-=
-= Finds the width and hoffset of all sprites in the wad, so the sprite doesn't
-= need to be cached just for the header during rendering
-=================
-*/
-
-void R_InitSpriteLumps(void)
-{
-    int i;
-    patch_t *patch;
-
-    firstspritelump = W_GetNumForName("S_START") + 1;
-    lastspritelump = W_GetNumForName("S_END") - 1;
-    numspritelumps = lastspritelump - firstspritelump + 1;
-    spritewidth = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
-    spriteoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
-    spritetopoffset = Z_Malloc(numspritelumps * sizeof(fixed_t), PU_STATIC, 0);
-
-    for (i = 0; i < numspritelumps; i++)
-    {
-        if (!(i & 127))
-            ST_Progress();
-        patch = W_CacheLumpNum(firstspritelump + i, PU_CACHE);
-        spritewidth[i] = SHORT(patch->width) << FRACBITS;
-        spriteoffset[i] = SHORT(patch->leftoffset) << FRACBITS;
-        spritetopoffset[i] = SHORT(patch->topoffset) << FRACBITS;
-    }
-}
-
-
-/*
-================
-=
-= R_InitColormaps
-=
-=================
-*/
-
-void R_InitColormaps(void)
-{
-    int lump, length;
-//
-// load in the light tables
-// 256 byte align tables
-//
-    lump = W_GetNumForName("COLORMAP");
-    length = W_LumpLength(lump);
-    colormaps = Z_Malloc(length, PU_STATIC, 0);
-    W_ReadLump(lump, colormaps);
-}
-
-
-/*
-================
-=
-= R_InitData
-=
-= Locates all the lumps that will be used by all views
-= Must be called after W_Init
-=================
-*/
-
-void R_InitData(void)
-{
-    R_InitTextures();
-    R_InitFlats();
-    R_InitSpriteLumps();
-    R_InitColormaps();
-}
-
-//=============================================================================
-
-/*
-================
-=
-= R_FlatNumForName
-=
-================
-*/
-
-int R_FlatNumForName(const char *name)
-{
-    int i;
-    char namet[9];
-
-    i = W_CheckNumForName(name);
-    if (i == -1)
-    {
-        namet[8] = 0;
-        memcpy(namet, name, 8);
-        I_Error("R_FlatNumForName: %s not found", namet);
-    }
-    return i - firstflat;
-}
-
-
-/*
-================
-=
-= R_CheckTextureNumForName
-=
-================
-*/
-
-int R_CheckTextureNumForName(const char *name)
-{
-    int i;
-
-    if (name[0] == '-')         // no texture marker
-        return 0;
-
-    for (i = 0; i < numtextures; i++)
-        if (!strncasecmp(textures[i]->name, name, 8))
-            return i;
-
-    return -1;
-}
-
-
-/*
-================
-=
-= R_TextureNumForName
-=
-================
-*/
-
-int R_TextureNumForName(const char *name)
-{
-    int i;
-    //char  namet[9];
-
-    i = R_CheckTextureNumForName(name);
-    if (i == -1)
-        I_Error("R_TextureNumForName: %s not found", name);
-
-    return i;
-}
-
-
-/*
-=================
-=
-= R_PrecacheLevel
-=
-= Preloads all relevent graphics for the level
-=================
-*/
-
-int flatmemory, texturememory, spritememory;
-
-void R_PrecacheLevel(void)
-{
-    char *flatpresent;
-    char *texturepresent;
-    char *spritepresent;
-    int i, j, k, lump;
-    texture_t *texture;
-    thinker_t *th;
-    spriteframe_t *sf;
-
-    if (demoplayback)
-        return;
-
-//
-// precache flats
-//      
-    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
-    memset(flatpresent, 0, numflats);
-    for (i = 0; i < numsectors; i++)
-    {
-        flatpresent[sectors[i].floorpic] = 1;
-        flatpresent[sectors[i].ceilingpic] = 1;
-    }
-
-    flatmemory = 0;
-    for (i = 0; i < numflats; i++)
-        if (flatpresent[i])
-        {
-            lump = firstflat + i;
-            flatmemory += lumpinfo[lump]->size;
-            W_CacheLumpNum(lump, PU_CACHE);
-        }
-
-    Z_Free(flatpresent);
-
-//
-// precache textures
-//
-    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
-    memset(texturepresent, 0, numtextures);
-
-    for (i = 0; i < numsides; i++)
-    {
-        texturepresent[sides[i].toptexture] = 1;
-        texturepresent[sides[i].midtexture] = 1;
-        texturepresent[sides[i].bottomtexture] = 1;
-    }
-
-    texturepresent[Sky1Texture] = 1;
-    texturepresent[Sky2Texture] = 1;
-
-    texturememory = 0;
-    for (i = 0; i < numtextures; i++)
-    {
-        if (!texturepresent[i])
-            continue;
-        texture = textures[i];
-        for (j = 0; j < texture->patchcount; j++)
-        {
-            lump = texture->patches[j].patch;
-            texturememory += lumpinfo[lump]->size;
-            W_CacheLumpNum(lump, PU_CACHE);
-        }
-    }
-
-    Z_Free(texturepresent);
-
-//
-// precache sprites
-//
-    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
-    memset(spritepresent, 0, numsprites);
-
-    for (th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if (th->function == P_MobjThinker)
-            spritepresent[((mobj_t *) th)->sprite] = 1;
-    }
-
-    spritememory = 0;
-    for (i = 0; i < numsprites; i++)
-    {
-        if (!spritepresent[i])
-            continue;
-        for (j = 0; j < sprites[i].numframes; j++)
-        {
-            sf = &sprites[i].spriteframes[j];
-            for (k = 0; k < 8; k++)
-            {
-                lump = firstspritelump + sf->lump[k];
-                spritememory += lumpinfo[lump]->size;
-                W_CacheLumpNum(lump, PU_CACHE);
-            }
-        }
-    }
-
-    Z_Free(spritepresent);
-}
diff --git a/games/NXDoom/src/hexen/r_draw.c b/games/NXDoom/src/hexen/r_draw.c
deleted file mode 100644
index 13a0421b4..000000000
--- a/games/NXDoom/src/hexen/r_draw.c
+++ /dev/null
@@ -1,558 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "i_video.h"
-#include "r_local.h"
-#include "v_video.h"
-
-/*
-
-All drawing to the view buffer is accomplished in this file.  The other refresh
-files only know about ccordinates, not the architecture of the frame buffer.
-
-*/
-
-byte *viewimage;
-int viewwidth, scaledviewwidth, viewheight, viewwindowx, viewwindowy;
-byte *ylookup[MAXHEIGHT];
-int columnofs[MAXWIDTH];
-//byte translations[3][256]; // color tables for different players
-
-/*
-==================
-=
-= R_DrawColumn
-=
-= Source is the top of the column to scale
-=
-==================
-*/
-
-lighttable_t *dc_colormap;
-int dc_x;
-int dc_yl;
-int dc_yh;
-fixed_t dc_iscale;
-fixed_t dc_texturemid;
-byte *dc_source;                // first pixel in a column (possibly virtual)
-
-int dccount;                    // just for profiling
-
-void R_DrawColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-void R_DrawColumnLow(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-//      dccount++;
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = dc_colormap[dc_source[(frac >> FRACBITS) & 127]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-void R_DrawTLColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    if (!dc_yl)
-        dc_yl = 1;
-    if (dc_yh == viewheight - 1)
-        dc_yh = viewheight - 2;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = tinttable[*dest +
-                          (dc_colormap[dc_source[(frac >> FRACBITS) & 127]] <<
-                           8)];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-//============================================================================
-//
-// R_DrawAltTLColumn
-//
-//============================================================================
-
-void R_DrawAltTLColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    if (!dc_yl)
-        dc_yl = 1;
-    if (dc_yh == viewheight - 1)
-        dc_yh = viewheight - 2;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawAltTLColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = tinttable[((*dest) << 8)
-                          + dc_colormap[dc_source[(frac >> FRACBITS) & 127]]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-/*
-========================
-=
-= R_DrawTranslatedColumn
-=
-========================
-*/
-
-byte *dc_translation;
-byte *translationtables;
-
-void R_DrawTranslatedColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = dc_colormap[dc_translation[dc_source[frac >> FRACBITS]]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-//============================================================================
-//
-// R_DrawTranslatedTLColumn
-//
-//============================================================================
-
-void R_DrawTranslatedTLColumn(void)
-{
-    int count;
-    byte *dest;
-    fixed_t frac, fracstep;
-
-    count = dc_yh - dc_yl;
-    if (count < 0)
-        return;
-
-#ifdef RANGECHECK
-    if ((unsigned) dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-        I_Error("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    fracstep = dc_iscale;
-    frac = dc_texturemid + (dc_yl - centery) * fracstep;
-
-    do
-    {
-        *dest = tinttable[((*dest) << 8)
-                          +
-                          dc_colormap[dc_translation
-                                      [dc_source[frac >> FRACBITS]]]];
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    }
-    while (count--);
-}
-
-//============================================================================
-//
-// R_DrawTranslatedAltTLColumn
-//
-//============================================================================
-
-/*
-void R_DrawTranslatedAltTLColumn (void)
-{
-	int			count;
-	byte		*dest;
-	fixed_t		frac, fracstep;	
-
-	count = dc_yh - dc_yl;
-	if (count < 0)
-		return;
-				
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= SCREENWIDTH || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-		I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x);
-#endif
-
-	dest = ylookup[dc_yl] + columnofs[dc_x];
-	
-	fracstep = dc_iscale;
-	frac = dc_texturemid + (dc_yl-centery)*fracstep;
-
-	do
-	{
-		*dest = tinttable[*dest
-			+(dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]]<<8)];
-		dest += SCREENWIDTH;
-		frac += fracstep;
-	} while (count--);
-}
-*/
-
-//--------------------------------------------------------------------------
-//
-// PROC R_InitTranslationTables
-//
-//--------------------------------------------------------------------------
-
-void R_InitTranslationTables(void)
-{
-    int i;
-    byte *transLump;
-    int lumpnum;
-
-    V_LoadTintTable();
-
-    // Allocate translation tables
-    translationtables = Z_Malloc(256 * 3 * (maxplayers - 1), PU_STATIC, 0);
-
-    for (i = 0; i < 3 * (maxplayers - 1); i++)
-    {
-        lumpnum = W_GetNumForName("trantbl0") + i;
-        transLump = W_CacheLumpNum(lumpnum, PU_STATIC);
-        memcpy(translationtables + i * 256, transLump, 256);
-        W_ReleaseLumpNum(lumpnum);
-    }
-}
-
-/*
-================
-=
-= R_DrawSpan
-=
-================
-*/
-
-int ds_y;
-int ds_x1;
-int ds_x2;
-lighttable_t *ds_colormap;
-fixed_t ds_xfrac;
-fixed_t ds_yfrac;
-fixed_t ds_xstep;
-fixed_t ds_ystep;
-byte *ds_source;                // start of a 64*64 tile image
-
-int dscount;                    // just for profiling
-
-void R_DrawSpan(void)
-{
-    fixed_t xfrac, yfrac;
-    byte *dest;
-    int count, spot;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
-        || (unsigned) ds_y > SCREENHEIGHT)
-        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
-//      dscount++;
-#endif
-
-    xfrac = ds_xfrac;
-    yfrac = ds_yfrac;
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-    count = ds_x2 - ds_x1;
-    do
-    {
-        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
-        *dest++ = ds_colormap[ds_source[spot]];
-        xfrac += ds_xstep;
-        yfrac += ds_ystep;
-    }
-    while (count--);
-}
-
-void R_DrawSpanLow(void)
-{
-    fixed_t xfrac, yfrac;
-    byte *dest;
-    int count, spot;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= SCREENWIDTH
-        || (unsigned) ds_y > SCREENHEIGHT)
-        I_Error("R_DrawSpan: %i to %i at %i", ds_x1, ds_x2, ds_y);
-//      dscount++;
-#endif
-
-    xfrac = ds_xfrac;
-    yfrac = ds_yfrac;
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-    count = ds_x2 - ds_x1;
-    do
-    {
-        spot = ((yfrac >> (16 - 6)) & (63 * 64)) + ((xfrac >> 16) & 63);
-        *dest++ = ds_colormap[ds_source[spot]];
-        xfrac += ds_xstep;
-        yfrac += ds_ystep;
-    }
-    while (count--);
-}
-
-
-
-/*
-================
-=
-= R_InitBuffer
-=
-=================
-*/
-
-void R_InitBuffer(int width, int height)
-{
-    int i;
-
-    viewwindowx = (SCREENWIDTH - width) >> 1;
-    for (i = 0; i < width; i++)
-        columnofs[i] = viewwindowx + i;
-    if (width == SCREENWIDTH)
-        viewwindowy = 0;
-    else
-        viewwindowy = (SCREENHEIGHT - SBARHEIGHT - height) >> 1;
-    for (i = 0; i < height; i++)
-        ylookup[i] = I_VideoBuffer + (i + viewwindowy) * SCREENWIDTH;
-}
-
-
-/*
-==================
-=
-= R_DrawViewBorder
-=
-= Draws the border around the view for different size windows
-==================
-*/
-
-boolean BorderNeedRefresh;
-
-void R_DrawViewBorder(void)
-{
-    byte *src, *dest;
-    int x, y;
-
-    if (scaledviewwidth == SCREENWIDTH)
-        return;
-
-    src = W_CacheLumpName("F_022", PU_CACHE);
-    dest = I_VideoBuffer;
-
-    for (y = 0; y < SCREENHEIGHT - SBARHEIGHT; y++)
-    {
-        for (x = 0; x < SCREENWIDTH / 64; x++)
-        {
-            memcpy(dest, src + ((y & 63) << 6), 64);
-            dest += 64;
-        }
-        if (SCREENWIDTH & 63)
-        {
-            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
-            dest += (SCREENWIDTH & 63);
-        }
-    }
-    for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
-    {
-        V_DrawPatch(x, viewwindowy - 4, W_CacheLumpName("bordt", PU_CACHE));
-        V_DrawPatch(x, viewwindowy + viewheight, W_CacheLumpName("bordb",
-                                                                 PU_CACHE));
-    }
-    for (y = viewwindowy; y < viewwindowy + viewheight; y += 16)
-    {
-        V_DrawPatch(viewwindowx - 4, y, W_CacheLumpName("bordl", PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, y, W_CacheLumpName("bordr",
-                                                                PU_CACHE));
-    }
-    V_DrawPatch(viewwindowx - 4, viewwindowy - 4, W_CacheLumpName("bordtl",
-                                                                  PU_CACHE));
-    V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
-                W_CacheLumpName("bordtr", PU_CACHE));
-    V_DrawPatch(viewwindowx + viewwidth, viewwindowy + viewheight,
-                W_CacheLumpName("bordbr", PU_CACHE));
-    V_DrawPatch(viewwindowx - 4, viewwindowy + viewheight,
-                W_CacheLumpName("bordbl", PU_CACHE));
-}
-
-/*
-==================
-=
-= R_DrawTopBorder
-=
-= Draws the top border around the view for different size windows
-==================
-*/
-
-boolean BorderTopRefresh;
-
-void R_DrawTopBorder(void)
-{
-    byte *src, *dest;
-    int x, y;
-
-    if (scaledviewwidth == SCREENWIDTH)
-        return;
-
-/*	if(gamemode == shareware)
-	{
-		src = W_CacheLumpName ("FLOOR04", PU_CACHE);
-	}
-	else
-	{
-		src = W_CacheLumpName ("FLAT513", PU_CACHE);
-	}
-*/
-    src = W_CacheLumpName("F_022", PU_CACHE);
-    dest = I_VideoBuffer;
-
-    for (y = 0; y < 34; y++)
-    {
-        for (x = 0; x < SCREENWIDTH / 64; x++)
-        {
-            memcpy(dest, src + ((y & 63) << 6), 64);
-            dest += 64;
-        }
-        if (SCREENWIDTH & 63)
-        {
-            memcpy(dest, src + ((y & 63) << 6), SCREENWIDTH & 63);
-            dest += (SCREENWIDTH & 63);
-        }
-    }
-    if (viewwindowy < 35)
-    {
-        for (x = viewwindowx; x < viewwindowx + viewwidth; x += 16)
-        {
-            V_DrawPatch(x, viewwindowy - 4,
-                        W_CacheLumpName("bordt", PU_CACHE));
-        }
-        V_DrawPatch(viewwindowx - 4, viewwindowy, W_CacheLumpName("bordl",
-                                                                  PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, viewwindowy,
-                    W_CacheLumpName("bordr", PU_CACHE));
-        V_DrawPatch(viewwindowx - 4, viewwindowy + 16,
-                    W_CacheLumpName("bordl", PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, viewwindowy + 16,
-                    W_CacheLumpName("bordr", PU_CACHE));
-
-        V_DrawPatch(viewwindowx - 4, viewwindowy - 4,
-                    W_CacheLumpName("bordtl", PU_CACHE));
-        V_DrawPatch(viewwindowx + viewwidth, viewwindowy - 4,
-                    W_CacheLumpName("bordtr", PU_CACHE));
-    }
-}
diff --git a/games/NXDoom/src/hexen/r_local.h b/games/NXDoom/src/hexen/r_local.h
deleted file mode 100644
index e9cb26ce0..000000000
--- a/games/NXDoom/src/hexen/r_local.h
+++ /dev/null
@@ -1,554 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __R_LOCAL__
-#define __R_LOCAL__
-
-#include "i_video.h"
-
-#define ANGLETOSKYSHIFT         22      // sky map is 256*128*4 maps
-
-#define BASEYCENTER                     100
-
-#define MAXWIDTH                        1120
-#define MAXHEIGHT                       832
-
-#define PI                                      3.141592657
-
-#define CENTERY                         (SCREENHEIGHT/2)
-
-#define MINZ                    (FRACUNIT*4)
-
-#define FIELDOFVIEW             2048    // fineangles in the SCREENWIDTH wide window
-
-//
-// lighting constants
-//
-#define LIGHTLEVELS                     16
-#define LIGHTSEGSHIFT           4
-#define MAXLIGHTSCALE           48
-#define LIGHTSCALESHIFT         12
-#define MAXLIGHTZ                       128
-#define LIGHTZSHIFT                     20
-#define NUMCOLORMAPS            32      // number of diminishing
-#define INVERSECOLORMAP         32
-
-/*
-==============================================================================
-
-					INTERNAL MAP TYPES
-
-==============================================================================
-*/
-
-//================ used by play and refresh
-
-typedef struct
-{
-    fixed_t x, y;
-} vertex_t;
-
-struct line_s;
-
-typedef struct
-{
-    fixed_t floorheight, ceilingheight;
-    short floorpic, ceilingpic;
-    short lightlevel;
-    short special, tag;
-
-    int soundtraversed;         // 0 = untraversed, 1,2 = sndlines -1
-    mobj_t *soundtarget;        // thing that made a sound (or null)
-    seqtype_t seqType;          // stone, metal, heavy, etc...
-
-    int blockbox[4];            // mapblock bounding box for height changes
-    degenmobj_t soundorg;       // for any sounds played by the sector
-    int validcount;             // if == validcount, already checked
-    mobj_t *thinglist;          // list of mobjs in sector
-    void *specialdata;          // thinker_t for reversable actions
-    int linecount;
-    struct line_s **lines;      // [linecount] size
-} sector_t;
-
-typedef struct
-{
-    fixed_t textureoffset;      // add this to the calculated texture col
-    fixed_t rowoffset;          // add this to the calculated texture top
-    short toptexture, bottomtexture, midtexture;
-    sector_t *sector;
-} side_t;
-
-typedef enum
-{
-    ST_HORIZONTAL,
-    ST_VERTICAL,
-    ST_POSITIVE,
-    ST_NEGATIVE
-} slopetype_t;
-
-/*
-typedef struct line_s
-{
-	vertex_t        *v1, *v2;
-	fixed_t         dx,dy;                          // v2 - v1 for side checking
-	short           flags;
-	short           special, tag;
-	short           sidenum[2];                     // sidenum[1] will be -1 if one sided
-	fixed_t         bbox[4];
-	slopetype_t     slopetype;                      // to aid move clipping
-	sector_t        *frontsector, *backsector;
-	int                     validcount;                     // if == validcount, already checked
-	void            *specialdata;           // thinker_t for reversable actions
-} line_t;
-*/
-
-typedef struct line_s
-{
-    vertex_t *v1;
-    vertex_t *v2;
-    fixed_t dx;
-    fixed_t dy;
-    short flags;
-    byte special;
-    byte arg1;
-    byte arg2;
-    byte arg3;
-    byte arg4;
-    byte arg5;
-    short sidenum[2];
-    fixed_t bbox[4];
-    slopetype_t slopetype;
-    sector_t *frontsector;
-    sector_t *backsector;
-    int validcount;
-    void *specialdata;
-} line_t;
-
-typedef struct
-{
-    vertex_t *v1, *v2;
-    fixed_t offset;
-    angle_t angle;
-    side_t *sidedef;
-    line_t *linedef;
-    sector_t *frontsector;
-    sector_t *backsector;       // NULL for one sided lines
-} seg_t;
-
-// ===== Polyobj data =====
-typedef struct
-{
-    int numsegs;
-    seg_t **segs;
-    degenmobj_t startSpot;
-    vertex_t *originalPts;      // used as the base for the rotations
-    vertex_t *prevPts;          // use to restore the old point values
-    angle_t angle;
-    int tag;                    // reference tag assigned in HereticEd
-    int bbox[4];
-    int validcount;
-    boolean crush;              // should the polyobj attempt to crush mobjs?
-    int seqType;
-    fixed_t size;               // polyobj size (area of POLY_AREAUNIT == size of FRACUNIT)
-    void *specialdata;          // pointer a thinker, if the poly is moving
-} polyobj_t;
-
-typedef struct polyblock_s
-{
-    polyobj_t *polyobj;
-    struct polyblock_s *prev;
-    struct polyblock_s *next;
-} polyblock_t;
-
-typedef struct subsector_s
-{
-    sector_t *sector;
-    short numlines;
-    short firstline;
-    polyobj_t *poly;
-} subsector_t;
-
-typedef struct
-{
-    fixed_t x, y, dx, dy;       // partition line
-    fixed_t bbox[2][4];         // bounding box for each child
-    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
-} node_t;
-
-
-/*
-==============================================================================
-
-						OTHER TYPES
-
-==============================================================================
-*/
-
-typedef byte lighttable_t;      // this could be wider for >8 bit display
-
-#define MAXVISPLANES    160
-#define MAXOPENINGS             SCREENWIDTH*64
-
-typedef struct
-{
-    fixed_t height;
-    int picnum;
-    int lightlevel;
-    int special;
-    int minx, maxx;
-    byte pad1;                  // leave pads for [minx-1]/[maxx+1]
-    byte top[SCREENWIDTH];
-    byte pad2;
-    byte pad3;
-    byte bottom[SCREENWIDTH];
-    byte pad4;
-} visplane_t;
-
-typedef struct drawseg_s
-{
-    seg_t *curline;
-    int x1, x2;
-    fixed_t scale1, scale2, scalestep;
-    int silhouette;             // 0=none, 1=bottom, 2=top, 3=both
-    fixed_t bsilheight;         // don't clip sprites above this
-    fixed_t tsilheight;         // don't clip sprites below this
-// pointers to lists for sprite clipping
-    short *sprtopclip;          // adjusted so [x1] is first value
-    short *sprbottomclip;       // adjusted so [x1] is first value
-    short *maskedtexturecol;    // adjusted so [x1] is first value
-} drawseg_t;
-
-#define SIL_NONE        0
-#define SIL_BOTTOM      1
-#define SIL_TOP         2
-#define SIL_BOTH        3
-
-#define MAXDRAWSEGS             256
-
-// A vissprite_t is a thing that will be drawn during a refresh
-typedef struct vissprite_s
-{
-    struct vissprite_s *prev, *next;
-    int x1, x2;
-    fixed_t gx, gy;             // for line side calculation
-    fixed_t gz, gzt;            // global bottom / top for silhouette clipping
-    fixed_t startfrac;          // horizontal position of x1
-    fixed_t scale;
-    fixed_t xiscale;            // negative if flipped
-    fixed_t texturemid;
-    int patch;
-    lighttable_t *colormap;
-    int mobjflags;              // for color translation and shadow draw
-    boolean psprite;            // true if psprite
-    int class;                  // player class (used in translation)
-    fixed_t floorclip;
-} vissprite_t;
-
-
-extern visplane_t *floorplane, *ceilingplane;
-
-// Sprites are patches with a special naming convention so they can be
-// recognized by R_InitSprites.  The sprite and frame specified by a
-// thing_t is range checked at run time.
-// a sprite is a patch_t that is assumed to represent a three dimensional
-// object and may have multiple rotations pre drawn.  Horizontal flipping
-// is used to save space. Some sprites will only have one picture used
-// for all views.
-
-typedef struct
-{
-    boolean rotate;             // if false use 0 for any position
-    short lump[8];              // lump to use for view angles 0-7
-    byte flip[8];               // flip (1 = flip) to use for view angles 0-7
-} spriteframe_t;
-
-typedef struct
-{
-    int numframes;
-    spriteframe_t *spriteframes;
-} spritedef_t;
-
-extern spritedef_t *sprites;
-extern int numsprites;
-
-//=============================================================================
-
-extern int numvertexes;
-extern vertex_t *vertexes;
-
-extern int numsegs;
-extern seg_t *segs;
-
-extern int numsectors;
-extern sector_t *sectors;
-
-extern int numsubsectors;
-extern subsector_t *subsectors;
-
-extern int numnodes;
-extern node_t *nodes;
-
-extern int numlines;
-extern line_t *lines;
-
-extern int numsides;
-extern side_t *sides;
-
-
-
-extern fixed_t viewx, viewy, viewz;
-extern angle_t viewangle;
-extern player_t *viewplayer;
-
-
-extern angle_t clipangle;
-
-extern int viewangletox[FINEANGLES / 2];
-extern angle_t xtoviewangle[SCREENWIDTH + 1];
-
-extern fixed_t rw_distance;
-extern angle_t rw_normalangle;
-
-//
-// R_main.c
-//
-extern int screenblocks;
-extern int viewwidth, viewheight, viewwindowx, viewwindowy;
-extern int scaledviewwidth;
-extern int centerx, centery;
-extern int flyheight;
-extern fixed_t centerxfrac;
-extern fixed_t centeryfrac;
-extern fixed_t projection;
-
-extern int validcount;
-
-extern int sscount, linecount, loopcount;
-extern lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-extern lighttable_t *scalelightfixed[MAXLIGHTSCALE];
-extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
-
-extern int extralight;
-extern lighttable_t *fixedcolormap;
-
-extern fixed_t viewcos, viewsin;
-
-extern int detailshift;         // 0 = high, 1 = low
-
-extern void (*colfunc) (void);
-extern void (*basecolfunc) (void);
-extern void (*tlcolfunc) (void);
-extern void (*spanfunc) (void);
-
-int R_PointOnSide(fixed_t x, fixed_t y, node_t * node);
-int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line);
-angle_t R_PointToAngle(fixed_t x, fixed_t y);
-angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
-fixed_t R_PointToDist(fixed_t x, fixed_t y);
-fixed_t R_ScaleFromGlobalAngle(angle_t visangle);
-subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
-//void R_AddPointToBox (int x, int y, fixed_t *box);
-
-
-//
-// R_bsp.c
-//
-extern seg_t *curline;
-extern side_t *sidedef;
-extern line_t *linedef;
-extern sector_t *frontsector, *backsector;
-
-extern int rw_x;
-extern int rw_stopx;
-
-extern boolean segtextured;
-extern boolean markfloor;       // false if the back side is the same plane
-extern boolean markceiling;
-extern boolean skymap;
-
-extern drawseg_t drawsegs[MAXDRAWSEGS], *ds_p;
-
-extern lighttable_t **hscalelight, **vscalelight, **dscalelight;
-
-typedef void (*drawfunc_t) (int start, int stop);
-void R_ClearClipSegs(void);
-
-void R_ClearDrawSegs(void);
-void R_InitSkyMap(void);
-void R_RenderBSPNode(int bspnum);
-
-//
-// R_segs.c
-//
-extern int rw_angle1;           // angle to line origin
-extern int TransTextureStart;
-extern int TransTextureEnd;
-extern lighttable_t **walllights;
-
-
-void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2);
-
-//
-// R_plane.c
-//
-typedef void (*planefunction_t) (int top, int bottom);
-extern planefunction_t floorfunc, ceilingfunc;
-
-extern fixed_t Sky1ColumnOffset;
-extern fixed_t Sky2ColumnOffset;
-extern int skyflatnum;
-extern boolean DoubleSky;
-
-extern short openings[MAXOPENINGS], *lastopening;
-
-extern short floorclip[SCREENWIDTH];
-extern short ceilingclip[SCREENWIDTH];
-
-extern fixed_t yslope[SCREENHEIGHT];
-extern fixed_t distscale[SCREENWIDTH];
-
-void R_InitPlanes(void);
-void R_ClearPlanes(void);
-void R_MapPlane(int y, int x1, int x2);
-void R_MakeSpans(int x, int t1, int b1, int t2, int b2);
-void R_DrawPlanes(void);
-
-visplane_t *R_FindPlane(fixed_t height, int picnum, int lightlevel,
-                        int special);
-visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop);
-
-void R_InitSky(int map);
-
-
-//
-// R_debug.m
-//
-extern int drawbsp;
-
-void RD_OpenMapWindow(void);
-void RD_ClearMapWindow(void);
-void RD_DisplayLine(int x1, int y1, int x2, int y2, float gray);
-void RD_DrawNodeLine(node_t * node);
-void RD_DrawLineCheck(seg_t * line);
-void RD_DrawLine(seg_t * line);
-void RD_DrawBBox(fixed_t * bbox);
-
-
-//
-// R_data.c
-//
-extern fixed_t *textureheight;  // needed for texture pegging
-extern fixed_t *spritewidth;    // needed for pre rendering (fracs)
-extern fixed_t *spriteoffset;
-extern fixed_t *spritetopoffset;
-extern lighttable_t *colormaps;
-extern int firstflat;
-extern int numflats;
-
-extern int *flattranslation;    // for global animation
-extern int *texturetranslation; // for global animation
-
-extern int firstspritelump, lastspritelump, numspritelumps;
-extern boolean LevelUseFullBright;
-
-byte *R_GetColumn(int tex, int col);
-void R_InitData(void);
-void R_PrecacheLevel(void);
-
-
-//
-// R_things.c
-//
-#define MAXVISSPRITES   192
-
-extern vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
-extern vissprite_t vsprsortedhead;
-
-// constant arrays used for psprite clipping and initializing clipping
-extern short negonearray[SCREENWIDTH];
-extern short screenheightarray[SCREENWIDTH];
-
-// vars for R_DrawMaskedColumn
-extern short *mfloorclip;
-extern short *mceilingclip;
-extern fixed_t spryscale;
-extern fixed_t sprtopscreen;
-extern fixed_t sprbotscreen;
-
-extern fixed_t pspritescale, pspriteiscale;
-
-
-void R_DrawMaskedColumn(column_t * column, signed int baseclip);
-
-
-void R_SortVisSprites(void);
-
-void R_AddSprites(sector_t * sec);
-void R_AddPSprites(void);
-void R_DrawSprites(void);
-void R_InitSprites(const char **namelist);
-void R_ClearSprites(void);
-void R_DrawMasked(void);
-void R_ClipVisSprite(vissprite_t * vis, int xl, int xh);
-
-//=============================================================================
-//
-// R_draw.c
-//
-//=============================================================================
-
-extern lighttable_t *dc_colormap;
-extern int dc_x;
-extern int dc_yl;
-extern int dc_yh;
-extern fixed_t dc_iscale;
-extern fixed_t dc_texturemid;
-extern byte *dc_source;         // first pixel in a column
-extern byte *ylookup[MAXHEIGHT];
-extern int columnofs[MAXWIDTH];
-
-
-void R_DrawColumn(void);
-void R_DrawColumnLow(void);
-void R_DrawTLColumn(void);
-void R_DrawTLColumnLow(void);
-void R_DrawTranslatedColumn(void);
-void R_DrawTranslatedTLColumn(void);
-void R_DrawTranslatedColumnLow(void);
-void R_DrawAltTLColumn(void);
-//void  R_DrawTranslatedAltTLColumn(void);
-
-extern int ds_y;
-extern int ds_x1;
-extern int ds_x2;
-extern lighttable_t *ds_colormap;
-extern fixed_t ds_xfrac;
-extern fixed_t ds_yfrac;
-extern fixed_t ds_xstep;
-extern fixed_t ds_ystep;
-extern byte *ds_source;         // start of a 64*64 tile image
-
-extern byte *translationtables;
-extern byte *dc_translation;
-
-void R_DrawSpan(void);
-void R_DrawSpanLow(void);
-
-void R_InitBuffer(int width, int height);
-void R_InitTranslationTables(void);
-
-#endif // __R_LOCAL__
diff --git a/games/NXDoom/src/hexen/r_main.c b/games/NXDoom/src/hexen/r_main.c
deleted file mode 100644
index 3bbb4fce2..000000000
--- a/games/NXDoom/src/hexen/r_main.c
+++ /dev/null
@@ -1,830 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include <math.h>
-#include "m_random.h"
-#include "h2def.h"
-#include "m_bbox.h"
-#include "r_local.h"
-
-int viewangleoffset;
-
-// haleyjd: removed WATCOMC
-
-int validcount = 1;             // increment every time a check is made
-
-lighttable_t *fixedcolormap;
-
-int centerx, centery;
-fixed_t centerxfrac, centeryfrac;
-fixed_t projection;
-
-int framecount;                 // just for profiling purposes
-
-int sscount, linecount, loopcount;
-
-fixed_t viewx, viewy, viewz;
-angle_t viewangle;
-fixed_t viewcos, viewsin;
-player_t *viewplayer;
-
-int detailshift;                // 0 = high, 1 = low
-
-//
-// precalculated math tables
-//
-angle_t clipangle;
-
-// The viewangletox[viewangle + FINEANGLES/4] lookup maps the visible view
-// angles  to screen X coordinates, flattening the arc to a flat projection
-// plane.  There will be many angles mapped to the same X.
-int viewangletox[FINEANGLES / 2];
-
-// The xtoviewangleangle[] table maps a screen pixel to the lowest viewangle
-// that maps back to x ranges from clipangle to -clipangle
-angle_t xtoviewangle[SCREENWIDTH + 1];
-
-lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-lighttable_t *scalelightfixed[MAXLIGHTSCALE];
-lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
-
-int extralight;                 // bumped light from gun blasts
-
-void (*colfunc) (void);
-void (*basecolfunc) (void);
-void (*tlcolfunc) (void);
-void (*transcolfunc) (void);
-void (*spanfunc) (void);
-
-/*
-===================
-=
-= R_AddPointToBox
-=
-===================
-*/
-
-/*
-void R_AddPointToBox (int x, int y, fixed_t *box)
-{
-	if (x< box[BOXLEFT])
-		box[BOXLEFT] = x;
-	if (x> box[BOXRIGHT])
-		box[BOXRIGHT] = x;
-	if (y< box[BOXBOTTOM])
-		box[BOXBOTTOM] = y;
-	if (y> box[BOXTOP])
-		box[BOXTOP] = y;
-}
-*/
-
-
-/*
-===============================================================================
-=
-= R_PointOnSide
-=
-= Returns side 0 (front) or 1 (back)
-===============================================================================
-*/
-
-int R_PointOnSide(fixed_t x, fixed_t y, node_t * node)
-{
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    if (!node->dx)
-    {
-        if (x <= node->x)
-            return node->dy > 0;
-        return node->dy < 0;
-    }
-    if (!node->dy)
-    {
-        if (y <= node->y)
-            return node->dx < 0;
-        return node->dx > 0;
-    }
-
-    dx = (x - node->x);
-    dy = (y - node->y);
-
-// try to quickly decide by looking at sign bits
-    if ((node->dy ^ node->dx ^ dx ^ dy) & 0x80000000)
-    {
-        if ((node->dy ^ dx) & 0x80000000)
-            return 1;           // (left is negative)
-        return 0;
-    }
-
-    left = FixedMul(node->dy >> FRACBITS, dx);
-    right = FixedMul(dy, node->dx >> FRACBITS);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-int R_PointOnSegSide(fixed_t x, fixed_t y, seg_t * line)
-{
-    fixed_t lx, ly;
-    fixed_t ldx, ldy;
-    fixed_t dx, dy;
-    fixed_t left, right;
-
-    lx = line->v1->x;
-    ly = line->v1->y;
-
-    ldx = line->v2->x - lx;
-    ldy = line->v2->y - ly;
-
-    if (!ldx)
-    {
-        if (x <= lx)
-            return ldy > 0;
-        return ldy < 0;
-    }
-    if (!ldy)
-    {
-        if (y <= ly)
-            return ldx < 0;
-        return ldx > 0;
-    }
-
-    dx = (x - lx);
-    dy = (y - ly);
-
-// try to quickly decide by looking at sign bits
-    if ((ldy ^ ldx ^ dx ^ dy) & 0x80000000)
-    {
-        if ((ldy ^ dx) & 0x80000000)
-            return 1;           // (left is negative)
-        return 0;
-    }
-
-    left = FixedMul(ldy >> FRACBITS, dx);
-    right = FixedMul(dy, ldx >> FRACBITS);
-
-    if (right < left)
-        return 0;               // front side
-    return 1;                   // back side
-}
-
-
-/*
-===============================================================================
-=
-= R_PointToAngle
-=
-===============================================================================
-*/
-
-#define	DBITS		(FRACBITS-SLOPEBITS)
-
-angle_t R_PointToAngle(fixed_t x, fixed_t y)
-{
-    x -= viewx;
-    y -= viewy;
-    if ((!x) && (!y))
-        return 0;
-    if (x >= 0)
-    {                           // x >=0
-        if (y >= 0)
-        {                       // y>= 0
-            if (x > y)
-                return tantoangle[SlopeDiv(y, x)];      // octant 0
-            else
-                return ANG90 - 1 - tantoangle[SlopeDiv(x, y)];  // octant 1
-        }
-        else
-        {                       // y<0
-            y = -y;
-            if (x > y)
-                return -tantoangle[SlopeDiv(y, x)];     // octant 8
-            else
-                return ANG270 + tantoangle[SlopeDiv(x, y)];     // octant 7
-        }
-    }
-    else
-    {                           // x<0
-        x = -x;
-        if (y >= 0)
-        {                       // y>= 0
-            if (x > y)
-                return ANG180 - 1 - tantoangle[SlopeDiv(y, x)]; // octant 3
-            else
-                return ANG90 + tantoangle[SlopeDiv(x, y)];      // octant 2
-        }
-        else
-        {                       // y<0
-            y = -y;
-            if (x > y)
-                return ANG180 + tantoangle[SlopeDiv(y, x)];     // octant 4
-            else
-                return ANG270 - 1 - tantoangle[SlopeDiv(x, y)]; // octant 5
-        }
-    }
-
-    return 0;
-}
-
-
-angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
-{
-    viewx = x1;
-    viewy = y1;
-    return R_PointToAngle(x2, y2);
-}
-
-
-fixed_t R_PointToDist(fixed_t x, fixed_t y)
-{
-    int angle;
-    fixed_t dx, dy, temp;
-    fixed_t dist;
-
-    dx = abs(x - viewx);
-    dy = abs(y - viewy);
-
-    if (dy > dx)
-    {
-        temp = dx;
-        dx = dy;
-        dy = temp;
-    }
-
-    angle =
-        (tantoangle[FixedDiv(dy, dx) >> DBITS] + ANG90) >> ANGLETOFINESHIFT;
-
-    dist = FixedDiv(dx, finesine[angle]);       // use as cosine
-
-    return dist;
-}
-
-
-
-/*
-=================
-=
-= R_InitPointToAngle
-=
-=================
-*/
-
-void R_InitPointToAngle(void)
-{
-// now getting from tables.c
-#if 0
-    int i;
-    long t;
-    float f;
-//
-// slope (tangent) to angle lookup
-//
-    for (i = 0; i <= SLOPERANGE; i++)
-    {
-        f = atan((float) i / SLOPERANGE) / (3.141592657 * 2);
-        t = 0xffffffff * f;
-        tantoangle[i] = t;
-    }
-#endif
-}
-
-//=============================================================================
-
-/*
-================
-=
-= R_ScaleFromGlobalAngle
-=
-= Returns the texture mapping scale for the current line at the given angle
-= rw_distance must be calculated first
-================
-*/
-
-fixed_t R_ScaleFromGlobalAngle(angle_t visangle)
-{
-    fixed_t scale;
-    int anglea, angleb;
-    int sinea, sineb;
-    fixed_t num, den;
-
-#if 0
-    {
-        fixed_t dist, z;
-        fixed_t sinv, cosv;
-
-        sinv = finesine[(visangle - rw_normalangle) >> ANGLETOFINESHIFT];
-        dist = FixedDiv(rw_distance, sinv);
-        cosv = finecosine[(viewangle - visangle) >> ANGLETOFINESHIFT];
-        z = abs(FixedMul(dist, cosv));
-        scale = FixedDiv(projection, z);
-        return scale;
-    }
-#endif
-
-    anglea = ANG90 + (visangle - viewangle);
-    angleb = ANG90 + (visangle - rw_normalangle);
-// bothe sines are allways positive
-    sinea = finesine[anglea >> ANGLETOFINESHIFT];
-    sineb = finesine[angleb >> ANGLETOFINESHIFT];
-    num = FixedMul(projection, sineb) << detailshift;
-    den = FixedMul(rw_distance, sinea);
-    if (den > num >> 16)
-    {
-        scale = FixedDiv(num, den);
-        if (scale > 64 * FRACUNIT)
-            scale = 64 * FRACUNIT;
-        else if (scale < 256)
-            scale = 256;
-    }
-    else
-        scale = 64 * FRACUNIT;
-
-    return scale;
-}
-
-
-
-/*
-=================
-=
-= R_InitTables
-=
-=================
-*/
-
-void R_InitTables(void)
-{
-// now getting from tables.c
-#if 0
-    int i;
-    float a, fv;
-    int t;
-
-//
-// viewangle tangent table
-//
-    for (i = 0; i < FINEANGLES / 2; i++)
-    {
-        a = (i - FINEANGLES / 4 + 0.5) * PI * 2 / FINEANGLES;
-        fv = FRACUNIT * tan(a);
-        t = fv;
-        finetangent[i] = t;
-    }
-
-//
-// finesine table
-//
-    for (i = 0; i < 5 * FINEANGLES / 4; i++)
-    {
-// OPTIMIZE: mirror...
-        a = (i + 0.5) * PI * 2 / FINEANGLES;
-        t = FRACUNIT * sin(a);
-        finesine[i] = t;
-    }
-#endif
-
-}
-
-
-/*
-=================
-=
-= R_InitTextureMapping
-=
-=================
-*/
-
-void R_InitTextureMapping(void)
-{
-    int i;
-    int x;
-    int t;
-    fixed_t focallength;
-
-
-//
-// use tangent table to generate viewangletox
-// viewangletox will give the next greatest x after the view angle
-//
-    // calc focallength so FIELDOFVIEW angles covers SCREENWIDTH
-    focallength =
-        FixedDiv(centerxfrac, finetangent[FINEANGLES / 4 + FIELDOFVIEW / 2]);
-
-    for (i = 0; i < FINEANGLES / 2; i++)
-    {
-        if (finetangent[i] > FRACUNIT * 2)
-            t = -1;
-        else if (finetangent[i] < -FRACUNIT * 2)
-            t = viewwidth + 1;
-        else
-        {
-            t = FixedMul(finetangent[i], focallength);
-            t = (centerxfrac - t + FRACUNIT - 1) >> FRACBITS;
-            if (t < -1)
-                t = -1;
-            else if (t > viewwidth + 1)
-                t = viewwidth + 1;
-        }
-        viewangletox[i] = t;
-    }
-
-//
-// scan viewangletox[] to generate xtoviewangleangle[]
-//
-// xtoviewangle will give the smallest view angle that maps to x
-    for (x = 0; x <= viewwidth; x++)
-    {
-        i = 0;
-        while (viewangletox[i] > x)
-            i++;
-        xtoviewangle[x] = (i << ANGLETOFINESHIFT) - ANG90;
-    }
-
-//
-// take out the fencepost cases from viewangletox
-//
-    for (i = 0; i < FINEANGLES / 2; i++)
-    {
-        t = FixedMul(finetangent[i], focallength);
-        t = centerx - t;
-        if (viewangletox[i] == -1)
-            viewangletox[i] = 0;
-        else if (viewangletox[i] == viewwidth + 1)
-            viewangletox[i] = viewwidth;
-    }
-
-    clipangle = xtoviewangle[0];
-}
-
-//=============================================================================
-
-/*
-====================
-=
-= R_InitLightTables
-=
-= Only inits the zlight table, because the scalelight table changes
-= with view size
-=
-====================
-*/
-
-#define		DISTMAP	2
-
-void R_InitLightTables(void)
-{
-    int i, j, level, startmap;
-    int scale;
-
-//
-// Calculate the light levels to use for each level / distance combination
-//
-    for (i = 0; i < LIGHTLEVELS; i++)
-    {
-        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
-        for (j = 0; j < MAXLIGHTZ; j++)
-        {
-            scale =
-                FixedDiv((SCREENWIDTH / 2 * FRACUNIT),
-                         (j + 1) << LIGHTZSHIFT);
-            scale >>= LIGHTSCALESHIFT;
-            level = startmap - scale / DISTMAP;
-            if (level < 0)
-                level = 0;
-            if (level >= NUMCOLORMAPS)
-                level = NUMCOLORMAPS - 1;
-            zlight[i][j] = colormaps + level * 256;
-        }
-    }
-}
-
-
-/*
-==============
-=
-= R_SetViewSize
-=
-= Don't really change anything here, because i might be in the middle of
-= a refresh.  The change will take effect next refresh.
-=
-==============
-*/
-
-boolean setsizeneeded;
-int setblocks, setdetail;
-
-void R_SetViewSize(int blocks, int detail)
-{
-    setsizeneeded = true;
-    setblocks = blocks;
-    setdetail = detail;
-}
-
-/*
-==============
-=
-= R_ExecuteSetViewSize
-=
-==============
-*/
-
-void R_ExecuteSetViewSize(void)
-{
-    fixed_t cosadj, dy;
-    int i, j, level, startmap;
-
-    setsizeneeded = false;
-
-    if (setblocks == 11)
-    {
-        scaledviewwidth = SCREENWIDTH;
-        viewheight = SCREENHEIGHT;
-    }
-    else
-    {
-        scaledviewwidth = setblocks * 32;
-        viewheight = (setblocks * 161 / 10);
-    }
-
-    detailshift = setdetail;
-    viewwidth = scaledviewwidth >> detailshift;
-
-    centery = viewheight / 2;
-    centerx = viewwidth / 2;
-    centerxfrac = centerx << FRACBITS;
-    centeryfrac = centery << FRACBITS;
-    projection = centerxfrac;
-
-    if (!detailshift)
-    {
-        colfunc = basecolfunc = R_DrawColumn;
-        tlcolfunc = R_DrawTLColumn;
-        transcolfunc = R_DrawTranslatedColumn;
-        spanfunc = R_DrawSpan;
-    }
-    else
-    {
-        colfunc = basecolfunc = R_DrawColumnLow;
-        tlcolfunc = R_DrawTLColumn;
-        transcolfunc = R_DrawTranslatedColumn;
-        spanfunc = R_DrawSpanLow;
-    }
-
-    R_InitBuffer(scaledviewwidth, viewheight);
-
-    R_InitTextureMapping();
-
-//
-// psprite scales
-//
-    pspritescale = FRACUNIT * viewwidth / SCREENWIDTH;
-    pspriteiscale = FRACUNIT * SCREENWIDTH / viewwidth;
-
-//
-// thing clipping
-//
-    for (i = 0; i < viewwidth; i++)
-        screenheightarray[i] = viewheight;
-
-//
-// planes
-//
-    for (i = 0; i < viewheight; i++)
-    {
-        dy = ((i - viewheight / 2) << FRACBITS) + FRACUNIT / 2;
-        dy = abs(dy);
-        yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT, dy);
-    }
-
-    for (i = 0; i < viewwidth; i++)
-    {
-        cosadj = abs(finecosine[xtoviewangle[i] >> ANGLETOFINESHIFT]);
-        distscale[i] = FixedDiv(FRACUNIT, cosadj);
-    }
-
-//
-// Calculate the light levels to use for each level / scale combination
-//
-    for (i = 0; i < LIGHTLEVELS; i++)
-    {
-        startmap = ((LIGHTLEVELS - 1 - i) * 2) * NUMCOLORMAPS / LIGHTLEVELS;
-        for (j = 0; j < MAXLIGHTSCALE; j++)
-        {
-            level =
-                startmap -
-                j * SCREENWIDTH / (viewwidth << detailshift) / DISTMAP;
-            if (level < 0)
-                level = 0;
-            if (level >= NUMCOLORMAPS)
-                level = NUMCOLORMAPS - 1;
-            scalelight[i][j] = colormaps + level * 256;
-        }
-    }
-
-//
-// draw the border
-//
-    R_DrawViewBorder();         // erase old menu stuff
-}
-
-
-/*
-==============
-=
-= R_Init
-=
-==============
-*/
-
-int detailLevel;
-int screenblocks = 10;
-
-void R_Init(void)
-{
-    R_InitData();
-    R_InitPointToAngle();
-    R_InitTables();
-    // viewwidth / viewheight / detailLevel are set by the defaults
-    R_SetViewSize(screenblocks, detailLevel);
-    R_InitPlanes();
-    R_InitLightTables();
-    R_InitSkyMap();
-    R_InitTranslationTables();
-    framecount = 0;
-}
-
-/*
-==============
-=
-= R_PointInSubsector
-=
-==============
-*/
-
-subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
-{
-    node_t *node;
-    int side, nodenum;
-
-    if (!numnodes)              // single subsector is a special case
-        return subsectors;
-
-    nodenum = numnodes - 1;
-
-    while (!(nodenum & NF_SUBSECTOR))
-    {
-        node = &nodes[nodenum];
-        side = R_PointOnSide(x, y, node);
-        nodenum = node->children[side];
-    }
-
-    return &subsectors[nodenum & ~NF_SUBSECTOR];
-
-}
-
-//----------------------------------------------------------------------------
-//
-// PROC R_SetupFrame
-//
-//----------------------------------------------------------------------------
-
-void R_SetupFrame(player_t * player)
-{
-    int i;
-    int tableAngle;
-    int tempCentery;
-    int intensity;
-
-    //drawbsp = 1;
-    viewplayer = player;
-    // haleyjd: removed WATCOMC
-    // haleyjd FIXME: viewangleoffset handling?
-    viewangle = player->mo->angle + viewangleoffset;
-    tableAngle = viewangle >> ANGLETOFINESHIFT;
-    viewx = player->mo->x;
-    viewy = player->mo->y;
-
-    if (localQuakeHappening[displayplayer] && !paused)
-    {
-        intensity = localQuakeHappening[displayplayer];
-        viewx += ((M_Random() % (intensity << 2))
-                  - (intensity << 1)) << FRACBITS;
-        viewy += ((M_Random() % (intensity << 2))
-                  - (intensity << 1)) << FRACBITS;
-    }
-
-    extralight = player->extralight;
-    viewz = player->viewz;
-
-    tempCentery = viewheight / 2 + (player->lookdir) * screenblocks / 10;
-    if (centery != tempCentery)
-    {
-        centery = tempCentery;
-        centeryfrac = centery << FRACBITS;
-        for (i = 0; i < viewheight; i++)
-        {
-            yslope[i] = FixedDiv((viewwidth << detailshift) / 2 * FRACUNIT,
-                                 abs(((i - centery) << FRACBITS) +
-                                     FRACUNIT / 2));
-        }
-    }
-    viewsin = finesine[tableAngle];
-    viewcos = finecosine[tableAngle];
-    sscount = 0;
-    if (player->fixedcolormap)
-    {
-        fixedcolormap = colormaps + player->fixedcolormap
-            * 256 * sizeof(lighttable_t);
-        walllights = scalelightfixed;
-        for (i = 0; i < MAXLIGHTSCALE; i++)
-        {
-            scalelightfixed[i] = fixedcolormap;
-        }
-    }
-    else
-    {
-        fixedcolormap = 0;
-    }
-    framecount++;
-    validcount++;
-    if (BorderNeedRefresh)
-    {
-        if (setblocks < 10)
-        {
-            R_DrawViewBorder();
-        }
-        BorderNeedRefresh = false;
-        BorderTopRefresh = false;
-        UpdateState |= I_FULLSCRN;
-    }
-    if (BorderTopRefresh)
-    {
-        if (setblocks < 10)
-        {
-            R_DrawTopBorder();
-        }
-        BorderTopRefresh = false;
-        UpdateState |= I_MESSAGES;
-    }
-
-#if 0
-    {
-        static int frame;
-        memset(screen, frame, SCREENWIDTH * SCREENHEIGHT);
-        frame++;
-    }
-#endif
-}
-
-/*
-==============
-=
-= R_RenderView
-=
-==============
-*/
-
-void R_RenderPlayerView(player_t * player)
-{
-    R_SetupFrame(player);
-    R_ClearClipSegs();
-    R_ClearDrawSegs();
-    R_ClearPlanes();
-    R_ClearSprites();
-    NetUpdate();                // check for new console commands
-
-    // Make displayed player invisible locally
-    if (localQuakeHappening[displayplayer] && gamestate == GS_LEVEL)
-    {
-        players[displayplayer].mo->flags2 |= MF2_DONTDRAW;
-        R_RenderBSPNode(numnodes - 1);  // head node is the last node output
-        players[displayplayer].mo->flags2 &= ~MF2_DONTDRAW;
-    }
-    else
-    {
-        R_RenderBSPNode(numnodes - 1);  // head node is the last node output
-    }
-
-    NetUpdate();                // check for new console commands
-    R_DrawPlanes();
-    NetUpdate();                // check for new console commands
-    R_DrawMasked();
-    NetUpdate();                // check for new console commands
-}
diff --git a/games/NXDoom/src/hexen/r_plane.c b/games/NXDoom/src/hexen/r_plane.c
deleted file mode 100644
index 8acbcc43c..000000000
--- a/games/NXDoom/src/hexen/r_plane.c
+++ /dev/null
@@ -1,579 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "i_system.h"
-#include "r_local.h"
-#include "p_spec.h"
-
-
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-int Sky1Texture;
-int Sky2Texture;
-fixed_t Sky1ColumnOffset;
-fixed_t Sky2ColumnOffset;
-int skyflatnum;
-int skytexturemid;
-fixed_t skyiscale;
-boolean DoubleSky;
-planefunction_t floorfunc, ceilingfunc;
-
-// Opening
-visplane_t visplanes[MAXVISPLANES], *lastvisplane;
-visplane_t *floorplane, *ceilingplane;
-short openings[MAXOPENINGS], *lastopening;
-
-// Clip values are the solid pixel bounding the range.
-// floorclip start out SCREENHEIGHT
-// ceilingclip starts out -1
-short floorclip[SCREENWIDTH];
-short ceilingclip[SCREENWIDTH];
-
-// spanstart holds the start of a plane span, initialized to 0
-int spanstart[SCREENHEIGHT];
-int spanstop[SCREENHEIGHT];
-
-// Texture mapping
-lighttable_t **planezlight;
-fixed_t planeheight;
-fixed_t yslope[SCREENHEIGHT];
-fixed_t distscale[SCREENWIDTH];
-fixed_t basexscale, baseyscale;
-fixed_t cachedheight[SCREENHEIGHT];
-fixed_t cacheddistance[SCREENHEIGHT];
-fixed_t cachedxstep[SCREENHEIGHT];
-fixed_t cachedystep[SCREENHEIGHT];
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// R_InitSky
-//
-// Called at level load.
-//
-//==========================================================================
-
-void R_InitSky(int map)
-{
-    Sky1Texture = P_GetMapSky1Texture(map);
-    Sky2Texture = P_GetMapSky2Texture(map);
-    Sky1ScrollDelta = P_GetMapSky1ScrollDelta(map);
-    Sky2ScrollDelta = P_GetMapSky2ScrollDelta(map);
-    Sky1ColumnOffset = 0;
-    Sky2ColumnOffset = 0;
-    DoubleSky = P_GetMapDoubleSky(map);
-}
-
-//==========================================================================
-//
-// R_InitSkyMap
-//
-// Called whenever the view size changes.
-//
-//==========================================================================
-
-void R_InitSkyMap(void)
-{
-    skyflatnum = R_FlatNumForName("F_SKY");
-    skytexturemid = 200 * FRACUNIT;
-    skyiscale = FRACUNIT;
-}
-
-//==========================================================================
-//
-// R_InitPlanes
-//
-// Called at game startup.
-//
-//==========================================================================
-
-void R_InitPlanes(void)
-{
-}
-
-//==========================================================================
-//
-// R_MapPlane
-//
-// Globals used: planeheight, ds_source, basexscale, baseyscale,
-// viewx, viewy.
-//
-//==========================================================================
-
-void R_MapPlane(int y, int x1, int x2)
-{
-    angle_t angle;
-    fixed_t distance, length;
-    unsigned index;
-
-#ifdef RANGECHECK
-    if (x2 < x1 || x1 < 0 || x2 >= viewwidth || (unsigned) y > viewheight)
-    {
-        I_Error("R_MapPlane: %i, %i at %i", x1, x2, y);
-    }
-#endif
-
-    if (planeheight != cachedheight[y])
-    {
-        cachedheight[y] = planeheight;
-        distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
-        ds_xstep = cachedxstep[y] = FixedMul(distance, basexscale);
-        ds_ystep = cachedystep[y] = FixedMul(distance, baseyscale);
-    }
-    else
-    {
-        distance = cacheddistance[y];
-        ds_xstep = cachedxstep[y];
-        ds_ystep = cachedystep[y];
-    }
-
-    length = FixedMul(distance, distscale[x1]);
-    angle = (viewangle + xtoviewangle[x1]) >> ANGLETOFINESHIFT;
-    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
-    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
-
-    if (fixedcolormap)
-    {
-        ds_colormap = fixedcolormap;
-    }
-    else
-    {
-        index = distance >> LIGHTZSHIFT;
-        if (index >= MAXLIGHTZ)
-        {
-            index = MAXLIGHTZ - 1;
-        }
-        ds_colormap = planezlight[index];
-    }
-
-    ds_y = y;
-    ds_x1 = x1;
-    ds_x2 = x2;
-
-    spanfunc();                 // High or low detail
-}
-
-//==========================================================================
-//
-// R_ClearPlanes
-//
-// Called at the beginning of each frame.
-//
-//==========================================================================
-
-void R_ClearPlanes(void)
-{
-    int i;
-    angle_t angle;
-
-    // Opening / clipping determination
-    for (i = 0; i < viewwidth; i++)
-    {
-        floorclip[i] = viewheight;
-        ceilingclip[i] = -1;
-    }
-
-    lastvisplane = visplanes;
-    lastopening = openings;
-
-    // Texture calculation
-    memset(cachedheight, 0, sizeof(cachedheight));
-    angle = (viewangle - ANG90) >> ANGLETOFINESHIFT;    // left to right mapping
-    // Scale will be unit scale at SCREENWIDTH/2 distance
-    basexscale = FixedDiv(finecosine[angle], centerxfrac);
-    baseyscale = -FixedDiv(finesine[angle], centerxfrac);
-}
-
-//==========================================================================
-//
-// R_FindPlane
-//
-//==========================================================================
-
-visplane_t *R_FindPlane(fixed_t height, int picnum,
-                        int lightlevel, int special)
-{
-    visplane_t *check;
-
-    if (special < 150)
-    {                           // Don't let low specials affect search
-        special = 0;
-    }
-
-    if (picnum == skyflatnum)
-    {                           // All skies map together
-        height = 0;
-        lightlevel = 0;
-    }
-
-    for (check = visplanes; check < lastvisplane; check++)
-    {
-        if (height == check->height
-            && picnum == check->picnum
-            && lightlevel == check->lightlevel && special == check->special)
-            break;
-    }
-
-    if (check < lastvisplane)
-    {
-        return (check);
-    }
-
-    if (lastvisplane - visplanes == MAXVISPLANES)
-    {
-        I_Error("R_FindPlane: no more visplanes");
-    }
-
-    lastvisplane++;
-    check->height = height;
-    check->picnum = picnum;
-    check->lightlevel = lightlevel;
-    check->special = special;
-    check->minx = SCREENWIDTH;
-    check->maxx = -1;
-    memset(check->top, 0xff, sizeof(check->top));
-    return (check);
-}
-
-//==========================================================================
-//
-// R_CheckPlane
-//
-//==========================================================================
-
-visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop)
-{
-    int intrl, intrh;
-    int unionl, unionh;
-    int x;
-
-    if (start < pl->minx)
-    {
-        intrl = pl->minx;
-        unionl = start;
-    }
-    else
-    {
-        unionl = pl->minx;
-        intrl = start;
-    }
-    if (stop > pl->maxx)
-    {
-        intrh = pl->maxx;
-        unionh = stop;
-    }
-    else
-    {
-        unionh = pl->maxx;
-        intrh = stop;
-    }
-
-    for (x = intrl; x <= intrh; x++)
-    {
-        if (pl->top[x] != 0xff)
-        {
-            break;
-        }
-    }
-
-    if (x > intrh)
-    {
-        pl->minx = unionl;
-        pl->maxx = unionh;
-        return pl;              // use the same visplane
-    }
-
-    // Make a new visplane
-    lastvisplane->height = pl->height;
-    lastvisplane->picnum = pl->picnum;
-    lastvisplane->lightlevel = pl->lightlevel;
-    lastvisplane->special = pl->special;
-    pl = lastvisplane++;
-    pl->minx = start;
-    pl->maxx = stop;
-    memset(pl->top, 0xff, sizeof(pl->top));
-
-    return pl;
-}
-
-//==========================================================================
-//
-// R_MakeSpans
-//
-//==========================================================================
-
-void R_MakeSpans(int x, int t1, int b1, int t2, int b2)
-{
-    while (t1 < t2 && t1 <= b1)
-    {
-        R_MapPlane(t1, spanstart[t1], x - 1);
-        t1++;
-    }
-    while (b1 > b2 && b1 >= t1)
-    {
-        R_MapPlane(b1, spanstart[b1], x - 1);
-        b1--;
-    }
-    while (t2 < t1 && t2 <= b2)
-    {
-        spanstart[t2] = x;
-        t2++;
-    }
-    while (b2 > b1 && b2 >= t2)
-    {
-        spanstart[b2] = x;
-        b2--;
-    }
-}
-
-//==========================================================================
-//
-// R_DrawPlanes
-//
-//==========================================================================
-
-#define SKYTEXTUREMIDSHIFTED 200
-
-void R_DrawPlanes(void)
-{
-    visplane_t *pl;
-    int light;
-    int x, stop;
-    int angle;
-    byte *tempSource;
-    byte *source;
-    byte *source2;
-    byte *dest;
-    int count;
-    int offset;
-    int skyTexture;
-    int offset2;
-    int skyTexture2;
-    int scrollOffset;
-
-#ifdef RANGECHECK
-    if (ds_p - drawsegs > MAXDRAWSEGS)
-    {
-        I_Error("R_DrawPlanes: drawsegs overflow (%td)",
-                ds_p - drawsegs);
-    }
-    if (lastvisplane - visplanes > MAXVISPLANES)
-    {
-        I_Error("R_DrawPlanes: visplane overflow (%td)",
-                lastvisplane - visplanes);
-    }
-    if (lastopening - openings > MAXOPENINGS)
-    {
-        I_Error("R_DrawPlanes: opening overflow (%td)",
-                lastopening - openings);
-    }
-#endif
-
-    for (pl = visplanes; pl < lastvisplane; pl++)
-    {
-        if (pl->minx > pl->maxx)
-        {
-            continue;
-        }
-        if (pl->picnum == skyflatnum)
-        {                       // Sky flat
-            if (DoubleSky)
-            {                   // Render 2 layers, sky 1 in front
-                offset = Sky1ColumnOffset >> 16;
-                skyTexture = texturetranslation[Sky1Texture];
-                offset2 = Sky2ColumnOffset >> 16;
-                skyTexture2 = texturetranslation[Sky2Texture];
-                for (x = pl->minx; x <= pl->maxx; x++)
-                {
-                    dc_yl = pl->top[x];
-                    dc_yh = pl->bottom[x];
-                    if (dc_yl <= dc_yh)
-                    {
-                        count = dc_yh - dc_yl;
-                        if (count < 0)
-                        {
-                            return;
-                        }
-                        angle = (viewangle + xtoviewangle[x])
-                            >> ANGLETOSKYSHIFT;
-                        source = R_GetColumn(skyTexture, angle + offset)
-                            + SKYTEXTUREMIDSHIFTED + (dc_yl - centery);
-                        source2 = R_GetColumn(skyTexture2, angle + offset2)
-                            + SKYTEXTUREMIDSHIFTED + (dc_yl - centery);
-                        dest = ylookup[dc_yl] + columnofs[x];
-                        do
-                        {
-                            if (*source)
-                            {
-                                *dest = *source++;
-                                source2++;
-                            }
-                            else
-                            {
-                                *dest = *source2++;
-                                source++;
-                            }
-                            dest += SCREENWIDTH;
-                        }
-                        while (count--);
-                    }
-                }
-                continue;       // Next visplane
-            }
-            else
-            {                   // Render single layer
-                if (pl->special == 200)
-                {               // Use sky 2
-                    offset = Sky2ColumnOffset >> 16;
-                    skyTexture = texturetranslation[Sky2Texture];
-                }
-                else
-                {               // Use sky 1
-                    offset = Sky1ColumnOffset >> 16;
-                    skyTexture = texturetranslation[Sky1Texture];
-                }
-                for (x = pl->minx; x <= pl->maxx; x++)
-                {
-                    dc_yl = pl->top[x];
-                    dc_yh = pl->bottom[x];
-                    if (dc_yl <= dc_yh)
-                    {
-                        count = dc_yh - dc_yl;
-                        if (count < 0)
-                        {
-                            return;
-                        }
-                        angle = (viewangle + xtoviewangle[x])
-                            >> ANGLETOSKYSHIFT;
-                        source = R_GetColumn(skyTexture, angle + offset)
-                            + SKYTEXTUREMIDSHIFTED + (dc_yl - centery);
-                        dest = ylookup[dc_yl] + columnofs[x];
-                        do
-                        {
-                            *dest = *source++;
-                            dest += SCREENWIDTH;
-                        }
-                        while (count--);
-                    }
-                }
-                continue;       // Next visplane
-            }
-        }
-        // Regular flat
-        tempSource = W_CacheLumpNum(firstflat +
-                                    flattranslation[pl->picnum], PU_STATIC);
-        scrollOffset = leveltime >> 1 & 63;
-        switch (pl->special)
-        {                       // Handle scrolling flats
-            case 201:
-            case 202:
-            case 203:          // Scroll_North_xxx
-                ds_source = tempSource + ((scrollOffset
-                                           << (pl->special - 201) & 63) << 6);
-                break;
-            case 204:
-            case 205:
-            case 206:          // Scroll_East_xxx
-                ds_source = tempSource + ((63 - scrollOffset)
-                                          << (pl->special - 204) & 63);
-                break;
-            case 207:
-            case 208:
-            case 209:          // Scroll_South_xxx
-                ds_source = tempSource + (((63 - scrollOffset)
-                                           << (pl->special - 207) & 63) << 6);
-                break;
-            case 210:
-            case 211:
-            case 212:          // Scroll_West_xxx
-                ds_source = tempSource + (scrollOffset
-                                          << (pl->special - 210) & 63);
-                break;
-            case 213:
-            case 214:
-            case 215:          // Scroll_NorthWest_xxx
-                ds_source = tempSource + (scrollOffset
-                                          << (pl->special - 213) & 63) +
-                    ((scrollOffset << (pl->special - 213) & 63) << 6);
-                break;
-            case 216:
-            case 217:
-            case 218:          // Scroll_NorthEast_xxx
-                ds_source = tempSource + ((63 - scrollOffset)
-                                          << (pl->special - 216) & 63) +
-                    ((scrollOffset << (pl->special - 216) & 63) << 6);
-                break;
-            case 219:
-            case 220:
-            case 221:          // Scroll_SouthEast_xxx
-                ds_source = tempSource + ((63 - scrollOffset)
-                                          << (pl->special - 219) & 63) +
-                    (((63 - scrollOffset) << (pl->special - 219) & 63) << 6);
-                break;
-            case 222:
-            case 223:
-            case 224:          // Scroll_SouthWest_xxx
-                ds_source = tempSource + (scrollOffset
-                                          << (pl->special - 222) & 63) +
-                    (((63 - scrollOffset) << (pl->special - 222) & 63) << 6);
-                break;
-            default:
-                ds_source = tempSource;
-                break;
-        }
-        planeheight = abs(pl->height - viewz);
-        light = (pl->lightlevel >> LIGHTSEGSHIFT) + extralight;
-        if (light >= LIGHTLEVELS)
-        {
-            light = LIGHTLEVELS - 1;
-        }
-        if (light < 0)
-        {
-            light = 0;
-        }
-        planezlight = zlight[light];
-
-        pl->top[pl->maxx + 1] = 0xff;
-        pl->top[pl->minx - 1] = 0xff;
-
-        stop = pl->maxx + 1;
-        for (x = pl->minx; x <= stop; x++)
-        {
-            R_MakeSpans(x, pl->top[x - 1], pl->bottom[x - 1],
-                        pl->top[x], pl->bottom[x]);
-        }
-        W_ReleaseLumpNum(firstflat + flattranslation[pl->picnum]);
-    }
-}
diff --git a/games/NXDoom/src/hexen/r_segs.c b/games/NXDoom/src/hexen/r_segs.c
deleted file mode 100644
index 003cf2eb0..000000000
--- a/games/NXDoom/src/hexen/r_segs.c
+++ /dev/null
@@ -1,654 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "i_system.h"
-#include "r_local.h"
-
-// OPTIMIZE: closed two sided lines as single sided
-
-boolean segtextured;            // true if any of the segs textures might be vis
-boolean markfloor;              // false if the back side is the same plane
-boolean markceiling;
-boolean maskedtexture;
-int toptexture, bottomtexture, midtexture;
-
-
-angle_t rw_normalangle;
-int rw_angle1;                  // angle to line origin
-
-//
-// wall
-//
-int rw_x;
-int rw_stopx;
-angle_t rw_centerangle;
-fixed_t rw_offset;
-fixed_t rw_distance;
-fixed_t rw_scale;
-fixed_t rw_scalestep;
-fixed_t rw_midtexturemid;
-fixed_t rw_toptexturemid;
-fixed_t rw_bottomtexturemid;
-
-int worldtop, worldbottom, worldhigh, worldlow;
-
-fixed_t pixhigh, pixlow;
-fixed_t pixhighstep, pixlowstep;
-fixed_t topfrac, topstep;
-fixed_t bottomfrac, bottomstep;
-
-
-lighttable_t **walllights;
-
-short *maskedtexturecol;
-
-/*
-================
-=
-= R_RenderMaskedSegRange
-=
-================
-*/
-
-void R_RenderMaskedSegRange(drawseg_t * ds, int x1, int x2)
-{
-    unsigned index;
-    column_t *col;
-    int lightnum;
-    int texnum;
-
-//
-// calculate light table
-// use different light tables for horizontal / vertical / diagonal
-// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-    curline = ds->curline;
-    frontsector = curline->frontsector;
-    backsector = curline->backsector;
-    texnum = texturetranslation[curline->sidedef->midtexture];
-
-    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
-    //if (curline->v1->y == curline->v2->y)
-    //      lightnum--;
-    //else if (curline->v1->x == curline->v2->x)
-    //      lightnum++;
-    //if (lightnum < 0)
-    //      walllights = scalelight[0];
-    if (lightnum >= LIGHTLEVELS)
-        walllights = scalelight[LIGHTLEVELS - 1];
-    else
-        walllights = scalelight[lightnum];
-
-    maskedtexturecol = ds->maskedtexturecol;
-
-    rw_scalestep = ds->scalestep;
-    spryscale = ds->scale1 + (x1 - ds->x1) * rw_scalestep;
-    mfloorclip = ds->sprbottomclip;
-    mceilingclip = ds->sprtopclip;
-
-//
-// find positioning
-//
-    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
-    {
-        dc_texturemid = frontsector->floorheight > backsector->floorheight
-            ? frontsector->floorheight : backsector->floorheight;
-        dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
-    }
-    else
-    {
-        dc_texturemid = frontsector->ceilingheight < backsector->ceilingheight
-            ? frontsector->ceilingheight : backsector->ceilingheight;
-        dc_texturemid = dc_texturemid - viewz;
-    }
-    dc_texturemid += curline->sidedef->rowoffset;
-
-    if (fixedcolormap)
-        dc_colormap = fixedcolormap;
-//
-// draw the columns
-//
-    for (dc_x = x1; dc_x <= x2; dc_x++)
-    {
-        // calculate lighting
-        if (maskedtexturecol[dc_x] != SHRT_MAX)
-        {
-            if (!fixedcolormap)
-            {
-                index = spryscale >> LIGHTSCALESHIFT;
-                if (index >= MAXLIGHTSCALE)
-                    index = MAXLIGHTSCALE - 1;
-                dc_colormap = walllights[index];
-            }
-
-            sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-            dc_iscale = 0xffffffffu / (unsigned) spryscale;
-
-            //
-            // draw the texture
-            //
-            col = (column_t *) ((byte *)
-                                R_GetColumn(texnum,
-                                            maskedtexturecol[dc_x]) - 3);
-
-            R_DrawMaskedColumn(col, -1);
-            maskedtexturecol[dc_x] = SHRT_MAX;
-        }
-        spryscale += rw_scalestep;
-    }
-
-}
-
-/*
-================
-=
-= R_RenderSegLoop
-=
-= Draws zero, one, or two textures (and possibly a masked texture) for walls
-= Can draw or mark the starting pixel of floor and ceiling textures
-=
-= CALLED: CORE LOOPING ROUTINE
-================
-*/
-
-#define HEIGHTBITS      12
-#define HEIGHTUNIT      (1<<HEIGHTBITS)
-
-void R_RenderSegLoop(void)
-{
-    angle_t angle;
-    unsigned index;
-    int yl, yh, mid;
-    fixed_t texturecolumn;
-    int top, bottom;
-
-    texturecolumn = 0;           // shut up compiler warning
-
-    for (; rw_x < rw_stopx; rw_x++)
-    {
-//
-// mark floor / ceiling areas
-//
-        yl = (topfrac + HEIGHTUNIT - 1) >> HEIGHTBITS;
-        if (yl < ceilingclip[rw_x] + 1)
-            yl = ceilingclip[rw_x] + 1; // no space above wall
-        if (markceiling)
-        {
-            top = ceilingclip[rw_x] + 1;
-            bottom = yl - 1;
-            if (bottom >= floorclip[rw_x])
-                bottom = floorclip[rw_x] - 1;
-            if (top <= bottom)
-            {
-                ceilingplane->top[rw_x] = top;
-                ceilingplane->bottom[rw_x] = bottom;
-            }
-        }
-
-        yh = bottomfrac >> HEIGHTBITS;
-        if (yh >= floorclip[rw_x])
-            yh = floorclip[rw_x] - 1;
-        if (markfloor)
-        {
-            top = yh + 1;
-            bottom = floorclip[rw_x] - 1;
-            if (top <= ceilingclip[rw_x])
-                top = ceilingclip[rw_x] + 1;
-            if (top <= bottom)
-            {
-                floorplane->top[rw_x] = top;
-                floorplane->bottom[rw_x] = bottom;
-            }
-        }
-
-//
-// texturecolumn and lighting are independent of wall tiers
-//
-        if (segtextured)
-        {
-            // calculate texture offset
-            angle = (rw_centerangle + xtoviewangle[rw_x]) >> ANGLETOFINESHIFT;
-            texturecolumn =
-                rw_offset - FixedMul(finetangent[angle], rw_distance);
-            texturecolumn >>= FRACBITS;
-            // calculate lighting
-            index = rw_scale >> LIGHTSCALESHIFT;
-            if (index >= MAXLIGHTSCALE)
-                index = MAXLIGHTSCALE - 1;
-            dc_colormap = walllights[index];
-            dc_x = rw_x;
-            dc_iscale = 0xffffffffu / (unsigned) rw_scale;
-        }
-
-//
-// draw the wall tiers
-//
-        if (midtexture)
-        {                       // single sided line
-            dc_yl = yl;
-            dc_yh = yh;
-            dc_texturemid = rw_midtexturemid;
-            dc_source = R_GetColumn(midtexture, texturecolumn);
-            colfunc();
-            ceilingclip[rw_x] = viewheight;
-            floorclip[rw_x] = -1;
-        }
-        else
-        {                       // two sided line
-            if (toptexture)
-            {                   // top wall
-                mid = pixhigh >> HEIGHTBITS;
-                pixhigh += pixhighstep;
-                if (mid >= floorclip[rw_x])
-                    mid = floorclip[rw_x] - 1;
-                if (mid >= yl)
-                {
-                    dc_yl = yl;
-                    dc_yh = mid;
-                    dc_texturemid = rw_toptexturemid;
-                    dc_source = R_GetColumn(toptexture, texturecolumn);
-                    colfunc();
-                    ceilingclip[rw_x] = mid;
-                }
-                else
-                    ceilingclip[rw_x] = yl - 1;
-            }
-            else
-            {                   // no top wall
-                if (markceiling)
-                    ceilingclip[rw_x] = yl - 1;
-            }
-
-            if (bottomtexture)
-            {                   // bottom wall
-                mid = (pixlow + HEIGHTUNIT - 1) >> HEIGHTBITS;
-                pixlow += pixlowstep;
-                if (mid <= ceilingclip[rw_x])
-                    mid = ceilingclip[rw_x] + 1;        // no space above wall
-                if (mid <= yh)
-                {
-                    dc_yl = mid;
-                    dc_yh = yh;
-                    dc_texturemid = rw_bottomtexturemid;
-                    dc_source = R_GetColumn(bottomtexture, texturecolumn);
-                    colfunc();
-                    floorclip[rw_x] = mid;
-                }
-                else
-                    floorclip[rw_x] = yh + 1;
-            }
-            else
-            {                   // no bottom wall
-                if (markfloor)
-                    floorclip[rw_x] = yh + 1;
-            }
-
-            if (maskedtexture)
-            {                   // save texturecol for backdrawing of masked mid texture
-                maskedtexturecol[rw_x] = texturecolumn;
-            }
-        }
-
-        rw_scale += rw_scalestep;
-        topfrac += topstep;
-        bottomfrac += bottomstep;
-    }
-
-}
-
-
-
-/*
-=====================
-=
-= R_StoreWallRange
-=
-= A wall segment will be drawn between start and stop pixels (inclusive)
-=
-======================
-*/
-
-void R_StoreWallRange(int start, int stop)
-{
-    fixed_t hyp;
-    fixed_t sineval;
-    angle_t distangle, offsetangle;
-    fixed_t vtop;
-    int lightnum;
-
-    if (ds_p == &drawsegs[MAXDRAWSEGS])
-        return;                 // don't overflow and crash
-
-#ifdef RANGECHECK
-    if (start >= viewwidth || start > stop)
-        I_Error("Bad R_RenderWallRange: %i to %i", start, stop);
-#endif
-
-    sidedef = curline->sidedef;
-    linedef = curline->linedef;
-
-// mark the segment as visible for auto map
-    linedef->flags |= ML_MAPPED;
-
-//
-// calculate rw_distance for scale calculation
-//
-    rw_normalangle = curline->angle + ANG90;
-    offsetangle = abs((int) rw_normalangle - (int) rw_angle1);
-    if (offsetangle > ANG90)
-        offsetangle = ANG90;
-    distangle = ANG90 - offsetangle;
-    hyp = R_PointToDist(curline->v1->x, curline->v1->y);
-    sineval = finesine[distangle >> ANGLETOFINESHIFT];
-    rw_distance = FixedMul(hyp, sineval);
-
-
-    ds_p->x1 = rw_x = start;
-    ds_p->x2 = stop;
-    ds_p->curline = curline;
-    rw_stopx = stop + 1;
-
-//
-// calculate scale at both ends and step
-//
-    ds_p->scale1 = rw_scale =
-        R_ScaleFromGlobalAngle(viewangle + xtoviewangle[start]);
-    if (stop > start)
-    {
-        ds_p->scale2 = R_ScaleFromGlobalAngle(viewangle + xtoviewangle[stop]);
-        ds_p->scalestep = rw_scalestep =
-            (ds_p->scale2 - rw_scale) / (stop - start);
-    }
-    else
-    {
-        //
-        // try to fix the stretched line bug
-        //
-#if 0
-        if (rw_distance < FRACUNIT / 2)
-        {
-            fixed_t trx, try;
-            fixed_t gxt, gyt;
-
-            trx = curline->v1->x - viewx;
-            try = curline->v1->y - viewy;
-
-            gxt = FixedMul(trx, viewcos);
-            gyt = -FixedMul(try, viewsin);
-            ds_p->scale1 = FixedDiv(projection, gxt - gyt);
-        }
-#endif
-        ds_p->scale2 = ds_p->scale1;
-    }
-
-
-//
-// calculate texture boundaries and decide if floor / ceiling marks
-// are needed
-//
-    worldtop = frontsector->ceilingheight - viewz;
-    worldbottom = frontsector->floorheight - viewz;
-
-    midtexture = toptexture = bottomtexture = maskedtexture = 0;
-    ds_p->maskedtexturecol = NULL;
-
-    if (!backsector)
-    {
-//
-// single sided line
-//
-        midtexture = texturetranslation[sidedef->midtexture];
-        // a single sided line is terminal, so it must mark ends
-        markfloor = markceiling = true;
-        if (linedef->flags & ML_DONTPEGBOTTOM)
-        {
-            vtop = frontsector->floorheight +
-                textureheight[sidedef->midtexture];
-            rw_midtexturemid = vtop - viewz;    // bottom of texture at bottom
-        }
-        else
-            rw_midtexturemid = worldtop;        // top of texture at top
-        rw_midtexturemid += sidedef->rowoffset;
-        ds_p->silhouette = SIL_BOTH;
-        ds_p->sprtopclip = screenheightarray;
-        ds_p->sprbottomclip = negonearray;
-        ds_p->bsilheight = INT_MAX;
-        ds_p->tsilheight = INT_MIN;
-    }
-    else
-    {
-//
-// two sided line
-//
-        ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
-        ds_p->silhouette = 0;
-        if (frontsector->floorheight > backsector->floorheight)
-        {
-            ds_p->silhouette = SIL_BOTTOM;
-            ds_p->bsilheight = frontsector->floorheight;
-        }
-        else if (backsector->floorheight > viewz)
-        {
-            ds_p->silhouette = SIL_BOTTOM;
-            ds_p->bsilheight = INT_MAX;
-//                      ds_p->sprbottomclip = negonearray;
-        }
-        if (frontsector->ceilingheight < backsector->ceilingheight)
-        {
-            ds_p->silhouette |= SIL_TOP;
-            ds_p->tsilheight = frontsector->ceilingheight;
-        }
-        else if (backsector->ceilingheight < viewz)
-        {
-            ds_p->silhouette |= SIL_TOP;
-            ds_p->tsilheight = INT_MIN;
-//                      ds_p->sprtopclip = screenheightarray;
-        }
-
-        if (backsector->ceilingheight <= frontsector->floorheight)
-        {
-            ds_p->sprbottomclip = negonearray;
-            ds_p->bsilheight = INT_MAX;
-            ds_p->silhouette |= SIL_BOTTOM;
-        }
-        if (backsector->floorheight >= frontsector->ceilingheight)
-        {
-            ds_p->sprtopclip = screenheightarray;
-            ds_p->tsilheight = INT_MIN;
-            ds_p->silhouette |= SIL_TOP;
-        }
-        worldhigh = backsector->ceilingheight - viewz;
-        worldlow = backsector->floorheight - viewz;
-
-        // hack to allow height changes in outdoor areas
-        if (frontsector->ceilingpic == skyflatnum
-            && backsector->ceilingpic == skyflatnum)
-            worldtop = worldhigh;
-
-        if (worldlow != worldbottom
-            || backsector->floorpic != frontsector->floorpic
-            || backsector->lightlevel != frontsector->lightlevel
-            || backsector->special != frontsector->special)
-            markfloor = true;
-        else
-            markfloor = false;  // same plane on both sides
-
-        if (worldhigh != worldtop
-            || backsector->ceilingpic != frontsector->ceilingpic
-            || backsector->lightlevel != frontsector->lightlevel)
-            markceiling = true;
-        else
-            markceiling = false;        // same plane on both sides
-
-        if (backsector->ceilingheight <= frontsector->floorheight
-            || backsector->floorheight >= frontsector->ceilingheight)
-            markceiling = markfloor = true;     // closed door
-
-        if (worldhigh < worldtop)
-        {                       // top texture
-            toptexture = texturetranslation[sidedef->toptexture];
-            if (linedef->flags & ML_DONTPEGTOP)
-                rw_toptexturemid = worldtop;    // top of texture at top
-            else
-            {
-                vtop = backsector->ceilingheight +
-                    textureheight[sidedef->toptexture];
-                rw_toptexturemid = vtop - viewz;        // bottom of texture
-            }
-        }
-        if (worldlow > worldbottom)
-        {                       // bottom texture
-            bottomtexture = texturetranslation[sidedef->bottomtexture];
-            if (linedef->flags & ML_DONTPEGBOTTOM)
-            {                   // bottom of texture at bottom
-                rw_bottomtexturemid = worldtop; // top of texture at top
-            }
-            else                // top of texture at top
-                rw_bottomtexturemid = worldlow;
-        }
-        rw_toptexturemid += sidedef->rowoffset;
-        rw_bottomtexturemid += sidedef->rowoffset;
-
-        //
-        // allocate space for masked texture tables
-        //
-        if (sidedef->midtexture)
-        {                       // masked midtexture
-            maskedtexture = true;
-            ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
-            lastopening += rw_stopx - rw_x;
-        }
-    }
-
-//
-// calculate rw_offset (only needed for textured lines)
-//
-    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
-
-    if (segtextured)
-    {
-        offsetangle = rw_normalangle - rw_angle1;
-        if (offsetangle > ANG180)
-            offsetangle = -offsetangle;
-        if (offsetangle > ANG90)
-            offsetangle = ANG90;
-        sineval = finesine[offsetangle >> ANGLETOFINESHIFT];
-        rw_offset = FixedMul(hyp, sineval);
-        if (rw_normalangle - rw_angle1 < ANG180)
-            rw_offset = -rw_offset;
-        rw_offset += sidedef->textureoffset + curline->offset;
-        rw_centerangle = ANG90 + viewangle - rw_normalangle;
-
-        //
-        // calculate light table
-        // use different light tables for horizontal / vertical / diagonal
-        // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-        if (!fixedcolormap)
-        {
-            lightnum =
-                (frontsector->lightlevel >> LIGHTSEGSHIFT) + extralight;
-            //if (curline->v1->y == curline->v2->y)
-            //      lightnum--;
-            //else if (curline->v1->x == curline->v2->x)
-            //      lightnum++;
-            //if (lightnum < 0)
-            //      walllights = scalelight[0];
-            if (lightnum >= LIGHTLEVELS)
-                walllights = scalelight[LIGHTLEVELS - 1];
-            else
-                walllights = scalelight[lightnum];
-        }
-    }
-
-
-//
-// if a floor / ceiling plane is on the wrong side of the view plane
-// it is definately invisible and doesn't need to be marked
-//
-    if (frontsector->floorheight >= viewz)
-        markfloor = false;      // above view plane
-    if (frontsector->ceilingheight <= viewz
-        && frontsector->ceilingpic != skyflatnum)
-        markceiling = false;    // below view plane
-
-//
-// calculate incremental stepping values for texture edges
-//
-    worldtop >>= 4;
-    worldbottom >>= 4;
-
-    topstep = -FixedMul(rw_scalestep, worldtop);
-    topfrac = (centeryfrac >> 4) - FixedMul(worldtop, rw_scale);
-
-    bottomstep = -FixedMul(rw_scalestep, worldbottom);
-    bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
-
-    if (backsector)
-    {
-        worldhigh >>= 4;
-        worldlow >>= 4;
-
-        if (worldhigh < worldtop)
-        {
-            pixhigh = (centeryfrac >> 4) - FixedMul(worldhigh, rw_scale);
-            pixhighstep = -FixedMul(rw_scalestep, worldhigh);
-        }
-        if (worldlow > worldbottom)
-        {
-            pixlow = (centeryfrac >> 4) - FixedMul(worldlow, rw_scale);
-            pixlowstep = -FixedMul(rw_scalestep, worldlow);
-        }
-    }
-
-//
-// render it
-//
-    if (markceiling)
-        ceilingplane = R_CheckPlane(ceilingplane, rw_x, rw_stopx - 1);
-    if (markfloor)
-        floorplane = R_CheckPlane(floorplane, rw_x, rw_stopx - 1);
-
-    R_RenderSegLoop();
-
-//
-// save sprite clipping info
-//
-    if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
-    {
-        memcpy(lastopening, ceilingclip + start, 2 * (rw_stopx - start));
-        ds_p->sprtopclip = lastopening - start;
-        lastopening += rw_stopx - start;
-    }
-    if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
-        && !ds_p->sprbottomclip)
-    {
-        memcpy(lastopening, floorclip + start, 2 * (rw_stopx - start));
-        ds_p->sprbottomclip = lastopening - start;
-        lastopening += rw_stopx - start;
-    }
-    if (maskedtexture && !(ds_p->silhouette & SIL_TOP))
-    {
-        ds_p->silhouette |= SIL_TOP;
-        ds_p->tsilheight = INT_MIN;
-    }
-    if (maskedtexture && !(ds_p->silhouette & SIL_BOTTOM))
-    {
-        ds_p->silhouette |= SIL_BOTTOM;
-        ds_p->bsilheight = INT_MAX;
-    }
-    ds_p++;
-}
diff --git a/games/NXDoom/src/hexen/r_things.c b/games/NXDoom/src/hexen/r_things.c
deleted file mode 100644
index e9cfeccdb..000000000
--- a/games/NXDoom/src/hexen/r_things.c
+++ /dev/null
@@ -1,1044 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "h2def.h"
-#include "i_system.h"
-#include "i_swap.h"
-#include "r_local.h"
-
-//void R_DrawTranslatedAltTLColumn(void);
-
-typedef struct
-{
-    int x1, x2;
-
-    int column;
-    int topclip;
-    int bottomclip;
-} maskdraw_t;
-
-/*
-
-Sprite rotation 0 is facing the viewer, rotation 1 is one angle turn CLOCKWISE around the axis.
-This is not the same as the angle, which increases counter clockwise
-(protractor).  There was a lot of stuff grabbed wrong, so I changed it...
-
-*/
-
-
-fixed_t pspritescale, pspriteiscale;
-
-lighttable_t **spritelights;
-
-// constant arrays used for psprite clipping and initializing clipping
-short negonearray[SCREENWIDTH];
-short screenheightarray[SCREENWIDTH];
-
-boolean LevelUseFullBright;
-/*
-===============================================================================
-
-						INITIALIZATION FUNCTIONS
-
-===============================================================================
-*/
-
-// variables used to look up and range check thing_t sprites patches
-spritedef_t *sprites;
-int numsprites;
-
-spriteframe_t sprtemp[30];
-int maxframe;
-static const char *spritename;
-
-
-
-/*
-=================
-=
-= R_InstallSpriteLump
-=
-= Local function for R_InitSprites
-=================
-*/
-
-void R_InstallSpriteLump(int lump, unsigned frame, unsigned rotation,
-                         boolean flipped)
-{
-    int r;
-
-    if (frame >= 30 || rotation > 8)
-        I_Error("R_InstallSpriteLump: Bad frame characters in lump %i", lump);
-
-    if ((int) frame > maxframe)
-        maxframe = frame;
-
-    if (rotation == 0)
-    {
-// the lump should be used for all rotations
-        if (sprtemp[frame].rotate == false)
-            I_Error("R_InitSprites: Sprite %s frame %c has multip rot=0 lump",
-                    spritename, 'A' + frame);
-        if (sprtemp[frame].rotate == true)
-            I_Error
-                ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
-                 spritename, 'A' + frame);
-
-        sprtemp[frame].rotate = false;
-        for (r = 0; r < 8; r++)
-        {
-            sprtemp[frame].lump[r] = lump - firstspritelump;
-            sprtemp[frame].flip[r] = (byte) flipped;
-        }
-        return;
-    }
-
-// the lump is only used for one rotation
-    if (sprtemp[frame].rotate == false)
-        I_Error
-            ("R_InitSprites: Sprite %s frame %c has rotations and a rot=0 lump",
-             spritename, 'A' + frame);
-
-    sprtemp[frame].rotate = true;
-
-    rotation--;                 // make 0 based
-    if (sprtemp[frame].lump[rotation] != -1)
-        I_Error
-            ("R_InitSprites: Sprite %s : %c : %c has two lumps mapped to it",
-             spritename, 'A' + frame, '1' + rotation);
-
-    sprtemp[frame].lump[rotation] = lump - firstspritelump;
-    sprtemp[frame].flip[rotation] = (byte) flipped;
-}
-
-/*
-=================
-=
-= R_InitSpriteDefs
-=
-= Pass a null terminated list of sprite names (4 chars exactly) to be used
-= Builds the sprite rotation matrixes to account for horizontally flipped
-= sprites.  Will report an error if the lumps are inconsistant
-=Only called at startup
-=
-= Sprite lump names are 4 characters for the actor, a letter for the frame,
-= and a number for the rotation, A sprite that is flippable will have an
-= additional letter/number appended.  The rotation character can be 0 to
-= signify no rotations
-=================
-*/
-
-void R_InitSpriteDefs(const char **namelist)
-{
-    const char **check;
-    int i, l, frame, rotation;
-    int start, end;
-
-// count the number of sprite names
-    check = namelist;
-    while (*check != NULL)
-        check++;
-    numsprites = check - namelist;
-
-    if (!numsprites)
-        return;
-
-    sprites = Z_Malloc(numsprites * sizeof(*sprites), PU_STATIC, NULL);
-
-    start = firstspritelump - 1;
-    end = lastspritelump + 1;
-
-// scan all the lump names for each of the names, noting the highest
-// frame letter
-// Just compare 4 characters as ints
-    for (i = 0; i < numsprites; i++)
-    {
-        spritename = namelist[i];
-        memset(sprtemp, -1, sizeof(sprtemp));
-
-        maxframe = -1;
-
-        //
-        // scan the lumps, filling in the frames for whatever is found
-        //
-        for (l = start + 1; l < end; l++)
-            if (!strncmp(lumpinfo[l]->name, namelist[i], 4))
-            {
-                frame = lumpinfo[l]->name[4] - 'A';
-                rotation = lumpinfo[l]->name[5] - '0';
-                R_InstallSpriteLump(l, frame, rotation, false);
-                if (lumpinfo[l]->name[6])
-                {
-                    frame = lumpinfo[l]->name[6] - 'A';
-                    rotation = lumpinfo[l]->name[7] - '0';
-                    R_InstallSpriteLump(l, frame, rotation, true);
-                }
-            }
-
-        //
-        // check the frames that were found for completeness
-        //
-        if (maxframe == -1)
-        {
-            //continue;
-            sprites[i].numframes = 0;
-            if (gamemode == shareware)
-                continue;
-            I_Error("R_InitSprites: No lumps found for sprite %s",
-                    namelist[i]);
-        }
-
-        maxframe++;
-        for (frame = 0; frame < maxframe; frame++)
-        {
-            switch ((int) sprtemp[frame].rotate)
-            {
-                case -1:       // no rotations were found for that frame at all
-                    I_Error("R_InitSprites: No patches found for %s frame %c",
-                            namelist[i], frame + 'A');
-                case 0:        // only the first rotation is needed
-                    break;
-
-                case 1:        // must have all 8 frames
-                    for (rotation = 0; rotation < 8; rotation++)
-                        if (sprtemp[frame].lump[rotation] == -1)
-                            I_Error
-                                ("R_InitSprites: Sprite %s frame %c is missing rotations",
-                                 namelist[i], frame + 'A');
-            }
-        }
-
-        //
-        // allocate space for the frames present and copy sprtemp to it
-        //
-        sprites[i].numframes = maxframe;
-        sprites[i].spriteframes =
-            Z_Malloc(maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
-        memcpy(sprites[i].spriteframes, sprtemp,
-               maxframe * sizeof(spriteframe_t));
-    }
-
-}
-
-
-/*
-===============================================================================
-
-							GAME FUNCTIONS
-
-===============================================================================
-*/
-
-vissprite_t vissprites[MAXVISSPRITES], *vissprite_p;
-int newvissprite;
-
-
-/*
-===================
-=
-= R_InitSprites
-=
-= Called at program start
-===================
-*/
-
-void R_InitSprites(const char **namelist)
-{
-    int i;
-
-    for (i = 0; i < SCREENWIDTH; i++)
-    {
-        negonearray[i] = -1;
-    }
-
-    R_InitSpriteDefs(namelist);
-}
-
-
-/*
-===================
-=
-= R_ClearSprites
-=
-= Called at frame start
-===================
-*/
-
-void R_ClearSprites(void)
-{
-    vissprite_p = vissprites;
-}
-
-
-/*
-===================
-=
-= R_NewVisSprite
-=
-===================
-*/
-
-vissprite_t overflowsprite;
-
-vissprite_t *R_NewVisSprite(void)
-{
-    if (vissprite_p == &vissprites[MAXVISSPRITES])
-        return &overflowsprite;
-    vissprite_p++;
-    return vissprite_p - 1;
-}
-
-
-/*
-================
-=
-= R_DrawMaskedColumn
-=
-= Used for sprites and masked mid textures
-================
-*/
-
-short *mfloorclip;
-short *mceilingclip;
-fixed_t spryscale;
-fixed_t sprtopscreen;
-fixed_t sprbotscreen;
-
-void R_DrawMaskedColumn(column_t * column, signed int baseclip)
-{
-    int topscreen, bottomscreen;
-    fixed_t basetexturemid;
-
-    basetexturemid = dc_texturemid;
-
-    for (; column->topdelta != 0xff;)
-    {
-// calculate unclipped screen coordinates for post
-        topscreen = sprtopscreen + spryscale * column->topdelta;
-        bottomscreen = topscreen + spryscale * column->length;
-        dc_yl = (topscreen + FRACUNIT - 1) >> FRACBITS;
-        dc_yh = (bottomscreen - 1) >> FRACBITS;
-
-        if (dc_yh >= mfloorclip[dc_x])
-            dc_yh = mfloorclip[dc_x] - 1;
-        if (dc_yl <= mceilingclip[dc_x])
-            dc_yl = mceilingclip[dc_x] + 1;
-
-        if (dc_yh >= baseclip && baseclip != -1)
-            dc_yh = baseclip;
-
-        if (dc_yl <= dc_yh)
-        {
-            dc_source = (byte *) column + 3;
-            dc_texturemid = basetexturemid - (column->topdelta << FRACBITS);
-//                      dc_source = (byte *)column + 3 - column->topdelta;
-            colfunc();          // either R_DrawColumn or R_DrawTLColumn
-        }
-        column = (column_t *) ((byte *) column + column->length + 4);
-    }
-
-    dc_texturemid = basetexturemid;
-}
-
-
-/*
-================
-=
-= R_DrawVisSprite
-=
-= mfloorclip and mceilingclip should also be set
-================
-*/
-
-void R_DrawVisSprite(vissprite_t * vis, int x1, int x2)
-{
-    column_t *column;
-    int texturecolumn;
-    fixed_t frac;
-    patch_t *patch;
-    fixed_t baseclip;
-
-
-    patch = W_CacheLumpNum(vis->patch + firstspritelump, PU_CACHE);
-
-    dc_colormap = vis->colormap;
-
-//      if(!dc_colormap)
-//              colfunc = tlcolfunc;  // NULL colormap = shadow draw
-
-    if (vis->mobjflags & (MF_SHADOW | MF_ALTSHADOW))
-    {
-        if (vis->mobjflags & MF_TRANSLATION)
-        {
-            colfunc = R_DrawTranslatedTLColumn;
-            dc_translation = translationtables - 256
-                + vis->class * ((maxplayers - 1) * 256) +
-                ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
-        }
-        else if (vis->mobjflags & MF_SHADOW)
-        {                       // Draw using shadow column function
-            colfunc = tlcolfunc;
-        }
-        else
-        {
-            colfunc = R_DrawAltTLColumn;
-        }
-    }
-    else if (vis->mobjflags & MF_TRANSLATION)
-    {
-        // Draw using translated column function
-        colfunc = R_DrawTranslatedColumn;
-        dc_translation = translationtables - 256
-            + vis->class * ((maxplayers - 1) * 256) +
-            ((vis->mobjflags & MF_TRANSLATION) >> (MF_TRANSSHIFT - 8));
-    }
-
-    dc_iscale = abs(vis->xiscale) >> detailshift;
-    dc_texturemid = vis->texturemid;
-    frac = vis->startfrac;
-    spryscale = vis->scale;
-
-    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-
-    // check to see if vissprite is a weapon
-    if (vis->psprite)
-    {
-        dc_texturemid += FixedMul(((centery - viewheight / 2) << FRACBITS),
-                                  vis->xiscale);
-        sprtopscreen += (viewheight / 2 - centery) << FRACBITS;
-    }
-
-    if (vis->floorclip && !vis->psprite)
-    {
-        sprbotscreen = sprtopscreen + FixedMul(SHORT(patch->height) << FRACBITS,
-                                               spryscale);
-        baseclip = (sprbotscreen - FixedMul(vis->floorclip,
-                                            spryscale)) >> FRACBITS;
-    }
-    else
-    {
-        baseclip = -1;
-    }
-
-    for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
-    {
-        texturecolumn = frac >> FRACBITS;
-#ifdef RANGECHECK
-        if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
-            I_Error("R_DrawSpriteRange: bad texturecolumn");
-#endif
-        column = (column_t *) ((byte *) patch +
-                               LONG(patch->columnofs[texturecolumn]));
-        R_DrawMaskedColumn(column, baseclip);
-    }
-
-    colfunc = basecolfunc;
-}
-
-
-
-/*
-===================
-=
-= R_ProjectSprite
-=
-= Generates a vissprite for a thing if it might be visible
-=
-===================
-*/
-
-void R_ProjectSprite(mobj_t * thing)
-{
-    fixed_t trx, try;
-    fixed_t gxt, gyt;
-    fixed_t tx, tz;
-    fixed_t xscale;
-    int x1, x2;
-    spritedef_t *sprdef;
-    spriteframe_t *sprframe;
-    int lump;
-    unsigned rot;
-    boolean flip;
-    int index;
-    vissprite_t *vis;
-    angle_t ang;
-    fixed_t iscale;
-
-    if (thing->flags2 & MF2_DONTDRAW)
-    {                           // Never make a vissprite when MF2_DONTDRAW is flagged.
-        return;
-    }
-
-//
-// transform the origin point
-//
-    trx = thing->x - viewx;
-    try = thing->y - viewy;
-
-    gxt = FixedMul(trx, viewcos);
-    gyt = -FixedMul(try, viewsin);
-    tz = gxt - gyt;
-
-    if (tz < MINZ)
-        return;                 // thing is behind view plane
-    xscale = FixedDiv(projection, tz);
-
-    gxt = -FixedMul(trx, viewsin);
-    gyt = FixedMul(try, viewcos);
-    tx = -(gyt + gxt);
-
-    if (abs(tx) > (tz << 2))
-        return;                 // too far off the side
-
-//
-// decide which patch to use for sprite reletive to player
-//
-#ifdef RANGECHECK
-    if ((unsigned) thing->sprite >= numsprites)
-        I_Error("R_ProjectSprite: invalid sprite number %i ", thing->sprite);
-#endif
-    sprdef = &sprites[thing->sprite];
-#ifdef RANGECHECK
-    if ((thing->frame & FF_FRAMEMASK) >= sprdef->numframes)
-        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
-                thing->sprite, thing->frame);
-#endif
-    sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
-
-    if (sprframe->rotate)
-    {                           // choose a different rotation based on player view
-        ang = R_PointToAngle(thing->x, thing->y);
-        rot = (ang - thing->angle + (unsigned) (ANG45 / 2) * 9) >> 29;
-        lump = sprframe->lump[rot];
-        flip = (boolean) sprframe->flip[rot];
-    }
-    else
-    {                           // use single rotation for all views
-        lump = sprframe->lump[0];
-        flip = (boolean) sprframe->flip[0];
-    }
-
-//
-// calculate edges of the shape
-//
-    tx -= spriteoffset[lump];
-    x1 = (centerxfrac + FixedMul(tx, xscale)) >> FRACBITS;
-    if (x1 > viewwidth)
-        return;                 // off the right side
-    tx += spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul(tx, xscale)) >> FRACBITS) - 1;
-    if (x2 < 0)
-        return;                 // off the left side
-
-
-//
-// store information in a vissprite
-//
-    vis = R_NewVisSprite();
-    vis->mobjflags = thing->flags;
-    vis->psprite = false;
-    vis->scale = xscale << detailshift;
-    vis->gx = thing->x;
-    vis->gy = thing->y;
-    vis->gz = thing->z;
-    vis->gzt = thing->z + spritetopoffset[lump];
-    if (thing->flags & MF_TRANSLATION)
-    {
-        if (thing->player)
-        {
-            vis->class = thing->player->class;
-        }
-        else
-        {
-            vis->class = thing->special1.i;
-        }
-        if (vis->class > 2)
-        {
-            vis->class = 0;
-        }
-    }
-    // foot clipping
-    vis->floorclip = thing->floorclip;
-    vis->texturemid = vis->gzt - viewz - vis->floorclip;
-
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
-    iscale = FixedDiv(FRACUNIT, xscale);
-    if (flip)
-    {
-        vis->startfrac = spritewidth[lump] - 1;
-        vis->xiscale = -iscale;
-    }
-    else
-    {
-        vis->startfrac = 0;
-        vis->xiscale = iscale;
-    }
-    if (vis->x1 > x1)
-        vis->startfrac += vis->xiscale * (vis->x1 - x1);
-    vis->patch = lump;
-//
-// get light level
-//
-
-//      if (thing->flags & MF_SHADOW)
-//              vis->colormap = NULL;                   // shadow draw
-//      else ...
-
-    if (fixedcolormap)
-        vis->colormap = fixedcolormap;  // fixed map
-    else if (LevelUseFullBright && thing->frame & FF_FULLBRIGHT)
-        vis->colormap = colormaps;      // full bright
-    else
-    {                           // diminished light
-        index = xscale >> (LIGHTSCALESHIFT - detailshift);
-        if (index >= MAXLIGHTSCALE)
-            index = MAXLIGHTSCALE - 1;
-        vis->colormap = spritelights[index];
-    }
-}
-
-
-
-
-/*
-========================
-=
-= R_AddSprites
-=
-========================
-*/
-
-void R_AddSprites(sector_t * sec)
-{
-    mobj_t *thing;
-    int lightnum;
-
-    if (sec->validcount == validcount)
-        return;                 // already added
-
-    sec->validcount = validcount;
-
-    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT) + extralight;
-    if (lightnum < 0)
-        spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-        spritelights = scalelight[LIGHTLEVELS - 1];
-    else
-        spritelights = scalelight[lightnum];
-
-
-    for (thing = sec->thinglist; thing; thing = thing->snext)
-        R_ProjectSprite(thing);
-}
-
-
-/*
-========================
-=
-= R_DrawPSprite
-=
-========================
-*/
-
-// Y-adjustment values for full screen (4 weapons)
-int PSpriteSY[NUMCLASSES][NUMWEAPONS] = {
-    {0, -12 * FRACUNIT, -10 * FRACUNIT, 10 * FRACUNIT}, // Fighter
-    {-8 * FRACUNIT, 10 * FRACUNIT, 10 * FRACUNIT, 0},   // Cleric
-    {9 * FRACUNIT, 20 * FRACUNIT, 20 * FRACUNIT, 20 * FRACUNIT},        // Mage 
-    {10 * FRACUNIT, 10 * FRACUNIT, 10 * FRACUNIT, 10 * FRACUNIT}        // Pig
-};
-
-void R_DrawPSprite(pspdef_t * psp)
-{
-    fixed_t tx;
-    int x1, x2;
-    spritedef_t *sprdef;
-    spriteframe_t *sprframe;
-    int lump;
-    boolean flip;
-    vissprite_t *vis, avis;
-
-    int tempangle;
-
-//
-// decide which patch to use
-//
-#ifdef RANGECHECK
-    if ((unsigned) psp->state->sprite >= numsprites)
-        I_Error("R_ProjectSprite: invalid sprite number %i ",
-                psp->state->sprite);
-#endif
-    sprdef = &sprites[psp->state->sprite];
-#ifdef RANGECHECK
-    if ((psp->state->frame & FF_FRAMEMASK) >= sprdef->numframes)
-        I_Error("R_ProjectSprite: invalid sprite frame %i : %i ",
-                psp->state->sprite, psp->state->frame);
-#endif
-    sprframe = &sprdef->spriteframes[psp->state->frame & FF_FRAMEMASK];
-
-    lump = sprframe->lump[0];
-    flip = (boolean) sprframe->flip[0];
-
-//
-// calculate edges of the shape
-//
-    tx = psp->sx - 160 * FRACUNIT;
-
-    tx -= spriteoffset[lump];
-    if (viewangleoffset)
-    {
-        tempangle =
-            ((centerxfrac / 1024) * (viewangleoffset >> ANGLETOFINESHIFT));
-    }
-    else
-    {
-        tempangle = 0;
-    }
-    x1 = (centerxfrac + FixedMul(tx, pspritescale) + tempangle) >> FRACBITS;
-    if (x1 > viewwidth)
-        return;                 // off the right side
-    tx += spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul(tx, pspritescale) +
-           tempangle) >> FRACBITS) - 1;
-    if (x2 < 0)
-        return;                 // off the left side
-
-//
-// store information in a vissprite
-//
-    vis = &avis;
-    vis->mobjflags = 0;
-    vis->class = 0;
-    vis->psprite = true;
-    vis->floorclip = 0;
-    vis->texturemid = (BASEYCENTER << FRACBITS) + FRACUNIT / 2
-        - (psp->sy - spritetopoffset[lump]);
-    if (viewheight == SCREENHEIGHT)
-    {
-        vis->texturemid -= PSpriteSY[viewplayer->class]
-            [players[consoleplayer].readyweapon];
-    }
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth - 1 : x2;
-    vis->scale = pspritescale << detailshift;
-    if (flip)
-    {
-        vis->xiscale = -pspriteiscale;
-        vis->startfrac = spritewidth[lump] - 1;
-    }
-    else
-    {
-        vis->xiscale = pspriteiscale;
-        vis->startfrac = 0;
-    }
-    if (vis->x1 > x1)
-        vis->startfrac += vis->xiscale * (vis->x1 - x1);
-    vis->patch = lump;
-
-    if (viewplayer->powers[pw_invulnerability] && viewplayer->class
-        == PCLASS_CLERIC)
-    {
-        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
-        if (viewplayer->powers[pw_invulnerability] > 4 * 32)
-        {
-            if (viewplayer->mo->flags2 & MF2_DONTDRAW)
-            {                   // don't draw the psprite
-                vis->mobjflags |= MF_SHADOW;
-            }
-            else if (viewplayer->mo->flags & MF_SHADOW)
-            {
-                vis->mobjflags |= MF_ALTSHADOW;
-            }
-        }
-        else if (viewplayer->powers[pw_invulnerability] & 8)
-        {
-            vis->mobjflags |= MF_SHADOW;
-        }
-    }
-    else if (fixedcolormap)
-    {
-        // Fixed color
-        vis->colormap = fixedcolormap;
-    }
-    else if (psp->state->frame & FF_FULLBRIGHT)
-    {
-        // Full bright
-        vis->colormap = colormaps;
-    }
-    else
-    {
-        // local light
-        vis->colormap = spritelights[MAXLIGHTSCALE - 1];
-    }
-    R_DrawVisSprite(vis, vis->x1, vis->x2);
-}
-
-/*
-========================
-=
-= R_DrawPlayerSprites
-=
-========================
-*/
-
-void R_DrawPlayerSprites(void)
-{
-    int i, lightnum;
-    pspdef_t *psp;
-
-//
-// get light level
-//
-    lightnum =
-        (viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) +
-        extralight;
-    if (lightnum < 0)
-        spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-        spritelights = scalelight[LIGHTLEVELS - 1];
-    else
-        spritelights = scalelight[lightnum];
-//
-// clip to screen bounds
-//
-    mfloorclip = screenheightarray;
-    mceilingclip = negonearray;
-
-//
-// add all active psprites
-//
-    for (i = 0, psp = viewplayer->psprites; i < NUMPSPRITES; i++, psp++)
-        if (psp->state)
-            R_DrawPSprite(psp);
-
-}
-
-
-/*
-========================
-=
-= R_SortVisSprites
-=
-========================
-*/
-
-vissprite_t vsprsortedhead;
-
-void R_SortVisSprites(void)
-{
-    int i, count;
-    vissprite_t *ds, *best;
-    static vissprite_t unsorted;
-    fixed_t bestscale;
-
-    count = vissprite_p - vissprites;
-
-    unsorted.next = unsorted.prev = &unsorted;
-    if (!count)
-        return;
-
-    for (ds = vissprites; ds < vissprite_p; ds++)
-    {
-        ds->next = ds + 1;
-        ds->prev = ds - 1;
-    }
-    vissprites[0].prev = &unsorted;
-    unsorted.next = &vissprites[0];
-    (vissprite_p - 1)->next = &unsorted;
-    unsorted.prev = vissprite_p - 1;
-
-//
-// pull the vissprites out by scale
-//
-    best = 0;                   // shut up the compiler warning
-    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
-    for (i = 0; i < count; i++)
-    {
-        bestscale = INT_MAX;
-        for (ds = unsorted.next; ds != &unsorted; ds = ds->next)
-        {
-            if (ds->scale < bestscale)
-            {
-                bestscale = ds->scale;
-                best = ds;
-            }
-        }
-        best->next->prev = best->prev;
-        best->prev->next = best->next;
-        best->next = &vsprsortedhead;
-        best->prev = vsprsortedhead.prev;
-        vsprsortedhead.prev->next = best;
-        vsprsortedhead.prev = best;
-    }
-}
-
-
-
-/*
-========================
-=
-= R_DrawSprite
-=
-========================
-*/
-
-void R_DrawSprite(vissprite_t * spr)
-{
-    drawseg_t *ds;
-    short clipbot[SCREENWIDTH], cliptop[SCREENWIDTH];
-    int x, r1, r2;
-    fixed_t scale, lowscale;
-    int silhouette;
-
-    for (x = spr->x1; x <= spr->x2; x++)
-        clipbot[x] = cliptop[x] = -2;
-
-//
-// scan drawsegs from end to start for obscuring segs
-// the first drawseg that has a greater scale is the clip seg
-//
-    for (ds = ds_p - 1; ds >= drawsegs; ds--)
-    {
-        //
-        // determine if the drawseg obscures the sprite
-        //
-        if (ds->x1 > spr->x2 || ds->x2 < spr->x1 ||
-            (!ds->silhouette && !ds->maskedtexturecol))
-            continue;           // doesn't cover sprite
-
-        r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
-        r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
-        if (ds->scale1 > ds->scale2)
-        {
-            lowscale = ds->scale2;
-            scale = ds->scale1;
-        }
-        else
-        {
-            lowscale = ds->scale1;
-            scale = ds->scale2;
-        }
-
-        if (scale < spr->scale || (lowscale < spr->scale
-                                   && !R_PointOnSegSide(spr->gx, spr->gy,
-                                                        ds->curline)))
-        {
-            if (ds->maskedtexturecol)   // masked mid texture
-                R_RenderMaskedSegRange(ds, r1, r2);
-            continue;           // seg is behind sprite
-        }
-
-//
-// clip this piece of the sprite
-//
-        silhouette = ds->silhouette;
-        if (spr->gz >= ds->bsilheight)
-            silhouette &= ~SIL_BOTTOM;
-        if (spr->gzt <= ds->tsilheight)
-            silhouette &= ~SIL_TOP;
-
-        if (silhouette == 1)
-        {                       // bottom sil
-            for (x = r1; x <= r2; x++)
-                if (clipbot[x] == -2)
-                    clipbot[x] = ds->sprbottomclip[x];
-        }
-        else if (silhouette == 2)
-        {                       // top sil
-            for (x = r1; x <= r2; x++)
-                if (cliptop[x] == -2)
-                    cliptop[x] = ds->sprtopclip[x];
-        }
-        else if (silhouette == 3)
-        {                       // both
-            for (x = r1; x <= r2; x++)
-            {
-                if (clipbot[x] == -2)
-                    clipbot[x] = ds->sprbottomclip[x];
-                if (cliptop[x] == -2)
-                    cliptop[x] = ds->sprtopclip[x];
-            }
-        }
-
-    }
-
-//
-// all clipping has been performed, so draw the sprite
-//
-
-// check for unclipped columns
-    for (x = spr->x1; x <= spr->x2; x++)
-    {
-        if (clipbot[x] == -2)
-            clipbot[x] = viewheight;
-        if (cliptop[x] == -2)
-            cliptop[x] = -1;
-    }
-
-    mfloorclip = clipbot;
-    mceilingclip = cliptop;
-    R_DrawVisSprite(spr, spr->x1, spr->x2);
-}
-
-
-/*
-========================
-=
-= R_DrawMasked
-=
-========================
-*/
-
-void R_DrawMasked(void)
-{
-    vissprite_t *spr;
-    drawseg_t *ds;
-
-    R_SortVisSprites();
-
-    if (vissprite_p > vissprites)
-    {
-        // draw all vissprites back to front
-
-        for (spr = vsprsortedhead.next; spr != &vsprsortedhead;
-             spr = spr->next)
-            R_DrawSprite(spr);
-    }
-
-//
-// render any remaining masked mid textures
-//
-    for (ds = ds_p - 1; ds >= drawsegs; ds--)
-        if (ds->maskedtexturecol)
-            R_RenderMaskedSegRange(ds, ds->x1, ds->x2);
-
-//
-// draw the psprites on top of everything
-//
-// Added for the sideviewing with an external device
-    if (viewangleoffset <= 1024 << ANGLETOFINESHIFT || viewangleoffset >=
-        -(1024 << ANGLETOFINESHIFT))
-    {                           // don't draw on side views
-        R_DrawPlayerSprites();
-    }
-
-//      if (!viewangleoffset)           // don't draw on side views
-//              R_DrawPlayerSprites ();
-}
diff --git a/games/NXDoom/src/hexen/s_sound.c b/games/NXDoom/src/hexen/s_sound.c
deleted file mode 100644
index 33e621671..000000000
--- a/games/NXDoom/src/hexen/s_sound.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include "h2def.h"
-#include "m_random.h"
-#include "i_cdmus.h"
-#include "i_sound.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "m_argv.h"
-#include "m_misc.h"
-#include "r_local.h"
-#include "p_local.h"            // for P_AproxDistance
-#include "sounds.h"
-#include "s_sound.h"
-
-#define PRIORITY_MAX_ADJUST 10
-#define DIST_ADJUST (MAX_SND_DIST/PRIORITY_MAX_ADJUST)
-
-#define DEFAULT_ARCHIVEPATH     "o:\\sound\\archive\\"
-
-void S_ShutDown(void);
-
-// If true, CD music playback is enabled (snd_musicdevice == SNDDEVICE_CD
-// and CD initialization succeeded).
-boolean cdmusic;
-
-// Track number of a track to play explicitly chosen by the
-// player using cheats. A value of zero means no track chosen:
-static int cd_custom_track = 0;
-
-// Currently playing track:
-static int cd_current_track = 0;
-
-// Time (MS) at which the currently-playing CD track will finish playing
-// and should be looped. Zero if we are not currently playing a track:
-static int cd_track_end_time = 0;
-
-/*
-===============================================================================
-
-		MUSIC & SFX API
-
-===============================================================================
-*/
-
-//static channel_t channel[MAX_CHANNELS];
-
-//static int rs; //the current registered song.
-//int mus_song = -1;
-//int mus_lumpnum;
-//void *mus_sndptr;
-//byte *soundCurve;
-
-
-static channel_t Channel[MAX_CHANNELS];
-static void *RegisteredSong;      //the current registered song.
-static boolean MusicPaused;
-static int Mus_Song = -1;
-static byte *Mus_SndPtr;
-static byte *SoundCurve;
-
-int snd_MaxVolume = 10;                // maximum volume for sound
-int snd_MusicVolume = 10;              // maximum volume for music
-int snd_Channels = 16;
-
-// int AmbChan;
-
-//==========================================================================
-//
-// S_Start
-//
-//==========================================================================
-
-void S_Start(void)
-{
-    S_StopAllSound();
-    S_StartSong(gamemap, true);
-}
-
-//==========================================================================
-//
-// Returns true if we are playing a looping CD track and it is time to
-// restart it.
-//
-//==========================================================================
-
-static boolean ShouldRestartCDTrack(void)
-{
-    return cd_track_end_time != 0 && I_GetTimeMS() > cd_track_end_time;
-}
-
-//==========================================================================
-//
-// Start playing a CD track. Returns true for success.
-//
-//==========================================================================
-
-static boolean StartCDTrack(int track, boolean loop)
-{
-    // Already playing? If so, don't bother.
-
-    if (track == cd_current_track && !ShouldRestartCDTrack())
-    {
-        return true;
-    }
-
-    if (I_CDMusPlay(track))
-    {
-        return false;
-    }
-
-    cd_current_track = track;
-
-    if (loop)
-    {
-        cd_track_end_time = I_GetTimeMS() + 1000 * I_CDMusTrackLength(track);
-    }
-    else
-    {
-        cd_track_end_time = 0;
-    }
-
-    return true;
-}
-
-//==========================================================================
-//
-// S_StartSong
-//
-//==========================================================================
-
-void S_StartSong(int song, boolean loop)
-{
-    char *songLump;
-    int lumpnum;
-    int length;
-    int track;
-
-    // If we're in CD music mode, play a CD track, instead:
-    if (cdmusic)
-    {
-        // Default to the player-chosen track
-        if (cd_custom_track != 0)
-        {
-            track = cd_custom_track;
-        }
-        else
-        {
-            track = P_GetMapCDTrack(gamemap);
-        }
-
-        StartCDTrack(track, loop);
-    }
-    else
-    {
-        if (song == Mus_Song)
-        {                       // don't replay an old song
-            return;
-        }
-        if (RegisteredSong)
-        {
-            I_StopSong();
-            I_UnRegisterSong(RegisteredSong);
-            RegisteredSong = 0;
-        }
-        songLump = P_GetMapSongLump(song);
-        if (!songLump)
-        {
-            return;
-        }
-
-        lumpnum = W_GetNumForName(songLump);
-        Mus_SndPtr = W_CacheLumpNum(lumpnum, PU_STATIC);
-        length = W_LumpLength(lumpnum);
-
-        RegisteredSong = I_RegisterSong(Mus_SndPtr, length);
-        I_PlaySong(RegisteredSong, loop);
-        Mus_Song = song;
-
-        W_ReleaseLumpNum(lumpnum);
-    }
-}
-
-//==========================================================================
-//
-// Play a custom-chosen music track selected by the player.
-//
-// Returns true for success.
-//
-//==========================================================================
-
-boolean S_StartCustomCDTrack(int tracknum)
-{
-    boolean result;
-
-    result = StartCDTrack(tracknum, true);
-
-    if (result)
-    {
-        cd_custom_track = tracknum;
-    }
-
-    return result;
-}
-
-//==========================================================================
-//
-// Get the currently-playing CD track; returns -1 if not playing.
-//
-//==========================================================================
-
-int S_GetCurrentCDTrack(void)
-{
-    if (!cdmusic || cd_current_track == 0)
-    {
-        return -1;
-    }
-
-    return cd_current_track;
-}
-
-//==========================================================================
-//
-// S_StartSongName
-//
-//==========================================================================
-
-void S_StartSongName(const char *songLump, boolean loop)
-{
-    int lumpnum;
-    int cdTrack;
-    int length;
-
-    if (!songLump)
-    {
-        return;
-    }
-    if (cdmusic)
-    {
-        cdTrack = 0;
-
-        if (!strcmp(songLump, "hexen"))
-        {
-            cdTrack = P_GetCDTitleTrack();
-        }
-        else if (!strcmp(songLump, "hub"))
-        {
-            cdTrack = P_GetCDIntermissionTrack();
-        }
-        else if (!strcmp(songLump, "hall"))
-        {
-            cdTrack = P_GetCDEnd1Track();
-        }
-        else if (!strcmp(songLump, "orb"))
-        {
-            cdTrack = P_GetCDEnd2Track();
-        }
-        else if (!strcmp(songLump, "chess") && cd_custom_track == 0)
-        {
-            cdTrack = P_GetCDEnd3Track();
-        }
-/*	Uncomment this, if Kevin writes a specific song for startup
-		else if(!strcmp(songLump, "start"))
-		{
-			cdTrack = P_GetCDStartTrack();
-		}
-*/
-        if (cdTrack != 0)
-        {
-            cd_custom_track = 0;
-            StartCDTrack(cdTrack, loop);
-        }
-    }
-    else
-    {
-        if (RegisteredSong)
-        {
-            I_StopSong();
-            I_UnRegisterSong(RegisteredSong);
-            RegisteredSong = NULL;
-        }
-
-        lumpnum = W_GetNumForName(songLump);
-        Mus_SndPtr = W_CacheLumpNum(lumpnum, PU_MUSIC);
-        length = W_LumpLength(lumpnum);
-
-        RegisteredSong = I_RegisterSong(Mus_SndPtr, length);
-        I_PlaySong(RegisteredSong, loop);
-        W_ReleaseLumpNum(lumpnum);
-        Mus_Song = -1;
-    }
-}
-
-//==========================================================================
-//
-// S_GetSoundID
-//
-//==========================================================================
-
-int S_GetSoundID(char *name)
-{
-    int i;
-
-    for (i = 0; i < NUMSFX; i++)
-    {
-        if (!strcmp(S_sfx[i].tagname, name))
-        {
-            return i;
-        }
-    }
-    return 0;
-}
-
-//==========================================================================
-//
-// S_StartSound
-//
-//==========================================================================
-
-void S_StartSound(mobj_t * origin, int sound_id)
-{
-    S_StartSoundAtVolume(origin, sound_id, 127);
-}
-
-static mobj_t *GetSoundListener(void)
-{
-    static degenmobj_t dummy_listener;
-
-    // If we are at the title screen, the console player doesn't have an
-    // object yet, so return a pointer to a static dummy listener instead.
-
-    if (players[displayplayer].mo != NULL)
-    {
-        return players[displayplayer].mo;
-    }
-    else
-    {
-        dummy_listener.x = 0;
-        dummy_listener.y = 0;
-        dummy_listener.z = 0;
-
-        return (mobj_t *) &dummy_listener;
-    }
-}
-
-//==========================================================================
-//
-// S_StartSoundAtVolume
-//
-//==========================================================================
-
-void S_StartSoundAtVolume(mobj_t * origin, int sound_id, int volume)
-{
-    mobj_t *listener;
-    int dist, vol;
-    int i;
-    int priority;
-    int sep;
-    int angle;
-    int absx;
-    int absy;
-
-    static int sndcount = 0;
-    int chan;
-
-    if (sound_id == 0 || snd_MaxVolume == 0)
-        return;
-
-    listener = GetSoundListener();
-
-    if (origin == NULL)
-    {
-        origin = listener;
-    }
-    if (volume == 0)
-    {
-        return;
-    }
-
-    // calculate the distance before other stuff so that we can throw out
-    // sounds that are beyond the hearing range.
-    absx = abs(origin->x - listener->x);
-    absy = abs(origin->y - listener->y);
-    dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
-    dist >>= FRACBITS;
-    if (dist >= MAX_SND_DIST)
-    {
-        return;                 // sound is beyond the hearing range...
-    }
-    if (dist < 0)
-    {
-        dist = 0;
-    }
-    priority = S_sfx[sound_id].priority;
-    priority *= (PRIORITY_MAX_ADJUST - (dist / DIST_ADJUST));
-    #if 0
-    // TODO
-    if (!S_StopSoundID(sound_id, priority))
-    {
-        return;                 // other sounds have greater priority
-    }
-    #endif
-    for (i = 0; i < snd_Channels; i++)
-    {
-        // The origin pointer may point to an object of type degenmobj_t
-        // (i.e. sector_t.soundorg and polyobj_t.startSpot) which does not have
-        // a player element. Thus the origin->player pointer may point to
-        // random memory which most likely evaluates to true.
-        if (origin->thinker.function == P_DegenMobjThinker || origin->player)
-        {
-            i = snd_Channels;
-            break;              // let the player have more than one sound.
-        }
-        if (origin == Channel[i].mo)
-        {                       // only allow other mobjs one sound
-            S_StopSound(Channel[i].mo);
-            break;
-        }
-    }
-    if (i >= snd_Channels)
-    {
-        for (i = 0; i < snd_Channels; i++)
-        {
-            if (Channel[i].mo == NULL)
-            {
-                break;
-            }
-        }
-        if (i >= snd_Channels)
-        {
-            // look for a lower priority sound to replace.
-            sndcount++;
-            if (sndcount >= snd_Channels)
-            {
-                sndcount = 0;
-            }
-            for (chan = 0; chan < snd_Channels; chan++)
-            {
-                i = (sndcount + chan) % snd_Channels;
-                if (priority >= Channel[i].priority)
-                {
-                    chan = -1;  //denote that sound should be replaced.
-                    break;
-                }
-            }
-            if (chan != -1)
-            {
-                return;         //no free channels.
-            }
-            else                //replace the lower priority sound.
-            {
-                if (Channel[i].handle)
-                {
-                    if (I_SoundIsPlaying(Channel[i].handle))
-                    {
-                        I_StopSound(Channel[i].handle);
-                    }
-                    if (S_sfx[Channel[i].sound_id].usefulness > 0)
-                    {
-                        S_sfx[Channel[i].sound_id].usefulness--;
-                    }
-                }
-            }
-        }
-    }
-
-    Channel[i].mo = origin;
-
-    vol = (SoundCurve[dist] * (snd_MaxVolume * 8) * volume) >> 14;
-    if (origin == listener)
-    {
-        sep = 128;
-//              vol = (volume*(snd_MaxVolume+1)*8)>>7;
-    }
-    else
-    {
-        angle = R_PointToAngle2(listener->x,
-                                listener->y,
-                                Channel[i].mo->x, Channel[i].mo->y);
-        angle = (angle - viewangle) >> 24;
-        sep = angle * 2 - 128;
-        if (sep < 64)
-            sep = -sep;
-        if (sep > 192)
-            sep = 512 - sep;
-//              vol = SoundCurve[dist];
-    }
-
-    // if the sfxinfo_t is marked as 'can be pitch shifted'
-    if (S_sfx[sound_id].pitch)
-    {
-        Channel[i].pitch = (byte) (NORM_PITCH + (M_Random() & 7) - (M_Random() & 7));
-    }
-    else
-    {
-        Channel[i].pitch = NORM_PITCH;
-    }
-
-    if (S_sfx[sound_id].lumpnum == 0)
-    {
-        S_sfx[sound_id].lumpnum = I_GetSfxLumpNum(&S_sfx[sound_id]);
-    }
-
-    Channel[i].handle = I_StartSound(&S_sfx[sound_id],
-                                     i,
-                                     vol,
-                                     sep,
-                                     Channel[i].pitch);
-    Channel[i].sound_id = sound_id;
-    Channel[i].priority = priority;
-    Channel[i].volume = volume;
-    if (S_sfx[sound_id].usefulness < 0)
-    {
-        S_sfx[sound_id].usefulness = 1;
-    }
-    else
-    {
-        S_sfx[sound_id].usefulness++;
-    }
-}
-
-//==========================================================================
-//
-// S_StopSoundID
-//
-//==========================================================================
-
-boolean S_StopSoundID(int sound_id, int priority)
-{
-    int i;
-    int lp;                     //least priority
-    int found;
-
-    if (S_sfx[sound_id].numchannels == -1)
-    {
-        return (true);
-    }
-    lp = -1;                    //denote the argument sound_id
-    found = 0;
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (Channel[i].sound_id == sound_id && Channel[i].mo)
-        {
-            found++;            //found one.  Now, should we replace it??
-            if (priority >= Channel[i].priority)
-            {                   // if we're gonna kill one, then this'll be it
-                lp = i;
-                priority = Channel[i].priority;
-            }
-        }
-    }
-    if (found < S_sfx[sound_id].numchannels)
-    {
-        return (true);
-    }
-    else if (lp == -1)
-    {
-        return (false);         // don't replace any sounds
-    }
-    if (Channel[lp].handle)
-    {
-        if (I_SoundIsPlaying(Channel[lp].handle))
-        {
-            I_StopSound(Channel[lp].handle);
-        }
-        if (S_sfx[Channel[lp].sound_id].usefulness > 0)
-        {
-            S_sfx[Channel[lp].sound_id].usefulness--;
-        }
-        Channel[lp].mo = NULL;
-    }
-    return (true);
-}
-
-//==========================================================================
-//
-// S_StopSound
-//
-//==========================================================================
-
-void S_StopSound(mobj_t * origin)
-{
-    int i;
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (Channel[i].mo == origin)
-        {
-            I_StopSound(Channel[i].handle);
-            if (S_sfx[Channel[i].sound_id].usefulness > 0)
-            {
-                S_sfx[Channel[i].sound_id].usefulness--;
-            }
-            Channel[i].handle = 0;
-            Channel[i].mo = NULL;
-        }
-    }
-}
-
-//==========================================================================
-//
-// S_StopAllSound
-//
-//==========================================================================
-
-void S_StopAllSound(void)
-{
-    int i;
-
-    //stop all sounds
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (Channel[i].handle)
-        {
-            S_StopSound(Channel[i].mo);
-        }
-    }
-    memset(Channel, 0, 8 * sizeof(channel_t));
-}
-
-//==========================================================================
-//
-// S_SoundLink
-//
-//==========================================================================
-
-void S_SoundLink(mobj_t * oldactor, mobj_t * newactor)
-{
-    int i;
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (Channel[i].mo == oldactor)
-            Channel[i].mo = newactor;
-    }
-}
-
-//==========================================================================
-//
-// S_PauseSound
-//
-//==========================================================================
-
-void S_PauseSound(void)
-{
-    if (cdmusic)
-    {
-        I_CDMusStop();
-    }
-    else
-    {
-        I_PauseSong();
-    }
-}
-
-//==========================================================================
-//
-// S_ResumeSound
-//
-//==========================================================================
-
-void S_ResumeSound(void)
-{
-    if (cdmusic)
-    {
-        I_CDMusResume();
-    }
-    else
-    {
-        I_ResumeSong();
-    }
-}
-
-//==========================================================================
-//
-// S_UpdateSounds
-//
-//==========================================================================
-
-void S_UpdateSounds(mobj_t * listener)
-{
-    int i, dist, vol;
-    int angle;
-    int sep;
-    int priority;
-    int absx;
-    int absy;
-
-    I_UpdateSound();
-
-    // If we are looping a CD track, we need to check if it has
-    // finished playing and needs to restart.
-    if (cdmusic && ShouldRestartCDTrack())
-    {
-        StartCDTrack(cd_current_track, true);
-    }
-
-    if (snd_MaxVolume == 0)
-    {
-        return;
-    }
-
-    // Update any Sequences
-    SN_UpdateActiveSequences();
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (!Channel[i].handle || S_sfx[Channel[i].sound_id].usefulness == -1)
-        {
-            continue;
-        }
-        if (!I_SoundIsPlaying(Channel[i].handle))
-        {
-            if (S_sfx[Channel[i].sound_id].usefulness > 0)
-            {
-                S_sfx[Channel[i].sound_id].usefulness--;
-            }
-            Channel[i].handle = 0;
-            Channel[i].mo = NULL;
-            Channel[i].sound_id = 0;
-        }
-        if (Channel[i].mo == NULL || Channel[i].sound_id == 0
-         || Channel[i].mo == listener || listener == NULL)
-        {
-            continue;
-        }
-        else
-        {
-            absx = abs(Channel[i].mo->x - listener->x);
-            absy = abs(Channel[i].mo->y - listener->y);
-            dist = absx + absy - (absx > absy ? absy >> 1 : absx >> 1);
-            dist >>= FRACBITS;
-
-            if (dist >= MAX_SND_DIST)
-            {
-                S_StopSound(Channel[i].mo);
-                continue;
-            }
-            if (dist < 0)
-            {
-                dist = 0;
-            }
-            //vol = SoundCurve[dist];
-            vol =
-                (SoundCurve[dist] * (snd_MaxVolume * 8) *
-                 Channel[i].volume) >> 14;
-            if (Channel[i].mo == listener)
-            {
-                sep = 128;
-            }
-            else
-            {
-                angle = R_PointToAngle2(listener->x, listener->y,
-                                        Channel[i].mo->x, Channel[i].mo->y);
-                angle = (angle - viewangle) >> 24;
-                sep = angle * 2 - 128;
-                if (sep < 64)
-                    sep = -sep;
-                if (sep > 192)
-                    sep = 512 - sep;
-            }
-            I_UpdateSoundParams(i, vol, sep);
-            priority = S_sfx[Channel[i].sound_id].priority;
-            priority *= PRIORITY_MAX_ADJUST - (dist / DIST_ADJUST);
-            Channel[i].priority = priority;
-        }
-    }
-}
-
-//==========================================================================
-//
-// S_Init
-//
-//==========================================================================
-
-void S_Init(void)
-{
-    I_SetOPLDriverVer(opl_doom2_1_666);
-    SoundCurve = W_CacheLumpName("SNDCURVE", PU_STATIC);
-//      SoundCurve = Z_Malloc(MAX_SND_DIST, PU_STATIC, NULL);
-
-    if (snd_Channels > 8)
-    {
-        snd_Channels = 8;
-    }
-    I_SetMusicVolume(snd_MusicVolume * 8);
-
-    I_AtExit(S_ShutDown, true);
-
-    // Hexen defaults to pitch-shifting on
-    if (snd_pitchshift == -1)
-    {
-        snd_pitchshift = 1;
-    }
-
-    I_PrecacheSounds(S_sfx, NUMSFX);
-
-    // Attempt to setup CD music
-    if (snd_musicdevice == SNDDEVICE_CD)
-    {
-        ST_Message("    Attempting to initialize CD Music: ");
-        if (!cdrom)
-        {
-            cdmusic = (I_CDMusInit() != -1);
-        }
-        else
-        {
-            // The user is trying to use the cdrom for both game and music
-            cdmusic = false;
-        }
-
-        if (cdmusic)
-        {
-            ST_Message("initialized.\n");
-        }
-        else
-        {
-            ST_Message("failed.\n");
-        }
-
-        I_CDMusPrintStartup();
-    }
-}
-
-//==========================================================================
-//
-// S_GetChannelInfo
-//
-//==========================================================================
-
-void S_GetChannelInfo(SoundInfo_t * s)
-{
-    int i;
-    ChanInfo_t *c;
-
-    s->channelCount = snd_Channels;
-    s->musicVolume = snd_MusicVolume;
-    s->soundVolume = snd_MaxVolume;
-    for (i = 0; i < snd_Channels; i++)
-    {
-        c = &s->chan[i];
-        c->id = Channel[i].sound_id;
-        c->priority = Channel[i].priority;
-        c->name = S_sfx[c->id].name;
-        c->mo = Channel[i].mo;
-
-        if (c->mo != NULL)
-        {
-            c->distance = P_AproxDistance(c->mo->x - viewx, c->mo->y - viewy)
-                >> FRACBITS;
-        }
-        else
-        {
-            c->distance = 0;
-        }
-    }
-}
-
-//==========================================================================
-//
-// S_GetSoundPlayingInfo
-//
-//==========================================================================
-
-boolean S_GetSoundPlayingInfo(mobj_t * mobj, int sound_id)
-{
-    int i;
-
-    for (i = 0; i < snd_Channels; i++)
-    {
-        if (Channel[i].sound_id == sound_id && Channel[i].mo == mobj)
-        {
-            if (I_SoundIsPlaying(Channel[i].handle))
-            {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-//==========================================================================
-//
-// S_SetMusicVolume
-//
-//==========================================================================
-
-void S_SetMusicVolume(void)
-{
-    if (cdmusic)
-    {
-        I_CDMusSetVolume(snd_MusicVolume * 16); // 0-255
-    }
-    else
-    {
-        I_SetMusicVolume(snd_MusicVolume * 8);
-    }
-    if (snd_MusicVolume == 0)
-    {
-        if (!cdmusic)
-        {
-            I_PauseSong();
-        }
-        MusicPaused = true;
-    }
-    else if (MusicPaused)
-    {
-        if (!cdmusic)
-        {
-            I_ResumeSong();
-        }
-        MusicPaused = false;
-    }
-}
-
-//==========================================================================
-//
-// S_ShutDown
-//
-//==========================================================================
-
-void S_ShutDown(void)
-{
-    I_StopSong();
-    I_UnRegisterSong(RegisteredSong);
-    I_ShutdownSound();
-    if (cdmusic)
-    {
-        I_CDMusStop();
-    }
-}
-
-//==========================================================================
-//
-// S_InitScript
-//
-//==========================================================================
-
-void S_InitScript(void)
-{
-    int i;
-
-    SC_OpenLump("sndinfo");
-
-    while (SC_GetString())
-    {
-        if (*sc_String == '$')
-        {
-            if (!strcasecmp(sc_String, "$ARCHIVEPATH"))
-            {
-                SC_MustGetString();
-            }
-            else if (!strcasecmp(sc_String, "$MAP"))
-            {
-                SC_MustGetNumber();
-                SC_MustGetString();
-                if (sc_Number)
-                {
-                    P_PutMapSongLump(sc_Number, sc_String);
-                }
-            }
-            continue;
-        }
-        else
-        {
-            for (i = 0; i < NUMSFX; i++)
-            {
-                if (!strcmp(S_sfx[i].tagname, sc_String))
-                {
-                    SC_MustGetString();
-                    if (*sc_String != '?')
-                    {
-                        M_StringCopy(S_sfx[i].name, sc_String,
-                                     sizeof(S_sfx[i].name));
-                    }
-                    else
-                    {
-                        M_StringCopy(S_sfx[i].name, "default",
-                                     sizeof(S_sfx[i].name));
-                    }
-                    break;
-                }
-            }
-            if (i == NUMSFX)
-            {
-                SC_MustGetString();
-            }
-        }
-    }
-    SC_Close();
-
-    for (i = 0; i < NUMSFX; i++)
-    {
-        if (!strcmp(S_sfx[i].name, ""))
-        {
-            M_StringCopy(S_sfx[i].name, "default", sizeof(S_sfx[i].name));
-        }
-    }
-}
-
diff --git a/games/NXDoom/src/hexen/s_sound.h b/games/NXDoom/src/hexen/s_sound.h
deleted file mode 100644
index f8284be77..000000000
--- a/games/NXDoom/src/hexen/s_sound.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __S_SOUND__
-#define __S_SOUND__
-
-/*
-typedef struct
-{
-    char name[8];
-    int p1;
-} musicinfo_t;
-*/
-
-/*
-typedef struct sfxinfo_s
-{
-    char tagName[32];
-    char lumpname[12];          // Only need 9 bytes, but padded out to be dword aligned
-    //struct sfxinfo_s *link; // Make alias for another sound
-    int priority;               // Higher priority takes precendence
-    int usefulness;             // Determines when a sound should be cached out
-    void *snd_ptr;
-    int lumpnum;
-    int numchannels;            // total number of channels a sound type may occupy
-    boolean changePitch;
-} sfxinfo_t;
-*/
-
-typedef struct
-{
-    mobj_t *mo;
-    int sound_id;
-    int handle;
-    int volume;
-    int pitch;
-    int priority;
-} channel_t;
-
-typedef struct
-{
-    int id;
-    unsigned short priority;
-    char *name;
-    mobj_t *mo;
-    int distance;
-} ChanInfo_t;
-
-typedef struct
-{
-    int channelCount;
-    int musicVolume;
-    int soundVolume;
-    ChanInfo_t chan[8];
-} SoundInfo_t;
-
-extern int snd_MaxVolume;
-extern int snd_MusicVolume;
-extern int snd_Channels;
-extern boolean cdmusic;
-
-void S_Start(void);
-void S_StartSound(mobj_t * origin, int sound_id);
-int S_GetSoundID(char *name);
-void S_StartSoundAtVolume(mobj_t * origin, int sound_id, int volume);
-void S_StopSound(mobj_t * origin);
-void S_StopAllSound(void);
-void S_PauseSound(void);
-void S_ResumeSound(void);
-void S_UpdateSounds(mobj_t * listener);
-void S_StartSong(int song, boolean loop);
-void S_StartSongName(const char *songLump, boolean loop);
-void S_Init(void);
-void S_GetChannelInfo(SoundInfo_t * s);
-void S_SetMusicVolume(void);
-boolean S_GetSoundPlayingInfo(mobj_t * mobj, int sound_id);
-boolean S_StartCustomCDTrack(int tracknum);
-int S_GetCurrentCDTrack(void);
-
-#endif
diff --git a/games/NXDoom/src/hexen/sb_bar.c b/games/NXDoom/src/hexen/sb_bar.c
deleted file mode 100644
index fa94d59a3..000000000
--- a/games/NXDoom/src/hexen/sb_bar.c
+++ /dev/null
@@ -1,2000 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "i_cdmus.h"
-#include "i_video.h"
-#include "m_bbox.h"
-#include "m_cheat.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "v_video.h"
-#include "i_swap.h"
-#include "am_map.h"
-
-
-// TYPES -------------------------------------------------------------------
-
-typedef struct Cheat_s
-{
-    void (*func) (player_t * player, struct Cheat_s * cheat);
-    cheatseq_t *seq;
-} Cheat_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void DrawSoundInfo(void);
-static void DrINumber(signed int val, int x, int y);
-static void DrRedINumber(signed int val, int x, int y);
-static void DrBNumber(signed int val, int x, int y);
-static void DrawCommonBar(void);
-static void DrawMainBar(void);
-static void DrawInventoryBar(void);
-static void DrawKeyBar(void);
-static void DrawWeaponPieces(void);
-static void DrawFullScreenStuff(void);
-static void DrawAnimatedIcons(void);
-static boolean HandleCheats(byte key);
-static boolean CheatAddKey(Cheat_t * cheat, byte key, boolean * eat);
-static void CheatGodFunc(player_t * player, Cheat_t * cheat);
-static void CheatNoClipFunc(player_t * player, Cheat_t * cheat);
-static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat);
-static void CheatHealthFunc(player_t * player, Cheat_t * cheat);
-static void CheatKeysFunc(player_t * player, Cheat_t * cheat);
-static void CheatSoundFunc(player_t * player, Cheat_t * cheat);
-static void CheatTickerFunc(player_t * player, Cheat_t * cheat);
-static void CheatArtifactAllFunc(player_t * player, Cheat_t * cheat);
-static void CheatPuzzleFunc(player_t * player, Cheat_t * cheat);
-static void CheatWarpFunc(player_t * player, Cheat_t * cheat);
-static void CheatPigFunc(player_t * player, Cheat_t * cheat);
-static void CheatMassacreFunc(player_t * player, Cheat_t * cheat);
-static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat);
-static void CheatQuickenFunc1(player_t * player, Cheat_t * cheat);
-static void CheatQuickenFunc2(player_t * player, Cheat_t * cheat);
-static void CheatQuickenFunc3(player_t * player, Cheat_t * cheat);
-static void CheatClassFunc1(player_t * player, Cheat_t * cheat);
-static void CheatClassFunc2(player_t * player, Cheat_t * cheat);
-static void CheatInitFunc(player_t * player, Cheat_t * cheat);
-static void CheatVersionFunc(player_t * player, Cheat_t * cheat);
-static void CheatDebugFunc(player_t * player, Cheat_t * cheat);
-static void CheatScriptFunc1(player_t * player, Cheat_t * cheat);
-static void CheatScriptFunc2(player_t * player, Cheat_t * cheat);
-static void CheatScriptFunc3(player_t * player, Cheat_t * cheat);
-static void CheatRevealFunc(player_t * player, Cheat_t * cheat);
-static void CheatTrackFunc1(player_t * player, Cheat_t * cheat);
-static void CheatTrackFunc2(player_t * player, Cheat_t * cheat);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DECLARATIONS ------------------------------------------------
-
-boolean DebugSound;             // Debug flag for displaying sound info
-boolean inventory;
-int curpos;
-int inv_ptr;
-int ArtifactFlash;
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int DisplayTicker = 0;
-static int HealthMarker;
-//static int ChainWiggle;
-static player_t *CPlayer;
-static int SpinFlylump;
-static int SpinMinotaurLump;
-static int SpinSpeedLump;
-static int SpinDefenseLump;
-
-static int FontBNumBase;
-static int PlayPalette;
-
-static patch_t *PatchH2BAR;
-static patch_t *PatchH2TOP;
-static patch_t *PatchLFEDGE;
-static patch_t *PatchRTEDGE;
-static patch_t *PatchARMCLEAR;
-static patch_t *PatchARTICLEAR;
-static patch_t *PatchMANACLEAR;
-static patch_t *PatchKILLS;
-static patch_t *PatchMANAVIAL1;
-static patch_t *PatchMANAVIAL2;
-static patch_t *PatchMANAVIALDIM1;
-static patch_t *PatchMANAVIALDIM2;
-static patch_t *PatchMANADIM1;
-static patch_t *PatchMANADIM2;
-static patch_t *PatchMANABRIGHT1;
-static patch_t *PatchMANABRIGHT2;
-static patch_t *PatchCHAIN;
-static patch_t *PatchSTATBAR;
-static patch_t *PatchKEYBAR;
-static patch_t *PatchLIFEGEM;
-static patch_t *PatchSELECTBOX;
-static patch_t *PatchINumbers[10];
-static patch_t *PatchNEGATIVE;
-static patch_t *PatchSmNumbers[10];
-static patch_t *PatchINVBAR;
-static patch_t *PatchWEAPONSLOT;
-static patch_t *PatchWEAPONFULL;
-static patch_t *PatchPIECE1;
-static patch_t *PatchPIECE2;
-static patch_t *PatchPIECE3;
-static patch_t *PatchINVLFGEM1;
-static patch_t *PatchINVLFGEM2;
-static patch_t *PatchINVRTGEM1;
-static patch_t *PatchINVRTGEM2;
-
-// Toggle god mode
-cheatseq_t CheatGodSeq = CHEAT("satan", 0);
-
-// Toggle no clipping mode
-cheatseq_t CheatNoClipSeq = CHEAT("casper", 0);
-
-// Get all weapons and mana
-cheatseq_t CheatWeaponsSeq = CHEAT("nra", 0);
-
-// Get full health
-cheatseq_t CheatHealthSeq =  CHEAT("clubmed", 0);
-
-// Get all keys
-cheatseq_t CheatKeysSeq = CHEAT("locksmith", 0);
-
-// Toggle sound debug info
-cheatseq_t CheatSoundSeq = CHEAT("noise", 0);
-
-// Toggle ticker
-cheatseq_t CheatTickerSeq = CHEAT("ticker", 0);
-
-// Get all artifacts
-cheatseq_t CheatArtifactAllSeq = CHEAT("indiana", 0);
-
-// Get all puzzle pieces
-cheatseq_t CheatPuzzleSeq = CHEAT("sherlock", 0);
-
-// Warp to new level
-cheatseq_t CheatWarpSeq = CHEAT("visit", 2);
-
-// Become a pig
-cheatseq_t CheatPigSeq = CHEAT("deliverance", 0);
-
-// Kill all monsters
-cheatseq_t CheatMassacreSeq = CHEAT("butcher", 0);
-
-cheatseq_t CheatIDKFASeq = CHEAT("conan", 0);
-
-cheatseq_t CheatQuickenSeq1 = CHEAT("martek", 0);
-
-cheatseq_t CheatQuickenSeq2 = CHEAT("martekmartek", 0);
-
-cheatseq_t CheatQuickenSeq3 = CHEAT("martekmartekmartek", 0);
-
-// New class
-cheatseq_t CheatClass1Seq = CHEAT("shadowcaster", 0);
-
-cheatseq_t CheatClass2Seq = CHEAT("shadowcaster", 1);
-
-cheatseq_t CheatInitSeq = CHEAT("init", 0);
-
-cheatseq_t CheatVersionSeq = CHEAT("mrjones", 0);
-
-cheatseq_t CheatDebugSeq = CHEAT("where", 0);
-
-cheatseq_t CheatScriptSeq1 = CHEAT("puke", 0);
-
-cheatseq_t CheatScriptSeq2 = CHEAT("puke", 1);
-
-cheatseq_t CheatScriptSeq3 = CHEAT("puke", 2);
-
-cheatseq_t CheatRevealSeq = CHEAT("mapsco", 0);
-
-cheatseq_t CheatTrackSeq1 = CHEAT("`", 0);
-
-cheatseq_t CheatTrackSeq2 = CHEAT("`", 2);
-
-static Cheat_t Cheats[] = {
-    {CheatTrackFunc1, &CheatTrackSeq1},
-    {CheatTrackFunc2, &CheatTrackSeq2},
-    {CheatGodFunc, &CheatGodSeq},
-    {CheatNoClipFunc, &CheatNoClipSeq},
-    {CheatWeaponsFunc, &CheatWeaponsSeq},
-    {CheatHealthFunc, &CheatHealthSeq},
-    {CheatKeysFunc, &CheatKeysSeq},
-    {CheatSoundFunc, &CheatSoundSeq},
-    {CheatTickerFunc, &CheatTickerSeq},
-    {CheatArtifactAllFunc, &CheatArtifactAllSeq},
-    {CheatPuzzleFunc, &CheatPuzzleSeq},
-    {CheatWarpFunc, &CheatWarpSeq},
-    {CheatPigFunc, &CheatPigSeq},
-    {CheatMassacreFunc, &CheatMassacreSeq},
-    {CheatIDKFAFunc, &CheatIDKFASeq},
-    {CheatQuickenFunc1, &CheatQuickenSeq1},
-    {CheatQuickenFunc2, &CheatQuickenSeq2},
-    {CheatQuickenFunc3, &CheatQuickenSeq3},
-    {CheatClassFunc1, &CheatClass1Seq},
-    {CheatClassFunc2, &CheatClass2Seq},
-    {CheatInitFunc, &CheatInitSeq},
-    {CheatVersionFunc, &CheatVersionSeq},
-    {CheatDebugFunc, &CheatDebugSeq},
-    {CheatScriptFunc1, &CheatScriptSeq1},
-    {CheatScriptFunc2, &CheatScriptSeq2},
-    {CheatScriptFunc3, &CheatScriptSeq3},
-    {CheatRevealFunc, &CheatRevealSeq},
-};
-
-#define SET_CHEAT(cheat, seq) \
-    { memcpy(cheat.sequence, seq, sizeof(seq)); \
-      cheat.sequence_len = sizeof(seq) - 1; }
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// SB_Init
-//
-//==========================================================================
-
-void SB_Init(void)
-{
-    int i;
-    int startLump;
-
-    PatchH2BAR = W_CacheLumpName("H2BAR", PU_STATIC);
-    PatchH2TOP = W_CacheLumpName("H2TOP", PU_STATIC);
-    PatchINVBAR = W_CacheLumpName("INVBAR", PU_STATIC);
-    PatchLFEDGE = W_CacheLumpName("LFEDGE", PU_STATIC);
-    PatchRTEDGE = W_CacheLumpName("RTEDGE", PU_STATIC);
-    PatchSTATBAR = W_CacheLumpName("STATBAR", PU_STATIC);
-    PatchKEYBAR = W_CacheLumpName("KEYBAR", PU_STATIC);
-    PatchSELECTBOX = W_CacheLumpName("SELECTBOX", PU_STATIC);
-    PatchARTICLEAR = W_CacheLumpName("ARTICLS", PU_STATIC);
-    PatchARMCLEAR = W_CacheLumpName("ARMCLS", PU_STATIC);
-    PatchMANACLEAR = W_CacheLumpName("MANACLS", PU_STATIC);
-    PatchMANAVIAL1 = W_CacheLumpName("MANAVL1", PU_STATIC);
-    PatchMANAVIAL2 = W_CacheLumpName("MANAVL2", PU_STATIC);
-    PatchMANAVIALDIM1 = W_CacheLumpName("MANAVL1D", PU_STATIC);
-    PatchMANAVIALDIM2 = W_CacheLumpName("MANAVL2D", PU_STATIC);
-    PatchMANADIM1 = W_CacheLumpName("MANADIM1", PU_STATIC);
-    PatchMANADIM2 = W_CacheLumpName("MANADIM2", PU_STATIC);
-    PatchMANABRIGHT1 = W_CacheLumpName("MANABRT1", PU_STATIC);
-    PatchMANABRIGHT2 = W_CacheLumpName("MANABRT2", PU_STATIC);
-    PatchINVLFGEM1 = W_CacheLumpName("invgeml1", PU_STATIC);
-    PatchINVLFGEM2 = W_CacheLumpName("invgeml2", PU_STATIC);
-    PatchINVRTGEM1 = W_CacheLumpName("invgemr1", PU_STATIC);
-    PatchINVRTGEM2 = W_CacheLumpName("invgemr2", PU_STATIC);
-
-//      PatchCHAINBACK = W_CacheLumpName("CHAINBACK", PU_STATIC);
-    startLump = W_GetNumForName("IN0");
-    for (i = 0; i < 10; i++)
-    {
-        PatchINumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
-    }
-    PatchNEGATIVE = W_CacheLumpName("NEGNUM", PU_STATIC);
-    FontBNumBase = W_GetNumForName("FONTB16");
-    startLump = W_GetNumForName("SMALLIN0");
-    for (i = 0; i < 10; i++)
-    {
-        PatchSmNumbers[i] = W_CacheLumpNum(startLump + i, PU_STATIC);
-    }
-    PlayPalette = W_GetNumForName("PLAYPAL");
-    SpinFlylump = W_GetNumForName("SPFLY0");
-    SpinMinotaurLump = W_GetNumForName("SPMINO0");
-    SpinSpeedLump = W_GetNumForName("SPBOOT0");
-    SpinDefenseLump = W_GetNumForName("SPSHLD0");
-
-    if (deathmatch)
-    {
-        PatchKILLS = W_CacheLumpName("KILLS", PU_STATIC);
-    }
-    SB_SetClassData();
-
-    if (gamemode == shareware)
-    {
-	SET_CHEAT(CheatGodSeq, "bgokey");
-	SET_CHEAT(CheatNoClipSeq, "rjohnson");
-	SET_CHEAT(CheatWeaponsSeq, "crhinehart");
-	SET_CHEAT(CheatHealthSeq,"sgurno");
-	SET_CHEAT(CheatKeysSeq, "mraymondjudy");
-	SET_CHEAT(CheatSoundSeq, "kschilder");
-	SET_CHEAT(CheatTickerSeq, "rrettenmund");
-	SET_CHEAT(CheatArtifactAllSeq, "braffel");
-	SET_CHEAT(CheatPuzzleSeq, "tmoore");
-	SET_CHEAT(CheatWarpSeq, "bpelletier");
-	SET_CHEAT(CheatPigSeq, "ebiessman");
-	SET_CHEAT(CheatMassacreSeq, "cstika");
-	SET_CHEAT(CheatIDKFASeq, "rambo");
-	SET_CHEAT(CheatQuickenSeq1, "quicken");
-	SET_CHEAT(CheatQuickenSeq2, "quickenquicken");
-	SET_CHEAT(CheatQuickenSeq3, "quickenquickenquicken");
-	SET_CHEAT(CheatClass1Seq, "plipo");
-	SET_CHEAT(CheatClass2Seq, "plipo");
-	SET_CHEAT(CheatVersionSeq, "pmacarther");
-	SET_CHEAT(CheatDebugSeq, "jsumwalt");
-	SET_CHEAT(CheatScriptSeq1, "mwagabaza");
-	SET_CHEAT(CheatScriptSeq2, "mwagabaza");
-	SET_CHEAT(CheatScriptSeq3, "mwagabaza");
-	SET_CHEAT(CheatRevealSeq, "reveal");
-    }
-}
-
-//==========================================================================
-//
-// SB_SetClassData
-//
-//==========================================================================
-
-void SB_SetClassData(void)
-{
-    int class;
-
-    class = PlayerClass[consoleplayer]; // original player class (not pig)
-    PatchWEAPONSLOT = W_CacheLumpNum(W_GetNumForName("wpslot0")
-                                     + class, PU_STATIC);
-    PatchWEAPONFULL = W_CacheLumpNum(W_GetNumForName("wpfull0")
-                                     + class, PU_STATIC);
-    PatchPIECE1 = W_CacheLumpNum(W_GetNumForName("wpiecef1")
-                                 + class, PU_STATIC);
-    PatchPIECE2 = W_CacheLumpNum(W_GetNumForName("wpiecef2")
-                                 + class, PU_STATIC);
-    PatchPIECE3 = W_CacheLumpNum(W_GetNumForName("wpiecef3")
-                                 + class, PU_STATIC);
-    PatchCHAIN = W_CacheLumpNum(W_GetNumForName("chain") + class, PU_STATIC);
-    if (!netgame)
-    {                           // single player game uses red life gem (the second gem)
-        PatchLIFEGEM = W_CacheLumpNum(W_GetNumForName("lifegem")
-                                      + maxplayers * class + 1, PU_STATIC);
-    }
-    else
-    {
-        PatchLIFEGEM = W_CacheLumpNum(W_GetNumForName("lifegem")
-                                      + maxplayers * class + consoleplayer,
-                                      PU_STATIC);
-    }
-    SB_state = -1;
-    UpdateState |= I_FULLSCRN;
-}
-
-//==========================================================================
-//
-// SB_Ticker
-//
-//==========================================================================
-
-void SB_Ticker(void)
-{
-    int delta;
-    int curHealth;
-
-    curHealth = players[consoleplayer].mo->health;
-    if (curHealth < 0)
-    {
-        curHealth = 0;
-    }
-    if (curHealth < HealthMarker)
-    {
-        delta = (HealthMarker - curHealth) >> 2;
-        if (delta < 1)
-        {
-            delta = 1;
-        }
-        else if (delta > 6)
-        {
-            delta = 6;
-        }
-        HealthMarker -= delta;
-    }
-    else if (curHealth > HealthMarker)
-    {
-        delta = (curHealth - HealthMarker) >> 2;
-        if (delta < 1)
-        {
-            delta = 1;
-        }
-        else if (delta > 6)
-        {
-            delta = 6;
-        }
-        HealthMarker += delta;
-    }
-}
-
-//==========================================================================
-//
-// DrINumber
-//
-// Draws a three digit number.
-//
-//==========================================================================
-
-static void DrINumber(signed int val, int x, int y)
-{
-    patch_t *patch;
-    int oldval;
-
-    oldval = val;
-    if (val < 0)
-    {
-        val = -val;
-        if (val > 99)
-        {
-            val = 99;
-        }
-        if (val > 9)
-        {
-            patch = PatchINumbers[val / 10];
-            V_DrawPatch(x + 8, y, patch);
-            V_DrawPatch(x, y, PatchNEGATIVE);
-        }
-        else
-        {
-            V_DrawPatch(x + 8, y, PatchNEGATIVE);
-        }
-        val = val % 10;
-        patch = PatchINumbers[val];
-        V_DrawPatch(x + 16, y, patch);
-        return;
-    }
-    if (val > 99)
-    {
-        patch = PatchINumbers[val / 100];
-        V_DrawPatch(x, y, patch);
-    }
-    val = val % 100;
-    if (val > 9 || oldval > 99)
-    {
-        patch = PatchINumbers[val / 10];
-        V_DrawPatch(x + 8, y, patch);
-    }
-    val = val % 10;
-    patch = PatchINumbers[val];
-    V_DrawPatch(x + 16, y, patch);
-}
-
-//==========================================================================
-//
-// DrRedINumber
-//
-// Draws a three digit number using the red font
-//
-//==========================================================================
-
-static void DrRedINumber(signed int val, int x, int y)
-{
-    patch_t *patch;
-    int oldval;
-
-    oldval = val;
-    if (val < 0)
-    {
-        val = 0;
-    }
-    if (val > 99)
-    {
-        patch =
-            W_CacheLumpNum(W_GetNumForName("inred0") + val / 100, PU_CACHE);
-        V_DrawPatch(x, y, patch);
-    }
-    val = val % 100;
-    if (val > 9 || oldval > 99)
-    {
-        patch =
-            W_CacheLumpNum(W_GetNumForName("inred0") + val / 10, PU_CACHE);
-        V_DrawPatch(x + 8, y, patch);
-    }
-    val = val % 10;
-    patch = W_CacheLumpNum(W_GetNumForName("inred0") + val, PU_CACHE);
-    V_DrawPatch(x + 16, y, patch);
-}
-
-//==========================================================================
-//
-// DrBNumber
-//
-// Draws a three digit number using FontB
-//
-//==========================================================================
-
-static void DrBNumber(signed int val, int x, int y)
-{
-    patch_t *patch;
-    int xpos;
-    int oldval;
-
-    oldval = val;
-    xpos = x;
-    if (val < 0)
-    {
-        val = 0;
-    }
-    if (val > 99)
-    {
-        patch = W_CacheLumpNum(FontBNumBase + val / 100, PU_CACHE);
-        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-    }
-    val = val % 100;
-    xpos += 12;
-    if (val > 9 || oldval > 99)
-    {
-        patch = W_CacheLumpNum(FontBNumBase + val / 10, PU_CACHE);
-        V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-    }
-    val = val % 10;
-    xpos += 12;
-    patch = W_CacheLumpNum(FontBNumBase + val, PU_CACHE);
-    V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
-}
-
-//==========================================================================
-//
-// DrSmallNumber
-//
-// Draws a small two digit number.
-//
-//==========================================================================
-
-static void DrSmallNumber(int val, int x, int y)
-{
-    patch_t *patch;
-
-    if (val <= 0)
-    {
-        return;
-    }
-    if (val > 999)
-    {
-        val %= 1000;
-    }
-    if (val > 99)
-    {
-        patch = PatchSmNumbers[val / 100];
-        V_DrawPatch(x, y, patch);
-        patch = PatchSmNumbers[(val % 100) / 10];
-        V_DrawPatch(x + 4, y, patch);
-    }
-    else if (val > 9)
-    {
-        patch = PatchSmNumbers[val / 10];
-        V_DrawPatch(x + 4, y, patch);
-    }
-    val %= 10;
-    patch = PatchSmNumbers[val];
-    V_DrawPatch(x + 8, y, patch);
-}
-
-/*
-//==========================================================================
-//
-// ShadeLine
-//
-//==========================================================================
-
-static void ShadeLine(int x, int y, int height, int shade)
-{
-	byte *dest;
-	byte *shades;
-
-	shades = colormaps+9*256+shade*2*256;
-	dest = I_VideoBuffer+y*SCREENWIDTH+x;
-	while(height--)
-	{
-		*(dest) = *(shades+*dest);
-		dest += SCREENWIDTH;
-	}
-}
-
-//==========================================================================
-//
-// ShadeChain
-//
-//==========================================================================
-
-static void ShadeChain(void)
-{
-	int i;
-
-	for(i = 0; i < 16; i++)
-	{
-		ShadeLine(277+i, 190, 10, i/2);
-		ShadeLine(19+i, 190, 10, 7-(i/2));
-	}
-}
-*/
-
-//==========================================================================
-//
-// DrawSoundInfo
-//
-// Displays sound debugging information.
-//
-//==========================================================================
-
-static void DrawSoundInfo(void)
-{
-    int i;
-    SoundInfo_t s;
-    ChanInfo_t *c;
-    char text[32];
-    int x;
-    int y;
-    int xPos[7] = { 1, 75, 112, 156, 200, 230, 260 };
-
-    if (leveltime & 16)
-    {
-        MN_DrTextA("*** SOUND DEBUG INFO ***", xPos[0], 20);
-    }
-    S_GetChannelInfo(&s);
-    if (s.channelCount == 0)
-    {
-        return;
-    }
-    x = 0;
-    MN_DrTextA("NAME", xPos[x++], 30);
-    MN_DrTextA("MO.T", xPos[x++], 30);
-    MN_DrTextA("MO.X", xPos[x++], 30);
-    MN_DrTextA("MO.Y", xPos[x++], 30);
-    MN_DrTextA("ID", xPos[x++], 30);
-    MN_DrTextA("PRI", xPos[x++], 30);
-    MN_DrTextA("DIST", xPos[x++], 30);
-    for (i = 0; i < s.channelCount; i++)
-    {
-        c = &s.chan[i];
-        x = 0;
-        y = 40 + i * 10;
-        if (c->mo == NULL)
-        {                       // Channel is unused
-            MN_DrTextA("------", xPos[0], y);
-            continue;
-        }
-        M_snprintf(text, sizeof(text), "%s", c->name);
-        M_ForceUppercase(text);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->mo->type);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->mo->x >> FRACBITS);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->mo->y >> FRACBITS);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", (int) c->id);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->priority);
-        MN_DrTextA(text, xPos[x++], y);
-        M_snprintf(text, sizeof(text), "%d", c->distance);
-        MN_DrTextA(text, xPos[x++], y);
-    }
-    UpdateState |= I_FULLSCRN;
-    BorderNeedRefresh = true;
-}
-
-//==========================================================================
-//
-// SB_Drawer
-//
-//==========================================================================
-
-char patcharti[][10] = {
-    {"ARTIBOX"},                // none
-    {"ARTIINVU"},               // invulnerability
-    {"ARTIPTN2"},               // health
-    {"ARTISPHL"},               // superhealth
-    {"ARTIHRAD"},               // healing radius
-    {"ARTISUMN"},               // summon maulator
-    {"ARTITRCH"},               // torch
-    {"ARTIPORK"},               // egg
-    {"ARTISOAR"},               // fly
-    {"ARTIBLST"},               // blast radius
-    {"ARTIPSBG"},               // poison bag
-    {"ARTITELO"},               // teleport other
-    {"ARTISPED"},               // speed
-    {"ARTIBMAN"},               // boost mana
-    {"ARTIBRAC"},               // boost armor
-    {"ARTIATLP"},               // teleport
-    {"ARTISKLL"},               // arti_puzzskull
-    {"ARTIBGEM"},               // arti_puzzgembig
-    {"ARTIGEMR"},               // arti_puzzgemred
-    {"ARTIGEMG"},               // arti_puzzgemgreen1
-    {"ARTIGMG2"},               // arti_puzzgemgreen2
-    {"ARTIGEMB"},               // arti_puzzgemblue1
-    {"ARTIGMB2"},               // arti_puzzgemblue2
-    {"ARTIBOK1"},               // arti_puzzbook1
-    {"ARTIBOK2"},               // arti_puzzbook2
-    {"ARTISKL2"},               // arti_puzzskull2
-    {"ARTIFWEP"},               // arti_puzzfweapon
-    {"ARTICWEP"},               // arti_puzzcweapon
-    {"ARTIMWEP"},               // arti_puzzmweapon
-    {"ARTIGEAR"},               // arti_puzzgear1
-    {"ARTIGER2"},               // arti_puzzgear2
-    {"ARTIGER3"},               // arti_puzzgear3
-    {"ARTIGER4"},               // arti_puzzgear4
-};
-
-int SB_state = -1;
-static int oldarti = 0;
-static int oldartiCount = 0;
-static int oldfrags = -9999;
-static int oldmana1 = -1;
-static int oldmana2 = -1;
-static int oldarmor = -1;
-static int oldhealth = -1;
-static int oldlife = -1;
-static int oldpieces = -1;
-static int oldweapon = -1;
-static int oldkeys = -1;
-
-
-void SB_Drawer(void)
-{
-    // Sound info debug stuff
-    if (DebugSound == true)
-    {
-        DrawSoundInfo();
-    }
-    CPlayer = &players[consoleplayer];
-    if (viewheight == SCREENHEIGHT && !automapactive)
-    {
-        DrawFullScreenStuff();
-        SB_state = -1;
-    }
-    else
-    {
-        if (SB_state == -1)
-        {
-            V_DrawPatch(0, 134, PatchH2BAR);
-            oldhealth = -1;
-        }
-        DrawCommonBar();
-        if (!inventory)
-        {
-            if (SB_state != 0)
-            {
-                // Main interface
-                if (!automapactive)
-                {
-                    V_DrawPatch(38, 162, PatchSTATBAR);
-                }
-                else
-                {
-                    V_DrawPatch(38, 162, PatchKEYBAR);
-                }
-                oldarti = 0;
-                oldmana1 = -1;
-                oldmana2 = -1;
-                oldarmor = -1;
-                oldpieces = -1;
-                oldfrags = -9999;       //can't use -1, 'cuz of negative frags
-                oldlife = -1;
-                oldweapon = -1;
-                oldkeys = -1;
-            }
-            if (!automapactive)
-            {
-                DrawMainBar();
-            }
-            else
-            {
-                DrawKeyBar();
-            }
-            SB_state = 0;
-        }
-        else
-        {
-            DrawInventoryBar();
-            SB_state = 1;
-        }
-    }
-    SB_PaletteFlash(false);
-    DrawAnimatedIcons();
-}
-
-//==========================================================================
-//
-// DrawAnimatedIcons
-//
-//==========================================================================
-
-static void DrawAnimatedIcons(void)
-{
-    int frame;
-    static boolean hitCenterFrame;
-
-    // Wings of wrath
-    if (CPlayer->powers[pw_flight])
-    {
-        if (CPlayer->powers[pw_flight] > BLINKTHRESHOLD
-            || !(CPlayer->powers[pw_flight] & 16))
-        {
-            frame = (leveltime / 3) & 15;
-            if (CPlayer->mo->flags2 & MF2_FLY)
-            {
-                if (hitCenterFrame && (frame != 15 && frame != 0))
-                {
-                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + 15,
-                                                       PU_CACHE));
-                }
-                else
-                {
-                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + frame,
-                                                       PU_CACHE));
-                    hitCenterFrame = false;
-                }
-            }
-            else
-            {
-                if (!hitCenterFrame && (frame != 15 && frame != 0))
-                {
-                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + frame,
-                                                       PU_CACHE));
-                    hitCenterFrame = false;
-                }
-                else
-                {
-                    V_DrawPatch(20, 19, W_CacheLumpNum(SpinFlylump + 15,
-                                                       PU_CACHE));
-                    hitCenterFrame = true;
-                }
-            }
-        }
-        BorderTopRefresh = true;
-        UpdateState |= I_MESSAGES;
-    }
-
-    // Speed Boots
-    if (CPlayer->powers[pw_speed])
-    {
-        if (CPlayer->powers[pw_speed] > BLINKTHRESHOLD
-            || !(CPlayer->powers[pw_speed] & 16))
-        {
-            frame = (leveltime / 3) & 15;
-            V_DrawPatch(60, 19, W_CacheLumpNum(SpinSpeedLump + frame,
-                                               PU_CACHE));
-        }
-        BorderTopRefresh = true;
-        UpdateState |= I_MESSAGES;
-    }
-
-    // Defensive power
-    if (CPlayer->powers[pw_invulnerability])
-    {
-        if (CPlayer->powers[pw_invulnerability] > BLINKTHRESHOLD
-            || !(CPlayer->powers[pw_invulnerability] & 16))
-        {
-            frame = (leveltime / 3) & 15;
-            V_DrawPatch(260, 19, W_CacheLumpNum(SpinDefenseLump + frame,
-                                                PU_CACHE));
-        }
-        BorderTopRefresh = true;
-        UpdateState |= I_MESSAGES;
-    }
-
-    // Minotaur Active
-    if (CPlayer->powers[pw_minotaur])
-    {
-        if (CPlayer->powers[pw_minotaur] > BLINKTHRESHOLD
-            || !(CPlayer->powers[pw_minotaur] & 16))
-        {
-            frame = (leveltime / 3) & 15;
-            V_DrawPatch(300, 19, W_CacheLumpNum(SpinMinotaurLump + frame,
-                                                PU_CACHE));
-        }
-        BorderTopRefresh = true;
-        UpdateState |= I_MESSAGES;
-    }
-}
-
-//==========================================================================
-//
-// SB_PaletteFlash
-//
-// Sets the new palette based upon the current values of
-// consoleplayer->damagecount and consoleplayer->bonuscount.
-//
-//==========================================================================
-
-void SB_PaletteFlash(boolean forceChange)
-{
-    static int sb_palette = 0;
-    int palette;
-    byte *pal;
-
-    if (forceChange)
-    {
-        sb_palette = -1;
-    }
-    if (gamestate == GS_LEVEL)
-    {
-        CPlayer = &players[consoleplayer];
-        if (CPlayer->poisoncount)
-        {
-            palette = 0;
-            palette = (CPlayer->poisoncount + 7) >> 3;
-            if (palette >= NUMPOISONPALS)
-            {
-                palette = NUMPOISONPALS - 1;
-            }
-            palette += STARTPOISONPALS;
-        }
-        else if (CPlayer->damagecount)
-        {
-            palette = (CPlayer->damagecount + 7) >> 3;
-            if (palette >= NUMREDPALS)
-            {
-                palette = NUMREDPALS - 1;
-            }
-            palette += STARTREDPALS;
-        }
-        else if (CPlayer->bonuscount)
-        {
-            palette = (CPlayer->bonuscount + 7) >> 3;
-            if (palette >= NUMBONUSPALS)
-            {
-                palette = NUMBONUSPALS - 1;
-            }
-            palette += STARTBONUSPALS;
-        }
-        else if (CPlayer->mo->flags2 & MF2_ICEDAMAGE)
-        {                       // Frozen player
-            palette = STARTICEPAL;
-        }
-        else
-        {
-            palette = 0;
-        }
-    }
-    else
-    {
-        palette = 0;
-    }
-    if (palette != sb_palette)
-    {
-        sb_palette = palette;
-        pal = (byte *) W_CacheLumpNum(PlayPalette, PU_CACHE) + palette * 768;
-        I_SetPalette(pal);
-    }
-}
-
-//==========================================================================
-//
-// DrawCommonBar
-//
-//==========================================================================
-
-void DrawCommonBar(void)
-{
-    int healthPos;
-
-    V_DrawPatch(0, 134, PatchH2TOP);
-
-    if (oldhealth != HealthMarker)
-    {
-        oldhealth = HealthMarker;
-        healthPos = HealthMarker;
-        if (healthPos < 0)
-        {
-            healthPos = 0;
-        }
-        if (healthPos > 100)
-        {
-            healthPos = 100;
-        }
-        V_DrawPatch(28 + (((healthPos * 196) / 100) % 9), 193, PatchCHAIN);
-        V_DrawPatch(7 + ((healthPos * 11) / 5), 193, PatchLIFEGEM);
-        V_DrawPatch(0, 193, PatchLFEDGE);
-        V_DrawPatch(277, 193, PatchRTEDGE);
-//              ShadeChain();
-        UpdateState |= I_STATBAR;
-    }
-}
-
-//==========================================================================
-//
-// DrawMainBar
-//
-//==========================================================================
-
-void DrawMainBar(void)
-{
-    int i;
-    int temp;
-    patch_t *manaPatch1, *manaPatch2;
-    patch_t *manaVialPatch1, *manaVialPatch2;
-
-    manaPatch1 = NULL;
-    manaPatch2 = NULL;
-    manaVialPatch1 = NULL;
-    manaVialPatch2 = NULL;
-
-    // Ready artifact
-    if (ArtifactFlash)
-    {
-        V_DrawPatch(144, 160, PatchARTICLEAR);
-        V_DrawPatch(148, 164, W_CacheLumpNum(W_GetNumForName("useartia")
-                                             + ArtifactFlash - 1, PU_CACHE));
-        ArtifactFlash--;
-        oldarti = -1;           // so that the correct artifact fills in after the flash
-        UpdateState |= I_STATBAR;
-    }
-    else if (oldarti != CPlayer->readyArtifact
-             || oldartiCount != CPlayer->inventory[inv_ptr].count)
-    {
-        V_DrawPatch(144, 160, PatchARTICLEAR);
-        if (CPlayer->readyArtifact > 0)
-        {
-            V_DrawPatch(143, 163,
-                        W_CacheLumpName(patcharti[CPlayer->readyArtifact],
-                                        PU_CACHE));
-            if (CPlayer->inventory[inv_ptr].count > 1)
-            {
-                DrSmallNumber(CPlayer->inventory[inv_ptr].count, 162, 184);
-            }
-        }
-        oldarti = CPlayer->readyArtifact;
-        oldartiCount = CPlayer->inventory[inv_ptr].count;
-        UpdateState |= I_STATBAR;
-    }
-
-    // Frags
-    if (deathmatch)
-    {
-        temp = 0;
-        for (i = 0; i < maxplayers; i++)
-        {
-            temp += CPlayer->frags[i];
-        }
-        if (temp != oldfrags)
-        {
-            V_DrawPatch(38, 162, PatchKILLS);
-            DrINumber(temp, 40, 176);
-            oldfrags = temp;
-            UpdateState |= I_STATBAR;
-        }
-    }
-    else
-    {
-        temp = HealthMarker;
-        if (temp < 0)
-        {
-            temp = 0;
-        }
-        else if (temp > 100)
-        {
-            temp = 100;
-        }
-        if (oldlife != temp)
-        {
-            oldlife = temp;
-            V_DrawPatch(41, 178, PatchARMCLEAR);
-            if (temp >= 25)
-            {
-                DrINumber(temp, 40, 176);
-            }
-            else
-            {
-                DrRedINumber(temp, 40, 176);
-            }
-            UpdateState |= I_STATBAR;
-        }
-    }
-    // Mana
-    temp = CPlayer->mana[0];
-    if (oldmana1 != temp)
-    {
-        V_DrawPatch(77, 178, PatchMANACLEAR);
-        DrSmallNumber(temp, 79, 181);
-        manaVialPatch1 = (patch_t *) 1; // force a vial update
-        if (temp == 0)
-        {                       // Draw Dim Mana icon
-            manaPatch1 = PatchMANADIM1;
-        }
-        else if (oldmana1 == 0)
-        {
-            manaPatch1 = PatchMANABRIGHT1;
-        }
-        oldmana1 = temp;
-        UpdateState |= I_STATBAR;
-    }
-    temp = CPlayer->mana[1];
-    if (oldmana2 != temp)
-    {
-        V_DrawPatch(109, 178, PatchMANACLEAR);
-        DrSmallNumber(temp, 111, 181);
-        manaVialPatch1 = (patch_t *) 1; // force a vial update
-        if (temp == 0)
-        {                       // Draw Dim Mana icon
-            manaPatch2 = PatchMANADIM2;
-        }
-        else if (oldmana2 == 0)
-        {
-            manaPatch2 = PatchMANABRIGHT2;
-        }
-        oldmana2 = temp;
-        UpdateState |= I_STATBAR;
-    }
-    if (oldweapon != CPlayer->readyweapon || manaPatch1 || manaPatch2
-        || manaVialPatch1)
-    {                           // Update mana graphics based upon mana count/weapon type
-        if (CPlayer->readyweapon == WP_FIRST)
-        {
-            manaPatch1 = PatchMANADIM1;
-            manaPatch2 = PatchMANADIM2;
-            manaVialPatch1 = PatchMANAVIALDIM1;
-            manaVialPatch2 = PatchMANAVIALDIM2;
-        }
-        else if (CPlayer->readyweapon == WP_SECOND)
-        {
-            if (!manaPatch1)
-            {
-                manaPatch1 = PatchMANABRIGHT1;
-            }
-            manaVialPatch1 = PatchMANAVIAL1;
-            manaPatch2 = PatchMANADIM2;
-            manaVialPatch2 = PatchMANAVIALDIM2;
-        }
-        else if (CPlayer->readyweapon == WP_THIRD)
-        {
-            manaPatch1 = PatchMANADIM1;
-            manaVialPatch1 = PatchMANAVIALDIM1;
-            if (!manaPatch2)
-            {
-                manaPatch2 = PatchMANABRIGHT2;
-            }
-            manaVialPatch2 = PatchMANAVIAL2;
-        }
-        else
-        {
-            manaVialPatch1 = PatchMANAVIAL1;
-            manaVialPatch2 = PatchMANAVIAL2;
-            if (!manaPatch1)
-            {
-                manaPatch1 = PatchMANABRIGHT1;
-            }
-            if (!manaPatch2)
-            {
-                manaPatch2 = PatchMANABRIGHT2;
-            }
-        }
-        V_DrawPatch(77, 164, manaPatch1);
-        V_DrawPatch(110, 164, manaPatch2);
-        V_DrawPatch(94, 164, manaVialPatch1);
-        for (i = 165; i < 187 - (22 * CPlayer->mana[0]) / MAX_MANA; i++)
-        {
-            I_VideoBuffer[i * SCREENWIDTH + 95] = 0;
-            I_VideoBuffer[i * SCREENWIDTH + 96] = 0;
-            I_VideoBuffer[i * SCREENWIDTH + 97] = 0;
-        }
-        V_DrawPatch(102, 164, manaVialPatch2);
-        for (i = 165; i < 187 - (22 * CPlayer->mana[1]) / MAX_MANA; i++)
-        {
-            I_VideoBuffer[i * SCREENWIDTH + 103] = 0;
-            I_VideoBuffer[i * SCREENWIDTH + 104] = 0;
-            I_VideoBuffer[i * SCREENWIDTH + 105] = 0;
-        }
-        oldweapon = CPlayer->readyweapon;
-        UpdateState |= I_STATBAR;
-    }
-    // Armor
-    temp = AutoArmorSave[CPlayer->class]
-        + CPlayer->armorpoints[ARMOR_ARMOR] +
-        CPlayer->armorpoints[ARMOR_SHIELD] +
-        CPlayer->armorpoints[ARMOR_HELMET] +
-        CPlayer->armorpoints[ARMOR_AMULET];
-    if (oldarmor != temp)
-    {
-        oldarmor = temp;
-        V_DrawPatch(255, 178, PatchARMCLEAR);
-        DrINumber(FixedDiv(temp, 5 * FRACUNIT) >> FRACBITS, 250, 176);
-        UpdateState |= I_STATBAR;
-    }
-    // Weapon Pieces
-    if (oldpieces != CPlayer->pieces)
-    {
-        DrawWeaponPieces();
-        oldpieces = CPlayer->pieces;
-        UpdateState |= I_STATBAR;
-    }
-}
-
-//==========================================================================
-//
-// DrawInventoryBar
-//
-//==========================================================================
-
-void DrawInventoryBar(void)
-{
-    int i;
-    int x;
-
-    x = inv_ptr - curpos;
-    UpdateState |= I_STATBAR;
-    V_DrawPatch(38, 162, PatchINVBAR);
-    for (i = 0; i < 7; i++)
-    {
-        //V_DrawPatch(50+i*31, 160, W_CacheLumpName("ARTIBOX", PU_CACHE));
-        if (CPlayer->inventorySlotNum > x + i
-            && CPlayer->inventory[x + i].type != arti_none)
-        {
-            V_DrawPatch(50 + i * 31, 163,
-                        W_CacheLumpName(patcharti
-                                        [CPlayer->inventory[x + i].type],
-                                        PU_CACHE));
-            if (CPlayer->inventory[x + i].count > 1)
-            {
-                DrSmallNumber(CPlayer->inventory[x + i].count, 68 + i * 31,
-                              185);
-            }
-        }
-    }
-    V_DrawPatch(50 + curpos * 31, 163, PatchSELECTBOX);
-    if (x != 0)
-    {
-        V_DrawPatch(42, 163, !(leveltime & 4) ? PatchINVLFGEM1 :
-                    PatchINVLFGEM2);
-    }
-    if (CPlayer->inventorySlotNum - x > 7)
-    {
-        V_DrawPatch(269, 163, !(leveltime & 4) ? PatchINVRTGEM1 :
-                    PatchINVRTGEM2);
-    }
-}
-
-//==========================================================================
-//
-// DrawKeyBar
-//
-//==========================================================================
-
-void DrawKeyBar(void)
-{
-    int i;
-    int xPosition;
-    int temp;
-
-    if (oldkeys != CPlayer->keys)
-    {
-        xPosition = 46;
-        for (i = 0; i < NUM_KEY_TYPES && xPosition <= 126; i++)
-        {
-            if (CPlayer->keys & (1 << i))
-            {
-                V_DrawPatch(xPosition, 164,
-                            W_CacheLumpNum(W_GetNumForName("keyslot1") + i,
-                                           PU_CACHE));
-                xPosition += 20;
-            }
-        }
-        oldkeys = CPlayer->keys;
-        UpdateState |= I_STATBAR;
-    }
-    temp = AutoArmorSave[CPlayer->class]
-        + CPlayer->armorpoints[ARMOR_ARMOR] +
-        CPlayer->armorpoints[ARMOR_SHIELD] +
-        CPlayer->armorpoints[ARMOR_HELMET] +
-        CPlayer->armorpoints[ARMOR_AMULET];
-    if (oldarmor != temp)
-    {
-        for (i = 0; i < NUMARMOR; i++)
-        {
-            if (!CPlayer->armorpoints[i])
-            {
-                continue;
-            }
-            if (CPlayer->armorpoints[i] <=
-                (ArmorIncrement[CPlayer->class][i] >> 2))
-            {
-                V_DrawTLPatch(150 + 31 * i, 164,
-                              W_CacheLumpNum(W_GetNumForName("armslot1") +
-                                             i, PU_CACHE));
-            }
-            else if (CPlayer->armorpoints[i] <=
-                     (ArmorIncrement[CPlayer->class][i] >> 1))
-            {
-                V_DrawAltTLPatch(150 + 31 * i, 164,
-                                 W_CacheLumpNum(W_GetNumForName("armslot1")
-                                                + i, PU_CACHE));
-            }
-            else
-            {
-                V_DrawPatch(150 + 31 * i, 164,
-                            W_CacheLumpNum(W_GetNumForName("armslot1") + i,
-                                           PU_CACHE));
-            }
-        }
-        oldarmor = temp;
-        UpdateState |= I_STATBAR;
-    }
-}
-
-//==========================================================================
-//
-// DrawWeaponPieces
-//
-//==========================================================================
-
-static int PieceX[NUMCLASSES][3] = {
-    {190, 225, 234},
-    {190, 212, 225},
-    {190, 205, 224},
-    {0, 0, 0}                   // Pig is never used
-};
-
-static void DrawWeaponPieces(void)
-{
-    if (CPlayer->pieces == 7)
-    {
-        V_DrawPatch(190, 162, PatchWEAPONFULL);
-        return;
-    }
-    V_DrawPatch(190, 162, PatchWEAPONSLOT);
-    if (CPlayer->pieces & WPIECE1)
-    {
-        V_DrawPatch(PieceX[PlayerClass[consoleplayer]][0], 162, PatchPIECE1);
-    }
-    if (CPlayer->pieces & WPIECE2)
-    {
-        V_DrawPatch(PieceX[PlayerClass[consoleplayer]][1], 162, PatchPIECE2);
-    }
-    if (CPlayer->pieces & WPIECE3)
-    {
-        V_DrawPatch(PieceX[PlayerClass[consoleplayer]][2], 162, PatchPIECE3);
-    }
-}
-
-//==========================================================================
-//
-// DrawFullScreenStuff
-//
-//==========================================================================
-
-void DrawFullScreenStuff(void)
-{
-    int i;
-    int x;
-    int temp;
-
-    UpdateState |= I_FULLSCRN;
-    if (CPlayer->mo->health > 0)
-    {
-        DrBNumber(CPlayer->mo->health, 5, 180);
-    }
-    else
-    {
-        DrBNumber(0, 5, 180);
-    }
-    if (deathmatch)
-    {
-        temp = 0;
-        for (i = 0; i < maxplayers; i++)
-        {
-            if (playeringame[i])
-            {
-                temp += CPlayer->frags[i];
-            }
-        }
-        DrINumber(temp, 45, 185);
-    }
-    if (!inventory)
-    {
-        if (CPlayer->readyArtifact > 0)
-        {
-            V_DrawTLPatch(286, 170, W_CacheLumpName("ARTIBOX", PU_CACHE));
-            V_DrawPatch(284, 169,
-                        W_CacheLumpName(patcharti[CPlayer->readyArtifact],
-                                        PU_CACHE));
-            if (CPlayer->inventory[inv_ptr].count > 1)
-            {
-                DrSmallNumber(CPlayer->inventory[inv_ptr].count, 302, 192);
-            }
-        }
-    }
-    else
-    {
-        x = inv_ptr - curpos;
-        for (i = 0; i < 7; i++)
-        {
-            V_DrawTLPatch(50 + i * 31, 168, W_CacheLumpName("ARTIBOX",
-                                                            PU_CACHE));
-            if (CPlayer->inventorySlotNum > x + i
-                && CPlayer->inventory[x + i].type != arti_none)
-            {
-                V_DrawPatch(49 + i * 31, 167,
-                            W_CacheLumpName(patcharti
-                                            [CPlayer->inventory[x + i].type],
-                                            PU_CACHE));
-                if (CPlayer->inventory[x + i].count > 1)
-                {
-                    DrSmallNumber(CPlayer->inventory[x + i].count,
-                                  66 + i * 31, 188);
-                }
-            }
-        }
-        V_DrawPatch(50 + curpos * 31, 167, PatchSELECTBOX);
-        if (x != 0)
-        {
-            V_DrawPatch(40, 167, !(leveltime & 4) ? PatchINVLFGEM1 :
-                        PatchINVLFGEM2);
-        }
-        if (CPlayer->inventorySlotNum - x > 7)
-        {
-            V_DrawPatch(268, 167, !(leveltime & 4) ?
-                        PatchINVRTGEM1 : PatchINVRTGEM2);
-        }
-    }
-}
-
-
-//==========================================================================
-//
-// Draw_TeleportIcon
-//
-//==========================================================================
-void Draw_TeleportIcon(void)
-{
-    patch_t *patch;
-    patch = W_CacheLumpNum(W_GetNumForName("teleicon"), PU_CACHE);
-    V_DrawPatch(100, 68, patch);
-    UpdateState |= I_FULLSCRN;
-    I_FinishUpdate();
-    UpdateState |= I_FULLSCRN;
-}
-
-//==========================================================================
-//
-// Draw_SaveIcon
-//
-//==========================================================================
-void Draw_SaveIcon(void)
-{
-    patch_t *patch;
-    patch = W_CacheLumpNum(W_GetNumForName("saveicon"), PU_CACHE);
-    V_DrawPatch(100, 68, patch);
-    UpdateState |= I_FULLSCRN;
-    I_FinishUpdate();
-    UpdateState |= I_FULLSCRN;
-}
-
-//==========================================================================
-//
-// Draw_LoadIcon
-//
-//==========================================================================
-void Draw_LoadIcon(void)
-{
-    patch_t *patch;
-    patch = W_CacheLumpNum(W_GetNumForName("loadicon"), PU_CACHE);
-    V_DrawPatch(100, 68, patch);
-    UpdateState |= I_FULLSCRN;
-    I_FinishUpdate();
-    UpdateState |= I_FULLSCRN;
-}
-
-
-
-//==========================================================================
-//
-// SB_Responder
-//
-//==========================================================================
-
-boolean SB_Responder(event_t * event)
-{
-    if (event->type == ev_keydown)
-    {
-        if (HandleCheats(event->data1))
-        {                       // Need to eat the key
-            return (true);
-        }
-    }
-    return (false);
-}
-
-//==========================================================================
-//
-// HandleCheats
-//
-// Returns true if the caller should eat the key.
-//
-//==========================================================================
-
-static boolean HandleCheats(byte key)
-{
-    int i;
-    boolean eat;
-
-    if (gameskill == sk_nightmare)
-    {                           // Can't cheat in nightmare mode
-        return (false);
-    }
-    else if (netgame)
-    {                           // change CD track is the only cheat available in deathmatch
-        eat = false;
-        if (cdmusic)
-        {
-            if (CheatAddKey(&Cheats[0], key, &eat))
-            {
-                Cheats[0].func(&players[consoleplayer], &Cheats[0]);
-                S_StartSound(NULL, SFX_PLATFORM_STOP);
-            }
-            if (CheatAddKey(&Cheats[1], key, &eat))
-            {
-                Cheats[1].func(&players[consoleplayer], &Cheats[1]);
-                S_StartSound(NULL, SFX_PLATFORM_STOP);
-            }
-        }
-        return eat;
-    }
-    if (players[consoleplayer].health <= 0)
-    {                           // Dead players can't cheat
-        return (false);
-    }
-    eat = false;
-    for (i = 0; i<arrlen(Cheats); ++i)
-    {
-        if (CheatAddKey(&Cheats[i], key, &eat))
-        {
-            Cheats[i].func(&players[consoleplayer], &Cheats[i]);
-            S_StartSound(NULL, SFX_PLATFORM_STOP);
-        }
-    }
-    return (eat);
-}
-
-//==========================================================================
-//
-// CheatAddkey
-//
-// Returns true if the added key completed the cheat, false otherwise.
-//
-//==========================================================================
-
-static boolean CheatAddKey(Cheat_t * cheat, byte key, boolean * eat)
-{
-/*
-    if (!cheat->pos)
-    {
-        cheat->pos = cheat->sequence;
-        cheat->currentArg = 0;
-    }
-    if (*cheat->pos == 0)
-    {
-        *eat = true;
-        cheat->args[cheat->currentArg++] = key;
-        cheat->pos++;
-    }
-    else if (CheatLookup[key] == *cheat->pos)
-    {
-        cheat->pos++;
-    }
-    else
-    {
-        cheat->pos = cheat->sequence;
-        cheat->currentArg = 0;
-    }
-    if (*cheat->pos == 0xff)
-    {
-        cheat->pos = cheat->sequence;
-        cheat->currentArg = 0;
-        return (true);
-    }
-    return (false);
-    */
-
-    *eat = cht_CheckCheat(cheat->seq, key);
-
-    return *eat;
-}
-
-//==========================================================================
-//
-// CHEAT FUNCTIONS
-//
-//==========================================================================
-
-static void CheatGodFunc(player_t * player, Cheat_t * cheat)
-{
-    player->cheats ^= CF_GODMODE;
-    if (player->cheats & CF_GODMODE)
-    {
-        P_SetMessage(player, TXT_CHEATGODON, true);
-    }
-    else
-    {
-        P_SetMessage(player, TXT_CHEATGODOFF, true);
-    }
-    SB_state = -1;
-}
-
-static void CheatNoClipFunc(player_t * player, Cheat_t * cheat)
-{
-    player->cheats ^= CF_NOCLIP;
-    if (player->cheats & CF_NOCLIP)
-    {
-        P_SetMessage(player, TXT_CHEATNOCLIPON, true);
-    }
-    else
-    {
-        P_SetMessage(player, TXT_CHEATNOCLIPOFF, true);
-    }
-}
-
-static void CheatWeaponsFunc(player_t * player, Cheat_t * cheat)
-{
-    int i;
-
-    for (i = 0; i < NUMARMOR; i++)
-    {
-        player->armorpoints[i] = ArmorIncrement[player->class][i];
-    }
-    for (i = 0; i < NUMWEAPONS; i++)
-    {
-        player->weaponowned[i] = true;
-    }
-    for (i = 0; i < NUMMANA; i++)
-    {
-        player->mana[i] = MAX_MANA;
-    }
-    P_SetMessage(player, TXT_CHEATWEAPONS, true);
-}
-
-static void CheatHealthFunc(player_t * player, Cheat_t * cheat)
-{
-    if (player->morphTics)
-    {
-        player->health = player->mo->health = MAXMORPHHEALTH;
-    }
-    else
-    {
-        player->health = player->mo->health = MAXHEALTH;
-    }
-    P_SetMessage(player, TXT_CHEATHEALTH, true);
-}
-
-static void CheatKeysFunc(player_t * player, Cheat_t * cheat)
-{
-    player->keys = 2047;
-    P_SetMessage(player, TXT_CHEATKEYS, true);
-}
-
-static void CheatSoundFunc(player_t * player, Cheat_t * cheat)
-{
-    DebugSound = !DebugSound;
-    if (DebugSound)
-    {
-        P_SetMessage(player, TXT_CHEATSOUNDON, true);
-    }
-    else
-    {
-        P_SetMessage(player, TXT_CHEATSOUNDOFF, true);
-    }
-}
-
-static void CheatTickerFunc(player_t * player, Cheat_t * cheat)
-{
-    DisplayTicker = !DisplayTicker;
-    if (DisplayTicker)
-    {
-        P_SetMessage(player, TXT_CHEATTICKERON, true);
-    }
-    else
-    {
-        P_SetMessage(player, TXT_CHEATTICKEROFF, true);
-    }
-
-    I_DisplayFPSDots(DisplayTicker);
-}
-
-static void CheatArtifactAllFunc(player_t * player, Cheat_t * cheat)
-{
-    int i;
-    int j;
-
-    for (i = arti_none + 1; i < arti_firstpuzzitem; i++)
-    {
-        for (j = 0; j < 25; j++)
-        {
-            P_GiveArtifact(player, i, NULL);
-        }
-    }
-    P_SetMessage(player, TXT_CHEATARTIFACTS3, true);
-}
-
-static void CheatPuzzleFunc(player_t * player, Cheat_t * cheat)
-{
-    int i;
-
-    for (i = arti_firstpuzzitem; i < NUMARTIFACTS; i++)
-    {
-        P_GiveArtifact(player, i, NULL);
-    }
-    P_SetMessage(player, TXT_CHEATARTIFACTS3, true);
-}
-
-static void CheatInitFunc(player_t * player, Cheat_t * cheat)
-{
-    G_DeferedInitNew(gameskill, gameepisode, gamemap);
-    P_SetMessage(player, TXT_CHEATWARP, true);
-}
-
-static void CheatWarpFunc(player_t * player, Cheat_t * cheat)
-{
-    int tens;
-    int ones;
-    int map;
-    char mapName[9];
-    char args[2];
-
-    cht_GetParam(cheat->seq, args);
-
-    tens = args[0] - '0';
-    ones = args[1] - '0';
-    if (tens < 0 || tens > 9 || ones < 0 || ones > 9)
-    {                           // Bad map
-        P_SetMessage(player, TXT_CHEATBADINPUT, true);
-        return;
-    }
-    map = P_TranslateMap((args[0] - '0') * 10 + args[1] - '0');
-    if (map == -1)
-    {                           // Not found
-        P_SetMessage(player, TXT_CHEATNOMAP, true);
-        return;
-    }
-    if (map == gamemap)
-    {                           // Don't try to teleport to current map
-        P_SetMessage(player, TXT_CHEATBADINPUT, true);
-        return;
-    }
-    M_snprintf(mapName, sizeof(mapName), "MAP%02d", map);
-    if (W_CheckNumForName(mapName) == -1)
-    {                       // Can't find
-        P_SetMessage(player, TXT_CHEATNOMAP, true);
-        return;
-    }
-    P_SetMessage(player, TXT_CHEATWARP, true);
-    G_TeleportNewMap(map, 0);
-}
-
-static void CheatPigFunc(player_t * player, Cheat_t * cheat)
-{
-    if (player->morphTics)
-    {
-        P_UndoPlayerMorph(player);
-    }
-    else
-    {
-        P_MorphPlayer(player);
-    }
-    P_SetMessage(player, "SQUEAL!!", true);
-}
-
-static void CheatMassacreFunc(player_t * player, Cheat_t * cheat)
-{
-    int count;
-    char buffer[80];
-
-    count = P_Massacre();
-    M_snprintf(buffer, sizeof(buffer), "%d MONSTERS KILLED\n", count);
-    P_SetMessage(player, buffer, true);
-}
-
-static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat)
-{
-    int i;
-    if (player->morphTics)
-    {
-        return;
-    }
-    for (i = 1; i < NUMWEAPONS; i++)
-    {
-        player->weaponowned[i] = false;
-    }
-
-    // In the original code, NUMWEAPONS was 8. So the writes to weaponowned
-    // overflowed the array. We must set the following fields to zero as
-    // well:
-
-    player->mana[0] = 0;
-    player->mana[1] = 0;
-    player->attackdown = 0;
-    player->usedown = 0;
-
-    player->pendingweapon = WP_FIRST;
-    P_SetMessage(player, TXT_CHEATIDKFA, true);
-}
-
-static void CheatQuickenFunc1(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, "TRYING TO CHEAT?  THAT'S ONE....", true);
-}
-
-static void CheatQuickenFunc2(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, "THAT'S TWO....", true);
-}
-
-static void CheatQuickenFunc3(player_t * player, Cheat_t * cheat)
-{
-    P_DamageMobj(player->mo, NULL, player->mo, 10000);
-    P_SetMessage(player, "THAT'S THREE!  TIME TO DIE.", true);
-}
-
-static void CheatClassFunc1(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, "ENTER NEW PLAYER CLASS (0 - 2)", true);
-}
-
-static void CheatClassFunc2(player_t * player, Cheat_t * cheat)
-{
-    int i;
-    int class;
-    char args[2];
-
-    cht_GetParam(cheat->seq, args);
-
-    if (player->morphTics)
-    {                           // don't change class if the player is morphed
-        return;
-    }
-    class = args[0] - '0';
-    if (class > 2 || class < 0)
-    {
-        P_SetMessage(player, "INVALID PLAYER CLASS", true);
-        return;
-    }
-    player->class = class;
-    for (i = 0; i < NUMARMOR; i++)
-    {
-        player->armorpoints[i] = 0;
-    }
-    PlayerClass[consoleplayer] = class;
-    P_PostMorphWeapon(player, WP_FIRST);
-    SB_SetClassData();
-    SB_state = -1;
-    UpdateState |= I_FULLSCRN;
-}
-
-static void CheatVersionFunc(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, HEXEN_VERSIONTEXT, true);
-}
-
-static void CheatDebugFunc(player_t * player, Cheat_t * cheat)
-{
-    char textBuffer[50];
-    M_snprintf(textBuffer, sizeof(textBuffer),
-               "MAP %d (%d)  X:%5d  Y:%5d  Z:%5d",
-               P_GetMapWarpTrans(gamemap),
-               gamemap,
-               player->mo->x >> FRACBITS,
-               player->mo->y >> FRACBITS, player->mo->z >> FRACBITS);
-    P_SetMessage(player, textBuffer, true);
-}
-
-static void CheatScriptFunc1(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, "RUN WHICH SCRIPT(01-99)?", true);
-}
-
-static void CheatScriptFunc2(player_t * player, Cheat_t * cheat)
-{
-    P_SetMessage(player, "RUN WHICH SCRIPT(01-99)?", true);
-}
-
-static void CheatScriptFunc3(player_t * player, Cheat_t * cheat)
-{
-    int script;
-    byte script_args[3];
-    int tens, ones;
-    char textBuffer[40];
-    char args[2];
-
-    cht_GetParam(cheat->seq, args);
-
-    tens = args[0] - '0';
-    ones = args[1] - '0';
-    script = tens * 10 + ones;
-    if (script < 1)
-        return;
-    if (script > 99)
-        return;
-    script_args[0] = script_args[1] = script_args[2] = 0;
-
-    if (P_StartACS(script, 0, script_args, player->mo, NULL, 0))
-    {
-        M_snprintf(textBuffer, sizeof(textBuffer),
-                   "RUNNING SCRIPT %.2d", script);
-        P_SetMessage(player, textBuffer, true);
-    }
-}
-
-
-static void CheatRevealFunc(player_t * player, Cheat_t * cheat)
-{
-    cheating = (cheating + 1) % 3;
-}
-
-//===========================================================================
-//
-// CheatTrackFunc1
-//
-//===========================================================================
-
-static void CheatTrackFunc1(player_t * player, Cheat_t * cheat)
-{
-    char buffer[80];
-
-    if (!cdmusic)
-    {
-        return;
-    }
-
-    if (I_CDMusInit() == -1)
-    {
-        P_SetMessage(player, "ERROR INITIALIZING CD", true);
-    }
-
-    M_snprintf(buffer, sizeof(buffer), "ENTER DESIRED CD TRACK (%.2d - %.2d):\n",
-               I_CDMusFirstTrack(), I_CDMusLastTrack());
-    P_SetMessage(player, buffer, true);
-}
-
-//===========================================================================
-//
-// CheatTrackFunc2
-//
-//===========================================================================
-
-static void CheatTrackFunc2(player_t * player, Cheat_t * cheat)
-{
-    char buffer[80];
-    int track;
-    char args[2];
-
-    cht_GetParam(cheat->seq, args);
-
-    if (!cdmusic)
-    {
-        return;
-    }
-
-    track = (args[0] - '0') * 10 + (args[1] - '0');
-    if (track < I_CDMusFirstTrack() || track > I_CDMusLastTrack())
-    {
-        P_SetMessage(player, "INVALID TRACK NUMBER\n", true);
-        return;
-    }
-
-    if (track == S_GetCurrentCDTrack())
-    {
-        return;
-    }
-
-    if (!S_StartCustomCDTrack(track))
-    {
-        M_snprintf(buffer, sizeof(buffer),
-                   "ERROR WHILE TRYING TO PLAY CD TRACK: %.2d\n", track);
-        P_SetMessage(player, buffer, true);
-    }
-    else
-    {
-        // No error encountered while attempting to play the track
-        M_snprintf(buffer, sizeof(buffer), "PLAYING TRACK: %.2d\n", track);
-        P_SetMessage(player, buffer, true);
-    }
-}
diff --git a/games/NXDoom/src/hexen/sc_man.c b/games/NXDoom/src/hexen/sc_man.c
deleted file mode 100644
index 489bc72e0..000000000
--- a/games/NXDoom/src/hexen/sc_man.c
+++ /dev/null
@@ -1,465 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include <string.h>
-#include <stdlib.h>
-#include "h2def.h"
-#include "i_system.h"
-#include "m_misc.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAX_STRING_SIZE 64
-#define ASCII_COMMENT (';')
-#define ASCII_QUOTE (34)
-#define LUMP_SCRIPT 1
-#define FILE_ZONE_SCRIPT 2
-
-// TYPES -------------------------------------------------------------------
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void CheckOpen(void);
-static void OpenScript(const char *name, int type);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-char *sc_String;
-int sc_Number;
-int sc_Line;
-boolean sc_End;
-boolean sc_Crossed;
-boolean sc_FileScripts = false;
-const char *sc_ScriptsDir = "";
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static char ScriptName[16];
-static char *ScriptBuffer;
-static char *ScriptPtr;
-static char *ScriptEndPtr;
-static char StringBuffer[MAX_STRING_SIZE];
-static int ScriptLumpNum;
-static boolean ScriptOpen = false;
-static int ScriptSize;
-static boolean AlreadyGot = false;
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// SC_Open
-//
-//==========================================================================
-
-void SC_Open(const char *name)
-{
-    char fileName[128];
-
-    if (sc_FileScripts == true)
-    {
-        M_snprintf(fileName, sizeof(fileName), "%s%s.txt", sc_ScriptsDir, name);
-        SC_OpenFile(fileName);
-    }
-    else
-    {
-        SC_OpenLump(name);
-    }
-}
-
-//==========================================================================
-//
-// SC_OpenLump
-//
-// Loads a script (from the WAD files) and prepares it for parsing.
-//
-//==========================================================================
-
-void SC_OpenLump(const char *name)
-{
-    OpenScript(name, LUMP_SCRIPT);
-}
-
-//==========================================================================
-//
-// SC_OpenFile
-//
-// Loads a script (from a file) and prepares it for parsing.  Uses the
-// zone memory allocator for memory allocation and de-allocation.
-//
-//==========================================================================
-
-void SC_OpenFile(const char *name)
-{
-    OpenScript(name, FILE_ZONE_SCRIPT);
-}
-
-//==========================================================================
-//
-// OpenScript
-//
-//==========================================================================
-
-static void OpenScript(const char *name, int type)
-{
-    SC_Close();
-    if (type == LUMP_SCRIPT)
-    {                           // Lump script
-        ScriptLumpNum = W_GetNumForName(name);
-        ScriptBuffer = (char *) W_CacheLumpNum(ScriptLumpNum, PU_STATIC);
-        ScriptSize = W_LumpLength(ScriptLumpNum);
-        M_StringCopy(ScriptName, name, sizeof(ScriptName));
-    }
-    else if (type == FILE_ZONE_SCRIPT)
-    {                           // File script - zone
-        ScriptLumpNum = -1;
-        ScriptSize = M_ReadFile(name, (byte **) & ScriptBuffer);
-        M_ExtractFileBase(name, ScriptName);
-    }
-    ScriptPtr = ScriptBuffer;
-    ScriptEndPtr = ScriptPtr + ScriptSize;
-    sc_Line = 1;
-    sc_End = false;
-    ScriptOpen = true;
-    sc_String = StringBuffer;
-    AlreadyGot = false;
-}
-
-//==========================================================================
-//
-// SC_Close
-//
-//==========================================================================
-
-void SC_Close(void)
-{
-    if (ScriptOpen)
-    {
-        if (ScriptLumpNum >= 0)
-        {
-            W_ReleaseLumpNum(ScriptLumpNum);
-        }
-        else
-        {
-            Z_Free(ScriptBuffer);
-        }
-        ScriptOpen = false;
-    }
-}
-
-//==========================================================================
-//
-// SC_GetString
-//
-//==========================================================================
-
-boolean SC_GetString(void)
-{
-    char *text;
-    boolean foundToken;
-
-    CheckOpen();
-    if (AlreadyGot)
-    {
-        AlreadyGot = false;
-        return true;
-    }
-    foundToken = false;
-    sc_Crossed = false;
-    if (ScriptPtr >= ScriptEndPtr)
-    {
-        sc_End = true;
-        return false;
-    }
-    while (foundToken == false)
-    {
-        while (ScriptPtr < ScriptEndPtr && *ScriptPtr <= 32)
-        {
-            if (*ScriptPtr++ == '\n')
-            {
-                sc_Line++;
-                sc_Crossed = true;
-            }
-        }
-        if (ScriptPtr >= ScriptEndPtr)
-        {
-            sc_End = true;
-            return false;
-        }
-        if (*ScriptPtr != ASCII_COMMENT)
-        {                       // Found a token
-            foundToken = true;
-        }
-        else
-        {                       // Skip comment
-            while (*ScriptPtr++ != '\n')
-            {
-                if (ScriptPtr >= ScriptEndPtr)
-                {
-                    sc_End = true;
-                    return false;
-                }
-            }
-            sc_Line++;
-            sc_Crossed = true;
-        }
-    }
-    text = sc_String;
-    if (*ScriptPtr == ASCII_QUOTE)
-    {                           // Quoted string
-        ScriptPtr++;
-        while (*ScriptPtr != ASCII_QUOTE)
-        {
-            *text++ = *ScriptPtr++;
-            if (ScriptPtr == ScriptEndPtr
-                || text == &sc_String[MAX_STRING_SIZE - 1])
-            {
-                break;
-            }
-        }
-        ScriptPtr++;
-    }
-    else
-    {                           // Normal string
-        while ((*ScriptPtr > 32) && (*ScriptPtr != ASCII_COMMENT))
-        {
-            *text++ = *ScriptPtr++;
-            if (ScriptPtr == ScriptEndPtr
-                || text == &sc_String[MAX_STRING_SIZE - 1])
-            {
-                break;
-            }
-        }
-    }
-    *text = 0;
-    return true;
-}
-
-//==========================================================================
-//
-// SC_MustGetString
-//
-//==========================================================================
-
-void SC_MustGetString(void)
-{
-    if (SC_GetString() == false)
-    {
-        SC_ScriptError("Missing string.");
-    }
-}
-
-//==========================================================================
-//
-// SC_MustGetStringName
-//
-//==========================================================================
-
-void SC_MustGetStringName(char *name)
-{
-    SC_MustGetString();
-    if (SC_Compare(name) == false)
-    {
-        SC_ScriptError(NULL);
-    }
-}
-
-//==========================================================================
-//
-// SC_GetNumber
-//
-//==========================================================================
-
-boolean SC_GetNumber(void)
-{
-    char *stopper;
-
-    CheckOpen();
-    if (SC_GetString())
-    {
-        sc_Number = strtol(sc_String, &stopper, 0);
-        if (*stopper != 0)
-        {
-            I_Error("SC_GetNumber: Bad numeric constant \"%s\".\n"
-                    "Script %s, Line %d", sc_String, ScriptName, sc_Line);
-        }
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-//==========================================================================
-//
-// SC_MustGetNumber
-//
-//==========================================================================
-
-void SC_MustGetNumber(void)
-{
-    if (SC_GetNumber() == false)
-    {
-        SC_ScriptError("Missing integer.");
-    }
-}
-
-//==========================================================================
-//
-// SC_UnGet
-//
-// Assumes there is a valid string in sc_String.
-//
-//==========================================================================
-
-void SC_UnGet(void)
-{
-    AlreadyGot = true;
-}
-
-//==========================================================================
-//
-// SC_Check
-//
-// Returns true if another token is on the current line.
-//
-//==========================================================================
-
-/*
-boolean SC_Check(void)
-{
-	char *text;
-
-	CheckOpen();
-	text = ScriptPtr;
-	if(text >= ScriptEndPtr)
-	{
-		return false;
-	}
-	while(*text <= 32)
-	{
-		if(*text == '\n')
-		{
-			return false;
-		}
-		text++;
-		if(text == ScriptEndPtr)
-		{
-			return false;
-		}
-	}
-	if(*text == ASCII_COMMENT)
-	{
-		return false;
-	}
-	return true;
-}
-*/
-
-//==========================================================================
-//
-// SC_MatchString
-//
-// Returns the index of the first match to sc_String from the passed
-// array of strings, or -1 if not found.
-//
-//==========================================================================
-
-int SC_MatchString(const char **strings)
-{
-    int i;
-
-    for (i = 0; *strings != NULL; i++)
-    {
-        if (SC_Compare(*strings++))
-        {
-            return i;
-        }
-    }
-    return -1;
-}
-
-//==========================================================================
-//
-// SC_MustMatchString
-//
-//==========================================================================
-
-int SC_MustMatchString(const char **strings)
-{
-    int i;
-
-    i = SC_MatchString(strings);
-    if (i == -1)
-    {
-        SC_ScriptError(NULL);
-    }
-    return i;
-}
-
-//==========================================================================
-//
-// SC_Compare
-//
-//==========================================================================
-
-boolean SC_Compare(const char *text)
-{
-    if (strcasecmp(text, sc_String) == 0)
-    {
-        return true;
-    }
-    return false;
-}
-
-//==========================================================================
-//
-// SC_ScriptError
-//
-//==========================================================================
-
-void SC_ScriptError(const char *message)
-{
-    if (message == NULL)
-    {
-        message = "Bad syntax.";
-    }
-    I_Error("Script error, \"%s\" line %d: %s", ScriptName, sc_Line, message);
-}
-
-//==========================================================================
-//
-// CheckOpen
-//
-//==========================================================================
-
-static void CheckOpen(void)
-{
-    if (ScriptOpen == false)
-    {
-        I_Error("SC_ call before SC_Open().");
-    }
-}
diff --git a/games/NXDoom/src/hexen/sn_sonix.c b/games/NXDoom/src/hexen/sn_sonix.c
deleted file mode 100644
index 81c506bab..000000000
--- a/games/NXDoom/src/hexen/sn_sonix.c
+++ /dev/null
@@ -1,535 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include <string.h>
-#include "m_random.h"
-#include "h2def.h"
-#include "i_system.h"
-#include "i_sound.h"
-#include "s_sound.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define SS_MAX_SCRIPTS	64
-#define SS_TEMPBUFFER_SIZE	1024
-#define SS_SEQUENCE_NAME_LENGTH 32
-
-#define SS_SCRIPT_NAME "SNDSEQ"
-#define SS_STRING_PLAY			"play"
-#define SS_STRING_PLAYUNTILDONE "playuntildone"
-#define SS_STRING_PLAYTIME		"playtime"
-#define SS_STRING_PLAYREPEAT	"playrepeat"
-#define SS_STRING_DELAY			"delay"
-#define SS_STRING_DELAYRAND		"delayrand"
-#define SS_STRING_VOLUME		"volume"
-#define SS_STRING_END			"end"
-#define SS_STRING_STOPSOUND		"stopsound"
-
-// TYPES -------------------------------------------------------------------
-
-typedef enum
-{
-    SS_CMD_NONE,
-    SS_CMD_PLAY,
-    SS_CMD_WAITUNTILDONE,       // used by PLAYUNTILDONE
-    SS_CMD_PLAYTIME,
-    SS_CMD_PLAYREPEAT,
-    SS_CMD_DELAY,
-    SS_CMD_DELAYRAND,
-    SS_CMD_VOLUME,
-    SS_CMD_STOPSOUND,
-    SS_CMD_END
-} sscmds_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void VerifySequencePtr(int *base, int *ptr);
-static int GetSoundOffset(char *name);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static struct
-{
-    char name[SS_SEQUENCE_NAME_LENGTH];
-    int scriptNum;
-    int stopSound;
-} SequenceTranslate[SEQ_NUMSEQ] =
-{
-    {
-    "Platform", 0, 0},
-    {
-    "Platform", 0, 0},          // a 'heavy' platform is just a platform
-    {
-    "PlatformMetal", 0, 0},
-    {
-    "Platform", 0, 0},          // same with a 'creak' platform
-    {
-    "Silence", 0, 0},
-    {
-    "Lava", 0, 0},
-    {
-    "Water", 0, 0},
-    {
-    "Ice", 0, 0},
-    {
-    "Earth", 0, 0},
-    {
-    "PlatformMetal2", 0, 0},
-    {
-    "DoorNormal", 0, 0},
-    {
-    "DoorHeavy", 0, 0},
-    {
-    "DoorMetal", 0, 0},
-    {
-    "DoorCreak", 0, 0},
-    {
-    "Silence", 0, 0},
-    {
-    "Lava", 0, 0},
-    {
-    "Water", 0, 0},
-    {
-    "Ice", 0, 0},
-    {
-    "Earth", 0, 0},
-    {
-    "DoorMetal2", 0, 0},
-    {
-    "Wind", 0, 0}
-};
-
-static int *SequenceData[SS_MAX_SCRIPTS];
-
-int ActiveSequences;
-seqnode_t *SequenceListHead;
-
-// CODE --------------------------------------------------------------------
-
-//==========================================================================
-//
-// VerifySequencePtr
-//
-//   Verifies the integrity of the temporary ptr, and ensures that the ptr
-//              isn't exceeding the size of the temporary buffer
-//==========================================================================
-
-static void VerifySequencePtr(int *base, int *ptr)
-{
-    if (ptr - base > SS_TEMPBUFFER_SIZE)
-    {
-        I_Error("VerifySequencePtr:  tempPtr >= %d\n", SS_TEMPBUFFER_SIZE);
-    }
-}
-
-//==========================================================================
-//
-// GetSoundOffset
-//
-//==========================================================================
-
-static int GetSoundOffset(char *name)
-{
-    int i;
-
-    for (i = 0; i < NUMSFX; i++)
-    {
-        if (!strcasecmp(name, S_sfx[i].tagname))
-        {
-            return i;
-        }
-    }
-    SC_ScriptError("GetSoundOffset:  Unknown sound name\n");
-    return 0;
-}
-
-//==========================================================================
-//
-// SN_InitSequenceScript
-//
-//==========================================================================
-
-void SN_InitSequenceScript(void)
-{
-    int i, j;
-    int inSequence;
-    int *tempDataStart = NULL;
-    int *tempDataPtr = NULL;
-
-    inSequence = -1;
-    ActiveSequences = 0;
-    for (i = 0; i < SS_MAX_SCRIPTS; i++)
-    {
-        SequenceData[i] = NULL;
-    }
-    SC_Open(SS_SCRIPT_NAME);
-    while (SC_GetString())
-    {
-        if (*sc_String == ':')
-        {
-            if (inSequence != -1)
-            {
-                SC_ScriptError("SN_InitSequenceScript:  Nested Script Error");
-            }
-            tempDataStart = (int *) Z_Malloc(SS_TEMPBUFFER_SIZE,
-                                             PU_STATIC, NULL);
-            memset(tempDataStart, 0, SS_TEMPBUFFER_SIZE);
-            tempDataPtr = tempDataStart;
-            for (i = 0; i < SS_MAX_SCRIPTS; i++)
-            {
-                if (SequenceData[i] == NULL)
-                {
-                    break;
-                }
-            }
-            if (i == SS_MAX_SCRIPTS)
-            {
-                I_Error("Number of SS Scripts >= SS_MAX_SCRIPTS");
-            }
-            for (j = 0; j < SEQ_NUMSEQ; j++)
-            {
-                if (!strcasecmp(SequenceTranslate[j].name, sc_String + 1))
-                {
-                    SequenceTranslate[j].scriptNum = i;
-                    inSequence = j;
-                    break;
-                }
-            }
-            continue;           // parse the next command
-        }
-        if (inSequence == -1)
-        {
-            continue;
-        }
-        if (SC_Compare(SS_STRING_PLAYUNTILDONE))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            SC_MustGetString();
-            *tempDataPtr++ = SS_CMD_PLAY;
-            *tempDataPtr++ = GetSoundOffset(sc_String);
-            *tempDataPtr++ = SS_CMD_WAITUNTILDONE;
-        }
-        else if (SC_Compare(SS_STRING_PLAY))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            SC_MustGetString();
-            *tempDataPtr++ = SS_CMD_PLAY;
-            *tempDataPtr++ = GetSoundOffset(sc_String);
-        }
-        else if (SC_Compare(SS_STRING_PLAYTIME))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            SC_MustGetString();
-            *tempDataPtr++ = SS_CMD_PLAY;
-            *tempDataPtr++ = GetSoundOffset(sc_String);
-            SC_MustGetNumber();
-            *tempDataPtr++ = SS_CMD_DELAY;
-            *tempDataPtr++ = sc_Number;
-        }
-        else if (SC_Compare(SS_STRING_PLAYREPEAT))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            SC_MustGetString();
-            *tempDataPtr++ = SS_CMD_PLAYREPEAT;
-            *tempDataPtr++ = GetSoundOffset(sc_String);
-        }
-        else if (SC_Compare(SS_STRING_DELAY))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            *tempDataPtr++ = SS_CMD_DELAY;
-            SC_MustGetNumber();
-            *tempDataPtr++ = sc_Number;
-        }
-        else if (SC_Compare(SS_STRING_DELAYRAND))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            *tempDataPtr++ = SS_CMD_DELAYRAND;
-            SC_MustGetNumber();
-            *tempDataPtr++ = sc_Number;
-            SC_MustGetNumber();
-            *tempDataPtr++ = sc_Number;
-        }
-        else if (SC_Compare(SS_STRING_VOLUME))
-        {
-            VerifySequencePtr(tempDataStart, tempDataPtr);
-            *tempDataPtr++ = SS_CMD_VOLUME;
-            SC_MustGetNumber();
-            *tempDataPtr++ = sc_Number;
-        }
-        else if (SC_Compare(SS_STRING_END))
-        {
-            int dataSize;
-
-            *tempDataPtr++ = SS_CMD_END;
-            dataSize = (tempDataPtr - tempDataStart) * sizeof(int);
-            SequenceData[i] = (int *) Z_Malloc(dataSize, PU_STATIC, NULL);
-            memcpy(SequenceData[i], tempDataStart, dataSize);
-            Z_Free(tempDataStart);
-            inSequence = -1;
-        }
-        else if (SC_Compare(SS_STRING_STOPSOUND))
-        {
-            SC_MustGetString();
-            SequenceTranslate[inSequence].stopSound =
-                GetSoundOffset(sc_String);
-            *tempDataPtr++ = SS_CMD_STOPSOUND;
-        }
-        else
-        {
-            SC_ScriptError("SN_InitSequenceScript:  Unknown commmand.\n");
-        }
-    }
-}
-
-//==========================================================================
-//
-//  SN_StartSequence
-//
-//==========================================================================
-
-void SN_StartSequence(mobj_t * mobj, int sequence)
-{
-    seqnode_t *node;
-
-    SN_StopSequence(mobj);      // Stop any previous sequence
-    node = (seqnode_t *) Z_Malloc(sizeof(seqnode_t), PU_STATIC, NULL);
-    node->sequencePtr = SequenceData[SequenceTranslate[sequence].scriptNum];
-    node->sequence = sequence;
-    node->mobj = mobj;
-    node->delayTics = 0;
-    node->stopSound = SequenceTranslate[sequence].stopSound;
-    node->volume = 127;         // Start at max volume
-
-    if (!SequenceListHead)
-    {
-        SequenceListHead = node;
-        node->next = node->prev = NULL;
-    }
-    else
-    {
-        SequenceListHead->prev = node;
-        node->next = SequenceListHead;
-        node->prev = NULL;
-        SequenceListHead = node;
-    }
-    ActiveSequences++;
-    return;
-}
-
-//==========================================================================
-//
-//  SN_StartSequenceName
-//
-//==========================================================================
-
-void SN_StartSequenceName(mobj_t * mobj, char *name)
-{
-    int i;
-
-    for (i = 0; i < SEQ_NUMSEQ; i++)
-    {
-        if (!strcmp(name, SequenceTranslate[i].name))
-        {
-            SN_StartSequence(mobj, i);
-            return;
-        }
-    }
-}
-
-//==========================================================================
-//
-//  SN_StopSequence
-//
-//==========================================================================
-
-void SN_StopSequence(mobj_t * mobj)
-{
-    seqnode_t *node;
-
-    for (node = SequenceListHead; node; node = node->next)
-    {
-        if (node->mobj == mobj)
-        {
-            S_StopSound(mobj);
-            if (node->stopSound)
-            {
-                S_StartSoundAtVolume(mobj, node->stopSound, node->volume);
-            }
-            if (SequenceListHead == node)
-            {
-                SequenceListHead = node->next;
-            }
-            if (node->prev)
-            {
-                node->prev->next = node->next;
-            }
-            if (node->next)
-            {
-                node->next->prev = node->prev;
-            }
-            Z_Free(node);
-            ActiveSequences--;
-        }
-    }
-}
-
-//==========================================================================
-//
-//  SN_UpdateActiveSequences
-//
-//==========================================================================
-
-void SN_UpdateActiveSequences(void)
-{
-    seqnode_t *node;
-    boolean sndPlaying;
-
-    if (!ActiveSequences || paused)
-    {                           // No sequences currently playing/game is paused
-        return;
-    }
-    for (node = SequenceListHead; node; node = node->next)
-    {
-        if (node->delayTics)
-        {
-            node->delayTics--;
-            continue;
-        }
-        sndPlaying = S_GetSoundPlayingInfo(node->mobj, node->currentSoundID);
-        switch (*node->sequencePtr)
-        {
-            case SS_CMD_PLAY:
-                if (!sndPlaying)
-                {
-                    node->currentSoundID = *(node->sequencePtr + 1);
-                    S_StartSoundAtVolume(node->mobj, node->currentSoundID,
-                                         node->volume);
-                }
-                node->sequencePtr += 2;
-                break;
-            case SS_CMD_WAITUNTILDONE:
-                if (!sndPlaying)
-                {
-                    node->sequencePtr++;
-                    node->currentSoundID = 0;
-                }
-                break;
-            case SS_CMD_PLAYREPEAT:
-                if (!sndPlaying)
-                {
-                    node->currentSoundID = *(node->sequencePtr + 1);
-                    S_StartSoundAtVolume(node->mobj, node->currentSoundID,
-                                         node->volume);
-                }
-                break;
-            case SS_CMD_DELAY:
-                node->delayTics = *(node->sequencePtr + 1);
-                node->sequencePtr += 2;
-                node->currentSoundID = 0;
-                break;
-            case SS_CMD_DELAYRAND:
-                node->delayTics = *(node->sequencePtr + 1) +
-                    M_Random() % (*(node->sequencePtr + 2) -
-                                  *(node->sequencePtr + 1));
-                node->sequencePtr += 2;
-                node->currentSoundID = 0;
-                break;
-            case SS_CMD_VOLUME:
-                node->volume = (127 * (*(node->sequencePtr + 1))) / 100;
-                node->sequencePtr += 2;
-                break;
-            case SS_CMD_STOPSOUND:
-                // Wait until something else stops the sequence
-                break;
-            case SS_CMD_END:
-                SN_StopSequence(node->mobj);
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-//==========================================================================
-//
-//  SN_StopAllSequences
-//
-//==========================================================================
-
-void SN_StopAllSequences(void)
-{
-    seqnode_t *node;
-
-    for (node = SequenceListHead; node; node = node->next)
-    {
-        node->stopSound = 0;    // don't play any stop sounds
-        SN_StopSequence(node->mobj);
-    }
-}
-
-//==========================================================================
-//
-//  SN_GetSequenceOffset
-//
-//==========================================================================
-
-int SN_GetSequenceOffset(int sequence, int *sequencePtr)
-{
-    return (sequencePtr -
-            SequenceData[SequenceTranslate[sequence].scriptNum]);
-}
-
-//==========================================================================
-//
-//  SN_ChangeNodeData
-//
-//      nodeNum zero is the first node
-//==========================================================================
-
-void SN_ChangeNodeData(int nodeNum, int seqOffset, int delayTics, int volume,
-                       int currentSoundID)
-{
-    int i;
-    seqnode_t *node;
-
-    i = 0;
-    node = SequenceListHead;
-    while (node && i < nodeNum)
-    {
-        node = node->next;
-        i++;
-    }
-    if (!node)
-    {                           // reach the end of the list before finding the nodeNum-th node
-        return;
-    }
-    node->delayTics = delayTics;
-    node->volume = volume;
-    node->sequencePtr += seqOffset;
-    node->currentSoundID = currentSoundID;
-}
diff --git a/games/NXDoom/src/hexen/sounds.c b/games/NXDoom/src/hexen/sounds.c
deleted file mode 100644
index fe322baa4..000000000
--- a/games/NXDoom/src/hexen/sounds.c
+++ /dev/null
@@ -1,313 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#include "h2def.h"
-#include "sounds.h"
-
-// Music info
-
-/*
-musicinfo_t S_music[] =
-{
-	{ "MUS_E1M1", 0 }, // 1-1
-	{ "MUS_E1M2", 0 },
-	{ "MUS_E1M3", 0 },
-	{ "MUS_E1M4", 0 },
-	{ "MUS_E1M5", 0 },
-	{ "MUS_E1M6", 0 },
-	{ "MUS_E1M7", 0 },
-	{ "MUS_E1M8", 0 },
-	{ "MUS_E1M9", 0 },
-	{ "MUS_E2M1", 0 }, // 2-1
-	{ "MUS_E2M2", 0 },
-	{ "MUS_E2M3", 0 },
-	{ "MUS_E2M4", 0 },
-	{ "MUS_E1M4", 0 },
-	{ "MUS_E2M6", 0 },
-	{ "MUS_E2M7", 0 },
-	{ "MUS_E2M8", 0 },
-	{ "MUS_E2M9", 0 },
-	{ "MUS_E1M1", 0 }, // 3-1
-	{ "MUS_E3M2", 0 },
-	{ "MUS_E3M3", 0 },
-	{ "MUS_E1M6", 0 },
-	{ "MUS_E1M3", 0 },
-	{ "MUS_E1M2", 0 },
-	{ "MUS_E1M5", 0 },
-	{ "MUS_E1M9", 0 },
-	{ "MUS_E2M6", 0 },
-	{ "MUS_E1M6", 0 }, // 4-1
-	{ "MUS_TITL", 0 },
-	{ "MUS_INTR", 0 },
-	{ "MUS_CPTD", 0 }
-};
-*/
-
-// Sound info
-
-#define SOUND(name, priority, numchannels, pitchshift) \
-    { name, "", priority, NULL, pitchshift, 0, -1, 0, numchannels, NULL }
-
-sfxinfo_t S_sfx[] = {
-    // tagname, lumpname, priority, usefulness, snd_ptr, lumpnum, numchannels,
-    //              pitchshift
-    SOUND("", 0, 0, 0),
-    SOUND("PlayerFighterNormalDeath", 256, 2, 1),
-    SOUND("PlayerFighterCrazyDeath", 256, 2, 1),
-    SOUND("PlayerFighterExtreme1Death", 256, 2, 1),
-    SOUND("PlayerFighterExtreme2Death", 256, 2, 1),
-    SOUND("PlayerFighterExtreme3Death", 256, 2, 1),
-    SOUND("PlayerFighterBurnDeath", 256, 2, 1),
-    SOUND("PlayerClericNormalDeath", 256, 2, 1),
-    SOUND("PlayerClericCrazyDeath", 256, 2, 1),
-    SOUND("PlayerClericExtreme1Death", 256, 2, 1),
-    SOUND("PlayerClericExtreme2Death", 256, 2, 1),
-    SOUND("PlayerClericExtreme3Death", 256, 2, 1),
-    SOUND("PlayerClericBurnDeath", 256, 2, 1),
-    SOUND("PlayerMageNormalDeath", 256, 2, 0),
-    SOUND("PlayerMageCrazyDeath", 256, 2, 0),
-    SOUND("PlayerMageExtreme1Death", 256, 2, 0),
-    SOUND("PlayerMageExtreme2Death", 256, 2, 0),
-    SOUND("PlayerMageExtreme3Death", 256, 2, 0),
-    SOUND("PlayerMageBurnDeath", 256, 2, 0),
-    SOUND("PlayerFighterPain", 256, 2, 1),
-    SOUND("PlayerClericPain", 256, 2, 1),
-    SOUND("PlayerMagePain", 256, 2, 0),
-    SOUND("PlayerFighterGrunt", 256, 2, 1),
-    SOUND("PlayerClericGrunt", 256, 2, 1),
-    SOUND("PlayerMageGrunt", 256, 2, 0),
-    SOUND("PlayerLand", 32, 2, 1),
-    SOUND("PlayerPoisonCough", 256, 2, 1),
-    SOUND("PlayerFighterFallingScream", 256, 2, 1),
-    SOUND("PlayerClericFallingScream", 256, 2, 1),
-    SOUND("PlayerMageFallingScream", 256, 2, 0),
-    SOUND("PlayerFallingSplat", 256, 2, 1),
-    SOUND("PlayerFighterFailedUse", 256, 1, 1),
-    SOUND("PlayerClericFailedUse", 256, 1, 1),
-    SOUND("PlayerMageFailedUse", 256, 1, 0),
-    SOUND("PlatformStart", 36, 2, 1),
-    SOUND("PlatformStartMetal", 36, 2, 1),
-    SOUND("PlatformStop", 40, 2, 1),
-    SOUND("StoneMove", 32, 2, 1),
-    SOUND("MetalMove", 32, 2, 1),
-    SOUND("DoorOpen", 36, 2, 1),
-    SOUND("DoorLocked", 36, 2, 1),
-    SOUND("DoorOpenMetal", 36, 2, 1),
-    SOUND("DoorCloseMetal", 36, 2, 1),
-    SOUND("DoorCloseLight", 36, 2, 1),
-    SOUND("DoorCloseHeavy", 36, 2, 1),
-    SOUND("DoorCreak", 36, 2, 1),
-    SOUND("PickupWeapon", 36, 2, 0),
-    SOUND("PickupArtifact", 36, 2, 1),
-    SOUND("PickupKey", 36, 2, 1),
-    SOUND("PickupItem", 36, 2, 1),
-    SOUND("PickupPiece", 36, 2, 0),
-    SOUND("WeaponBuild", 36, 2, 0),
-    SOUND("UseArtifact", 36, 2, 1),
-    SOUND("BlastRadius", 36, 2, 1),
-    SOUND("Teleport", 256, 2, 1),
-    SOUND("ThunderCrash", 30, 2, 1),
-    SOUND("FighterPunchMiss", 80, 2, 1),
-    SOUND("FighterPunchHitThing", 80, 2, 1),
-    SOUND("FighterPunchHitWall", 80, 2, 1),
-    SOUND("FighterGrunt", 80, 2, 1),
-    SOUND("FighterAxeHitThing", 80, 2, 1),
-    SOUND("FighterHammerMiss", 80, 2, 1),
-    SOUND("FighterHammerHitThing", 80, 2, 1),
-    SOUND("FighterHammerHitWall", 80, 2, 1),
-    SOUND("FighterHammerContinuous", 32, 2, 1),
-    SOUND("FighterHammerExplode", 80, 2, 1),
-    SOUND("FighterSwordFire", 80, 2, 1),
-    SOUND("FighterSwordExplode", 80, 2, 1),
-    SOUND("ClericCStaffFire", 80, 2, 1),
-    SOUND("ClericCStaffExplode", 40, 2, 1),
-    SOUND("ClericCStaffHitThing", 80, 2, 1),
-    SOUND("ClericFlameFire", 80, 2, 1),
-    SOUND("ClericFlameExplode", 80, 2, 1),
-    SOUND("ClericFlameCircle", 80, 2, 1),
-    SOUND("MageWandFire", 80, 2, 1),
-    SOUND("MageLightningFire", 80, 2, 1),
-    SOUND("MageLightningZap", 32, 2, 1),
-    SOUND("MageLightningContinuous", 32, 2, 1),
-    SOUND("MageLightningReady", 30, 2, 1),
-    SOUND("MageShardsFire", 80, 2, 1),
-    SOUND("MageShardsExplode", 36, 2, 1),
-    SOUND("MageStaffFire", 80, 2, 1),
-    SOUND("MageStaffExplode", 40, 2, 1),
-    SOUND("Switch1", 32, 2, 1),
-    SOUND("Switch2", 32, 2, 1),
-    SOUND("SerpentSight", 32, 2, 1),
-    SOUND("SerpentActive", 32, 2, 1),
-    SOUND("SerpentPain", 32, 2, 1),
-    SOUND("SerpentAttack", 32, 2, 1),
-    SOUND("SerpentMeleeHit", 32, 2, 1),
-    SOUND("SerpentDeath", 40, 2, 1),
-    SOUND("SerpentBirth", 32, 2, 1),
-    SOUND("SerpentFXContinuous", 32, 2, 1),
-    SOUND("SerpentFXHit", 32, 2, 1),
-    SOUND("PotteryExplode", 32, 2, 1),
-    SOUND("Drip", 32, 2, 1),
-    SOUND("CentaurSight", 32, 2, 1),
-    SOUND("CentaurActive", 32, 2, 1),
-    SOUND("CentaurPain", 32, 2, 1),
-    SOUND("CentaurAttack", 32, 2, 1),
-    SOUND("CentaurDeath", 40, 2, 1),
-    SOUND("CentaurLeaderAttack", 32, 2, 1),
-    SOUND("CentaurMissileExplode", 32, 2, 1),
-    SOUND("Wind", 1, 2, 1),
-    SOUND("BishopSight", 32, 2, 1),
-    SOUND("BishopActive", 32, 2, 1),
-    SOUND("BishopPain", 32, 2, 1),
-    SOUND("BishopAttack", 32, 2, 1),
-    SOUND("BishopDeath", 40, 2, 1),
-    SOUND("BishopMissileExplode", 32, 2, 1),
-    SOUND("BishopBlur", 32, 2, 1),
-    SOUND("DemonSight", 32, 2, 1),
-    SOUND("DemonActive", 32, 2, 1),
-    SOUND("DemonPain", 32, 2, 1),
-    SOUND("DemonAttack", 32, 2, 1),
-    SOUND("DemonMissileFire", 32, 2, 1),
-    SOUND("DemonMissileExplode", 32, 2, 1),
-    SOUND("DemonDeath", 40, 2, 1),
-    SOUND("WraithSight", 32, 2, 1),
-    SOUND("WraithActive", 32, 2, 1),
-    SOUND("WraithPain", 32, 2, 1),
-    SOUND("WraithAttack", 32, 2, 1),
-    SOUND("WraithMissileFire", 32, 2, 1),
-    SOUND("WraithMissileExplode", 32, 2, 1),
-    SOUND("WraithDeath", 40, 2, 1),
-    SOUND("PigActive1", 32, 2, 1),
-    SOUND("PigActive2", 32, 2, 1),
-    SOUND("PigPain", 32, 2, 1),
-    SOUND("PigAttack", 32, 2, 1),
-    SOUND("PigDeath", 40, 2, 1),
-    SOUND("MaulatorSight", 32, 2, 1),
-    SOUND("MaulatorActive", 32, 2, 1),
-    SOUND("MaulatorPain", 32, 2, 1),
-    SOUND("MaulatorHamSwing", 32, 2, 1),
-    SOUND("MaulatorHamHit", 32, 2, 1),
-    SOUND("MaulatorMissileHit", 32, 2, 1),
-    SOUND("MaulatorDeath", 40, 2, 1),
-    SOUND("FreezeDeath", 40, 2, 1),
-    SOUND("FreezeShatter", 40, 2, 1),
-    SOUND("EttinSight", 32, 2, 1),
-    SOUND("EttinActive", 32, 2, 1),
-    SOUND("EttinPain", 32, 2, 1),
-    SOUND("EttinAttack", 32, 2, 1),
-    SOUND("EttinDeath", 40, 2, 1),
-    SOUND("FireDemonSpawn", 32, 2, 1),
-    SOUND("FireDemonActive", 32, 2, 1),
-    SOUND("FireDemonPain", 32, 2, 1),
-    SOUND("FireDemonAttack", 32, 2, 1),
-    SOUND("FireDemonMissileHit", 32, 2, 1),
-    SOUND("FireDemonDeath", 40, 2, 1),
-    SOUND("IceGuySight", 32, 2, 1),
-    SOUND("IceGuyActive", 32, 2, 1),
-    SOUND("IceGuyAttack", 32, 2, 1),
-    SOUND("IceGuyMissileExplode", 32, 2, 1),
-    SOUND("SorcererSight", 256, 2, 1),
-    SOUND("SorcererActive", 256, 2, 1),
-    SOUND("SorcererPain", 256, 2, 1),
-    SOUND("SorcererSpellCast", 256, 2, 1),
-    SOUND("SorcererBallWoosh", 256, 4, 1),
-    SOUND("SorcererDeathScream", 256, 2, 1),
-    SOUND("SorcererBishopSpawn", 80, 2, 1),
-    SOUND("SorcererBallPop", 80, 2, 1),
-    SOUND("SorcererBallBounce", 80, 3, 1),
-    SOUND("SorcererBallExplode", 80, 3, 1),
-    SOUND("SorcererBigBallExplode", 80, 3, 1),
-    SOUND("SorcererHeadScream", 256, 2, 1),
-    SOUND("DragonSight", 64, 2, 1),
-    SOUND("DragonActive", 64, 2, 1),
-    SOUND("DragonWingflap", 64, 2, 1),
-    SOUND("DragonAttack", 64, 2, 1),
-    SOUND("DragonPain", 64, 2, 1),
-    SOUND("DragonDeath", 64, 2, 1),
-    SOUND("DragonFireballExplode", 32, 2, 1),
-    SOUND("KoraxSight", 256, 2, 1),
-    SOUND("KoraxActive", 256, 2, 1),
-    SOUND("KoraxPain", 256, 2, 1),
-    SOUND("KoraxAttack", 256, 2, 1),
-    SOUND("KoraxCommand", 256, 2, 1),
-    SOUND("KoraxDeath", 256, 2, 1),
-    SOUND("KoraxStep", 128, 2, 1),
-    SOUND("ThrustSpikeRaise", 32, 2, 1),
-    SOUND("ThrustSpikeLower", 32, 2, 1),
-    SOUND("GlassShatter", 32, 2, 1),
-    SOUND("FlechetteBounce", 32, 2, 1),
-    SOUND("FlechetteExplode", 32, 2, 1),
-    SOUND("LavaMove", 36, 2, 1),
-    SOUND("WaterMove", 36, 2, 1),
-    SOUND("IceStartMove", 36, 2, 1),
-    SOUND("EarthStartMove", 36, 2, 1),
-    SOUND("WaterSplash", 32, 2, 1),
-    SOUND("LavaSizzle", 32, 2, 1),
-    SOUND("SludgeGloop", 32, 2, 1),
-    SOUND("HolySymbolFire", 64, 2, 1),
-    SOUND("SpiritActive", 32, 2, 1),
-    SOUND("SpiritAttack", 32, 2, 1),
-    SOUND("SpiritDie", 32, 2, 1),
-    SOUND("ValveTurn", 36, 2, 1),
-    SOUND("RopePull", 36, 2, 1),
-    SOUND("FlyBuzz", 20, 2, 1),
-    SOUND("Ignite", 32, 2, 1),
-    SOUND("PuzzleSuccess", 256, 2, 1),
-    SOUND("PuzzleFailFighter", 256, 2, 1),
-    SOUND("PuzzleFailCleric", 256, 2, 1),
-    SOUND("PuzzleFailMage", 256, 2, 1),
-    SOUND("Earthquake", 32, 2, 1),
-    SOUND("BellRing", 32, 2, 0),
-    SOUND("TreeBreak", 32, 2, 1),
-    SOUND("TreeExplode", 32, 2, 1),
-    SOUND("SuitofArmorBreak", 32, 2, 1),
-    SOUND("PoisonShroomPain", 20, 2, 1),
-    SOUND("PoisonShroomDeath", 32, 2, 1),
-    SOUND("Ambient1", 1, 1, 1),
-    SOUND("Ambient2", 1, 1, 1),
-    SOUND("Ambient3", 1, 1, 1),
-    SOUND("Ambient4", 1, 1, 1),
-    SOUND("Ambient5", 1, 1, 1),
-    SOUND("Ambient6", 1, 1, 1),
-    SOUND("Ambient7", 1, 1, 1),
-    SOUND("Ambient8", 1, 1, 1),
-    SOUND("Ambient9", 1, 1, 1),
-    SOUND("Ambient10", 1, 1, 1),
-    SOUND("Ambient11", 1, 1, 1),
-    SOUND("Ambient12", 1, 1, 1),
-    SOUND("Ambient13", 1, 1, 1),
-    SOUND("Ambient14", 1, 1, 1),
-    SOUND("Ambient15", 1, 1, 1),
-    SOUND("StartupTick", 32, 2, 1),
-    SOUND("SwitchOtherLevel", 32, 2, 1),
-    SOUND("Respawn", 32, 2, 1),
-    SOUND("KoraxVoiceGreetings", 512, 2, 1),
-    SOUND("KoraxVoiceReady", 512, 2, 1),
-    SOUND("KoraxVoiceBlood", 512, 2, 1),
-    SOUND("KoraxVoiceGame", 512, 2, 1),
-    SOUND("KoraxVoiceBoard", 512, 2, 1),
-    SOUND("KoraxVoiceWorship", 512, 2, 1),
-    SOUND("KoraxVoiceMaybe", 512, 2, 1),
-    SOUND("KoraxVoiceStrong", 512, 2, 1),
-    SOUND("KoraxVoiceFace", 512, 2, 1),
-    SOUND("BatScream", 32, 2, 1),
-    SOUND("Chat", 512, 2, 1),
-    SOUND("MenuMove", 32, 2, 1),
-    SOUND("ClockTick", 32, 2, 1),
-    SOUND("Fireball", 32, 2, 1),
-    SOUND("PuppyBeat", 30, 2, 1),
-    SOUND("MysticIncant", 32, 4, 1),
-};
diff --git a/games/NXDoom/src/hexen/sounds.h b/games/NXDoom/src/hexen/sounds.h
deleted file mode 100644
index 1fe2345f2..000000000
--- a/games/NXDoom/src/hexen/sounds.h
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __SOUNDSH__
-#define __SOUNDSH__
-
-#include "i_sound.h"
-
-#define MAX_SND_DIST    2025
-#define MAX_CHANNELS    16
-
-// Music identifiers
-
-typedef enum
-{
-    mus_e1m1,
-    mus_e1m2,
-    mus_e1m3,
-    mus_e1m4,
-    mus_e1m5,
-    mus_e1m6,
-    mus_e1m7,
-    mus_e1m8,
-    mus_e1m9,
-    mus_e2m1,
-    mus_e2m2,
-    mus_e2m3,
-    mus_e2m4,
-    mus_e2m5,
-    mus_e2m6,
-    mus_e2m7,
-    mus_e2m8,
-    mus_e2m9,
-    mus_e3m1,
-    mus_e3m2,
-    mus_e3m3,
-    mus_e3m4,
-    mus_e3m5,
-    mus_e3m6,
-    mus_e3m7,
-    mus_e3m8,
-    mus_e3m9,
-    mus_e4m1,
-    mus_titl,
-    mus_intr,
-    mus_cptd,
-    NUMMUSIC
-} musicenum_t;
-
-// Sound identifiers
-
-typedef enum
-{
-    SFX_NONE,
-    SFX_PLAYER_FIGHTER_NORMAL_DEATH,    // class specific death screams
-    SFX_PLAYER_FIGHTER_CRAZY_DEATH,
-    SFX_PLAYER_FIGHTER_EXTREME1_DEATH,
-    SFX_PLAYER_FIGHTER_EXTREME2_DEATH,
-    SFX_PLAYER_FIGHTER_EXTREME3_DEATH,
-    SFX_PLAYER_FIGHTER_BURN_DEATH,
-    SFX_PLAYER_CLERIC_NORMAL_DEATH,
-    SFX_PLAYER_CLERIC_CRAZY_DEATH,
-    SFX_PLAYER_CLERIC_EXTREME1_DEATH,
-    SFX_PLAYER_CLERIC_EXTREME2_DEATH,
-    SFX_PLAYER_CLERIC_EXTREME3_DEATH,
-    SFX_PLAYER_CLERIC_BURN_DEATH,
-    SFX_PLAYER_MAGE_NORMAL_DEATH,
-    SFX_PLAYER_MAGE_CRAZY_DEATH,
-    SFX_PLAYER_MAGE_EXTREME1_DEATH,
-    SFX_PLAYER_MAGE_EXTREME2_DEATH,
-    SFX_PLAYER_MAGE_EXTREME3_DEATH,
-    SFX_PLAYER_MAGE_BURN_DEATH,
-    SFX_PLAYER_FIGHTER_PAIN,
-    SFX_PLAYER_CLERIC_PAIN,
-    SFX_PLAYER_MAGE_PAIN,
-    SFX_PLAYER_FIGHTER_GRUNT,
-    SFX_PLAYER_CLERIC_GRUNT,
-    SFX_PLAYER_MAGE_GRUNT,
-    SFX_PLAYER_LAND,
-    SFX_PLAYER_POISONCOUGH,
-    SFX_PLAYER_FIGHTER_FALLING_SCREAM,  // class specific falling screams
-    SFX_PLAYER_CLERIC_FALLING_SCREAM,
-    SFX_PLAYER_MAGE_FALLING_SCREAM,
-    SFX_PLAYER_FALLING_SPLAT,
-    SFX_PLAYER_FIGHTER_FAILED_USE,
-    SFX_PLAYER_CLERIC_FAILED_USE,
-    SFX_PLAYER_MAGE_FAILED_USE,
-    SFX_PLATFORM_START,
-    SFX_PLATFORM_STARTMETAL,
-    SFX_PLATFORM_STOP,
-    SFX_STONE_MOVE,
-    SFX_METAL_MOVE,
-    SFX_DOOR_OPEN,
-    SFX_DOOR_LOCKED,
-    SFX_DOOR_METAL_OPEN,
-    SFX_DOOR_METAL_CLOSE,
-    SFX_DOOR_LIGHT_CLOSE,
-    SFX_DOOR_HEAVY_CLOSE,
-    SFX_DOOR_CREAK,
-    SFX_PICKUP_WEAPON,
-    SFX_PICKUP_ARTIFACT,
-    SFX_PICKUP_KEY,
-    SFX_PICKUP_ITEM,
-    SFX_PICKUP_PIECE,
-    SFX_WEAPON_BUILD,
-    SFX_ARTIFACT_USE,
-    SFX_ARTIFACT_BLAST,
-    SFX_TELEPORT,
-    SFX_THUNDER_CRASH,
-    SFX_FIGHTER_PUNCH_MISS,
-    SFX_FIGHTER_PUNCH_HITTHING,
-    SFX_FIGHTER_PUNCH_HITWALL,
-    SFX_FIGHTER_GRUNT,
-    SFX_FIGHTER_AXE_HITTHING,
-    SFX_FIGHTER_HAMMER_MISS,
-    SFX_FIGHTER_HAMMER_HITTHING,
-    SFX_FIGHTER_HAMMER_HITWALL,
-    SFX_FIGHTER_HAMMER_CONTINUOUS,
-    SFX_FIGHTER_HAMMER_EXPLODE,
-    SFX_FIGHTER_SWORD_FIRE,
-    SFX_FIGHTER_SWORD_EXPLODE,
-    SFX_CLERIC_CSTAFF_FIRE,
-    SFX_CLERIC_CSTAFF_EXPLODE,
-    SFX_CLERIC_CSTAFF_HITTHING,
-    SFX_CLERIC_FLAME_FIRE,
-    SFX_CLERIC_FLAME_EXPLODE,
-    SFX_CLERIC_FLAME_CIRCLE,
-    SFX_MAGE_WAND_FIRE,
-    SFX_MAGE_LIGHTNING_FIRE,
-    SFX_MAGE_LIGHTNING_ZAP,
-    SFX_MAGE_LIGHTNING_CONTINUOUS,
-    SFX_MAGE_LIGHTNING_READY,
-    SFX_MAGE_SHARDS_FIRE,
-    SFX_MAGE_SHARDS_EXPLODE,
-    SFX_MAGE_STAFF_FIRE,
-    SFX_MAGE_STAFF_EXPLODE,
-    SFX_SWITCH1,
-    SFX_SWITCH2,
-    SFX_SERPENT_SIGHT,
-    SFX_SERPENT_ACTIVE,
-    SFX_SERPENT_PAIN,
-    SFX_SERPENT_ATTACK,
-    SFX_SERPENT_MELEEHIT,
-    SFX_SERPENT_DEATH,
-    SFX_SERPENT_BIRTH,
-    SFX_SERPENTFX_CONTINUOUS,
-    SFX_SERPENTFX_HIT,
-    SFX_POTTERY_EXPLODE,
-    SFX_DRIP,
-    SFX_CENTAUR_SIGHT,
-    SFX_CENTAUR_ACTIVE,
-    SFX_CENTAUR_PAIN,
-    SFX_CENTAUR_ATTACK,
-    SFX_CENTAUR_DEATH,
-    SFX_CENTAURLEADER_ATTACK,
-    SFX_CENTAUR_MISSILE_EXPLODE,
-    SFX_WIND,
-    SFX_BISHOP_SIGHT,
-    SFX_BISHOP_ACTIVE,
-    SFX_BISHOP_PAIN,
-    SFX_BISHOP_ATTACK,
-    SFX_BISHOP_DEATH,
-    SFX_BISHOP_MISSILE_EXPLODE,
-    SFX_BISHOP_BLUR,
-    SFX_DEMON_SIGHT,
-    SFX_DEMON_ACTIVE,
-    SFX_DEMON_PAIN,
-    SFX_DEMON_ATTACK,
-    SFX_DEMON_MISSILE_FIRE,
-    SFX_DEMON_MISSILE_EXPLODE,
-    SFX_DEMON_DEATH,
-    SFX_WRAITH_SIGHT,
-    SFX_WRAITH_ACTIVE,
-    SFX_WRAITH_PAIN,
-    SFX_WRAITH_ATTACK,
-    SFX_WRAITH_MISSILE_FIRE,
-    SFX_WRAITH_MISSILE_EXPLODE,
-    SFX_WRAITH_DEATH,
-    SFX_PIG_ACTIVE1,
-    SFX_PIG_ACTIVE2,
-    SFX_PIG_PAIN,
-    SFX_PIG_ATTACK,
-    SFX_PIG_DEATH,
-    SFX_MAULATOR_SIGHT,
-    SFX_MAULATOR_ACTIVE,
-    SFX_MAULATOR_PAIN,
-    SFX_MAULATOR_HAMMER_SWING,
-    SFX_MAULATOR_HAMMER_HIT,
-    SFX_MAULATOR_MISSILE_HIT,
-    SFX_MAULATOR_DEATH,
-    SFX_FREEZE_DEATH,
-    SFX_FREEZE_SHATTER,
-    SFX_ETTIN_SIGHT,
-    SFX_ETTIN_ACTIVE,
-    SFX_ETTIN_PAIN,
-    SFX_ETTIN_ATTACK,
-    SFX_ETTIN_DEATH,
-    SFX_FIRED_SPAWN,
-    SFX_FIRED_ACTIVE,
-    SFX_FIRED_PAIN,
-    SFX_FIRED_ATTACK,
-    SFX_FIRED_MISSILE_HIT,
-    SFX_FIRED_DEATH,
-    SFX_ICEGUY_SIGHT,
-    SFX_ICEGUY_ACTIVE,
-    SFX_ICEGUY_ATTACK,
-    SFX_ICEGUY_FX_EXPLODE,
-    SFX_SORCERER_SIGHT,
-    SFX_SORCERER_ACTIVE,
-    SFX_SORCERER_PAIN,
-    SFX_SORCERER_SPELLCAST,
-    SFX_SORCERER_BALLWOOSH,
-    SFX_SORCERER_DEATHSCREAM,
-    SFX_SORCERER_BISHOPSPAWN,
-    SFX_SORCERER_BALLPOP,
-    SFX_SORCERER_BALLBOUNCE,
-    SFX_SORCERER_BALLEXPLODE,
-    SFX_SORCERER_BIGBALLEXPLODE,
-    SFX_SORCERER_HEADSCREAM,
-    SFX_DRAGON_SIGHT,
-    SFX_DRAGON_ACTIVE,
-    SFX_DRAGON_WINGFLAP,
-    SFX_DRAGON_ATTACK,
-    SFX_DRAGON_PAIN,
-    SFX_DRAGON_DEATH,
-    SFX_DRAGON_FIREBALL_EXPLODE,
-    SFX_KORAX_SIGHT,
-    SFX_KORAX_ACTIVE,
-    SFX_KORAX_PAIN,
-    SFX_KORAX_ATTACK,
-    SFX_KORAX_COMMAND,
-    SFX_KORAX_DEATH,
-    SFX_KORAX_STEP,
-    SFX_THRUSTSPIKE_RAISE,
-    SFX_THRUSTSPIKE_LOWER,
-    SFX_STAINEDGLASS_SHATTER,
-    SFX_FLECHETTE_BOUNCE,
-    SFX_FLECHETTE_EXPLODE,
-    SFX_LAVA_MOVE,
-    SFX_WATER_MOVE,
-    SFX_ICE_STARTMOVE,
-    SFX_EARTH_STARTMOVE,
-    SFX_WATER_SPLASH,
-    SFX_LAVA_SIZZLE,
-    SFX_SLUDGE_GLOOP,
-    SFX_CHOLY_FIRE,
-    SFX_SPIRIT_ACTIVE,
-    SFX_SPIRIT_ATTACK,
-    SFX_SPIRIT_DIE,
-    SFX_VALVE_TURN,
-    SFX_ROPE_PULL,
-    SFX_FLY_BUZZ,
-    SFX_IGNITE,
-    SFX_PUZZLE_SUCCESS,
-    SFX_PUZZLE_FAIL_FIGHTER,
-    SFX_PUZZLE_FAIL_CLERIC,
-    SFX_PUZZLE_FAIL_MAGE,
-    SFX_EARTHQUAKE,
-    SFX_BELLRING,
-    SFX_TREE_BREAK,
-    SFX_TREE_EXPLODE,
-    SFX_SUITOFARMOR_BREAK,
-    SFX_POISONSHROOM_PAIN,
-    SFX_POISONSHROOM_DEATH,
-    SFX_AMBIENT1,
-    SFX_AMBIENT2,
-    SFX_AMBIENT3,
-    SFX_AMBIENT4,
-    SFX_AMBIENT5,
-    SFX_AMBIENT6,
-    SFX_AMBIENT7,
-    SFX_AMBIENT8,
-    SFX_AMBIENT9,
-    SFX_AMBIENT10,
-    SFX_AMBIENT11,
-    SFX_AMBIENT12,
-    SFX_AMBIENT13,
-    SFX_AMBIENT14,
-    SFX_AMBIENT15,
-    SFX_STARTUP_TICK,
-    SFX_SWITCH_OTHERLEVEL,
-    SFX_RESPAWN,
-    SFX_KORAX_VOICE_1,
-    SFX_KORAX_VOICE_2,
-    SFX_KORAX_VOICE_3,
-    SFX_KORAX_VOICE_4,
-    SFX_KORAX_VOICE_5,
-    SFX_KORAX_VOICE_6,
-    SFX_KORAX_VOICE_7,
-    SFX_KORAX_VOICE_8,
-    SFX_KORAX_VOICE_9,
-    SFX_BAT_SCREAM,
-    SFX_CHAT,
-    SFX_MENU_MOVE,
-    SFX_CLOCK_TICK,
-    SFX_FIREBALL,
-    SFX_PUPPYBEAT,
-    SFX_MYSTICINCANT,
-    NUMSFX
-} sfxenum_t;
-
-
-extern sfxinfo_t S_sfx[];
-extern musicinfo_t S_music[];
-
-
-#endif
diff --git a/games/NXDoom/src/hexen/st_start.c b/games/NXDoom/src/hexen/st_start.c
deleted file mode 100644
index aa104358d..000000000
--- a/games/NXDoom/src/hexen/st_start.c
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include <stdarg.h>
-
-#include "config.h"
-
-#include "h2def.h"
-#include "i_system.h"
-#include "i_video.h"
-#include "i_videohr.h"
-#include "s_sound.h"
-#include "st_start.h"
-
-
-// MACROS ------------------------------------------------------------------
-#define ST_MAX_NOTCHES		32
-#define ST_NOTCH_WIDTH		16
-#define ST_NOTCH_HEIGHT		23
-#define ST_PROGRESS_X		64      // Start of notches x screen pos.
-#define ST_PROGRESS_Y		441     // Start of notches y screen pos.
-
-#define ST_NETPROGRESS_X		288
-#define ST_NETPROGRESS_Y		32
-#define ST_NETNOTCH_WIDTH		8
-#define ST_NETNOTCH_HEIGHT		16
-#define ST_MAX_NETNOTCHES		8
-
-byte *ST_LoadScreen(void);
-void ST_UpdateNotches(int notchPosition);
-void ST_UpdateNetNotches(int notchPosition);
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-static const byte *bitmap = NULL;
-int graphical_startup = 1;
-static boolean using_graphical_startup;
-
-static const byte notchTable[] = {
-    // plane 0
-    0x00, 0x80, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40,
-    0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xC0,
-    0x0F, 0x90, 0x1B, 0x68, 0x3D, 0xBC, 0x3F, 0xFC, 0x20, 0x08, 0x20, 0x08,
-    0x2F, 0xD8, 0x37, 0xD8, 0x37, 0xF8, 0x1F, 0xF8, 0x1C, 0x50,
-
-    // plane 1
-    0x00, 0x80, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0xA0,
-    0x30, 0x6C, 0x24, 0x94, 0x42, 0x4A, 0x60, 0x0E, 0x60, 0x06, 0x7F, 0xF6,
-    0x7F, 0xF6, 0x7F, 0xF6, 0x5E, 0xF6, 0x38, 0x16, 0x23, 0xAC,
-
-    // plane 2
-    0x00, 0x80, 0x01, 0x80, 0x01, 0x80, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
-    0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xE0,
-    0x30, 0x6C, 0x24, 0x94, 0x52, 0x6A, 0x7F, 0xFE, 0x60, 0x0E, 0x60, 0x0E,
-    0x6F, 0xD6, 0x77, 0xD6, 0x56, 0xF6, 0x38, 0x36, 0x23, 0xAC,
-
-    // plane 3
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80,
-    0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0x80, 0x02, 0x40,
-    0x0F, 0x90, 0x1B, 0x68, 0x3D, 0xB4, 0x1F, 0xF0, 0x1F, 0xF8, 0x1F, 0xF8,
-    0x10, 0x28, 0x08, 0x28, 0x29, 0x08, 0x07, 0xE8, 0x1C, 0x50
-};
-
-
-// Red Network Progress notches
-static const byte netnotchTable[] = {
-    // plane 0
-    0x80, 0x50, 0xD0, 0xf0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xD0, 0xF0, 0xC0,
-    0x70, 0x50, 0x80, 0x60,
-
-    // plane 1
-    0x60, 0xE0, 0xE0, 0xA0, 0xA0, 0xA0, 0xE0, 0xA0, 0xA0, 0xA0, 0xE0, 0xA0,
-    0xA0, 0xE0, 0x60, 0x00,
-
-    // plane 2
-    0x80, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00,
-    0x10, 0x10, 0x80, 0x60,
-
-    // plane 3
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00
-};
-
-// CODE --------------------------------------------------------------------
-
-
-
-//--------------------------------------------------------------------------
-//
-// Startup Screen Functions
-//
-//--------------------------------------------------------------------------
-
-
-//==========================================================================
-//
-// ST_Init - Do the startup screen
-//
-//==========================================================================
-
-void ST_Init(void)
-{
-    byte *pal;
-    byte *buffer;
-    
-    using_graphical_startup = false;
-
-    if (graphical_startup && !debugmode && !testcontrols)
-    {
-        I_SetWindowTitleHR("Hexen startup - " PACKAGE_STRING);
-
-        // Set 640x480x16 mode
-        if (I_SetVideoModeHR())
-        {
-            using_graphical_startup = true;
-            I_InitWindowIcon();
-
-            S_StartSongName("orb", true);
-
-            I_ClearScreenHR();
-            I_InitPaletteHR();
-            I_BlackPaletteHR();
-
-            // Load graphic
-            buffer = ST_LoadScreen();
-            pal = buffer;
-            bitmap = buffer + 16 * 3;
-
-            I_SlamHR(bitmap);
-            I_FadeToPaletteHR(pal);
-            Z_Free(buffer);
-        }
-    }
-}
-
-void ST_Done(void)
-{
-    if (using_graphical_startup)
-    {
-        I_ClearScreenHR();
-        I_UnsetVideoModeHR();
-    }
-}
-
-
-//==========================================================================
-//
-// ST_UpdateNotches
-//
-//==========================================================================
-
-void ST_UpdateNotches(int notchPosition)
-{
-    int x = ST_PROGRESS_X + notchPosition * ST_NOTCH_WIDTH;
-    int y = ST_PROGRESS_Y;
-    I_SlamBlockHR(x, y, ST_NOTCH_WIDTH, ST_NOTCH_HEIGHT, notchTable);
-}
-
-
-//==========================================================================
-//
-// ST_UpdateNetNotches - indicates network progress
-//
-//==========================================================================
-
-void ST_UpdateNetNotches(int notchPosition)
-{
-    int x = ST_NETPROGRESS_X + notchPosition * ST_NETNOTCH_WIDTH;
-    int y = ST_NETPROGRESS_Y;
-    I_SlamBlockHR(x, y, ST_NETNOTCH_WIDTH, ST_NETNOTCH_HEIGHT, netnotchTable);
-}
-
-
-//==========================================================================
-//
-// ST_Progress - increments progress indicator
-//
-//==========================================================================
-
-void ST_Progress(void)
-{
-    // Check for ESC press -- during startup all events eaten here
-    if (I_CheckAbortHR())
-    {
-        I_Quit();
-    }
-
-    if (using_graphical_startup)
-    {
-        static int notchPosition = 0;
-
-        if (notchPosition < ST_MAX_NOTCHES)
-        {
-            ST_UpdateNotches(notchPosition);
-            S_StartSound(NULL, SFX_STARTUP_TICK);
-            //I_Sleep(1000);
-            notchPosition++;
-        }
-    }
-
-    printf(".");
-}
-
-
-//==========================================================================
-//
-// ST_NetProgress - indicates network progress
-//
-//==========================================================================
-
-void ST_NetProgress(void)
-{
-    printf("*");
-
-    if (using_graphical_startup)
-    {
-        static int netnotchPosition = 0;
-
-        if (netnotchPosition < ST_MAX_NETNOTCHES)
-        {
-            ST_UpdateNetNotches(netnotchPosition);
-            S_StartSound(NULL, SFX_DRIP);
-            netnotchPosition++;
-        }
-    }
-}
-
-
-//==========================================================================
-//
-// ST_NetDone - net progress complete
-//
-//==========================================================================
-void ST_NetDone(void)
-{
-    if (using_graphical_startup)
-    {
-        S_StartSound(NULL, SFX_PICKUP_WEAPON);
-    }
-}
-
-
-//==========================================================================
-//
-// ST_Message - gives debug message
-//
-//==========================================================================
-
-void ST_Message(const char *message, ...)
-{
-    va_list argptr;
-
-    va_start(argptr, message);
-    vprintf(message, argptr);
-    va_end(argptr);
-}
-
-//==========================================================================
-//
-// ST_RealMessage - gives user message
-//
-//==========================================================================
-
-void ST_RealMessage(const char *message, ...)
-{
-    va_list argptr;
-
-    va_start(argptr, message);
-    vprintf(message, argptr);
-    va_end(argptr);
-}
-
-
-
-//==========================================================================
-//
-// ST_LoadScreen - loads startup graphic
-//
-//==========================================================================
-
-
-byte *ST_LoadScreen(void)
-{
-    int length, lump;
-    byte *buffer;
-
-    lump = W_GetNumForName("STARTUP");
-    length = W_LumpLength(lump);
-    buffer = (byte *) Z_Malloc(length, PU_STATIC, NULL);
-    W_ReadLump(lump, buffer);
-    return (buffer);
-}
-
diff --git a/games/NXDoom/src/hexen/st_start.h b/games/NXDoom/src/hexen/st_start.h
deleted file mode 100644
index d38d28303..000000000
--- a/games/NXDoom/src/hexen/st_start.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef STSTART_H
-#define STSTART_H
-
-#include "doomtype.h"
-
-// HEADER FILES ------------------------------------------------------------
-
-// MACROS ------------------------------------------------------------------
-
-// TYPES -------------------------------------------------------------------
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-extern void ST_Init(void);
-extern void ST_Done(void);
-extern void ST_Message(const char *message, ...) PRINTF_ATTR(1, 2);
-extern void ST_RealMessage(const char *message, ...) PRINTF_ATTR(1, 2);
-extern void ST_Progress(void);
-extern void ST_NetProgress(void);
-extern void ST_NetDone(void);
-
-// PUBLIC DATA DECLARATIONS ------------------------------------------------
- 
-extern int graphical_startup;
-
-#endif
diff --git a/games/NXDoom/src/hexen/sv_save.c b/games/NXDoom/src/hexen/sv_save.c
deleted file mode 100644
index 007e63340..000000000
--- a/games/NXDoom/src/hexen/sv_save.c
+++ /dev/null
@@ -1,3508 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// HEADER FILES ------------------------------------------------------------
-
-#include "h2def.h"
-#include "i_system.h"
-#include "m_misc.h"
-#include "i_swap.h"
-#include "p_local.h"
-
-// MACROS ------------------------------------------------------------------
-
-#define MAX_TARGET_PLAYERS 512
-#define MOBJ_NULL -1
-#define MOBJ_XX_PLAYER -2
-#define MAX_MAPS 99
-#define BASE_SLOT 6
-#define REBORN_SLOT 7
-#define REBORN_DESCRIPTION "TEMP GAME"
-#define MAX_THINKER_SIZE 256
-
-// TYPES -------------------------------------------------------------------
-
-typedef enum
-{
-    ASEG_GAME_HEADER = 101,
-    ASEG_MAP_HEADER,
-    ASEG_WORLD,
-    ASEG_POLYOBJS,
-    ASEG_MOBJS,
-    ASEG_THINKERS,
-    ASEG_SCRIPTS,
-    ASEG_PLAYERS,
-    ASEG_SOUNDS,
-    ASEG_MISC,
-    ASEG_END
-} gameArchiveSegment_t;
-
-typedef enum
-{
-    TC_NULL,
-    TC_MOVE_CEILING,
-    TC_VERTICAL_DOOR,
-    TC_MOVE_FLOOR,
-    TC_PLAT_RAISE,
-    TC_INTERPRET_ACS,
-    TC_FLOOR_WAGGLE,
-    TC_LIGHT,
-    TC_PHASE,
-    TC_BUILD_PILLAR,
-    TC_ROTATE_POLY,
-    TC_MOVE_POLY,
-    TC_POLY_DOOR
-} thinkClass_t;
-
-typedef struct
-{
-    thinkClass_t tClass;
-    think_t thinkerFunc;
-    void (*writeFunc)(thinker_t *thinker);
-    void (*readFunc)(thinker_t *thinker);
-    void (*restoreFunc)(thinker_t *thinker);
-    size_t size;
-} thinkInfo_t;
-
-typedef struct
-{
-    thinker_t thinker;
-    sector_t *sector;
-} ssthinker_t;
-
-// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-
-void P_SpawnPlayer(mapthing_t * mthing);
-
-// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-
-// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
-
-static void ArchiveWorld(void);
-static void UnarchiveWorld(void);
-static void ArchivePolyobjs(void);
-static void UnarchivePolyobjs(void);
-static void ArchiveMobjs(void);
-static void UnarchiveMobjs(void);
-static void ArchiveThinkers(void);
-static void UnarchiveThinkers(void);
-static void ArchiveScripts(void);
-static void UnarchiveScripts(void);
-static void ArchivePlayers(void);
-static void UnarchivePlayers(void);
-static void ArchiveSounds(void);
-static void UnarchiveSounds(void);
-static void ArchiveMisc(void);
-static void UnarchiveMisc(void);
-static void SetMobjArchiveNums(void);
-static void RemoveAllThinkers(void);
-static int GetMobjNum(mobj_t * mobj);
-static void SetMobjPtr(mobj_t **ptr, unsigned int archiveNum);
-static void RestoreSSThinker(thinker_t *sst);
-static void RestorePlatRaise(thinker_t *thinker);
-static void RestoreMoveCeiling(thinker_t *thinker);
-static void AssertSegment(gameArchiveSegment_t segType);
-static void ClearSaveSlot(int slot);
-static void CopySaveSlot(int sourceSlot, int destSlot);
-static void CopyFile(char *sourceName, char *destName);
-static boolean ExistingFile(char *name);
-static void SV_OpenRead(char *fileName);
-static void SV_OpenWrite(char *fileName);
-static void SV_Close(void);
-static void SV_Read(void *buffer, int size);
-static byte SV_ReadByte(void);
-static uint16_t SV_ReadWord(void);
-static uint32_t SV_ReadLong(void);
-static void *SV_ReadPtr(void);
-static void SV_Write(const void *buffer, int size);
-static void SV_WriteByte(byte val);
-static void SV_WriteWord(unsigned short val);
-static void SV_WriteLong(unsigned int val);
-static void SV_WritePtr(void *ptr);
-
-// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-
-// PUBLIC DATA DEFINITIONS -------------------------------------------------
-
-#define DEFAULT_SAVEPATH                "hexndata/"
-
-char *SavePath = DEFAULT_SAVEPATH;
-
-int vanilla_savegame_limit = 1;
-
-// PRIVATE DATA DEFINITIONS ------------------------------------------------
-
-static int MobjCount;
-static mobj_t **MobjList;
-static mobj_t ***TargetPlayerAddrs;
-static int TargetPlayerCount;
-static boolean SavingPlayers;
-static FILE *SavingFP;
-
-// CODE --------------------------------------------------------------------
-
-// Autogenerated functions for reading/writing structs:
-
-//
-// acsstore_t
-//
-
-static void StreamIn_acsstore_t(acsstore_t *str)
-{
-    int i;
-
-    // int map;
-    str->map = SV_ReadLong();
-
-    // int script;
-    str->script = SV_ReadLong();
-
-    // byte args[4];
-    for (i=0; i<4; ++i)
-    {
-        str->args[i] = SV_ReadByte();
-    }
-}
-
-static void StreamOut_acsstore_t(acsstore_t *str)
-{
-    int i;
-
-    // int map;
-    SV_WriteLong(str->map);
-
-    // int script;
-    SV_WriteLong(str->script);
-
-    // byte args[4];
-    for (i=0; i<4; ++i)
-    {
-        SV_WriteByte(str->args[i]);
-    }
-}
-
-
-//
-// ticcmd_t
-// (this is based on the Vanilla definition of the struct)
-//
-
-static void StreamIn_ticcmd_t(ticcmd_t *str)
-{
-    // char forwardmove;
-    str->forwardmove = SV_ReadByte();
-
-    // char sidemove;
-    str->sidemove = SV_ReadByte();
-
-    // short angleturn;
-    str->angleturn = SV_ReadWord();
-
-    // short consistancy;
-    str->consistancy = SV_ReadWord();
-
-    // byte chatchar;
-    str->chatchar = SV_ReadByte();
-
-    // byte buttons;
-    str->buttons = SV_ReadByte();
-
-    // byte lookfly;
-    str->lookfly = SV_ReadByte();
-
-    // byte arti;
-    str->arti = SV_ReadByte();
-}
-
-static void StreamOut_ticcmd_t(ticcmd_t *str)
-{
-    // char forwardmove;
-    SV_WriteByte(str->forwardmove);
-
-    // char sidemove;
-    SV_WriteByte(str->sidemove);
-
-    // short angleturn;
-    SV_WriteWord(str->angleturn);
-
-    // short consistancy;
-    SV_WriteWord(str->consistancy);
-
-    // byte chatchar;
-    SV_WriteByte(str->chatchar);
-
-    // byte buttons;
-    SV_WriteByte(str->buttons);
-
-    // byte lookfly;
-    SV_WriteByte(str->lookfly);
-
-    // byte arti;
-    SV_WriteByte(str->arti);
-}
-
-
-
-//
-// inventory_t
-//
-
-static void StreamIn_inventory_t(inventory_t *str)
-{
-    // int type;
-    str->type = SV_ReadLong();
-
-    // int count;
-    str->count = SV_ReadLong();
-}
-
-static void StreamOut_inventory_t(inventory_t *str)
-{
-    // int type;
-    SV_WriteLong(str->type);
-
-    // int count;
-    SV_WriteLong(str->count);
-}
-
-
-//
-// pspdef_t
-//
-
-static void StreamIn_pspdef_t(pspdef_t *str)
-{
-    int state_num;
-
-    // state_t *state;
-
-    // This is a pointer; it is stored as an index into the states table.
-
-    state_num = SV_ReadLong();
-
-    if (state_num != 0)
-    {
-        str->state = states + state_num;
-    }
-    else
-    {
-        str->state = NULL;
-    }
-
-    // int tics;
-    str->tics = SV_ReadLong();
-
-    // fixed_t sx, sy;
-    str->sx = SV_ReadLong();
-    str->sy = SV_ReadLong();
-}
-
-static void StreamOut_pspdef_t(pspdef_t *str)
-{
-    // state_t *state;
-    // This is a pointer; store the index in the states table,
-    // rather than the pointer itself.
-    if (str->state != NULL)
-    {
-        SV_WriteLong(str->state - states);
-    }
-    else
-    {
-        SV_WriteLong(0);
-    }
-
-    // int tics;
-    SV_WriteLong(str->tics);
-
-    // fixed_t sx, sy;
-    SV_WriteLong(str->sx);
-    SV_WriteLong(str->sy);
-}
-
-
-//
-// player_t
-//
-
-static void StreamIn_player_t(player_t *str)
-{
-    int i;
-
-    // mobj_t *mo;
-    // Pointer value is reset on load.
-    str->mo = SV_ReadPtr();
-    str->mo = NULL;
-
-    // playerstate_t playerstate;
-    str->playerstate = SV_ReadLong();
-
-    // ticcmd_t cmd;
-    StreamIn_ticcmd_t(&str->cmd);
-
-    // pclass_t class;
-    str->class = SV_ReadLong();
-
-    // fixed_t viewz;
-    str->viewz = SV_ReadLong();
-
-    // fixed_t viewheight;
-    str->viewheight = SV_ReadLong();
-
-    // fixed_t deltaviewheight;
-    str->deltaviewheight = SV_ReadLong();
-
-    // fixed_t bob;
-    str->bob = SV_ReadLong();
-
-    // int flyheight;
-    str->flyheight = SV_ReadLong();
-
-    // int lookdir;
-    str->lookdir = SV_ReadLong();
-
-    // boolean centering;
-    str->centering = SV_ReadLong();
-
-    // int health;
-    str->health = SV_ReadLong();
-
-    // int armorpoints[NUMARMOR];
-    for (i=0; i<NUMARMOR; ++i)
-    {
-        str->armorpoints[i] = SV_ReadLong();
-    }
-
-    // inventory_t inventory[NUMINVENTORYSLOTS];
-    for (i=0; i<NUMINVENTORYSLOTS; ++i)
-    {
-        StreamIn_inventory_t(&str->inventory[i]);
-    }
-
-    // artitype_t readyArtifact;
-    str->readyArtifact = SV_ReadLong();
-
-    // int artifactCount;
-    str->artifactCount = SV_ReadLong();
-
-    // int inventorySlotNum;
-    str->inventorySlotNum = SV_ReadLong();
-
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
-    {
-        str->powers[i] = SV_ReadLong();
-    }
-
-    // int keys;
-    str->keys = SV_ReadLong();
-
-    // int pieces;
-    str->pieces = SV_ReadLong();
-
-    // signed int frags[MAXPLAYERS];
-    for (i=0; i<maxplayers; ++i)
-    {
-        str->frags[i] = SV_ReadLong();
-    }
-
-    // weapontype_t readyweapon;
-    str->readyweapon = SV_ReadLong();
-
-    // weapontype_t pendingweapon;
-    str->pendingweapon = SV_ReadLong();
-
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        str->weaponowned[i] = SV_ReadLong();
-    }
-
-    // int mana[NUMMANA];
-    for (i=0; i<NUMMANA; ++i)
-    {
-        str->mana[i] = SV_ReadLong();
-    }
-
-    // int attackdown, usedown;
-    str->attackdown = SV_ReadLong();
-    str->usedown = SV_ReadLong();
-
-    // int cheats;
-    str->cheats = SV_ReadLong();
-
-    // int refire;
-    str->refire = SV_ReadLong();
-
-    // int killcount, itemcount, secretcount;
-    str->killcount = SV_ReadLong();
-    str->itemcount = SV_ReadLong();
-    str->secretcount = SV_ReadLong();
-
-    // char message[80];
-    for (i=0; i<80; ++i)
-    {
-        str->message[i] = SV_ReadByte();
-    }
-
-    // int messageTics;
-    str->messageTics = SV_ReadLong();
-
-    // short ultimateMessage;
-    str->ultimateMessage = SV_ReadWord();
-
-    // short yellowMessage;
-    str->yellowMessage = SV_ReadWord();
-
-    // int damagecount, bonuscount;
-    str->damagecount = SV_ReadLong();
-    str->bonuscount = SV_ReadLong();
-
-    // int poisoncount;
-    str->poisoncount = SV_ReadLong();
-
-    // mobj_t *poisoner;
-    // Pointer value is reset.
-    str->poisoner = SV_ReadPtr();
-    str->poisoner = NULL;
-
-    // mobj_t *attacker;
-    // Pointer value is reset.
-    str->attacker = SV_ReadPtr();
-    str->attacker = NULL;
-
-    // int extralight;
-    str->extralight = SV_ReadLong();
-
-    // int fixedcolormap;
-    str->fixedcolormap = SV_ReadLong();
-
-    // int colormap;
-    str->colormap = SV_ReadLong();
-
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
-    {
-        StreamIn_pspdef_t(&str->psprites[i]);
-    }
-
-    // int morphTics;
-    str->morphTics = SV_ReadLong();
-
-    // unsigned int jumpTics;
-    str->jumpTics = SV_ReadLong();
-
-    // unsigned int worldTimer;
-    str->worldTimer = SV_ReadLong();
-}
-
-static void StreamOut_player_t(player_t *str)
-{
-    int i;
-
-    // mobj_t *mo;
-    SV_WritePtr(str->mo);
-
-    // playerstate_t playerstate;
-    SV_WriteLong(str->playerstate);
-
-    // ticcmd_t cmd;
-    StreamOut_ticcmd_t(&str->cmd);
-
-    // pclass_t class;
-    SV_WriteLong(str->class);
-
-    // fixed_t viewz;
-    SV_WriteLong(str->viewz);
-
-    // fixed_t viewheight;
-    SV_WriteLong(str->viewheight);
-
-    // fixed_t deltaviewheight;
-    SV_WriteLong(str->deltaviewheight);
-
-    // fixed_t bob;
-    SV_WriteLong(str->bob);
-
-    // int flyheight;
-    SV_WriteLong(str->flyheight);
-
-    // int lookdir;
-    SV_WriteLong(str->lookdir);
-
-    // boolean centering;
-    SV_WriteLong(str->centering);
-
-    // int health;
-    SV_WriteLong(str->health);
-
-    // int armorpoints[NUMARMOR];
-    for (i=0; i<NUMARMOR; ++i)
-    {
-        SV_WriteLong(str->armorpoints[i]);
-    }
-
-    // inventory_t inventory[NUMINVENTORYSLOTS];
-    for (i=0; i<NUMINVENTORYSLOTS; ++i)
-    {
-        StreamOut_inventory_t(&str->inventory[i]);
-    }
-
-    // artitype_t readyArtifact;
-    SV_WriteLong(str->readyArtifact);
-
-    // int artifactCount;
-    SV_WriteLong(str->artifactCount);
-
-    // int inventorySlotNum;
-    SV_WriteLong(str->inventorySlotNum);
-
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
-    {
-        SV_WriteLong(str->powers[i]);
-    }
-
-    // int keys;
-    SV_WriteLong(str->keys);
-
-    // int pieces;
-    SV_WriteLong(str->pieces);
-
-    // signed int frags[MAXPLAYERS];
-    for (i=0; i<maxplayers; ++i)
-    {
-        SV_WriteLong(str->frags[i]);
-    }
-
-    // weapontype_t readyweapon;
-    SV_WriteLong(str->readyweapon);
-
-    // weapontype_t pendingweapon;
-    SV_WriteLong(str->pendingweapon);
-
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        SV_WriteLong(str->weaponowned[i]);
-    }
-
-    // int mana[NUMMANA];
-    for (i=0; i<NUMMANA; ++i)
-    {
-        SV_WriteLong(str->mana[i]);
-    }
-
-    // int attackdown, usedown;
-    SV_WriteLong(str->attackdown);
-    SV_WriteLong(str->usedown);
-
-    // int cheats;
-    SV_WriteLong(str->cheats);
-
-    // int refire;
-    SV_WriteLong(str->refire);
-
-    // int killcount, itemcount, secretcount;
-    SV_WriteLong(str->killcount);
-    SV_WriteLong(str->itemcount);
-    SV_WriteLong(str->secretcount);
-
-    // char message[80];
-    for (i=0; i<80; ++i)
-    {
-        SV_WriteByte(str->message[i]);
-    }
-
-    // int messageTics;
-    SV_WriteLong(str->messageTics);
-
-    // short ultimateMessage;
-    SV_WriteWord(str->ultimateMessage);
-
-    // short yellowMessage;
-    SV_WriteWord(str->yellowMessage);
-
-    // int damagecount, bonuscount;
-    SV_WriteLong(str->damagecount);
-    SV_WriteLong(str->bonuscount);
-
-    // int poisoncount;
-    SV_WriteLong(str->poisoncount);
-
-    // mobj_t *poisoner;
-    SV_WritePtr(str->poisoner);
-
-    // mobj_t *attacker;
-    SV_WritePtr(str->attacker);
-
-    // int extralight;
-    SV_WriteLong(str->extralight);
-
-    // int fixedcolormap;
-    SV_WriteLong(str->fixedcolormap);
-
-    // int colormap;
-    SV_WriteLong(str->colormap);
-
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
-    {
-        StreamOut_pspdef_t(&str->psprites[i]);
-    }
-
-    // int morphTics;
-    SV_WriteLong(str->morphTics);
-
-    // unsigned int jumpTics;
-    SV_WriteLong(str->jumpTics);
-
-    // unsigned int worldTimer;
-    SV_WriteLong(str->worldTimer);
-}
-
-
-//
-// thinker_t
-//
-
-static void StreamIn_thinker_t(thinker_t *str)
-{
-    // struct thinker_s *prev, *next;
-    // Pointers are discarded:
-    str->prev = SV_ReadPtr();
-    str->prev = NULL;
-    str->next = SV_ReadPtr();
-    str->next = NULL;
-
-    // think_t function;
-    // Function pointer is discarded:
-    str->function = SV_ReadPtr();
-    str->function = NULL;
-}
-
-static void StreamOut_thinker_t(thinker_t *str)
-{
-    // struct thinker_s *prev, *next;
-    SV_WritePtr(str->prev);
-    SV_WritePtr(str->next);
-
-    // think_t function;
-    SV_WritePtr(&str->function);
-}
-
-
-//
-// mobj_t
-//
-
-static void StreamInMobjSpecials(mobj_t *mobj)
-{
-    unsigned int special1, special2;
-
-    special1 = SV_ReadLong();
-    special2 = SV_ReadLong();
-
-    mobj->special1.i = special1;
-    mobj->special2.i = special2;
-
-    switch (mobj->type)
-    {
-            // Just special1
-        case MT_BISH_FX:
-        case MT_HOLY_FX:
-        case MT_DRAGON:
-        case MT_THRUSTFLOOR_UP:
-        case MT_THRUSTFLOOR_DOWN:
-        case MT_MINOTAUR:
-        case MT_SORCFX1:
-            SetMobjPtr(&mobj->special1.m, special1);
-            break;
-
-            // Just special2
-        case MT_LIGHTNING_FLOOR:
-        case MT_LIGHTNING_ZAP:
-            SetMobjPtr(&mobj->special2.m, special2);
-            break;
-
-            // Both special1 and special2
-        case MT_HOLY_TAIL:
-        case MT_LIGHTNING_CEILING:
-            SetMobjPtr(&mobj->special1.m, special1);
-            SetMobjPtr(&mobj->special2.m, special2);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void StreamIn_mobj_t(mobj_t *str)
-{
-    unsigned int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // fixed_t x, y, z;
-    str->x = SV_ReadLong();
-    str->y = SV_ReadLong();
-    str->z = SV_ReadLong();
-
-    // struct mobj_s *snext, *sprev;
-    // Pointer values are discarded:
-    str->snext = SV_ReadPtr();
-    str->snext = NULL;
-    str->sprev = SV_ReadPtr();
-    str->sprev = NULL;
-
-    // angle_t angle;
-    str->angle = SV_ReadLong();
-
-    // spritenum_t sprite;
-    str->sprite = SV_ReadLong();
-
-    // int frame;
-    str->frame = SV_ReadLong();
-
-    // struct mobj_s *bnext, *bprev;
-    // Values are read but discarded; this will be restored when the thing's
-    // position is set.
-    str->bnext = SV_ReadPtr();
-    str->bnext = NULL;
-    str->bprev = SV_ReadPtr();
-    str->bprev = NULL;
-
-    // struct subsector_s *subsector;
-    // Read but discard: pointer will be restored when thing position is set.
-    str->subsector = SV_ReadPtr();
-    str->subsector = NULL;
-
-    // fixed_t floorz, ceilingz;
-    str->floorz = SV_ReadLong();
-    str->ceilingz = SV_ReadLong();
-
-    // fixed_t floorpic;
-    str->floorpic = SV_ReadLong();
-
-    // fixed_t radius, height;
-    str->radius = SV_ReadLong();
-    str->height = SV_ReadLong();
-
-    // fixed_t momx, momy, momz;
-    str->momx = SV_ReadLong();
-    str->momy = SV_ReadLong();
-    str->momz = SV_ReadLong();
-
-    // int validcount;
-    str->validcount = SV_ReadLong();
-
-    // mobjtype_t type;
-    str->type = SV_ReadLong();
-
-    // mobjinfo_t *info;
-    // Pointer value is read but discarded.
-    str->info = SV_ReadPtr();
-    str->info = NULL;
-
-    // int tics;
-    str->tics = SV_ReadLong();
-
-    // state_t *state;
-    // Restore as index into states table.
-    i = SV_ReadLong();
-    str->state = &states[i];
-
-    // int damage;
-    str->damage = SV_ReadLong();
-
-    // int flags;
-    str->flags = SV_ReadLong();
-
-    // int flags2;
-    str->flags2 = SV_ReadLong();
-
-    // specialval_t special1;
-    // specialval_t special2;
-    // Read in special values: there are special cases to deal with with
-    // mobj pointers.
-    StreamInMobjSpecials(str);
-
-    // int health;
-    str->health = SV_ReadLong();
-
-    // int movedir;
-    str->movedir = SV_ReadLong();
-
-    // int movecount;
-    str->movecount = SV_ReadLong();
-
-    // struct mobj_s *target;
-    i = SV_ReadLong();
-    SetMobjPtr(&str->target, i);
-
-    // int reactiontime;
-    str->reactiontime = SV_ReadLong();
-
-    // int threshold;
-    str->threshold = SV_ReadLong();
-
-    // struct player_s *player;
-    // Saved as player number.
-    i = SV_ReadLong();
-    if (i == 0)
-    {
-        str->player = NULL;
-    }
-    else
-    {
-        str->player = &players[i - 1];
-        str->player->mo = str;
-    }
-
-    // int lastlook;
-    str->lastlook = SV_ReadLong();
-
-    // fixed_t floorclip;
-    str->floorclip = SV_ReadLong();
-
-    // int archiveNum;
-    str->archiveNum = SV_ReadLong();
-
-    // short tid;
-    str->tid = SV_ReadWord();
-
-    // byte special;
-    str->special = SV_ReadByte();
-
-    // byte args[5];
-    for (i=0; i<5; ++i)
-    {
-        str->args[i] = SV_ReadByte();
-    }
-}
-
-static void StreamOutMobjSpecials(mobj_t *mobj)
-{
-    unsigned int special1, special2;
-    boolean corpse;
-    
-    corpse = (mobj->flags & MF_CORPSE) != 0;
-    special1 = mobj->special1.i;
-    special2 = mobj->special2.i;
-
-    switch (mobj->type)
-    {
-            // Just special1
-        case MT_BISH_FX:
-        case MT_HOLY_FX:
-        case MT_DRAGON:
-        case MT_THRUSTFLOOR_UP:
-        case MT_THRUSTFLOOR_DOWN:
-        case MT_MINOTAUR:
-        case MT_SORCFX1:
-        case MT_MSTAFF_FX2:
-            if (corpse)
-            {
-                special1 = MOBJ_NULL;
-            }
-            else
-            {
-                special1 = GetMobjNum(mobj->special1.m);
-            }
-            break;
-
-            // Just special2
-        case MT_LIGHTNING_FLOOR:
-        case MT_LIGHTNING_ZAP:
-            if (corpse)
-            {
-                special2 = MOBJ_NULL;
-            }
-            else
-            {
-                special2 = GetMobjNum(mobj->special2.m);
-            }
-            break;
-
-            // Both special1 and special2
-        case MT_HOLY_TAIL:
-        case MT_LIGHTNING_CEILING:
-            if (corpse)
-            {
-                special1 = MOBJ_NULL;
-                special2 = MOBJ_NULL;
-            }
-            else
-            {
-                special1 = GetMobjNum(mobj->special1.m);
-                special2 = GetMobjNum(mobj->special2.m);
-            }
-            break;
-
-            // Miscellaneous
-        case MT_KORAX:
-            special1 = 0; // Searching index
-            break;
-
-        default:
-            break;
-    }
-
-    // Write special values to savegame file.
-
-    SV_WriteLong(special1);
-    SV_WriteLong(special2);
-}
-
-static void StreamOut_mobj_t(mobj_t *str)
-{
-    int i;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // fixed_t x, y, z;
-    SV_WriteLong(str->x);
-    SV_WriteLong(str->y);
-    SV_WriteLong(str->z);
-
-    // struct mobj_s *snext, *sprev;
-    SV_WritePtr(str->snext);
-    SV_WritePtr(str->sprev);
-
-    // angle_t angle;
-    SV_WriteLong(str->angle);
-
-    // spritenum_t sprite;
-    SV_WriteLong(str->sprite);
-
-    // int frame;
-    SV_WriteLong(str->frame);
-
-    // struct mobj_s *bnext, *bprev;
-    SV_WritePtr(str->bnext);
-    SV_WritePtr(str->bprev);
-
-    // struct subsector_s *subsector;
-    SV_WritePtr(str->subsector);
-
-    // fixed_t floorz, ceilingz;
-    SV_WriteLong(str->floorz);
-    SV_WriteLong(str->ceilingz);
-
-    // fixed_t floorpic;
-    SV_WriteLong(str->floorpic);
-
-    // fixed_t radius, height;
-    SV_WriteLong(str->radius);
-    SV_WriteLong(str->height);
-
-    // fixed_t momx, momy, momz;
-    SV_WriteLong(str->momx);
-    SV_WriteLong(str->momy);
-    SV_WriteLong(str->momz);
-
-    // int validcount;
-    SV_WriteLong(str->validcount);
-
-    // mobjtype_t type;
-    SV_WriteLong(str->type);
-
-    // mobjinfo_t *info;
-    SV_WritePtr(str->info);
-
-    // int tics;
-    SV_WriteLong(str->tics);
-
-    // state_t *state;
-    // Save as index into the states table.
-    SV_WriteLong(str->state - states);
-
-    // int damage;
-    SV_WriteLong(str->damage);
-
-    // int flags;
-    SV_WriteLong(str->flags);
-
-    // int flags2;
-    SV_WriteLong(str->flags2);
-
-    // specialval_t special1;
-    // specialval_t special2;
-    // There are lots of special cases for the special values:
-    StreamOutMobjSpecials(str);
-
-    // int health;
-    SV_WriteLong(str->health);
-
-    // int movedir;
-    SV_WriteLong(str->movedir);
-
-    // int movecount;
-    SV_WriteLong(str->movecount);
-
-    // struct mobj_s *target;
-    if ((str->flags & MF_CORPSE) != 0)
-    {
-        SV_WriteLong(MOBJ_NULL);
-    }
-    else
-    {
-        SV_WriteLong(GetMobjNum(str->target));
-    }
-
-    // int reactiontime;
-    SV_WriteLong(str->reactiontime);
-
-    // int threshold;
-    SV_WriteLong(str->threshold);
-
-    // struct player_s *player;
-    // Stored as index into players[] array, if there is a player pointer.
-    if (str->player != NULL)
-    {
-        SV_WriteLong(str->player - players + 1);
-    }
-    else
-    {
-        SV_WriteLong(0);
-    }
-
-    // int lastlook;
-    SV_WriteLong(str->lastlook);
-
-    // fixed_t floorclip;
-    SV_WriteLong(str->floorclip);
-
-    // int archiveNum;
-    SV_WriteLong(str->archiveNum);
-
-    // short tid;
-    SV_WriteWord(str->tid);
-
-    // byte special;
-    SV_WriteByte(str->special);
-
-    // byte args[5];
-    for (i=0; i<5; ++i)
-    {
-        SV_WriteByte(str->args[i]);
-    }
-}
-
-
-//
-// floormove_t
-//
-
-static void StreamIn_floormove_t(thinker_t *thinker)
-{
-    floormove_t *str = (floormove_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = sectors + i;
-
-    // floor_e type;
-    str->type = SV_ReadLong();
-
-    // int crush;
-    str->crush = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int newspecial;
-    str->newspecial = SV_ReadLong();
-
-    // short texture;
-    str->texture = SV_ReadWord();
-
-    // fixed_t floordestheight;
-    str->floordestheight = SV_ReadLong();
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // int delayCount;
-    str->delayCount = SV_ReadLong();
-
-    // int delayTotal;
-    str->delayTotal = SV_ReadLong();
-
-    // fixed_t stairsDelayHeight;
-    str->stairsDelayHeight = SV_ReadLong();
-
-    // fixed_t stairsDelayHeightDelta;
-    str->stairsDelayHeightDelta = SV_ReadLong();
-
-    // fixed_t resetHeight;
-    str->resetHeight = SV_ReadLong();
-
-    // short resetDelay;
-    str->resetDelay = SV_ReadWord();
-
-    // short resetDelayCount;
-    str->resetDelayCount = SV_ReadWord();
-
-    // byte textureChange;
-    str->textureChange = SV_ReadByte();
-}
-
-static void StreamOut_floormove_t(thinker_t *thinker)
-{
-    floormove_t *str = (floormove_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // floor_e type;
-    SV_WriteLong(str->type);
-
-    // int crush;
-    SV_WriteLong(str->crush);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int newspecial;
-    SV_WriteLong(str->newspecial);
-
-    // short texture;
-    SV_WriteWord(str->texture);
-
-    // fixed_t floordestheight;
-    SV_WriteLong(str->floordestheight);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // int delayCount;
-    SV_WriteLong(str->delayCount);
-
-    // int delayTotal;
-    SV_WriteLong(str->delayTotal);
-
-    // fixed_t stairsDelayHeight;
-    SV_WriteLong(str->stairsDelayHeight);
-
-    // fixed_t stairsDelayHeightDelta;
-    SV_WriteLong(str->stairsDelayHeightDelta);
-
-    // fixed_t resetHeight;
-    SV_WriteLong(str->resetHeight);
-
-    // short resetDelay;
-    SV_WriteWord(str->resetDelay);
-
-    // short resetDelayCount;
-    SV_WriteWord(str->resetDelayCount);
-
-    // byte textureChange;
-    SV_WriteByte(str->textureChange);
-}
-
-
-//
-// plat_t
-//
-
-static void StreamIn_plat_t(thinker_t *thinker)
-{
-    plat_t *str = (plat_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = sectors + i;
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // fixed_t low;
-    str->low = SV_ReadLong();
-
-    // fixed_t high;
-    str->high = SV_ReadLong();
-
-    // int wait;
-    str->wait = SV_ReadLong();
-
-    // int count;
-    str->count = SV_ReadLong();
-
-    // plat_e status;
-    str->status = SV_ReadLong();
-
-    // plat_e oldstatus;
-    str->oldstatus = SV_ReadLong();
-
-    // int crush;
-    str->crush = SV_ReadLong();
-
-    // int tag;
-    str->tag = SV_ReadLong();
-
-    // plattype_e type;
-    str->type = SV_ReadLong();
-}
-
-static void StreamOut_plat_t(thinker_t *thinker)
-{
-    plat_t *str = (plat_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // fixed_t low;
-    SV_WriteLong(str->low);
-
-    // fixed_t high;
-    SV_WriteLong(str->high);
-
-    // int wait;
-    SV_WriteLong(str->wait);
-
-    // int count;
-    SV_WriteLong(str->count);
-
-    // plat_e status;
-    SV_WriteLong(str->status);
-
-    // plat_e oldstatus;
-    SV_WriteLong(str->oldstatus);
-
-    // int crush;
-    SV_WriteLong(str->crush);
-
-    // int tag;
-    SV_WriteLong(str->tag);
-
-    // plattype_e type;
-    SV_WriteLong(str->type);
-}
-
-
-//
-// ceiling_t
-//
-
-static void StreamIn_ceiling_t(thinker_t *thinker)
-{
-    ceiling_t *str = (ceiling_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = sectors + i;
-
-    // ceiling_e type;
-    str->type = SV_ReadLong();
-
-    // fixed_t bottomheight, topheight;
-    str->bottomheight = SV_ReadLong();
-    str->topheight = SV_ReadLong();
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // int crush;
-    str->crush = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int tag;
-    str->tag = SV_ReadLong();
-
-    // int olddirection;
-    str->olddirection = SV_ReadLong();
-}
-
-static void StreamOut_ceiling_t(thinker_t *thinker)
-{
-    ceiling_t *str = (ceiling_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // ceiling_e type;
-    SV_WriteLong(str->type);
-
-    // fixed_t bottomheight, topheight;
-    SV_WriteLong(str->bottomheight);
-    SV_WriteLong(str->topheight);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // int crush;
-    SV_WriteLong(str->crush);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int tag;
-    SV_WriteLong(str->tag);
-
-    // int olddirection;
-    SV_WriteLong(str->olddirection);
-}
-
-
-//
-// light_t
-//
-
-static void StreamIn_light_t(thinker_t *thinker)
-{
-    light_t *str = (light_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = sectors + i;
-
-    // lighttype_t type;
-    str->type = SV_ReadLong();
-
-    // int value1;
-    str->value1 = SV_ReadLong();
-
-    // int value2;
-    str->value2 = SV_ReadLong();
-
-    // int tics1;
-    str->tics1 = SV_ReadLong();
-
-    // int tics2;
-    str->tics2 = SV_ReadLong();
-
-    // int count;
-    str->count = SV_ReadLong();
-}
-
-static void StreamOut_light_t(thinker_t *thinker)
-{
-    light_t *str = (light_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // lighttype_t type;
-    SV_WriteLong(str->type);
-
-    // int value1;
-    SV_WriteLong(str->value1);
-
-    // int value2;
-    SV_WriteLong(str->value2);
-
-    // int tics1;
-    SV_WriteLong(str->tics1);
-
-    // int tics2;
-    SV_WriteLong(str->tics2);
-
-    // int count;
-    SV_WriteLong(str->count);
-}
-
-
-//
-// vldoor_t
-//
-
-static void StreamIn_vldoor_t(thinker_t *thinker)
-{
-    vldoor_t *str = (vldoor_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // vldoor_e type;
-    str->type = SV_ReadLong();
-
-    // fixed_t topheight;
-    str->topheight = SV_ReadLong();
-
-    // fixed_t speed;
-    str->speed = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int topwait;
-    str->topwait = SV_ReadLong();
-
-    // int topcountdown;
-    str->topcountdown = SV_ReadLong();
-}
-
-static void StreamOut_vldoor_t(thinker_t *thinker)
-{
-    vldoor_t *str = (vldoor_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // vldoor_e type;
-    SV_WriteLong(str->type);
-
-    // fixed_t topheight;
-    SV_WriteLong(str->topheight);
-
-    // fixed_t speed;
-    SV_WriteLong(str->speed);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int topwait;
-    SV_WriteLong(str->topwait);
-
-    // int topcountdown;
-    SV_WriteLong(str->topcountdown);
-}
-
-
-//
-// phase_t
-//
-
-static void StreamIn_phase_t(thinker_t *thinker)
-{
-    phase_t *str = (phase_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // int index;
-    str->index = SV_ReadLong();
-
-    // int base;
-    str->base = SV_ReadLong();
-}
-
-static void StreamOut_phase_t(thinker_t *thinker)
-{
-    phase_t *str = (phase_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // int index;
-    SV_WriteLong(str->index);
-
-    // int base;
-    SV_WriteLong(str->base);
-}
-
-
-//
-// acs_t
-//
-
-static void StreamIn_acs_t(thinker_t *thinker)
-{
-    acs_t *str = (acs_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // mobj_t *activator;
-    i = SV_ReadLong();
-    SetMobjPtr(&str->activator, i);
-
-    // line_t *line;
-    i = SV_ReadLong();
-    if (i != -1)
-    {
-        str->line = &lines[i];
-    }
-    else
-    {
-        str->line = NULL;
-    }
-
-    // int side;
-    str->side = SV_ReadLong();
-
-    // int number;
-    str->number = SV_ReadLong();
-
-    // int infoIndex;
-    str->infoIndex = SV_ReadLong();
-
-    // int delayCount;
-    str->delayCount = SV_ReadLong();
-
-    // int stack[ACS_STACK_DEPTH];
-    for (i=0; i<ACS_STACK_DEPTH; ++i)
-    {
-        str->stack[i] = SV_ReadLong();
-    }
-
-    // int stackPtr;
-    str->stackPtr = SV_ReadLong();
-
-    // int vars[MAX_ACS_SCRIPT_VARS];
-    for (i=0; i<MAX_ACS_SCRIPT_VARS; ++i)
-    {
-        str->vars[i] = SV_ReadLong();
-    }
-
-    // int *ip;
-    str->ip = SV_ReadLong();
-}
-
-static void StreamOut_acs_t(thinker_t *thinker)
-{
-    acs_t *str = (acs_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // mobj_t *activator;
-    SV_WriteLong(GetMobjNum(str->activator));
-
-    // line_t *line;
-    if (str->line != NULL)
-    {
-        SV_WriteLong(str->line - lines);
-    }
-    else
-    {
-        SV_WriteLong(-1);
-    }
-
-    // int side;
-    SV_WriteLong(str->side);
-
-    // int number;
-    SV_WriteLong(str->number);
-
-    // int infoIndex;
-    SV_WriteLong(str->infoIndex);
-
-    // int delayCount;
-    SV_WriteLong(str->delayCount);
-
-    // int stack[ACS_STACK_DEPTH];
-    for (i=0; i<ACS_STACK_DEPTH; ++i)
-    {
-        SV_WriteLong(str->stack[i]);
-    }
-
-    // int stackPtr;
-    SV_WriteLong(str->stackPtr);
-
-    // int vars[MAX_ACS_SCRIPT_VARS];
-    for (i=0; i<MAX_ACS_SCRIPT_VARS; ++i)
-    {
-        SV_WriteLong(str->vars[i]);
-    }
-
-    // int *ip;
-    SV_WriteLong(str->ip);
-}
-
-
-//
-// polyevent_t
-//
-
-static void StreamIn_polyevent_t(thinker_t *thinker)
-{
-    polyevent_t *str = (polyevent_t *) thinker;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // int polyobj;
-    str->polyobj = SV_ReadLong();
-
-    // int speed;
-    str->speed = SV_ReadLong();
-
-    // unsigned int dist;
-    str->dist = SV_ReadLong();
-
-    // int angle;
-    str->angle = SV_ReadLong();
-
-    // fixed_t xSpeed;
-    str->xSpeed = SV_ReadLong();
-
-    // fixed_t ySpeed;
-    str->ySpeed = SV_ReadLong();
-}
-
-static void StreamOut_polyevent_t(thinker_t *thinker)
-{
-    polyevent_t *str = (polyevent_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // int polyobj;
-    SV_WriteLong(str->polyobj);
-
-    // int speed;
-    SV_WriteLong(str->speed);
-
-    // unsigned int dist;
-    SV_WriteLong(str->dist);
-
-    // int angle;
-    SV_WriteLong(str->angle);
-
-    // fixed_t xSpeed;
-    SV_WriteLong(str->xSpeed);
-
-    // fixed_t ySpeed;
-    SV_WriteLong(str->ySpeed);
-}
-
-
-//
-// pillar_t
-//
-
-static void StreamIn_pillar_t(thinker_t *thinker)
-{
-    pillar_t *str = (pillar_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // int ceilingSpeed;
-    str->ceilingSpeed = SV_ReadLong();
-
-    // int floorSpeed;
-    str->floorSpeed = SV_ReadLong();
-
-    // int floordest;
-    str->floordest = SV_ReadLong();
-
-    // int ceilingdest;
-    str->ceilingdest = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // int crush;
-    str->crush = SV_ReadLong();
-}
-
-static void StreamOut_pillar_t(thinker_t *thinker)
-{
-    pillar_t *str = (pillar_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // int ceilingSpeed;
-    SV_WriteLong(str->ceilingSpeed);
-
-    // int floorSpeed;
-    SV_WriteLong(str->floorSpeed);
-
-    // int floordest;
-    SV_WriteLong(str->floordest);
-
-    // int ceilingdest;
-    SV_WriteLong(str->ceilingdest);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // int crush;
-    SV_WriteLong(str->crush);
-}
-
-
-//
-// polydoor_t
-//
-
-static void StreamIn_polydoor_t(thinker_t *thinker)
-{
-    polydoor_t *str = (polydoor_t *) thinker;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // int polyobj;
-    str->polyobj = SV_ReadLong();
-
-    // int speed;
-    str->speed = SV_ReadLong();
-
-    // int dist;
-    str->dist = SV_ReadLong();
-
-    // int totalDist;
-    str->totalDist = SV_ReadLong();
-
-    // int direction;
-    str->direction = SV_ReadLong();
-
-    // fixed_t xSpeed, ySpeed;
-    str->xSpeed = SV_ReadLong();
-    str->ySpeed = SV_ReadLong();
-
-    // int tics;
-    str->tics = SV_ReadLong();
-
-    // int waitTics;
-    str->waitTics = SV_ReadLong();
-
-    // podoortype_t type;
-    str->type = SV_ReadLong();
-
-    // boolean close;
-    str->close = SV_ReadLong();
-}
-
-static void StreamOut_polydoor_t(thinker_t *thinker)
-{
-    polydoor_t *str = (polydoor_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // int polyobj;
-    SV_WriteLong(str->polyobj);
-
-    // int speed;
-    SV_WriteLong(str->speed);
-
-    // int dist;
-    SV_WriteLong(str->dist);
-
-    // int totalDist;
-    SV_WriteLong(str->totalDist);
-
-    // int direction;
-    SV_WriteLong(str->direction);
-
-    // fixed_t xSpeed, ySpeed;
-    SV_WriteLong(str->xSpeed);
-    SV_WriteLong(str->ySpeed);
-
-    // int tics;
-    SV_WriteLong(str->tics);
-
-    // int waitTics;
-    SV_WriteLong(str->waitTics);
-
-    // podoortype_t type;
-    SV_WriteLong(str->type);
-
-    // boolean close;
-    SV_WriteLong(str->close);
-}
-
-
-//
-// floorWaggle_t
-//
-
-static void StreamIn_floorWaggle_t(thinker_t *thinker)
-{
-    floorWaggle_t *str = (floorWaggle_t *) thinker;
-
-    int i;
-
-    // thinker_t thinker;
-    StreamIn_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    i = SV_ReadLong();
-    str->sector = &sectors[i];
-
-    // fixed_t originalHeight;
-    str->originalHeight = SV_ReadLong();
-
-    // fixed_t accumulator;
-    str->accumulator = SV_ReadLong();
-
-    // fixed_t accDelta;
-    str->accDelta = SV_ReadLong();
-
-    // fixed_t targetScale;
-    str->targetScale = SV_ReadLong();
-
-    // fixed_t scale;
-    str->scale = SV_ReadLong();
-
-    // fixed_t scaleDelta;
-    str->scaleDelta = SV_ReadLong();
-
-    // int ticker;
-    str->ticker = SV_ReadLong();
-
-    // int state;
-    str->state = SV_ReadLong();
-}
-
-static void StreamOut_floorWaggle_t(thinker_t *thinker)
-{
-    floorWaggle_t *str = (floorWaggle_t *) thinker;
-
-    // thinker_t thinker;
-    StreamOut_thinker_t(&str->thinker);
-
-    // sector_t *sector;
-    SV_WriteLong(str->sector - sectors);
-
-    // fixed_t originalHeight;
-    SV_WriteLong(str->originalHeight);
-
-    // fixed_t accumulator;
-    SV_WriteLong(str->accumulator);
-
-    // fixed_t accDelta;
-    SV_WriteLong(str->accDelta);
-
-    // fixed_t targetScale;
-    SV_WriteLong(str->targetScale);
-
-    // fixed_t scale;
-    SV_WriteLong(str->scale);
-
-    // fixed_t scaleDelta;
-    SV_WriteLong(str->scaleDelta);
-
-    // int ticker;
-    SV_WriteLong(str->ticker);
-
-    // int state;
-    SV_WriteLong(str->state);
-}
-
-
-//==========================================================================
-//
-// SV_SaveGame
-//
-//==========================================================================
-
-void SV_SaveGame(int slot, const char *description)
-{
-    char fileName[100];
-    char versionText[HXS_VERSION_TEXT_LENGTH];
-    unsigned int i;
-
-    // Open the output file
-    M_snprintf(fileName, sizeof(fileName), "%shex6.hxs", SavePath);
-    SV_OpenWrite(fileName);
-
-    // Write game save description
-    SV_Write(description, HXS_DESCRIPTION_LENGTH);
-
-    // Write version info
-    memset(versionText, 0, HXS_VERSION_TEXT_LENGTH);
-    M_StringCopy(versionText, HXS_VERSION_TEXT, HXS_VERSION_TEXT_LENGTH);
-    SV_Write(versionText, HXS_VERSION_TEXT_LENGTH);
-
-    // Place a header marker
-    SV_WriteLong(ASEG_GAME_HEADER);
-
-    // Write current map and difficulty
-    SV_WriteByte(gamemap);
-    SV_WriteByte(gameskill);
-
-    // Write global script info
-    for (i = 0; i < MAX_ACS_WORLD_VARS; ++i)
-    {
-        SV_WriteLong(WorldVars[i]);
-    }
-
-    for (i = 0; i < MAX_ACS_STORE + 1; ++i)
-    {
-        StreamOut_acsstore_t(&ACSStore[i]);
-    }
-
-    ArchivePlayers();
-
-    // Place a termination marker
-    SV_WriteLong(ASEG_END);
-
-    // Close the output file
-    SV_Close();
-
-    // Save out the current map
-    SV_SaveMap(true);           // true = save player info
-
-    // Clear all save files at destination slot
-    ClearSaveSlot(slot);
-
-    // Copy base slot to destination slot
-    CopySaveSlot(BASE_SLOT, slot);
-}
-
-//==========================================================================
-//
-// SV_SaveMap
-//
-//==========================================================================
-
-void SV_SaveMap(boolean savePlayers)
-{
-    char fileName[100];
-
-    SavingPlayers = savePlayers;
-
-    // Open the output file
-    M_snprintf(fileName, sizeof(fileName), "%shex6%02d.hxs", SavePath, gamemap);
-    SV_OpenWrite(fileName);
-
-    // Place a header marker
-    SV_WriteLong(ASEG_MAP_HEADER);
-
-    // Write the level timer
-    SV_WriteLong(leveltime);
-
-    // Set the mobj archive numbers
-    SetMobjArchiveNums();
-
-    ArchiveWorld();
-    ArchivePolyobjs();
-    ArchiveMobjs();
-    ArchiveThinkers();
-    ArchiveScripts();
-    ArchiveSounds();
-    ArchiveMisc();
-
-    // Place a termination marker
-    SV_WriteLong(ASEG_END);
-
-    // Close the output file
-    SV_Close();
-}
-
-//==========================================================================
-//
-// SV_LoadGame
-//
-//==========================================================================
-
-void SV_LoadGame(int slot)
-{
-    int i;
-    char fileName[100];
-    char version_text[HXS_VERSION_TEXT_LENGTH];
-    player_t playerBackup[MAXPLAYERS];
-    mobj_t *mobj;
-
-    // Copy all needed save files to the base slot
-    if (slot != BASE_SLOT)
-    {
-        ClearSaveSlot(BASE_SLOT);
-        CopySaveSlot(slot, BASE_SLOT);
-    }
-
-    // Create the name
-    M_snprintf(fileName, sizeof(fileName), "%shex6.hxs", SavePath);
-
-    // Load the file
-    SV_OpenRead(fileName);
-
-    // Set the save pointer and skip the description field
-    fseek(SavingFP, HXS_DESCRIPTION_LENGTH, SEEK_CUR);
-
-    // Check the version text
-
-    for (i = 0; i < sizeof(version_text); ++i)
-    {
-        version_text[i] = SV_ReadByte();
-    }
-    if (strncmp(version_text, HXS_VERSION_TEXT, HXS_VERSION_TEXT_LENGTH) != 0)
-    {                           // Bad version
-        return;
-    }
-
-    AssertSegment(ASEG_GAME_HEADER);
-
-    gameepisode = 1;
-    gamemap = SV_ReadByte();
-    gameskill = SV_ReadByte();
-
-    // Read global script info
-
-    for (i = 0; i < MAX_ACS_WORLD_VARS; ++i)
-    {
-        WorldVars[i] = SV_ReadLong();
-    }
-
-    for (i = 0; i < MAX_ACS_STORE + 1; ++i)
-    {
-        StreamIn_acsstore_t(&ACSStore[i]);
-    }
-
-    // Read the player structures
-    UnarchivePlayers();
-
-    AssertSegment(ASEG_END);
-
-    // Save player structs
-    for (i = 0; i < maxplayers; i++)
-    {
-        playerBackup[i] = players[i];
-    }
-
-    SV_Close();
-
-    // Load the current map
-    SV_LoadMap();
-
-    // Don't need the player mobj relocation info for load game
-    Z_Free(TargetPlayerAddrs);
-
-    // Restore player structs
-    inv_ptr = 0;
-    curpos = 0;
-    for (i = 0; i < maxplayers; i++)
-    {
-        mobj = players[i].mo;
-        players[i] = playerBackup[i];
-        players[i].mo = mobj;
-        if (i == consoleplayer)
-        {
-            players[i].readyArtifact = players[i].inventory[inv_ptr].type;
-        }
-    }
-
-    // Set Bestslideline after loading
-    P_InitSlideLine();
-}
-
-//==========================================================================
-//
-// SV_UpdateRebornSlot
-//
-// Copies the base slot to the reborn slot.
-//
-//==========================================================================
-
-void SV_UpdateRebornSlot(void)
-{
-    ClearSaveSlot(REBORN_SLOT);
-    CopySaveSlot(BASE_SLOT, REBORN_SLOT);
-}
-
-//==========================================================================
-//
-// SV_ClearRebornSlot
-//
-//==========================================================================
-
-void SV_ClearRebornSlot(void)
-{
-    ClearSaveSlot(REBORN_SLOT);
-}
-
-//==========================================================================
-//
-// SV_MapTeleport
-//
-//==========================================================================
-
-void SV_MapTeleport(int map, int position)
-{
-    int i;
-    int j;
-    char fileName[100];
-    player_t playerBackup[MAXPLAYERS];
-    mobj_t *targetPlayerMobj;
-    mobj_t *mobj;
-    int inventoryPtr;
-    int currentInvPos;
-    boolean rClass;
-    boolean playerWasReborn;
-    boolean oldWeaponowned[NUMWEAPONS];
-    int oldKeys = 0;
-    int oldPieces = 0;
-    int bestWeapon;
-
-    if (!deathmatch)
-    {
-        if (P_GetMapCluster(gamemap) == P_GetMapCluster(map))
-        {                       // Same cluster - save map without saving player mobjs
-            SV_SaveMap(false);
-        }
-        else
-        {                       // Entering new cluster - clear base slot
-            ClearSaveSlot(BASE_SLOT);
-        }
-    }
-
-    // Store player structs for later
-    rClass = randomclass;
-    randomclass = false;
-    for (i = 0; i < maxplayers; i++)
-    {
-        playerBackup[i] = players[i];
-    }
-
-    // Save some globals that get trashed during the load
-    inventoryPtr = inv_ptr;
-    currentInvPos = curpos;
-
-    // Only SV_LoadMap() uses TargetPlayerAddrs, so it's NULLed here
-    // for the following check (player mobj redirection)
-    TargetPlayerAddrs = NULL;
-
-    gamemap = map;
-    M_snprintf(fileName, sizeof(fileName), "%shex6%02d.hxs", SavePath, gamemap);
-    if (!deathmatch && ExistingFile(fileName))
-    {                           // Unarchive map
-        SV_LoadMap();
-    }
-    else
-    {                           // New map
-        G_InitNew(gameskill, gameepisode, gamemap);
-
-        // Destroy all freshly spawned players
-        for (i = 0; i < maxplayers; i++)
-        {
-            if (playeringame[i])
-            {
-                P_RemoveMobj(players[i].mo);
-            }
-        }
-    }
-
-    // Restore player structs
-    targetPlayerMobj = NULL;
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        players[i] = playerBackup[i];
-        P_ClearMessage(&players[i]);
-        players[i].attacker = NULL;
-        players[i].poisoner = NULL;
-
-        if (netgame)
-        {
-            if (players[i].playerstate == PST_DEAD)
-            {                   // In a network game, force all players to be alive
-                players[i].playerstate = PST_REBORN;
-            }
-            if (!deathmatch)
-            {                   // Cooperative net-play, retain keys and weapons
-                oldKeys = players[i].keys;
-                oldPieces = players[i].pieces;
-                for (j = 0; j < NUMWEAPONS; j++)
-                {
-                    oldWeaponowned[j] = players[i].weaponowned[j];
-                }
-            }
-        }
-        playerWasReborn = (players[i].playerstate == PST_REBORN);
-        if (deathmatch)
-        {
-            memset(players[i].frags, 0, sizeof(players[i].frags));
-            mobj = P_SpawnMobj(playerstarts[0][i].x << 16,
-                               playerstarts[0][i].y << 16, 0,
-                               MT_PLAYER_FIGHTER);
-            players[i].mo = mobj;
-            G_DeathMatchSpawnPlayer(i);
-            P_RemoveMobj(mobj);
-        }
-        else
-        {
-            P_SpawnPlayer(&playerstarts[position][i]);
-        }
-
-        if (playerWasReborn && netgame && !deathmatch)
-        {                       // Restore keys and weapons when reborn in co-op
-            players[i].keys = oldKeys;
-            players[i].pieces = oldPieces;
-            for (bestWeapon = 0, j = 0; j < NUMWEAPONS; j++)
-            {
-                if (oldWeaponowned[j])
-                {
-                    bestWeapon = j;
-                    players[i].weaponowned[j] = true;
-                }
-            }
-            players[i].mana[MANA_1] = 25;
-            players[i].mana[MANA_2] = 25;
-            if (bestWeapon)
-            {                   // Bring up the best weapon
-                players[i].pendingweapon = bestWeapon;
-            }
-        }
-
-        if (targetPlayerMobj == NULL)
-        {                       // The poor sap
-            targetPlayerMobj = players[i].mo;
-        }
-    }
-    randomclass = rClass;
-
-    // Redirect anything targeting a player mobj
-    if (TargetPlayerAddrs)
-    {
-        for (i = 0; i < TargetPlayerCount; i++)
-        {
-            *TargetPlayerAddrs[i] = targetPlayerMobj;
-        }
-        Z_Free(TargetPlayerAddrs);
-    }
-
-    // Destroy all things touching players
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (playeringame[i])
-        {
-            P_TeleportMove(players[i].mo, players[i].mo->x, players[i].mo->y);
-        }
-    }
-
-    // Restore trashed globals
-    inv_ptr = inventoryPtr;
-    curpos = currentInvPos;
-
-    // Launch waiting scripts
-    if (!deathmatch)
-    {
-        P_CheckACSStore();
-    }
-
-    // For single play, save immediately into the reborn slot
-    if (!netgame)
-    {
-        SV_SaveGame(REBORN_SLOT, REBORN_DESCRIPTION);
-    }
-}
-
-//==========================================================================
-//
-// SV_GetRebornSlot
-//
-//==========================================================================
-
-int SV_GetRebornSlot(void)
-{
-    return (REBORN_SLOT);
-}
-
-//==========================================================================
-//
-// SV_RebornSlotAvailable
-//
-// Returns true if the reborn slot is available.
-//
-//==========================================================================
-
-boolean SV_RebornSlotAvailable(void)
-{
-    char fileName[100];
-
-    M_snprintf(fileName, sizeof(fileName), "%shex%d.hxs", SavePath, REBORN_SLOT);
-    return ExistingFile(fileName);
-}
-
-//==========================================================================
-//
-// SV_LoadMap
-//
-//==========================================================================
-
-void SV_LoadMap(void)
-{
-    char fileName[100];
-
-    // Load a base level
-    G_InitNew(gameskill, gameepisode, gamemap);
-
-    // Remove all thinkers
-    RemoveAllThinkers();
-
-    // Create the name
-    M_snprintf(fileName, sizeof(fileName), "%shex6%02d.hxs", SavePath, gamemap);
-
-    // Load the file
-    SV_OpenRead(fileName);
-
-    AssertSegment(ASEG_MAP_HEADER);
-
-    // Read the level timer
-    leveltime = SV_ReadLong();
-
-    UnarchiveWorld();
-    UnarchivePolyobjs();
-    UnarchiveMobjs();
-    UnarchiveThinkers();
-    UnarchiveScripts();
-    UnarchiveSounds();
-    UnarchiveMisc();
-
-    AssertSegment(ASEG_END);
-
-    // Free mobj list and save buffer
-    Z_Free(MobjList);
-    SV_Close();
-}
-
-//==========================================================================
-//
-// SV_InitBaseSlot
-//
-//==========================================================================
-
-void SV_InitBaseSlot(void)
-{
-    ClearSaveSlot(BASE_SLOT);
-}
-
-//==========================================================================
-//
-// ArchivePlayers
-//
-//==========================================================================
-
-static void ArchivePlayers(void)
-{
-    int i;
-
-    SV_WriteLong(ASEG_PLAYERS);
-    for (i = 0; i < maxplayers; i++)
-    {
-        SV_WriteByte(playeringame[i]);
-    }
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        SV_WriteByte(PlayerClass[i]);
-        StreamOut_player_t(&players[i]);
-    }
-}
-
-//==========================================================================
-//
-// UnarchivePlayers
-//
-//==========================================================================
-
-static void UnarchivePlayers(void)
-{
-    int i;
-
-    AssertSegment(ASEG_PLAYERS);
-    for (i = 0; i < maxplayers; i++)
-    {
-        playeringame[i] = SV_ReadByte();
-    }
-    for (i = 0; i < maxplayers; i++)
-    {
-        if (!playeringame[i])
-        {
-            continue;
-        }
-        PlayerClass[i] = SV_ReadByte();
-        StreamIn_player_t(&players[i]);
-        P_ClearMessage(&players[i]);
-    }
-}
-
-//==========================================================================
-//
-// ArchiveWorld
-//
-//==========================================================================
-
-static void ArchiveWorld(void)
-{
-    int i;
-    int j;
-    sector_t *sec;
-    line_t *li;
-    side_t *si;
-
-    SV_WriteLong(ASEG_WORLD);
-    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
-    {
-        SV_WriteWord(sec->floorheight >> FRACBITS);
-        SV_WriteWord(sec->ceilingheight >> FRACBITS);
-        SV_WriteWord(sec->floorpic);
-        SV_WriteWord(sec->ceilingpic);
-        SV_WriteWord(sec->lightlevel);
-        SV_WriteWord(sec->special);
-        SV_WriteWord(sec->tag);
-        SV_WriteWord(sec->seqType);
-    }
-    for (i = 0, li = lines; i < numlines; i++, li++)
-    {
-        SV_WriteWord(li->flags);
-        SV_WriteByte(li->special);
-        SV_WriteByte(li->arg1);
-        SV_WriteByte(li->arg2);
-        SV_WriteByte(li->arg3);
-        SV_WriteByte(li->arg4);
-        SV_WriteByte(li->arg5);
-        for (j = 0; j < 2; j++)
-        {
-            if (li->sidenum[j] == -1)
-            {
-                continue;
-            }
-            si = &sides[li->sidenum[j]];
-            SV_WriteWord(si->textureoffset >> FRACBITS);
-            SV_WriteWord(si->rowoffset >> FRACBITS);
-            SV_WriteWord(si->toptexture);
-            SV_WriteWord(si->bottomtexture);
-            SV_WriteWord(si->midtexture);
-        }
-    }
-}
-
-//==========================================================================
-//
-// UnarchiveWorld
-//
-//==========================================================================
-
-static void UnarchiveWorld(void)
-{
-    int i;
-    int j;
-    sector_t *sec;
-    line_t *li;
-    side_t *si;
-
-    AssertSegment(ASEG_WORLD);
-    for (i = 0, sec = sectors; i < numsectors; i++, sec++)
-    {
-        sec->floorheight = SV_ReadWord() << FRACBITS;
-        sec->ceilingheight = SV_ReadWord() << FRACBITS;
-        sec->floorpic = SV_ReadWord();
-        sec->ceilingpic = SV_ReadWord();
-        sec->lightlevel = SV_ReadWord();
-        sec->special = SV_ReadWord();
-        sec->tag = SV_ReadWord();
-        sec->seqType = SV_ReadWord();
-        sec->specialdata = 0;
-        sec->soundtarget = 0;
-    }
-    for (i = 0, li = lines; i < numlines; i++, li++)
-    {
-        li->flags = SV_ReadWord();
-        li->special = SV_ReadByte();
-        li->arg1 = SV_ReadByte();
-        li->arg2 = SV_ReadByte();
-        li->arg3 = SV_ReadByte();
-        li->arg4 = SV_ReadByte();
-        li->arg5 = SV_ReadByte();
-        for (j = 0; j < 2; j++)
-        {
-            if (li->sidenum[j] == -1)
-            {
-                continue;
-            }
-            si = &sides[li->sidenum[j]];
-            si->textureoffset = SV_ReadWord() << FRACBITS;
-            si->rowoffset = SV_ReadWord() << FRACBITS;
-            si->toptexture = SV_ReadWord();
-            si->bottomtexture = SV_ReadWord();
-            si->midtexture = SV_ReadWord();
-        }
-    }
-}
-
-//==========================================================================
-//
-// SetMobjArchiveNums
-//
-// Sets the archive numbers in all mobj structs.  Also sets the MobjCount
-// global.  Ignores player mobjs if SavingPlayers is false.
-//
-//==========================================================================
-
-static void SetMobjArchiveNums(void)
-{
-    mobj_t *mobj;
-    thinker_t *thinker;
-
-    MobjCount = 0;
-    for (thinker = thinkercap.next; thinker != &thinkercap;
-         thinker = thinker->next)
-    {
-        if (thinker->function == P_MobjThinker)
-        {
-            mobj = (mobj_t *) thinker;
-            if (mobj->player && !SavingPlayers)
-            {                   // Skipping player mobjs
-                continue;
-            }
-            mobj->archiveNum = MobjCount++;
-        }
-    }
-}
-
-//==========================================================================
-//
-// ArchiveMobjs
-//
-//==========================================================================
-
-static void ArchiveMobjs(void)
-{
-    int count;
-    thinker_t *thinker;
-
-    SV_WriteLong(ASEG_MOBJS);
-    SV_WriteLong(MobjCount);
-    count = 0;
-    for (thinker = thinkercap.next; thinker != &thinkercap;
-         thinker = thinker->next)
-    {
-        if (thinker->function != P_MobjThinker)
-        {                       // Not a mobj thinker
-            continue;
-        }
-        if (((mobj_t *) thinker)->player && !SavingPlayers)
-        {                       // Skipping player mobjs
-            continue;
-        }
-        count++;
-        StreamOut_mobj_t((mobj_t *) thinker);
-    }
-    if (count != MobjCount)
-    {
-        I_Error("ArchiveMobjs: bad mobj count");
-    }
-}
-
-//==========================================================================
-//
-// UnarchiveMobjs
-//
-//==========================================================================
-
-static void UnarchiveMobjs(void)
-{
-    int i;
-    mobj_t *mobj;
-
-    AssertSegment(ASEG_MOBJS);
-    TargetPlayerAddrs = Z_Malloc(MAX_TARGET_PLAYERS * sizeof(mobj_t **),
-                                 PU_STATIC, NULL);
-    TargetPlayerCount = 0;
-    MobjCount = SV_ReadLong();
-    MobjList = Z_Malloc(MobjCount * sizeof(mobj_t *), PU_STATIC, NULL);
-    for (i = 0; i < MobjCount; i++)
-    {
-        MobjList[i] = Z_Malloc(sizeof(mobj_t), PU_LEVEL, NULL);
-    }
-    for (i = 0; i < MobjCount; i++)
-    {
-        mobj = MobjList[i];
-        StreamIn_mobj_t(mobj);
-
-        // Restore broken pointers.
-        mobj->info = &mobjinfo[mobj->type];
-        P_SetThingPosition(mobj);
-        mobj->floorz = mobj->subsector->sector->floorheight;
-        mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-
-        mobj->thinker.function = P_MobjThinker;
-        P_AddThinker(&mobj->thinker);
-    }
-    P_CreateTIDList();
-    P_InitCreatureCorpseQueue(true);    // true = scan for corpses
-}
-
-//==========================================================================
-//
-// GetMobjNum
-//
-//==========================================================================
-
-static int GetMobjNum(mobj_t * mobj)
-{
-    if (mobj == NULL)
-    {
-        return MOBJ_NULL;
-    }
-    if (mobj->player && !SavingPlayers)
-    {
-        return MOBJ_XX_PLAYER;
-    }
-    return mobj->archiveNum;
-}
-
-//==========================================================================
-//
-// SetMobjPtr
-//
-//==========================================================================
-
-static void SetMobjPtr(mobj_t **ptr, unsigned int archiveNum)
-{
-    if (archiveNum == MOBJ_NULL)
-    {
-        *ptr = NULL;
-    }
-    else if (archiveNum == MOBJ_XX_PLAYER)
-    {
-        if (TargetPlayerCount == MAX_TARGET_PLAYERS)
-        {
-            I_Error("RestoreMobj: exceeded MAX_TARGET_PLAYERS");
-        }
-        TargetPlayerAddrs[TargetPlayerCount++] = ptr;
-        *ptr = NULL;
-    }
-    else
-    {
-        *ptr = MobjList[archiveNum];
-    }
-}
-
-//==========================================================================
-//
-// Thinker types list.
-//
-// This is used by ArchiveThinkers and UnarchiveThinkers, below.
-//
-// Original comment:
-// "This list has been prioritized using frequency estimates"
-//
-//==========================================================================
-
-static thinkInfo_t ThinkerInfo[] = {
-    {
-     TC_MOVE_FLOOR,
-     T_MoveFloor,
-     StreamOut_floormove_t,
-     StreamIn_floormove_t,
-     RestoreSSThinker,
-     sizeof(floormove_t)
-    },
-    {
-     TC_PLAT_RAISE,
-     T_PlatRaise,
-     StreamOut_plat_t,
-     StreamIn_plat_t,
-     RestorePlatRaise,
-     sizeof(plat_t)
-    },
-    {
-     TC_MOVE_CEILING,
-     T_MoveCeiling,
-     StreamOut_ceiling_t,
-     StreamIn_ceiling_t,
-     RestoreMoveCeiling,
-     sizeof(ceiling_t)
-    },
-    {
-     TC_LIGHT,
-     T_Light,
-     StreamOut_light_t,
-     StreamIn_light_t,
-     NULL,
-     sizeof(light_t)
-    },
-    {
-     TC_VERTICAL_DOOR,
-     T_VerticalDoor,
-     StreamOut_vldoor_t,
-     StreamIn_vldoor_t,
-     RestoreSSThinker,
-     sizeof(vldoor_t)
-    },
-    {
-     TC_PHASE,
-     T_Phase,
-     StreamOut_phase_t,
-     StreamIn_phase_t,
-     NULL,
-     sizeof(phase_t)
-    },
-    {
-     TC_INTERPRET_ACS,
-     T_InterpretACS,
-     StreamOut_acs_t,
-     StreamIn_acs_t,
-     NULL,
-     sizeof(acs_t)
-    },
-    {
-     TC_ROTATE_POLY,
-     T_RotatePoly,
-     StreamOut_polyevent_t,
-     StreamIn_polyevent_t,
-     NULL,
-     sizeof(polyevent_t)
-    },
-    {
-     TC_BUILD_PILLAR,
-     T_BuildPillar,
-     StreamOut_pillar_t,
-     StreamIn_pillar_t,
-     RestoreSSThinker,
-     sizeof(pillar_t)
-    },
-    {
-     TC_MOVE_POLY,
-     T_MovePoly,
-     StreamOut_polyevent_t,
-     StreamIn_polyevent_t,
-     NULL,
-     sizeof(polyevent_t)
-    },
-    {
-     TC_POLY_DOOR,
-     T_PolyDoor,
-     StreamOut_polydoor_t,
-     StreamIn_polydoor_t,
-     NULL,
-     sizeof(polydoor_t)
-    },
-    {
-     TC_FLOOR_WAGGLE,
-     T_FloorWaggle,
-     StreamOut_floorWaggle_t,
-     StreamIn_floorWaggle_t,
-     RestoreSSThinker,
-     sizeof(floorWaggle_t)
-    },
-    { TC_NULL, NULL, NULL, NULL, NULL, 0},
-};
-
-//==========================================================================
-//
-// ArchiveThinkers
-//
-//==========================================================================
-
-static void ArchiveThinkers(void)
-{
-    thinker_t *thinker;
-    thinkInfo_t *info;
-
-    SV_WriteLong(ASEG_THINKERS);
-    for (thinker = thinkercap.next; thinker != &thinkercap;
-         thinker = thinker->next)
-    {
-        for (info = ThinkerInfo; info->tClass != TC_NULL; info++)
-        {
-            if (thinker->function == info->thinkerFunc)
-            {
-                SV_WriteByte(info->tClass);
-                info->writeFunc(thinker);
-                break;
-            }
-        }
-    }
-    // Add a termination marker
-    SV_WriteByte(TC_NULL);
-}
-
-//==========================================================================
-//
-// UnarchiveThinkers
-//
-//==========================================================================
-
-static void UnarchiveThinkers(void)
-{
-    int tClass;
-    thinker_t *thinker;
-    thinkInfo_t *info;
-
-    AssertSegment(ASEG_THINKERS);
-    while ((tClass = SV_ReadByte()) != TC_NULL)
-    {
-        for (info = ThinkerInfo; info->tClass != TC_NULL; info++)
-        {
-            if (tClass == info->tClass)
-            {
-                thinker = Z_Malloc(info->size, PU_LEVEL, NULL);
-                info->readFunc(thinker);
-                thinker->function = info->thinkerFunc;
-                if (info->restoreFunc)
-                {
-                    info->restoreFunc(thinker);
-                }
-                P_AddThinker(thinker);
-                break;
-            }
-        }
-        if (info->tClass == TC_NULL)
-        {
-            I_Error("UnarchiveThinkers: Unknown tClass %d in "
-                    "savegame", tClass);
-        }
-    }
-}
-
-//==========================================================================
-//
-// RestoreSSThinker
-//
-//==========================================================================
-
-static void RestoreSSThinker(thinker_t *thinker)
-{
-    ssthinker_t *sst = (ssthinker_t *) thinker;
-    sst->sector->specialdata = sst->thinker.function;
-}
-
-//==========================================================================
-//
-// RestorePlatRaise
-//
-//==========================================================================
-
-static void RestorePlatRaise(thinker_t *thinker)
-{
-    plat_t *plat = (plat_t *) thinker;
-    plat->sector->specialdata = T_PlatRaise;
-    P_AddActivePlat(plat);
-}
-
-//==========================================================================
-//
-// RestoreMoveCeiling
-//
-//==========================================================================
-
-static void RestoreMoveCeiling(thinker_t *thinker)
-{
-    ceiling_t *ceiling = (ceiling_t *) thinker;
-    ceiling->sector->specialdata = T_MoveCeiling;
-    P_AddActiveCeiling(ceiling);
-}
-
-//==========================================================================
-//
-// ArchiveScripts
-//
-//==========================================================================
-
-static void ArchiveScripts(void)
-{
-    int i;
-
-    SV_WriteLong(ASEG_SCRIPTS);
-    for (i = 0; i < ACScriptCount; i++)
-    {
-        SV_WriteWord(ACSInfo[i].state);
-        SV_WriteWord(ACSInfo[i].waitValue);
-    }
-
-    for (i = 0; i< MAX_ACS_MAP_VARS; ++i)
-    {
-        SV_WriteLong(MapVars[i]);
-    }
-}
-
-//==========================================================================
-//
-// UnarchiveScripts
-//
-//==========================================================================
-
-static void UnarchiveScripts(void)
-{
-    int i;
-
-    AssertSegment(ASEG_SCRIPTS);
-    for (i = 0; i < ACScriptCount; i++)
-    {
-        ACSInfo[i].state = SV_ReadWord();
-        ACSInfo[i].waitValue = SV_ReadWord();
-    }
-
-    for (i = 0; i < MAX_ACS_MAP_VARS; ++i)
-    {
-        MapVars[i] = SV_ReadLong();
-    }
-}
-
-//==========================================================================
-//
-// ArchiveMisc
-//
-//==========================================================================
-
-static void ArchiveMisc(void)
-{
-    int ix;
-
-    SV_WriteLong(ASEG_MISC);
-    for (ix = 0; ix < maxplayers; ix++)
-    {
-        SV_WriteLong(localQuakeHappening[ix]);
-    }
-}
-
-//==========================================================================
-//
-// UnarchiveMisc
-//
-//==========================================================================
-
-static void UnarchiveMisc(void)
-{
-    int ix;
-
-    AssertSegment(ASEG_MISC);
-    for (ix = 0; ix < maxplayers; ix++)
-    {
-        localQuakeHappening[ix] = SV_ReadLong();
-    }
-}
-
-//==========================================================================
-//
-// RemoveAllThinkers
-//
-//==========================================================================
-
-static void RemoveAllThinkers(void)
-{
-    thinker_t *thinker;
-    thinker_t *nextThinker;
-
-    thinker = thinkercap.next;
-    while (thinker != &thinkercap)
-    {
-        nextThinker = thinker->next;
-        if (thinker->function == P_MobjThinker)
-        {
-            P_RemoveMobj((mobj_t *) thinker);
-        }
-        else
-        {
-            Z_Free(thinker);
-        }
-        thinker = nextThinker;
-    }
-    P_InitThinkers();
-}
-
-//==========================================================================
-//
-// ArchiveSounds
-//
-//==========================================================================
-
-static void ArchiveSounds(void)
-{
-    seqnode_t *node;
-    sector_t *sec;
-    int difference;
-    int i;
-
-    SV_WriteLong(ASEG_SOUNDS);
-
-    // Save the sound sequences
-    SV_WriteLong(ActiveSequences);
-    for (node = SequenceListHead; node; node = node->next)
-    {
-        SV_WriteLong(node->sequence);
-        SV_WriteLong(node->delayTics);
-        SV_WriteLong(node->volume);
-        SV_WriteLong(SN_GetSequenceOffset(node->sequence,
-                                           node->sequencePtr));
-        SV_WriteLong(node->currentSoundID);
-        for (i = 0; i < po_NumPolyobjs; i++)
-        {
-            if (node->mobj == (mobj_t *) & polyobjs[i].startSpot)
-            {
-                break;
-            }
-        }
-        if (i == po_NumPolyobjs)
-        {                       // Sound is attached to a sector, not a polyobj
-            sec = R_PointInSubsector(node->mobj->x, node->mobj->y)->sector;
-            difference = (int) ((byte *) sec
-                                - (byte *) & sectors[0]) / sizeof(sector_t);
-            SV_WriteLong(0);   // 0 -- sector sound origin
-        }
-        else
-        {
-            SV_WriteLong(1);   // 1 -- polyobj sound origin
-            difference = i;
-        }
-        SV_WriteLong(difference);
-    }
-}
-
-//==========================================================================
-//
-// UnarchiveSounds
-//
-//==========================================================================
-
-static void UnarchiveSounds(void)
-{
-    int i;
-    int numSequences;
-    int sequence;
-    int delayTics;
-    int volume;
-    int seqOffset;
-    int soundID;
-    int polySnd;
-    int secNum;
-    mobj_t *sndMobj;
-
-    AssertSegment(ASEG_SOUNDS);
-
-    // Reload and restart all sound sequences
-    numSequences = SV_ReadLong();
-    i = 0;
-    while (i < numSequences)
-    {
-        sequence = SV_ReadLong();
-        delayTics = SV_ReadLong();
-        volume = SV_ReadLong();
-        seqOffset = SV_ReadLong();
-
-        soundID = SV_ReadLong();
-        polySnd = SV_ReadLong();
-        secNum = SV_ReadLong();
-        if (!polySnd)
-        {
-            sndMobj = (mobj_t *) & sectors[secNum].soundorg;
-        }
-        else
-        {
-            sndMobj = (mobj_t *) & polyobjs[secNum].startSpot;
-        }
-        SN_StartSequence(sndMobj, sequence);
-        SN_ChangeNodeData(i, seqOffset, delayTics, volume, soundID);
-        i++;
-    }
-}
-
-//==========================================================================
-//
-// ArchivePolyobjs
-//
-//==========================================================================
-
-static void ArchivePolyobjs(void)
-{
-    int i;
-
-    SV_WriteLong(ASEG_POLYOBJS);
-    SV_WriteLong(po_NumPolyobjs);
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        SV_WriteLong(polyobjs[i].tag);
-        SV_WriteLong(polyobjs[i].angle);
-        SV_WriteLong(polyobjs[i].startSpot.x);
-        SV_WriteLong(polyobjs[i].startSpot.y);
-    }
-}
-
-//==========================================================================
-//
-// UnarchivePolyobjs
-//
-//==========================================================================
-
-static void UnarchivePolyobjs(void)
-{
-    int i;
-    fixed_t deltaX;
-    fixed_t deltaY;
-
-    AssertSegment(ASEG_POLYOBJS);
-    if (SV_ReadLong() != po_NumPolyobjs)
-    {
-        I_Error("UnarchivePolyobjs: Bad polyobj count");
-    }
-    for (i = 0; i < po_NumPolyobjs; i++)
-    {
-        if (SV_ReadLong() != polyobjs[i].tag)
-        {
-            I_Error("UnarchivePolyobjs: Invalid polyobj tag");
-        }
-        PO_RotatePolyobj(polyobjs[i].tag, (angle_t) SV_ReadLong());
-        deltaX = SV_ReadLong() - polyobjs[i].startSpot.x;
-        deltaY = SV_ReadLong() - polyobjs[i].startSpot.y;
-        PO_MovePolyobj(polyobjs[i].tag, deltaX, deltaY);
-    }
-}
-
-//==========================================================================
-//
-// AssertSegment
-//
-//==========================================================================
-
-static void AssertSegment(gameArchiveSegment_t segType)
-{
-    if (SV_ReadLong() != segType)
-    {
-        I_Error("Corrupt save game: Segment [%d] failed alignment check",
-                segType);
-    }
-}
-
-//==========================================================================
-//
-// ClearSaveSlot
-//
-// Deletes all save game files associated with a slot number.
-//
-//==========================================================================
-
-static void ClearSaveSlot(int slot)
-{
-    int i;
-    char fileName[100];
-
-    for (i = 0; i < MAX_MAPS; i++)
-    {
-        M_snprintf(fileName, sizeof(fileName),
-                   "%shex%d%02d.hxs", SavePath, slot, i);
-        M_remove(fileName);
-    }
-    M_snprintf(fileName, sizeof(fileName), "%shex%d.hxs", SavePath, slot);
-    M_remove(fileName);
-}
-
-//==========================================================================
-//
-// CopySaveSlot
-//
-// Copies all the save game files from one slot to another.
-//
-//==========================================================================
-
-static void CopySaveSlot(int sourceSlot, int destSlot)
-{
-    int i;
-    char sourceName[100];
-    char destName[100];
-
-    for (i = 0; i < MAX_MAPS; i++)
-    {
-        M_snprintf(sourceName, sizeof(sourceName),
-                   "%shex%d%02d.hxs", SavePath, sourceSlot, i);
-        if (ExistingFile(sourceName))
-        {
-            M_snprintf(destName, sizeof(destName),
-                       "%shex%d%02d.hxs", SavePath, destSlot, i);
-            CopyFile(sourceName, destName);
-        }
-    }
-    M_snprintf(sourceName, sizeof(sourceName),
-               "%shex%d.hxs", SavePath, sourceSlot);
-    if (ExistingFile(sourceName))
-    {
-        M_snprintf(destName, sizeof(destName),
-                   "%shex%d.hxs", SavePath, destSlot);
-        CopyFile(sourceName, destName);
-    }
-    else
-    {
-        I_Error("Could not load savegame %s", sourceName);
-    }
-}
-
-//==========================================================================
-//
-// CopyFile
-//
-// This function was rewritten to copy files with minimal strain on zone
-// allocation and allow for big maps that technically work in vanilla to
-// save without error.
-//==========================================================================
-
-static void CopyFile(char *source_name, char *dest_name)
-{
-    const int BUFFER_CHUNK_SIZE = 0x10000;
-
-    byte *buffer;
-    int file_length, file_remaining;
-    FILE *read_handle, *write_handle;
-    int buf_count, read_count, write_count;
-
-    read_handle = M_fopen(source_name, "rb");
-    if (read_handle == NULL)
-    {
-        I_Error ("Couldn't read file %s", source_name);
-    }
-    file_length = file_remaining = M_FileLength(read_handle);
-
-    // Vanilla savegame emulation.
-    //
-    // CopyFile() typically calls M_ReadFile() which stores the entire file
-    // in memory: Chocolate Hexen should force an allocation error here
-    // whenever it's appropriate.
-
-    if (vanilla_savegame_limit)
-    {
-        buffer = Z_Malloc(file_length, PU_STATIC, NULL);
-        Z_Free(buffer);
-    }
-
-    write_handle = M_fopen(dest_name, "wb");
-    if (write_handle == NULL)
-    {
-        I_Error ("Couldn't read file %s", dest_name);
-    }
-
-    buffer = Z_Malloc (BUFFER_CHUNK_SIZE, PU_STATIC, NULL);
-
-    do
-    {
-        buf_count = BUFFER_CHUNK_SIZE;
-        if( file_remaining < BUFFER_CHUNK_SIZE)
-        {
-            buf_count = file_remaining;
-        }
-
-        read_count = fread(buffer, 1, buf_count, read_handle);
-        if (read_count < buf_count)
-        {
-            I_Error ("Couldn't read file %s", source_name);
-        }
-
-        write_count = fwrite(buffer, 1, buf_count, write_handle);
-        if (write_count < buf_count)
-        {
-            I_Error ("Couldn't write to file %s", dest_name);
-        }
-
-        file_remaining -= buf_count;
-    } while (file_remaining > 0);
-
-    Z_Free(buffer);
-    fclose(read_handle);
-    fclose(write_handle);
-}
-
-//==========================================================================
-//
-// ExistingFile
-//
-//==========================================================================
-
-static boolean ExistingFile(char *name)
-{
-    FILE *fp;
-
-    if ((fp = M_fopen(name, "rb")) != NULL)
-    {
-        fclose(fp);
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-//==========================================================================
-//
-// SV_Open
-//
-//==========================================================================
-
-static void SV_OpenRead(char *fileName)
-{
-    SavingFP = M_fopen(fileName, "rb");
-
-    // Should never happen, only if hex6.hxs cannot ever be created.
-    if (SavingFP == NULL)
-    {
-        I_Error("Could not load savegame %s", fileName);
-    }
-}
-
-static void SV_OpenWrite(char *fileName)
-{
-    SavingFP = M_fopen(fileName, "wb");
-}
-
-//==========================================================================
-//
-// SV_Close
-//
-//==========================================================================
-
-static void SV_Close(void)
-{
-    if (SavingFP)
-    {
-        fclose(SavingFP);
-        SavingFP = NULL;
-    }
-}
-
-//==========================================================================
-//
-// SV_Read
-//
-//==========================================================================
-
-static void SV_Read(void *buffer, int size)
-{
-    int retval = fread(buffer, 1, size, SavingFP);
-    if (retval != size)
-    {
-        I_Error("Incomplete read in SV_Read: Expected %d, got %d bytes",
-            size, retval);
-    }
-}
-
-static byte SV_ReadByte(void)
-{
-    byte result;
-    SV_Read(&result, sizeof(byte));
-    return result;
-}
-
-static uint16_t SV_ReadWord(void)
-{
-    uint16_t result;
-    SV_Read(&result, sizeof(unsigned short));
-    return SHORT(result);
-}
-
-static uint32_t SV_ReadLong(void)
-{
-    uint32_t result;
-    SV_Read(&result, sizeof(int));
-    return LONG(result);
-}
-
-static void *SV_ReadPtr(void)
-{
-    return (void *) (intptr_t) SV_ReadLong();
-}
-
-//==========================================================================
-//
-// SV_Write
-//
-//==========================================================================
-
-static void SV_Write(const void *buffer, int size)
-{
-    fwrite(buffer, size, 1, SavingFP);
-}
-
-static void SV_WriteByte(byte val)
-{
-    fwrite(&val, sizeof(byte), 1, SavingFP);
-}
-
-static void SV_WriteWord(unsigned short val)
-{
-    val = SHORT(val);
-    fwrite(&val, sizeof(unsigned short), 1, SavingFP);
-}
-
-static void SV_WriteLong(unsigned int val)
-{
-    val = LONG(val);
-    fwrite(&val, sizeof(int), 1, SavingFP);
-}
-
-static void SV_WritePtr(void *val)
-{
-    long ptr;
-
-    // Write a pointer value. In Vanilla Hexen pointers are 32-bit but
-    // nowadays they might be larger. Whatever value we write here isn't
-    // going to be much use when we reload the game.
-
-    ptr = (long)(intptr_t) val;
-    SV_WriteLong((unsigned int) (ptr & 0xffffffff));
-}
diff --git a/games/NXDoom/src/hexen/textdefs.h b/games/NXDoom/src/hexen/textdefs.h
deleted file mode 100644
index febeb178d..000000000
--- a/games/NXDoom/src/hexen/textdefs.h
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-// MN_menu.c ---------------------------------------------------------------
-
-#define PRESSKEY	"press a key."
-#define PRESSYN		"press y or n."
-#define TXT_PAUSED	"PAUSED"
-#define QUITMSG		"are you sure you want to\nquit this great game?"
-#define LOADNET		"you can't do load while in a net game!\n\n"PRESSKEY
-#define QLOADNET	"you can't quickload during a netgame!\n\n"PRESSKEY
-#define QSAVESPOT	"you haven't picked a quicksave slot yet!\n\n"PRESSKEY
-#define SAVEDEAD 	"you can't save if you aren't playing!\n\n"PRESSKEY
-#define QSPROMPT 	"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
-#define QLPROMPT	"do you want to quickload the game named"\
-					"\n\n'%s'?\n\n"PRESSYN
-#define NEWGAME		"you can't start a new game\n"\
-					"while in a network game.\n\n"PRESSKEY
-#define MSGOFF		"Messages OFF"
-#define MSGON		"Messages ON"
-#define NETEND		"you can't end a netgame!\n\n"PRESSKEY
-#define ENDGAME		"are you sure you want to end the game?\n\n"PRESSYN
-#define DOSY		"(press y to quit to dos.)"
-#define TXT_GAMMA_LEVEL_OFF	"GAMMA CORRECTION OFF"
-#define TXT_GAMMA_LEVEL_1	"GAMMA CORRECTION LEVEL 1"
-#define TXT_GAMMA_LEVEL_2	"GAMMA CORRECTION LEVEL 2"
-#define TXT_GAMMA_LEVEL_3	"GAMMA CORRECTION LEVEL 3"
-#define TXT_GAMMA_LEVEL_4	"GAMMA CORRECTION LEVEL 4"
-#define	EMPTYSTRING	"empty slot"
-
-// P_inter.c ---------------------------------------------------------------
-
-// Mana
-
-#define TXT_MANA_1				"BLUE MANA"
-#define TXT_MANA_2				"GREEN MANA"
-#define TXT_MANA_BOTH			"COMBINED MANA"
-
-// Keys
-
-#define	TXT_KEY_STEEL		"STEEL KEY"
-#define	TXT_KEY_CAVE		"CAVE KEY"
-#define	TXT_KEY_AXE			"AXE KEY"
-#define	TXT_KEY_FIRE		"FIRE KEY"
-#define	TXT_KEY_EMERALD		"EMERALD KEY"
-#define	TXT_KEY_DUNGEON		"DUNGEON KEY"
-#define	TXT_KEY_SILVER		"SILVER KEY"
-#define	TXT_KEY_RUSTED		"RUSTED KEY"
-#define	TXT_KEY_HORN		"HORN KEY"
-#define	TXT_KEY_SWAMP		"SWAMP KEY"
-#define TXT_KEY_CASTLE		"CASTLE KEY"
-
-// Artifacts
-
-#define TXT_ARTIINVULNERABILITY		"ICON OF THE DEFENDER"
-#define TXT_ARTIHEALTH				"QUARTZ FLASK"
-#define TXT_ARTISUPERHEALTH			"MYSTIC URN"
-#define TXT_ARTISUMMON				"DARK SERVANT"
-#define TXT_ARTITORCH				"TORCH"
-#define TXT_ARTIEGG					"PORKALATOR"
-#define TXT_ARTIFLY					"WINGS OF WRATH"
-#define TXT_ARTITELEPORT			"CHAOS DEVICE"
-#define TXT_ARTIPOISONBAG			"FLECHETTE"
-#define TXT_ARTITELEPORTOTHER		"BANISHMENT DEVICE"
-#define TXT_ARTISPEED				"BOOTS OF SPEED"
-#define TXT_ARTIBOOSTMANA			"KRATER OF MIGHT"
-#define TXT_ARTIBOOSTARMOR			"DRAGONSKIN BRACERS"
-#define TXT_ARTIBLASTRADIUS			"DISC OF REPULSION"
-#define TXT_ARTIHEALINGRADIUS		"MYSTIC AMBIT INCANT"
-
-// Puzzle artifacts
-
-#define TXT_ARTIPUZZSKULL			"YORICK'S SKULL"
-#define TXT_ARTIPUZZGEMBIG			"HEART OF D'SPARIL"
-#define TXT_ARTIPUZZGEMRED			"RUBY PLANET"
-#define TXT_ARTIPUZZGEMGREEN1		"EMERALD PLANET"
-#define TXT_ARTIPUZZGEMGREEN2		"EMERALD PLANET"
-#define TXT_ARTIPUZZGEMBLUE1		"SAPPHIRE PLANET"
-#define TXT_ARTIPUZZGEMBLUE2		"SAPPHIRE PLANET"
-#define TXT_ARTIPUZZBOOK1			"DAEMON CODEX"
-#define TXT_ARTIPUZZBOOK2			"LIBER OSCURA"
-#define TXT_ARTIPUZZSKULL2			"FLAME MASK"
-#define TXT_ARTIPUZZFWEAPON			"GLAIVE SEAL"
-#define TXT_ARTIPUZZCWEAPON			"HOLY RELIC"
-#define TXT_ARTIPUZZMWEAPON			"SIGIL OF THE MAGUS"
-#define TXT_ARTIPUZZGEAR			"CLOCK GEAR"
-#define TXT_USEPUZZLEFAILED			"YOU CANNOT USE THIS HERE"
-
-// Items
-
-#define TXT_ITEMHEALTH			"CRYSTAL VIAL"
-#define TXT_ITEMBAGOFHOLDING	"BAG OF HOLDING"
-#define TXT_ITEMSHIELD1			"SILVER SHIELD"
-#define TXT_ITEMSHIELD2			"ENCHANTED SHIELD"
-#define TXT_ITEMSUPERMAP		"MAP SCROLL"
-#define TXT_ARMOR1				"MESH ARMOR"
-#define TXT_ARMOR2				"FALCON SHIELD"
-#define TXT_ARMOR3				"PLATINUM HELMET"
-#define TXT_ARMOR4				"AMULET OF WARDING"
-
-// Weapons
-
-#define TXT_WEAPON_F2			"TIMON'S AXE"
-#define TXT_WEAPON_F3			"HAMMER OF RETRIBUTION"
-#define TXT_WEAPON_F4			"QUIETUS ASSEMBLED"
-#define TXT_WEAPON_C2			"SERPENT STAFF"
-#define TXT_WEAPON_C3			"FIRESTORM"
-#define TXT_WEAPON_C4			"WRAITHVERGE ASSEMBLED"
-#define TXT_WEAPON_M2			"FROST SHARDS"
-#define TXT_WEAPON_M3			"ARC OF DEATH"
-#define TXT_WEAPON_M4			"BLOODSCOURGE ASSEMBLED"
-#define TXT_QUIETUS_PIECE		"SEGMENT OF QUIETUS"
-#define TXT_WRAITHVERGE_PIECE	"SEGMENT OF WRAITHVERGE"
-#define TXT_BLOODSCOURGE_PIECE	"SEGMENT OF BLOODSCOURGE"
-
-// SB_bar.c ----------------------------------------------------------------
-
-#define TXT_CHEATGODON			"GOD MODE ON"
-#define TXT_CHEATGODOFF			"GOD MODE OFF"
-#define TXT_CHEATNOCLIPON		"NO CLIPPING ON"
-#define TXT_CHEATNOCLIPOFF		"NO CLIPPING OFF"
-#define TXT_CHEATWEAPONS		"ALL WEAPONS"
-#define TXT_CHEATHEALTH			"FULL HEALTH"
-#define TXT_CHEATKEYS			"ALL KEYS"
-#define TXT_CHEATSOUNDON		"SOUND DEBUG ON"
-#define TXT_CHEATSOUNDOFF		"SOUND DEBUG OFF"
-#define TXT_CHEATTICKERON		"TICKER ON"
-#define TXT_CHEATTICKEROFF		"TICKER OFF"
-#define TXT_CHEATARTIFACTS3		"ALL ARTIFACTS"
-#define TXT_CHEATARTIFACTSFAIL	"BAD INPUT"
-#define TXT_CHEATWARP			"LEVEL WARP"
-#define TXT_CHEATSCREENSHOT		"SCREENSHOT"
-#define TXT_CHEATIDDQD			"TRYING TO CHEAT, EH?  NOW YOU DIE!"
-#define TXT_CHEATIDKFA			"CHEATER - YOU DON'T DESERVE WEAPONS"
-#define TXT_CHEATBADINPUT		"BAD INPUT"
-#define TXT_CHEATNOMAP			"CAN'T FIND MAP"
-
-// G_game.c ----------------------------------------------------------------
-
-#define TXT_GAMESAVED			"GAME SAVED"
-
-// M_misc.c ----------------------------------------------------------------
-
-#define HUSTR_CHATMACRO1 "I'm ready to kick butt!"
-#define HUSTR_CHATMACRO2 "I'm OK."
-#define HUSTR_CHATMACRO3 "I'm not looking too good!"
-#define HUSTR_CHATMACRO4 "Help!"
-#define HUSTR_CHATMACRO5 "You suck!"
-#define HUSTR_CHATMACRO6 "Next time, scumbag..."
-#define HUSTR_CHATMACRO7 "Come here!"
-#define HUSTR_CHATMACRO8 "I'll take care of it."
-#define HUSTR_CHATMACRO9 "Yes"
-#define HUSTR_CHATMACRO0 "No"
-
-// AM_map.c ----------------------------------------------------------------
-
-#define AMSTR_FOLLOWON		"FOLLOW MODE ON"
-#define AMSTR_FOLLOWOFF		"FOLLOW MODE OFF"
diff --git a/games/NXDoom/src/hexen/xddefs.h b/games/NXDoom/src/hexen/xddefs.h
deleted file mode 100644
index 544f4ce28..000000000
--- a/games/NXDoom/src/hexen/xddefs.h
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-
-#ifndef __XDDEFS__
-#define __XDDEFS__
-
-#include "doomtype.h"
-#include "v_patch.h"
-
-//--------------------------------------------------------------------------
-//
-// Map level types
-//
-//--------------------------------------------------------------------------
-
-// lump order in a map wad
-enum
-{
-    ML_LABEL,
-    ML_THINGS,
-    ML_LINEDEFS,
-    ML_SIDEDEFS,
-    ML_VERTEXES,
-    ML_SEGS,
-    ML_SSECTORS,
-    ML_NODES,
-    ML_SECTORS,
-    ML_REJECT,
-    ML_BLOCKMAP,
-    ML_BEHAVIOR
-};
-
-typedef PACKED_STRUCT (
-{
-    short x;
-    short y;
-})  mapvertex_t;
-
-typedef PACKED_STRUCT (
-{
-    short textureoffset;
-    short rowoffset;
-    char toptexture[8];
-    char bottomtexture[8];
-    char midtexture[8];
-    short sector;               // on viewer's side
-}) mapsidedef_t;
-
-typedef PACKED_STRUCT (
-{
-    short v1;
-    short v2;
-    short flags;
-    byte special;
-    byte arg1;
-    byte arg2;
-    byte arg3;
-    byte arg4;
-    byte arg5;
-    short sidenum[2];           // sidenum[1] will be -1 if one sided
-}) maplinedef_t;
-
-#define	ML_BLOCKING			0x0001
-#define	ML_BLOCKMONSTERS	0x0002
-#define	ML_TWOSIDED			0x0004
-#define	ML_DONTPEGTOP		0x0008
-#define	ML_DONTPEGBOTTOM	0x0010
-#define ML_SECRET			0x0020  // don't map as two sided: IT'S A SECRET!
-#define ML_SOUNDBLOCK		0x0040  // don't let sound cross two of these
-#define	ML_DONTDRAW			0x0080  // don't draw on the automap
-#define	ML_MAPPED			0x0100  // set if already drawn in automap
-#define ML_REPEAT_SPECIAL	0x0200  // special is repeatable
-#define ML_SPAC_SHIFT		10
-#define ML_SPAC_MASK		0x1c00
-#define GET_SPAC(flags) ((flags&ML_SPAC_MASK)>>ML_SPAC_SHIFT)
-
-// Special activation types
-#define SPAC_CROSS		0       // when player crosses line
-#define SPAC_USE		1       // when player uses line
-#define SPAC_MCROSS		2       // when monster crosses line
-#define SPAC_IMPACT		3       // when projectile hits line
-#define SPAC_PUSH		4       // when player/monster pushes line
-#define SPAC_PCROSS		5       // when projectile crosses line
-
-typedef PACKED_STRUCT (
-{
-    short floorheight;
-    short ceilingheight;
-    char floorpic[8];
-    char ceilingpic[8];
-    short lightlevel;
-    short special;
-    short tag;
-}) mapsector_t;
-
-typedef PACKED_STRUCT (
-{
-    short numsegs;
-    short firstseg;             // segs are stored sequentially
-}) mapsubsector_t;
-
-typedef PACKED_STRUCT (
-{
-    short v1;
-    short v2;
-    short angle;
-    short linedef;
-    short side;
-    short offset;
-}) mapseg_t;
-
-#define	NF_SUBSECTOR	0x8000
-typedef PACKED_STRUCT (
-{
-    short x, y, dx, dy;         // partition line
-    short bbox[2][4];           // bounding box for each child
-    unsigned short children[2]; // if NF_SUBSECTOR its a subsector
-}) mapnode_t;
-
-typedef PACKED_STRUCT (
-{
-    short tid;
-    short x;
-    short y;
-    short height;
-    short angle;
-    short type;
-    short options;
-    byte special;
-    byte arg1;
-    byte arg2;
-    byte arg3;
-    byte arg4;
-    byte arg5;
-}) mapthing_t;
-
-#define MTF_EASY		1
-#define MTF_NORMAL		2
-#define MTF_HARD		4
-#define MTF_AMBUSH		8
-#define MTF_DORMANT		16
-#define MTF_FIGHTER		32
-#define MTF_CLERIC		64
-#define MTF_MAGE		128
-#define MTF_GSINGLE		256
-#define MTF_GCOOP		512
-#define MTF_GDEATHMATCH	1024
-
-//--------------------------------------------------------------------------
-//
-// Texture definition
-//
-//--------------------------------------------------------------------------
-
-typedef PACKED_STRUCT (
-{
-    short originx;
-    short originy;
-    short patch;
-    short stepdir;
-    short colormap;
-}) mappatch_t;
-
-typedef PACKED_STRUCT (
-{
-    char name[8];
-    boolean masked;
-    short width;
-    short height;
-    int obsolete;
-    short patchcount;
-    mappatch_t patches[1];
-}) maptexture_t;
-
-#endif // __XDDEFS__
diff --git a/games/NXDoom/src/i_cdmus.c b/games/NXDoom/src/i_cdmus.c
deleted file mode 100644
index caad87af8..000000000
--- a/games/NXDoom/src/i_cdmus.c
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-//
-// 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.
-//
-//
-// Hexen CD interface.
-//
-
-#include <stdio.h>
-
-#include "SDL.h"
-
-#include "doomtype.h"
-
-#include "i_cdmus.h"
-
-int cd_Error;
-
-int I_CDMusInit(void)
-{
-    fprintf(stderr,
-        "I_CDMusInit: CD music playback is no longer supported! "
-        "Please use digital music packs instead:\n"
-        "https://www.chocolate-doom.org/wiki/index.php/Digital_music_packs\n");
-    return -1;
-}
-
-// We cannot print status messages inline during startup, they must
-// be deferred until after I_CDMusInit has returned.
-
-void I_CDMusPrintStartup(void)
-{
-}
-
-int I_CDMusPlay(int track)
-{
-    return 0;
-}
-
-int I_CDMusStop(void)
-{
-    return 0;
-}
-
-int I_CDMusResume(void)
-{
-    return 0;
-}
-
-int I_CDMusSetVolume(int volume)
-{
-    return 0;
-}
-
-int I_CDMusFirstTrack(void)
-{
-    return 0;
-}
-
-int I_CDMusLastTrack(void)
-{
-    return 0;
-}
-
-int I_CDMusTrackLength(int track_num)
-{
-    return 0;
-}
-
diff --git a/games/NXDoom/src/i_cdmus.h b/games/NXDoom/src/i_cdmus.h
deleted file mode 100644
index 31db2a659..000000000
--- a/games/NXDoom/src/i_cdmus.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-//
-// 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.
-//
-
-// i_cdmus.h
-
-#ifndef __ICDMUS__
-#define __ICDMUS__
-
-#define CDERR_NOTINSTALLED   10 // MSCDEX not installed
-#define CDERR_NOAUDIOSUPPORT 11 // CD-ROM Doesn't support audio
-#define CDERR_NOAUDIOTRACKS  12 // Current CD has no audio tracks
-#define CDERR_BADDRIVE       20 // Bad drive number
-#define CDERR_BADTRACK       21 // Bad track number
-#define CDERR_IOCTLBUFFMEM   22 // Not enough low memory for IOCTL
-#define CDERR_DEVREQBASE     100        // DevReq errors
-
-extern int cd_Error;
-
-int I_CDMusInit(void);
-void I_CDMusPrintStartup(void);
-int I_CDMusPlay(int track);
-int I_CDMusStop(void);
-int I_CDMusResume(void);
-int I_CDMusSetVolume(int volume);
-int I_CDMusFirstTrack(void);
-int I_CDMusLastTrack(void);
-int I_CDMusTrackLength(int track);
-
-#endif
diff --git a/games/NXDoom/src/i_endoom.c b/games/NXDoom/src/i_endoom.c
index 9beacc901..97a797ee8 100644
--- a/games/NXDoom/src/i_endoom.c
+++ b/games/NXDoom/src/i_endoom.c
@@ -1,19 +1,28 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    Exit text-mode ENDOOM screen.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_endoom.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *    Exit text-mode ENDOOM screen.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <string.h>
@@ -24,56 +33,67 @@
 
 #include "txt_main.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define ENDOOM_W 80
 #define ENDOOM_H 25
 
-// 
-// Displays the text mode ending screen after the game quits
-//
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-void I_Endoom(byte *endoom_data)
+/****************************************************************************
+ * Name: i_endoom
+ *
+ * Description:
+ *  Displays the text mode ending screen after the game quits
+ *
+ ****************************************************************************/
+
+void i_endoom(byte *endoom_data)
 {
-    unsigned char *screendata;
-    int y;
-    int indent;
+  unsigned char *screendata;
+  int y;
+  int indent;
 
-    // Set up text mode screen
+  /* Set up text mode screen */
 
-    TXT_Init();
+  txt_init();
 
-    TXT_SetWindowTitle(PACKAGE_STRING);
-    // SDL2-TODO I_InitWindowTitle();
-    // SDL2-TODO I_InitWindowIcon();
+  txt_set_window_title(PACKAGE_STRING);
 
-    // Write the data to the screen memory
+  /* SDL2-TODO i_init_window_title();
+   */
 
-    screendata = TXT_GetScreenData();
+  /* Write the data to the screen memory */
 
-    indent = (ENDOOM_W - TXT_SCREEN_W) / 2;
+  screendata = txt_get_screen_data();
 
-    for (y=0; y<TXT_SCREEN_H; ++y)
+  indent = (ENDOOM_W - TXT_SCREEN_W) / 2;
+
+  for (y = 0; y < TXT_SCREEN_H; ++y)
     {
-        memcpy(screendata + (y * TXT_SCREEN_W * 2),
-               endoom_data + (y * ENDOOM_W + indent) * 2,
-               TXT_SCREEN_W * 2);
+      memcpy(screendata + (y * TXT_SCREEN_W * 2),
+             endoom_data + (y * ENDOOM_W + indent) * 2, TXT_SCREEN_W * 2);
     }
 
-    // Wait for a keypress
+  /* Wait for a keypress */
 
-    while (true)
+  while (true)
     {
-        TXT_UpdateScreen();
+      txt_update_screen();
 
-        if (TXT_GetChar() > 0)
+      if (txt_getchar() > 0)
         {
-            break;
+          break;
         }
 
-        TXT_Sleep(0);
+      txt_sleep(0);
     }
 
-    // Shut down text mode screen
+  /* Shut down text mode screen */
 
-    TXT_Shutdown();
+  txt_shutdown();
 }
-
diff --git a/games/NXDoom/src/i_endoom.h b/games/NXDoom/src/i_endoom.h
index 8c8ff457f..22a773dc4 100644
--- a/games/NXDoom/src/i_endoom.h
+++ b/games/NXDoom/src/i_endoom.h
@@ -1,29 +1,40 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    Exit text-mode ENDOOM screen.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_endoom.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Exit text-mode ENDOOM screen.
+ *
+ ****************************************************************************/
 
 #ifndef __I_ENDOOM__
 #define __I_ENDOOM__
 
-// Display the Endoom screen on shutdown.  Pass a pointer to the
-// ENDOOM lump.
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void I_Endoom(byte *data);
+#ifdef CONFIG_GAMES_NXDOOM_ENDOOM
 
+/* Display the Endoom screen on shutdown.  Pass a pointer to the
+ * ENDOOM lump.
+ */
+
+void i_endoom(byte *data);
 #endif
 
+#endif /* __I_ENDOOM__ */
diff --git a/games/NXDoom/src/i_flmusic.c b/games/NXDoom/src/i_flmusic.c
deleted file mode 100644
index a0978a0f1..000000000
--- a/games/NXDoom/src/i_flmusic.c
+++ /dev/null
@@ -1,332 +0,0 @@
-//
-// Copyright(C) 2022 Roman Fomin
-// Copyright(C) 2023 Michael Day
-//
-// 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.
-//
-// DESCRIPTION:
-//      FluidSynth backend
-
-#include "config.h"
-
-#ifdef HAVE_FLUIDSYNTH
-
-#include "fluidsynth.h"
-
-#if (FLUIDSYNTH_VERSION_MAJOR < 2 ||                                           \
-     (FLUIDSYNTH_VERSION_MAJOR == 2 && FLUIDSYNTH_VERSION_MINOR < 2))
-
-typedef int fluid_int_t;
-typedef long fluid_long_long_t;
-
-#else
-
-typedef fluid_long_long_t fluid_int_t;
-
-#endif
-
-#include "SDL_mixer.h"
-
-#include "doomtype.h"
-#include "i_system.h"
-#include "i_sound.h"
-#include "m_misc.h"
-#include "memio.h"
-#include "mus2mid.h"
-
-#include <string.h>
-
-char *fsynth_sf_path = "";
-int fsynth_chorus_active = 1;
-float fsynth_chorus_depth = 5.0f;
-float fsynth_chorus_level = 0.35f;
-int fsynth_chorus_nr = 3;
-float fsynth_chorus_speed = 0.3f;
-char *fsynth_midibankselect = "gs";
-int fsynth_polyphony = 256;
-int fsynth_reverb_active = 1;
-float fsynth_reverb_damp = 0.4f;
-float fsynth_reverb_level = 0.15f;
-float fsynth_reverb_roomsize = 0.6f;
-float fsynth_reverb_width = 4.0f;
-float fsynth_gain = 1.0f;
-
-static fluid_synth_t *synth = NULL;
-static fluid_settings_t *settings = NULL;
-static fluid_player_t *player = NULL;
-
-static void FL_Mix_Callback(void *udata, Uint8 *stream, int len)
-{
-    int result;
-
-    result = fluid_synth_write_s16(synth, len / 4, stream, 0, 2, stream, 1, 2);
-
-    if (result != FLUID_OK)
-    {
-        fprintf(stderr,
-                "FL_Mix_Callback: Error generating FluidSynth audio.\n");
-    }
-}
-
-static boolean I_FL_InitMusic(void)
-{
-    int sf_id;
-
-    if (strlen(fsynth_sf_path) == 0)
-    {
-        fprintf(stderr,
-                "I_FL_InitMusic: No FluidSynth soundfont file specified.\n");
-        return false;
-    }
-
-    settings = new_fluid_settings();
-
-    fluid_settings_setnum(settings, "synth.sample-rate", snd_samplerate);
-    fluid_settings_setstr(settings, "synth.midi-bank-select",
-                          fsynth_midibankselect);
-    fluid_settings_setint(settings, "synth.polyphony", fsynth_polyphony);
-
-    fluid_settings_setint(settings, "synth.chorus.active",
-                          fsynth_chorus_active);
-    fluid_settings_setint(settings, "synth.reverb.active",
-                          fsynth_reverb_active);
-
-    if (fsynth_reverb_active)
-    {
-        fluid_settings_setnum(settings, "synth.reverb.room-size",
-                              fsynth_reverb_roomsize);
-        fluid_settings_setnum(settings, "synth.reverb.damp",
-                              fsynth_reverb_damp);
-        fluid_settings_setnum(settings, "synth.reverb.width",
-                              fsynth_reverb_width);
-        fluid_settings_setnum(settings, "synth.reverb.level",
-                              fsynth_reverb_level);
-    }
-
-    if (fsynth_chorus_active)
-    {
-        fluid_settings_setnum(settings, "synth.chorus.level",
-                              fsynth_chorus_level);
-        fluid_settings_setnum(settings, "synth.chorus.depth",
-                              fsynth_chorus_depth);
-        fluid_settings_setint(settings, "synth.chorus.nr", fsynth_chorus_nr);
-        fluid_settings_setnum(settings, "synth.chorus.speed",
-                              fsynth_chorus_speed);
-    }
-
-    if (fsynth_gain < 0.0f)
-    {
-        fsynth_gain = 0.0f;
-    }
-    if (fsynth_gain > 10.0f)
-    {
-        fsynth_gain = 10.0f;
-    }
-
-    synth = new_fluid_synth(settings);
-
-    if (synth == NULL)
-    {
-        fprintf(stderr,
-                "I_FL_InitMusic: FluidSynth failed to initialize synth.\n");
-        return false;
-    }
-
-    sf_id = fluid_synth_sfload(synth, fsynth_sf_path, true);
-    if (sf_id == FLUID_FAILED)
-    {
-        delete_fluid_synth(synth);
-        synth = NULL;
-        delete_fluid_settings(settings);
-        settings = NULL;
-        fprintf(stderr,
-                "I_FL_InitMusic: Error loading FluidSynth soundfont: '%s'.\n",
-                fsynth_sf_path);
-        return false;
-    }
-
-    printf("I_FL_InitMusic: Using '%s'.\n", fsynth_sf_path);
-
-    return true;
-}
-
-static void I_FL_SetMusicVolume(int volume)
-{
-    if (synth == NULL)
-    {
-        return;
-    }
-    // FluidSynth's default is 0.2. Make 1.0 the maximum.
-    // 0 -- 0.2 -- 10.0
-    fluid_synth_set_gain(synth, ((float) volume / 127) * fsynth_gain);
-}
-
-static void I_FL_PauseSong(void)
-{
-    if (player)
-    {
-        Mix_HookMusic(NULL, NULL);
-    }
-}
-
-static void I_FL_ResumeSong(void)
-{
-    if (player)
-    {
-        Mix_HookMusic(FL_Mix_Callback, NULL);
-    }
-}
-
-static void I_FL_PlaySong(void *handle, boolean looping)
-{
-    if (player)
-    {
-        fluid_player_set_loop(player, looping ? -1 : 1);
-        fluid_player_play(player);
-    }
-}
-
-static void I_FL_StopSong(void)
-{
-    if (player)
-    {
-        fluid_player_stop(player);
-    }
-}
-
-// Determine whether memory block is a .mid file
-
-static boolean IsMid(const byte *mem, int len)
-{
-    return len > 4 && !memcmp(mem, "MThd", 4);
-}
-
-static void *I_FL_RegisterSong(void *data, int len)
-{
-    int result = FLUID_FAILED;
-
-    player = new_fluid_player(synth);
-
-    if (player == NULL)
-    {
-        fprintf(stderr,
-                "I_FL_RegisterSong: FluidSynth failed to initialize player.\n");
-        return NULL;
-    }
-
-    if (IsMid(data, len))
-    {
-        result = fluid_player_add_mem(player, data, len);
-
-        if (result == FLUID_FAILED)
-        {
-            fprintf(stderr,
-                    "I_FL_RegisterSong: FluidSynth failed to load MIDI.\n");
-            return NULL;
-        }
-    }
-    else
-    {
-        // Assume a MUS file and try to convert
-        MEMFILE *instream;
-        MEMFILE *outstream;
-        void *outbuf;
-        size_t outbuf_len;
-
-        instream = mem_fopen_read(data, len);
-        outstream = mem_fopen_write();
-
-        if (mus2mid(instream, outstream) == 0)
-        {
-            mem_get_buf(outstream, &outbuf, &outbuf_len);
-            result = fluid_player_add_mem(player, outbuf, outbuf_len);
-        }
-
-        mem_fclose(instream);
-        mem_fclose(outstream);
-
-        if (result == FLUID_FAILED)
-        {
-            fprintf(stderr,
-                    "I_FL_RegisterSong: FluidSynth failed to load MUS.\n");
-            return NULL;
-        }
-    }
-
-    Mix_HookMusic(FL_Mix_Callback, NULL);
-    return player;
-}
-
-static void I_FL_UnRegisterSong(void *handle)
-{
-    if (player)
-    {
-        fluid_synth_program_reset(synth);
-        fluid_synth_system_reset(synth);
-
-        Mix_HookMusic(NULL, NULL);
-
-        delete_fluid_player(player);
-        player = NULL;
-    }
-}
-
-static void I_FL_ShutdownMusic(void)
-{
-    I_FL_StopSong();
-    I_FL_UnRegisterSong(NULL);
-
-    if (synth)
-    {
-        delete_fluid_synth(synth);
-        synth = NULL;
-    }
-
-    if (settings)
-    {
-        delete_fluid_settings(settings);
-        settings = NULL;
-    }
-}
-
-static boolean I_FL_MusicIsPlaying(void)
-{
-    if (player == NULL)
-    {
-        return false;
-    }
-
-    return (fluid_player_get_status(player) == FLUID_PLAYER_PLAYING);
-}
-
-static const snddevice_t music_fl_devices[] =
-{
-    SNDDEVICE_FSYNTH,
-};
-
-const music_module_t music_fl_module =
-{
-    music_fl_devices,
-    arrlen(music_fl_devices),
-    I_FL_InitMusic,
-    I_FL_ShutdownMusic,
-    I_FL_SetMusicVolume,
-    I_FL_PauseSong,
-    I_FL_ResumeSong,
-    I_FL_RegisterSong,
-    I_FL_UnRegisterSong,
-    I_FL_PlaySong,
-    I_FL_StopSong,
-    I_FL_MusicIsPlaying,
-    NULL // Poll
-};
-
-#endif
diff --git a/games/NXDoom/src/i_glob.c b/games/NXDoom/src/i_glob.c
index 79c3e8983..6f2df49e0 100644
--- a/games/NXDoom/src/i_glob.c
+++ b/games/NXDoom/src/i_glob.c
@@ -1,373 +1,431 @@
-//
-// Copyright(C) 2018 Simon Howard
-//
-// 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.
-//
-//
-// File globbing API. This allows the contents of the filesystem
-// to be interrogated.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_glob.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2018 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * File globbing API. This allows the contents of the filesystem
+ * to be interrogated.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
+#include "config.h"
 #include "i_glob.h"
 #include "m_misc.h"
-#include "config.h"
 
-#if defined(_WIN32)
-#include <win_opendir.h>
-#ifndef S_ISDIR
-#define S_ISDIR(m)      (((m)& S_IFMT) == S_IFDIR)
-#endif
-#elif defined(HAVE_DIRENT_H)
+#if defined(HAVE_DIRENT_H)
 #include <dirent.h>
 #include <sys/stat.h>
 #elif defined(__WATCOMC__)
-// Watcom has the same API in a different header.
+/* Watcom has the same API in a different header. */
 #include <direct.h>
 #else
 #define NO_DIRENT_IMPLEMENTATION
 #endif
 
-#ifndef NO_DIRENT_IMPLEMENTATION
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Only the fields d_name and (as an XSI extension) d_ino are specified
-// in POSIX.1.  Other than Linux, the d_type field is available mainly
-// only on BSD systems.  The remaining fields are available on many, but
-// not all systems.
-static boolean IsDirectory(char *dir, struct dirent *de)
-{
-#if defined(_DIRENT_HAVE_D_TYPE)
-    if (de->d_type != DT_UNKNOWN && de->d_type != DT_LNK)
-    {
-        return de->d_type == DT_DIR;
-    }
-    else
-#endif
-    {
-        char *filename;
-        struct stat sb;
-        int result;
-
-        filename = M_StringJoin(dir, DIR_SEPARATOR_S, de->d_name, NULL);
-        result = M_stat(filename, &sb);
-        free(filename);
-
-        if (result != 0)
-        {
-            return false;
-        }
-
-        return S_ISDIR(sb.st_mode);
-    }
-}
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 struct glob_s
 {
-    char **globs;
-    int num_globs;
-    int flags;
-    DIR *dir;
-    char *directory;
-    char *last_filename;
-    // These fields are only used when the GLOB_FLAG_SORTED flag is set:
-    char **filenames;
-    int filenames_len;
-    int next_index;
+  char **globs;
+  int num_globs;
+  int flags;
+  DIR *dir;
+  char *directory;
+  char *last_filename;
+
+  /* These fields are only used when the GLOB_FLAG_SORTED flag is set:
+   */
+
+  char **filenames;
+  int filenames_len;
+  int next_index;
 };
 
-static void FreeStringList(char **globs, int num_globs)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifndef NO_DIRENT_IMPLEMENTATION
+
+/* Only the fields d_name and (as an XSI extension) d_ino are specified
+ * in POSIX.1.  Other than Linux, the d_type field is available mainly
+ * only on BSD systems.  The remaining fields are available on many, but
+ * not all systems.
+ */
+
+static boolean is_directory(char *dir, struct dirent *de)
 {
-    int i;
-    for (i = 0; i < num_globs; ++i)
+#if defined(_DIRENT_HAVE_D_TYPE)
+  if (de->d_type != DT_UNKNOWN && de->d_type != DT_LNK)
     {
-        free(globs[i]);
+      return de->d_type == DT_DIR;
     }
-    free(globs);
-}
-
-glob_t *I_StartMultiGlob(const char *directory, int flags,
-                         const char *glob, ...)
-{
-    char **globs;
-    int num_globs;
-    glob_t *result;
-    va_list args;
-
-    globs = malloc(sizeof(char *));
-    if (globs == NULL)
+  else
+#endif
     {
-        return NULL;
-    }
-    globs[0] = M_StringDuplicate(glob);
-    num_globs = 1;
+      char *filename;
+      struct stat sb;
+      int result;
 
-    va_start(args, glob);
-    for (;;)
-    {
-        const char *arg = va_arg(args, const char *);
-        char **new_globs;
+      filename = m_string_join(dir, DIR_SEPARATOR_S, de->d_name, NULL);
+      result = m_stat(filename, &sb);
+      free(filename);
 
-        if (arg == NULL)
+      if (result != 0)
         {
-            break;
+          return false;
         }
 
-        new_globs = realloc(globs, sizeof(char *) * (num_globs + 1));
-        if (new_globs == NULL)
+      return S_ISDIR(sb.st_mode);
+    }
+}
+
+static void free_string_list(char **globs, int num_globs)
+{
+  int i;
+  for (i = 0; i < num_globs; ++i)
+    {
+      free(globs[i]);
+    }
+
+  free(globs);
+}
+
+static boolean matches_glob(const char *name, const char *glob, int flags)
+{
+  int n;
+  int g;
+
+  while (*glob != '\0')
+    {
+      n = *name;
+      g = *glob;
+
+      if ((flags & GLOB_FLAG_NOCASE) != 0)
         {
-            FreeStringList(globs, num_globs);
-        }
-        globs = new_globs;
-        globs[num_globs] = M_StringDuplicate(arg);
-        ++num_globs;
-    }
-    va_end(args);
-
-    result = malloc(sizeof(glob_t));
-    if (result == NULL)
-    {
-        FreeStringList(globs, num_globs);
-        return NULL;
-    }
-
-    result->dir = opendir(directory);
-    if (result->dir == NULL)
-    {
-        FreeStringList(globs, num_globs);
-        free(result);
-        return NULL;
-    }
-
-    result->directory = M_StringDuplicate(directory);
-    result->globs = globs;
-    result->num_globs = num_globs;
-    result->flags = flags;
-    result->last_filename = NULL;
-    result->filenames = NULL;
-    result->filenames_len = 0;
-    result->next_index = -1;
-    return result;
-}
-
-glob_t *I_StartGlob(const char *directory, const char *glob, int flags)
-{
-    return I_StartMultiGlob(directory, flags, glob, NULL);
-}
-
-void I_EndGlob(glob_t *glob)
-{
-    if (glob == NULL)
-    {
-        return;
-    }
-
-    FreeStringList(glob->globs, glob->num_globs);
-    FreeStringList(glob->filenames, glob->filenames_len);
-
-    free(glob->directory);
-    free(glob->last_filename);
-    (void) closedir(glob->dir);
-    free(glob);
-}
-
-static boolean MatchesGlob(const char *name, const char *glob, int flags)
-{
-    int n, g;
-
-    while (*glob != '\0')
-    {
-        n = *name;
-        g = *glob;
-
-        if ((flags & GLOB_FLAG_NOCASE) != 0)
-        {
-            n = tolower(n);
-            g = tolower(g);
+          n = tolower(n);
+          g = tolower(g);
         }
 
-        if (g == '*')
+      if (g == '*')
         {
-            // To handle *-matching we skip past the * and recurse
-            // to check each subsequent character in turn. If none
-            // match then the whole match is a failure.
-            while (*name != '\0')
+          /* To handle *-matching we skip past the * and recurse
+           * to check each subsequent character in turn. If none
+           * match then the whole match is a failure.
+           */
+
+          while (*name != '\0')
             {
-                if (MatchesGlob(name, glob + 1, flags))
+              if (matches_glob(name, glob + 1, flags))
                 {
-                    return true;
+                  return true;
                 }
-                ++name;
+
+              ++name;
             }
-            return glob[1] == '\0';
+
+          return glob[1] == '\0';
         }
-        else if (g != '?' && n != g)
+      else if (g != '?' && n != g)
         {
-            // For normal characters the name must match the glob,
-            // but for ? we don't care what the character is.
-            return false;
+          /* For normal characters the name must match the glob,
+           * but for ? we don't care what the character is.
+           */
+
+          return false;
         }
 
-        ++name;
-        ++glob;
+      ++name;
+      ++glob;
     }
 
-    // Match successful when glob and name end at the same time.
-    return *name == '\0';
+  /* Match successful when glob and name end at the same time. */
+
+  return *name == '\0';
 }
 
-static boolean MatchesAnyGlob(const char *name, glob_t *glob)
+static boolean matches_any_glob(const char *name, glob_t *glob)
 {
-    int i;
+  int i;
 
-    for (i = 0; i < glob->num_globs; ++i)
+  for (i = 0; i < glob->num_globs; ++i)
     {
-        if (MatchesGlob(name, glob->globs[i], glob->flags))
+      if (matches_glob(name, glob->globs[i], glob->flags))
         {
-            return true;
+          return true;
         }
     }
-    return false;
+
+  return false;
 }
 
-static char *NextGlob(glob_t *glob)
+static char *next_glob(glob_t *glob)
 {
-    struct dirent *de;
+  struct dirent *de;
 
-    do
+  do
     {
-        de = readdir(glob->dir);
-        if (de == NULL)
+      de = readdir(glob->dir);
+      if (de == NULL)
         {
-            return NULL;
+          return NULL;
         }
-    } while (IsDirectory(glob->directory, de)
-          || !MatchesAnyGlob(de->d_name, glob));
+    }
+  while (is_directory(glob->directory, de) ||
+         !matches_any_glob(de->d_name, glob));
 
-    // Return the fully-qualified path, not just the bare filename.
-    return M_StringJoin(glob->directory, DIR_SEPARATOR_S, de->d_name, NULL);
+  /* Return the fully-qualified path, not just the bare filename. */
+
+  return m_string_join(glob->directory, DIR_SEPARATOR_S, de->d_name, NULL);
 }
 
-static void ReadAllFilenames(glob_t *glob)
+static void read_all_filenames(glob_t *glob)
 {
-    char *name;
+  char *name;
 
-    glob->filenames = NULL;
-    glob->filenames_len = 0;
-    glob->next_index = 0;
+  glob->filenames = NULL;
+  glob->filenames_len = 0;
+  glob->next_index = 0;
 
-    for (;;)
+  for (; ; )
     {
-        name = NextGlob(glob);
-        if (name == NULL)
+      name = next_glob(glob);
+      if (name == NULL)
         {
-            break;
+          break;
         }
-        glob->filenames = realloc(glob->filenames,
-                                  (glob->filenames_len + 1) * sizeof(char *));
-        glob->filenames[glob->filenames_len] = name;
-        ++glob->filenames_len;
+
+      glob->filenames = realloc(glob->filenames,
+                                (glob->filenames_len + 1) * sizeof(char *));
+      glob->filenames[glob->filenames_len] = name;
+      ++glob->filenames_len;
     }
 }
 
-static void SortFilenames(char **filenames, int len, int flags)
+static void sort_filenames(char **filenames, int len, int flags)
 {
-    char *pivot, *tmp;
-    int i, left_len, cmp;
+  char *pivot;
+  char *tmp;
+  int i;
+  int left_len;
+  int cmp;
 
-    if (len <= 1)
+  if (len <= 1)
     {
-        return;
+      return;
     }
-    pivot = filenames[len - 1];
-    left_len = 0;
-    for (i = 0; i < len-1; ++i)
+
+  pivot = filenames[len - 1];
+  left_len = 0;
+  for (i = 0; i < len - 1; ++i)
     {
-        if ((flags & GLOB_FLAG_NOCASE) != 0)
+      if ((flags & GLOB_FLAG_NOCASE) != 0)
         {
-            cmp = strcasecmp(filenames[i], pivot);
+          cmp = strcasecmp(filenames[i], pivot);
         }
-        else
+      else
         {
-            cmp = strcmp(filenames[i], pivot);
+          cmp = strcmp(filenames[i], pivot);
         }
 
-        if (cmp < 0)
+      if (cmp < 0)
         {
-            tmp = filenames[i];
-            filenames[i] = filenames[left_len];
-            filenames[left_len] = tmp;
-            ++left_len;
+          tmp = filenames[i];
+          filenames[i] = filenames[left_len];
+          filenames[left_len] = tmp;
+          ++left_len;
         }
     }
-    filenames[len - 1] = filenames[left_len];
-    filenames[left_len] = pivot;
 
-    SortFilenames(filenames, left_len, flags);
-    SortFilenames(&filenames[left_len + 1], len - left_len - 1, flags);
+  filenames[len - 1] = filenames[left_len];
+  filenames[left_len] = pivot;
+
+  sort_filenames(filenames, left_len, flags);
+  sort_filenames(&filenames[left_len + 1], len - left_len - 1, flags);
 }
 
-const char *I_NextGlob(glob_t *glob)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+glob_t *i_start_multi_glob(const char *directory, int flags,
+        const char *glob, ...)
 {
-    const char *result;
+  char **globs;
+  int num_globs;
+  glob_t *result;
+  va_list args;
 
-    if (glob == NULL)
+  globs = malloc(sizeof(char *));
+  if (globs == NULL)
     {
-        return NULL;
+      return NULL;
     }
 
-    // In unsorted mode we just return the filenames as we read
-    // them back from the system API.
-    if ((glob->flags & GLOB_FLAG_SORTED) == 0)
+  globs[0] = m_string_duplicate(glob);
+  num_globs = 1;
+
+  va_start(args, glob);
+  for (; ; )
     {
-        free(glob->last_filename);
-        glob->last_filename = NextGlob(glob);
-        return glob->last_filename;
+      const char *arg = va_arg(args, const char *);
+      char **new_globs;
+
+      if (arg == NULL)
+        {
+          break;
+        }
+
+      new_globs = realloc(globs, sizeof(char *) * (num_globs + 1));
+      if (new_globs == NULL)
+        {
+          free_string_list(globs, num_globs);
+        }
+
+      globs = new_globs;
+      globs[num_globs] = m_string_duplicate(arg);
+      ++num_globs;
     }
 
-    // In sorted mode we read the whole list of filenames into memory,
-    // sort them and return them one at a time.
-    if (glob->next_index < 0)
+  va_end(args);
+
+  result = malloc(sizeof(glob_t));
+  if (result == NULL)
     {
-        ReadAllFilenames(glob);
-        SortFilenames(glob->filenames, glob->filenames_len, glob->flags);
+      free_string_list(globs, num_globs);
+      return NULL;
     }
-    if (glob->next_index >= glob->filenames_len)
+
+  result->dir = opendir(directory);
+  if (result->dir == NULL)
     {
-        return NULL;
+      free_string_list(globs, num_globs);
+      free(result);
+      return NULL;
     }
-    result = glob->filenames[glob->next_index];
-    ++glob->next_index;
-    return result;
+
+  result->directory = m_string_duplicate(directory);
+  result->globs = globs;
+  result->num_globs = num_globs;
+  result->flags = flags;
+  result->last_filename = NULL;
+  result->filenames = NULL;
+  result->filenames_len = 0;
+  result->next_index = -1;
+  return result;
+}
+
+glob_t *i_start_glob(const char *directory, const char *glob, int flags)
+{
+  return i_start_multi_glob(directory, flags, glob, NULL);
+}
+
+void i_end_glob(glob_t *glob)
+{
+  if (glob == NULL)
+    {
+      return;
+    }
+
+  free_string_list(glob->globs, glob->num_globs);
+  free_string_list(glob->filenames, glob->filenames_len);
+
+  free(glob->directory);
+  free(glob->last_filename);
+  (void)closedir(glob->dir);
+  free(glob);
+}
+
+const char *i_next_glob(glob_t *glob)
+{
+  const char *result;
+
+  if (glob == NULL)
+    {
+      return NULL;
+    }
+
+  /* In unsorted mode we just return the filenames as we read
+   * them back from the system API.
+   */
+
+  if ((glob->flags & GLOB_FLAG_SORTED) == 0)
+    {
+      free(glob->last_filename);
+      glob->last_filename = next_glob(glob);
+      return glob->last_filename;
+    }
+
+  /* In sorted mode we read the whole list of filenames into memory,
+   * sort them and return them one at a time.
+   */
+
+  if (glob->next_index < 0)
+    {
+      read_all_filenames(glob);
+      sort_filenames(glob->filenames, glob->filenames_len, glob->flags);
+    }
+
+  if (glob->next_index >= glob->filenames_len)
+    {
+      return NULL;
+    }
+
+  result = glob->filenames[glob->next_index];
+  ++glob->next_index;
+  return result;
 }
 
 #else /* #ifdef NO_DIRENT_IMPLEMENTATION */
 
-#warning No native implementation of file globbing.
+#warning "No native implementation of file globbing."
 
-glob_t *I_StartGlob(const char *directory, const char *glob, int flags)
+glob_t *i_start_glob(const char *directory, const char *glob, int flags)
 {
-    return NULL;
+  return NULL;
 }
 
-void I_EndGlob(glob_t *glob)
+void i_end_glob(glob_t *glob)
 {
+  return;
 }
 
-const char *I_NextGlob(glob_t *glob)
+const char *i_next_glob(glob_t *glob)
 {
-    return "";
+  return "";
 }
 
-#endif /* #ifdef NO_DIRENT_IMPLEMENTATION */
+glob_t *i_start_multi_glob(const char *directory, int flags,
+        const char *glob, ...)
+{
+  return NULL;
+}
 
+#endif /* NO_DIRENT_IMPLEMENTATION */
diff --git a/games/NXDoom/src/i_glob.h b/games/NXDoom/src/i_glob.h
index f976db01c..a151795ad 100644
--- a/games/NXDoom/src/i_glob.h
+++ b/games/NXDoom/src/i_glob.h
@@ -1,44 +1,87 @@
-//
-// Copyright(C) 2018 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific file globbing interface.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_glob.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2018 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific file globbing interface.
+ *
+ ****************************************************************************/
 
 #ifndef __I_GLOB__
 #define __I_GLOB__
 
-#define GLOB_FLAG_NOCASE  0x01
-#define GLOB_FLAG_SORTED  0x02
+/****************************************************************************
+ * Preprocessor Definitions
+ ****************************************************************************/
+
+#define GLOB_FLAG_NOCASE 0x01
+#define GLOB_FLAG_SORTED 0x02
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef struct glob_s glob_t;
 
-// Start reading a list of file paths from the given directory which match
-// the given glob pattern. I_EndGlob() must be called on completion.
-glob_t *I_StartGlob(const char *directory, const char *glob, int flags);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Same as I_StartGlob but multiple glob patterns can be provided. The list
-// of patterns must be terminated with NULL.
-glob_t *I_StartMultiGlob(const char *directory, int flags,
-                         const char *glob, ...);
+/****************************************************************************
+ * Name: i_start_glob
+ *
+ * Description:
+ *  Start reading a list of file paths from the given directory which match
+ *  the given glob pattern. i_end_glob() must be called on completion.
+ *
+ ****************************************************************************/
 
-// Finish reading file list.
-void I_EndGlob(glob_t *glob);
+glob_t *i_start_glob(const char *directory, const char *glob, int flags);
 
-// Read the name of the next globbed filename. NULL is returned if there
-// are no more found.
-const char *I_NextGlob(glob_t *glob);
+/****************************************************************************
+ * Name: i_start_multi_glob
+ *
+ * Description:
+ *  Same as i_start_glob but multiple glob patterns can be provided. The list
+ *  of patterns must be terminated with NULL.
+ *
+ ****************************************************************************/
 
-#endif
+glob_t *i_start_multi_glob(const char *directory, int flags,
+                           const char *glob, ...);
 
+/****************************************************************************
+ * Name: i_end_glob
+ *
+ * Description:
+ *  Finish reading file list.
+ *
+ ****************************************************************************/
+
+void i_end_glob(glob_t *glob);
+
+/****************************************************************************
+ * Name: i_next_glob
+ *
+ * Description:
+ *  Read the name of the next globbed filename. NULL is returned if there
+ *  are no more found.
+ *
+ ****************************************************************************/
+
+const char *i_next_glob(glob_t *glob);
+
+#endif /* __I_GLOB__ */
diff --git a/games/NXDoom/src/i_input.c b/games/NXDoom/src/i_input.c
index 091aa6b88..8cb3a8630 100644
--- a/games/NXDoom/src/i_input.c
+++ b/games/NXDoom/src/i_input.c
@@ -1,473 +1,402 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     SDL implementation of system-specific input interface.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_input.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   SDL implementation of system-specific input interface.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <fcntl.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "SDL.h"
-#include "SDL_keycode.h"
+#ifdef CONFIG_GAMES_NXDOOM_KEYBOARD
+#include <nuttx/input/kbd_codec.h>
+#endif
 
+#include "d_event.h"
 #include "doomkeys.h"
 #include "doomtype.h"
-#include "d_event.h"
 #include "i_input.h"
 #include "m_argv.h"
 #include "m_config.h"
 
-static const int scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct keyboard_dev
+{
+  int fd;
+  bool inited;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_GAMES_NXDOOM_KEYBOARD
+struct keyboard_dev g_kbd_dev =
+{
+  .fd = -1,
+  .inited = false,
+};
+#endif
+
+#if 0
+static const int g_scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
+
+/* Lookup table for mapping ASCII characters to their equivalent when
+ * shift is pressed on a US layout keyboard. This is the original table
+ * as found in the Doom sources, comments and all.
+ */
 
-// Lookup table for mapping ASCII characters to their equivalent when
-// shift is pressed on a US layout keyboard. This is the original table
-// as found in the Doom sources, comments and all.
 static const char shiftxform[] =
 {
     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, ' ', '!', '"', '#', '$', '%', '&',
-    '"', // shift-'
+    '"', /* shift-' */
     '(', ')', '*', '+',
-    '<', // shift-,
-    '_', // shift--
-    '>', // shift-.
-    '?', // shift-/
-    ')', // shift-0
-    '!', // shift-1
-    '@', // shift-2
-    '#', // shift-3
-    '$', // shift-4
-    '%', // shift-5
-    '^', // shift-6
-    '&', // shift-7
-    '*', // shift-8
-    '(', // shift-9
+    '<', /* shift-, */
+    '_', /* shift-- */
+    '>', /* shift-. */
+    '?', /* shift-/ */
+    ')', /* shift-0 */
+    '!', /* shift-1 */
+    '@', /* shift-2 */
+    '#', /* shift-3 */
+    '$', /* shift-4 */
+    '%', /* shift-5 */
+    '^', /* shift-6 */
+    '&', /* shift-7 */
+    '*', /* shift-8 */
+    '(', /* shift-9 */
     ':',
-    ':', // shift-;
+    ':', /* shift-; */
     '<',
-    '+', // shift-=
+    '+', /* shift-= */
     '>', '?', '@',
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
     'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-    '[', // shift-[
-    '!', // shift-backslash - OH MY GOD DOES WATCOM SUCK
-    ']', // shift-]
+    '[', /* shift-[ */
+    '!', /* shift-backslash - OH MY GOD DOES WATCOM SUCK */
+    ']', /* shift-] */
     '"', '_',
-    '\'', // shift-`
+    '\'', /* shift-` */
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
     'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
     '{', '|', '}', '~', 127
 };
 
-// If true, I_StartTextInput() has been called, and we are populating
-// the data3 field of ev_keydown events.
+/* If true, i_start_text_input() has been called, and we are populating
+ * the data3 field of ev_keydown events.
+ */
+
 static boolean text_input_enabled = true;
 
-// Bit mask of mouse button state.
-static unsigned int mouse_button_state = 0;
+/* Bit mask of mouse button state. */
+
+static unsigned int mouse_button_state = 0;
+#endif
+
+/* Disallow mouse and joystick movement to cause forward/backward
+ * motion.  Specified with the '-novert' command line parameter.
+ * This is an int to allow saving to config file
+ */
 
-// Disallow mouse and joystick movement to cause forward/backward
-// motion.  Specified with the '-novert' command line parameter.
-// This is an int to allow saving to config file
 int novert = 0;
 
-// If true, keyboard mapping is ignored, like in Vanilla Doom.
-// The sensible thing to do is to disable this if you have a non-US
-// keyboard.
+/* If true, keyboard mapping is ignored, like in Vanilla Doom.
+ * The sensible thing to do is to disable this if you have a non-US
+ * keyboard.
+ */
 
 int vanilla_keyboard_mapping = true;
 
-// Mouse acceleration
-//
-// This emulates some of the behavior of DOS mouse drivers by increasing
-// the speed when the mouse is moved fast.
-//
-// The mouse input values are input directly to the game, but when
-// the values exceed the value of mouse_threshold, they are multiplied
-// by mouse_acceleration to increase the speed.
+/* Mouse acceleration
+ *
+ * This emulates some of the behavior of DOS mouse drivers by increasing
+ * the speed when the mouse is moved fast.
+ *
+ * The mouse input values are input directly to the game, but when
+ * the values exceed the value of mouse_threshold, they are multiplied
+ * by mouse_acceleration to increase the speed.
+ */
+
 float mouse_acceleration = 2.0;
 int mouse_threshold = 10;
 
-// Translates the SDL key to a value of the type found in doomkeys.h
-static int TranslateKey(SDL_Keysym *sym)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: init_kbd_dev
+ *
+ * Description:
+ *   Set up the keyboard device for getting keyboard events.
+ *
+ * Return:
+ *   0 on success, error code otherwise.
+ *
+ ****************************************************************************/
+
+static int init_kbd_dev(struct keyboard_dev *dev)
 {
-    int scancode = sym->scancode;
-
-    switch (scancode)
+  if (dev->inited)
     {
-        case SDL_SCANCODE_LCTRL:
-        case SDL_SCANCODE_RCTRL:
-            return KEY_RCTRL;
+      return 0;
+    }
 
-        case SDL_SCANCODE_LSHIFT:
-        case SDL_SCANCODE_RSHIFT:
-            return KEY_RSHIFT;
+  dev->fd = open(CONFIG_GAMES_NXDOOM_KBDPATH, O_RDONLY | O_NONBLOCK);
+  if (dev->fd < 0)
+    {
+      return errno;
+    }
 
-        case SDL_SCANCODE_LALT:
-            return KEY_LALT;
+  dev->inited = true;
+  return 0;
+}
 
-        case SDL_SCANCODE_RALT:
-            return KEY_RALT;
+/****************************************************************************
+ * Name: translate_key
+ *
+ * Description:
+ *   Translates a NuttX key code into one from doomkeys.h.
+ *
+ * Return:
+ *   The translated key code.
+ *
+ ****************************************************************************/
 
-        default:
-            if (scancode >= 0 && scancode < arrlen(scancode_translate_table))
-            {
-                return scancode_translate_table[scancode];
-            }
-            else
-            {
-                return 0;
-            }
+static int translate_key(uint32_t keycode)
+{
+  switch (keycode)
+    {
+    case KEYCODE_LEFT:
+      return KEY_LEFTARROW;
+    case KEYCODE_RIGHT:
+      return KEY_RIGHTARROW;
+    case KEYCODE_UP:
+      return KEY_UPARROW;
+    case KEYCODE_DOWN:
+      return KEY_DOWNARROW;
+    case KEYCODE_ENTER:
+      return KEY_ENTER;
+    default:
+      return keycode;
     }
 }
 
-// Get the localized version of the key press. This takes into account the
-// keyboard layout, but does not apply any changes due to modifiers, (eg.
-// shift-, alt-, etc.)
-static int GetLocalizedKey(SDL_Keysym *sym)
-{
-    // When using Vanilla mapping, we just base everything off the scancode
-    // and always pretend the user is using a US layout keyboard.
-    if (vanilla_keyboard_mapping)
-    {
-        return TranslateKey(sym);
-    }
-    else
-    {
-        int result = sym->sym;
+/****************************************************************************
+ * Name: get_localized_key
+ *
+ * Description:
+ *  Get the localized version of the key press. This takes into account the
+ *  keyboard layout, but does not apply any changes due to modifiers, (eg.
+ *  shift-, alt-, etc.)
+ *
+ ****************************************************************************/
 
-        if (result < 0 || result >= 128)
+static int get_localized_key(uint32_t sym)
+{
+  /* NOTE: Argument was SDL_Keysym *sym */
+
+  /* When using Vanilla mapping, we just base everything off the scancode
+   * and always pretend the user is using a US layout keyboard.
+   */
+
+  if (vanilla_keyboard_mapping)
+    {
+      return translate_key(sym);
+    }
+  else
+    {
+      int result = sym;
+
+      if (result < 0 || result >= 128)
         {
-            result = 0;
+          result = 0;
         }
 
-        return result;
+      return result;
     }
 }
 
-// Get the equivalent ASCII (Unicode?) character for a keypress.
-static int GetTypedChar(SDL_Keysym *sym)
+/****************************************************************************
+ * Name: get_typed_char
+ *
+ * Description:
+ *  Get the equivalent ASCII (Unicode?) character for a keypress.
+ *
+ ****************************************************************************/
+
+static int get_typed_char(uint32_t sym)
 {
-    // We only return typed characters when entering text, after
-    // I_StartTextInput() has been called. Otherwise we return nothing.
-    if (!text_input_enabled)
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_GAMES_NXDOOM_KEYBOARD
+
+/****************************************************************************
+ * Name: get_kbd_event
+ *
+ * Description:
+ *   Read a single keyboard event from the keyboard device.
+ *
+ * Return:
+ *   0 on success, error code otherwise.
+ *
+ ****************************************************************************/
+
+int get_kbd_event(struct keyboard_event_s *sample)
+{
+  int err;
+  ssize_t nbytes;
+
+  /* Initialize the keyboard device if it isn't already */
+
+  err = init_kbd_dev(&g_kbd_dev);
+  if (err)
     {
-        return 0;
+      return err;
     }
 
-    // If we're strictly emulating Vanilla, we should always act like
-    // we're using a US layout keyboard (in ev_keydown, data1=data2).
-    // Otherwise we should use the native key mapping.
-    if (vanilla_keyboard_mapping)
-    {
-        int result = TranslateKey(sym);
+  /* Read events until we're out of them */
 
-        // If shift is held down, apply the original uppercase
-        // translation table used under DOS.
-        if ((SDL_GetModState() & KMOD_SHIFT) != 0
-         && result >= 0 && result < arrlen(shiftxform))
+  nbytes = read(g_kbd_dev.fd, sample, sizeof(*sample));
+  if (nbytes < 0)
+    {
+      err = errno;
+      if (err != EINTR)
         {
-            result = shiftxform[result];
+          return err;
         }
-
-        return result;
     }
-    else
+  else if (nbytes != sizeof(*sample))
     {
-        SDL_Event next_event;
+      return EIO;
+    }
+  else if (nbytes == 0)
+    {
+      return EAGAIN; /* No event */
+    }
 
-        // Special cases, where we always return a fixed value.
-        switch (sym->sym)
+  return 0;
+}
+#endif
+
+void i_handle_keyboard_event(struct keyboard_event_s *kevent)
+{
+  /* XXX: passing pointers to event for access after this function
+   * has terminated is undefined behaviour
+   */
+
+  event_t event;
+
+  switch (kevent->type)
+    {
+    case KEYBOARD_PRESS:
+      event.type = ev_keydown;
+      event.data1 = translate_key(kevent->code);
+      event.data2 = get_localized_key(kevent->code);
+      event.data3 = get_typed_char(kevent->code);
+
+      if (event.data1 != 0)
         {
-            case SDLK_BACKSPACE: return KEY_BACKSPACE;
-            case SDLK_RETURN:    return KEY_ENTER;
-            default:
-                break;
+          d_post_event(&event);
         }
+      break;
 
-        // The following is a gross hack, but I don't see an easier way
-        // of doing this within the SDL2 API (in SDL1 it was easier).
-        // We want to get the fully transformed input character associated
-        // with this keypress - correct keyboard layout, appropriately
-        // transformed by any modifier keys, etc. So peek ahead in the SDL
-        // event queue and see if the key press is immediately followed by
-        // an SDL_TEXTINPUT event. If it is, it's reasonable to assume the
-        // key press and the text input are connected. Technically the SDL
-        // API does not guarantee anything of the sort, but in practice this
-        // is what happens and I've verified it through manual inspect of
-        // the SDL source code.
-        //
-        // In an ideal world we'd split out ev_keydown into a separate
-        // ev_textinput event, as SDL2 has done. But this doesn't work
-        // (I experimented with the idea), because lots of Doom's code is
-        // based around different responders "eating" events to stop them
-        // being passed on to another responder. If code is listening for
-        // a text input, it cannot block the corresponding keydown events
-        // which can affect other responders.
-        //
-        // So we're stuck with this as a rather fragile alternative.
+    case KEYBOARD_RELEASE:
+      event.type = ev_keyup;
+      event.data1 = translate_key(kevent->code);
 
-        if (SDL_PeepEvents(&next_event, 1, SDL_PEEKEVENT,
-                           SDL_FIRSTEVENT, SDL_LASTEVENT) == 1
-         && next_event.type == SDL_TEXTINPUT)
+      /* data2/data3 are initialized to zero for ev_keyup.
+       * For ev_keydown it's the shifted Unicode character
+       * that was typed, but if something wants to detect
+       * key releases it should do so based on data1
+       * (key ID), not the printable char.
+       */
+
+      event.data2 = 0;
+      event.data3 = 0;
+
+      if (event.data1 != 0)
         {
-            // If an SDL_TEXTINPUT event is found, we always assume it
-            // matches the key press. The input text must be a single
-            // ASCII character - if it isn't, it's possible the input
-            // char is a Unicode value instead; better to send a null
-            // character than the unshifted key.
-            if (strlen(next_event.text.text) == 1
-             && (next_event.text.text[0] & 0x80) == 0)
-            {
-                return next_event.text.text[0];
-            }
+          d_post_event(&event);
         }
+      break;
 
-        // Failed to find anything :/
-        return 0;
+    default:
+      break;
     }
 }
 
-void I_HandleKeyboardEvent(SDL_Event *sdlevent)
+void i_start_text_input(int x1, int y1, int x2, int y2)
 {
-    // XXX: passing pointers to event for access after this function
-    // has terminated is undefined behaviour
-    event_t event;
-
-    switch (sdlevent->type)
-    {
-        case SDL_KEYDOWN:
-            event.type = ev_keydown;
-            event.data1 = TranslateKey(&sdlevent->key.keysym);
-            event.data2 = GetLocalizedKey(&sdlevent->key.keysym);
-            event.data3 = GetTypedChar(&sdlevent->key.keysym);
-
-            if (event.data1 != 0)
-            {
-                D_PostEvent(&event);
-            }
-            break;
-
-        case SDL_KEYUP:
-            event.type = ev_keyup;
-            event.data1 = TranslateKey(&sdlevent->key.keysym);
-
-            // data2/data3 are initialized to zero for ev_keyup.
-            // For ev_keydown it's the shifted Unicode character
-            // that was typed, but if something wants to detect
-            // key releases it should do so based on data1
-            // (key ID), not the printable char.
-
-            event.data2 = 0;
-            event.data3 = 0;
-
-            if (event.data1 != 0)
-            {
-                D_PostEvent(&event);
-            }
-            break;
-
-        default:
-            break;
-    }
 }
 
-void I_StartTextInput(int x1, int y1, int x2, int y2)
+void i_stop_text_input(void)
 {
-    text_input_enabled = true;
-
-    if (!vanilla_keyboard_mapping)
-    {
-        // SDL2-TODO: SDL_SetTextInputRect(...);
-        SDL_StartTextInput();
-    }
 }
 
-void I_StopTextInput(void)
+void i_handle_mouse_event(void)
 {
-    text_input_enabled = false;
-
-    if (!vanilla_keyboard_mapping)
-    {
-        SDL_StopTextInput();
-    }
+  /* Argument was SDL_Event *sdlevent */
 }
 
-static void UpdateMouseButtonState(unsigned int button, boolean on)
+/****************************************************************************
+ * Name: i_read_mouse
+ *
+ * Description:
+ *  Read the change in mouse state to generate mouse motion events. This is
+ *  to combine all mouse movement for a tic into one mouse motion event.
+ *
+ ****************************************************************************/
+
+void i_read_mouse(void)
 {
-    static event_t event;
-
-    if (button < SDL_BUTTON_LEFT || button > MAX_MOUSE_BUTTONS)
-    {
-        return;
-    }
-
-    // Note: button "0" is left, button "1" is right,
-    // button "2" is middle for Doom.  This is different
-    // to how SDL sees things.
-    // In the end: Left=0, Right=1, Middle=2,
-    // WheelUp=3 WheelDown=4, XButton1=5, XButton2=6
-
-    switch (button)
-    {
-        case SDL_BUTTON_LEFT:
-            button = 0;
-            break;
-
-        case SDL_BUTTON_RIGHT:
-            button = 1;
-            break;
-
-        case SDL_BUTTON_MIDDLE:
-            button = 2;
-            break;
-
-        default:
-            // SDL buttons are indexed from 1.
-            // And the wheel is mapped to button 3/4
-            // So we have to increment 2 and decrement 1 => inc 1.
-            button++;
-            break;
-    }
-
-    // Turn bit representing this button on or off.
-
-    if (on)
-    {
-        mouse_button_state |= (1 << button);
-    }
-    else
-    {
-        mouse_button_state &= ~(1 << button);
-    }
-
-    // Post an event with the new button state.
-
-    event.type = ev_mouse;
-    event.data1 = mouse_button_state;
-    event.data2 = event.data3 = 0;
-    D_PostEvent(&event);
 }
 
-static void MapMouseWheelToButtons(SDL_MouseWheelEvent *wheel)
+/****************************************************************************
+ * Name: i_bind_input_variables
+ *
+ * Description:
+ *  Bind all variables controlling input options.
+ *
+ ****************************************************************************/
+
+void i_bind_input_variables(void)
 {
-    // SDL2 distinguishes button events from mouse wheel events.
-    // We want to treat the mouse wheel as two buttons, as per
-    // SDL1
-    static event_t up, down;
-    int button;
-
-    if (wheel->y <= 0)
-    {   // scroll down
-        button = 4;
-    }
-    else
-    {   // scroll up
-        button = 3;
-    }
-
-    // post a button down event
-    mouse_button_state |= (1 << button);
-    down.type = ev_mouse;
-    down.data1 = mouse_button_state;
-    down.data2 = down.data3 = 0;
-    D_PostEvent(&down);
-
-    // post a button up event
-    mouse_button_state &= ~(1 << button);
-    up.type = ev_mouse;
-    up.data1 = mouse_button_state;
-    up.data2 = up.data3 = 0;
-    D_PostEvent(&up);
-}
-
-void I_HandleMouseEvent(SDL_Event *sdlevent)
-{
-    switch (sdlevent->type)
-    {
-        case SDL_MOUSEBUTTONDOWN:
-            UpdateMouseButtonState(sdlevent->button.button, true);
-            break;
-
-        case SDL_MOUSEBUTTONUP:
-            UpdateMouseButtonState(sdlevent->button.button, false);
-            break;
-
-        case SDL_MOUSEWHEEL:
-            MapMouseWheelToButtons(&(sdlevent->wheel));
-            break;
-
-        default:
-            break;
-    }
-}
-
-static int AccelerateMouse(int val)
-{
-    if (val < 0)
-        return -AccelerateMouse(-val);
-
-    if (val > mouse_threshold)
-    {
-        return (int)((val - mouse_threshold) * mouse_acceleration + mouse_threshold);
-    }
-    else
-    {
-        return val;
-    }
-}
-
-//
-// Read the change in mouse state to generate mouse motion events
-//
-// This is to combine all mouse movement for a tic into one mouse
-// motion event.
-void I_ReadMouse(void)
-{
-    int x, y;
-    event_t ev;
-
-    SDL_GetRelativeMouseState(&x, &y);
-
-    if (x != 0 || y != 0) 
-    {
-        ev.type = ev_mouse;
-        ev.data1 = mouse_button_state;
-        ev.data2 = AccelerateMouse(x);
-
-        if (!novert)
-        {
-            ev.data3 = -AccelerateMouse(y);
-        }
-        else
-        {
-            ev.data3 = 0;
-        }
-
-        // XXX: undefined behaviour since event is scoped to
-        // this function
-        D_PostEvent(&ev);
-    }
-}
-
-// Bind all variables controlling input options.
-void I_BindInputVariables(void)
-{
-    M_BindFloatVariable("mouse_acceleration",      &mouse_acceleration);
-    M_BindIntVariable("mouse_threshold",           &mouse_threshold);
-    M_BindIntVariable("vanilla_keyboard_mapping",  &vanilla_keyboard_mapping);
-    M_BindIntVariable("novert",                    &novert);
+  m_bind_float_variable("mouse_acceleration", &mouse_acceleration);
+  m_bind_int_variable("mouse_threshold", &mouse_threshold);
+  m_bind_int_variable("vanilla_keyboard_mapping", &vanilla_keyboard_mapping);
+  m_bind_int_variable("novert", &novert);
 }
diff --git a/games/NXDoom/src/i_input.h b/games/NXDoom/src/i_input.h
index 0dda76d07..97fc81bf7 100644
--- a/games/NXDoom/src/i_input.h
+++ b/games/NXDoom/src/i_input.h
@@ -1,49 +1,77 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    System-specific keyboard/mouse input.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_input.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   System-specific keyboard/mouse input.
+ *
+ ****************************************************************************/
 
 #ifndef __I_INPUT__
 #define __I_INPUT__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-#include "SDL.h"
+#ifdef CONFIG_GAMES_NXDOOM_KEYBOARD
+#include <nuttx/input/keyboard.h>
+#endif
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 #define MAX_MOUSE_BUTTONS 8
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern float mouse_acceleration;
 extern int mouse_threshold;
 
-void I_BindInputVariables(void);
-void I_ReadMouse(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// I_StartTextInput begins text input, activating the on-screen keyboard
-// (if one is used). The caller indicates that any entered text will be
-// displayed in the rectangle given by the provided set of coordinates.
-void I_StartTextInput(int x1, int y1, int x2, int y2);
+void i_bind_input_variables(void);
+void i_read_mouse(void);
 
-// I_StopTextInput finishes text input, deactivating the on-screen keyboard
-// (if one is used).
-void I_StopTextInput(void);
+/* i_start_text_input begins text input, activating the on-screen keyboard
+ * (if one is used). The caller indicates that any entered text will be
+ * displayed in the rectangle given by the provided set of coordinates.
+ */
 
-void I_HandleKeyboardEvent(SDL_Event *sdlevent);
-void I_HandleMouseEvent(SDL_Event *sdlevent);
+void i_start_text_input(int x1, int y1, int x2, int y2);
 
+/* i_stop_text_input finishes text input, deactivating the on-screen keyboard
+ * (if one is used).
+ */
 
+void i_stop_text_input(void);
+
+void i_handle_keyboard_event(struct keyboard_event_s *kevent);
+void i_handle_mouse_event(void);
+
+#ifdef CONFIG_GAMES_NXDOOM_KEYBOARD
+int get_kbd_event(struct keyboard_event_s *sample);
 #endif
+
+#endif /* __I_INPUT__ */
diff --git a/games/NXDoom/src/i_joystick.c b/games/NXDoom/src/i_joystick.c
index 9e28a1008..4ae0b3a32 100644
--- a/games/NXDoom/src/i_joystick.c
+++ b/games/NXDoom/src/i_joystick.c
@@ -1,31 +1,35 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//       SDL Joystick code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_joystick.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   SDL Joystick code.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "SDL.h"
-#include "SDL_joystick.h"
-#include "SDL_gamecontroller.h"
-
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "doomtype.h"
 #include "d_event.h"
+#include "doomtype.h"
 #include "i_joystick.h"
 #include "i_system.h"
 
@@ -33,794 +37,145 @@
 #include "m_fixed.h"
 #include "m_misc.h"
 
-static SDL_GameController *gamepad = NULL;
-static SDL_Joystick *joystick = NULL;
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Configuration variables:
+#define DIRECTION_DEADZONE (50 * 32768 / 100)
 
-// Standard default.cfg Joystick enable/disable
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Configuration variables: */
+
+/* Standard default.cfg Joystick enable/disable */
 
 static int usejoystick = 0;
 
-// Use SDL_gamecontroller interface for the selected device
+/* Use SDL_gamecontroller interface for the selected device */
+
 static int use_gamepad = 0;
 
-// SDL_GameControllerType of gamepad
+/* SDL_GameControllerType of gamepad */
+
 static int gamepad_type = 0;
 
-// SDL GUID and index of the joystick to use.
+/* SDL GUID and index of the joystick to use. */
+
 static char *joystick_guid = "";
 static int joystick_index = -1;
 
-// Which joystick axis to use for horizontal movement, and whether to
-// invert the direction:
+/* Which joystick axis to use for horizontal movement, and whether to
+ * invert the direction:
+ */
 
 static int joystick_x_axis = 0;
 static int joystick_x_invert = 0;
 
-// Which joystick axis to use for vertical movement, and whether to
-// invert the direction:
+/* Which joystick axis to use for vertical movement, and whether to
+ * invert the direction:
+ */
 
 static int joystick_y_axis = 1;
 static int joystick_y_invert = 0;
 
-// Which joystick axis to use for strafing?
+/* Which joystick axis to use for strafing? */
 
 static int joystick_strafe_axis = -1;
 static int joystick_strafe_invert = 0;
 
-// Which joystick axis to use for looking?
+/* Which joystick axis to use for looking? */
 
 static int joystick_look_axis = -1;
 static int joystick_look_invert = 0;
 
-// Configurable dead zone for each axis, specified as a percentage of the axis
-// max value.
+/* Configurable dead zone for each axis, specified as a percentage of the
+ * axis max value.
+ */
+
 static int joystick_x_dead_zone = 33;
 static int joystick_y_dead_zone = 33;
 static int joystick_strafe_dead_zone = 33;
 static int joystick_look_dead_zone = 33;
 
+/* Virtual to physical button joystick button mapping. By default this
+ * is a straight mapping.
+ */
+
+static int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS] =
+{
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 int use_analog = 0;
 
 int joystick_turn_sensitivity = 10;
 int joystick_move_sensitivity = 10;
 int joystick_look_sensitivity = 10;
 
-// Virtual to physical button joystick button mapping. By default this
-// is a straight mapping.
-static int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS] = {
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-};
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-void I_ShutdownGamepad(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void i_init_joystick(void)
 {
-    if (gamepad != NULL)
-    {
-        SDL_GameControllerClose(gamepad);
-        gamepad = NULL;
-        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
-    }
 }
 
-static int FindFirstGamepad(void)
+void i_update_gamepad(void)
 {
-    int i;
-    int gamepadindex = -1;
-
-    for (i = 0; i < SDL_NumJoysticks(); ++i)
-    {
-        if (SDL_IsGameController(i))
-        {
-            gamepadindex = i;
-            break;
-        }
-    }
-
-    return gamepadindex;
 }
 
-static int FindSpecificGamepad(SDL_JoystickGUID guid)
+void i_shutdown_joystick(void)
 {
-    SDL_JoystickGUID dev_guid;
-    int i;
-    int gamepadindex = -1;
-
-    for (i = 0; i < SDL_NumJoysticks(); ++i)
-    {
-        dev_guid = SDL_JoystickGetDeviceGUID(i);
-        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-        {
-            gamepadindex = i;
-            break;
-        }
-    }
-
-    return gamepadindex;
 }
 
-static int DeviceIndexGamepad(void)
+void i_update_joystick(void)
 {
-    SDL_JoystickGUID guid, dev_guid;
-    int index = -1;
-
-    if (strcmp(joystick_guid, ""))
-    {
-        guid = SDL_JoystickGetGUIDFromString(joystick_guid);
-
-        // First, look for the gamepad at the previously-used index.
-        if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
-        {
-            dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
-            if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-            {
-                return joystick_index;
-            }
-        }
-
-        // Maybe the index has moved?
-        index = FindSpecificGamepad(guid);
-    }
-
-    // If the previous gamepad isn't present, see if a different one is
-    // available.
-    if (index < 0)
-    {
-        index = FindFirstGamepad();
-    }
-
-    return index;
 }
 
-void I_InitGamepad(void)
+void i_bind_joystick_variables(void)
 {
-    SDL_JoystickGUID guid;
-    int index;
+  int i;
 
-    if (!use_gamepad)
+  m_bind_int_variable("use_joystick", &usejoystick);
+  m_bind_int_variable("use_gamepad", &use_gamepad);
+  m_bind_int_variable("gamepad_type", &gamepad_type);
+  m_bind_string_variable("joystick_guid", &joystick_guid);
+  m_bind_int_variable("joystick_index", &joystick_index);
+  m_bind_int_variable("joystick_x_axis", &joystick_x_axis);
+  m_bind_int_variable("joystick_y_axis", &joystick_y_axis);
+  m_bind_int_variable("joystick_strafe_axis", &joystick_strafe_axis);
+  m_bind_int_variable("joystick_x_invert", &joystick_x_invert);
+  m_bind_int_variable("joystick_y_invert", &joystick_y_invert);
+  m_bind_int_variable("joystick_strafe_invert", &joystick_strafe_invert);
+  m_bind_int_variable("joystick_look_axis", &joystick_look_axis);
+  m_bind_int_variable("joystick_look_invert", &joystick_look_invert);
+  m_bind_int_variable("joystick_x_dead_zone", &joystick_x_dead_zone);
+  m_bind_int_variable("joystick_y_dead_zone", &joystick_y_dead_zone);
+  m_bind_int_variable("joystick_strafe_dead_zone",
+                      &joystick_strafe_dead_zone);
+  m_bind_int_variable("joystick_look_dead_zone", &joystick_look_dead_zone);
+  m_bind_int_variable("use_analog", &use_analog);
+  m_bind_int_variable("joystick_turn_sensitivity",
+                      &joystick_turn_sensitivity);
+  m_bind_int_variable("joystick_move_sensitivity",
+                      &joystick_move_sensitivity);
+  m_bind_int_variable("joystick_look_sensitivity",
+                      &joystick_look_sensitivity);
+
+  for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
     {
-        return;
-    }
-
-    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
-    {
-        return;
-    }
-
-    index = DeviceIndexGamepad();
-
-    if (index < 0)
-    {
-        printf("I_InitGamepad: No gamepad found.\n");
-        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
-        return;
-    }
-
-    gamepad = SDL_GameControllerOpen(index);
-
-    if (gamepad == NULL)
-    {
-        printf("I_InitGamepad: Failed to open gamepad: %s\n", SDL_GetError());
-        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
-        return;
-    }
-
-    joystick_index = index;
-    gamepad_type = SDL_GameControllerTypeForIndex(index);
-
-    if (strcmp(joystick_guid, ""))
-    {
-        joystick_guid = malloc(GUID_STRING_BUF_SIZE);
-    }
-
-    guid = SDL_JoystickGetDeviceGUID(joystick_index);
-    SDL_JoystickGetGUIDString(guid, joystick_guid, GUID_STRING_BUF_SIZE);
-
-    // GameController events do not fire if Joystick events are disabled.
-    SDL_JoystickEventState(SDL_ENABLE);
-    SDL_GameControllerEventState(SDL_ENABLE);
-
-    printf("I_InitGamepad: %s\n", SDL_GameControllerName(gamepad));
-    I_AtExit(I_ShutdownGamepad, true);
-}
-
-static int GetTriggerStateGamepad(SDL_GameControllerAxis trigger)
-{
-    return (SDL_GameControllerGetAxis(gamepad, trigger) > TRIGGER_THRESHOLD);
-}
-
-// Get the state of the given virtual button.
-
-static int ReadButtonStateGamepad(int vbutton)
-{
-    int physbutton, state;
-
-    // Map from virtual button to physical (SDL) button.
-    if (vbutton < NUM_VIRTUAL_BUTTONS)
-    {
-        physbutton = joystick_physical_buttons[vbutton];
-    }
-    else
-    {
-        physbutton = vbutton;
-    }
-
-    switch (physbutton)
-    {
-        case GAMEPAD_BUTTON_TRIGGERLEFT:
-            state = GetTriggerStateGamepad(SDL_CONTROLLER_AXIS_TRIGGERLEFT);
-            break;
-
-        case GAMEPAD_BUTTON_TRIGGERRIGHT:
-            state = GetTriggerStateGamepad(SDL_CONTROLLER_AXIS_TRIGGERRIGHT);
-            break;
-
-        default:
-            state = SDL_GameControllerGetButton(gamepad, physbutton);
-            break;
-    }
-
-    return state;
-}
-
-// Get a bitmask of all currently-pressed buttons
-
-static int GetButtonsStateGamepad(void)
-{
-    int i;
-    int result = 0;
-
-    for (i = 0; i < MAX_VIRTUAL_BUTTONS; ++i)
-    {
-        if (ReadButtonStateGamepad(i))
-        {
-            result |= 1u << i;
-        }
-    }
-
-    return result;
-}
-
-// Read the state of an axis, inverting if necessary.
-
-static int GetAxisStateGamepad(const int *axis_values, int axis, int invert,
-                               int dead_zone)
-{
-    int result;
-
-    // Axis -1 means disabled.
-
-    if (axis < 0)
-    {
-        return 0;
-    }
-
-    // Dead zone is expressed as percentage of axis max value
-    dead_zone = 32768 * dead_zone / 100;
-
-    result = axis_values[axis];
-
-    if (result < dead_zone && result > -dead_zone)
-    {
-        return 0;
-    }
-
-    if (invert)
-    {
-        result = -result;
-    }
-
-    result *= FRACUNIT / 32768; // Want FXP number between -1 and 1
-
-    return result;
-}
-
-#define DIRECTION_DEADZONE (50 * 32768 / 100)
-
-static int GetDirectionalInputGamepad(const int *axis_values)
-{
-    int value;
-    int dpad = JOY_DIR_NONE;
-    int leftstick = JOY_DIR_NONE;
-    int rightstick = JOY_DIR_NONE;
-
-    // Dpad.
-    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_UP))
-    {
-        dpad |=  JOY_DIR_UP;
-    }
-
-    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_DOWN))
-    {
-        dpad |=  JOY_DIR_DOWN;
-    }
-
-    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_LEFT))
-    {
-        dpad |=  JOY_DIR_LEFT;
-    }
-
-    if (SDL_GameControllerGetButton(gamepad, SDL_CONTROLLER_BUTTON_DPAD_RIGHT))
-    {
-        dpad |= JOY_DIR_RIGHT;
-    }
-
-    // Left stick.
-    value = axis_values[SDL_CONTROLLER_AXIS_LEFTY];
-
-    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
-    {
-        if (value > 0)
-        {
-            leftstick |= JOY_DIR_DOWN;
-        }
-        else
-        {
-            leftstick |= JOY_DIR_UP;
-        }
-    }
-
-    value = axis_values[SDL_CONTROLLER_AXIS_LEFTX];
-
-    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
-    {
-        if (value > 0)
-        {
-            leftstick |= JOY_DIR_RIGHT;
-        }
-        else
-        {
-            leftstick |= JOY_DIR_LEFT;
-        }
-    }
-
-    // Right stick.
-    value = axis_values[SDL_CONTROLLER_AXIS_RIGHTX];
-
-    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
-    {
-        if (value > 0)
-        {
-            rightstick |= JOY_DIR_RIGHT;
-        }
-        else
-        {
-            rightstick |= JOY_DIR_LEFT;
-        }
-    }
-
-    value = axis_values[SDL_CONTROLLER_AXIS_RIGHTY];
-
-    if (value > DIRECTION_DEADZONE || value < -DIRECTION_DEADZONE)
-    {
-        if (value > 0)
-        {
-            rightstick |= JOY_DIR_DOWN;
-        }
-        else
-        {
-            rightstick |= JOY_DIR_UP;
-        }
-    }
-
-    return ((dpad << DPAD_SHIFT) | (leftstick << LSTICK_SHIFT) |
-            (rightstick << RSTICK_SHIFT));
-}
-
-void I_UpdateGamepad(void)
-{
-    if (gamepad != NULL)
-    {
-        event_t ev;
-        int axis_values[SDL_CONTROLLER_AXIS_MAX];
-
-        axis_values[SDL_CONTROLLER_AXIS_LEFTX] =
-            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_LEFTX);
-
-        axis_values[SDL_CONTROLLER_AXIS_LEFTY] =
-            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_LEFTY);
-
-        axis_values[SDL_CONTROLLER_AXIS_RIGHTX] =
-            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_RIGHTX);
-
-        axis_values[SDL_CONTROLLER_AXIS_RIGHTY] =
-            SDL_GameControllerGetAxis(gamepad, SDL_CONTROLLER_AXIS_RIGHTY);
-
-        ev.type = ev_joystick;
-        ev.data1 = GetButtonsStateGamepad();
-        ev.data2 = GetAxisStateGamepad(axis_values, joystick_x_axis,
-                                       joystick_x_invert, joystick_x_dead_zone);
-        ev.data3 = GetAxisStateGamepad(axis_values, joystick_y_axis,
-                                       joystick_y_invert, joystick_y_dead_zone);
-        ev.data4 = GetAxisStateGamepad(axis_values, joystick_strafe_axis,
-                                       joystick_strafe_invert,
-                                       joystick_strafe_dead_zone);
-        ev.data5 = GetAxisStateGamepad(axis_values, joystick_look_axis,
-                                       joystick_look_invert,
-                                       joystick_look_dead_zone);
-        ev.data6 = GetDirectionalInputGamepad(axis_values);
-
-        D_PostEvent(&ev);
+      char name[32];
+      snprintf(name, sizeof(name), "joystick_physical_button%i", i);
+      m_bind_int_variable(name, &joystick_physical_buttons[i]);
     }
 }
-
-void I_ShutdownJoystick(void)
-{
-    if (joystick != NULL)
-    {
-        SDL_JoystickClose(joystick);
-        joystick = NULL;
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-    }
-}
-
-static boolean IsValidAxis(int axis)
-{
-    int num_axes;
-
-    if (axis < 0)
-    {
-        return true;
-    }
-
-    if (IS_BUTTON_AXIS(axis))
-    {
-        return true;
-    }
-
-    if (IS_HAT_AXIS(axis))
-    {
-        return HAT_AXIS_HAT(axis) < SDL_JoystickNumHats(joystick);
-    }
-
-    num_axes = SDL_JoystickNumAxes(joystick);
-
-    return axis < num_axes;
-}
-
-static int DeviceIndex(void)
-{
-    SDL_JoystickGUID guid, dev_guid;
-    int i;
-
-    guid = SDL_JoystickGetGUIDFromString(joystick_guid);
-
-    // GUID identifies a class of device rather than a specific device.
-    // Check if joystick_index has the expected GUID, as this can act
-    // as a tie-breaker in case there are multiple identical devices.
-    if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
-    {
-        dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
-        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-        {
-            return joystick_index;
-        }
-    }
-
-    // Check all devices to look for one with the expected GUID.
-    for (i = 0; i < SDL_NumJoysticks(); ++i)
-    {
-        dev_guid = SDL_JoystickGetDeviceGUID(i);
-        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-        {
-            printf("I_InitJoystick: Joystick moved to index %d.\n", i);
-            return i;
-        }
-    }
-
-    // No joystick found with the expected GUID.
-    return -1;
-}
-
-void I_InitJoystick(void)
-{
-    int index;
-
-    if (!usejoystick || !strcmp(joystick_guid, ""))
-    {
-        return;
-    }
-
-    if (use_gamepad)
-    {
-        I_InitGamepad();
-        return;
-    }
-
-    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
-    {
-        return;
-    }
-
-    index = DeviceIndex();
-
-    if (index < 0)
-    {
-        printf("I_InitJoystick: Couldn't find joystick with GUID \"%s\": "
-               "device not found or not connected?\n",
-               joystick_guid);
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-        return;
-    }
-
-    // Open the joystick
-
-    joystick = SDL_JoystickOpen(index);
-
-    if (joystick == NULL)
-    {
-        printf("I_InitJoystick: Failed to open joystick #%i: %s\n", index,
-               SDL_GetError());
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-        return;
-    }
-
-    if (!IsValidAxis(joystick_x_axis)
-     || !IsValidAxis(joystick_y_axis)
-     || !IsValidAxis(joystick_strafe_axis)
-     || !IsValidAxis(joystick_look_axis))
-    {
-        printf("I_InitJoystick: Invalid joystick axis for configured joystick "
-               "(run joystick setup again)\n");
-
-        SDL_JoystickClose(joystick);
-        joystick = NULL;
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-    }
-
-    SDL_JoystickEventState(SDL_ENABLE);
-
-    // Initialized okay!
-
-    printf("I_InitJoystick: %s\n", SDL_JoystickName(joystick));
-
-    I_AtExit(I_ShutdownJoystick, true);
-}
-
-static boolean IsAxisButton(int physbutton)
-{
-    if (IS_BUTTON_AXIS(joystick_x_axis))
-    {
-        if (physbutton == BUTTON_AXIS_NEG(joystick_x_axis)
-         || physbutton == BUTTON_AXIS_POS(joystick_x_axis))
-        {
-            return true;
-        }
-    }
-    if (IS_BUTTON_AXIS(joystick_y_axis))
-    {
-        if (physbutton == BUTTON_AXIS_NEG(joystick_y_axis)
-         || physbutton == BUTTON_AXIS_POS(joystick_y_axis))
-        {
-            return true;
-        }
-    }
-    if (IS_BUTTON_AXIS(joystick_strafe_axis))
-    {
-        if (physbutton == BUTTON_AXIS_NEG(joystick_strafe_axis)
-         || physbutton == BUTTON_AXIS_POS(joystick_strafe_axis))
-        {
-            return true;
-        }
-    }
-    if (IS_BUTTON_AXIS(joystick_look_axis))
-    {
-        if (physbutton == BUTTON_AXIS_NEG(joystick_look_axis)
-         || physbutton == BUTTON_AXIS_POS(joystick_look_axis))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-// Get the state of the given virtual button.
-
-static int ReadButtonState(int vbutton)
-{
-    int physbutton;
-
-    // Map from virtual button to physical (SDL) button.
-    if (vbutton < NUM_VIRTUAL_BUTTONS)
-    {
-        physbutton = joystick_physical_buttons[vbutton];
-    }
-    else
-    {
-        physbutton = vbutton;
-    }
-
-    // Never read axis buttons as buttons.
-    if (IsAxisButton(physbutton))
-    {
-        return 0;
-    }
-
-    return SDL_JoystickGetButton(joystick, physbutton);
-}
-
-// Get a bitmask of all currently-pressed buttons
-
-static int GetButtonsState(void)
-{
-    int i;
-    int result = 0;
-
-    for (i = 0; i < MAX_VIRTUAL_BUTTONS; ++i)
-    {
-        if (ReadButtonState(i))
-        {
-            result |= 1 << i;
-        }
-    }
-
-    return result;
-}
-
-// Read the state of an axis, inverting if necessary.
-
-static int GetAxisState(int axis, int invert, int dead_zone)
-{
-    int result;
-
-    // Axis -1 means disabled.
-
-    if (axis < 0)
-    {
-        return 0;
-    }
-
-    // Is this a button axis, or a hat axis?
-    // If so, we need to handle it specially.
-
-    result = 0;
-
-    if (IS_BUTTON_AXIS(axis))
-    {
-        if (SDL_JoystickGetButton(joystick, BUTTON_AXIS_NEG(axis)))
-        {
-            result -= 32767;
-        }
-        if (SDL_JoystickGetButton(joystick, BUTTON_AXIS_POS(axis)))
-        {
-            result += 32767;
-        }
-    }
-    else if (IS_HAT_AXIS(axis))
-    {
-        int direction = HAT_AXIS_DIRECTION(axis);
-        int hatval = SDL_JoystickGetHat(joystick, HAT_AXIS_HAT(axis));
-
-        if (direction == HAT_AXIS_HORIZONTAL)
-        {
-            if ((hatval & SDL_HAT_LEFT) != 0)
-            {
-                result -= 32767;
-            }
-            else if ((hatval & SDL_HAT_RIGHT) != 0)
-            {
-                result += 32767;
-            }
-        }
-        else if (direction == HAT_AXIS_VERTICAL)
-        {
-            if ((hatval & SDL_HAT_UP) != 0)
-            {
-                result -= 32767;
-            }
-            else if ((hatval & SDL_HAT_DOWN) != 0)
-            {
-                result += 32767;
-            }
-        }
-    }
-    else
-    {
-        result = SDL_JoystickGetAxis(joystick, axis);
-
-        // Dead zone is expressed as percentage of axis max value
-        dead_zone = 32768 * dead_zone / 100;
-
-        if (result < dead_zone && result > -dead_zone)
-        {
-            result = 0;
-        }
-    }
-
-    if (invert)
-    {
-        result = -result;
-    }
-
-    result *= FRACUNIT / 32768; // Want FXP number between -1 and 1
-
-    return result;
-}
-
-static int GetDirectionalInput(int x, int y)
-{
-    int retval = JOY_DIR_NONE;
-
-    if (x > 0)
-    {
-        retval |= JOY_DIR_RIGHT;
-    }
-    else if (x < 0)
-    {
-        retval |= JOY_DIR_LEFT;
-    }
-
-    if (y > 0)
-    {
-        retval |= JOY_DIR_DOWN;
-    }
-    else if (y < 0)
-    {
-        retval |= JOY_DIR_UP;
-    }
-
-    return (retval << DPAD_SHIFT);
-}
-
-void I_UpdateJoystick(void)
-{
-    if (use_gamepad)
-    {
-        I_UpdateGamepad();
-        return;
-    }
-
-    if (joystick != NULL)
-    {
-        event_t ev;
-
-        ev.type = ev_joystick;
-        ev.data1 = GetButtonsState();
-        ev.data2 = GetAxisState(joystick_x_axis, joystick_x_invert,
-                                joystick_x_dead_zone);
-        ev.data3 = GetAxisState(joystick_y_axis, joystick_y_invert,
-                                joystick_y_dead_zone);
-        ev.data4 = GetAxisState(joystick_strafe_axis, joystick_strafe_invert,
-                                joystick_strafe_dead_zone);
-        ev.data5 = GetAxisState(joystick_look_axis, joystick_look_invert,
-                                joystick_look_dead_zone);
-        ev.data6 = GetDirectionalInput(ev.data2, ev.data3);
-        D_PostEvent(&ev);
-    }
-}
-
-void I_BindJoystickVariables(void)
-{
-    int i;
-
-    M_BindIntVariable("use_joystick",          &usejoystick);
-    M_BindIntVariable("use_gamepad",           &use_gamepad);
-    M_BindIntVariable("gamepad_type",          &gamepad_type);
-    M_BindStringVariable("joystick_guid",      &joystick_guid);
-    M_BindIntVariable("joystick_index",        &joystick_index);
-    M_BindIntVariable("joystick_x_axis",       &joystick_x_axis);
-    M_BindIntVariable("joystick_y_axis",       &joystick_y_axis);
-    M_BindIntVariable("joystick_strafe_axis",  &joystick_strafe_axis);
-    M_BindIntVariable("joystick_x_invert",     &joystick_x_invert);
-    M_BindIntVariable("joystick_y_invert",     &joystick_y_invert);
-    M_BindIntVariable("joystick_strafe_invert",&joystick_strafe_invert);
-    M_BindIntVariable("joystick_look_axis",    &joystick_look_axis);
-    M_BindIntVariable("joystick_look_invert",  &joystick_look_invert);
-    M_BindIntVariable("joystick_x_dead_zone", &joystick_x_dead_zone);
-    M_BindIntVariable("joystick_y_dead_zone", &joystick_y_dead_zone);
-    M_BindIntVariable("joystick_strafe_dead_zone", &joystick_strafe_dead_zone);
-    M_BindIntVariable("joystick_look_dead_zone", &joystick_look_dead_zone);
-    M_BindIntVariable("use_analog", &use_analog);
-    M_BindIntVariable("joystick_turn_sensitivity", &joystick_turn_sensitivity);
-    M_BindIntVariable("joystick_move_sensitivity", &joystick_move_sensitivity);
-    M_BindIntVariable("joystick_look_sensitivity", &joystick_look_sensitivity);
-
-    for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
-    {
-        char name[32];
-        M_snprintf(name, sizeof(name), "joystick_physical_button%i", i);
-        M_BindIntVariable(name, &joystick_physical_buttons[i]);
-    }
-}
-
diff --git a/games/NXDoom/src/i_joystick.h b/games/NXDoom/src/i_joystick.h
index 15c8daa30..6c1ff3df5 100644
--- a/games/NXDoom/src/i_joystick.h
+++ b/games/NXDoom/src/i_joystick.h
@@ -1,80 +1,104 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      System-specific joystick interface.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_joystick.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   System-specific joystick interface.
+ *
+ ****************************************************************************/
 
 #ifndef __I_JOYSTICK__
 #define __I_JOYSTICK__
 
-#include "SDL_gamecontroller.h"
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Number of "virtual" joystick buttons defined in configuration files.
+ * This needs to be at least as large as the number of different key
+ * bindings supported by the higher-level game code (joyb* variables).
+ */
 
-// Number of "virtual" joystick buttons defined in configuration files.
-// This needs to be at least as large as the number of different key
-// bindings supported by the higher-level game code (joyb* variables).
 #define NUM_VIRTUAL_BUTTONS 17
 
-// Max allowed number of virtual mappings. Chosen to be less than joybspeed
-// autorun value.
+/* Max allowed number of virtual mappings. Chosen to be less than joybspeed
+ * autorun value.
+ */
+
 #define MAX_VIRTUAL_BUTTONS 20
 
-// If this bit is set in a configuration file axis value, the axis is
-// not actually a joystick axis, but instead is a "button axis". This
-// means that instead of reading an SDL joystick axis, we read the
-// state of two buttons to get the axis value. This is needed for eg.
-// the PS3 SIXAXIS controller, where the D-pad buttons register as
-// buttons, not as two axes.
+/* If this bit is set in a configuration file axis value, the axis is
+ * not actually a joystick axis, but instead is a "button axis". This
+ * means that instead of reading an SDL joystick axis, we read the
+ * state of two buttons to get the axis value. This is needed for eg.
+ * the PS3 SIXAXIS controller, where the D-pad buttons register as
+ * buttons, not as two axes.
+ */
+
 #define BUTTON_AXIS 0x10000
 
-// Query whether a given axis value describes a button axis.
+/* Query whether a given axis value describes a button axis. */
+
 #define IS_BUTTON_AXIS(axis) ((axis) >= 0 && ((axis) & BUTTON_AXIS) != 0)
 
-// Get the individual buttons from a button axis value.
-#define BUTTON_AXIS_NEG(axis)  ((axis) & 0xff)
-#define BUTTON_AXIS_POS(axis)  (((axis) >> 8) & 0xff)
+/* Get the individual buttons from a button axis value. */
+
+#define BUTTON_AXIS_NEG(axis) ((axis) & 0xff)
+#define BUTTON_AXIS_POS(axis) (((axis) >> 8) & 0xff)
+
+/* Create a button axis value from two button values. */
 
-// Create a button axis value from two button values.
 #define CREATE_BUTTON_AXIS(neg, pos) (BUTTON_AXIS | (neg) | ((pos) << 8))
 
-// If this bit is set in an axis value, the axis is not actually a
-// joystick axis, but is a "hat" axis. This means that we read (one of)
-// the hats on the joystick.
-#define HAT_AXIS    0x20000
+/* If this bit is set in an axis value, the axis is not actually a
+ * joystick axis, but is a "hat" axis. This means that we read (one of)
+ * the hats on the joystick.
+ */
+
+#define HAT_AXIS 0x20000
 
 #define IS_HAT_AXIS(axis) ((axis) >= 0 && ((axis) & HAT_AXIS) != 0)
 
-// Get the hat number from a hat axis value.
-#define HAT_AXIS_HAT(axis)         ((axis) & 0xff)
-// Which axis of the hat? (horizonal or vertical)
-#define HAT_AXIS_DIRECTION(axis)   (((axis) >> 8) & 0xff)
+/* Get the hat number from a hat axis value. */
 
-#define CREATE_HAT_AXIS(hat, direction) \
-    (HAT_AXIS | (hat) | ((direction) << 8))
+#define HAT_AXIS_HAT(axis) ((axis) & 0xff)
+
+/* Which axis of the hat? (horizontal or vertical) */
+
+#define HAT_AXIS_DIRECTION(axis) (((axis) >> 8) & 0xff)
+
+#define CREATE_HAT_AXIS(hat, direction)                                      \
+  (HAT_AXIS | (hat) | ((direction) << 8))
 
 #define HAT_AXIS_HORIZONTAL 1
-#define HAT_AXIS_VERTICAL   2
+#define HAT_AXIS_VERTICAL 2
+
+/* When a trigger reads greater than this, consider it to be pressed.  30
+ * comes from XINPUT_GAMEPAD_TRIGGER_THRESHOLD in xinput.h, and is scaled
+ * here for the SDL_GameController trigger max value.
+ */
 
-// When a trigger reads greater than this, consider it to be pressed.  30 comes
-// from XINPUT_GAMEPAD_TRIGGER_THRESHOLD in xinput.h, and is scaled here for
-// the SDL_GameController trigger max value.
 #define TRIGGER_THRESHOLD (30 * 32767 / 255)
 
-// To be used with SDL_JoystickGetGUIDString; see SDL_joystick.h
+/* To be used with SDL_JoystickGetGUIDString; see SDL_joystick.h */
+
 #define GUID_STRING_BUF_SIZE 33
 
-// Helper macros for bitpacked directional data from gamepad inputs.
+/* Helper macros for bitpacked directional data from gamepad inputs. */
+
 #define DPAD_SHIFT 0
 #define LSTICK_SHIFT 4
 #define RSTICK_SHIFT 8
@@ -82,34 +106,47 @@
 #define JOY_GET_LSTICK(x) (((x) >> LSTICK_SHIFT) & 0xf)
 #define JOY_GET_RSTICK(x) (((x) >> RSTICK_SHIFT) & 0xf)
 
-// 4-way direction data for gamepad directional inputs.
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* 4-way direction data for gamepad directional inputs. */
+
 enum
 {
-    JOY_DIR_NONE = 0x0,
-    JOY_DIR_UP = 0x1,
-    JOY_DIR_DOWN = 0x2,
-    JOY_DIR_LEFT = 0x4,
-    JOY_DIR_RIGHT = 0x8
+  JOY_DIR_NONE = 0x0,
+  JOY_DIR_UP = 0x1,
+  JOY_DIR_DOWN = 0x2,
+  JOY_DIR_LEFT = 0x4,
+  JOY_DIR_RIGHT = 0x8
 };
 
-// Extend the SDL_GameControllerButton enum to include the triggers.
+/* Extend the SDL_GameControllerButton enum to include the triggers. */
+
 enum
 {
-    GAMEPAD_BUTTON_TRIGGERLEFT = SDL_CONTROLLER_BUTTON_MAX,
-    GAMEPAD_BUTTON_TRIGGERRIGHT,
-    GAMEPAD_BUTTON_MAX
+  GAMEPAD_BUTTON_TRIGGERLEFT, /* = SDL_CONTROLLER_BUTTON_MAX, */
+  GAMEPAD_BUTTON_TRIGGERRIGHT,
+  GAMEPAD_BUTTON_MAX
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern int use_analog;
 extern int joystick_turn_sensitivity;
 extern int joystick_move_sensitivity;
 extern int joystick_look_sensitivity;
 
-void I_InitJoystick(void);
-void I_ShutdownJoystick(void);
-void I_UpdateJoystick(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void I_BindJoystickVariables(void);
+void i_init_joystick(void);
+void i_shutdown_joystick(void);
+void i_update_joystick(void);
 
-#endif /* #ifndef __I_JOYSTICK__ */
+void i_bind_joystick_variables(void);
 
+#endif /* __I_JOYSTICK__ */
diff --git a/games/NXDoom/src/i_main.c b/games/NXDoom/src/i_main.c
index 851f0e9d2..bd9dab609 100644
--- a/games/NXDoom/src/i_main.c
+++ b/games/NXDoom/src/i_main.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Main program, simply calls D_DoomMain high level loop.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_main.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Main program, simply calls d_doom_main high level loop.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "config.h"
 
@@ -22,58 +31,57 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "SDL.h"
-
 #include "doomtype.h"
 #include "i_system.h"
 #include "m_argv.h"
 #include "m_misc.h"
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-//
-// D_DoomMain()
-// Not a globally visible function, just included for source reference,
-// calls all startup code, parses command line options.
-//
+/****************************************************************************
+ * Name: d_doom_main()
+ *
+ * Description:
+ *  Not a globally visible function, just included for source reference,
+ *  calls all startup code, parses command line options.
+ *
+ ****************************************************************************/
 
-void D_DoomMain (void);
+void d_doom_main(void);
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
 int main(int argc, char **argv)
 {
-    // save arguments
+  /* save arguments */
 
-    myargc = argc;
-    myargv = malloc(argc * sizeof(char *));
-    assert(myargv != NULL);
+  myargc = argc;
+  myargv = malloc(argc * sizeof(char *));
+  assert(myargv != NULL);
 
-    for (int i = 0; i < argc; i++)
+  for (int i = 0; i < argc; i++)
     {
-        myargv[i] = M_StringDuplicate(argv[i]);
+      myargv[i] = m_string_duplicate(argv[i]);
     }
 
-    //!
-    // Print the program version and exit.
-    //
-    if (M_ParmExists("-version") || M_ParmExists("--version")) {
-        puts(PACKAGE_STRING);
-        exit(0);
+  /* Print the program version and exit. */
+
+  if (m_parm_exists("-version") || m_parm_exists("--version"))
+    {
+      puts(PACKAGE_STRING);
+      exit(0);
     }
 
-#if defined(_WIN32)
-    // compose a proper command line from loose file paths passed as arguments
-    // to allow for loading WADs and DEHACKED patches by drag-and-drop
-    M_AddLooseFiles();
-#endif
+  m_find_response_file();
+  m_set_exe_dir();
 
-    M_FindResponseFile();
-    M_SetExeDir();
+  /* start doom */
 
-    SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1");
+  d_doom_main();
 
-    // start doom
-
-    D_DoomMain ();
-
-    return 0;
+  return 0;
 }
-
diff --git a/games/NXDoom/src/i_musicpack.c b/games/NXDoom/src/i_musicpack.c
index 10a2d1648..733a45c7c 100644
--- a/games/NXDoom/src/i_musicpack.c
+++ b/games/NXDoom/src/i_musicpack.c
@@ -1,28 +1,34 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System interface for music.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_musicpack.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System interface for music.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-
-#include "SDL.h"
 
 #include "i_glob.h"
 
@@ -34,8 +40,8 @@
 #include "deh_str.h"
 #include "gusconf.h"
 #include "i_sound.h"
-#include "i_system.h"
 #include "i_swap.h"
+#include "i_system.h"
 #include "m_argv.h"
 #include "m_config.h"
 #include "m_misc.h"
@@ -43,1454 +49,104 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static boolean i_null_init_music(void);
+static void i_null_shutdown_music(void);
+static void i_null_set_music_volume(int volume);
+static void i_null_pause_song(void);
+static void i_null_resume_song(void);
+static void *i_null_register_song(void *data, int len);
+static void i_null_unregister_song(void *handle);
+static void i_null_play_song(void *handle, boolean looping);
+static void i_null_stop_song(void);
+static boolean i_null_musicisplaying(void);
+static void i_null_pollmusic(void);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 char *music_pack_path = "";
 
-
-#ifndef DISABLE_SDL2MIXER
-
-#include "SDL_mixer.h"
-
-#define MID_HEADER_MAGIC "MThd"
-#define MUS_HEADER_MAGIC "MUS\x1a"
-
-// Starting with 2.6.0, SDL_mixer supports OGG and FLAC looping natively.
-// TODO: Once SDL_mixer 2.6.0+ is a requirement, delete the old looping code.
-#if !defined(USE_SDL_MIXER_LOOPING)
-#if defined(SDL_MIXER_VERSION_ATLEAST)
-#if SDL_MIXER_VERSION_ATLEAST(2, 6, 0)
-#define USE_SDL_MIXER_LOOPING 1
-#else
-#define USE_SDL_MIXER_LOOPING 0
-#endif // SDL_MIXER_VERSION_ATLEAST(2, 6, 0)
-#else
-#define USE_SDL_MIXER_LOOPING 0
-#endif // defined(SDL_MIXER_VERSION_ATLEAST)
-#endif // !defined(USE_SDL_MIXER_LOOPING)
-
-#if !USE_SDL_MIXER_LOOPING
-#define FLAC_HEADER "fLaC"
-#define OGG_HEADER "OggS"
-
-// Looping Vorbis metadata tag names. These have been defined by ZDoom
-// for specifying the start and end positions for looping music tracks
-// in .ogg and .flac files.
-// More information is here: http://zdoom.org/wiki/Audio_loop
-#define LOOP_START_TAG "LOOP_START"
-#define LOOP_END_TAG   "LOOP_END"
-
-// FLAC metadata headers that we care about.
-#define FLAC_STREAMINFO      0
-#define FLAC_VORBIS_COMMENT  4
-
-// Ogg metadata headers that we care about.
-#define OGG_ID_HEADER        1
-#define OGG_COMMENT_HEADER   3
-#endif // !USE_SDL_MIXER_LOOPING
-
-// Structure for music substitution.
-// We store a mapping based on SHA1 checksum -> filename of substitute music
-// file to play, so that substitution occurs based on content rather than
-// lump name. This has some inherent advantages:
-//  * Music for Plutonia (reused from Doom 1) works automatically.
-//  * If a PWAD replaces music, the replacement music is used rather than
-//    the substitute music for the IWAD.
-//  * If a PWAD reuses music from an IWAD (even from a different game), we get
-//    the high quality version of the music automatically (neat!)
-
-typedef struct
-{
-    const char *hash_prefix;
-    const char *filename;
-} subst_music_t;
-
-#if !USE_SDL_MIXER_LOOPING
-// Structure containing parsed metadata read from a digital music track:
-typedef struct
-{
-    boolean valid;
-    unsigned int samplerate_hz;
-    int start_time, end_time;
-} file_metadata_t;
-#endif // !USE_SDL_MIXER_LOOPING
-
-static subst_music_t *subst_music = NULL;
-static unsigned int subst_music_len = 0;
-
-static boolean music_initialized = false;
-
-// If this is true, this module initialized SDL sound and has the 
-// responsibility to shut it down
-
-static boolean sdl_was_initialized = false;
-
-#if !USE_SDL_MIXER_LOOPING
-// If true, we are playing a substitute digital track rather than in-WAD
-// MIDI/MUS track, and file_metadata contains loop metadata.
-static file_metadata_t file_metadata;
-
-// Position (in samples) that we have reached in the current track.
-// This is updated by the TrackPositionCallback function.
-static unsigned int current_track_pos;
-#endif // !USE_SDL_MIXER_LOOPING
-
-// Currently playing music track.
-static Mix_Music *current_track_music = NULL;
-
-// If true, the currently playing track is being played on loop.
-static boolean current_track_loop;
-
-// Table of known hashes and filenames to look up for them. This allows
-// users to drop in a set of files without having to also provide a
-// configuration file.
-static const subst_music_t known_filenames[] = {
-    // Doom 1 music files.
-    {"b2e05b4e8dff8d76f8f4", "d_inter.{ext}"},
-    {"0c0acce45130bab935d2", "d_intro.{ext}"},
-    {"fca4086939a68ae4ed84", "d_victor.{ext}"},
-    {"5971e5e20554f47ca065", "d_intro.{ext}"},
-    {"99767e32769229897f77", "d_e1m1.{ext}"},
-    {"b5e7dfb4efe9e688bf2a", "d_e1m2.{ext}"},
-    {"fda8fa73e4d30a6b961c", "d_e1m3.{ext}"},
-    {"3805f9bf3f1702f7e7f5", "d_e1m4.{ext}"},
-    {"f546ed823b234fe39165", "d_e1m5.{ext}"},
-    {"4450811b5a6748cfd83e", "d_e1m6.{ext}"},
-    {"73edb50d96b0ac03be34", "d_e1m7.{ext}"},
-    {"47d711a6fd32f5047879", "d_e1m8.{ext}"},
-    {"62c631c2fdaa5ecd9a8d", "d_e1m9.{ext}"},
-    {"7702a6449585428e7185", "d_e2m1.{ext}"},
-    {"1cb1810989cbfae2b29b", "d_e2m2.{ext}"},
-    {"7d740f3c881a22945e47", "d_e2m4.{ext}"},
-    {"ae9c3dc2f9aeea002327", "d_e2m6.{ext}"},
-    {"b26aad3caa420e9a2c76", "d_e2m7.{ext}"},
-    {"90f06251a2a90bfaefd4", "d_e2m8.{ext}"},
-    {"b2fb439f23c08c8e2577", "d_e3m1.{ext}"},
-    {"b6c07bb249526b864208", "d_e3m2.{ext}"},
-    {"ce3587ee503ffe707b2d", "d_e3m3.{ext}"},
-    {"d746ea2aa16b3237422c", "d_e3m8.{ext}"},
-    {"3da3b1335560a92912e6", "d_bunny.{ext}"},
-
-    // Duplicates that don't have identical hashes:
-    {"4a5badc4f10a7d4ed021", "d_inter.{ext}"},  // E2M3
-    {"36b14bf165b3fdd3958e", "d_e1m7.{ext}"},   // E3M5
-    {"e77c3d42f2ea87f04607", "d_e1m6.{ext}"},   // E3M6
-    {"3d85ec9c10b5ea465568", "d_e2m7.{ext}"},   // E3M7
-    {"4d42e2ce1c1ff192500e", "d_e1m9.{ext}"},   // E3M9
-
-    // These tracks are reused in Alien Vendetta, but are MIDs:
-    {"a05e45f67e1b64733fe3", "d_e2m1.{ext}"},   // MAP02
-    {"8024ae1616ddd97ce330", "d_e1m4.{ext}"},   // MAP03
-    {"3af8d79ddba49edaf9eb", "d_victor.{ext}"}, // MAP05
-    {"a55352c96c025b6bd08a", "d_inter.{ext}"},  // MAP07
-    {"76d1fc25ab7b1b4a58d6", "d_e1m8.{ext}"},   // MAP11
-    {"497777f0863eca7cea87", "d_e1m2.{ext}"},   // MAP12
-    {"0228fd87f8762f112fb6", "d_e2m2.{ext}"},   // MAP13
-    {"db94e8e1d7c02092eab5", "d_e1m6.{ext}"},   // MAP14
-    {"5a8d7a307eebc952795c", "d_e2m7.{ext}"},   // MAP16
-    {"1a36b692bf26d94a72cc", "d_e1m7.{ext}"},   // MAP23
-    {"37c6cefa351b06995152", "d_e1m5.{ext}"},   // MAP27
-    {"36b97b87fe98348d44b6", "d_e2m6.{ext}"},   // MAP28
-
-    // Doom II music files.
-    {"79080e9681a2d7bec3fb", "d_runnin.{ext}"},  // MAP01,15
-    {"868b3aae73c7b12e92c0", "d_stalks.{ext}"},  // MAP02,11,17
-    {"19237754d2eb85f41d84", "d_countd.{ext}"},  // MAP03,21
-    {"00abff3b61b25a6855d2", "d_betwee.{ext}"},  // MAP04
-    {"954636c7ee09edf5d98f", "d_doom.{ext}"},    // MAP05,13
-    {"8d32b2b7aa3b806474c1", "d_the_da.{ext}"},  // MAP06,12,24
-    {"41efc3c84bb321af2b6b", "d_shawn.{ext}"},   // MAP07,19,29
-    // Assuming single D_DDTBLU: http://doomwiki.org/wiki/Doom_II_music#Trivia
-    {"51c0872fec9f43259318", "d_ddtblu.{ext}"},  // MAP08
-    {"acb7ad85494d18235df8", "d_ddtblu.{ext}"},  // MAP14,22
-    {"4b7ceccbf47e78e2fa0b", "d_in_cit.{ext}"},  // MAP09
-    {"1d1f4a9edba174584e11", "d_dead.{ext}"},    // MAP10,16
-    {"1736c81aac77f9bffd3d", "d_romero.{ext}"},  // MAP18,27
-    {"a55d400570ad255a576b", "d_messag.{ext}"},  // MAP20,26
-    {"29d30c3fbd712016f2e5", "d_ampie.{ext}"},   // MAP23
-    {"bcfe9786afdcfb704afa", "d_adrian.{ext}"},  // MAP25
-    {"e05c10389e71836834ae", "d_tense.{ext}"},   // MAP28
-    {"b779022b1d0f0010b8f0", "d_openin.{ext}"},  // MAP30
-    {"a9a5f7b0ab3be0f4fc24", "d_evil.{ext}"},    // MAP31
-    {"4503d155aafec0296689", "d_ultima.{ext}"},  // MAP32
-    {"56f2363f01df38908c77", "d_dm2ttl.{ext}"},
-    {"71e58baf9e9dea4dd24a", "d_dm2int.{ext}"},
-    {"e632318629869811f7dc", "d_read_m.{ext}"},
-
-    // Duplicate filenames: the above filenames are the "canonical" files
-    // for the given SHA1 hashes, but we can also look for these filenames
-    // corresponding to the duplicated music tracks too.
-    {"868b3aae73c7b12e92c0", "d_stlks2.{ext}"},
-    {"868b3aae73c7b12e92c0", "d_stlks3.{ext}"},
-    {"8d32b2b7aa3b806474c1", "d_theda2.{ext}"},
-    {"8d32b2b7aa3b806474c1", "d_theda3.{ext}"},
-    {"954636c7ee09edf5d98f", "d_doom2.{ext}"},
-    {"acb7ad85494d18235df8", "d_ddtbl2.{ext}"},
-    {"acb7ad85494d18235df8", "d_ddtbl3.{ext}"},
-    {"79080e9681a2d7bec3fb", "d_runni2.{ext}"},
-    {"1d1f4a9edba174584e11", "d_dead2.{ext}"},
-    {"41efc3c84bb321af2b6b", "d_shawn2.{ext}"},
-    {"41efc3c84bb321af2b6b", "d_shawn3.{ext}"},
-    {"19237754d2eb85f41d84", "d_count2.{ext}"},
-    {"a55d400570ad255a576b", "d_messg2.{ext}"},
-    {"1736c81aac77f9bffd3d", "d_romer2.{ext}"},
-
-    // These tracks are reused in Alien Vendetta, but are MIDs:
-    {"9433604c098b7b1119a4", "d_in_cit.{ext}"},  // MAP26
-
-    // Heretic tracks.
-    {"12818ca0d3c957e7d57e", "mus_titl.{ext}"},
-    {"5cb988538ce1b1857349", "mus_intr.{ext}"},
-    {"6f126abe35a78b61b930", "mus_cptd.{ext}"},
-    {"62557250f0427c067dc9", "mus_e1m1.{ext}"},
-    {"1e8d5fd814490b9ae166", "mus_e1m2.{ext}"},
-    {"f0f31e8834e85035d434", "mus_e1m3.{ext}"},
-    {"054d6997405cc5a32b46", "mus_e1m4.{ext}"},
-    {"31950ab062cc1e5ca49d", "mus_e1m5.{ext}"},
-    {"7389024fbab0dff47211", "mus_e1m6.{ext}"},
-    {"f2aa312dddd0a294a095", "mus_e1m7.{ext}"},
-    {"cd6856731d1ae1f3aa4e", "mus_e1m8.{ext}"},
-    {"d7fe793f266733d92e61", "mus_e1m9.{ext}"},
-    {"933545b48fad8c66f042", "mus_e2m1.{ext}"},
-    {"bf88ecd4ae1621222592", "mus_e2m2.{ext}"},
-    {"4f619f87a828c2ca4801", "mus_e2m3.{ext}"},
-    {"13033a83c49424b2f2ab", "mus_e2m4.{ext}"},
-    {"b3851f9351ae411d9de3", "mus_e2m6.{ext}"},
-    {"82539791159fbbc02a23", "mus_e2m7.{ext}"},
-    {"fd9e53a49cfa62c463a0", "mus_e2m8.{ext}"},
-    {"29503959324d2ca67958", "mus_e2m9.{ext}"},
-    {"3aa632257c5be375b97b", "mus_e3m2.{ext}"},
-    {"69ba0dce7913d53b67a8", "mus_e3m3.{ext}"},
-
-    // These Heretic tracks are reused in Alien Vendetta, but are MIDs:
-    {"51344131e8d260753ce7", "mus_e2m3.{ext}"},  // MAP15
-    {"78b570b2397570440aff", "mus_e1m1.{ext}"},  // MAP19
-    {"ee21ba9fad4de3dfaef0", "mus_e1m4.{ext}"},  // MAP29
-    {"d2bb643a60696ccbca03", "mus_e1m9.{ext}"},  // MAP32
-
-    // Hexen tracks:
-    {"fbf55fc1ee26bd01266b", "winnowr.{ext}"},
-    {"71776e2da2b7ba607d81", "jachr.{ext}"},
-    {"c5c8630608b8132b33cd", "simonr.{ext}"},
-    {"43683b3f55a031de88d4", "wutzitr.{ext}"},
-    {"a6062883f29436ef73db", "falconr.{ext}"},
-    {"512cb6cc9b558d5f0fef", "levelr.{ext}"},
-    {"d31226ae75fce6a24208", "chartr.{ext}"},
-    {"bf1f1e561bbdba4e699f", "swampr.{ext}"},
-    {"b303193f756ca0e2de0f", "deepr.{ext}"},
-    {"f0635f0386d883b00186", "fubasr.{ext}"},
-    {"18f2a01f83df6e3abedc", "grover.{ext}"},
-    {"b2527eb0522f08b2cf5f", "fortr.{ext}"},
-    {"343addba8ba53a20a160", "foojar.{ext}"},
-    {"c13109045b06b5a63386", "sixater.{ext}"},
-    {"693525aaf69eac5429ab", "wobabyr.{ext}"},
-    {"8f884223811c2bb8311d", "cryptr.{ext}"},
-    {"de540e6826e62b32c01c", "fantar.{ext}"},
-    {"efdff548df918934f71f", "blechr.{ext}"},
-    {"de91f150f6a127e72e35", "voidr.{ext}"},
-    {"e0497fe27289fe18515b", "chap_1r.{ext}"},
-    {"f2ef1abdc3f672a3519a", "chap_2r.{ext}"},
-    {"78cd9882f61cc441bef4", "chap_3r.{ext}"},
-    {"97b2b575d9d096c1f89f", "chap_4r.{ext}"},
-    {"ad0197a0f6c52ac30915", "chippyr.{ext}"},
-    {"30506c62e9f0989ffe09", "percr.{ext}"},
-    {"3542803beaa43bf1de1a", "secretr.{ext}"},
-    {"81067721f40c611d09fb", "bonesr.{ext}"},
-    {"4822af2e1a2eb7faf660", "octor.{ext}"},
-    {"26bb3cec902ed8008fc2", "rithmr.{ext}"},
-    {"94ab641c7aa93caac77a", "stalkr.{ext}"},
-    {"d0a3f337c54b0703b4d3", "borkr.{ext}"},
-    {"79e7781ec7eb9b9434b5", "crucibr.{ext}"},
-    {"c2786e5581a7f8801969", "hexen.{ext}"},
-    {"97fae9a084c0efda5151", "hub.{ext}"},
-    {"c5da52d5c2ec4803ef8f", "hall.{ext}"},
-    {"1e71bc0e2feafb06214e", "orb.{ext}"},
-    {"bc9dcfa6632e847e03af", "chess.{ext}"},
-
-    // Hexen CD tracks: alternate filenames for a ripped copy of
-    // the CD soundtrack.
-    {"71776e2da2b7ba607d81", "hexen02.{ext}"},   // level  2 (jachr)
-    {"efdff548df918934f71f", "hexen03.{ext}"},   // level 26 (blechr)
-    {"c2786e5581a7f8801969", "hexen04.{ext}"},   // (hexen)
-    {"1e71bc0e2feafb06214e", "hexen05.{ext}"},   // (orb)
-    {"f0635f0386d883b00186", "hexen06.{ext}"},   // level 10 (fubasr)
-    {"bc9dcfa6632e847e03af", "hexen07.{ext}"},   // (chess)
-    {"8f884223811c2bb8311d", "hexen08.{ext}"},   // level 24 (cryptr)
-    {"a6062883f29436ef73db", "hexen09.{ext}"},   // level  5 (falconr)
-    {"4822af2e1a2eb7faf660", "hexen10.{ext}"},   // level 36 (octor)
-    {"26bb3cec902ed8008fc2", "hexen11.{ext}"},   // level 37 (rithmr)
-    {"c13109045b06b5a63386", "hexen12.{ext}"},   // level 22 (sixater)
-    {"fbf55fc1ee26bd01266b", "hexen13.{ext}"},   // level  1 (winnowr)
-    {"bf1f1e561bbdba4e699f", "hexen14.{ext}"},   // level  8 (swampr)
-    {"43683b3f55a031de88d4", "hexen15.{ext}"},   // level  4 (wutzitr)
-    {"81067721f40c611d09fb", "hexen16.{ext}"},   // level 35 (bonesr)
-    {"e0497fe27289fe18515b", "hexen17.{ext}"},   // level 28 (chap_1r)
-    {"97b2b575d9d096c1f89f", "hexen18.{ext}"},   // level 31 (chap_4r)
-    {"de540e6826e62b32c01c", "hexen19.{ext}"},   // level 25 (fantar)
-    {"343addba8ba53a20a160", "hexen20.{ext}"},   // level 21 (foojar)
-    {"512cb6cc9b558d5f0fef", "hexen21.{ext}"},   // level  6 (levelr)
-    {"c5c8630608b8132b33cd", "hexen22.{ext}"},   // level  3 (simonr)
-
-    // Strife:
-    {"8ac2b2b47707f0fdf8f6", "d_logo.{ext}"},   // Title
-    {"62e1c58054a1f1bc39b2", "d_action.{ext}"}, // 1,15,28
-    {"12fa000f3fa1edac5c4f", "d_tavern.{ext}"}, // 2
-    {"695e56ab3251792d20e5", "d_danger.{ext}"}, // 3,11
-    {"96fe30e8712217b60dd7", "d_fast.{ext}"},   // 4
-    {"61345598a3de04aad508", "d_darker.{ext}"}, // 6,14
-    {"52353e9a435b7b1cb268", "d_strike.{ext}"}, // 7,19
-    {"061164504907bffc9c22", "d_slide.{ext}"},  // 8,18,22
-    {"3dbb4b703ce69aafcdd5", "d_tribal.{ext}"}, // 9
-    {"393773688eba050c3548", "d_march.{ext}"},  // 10
-    {"3cba3c627de065a667dd", "d_mood.{ext}"},   // 12
-    {"b1f65a333e5c70255784", "d_castle.{ext}"}, // 13
-    {"e1455a83a04c9ac4a09f", "d_fight.{ext}"},  // 16,31
-    {"17f822b7374b1f069b89", "d_spense.{ext}"}, // 17
-    {"e66c5a1a7d05f021f4ae", "d_dark.{ext}"},   // 20
-    {"1c92bd0625026af30dad", "d_tech.{ext}"},   // 21,27
-    {"7ae280713d078de7933a", "d_drone.{ext}"},  // 23,30
-    {"4a664afd0d7eae79c97a", "d_panthr.{ext}"}, // 24
-    {"4a7d62beeac5601ccf21", "d_sad.{ext}"},    // 25
-    {"e60e109779400f2855d7", "d_instry.{ext}"}, // 26,29
-    {"b7d36878faeb291d6df5", "d_happy.{ext}"},  // Better ending
-    {"ff4a342c8c5ec51b06c3", "d_end.{ext}"},    // Worse ending
-    // This conflicts with Doom's d_intro:
-    //{"ec8fa484c4e85adbf700", "d_intro.{ext}"},  // 5
-};
-
-#if !USE_SDL_MIXER_LOOPING
-// Given a time string (for LOOP_START/LOOP_END), parse it and return
-// the time (in # samples since start of track) it represents.
-static unsigned int ParseVorbisTime(unsigned int samplerate_hz, char *value)
-{
-    char *num_start, *p;
-    unsigned int result = 0;
-    char c;
-
-    if (strchr(value, ':') == NULL)
-    {
-	return atoi(value);
-    }
-
-    result = 0;
-    num_start = value;
-
-    for (p = value; *p != '\0'; ++p)
-    {
-        if (*p == '.' || *p == ':')
-        {
-            c = *p; *p = '\0';
-            result = result * 60 + atoi(num_start);
-            num_start = p + 1;
-            *p = c;
-        }
-
-        if (*p == '.')
-        {
-            return result * samplerate_hz
-	         + (unsigned int) (atof(p) * samplerate_hz);
-        }
-    }
-
-    return (result * 60 + atoi(num_start)) * samplerate_hz;
-}
-
-// Given a vorbis comment string (eg. "LOOP_START=12345"), set fields
-// in the metadata structure as appropriate.
-static void ParseVorbisComment(file_metadata_t *metadata, char *comment)
-{
-    char *eq, *key, *value;
-
-    eq = strchr(comment, '=');
-
-    if (eq == NULL)
-    {
-        return;
-    }
-
-    key = comment;
-    *eq = '\0';
-    value = eq + 1;
-
-    if (!strcmp(key, LOOP_START_TAG))
-    {
-        metadata->start_time = ParseVorbisTime(metadata->samplerate_hz, value);
-    }
-    else if (!strcmp(key, LOOP_END_TAG))
-    {
-        metadata->end_time = ParseVorbisTime(metadata->samplerate_hz, value);
-    }
-}
-
-// Parse a vorbis comments structure, reading from the given file.
-static void ParseVorbisComments(file_metadata_t *metadata, FILE *fs)
-{
-    uint32_t buf;
-    unsigned int num_comments, i, comment_len;
-    char *comment;
-
-    // We must have read the sample rate already from an earlier header.
-    if (metadata->samplerate_hz == 0)
-    {
-	return;
-    }
-
-    // Skip the starting part we don't care about.
-    if (fread(&buf, 4, 1, fs) < 1)
-    {
-        return;
-    }
-    if (fseek(fs, LONG(buf), SEEK_CUR) != 0)
-    {
-	return;
-    }
-
-    // Read count field for number of comments.
-    if (fread(&buf, 4, 1, fs) < 1)
-    {
-        return;
-    }
-    num_comments = LONG(buf);
-
-    // Read each individual comment.
-    for (i = 0; i < num_comments; ++i)
-    {
-        // Read length of comment.
-        if (fread(&buf, 4, 1, fs) < 1)
-	{
-            return;
-	}
-
-        comment_len = LONG(buf);
-
-        // Read actual comment data into string buffer.
-        comment = calloc(1, comment_len + 1);
-        if (comment == NULL
-         || fread(comment, 1, comment_len, fs) < comment_len)
-        {
-            free(comment);
-            break;
-        }
-
-        // Parse comment string.
-        ParseVorbisComment(metadata, comment);
-        free(comment);
-    }
-}
-
-static void ParseFlacStreaminfo(file_metadata_t *metadata, FILE *fs)
-{
-    byte buf[34];
-
-    // Read block data.
-    if (fread(buf, sizeof(buf), 1, fs) < 1)
-    {
-        return;
-    }
-
-    // We only care about sample rate and song length.
-    metadata->samplerate_hz = (buf[10] << 12) | (buf[11] << 4)
-                            | (buf[12] >> 4);
-    // Song length is actually a 36 bit field, but 32 bits should be
-    // enough for everybody.
-    //metadata->song_length = (buf[14] << 24) | (buf[15] << 16)
-    //                      | (buf[16] << 8) | buf[17];
-}
-
-static void ParseFlacFile(file_metadata_t *metadata, FILE *fs)
-{
-    byte header[4];
-    unsigned int block_type;
-    size_t block_len;
-    boolean last_block;
-
-    for (;;)
-    {
-        long pos = -1;
-
-        // Read METADATA_BLOCK_HEADER:
-        if (fread(header, 4, 1, fs) < 1)
-        {
-            return;
-        }
-
-        block_type = header[0] & ~0x80;
-        last_block = (header[0] & 0x80) != 0;
-        block_len = (header[1] << 16) | (header[2] << 8) | header[3];
-
-        pos = ftell(fs);
-        if (pos < 0)
-        {
-            return;
-        }
-
-        if (block_type == FLAC_STREAMINFO)
-        {
-            ParseFlacStreaminfo(metadata, fs);
-        }
-        else if (block_type == FLAC_VORBIS_COMMENT)
-        {
-            ParseVorbisComments(metadata, fs);
-        }
-
-        if (last_block)
-        {
-            break;
-        }
-
-        // Seek to start of next block.
-        if (fseek(fs, pos + block_len, SEEK_SET) != 0)
-        {
-            return;
-        }
-    }
-}
-
-static void ParseOggIdHeader(file_metadata_t *metadata, FILE *fs)
-{
-    byte buf[21];
-
-    if (fread(buf, sizeof(buf), 1, fs) < 1)
-    {
-        return;
-    }
-
-    metadata->samplerate_hz = (buf[8] << 24) | (buf[7] << 16)
-                            | (buf[6] << 8) | buf[5];
-}
-
-static void ParseOggFile(file_metadata_t *metadata, FILE *fs)
-{
-    byte buf[7];
-    unsigned int offset;
-
-    // Scan through the start of the file looking for headers. They
-    // begin '[byte]vorbis' where the byte value indicates header type.
-    memset(buf, 0, sizeof(buf));
-
-    for (offset = 0; offset < 100 * 1024; ++offset)
-    {
-	// buf[] is used as a sliding window. Each iteration, we
-	// move the buffer one byte to the left and read an extra
-	// byte onto the end.
-        memmove(buf, buf + 1, sizeof(buf) - 1);
-
-        if (fread(&buf[6], 1, 1, fs) < 1)
-        {
-            return;
-        }
-
-        if (!memcmp(buf + 1, "vorbis", 6))
-        {
-            switch (buf[0])
-            {
-                case OGG_ID_HEADER:
-                    ParseOggIdHeader(metadata, fs);
-                    break;
-                case OGG_COMMENT_HEADER:
-		    ParseVorbisComments(metadata, fs);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-}
-
-static void ReadLoopPoints(const char *filename, file_metadata_t *metadata)
-{
-    FILE *fs;
-    char header[4];
-
-    metadata->valid = false;
-    metadata->samplerate_hz = 0;
-    metadata->start_time = 0;
-    metadata->end_time = -1;
-
-    fs = M_fopen(filename, "rb");
-
-    if (fs == NULL)
-    {
-        return;
-    }
-
-    // Check for a recognized file format; use the first four bytes
-    // of the file.
-
-    if (fread(header, 4, 1, fs) < 1)
-    {
-        fclose(fs);
-        return;
-    }
-
-    if (memcmp(header, FLAC_HEADER, 4) == 0)
-    {
-        ParseFlacFile(metadata, fs);
-    }
-    else if (memcmp(header, OGG_HEADER, 4) == 0)
-    {
-        ParseOggFile(metadata, fs);
-    }
-
-    fclose(fs);
-
-    // Only valid if at the very least we read the sample rate.
-    metadata->valid = metadata->samplerate_hz > 0;
-
-    // If start and end time are both zero, ignore the loop tags.
-    // This is consistent with other source ports.
-    if (metadata->start_time == 0 && metadata->end_time == 0)
-    {
-        metadata->valid = false;
-    }
-}
-#endif // !USE_SDL_MIXER_LOOPING
-
-// Given a MUS lump, look up a substitute MUS file to play instead
-// (or NULL to just use normal MIDI playback).
-
-static const char *GetSubstituteMusicFile(void *data, size_t data_len)
-{
-    sha1_context_t context;
-    sha1_digest_t hash;
-    const char *filename;
-    char hash_str[sizeof(sha1_digest_t) * 2 + 1];
-    unsigned int i;
-
-    // Don't bother doing a hash if we're never going to find anything.
-    if (subst_music_len == 0)
-    {
-        return NULL;
-    }
-
-    SHA1_Init(&context);
-    SHA1_Update(&context, data, data_len);
-    SHA1_Final(hash, &context);
-
-    // Build a string representation of the hash.
-    for (i = 0; i < sizeof(sha1_digest_t); ++i)
-    {
-        M_snprintf(hash_str + i * 2, sizeof(hash_str) - i * 2,
-                   "%02x", hash[i]);
-    }
-
-    // Look for a hash that matches.
-    // The substitute mapping list can (intentionally) contain multiple
-    // filename mappings for the same hash. This allows us to try
-    // different files and fall back if our first choice isn't found.
-
-    filename = NULL;
-
-    for (i = 0; i < subst_music_len; ++i)
-    {
-        if (M_StringStartsWith(hash_str, subst_music[i].hash_prefix))
-        {
-            filename = subst_music[i].filename;
-
-            // If the file exists, then use this file in preference to
-            // any fallbacks. But we always return a filename if it's
-            // in the list, even if it's just so we can print an error
-            // message to the user saying it doesn't exist.
-            if (M_FileExists(filename))
-            {
-                break;
-            }
-        }
-    }
-
-    return filename;
-}
-
-static char *GetFullPath(const char *musicdir, const char *path)
-{
-    char *result;
-    char *systemized_path;
-
-    // Starting with directory separator means we have an absolute path,
-    // so just return it.
-    if (path[0] == DIR_SEPARATOR)
-    {
-        return M_StringDuplicate(path);
-    }
-
-#ifdef _WIN32
-    // d:\path\...
-    if (isalpha(path[0]) && path[1] == ':' && path[2] == DIR_SEPARATOR)
-    {
-        return M_StringDuplicate(path);
-    }
-#endif
-
-    // Paths in the substitute filenames can contain Unix-style /
-    // path separators, but we should convert this to the separator
-    // for the native platform.
-    systemized_path = M_StringReplace(path, "/", DIR_SEPARATOR_S);
-
-    // Copy config filename and cut off the filename to just get the
-    // parent dir.
-    result = M_StringJoin(musicdir, systemized_path, NULL);
-    free(systemized_path);
-
-    return result;
-}
-
-// If filename ends with .{ext}, check if a .ogg, .flac or .mp3 exists with
-// that name, returning it if found. If none exist, NULL is returned. If the
-// filename doesn't end with .{ext} then it just acts as a wrapper around
-// GetFullPath().
-static char *ExpandFileExtension(const char *musicdir, const char *filename)
-{
-    static const char *extns[] = {".flac", ".ogg", ".mp3"};
-    char *replaced, *result;
-    int i;
-
-    if (!M_StringEndsWith(filename, ".{ext}"))
-    {
-        return GetFullPath(musicdir, filename);
-    }
-
-    for (i = 0; i < arrlen(extns); ++i)
-    {
-        replaced = M_StringReplace(filename, ".{ext}", extns[i]);
-        result = GetFullPath(musicdir, replaced);
-        free(replaced);
-        if (M_FileExists(result))
-        {
-            return result;
-        }
-        free(result);
-    }
-
-    return NULL;
-}
-
-// Add a substitute music file to the lookup list.
-static void AddSubstituteMusic(const char *musicdir, const char *hash_prefix,
-                               const char *filename)
-{
-    subst_music_t *s;
-    char *path;
-
-    path = ExpandFileExtension(musicdir, filename);
-    if (path == NULL)
-    {
-        return;
-    }
-
-    ++subst_music_len;
-    subst_music =
-        I_Realloc(subst_music, sizeof(subst_music_t) * subst_music_len);
-    s = &subst_music[subst_music_len - 1];
-    s->hash_prefix = hash_prefix;
-    s->filename = path;
-}
-
-static const char *ReadHashPrefix(char *line)
-{
-    char *result;
-    char *p;
-    int i, len;
-
-    for (p = line; *p != '\0' && !isspace(*p) && *p != '='; ++p)
-    {
-        if (!isxdigit(*p))
-        {
-            return NULL;
-        }
-    }
-
-    len = p - line;
-    if (len == 0 || len > sizeof(sha1_digest_t) * 2)
-    {
-        return NULL;
-    }
-
-    result = malloc(len + 1);
-    if (result == NULL)
-    {
-        return NULL;
-    }
-
-    for (i = 0; i < len; ++i)
-    {
-        result[i] = tolower(line[i]);
-    }
-    result[len] = '\0';
-
-    return result;
-}
-
-// Parse a line from substitute music configuration file; returns error
-// message or NULL for no error.
-
-static const char *ParseSubstituteLine(char *musicdir, char *line)
-{
-    const char *hash_prefix;
-    char *filename;
-    char *p;
-
-    // Strip out comments if present.
-    p = strchr(line, '#');
-    if (p != NULL)
-    {
-        while (p > line && isspace(*(p - 1)))
-        {
-            --p;
-        }
-        *p = '\0';
-    }
-
-    // Skip leading spaces.
-    for (p = line; *p != '\0' && isspace(*p); ++p);
-
-    // Empty line? This includes comment lines now that comments have
-    // been stripped.
-    if (*p == '\0')
-    {
-        return NULL;
-    }
-
-    hash_prefix = ReadHashPrefix(p);
-    if (hash_prefix == NULL)
-    {
-        return "Invalid hash prefix";
-    }
-
-    p += strlen(hash_prefix);
-
-    // Skip spaces.
-    for (; *p != '\0' && isspace(*p); ++p);
-
-    if (*p != '=')
-    {
-        return "Expected '='";
-    }
-
-    ++p;
-
-    // Skip spaces.
-    for (; *p != '\0' && isspace(*p); ++p);
-
-    filename = p;
-
-    // We're now at the filename. Cut off trailing space characters.
-    while (strlen(p) > 0 && isspace(p[strlen(p) - 1]))
-    {
-        p[strlen(p) - 1] = '\0';
-    }
-
-    if (strlen(p) == 0)
-    {
-        return "No filename specified for music substitution";
-    }
-
-    // Expand full path and add to our database of substitutes.
-    AddSubstituteMusic(musicdir, hash_prefix, filename);
-
-    return NULL;
-}
-
-// Read a substitute music configuration file.
-
-static boolean ReadSubstituteConfig(char *musicdir, const char *filename)
-{
-    char *buffer;
-    char *line;
-    int linenum = 1;
-
-    // This unnecessarily opens the file twice...
-    if (!M_FileExists(filename))
-    {
-        return false;
-    }
-
-    M_ReadFile(filename, (byte **) &buffer);
-
-    line = buffer;
-
-    while (line != NULL)
-    {
-        const char *error;
-        char *next;
-
-        // find end of line
-        char *eol = strchr(line, '\n');
-        if (eol != NULL)
-        {
-            // change the newline into NUL
-            *eol = '\0';
-            next = eol + 1;
-        }
-        else
-        {
-            // end of buffer
-            next = NULL;
-        }
-
-        error = ParseSubstituteLine(musicdir, line);
-
-        if (error != NULL)
-        {
-            fprintf(stderr, "%s:%i: Error: %s\n", filename, linenum, error);
-        }
-
-        ++linenum;
-        line = next;
-    }
-
-    Z_Free(buffer);
-
-    return true;
-}
-
-// Find substitute configs and try to load them.
-
-static void LoadSubstituteConfigs(void)
-{
-    glob_t *glob;
-    char *musicdir;
-    const char *path;
-    unsigned int old_music_len;
-    unsigned int i;
-
-    // We can configure the path to music packs using the music_pack_path
-    // configuration variable. Otherwise we use the current directory, or
-    // $configdir/music to look for .cfg files.
-    if (strcmp(music_pack_path, "") != 0)
-    {
-        musicdir = M_StringJoin(music_pack_path, DIR_SEPARATOR_S, NULL);
-    }
-    else if (!strcmp(configdir, exedir))
-    {
-        musicdir = M_StringDuplicate("");
-    }
-    else
-    {
-        musicdir = M_StringJoin(configdir, "music", DIR_SEPARATOR_S, NULL);
-    }
-
-    // Load all music packs, by searching for .cfg files.
-    glob = I_StartGlob(musicdir, "*.cfg", GLOB_FLAG_SORTED|GLOB_FLAG_NOCASE);
-    for (;;)
-    {
-        path = I_NextGlob(glob);
-        if (path == NULL)
-        {
-            break;
-        }
-        ReadSubstituteConfig(musicdir, path);
-    }
-    I_EndGlob(glob);
-
-    if (subst_music_len > 0)
-    {
-        printf("Loaded %u music substitutions from config files.\n",
-               subst_music_len);
-    }
-
-    old_music_len = subst_music_len;
-
-    // Add entries from known filenames list. We add this after those from the
-    // configuration files, so that the entries here can be overridden.
-    for (i = 0; i < arrlen(known_filenames); ++i)
-    {
-        AddSubstituteMusic(musicdir, known_filenames[i].hash_prefix,
-                           known_filenames[i].filename);
-    }
-
-    if (subst_music_len > old_music_len)
-    {
-        printf("Configured %u music substitutions based on filename.\n",
-               subst_music_len - old_music_len);
-    }
-
-    free(musicdir);
-}
-
-// Returns true if the given lump number is a music lump that should
-// be included in substitute configs.
-// Identifying music lumps by name is not feasible; some games (eg.
-// Heretic, Hexen) don't have a common naming pattern for music lumps.
-
-static boolean IsMusicLump(int lumpnum)
-{
-    byte *data;
-    boolean result;
-
-    if (W_LumpLength(lumpnum) < 4)
-    {
-        return false;
-    }
-
-    data = W_CacheLumpNum(lumpnum, PU_STATIC);
-
-    result = memcmp(data, MUS_HEADER_MAGIC, 4) == 0
-          || memcmp(data, MID_HEADER_MAGIC, 4) == 0;
-
-    W_ReleaseLumpNum(lumpnum);
-
-    return result;
-}
-
-// Dump an example config file containing checksums for all MIDI music
-// found in the WAD directory.
-
-static void DumpSubstituteConfig(const char *filename)
-{
-    sha1_context_t context;
-    sha1_digest_t digest;
-    char name[9];
-    byte *data;
-    FILE *fs;
-    unsigned int lumpnum;
-    size_t h;
-
-    fs = M_fopen(filename, "w");
-
-    if (fs == NULL)
-    {
-        I_Error("Failed to open %s for writing", filename);
-        return;
-    }
-
-    fprintf(fs, "# Example %s substitute MIDI file.\n\n", PACKAGE_NAME);
-    fprintf(fs, "# SHA1 hash                              = filename\n");
-
-    for (lumpnum = 0; lumpnum < numlumps; ++lumpnum)
-    {
-        strncpy(name, lumpinfo[lumpnum]->name, 8);
-        name[8] = '\0';
-
-        if (!IsMusicLump(lumpnum))
-        {
-            continue;
-        }
-
-        // Calculate hash.
-        data = W_CacheLumpNum(lumpnum, PU_STATIC);
-        SHA1_Init(&context);
-        SHA1_Update(&context, data, W_LumpLength(lumpnum));
-        SHA1_Final(digest, &context);
-        W_ReleaseLumpNum(lumpnum);
-
-        // Print line.
-        for (h = 0; h < sizeof(sha1_digest_t); ++h)
-        {
-            fprintf(fs, "%02x", digest[h]);
-        }
-
-        fprintf(fs, " = %s.ogg\n", name);
-    }
-
-    fprintf(fs, "\n");
-    fclose(fs);
-
-    printf("Substitute MIDI config file written to %s.\n", filename);
-    I_Quit();
-}
-
-// Shutdown music
-
-static void I_MP_ShutdownMusic(void)
-{
-    if (music_initialized)
-    {
-        Mix_HaltMusic();
-        music_initialized = false;
-
-        if (sdl_was_initialized)
-        {
-            Mix_CloseAudio();
-            SDL_QuitSubSystem(SDL_INIT_AUDIO);
-            sdl_was_initialized = false;
-        }
-    }
-}
-
-static boolean SDLIsInitialized(void)
-{
-    int freq, channels;
-    Uint16 format;
-
-    return Mix_QuerySpec(&freq, &format, &channels) != 0;
-}
-
-#if !USE_SDL_MIXER_LOOPING
-// Callback function that is invoked to track current track position.
-void TrackPositionCallback(int chan, void *stream, int len, void *udata)
-{
-    // Position is doubled up twice: for 16-bit samples and for stereo.
-    current_track_pos += len / 4;
-}
-#endif // !USE_SDL_MIXER_LOOPING
-
-// Initialize music subsystem
-static boolean I_MP_InitMusic(void)
-{
-    int i;
-
-    //!
-    // @category obscure
-    // @arg <file>
-    //
-    // Read all MIDI files from loaded WAD files, dump an example
-    // substitution music config file to the specified file, and quit.
-    //
-    i = M_CheckParmWithArgs("-dumpsubstconfig", 1);
-
-    if (i > 0)
-    {
-        DumpSubstituteConfig(myargv[i + 1]);
-    }
-
-    // If we're in GENMIDI mode, try to load sound packs.
-    LoadSubstituteConfigs();
-
-    // We can't initialize if we don't have any substitute files to work with.
-    // If so, don't bother with SDL initialization etc.
-    if (subst_music_len == 0)
-    {
-        return false;
-    }
-
-    // If SDL_mixer is not initialized, we have to initialize it
-    // and have the responsibility to shut it down later on.
-    if (SDLIsInitialized())
-    {
-        music_initialized = true;
-    }
-    else if (SDL_Init(SDL_INIT_AUDIO) < 0)
-    {
-        fprintf(stderr, "Unable to set up sound.\n");
-    }
-    else if (Mix_OpenAudioDevice(snd_samplerate, AUDIO_S16SYS, 2, 1024, NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
-    {
-        fprintf(stderr, "Error initializing SDL_mixer: %s\n",
-                Mix_GetError());
-        SDL_QuitSubSystem(SDL_INIT_AUDIO);
-    }
-    else
-    {
-        SDL_PauseAudio(0);
-
-        sdl_was_initialized = true;
-        music_initialized = true;
-    }
-
-    // Initialize SDL_Mixer for digital music playback
-    Mix_Init(MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3);
-
-#if !USE_SDL_MIXER_LOOPING
-    // Register an effect function to track the music position.
-    Mix_RegisterEffect(MIX_CHANNEL_POST, TrackPositionCallback, NULL, NULL);
-#endif // !USE_SDL_MIXER_LOOPING
-
-    return music_initialized;
-}
-
-// Set music volume (0 - 127)
-
-static void I_MP_SetMusicVolume(int volume)
-{
-    Mix_VolumeMusic((volume * MIX_MAX_VOLUME) / 127);
-}
-
-// Start playing a mid
-
-static void I_MP_PlaySong(void *handle, boolean looping)
-{
-    int loops;
-
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    if (handle == NULL)
-    {
-        return;
-    }
-
-    current_track_music = (Mix_Music *) handle;
-    current_track_loop = looping;
-
-    if (looping)
-    {
-        loops = -1;
-    }
-    else
-    {
-        loops = 1;
-    }
-
-#if !USE_SDL_MIXER_LOOPING
-    // Don't loop when playing substitute music, as we do it
-    // ourselves instead.
-    if (file_metadata.valid)
-    {
-        loops = 1;
-        SDL_LockAudio();
-        current_track_pos = 0;  // start of track
-        SDL_UnlockAudio();
-    }
-#endif // !USE_SDL_MIXER_LOOPING
-
-    if (Mix_PlayMusic(current_track_music, loops) == -1)
-    {
-        fprintf(stderr, "I_MP_PlaySong: Error starting track: %s\n",
-                Mix_GetError());
-    }
-}
-
-static void I_MP_PauseSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    Mix_PauseMusic();
-}
-
-static void I_MP_ResumeSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    Mix_ResumeMusic();
-}
-
-static void I_MP_StopSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    Mix_HaltMusic();
-    current_track_music = NULL;
-}
-
-static void I_MP_UnRegisterSong(void *handle)
-{
-    Mix_Music *music = (Mix_Music *) handle;
-
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    if (handle == NULL)
-    {
-        return;
-    }
-
-    Mix_FreeMusic(music);
-}
-
-static void *I_MP_RegisterSong(void *data, int len)
-{
-    const char *filename;
-    Mix_Music *music;
-
-    if (!music_initialized)
-    {
-        return NULL;
-    }
-
-    // See if we're substituting this MUS for a high-quality replacement.
-    filename = GetSubstituteMusicFile(data, len);
-    if (filename == NULL)
-    {
-        return NULL;
-    }
-
-    music = Mix_LoadMUS(filename);
-    if (music == NULL)
-    {
-        // Fall through and play MIDI normally, but print an error
-        // message.
-        fprintf(stderr, "Failed to load substitute music file: %s: %s\n",
-                filename, Mix_GetError());
-        return NULL;
-    }
-
-#if !USE_SDL_MIXER_LOOPING
-    // Read loop point metadata from the file so that we know where
-    // to loop the music.
-    ReadLoopPoints(filename, &file_metadata);
-#endif // !USE_SDL_MIXER_LOOPING
-    return music;
-}
-
-// Is the song playing?
-static boolean I_MP_MusicIsPlaying(void)
-{
-    if (!music_initialized)
-    {
-        return false;
-    }
-
-    return Mix_PlayingMusic();
-}
-
-#if !USE_SDL_MIXER_LOOPING
-// Get position in substitute music track, in seconds since start of track.
-static double GetMusicPosition(void)
-{
-    unsigned int music_pos;
-    int freq;
-
-    Mix_QuerySpec(&freq, NULL, NULL);
-
-    SDL_LockAudio();
-    music_pos = current_track_pos;
-    SDL_UnlockAudio();
-
-    return (double) music_pos / freq;
-}
-
-static void RestartCurrentTrack(void)
-{
-    double start = (double) file_metadata.start_time
-                 / file_metadata.samplerate_hz;
-
-    // If the track finished we need to restart it.
-    if (current_track_music != NULL)
-    {
-        Mix_PlayMusic(current_track_music, 1);
-    }
-
-    Mix_SetMusicPosition(start);
-    SDL_LockAudio();
-    current_track_pos = file_metadata.start_time;
-    SDL_UnlockAudio();
-}
-#endif // !USE_SDL_MIXER_LOOPING
-
-// Poll music position; if we have passed the loop point end position
-// then we need to go back.
-static void I_MP_PollMusic(void)
-{
-#if !USE_SDL_MIXER_LOOPING
-    // When playing substitute tracks, loop tags only apply if we're playing
-    // a looping track. Tracks like the title screen music have the loop
-    // tags ignored.
-    if (current_track_loop && file_metadata.valid)
-    {
-        double end = (double) file_metadata.end_time
-                   / file_metadata.samplerate_hz;
-
-        // If we have reached the loop end point then we have to take action.
-        if (file_metadata.end_time >= 0 && GetMusicPosition() >= end)
-        {
-            RestartCurrentTrack();
-        }
-
-        // Have we reached the actual end of track (not loop end)?
-        if (!Mix_PlayingMusic())
-        {
-            RestartCurrentTrack();
-        }
-    }
-#endif // !USE_SDL_MIXER_LOOPING
-}
-
 const music_module_t music_pack_module =
 {
-    NULL,
-    0,
-    I_MP_InitMusic,
-    I_MP_ShutdownMusic,
-    I_MP_SetMusicVolume,
-    I_MP_PauseSong,
-    I_MP_ResumeSong,
-    I_MP_RegisterSong,
-    I_MP_UnRegisterSong,
-    I_MP_PlaySong,
-    I_MP_StopSong,
-    I_MP_MusicIsPlaying,
-    I_MP_PollMusic,
+  NULL,
+  0,
+  i_null_init_music,
+  i_null_shutdown_music,
+  i_null_set_music_volume,
+  i_null_pause_song,
+  i_null_resume_song,
+  i_null_register_song,
+  i_null_unregister_song,
+  i_null_play_song,
+  i_null_stop_song,
+  i_null_musicisplaying,
+  i_null_pollmusic,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-#else // DISABLE_SDL2MIXER
-
-
-static boolean I_NULL_InitMusic(void)
+static boolean i_null_init_music(void)
 {
-    return false;
+  return false;
 }
 
-
-static void I_NULL_ShutdownMusic(void)
+static void i_null_shutdown_music(void)
 {
+  return;
 }
 
-
-static void I_NULL_SetMusicVolume(int volume)
+static void i_null_set_music_volume(int volume)
 {
+  return;
 }
 
-
-static void I_NULL_PauseSong(void)
+static void i_null_pause_song(void)
 {
+  return;
 }
 
-
-static void I_NULL_ResumeSong(void)
+static void i_null_resume_song(void)
 {
+  return;
 }
 
-
-static void *I_NULL_RegisterSong(void *data, int len)
+static void *i_null_register_song(void *data, int len)
 {
-    return NULL;
+  return NULL;
 }
 
-
-static void I_NULL_UnRegisterSong(void *handle)
+static void i_null_unregister_song(void *handle)
 {
+  return;
 }
 
-
-static void I_NULL_PlaySong(void *handle, boolean looping)
+static void i_null_play_song(void *handle, boolean looping)
 {
+  return;
 }
 
-
-static void I_NULL_StopSong(void)
+static void i_null_stop_song(void)
 {
+  return;
 }
 
-
-static boolean I_NULL_MusicIsPlaying(void)
+static boolean i_null_musicisplaying(void)
 {
-    return false;
+  return false;
 }
 
-
-static void I_NULL_PollMusic(void)
+static void i_null_pollmusic(void)
 {
+  return;
 }
 
-const music_module_t music_pack_module =
-{
-    NULL,
-    0,
-    I_NULL_InitMusic,
-    I_NULL_ShutdownMusic,
-    I_NULL_SetMusicVolume,
-    I_NULL_PauseSong,
-    I_NULL_ResumeSong,
-    I_NULL_RegisterSong,
-    I_NULL_UnRegisterSong,
-    I_NULL_PlaySong,
-    I_NULL_StopSong,
-    I_NULL_MusicIsPlaying,
-    I_NULL_PollMusic,
-};
-
-
-#endif // DISABLE_SDL2MIXER
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/i_oplmusic.c b/games/NXDoom/src/i_oplmusic.c
deleted file mode 100644
index 54e7dac3c..000000000
--- a/games/NXDoom/src/i_oplmusic.c
+++ /dev/null
@@ -1,1898 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   System interface for music.
-//
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "memio.h"
-#include "mus2mid.h"
-
-#include "deh_main.h"
-#include "i_sound.h"
-#include "i_swap.h"
-#include "m_misc.h"
-#include "w_wad.h"
-#include "z_zone.h"
-
-#include "opl.h"
-#include "midifile.h"
-
-// #define OPL_MIDI_DEBUG
-
-#define MAXMIDLENGTH (96 * 1024)
-#define GENMIDI_NUM_INSTRS  128
-#define GENMIDI_NUM_PERCUSSION 47
-
-#define GENMIDI_HEADER          "#OPL_II#"
-#define GENMIDI_FLAG_FIXED      0x0001         /* fixed pitch */
-#define GENMIDI_FLAG_2VOICE     0x0004         /* double voice (OPL3) */
-
-#define PERCUSSION_LOG_LEN 16
-
-typedef PACKED_STRUCT (
-{
-    byte tremolo;
-    byte attack;
-    byte sustain;
-    byte waveform;
-    byte scale;
-    byte level;
-}) genmidi_op_t;
-
-typedef PACKED_STRUCT (
-{
-    genmidi_op_t modulator;
-    byte feedback;
-    genmidi_op_t carrier;
-    byte unused;
-    short base_note_offset;
-}) genmidi_voice_t;
-
-typedef PACKED_STRUCT (
-{
-    unsigned short flags;
-    byte fine_tuning;
-    byte fixed_note;
-
-    genmidi_voice_t voices[2];
-}) genmidi_instr_t;
-
-// Data associated with a channel of a track that is currently playing.
-
-typedef struct
-{
-    // The instrument currently used for this track.
-
-    genmidi_instr_t *instrument;
-
-    // Volume level
-
-    int volume;
-    int volume_base;
-
-    // Pan
-
-    int pan;
-
-    // Pitch bend value:
-
-    int bend;
-
-} opl_channel_data_t;
-
-// Data associated with a track that is currently playing.
-
-typedef struct
-{
-    // Track iterator used to read new events.
-
-    midi_track_iter_t *iter;
-} opl_track_data_t;
-
-typedef struct opl_voice_s opl_voice_t;
-
-struct opl_voice_s
-{
-    // Index of this voice:
-    int index;
-
-    // The operators used by this voice:
-    int op1, op2;
-
-    // Array used by voice:
-    int array;
-
-    // Currently-loaded instrument data
-    genmidi_instr_t *current_instr;
-
-    // The voice number in the instrument to use.
-    // This is normally set to zero; if this is a double voice
-    // instrument, it may be one.
-    unsigned int current_instr_voice;
-
-    // The channel currently using this voice.
-    opl_channel_data_t *channel;
-
-    // The midi key that this voice is playing.
-    unsigned int key;
-
-    // The note being played.  This is normally the same as
-    // the key, but if the instrument is a fixed pitch
-    // instrument, it is different.
-    unsigned int note;
-
-    // The frequency value being used.
-    unsigned int freq;
-
-    // The volume of the note being played on this channel.
-    unsigned int note_volume;
-
-    // The current volume (register value) that has been set for this channel.
-    unsigned int car_volume;
-    unsigned int mod_volume;
-
-    // Pan.
-    unsigned int reg_pan;
-
-    // Priority.
-    unsigned int priority;
-};
-
-// Operators used by the different voices.
-
-static const int voice_operators[2][OPL_NUM_VOICES] = {
-    { 0x00, 0x01, 0x02, 0x08, 0x09, 0x0a, 0x10, 0x11, 0x12 },
-    { 0x03, 0x04, 0x05, 0x0b, 0x0c, 0x0d, 0x13, 0x14, 0x15 }
-};
-
-// Frequency values to use for each note.
-
-static const unsigned short frequency_curve[] = {
-
-    0x133, 0x133, 0x134, 0x134, 0x135, 0x136, 0x136, 0x137,   // -1
-    0x137, 0x138, 0x138, 0x139, 0x139, 0x13a, 0x13b, 0x13b,
-    0x13c, 0x13c, 0x13d, 0x13d, 0x13e, 0x13f, 0x13f, 0x140,
-    0x140, 0x141, 0x142, 0x142, 0x143, 0x143, 0x144, 0x144,
-
-    0x145, 0x146, 0x146, 0x147, 0x147, 0x148, 0x149, 0x149,   // -2
-    0x14a, 0x14a, 0x14b, 0x14c, 0x14c, 0x14d, 0x14d, 0x14e,
-    0x14f, 0x14f, 0x150, 0x150, 0x151, 0x152, 0x152, 0x153,
-    0x153, 0x154, 0x155, 0x155, 0x156, 0x157, 0x157, 0x158,
-
-    // These are used for the first seven MIDI note values:
-
-    0x158, 0x159, 0x15a, 0x15a, 0x15b, 0x15b, 0x15c, 0x15d,   // 0
-    0x15d, 0x15e, 0x15f, 0x15f, 0x160, 0x161, 0x161, 0x162,
-    0x162, 0x163, 0x164, 0x164, 0x165, 0x166, 0x166, 0x167,
-    0x168, 0x168, 0x169, 0x16a, 0x16a, 0x16b, 0x16c, 0x16c,
-
-    0x16d, 0x16e, 0x16e, 0x16f, 0x170, 0x170, 0x171, 0x172,   // 1
-    0x172, 0x173, 0x174, 0x174, 0x175, 0x176, 0x176, 0x177,
-    0x178, 0x178, 0x179, 0x17a, 0x17a, 0x17b, 0x17c, 0x17c,
-    0x17d, 0x17e, 0x17e, 0x17f, 0x180, 0x181, 0x181, 0x182,
-
-    0x183, 0x183, 0x184, 0x185, 0x185, 0x186, 0x187, 0x188,   // 2
-    0x188, 0x189, 0x18a, 0x18a, 0x18b, 0x18c, 0x18d, 0x18d,
-    0x18e, 0x18f, 0x18f, 0x190, 0x191, 0x192, 0x192, 0x193,
-    0x194, 0x194, 0x195, 0x196, 0x197, 0x197, 0x198, 0x199,
-
-    0x19a, 0x19a, 0x19b, 0x19c, 0x19d, 0x19d, 0x19e, 0x19f,   // 3
-    0x1a0, 0x1a0, 0x1a1, 0x1a2, 0x1a3, 0x1a3, 0x1a4, 0x1a5,
-    0x1a6, 0x1a6, 0x1a7, 0x1a8, 0x1a9, 0x1a9, 0x1aa, 0x1ab,
-    0x1ac, 0x1ad, 0x1ad, 0x1ae, 0x1af, 0x1b0, 0x1b0, 0x1b1,
-
-    0x1b2, 0x1b3, 0x1b4, 0x1b4, 0x1b5, 0x1b6, 0x1b7, 0x1b8,   // 4
-    0x1b8, 0x1b9, 0x1ba, 0x1bb, 0x1bc, 0x1bc, 0x1bd, 0x1be,
-    0x1bf, 0x1c0, 0x1c0, 0x1c1, 0x1c2, 0x1c3, 0x1c4, 0x1c4,
-    0x1c5, 0x1c6, 0x1c7, 0x1c8, 0x1c9, 0x1c9, 0x1ca, 0x1cb,
-
-    0x1cc, 0x1cd, 0x1ce, 0x1ce, 0x1cf, 0x1d0, 0x1d1, 0x1d2,   // 5
-    0x1d3, 0x1d3, 0x1d4, 0x1d5, 0x1d6, 0x1d7, 0x1d8, 0x1d8,
-    0x1d9, 0x1da, 0x1db, 0x1dc, 0x1dd, 0x1de, 0x1de, 0x1df,
-    0x1e0, 0x1e1, 0x1e2, 0x1e3, 0x1e4, 0x1e5, 0x1e5, 0x1e6,
-
-    0x1e7, 0x1e8, 0x1e9, 0x1ea, 0x1eb, 0x1ec, 0x1ed, 0x1ed,   // 6
-    0x1ee, 0x1ef, 0x1f0, 0x1f1, 0x1f2, 0x1f3, 0x1f4, 0x1f5,
-    0x1f6, 0x1f6, 0x1f7, 0x1f8, 0x1f9, 0x1fa, 0x1fb, 0x1fc,
-    0x1fd, 0x1fe, 0x1ff, 0x200, 0x201, 0x201, 0x202, 0x203,
-
-    // First note of looped range used for all octaves:
-
-    0x204, 0x205, 0x206, 0x207, 0x208, 0x209, 0x20a, 0x20b,   // 7
-    0x20c, 0x20d, 0x20e, 0x20f, 0x210, 0x210, 0x211, 0x212,
-    0x213, 0x214, 0x215, 0x216, 0x217, 0x218, 0x219, 0x21a,
-    0x21b, 0x21c, 0x21d, 0x21e, 0x21f, 0x220, 0x221, 0x222,
-
-    0x223, 0x224, 0x225, 0x226, 0x227, 0x228, 0x229, 0x22a,   // 8
-    0x22b, 0x22c, 0x22d, 0x22e, 0x22f, 0x230, 0x231, 0x232,
-    0x233, 0x234, 0x235, 0x236, 0x237, 0x238, 0x239, 0x23a,
-    0x23b, 0x23c, 0x23d, 0x23e, 0x23f, 0x240, 0x241, 0x242,
-
-    0x244, 0x245, 0x246, 0x247, 0x248, 0x249, 0x24a, 0x24b,   // 9
-    0x24c, 0x24d, 0x24e, 0x24f, 0x250, 0x251, 0x252, 0x253,
-    0x254, 0x256, 0x257, 0x258, 0x259, 0x25a, 0x25b, 0x25c,
-    0x25d, 0x25e, 0x25f, 0x260, 0x262, 0x263, 0x264, 0x265,
-
-    0x266, 0x267, 0x268, 0x269, 0x26a, 0x26c, 0x26d, 0x26e,   // 10
-    0x26f, 0x270, 0x271, 0x272, 0x273, 0x275, 0x276, 0x277,
-    0x278, 0x279, 0x27a, 0x27b, 0x27d, 0x27e, 0x27f, 0x280,
-    0x281, 0x282, 0x284, 0x285, 0x286, 0x287, 0x288, 0x289,
-
-    0x28b, 0x28c, 0x28d, 0x28e, 0x28f, 0x290, 0x292, 0x293,   // 11
-    0x294, 0x295, 0x296, 0x298, 0x299, 0x29a, 0x29b, 0x29c,
-    0x29e, 0x29f, 0x2a0, 0x2a1, 0x2a2, 0x2a4, 0x2a5, 0x2a6,
-    0x2a7, 0x2a9, 0x2aa, 0x2ab, 0x2ac, 0x2ae, 0x2af, 0x2b0,
-
-    0x2b1, 0x2b2, 0x2b4, 0x2b5, 0x2b6, 0x2b7, 0x2b9, 0x2ba,   // 12
-    0x2bb, 0x2bd, 0x2be, 0x2bf, 0x2c0, 0x2c2, 0x2c3, 0x2c4,
-    0x2c5, 0x2c7, 0x2c8, 0x2c9, 0x2cb, 0x2cc, 0x2cd, 0x2ce,
-    0x2d0, 0x2d1, 0x2d2, 0x2d4, 0x2d5, 0x2d6, 0x2d8, 0x2d9,
-
-    0x2da, 0x2dc, 0x2dd, 0x2de, 0x2e0, 0x2e1, 0x2e2, 0x2e4,   // 13
-    0x2e5, 0x2e6, 0x2e8, 0x2e9, 0x2ea, 0x2ec, 0x2ed, 0x2ee,
-    0x2f0, 0x2f1, 0x2f2, 0x2f4, 0x2f5, 0x2f6, 0x2f8, 0x2f9,
-    0x2fb, 0x2fc, 0x2fd, 0x2ff, 0x300, 0x302, 0x303, 0x304,
-
-    0x306, 0x307, 0x309, 0x30a, 0x30b, 0x30d, 0x30e, 0x310,   // 14
-    0x311, 0x312, 0x314, 0x315, 0x317, 0x318, 0x31a, 0x31b,
-    0x31c, 0x31e, 0x31f, 0x321, 0x322, 0x324, 0x325, 0x327,
-    0x328, 0x329, 0x32b, 0x32c, 0x32e, 0x32f, 0x331, 0x332,
-
-    0x334, 0x335, 0x337, 0x338, 0x33a, 0x33b, 0x33d, 0x33e,   // 15
-    0x340, 0x341, 0x343, 0x344, 0x346, 0x347, 0x349, 0x34a,
-    0x34c, 0x34d, 0x34f, 0x350, 0x352, 0x353, 0x355, 0x357,
-    0x358, 0x35a, 0x35b, 0x35d, 0x35e, 0x360, 0x361, 0x363,
-
-    0x365, 0x366, 0x368, 0x369, 0x36b, 0x36c, 0x36e, 0x370,   // 16
-    0x371, 0x373, 0x374, 0x376, 0x378, 0x379, 0x37b, 0x37c,
-    0x37e, 0x380, 0x381, 0x383, 0x384, 0x386, 0x388, 0x389,
-    0x38b, 0x38d, 0x38e, 0x390, 0x392, 0x393, 0x395, 0x397,
-
-    0x398, 0x39a, 0x39c, 0x39d, 0x39f, 0x3a1, 0x3a2, 0x3a4,   // 17
-    0x3a6, 0x3a7, 0x3a9, 0x3ab, 0x3ac, 0x3ae, 0x3b0, 0x3b1,
-    0x3b3, 0x3b5, 0x3b7, 0x3b8, 0x3ba, 0x3bc, 0x3bd, 0x3bf,
-    0x3c1, 0x3c3, 0x3c4, 0x3c6, 0x3c8, 0x3ca, 0x3cb, 0x3cd,
-
-    // The last note has an incomplete range, and loops round back to
-    // the start.  Note that the last value is actually a buffer overrun
-    // and does not fit with the other values.
-
-    0x3cf, 0x3d1, 0x3d2, 0x3d4, 0x3d6, 0x3d8, 0x3da, 0x3db,   // 18
-    0x3dd, 0x3df, 0x3e1, 0x3e3, 0x3e4, 0x3e6, 0x3e8, 0x3ea,
-    0x3ec, 0x3ed, 0x3ef, 0x3f1, 0x3f3, 0x3f5, 0x3f6, 0x3f8,
-    0x3fa, 0x3fc, 0x3fe, 0x36c,
-};
-
-// Mapping from MIDI volume level to OPL level value.
-
-static const unsigned int volume_mapping_table[] = {
-    0, 1, 3, 5, 6, 8, 10, 11,
-    13, 14, 16, 17, 19, 20, 22, 23,
-    25, 26, 27, 29, 30, 32, 33, 34,
-    36, 37, 39, 41, 43, 45, 47, 49,
-    50, 52, 54, 55, 57, 59, 60, 61,
-    63, 64, 66, 67, 68, 69, 71, 72,
-    73, 74, 75, 76, 77, 79, 80, 81,
-    82, 83, 84, 84, 85, 86, 87, 88,
-    89, 90, 91, 92, 92, 93, 94, 95,
-    96, 96, 97, 98, 99, 99, 100, 101,
-    101, 102, 103, 103, 104, 105, 105, 106,
-    107, 107, 108, 109, 109, 110, 110, 111,
-    112, 112, 113, 113, 114, 114, 115, 115,
-    116, 117, 117, 118, 118, 119, 119, 120,
-    120, 121, 121, 122, 122, 123, 123, 123,
-    124, 124, 125, 125, 126, 126, 127, 127
-};
-
-static opl_driver_ver_t opl_drv_ver = opl_doom_1_9;
-static boolean music_initialized = false;
-
-//static boolean musicpaused = false;
-static int start_music_volume;
-static int current_music_volume;
-
-// GENMIDI lump instrument data:
-
-static genmidi_instr_t *main_instrs;
-static genmidi_instr_t *percussion_instrs;
-static char (*main_instr_names)[32];
-static char (*percussion_names)[32];
-
-// Voices:
-
-static opl_voice_t voices[OPL_NUM_VOICES * 2];
-static opl_voice_t *voice_free_list[OPL_NUM_VOICES * 2];
-static opl_voice_t *voice_alloced_list[OPL_NUM_VOICES * 2];
-static int voice_free_num;
-static int voice_alloced_num;
-static int opl_opl3mode;
-static int num_opl_voices;
-
-// Data for each channel.
-
-static opl_channel_data_t channels[MIDI_CHANNELS_PER_TRACK];
-
-// Track data for playing tracks:
-
-static opl_track_data_t *tracks;
-static unsigned int num_tracks = 0;
-static unsigned int running_tracks = 0;
-static boolean song_looping;
-
-// Tempo control variables
-
-static unsigned int ticks_per_beat;
-static unsigned int us_per_beat;
-
-// Mini-log of recently played percussion instruments:
-
-static uint8_t last_perc[PERCUSSION_LOG_LEN];
-static unsigned int last_perc_count;
-
-// Configuration file variable, containing the port number for the
-// adlib chip.
-
-char *snd_dmxoption = "";
-int opl_io_port = 0x388;
-
-// If true, OPL sound channels are reversed to their correct arrangement
-// (as intended by the MIDI standard) rather than the backwards one
-// used by DMX due to a bug.
-
-static boolean opl_stereo_correct = false;
-
-// Load instrument table from GENMIDI lump:
-
-static boolean LoadInstrumentTable(void)
-{
-    byte *lump;
-
-    lump = W_CacheLumpName(DEH_String("genmidi"), PU_STATIC);
-
-    // DMX does not check header
-
-    main_instrs = (genmidi_instr_t *) (lump + strlen(GENMIDI_HEADER));
-    percussion_instrs = main_instrs + GENMIDI_NUM_INSTRS;
-    main_instr_names =
-        (char (*)[32]) (percussion_instrs + GENMIDI_NUM_PERCUSSION);
-    percussion_names = main_instr_names + GENMIDI_NUM_INSTRS;
-
-    return true;
-}
-
-// Get the next available voice from the freelist.
-
-static opl_voice_t *GetFreeVoice(void)
-{
-    opl_voice_t *result;
-    int i;
-
-    // None available?
-
-    if (voice_free_num == 0)
-    {
-        return NULL;
-    }
-
-    // Remove from free list
-
-    result = voice_free_list[0];
-
-    voice_free_num--;
-
-    for (i = 0; i < voice_free_num; i++)
-    {
-        voice_free_list[i] = voice_free_list[i + 1];
-    }
-
-    // Add to allocated list
-
-    voice_alloced_list[voice_alloced_num++] = result;
-
-    return result;
-}
-
-// Release a voice back to the freelist.
-
-static void VoiceKeyOff(opl_voice_t *voice);
-
-static void ReleaseVoice(int index)
-{
-    opl_voice_t *voice;
-    boolean double_voice;
-    int i;
-
-    // Doom 2 1.666 OPL crash emulation.
-    if (index >= voice_alloced_num)
-    {
-
-        voice_alloced_num = 0;
-        voice_free_num = 0;
-        return;
-    }
-
-    voice = voice_alloced_list[index];
-
-    VoiceKeyOff(voice);
-
-    voice->channel = NULL;
-    voice->note = 0;
-
-    double_voice = voice->current_instr_voice != 0;
-    
-    // Remove from alloced list.
-
-    voice_alloced_num--;
-
-    for (i = index; i < voice_alloced_num; i++)
-    {
-        voice_alloced_list[i] = voice_alloced_list[i + 1];
-    }
-
-    // Search to the end of the freelist (This is how Doom behaves!)
-
-    voice_free_list[voice_free_num++] = voice;
-
-    if (double_voice && opl_drv_ver < opl_doom_1_9)
-    {
-        ReleaseVoice(index);
-    }
-}
-
-// Load data to the specified operator
-
-static void LoadOperatorData(int operator, genmidi_op_t *data,
-                             boolean max_level, unsigned int *volume)
-{
-    int level;
-
-    // The scale and level fields must be combined for the level register.
-    // For the carrier wave we always set the maximum level.
-
-    level = data->scale;
-
-    if (max_level)
-    {
-        level |= 0x3f;
-    }
-    else
-    {
-        level |= data->level;
-    }
-
-    *volume = level;
-
-    OPL_WriteRegister(OPL_REGS_LEVEL + operator, level);
-    OPL_WriteRegister(OPL_REGS_TREMOLO + operator, data->tremolo);
-    OPL_WriteRegister(OPL_REGS_ATTACK + operator, data->attack);
-    OPL_WriteRegister(OPL_REGS_SUSTAIN + operator, data->sustain);
-    OPL_WriteRegister(OPL_REGS_WAVEFORM + operator, data->waveform);
-}
-
-// Set the instrument for a particular voice.
-
-static void SetVoiceInstrument(opl_voice_t *voice,
-                               genmidi_instr_t *instr,
-                               unsigned int instr_voice)
-{
-    genmidi_voice_t *data;
-    unsigned int modulating;
-
-    // Instrument already set for this channel?
-
-    if (voice->current_instr == instr
-     && voice->current_instr_voice == instr_voice)
-    {
-        return;
-    }
-
-    voice->current_instr = instr;
-    voice->current_instr_voice = instr_voice;
-
-    data = &instr->voices[instr_voice];
-
-    // Are we usind modulated feedback mode?
-
-    modulating = (data->feedback & 0x01) == 0;
-
-    // Doom loads the second operator first, then the first.
-    // The carrier is set to minimum volume until the voice volume
-    // is set in SetVoiceVolume (below).  If we are not using
-    // modulating mode, we must set both to minimum volume.
-
-    LoadOperatorData(voice->op2 | voice->array, &data->carrier, true,
-                     &voice->car_volume);
-    LoadOperatorData(voice->op1 | voice->array, &data->modulator, !modulating,
-                     &voice->mod_volume);
-
-    // Set feedback register that control the connection between the
-    // two operators.  Turn on bits in the upper nybble; I think this
-    // is for OPL3, where it turns on channel A/B.
-
-    OPL_WriteRegister((OPL_REGS_FEEDBACK + voice->index) | voice->array,
-                      data->feedback | voice->reg_pan);
-
-    // Calculate voice priority.
-
-    voice->priority = 0x0f - (data->carrier.attack >> 4)
-                    + 0x0f - (data->carrier.sustain & 0x0f);
-}
-
-static void SetVoiceVolume(opl_voice_t *voice, unsigned int volume)
-{
-    genmidi_voice_t *opl_voice;
-    unsigned int midi_volume;
-    unsigned int full_volume;
-    unsigned int car_volume;
-    unsigned int mod_volume;
-
-    voice->note_volume = volume;
-
-    opl_voice = &voice->current_instr->voices[voice->current_instr_voice];
-
-    // Multiply note volume and channel volume to get the actual volume.
-
-    midi_volume = 2 * (volume_mapping_table[voice->channel->volume] + 1);
-
-    full_volume = (volume_mapping_table[voice->note_volume] * midi_volume)
-                >> 9;
-
-    // The volume value to use in the register:
-    car_volume = 0x3f - full_volume;
-
-    // Update the volume register(s) if necessary.
-
-    if (car_volume != (voice->car_volume & 0x3f))
-    {
-        voice->car_volume = car_volume | (voice->car_volume & 0xc0);
-
-        OPL_WriteRegister((OPL_REGS_LEVEL + voice->op2) | voice->array,
-                          voice->car_volume);
-
-        // If we are using non-modulated feedback mode, we must set the
-        // volume for both voices.
-
-        if ((opl_voice->feedback & 0x01) != 0
-         && opl_voice->modulator.level != 0x3f)
-        {
-            mod_volume = opl_voice->modulator.level;
-            if (mod_volume < car_volume)
-            {
-                mod_volume = car_volume;
-            }
-
-            mod_volume |= voice->mod_volume & 0xc0;
-
-            if(mod_volume != voice->mod_volume)
-            {
-                voice->mod_volume = mod_volume;
-                OPL_WriteRegister((OPL_REGS_LEVEL + voice->op1) | voice->array,
-                                  mod_volume |
-                                  (opl_voice->modulator.scale & 0xc0));
-            }
-        }
-    }
-}
-
-static void SetVoicePan(opl_voice_t *voice, unsigned int pan)
-{
-    genmidi_voice_t *opl_voice;
-
-    voice->reg_pan = pan;
-    opl_voice = &voice->current_instr->voices[voice->current_instr_voice];;
-
-    OPL_WriteRegister((OPL_REGS_FEEDBACK + voice->index) | voice->array,
-                      opl_voice->feedback | pan);
-}
-
-// Initialize the voice table and freelist
-
-static void InitVoices(void)
-{
-    int i;
-
-    // Start with an empty free list.
-    
-    voice_free_num = num_opl_voices;
-    voice_alloced_num = 0;
-
-    // Initialize each voice.
-
-    for (i = 0; i < num_opl_voices; ++i)
-    {
-        voices[i].index = i % OPL_NUM_VOICES;
-        voices[i].op1 = voice_operators[0][i % OPL_NUM_VOICES];
-        voices[i].op2 = voice_operators[1][i % OPL_NUM_VOICES];
-        voices[i].array = (i / OPL_NUM_VOICES) << 8;
-        voices[i].current_instr = NULL;
-
-        // Add this voice to the freelist.
-
-        voice_free_list[i] = &voices[i];
-    }
-}
-
-static void SetChannelVolume(opl_channel_data_t *channel, unsigned int volume,
-                             boolean clip_start);
-
-// Set music volume (0 - 127)
-
-static void I_OPL_SetMusicVolume(int volume)
-{
-    unsigned int i;
-
-    if (current_music_volume == volume)
-    {
-        return;
-    }
-
-    // Internal state variable.
-
-    current_music_volume = volume;
-
-    // Update the volume of all voices.
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        if (i == 15)
-        {
-            SetChannelVolume(&channels[i], volume, false);
-        }
-        else
-        {
-            SetChannelVolume(&channels[i], channels[i].volume_base, false);
-        }
-    }
-}
-
-static void VoiceKeyOff(opl_voice_t *voice)
-{
-    OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array,
-                      voice->freq >> 8);
-}
-
-static opl_channel_data_t *TrackChannelForEvent(opl_track_data_t *track,
-                                                midi_event_t *event)
-{
-    unsigned int channel_num = event->data.channel.channel;
-
-    // MIDI uses track #9 for percussion, but for MUS it's track #15
-    // instead. Because DMX works on MUS data internally, we need to
-    // swap back to the MUS version of the channel number.
-    if (channel_num == 9)
-    {
-        channel_num = 15;
-    }
-    else if (channel_num == 15)
-    {
-        channel_num = 9;
-    }
-
-    return &channels[channel_num];
-}
-
-// Get the frequency that we should be using for a voice.
-
-static void KeyOffEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    opl_channel_data_t *channel;
-    int i;
-    unsigned int key;
-
-/*
-    printf("note off: channel %i, %i, %i\n",
-           event->data.channel.channel,
-           event->data.channel.param1,
-           event->data.channel.param2);
-*/
-
-    channel = TrackChannelForEvent(track, event);
-    key = event->data.channel.param1;
-
-    // Turn off voices being used to play this key.
-    // If it is a double voice instrument there will be two.
-
-    for (i = 0; i < voice_alloced_num; i++)
-    {
-        if (voice_alloced_list[i]->channel == channel
-         && voice_alloced_list[i]->key == key)
-        {
-            // Finished with this voice now.
-
-            ReleaseVoice(i);
-
-            i--;
-        }
-    }
-}
-
-// When all voices are in use, we must discard an existing voice to
-// play a new note.  Find and free an existing voice.  The channel
-// passed to the function is the channel for the new note to be
-// played.
-
-static void ReplaceExistingVoice(void)
-{
-    int i;
-    int result;
-
-    // Check the allocated voices, if we find an instrument that is
-    // of a lower priority to the new instrument, discard it.
-    // If a voice is being used to play the second voice of an instrument,
-    // use that, as second voices are non-essential.
-    // Lower numbered MIDI channels implicitly have a higher priority
-    // than higher-numbered channels, eg. MIDI channel 1 is never
-    // discarded for MIDI channel 2.
-
-    result = 0;
-
-    for (i = 0; i < voice_alloced_num; i++)
-    {
-        if (voice_alloced_list[i]->current_instr_voice != 0
-         || voice_alloced_list[i]->channel
-         >= voice_alloced_list[result]->channel)
-        {
-            result = i;
-        }
-    }
-
-    ReleaseVoice(result);
-}
-
-// Alternate versions of ReplaceExistingVoice() used when emulating old
-// versions of the DMX library used in Doom 1.666, Heretic and Hexen.
-
-static void ReplaceExistingVoiceDoom1(void)
-{
-    int i;
-    int result;
-
-    result = 0;
-
-    for (i = 0; i < voice_alloced_num; i++)
-    {
-        if (voice_alloced_list[i]->channel
-          > voice_alloced_list[result]->channel)
-        {
-            result = i;
-        }
-    }
-
-    ReleaseVoice(result);
-}
-
-static void ReplaceExistingVoiceDoom2(opl_channel_data_t *channel)
-{
-    int i;
-    int result;
-    int priority;
-
-    result = 0;
-
-    priority = 0x8000;
-
-    for (i = 0; i < voice_alloced_num - 3; i++)
-    {
-        if (voice_alloced_list[i]->priority < priority
-         && voice_alloced_list[i]->channel >= channel)
-        {
-            priority = voice_alloced_list[i]->priority;
-            result = i;
-        }
-    }
-
-    ReleaseVoice(result);
-}
-
-
-static unsigned int FrequencyForVoice(opl_voice_t *voice)
-{
-    genmidi_voice_t *gm_voice;
-    signed int freq_index;
-    unsigned int octave;
-    unsigned int sub_index;
-    signed int note;
-
-    note = voice->note;
-
-    // Apply note offset.
-    // Don't apply offset if the instrument is a fixed note instrument.
-
-    gm_voice = &voice->current_instr->voices[voice->current_instr_voice];
-
-    if ((SHORT(voice->current_instr->flags) & GENMIDI_FLAG_FIXED) == 0)
-    {
-        note += (signed short) SHORT(gm_voice->base_note_offset);
-    }
-
-    // Avoid possible overflow due to base note offset:
-
-    while (note < 0)
-    {
-        note += 12;
-    }
-
-    while (note > 95)
-    {
-        note -= 12;
-    }
-
-    freq_index = 64 + 32 * note + voice->channel->bend;
-
-    // If this is the second voice of a double voice instrument, the
-    // frequency index can be adjusted by the fine tuning field.
-
-    if (voice->current_instr_voice != 0)
-    {
-        freq_index += (voice->current_instr->fine_tuning / 2) - 64;
-    }
-
-    if (freq_index < 0)
-    {
-        freq_index = 0;
-    }
-
-    // The first 7 notes use the start of the table, while
-    // consecutive notes loop around the latter part.
-
-    if (freq_index < 284)
-    {
-        return frequency_curve[freq_index];
-    }
-
-    sub_index = (freq_index - 284) % (12 * 32);
-    octave = (freq_index - 284) / (12 * 32);
-
-    // Once the seventh octave is reached, things break down.
-    // We can only go up to octave 7 as a maximum anyway (the OPL
-    // register only has three bits for octave number), but for the
-    // notes in octave 7, the first five bits have octave=7, the
-    // following notes have octave=6.  This 7/6 pattern repeats in
-    // following octaves (which are technically impossible to
-    // represent anyway).
-
-    if (octave >= 7)
-    {
-        octave = 7;
-    }
-
-    // Calculate the resulting register value to use for the frequency.
-
-    return frequency_curve[sub_index + 284] | (octave << 10);
-}
-
-// Update the frequency that a voice is programmed to use.
-
-static void UpdateVoiceFrequency(opl_voice_t *voice)
-{
-    unsigned int freq;
-
-    // Calculate the frequency to use for this voice and update it
-    // if neccessary.
-
-    freq = FrequencyForVoice(voice);
-
-    if (voice->freq != freq)
-    {
-        OPL_WriteRegister((OPL_REGS_FREQ_1 + voice->index) | voice->array,
-                          freq & 0xff);
-        OPL_WriteRegister((OPL_REGS_FREQ_2 + voice->index) | voice->array,
-                          (freq >> 8) | 0x20);
-
-        voice->freq = freq;
-    }
-}
-
-// Program a single voice for an instrument.  For a double voice
-// instrument (GENMIDI_FLAG_2VOICE), this is called twice for each
-// key on event.
-
-static void VoiceKeyOn(opl_channel_data_t *channel,
-                       genmidi_instr_t *instrument,
-                       unsigned int instrument_voice,
-                       unsigned int note,
-                       unsigned int key,
-                       unsigned int volume)
-{
-    opl_voice_t *voice;
-
-    if (!opl_opl3mode && opl_drv_ver == opl_doom1_1_666)
-    {
-        instrument_voice = 0;
-    }
-
-    // Find a voice to use for this new note.
-
-    voice = GetFreeVoice();
-
-    if (voice == NULL)
-    {
-        return;
-    }
-
-    voice->channel = channel;
-    voice->key = key;
-
-    // Work out the note to use.  This is normally the same as
-    // the key, unless it is a fixed pitch instrument.
-
-    if ((SHORT(instrument->flags) & GENMIDI_FLAG_FIXED) != 0)
-    {
-        voice->note = instrument->fixed_note;
-    }
-    else
-    {
-        voice->note = note;
-    }
-
-    voice->reg_pan = channel->pan;
-
-    // Program the voice with the instrument data:
-
-    SetVoiceInstrument(voice, instrument, instrument_voice);
-
-    // Set the volume level.
-
-    SetVoiceVolume(voice, volume);
-
-    // Write the frequency value to turn the note on.
-
-    voice->freq = 0;
-    UpdateVoiceFrequency(voice);
-}
-
-static void KeyOnEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    genmidi_instr_t *instrument;
-    opl_channel_data_t *channel;
-    unsigned int note, key, volume, voicenum;
-    boolean double_voice;
-
-/*
-    printf("note on: channel %i, %i, %i\n",
-           event->data.channel.channel,
-           event->data.channel.param1,
-           event->data.channel.param2);
-*/
-
-    note = event->data.channel.param1;
-    key = event->data.channel.param1;
-    volume = event->data.channel.param2;
-
-    // A volume of zero means key off. Some MIDI tracks, eg. the ones
-    // in AV.wad, use a second key on with a volume of zero to mean
-    // key off.
-    if (volume <= 0)
-    {
-        KeyOffEvent(track, event);
-        return;
-    }
-
-    // The channel.
-    channel = TrackChannelForEvent(track, event);
-
-    // Percussion channel is treated differently.
-    if (event->data.channel.channel == 9)
-    {
-        if (key < 35 || key > 81)
-        {
-            return;
-        }
-
-        instrument = &percussion_instrs[key - 35];
-
-        last_perc[last_perc_count] = key;
-        last_perc_count = (last_perc_count + 1) % PERCUSSION_LOG_LEN;
-        note = 60;
-    }
-    else
-    {
-        instrument = channel->instrument;
-    }
-
-    double_voice = (SHORT(instrument->flags) & GENMIDI_FLAG_2VOICE) != 0;
-
-    switch (opl_drv_ver)
-    {
-        case opl_doom1_1_666:
-            voicenum = double_voice + 1;
-            if (!opl_opl3mode)
-            {
-                voicenum = 1;
-            }
-            while (voice_alloced_num > num_opl_voices - voicenum)
-            {
-                ReplaceExistingVoiceDoom1();
-            }
-
-            // Find and program a voice for this instrument.  If this
-            // is a double voice instrument, we must do this twice.
-
-            if (double_voice)
-            {
-                VoiceKeyOn(channel, instrument, 1, note, key, volume);
-            }
-
-            VoiceKeyOn(channel, instrument, 0, note, key, volume);
-            break;
-        case opl_doom2_1_666:
-            if (voice_alloced_num == num_opl_voices)
-            {
-                ReplaceExistingVoiceDoom2(channel);
-            }
-            if (voice_alloced_num == num_opl_voices - 1 && double_voice)
-            {
-                ReplaceExistingVoiceDoom2(channel);
-            }
-
-            // Find and program a voice for this instrument.  If this
-            // is a double voice instrument, we must do this twice.
-
-            if (double_voice)
-            {
-                VoiceKeyOn(channel, instrument, 1, note, key, volume);
-            }
-
-            VoiceKeyOn(channel, instrument, 0, note, key, volume);
-            break;
-        default:
-        case opl_doom_1_9:
-            if (voice_free_num == 0)
-            {
-                ReplaceExistingVoice();
-            }
-
-            // Find and program a voice for this instrument.  If this
-            // is a double voice instrument, we must do this twice.
-
-            VoiceKeyOn(channel, instrument, 0, note, key, volume);
-
-            if (double_voice)
-            {
-                VoiceKeyOn(channel, instrument, 1, note, key, volume);
-            }
-            break;
-    }
-}
-
-static void ProgramChangeEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    opl_channel_data_t *channel;
-    int instrument;
-
-    // Set the instrument used on this channel.
-
-    channel = TrackChannelForEvent(track, event);
-    instrument = event->data.channel.param1;
-    channel->instrument = &main_instrs[instrument];
-
-    // TODO: Look through existing voices that are turned on on this
-    // channel, and change the instrument.
-}
-
-static void SetChannelVolume(opl_channel_data_t *channel, unsigned int volume,
-                             boolean clip_start)
-{
-    unsigned int i;
-
-    channel->volume_base = volume;
-
-    if (volume > current_music_volume)
-    {
-        volume = current_music_volume;
-    }
-
-    if (clip_start && volume > start_music_volume)
-    {
-        volume = start_music_volume;
-    }
-
-    channel->volume = volume;
-
-    // Update all voices that this channel is using.
-
-    for (i = 0; i < num_opl_voices; ++i)
-    {
-        if (voices[i].channel == channel)
-        {
-            SetVoiceVolume(&voices[i], voices[i].note_volume);
-        }
-    }
-}
-
-static void SetChannelPan(opl_channel_data_t *channel, unsigned int pan)
-{
-    unsigned int reg_pan;
-    unsigned int i;
-
-    // The DMX library has the stereo channels backwards, maybe because
-    // Paul Radek had a Soundblaster card with the channels reversed, or
-    // perhaps it was just a bug in the OPL3 support that was never
-    // finished. By default we preserve this bug, but we also provide a
-    // secret DMXOPTION to fix it.
-    if (opl_stereo_correct)
-    {
-        pan = 144 - pan;
-    }
-
-    if (opl_opl3mode)
-    {
-        if (pan >= 96)
-        {
-            reg_pan = 0x10;
-        }
-        else if (pan <= 48)
-        {
-            reg_pan = 0x20;
-        }
-        else
-        {
-            reg_pan = 0x30;
-        }
-        if (channel->pan != reg_pan)
-        {
-            channel->pan = reg_pan;
-            for (i = 0; i < num_opl_voices; i++)
-            {
-                if (voices[i].channel == channel)
-                {
-                    SetVoicePan(&voices[i], reg_pan);
-                }
-            }
-        }
-    }
-}
-
-// Handler for the MIDI_CONTROLLER_ALL_NOTES_OFF channel event.
-static void AllNotesOff(opl_channel_data_t *channel, unsigned int param)
-{
-    int i;
-
-    for (i = 0; i < voice_alloced_num; i++)
-    {
-        if (voice_alloced_list[i]->channel == channel)
-        {
-            // Finished with this voice now.
-
-            ReleaseVoice(i);
-            
-            i--;
-        }
-    }
-}
-
-static void ControllerEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    opl_channel_data_t *channel;
-    unsigned int controller;
-    unsigned int param;
-
-/*
-    printf("change controller: channel %i, %i, %i\n",
-           event->data.channel.channel,
-           event->data.channel.param1,
-           event->data.channel.param2);
-*/
-
-    channel = TrackChannelForEvent(track, event);
-    controller = event->data.channel.param1;
-    param = event->data.channel.param2;
-
-    switch (controller)
-    {
-        case MIDI_CONTROLLER_VOLUME_MSB:
-            SetChannelVolume(channel, param, true);
-            break;
-
-        case MIDI_CONTROLLER_PAN:
-            SetChannelPan(channel, param);
-            break;
-
-        case MIDI_CONTROLLER_ALL_NOTES_OFF:
-            AllNotesOff(channel, param);
-            break;
-
-        default:
-#ifdef OPL_MIDI_DEBUG
-            fprintf(stderr, "Unknown MIDI controller type: %u\n", controller);
-#endif
-            break;
-    }
-}
-
-// Process a pitch bend event.
-
-static void PitchBendEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    opl_channel_data_t *channel;
-    int i;
-    opl_voice_t *voice_updated_list[OPL_NUM_VOICES * 2];
-    unsigned int voice_updated_num = 0;
-    opl_voice_t *voice_not_updated_list[OPL_NUM_VOICES * 2];
-    unsigned int voice_not_updated_num = 0;
-
-    // Update the channel bend value.  Only the MSB of the pitch bend
-    // value is considered: this is what Doom does.
-
-    channel = TrackChannelForEvent(track, event);
-    channel->bend = event->data.channel.param2 - 64;
-
-    // Update all voices for this channel.
-
-	for (i = 0; i < voice_alloced_num; ++i)
-    {
-        if (voice_alloced_list[i]->channel == channel)
-        {
-            UpdateVoiceFrequency(voice_alloced_list[i]);
-            voice_updated_list[voice_updated_num++] = voice_alloced_list[i];
-        }
-        else
-        {
-            voice_not_updated_list[voice_not_updated_num++] =
-            voice_alloced_list[i];
-        }
-    }
-
-    for (i = 0; i < voice_not_updated_num; i++)
-    {
-        voice_alloced_list[i] = voice_not_updated_list[i];
-    }
-
-    for (i = 0; i < voice_updated_num; i++)
-    {
-        voice_alloced_list[i + voice_not_updated_num] = voice_updated_list[i];
-    }
-}
-
-static void MetaSetTempo(unsigned int tempo)
-{
-    OPL_AdjustCallbacks((float) us_per_beat / tempo);
-    us_per_beat = tempo;
-}
-
-// Process a meta event.
-
-static void MetaEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    byte *data = event->data.meta.data;
-    unsigned int data_len = event->data.meta.length;
-
-    switch (event->data.meta.type)
-    {
-        // Things we can just ignore.
-
-        case MIDI_META_SEQUENCE_NUMBER:
-        case MIDI_META_TEXT:
-        case MIDI_META_COPYRIGHT:
-        case MIDI_META_TRACK_NAME:
-        case MIDI_META_INSTR_NAME:
-        case MIDI_META_LYRICS:
-        case MIDI_META_MARKER:
-        case MIDI_META_CUE_POINT:
-        case MIDI_META_SEQUENCER_SPECIFIC:
-            break;
-
-        case MIDI_META_SET_TEMPO:
-            if (data_len == 3)
-            {
-                MetaSetTempo((data[0] << 16) | (data[1] << 8) | data[2]);
-            }
-            break;
-
-        // End of track - actually handled when we run out of events
-        // in the track, see below.
-
-        case MIDI_META_END_OF_TRACK:
-            break;
-
-        default:
-#ifdef OPL_MIDI_DEBUG
-            fprintf(stderr, "Unknown MIDI meta event type: %u\n",
-                            event->data.meta.type);
-#endif
-            break;
-    }
-}
-
-// Process a MIDI event from a track.
-
-static void ProcessEvent(opl_track_data_t *track, midi_event_t *event)
-{
-    switch (event->event_type)
-    {
-        case MIDI_EVENT_NOTE_OFF:
-            KeyOffEvent(track, event);
-            break;
-
-        case MIDI_EVENT_NOTE_ON:
-            KeyOnEvent(track, event);
-            break;
-
-        case MIDI_EVENT_CONTROLLER:
-            ControllerEvent(track, event);
-            break;
-
-        case MIDI_EVENT_PROGRAM_CHANGE:
-            ProgramChangeEvent(track, event);
-            break;
-
-        case MIDI_EVENT_PITCH_BEND:
-            PitchBendEvent(track, event);
-            break;
-
-        case MIDI_EVENT_META:
-            MetaEvent(track, event);
-            break;
-
-        // SysEx events can be ignored.
-
-        case MIDI_EVENT_SYSEX:
-        case MIDI_EVENT_SYSEX_SPLIT:
-            break;
-
-        default:
-#ifdef OPL_MIDI_DEBUG
-            fprintf(stderr, "Unknown MIDI event type %i\n", event->event_type);
-#endif
-            break;
-    }
-}
-
-static void ScheduleTrack(opl_track_data_t *track);
-static void InitChannel(opl_channel_data_t *channel);
-
-// Restart a song from the beginning.
-
-static void RestartSong(void *unused)
-{
-    unsigned int i;
-
-    running_tracks = num_tracks;
-
-    start_music_volume = current_music_volume;
-
-    for (i = 0; i < num_tracks; ++i)
-    {
-        MIDI_RestartIterator(tracks[i].iter);
-        ScheduleTrack(&tracks[i]);
-    }
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        InitChannel(&channels[i]);
-    }
-}
-
-// Callback function invoked when another event needs to be read from
-// a track.
-
-static void TrackTimerCallback(void *arg)
-{
-    opl_track_data_t *track = arg;
-    midi_event_t *event;
-
-    // Get the next event and process it.
-
-    if (!MIDI_GetNextEvent(track->iter, &event))
-    {
-        return;
-    }
-
-    ProcessEvent(track, event);
-
-    // End of track?
-
-    if (event->event_type == MIDI_EVENT_META
-     && event->data.meta.type == MIDI_META_END_OF_TRACK)
-    {
-        --running_tracks;
-
-        // When all tracks have finished, restart the song.
-        // Don't restart the song immediately, but wait for 5ms
-        // before triggering a restart.  Otherwise it is possible
-        // to construct an empty MIDI file that causes the game
-        // to lock up in an infinite loop. (5ms should be short
-        // enough not to be noticeable by the listener).
-
-        if (running_tracks <= 0 && song_looping)
-        {
-            OPL_SetCallback(5000, RestartSong, NULL);
-        }
-
-        return;
-    }
-
-    // Reschedule the callback for the next event in the track.
-
-    ScheduleTrack(track);
-}
-
-static void ScheduleTrack(opl_track_data_t *track)
-{
-    unsigned int nticks;
-    uint64_t us;
-
-    // Get the number of microseconds until the next event.
-
-    nticks = MIDI_GetDeltaTime(track->iter);
-    us = ((uint64_t) nticks * us_per_beat) / ticks_per_beat;
-
-    // Set a timer to be invoked when the next event is
-    // ready to play.
-
-    OPL_SetCallback(us, TrackTimerCallback, track);
-}
-
-// Initialize a channel.
-
-static void InitChannel(opl_channel_data_t *channel)
-{
-    // TODO: Work out sensible defaults?
-
-    channel->instrument = &main_instrs[0];
-    channel->volume = current_music_volume;
-    channel->volume_base = 100;
-    if (channel->volume > channel->volume_base)
-    {
-        channel->volume = channel->volume_base;
-    }
-    channel->pan = 0x30;
-    channel->bend = 0;
-}
-
-// Start a MIDI track playing:
-
-static void StartTrack(midi_file_t *file, unsigned int track_num)
-{
-    opl_track_data_t *track;
-
-    track = &tracks[track_num];
-    track->iter = MIDI_IterateTrack(file, track_num);
-
-    // Schedule the first event.
-
-    ScheduleTrack(track);
-}
-
-// Start playing a mid
-
-static void I_OPL_PlaySong(void *handle, boolean looping)
-{
-    midi_file_t *file;
-    unsigned int i;
-
-    if (!music_initialized || handle == NULL)
-    {
-        return;
-    }
-
-    file = handle;
-
-    // Allocate track data.
-
-    tracks = malloc(MIDI_NumTracks(file) * sizeof(opl_track_data_t));
-
-    num_tracks = MIDI_NumTracks(file);
-    running_tracks = num_tracks;
-    song_looping = looping;
-
-    ticks_per_beat = MIDI_GetFileTimeDivision(file);
-
-    // Default is 120 bpm.
-    // TODO: this is wrong
-
-    us_per_beat = 500 * 1000;
-
-    start_music_volume = current_music_volume;
-
-    for (i = 0; i < num_tracks; ++i)
-    {
-        StartTrack(file, i);
-    }
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        InitChannel(&channels[i]);
-    }
-
-    // If the music was previously paused, it needs to be unpaused; playing
-    // a new song implies that we turn off pause. This matches vanilla
-    // behavior of the DMX library, and some of the higher-level code in
-    // s_sound.c relies on this.
-    OPL_SetPaused(0);
-}
-
-static void I_OPL_PauseSong(void)
-{
-    unsigned int i;
-
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    // Pause OPL callbacks.
-
-    OPL_SetPaused(1);
-
-    // Turn off all main instrument voices (not percussion).
-    // This is what Vanilla does.
-
-    for (i = 0; i < num_opl_voices; ++i)
-    {
-        if (voices[i].channel != NULL
-         && voices[i].current_instr < percussion_instrs)
-        {
-            VoiceKeyOff(&voices[i]);
-        }
-    }
-}
-
-static void I_OPL_ResumeSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    OPL_SetPaused(0);
-}
-
-static void I_OPL_StopSong(void)
-{
-    unsigned int i;
-
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    OPL_Lock();
-
-    // Stop all playback.
-
-    OPL_ClearCallbacks();
-
-    // Free all voices.
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        AllNotesOff(&channels[i], 0);
-    }
-
-    // Free all track data.
-
-    for (i = 0; i < num_tracks; ++i)
-    {
-        MIDI_FreeIterator(tracks[i].iter);
-    }
-
-    free(tracks);
-
-    tracks = NULL;
-    num_tracks = 0;
-
-    OPL_Unlock();
-}
-
-static void I_OPL_UnRegisterSong(void *handle)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    if (handle != NULL)
-    {
-        MIDI_FreeFile(handle);
-    }
-}
-
-// Determine whether memory block is a .mid file
-
-static boolean IsMid(byte *mem, int len)
-{
-    return len > 4 && !memcmp(mem, "MThd", 4);
-}
-
-static boolean ConvertMus(byte *musdata, int len, char *filename)
-{
-    MEMFILE *instream;
-    MEMFILE *outstream;
-    void *outbuf;
-    size_t outbuf_len;
-    int result;
-
-    instream = mem_fopen_read(musdata, len);
-    outstream = mem_fopen_write();
-
-    result = mus2mid(instream, outstream);
-
-    if (result == 0)
-    {
-        mem_get_buf(outstream, &outbuf, &outbuf_len);
-
-        M_WriteFile(filename, outbuf, outbuf_len);
-    }
-
-    mem_fclose(instream);
-    mem_fclose(outstream);
-
-    return result;
-}
-
-static void *I_OPL_RegisterSong(void *data, int len)
-{
-    midi_file_t *result;
-    char *filename;
-
-    if (!music_initialized)
-    {
-        return NULL;
-    }
-
-    // MUS files begin with "MUS"
-    // Reject anything which doesnt have this signature
-
-    filename = M_TempFile("doom.mid");
-
-    if (IsMid(data, len) && len < MAXMIDLENGTH)
-    {
-        M_WriteFile(filename, data, len);
-    }
-    else
-    {
-        // Assume a MUS file and try to convert
-
-        ConvertMus(data, len, filename);
-    }
-
-    result = MIDI_LoadFile(filename);
-
-    if (result == NULL)
-    {
-        fprintf(stderr, "I_OPL_RegisterSong: Failed to load MID.\n");
-    }
-
-    // remove file now
-
-    M_remove(filename);
-    free(filename);
-
-    return result;
-}
-
-// Is the song playing?
-
-static boolean I_OPL_MusicIsPlaying(void)
-{
-    if (!music_initialized)
-    {
-        return false;
-    }
-
-    return num_tracks > 0;
-}
-
-// Shutdown music
-
-static void I_OPL_ShutdownMusic(void)
-{
-    if (music_initialized)
-    {
-        // Stop currently-playing track, if there is one:
-
-        I_OPL_StopSong();
-
-        OPL_Shutdown();
-
-        // Release GENMIDI lump
-
-        W_ReleaseLumpName(DEH_String("genmidi"));
-
-        music_initialized = false;
-    }
-}
-
-// Initialize music subsystem
-
-static boolean I_OPL_InitMusic(void)
-{
-    const char *dmxoption;
-    opl_init_result_t chip_type;
-
-    OPL_SetSampleRate(snd_samplerate);
-
-    chip_type = OPL_Init(opl_io_port);
-    if (chip_type == OPL_INIT_NONE)
-    {
-        printf("Dude.  The Adlib isn't responding.\n");
-        return false;
-    }
-
-    // The DMXOPTION variable must be set to enable OPL3 support.
-    // As an extension, we also allow it to be set from the config file.
-    dmxoption = getenv("DMXOPTION");
-    if (dmxoption == NULL)
-    {
-        dmxoption = snd_dmxoption != NULL ? snd_dmxoption : "";
-    }
-
-    if (chip_type == OPL_INIT_OPL3 && strstr(dmxoption, "-opl3") != NULL)
-    {
-        opl_opl3mode = 1;
-        num_opl_voices = OPL_NUM_VOICES * 2;
-    }
-    else
-    {
-        opl_opl3mode = 0;
-        num_opl_voices = OPL_NUM_VOICES;
-    }
-
-    // Secret, undocumented DMXOPTION that reverses the stereo channels
-    // into their correct orientation.
-    opl_stereo_correct = strstr(dmxoption, "-reverse") != NULL;
-
-    // Initialize all registers.
-
-    OPL_InitRegisters(opl_opl3mode);
-
-    // Load instruments from GENMIDI lump:
-
-    if (!LoadInstrumentTable())
-    {
-        OPL_Shutdown();
-        return false;
-    }
-
-    InitVoices();
-
-    tracks = NULL;
-    num_tracks = 0;
-    music_initialized = true;
-
-    return true;
-}
-
-const static snddevice_t music_opl_devices[] =
-{
-    SNDDEVICE_ADLIB,
-    SNDDEVICE_SB,
-};
-
-const music_module_t music_opl_module =
-{
-    music_opl_devices,
-    arrlen(music_opl_devices),
-    I_OPL_InitMusic,
-    I_OPL_ShutdownMusic,
-    I_OPL_SetMusicVolume,
-    I_OPL_PauseSong,
-    I_OPL_ResumeSong,
-    I_OPL_RegisterSong,
-    I_OPL_UnRegisterSong,
-    I_OPL_PlaySong,
-    I_OPL_StopSong,
-    I_OPL_MusicIsPlaying,
-    NULL,  // Poll
-};
-
-void I_SetOPLDriverVer(opl_driver_ver_t ver)
-{
-    opl_drv_ver = ver;
-}
-
-//----------------------------------------------------------------------
-//
-// Development / debug message generation, to help developing GENMIDI
-// lumps.
-//
-//----------------------------------------------------------------------
-
-static int NumActiveChannels(void)
-{
-    int i;
-
-    for (i = MIDI_CHANNELS_PER_TRACK - 1; i >= 0; --i)
-    {
-        if (channels[i].instrument != &main_instrs[0])
-        {
-            return i + 1;
-        }
-    }
-
-    return 0;
-}
-
-static int ChannelInUse(opl_channel_data_t *channel)
-{
-    int i;
-
-    for (i = 0; i < voice_alloced_num; i++)
-    {
-        if (voice_alloced_list[i]->channel == channel)
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-void I_OPL_DevMessages(char *result, size_t result_len)
-{
-    char tmp[80];
-    int instr_num;
-    int lines;
-    int i;
-
-    if (num_tracks == 0)
-    {
-        M_snprintf(result, result_len, "No OPL track!");
-        return;
-    }
-
-    M_snprintf(result, result_len, "Tracks:\n");
-    lines = 1;
-
-    for (i = 0; i < NumActiveChannels(); ++i)
-    {
-        if (channels[i].instrument == NULL)
-        {
-            continue;
-        }
-
-        instr_num = channels[i].instrument - main_instrs;
-
-        M_snprintf(tmp, sizeof(tmp),
-                   "chan %i: %c i#%i (%s)\n",
-                   i,
-                   ChannelInUse(&channels[i]) ? '\'' : ' ',
-                   instr_num + 1,
-                   main_instr_names[instr_num]);
-        M_StringConcat(result, tmp, result_len);
-
-        ++lines;
-    }
-
-    M_snprintf(tmp, sizeof(tmp), "\nLast percussion:\n");
-    M_StringConcat(result, tmp, result_len);
-    lines += 2;
-
-    i = (last_perc_count + PERCUSSION_LOG_LEN - 1) % PERCUSSION_LOG_LEN;
-
-    do {
-        if (last_perc[i] == 0)
-        {
-            break;
-        }
-
-        M_snprintf(tmp, sizeof(tmp),
-                   "%cp#%i (%s)\n",
-                   i == 0 ? '\'' : ' ',
-                   last_perc[i],
-                   percussion_names[last_perc[i] - 35]);
-        M_StringConcat(result, tmp, result_len);
-        ++lines;
-
-        i = (i + PERCUSSION_LOG_LEN - 1) % PERCUSSION_LOG_LEN;
-    } while (lines < 25 && i != last_perc_count);
-}
-
diff --git a/games/NXDoom/src/i_pcsound.c b/games/NXDoom/src/i_pcsound.c
index c3ec62803..2548fbe96 100644
--- a/games/NXDoom/src/i_pcsound.c
+++ b/games/NXDoom/src/i_pcsound.c
@@ -1,21 +1,29 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System interface for PC speaker sound.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_pcsound.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System interface for PC speaker sound.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "SDL.h"
 #include <string.h>
 
 #include "doomtype.h"
@@ -28,311 +36,201 @@
 
 #include "pcsound.h"
 
-#define TIMER_FREQ 1193181 /* hz */
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-static boolean pcs_initialized = false;
+#define TIMER_FREQ 1193181 /* Hz */
 
-static SDL_mutex *sound_lock;
-static GameMission_t gamemission;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static uint8_t *current_sound_lump = NULL;
-static uint8_t *current_sound_pos = NULL;
-static unsigned int current_sound_remaining = 0;
-static int current_sound_handle = 0;
-static int current_sound_lump_num = -1;
+static boolean g_pcs_initialized = false;
 
-static const uint16_t divisors[] = {
-    0,
-    6818, 6628, 6449, 6279, 6087, 5906, 5736, 5575,
-    5423, 5279, 5120, 4971, 4830, 4697, 4554, 4435,
-    4307, 4186, 4058, 3950, 3836, 3728, 3615, 3519,
-    3418, 3323, 3224, 3131, 3043, 2960, 2875, 2794,
-    2711, 2633, 2560, 2485, 2415, 2348, 2281, 2213,
-    2153, 2089, 2032, 1975, 1918, 1864, 1810, 1757,
-    1709, 1659, 1612, 1565, 1521, 1478, 1435, 1395,
-    1355, 1316, 1280, 1242, 1207, 1173, 1140, 1107,
-    1075, 1045, 1015,  986,  959,  931,  905,  879,
-     854,  829,  806,  783,  760,  739,  718,  697,
-     677,  658,  640,  621,  604,  586,  570,  553,
-     538,  522,  507,  493,  479,  465,  452,  439,
-     427,  415,  403,  391,  380,  369,  359,  348,
-     339,  329,  319,  310,  302,  293,  285,  276,
-     269,  261,  253,  246,  239,  232,  226,  219,
-     213,  207,  201,  195,  190,  184,  179,
+static gamemission_t g_gamemission;
+
+static uint8_t *g_current_sound_lump = NULL;
+static uint8_t *g_current_sound_pos = NULL;
+static unsigned int g_current_sound_remaining = 0;
+static int g_current_sound_handle = 0;
+static int g_current_sound_lump_num = -1;
+
+static const uint16_t g_divisors[] =
+{
+  0,    6818, 6628, 6449, 6279, 6087, 5906, 5736, 5575, 5423, 5279, 5120,
+  4971, 4830, 4697, 4554, 4435, 4307, 4186, 4058, 3950, 3836, 3728, 3615,
+  3519, 3418, 3323, 3224, 3131, 3043, 2960, 2875, 2794, 2711, 2633, 2560,
+  2485, 2415, 2348, 2281, 2213, 2153, 2089, 2032, 1975, 1918, 1864, 1810,
+  1757, 1709, 1659, 1612, 1565, 1521, 1478, 1435, 1395, 1355, 1316, 1280,
+  1242, 1207, 1173, 1140, 1107, 1075, 1045, 1015, 986,  959,  931,  905,
+  879,  854,  829,  806,  783,  760,  739,  718,  697,  677,  658,  640,
+  621,  604,  586,  570,  553,  538,  522,  507,  493,  479,  465,  452,
+  439,  427,  415,  403,  391,  380,  369,  359,  348,  339,  329,  319,
+  310,  302,  293,  285,  276,  269,  261,  253,  246,  239,  232,  226,
+  219,  213,  207,  201,  195,  190,  184,  179,
 };
 
-static void PCSCallbackFunc(int *duration, int *freq)
+static const snddevice_t g_sound_pcsound_devices[] =
 {
-    unsigned int tone;
-
-    *duration = 1000 / 140;
-
-    if (SDL_LockMutex(sound_lock) < 0)
-    {
-        *freq = 0;
-        return;
-    }
-
-    if (current_sound_lump != NULL && current_sound_remaining > 0)
-    {
-        // Read the next tone
-
-        tone = *current_sound_pos;
-
-        // Use the tone -> frequency lookup table.  See pcspkr10.zip
-        // for a full discussion of this.
-        // Check we don't overflow the frequency table.
-
-        if (tone < arrlen(divisors) && divisors[tone] != 0)
-        {
-            *freq = (int) (TIMER_FREQ / divisors[tone]);
-        }
-        else
-        {
-            *freq = 0;
-        }
-
-        ++current_sound_pos;
-        --current_sound_remaining;
-    }
-    else
-    {
-        *freq = 0;
-    }
-
-    SDL_UnlockMutex(sound_lock);
-}
-
-static boolean CachePCSLump(sfxinfo_t *sfxinfo)
-{
-    int lumplen;
-    int headerlen;
-
-    // Free the current sound lump back to the cache
- 
-    if (current_sound_lump != NULL)
-    {
-        W_ReleaseLumpNum(current_sound_lump_num);
-        current_sound_lump = NULL;
-    }
-
-    // Load from WAD
-
-    current_sound_lump = W_CacheLumpNum(sfxinfo->lumpnum, PU_STATIC);
-    lumplen = W_LumpLength(sfxinfo->lumpnum);
-
-    // Read header
-  
-    if (current_sound_lump[0] != 0x00 || current_sound_lump[1] != 0x00)
-    {
-        return false;
-    }
-
-    headerlen = (current_sound_lump[3] << 8) | current_sound_lump[2];
-
-    if (headerlen > lumplen - 4)
-    {
-        return false;
-    }
-
-    // Header checks out ok
-
-    current_sound_remaining = headerlen;
-    current_sound_pos = current_sound_lump + 4;
-    current_sound_lump_num = sfxinfo->lumpnum;
-
-    return true;
-}
-
-// These Doom PC speaker sounds are not played - this can be seen in the 
-// Heretic source code, where there are remnants of this left over
-// from Doom.
-
-static boolean IsDisabledSound(sfxinfo_t *sfxinfo)
-{
-    int i;
-    const char *disabled_sounds[] = {
-        "posact",
-        "bgact",
-        "dmact",
-        "dmpain",
-        "popain",
-        "sawidl",
-        "rifle",
-    };
-
-    for (i=0; i<arrlen(disabled_sounds); ++i)
-    {
-        if (!strcmp(sfxinfo->name, disabled_sounds[i]))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static int I_PCS_StartSound(sfxinfo_t *sfxinfo,
-                            int channel,
-                            int vol,
-                            int sep,
-                            int pitch)
-{
-    int result;
-
-    if (!pcs_initialized)
-    {
-        return -1;
-    }
-
-    if (IsDisabledSound(sfxinfo))
-    {
-        return -1;
-    }
-
-    if (SDL_LockMutex(sound_lock) < 0)
-    {
-        return -1;
-    }
-
-    result = CachePCSLump(sfxinfo);
-
-    if (result)
-    {
-        current_sound_handle = channel;
-    }
-
-    SDL_UnlockMutex(sound_lock);
-
-    if (result)
-    {
-        return channel;
-    }
-    else
-    {
-        return -1;
-    }
-}
-
-static void I_PCS_StopSound(int handle)
-{
-    if (!pcs_initialized)
-    {
-        return;
-    }
-
-    if (SDL_LockMutex(sound_lock) < 0)
-    {
-        return;
-    }
-
-    // If this is the channel currently playing, immediately end it.
-
-    if (current_sound_handle == handle)
-    {
-        current_sound_remaining = 0;
-    }
-    
-    SDL_UnlockMutex(sound_lock);
-}
-
-//
-// Retrieve the raw data lump index
-//  for a given SFX name.
-//
-
-static int I_PCS_GetSfxLumpNum(sfxinfo_t* sfx)
-{
-    char namebuf[9];
-
-    if (gamemission == doom || gamemission == strife)
-    {
-        M_snprintf(namebuf, sizeof(namebuf), "dp%s", DEH_String(sfx->name));
-
-        if (gamemission == strife && W_CheckNumForName(namebuf) == -1)
-        {
-            // Missing sounds replaced with DPRIFLE.
-            M_snprintf(namebuf, sizeof(namebuf), "dp%s", DEH_String("rifle"));
-        }
-    }
-    else
-    {
-        M_StringCopy(namebuf, DEH_String(sfx->name), sizeof(namebuf));
-    }
-
-    return W_GetNumForName(namebuf);
-}
-
-
-static boolean I_PCS_SoundIsPlaying(int handle)
-{
-    if (!pcs_initialized)
-    {
-        return false;
-    }
-
-    if (handle != current_sound_handle)
-    {
-        return false;
-    }
-
-    return current_sound_lump != NULL && current_sound_remaining > 0;
-}
-
-static boolean I_PCS_InitSound(GameMission_t mission)
-{
-    gamemission = mission;
-
-    // Use the sample rate from the configuration file
-
-    PCSound_SetSampleRate(snd_samplerate);
-
-    // Initialize the PC speaker subsystem.
-
-    pcs_initialized = PCSound_Init(PCSCallbackFunc);
-
-    if (pcs_initialized)
-    {
-        sound_lock = SDL_CreateMutex();
-    }
-
-    return pcs_initialized;
-}
-
-static void I_PCS_ShutdownSound(void)
-{
-    if (pcs_initialized)
-    {
-        PCSound_Shutdown();
-    }
-}
-
-static void I_PCS_UpdateSound(void)
-{
-    // no-op.
-}
-
-void I_PCS_UpdateSoundParams(int channel, int vol, int sep)
-{
-    // no-op.
-}
-
-static const snddevice_t sound_pcsound_devices[] =
-{
-    SNDDEVICE_PCSPEAKER,
+  SNDDEVICE_PCSPEAKER,
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 const sound_module_t sound_pcsound_module =
 {
-    sound_pcsound_devices,
-    arrlen(sound_pcsound_devices),
-    I_PCS_InitSound,
-    I_PCS_ShutdownSound,
-    I_PCS_GetSfxLumpNum,
-    I_PCS_UpdateSound,
-    I_PCS_UpdateSoundParams,
-    I_PCS_StartSound,
-    I_PCS_StopSound,
-    I_PCS_SoundIsPlaying,
+  g_sound_pcsound_devices,
+  arrlen(g_sound_pcsound_devices),
+#if 0
+  i_pcs_init_sound,
+  i_pcs_shutdown_sound,
+  i_pcs_get_sfx_lumpnum,
+  i_pcs_update_sound,
+  i_pcs_update_sound_params,
+  i_pcs_start_sound,
+  i_pcs_stop_sound,
+  i_pcs_sound_is_playing,
+#endif
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void pcs_callback_func(int *duration, int *freq)
+{
+}
+
+static boolean cache_pcs_lump(sfxinfo_t *sfxinfo)
+{
+  int lumplen;
+  int headerlen;
+
+  /* Free the current sound lump back to the cache */
+
+  if (g_current_sound_lump != NULL)
+    {
+      w_release_lump_num(g_current_sound_lump_num);
+      g_current_sound_lump = NULL;
+    }
+
+  /* Load from WAD */
+
+  g_current_sound_lump = w_cache_lump_num(sfxinfo->lumpnum, PU_STATIC);
+  lumplen = w_lump_length(sfxinfo->lumpnum);
+
+  /* Read header */
+
+  if (g_current_sound_lump[0] != 0x00 || g_current_sound_lump[1] != 0x00)
+    {
+      return false;
+    }
+
+  headerlen = (g_current_sound_lump[3] << 8) | g_current_sound_lump[2];
+
+  if (headerlen > lumplen - 4)
+    {
+      return false;
+    }
+
+  /* Header checks out ok */
+
+  g_current_sound_remaining = headerlen;
+  g_current_sound_pos = g_current_sound_lump + 4;
+  g_current_sound_lump_num = sfxinfo->lumpnum;
+
+  return true;
+}
+
+/* These Doom PC speaker sounds are not played - this can be seen in the
+ * Heretic source code, where there are remnants of this left over
+ * from Doom.
+ */
+
+static boolean is_disabled_sound(sfxinfo_t *sfxinfo)
+{
+  int i;
+  const char *disabled_sounds[] = {
+      "posact", "bgact", "dmact", "dmpain", "popain", "sawidl", "rifle",
+  };
+
+  for (i = 0; i < arrlen(disabled_sounds); ++i)
+    {
+      if (!strcmp(sfxinfo->name, disabled_sounds[i]))
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
+static int i_pcs_start_sound(sfxinfo_t *sfxinfo, int channel, int vol,
+                             int sep, int pitch)
+{
+}
+
+static void i_pcs_stop_sound(int handle)
+{
+}
+
+/* Retrieve the raw data lump index for a given SFX name. */
+
+static int i_pcs_get_sfx_lumpnum(sfxinfo_t *sfx)
+{
+  char namebuf[9];
+
+  if (g_gamemission == doom || g_gamemission == strife)
+    {
+      snprintf(namebuf, sizeof(namebuf), "dp%s", (sfx->name));
+
+      if (g_gamemission == strife && w_check_num_for_name(namebuf) == -1)
+        {
+          /* Missing sounds replaced with DPRIFLE. */
+
+          snprintf(namebuf, sizeof(namebuf), "dp%s", ("rifle"));
+        }
+    }
+  else
+    {
+      m_str_copy(namebuf, (sfx->name), sizeof(namebuf));
+    }
+
+  return w_get_num_for_name(namebuf);
+}
+
+static boolean i_pcs_sound_is_playing(int handle)
+{
+  if (!g_pcs_initialized)
+    {
+      return false;
+    }
+
+  if (handle != g_current_sound_handle)
+    {
+      return false;
+    }
+
+  return g_current_sound_lump != NULL && g_current_sound_remaining > 0;
+}
+
+static boolean i_pcs_init_sound(gamemission_t mission)
+{
+}
+
+static void i_pcs_shutdown_sound(void)
+{
+}
+
+static void i_pcs_update_sound(void)
+{
+  /* no-op. */
+}
+
+static void i_pcs_update_sound_params(int channel, int vol, int sep)
+{
+  /* no-op. */
+}
diff --git a/games/NXDoom/src/i_sdlmusic.c b/games/NXDoom/src/i_sdlmusic.c
index 70502d0b2..29af65a4e 100644
--- a/games/NXDoom/src/i_sdlmusic.c
+++ b/games/NXDoom/src/i_sdlmusic.c
@@ -1,28 +1,34 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System interface for music.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_sdlmusic.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System interface for music.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-
-#include "SDL.h"
 
 #include "config.h"
 #include "doomtype.h"
@@ -32,8 +38,8 @@
 #include "deh_str.h"
 #include "gusconf.h"
 #include "i_sound.h"
-#include "i_system.h"
 #include "i_swap.h"
+#include "i_system.h"
 #include "m_argv.h"
 #include "m_config.h"
 #include "m_misc.h"
@@ -41,433 +47,103 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-
-char *timidity_cfg_path = "";
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
 static char *temp_timidity_cfg = NULL;
 
-// If the temp_timidity_cfg config variable is set, generate a "wrapper"
-// config file for Timidity to point to the actual config file. This
-// is needed to inject a "dir" command so that the patches are read
-// relative to the actual config file.
+/* putenv requires a non-const string whose lifetime is the whole program
+ * so can't use a string directly, have to do this silliness
+ */
 
-static boolean WriteWrapperTimidityConfig(char *write_path)
+static char sdl_mixer_disable_fluidsynth[] =
+                                "SDL_MIXER_DISABLE_FLUIDSYNTH=1";
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+char *timidity_cfg_path = "";
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* If the temp_timidity_cfg config variable is set, generate a "wrapper"
+ * config file for Timidity to point to the actual config file. This
+ * is needed to inject a "dir" command so that the patches are read
+ * relative to the actual config file.
+ */
+
+static boolean write_wrapper_timidity_config(char *write_path)
 {
-    char *path;
-    FILE *fstream;
+  char *path;
+  FILE *fstream;
 
-    if (!strcmp(timidity_cfg_path, ""))
+  if (!strcmp(timidity_cfg_path, ""))
     {
-        return false;
+      return false;
     }
 
-    fstream = M_fopen(write_path, "w");
+  fstream = fopen(write_path, "w");
 
-    if (fstream == NULL)
+  if (fstream == NULL)
     {
-        return false;
+      return false;
     }
 
-    path = M_DirName(timidity_cfg_path);
-    fprintf(fstream, "dir %s\n", path);
-    free(path);
+  path = m_dir_name(timidity_cfg_path);
+  fprintf(fstream, "dir %s\n", path);
+  free(path);
 
-    fprintf(fstream, "source %s\n", timidity_cfg_path);
-    fclose(fstream);
+  fprintf(fstream, "source %s\n", timidity_cfg_path);
+  fclose(fstream);
 
-    return true;
+  return true;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-// putenv requires a non-const string whose lifetime is the whole program
-// so can't use a string directly, have to do this silliness
-static char sdl_mixer_disable_fluidsynth[] = "SDL_MIXER_DISABLE_FLUIDSYNTH=1";
-
-
-void I_InitTimidityConfig(void)
+void i_init_timidity_config(void)
 {
-    char *env_string;
-    boolean success;
+  char *env_string;
+  boolean success;
 
-    temp_timidity_cfg = M_TempFile("timidity.cfg");
+  temp_timidity_cfg = m_temp_file("timidity.cfg");
 
-    if (snd_musicdevice == SNDDEVICE_GUS)
+  if (snd_musicdevice == SNDDEVICE_GUS)
     {
-        success = GUS_WriteConfig(temp_timidity_cfg);
+      success = gus_write_config(temp_timidity_cfg);
     }
-    else
+  else
     {
-        success = WriteWrapperTimidityConfig(temp_timidity_cfg);
+      success = write_wrapper_timidity_config(temp_timidity_cfg);
     }
 
-    // Set the TIMIDITY_CFG environment variable to point to the temporary
-    // config file.
-    if (success)
-    {
-        env_string = M_StringJoin("TIMIDITY_CFG=", temp_timidity_cfg, NULL);
-        putenv(env_string);
-        // env_string deliberately not freed; see putenv manpage
+  /* Set the TIMIDITY_CFG environment variable to point to the temporary
+   * config file.
+   */
 
-        // If we're explicitly configured to use Timidity (either through
-        // timidity_cfg_path or GUS mode), then disable Fluidsynth, because
-        // SDL_mixer considers Fluidsynth a higher priority than Timidity and
-        // therefore can end up circumventing Timidity entirely.
-        putenv(sdl_mixer_disable_fluidsynth);
-    }
-    else
+  if (success)
     {
-        free(temp_timidity_cfg);
-        temp_timidity_cfg = NULL;
+      env_string = m_string_join("TIMIDITY_CFG=", temp_timidity_cfg, NULL);
+      putenv(env_string);
+
+      /* env_string deliberately not freed; see putenv manpage
+       * If we're explicitly configured to use Timidity (either through
+       * timidity_cfg_path or GUS mode), then disable Fluidsynth, because
+       * SDL_mixer considers Fluidsynth a higher priority than Timidity and
+       * therefore can end up circumventing Timidity entirely.
+       */
+
+      putenv(sdl_mixer_disable_fluidsynth);
+    }
+  else
+    {
+      free(temp_timidity_cfg);
+      temp_timidity_cfg = NULL;
     }
 }
-
-
-#ifndef DISABLE_SDL2MIXER
-
-#include "SDL_mixer.h"
-
-
-#define MAXMIDLENGTH (96 * 1024)
-
-static boolean music_initialized = false;
-
-// If this is true, this module initialized SDL sound and has the
-// responsibility to shut it down
-
-static boolean sdl_was_initialized = false;
-
-static boolean musicpaused = false;
-static int current_music_volume;
-
-
-// Remove the temporary config file generated by I_InitTimidityConfig().
-
-static void RemoveTimidityConfig(void)
-{
-    if (temp_timidity_cfg != NULL)
-    {
-        M_remove(temp_timidity_cfg);
-        free(temp_timidity_cfg);
-    }
-}
-
-// Shutdown music
-
-static void I_SDL_ShutdownMusic(void)
-{
-    if (music_initialized)
-    {
-        Mix_HaltMusic();
-        music_initialized = false;
-
-        if (sdl_was_initialized)
-        {
-            Mix_CloseAudio();
-            SDL_QuitSubSystem(SDL_INIT_AUDIO);
-            sdl_was_initialized = false;
-        }
-    }
-}
-
-static boolean SDLIsInitialized(void)
-{
-    int freq, channels;
-    Uint16 format;
-
-    return Mix_QuerySpec(&freq, &format, &channels) != 0;
-}
-
-#ifdef _WIN32
-// putenv requires a non-const string whose lifetime is the whole program
-static char sdl_mixer_disable_nativemidi[] = "SDL_MIXER_DISABLE_NATIVEMIDI=1";
-#endif
-
-// Initialize music subsystem
-static boolean I_SDL_InitMusic(void)
-{
-    // If SDL_mixer is not initialized, we have to initialize it
-    // and have the responsibility to shut it down later on.
-
-    if (SDLIsInitialized())
-    {
-        music_initialized = true;
-    }
-    else
-    {
-        if (SDL_Init(SDL_INIT_AUDIO) < 0)
-        {
-            fprintf(stderr, "Unable to set up sound.\n");
-        }
-        else if (Mix_OpenAudioDevice(snd_samplerate, AUDIO_S16SYS, 2, 1024, NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
-        {
-            fprintf(stderr, "Error initializing SDL_mixer: %s\n",
-                    Mix_GetError());
-            SDL_QuitSubSystem(SDL_INIT_AUDIO);
-        }
-        else
-        {
-            SDL_PauseAudio(0);
-
-            sdl_was_initialized = true;
-            music_initialized = true;
-        }
-    }
-
-    #ifdef _WIN32
-    // Never let SDL Mixer use native midi on Windows. Avoids SDL Mixer bug
-    // where music volume affects global application volume.
-    putenv(sdl_mixer_disable_nativemidi);
-    #endif
-
-    // Initialize SDL_Mixer for MIDI music playback
-    Mix_Init(MIX_INIT_MID);
-
-    // Once initialization is complete, the temporary Timidity config
-    // file can be removed.
-
-    RemoveTimidityConfig();
-
-    // If snd_musiccmd is set, we need to call Mix_SetMusicCMD to
-    // configure an external music playback program.
-
-    if (strlen(snd_musiccmd) > 0)
-    {
-        Mix_SetMusicCMD(snd_musiccmd);
-    }
-
-    return music_initialized;
-}
-
-//
-// SDL_mixer's native MIDI music playing does not pause properly.
-// As a workaround, set the volume to 0 when paused.
-//
-
-static void UpdateMusicVolume(void)
-{
-    int vol;
-
-    if (musicpaused)
-    {
-        vol = 0;
-    }
-    else
-    {
-        vol = (current_music_volume * MIX_MAX_VOLUME) / 127;
-    }
-
-    Mix_VolumeMusic(vol);
-}
-
-// Set music volume (0 - 127)
-
-static void I_SDL_SetMusicVolume(int volume)
-{
-    // Internal state variable.
-    current_music_volume = volume;
-
-    UpdateMusicVolume();
-}
-
-// Start playing a mid
-
-static void I_SDL_PlaySong(void *handle, boolean looping)
-{
-    int loops;
-
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    if (handle == NULL)
-    {
-        return;
-    }
-
-    if (looping)
-    {
-        loops = -1;
-    }
-    else
-    {
-        loops = 1;
-    }
-
-    Mix_PlayMusic((Mix_Music *) handle, loops);
-}
-
-static void I_SDL_PauseSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    musicpaused = true;
-
-    UpdateMusicVolume();
-}
-
-static void I_SDL_ResumeSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    musicpaused = false;
-
-    UpdateMusicVolume();
-}
-
-static void I_SDL_StopSong(void)
-{
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    Mix_HaltMusic();
-}
-
-static void I_SDL_UnRegisterSong(void *handle)
-{
-    Mix_Music *music = (Mix_Music *) handle;
-
-    if (!music_initialized)
-    {
-        return;
-    }
-
-    if (handle != NULL)
-    {
-        Mix_FreeMusic(music);
-    }
-}
-
-// Determine whether memory block is a .mid file 
-
-static boolean IsMid(byte *mem, int len)
-{
-    return len > 4 && !memcmp(mem, "MThd", 4);
-}
-
-static boolean ConvertMus(byte *musdata, int len, const char *filename)
-{
-    MEMFILE *instream;
-    MEMFILE *outstream;
-    void *outbuf;
-    size_t outbuf_len;
-    int result;
-
-    instream = mem_fopen_read(musdata, len);
-    outstream = mem_fopen_write();
-
-    result = mus2mid(instream, outstream);
-
-    if (result == 0)
-    {
-        mem_get_buf(outstream, &outbuf, &outbuf_len);
-
-        M_WriteFile(filename, outbuf, outbuf_len);
-    }
-
-    mem_fclose(instream);
-    mem_fclose(outstream);
-
-    return result;
-}
-
-static void *I_SDL_RegisterSong(void *data, int len)
-{
-    char *filename;
-    Mix_Music *music;
-
-    if (!music_initialized)
-    {
-        return NULL;
-    }
-
-    // MUS files begin with "MUS"
-    // Reject anything which doesnt have this signature
-
-    filename = M_TempFile("doom.mid");
-
-    if (IsMid(data, len) && len < MAXMIDLENGTH)
-    {
-        M_WriteFile(filename, data, len);
-    }
-    else
-    {
-	// Assume a MUS file and try to convert
-
-        ConvertMus(data, len, filename);
-    }
-
-    // Load the MIDI. In an ideal world we'd be using Mix_LoadMUS_RW()
-    // by now, but Mix_SetMusicCMD() only works with Mix_LoadMUS(), so
-    // we have to generate a temporary file.
-
-    music = Mix_LoadMUS(filename);
-    if (music == NULL)
-    {
-        // Failed to load
-        fprintf(stderr, "Error loading midi: %s\n", Mix_GetError());
-    }
-
-    // Remove the temporary MIDI file; however, when using an external
-    // MIDI program we can't delete the file. Otherwise, the program
-    // won't find the file to play. This means we leave a mess on
-    // disk :(
-
-    if (strlen(snd_musiccmd) == 0)
-    {
-        M_remove(filename);
-    }
-
-    free(filename);
-
-    return music;
-}
-
-// Is the song playing?
-static boolean I_SDL_MusicIsPlaying(void)
-{
-    if (!music_initialized)
-    {
-        return false;
-    }
-
-    return Mix_PlayingMusic();
-}
-
-static const snddevice_t music_sdl_devices[] =
-{
-    SNDDEVICE_PAS,
-    SNDDEVICE_GUS,
-    SNDDEVICE_WAVEBLASTER,
-    SNDDEVICE_SOUNDCANVAS,
-    SNDDEVICE_GENMIDI,
-    SNDDEVICE_AWE32,
-};
-
-const music_module_t music_sdl_module =
-{
-    music_sdl_devices,
-    arrlen(music_sdl_devices),
-    I_SDL_InitMusic,
-    I_SDL_ShutdownMusic,
-    I_SDL_SetMusicVolume,
-    I_SDL_PauseSong,
-    I_SDL_ResumeSong,
-    I_SDL_RegisterSong,
-    I_SDL_UnRegisterSong,
-    I_SDL_PlaySong,
-    I_SDL_StopSong,
-    I_SDL_MusicIsPlaying,
-    NULL,  // Poll
-};
-
-
-#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/src/i_sdlsound.c b/games/NXDoom/src/i_sdlsound.c
deleted file mode 100644
index 18a51a09d..000000000
--- a/games/NXDoom/src/i_sdlsound.c
+++ /dev/null
@@ -1,1146 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2008 David Flater
-//
-// 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.
-//
-// DESCRIPTION:
-//	System interface for sound.
-//
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include "SDL.h"
-
-#ifdef HAVE_LIBSAMPLERATE
-#include <samplerate.h>
-#endif
-
-#include "deh_str.h"
-#include "i_sound.h"
-#include "i_system.h"
-#include "i_swap.h"
-#include "m_argv.h"
-#include "m_misc.h"
-#include "w_wad.h"
-#include "z_zone.h"
-
-#include "doomtype.h"
-
-
-int use_libsamplerate = 0;
-
-// Scale factor used when converting libsamplerate floating point numbers
-// to integers. Too high means the sounds can clip; too low means they
-// will be too quiet. This is an amount that should avoid clipping most
-// of the time: with all the Doom IWAD sound effects, at least. If a PWAD
-// is used, clipping might occur.
-
-float libsamplerate_scale = 0.65f;
-
-
-#ifndef DISABLE_SDL2MIXER
-
-#include "SDL_mixer.h"
-
-
-#define LOW_PASS_FILTER
-//#define DEBUG_DUMP_WAVS
-#define NUM_CHANNELS 16
-
-typedef struct allocated_sound_s allocated_sound_t;
-
-struct allocated_sound_s
-{
-    sfxinfo_t *sfxinfo;
-    Mix_Chunk chunk;
-    int use_count;
-    int pitch;
-    allocated_sound_t *prev, *next;
-};
-
-static boolean sound_initialized = false;
-
-static allocated_sound_t *channels_playing[NUM_CHANNELS];
-
-static int mixer_freq;
-static Uint16 mixer_format;
-static int mixer_channels;
-static boolean use_sfx_prefix;
-static boolean (*ExpandSoundData)(sfxinfo_t *sfxinfo,
-                                  byte *data,
-                                  int samplerate,
-                                  int length) = NULL;
-
-// Doubly-linked list of allocated sounds.
-// When a sound is played, it is moved to the head, so that the oldest
-// sounds not used recently are at the tail.
-
-static allocated_sound_t *allocated_sounds_head = NULL;
-static allocated_sound_t *allocated_sounds_tail = NULL;
-static int allocated_sounds_size = 0;
-
-
-// Hook a sound into the linked list at the head.
-
-static void AllocatedSoundLink(allocated_sound_t *snd)
-{
-    snd->prev = NULL;
-
-    snd->next = allocated_sounds_head;
-    allocated_sounds_head = snd;
-
-    if (allocated_sounds_tail == NULL)
-    {
-        allocated_sounds_tail = snd;
-    }
-    else
-    {
-        snd->next->prev = snd;
-    }
-}
-
-// Unlink a sound from the linked list.
-
-static void AllocatedSoundUnlink(allocated_sound_t *snd)
-{
-    if (snd->prev == NULL)
-    {
-        allocated_sounds_head = snd->next;
-    }
-    else
-    {
-        snd->prev->next = snd->next;
-    }
-
-    if (snd->next == NULL)
-    {
-        allocated_sounds_tail = snd->prev;
-    }
-    else
-    {
-        snd->next->prev = snd->prev;
-    }
-}
-
-static void FreeAllocatedSound(allocated_sound_t *snd)
-{
-    // Unlink from linked list.
-
-    AllocatedSoundUnlink(snd);
-
-    // Keep track of the amount of allocated sound data:
-
-    allocated_sounds_size -= snd->chunk.alen;
-
-    free(snd);
-}
-
-// Search from the tail backwards along the allocated sounds list, find
-// and free a sound that is not in use, to free up memory.  Return true
-// for success.
-
-static boolean FindAndFreeSound(void)
-{
-    allocated_sound_t *snd;
-
-    snd = allocated_sounds_tail;
-
-    while (snd != NULL)
-    {
-        if (snd->use_count == 0)
-        {
-            FreeAllocatedSound(snd);
-            return true;
-        }
-
-        snd = snd->prev;
-    }
-
-    // No available sounds to free...
-
-    return false;
-}
-
-// Enforce SFX cache size limit.  We are just about to allocate "len"
-// bytes on the heap for a new sound effect, so free up some space
-// so that we keep allocated_sounds_size < snd_cachesize
-
-static void ReserveCacheSpace(size_t len)
-{
-    if (snd_cachesize <= 0)
-    {
-        return;
-    }
-
-    // Keep freeing sound effects that aren't currently being played,
-    // until there is enough space for the new sound.
-
-    while (allocated_sounds_size + len > snd_cachesize)
-    {
-        // Free a sound.  If there is nothing more to free, stop.
-
-        if (!FindAndFreeSound())
-        {
-            break;
-        }
-    }
-}
-
-// Allocate a block for a new sound effect.
-
-static allocated_sound_t *AllocateSound(sfxinfo_t *sfxinfo, size_t len)
-{
-    allocated_sound_t *snd;
-
-    // Keep allocated sounds within the cache size.
-
-    ReserveCacheSpace(len);
-
-    // Allocate the sound structure and data.  The data will immediately
-    // follow the structure, which acts as a header.
-
-    do
-    {
-        snd = malloc(sizeof(allocated_sound_t) + len);
-
-        // Out of memory?  Try to free an old sound, then loop round
-        // and try again.
-
-        if (snd == NULL && !FindAndFreeSound())
-        {
-            return NULL;
-        }
-
-    } while (snd == NULL);
-
-    // Skip past the chunk structure for the audio buffer
-
-    snd->chunk.abuf = (byte *) (snd + 1);
-    snd->chunk.alen = len;
-    snd->chunk.allocated = 1;
-    snd->chunk.volume = MIX_MAX_VOLUME;
-    snd->pitch = NORM_PITCH;
-
-    snd->sfxinfo = sfxinfo;
-    snd->use_count = 0;
-
-    // Keep track of how much memory all these cached sounds are using...
-
-    allocated_sounds_size += len;
-
-    AllocatedSoundLink(snd);
-
-    return snd;
-}
-
-// Lock a sound, to indicate that it may not be freed.
-
-static void LockAllocatedSound(allocated_sound_t *snd)
-{
-    // Increase use count, to stop the sound being freed.
-
-    ++snd->use_count;
-
-    //printf("++ %s: Use count=%i\n", snd->sfxinfo->name, snd->use_count);
-
-    // When we use a sound, re-link it into the list at the head, so
-    // that the oldest sounds fall to the end of the list for freeing.
-
-    AllocatedSoundUnlink(snd);
-    AllocatedSoundLink(snd);
-}
-
-// Unlock a sound to indicate that it may now be freed.
-
-static void UnlockAllocatedSound(allocated_sound_t *snd)
-{
-    if (snd->use_count <= 0)
-    {
-        I_Error("Sound effect released more times than it was locked...");
-    }
-
-    --snd->use_count;
-
-    //printf("-- %s: Use count=%i\n", snd->sfxinfo->name, snd->use_count);
-}
-
-// Search through the list of allocated sounds and return the one that matches
-// the supplied sfxinfo entry and pitch level.
-
-static allocated_sound_t * GetAllocatedSoundBySfxInfoAndPitch(sfxinfo_t *sfxinfo, int pitch)
-{
-    allocated_sound_t * p = allocated_sounds_head;
-
-    while (p != NULL)
-    {
-        if (p->sfxinfo == sfxinfo && p->pitch == pitch)
-        {
-            return p;
-        }
-        p = p->next;
-    }
-
-    return NULL;
-}
-
-// Allocate a new sound chunk and pitch-shift an existing sound up-or-down
-// into it.
-
-static allocated_sound_t * PitchShift(allocated_sound_t *insnd, int pitch)
-{
-    allocated_sound_t * outsnd;
-    Sint16 *inp, *outp;
-    Sint16 *srcbuf, *dstbuf;
-    Uint32 srclen, dstlen;
-
-    srcbuf = (Sint16 *)insnd->chunk.abuf;
-    srclen = insnd->chunk.alen;
-
-    // determine ratio pitch:NORM_PITCH and apply to srclen, then invert.
-    // This is an approximation of vanilla behaviour based on measurements
-    dstlen = (int)((1 + (1 - (float)pitch / NORM_PITCH)) * srclen);
-
-    // ensure that the new buffer is an even length
-    if ((dstlen % 2) == 0)
-    {
-        dstlen++;
-    }
-
-    outsnd = AllocateSound(insnd->sfxinfo, dstlen);
-
-    if (!outsnd)
-    {
-        return NULL;
-    }
-
-    outsnd->pitch = pitch;
-    dstbuf = (Sint16 *)outsnd->chunk.abuf;
-
-    // loop over output buffer. find corresponding input cell, copy over
-    for (outp = dstbuf; outp < dstbuf + dstlen/2; ++outp)
-    {
-        inp = srcbuf + (int)((float)(outp - dstbuf) / dstlen * srclen);
-        *outp = *inp;
-    }
-
-    return outsnd;
-}
-
-// When a sound stops, check if it is still playing.  If it is not,
-// we can mark the sound data as CACHE to be freed back for other
-// means.
-
-static void ReleaseSoundOnChannel(int channel)
-{
-    allocated_sound_t *snd = channels_playing[channel];
-
-    Mix_HaltChannel(channel);
-
-    if (snd == NULL)
-    {
-        return;
-    }
-
-    channels_playing[channel] = NULL;
-
-    UnlockAllocatedSound(snd);
-
-    // if the sound is a pitch-shift and it's not in use, immediately
-    // free it
-    if (snd->pitch != NORM_PITCH && snd->use_count <= 0)
-    {
-        FreeAllocatedSound(snd);
-    }
-}
-
-#ifdef HAVE_LIBSAMPLERATE
-
-// Returns the conversion mode for libsamplerate to use.
-
-static int SRC_ConversionMode(void)
-{
-    switch (use_libsamplerate)
-    {
-        // 0 = disabled
-
-        default:
-        case 0:
-            return -1;
-
-        // Ascending numbers give higher quality
-
-        case 1:
-            return SRC_LINEAR;
-        case 2:
-            return SRC_ZERO_ORDER_HOLD;
-        case 3:
-            return SRC_SINC_FASTEST;
-        case 4:
-            return SRC_SINC_MEDIUM_QUALITY;
-        case 5:
-            return SRC_SINC_BEST_QUALITY;
-    }
-}
-
-// libsamplerate-based generic sound expansion function for any sample rate
-//   unsigned 8 bits --> signed 16 bits
-//   mono --> stereo
-//   samplerate --> mixer_freq
-// Returns number of clipped samples.
-// DWF 2008-02-10 with cleanups by Simon Howard.
-
-static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
-                                   byte *data,
-                                   int samplerate,
-                                   int length)
-{
-    SRC_DATA src_data;
-    float *data_in;
-    uint32_t i, abuf_index=0, clipped=0;
-//    uint32_t alen;
-    int retn;
-    int16_t *expanded;
-    allocated_sound_t *snd;
-    Mix_Chunk *chunk;
-
-    src_data.input_frames = length;
-    data_in = malloc(length * sizeof(float));
-    src_data.data_in = data_in;
-    src_data.src_ratio = (double)mixer_freq / samplerate;
-
-    // We include some extra space here in case of rounding-up.
-    src_data.output_frames = src_data.src_ratio * length + (mixer_freq / 4);
-    src_data.data_out = malloc(src_data.output_frames * sizeof(float));
-
-    assert(src_data.data_in != NULL && src_data.data_out != NULL);
-
-    // Convert input data to floats
-
-    for (i=0; i<length; ++i)
-    {
-        // Unclear whether 128 should be interpreted as "zero" or whether a
-        // symmetrical range should be assumed.  The following assumes a
-        // symmetrical range.
-        data_in[i] = data[i] / 127.5 - 1;
-    }
-
-    // Do the sound conversion
-
-    retn = src_simple(&src_data, SRC_ConversionMode(), 1);
-    assert(retn == 0);
-
-    // Allocate the new chunk.
-
-//    alen = src_data.output_frames_gen * 4;
-
-    snd = AllocateSound(sfxinfo, src_data.output_frames_gen * 4);
-
-    if (snd == NULL)
-    {
-        return false;
-    }
-
-    chunk = &snd->chunk;
-    expanded = (int16_t *) chunk->abuf;
-
-    // Convert the result back into 16-bit integers.
-
-    for (i=0; i<src_data.output_frames_gen; ++i)
-    {
-        // libsamplerate does not limit itself to the -1.0 .. 1.0 range on
-        // output, so a multiplier less than INT16_MAX (32767) is required
-        // to avoid overflows or clipping.  However, the smaller the
-        // multiplier, the quieter the sound effects get, and the more you
-        // have to turn down the music to keep it in balance.
-
-        // 22265 is the largest multiplier that can be used to resample all
-        // of the Vanilla DOOM sound effects to 48 kHz without clipping
-        // using SRC_SINC_BEST_QUALITY.  It is close enough (only slightly
-        // too conservative) for SRC_SINC_MEDIUM_QUALITY and
-        // SRC_SINC_FASTEST.  PWADs with interestingly different sound
-        // effects or target rates other than 48 kHz might still result in
-        // clipping--I don't know if there's a limit to it.
-
-        // As the number of clipped samples increases, the signal is
-        // gradually overtaken by noise, with the loudest parts going first.
-        // However, a moderate amount of clipping is often tolerated in the
-        // quest for the loudest possible sound overall.  The results of
-        // using INT16_MAX as the multiplier are not all that bad, but
-        // artifacts are noticeable during the loudest parts.
-
-        float cvtval_f =
-            src_data.data_out[i] * libsamplerate_scale * INT16_MAX;
-        int32_t cvtval_i = cvtval_f + (cvtval_f < 0 ? -0.5 : 0.5);
-
-        // Asymmetrical sound worries me, so we won't use -32768.
-        if (cvtval_i < -INT16_MAX)
-        {
-            cvtval_i = -INT16_MAX;
-            ++clipped;
-        }
-        else if (cvtval_i > INT16_MAX)
-        {
-            cvtval_i = INT16_MAX;
-            ++clipped;
-        }
-
-        // Left and right channels
-
-        expanded[abuf_index++] = cvtval_i;
-        expanded[abuf_index++] = cvtval_i;
-    }
-
-    free(data_in);
-    free(src_data.data_out);
-
-    if (clipped > 0)
-    {
-        fprintf(stderr, "Sound '%s': clipped %u samples (%0.2f %%)\n", 
-                        sfxinfo->name, clipped,
-                        400.0 * clipped / chunk->alen);
-    }
-
-    return true;
-}
-
-#endif
-
-static boolean ConvertibleRatio(int freq1, int freq2)
-{
-    int ratio;
-
-    if (freq1 > freq2)
-    {
-        return ConvertibleRatio(freq2, freq1);
-    }
-    else if ((freq2 % freq1) != 0)
-    {
-        // Not in a direct ratio
-
-        return false;
-    }
-    else
-    {
-        // Check the ratio is a power of 2
-
-        ratio = freq2 / freq1;
-
-        while ((ratio & 1) == 0)
-        {
-            ratio = ratio >> 1;
-        }
-
-        return ratio == 1;
-    }
-}
-
-#ifdef DEBUG_DUMP_WAVS
-
-// Debug code to dump resampled sound effects to WAV files for analysis.
-
-static void WriteWAV(char *filename, byte *data,
-                     uint32_t length, int samplerate)
-{
-    FILE *wav;
-    unsigned int i;
-    unsigned short s;
-
-    wav = M_fopen(filename, "wb");
-
-    // Header
-
-    fwrite("RIFF", 1, 4, wav);
-    i = LONG(36 + samplerate);
-    fwrite(&i, 4, 1, wav);
-    fwrite("WAVE", 1, 4, wav);
-
-    // Subchunk 1
-
-    fwrite("fmt ", 1, 4, wav);
-    i = LONG(16);
-    fwrite(&i, 4, 1, wav);           // Length
-    s = SHORT(1);
-    fwrite(&s, 2, 1, wav);           // Format (PCM)
-    s = SHORT(2);
-    fwrite(&s, 2, 1, wav);           // Channels (2=stereo)
-    i = LONG(samplerate);
-    fwrite(&i, 4, 1, wav);           // Sample rate
-    i = LONG(samplerate * 2 * 2);
-    fwrite(&i, 4, 1, wav);           // Byte rate (samplerate * stereo * 16 bit)
-    s = SHORT(2 * 2);
-    fwrite(&s, 2, 1, wav);           // Block align (stereo * 16 bit)
-    s = SHORT(16);
-    fwrite(&s, 2, 1, wav);           // Bits per sample (16 bit)
-
-    // Data subchunk
-
-    fwrite("data", 1, 4, wav);
-    i = LONG(length);
-    fwrite(&i, 4, 1, wav);           // Data length
-    fwrite(data, 1, length, wav);    // Data
-
-    fclose(wav);
-}
-
-#endif
-
-// Generic sound expansion function for any sample rate.
-// Returns number of clipped samples (always 0).
-
-static boolean ExpandSoundData_SDL(sfxinfo_t *sfxinfo,
-                                   byte *data,
-                                   int samplerate,
-                                   int length)
-{
-    SDL_AudioCVT convertor;
-    allocated_sound_t *snd;
-    Mix_Chunk *chunk;
-    uint32_t expanded_length;
-
-    // Calculate the length of the expanded version of the sample.
-
-    expanded_length = (uint32_t) ((((uint64_t) length) * mixer_freq) / samplerate);
-
-    // Double up twice: 8 -> 16 bit and mono -> stereo
-
-    expanded_length *= 4;
-
-    // Allocate a chunk in which to expand the sound
-
-    snd = AllocateSound(sfxinfo, expanded_length);
-
-    if (snd == NULL)
-    {
-        return false;
-    }
-
-    chunk = &snd->chunk;
-
-    // If we can, use the standard / optimized SDL conversion routines.
-
-    if (samplerate <= mixer_freq
-     && ConvertibleRatio(samplerate, mixer_freq)
-     && SDL_BuildAudioCVT(&convertor,
-                          AUDIO_U8, 1, samplerate,
-                          mixer_format, mixer_channels, mixer_freq))
-    {
-        convertor.len = length;
-        convertor.buf = malloc(convertor.len * convertor.len_mult);
-        assert(convertor.buf != NULL);
-        memcpy(convertor.buf, data, length);
-
-        SDL_ConvertAudio(&convertor);
-
-        memcpy(chunk->abuf, convertor.buf, chunk->alen);
-        free(convertor.buf);
-    }
-    else
-    {
-        Sint16 *expanded = (Sint16 *) chunk->abuf;
-        int expanded_length;
-        int expand_ratio;
-        int i;
-
-        // Generic expansion if conversion does not work:
-        //
-        // SDL's audio conversion only works for rate conversions that are
-        // powers of 2; if the two formats are not in a direct power of 2
-        // ratio, do this naive conversion instead.
-
-        // number of samples in the converted sound
-
-        expanded_length = ((uint64_t) length * mixer_freq) / samplerate;
-        expand_ratio = (length << 8) / expanded_length;
-
-        for (i=0; i<expanded_length; ++i)
-        {
-            Sint16 sample;
-            int src;
-
-            src = (i * expand_ratio) >> 8;
-
-            sample = data[src] | (data[src] << 8);
-            sample -= 32768;
-
-            // expand 8->16 bits, mono->stereo
-
-            expanded[i * 2] = expanded[i * 2 + 1] = sample;
-        }
-
-#ifdef LOW_PASS_FILTER
-        // Perform a low-pass filter on the upscaled sound to filter
-        // out high-frequency noise from the conversion process.
-
-        {
-            float rc, dt, alpha;
-
-            // Low-pass filter for cutoff frequency f:
-            //
-            // For sampling rate r, dt = 1 / r
-            // rc = 1 / 2*pi*f
-            // alpha = dt / (rc + dt)
-
-            // Filter to the half sample rate of the original sound effect
-            // (maximum frequency, by nyquist)
-
-            dt = 1.0f / mixer_freq;
-            rc = 1.0f / (3.14f * samplerate);
-            alpha = dt / (rc + dt);
-
-            // Both channels are processed in parallel, hence [i-2]:
-
-            for (i=2; i<expanded_length * 2; ++i)
-            {
-                expanded[i] = (Sint16) (alpha * expanded[i]
-                                      + (1 - alpha) * expanded[i-2]);
-            }
-        }
-#endif /* #ifdef LOW_PASS_FILTER */
-    }
-
-    return true;
-}
-
-// Load and convert a sound effect
-// Returns true if successful
-
-static boolean CacheSFX(sfxinfo_t *sfxinfo)
-{
-    int lumpnum;
-    unsigned int lumplen;
-    int samplerate;
-    unsigned int length;
-    byte *data;
-
-    // need to load the sound
-
-    lumpnum = sfxinfo->lumpnum;
-    data = W_CacheLumpNum(lumpnum, PU_STATIC);
-    lumplen = W_LumpLength(lumpnum);
-
-    // Check the header, and ensure this is a valid sound
-
-    if (lumplen < 8
-     || data[0] != 0x03 || data[1] != 0x00)
-    {
-        // Invalid sound
-
-        return false;
-    }
-
-    // 16 bit sample rate field, 32 bit length field
-
-    samplerate = (data[3] << 8) | data[2];
-    length = (data[7] << 24) | (data[6] << 16) | (data[5] << 8) | data[4];
-
-    // If the header specifies that the length of the sound is greater than
-    // the length of the lump itself, this is an invalid sound lump
-
-    // We also discard sound lumps that are less than 49 samples long,
-    // as this is how DMX behaves - although the actual cut-off length
-    // seems to vary slightly depending on the sample rate.  This needs
-    // further investigation to better understand the correct
-    // behavior.
-
-    if (length > lumplen - 8 || length <= 48)
-    {
-        return false;
-    }
-
-    // The DMX sound library seems to skip the first 16 and last 16
-    // bytes of the lump - reason unknown.
-
-    data += 16;
-    length -= 32;
-
-    // Sample rate conversion
-
-    if (!ExpandSoundData(sfxinfo, data + 8, samplerate, length))
-    {
-        return false;
-    }
-
-#ifdef DEBUG_DUMP_WAVS
-    {
-        char filename[16];
-        allocated_sound_t * snd;
-
-        M_snprintf(filename, sizeof(filename), "%s.wav",
-                   DEH_String(sfxinfo->name));
-        snd = GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH);
-        WriteWAV(filename, snd->chunk.abuf, snd->chunk.alen,mixer_freq);
-    }
-#endif
-
-    // don't need the original lump any more
-  
-    W_ReleaseLumpNum(lumpnum);
-
-    return true;
-}
-
-static void GetSfxLumpName(sfxinfo_t *sfx, char *buf, size_t buf_len)
-{
-    // Linked sfx lumps? Get the lump number for the sound linked to.
-
-    if (sfx->link != NULL)
-    {
-        sfx = sfx->link;
-    }
-
-    // Doom adds a DS* prefix to sound lumps; Heretic and Hexen don't
-    // do this.
-
-    if (use_sfx_prefix)
-    {
-        M_snprintf(buf, buf_len, "ds%s", DEH_String(sfx->name));
-    }
-    else
-    {
-        M_StringCopy(buf, DEH_String(sfx->name), buf_len);
-    }
-}
-
-// Preload all the sound effects - stops nasty ingame freezes
-
-static void I_SDL_PrecacheSounds(sfxinfo_t *sounds, int num_sounds)
-{
-    char namebuf[9];
-    int i;
-
-    printf("I_SDL_PrecacheSounds: Precaching all sound effects..");
-
-    for (i=0; i<num_sounds; ++i)
-    {
-        if ((i % 6) == 0)
-        {
-            printf(".");
-            fflush(stdout);
-        }
-
-        GetSfxLumpName(&sounds[i], namebuf, sizeof(namebuf));
-
-        sounds[i].lumpnum = W_CheckNumForName(namebuf);
-
-        if (sounds[i].lumpnum != -1)
-        {
-            CacheSFX(&sounds[i]);
-        }
-    }
-
-    printf("\n");
-}
-
-// Load a SFX chunk into memory and ensure that it is locked.
-
-static boolean LockSound(sfxinfo_t *sfxinfo)
-{
-    // If the sound isn't loaded, load it now
-    if (GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH) == NULL)
-    {
-        if (!CacheSFX(sfxinfo))
-        {
-            return false;
-        }
-    }
-
-    LockAllocatedSound(GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH));
-
-    return true;
-}
-
-//
-// Retrieve the raw data lump index
-//  for a given SFX name.
-//
-
-static int I_SDL_GetSfxLumpNum(sfxinfo_t *sfx)
-{
-    char namebuf[9];
-
-    GetSfxLumpName(sfx, namebuf, sizeof(namebuf));
-
-    return W_GetNumForName(namebuf);
-}
-
-static void I_SDL_UpdateSoundParams(int handle, int vol, int sep)
-{
-    int left, right;
-
-    if (!sound_initialized || handle < 0 || handle >= NUM_CHANNELS)
-    {
-        return;
-    }
-
-    left = ((254 - sep) * vol) / 127;
-    right = ((sep) * vol) / 127;
-
-    if (left < 0) left = 0;
-    else if ( left > 255) left = 255;
-    if (right < 0) right = 0;
-    else if (right > 255) right = 255;
-
-    Mix_SetPanning(handle, left, right);
-}
-
-//
-// Starting a sound means adding it
-//  to the current list of active sounds
-//  in the internal channels.
-// As the SFX info struct contains
-//  e.g. a pointer to the raw data,
-//  it is ignored.
-// As our sound handling does not handle
-//  priority, it is ignored.
-// Pitching (that is, increased speed of playback)
-//  is set, but currently not used by mixing.
-//
-
-static int I_SDL_StartSound(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch)
-{
-    allocated_sound_t *snd;
-
-    if (!sound_initialized || channel < 0 || channel >= NUM_CHANNELS)
-    {
-        return -1;
-    }
-
-    // Release a sound effect if there is already one playing
-    // on this channel
-
-    ReleaseSoundOnChannel(channel);
-
-    // Get the sound data
-
-    if (!LockSound(sfxinfo))
-    {
-        return -1;
-    }
-
-    snd = GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, pitch);
-
-    if (snd == NULL)
-    {
-        allocated_sound_t *newsnd;
-        // fetch the base sound effect, un-pitch-shifted
-        snd = GetAllocatedSoundBySfxInfoAndPitch(sfxinfo, NORM_PITCH);
-
-        if (snd == NULL)
-        {
-            return -1;
-        }
-
-        if (snd_pitchshift)
-        {
-            newsnd = PitchShift(snd, pitch);
-
-            if (newsnd)
-            {
-                LockAllocatedSound(newsnd);
-                UnlockAllocatedSound(snd);
-                snd = newsnd;
-            }
-        }
-    }
-    else
-    {
-        LockAllocatedSound(snd);
-    }
-
-    // play sound
-
-    Mix_PlayChannel(channel, &snd->chunk, 0);
-
-    channels_playing[channel] = snd;
-
-    // set separation, etc.
-
-    I_SDL_UpdateSoundParams(channel, vol, sep);
-
-    return channel;
-}
-
-static void I_SDL_StopSound(int handle)
-{
-    if (!sound_initialized || handle < 0 || handle >= NUM_CHANNELS)
-    {
-        return;
-    }
-
-    // Sound data is no longer needed; release the
-    // sound data being used for this channel
-
-    ReleaseSoundOnChannel(handle);
-}
-
-
-static boolean I_SDL_SoundIsPlaying(int handle)
-{
-    if (!sound_initialized || handle < 0 || handle >= NUM_CHANNELS)
-    {
-        return false;
-    }
-
-    return Mix_Playing(handle);
-}
-
-//
-// Periodically called to update the sound system
-//
-
-static void I_SDL_UpdateSound(void)
-{
-    int i;
-
-    // Check all channels to see if a sound has finished
-
-    for (i=0; i<NUM_CHANNELS; ++i)
-    {
-        if (channels_playing[i] && !I_SDL_SoundIsPlaying(i))
-        {
-            // Sound has finished playing on this channel,
-            // but sound data has not been released to cache
-
-            ReleaseSoundOnChannel(i);
-        }
-    }
-}
-
-static void I_SDL_ShutdownSound(void)
-{
-    if (!sound_initialized)
-    {
-        return;
-    }
-
-    Mix_CloseAudio();
-    SDL_QuitSubSystem(SDL_INIT_AUDIO);
-
-    sound_initialized = false;
-}
-
-// Calculate slice size, based on snd_maxslicetime_ms.
-// The result must be a power of two.
-
-static int GetSliceSize(void)
-{
-    int limit;
-    int n;
-
-    limit = (snd_samplerate * snd_maxslicetime_ms) / 1000;
-
-    // Try all powers of two, not exceeding the limit.
-
-    for (n=0;; ++n)
-    {
-        // 2^n <= limit < 2^n+1 ?
-
-        if ((1 << (n + 1)) > limit)
-        {
-            return (1 << n);
-        }
-    }
-
-    // Should never happen?
-
-    return 1024;
-}
-
-static boolean I_SDL_InitSound(GameMission_t mission)
-{
-    int i;
-
-    use_sfx_prefix = (mission == doom || mission == strife);
-
-    // No sounds yet
-    for (i=0; i<NUM_CHANNELS; ++i)
-    {
-        channels_playing[i] = NULL;
-    }
-
-    if (SDL_Init(SDL_INIT_AUDIO) < 0)
-    {
-        fprintf(stderr, "Unable to set up sound.\n");
-        return false;
-    }
-
-    if (Mix_OpenAudioDevice(snd_samplerate, AUDIO_S16SYS, 2, GetSliceSize(), NULL, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) < 0)
-    {
-        fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
-        return false;
-    }
-
-    ExpandSoundData = ExpandSoundData_SDL;
-
-    Mix_QuerySpec(&mixer_freq, &mixer_format, &mixer_channels);
-
-#ifdef HAVE_LIBSAMPLERATE
-    if (use_libsamplerate != 0)
-    {
-        if (SRC_ConversionMode() < 0)
-        {
-            I_Error("I_SDL_InitSound: Invalid value for use_libsamplerate: %i",
-                    use_libsamplerate);
-        }
-
-        ExpandSoundData = ExpandSoundData_SRC;
-    }
-#else
-    if (use_libsamplerate != 0)
-    {
-        fprintf(stderr, "I_SDL_InitSound: use_libsamplerate=%i, but "
-                        "libsamplerate support not compiled in.\n",
-                        use_libsamplerate);
-    }
-#endif
-
-    Mix_AllocateChannels(NUM_CHANNELS);
-
-    SDL_PauseAudio(0);
-
-    sound_initialized = true;
-
-    return true;
-}
-
-static const snddevice_t sound_sdl_devices[] =
-{
-    SNDDEVICE_SB,
-    SNDDEVICE_PAS,
-    SNDDEVICE_GUS,
-    SNDDEVICE_WAVEBLASTER,
-    SNDDEVICE_SOUNDCANVAS,
-    SNDDEVICE_AWE32,
-};
-
-const sound_module_t sound_sdl_module =
-{
-    sound_sdl_devices,
-    arrlen(sound_sdl_devices),
-    I_SDL_InitSound,
-    I_SDL_ShutdownSound,
-    I_SDL_GetSfxLumpNum,
-    I_SDL_UpdateSound,
-    I_SDL_UpdateSoundParams,
-    I_SDL_StartSound,
-    I_SDL_StopSound,
-    I_SDL_SoundIsPlaying,
-    I_SDL_PrecacheSounds,
-};
-
-
-#endif // DISABLE_SDL2MIXER
diff --git a/games/NXDoom/src/i_sound.c b/games/NXDoom/src/i_sound.c
index 7a7bdb31a..e86a7e65b 100644
--- a/games/NXDoom/src/i_sound.c
+++ b/games/NXDoom/src/i_sound.c
@@ -1,19 +1,26 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_sound.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,514 +34,484 @@
 #include "m_argv.h"
 #include "m_config.h"
 
-#ifndef DISABLE_SDL2MIXER
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-#include "SDL_mixer.h"
-
-#endif  // DISABLE_SDL2MIXER
-
-
-// Sound sample rate to use for digital output (Hz)
+/* Sound sample rate to use for digital output (Hz) */
 
 int snd_samplerate = 44100;
 
-// Maximum number of bytes to dedicate to allocated sound effects.
-// (Default: 64MB)
+/* Maximum number of bytes to dedicate to allocated sound effects.
+ * (Default: 64MB)
+ */
 
 int snd_cachesize = 64 * 1024 * 1024;
 
-// Config variable that controls the sound buffer size.
-// We default to 28ms (1000 / 35fps = 1 buffer per tic).
+/* Config variable that controls the sound buffer size.
+ * We default to 28ms (1000 / 35fps = 1 buffer per tic).
+ */
 
 int snd_maxslicetime_ms = 28;
 
-// External command to invoke to play back music.
+/* External command to invoke to play back music. */
 
 char *snd_musiccmd = "";
 
-// Whether to vary the pitch of sound effects
-// Each game will set the default differently
+/* Whether to vary the pitch of sound effects
+ * Each game will set the default differently
+ */
 
 int snd_pitchshift = -1;
 
 int snd_musicdevice = SNDDEVICE_SB;
 int snd_sfxdevice = SNDDEVICE_SB;
 
-// Low-level sound and music modules we are using
+/* Scale factor used when converting libsamplerate floating point numbers
+ * to integers. Too high means the sounds can clip; too low means they
+ * will be too quiet. This is an amount that should avoid clipping most
+ * of the time: with all the Doom IWAD sound effects, at least. If a PWAD
+ * is used, clipping might occur.
+ *
+ * NOTE: originally from i_sdlsound.c
+ */
+
+float libsamplerate_scale = 0.65f;
+int use_libsamplerate = 0;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Low-level sound and music modules we are using */
+
 static const sound_module_t *sound_module;
 static const music_module_t *music_module;
 
-// If true, the music pack module was successfully initialized.
+/* If true, the music pack module was successfully initialized. */
+
 static boolean music_packs_active = false;
 
-// This is either equal to music_module or &music_pack_module,
-// depending on whether the current track is substituted.
+/* This is either equal to music_module or &music_pack_module,
+ * depending on whether the current track is substituted.
+ */
+
 static const music_module_t *active_music_module;
 
-
-// DOS-specific options: These are unused but should be maintained
-// so that the config file can be shared between chocolate
-// doom and doom.exe
+/* DOS-specific options: These are unused but should be maintained
+ * so that the config file can be shared between chocolate
+ * doom and doom.exe
+ */
 
 static int snd_sbport = 0;
 static int snd_sbirq = 0;
 static int snd_sbdma = 0;
 static int snd_mport = 0;
 
-// Compiled-in sound modules:
+/* Compiled-in sound modules: */
 
 static const sound_module_t *sound_modules[] =
 {
-#ifndef DISABLE_SDL2MIXER
-    &sound_sdl_module,
-#endif // DISABLE_SDL2MIXER
-    &sound_pcsound_module,
-    NULL,
+  &sound_pcsound_module,
+  NULL,
 };
 
-// Compiled-in music modules:
+/* Compiled-in music modules: */
 
 static const music_module_t *music_modules[] =
 {
-#ifdef _WIN32
-    &music_win_module,
-#endif
-#ifdef HAVE_FLUIDSYNTH
-    &music_fl_module,
-#endif // HAVE_FLUIDSYNTH
-#ifndef DISABLE_SDL2MIXER
-    &music_sdl_module,
-#endif // DISABLE_SDL2MIXER
+#if 0
     &music_opl_module,
+#endif
     NULL,
 };
 
-// Check if a sound device is in the given list of devices
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static boolean SndDeviceInList(snddevice_t device, const snddevice_t *list,
-                               int len)
+/* Check if a sound device is in the given list of devices */
+
+static boolean snd_device_in_list(snddevice_t device,
+                                  const snddevice_t *list, int len)
 {
-    int i;
+  int i;
 
-    for (i=0; i<len; ++i)
+  for (i = 0; i < len; ++i)
     {
-        if (device == list[i])
+      if (device == list[i])
         {
-            return true;
+          return true;
         }
     }
 
-    return false;
+  return false;
 }
 
-// Find and initialize a sound_module_t appropriate for the setting
-// in snd_sfxdevice.
+/* Find and initialize a sound_module_t appropriate for the setting
+ * in snd_sfxdevice.
+ */
 
-static void InitSfxModule(GameMission_t mission)
+static void init_sfx_module(gamemission_t mission)
 {
-    int i;
+  int i;
 
-    sound_module = NULL;
+  sound_module = NULL;
 
-    for (i=0; sound_modules[i] != NULL; ++i)
+  for (i = 0; sound_modules[i] != NULL; ++i)
     {
-        // Is the sfx device in the list of devices supported by
-        // this module?
+      /* Is the sfx device in the list of devices supported by
+       * this module?
+       */
 
-        if (SndDeviceInList(snd_sfxdevice, 
-                            sound_modules[i]->sound_devices,
-                            sound_modules[i]->num_sound_devices))
+      if (snd_device_in_list(snd_sfxdevice, sound_modules[i]->sound_devices,
+                          sound_modules[i]->num_sound_devices))
         {
-            // Initialize the module
+          /* initialize the module */
 
-            if (sound_modules[i]->Init(mission))
+          if (sound_modules[i]->init(mission))
             {
-                sound_module = sound_modules[i];
-                return;
+              sound_module = sound_modules[i];
+              return;
             }
         }
     }
 }
 
-// Initialize music according to snd_musicdevice.
+/* initialize music according to snd_musicdevice. */
 
-static void InitMusicModule(void)
+static void init_music_module(void)
 {
-    int i;
+  int i;
 
-    music_module = NULL;
+  music_module = NULL;
 
-    for (i=0; music_modules[i] != NULL; ++i)
+  for (i = 0; music_modules[i] != NULL; ++i)
     {
-        // Is the music device in the list of devices supported
-        // by this module?
+      /* Is the music device in the list of devices supported
+       * by this module?
+       */
 
-        if (SndDeviceInList(snd_musicdevice, 
-                            music_modules[i]->sound_devices,
-                            music_modules[i]->num_sound_devices))
+      if (snd_device_in_list(snd_musicdevice,
+                             music_modules[i]->sound_devices,
+                             music_modules[i]->num_sound_devices))
         {
-        #ifdef _WIN32
-            // Skip the native Windows MIDI module if using Timidity.
+          /* initialize the module */
 
-            if (strcmp(timidity_cfg_path, "") &&
-                music_modules[i] == &music_win_module)
+          if (music_modules[i]->init())
             {
-                continue;
-            }
-        #endif
-
-            // Initialize the module
-
-            if (music_modules[i]->Init())
-            {
-                music_module = music_modules[i];
-                return;
+              music_module = music_modules[i];
+              return;
             }
         }
     }
 }
 
-//
-// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume,
-//  allocates channel buffer, sets S_sfx lookup.
-//
-
-void I_InitSound(GameMission_t mission)
+static void check_volume_separation(int *vol, int *sep)
 {
-    boolean nosound, nosfx, nomusic, nomusicpacks;
-
-    //!
-    // @vanilla
-    //
-    // Disable all sound output.
-    //
-
-    nosound = M_CheckParm("-nosound") > 0;
-
-    //!
-    // @vanilla
-    //
-    // Disable sound effects. 
-    //
-
-    nosfx = M_CheckParm("-nosfx") > 0;
-
-    //!
-    // @vanilla
-    //
-    // Disable music.
-    //
-
-    nomusic = M_CheckParm("-nomusic") > 0;
-
-    //!
-    //
-    // Disable substitution music packs.
-    //
-
-    nomusicpacks = M_ParmExists("-nomusicpacks");
-
-    // Auto configure the music pack directory.
-    M_SetMusicPackDir();
-
-    // Initialize the sound and music subsystems.
-
-    if (!nosound && !screensaver_mode)
+  if (*sep < 0)
     {
-        // This is kind of a hack. If native MIDI is enabled, set up
-        // the TIMIDITY_CFG environment variable here before SDL_mixer
-        // is opened.
+      *sep = 0;
+    }
+  else if (*sep > 254)
+    {
+      *sep = 254;
+    }
 
-        if (!nomusic
-         && (snd_musicdevice == SNDDEVICE_GENMIDI
-          || snd_musicdevice == SNDDEVICE_GUS))
+  if (*vol < 0)
+    {
+      *vol = 0;
+    }
+  else if (*vol > 127)
+    {
+      *vol = 127;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* initializes sound stuff, including volume
+ * Sets channels, SFX and music volume, allocates channel buffer, sets s_sfx
+ * lookup.
+ */
+
+void i_init_sound(gamemission_t mission)
+{
+  boolean nosound, nosfx, nomusic, nomusicpacks;
+
+  /* @vanilla
+   *
+   * Disable all sound output.
+   */
+
+  nosound = m_check_parm("-nosound") > 0;
+
+  /* @vanilla
+   *
+   * Disable sound effects.
+   */
+
+  nosfx = m_check_parm("-nosfx") > 0;
+
+  /* @vanilla
+   *
+   * Disable music.
+   */
+
+  nomusic = m_check_parm("-nomusic") > 0;
+
+  /* Disable substitution music packs. */
+
+  nomusicpacks = m_parm_exists("-nomusicpacks");
+
+  /* Auto configure the music pack directory. */
+
+  m_set_music_pack_dir();
+
+  /* initialize the sound and music subsystems. */
+
+  if (!nosound && !screensaver_mode)
+    {
+      /* This is kind of a hack. If native MIDI is enabled, set up
+       * the TIMIDITY_CFG environment variable here before SDL_mixer
+       * is opened.
+       */
+
+      if (!nomusic && (snd_musicdevice == SNDDEVICE_GENMIDI ||
+                       snd_musicdevice == SNDDEVICE_GUS))
         {
-            I_InitTimidityConfig();
+          i_init_timidity_config();
         }
 
-        if (!nosfx)
+      if (!nosfx)
         {
-            InitSfxModule(mission);
+          init_sfx_module(mission);
         }
 
-        if (!nomusic)
+      if (!nomusic)
         {
-            InitMusicModule();
-            active_music_module = music_module;
+          init_music_module();
+          active_music_module = music_module;
         }
 
-        // We may also have substitute MIDIs we can load.
-        if (!nomusicpacks && music_module != NULL)
+      /* We may also have substitute MIDIs we can load. */
+
+      if (!nomusicpacks && music_module != NULL)
         {
-            music_packs_active = music_pack_module.Init();
+          music_packs_active = music_pack_module.init();
         }
     }
 }
 
-void I_ShutdownSound(void)
+void i_shutdown_sound(void)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL)
     {
-        sound_module->Shutdown();
+      sound_module->shutdown();
     }
 
-    if (music_packs_active)
+  if (music_packs_active)
     {
-        music_pack_module.Shutdown();
+      music_pack_module.shutdown();
     }
 
-    if (music_module != NULL)
+  if (music_module != NULL)
     {
-        music_module->Shutdown();
+      music_module->shutdown();
     }
 }
 
-int I_GetSfxLumpNum(sfxinfo_t *sfxinfo)
+int i_get_sfx_lumpnum(sfxinfo_t *sfxinfo)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL)
     {
-        return sound_module->GetSfxLumpNum(sfxinfo);
+      return sound_module->get_sfx_lumpnum(sfxinfo);
     }
-    else
+  else
     {
-        return 0;
+      return 0;
     }
 }
 
-void I_UpdateSound(void)
+void i_update_sound(void)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL)
     {
-        sound_module->Update();
+      sound_module->update();
     }
 
-    if (active_music_module != NULL && active_music_module->Poll != NULL)
+  if (active_music_module != NULL && active_music_module->poll != NULL)
     {
-        active_music_module->Poll();
+      active_music_module->poll();
     }
 }
 
-static void CheckVolumeSeparation(int *vol, int *sep)
+void i_update_sound_params(int channel, int vol, int sep)
 {
-    if (*sep < 0)
+  if (sound_module != NULL)
     {
-        *sep = 0;
-    }
-    else if (*sep > 254)
-    {
-        *sep = 254;
-    }
-
-    if (*vol < 0)
-    {
-        *vol = 0;
-    }
-    else if (*vol > 127)
-    {
-        *vol = 127;
+      check_volume_separation(&vol, &sep);
+      sound_module->update_sound_params(channel, vol, sep);
     }
 }
 
-void I_UpdateSoundParams(int channel, int vol, int sep)
+int i_start_sound(sfxinfo_t *sfxinfo, int channel, int vol, int sep,
+                  int pitch)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL)
     {
-        CheckVolumeSeparation(&vol, &sep);
-        sound_module->UpdateSoundParams(channel, vol, sep);
+      check_volume_separation(&vol, &sep);
+      return sound_module->start_sound(sfxinfo, channel, vol, sep, pitch);
+    }
+  else
+    {
+      return 0;
     }
 }
 
-int I_StartSound(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch)
+void i_stop_sound(int channel)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL)
     {
-        CheckVolumeSeparation(&vol, &sep);
-        return sound_module->StartSound(sfxinfo, channel, vol, sep, pitch);
-    }
-    else
-    {
-        return 0;
+      sound_module->stop_sound(channel);
     }
 }
 
-void I_StopSound(int channel)
+boolean i_sound_playing(int channel)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL)
     {
-        sound_module->StopSound(channel);
+      return sound_module->sound_is_playing(channel);
+    }
+  else
+    {
+      return false;
     }
 }
 
-boolean I_SoundIsPlaying(int channel)
+void i_precache_sounds(sfxinfo_t *sounds, int num_sounds)
 {
-    if (sound_module != NULL)
+  if (sound_module != NULL && sound_module->cache_sounds != NULL)
     {
-        return sound_module->SoundIsPlaying(channel);
-    }
-    else
-    {
-        return false;
+      sound_module->cache_sounds(sounds, num_sounds);
     }
 }
 
-void I_PrecacheSounds(sfxinfo_t *sounds, int num_sounds)
+void i_init_music(void)
 {
-    if (sound_module != NULL && sound_module->CacheSounds != NULL)
+}
+
+void i_shutdown_music(void)
+{
+}
+
+void i_set_music_volume(int volume)
+{
+  if (music_module != NULL)
     {
-        sound_module->CacheSounds(sounds, num_sounds);
-    }
-}
+      music_module->set_music_volume(volume);
 
-void I_InitMusic(void)
-{
-}
-
-void I_ShutdownMusic(void)
-{
-
-}
-
-void I_SetMusicVolume(int volume)
-{
-    if (music_module != NULL)
-    {
-        music_module->SetMusicVolume(volume);
-
-        if (music_packs_active && music_module != &music_pack_module)
+      if (music_packs_active && music_module != &music_pack_module)
         {
-            music_pack_module.SetMusicVolume(volume);
+          music_pack_module.set_music_volume(volume);
         }
     }
 }
 
-void I_PauseSong(void)
+void i_pause_song(void)
 {
-    if (active_music_module != NULL)
+  if (active_music_module != NULL)
     {
-        active_music_module->PauseMusic();
+      active_music_module->pause_music();
     }
 }
 
-void I_ResumeSong(void)
+void i_resume_song(void)
 {
-    if (active_music_module != NULL)
+  if (active_music_module != NULL)
     {
-        active_music_module->ResumeMusic();
+      active_music_module->resume_music();
     }
 }
 
-void *I_RegisterSong(void *data, int len)
+void *i_register_song(void *data, int len)
 {
-    // If the music pack module is active, check to see if there is a
-    // valid substitution for this track. If there is, we set the
-    // active_music_module pointer to the music pack module for the
-    // duration of this particular track.
-    if (music_packs_active)
-    {
-        void *handle;
+  /* If the music pack module is active, check to see if there is a
+   * valid substitution for this track. If there is, we set the
+   * active_music_module pointer to the music pack module for the
+   * duration of this particular track.
+   */
 
-        handle = music_pack_module.RegisterSong(data, len);
-        if (handle != NULL)
+  if (music_packs_active)
+    {
+      void *handle;
+
+      handle = music_pack_module.register_song(data, len);
+      if (handle != NULL)
         {
-            active_music_module = &music_pack_module;
-            return handle;
+          active_music_module = &music_pack_module;
+          return handle;
         }
     }
 
-    // No substitution for this track, so use the main module.
-    active_music_module = music_module;
-    if (active_music_module != NULL)
+  /* No substitution for this track, so use the main module. */
+
+  active_music_module = music_module;
+  if (active_music_module != NULL)
     {
-        return active_music_module->RegisterSong(data, len);
+      return active_music_module->register_song(data, len);
     }
-    else
+  else
     {
-        return NULL;
+      return NULL;
     }
 }
 
-void I_UnRegisterSong(void *handle)
+void i_unregister_song(void *handle)
 {
-    if (active_music_module != NULL)
+  if (active_music_module != NULL)
     {
-        active_music_module->UnRegisterSong(handle);
+      active_music_module->unregister_song(handle);
     }
 }
 
-void I_PlaySong(void *handle, boolean looping)
+void i_play_song(void *handle, boolean looping)
 {
-    if (active_music_module != NULL)
+  if (active_music_module != NULL)
     {
-        active_music_module->PlaySong(handle, looping);
+      active_music_module->play_song(handle, looping);
     }
 }
 
-void I_StopSong(void)
+void i_stop_song(void)
 {
-    if (active_music_module != NULL)
+  if (active_music_module != NULL)
     {
-        active_music_module->StopSong();
+      active_music_module->stop_song();
     }
 }
 
-boolean I_MusicIsPlaying(void)
+void i_bind_sound_variables(void)
 {
-    if (active_music_module != NULL)
-    {
-        return active_music_module->MusicIsPlaying();
-    }
-    else
-    {
-        return false;
-    }
+  m_bind_int_variable("snd_musicdevice", &snd_musicdevice);
+  m_bind_int_variable("snd_sfxdevice", &snd_sfxdevice);
+  m_bind_int_variable("snd_sbport", &snd_sbport);
+  m_bind_int_variable("snd_sbirq", &snd_sbirq);
+  m_bind_int_variable("snd_sbdma", &snd_sbdma);
+  m_bind_int_variable("snd_mport", &snd_mport);
+  m_bind_int_variable("snd_maxslicetime_ms", &snd_maxslicetime_ms);
+  m_bind_string_variable("snd_musiccmd", &snd_musiccmd);
+  m_bind_int_variable("snd_samplerate", &snd_samplerate);
+  m_bind_int_variable("snd_cachesize", &snd_cachesize);
+  m_bind_int_variable("snd_pitchshift", &snd_pitchshift);
+
+  m_bind_string_variable("music_pack_path", &music_pack_path);
+  m_bind_string_variable("timidity_cfg_path", &timidity_cfg_path);
+  m_bind_string_variable("gus_patch_path", &gus_patch_path);
+  m_bind_int_variable("gus_ram_kb", &gus_ram_kb);
+
+  m_bind_int_variable("use_libsamplerate", &use_libsamplerate);
+  m_bind_float_variable("libsamplerate_scale", &libsamplerate_scale);
 }
-
-void I_BindSoundVariables(void)
-{
-    M_BindIntVariable("snd_musicdevice",         &snd_musicdevice);
-    M_BindIntVariable("snd_sfxdevice",           &snd_sfxdevice);
-    M_BindIntVariable("snd_sbport",              &snd_sbport);
-    M_BindIntVariable("snd_sbirq",               &snd_sbirq);
-    M_BindIntVariable("snd_sbdma",               &snd_sbdma);
-    M_BindIntVariable("snd_mport",               &snd_mport);
-    M_BindIntVariable("snd_maxslicetime_ms",     &snd_maxslicetime_ms);
-    M_BindStringVariable("snd_musiccmd",         &snd_musiccmd);
-    M_BindStringVariable("snd_dmxoption",        &snd_dmxoption);
-    M_BindIntVariable("snd_samplerate",          &snd_samplerate);
-    M_BindIntVariable("snd_cachesize",           &snd_cachesize);
-    M_BindIntVariable("opl_io_port",             &opl_io_port);
-    M_BindIntVariable("snd_pitchshift",          &snd_pitchshift);
-
-    M_BindStringVariable("music_pack_path",      &music_pack_path);
-    M_BindStringVariable("timidity_cfg_path",    &timidity_cfg_path);
-    M_BindStringVariable("gus_patch_path",       &gus_patch_path);
-    M_BindIntVariable("gus_ram_kb",              &gus_ram_kb);
-#ifdef _WIN32
-    M_BindStringVariable("winmm_midi_device",    &winmm_midi_device);
-    M_BindIntVariable("winmm_complevel",         &winmm_complevel);
-    M_BindIntVariable("winmm_reset_type",        &winmm_reset_type);
-    M_BindIntVariable("winmm_reset_delay",       &winmm_reset_delay);
-#endif
-
-#ifdef HAVE_FLUIDSYNTH
-    M_BindIntVariable("fsynth_chorus_active",       &fsynth_chorus_active);
-    M_BindFloatVariable("fsynth_chorus_depth",      &fsynth_chorus_depth);
-    M_BindFloatVariable("fsynth_chorus_level",      &fsynth_chorus_level);
-    M_BindIntVariable("fsynth_chorus_nr",           &fsynth_chorus_nr);
-    M_BindFloatVariable("fsynth_chorus_speed",      &fsynth_chorus_speed);
-    M_BindStringVariable("fsynth_midibankselect",   &fsynth_midibankselect);
-    M_BindIntVariable("fsynth_polyphony",           &fsynth_polyphony);
-    M_BindIntVariable("fsynth_reverb_active",       &fsynth_reverb_active);
-    M_BindFloatVariable("fsynth_reverb_damp",       &fsynth_reverb_damp);
-    M_BindFloatVariable("fsynth_reverb_level",      &fsynth_reverb_level);
-    M_BindFloatVariable("fsynth_reverb_roomsize",   &fsynth_reverb_roomsize);
-    M_BindFloatVariable("fsynth_reverb_width",      &fsynth_reverb_width);
-    M_BindFloatVariable("fsynth_gain",              &fsynth_gain);
-    M_BindStringVariable("fsynth_sf_path",          &fsynth_sf_path);
-#endif // HAVE_FLUIDSYNTH
-
-    M_BindIntVariable("use_libsamplerate",       &use_libsamplerate);
-    M_BindFloatVariable("libsamplerate_scale",   &libsamplerate_scale);
-}
-
diff --git a/games/NXDoom/src/i_sound.h b/games/NXDoom/src/i_sound.h
index 376e1bb9c..d1ad8d8eb 100644
--- a/games/NXDoom/src/i_sound.h
+++ b/games/NXDoom/src/i_sound.h
@@ -1,233 +1,260 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The not so system specific sound interface.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_sound.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  The not so system specific sound interface.
+ *
+ ****************************************************************************/
 
 #ifndef __I_SOUND__
 #define __I_SOUND__
 
-#include "doomtype.h"
-#include "d_mode.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "d_mode.h"
+#include "doomtype.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* so that the individual game logic and sound driver code agree */
 
-// so that the individual game logic and sound driver code agree
 #define NORM_PITCH 127
 
-//
-// SoundFX struct.
-//
-typedef struct sfxinfo_struct	sfxinfo_t;
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* SoundFX struct. */
+
+typedef struct sfxinfo_struct sfxinfo_t;
 
 struct sfxinfo_struct
 {
-    // tag name, used for hexen.
-    const char *tagname;
+  /* tag name, used for hexen. */
 
-    // lump name.  If we are running with use_sfx_prefix=true, a
-    // 'DS' (or 'DP' for PC speaker sounds) is prepended to this.
+  const char *tagname;
 
-    char name[9];
+  /* lump name.  If we are running with use_sfx_prefix=true, a
+   * 'DS' (or 'DP' for PC speaker sounds) is prepended to this.
+   */
 
-    // Sfx priority
-    int priority;
+  char name[9];
 
-    // referenced sound if a link
-    sfxinfo_t *link;
+  /* Sfx priority */
 
-    // pitch if a link (Doom), whether to pitch-shift (Hexen)
-    int pitch;
+  int priority;
 
-    // volume if a link
-    int volume;
+  /* referenced sound if a link */
 
-    // this is checked every second to see if sound
-    // can be thrown out (if 0, then decrement, if -1,
-    // then throw out, if > 0, then it is in use)
-    int usefulness;
+  sfxinfo_t *link;
 
-    // lump number of sfx
-    int lumpnum;
+  /* pitch if a link (Doom), whether to pitch-shift (Hexen) */
 
-    // Maximum number of channels that the sound can be played on 
-    // (Heretic)
-    int numchannels;
+  int pitch;
 
-    // data used by the low level code
-    void *driver_data;
+  /* volume if a link */
+
+  int volume;
+
+  /* this is checked every second to see if sound
+   * can be thrown out (if 0, then decrement, if -1,
+   * then throw out, if > 0, then it is in use)
+   */
+
+  int usefulness;
+
+  /* lump number of sfx */
+
+  int lumpnum;
+
+  /* Maximum number of channels that the sound can be played on
+   * (Heretic)
+   */
+
+  int numchannels;
+
+  /* data used by the low level code */
+
+  void *driver_data;
 };
 
-//
-// MusicInfo struct.
-//
+/* MusicInfo struct. */
+
 typedef struct
 {
-    // up to 6-character name
-    const char *name;
+  /* up to 6-character name */
 
-    // lump number of music
-    int lumpnum;
+  const char *name;
 
-    // music data
-    void *data;
+  /* lump number of music */
 
-    // music handle once registered
-    void *handle;
+  int lumpnum;
 
+  /* music data */
+
+  void *data;
+
+  /* music handle once registered */
+
+  void *handle;
 } musicinfo_t;
 
-typedef enum 
+typedef enum
 {
-    SNDDEVICE_NONE = 0,
-    SNDDEVICE_PCSPEAKER = 1,
-    SNDDEVICE_ADLIB = 2,
-    SNDDEVICE_SB = 3,
-    SNDDEVICE_PAS = 4,
-    SNDDEVICE_GUS = 5,
-    SNDDEVICE_WAVEBLASTER = 6,
-    SNDDEVICE_SOUNDCANVAS = 7,
-    SNDDEVICE_GENMIDI = 8,
-    SNDDEVICE_AWE32 = 9,
-    SNDDEVICE_CD = 10,
-    SNDDEVICE_FSYNTH = 11,
+  SNDDEVICE_NONE = 0,
+  SNDDEVICE_PCSPEAKER = 1,
+  SNDDEVICE_ADLIB = 2,
+  SNDDEVICE_SB = 3,
+  SNDDEVICE_PAS = 4,
+  SNDDEVICE_GUS = 5,
+  SNDDEVICE_WAVEBLASTER = 6,
+  SNDDEVICE_SOUNDCANVAS = 7,
+  SNDDEVICE_GENMIDI = 8,
+  SNDDEVICE_AWE32 = 9,
+  SNDDEVICE_CD = 10,
+  SNDDEVICE_FSYNTH = 11,
 } snddevice_t;
 
-// Interface for sound modules
+/* Interface for sound modules */
 
 typedef struct
 {
-    // List of sound devices that this sound module is used for.
+  /* List of sound devices that this sound module is used for. */
 
-    const snddevice_t *sound_devices;
-    int num_sound_devices;
+  const snddevice_t *sound_devices;
+  int num_sound_devices;
 
-    // Initialise sound module
-    // Returns true if successfully initialised
+  /* initialise sound module
+   * Returns true if successfully initialised
+   */
 
-    boolean (*Init)(GameMission_t mission);
+  boolean (*init)(gamemission_t mission);
 
-    // Shutdown sound module
+  /* shutdown sound module */
 
-    void (*Shutdown)(void);
+  void (*shutdown)(void);
 
-    // Returns the lump index of the given sound.
+  /* Returns the lump index of the given sound. */
 
-    int (*GetSfxLumpNum)(sfxinfo_t *sfxinfo);
+  int (*get_sfx_lumpnum)(sfxinfo_t *sfxinfo);
 
-    // Called periodically to update the subsystem.
+  /* Called periodically to update the subsystem. */
 
-    void (*Update)(void);
+  void (*update)(void);
 
-    // Update the sound settings on the given channel.
+  /* Update the sound settings on the given channel. */
 
-    void (*UpdateSoundParams)(int channel, int vol, int sep);
+  void (*update_sound_params)(int channel, int vol, int sep);
 
-    // Start a sound on a given channel.  Returns the channel id
-    // or -1 on failure.
+  /* Start a sound on a given channel.  Returns the channel id
+   * or -1 on failure.
+   */
 
-    int (*StartSound)(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch);
+  int (*start_sound)(sfxinfo_t *sfxinfo, int channel, int vol, int sep,
+                    int pitch);
 
-    // Stop the sound playing on the given channel.
+  /* Stop the sound playing on the given channel. */
 
-    void (*StopSound)(int channel);
+  void (*stop_sound)(int channel);
 
-    // Query if a sound is playing on the given channel
+  /* Query if a sound is playing on the given channel */
 
-    boolean (*SoundIsPlaying)(int channel);
+  boolean (*sound_is_playing)(int channel);
 
-    // Called on startup to precache sound effects (if necessary)
-
-    void (*CacheSounds)(sfxinfo_t *sounds, int num_sounds);
+  /* Called on startup to precache sound effects (if necessary) */
 
+  void (*cache_sounds)(sfxinfo_t *sounds, int num_sounds);
 } sound_module_t;
 
-void I_InitSound(GameMission_t mission);
-void I_ShutdownSound(void);
-int I_GetSfxLumpNum(sfxinfo_t *sfxinfo);
-void I_UpdateSound(void);
-void I_UpdateSoundParams(int channel, int vol, int sep);
-int I_StartSound(sfxinfo_t *sfxinfo, int channel, int vol, int sep, int pitch);
-void I_StopSound(int channel);
-boolean I_SoundIsPlaying(int channel);
-void I_PrecacheSounds(sfxinfo_t *sounds, int num_sounds);
-
-// Interface for music modules
+/* Interface for music modules */
 
 typedef struct
 {
-    // List of sound devices that this music module is used for.
+  /* List of sound devices that this music module is used for. */
 
-    const snddevice_t *sound_devices;
-    int num_sound_devices;
+  const snddevice_t *sound_devices;
+  int num_sound_devices;
 
-    // Initialise the music subsystem
+  /* initialise the music subsystem */
 
-    boolean (*Init)(void);
+  boolean (*init)(void);
 
-    // Shutdown the music subsystem
+  /* shutdown the music subsystem */
 
-    void (*Shutdown)(void);
+  void (*shutdown)(void);
 
-    // Set music volume - range 0-127
+  /* Set music volume - range 0-127 */
 
-    void (*SetMusicVolume)(int volume);
+  void (*set_music_volume)(int volume);
 
-    // Pause music
+  /* Pause music */
 
-    void (*PauseMusic)(void);
+  void (*pause_music)(void);
 
-    // Un-pause music
+  /* Un-pause music */
 
-    void (*ResumeMusic)(void);
+  void (*resume_music)(void);
 
-    // Register a song handle from data
-    // Returns a handle that can be used to play the song
+  /* Register a song handle from data
+   * Returns a handle that can be used to play the song
+   */
 
-    void *(*RegisterSong)(void *data, int len);
+  void *(*register_song)(void *data, int len);
 
-    // Un-register (free) song data
+  /* Un-register (free) song data */
 
-    void (*UnRegisterSong)(void *handle);
+  void (*unregister_song)(void *handle);
 
-    // Play the song
+  /* Play the song */
 
-    void (*PlaySong)(void *handle, boolean looping);
+  void (*play_song)(void *handle, boolean looping);
 
-    // Stop playing the current song.
+  /* Stop playing the current song. */
 
-    void (*StopSong)(void);
+  void (*stop_song)(void);
 
-    // Query if music is playing.
+  /* Query if music is playing. */
 
-    boolean (*MusicIsPlaying)(void);
+  boolean (*music_is_playing)(void);
 
-    // Invoked periodically to poll.
+  /* Invoked periodically to poll. */
 
-    void (*Poll)(void);
+  void (*poll)(void);
 } music_module_t;
 
-void I_InitMusic(void);
-void I_ShutdownMusic(void);
-void I_SetMusicVolume(int volume);
-void I_PauseSong(void);
-void I_ResumeSong(void);
-void *I_RegisterSong(void *data, int len);
-void I_UnRegisterSong(void *handle);
-void I_PlaySong(void *handle, boolean looping);
-void I_StopSong(void);
-boolean I_MusicIsPlaying(void);
+#if 0
+/* DMX version to emulate for OPL emulation: */
+
+typedef enum
+{
+  opl_doom1_1_666, /* Doom 1 v1.666 */
+  opl_doom2_1_666, /* Doom 2 v1.666, Hexen, Heretic */
+  opl_doom_1_9     /* Doom v1.9, Strife */
+} opl_driver_ver_t;
+#endif
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern int snd_sfxdevice;
 extern int snd_musicdevice;
@@ -236,65 +263,54 @@ extern int snd_cachesize;
 extern int snd_maxslicetime_ms;
 extern char *snd_musiccmd;
 extern int snd_pitchshift;
-extern char *snd_dmxoption;
 extern int use_libsamplerate;
 extern float libsamplerate_scale;
 
-void I_BindSoundVariables(void);
-
-// DMX version to emulate for OPL emulation:
-typedef enum {
-    opl_doom1_1_666,    // Doom 1 v1.666
-    opl_doom2_1_666,    // Doom 2 v1.666, Hexen, Heretic
-    opl_doom_1_9        // Doom v1.9, Strife
-} opl_driver_ver_t;
-
-void I_SetOPLDriverVer(opl_driver_ver_t ver);
-void I_OPL_DevMessages(char *, size_t);
-
-// Sound modules
-
-void I_InitTimidityConfig(void);
 extern const sound_module_t sound_sdl_module;
 extern const sound_module_t sound_pcsound_module;
 extern const music_module_t music_sdl_module;
-extern const music_module_t music_opl_module;
 extern const music_module_t music_pack_module;
-extern const music_module_t music_win_module;
 extern const music_module_t music_fl_module;
 
-// For OPL module:
-
-extern int opl_io_port;
-
-// For native music module:
+/* For native music module: */
 
 extern char *music_pack_path;
 extern char *timidity_cfg_path;
-#ifdef _WIN32
-extern char *winmm_midi_device;
-extern int winmm_complevel;
-extern int winmm_reset_type;
-extern int winmm_reset_delay;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void i_init_sound(gamemission_t mission);
+void i_shutdown_sound(void);
+int i_get_sfx_lumpnum(sfxinfo_t *sfxinfo);
+void i_update_sound(void);
+void i_update_sound_params(int channel, int vol, int sep);
+int i_start_sound(sfxinfo_t *sfxinfo, int channel, int vol, int sep,
+                  int pitch);
+void i_stop_sound(int channel);
+boolean i_sound_playing(int channel);
+void i_precache_sounds(sfxinfo_t *sounds, int num_sounds);
+
+void i_init_music(void);
+void i_shutdown_music(void);
+void i_set_music_volume(int volume);
+void i_pause_song(void);
+void i_resume_song(void);
+void *i_register_song(void *data, int len);
+void i_unregister_song(void *handle);
+void i_play_song(void *handle, boolean looping);
+void i_stop_song(void);
+
+void i_bind_sound_variables(void);
+
+#if 0
+void i_set_opl_driver_ver(opl_driver_ver_t ver);
+void i_opl_dev_messages(char *, size_t);
 #endif
 
-// For FluidSynth module:
+/* Sound modules */
 
-#ifdef HAVE_FLUIDSYNTH
-extern char *fsynth_sf_path;
-extern int fsynth_chorus_active;
-extern float fsynth_chorus_depth;
-extern float fsynth_chorus_level;
-extern int fsynth_chorus_nr;
-extern float fsynth_chorus_speed;
-extern char *fsynth_midibankselect;
-extern int fsynth_polyphony;
-extern int fsynth_reverb_active;
-extern float fsynth_reverb_damp;
-extern float fsynth_reverb_level;
-extern float fsynth_reverb_roomsize;
-extern float fsynth_reverb_width;
-extern float fsynth_gain;
-#endif // HAVE_FLUIDSYNTH
+void i_init_timidity_config(void);
 
-#endif
+#endif /* __I_SOUND__ */
diff --git a/games/NXDoom/src/i_swap.h b/games/NXDoom/src/i_swap.h
index 3dee8e3f6..72b64236f 100644
--- a/games/NXDoom/src/i_swap.h
+++ b/games/NXDoom/src/i_swap.h
@@ -1,43 +1,54 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Endianess handling, swapping 16bit and 32bit.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_swap.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Endianness handling, swapping 16bit and 32bit.
+ *
+ ****************************************************************************/
 
 #ifndef __I_SWAP__
 #define __I_SWAP__
 
-#include "SDL_endian.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-// Endianess handling.
-// WAD files are stored little endian.
+#include <endian.h>
 
-// Just use SDL's endianness swapping functions.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// These are deliberately cast to signed values; this is the behaviour
-// of the macros in the original source and some code relies on it.
+/* Endianness handling.
+ * WAD files are stored little endian.
+ */
 
-#define SHORT(x)  ((signed short) SDL_SwapLE16(x))
-#define LONG(x)   ((signed int) SDL_SwapLE32(x))
+/* These are deliberately cast to signed values; this is the behaviour
+ * of the macros in the original source and some code relies on it.
+ */
 
-// Defines for checking the endianness of the system.
+#define SHORT(x) ((signed short)le16toh(x))
+#define LONG(x) ((signed int)le32toh(x))
 
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+/* Defines for checking the endianness of the system. */
+
+#if BYTE_ORDER == BIG_ENDIAN
 #define SYS_BIG_ENDIAN
 #endif
 
-#endif
-
+#endif /* __I_SWAP__ */
diff --git a/games/NXDoom/src/i_system.c b/games/NXDoom/src/i_system.c
index dba359035..b3867e0ad 100644
--- a/games/NXDoom/src/i_system.c
+++ b/games/NXDoom/src/i_system.c
@@ -1,470 +1,482 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_system.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdarg.h>
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#endif
-
-#include "SDL.h"
 
 #include "config.h"
 
 #include "deh_str.h"
 #include "doomtype.h"
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_misc.h"
 #include "i_joystick.h"
 #include "i_sound.h"
 #include "i_timer.h"
 #include "i_video.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
 
 #include "i_system.h"
 
 #include "w_wad.h"
 #include "z_zone.h"
 
-#define DEFAULT_RAM 16 /* MiB */
-#define MIN_RAM     4  /* MiB */
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define DEFAULT_RAM 16 /* MiB */
+#define MIN_RAM 4      /* MiB */
+
+#define DOS_MEM_DUMP_SIZE 10
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef struct atexit_listentry_s atexit_listentry_t;
 
 struct atexit_listentry_s
 {
-    atexit_func_t func;
-    boolean run_on_error;
-    atexit_listentry_t *next;
+  atexit_func_t func;
+  boolean run_on_error;
+  atexit_listentry_t *next;
 };
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static atexit_listentry_t *exit_funcs = NULL;
 
-void I_AtExit(atexit_func_t func, boolean run_on_error)
-{
-    atexit_listentry_t *entry;
-
-    entry = malloc(sizeof(*entry));
-
-    entry->func = func;
-    entry->run_on_error = run_on_error;
-    entry->next = exit_funcs;
-    exit_funcs = entry;
-}
-
-// Tactile feedback function, probably used for the Logitech Cyberman
-
-void I_Tactile(int on, int off, int total)
-{
-}
-
-// Zone memory auto-allocation function that allocates the zone size
-// by trying progressively smaller zone sizes until one is found that
-// works.
-
-static byte *AutoAllocMemory(int *size, int default_ram, int min_ram)
-{
-    byte *zonemem;
-
-    // Allocate the zone memory.  This loop tries progressively smaller
-    // zone sizes until a size is found that can be allocated.
-    // If we used the -mb command line parameter, only the parameter
-    // provided is accepted.
-
-    zonemem = NULL;
-
-    while (zonemem == NULL)
-    {
-        // We need a reasonable minimum amount of RAM to start.
-
-        if (default_ram < min_ram)
-        {
-            I_Error("Unable to allocate %i MiB of RAM for zone", default_ram);
-        }
-
-        // Try to allocate the zone memory.
-
-        *size = default_ram * 1024 * 1024;
-
-        zonemem = malloc(*size);
-
-        // Failed to allocate?  Reduce zone size until we reach a size
-        // that is acceptable.
-
-        if (zonemem == NULL)
-        {
-            default_ram -= 1;
-        }
-    }
-
-    return zonemem;
-}
-
-byte *I_ZoneBase (int *size)
-{
-    byte *zonemem;
-    int min_ram, default_ram;
-    int p;
-
-    //!
-    // @category obscure
-    // @arg <mb>
-    //
-    // Specify the heap size, in MiB.
-    //
-
-    p = M_CheckParmWithArgs("-mb", 1);
-
-    if (p > 0)
-    {
-        default_ram = atoi(myargv[p+1]);
-        min_ram = default_ram;
-    }
-    else
-    {
-        // Because of the 8-byte pointer size in a 64-bit build, the default
-        // heap size (16 MiB) is insufficient compared to a 32-bit build. For
-        // example, the Alien Vendetta avm62402.lmp demo completes successfully
-        // on a 32-bit build, but terminates with an out of memory error on a
-        // 64-bit build. Therefore, to maintain consistency with a 32-bit
-        // build, the heap size should be increased.
-
-        if (sizeof(void *) == 8)
-        {
-            default_ram = DEFAULT_RAM * 2;
-        }
-        else
-        {
-            default_ram = DEFAULT_RAM;
-        }
-        min_ram = MIN_RAM;
-    }
-
-    zonemem = AutoAllocMemory(size, default_ram, min_ram);
-
-    printf("zone memory: %p, %x allocated for zone\n", 
-           zonemem, *size);
-
-    return zonemem;
-}
-
-void I_PrintBanner(const char *msg)
-{
-    int i;
-    int spaces = 35 - (strlen(msg) / 2);
-
-    for (i=0; i<spaces; ++i)
-        putchar(' ');
-
-    puts(msg);
-}
-
-void I_PrintDivider(void)
-{
-    int i;
-
-    for (i=0; i<75; ++i)
-    {
-        putchar('=');
-    }
-
-    putchar('\n');
-}
-
-void I_PrintStartupBanner(const char *gamedescription)
-{
-    I_PrintDivider();
-    I_PrintBanner(gamedescription);
-    I_PrintDivider();
-    
-    printf(
-    " " PACKAGE_NAME " is free software, covered by the GNU General Public\n"
-    " License.  There is NO warranty; not even for MERCHANTABILITY or FITNESS\n"
-    " FOR A PARTICULAR PURPOSE. You are welcome to change and distribute\n"
-    " copies under certain conditions. See the source for more information.\n");
-
-    I_PrintDivider();
-}
-
-// 
-// I_ConsoleStdout
-//
-// Returns true if stdout is a real console, false if it is a file
-//
-
-boolean I_ConsoleStdout(void)
-{
-#ifdef _WIN32
-    // SDL "helpfully" always redirects stdout to a file.
-    return false;
-#else
-    return isatty(fileno(stdout));
-#endif
-}
-
-//
-// I_Init
-//
-/*
-void I_Init (void)
-{
-    I_CheckIsScreensaver();
-    I_InitTimer();
-    I_InitJoystick();
-}
-void I_BindVariables(void)
-{
-    I_BindVideoVariables();
-    I_BindJoystickVariables();
-    I_BindSoundVariables();
-}
-*/
-
-//
-// I_Quit
-//
-
-void I_Quit (void)
-{
-    atexit_listentry_t *entry;
-
-    // Run through all exit functions
- 
-    entry = exit_funcs; 
-
-    while (entry != NULL)
-    {
-        entry->func();
-        entry = entry->next;
-    }
-
-    SDL_Quit();
-
-    exit(0);
-}
-
-
-
-//
-// I_Error
-//
-
 static boolean already_quitting = false;
 
-void I_Error (const char *error, ...)
+/* Read Access Violation emulation.
+ *
+ * From PrBoom+, by entryway.
+ */
+
+/* C:\>debug
+ * -d 0:0
+ *
+ * DOS 6.22:
+ * 0000:0000  (57 92 19 00) F4 06 70 00-(16 00)
+ * DOS 7.1:
+ * 0000:0000  (9E 0F C9 00) 65 04 70 00-(16 00)
+ * Win98:
+ * 0000:0000  (9E 0F C9 00) 65 04 70 00-(16 00)
+ * DOSBox under XP:
+ * 0000:0000  (00 00 00 F1) ?? ?? ?? 00-(07 00)
+ */
+
+static const unsigned char mem_dump_dos622[DOS_MEM_DUMP_SIZE] =
 {
-    char msgbuf[512];
-    va_list argptr;
-    atexit_listentry_t *entry;
-    boolean exit_gui_popup;
+  0x57, 0x92, 0x19, 0x00, 0xf4, 0x06, 0x70, 0x00, 0x16, 0x00,
+};
 
-    if (already_quitting)
-    {
-        fprintf(stderr, "Warning: recursive call to I_Error detected.\n");
-        exit(-1);
-    }
-    else
-    {
-        already_quitting = true;
-    }
-
-    // Message first.
-    va_start(argptr, error);
-    //fprintf(stderr, "\nError: ");
-    vfprintf(stderr, error, argptr);
-    fprintf(stderr, "\n\n");
-    va_end(argptr);
-    fflush(stderr);
-
-    // Write a copy of the message into buffer.
-    va_start(argptr, error);
-    memset(msgbuf, 0, sizeof(msgbuf));
-    M_vsnprintf(msgbuf, sizeof(msgbuf), error, argptr);
-    va_end(argptr);
-
-    // Shutdown. Here might be other errors.
-
-    entry = exit_funcs;
-
-    while (entry != NULL)
-    {
-        if (entry->run_on_error)
-        {
-            entry->func();
-        }
-
-        entry = entry->next;
-    }
-
-    //!
-    // @category obscure
-    //
-    // If specified, don't show a GUI window for error messages when the
-    // game exits with an error.
-    //
-    exit_gui_popup = !M_ParmExists("-nogui");
-
-    // Pop up a GUI dialog box to show the error message, if the
-    // game was not run from the console (and the user will
-    // therefore be unable to otherwise see the message).
-    if (exit_gui_popup && !I_ConsoleStdout())
-    {
-        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-                                 PACKAGE_STRING, msgbuf, NULL);
-    }
-
-    // abort();
-
-    SDL_Quit();
-
-    exit(-1);
-}
-
-//
-// I_Realloc
-//
-
-void *I_Realloc(void *ptr, size_t size)
+static const unsigned char mem_dump_win98[DOS_MEM_DUMP_SIZE] =
 {
-    void *new_ptr;
+  0x9e, 0x0f, 0xc9, 0x00, 0x65, 0x04, 0x70, 0x00, 0x16, 0x00,
+};
 
-    new_ptr = realloc(ptr, size);
+static const unsigned char mem_dump_dosbox[DOS_MEM_DUMP_SIZE] =
+{
+  0x00, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+};
 
-    if (size != 0 && new_ptr == NULL)
-    {
-        I_Error ("I_Realloc: failed on reallocation of %zu bytes", size);
-    }
-
-    return new_ptr;
-}
-
-//
-// Read Access Violation emulation.
-//
-// From PrBoom+, by entryway.
-//
-
-// C:\>debug
-// -d 0:0
-//
-// DOS 6.22:
-// 0000:0000  (57 92 19 00) F4 06 70 00-(16 00)
-// DOS 7.1:
-// 0000:0000  (9E 0F C9 00) 65 04 70 00-(16 00)
-// Win98:
-// 0000:0000  (9E 0F C9 00) 65 04 70 00-(16 00)
-// DOSBox under XP:
-// 0000:0000  (00 00 00 F1) ?? ?? ?? 00-(07 00)
-
-#define DOS_MEM_DUMP_SIZE 10
-
-static const unsigned char mem_dump_dos622[DOS_MEM_DUMP_SIZE] = {
-  0x57, 0x92, 0x19, 0x00, 0xF4, 0x06, 0x70, 0x00, 0x16, 0x00};
-static const unsigned char mem_dump_win98[DOS_MEM_DUMP_SIZE] = {
-  0x9E, 0x0F, 0xC9, 0x00, 0x65, 0x04, 0x70, 0x00, 0x16, 0x00};
-static const unsigned char mem_dump_dosbox[DOS_MEM_DUMP_SIZE] = {
-  0x00, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00};
 static unsigned char mem_dump_custom[DOS_MEM_DUMP_SIZE];
 
 static const unsigned char *dos_mem_dump = mem_dump_dos622;
 
-boolean I_GetMemoryValue(unsigned int offset, void *value, int size)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Zone memory auto-allocation function that allocates the zone size
+ * by trying progressively smaller zone sizes until one is found that
+ * works.
+ */
+
+static byte *auto_alloc_memory(int *size, int default_ram, int min_ram)
 {
-    static boolean firsttime = true;
+  byte *zonemem;
 
-    if (firsttime)
+  /* Allocate the zone memory.  This loop tries progressively smaller
+   * zone sizes until a size is found that can be allocated.
+   * If we used the -mb command line parameter, only the parameter
+   * provided is accepted.
+   */
+
+  zonemem = NULL;
+
+  while (zonemem == NULL)
     {
-        int p, i, val;
+      /* We need a reasonable minimum amount of RAM to start. */
 
-        firsttime = false;
-        i = 0;
-
-        //!
-        // @category compat
-        // @arg <version>
-        //
-        // Specify DOS version to emulate for NULL pointer dereference
-        // emulation.  Supported versions are: dos622, dos71, dosbox.
-        // The default is to emulate DOS 7.1 (Windows 98).
-        //
-
-        p = M_CheckParmWithArgs("-setmem", 1);
-
-        if (p > 0)
+      if (default_ram < min_ram)
         {
-            if (!strcasecmp(myargv[p + 1], "dos622"))
-            {
-                dos_mem_dump = mem_dump_dos622;
-            }
-            if (!strcasecmp(myargv[p + 1], "dos71"))
-            {
-                dos_mem_dump = mem_dump_win98;
-            }
-            else if (!strcasecmp(myargv[p + 1], "dosbox"))
-            {
-                dos_mem_dump = mem_dump_dosbox;
-            }
-            else
-            {
-                for (i = 0; i < DOS_MEM_DUMP_SIZE; ++i)
-                {
-                    ++p;
+          i_error("Unable to allocate %i MiB of RAM for zone", default_ram);
+        }
 
-                    if (p >= myargc || myargv[p][0] == '-')
+      /* Try to allocate the zone memory. */
+
+      *size = default_ram * 1024 * 1024;
+
+      zonemem = malloc(*size);
+
+      /* Failed to allocate?  Reduce zone size until we reach a size
+       * that is acceptable.
+       */
+
+      if (zonemem == NULL)
+        {
+          default_ram -= 1;
+        }
+    }
+
+  return zonemem;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void i_at_exit(atexit_func_t func, boolean run_on_error)
+{
+  atexit_listentry_t *entry;
+
+  entry = malloc(sizeof(*entry));
+
+  entry->func = func;
+  entry->run_on_error = run_on_error;
+  entry->next = exit_funcs;
+  exit_funcs = entry;
+}
+
+/* Tactile feedback function, probably used for the Logitech Cyberman */
+
+void i_tactile(int on, int off, int total)
+{
+}
+
+byte *i_zone_base(int *size)
+{
+  byte *zonemem;
+  int min_ram;
+  int default_ram;
+  int p;
+
+  /* @category obscure
+   * @arg <mb>
+   *
+   * Specify the heap size, in MiB.
+   */
+
+  p = m_check_parm_with_args("-mb", 1);
+
+  if (p > 0)
+    {
+      default_ram = atoi(myargv[p + 1]);
+      min_ram = default_ram;
+    }
+  else
+    {
+      /* Because of the 8-byte pointer size in a 64-bit build, the default
+       * heap size (16 MiB) is insufficient compared to a 32-bit build. For
+       * example, the Alien Vendetta avm62402.lmp demo completes successfully
+       * on a 32-bit build, but terminates with an out of memory error on a
+       * 64-bit build. Therefore, to maintain consistency with a 32-bit
+       * build, the heap size should be increased.
+       */
+
+      if (sizeof(void *) == 8)
+        {
+          default_ram = DEFAULT_RAM * 2;
+        }
+      else
+        {
+          default_ram = DEFAULT_RAM;
+        }
+
+      min_ram = MIN_RAM;
+    }
+
+  zonemem = auto_alloc_memory(size, default_ram, min_ram);
+
+  printf("zone memory: %p, %x allocated for zone\n", zonemem, *size);
+
+  return zonemem;
+}
+
+void i_print_banner(const char *msg)
+{
+  int i;
+  int spaces = 35 - (strlen(msg) / 2);
+
+  for (i = 0; i < spaces; ++i)
+    putchar(' ');
+
+  puts(msg);
+}
+
+void i_print_divider(void)
+{
+  int i;
+
+  for (i = 0; i < 75; ++i)
+    {
+      putchar('=');
+    }
+
+  putchar('\n');
+}
+
+void i_print_startup_banner(const char *gamedescription)
+{
+  i_print_divider();
+  i_print_banner(gamedescription);
+  i_print_divider();
+
+  printf(
+      " " PACKAGE_NAME
+      " is free software, covered by the GNU General Public\n"
+      " License.  There is NO warranty; not even for MERCHANTABILITY or "
+      "FITNESS\n"
+      " FOR A PARTICULAR PURPOSE. You are welcome to change and distribute\n"
+      " copies under certain conditions. See the source for more "
+      "information.\n");
+
+  i_print_divider();
+}
+
+/* i_console_stdout
+ *
+ * Returns true if stdout is a real console, false if it is a file
+ */
+
+boolean i_console_stdout(void)
+{
+  return isatty(fileno(stdout));
+}
+
+/* i_init */
+
+#if 0
+void i_init(void)
+{
+  i_check_is_screensaver();
+  i_init_timer();
+  i_init_joystick();
+}
+
+void i_bind_variables(void)
+{
+  i_bind_video_variables();
+  i_bind_joystick_variables();
+  i_bind_sound_variables();
+}
+#endif
+
+/* i_quit */
+
+void i_quit(void)
+{
+  atexit_listentry_t *entry;
+
+  /* Run through all exit functions */
+
+  entry = exit_funcs;
+
+  while (entry != NULL)
+    {
+      entry->func();
+      entry = entry->next;
+    }
+
+  exit(0);
+}
+
+void i_error(const char *error, ...)
+{
+  char msgbuf[512];
+  va_list argptr;
+  atexit_listentry_t *entry;
+  boolean exit_gui_popup;
+
+  if (already_quitting)
+    {
+      fprintf(stderr, "Warning: recursive call to i_error detected.\n");
+      exit(-1);
+    }
+  else
+    {
+      already_quitting = true;
+    }
+
+  /* Message first. */
+
+  va_start(argptr, error);
+
+  vfprintf(stderr, error, argptr);
+  fprintf(stderr, "\n\n");
+  va_end(argptr);
+  fflush(stderr);
+
+  /* Write a copy of the message into buffer. */
+
+  va_start(argptr, error);
+  memset(msgbuf, 0, sizeof(msgbuf));
+  vsnprintf(msgbuf, sizeof(msgbuf), error, argptr);
+  va_end(argptr);
+
+  /* Shutdown. Here might be other errors. */
+
+  entry = exit_funcs;
+
+  while (entry != NULL)
+    {
+      if (entry->run_on_error)
+        {
+          entry->func();
+        }
+
+      entry = entry->next;
+    }
+
+  /* @category obscure
+   *
+   * If specified, don't show a GUI window for error messages when the
+   * game exits with an error.
+   */
+
+  exit_gui_popup = !m_parm_exists("-nogui");
+
+  /* Pop up a GUI dialog box to show the error message, if the
+   * game was not run from the console (and the user will
+   * therefore be unable to otherwise see the message).
+   */
+
+  if (exit_gui_popup && !i_console_stdout())
+    {
+    }
+
+  /* abort(); */
+
+  exit(-1);
+}
+
+void *i_realloc(void *ptr, size_t size)
+{
+  void *new_ptr;
+
+  new_ptr = realloc(ptr, size);
+
+  if (size != 0 && new_ptr == NULL)
+    {
+      i_error("i_realloc: failed on reallocation of %zu bytes", size);
+    }
+
+  return new_ptr;
+}
+
+boolean i_get_memory_value(unsigned int offset, void *value, int size)
+{
+  static boolean firsttime = true;
+
+  if (firsttime)
+    {
+      int p;
+      int i;
+      int val;
+
+      firsttime = false;
+      i = 0;
+
+      /* @category compat
+       * @arg <version>
+       *
+       * Specify DOS version to emulate for NULL pointer dereference
+       * emulation.  Supported versions are: dos622, dos71, dosbox.
+       * The default is to emulate DOS 7.1 (Windows 98).
+       */
+
+      p = m_check_parm_with_args("-setmem", 1);
+
+      if (p > 0)
+        {
+          if (!strcasecmp(myargv[p + 1], "dos622"))
+            {
+              dos_mem_dump = mem_dump_dos622;
+            }
+
+          if (!strcasecmp(myargv[p + 1], "dos71"))
+            {
+              dos_mem_dump = mem_dump_win98;
+            }
+          else if (!strcasecmp(myargv[p + 1], "dosbox"))
+            {
+              dos_mem_dump = mem_dump_dosbox;
+            }
+          else
+            {
+              for (i = 0; i < DOS_MEM_DUMP_SIZE; ++i)
+                {
+                  ++p;
+
+                  if (p >= myargc || myargv[p][0] == '-')
                     {
-                        break;
+                      break;
                     }
 
-                    M_StrToInt(myargv[p], &val);
-                    mem_dump_custom[i++] = (unsigned char) val;
+                  m_str_to_int(myargv[p], &val);
+                  mem_dump_custom[i++] = (unsigned char)val;
                 }
 
-                dos_mem_dump = mem_dump_custom;
+              dos_mem_dump = mem_dump_custom;
             }
         }
     }
 
-    switch (size)
+  switch (size)
     {
     case 1:
-        *((unsigned char *) value) = dos_mem_dump[offset];
-        return true;
+      *((unsigned char *)value) = dos_mem_dump[offset];
+      return true;
     case 2:
-        *((unsigned short *) value) = dos_mem_dump[offset]
-                                    | (dos_mem_dump[offset + 1] << 8);
-        return true;
+      *((unsigned short *)value) =
+          dos_mem_dump[offset] | (dos_mem_dump[offset + 1] << 8);
+      return true;
     case 4:
-        *((unsigned int *) value) = dos_mem_dump[offset]
-                                  | (dos_mem_dump[offset + 1] << 8)
-                                  | (dos_mem_dump[offset + 2] << 16)
-                                  | (dos_mem_dump[offset + 3] << 24);
-        return true;
+      *((unsigned int *)value) =
+          dos_mem_dump[offset] | (dos_mem_dump[offset + 1] << 8) |
+          (dos_mem_dump[offset + 2] << 16) |
+          (dos_mem_dump[offset + 3] << 24);
+      return true;
     }
 
-    return false;
+  return false;
 }
-
diff --git a/games/NXDoom/src/i_system.h b/games/NXDoom/src/i_system.h
index 78376f3cc..ae1c56806 100644
--- a/games/NXDoom/src/i_system.h
+++ b/games/NXDoom/src/i_system.h
@@ -1,86 +1,107 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_system.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __I_SYSTEM__
 #define __I_SYSTEM__
 
-#include "d_ticcmd.h"
-#include "d_event.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include "d_event.h"
+#include "d_ticcmd.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef void (*atexit_func_t)(void);
 
-// Called by DoomMain.
-void I_Init (void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Called by startup code
-// to get the ammount of memory to malloc
-// for the zone management.
-byte*	I_ZoneBase (int *size);
+/* Called by DoomMain. */
 
-boolean I_ConsoleStdout(void);
+void i_init(void);
 
+/* Called by startup code to get the amount of memory to malloc for the zone
+ * management.
+ */
 
-// Asynchronous interrupt functions should maintain private queues
-// that are read by the synchronous functions
-// to be converted into events.
+byte *i_zone_base(int *size);
 
-// Either returns a null ticcmd,
-// or calls a loadable driver to build it.
-// This ticcmd will then be modified by the gameloop
-// for normal input.
-ticcmd_t* I_BaseTiccmd (void);
+boolean i_console_stdout(void);
 
+/* Asynchronous interrupt functions should maintain private queues
+ * that are read by the synchronous functions
+ * to be converted into events.
+ */
 
-// Called by M_Responder when quit is selected.
-// Clean exit, displays sell blurb.
-void I_Quit (void) NORETURN;
+#if 0 /* Unused */
 
-void I_Error (const char *error, ...) NORETURN PRINTF_ATTR(1, 2);
-
-void I_Tactile (int on, int off, int total);
-
-void *I_Realloc(void *ptr, size_t size);
-
-boolean I_GetMemoryValue(unsigned int offset, void *value, int size);
-
-// Schedule a function to be called when the program exits.
-// If run_if_error is true, the function is called if the exit
-// is due to an error (I_Error)
-
-void I_AtExit(atexit_func_t func, boolean run_if_error);
-
-// Add all system-specific config file variable bindings.
-
-void I_BindVariables(void);
-
-// Print startup banner copyright message.
-
-void I_PrintStartupBanner(const char *gamedescription);
-
-// Print a centered text banner displaying the given string.
-
-void I_PrintBanner(const char *text);
-
-// Print a dividing line for startup banners.
-
-void I_PrintDivider(void);
+/* Either returns a null ticcmd, or calls a loadable driver to build it.
+ * This ticcmd will then be modified by the gameloop for normal input.
+ */
 
+ticcmd_t *i_base_ticcmd(void);
 #endif
 
+/* Called by m_responder when quit is selected.
+ * Clean exit, displays sell blurb.
+ */
+
+void i_quit(void) NORETURN;
+
+void i_error(const char *error, ...) NORETURN PRINTF_ATTR(1, 2);
+
+void i_tactile(int on, int off, int total);
+
+void *i_realloc(void *ptr, size_t size);
+
+boolean i_get_memory_value(unsigned int offset, void *value, int size);
+
+/* Schedule a function to be called when the program exits.
+ * If run_if_error is true, the function is called if the exit
+ * is due to an error (i_error)
+ */
+
+void i_at_exit(atexit_func_t func, boolean run_if_error);
+
+/* Add all system-specific config file variable bindings. */
+
+void i_bind_variables(void);
+
+/* Print startup banner copyright message. */
+
+void i_print_startup_banner(const char *gamedescription);
+
+/* Print a centered text banner displaying the given string. */
+
+void i_print_banner(const char *text);
+
+/* Print a dividing line for startup banners. */
+
+void i_print_divider(void);
+
+#endif /* __I_SYSTEM__ */
diff --git a/games/NXDoom/src/i_timer.c b/games/NXDoom/src/i_timer.c
index 4ec6fb047..abde6d4c9 100644
--- a/games/NXDoom/src/i_timer.c
+++ b/games/NXDoom/src/i_timer.c
@@ -1,82 +1,107 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Timer functions.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_timer.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *      Timer functions.
+ *
+ ****************************************************************************/
 
-#include "SDL.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/clock.h>
+#include <unistd.h>
 
-#include "i_timer.h"
 #include "doomtype.h"
+#include "i_timer.h"
 
-//
-// I_GetTime
-// returns time in 1/35th second tics
-//
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static Uint32 basetime = 0;
+/* The start time of the game used as the base for tic calculations. */
 
-int  I_GetTime (void)
+static struct timespec basetime =
 {
-    Uint32 ticks;
+  .tv_nsec = 0, .tv_sec = 0
+};
 
-    ticks = SDL_GetTicks();
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-    if (basetime == 0)
-        basetime = ticks;
+/****************************************************************************
+ * Name: i_get_time
+ *
+ * Description:
+ *  Called by D_DoomLoop.
+ *
+ * Returns:
+ *  The current time in 1/35th second tics.
+ ****************************************************************************/
 
-    ticks -= basetime;
-
-    return (ticks * TICRATE) / 1000;    
+int i_get_time(void)
+{
+  return (i_get_time_ms() * TICRATE) / 1000;
 }
 
-//
-// Same as I_GetTime, but returns time in milliseconds
-//
+/****************************************************************************
+ * Name: i_get_time_ms
+ *
+ * Returns:
+ *  The current time in ms.
+ ****************************************************************************/
 
-int I_GetTimeMS(void)
+int i_get_time_ms(void)
 {
-    Uint32 ticks;
+  struct timespec curtime;
 
-    ticks = SDL_GetTicks();
+  /* NOTE: we ignore any possible error here */
 
-    if (basetime == 0)
-        basetime = ticks;
+  clock_gettime(CLOCK_MONOTONIC, &curtime);
+  if (basetime.tv_sec == 0 && basetime.tv_nsec == 0)
+    {
+      clock_gettime(CLOCK_MONOTONIC, &basetime);
+    }
 
-    return ticks - basetime;
+  return (clock_time2usec(&curtime) - clock_time2usec(&basetime)) / 1000;
 }
 
-// Sleep for a specified number of ms
+/****************************************************************************
+ * Name: i_init_timer
+ *
+ * Description:
+ *  Initialize timer.
+ ****************************************************************************/
 
-void I_Sleep(int ms)
+void i_init_timer(void)
 {
-    SDL_Delay(ms);
 }
 
-void I_WaitVBL(int count)
+/****************************************************************************
+ * Name: i_wait_vbl
+ *
+ * Description:
+ *   Wait for vertical retrace or pause a bit.
+ ****************************************************************************/
+
+void i_wait_vbl(int count)
 {
-    I_Sleep((count * 1000) / 70);
+  usleep((count * 1000000) / 70);
 }
-
-
-void I_InitTimer(void)
-{
-    // initialize timer
-
-    SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "1");
-
-    SDL_Init(SDL_INIT_TIMER);
-}
-
diff --git a/games/NXDoom/src/i_timer.h b/games/NXDoom/src/i_timer.h
index 9b3dbb8d1..eb9d7756c 100644
--- a/games/NXDoom/src/i_timer.h
+++ b/games/NXDoom/src/i_timer.h
@@ -1,42 +1,76 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      System-specific timer interface
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_timer.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *      System-specific timer interface
+ *
+ ****************************************************************************/
 
 #ifndef __I_TIMER__
 #define __I_TIMER__
 
+/****************************************************************************
+ * Preprocessor Definitions
+ ****************************************************************************/
+
 #define TICRATE 35
 
-// Called by D_DoomLoop,
-// returns current time in tics.
-int I_GetTime (void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// returns current time in ms
-int I_GetTimeMS (void);
+/****************************************************************************
+ * Name: i_get_time
+ *
+ * Description:
+ *  Called by d_doomloop.
+ *
+ * Returns:
+ *  The current time in tics.
+ ****************************************************************************/
 
-// Pause for a specified number of ms
-void I_Sleep(int ms);
+int i_get_time(void);
 
-// Initialize timer
-void I_InitTimer(void);
+/****************************************************************************
+ * Name: i_get_time_ms
+ *
+ * Returns:
+ *  The current time in ms.
+ ****************************************************************************/
 
-// Wait for vertical retrace or pause a bit.
-void I_WaitVBL(int count);
+int i_get_time_ms(void);
 
-#endif
+/****************************************************************************
+ * Name: i_init_timer
+ *
+ * Description:
+ *  Initialize timer.
+ ****************************************************************************/
 
+void i_init_timer(void);
+
+/****************************************************************************
+ * Name: i_wait_vbl
+ *
+ * Description:
+ *   Wait for vertical retrace or pause a bit.
+ ****************************************************************************/
+
+void i_wait_vbl(int count);
+
+#endif /* __I_TIMER__ */
diff --git a/games/NXDoom/src/i_video.c b/games/NXDoom/src/i_video.c
index 6ff3b80e1..0d3b41af3 100644
--- a/games/NXDoom/src/i_video.c
+++ b/games/NXDoom/src/i_video.c
@@ -1,34 +1,40 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM graphics stuff for SDL.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/i_video.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ * DOOM graphics stuff for SDL.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include <nuttx/config.h>
+
+#include <nuttx/video/fb.h>
+#include <nuttx/video/rgbcolors.h>
+
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include "SDL.h"
-#include "SDL_opengl.h"
-
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#endif
+#include <sys/ioctl.h>
+#include <sys/mman.h>
 
 #include "config.h"
 #include "d_loop.h"
@@ -48,1490 +54,779 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-// These are (1) the window (or the full screen) that our game is rendered to
-// and (2) the renderer that scales the texture (see below) into this window.
+/****************************************************************************
+ * Preprocessor Definitions
+ ****************************************************************************/
 
-static SDL_Window *screen;
-static SDL_Renderer *renderer;
+#define RESIZE_DELAY 500
 
-// Window title
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
-static const char *window_title = "";
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-// These are (1) the 320x200x8 paletted buffer that we draw to (i.e. the one
-// that holds I_VideoBuffer), (2) the 320x200x32 RGBA intermediate buffer that
-// we blit the former buffer to, (3) the intermediate 320x200 texture that we
-// load the RGBA buffer to and that we render into another texture (4) which
-// is upscaled by an integer factor UPSCALE using "nearest" scaling and which
-// in turn is finally rendered to screen using "linear" scaling.
+struct graphics_state_s
+{
+  int fd; /* File descriptor handle to frame buffer */
 
-static SDL_Surface *screenbuffer = NULL;
-static SDL_Surface *argbbuffer = NULL;
-static SDL_Texture *texture = NULL;
-static SDL_Texture *texture_upscaled = NULL;
+  /* The 320x200x32 RGBA intermediate buffer is what we blit the former
+   * buffer to. On NuttX, this is the frame buffer memory `fbmem`. It may not
+   * have 32-bit depth, but if it doesn't, the code is adjusted accordingly.
+   */
 
-static SDL_Rect blit_rect = {
-    0,
-    0,
-    SCREENWIDTH,
-    SCREENHEIGHT
+  FAR void *fbmem;
+
+  /* 8-bit depth screen buffer (320x200x8) that we draw to (i.e. the one that
+   * holds i_video_buffer)
+   */
+
+  pixel_t *scrnbuf;
+
+  /* Information about the frame buffer needed for rendering. */
+
+  struct fb_videoinfo_s vinfo;
+  struct fb_planeinfo_s pinfo;
+
+  /* Scale multiplier for rendering large image */
+
+  uint8_t scale;
+
+  bool inited; /* Track initialization */
 };
 
-// palette
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* NuttX graphics state */
+
+static struct graphics_state_s g_graphics_state =
+{
+  0
+};
+
+/* Window title */
+
+static const char *g_window_title = "";
+
+/* Colour palette map from 8-bit colour to 32-bit */
+
+static struct argbcolor_s g_palette[256];
 
-static SDL_Color palette[256];
 static boolean palette_to_set;
 
-// display has been set up?
-
-static boolean initialized = false;
-
-// disable mouse?
+/* disable mouse? */
 
 static boolean nomouse = false;
-int usemouse = 1;
 
-// Save screenshots in PNG format.
-
-int png_screenshots = 0;
-
-// SDL video driver name
-
-char *video_driver = "";
-
-// Window position:
-
-char *window_position = "center";
-
-// SDL display number on which to run.
-
-int video_display = 0;
-
-// Screen width and height, from configuration file.
-
-int window_width = 800;
-int window_height = 600;
-
-// Fullscreen mode, 0x0 for SDL_WINDOW_FULLSCREEN_DESKTOP.
-
-int fullscreen_width = 0, fullscreen_height = 0;
-
-// Maximum number of pixels to use for intermediate scale buffer.
+/* Maximum number of pixels to use for intermediate scale buffer. */
 
 static int max_scaling_buffer_pixels = 16000000;
 
-// Run in full screen mode?  (int type for config code)
-
-int fullscreen = true;
-
-// Aspect ratio correction mode
-
-int aspect_ratio_correct = true;
-static int actualheight;
-
-// Smooth pixel scaling
-int smooth_pixel_scaling = true;
-
-// Force integer scales for resolution-independent rendering
-
-int integer_scaling = false;
-
-// VGA Porch palette change emulation
-
-int vga_porch_flash = false;
-
-// Force software rendering, for systems which lack effective hardware
-// acceleration
-
-int force_software_renderer = false;
-
-// Time to wait for the screen to settle on startup before starting the
-// game (ms)
+/* Time to wait for the screen to settle on startup before starting the game
+ * (ms)
+ */
 
 static int startup_delay = 1000;
 
-// Grab the mouse? (int type for config code). nograbmouse_override allows
-// this to be temporarily disabled via the command line.
+/* Grab the mouse? (int type for config code). nograbmouse_override allows
+ * this to be temporarily disabled via the command line.
+ */
 
 static int grabmouse = true;
 static boolean nograbmouse_override = false;
 
-// The screen buffer; this is modified to draw things to the screen
-
-pixel_t *I_VideoBuffer = NULL;
-
-// If true, game is running as a screensaver
-
-boolean screensaver_mode = false;
-
-// Flag indicating whether the screen is currently visible:
-// when the screen isnt visible, don't render the screen
-
-boolean screenvisible = true;
-
-// If true, we display dots at the bottom of the screen to 
-// indicate FPS.
+/* If true, we display dots at the bottom of the screen to
+ * indicate FPS.
+ */
 
 static boolean display_fps_dots;
 
-// If this is true, the screen is rendered but not blitted to the
-// video buffer.
+/* If this is true, the screen is rendered but not blitted to the
+ * video buffer.
+ */
 
 static boolean noblit;
 
-// Callback function to invoke to determine whether to grab the 
-// mouse pointer.
+/* Callback function to invoke to determine whether to grab the
+ * mouse pointer.
+ */
 
 static grabmouse_callback_t grabmouse_callback = NULL;
 
-// Does the window currently have focus?
+/* Does the window currently have focus? */
 
 static boolean window_focused = true;
 
-// Window resize state.
+/* Window resize state. */
 
+#if 0
 static boolean need_resize = false;
 static unsigned int last_resize_time;
-#define RESIZE_DELAY 500
+#endif
 
-// Gamma correction level to use
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+int usemouse = 1;
+
+/* Save screenshots in PNG format. */
+
+int png_screenshots = 0;
+
+/* SDL video driver name */
+
+char *video_driver = "";
+
+/* Window position: */
+
+char *window_position = "center";
+
+/* SDL display number on which to run. */
+
+int video_display = 0;
+
+/* Screen width and height, from configuration file. */
+
+int window_width = 320;
+int window_height = 200;
+
+/* Fullscreen mode, 0x0 for SDL_WINDOW_FULLSCREEN_DESKTOP. */
+
+int fullscreen_width = 0;
+int fullscreen_height = 0;
+
+/* Run in full screen mode?  (int type for config code) */
+
+int fullscreen = true;
+
+/* Smooth pixel scaling */
+
+int smooth_pixel_scaling = true;
+
+/* Force integer scales for resolution-independent rendering */
+
+int integer_scaling = false;
+
+/* VGA Porch palette change emulation */
+
+int vga_porch_flash = false;
+
+/* Force software rendering, for systems which lack effective hardware
+ * acceleration
+ */
+
+int force_software_renderer = false;
+
+/* The screen buffer; this is modified to draw things to the screen */
+
+pixel_t *i_video_buffer = NULL;
+
+/* If true, game is running as a screensaver */
+
+boolean screensaver_mode = false;
+
+/* Flag indicating whether the screen is currently visible:
+ * when the screen isn't visible, don't render the screen
+ */
+
+boolean screenvisible = true;
+
+/* Gamma correction level to use */
 
 int usegamma = 0;
 
-// Joystick/gamepad hysteresis
+/* Joystick/gamepad hysteresis */
+
 unsigned int joywait = 0;
 
-// Icon RGB data and dimensions
-static const unsigned int *icon_data;
-static int icon_w;
-static int icon_h;
+/* TODO: I'm sure more of the variables above can be private */
 
-static boolean MouseShouldBeGrabbed()
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: blit_screen
+ *
+ * Description:
+ *   Blit the 8-bit depth buffer that DOOM renders to onto the frame buffer
+ *   in a higher colour depth.
+ *
+ ****************************************************************************/
+
+static void blit_screen(void)
 {
-    // never grab the mouse when in screensaver mode
-   
-    if (screensaver_mode)
-        return false;
+  uint8_t p_idx;
+  void *fbptr;
 
-    // if the window doesn't have focus, never grab it
+  /* TODO: It would be best to do this more efficiently/with less memory.
+   * It also would be good if we could handle the palette translation here
+   * such that DOOM can be played on frame buffers with differing bit depths
+   * and pixel formats.
+   */
 
-    if (!window_focused)
-        return false;
-
-    // always grab the mouse when full screen (dont want to 
-    // see the mouse pointer)
-
-    if (fullscreen)
-        return true;
-
-    // Don't grab the mouse if mouse input is disabled
-
-    if (!usemouse || nomouse)
-        return false;
-
-    // if we specify not to grab the mouse, never grab
-
-    if (nograbmouse_override || !grabmouse)
-        return false;
-
-    // Invoke the grabmouse callback function to determine whether
-    // the mouse should be grabbed
-
-    if (grabmouse_callback != NULL)
+  fbptr = g_graphics_state.fbmem;
+  for (unsigned y = 0; y < SCREENHEIGHT * g_graphics_state.scale; y++)
     {
-        return grabmouse_callback();
-    }
-    else
-    {
-        return true;
-    }
-}
-
-void I_SetGrabMouseCallback(grabmouse_callback_t func)
-{
-    grabmouse_callback = func;
-}
-
-// Set the variable controlling FPS dots.
-
-void I_DisplayFPSDots(boolean dots_on)
-{
-    display_fps_dots = dots_on;
-}
-
-static void SetShowCursor(boolean show)
-{
-    if (!screensaver_mode)
-    {
-        // When the cursor is hidden, grab the input.
-        // Relative mode implicitly hides the cursor.
-        SDL_SetRelativeMouseMode(!show);
-        SDL_GetRelativeMouseState(NULL, NULL);
-    }
-}
-
-void I_ShutdownGraphics(void)
-{
-    if (initialized)
-    {
-        SetShowCursor(true);
-
-        SDL_FreeSurface(argbbuffer);
-        SDL_FreeSurface(screenbuffer);
-        SDL_DestroyTexture(texture_upscaled);
-        SDL_DestroyTexture(texture);
-        SDL_DestroyRenderer(renderer);
-        SDL_DestroyWindow(screen);
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-
-        initialized = false;
-    }
-}
-
-
-
-//
-// I_StartFrame
-//
-void I_StartFrame (void)
-{
-    // er?
-
-}
-
-// Adjust window_width / window_height variables to be an an aspect
-// ratio consistent with the aspect_ratio_correct variable.
-static void AdjustWindowSize(void)
-{
-    if (aspect_ratio_correct || integer_scaling)
-    {
-        if (window_width * actualheight <= window_height * SCREENWIDTH)
+      for (unsigned x = 0; x < SCREENWIDTH * g_graphics_state.scale; x++)
         {
-            // We round up window_height if the ratio is not exact; this leaves
-            // the result stable.
-            window_height = (window_width * actualheight + SCREENWIDTH - 1) / SCREENWIDTH;
-        }
-        else
-        {
-            window_width = window_height * SCREENWIDTH / actualheight;
+          p_idx = g_graphics_state
+                      .scrnbuf[(y / g_graphics_state.scale) * SCREENWIDTH +
+                               (x / g_graphics_state.scale)];
+
+          ((uint32_t *)(fbptr))[x] =
+              ARGBTO32(g_palette[p_idx].a, g_palette[p_idx].r,
+                       g_palette[p_idx].g, g_palette[p_idx].b);
         }
+
+      fbptr += g_graphics_state.pinfo.stride;
     }
 }
 
-static void HandleWindowEvent(SDL_WindowEvent *event)
+static void update_grab(void)
 {
-    int i;
+}
 
-    switch (event->event)
+static void set_video_mode(void)
+{
+}
+
+static void i_get_event(void)
+{
+  int err;
+#if CONFIG_GAMES_NXDOOM_KEYBOARD
+  struct keyboard_event_s kbdevent;
+
+  while ((err = get_kbd_event(&kbdevent)) == 0)
     {
-#if 0 // SDL2-TODO
-        case SDL_ACTIVEEVENT:
-            // need to update our focus state
-            UpdateFocus();
-            break;
-#endif
-        case SDL_WINDOWEVENT_EXPOSED:
-            palette_to_set = true;
-            break;
+      switch (kbdevent.type)
+        {
+        case KEYBOARD_PRESS:
 
-        case SDL_WINDOWEVENT_RESIZED:
-            need_resize = true;
-            last_resize_time = SDL_GetTicks();
-            break;
+          /* deliberate fall-though */
 
-        // Don't render the screen when the window is minimized:
-
-        case SDL_WINDOWEVENT_MINIMIZED:
-            screenvisible = false;
-            break;
-
-        case SDL_WINDOWEVENT_MAXIMIZED:
-        case SDL_WINDOWEVENT_RESTORED:
-            screenvisible = true;
-            break;
-
-        // Update the value of window_focused when we get a focus event
-        //
-        // We try to make ourselves be well-behaved: the grab on the mouse
-        // is removed if we lose focus (such as a popup window appearing),
-        // and we dont move the mouse around if we aren't focused either.
-
-        case SDL_WINDOWEVENT_FOCUS_GAINED:
-            window_focused = true;
-            break;
-
-        case SDL_WINDOWEVENT_FOCUS_LOST:
-            window_focused = false;
-            break;
-
-        // We want to save the user's preferred monitor to use for running the
-        // game, so that next time we're run we start on the same display. So
-        // every time the window is moved, find which display we're now on and
-        // update the video_display config variable.
-
-        case SDL_WINDOWEVENT_MOVED:
-            i = SDL_GetWindowDisplayIndex(screen);
-            if (i >= 0)
-            {
-                video_display = i;
-            }
-            break;
+        case KEYBOARD_RELEASE:
+          i_handle_keyboard_event(&kbdevent);
+          break;
 
         default:
-            break;
-    }
-}
-
-static boolean ToggleFullScreenKeyShortcut(SDL_Keysym *sym)
-{
-    Uint16 flags = (KMOD_LALT | KMOD_RALT);
-#if defined(__MACOSX__)
-    flags |= (KMOD_LGUI | KMOD_RGUI);
-#endif
-    return (sym->scancode == SDL_SCANCODE_RETURN || 
-            sym->scancode == SDL_SCANCODE_KP_ENTER) && (sym->mod & flags) != 0;
-}
-
-static void I_ToggleFullScreen(void)
-{
-    unsigned int flags = 0;
-
-    // TODO: Consider implementing fullscreen toggle for SDL_WINDOW_FULLSCREEN
-    // (mode-changing) setup. This is hard because we have to shut down and
-    // restart again.
-    if (fullscreen_width != 0 || fullscreen_height != 0)
-    {
-        return;
-    }
-
-    fullscreen = !fullscreen;
-
-    if (fullscreen)
-    {
-        flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
-    }
-
-    SDL_SetWindowFullscreen(screen, flags);
-
-    if (!fullscreen)
-    {
-        AdjustWindowSize();
-        SDL_SetWindowSize(screen, window_width, window_height);
-    }
-}
-
-void I_GetEvent(void)
-{
-    SDL_Event sdlevent;
-
-    SDL_PumpEvents();
-
-    while (SDL_PollEvent(&sdlevent))
-    {
-        switch (sdlevent.type)
-        {
-            case SDL_KEYDOWN:
-                if (ToggleFullScreenKeyShortcut(&sdlevent.key.keysym))
-                {
-                    I_ToggleFullScreen();
-                    break;
-                }
-                // deliberate fall-though
-
-            case SDL_KEYUP:
-		I_HandleKeyboardEvent(&sdlevent);
-                break;
-
-            case SDL_MOUSEBUTTONDOWN:
-            case SDL_MOUSEBUTTONUP:
-            case SDL_MOUSEWHEEL:
-                if (usemouse && !nomouse && window_focused)
-                {
-                    I_HandleMouseEvent(&sdlevent);
-                }
-                break;
-
-            case SDL_QUIT:
-                if (screensaver_mode)
-                {
-                    I_Quit();
-                }
-                else
-                {
-                    event_t event;
-                    event.type = ev_quit;
-                    D_PostEvent(&event);
-                }
-                break;
-
-            case SDL_WINDOWEVENT:
-                if (sdlevent.window.windowID == SDL_GetWindowID(screen))
-                {
-                    HandleWindowEvent(&sdlevent.window);
-                }
-                break;
-
-            default:
-                break;
-        }
-    }
-}
-
-//
-// I_StartTic
-//
-void I_StartTic (void)
-{
-    if (!initialized)
-    {
-        return;
-    }
-
-    I_GetEvent();
-
-    if (usemouse && !nomouse && window_focused)
-    {
-        I_ReadMouse();
-    }
-
-    if (joywait < I_GetTime())
-    {
-        I_UpdateJoystick();
-    }
-}
-
-
-//
-// I_UpdateNoBlit
-//
-void I_UpdateNoBlit (void)
-{
-    // what is this?
-}
-
-static void UpdateGrab(void)
-{
-    static boolean currently_grabbed = false;
-    boolean grab;
-
-    grab = MouseShouldBeGrabbed();
-
-    if (screensaver_mode)
-    {
-        // Hide the cursor in screensaver mode
-
-        SetShowCursor(false);
-    }
-    else if (grab && !currently_grabbed)
-    {
-        SetShowCursor(false);
-    }
-    else if (!grab && currently_grabbed)
-    {
-        int screen_w, screen_h;
-
-        SetShowCursor(true);
-
-        // When releasing the mouse from grab, warp the mouse cursor to
-        // the bottom-right of the screen. This is a minimally distracting
-        // place for it to appear - we may only have released the grab
-        // because we're at an end of level intermission screen, for
-        // example.
-
-        SDL_GetWindowSize(screen, &screen_w, &screen_h);
-        SDL_WarpMouseInWindow(screen, screen_w - 16, screen_h - 16);
-        SDL_GetRelativeMouseState(NULL, NULL);
-    }
-
-    currently_grabbed = grab;
-}
-
-static void LimitTextureSize(int *w_upscale, int *h_upscale)
-{
-    SDL_RendererInfo rinfo;
-    int orig_w, orig_h;
-
-    orig_w = *w_upscale;
-    orig_h = *h_upscale;
-
-    // Query renderer and limit to maximum texture dimensions of hardware:
-    if (SDL_GetRendererInfo(renderer, &rinfo) != 0)
-    {
-        I_Error("CreateUpscaledTexture: SDL_GetRendererInfo() call failed: %s",
-                SDL_GetError());
-    }
-
-    while (*w_upscale * SCREENWIDTH > rinfo.max_texture_width)
-    {
-        --*w_upscale;
-    }
-    while (*h_upscale * SCREENHEIGHT > rinfo.max_texture_height)
-    {
-        --*h_upscale;
-    }
-
-    if ((*w_upscale < 1 && rinfo.max_texture_width > 0) ||
-        (*h_upscale < 1 && rinfo.max_texture_height > 0))
-    {
-        I_Error("CreateUpscaledTexture: Can't create a texture big enough for "
-                "the whole screen! Maximum texture size %dx%d",
-                rinfo.max_texture_width, rinfo.max_texture_height);
-    }
-
-    // We limit the amount of texture memory used for the intermediate buffer,
-    // since beyond a certain point there are diminishing returns. Also,
-    // depending on the hardware there may be performance problems with very
-    // huge textures, so the user can use this to reduce the maximum texture
-    // size if desired.
-
-    if (max_scaling_buffer_pixels < SCREENWIDTH * SCREENHEIGHT)
-    {
-        I_Error("CreateUpscaledTexture: max_scaling_buffer_pixels too small "
-                "to create a texture buffer: %d < %d",
-                max_scaling_buffer_pixels, SCREENWIDTH * SCREENHEIGHT);
-    }
-
-    while (*w_upscale * *h_upscale * SCREENWIDTH * SCREENHEIGHT
-           > max_scaling_buffer_pixels)
-    {
-        if (*w_upscale > *h_upscale)
-        {
-            --*w_upscale;
-        }
-        else
-        {
-            --*h_upscale;
-        }
-    }
-
-    if (*w_upscale != orig_w || *h_upscale != orig_h)
-    {
-        printf("CreateUpscaledTexture: Limited texture size to %dx%d "
-               "(max %d pixels, max texture size %dx%d)\n",
-               *w_upscale * SCREENWIDTH, *h_upscale * SCREENHEIGHT,
-               max_scaling_buffer_pixels,
-               rinfo.max_texture_width, rinfo.max_texture_height);
-    }
-}
-
-static void CreateUpscaledTexture(boolean force)
-{
-    int w, h;
-    int h_upscale, w_upscale;
-    static int h_upscale_old, w_upscale_old;
-
-    SDL_Texture *new_texture, *old_texture;
-
-    // Get the size of the renderer output. The units this gives us will be
-    // real world pixels, which are not necessarily equivalent to the screen's
-    // window size (because of highdpi).
-    if (SDL_GetRendererOutputSize(renderer, &w, &h) != 0)
-    {
-        I_Error("Failed to get renderer output size: %s", SDL_GetError());
-    }
-
-    // When the screen or window dimensions do not match the aspect ratio
-    // of the texture, the rendered area is scaled down to fit. Calculate
-    // the actual dimensions of the rendered area.
-
-    if (w * actualheight < h * SCREENWIDTH)
-    {
-        // Tall window.
-
-        h = w * actualheight / SCREENWIDTH;
-    }
-    else
-    {
-        // Wide window.
-
-        w = h * SCREENWIDTH / actualheight;
-    }
-
-    // Pick texture size the next integer multiple of the screen dimensions.
-    // If one screen dimension matches an integer multiple of the original
-    // resolution, there is no need to overscale in this direction.
-
-    w_upscale = (w + SCREENWIDTH - 1) / SCREENWIDTH;
-    h_upscale = (h + SCREENHEIGHT - 1) / SCREENHEIGHT;
-
-    // Minimum texture dimensions of 320x200.
-
-    if (w_upscale < 1)
-    {
-        w_upscale = 1;
-    }
-    if (h_upscale < 1)
-    {
-        h_upscale = 1;
-    }
-
-    LimitTextureSize(&w_upscale, &h_upscale);
-
-    // Create a new texture only if the upscale factors have actually changed.
-
-    if (h_upscale == h_upscale_old && w_upscale == w_upscale_old && !force)
-    {
-        return;
-    }
-
-    h_upscale_old = h_upscale;
-    w_upscale_old = w_upscale;
-
-    // Set the scaling quality for rendering the upscaled texture to "linear",
-    // which looks much softer and smoother than "nearest" but does a better
-    // job at downscaling from the upscaled texture to screen.
-
-    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
-
-    new_texture = SDL_CreateTexture(renderer,
-                                SDL_PIXELFORMAT_ARGB8888,
-                                SDL_TEXTUREACCESS_TARGET,
-                                w_upscale*SCREENWIDTH,
-                                h_upscale*SCREENHEIGHT);
-
-    old_texture = texture_upscaled;
-    texture_upscaled = new_texture;
-
-    if (old_texture != NULL)
-    {
-        SDL_DestroyTexture(old_texture);
-    }
-}
-
-//
-// I_FinishUpdate
-//
-void I_FinishUpdate (void)
-{
-    static int lasttic;
-    int tics;
-    int i;
-
-    if (!initialized)
-        return;
-
-    if (noblit)
-        return;
-
-    if (need_resize)
-    {
-        if (SDL_GetTicks() > last_resize_time + RESIZE_DELAY)
-        {
-            int flags;
-            // When the window is resized (we're not in fullscreen mode),
-            // save the new window size.
-            flags = SDL_GetWindowFlags(screen);
-            if ((flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == 0)
-            {
-                SDL_GetWindowSize(screen, &window_width, &window_height);
-
-                // Adjust the window by resizing again so that the window
-                // is the right aspect ratio.
-                AdjustWindowSize();
-                SDL_SetWindowSize(screen, window_width, window_height);
-            }
-            CreateUpscaledTexture(false);
-            need_resize = false;
-            palette_to_set = true;
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    UpdateGrab();
-
-#if 0 // SDL2-TODO
-    // Don't update the screen if the window isn't visible.
-    // Not doing this breaks under Windows when we alt-tab away 
-    // while fullscreen.
-
-    if (!(SDL_GetAppState() & SDL_APPACTIVE))
-        return;
-#endif
-
-    // draws little dots on the bottom of the screen
-
-    if (display_fps_dots)
-    {
-	i = I_GetTime();
-	tics = i - lasttic;
-	lasttic = i;
-	if (tics > 20) tics = 20;
-
-	for (i=0 ; i<tics*4 ; i+=4)
-	    I_VideoBuffer[ (SCREENHEIGHT-1)*SCREENWIDTH + i] = 0xff;
-	for ( ; i<20*4 ; i+=4)
-	    I_VideoBuffer[ (SCREENHEIGHT-1)*SCREENWIDTH + i] = 0x0;
-    }
-
-    // Draw disk icon before blit, if necessary.
-    V_DrawDiskIcon();
-
-    if (palette_to_set)
-    {
-        SDL_SetPaletteColors(screenbuffer->format->palette, palette, 0, 256);
-        palette_to_set = false;
-
-        if (vga_porch_flash)
-        {
-            // "flash" the pillars/letterboxes with palette changes, emulating
-            // VGA "porch" behaviour (GitHub issue #832)
-            SDL_SetRenderDrawColor(renderer, palette[0].r, palette[0].g,
-                palette[0].b, SDL_ALPHA_OPAQUE);
-        }
-    }
-
-    // Blit from the paletted 8-bit screen buffer to the intermediate
-    // 32-bit RGBA buffer and update the intermediate texture with the
-    // contents of the RGBA buffer.
-
-    SDL_LockTexture(texture, &blit_rect, &argbbuffer->pixels,
-                    &argbbuffer->pitch);
-    SDL_LowerBlit(screenbuffer, &blit_rect, argbbuffer, &blit_rect);
-    SDL_UnlockTexture(texture);
-
-    // Make sure the pillarboxes are kept clear each frame.
-
-    SDL_RenderClear(renderer);
-
-    if (smooth_pixel_scaling && !force_software_renderer)
-    {
-        // Render this intermediate texture into the upscaled texture
-        // using "nearest" integer scaling.
-        SDL_SetRenderTarget(renderer, texture_upscaled);
-        SDL_RenderCopy(renderer, texture, NULL, NULL);
-
-        // Finally, render this upscaled texture to screen using linear scaling.
-
-        SDL_SetRenderTarget(renderer, NULL);
-        SDL_RenderCopy(renderer, texture_upscaled, NULL, NULL);
-    }
-    else
-    {
-        SDL_SetRenderTarget(renderer, NULL);
-        SDL_RenderCopy(renderer, texture, NULL, NULL);
-    }
-
-
-    // Draw!
-
-    SDL_RenderPresent(renderer);
-
-    // Restore background and undo the disk indicator, if it was drawn.
-    V_RestoreDiskBackground();
-}
-
-
-//
-// I_ReadScreen
-//
-void I_ReadScreen (pixel_t* scr)
-{
-    memcpy(scr, I_VideoBuffer, SCREENWIDTH*SCREENHEIGHT*sizeof(*scr));
-}
-
-
-//
-// I_SetPalette
-//
-void I_SetPalette (byte *doompalette)
-{
-    int i;
-
-    for (i=0; i<256; ++i)
-    {
-        // Zero out the bottom two bits of each channel - the PC VGA
-        // controller only supports 6 bits of accuracy.
-
-        palette[i].a = 0xFFU;
-        palette[i].r = gammatable[usegamma][*doompalette++] & ~3;
-        palette[i].g = gammatable[usegamma][*doompalette++] & ~3;
-        palette[i].b = gammatable[usegamma][*doompalette++] & ~3;
-    }
-
-    palette_to_set = true;
-}
-
-// Given an RGB value, find the closest matching palette index.
-
-int I_GetPaletteIndex(int r, int g, int b)
-{
-    int best, best_diff, diff;
-    int i;
-
-    best = 0; best_diff = INT_MAX;
-
-    for (i = 0; i < 256; ++i)
-    {
-        diff = (r - palette[i].r) * (r - palette[i].r)
-             + (g - palette[i].g) * (g - palette[i].g)
-             + (b - palette[i].b) * (b - palette[i].b);
-
-        if (diff < best_diff)
-        {
-            best = i;
-            best_diff = diff;
-        }
-
-        if (diff == 0)
-        {
-            break;
-        }
-    }
-
-    return best;
-}
-
-// 
-// Set the window title
-//
-
-void I_SetWindowTitle(const char *title)
-{
-    window_title = title;
-}
-
-//
-// Call the SDL function to set the window title, based on 
-// the title set with I_SetWindowTitle.
-//
-
-void I_InitWindowTitle(void)
-{
-    char *buf;
-
-    buf = M_StringJoin(window_title, " - ", PACKAGE_STRING, NULL);
-    SDL_SetWindowTitle(screen, buf);
-    free(buf);
-}
-
-void I_RegisterWindowIcon(const unsigned int *icon, int width, int height)
-{
-    icon_data = icon;
-    icon_w = width;
-    icon_h = height;
-}
-
-// Set the application icon
-
-void I_InitWindowIcon(void)
-{
-    SDL_Surface *surface;
-
-    surface = SDL_CreateRGBSurfaceFrom((void *) icon_data, icon_w, icon_h,
-                                       32, icon_w * 4,
-                                       0xffu << 24, 0xffu << 16,
-                                       0xffu << 8, 0xffu << 0);
-
-    SDL_SetWindowIcon(screen, surface);
-    SDL_FreeSurface(surface);
-}
-
-// Set video size to a particular scale factor (1x, 2x, 3x, etc.)
-
-static void SetScaleFactor(int factor)
-{
-    int height;
-
-    // Pick 320x200 or 320x240, depending on aspect ratio correct
-    if (aspect_ratio_correct)
-    {
-        height = SCREENHEIGHT_4_3;
-    }
-    else
-    {
-        height = SCREENHEIGHT;
-    }
-
-    window_width = factor * SCREENWIDTH;
-    window_height = factor * height;
-    fullscreen = false;
-}
-
-void I_GraphicsCheckCommandLine(void)
-{
-    int i;
-
-    //!
-    // @category video
-    // @vanilla
-    //
-    // Disable blitting the screen.
-    //
-
-    noblit = M_CheckParm ("-noblit");
-
-    //!
-    // @category video 
-    //
-    // Don't grab the mouse when running in windowed mode.
-    //
-
-    nograbmouse_override = M_ParmExists("-nograbmouse");
-
-    // default to fullscreen mode, allow override with command line
-    // nofullscreen because we love prboom
-
-    //!
-    // @category video 
-    //
-    // Run in a window.
-    //
-
-    if (M_CheckParm("-window") || M_CheckParm("-nofullscreen"))
-    {
-        fullscreen = false;
-    }
-
-    //!
-    // @category video 
-    //
-    // Run in fullscreen mode.
-    //
-
-    if (M_CheckParm("-fullscreen"))
-    {
-        fullscreen = true;
-    }
-
-    //!
-    // @category video 
-    //
-    // Disable the mouse.
-    //
-
-    nomouse = M_CheckParm("-nomouse") > 0;
-
-    //!
-    // @category video
-    // @arg <W>
-    //
-    // Specify the screen width, in pixels.  Implies -window.
-    //
-
-    i = M_CheckParmWithArgs("-width", 1);
-
-    if (i > 0)
-    {
-        window_width = atoi(myargv[i + 1]);
-        fullscreen = false;
-    }
-
-    //!
-    // @category video
-    // @arg <H>
-    //
-    // Specify the screen height, in pixels.  Implies -window.
-    //
-
-    i = M_CheckParmWithArgs("-height", 1);
-
-    if (i > 0)
-    {
-        window_height = atoi(myargv[i + 1]);
-        fullscreen = false;
-    }
-
-    //!
-    // @category video
-    // @arg <WxH>
-    //
-    // Specify the dimensions of the window.  Implies -window.
-    //
-
-    i = M_CheckParmWithArgs("-geometry", 1);
-
-    if (i > 0)
-    {
-        int w, h, s;
-
-        s = sscanf(myargv[i + 1], "%ix%i", &w, &h);
-        if (s == 2)
-        {
-            window_width = w;
-            window_height = h;
-            fullscreen = false;
-        }
-    }
-
-    //!
-    // @category video
-    // @arg <x>
-    //
-    // Specify the display number on which to show the screen.
-    //
-
-    i = M_CheckParmWithArgs("-display", 1);
-
-    if (i > 0)
-    {
-        int display = atoi(myargv[i + 1]);
-        if (display >= 0)
-        {
-            video_display = display;
-        }
-    }
-
-    //!
-    // @category video
-    //
-    // Don't scale up the screen.  Implies -window.
-    //
-
-    if (M_CheckParm("-1")) 
-    {
-        SetScaleFactor(1);
-    }
-
-    //!
-    // @category video
-    //
-    // Double up the screen to 2x its normal size.  Implies -window.
-    //
-
-    if (M_CheckParm("-2")) 
-    {
-        SetScaleFactor(2);
-    }
-
-    //!
-    // @category video
-    //
-    // Double up the screen to 3x its normal size.  Implies -window.
-    //
-
-    if (M_CheckParm("-3")) 
-    {
-        SetScaleFactor(3);
-    }
-}
-
-// Check if we have been invoked as a screensaver by xscreensaver.
-
-void I_CheckIsScreensaver(void)
-{
-    char *env;
-
-    env = getenv("XSCREENSAVER_WINDOW");
-
-    if (env != NULL)
-    {
-        screensaver_mode = true;
-    }
-}
-
-static void SetSDLVideoDriver(void)
-{
-    // Allow a default value for the SDL video driver to be specified
-    // in the configuration file.
-
-    if (strcmp(video_driver, "") != 0)
-    {
-        char *env_string;
-
-        env_string = M_StringJoin("SDL_VIDEODRIVER=", video_driver, NULL);
-        putenv(env_string);
-        free(env_string);
-    }
-}
-
-// Check the display bounds of the display referred to by 'video_display' and
-// set x and y to a location that places the window in the center of that
-// display.
-static void CenterWindow(int *x, int *y, int w, int h)
-{
-    SDL_Rect bounds;
-
-    if (SDL_GetDisplayBounds(video_display, &bounds) < 0)
-    {
-        fprintf(stderr, "CenterWindow: Failed to read display bounds "
-                        "for display #%d!\n", video_display);
-        return;
-    }
-
-    *x = bounds.x + SDL_max((bounds.w - w) / 2, 0);
-    *y = bounds.y + SDL_max((bounds.h - h) / 2, 0);
-}
-
-void I_GetWindowPosition(int *x, int *y, int w, int h)
-{
-    // Check that video_display corresponds to a display that really exists,
-    // and if it doesn't, reset it.
-    if (video_display < 0 || video_display >= SDL_GetNumVideoDisplays())
-    {
-        fprintf(stderr,
-                "I_GetWindowPosition: We were configured to run on display #%d, "
-                "but it no longer exists (max %d). Moving to display 0.\n",
-                video_display, SDL_GetNumVideoDisplays() - 1);
-        video_display = 0;
-    }
-
-    // in fullscreen mode, the window "position" still matters, because
-    // we use it to control which display we run fullscreen on.
-
-    if (fullscreen)
-    {
-        CenterWindow(x, y, w, h);
-        return;
-    }
-
-    // in windowed mode, the desired window position can be specified
-    // in the configuration file.
-
-    if (window_position == NULL || !strcmp(window_position, ""))
-    {
-        *x = *y = SDL_WINDOWPOS_UNDEFINED;
-    }
-    else if (!strcmp(window_position, "center"))
-    {
-        // Note: SDL has a SDL_WINDOWPOS_CENTER, but this is useless for our
-        // purposes, since we also want to control which display we appear on.
-        // So we have to do this ourselves.
-        CenterWindow(x, y, w, h);
-    }
-    else if (sscanf(window_position, "%i,%i", x, y) != 2)
-    {
-        // invalid format: revert to default
-        fprintf(stderr, "I_GetWindowPosition: invalid window_position setting\n");
-        *x = *y = SDL_WINDOWPOS_UNDEFINED;
-    }
-}
-
-static void SetVideoMode(void)
-{
-    int w, h;
-    int x, y;
-    int window_flags = 0, renderer_flags = 0;
-    SDL_DisplayMode mode;
-
-    w = window_width;
-    h = window_height;
-
-    // In windowed mode, the window can be resized while the game is
-    // running.
-    window_flags = SDL_WINDOW_RESIZABLE;
-
-    // Set the highdpi flag - this makes a big difference on Macs with
-    // retina displays, especially when using small window sizes.
-    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
-
-    if (fullscreen)
-    {
-        if (fullscreen_width == 0 && fullscreen_height == 0)
-        {
-            // This window_flags means "Never change the screen resolution!
-            // Instead, draw to the entire screen by scaling the texture
-            // appropriately".
-            window_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
-        }
-        else
-        {
-            w = fullscreen_width;
-            h = fullscreen_height;
-            window_flags |= SDL_WINDOW_FULLSCREEN;
-        }
-    }
-
-    // Running without window decorations is potentially useful if you're
-    // playing in three window mode and want to line up three game windows
-    // next to each other on a single desktop.
-    // Deliberately not documented because I'm not sure how useful this is yet.
-    if (M_ParmExists("-borderless"))
-    {
-        window_flags |= SDL_WINDOW_BORDERLESS;
-    }
-
-    I_GetWindowPosition(&x, &y, w, h);
-
-    // Create window and renderer contexts. We set the window title
-    // later anyway and leave the window position "undefined". If
-    // "window_flags" contains the fullscreen flag (see above), then
-    // w and h are ignored.
-
-    if (screen == NULL)
-    {
-        screen = SDL_CreateWindow(NULL, x, y, w, h, window_flags);
-
-        if (screen == NULL)
-        {
-            I_Error("Error creating window for video startup: %s",
-            SDL_GetError());
-        }
-
-        SDL_SetWindowMinimumSize(screen, SCREENWIDTH, actualheight);
-
-        I_InitWindowTitle();
-        I_InitWindowIcon();
-    }
-
-    // The SDL_RENDERER_TARGETTEXTURE flag is required to render the
-    // intermediate texture into the upscaled texture.
-    renderer_flags = SDL_RENDERER_TARGETTEXTURE;
-	
-    if (SDL_GetCurrentDisplayMode(video_display, &mode) != 0)
-    {
-        I_Error("Could not get display mode for video display #%d: %s",
-        video_display, SDL_GetError());
-    }
-
-    // Turn on vsync if we aren't in a -timedemo
-    if (!singletics && mode.refresh_rate > 0)
-    {
-        renderer_flags |= SDL_RENDERER_PRESENTVSYNC;
-    }
-
-    if (force_software_renderer)
-    {
-        renderer_flags |= SDL_RENDERER_SOFTWARE;
-        renderer_flags &= ~SDL_RENDERER_PRESENTVSYNC;
-    }
-
-    if (renderer != NULL)
-    {
-        SDL_DestroyRenderer(renderer);
-        // all associated textures get destroyed
-        texture = NULL;
-        texture_upscaled = NULL;
-    }
-
-    renderer = SDL_CreateRenderer(screen, -1, renderer_flags);
-
-    // If we could not find a matching render driver,
-    // try again without hardware acceleration.
-
-    if (renderer == NULL && !force_software_renderer)
-    {
-        renderer_flags |= SDL_RENDERER_SOFTWARE;
-        renderer_flags &= ~SDL_RENDERER_PRESENTVSYNC;
-
-        renderer = SDL_CreateRenderer(screen, -1, renderer_flags);
-
-        // If this helped, save the setting for later.
-        if (renderer != NULL)
-        {
-            force_software_renderer = 1;
-        }
-    }
-
-    if (renderer == NULL)
-    {
-        I_Error("Error creating renderer for screen window: %s",
-                SDL_GetError());
-    }
-
-    // Important: Set the "logical size" of the rendering context. At the same
-    // time this also defines the aspect ratio that is preserved while scaling
-    // and stretching the texture into the window.
-
-    if (aspect_ratio_correct || integer_scaling)
-    {
-        SDL_RenderSetLogicalSize(renderer,
-                                 SCREENWIDTH,
-                                 actualheight);
-    }
-
-    // Force integer scales for resolution-independent rendering.
-
-    SDL_RenderSetIntegerScale(renderer, integer_scaling);
-
-    // Blank out the full screen area in case there is any junk in
-    // the borders that won't otherwise be overwritten.
-
-    SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
-    SDL_RenderClear(renderer);
-    SDL_RenderPresent(renderer);
-
-    // Create the 8-bit paletted and the 32-bit RGBA screenbuffer surfaces.
-
-    if (screenbuffer != NULL)
-    {
-        SDL_FreeSurface(screenbuffer);
-        screenbuffer = NULL;
-    }
-
-    if (screenbuffer == NULL)
-    {
-        screenbuffer = SDL_CreateRGBSurface(0,
-                                            SCREENWIDTH, SCREENHEIGHT, 8,
-                                            0, 0, 0, 0);
-        SDL_FillRect(screenbuffer, NULL, 0);
-    }
-
-    // Format of argbbuffer must match the screen pixel format because we
-    // import the surface data into the texture.
-
-    if (argbbuffer != NULL)
-    {
-        SDL_FreeSurface(argbbuffer);
-        argbbuffer = NULL;
-    }
-
-    if (argbbuffer == NULL)
-    {
-	    // pixels and pitch will be filled with the texture's values
-	    // in I_FinishUpdate()
-	    argbbuffer = SDL_CreateRGBSurfaceWithFormatFrom(
-                     NULL, w, h, 0, 0, SDL_PIXELFORMAT_ARGB8888);
-    }
-
-    if (texture != NULL)
-    {
-        SDL_DestroyTexture(texture);
-    }
-
-    // Set the scaling quality for rendering the intermediate texture into
-    // the upscaled texture to "nearest", which is gritty and pixelated and
-    // resembles software scaling pretty well.
-
-    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "nearest");
-
-    // Create the intermediate texture that the RGBA surface gets loaded into.
-    // The SDL_TEXTUREACCESS_STREAMING flag means that this texture's content
-    // is going to change frequently.
-
-    texture = SDL_CreateTexture(renderer,
-                                SDL_PIXELFORMAT_ARGB8888,
-                                SDL_TEXTUREACCESS_STREAMING,
-                                SCREENWIDTH, SCREENHEIGHT);
-
-    // Workaround for SDL 2.0.14+ alt-tab bug (taken from Doom Retro via Prboom-plus and Woof)
-#if defined(_WIN32)
-    {
-        SDL_version ver;
-        SDL_GetVersion(&ver);
-        if (ver.major == 2 && ver.minor == 0 && (ver.patch == 14 || ver.patch == 16))
-        {
-           SDL_SetHintWithPriority(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1", SDL_HINT_OVERRIDE);
+          break;
         }
     }
 #endif
-
-    // Initially create the upscaled texture for rendering to screen
-
-    CreateUpscaledTexture(true);
 }
 
-void I_InitGraphics(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void i_set_grab_mouse_callback(grabmouse_callback_t func)
 {
-    SDL_Event dummy;
-    byte *doompal;
-    char *env;
-
-    // Pass through the XSCREENSAVER_WINDOW environment variable to 
-    // SDL_WINDOWID, to embed the SDL window into the Xscreensaver
-    // window.
-
-    env = getenv("XSCREENSAVER_WINDOW");
-
-    if (env != NULL)
-    {
-        char winenv[30];
-        unsigned int winid;
-
-        sscanf(env, "0x%x", &winid);
-        M_snprintf(winenv, sizeof(winenv), "SDL_WINDOWID=%u", winid);
-
-        putenv(winenv);
-    }
-
-    SetSDLVideoDriver();
-
-    if (SDL_Init(SDL_INIT_VIDEO) < 0) 
-    {
-        I_Error("Failed to initialize video: %s", SDL_GetError());
-    }
-
-    // When in screensaver mode, run full screen and auto detect
-    // screen dimensions (don't change video mode)
-    if (screensaver_mode)
-    {
-        fullscreen = true;
-    }
-
-    if (aspect_ratio_correct == 1)
-    {
-        actualheight = SCREENHEIGHT_4_3;
-    }
-    else
-    {
-        actualheight = SCREENHEIGHT;
-    }
-
-    // Create the game window; this may switch graphic modes depending
-    // on configuration.
-    AdjustWindowSize();
-    SetVideoMode();
-
-    // Start with a clear black screen
-    // (screen will be flipped after we set the palette)
-
-    SDL_FillRect(screenbuffer, NULL, 0);
-
-    // Set the palette
-
-    doompal = W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE);
-    I_SetPalette(doompal);
-    SDL_SetPaletteColors(screenbuffer->format->palette, palette, 0, 256);
-
-    // SDL2-TODO UpdateFocus();
-    UpdateGrab();
-
-    // On some systems, it takes a second or so for the screen to settle
-    // after changing modes.  We include the option to add a delay when
-    // setting the screen mode, so that the game doesn't start immediately
-    // with the player unable to see anything.
-
-    if (fullscreen && !screensaver_mode)
-    {
-        SDL_Delay(startup_delay);
-    }
-
-    // The actual 320x200 canvas that we draw to. This is the pixel buffer of
-    // the 8-bit paletted screen buffer that gets blit on an intermediate
-    // 32-bit RGBA screen buffer that gets loaded into a texture that gets
-    // finally rendered into our window or full screen in I_FinishUpdate().
-
-    I_VideoBuffer = screenbuffer->pixels;
-    V_RestoreBuffer();
-
-    // Clear the screen to black.
-
-    memset(I_VideoBuffer, 0, SCREENWIDTH * SCREENHEIGHT * sizeof(*I_VideoBuffer));
-
-    // clear out any events waiting at the start and center the mouse
-  
-    while (SDL_PollEvent(&dummy));
-
-    initialized = true;
-
-    // Call I_ShutdownGraphics on quit
-
-    I_AtExit(I_ShutdownGraphics, true);
+  grabmouse_callback = func;
 }
 
-// Bind all variables controlling video options into the configuration
-// file system.
-void I_BindVideoVariables(void)
+/* Set the variable controlling FPS dots. */
+
+void i_display_fps_dots(boolean dots_on)
 {
-    M_BindIntVariable("use_mouse",                 &usemouse);
-    M_BindIntVariable("fullscreen",                &fullscreen);
-    M_BindIntVariable("video_display",             &video_display);
-    M_BindIntVariable("aspect_ratio_correct",      &aspect_ratio_correct);
-    M_BindIntVariable("integer_scaling",           &integer_scaling);
-    M_BindIntVariable("smooth_pixel_scaling",      &smooth_pixel_scaling);
-    M_BindIntVariable("vga_porch_flash",           &vga_porch_flash);
-    M_BindIntVariable("startup_delay",             &startup_delay);
-    M_BindIntVariable("fullscreen_width",          &fullscreen_width);
-    M_BindIntVariable("fullscreen_height",         &fullscreen_height);
-    M_BindIntVariable("force_software_renderer",   &force_software_renderer);
-    M_BindIntVariable("max_scaling_buffer_pixels", &max_scaling_buffer_pixels);
-    M_BindIntVariable("window_width",              &window_width);
-    M_BindIntVariable("window_height",             &window_height);
-    M_BindIntVariable("grabmouse",                 &grabmouse);
-    M_BindStringVariable("video_driver",           &video_driver);
-    M_BindStringVariable("window_position",        &window_position);
-    M_BindIntVariable("usegamma",                  &usegamma);
-    M_BindIntVariable("png_screenshots",           &png_screenshots);
-}
\ No newline at end of file
+  display_fps_dots = dots_on;
+}
+
+void i_shutdown_graphics(void)
+{
+  if (!g_graphics_state.inited)
+    {
+      return;
+    }
+
+  close(g_graphics_state.fd);
+  munmap(g_graphics_state.fbmem, g_graphics_state.pinfo.fblen);
+  free(g_graphics_state.scrnbuf);
+  g_graphics_state.inited = false;
+}
+
+void i_start_frame(void)
+{
+  /* er? */
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void i_start_tic(void)
+{
+  if (!g_graphics_state.inited)
+    {
+      return;
+    }
+
+  i_get_event();
+
+  if (usemouse && !nomouse && window_focused)
+    {
+      i_read_mouse();
+    }
+
+  if (joywait < i_get_time())
+    {
+      i_update_joystick();
+    }
+}
+
+void i_update_no_blit(void)
+{
+  /* what is this? */
+}
+
+void i_finish_update(void)
+{
+  static int lasttic;
+  int tics;
+  int i;
+
+  if (!g_graphics_state.inited) return;
+
+  if (noblit) return;
+
+  /* draws little dots on the bottom of the screen */
+
+  if (display_fps_dots)
+    {
+      i = i_get_time();
+      tics = i - lasttic;
+      lasttic = i;
+      if (tics > 20) tics = 20;
+
+      for (i = 0; i < tics * 4; i += 4)
+        i_video_buffer[(SCREENHEIGHT - 1) * SCREENWIDTH + i] = 0xff;
+      for (; i < 20 * 4; i += 4)
+        i_video_buffer[(SCREENHEIGHT - 1) * SCREENWIDTH + i] = 0x0;
+    }
+
+  /* Draw disk icon before blit, if necessary. */
+
+  v_draw_disk_icon();
+
+  if (palette_to_set)
+    {
+      palette_to_set = false;
+    }
+
+  blit_screen();
+
+  /* Draw! */
+
+  /* Restore background and undo the disk indicator, if it was drawn. */
+
+  v_restore_disk_background();
+}
+
+void i_read_screen(pixel_t *scr)
+{
+  memcpy(scr, i_video_buffer, SCREENWIDTH * SCREENHEIGHT * sizeof(*scr));
+}
+
+/****************************************************************************
+ * Name: i_set_palette
+ ****************************************************************************/
+
+void i_set_palette(byte *doompalette)
+{
+  for (int i = 0; i < 256; ++i)
+    {
+      /* Zero out the bottom two bits of each channel - the PC VGA
+       * controller only supports 6 bits of accuracy.
+       */
+
+      g_palette[i].a = 0xffu;
+      g_palette[i].r = gammatable[usegamma][*doompalette++] & ~3;
+      g_palette[i].g = gammatable[usegamma][*doompalette++] & ~3;
+      g_palette[i].b = gammatable[usegamma][*doompalette++] & ~3;
+    }
+
+  palette_to_set = true;
+}
+
+/****************************************************************************
+ * Name: i_get_palette_index
+ *
+ * Description:
+ *  Given an RGB value, find the closest matching palette index.
+ *
+ * Return:
+ *   An index into the palette lookup table for the best match.
+ *
+ ****************************************************************************/
+
+int i_get_palette_index(int r, int g, int b)
+{
+  int best = 0;
+  int best_diff = INT_MAX;
+  int diff;
+
+  for (int i = 0; i < 256; ++i)
+    {
+      diff = (r - g_palette[i].r) * (r - g_palette[i].r) +
+             (g - g_palette[i].g) * (g - g_palette[i].g) +
+             (b - g_palette[i].b) * (b - g_palette[i].b);
+
+      if (diff < best_diff)
+        {
+          best = i;
+          best_diff = diff;
+        }
+
+      if (diff == 0)
+        {
+          break;
+        }
+    }
+
+  return best;
+}
+
+/****************************************************************************
+ * Name: i_set_window_title
+ *
+ * Description:
+ *  Set the window title internally.
+ *
+ ****************************************************************************/
+
+void i_set_window_title(const char *title)
+{
+  g_window_title = title;
+}
+
+/****************************************************************************
+ * Name: i_init_window_title
+ *
+ * Description:
+ *   Actually cause the window title to update with whatever window title was
+ *   last set via i_set_window_title.
+ *
+ ****************************************************************************/
+
+void i_init_window_title(void)
+{
+}
+
+/****************************************************************************
+ * Name: i_set_window_title
+ ****************************************************************************/
+
+void i_graphics_check_commandline(void)
+{
+  int i;
+
+  /* @category video
+   * @vanilla
+   *
+   * Disable blitting the screen.
+   */
+
+  noblit = m_check_parm("-noblit");
+
+  /* @category video
+   *
+   * Don't grab the mouse when running in windowed mode.
+   */
+
+  nograbmouse_override = m_parm_exists("-nograbmouse");
+
+  /* default to fullscreen mode, allow override with command line
+   * nofullscreen because we love prboom
+   */
+
+  /* @category video
+   *
+   * Run in a window.
+   */
+
+  if (m_check_parm("-window") || m_check_parm("-nofullscreen"))
+    {
+      fullscreen = false;
+    }
+
+  /* @category video
+   *
+   * Run in fullscreen mode.
+   */
+
+  if (m_check_parm("-fullscreen"))
+    {
+      fullscreen = true;
+    }
+
+  /* @category video
+   *
+   * Disable the mouse.
+   */
+
+  nomouse = m_check_parm("-nomouse") > 0;
+
+  /* @category video
+   * @arg <W>
+   *
+   * Specify the screen width, in pixels.  Implies -window.
+   */
+
+  i = m_check_parm_with_args("-width", 1);
+
+  if (i > 0)
+    {
+      window_width = atoi(myargv[i + 1]);
+      fullscreen = false;
+    }
+
+  /* @category video
+   * @arg <H>
+   *
+   * Specify the screen height, in pixels.  Implies -window.
+   */
+
+  i = m_check_parm_with_args("-height", 1);
+
+  if (i > 0)
+    {
+      window_height = atoi(myargv[i + 1]);
+      fullscreen = false;
+    }
+
+  /* @category video
+   * @arg <WxH>
+   *
+   * Specify the dimensions of the window.  Implies -window.
+   */
+
+  i = m_check_parm_with_args("-geometry", 1);
+
+  if (i > 0)
+    {
+      int w;
+      int h;
+      int s;
+
+      s = sscanf(myargv[i + 1], "%ix%i", &w, &h);
+      if (s == 2)
+        {
+          window_width = w;
+          window_height = h;
+          fullscreen = false;
+        }
+    }
+
+  /* @category video
+   * @arg <x>
+   *
+   * Specify the display number on which to show the screen.
+   */
+
+  i = m_check_parm_with_args("-display", 1);
+
+  if (i > 0)
+    {
+      int display = atoi(myargv[i + 1]);
+      if (display >= 0)
+        {
+          video_display = display;
+        }
+    }
+}
+
+/* Check if we have been invoked as a screensaver by xscreensaver. */
+
+void i_check_is_screensaver(void)
+{
+  char *env;
+
+  env = getenv("XSCREENSAVER_WINDOW");
+
+  if (env != NULL)
+    {
+      screensaver_mode = true;
+    }
+}
+
+/* Check the display bounds of the display referred to by 'video_display' and
+ * set x and y to a location that places the window in the center of that
+ * display.
+ */
+
+static void center_window(int *x, int *y, int w, int h)
+{
+  *x = MAX((g_graphics_state.vinfo.xres - w) / 2, 0);
+  *y = MAX((g_graphics_state.vinfo.yres - h) / 2, 0);
+}
+
+void i_get_window_position(int *x, int *y, int w, int h)
+{
+  /* in fullscreen mode, the window "position" still matters, because
+   * we use it to control which display we run fullscreen on.
+   */
+
+  if (fullscreen)
+    {
+      center_window(x, y, w, h);
+      return;
+    }
+}
+
+void i_init_graphics(void)
+{
+  uint8_t xscale;
+  uint8_t yscale;
+  int err;
+  byte *doompal;
+
+  /* Open frame buffer */
+
+  g_graphics_state.fd = open(CONFIG_GAMES_NXDOOM_FBPATH, O_RDWR);
+  if (g_graphics_state.fd < 0)
+    {
+      i_error("Failed to open frame buffer: %d", errno);
+    }
+
+  /* Get frame buffer characteristics */
+
+  err = ioctl(g_graphics_state.fd, FBIOGET_VIDEOINFO,
+              (unsigned long)(uintptr_t)&g_graphics_state.vinfo);
+  if (err < 0)
+    {
+      close(g_graphics_state.fd);
+      i_error("Failed to get video info: %d", errno);
+    }
+
+  /* Here, we check the dimensions of the frame buffer. If we have enough
+   * space to scale up the rendered image in both width and height, record
+   * that so we can make use of it elsewhere.
+   *
+   * If we don't have enough frame buffer space for the game, quit!
+   */
+
+  if (g_graphics_state.vinfo.xres < SCREENWIDTH)
+    {
+      i_error("Resolution width of %u px < minimum of %u px\n",
+              g_graphics_state.vinfo.xres, SCREENWIDTH);
+    }
+
+  if (g_graphics_state.vinfo.yres < SCREENHEIGHT)
+    {
+      i_error("Resolution height of %u px < minimum of %u px\n",
+              g_graphics_state.vinfo.yres, SCREENHEIGHT);
+    }
+
+  xscale = g_graphics_state.vinfo.xres / SCREENWIDTH;
+  yscale = g_graphics_state.vinfo.yres / SCREENHEIGHT;
+  g_graphics_state.scale = xscale > yscale ? yscale : xscale;
+
+  /* Get frame buffer plane info */
+
+  if (ioctl(g_graphics_state.fd, FBIOGET_PLANEINFO,
+            (unsigned long)((uintptr_t)&g_graphics_state.pinfo)) < 0)
+    {
+      i_error("ioctl(FBIOGET_PLANEINFO) failed: %d\n", errno);
+    }
+
+  /* Initialize frame buffer memory for actual rendering */
+
+  g_graphics_state.fbmem =
+      mmap(NULL, g_graphics_state.pinfo.fblen, PROT_READ | PROT_WRITE,
+           MAP_SHARED | MAP_FILE, g_graphics_state.fd, 0);
+  if (g_graphics_state.fbmem == MAP_FAILED)
+    {
+      i_error("mmap() of frame buffer failed: %d\n", errno);
+    }
+
+  /* Create an 8-bit depth screen buffer for DOOM to render to */
+
+  g_graphics_state.scrnbuf = malloc(SCREENWIDTH * SCREENHEIGHT);
+  if (g_graphics_state.scrnbuf == NULL)
+    {
+      i_error("Couldn't allocate screen buffer: %d\n", errno);
+    }
+
+  /* Create the game window; this may switch graphic modes depending
+   * on configuration.
+   * AdjustWindowSize();
+   */
+
+  set_video_mode();
+
+  /* Start with a clear black screen
+   * (screen will be flipped after we set the palette)
+   */
+
+  memset(g_graphics_state.scrnbuf, 0, SCREENHEIGHT * SCREENWIDTH);
+
+  /* Set the palette */
+
+  doompal = w_cache_lump_name(("PLAYPAL"), PU_CACHE);
+  i_set_palette(doompal);
+
+  update_grab();
+
+  /* On some systems, it takes a second or so for the screen to settle
+   * after changing modes.  We include the option to add a delay when
+   * setting the screen mode, so that the game doesn't start immediately
+   * with the player unable to see anything.
+   */
+
+  if (fullscreen && !screensaver_mode)
+    {
+      usleep(startup_delay * 1000);
+    }
+
+  /* The actual 320x200 canvas that we draw to. This is the pixel buffer of
+   * the 8-bit paletted screen buffer that gets blit on an intermediate
+   * 32-bit RGBA screen buffer that gets loaded into a texture that gets
+   * finally rendered into our window or full screen in i_finish_update().
+   */
+
+  i_video_buffer = g_graphics_state.scrnbuf;
+  v_restore_buffer();
+
+  /* Clear the screen to black. */
+
+  memset(i_video_buffer, 0,
+         SCREENWIDTH * SCREENHEIGHT * sizeof(*i_video_buffer));
+
+  /* clear out any events waiting at the start and center the mouse */
+
+  g_graphics_state.inited = true;
+
+  /* Call i_shutdown_graphics on quit */
+
+  i_at_exit(i_shutdown_graphics, true);
+}
+
+/* Bind all variables controlling video options into the configuration
+ * file system.
+ */
+
+void i_bind_video_variables(void)
+{
+  m_bind_int_variable("use_mouse", &usemouse);
+  m_bind_int_variable("fullscreen", &fullscreen);
+  m_bind_int_variable("video_display", &video_display);
+  m_bind_int_variable("integer_scaling", &integer_scaling);
+  m_bind_int_variable("smooth_pixel_scaling", &smooth_pixel_scaling);
+  m_bind_int_variable("vga_porch_flash", &vga_porch_flash);
+  m_bind_int_variable("startup_delay", &startup_delay);
+  m_bind_int_variable("fullscreen_width", &fullscreen_width);
+  m_bind_int_variable("fullscreen_height", &fullscreen_height);
+  m_bind_int_variable("force_software_renderer", &force_software_renderer);
+  m_bind_int_variable("max_scaling_buffer_pixels",
+                      &max_scaling_buffer_pixels);
+  m_bind_int_variable("window_width", &window_width);
+  m_bind_int_variable("window_height", &window_height);
+  m_bind_int_variable("grabmouse", &grabmouse);
+  m_bind_string_variable("video_driver", &video_driver);
+  m_bind_string_variable("window_position", &window_position);
+  m_bind_int_variable("usegamma", &usegamma);
+  m_bind_int_variable("png_screenshots", &png_screenshots);
+}
diff --git a/games/NXDoom/src/i_video.h b/games/NXDoom/src/i_video.h
index d98b8f507..322160f9b 100644
--- a/games/NXDoom/src/i_video.h
+++ b/games/NXDoom/src/i_video.h
@@ -1,83 +1,57 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/i_video.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __I_VIDEO__
 #define __I_VIDEO__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-// Screen width and height.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define SCREENWIDTH  320
+/* Screen width and height. */
+
+#define SCREENWIDTH 320
 #define SCREENHEIGHT 200
 
-// Screen height used when aspect_ratio_correct=true.
+/* Screen height used when aspect_ratio_correct=true. */
 
 #define SCREENHEIGHT_4_3 240
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef boolean (*grabmouse_callback_t)(void);
 
-// Called by D_DoomMain,
-// determines the hardware configuration
-// and sets up the video mode
-void I_InitGraphics (void);
-
-void I_GraphicsCheckCommandLine(void);
-
-void I_ShutdownGraphics(void);
-
-// Takes full 8 bit values.
-void I_SetPalette (byte* palette);
-int I_GetPaletteIndex(int r, int g, int b);
-
-void I_UpdateNoBlit (void);
-void I_FinishUpdate (void);
-
-void I_ReadScreen (pixel_t* scr);
-
-void I_BeginRead (void);
-
-void I_SetWindowTitle(const char *title);
-
-void I_CheckIsScreensaver(void);
-void I_SetGrabMouseCallback(grabmouse_callback_t func);
-
-void I_DisplayFPSDots(boolean dots_on);
-void I_BindVideoVariables(void);
-
-void I_InitWindowTitle(void);
-void I_RegisterWindowIcon(const unsigned int *icon, int width, int height);
-void I_InitWindowIcon(void);
-
-// Called before processing any tics in a frame (just after displaying a frame).
-// Time consuming syncronous operations are performed here (joystick reading).
-
-void I_StartFrame (void);
-
-// Called before processing each tic in a frame.
-// Quick syncronous operations are performed here.
-
-void I_StartTic (void);
-
-// Enable the loading disk image displayed when reading from disk.
-
-void I_EnableLoadingDisk(int xoffs, int yoffs);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern char *video_driver;
 extern boolean screenvisible;
@@ -85,7 +59,7 @@ extern boolean screenvisible;
 extern int vanilla_keyboard_mapping;
 extern boolean screensaver_mode;
 extern int usegamma;
-extern pixel_t *I_VideoBuffer;
+extern pixel_t *i_video_buffer;
 
 extern int screen_width;
 extern int screen_height;
@@ -99,12 +73,82 @@ extern int force_software_renderer;
 extern int png_screenshots;
 
 extern char *window_position;
-void I_GetWindowPosition(int *x, int *y, int w, int h);
 
-// Joystic/gamepad hysteresis
+/* Joystic/gamepad hysteresis */
+
 extern unsigned int joywait;
 
 extern int usemouse;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
\ No newline at end of file
+/****************************************************************************
+ * Name: i_init_graphics
+ *
+ * Description:
+ *  Called by d_doom_main, determines the hardware configuration and sets up
+ *  the video mode.
+ *
+ ****************************************************************************/
+
+void i_init_graphics(void);
+
+void i_graphics_check_commandline(void);
+
+void i_shutdown_graphics(void);
+
+/****************************************************************************
+ * Name: i_set_palette
+ *
+ * Description:
+ *  Takes full 8 bit values.
+ *
+ ****************************************************************************/
+
+void i_set_palette(byte *palette);
+
+int i_get_palette_index(int r, int g, int b);
+
+void i_update_no_blit(void);
+void i_finish_update(void);
+
+void i_read_screen(pixel_t *scr);
+
+void i_set_window_title(const char *title);
+
+void i_check_is_screensaver(void);
+void i_set_grab_mouse_callback(grabmouse_callback_t func);
+
+void i_display_fps_dots(boolean dots_on);
+void i_bind_video_variables(void);
+
+void i_init_window_title(void);
+
+/****************************************************************************
+ * Name: i_start_frame
+ *
+ * Description:
+ *  Called before processing any tics in a frame (just after displaying a
+ *  frame). Time consuming synchronous operations are performed here
+ *  (joystick reading).
+ *
+ ****************************************************************************/
+
+void i_start_frame(void);
+
+/****************************************************************************
+ * Name: i_start_tic
+ *
+ * Description:
+ *  Called before processing each tic in a frame. Quick synchronous
+ *  operations are performed here.
+ *
+ ****************************************************************************/
+
+void i_start_tic(void);
+
+void i_get_window_position(int *x, int *y, int w, int h);
+
+#endif /* __I_VIDEO__ */
diff --git a/games/NXDoom/src/i_videohr.c b/games/NXDoom/src/i_videohr.c
deleted file mode 100644
index 08e230336..000000000
--- a/games/NXDoom/src/i_videohr.c
+++ /dev/null
@@ -1,257 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     SDL emulation of VGA 640x480x4 planar video mode,
-//     for Hexen startup loading screen.
-//
-
-#include "SDL.h"
-#include "string.h"
-
-#include "doomtype.h"
-#include "i_timer.h"
-#include "i_video.h"
-
-// Palette fade-in takes two seconds
-
-#define FADE_TIME 2000
-
-#define HR_SCREENWIDTH 640
-#define HR_SCREENHEIGHT 480
-
-static SDL_Window *hr_screen = NULL;
-static SDL_Surface *hr_surface = NULL;
-static const char *window_title = "";
-
-boolean I_SetVideoModeHR(void)
-{
-    int x, y;
-
-    if (SDL_Init(SDL_INIT_VIDEO) < 0)
-    {
-        return false;
-    }
-
-    I_GetWindowPosition(&x, &y, HR_SCREENWIDTH, HR_SCREENHEIGHT);
-
-    // Create screen surface at the native desktop pixel depth (bpp=0),
-    // as we cannot trust true 8-bit to reliably work nowadays.
-    hr_screen = SDL_CreateWindow(window_title, x, y,
-        HR_SCREENWIDTH, HR_SCREENHEIGHT,
-        0);
-
-    if (hr_screen == NULL)
-    {
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        return false;
-    }
-
-    // We do all actual drawing into an intermediate surface.
-    hr_surface = SDL_CreateRGBSurface(0, HR_SCREENWIDTH, HR_SCREENHEIGHT,
-                                      8, 0, 0, 0, 0);
-
-    return true;
-}
-
-void I_SetWindowTitleHR(const char *title)
-{
-    window_title = title;
-}
-
-void I_UnsetVideoModeHR(void)
-{
-    if (hr_screen != NULL)
-    {
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        hr_screen = NULL;
-        SDL_FreeSurface(hr_surface);
-        hr_surface = NULL;
-    }
-}
-
-void I_ClearScreenHR(void)
-{
-    SDL_Rect area = { 0, 0, HR_SCREENWIDTH, HR_SCREENHEIGHT };
-
-    SDL_FillRect(hr_surface, &area, 0);
-}
-
-void I_SlamBlockHR(int x, int y, int w, int h, const byte *src)
-{
-    SDL_Rect blit_rect;
-    const byte *srcptrs[4];
-    byte srcbits[4];
-    byte *dest;
-    int x1, y1;
-    int i;
-    int bit;
-
-    // Set up source pointers to read from source buffer - each 4-bit 
-    // pixel has its bits split into four sub-buffers
-
-    for (i=0; i<4; ++i)
-    {
-        srcptrs[i] = src + (i * w * h / 8);
-    }
-
-    if (SDL_LockSurface(hr_surface) < 0)
-    {
-        return;
-    }
-
-    // Draw each pixel
-
-    bit = 0;
-
-    for (y1=y; y1<y+h; ++y1)
-    {
-        dest = ((byte *) hr_surface->pixels) + y1 * hr_surface->pitch + x;
-
-        for (x1=x; x1<x+w; ++x1)
-        {
-            // Get the bits for this pixel
-            // For each bit, find the byte containing it, shift down
-            // and mask out the specific bit wanted.
-
-            for (i=0; i<4; ++i)
-            {
-                srcbits[i] = (srcptrs[i][bit / 8] >> (7 - (bit % 8))) & 0x1;
-            }
-
-            // Reassemble the pixel value
-
-            *dest = (srcbits[0] << 0) 
-                  | (srcbits[1] << 1)
-                  | (srcbits[2] << 2)
-                  | (srcbits[3] << 3);
-
-            // Next pixel!
-
-            ++dest;
-            ++bit;
-        }
-    }
-
-    SDL_UnlockSurface(hr_surface);
-
-    // Update the region we drew.
-    blit_rect.x = x;
-    blit_rect.y = y;
-    blit_rect.w = w;
-    blit_rect.h = h;
-    SDL_BlitSurface(hr_surface, &blit_rect,
-                    SDL_GetWindowSurface(hr_screen), &blit_rect);
-    SDL_UpdateWindowSurfaceRects(hr_screen, &blit_rect, 1);
-}
-
-void I_SlamHR(const byte *buffer)
-{
-    I_SlamBlockHR(0, 0, HR_SCREENWIDTH, HR_SCREENHEIGHT, buffer);
-}
-
-void I_InitPaletteHR(void)
-{
-    // ...
-}
-
-void I_SetPaletteHR(const byte *palette)
-{
-    SDL_Rect screen_rect = {0, 0, HR_SCREENWIDTH, HR_SCREENHEIGHT};
-    SDL_Color sdlpal[16];
-    int i;
-
-    for (i=0; i<16; ++i)
-    {
-        sdlpal[i].r = palette[i * 3 + 0] * 4;
-        sdlpal[i].g = palette[i * 3 + 1] * 4;
-        sdlpal[i].b = palette[i * 3 + 2] * 4;
-    }
-
-    // After setting colors, update the screen.
-    SDL_SetPaletteColors(hr_surface->format->palette, sdlpal, 0, 16);
-    SDL_BlitSurface(hr_surface, &screen_rect,
-                    SDL_GetWindowSurface(hr_screen), &screen_rect);
-    SDL_UpdateWindowSurfaceRects(hr_screen, &screen_rect, 1);
-}
-
-void I_FadeToPaletteHR(const byte *palette)
-{
-    byte tmppal[16 * 3];
-    int starttime;
-    int elapsed;
-    int i;
-
-    starttime = I_GetTimeMS();
-
-    for (;;)
-    {
-        elapsed = I_GetTimeMS() - starttime;
-
-        if (elapsed >= FADE_TIME)
-        {
-            break;
-        }
-
-        // Generate the fake palette
-
-        for (i=0; i<16 * 3; ++i) 
-        {
-            tmppal[i] = (palette[i] * elapsed) / FADE_TIME;
-        }
-
-        I_SetPaletteHR(tmppal);
-        SDL_UpdateWindowSurface(hr_screen);
-
-        // Sleep a bit
-
-        I_Sleep(10);
-    }
-
-    // Set the final palette
-
-    I_SetPaletteHR(palette);
-}
-
-void I_BlackPaletteHR(void)
-{
-    byte blackpal[16 * 3];
-
-    memset(blackpal, 0, sizeof(blackpal));
-
-    I_SetPaletteHR(blackpal);
-}
-
-// Check if the user has hit the escape key to abort startup.
-boolean I_CheckAbortHR(void)
-{
-    SDL_Event ev;
-    boolean result = false;
-
-    // Not initialized?
-    if (hr_surface == NULL)
-    {
-        return false;
-    }
-
-    while (SDL_PollEvent(&ev))
-    {
-        if (ev.type == SDL_KEYDOWN && ev.key.keysym.sym == SDLK_ESCAPE)
-        {
-            result = true;
-        }
-    }
-
-    return result;
-}
-
diff --git a/games/NXDoom/src/i_videohr.h b/games/NXDoom/src/i_videohr.h
deleted file mode 100644
index d0a0dca50..000000000
--- a/games/NXDoom/src/i_videohr.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     SDL emulation of VGA 640x480x4 planar video mode,
-//     for Hexen startup loading screen.
-//
-
-#ifndef I_VIDEOHR_H
-#define I_VIDEOHR_H
-
-boolean I_SetVideoModeHR(void);
-void I_UnsetVideoModeHR(void);
-void I_SetWindowTitleHR(const char *title);
-void I_ClearScreenHR(void);
-void I_SlamBlockHR(int x, int y, int w, int h, const byte *src);
-void I_SlamHR(const byte *buffer);
-void I_InitPaletteHR(void);
-void I_SetPaletteHR(const byte *palette);
-void I_FadeToPaletteHR(const byte *palette);
-void I_BlackPaletteHR(void);
-boolean I_CheckAbortHR(void);
-
-#endif /* #ifndef I_VIDEOHR_H */
-
diff --git a/games/NXDoom/src/i_winmusic.c b/games/NXDoom/src/i_winmusic.c
deleted file mode 100644
index 6871fe224..000000000
--- a/games/NXDoom/src/i_winmusic.c
+++ /dev/null
@@ -1,1920 +0,0 @@
-//
-// Copyright(C) 2021-2022 Roman Fomin
-// Copyright(C) 2022 ceski
-//
-// 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.
-//
-// DESCRIPTION:
-//      Windows native MIDI
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmreg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "doomtype.h"
-#include "i_sound.h"
-#include "i_system.h"
-#include "m_misc.h"
-#include "memio.h"
-#include "mus2mid.h"
-#include "midifile.h"
-#include "midifallback.h"
-
-enum
-{
-    COMP_VANILLA,
-    COMP_STANDARD,
-    COMP_FULL,
-};
-
-enum
-{
-    RESET_TYPE_NONE,
-    RESET_TYPE_GM,
-    RESET_TYPE_GS,
-    RESET_TYPE_XG,
-};
-
-char *winmm_midi_device = NULL;
-int winmm_complevel = COMP_VANILLA;
-int winmm_reset_type = RESET_TYPE_GM;
-int winmm_reset_delay = 0;
-
-static const byte gm_system_on[] = {
-    0xF0, 0x7E, 0x7F, 0x09, 0x01, 0xF7
-};
-
-static const byte gs_reset[] = {
-    0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7
-};
-
-static const byte xg_system_on[] = {
-    0xF0, 0x43, 0x10, 0x4C, 0x00, 0x00, 0x7E, 0x00, 0xF7
-};
-
-static const byte ff_loopStart[] = {'l', 'o', 'o', 'p', 'S', 't', 'a', 'r', 't'};
-static const byte ff_loopEnd[] = {'l', 'o', 'o', 'p', 'E', 'n', 'd'};
-
-static boolean use_fallback;
-
-#define DEFAULT_VOLUME 100
-static byte channel_volume[MIDI_CHANNELS_PER_TRACK];
-static float volume_factor = 0.0f;
-static boolean update_volume = false;
-
-typedef enum
-{
-    STATE_STARTUP,
-    STATE_SHUTDOWN,
-    STATE_EXIT,
-    STATE_STOPPING,
-    STATE_STOPPED,
-    STATE_PLAYING,
-    STATE_PAUSED
-} win_midi_state_t;
-
-static win_midi_state_t win_midi_state;
-
-static DWORD timediv;
-static DWORD tempo;
-
-static UINT MidiDevice;
-static HMIDISTRM hMidiStream;
-static MIDIHDR MidiStreamHdr;
-static HANDLE hBufferReturnEvent;
-static HANDLE hStoppedEvent;
-static HANDLE hPlayerThread;
-static CRITICAL_SECTION CriticalSection;
-
-#define EMIDI_DEVICE (1U << EMIDI_DEVICE_GENERAL_MIDI)
-
-// This is a reduced Windows MIDIEVENT structure for MEVT_F_SHORT
-// type of events.
-
-typedef struct
-{
-    DWORD dwDeltaTime;
-    DWORD dwStreamID; // always 0
-    DWORD dwEvent;
-} native_event_t;
-
-typedef struct
-{
-    midi_track_iter_t *iter;
-    unsigned int elapsed_time;
-    unsigned int saved_elapsed_time;
-    boolean end_of_track;
-    boolean saved_end_of_track;
-    unsigned int emidi_device_flags;
-    boolean emidi_designated;
-    boolean emidi_program;
-    boolean emidi_volume;
-    int emidi_loop_count;
-} win_midi_track_t;
-
-typedef struct
-{
-    win_midi_track_t *tracks;
-    unsigned int elapsed_time;
-    unsigned int saved_elapsed_time;
-    unsigned int num_tracks;
-    boolean registered;
-    boolean looping;
-    boolean ff_loop;
-    boolean ff_restart;
-    boolean rpg_loop;
-} win_midi_song_t;
-
-static win_midi_song_t song;
-
-#define BUFFER_INITIAL_SIZE 8192
-
-#define PLAYER_THREAD_WAIT_TIME 3000
-
-typedef struct
-{
-    byte *data;
-    unsigned int size;
-    unsigned int position;
-    boolean prepared;
-} buffer_t;
-
-static buffer_t buffer;
-
-// Maximum of 4 events in the buffer for faster volume updates.
-
-#define STREAM_MAX_EVENTS   4
-
-#define MAKE_EVT(a, b, c, d)                                                   \
-    ((DWORD)(a) | ((DWORD)(b) << 8) | ((DWORD)(c) << 16) | ((DWORD)(d) << 24))
-
-#define PADDED_SIZE(x) (((x) + sizeof(DWORD) - 1) & ~(sizeof(DWORD) - 1))
-
-// Check for midiStream errors.
-
-static void MidiError(const char *prefix, DWORD dwError)
-{
-    wchar_t werror[MAXERRORLENGTH];
-    MMRESULT mmr;
-
-    mmr = midiOutGetErrorTextW(dwError, (LPWSTR) werror, MAXERRORLENGTH);
-    if (mmr == MMSYSERR_NOERROR)
-    {
-        char *error = M_ConvertWideToUtf8(werror);
-        fprintf(stderr, "%s: %s.\n", prefix, error);
-        free(error);
-    }
-    else
-    {
-        fprintf(stderr, "%s: Unknown midiStream error.\n", prefix);
-    }
-}
-
-// midiStream callback.
-
-static void CALLBACK MidiStreamProc(HMIDIOUT hMidi, UINT uMsg,
-                                    DWORD_PTR dwInstance, DWORD_PTR dwParam1,
-                                    DWORD_PTR dwParam2)
-{
-    if (uMsg == MOM_DONE)
-    {
-        SetEvent(hBufferReturnEvent);
-    }
-}
-
-// Unprepare MIDI header. The calling thread must have exclusive access to the
-// shared resources in this function.
-
-static void UnprepareHeader(void)
-{
-    // Avoid ASan detection. Commentary by Microsoft: "It looks like
-    // midiOutPrepareHeader() allocates with HeapAlloc(), and then
-    // midiOutUnprepareHeader() deallocates with GlobalFree(GlobalHandle
-    // (...)). By design, this kind of allocator mismatch is an issue that ASan
-    // is designed to catch. It is theoretically possible for us to support
-    // this kind of code, but it’s not very high priority since it is undefined
-    // behavior, though it happens to work right now outside of ASan."
-    // https://developercommunity.visualstudio.com/t/1597288
-
-#ifndef __SANITIZE_ADDRESS__
-    MIDIHDR *hdr = &MidiStreamHdr;
-    MMRESULT mmr;
-
-    mmr = midiOutUnprepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR));
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiOutUnprepareHeader", mmr);
-    }
-#endif
-}
-
-// Allocate buffer. The calling thread must have exclusive access to the shared
-// resources in this function.
-
-static void AllocateBuffer(const unsigned int size)
-{
-    buffer.size = PADDED_SIZE(size);
-    buffer.data = I_Realloc(buffer.data, buffer.size);
-}
-
-// Pads the buffer with zeros so that an integral number of DWORDs are stored.
-// Required for long messages (SysEx). Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static void WriteBufferPad(void)
-{
-    unsigned int padding = PADDED_SIZE(buffer.position);
-    memset(buffer.data + buffer.position, 0, padding - buffer.position);
-    buffer.position = padding;
-}
-
-// Writes message data to buffer. Call this function from the MIDI thread only,
-// with exclusive access to shared resources.
-
-static void WriteBuffer(const byte *ptr, unsigned int size)
-{
-    if (buffer.prepared)
-    {
-        UnprepareHeader();
-        buffer.prepared = false;
-    }
-
-    if (buffer.position + size >= buffer.size)
-    {
-        AllocateBuffer(size + buffer.size * 2);
-    }
-
-    memcpy(buffer.data + buffer.position, ptr, size);
-    buffer.position += size;
-}
-
-// Streams out the current buffer. Call this function from the MIDI thread only,
-// with exclusive access to shared resources.
-
-static void StreamOut(void)
-{
-    MIDIHDR *hdr = &MidiStreamHdr;
-    MMRESULT mmr;
-
-    memset(hdr, 0, sizeof(*hdr));
-    hdr->lpData = (LPSTR)buffer.data;
-    hdr->dwBytesRecorded = buffer.position;
-    hdr->dwBufferLength = buffer.size;
-
-    // Reset buffer position even if midiStreamOut fails.
-    buffer.position = 0;
-
-    mmr = midiOutPrepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR));
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiOutPrepareHeader", mmr);
-        return;
-    }
-
-    buffer.prepared = true;
-
-    mmr = midiStreamOut(hMidiStream, hdr, sizeof(MIDIHDR));
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamOut", mmr);
-    }
-}
-
-// Writes a short MIDI message. Call this function from the MIDI thread only,
-// with exclusive access to shared resources.
-
-static void SendShortMsg(unsigned int delta_time, byte status, byte channel,
-                         byte param1, byte param2)
-{
-    native_event_t native_event;
-    native_event.dwDeltaTime = delta_time;
-    native_event.dwStreamID = 0;
-    native_event.dwEvent = MAKE_EVT(status | channel, param1, param2, MEVT_SHORTMSG);
-    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
-}
-
-// Writes a short MIDI message (from an event). Call this function from the MIDI
-// thread only, with exclusive access to shared resources.
-
-static void SendChannelMsg(unsigned int delta_time, const midi_event_t *event,
-                           boolean use_param2)
-{
-    SendShortMsg(delta_time, event->event_type, event->data.channel.channel,
-                 event->data.channel.param1,
-                 use_param2 ? event->data.channel.param2 : 0);
-}
-
-// Writes a long MIDI message (SysEx). Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static void SendLongMsg(unsigned int delta_time, const byte *ptr,
-                        unsigned int length)
-{
-    native_event_t native_event;
-    native_event.dwDeltaTime = delta_time;
-    native_event.dwStreamID = 0;
-    native_event.dwEvent = MAKE_EVT(length, 0, 0, MEVT_LONGMSG);
-    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
-    WriteBuffer(ptr, length);
-    WriteBufferPad();
-}
-
-// Writes an RPN message set to NULL (0x7F). Prevents accidental data entry.
-// Call this function from the MIDI thread only, with exclusive access to shared
-// resources.
-
-static void SendNullRPN(unsigned int delta_time, const midi_event_t *event)
-{
-    const byte channel = event->data.channel.channel;
-    SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER, channel,
-                 MIDI_CONTROLLER_RPN_LSB, MIDI_RPN_NULL);
-    SendShortMsg(0, MIDI_EVENT_CONTROLLER, channel,
-                 MIDI_CONTROLLER_RPN_MSB, MIDI_RPN_NULL);
-}
-
-// Writes a NOP message (ticks). Call this function from the MIDI thread only,
-// with exclusive access to shared resources.
-
-static void SendNOPMsg(unsigned int delta_time)
-{
-    native_event_t native_event;
-    native_event.dwDeltaTime = delta_time;
-    native_event.dwStreamID = 0;
-    native_event.dwEvent = MAKE_EVT(0, 0, 0, MEVT_NOP);
-    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
-}
-
-// Writes a NOP message (milliseconds). Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static void SendDelayMsg(unsigned int time_ms)
-{
-    // Convert ms to ticks (see "Standard MIDI Files 1.0" page 14).
-    const unsigned int ticks = (float) time_ms * 1000 * timediv / tempo + 0.5f;
-    SendNOPMsg(ticks);
-}
-
-// Writes a tempo MIDI meta message. Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static void UpdateTempo(unsigned int delta_time, const midi_event_t *event)
-{
-    native_event_t native_event;
-
-    tempo = MAKE_EVT(event->data.meta.data[2], event->data.meta.data[1],
-                     event->data.meta.data[0], 0);
-
-    native_event.dwDeltaTime = delta_time;
-    native_event.dwStreamID = 0;
-    native_event.dwEvent = MAKE_EVT(tempo, 0, 0, MEVT_TEMPO);
-    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
-}
-
-// Writes a MIDI volume message. The value is scaled by the volume slider. Call
-// this function from the MIDI thread only, with exclusive access to shared
-// resources.
-
-static void SendManualVolumeMsg(unsigned int delta_time, byte channel,
-                                byte volume)
-{
-    unsigned int scaled_volume;
-
-    scaled_volume = volume * volume_factor + 0.5f;
-
-    if (scaled_volume > 127)
-    {
-        scaled_volume = 127;
-    }
-
-    SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER, channel,
-                 MIDI_CONTROLLER_VOLUME_MSB, scaled_volume);
-
-    channel_volume[channel] = volume;
-}
-
-// Writes a MIDI volume message (from an event). The value is scaled by the
-// volume slider. Call this function from the MIDI thread only, with exclusive
-// access to shared resources.
-
-static void SendVolumeMsg(unsigned int delta_time, const midi_event_t *event)
-{
-    SendManualVolumeMsg(delta_time, event->data.channel.channel,
-                        event->data.channel.param2);
-}
-
-// Sets each channel to its saved volume level, scaled by the volume slider.
-// Call this function from the MIDI thread only, with exclusive access to shared
-// resources.
-
-static void UpdateVolume(void)
-{
-    int i;
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        SendManualVolumeMsg(0, i, channel_volume[i]);
-    }
-}
-
-// Sets each channel to the default volume level, scaled by the volume slider.
-// Call this function from the MIDI thread only, with exclusive access to shared
-// resources.
-
-static void ResetVolume(void)
-{
-    int i;
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        SendManualVolumeMsg(0, i, DEFAULT_VOLUME);
-    }
-}
-
-// Writes "notes off" and "sound off" messages for each channel. Some devices
-// may support only one or the other. Held notes (sustained, etc.) are released
-// to prevent hanging notes. Call this function from the MIDI thread only, with
-// exclusive access to shared resources.
-
-static void SendNotesSoundOff(void)
-{
-    int i;
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_ALL_NOTES_OFF, 0);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_ALL_SOUND_OFF, 0);
-    }
-}
-
-// Resets commonly used controllers. This is only for a reset type of "none" for
-// devices that don't support SysEx resets. Call this function from the MIDI
-// thread only, with exclusive access to shared resources.
-
-static void ResetControllers(void)
-{
-    int i;
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        // Reset commonly used controllers.
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RESET_ALL_CTRLS, 0);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_PAN, 64);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_BANK_SELECT_MSB, 0);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_BANK_SELECT_LSB, 0);
-        SendShortMsg(0, MIDI_EVENT_PROGRAM_CHANGE, i, 0, 0);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_REVERB, 40);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_CHORUS, 0);
-    }
-}
-
-// Resets the pitch bend sensitivity for each channel. This must be sent during
-// a reset due to an MS GS Wavetable Synth bug. Call this function from the MIDI
-// thread only, with exclusive access to shared resources.
-
-static void ResetPitchBendSensitivity(void)
-{
-    int i;
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-    {
-        // Set RPN MSB/LSB to pitch bend sensitivity.
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_LSB, 0);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_MSB, 0);
-
-        // Reset pitch bend sensitivity to +/- 2 semitones and 0 cents.
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_DATA_ENTRY_MSB, 2);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_DATA_ENTRY_LSB, 0);
-
-        // Set RPN MSB/LSB to null value after data entry.
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_LSB, 127);
-        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RPN_MSB, 127);
-    }
-}
-
-// Resets the MIDI device. Call this function before each song starts and once
-// at shut down. Call this function from the MIDI thread only, with exclusive
-// access to shared resources.
-
-static void ResetDevice(void)
-{
-    MIDI_ResetFallback();
-    use_fallback = false;
-
-    switch (winmm_reset_type)
-    {
-        case RESET_TYPE_NONE:
-            ResetControllers();
-            break;
-
-        case RESET_TYPE_GS:
-            SendLongMsg(0, gs_reset, sizeof(gs_reset));
-            use_fallback = (winmm_complevel != COMP_VANILLA);
-            break;
-
-        case RESET_TYPE_XG:
-            SendLongMsg(0, xg_system_on, sizeof(xg_system_on));
-            break;
-
-        default:
-            SendLongMsg(0, gm_system_on, sizeof(gm_system_on));
-            break;
-    }
-
-    // MS GS Wavetable Synth doesn't reset pitch bend sensitivity.
-    ResetPitchBendSensitivity();
-
-    // Reset volume (initial playback or on shutdown if no SysEx reset).
-    // Scale by slider on initial playback, max on shutdown.
-    if (win_midi_state == STATE_STARTUP)
-    {
-        ResetVolume();
-    }
-    else if (winmm_reset_type == RESET_TYPE_NONE)
-    {
-        volume_factor = 1.0f;
-        ResetVolume();
-    }
-
-    // Send delay after reset. This is for hardware devices only (e.g. SC-55).
-    if (winmm_reset_delay > 0)
-    {
-        SendDelayMsg(winmm_reset_delay);
-    }
-}
-
-// Normally, volume is controlled by channel volume messages. Roland defined a
-// special SysEx message called "part level" that is equivalent to this. MS GS
-// Wavetable Synth ignores these messages, but other MIDI devices support them.
-// Returns true if there is a match. Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static boolean IsPartLevel(const byte *msg, unsigned int length)
-{
-    if (length == 10 &&
-        msg[0] == 0x41 && // Roland
-        msg[2] == 0x42 && // GS
-        msg[3] == 0x12 && // DT1
-        msg[4] == 0x40 && // Address MSB
-        msg[5] >= 0x10 && // Address
-        msg[5] <= 0x1F && // Address
-        msg[6] == 0x19 && // Address LSB
-        msg[9] == 0xF7)   // SysEx EOX
-    {
-        const byte checksum =
-            128 - ((int) msg[4] + msg[5] + msg[6] + msg[7]) % 128;
-
-        if (msg[8] == checksum)
-        {
-            // GS Part Level (aka Channel Volume)
-            // 41 <dev> 42 12 40 <ch> 19 <vol> <sum> F7
-            return true;
-        }
-    }
-
-    return false;
-}
-
-// Checks if the current SysEx message matches any known SysEx reset message.
-// Returns true if there is a match. Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static boolean IsSysExReset(const byte *msg, unsigned int length)
-{
-    if (length < 5)
-    {
-        return false;
-    }
-
-    switch (msg[0])
-    {
-        case 0x41: // Roland
-            switch (msg[2])
-            {
-                case 0x42: // GS
-                    switch (msg[3])
-                    {
-                        case 0x12: // DT1
-                            if (length == 10 &&
-                                msg[4] == 0x00 &&  // Address MSB
-                                msg[5] == 0x00 &&  // Address
-                                msg[6] == 0x7F &&  // Address LSB
-                              ((msg[7] == 0x00 &&  // Data     (MODE-1)
-                                msg[8] == 0x01) || // Checksum (MODE-1)
-                               (msg[7] == 0x01 &&  // Data     (MODE-2)
-                                msg[8] == 0x00)))  // Checksum (MODE-2)
-                            {
-                                // SC-88 System Mode Set
-                                // 41 <dev> 42 12 00 00 7F 00 01 F7 (MODE-1)
-                                // 41 <dev> 42 12 00 00 7F 01 00 F7 (MODE-2)
-                                return true;
-                            }
-                            else if (length == 10 &&
-                                     msg[4] == 0x40 && // Address MSB
-                                     msg[5] == 0x00 && // Address
-                                     msg[6] == 0x7F && // Address LSB
-                                     msg[7] == 0x00 && // Data (GS Reset)
-                                     msg[8] == 0x41)   // Checksum
-                            {
-                                // GS Reset
-                                // 41 <dev> 42 12 40 00 7F 00 41 F7
-                                return true;
-                            }
-                            break;
-                    }
-                    break;
-            }
-            break;
-
-        case 0x43: // Yamaha
-            switch (msg[2])
-            {
-                case 0x2B: // TG300
-                    if (length == 9 &&
-                        msg[3] == 0x00 && // Start Address b20 - b14
-                        msg[4] == 0x00 && // Start Address b13 - b7
-                        msg[5] == 0x7F && // Start Address b6 - b0
-                        msg[6] == 0x00 && // Data
-                        msg[7] == 0x01)   // Checksum
-                    {
-                        // TG300 All Parameter Reset
-                        // 43 <dev> 2B 00 00 7F 00 01 F7
-                        return true;
-                    }
-                    break;
-
-                case 0x4C: // XG
-                    if (length == 8 &&
-                        msg[3] == 0x00 &&  // Address High
-                        msg[4] == 0x00 &&  // Address Mid
-                       (msg[5] == 0x7E ||  // Address Low (System On)
-                        msg[5] == 0x7F) && // Address Low (All Parameter Reset)
-                        msg[6] == 0x00)    // Data
-                    {
-                        // XG System On, XG All Parameter Reset
-                        // 43 <dev> 4C 00 00 7E 00 F7
-                        // 43 <dev> 4C 00 00 7F 00 F7
-                        return true;
-                    }
-                    break;
-            }
-            break;
-
-        case 0x7E: // Universal Non-Real Time
-            switch (msg[2])
-            {
-                case 0x09: // General Midi
-                    if (length == 5 &&
-                       (msg[3] == 0x01 || // GM System On
-                        msg[3] == 0x02 || // GM System Off
-                        msg[3] == 0x03))  // GM2 System On
-                    {
-                        // GM System On/Off, GM2 System On
-                        // 7E <dev> 09 01 F7
-                        // 7E <dev> 09 02 F7
-                        // 7E <dev> 09 03 F7
-                        return true;
-                    }
-                    break;
-            }
-            break;
-    }
-    return false;
-}
-
-// Writes a MIDI SysEx message. Call this function from the MIDI thread only,
-// with exclusive access to shared resources.
-
-static void SendSysExMsg(unsigned int delta_time, const midi_event_t *event)
-{
-    native_event_t native_event;
-    const byte event_type = MIDI_EVENT_SYSEX;
-    const byte *data = event->data.sysex.data;
-    const unsigned int length = event->data.sysex.length;
-
-    if (IsPartLevel(data, length))
-    {
-        byte channel;
-
-        // Convert "block number" to a channel number.
-        if (data[5] == 0x10) // Channel 10
-        {
-            channel = 9;
-        }
-        else if (data[5] < 0x1A) // Channels 1-9
-        {
-            channel = (data[5] & 0x0F) - 1;
-        }
-        else // Channels 11-16
-        {
-            channel = data[5] & 0x0F;
-        }
-
-        // Replace SysEx part level message with channel volume message.
-        SendManualVolumeMsg(delta_time, channel, data[7]);
-        return;
-    }
-
-    // Send the SysEx message.
-    native_event.dwDeltaTime = delta_time;
-    native_event.dwStreamID = 0;
-    native_event.dwEvent = MAKE_EVT(length + sizeof(byte), 0, 0, MEVT_LONGMSG);
-    WriteBuffer((byte *)&native_event, sizeof(native_event_t));
-    WriteBuffer(&event_type, sizeof(byte));
-    WriteBuffer(data, length);
-    WriteBufferPad();
-
-    if (IsSysExReset(data, length))
-    {
-        // SysEx reset also resets volume. Take the default channel volumes
-        // and scale them by the user's volume slider.
-        ResetVolume();
-
-        // Disable instrument fallback and give priority to MIDI file. Fallback
-        // assumes GS (SC-55 level) and the MIDI file could be GM, GM2, XG, or
-        // GS (SC-88 or higher). Preserve the composer's intent.
-        if (use_fallback)
-        {
-            MIDI_ResetFallback();
-            use_fallback = false;
-        }
-    }
-}
-
-// Writes a MIDI program change message. If applicable, emulates capital tone
-// fallback to fix invalid instruments. Call this function from the MIDI thread
-// only, with exclusive access to shared resources.
-
-static void SendProgramMsg(unsigned int delta_time, byte channel, byte program,
-                           const midi_fallback_t *fallback)
-{
-    switch ((int)fallback->type)
-    {
-        case FALLBACK_BANK_MSB:
-            SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER, channel,
-                         MIDI_CONTROLLER_BANK_SELECT_MSB, fallback->value);
-            SendShortMsg(0, MIDI_EVENT_PROGRAM_CHANGE, channel, program, 0);
-            break;
-
-        case FALLBACK_DRUMS:
-            SendShortMsg(delta_time, MIDI_EVENT_PROGRAM_CHANGE, channel,
-                         fallback->value, 0);
-            break;
-
-        default:
-            SendShortMsg(delta_time, MIDI_EVENT_PROGRAM_CHANGE, channel,
-                         program, 0);
-            break;
-    }
-}
-
-// Sets a Final Fantasy or RPG Maker loop point. Call this function from the
-// MIDI thread only, with exclusive access to shared resources.
-
-static void SetLoopPoint(void)
-{
-    unsigned int i;
-
-    for (i = 0; i < song.num_tracks; ++i)
-    {
-        MIDI_SetLoopPoint(song.tracks[i].iter);
-        song.tracks[i].saved_end_of_track = song.tracks[i].end_of_track;
-        song.tracks[i].saved_elapsed_time = song.tracks[i].elapsed_time;
-    }
-    song.saved_elapsed_time = song.elapsed_time;
-}
-
-// Checks if the MIDI meta message contains a Final Fantasy loop marker. Call
-// this function from the MIDI thread only, with exclusive access to shared
-// resources.
-
-static void CheckFFLoop(const midi_event_t *event)
-{
-    if (event->data.meta.length == sizeof(ff_loopStart) &&
-        !memcmp(event->data.meta.data, ff_loopStart, sizeof(ff_loopStart)))
-    {
-        SetLoopPoint();
-        song.ff_loop = true;
-    }
-    else if (song.ff_loop && event->data.meta.length == sizeof(ff_loopEnd) &&
-             !memcmp(event->data.meta.data, ff_loopEnd, sizeof(ff_loopEnd)))
-    {
-        song.ff_restart = true;
-    }
-}
-
-// Writes an EMIDI message. Call this function from the MIDI thread only, with
-// exclusive access to shared resources.
-
-static void SendEMIDI(unsigned int delta_time, const midi_event_t *event,
-                      win_midi_track_t *track, const midi_fallback_t *fallback)
-{
-    unsigned int i;
-    unsigned int flag;
-    int count;
-
-    switch (event->data.channel.param1)
-    {
-        case EMIDI_CONTROLLER_TRACK_DESIGNATION:
-            if (track->elapsed_time < timediv)
-            {
-                flag = event->data.channel.param2;
-
-                if (flag == EMIDI_DEVICE_ALL)
-                {
-                    track->emidi_device_flags = UINT_MAX;
-                    track->emidi_designated = true;
-                }
-                else if (flag <= EMIDI_DEVICE_ULTRASOUND)
-                {
-                    track->emidi_device_flags |= 1U << flag;
-                    track->emidi_designated = true;
-                }
-            }
-            SendNOPMsg(delta_time);
-            break;
-
-        case EMIDI_CONTROLLER_TRACK_EXCLUSION:
-            if (song.rpg_loop)
-            {
-                SetLoopPoint();
-            }
-            else if (track->elapsed_time < timediv)
-            {
-                flag = event->data.channel.param2;
-
-                if (!track->emidi_designated)
-                {
-                    track->emidi_device_flags = UINT_MAX;
-                    track->emidi_designated = true;
-                }
-
-                if (flag <= EMIDI_DEVICE_ULTRASOUND)
-                {
-                    track->emidi_device_flags &= ~(1U << flag);
-                }
-            }
-            SendNOPMsg(delta_time);
-            break;
-
-        case EMIDI_CONTROLLER_PROGRAM_CHANGE:
-            if (track->emidi_program || track->elapsed_time < timediv)
-            {
-                track->emidi_program = true;
-                SendProgramMsg(delta_time, event->data.channel.channel,
-                               event->data.channel.param2, fallback);
-            }
-            else
-            {
-                SendNOPMsg(delta_time);
-            }
-            break;
-
-        case EMIDI_CONTROLLER_VOLUME:
-            if (track->emidi_volume || track->elapsed_time < timediv)
-            {
-                track->emidi_volume = true;
-                SendVolumeMsg(delta_time, event);
-            }
-            else
-            {
-                SendNOPMsg(delta_time);
-            }
-            break;
-
-        case EMIDI_CONTROLLER_LOOP_BEGIN:
-            count = event->data.channel.param2;
-            count = (count == 0) ? (-1) : count;
-            track->emidi_loop_count = count;
-            MIDI_SetLoopPoint(track->iter);
-            SendNOPMsg(delta_time);
-            break;
-
-        case EMIDI_CONTROLLER_LOOP_END:
-            if (event->data.channel.param2 == EMIDI_LOOP_FLAG)
-            {
-                if (track->emidi_loop_count != 0)
-                {
-                    MIDI_RestartAtLoopPoint(track->iter);
-                }
-
-                if (track->emidi_loop_count > 0)
-                {
-                    track->emidi_loop_count--;
-                }
-            }
-            SendNOPMsg(delta_time);
-            break;
-
-        case EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN:
-            count = event->data.channel.param2;
-            count = (count == 0) ? (-1) : count;
-            for (i = 0; i < song.num_tracks; ++i)
-            {
-                song.tracks[i].emidi_loop_count = count;
-                MIDI_SetLoopPoint(song.tracks[i].iter);
-                song.tracks[i].saved_end_of_track = song.tracks[i].end_of_track;
-                song.tracks[i].saved_elapsed_time = song.tracks[i].elapsed_time;
-            }
-            song.saved_elapsed_time = song.elapsed_time;
-            SendNOPMsg(delta_time);
-            break;
-
-        case EMIDI_CONTROLLER_GLOBAL_LOOP_END:
-            if (event->data.channel.param2 == EMIDI_LOOP_FLAG)
-            {
-                for (i = 0; i < song.num_tracks; ++i)
-                {
-                    if (song.tracks[i].emidi_loop_count != 0)
-                    {
-                        MIDI_RestartAtLoopPoint(song.tracks[i].iter);
-                        song.tracks[i].end_of_track =
-                            song.tracks[i].saved_end_of_track;
-                        song.tracks[i].elapsed_time =
-                            song.tracks[i].saved_elapsed_time;
-                        song.elapsed_time = song.saved_elapsed_time;
-                    }
-
-                    if (song.tracks[i].emidi_loop_count > 0)
-                    {
-                        song.tracks[i].emidi_loop_count--;
-                    }
-                }
-            }
-            SendNOPMsg(delta_time);
-            break;
-    }
-}
-
-// Writes a MIDI meta message. Call this function from the MIDI thread only,
-// with exclusive access to shared resources.
-
-static void SendMetaMsg(unsigned int delta_time, const midi_event_t *event,
-                        win_midi_track_t *track)
-{
-    switch (event->data.meta.type)
-    {
-        case MIDI_META_END_OF_TRACK:
-            track->end_of_track = true;
-            SendNOPMsg(delta_time);
-            break;
-
-        case MIDI_META_SET_TEMPO:
-            UpdateTempo(delta_time, event);
-            break;
-
-        case MIDI_META_MARKER:
-            if (winmm_complevel != COMP_VANILLA)
-            {
-                CheckFFLoop(event);
-            }
-            SendNOPMsg(delta_time);
-            break;
-
-        default:
-            SendNOPMsg(delta_time);
-            break;
-    }
-}
-
-// AddToBuffer function for vanilla (DMX MPU-401) compatibility level. Do not
-// call this function directly. See the AddToBuffer function pointer.
-
-static boolean AddToBuffer_Vanilla(unsigned int delta_time,
-                                   const midi_event_t *event,
-                                   win_midi_track_t *track)
-{
-    switch ((int) event->event_type)
-    {
-        case MIDI_EVENT_SYSEX:
-            SendNOPMsg(delta_time);
-            return false;
-
-        case MIDI_EVENT_META:
-            SendMetaMsg(delta_time, event, track);
-            break;
-
-        case MIDI_EVENT_CONTROLLER:
-            switch (event->data.channel.param1)
-            {
-                case MIDI_CONTROLLER_BANK_SELECT_MSB:
-                case MIDI_CONTROLLER_BANK_SELECT_LSB:
-                    // DMX has broken bank select support and runs in GM mode.
-                    SendChannelMsg(delta_time, event, false);
-                    break;
-
-                case MIDI_CONTROLLER_MODULATION:
-                case MIDI_CONTROLLER_PAN:
-                case MIDI_CONTROLLER_EXPRESSION:
-                case MIDI_CONTROLLER_HOLD1_PEDAL:
-                case MIDI_CONTROLLER_SOFT_PEDAL:
-                case MIDI_CONTROLLER_REVERB:
-                case MIDI_CONTROLLER_CHORUS:
-                case MIDI_CONTROLLER_ALL_SOUND_OFF:
-                case MIDI_CONTROLLER_ALL_NOTES_OFF:
-                    SendChannelMsg(delta_time, event, true);
-                    break;
-
-                case MIDI_CONTROLLER_VOLUME_MSB:
-                    SendVolumeMsg(delta_time, event);
-                    break;
-
-                case MIDI_CONTROLLER_RESET_ALL_CTRLS:
-                    // MS GS Wavetable Synth resets volume if param2 isn't zero.
-                    SendChannelMsg(delta_time, event, false);
-                    break;
-
-                default:
-                    SendNOPMsg(delta_time);
-                    break;
-            }
-            break;
-
-        case MIDI_EVENT_NOTE_OFF:
-        case MIDI_EVENT_NOTE_ON:
-        case MIDI_EVENT_PITCH_BEND:
-            SendChannelMsg(delta_time, event, true);
-            break;
-
-        case MIDI_EVENT_PROGRAM_CHANGE:
-            SendChannelMsg(delta_time, event, false);
-            break;
-
-        default:
-            SendNOPMsg(delta_time);
-            break;
-    }
-
-    return true;
-}
-
-// AddToBuffer function for standard and full MIDI compatibility levels. Do not
-// call this function directly. See the AddToBuffer function pointer.
-
-static boolean AddToBuffer_Standard(unsigned int delta_time,
-                                    const midi_event_t *event,
-                                    win_midi_track_t *track)
-{
-    midi_fallback_t fallback = {FALLBACK_NONE, 0};
-
-    if (use_fallback)
-    {
-        MIDI_CheckFallback(event, &fallback, winmm_complevel == COMP_FULL);
-    }
-
-    switch ((int) event->event_type)
-    {
-        case MIDI_EVENT_SYSEX:
-            if (winmm_complevel == COMP_FULL)
-            {
-                SendSysExMsg(delta_time, event);
-            }
-            else
-            {
-                SendNOPMsg(delta_time);
-            }
-            return false;
-
-        case MIDI_EVENT_META:
-            SendMetaMsg(delta_time, event, track);
-            return true;
-    }
-
-    if (track->emidi_designated && (EMIDI_DEVICE & ~track->emidi_device_flags))
-    {
-        // Send NOP if this device has been excluded from this track.
-        SendNOPMsg(delta_time);
-        return true;
-    }
-
-    switch ((int) event->event_type)
-    {
-        case MIDI_EVENT_CONTROLLER:
-            switch (event->data.channel.param1)
-            {
-                case MIDI_CONTROLLER_BANK_SELECT_MSB:
-                case MIDI_CONTROLLER_MODULATION:
-                case MIDI_CONTROLLER_DATA_ENTRY_MSB:
-                case MIDI_CONTROLLER_PAN:
-                case MIDI_CONTROLLER_EXPRESSION:
-                case MIDI_CONTROLLER_DATA_ENTRY_LSB:
-                case MIDI_CONTROLLER_HOLD1_PEDAL:
-                case MIDI_CONTROLLER_SOFT_PEDAL:
-                case MIDI_CONTROLLER_REVERB:
-                case MIDI_CONTROLLER_CHORUS:
-                case MIDI_CONTROLLER_ALL_SOUND_OFF:
-                case MIDI_CONTROLLER_ALL_NOTES_OFF:
-                case MIDI_CONTROLLER_POLY_MODE_OFF:
-                case MIDI_CONTROLLER_POLY_MODE_ON:
-                    SendChannelMsg(delta_time, event, true);
-                    break;
-
-                case MIDI_CONTROLLER_VOLUME_MSB:
-                    if (track->emidi_volume)
-                    {
-                        SendNOPMsg(delta_time);
-                    }
-                    else
-                    {
-                        SendVolumeMsg(delta_time, event);
-                    }
-                    break;
-
-                case MIDI_CONTROLLER_VOLUME_LSB:
-                    SendNOPMsg(delta_time);
-                    break;
-
-                case MIDI_CONTROLLER_BANK_SELECT_LSB:
-                    SendChannelMsg(delta_time, event,
-                                   fallback.type != FALLBACK_BANK_LSB);
-                    break;
-
-                case MIDI_CONTROLLER_NRPN_LSB:
-                case MIDI_CONTROLLER_NRPN_MSB:
-                    if (winmm_complevel == COMP_FULL)
-                    {
-                        SendChannelMsg(delta_time, event, true);
-                    }
-                    else
-                    {
-                        // MS GS Wavetable Synth nulls RPN for any NRPN.
-                        SendNullRPN(delta_time, event);
-                    }
-                    break;
-
-                case MIDI_CONTROLLER_RPN_LSB:
-                    switch (event->data.channel.param2)
-                    {
-                        case MIDI_RPN_PITCH_BEND_SENS_LSB:
-                        case MIDI_RPN_FINE_TUNING_LSB:
-                        case MIDI_RPN_COARSE_TUNING_LSB:
-                        case MIDI_RPN_NULL:
-                            SendChannelMsg(delta_time, event, true);
-                            break;
-
-                        default:
-                            if (winmm_complevel == COMP_FULL)
-                            {
-                                SendChannelMsg(delta_time, event, true);
-                            }
-                            else
-                            {
-                                // MS GS Wavetable Synth ignores other RPNs.
-                                SendNullRPN(delta_time, event);
-                            }
-                            break;
-                    }
-                    break;
-
-                case MIDI_CONTROLLER_RPN_MSB:
-                    switch (event->data.channel.param2)
-                    {
-                        case MIDI_RPN_MSB:
-                        case MIDI_RPN_NULL:
-                            SendChannelMsg(delta_time, event, true);
-                            break;
-
-                        default:
-                            if (winmm_complevel == COMP_FULL)
-                            {
-                                SendChannelMsg(delta_time, event, true);
-                            }
-                            else
-                            {
-                                // MS GS Wavetable Synth ignores other RPNs.
-                                SendNullRPN(delta_time, event);
-                            }
-                            break;
-                    }
-                    break;
-
-                case EMIDI_CONTROLLER_TRACK_DESIGNATION:
-                case EMIDI_CONTROLLER_TRACK_EXCLUSION:
-                case EMIDI_CONTROLLER_PROGRAM_CHANGE:
-                case EMIDI_CONTROLLER_VOLUME:
-                case EMIDI_CONTROLLER_LOOP_BEGIN:
-                case EMIDI_CONTROLLER_LOOP_END:
-                case EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN:
-                case EMIDI_CONTROLLER_GLOBAL_LOOP_END:
-                    SendEMIDI(delta_time, event, track, &fallback);
-                    break;
-
-                case MIDI_CONTROLLER_RESET_ALL_CTRLS:
-                    // MS GS Wavetable Synth resets volume if param2 isn't zero.
-                    SendChannelMsg(delta_time, event, false);
-                    break;
-
-                default:
-                    if (winmm_complevel == COMP_FULL)
-                    {
-                        SendChannelMsg(delta_time, event, true);
-                    }
-                    else
-                    {
-                        SendNOPMsg(delta_time);
-                    }
-                    break;
-            }
-            break;
-
-        case MIDI_EVENT_NOTE_OFF:
-        case MIDI_EVENT_NOTE_ON:
-        case MIDI_EVENT_PITCH_BEND:
-            SendChannelMsg(delta_time, event, true);
-            break;
-
-        case MIDI_EVENT_PROGRAM_CHANGE:
-            if (track->emidi_program)
-            {
-                SendNOPMsg(delta_time);
-            }
-            else
-            {
-                SendProgramMsg(delta_time, event->data.channel.channel,
-                               event->data.channel.param1, &fallback);
-            }
-            break;
-
-        case MIDI_EVENT_AFTERTOUCH:
-            if (winmm_complevel == COMP_FULL)
-            {
-                SendChannelMsg(delta_time, event, true);
-            }
-            else
-            {
-                SendNOPMsg(delta_time);
-            }
-            break;
-
-        case MIDI_EVENT_CHAN_AFTERTOUCH:
-            if (winmm_complevel == COMP_FULL)
-            {
-                SendChannelMsg(delta_time, event, false);
-            }
-            else
-            {
-                SendNOPMsg(delta_time);
-            }
-            break;
-
-        default:
-            SendNOPMsg(delta_time);
-            break;
-    }
-
-    return true;
-}
-
-// Function pointer determined by the desired MIDI compatibility level. Set
-// during initialization by the main thread, then called from the MIDI thread
-// only. The calling thread must have exclusive access to the shared resources
-// in this function.
-
-static boolean (*AddToBuffer)(unsigned int delta_time,
-                              const midi_event_t *event,
-                              win_midi_track_t *track) = AddToBuffer_Vanilla;
-
-// Restarts a song that uses a Final Fantasy or RPG Maker loop point. Call this
-// function from the MIDI thread only, with exclusive access to shared
-// resources.
-
-static void RestartLoop(void)
-{
-    unsigned int i;
-
-    for (i = 0; i < song.num_tracks; ++i)
-    {
-        MIDI_RestartAtLoopPoint(song.tracks[i].iter);
-        song.tracks[i].end_of_track = song.tracks[i].saved_end_of_track;
-        song.tracks[i].elapsed_time = song.tracks[i].saved_elapsed_time;
-    }
-    song.elapsed_time = song.saved_elapsed_time;
-}
-
-// Restarts a song that uses standard looping. Call this function from the MIDI
-// thread only, with exclusive access to shared resources.
-
-static void RestartTracks(void)
-{
-    unsigned int i;
-
-    for (i = 0; i < song.num_tracks; ++i)
-    {
-        MIDI_RestartIterator(song.tracks[i].iter);
-        song.tracks[i].elapsed_time = 0;
-        song.tracks[i].end_of_track = false;
-        song.tracks[i].emidi_device_flags = 0;
-        song.tracks[i].emidi_designated = false;
-        song.tracks[i].emidi_program = false;
-        song.tracks[i].emidi_volume = false;
-        song.tracks[i].emidi_loop_count = 0;
-    }
-    song.elapsed_time = 0;
-}
-
-// The controllers "EMIDI track exclusion" and "RPG Maker loop point" share the
-// same number (CC#111) and are not compatible with each other. As a workaround,
-// allow an RPG Maker loop point only if no other EMIDI events are present. Call
-// this function from the MIDI thread only, before the song starts, with
-// exclusive access to shared resources.
-
-static boolean IsRPGLoop(void)
-{
-    unsigned int i;
-    unsigned int num_rpg_events = 0;
-    unsigned int num_emidi_events = 0;
-    midi_event_t *event = NULL;
-
-    for (i = 0; i < song.num_tracks; ++i)
-    {
-        while (MIDI_GetNextEvent(song.tracks[i].iter, &event))
-        {
-            if (event->event_type == MIDI_EVENT_CONTROLLER)
-            {
-                switch (event->data.channel.param1)
-                {
-                    case EMIDI_CONTROLLER_TRACK_EXCLUSION:
-                        num_rpg_events++;
-                        break;
-
-                    case EMIDI_CONTROLLER_TRACK_DESIGNATION:
-                    case EMIDI_CONTROLLER_PROGRAM_CHANGE:
-                    case EMIDI_CONTROLLER_VOLUME:
-                    case EMIDI_CONTROLLER_LOOP_BEGIN:
-                    case EMIDI_CONTROLLER_LOOP_END:
-                    case EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN:
-                    case EMIDI_CONTROLLER_GLOBAL_LOOP_END:
-                        num_emidi_events++;
-                        break;
-                }
-            }
-        }
-
-        MIDI_RestartIterator(song.tracks[i].iter);
-    }
-
-    return (num_rpg_events == 1 && num_emidi_events == 0);
-}
-
-// Fills the output buffer with events from the current song and then streams it
-// out. Call this function from the MIDI thread only, with exclusive access to
-// shared resources.
-
-static void FillBuffer(void)
-{
-    unsigned int i;
-    int num_events;
-
-    for (num_events = 0; num_events < STREAM_MAX_EVENTS; )
-    {
-        midi_event_t *event = NULL;
-        win_midi_track_t *track = NULL;
-        unsigned int min_time = UINT_MAX;
-        unsigned int delta_time;
-
-        // Find next event across all tracks.
-        for (i = 0; i < song.num_tracks; ++i)
-        {
-            if (!song.tracks[i].end_of_track)
-            {
-                unsigned int time = song.tracks[i].elapsed_time +
-                                    MIDI_GetDeltaTime(song.tracks[i].iter);
-                if (time < min_time)
-                {
-                    min_time = time;
-                    track = &song.tracks[i];
-                }
-            }
-        }
-
-        // No more events. Restart or stop song.
-        if (track == NULL)
-        {
-            if (song.elapsed_time)
-            {
-                if (song.ff_restart || song.rpg_loop)
-                {
-                    song.ff_restart = false;
-                    RestartLoop();
-                    continue;
-                }
-                else if (song.looping)
-                {
-                    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
-                    {
-                        SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RESET_ALL_CTRLS, 0);
-                    }
-                    RestartTracks();
-                    continue;
-                }
-            }
-            break;
-        }
-
-        track->elapsed_time = min_time;
-        delta_time = min_time - song.elapsed_time;
-        song.elapsed_time = min_time;
-
-        if (!MIDI_GetNextEvent(track->iter, &event))
-        {
-            track->end_of_track = true;
-            continue;
-        }
-
-        // Restart FF loop after sending all events that share same timediv.
-        if (song.ff_restart && MIDI_GetDeltaTime(track->iter) > 0)
-        {
-            song.ff_restart = false;
-            RestartLoop();
-            continue;
-        }
-
-        if (!AddToBuffer(delta_time, event, track))
-        {
-            StreamOut();
-            return;
-        }
-
-        num_events++;
-    }
-
-    if (num_events)
-    {
-        StreamOut();
-    }
-}
-
-// The Windows API documentation states: "Applications should not call any
-// multimedia functions from inside the callback function, as doing so can
-// cause a deadlock." We use a thread to avoid possible deadlocks.
-
-static DWORD WINAPI PlayerProc(void)
-{
-    boolean keep_going = true;
-
-    while (keep_going)
-    {
-        if (WaitForSingleObject(hBufferReturnEvent, INFINITE) != WAIT_OBJECT_0)
-        {
-            continue;
-        }
-
-        // The MIDI thread must have exclusive access to shared resources until
-        // the end of the current loop iteration or when the thread exits.
-        EnterCriticalSection(&CriticalSection);
-
-        switch (win_midi_state)
-        {
-            case STATE_STARTUP:
-                ResetDevice();
-                StreamOut();
-                song.rpg_loop = IsRPGLoop();
-                win_midi_state = STATE_PLAYING;
-                break;
-
-            case STATE_SHUTDOWN:
-                // Send notes/sound off prior to reset to prevent volume spikes.
-                SendNotesSoundOff();
-                ResetDevice();
-                StreamOut();
-                win_midi_state = STATE_EXIT;
-                break;
-
-            case STATE_EXIT:
-                keep_going = false;
-                break;
-
-            case STATE_PLAYING:
-                if (update_volume)
-                {
-                    UpdateVolume();
-                    StreamOut();
-                    update_volume = false;
-                    break;
-                }
-                FillBuffer();
-                break;
-
-            case STATE_STOPPING:
-                // Send notes/sound off to prevent hanging notes.
-                SendNotesSoundOff();
-                StreamOut();
-                win_midi_state = STATE_STOPPED;
-                break;
-
-            case STATE_STOPPED:
-                SetEvent(hStoppedEvent);
-                break;
-
-            case STATE_PAUSED:
-                break;
-        }
-
-        LeaveCriticalSection(&CriticalSection);
-    }
-
-    return 0;
-}
-
-// Restarts the MIDI stream. Call this function from the main thread only, with
-// exclusive access to shared resources.
-
-static void StreamStart(void)
-{
-    MMRESULT mmr;
-
-    SetEvent(hBufferReturnEvent);
-
-    mmr = midiStreamRestart(hMidiStream);
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamRestart", mmr);
-    }
-}
-
-// Turns off notes but does not release all held ones (use SendNotesSoundOff()
-// to prevent hanging notes). The output buffer is returned to the callback
-// function and flagged as MHDR_DONE. Call this function from the main thread
-// only, with exclusive access to shared resources.
-
-static void StreamStop(void)
-{
-    MMRESULT mmr;
-
-    mmr = midiStreamStop(hMidiStream);
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamStop", mmr);
-    }
-
-    ResetEvent(hBufferReturnEvent);
-    ResetEvent(hStoppedEvent);
-}
-
-static boolean I_WIN_InitMusic(void)
-{
-    const int all_devices = midiOutGetNumDevs();
-    int i;
-    MMRESULT mmr;
-
-    if (winmm_midi_device == NULL)
-    {
-        winmm_midi_device = M_StringDuplicate("");
-    }
-
-    for (i = 0; i < all_devices; i++)
-    {
-        MIDIOUTCAPS caps;
-
-        if (midiOutGetDevCaps(i, &caps, sizeof(caps)) == MMSYSERR_NOERROR &&
-            !strncasecmp(winmm_midi_device, caps.szPname, MAXPNAMELEN))
-        {
-            MidiDevice = i;
-            break;
-        }
-    }
-
-    if (i == all_devices)
-    {
-        free(winmm_midi_device);
-        winmm_midi_device = M_StringDuplicate("Microsoft MIDI Mapper");
-        MidiDevice = MIDI_MAPPER;
-    }
-
-    mmr = midiStreamOpen(&hMidiStream, &MidiDevice, (DWORD)1,
-                         (DWORD_PTR)MidiStreamProc, (DWORD_PTR)NULL,
-                         CALLBACK_FUNCTION);
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamOpen", mmr);
-        hMidiStream = NULL;
-        return false;
-    }
-
-    AllocateBuffer(BUFFER_INITIAL_SIZE);
-
-    hBufferReturnEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-    hStoppedEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-    hPlayerThread =
-        CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) PlayerProc, 0, 0, 0);
-    SetThreadPriority(hPlayerThread, THREAD_PRIORITY_TIME_CRITICAL);
-    InitializeCriticalSectionAndSpinCount(&CriticalSection, 1024);
-
-    AddToBuffer = (winmm_complevel == COMP_VANILLA) ? AddToBuffer_Vanilla
-                                                    : AddToBuffer_Standard;
-    MIDI_InitFallback();
-
-    return true;
-}
-
-static void I_WIN_SetMusicVolume(int volume)
-{
-    static int last_volume = -1;
-
-    if (last_volume == volume)
-    {
-        // Ignore holding key down in volume menu.
-        return;
-    }
-    last_volume = volume;
-
-    EnterCriticalSection(&CriticalSection);
-    volume_factor = sqrtf((float)volume / 120);
-    update_volume = song.registered;
-    LeaveCriticalSection(&CriticalSection);
-}
-
-static void I_WIN_StopSong(void)
-{
-    if (!hMidiStream)
-    {
-        return;
-    }
-
-    EnterCriticalSection(&CriticalSection);
-    StreamStop();
-    win_midi_state = STATE_STOPPING;
-    StreamStart();
-    LeaveCriticalSection(&CriticalSection);
-
-    WaitForSingleObject(hStoppedEvent, PLAYER_THREAD_WAIT_TIME);
-    StreamStop();
-}
-
-static void I_WIN_PlaySong(void *handle, boolean looping)
-{
-    if (!hMidiStream)
-    {
-        return;
-    }
-
-    EnterCriticalSection(&CriticalSection);
-    song.looping = looping;
-    win_midi_state = STATE_STARTUP;
-    StreamStart();
-    LeaveCriticalSection(&CriticalSection);
-}
-
-static void I_WIN_PauseSong(void)
-{
-    if (!hMidiStream)
-    {
-        return;
-    }
-
-    I_WIN_StopSong();
-
-    EnterCriticalSection(&CriticalSection);
-    win_midi_state = STATE_PAUSED;
-    LeaveCriticalSection(&CriticalSection);
-}
-
-static void I_WIN_ResumeSong(void)
-{
-    if (!hMidiStream)
-    {
-        return;
-    }
-
-    EnterCriticalSection(&CriticalSection);
-    if (win_midi_state == STATE_PAUSED)
-    {
-        win_midi_state = STATE_PLAYING;
-        StreamStart();
-    }
-    LeaveCriticalSection(&CriticalSection);
-}
-
-// Determine whether memory block is a .mid file 
-
-static boolean IsMid(byte *mem, int len)
-{
-    return len > 4 && !memcmp(mem, "MThd", 4);
-}
-
-static boolean ConvertMus(byte *musdata, int len, const char *filename)
-{
-    MEMFILE *instream;
-    MEMFILE *outstream;
-    void *outbuf;
-    size_t outbuf_len;
-    int result;
-
-    instream = mem_fopen_read(musdata, len);
-    outstream = mem_fopen_write();
-
-    result = mus2mid(instream, outstream);
-
-    if (result == 0)
-    {
-        mem_get_buf(outstream, &outbuf, &outbuf_len);
-
-        M_WriteFile(filename, outbuf, outbuf_len);
-    }
-
-    mem_fclose(instream);
-    mem_fclose(outstream);
-
-    return result;
-}
-
-static void *I_WIN_RegisterSong(void *data, int len)
-{
-    unsigned int i;
-    char *filename;
-    midi_file_t *file;
-
-    MIDIPROPTIMEDIV prop_timediv;
-    MIDIPROPTEMPO prop_tempo;
-    MMRESULT mmr;
-
-    if (!hMidiStream)
-    {
-        return NULL;
-    }
-
-    // MUS files begin with "MUS"
-    // Reject anything which doesnt have this signature
-
-    filename = M_TempFile("doom.mid");
-
-    if (IsMid(data, len))
-    {
-        M_WriteFile(filename, data, len);
-    }
-    else
-    {
-        // Assume a MUS file and try to convert
-
-        ConvertMus(data, len, filename);
-    }
-
-    file = MIDI_LoadFile(filename);
-
-    M_remove(filename);
-    free(filename);
-
-    if (file == NULL)
-    {
-        fprintf(stderr, "I_WIN_RegisterSong: Failed to load MID.\n");
-        return NULL;
-    }
-
-    prop_timediv.cbStruct = sizeof(MIDIPROPTIMEDIV);
-    prop_timediv.dwTimeDiv = MIDI_GetFileTimeDivision(file);
-    mmr = midiStreamProperty(hMidiStream, (LPBYTE)&prop_timediv,
-                             MIDIPROP_SET | MIDIPROP_TIMEDIV);
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamProperty", mmr);
-        return NULL;
-    }
-    timediv = prop_timediv.dwTimeDiv;
-
-    // Set initial tempo.
-    prop_tempo.cbStruct = sizeof(MIDIPROPTIMEDIV);
-    prop_tempo.dwTempo = 500000; // 120 BPM
-    mmr = midiStreamProperty(hMidiStream, (LPBYTE)&prop_tempo,
-                             MIDIPROP_SET | MIDIPROP_TEMPO);
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamProperty", mmr);
-        return NULL;
-    }
-    tempo = prop_tempo.dwTempo;
-
-    song.num_tracks = MIDI_NumTracks(file);
-    song.tracks = calloc(song.num_tracks, sizeof(win_midi_track_t));
-    for (i = 0; i < song.num_tracks; ++i)
-    {
-        song.tracks[i].iter = MIDI_IterateTrack(file, i);
-    }
-    song.registered = true;
-
-    return file;
-}
-
-static void I_WIN_UnRegisterSong(void *handle)
-{
-    if (!hMidiStream)
-    {
-        return;
-    }
-
-    if (song.tracks)
-    {
-        unsigned int i;
-        for (i = 0; i < song.num_tracks; ++i)
-        {
-            MIDI_FreeIterator(song.tracks[i].iter);
-            song.tracks[i].iter = NULL;
-        }
-        free(song.tracks);
-        song.tracks = NULL;
-    }
-    if (handle)
-    {
-        MIDI_FreeFile(handle);
-    }
-    song.elapsed_time = 0;
-    song.saved_elapsed_time = 0;
-    song.num_tracks = 0;
-    song.registered = false;
-    song.looping = false;
-    song.ff_loop = false;
-    song.ff_restart = false;
-    song.rpg_loop = false;
-}
-
-static void I_WIN_ShutdownMusic(void)
-{
-    MMRESULT mmr;
-
-    if (!hMidiStream)
-    {
-        return;
-    }
-
-    EnterCriticalSection(&CriticalSection);
-    StreamStop();
-    I_WIN_UnRegisterSong(NULL);
-    win_midi_state = STATE_SHUTDOWN;
-    StreamStart();
-    LeaveCriticalSection(&CriticalSection);
-
-    if (WaitForSingleObject(hPlayerThread, PLAYER_THREAD_WAIT_TIME) ==
-        WAIT_OBJECT_0)
-    {
-        CloseHandle(hPlayerThread);
-        hPlayerThread = NULL;
-    }
-    StreamStop();
-
-    if (buffer.prepared)
-    {
-        UnprepareHeader();
-        buffer.prepared = false;
-    }
-
-    mmr = midiStreamClose(hMidiStream);
-    if (mmr != MMSYSERR_NOERROR)
-    {
-        MidiError("midiStreamClose", mmr);
-    }
-    hMidiStream = NULL;
-
-    free(buffer.data);
-    buffer.data = NULL;
-    buffer.size = 0;
-    buffer.position = 0;
-
-    CloseHandle(hBufferReturnEvent);
-    CloseHandle(hStoppedEvent);
-    DeleteCriticalSection(&CriticalSection);
-}
-
-static boolean I_WIN_MusicIsPlaying(void)
-{
-    return (song.num_tracks > 0);
-}
-
-static const snddevice_t music_win_devices[] =
-{
-    SNDDEVICE_PAS,
-    SNDDEVICE_WAVEBLASTER,
-    SNDDEVICE_SOUNDCANVAS,
-    SNDDEVICE_GENMIDI,
-    SNDDEVICE_AWE32,
-};
-
-const music_module_t music_win_module =
-{
-    music_win_devices,
-    arrlen(music_win_devices),
-    I_WIN_InitMusic,
-    I_WIN_ShutdownMusic,
-    I_WIN_SetMusicVolume,
-    I_WIN_PauseSong,
-    I_WIN_ResumeSong,
-    I_WIN_RegisterSong,
-    I_WIN_UnRegisterSong,
-    I_WIN_PlaySong,
-    I_WIN_StopSong,
-    I_WIN_MusicIsPlaying,
-    NULL,  // Poll
-};
-
-#endif
diff --git a/games/NXDoom/src/m_argv.c b/games/NXDoom/src/m_argv.c
index 724a42b67..a9b0ccd14 100644
--- a/games/NXDoom/src/m_argv.c
+++ b/games/NXDoom/src/m_argv.c
@@ -1,556 +1,349 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/m_argv.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "SDL_stdinc.h"
-
-#include "doomtype.h"
 #include "d_iwad.h"
+#include "doomtype.h"
 #include "i_system.h"
+#include "m_argv.h"
 #include "m_misc.h"
-#include "m_argv.h"  // haleyjd 20110212: warning fix
 
-int		myargc;
-char**		myargv;
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define MAXARGVS 100
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-
-//
-// M_CheckParm
-// Checks for the given parameter
-// in the program's command line arguments.
-// Returns the argument number (1 to argc-1)
-// or 0 if not present
-//
-
-int M_CheckParmWithArgs(const char *check, int num_args)
-{
-    int i;
-
-    // Check if myargv[i] has been set to NULL in LoadResponseFile(),
-    // which may call I_Error(), which in turn calls M_ParmExists("-nogui").
-
-    for (i = 1; i < myargc - num_args && myargv[i]; i++)
-    {
-	if (!strcasecmp(check, myargv[i]))
-	    return i;
-    }
-
-    return 0;
-}
-
-//
-// M_ParmExists
-//
-// Returns true if the given parameter exists in the program's command
-// line arguments, false if not.
-//
-
-boolean M_ParmExists(const char *check)
-{
-    return M_CheckParm(check) != 0;
-}
-
-int M_CheckParm(const char *check)
-{
-    return M_CheckParmWithArgs(check, 0);
-}
-
-#define MAXARGVS        100
-
-static void LoadResponseFile(int argv_index, const char *filename)
-{
-    FILE *handle;
-    int size;
-    char *infile;
-    char *file;
-    char **newargv;
-    int newargc;
-    int i, k;
-
-    // Read the response file into memory
-    handle = M_fopen(filename, "rb");
-
-    if (handle == NULL)
-    {
-        printf ("\nNo such response file!");
-        exit(1);
-    }
-
-    printf("Found response file %s!\n", filename);
-
-    size = M_FileLength(handle);
-
-    // Read in the entire file
-    // Allocate one byte extra - this is in case there is an argument
-    // at the end of the response file, in which case a '\0' will be
-    // needed.
-
-    file = malloc(size + 1);
-
-    i = 0;
-
-    while (i < size)
-    {
-        k = fread(file + i, 1, size - i, handle);
-
-        if (k < 0)
-        {
-            I_Error("Failed to read full contents of '%s'", filename);
-        }
-
-        i += k;
-    }
-
-    fclose(handle);
-
-    // Create new arguments list array
-
-    newargv = malloc(sizeof(char *) * MAXARGVS);
-    newargc = 0;
-    memset(newargv, 0, sizeof(char *) * MAXARGVS);
-
-    // Copy all the arguments in the list up to the response file
-
-    if (argv_index >= MAXARGVS)
-    {
-        I_Error("Too many arguments up to the response file!");
-    }
-
-    for (i=0; i<argv_index; ++i)
-    {
-        newargv[i] = myargv[i];
-        myargv[i] = NULL;
-        ++newargc;
-    }
-
-    infile = file;
-    k = 0;
-
-    while(k < size)
-    {
-        // Skip past space characters to the next argument
-
-        while(k < size && isspace(infile[k]))
-        {
-            ++k;
-        }
-
-        if (k >= size)
-        {
-            break;
-        }
-
-        // If the next argument is enclosed in quote marks, treat
-        // the contents as a single argument.  This allows long filenames
-        // to be specified.
-
-        if (infile[k] == '\"')
-        {
-            char *argstart;
-            // Skip the first character(")
-            ++k;
-
-            argstart = &infile[k];
-
-            // Read all characters between quotes
-
-            while (k < size && infile[k] != '\"' && infile[k] != '\n')
-            {
-                ++k;
-            }
-
-            if (k >= size || infile[k] == '\n')
-            {
-                I_Error("Quotes unclosed in response file '%s'",
-                        filename);
-            }
-
-            // Cut off the string at the closing quote
-
-            infile[k] = '\0';
-            ++k;
-
-            if (newargc >= MAXARGVS)
-            {
-                I_Error("Too many arguments in the response file!");
-            }
-
-            newargv[newargc++] = M_StringDuplicate(argstart);
-        }
-        else
-        {
-            char *argstart;
-            // Read in the next argument until a space is reached
-
-            argstart = &infile[k];
-
-            while(k < size && !isspace(infile[k]))
-            {
-                ++k;
-            }
-
-            // Cut off the end of the argument at the first space
-
-            infile[k] = '\0';
-            ++k;
-
-            if (newargc >= MAXARGVS)
-            {
-                I_Error("Too many arguments in the response file!");
-            }
-
-            newargv[newargc++] = M_StringDuplicate(argstart);
-        }
-    }
-
-    // Add arguments following the response file argument
-
-    if (newargc + myargc - (argv_index + 1) >= MAXARGVS)
-    {
-        I_Error("Too many arguments following the response file!");
-    }
-
-    for (i=argv_index + 1; i<myargc; ++i)
-    {
-        newargv[newargc] = myargv[i];
-        myargv[i] = NULL;
-        ++newargc;
-    }
-
-    // Free any old strings in myargv which were not moved to newargv
-    for (i = 0; i < myargc; ++i)
-    {
-        if (myargv[i] != NULL)
-        {
-            free(myargv[i]);
-            myargv[i] = NULL;
-        }
-    }
-
-    free(myargv);
-    myargv = newargv;
-    myargc = newargc;
-
-    free(file);
-
-#if 0
-    // Disabled - Vanilla Doom does not do this.
-    // Display arguments
-
-    printf("%d command-line args:\n", myargc);
-
-    for (k=1; k<myargc; k++)
-    {
-        printf("'%s'\n", myargv[k]);
-    }
-#endif
-}
-
-//
-// Find a Response File
-//
-
-void M_FindResponseFile(void)
-{
-    int i;
-
-    for (i = 1; i < myargc; i++)
-    {
-        if (myargv[i][0] == '@')
-        {
-            LoadResponseFile(i, myargv[i] + 1);
-        }
-    }
-
-    for (;;)
-    {
-        //!
-        // @arg <file>
-        //
-        // Load extra command-line arguments from the given response
-        // file.  Arguments read from the file are inserted into the
-        // command line, replacing this argument.  A response file can
-        // also be loaded using the abbreviated syntax '@file.rsp'.
-        //
-        i = M_CheckParmWithArgs("-response", 1);
-        if (i <= 0)
-        {
-            break;
-        }
-        // Replace the -response argument so that the next time through
-        // the loop we'll ignore it. Since some parameters stop reading when
-        // an argument beginning with a '-' is encountered, we keep something
-        // that starts with a '-'.
-        free(myargv[i]);
-        myargv[i] = M_StringDuplicate("-_");
-        LoadResponseFile(i + 1, myargv[i + 1]);
-    }
-}
-
-#if defined(_WIN32)
-enum
-{
-    FILETYPE_UNKNOWN = 0x0,
-    FILETYPE_IWAD =    0x2,
-    FILETYPE_PWAD =    0x4,
-    FILETYPE_DEH =     0x8,
-    FILETYPE_DEMO =    0x10,
-};
-
-static boolean FileIsDemoLump(const char *filename)
-{
-    FILE *handle;
-    int count, ver;
-    byte buf[12], *p = buf;
-
-    handle = M_fopen(filename, "rb");
-
-    if (handle == NULL)
-    {
-        return false;
-    }
-
-    count = fread(buf, 1, sizeof(buf), handle);
-    fclose(handle);
-
-    if (count != sizeof(buf))
-    {
-        return false;
-    }
-
-    ver = *p++;
-
-    if (ver >= 0 && ver <= 4) // v1.0/v1.1/v1.2
-    {
-        p--;
-    }
-    else
-    {
-        switch (ver)
-        {
-            case 104: // v1.4
-            case 105: // v1.5
-            case 106: // v1.6/v1.666
-            case 107: // v1.7/v1.7a
-            case 108: // v1.8
-            case 109: // v1.9
-            case 111: // v1.91 hack
-                break;
-            default:
-                return false;
-                break;
-        }
-    }
-
-    if (*p++ > 5) // skill
-    {
-        return false;
-    }
-    if (*p++ > 9) // episode
-    {
-        return false;
-    }
-    if (*p++ > 99) // map
-    {
-        return false;
-    }
-
-    return true;
-}
-
-static int GuessFileType(const char *name)
-{
-    int ret = FILETYPE_UNKNOWN;
-    const char *base;
-    char *lower;
-    static boolean iwad_found = false, demo_found = false;
-
-    base = M_BaseName(name);
-    lower = M_StringDuplicate(base);
-    M_ForceLowercase(lower);
-
-    // only ever add one argument to the -iwad parameter
-
-    if (iwad_found == false && D_IsIWADName(lower))
-    {
-        ret = FILETYPE_IWAD;
-        iwad_found = true;
-    }
-    else if (M_StringEndsWith(lower, ".wad"))
-    {
-        ret = FILETYPE_PWAD;
-    }
-    else if (M_StringEndsWith(lower, ".lmp"))
-    {
-        // only ever add one argument to the -playdemo parameter
-
-        if (demo_found == false && FileIsDemoLump(name))
-        {
-            ret = FILETYPE_DEMO;
-            demo_found = true;
-        }
-        else
-        {
-            ret = FILETYPE_PWAD;
-        }
-    }
-    else if (M_StringEndsWith(lower, ".deh") ||
-//           M_StringEndsWith(lower, ".bex") ||
-             M_StringEndsWith(lower, ".hhe") ||
-             M_StringEndsWith(lower, ".seh"))
-    {
-        ret = FILETYPE_DEH;
-    }
-
-    free(lower);
-
-    return ret;
-}
-
-typedef struct
-{
-    char *str;
-    int type, stable;
-} argument_t;
-
-static int CompareByFileType(const void *a, const void *b)
-{
-    const argument_t *arg_a = (const argument_t *) a;
-    const argument_t *arg_b = (const argument_t *) b;
-
-    const int ret = arg_a->type - arg_b->type;
-
-    return ret ? ret : (arg_a->stable - arg_b->stable);
-}
-
-void M_AddLooseFiles(void)
-{
-    int i, types = 0;
-    char **newargv;
-    argument_t *arguments;
-
-    if (myargc < 2)
-    {
-        return;
-    }
-
-    // allocate space for up to four additional regular parameters
-    // (-iwad, -merge, -deh, -playdemo)
-
-    arguments = malloc((myargc + 4) * sizeof(*arguments));
-    memset(arguments, 0, (myargc + 4) * sizeof(*arguments));
-
-    // check the command line and make sure it does not already
-    // contain any regular parameters or response files
-    // but only fully-qualified LFS or UNC file paths
-
-    for (i = 1; i < myargc; i++)
-    {
-        char *arg = myargv[i];
-        int type;
-
-        if (strlen(arg) < 3 ||
-            arg[0] == '-' ||
-            arg[0] == '@' ||
-            ((!isalpha(arg[0]) || arg[1] != ':' || arg[2] != '\\') &&
-            (arg[0] != '\\' || arg[1] != '\\')))
-        {
-            free(arguments);
-            return;
-        }
-
-        type = GuessFileType(arg);
-        arguments[i].str = arg;
-        arguments[i].type = type;
-        arguments[i].stable = i;
-        types |= type;
-    }
-
-    // add space for one additional regular parameter
-    // for each discovered file type in the new argument  list
-    // and sort parameters right before their corresponding file paths
-
-    if (types & FILETYPE_IWAD)
-    {
-        arguments[myargc].str = M_StringDuplicate("-iwad");
-        arguments[myargc].type = FILETYPE_IWAD - 1;
-        myargc++;
-    }
-    if (types & FILETYPE_PWAD)
-    {
-        arguments[myargc].str = M_StringDuplicate("-merge");
-        arguments[myargc].type = FILETYPE_PWAD - 1;
-        myargc++;
-    }
-    if (types & FILETYPE_DEH)
-    {
-        arguments[myargc].str = M_StringDuplicate("-deh");
-        arguments[myargc].type = FILETYPE_DEH - 1;
-        myargc++;
-    }
-    if (types & FILETYPE_DEMO)
-    {
-        arguments[myargc].str = M_StringDuplicate("-playdemo");
-        arguments[myargc].type = FILETYPE_DEMO - 1;
-        myargc++;
-    }
-
-    newargv = malloc(myargc * sizeof(*newargv));
-
-    // sort the argument list by file type, except for the zeroth argument
-    // which is the executable invocation itself
-
-    SDL_qsort(arguments + 1, myargc - 1, sizeof(*arguments), CompareByFileType);
-
-    newargv[0] = myargv[0];
-
-    for (i = 1; i < myargc; i++)
-    {
-        newargv[i] = arguments[i].str;
-    }
-
-    free(arguments);
-
-    free(myargv);
-    myargv = newargv;
-}
-#endif
-
-// Return the name of the executable used to start the program:
-
-const char *M_GetExecutableName(void)
-{
-    return M_BaseName(myargv[0]);
-}
+int myargc;
+char **myargv;
 
 char *exedir = NULL;
 
-void M_SetExeDir(void)
-{
-    char *dirname;
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-    dirname = M_DirName(myargv[0]);
-    exedir = M_StringJoin(dirname, DIR_SEPARATOR_S, NULL);
-    free(dirname);
+static void load_response_file(int argv_index, const char *filename)
+{
+  FILE *handle;
+  int size;
+  char *infile;
+  char *file;
+  char **newargv;
+  int newargc;
+  int i;
+  int k;
+
+  /* Read the response file into memory */
+
+  handle = fopen(filename, "rb");
+
+  if (handle == NULL)
+    {
+      printf("\nNo such response file!");
+      exit(1);
+    }
+
+  printf("Found response file %s!\n", filename);
+
+  size = m_file_length(handle);
+
+  /* Read in the entire file
+   * Allocate one byte extra - this is in case there is an argument
+   * at the end of the response file, in which case a '\0' will be
+   * needed.
+   */
+
+  file = malloc(size + 1);
+
+  i = 0;
+
+  while (i < size)
+    {
+      k = fread(file + i, 1, size - i, handle);
+
+      if (k < 0)
+        {
+          i_error("Failed to read full contents of '%s'", filename);
+        }
+
+      i += k;
+    }
+
+  fclose(handle);
+
+  /* Create new arguments list array */
+
+  newargv = malloc(sizeof(char *) * MAXARGVS);
+  newargc = 0;
+  memset(newargv, 0, sizeof(char *) * MAXARGVS);
+
+  /* Copy all the arguments in the list up to the response file */
+
+  if (argv_index >= MAXARGVS)
+    {
+      i_error("Too many arguments up to the response file!");
+    }
+
+  for (i = 0; i < argv_index; ++i)
+    {
+      newargv[i] = myargv[i];
+      myargv[i] = NULL;
+      ++newargc;
+    }
+
+  infile = file;
+  k = 0;
+
+  while (k < size)
+    {
+      /* Skip past space characters to the next argument */
+
+      while (k < size && isspace(infile[k]))
+        {
+          ++k;
+        }
+
+      if (k >= size)
+        {
+          break;
+        }
+
+      /* If the next argument is enclosed in quote marks, treat
+       * the contents as a single argument.  This allows long filenames
+       * to be specified.
+       */
+
+      if (infile[k] == '\"')
+        {
+          char *argstart;
+
+          /* Skip the first character(") */
+
+          ++k;
+
+          argstart = &infile[k];
+
+          /* Read all characters between quotes */
+
+          while (k < size && infile[k] != '\"' && infile[k] != '\n')
+            {
+              ++k;
+            }
+
+          if (k >= size || infile[k] == '\n')
+            {
+              i_error("Quotes unclosed in response file '%s'", filename);
+            }
+
+          /* Cut off the string at the closing quote */
+
+          infile[k] = '\0';
+          ++k;
+
+          if (newargc >= MAXARGVS)
+            {
+              i_error("Too many arguments in the response file!");
+            }
+
+          newargv[newargc++] = m_string_duplicate(argstart);
+        }
+      else
+        {
+          char *argstart;
+
+          /* Read in the next argument until a space is reached */
+
+          argstart = &infile[k];
+
+          while (k < size && !isspace(infile[k]))
+            {
+              ++k;
+            }
+
+          /* Cut off the end of the argument at the first space */
+
+          infile[k] = '\0';
+          ++k;
+
+          if (newargc >= MAXARGVS)
+            {
+              i_error("Too many arguments in the response file!");
+            }
+
+          newargv[newargc++] = m_string_duplicate(argstart);
+        }
+    }
+
+  /* Add arguments following the response file argument */
+
+  if (newargc + myargc - (argv_index + 1) >= MAXARGVS)
+    {
+      i_error("Too many arguments following the response file!");
+    }
+
+  for (i = argv_index + 1; i < myargc; ++i)
+    {
+      newargv[newargc] = myargv[i];
+      myargv[i] = NULL;
+      ++newargc;
+    }
+
+  /* Free any old strings in myargv which were not moved to newargv */
+
+  for (i = 0; i < myargc; ++i)
+    {
+      if (myargv[i] != NULL)
+        {
+          free(myargv[i]);
+          myargv[i] = NULL;
+        }
+    }
+
+  free(myargv);
+  myargv = newargv;
+  myargc = newargc;
+
+  free(file);
+
+#if 0
+  /* Disabled - Vanilla Doom does not do this.
+   * Display arguments
+   */
+
+  printf("%d command-line args:\n", myargc);
+
+  for (k = 1; k < myargc; k++)
+    {
+      printf("'%s'\n", myargv[k]);
+    }
+#endif
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* m_check_parm
+ * Checks for the given parameter in the program's command line arguments.
+ * Returns the argument number (1 to argc-1) or 0 if not present
+ */
+
+int m_check_parm_with_args(const char *check, int num_args)
+{
+  int i;
+
+  /* Check if myargv[i] has been set to NULL in load_response_file(),
+   * which may call i_error(), which in turn calls m_parm_exists("-nogui").
+   */
+
+  for (i = 1; i < myargc - num_args && myargv[i]; i++)
+    {
+      if (!strcasecmp(check, myargv[i])) return i;
+    }
+
+  return 0;
+}
+
+/* m_parm_exists
+ *
+ * Returns true if the given parameter exists in the program's command
+ * line arguments, false if not.
+ */
+
+boolean m_parm_exists(const char *check)
+{
+  return m_check_parm(check) != 0;
+}
+
+int m_check_parm(const char *check)
+{
+  return m_check_parm_with_args(check, 0);
+}
+
+/* Find a Response File */
+
+void m_find_response_file(void)
+{
+  int i;
+
+  for (i = 1; i < myargc; i++)
+    {
+      if (myargv[i][0] == '@')
+        {
+          load_response_file(i, myargv[i] + 1);
+        }
+    }
+
+  for (; ; )
+    {
+      /* @arg <file>
+       *
+       * Load extra command-line arguments from the given response
+       * file.  Arguments read from the file are inserted into the
+       * command line, replacing this argument.  A response file can
+       * also be loaded using the abbreviated syntax '@file.rsp'.
+       */
+
+      i = m_check_parm_with_args("-response", 1);
+      if (i <= 0)
+        {
+          break;
+        }
+
+      /* Replace the -response argument so that the next time through
+       * the loop we'll ignore it. Since some parameters stop reading when
+       * an argument beginning with a '-' is encountered, we keep something
+       * that starts with a '-'.
+       */
+
+      free(myargv[i]);
+      myargv[i] = m_string_duplicate("-_");
+      load_response_file(i + 1, myargv[i + 1]);
+    }
+}
+
+/* Return the name of the executable used to start the program: */
+
+const char *m_get_executable_name(void)
+{
+  return m_base_name(myargv[0]);
+}
+
+void m_set_exe_dir(void)
+{
+  char *dirname;
+
+  dirname = m_dir_name(myargv[0]);
+  exedir = m_string_join(dirname, DIR_SEPARATOR_S, NULL);
+  free(dirname);
 }
diff --git a/games/NXDoom/src/m_argv.h b/games/NXDoom/src/m_argv.h
index b42f11cd4..bb7f6a8cb 100644
--- a/games/NXDoom/src/m_argv.h
+++ b/games/NXDoom/src/m_argv.h
@@ -1,53 +1,92 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Nil.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_argv.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef __M_ARGV__
 #define __M_ARGV__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-//
-// MISC
-//
-extern  int	myargc;
-extern  char**	myargv;
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern int myargc;
+extern char **myargv;
 
 extern char *exedir;
-void M_SetExeDir(void);
 
-// Returns the position of the given parameter
-// in the arg list (0 if not found).
-int M_CheckParm (const char* check);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Same as M_CheckParm, but checks that num_args arguments are available
-// following the specified argument.
-int M_CheckParmWithArgs(const char *check, int num_args);
+void m_set_exe_dir(void);
 
-void M_FindResponseFile(void);
-void M_AddLooseFiles(void);
+/****************************************************************************
+ * Name: m_check_parm
+ *
+ * Description:
+ *  Returns the position of the given parameter in the arg list.
+ *
+ * Returns:
+ *  The position of the given parameter in the arg list (0 if not found).
+ *
+ ****************************************************************************/
 
-// Parameter has been specified?
+int m_check_parm(const char *check);
 
-boolean M_ParmExists(const char *check);
+/****************************************************************************
+ * Name: m_check_parm_with_args
+ *
+ * Description:
+ *  Same as m_check_parm, but checks that num_args arguments are available
+ *  following the specified argument.
+ *
+ ****************************************************************************/
 
-// Get name of executable used to run this program:
+int m_check_parm_with_args(const char *check, int num_args);
 
-const char *M_GetExecutableName(void);
+void m_find_response_file(void);
+void m_add_loose_files(void);
+
+/****************************************************************************
+ * Name: m_parm_exists
+ *
+ * Description:
+ *  Parameter has been specified?
+ *
+ ****************************************************************************/
+
+boolean m_parm_exists(const char *check);
+
+/****************************************************************************
+ * Name: m_get_executable_name
+ *
+ * Description:
+ *  Get name of executable used to run this program.
+ *
+ ****************************************************************************/
+
+const char *m_get_executable_name(void);
 
 #endif
diff --git a/games/NXDoom/src/m_bbox.c b/games/NXDoom/src/m_bbox.c
index fb3f270d1..226237fbb 100644
--- a/games/NXDoom/src/m_bbox.c
+++ b/games/NXDoom/src/m_bbox.c
@@ -1,54 +1,53 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Main loop menu stuff.
-//	Random number LUT.
-//	Default Config File.
-//	PCX Screenshots.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_bbox.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Main loop menu stuff.
+ *  Random number LUT.
+ *  Default Config File.
+ *  PCX Screenshots.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "m_bbox.h"
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-
-
-void M_ClearBox (fixed_t *box)
+void m_clear_box(fixed_t *box)
 {
-    box[BOXTOP] = box[BOXRIGHT] = INT_MIN;
-    box[BOXBOTTOM] = box[BOXLEFT] = INT_MAX;
+  box[BOXTOP] = box[BOXRIGHT] = INT_MIN;
+  box[BOXBOTTOM] = box[BOXLEFT] = INT_MAX;
 }
 
-void
-M_AddToBox
-( fixed_t*	box,
-  fixed_t	x,
-  fixed_t	y )
+void m_add_to_box(fixed_t *box, fixed_t x, fixed_t y)
 {
-    if (x<box[BOXLEFT])
-	box[BOXLEFT] = x;
-    else if (x>box[BOXRIGHT])
-	box[BOXRIGHT] = x;
-    if (y<box[BOXBOTTOM])
-	box[BOXBOTTOM] = y;
-    else if (y>box[BOXTOP])
-	box[BOXTOP] = y;
+  if (x < box[BOXLEFT])
+    box[BOXLEFT] = x;
+  else if (x > box[BOXRIGHT])
+    box[BOXRIGHT] = x;
+  if (y < box[BOXBOTTOM])
+    box[BOXBOTTOM] = y;
+  else if (y > box[BOXTOP])
+    box[BOXTOP] = y;
 }
-
-
-
-
-
diff --git a/games/NXDoom/src/m_bbox.h b/games/NXDoom/src/m_bbox.h
index 5a7af57c4..a36d545d5 100644
--- a/games/NXDoom/src/m_bbox.h
+++ b/games/NXDoom/src/m_bbox.h
@@ -1,47 +1,59 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    Nil.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_bbox.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *    Nil.
+ *
+ ****************************************************************************/
 
 #ifndef __M_BBOX__
 #define __M_BBOX__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <limits.h>
 
 #include "m_fixed.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Bounding box coordinate storage. */
 
-// Bounding box coordinate storage.
 enum
 {
-    BOXTOP,
-    BOXBOTTOM,
-    BOXLEFT,
-    BOXRIGHT
-};	// bbox coordinates
+  BOXTOP,
+  BOXBOTTOM,
+  BOXLEFT,
+  BOXRIGHT
+}; /* bbox coordinates */
 
-// Bounding box functions.
-void M_ClearBox (fixed_t*	box);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void
-M_AddToBox
-( fixed_t*	box,
-  fixed_t	x,
-  fixed_t	y );
+/* Bounding box functions. */
 
+void m_clear_box(fixed_t *box);
 
-#endif
+void m_add_to_box(fixed_t *box, fixed_t x, fixed_t y);
+
+#endif /* __M_BBOX__ */
diff --git a/games/NXDoom/src/m_cheat.c b/games/NXDoom/src/m_cheat.c
index 1565f9ef5..038d77107 100644
--- a/games/NXDoom/src/m_cheat.c
+++ b/games/NXDoom/src/m_cheat.c
@@ -1,89 +1,95 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Cheat sequence checking.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_cheat.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Cheat sequence checking.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <string.h>
 
 #include "doomtype.h"
 #include "m_cheat.h"
 
-//
-// CHEAT SEQUENCE PACKAGE
-//
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-//
-// Called in st_stuff module, which handles the input.
-// Returns a 1 if the cheat was successful, 0 if failed.
-//
-int
-cht_CheckCheat
-( cheatseq_t*	cht,
-  char		key )
+/* CHEAT SEQUENCE PACKAGE */
+
+/* Called in st_stuff module, which handles the input.
+ * Returns a 1 if the cheat was successful, 0 if failed.
+ */
+
+int cht_check_cheat(cheatseq_t *cht, char key)
 {
-    // if we make a short sequence on a cheat with parameters, this 
-    // will not work in vanilla doom.  behave the same.
+  /* if we make a short sequence on a cheat with parameters, this
+   * will not work in vanilla doom.  behave the same.
+   */
 
-    if (cht->parameter_chars > 0 && strlen(cht->sequence) < cht->sequence_len)
-        return false;
-    
-    if (cht->chars_read < strlen(cht->sequence))
+  if (cht->parameter_chars > 0 && strlen(cht->sequence) < cht->sequence_len)
     {
-        // still reading characters from the cheat code
-        // and verifying.  reset back to the beginning 
-        // if a key is wrong
-
-        if (key == cht->sequence[cht->chars_read])
-            ++cht->chars_read;
-        else
-            cht->chars_read = 0;
-        
-        cht->param_chars_read = 0;
-    }
-    else if (cht->param_chars_read < cht->parameter_chars)
-    {
-        // we have passed the end of the cheat sequence and are 
-        // entering parameters now 
-        
-        cht->parameter_buf[cht->param_chars_read] = key;
-        
-        ++cht->param_chars_read;
+      return false;
     }
 
-    if (cht->chars_read >= strlen(cht->sequence)
-     && cht->param_chars_read >= cht->parameter_chars)
+  if (cht->chars_read < strlen(cht->sequence))
     {
-        cht->chars_read = cht->param_chars_read = 0;
+      /* still reading characters from the cheat code
+       * and verifying.  reset back to the beginning
+       * if a key is wrong
+       */
 
-        return true;
+      if (key == cht->sequence[cht->chars_read])
+        ++cht->chars_read;
+      else
+        cht->chars_read = 0;
+
+      cht->param_chars_read = 0;
     }
-    
-    // cheat not matched yet
+  else if (cht->param_chars_read < cht->parameter_chars)
+    {
+      /* we have passed the end of the cheat sequence and are
+       * entering parameters now
+       */
 
-    return false;
+      cht->parameter_buf[cht->param_chars_read] = key;
+
+      ++cht->param_chars_read;
+    }
+
+  if (cht->chars_read >= strlen(cht->sequence) &&
+      cht->param_chars_read >= cht->parameter_chars)
+    {
+      cht->chars_read = cht->param_chars_read = 0;
+
+      return true;
+    }
+
+  /* cheat not matched yet */
+
+  return false;
 }
 
-void
-cht_GetParam
-( cheatseq_t*	cht,
-  char*		buffer )
+void ch_get_param(cheatseq_t *cht, char *buffer)
 {
-    memcpy(buffer, cht->parameter_buf, cht->parameter_chars);
+  memcpy(buffer, cht->parameter_buf, cht->parameter_chars);
 }
-
-
diff --git a/games/NXDoom/src/m_cheat.h b/games/NXDoom/src/m_cheat.h
index 6775e709e..8fa745615 100644
--- a/games/NXDoom/src/m_cheat.h
+++ b/games/NXDoom/src/m_cheat.h
@@ -1,62 +1,68 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Cheat code checking.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_cheat.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Cheat code checking.
+ *
+ ****************************************************************************/
 
 #ifndef __M_CHEAT__
 #define __M_CHEAT__
 
-//
-// CHEAT SEQUENCE PACKAGE
-//
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// declaring a cheat
+/* CHEAT SEQUENCE PACKAGE */
 
-#define CHEAT(value, parameters) \
-    { value, sizeof(value) - 1, parameters, 0, 0, "" }
+/* declaring a cheat */
+
+#define CHEAT(value, parameters)                                             \
+  {value, sizeof(value) - 1, parameters, 0, 0, ""}
 
 #define MAX_CHEAT_LEN 25
 #define MAX_CHEAT_PARAMS 5
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef struct
 {
-    // settings for this cheat
+  /* settings for this cheat */
 
-    char sequence[MAX_CHEAT_LEN];
-    size_t sequence_len;
-    int parameter_chars;
+  char sequence[MAX_CHEAT_LEN];
+  size_t sequence_len;
+  int parameter_chars;
 
-    // state used during the game
+  /* state used during the game */
 
-    size_t chars_read;
-    int param_chars_read;
-    char parameter_buf[MAX_CHEAT_PARAMS];
+  size_t chars_read;
+  int param_chars_read;
+  char parameter_buf[MAX_CHEAT_PARAMS];
 } cheatseq_t;
 
-int
-cht_CheckCheat
-( cheatseq_t*		cht,
-  char			key );
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+int cht_check_cheat(cheatseq_t *cht, char key);
 
-void
-cht_GetParam
-( cheatseq_t*		cht,
-  char*			buffer );
+void ch_get_param(cheatseq_t *cht, char *buffer);
 
-
-#endif
+#endif /* __M_CHEAT__ */
diff --git a/games/NXDoom/src/m_config.c b/games/NXDoom/src/m_config.c
index e1a0260a2..d4441f5ea 100644
--- a/games/NXDoom/src/m_config.c
+++ b/games/NXDoom/src/m_config.c
@@ -1,37 +1,43 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    Configuration file interface.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/m_config.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Configuration file interface.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <assert.h>
-#include <locale.h>
-
-#include "SDL_filesystem.h"
 
 #include "config.h"
 
-#include "doomtype.h"
 #include "doomkeys.h"
+#include "doomtype.h"
 #include "i_system.h"
 #include "m_argv.h"
 #include "m_config.h"
@@ -39,654 +45,557 @@
 
 #include "z_zone.h"
 
-//
-// DEFAULTS
-//
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Location where all configuration data is stored - 
-// default.cfg, savegames, etc.
+#define CONFIG_VARIABLE_GENERIC(name, type) {#name, {NULL}, type, 0, 0, false}
 
-const char *configdir;
+#define CONFIG_VARIABLE_KEY(name) CONFIG_VARIABLE_GENERIC(name, DEFAULT_KEY)
+#define CONFIG_VARIABLE_INT(name) CONFIG_VARIABLE_GENERIC(name, DEFAULT_INT)
+#define CONFIG_VARIABLE_INT_HEX(name)                                        \
+  CONFIG_VARIABLE_GENERIC(name, DEFAULT_INT_HEX)
+#define CONFIG_VARIABLE_FLOAT(name)                                          \
+  CONFIG_VARIABLE_GENERIC(name, DEFAULT_FLOAT)
+#define CONFIG_VARIABLE_STRING(name)                                         \
+  CONFIG_VARIABLE_GENERIC(name, DEFAULT_STRING)
 
-static char *autoload_path = "";
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-// Default filenames for configuration files.
-
-static const char *default_main_config;
-static const char *default_extra_config;
-
-typedef enum 
+typedef enum
 {
-    DEFAULT_INT,
-    DEFAULT_INT_HEX,
-    DEFAULT_STRING,
-    DEFAULT_FLOAT,
-    DEFAULT_KEY,
+  DEFAULT_INT,
+  DEFAULT_INT_HEX,
+  DEFAULT_STRING,
+  DEFAULT_FLOAT,
+  DEFAULT_KEY,
 } default_type_t;
 
 typedef struct
 {
-    // Name of the variable
-    const char *name;
+  /* Name of the variable */
 
-    // Pointer to the location in memory of the variable
-    union {
-        int *i;
-        char **s;
-        float *f;
-    } location;
+  const char *name;
 
-    // Type of the variable
-    default_type_t type;
+  /* Pointer to the location in memory of the variable */
 
-    // If this is a key value, the original integer scancode we read from
-    // the config file before translating it to the internal key value.
-    // If zero, we didn't read this value from a config file.
-    int untranslated;
+  union
+  {
+    int *i;
+    char **s;
+    float *f;
+  } location;
 
-    // The value we translated the scancode into when we read the 
-    // config file on startup.  If the variable value is different from
-    // this, it has been changed and needs to be converted; otherwise,
-    // use the 'untranslated' value.
-    int original_translated;
+  /* Type of the variable */
 
-    // If true, this config variable has been bound to a variable
-    // and is being used.
-    boolean bound;
+  default_type_t type;
+
+  /* If this is a key value, the original integer scancode we read from
+   * the config file before translating it to the internal key value.
+   * If zero, we didn't read this value from a config file.
+   */
+
+  int untranslated;
+
+  /* The value we translated the scancode into when we read the
+   * config file on startup.  If the variable value is different from
+   * this, it has been changed and needs to be converted; otherwise,
+   * use the 'untranslated' value.
+   */
+
+  int original_translated;
+
+  /* If true, this config variable has been bound to a variable
+   * and is being used.
+   */
+
+  boolean bound;
 } default_t;
 
 typedef struct
 {
-    default_t *defaults;
-    int numdefaults;
-    const char *filename;
+  default_t *defaults;
+  int numdefaults;
+  const char *filename;
 } default_collection_t;
 
-#define CONFIG_VARIABLE_GENERIC(name, type) \
-    { #name, {NULL}, type, 0, 0, false }
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-#define CONFIG_VARIABLE_KEY(name) \
-    CONFIG_VARIABLE_GENERIC(name, DEFAULT_KEY)
-#define CONFIG_VARIABLE_INT(name) \
-    CONFIG_VARIABLE_GENERIC(name, DEFAULT_INT)
-#define CONFIG_VARIABLE_INT_HEX(name) \
-    CONFIG_VARIABLE_GENERIC(name, DEFAULT_INT_HEX)
-#define CONFIG_VARIABLE_FLOAT(name) \
-    CONFIG_VARIABLE_GENERIC(name, DEFAULT_FLOAT)
-#define CONFIG_VARIABLE_STRING(name) \
-    CONFIG_VARIABLE_GENERIC(name, DEFAULT_STRING)
+static char *autoload_path = "";
 
-//! @begin_config_file default
+/* Default filenames for configuration files. */
 
-static default_t	doom_defaults_list[] =
+static const char *default_main_config;
+static const char *default_extra_config;
+
+/* @begin_config_file default */
+
+static default_t doom_defaults_list[] =
 {
-    //!
-    // Mouse sensitivity.  This value is used to multiply input mouse
-    // movement to control the effect of moving the mouse.
-    //
-    // The "normal" maximum value available for this through the
-    // in-game options menu is 9. A value of 31 or greater will cause
-    // the game to crash when entering the options menu.
-    //
+  /* Mouse sensitivity.  This value is used to multiply input mouse
+   * movement to control the effect of moving the mouse.
+   *
+   * The "normal" maximum value available for this through the
+   * in-game options menu is 9. A value of 31 or greater will cause
+   * the game to crash when entering the options menu.
+   *
+   */
 
-    CONFIG_VARIABLE_INT(mouse_sensitivity),
+  CONFIG_VARIABLE_INT(mouse_sensitivity),
 
-    //!
-    // Volume of sound effects, range 0-15.
-    //
+  /* Volume of sound effects, range 0-15. */
 
-    CONFIG_VARIABLE_INT(sfx_volume),
+  CONFIG_VARIABLE_INT(sfx_volume),
 
-    //!
-    // Volume of in-game music, range 0-15.
-    //
+  /* Volume of in-game music, range 0-15. */
 
-    CONFIG_VARIABLE_INT(music_volume),
+  CONFIG_VARIABLE_INT(music_volume),
 
-    //!
-    // @game strife
-    //
-    // If non-zero, dialogue text is displayed over characters' pictures
-    // when engaging actors who have voices.
-    //
+  /* @game strife
+   *
+   * If non-zero, dialogue text is displayed over characters' pictures
+   * when engaging actors who have voices.
+   */
 
-    CONFIG_VARIABLE_INT(show_talk),
+  CONFIG_VARIABLE_INT(show_talk),
 
-    //!
-    // @game strife
-    //
-    // Volume of voice sound effects, range 0-15.
-    //
+  /* @game strife
+   *
+   * Volume of voice sound effects, range 0-15.
+   */
 
-    CONFIG_VARIABLE_INT(voice_volume),
+  CONFIG_VARIABLE_INT(voice_volume),
 
-    //!
-    // @game doom
-    //
-    // If non-zero, messages are displayed on the heads-up display
-    // in the game ("picked up a clip", etc).  If zero, these messages
-    // are not displayed.
-    //
+  /* @game doom
+   *
+   * If non-zero, messages are displayed on the heads-up display
+   * in the game ("picked up a clip", etc).  If zero, these messages
+   * are not displayed.
+   */
 
-    CONFIG_VARIABLE_INT(show_messages),
+  CONFIG_VARIABLE_INT(show_messages),
 
-    //!
-    // Keyboard key to turn right.
-    //
+  /* Keyboard key to turn right. */
 
-    CONFIG_VARIABLE_KEY(key_right),
+  CONFIG_VARIABLE_KEY(key_right),
 
-    //!
-    // Keyboard key to turn left.
-    //
+  /* Keyboard key to turn left. */
 
-    CONFIG_VARIABLE_KEY(key_left),
+  CONFIG_VARIABLE_KEY(key_left),
 
-    //!
-    // Keyboard key to move forward.
-    //
+  /* Keyboard key to move forward. */
 
-    CONFIG_VARIABLE_KEY(key_up),
+  CONFIG_VARIABLE_KEY(key_up),
 
-    //!
-    // Keyboard key to move backward.
-    //
+  /* Keyboard key to move backward. */
 
-    CONFIG_VARIABLE_KEY(key_down),
+  CONFIG_VARIABLE_KEY(key_down),
 
-    //!
-    // Keyboard key to strafe left.
-    //
+  /* Keyboard key to strafe left. */
 
-    CONFIG_VARIABLE_KEY(key_strafeleft),
+  CONFIG_VARIABLE_KEY(key_strafeleft),
 
-    //!
-    // Keyboard key to strafe right.
-    //
+  /* Keyboard key to strafe right. */
 
-    CONFIG_VARIABLE_KEY(key_straferight),
+  CONFIG_VARIABLE_KEY(key_straferight),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to use health.
-    //
+  /* @game strife
+   *
+   * Keyboard key to use health.
+   */
 
-    CONFIG_VARIABLE_KEY(key_useHealth),
+  CONFIG_VARIABLE_KEY(key_use_health),
 
-    //!
-    // @game hexen
-    //
-    // Keyboard key to jump.
-    //
+  /* @game hexen
+   *
+   * Keyboard key to jump.
+   */
 
-    CONFIG_VARIABLE_KEY(key_jump),
+  CONFIG_VARIABLE_KEY(key_jump),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to fly upward.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to fly upward.
+   */
 
-    CONFIG_VARIABLE_KEY(key_flyup),
+  CONFIG_VARIABLE_KEY(key_flyup),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to fly downwards.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to fly downwards.
+   */
 
-    CONFIG_VARIABLE_KEY(key_flydown),
+  CONFIG_VARIABLE_KEY(key_flydown),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to center flying.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to center flying.
+   */
 
-    CONFIG_VARIABLE_KEY(key_flycenter),
+  CONFIG_VARIABLE_KEY(key_flycenter),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to look up.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to look up.
+   */
 
-    CONFIG_VARIABLE_KEY(key_lookup),
+  CONFIG_VARIABLE_KEY(key_lookup),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to look down.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to look down.
+   */
 
-    CONFIG_VARIABLE_KEY(key_lookdown),
+  CONFIG_VARIABLE_KEY(key_lookdown),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to center the view.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to center the view.
+   */
 
-    CONFIG_VARIABLE_KEY(key_lookcenter),
+  CONFIG_VARIABLE_KEY(key_lookcenter),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to query inventory.
-    //
+  /* @game strife
+   *
+   * Keyboard key to query inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invquery),
+  CONFIG_VARIABLE_KEY(key_invquery),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to display mission objective.
-    //
+  /* @game strife
+   *
+   * Keyboard key to display mission objective.
+   */
 
-    CONFIG_VARIABLE_KEY(key_mission),
+  CONFIG_VARIABLE_KEY(key_mission),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to display inventory popup.
-    //
+  /* @game strife
+   *
+   * Keyboard key to display inventory popup.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invPop),
+  CONFIG_VARIABLE_KEY(key_inv_pop),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to display keys popup.
-    //
+  /* @game strife
+   *
+   * Keyboard key to display keys popup.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invKey),
+  CONFIG_VARIABLE_KEY(key_inv_key),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to jump to start of inventory.
-    //
+  /* @game strife
+   *
+   * Keyboard key to jump to start of inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invHome),
+  CONFIG_VARIABLE_KEY(key_inv_home),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to jump to end of inventory.
-    //
+  /* @game strife
+   *
+   * Keyboard key to jump to end of inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invEnd),
+  CONFIG_VARIABLE_KEY(key_inv_end),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to scroll left in the inventory.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to scroll left in the inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invleft),
+  CONFIG_VARIABLE_KEY(key_invleft),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to scroll right in the inventory.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to scroll right in the inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invright),
+  CONFIG_VARIABLE_KEY(key_invright),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to scroll left in the inventory.
-    //
+  /* @game strife
+   *
+   * Keyboard key to scroll left in the inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invLeft),
+  CONFIG_VARIABLE_KEY(key_inv_left),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to scroll right in the inventory.
-    //
+  /* @game strife
+   *
+   * Keyboard key to scroll right in the inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invRight),
+  CONFIG_VARIABLE_KEY(key_inv_right),
 
-    //!
-    // @game heretic hexen
-    //
-    // Keyboard key to use the current item in the inventory.
-    //
+  /* @game heretic hexen
+   *
+   * Keyboard key to use the current item in the inventory.
+   */
 
-    CONFIG_VARIABLE_KEY(key_useartifact),
+  CONFIG_VARIABLE_KEY(key_useartifact),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to use inventory item.
-    //
+  /* @game strife
+   *
+   * Keyboard key to use inventory item.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invUse),
+  CONFIG_VARIABLE_KEY(key_inv_use),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to drop an inventory item.
-    //
+  /* @game strife
+   *
+   * Keyboard key to drop an inventory item.
+   */
 
-    CONFIG_VARIABLE_KEY(key_invDrop),
+  CONFIG_VARIABLE_KEY(key_inv_drop),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to look up.
-    //
+  /* @game strife
+   *
+   * Keyboard key to look up.
+   */
 
-    CONFIG_VARIABLE_KEY(key_lookUp),
+  CONFIG_VARIABLE_KEY(key_look_up),
 
-    //!
-    // @game strife
-    //
-    // Keyboard key to look down.
-    //
+  /* @game strife
+   *
+   * Keyboard key to look down.
+   */
 
-    CONFIG_VARIABLE_KEY(key_lookDown),
+  CONFIG_VARIABLE_KEY(key_look_down),
 
-    //!
-    // Keyboard key to fire the currently selected weapon.
-    //
+  /* Keyboard key to fire the currently selected weapon. */
 
-    CONFIG_VARIABLE_KEY(key_fire),
+  CONFIG_VARIABLE_KEY(key_fire),
 
-    //!
-    // Keyboard key to "use" an object, eg. a door or switch.
-    //
+  /* Keyboard key to "use" an object, eg. a door or switch. */
 
-    CONFIG_VARIABLE_KEY(key_use),
+  CONFIG_VARIABLE_KEY(key_use),
 
-    //!
-    // Keyboard key to turn on strafing.  When held down, pressing the
-    // key to turn left or right causes the player to strafe left or
-    // right instead.
-    //
+  /* Keyboard key to turn on strafing.  When held down, pressing the
+   * key to turn left or right causes the player to strafe left or
+   * right instead.
+   */
 
-    CONFIG_VARIABLE_KEY(key_strafe),
+  CONFIG_VARIABLE_KEY(key_strafe),
 
-    //!
-    // Keyboard key to make the player run.
-    //
+  /* Keyboard key to make the player run. */
 
-    CONFIG_VARIABLE_KEY(key_speed),
+  CONFIG_VARIABLE_KEY(key_speed),
 
-    //!
-    // If non-zero, mouse input is enabled.  If zero, mouse input is
-    // disabled.
-    //
+  /* If non-zero, mouse input is enabled.  If zero, mouse input is
+   * disabled.
+   */
 
-    CONFIG_VARIABLE_INT(use_mouse),
+  CONFIG_VARIABLE_INT(use_mouse),
 
-    //!
-    // Mouse button to fire the currently selected weapon.
-    //
+  /* Mouse button to fire the currently selected weapon. */
 
-    CONFIG_VARIABLE_INT(mouseb_fire),
+  CONFIG_VARIABLE_INT(mouseb_fire),
 
-    //!
-    // Mouse button to turn on strafing.  When held down, the player
-    // will strafe left and right instead of turning left and right.
-    //
+  /* Mouse button to turn on strafing.  When held down, the player
+   * will strafe left and right instead of turning left and right.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_strafe),
+  CONFIG_VARIABLE_INT(mouseb_strafe),
 
-    //!
-    // Mouse button to move forward.
-    //
+  /* Mouse button to move forward. */
 
-    CONFIG_VARIABLE_INT(mouseb_forward),
+  CONFIG_VARIABLE_INT(mouseb_forward),
 
-    //!
-    // Mouse button to turn on running.  When held down, the player
-    // will run while moving.
-    //
+  /* Mouse button to turn on running.  When held down, the player
+   * will run while moving.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_speed),
+  CONFIG_VARIABLE_INT(mouseb_speed),
 
-    //!
-    // @game hexen strife
-    //
-    // Mouse button to jump.
-    //
+  /* @game hexen strife
+   *
+   * Mouse button to jump.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_jump),
+  CONFIG_VARIABLE_INT(mouseb_jump),
 
-    //!
-    // If non-zero, joystick input is enabled.
-    //
+  /* If non-zero, joystick input is enabled. */
 
-    CONFIG_VARIABLE_INT(use_joystick),
+  CONFIG_VARIABLE_INT(use_joystick),
 
-    //!
-    // Joystick virtual button that fires the current weapon.
-    //
+  /* Joystick virtual button that fires the current weapon. */
 
-    CONFIG_VARIABLE_INT(joyb_fire),
+  CONFIG_VARIABLE_INT(joyb_fire),
 
-    //!
-    // Joystick virtual button that makes the player strafe while
-    // held down.
-    //
+  /* Joystick virtual button that makes the player strafe while
+   * held down.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_strafe),
+  CONFIG_VARIABLE_INT(joyb_strafe),
 
-    //!
-    // Joystick virtual button to "use" an object, eg. a door or switch.
-    //
+  /* Joystick virtual button to "use" an object, eg. a door or switch. */
 
-    CONFIG_VARIABLE_INT(joyb_use),
+  CONFIG_VARIABLE_INT(joyb_use),
 
-    //!
-    // Joystick virtual button that makes the player run while held
-    // down.
-    //
-    // If this has a value of 20 or greater, the player will always run,
-    // even if use_joystick is 0.
-    //
+  /* Joystick virtual button that makes the player run while held
+   * down.
+   *
+   * If this has a value of 20 or greater, the player will always run,
+   * even if use_joystick is 0.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_speed),
+  CONFIG_VARIABLE_INT(joyb_speed),
 
-    //!
-    // @game hexen strife
-    //
-    // Joystick virtual button that makes the player jump.
-    //
+  /* @game hexen strife
+   *
+   * Joystick virtual button that makes the player jump.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_jump),
+  CONFIG_VARIABLE_INT(joyb_jump),
 
-    //!
-    // @game doom heretic hexen
-    //
-    // Screen size, range 3-11.
-    //
-    // A value of 11 gives a full-screen view with the status bar not
-    // displayed.  A value of 10 gives a full-screen view with the
-    // status bar displayed.
-    //
+  /* @game doom heretic hexen
+   *
+   * Screen size, range 3-11.
+   *
+   * A value of 11 gives a full-screen view with the status bar not
+   * displayed.  A value of 10 gives a full-screen view with the
+   * status bar displayed.
+   */
 
-    CONFIG_VARIABLE_INT(screenblocks),
+  CONFIG_VARIABLE_INT(screenblocks),
 
-    //!
-    // @game strife
-    //
-    // Screen size, range 3-11.
-    //
-    // A value of 11 gives a full-screen view with the status bar not
-    // displayed.  A value of 10 gives a full-screen view with the
-    // status bar displayed.
-    //
+  /* @game strife
+   *
+   * Screen size, range 3-11.
+   *
+   * A value of 11 gives a full-screen view with the status bar not
+   * displayed.  A value of 10 gives a full-screen view with the
+   * status bar displayed.
+   */
 
-    CONFIG_VARIABLE_INT(screensize),
+  CONFIG_VARIABLE_INT(screensize),
 
-    //!
-    // @game doom
-    //
-    // Screen detail.  Zero gives normal "high detail" mode, while
-    // a non-zero value gives "low detail" mode.
-    //
+  /* @game doom
+   *
+   * Screen detail.  Zero gives normal "high detail" mode, while
+   * a non-zero value gives "low detail" mode.
+   */
 
-    CONFIG_VARIABLE_INT(detaillevel),
+  CONFIG_VARIABLE_INT(detaillevel),
 
-    //!
-    // Number of sounds that will be played simultaneously.
-    //
+  /* Number of sounds that will be played simultaneously. */
 
-    CONFIG_VARIABLE_INT(snd_channels),
+  CONFIG_VARIABLE_INT(snd_channels),
 
-    //!
-    // Music output device.  A non-zero value gives MIDI sound output,
-    // while a value of zero disables music.
-    //
+  /* Music output device.  A non-zero value gives MIDI sound output,
+   * while a value of zero disables music.
+   */
 
-    CONFIG_VARIABLE_INT(snd_musicdevice),
+  CONFIG_VARIABLE_INT(snd_musicdevice),
 
-    //!
-    // Sound effects device.  A value of zero disables in-game sound
-    // effects, a value of 1 enables PC speaker sound effects, while
-    // a value in the range 2-9 enables the "normal" digital sound
-    // effects.
-    //
+  /* Sound effects device.  A value of zero disables in-game sound
+   * effects, a value of 1 enables PC speaker sound effects, while
+   * a value in the range 2-9 enables the "normal" digital sound
+   * effects.
+   */
 
-    CONFIG_VARIABLE_INT(snd_sfxdevice),
+  CONFIG_VARIABLE_INT(snd_sfxdevice),
 
-    //!
-    // SoundBlaster I/O port. Unused.
-    //
+  /* SoundBlaster I/O port. Unused. */
 
-    CONFIG_VARIABLE_INT(snd_sbport),
+  CONFIG_VARIABLE_INT(snd_sbport),
 
-    //!
-    // SoundBlaster IRQ.  Unused.
-    //
+  /* SoundBlaster IRQ.  Unused. */
 
-    CONFIG_VARIABLE_INT(snd_sbirq),
+  CONFIG_VARIABLE_INT(snd_sbirq),
 
-    //!
-    // SoundBlaster DMA channel.  Unused.
-    //
+  /* SoundBlaster DMA channel.  Unused. */
 
-    CONFIG_VARIABLE_INT(snd_sbdma),
+  CONFIG_VARIABLE_INT(snd_sbdma),
 
-    //!
-    // Output port to use for OPL MIDI playback.  Unused.
-    //
+  /* Output port to use for OPL MIDI playback.  Unused. */
 
-    CONFIG_VARIABLE_INT(snd_mport),
+  CONFIG_VARIABLE_INT(snd_mport),
 
-    //!
-    // Gamma correction level.  A value of zero disables gamma
-    // correction, while a value in the range 1-4 gives increasing
-    // levels of gamma correction.
-    //
+  /* Gamma correction level.  A value of zero disables gamma
+   * correction, while a value in the range 1-4 gives increasing
+   * levels of gamma correction.
+   */
 
-    CONFIG_VARIABLE_INT(usegamma),
+  CONFIG_VARIABLE_INT(usegamma),
 
-    //!
-    // @game hexen
-    //
-    // Directory in which to store savegames.
-    //
+  /* @game hexen
+   *
+   * Directory in which to store savegames.
+   */
 
-    CONFIG_VARIABLE_STRING(savedir),
+  CONFIG_VARIABLE_STRING(savedir),
 
-    //!
-    // @game hexen
-    //
-    // Controls whether messages are displayed in the heads-up display.
-    // If this has a non-zero value, messages are displayed.
-    //
+  /* @game hexen
+   *
+   * Controls whether messages are displayed in the heads-up display.
+   * If this has a non-zero value, messages are displayed.
+   */
 
-    CONFIG_VARIABLE_INT(messageson),
+  CONFIG_VARIABLE_INT(messageson),
 
-    //!
-    // @game strife
-    //
-    // Name of background flat used by view border.
-    //
+  /* @game strife
+   *
+   * Name of background flat used by view border.
+   */
 
-    CONFIG_VARIABLE_STRING(back_flat),
+  CONFIG_VARIABLE_STRING(back_flat),
 
-    //!
-    // @game strife
-    //
-    // Multiplayer nickname (?).
-    //
+  /* @game strife
+   *
+   * Multiplayer nickname (?).
+   */
 
-    CONFIG_VARIABLE_STRING(nickname),
+  CONFIG_VARIABLE_STRING(nickname),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+0 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+0 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro0),
+  CONFIG_VARIABLE_STRING(chatmacro0),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+1 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+1 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro1),
+  CONFIG_VARIABLE_STRING(chatmacro1),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+2 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+2 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro2),
+  CONFIG_VARIABLE_STRING(chatmacro2),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+3 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+3 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro3),
+  CONFIG_VARIABLE_STRING(chatmacro3),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+4 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+4 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro4),
+  CONFIG_VARIABLE_STRING(chatmacro4),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+5 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+5 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro5),
+  CONFIG_VARIABLE_STRING(chatmacro5),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+6 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+6 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro6),
+  CONFIG_VARIABLE_STRING(chatmacro6),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+7 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+7 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro7),
+  CONFIG_VARIABLE_STRING(chatmacro7),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+8 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+8 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro8),
+  CONFIG_VARIABLE_STRING(chatmacro8),
 
-    //!
-    // Multiplayer chat macro: message to send when alt+9 is pressed.
-    //
+  /* Multiplayer chat macro: message to send when alt+9 is pressed. */
 
-    CONFIG_VARIABLE_STRING(chatmacro9),
+  CONFIG_VARIABLE_STRING(chatmacro9),
 
-    //!
-    // @game strife
-    //
-    // Serial port number to use for SERSETUP.EXE (unused).
-    //
+  /* @game strife
+   *
+   * Serial port number to use for SERSETUP.EXE (unused).
+   */
 
-    CONFIG_VARIABLE_INT(comport),
+  CONFIG_VARIABLE_INT(comport),
 };
 
 static default_collection_t doom_defaults =
@@ -696,1376 +605,1072 @@ static default_collection_t doom_defaults =
     NULL,
 };
 
-//! @begin_config_file extended
+/* @begin_config_file extended */
 
 static default_t extra_defaults_list[] =
 {
-    //!
-    // Name of the SDL video driver to use.  If this is an empty string,
-    // the default video driver is used.
-    //
+  /* Name of the SDL video driver to use.  If this is an empty string,
+   * the default video driver is used.
+   */
 
-    CONFIG_VARIABLE_STRING(video_driver),
+  CONFIG_VARIABLE_STRING(video_driver),
 
-    //!
-    // Position of the window on the screen when running in windowed
-    // mode. Accepted values are: "" (empty string) - don't care,
-    // "center" - place window at center of screen, "x,y" - place
-    // window at the specified coordinates.
-    //
+  /* Position of the window on the screen when running in windowed
+   * mode. Accepted values are: "" (empty string) - don't care,
+   * "center" - place window at center of screen, "x,y" - place
+   * window at the specified coordinates.
+   */
 
-    CONFIG_VARIABLE_STRING(window_position),
+  CONFIG_VARIABLE_STRING(window_position),
 
-    //!
-    // If non-zero, the game will run in full screen mode.  If zero,
-    // the game will run in a window.
-    //
+  /* If non-zero, the game will run in full screen mode.  If zero,
+   * the game will run in a window.
+   */
 
-    CONFIG_VARIABLE_INT(fullscreen),
+  CONFIG_VARIABLE_INT(fullscreen),
 
-    //!
-    // Index of the display on which the game should run. This has no
-    // effect if running in windowed mode (fullscreen=0) and
-    // window_position is not set to "center".
-    //
+  /* Index of the display on which the game should run. This has no
+   * effect if running in windowed mode (fullscreen=0) and
+   * window_position is not set to "center".
+   */
 
-    CONFIG_VARIABLE_INT(video_display),
+  CONFIG_VARIABLE_INT(video_display),
 
-    //!
-    // If non-zero, the screen will be stretched vertically to display
-    // correctly on a square pixel video mode.
-    //
+  /* If non-zero, the screen will be stretched vertically to display
+   * correctly on a square pixel video mode.
+   */
 
-    CONFIG_VARIABLE_INT(aspect_ratio_correct),
+  CONFIG_VARIABLE_INT(aspect_ratio_correct),
 
-    //!
-    // If non-zero, the screen will have smooth scaling.
-    //
+  /* If non-zero, the screen will have smooth scaling. */
 
-    CONFIG_VARIABLE_INT(smooth_pixel_scaling),
+  CONFIG_VARIABLE_INT(smooth_pixel_scaling),
 
-    //!
-    // If non-zero, forces integer scales for resolution-independent rendering.
-    //
+  /* If non-zero, forces integer scales for resolution-independent
+   * rendering.
+   */
 
-    CONFIG_VARIABLE_INT(integer_scaling),
+  CONFIG_VARIABLE_INT(integer_scaling),
 
-    // If non-zero, any pillar/letter boxes drawn around the game area
-    // will "flash" when the game palette changes, simulating the VGA
-    // "porch"
+  /* If non-zero, any pillar/letter boxes drawn around the game area
+   * will "flash" when the game palette changes, simulating the VGA
+   * "porch"
+   */
 
-    CONFIG_VARIABLE_INT(vga_porch_flash),
+  CONFIG_VARIABLE_INT(vga_porch_flash),
 
-    //!
-    // Window width when running in windowed mode.
-    //
+  /* Window width when running in windowed mode. */
 
-    CONFIG_VARIABLE_INT(window_width),
+  CONFIG_VARIABLE_INT(window_width),
 
-    //!
-    // Window height when running in windowed mode.
-    //
+  /* Window height when running in windowed mode. */
 
-    CONFIG_VARIABLE_INT(window_height),
+  CONFIG_VARIABLE_INT(window_height),
 
-    //!
-    // Width for screen mode when running fullscreen.
-    // If this and fullscreen_height are both set to zero, we run
-    // fullscreen as a desktop window that covers the entire screen,
-    // rather than ever switching screen modes. It should usually
-    // be unnecessary to set this value.
-    //
+  /* Width for screen mode when running fullscreen.
+   * If this and fullscreen_height are both set to zero, we run
+   * fullscreen as a desktop window that covers the entire screen,
+   * rather than ever switching screen modes. It should usually
+   * be unnecessary to set this value.
+   */
 
-    CONFIG_VARIABLE_INT(fullscreen_width),
+  CONFIG_VARIABLE_INT(fullscreen_width),
 
-    //!
-    // Height for screen mode when running fullscreen.
-    // See documentation for fullscreen_width.
-    //
+  /* Height for screen mode when running fullscreen.
+   * See documentation for fullscreen_width.
+   */
 
-    CONFIG_VARIABLE_INT(fullscreen_height),
+  CONFIG_VARIABLE_INT(fullscreen_height),
 
-    //!
-    // If non-zero, force the use of a software renderer. For use on
-    // systems lacking hardware acceleration.
-    //
+  /* If non-zero, force the use of a software renderer. For use on
+   * systems lacking hardware acceleration.
+   */
 
-    CONFIG_VARIABLE_INT(force_software_renderer),
+  CONFIG_VARIABLE_INT(force_software_renderer),
 
-    //!
-    // Maximum number of pixels to use for intermediate scaling buffer.
-    // More pixels mean that the screen can be rendered more precisely,
-    // but there are diminishing returns on quality. The default limits to
-    // 16,000,000 pixels, which is enough to cover 4K monitor standards.
+  /* Maximum number of pixels to use for intermediate scaling buffer.
+   * More pixels mean that the screen can be rendered more precisely,
+   * but there are diminishing returns on quality. The default limits to
+   * 16,000,000 pixels, which is enough to cover 4K monitor standards.
+   */
 
-    CONFIG_VARIABLE_INT(max_scaling_buffer_pixels),
+  CONFIG_VARIABLE_INT(max_scaling_buffer_pixels),
 
-    //!
-    // Number of milliseconds to wait on startup after the video mode
-    // has been set, before the game will start.  This allows the
-    // screen to settle on some monitors that do not display an image
-    // for a brief interval after changing video modes.
-    //
+  /* Number of milliseconds to wait on startup after the video mode
+   * has been set, before the game will start.  This allows the
+   * screen to settle on some monitors that do not display an image
+   * for a brief interval after changing video modes.
+   */
 
-    CONFIG_VARIABLE_INT(startup_delay),
+  CONFIG_VARIABLE_INT(startup_delay),
 
-    //!
-    // @game heretic hexen strife
-    //
-    // If non-zero, display the graphical startup screen.
-    //
+  /* @game heretic hexen strife
+   *
+   * If non-zero, display the graphical startup screen.
+   */
 
-    CONFIG_VARIABLE_INT(graphical_startup),
+  CONFIG_VARIABLE_INT(graphical_startup),
 
-    //!
-    // @game doom heretic strife
-    //
-    // If non-zero, the ENDOOM text screen is displayed when exiting the
-    // game. If zero, the ENDOOM screen is not displayed.
-    //
+  /* @game doom heretic strife
+   *
+   * If non-zero, the ENDOOM text screen is displayed when exiting the
+   * game. If zero, the ENDOOM screen is not displayed.
+   */
 
-    CONFIG_VARIABLE_INT(show_endoom),
+  CONFIG_VARIABLE_INT(show_endoom),
 
-    //!
-    // @game doom strife
-    //
-    // If non-zero, a disk activity indicator is displayed when data is read
-    // from disk. If zero, the disk activity indicator is not displayed.
-    //
+  /* @game doom strife
+   *
+   * If non-zero, a disk activity indicator is displayed when data is read
+   * from disk. If zero, the disk activity indicator is not displayed.
+   */
 
-    CONFIG_VARIABLE_INT(show_diskicon),
+  CONFIG_VARIABLE_INT(show_diskicon),
 
-    //!
-    // If non-zero, save screenshots in PNG format. If zero, screenshots are
-    // saved in PCX format, as Vanilla Doom does.
-    //
+  /* If non-zero, save screenshots in PNG format. If zero, screenshots are
+   * saved in PCX format, as Vanilla Doom does.
+   */
 
-    CONFIG_VARIABLE_INT(png_screenshots),
+  CONFIG_VARIABLE_INT(png_screenshots),
 
-    //!
-    // Sound output sample rate, in Hz.  Typical values to use are
-    // 11025, 22050, 44100 and 48000.
-    //
+  /* Sound output sample rate, in Hz.  Typical values to use are
+   * 11025, 22050, 44100 and 48000.
+   */
 
-    CONFIG_VARIABLE_INT(snd_samplerate),
+  CONFIG_VARIABLE_INT(snd_samplerate),
 
-    //!
-    // Maximum number of bytes to allocate for caching converted sound
-    // effects in memory. If set to zero, there is no limit applied.
-    //
+  /* Maximum number of bytes to allocate for caching converted sound
+   * effects in memory. If set to zero, there is no limit applied.
+   */
 
-    CONFIG_VARIABLE_INT(snd_cachesize),
+  CONFIG_VARIABLE_INT(snd_cachesize),
 
-    //!
-    // Maximum size of the output sound buffer size in milliseconds.
-    // Sound output is generated periodically in slices. Higher values
-    // might be more efficient but will introduce latency to the
-    // sound output. The default is 28ms (one slice per tic with the
-    // 35fps timer).
-    //
+  /* Maximum size of the output sound buffer size in milliseconds.
+   * Sound output is generated periodically in slices. Higher values
+   * might be more efficient but will introduce latency to the
+   * sound output. The default is 28ms (one slice per tic with the
+   * 35fps timer).
+   */
 
-    CONFIG_VARIABLE_INT(snd_maxslicetime_ms),
+  CONFIG_VARIABLE_INT(snd_maxslicetime_ms),
 
-    //!
-    // If non-zero, sound effects will have their pitch varied up or
-    // down by a random amount during play. If zero, sound effects
-    // play back at their default pitch.
-    //
+  /* If non-zero, sound effects will have their pitch varied up or
+   * down by a random amount during play. If zero, sound effects
+   * play back at their default pitch.
+   */
 
-    CONFIG_VARIABLE_INT(snd_pitchshift),
+  CONFIG_VARIABLE_INT(snd_pitchshift),
 
-    //!
-    // External command to invoke to perform MIDI playback. If set to
-    // the empty string, SDL_mixer's internal MIDI playback is used.
-    // This only has any effect when snd_musicdevice is set to General
-    // MIDI output.
-    //
+  /* External command to invoke to perform MIDI playback. If set to
+   * the empty string, SDL_mixer's internal MIDI playback is used.
+   * This only has any effect when snd_musicdevice is set to General
+   * MIDI output.
+   */
 
-    CONFIG_VARIABLE_STRING(snd_musiccmd),
+  CONFIG_VARIABLE_STRING(snd_musiccmd),
 
-    //!
-    // Value to set for the DMXOPTION environment variable. If this contains
-    // "-opl3", output for an OPL3 chip is generated when in OPL MIDI
-    // playback mode.
-    //
+  /* Controls whether libsamplerate support is used for performing
+   * sample rate conversions of sound effects.  Support for this
+   * must be compiled into the program.
+   *
+   * If zero, libsamplerate support is disabled.  If non-zero,
+   * libsamplerate is enabled. Increasing values roughly correspond
+   * to higher quality conversion; the higher the quality, the
+   * slower the conversion process.  Linear conversion = 1;
+   * Zero order hold = 2; Fast Sinc filter = 3; Medium quality
+   * Sinc filter = 4; High quality Sinc filter = 5.
+   */
 
-    CONFIG_VARIABLE_STRING(snd_dmxoption),
+  CONFIG_VARIABLE_INT(use_libsamplerate),
 
-    //!
-    // The I/O port to use to access the OPL chip.  Only relevant when
-    // using native OPL music playback.
-    //
+  /* Scaling factor used by libsamplerate. This is used when converting
+   * sounds internally back into integer form; normally it should not
+   * be necessary to change it from the default value. The only time
+   * it might be needed is if a PWAD file is loaded that contains very
+   * loud sounds, in which case the conversion may cause sound clipping
+   * and the scale factor should be reduced. The lower the value, the
+   * quieter the sound effects become, so it should be set as high as is
+   * possible without clipping occurring.
+   */
 
-    CONFIG_VARIABLE_INT_HEX(opl_io_port),
+  CONFIG_VARIABLE_FLOAT(libsamplerate_scale),
 
-    //!
-    // Controls whether libsamplerate support is used for performing
-    // sample rate conversions of sound effects.  Support for this
-    // must be compiled into the program.
-    //
-    // If zero, libsamplerate support is disabled.  If non-zero,
-    // libsamplerate is enabled. Increasing values roughly correspond
-    // to higher quality conversion; the higher the quality, the
-    // slower the conversion process.  Linear conversion = 1;
-    // Zero order hold = 2; Fast Sinc filter = 3; Medium quality
-    // Sinc filter = 4; High quality Sinc filter = 5.
-    //
+  /* Full path to a directory in which WAD files and dehacked patches
+   * can be placed to be automatically loaded on startup. A subdirectory
+   * of this directory matching the IWAD name is checked to find the
+   * files to load.
+   */
 
-    CONFIG_VARIABLE_INT(use_libsamplerate),
+  CONFIG_VARIABLE_STRING(autoload_path),
 
-    //!
-    // Scaling factor used by libsamplerate. This is used when converting
-    // sounds internally back into integer form; normally it should not
-    // be necessary to change it from the default value. The only time
-    // it might be needed is if a PWAD file is loaded that contains very
-    // loud sounds, in which case the conversion may cause sound clipping
-    // and the scale factor should be reduced. The lower the value, the
-    // quieter the sound effects become, so it should be set as high as is
-    // possible without clipping occurring.
+  /* Full path to a directory containing configuration files for
+   * substitute music packs. These packs contain high quality renderings
+   * of game music to be played instead of using the system's built-in
+   * MIDI playback.
+   */
 
-    CONFIG_VARIABLE_FLOAT(libsamplerate_scale),
-
-    //!
-    // Full path to a directory in which WAD files and dehacked patches
-    // can be placed to be automatically loaded on startup. A subdirectory
-    // of this directory matching the IWAD name is checked to find the
-    // files to load.
-
-    CONFIG_VARIABLE_STRING(autoload_path),
-
-    //!
-    // Full path to a directory containing configuration files for
-    // substitute music packs. These packs contain high quality renderings
-    // of game music to be played instead of using the system's built-in
-    // MIDI playback.
-    //
-
-    CONFIG_VARIABLE_STRING(music_pack_path),
+  CONFIG_VARIABLE_STRING(music_pack_path),
 
 #ifdef HAVE_FLUIDSYNTH
-    //!
-    // If 1, activate the FluidSynth chorus effects module. If 0, no chorus
-    // will be added to the output signal.
-    //
+  /* If 1, activate the FluidSynth chorus effects module. If 0, no chorus
+   * will be added to the output signal.
+   */
 
-    CONFIG_VARIABLE_INT(fsynth_chorus_active),
+  CONFIG_VARIABLE_INT(fsynth_chorus_active),
 
-    //!
-    // Specifies the modulation depth of the FluidSynth chorus. Default is
-    // 5.0, range is 0.0 to 256.0.
-    //
+  /* Specifies the modulation depth of the FluidSynth chorus. Default is
+   * 5.0, range is 0.0 to 256.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_chorus_depth),
+  CONFIG_VARIABLE_FLOAT(fsynth_chorus_depth),
 
-    //!
-    // Specifies the output amplitude of the FluidSynth chorus signal. Default
-    // is 0.35, range is 0.0 to 10.0.
-    //
+  /* Specifies the output amplitude of the FluidSynth chorus signal. Default
+   * is 0.35, range is 0.0 to 10.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_chorus_level),
+  CONFIG_VARIABLE_FLOAT(fsynth_chorus_level),
 
-    //!
-    // Sets the voice count of the FluidSynth chorus signal. Default is 3,
-    // range is 0 to 99.
-    //
+  /* Sets the voice count of the FluidSynth chorus signal. Default is 3,
+   * range is 0 to 99.
+   */
 
-    CONFIG_VARIABLE_INT(fsynth_chorus_nr),
+  CONFIG_VARIABLE_INT(fsynth_chorus_nr),
 
-    //!
-    // Sets the FluidSynth chorus modulation speed in Hz. Default is 0.3,
-    // range is 0.1 to 5.0.
-    //
+  /* Sets the FluidSynth chorus modulation speed in Hz. Default is 0.3,
+   * range is 0.1 to 5.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_chorus_speed),
+  CONFIG_VARIABLE_FLOAT(fsynth_chorus_speed),
 
-    //!
-    // This setting defines how FluidSynth interprets Bank Select messages. The
-    // default is "gs". Other possible values are "gm", "xg" and "mma".
-    //
+  /* This setting defines how FluidSynth interprets Bank Select messages.
+   * The default is "gs". Other possible values are "gm", "xg" and "mma".
+   */
 
-    CONFIG_VARIABLE_STRING(fsynth_midibankselect),
+  CONFIG_VARIABLE_STRING(fsynth_midibankselect),
 
-    //!
-    // Sets the number of FluidSynth voices that can be played in parallel.
-    // Default is 256, range is 1 - 65535.
-    //
+  /* Sets the number of FluidSynth voices that can be played in parallel.
+   * Default is 256, range is 1 - 65535.
+   */
 
-    CONFIG_VARIABLE_INT(fsynth_polyphony),
+  CONFIG_VARIABLE_INT(fsynth_polyphony),
 
-    //!
-    // If 1, activate the FluidSynth reverb effects module. If 0, no reverb
-    // will be added to the output signal.
-    //
+  /* If 1, activate the FluidSynth reverb effects module. If 0, no reverb
+   * will be added to the output signal.
+   */
 
-    CONFIG_VARIABLE_INT(fsynth_reverb_active),
+  CONFIG_VARIABLE_INT(fsynth_reverb_active),
 
-    //!
-    // Sets the amount of FluidSynth reverb damping. Default is 0.4, range is
-    // 0.0 to 1.0.
-    //
+  /* Sets the amount of FluidSynth reverb damping. Default is 0.4, range is
+   * 0.0 to 1.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_reverb_damp),
+  CONFIG_VARIABLE_FLOAT(fsynth_reverb_damp),
 
-    //!
-    // Sets the FluidSynth reverb amplitude. Default is 0.15, range is 0.0 -
-    // 1.0.
-    //
+  /* Sets the FluidSynth reverb amplitude. Default is 0.15, range is 0.0 -
+   * 1.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_reverb_level),
+  CONFIG_VARIABLE_FLOAT(fsynth_reverb_level),
 
-    //!
-    // Sets the room size(i.e. amount of wet) FluidSynth reverb. Default is
-    // 0.6, range is 0.0 - 1.0.
-    //
+  /* Sets the room size(i.e. amount of wet) FluidSynth reverb. Default is
+   * 0.6, range is 0.0 - 1.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_reverb_roomsize),
+  CONFIG_VARIABLE_FLOAT(fsynth_reverb_roomsize),
 
-    //!
-    // Sets the stereo spread of the FluidSynth reverb signal. Default is
-    // 0.4, range is 0.0 - 100.0.
-    //
+  /* Sets the stereo spread of the FluidSynth reverb signal. Default is
+   * 0.4, range is 0.0 - 100.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_reverb_width),
+  CONFIG_VARIABLE_FLOAT(fsynth_reverb_width),
 
-    //!
-    // Fine tune the FluidSynth output level. Default is 1.0,
-    // range is 0.0 - 10.0.
-    //
+  /* Fine tune the FluidSynth output level. Default is 1.0,
+   * range is 0.0 - 10.0.
+   */
 
-    CONFIG_VARIABLE_FLOAT(fsynth_gain),
+  CONFIG_VARIABLE_FLOAT(fsynth_gain),
 
-    //!
-    // Full path to a soundfont file to use with FluidSynth MIDI playback.
-    //
+  /* Full path to a soundfont file to use with FluidSynth MIDI playback. */
 
-    CONFIG_VARIABLE_STRING(fsynth_sf_path),
-#endif // HAVE_FLUIDSYNTH
+  CONFIG_VARIABLE_STRING(fsynth_sf_path),
+#endif /* HAVE_FLUIDSYNTH */
 
-    //!
-    // Full path to a Timidity configuration file to use for MIDI
-    // playback. The file will be evaluated from the directory where
-    // it is evaluated, so there is no need to add "dir" commands
-    // into it.
-    //
+  /* Full path to a Timidity configuration file to use for MIDI
+   * playback. The file will be evaluated from the directory where
+   * it is evaluated, so there is no need to add "dir" commands
+   * into it.
+   */
 
-    CONFIG_VARIABLE_STRING(timidity_cfg_path),
+  CONFIG_VARIABLE_STRING(timidity_cfg_path),
 
-    //!
-    // Path to GUS patch files to use when operating in GUS emulation
-    // mode.
-    //
+  /* Path to GUS patch files to use when operating in GUS emulation
+   * mode.
+   */
 
-    CONFIG_VARIABLE_STRING(gus_patch_path),
+  CONFIG_VARIABLE_STRING(gus_patch_path),
 
-    //!
-    // Number of kilobytes of RAM to use in GUS emulation mode. Valid
-    // values are 256, 512, 768 or 1024.
-    //
+  /* Number of kilobytes of RAM to use in GUS emulation mode. Valid
+   * values are 256, 512, 768 or 1024.
+   */
 
-    CONFIG_VARIABLE_INT(gus_ram_kb),
+  CONFIG_VARIABLE_INT(gus_ram_kb),
 
-#ifdef _WIN32
-    //!
-    // MIDI device for native Windows MIDI.
-    //
+  /* @game doom strife
+   *
+   * If non-zero, the Vanilla savegame limit is enforced; if the
+   * savegame exceeds 180224 bytes in size, the game will exit with
+   * an error.  If this has a value of zero, there is no limit to
+   * the size of savegames.
+   */
 
-    CONFIG_VARIABLE_STRING(winmm_midi_device),
+  CONFIG_VARIABLE_INT(vanilla_savegame_limit),
 
-    //!
-    // Compatibility level for native Windows MIDI, default 0. Valid values are
-    // 0 (Vanilla), 1 (Standard), 2 (Full).
-    //
+  /* @game doom strife
+   *
+   * If non-zero, the Vanilla demo size limit is enforced; the game
+   * exits with an error when a demo exceeds the demo size limit
+   * (128KiB by default).  If this has a value of zero, there is no
+   * limit to the size of demos.
+   */
 
-    CONFIG_VARIABLE_INT(winmm_complevel),
+  CONFIG_VARIABLE_INT(vanilla_demo_limit),
 
-    //!
-    // Reset device type for native Windows MIDI, default 1. Valid values are
-    // 0 (None), 1 (GM Mode), 2 (GS Mode), 3 (XG Mode).
-    //
+  /* If non-zero, the game behaves like Vanilla Doom, always assuming
+   * an American keyboard mapping.  If this has a value of zero, the
+   * native keyboard mapping of the keyboard is used.
+   */
 
-    CONFIG_VARIABLE_INT(winmm_reset_type),
+  CONFIG_VARIABLE_INT(vanilla_keyboard_mapping),
 
-    //!
-    // Reset device delay for native Windows MIDI, default 0, median value 100 ms.
-    //
+  /* Name to use in network games for identification.  This is only
+   * used on the "waiting" screen while waiting for the game to start.
+   */
 
-    CONFIG_VARIABLE_INT(winmm_reset_delay),
-#endif
+  CONFIG_VARIABLE_STRING(player_name),
 
-    //!
-    // @game doom strife
-    //
-    // If non-zero, the Vanilla savegame limit is enforced; if the
-    // savegame exceeds 180224 bytes in size, the game will exit with
-    // an error.  If this has a value of zero, there is no limit to
-    // the size of savegames.
-    //
+  /* If this is non-zero, the mouse will be "grabbed" when running
+   * in windowed mode so that it can be used as an input device.
+   * When running full screen, this has no effect.
+   */
 
-    CONFIG_VARIABLE_INT(vanilla_savegame_limit),
+  CONFIG_VARIABLE_INT(grabmouse),
 
-    //!
-    // @game doom strife
-    //
-    // If non-zero, the Vanilla demo size limit is enforced; the game
-    // exits with an error when a demo exceeds the demo size limit
-    // (128KiB by default).  If this has a value of zero, there is no
-    // limit to the size of demos.
-    //
+  /* If non-zero, all vertical mouse movement is ignored.  This
+   * emulates the behavior of the "novert" tool available under DOS
+   * that performs the same function.
+   */
 
-    CONFIG_VARIABLE_INT(vanilla_demo_limit),
+  CONFIG_VARIABLE_INT(novert),
 
-    //!
-    // If non-zero, the game behaves like Vanilla Doom, always assuming
-    // an American keyboard mapping.  If this has a value of zero, the
-    // native keyboard mapping of the keyboard is used.
-    //
+  /* Mouse acceleration factor.  When the speed of mouse movement
+   * exceeds the threshold value (mouse_threshold), the speed is
+   * multiplied by this value.
+   */
 
-    CONFIG_VARIABLE_INT(vanilla_keyboard_mapping),
+  CONFIG_VARIABLE_FLOAT(mouse_acceleration),
 
-    //!
-    // Name to use in network games for identification.  This is only
-    // used on the "waiting" screen while waiting for the game to start.
-    //
+  /* Mouse acceleration threshold.  When the speed of mouse movement
+   * exceeds this threshold value, the speed is multiplied by an
+   * acceleration factor (mouse_acceleration).
+   */
 
-    CONFIG_VARIABLE_STRING(player_name),
+  CONFIG_VARIABLE_INT(mouse_threshold),
 
-    //!
-    // If this is non-zero, the mouse will be "grabbed" when running
-    // in windowed mode so that it can be used as an input device.
-    // When running full screen, this has no effect.
-    //
+  /* Mouse button to strafe left. */
 
-    CONFIG_VARIABLE_INT(grabmouse),
+  CONFIG_VARIABLE_INT(mouseb_strafeleft),
 
-    //!
-    // If non-zero, all vertical mouse movement is ignored.  This
-    // emulates the behavior of the "novert" tool available under DOS
-    // that performs the same function.
-    //
+  /* Mouse button to strafe right. */
 
-    CONFIG_VARIABLE_INT(novert),
+  CONFIG_VARIABLE_INT(mouseb_straferight),
 
-    //!
-    // Mouse acceleration factor.  When the speed of mouse movement
-    // exceeds the threshold value (mouse_threshold), the speed is
-    // multiplied by this value.
-    //
+  /* Mouse button to turn left. */
 
-    CONFIG_VARIABLE_FLOAT(mouse_acceleration),
+  CONFIG_VARIABLE_INT(mouseb_turnleft),
 
-    //!
-    // Mouse acceleration threshold.  When the speed of mouse movement
-    // exceeds this threshold value, the speed is multiplied by an
-    // acceleration factor (mouse_acceleration).
-    //
+  /* Mouse button to turn right. */
 
-    CONFIG_VARIABLE_INT(mouse_threshold),
+  CONFIG_VARIABLE_INT(mouseb_turnright),
 
-    //!
-    // Mouse button to strafe left.
-    //
+  /* Mouse button to "use" an object, eg. a door or switch. */
 
-    CONFIG_VARIABLE_INT(mouseb_strafeleft),
+  CONFIG_VARIABLE_INT(mouseb_use),
 
-    //!
-    // Mouse button to strafe right.
-    //
+  /* Mouse button to move backwards. */
 
-    CONFIG_VARIABLE_INT(mouseb_straferight),
+  CONFIG_VARIABLE_INT(mouseb_backward),
 
-    //!
-    // Mouse button to turn left.
-    //
+  /* Mouse button to cycle to the previous weapon. */
 
-    CONFIG_VARIABLE_INT(mouseb_turnleft),
+  CONFIG_VARIABLE_INT(mouseb_prevweapon),
 
-    //!
-    // Mouse button to turn right.
-    //
+  /* Mouse button to cycle to the next weapon. */
 
-    CONFIG_VARIABLE_INT(mouseb_turnright),
+  CONFIG_VARIABLE_INT(mouseb_nextweapon),
 
-    //!
-    // Mouse button to "use" an object, eg. a door or switch.
-    //
+  /* @game heretic
+   *
+   * Mouse button to move to the left in the inventory.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_use),
+  CONFIG_VARIABLE_INT(mouseb_invleft),
 
-    //!
-    // Mouse button to move backwards.
-    //
+  /* @game heretic
+   *
+   * Mouse button to move to the right in the inventory.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_backward),
+  CONFIG_VARIABLE_INT(mouseb_invright),
 
-    //!
-    // Mouse button to cycle to the previous weapon.
-    //
+  /* @game heretic hexen
+   *
+   * Mouse button to use artifact.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_prevweapon),
+  CONFIG_VARIABLE_INT(mouseb_useartifact),
 
-    //!
-    // Mouse button to cycle to the next weapon.
-    //
+  /* If non-zero, double-clicking a mouse button acts like pressing
+   * the "use" key to use an object in-game, eg. a door or switch.
+   */
 
-    CONFIG_VARIABLE_INT(mouseb_nextweapon),
-    
-    //!
-    // @game heretic
-    //
-    // Mouse button to move to the left in the inventory.
-    //
+  CONFIG_VARIABLE_INT(dclick_use),
 
-    CONFIG_VARIABLE_INT(mouseb_invleft),
+  /* SDL GUID string indicating the joystick to use. An empty string
+   * indicates that no joystick is configured.
+   */
 
-    //!
-    // @game heretic
-    //
-    // Mouse button to move to the right in the inventory.
-    //
+  CONFIG_VARIABLE_STRING(joystick_guid),
 
-    CONFIG_VARIABLE_INT(mouseb_invright),
+  /* Index of SDL joystick to use; this is only used in the case where
+   * multiple identical joystick devices are connected which have the
+   * same GUID, to distinguish between devices.
+   */
 
-    //!
-    // @game heretic hexen
-    //
-    // Mouse button to use artifact.
-    //
+  CONFIG_VARIABLE_INT(joystick_index),
 
-    CONFIG_VARIABLE_INT(mouseb_useartifact),
+  /* If non-zero, use analog movement when playing with a gamepad. */
 
-    //!
-    // If non-zero, double-clicking a mouse button acts like pressing
-    // the "use" key to use an object in-game, eg. a door or switch.
-    //
+  CONFIG_VARIABLE_INT(use_analog),
 
-    CONFIG_VARIABLE_INT(dclick_use),
+  /* Joystick axis to use to for horizontal (X) movement. */
 
-    //!
-    // SDL GUID string indicating the joystick to use. An empty string
-    // indicates that no joystick is configured.
-    //
+  CONFIG_VARIABLE_INT(joystick_x_axis),
 
-    CONFIG_VARIABLE_STRING(joystick_guid),
+  /* If non-zero, movement on the horizontal joystick axis is inverted. */
 
-    //!
-    // Index of SDL joystick to use; this is only used in the case where
-    // multiple identical joystick devices are connected which have the
-    // same GUID, to distinguish between devices.
-    //
+  CONFIG_VARIABLE_INT(joystick_x_invert),
 
-    CONFIG_VARIABLE_INT(joystick_index),
+  /* Joystick turn analog sensitivity, specified as a value between 0
+   * and 20.
+   */
 
-    //!
-    // If non-zero, use analog movement when playing with a gamepad.
-    //
+  CONFIG_VARIABLE_INT(joystick_turn_sensitivity),
 
-    CONFIG_VARIABLE_INT(use_analog),
+  /* Joystick axis to use to for vertical (Y) movement. */
 
-    //!
-    // Joystick axis to use to for horizontal (X) movement.
-    //
+  CONFIG_VARIABLE_INT(joystick_y_axis),
 
-    CONFIG_VARIABLE_INT(joystick_x_axis),
+  /* If non-zero, movement on the vertical joystick axis is inverted. */
 
-    //!
-    // If non-zero, movement on the horizontal joystick axis is inverted.
-    //
+  CONFIG_VARIABLE_INT(joystick_y_invert),
 
-    CONFIG_VARIABLE_INT(joystick_x_invert),
+  /* Joystick axis to use to for strafing movement. */
 
-    //!
-    // Joystick turn analog sensitivity, specified as a value between 0 and 20.
-    //
+  CONFIG_VARIABLE_INT(joystick_strafe_axis),
 
-    CONFIG_VARIABLE_INT(joystick_turn_sensitivity),
+  /* If non-zero, movement on the joystick axis used for strafing
+   * is inverted.
+   */
 
-    //!
-    // Joystick axis to use to for vertical (Y) movement.
-    //
+  CONFIG_VARIABLE_INT(joystick_strafe_invert),
 
-    CONFIG_VARIABLE_INT(joystick_y_axis),
+  /* Joystick move and strafe analog sensitivity, specified as a value
+   * between 0 and 20.
+   */
 
-    //!
-    // If non-zero, movement on the vertical joystick axis is inverted.
-    //
+  CONFIG_VARIABLE_INT(joystick_move_sensitivity),
 
-    CONFIG_VARIABLE_INT(joystick_y_invert),
+  /* Joystick axis to use to for looking up and down. */
 
-    //!
-    // Joystick axis to use to for strafing movement.
-    //
+  CONFIG_VARIABLE_INT(joystick_look_axis),
 
-    CONFIG_VARIABLE_INT(joystick_strafe_axis),
+  /* If non-zero, movement on the joystick axis used for looking
+   * is inverted.
+   */
 
-    //!
-    // If non-zero, movement on the joystick axis used for strafing
-    // is inverted.
-    //
+  CONFIG_VARIABLE_INT(joystick_look_invert),
 
-    CONFIG_VARIABLE_INT(joystick_strafe_invert),
+  /* Joystick look analog sensitivity, specified as a value between 0
+   * and 20.
+   */
 
-    //!
-    // Joystick move and strafe analog sensitivity, specified as a value
-    // between 0 and 20.
-    //
+  CONFIG_VARIABLE_INT(joystick_look_sensitivity),
 
-    CONFIG_VARIABLE_INT(joystick_move_sensitivity),
-    //!
-    // Joystick axis to use to for looking up and down.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #0.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_look_axis),
+  CONFIG_VARIABLE_INT(joystick_physical_button0),
 
-    //!
-    // If non-zero, movement on the joystick axis used for looking
-    // is inverted.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #1.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_look_invert),
+  CONFIG_VARIABLE_INT(joystick_physical_button1),
 
-    //!
-    // Joystick look analog sensitivity, specified as a value between 0 and 20.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #2.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_look_sensitivity),
+  CONFIG_VARIABLE_INT(joystick_physical_button2),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #0.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #3.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button0),
+  CONFIG_VARIABLE_INT(joystick_physical_button3),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #1.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #4.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button1),
+  CONFIG_VARIABLE_INT(joystick_physical_button4),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #2.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #5.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button2),
+  CONFIG_VARIABLE_INT(joystick_physical_button5),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #3.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #6.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button3),
+  CONFIG_VARIABLE_INT(joystick_physical_button6),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #4.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #7.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button4),
+  CONFIG_VARIABLE_INT(joystick_physical_button7),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #5.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #8.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button5),
+  CONFIG_VARIABLE_INT(joystick_physical_button8),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #6.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #9.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button6),
+  CONFIG_VARIABLE_INT(joystick_physical_button9),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #7.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #10.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button7),
+  CONFIG_VARIABLE_INT(joystick_physical_button10),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #8.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #11.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button8),
+  CONFIG_VARIABLE_INT(joystick_physical_button11),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #9.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #12.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button9),
+  CONFIG_VARIABLE_INT(joystick_physical_button12),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #10.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #13.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button10),
+  CONFIG_VARIABLE_INT(joystick_physical_button13),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #11.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #14.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button11),
+  CONFIG_VARIABLE_INT(joystick_physical_button14),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #12.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #15.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button12),
+  CONFIG_VARIABLE_INT(joystick_physical_button15),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #13.
-    //
+  /* The physical joystick button that corresponds to joystick
+   * virtual button #16.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button13),
+  CONFIG_VARIABLE_INT(joystick_physical_button16),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #14.
-    //
+  /* If non-zero, use the SDL_GameController interface instead of the
+   * SDL_Joystick interface.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button14),
+  CONFIG_VARIABLE_INT(use_gamepad),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #15.
-    //
+  /* Stores the SDL_GameControllerType of the last configured gamepad. */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button15),
+  CONFIG_VARIABLE_INT(gamepad_type),
 
-    //!
-    // The physical joystick button that corresponds to joystick
-    // virtual button #16.
-    //
+  /* Joystick x axis dead zone, specified as a percentage of the axis max
+   * value.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_physical_button16),
+  CONFIG_VARIABLE_INT(joystick_x_dead_zone),
 
-    //!
-    // If non-zero, use the SDL_GameController interface instead of the
-    // SDL_Joystick interface.
-    //
+  /* Joystick y axis dead zone, specified as a percentage of the axis max
+   * value.
+   */
 
-    CONFIG_VARIABLE_INT(use_gamepad),
+  CONFIG_VARIABLE_INT(joystick_y_dead_zone),
 
-    //!
-    // Stores the SDL_GameControllerType of the last configured gamepad.
-    //
+  /* Joystick strafe axis dead zone, specified as a percentage of the axis
+   * max value.
+   */
 
-    CONFIG_VARIABLE_INT(gamepad_type),
+  CONFIG_VARIABLE_INT(joystick_strafe_dead_zone),
 
-    //!
-    // Joystick x axis dead zone, specified as a percentage of the axis max
-    // value.
-    //
+  /* Joystick look axis dead zone, specified as a percentage of the axis max
+   * value.
+   */
 
-    CONFIG_VARIABLE_INT(joystick_x_dead_zone),
+  CONFIG_VARIABLE_INT(joystick_look_dead_zone),
 
-    //!
-    // Joystick y axis dead zone, specified as a percentage of the axis max
-    // value.
-    //
+  /* Joystick virtual button to make the player strafe left. */
 
-    CONFIG_VARIABLE_INT(joystick_y_dead_zone),
+  CONFIG_VARIABLE_INT(joyb_strafeleft),
 
-    //!
-    // Joystick strafe axis dead zone, specified as a percentage of the axis
-    // max value.
-    //
+  /* Joystick virtual button to make the player strafe right. */
 
-    CONFIG_VARIABLE_INT(joystick_strafe_dead_zone),
+  CONFIG_VARIABLE_INT(joyb_straferight),
 
-    //!
-    // Joystick look axis dead zone, specified as a percentage of the axis max
-    // value.
-    //
+  /* Joystick virtual button to activate the menu. */
 
-    CONFIG_VARIABLE_INT(joystick_look_dead_zone),
+  CONFIG_VARIABLE_INT(joyb_menu_activate),
 
-    //!
-    // Joystick virtual button to make the player strafe left.
-    //
+  /* Joystick virtual button to toggle the automap. */
 
-    CONFIG_VARIABLE_INT(joyb_strafeleft),
+  CONFIG_VARIABLE_INT(joyb_toggle_automap),
 
-    //!
-    // Joystick virtual button to make the player strafe right.
-    //
+  /* Joystick virtual button that cycles to the previous weapon. */
 
-    CONFIG_VARIABLE_INT(joyb_straferight),
+  CONFIG_VARIABLE_INT(joyb_prevweapon),
 
-    //!
-    // Joystick virtual button to activate the menu.
-    //
+  /* Joystick virtual button that cycles to the next weapon. */
 
-    CONFIG_VARIABLE_INT(joyb_menu_activate),
+  CONFIG_VARIABLE_INT(joyb_nextweapon),
 
-    //!
-    // Joystick virtual button to toggle the automap.
-    //
+  /* @game heretic hexen
+   * Joystick virtual button to activate artifact.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_toggle_automap),
+  CONFIG_VARIABLE_INT(joyb_useartifact),
 
-    //!
-    // Joystick virtual button that cycles to the previous weapon.
-    //
+  /* @game heretic hexen
+   * Joystick virtual button to move left in the inventory.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_prevweapon),
+  CONFIG_VARIABLE_INT(joyb_invleft),
 
-    //!
-    // Joystick virtual button that cycles to the next weapon.
-    //
+  /* @game heretic hexen
+   * Joystick virtual button to move right in the inventory.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_nextweapon),
+  CONFIG_VARIABLE_INT(joyb_invright),
 
-    //!
-    // @game heretic hexen
-    // Joystick virtual button to activate artifact.
-    //
+  /* @game heretic hexen
+   * Joystick virtual button to fly up.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_useartifact),
+  CONFIG_VARIABLE_INT(joyb_flyup),
 
-    //!
-    // @game heretic hexen
-    // Joystick virtual button to move left in the inventory.
-    //
+  /* @game heretic hexen
+   * Joystick virtual button to fly down.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_invleft),
+  CONFIG_VARIABLE_INT(joyb_flydown),
 
-    //!
-    // @game heretic hexen
-    // Joystick virtual button to move right in the inventory.
-    //
+  /* @game heretic hexen
+   * Joystick virtual button to center flying.
+   */
 
-    CONFIG_VARIABLE_INT(joyb_invright),
+  CONFIG_VARIABLE_INT(joyb_flycenter),
 
-    //!
-    // @game heretic hexen
-    // Joystick virtual button to fly up.
-    //
+  /* Key to pause or unpause the game. */
 
-    CONFIG_VARIABLE_INT(joyb_flyup),
+  CONFIG_VARIABLE_KEY(key_pause),
 
-    //!
-    // @game heretic hexen
-    // Joystick virtual button to fly down.
-    //
+  /* Key that activates the menu when pressed. */
 
-    CONFIG_VARIABLE_INT(joyb_flydown),
+  CONFIG_VARIABLE_KEY(key_menu_activate),
 
-    //!
-    // @game heretic hexen
-    // Joystick virtual button to center flying.
-    //
+  /* Key that moves the cursor up on the menu. */
 
-    CONFIG_VARIABLE_INT(joyb_flycenter),
+  CONFIG_VARIABLE_KEY(key_menu_up),
 
-    //!
-    // Key to pause or unpause the game.
-    //
+  /* Key that moves the cursor down on the menu. */
 
-    CONFIG_VARIABLE_KEY(key_pause),
+  CONFIG_VARIABLE_KEY(key_menu_down),
 
-    //!
-    // Key that activates the menu when pressed.
-    //
+  /* Key that moves the currently selected slider on the menu left. */
 
-    CONFIG_VARIABLE_KEY(key_menu_activate),
+  CONFIG_VARIABLE_KEY(key_menu_left),
 
-    //!
-    // Key that moves the cursor up on the menu.
-    //
+  /* Key that moves the currently selected slider on the menu right. */
 
-    CONFIG_VARIABLE_KEY(key_menu_up),
+  CONFIG_VARIABLE_KEY(key_menu_right),
 
-    //!
-    // Key that moves the cursor down on the menu.
-    //
+  /* Key to go back to the previous menu. */
 
-    CONFIG_VARIABLE_KEY(key_menu_down),
+  CONFIG_VARIABLE_KEY(key_menu_back),
 
-    //!
-    // Key that moves the currently selected slider on the menu left.
-    //
+  /* Key to activate the currently selected menu item. */
 
-    CONFIG_VARIABLE_KEY(key_menu_left),
+  CONFIG_VARIABLE_KEY(key_menu_forward),
 
-    //!
-    // Key that moves the currently selected slider on the menu right.
-    //
+  /* Key to answer 'yes' to a question in the menu. */
 
-    CONFIG_VARIABLE_KEY(key_menu_right),
+  CONFIG_VARIABLE_KEY(key_menu_confirm),
 
-    //!
-    // Key to go back to the previous menu.
-    //
+  /* Key to answer 'no' to a question in the menu. */
 
-    CONFIG_VARIABLE_KEY(key_menu_back),
+  CONFIG_VARIABLE_KEY(key_menu_abort),
 
-    //!
-    // Key to activate the currently selected menu item.
-    //
+  /* Keyboard shortcut to bring up the help screen. */
 
-    CONFIG_VARIABLE_KEY(key_menu_forward),
+  CONFIG_VARIABLE_KEY(key_menu_help),
 
-    //!
-    // Key to answer 'yes' to a question in the menu.
-    //
+  /* Keyboard shortcut to bring up the save game menu. */
 
-    CONFIG_VARIABLE_KEY(key_menu_confirm),
+  CONFIG_VARIABLE_KEY(key_menu_save),
 
-    //!
-    // Key to answer 'no' to a question in the menu.
-    //
+  /* Keyboard shortcut to bring up the load game menu. */
 
-    CONFIG_VARIABLE_KEY(key_menu_abort),
+  CONFIG_VARIABLE_KEY(key_menu_load),
 
-    //!
-    // Keyboard shortcut to bring up the help screen.
-    //
+  /* Keyboard shortcut to bring up the sound volume menu. */
 
-    CONFIG_VARIABLE_KEY(key_menu_help),
+  CONFIG_VARIABLE_KEY(key_menu_volume),
 
-    //!
-    // Keyboard shortcut to bring up the save game menu.
-    //
+  /* Keyboard shortcut to toggle the detail level. */
 
-    CONFIG_VARIABLE_KEY(key_menu_save),
+  CONFIG_VARIABLE_KEY(key_menu_detail),
 
-    //!
-    // Keyboard shortcut to bring up the load game menu.
-    //
+  /* Keyboard shortcut to quicksave the current game. */
 
-    CONFIG_VARIABLE_KEY(key_menu_load),
+  CONFIG_VARIABLE_KEY(key_menu_qsave),
 
-    //!
-    // Keyboard shortcut to bring up the sound volume menu.
-    //
+  /* Keyboard shortcut to end the game. */
 
-    CONFIG_VARIABLE_KEY(key_menu_volume),
+  CONFIG_VARIABLE_KEY(key_menu_endgame),
 
-    //!
-    // Keyboard shortcut to toggle the detail level.
-    //
+  /* Keyboard shortcut to toggle heads-up messages. */
 
-    CONFIG_VARIABLE_KEY(key_menu_detail),
+  CONFIG_VARIABLE_KEY(key_menu_messages),
 
-    //!
-    // Keyboard shortcut to quicksave the current game.
-    //
+  /* Keyboard shortcut to load the last quicksave. */
 
-    CONFIG_VARIABLE_KEY(key_menu_qsave),
+  CONFIG_VARIABLE_KEY(key_menu_qload),
 
-    //!
-    // Keyboard shortcut to end the game.
-    //
+  /* Keyboard shortcut to quit the game. */
 
-    CONFIG_VARIABLE_KEY(key_menu_endgame),
+  CONFIG_VARIABLE_KEY(key_menu_quit),
 
-    //!
-    // Keyboard shortcut to toggle heads-up messages.
-    //
+  /* Keyboard shortcut to toggle the gamma correction level. */
 
-    CONFIG_VARIABLE_KEY(key_menu_messages),
+  CONFIG_VARIABLE_KEY(key_menu_gamma),
 
-    //!
-    // Keyboard shortcut to load the last quicksave.
-    //
+  /* Keyboard shortcut to switch view in multiplayer. */
 
-    CONFIG_VARIABLE_KEY(key_menu_qload),
+  CONFIG_VARIABLE_KEY(key_spy),
 
-    //!
-    // Keyboard shortcut to quit the game.
-    //
+  /* Keyboard shortcut to increase the screen size. */
 
-    CONFIG_VARIABLE_KEY(key_menu_quit),
+  CONFIG_VARIABLE_KEY(key_menu_incscreen),
 
-    //!
-    // Keyboard shortcut to toggle the gamma correction level.
-    //
+  /* Keyboard shortcut to decrease the screen size. */
 
-    CONFIG_VARIABLE_KEY(key_menu_gamma),
+  CONFIG_VARIABLE_KEY(key_menu_decscreen),
 
-    //!
-    // Keyboard shortcut to switch view in multiplayer.
-    //
+  /* Keyboard shortcut to save a screenshot. */
 
-    CONFIG_VARIABLE_KEY(key_spy),
+  CONFIG_VARIABLE_KEY(key_menu_screenshot),
 
-    //!
-    // Keyboard shortcut to increase the screen size.
-    //
+  /* Key to toggle the map view. */
 
-    CONFIG_VARIABLE_KEY(key_menu_incscreen),
+  CONFIG_VARIABLE_KEY(key_map_toggle),
 
-    //!
-    // Keyboard shortcut to decrease the screen size.
-    //
+  /* Key to pan north when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_menu_decscreen),
+  CONFIG_VARIABLE_KEY(key_map_north),
 
-    //!
-    // Keyboard shortcut to save a screenshot.
-    //
+  /* Key to pan south when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_menu_screenshot),
+  CONFIG_VARIABLE_KEY(key_map_south),
 
-    //!
-    // Key to toggle the map view.
-    //
+  /* Key to pan east when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_toggle),
+  CONFIG_VARIABLE_KEY(key_map_east),
 
-    //!
-    // Key to pan north when in the map view.
-    //
+  /* Key to pan west when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_north),
+  CONFIG_VARIABLE_KEY(key_map_west),
 
-    //!
-    // Key to pan south when in the map view.
-    //
+  /* Key to zoom in when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_south),
+  CONFIG_VARIABLE_KEY(key_map_zoomin),
 
-    //!
-    // Key to pan east when in the map view.
-    //
+  /* Key to zoom out when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_east),
+  CONFIG_VARIABLE_KEY(key_map_zoomout),
 
-    //!
-    // Key to pan west when in the map view.
-    //
+  /* Key to zoom out the maximum amount when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_west),
+  CONFIG_VARIABLE_KEY(key_map_maxzoom),
 
-    //!
-    // Key to zoom in when in the map view.
-    //
+  /* Key to toggle follow mode when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_zoomin),
+  CONFIG_VARIABLE_KEY(key_map_follow),
 
-    //!
-    // Key to zoom out when in the map view.
-    //
+  /* Key to toggle the grid display when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_zoomout),
+  CONFIG_VARIABLE_KEY(key_map_grid),
 
-    //!
-    // Key to zoom out the maximum amount when in the map view.
-    //
+  /* Key to set a mark when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_maxzoom),
+  CONFIG_VARIABLE_KEY(key_map_mark),
 
-    //!
-    // Key to toggle follow mode when in the map view.
-    //
+  /* Key to clear all marks when in the map view. */
 
-    CONFIG_VARIABLE_KEY(key_map_follow),
+  CONFIG_VARIABLE_KEY(key_map_clearmark),
 
-    //!
-    // Key to toggle the grid display when in the map view.
-    //
+  /* Key to select weapon 1. */
 
-    CONFIG_VARIABLE_KEY(key_map_grid),
+  CONFIG_VARIABLE_KEY(key_weapon1),
 
-    //!
-    // Key to set a mark when in the map view.
-    //
+  /* Key to select weapon 2. */
 
-    CONFIG_VARIABLE_KEY(key_map_mark),
+  CONFIG_VARIABLE_KEY(key_weapon2),
 
-    //!
-    // Key to clear all marks when in the map view.
-    //
+  /* Key to select weapon 3. */
 
-    CONFIG_VARIABLE_KEY(key_map_clearmark),
+  CONFIG_VARIABLE_KEY(key_weapon3),
 
-    //!
-    // Key to select weapon 1.
-    //
+  /* Key to select weapon 4. */
 
-    CONFIG_VARIABLE_KEY(key_weapon1),
+  CONFIG_VARIABLE_KEY(key_weapon4),
 
-    //!
-    // Key to select weapon 2.
-    //
+  /* Key to select weapon 5. */
 
-    CONFIG_VARIABLE_KEY(key_weapon2),
+  CONFIG_VARIABLE_KEY(key_weapon5),
 
-    //!
-    // Key to select weapon 3.
-    //
+  /* Key to select weapon 6. */
 
-    CONFIG_VARIABLE_KEY(key_weapon3),
+  CONFIG_VARIABLE_KEY(key_weapon6),
 
-    //!
-    // Key to select weapon 4.
-    //
+  /* Key to select weapon 7. */
 
-    CONFIG_VARIABLE_KEY(key_weapon4),
+  CONFIG_VARIABLE_KEY(key_weapon7),
 
-    //!
-    // Key to select weapon 5.
-    //
+  /* Key to select weapon 8. */
 
-    CONFIG_VARIABLE_KEY(key_weapon5),
+  CONFIG_VARIABLE_KEY(key_weapon8),
 
-    //!
-    // Key to select weapon 6.
-    //
+  /* Key to cycle to the previous weapon. */
 
-    CONFIG_VARIABLE_KEY(key_weapon6),
+  CONFIG_VARIABLE_KEY(key_prevweapon),
 
-    //!
-    // Key to select weapon 7.
-    //
+  /* Key to cycle to the next weapon. */
 
-    CONFIG_VARIABLE_KEY(key_weapon7),
+  CONFIG_VARIABLE_KEY(key_nextweapon),
 
-    //!
-    // Key to select weapon 8.
-    //
+  /* @game heretic
+   *
+   * Key to use "quartz flask" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_weapon8),
+  CONFIG_VARIABLE_KEY(key_arti_quartz),
 
-    //!
-    // Key to cycle to the previous weapon.
-    //
+  /* @game heretic
+   *
+   * Key to use "mystic urn" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_prevweapon),
+  CONFIG_VARIABLE_KEY(key_arti_urn),
 
-    //!
-    // Key to cycle to the next weapon.
-    //
+  /* @game heretic
+   *
+   * Key to use "timebomb of the ancients" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_nextweapon),
+  CONFIG_VARIABLE_KEY(key_arti_bomb),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "quartz flask" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "tome of power" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_quartz),
+  CONFIG_VARIABLE_KEY(key_arti_tome),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "mystic urn" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "ring of invincibility" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_urn),
+  CONFIG_VARIABLE_KEY(key_arti_ring),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "timebomb of the ancients" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "chaos device" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_bomb),
+  CONFIG_VARIABLE_KEY(key_arti_chaosdevice),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "tome of power" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "shadowsphere" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_tome),
+  CONFIG_VARIABLE_KEY(key_arti_shadowsphere),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "ring of invincibility" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "wings of wrath" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_ring),
+  CONFIG_VARIABLE_KEY(key_arti_wings),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "chaos device" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "torch" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_chaosdevice),
+  CONFIG_VARIABLE_KEY(key_arti_torch),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "shadowsphere" artifact.
-    //
+  /* @game heretic
+   *
+   * Key to use "morph ovum" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_shadowsphere),
+  CONFIG_VARIABLE_KEY(key_arti_morph),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "wings of wrath" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use one of each artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_wings),
+  CONFIG_VARIABLE_KEY(key_arti_all),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "torch" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "quartz flask" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_torch),
+  CONFIG_VARIABLE_KEY(key_arti_health),
 
-    //!
-    // @game heretic
-    //
-    // Key to use "morph ovum" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "flechette" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_morph),
+  CONFIG_VARIABLE_KEY(key_arti_poisonbag),
 
-    //!
-    // @game hexen
-    //
-    // Key to use one of each artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "disc of repulsion" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_all),
+  CONFIG_VARIABLE_KEY(key_arti_blastradius),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "quartz flask" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "chaos device" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_health),
+  CONFIG_VARIABLE_KEY(key_arti_teleport),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "flechette" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "banishment device" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_poisonbag),
+  CONFIG_VARIABLE_KEY(key_arti_teleportother),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "disc of repulsion" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "porkalator" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_blastradius),
+  CONFIG_VARIABLE_KEY(key_arti_egg),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "chaos device" artifact.
-    //
+  /* @game hexen
+   *
+   * Key to use "icon of the defender" artifact.
+   */
 
-    CONFIG_VARIABLE_KEY(key_arti_teleport),
+  CONFIG_VARIABLE_KEY(key_arti_invulnerability),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "banishment device" artifact.
-    //
+  /* Key to re-display last message. */
 
-    CONFIG_VARIABLE_KEY(key_arti_teleportother),
+  CONFIG_VARIABLE_KEY(key_message_refresh),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "porkalator" artifact.
-    //
+  /* Key to quit the game when recording a demo. */
 
-    CONFIG_VARIABLE_KEY(key_arti_egg),
+  CONFIG_VARIABLE_KEY(key_demo_quit),
 
-    //!
-    // @game hexen
-    //
-    // Key to use "icon of the defender" artifact.
-    //
+  /* Key to send a message during multiplayer games. */
 
-    CONFIG_VARIABLE_KEY(key_arti_invulnerability),
+  CONFIG_VARIABLE_KEY(key_multi_msg),
 
-    //!
-    // Key to re-display last message.
-    //
+  /* Key to send a message to player 1 during multiplayer games. */
 
-    CONFIG_VARIABLE_KEY(key_message_refresh),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer1),
 
-    //!
-    // Key to quit the game when recording a demo.
-    //
+  /* Key to send a message to player 2 during multiplayer games. */
 
-    CONFIG_VARIABLE_KEY(key_demo_quit),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer2),
 
-    //!
-    // Key to send a message during multiplayer games.
-    //
+  /* Key to send a message to player 3 during multiplayer games. */
 
-    CONFIG_VARIABLE_KEY(key_multi_msg),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer3),
 
-    //!
-    // Key to send a message to player 1 during multiplayer games.
-    //
+  /* Key to send a message to player 4 during multiplayer games. */
 
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer1),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer4),
 
-    //!
-    // Key to send a message to player 2 during multiplayer games.
-    //
+  /* @game hexen strife
+   *
+   * Key to send a message to player 5 during multiplayer games.
+   */
 
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer2),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer5),
 
-    //!
-    // Key to send a message to player 3 during multiplayer games.
-    //
+  /* @game hexen strife
+   *
+   * Key to send a message to player 6 during multiplayer games.
+   */
 
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer3),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer6),
 
-    //!
-    // Key to send a message to player 4 during multiplayer games.
-    //
+  /* @game hexen strife
+   *
+   * Key to send a message to player 7 during multiplayer games.
+   */
 
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer4),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer7),
 
-    //!
-    // @game hexen strife
-    //
-    // Key to send a message to player 5 during multiplayer games.
-    //
+  /* @game hexen strife
+   *
+   * Key to send a message to player 8 during multiplayer games.
+   */
 
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer5),
-
-    //!
-    // @game hexen strife
-    //
-    // Key to send a message to player 6 during multiplayer games.
-    //
-
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer6),
-
-    //!
-    // @game hexen strife
-    //
-    // Key to send a message to player 7 during multiplayer games.
-    //
-
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer7),
-
-    //!
-    // @game hexen strife
-    //
-    // Key to send a message to player 8 during multiplayer games.
-    //
-
-    CONFIG_VARIABLE_KEY(key_multi_msgplayer8),
+  CONFIG_VARIABLE_KEY(key_multi_msgplayer8),
 };
 
 static default_collection_t extra_defaults =
@@ -2075,737 +1680,815 @@ static default_collection_t extra_defaults =
     NULL,
 };
 
-// Search a collection for a variable
+/* Mapping from DOS keyboard scan code to internal key code (as defined
+ * in doomkey.h). I think I (fraggle) reused this from somewhere else
+ * but I can't find where. Anyway, notes:
+ *  * KEY_PAUSE is wrong - it's in the KEY_NUMLOCK spot. This shouldn't
+ *    matter in terms of Vanilla compatibility because neither of
+ *    those were valid for key bindings.
+ *  * There is no proper scan code for PrintScreen (on DOS machines it
+ *    sends an interrupt). So I added a fake scan code of 126 for it.
+ *    The presence of this is important so we can bind PrintScreen as
+ *    a screenshot key.
+ */
 
-static default_t *SearchCollection(default_collection_t *collection, const char *name)
-{
-    int i;
-
-    for (i=0; i<collection->numdefaults; ++i) 
-    {
-        if (!strcmp(name, collection->defaults[i].name))
-        {
-            return &collection->defaults[i];
-        }
-    }
-
-    return NULL;
-}
-
-// Mapping from DOS keyboard scan code to internal key code (as defined
-// in doomkey.h). I think I (fraggle) reused this from somewhere else
-// but I can't find where. Anyway, notes:
-//  * KEY_PAUSE is wrong - it's in the KEY_NUMLOCK spot. This shouldn't
-//    matter in terms of Vanilla compatibility because neither of
-//    those were valid for key bindings.
-//  * There is no proper scan code for PrintScreen (on DOS machines it
-//    sends an interrupt). So I added a fake scan code of 126 for it.
-//    The presence of this is important so we can bind PrintScreen as
-//    a screenshot key.
 static const int scantokey[128] =
 {
-    0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6',
-    '7',    '8',    '9',    '0',    '-',    '=',    KEY_BACKSPACE, 9,
-    'q',    'w',    'e',    'r',    't',    'y',    'u',    'i',
-    'o',    'p',    '[',    ']',    13,		KEY_RCTRL, 'a',    's',
-    'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';',
-    '\'',   '`',    KEY_RSHIFT,'\\',   'z',    'x',    'c',    'v',
-    'b',    'n',    'm',    ',',    '.',    '/',    KEY_RSHIFT,KEYP_MULTIPLY,
-    KEY_RALT,  ' ',  KEY_CAPSLOCK,KEY_F1,  KEY_F2,   KEY_F3,   KEY_F4,   KEY_F5,
-    KEY_F6,   KEY_F7,   KEY_F8,   KEY_F9,   KEY_F10,  /*KEY_NUMLOCK?*/KEY_PAUSE,KEY_SCRLCK,KEY_HOME,
-    KEY_UPARROW,KEY_PGUP,KEY_MINUS,KEY_LEFTARROW,KEYP_5,KEY_RIGHTARROW,KEYP_PLUS,KEY_END,
-    KEY_DOWNARROW,KEY_PGDN,KEY_INS,KEY_DEL,0,   0,      0,      KEY_F11,
-    KEY_F12,  0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      KEY_PRTSCR, 0
+    0,
+    27,
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9',
+    '0',
+    '-',
+    '=',
+    KEY_BACKSPACE,
+    9,
+    'q',
+    'w',
+    'e',
+    'r',
+    't',
+    'y',
+    'u',
+    'i',
+    'o',
+    'p',
+    '[',
+    ']',
+    13,
+    KEY_RCTRL,
+    'a',
+    's',
+    'd',
+    'f',
+    'g',
+    'h',
+    'j',
+    'k',
+    'l',
+    ';',
+    '\'',
+    '`',
+    KEY_RSHIFT,
+    '\\',
+    'z',
+    'x',
+    'c',
+    'v',
+    'b',
+    'n',
+    'm',
+    ',',
+    '.',
+    '/',
+    KEY_RSHIFT,
+    KEYP_MULTIPLY,
+    KEY_RALT,
+    ' ',
+    KEY_CAPSLOCK,
+    KEY_F1,
+    KEY_F2,
+    KEY_F3,
+    KEY_F4,
+    KEY_F5,
+    KEY_F6,
+    KEY_F7,
+    KEY_F8,
+    KEY_F9,
+    KEY_F10,
+
+    /* KEY_NUMLOCK? */
+
+    KEY_PAUSE,
+    KEY_SCRLCK,
+    KEY_HOME,
+    KEY_UPARROW,
+    KEY_PGUP,
+    KEY_MINUS,
+    KEY_LEFTARROW,
+    KEYP_5,
+    KEY_RIGHTARROW,
+    KEYP_PLUS,
+    KEY_END,
+    KEY_DOWNARROW,
+    KEY_PGDN,
+    KEY_INS,
+    KEY_DEL,
+    0,
+    0,
+    0,
+    KEY_F11,
+    KEY_F12,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    KEY_PRTSCR,
+    0,
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-static void SaveDefaultCollection(default_collection_t *collection)
+/* DEFAULTS */
+
+/* Location where all configuration data is stored - default.cfg, savegames,
+ * etc.
+ */
+
+const char *configdir;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: search_collection
+ *
+ * Description:
+ *  Search a collection for a variable
+ *
+ ****************************************************************************/
+
+static default_t *search_collection(default_collection_t *collection,
+                                    const char *name)
 {
-    default_t *defaults;
-    int i, v;
-    FILE *f;
-	
-    f = M_fopen(collection->filename, "w");
-    if (!f)
-	return; // can't write the file, but don't complain
+  int i;
 
-    defaults = collection->defaults;
-		
-    for (i=0 ; i<collection->numdefaults ; i++)
+  for (i = 0; i < collection->numdefaults; ++i)
     {
-        int chars_written;
-
-        // Ignore unbound variables
-
-        if (!defaults[i].bound)
+      if (!strcmp(name, collection->defaults[i].name))
         {
-            continue;
+          return &collection->defaults[i];
         }
-
-        // Print the name and line up all values at 30 characters
-
-        chars_written = fprintf(f, "%s ", defaults[i].name);
-
-        for (; chars_written < 30; ++chars_written)
-            fprintf(f, " ");
-
-        // Print the value
-
-        switch (defaults[i].type) 
-        {
-            case DEFAULT_KEY:
-
-                // use the untranslated version if we can, to reduce
-                // the possibility of screwing up the user's config
-                // file
-                
-                v = *defaults[i].location.i;
-
-                if (v == KEY_RSHIFT)
-                {
-                    // Special case: for shift, force scan code for
-                    // right shift, as this is what Vanilla uses.
-                    // This overrides the change check below, to fix
-                    // configuration files made by old versions that
-                    // mistakenly used the scan code for left shift.
-
-                    v = 54;
-                }
-                else if (defaults[i].untranslated
-                      && v == defaults[i].original_translated)
-                {
-                    // Has not been changed since the last time we
-                    // read the config file.
-
-                    v = defaults[i].untranslated;
-                }
-                else
-                {
-                    // search for a reverse mapping back to a scancode
-                    // in the scantokey table
-
-                    int s;
-
-                    for (s=0; s<128; ++s)
-                    {
-                        if (scantokey[s] == v)
-                        {
-                            v = s;
-                            break;
-                        }
-                    }
-                }
-
-	        fprintf(f, "%i", v);
-                break;
-
-            case DEFAULT_INT:
-	        fprintf(f, "%i", *defaults[i].location.i);
-                break;
-
-            case DEFAULT_INT_HEX:
-	        fprintf(f, "0x%x", *defaults[i].location.i);
-                break;
-
-            case DEFAULT_FLOAT:
-                fprintf(f, "%f", *defaults[i].location.f);
-                break;
-
-            case DEFAULT_STRING:
-	        fprintf(f,"\"%s\"", *defaults[i].location.s);
-                break;
-        }
-
-        fprintf(f, "\n");
     }
 
-    fclose (f);
+  return NULL;
 }
 
-// Parses integer values in the configuration file
-
-static int ParseIntParameter(const char *strparm)
+static void save_default_collection(default_collection_t *collection)
 {
-    int parm;
+  default_t *defaults;
+  int i;
+  int v;
+  FILE *f;
 
-    if (strparm[0] == '0' && strparm[1] == 'x')
-        sscanf(strparm+2, "%x", (unsigned int *) &parm);
-    else
-        sscanf(strparm, "%i", &parm);
+  f = fopen(collection->filename, "w");
+  if (!f) return; /* can't write the file, but don't complain */
 
-    return parm;
-}
+  defaults = collection->defaults;
 
-static void SetVariable(default_t *def, const char *value)
-{
-    int intparm;
-
-    // parameter found
-
-    switch (def->type)
+  for (i = 0; i < collection->numdefaults; i++)
     {
-        case DEFAULT_STRING:
-            *def->location.s = M_StringDuplicate(value);
-            break;
+      int chars_written;
 
-        case DEFAULT_INT:
-        case DEFAULT_INT_HEX:
-            *def->location.i = ParseIntParameter(value);
-            break;
+      /* Ignore unbound variables */
 
+      if (!defaults[i].bound)
+        {
+          continue;
+        }
+
+      /* Print the name and line up all values at 30 characters */
+
+      chars_written = fprintf(f, "%s ", defaults[i].name);
+
+      for (; chars_written < 30; ++chars_written)
+        fprintf(f, " ");
+
+      /* Print the value */
+
+      switch (defaults[i].type)
+        {
         case DEFAULT_KEY:
 
-            // translate scancodes read from config
-            // file (save the old value in untranslated)
+          /* use the untranslated version if we can, to reduce
+           * the possibility of screwing up the user's config
+           * file
+           */
 
-            intparm = ParseIntParameter(value);
-            def->untranslated = intparm;
-            if (intparm >= 0 && intparm < 128)
+          v = *defaults[i].location.i;
+
+          if (v == KEY_RSHIFT)
             {
-                intparm = scantokey[intparm];
+              /* Special case: for shift, force scan code for
+               * right shift, as this is what Vanilla uses.
+               * This overrides the change check below, to fix
+               * configuration files made by old versions that
+               * mistakenly used the scan code for left shift.
+               */
+
+              v = 54;
             }
-            else
+          else if (defaults[i].untranslated &&
+                   v == defaults[i].original_translated)
             {
-                intparm = 0;
+              /* Has not been changed since the last time we read the config
+               * file.
+               */
+
+              v = defaults[i].untranslated;
             }
-
-            def->original_translated = intparm;
-            *def->location.i = intparm;
-            break;
-
-        case DEFAULT_FLOAT:
-        {
-            // Different locales use different decimal separators.
-            // However, the choice of the current locale isn't always
-            // under our own control. If the atof() function fails to
-            // parse the string representing the floating point number
-            // using the current locale's decimal separator, it will
-            // return 0, resulting in silent sound effects. To
-            // mitigate this, we replace the first non-digit,
-            // non-minus character in the string with the current
-            // locale's decimal separator before passing it to atof().
-            struct lconv *lc = localeconv();
-            char dec, *str;
-            int i = 0;
-
-            dec = lc->decimal_point[0];
-            str = M_StringDuplicate(value);
-
-            // Skip sign indicators.
-            if (str[i] == '-' || str[i] == '+')
+          else
             {
-                i++;
-            }
+              /* search for a reverse mapping back to a scancode
+               * in the scantokey table
+               */
 
-            for ( ; str[i] != '\0'; i++)
-            {
-                if (!isdigit(str[i]))
+              int s;
+
+              for (s = 0; s < 128; ++s)
                 {
-                    str[i] = dec;
-                    break;
+                  if (scantokey[s] == v)
+                    {
+                      v = s;
+                      break;
+                    }
                 }
             }
 
-            *def->location.f = (float) atof(str);
-            free(str);
+          fprintf(f, "%i", v);
+          break;
+
+        case DEFAULT_INT:
+          fprintf(f, "%i", *defaults[i].location.i);
+          break;
+
+        case DEFAULT_INT_HEX:
+          fprintf(f, "0x%x", *defaults[i].location.i);
+          break;
+
+        case DEFAULT_FLOAT:
+          fprintf(f, "%f", *defaults[i].location.f);
+          break;
+
+        case DEFAULT_STRING:
+          fprintf(f, "\"%s\"", *defaults[i].location.s);
+          break;
         }
-            break;
+
+      fprintf(f, "\n");
     }
+
+  fclose(f);
 }
 
-static void LoadDefaultCollection(default_collection_t *collection)
+/****************************************************************************
+ * Name: parse_int_parameter
+ *
+ * Description:
+ *  Parses integer values in the configuration file
+ *
+ ****************************************************************************/
+
+static int parse_int_parameter(const char *strparm)
 {
-    FILE *f;
-    default_t *def;
-    char defname[80];
-    char strparm[100];
+  int param;
 
-    // read the file in, overriding any set defaults
-    f = M_fopen(collection->filename, "r");
+  if (strparm[0] == '0' && strparm[1] == 'x')
+    sscanf(strparm + 2, "%x", (unsigned int *)&param);
+  else
+    sscanf(strparm, "%i", &param);
 
-    if (f == NULL)
+  return param;
+}
+
+static void set_variable(default_t *def, const char *value)
+{
+  int intparm;
+
+  /* parameter found */
+
+  switch (def->type)
     {
-        // File not opened, but don't complain. 
-        // It's probably just the first time they ran the game.
+    case DEFAULT_STRING:
+      *def->location.s = m_string_duplicate(value);
+      break;
 
-        return;
-    }
+    case DEFAULT_INT:
+    case DEFAULT_INT_HEX:
+      *def->location.i = parse_int_parameter(value);
+      break;
 
-    while (!feof(f))
-    {
-        if (fscanf(f, "%79s %99[^\n]\n", defname, strparm) != 2)
+    case DEFAULT_KEY:
+
+      /* translate scancodes read from config
+       * file (save the old value in untranslated)
+       */
+
+      intparm = parse_int_parameter(value);
+      def->untranslated = intparm;
+      if (intparm >= 0 && intparm < 128)
         {
-            // This line doesn't match
-
-            continue;
+          intparm = scantokey[intparm];
         }
-
-        // Find the setting in the list
-
-        def = SearchCollection(collection, defname);
-
-        if (def == NULL || !def->bound)
+      else
         {
-            // Unknown variable?  Unbound variables are also treated
-            // as unknown.
-
-            continue;
+          intparm = 0;
         }
 
-        // Strip off trailing non-printable characters (\r characters
-        // from DOS text files)
+      def->original_translated = intparm;
+      *def->location.i = intparm;
+      break;
 
-        while (strlen(strparm) > 0 && !isprint(strparm[strlen(strparm)-1]))
+    case DEFAULT_FLOAT:
+      {
+        /* Different locales use different decimal separators.
+         * However, the choice of the current locale isn't always
+         * under our own control. If the atof() function fails to
+         * parse the string representing the floating point number
+         * using the current locale's decimal separator, it will
+         * return 0, resulting in silent sound effects. To
+         * mitigate this, we replace the first non-digit,
+         * non-minus character in the string with the current
+         * locale's decimal separator before passing it to atof().
+         */
+
+        struct lconv *lc = localeconv();
+        char dec;
+        char *str;
+        int i = 0;
+
+        dec = lc->decimal_point[0];
+        str = m_string_duplicate(value);
+
+        /* Skip sign indicators. */
+
+        if (str[i] == '-' || str[i] == '+')
+          {
+            i++;
+          }
+
+        for (; str[i] != '\0'; i++)
+          {
+            if (!isdigit(str[i]))
+              {
+                str[i] = dec;
+                break;
+              }
+          }
+
+        *def->location.f = (float)atof(str);
+        free(str);
+      }
+      break;
+    }
+}
+
+static void load_default_collection(default_collection_t *collection)
+{
+  FILE *f;
+  default_t *def;
+  char defname[80];
+  char strparm[100];
+
+  /* read the file in, overriding any set defaults */
+
+  f = fopen(collection->filename, "r");
+
+  if (f == NULL)
+    {
+      /* File not opened, but don't complain.
+       * It's probably just the first time they ran the game.
+       */
+
+      return;
+    }
+
+  while (!feof(f))
+    {
+      if (fscanf(f, "%79s %99[^\n]\n", defname, strparm) != 2)
         {
-            strparm[strlen(strparm)-1] = '\0';
+          /* This line doesn't match */
+
+          continue;
         }
 
-        // Surrounded by quotes? If so, remove them.
-        if (strlen(strparm) >= 2
-         && strparm[0] == '"' && strparm[strlen(strparm) - 1] == '"')
+      /* Find the setting in the list */
+
+      def = search_collection(collection, defname);
+
+      if (def == NULL || !def->bound)
         {
-            strparm[strlen(strparm) - 1] = '\0';
-            memmove(strparm, strparm + 1, sizeof(strparm) - 1);
+          /* Unknown variable?  Unbound variables are also treated
+           * as unknown.
+           */
+
+          continue;
         }
 
-        SetVariable(def, strparm);
-    }
+      /* Strip off trailing non-printable characters (\r characters
+       * from DOS text files)
+       */
 
-    fclose (f);
-}
-
-// Set the default filenames to use for configuration files.
-
-void M_SetConfigFilenames(const char *main_config, const char *extra_config)
-{
-    default_main_config = main_config;
-    default_extra_config = extra_config;
-}
-
-//
-// M_SaveDefaults
-//
-
-void M_SaveDefaults (void)
-{
-    SaveDefaultCollection(&doom_defaults);
-    SaveDefaultCollection(&extra_defaults);
-}
-
-//
-// Save defaults to alternate filenames
-//
-
-void M_SaveDefaultsAlternate(const char *main, const char *extra)
-{
-    const char *orig_main;
-    const char *orig_extra;
-
-    // Temporarily change the filenames
-
-    orig_main = doom_defaults.filename;
-    orig_extra = extra_defaults.filename;
-
-    doom_defaults.filename = main;
-    extra_defaults.filename = extra;
-
-    M_SaveDefaults();
-
-    // Restore normal filenames
-
-    doom_defaults.filename = orig_main;
-    extra_defaults.filename = orig_extra;
-}
-
-//
-// M_LoadDefaults
-//
-
-void M_LoadDefaults (void)
-{
-    int i;
-
-    // This variable is a special snowflake for no good reason.
-    M_BindStringVariable("autoload_path", &autoload_path);
-
-    // check for a custom default file
-
-    //!
-    // @arg <file>
-    // @vanilla
-    //
-    // Load main configuration from the specified file, instead of the
-    // default.
-    //
-
-    i = M_CheckParmWithArgs("-config", 1);
-
-    if (i)
-    {
-	doom_defaults.filename = myargv[i+1];
-	printf ("	default file: %s\n",doom_defaults.filename);
-    }
-    else
-    {
-        doom_defaults.filename
-            = M_StringJoin(configdir, default_main_config, NULL);
-    }
-
-    printf("saving config in %s\n", doom_defaults.filename);
-
-    //!
-    // @arg <file>
-    //
-    // Load additional configuration from the specified file, instead of
-    // the default.
-    //
-
-    i = M_CheckParmWithArgs("-extraconfig", 1);
-
-    if (i)
-    {
-        extra_defaults.filename = myargv[i+1];
-        printf("        extra configuration file: %s\n", 
-               extra_defaults.filename);
-    }
-    else
-    {
-        extra_defaults.filename
-            = M_StringJoin(configdir, default_extra_config, NULL);
-    }
-
-    LoadDefaultCollection(&doom_defaults);
-    LoadDefaultCollection(&extra_defaults);
-}
-
-// Get a configuration file variable by its name
-
-static default_t *GetDefaultForName(const char *name)
-{
-    default_t *result;
-
-    // Try the main list and the extras
-
-    result = SearchCollection(&doom_defaults, name);
-
-    if (result == NULL)
-    {
-        result = SearchCollection(&extra_defaults, name);
-    }
-
-    // Not found? Internal error.
-
-    if (result == NULL)
-    {
-        I_Error("Unknown configuration variable: '%s'", name);
-    }
-
-    return result;
-}
-
-//
-// Bind a variable to a given configuration file variable, by name.
-//
-
-void M_BindIntVariable(const char *name, int *location)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-    assert(variable->type == DEFAULT_INT
-        || variable->type == DEFAULT_INT_HEX
-        || variable->type == DEFAULT_KEY);
-
-    variable->location.i = location;
-    variable->bound = true;
-}
-
-void M_BindFloatVariable(const char *name, float *location)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-    assert(variable->type == DEFAULT_FLOAT);
-
-    variable->location.f = location;
-    variable->bound = true;
-}
-
-void M_BindStringVariable(const char *name, char **location)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-    assert(variable->type == DEFAULT_STRING);
-
-    variable->location.s = location;
-    variable->bound = true;
-}
-
-// Set the value of a particular variable; an API function for other
-// parts of the program to assign values to config variables by name.
-
-boolean M_SetVariable(const char *name, const char *value)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-
-    if (variable == NULL || !variable->bound)
-    {
-        return false;
-    }
-
-    SetVariable(variable, value);
-
-    return true;
-}
-
-// Get the value of a variable.
-
-int M_GetIntVariable(const char *name)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-
-    if (variable == NULL || !variable->bound
-     || (variable->type != DEFAULT_INT && variable->type != DEFAULT_INT_HEX))
-    {
-        return 0;
-    }
-
-    return *variable->location.i;
-}
-
-const char *M_GetStringVariable(const char *name)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-
-    if (variable == NULL || !variable->bound
-     || variable->type != DEFAULT_STRING)
-    {
-        return NULL;
-    }
-
-    return *variable->location.s;
-}
-
-float M_GetFloatVariable(const char *name)
-{
-    default_t *variable;
-
-    variable = GetDefaultForName(name);
-
-    if (variable == NULL || !variable->bound
-     || variable->type != DEFAULT_FLOAT)
-    {
-        return 0;
-    }
-
-    return *variable->location.f;
-}
-
-// Get the path to the default configuration dir to use, if NULL
-// is passed to M_SetConfigDir.
-
-static char *GetDefaultConfigDir(void)
-{
-#if !defined(_WIN32) || defined(_WIN32_WCE)
-
-    // Configuration settings are stored in an OS-appropriate path
-    // determined by SDL.  On typical Unix systems, this might be
-    // ~/.local/share/chocolate-doom.  On Windows, we behave like
-    // Vanilla Doom and save in the current directory.
-
-    char *result;
-    char *copy;
-
-    result = SDL_GetPrefPath("", PACKAGE_TARNAME);
-    if (result != NULL)
-    {
-        copy = M_StringDuplicate(result);
-        SDL_free(result);
-        return copy;
-    }
-#endif /* #ifndef _WIN32 */
-    return M_StringDuplicate(exedir);
-}
-
-// 
-// SetConfigDir:
-//
-// Sets the location of the configuration directory, where configuration
-// files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
-//
-
-void M_SetConfigDir(const char *dir)
-{
-    // Use the directory that was passed, or find the default.
-
-    if (dir != NULL)
-    {
-        configdir = dir;
-    }
-    else
-    {
-        configdir = GetDefaultConfigDir();
-    }
-
-    if (strcmp(configdir, exedir) != 0)
-    {
-        printf("Using %s for configuration and saves\n", configdir);
-    }
-
-    // Make the directory if it doesn't already exist:
-
-    M_MakeDirectory(configdir);
-}
-
-#define MUSIC_PACK_README \
-"Extract music packs into this directory in .flac or .ogg format;\n"   \
-"they will be automatically loaded based on filename to replace the\n" \
-"in-game music with high quality versions.\n\n" \
-"For more information check here:\n\n" \
-"  <https://www.chocolate-doom.org/wiki/index.php/Digital_music_packs>\n\n"
-
-// Set the value of music_pack_path if it is currently empty, and create
-// the directory if necessary.
-void M_SetMusicPackDir(void)
-{
-    const char *current_path;
-    char *prefdir, *music_pack_path, *readme_path;
-
-    current_path = M_GetStringVariable("music_pack_path");
-
-    if (current_path != NULL && strlen(current_path) > 0)
-    {
-        return;
-    }
-
-    prefdir = SDL_GetPrefPath("", PACKAGE_TARNAME);
-    if (prefdir == NULL)
-    {
-        printf("M_SetMusicPackDir: SDL_GetPrefPath failed, music pack directory not set\n");
-        return;
-    }
-    music_pack_path = M_StringJoin(prefdir, "music-packs", NULL);
-
-    M_MakeDirectory(prefdir);
-    M_MakeDirectory(music_pack_path);
-    M_SetVariable("music_pack_path", music_pack_path);
-
-    // We write a README file with some basic instructions on how to use
-    // the directory.
-    readme_path = M_StringJoin(music_pack_path, DIR_SEPARATOR_S,
-                               "README.txt", NULL);
-    M_WriteFile(readme_path, MUSIC_PACK_README, strlen(MUSIC_PACK_README));
-
-    free(readme_path);
-    free(music_pack_path);
-    SDL_free(prefdir);
-}
-
-//
-// Calculate the path to the directory to use to store save games.
-// Creates the directory as necessary.
-//
-
-char *M_GetSaveGameDir(const char *iwadname)
-{
-    char *savegamedir;
-    char *topdir;
-    int p;
-
-    //!
-    // @arg <directory>
-    //
-    // Specify a path from which to load and save games.  If the
-    // directory does not exist then it will automatically be created.
-    //
-
-    p = M_CheckParmWithArgs("-savedir", 1);
-    if (p)
-    {
-        savegamedir = myargv[p + 1];
-        if (!M_FileExists(savegamedir))
+      while (strlen(strparm) > 0 && !isprint(strparm[strlen(strparm) - 1]))
         {
-            M_MakeDirectory(savegamedir);
+          strparm[strlen(strparm) - 1] = '\0';
         }
 
-        // add separator at end just in case
-        savegamedir = M_StringJoin(savegamedir, DIR_SEPARATOR_S, NULL);
+      /* Surrounded by quotes? If so, remove them. */
 
-        printf("Save directory changed to %s.\n", savegamedir);
-    }
-#ifdef _WIN32
-    // In -cdrom mode, we write savegames to a specific directory
-    // in addition to configs.
+      if (strlen(strparm) >= 2 && strparm[0] == '"' &&
+          strparm[strlen(strparm) - 1] == '"')
+        {
+          strparm[strlen(strparm) - 1] = '\0';
+          memmove(strparm, strparm + 1, sizeof(strparm) - 1);
+        }
 
-    else if (M_ParmExists("-cdrom"))
-    {
-        savegamedir = M_StringDuplicate(configdir);
-    }
-#endif
-    // If not "doing" a configuration directory (Windows), don't "do"
-    // a savegame directory, either.
-    else if (!strcmp(configdir, exedir))
-    {
-	savegamedir = M_StringDuplicate("");
-    }
-    else
-    {
-        // ~/.local/share/chocolate-doom/savegames
-
-        topdir = M_StringJoin(configdir, "savegames", NULL);
-        M_MakeDirectory(topdir);
-
-        // eg. ~/.local/share/chocolate-doom/savegames/doom2.wad/
-
-        savegamedir = M_StringJoin(topdir, DIR_SEPARATOR_S, iwadname,
-                                   DIR_SEPARATOR_S, NULL);
-
-        M_MakeDirectory(savegamedir);
-
-        free(topdir);
+      set_variable(def, strparm);
     }
 
-    return savegamedir;
+  fclose(f);
 }
 
-//
-// Calculate the path to the directory for autoloaded WADs/DEHs.
-// Creates the directory as necessary.
-//
-char *M_GetAutoloadDir(const char *iwadname)
-{
-    char *result;
+/* Get a configuration file variable by its name */
 
-    if (autoload_path == NULL || strlen(autoload_path) == 0)
+static default_t *get_default_for_name(const char *name)
+{
+  default_t *result;
+
+  /* Try the main list and the extras */
+
+  result = search_collection(&doom_defaults, name);
+
+  if (result == NULL)
     {
-        char *prefdir;
-        prefdir = SDL_GetPrefPath("", PACKAGE_TARNAME);
-        if (prefdir == NULL)
-        {
-            printf("M_GetAutoloadDir: SDL_GetPrefPath failed\n");
-            return NULL;
-        }
-        autoload_path = M_StringJoin(prefdir, "autoload", NULL);
-        SDL_free(prefdir);
+      result = search_collection(&extra_defaults, name);
     }
 
-    M_MakeDirectory(autoload_path);
+  /* Not found? Internal error. */
 
-    result = M_StringJoin(autoload_path, DIR_SEPARATOR_S, iwadname, NULL);
-    M_MakeDirectory(result);
+  if (result == NULL)
+    {
+      i_error("Unknown configuration variable: '%s'", name);
+    }
 
-    // TODO: Add README file
+  return result;
+}
 
-    return result;
-}
\ No newline at end of file
+/* Get the path to the default configuration dir to use, if NULL
+ * is passed to m_set_config_dir.
+ */
+
+static char *get_default_config_dir(void)
+{
+  /* Configuration settings are stored in an OS-appropriate path
+   * determined by SDL.  On typical Unix systems, this might be
+   * ~/.local/share/chocolate-doom.  On Windows, we behave like
+   * Vanilla Doom and save in the current directory.
+   */
+
+  char *result = CONFIG_GAMES_NXDOOM_PREFDIR "/";
+  char *copy = m_string_duplicate(result);
+  return copy;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Set the default filenames to use for configuration files. */
+
+void m_set_config_filenames(const char *main_config,
+        const char *extra_config)
+{
+  default_main_config = main_config;
+  default_extra_config = extra_config;
+}
+
+void m_save_defaults(void)
+{
+  save_default_collection(&doom_defaults);
+  save_default_collection(&extra_defaults);
+}
+
+/* Save defaults to alternate filenames */
+
+void m_save_defaults_alternate(const char *main, const char *extra)
+{
+  const char *orig_main;
+  const char *orig_extra;
+
+  /* Temporarily change the filenames */
+
+  orig_main = doom_defaults.filename;
+  orig_extra = extra_defaults.filename;
+
+  doom_defaults.filename = main;
+  extra_defaults.filename = extra;
+
+  m_save_defaults();
+
+  /* Restore normal filenames */
+
+  doom_defaults.filename = orig_main;
+  extra_defaults.filename = orig_extra;
+}
+
+void m_load_defaults(void)
+{
+  int i;
+
+  /* This variable is a special snowflake for no good reason. */
+
+  m_bind_string_variable("autoload_path", &autoload_path);
+
+  /* check for a custom default file */
+
+  /* @arg <file>
+   * @vanilla
+   *
+   * Load main configuration from the specified file, instead of the
+   * default.
+   */
+
+  i = m_check_parm_with_args("-config", 1);
+
+  if (i)
+    {
+      doom_defaults.filename = myargv[i + 1];
+      printf("\tdefault file: %s\n", doom_defaults.filename);
+    }
+  else
+    {
+      doom_defaults.filename =
+          m_string_join(configdir, default_main_config, NULL);
+    }
+
+  printf("saving config in %s\n", doom_defaults.filename);
+
+  /* @arg <file>
+   *
+   * Load additional configuration from the specified file, instead of
+   * the default.
+   */
+
+  i = m_check_parm_with_args("-extraconfig", 1);
+
+  if (i)
+    {
+      extra_defaults.filename = myargv[i + 1];
+      printf("        extra configuration file: %s\n",
+             extra_defaults.filename);
+    }
+  else
+    {
+      extra_defaults.filename =
+          m_string_join(configdir, default_extra_config, NULL);
+    }
+
+  load_default_collection(&doom_defaults);
+  load_default_collection(&extra_defaults);
+}
+
+/* Bind a variable to a given configuration file variable, by name. */
+
+void m_bind_int_variable(const char *name, int *location)
+{
+  default_t *variable;
+
+  variable = get_default_for_name(name);
+  assert(variable->type == DEFAULT_INT ||
+        variable->type == DEFAULT_INT_HEX || variable->type == DEFAULT_KEY);
+
+  variable->location.i = location;
+  variable->bound = true;
+}
+
+void m_bind_float_variable(const char *name, float *location)
+{
+  default_t *variable;
+
+  variable = get_default_for_name(name);
+  assert(variable->type == DEFAULT_FLOAT);
+
+  variable->location.f = location;
+  variable->bound = true;
+}
+
+void m_bind_string_variable(const char *name, char **location)
+{
+  default_t *variable;
+
+  variable = get_default_for_name(name);
+  assert(variable->type == DEFAULT_STRING);
+
+  variable->location.s = location;
+  variable->bound = true;
+}
+
+/* Set the value of a particular variable; an API function for other
+ * parts of the program to assign values to config variables by name.
+ */
+
+boolean m_set_variable(const char *name, const char *value)
+{
+  default_t *variable;
+
+  variable = get_default_for_name(name);
+
+  if (variable == NULL || !variable->bound)
+    {
+      return false;
+    }
+
+  set_variable(variable, value);
+
+  return true;
+}
+
+const char *m_get_string_variable(const char *name)
+{
+  default_t *variable;
+
+  variable = get_default_for_name(name);
+
+  if (variable == NULL || !variable->bound ||
+      variable->type != DEFAULT_STRING)
+    {
+      return NULL;
+    }
+
+  return *variable->location.s;
+}
+
+/* SetConfigDir:
+ *
+ * Sets the location of the configuration directory, where configuration
+ * files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
+ */
+
+void m_set_config_dir(const char *dir)
+{
+  /* Use the directory that was passed, or find the default. */
+
+  if (dir != NULL)
+    {
+      configdir = dir;
+    }
+  else
+    {
+      configdir = get_default_config_dir();
+    }
+
+  if (strcmp(configdir, exedir) != 0)
+    {
+      printf("Using %s for configuration and saves\n", configdir);
+    }
+
+  /* Make the directory if it doesn't already exist: */
+
+  m_make_directory(configdir);
+}
+
+/* Set the value of music_pack_path if it is currently empty, and create
+ * the directory if necessary.
+ */
+
+void m_set_music_pack_dir(void)
+{
+  const char *current_path;
+  char *prefdir;
+  char *music_pack_path;
+
+  current_path = m_get_string_variable("music_pack_path");
+
+  if (current_path != NULL && strlen(current_path) > 0)
+    {
+      return;
+    }
+
+  prefdir = CONFIG_GAMES_NXDOOM_PREFDIR "/";
+  music_pack_path = m_string_join(prefdir, "music-packs", NULL);
+
+  m_make_directory(prefdir);
+  m_make_directory(music_pack_path);
+  m_set_variable("music_pack_path", music_pack_path);
+
+  free(music_pack_path);
+}
+
+/* Calculate the path to the directory to use to store save games.
+ * Creates the directory as necessary.
+ */
+
+char *m_get_save_game_dir(const char *iwadname)
+{
+  char *savegamedir;
+  char *topdir;
+  int p;
+
+  /* @arg <directory>
+   *
+   * Specify a path from which to load and save games.  If the
+   * directory does not exist then it will automatically be created.
+   */
+
+  p = m_check_parm_with_args("-savedir", 1);
+  if (p)
+    {
+      savegamedir = myargv[p + 1];
+      if (!m_file_exists(savegamedir))
+        {
+          m_make_directory(savegamedir);
+        }
+
+      /* add separator at end just in case */
+
+      savegamedir = m_string_join(savegamedir, DIR_SEPARATOR_S, NULL);
+
+      printf("Save directory changed to %s.\n", savegamedir);
+    }
+
+  /* If not "doing" a configuration directory (Windows), don't "do"
+   * a savegame directory, either.
+   */
+
+  else if (!strcmp(configdir, exedir))
+    {
+      savegamedir = m_string_duplicate("");
+    }
+  else
+    {
+      /* ~/.local/share/chocolate-doom/savegames */
+
+      topdir = m_string_join(configdir, "savegames", NULL);
+      m_make_directory(topdir);
+
+      /* eg. ~/.local/share/chocolate-doom/savegames/doom2.wad/ */
+
+      savegamedir = m_string_join(topdir, DIR_SEPARATOR_S, iwadname,
+                                  DIR_SEPARATOR_S, NULL);
+
+      m_make_directory(savegamedir);
+
+      free(topdir);
+    }
+
+  return savegamedir;
+}
+
+/* Calculate the path to the directory for autoloaded WADs/DEHs.
+ * Creates the directory as necessary.
+ */
+
+char *m_get_autoload_dir(const char *iwadname)
+{
+  char *result;
+
+  if (autoload_path == NULL || strlen(autoload_path) == 0)
+    {
+      char *prefdir = CONFIG_GAMES_NXDOOM_PREFDIR "/";
+      autoload_path = m_string_join(prefdir, "autoload", NULL);
+    }
+
+  m_make_directory(autoload_path);
+
+  result = m_string_join(autoload_path, DIR_SEPARATOR_S, iwadname, NULL);
+  m_make_directory(result);
+
+  /* TODO: Add README file */
+
+  return result;
+}
diff --git a/games/NXDoom/src/m_config.h b/games/NXDoom/src/m_config.h
index 5939b6bef..5dd8358b7 100644
--- a/games/NXDoom/src/m_config.h
+++ b/games/NXDoom/src/m_config.h
@@ -1,43 +1,58 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Configuration file interface.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_config.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Configuration file interface.
+ *
+ ****************************************************************************/
 
 #ifndef __M_CONFIG__
 #define __M_CONFIG__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-void M_LoadDefaults(void);
-void M_SaveDefaults(void);
-void M_SaveDefaultsAlternate(const char *main, const char *extra);
-void M_SetConfigDir(const char *dir);
-void M_SetMusicPackDir(void);
-void M_BindIntVariable(const char *name, int *variable);
-void M_BindFloatVariable(const char *name, float *variable);
-void M_BindStringVariable(const char *name, char **variable);
-boolean M_SetVariable(const char *name, const char *value);
-int M_GetIntVariable(const char *name);
-const char *M_GetStringVariable(const char *name);
-float M_GetFloatVariable(const char *name);
-void M_SetConfigFilenames(const char *main_config, const char *extra_config);
-char *M_GetSaveGameDir(const char *iwadname);
-char *M_GetAutoloadDir(const char *iwadname);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern const char *configdir;
 
-#endif
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void m_load_defaults(void);
+void m_save_defaults(void);
+void m_save_defaults_alternate(const char *main, const char *extra);
+void m_set_config_dir(const char *dir);
+void m_set_music_pack_dir(void);
+void m_bind_int_variable(const char *name, int *variable);
+void m_bind_float_variable(const char *name, float *variable);
+void m_bind_string_variable(const char *name, char **variable);
+boolean m_set_variable(const char *name, const char *value);
+const char *m_get_string_variable(const char *name);
+void m_set_config_filenames(const char *main_config,
+                            const char *extra_config);
+char *m_get_save_game_dir(const char *iwadname);
+char *m_get_autoload_dir(const char *iwadname);
+
+#endif /* __M_CONFIG__ */
diff --git a/games/NXDoom/src/m_controls.c b/games/NXDoom/src/m_controls.c
index 1a5f520e1..2266df2ce 100644
--- a/games/NXDoom/src/m_controls.c
+++ b/games/NXDoom/src/m_controls.c
@@ -1,47 +1,56 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/m_controls.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
-#include "doomtype.h"
 #include "doomkeys.h"
+#include "doomtype.h"
 
 #include "m_config.h"
 #include "m_misc.h"
 
-//
-// Keyboard controls
-//
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Keyboard controls */
 
 int key_right = KEY_RIGHTARROW;
 int key_left = KEY_LEFTARROW;
 
 int key_up = KEY_UPARROW;
-int key_down = KEY_DOWNARROW; 
-int key_strafeleft = ',';
+int key_down = KEY_DOWNARROW;
+int key_strafeleft = 0x2c; /* Comma, ',' */
 int key_straferight = '.';
 int key_fire = KEY_RCTRL;
 int key_use = ' ';
 int key_strafe = KEY_RALT;
-int key_speed = KEY_RSHIFT; 
+int key_speed = KEY_RSHIFT;
+
+/* Heretic keyboard controls */
 
-// 
-// Heretic keyboard controls
-//
- 
 int key_flyup = KEY_PGUP;
 int key_flydown = KEY_INS;
 int key_flycenter = KEY_HOME;
@@ -65,44 +74,38 @@ int key_arti_wings = 0;
 int key_arti_torch = 0;
 int key_arti_morph = 0;
 
-//
-// Hexen key controls
-//
+/* Hexen key controls */
 
 int key_jump = '/';
 
-int key_arti_all             = KEY_BACKSPACE;
-int key_arti_health          = '\\';
-int key_arti_poisonbag       = '0';
-int key_arti_blastradius     = '9';
-int key_arti_teleport        = '8';
-int key_arti_teleportother   = '7';
-int key_arti_egg             = '6';
+int key_arti_all = KEY_BACKSPACE;
+int key_arti_health = '\\';
+int key_arti_poisonbag = '0';
+int key_arti_blastradius = '9';
+int key_arti_teleport = '8';
+int key_arti_teleportother = '7';
+int key_arti_egg = '6';
 int key_arti_invulnerability = '5';
 
-//
-// Strife key controls
-//
-// haleyjd 09/01/10
-//
-
-// Note: Strife also uses key_invleft, key_invright, key_jump, key_lookup, and
-// key_lookdown, but with different default values.
+/* Strife key controls
+ *
+ * haleyjd 09/01/10
+ *
+ * Note: Strife also uses key_invleft, key_invright, key_jump, key_lookup,
+ * and key_lookdown, but with different default values.
+ */
 
 int key_usehealth = 'h';
-int key_invquery  = 'q';
-int key_mission   = 'w';
-int key_invpop    = 'z';
-int key_invkey    = 'k';
-int key_invhome   = KEY_HOME;
-int key_invend    = KEY_END;
-int key_invuse    = KEY_ENTER;
-int key_invdrop   = KEY_BACKSPACE;
+int key_invquery = 'q';
+int key_mission = 'w';
+int key_invpop = 'z';
+int key_invkey = 'k';
+int key_invhome = KEY_HOME;
+int key_invend = KEY_END;
+int key_invuse = KEY_ENTER;
+int key_invdrop = KEY_BACKSPACE;
 
-
-//
-// Mouse controls
-//
+/* Mouse controls */
 
 int mousebfire = 0;
 int mousebstrafe = 1;
@@ -129,12 +132,12 @@ int key_pause = KEY_PAUSE;
 int key_demo_quit = 'q';
 int key_spy = KEY_F12;
 
-// Multiplayer chat keys:
+/* Multiplayer chat keys: */
 
 int key_multi_msg = 't';
 int key_multi_msgplayer[8];
 
-// Weapon selection keys:
+/* Weapon selection keys: */
 
 int key_weapon1 = '1';
 int key_weapon2 = '2';
@@ -147,52 +150,50 @@ int key_weapon8 = '8';
 int key_prevweapon = 0;
 int key_nextweapon = 0;
 
-// Map control keys:
+/* Map control keys: */
 
-int key_map_north     = KEY_UPARROW;
-int key_map_south     = KEY_DOWNARROW;
-int key_map_east      = KEY_RIGHTARROW;
-int key_map_west      = KEY_LEFTARROW;
-int key_map_zoomin    = '=';
-int key_map_zoomout   = '-';
-int key_map_toggle    = KEY_TAB;
-int key_map_maxzoom   = '0';
-int key_map_follow    = 'f';
-int key_map_grid      = 'g';
-int key_map_mark      = 'm';
+int key_map_north = KEY_UPARROW;
+int key_map_south = KEY_DOWNARROW;
+int key_map_east = KEY_RIGHTARROW;
+int key_map_west = KEY_LEFTARROW;
+int key_map_zoomin = '=';
+int key_map_zoomout = '-';
+int key_map_toggle = KEY_TAB;
+int key_map_maxzoom = '0';
+int key_map_follow = 'f';
+int key_map_grid = 'g';
+int key_map_mark = 'm';
 int key_map_clearmark = 'c';
 
-// menu keys:
+/* menu keys: */
 
-int key_menu_activate  = KEY_ESCAPE;
-int key_menu_up        = KEY_UPARROW;
-int key_menu_down      = KEY_DOWNARROW;
-int key_menu_left      = KEY_LEFTARROW;
-int key_menu_right     = KEY_RIGHTARROW;
-int key_menu_back      = KEY_BACKSPACE;
-int key_menu_forward   = KEY_ENTER;
-int key_menu_confirm   = 'y';
-int key_menu_abort     = 'n';
+int key_menu_activate = KEY_ESCAPE;
+int key_menu_up = KEY_UPARROW;
+int key_menu_down = KEY_DOWNARROW;
+int key_menu_left = KEY_LEFTARROW;
+int key_menu_right = KEY_RIGHTARROW;
+int key_menu_back = KEY_BACKSPACE;
+int key_menu_forward = KEY_ENTER;
+int key_menu_confirm = 'y';
+int key_menu_abort = 'n';
 
-int key_menu_help      = KEY_F1;
-int key_menu_save      = KEY_F2;
-int key_menu_load      = KEY_F3;
-int key_menu_volume    = KEY_F4;
-int key_menu_detail    = KEY_F5;
-int key_menu_qsave     = KEY_F6;
-int key_menu_endgame   = KEY_F7;
-int key_menu_messages  = KEY_F8;
-int key_menu_qload     = KEY_F9;
-int key_menu_quit      = KEY_F10;
-int key_menu_gamma     = KEY_F11;
+int key_menu_help = KEY_F1;
+int key_menu_save = KEY_F2;
+int key_menu_load = KEY_F3;
+int key_menu_volume = KEY_F4;
+int key_menu_detail = KEY_F5;
+int key_menu_qsave = KEY_F6;
+int key_menu_endgame = KEY_F7;
+int key_menu_messages = KEY_F8;
+int key_menu_qload = KEY_F9;
+int key_menu_quit = KEY_F10;
+int key_menu_gamma = KEY_F11;
 
 int key_menu_incscreen = KEY_EQUALS;
 int key_menu_decscreen = KEY_MINUS;
 int key_menu_screenshot = 0;
 
-//
-// Joystick controls
-//
+/* Joystick controls */
 
 int joybfire = 0;
 int joybstrafe = 1;
@@ -218,240 +219,249 @@ int joybflyup = -1;
 int joybflydown = -1;
 int joybflycenter = -1;
 
-// Control whether if a mouse button is double clicked, it acts like 
-// "use" has been pressed
+/* Control whether if a mouse button is double clicked, it acts like
+ * "use" has been pressed
+ */
 
 int dclick_use = 1;
- 
-// 
-// Bind all of the common controls used by Doom and all other games.
-//
 
-void M_BindBaseControls(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Bind all of the common controls used by Doom and all other games. */
+
+void m_bind_base_controls(void)
 {
-    M_BindIntVariable("key_right",          &key_right);
-    M_BindIntVariable("key_left",           &key_left);
-    M_BindIntVariable("key_up",             &key_up);
-    M_BindIntVariable("key_down",           &key_down);
-    M_BindIntVariable("key_strafeleft",     &key_strafeleft);
-    M_BindIntVariable("key_straferight",    &key_straferight);
-    M_BindIntVariable("key_fire",           &key_fire);
-    M_BindIntVariable("key_use",            &key_use);
-    M_BindIntVariable("key_strafe",         &key_strafe);
-    M_BindIntVariable("key_speed",          &key_speed);
+  m_bind_int_variable("key_right", &key_right);
+  m_bind_int_variable("key_left", &key_left);
+  m_bind_int_variable("key_up", &key_up);
+  m_bind_int_variable("key_down", &key_down);
+  m_bind_int_variable("key_strafeleft", &key_strafeleft);
+  m_bind_int_variable("key_straferight", &key_straferight);
+  m_bind_int_variable("key_fire", &key_fire);
+  m_bind_int_variable("key_use", &key_use);
+  m_bind_int_variable("key_strafe", &key_strafe);
+  m_bind_int_variable("key_speed", &key_speed);
 
-    M_BindIntVariable("mouseb_fire",        &mousebfire);
-    M_BindIntVariable("mouseb_strafe",      &mousebstrafe);
-    M_BindIntVariable("mouseb_forward",     &mousebforward);
-    M_BindIntVariable("mouseb_speed",       &mousebspeed);
+  m_bind_int_variable("mouseb_fire", &mousebfire);
+  m_bind_int_variable("mouseb_strafe", &mousebstrafe);
+  m_bind_int_variable("mouseb_forward", &mousebforward);
+  m_bind_int_variable("mouseb_speed", &mousebspeed);
 
-    M_BindIntVariable("joyb_fire",          &joybfire);
-    M_BindIntVariable("joyb_strafe",        &joybstrafe);
-    M_BindIntVariable("joyb_use",           &joybuse);
-    M_BindIntVariable("joyb_speed",         &joybspeed);
+  m_bind_int_variable("joyb_fire", &joybfire);
+  m_bind_int_variable("joyb_strafe", &joybstrafe);
+  m_bind_int_variable("joyb_use", &joybuse);
+  m_bind_int_variable("joyb_speed", &joybspeed);
 
-    M_BindIntVariable("joyb_menu_activate", &joybmenu);
-    M_BindIntVariable("joyb_toggle_automap", &joybautomap);
+  m_bind_int_variable("joyb_menu_activate", &joybmenu);
+  m_bind_int_variable("joyb_toggle_automap", &joybautomap);
 
-    // Extra controls that are not in the Vanilla versions:
+  /* Extra controls that are not in the Vanilla versions: */
 
-    M_BindIntVariable("joyb_strafeleft",     &joybstrafeleft);
-    M_BindIntVariable("joyb_straferight",    &joybstraferight);
-    M_BindIntVariable("mouseb_strafeleft",   &mousebstrafeleft);
-    M_BindIntVariable("mouseb_straferight",  &mousebstraferight);
-    M_BindIntVariable("mouseb_turnleft",     &mousebturnleft);
-    M_BindIntVariable("mouseb_turnright",    &mousebturnright);
-    M_BindIntVariable("mouseb_use",          &mousebuse);
-    M_BindIntVariable("mouseb_backward",     &mousebbackward);
-    M_BindIntVariable("dclick_use",          &dclick_use);
-    M_BindIntVariable("key_pause",           &key_pause);
-    M_BindIntVariable("key_message_refresh", &key_message_refresh);
+  m_bind_int_variable("joyb_strafeleft", &joybstrafeleft);
+  m_bind_int_variable("joyb_straferight", &joybstraferight);
+  m_bind_int_variable("mouseb_strafeleft", &mousebstrafeleft);
+  m_bind_int_variable("mouseb_straferight", &mousebstraferight);
+  m_bind_int_variable("mouseb_turnleft", &mousebturnleft);
+  m_bind_int_variable("mouseb_turnright", &mousebturnright);
+  m_bind_int_variable("mouseb_use", &mousebuse);
+  m_bind_int_variable("mouseb_backward", &mousebbackward);
+  m_bind_int_variable("dclick_use", &dclick_use);
+  m_bind_int_variable("key_pause", &key_pause);
+  m_bind_int_variable("key_message_refresh", &key_message_refresh);
 }
 
-void M_BindHereticControls(void)
+void m_bind_heretic_controls(void)
 {
-    M_BindIntVariable("key_flyup",          &key_flyup);
-    M_BindIntVariable("key_flydown",        &key_flydown);
-    M_BindIntVariable("key_flycenter",      &key_flycenter);
+  m_bind_int_variable("key_flyup", &key_flyup);
+  m_bind_int_variable("key_flydown", &key_flydown);
+  m_bind_int_variable("key_flycenter", &key_flycenter);
 
-    M_BindIntVariable("key_lookup",         &key_lookup);
-    M_BindIntVariable("key_lookdown",       &key_lookdown);
-    M_BindIntVariable("key_lookcenter",     &key_lookcenter);
+  m_bind_int_variable("key_lookup", &key_lookup);
+  m_bind_int_variable("key_lookdown", &key_lookdown);
+  m_bind_int_variable("key_lookcenter", &key_lookcenter);
 
-    M_BindIntVariable("key_invleft",        &key_invleft);
-    M_BindIntVariable("key_invright",       &key_invright);
-    M_BindIntVariable("key_useartifact",    &key_useartifact);
+  m_bind_int_variable("key_invleft", &key_invleft);
+  m_bind_int_variable("key_invright", &key_invright);
+  m_bind_int_variable("key_useartifact", &key_useartifact);
 
-    M_BindIntVariable("mouseb_invleft", &mousebinvleft);
-    M_BindIntVariable("mouseb_invright", &mousebinvright);
-    M_BindIntVariable("mouseb_useartifact", &mousebuseartifact);
+  m_bind_int_variable("mouseb_invleft", &mousebinvleft);
+  m_bind_int_variable("mouseb_invright", &mousebinvright);
+  m_bind_int_variable("mouseb_useartifact", &mousebuseartifact);
 
-    M_BindIntVariable("joyb_invleft", &joybinvleft);
-    M_BindIntVariable("joyb_invright", &joybinvright);
-    M_BindIntVariable("joyb_useartifact", &joybuseartifact);
+  m_bind_int_variable("joyb_invleft", &joybinvleft);
+  m_bind_int_variable("joyb_invright", &joybinvright);
+  m_bind_int_variable("joyb_useartifact", &joybuseartifact);
 
-    M_BindIntVariable("joyb_flyup", &joybflyup);
-    M_BindIntVariable("joyb_flydown", &joybflydown);
-    M_BindIntVariable("joyb_flycenter", &joybflycenter);
+  m_bind_int_variable("joyb_flyup", &joybflyup);
+  m_bind_int_variable("joyb_flydown", &joybflydown);
+  m_bind_int_variable("joyb_flycenter", &joybflycenter);
 
-    M_BindIntVariable("key_arti_quartz",        &key_arti_quartz);
-    M_BindIntVariable("key_arti_urn",           &key_arti_urn);
-    M_BindIntVariable("key_arti_bomb",          &key_arti_bomb);
-    M_BindIntVariable("key_arti_tome",          &key_arti_tome);
-    M_BindIntVariable("key_arti_ring",          &key_arti_ring);
-    M_BindIntVariable("key_arti_chaosdevice",   &key_arti_chaosdevice);
-    M_BindIntVariable("key_arti_shadowsphere",  &key_arti_shadowsphere);
-    M_BindIntVariable("key_arti_wings",         &key_arti_wings);
-    M_BindIntVariable("key_arti_torch",         &key_arti_torch);
-    M_BindIntVariable("key_arti_morph",         &key_arti_morph);
+  m_bind_int_variable("key_arti_quartz", &key_arti_quartz);
+  m_bind_int_variable("key_arti_urn", &key_arti_urn);
+  m_bind_int_variable("key_arti_bomb", &key_arti_bomb);
+  m_bind_int_variable("key_arti_tome", &key_arti_tome);
+  m_bind_int_variable("key_arti_ring", &key_arti_ring);
+  m_bind_int_variable("key_arti_chaosdevice", &key_arti_chaosdevice);
+  m_bind_int_variable("key_arti_shadowsphere", &key_arti_shadowsphere);
+  m_bind_int_variable("key_arti_wings", &key_arti_wings);
+  m_bind_int_variable("key_arti_torch", &key_arti_torch);
+  m_bind_int_variable("key_arti_morph", &key_arti_morph);
 }
 
-void M_BindHexenControls(void)
+void m_bind_hexen_controls(void)
 {
-    M_BindIntVariable("key_jump",           &key_jump);
-    M_BindIntVariable("mouseb_jump",        &mousebjump);
-    M_BindIntVariable("joyb_jump",          &joybjump);
+  m_bind_int_variable("key_jump", &key_jump);
+  m_bind_int_variable("mouseb_jump", &mousebjump);
+  m_bind_int_variable("joyb_jump", &joybjump);
 
-    M_BindIntVariable("key_arti_all",             &key_arti_all);
-    M_BindIntVariable("key_arti_health",          &key_arti_health);
-    M_BindIntVariable("key_arti_poisonbag",       &key_arti_poisonbag);
-    M_BindIntVariable("key_arti_blastradius",     &key_arti_blastradius);
-    M_BindIntVariable("key_arti_teleport",        &key_arti_teleport);
-    M_BindIntVariable("key_arti_teleportother",   &key_arti_teleportother);
-    M_BindIntVariable("key_arti_egg",             &key_arti_egg);
-    M_BindIntVariable("key_arti_invulnerability", &key_arti_invulnerability);
+  m_bind_int_variable("key_arti_all", &key_arti_all);
+  m_bind_int_variable("key_arti_health", &key_arti_health);
+  m_bind_int_variable("key_arti_poisonbag", &key_arti_poisonbag);
+  m_bind_int_variable("key_arti_blastradius", &key_arti_blastradius);
+  m_bind_int_variable("key_arti_teleport", &key_arti_teleport);
+  m_bind_int_variable("key_arti_teleportother", &key_arti_teleportother);
+  m_bind_int_variable("key_arti_egg", &key_arti_egg);
+  m_bind_int_variable("key_arti_invulnerability", &key_arti_invulnerability);
 }
 
-void M_BindStrifeControls(void)
+void m_bind_strife_controls(void)
 {
-    // These are shared with all games, but have different defaults:
-    key_message_refresh = '/';
+  /* These are shared with all games, but have different defaults: */
 
-    // These keys are shared with Heretic/Hexen but have different defaults:
-    key_jump     = 'a';
-    key_lookup   = KEY_PGUP;
-    key_lookdown = KEY_PGDN;
-    key_invleft  = KEY_INS;
-    key_invright = KEY_DEL;
+  key_message_refresh = '/';
 
-    M_BindIntVariable("key_jump",           &key_jump);
-    M_BindIntVariable("key_lookUp",         &key_lookup);
-    M_BindIntVariable("key_lookDown",       &key_lookdown);
-    M_BindIntVariable("key_invLeft",        &key_invleft);
-    M_BindIntVariable("key_invRight",       &key_invright);
+  /* These keys are shared with Heretic/Hexen but have different defaults: */
 
-    // Custom Strife-only Keys:
-    M_BindIntVariable("key_useHealth",      &key_usehealth);
-    M_BindIntVariable("key_invquery",       &key_invquery);
-    M_BindIntVariable("key_mission",        &key_mission);
-    M_BindIntVariable("key_invPop",         &key_invpop);
-    M_BindIntVariable("key_invKey",         &key_invkey);
-    M_BindIntVariable("key_invHome",        &key_invhome);
-    M_BindIntVariable("key_invEnd",         &key_invend);
-    M_BindIntVariable("key_invUse",         &key_invuse);
-    M_BindIntVariable("key_invDrop",        &key_invdrop);
+  key_jump = 'a';
+  key_lookup = KEY_PGUP;
+  key_lookdown = KEY_PGDN;
+  key_invleft = KEY_INS;
+  key_invright = KEY_DEL;
 
-    // Strife also supports jump on mouse and joystick, and in the exact same
-    // manner as Hexen!
-    M_BindIntVariable("mouseb_jump",        &mousebjump);
-    M_BindIntVariable("joyb_jump",          &joybjump);
+  m_bind_int_variable("key_jump", &key_jump);
+  m_bind_int_variable("key_look_up", &key_lookup);
+  m_bind_int_variable("key_look_down", &key_lookdown);
+  m_bind_int_variable("key_inv_left", &key_invleft);
+  m_bind_int_variable("key_inv_right", &key_invright);
 
-    // Subset of inventory actions common to Heretic/Hexen and Strife.
-    M_BindIntVariable("joyb_invleft",       &joybinvleft);
-    M_BindIntVariable("joyb_invright",      &joybinvright);
-    // This is technically "invuse" in Strife, but let's reuse the value.
-    M_BindIntVariable("joyb_useartifact",   &joybuseartifact);
+  /* Custom Strife-only Keys: */
+
+  m_bind_int_variable("key_use_health", &key_usehealth);
+  m_bind_int_variable("key_invquery", &key_invquery);
+  m_bind_int_variable("key_mission", &key_mission);
+  m_bind_int_variable("key_inv_pop", &key_invpop);
+  m_bind_int_variable("key_inv_key", &key_invkey);
+  m_bind_int_variable("key_invHome", &key_invhome);
+  m_bind_int_variable("key_inv_end", &key_invend);
+  m_bind_int_variable("key_inv_use", &key_invuse);
+  m_bind_int_variable("key_inv_drop", &key_invdrop);
+
+  /* Strife also supports jump on mouse and joystick, and in the exact same
+   * manner as Hexen!
+   */
+
+  m_bind_int_variable("mouseb_jump", &mousebjump);
+  m_bind_int_variable("joyb_jump", &joybjump);
+
+  /* Subset of inventory actions common to Heretic/Hexen and Strife. */
+
+  m_bind_int_variable("joyb_invleft", &joybinvleft);
+  m_bind_int_variable("joyb_invright", &joybinvright);
+
+  /* This is technically "invuse" in Strife, but let's reuse the value. */
+
+  m_bind_int_variable("joyb_useartifact", &joybuseartifact);
 }
 
-void M_BindWeaponControls(void)
+void m_bind_weapon_controls(void)
 {
-    M_BindIntVariable("key_weapon1",        &key_weapon1);
-    M_BindIntVariable("key_weapon2",        &key_weapon2);
-    M_BindIntVariable("key_weapon3",        &key_weapon3);
-    M_BindIntVariable("key_weapon4",        &key_weapon4);
-    M_BindIntVariable("key_weapon5",        &key_weapon5);
-    M_BindIntVariable("key_weapon6",        &key_weapon6);
-    M_BindIntVariable("key_weapon7",        &key_weapon7);
-    M_BindIntVariable("key_weapon8",        &key_weapon8);
+  m_bind_int_variable("key_weapon1", &key_weapon1);
+  m_bind_int_variable("key_weapon2", &key_weapon2);
+  m_bind_int_variable("key_weapon3", &key_weapon3);
+  m_bind_int_variable("key_weapon4", &key_weapon4);
+  m_bind_int_variable("key_weapon5", &key_weapon5);
+  m_bind_int_variable("key_weapon6", &key_weapon6);
+  m_bind_int_variable("key_weapon7", &key_weapon7);
+  m_bind_int_variable("key_weapon8", &key_weapon8);
 
-    M_BindIntVariable("key_prevweapon",     &key_prevweapon);
-    M_BindIntVariable("key_nextweapon",     &key_nextweapon);
+  m_bind_int_variable("key_prevweapon", &key_prevweapon);
+  m_bind_int_variable("key_nextweapon", &key_nextweapon);
 
-    M_BindIntVariable("joyb_prevweapon",    &joybprevweapon);
-    M_BindIntVariable("joyb_nextweapon",    &joybnextweapon);
+  m_bind_int_variable("joyb_prevweapon", &joybprevweapon);
+  m_bind_int_variable("joyb_nextweapon", &joybnextweapon);
 
-    M_BindIntVariable("mouseb_prevweapon",  &mousebprevweapon);
-    M_BindIntVariable("mouseb_nextweapon",  &mousebnextweapon);
+  m_bind_int_variable("mouseb_prevweapon", &mousebprevweapon);
+  m_bind_int_variable("mouseb_nextweapon", &mousebnextweapon);
 }
 
-void M_BindMapControls(void)
+void m_bind_map_controls(void)
 {
-    M_BindIntVariable("key_map_north",      &key_map_north);
-    M_BindIntVariable("key_map_south",      &key_map_south);
-    M_BindIntVariable("key_map_east",       &key_map_east);
-    M_BindIntVariable("key_map_west",       &key_map_west);
-    M_BindIntVariable("key_map_zoomin",     &key_map_zoomin);
-    M_BindIntVariable("key_map_zoomout",    &key_map_zoomout);
-    M_BindIntVariable("key_map_toggle",     &key_map_toggle);
-    M_BindIntVariable("key_map_maxzoom",    &key_map_maxzoom);
-    M_BindIntVariable("key_map_follow",     &key_map_follow);
-    M_BindIntVariable("key_map_grid",       &key_map_grid);
-    M_BindIntVariable("key_map_mark",       &key_map_mark);
-    M_BindIntVariable("key_map_clearmark",  &key_map_clearmark);
+  m_bind_int_variable("key_map_north", &key_map_north);
+  m_bind_int_variable("key_map_south", &key_map_south);
+  m_bind_int_variable("key_map_east", &key_map_east);
+  m_bind_int_variable("key_map_west", &key_map_west);
+  m_bind_int_variable("key_map_zoomin", &key_map_zoomin);
+  m_bind_int_variable("key_map_zoomout", &key_map_zoomout);
+  m_bind_int_variable("key_map_toggle", &key_map_toggle);
+  m_bind_int_variable("key_map_maxzoom", &key_map_maxzoom);
+  m_bind_int_variable("key_map_follow", &key_map_follow);
+  m_bind_int_variable("key_map_grid", &key_map_grid);
+  m_bind_int_variable("key_map_mark", &key_map_mark);
+  m_bind_int_variable("key_map_clearmark", &key_map_clearmark);
 }
 
-void M_BindMenuControls(void)
+void m_bind_menu_controls(void)
 {
-    M_BindIntVariable("key_menu_activate",  &key_menu_activate);
-    M_BindIntVariable("key_menu_up",        &key_menu_up);
-    M_BindIntVariable("key_menu_down",      &key_menu_down);
-    M_BindIntVariable("key_menu_left",      &key_menu_left);
-    M_BindIntVariable("key_menu_right",     &key_menu_right);
-    M_BindIntVariable("key_menu_back",      &key_menu_back);
-    M_BindIntVariable("key_menu_forward",   &key_menu_forward);
-    M_BindIntVariable("key_menu_confirm",   &key_menu_confirm);
-    M_BindIntVariable("key_menu_abort",     &key_menu_abort);
+  m_bind_int_variable("key_menu_activate", &key_menu_activate);
+  m_bind_int_variable("key_menu_up", &key_menu_up);
+  m_bind_int_variable("key_menu_down", &key_menu_down);
+  m_bind_int_variable("key_menu_left", &key_menu_left);
+  m_bind_int_variable("key_menu_right", &key_menu_right);
+  m_bind_int_variable("key_menu_back", &key_menu_back);
+  m_bind_int_variable("key_menu_forward", &key_menu_forward);
+  m_bind_int_variable("key_menu_confirm", &key_menu_confirm);
+  m_bind_int_variable("key_menu_abort", &key_menu_abort);
 
-    M_BindIntVariable("key_menu_help",      &key_menu_help);
-    M_BindIntVariable("key_menu_save",      &key_menu_save);
-    M_BindIntVariable("key_menu_load",      &key_menu_load);
-    M_BindIntVariable("key_menu_volume",    &key_menu_volume);
-    M_BindIntVariable("key_menu_detail",    &key_menu_detail);
-    M_BindIntVariable("key_menu_qsave",     &key_menu_qsave);
-    M_BindIntVariable("key_menu_endgame",   &key_menu_endgame);
-    M_BindIntVariable("key_menu_messages",  &key_menu_messages);
-    M_BindIntVariable("key_menu_qload",     &key_menu_qload);
-    M_BindIntVariable("key_menu_quit",      &key_menu_quit);
-    M_BindIntVariable("key_menu_gamma",     &key_menu_gamma);
+  m_bind_int_variable("key_menu_help", &key_menu_help);
+  m_bind_int_variable("key_menu_save", &key_menu_save);
+  m_bind_int_variable("key_menu_load", &key_menu_load);
+  m_bind_int_variable("key_menu_volume", &key_menu_volume);
+  m_bind_int_variable("key_menu_detail", &key_menu_detail);
+  m_bind_int_variable("key_menu_qsave", &key_menu_qsave);
+  m_bind_int_variable("key_menu_endgame", &key_menu_endgame);
+  m_bind_int_variable("key_menu_messages", &key_menu_messages);
+  m_bind_int_variable("key_menu_qload", &key_menu_qload);
+  m_bind_int_variable("key_menu_quit", &key_menu_quit);
+  m_bind_int_variable("key_menu_gamma", &key_menu_gamma);
 
-    M_BindIntVariable("key_menu_incscreen", &key_menu_incscreen);
-    M_BindIntVariable("key_menu_decscreen", &key_menu_decscreen);
-    M_BindIntVariable("key_menu_screenshot",&key_menu_screenshot);
-    M_BindIntVariable("key_demo_quit",      &key_demo_quit);
-    M_BindIntVariable("key_spy",            &key_spy);
+  m_bind_int_variable("key_menu_incscreen", &key_menu_incscreen);
+  m_bind_int_variable("key_menu_decscreen", &key_menu_decscreen);
+  m_bind_int_variable("key_menu_screenshot", &key_menu_screenshot);
+  m_bind_int_variable("key_demo_quit", &key_demo_quit);
+  m_bind_int_variable("key_spy", &key_spy);
 }
 
-void M_BindChatControls(unsigned int num_players)
+void m_bind_chat_controls(unsigned int num_players)
 {
-    char name[32];  // haleyjd: 20 not large enough - Thank you, come again!
-    unsigned int i; // haleyjd: signedness conflict
+  char name[32];  /* haleyjd: 20 not large enough - Thank you, come again! */
+  unsigned int i; /* haleyjd: signedness conflict */
 
-    M_BindIntVariable("key_multi_msg",     &key_multi_msg);
+  m_bind_int_variable("key_multi_msg", &key_multi_msg);
 
-    for (i=0; i<num_players; ++i)
+  for (i = 0; i < num_players; ++i)
     {
-        M_snprintf(name, sizeof(name), "key_multi_msgplayer%i", i + 1);
-        M_BindIntVariable(name, &key_multi_msgplayer[i]);
+      snprintf(name, sizeof(name), "key_multi_msgplayer%i", i + 1);
+      m_bind_int_variable(name, &key_multi_msgplayer[i]);
     }
 }
 
-//
-// Apply custom patches to the default values depending on the
-// platform we are running on.
-//
+/* Apply custom patches to the default values depending on the
+ * platform we are running on.
+ */
 
-void M_ApplyPlatformDefaults(void)
+void m_apply_platform_defaults(void)
 {
-    // no-op. Add your platform-specific patches here.
+  /* no-op. Add your platform-specific patches here. */
 }
-
diff --git a/games/NXDoom/src/m_controls.h b/games/NXDoom/src/m_controls.h
index 7a8a2eafa..fb756ec11 100644
--- a/games/NXDoom/src/m_controls.h
+++ b/games/NXDoom/src/m_controls.h
@@ -1,22 +1,31 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/m_controls.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef __M_CONTROLS_H__
 #define __M_CONTROLS_H__
- 
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern int key_right;
 extern int key_left;
 
@@ -30,7 +39,7 @@ extern int key_strafe;
 extern int key_speed;
 
 extern int key_jump;
- 
+
 extern int key_flyup;
 extern int key_flydown;
 extern int key_flycenter;
@@ -41,7 +50,8 @@ extern int key_invleft;
 extern int key_invright;
 extern int key_useartifact;
 
-// villsa [STRIFE] strife keys
+/* villsa [STRIFE] strife keys */
+
 extern int key_usehealth;
 extern int key_invquery;
 extern int key_mission;
@@ -105,7 +115,7 @@ extern int key_map_grid;
 extern int key_map_mark;
 extern int key_map_clearmark;
 
-// menu keys:
+/* menu keys: */
 
 extern int key_menu_activate;
 extern int key_menu_up;
@@ -179,16 +189,19 @@ extern int joybflycenter;
 
 extern int dclick_use;
 
-void M_BindBaseControls(void);
-void M_BindHereticControls(void);
-void M_BindHexenControls(void);
-void M_BindStrifeControls(void);
-void M_BindWeaponControls(void);
-void M_BindMapControls(void);
-void M_BindMenuControls(void);
-void M_BindChatControls(unsigned int num_players);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void M_ApplyPlatformDefaults(void);
+void m_bind_base_controls(void);
+void m_bind_heretic_controls(void);
+void m_bind_hexen_controls(void);
+void m_bind_strife_controls(void);
+void m_bind_weapon_controls(void);
+void m_bind_map_controls(void);
+void m_bind_menu_controls(void);
+void m_bind_chat_controls(unsigned int num_players);
 
-#endif /* #ifndef __M_CONTROLS_H__ */
+void m_apply_platform_defaults(void);
 
+#endif /* __M_CONTROLS_H__ */
diff --git a/games/NXDoom/src/m_fixed.c b/games/NXDoom/src/m_fixed.c
index d2c181847..c8931d96c 100644
--- a/games/NXDoom/src/m_fixed.c
+++ b/games/NXDoom/src/m_fixed.c
@@ -1,22 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Fixed point implementation.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_fixed.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Fixed point implementation.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "stdlib.h"
 
@@ -25,38 +32,31 @@
 
 #include "m_fixed.h"
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
+/* Fixme. __USE_C_FIXED__ or something. */
 
-
-// Fixme. __USE_C_FIXED__ or something.
-
-fixed_t
-FixedMul
-( fixed_t	a,
-  fixed_t	b )
+fixed_t fixed_mul(fixed_t a, fixed_t b)
 {
-    return ((int64_t) a * (int64_t) b) >> FRACBITS;
+  return ((int64_t)a * (int64_t)b) >> FRACBITS;
 }
 
+/* fixed_div, C version. */
 
-
-//
-// FixedDiv, C version.
-//
-
-fixed_t FixedDiv(fixed_t a, fixed_t b)
+fixed_t fixed_div(fixed_t a, fixed_t b)
 {
-    if ((abs(a) >> 14) >= abs(b))
+  if ((abs(a) >> 14) >= abs(b))
     {
-	return (a^b) < 0 ? INT_MIN : INT_MAX;
+      return (a ^ b) < 0 ? INT_MIN : INT_MAX;
     }
-    else
+  else
     {
-	int64_t result;
+      int64_t result;
 
-	result = ((int64_t) a << FRACBITS) / b;
+      result = ((int64_t)a << FRACBITS) / b;
 
-	return (fixed_t) result;
+      return (fixed_t)result;
     }
 }
-
diff --git a/games/NXDoom/src/m_fixed.h b/games/NXDoom/src/m_fixed.h
index 733b2901c..abb837b31 100644
--- a/games/NXDoom/src/m_fixed.h
+++ b/games/NXDoom/src/m_fixed.h
@@ -1,39 +1,49 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Fixed point arithemtics, implementation.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_fixed.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Fixed point arithemtics, implementation.
+ *
+ ****************************************************************************/
 
 #ifndef __M_FIXED__
 #define __M_FIXED__
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+/* Fixed point, 32bit as 16.16. */
 
+#define FRACBITS 16
+#define FRACUNIT (1 << FRACBITS)
 
-//
-// Fixed point, 32bit as 16.16.
-//
-#define FRACBITS		16
-#define FRACUNIT		(1<<FRACBITS)
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef int fixed_t;
 
-fixed_t FixedMul	(fixed_t a, fixed_t b);
-fixed_t FixedDiv	(fixed_t a, fixed_t b);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+fixed_t fixed_mul(fixed_t a, fixed_t b);
+fixed_t fixed_div(fixed_t a, fixed_t b);
 
-
-#endif
+#endif /* __M_FIXED__ */
diff --git a/games/NXDoom/src/m_misc.c b/games/NXDoom/src/m_misc.c
index daa58ff05..515ff46f0 100644
--- a/games/NXDoom/src/m_misc.c
+++ b/games/NXDoom/src/m_misc.c
@@ -1,37 +1,38 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Miscellaneous.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/m_misc.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Miscellaneous.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
+#include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <io.h>
-#include <direct.h>
-#else
 #include <sys/types.h>
-#endif
 
 #include "doomtype.h"
 
@@ -39,926 +40,581 @@
 #include "m_misc.h"
 #include "z_zone.h"
 
-#ifdef _WIN32
-static wchar_t *ConvertMultiByteToWide(const char *str, UINT code_page)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void m_make_directory(const char *path)
 {
-    wchar_t *wstr = NULL;
-    int wlen = 0;
-
-    wlen = MultiByteToWideChar(code_page, 0, str, -1, NULL, 0);
-
-    if (!wlen)
-    {
-        errno = EINVAL;
-        printf("ConvertMultiByteToWide: Failed to convert path to wide encoding.\n");
-        return NULL;
-    }
-
-    wstr = malloc(sizeof(wchar_t) * wlen);
-
-    if (!wstr)
-    {
-        I_Error("ConvertMultiByteToWide: Failed to allocate new string.");
-        return NULL;
-    }
-
-    if (MultiByteToWideChar(code_page, 0, str, -1, wstr, wlen) == 0)
-    {
-        errno = EINVAL;
-        printf("ConvertMultiByteToWide: Failed to convert path to wide encoding.\n");
-        free(wstr);
-        return NULL;
-    }
-
-    return wstr;
+  mkdir(path, 0755);
 }
 
-static char *ConvertWideToMultiByte(const wchar_t *wstr, UINT code_page)
+boolean m_file_exists(const char *filename)
 {
-    char *str = NULL;
-    int len = 0;
+  FILE *fstream;
 
-    len = WideCharToMultiByte(code_page, 0, wstr, -1, NULL, 0, NULL, NULL);
+  fstream = fopen(filename, "r");
 
-    if (!len)
+  if (fstream != NULL)
     {
-        errno = EINVAL;
-        printf("ConvertWideToMultiByte: Failed to convert path to multibyte encoding.\n");
-        return NULL;
+      fclose(fstream);
+      return true;
     }
-
-    str = malloc(sizeof(char) * len);
-
-    if (!str)
+  else
     {
-        I_Error("ConvertWideToMultiByte: Failed to allocate new string.");
-        return NULL;
-    }
+      /* If we can't open because the file is a directory, the
+       * "file" exists at least!
+       */
 
-    if (WideCharToMultiByte(code_page, 0, wstr, -1, str, len, NULL, NULL) == 0)
-    {
-        errno = EINVAL;
-        printf("ConvertWideToMultiByte: Failed to convert path to multibyte encoding.\n");
-        free(str);
-        return NULL;
+      return errno == EISDIR;
     }
-
-    return str;
 }
 
-// Convert wide string to a UTF8 string. The result is newly allocated and must
-// be freed by the caller after use.
+/* Check if a file exists by probing for common case variation of its
+ * filename. Returns a newly allocated string that the caller is responsible
+ * for freeing.
+ */
 
-char *M_ConvertWideToUtf8(const wchar_t *wstr)
+char *m_file_case_exists(const char *path)
 {
-    return ConvertWideToMultiByte(wstr, CP_UTF8);
-}
+  char *path_dup;
+  char *filename;
+  char *ext;
 
-// Convert UTF8 string to a wide string. The result is newly allocated and must
-// be freed by the caller after use.
+  path_dup = m_string_duplicate(path);
 
-wchar_t *M_ConvertUtf8ToWide(const char *str)
-{
-    return ConvertMultiByteToWide(str, CP_UTF8);
-}
-#endif
+  /* 0: actual path */
 
-FILE *M_fopen(const char *filename, const char *mode)
-{
-#ifdef _WIN32
-    FILE *file;
-    wchar_t *wname = NULL;
-    wchar_t *wmode = NULL;
-
-    wname = M_ConvertUtf8ToWide(filename);
-
-    if (!wname)
+  if (m_file_exists(path_dup))
     {
-        return NULL;
+      return path_dup;
     }
 
-    wmode = M_ConvertUtf8ToWide(mode);
-
-    if (!wmode)
+  filename = strrchr(path_dup, DIR_SEPARATOR);
+  if (filename != NULL)
     {
-        free(wname);
-        return NULL;
+      filename++;
+    }
+  else
+    {
+      filename = path_dup;
     }
 
-    file = _wfopen(wname, wmode);
+  /* 1: lowercase filename, e.g. doom2.wad */
 
-    free(wname);
-    free(wmode);
+  m_force_lowercase(filename);
 
-    return file;
-#else
-    return fopen(filename, mode);
-#endif
-}
-
-int M_remove(const char *path)
-{
-#ifdef _WIN32
-    wchar_t *wpath = NULL;
-    int ret;
-
-    wpath = M_ConvertUtf8ToWide(path);
-
-    if (!wpath)
+  if (m_file_exists(path_dup))
     {
-        return 0;
+      return path_dup;
     }
 
-    ret = _wremove(wpath);
+  /* 2: uppercase filename, e.g. DOOM2.WAD */
 
-    free(wpath);
+  m_force_uppercase(filename);
 
-    return ret;
-#else
-    return remove(path);
-#endif
-}
-
-int M_rename(const char *oldname, const char *newname)
-{
-#ifdef _WIN32
-    wchar_t *wold = NULL;
-    wchar_t *wnew = NULL;
-    int ret;
-
-    wold = M_ConvertUtf8ToWide(oldname);
-
-    if (!wold)
+  if (m_file_exists(path_dup))
     {
-        return 0;
+      return path_dup;
     }
 
-    wnew = M_ConvertUtf8ToWide(newname);
+  /* 3. uppercase basename with lowercase extension, e.g. DOOM2.wad */
 
-    if (!wnew)
+  ext = strrchr(path_dup, '.');
+  if (ext != NULL && ext > filename)
     {
-        free(wold);
-        return 0;
-    }
+      m_force_lowercase(ext + 1);
 
-    ret = _wrename(wold, wnew);
-
-    free(wold);
-    free(wnew);
-
-    return ret;
-#else
-    return rename(oldname, newname);
-#endif
-}
-
-int M_stat(const char *path, struct stat *buf)
-{
-#ifdef _WIN32
-    wchar_t *wpath = NULL;
-    struct _stat wbuf;
-    int ret;
-
-    wpath = M_ConvertUtf8ToWide(path);
-
-    if (!wpath)
-    {
-        return -1;
-    }
-
-    ret = _wstat(wpath, &wbuf);
-
-    // The _wstat() function expects a struct _stat* parameter that is
-    // incompatible with struct stat*. We copy only the required compatible
-    // field.
-    buf->st_mode = wbuf.st_mode;
-
-    free(wpath);
-
-    return ret;
-#else
-    return stat(path, buf);
-#endif
-}
-
-#ifdef _WIN32
-typedef struct {
-    char *var;
-    const char *name;
-} env_var_t;
-
-static env_var_t *env_vars;
-static int num_vars;
-#endif
-
-char *M_getenv(const char *name)
-{
-#ifdef _WIN32
-    int i;
-    wchar_t *wenv = NULL, *wname = NULL;
-    char *env = NULL;
-
-    for (i = 0; i < num_vars; ++i)
-    {
-        if (!strcasecmp(name, env_vars[i].name))
+      if (m_file_exists(path_dup))
         {
-            return env_vars[i].var;
+          return path_dup;
         }
     }
 
-    wname = M_ConvertUtf8ToWide(name);
+  /* 4. lowercase filename with uppercase first letter, e.g. Doom2.wad */
 
-    if (!wname)
+  if (strlen(filename) > 1)
     {
-        return NULL;
-    }
+      m_force_lowercase(filename + 1);
 
-    wenv = _wgetenv(wname);
-
-    free(wname);
-
-    if (wenv)
-    {
-        env = M_ConvertWideToUtf8(wenv);
-    }
-    else
-    {
-        env = NULL;
-    }
-
-    env_vars = I_Realloc(env_vars, (num_vars + 1) * sizeof(*env_vars));
-    env_vars[num_vars].var = env;
-    env_vars[num_vars].name = M_StringDuplicate(name);
-    ++num_vars;
-
-    return env;
-#else
-    return getenv(name);
-#endif
-}
-
-//
-// Create a directory
-//
-
-void M_MakeDirectory(const char *path)
-{
-#ifdef _WIN32
-    wchar_t *wdir;
-
-    wdir = M_ConvertUtf8ToWide(path);
-
-    if (!wdir)
-    {
-        return;
-    }
-
-    _wmkdir(wdir);
-
-    free(wdir);
-#else
-    mkdir(path, 0755);
-#endif
-}
-
-// Check if a file exists
-
-boolean M_FileExists(const char *filename)
-{
-    FILE *fstream;
-
-    fstream = M_fopen(filename, "r");
-
-    if (fstream != NULL)
-    {
-        fclose(fstream);
-        return true;
-    }
-    else
-    {
-        // If we can't open because the file is a directory, the 
-        // "file" exists at least!
-
-        return errno == EISDIR;
-    }
-}
-
-// Check if a file exists by probing for common case variation of its filename.
-// Returns a newly allocated string that the caller is responsible for freeing.
-
-char *M_FileCaseExists(const char *path)
-{
-    char *path_dup, *filename, *ext;
-
-    path_dup = M_StringDuplicate(path);
-
-    // 0: actual path
-    if (M_FileExists(path_dup))
-    {
-        return path_dup;
-    }
-
-    filename = strrchr(path_dup, DIR_SEPARATOR);
-    if (filename != NULL)
-    {
-        filename++;
-    }
-    else
-    {
-        filename = path_dup;
-    }
-
-    // 1: lowercase filename, e.g. doom2.wad
-    M_ForceLowercase(filename);
-
-    if (M_FileExists(path_dup))
-    {
-        return path_dup;
-    }
-
-    // 2: uppercase filename, e.g. DOOM2.WAD
-    M_ForceUppercase(filename);
-
-    if (M_FileExists(path_dup))
-    {
-        return path_dup;
-    }
-
-    // 3. uppercase basename with lowercase extension, e.g. DOOM2.wad
-    ext = strrchr(path_dup, '.');
-    if (ext != NULL && ext > filename)
-    {
-        M_ForceLowercase(ext + 1);
-
-        if (M_FileExists(path_dup))
+      if (m_file_exists(path_dup))
         {
-            return path_dup;
+          return path_dup;
         }
     }
 
-    // 4. lowercase filename with uppercase first letter, e.g. Doom2.wad
-    if (strlen(filename) > 1)
-    {
-        M_ForceLowercase(filename + 1);
+  /* 5. no luck */
 
-        if (M_FileExists(path_dup))
+  free(path_dup);
+  return NULL;
+}
+
+long m_file_length(FILE *handle)
+{
+  long savedpos;
+  long length;
+
+  /* save the current position in the file */
+
+  savedpos = ftell(handle);
+
+  /* jump to the end and find the length */
+
+  fseek(handle, 0, SEEK_END);
+  length = ftell(handle);
+
+  /* go back to the old location */
+
+  fseek(handle, savedpos, SEEK_SET);
+
+  return length;
+}
+
+boolean m_write_file(const char *name, const void *source, int length)
+{
+  FILE *handle;
+  int count;
+
+  handle = fopen(name, "wb");
+
+  if (handle == NULL) return false;
+
+  count = fwrite(source, 1, length, handle);
+  fclose(handle);
+
+  if (count < length) return false;
+
+  return true;
+}
+
+int m_read_file(const char *name, byte **buffer)
+{
+  FILE *handle;
+  int count;
+  int length;
+  byte *buf;
+
+  handle = fopen(name, "rb");
+  if (handle == NULL) i_error("Couldn't read file %s", name);
+
+  /* find the size of the file by seeking to the end and
+   * reading the current position
+   */
+
+  length = m_file_length(handle);
+
+  buf = z_malloc(length + 1, PU_STATIC, NULL);
+  count = fread(buf, 1, length, handle);
+  fclose(handle);
+
+  if (count < length) i_error("Couldn't read file %s", name);
+
+  buf[length] = '\0';
+  *buffer = buf;
+  return length;
+}
+
+/* Returns the path to a temporary file of the given name, stored
+ * inside the system temporary directory.
+ *
+ * The returned value must be freed with z_free after use.
+ */
+
+char *m_temp_file(const char *s)
+{
+  const char *tempdir;
+
+  /* Check the $TMPDIR environment variable to find the location. */
+
+  tempdir = getenv("TMPDIR");
+
+  if (tempdir == NULL)
+    {
+      tempdir = "/tmp";
+    }
+
+  return m_string_join(tempdir, DIR_SEPARATOR_S, s, NULL);
+}
+
+boolean m_str_to_int(const char *str, int *result)
+{
+  return sscanf(str, " 0x%x", (unsigned int *)result) == 1 ||
+         sscanf(str, " 0X%x", (unsigned int *)result) == 1 ||
+         sscanf(str, " 0%o", (unsigned int *)result) == 1 ||
+         sscanf(str, " %d", result) == 1;
+}
+
+/* Returns the directory portion of the given path, without the trailing
+ * slash separator character. If no directory is described in the path,
+ * the string "." is returned. In either case, the result is newly allocated
+ * and must be freed by the caller after use.
+ */
+
+char *m_dir_name(const char *path)
+{
+  char *result;
+  const char *pf;
+  const char *pb;
+
+  pf = strrchr(path, '/');
+  pb = NULL;
+
+  if (pf == NULL && pb == NULL)
+    {
+      return m_string_duplicate(".");
+    }
+  else
+    {
+      const char *p = (pb > pf) ? pb : pf;
+      result = m_string_duplicate(path);
+      result[p - path] = '\0';
+      return result;
+    }
+}
+
+/* Returns the base filename described by the given path (without the
+ * directory name). The result points inside path and nothing new is
+ * allocated.
+ */
+
+const char *m_base_name(const char *path)
+{
+  const char *pf;
+  const char *pb;
+
+  pf = strrchr(path, '/');
+  pb = NULL;
+
+  if (pf == NULL && pb == NULL)
+    {
+      return path;
+    }
+  else
+    {
+      const char *p = (pb > pf) ? pb : pf;
+      return p + 1;
+    }
+}
+
+void m_extract_file_base(const char *path, char *dest)
+{
+  const char *src;
+  const char *filename;
+  int length;
+
+  src = path + strlen(path) - 1;
+
+  /* back up until a \ or the start */
+
+  while (src != path && *(src - 1) != DIR_SEPARATOR)
+    {
+      src--;
+    }
+
+  filename = src;
+
+  /* Copy up to eight characters
+   * Note: Vanilla Doom exits with an error if a filename is specified
+   * with a base of more than eight characters.  To remove the 8.3
+   * filename limit, instead we simply truncate the name.
+   */
+
+  length = 0;
+  memset(dest, 0, 8);
+
+  while (*src != '\0' && *src != '.')
+    {
+      if (length >= 8)
         {
-            return path_dup;
+          printf("Warning: Truncated '%s' lump name to '%.8s'.\n", filename,
+                 dest);
+          break;
+        }
+
+      dest[length++] = toupper((int)*src++);
+    }
+}
+
+/****************************************************************************
+ * Name: m_force_uppercase
+ *
+ * Description:
+ *  (PROC) Change string to uppercase.
+ *
+ ****************************************************************************/
+
+void m_force_uppercase(char *text)
+{
+  char *p;
+
+  for (p = text; *p != '\0'; ++p)
+    {
+      *p = toupper(*p);
+    }
+}
+
+/****************************************************************************
+ * Name: m_force_lowercase
+ *
+ * Description:
+ *  (PROC) Change string to lowercase.
+ *
+ ****************************************************************************/
+
+void m_force_lowercase(char *text)
+{
+  char *p;
+
+  for (p = text; *p != '\0'; ++p)
+    {
+      *p = tolower(*p);
+    }
+}
+
+/****************************************************************************
+ * Name: m_string_duplicate
+ *
+ * Description:
+ *  Safe version of strdup() that checks the string was successfully
+ *  allocated.
+ *
+ ****************************************************************************/
+
+char *m_string_duplicate(const char *orig)
+{
+  char *result;
+
+  result = strdup(orig);
+
+  if (result == NULL)
+    {
+      i_error("Failed to duplicate string (length %zu)\n", strlen(orig));
+    }
+
+  return result;
+}
+
+char *m_string_replace(const char *haystack, const char *needle,
+                       const char *replacement)
+{
+  char *result;
+  char *dst;
+  const char *p;
+  size_t needle_len = strlen(needle);
+  size_t result_len;
+  size_t dst_len;
+
+  /* Iterate through occurrences of 'needle' and calculate the size of
+   * the new string.
+   */
+
+  result_len = strlen(haystack) + 1;
+  p = haystack;
+
+  for (; ; )
+    {
+      p = strstr(p, needle);
+      if (p == NULL)
+        {
+          break;
+        }
+
+      p += needle_len;
+      result_len += strlen(replacement) - needle_len;
+    }
+
+  /* Construct new string. */
+
+  result = malloc(result_len);
+  if (result == NULL)
+    {
+      i_error("m_string_replace: Failed to allocate new string");
+      return NULL;
+    }
+
+  dst = result;
+  dst_len = result_len;
+  p = haystack;
+
+  while (*p != '\0')
+    {
+      if (!strncmp(p, needle, needle_len))
+        {
+          m_str_copy(dst, replacement, dst_len);
+          p += needle_len;
+          dst += strlen(replacement);
+          dst_len -= strlen(replacement);
+        }
+      else
+        {
+          *dst = *p;
+          ++dst;
+          --dst_len;
+          ++p;
         }
     }
 
-    // 5. no luck
-    free(path_dup);
-    return NULL;
+  *dst = '\0';
+
+  return result;
 }
 
-//
-// Determine the length of an open file.
-//
+/* Safe string copy function that works like OpenBSD's strlcpy().
+ * Returns true if the string was not truncated.
+ */
 
-long M_FileLength(FILE *handle)
-{ 
-    long savedpos;
-    long length;
-
-    // save the current position in the file
-    savedpos = ftell(handle);
-    
-    // jump to the end and find the length
-    fseek(handle, 0, SEEK_END);
-    length = ftell(handle);
-
-    // go back to the old location
-    fseek(handle, savedpos, SEEK_SET);
-
-    return length;
-}
-
-//
-// M_WriteFile
-//
-
-boolean M_WriteFile(const char *name, const void *source, int length)
+boolean m_str_copy(char *dest, const char *src, size_t dest_size)
 {
-    FILE *handle;
-    int	count;
-	
-    handle = M_fopen(name, "wb");
+  size_t len;
 
-    if (handle == NULL)
-	return false;
-
-    count = fwrite(source, 1, length, handle);
-    fclose(handle);
-	
-    if (count < length)
-	return false;
-		
-    return true;
-}
-
-
-//
-// M_ReadFile
-//
-
-int M_ReadFile(const char *name, byte **buffer)
-{
-    FILE *handle;
-    int	count, length;
-    byte *buf;
-	
-    handle = M_fopen(name, "rb");
-    if (handle == NULL)
-	I_Error ("Couldn't read file %s", name);
-
-    // find the size of the file by seeking to the end and
-    // reading the current position
-
-    length = M_FileLength(handle);
-    
-    buf = Z_Malloc (length + 1, PU_STATIC, NULL);
-    count = fread(buf, 1, length, handle);
-    fclose (handle);
-	
-    if (count < length)
-	I_Error ("Couldn't read file %s", name);
-		
-    buf[length] = '\0';
-    *buffer = buf;
-    return length;
-}
-
-// Returns the path to a temporary file of the given name, stored
-// inside the system temporary directory.
-//
-// The returned value must be freed with Z_Free after use.
-
-char *M_TempFile(const char *s)
-{
-    const char *tempdir;
-
-#ifdef _WIN32
-
-    // Check the TEMP environment variable to find the location.
-
-    tempdir = M_getenv("TEMP");
-
-    if (tempdir == NULL)
+  if (dest_size >= 1)
     {
-        tempdir = ".";
+      dest[dest_size - 1] = '\0';
+      strncpy(dest, src, dest_size - 1);
     }
-#else
-    // Check the $TMPDIR environment variable to find the location.
-
-    tempdir = getenv("TMPDIR");
-
-    if (tempdir == NULL)
+  else
     {
-        tempdir = "/tmp";
-    }
-#endif
-
-    return M_StringJoin(tempdir, DIR_SEPARATOR_S, s, NULL);
-}
-
-boolean M_StrToInt(const char *str, int *result)
-{
-    return sscanf(str, " 0x%x", (unsigned int *) result) == 1
-        || sscanf(str, " 0X%x", (unsigned int *) result) == 1
-        || sscanf(str, " 0%o", (unsigned int *) result) == 1
-        || sscanf(str, " %d", result) == 1;
-}
-
-// Returns the directory portion of the given path, without the trailing
-// slash separator character. If no directory is described in the path,
-// the string "." is returned. In either case, the result is newly allocated
-// and must be freed by the caller after use.
-char *M_DirName(const char *path)
-{
-    char *result;
-    const char *pf, *pb;
-
-    pf = strrchr(path, '/');
-#ifdef _WIN32
-    pb = strrchr(path, '\\');
-#else
-    pb = NULL;
-#endif
-    if (pf == NULL && pb == NULL)
-    {
-        return M_StringDuplicate(".");
-    }
-    else
-    {
-        const char *p = (pb > pf) ? pb : pf;
-        result = M_StringDuplicate(path);
-        result[p - path] = '\0';
-        return result;
-    }
-}
-
-// Returns the base filename described by the given path (without the
-// directory name). The result points inside path and nothing new is
-// allocated.
-const char *M_BaseName(const char *path)
-{
-    const char *pf, *pb;
-
-    pf = strrchr(path, '/');
-#ifdef _WIN32
-    pb = strrchr(path, '\\');
-#else
-    pb = NULL;
-#endif
-    if (pf == NULL && pb == NULL)
-    {
-        return path;
-    }
-    else
-    {
-        const char *p = (pb > pf) ? pb : pf;
-        return p + 1;
-    }
-}
-
-void M_ExtractFileBase(const char *path, char *dest)
-{
-    const char *src;
-    const char *filename;
-    int length;
-
-    src = path + strlen(path) - 1;
-
-    // back up until a \ or the start
-    while (src != path && *(src - 1) != DIR_SEPARATOR)
-    {
-	src--;
+      return false;
     }
 
-    filename = src;
+  len = strlen(dest);
+  return src[len] == '\0';
+}
 
-    // Copy up to eight characters
-    // Note: Vanilla Doom exits with an error if a filename is specified
-    // with a base of more than eight characters.  To remove the 8.3
-    // filename limit, instead we simply truncate the name.
+/* Safe string concat function that works like OpenBSD's strlcat().
+ * Returns true if string not truncated.
+ */
 
-    length = 0;
-    memset(dest, 0, 8);
+boolean m_string_concat(char *dest, const char *src, size_t dest_size)
+{
+  size_t offset;
 
-    while (*src != '\0' && *src != '.')
+  offset = strlen(dest);
+  if (offset > dest_size)
     {
-        if (length >= 8)
+      offset = dest_size;
+    }
+
+  return m_str_copy(dest + offset, src, dest_size - offset);
+}
+
+/* Returns true if 's' begins with the specified prefix. */
+
+boolean m_string_starts_with(const char *s, const char *prefix)
+{
+  return strlen(s) >= strlen(prefix) &&
+         strncmp(s, prefix, strlen(prefix)) == 0;
+}
+
+/* Returns true if 's' ends with the specified suffix. */
+
+boolean m_string_ends_with(const char *s, const char *suffix)
+{
+  return strlen(s) >= strlen(suffix) &&
+         strcmp(s + strlen(s) - strlen(suffix), suffix) == 0;
+}
+
+/* Return a newly-malloced string with all the strings given as arguments
+ * concatenated together.
+ */
+
+char *m_string_join(const char *s, ...)
+{
+  char *result;
+  const char *v;
+  va_list args;
+  size_t result_len;
+
+  result_len = strlen(s) + 1;
+
+  va_start(args, s);
+
+  for (; ; )
+    {
+      v = va_arg(args, const char *);
+      if (v == NULL)
         {
-            printf("Warning: Truncated '%s' lump name to '%.8s'.\n",
-                   filename, dest);
-            break;
+          break;
         }
 
-	dest[length++] = toupper((int)*src++);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC M_ForceUppercase
-//
-// Change string to uppercase.
-//
-//---------------------------------------------------------------------------
-
-void M_ForceUppercase(char *text)
-{
-    char *p;
-
-    for (p = text; *p != '\0'; ++p)
-    {
-        *p = toupper(*p);
-    }
-}
-
-//---------------------------------------------------------------------------
-//
-// PROC M_ForceLowercase
-//
-// Change string to lowercase.
-//
-//---------------------------------------------------------------------------
-
-void M_ForceLowercase(char *text)
-{
-    char *p;
-
-    for (p = text; *p != '\0'; ++p)
-    {
-        *p = tolower(*p);
-    }
-}
-
-//
-// M_StrCaseStr
-//
-// Case-insensitive version of strstr()
-//
-
-const char *M_StrCaseStr(const char *haystack, const char *needle)
-{
-    unsigned int haystack_len;
-    unsigned int needle_len;
-    unsigned int len;
-    unsigned int i;
-
-    haystack_len = strlen(haystack);
-    needle_len = strlen(needle);
-
-    if (haystack_len < needle_len)
-    {
-        return NULL;
+      result_len += strlen(v);
     }
 
-    len = haystack_len - needle_len;
+  va_end(args);
 
-    for (i = 0; i <= len; ++i)
+  result = malloc(result_len);
+
+  if (result == NULL)
     {
-        if (!strncasecmp(haystack + i, needle, needle_len))
+      i_error("m_string_join: Failed to allocate new string.");
+      return NULL;
+    }
+
+  m_str_copy(result, s, result_len);
+
+  va_start(args, s);
+
+  for (; ; )
+    {
+      v = va_arg(args, const char *);
+      if (v == NULL)
         {
-            return haystack + i;
+          break;
+        }
+
+      m_string_concat(result, v, result_len);
+    }
+
+  va_end(args);
+
+  return result;
+}
+
+/****************************************************************************
+ * Name: m_normalize_slashes
+ *
+ * Description:
+ *   Remove trailing slashes, translate backslashes to slashes. The string to
+ *   normalize is passed and returned in str.
+ *
+ *   killough 11/98: rewritten
+ *
+ *   [STRIFE] - haleyjd 20110210: Borrowed from Eternity and adapted to
+ *   respect the DIR_SEPARATOR define used by Choco Doom. This routine
+ *   originated in BOOM.
+ *
+ ****************************************************************************/
+
+void m_normalize_slashes(char *str)
+{
+  char *p;
+
+  /* Convert all slashes/backslashes to DIR_SEPARATOR */
+
+  for (p = str; *p; p++)
+    {
+      if ((*p == '/' || *p == '\\') && *p != DIR_SEPARATOR)
+        {
+          *p = DIR_SEPARATOR;
         }
     }
 
-    return NULL;
-}
+  /* Remove trailing slashes */
 
-//
-// Safe version of strdup() that checks the string was successfully
-// allocated.
-//
-
-char *M_StringDuplicate(const char *orig)
-{
-    char *result;
-
-    result = strdup(orig);
-
-    if (result == NULL)
+  while (p > str && *--p == DIR_SEPARATOR)
     {
-        I_Error("Failed to duplicate string (length %zu)\n",
-                strlen(orig));
+      *p = 0;
     }
 
-    return result;
-}
+  /* Collapse multiple slashes */
 
-//
-// String replace function.
-//
-
-char *M_StringReplace(const char *haystack, const char *needle,
-                      const char *replacement)
-{
-    char *result, *dst;
-    const char *p;
-    size_t needle_len = strlen(needle);
-    size_t result_len, dst_len;
-
-    // Iterate through occurrences of 'needle' and calculate the size of
-    // the new string.
-    result_len = strlen(haystack) + 1;
-    p = haystack;
-
-    for (;;)
+  for (p = str; (*str++ = *p); )
     {
-        p = strstr(p, needle);
-        if (p == NULL)
+      if (*p++ == DIR_SEPARATOR)
         {
-            break;
-        }
-
-        p += needle_len;
-        result_len += strlen(replacement) - needle_len;
-    }
-
-    // Construct new string.
-
-    result = malloc(result_len);
-    if (result == NULL)
-    {
-        I_Error("M_StringReplace: Failed to allocate new string");
-        return NULL;
-    }
-
-    dst = result; dst_len = result_len;
-    p = haystack;
-
-    while (*p != '\0')
-    {
-        if (!strncmp(p, needle, needle_len))
-        {
-            M_StringCopy(dst, replacement, dst_len);
-            p += needle_len;
-            dst += strlen(replacement);
-            dst_len -= strlen(replacement);
-        }
-        else
-        {
-            *dst = *p;
-            ++dst; --dst_len;
-            ++p;
-        }
-    }
-
-    *dst = '\0';
-
-    return result;
-}
-
-// Safe string copy function that works like OpenBSD's strlcpy().
-// Returns true if the string was not truncated.
-
-boolean M_StringCopy(char *dest, const char *src, size_t dest_size)
-{
-    size_t len;
-
-    if (dest_size >= 1)
-    {
-        dest[dest_size - 1] = '\0';
-        strncpy(dest, src, dest_size - 1);
-    }
-    else
-    {
-        return false;
-    }
-
-    len = strlen(dest);
-    return src[len] == '\0';
-}
-
-// Safe string concat function that works like OpenBSD's strlcat().
-// Returns true if string not truncated.
-
-boolean M_StringConcat(char *dest, const char *src, size_t dest_size)
-{
-    size_t offset;
-
-    offset = strlen(dest);
-    if (offset > dest_size)
-    {
-        offset = dest_size;
-    }
-
-    return M_StringCopy(dest + offset, src, dest_size - offset);
-}
-
-// Returns true if 's' begins with the specified prefix.
-
-boolean M_StringStartsWith(const char *s, const char *prefix)
-{
-    return strlen(s) >= strlen(prefix)
-        && strncmp(s, prefix, strlen(prefix)) == 0;
-}
-
-// Returns true if 's' ends with the specified suffix.
-
-boolean M_StringEndsWith(const char *s, const char *suffix)
-{
-    return strlen(s) >= strlen(suffix)
-        && strcmp(s + strlen(s) - strlen(suffix), suffix) == 0;
-}
-
-// Return a newly-malloced string with all the strings given as arguments
-// concatenated together.
-
-char *M_StringJoin(const char *s, ...)
-{
-    char *result;
-    const char *v;
-    va_list args;
-    size_t result_len;
-
-    result_len = strlen(s) + 1;
-
-    va_start(args, s);
-    for (;;)
-    {
-        v = va_arg(args, const char *);
-        if (v == NULL)
-        {
-            break;
-        }
-
-        result_len += strlen(v);
-    }
-    va_end(args);
-
-    result = malloc(result_len);
-
-    if (result == NULL)
-    {
-        I_Error("M_StringJoin: Failed to allocate new string.");
-        return NULL;
-    }
-
-    M_StringCopy(result, s, result_len);
-
-    va_start(args, s);
-    for (;;)
-    {
-        v = va_arg(args, const char *);
-        if (v == NULL)
-        {
-            break;
-        }
-
-        M_StringConcat(result, v, result_len);
-    }
-    va_end(args);
-
-    return result;
-}
-
-// On Windows, vsnprintf() is _vsnprintf().
-#ifdef _WIN32
-#if _MSC_VER < 1400 /* not needed for Visual Studio 2008 */
-#define vsnprintf _vsnprintf
-#endif
-#endif
-
-// Safe, portable vsnprintf().
-int M_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args)
-{
-    int result;
-
-    if (buf_len < 1)
-    {
-        return 0;
-    }
-
-    // Windows (and other OSes?) has a vsnprintf() that doesn't always
-    // append a trailing \0. So we must do it, and write into a buffer
-    // that is one byte shorter; otherwise this function is unsafe.
-    result = vsnprintf(buf, buf_len, s, args);
-
-    // If truncated, change the final char in the buffer to a \0.
-    // A negative result indicates a truncated buffer on Windows.
-    if (result < 0 || result >= buf_len)
-    {
-        buf[buf_len - 1] = '\0';
-        result = buf_len - 1;
-    }
-
-    return result;
-}
-
-// Safe, portable snprintf().
-int M_snprintf(char *buf, size_t buf_len, const char *s, ...)
-{
-    va_list args;
-    int result;
-    va_start(args, s);
-    result = M_vsnprintf(buf, buf_len, s, args);
-    va_end(args);
-    return result;
-}
-
-//
-// M_NormalizeSlashes
-//
-// Remove trailing slashes, translate backslashes to slashes
-// The string to normalize is passed and returned in str
-//
-// killough 11/98: rewritten
-//
-// [STRIFE] - haleyjd 20110210: Borrowed from Eternity and adapted to respect
-// the DIR_SEPARATOR define used by Choco Doom. This routine originated in
-// BOOM.
-//
-void M_NormalizeSlashes(char *str)
-{
-    char *p;
-
-    // Convert all slashes/backslashes to DIR_SEPARATOR
-    for (p = str; *p; p++)
-    {
-        if ((*p == '/' || *p == '\\') && *p != DIR_SEPARATOR)
-        {
-            *p = DIR_SEPARATOR;
-        }
-    }
-
-    // Remove trailing slashes
-    while (p > str && *--p == DIR_SEPARATOR)
-    {
-        *p = 0;
-    }
-
-    // Collapse multiple slashes
-    for (p = str; (*str++ = *p); )
-    {
-        if (*p++ == DIR_SEPARATOR)
-        {
-            while (*p == DIR_SEPARATOR)
+          while (*p == DIR_SEPARATOR)
             {
-                p++;
+              p++;
             }
         }
     }
diff --git a/games/NXDoom/src/m_misc.h b/games/NXDoom/src/m_misc.h
index 6dc18ccfa..0b310371e 100644
--- a/games/NXDoom/src/m_misc.h
+++ b/games/NXDoom/src/m_misc.h
@@ -1,107 +1,111 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Miscellaneous.
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/m_misc.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Miscellaneous.
+ *
+ ****************************************************************************/
 
 #ifndef __M_MISC__
 #define __M_MISC__
 
-#include <stdio.h>
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <stdarg.h>
+#include <stdio.h>
 #include <sys/stat.h>
 
 #include "doomtype.h"
 
-#ifdef _WIN32
-wchar_t *M_ConvertUtf8ToWide(const char *str);
-char *M_ConvertWideToUtf8(const wchar_t *wstr);
-#endif
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-FILE *M_fopen(const char *filename, const char *mode);
-int M_remove(const char *path);
-int M_rename(const char *oldname, const char *newname);
-int M_stat(const char *path, struct stat *buf);
-char *M_getenv(const char *name);
-boolean M_WriteFile(const char *name, const void *source, int length);
-int M_ReadFile(const char *name, byte **buffer);
-void M_MakeDirectory(const char *dir);
-char *M_TempFile(const char *s);
-boolean M_FileExists(const char *file);
-char *M_FileCaseExists(const char *file);
-long M_FileLength(FILE *handle);
-boolean M_StrToInt(const char *str, int *result);
-char *M_DirName(const char *path);
-const char *M_BaseName(const char *path);
-void M_ExtractFileBase(const char *path, char *dest);
-void M_ForceUppercase(char *text);
-void M_ForceLowercase(char *text);
-const char *M_StrCaseStr(const char *haystack, const char *needle);
-char *M_StringDuplicate(const char *orig);
-boolean M_StringCopy(char *dest, const char *src, size_t dest_size);
-boolean M_StringConcat(char *dest, const char *src, size_t dest_size);
-char *M_StringReplace(const char *haystack, const char *needle,
-                      const char *replacement);
-char *M_StringJoin(const char *s, ...);
-boolean M_StringStartsWith(const char *s, const char *prefix);
-boolean M_StringEndsWith(const char *s, const char *suffix);
-int M_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args);
-int M_snprintf(char *buf, size_t buf_len, const char *s, ...) PRINTF_ATTR(3, 4);
-void M_NormalizeSlashes(char *str);
+/* debugging code to check there are no loops in a linked list
+ * disabled unless explicitly requested
+ */
 
-
-// debugging code to check there are no loops in a linked list
-// disabled unless explicitly requested
 #ifdef DEBUG_LINKED_LISTS
 
+#define LINKED_LIST_CHECK_NO_CYCLE(list_type, list, next_member)             \
+  do                                                                         \
+    {                                                                        \
+      if (list != NULL)                                                      \
+        {                                                                    \
+          list_type *slow, *fast;                                            \
+          slow = list;                                                       \
+          fast = list->next_member;                                          \
+          while (fast)                                                       \
+            {                                                                \
+              if (!fast->next_member)                                        \
+                {                                                            \
+                  break;                                                     \
+                }                                                            \
+              fast = fast->next_member->next_member;                         \
+              slow = slow->next_member;                                      \
+              if (slow == fast)                                              \
+                {                                                            \
+                  fprintf(stderr, "loop in linked list " #list " in %s:%d",  \
+                          __FILE__, __LINE__);                               \
+                  __builtin_trap();                                          \
+                }                                                            \
+            }                                                                \
+        }                                                                    \
+    }                                                                        \
+  while (0)
 
-#define LINKED_LIST_CHECK_NO_CYCLE(list_type, list, next_member)  \
-    do                                                            \
-    {                                                             \
-        if (list != NULL) {                                       \
-            list_type *slow, *fast;                               \
-            slow = list;                                          \
-            fast = list->next_member;                             \
-            while (fast) {                                        \
-                if (!fast->next_member) {                         \
-                    break;                                        \
-                }                                                 \
-                fast = fast->next_member->next_member;            \
-                slow = slow->next_member;                         \
-                if (slow == fast) {                               \
-                    fprintf(stderr, "loop in linked list " # list " in %s:%d", __FILE__, __LINE__); \
-                    __builtin_trap();                             \
-                }                                                 \
-            }                                                     \
-        }                                                         \
-    } while (0)                                                   \
+#else /* DEBUG_LINKED_LISTS */
 
+#define LINKED_LIST_CHECK_NO_CYCLE(list_type, list, next_member)             \
+  do                                                                         \
+    {                                                                        \
+    }                                                                        \
+  while (0)
 
+#endif /* DEBUG_LINKED_LISTS */
 
-#else  // DEBUG_LINKED_LISTS
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+boolean m_write_file(const char *name, const void *source, int length);
+int m_read_file(const char *name, byte **buffer);
+void m_make_directory(const char *dir);
+char *m_temp_file(const char *s);
+boolean m_file_exists(const char *file);
+char *m_file_case_exists(const char *file);
+long m_file_length(FILE *handle);
+boolean m_str_to_int(const char *str, int *result);
+char *m_dir_name(const char *path);
+const char *m_base_name(const char *path);
+void m_extract_file_base(const char *path, char *dest);
+void m_force_uppercase(char *text);
+void m_force_lowercase(char *text);
+char *m_string_duplicate(const char *orig);
+boolean m_str_copy(char *dest, const char *src, size_t dest_size);
+boolean m_string_concat(char *dest, const char *src, size_t dest_size);
+char *m_string_replace(const char *haystack, const char *needle,
+                       const char *replacement);
+char *m_string_join(const char *s, ...);
+boolean m_string_starts_with(const char *s, const char *prefix);
+boolean m_string_ends_with(const char *s, const char *suffix);
+void m_normalize_slashes(char *str);
 
-#define LINKED_LIST_CHECK_NO_CYCLE(list_type, list, next_member)  \
-    do                                                            \
-    {                                                             \
-    } while (0)                                                   \
-
-
-#endif  // DEBUG_LINKED_LISTS
-
-
-#endif
-
+#endif /* __M_MISC__ */
diff --git a/games/NXDoom/src/memio.c b/games/NXDoom/src/memio.c
index 299a66bf7..aeb8ac8a8 100644
--- a/games/NXDoom/src/memio.c
+++ b/games/NXDoom/src/memio.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Emulates the IO functions in C stdio.h reading and writing to 
-// memory.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/memio.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Emulates the IO functions in C stdio.h reading and writing to
+ * memory.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,174 +33,183 @@
 
 #include "z_zone.h"
 
-typedef enum {
-	MODE_READ,
-	MODE_WRITE,
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef enum
+{
+  MODE_READ,
+  MODE_WRITE,
 } memfile_mode_t;
 
-struct _MEMFILE {
-	unsigned char *buf;
-	size_t buflen;
-	size_t alloced;
-	unsigned int position;
-	memfile_mode_t mode;
+struct _MEMFILE
+{
+  unsigned char *buf;
+  size_t buflen;
+  size_t alloced;
+  unsigned int position;
+  memfile_mode_t mode;
 };
 
-// Open a memory area for reading
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Open a memory area for reading */
 
 MEMFILE *mem_fopen_read(void *buf, size_t buflen)
 {
-	MEMFILE *file;
+  MEMFILE *file;
 
-	file = Z_Malloc(sizeof(MEMFILE), PU_STATIC, 0);
+  file = z_malloc(sizeof(MEMFILE), PU_STATIC, 0);
 
-	file->buf = (unsigned char *) buf;
-	file->buflen = buflen;
-	file->position = 0;
-	file->mode = MODE_READ;
+  file->buf = (unsigned char *)buf;
+  file->buflen = buflen;
+  file->position = 0;
+  file->mode = MODE_READ;
 
-	return file;
+  return file;
 }
 
-// Read bytes
+/* Read bytes */
 
 size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream)
 {
-	size_t items;
+  size_t items;
 
-	if (stream->mode != MODE_READ)
-	{
-		printf("not a read stream\n");
-		return -1;
-	}
+  if (stream->mode != MODE_READ)
+    {
+      printf("not a read stream\n");
+      return -1;
+    }
 
-	// Trying to read more bytes than we have left?
-	
-	items = nmemb;
+  /* Trying to read more bytes than we have left? */
 
-	if (items * size > stream->buflen - stream->position) 
-	{
-		items = (stream->buflen - stream->position) / size;
-	}
-	
-	// Copy bytes to buffer
-	
-	memcpy(buf, stream->buf + stream->position, items * size);
+  items = nmemb;
 
-	// Update position
+  if (items * size > stream->buflen - stream->position)
+    {
+      items = (stream->buflen - stream->position) / size;
+    }
 
-	stream->position += items * size;
-	
-	return items;
+  /* Copy bytes to buffer */
+
+  memcpy(buf, stream->buf + stream->position, items * size);
+
+  /* Update position */
+
+  stream->position += items * size;
+
+  return items;
 }
 
-// Open a memory area for writing
+/* Open a memory area for writing */
 
 MEMFILE *mem_fopen_write(void)
 {
-	MEMFILE *file;
+  MEMFILE *file;
 
-	file = Z_Malloc(sizeof(MEMFILE), PU_STATIC, 0);
+  file = z_malloc(sizeof(MEMFILE), PU_STATIC, 0);
 
-	file->alloced = 1024;
-	file->buf = Z_Malloc(file->alloced, PU_STATIC, 0);
-	file->buflen = 0;
-	file->position = 0;
-	file->mode = MODE_WRITE;
+  file->alloced = 1024;
+  file->buf = z_malloc(file->alloced, PU_STATIC, 0);
+  file->buflen = 0;
+  file->position = 0;
+  file->mode = MODE_WRITE;
 
-	return file;
+  return file;
 }
 
-// Write bytes to stream
+/* Write bytes to stream */
 
-size_t mem_fwrite(const void *ptr, size_t size, size_t nmemb, MEMFILE *stream)
+size_t mem_fwrite(const void *ptr, size_t size, size_t nmemb,
+                  MEMFILE *stream)
 {
-	size_t bytes;
+  size_t bytes;
 
-	if (stream->mode != MODE_WRITE)
-	{
-		return -1;
-	}
-	
-	// More bytes than can fit in the buffer?
-	// If so, reallocate bigger.
+  if (stream->mode != MODE_WRITE)
+    {
+      return -1;
+    }
 
-	bytes = size * nmemb;
-	
-	while (bytes > stream->alloced - stream->position)
-	{
-		unsigned char *newbuf;
+  /* More bytes than can fit in the buffer?
+   * If so, reallocate bigger.
+   */
 
-		newbuf = Z_Malloc(stream->alloced * 2, PU_STATIC, 0);
-		memcpy(newbuf, stream->buf, stream->alloced);
-		Z_Free(stream->buf);
-		stream->buf = newbuf;
-		stream->alloced *= 2;
-	}
+  bytes = size * nmemb;
 
-	// Copy into buffer
-	
-	memcpy(stream->buf + stream->position, ptr, bytes);
-	stream->position += bytes;
+  while (bytes > stream->alloced - stream->position)
+    {
+      unsigned char *newbuf;
 
-	if (stream->position > stream->buflen)
-		stream->buflen = stream->position;
+      newbuf = z_malloc(stream->alloced * 2, PU_STATIC, 0);
+      memcpy(newbuf, stream->buf, stream->alloced);
+      z_free(stream->buf);
+      stream->buf = newbuf;
+      stream->alloced *= 2;
+    }
 
-	return nmemb;
+  /* Copy into buffer */
+
+  memcpy(stream->buf + stream->position, ptr, bytes);
+  stream->position += bytes;
+
+  if (stream->position > stream->buflen) stream->buflen = stream->position;
+
+  return nmemb;
 }
 
 void mem_get_buf(MEMFILE *stream, void **buf, size_t *buflen)
 {
-	*buf = stream->buf;
-	*buflen = stream->buflen;
+  *buf = stream->buf;
+  *buflen = stream->buflen;
 }
 
 void mem_fclose(MEMFILE *stream)
 {
-	if (stream->mode == MODE_WRITE)
-	{
-		Z_Free(stream->buf);
-	}
+  if (stream->mode == MODE_WRITE)
+    {
+      z_free(stream->buf);
+    }
 
-	Z_Free(stream);
+  z_free(stream);
 }
 
 long mem_ftell(MEMFILE *stream)
 {
-	return stream->position;
+  return stream->position;
 }
 
 int mem_fseek(MEMFILE *stream, signed long position, mem_rel_t whence)
 {
-	unsigned int newpos;
+  unsigned int newpos;
 
-	switch (whence)
-	{
-		case MEM_SEEK_SET:
-			newpos = (int) position;
-			break;
+  switch (whence)
+    {
+    case MEM_SEEK_SET:
+      newpos = (int)position;
+      break;
 
-		case MEM_SEEK_CUR:
-			newpos = (int) (stream->position + position);
-			break;
-			
-		case MEM_SEEK_END:
-			newpos = (int) (stream->buflen + position);
-			break;
-		default:
-			return -1;
-	}
+    case MEM_SEEK_CUR:
+      newpos = (int)(stream->position + position);
+      break;
 
-	if (newpos < stream->buflen)
-	{
-		stream->position = newpos;
-		return 0;
-	}
-	else
-	{
-		printf("Error seeking to %u\n", newpos);
-		return -1;
-	}
+    case MEM_SEEK_END:
+      newpos = (int)(stream->buflen + position);
+      break;
+    default:
+      return -1;
+    }
+
+  if (newpos < stream->buflen)
+    {
+      stream->position = newpos;
+      return 0;
+    }
+  else
+    {
+      printf("Error seeking to %u\n", newpos);
+      return -1;
+    }
 }
-
-
diff --git a/games/NXDoom/src/memio.h b/games/NXDoom/src/memio.h
index 03706a317..275fbc753 100644
--- a/games/NXDoom/src/memio.h
+++ b/games/NXDoom/src/memio.h
@@ -1,38 +1,51 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/memio.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef MEMIO_H
 #define MEMIO_H
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef struct _MEMFILE MEMFILE;
 
-typedef enum 
+typedef enum
 {
-	MEM_SEEK_SET,
-	MEM_SEEK_CUR,
-	MEM_SEEK_END,
+  MEM_SEEK_SET,
+  MEM_SEEK_CUR,
+  MEM_SEEK_END,
 } mem_rel_t;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 MEMFILE *mem_fopen_read(void *buf, size_t buflen);
 size_t mem_fread(void *buf, size_t size, size_t nmemb, MEMFILE *stream);
 MEMFILE *mem_fopen_write(void);
-size_t mem_fwrite(const void *ptr, size_t size, size_t nmemb, MEMFILE *stream);
+size_t mem_fwrite(const void *ptr, size_t size, size_t nmemb,
+                  MEMFILE *stream);
 void mem_get_buf(MEMFILE *stream, void **buf, size_t *buflen);
 void mem_fclose(MEMFILE *stream);
 long mem_ftell(MEMFILE *stream);
 int mem_fseek(MEMFILE *stream, signed long offset, mem_rel_t whence);
 
-#endif /* #ifndef MEMIO_H */
-	  
+#endif /* MEMIO_H */
diff --git a/games/NXDoom/src/midifallback.c b/games/NXDoom/src/midifallback.c
deleted file mode 100644
index 615d6880f..000000000
--- a/games/NXDoom/src/midifallback.c
+++ /dev/null
@@ -1,370 +0,0 @@
-//
-// Copyright(C) 2022 ceski
-//
-// 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.
-//
-// DESCRIPTION:
-//      MIDI instrument fallback support
-//
-
-#ifdef _WIN32
-
-#include "doomtype.h"
-#include "midifile.h"
-#include "midifallback.h"
-
-static const byte drums_table[128] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-    0x18, 0x19, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-    0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-    0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F
-};
-
-static byte variation[128][128];
-static byte bank_msb[MIDI_CHANNELS_PER_TRACK];
-static byte drum_map[MIDI_CHANNELS_PER_TRACK];
-static boolean selected[MIDI_CHANNELS_PER_TRACK];
-
-static void UpdateDrumMap(const byte *msg, unsigned int length)
-{
-    byte idx;
-    byte checksum;
-
-    // GS allows drums on any channel using SysEx messages.
-    // The message format is F0 followed by:
-    //
-    // 41 10 42 12 40 <ch> 15 <map> <sum> F7
-    //
-    // <ch> is [11-19, 10, 1A-1F] for channels 1-16. Note the position of 10.
-    // <map> is 00-02 for off (normal part), drum map 1, or drum map 2.
-    // <sum> is checksum.
-
-    if (length == 10 &&
-        msg[0] == 0x41 && // Roland
-        msg[1] == 0x10 && // Device ID
-        msg[2] == 0x42 && // GS
-        msg[3] == 0x12 && // DT1
-        msg[4] == 0x40 && // Address MSB
-        msg[6] == 0x15 && // Address LSB
-        msg[9] == 0xF7)   // SysEx EOX
-    {
-        checksum = 128 - ((int)msg[4] + msg[5] + msg[6] + msg[7]) % 128;
-
-        if (msg[8] != checksum)
-        {
-            return;
-        }
-
-        if (msg[5] == 0x10) // Channel 10
-        {
-            idx = 9;
-        }
-        else if (msg[5] < 0x1A) // Channels 1-9
-        {
-            idx = (msg[5] & 0x0F) - 1;
-        }
-        else // Channels 11-16
-        {
-            idx = msg[5] & 0x0F;
-        }
-
-        drum_map[idx] = msg[7];
-    }
-}
-
-static boolean GetProgramFallback(byte idx, byte program,
-                                  midi_fallback_t *fallback)
-{
-    if (drum_map[idx] == 0) // Normal channel
-    {
-        if (bank_msb[idx] == 0 || variation[bank_msb[idx]][program])
-        {
-            // Found a capital or variation for this bank select MSB.
-            selected[idx] = true;
-            return false;
-        }
-
-        fallback->type = FALLBACK_BANK_MSB;
-
-        if (!selected[idx] || bank_msb[idx] > 63)
-        {
-            // Fall to capital when no instrument has (successfully)
-            // selected this variation or if the variation is above 63.
-            fallback->value = 0;
-            return true;
-        }
-
-        // A previous instrument used this variation but it's not
-        // valid for the current instrument. Fall to the next valid
-        // "sub-capital" (next variation that is a multiple of 8).
-        fallback->value = (bank_msb[idx] / 8) * 8;
-        while (fallback->value > 0)
-        {
-            if (variation[fallback->value][program])
-            {
-                break;
-            }
-            fallback->value -= 8;
-        }
-        return true;
-    }
-    else // Drums channel
-    {
-        if (program != drums_table[program])
-        {
-            // Use drum set from drums fallback table.
-            // Drums 0-63 and 127: same as original SC-55 (1.00 - 1.21).
-            // Drums 64-126: standard drum set (0).
-            fallback->type = FALLBACK_DRUMS;
-            fallback->value = drums_table[program];
-            selected[idx] = true;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void MIDI_CheckFallback(const midi_event_t *event, midi_fallback_t *fallback,
-                        boolean allow_sysex)
-{
-    byte idx;
-    byte program;
-
-    switch ((int)event->event_type)
-    {
-        case MIDI_EVENT_SYSEX:
-            if (allow_sysex)
-            {
-                UpdateDrumMap(event->data.sysex.data, event->data.sysex.length);
-            }
-            break;
-
-        case MIDI_EVENT_CONTROLLER:
-            idx = event->data.channel.channel;
-            switch (event->data.channel.param1)
-            {
-                case MIDI_CONTROLLER_BANK_SELECT_MSB:
-                    bank_msb[idx] = event->data.channel.param2;
-                    selected[idx] = false;
-                    break;
-
-                case MIDI_CONTROLLER_BANK_SELECT_LSB:
-                    selected[idx] = false;
-                    if (event->data.channel.param2 > 0)
-                    {
-                        // Bank select LSB > 0 not supported. This also
-                        // preserves user's current SC-XX map.
-                        fallback->type = FALLBACK_BANK_LSB;
-                        fallback->value = 0;
-                        return;
-                    }
-                    break;
-
-                case EMIDI_CONTROLLER_PROGRAM_CHANGE:
-                    program = event->data.channel.param2;
-                    if (GetProgramFallback(idx, program, fallback))
-                    {
-                        return;
-                    }
-                    break;
-            }
-            break;
-
-        case MIDI_EVENT_PROGRAM_CHANGE:
-            idx = event->data.channel.channel;
-            program = event->data.channel.param1;
-            if (GetProgramFallback(idx, program, fallback))
-            {
-                return;
-            }
-            break;
-    }
-
-    fallback->type = FALLBACK_NONE;
-    fallback->value = 0;
-}
-
-void MIDI_ResetFallback(void)
-{
-    int i;
-
-    for (i = 0; i < MIDI_CHANNELS_PER_TRACK; i++)
-    {
-        bank_msb[i] = 0;
-        drum_map[i] = 0;
-        selected[i] = false;
-    }
-
-    // Channel 10 (index 9) is set to drum map 1 by default.
-    drum_map[9] = 1;
-}
-
-void MIDI_InitFallback(void)
-{
-    byte program;
-
-    MIDI_ResetFallback();
-
-    // Capital
-    for (program = 0; program < 128; program++)
-    {
-        variation[0][program] = 1;
-    }
-
-    // Variation #1
-    variation[1][38] = 1;
-    variation[1][57] = 1;
-    variation[1][60] = 1;
-    variation[1][80] = 1;
-    variation[1][81] = 1;
-    variation[1][98] = 1;
-    variation[1][102] = 1;
-    variation[1][104] = 1;
-    variation[1][120] = 1;
-    variation[1][121] = 1;
-    variation[1][122] = 1;
-    variation[1][123] = 1;
-    variation[1][124] = 1;
-    variation[1][125] = 1;
-    variation[1][126] = 1;
-    variation[1][127] = 1;
-
-    // Variation #2
-    variation[2][102] = 1;
-    variation[2][120] = 1;
-    variation[2][122] = 1;
-    variation[2][123] = 1;
-    variation[2][124] = 1;
-    variation[2][125] = 1;
-    variation[2][126] = 1;
-    variation[2][127] = 1;
-
-    // Variation #3
-    variation[3][122] = 1;
-    variation[3][123] = 1;
-    variation[3][124] = 1;
-    variation[3][125] = 1;
-    variation[3][126] = 1;
-    variation[3][127] = 1;
-
-    // Variation #4
-    variation[4][122] = 1;
-    variation[4][124] = 1;
-    variation[4][125] = 1;
-    variation[4][126] = 1;
-
-    // Variation #5
-    variation[5][122] = 1;
-    variation[5][124] = 1;
-    variation[5][125] = 1;
-    variation[5][126] = 1;
-
-    // Variation #6
-    variation[6][125] = 1;
-
-    // Variation #7
-    variation[7][125] = 1;
-
-    // Variation #8
-    variation[8][0] = 1;
-    variation[8][1] = 1;
-    variation[8][2] = 1;
-    variation[8][3] = 1;
-    variation[8][4] = 1;
-    variation[8][5] = 1;
-    variation[8][6] = 1;
-    variation[8][11] = 1;
-    variation[8][12] = 1;
-    variation[8][14] = 1;
-    variation[8][16] = 1;
-    variation[8][17] = 1;
-    variation[8][19] = 1;
-    variation[8][21] = 1;
-    variation[8][24] = 1;
-    variation[8][25] = 1;
-    variation[8][26] = 1;
-    variation[8][27] = 1;
-    variation[8][28] = 1;
-    variation[8][30] = 1;
-    variation[8][31] = 1;
-    variation[8][38] = 1;
-    variation[8][39] = 1;
-    variation[8][40] = 1;
-    variation[8][48] = 1;
-    variation[8][50] = 1;
-    variation[8][61] = 1;
-    variation[8][62] = 1;
-    variation[8][63] = 1;
-    variation[8][80] = 1;
-    variation[8][81] = 1;
-    variation[8][107] = 1;
-    variation[8][115] = 1;
-    variation[8][116] = 1;
-    variation[8][117] = 1;
-    variation[8][118] = 1;
-    variation[8][125] = 1;
-
-    // Variation #9
-    variation[9][14] = 1;
-    variation[9][118] = 1;
-    variation[9][125] = 1;
-
-    // Variation #16
-    variation[16][0] = 1;
-    variation[16][4] = 1;
-    variation[16][5] = 1;
-    variation[16][6] = 1;
-    variation[16][16] = 1;
-    variation[16][19] = 1;
-    variation[16][24] = 1;
-    variation[16][25] = 1;
-    variation[16][28] = 1;
-    variation[16][39] = 1;
-    variation[16][62] = 1;
-    variation[16][63] = 1;
-
-    // Variation #24
-    variation[24][4] = 1;
-    variation[24][6] = 1;
-
-    // Variation #32
-    variation[32][16] = 1;
-    variation[32][17] = 1;
-    variation[32][24] = 1;
-    variation[32][52] = 1;
-
-    // CM-64 Map (PCM)
-    for (program = 0; program < 64; program++)
-    {
-        variation[126][program] = 1;
-    }
-
-    // CM-64 Map (LA)
-    for (program = 0; program < 128; program++)
-    {
-        variation[127][program] = 1;
-    }
-}
-
-#endif
diff --git a/games/NXDoom/src/midifallback.h b/games/NXDoom/src/midifallback.h
deleted file mode 100644
index 6093b2e6f..000000000
--- a/games/NXDoom/src/midifallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright(C) 2022 ceski
-//
-// 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.
-//
-// DESCRIPTION:
-//      MIDI instrument fallback support
-//
-
-#ifdef _WIN32
-
-#ifndef MIDIFALLBACK_H
-#define MIDIFALLBACK_H
-
-#include "doomtype.h"
-#include "midifile.h"
-
-typedef enum midi_fallback_type_t
-{
-    FALLBACK_NONE,
-    FALLBACK_BANK_MSB,
-    FALLBACK_BANK_LSB,
-    FALLBACK_DRUMS,
-} midi_fallback_type_t;
-
-typedef struct midi_fallback_t
-{
-    midi_fallback_type_t type;
-    byte value;
-} midi_fallback_t;
-
-void MIDI_CheckFallback(const midi_event_t *event, midi_fallback_t *fallback,
-                        boolean allow_sysex);
-void MIDI_ResetFallback(void);
-void MIDI_InitFallback(void);
-
-#endif // MIDIFALLBACK_H
-
-#endif // _WIN32
diff --git a/games/NXDoom/src/midifile.c b/games/NXDoom/src/midifile.c
index 258154eea..8374ac50d 100644
--- a/games/NXDoom/src/midifile.c
+++ b/games/NXDoom/src/midifile.c
@@ -1,24 +1,33 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//    Reading of MIDI files.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/midifile.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Reading of MIDI files.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "doomtype.h"
 #include "i_swap.h"
@@ -26,813 +35,844 @@
 #include "m_misc.h"
 #include "midifile.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define HEADER_CHUNK_ID "MThd"
-#define TRACK_CHUNK_ID  "MTrk"
+#define TRACK_CHUNK_ID "MTrk"
 #define MAX_BUFFER_SIZE 0x10000
 
-// haleyjd 09/09/10: packing required
+/* haleyjd 09/09/10: packing required */
+
 #ifdef _MSC_VER
 #pragma pack(push, 1)
 #endif
 
-typedef PACKED_STRUCT (
-{
-    byte chunk_id[4];
-    unsigned int chunk_size;
-}) chunk_header_t;
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-typedef PACKED_STRUCT (
+begin_packed_struct struct chunk_header_t
 {
-    chunk_header_t chunk_header;
-    unsigned short format_type;
-    unsigned short num_tracks;
-    unsigned short time_division;
-}) midi_header_t;
+  byte chunk_id[4];
+  unsigned int chunk_size;
+} end_packed_struct;
+
+typedef struct chunk_header_t chunk_header_t;
+
+begin_packed_struct struct midi_header_t
+{
+  chunk_header_t chunk_header;
+  unsigned short format_type;
+  unsigned short num_tracks;
+  unsigned short time_division;
+} begin_packed_struct;
+
+typedef struct midi_header_t midi_header_t;
+
+/* haleyjd 09/09/10: packing off. */
 
-// haleyjd 09/09/10: packing off.
 #ifdef _MSC_VER
 #pragma pack(pop)
 #endif
 
 typedef struct
 {
-    // Length in bytes:
+  /* Length in bytes: */
 
-    unsigned int data_len;
+  unsigned int data_len;
 
-    // Events in this track:
+  /* Events in this track: */
 
-    midi_event_t *events;
-    int num_events;
+  midi_event_t *events;
+  int num_events;
 } midi_track_t;
 
 struct midi_track_iter_s
 {
-    midi_track_t *track;
-    unsigned int position;
-    unsigned int loop_point;
+  midi_track_t *track;
+  unsigned int position;
+  unsigned int loop_point;
 };
 
 struct midi_file_s
 {
-    midi_header_t header;
+  midi_header_t header;
 
-    // All tracks in this file:
-    midi_track_t *tracks;
-    unsigned int num_tracks;
+  /* All tracks in this file: */
 
-    // Data buffer used to store data read for SysEx or meta events:
-    byte *buffer;
-    unsigned int buffer_size;
+  midi_track_t *tracks;
+  unsigned int num_tracks;
+
+  /* Data buffer used to store data read for SysEx or meta events: */
+
+  byte *buffer;
+  unsigned int buffer_size;
 };
 
-// Check the header of a chunk:
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static boolean CheckChunkHeader(chunk_header_t *chunk,
+/* Check the header of a chunk: */
+
+static boolean check_chunk_header(chunk_header_t *chunk,
                                 const char *expected_id)
 {
-    boolean result;
-    
-    result = (memcmp((char *) chunk->chunk_id, expected_id, 4) == 0);
+  boolean result;
 
-    if (!result)
+  result = (memcmp((char *)chunk->chunk_id, expected_id, 4) == 0);
+
+  if (!result)
     {
-        fprintf(stderr, "CheckChunkHeader: Expected '%s' chunk header, "
-                        "got '%c%c%c%c'\n",
-                        expected_id,
-                        chunk->chunk_id[0], chunk->chunk_id[1],
-                        chunk->chunk_id[2], chunk->chunk_id[3]);
+      fprintf(stderr,
+              "check_chunk_header: Expected '%s' chunk header, "
+              "got '%c%c%c%c'\n",
+              expected_id, chunk->chunk_id[0], chunk->chunk_id[1],
+              chunk->chunk_id[2], chunk->chunk_id[3]);
     }
 
-    return result;
+  return result;
 }
 
-// Read a single byte.  Returns false on error.
+/* Read a single byte. Returns false on error. */
 
-static boolean ReadByte(byte *result, FILE *stream)
+static boolean read_byte(byte *result, FILE *stream)
 {
-    int c;
+  int c;
 
-    c = fgetc(stream);
+  c = fgetc(stream);
 
-    if (c == EOF)
+  if (c == EOF)
     {
-        fprintf(stderr, "ReadByte: Unexpected end of file\n");
-        return false;
+      fprintf(stderr, "read_byte: Unexpected end of file\n");
+      return false;
     }
-    else
+  else
     {
-        *result = (byte) c;
+      *result = (byte)c;
 
-        return true;
+      return true;
     }
 }
 
-// Read a variable-length value.
+/* Read a variable-length value. */
 
-static boolean ReadVariableLength(unsigned int *result, FILE *stream)
+static boolean read_variable_length(unsigned int *result, FILE *stream)
 {
-    int i;
-    byte b = 0;
+  int i;
+  byte b = 0;
 
-    *result = 0;
+  *result = 0;
 
-    for (i=0; i<4; ++i)
+  for (i = 0; i < 4; ++i)
     {
-        if (!ReadByte(&b, stream))
+      if (!read_byte(&b, stream))
         {
-            fprintf(stderr, "ReadVariableLength: Error while reading "
-                            "variable-length value\n");
-            return false;
+          fprintf(stderr, "read_variable_length: Error while reading "
+                          "variable-length value\n");
+          return false;
         }
 
-        // Insert the bottom seven bits from this byte.
+      /* Insert the bottom seven bits from this byte. */
 
-        *result <<= 7;
-        *result |= b & 0x7f;
+      *result <<= 7;
+      *result |= b & 0x7f;
 
-        // If the top bit is not set, this is the end.
+      /* If the top bit is not set, this is the end. */
 
-        if ((b & 0x80) == 0)
+      if ((b & 0x80) == 0)
         {
-            return true;
+          return true;
         }
     }
 
-    fprintf(stderr, "ReadVariableLength: Variable-length value too "
-                    "long: maximum of four bytes\n");
-    return false;
+  fprintf(stderr, "read_variable_length: Variable-length value too "
+                  "long: maximum of four bytes\n");
+  return false;
 }
 
-// Read a byte sequence into the data buffer.
+/* Read a byte sequence into the data buffer. */
 
-static void *ReadByteSequence(unsigned int num_bytes, FILE *stream)
+static void *read_byte_sequence(unsigned int num_bytes, FILE *stream)
 {
-    unsigned int i;
-    byte *result;
+  unsigned int i;
+  byte *result;
 
-    // Allocate a buffer. Allocate one extra byte, as malloc(0) is
-    // non-portable.
+  /* Allocate a buffer. Allocate one extra byte, as malloc(0) is
+   * non-portable.
+   */
 
-    result = malloc(num_bytes + 1);
+  result = malloc(num_bytes + 1);
 
-    if (result == NULL)
+  if (result == NULL)
     {
-        fprintf(stderr, "ReadByteSequence: Failed to allocate buffer\n");
-        return NULL;
+      fprintf(stderr, "read_byte_sequence: Failed to allocate buffer\n");
+      return NULL;
     }
 
-    // Read the data:
+  /* Read the data: */
 
-    for (i=0; i<num_bytes; ++i)
+  for (i = 0; i < num_bytes; ++i)
     {
-        if (!ReadByte(&result[i], stream))
+      if (!read_byte(&result[i], stream))
         {
-            fprintf(stderr, "ReadByteSequence: Error while reading byte %u\n",
-                            i);
-            free(result);
-            return NULL;
+          fprintf(stderr,
+                  "read_byte_sequence: Error while reading byte %u\n", i);
+          free(result);
+          return NULL;
         }
     }
 
-    return result;
+  return result;
 }
 
-// Read a MIDI channel event.
-// two_param indicates that the event type takes two parameters
-// (three byte) otherwise it is single parameter (two byte)
+/* Read a MIDI channel event.
+ * two_param indicates that the event type takes two parameters
+ * (three byte) otherwise it is single parameter (two byte)
+ */
 
-static boolean ReadChannelEvent(midi_event_t *event,
-                                byte event_type, boolean two_param,
-                                FILE *stream)
+static boolean read_channel_event(midi_event_t *event, byte event_type,
+                                boolean two_param, FILE *stream)
 {
-    byte b = 0;
+  byte b = 0;
 
-    // Set basics:
+  /* Set basics: */
 
-    event->event_type = event_type & 0xf0;
-    event->data.channel.channel = event_type & 0x0f;
+  event->event_type = event_type & 0xf0;
+  event->data.channel.channel = event_type & 0x0f;
 
-    // Read parameters:
+  /* Read parameters: */
 
-    if (!ReadByte(&b, stream))
+  if (!read_byte(&b, stream))
     {
-        fprintf(stderr, "ReadChannelEvent: Error while reading channel "
-                        "event parameters\n");
-        return false;
+      fprintf(stderr, "read_channel_event: Error while reading channel "
+                      "event parameters\n");
+      return false;
     }
 
-    event->data.channel.param1 = b;
+  event->data.channel.param1 = b;
 
-    // Second parameter:
+  /* Second parameter: */
 
-    if (two_param)
+  if (two_param)
     {
-        if (!ReadByte(&b, stream))
+      if (!read_byte(&b, stream))
         {
-            fprintf(stderr, "ReadChannelEvent: Error while reading channel "
-                            "event parameters\n");
-            return false;
+          fprintf(stderr, "read_channel_event: Error while reading channel "
+                          "event parameters\n");
+          return false;
         }
 
-        event->data.channel.param2 = b;
+      event->data.channel.param2 = b;
     }
 
-    return true;
+  return true;
 }
 
-// Read sysex event:
+/* Read sysex event: */
 
-static boolean ReadSysExEvent(midi_event_t *event, int event_type,
+static boolean read_sys_ex_event(midi_event_t *event, int event_type,
                               FILE *stream)
 {
-    event->event_type = event_type;
+  event->event_type = event_type;
 
-    if (!ReadVariableLength(&event->data.sysex.length, stream))
+  if (!read_variable_length(&event->data.sysex.length, stream))
     {
-        fprintf(stderr, "ReadSysExEvent: Failed to read length of "
-                                        "SysEx block\n");
-        return false;
+      fprintf(stderr, "read_sys_ex_event: Failed to read length of "
+                      "SysEx block\n");
+      return false;
     }
 
-    // Read the byte sequence:
+  /* Read the byte sequence: */
 
-    event->data.sysex.data = ReadByteSequence(event->data.sysex.length, stream);
+  event->data.sysex.data =
+      read_byte_sequence(event->data.sysex.length, stream);
 
-    if (event->data.sysex.data == NULL)
+  if (event->data.sysex.data == NULL)
     {
-        fprintf(stderr, "ReadSysExEvent: Failed while reading SysEx event\n");
-        return false;
+      fprintf(stderr,
+              "read_sys_ex_event: Failed while reading SysEx event\n");
+      return false;
     }
 
-    return true;
+  return true;
 }
 
-// Read meta event:
+/* Read meta event: */
 
-static boolean ReadMetaEvent(midi_event_t *event, FILE *stream)
+static boolean read_meta_event(midi_event_t *event, FILE *stream)
 {
-    byte b = 0;
+  byte b = 0;
 
-    event->event_type = MIDI_EVENT_META;
+  event->event_type = MIDI_EVENT_META;
 
-    // Read meta event type:
+  /* Read meta event type: */
 
-    if (!ReadByte(&b, stream))
+  if (!read_byte(&b, stream))
     {
-        fprintf(stderr, "ReadMetaEvent: Failed to read meta event type\n");
-        return false;
+      fprintf(stderr, "read_meta_event: Failed to read meta event type\n");
+      return false;
     }
 
-    event->data.meta.type = b;
+  event->data.meta.type = b;
 
-    // Read length of meta event data:
+  /* Read length of meta event data: */
 
-    if (!ReadVariableLength(&event->data.meta.length, stream))
+  if (!read_variable_length(&event->data.meta.length, stream))
     {
-        fprintf(stderr, "ReadSysExEvent: Failed to read length of "
-                                        "SysEx block\n");
-        return false;
+      fprintf(stderr, "read_sys_ex_event: Failed to read length of "
+                      "SysEx block\n");
+      return false;
     }
 
-    // Read the byte sequence:
+  /* Read the byte sequence: */
 
-    event->data.meta.data = ReadByteSequence(event->data.meta.length, stream);
+  event->data.meta.data =
+      read_byte_sequence(event->data.meta.length, stream);
 
-    if (event->data.meta.data == NULL)
+  if (event->data.meta.data == NULL)
     {
-        fprintf(stderr, "ReadSysExEvent: Failed while reading SysEx event\n");
-        return false;
+      fprintf(stderr,
+              "read_sys_ex_event: Failed while reading SysEx event\n");
+      return false;
     }
 
-    return true;
+  return true;
 }
 
-static boolean ReadEvent(midi_event_t *event, unsigned int *last_event_type,
+static boolean read_event(midi_event_t *event, unsigned int *last_event_type,
                          FILE *stream)
 {
-    byte event_type = 0;
+  byte event_type = 0;
 
-    if (!ReadVariableLength(&event->delta_time, stream))
+  if (!read_variable_length(&event->delta_time, stream))
     {
-        fprintf(stderr, "ReadEvent: Failed to read event timestamp\n");
-        return false;
+      fprintf(stderr, "read_event: Failed to read event timestamp\n");
+      return false;
     }
 
-    if (!ReadByte(&event_type, stream))
+  if (!read_byte(&event_type, stream))
     {
-        fprintf(stderr, "ReadEvent: Failed to read event type\n");
-        return false;
+      fprintf(stderr, "read_event: Failed to read event type\n");
+      return false;
     }
 
-    // All event types have their top bit set.  Therefore, if 
-    // the top bit is not set, it is because we are using the "same
-    // as previous event type" shortcut to save a byte.  Skip back
-    // a byte so that we read this byte again.
+  /* All event types have their top bit set.  Therefore, if
+   * the top bit is not set, it is because we are using the "same
+   * as previous event type" shortcut to save a byte.  Skip back
+   * a byte so that we read this byte again.
+   */
 
-    if ((event_type & 0x80) == 0)
+  if ((event_type & 0x80) == 0)
     {
-        event_type = *last_event_type;
+      event_type = *last_event_type;
 
-        if (fseek(stream, -1, SEEK_CUR) < 0)
+      if (fseek(stream, -1, SEEK_CUR) < 0)
         {
-            fprintf(stderr, "ReadEvent: Unable to seek in stream\n");
-            return false;
+          fprintf(stderr, "read_event: Unable to seek in stream\n");
+          return false;
         }
     }
-    else
+  else
     {
-        *last_event_type = event_type;
+      *last_event_type = event_type;
     }
 
-    // Check event type:
+  /* Check event type: */
 
-    switch (event_type & 0xf0)
+  switch (event_type & 0xf0)
     {
-        // Two parameter channel events:
+      /* Two parameter channel events: */
 
-        case MIDI_EVENT_NOTE_OFF:
-        case MIDI_EVENT_NOTE_ON:
-        case MIDI_EVENT_AFTERTOUCH:
-        case MIDI_EVENT_CONTROLLER:
-        case MIDI_EVENT_PITCH_BEND:
-            return ReadChannelEvent(event, event_type, true, stream);
+    case MIDI_EVENT_NOTE_OFF:
+    case MIDI_EVENT_NOTE_ON:
+    case MIDI_EVENT_AFTERTOUCH:
+    case MIDI_EVENT_CONTROLLER:
+    case MIDI_EVENT_PITCH_BEND:
+      return read_channel_event(event, event_type, true, stream);
 
-        // Single parameter channel events:
+      /* Single parameter channel events: */
 
-        case MIDI_EVENT_PROGRAM_CHANGE:
-        case MIDI_EVENT_CHAN_AFTERTOUCH:
-            return ReadChannelEvent(event, event_type, false, stream);
+    case MIDI_EVENT_PROGRAM_CHANGE:
+    case MIDI_EVENT_CHAN_AFTERTOUCH:
+      return read_channel_event(event, event_type, false, stream);
 
-        default:
-            break;
+    default:
+      break;
     }
 
-    // Specific value?
+  /* Specific value? */
 
-    switch (event_type)
+  switch (event_type)
     {
-        case MIDI_EVENT_SYSEX:
-        case MIDI_EVENT_SYSEX_SPLIT:
-            return ReadSysExEvent(event, event_type, stream);
+    case MIDI_EVENT_SYSEX:
+    case MIDI_EVENT_SYSEX_SPLIT:
+      return read_sys_ex_event(event, event_type, stream);
 
-        case MIDI_EVENT_META:
-            return ReadMetaEvent(event, stream);
+    case MIDI_EVENT_META:
+      return read_meta_event(event, stream);
 
-        default:
-            break;
+    default:
+      break;
     }
 
-    fprintf(stderr, "ReadEvent: Unknown MIDI event type: 0x%x\n", event_type);
-    return false;
+  fprintf(stderr, "read_event: Unknown MIDI event type: 0x%x\n", event_type);
+  return false;
 }
 
-// Free an event:
+/* Free an event: */
 
-static void FreeEvent(midi_event_t *event)
+static void free_event(midi_event_t *event)
 {
-    // Some event types have dynamically allocated buffers assigned
-    // to them that must be freed.
+  /* Some event types have dynamically allocated buffers assigned
+   * to them that must be freed.
+   */
 
-    switch (event->event_type)
+  switch (event->event_type)
     {
-        case MIDI_EVENT_SYSEX:
-        case MIDI_EVENT_SYSEX_SPLIT:
-            free(event->data.sysex.data);
-            break;
+    case MIDI_EVENT_SYSEX:
+    case MIDI_EVENT_SYSEX_SPLIT:
+      free(event->data.sysex.data);
+      break;
 
-        case MIDI_EVENT_META:
-            free(event->data.meta.data);
-            break;
+    case MIDI_EVENT_META:
+      free(event->data.meta.data);
+      break;
 
-        default:
-            // Nothing to do.
-            break;
+    default:
+      break; /* Nothing to do. */
     }
 }
 
-// Read and check the track chunk header
+/* Read and check the track chunk header */
 
-static boolean ReadTrackHeader(midi_track_t *track, FILE *stream)
+static boolean read_track_header(midi_track_t *track, FILE *stream)
 {
-    size_t records_read;
-    chunk_header_t chunk_header;
+  size_t records_read;
+  chunk_header_t chunk_header;
 
-    records_read = fread(&chunk_header, sizeof(chunk_header_t), 1, stream);
+  records_read = fread(&chunk_header, sizeof(chunk_header_t), 1, stream);
 
-    if (records_read < 1)
+  if (records_read < 1)
     {
-        return false;
+      return false;
     }
 
-    if (!CheckChunkHeader(&chunk_header, TRACK_CHUNK_ID))
+  if (!check_chunk_header(&chunk_header, TRACK_CHUNK_ID))
     {
-        return false;
+      return false;
     }
 
-    track->data_len = SDL_SwapBE32(chunk_header.chunk_size);
+  track->data_len = be32toh(chunk_header.chunk_size);
 
-    return true;
+  return true;
 }
 
-static boolean ReadTrack(midi_track_t *track, FILE *stream)
+static boolean read_track(midi_track_t *track, FILE *stream)
 {
-    midi_event_t *new_events;
-    midi_event_t *event;
-    unsigned int last_event_type;
+  midi_event_t *new_events;
+  midi_event_t *event;
+  unsigned int last_event_type;
 
-    track->num_events = 0;
-    track->events = NULL;
+  track->num_events = 0;
+  track->events = NULL;
 
-    // Read the header:
+  /* Read the header: */
 
-    if (!ReadTrackHeader(track, stream))
+  if (!read_track_header(track, stream))
     {
-        return false;
+      return false;
     }
 
-    // Then the events:
+  /* Then the events: */
 
-    last_event_type = 0;
+  last_event_type = 0;
 
-    for (;;)
+  for (; ; )
     {
-        // Resize the track slightly larger to hold another event:
+      /* Resize the track slightly larger to hold another event: */
 
-        new_events = I_Realloc(track->events, 
+      new_events = i_realloc(track->events,
                              sizeof(midi_event_t) * (track->num_events + 1));
-        track->events = new_events;
+      track->events = new_events;
 
-        // Read the next event:
+      /* Read the next event: */
 
-        event = &track->events[track->num_events];
-        if (!ReadEvent(event, &last_event_type, stream))
+      event = &track->events[track->num_events];
+      if (!read_event(event, &last_event_type, stream))
         {
-            return false;
+          return false;
         }
 
-        ++track->num_events;
+      ++track->num_events;
 
-        // End of track?
+      /* End of track? */
 
-        if (event->event_type == MIDI_EVENT_META
-         && event->data.meta.type == MIDI_META_END_OF_TRACK)
+      if (event->event_type == MIDI_EVENT_META &&
+          event->data.meta.type == MIDI_META_END_OF_TRACK)
         {
-            break;
+          break;
         }
     }
 
-    return true;
+  return true;
 }
 
-// Free a track:
+/* Free a track: */
 
-static void FreeTrack(midi_track_t *track)
+static void free_track(midi_track_t *track)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i=0; i<track->num_events; ++i)
+  for (i = 0; i < track->num_events; ++i)
     {
-        FreeEvent(&track->events[i]);
+      free_event(&track->events[i]);
     }
 
-    free(track->events);
+  free(track->events);
 }
 
-static boolean ReadAllTracks(midi_file_t *file, FILE *stream)
+static boolean read_all_tracks(midi_file_t *file, FILE *stream)
 {
-    unsigned int i;
+  unsigned int i;
 
-    // Allocate list of tracks and read each track:
+  /* Allocate list of tracks and read each track: */
 
-    file->tracks = malloc(sizeof(midi_track_t) * file->num_tracks);
+  file->tracks = malloc(sizeof(midi_track_t) * file->num_tracks);
 
-    if (file->tracks == NULL)
+  if (file->tracks == NULL)
     {
-        return false;
+      return false;
     }
 
-    memset(file->tracks, 0, sizeof(midi_track_t) * file->num_tracks);
+  memset(file->tracks, 0, sizeof(midi_track_t) * file->num_tracks);
 
-    // Read each track:
+  /* Read each track: */
 
-    for (i=0; i<file->num_tracks; ++i)
+  for (i = 0; i < file->num_tracks; ++i)
     {
-        if (!ReadTrack(&file->tracks[i], stream))
+      if (!read_track(&file->tracks[i], stream))
         {
-            return false;
+          return false;
         }
     }
 
-    return true;
+  return true;
 }
 
-// Read and check the header chunk.
+/* Read and check the header chunk. */
 
-static boolean ReadFileHeader(midi_file_t *file, FILE *stream)
+static boolean read_file_header(midi_file_t *file, FILE *stream)
 {
-    size_t records_read;
-    unsigned int format_type;
+  size_t records_read;
+  unsigned int format_type;
 
-    records_read = fread(&file->header, sizeof(midi_header_t), 1, stream);
+  records_read = fread(&file->header, sizeof(midi_header_t), 1, stream);
 
-    if (records_read < 1)
+  if (records_read < 1)
     {
-        return false;
+      return false;
     }
 
-    if (!CheckChunkHeader(&file->header.chunk_header, HEADER_CHUNK_ID)
-     || SDL_SwapBE32(file->header.chunk_header.chunk_size) != 6)
+  if (!check_chunk_header(&file->header.chunk_header, HEADER_CHUNK_ID) ||
+      be32toh(file->header.chunk_header.chunk_size) != 6)
     {
-        fprintf(stderr, "ReadFileHeader: Invalid MIDI chunk header! "
-                        "chunk_size=%i\n",
-                        SDL_SwapBE32(file->header.chunk_header.chunk_size));
-        return false;
+      fprintf(stderr,
+              "read_file_header: Invalid MIDI chunk header! "
+              "chunk_size=%i\n",
+              be32toh(file->header.chunk_header.chunk_size));
+      return false;
     }
 
-    format_type = SDL_SwapBE16(file->header.format_type);
-    file->num_tracks = SDL_SwapBE16(file->header.num_tracks);
+  format_type = be32toh(file->header.format_type);
+  file->num_tracks = be32toh(file->header.num_tracks);
 
-    if ((format_type != 0 && format_type != 1)
-     || file->num_tracks < 1)
+  if ((format_type != 0 && format_type != 1) || file->num_tracks < 1)
     {
-        fprintf(stderr, "ReadFileHeader: Only type 0/1 "
-                                         "MIDI files supported!\n");
-        return false;
+      fprintf(stderr, "read_file_header: Only type 0/1 "
+                      "MIDI files supported!\n");
+      return false;
     }
 
-    return true;
+  return true;
 }
 
-void MIDI_FreeFile(midi_file_t *file)
+void midi_free_file(midi_file_t *file)
 {
-    int i;
+  int i;
 
-    if (file->tracks != NULL)
+  if (file->tracks != NULL)
     {
-        for (i=0; i<file->num_tracks; ++i)
+      for (i = 0; i < file->num_tracks; ++i)
         {
-            FreeTrack(&file->tracks[i]);
+          free_track(&file->tracks[i]);
         }
 
-        free(file->tracks);
+      free(file->tracks);
     }
 
-    free(file);
+  free(file);
 }
 
-midi_file_t *MIDI_LoadFile(char *filename)
+midi_file_t *midi_loadfile(char *filename)
 {
-    midi_file_t *file;
-    FILE *stream;
+  midi_file_t *file;
+  FILE *stream;
 
-    file = malloc(sizeof(midi_file_t));
+  file = malloc(sizeof(midi_file_t));
 
-    if (file == NULL)
+  if (file == NULL)
     {
-        return NULL;
+      return NULL;
     }
 
-    file->tracks = NULL;
-    file->num_tracks = 0;
-    file->buffer = NULL;
-    file->buffer_size = 0;
+  file->tracks = NULL;
+  file->num_tracks = 0;
+  file->buffer = NULL;
+  file->buffer_size = 0;
 
-    // Open file
+  /* Open file */
 
-    stream = M_fopen(filename, "rb");
+  stream = fopen(filename, "rb");
 
-    if (stream == NULL)
+  if (stream == NULL)
     {
-        fprintf(stderr, "MIDI_LoadFile: Failed to open '%s'\n", filename);
-        MIDI_FreeFile(file);
-        return NULL;
+      fprintf(stderr, "midi_loadfile: Failed to open '%s'\n", filename);
+      midi_free_file(file);
+      return NULL;
     }
 
-    // Read MIDI file header
+  /* Read MIDI file header */
 
-    if (!ReadFileHeader(file, stream))
+  if (!read_file_header(file, stream))
     {
-        fclose(stream);
-        MIDI_FreeFile(file);
-        return NULL;
+      fclose(stream);
+      midi_free_file(file);
+      return NULL;
     }
 
-    // Read all tracks:
+  /* Read all tracks: */
 
-    if (!ReadAllTracks(file, stream))
+  if (!read_all_tracks(file, stream))
     {
-        fclose(stream);
-        MIDI_FreeFile(file);
-        return NULL;
+      fclose(stream);
+      midi_free_file(file);
+      return NULL;
     }
 
-    fclose(stream);
+  fclose(stream);
 
-    return file;
-}
-
-// Get the number of tracks in a MIDI file.
-
-unsigned int MIDI_NumTracks(midi_file_t *file)
-{
-    return file->num_tracks;
-}
-
-// Start iterating over the events in a track.
-
-midi_track_iter_t *MIDI_IterateTrack(midi_file_t *file, unsigned int track)
-{
-    midi_track_iter_t *iter;
-
-    assert(track < file->num_tracks);
-
-    iter = malloc(sizeof(*iter));
-    iter->track = &file->tracks[track];
-    iter->position = 0;
-    iter->loop_point = 0;
-
-    return iter;
-}
-
-void MIDI_FreeIterator(midi_track_iter_t *iter)
-{
-    free(iter);
-}
-
-// Get the time until the next MIDI event in a track.
-
-unsigned int MIDI_GetDeltaTime(midi_track_iter_t *iter)
-{
-    if (iter->position < iter->track->num_events)
-    {
-        midi_event_t *next_event;
-
-        next_event = &iter->track->events[iter->position];
-
-        return next_event->delta_time;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-// Get a pointer to the next MIDI event.
-
-int MIDI_GetNextEvent(midi_track_iter_t *iter, midi_event_t **event)
-{
-    if (iter->position < iter->track->num_events)
-    {
-        *event = &iter->track->events[iter->position];
-        ++iter->position;
-
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-unsigned int MIDI_GetFileTimeDivision(midi_file_t *file)
-{
-    short result = SDL_SwapBE16(file->header.time_division);
-
-    // Negative time division indicates SMPTE time and must be handled
-    // differently.
-    if (result < 0)
-    {
-        return (signed int)(-(result/256))
-             * (signed int)(result & 0xFF);
-    }
-    else
-    {
-        return result;
-    }
-}
-
-void MIDI_RestartIterator(midi_track_iter_t *iter)
-{
-    iter->position = 0;
-    iter->loop_point = 0;
-}
-
-void MIDI_SetLoopPoint(midi_track_iter_t *iter)
-{
-    iter->loop_point = iter->position;
-}
-
-void MIDI_RestartAtLoopPoint(midi_track_iter_t *iter)
-{
-    iter->position = iter->loop_point;
+  return file;
 }
 
 #ifdef TEST
-
-static char *MIDI_EventTypeToString(midi_event_type_t event_type)
+static char *midi_event_type_to_string(midi_event_type_t event_type)
 {
-    switch (event_type)
+  switch (event_type)
     {
-        case MIDI_EVENT_NOTE_OFF:
-            return "MIDI_EVENT_NOTE_OFF";
-        case MIDI_EVENT_NOTE_ON:
-            return "MIDI_EVENT_NOTE_ON";
-        case MIDI_EVENT_AFTERTOUCH:
-            return "MIDI_EVENT_AFTERTOUCH";
-        case MIDI_EVENT_CONTROLLER:
-            return "MIDI_EVENT_CONTROLLER";
-        case MIDI_EVENT_PROGRAM_CHANGE:
-            return "MIDI_EVENT_PROGRAM_CHANGE";
-        case MIDI_EVENT_CHAN_AFTERTOUCH:
-            return "MIDI_EVENT_CHAN_AFTERTOUCH";
-        case MIDI_EVENT_PITCH_BEND:
-            return "MIDI_EVENT_PITCH_BEND";
-        case MIDI_EVENT_SYSEX:
-            return "MIDI_EVENT_SYSEX";
-        case MIDI_EVENT_SYSEX_SPLIT:
-            return "MIDI_EVENT_SYSEX_SPLIT";
-        case MIDI_EVENT_META:
-            return "MIDI_EVENT_META";
+    case MIDI_EVENT_NOTE_OFF:
+      return "MIDI_EVENT_NOTE_OFF";
+    case MIDI_EVENT_NOTE_ON:
+      return "MIDI_EVENT_NOTE_ON";
+    case MIDI_EVENT_AFTERTOUCH:
+      return "MIDI_EVENT_AFTERTOUCH";
+    case MIDI_EVENT_CONTROLLER:
+      return "MIDI_EVENT_CONTROLLER";
+    case MIDI_EVENT_PROGRAM_CHANGE:
+      return "MIDI_EVENT_PROGRAM_CHANGE";
+    case MIDI_EVENT_CHAN_AFTERTOUCH:
+      return "MIDI_EVENT_CHAN_AFTERTOUCH";
+    case MIDI_EVENT_PITCH_BEND:
+      return "MIDI_EVENT_PITCH_BEND";
+    case MIDI_EVENT_SYSEX:
+      return "MIDI_EVENT_SYSEX";
+    case MIDI_EVENT_SYSEX_SPLIT:
+      return "MIDI_EVENT_SYSEX_SPLIT";
+    case MIDI_EVENT_META:
+      return "MIDI_EVENT_META";
 
-        default:
-            return "(unknown)";
+    default:
+      return "(unknown)";
+    }
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Get the number of tracks in a MIDI file. */
+
+unsigned int midi_num_tracks(midi_file_t *file)
+{
+  return file->num_tracks;
+}
+
+/* Start iterating over the events in a track. */
+
+midi_track_iter_t *midi_iterate_track(midi_file_t *file, unsigned int track)
+{
+  midi_track_iter_t *iter;
+
+  assert(track < file->num_tracks);
+
+  iter = malloc(sizeof(*iter));
+  iter->track = &file->tracks[track];
+  iter->position = 0;
+  iter->loop_point = 0;
+
+  return iter;
+}
+
+void midi_free_iterator(midi_track_iter_t *iter)
+{
+  free(iter);
+}
+
+/* Get the time until the next MIDI event in a track. */
+
+unsigned int midi_get_delta_time(midi_track_iter_t *iter)
+{
+  if (iter->position < iter->track->num_events)
+    {
+      midi_event_t *next_event;
+
+      next_event = &iter->track->events[iter->position];
+
+      return next_event->delta_time;
+    }
+  else
+    {
+      return 0;
     }
 }
 
-void PrintTrack(midi_track_t *track)
+/* Get a pointer to the next MIDI event. */
+
+int midi_get_next_event(midi_track_iter_t *iter, midi_event_t **event)
 {
-    midi_event_t *event;
-    unsigned int i;
-
-    for (i=0; i<track->num_events; ++i)
+  if (iter->position < iter->track->num_events)
     {
-        event = &track->events[i];
+      *event = &iter->track->events[iter->position];
+      ++iter->position;
 
-        if (event->delta_time > 0)
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+unsigned int midi_get_file_time_division(midi_file_t *file)
+{
+  short result = be16toh(file->header.time_division);
+
+  /* Negative time division indicates SMPTE time and must be handled
+   * differently.
+   */
+
+  if (result < 0)
+    {
+      return (signed int)(-(result / 256)) *
+             (signed int)(result & 0xff);
+    }
+  else
+    {
+      return result;
+    }
+}
+
+void midi_restart_iterator(midi_track_iter_t *iter)
+{
+  iter->position = 0;
+  iter->loop_point = 0;
+}
+
+void midi_set_loop_point(midi_track_iter_t *iter)
+{
+  iter->loop_point = iter->position;
+}
+
+void midi_restart_at_loop_point(midi_track_iter_t *iter)
+{
+  iter->position = iter->loop_point;
+}
+
+#ifdef TEST
+void print_track(midi_track_t *track)
+{
+  midi_event_t *event;
+  unsigned int i;
+
+  for (i = 0; i < track->num_events; ++i)
+    {
+      event = &track->events[i];
+
+      if (event->delta_time > 0)
         {
-            printf("Delay: %u ticks\n", event->delta_time);
+          printf("Delay: %u ticks\n", event->delta_time);
         }
 
-        printf("Event type: %s (%i)\n",
-               MIDI_EventTypeToString(event->event_type),
-               event->event_type);
+      printf("Event type: %s (%i)\n",
+             midi_event_type_to_string(event->event_type),
+             event->event_type);
 
-        switch(event->event_type)
+      switch (event->event_type)
         {
-            case MIDI_EVENT_NOTE_OFF:
-            case MIDI_EVENT_NOTE_ON:
-            case MIDI_EVENT_AFTERTOUCH:
-            case MIDI_EVENT_CONTROLLER:
-            case MIDI_EVENT_PROGRAM_CHANGE:
-            case MIDI_EVENT_CHAN_AFTERTOUCH:
-            case MIDI_EVENT_PITCH_BEND:
-                printf("\tChannel: %u\n", event->data.channel.channel);
-                printf("\tParameter 1: %u\n", event->data.channel.param1);
-                printf("\tParameter 2: %u\n", event->data.channel.param2);
-                break;
+        case MIDI_EVENT_NOTE_OFF:
+        case MIDI_EVENT_NOTE_ON:
+        case MIDI_EVENT_AFTERTOUCH:
+        case MIDI_EVENT_CONTROLLER:
+        case MIDI_EVENT_PROGRAM_CHANGE:
+        case MIDI_EVENT_CHAN_AFTERTOUCH:
+        case MIDI_EVENT_PITCH_BEND:
+          printf("\tChannel: %u\n", event->data.channel.channel);
+          printf("\tParameter 1: %u\n", event->data.channel.param1);
+          printf("\tParameter 2: %u\n", event->data.channel.param2);
+          break;
 
-            case MIDI_EVENT_SYSEX:
-            case MIDI_EVENT_SYSEX_SPLIT:
-                printf("\tLength: %u\n", event->data.sysex.length);
-                break;
+        case MIDI_EVENT_SYSEX:
+        case MIDI_EVENT_SYSEX_SPLIT:
+          printf("\tLength: %u\n", event->data.sysex.length);
+          break;
 
-            case MIDI_EVENT_META:
-                printf("\tMeta type: %u\n", event->data.meta.type);
-                printf("\tLength: %u\n", event->data.meta.length);
-                break;
+        case MIDI_EVENT_META:
+          printf("\tMeta type: %u\n", event->data.meta.type);
+          printf("\tLength: %u\n", event->data.meta.length);
+          break;
         }
     }
 }
 
 int main(int argc, char *argv[])
 {
-    midi_file_t *file;
-    unsigned int i;
+  midi_file_t *file;
+  unsigned int i;
 
-    if (argc < 2)
+  if (argc < 2)
     {
-        printf("Usage: %s <filename>\n", argv[0]);
-        exit(1);
+      printf("Usage: %s <filename>\n", argv[0]);
+      exit(1);
     }
 
-    file = MIDI_LoadFile(argv[1]);
+  file = midi_loadfile(argv[1]);
 
-    if (file == NULL)
+  if (file == NULL)
     {
-        fprintf(stderr, "Failed to open %s\n", argv[1]);
-        exit(1);
+      fprintf(stderr, "Failed to open %s\n", argv[1]);
+      exit(1);
     }
 
-    for (i=0; i<file->num_tracks; ++i)
+  for (i = 0; i < file->num_tracks; ++i)
     {
-        printf("\n== Track %u ==\n\n", i);
+      printf("\n== Track %u ==\n\n", i);
 
-        PrintTrack(&file->tracks[i]);
+      print_track(&file->tracks[i]);
     }
 
-    return 0;
+  return 0;
 }
-
 #endif
-
diff --git a/games/NXDoom/src/midifile.h b/games/NXDoom/src/midifile.h
index 035d6f8aa..e6dc9166e 100644
--- a/games/NXDoom/src/midifile.h
+++ b/games/NXDoom/src/midifile.h
@@ -1,232 +1,251 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     MIDI file parsing.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/midifile.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   MIDI file parsing.
+ *
+ ****************************************************************************/
 
 #ifndef MIDIFILE_H
 #define MIDIFILE_H
 
-typedef struct midi_file_s midi_file_t;
-typedef struct midi_track_iter_s midi_track_iter_t;
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 #define MIDI_CHANNELS_PER_TRACK 16
 
-#define MIDI_RPN_MSB                 0x00
+#define MIDI_RPN_MSB 0x00
 #define MIDI_RPN_PITCH_BEND_SENS_LSB 0x00
-#define MIDI_RPN_FINE_TUNING_LSB     0x01
-#define MIDI_RPN_COARSE_TUNING_LSB   0x02
-#define MIDI_RPN_NULL                0x7F
+#define MIDI_RPN_FINE_TUNING_LSB 0x01
+#define MIDI_RPN_COARSE_TUNING_LSB 0x02
+#define MIDI_RPN_NULL 0x7f
+
+#define EMIDI_LOOP_FLAG 0x7f
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+typedef struct midi_file_s midi_file_t;
+typedef struct midi_track_iter_s midi_track_iter_t;
 
 typedef enum
 {
-    MIDI_EVENT_NOTE_OFF        = 0x80,
-    MIDI_EVENT_NOTE_ON         = 0x90,
-    MIDI_EVENT_AFTERTOUCH      = 0xA0,
-    MIDI_EVENT_CONTROLLER      = 0xB0,
-    MIDI_EVENT_PROGRAM_CHANGE  = 0xC0,
-    MIDI_EVENT_CHAN_AFTERTOUCH = 0xD0,
-    MIDI_EVENT_PITCH_BEND      = 0xE0,
+  MIDI_EVENT_NOTE_OFF = 0x80,
+  MIDI_EVENT_NOTE_ON = 0x90,
+  MIDI_EVENT_AFTERTOUCH = 0xa0,
+  MIDI_EVENT_CONTROLLER = 0xb0,
+  MIDI_EVENT_PROGRAM_CHANGE = 0xc0,
+  MIDI_EVENT_CHAN_AFTERTOUCH = 0xd0,
+  MIDI_EVENT_PITCH_BEND = 0xe0,
 
-    MIDI_EVENT_SYSEX           = 0xF0,
-    MIDI_EVENT_SYSEX_SPLIT     = 0xF7,
-    MIDI_EVENT_META            = 0xFF,
+  MIDI_EVENT_SYSEX = 0xf0,
+  MIDI_EVENT_SYSEX_SPLIT = 0xf7,
+  MIDI_EVENT_META = 0xff,
 } midi_event_type_t;
 
 typedef enum
 {
-    MIDI_CONTROLLER_BANK_SELECT_MSB = 0x00,
-    MIDI_CONTROLLER_MODULATION      = 0x01,
-    MIDI_CONTROLLER_BREATH_CONTROL  = 0x02,
-    MIDI_CONTROLLER_FOOT_CONTROL    = 0x04,
-    MIDI_CONTROLLER_PORTAMENTO      = 0x05,
-    MIDI_CONTROLLER_DATA_ENTRY_MSB  = 0x06,
-    MIDI_CONTROLLER_VOLUME_MSB      = 0x07,
-    MIDI_CONTROLLER_PAN             = 0x0A,
-    MIDI_CONTROLLER_EXPRESSION      = 0x0B,
+  MIDI_CONTROLLER_BANK_SELECT_MSB = 0x00,
+  MIDI_CONTROLLER_MODULATION = 0x01,
+  MIDI_CONTROLLER_BREATH_CONTROL = 0x02,
+  MIDI_CONTROLLER_FOOT_CONTROL = 0x04,
+  MIDI_CONTROLLER_PORTAMENTO = 0x05,
+  MIDI_CONTROLLER_DATA_ENTRY_MSB = 0x06,
+  MIDI_CONTROLLER_VOLUME_MSB = 0x07,
+  MIDI_CONTROLLER_PAN = 0x0a,
+  MIDI_CONTROLLER_EXPRESSION = 0x0b,
 
-    MIDI_CONTROLLER_BANK_SELECT_LSB = 0x20,
-    MIDI_CONTROLLER_DATA_ENTRY_LSB  = 0x26,
-    MIDI_CONTROLLER_VOLUME_LSB      = 0X27,
+  MIDI_CONTROLLER_BANK_SELECT_LSB = 0x20,
+  MIDI_CONTROLLER_DATA_ENTRY_LSB = 0x26,
+  MIDI_CONTROLLER_VOLUME_LSB = 0X27,
 
-    MIDI_CONTROLLER_HOLD1_PEDAL     = 0x40,
-    MIDI_CONTROLLER_SOFT_PEDAL      = 0x43,
+  MIDI_CONTROLLER_HOLD1_PEDAL = 0x40,
+  MIDI_CONTROLLER_SOFT_PEDAL = 0x43,
 
-    MIDI_CONTROLLER_REVERB          = 0x5B,
-    MIDI_CONTROLLER_CHORUS          = 0x5D,
+  MIDI_CONTROLLER_REVERB = 0x5b,
+  MIDI_CONTROLLER_CHORUS = 0x5d,
 
-    MIDI_CONTROLLER_NRPN_LSB        = 0x62,
-    MIDI_CONTROLLER_NRPN_MSB        = 0x63,
-    MIDI_CONTROLLER_RPN_LSB         = 0x64,
-    MIDI_CONTROLLER_RPN_MSB         = 0x65,
+  MIDI_CONTROLLER_NRPN_LSB = 0x62,
+  MIDI_CONTROLLER_NRPN_MSB = 0x63,
+  MIDI_CONTROLLER_RPN_LSB = 0x64,
+  MIDI_CONTROLLER_RPN_MSB = 0x65,
 
-    MIDI_CONTROLLER_ALL_SOUND_OFF   = 0x78,
-    MIDI_CONTROLLER_RESET_ALL_CTRLS = 0x79,
-    MIDI_CONTROLLER_ALL_NOTES_OFF   = 0x7B,
+  MIDI_CONTROLLER_ALL_SOUND_OFF = 0x78,
+  MIDI_CONTROLLER_RESET_ALL_CTRLS = 0x79,
+  MIDI_CONTROLLER_ALL_NOTES_OFF = 0x7b,
 
-    MIDI_CONTROLLER_POLY_MODE_OFF   = 0x7E,
-    MIDI_CONTROLLER_POLY_MODE_ON    = 0x7F,
+  MIDI_CONTROLLER_POLY_MODE_OFF = 0x7e,
+  MIDI_CONTROLLER_POLY_MODE_ON = 0x7f,
 } midi_controller_t;
 
 typedef enum
 {
-    MIDI_META_SEQUENCE_NUMBER       = 0x00,
+  MIDI_META_SEQUENCE_NUMBER = 0x00,
 
-    MIDI_META_TEXT                  = 0x01,
-    MIDI_META_COPYRIGHT             = 0x02,
-    MIDI_META_TRACK_NAME            = 0x03,
-    MIDI_META_INSTR_NAME            = 0x04,
-    MIDI_META_LYRICS                = 0x05,
-    MIDI_META_MARKER                = 0x06,
-    MIDI_META_CUE_POINT             = 0x07,
+  MIDI_META_TEXT = 0x01,
+  MIDI_META_COPYRIGHT = 0x02,
+  MIDI_META_TRACK_NAME = 0x03,
+  MIDI_META_INSTR_NAME = 0x04,
+  MIDI_META_LYRICS = 0x05,
+  MIDI_META_MARKER = 0x06,
+  MIDI_META_CUE_POINT = 0x07,
 
-    MIDI_META_CHANNEL_PREFIX        = 0x20,
-    MIDI_META_END_OF_TRACK          = 0x2F,
+  MIDI_META_CHANNEL_PREFIX = 0x20,
+  MIDI_META_END_OF_TRACK = 0x2f,
 
-    MIDI_META_SET_TEMPO             = 0x51,
-    MIDI_META_SMPTE_OFFSET          = 0x54,
-    MIDI_META_TIME_SIGNATURE        = 0x58,
-    MIDI_META_KEY_SIGNATURE         = 0x59,
-    MIDI_META_SEQUENCER_SPECIFIC    = 0x7F,
+  MIDI_META_SET_TEMPO = 0x51,
+  MIDI_META_SMPTE_OFFSET = 0x54,
+  MIDI_META_TIME_SIGNATURE = 0x58,
+  MIDI_META_KEY_SIGNATURE = 0x59,
+  MIDI_META_SEQUENCER_SPECIFIC = 0x7f,
 } midi_meta_event_type_t;
 
-#define EMIDI_LOOP_FLAG 0x7F
-
 typedef enum
 {
-    EMIDI_DEVICE_GENERAL_MIDI  = 0x00,
-    EMIDI_DEVICE_SOUND_CANVAS  = 0x01,
-    EMIDI_DEVICE_AWE32         = 0x02,
-    EMIDI_DEVICE_WAVE_BLASTER  = 0x03,
-    EMIDI_DEVICE_SOUND_BLASTER = 0x04,
-    EMIDI_DEVICE_PRO_AUDIO     = 0x05,
-    EMIDI_DEVICE_SOUND_MAN_16  = 0x06,
-    EMIDI_DEVICE_ADLIB         = 0x07,
-    EMIDI_DEVICE_SOUNDSCAPE    = 0x08,
-    EMIDI_DEVICE_ULTRASOUND    = 0x09,
-    EMIDI_DEVICE_ALL           = 0x7F,
+  EMIDI_DEVICE_GENERAL_MIDI = 0x00,
+  EMIDI_DEVICE_SOUND_CANVAS = 0x01,
+  EMIDI_DEVICE_AWE32 = 0x02,
+  EMIDI_DEVICE_WAVE_BLASTER = 0x03,
+  EMIDI_DEVICE_SOUND_BLASTER = 0x04,
+  EMIDI_DEVICE_PRO_AUDIO = 0x05,
+  EMIDI_DEVICE_SOUND_MAN_16 = 0x06,
+  EMIDI_DEVICE_ADLIB = 0x07,
+  EMIDI_DEVICE_SOUNDSCAPE = 0x08,
+  EMIDI_DEVICE_ULTRASOUND = 0x09,
+  EMIDI_DEVICE_ALL = 0x7f,
 } emidi_device_t;
 
 typedef enum
 {
-    EMIDI_CONTROLLER_TRACK_DESIGNATION = 0x6E,
-    EMIDI_CONTROLLER_TRACK_EXCLUSION   = 0x6F,
-    EMIDI_CONTROLLER_PROGRAM_CHANGE    = 0x70,
-    EMIDI_CONTROLLER_VOLUME            = 0x71,
-    EMIDI_CONTROLLER_LOOP_BEGIN        = 0x74,
-    EMIDI_CONTROLLER_LOOP_END          = 0x75,
-    EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN = 0x76,
-    EMIDI_CONTROLLER_GLOBAL_LOOP_END   = 0x77,
+  EMIDI_CONTROLLER_TRACK_DESIGNATION = 0x6e,
+  EMIDI_CONTROLLER_TRACK_EXCLUSION = 0x6f,
+  EMIDI_CONTROLLER_PROGRAM_CHANGE = 0x70,
+  EMIDI_CONTROLLER_VOLUME = 0x71,
+  EMIDI_CONTROLLER_LOOP_BEGIN = 0x74,
+  EMIDI_CONTROLLER_LOOP_END = 0x75,
+  EMIDI_CONTROLLER_GLOBAL_LOOP_BEGIN = 0x76,
+  EMIDI_CONTROLLER_GLOBAL_LOOP_END = 0x77,
 } emidi_controller_t;
 
 typedef struct
 {
-    // Meta event type:
+  /* Meta event type: */
 
-    unsigned int type;
+  unsigned int type;
 
-    // Length:
+  /* Length: */
 
-    unsigned int length;
+  unsigned int length;
 
-    // Meta event data:
+  /* Meta event data: */
 
-    byte *data;
+  byte *data;
 } midi_meta_event_data_t;
 
 typedef struct
 {
-    // Length:
+  /* Length: */
 
-    unsigned int length;
+  unsigned int length;
 
-    // Event data:
+  /* Event data: */
 
-    byte *data;
+  byte *data;
 } midi_sysex_event_data_t;
 
 typedef struct
 {
-    // The channel number to which this applies:
+  /* The channel number to which this applies: */
 
-    unsigned int channel;
+  unsigned int channel;
 
-    // Extra parameters:
+  /* Extra parameters: */
 
-    unsigned int param1;
-    unsigned int param2;
+  unsigned int param1;
+  unsigned int param2;
 } midi_channel_event_data_t;
 
 typedef struct
 {
-    // Time between the previous event and this event.
-    unsigned int delta_time;
+  /* Time between the previous event and this event. */
 
-    // Type of event:
-    midi_event_type_t event_type;
+  unsigned int delta_time;
 
-    union
-    {
-        midi_channel_event_data_t channel;
-        midi_meta_event_data_t meta;
-        midi_sysex_event_data_t sysex;
-    } data;
+  /* Type of event: */
+
+  midi_event_type_t event_type;
+
+  union
+  {
+    midi_channel_event_data_t channel;
+    midi_meta_event_data_t meta;
+    midi_sysex_event_data_t sysex;
+  } data;
 } midi_event_t;
 
-// Load a MIDI file.
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-midi_file_t *MIDI_LoadFile(char *filename);
+/* Load a MIDI file. */
 
-// Free a MIDI file.
+midi_file_t *midi_loadfile(char *filename);
 
-void MIDI_FreeFile(midi_file_t *file);
+/* Free a MIDI file. */
 
-// Get the time division value from the MIDI header.
+void midi_free_file(midi_file_t *file);
 
-unsigned int MIDI_GetFileTimeDivision(midi_file_t *file);
+/* Get the time division value from the MIDI header. */
 
-// Get the number of tracks in a MIDI file.
+unsigned int midi_get_file_time_division(midi_file_t *file);
 
-unsigned int MIDI_NumTracks(midi_file_t *file);
+/* Get the number of tracks in a MIDI file. */
 
-// Start iterating over the events in a track.
+unsigned int midi_num_tracks(midi_file_t *file);
 
-midi_track_iter_t *MIDI_IterateTrack(midi_file_t *file, unsigned int track_num);
+/* Start iterating over the events in a track. */
 
-// Free an iterator.
+midi_track_iter_t *midi_iterate_track(midi_file_t *file,
+                                     unsigned int track_num);
 
-void MIDI_FreeIterator(midi_track_iter_t *iter);
+/* Free an iterator. */
 
-// Get the time until the next MIDI event in a track.
+void midi_free_iterator(midi_track_iter_t *iter);
 
-unsigned int MIDI_GetDeltaTime(midi_track_iter_t *iter);
+/* Get the time until the next MIDI event in a track. */
 
-// Get a pointer to the next MIDI event.
+unsigned int midi_get_delta_time(midi_track_iter_t *iter);
 
-int MIDI_GetNextEvent(midi_track_iter_t *iter, midi_event_t **event);
+/* Get a pointer to the next MIDI event. */
 
-// Reset an iterator to the beginning of a track.
+int midi_get_next_event(midi_track_iter_t *iter, midi_event_t **event);
 
-void MIDI_RestartIterator(midi_track_iter_t *iter);
+/* Reset an iterator to the beginning of a track. */
 
-// Set loop point to current position.
+void midi_restart_iterator(midi_track_iter_t *iter);
 
-void MIDI_SetLoopPoint(midi_track_iter_t *iter);
+/* Set loop point to current position. */
 
-// Set position to saved loop point.
+void midi_set_loop_point(midi_track_iter_t *iter);
 
-void MIDI_RestartAtLoopPoint(midi_track_iter_t *iter);
+/* Set position to saved loop point. */
 
-#endif /* #ifndef MIDIFILE_H */
+void midi_restart_at_loop_point(midi_track_iter_t *iter);
 
+#endif /* MIDIFILE_H */
diff --git a/games/NXDoom/src/mus2mid.c b/games/NXDoom/src/mus2mid.c
index f81f939f2..502e10252 100644
--- a/games/NXDoom/src/mus2mid.c
+++ b/games/NXDoom/src/mus2mid.c
@@ -1,20 +1,30 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2006 Ben Ryves 2006
-//
-// 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.
-//
-// mus2mid.c - Ben Ryves 2006 - http://benryves.com - benryves@benryves.com
-// Use to convert a MUS file into a single track, type 0 MIDI file.
+/****************************************************************************
+ * apps/games/NXDoom/src/mus2mid.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ * Copyright(C) 2006 Ben Ryves 2006
+ *
+ * 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.
+ *
+ * mus2mid.c - Ben Ryves 2006 - http: *benryves.com - benryves@benryves.com
+ * Use to convert a MUS file into a single track, type 0 MIDI file.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,712 +35,760 @@
 #include "memio.h"
 #include "mus2mid.h"
 
+#ifdef STANDALONE
+#include "m_misc.h"
+#include "z_zone.h"
+#endif
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define NUM_CHANNELS 16
 
 #define MIDI_PERCUSSION_CHAN 9
 #define MUS_PERCUSSION_CHAN 15
 
-// MUS event codes
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* MUS event codes */
+
 typedef enum
 {
-    mus_releasekey = 0x00,
-    mus_presskey = 0x10,
-    mus_pitchwheel = 0x20,
-    mus_systemevent = 0x30,
-    mus_changecontroller = 0x40,
-    mus_scoreend = 0x60
+  mus_releasekey = 0x00,
+  mus_presskey = 0x10,
+  mus_pitchwheel = 0x20,
+  mus_systemevent = 0x30,
+  mus_changecontroller = 0x40,
+  mus_scoreend = 0x60
 } musevent;
 
-// MIDI event codes
+/* MIDI event codes */
+
 typedef enum
 {
-    midi_releasekey = 0x80,
-    midi_presskey = 0x90,
-    midi_aftertouchkey = 0xA0,
-    midi_changecontroller = 0xB0,
-    midi_changepatch = 0xC0,
-    midi_aftertouchchannel = 0xD0,
-    midi_pitchwheel = 0xE0
+  midi_releasekey = 0x80,
+  midi_presskey = 0x90,
+  midi_aftertouchkey = 0xa0,
+  midi_changecontroller = 0xb0,
+  midi_changepatch = 0xc0,
+  midi_aftertouchchannel = 0xd0,
+  midi_pitchwheel = 0xe0
 } midievent;
 
-// Structure to hold MUS file header
-typedef PACKED_STRUCT (
-{
-    byte id[4];
-    unsigned short scorelength;
-    unsigned short scorestart;
-    unsigned short primarychannels;
-    unsigned short secondarychannels;
-    unsigned short instrumentcount;
-}) musheader;
+/* Structure to hold MUS file header */
+
+begin_packed_struct struct musheader
+{
+  byte id[4];
+  unsigned short scorelength;
+  unsigned short scorestart;
+  unsigned short primarychannels;
+  unsigned short secondarychannels;
+  unsigned short instrumentcount;
+} end_packed_struct;
+
+typedef struct musheader musheader;
+
+/* Standard MIDI type 0 header + track header */
 
-// Standard MIDI type 0 header + track header
 static const byte midiheader[] =
 {
-    'M', 'T', 'h', 'd',     // Main header
-    0x00, 0x00, 0x00, 0x06, // Header size
-    0x00, 0x00,             // MIDI type (0)
-    0x00, 0x01,             // Number of tracks
-    0x00, 0x46,             // Resolution
-    'M', 'T', 'r', 'k',        // Start of track
-    0x00, 0x00, 0x00, 0x00  // Placeholder for track length
+  'M',  'T',  'h',  'd',  /* Main header */
+  0x00, 0x00, 0x00, 0x06, /* Header size */
+  0x00, 0x00,             /* MIDI type (0) */
+  0x00, 0x01,             /* Number of tracks */
+  0x00, 0x46,             /* Resolution */
+  'M',  'T',  'r',  'k',  /* Start of track */
+  0x00, 0x00, 0x00, 0x00  /* Placeholder for track length */
 };
 
-// Cached channel velocities
+/* Cached channel velocities */
+
 static byte channelvelocities[] =
 {
-    127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127, 127, 127, 127, 127, 127
+  127, 127, 127, 127, 127, 127, 127, 127,
+  127, 127, 127, 127, 127, 127, 127, 127,
 };
 
-// Timestamps between sequences of MUS events
+/* Timestamps between sequences of MUS events */
 
 static unsigned int queuedtime = 0;
 
-// Counter for the length of the track
+/* Counter for the length of the track */
 
 static unsigned int tracksize;
 
 static const byte controller_map[] =
 {
-    0x00, 0x20, 0x01, 0x07, 0x0A, 0x0B, 0x5B, 0x5D,
-    0x40, 0x43, 0x78, 0x7B, 0x7E, 0x7F, 0x79
+    0x00, 0x20, 0x01, 0x07, 0x0a, 0x0b, 0x5b, 0x5d,
+    0x40, 0x43, 0x78, 0x7b, 0x7e, 0x7f, 0x79,
 };
 
 static int channel_map[NUM_CHANNELS];
 
-// Write timestamp to a MIDI file.
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static boolean WriteTime(unsigned int time, MEMFILE *midioutput)
+/* Write timestamp to a MIDI file. */
+
+static boolean write_time(unsigned int time, MEMFILE *midioutput)
 {
-    unsigned int buffer = time & 0x7F;
-    byte writeval;
+  unsigned int buffer = time & 0x7f;
+  byte writeval;
 
-    while ((time >>= 7) != 0)
+  while ((time >>= 7) != 0)
     {
-        buffer <<= 8;
-        buffer |= ((time & 0x7F) | 0x80);
+      buffer <<= 8;
+      buffer |= ((time & 0x7f) | 0x80);
     }
 
-    for (;;)
+  for (; ; )
     {
-        writeval = (byte)(buffer & 0xFF);
+      writeval = (byte)(buffer & 0xff);
 
-        if (mem_fwrite(&writeval, 1, 1, midioutput) != 1)
+      if (mem_fwrite(&writeval, 1, 1, midioutput) != 1)
         {
-            return true;
+          return true;
         }
 
-        ++tracksize;
+      ++tracksize;
 
-        if ((buffer & 0x80) != 0)
+      if ((buffer & 0x80) != 0)
         {
-            buffer >>= 8;
+          buffer >>= 8;
         }
-        else
+      else
         {
-            queuedtime = 0;
-            return false;
+          queuedtime = 0;
+          return false;
         }
     }
 }
 
+/* Write the end of track marker */
 
-// Write the end of track marker
-static boolean WriteEndTrack(MEMFILE *midioutput)
+static boolean write_end_track(MEMFILE *midioutput)
 {
-    byte endtrack[] = {0xFF, 0x2F, 0x00};
-
-    if (WriteTime(queuedtime, midioutput))
+  byte endtrack[] =
     {
-        return true;
+      0xff, 0x2f, 0x00
+    };
+
+  if (write_time(queuedtime, midioutput))
+    {
+      return true;
     }
 
-    if (mem_fwrite(endtrack, 1, 3, midioutput) != 3)
+  if (mem_fwrite(endtrack, 1, 3, midioutput) != 3)
     {
-        return true;
+      return true;
     }
 
-    tracksize += 3;
-    return false;
+  tracksize += 3;
+  return false;
 }
 
-// Write a key press event
-static boolean WritePressKey(byte channel, byte key,
-                             byte velocity, MEMFILE *midioutput)
+/* Write a key press event */
+
+static boolean write_press_key(byte channel, byte key, byte velocity,
+                             MEMFILE *midioutput)
 {
-    byte working = midi_presskey | channel;
+  byte working = midi_presskey | channel;
 
-    if (WriteTime(queuedtime, midioutput))
+  if (write_time(queuedtime, midioutput))
     {
-        return true;
+      return true;
     }
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = key & 0x7F;
+  working = key & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = velocity & 0x7F;
+  working = velocity & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    tracksize += 3;
+  tracksize += 3;
 
-    return false;
+  return false;
 }
 
-// Write a key release event
-static boolean WriteReleaseKey(byte channel, byte key,
-                               MEMFILE *midioutput)
+/* Write a key release event */
+
+static boolean write_release_key(byte channel, byte key, MEMFILE *midioutput)
 {
-    byte working = midi_releasekey | channel;
+  byte working = midi_releasekey | channel;
 
-    if (WriteTime(queuedtime, midioutput))
+  if (write_time(queuedtime, midioutput))
     {
-        return true;
+      return true;
     }
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = key & 0x7F;
+  working = key & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = 0;
+  working = 0;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    tracksize += 3;
+  tracksize += 3;
 
-    return false;
+  return false;
 }
 
-// Write a pitch wheel/bend event
-static boolean WritePitchWheel(byte channel, short wheel,
-                               MEMFILE *midioutput)
+/* Write a pitch wheel/bend event */
+
+static boolean write_pitch_wheel(byte channel, short wheel,
+                                 MEMFILE *midioutput)
 {
-    byte working = midi_pitchwheel | channel;
+  byte working = midi_pitchwheel | channel;
 
-    if (WriteTime(queuedtime, midioutput))
+  if (write_time(queuedtime, midioutput))
     {
-        return true;
+      return true;
     }
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = wheel & 0x7F;
+  working = wheel & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = (wheel >> 7) & 0x7F;
+  working = (wheel >> 7) & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    tracksize += 3;
-    return false;
+  tracksize += 3;
+  return false;
 }
 
-// Write a patch change event
-static boolean WriteChangePatch(byte channel, byte patch,
-                                MEMFILE *midioutput)
+/* Write a patch change event */
+
+static boolean write_change_patch(byte channel, byte patch,
+                                  MEMFILE *midioutput)
 {
-    byte working = midi_changepatch | channel;
+  byte working = midi_changepatch | channel;
 
-    if (WriteTime(queuedtime, midioutput))
+  if (write_time(queuedtime, midioutput))
     {
-        return true;
+      return true;
     }
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = patch & 0x7F;
+  working = patch & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    tracksize += 2;
+  tracksize += 2;
 
-    return false;
+  return false;
 }
 
-// Write a valued controller change event
+/* Write a valued controller change event */
 
-static boolean WriteChangeController_Valued(byte channel,
-                                            byte control,
-                                            byte value,
-                                            MEMFILE *midioutput)
+static boolean write_change_controller_valued(byte channel, byte control,
+                                            byte value, MEMFILE *midioutput)
 {
-    byte working = midi_changecontroller | channel;
+  byte working = midi_changecontroller | channel;
 
-    if (WriteTime(queuedtime, midioutput))
+  if (write_time(queuedtime, midioutput))
     {
-        return true;
+      return true;
     }
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    working = control & 0x7F;
+  working = control & 0x7f;
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    // Quirk in vanilla DOOM? MUS controller values should be
-    // 7-bit, not 8-bit.
+  /* Quirk in vanilla DOOM? MUS controller values should be
+   * 7-bit, not 8-bit.
+   */
 
-    working = value;// & 0x7F;
+  working = value; /* & 0x7F; */
 
-    // Fix on said quirk to stop MIDI players from complaining that
-    // the value is out of range:
+  /* Fix on said quirk to stop MIDI players from complaining that
+   * the value is out of range:
+   */
 
-    if (working & 0x80)
+  if (working & 0x80)
     {
-        working = 0x7F;
+      working = 0x7f;
     }
 
-    if (mem_fwrite(&working, 1, 1, midioutput) != 1)
+  if (mem_fwrite(&working, 1, 1, midioutput) != 1)
     {
-        return true;
+      return true;
     }
 
-    tracksize += 3;
+  tracksize += 3;
 
-    return false;
+  return false;
 }
 
-// Write a valueless controller change event
-static boolean WriteChangeController_Valueless(byte channel,
-                                               byte control,
+/* Write a valueless controller change event */
+
+static boolean write_change_controller_valueless(byte channel, byte control,
                                                MEMFILE *midioutput)
 {
-    return WriteChangeController_Valued(channel, control, 0,
-                                             midioutput);
+  return write_change_controller_valued(channel, control, 0, midioutput);
 }
 
-// Allocate a free MIDI channel.
+/* Allocate a free MIDI channel. */
 
-static int AllocateMIDIChannel(void)
+static int allocate_midi_channel(void)
 {
-    int result;
-    int max;
-    int i;
+  int result;
+  int max;
+  int i;
 
-    // Find the current highest-allocated channel.
+  /* Find the current highest-allocated channel. */
 
-    max = -1;
+  max = -1;
 
-    for (i=0; i<NUM_CHANNELS; ++i)
+  for (i = 0; i < NUM_CHANNELS; ++i)
     {
-        if (channel_map[i] > max)
+      if (channel_map[i] > max)
         {
-            max = channel_map[i];
+          max = channel_map[i];
         }
     }
 
-    // max is now equal to the highest-allocated MIDI channel.  We can
-    // now allocate the next available channel.  This also works if
-    // no channels are currently allocated (max=-1)
+  /* max is now equal to the highest-allocated MIDI channel.  We can
+   * now allocate the next available channel.  This also works if
+   * no channels are currently allocated (max=-1)
+   */
 
-    result = max + 1;
+  result = max + 1;
 
-    // Don't allocate the MIDI percussion channel!
+  /* Don't allocate the MIDI percussion channel! */
 
-    if (result == MIDI_PERCUSSION_CHAN)
+  if (result == MIDI_PERCUSSION_CHAN)
     {
-        ++result;
+      ++result;
     }
 
-    return result;
+  return result;
 }
 
-// Given a MUS channel number, get the MIDI channel number to use
-// in the outputted file.
+/* Given a MUS channel number, get the MIDI channel number to use
+ * in the outputted file.
+ */
 
-static int GetMIDIChannel(int mus_channel, MEMFILE *midioutput)
+static int get_midi_channel(int mus_channel, MEMFILE *midioutput)
 {
-    // Find the MIDI channel to use for this MUS channel.
-    // MUS channel 15 is the percusssion channel.
+  /* Find the MIDI channel to use for this MUS channel.
+   * MUS channel 15 is the percusssion channel.
+   */
 
-    if (mus_channel == MUS_PERCUSSION_CHAN)
+  if (mus_channel == MUS_PERCUSSION_CHAN)
     {
-        return MIDI_PERCUSSION_CHAN;
+      return MIDI_PERCUSSION_CHAN;
     }
-    else
+  else
     {
-        // If a MIDI channel hasn't been allocated for this MUS channel
-        // yet, allocate the next free MIDI channel.
+      /* If a MIDI channel hasn't been allocated for this MUS channel
+       * yet, allocate the next free MIDI channel.
+       */
 
-        if (channel_map[mus_channel] == -1)
+      if (channel_map[mus_channel] == -1)
         {
-            channel_map[mus_channel] = AllocateMIDIChannel();
+          channel_map[mus_channel] = allocate_midi_channel();
 
-            // First time using the channel, send an "all notes off"
-            // event. This fixes "The D_DDTBLU disease" described here:
-            // https://www.doomworld.com/vb/source-ports/66802-the
-            WriteChangeController_Valueless(channel_map[mus_channel], 0x7b,
-                                            midioutput);
+          /* First time using the channel, send an "all notes off"
+           * event. This fixes "The D_DDTBLU disease" described here:
+           * https: *www.doomworld.com/vb/source-ports/66802-the
+           */
+
+          write_change_controller_valueless(channel_map[mus_channel], 0x7b,
+                                          midioutput);
         }
 
-        return channel_map[mus_channel];
+      return channel_map[mus_channel];
     }
 }
 
-static boolean ReadMusHeader(MEMFILE *file, musheader *header)
+static boolean read_mus_header(MEMFILE *file, musheader *header)
 {
-    boolean result;
+  boolean result;
 
-    result = mem_fread(&header->id, sizeof(byte), 4, file) == 4
-          && mem_fread(&header->scorelength, sizeof(short), 1, file) == 1
-          && mem_fread(&header->scorestart, sizeof(short), 1, file) == 1
-          && mem_fread(&header->primarychannels, sizeof(short), 1, file) == 1
-          && mem_fread(&header->secondarychannels, sizeof(short), 1, file) == 1
-          && mem_fread(&header->instrumentcount, sizeof(short), 1, file) == 1;
+  result =
+      mem_fread(&header->id, sizeof(byte), 4, file) == 4 &&
+      mem_fread(&header->scorelength, sizeof(short), 1, file) == 1 &&
+      mem_fread(&header->scorestart, sizeof(short), 1, file) == 1 &&
+      mem_fread(&header->primarychannels, sizeof(short), 1, file) == 1 &&
+      mem_fread(&header->secondarychannels, sizeof(short), 1, file) == 1 &&
+      mem_fread(&header->instrumentcount, sizeof(short), 1, file) == 1;
 
-    if (result)
+  if (result)
     {
-        header->scorelength = SHORT(header->scorelength);
-        header->scorestart = SHORT(header->scorestart);
-        header->primarychannels = SHORT(header->primarychannels);
-        header->secondarychannels = SHORT(header->secondarychannels);
-        header->instrumentcount = SHORT(header->instrumentcount);
+      header->scorelength = SHORT(header->scorelength);
+      header->scorestart = SHORT(header->scorestart);
+      header->primarychannels = SHORT(header->primarychannels);
+      header->secondarychannels = SHORT(header->secondarychannels);
+      header->instrumentcount = SHORT(header->instrumentcount);
     }
 
-    return result;
+  return result;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-// Read a MUS file from a stream (musinput) and output a MIDI file to
-// a stream (midioutput).
-//
-// Returns 0 on success or 1 on failure.
+/* Read a MUS file from a stream (musinput) and output a MIDI file to
+ * a stream (midioutput).
+ *
+ * Returns 0 on success or 1 on failure.
+ */
 
 boolean mus2mid(MEMFILE *musinput, MEMFILE *midioutput)
 {
-    // Header for the MUS file
-    musheader musfileheader;
+  /* Header for the MUS file */
 
-    // Descriptor for the current MUS event
-    byte eventdescriptor;
-    int channel; // Channel number
-    musevent event;
+  musheader musfileheader;
 
+  /* Descriptor for the current MUS event */
 
-    // Bunch of vars read from MUS lump
-    byte key;
-    byte controllernumber;
-    byte controllervalue;
+  byte eventdescriptor;
+  int channel; /* Channel number */
+  musevent event;
 
-    // Buffer used for MIDI track size record
-    byte tracksizebuffer[4];
+  /* Bunch of vars read from MUS lump */
 
-    // Flag for when the score end marker is hit.
-    int hitscoreend = 0;
+  byte key;
+  byte controllernumber;
+  byte controllervalue;
 
-    // Temp working byte
-    byte working;
-    // Used in building up time delays
-    unsigned int timedelay;
+  /* Buffer used for MIDI track size record */
 
-    // Initialise channel map to mark all channels as unused.
+  byte tracksizebuffer[4];
 
-    for (channel=0; channel<NUM_CHANNELS; ++channel)
+  /* Flag for when the score end marker is hit. */
+
+  int hitscoreend = 0;
+
+  /* Temp working byte */
+
+  byte working;
+
+  /* Used in building up time delays */
+
+  unsigned int timedelay;
+
+  /* Initialise channel map to mark all channels as unused. */
+
+  for (channel = 0; channel < NUM_CHANNELS; ++channel)
     {
-        channel_map[channel] = -1;
+      channel_map[channel] = -1;
     }
 
-    // Grab the header
+  /* Grab the header */
 
-    if (!ReadMusHeader(musinput, &musfileheader))
+  if (!read_mus_header(musinput, &musfileheader))
     {
-        return true;
+      return true;
     }
 
+  /* Check MUS header */
+
 #ifdef CHECK_MUS_HEADER
-    // Check MUS header
-    if (musfileheader.id[0] != 'M'
-     || musfileheader.id[1] != 'U'
-     || musfileheader.id[2] != 'S'
-     || musfileheader.id[3] != 0x1A)
+  if (musfileheader.id[0] != 'M' || musfileheader.id[1] != 'U' ||
+      musfileheader.id[2] != 'S' || musfileheader.id[3] != 0x1a)
     {
-        return true;
+      return true;
     }
 #endif
 
-    // Seek to where the data is held
-    if (mem_fseek(musinput, (long)musfileheader.scorestart,
-                  MEM_SEEK_SET) != 0)
+  /* Seek to where the data is held */
+
+  if (mem_fseek(musinput, (long)musfileheader.scorestart, MEM_SEEK_SET) != 0)
     {
-        return true;
+      return true;
     }
 
-    // So, we can assume the MUS file is faintly legit. Let's start
-    // writing MIDI data...
+  /* So, we can assume the MUS file is faintly legit. Let's start
+   * writing MIDI data...
+   */
 
-    mem_fwrite(midiheader, 1, sizeof(midiheader), midioutput);
-    tracksize = 0;
+  mem_fwrite(midiheader, 1, sizeof(midiheader), midioutput);
+  tracksize = 0;
 
-    // Now, process the MUS file:
-    while (!hitscoreend)
+  /* Now, process the MUS file: */
+
+  while (!hitscoreend)
     {
-        // Handle a block of events:
+      /* Handle a block of events: */
 
-        while (!hitscoreend)
+      while (!hitscoreend)
         {
-            // Fetch channel number and event code:
+          /* Fetch channel number and event code: */
 
-            if (mem_fread(&eventdescriptor, 1, 1, musinput) != 1)
+          if (mem_fread(&eventdescriptor, 1, 1, musinput) != 1)
             {
-                return true;
+              return true;
             }
 
-            channel = GetMIDIChannel(eventdescriptor & 0x0F, midioutput);
-            event = eventdescriptor & 0x70;
+          channel = get_midi_channel(eventdescriptor & 0x0f, midioutput);
+          event = eventdescriptor & 0x70;
 
-            switch (event)
+          switch (event)
             {
-                case mus_releasekey:
-                    if (mem_fread(&key, 1, 1, musinput) != 1)
+            case mus_releasekey:
+              if (mem_fread(&key, 1, 1, musinput) != 1)
+                {
+                  return true;
+                }
+
+              if (write_release_key(channel, key, midioutput))
+                {
+                  return true;
+                }
+
+              break;
+
+            case mus_presskey:
+              if (mem_fread(&key, 1, 1, musinput) != 1)
+                {
+                  return true;
+                }
+
+              if (key & 0x80)
+                {
+                  if (mem_fread(&channelvelocities[channel], 1, 1,
+                                musinput) != 1)
                     {
-                        return true;
+                      return true;
                     }
 
-                    if (WriteReleaseKey(channel, key, midioutput))
+                  channelvelocities[channel] &= 0x7f;
+                }
+
+              if (write_press_key(channel, key, channelvelocities[channel],
+                                midioutput))
+                {
+                  return true;
+                }
+
+              break;
+
+            case mus_pitchwheel:
+              if (mem_fread(&key, 1, 1, musinput) != 1)
+                {
+                  break;
+                }
+
+              if (write_pitch_wheel(channel, (short)(key * 64), midioutput))
+                {
+                  return true;
+                }
+
+              break;
+
+            case mus_systemevent:
+              if (mem_fread(&controllernumber, 1, 1, musinput) != 1)
+                {
+                  return true;
+                }
+
+              if (controllernumber < 10 || controllernumber > 14)
+                {
+                  return true;
+                }
+
+              if (write_change_controller_valueless(
+                      channel, controller_map[controllernumber], midioutput))
+                {
+                  return true;
+                }
+
+              break;
+
+            case mus_changecontroller:
+              if (mem_fread(&controllernumber, 1, 1, musinput) != 1)
+                {
+                  return true;
+                }
+
+              if (mem_fread(&controllervalue, 1, 1, musinput) != 1)
+                {
+                  return true;
+                }
+
+              if (controllernumber == 0)
+                {
+                  if (write_change_patch(channel, controllervalue,
+                                         midioutput))
                     {
-                        return true;
+                      return true;
+                    }
+                }
+              else
+                {
+                  if (controllernumber < 1 || controllernumber > 9)
+                    {
+                      return true;
                     }
 
-                    break;
-
-                case mus_presskey:
-                    if (mem_fread(&key, 1, 1, musinput) != 1)
+                  if (write_change_controller_valued(
+                          channel, controller_map[controllernumber],
+                          controllervalue, midioutput))
                     {
-                        return true;
+                      return true;
                     }
+                }
 
-                    if (key & 0x80)
-                    {
-                        if (mem_fread(&channelvelocities[channel], 1, 1, musinput) != 1)
-                        {
-                            return true;
-                        }
+              break;
 
-                        channelvelocities[channel] &= 0x7F;
-                    }
+            case mus_scoreend:
+              hitscoreend = 1;
+              break;
 
-                    if (WritePressKey(channel, key,
-                                      channelvelocities[channel], midioutput))
-                    {
-                        return true;
-                    }
-
-                    break;
-
-                case mus_pitchwheel:
-                    if (mem_fread(&key, 1, 1, musinput) != 1)
-                    {
-                        break;
-                    }
-                    if (WritePitchWheel(channel, (short)(key * 64), midioutput))
-                    {
-                        return true;
-                    }
-
-                    break;
-
-                case mus_systemevent:
-                    if (mem_fread(&controllernumber, 1, 1, musinput) != 1)
-                    {
-                        return true;
-                    }
-                    if (controllernumber < 10 || controllernumber > 14)
-                    {
-                        return true;
-                    }
-
-                    if (WriteChangeController_Valueless(channel,
-                                                        controller_map[controllernumber],
-                                                        midioutput))
-                    {
-                        return true;
-                    }
-
-                    break;
-
-                case mus_changecontroller:
-                    if (mem_fread(&controllernumber, 1, 1, musinput) != 1)
-                    {
-                        return true;
-                    }
-
-                    if (mem_fread(&controllervalue, 1, 1, musinput) != 1)
-                    {
-                        return true;
-                    }
-
-                    if (controllernumber == 0)
-                    {
-                        if (WriteChangePatch(channel, controllervalue,
-                                             midioutput))
-                        {
-                            return true;
-                        }
-                    }
-                    else
-                    {
-                        if (controllernumber < 1 || controllernumber > 9)
-                        {
-                            return true;
-                        }
-
-                        if (WriteChangeController_Valued(channel,
-                                                         controller_map[controllernumber],
-                                                         controllervalue,
-                                                         midioutput))
-                        {
-                            return true;
-                        }
-                    }
-
-                    break;
-
-                case mus_scoreend:
-                    hitscoreend = 1;
-                    break;
-
-                default:
-                    return true;
-                    break;
+            default:
+              return true;
+              break;
             }
 
-            if (eventdescriptor & 0x80)
+          if (eventdescriptor & 0x80)
             {
-                break;
+              break;
             }
         }
-        // Now we need to read the time code:
-        if (!hitscoreend)
+
+      /* Now we need to read the time code: */
+
+      if (!hitscoreend)
         {
-            timedelay = 0;
-            for (;;)
+          timedelay = 0;
+          for (; ; )
             {
-                if (mem_fread(&working, 1, 1, musinput) != 1)
+              if (mem_fread(&working, 1, 1, musinput) != 1)
                 {
-                    return true;
+                  return true;
                 }
 
-                timedelay = timedelay * 128 + (working & 0x7F);
-                if ((working & 0x80) == 0)
+              timedelay = timedelay * 128 + (working & 0x7f);
+              if ((working & 0x80) == 0)
                 {
-                    break;
+                  break;
                 }
             }
-            queuedtime += timedelay;
+
+          queuedtime += timedelay;
         }
     }
 
-    // End of track
-    if (WriteEndTrack(midioutput))
+  /* End of track */
+
+  if (write_end_track(midioutput))
     {
-        return true;
+      return true;
     }
 
-    // Write the track size into the stream
-    if (mem_fseek(midioutput, 18, MEM_SEEK_SET))
+  /* Write the track size into the stream */
+
+  if (mem_fseek(midioutput, 18, MEM_SEEK_SET))
     {
-        return true;
+      return true;
     }
 
-    tracksizebuffer[0] = (tracksize >> 24) & 0xff;
-    tracksizebuffer[1] = (tracksize >> 16) & 0xff;
-    tracksizebuffer[2] = (tracksize >> 8) & 0xff;
-    tracksizebuffer[3] = tracksize & 0xff;
+  tracksizebuffer[0] = (tracksize >> 24) & 0xff;
+  tracksizebuffer[1] = (tracksize >> 16) & 0xff;
+  tracksizebuffer[2] = (tracksize >> 8) & 0xff;
+  tracksizebuffer[3] = tracksize & 0xff;
 
-    if (mem_fwrite(tracksizebuffer, 1, 4, midioutput) != 4)
+  if (mem_fwrite(tracksizebuffer, 1, 4, midioutput) != 4)
     {
-        return true;
+      return true;
     }
 
-    return false;
+  return false;
 }
 
 #ifdef STANDALONE
-
-#include "m_misc.h"
-#include "z_zone.h"
-
 int main(int argc, char *argv[])
 {
-    MEMFILE *src, *dst;
-    byte *infile;
-    long infile_len;
-    void *outfile;
-    size_t outfile_len;
+  MEMFILE *src, *dst;
+  byte *infile;
+  long infile_len;
+  void *outfile;
+  size_t outfile_len;
 
-    if (argc != 3)
+  if (argc != 3)
     {
-        printf("Usage: %s <musfile> <midfile>\n", argv[0]);
-        exit(-1);
+      printf("Usage: %s <musfile> <midfile>\n", argv[0]);
+      exit(-1);
     }
 
-    Z_Init();
+  z_init();
 
-    infile_len = M_ReadFile(argv[1], &infile);
+  infile_len = m_read_file(argv[1], &infile);
 
-    src = mem_fopen_read(infile, infile_len);
-    dst = mem_fopen_write();
+  src = mem_fopen_read(infile, infile_len);
+  dst = mem_fopen_write();
 
-    if (mus2mid(src, dst))
+  if (mus2mid(src, dst))
     {
-        fprintf(stderr, "mus2mid() failed\n");
-        exit(-1);
+      fprintf(stderr, "mus2mid() failed\n");
+      exit(-1);
     }
 
-    // Write result to output file:
+  /* Write result to output file: */
 
-    mem_get_buf(dst, &outfile, &outfile_len);
+  mem_get_buf(dst, &outfile, &outfile_len);
 
-    M_WriteFile(argv[2], outfile, outfile_len);
+  m_write_file(argv[2], outfile, outfile_len);
 
-    return 0;
+  return 0;
 }
-
-#endif
-
+#endif /* STANDALONE */
diff --git a/games/NXDoom/src/mus2mid.h b/games/NXDoom/src/mus2mid.h
index 324025a2c..e8cafc4a8 100644
--- a/games/NXDoom/src/mus2mid.h
+++ b/games/NXDoom/src/mus2mid.h
@@ -1,29 +1,41 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2006 Ben Ryves 2006
-//
-// 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.
-//
-//
-// mus2mid.h - Ben Ryves 2006 - http://benryves.com - benryves@benryves.com
-// Use to convert a MUS file into a single track, type 0 MIDI file.
+/****************************************************************************
+ * apps/games/NXDoom/src/mus2mid.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ * Copyright(C) 2006 Ben Ryves 2006
+ *
+ * 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.
+ *
+ * mus2mid.h - Ben Ryves 2006 - http: *benryves.com - benryves@benryves.com
+ * Use to convert a MUS file into a single track, type 0 MIDI file.
+ *
+ ****************************************************************************/
 
 #ifndef MUS2MID_H
 #define MUS2MID_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 #include "memio.h"
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 boolean mus2mid(MEMFILE *musinput, MEMFILE *midioutput);
 
-#endif /* #ifndef MUS2MID_H */
-
+#endif /* MUS2MID_H */
diff --git a/games/NXDoom/src/net_client.c b/games/NXDoom/src/net_client.c
index 19b720fa6..fb589f692 100644
--- a/games/NXDoom/src/net_client.c
+++ b/games/NXDoom/src/net_client.c
@@ -1,18 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Network client code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_client.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Network client code
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdio.h>
@@ -20,15 +29,15 @@
 #include <string.h>
 
 #include "config.h"
-#include "doomtype.h"
+#include "d_loop.h"
 #include "deh_main.h"
 #include "deh_str.h"
-#include "d_loop.h"
+#include "doomtype.h"
 #include "i_system.h"
 #include "i_timer.h"
 #include "m_argv.h"
-#include "m_fixed.h"
 #include "m_config.h"
+#include "m_fixed.h"
 #include "m_misc.h"
 #include "net_client.h"
 #include "net_common.h"
@@ -39,1191 +48,1264 @@
 #include "net_query.h"
 #include "net_server.h"
 #include "net_structrw.h"
-#include "net_petname.h"
 #include "w_checksum.h"
 #include "w_wad.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define net_cl_expand_ticnum(b) net_expand_tic_num(recvwindow_start, (b))
+
+#define KP 0.1
+#define KI 0.01
+#define KD 0.02
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef enum
 {
-    // waiting for the game to launch
+  /* waiting for the game to launch */
 
-    CLIENT_STATE_WAITING_LAUNCH,
+  CLIENT_STATE_WAITING_LAUNCH,
 
-    // waiting for the game to start
+  /* waiting for the game to start */
 
-    CLIENT_STATE_WAITING_START,
+  CLIENT_STATE_WAITING_START,
 
-    // in game
-
-    CLIENT_STATE_IN_GAME,
+  /* in game */
 
+  CLIENT_STATE_IN_GAME,
 } net_clientstate_t;
 
-// Type of structure used in the receive window
+/* Type of structure used in the receive window */
 
 typedef struct
 {
-    // Whether this tic has been received yet
+  /* Whether this tic has been received yet */
 
-    boolean active;
+  boolean active;
 
-    // Last time we sent a resend request for this tic
+  /* Last time we sent a resend request for this tic */
 
-    unsigned int resend_time;
+  unsigned int resend_time;
 
-    // Tic data from server
-
-    net_full_ticcmd_t cmd;
+  /* Tic data from server */
 
+  net_full_ticcmd_t cmd;
 } net_server_recv_t;
 
-// Type of structure used in the send window
+/* Type of structure used in the send window */
 
 typedef struct
 {
-    // Whether this slot is active yet
+  /* Whether this slot is active yet */
 
-    boolean active;
+  boolean active;
 
-    // The tic number
+  /* The tic number */
 
-    unsigned int seq;
+  unsigned int seq;
 
-    // Time the command was generated
+  /* Time the command was generated */
 
-    unsigned int time;
+  unsigned int time;
 
-    // Ticcmd diff
+  /* Ticcmd diff */
 
-    net_ticdiff_t cmd;
+  net_ticdiff_t cmd;
 } net_server_send_t;
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
 static net_connection_t client_connection;
 static net_clientstate_t client_state;
 static net_addr_t *server_addr;
 static net_context_t *client_context;
 
-// game settings, as received from the server when the game started
+/* game settings, as received from the server when the game started */
 
 static net_gamesettings_t settings;
 
-// Why did the server reject us?
-char *net_client_reject_reason = NULL;
-
-// true if the client code is in use
-
-boolean net_client_connected;
-
-// true if we have received waiting data from the server,
-// and the wait data that was received.
-
-boolean net_client_received_wait_data;
-net_waitdata_t net_client_wait_data;
-
-// Waiting at the initial wait screen for the game to be launched?
-
-boolean net_waiting_for_launch = false;
-
-// Name that we send to the server
-
-char *net_player_name = NULL;
-
-// Connected but not participating in the game (observer)
-
-boolean drone = false;
-
-// The last ticcmd constructed
+/* The last ticcmd constructed */
 
 static ticcmd_t last_ticcmd;
 
-// Buffer of ticcmd diffs being sent to the server
+/* Buffer of ticcmd diffs being sent to the server */
 
-static net_server_send_t send_queue[BACKUPTICS];
+static net_server_send_t send_queue[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-// Receive window
+/* Receive window */
 
-static ticcmd_t recvwindow_cmd_base[NET_MAXPLAYERS];
+static ticcmd_t recvwindow_cmd_base[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 static int recvwindow_start;
-static net_server_recv_t recvwindow[BACKUPTICS];
+static net_server_recv_t recvwindow[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-// Whether we need to send an acknowledgement and
-// when gamedata was last received.
+/* Whether we need to send an acknowledgement and
+ * when gamedata was last received.
+ */
 
 static boolean need_to_acknowledge;
 static unsigned int gamedata_recv_time;
 
-// The latency (time between when we sent our command and we got all
-// the other players' commands from the server) for the last tic we
-// received. We include this latency in tics we send to the server so
-// that they can adjust to us.
+/* The latency (time between when we sent our command and we got all
+ * the other players' commands from the server) for the last tic we
+ * received. We include this latency in tics we send to the server so
+ * that they can adjust to us.
+ */
+
 static int last_latency;
 
-// Hash checksums of our wad directory and dehacked data.
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Why did the server reject us? */
+
+char *net_client_reject_reason = NULL;
+
+/* true if the client code is in use */
+
+boolean net_client_connected;
+
+/* true if we have received waiting data from the server,
+ * and the wait data that was received.
+ */
+
+boolean net_client_received_wait_data;
+net_waitdata_t net_client_wait_data;
+
+/* Waiting at the initial wait screen for the game to be launched? */
+
+boolean net_waiting_for_launch = false;
+
+/* Name that we send to the server */
+
+char *net_player_name = NULL;
+
+/* Connected but not participating in the game (observer) */
+
+boolean drone = false;
+
+/* Hash checksums of our wad directory and dehacked data. */
 
 sha1_digest_t net_local_wad_sha1sum;
 sha1_digest_t net_local_deh_sha1sum;
 
-// Are we playing with the freedoom IWAD?
+/* Are we playing with the freedoom IWAD? */
 
 unsigned int net_local_is_freedoom;
 
-#define NET_CL_ExpandTicNum(b) NET_ExpandTicNum(recvwindow_start, (b))
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-// Called when we become disconnected from the server
+/* Called when we become disconnected from the server */
 
-static void NET_CL_Disconnected(void)
+static void net_cl_disconnected(void)
 {
-    D_ReceiveTic(NULL, NULL);
+  d_receive_tic(NULL, NULL);
 }
 
-// Called when a packet is received from the server containing game
-// data. This updates the clock synchronization variable (offsetms)
-// using a PID filter that keeps client clocks in sync.
-static void UpdateClockSync(unsigned int seq,
-                            unsigned int remote_latency)
+/* Called when a packet is received from the server containing game
+ * data. This updates the clock synchronization variable (offsetms)
+ * using a PID filter that keeps client clocks in sync.
+ */
+
+static void update_clock_sync(unsigned int seq, unsigned int remote_latency)
 {
-    static int last_error, cumul_error;
-    int latency, error;
+  static int last_error;
+  static int cumul_error;
+  int latency;
+  int error;
 
-    if (seq == send_queue[seq % BACKUPTICS].seq)
+  if (seq == send_queue[seq % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].seq)
     {
-        latency = I_GetTimeMS() - send_queue[seq % BACKUPTICS].time;
+      latency = i_get_time_ms() -
+                send_queue[seq % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].time;
     }
-    else if (seq > send_queue[seq % BACKUPTICS].seq)
+  else if (seq > send_queue[seq % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].seq)
     {
-        // We have received the ticcmd from the server before we have
-        // even sent ours
+      /* We have received the ticcmd from the server before we have
+       * even sent ours
+       */
 
-        latency = 0;
+      latency = 0;
     }
-    else
+  else
     {
-        return;
+      return;
     }
 
-    // PID filter. These are manually trained parameters.
-#define KP 0.1
-#define KI 0.01
-#define KD 0.02
+  /* PID filter. These are manually trained parameters. */
 
-    // How does our latency compare to the worst other player?
-    error = latency - remote_latency;
-    cumul_error += error;
+  /* How does our latency compare to the worst other player? */
 
-    offsetms = KP * (FRACUNIT * error)
-             - KI * (FRACUNIT * cumul_error)
-             + (KD * FRACUNIT) * (last_error - error);
+  error = latency - remote_latency;
+  cumul_error += error;
 
-    last_error = error;
-    last_latency = latency;
+  offsetms = KP * (FRACUNIT * error) - KI * (FRACUNIT * cumul_error) +
+             (KD * FRACUNIT) * (last_error - error);
 
-    NET_Log("client: latency %d, remote %d -> offset=%dms, cumul_error=%d",
-            latency, remote_latency, offsetms / FRACUNIT, cumul_error);
+  last_error = error;
+  last_latency = latency;
+
+  net_log_info(
+    "client: latency %d, remote %d -> offset=%dms, cumul_error=%d",
+    latency, remote_latency, offsetms / FRACUNIT, cumul_error);
 }
 
-// Expand a net_full_ticcmd_t, applying the diffs in cmd->cmds as
-// patches against recvwindow_cmd_base.  Place the results into
-// the d_net.c structures (netcmds/nettics) and save the new ticcmd
-// back into recvwindow_cmd_base.
+/* Expand a net_full_ticcmd_t, applying the diffs in cmd->cmds as
+ * patches against recvwindow_cmd_base.  Place the results into
+ * the d_net.c structures (netcmds/nettics) and save the new ticcmd
+ * back into recvwindow_cmd_base.
+ */
 
-static void NET_CL_ExpandFullTiccmd(net_full_ticcmd_t *cmd, unsigned int seq,
-                                    ticcmd_t *ticcmds)
+static void net_cl_expand_full_ticcmd(net_full_ticcmd_t *cmd,
+                                      unsigned int seq, ticcmd_t *ticcmds)
 {
-    int i;
+  int i;
 
-    // Expand tic diffs for all players
-    
-    for (i=0; i<NET_MAXPLAYERS; ++i)
+  /* Expand tic diffs for all players */
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (i == settings.consoleplayer && !drone)
+      if (i == settings.consoleplayer && !drone)
         {
-            continue;
+          continue;
         }
-        
-        if (cmd->playeringame[i])
+
+      if (cmd->playeringame[i])
         {
-            net_ticdiff_t *diff;
+          net_ticdiff_t *diff;
 
-            diff = &cmd->cmds[i];
+          diff = &cmd->cmds[i];
 
-            // Use the ticcmd diff to patch the previous ticcmd to
-            // the new ticcmd
+          /* Use the ticcmd diff to patch the previous ticcmd to
+           * the new ticcmd
+           */
 
-            NET_TiccmdPatch(&recvwindow_cmd_base[i], diff, &ticcmds[i]);
+          net_ticcmd_patch(&recvwindow_cmd_base[i], diff, &ticcmds[i]);
 
-            // Store a copy for next time
+          /* Store a copy for next time */
 
-            recvwindow_cmd_base[i] = ticcmds[i];
+          recvwindow_cmd_base[i] = ticcmds[i];
         }
     }
 }
 
-// Advance the receive window
+/* Advance the receive window */
 
-static void NET_CL_AdvanceWindow(void)
+static void net_cl_advance_window(void)
 {
-    ticcmd_t ticcmds[NET_MAXPLAYERS];
+  ticcmd_t ticcmds[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 
-    while (recvwindow[0].active)
+  while (recvwindow[0].active)
     {
-        // Expand tic diff data into d_net.c structures
+      /* Expand tic diff data into d_net.c structures */
 
-        NET_CL_ExpandFullTiccmd(&recvwindow[0].cmd, recvwindow_start,
+      net_cl_expand_full_ticcmd(&recvwindow[0].cmd, recvwindow_start,
                                 ticcmds);
-        D_ReceiveTic(ticcmds, recvwindow[0].cmd.playeringame);
+      d_receive_tic(ticcmds, recvwindow[0].cmd.playeringame);
 
-        // Advance the window
+      /* Advance the window */
 
-        memmove(recvwindow, recvwindow + 1,
-                sizeof(net_server_recv_t) * (BACKUPTICS - 1));
-        memset(&recvwindow[BACKUPTICS-1], 0, sizeof(net_server_recv_t));
+      memmove(recvwindow, recvwindow + 1,
+              sizeof(net_server_recv_t) *
+                  (CONFIG_GAMES_NXDOOM_NET_BACKUPTICS - 1));
+      memset(&recvwindow[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS - 1], 0,
+             sizeof(net_server_recv_t));
 
-        ++recvwindow_start;
+      ++recvwindow_start;
 
-        NET_Log("client: advanced receive window to %d", recvwindow_start);
+      net_log_info("client: advanced receive window to %d",
+              recvwindow_start);
     }
 }
 
-// Shut down the client code, etc.  Invoked after a disconnect.
+/* Shut down the client code, etc.  Invoked after a disconnect. */
 
-static void NET_CL_Shutdown(void)
+static void net_cl_shutdown(void)
 {
-    if (net_client_connected)
+  if (net_client_connected)
     {
-        net_client_connected = false;
+      net_client_connected = false;
 
-        NET_ReleaseAddress(server_addr);
+      net_release_address(server_addr);
 
-        // Shut down network module, etc.  To do.
+      /* Shut down network module, etc.  To do. */
     }
 }
 
-void NET_CL_LaunchGame(void)
+static void net_cl_send_game_data_ack(void)
 {
-    NET_Conn_NewReliable(&client_connection, NET_PACKET_TYPE_LAUNCH);
+  net_packet_t *packet;
+
+  packet = net_new_packet(10);
+
+  net_write_int16(packet, NET_PACKET_TYPE_GAMEDATA_ACK);
+  net_write_int8(packet, recvwindow_start & 0xff);
+
+  net_conn_send_packet(&client_connection, packet);
+
+  net_free_packet(packet);
+
+  need_to_acknowledge = false;
 }
 
-void NET_CL_StartGame(net_gamesettings_t *settings)
+static void net_cl_send_tics(int start, int end)
 {
-    net_packet_t *packet;
+  net_packet_t *packet;
+  int i;
 
-    // Start from a ticcmd of all zeros
-
-    memset(&last_ticcmd, 0, sizeof(ticcmd_t));
-    
-    // Send packet
-
-    packet = NET_Conn_NewReliable(&client_connection, 
-                                  NET_PACKET_TYPE_GAMESTART);
-
-    NET_WriteSettings(packet, settings);
-}
-
-static void NET_CL_SendGameDataACK(void)
-{
-    net_packet_t *packet;
-
-    packet = NET_NewPacket(10);
-
-    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA_ACK);
-    NET_WriteInt8(packet, recvwindow_start & 0xff);
-
-    NET_Conn_SendPacket(&client_connection, packet);
-
-    NET_FreePacket(packet);
-
-    need_to_acknowledge = false;
-}
-
-static void NET_CL_SendTics(int start, int end)
-{
-    net_packet_t *packet;
-    int i;
-
-    if (!net_client_connected)
+  if (!net_client_connected)
     {
-        // Disconnected from server
+      /* Disconnected from server */
 
-        return;
+      return;
     }
 
-    if (start < 0)
-        start = 0;
-    
-    // Build a new packet to send to the server
+  if (start < 0) start = 0;
 
-    packet = NET_NewPacket(512);
-    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA);
+  /* Build a new packet to send to the server */
 
-    // Write the start tic and number of tics.  Send only the low byte
-    // of start - it can be inferred by the server.
+  packet = net_new_packet(512);
+  net_write_int16(packet, NET_PACKET_TYPE_GAMEDATA);
 
-    NET_WriteInt8(packet, recvwindow_start & 0xff);
-    NET_WriteInt8(packet, start & 0xff);
-    NET_WriteInt8(packet, end - start + 1);
+  /* Write the start tic and number of tics.  Send only the low byte
+   * of start - it can be inferred by the server.
+   */
 
-    // Add the tics.
+  net_write_int8(packet, recvwindow_start & 0xff);
+  net_write_int8(packet, start & 0xff);
+  net_write_int8(packet, end - start + 1);
 
-    for (i=start; i<=end; ++i)
+  /* Add the tics. */
+
+  for (i = start; i <= end; ++i)
     {
-        net_server_send_t *sendobj;
+      net_server_send_t *sendobj;
 
-        sendobj = &send_queue[i % BACKUPTICS];
+      sendobj = &send_queue[i % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-        NET_WriteInt16(packet, last_latency);
+      net_write_int16(packet, last_latency);
 
-        NET_WriteTiccmdDiff(packet, &sendobj->cmd, settings.lowres_turn);
+      net_write_ticcmd_diff(packet, &sendobj->cmd, settings.lowres_turn);
     }
-    
-    // Send the packet
 
-    NET_Conn_SendPacket(&client_connection, packet);
-    
-    // All done!
+  /* Send the packet */
 
-    NET_FreePacket(packet);
+  net_conn_send_packet(&client_connection, packet);
 
-    // Acknowledgement has been sent as part of the packet
+  /* All done! */
 
-    need_to_acknowledge = false;
+  net_free_packet(packet);
+
+  /* Acknowledgement has been sent as part of the packet */
+
+  need_to_acknowledge = false;
 }
 
-// Add a new ticcmd to the send queue
+/* Parse a SYN packet received back from the server indicating a successful
+ * connection attempt.
+ */
 
-void NET_CL_SendTiccmd(ticcmd_t *ticcmd, int maketic)
+static void net_cl_parse_syn(net_packet_t *packet)
 {
-    net_ticdiff_t diff;
-    net_server_send_t *sendobj;
-    int starttic, endtic;
-    
-    // Calculate the difference to the last ticcmd
+  net_protocol_t protocol;
+  char *server_version;
 
-    NET_TiccmdDiff(&last_ticcmd, ticcmd, &diff);
-    
-    // Store in the send queue
+  net_log_info("client: processing SYN response");
 
-    sendobj = &send_queue[maketic % BACKUPTICS];
-    sendobj->active = true;
-    sendobj->seq = maketic;
-    sendobj->time = I_GetTimeMS();
-    sendobj->cmd = diff;
-
-    last_ticcmd = *ticcmd;
-
-    // Send to server.
-
-    starttic = maketic - settings.extratics;
-    endtic = maketic;
-
-    if (starttic < 0)
-        starttic = 0;
-
-    NET_Log("client: generated tic %d, sending %d-%d",
-            maketic, starttic, endtic);
-    NET_CL_SendTics(starttic, endtic);
-}
-
-// Parse a SYN packet received back from the server indicating a successful
-// connection attempt.
-static void NET_CL_ParseSYN(net_packet_t *packet)
-{
-    net_protocol_t protocol;
-    char *server_version;
-
-    NET_Log("client: processing SYN response");
-
-    server_version = NET_ReadSafeString(packet);
-    if (server_version == NULL)
+  server_version = net_read_safe_string(packet);
+  if (server_version == NULL)
     {
-        NET_Log("client: error: failed to read server version");
-        return;
+      net_log_err("client: failed to read server version");
+      return;
     }
 
-    protocol = NET_ReadProtocol(packet);
-    if (protocol == NET_PROTOCOL_UNKNOWN)
+  protocol = net_read_protocol(packet);
+  if (protocol == NET_PROTOCOL_UNKNOWN)
     {
-        NET_Log("client: error: can't find a common protocol");
-        return;
+      net_log_err("client: can't find a common protocol");
+      return;
     }
 
-    // We are now successfully connected.
-    NET_Log("client: connected to server");
-    client_connection.state = NET_CONN_STATE_CONNECTED;
-    client_connection.protocol = protocol;
+  /* We are now successfully connected. */
 
-    // Even though we have negotiated a compatible protocol, the game may still
-    // desync. Chocolate Doom's philosophy makes this unlikely, but if we're
-    // playing with a forked version, or even against a different version that
-    // fixes a compatibility issue, we may still have problems.
-    if (strcmp(server_version, PACKAGE_STRING) != 0)
+  net_log_info("client: connected to server");
+  client_connection.state = NET_CONN_STATE_CONNECTED;
+  client_connection.protocol = protocol;
+
+  /* Even though we have negotiated a compatible protocol, the game may still
+   * desync. Chocolate Doom's philosophy makes this unlikely, but if we're
+   * playing with a forked version, or even against a different version that
+   * fixes a compatibility issue, we may still have problems.
+   */
+
+  if (strcmp(server_version, PACKAGE_STRING) != 0)
     {
-        fprintf(stderr, "NET_CL_ParseSYN: This is '%s', but the server is "
-                "'%s'. It is possible that this mismatch may cause the game "
-                "to desync.\n", PACKAGE_STRING, server_version);
+      fprintf(stderr,
+              "NET_CL_ParseSYN: This is '%s', but the server is "
+              "'%s'. It is possible that this mismatch may cause the game "
+              "to desync.\n",
+              PACKAGE_STRING, server_version);
     }
 }
 
-static void SetRejectReason(const char *s)
+static void set_reject_reason(const char *s)
 {
-    free(net_client_reject_reason);
-    if (s != NULL)
+  free(net_client_reject_reason);
+  if (s != NULL)
     {
-        net_client_reject_reason = strdup(s);
+      net_client_reject_reason = strdup(s);
     }
-    else
+  else
     {
-        net_client_reject_reason = NULL;
+      net_client_reject_reason = NULL;
     }
 }
 
-static void NET_CL_ParseReject(net_packet_t *packet)
+static void net_cl_parse_reject(net_packet_t *packet)
 {
-    char *msg;
+  char *msg;
 
-    msg = NET_ReadSafeString(packet);
-    if (msg == NULL)
+  msg = net_read_safe_string(packet);
+  if (msg == NULL)
     {
-        return;
+      return;
     }
 
-    if (client_connection.state == NET_CONN_STATE_CONNECTING)
+  if (client_connection.state == NET_CONN_STATE_CONNECTING)
     {
-        client_connection.state = NET_CONN_STATE_DISCONNECTED;
-        client_connection.disconnect_reason = NET_DISCONNECT_REMOTE;
-        SetRejectReason(msg);
+      client_connection.state = NET_CONN_STATE_DISCONNECTED;
+      client_connection.disconnect_reason = NET_DISCONNECT_REMOTE;
+      set_reject_reason(msg);
     }
 }
 
-// data received while we are waiting for the game to start
+/* data received while we are waiting for the game to start */
 
-static void NET_CL_ParseWaitingData(net_packet_t *packet)
+static void net_cl_parse_waiting_data(net_packet_t *packet)
 {
-    net_waitdata_t wait_data;
+  net_waitdata_t wait_data;
 
-    if (!NET_ReadWaitData(packet, &wait_data))
+  if (!net_read_wait_data(packet, &wait_data))
     {
-        // Invalid packet?
-        return;
+      /* Invalid packet? */
+
+      return;
     }
 
-    if (wait_data.num_players > wait_data.max_players
-     || wait_data.ready_players > wait_data.num_players
-     || wait_data.max_players > NET_MAXPLAYERS)
+  if (wait_data.num_players > wait_data.max_players ||
+      wait_data.ready_players > wait_data.num_players ||
+      wait_data.max_players > CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS)
     {
-        // insane data
+      /* insane data */
 
-        return;
+      return;
     }
 
-    if ((wait_data.consoleplayer >= 0 && drone)
-     || (wait_data.consoleplayer < 0 && !drone)
-     || (wait_data.consoleplayer >= wait_data.num_players))
+  if ((wait_data.consoleplayer >= 0 && drone) ||
+      (wait_data.consoleplayer < 0 && !drone) ||
+      (wait_data.consoleplayer >= wait_data.num_players))
     {
-        // Invalid player number
+      /* Invalid player number */
 
-        return;
+      return;
     }
 
-    memcpy(&net_client_wait_data, &wait_data, sizeof(net_waitdata_t));
-    net_client_received_wait_data = true;
+  memcpy(&net_client_wait_data, &wait_data, sizeof(net_waitdata_t));
+  net_client_received_wait_data = true;
 }
 
-static void NET_CL_ParseLaunch(net_packet_t *packet)
+static void net_cl_parse_launch(net_packet_t *packet)
 {
-    unsigned int num_players;
+  unsigned int num_players;
 
-    NET_Log("client: processing launch packet");
+  net_log_info("client: processing launch packet");
 
-    if (client_state != CLIENT_STATE_WAITING_LAUNCH)
+  if (client_state != CLIENT_STATE_WAITING_LAUNCH)
     {
-        NET_Log("client: error: not in waiting launch state, client_state=%d",
-                client_state);
-        return;
+      net_log_err("client: not in waiting launch state, client_state=%d",
+                  client_state);
+      return;
     }
 
-    // The launch packet contains the number of players that will be
-    // in the game when it starts, so that we can do the startup
-    // progress indicator (the wait data is unreliable).
+  /* The launch packet contains the number of players that will be
+   * in the game when it starts, so that we can do the startup
+   * progress indicator (the wait data is unreliable).
+   */
 
-    if (!NET_ReadInt8(packet, &num_players))
+  if (!net_read_int8(packet, &num_players))
     {
-        NET_Log("client: error: failed to read number of players");
-        return;
+      net_log_err("client: failed to read number of players");
+      return;
     }
 
-    net_client_wait_data.num_players = num_players;
-    client_state = CLIENT_STATE_WAITING_START;
-    NET_Log("client: now waiting for game start");
+  net_client_wait_data.num_players = num_players;
+  client_state = CLIENT_STATE_WAITING_START;
+  net_log_err("client: now waiting for game start");
 }
 
-static void NET_CL_ParseGameStart(net_packet_t *packet)
+static void net_cl_parse_game_start(net_packet_t *packet)
 {
-    NET_Log("client: processing game start packet");
+  net_log_info("client: processing game start packet");
 
-    if (!NET_ReadSettings(packet, &settings))
+  if (!net_read_settings(packet, &settings))
     {
-        NET_Log("client: error: failed to read settings");
-        return;
+      net_log_err("client: failed to read settings");
+      return;
     }
 
-    if (client_state != CLIENT_STATE_WAITING_START)
+  if (client_state != CLIENT_STATE_WAITING_START)
     {
-        NET_Log("client: error: not in waiting start state, client_state=%d",
-                client_state);
-        return;
+      net_log_err("client: not in waiting start state, client_state=%d",
+                  client_state);
+      return;
     }
 
-    if (settings.num_players > NET_MAXPLAYERS
-     || settings.consoleplayer >= (signed int) settings.num_players)
+  if (settings.num_players > CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS ||
+      settings.consoleplayer >= (signed int)settings.num_players)
     {
-        // insane values
-        NET_Log("client: error: bad settings, num_players=%d, consoleplayer=%d",
-                settings.num_players, settings.consoleplayer);
-        return;
+      /* insane values */
+
+      net_log_err("client: bad settings, num_players=%d, consoleplayer=%d",
+                  settings.num_players, settings.consoleplayer);
+      return;
     }
 
-    if ((drone && settings.consoleplayer >= 0)
-     || (!drone && settings.consoleplayer < 0))
+  if ((drone && settings.consoleplayer >= 0) ||
+      (!drone && settings.consoleplayer < 0))
     {
-        // Invalid player number: must be positive for real players,
-        // negative for drones
-        NET_Log("client: error: mismatch: drone=%d, consoleplayer=%d",
-                drone, settings.consoleplayer);
-        return;
+      /* Invalid player number: must be positive for real players,
+       * negative for drones
+       */
+
+      net_log_err("client: mismatch: drone=%d, consoleplayer=%d", drone,
+                  settings.consoleplayer);
+      return;
     }
 
-    NET_Log("client: beginning game state");
-    client_state = CLIENT_STATE_IN_GAME;
+  net_log_info("client: beginning game state");
+  client_state = CLIENT_STATE_IN_GAME;
 
-    // Clear the receive window
+  /* Clear the receive window */
 
-    memset(recvwindow, 0, sizeof(recvwindow));
-    recvwindow_start = 0;
-    memset(&recvwindow_cmd_base, 0, sizeof(recvwindow_cmd_base));
+  memset(recvwindow, 0, sizeof(recvwindow));
+  recvwindow_start = 0;
+  memset(&recvwindow_cmd_base, 0, sizeof(recvwindow_cmd_base));
 
-    // Clear the send queue
+  /* Clear the send queue */
 
-    memset(&send_queue, 0x00, sizeof(send_queue));
+  memset(&send_queue, 0x00, sizeof(send_queue));
 }
 
-static void NET_CL_SendResendRequest(int start, int end)
+static void net_cl_send_resend_request(int start, int end)
 {
-    net_packet_t *packet;
-    unsigned int nowtime;
-    int i;
+  net_packet_t *packet;
+  unsigned int nowtime;
+  int i;
 
-    //printf("CL: Send resend %i-%i\n", start, end);
-    
-    packet = NET_NewPacket(64);
-    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA_RESEND);
-    NET_WriteInt32(packet, start);
-    NET_WriteInt8(packet, end - start + 1);
-    NET_Conn_SendPacket(&client_connection, packet);
-    NET_FreePacket(packet);
+  packet = net_new_packet(64);
+  net_write_int16(packet, NET_PACKET_TYPE_GAMEDATA_RESEND);
+  net_write_int32(packet, start);
+  net_write_int8(packet, end - start + 1);
+  net_conn_send_packet(&client_connection, packet);
+  net_free_packet(packet);
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    // Save the time we sent the resend request
+  /* Save the time we sent the resend request */
 
-    for (i=start; i<=end; ++i)
+  for (i = start; i <= end; ++i)
     {
-        int index;
+      int index;
 
-        index = i - recvwindow_start;
+      index = i - recvwindow_start;
 
-        if (index < 0 || index >= BACKUPTICS)
-            continue;
+      if (index < 0 || index >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS) continue;
 
-        recvwindow[index].resend_time = nowtime;
+      recvwindow[index].resend_time = nowtime;
     }
 }
 
-// Check for expired resend requests
+/* Check for expired resend requests */
 
-static void NET_CL_CheckResends(void)
+static void net_cl_check_resends(void)
 {
-    int i;
-    int resend_start, resend_end;
-    unsigned int nowtime;
-    boolean maybe_deadlocked;
+  int i;
+  int resend_start;
+  int resend_end;
+  unsigned int nowtime;
+  boolean maybe_deadlocked;
 
-    nowtime = I_GetTimeMS();
-    maybe_deadlocked = nowtime - gamedata_recv_time > 1000;
+  nowtime = i_get_time_ms();
+  maybe_deadlocked = nowtime - gamedata_recv_time > 1000;
 
-    resend_start = -1;
-    resend_end = -1;
+  resend_start = -1;
+  resend_end = -1;
 
-    for (i=0; i<BACKUPTICS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_BACKUPTICS; ++i)
     {
-        net_server_recv_t *recvobj;
-        boolean need_resend;
+      net_server_recv_t *recvobj;
+      boolean need_resend;
 
-        recvobj = &recvwindow[i];
+      recvobj = &recvwindow[i];
 
-        // if need_resend is true, this tic needs another retransmit
-        // request (300ms timeout)
+      /* if need_resend is true, this tic needs another retransmit
+       * request (300ms timeout)
+       */
 
-        need_resend = !recvobj->active
-                   && recvobj->resend_time != 0
-                   && nowtime > recvobj->resend_time + 300;
+      need_resend = !recvobj->active && recvobj->resend_time != 0 &&
+                    nowtime > recvobj->resend_time + 300;
 
-        // if no game data has been received in a long time, we may be in
-        // a deadlock scenario where tics from the server have been lost, so
-        // we've stopped generating any more, so the server isn't sending us
-        // any, so we don't get any to trigger a resend request. So force the
-        // first few tics in the receive window to be requested.
-        if (i == 0 && !recvobj->active && recvobj->resend_time == 0
-         && maybe_deadlocked)
+      /* if no game data has been received in a long time, we may be in
+       * a deadlock scenario where tics from the server have been lost, so
+       * we've stopped generating any more, so the server isn't sending us
+       * any, so we don't get any to trigger a resend request. So force the
+       * first few tics in the receive window to be requested.
+       */
+
+      if (i == 0 && !recvobj->active && recvobj->resend_time == 0 &&
+          maybe_deadlocked)
         {
-            need_resend = true;
+          need_resend = true;
         }
 
-        if (need_resend)
+      if (need_resend)
         {
-            // Start a new run of resend tics?
+          /* Start a new run of resend tics? */
 
-            if (resend_start < 0)
+          if (resend_start < 0)
             {
-                resend_start = i;
+              resend_start = i;
             }
 
-            resend_end = i;
+          resend_end = i;
         }
-        else if (resend_start >= 0)
+      else if (resend_start >= 0)
         {
-            // End of a run of resend tics
-            NET_Log("client: resend request timed out for %d-%d (%d)",
-                    recvwindow_start + resend_start,
-                    recvwindow_start + resend_end,
-                    recvwindow[resend_start].resend_time);
-            NET_CL_SendResendRequest(recvwindow_start + resend_start,
+          /* End of a run of resend tics */
+
+          net_log_info("client: resend request timed out for %d-%d (%d)",
+                       recvwindow_start + resend_start,
+                       recvwindow_start + resend_end,
+                       recvwindow[resend_start].resend_time);
+          net_cl_send_resend_request(recvwindow_start + resend_start,
                                      recvwindow_start + resend_end);
-            resend_start = -1;
+          resend_start = -1;
         }
     }
 
-    if (resend_start >= 0)
+  if (resend_start >= 0)
     {
-        NET_Log("client: resend request timed out for %d-%d (%d)",
-                recvwindow_start + resend_start,
-                recvwindow_start + resend_end,
-                recvwindow[resend_start].resend_time);
-        NET_CL_SendResendRequest(recvwindow_start + resend_start,
+      net_log_info("client: resend request timed out for %d-%d (%d)",
+                   recvwindow_start + resend_start,
+                   recvwindow_start + resend_end,
+                   recvwindow[resend_start].resend_time);
+      net_cl_send_resend_request(recvwindow_start + resend_start,
                                  recvwindow_start + resend_end);
     }
 
-    // We have received some data from the server and not acknowledged
-    // it yet.  Normally this gets acknowledged when we send our game
-    // data, but if the client is a drone we need to do this.
+  /* We have received some data from the server and not acknowledged
+   * it yet.  Normally this gets acknowledged when we send our game
+   * data, but if the client is a drone we need to do this.
+   */
 
-    if (need_to_acknowledge && nowtime - gamedata_recv_time > 200)
+  if (need_to_acknowledge && nowtime - gamedata_recv_time > 200)
     {
-        NET_Log("client: no game data received since %d: triggering ack",
-                gamedata_recv_time);
-        NET_CL_SendGameDataACK();
+      net_log_info("client: no game data received since %d: triggering ack",
+                   gamedata_recv_time);
+      net_cl_send_game_data_ack();
     }
 }
 
+/* Parsing of NET_PACKET_TYPE_GAMEDATA packets
+ * (packets containing the actual ticcmd data)
+ */
 
-// Parsing of NET_PACKET_TYPE_GAMEDATA packets
-// (packets containing the actual ticcmd data)
-
-static void NET_CL_ParseGameData(net_packet_t *packet)
+static void net_cl_parse_game_data(net_packet_t *packet)
 {
-    net_server_recv_t *recvobj;
-    unsigned int seq, num_tics;
-    unsigned int nowtime;
-    int resend_start, resend_end;
-    size_t i;
-    int index;
+  net_server_recv_t *recvobj;
+  unsigned int seq;
+  unsigned int num_tics;
+  unsigned int nowtime;
+  int resend_start;
+  int resend_end;
+  size_t i;
+  int index;
 
-    NET_Log("client: processing game data packet");
+  net_log_info("client: processing game data packet");
 
-    // Read header
-    if (!NET_ReadInt8(packet, &seq)
-     || !NET_ReadInt8(packet, &num_tics))
+  /* Read header */
+
+  if (!net_read_int8(packet, &seq) || !net_read_int8(packet, &num_tics))
     {
-        NET_Log("client: error: failed to read header");
-        return;
+      net_log_info("client: error: failed to read header");
+      return;
     }
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    // Whatever happens, we now need to send an acknowledgement of our
-    // current receive point.
+  /* Whatever happens, we now need to send an acknowledgement of our
+   * current receive point.
+   */
 
-    if (!need_to_acknowledge)
+  if (!need_to_acknowledge)
     {
-        need_to_acknowledge = true;
-        gamedata_recv_time = nowtime;
+      need_to_acknowledge = true;
+      gamedata_recv_time = nowtime;
     }
 
-    // Expand byte value into the full tic number
-    seq = NET_CL_ExpandTicNum(seq);
-    NET_Log("client: got game data, seq=%d, num_tics=%d", seq, num_tics);
+  /* Expand byte value into the full tic number */
 
-    for (i=0; i<num_tics; ++i)
+  seq = net_cl_expand_ticnum(seq);
+  net_log_info("client: got game data, seq=%d, num_tics=%d", seq, num_tics);
+
+  for (i = 0; i < num_tics; ++i)
     {
-        net_full_ticcmd_t cmd;
+      net_full_ticcmd_t cmd;
 
-        index = seq - recvwindow_start + i;
+      index = seq - recvwindow_start + i;
 
-        if (!NET_ReadFullTiccmd(packet, &cmd, settings.lowres_turn))
+      if (!net_read_full_ticcmd(packet, &cmd, settings.lowres_turn))
         {
-            NET_Log("client: error: failed to read ticcmd %d", i);
-            return;
+          net_log_err("client: failed to read ticcmd %zu", i);
+          return;
         }
 
-        if (index < 0 || index >= BACKUPTICS)
+      if (index < 0 || index >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS)
         {
-            // Out of range of the recv window
+          /* Out of range of the recv window */
 
-            continue;
+          continue;
         }
 
-        // Store in the receive window
+      /* Store in the receive window */
 
-        recvobj = &recvwindow[index];
+      recvobj = &recvwindow[index];
 
-        recvobj->active = true;
-        recvobj->cmd = cmd;
-        NET_Log("client: stored tic %d in receive window", seq + i);
+      recvobj->active = true;
+      recvobj->cmd = cmd;
+      net_log_info("client: stored tic %zu in receive window", seq + i);
 
-        // If a packet is lost or arrives out of order, we might get
-        // the tic in the next packet instead (because of extratic).
-        // If that's the case then the latency for receiving that tic
-        // now will be bogus. So we only use the last tic in the packet
-        // to trigger a clock sync update.
-        if (i == num_tics - 1)
+      /* If a packet is lost or arrives out of order, we might get
+       * the tic in the next packet instead (because of extratic).
+       * If that's the case then the latency for receiving that tic
+       * now will be bogus. So we only use the last tic in the packet
+       * to trigger a clock sync update.
+       */
+
+      if (i == num_tics - 1)
         {
-            UpdateClockSync(seq + i, cmd.latency);
+          update_clock_sync(seq + i, cmd.latency);
         }
     }
 
-    // Has this been received out of sequence, ie. have we not received
-    // all tics before the first tic in this packet?  If so, send a 
-    // resend request.
+  /* Has this been received out of sequence, ie. have we not received
+   * all tics before the first tic in this packet?  If so, send a
+   * resend request.
+   */
 
-    //printf("CL: %p: %i\n", client, seq);
+  resend_end = seq - recvwindow_start;
 
-    resend_end = seq - recvwindow_start;
+  if (resend_end <= 0) return;
 
-    if (resend_end <= 0)
-        return;
-
-    if (resend_end >= BACKUPTICS)
-        resend_end = BACKUPTICS - 1;
-
-    index = resend_end - 1;
-    resend_start = resend_end;
-    
-    while (index >= 0)
+  if (resend_end >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS)
     {
-        recvobj = &recvwindow[index];
-
-        if (recvobj->active)
-        {
-            // ended our run of unreceived tics
-
-            break;
-        }
-
-        if (recvobj->resend_time != 0)
-        {
-            // Already sent a resend request for this tic
-
-            break;
-        }
-
-        resend_start = index;
-        --index;
+      resend_end = CONFIG_GAMES_NXDOOM_NET_BACKUPTICS - 1;
     }
 
-    // Possibly send a resend request
-    if (resend_start < resend_end)
+  index = resend_end - 1;
+  resend_start = resend_end;
+
+  while (index >= 0)
     {
-        NET_Log("client: request resend for %d-%d before %d",
-                recvwindow_start + resend_start,
-                recvwindow_start + resend_end - 1, seq);
-        NET_CL_SendResendRequest(recvwindow_start + resend_start, 
+      recvobj = &recvwindow[index];
+
+      if (recvobj->active)
+        {
+          /* ended our run of unreceived tics */
+
+          break;
+        }
+
+      if (recvobj->resend_time != 0)
+        {
+          /* Already sent a resend request for this tic */
+
+          break;
+        }
+
+      resend_start = index;
+      --index;
+    }
+
+  /* Possibly send a resend request */
+
+  if (resend_start < resend_end)
+    {
+      net_log_info("client: request resend for %d-%d before %d",
+                   recvwindow_start + resend_start,
+                   recvwindow_start + resend_end - 1, seq);
+      net_cl_send_resend_request(recvwindow_start + resend_start,
                                  recvwindow_start + resend_end - 1);
     }
 }
 
-// Parse a resend request from the server due to a dropped packet
+/* Parse a resend request from the server due to a dropped packet */
 
-static void NET_CL_ParseResendRequest(net_packet_t *packet)
+static void net_cl_parse_resend_request(net_packet_t *packet)
 {
-    static unsigned int start;
-    static unsigned int end;
-    static unsigned int num_tics;
+  static unsigned int start;
+  static unsigned int end;
+  static unsigned int num_tics;
 
-    NET_Log("client: processing resend request");
+  net_log_info("client: processing resend request");
 
-    if (drone)
+  if (drone)
     {
-        // Drones don't send gamedata.
-        NET_Log("client: error: resend request but we're a drone?");
-        return;
+      /* Drones don't send gamedata. */
+
+      net_log_err("client: resend request but we're a drone?");
+      return;
     }
 
-    if (!NET_ReadInt32(packet, &start)
-     || !NET_ReadInt8(packet, &num_tics))
+  if (!net_read_int32(packet, &start) || !net_read_int8(packet, &num_tics))
     {
-        NET_Log("client: error: couldn't read start and num_tics");
-        return;
+      net_log_err("client: couldn't read start and num_tics");
+      return;
     }
 
-    end = start + num_tics - 1;
+  end = start + num_tics - 1;
 
-    //printf("requested resend %i-%i .. ", start, end);
-    NET_Log("client: resend request: start=%d, num_tics=%d", start, num_tics);
+  net_log_info("client: resend request: start=%d, num_tics=%d", start,
+               num_tics);
 
-    // Check we have the tics being requested.  If not, reduce the 
-    // window of tics to only what we have.
+  /* Check we have the tics being requested.  If not, reduce the
+   * window of tics to only what we have.
+   */
 
-    while (start <= end
-        && (!send_queue[start % BACKUPTICS].active
-         || send_queue[start % BACKUPTICS].seq != start))
+  while (
+      start <= end &&
+      (!send_queue[start % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].active ||
+       send_queue[start % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].seq != start))
     {
-        ++start;
-    }
-     
-    while (start <= end
-        && (!send_queue[end % BACKUPTICS].active
-         || send_queue[end % BACKUPTICS].seq != end))
-    {
-        --end;
+      ++start;
     }
 
-    // Resend those tics
-    if (start <= end)
+  while (start <= end &&
+         (!send_queue[end % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].active ||
+          send_queue[end % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS].seq != end))
     {
-        NET_Log("client: resending %d-%d", start, end);
-        NET_CL_SendTics(start, end);
+      --end;
     }
-    else
+
+  /* Resend those tics */
+
+  if (start <= end)
     {
-        NET_Log("client: don't have the tics to resend");
+      net_log_info("client: resending %d-%d", start, end);
+      net_cl_send_tics(start, end);
+    }
+  else
+    {
+      net_log_info("client: don't have the tics to resend");
     }
 }
 
-// Console message that the server wants the client to print
+/* Console message that the server wants the client to print */
 
-static void NET_CL_ParseConsoleMessage(net_packet_t *packet)
+static void net_cl_parse_console_message(net_packet_t *packet)
 {
-    char *msg;
+  char *msg;
 
-    msg = NET_ReadSafeString(packet);
+  msg = net_read_safe_string(packet);
 
-    if (msg == NULL)
+  if (msg == NULL)
     {
-        return;
+      return;
     }
 
-    printf("Message from server:\n%s\n", msg);
+  printf("Message from server:\n%s\n", msg);
 }
 
-// parse a received packet
+/* parse a received packet */
 
-static void NET_CL_ParsePacket(net_packet_t *packet)
+static void net_cl_parse_packet(net_packet_t *packet)
 {
-    unsigned int packet_type;
+  unsigned int packet_type;
 
-    if (!NET_ReadInt16(packet, &packet_type))
+  if (!net_read_int16(packet, &packet_type))
     {
-        return;
+      return;
     }
 
-    NET_Log("client: packet from server, type %d",
-            packet_type & ~NET_RELIABLE_PACKET);
-    NET_LogPacket(packet);
+  net_log_info("client: packet from server, type %d",
+               packet_type & ~NET_RELIABLE_PACKET);
+  net_log_packet(packet);
 
-    if (NET_Conn_Packet(&client_connection, packet, &packet_type))
+  if (net_conn_packet(&client_connection, packet, &packet_type))
     {
-        // Packet eaten by the common connection code
+      /* Packet eaten by the common connection code */
     }
-    else
+  else
     {
-        switch (packet_type)
+      switch (packet_type)
         {
-            case NET_PACKET_TYPE_SYN:
-                NET_CL_ParseSYN(packet);
-                break;
+        case NET_PACKET_TYPE_SYN:
+          net_cl_parse_syn(packet);
+          break;
 
-            case NET_PACKET_TYPE_REJECTED:
-                NET_CL_ParseReject(packet);
-                break;
+        case NET_PACKET_TYPE_REJECTED:
+          net_cl_parse_reject(packet);
+          break;
 
-            case NET_PACKET_TYPE_WAITING_DATA:
-                NET_CL_ParseWaitingData(packet);
-                break;
+        case NET_PACKET_TYPE_WAITING_DATA:
+          net_cl_parse_waiting_data(packet);
+          break;
 
-            case NET_PACKET_TYPE_LAUNCH:
-                NET_CL_ParseLaunch(packet);
-                break;
+        case NET_PACKET_TYPE_LAUNCH:
+          net_cl_parse_launch(packet);
+          break;
 
-            case NET_PACKET_TYPE_GAMESTART:
-                NET_CL_ParseGameStart(packet);
-                break;
+        case NET_PACKET_TYPE_GAMESTART:
+          net_cl_parse_game_start(packet);
+          break;
 
-            case NET_PACKET_TYPE_GAMEDATA:
-                NET_CL_ParseGameData(packet);
-                break;
+        case NET_PACKET_TYPE_GAMEDATA:
+          net_cl_parse_game_data(packet);
+          break;
 
-            case NET_PACKET_TYPE_GAMEDATA_RESEND:
-                NET_CL_ParseResendRequest(packet);
-                break;
+        case NET_PACKET_TYPE_GAMEDATA_RESEND:
+          net_cl_parse_resend_request(packet);
+          break;
 
-            case NET_PACKET_TYPE_CONSOLE_MESSAGE:
-                NET_CL_ParseConsoleMessage(packet);
-                break;
+        case NET_PACKET_TYPE_CONSOLE_MESSAGE:
+          net_cl_parse_console_message(packet);
+          break;
 
-            default:
-                break;
+        default:
+          break;
         }
     }
 }
 
-// "Run" the client code: check for new packets, send packets as
-// needed
-
-void NET_CL_Run(void)
+static void net_cl_send_syn(net_connect_data_t *data)
 {
-    net_addr_t *addr;
-    net_packet_t *packet;
-    
-    if (!net_client_connected)
-    {
-        return;
-    }
-    
-    while (NET_RecvPacket(client_context, &addr, &packet))
-    {
-        // only accept packets from the server
+  net_packet_t *packet;
 
-        if (addr == server_addr)
+  net_log_info("client: sending SYN");
+
+  packet = net_new_packet(10);
+  net_write_int16(packet, NET_PACKET_TYPE_SYN);
+  net_write_int32(packet, NET_MAGIC_NUMBER);
+  net_write_string(packet, PACKAGE_STRING);
+  net_write_protocol_list(packet);
+  net_write_connect_data(packet, data);
+  net_write_string(packet, net_player_name);
+  net_conn_send_packet(&client_connection, packet);
+  net_free_packet(packet);
+}
+
+static void net_cl_init(void)
+{
+  /* Try to set from the USER and USERNAME environment variables
+   * Otherwise, fallback to "Player"
+   */
+
+  if (net_player_name == NULL)
+    {
+      net_player_name = "Player";
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void net_cl_launch_game(void)
+{
+  net_conn_new_reliable(&client_connection, NET_PACKET_TYPE_LAUNCH);
+}
+
+void net_cl_start_game(net_gamesettings_t *p_settings)
+{
+  net_packet_t *packet;
+
+  /* Start from a ticcmd of all zeros */
+
+  memset(&last_ticcmd, 0, sizeof(ticcmd_t));
+
+  /* Send packet */
+
+  packet =
+      net_conn_new_reliable(&client_connection, NET_PACKET_TYPE_GAMESTART);
+
+  net_write_settings(packet, p_settings);
+}
+
+/* Add a new ticcmd to the send queue */
+
+void net_cl_send_ticcmd(ticcmd_t *ticcmd, int maketic)
+{
+  net_ticdiff_t diff;
+  net_server_send_t *sendobj;
+  int starttic;
+  int endtic;
+
+  /* Calculate the difference to the last ticcmd */
+
+  net_ticcmd_diff(&last_ticcmd, ticcmd, &diff);
+
+  /* Store in the send queue */
+
+  sendobj = &send_queue[maketic % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
+  sendobj->active = true;
+  sendobj->seq = maketic;
+  sendobj->time = i_get_time_ms();
+  sendobj->cmd = diff;
+
+  last_ticcmd = *ticcmd;
+
+  /* Send to server. */
+
+  starttic = maketic - settings.extratics;
+  endtic = maketic;
+
+  if (starttic < 0) starttic = 0;
+
+  net_log_info("client: generated tic %d, sending %d-%d", maketic, starttic,
+               endtic);
+  net_cl_send_tics(starttic, endtic);
+}
+
+/* "Run" the client code: check for new packets, send packets as
+ * needed
+ */
+
+void net_cl_run(void)
+{
+  net_addr_t *addr;
+  net_packet_t *packet;
+
+  if (!net_client_connected)
+    {
+      return;
+    }
+
+  while (net_recv_packet(client_context, &addr, &packet))
+    {
+      /* only accept packets from the server */
+
+      if (addr == server_addr)
         {
-            NET_CL_ParsePacket(packet);
+          net_cl_parse_packet(packet);
         }
 
-        NET_FreePacket(packet);
-        NET_ReleaseAddress(addr);
+      net_free_packet(packet);
+      net_release_address(addr);
     }
 
-    // Run the common connection code to send any packets as needed
+  /* Run the common connection code to send any packets as needed */
 
-    NET_Conn_Run(&client_connection);
+  net_conn_run(&client_connection);
 
-    if (client_connection.state == NET_CONN_STATE_DISCONNECTED
-     || client_connection.state == NET_CONN_STATE_DISCONNECTED_SLEEP)
+  if (client_connection.state == NET_CONN_STATE_DISCONNECTED ||
+      client_connection.state == NET_CONN_STATE_DISCONNECTED_SLEEP)
     {
-        NET_CL_Disconnected();
+      net_cl_disconnected();
 
-        NET_CL_Shutdown();
+      net_cl_shutdown();
     }
 
-    net_waiting_for_launch =
-            client_connection.state == NET_CONN_STATE_CONNECTED
-         && client_state == CLIENT_STATE_WAITING_LAUNCH;
+  net_waiting_for_launch =
+      client_connection.state == NET_CONN_STATE_CONNECTED &&
+      client_state == CLIENT_STATE_WAITING_LAUNCH;
 
-    if (client_state == CLIENT_STATE_IN_GAME)
+  if (client_state == CLIENT_STATE_IN_GAME)
     {
-        // Possibly advance the receive window
+      /* Possibly advance the receive window */
 
-        NET_CL_AdvanceWindow();
+      net_cl_advance_window();
 
-        // Check if our resend requests have timed out
+      /* Check if our resend requests have timed out */
 
-        NET_CL_CheckResends();
+      net_cl_check_resends();
     }
 }
 
-static void NET_CL_SendSYN(net_connect_data_t *data)
+/* Connect to a server */
+
+boolean net_cl_connect(net_addr_t *addr, net_connect_data_t *data)
 {
-    net_packet_t *packet;
+  int start_time;
+  int last_send_time;
+  boolean sent_hole_punch;
 
-    NET_Log("client: sending SYN");
+  server_addr = addr;
+  net_reference_address(addr);
 
-    packet = NET_NewPacket(10);
-    NET_WriteInt16(packet, NET_PACKET_TYPE_SYN);
-    NET_WriteInt32(packet, NET_MAGIC_NUMBER);
-    NET_WriteString(packet, PACKAGE_STRING);
-    NET_WriteProtocolList(packet);
-    NET_WriteConnectData(packet, data);
-    NET_WriteString(packet, net_player_name);
-    NET_Conn_SendPacket(&client_connection, packet);
-    NET_FreePacket(packet);
-}
+  memcpy(net_local_wad_sha1sum, data->wad_sha1sum, sizeof(sha1_digest_t));
+  memcpy(net_local_deh_sha1sum, data->deh_sha1sum, sizeof(sha1_digest_t));
+  net_local_is_freedoom = data->is_freedoom;
 
-// Connect to a server
-boolean NET_CL_Connect(net_addr_t *addr, net_connect_data_t *data)
-{
-    int start_time;
-    int last_send_time;
-    boolean sent_hole_punch;
+  /* create a new network I/O context and add just the necessary module */
 
-    server_addr = addr;
-    NET_ReferenceAddress(addr);
+  client_context = net_new_context();
 
-    memcpy(net_local_wad_sha1sum, data->wad_sha1sum, sizeof(sha1_digest_t));
-    memcpy(net_local_deh_sha1sum, data->deh_sha1sum, sizeof(sha1_digest_t));
-    net_local_is_freedoom = data->is_freedoom;
+  /* initialize module for client mode */
 
-    // create a new network I/O context and add just the necessary module
-    client_context = NET_NewContext();
-
-    // initialize module for client mode
-    if (!addr->module->InitClient())
+  if (!addr->module->init_client())
     {
-        SetRejectReason("Failed to initialize client module");
-        return false;
+      set_reject_reason("Failed to initialize client module");
+      return false;
     }
 
-    NET_AddModule(client_context, addr->module);
+  net_add_module(client_context, addr->module);
 
-    net_client_connected = true;
-    net_client_received_wait_data = false;
-    sent_hole_punch = false;
+  net_client_connected = true;
+  net_client_received_wait_data = false;
+  sent_hole_punch = false;
 
-    NET_Conn_InitClient(&client_connection, addr, NET_PROTOCOL_UNKNOWN);
+  net_conn_init_client(&client_connection, addr, NET_PROTOCOL_UNKNOWN);
 
-    // try to connect
-    start_time = I_GetTimeMS();
-    last_send_time = -1;
-    SetRejectReason("Unknown reason");
+  /* try to connect */
 
-    while (client_connection.state == NET_CONN_STATE_CONNECTING)
+  start_time = i_get_time_ms();
+  last_send_time = -1;
+  set_reject_reason("Unknown reason");
+
+  while (client_connection.state == NET_CONN_STATE_CONNECTING)
     {
-        int nowtime = I_GetTimeMS();
+      int nowtime = i_get_time_ms();
 
-        // Send a SYN packet every second.
-        if (nowtime - last_send_time > 1000 || last_send_time < 0)
+      /* Send a SYN packet every second. */
+
+      if (nowtime - last_send_time > 1000 || last_send_time < 0)
         {
-            NET_CL_SendSYN(data);
-            last_send_time = nowtime;
+          net_cl_send_syn(data);
+          last_send_time = nowtime;
         }
 
-        // time out after 5 seconds
-        if (nowtime - start_time > 5000)
+      /* time out after 5 seconds */
+
+      if (nowtime - start_time > 5000)
         {
-            SetRejectReason("No response from server");
-            break;
+          set_reject_reason("No response from server");
+          break;
         }
 
-        if (!sent_hole_punch && nowtime - start_time > 2000)
+      if (!sent_hole_punch && nowtime - start_time > 2000)
         {
-            NET_Log("client: no response to SYN, requesting hole punch");
-            NET_RequestHolePunch(client_context, addr);
-            sent_hole_punch = true;
+          net_log_warn("client: no response to SYN, requesting hole punch");
+          net_request_hole_punch(client_context, addr);
+          sent_hole_punch = true;
         }
 
-        // run client code
-        NET_CL_Run();
+      /* run client code */
 
-        // run the server, just in case we are doing a loopback connect
-        NET_SV_Run();
+      net_cl_run();
 
-        // Don't hog the CPU
-        I_Sleep(1);
+      /* run the server, just in case we are doing a loopback connect */
+
+      net_sv_run();
+
+      /* Don't hog the CPU */
+
+      usleep(1000);
     }
 
-    if (client_connection.state == NET_CONN_STATE_CONNECTED)
+  if (client_connection.state == NET_CONN_STATE_CONNECTED)
     {
-        // connected ok!
-        NET_Log("client: connected successfully");
-        SetRejectReason(NULL);
-        client_state = CLIENT_STATE_WAITING_LAUNCH;
-        drone = data->drone;
+      /* connected ok! */
 
-        return true;
+      net_log_info("client: connected successfully");
+      set_reject_reason(NULL);
+      client_state = CLIENT_STATE_WAITING_LAUNCH;
+      drone = data->drone;
+
+      return true;
     }
-    else
+  else
     {
-        // failed to connect
-        NET_Log("client: failed to connect");
-        NET_CL_Shutdown();
+      /* failed to connect */
 
-        return false;
+      net_log_err("client: failed to connect");
+      net_cl_shutdown();
+
+      return false;
     }
 }
 
-// read game settings received from server
+/* read game settings received from server */
 
-boolean NET_CL_GetSettings(net_gamesettings_t *_settings)
+boolean net_cl_get_settings(net_gamesettings_t *_settings)
 {
-    if (client_state != CLIENT_STATE_IN_GAME)
+  if (client_state != CLIENT_STATE_IN_GAME)
     {
-        return false;
+      return false;
     }
 
-    memcpy(_settings, &settings, sizeof(net_gamesettings_t));
+  memcpy(_settings, &settings, sizeof(net_gamesettings_t));
 
-    return true;
+  return true;
 }
 
-// disconnect from the server
+/* disconnect from the server */
 
-void NET_CL_Disconnect(void)
+void net_cl_disconnect(void)
 {
-    int start_time;
+  int start_time;
 
-    if (!net_client_connected)
+  if (!net_client_connected)
     {
-        return;
+      return;
     }
 
-    NET_Log("client: beginning disconnect");
-    NET_Conn_Disconnect(&client_connection);
+  net_log_info("client: beginning disconnect");
+  net_conn_disconnect(&client_connection);
 
-    start_time = I_GetTimeMS();
+  start_time = i_get_time_ms();
 
-    while (client_connection.state != NET_CONN_STATE_DISCONNECTED
-        && client_connection.state != NET_CONN_STATE_DISCONNECTED_SLEEP)
+  while (client_connection.state != NET_CONN_STATE_DISCONNECTED &&
+         client_connection.state != NET_CONN_STATE_DISCONNECTED_SLEEP)
     {
-        if (I_GetTimeMS() - start_time > 5000)
+      if (i_get_time_ms() - start_time > 5000)
         {
-            // time out after 5 seconds
+          /* time out after 5 seconds */
 
-            NET_Log("client: no acknowledgement of disconnect received");
-            client_state = CLIENT_STATE_WAITING_START;
+          net_log_err("client: no acknowledgement of disconnect received");
+          client_state = CLIENT_STATE_WAITING_START;
 
-            fprintf(stderr, "NET_CL_Disconnect: Timeout while disconnecting "
-                            "from server\n");
-            break;
+          fprintf(stderr, "net_cl_disconnect: Timeout while disconnecting "
+                          "from server\n");
+          break;
         }
 
-        NET_CL_Run();
-        NET_SV_Run();
+      net_cl_run();
+      net_sv_run();
 
-        I_Sleep(1);
+      usleep(1000);
     }
 
-    // Finished sending disconnect packets, etc.
-    NET_Log("client: disconnect complete");
-    NET_CL_Shutdown();
+  /* Finished sending disconnect packets, etc. */
+
+  net_log_info("client: disconnect complete");
+  net_cl_shutdown();
 }
 
-void NET_CL_Init(void)
+void net_init(void)
 {
-    // Try to set from the USER and USERNAME environment variables
-    // Otherwise, fallback to "Player"
-
-    if (net_player_name == NULL)
-    {
-        net_player_name = NET_GetRandomPetName();
-    }
+  net_cl_init();
 }
 
-void NET_Init(void)
+void net_bind_variables(void)
 {
-    NET_OpenLog();
-    NET_CL_Init();
-}
-
-void NET_BindVariables(void)
-{
-    M_BindStringVariable("player_name", &net_player_name);
+  m_bind_string_variable("player_name", &net_player_name);
 }
diff --git a/games/NXDoom/src/net_client.h b/games/NXDoom/src/net_client.h
index 37ba01984..abe3d1b82 100644
--- a/games/NXDoom/src/net_client.h
+++ b/games/NXDoom/src/net_client.h
@@ -1,38 +1,39 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Network client code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_client.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Network client code
+ *
+ ****************************************************************************/
 
 #ifndef NET_CLIENT_H
 #define NET_CLIENT_H
 
-#include "doomtype.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_ticcmd.h"
-#include "sha1.h"
+#include "doomtype.h"
 #include "net_defs.h"
+#include "sha1.h"
 
-boolean NET_CL_Connect(net_addr_t *addr, net_connect_data_t *data);
-void NET_CL_Disconnect(void);
-void NET_CL_Run(void);
-void NET_CL_Init(void);
-void NET_CL_LaunchGame(void);
-void NET_CL_StartGame(net_gamesettings_t *settings);
-void NET_CL_SendTiccmd(ticcmd_t *ticcmd, int maketic);
-boolean NET_CL_GetSettings(net_gamesettings_t *_settings);
-void NET_Init(void);
-
-void NET_BindVariables(void);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern boolean net_client_connected;
 extern boolean net_client_received_wait_data;
@@ -50,4 +51,19 @@ extern unsigned int net_local_is_freedoom;
 
 extern boolean drone;
 
-#endif /* #ifndef NET_CLIENT_H */
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+boolean net_cl_connect(net_addr_t *addr, net_connect_data_t *data);
+void net_cl_disconnect(void);
+void net_cl_run(void);
+void net_cl_launch_game(void);
+void net_cl_start_game(net_gamesettings_t *settings);
+void net_cl_send_ticcmd(ticcmd_t *ticcmd, int maketic);
+boolean net_cl_get_settings(net_gamesettings_t *_settings);
+void net_init(void);
+
+void net_bind_variables(void);
+
+#endif /* NET_CLIENT_H */
diff --git a/games/NXDoom/src/net_common.c b/games/NXDoom/src/net_common.c
index 99b32c256..62dac01ca 100644
--- a/games/NXDoom/src/net_common.c
+++ b/games/NXDoom/src/net_common.c
@@ -1,26 +1,35 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Common code shared between the client and server
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_common.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Common code shared between the client and server
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 
-#include "doomtype.h"
 #include "d_mode.h"
+#include "doomtype.h"
 #include "i_system.h"
 #include "i_timer.h"
 #include "m_argv.h"
@@ -31,497 +40,493 @@
 #include "net_packet.h"
 #include "net_structrw.h"
 
-// connections time out after 30 seconds
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* connections time out after 30 seconds */
 
 #define CONNECTION_TIMEOUT_LEN 30
 
-// maximum time between sending packets
+/* maximum time between sending packets */
 
 #define KEEPALIVE_PERIOD 1
 
-// reliable packet that is guaranteed to reach its destination
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* reliable packet that is guaranteed to reach its destination */
 
 struct net_reliable_packet_s
 {
-    net_packet_t *packet;
-    int last_send_time;
-    int seq;
-    net_reliable_packet_t *next;
+  net_packet_t *packet;
+  int last_send_time;
+  int seq;
+  net_reliable_packet_t *next;
 };
 
-static FILE *net_debug = NULL;
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static void NET_Conn_Init(net_connection_t *conn, net_addr_t *addr,
+static void net_conn_init(net_connection_t *conn, net_addr_t *addr,
                           net_protocol_t protocol)
 {
-    conn->last_send_time = -1;
-    conn->num_retries = 0;
-    conn->addr = addr;
-    conn->protocol = protocol;
-    conn->reliable_packets = NULL;
-    conn->reliable_send_seq = 0;
-    conn->reliable_recv_seq = 0;
-    conn->keepalive_recv_time = I_GetTimeMS();
+  conn->last_send_time = -1;
+  conn->num_retries = 0;
+  conn->addr = addr;
+  conn->protocol = protocol;
+  conn->reliable_packets = NULL;
+  conn->reliable_send_seq = 0;
+  conn->reliable_recv_seq = 0;
+  conn->keepalive_recv_time = i_get_time_ms();
 }
 
-// Initialize as a client connection
-
-void NET_Conn_InitClient(net_connection_t *conn, net_addr_t *addr,
-                         net_protocol_t protocol)
+static void net_conn_parse_disconnect(net_connection_t *conn,
+                                      net_packet_t *packet)
 {
-    NET_Conn_Init(conn, addr, protocol);
-    conn->state = NET_CONN_STATE_CONNECTING;
+  net_packet_t *reply;
+
+  /* Other end wants to disconnect
+   * Send a DISCONNECT_ACK reply.
+   */
+
+  reply = net_new_packet(10);
+  net_write_int16(reply, NET_PACKET_TYPE_DISCONNECT_ACK);
+  net_conn_send_packet(conn, reply);
+  net_free_packet(reply);
+
+  conn->last_send_time = i_get_time_ms();
+
+  conn->state = NET_CONN_STATE_DISCONNECTED_SLEEP;
+  conn->disconnect_reason = NET_DISCONNECT_REMOTE;
 }
 
-// Initialize as a server connection
+/* Parse a DISCONNECT_ACK packet */
 
-void NET_Conn_InitServer(net_connection_t *conn, net_addr_t *addr,
-                         net_protocol_t protocol)
+static void net_conn_parse_disconnect_ack(net_connection_t *conn,
+                                          net_packet_t *packet)
 {
-    NET_Conn_Init(conn, addr, protocol);
-    conn->state = NET_CONN_STATE_CONNECTED;
+  if (conn->state == NET_CONN_STATE_DISCONNECTING)
+    {
+      /* We have received an acknowledgement to our disconnect
+       * request. We have been disconnected successfully.
+       */
+
+      conn->state = NET_CONN_STATE_DISCONNECTED;
+      conn->disconnect_reason = NET_DISCONNECT_LOCAL;
+      conn->last_send_time = -1;
+    }
 }
 
-// Send a packet to a connection
-// All packets should be sent through this interface, as it maintains the
-// keepalive_send_time counter.
-
-void NET_Conn_SendPacket(net_connection_t *conn, net_packet_t *packet)
-{
-    conn->keepalive_send_time = I_GetTimeMS();
-    NET_SendPacket(conn->addr, packet);
-}
-
-static void NET_Conn_ParseDisconnect(net_connection_t *conn, net_packet_t *packet)
-{
-    net_packet_t *reply;
-
-    // Other end wants to disconnect
-    // Send a DISCONNECT_ACK reply.
-    
-    reply = NET_NewPacket(10);
-    NET_WriteInt16(reply, NET_PACKET_TYPE_DISCONNECT_ACK);
-    NET_Conn_SendPacket(conn, reply);
-    NET_FreePacket(reply);
-
-    conn->last_send_time = I_GetTimeMS();
-    
-    conn->state = NET_CONN_STATE_DISCONNECTED_SLEEP;
-    conn->disconnect_reason = NET_DISCONNECT_REMOTE;
-}
-
-// Parse a DISCONNECT_ACK packet
-
-static void NET_Conn_ParseDisconnectACK(net_connection_t *conn,
+static void net_conn_parse_reliable_ack(net_connection_t *conn,
                                         net_packet_t *packet)
 {
+  unsigned int seq;
 
-    if (conn->state == NET_CONN_STATE_DISCONNECTING)
+  if (!net_read_int8(packet, &seq))
     {
-        // We have received an acknowledgement to our disconnect
-        // request. We have been disconnected successfully.
-        
-        conn->state = NET_CONN_STATE_DISCONNECTED;
-        conn->disconnect_reason = NET_DISCONNECT_LOCAL;
-        conn->last_send_time = -1;
+      return;
+    }
+
+  if (conn->reliable_packets == NULL)
+    {
+      return;
+    }
+
+  /* Is this an acknowledgement for the first packet in the list? */
+
+  if (seq == (unsigned int)((conn->reliable_packets->seq + 1) & 0xff))
+    {
+      net_reliable_packet_t *rp;
+
+      /* Discard it, then.
+       * Unlink from the list.
+       */
+
+      rp = conn->reliable_packets;
+      conn->reliable_packets = rp->next;
+
+      net_free_packet(rp->packet);
+      free(rp);
     }
 }
 
-static void NET_Conn_ParseReliableACK(net_connection_t *conn, net_packet_t *packet)
+/* Process the header of a reliable packet
+ *
+ * Returns true if the packet should be discarded (incorrect sequence)
+ */
+
+static boolean net_connect_reliable_packet(net_connection_t *conn,
+                                           net_packet_t *packet)
 {
-    unsigned int seq;
+  unsigned int seq;
+  net_packet_t *reply;
+  boolean result;
 
-    if (!NET_ReadInt8(packet, &seq))
+  /* Read the sequence number */
+
+  if (!net_read_int8(packet, &seq))
     {
-        return;
+      return true;
     }
 
-    if (conn->reliable_packets == NULL)
+  if (seq != (unsigned int)(conn->reliable_recv_seq & 0xff))
     {
-        return;
-    }
-            
-    // Is this an acknowledgement for the first packet in the list?
+      /* This is not the next expected packet in the sequence!
+       *
+       * Discard the packet.  If we were smart, we would use a proper
+       * sliding window protocol to do this, but I'm lazy.
+       */
 
-    if (seq == (unsigned int)((conn->reliable_packets->seq + 1) & 0xff))
+      result = true;
+    }
+  else
     {
-        net_reliable_packet_t *rp;
+      /* Now we can receive the next packet in the sequence. */
 
-        // Discard it, then.
-        // Unlink from the list.
+      conn->reliable_recv_seq = (conn->reliable_recv_seq + 1) & 0xff;
 
-        rp = conn->reliable_packets;
-        conn->reliable_packets = rp->next;
-        
-        NET_FreePacket(rp->packet);
-        free(rp);
+      result = false;
     }
+
+  /* Send an acknowledgement */
+
+  /* Note: this is braindead.  It would be much more sensible to
+   * include this in the next packet, rather than the overhead of
+   * sending a complete packet just for one byte of information.
+   */
+
+  reply = net_new_packet(10);
+
+  net_write_int16(reply, NET_PACKET_TYPE_RELIABLE_ACK);
+  net_write_int8(reply, conn->reliable_recv_seq & 0xff);
+
+  net_conn_send_packet(conn, reply);
+
+  net_free_packet(reply);
+
+  return result;
 }
 
-// Process the header of a reliable packet
-//
-// Returns true if the packet should be discarded (incorrect sequence)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-static boolean NET_Conn_ReliablePacket(net_connection_t *conn, 
-                                       net_packet_t *packet)
+/* Initialize as a client connection */
+
+void net_conn_init_client(net_connection_t *conn, net_addr_t *addr,
+                          net_protocol_t protocol)
 {
-    unsigned int seq;
-    net_packet_t *reply;
-    boolean result;
-
-    // Read the sequence number
-
-    if (!NET_ReadInt8(packet, &seq))
-    {
-        return true;
-    }
-
-    if (seq != (unsigned int)(conn->reliable_recv_seq & 0xff))
-    {
-        // This is not the next expected packet in the sequence!
-        //
-        // Discard the packet.  If we were smart, we would use a proper
-        // sliding window protocol to do this, but I'm lazy.
-
-        result = true;
-    }
-    else
-    {
-        // Now we can receive the next packet in the sequence.
-
-        conn->reliable_recv_seq = (conn->reliable_recv_seq + 1) & 0xff;
-    
-        result = false;
-    }
-
-    // Send an acknowledgement
-
-    // Note: this is braindead.  It would be much more sensible to 
-    // include this in the next packet, rather than the overhead of
-    // sending a complete packet just for one byte of information.
-
-    reply = NET_NewPacket(10);
-
-    NET_WriteInt16(reply, NET_PACKET_TYPE_RELIABLE_ACK);
-    NET_WriteInt8(reply, conn->reliable_recv_seq & 0xff);
-
-    NET_Conn_SendPacket(conn, reply);
-
-    NET_FreePacket(reply);
-
-    return result;
+  net_conn_init(conn, addr, protocol);
+  conn->state = NET_CONN_STATE_CONNECTING;
 }
 
-// Process a packet received by the server
-//
-// Returns true if eaten by common code
+/* Initialize as a server connection */
 
-boolean NET_Conn_Packet(net_connection_t *conn, net_packet_t *packet, 
+void net_conn_init_server(net_connection_t *conn, net_addr_t *addr,
+                         net_protocol_t protocol)
+{
+  net_conn_init(conn, addr, protocol);
+  conn->state = NET_CONN_STATE_CONNECTED;
+}
+
+/* Send a packet to a connection
+ * All packets should be sent through this interface, as it maintains the
+ * keepalive_send_time counter.
+ */
+
+void net_conn_send_packet(net_connection_t *conn, net_packet_t *packet)
+{
+  conn->keepalive_send_time = i_get_time_ms();
+  net_send_packet(conn->addr, packet);
+}
+
+/* Process a packet received by the server
+ *
+ * Returns true if eaten by common code
+ */
+
+boolean net_conn_packet(net_connection_t *conn, net_packet_t *packet,
                         unsigned int *packet_type)
 {
-    conn->keepalive_recv_time = I_GetTimeMS();
+  conn->keepalive_recv_time = i_get_time_ms();
 
-    // Is this a reliable packet?
+  /* Is this a reliable packet? */
 
-    if (*packet_type & NET_RELIABLE_PACKET)
+  if (*packet_type & NET_RELIABLE_PACKET)
     {
-        if (NET_Conn_ReliablePacket(conn, packet)) 
+      if (net_connect_reliable_packet(conn, packet))
         {
-            // Invalid packet: eat it.
+          /* Invalid packet: eat it. */
 
-            return true;
+          return true;
         }
 
-        // Remove the reliable bit
+      /* Remove the reliable bit */
 
-        *packet_type &= ~NET_RELIABLE_PACKET;
+      *packet_type &= ~NET_RELIABLE_PACKET;
     }
-    
-    switch (*packet_type)
+
+  switch (*packet_type)
     {
-        case NET_PACKET_TYPE_DISCONNECT:
-            NET_Conn_ParseDisconnect(conn, packet);
-            break;
-        case NET_PACKET_TYPE_DISCONNECT_ACK:
-            NET_Conn_ParseDisconnectACK(conn, packet);
-            break;
-        case NET_PACKET_TYPE_KEEPALIVE:
-            // No special action needed.
-            break;
-        case NET_PACKET_TYPE_RELIABLE_ACK:
-            NET_Conn_ParseReliableACK(conn, packet);
-            break;
-        default:
-            // Not a common packet
-
-            return false;
+    case NET_PACKET_TYPE_DISCONNECT:
+      net_conn_parse_disconnect(conn, packet);
+      break;
+    case NET_PACKET_TYPE_DISCONNECT_ACK:
+      net_conn_parse_disconnect_ack(conn, packet);
+      break;
+    case NET_PACKET_TYPE_KEEPALIVE:
+      break; /* No special action needed. */
+    case NET_PACKET_TYPE_RELIABLE_ACK:
+      net_conn_parse_reliable_ack(conn, packet);
+      break;
+    default:
+      return false; /* Not a common packet */
     }
 
-    // We found a packet that we found interesting, and ate it.
+  /* We found a packet that we found interesting, and ate it. */
 
-    return true;
+  return true;
 }
 
-void NET_Conn_Disconnect(net_connection_t *conn)
+void net_conn_disconnect(net_connection_t *conn)
 {
-    if (conn->state != NET_CONN_STATE_DISCONNECTED
-     && conn->state != NET_CONN_STATE_DISCONNECTING
-     && conn->state != NET_CONN_STATE_DISCONNECTED_SLEEP)
+  if (conn->state != NET_CONN_STATE_DISCONNECTED &&
+      conn->state != NET_CONN_STATE_DISCONNECTING &&
+      conn->state != NET_CONN_STATE_DISCONNECTED_SLEEP)
     {
-        conn->state = NET_CONN_STATE_DISCONNECTING;
-        conn->disconnect_reason = NET_DISCONNECT_LOCAL;
-        conn->last_send_time = -1;
-        conn->num_retries = 0;
+      conn->state = NET_CONN_STATE_DISCONNECTING;
+      conn->disconnect_reason = NET_DISCONNECT_LOCAL;
+      conn->last_send_time = -1;
+      conn->num_retries = 0;
     }
 }
 
-void NET_Conn_Run(net_connection_t *conn)
+void net_conn_run(net_connection_t *conn)
 {
-    net_packet_t *packet;
-    unsigned int nowtime;
+  net_packet_t *packet;
+  unsigned int nowtime;
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    if (conn->state == NET_CONN_STATE_CONNECTED)
+  if (conn->state == NET_CONN_STATE_CONNECTED)
     {
-        // Check the keepalive counters
+      /* Check the keepalive counters */
 
-        if (nowtime - conn->keepalive_recv_time > CONNECTION_TIMEOUT_LEN * 1000)
+      if (nowtime - conn->keepalive_recv_time >
+              CONNECTION_TIMEOUT_LEN * 1000)
         {
-            // Haven't received any packets from the other end in a long
-            // time.  Assume disconnected.
+          /* Haven't received any packets from the other end in a long
+           * time.  Assume disconnected.
+           */
 
-            conn->state = NET_CONN_STATE_DISCONNECTED;
-            conn->disconnect_reason = NET_DISCONNECT_TIMEOUT;
-        }
-        
-        if (nowtime - conn->keepalive_send_time > KEEPALIVE_PERIOD * 1000)
-        {
-            // We have not sent anything in a long time.
-            // Send a keepalive.
-
-            packet = NET_NewPacket(10);
-            NET_WriteInt16(packet, NET_PACKET_TYPE_KEEPALIVE);
-            NET_Conn_SendPacket(conn, packet);
-            NET_FreePacket(packet);
+          conn->state = NET_CONN_STATE_DISCONNECTED;
+          conn->disconnect_reason = NET_DISCONNECT_TIMEOUT;
         }
 
-        // Check the reliable packet list. Has the first packet in the
-        // list timed out?
-        //
-        // NB.  This is braindead, we have a fixed time of one second.
-
-        if (conn->reliable_packets != NULL
-         && (conn->reliable_packets->last_send_time < 0
-          || nowtime - conn->reliable_packets->last_send_time > 1000))
+      if (nowtime - conn->keepalive_send_time > KEEPALIVE_PERIOD * 1000)
         {
-            // Packet timed out, time to resend
+          /* We have not sent anything in a long time.
+           * Send a keepalive.
+           */
 
-            NET_Conn_SendPacket(conn, conn->reliable_packets->packet);
-            conn->reliable_packets->last_send_time = nowtime;
+          packet = net_new_packet(10);
+          net_write_int16(packet, NET_PACKET_TYPE_KEEPALIVE);
+          net_conn_send_packet(conn, packet);
+          net_free_packet(packet);
+        }
+
+      /* Check the reliable packet list. Has the first packet in the
+       * list timed out?
+       *
+       * NB.  This is braindead, we have a fixed time of one second.
+       */
+
+      if (conn->reliable_packets != NULL &&
+          (conn->reliable_packets->last_send_time < 0 ||
+           nowtime - conn->reliable_packets->last_send_time > 1000))
+        {
+          /* Packet timed out, time to resend */
+
+          net_conn_send_packet(conn, conn->reliable_packets->packet);
+          conn->reliable_packets->last_send_time = nowtime;
         }
     }
-    else if (conn->state == NET_CONN_STATE_DISCONNECTING)
+  else if (conn->state == NET_CONN_STATE_DISCONNECTING)
     {
-        // Waiting for a reply to our DISCONNECT request.
+      /* Waiting for a reply to our DISCONNECT request. */
 
-        if (conn->last_send_time < 0
-         || nowtime - conn->last_send_time > 1000)
+      if (conn->last_send_time < 0 || nowtime - conn->last_send_time > 1000)
         {
-            // it has been a second since the last disconnect packet 
-            // was sent, and still no reply.
+          /* it has been a second since the last disconnect packet
+           * was sent, and still no reply.
+           */
 
-            if (conn->num_retries < MAX_RETRIES)
+          if (conn->num_retries < MAX_RETRIES)
             {
-                // send another disconnect
+              /* send another disconnect */
 
-                packet = NET_NewPacket(10);
-                NET_WriteInt16(packet, NET_PACKET_TYPE_DISCONNECT);
-                NET_Conn_SendPacket(conn, packet);
-                NET_FreePacket(packet);
-                conn->last_send_time = nowtime;
+              packet = net_new_packet(10);
+              net_write_int16(packet, NET_PACKET_TYPE_DISCONNECT);
+              net_conn_send_packet(conn, packet);
+              net_free_packet(packet);
+              conn->last_send_time = nowtime;
 
-                ++conn->num_retries;
+              ++conn->num_retries;
             }
-            else 
+          else
             {
-                // No more retries allowed.
-                // Force disconnect.
+              /* No more retries allowed. Force disconnect. */
 
-                conn->state = NET_CONN_STATE_DISCONNECTED;
-                conn->disconnect_reason = NET_DISCONNECT_LOCAL;
+              conn->state = NET_CONN_STATE_DISCONNECTED;
+              conn->disconnect_reason = NET_DISCONNECT_LOCAL;
             }
         }
     }
-    else if (conn->state == NET_CONN_STATE_DISCONNECTED_SLEEP)
+  else if (conn->state == NET_CONN_STATE_DISCONNECTED_SLEEP)
     {
-        // We are disconnected, waiting in case we need to send
-        // a DISCONNECT_ACK to the server again.
+      /* We are disconnected, waiting in case we need to send
+       * a DISCONNECT_ACK to the server again.
+       */
 
-        if (nowtime - conn->last_send_time > 5000)
+      if (nowtime - conn->last_send_time > 5000)
         {
-            // Idle for 5 seconds, switch state
+          /* Idle for 5 seconds, switch state */
 
-            conn->state = NET_CONN_STATE_DISCONNECTED;
-            conn->disconnect_reason = NET_DISCONNECT_REMOTE;
+          conn->state = NET_CONN_STATE_DISCONNECTED;
+          conn->disconnect_reason = NET_DISCONNECT_REMOTE;
         }
     }
 }
 
-net_packet_t *NET_Conn_NewReliable(net_connection_t *conn, int packet_type)
+net_packet_t *net_conn_new_reliable(net_connection_t *conn, int packet_type)
 {
-    net_packet_t *packet;
-    net_reliable_packet_t *rp;
-    net_reliable_packet_t **listend;
+  net_packet_t *packet;
+  net_reliable_packet_t *rp;
+  net_reliable_packet_t **listend;
 
-    // Generate a packet with the right header
+  /* Generate a packet with the right header */
 
-    packet = NET_NewPacket(100);
+  packet = net_new_packet(100);
 
-    NET_WriteInt16(packet, packet_type | NET_RELIABLE_PACKET);
+  net_write_int16(packet, packet_type | NET_RELIABLE_PACKET);
 
-    // write the low byte of the send sequence number
-    
-    NET_WriteInt8(packet, conn->reliable_send_seq & 0xff);
+  /* write the low byte of the send sequence number */
 
-    // Add to the list of reliable packets
+  net_write_int8(packet, conn->reliable_send_seq & 0xff);
 
-    rp = malloc(sizeof(net_reliable_packet_t));
-    rp->packet = packet;
-    rp->next = NULL;
-    rp->seq = conn->reliable_send_seq;
-    rp->last_send_time = -1;
+  /* Add to the list of reliable packets */
 
-    for (listend = &conn->reliable_packets; 
-         *listend != NULL; 
-         listend = &((*listend)->next));
+  rp = malloc(sizeof(net_reliable_packet_t));
+  rp->packet = packet;
+  rp->next = NULL;
+  rp->seq = conn->reliable_send_seq;
+  rp->last_send_time = -1;
 
-    *listend = rp;
+  for (listend = &conn->reliable_packets; *listend != NULL;
+       listend = &((*listend)->next))
+    ;
 
-    // Count along the sequence
+  *listend = rp;
 
-    conn->reliable_send_seq = (conn->reliable_send_seq + 1) & 0xff;
+  /* Count along the sequence */
 
-    // Finished
-    
-    return packet;
+  conn->reliable_send_seq = (conn->reliable_send_seq + 1) & 0xff;
+
+  /* Finished */
+
+  return packet;
 }
 
-// Used to expand the least significant byte of a tic number into 
-// the full tic number, from the current tic number
+/* Used to expand the least significant byte of a tic number into
+ * the full tic number, from the current tic number
+ */
 
-unsigned int NET_ExpandTicNum(unsigned int relative, unsigned int b)
+unsigned int net_expand_tic_num(unsigned int relative, unsigned int b)
 {
-    unsigned int l, h;
-    unsigned int result;
+  unsigned int l;
+  unsigned int h;
+  unsigned int result;
 
-    h = relative & ~0xff;
-    l = relative & 0xff;
+  h = relative & ~0xff;
+  l = relative & 0xff;
 
-    result = h | b;
+  result = h | b;
 
-    if (l < 0x40 && b > 0xb0)
-        result -= 0x100;
-    if (l > 0xb0 && b < 0x40)
-        result += 0x100;
-    
-    return result;
+  if (l < 0x40 && b > 0xb0) result -= 0x100;
+  if (l > 0xb0 && b < 0x40) result += 0x100;
+
+  return result;
 }
 
-// Check that game settings are valid
+/* Check that game settings are valid */
 
-boolean NET_ValidGameSettings(GameMode_t mode, GameMission_t mission,
+boolean net_valid_game_settings(game_mode_t mode, gamemission_t mission,
                               net_gamesettings_t *settings)
 {
-    if (settings->ticdup <= 0)
-        return false;
-
-    if (settings->extratics < 0)
-        return false;
-
-    if (settings->deathmatch < 0 || settings->deathmatch > 2)
-        return false;
-
-    if (settings->skill < sk_noitems || settings->skill > sk_nightmare)
-        return false;
-
-    if (!D_ValidGameVersion(mission, settings->gameversion))
-        return false;
-
-    if (!D_ValidEpisodeMap(mission, mode, settings->episode, settings->map))
-        return false;
-
-    return true;
-}
-
-static void CloseLog(void)
-{
-    if (net_debug != NULL)
+  if (settings->ticdup <= 0)
     {
-        fclose(net_debug);
-        net_debug = NULL;
+      return false;
     }
+
+  if (settings->extratics < 0)
+    {
+      return false;
+    }
+
+  if (settings->deathmatch < 0 || settings->deathmatch > 2)
+    {
+      return false;
+    }
+
+  if (settings->skill < sk_noitems || settings->skill > sk_nightmare)
+    {
+      return false;
+    }
+
+  if (!d_valid_game_version(mission, settings->gameversion))
+    {
+      return false;
+    }
+
+  if (!d_valid_episode_map(mission, mode, settings->episode, settings->map))
+    {
+      return false;
+    }
+
+  return true;
 }
 
-void NET_OpenLog(void)
+#ifdef CONFIG_GAMES_NXDOOM_NET_LOGS
+void net_log_packet(net_packet_t *packet)
 {
-    int p;
+  int i;
+  int bytes;
 
-    p = M_CheckParmWithArgs("-netlog", 1);
-    if (p > 0)
+  bytes = packet->len - packet->pos;
+  if (bytes == 0)
     {
-        net_debug = M_fopen(myargv[p + 1], "w");
-        if (net_debug == NULL)
+      return;
+    }
+
+  fprintf(stderr, "\t%02x", packet->data[packet->pos]);
+
+  for (i = 1; i < bytes; ++i)
+    {
+      if ((i % 16) == 0)
         {
-            I_Error("Failed to open %s to write debug log.", myargv[p + 1]);
+          fprintf(stderr, "\n\t");
         }
-        I_AtExit(CloseLog, true);
-    }
-}
-
-void NET_Log(const char *fmt, ...)
-{
-    va_list args;
-
-    if (net_debug == NULL)
-    {
-        return;
-    }
-
-    fprintf(net_debug, "%8d: ", I_GetTimeMS());
-    va_start(args, fmt);
-    vfprintf(net_debug, fmt, args);
-    va_end(args);
-    fprintf(net_debug, "\n");
-}
-
-void NET_LogPacket(net_packet_t *packet)
-{
-    int i, bytes;
-
-    if (net_debug == NULL)
-    {
-        return;
-    }
-
-    bytes = packet->len - packet->pos;
-    if (bytes == 0)
-    {
-        return;
-    }
-    fprintf(net_debug, "\t%02x", packet->data[packet->pos]);
-    for (i = 1; i < bytes; ++i)
-    {
-        if ((i % 16) == 0)
+      else
         {
-            fprintf(net_debug, "\n\t");
+          fprintf(stderr, " ");
         }
-        else
-        {
-            fprintf(net_debug, " ");
-        }
-        fprintf(net_debug, "%02x", packet->data[packet->pos + i]);
-    }
-    fprintf(net_debug, "\n");
-}
 
+      fprintf(stderr, "%02x", packet->data[packet->pos + i]);
+    }
+
+  fprintf(stderr, "\n");
+}
+#endif /* CONFIG_GAMES_NXDOOM_NET_LOGS */
diff --git a/games/NXDoom/src/net_common.h b/games/NXDoom/src/net_common.h
index 15a7684ae..09770a1b2 100644
--- a/games/NXDoom/src/net_common.h
+++ b/games/NXDoom/src/net_common.h
@@ -1,106 +1,145 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Common code shared between the client and server
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_common.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Common code shared between the client and server
+ *
+ ****************************************************************************/
 
 #ifndef NET_COMMON_H
 #define NET_COMMON_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <syslog.h>
+
 #include "d_mode.h"
 #include "net_defs.h"
 #include "net_packet.h"
 
-typedef enum
-{
-    // Client has sent a SYN, is waiting for a SYN in response.
-    NET_CONN_STATE_CONNECTING,
-
-    // Successfully connected.
-    NET_CONN_STATE_CONNECTED,
-
-    // Sent a DISCONNECT packet, waiting for a DISCONNECT_ACK reply
-    NET_CONN_STATE_DISCONNECTING,
-
-    // Client successfully disconnected
-    NET_CONN_STATE_DISCONNECTED,
-
-    // We are disconnected, but in a sleep state, waiting for several
-    // seconds.  This is in case the DISCONNECT_ACK we sent failed
-    // to arrive, and we need to send another one.  We keep this as
-    // a valid connection for a few seconds until we are sure that
-    // the other end has successfully disconnected as well.
-    NET_CONN_STATE_DISCONNECTED_SLEEP,
-
-} net_connstate_t;
-
-// Reason a connection was terminated
-
-typedef enum
-{
-    // As the result of a local disconnect request
-
-    NET_DISCONNECT_LOCAL,
-
-    // As the result of a remote disconnect request
-
-    NET_DISCONNECT_REMOTE,
-
-    // Timeout (no data received in a long time)
-
-    NET_DISCONNECT_TIMEOUT,
-
-} net_disconnect_reason_t;
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 #define MAX_RETRIES 5
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+typedef enum
+{
+  /* Client has sent a SYN, is waiting for a SYN in response. */
+
+  NET_CONN_STATE_CONNECTING,
+
+  /* Successfully connected. */
+
+  NET_CONN_STATE_CONNECTED,
+
+  /* Sent a DISCONNECT packet, waiting for a DISCONNECT_ACK reply */
+
+  NET_CONN_STATE_DISCONNECTING,
+
+  /* Client successfully disconnected */
+
+  NET_CONN_STATE_DISCONNECTED,
+
+  /* We are disconnected, but in a sleep state, waiting for several
+   * seconds.  This is in case the DISCONNECT_ACK we sent failed
+   * to arrive, and we need to send another one.  We keep this as
+   * a valid connection for a few seconds until we are sure that
+   * the other end has successfully disconnected as well.
+   */
+
+  NET_CONN_STATE_DISCONNECTED_SLEEP,
+} net_connstate_t;
+
+/* Reason a connection was terminated */
+
+typedef enum
+{
+  /* As the result of a local disconnect request */
+
+  NET_DISCONNECT_LOCAL,
+
+  /* As the result of a remote disconnect request */
+
+  NET_DISCONNECT_REMOTE,
+
+  /* Timeout (no data received in a long time) */
+
+  NET_DISCONNECT_TIMEOUT,
+} net_disconnect_reason_t;
+
 typedef struct net_reliable_packet_s net_reliable_packet_t;
 
-typedef struct 
+typedef struct
 {
-    net_connstate_t state;
-    net_disconnect_reason_t disconnect_reason;
-    net_addr_t *addr;
-    net_protocol_t protocol;
-    int last_send_time;
-    int num_retries;
-    int keepalive_send_time;
-    int keepalive_recv_time;
-    net_reliable_packet_t *reliable_packets;
-    int reliable_send_seq;
-    int reliable_recv_seq;
+  net_connstate_t state;
+  net_disconnect_reason_t disconnect_reason;
+  net_addr_t *addr;
+  net_protocol_t protocol;
+  int last_send_time;
+  int num_retries;
+  int keepalive_send_time;
+  int keepalive_recv_time;
+  net_reliable_packet_t *reliable_packets;
+  int reliable_send_seq;
+  int reliable_recv_seq;
 } net_connection_t;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void NET_Conn_SendPacket(net_connection_t *conn, net_packet_t *packet);
-void NET_Conn_InitClient(net_connection_t *conn, net_addr_t *addr,
+void net_conn_send_packet(net_connection_t *conn, net_packet_t *packet);
+void net_conn_init_client(net_connection_t *conn, net_addr_t *addr,
+                          net_protocol_t protocol);
+void net_conn_init_server(net_connection_t *conn, net_addr_t *addr,
                          net_protocol_t protocol);
-void NET_Conn_InitServer(net_connection_t *conn, net_addr_t *addr,
-                         net_protocol_t protocol);
-boolean NET_Conn_Packet(net_connection_t *conn, net_packet_t *packet,
+boolean net_conn_packet(net_connection_t *conn, net_packet_t *packet,
                         unsigned int *packet_type);
-void NET_Conn_Disconnect(net_connection_t *conn);
-void NET_Conn_Run(net_connection_t *conn);
-net_packet_t *NET_Conn_NewReliable(net_connection_t *conn, int packet_type);
+void net_conn_disconnect(net_connection_t *conn);
+void net_conn_run(net_connection_t *conn);
+net_packet_t *net_conn_new_reliable(net_connection_t *conn, int packet_type);
 
-// Other miscellaneous common functions
-unsigned int NET_ExpandTicNum(unsigned int relative, unsigned int b);
-boolean NET_ValidGameSettings(GameMode_t mode, GameMission_t mission,
+/* Other miscellaneous common functions */
+
+unsigned int net_expand_tic_num(unsigned int relative, unsigned int b);
+boolean net_valid_game_settings(game_mode_t mode, gamemission_t mission,
                               net_gamesettings_t *settings);
 
-void NET_OpenLog(void);
-void NET_Log(const char *fmt, ...);
-void NET_LogPacket(net_packet_t *packet);
+/* Conditional logging */
 
-#endif /* #ifndef NET_COMMON_H */
+#ifdef CONFIG_GAMES_NXDOOM_NET_LOGS
+#define net_log_info(fmt, ...) syslog(LOG_USER | LOG_INFO, fmt, ##__VA_ARGS__)
+#define net_log_warn(fmt, ...)                                               \
+  syslog(LOG_USER | LOG_WARNING, fmt, ##__VA_ARGS__)
+#define net_log_err(fmt, ...) syslog(LOG_USER | LOG_ERR, fmt, ##__VA_ARGS__)
 
+void net_log_packet(net_packet_t *packet);
+#else
+#define net_log_info(fmt, ...)
+#define net_log_warn(fmt, ...)
+#define net_log_err(fmt, ...)
+
+#define net_log_packet(pkt)
+#endif /* CONFIG_GAMES_NXDOOM_NET_LOGS */
+
+#endif /* NET_COMMON_H */
diff --git a/games/NXDoom/src/net_dedicated.c b/games/NXDoom/src/net_dedicated.c
index dcb9f8fae..8c59fb7bb 100644
--- a/games/NXDoom/src/net_dedicated.c
+++ b/games/NXDoom/src/net_dedicated.c
@@ -1,19 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dedicated server code.
-// 
+/****************************************************************************
+ * apps/games/NXDoom/src/net_dedicated.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Dedicated server code.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,52 +37,65 @@
 #include "net_sdl.h"
 #include "net_server.h"
 
-// 
-// People can become confused about how dedicated servers work.  Game
-// options are specified to the controlling player who is the first to
-// join a game.  Bomb out with an error message if game options are
-// specified to a dedicated server.
-//
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* People can become confused about how dedicated servers work.  Game
+ * options are specified to the controlling player who is the first to
+ * join a game.  Bomb out with an error message if game options are
+ * specified to a dedicated server.
+ */
 
 static const char *not_dedicated_options[] =
 {
-    "-deh", "-iwad", "-cdrom", "-gameversion", "-nomonsters", "-respawn",
-    "-fast", "-altdeath", "-deathmatch", "-turbo", "-merge", "-af", "-as",
-    "-aa", "-file", "-wart", "-skill", "-episode", "-timer", "-avg", "-warp",
-    "-loadgame", "-longtics", "-extratics", "-dup", "-shorttics", NULL,
+  "-deh",       "-iwad",     "-cdrom",    "-gameversion", "-nomonsters",
+  "-respawn",   "-fast",     "-altdeath", "-deathmatch",  "-turbo",
+  "-merge",     "-af",       "-as",       "-aa",          "-file",
+  "-wart",      "-skill",    "-episode",  "-timer",       "-avg",
+  "-warp",      "-loadgame", "-longtics", "-extratics",   "-dup",
+  "-shorttics", NULL,
 };
 
-static void CheckForClientOptions(void)
-{
-    int i;
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-    for (i=0; not_dedicated_options[i] != NULL; ++i)
+static void check_for_client_options(void)
+{
+  int i;
+
+  for (i = 0; not_dedicated_options[i] != NULL; ++i)
     {
-        if (M_CheckParm(not_dedicated_options[i]) > 0)
+      if (m_check_parm(not_dedicated_options[i]) > 0)
         {
-            I_Error("The command line parameter '%s' was specified to a "
-                    "dedicated server.\nGame parameters should be specified "
-                    "to the first player to join a server, \nnot to the "
-                    "server itself. ",
-                    not_dedicated_options[i]);
+          i_error("The command line parameter '%s' was specified to a "
+                  "dedicated server.\nGame parameters should be specified "
+                  "to the first player to join a server, \nnot to the "
+                  "server itself. ",
+                  not_dedicated_options[i]);
         }
     }
 }
 
-void NET_DedicatedServer(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void net_dedicated_server(void)
 {
-    CheckForClientOptions();
+  check_for_client_options();
 
-    NET_OpenLog();
-    NET_SV_Init();
-    NET_SV_AddModule(&net_sdl_module);
-    NET_SV_RegisterWithMaster();
+  net_sv_init();
+  net_sv_add_module(&net_sdl_module);
+  net_sv_register_with_master();
 
-    while (true)
+  while (true)
     {
-        NET_SV_Run();
-        // TODO: Block on socket instead of polling.
-        I_Sleep(1);
+      net_sv_run();
+
+      /* TODO: Block on socket instead of polling. */
+
+      usleep(1000);
     }
 }
-
diff --git a/games/NXDoom/src/net_dedicated.h b/games/NXDoom/src/net_dedicated.h
index 3d7387b57..2f87bc5d5 100644
--- a/games/NXDoom/src/net_dedicated.h
+++ b/games/NXDoom/src/net_dedicated.h
@@ -1,25 +1,32 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Dedicated server code.
-// 
+/****************************************************************************
+ * apps/games/NXDoom/src/net_dedicated.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Dedicated server code.
+ *
+ ****************************************************************************/
 
 #ifndef NET_DEDICATED_H
 #define NET_DEDICATED_H
 
-void NET_DedicatedServer(void);
-
-#endif /* #ifndef NET_DEDICATED_H */
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
+void net_dedicated_server(void);
 
+#endif /* NET_DEDICATED_H */
diff --git a/games/NXDoom/src/net_defs.h b/games/NXDoom/src/net_defs.h
index ab852c08e..be7358630 100644
--- a/games/NXDoom/src/net_defs.h
+++ b/games/NXDoom/src/net_defs.h
@@ -1,48 +1,104 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Definitions for use in networking code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_defs.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Definitions for use in networking code.
+ *
+ ****************************************************************************/
 
 #ifndef NET_DEFS_H
-#define NET_DEFS_H 
+#define NET_DEFS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
-#include "doomtype.h"
 #include "d_ticcmd.h"
+#include "doomtype.h"
 #include "sha1.h"
 
-// Absolute maximum number of "nodes" in the game.  This is different to
-// NET_MAXPLAYERS, as there may be observers that are not participating
-// (eg. left/right monitors)
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Absolute maximum number of "nodes" in the game.  This is different to
+ * NET_MAXPLAYERS, as there may be observers that are not participating
+ * (eg. left/right monitors)
+ */
 
 #define MAXNETNODES 16
 
-// The maximum number of players, multiplayer/networking.
-// This is the maximum supported by the networking code; individual games
-// have their own values for MAXPLAYERS that can be smaller.
+#ifndef CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME
 
-#define NET_MAXPLAYERS 8
+/* We don't need player names. TODO: I should be smarter about this
+ * and avoid compiling ANY networking related stuff (i.e. player name
+ * members in the structs below) at all when net stuff is not enabled.
+ */
 
-// Maximum length of a player's name.
+#define CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME (1)
+#endif /* CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME */
 
-#define MAXPLAYERNAME 30
+/* The maximum number of players, multiplayer/networking.
+ * This is the maximum supported by the networking code; individual games
+ * have their own values for MAXPLAYERS that can be smaller.
+ */
 
-// Networking and tick handling related.
+#ifndef CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS
 
-#define BACKUPTICS 128
+/* No players if not set up for networking */
+
+#define CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS (1)
+#endif /* CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS */
+
+/* Networking and tick handling related. */
+
+#ifndef CONFIG_GAMES_NXDOOM_NET_BACKUPTICS
+
+/* Surely we don't need any for a local game? */
+
+#define CONFIG_GAMES_NXDOOM_NET_BACKUPTICS (1)
+#endif /* CONFIG_GAMES_NXDOOM_NET_BACKUPTICS */
+
+/* Magic number sent when connecting to check this is a valid client */
+
+#define NET_MAGIC_NUMBER 1454104972U
+
+/* Old magic number used by Chocolate Doom versions before v3.0: */
+
+#define NET_OLD_MAGIC_NUMBER 3436803284U
+
+/* header field value indicating that the packet is a reliable packet */
+
+#define NET_RELIABLE_PACKET (1 << 15)
+
+#define NET_TICDIFF_FORWARD (1 << 0)
+#define NET_TICDIFF_SIDE (1 << 1)
+#define NET_TICDIFF_TURN (1 << 2)
+#define NET_TICDIFF_BUTTONS (1 << 3)
+#define NET_TICDIFF_CONSISTANCY (1 << 4)
+#define NET_TICDIFF_CHATCHAR (1 << 5)
+#define NET_TICDIFF_RAVEN (1 << 6)
+#define NET_TICDIFF_STRIFE (1 << 7)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef struct _net_module_s net_module_t;
 typedef struct _net_packet_s net_packet_t;
@@ -51,226 +107,217 @@ typedef struct _net_context_s net_context_t;
 
 struct _net_packet_s
 {
-    byte *data;
-    size_t len;
-    size_t alloced;
-    unsigned int pos;
+  byte *data;
+  size_t len;
+  size_t alloced;
+  unsigned int pos;
 };
 
 struct _net_module_s
 {
-    // Initialize this module for use as a client
+  /* Initialize this module for use as a client */
 
-    boolean (*InitClient)(void);
+  boolean (*init_client)(void);
 
-    // Initialize this module for use as a server
+  /* Initialize this module for use as a server */
 
-    boolean (*InitServer)(void);
+  boolean (*init_server)(void);
 
-    // Send a packet
+  /* Send a packet */
 
-    void (*SendPacket)(net_addr_t *addr, net_packet_t *packet);
+  void (*send_packet)(net_addr_t *addr, net_packet_t *packet);
 
-    // Check for new packets to receive
-    //
-    // Returns true if packet received
+  /* Check for new packets to receive
+   *
+   * Returns true if packet received
+   */
 
-    boolean (*RecvPacket)(net_addr_t **addr, net_packet_t **packet);
+  boolean (*recv_packet)(net_addr_t **addr, net_packet_t **packet);
 
-    // Converts an address to a string
+  /* Converts an address to a string */
 
-    void (*AddrToString)(net_addr_t *addr, char *buffer, int buffer_len);
+  void (*addr_to_string)(net_addr_t *addr, char *buffer, int buffer_len);
 
-    // Free back an address when no longer in use
+  /* Free back an address when no longer in use */
 
-    void (*FreeAddress)(net_addr_t *addr);
+  void (*free_address)(net_addr_t *addr);
 
-    // Try to resolve a name to an address
+  /* Try to resolve a name to an address */
 
-    net_addr_t *(*ResolveAddress)(const char *addr);
+  net_addr_t *(*resolve_address)(const char *addr);
 };
 
-// net_addr_t
+/* net_addr_t */
 
 struct _net_addr_s
 {
-    net_module_t *module;
-    int refcount;
-    void *handle;
+  net_module_t *module;
+  int refcount;
+  void *handle;
 };
 
-// Magic number sent when connecting to check this is a valid client
-#define NET_MAGIC_NUMBER     1454104972U
+/* Supported protocols. If you're developing a fork of Chocolate
+ * Doom, you can add your own entry to this list while maintaining
+ * compatibility with Chocolate Doom servers. Higher-numbered enum values
+ * will be preferred when negotiating a protocol for the client and server
+ * to use, so the order matters.
+ * NOTE: The values in this enum do not have any special value outside of
+ * the program they're compiled in. What matters is the string
+ * representation.
+ */
 
-// Old magic number used by Chocolate Doom versions before v3.0:
-#define NET_OLD_MAGIC_NUMBER 3436803284U
-
-// header field value indicating that the packet is a reliable packet
-
-#define NET_RELIABLE_PACKET (1 << 15)
-
-// Supported protocols. If you're developing a fork of Chocolate
-// Doom, you can add your own entry to this list while maintaining
-// compatibility with Chocolate Doom servers. Higher-numbered enum values
-// will be preferred when negotiating a protocol for the client and server
-// to use, so the order matters.
-// NOTE: The values in this enum do not have any special value outside of
-// the program they're compiled in. What matters is the string representation.
 typedef enum
 {
-    // Protocol introduced with Chocolate Doom v3.0. Each compatibility-
-    // breaking change to the network protocol will produce a new protocol
-    // number in this enum.
-    NET_PROTOCOL_CHOCOLATE_DOOM_0,
+  /* Protocol introduced with Chocolate Doom v3.0. Each compatibility-
+   * breaking change to the network protocol will produce a new protocol
+   * number in this enum.
+   */
 
-    // Add your own protocol here; be sure to add a name for it to the list
-    // in net_common.c too.
+  NET_PROTOCOL_CHOCOLATE_DOOM_0,
 
-    NET_NUM_PROTOCOLS,
-    NET_PROTOCOL_UNKNOWN,
+  /* Add your own protocol here; be sure to add a name for it to the list
+   * in net_common.c too.
+   */
+
+  NET_NUM_PROTOCOLS,
+  NET_PROTOCOL_UNKNOWN,
 } net_protocol_t;
 
-// packet types
+/* packet types */
 
 typedef enum
 {
-    NET_PACKET_TYPE_SYN,
-    NET_PACKET_TYPE_ACK, // deprecated
-    NET_PACKET_TYPE_REJECTED,
-    NET_PACKET_TYPE_KEEPALIVE,
-    NET_PACKET_TYPE_WAITING_DATA,
-    NET_PACKET_TYPE_GAMESTART,
-    NET_PACKET_TYPE_GAMEDATA,
-    NET_PACKET_TYPE_GAMEDATA_ACK,
-    NET_PACKET_TYPE_DISCONNECT,
-    NET_PACKET_TYPE_DISCONNECT_ACK,
-    NET_PACKET_TYPE_RELIABLE_ACK,
-    NET_PACKET_TYPE_GAMEDATA_RESEND,
-    NET_PACKET_TYPE_CONSOLE_MESSAGE,
-    NET_PACKET_TYPE_QUERY,
-    NET_PACKET_TYPE_QUERY_RESPONSE,
-    NET_PACKET_TYPE_LAUNCH,
-    NET_PACKET_TYPE_NAT_HOLE_PUNCH,
+  NET_PACKET_TYPE_SYN,
+  NET_PACKET_TYPE_ACK, /* deprecated */
+  NET_PACKET_TYPE_REJECTED,
+  NET_PACKET_TYPE_KEEPALIVE,
+  NET_PACKET_TYPE_WAITING_DATA,
+  NET_PACKET_TYPE_GAMESTART,
+  NET_PACKET_TYPE_GAMEDATA,
+  NET_PACKET_TYPE_GAMEDATA_ACK,
+  NET_PACKET_TYPE_DISCONNECT,
+  NET_PACKET_TYPE_DISCONNECT_ACK,
+  NET_PACKET_TYPE_RELIABLE_ACK,
+  NET_PACKET_TYPE_GAMEDATA_RESEND,
+  NET_PACKET_TYPE_CONSOLE_MESSAGE,
+  NET_PACKET_TYPE_QUERY,
+  NET_PACKET_TYPE_QUERY_RESPONSE,
+  NET_PACKET_TYPE_LAUNCH,
+  NET_PACKET_TYPE_NAT_HOLE_PUNCH,
 } net_packet_type_t;
 
 typedef enum
 {
-    NET_MASTER_PACKET_TYPE_ADD,
-    NET_MASTER_PACKET_TYPE_ADD_RESPONSE,
-    NET_MASTER_PACKET_TYPE_QUERY,
-    NET_MASTER_PACKET_TYPE_QUERY_RESPONSE,
-    NET_MASTER_PACKET_TYPE_GET_METADATA,
-    NET_MASTER_PACKET_TYPE_GET_METADATA_RESPONSE,
-    NET_MASTER_PACKET_TYPE_SIGN_START,
-    NET_MASTER_PACKET_TYPE_SIGN_START_RESPONSE,
-    NET_MASTER_PACKET_TYPE_SIGN_END,
-    NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE,
-    NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH,
-    NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL,
+  NET_MASTER_PACKET_TYPE_ADD,
+  NET_MASTER_PACKET_TYPE_ADD_RESPONSE,
+  NET_MASTER_PACKET_TYPE_QUERY,
+  NET_MASTER_PACKET_TYPE_QUERY_RESPONSE,
+  NET_MASTER_PACKET_TYPE_GET_METADATA,
+  NET_MASTER_PACKET_TYPE_GET_METADATA_RESPONSE,
+  NET_MASTER_PACKET_TYPE_SIGN_START,
+  NET_MASTER_PACKET_TYPE_SIGN_START_RESPONSE,
+  NET_MASTER_PACKET_TYPE_SIGN_END,
+  NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE,
+  NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH,
+  NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL,
 } net_master_packet_type_t;
 
-// Settings specified when the client connects to the server.
+/* Settings specified when the client connects to the server. */
 
 typedef struct
 {
-    int gamemode;
-    int gamemission;
-    int lowres_turn;
-    int drone;
-    int max_players;
-    int is_freedoom;
-    sha1_digest_t wad_sha1sum;
-    sha1_digest_t deh_sha1sum;
-    int player_class;
+  int gamemode;
+  int gamemission;
+  int lowres_turn;
+  int drone;
+  int max_players;
+  int is_freedoom;
+  sha1_digest_t wad_sha1sum;
+  sha1_digest_t deh_sha1sum;
+  int player_class;
 } net_connect_data_t;
 
-// Game settings sent by client to server when initiating game start,
-// and received from the server by clients when the game starts.
+/* Game settings sent by client to server when initiating game start,
+ * and received from the server by clients when the game starts.
+ */
 
 typedef struct
 {
-    int ticdup;
-    int extratics;
-    int deathmatch;
-    int episode;
-    int nomonsters;
-    int fast_monsters;
-    int respawn_monsters;
-    int map;
-    int skill;
-    int gameversion;
-    int lowres_turn;
-    int new_sync;
-    int timelimit;
-    int loadgame;
-    int random;  // [Strife only]
+  int ticdup;
+  int extratics;
+  int deathmatch;
+  int episode;
+  int nomonsters;
+  int fast_monsters;
+  int respawn_monsters;
+  int map;
+  int skill;
+  int gameversion;
+  int lowres_turn;
+  int new_sync;
+  int timelimit;
+  int loadgame;
+  int random; /* [Strife only] */
 
-    // These fields are only used by the server when sending a game
-    // start message:
+  /* These fields are only used by the server when sending a game
+   * start message:
+   */
 
-    int num_players;
-    int consoleplayer;
+  int num_players;
+  int consoleplayer;
 
-    // Hexen player classes:
-
-    int player_classes[NET_MAXPLAYERS];
+  /* Hexen player classes: */
 
+  int player_classes[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 } net_gamesettings_t;
 
-#define NET_TICDIFF_FORWARD      (1 << 0)
-#define NET_TICDIFF_SIDE         (1 << 1)
-#define NET_TICDIFF_TURN         (1 << 2)
-#define NET_TICDIFF_BUTTONS      (1 << 3)
-#define NET_TICDIFF_CONSISTANCY  (1 << 4)
-#define NET_TICDIFF_CHATCHAR     (1 << 5)
-#define NET_TICDIFF_RAVEN        (1 << 6)
-#define NET_TICDIFF_STRIFE       (1 << 7)
-
 typedef struct
 {
-    unsigned int diff;
-    ticcmd_t cmd;
+  unsigned int diff;
+  ticcmd_t cmd;
 } net_ticdiff_t;
 
-// Complete set of ticcmds from all players
+/* Complete set of ticcmds from all players */
 
-typedef struct 
+typedef struct
 {
-    signed int latency;
-    unsigned int seq;
-    boolean playeringame[NET_MAXPLAYERS];
-    net_ticdiff_t cmds[NET_MAXPLAYERS];
+  signed int latency;
+  unsigned int seq;
+  boolean playeringame[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
+  net_ticdiff_t cmds[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 } net_full_ticcmd_t;
 
-// Data sent in response to server queries
+/* Data sent in response to server queries */
 
 typedef struct
 {
-    const char *version;
-    int server_state;
-    int num_players;
-    int max_players;
-    int gamemode;
-    int gamemission;
-    const char *description;
-    net_protocol_t protocol;
+  const char *version;
+  int server_state;
+  int num_players;
+  int max_players;
+  int gamemode;
+  int gamemission;
+  const char *description;
+  net_protocol_t protocol;
 } net_querydata_t;
 
-// Data sent by the server while waiting for the game to start.
+/* Data sent by the server while waiting for the game to start. */
 
 typedef struct
 {
-    int num_players;
-    int num_drones;
-    int ready_players;
-    int max_players;
-    int is_controller;
-    int consoleplayer;
-    char player_names[NET_MAXPLAYERS][MAXPLAYERNAME];
-    char player_addrs[NET_MAXPLAYERS][MAXPLAYERNAME];
-    sha1_digest_t wad_sha1sum;
-    sha1_digest_t deh_sha1sum;
-    int is_freedoom;
+  int num_players;
+  int num_drones;
+  int ready_players;
+  int max_players;
+  int is_controller;
+  int consoleplayer;
+  char player_names[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS]
+                   [CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME];
+  char player_addrs[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS]
+                   [CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME];
+  sha1_digest_t wad_sha1sum;
+  sha1_digest_t deh_sha1sum;
+  int is_freedoom;
 } net_waitdata_t;
 
-#endif /* #ifndef NET_DEFS_H */
+#endif /* NET_DEFS_H */
diff --git a/games/NXDoom/src/net_gui.c b/games/NXDoom/src/net_gui.c
index 0a73fa43c..f731693ca 100644
--- a/games/NXDoom/src/net_gui.c
+++ b/games/NXDoom/src/net_gui.c
@@ -1,26 +1,35 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Graphical stuff related to the networking code:
-//
-//  * The client waiting screen when we are waiting for the server to
-//    start the game.
-//   
+/****************************************************************************
+ * apps/games/NXDoom/src/net_gui.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Graphical stuff related to the networking code:
+ *
+ *  * The client waiting screen when we are waiting for the server to
+ *    start the game.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "config.h"
 #include "doomkeys.h"
@@ -38,397 +47,423 @@
 
 #include "textscreen.h"
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static txt_window_t *window;
 static int old_max_players;
-static txt_label_t *player_labels[NET_MAXPLAYERS];
-static txt_label_t *ip_labels[NET_MAXPLAYERS];
+static txt_label_t *player_labels[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
+static txt_label_t *ip_labels[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 static txt_label_t *drone_label;
 static txt_label_t *master_msg_label;
 static boolean had_warning;
 
-// Number of players we expect to be in the game. When the number is
-// reached, we auto-start the game (if we're the controller). If
-// zero, do not autostart.
+/* Number of players we expect to be in the game. When the number is
+ * reached, we auto-start the game (if we're the controller). If
+ * zero, do not autostart.
+ */
+
 static int expected_nodes;
 
-static void EscapePressed(TXT_UNCAST_ARG(widget), void *unused)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void escape_pressed(TXT_UNCAST_ARG(widget), void *unused)
 {
-    TXT_Shutdown();
-    I_Quit();
+  txt_shutdown();
+  i_quit();
 }
 
-static void StartGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+static void start_game(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
 {
-    NET_CL_LaunchGame();
+  net_cl_launch_game();
 }
 
-static void OpenWaitDialog(void)
+static void open_wait_dialog(void)
 {
-    txt_window_action_t *cancel;
+  txt_window_action_t *cancel;
 
-    TXT_SetDesktopTitle(PACKAGE_STRING);
+  txt_set_desktop_title(PACKAGE_STRING);
 
-    window = TXT_NewWindow("Waiting for game start...");
+  window = txt_new_window("Waiting for game start...");
 
-    TXT_AddWidget(window, TXT_NewLabel("\nPlease wait...\n\n"));
+  txt_add_widget(window, txt_new_label("\nPlease wait...\n\n"));
 
-    cancel = TXT_NewWindowAction(KEY_ESCAPE, "Cancel");
-    TXT_SignalConnect(cancel, "pressed", EscapePressed, NULL);
+  cancel = txt_new_window_action(KEY_ESCAPE, "Cancel");
+  txt_signal_connect(cancel, "pressed", escape_pressed, NULL);
 
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, cancel);
-    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_BOTTOM,
-                                  TXT_SCREEN_W / 2, TXT_SCREEN_H - 9);
+  txt_set_window_action(window, TXT_HORIZ_LEFT, cancel);
+  txt_set_window_position(window, TXT_HORIZ_CENTER, TXT_VERT_BOTTOM,
+                          TXT_SCREEN_W / 2, TXT_SCREEN_H - 9);
 
-    old_max_players = 0;
+  old_max_players = 0;
 }
 
-static void BuildWindow(void)
+static void build_window(void)
 {
-    char buf[50];
-    txt_table_t *table;
-    int i;
+  char buf[50];
+  txt_table_t *table;
+  int i;
 
-    TXT_ClearTable(window);
-    table = TXT_NewTable(3);
-    TXT_AddWidget(window, table);
+  txt_clear_table(window);
+  table = txt_new_table(3);
+  txt_add_widget(window, table);
 
-    // Add spacers
+  /* Add spacers */
 
-    TXT_AddWidget(table, NULL);
-    TXT_AddWidget(table, TXT_NewStrut(25, 1));
-    TXT_AddWidget(table, TXT_NewStrut(17, 1));
+  txt_add_widget(table, NULL);
+  txt_add_widget(table, txt_new_strut(25, 1));
+  txt_add_widget(table, txt_new_strut(17, 1));
 
-    // Player labels
+  /* Player labels */
 
-    for (i = 0; i < net_client_wait_data.max_players; ++i)
+  for (i = 0; i < net_client_wait_data.max_players; ++i)
     {
-        M_snprintf(buf, sizeof(buf), " %i. ", i + 1);
-        TXT_AddWidget(table, TXT_NewLabel(buf));
-        player_labels[i] = TXT_NewLabel("");
-        ip_labels[i] = TXT_NewLabel("");
-        TXT_AddWidget(table, player_labels[i]);
-        TXT_AddWidget(table, ip_labels[i]);
+      snprintf(buf, sizeof(buf), " %i. ", i + 1);
+      txt_add_widget(table, txt_new_label(buf));
+      player_labels[i] = txt_new_label("");
+      ip_labels[i] = txt_new_label("");
+      txt_add_widget(table, player_labels[i]);
+      txt_add_widget(table, ip_labels[i]);
     }
 
-    drone_label = TXT_NewLabel("");
+  drone_label = txt_new_label("");
 
-    TXT_AddWidget(window, drone_label);
+  txt_add_widget(window, drone_label);
 }
 
-static void UpdateGUI(void)
+static void update_gui(void)
 {
-    txt_window_action_t *startgame;
-    char buf[50];
-    unsigned int i;
+  txt_window_action_t *startgame;
+  char buf[50];
+  unsigned int i;
 
-    // If the value of max_players changes, we must rebuild the
-    // contents of the window. This includes when the first
-    // waiting data packet is received.
+  /* If the value of max_players changes, we must rebuild the
+   * contents of the window. This includes when the first
+   * waiting data packet is received.
+   */
 
-    if (net_client_received_wait_data)
+  if (net_client_received_wait_data)
     {
-        if (net_client_wait_data.max_players != old_max_players)
+      if (net_client_wait_data.max_players != old_max_players)
         {
-            BuildWindow();
+          build_window();
         }
     }
-    else
+  else
     {
-        return;
+      return;
     }
 
-    for (i = 0; i < net_client_wait_data.max_players; ++i)
+  for (i = 0; i < net_client_wait_data.max_players; ++i)
     {
-        txt_color_t color = TXT_COLOR_BRIGHT_WHITE;
+      txt_color_t color = TXT_COLOR_BRIGHT_WHITE;
 
-        if ((signed) i == net_client_wait_data.consoleplayer)
+      if ((signed)i == net_client_wait_data.consoleplayer)
         {
-            color = TXT_COLOR_YELLOW;
+          color = TXT_COLOR_YELLOW;
         }
 
-        TXT_SetFGColor(player_labels[i], color);
-        TXT_SetFGColor(ip_labels[i], color);
+      txt_set_fg_colour(player_labels[i], color);
+      txt_set_fg_colour(ip_labels[i], color);
 
-        if (i < net_client_wait_data.num_players)
+      if (i < net_client_wait_data.num_players)
         {
-            TXT_SetLabel(player_labels[i],
-                         net_client_wait_data.player_names[i]);
-            TXT_SetLabel(ip_labels[i],
-                         net_client_wait_data.player_addrs[i]);
+          txt_set_label(player_labels[i],
+                       net_client_wait_data.player_names[i]);
+          txt_set_label(ip_labels[i], net_client_wait_data.player_addrs[i]);
         }
-        else
+      else
         {
-            TXT_SetLabel(player_labels[i], "");
-            TXT_SetLabel(ip_labels[i], "");
+          txt_set_label(player_labels[i], "");
+          txt_set_label(ip_labels[i], "");
         }
     }
 
-    if (net_client_wait_data.num_drones > 0)
+  if (net_client_wait_data.num_drones > 0)
     {
-        M_snprintf(buf, sizeof(buf), " (+%i observer clients)",
-                   net_client_wait_data.num_drones);
-        TXT_SetLabel(drone_label, buf);
+      snprintf(buf, sizeof(buf), " (+%i observer clients)",
+               net_client_wait_data.num_drones);
+      txt_set_label(drone_label, buf);
     }
-    else
+  else
     {
-        TXT_SetLabel(drone_label, "");
+      txt_set_label(drone_label, "");
     }
 
-    if (net_client_wait_data.is_controller)
+  if (net_client_wait_data.is_controller)
     {
-        startgame = TXT_NewWindowAction(' ', "Start game");
-        TXT_SignalConnect(startgame, "pressed", StartGame, NULL);
+      startgame = txt_new_window_action(' ', "Start game");
+      txt_signal_connect(startgame, "pressed", start_game, NULL);
     }
-    else
+  else
     {
-        startgame = NULL;
+      startgame = NULL;
     }
 
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, startgame);
+  txt_set_window_action(window, TXT_HORIZ_RIGHT, startgame);
 }
 
-static void BuildMasterStatusWindow(void)
+static void build_master_status_window(void)
 {
-    txt_window_t *master_window;
+  txt_window_t *master_window;
 
-    master_window = TXT_NewWindow(NULL);
-    master_msg_label = TXT_NewLabel("");
-    TXT_AddWidget(master_window, master_msg_label);
+  master_window = txt_new_window(NULL);
+  master_msg_label = txt_new_label("");
+  txt_add_widget(master_window, master_msg_label);
 
-    // This window is here purely for information, so it should be
-    // in the background.
+  /* This window is here purely for information, so it should be
+   * in the background.
+   */
 
-    TXT_LowerWindow(master_window);
-    TXT_SetWindowPosition(master_window, TXT_HORIZ_CENTER, TXT_VERT_CENTER,
-                                         TXT_SCREEN_W / 2, TXT_SCREEN_H - 4);
-    TXT_SetWindowAction(master_window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(master_window, TXT_HORIZ_CENTER, NULL);
-    TXT_SetWindowAction(master_window, TXT_HORIZ_RIGHT, NULL);
+  txt_lower_window(master_window);
+  txt_set_window_position(master_window, TXT_HORIZ_CENTER, TXT_VERT_CENTER,
+                          TXT_SCREEN_W / 2, TXT_SCREEN_H - 4);
+  txt_set_window_action(master_window, TXT_HORIZ_LEFT, NULL);
+  txt_set_window_action(master_window, TXT_HORIZ_CENTER, NULL);
+  txt_set_window_action(master_window, TXT_HORIZ_RIGHT, NULL);
 }
 
-static void CheckMasterStatus(void)
+static void check_master_status(void)
 {
-    boolean added;
+  boolean added;
 
-    if (!NET_Query_CheckAddedToMaster(&added))
+  if (!net_query_check_added_to_master(&added))
     {
-        return;
+      return;
     }
 
-    if (master_msg_label == NULL)
+  if (master_msg_label == NULL)
     {
-        BuildMasterStatusWindow();
+      build_master_status_window();
     }
 
-    if (added)
+  if (added)
     {
-        TXT_SetLabel(master_msg_label,
-            "Your server is now registered with the global master server.\n"
-            "Other players can find your server online.");
+      txt_set_label(
+          master_msg_label,
+          "Your server is now registered with the global master server.\n"
+          "Other players can find your server online.");
     }
-    else
+  else
     {
-        TXT_SetLabel(master_msg_label,
-            "Failed to register with the master server. Your server is not\n"
-            "publicly accessible. You may need to reconfigure your Internet\n"
-            "router to add a port forward for UDP port 2342. Look up\n"
-            "information on port forwarding online.");
+      txt_set_label(
+          master_msg_label,
+          "Failed to register with the master server. Your server is not\n"
+          "publicly accessible. You may need to reconfigure your Internet\n"
+          "router to add a port forward for UDP port 2342. Look up\n"
+          "information on port forwarding online.");
     }
 }
 
-static void PrintSHA1Digest(const char *s, const byte *digest)
+static void print_sha1_digest(const char *s, const byte *digest)
 {
-    unsigned int i;
+  unsigned int i;
 
-    printf("%s: ", s);
+  printf("%s: ", s);
 
-    for (i=0; i<sizeof(sha1_digest_t); ++i)
+  for (i = 0; i < sizeof(sha1_digest_t); ++i)
     {
-        printf("%02x", digest[i]);
+      printf("%02x", digest[i]);
     }
 
-    printf("\n");
+  printf("\n");
 }
 
-static void CloseWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+static void close_window(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(p_window))
 {
-    TXT_CAST_ARG(txt_window_t, window);
+  TXT_CAST_ARG(txt_window_t, p_window);
 
-    TXT_CloseWindow(window);
+  txt_close_window(p_window);
 }
 
-static void CheckSHA1Sums(void)
+static void check_sha1_sums(void)
 {
-    boolean correct_wad, correct_deh;
-    boolean same_freedoom;
-    txt_window_t *window;
-    txt_window_action_t *cont_button;
+  boolean correct_wad;
+  boolean correct_deh;
+  boolean same_freedoom;
+  txt_window_t *l_window;
+  txt_window_action_t *cont_button;
 
-    if (!net_client_received_wait_data || had_warning)
+  if (!net_client_received_wait_data || had_warning)
     {
-        return;
+      return;
     }
 
-    correct_wad = memcmp(net_local_wad_sha1sum,
-                         net_client_wait_data.wad_sha1sum, 
-                         sizeof(sha1_digest_t)) == 0;
-    correct_deh = memcmp(net_local_deh_sha1sum,
-                         net_client_wait_data.deh_sha1sum, 
-                         sizeof(sha1_digest_t)) == 0;
-    same_freedoom = net_client_wait_data.is_freedoom == net_local_is_freedoom;
+  correct_wad =
+      memcmp(net_local_wad_sha1sum, net_client_wait_data.wad_sha1sum,
+             sizeof(sha1_digest_t)) == 0;
+  correct_deh =
+      memcmp(net_local_deh_sha1sum, net_client_wait_data.deh_sha1sum,
+             sizeof(sha1_digest_t)) == 0;
+  same_freedoom = net_client_wait_data.is_freedoom == net_local_is_freedoom;
 
-    if (correct_wad && correct_deh && same_freedoom)
+  if (correct_wad && correct_deh && same_freedoom)
     {
-        return;
+      return;
     }
 
-    if (!correct_wad)
+  if (!correct_wad)
     {
-        printf("Warning: WAD SHA1 does not match server:\n");
-        PrintSHA1Digest("Local", net_local_wad_sha1sum);
-        PrintSHA1Digest("Server", net_client_wait_data.wad_sha1sum);
+      printf("Warning: WAD SHA1 does not match server:\n");
+      print_sha1_digest("Local", net_local_wad_sha1sum);
+      print_sha1_digest("Server", net_client_wait_data.wad_sha1sum);
     }
 
-    if (!same_freedoom)
+  if (!same_freedoom)
     {
-        printf("Warning: Mixing Freedoom with non-Freedoom\n");
-        printf("Local: %u  Server: %i\n",
-               net_local_is_freedoom, 
-               net_client_wait_data.is_freedoom);
+      printf("Warning: Mixing Freedoom with non-Freedoom\n");
+      printf("Local: %u  Server: %i\n", net_local_is_freedoom,
+             net_client_wait_data.is_freedoom);
     }
 
-    if (!correct_deh)
+  if (!correct_deh)
     {
-        printf("Warning: Dehacked SHA1 does not match server:\n");
-        PrintSHA1Digest("Local", net_local_deh_sha1sum);
-        PrintSHA1Digest("Server", net_client_wait_data.deh_sha1sum);
+      printf("Warning: Dehacked SHA1 does not match server:\n");
+      print_sha1_digest("Local", net_local_deh_sha1sum);
+      print_sha1_digest("Server", net_client_wait_data.deh_sha1sum);
     }
 
-    window = TXT_NewWindow("WARNING!");
+  l_window = txt_new_window("WARNING!");
 
-    cont_button = TXT_NewWindowAction(KEY_ENTER, "Continue");
-    TXT_SignalConnect(cont_button, "pressed", CloseWindow, window);
+  cont_button = txt_new_window_action(KEY_ENTER, "Continue");
+  txt_signal_connect(cont_button, "pressed", close_window, l_window);
 
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, cont_button);
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+  txt_set_window_action(l_window, TXT_HORIZ_LEFT, NULL);
+  txt_set_window_action(l_window, TXT_HORIZ_CENTER, cont_button);
+  txt_set_window_action(l_window, TXT_HORIZ_RIGHT, NULL);
 
-    if (!same_freedoom)
+  if (!same_freedoom)
     {
-        // If Freedoom and Doom IWADs are mixed, the WAD directory
-        // will be wrong, but this is not neccessarily a problem.
-        // Display a different message to the WAD directory message.
+      /* If Freedoom and Doom IWADs are mixed, the WAD directory
+       * will be wrong, but this is not necessarily a problem.
+       * Display a different message to the WAD directory message.
+       */
 
-        if (net_local_is_freedoom)
+      if (net_local_is_freedoom)
         {
-            TXT_AddWidget(window, TXT_NewLabel
-            ("You are using the Freedoom IWAD to play with players\n"
-             "using an official Doom IWAD.  Make sure that you are\n"
-             "playing the same levels as other players.\n"));
+          txt_add_widget(
+              l_window,
+              txt_new_label(
+                  "You are using the Freedoom IWAD to play with players\n"
+                  "using an official Doom IWAD.  Make sure that you are\n"
+                  "playing the same levels as other players.\n"));
         }
-        else
+      else
         {
-            TXT_AddWidget(window, TXT_NewLabel
-            ("You are using an official IWAD to play with players\n"
-             "using the Freedoom IWAD.  Make sure that you are\n"
-             "playing the same levels as other players.\n"));
+          txt_add_widget(
+              l_window,
+              txt_new_label(
+                  "You are using an official IWAD to play with players\n"
+                  "using the Freedoom IWAD.  Make sure that you are\n"
+                  "playing the same levels as other players.\n"));
         }
     }
-    else if (!correct_wad)
+  else if (!correct_wad)
     {
-        TXT_AddWidget(window, TXT_NewLabel
-            ("Your WAD directory does not match other players in the game.\n"
-             "Check that you have loaded the exact same WAD files as other\n"
-             "players.\n"));
+      txt_add_widget(
+        l_window,
+        txt_new_label(
+        "Your WAD directory does not match other players in the game.\n"
+        "Check that you have loaded the exact same WAD files as other\n"
+        "players.\n")
+      );
     }
 
-    if (!correct_deh)
+  if (!correct_deh)
     {
-        TXT_AddWidget(window, TXT_NewLabel
-            ("Your dehacked signature does not match other players in the\n"
-             "game.  Check that you have loaded the same dehacked patches\n"
-             "as other players.\n"));
+      txt_add_widget(
+          l_window,
+          txt_new_label(
+              "Your dehacked signature does not match other players in the\n"
+              "game.  Check that you have loaded the same dehacked patches\n"
+              "as other players.\n"));
     }
 
-    TXT_AddWidget(window, TXT_NewLabel
-            ("If you continue, this may cause your game to desync."));
+  txt_add_widget(
+      l_window,
+      txt_new_label("If you continue, this may cause your game to desync."));
 
-    had_warning = true;
+  had_warning = true;
 }
 
-static void ParseCommandLineArgs(void)
+static void parse_command_line_args(void)
 {
-    int i;
+  int i;
 
-    //!
-    // @arg <n>
-    // @category net
-    //
-    // Autostart the netgame when n nodes (clients) have joined the server.
-    //
+  /* @arg <n>
+   * @category net
+   *
+   * Autostart the netgame when n nodes (clients) have joined the server.
+   */
 
-    i = M_CheckParmWithArgs("-nodes", 1);
-    if (i > 0)
+  i = m_check_parm_with_args("-nodes", 1);
+  if (i > 0)
     {
-        expected_nodes = atoi(myargv[i + 1]);
+      expected_nodes = atoi(myargv[i + 1]);
     }
 }
 
-static void CheckAutoLaunch(void)
+static void check_auto_latch(void)
 {
-    int nodes;
+  int nodes;
 
-    if (net_client_received_wait_data
-     && net_client_wait_data.is_controller
-     && expected_nodes > 0)
+  if (net_client_received_wait_data && net_client_wait_data.is_controller &&
+      expected_nodes > 0)
     {
-        nodes = net_client_wait_data.num_players
-              + net_client_wait_data.num_drones;
+      nodes =
+          net_client_wait_data.num_players + net_client_wait_data.num_drones;
 
-        if (nodes >= expected_nodes)
+      if (nodes >= expected_nodes)
         {
-            StartGame(NULL, NULL);
-            expected_nodes = 0;
+          start_game(NULL, NULL);
+          expected_nodes = 0;
         }
     }
 }
 
-void NET_WaitForLaunch(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void net_wait_for_launch(void)
 {
-    if (!TXT_Init())
+  if (!txt_init())
     {
-        fprintf(stderr, "Failed to initialize GUI\n");
-        exit(-1);
+      fprintf(stderr, "Failed to initialize GUI\n");
+      exit(-1);
     }
 
-    TXT_SetColor(TXT_COLOR_BLUE, 0x04, 0x14, 0x40); // Romero's "funky blue" color
-    
-    I_InitWindowIcon();
+  /* Romero's "funky blue" color */
 
-    ParseCommandLineArgs();
-    OpenWaitDialog();
-    had_warning = false;
+  txt_set_colour(TXT_COLOR_BLUE, 0x04, 0x14, 0x40);
 
-    while (net_waiting_for_launch)
+  parse_command_line_args();
+  open_wait_dialog();
+  had_warning = false;
+
+  while (net_waiting_for_launch)
     {
-        UpdateGUI();
-        CheckAutoLaunch();
-        CheckSHA1Sums();
-        CheckMasterStatus();
+      update_gui();
+      check_auto_latch();
+      check_sha1_sums();
+      check_master_status();
 
-        TXT_DispatchEvents();
-        TXT_DrawDesktop();
+      txt_dispatch_events();
+      txt_draw_desktop();
 
-        NET_CL_Run();
-        NET_SV_Run();
+      net_cl_run();
+      net_sv_run();
 
-        if (!net_client_connected)
+      if (!net_client_connected)
         {
-            I_Error("Lost connection to server");
+          i_error("Lost connection to server");
         }
 
-        TXT_Sleep(100);
+      txt_sleep(100);
     }
 
-    TXT_Shutdown();
+  txt_shutdown();
 }
diff --git a/games/NXDoom/src/net_gui.h b/games/NXDoom/src/net_gui.h
index 4f4198b60..377b6646c 100644
--- a/games/NXDoom/src/net_gui.h
+++ b/games/NXDoom/src/net_gui.h
@@ -1,29 +1,40 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Graphical stuff related to the networking code:
-//
-//  * The client waiting screen when we are waiting for the server to
-//    start the game.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/net_gui.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Graphical stuff related to the networking code:
+ *
+ *  * The client waiting screen when we are waiting for the server to
+ *    start the game.
+ *
+ ****************************************************************************/
 
 #ifndef NET_GUI_H
 #define NET_GUI_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-extern void NET_WaitForLaunch(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef NET_GUI_H */
+extern void net_wait_for_launch(void);
 
+#endif /* NET_GUI_H */
diff --git a/games/NXDoom/src/net_io.c b/games/NXDoom/src/net_io.c
index 02519afe2..0c9c4a4fb 100644
--- a/games/NXDoom/src/net_io.c
+++ b/games/NXDoom/src/net_io.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Network packet I/O.  Base layer for sending/receiving packets,
-//     through the network module system
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_io.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Network packet I/O.  Base layer for sending/receiving packets,
+ *   through the network module system
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
@@ -23,125 +32,139 @@
 #include "net_io.h"
 #include "z_zone.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define MAX_MODULES 16
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 struct _net_context_s
 {
-    net_module_t *modules[MAX_MODULES];
-    int num_modules;
+  net_module_t *modules[MAX_MODULES];
+  int num_modules;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 net_addr_t net_broadcast_addr;
 
-net_context_t *NET_NewContext(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+net_context_t *net_new_context(void)
 {
-    net_context_t *context;
+  net_context_t *context;
 
-    context = Z_Malloc(sizeof(net_context_t), PU_STATIC, 0);
-    context->num_modules = 0;
+  context = z_malloc(sizeof(net_context_t), PU_STATIC, 0);
+  context->num_modules = 0;
 
-    return context;
+  return context;
 }
 
-void NET_AddModule(net_context_t *context, net_module_t *module)
+void net_add_module(net_context_t *context, net_module_t *module)
 {
-    if (context->num_modules >= MAX_MODULES)
+  if (context->num_modules >= MAX_MODULES)
     {
-        I_Error("NET_AddModule: No more modules for context");
+      i_error("net_add_module: No more modules for context");
     }
-    
-    context->modules[context->num_modules] = module;
-    ++context->num_modules;
+
+  context->modules[context->num_modules] = module;
+  ++context->num_modules;
 }
 
-net_addr_t *NET_ResolveAddress(net_context_t *context, const char *addr)
+net_addr_t *net_resolve_address(net_context_t *context, const char *addr)
 {
-    int i;
-    net_addr_t *result;
+  int i;
+  net_addr_t *result;
 
-    for (i=0; i<context->num_modules; ++i)
+  for (i = 0; i < context->num_modules; ++i)
     {
-        result = context->modules[i]->ResolveAddress(addr);
+      result = context->modules[i]->resolve_address(addr);
 
-        if (result != NULL)
+      if (result != NULL)
         {
-            NET_ReferenceAddress(result);
-            return result;
+          net_reference_address(result);
+          return result;
         }
     }
 
-    return NULL;
+  return NULL;
 }
 
-void NET_SendPacket(net_addr_t *addr, net_packet_t *packet)
+void net_send_packet(net_addr_t *addr, net_packet_t *packet)
 {
-    addr->module->SendPacket(addr, packet);
+  addr->module->send_packet(addr, packet);
 }
 
-void NET_SendBroadcast(net_context_t *context, net_packet_t *packet)
+void net_send_broadcast(net_context_t *context, net_packet_t *packet)
 {
-    int i;
+  int i;
 
-    for (i=0; i<context->num_modules; ++i)
+  for (i = 0; i < context->num_modules; ++i)
     {
-        context->modules[i]->SendPacket(&net_broadcast_addr, packet);
+      context->modules[i]->send_packet(&net_broadcast_addr, packet);
     }
 }
 
-boolean NET_RecvPacket(net_context_t *context, 
-                       net_addr_t **addr, 
+boolean net_recv_packet(net_context_t *context, net_addr_t **addr,
                        net_packet_t **packet)
 {
-    int i;
-    
-    // check all modules for new packets
-    
-    for (i=0; i<context->num_modules; ++i)
+  int i;
+
+  /* check all modules for new packets */
+
+  for (i = 0; i < context->num_modules; ++i)
     {
-        if (context->modules[i]->RecvPacket(addr, packet))
+      if (context->modules[i]->recv_packet(addr, packet))
         {
-            NET_ReferenceAddress(*addr);
-            return true;
+          net_reference_address(*addr);
+          return true;
         }
     }
 
-    return false;
+  return false;
 }
 
-// Note: this prints into a static buffer, calling again overwrites
-// the first result
+/* Note: this prints into a static buffer, calling again overwrites
+ * the first result
+ */
 
-char *NET_AddrToString(net_addr_t *addr)
+char *net_addr_to_string(net_addr_t *addr)
 {
-    static char buf[128];
+  static char buf[128];
 
-    addr->module->AddrToString(addr, buf, sizeof(buf) - 1);
+  addr->module->addr_to_string(addr, buf, sizeof(buf) - 1);
 
-    return buf;
+  return buf;
 }
 
-void NET_ReferenceAddress(net_addr_t *addr)
+void net_reference_address(net_addr_t *addr)
 {
-    if (addr == NULL)
+  if (addr == NULL)
     {
-        return;
-    }
-    ++addr->refcount;
-    //printf("%s: +refcount=%d\n", NET_AddrToString(addr), addr->refcount);
-}
-
-void NET_ReleaseAddress(net_addr_t *addr)
-{
-    if (addr == NULL)
-    {
-        return;
+      return;
     }
 
-    --addr->refcount;
-    //printf("%s: -refcount=%d\n", NET_AddrToString(addr), addr->refcount);
-    if (addr->refcount <= 0)
-    {
-        addr->module->FreeAddress(addr);
-    }
+  ++addr->refcount;
 }
 
+void net_release_address(net_addr_t *addr)
+{
+  if (addr == NULL)
+    {
+      return;
+    }
+
+  --addr->refcount;
+  if (addr->refcount <= 0)
+    {
+      addr->module->free_address(addr);
+    }
+}
diff --git a/games/NXDoom/src/net_io.h b/games/NXDoom/src/net_io.h
index d61a1eb3d..d83d3ace3 100644
--- a/games/NXDoom/src/net_io.h
+++ b/games/NXDoom/src/net_io.h
@@ -1,61 +1,90 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Network packet manipulation (net_packet_t)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_io.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *      Network packet manipulation (net_packet_t)
+ *
+ ****************************************************************************/
 
 #ifndef NET_IO_H
 #define NET_IO_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "net_defs.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern net_addr_t net_broadcast_addr;
 
-// Create a new network context.
-net_context_t *NET_NewContext(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Add a network module to a context.
-void NET_AddModule(net_context_t *context, net_module_t *module);
+/* Create a new network context. */
 
-// Send a packet to the given address.
-void NET_SendPacket(net_addr_t *addr, net_packet_t *packet);
+net_context_t *net_new_context(void);
 
-// Send a broadcast using all modules in the given context.
-void NET_SendBroadcast(net_context_t *context, net_packet_t *packet);
+/* Add a network module to a context. */
 
-// Check all modules in the given context and receive a packet, returning true
-// if a packet was received. The result is stored in *packet and the source is
-// stored in *addr, with an implicit reference added. The packet must be freed
-// by the caller and the reference releasd.
-boolean NET_RecvPacket(net_context_t *context, net_addr_t **addr,
-                       net_packet_t **packet);
+void net_add_module(net_context_t *context, net_module_t *module);
 
-// Return a string representation of the given address. The result points to a
-// static buffer and will become invalid with the next call.
-char *NET_AddrToString(net_addr_t *addr);
+/* Send a packet to the given address. */
 
-// Add a reference to the given address.
-void NET_ReferenceAddress(net_addr_t *addr);
+void net_send_packet(net_addr_t *addr, net_packet_t *packet);
 
-// Release a reference to the given address. When there are no more references,
-// the address will be freed.
-void NET_ReleaseAddress(net_addr_t *addr);
+/* Send a broadcast using all modules in the given context. */
 
-// Resolve a string representation of an address. If successful, a net_addr_t
-// pointer is received with an implicit reference that must be freed by the
-// caller when it is no longer needed.
-net_addr_t *NET_ResolveAddress(net_context_t *context, const char *address);
+void net_send_broadcast(net_context_t *context, net_packet_t *packet);
 
-#endif  /* #ifndef NET_IO_H */
+/* Check all modules in the given context and receive a packet, returning
+ * true if a packet was received. The result is stored in *packet and the
+ * source is stored in *addr, with an implicit reference added. The packet
+ * must be freed by the caller and the reference released.
+ */
 
+boolean net_recv_packet(net_context_t *context, net_addr_t **addr,
+                        net_packet_t **packet);
+
+/* Return a string representation of the given address. The result points
+ * to a static buffer and will become invalid with the next call.
+ */
+
+char *net_addr_to_string(net_addr_t *addr);
+
+/* Add a reference to the given address. */
+
+void net_reference_address(net_addr_t *addr);
+
+/* Release a reference to the given address. When there are no more
+ * references, the address will be freed.
+ */
+
+void net_release_address(net_addr_t *addr);
+
+/* Resolve a string representation of an address. If successful, a net_addr_t
+ * pointer is received with an implicit reference that must be freed by the
+ * caller when it is no longer needed.
+ */
+
+net_addr_t *net_resolve_address(net_context_t *context, const char *address);
+
+#endif /* NET_IO_H */
diff --git a/games/NXDoom/src/net_loop.c b/games/NXDoom/src/net_loop.c
index 65140fa3b..d31d29cfc 100644
--- a/games/NXDoom/src/net_loop.c
+++ b/games/NXDoom/src/net_loop.c
@@ -1,19 +1,28 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Loopback network module for server compiled into the client
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_loop.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Loopback network module for server compiled into the client
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,207 +34,239 @@
 #include "net_loop.h"
 #include "net_packet.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define MAX_QUEUE_SIZE 16
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct
 {
-    net_packet_t *packets[MAX_QUEUE_SIZE];
-    int head, tail;
+  net_packet_t *packets[MAX_QUEUE_SIZE];
+  int head;
+  int tail;
 } packet_queue_t;
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static packet_queue_t client_queue;
 static packet_queue_t server_queue;
 static net_addr_t client_addr;
 static net_addr_t server_addr;
 
-static void QueueInit(packet_queue_t *queue)
-{
-    queue->head = queue->tail = 0;
-}
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-static void QueuePush(packet_queue_t *queue, net_packet_t *packet)
-{
-    int new_tail;
+static boolean net_cl_init_client(void);
+static boolean net_cl_init_server(void);
+static void net_cl_send_packet(net_addr_t *addr, net_packet_t *packet);
+static boolean net_cl_recv_packet(net_addr_t **addr, net_packet_t **packet);
+static void net_cl_addr_to_string(net_addr_t *addr, char *buffer,
+                                  int buffer_len);
+static void net_cl_free_address(net_addr_t *addr);
+static net_addr_t *net_cl_resolve_address(const char *address);
 
-    new_tail = (queue->tail + 1) % MAX_QUEUE_SIZE;
+static boolean net_sv_init_client(void);
+static boolean net_sv_init_server(void);
+static void net_sv_send_packet(net_addr_t *addr, net_packet_t *packet);
+static boolean net_sv_recv_packet(net_addr_t **addr, net_packet_t **packet);
+static void net_sv_addr_to_string(net_addr_t *addr, char *buffer,
+                                  int buffer_len);
+static void net_sv_free_address(net_addr_t *addr);
+static net_addr_t *net_sv_resolve_address(const char *address);
 
-    if (new_tail == queue->head)
-    {
-        // queue is full
-        
-        return;
-    }
-
-    queue->packets[queue->tail] = packet;
-    queue->tail = new_tail;
-}
-
-static net_packet_t *QueuePop(packet_queue_t *queue)
-{
-    net_packet_t *packet;
-    
-    if (queue->tail == queue->head)
-    {
-        // queue empty
-
-        return NULL;
-    }
-
-    packet = queue->packets[queue->head];
-    queue->head = (queue->head + 1) % MAX_QUEUE_SIZE;
-
-    return packet;
-}
-
-//-----------------------------------------------------------------------------
-//
-// Client end code
-//
-//-----------------------------------------------------------------------------
-
-static boolean NET_CL_InitClient(void)
-{
-    QueueInit(&client_queue);
-
-    return true;
-}
-
-static boolean NET_CL_InitServer(void)
-{
-    I_Error("NET_CL_InitServer: attempted to initialize client pipe end as a server!");
-    return false;
-}
-
-static void NET_CL_SendPacket(net_addr_t *addr, net_packet_t *packet)
-{
-    QueuePush(&server_queue, NET_PacketDup(packet));
-}
-
-static boolean NET_CL_RecvPacket(net_addr_t **addr, net_packet_t **packet)
-{
-    net_packet_t *popped;
-
-    popped = QueuePop(&client_queue);
-
-    if (popped != NULL)
-    {
-        *packet = popped;
-        *addr = &client_addr;
-        client_addr.module = &net_loop_client_module;
-        
-        return true;
-    }
-
-    return false;
-}
-
-static void NET_CL_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
-{
-    M_snprintf(buffer, buffer_len, "local server");
-}
-
-static void NET_CL_FreeAddress(net_addr_t *addr)
-{
-}
-
-static net_addr_t *NET_CL_ResolveAddress(const char *address)
-{
-    if (address == NULL)
-    {
-        client_addr.module = &net_loop_client_module;
-
-        return &client_addr;
-    }
-    else
-    {
-        return NULL;
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 net_module_t net_loop_client_module =
 {
-    NET_CL_InitClient,
-    NET_CL_InitServer,
-    NET_CL_SendPacket,
-    NET_CL_RecvPacket,
-    NET_CL_AddrToString,
-    NET_CL_FreeAddress,
-    NET_CL_ResolveAddress,
+  net_cl_init_client,     net_cl_init_server,    net_cl_send_packet,
+  net_cl_recv_packet,     net_cl_addr_to_string, net_cl_free_address,
+  net_cl_resolve_address,
 };
 
-//-----------------------------------------------------------------------------
-//
-// Server end code
-//
-//-----------------------------------------------------------------------------
-
-static boolean NET_SV_InitClient(void)
-{
-    I_Error("NET_SV_InitClient: attempted to initialize server pipe end as a client!");
-    return false;
-}
-
-static boolean NET_SV_InitServer(void)
-{
-    QueueInit(&server_queue);
-
-    return true;
-}
-
-static void NET_SV_SendPacket(net_addr_t *addr, net_packet_t *packet)
-{
-    QueuePush(&client_queue, NET_PacketDup(packet));
-}
-
-static boolean NET_SV_RecvPacket(net_addr_t **addr, net_packet_t **packet)
-{
-    net_packet_t *popped;
-
-    popped = QueuePop(&server_queue);
-
-    if (popped != NULL)
-    {
-        *packet = popped;
-        *addr = &server_addr;
-        server_addr.module = &net_loop_server_module;
-        
-        return true;
-    }
-
-    return false;
-}
-
-static void NET_SV_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
-{
-    M_snprintf(buffer, buffer_len, "local client");
-}
-
-static void NET_SV_FreeAddress(net_addr_t *addr)
-{
-}
-
-static net_addr_t *NET_SV_ResolveAddress(const char *address)
-{
-    if (address == NULL)
-    {
-        server_addr.module = &net_loop_server_module;
-        return &server_addr;
-    }
-    else
-    {
-        return NULL;
-    }
-}
-
 net_module_t net_loop_server_module =
 {
-    NET_SV_InitClient,
-    NET_SV_InitServer,
-    NET_SV_SendPacket,
-    NET_SV_RecvPacket,
-    NET_SV_AddrToString,
-    NET_SV_FreeAddress,
-    NET_SV_ResolveAddress,
+  net_sv_init_client,     net_sv_init_server,    net_sv_send_packet,
+  net_sv_recv_packet,     net_sv_addr_to_string, net_sv_free_address,
+  net_sv_resolve_address,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
+static void queue_init(packet_queue_t *queue)
+{
+  queue->head = queue->tail = 0;
+}
+
+static void queue_push(packet_queue_t *queue, net_packet_t *packet)
+{
+  int new_tail;
+
+  new_tail = (queue->tail + 1) % MAX_QUEUE_SIZE;
+
+  if (new_tail == queue->head)
+    {
+      /* queue is full */
+
+      return;
+    }
+
+  queue->packets[queue->tail] = packet;
+  queue->tail = new_tail;
+}
+
+static net_packet_t *queue_pop(packet_queue_t *queue)
+{
+  net_packet_t *packet;
+
+  if (queue->tail == queue->head)
+    {
+      /* queue empty */
+
+      return NULL;
+    }
+
+  packet = queue->packets[queue->head];
+  queue->head = (queue->head + 1) % MAX_QUEUE_SIZE;
+
+  return packet;
+}
+
+/****************************************************************************
+ * Client-end code
+ ****************************************************************************/
+
+static boolean net_cl_init_client(void)
+{
+  queue_init(&client_queue);
+
+  return true;
+}
+
+static boolean net_cl_init_server(void)
+{
+  i_error("NET_CL_init_server: attempted to initialize client pipe end as a "
+          "server!");
+  return false;
+}
+
+static void net_cl_send_packet(net_addr_t *addr, net_packet_t *packet)
+{
+  queue_push(&server_queue, net_packet_dup(packet));
+}
+
+static boolean net_cl_recv_packet(net_addr_t **addr, net_packet_t **packet)
+{
+  net_packet_t *popped;
+
+  popped = queue_pop(&client_queue);
+
+  if (popped != NULL)
+    {
+      *packet = popped;
+      *addr = &client_addr;
+      client_addr.module = &net_loop_client_module;
+
+      return true;
+    }
+
+  return false;
+}
+
+static void net_cl_addr_to_string(net_addr_t *addr, char *buffer,
+                                  int buffer_len)
+{
+  snprintf(buffer, buffer_len, "local server");
+}
+
+static void net_cl_free_address(net_addr_t *addr)
+{
+}
+
+static net_addr_t *net_cl_resolve_address(const char *address)
+{
+  if (address == NULL)
+    {
+      client_addr.module = &net_loop_client_module;
+
+      return &client_addr;
+    }
+  else
+    {
+      return NULL;
+    }
+}
+
+/****************************************************************************
+ * Server-end code
+ ****************************************************************************/
+
+static boolean net_sv_init_client(void)
+{
+  i_error("net_sv_initClient: attempted to initialize server pipe end as a "
+          "client!");
+  return false;
+}
+
+static boolean net_sv_init_server(void)
+{
+  queue_init(&server_queue);
+  return true;
+}
+
+static void net_sv_send_packet(net_addr_t *addr, net_packet_t *packet)
+{
+  queue_push(&client_queue, net_packet_dup(packet));
+}
+
+static boolean net_sv_recv_packet(net_addr_t **addr, net_packet_t **packet)
+{
+  net_packet_t *popped;
+
+  popped = queue_pop(&server_queue);
+
+  if (popped != NULL)
+    {
+      *packet = popped;
+      *addr = &server_addr;
+      server_addr.module = &net_loop_server_module;
+
+      return true;
+    }
+
+  return false;
+}
+
+static void net_sv_addr_to_string(net_addr_t *addr, char *buffer,
+                                  int buffer_len)
+{
+  snprintf(buffer, buffer_len, "local client");
+}
+
+static void net_sv_free_address(net_addr_t *addr)
+{
+}
+
+static net_addr_t *net_sv_resolve_address(const char *address)
+{
+  if (address == NULL)
+    {
+      server_addr.module = &net_loop_server_module;
+      return &server_addr;
+    }
+  else
+    {
+      return NULL;
+    }
+}
diff --git a/games/NXDoom/src/net_loop.h b/games/NXDoom/src/net_loop.h
index 5a2e58ee1..222660ffc 100644
--- a/games/NXDoom/src/net_loop.h
+++ b/games/NXDoom/src/net_loop.h
@@ -1,27 +1,39 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Loopback network module for server compiled into the client
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_loop.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Loopback network module for server compiled into the client
+ *
+ ****************************************************************************/
 
 #ifndef NET_LOOP_H
 #define NET_LOOP_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "net_defs.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern net_module_t net_loop_client_module;
 extern net_module_t net_loop_server_module;
 
-#endif /* #ifndef NET_LOOP_H */
-
+#endif /* NET_LOOP_H */
diff --git a/games/NXDoom/src/net_packet.c b/games/NXDoom/src/net_packet.c
index 23bfda675..d7a57e1e2 100644
--- a/games/NXDoom/src/net_packet.c
+++ b/games/NXDoom/src/net_packet.c
@@ -1,328 +1,357 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Network packet manipulation (net_packet_t)
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_packet.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *      Network packet manipulation (net_packet_t)
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "net_packet.h"
+#include "m_misc.h"
+#include "z_zone.h"
 #include <ctype.h>
 #include <string.h>
-#include "m_misc.h"
-#include "net_packet.h"
-#include "z_zone.h"
 
-static int total_packet_memory = 0;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-net_packet_t *NET_NewPacket(int initial_size)
+static int g_total_packet_memory = 0;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Dynamically increases the size of a packet */
+
+static void net_increase_packet(net_packet_t *packet)
 {
-    net_packet_t *packet;
+  byte *newdata;
 
-    packet = (net_packet_t *) Z_Malloc(sizeof(net_packet_t), PU_STATIC, 0);
-    
-    if (initial_size == 0)
-        initial_size = 256;
+  g_total_packet_memory -= packet->alloced;
 
-    packet->alloced = initial_size;
-    packet->data = Z_Malloc(initial_size, PU_STATIC, 0);
-    packet->len = 0;
-    packet->pos = 0;
+  packet->alloced *= 2;
 
-    total_packet_memory += sizeof(net_packet_t) + initial_size;
+  newdata = z_malloc(packet->alloced, PU_STATIC, 0);
 
-    //printf("total packet memory: %i bytes\n", total_packet_memory);
-    //printf("%p: allocated\n", packet);
+  memcpy(newdata, packet->data, packet->len);
 
-    return packet;
+  z_free(packet->data);
+  packet->data = newdata;
+
+  g_total_packet_memory += packet->alloced;
 }
 
-// duplicates an existing packet
-
-net_packet_t *NET_PacketDup(net_packet_t *packet)
+#if 0 /* Unused */
+static boolean net_read_sint32(net_packet_t *packet, signed int *data)
 {
-    net_packet_t *newpacket;
-
-    newpacket = NET_NewPacket(packet->len);
-    memcpy(newpacket->data, packet->data, packet->len);
-    newpacket->len = packet->len;
-
-    return newpacket;
-}
-
-void NET_FreePacket(net_packet_t *packet)
-{
-    //printf("%p: destroyed\n", packet);
-    
-    total_packet_memory -= sizeof(net_packet_t) + packet->alloced;
-    Z_Free(packet->data);
-    Z_Free(packet);
-}
-
-// Read a byte from the packet, returning true if read
-// successfully
-
-boolean NET_ReadInt8(net_packet_t *packet, unsigned int *data)
-{
-    if (packet->pos + 1 > packet->len)
-        return false;
-
-    *data = packet->data[packet->pos];
-
-    packet->pos += 1;
-
-    return true;
-}
-
-// Read a 16-bit integer from the packet, returning true if read
-// successfully
-
-boolean NET_ReadInt16(net_packet_t *packet, unsigned int *data)
-{
-    byte *p;
-
-    if (packet->pos + 2 > packet->len)
-        return false;
-
-    p = packet->data + packet->pos;
-
-    *data = (p[0] << 8) | p[1];
-    packet->pos += 2;
-
-    return true;
-}
-
-// Read a 32-bit integer from the packet, returning true if read
-// successfully
-
-boolean NET_ReadInt32(net_packet_t *packet, unsigned int *data)
-{
-    byte *p;
-
-    if (packet->pos + 4 > packet->len)
-        return false;
-
-    p = packet->data + packet->pos;
-
-    *data = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-    packet->pos += 4;
-    
-    return true;
-}
-
-// Signed read functions
-
-boolean NET_ReadSInt8(net_packet_t *packet, signed int *data)
-{
-    if (NET_ReadInt8(packet,(unsigned int *) data))
+  if (net_read_int32(packet, (unsigned int *)data))
     {
-        if (*data & (1 << 7))
+      if (*data & (1U << 31))
         {
-            *data &= ~(1 << 7);
-            *data -= (1 << 7);
+          *data &= ~(1U << 31);
+          *data -= (1U << 31);
         }
-        return true;
+
+      return true;
     }
-    else
+  else
     {
-        return false;
+      return false;
     }
 }
+#endif
 
-boolean NET_ReadSInt16(net_packet_t *packet, signed int *data)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+net_packet_t *net_new_packet(int initial_size)
 {
-    if (NET_ReadInt16(packet, (unsigned int *) data))
+  net_packet_t *packet;
+
+  packet = (net_packet_t *)z_malloc(sizeof(net_packet_t), PU_STATIC, 0);
+
+  if (initial_size == 0) initial_size = 256;
+
+  packet->alloced = initial_size;
+  packet->data = z_malloc(initial_size, PU_STATIC, 0);
+  packet->len = 0;
+  packet->pos = 0;
+
+  g_total_packet_memory += sizeof(net_packet_t) + initial_size;
+
+  /* printf("total packet memory: %i bytes\n", total_packet_memory);
+   * printf("%p: allocated\n", packet);
+   */
+
+  return packet;
+}
+
+/* duplicates an existing packet */
+
+net_packet_t *net_packet_dup(net_packet_t *packet)
+{
+  net_packet_t *newpacket;
+
+  newpacket = net_new_packet(packet->len);
+  memcpy(newpacket->data, packet->data, packet->len);
+  newpacket->len = packet->len;
+
+  return newpacket;
+}
+
+void net_free_packet(net_packet_t *packet)
+{
+  /* printf("%p: destroyed\n", packet); */
+
+  g_total_packet_memory -= sizeof(net_packet_t) + packet->alloced;
+  z_free(packet->data);
+  z_free(packet);
+}
+
+/* Read a byte from the packet, returning true if read
+ * successfully
+ */
+
+boolean net_read_int8(net_packet_t *packet, unsigned int *data)
+{
+  if (packet->pos + 1 > packet->len) return false;
+
+  *data = packet->data[packet->pos];
+
+  packet->pos += 1;
+
+  return true;
+}
+
+/* Read a 16-bit integer from the packet, returning true if read
+ * successfully
+ */
+
+boolean net_read_int16(net_packet_t *packet, unsigned int *data)
+{
+  byte *p;
+
+  if (packet->pos + 2 > packet->len) return false;
+
+  p = packet->data + packet->pos;
+
+  *data = (p[0] << 8) | p[1];
+  packet->pos += 2;
+
+  return true;
+}
+
+/* Read a 32-bit integer from the packet, returning true if read
+ * successfully
+ */
+
+boolean net_read_int32(net_packet_t *packet, unsigned int *data)
+{
+  byte *p;
+
+  if (packet->pos + 4 > packet->len) return false;
+
+  p = packet->data + packet->pos;
+
+  *data = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
+  packet->pos += 4;
+
+  return true;
+}
+
+/* Signed read functions */
+
+boolean net_read_sint8(net_packet_t *packet, signed int *data)
+{
+  if (net_read_int8(packet, (unsigned int *)data))
     {
-        if (*data & (1 << 15))
+      if (*data & (1 << 7))
         {
-            *data &= ~(1 << 15);
-            *data -= (1 << 15);
+          *data &= ~(1 << 7);
+          *data -= (1 << 7);
         }
-        return true;
+
+      return true;
     }
-    else
+  else
     {
-        return false;
+      return false;
     }
 }
 
-boolean NET_ReadSInt32(net_packet_t *packet, signed int *data)
+boolean net_read_sint16(net_packet_t *packet, signed int *data)
 {
-    if (NET_ReadInt32(packet, (unsigned int *) data))
+  if (net_read_int16(packet, (unsigned int *)data))
     {
-        if (*data & (1U << 31))
+      if (*data & (1 << 15))
         {
-            *data &= ~(1U << 31);
-            *data -= (1U << 31);
+          *data &= ~(1 << 15);
+          *data -= (1 << 15);
         }
-        return true;
+
+      return true;
     }
-    else
+  else
     {
-        return false;
+      return false;
     }
 }
 
-// Read a string from the packet.  Returns NULL if a terminating 
-// NUL character was not found before the end of the packet.
+/* Read a string from the packet.  Returns NULL if a terminating
+ * NUL character was not found before the end of the packet.
+ */
 
-char *NET_ReadString(net_packet_t *packet)
+char *net_read_string(net_packet_t *packet)
 {
-    char *start;
+  char *start;
 
-    start = (char *) packet->data + packet->pos;
+  start = (char *)packet->data + packet->pos;
 
-    // Search forward for a NUL character
+  /* Search forward for a NUL character */
 
-    while (packet->pos < packet->len && packet->data[packet->pos] != '\0')
+  while (packet->pos < packet->len && packet->data[packet->pos] != '\0')
     {
-        ++packet->pos;
+      ++packet->pos;
     }
 
-    if (packet->pos >= packet->len)
+  if (packet->pos >= packet->len)
     {
-        // Reached the end of the packet
+      /* Reached the end of the packet */
 
-        return NULL;
+      return NULL;
     }
 
-    // packet->data[packet->pos] == '\0': We have reached a terminating
-    // NULL.  Skip past this NULL and continue reading immediately 
-    // after it.
+  /* packet->data[packet->pos] == '\0': We have reached a terminating
+   * NULL.  Skip past this NULL and continue reading immediately
+   * after it.
+   */
 
-    ++packet->pos;
-    
-    return start;
+  ++packet->pos;
+
+  return start;
 }
 
-// Read a string from the packet, but (potentially) modify it to strip
-// out any unprintable characters which could be malicious control codes.
-// Note that this may modify the original packet contents.
-char *NET_ReadSafeString(net_packet_t *packet)
-{
-    char *r, *w, *result;
+/* Read a string from the packet, but (potentially) modify it to strip
+ * out any unprintable characters which could be malicious control codes.
+ * Note that this may modify the original packet contents.
+ */
 
-    result = NET_ReadString(packet);
-    if (result == NULL)
+char *net_read_safe_string(net_packet_t *packet)
+{
+  char *r;
+  char *w;
+  char *result;
+
+  result = net_read_string(packet);
+  if (result == NULL)
     {
-        return NULL;
+      return NULL;
     }
 
-    // w is always <= r, so we never produce a longer string than the original.
-    w = result;
-    for (r = result; *r != '\0'; ++r)
+  /* w is always <= r, so we never produce a longer string than the original.
+   */
+
+  w = result;
+  for (r = result; *r != '\0'; ++r)
     {
-        // TODO: This is a very naive way of producing a safe string; only
-        // ASCII characters are allowed. Probably this should really support
-        // UTF-8 characters as well.
-        if (isprint(*r) || *r == '\n')
+      /* TODO: This is a very naive way of producing a safe string; only
+       * ASCII characters are allowed. Probably this should really support
+       * UTF-8 characters as well.
+       */
+
+      if (isprint(*r) || *r == '\n')
         {
-            *w = *r;
-            ++w;
+          *w = *r;
+          ++w;
         }
     }
-    *w = '\0';
 
-    return result;
+  *w = '\0';
+
+  return result;
 }
 
-// Dynamically increases the size of a packet
+/* Write a single byte to the packet */
 
-static void NET_IncreasePacket(net_packet_t *packet)
+void net_write_int8(net_packet_t *packet, unsigned int i)
 {
-    byte *newdata;
+  if (packet->len + 1 > packet->alloced) net_increase_packet(packet);
 
-    total_packet_memory -= packet->alloced;
-   
-    packet->alloced *= 2;
-
-    newdata = Z_Malloc(packet->alloced, PU_STATIC, 0);
-
-    memcpy(newdata, packet->data, packet->len);
-
-    Z_Free(packet->data);
-    packet->data = newdata;
-
-    total_packet_memory += packet->alloced;
+  packet->data[packet->len] = i;
+  packet->len += 1;
 }
 
-// Write a single byte to the packet
+/* Write a 16-bit integer to the packet */
 
-void NET_WriteInt8(net_packet_t *packet, unsigned int i)
+void net_write_int16(net_packet_t *packet, unsigned int i)
 {
-    if (packet->len + 1 > packet->alloced)
-        NET_IncreasePacket(packet);
+  byte *p;
 
-    packet->data[packet->len] = i;
-    packet->len += 1;
+  if (packet->len + 2 > packet->alloced) net_increase_packet(packet);
+
+  p = packet->data + packet->len;
+
+  p[0] = (i >> 8) & 0xff;
+  p[1] = i & 0xff;
+
+  packet->len += 2;
 }
 
-// Write a 16-bit integer to the packet
+/* Write a single byte to the packet */
 
-void NET_WriteInt16(net_packet_t *packet, unsigned int i)
+void net_write_int32(net_packet_t *packet, unsigned int i)
 {
-    byte *p;
-    
-    if (packet->len + 2 > packet->alloced)
-        NET_IncreasePacket(packet);
+  byte *p;
 
-    p = packet->data + packet->len;
+  if (packet->len + 4 > packet->alloced) net_increase_packet(packet);
 
-    p[0] = (i >> 8) & 0xff;
-    p[1] = i & 0xff;
+  p = packet->data + packet->len;
 
-    packet->len += 2;
+  p[0] = (i >> 24) & 0xff;
+  p[1] = (i >> 16) & 0xff;
+  p[2] = (i >> 8) & 0xff;
+  p[3] = i & 0xff;
+
+  packet->len += 4;
 }
 
-
-// Write a single byte to the packet
-
-void NET_WriteInt32(net_packet_t *packet, unsigned int i)
+void net_write_string(net_packet_t *packet, const char *string)
 {
-    byte *p;
+  byte *p;
+  size_t string_size;
 
-    if (packet->len + 4 > packet->alloced)
-        NET_IncreasePacket(packet);
+  string_size = strlen(string) + 1;
 
-    p = packet->data + packet->len;
+  /* Increase the packet size until large enough to hold the string */
 
-    p[0] = (i >> 24) & 0xff;
-    p[1] = (i >> 16) & 0xff;
-    p[2] = (i >> 8) & 0xff;
-    p[3] = i & 0xff;
-
-    packet->len += 4;
-}
-
-void NET_WriteString(net_packet_t *packet, const char *string)
-{
-    byte *p;
-    size_t string_size;
-
-    string_size = strlen(string) + 1;
-
-    // Increase the packet size until large enough to hold the string
-
-    while (packet->len + string_size > packet->alloced)
+  while (packet->len + string_size > packet->alloced)
     {
-        NET_IncreasePacket(packet);
+      net_increase_packet(packet);
     }
 
-    p = packet->data + packet->len;
+  p = packet->data + packet->len;
 
-    M_StringCopy((char *) p, string, string_size);
+  m_str_copy((char *)p, string, string_size);
 
-    packet->len += string_size;
+  packet->len += string_size;
 }
-
-
-
-
diff --git a/games/NXDoom/src/net_packet.h b/games/NXDoom/src/net_packet.h
index 6beb44b2a..f2d412b95 100644
--- a/games/NXDoom/src/net_packet.h
+++ b/games/NXDoom/src/net_packet.h
@@ -1,45 +1,56 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Definitions for use in networking code.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_packet.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Definitions for use in networking code.
+ *
+ ****************************************************************************/
 
 #ifndef NET_PACKET_H
 #define NET_PACKET_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "net_defs.h"
 
-net_packet_t *NET_NewPacket(int initial_size);
-net_packet_t *NET_PacketDup(net_packet_t *packet);
-void NET_FreePacket(net_packet_t *packet);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-boolean NET_ReadInt8(net_packet_t *packet, unsigned int *data);
-boolean NET_ReadInt16(net_packet_t *packet, unsigned int *data);
-boolean NET_ReadInt32(net_packet_t *packet, unsigned int *data);
+net_packet_t *net_new_packet(int initial_size);
+net_packet_t *net_packet_dup(net_packet_t *packet);
+void net_free_packet(net_packet_t *packet);
 
-boolean NET_ReadSInt8(net_packet_t *packet, signed int *data);
-boolean NET_ReadSInt16(net_packet_t *packet, signed int *data);
-boolean NET_ReadSInt32(net_packet_t *packet, signed int *data);
+boolean net_read_int8(net_packet_t *packet, unsigned int *data);
+boolean net_read_int16(net_packet_t *packet, unsigned int *data);
+boolean net_read_int32(net_packet_t *packet, unsigned int *data);
 
-char *NET_ReadString(net_packet_t *packet);
-char *NET_ReadSafeString(net_packet_t *packet);
+boolean net_read_sint8(net_packet_t *packet, signed int *data);
+boolean net_read_sint16(net_packet_t *packet, signed int *data);
 
-void NET_WriteInt8(net_packet_t *packet, unsigned int i);
-void NET_WriteInt16(net_packet_t *packet, unsigned int i);
-void NET_WriteInt32(net_packet_t *packet, unsigned int i);
+char *net_read_string(net_packet_t *packet);
+char *net_read_safe_string(net_packet_t *packet);
 
-void NET_WriteString(net_packet_t *packet, const char *string);
+void net_write_int8(net_packet_t *packet, unsigned int i);
+void net_write_int16(net_packet_t *packet, unsigned int i);
+void net_write_int32(net_packet_t *packet, unsigned int i);
 
-#endif /* #ifndef NET_PACKET_H */
+void net_write_string(net_packet_t *packet, const char *string);
 
+#endif /* NET_PACKET_H */
diff --git a/games/NXDoom/src/net_petname.c b/games/NXDoom/src/net_petname.c
deleted file mode 100644
index db6600db6..000000000
--- a/games/NXDoom/src/net_petname.c
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright(C) 2019 Jonathan Dowland
-//
-// 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.
-//
-// DESCRIPTION:
-//     Generate a randomized, private, memorable name for a Player
-//
-
-#include <stdlib.h>
-#include <time.h>
-#include "doomtype.h"
-#include "m_misc.h"
-
-static const char * const adjectives [] = {
-    "Grumpy",
-    "Ecstatic",
-    "Surly",
-    "Prepared",
-    "Crafty",
-    "Alert",
-    "Sluggish",
-    "Testy",
-    "Reluctant",
-    "Languid",
-    "Passive",
-    "Pacifist",
-    "Aggressive",
-    "Hostile",
-    "Bubbly",
-    "Giggly",
-    "Laughing",
-    "Crying",
-    "Frowning",
-    "Torpid",
-    "Lethargic",
-    "Manic",
-    "Patient",
-    "Protective",
-    "Philosophical",
-    "Enquiring",
-    "Debating",
-    "Furious",
-    "Laid-Back",
-    "Easy-Going",
-    "Cromulent",
-    "Excitable",
-    "Tired",
-    "Exhausted",
-    "Ruminating",
-    "Redundant",
-    "Sporty",
-    "Ginger",
-    "Scary",
-    "Posh",
-    "Baby",
-};
-
-static const char * const nouns[] = {
-    "Frad",
-    // Doom
-    "Cacodemon",
-    "Arch-Vile",
-    "Cyberdemon",
-    "Imp",
-    "Demon",
-    "Mancubus",
-    "Arachnotron",
-    "Baron",
-    "Knight",
-    "Revenant",
-    // Hexen
-    "Ettin",
-    "Maulotaur",
-    "Centaur",
-    "Afrit",
-    "Serpent",
-    // Heretic
-    "Disciple",
-    "Gargoyle",
-    "Golem",
-    "Lich",
-    // Strife
-    "Sentinel",
-    "Acolyte",
-    "Templar",
-    "Reaver",
-    "Spectre",
-};
-
-/*
- * ideally we would export this and the caller would invoke it during
- * their setup routine. But, the two callers only invoke getRandomPetName
- * once, so the initialization might as well occur then.
- */
-static void InitPetName()
-{
-    srand((unsigned int)time(NULL));
-}
-
-char *NET_GetRandomPetName()
-{
-    const char *a, *n;
-
-    InitPetName();
-    a = adjectives[rand() % arrlen(adjectives)];
-    n = nouns[rand() % arrlen(nouns)];
-
-    return M_StringJoin(a, " ", n, NULL);
-}
diff --git a/games/NXDoom/src/net_petname.h b/games/NXDoom/src/net_petname.h
deleted file mode 100644
index 292250744..000000000
--- a/games/NXDoom/src/net_petname.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Copyright(C) 2019 Jonathan Dowland
-//
-// 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.
-//
-// DESCRIPTION:
-//     Generate a randomized, private, memorable name for a Player
-//
-
-char *NET_GetRandomPetName();
diff --git a/games/NXDoom/src/net_query.c b/games/NXDoom/src/net_query.c
index d9c8b2d96..ea80d8ccd 100644
--- a/games/NXDoom/src/net_query.c
+++ b/games/NXDoom/src/net_query.c
@@ -1,22 +1,31 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Querying servers to find their current status.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_query.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Querying servers to find their current status.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -29,978 +38,1026 @@
 #include "net_io.h"
 #include "net_packet.h"
 #include "net_query.h"
-#include "net_structrw.h"
 #include "net_sdl.h"
+#include "net_structrw.h"
 
-// DNS address of the Internet master server.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* DNS address of the Internet master server. */
 
 #define MASTER_SERVER_ADDRESS "master.chocolate-doom.org:2342"
 
-// Time to wait for a response before declaring a timeout.
+/* Time to wait for a response before declaring a timeout. */
 
 #define QUERY_TIMEOUT_SECS 2
 
-// Time to wait for secure demo signatures before declaring a timeout.
+/* Time to wait for secure demo signatures before declaring a timeout. */
 
 #define SIGNATURE_TIMEOUT_SECS 5
 
-// Number of query attempts to make before giving up on a server.
+/* Number of query attempts to make before giving up on a server. */
 
 #define QUERY_MAX_ATTEMPTS 3
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef enum
 {
-    QUERY_TARGET_SERVER,       // Normal server target.
-    QUERY_TARGET_MASTER,       // The master server.
-    QUERY_TARGET_BROADCAST     // Send a broadcast query
+  QUERY_TARGET_SERVER,   /* Normal server target. */
+  QUERY_TARGET_MASTER,   /* The master server. */
+  QUERY_TARGET_BROADCAST /* Send a broadcast query */
 } query_target_type_t;
 
 typedef enum
 {
-    QUERY_TARGET_QUEUED,       // Query not yet sent
-    QUERY_TARGET_QUERIED,      // Query sent, waiting response
-    QUERY_TARGET_RESPONDED,    // Response received
-    QUERY_TARGET_NO_RESPONSE
+  QUERY_TARGET_QUEUED,    /* Query not yet sent */
+  QUERY_TARGET_QUERIED,   /* Query sent, waiting response */
+  QUERY_TARGET_RESPONDED, /* Response received */
+  QUERY_TARGET_NO_RESPONSE
 } query_target_state_t;
 
 typedef struct
 {
-    query_target_type_t type;
-    query_target_state_t state;
-    net_addr_t *addr;
-    net_querydata_t data;
-    unsigned int ping_time;
-    unsigned int query_time;
-    unsigned int query_attempts;
-    boolean printed;
+  query_target_type_t type;
+  query_target_state_t state;
+  net_addr_t *addr;
+  net_querydata_t data;
+  unsigned int ping_time;
+  unsigned int query_time;
+  unsigned int query_attempts;
+  boolean printed;
 } query_target_t;
 
-static boolean registered_with_master = false;
-static boolean got_master_response = false;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static net_context_t *query_context;
-static query_target_t *targets;
-static int num_targets;
+static boolean g_registered_with_master = false;
+static boolean g_got_master_response = false;
 
-static boolean query_loop_running = false;
-static boolean printed_header = false;
-static int last_query_time = 0;
+static net_context_t *g_query_context;
+static query_target_t *g_targets;
+static int g_num_targets;
 
-static char *securedemo_start_message = NULL;
+static boolean g_query_loop_running = false;
+static boolean g_printed_header = false;
+static int g_last_query_time = 0;
 
-// Resolve the master server address.
+#if 0
+static char *g_securedemo_start_message = NULL;
+#endif
 
-net_addr_t *NET_Query_ResolveMaster(net_context_t *context)
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void formatted_printf(int wide, const char *s, ...) PRINTF_ATTR(2, 3);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Send a query to the master server. */
+
+static void net_query_send_master_query(net_addr_t *addr)
 {
-    net_addr_t *addr;
+  net_packet_t *packet;
 
-    addr = NET_ResolveAddress(context, MASTER_SERVER_ADDRESS);
+  packet = net_new_packet(4);
+  net_write_int16(packet, NET_MASTER_PACKET_TYPE_QUERY);
+  net_send_packet(addr, packet);
+  net_free_packet(packet);
 
-    if (addr == NULL)
-    {
-        fprintf(stderr, "Warning: Failed to resolve address "
-                        "for master server: %s\n", MASTER_SERVER_ADDRESS);
-    }
+  /* We also send a NAT_HOLE_PUNCH_ALL packet so that servers behind
+   * NAT gateways will open themselves up to us.
+   */
 
-    return addr;
+  packet = net_new_packet(4);
+  net_write_int16(packet, NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL);
+  net_send_packet(addr, packet);
+  net_free_packet(packet);
 }
 
-// Send a registration packet to the master server to register
-// ourselves with the global list.
+/* Given the specified address, find the target associated.  If no
+ * target is found, and 'create' is true, a new target is created.
+ */
 
-void NET_Query_AddToMaster(net_addr_t *master_addr)
+static query_target_t *get_target_for_addr(net_addr_t *addr, boolean create)
 {
-    net_packet_t *packet;
+  query_target_t *target;
+  int i;
 
-    packet = NET_NewPacket(10);
-    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_ADD);
-    NET_SendPacket(master_addr, packet);
-    NET_FreePacket(packet);
-}
-
-// Process a packet received from the master server.
-
-void NET_Query_AddResponse(net_packet_t *packet)
-{
-    unsigned int result;
-
-    if (!NET_ReadInt16(packet, &result))
+  for (i = 0; i < g_num_targets; ++i)
     {
-        return;
-    }
-
-    if (result != 0)
-    {
-        // Only show the message once.
-
-        if (!registered_with_master)
+      if (g_targets[i].addr == addr)
         {
-            printf("Registered with master server at %s\n",
-                   MASTER_SERVER_ADDRESS);
-            registered_with_master = true;
-        }
-    }
-    else
-    {
-        // Always show rejections.
-
-        printf("Failed to register with master server at %s\n",
-               MASTER_SERVER_ADDRESS);
-    }
-
-    got_master_response = true;
-}
-
-boolean NET_Query_CheckAddedToMaster(boolean *result)
-{
-    // Got response from master yet?
-
-    if (!got_master_response)
-    {
-        return false;
-    }
-
-    *result = registered_with_master;
-    return true;
-}
-
-// Send a query to the master server.
-
-static void NET_Query_SendMasterQuery(net_addr_t *addr)
-{
-    net_packet_t *packet;
-
-    packet = NET_NewPacket(4);
-    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_QUERY);
-    NET_SendPacket(addr, packet);
-    NET_FreePacket(packet);
-
-    // We also send a NAT_HOLE_PUNCH_ALL packet so that servers behind
-    // NAT gateways will open themselves up to us.
-    packet = NET_NewPacket(4);
-    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL);
-    NET_SendPacket(addr, packet);
-    NET_FreePacket(packet);
-}
-
-// Send a hole punch request to the master server for the server at the
-// given address.
-void NET_RequestHolePunch(net_context_t *context, net_addr_t *addr)
-{
-    net_addr_t *master_addr;
-    net_packet_t *packet;
-
-    master_addr = NET_Query_ResolveMaster(context);
-    if (master_addr == NULL)
-    {
-        return;
-    }
-
-    packet = NET_NewPacket(32);
-    NET_WriteInt16(packet, NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH);
-    NET_WriteString(packet, NET_AddrToString(addr));
-    NET_SendPacket(master_addr, packet);
-
-    NET_FreePacket(packet);
-    NET_ReleaseAddress(master_addr);
-}
-
-// Given the specified address, find the target associated.  If no
-// target is found, and 'create' is true, a new target is created.
-
-static query_target_t *GetTargetForAddr(net_addr_t *addr, boolean create)
-{
-    query_target_t *target;
-    int i;
-
-    for (i=0; i<num_targets; ++i)
-    {
-        if (targets[i].addr == addr)
-        {
-            return &targets[i];
+          return &g_targets[i];
         }
     }
 
-    if (!create)
+  if (!create)
     {
-        return NULL;
+      return NULL;
     }
 
-    targets = I_Realloc(targets, sizeof(query_target_t) * (num_targets + 1));
+  g_targets =
+      i_realloc(g_targets, sizeof(query_target_t) * (g_num_targets + 1));
 
-    target = &targets[num_targets];
-    target->type = QUERY_TARGET_SERVER;
-    target->state = QUERY_TARGET_QUEUED;
-    target->printed = false;
-    target->query_attempts = 0;
-    target->addr = addr;
-    NET_ReferenceAddress(addr);
-    ++num_targets;
+  target = &g_targets[g_num_targets];
+  target->type = QUERY_TARGET_SERVER;
+  target->state = QUERY_TARGET_QUEUED;
+  target->printed = false;
+  target->query_attempts = 0;
+  target->addr = addr;
+  net_reference_address(addr);
+  ++g_num_targets;
 
-    return target;
+  return target;
 }
 
-static void FreeTargets(void)
+static void free_targets(void)
 {
-    int i;
+  int i;
 
-    for (i = 0; i < num_targets; ++i)
+  for (i = 0; i < g_num_targets; ++i)
     {
-        NET_ReleaseAddress(targets[i].addr);
+      net_release_address(g_targets[i].addr);
     }
-    free(targets);
-    targets = NULL;
-    num_targets = 0;
+
+  free(g_targets);
+  g_targets = NULL;
+  g_num_targets = 0;
 }
 
-// Transmit a query packet
+/* Transmit a query packet */
 
-static void NET_Query_SendQuery(net_addr_t *addr)
+static void net_query_send_query(net_addr_t *addr)
 {
-    net_packet_t *request;
+  net_packet_t *request;
 
-    request = NET_NewPacket(10);
-    NET_WriteInt16(request, NET_PACKET_TYPE_QUERY);
+  request = net_new_packet(10);
+  net_write_int16(request, NET_PACKET_TYPE_QUERY);
 
-    if (addr == NULL)
+  if (addr == NULL)
     {
-        NET_SendBroadcast(query_context, request);
+      net_send_broadcast(g_query_context, request);
     }
-    else
+  else
     {
-        NET_SendPacket(addr, request);
+      net_send_packet(addr, request);
     }
 
-    NET_FreePacket(request);
+  net_free_packet(request);
 }
 
-static void NET_Query_ParseResponse(net_addr_t *addr, net_packet_t *packet,
-                                    net_query_callback_t callback,
-                                    void *user_data)
+static void net_query_parse_response(net_addr_t *addr, net_packet_t *packet,
+                                     net_query_callback_t callback,
+                                     void *user_data)
 {
-    unsigned int packet_type;
-    net_querydata_t querydata;
-    query_target_t *target;
+  unsigned int packet_type;
+  net_querydata_t querydata;
+  query_target_t *target;
 
-    // Read the header
+  /* Read the header */
 
-    if (!NET_ReadInt16(packet, &packet_type)
-     || packet_type != NET_PACKET_TYPE_QUERY_RESPONSE)
+  if (!net_read_int16(packet, &packet_type) ||
+      packet_type != NET_PACKET_TYPE_QUERY_RESPONSE)
     {
-        return;
+      return;
     }
 
-    // Read query data
+  /* Read query data */
 
-    if (!NET_ReadQueryData(packet, &querydata))
+  if (!net_read_query_data(packet, &querydata))
     {
-        return;
+      return;
     }
 
-    // Find the target that responded.
+  /* Find the target that responded. */
 
-    target = GetTargetForAddr(addr, false);
+  target = get_target_for_addr(addr, false);
 
-    // If the target is not found, it may be because we are doing
-    // a LAN broadcast search, in which case we need to create a
-    // target for the new responder.
+  /* If the target is not found, it may be because we are doing
+   * a LAN broadcast search, in which case we need to create a
+   * target for the new responder.
+   */
 
-    if (target == NULL)
+  if (target == NULL)
     {
-        query_target_t *broadcast_target;
+      query_target_t *broadcast_target;
 
-        broadcast_target = GetTargetForAddr(NULL, false);
+      broadcast_target = get_target_for_addr(NULL, false);
 
-        // Not in broadcast mode, unexpected response that came out
-        // of nowhere. Ignore.
+      /* Not in broadcast mode, unexpected response that came out
+       * of nowhere. Ignore.
+       */
 
-        if (broadcast_target == NULL
-         || broadcast_target->state != QUERY_TARGET_QUERIED)
+      if (broadcast_target == NULL ||
+          broadcast_target->state != QUERY_TARGET_QUERIED)
         {
-            return;
+          return;
         }
 
-        // Create new target.
+      /* Create new target. */
 
-        target = GetTargetForAddr(addr, true);
-        broadcast_target = GetTargetForAddr(NULL, false);
-        target->state = QUERY_TARGET_QUERIED;
-        target->query_time = broadcast_target->query_time;
+      target = get_target_for_addr(addr, true);
+      broadcast_target = get_target_for_addr(NULL, false);
+      target->state = QUERY_TARGET_QUERIED;
+      target->query_time = broadcast_target->query_time;
     }
 
-    if (target->state != QUERY_TARGET_RESPONDED)
+  if (target->state != QUERY_TARGET_RESPONDED)
     {
-        target->state = QUERY_TARGET_RESPONDED;
-        memcpy(&target->data, &querydata, sizeof(net_querydata_t));
+      target->state = QUERY_TARGET_RESPONDED;
+      memcpy(&target->data, &querydata, sizeof(net_querydata_t));
 
-        // Calculate RTT.
+      /* Calculate RTT. */
 
-        target->ping_time = I_GetTimeMS() - target->query_time;
+      target->ping_time = i_get_time_ms() - target->query_time;
 
-        // Invoke callback to signal that we have a new address.
+      /* Invoke callback to signal that we have a new address. */
 
-        callback(addr, &target->data, target->ping_time, user_data);
+      callback(addr, &target->data, target->ping_time, user_data);
     }
 }
 
-// Parse a response packet from the master server.
+/* Parse a response packet from the master server. */
 
-static void NET_Query_ParseMasterResponse(net_addr_t *master_addr,
-                                          net_packet_t *packet)
+static void net_query_parse_master_response(net_addr_t *master_addr,
+                                            net_packet_t *packet)
 {
-    unsigned int packet_type;
-    query_target_t *target;
-    char *addr_str;
-    net_addr_t *addr;
+  unsigned int packet_type;
+  query_target_t *target;
+  char *addr_str;
+  net_addr_t *addr;
 
-    // Read the header.  We are only interested in query responses.
+  /* Read the header.  We are only interested in query responses. */
 
-    if (!NET_ReadInt16(packet, &packet_type)
-     || packet_type != NET_MASTER_PACKET_TYPE_QUERY_RESPONSE)
+  if (!net_read_int16(packet, &packet_type) ||
+      packet_type != NET_MASTER_PACKET_TYPE_QUERY_RESPONSE)
     {
-        return;
+      return;
     }
 
-    // Read a list of strings containing the addresses of servers
-    // that the master knows about.
+  /* Read a list of strings containing the addresses of servers
+   * that the master knows about.
+   */
 
-    for (;;)
+  for (; ; )
     {
-        addr_str = NET_ReadString(packet);
+      addr_str = net_read_string(packet);
 
-        if (addr_str == NULL)
+      if (addr_str == NULL)
         {
-            break;
+          break;
         }
 
-        // Resolve address and add to targets list if it is not already
-        // there.
+      /* Resolve address and add to targets list if it is not already
+       * there.
+       */
 
-        addr = NET_ResolveAddress(query_context, addr_str);
-        if (addr != NULL)
+      addr = net_resolve_address(g_query_context, addr_str);
+      if (addr != NULL)
         {
-            GetTargetForAddr(addr, true);
-            NET_ReleaseAddress(addr);
+          get_target_for_addr(addr, true);
+          net_release_address(addr);
         }
     }
 
-    // Mark the master as having responded.
+  /* Mark the master as having responded. */
 
-    target = GetTargetForAddr(master_addr, true);
-    target->state = QUERY_TARGET_RESPONDED;
+  target = get_target_for_addr(master_addr, true);
+  target->state = QUERY_TARGET_RESPONDED;
 }
 
-static void NET_Query_ParsePacket(net_addr_t *addr, net_packet_t *packet,
-                                  net_query_callback_t callback,
-                                  void *user_data)
+static void net_query_parse_packet(net_addr_t *addr, net_packet_t *packet,
+                                   net_query_callback_t callback,
+                                   void *user_data)
 {
-    query_target_t *target;
+  query_target_t *target;
 
-    // This might be the master server responding.
+  /* This might be the master server responding. */
 
-    target = GetTargetForAddr(addr, false);
+  target = get_target_for_addr(addr, false);
 
-    if (target != NULL && target->type == QUERY_TARGET_MASTER)
+  if (target != NULL && target->type == QUERY_TARGET_MASTER)
     {
-        NET_Query_ParseMasterResponse(addr, packet);
+      net_query_parse_master_response(addr, packet);
     }
-    else
+  else
     {
-        NET_Query_ParseResponse(addr, packet, callback, user_data);
+      net_query_parse_response(addr, packet, callback, user_data);
     }
 }
 
-static void NET_Query_GetResponse(net_query_callback_t callback,
-                                  void *user_data)
+static void net_query_get_response(net_query_callback_t callback,
+                                   void *user_data)
 {
-    net_addr_t *addr;
-    net_packet_t *packet;
+  net_addr_t *addr;
+  net_packet_t *packet;
 
-    if (NET_RecvPacket(query_context, &addr, &packet))
+  if (net_recv_packet(g_query_context, &addr, &packet))
     {
-        NET_Query_ParsePacket(addr, packet, callback, user_data);
-        NET_ReleaseAddress(addr);
-        NET_FreePacket(packet);
+      net_query_parse_packet(addr, packet, callback, user_data);
+      net_release_address(addr);
+      net_free_packet(packet);
     }
 }
 
-// Find a target we have not yet queried and send a query.
+/* Find a target we have not yet queried and send a query. */
 
-static void SendOneQuery(void)
+static void send_one_query(void)
 {
-    unsigned int now;
-    unsigned int i;
+  unsigned int now;
+  unsigned int i;
 
-    now = I_GetTimeMS();
+  now = i_get_time_ms();
 
-    // Rate limit - only send one query every 50ms.
+  /* Rate limit - only send one query every 50ms. */
 
-    if (now - last_query_time < 50)
+  if (now - g_last_query_time < 50)
     {
-        return;
+      return;
     }
 
-    for (i = 0; i < num_targets; ++i)
+  for (i = 0; i < g_num_targets; ++i)
     {
-        // Not queried yet?
-        // Or last query timed out without a response?
+      /* Not queried yet?
+       * Or last query timed out without a response?
+       */
 
-        if (targets[i].state == QUERY_TARGET_QUEUED
-         || (targets[i].state == QUERY_TARGET_QUERIED
-             && now - targets[i].query_time > QUERY_TIMEOUT_SECS * 1000))
+      if (g_targets[i].state == QUERY_TARGET_QUEUED ||
+          (g_targets[i].state == QUERY_TARGET_QUERIED &&
+           now - g_targets[i].query_time > QUERY_TIMEOUT_SECS * 1000))
         {
-            break;
+          break;
         }
     }
 
-    if (i >= num_targets)
+  if (i >= g_num_targets)
     {
-        return;
+      return;
     }
 
-    // Found a target to query.  Send a query; how to do this depends on
-    // the target type.
+  /* Found a target to query.  Send a query; how to do this depends on
+   * the target type.
+   */
 
-    switch (targets[i].type)
+  switch (g_targets[i].type)
     {
-        case QUERY_TARGET_SERVER:
-            NET_Query_SendQuery(targets[i].addr);
-            break;
+    case QUERY_TARGET_SERVER:
+      net_query_send_query(g_targets[i].addr);
+      break;
 
-        case QUERY_TARGET_BROADCAST:
-            NET_Query_SendQuery(NULL);
-            break;
+    case QUERY_TARGET_BROADCAST:
+      net_query_send_query(NULL);
+      break;
 
-        case QUERY_TARGET_MASTER:
-            NET_Query_SendMasterQuery(targets[i].addr);
-            break;
+    case QUERY_TARGET_MASTER:
+      net_query_send_master_query(g_targets[i].addr);
+      break;
     }
 
-    //printf("Queried %s\n", NET_AddrToString(targets[i].addr));
-    targets[i].state = QUERY_TARGET_QUERIED;
-    targets[i].query_time = now;
-    ++targets[i].query_attempts;
+  /* printf("Queried %s\n", net_addr_to_string(targets[i].addr)); */
 
-    last_query_time = now;
+  g_targets[i].state = QUERY_TARGET_QUERIED;
+  g_targets[i].query_time = now;
+  ++g_targets[i].query_attempts;
+
+  g_last_query_time = now;
 }
 
-// Time out servers that have been queried and not responded.
+/* Time out servers that have been queried and not responded. */
 
-static void CheckTargetTimeouts(void)
+static void check_target_timeouts(void)
 {
-    unsigned int i;
-    unsigned int now;
+  unsigned int i;
+  unsigned int now;
 
-    now = I_GetTimeMS();
+  now = i_get_time_ms();
 
-    for (i = 0; i < num_targets; ++i)
+  for (i = 0; i < g_num_targets; ++i)
     {
-        /*
-        printf("target %i: state %i, queries %i, query time %i\n",
-               i, targets[i].state, targets[i].query_attempts,
-               now - targets[i].query_time);
-        */
+      /* printf("target %i: state %i, queries %i, query time %i\n",
+       *      i, targets[i].state, targets[i].query_attempts,
+       *      now - targets[i].query_time);
+       */
 
-        // We declare a target to be "no response" when we've sent
-        // multiple query packets to it (QUERY_MAX_ATTEMPTS) and
-        // received no response to any of them.
+      /* We declare a target to be "no response" when we've sent
+       * multiple query packets to it (QUERY_MAX_ATTEMPTS) and
+       * received no response to any of them.
+       */
 
-        if (targets[i].state == QUERY_TARGET_QUERIED
-         && targets[i].query_attempts >= QUERY_MAX_ATTEMPTS
-         && now - targets[i].query_time > QUERY_TIMEOUT_SECS * 1000)
+      if (g_targets[i].state == QUERY_TARGET_QUERIED &&
+          g_targets[i].query_attempts >= QUERY_MAX_ATTEMPTS &&
+          now - g_targets[i].query_time > QUERY_TIMEOUT_SECS * 1000)
         {
-            targets[i].state = QUERY_TARGET_NO_RESPONSE;
+          g_targets[i].state = QUERY_TARGET_NO_RESPONSE;
 
-            if (targets[i].type == QUERY_TARGET_MASTER)
+          if (g_targets[i].type == QUERY_TARGET_MASTER)
             {
-                fprintf(stderr, "NET_MasterQuery: no response "
-                                "from master server.\n");
+              fprintf(stderr, "net_master_query: no response "
+                              "from master server.\n");
             }
         }
     }
 }
 
-// If all targets have responded or timed out, returns true.
+/* If all targets have responded or timed out, returns true. */
 
-static boolean AllTargetsDone(void)
+static boolean all_targets_done(void)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i = 0; i < num_targets; ++i)
+  for (i = 0; i < g_num_targets; ++i)
     {
-        if (targets[i].state != QUERY_TARGET_RESPONDED
-         && targets[i].state != QUERY_TARGET_NO_RESPONSE)
+      if (g_targets[i].state != QUERY_TARGET_RESPONDED &&
+          g_targets[i].state != QUERY_TARGET_NO_RESPONSE)
         {
-            return false;
+          return false;
         }
     }
 
-    return true;
+  return true;
 }
 
-// Polling function, invoked periodically to send queries and
-// interpret new responses received from remote servers.
-// Returns zero when the query sequence has completed and all targets
-// have returned responses or timed out.
+/* Stop the query loop */
 
-int NET_Query_Poll(net_query_callback_t callback, void *user_data)
+static void net_query_exit_loop(void)
 {
-    CheckTargetTimeouts();
-
-    // Send a query.  This will only send a single query at once.
-
-    SendOneQuery();
-
-    // Check for a response
-
-    NET_Query_GetResponse(callback, user_data);
-
-    return !AllTargetsDone();
+  g_query_loop_running = false;
 }
 
-// Stop the query loop
+/* Loop waiting for responses.
+ * The specified callback is invoked when a new server responds.
+ */
 
-static void NET_Query_ExitLoop(void)
+static void net_query_query_loop(net_query_callback_t callback,
+                                 void *user_data)
 {
-    query_loop_running = false;
-}
+  g_query_loop_running = true;
 
-// Loop waiting for responses.
-// The specified callback is invoked when a new server responds.
-
-static void NET_Query_QueryLoop(net_query_callback_t callback, void *user_data)
-{
-    query_loop_running = true;
-
-    while (query_loop_running && NET_Query_Poll(callback, user_data))
+  while (g_query_loop_running && net_query_poll(callback, user_data))
     {
-        // Don't thrash the CPU
+      /* Don't thrash the CPU */
 
-        I_Sleep(1);
+      usleep(1000);
     }
 }
 
-void NET_Query_Init(void)
+static void net_query_init(void)
 {
-    if (query_context == NULL)
+  if (g_query_context == NULL)
     {
-        query_context = NET_NewContext();
-        NET_AddModule(query_context, &net_sdl_module);
-        net_sdl_module.InitClient();
+      g_query_context = net_new_context();
+      net_add_module(g_query_context, &net_sdl_module);
+      net_sdl_module.init_client();
     }
 
-    free(targets);
-    targets = NULL;
-    num_targets = 0;
+  free(g_targets);
+  g_targets = NULL;
+  g_num_targets = 0;
 
-    printed_header = false;
+  g_printed_header = false;
 }
 
-// Callback that exits the query loop when the first server is found.
+/* Callback that exits the query loop when the first server is found. */
 
-static void NET_Query_ExitCallback(net_addr_t *addr, net_querydata_t *data,
-                                   unsigned int ping_time, void *user_data)
+static void net_query_exit_callback(net_addr_t *addr, net_querydata_t *data,
+                                    unsigned int ping_time, void *user_data)
 {
-    NET_Query_ExitLoop();
+  net_query_exit_loop();
 }
 
-// Search the targets list and find a target that has responded.
-// If none have responded, returns NULL.
+/* Search the targets list and find a target that has responded.
+ * If none have responded, returns NULL.
+ */
 
-static query_target_t *FindFirstResponder(void)
+static query_target_t *find_first_responder(void)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i = 0; i < num_targets; ++i)
+  for (i = 0; i < g_num_targets; ++i)
     {
-        if (targets[i].type == QUERY_TARGET_SERVER
-         && targets[i].state == QUERY_TARGET_RESPONDED)
+      if (g_targets[i].type == QUERY_TARGET_SERVER &&
+          g_targets[i].state == QUERY_TARGET_RESPONDED)
         {
-            return &targets[i];
+          return &g_targets[i];
         }
     }
 
-    return NULL;
+  return NULL;
 }
 
-// Return a count of the number of responses.
+/* Return a count of the number of responses. */
 
-static int GetNumResponses(void)
+static int get_num_responses(void)
 {
-    unsigned int i;
-    int result;
+  unsigned int i;
+  int result;
 
-    result = 0;
+  result = 0;
 
-    for (i = 0; i < num_targets; ++i)
+  for (i = 0; i < g_num_targets; ++i)
     {
-        if (targets[i].type == QUERY_TARGET_SERVER
-         && targets[i].state == QUERY_TARGET_RESPONDED)
+      if (g_targets[i].type == QUERY_TARGET_SERVER &&
+          g_targets[i].state == QUERY_TARGET_RESPONDED)
         {
-            ++result;
+          ++result;
         }
     }
 
-    return result;
+  return result;
 }
 
-int NET_StartLANQuery(void)
-{
-    query_target_t *target;
-
-    NET_Query_Init();
-
-    // Add a broadcast target to the list.
-
-    target = GetTargetForAddr(NULL, true);
-    target->type = QUERY_TARGET_BROADCAST;
-
-    return 1;
-}
-
-int NET_StartMasterQuery(void)
-{
-    net_addr_t *master;
-    query_target_t *target;
-
-    NET_Query_Init();
-
-    // Resolve master address and add to targets list.
-
-    master = NET_Query_ResolveMaster(query_context);
-
-    if (master == NULL)
-    {
-        return 0;
-    }
-
-    target = GetTargetForAddr(master, true);
-    target->type = QUERY_TARGET_MASTER;
-    NET_ReleaseAddress(master);
-
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-static void formatted_printf(int wide, const char *s, ...) PRINTF_ATTR(2, 3);
 static void formatted_printf(int wide, const char *s, ...)
 {
-    va_list args;
-    int i;
+  va_list args;
+  int i;
 
-    va_start(args, s);
-    i = vprintf(s, args);
-    va_end(args);
+  va_start(args, s);
+  i = vprintf(s, args);
+  va_end(args);
 
-    while (i < wide)
+  while (i < wide)
     {
-        putchar(' ');
-        ++i;
+      putchar(' ');
+      ++i;
     }
 }
 
-static const char *GameDescription(GameMode_t mode, GameMission_t mission)
+static const char *game_description(game_mode_t mode, gamemission_t mission)
 {
-    switch (mission)
+  switch (mission)
     {
-        case doom:
-            if (mode == shareware)
-                return "swdoom";
-            else if (mode == registered)
-                return "regdoom";
-            else if (mode == retail)
-                return "ultdoom";
-            else
-                return "doom";
-        case doom2:
-            return "doom2";
-        case pack_tnt:
-            return "tnt";
-        case pack_plut:
-            return "plutonia";
-        case pack_chex:
-            return "chex";
-        case pack_hacx:
-            return "hacx";
-        case heretic:
-            return "heretic";
-        case hexen:
-            return "hexen";
-        case strife:
-            return "strife";
-        default:
-            return "?";
+    case doom:
+      if (mode == shareware)
+        return "swdoom";
+      else if (mode == registered)
+        return "regdoom";
+      else if (mode == retail)
+        return "ultdoom";
+      else
+        return "doom";
+    case doom2:
+      return "doom2";
+    case pack_tnt:
+      return "tnt";
+    case pack_plut:
+      return "plutonia";
+    case pack_chex:
+      return "chex";
+    case pack_hacx:
+      return "hacx";
+    case heretic:
+      return "heretic";
+    case hexen:
+      return "hexen";
+    case strife:
+      return "strife";
+    default:
+      return "?";
     }
 }
 
-static void PrintHeader(void)
+static void print_header(void)
 {
-    int i;
+  int i;
 
-    putchar('\n');
-    formatted_printf(5, "Ping");
-    formatted_printf(18, "Address");
-    formatted_printf(8, "Players");
-    puts("Description");
+  putchar('\n');
+  formatted_printf(5, "Ping");
+  formatted_printf(18, "Address");
+  formatted_printf(8, "Players");
+  puts("Description");
 
-    for (i=0; i<70; ++i)
-        putchar('=');
-    putchar('\n');
+  for (i = 0; i < 70; ++i)
+    putchar('=');
+  putchar('\n');
 }
 
-// Callback function that just prints information in a table.
+/* Callback function that just prints information in a table. */
 
-static void NET_QueryPrintCallback(net_addr_t *addr,
-                                   net_querydata_t *data,
-                                   unsigned int ping_time,
-                                   void *user_data)
+static void net_query_print_callback(net_addr_t *addr, net_querydata_t *data,
+                                     unsigned int ping_time, void *user_data)
 {
-    // If this is the first server, print the header.
+  /* If this is the first server, print the header. */
 
-    if (!printed_header)
+  if (!g_printed_header)
     {
-        PrintHeader();
-        printed_header = true;
+      print_header();
+      g_printed_header = true;
     }
 
-    formatted_printf(5, "%4i", ping_time);
-    formatted_printf(22, "%s", NET_AddrToString(addr));
-    formatted_printf(4, "%i/%i ", data->num_players,
-                                  data->max_players);
+  formatted_printf(5, "%4i", ping_time);
+  formatted_printf(22, "%s", net_addr_to_string(addr));
+  formatted_printf(4, "%i/%i ", data->num_players, data->max_players);
 
-    if (data->gamemode != indetermined)
+  if (data->gamemode != indetermined)
     {
-        printf("(%s) ", GameDescription(data->gamemode, 
-                                        data->gamemission));
+      printf("(%s) ", game_description(data->gamemode, data->gamemission));
     }
 
-    if (data->server_state)
+  if (data->server_state)
     {
-        printf("(game running) ");
+      printf("(game running) ");
     }
 
-    printf("%s\n", data->description);
+  printf("%s\n", data->description);
 }
 
-void NET_LANQuery(void)
+#if 0 /* UNUSED */
+
+/* Block until a packet of the given type is received from the given
+ * address.
+ */
+
+static net_packet_t *block_for_packet(net_addr_t *addr,
+                                      unsigned int packet_type,
+                                      unsigned int timeout_ms)
 {
-    if (NET_StartLANQuery())
+  net_packet_t *packet;
+  net_addr_t *packet_src;
+  unsigned int read_packet_type;
+  unsigned int start_time;
+
+  start_time = i_get_time_ms();
+
+  while (i_get_time_ms() < start_time + timeout_ms)
     {
-        printf("\nSearching for servers on local LAN ...\n");
-
-        NET_Query_QueryLoop(NET_QueryPrintCallback, NULL);
-
-        printf("\n%i server(s) found.\n", GetNumResponses());
-        FreeTargets();
-    }
-}
-
-void NET_MasterQuery(void)
-{
-    if (NET_StartMasterQuery())
-    {
-        printf("\nSearching for servers on Internet ...\n");
-
-        NET_Query_QueryLoop(NET_QueryPrintCallback, NULL);
-
-        printf("\n%i server(s) found.\n", GetNumResponses());
-        FreeTargets();
-    }
-}
-
-void NET_QueryAddress(const char *addr_str)
-{
-    net_addr_t *addr;
-    query_target_t *target;
-
-    NET_Query_Init();
-
-    addr = NET_ResolveAddress(query_context, addr_str);
-
-    if (addr == NULL)
-    {
-        I_Error("NET_QueryAddress: Host '%s' not found!", addr_str);
-    }
-
-    // Add the address to the list of targets.
-
-    target = GetTargetForAddr(addr, true);
-
-    printf("\nQuerying '%s'...\n", addr_str);
-
-    // Run query loop.
-
-    NET_Query_QueryLoop(NET_Query_ExitCallback, NULL);
-
-    // Check if the target responded.
-
-    if (target->state == QUERY_TARGET_RESPONDED)
-    {
-        NET_QueryPrintCallback(addr, &target->data, target->ping_time, NULL);
-        NET_ReleaseAddress(addr);
-        FreeTargets();
-    }
-    else
-    {
-        I_Error("No response from '%s'", addr_str);
-    }
-}
-
-net_addr_t *NET_FindLANServer(void)
-{
-    query_target_t *target;
-    query_target_t *responder;
-    net_addr_t *result;
-
-    NET_Query_Init();
-
-    // Add a broadcast target to the list.
-
-    target = GetTargetForAddr(NULL, true);
-    target->type = QUERY_TARGET_BROADCAST;
-
-    // Run the query loop, and stop at the first target found.
-
-    NET_Query_QueryLoop(NET_Query_ExitCallback, NULL);
-
-    responder = FindFirstResponder();
-
-    if (responder != NULL)
-    {
-        result = responder->addr;
-        NET_ReferenceAddress(result);
-    }
-    else
-    {
-        result = NULL;
-    }
-
-    FreeTargets();
-    return result;
-}
-
-// Block until a packet of the given type is received from the given
-// address.
-
-static net_packet_t *BlockForPacket(net_addr_t *addr, unsigned int packet_type,
-                                    unsigned int timeout_ms)
-{
-    net_packet_t *packet;
-    net_addr_t *packet_src;
-    unsigned int read_packet_type;
-    unsigned int start_time;
-
-    start_time = I_GetTimeMS();
-
-    while (I_GetTimeMS() < start_time + timeout_ms)
-    {
-        if (!NET_RecvPacket(query_context, &packet_src, &packet))
+      if (!net_recv_packet(g_query_context, &packet_src, &packet))
         {
-            I_Sleep(20);
-            continue;
+          usleep(20000);
+          continue;
         }
 
-        // Caller doesn't need additional reference.
-        NET_ReleaseAddress(packet_src);
+      /* Caller doesn't need additional reference. */
 
-        if (packet_src == addr
-         && NET_ReadInt16(packet, &read_packet_type)
-         && packet_type == read_packet_type)
+      net_release_address(packet_src);
+
+      if (packet_src == addr && net_read_int16(packet, &read_packet_type) &&
+          packet_type == read_packet_type)
         {
-            return packet;
+          return packet;
         }
 
-        NET_FreePacket(packet);
+      net_free_packet(packet);
     }
 
-    // Timeout - no response.
+  /* Timeout - no response. */
 
-    return NULL;
+  return NULL;
 }
 
-// Query master server for secure demo start seed value.
+/* Query master server for secure demo start seed value. */
 
-boolean NET_StartSecureDemo(prng_seed_t seed)
+static boolean net_start_secure_demo(prng_seed_t seed)
 {
-    net_packet_t *request, *response;
-    net_addr_t *master_addr;
-    char *signature;
-    boolean result;
+  net_packet_t *request, *response;
+  net_addr_t *master_addr;
+  char *signature;
+  boolean result;
 
-    NET_Query_Init();
-    master_addr = NET_Query_ResolveMaster(query_context);
+  net_query_init();
+  master_addr = net_query_resolve_master(g_query_context);
 
-    // Send request packet to master server.
+  /* Send request packet to master server. */
 
-    request = NET_NewPacket(10);
-    NET_WriteInt16(request, NET_MASTER_PACKET_TYPE_SIGN_START);
-    NET_SendPacket(master_addr, request);
-    NET_FreePacket(request);
+  request = net_new_packet(10);
+  net_write_int16(request, NET_MASTER_PACKET_TYPE_SIGN_START);
+  net_send_packet(master_addr, request);
+  net_free_packet(request);
 
-    // Block for response and read contents.
-    // The signed start message will be saved for later.
+  /* Block for response and read contents.
+   * The signed start message will be saved for later.
+   */
 
-    response = BlockForPacket(master_addr,
+  response = block_for_packet(master_addr,
                               NET_MASTER_PACKET_TYPE_SIGN_START_RESPONSE,
                               SIGNATURE_TIMEOUT_SECS * 1000);
 
-    result = false;
+  result = false;
 
-    if (response != NULL)
+  if (response != NULL)
     {
-        if (NET_ReadPRNGSeed(response, seed))
+      if (net_read_prng_seed(response, seed))
         {
-            signature = NET_ReadString(response);
+          signature = net_read_string(response);
 
-            if (signature != NULL)
+          if (signature != NULL)
             {
-                securedemo_start_message = M_StringDuplicate(signature);
-                result = true;
+              g_securedemo_start_message = m_string_duplicate(signature);
+              result = true;
             }
         }
 
-        NET_FreePacket(response);
+      net_free_packet(response);
     }
 
-    return result;
+  return result;
 }
 
-// Query master server for secure demo end signature.
+/* Query master server for secure demo end signature. */
 
-char *NET_EndSecureDemo(sha1_digest_t demo_hash)
+static char *net_end_secure_demo(sha1_digest_t demo_hash)
 {
-    net_packet_t *request, *response;
-    net_addr_t *master_addr;
-    char *signature;
+  net_packet_t *request, *response;
+  net_addr_t *master_addr;
+  char *signature;
 
-    master_addr = NET_Query_ResolveMaster(query_context);
+  master_addr = net_query_resolve_master(g_query_context);
 
-    // Construct end request and send to master server.
+  /* Construct end request and send to master server. */
 
-    request = NET_NewPacket(10);
-    NET_WriteInt16(request, NET_MASTER_PACKET_TYPE_SIGN_END);
-    NET_WriteSHA1Sum(request, demo_hash);
-    NET_WriteString(request, securedemo_start_message);
-    NET_SendPacket(master_addr, request);
-    NET_FreePacket(request);
+  request = net_new_packet(10);
+  net_write_int16(request, NET_MASTER_PACKET_TYPE_SIGN_END);
+  net_write_sha1_sum(request, demo_hash);
+  net_write_string(request, g_securedemo_start_message);
+  net_send_packet(master_addr, request);
+  net_free_packet(request);
 
-    // Block for response. The response packet simply contains a string
-    // with the ASCII signature.
+  /* Block for response. The response packet simply contains a string
+   * with the ASCII signature.
+   */
 
-    response = BlockForPacket(master_addr,
-                              NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE,
-                              SIGNATURE_TIMEOUT_SECS * 1000);
+  response =
+      block_for_packet(master_addr, NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE,
+                       SIGNATURE_TIMEOUT_SECS * 1000);
 
-    if (response == NULL)
+  if (response == NULL)
     {
-        return NULL;
+      return NULL;
     }
 
-    signature = NET_ReadString(response);
+  signature = net_read_string(response);
 
-    NET_FreePacket(response);
+  net_free_packet(response);
 
-    return signature;
+  return signature;
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Resolve the master server address. */
+
+net_addr_t *net_query_resolve_master(net_context_t *context)
+{
+  net_addr_t *addr;
+
+  addr = net_resolve_address(context, MASTER_SERVER_ADDRESS);
+
+  if (addr == NULL)
+    {
+      fprintf(stderr,
+              "Warning: Failed to resolve address "
+              "for master server: %s\n",
+              MASTER_SERVER_ADDRESS);
+    }
+
+  return addr;
 }
 
+/* Send a registration packet to the master server to register
+ * ourselves with the global list.
+ */
+
+void net_query_add_to_master(net_addr_t *master_addr)
+{
+  net_packet_t *packet;
+
+  packet = net_new_packet(10);
+  net_write_int16(packet, NET_MASTER_PACKET_TYPE_ADD);
+  net_send_packet(master_addr, packet);
+  net_free_packet(packet);
+}
+
+/* Process a packet received from the master server. */
+
+void net_query_add_response(net_packet_t *packet)
+{
+  unsigned int result;
+
+  if (!net_read_int16(packet, &result))
+    {
+      return;
+    }
+
+  if (result != 0)
+    {
+      /* Only show the message once. */
+
+      if (!g_registered_with_master)
+        {
+          printf("Registered with master server at %s\n",
+                 MASTER_SERVER_ADDRESS);
+          g_registered_with_master = true;
+        }
+    }
+  else
+    {
+      /* Always show rejections. */
+
+      printf("Failed to register with master server at %s\n",
+             MASTER_SERVER_ADDRESS);
+    }
+
+  g_got_master_response = true;
+}
+
+boolean net_query_check_added_to_master(boolean *result)
+{
+  /* Got response from master yet? */
+
+  if (!g_got_master_response)
+    {
+      return false;
+    }
+
+  *result = g_registered_with_master;
+  return true;
+}
+
+/* Send a hole punch request to the master server for the server at the
+ * given address.
+ */
+
+void net_request_hole_punch(net_context_t *context, net_addr_t *addr)
+{
+  net_addr_t *master_addr;
+  net_packet_t *packet;
+
+  master_addr = net_query_resolve_master(context);
+  if (master_addr == NULL)
+    {
+      return;
+    }
+
+  packet = net_new_packet(32);
+  net_write_int16(packet, NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH);
+  net_write_string(packet, net_addr_to_string(addr));
+  net_send_packet(master_addr, packet);
+
+  net_free_packet(packet);
+  net_release_address(master_addr);
+}
+
+/* Polling function, invoked periodically to send queries and
+ * interpret new responses received from remote servers.
+ * Returns zero when the query sequence has completed and all targets
+ * have returned responses or timed out.
+ */
+
+int net_query_poll(net_query_callback_t callback, void *user_data)
+{
+  check_target_timeouts();
+
+  /* Send a query.  This will only send a single query at once. */
+
+  send_one_query();
+
+  /* Check for a response */
+
+  net_query_get_response(callback, user_data);
+
+  return !all_targets_done();
+}
+
+int net_start_lan_query(void)
+{
+  query_target_t *target;
+
+  net_query_init();
+
+  /* Add a broadcast target to the list. */
+
+  target = get_target_for_addr(NULL, true);
+  target->type = QUERY_TARGET_BROADCAST;
+
+  return 1;
+}
+
+int net_start_master_query(void)
+{
+  net_addr_t *master;
+  query_target_t *target;
+
+  net_query_init();
+
+  /* Resolve master address and add to targets list. */
+
+  master = net_query_resolve_master(g_query_context);
+
+  if (master == NULL)
+    {
+      return 0;
+    }
+
+  target = get_target_for_addr(master, true);
+  target->type = QUERY_TARGET_MASTER;
+  net_release_address(master);
+
+  return 1;
+}
+
+void net_lan_query(void)
+{
+  if (net_start_lan_query())
+    {
+      printf("\nSearching for servers on local LAN ...\n");
+
+      net_query_query_loop(net_query_print_callback, NULL);
+
+      printf("\n%i server(s) found.\n", get_num_responses());
+      free_targets();
+    }
+}
+
+void net_master_query(void)
+{
+  if (net_start_master_query())
+    {
+      printf("\nSearching for servers on Internet ...\n");
+
+      net_query_query_loop(net_query_print_callback, NULL);
+
+      printf("\n%i server(s) found.\n", get_num_responses());
+      free_targets();
+    }
+}
+
+void net_query_address(const char *addr_str)
+{
+  net_addr_t *addr;
+  query_target_t *target;
+
+  net_query_init();
+
+  addr = net_resolve_address(g_query_context, addr_str);
+
+  if (addr == NULL)
+    {
+      i_error("net_query_address: Host '%s' not found!", addr_str);
+    }
+
+  /* Add the address to the list of targets. */
+
+  target = get_target_for_addr(addr, true);
+
+  printf("\nQuerying '%s'...\n", addr_str);
+
+  /* Run query loop. */
+
+  net_query_query_loop(net_query_exit_callback, NULL);
+
+  /* Check if the target responded. */
+
+  if (target->state == QUERY_TARGET_RESPONDED)
+    {
+      net_query_print_callback(addr, &target->data, target->ping_time, NULL);
+      net_release_address(addr);
+      free_targets();
+    }
+  else
+    {
+      i_error("No response from '%s'", addr_str);
+    }
+}
+
+net_addr_t *net_find_lan_server(void)
+{
+  query_target_t *target;
+  query_target_t *responder;
+  net_addr_t *result;
+
+  net_query_init();
+
+  /* Add a broadcast target to the list. */
+
+  target = get_target_for_addr(NULL, true);
+  target->type = QUERY_TARGET_BROADCAST;
+
+  /* Run the query loop, and stop at the first target found. */
+
+  net_query_query_loop(net_query_exit_callback, NULL);
+
+  responder = find_first_responder();
+
+  if (responder != NULL)
+    {
+      result = responder->addr;
+      net_reference_address(result);
+    }
+  else
+    {
+      result = NULL;
+    }
+
+  free_targets();
+  return result;
+}
diff --git a/games/NXDoom/src/net_query.h b/games/NXDoom/src/net_query.h
index e0c9e9bef..70dacfecd 100644
--- a/games/NXDoom/src/net_query.h
+++ b/games/NXDoom/src/net_query.h
@@ -1,45 +1,61 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Querying servers to find their current status.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_query.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Querying servers to find their current status.
+ *
+ ****************************************************************************/
 
 #ifndef NET_QUERY_H
 #define NET_QUERY_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "net_defs.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef void (*net_query_callback_t)(net_addr_t *addr,
                                      net_querydata_t *querydata,
                                      unsigned int ping_time,
                                      void *user_data);
 
-extern int NET_StartLANQuery(void);
-extern int NET_StartMasterQuery(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-extern void NET_LANQuery(void);
-extern void NET_MasterQuery(void);
-extern void NET_QueryAddress(const char *addr);
-extern net_addr_t *NET_FindLANServer(void);
+extern int net_start_lan_query(void);
+extern int net_start_master_query(void);
 
-extern int NET_Query_Poll(net_query_callback_t callback, void *user_data);
+extern void net_lan_query(void);
+extern void net_master_query(void);
+extern void net_query_address(const char *addr);
+extern net_addr_t *net_find_lan_server(void);
 
-extern net_addr_t *NET_Query_ResolveMaster(net_context_t *context);
-extern void NET_Query_AddToMaster(net_addr_t *master_addr);
-extern boolean NET_Query_CheckAddedToMaster(boolean *result);
-extern void NET_Query_AddResponse(net_packet_t *packet);
-extern void NET_RequestHolePunch(net_context_t *context, net_addr_t *addr);
+extern int net_query_poll(net_query_callback_t callback, void *user_data);
 
-#endif /* #ifndef NET_QUERY_H */
+extern net_addr_t *net_query_resolve_master(net_context_t *context);
+extern void net_query_add_to_master(net_addr_t *master_addr);
+extern boolean net_query_check_added_to_master(boolean *result);
+extern void net_query_add_response(net_packet_t *packet);
+extern void net_request_hole_punch(net_context_t *context, net_addr_t *addr);
 
+#endif /* NET_QUERY_H */
diff --git a/games/NXDoom/src/net_sdl.c b/games/NXDoom/src/net_sdl.c
index 2965f4234..b57f4d206 100644
--- a/games/NXDoom/src/net_sdl.c
+++ b/games/NXDoom/src/net_sdl.c
@@ -1,23 +1,32 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Networking module which uses SDL_net
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_sdl.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Networking module which uses SDL_net
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "doomtype.h"
 #include "i_system.h"
@@ -29,413 +38,65 @@
 #include "net_sdl.h"
 #include "z_zone.h"
 
-//
-// NETWORKING
-//
-
-
-#ifndef DISABLE_SDL2NET
-
-
-#include <SDL_net.h>
-
-#define DEFAULT_PORT 2342
-
-static boolean initted = false;
-static int port = DEFAULT_PORT;
-static UDPsocket udpsocket;
-static UDPpacket *recvpacket;
-
-typedef struct
-{
-    net_addr_t net_addr;
-    IPaddress sdl_addr;
-} addrpair_t;
-
-static addrpair_t **addr_table;
-static int addr_table_size = -1;
-
-// Initializes the address table
-
-static void NET_SDL_InitAddrTable(void)
-{
-    addr_table_size = 16;
-
-    addr_table = Z_Malloc(sizeof(addrpair_t *) * addr_table_size,
-                          PU_STATIC, 0);
-    memset(addr_table, 0, sizeof(addrpair_t *) * addr_table_size);
-}
-
-static boolean AddressesEqual(IPaddress *a, IPaddress *b)
-{
-    return a->host == b->host
-        && a->port == b->port;
-}
-
-// Finds an address by searching the table.  If the address is not found,
-// it is added to the table.
-
-static net_addr_t *NET_SDL_FindAddress(IPaddress *addr)
-{
-    addrpair_t *new_entry;
-    int empty_entry = -1;
-    int i;
-
-    if (addr_table_size < 0)
-    {
-        NET_SDL_InitAddrTable();
-    }
-
-    for (i=0; i<addr_table_size; ++i)
-    {
-        if (addr_table[i] != NULL
-         && AddressesEqual(addr, &addr_table[i]->sdl_addr))
-        {
-            return &addr_table[i]->net_addr;
-        }
-
-        if (empty_entry < 0 && addr_table[i] == NULL)
-            empty_entry = i;
-    }
-
-    // Was not found in list.  We need to add it.
-
-    // Is there any space in the table? If not, increase the table size
-
-    if (empty_entry < 0)
-    {
-        addrpair_t **new_addr_table;
-        int new_addr_table_size;
-
-        // after reallocing, we will add this in as the first entry
-        // in the new block of memory
-
-        empty_entry = addr_table_size;
-        
-        // allocate a new array twice the size, init to 0 and copy 
-        // the existing table in.  replace the old table.
-
-        new_addr_table_size = addr_table_size * 2;
-        new_addr_table = Z_Malloc(sizeof(addrpair_t *) * new_addr_table_size,
-                                  PU_STATIC, 0);
-        memset(new_addr_table, 0, sizeof(addrpair_t *) * new_addr_table_size);
-        memcpy(new_addr_table, addr_table, 
-               sizeof(addrpair_t *) * addr_table_size);
-        Z_Free(addr_table);
-        addr_table = new_addr_table;
-        addr_table_size = new_addr_table_size;
-    }
-
-    // Add a new entry
-    
-    new_entry = Z_Malloc(sizeof(addrpair_t), PU_STATIC, 0);
-
-    new_entry->sdl_addr = *addr;
-    new_entry->net_addr.refcount = 0;
-    new_entry->net_addr.handle = &new_entry->sdl_addr;
-    new_entry->net_addr.module = &net_sdl_module;
-
-    addr_table[empty_entry] = new_entry;
-
-    return &new_entry->net_addr;
-}
-
-static void NET_SDL_FreeAddress(net_addr_t *addr)
-{
-    int i;
-    
-    for (i=0; i<addr_table_size; ++i)
-    {
-        if (addr == &addr_table[i]->net_addr)
-        {
-            Z_Free(addr_table[i]);
-            addr_table[i] = NULL;
-            return;
-        }
-    }
-
-    I_Error("NET_SDL_FreeAddress: Attempted to remove an unused address!");
-}
-
-static boolean NET_SDL_InitClient(void)
-{
-    int p;
-
-    if (initted)
-        return true;
-
-    //!
-    // @category net
-    // @arg <n>
-    //
-    // Use the specified UDP port for communications, instead of 
-    // the default (2342).
-    //
-
-    p = M_CheckParmWithArgs("-port", 1);
-    if (p > 0)
-        port = atoi(myargv[p+1]);
-
-    SDLNet_Init();
-
-    udpsocket = SDLNet_UDP_Open(0);
-
-    if (udpsocket == NULL)
-    {
-        I_Error("NET_SDL_InitClient: Unable to open a socket!");
-    }
-    
-    recvpacket = SDLNet_AllocPacket(1500);
-
-#ifdef DROP_PACKETS
-    srand(time(NULL));
-#endif
-
-    initted = true;
-
-    return true;
-}
-
-static boolean NET_SDL_InitServer(void)
-{
-    int p;
-
-    if (initted)
-        return true;
-
-    p = M_CheckParmWithArgs("-port", 1);
-    if (p > 0)
-        port = atoi(myargv[p+1]);
-
-    SDLNet_Init();
-
-    udpsocket = SDLNet_UDP_Open(port);
-
-    if (udpsocket == NULL)
-    {
-        I_Error("NET_SDL_InitServer: Unable to bind to port %i", port);
-    }
-
-    recvpacket = SDLNet_AllocPacket(1500);
-#ifdef DROP_PACKETS
-    srand(time(NULL));
-#endif
-
-    initted = true;
-
-    return true;
-}
-
-static void NET_SDL_SendPacket(net_addr_t *addr, net_packet_t *packet)
-{
-    UDPpacket sdl_packet;
-    IPaddress ip;
-   
-    if (addr == &net_broadcast_addr)
-    {
-        SDLNet_ResolveHost(&ip, NULL, port);
-        ip.host = INADDR_BROADCAST;
-    }
-    else
-    {
-        ip = *((IPaddress *) addr->handle);
-    }
-
-#if 0
-    {
-        static int this_second_sent = 0;
-        static int lasttime;
-
-        this_second_sent += packet->len + 64;
-
-        if (I_GetTime() - lasttime > TICRATE)
-        {
-            printf("%i bytes sent in the last second\n", this_second_sent);
-            lasttime = I_GetTime();
-            this_second_sent = 0;
-        }
-    }
-#endif
-
-#ifdef DROP_PACKETS
-    if ((rand() % 4) == 0)
-        return;
-#endif
-
-    sdl_packet.channel = 0;
-    sdl_packet.data = packet->data;
-    sdl_packet.len = packet->len;
-    sdl_packet.address = ip;
-
-    if (!SDLNet_UDP_Send(udpsocket, -1, &sdl_packet))
-    {
-        I_Error("NET_SDL_SendPacket: Error transmitting packet: %s",
-                SDLNet_GetError());
-    }
-}
-
-static boolean NET_SDL_RecvPacket(net_addr_t **addr, net_packet_t **packet)
-{
-    int result;
-
-    result = SDLNet_UDP_Recv(udpsocket, recvpacket);
-
-    if (result < 0)
-    {
-        I_Error("NET_SDL_RecvPacket: Error receiving packet: %s",
-                SDLNet_GetError());
-    }
-
-    // no packets received
-
-    if (result == 0)
-        return false;
-
-    // Put the data into a new packet structure
-
-    *packet = NET_NewPacket(recvpacket->len);
-    memcpy((*packet)->data, recvpacket->data, recvpacket->len);
-    (*packet)->len = recvpacket->len;
-
-    // Address
-
-    *addr = NET_SDL_FindAddress(&recvpacket->address);
-
-    return true;
-}
-
-void NET_SDL_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
-{
-    IPaddress *ip;
-    uint32_t host;
-    uint16_t port;
-
-    ip = (IPaddress *) addr->handle;
-    host = SDLNet_Read32(&ip->host);
-    port = SDLNet_Read16(&ip->port);
-
-    M_snprintf(buffer, buffer_len, "%i.%i.%i.%i",
-               (host >> 24) & 0xff, (host >> 16) & 0xff,
-               (host >> 8) & 0xff, host & 0xff);
-
-    // If we are using the default port we just need to show the IP address,
-    // but otherwise we need to include the port. This is important because
-    // we use the string representation in the setup tool to provided an
-    // address to connect to.
-    if (port != DEFAULT_PORT)
-    {
-        char portbuf[10];
-        M_snprintf(portbuf, sizeof(portbuf), ":%i", port);
-        M_StringConcat(buffer, portbuf, buffer_len);
-    }
-}
-
-net_addr_t *NET_SDL_ResolveAddress(const char *address)
-{
-    IPaddress ip;
-    char *addr_hostname;
-    int addr_port;
-    int result;
-    char *colon;
-
-    colon = strchr(address, ':');
-
-    addr_hostname = M_StringDuplicate(address);
-    if (colon != NULL)
-    {
-	addr_hostname[colon - address] = '\0';
-	addr_port = atoi(colon + 1);
-    }
-    else
-    {
-	addr_port = port;
-    }
-    
-    result = SDLNet_ResolveHost(&ip, addr_hostname, addr_port);
-
-    free(addr_hostname);
-
-    if (result)
-    {
-        // unable to resolve
-
-        return NULL;
-    }
-    else
-    {
-        return NET_SDL_FindAddress(&ip);
-    }
-}
-
-// Complete module
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static boolean net_null_init_client(void);
+static boolean net_null_init_server(void);
+static void net_null_send_packet(net_addr_t *addr, net_packet_t *packet);
+static boolean net_null_recv_packet(net_addr_t **addr,
+        net_packet_t **packet);
+static void net_null_addr_to_string(net_addr_t *addr, char *buffer,
+                                  int buffer_len);
+static void net_null_free_address(net_addr_t *addr);
+static net_addr_t *net_null_resolve_address(const char *address);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 net_module_t net_sdl_module =
 {
-    NET_SDL_InitClient,
-    NET_SDL_InitServer,
-    NET_SDL_SendPacket,
-    NET_SDL_RecvPacket,
-    NET_SDL_AddrToString,
-    NET_SDL_FreeAddress,
-    NET_SDL_ResolveAddress,
+  net_null_init_client,     net_null_init_server,  net_null_send_packet,
+  net_null_recv_packet,      net_null_addr_to_string, net_null_free_address,
+  net_null_resolve_address,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-#else // DISABLE_SDL2NET
-
-// no-op implementation
-
-
-static boolean NET_NULL_InitClient(void)
+static net_addr_t *net_null_resolve_address(const char *address)
 {
-    return false;
+  return NULL;
 }
 
-
-static boolean NET_NULL_InitServer(void)
+static boolean net_null_init_client(void)
 {
-    return false;
+  return false;
 }
 
+static boolean net_null_init_server(void)
+{
+  return false;
+}
 
-static void NET_NULL_SendPacket(net_addr_t *addr, net_packet_t *packet)
+static void net_null_send_packet(net_addr_t *addr, net_packet_t *packet)
 {
 }
 
-
-static boolean NET_NULL_RecvPacket(net_addr_t **addr, net_packet_t **packet)
+static boolean net_null_recv_packet(net_addr_t **addr,
+        net_packet_t **packet)
 {
-    return false;
+  return false;
 }
 
-
-static void NET_NULL_AddrToString(net_addr_t *addr, char *buffer, int buffer_len)
-{
-
-}
-
-
-static void NET_NULL_FreeAddress(net_addr_t *addr)
+static void net_null_addr_to_string(net_addr_t *addr, char *buffer,
+                                  int buffer_len)
 {
 }
 
-
-net_addr_t *NET_NULL_ResolveAddress(const char *address)
+static void net_null_free_address(net_addr_t *addr)
 {
-    return NULL;
 }
-
-
-net_module_t net_sdl_module =
-{
-    NET_NULL_InitClient,
-    NET_NULL_InitServer,
-    NET_NULL_SendPacket,
-    NET_NULL_RecvPacket,
-    NET_NULL_AddrToString,
-    NET_NULL_FreeAddress,
-    NET_NULL_ResolveAddress,
-};
-
-
-#endif // DISABLE_SDL2NET
diff --git a/games/NXDoom/src/net_sdl.h b/games/NXDoom/src/net_sdl.h
index c249de1c4..6f972fd1d 100644
--- a/games/NXDoom/src/net_sdl.h
+++ b/games/NXDoom/src/net_sdl.h
@@ -1,26 +1,39 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Networking module which uses SDL_net
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_sdl.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Networking module which uses SDL_net
+ *
+ *
+ ****************************************************************************/
 
 #ifndef NET_SDL_H
 #define NET_SDL_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "net_defs.h"
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern net_module_t net_sdl_module;
 
-#endif /* #ifndef NET_SDL_H */
-
+#endif /* NET_SDL_H */
diff --git a/games/NXDoom/src/net_server.c b/games/NXDoom/src/net_server.c
index 9374b64ec..61b5246f1 100644
--- a/games/NXDoom/src/net_server.c
+++ b/games/NXDoom/src/net_server.c
@@ -1,28 +1,37 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Network server code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_server.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Network server code
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "config.h"
 
-#include "doomtype.h"
 #include "d_mode.h"
+#include "doomtype.h"
 #include "i_system.h"
 #include "i_timer.h"
 #include "m_argv.h"
@@ -35,2063 +44,2167 @@
 #include "net_loop.h"
 #include "net_packet.h"
 #include "net_query.h"
-#include "net_server.h"
 #include "net_sdl.h"
+#include "net_server.h"
 #include "net_structrw.h"
 
-// How often to refresh our registration with the master server.
-#define MASTER_REFRESH_PERIOD 30  /* twice per minute */
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* How often to refresh our registration with the master server. */
+
+#define MASTER_REFRESH_PERIOD 30 /* twice per minute */
+
+/* How often to re-resolve the address of the master server? */
 
-// How often to re-resolve the address of the master server?
 #define MASTER_RESOLVE_PERIOD 8 * 60 * 60 /* 8 hours */
 
+#define net_sv_expand_ticnum(b) net_expand_tic_num(recvwindow_start, (b))
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef enum
 {
-    // waiting for the game to be "launched" (key player to press the start
-    // button)
+  /* waiting for the game to be "launched" (key player to press the start
+   * button)
+   */
 
-    SERVER_WAITING_LAUNCH,
+  SERVER_WAITING_LAUNCH,
 
-    // game has been launched, we are waiting for all players to be ready
-    // so the game can start.
+  /* game has been launched, we are waiting for all players to be ready
+   * so the game can start.
+   */
 
-    SERVER_WAITING_START,
+  SERVER_WAITING_START,
 
-    // in a game
+  /* in a game */
 
-    SERVER_IN_GAME,
+  SERVER_IN_GAME,
 } net_server_state_t;
 
 typedef struct
 {
-    boolean active;
-    int player_number;
-    net_addr_t *addr;
-    net_connection_t connection;
-    int last_send_time;
-    char *name;
+  boolean active;
+  int player_number;
+  net_addr_t *addr;
+  net_connection_t connection;
+  int last_send_time;
+  char *name;
 
-    // If true, the client has sent the NET_PACKET_TYPE_GAMESTART
-    // message indicating that it is ready for the game to start.
+  /* If true, the client has sent the NET_PACKET_TYPE_GAMESTART
+   * message indicating that it is ready for the game to start.
+   */
 
-    boolean ready;
+  boolean ready;
 
-    // Time that this client connected to the server.
-    // This is used to determine the controller (oldest client).
+  /* Time that this client connected to the server.
+   * This is used to determine the controller (oldest client).
+   */
 
-    unsigned int connect_time;
+  unsigned int connect_time;
 
-    // Last time new gamedata was received from this client
+  /* Last time new gamedata was received from this client */
 
-    int last_gamedata_time;
+  int last_gamedata_time;
 
-    // recording a demo without -longtics
+  /* recording a demo without -longtics */
 
-    boolean recording_lowres;
+  boolean recording_lowres;
 
-    // send queue: items to send to the client
-    // this is a circular buffer
+  /* send queue: items to send to the client
+   * this is a circular buffer
+   */
 
-    int sendseq;
-    net_full_ticcmd_t sendqueue[BACKUPTICS];
+  int sendseq;
+  net_full_ticcmd_t sendqueue[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-    // Latest acknowledged by the client
+  /* Latest acknowledged by the client */
 
-    unsigned int acknowledged;
+  unsigned int acknowledged;
 
-    // Value of max_players specified by the client on connect.
+  /* Value of max_players specified by the client on connect. */
 
-    int max_players;
+  int max_players;
 
-    // Observer: receives data but does not participate in the game.
+  /* Observer: receives data but does not participate in the game. */
 
-    boolean drone;
+  boolean drone;
 
-    // SHA1 hash sums of the client's WAD directory and dehacked data
+  /* SHA1 hash sums of the client's WAD directory and dehacked data */
 
-    sha1_digest_t wad_sha1sum;
-    sha1_digest_t deh_sha1sum;
+  sha1_digest_t wad_sha1sum;
+  sha1_digest_t deh_sha1sum;
 
-    // Is this client is playing with the Freedoom IWAD?
+  /* Is this client is playing with the Freedoom IWAD? */
 
-    unsigned int is_freedoom;
+  unsigned int is_freedoom;
 
-    // Player class (for Hexen)
-
-    int player_class;
+  /* Player class (for Hexen) */
 
+  int player_class;
 } net_client_t;
 
-// structure used for the recv window
+/* structure used for the recv window */
 
-typedef struct 
+typedef struct
 {
-    // Whether this tic has been received yet
+  /* Whether this tic has been received yet */
 
-    boolean active;
+  boolean active;
 
-    // Latency value received from the client
+  /* Latency value received from the client */
 
-    signed int latency;
+  signed int latency;
 
-    // Last time we sent a resend request for this tic
+  /* Last time we sent a resend request for this tic */
 
-    unsigned int resend_time;
+  unsigned int resend_time;
 
-    // Tic data itself
+  /* Tic data itself */
 
-    net_ticdiff_t diff;
+  net_ticdiff_t diff;
 } net_client_recv_t;
 
+typedef enum
+{
+  RANGE_LOCALHOST, /* Same process or 127.x */
+  RANGE_PRIVATE,   /* RFC 1918 */
+  RANGE_PUBLIC,    /* The public Internet */
+} ip_range_t;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static net_server_state_t server_state;
 static boolean server_initialized = false;
 static net_client_t clients[MAXNETNODES];
-static net_client_t *sv_players[NET_MAXPLAYERS];
+static net_client_t *sv_players[CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 static net_context_t *server_context;
 static unsigned int sv_gamemode;
 static unsigned int sv_gamemission;
 static net_gamesettings_t sv_settings;
 
-// For registration with master server:
+/* For registration with master server: */
 
 static net_addr_t *master_server = NULL;
 static unsigned int master_refresh_time;
 static unsigned int master_resolve_time;
 
-// receive window
+/* receive window */
 
 static unsigned int recvwindow_start;
-static net_client_recv_t recvwindow[BACKUPTICS][NET_MAXPLAYERS];
+static net_client_recv_t recvwindow[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS]
+                                   [CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS];
 
-#define NET_SV_ExpandTicNum(b) NET_ExpandTicNum(recvwindow_start, (b))
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-static void NET_SV_DisconnectClient(net_client_t *client)
+static void net_sv_send_console_message(net_client_t *client, const char *s,
+                                        ...) PRINTF_ATTR(2, 3);
+static void net_sv_broadcast_message(const char *s, ...) PRINTF_ATTR(1, 2);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void net_sv_disconnect_client(net_client_t *client)
 {
-    if (client->active)
+  if (client->active)
     {
-        NET_Conn_Disconnect(&client->connection);
+      net_conn_disconnect(&client->connection);
     }
 }
 
-static boolean ClientConnected(net_client_t *client)
+static boolean client_connected(net_client_t *client)
 {
-    // Check that the client is properly connected: ie. not in the 
-    // process of connecting or disconnecting
+  /* Check that the client is properly connected: ie. not in the
+   * process of connecting or disconnecting
+   */
 
-    return client->active 
-        && client->connection.state == NET_CONN_STATE_CONNECTED;
+  return client->active &&
+         client->connection.state == NET_CONN_STATE_CONNECTED;
 }
 
-// Send a message to be displayed on a client's console
+/* Send a message to be displayed on a client's console */
 
-static void NET_SV_SendConsoleMessage(net_client_t *client, const char *s, ...) PRINTF_ATTR(2, 3);
-static void NET_SV_SendConsoleMessage(net_client_t *client, const char *s, ...)
+static void net_sv_send_console_message(net_client_t *client, const char *s,
+                                        ...)
 {
-    char buf[1024];
-    va_list args;
-    net_packet_t *packet;
+  char buf[1024];
+  va_list args;
+  net_packet_t *packet;
 
-    va_start(args, s);
-    M_vsnprintf(buf, sizeof(buf), s, args);
-    va_end(args);
-    
-    packet = NET_Conn_NewReliable(&client->connection, 
-                                  NET_PACKET_TYPE_CONSOLE_MESSAGE);
+  va_start(args, s);
+  vsnprintf(buf, sizeof(buf), s, args);
+  va_end(args);
 
-    NET_WriteString(packet, buf);
+  packet = net_conn_new_reliable(&client->connection,
+                                NET_PACKET_TYPE_CONSOLE_MESSAGE);
+
+  net_write_string(packet, buf);
 }
 
-// Send a message to all clients
+/* Send a message to all clients */
 
-static void NET_SV_BroadcastMessage(const char *s, ...) PRINTF_ATTR(1, 2);
-static void NET_SV_BroadcastMessage(const char *s, ...)
+static void net_sv_broadcast_message(const char *s, ...)
 {
-    char buf[1024];
-    va_list args;
-    int i;
+  char buf[1024];
+  va_list args;
+  int i;
 
-    va_start(args, s);
-    M_vsnprintf(buf, sizeof(buf), s, args);
-    va_end(args);
+  va_start(args, s);
+  vsnprintf(buf, sizeof(buf), s, args);
+  va_end(args);
 
-    for (i=0; i<MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]))
+      if (client_connected(&clients[i]))
         {
-            NET_SV_SendConsoleMessage(&clients[i], "%s", buf);
+          net_sv_send_console_message(&clients[i], "%s", buf);
         }
     }
 
-    printf("%s\n", buf);
+  printf("%s\n", buf);
 }
 
+/* Assign player numbers to connected clients */
 
-// Assign player numbers to connected clients
-
-static void NET_SV_AssignPlayers(void)
+static void net_sv_assign_players(void)
 {
-    int i;
-    int pl;
+  int i;
+  int pl;
 
-    pl = 0;
+  pl = 0;
 
-    for (i=0; i<MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]))
+      if (client_connected(&clients[i]))
         {
-            if (!clients[i].drone)
+          if (!clients[i].drone)
             {
-                sv_players[pl] = &clients[i];
-                sv_players[pl]->player_number = pl;
-                ++pl;
+              sv_players[pl] = &clients[i];
+              sv_players[pl]->player_number = pl;
+              ++pl;
             }
-            else
+          else
             {
-                clients[i].player_number = -1;
+              clients[i].player_number = -1;
             }
         }
     }
 
-    for (; pl<NET_MAXPLAYERS; ++pl)
+  for (; pl < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++pl)
     {
-        sv_players[pl] = NULL;
+      sv_players[pl] = NULL;
     }
 }
 
-// Returns the number of players currently connected.
+/* Returns the number of players currently connected. */
 
-static int NET_SV_NumPlayers(void)
+static int net_sv_num_players(void)
 {
-    int i;
-    int result;
+  int i;
+  int result;
 
-    result = 0;
+  result = 0;
 
-    for (i=0; i<NET_MAXPLAYERS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (sv_players[i] != NULL && ClientConnected(sv_players[i]))
+      if (sv_players[i] != NULL && client_connected(sv_players[i]))
         {
-            result += 1;
+          result += 1;
         }
     }
 
-    return result;
+  return result;
 }
 
-// Returns the number of players ready to start the game.
+/* Returns the number of players ready to start the game. */
 
-static int NET_SV_NumReadyPlayers(void)
+static int net_sv_num_ready_players(void)
 {
-    int result = 0;
-    int i;
+  int result = 0;
+  int i;
 
-    for (i = 0; i < MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i])
-         && !clients[i].drone && clients[i].ready)
+      if (client_connected(&clients[i]) && !clients[i].drone &&
+          clients[i].ready)
         {
-            ++result;
+          ++result;
         }
     }
 
-    return result;
+  return result;
 }
 
-// Returns the maximum number of players that can play.
+/* Returns the maximum number of players that can play. */
 
-static int NET_SV_MaxPlayers(void)
+static int net_sv_max_players(void)
 {
-    int i;
+  int i;
 
-    for (i = 0; i < MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]))
+      if (client_connected(&clients[i]))
         {
-            return clients[i].max_players;
+          return clients[i].max_players;
         }
     }
 
-    return NET_MAXPLAYERS;
+  return CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS;
 }
 
-// Returns the number of drones currently connected.
+/* Returns the number of drones currently connected. */
 
-static int NET_SV_NumDrones(void)
+static int net_sv_num_drones(void)
 {
-    int i;
-    int result;
+  int i;
+  int result;
 
-    result = 0;
+  result = 0;
 
-    for (i=0; i<MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]) && clients[i].drone)
+      if (client_connected(&clients[i]) && clients[i].drone)
         {
-            result += 1;
+          result += 1;
         }
     }
 
-    return result;
+  return result;
 }
 
-// returns the number of clients connected
+/* returns the number of clients connected */
 
-static int NET_SV_NumClients(void)
+static int net_sv_num_clients(void)
 {
-    int count;
-    int i;
+  int count;
+  int i;
 
-    count = 0;
+  count = 0;
 
-    for (i=0; i<MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]))
+      if (client_connected(&clients[i]))
         {
-            ++count;
+          ++count;
         }
     }
 
-    return count;
+  return count;
 }
 
-// returns a pointer to the client which controls the server
+/* returns a pointer to the client which controls the server */
 
-static net_client_t *NET_SV_Controller(void)
+static net_client_t *net_sv_controller(void)
 {
-    net_client_t *best;
-    int i;
+  net_client_t *best;
+  int i;
 
-    // Find the oldest client (first to connect).
+  /* Find the oldest client (first to connect). */
 
-    best = NULL;
+  best = NULL;
 
-    for (i=0; i<MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        // Can't be controller?
+      /* Can't be controller? */
 
-        if (!ClientConnected(&clients[i]) || clients[i].drone)
+      if (!client_connected(&clients[i]) || clients[i].drone)
         {
-            continue;
+          continue;
         }
 
-        if (best == NULL || clients[i].connect_time < best->connect_time)
+      if (best == NULL || clients[i].connect_time < best->connect_time)
         {
-            best = &clients[i];
+          best = &clients[i];
         }
     }
 
-    return best;
+  return best;
 }
 
-typedef enum
+static ip_range_t client_address_range(const char *addr)
 {
-    RANGE_LOCALHOST,   // Same process or 127.x
-    RANGE_PRIVATE,     // RFC 1918
-    RANGE_PUBLIC,      // The public Internet
-} ip_range_t;
+  if (!strcmp(addr, "local client") || m_string_starts_with(addr, "127."))
+    {
+      return RANGE_LOCALHOST;
+    }
 
-static ip_range_t ClientAddressRange(const char *addr)
-{
-    if (!strcmp(addr, "local client")
-     || M_StringStartsWith(addr, "127."))
+  if (m_string_starts_with(addr, "10.") ||
+      m_string_starts_with(addr, "192.168."))
     {
-        return RANGE_LOCALHOST;
+      return RANGE_PRIVATE;
     }
-    if (M_StringStartsWith(addr, "10.")
-     || M_StringStartsWith(addr, "192.168."))
-    {
-        return RANGE_PRIVATE;
-    }
-    return RANGE_PUBLIC;
+
+  return RANGE_PUBLIC;
 }
 
-static void NET_SV_SendWaitingData(net_client_t *client)
+static void net_sv_send_waiting_data(net_client_t *client)
 {
-    net_waitdata_t wait_data;
-    net_packet_t *packet;
-    net_client_t *controller;
-    ip_range_t client_range, player_range;
-    const char *addr;
-    int i;
+  net_waitdata_t wait_data;
+  net_packet_t *packet;
+  net_client_t *controller;
+  ip_range_t client_range, player_range;
+  const char *addr;
+  int i;
 
-    NET_SV_AssignPlayers();
+  net_sv_assign_players();
 
-    controller = NET_SV_Controller();
+  controller = net_sv_controller();
 
-    wait_data.num_players = NET_SV_NumPlayers();
-    wait_data.num_drones = NET_SV_NumDrones();
-    wait_data.ready_players = NET_SV_NumReadyPlayers();
-    wait_data.max_players = NET_SV_MaxPlayers();
-    wait_data.is_controller = (client == controller);
-    wait_data.consoleplayer = client->player_number;
+  wait_data.num_players = net_sv_num_players();
+  wait_data.num_drones = net_sv_num_drones();
+  wait_data.ready_players = net_sv_num_ready_players();
+  wait_data.max_players = net_sv_max_players();
+  wait_data.is_controller = (client == controller);
+  wait_data.consoleplayer = client->player_number;
 
-    // Send the WAD and dehacked checksums of the controlling client.
-    // If no controller found (?), send the details that the client
-    // is expecting anyway.
+  /* Send the WAD and dehacked checksums of the controlling client.
+   * If no controller found (?), send the details that the client
+   * is expecting anyway.
+   */
 
-    if (controller == NULL)
+  if (controller == NULL)
     {
-        controller = client;
+      controller = client;
     }
 
-    memcpy(&wait_data.wad_sha1sum, &controller->wad_sha1sum,
-           sizeof(sha1_digest_t));
-    memcpy(&wait_data.deh_sha1sum, &controller->deh_sha1sum,
-           sizeof(sha1_digest_t));
-    wait_data.is_freedoom = controller->is_freedoom;
+  memcpy(&wait_data.wad_sha1sum, &controller->wad_sha1sum,
+         sizeof(sha1_digest_t));
+  memcpy(&wait_data.deh_sha1sum, &controller->deh_sha1sum,
+         sizeof(sha1_digest_t));
+  wait_data.is_freedoom = controller->is_freedoom;
 
-    // We only send IP addresses to locally-connected clients (including
-    // the 127.* loopback range):
-    addr = NET_AddrToString(client->connection.addr);
-    client_range = ClientAddressRange(addr);
+  /* We only send IP addresses to locally-connected clients (including
+   * the 127.* loopback range):
+   */
 
-    // set name and address of each player:
+  addr = net_addr_to_string(client->connection.addr);
+  client_range = client_address_range(addr);
 
-    for (i = 0; i < wait_data.num_players; ++i)
+  /* set name and address of each player: */
+
+  for (i = 0; i < wait_data.num_players; ++i)
     {
-        M_StringCopy(wait_data.player_names[i],
-                     sv_players[i]->name,
-                     MAXPLAYERNAME);
+      m_str_copy(wait_data.player_names[i], sv_players[i]->name,
+                 CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME);
 
-        // For privacy, only local clients or those on a LAN get to see
-        // addresses. Public clients only get to see their own address,
-        // though we do reveal localhost addresses since they're harmless,
-        // and we do reveal when a client is connected via LAN.
-        addr = NET_AddrToString(sv_players[i]->addr);
-        player_range = ClientAddressRange(addr);
-        if (client_range == RANGE_LOCALHOST || client_range == RANGE_PRIVATE
-         || i == wait_data.consoleplayer || player_range == RANGE_LOCALHOST)
+      /* For privacy, only local clients or those on a LAN get to see
+       * addresses. Public clients only get to see their own address,
+       * though we do reveal localhost addresses since they're harmless,
+       * and we do reveal when a client is connected via LAN.
+       */
+
+      addr = net_addr_to_string(sv_players[i]->addr);
+      player_range = client_address_range(addr);
+      if (client_range == RANGE_LOCALHOST || client_range == RANGE_PRIVATE ||
+          i == wait_data.consoleplayer || player_range == RANGE_LOCALHOST)
         {
-            M_StringCopy(wait_data.player_addrs[i], addr, MAXPLAYERNAME);
+          m_str_copy(wait_data.player_addrs[i], addr,
+                     CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME);
         }
-        else if (player_range == RANGE_PRIVATE)
+      else if (player_range == RANGE_PRIVATE)
         {
-            M_snprintf(wait_data.player_addrs[i], MAXPLAYERNAME,
-                       "[LAN player]");
+          snprintf(wait_data.player_addrs[i],
+                   CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME,
+                   "[LAN player]");
         }
-        else
+      else
         {
-            M_snprintf(wait_data.player_addrs[i], MAXPLAYERNAME,
-                       "[address hidden]");
+          snprintf(wait_data.player_addrs[i],
+                   CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME,
+                   "[address hidden]");
         }
     }
 
-    // Construct packet:
+  /* Construct packet: */
 
-    packet = NET_NewPacket(10);
-    NET_WriteInt16(packet, NET_PACKET_TYPE_WAITING_DATA);
-    NET_WriteWaitData(packet, &wait_data);
+  packet = net_new_packet(10);
+  net_write_int16(packet, NET_PACKET_TYPE_WAITING_DATA);
+  net_write_wait_data(packet, &wait_data);
 
-    // Send packet to client and free
+  /* Send packet to client and free */
 
-    NET_Conn_SendPacket(&client->connection, packet);
-    NET_FreePacket(packet);
+  net_conn_send_packet(&client->connection, packet);
+  net_free_packet(packet);
 }
 
-// Find the latest tic which has been acknowledged as received by
-// all clients.
+/* Find the latest tic which has been acknowledged as received by
+ * all clients.
+ */
 
-static unsigned int NET_SV_LatestAcknowledged(void)
+static unsigned int net_sv_latest_acknowledged(void)
 {
-    unsigned int lowtic = UINT_MAX;
-    int i;
+  unsigned int lowtic = UINT_MAX;
+  int i;
 
-    for (i=0; i<MAXNETNODES; ++i) 
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]))
+      if (client_connected(&clients[i]))
         {
-            if (clients[i].acknowledged < lowtic)
+          if (clients[i].acknowledged < lowtic)
             {
-                lowtic = clients[i].acknowledged;
+              lowtic = clients[i].acknowledged;
             }
         }
     }
 
-    return lowtic;
+  return lowtic;
 }
 
+/* Possibly advance the recv window if all connected clients have
+ * used the data in the window
+ */
 
-// Possibly advance the recv window if all connected clients have
-// used the data in the window
-
-static void NET_SV_AdvanceWindow(void)
+static void net_sv_advance_window(void)
 {
-    unsigned int lowtic;
-    int i;
+  unsigned int lowtic;
+  int i;
 
-    if (NET_SV_NumPlayers() <= 0)
+  if (net_sv_num_players() <= 0)
     {
-        return;
+      return;
     }
 
-    lowtic = NET_SV_LatestAcknowledged();
+  lowtic = net_sv_latest_acknowledged();
 
-    // Advance the recv window until it catches up with lowtic
+  /* Advance the recv window until it catches up with lowtic */
 
-    while (recvwindow_start < lowtic)
+  while (recvwindow_start < lowtic)
     {
-        boolean should_advance;
+      boolean should_advance;
 
-        // Check we have tics from all players for first tic in
-        // the recv window
-        
-        should_advance = true;
+      /* Check we have tics from all players for first tic in
+       * the recv window
+       */
 
-        for (i=0; i<NET_MAXPLAYERS; ++i)
+      should_advance = true;
+
+      for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
         {
-            if (sv_players[i] == NULL || !ClientConnected(sv_players[i]))
+          if (sv_players[i] == NULL || !client_connected(sv_players[i]))
             {
-                continue;
+              continue;
             }
 
-            if (!recvwindow[0][i].active)
+          if (!recvwindow[0][i].active)
             {
-                should_advance = false;
-                break;
+              should_advance = false;
+              break;
             }
         }
 
-        if (!should_advance)
+      if (!should_advance)
         {
-            // The first tic is not complete: ie. we have not 
-            // received tics from all connected players.  This can
-            // happen if only one player is in the game.
+          /* The first tic is not complete: ie. we have not
+           * received tics from all connected players. This can
+           * happen if only one player is in the game.
+           */
 
-            break;
+          break;
         }
-        
-        // Advance the window
 
-        memmove(recvwindow, recvwindow + 1,
-                sizeof(*recvwindow) * (BACKUPTICS - 1));
-        memset(&recvwindow[BACKUPTICS-1], 0, sizeof(*recvwindow));
-        ++recvwindow_start;
-        NET_Log("server: advanced receive window to %d", recvwindow_start);
+      /* Advance the window */
+
+      memmove(recvwindow, recvwindow + 1,
+              sizeof(*recvwindow) *
+              (CONFIG_GAMES_NXDOOM_NET_BACKUPTICS - 1));
+      memset(&recvwindow[CONFIG_GAMES_NXDOOM_NET_BACKUPTICS - 1],
+             0, sizeof(*recvwindow));
+      ++recvwindow_start;
+      net_log_info("server: advanced receive window to %d",
+              recvwindow_start);
     }
 }
 
-// Given an address, find the corresponding client
+/* Given an address, find the corresponding client */
 
-static net_client_t *NET_SV_FindClient(net_addr_t *addr)
+static net_client_t *net_sv_find_client(net_addr_t *addr)
 {
-    int i;
+  int i;
 
-    for (i=0; i<MAXNETNODES; ++i) 
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (clients[i].active && clients[i].addr == addr)
+      if (clients[i].active && clients[i].addr == addr)
         {
-            // found the client
+          /* found the client */
 
-            return &clients[i];
+          return &clients[i];
         }
     }
 
-    return NULL;
+  return NULL;
 }
 
-// send a rejection packet to a client
+/* send a rejection packet to a client */
 
-static void NET_SV_SendReject(net_addr_t *addr, const char *msg)
+static void net_sv_send_reject(net_addr_t *addr, const char *msg)
 {
-    net_packet_t *packet;
+  net_packet_t *packet;
 
-    NET_Log("server: sending reject to %s", NET_AddrToString(addr));
+  net_log_info("server: sending reject to %s", net_addr_to_string(addr));
 
-    packet = NET_NewPacket(10);
-    NET_WriteInt16(packet, NET_PACKET_TYPE_REJECTED);
-    NET_WriteString(packet, msg);
-    NET_SendPacket(addr, packet);
-    NET_FreePacket(packet);
+  packet = net_new_packet(10);
+  net_write_int16(packet, NET_PACKET_TYPE_REJECTED);
+  net_write_string(packet, msg);
+  net_send_packet(addr, packet);
+  net_free_packet(packet);
 }
 
-static void NET_SV_InitNewClient(net_client_t *client, net_addr_t *addr,
-                                 net_protocol_t protocol)
+static void net_sv_init_new_client(net_client_t *client, net_addr_t *addr,
+                                   net_protocol_t protocol)
 {
-    client->active = true;
-    client->connect_time = I_GetTimeMS();
-    NET_Conn_InitServer(&client->connection, addr, protocol);
-    client->addr = addr;
-    NET_ReferenceAddress(addr);
-    client->last_send_time = -1;
+  client->active = true;
+  client->connect_time = i_get_time_ms();
+  net_conn_init_server(&client->connection, addr, protocol);
+  client->addr = addr;
+  net_reference_address(addr);
+  client->last_send_time = -1;
 
-    // init the ticcmd send queue
+  /* init the ticcmd send queue */
 
-    client->sendseq = 0;
-    client->acknowledged = 0;
-    client->drone = false;
-    client->ready = false;
+  client->sendseq = 0;
+  client->acknowledged = 0;
+  client->drone = false;
+  client->ready = false;
 
-    client->last_gamedata_time = 0;
+  client->last_gamedata_time = 0;
 
-    memset(client->sendqueue, 0xff, sizeof(client->sendqueue));
+  memset(client->sendqueue, 0xff, sizeof(client->sendqueue));
 
-    NET_Log("server: initialized new client from %s", NET_AddrToString(addr));
+  net_log_info("server: initialized new client from %s",
+               net_addr_to_string(addr));
 }
 
-// parse a SYN from a client(initiating a connection)
+/* parse a SYN from a client(initiating a connection) */
 
-static void NET_SV_ParseSYN(net_packet_t *packet, net_client_t *client,
-                            net_addr_t *addr)
+static void net_sv_parse_syn(net_packet_t *packet, net_client_t *client,
+                             net_addr_t *addr)
 {
-    unsigned int magic;
-    net_connect_data_t data;
-    net_packet_t *reply;
-    net_protocol_t protocol;
-    char *player_name;
-    char *client_version;
-    int num_players;
-    int i;
+  unsigned int magic;
+  net_connect_data_t data;
+  net_packet_t *reply;
+  net_protocol_t protocol;
+  char *player_name;
+  char *client_version;
+  int num_players;
+  int i;
 
-    NET_Log("server: processing SYN packet");
+  net_log_info("server: processing SYN packet");
 
-    // Read the magic number and check it is the expected one.
-    if (!NET_ReadInt32(packet, &magic))
+  /* Read the magic number and check it is the expected one. */
+
+  if (!net_read_int32(packet, &magic))
     {
-        NET_Log("server: error: no magic number for SYN");
-        return;
+      net_log_err("server: no magic number for SYN");
+      return;
     }
 
-    switch (magic)
+  switch (magic)
     {
-        case NET_MAGIC_NUMBER:
-            break;
+    case NET_MAGIC_NUMBER:
+      break;
 
-        case NET_OLD_MAGIC_NUMBER:
-            NET_Log("server: error: client using old magic number: %d", magic);
-            NET_SV_SendReject(addr,
-                "You are using an old client version that is not supported by "
-                "this server. This server is running " PACKAGE_STRING ".");
-            return;
+    case NET_OLD_MAGIC_NUMBER:
+      net_log_err("server: client using old magic number: %d", magic);
+      net_sv_send_reject(
+          addr,
+          "You are using an old client version that is not supported by "
+          "this server. This server is running " PACKAGE_STRING ".");
+      return;
 
-        default:
-            NET_Log("server: error: wrong magic number: %d", magic);
-            return;
+    default:
+      net_log_err("server: wrong magic number: %d", magic);
+      return;
     }
 
-    // Read the client version string. We actually now only use this when
-    // sending a reject message, as we only reject if we can't negotiate a
-    // common protocol (below).
-    client_version = NET_ReadString(packet);
-    if (client_version == NULL)
+  /* Read the client version string. We actually now only use this when
+   * sending a reject message, as we only reject if we can't negotiate a
+   * common protocol (below).
+   */
+
+  client_version = net_read_string(packet);
+  if (client_version == NULL)
     {
-        NET_Log("server: error: no version from client");
-        return;
+      net_log_err("server: no version from client");
+      return;
     }
 
-    // Read the client's list of accepted protocols. Net play between forks
-    // of Chocolate Doom is accepted provided that they can negotiate a
-    // common accepted protocol.
-    protocol = NET_ReadProtocolList(packet);
-    if (protocol == NET_PROTOCOL_UNKNOWN)
-    {
-        char reject_msg[256];
+  /* Read the client's list of accepted protocols. Net play between forks
+   * of Chocolate Doom is accepted provided that they can negotiate a
+   * common accepted protocol.
+   */
 
-        M_snprintf(reject_msg, sizeof(reject_msg),
-            "Version mismatch: server version is: " PACKAGE_STRING "; "
-            "client is: %s. No common compatible protocol could be "
-            "negotiated.", client_version);
-        NET_SV_SendReject(addr, reject_msg);
-        NET_Log("server: error: no common protocol");
-        return;
+  protocol = net_read_protocol_list(packet);
+  if (protocol == NET_PROTOCOL_UNKNOWN)
+    {
+      char reject_msg[256];
+
+      snprintf(reject_msg, sizeof(reject_msg),
+               "Version mismatch: server version is: " PACKAGE_STRING "; "
+               "client is: %s. No common compatible protocol could be "
+               "negotiated.",
+               client_version);
+      net_sv_send_reject(addr, reject_msg);
+      net_log_err("server: no common protocol");
+      return;
     }
 
-    // Read connect data, and check that the game mode/mission are valid
-    // and the max_players value is in a sensible range.
-    if (!NET_ReadConnectData(packet, &data))
+  /* Read connect data, and check that the game mode/mission are valid
+   * and the max_players value is in a sensible range.
+   */
+
+  if (!net_read_connect_data(packet, &data))
     {
-        NET_Log("server: error: failed to read connect data");
-        return;
+      net_log_err("server: failed to read connect data");
+      return;
     }
 
-    if (!D_ValidGameMode(data.gamemission, data.gamemode)
-     || data.max_players > NET_MAXPLAYERS)
+  if (!d_valid_game_mode(data.gamemission, data.gamemode) ||
+      data.max_players > CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS)
     {
-        NET_Log("server: error: invalid connect data, max_players=%d, "
-                "gamemission=%d, gamemode=%d",
-                data.max_players, data.gamemission, data.gamemode);
-        return;
+      net_log_err("server: invalid connect data, max_players=%d, "
+                  "gamemission=%d, gamemode=%d",
+                  data.max_players, data.gamemission, data.gamemode);
+      return;
     }
 
-    // Read the player's name
-    player_name = NET_ReadString(packet);
-    if (player_name == NULL)
+  /* Read the player's name */
+
+  player_name = net_read_string(packet);
+  if (player_name == NULL)
     {
-        NET_Log("server: error: failed to read player name");
-        return;
+      net_log_err("server: failed to read player name");
+      return;
     }
 
-    // At this point we have received a valid SYN.
+  /* At this point we have received a valid SYN. */
 
-    // Not accepting new connections?
-    if (server_state != SERVER_WAITING_LAUNCH)
+  /* Not accepting new connections? */
+
+  if (server_state != SERVER_WAITING_LAUNCH)
     {
-        NET_Log("server: error: not in waiting launch state, server_state=%d",
-                server_state);
-        NET_SV_SendReject(addr,
-                          "Server is not currently accepting connections");
-        return;
+      net_log_err("server: not in waiting launch state, server_state=%d",
+                  server_state);
+      net_sv_send_reject(addr,
+                         "Server is not currently accepting connections");
+      return;
     }
 
-    // Before accepting a new client, check that there is a slot free.
-    NET_SV_AssignPlayers();
-    num_players = NET_SV_NumPlayers();
+  /* Before accepting a new client, check that there is a slot free. */
 
-    if ((!data.drone && num_players >= NET_SV_MaxPlayers())
-     || NET_SV_NumClients() >= MAXNETNODES)
+  net_sv_assign_players();
+  num_players = net_sv_num_players();
+
+  if ((!data.drone && num_players >= net_sv_max_players()) ||
+      net_sv_num_clients() >= MAXNETNODES)
     {
-        NET_Log("server: no more players, num_players=%d, max=%d",
-                num_players, NET_SV_MaxPlayers());
-        NET_SV_SendReject(addr, "Server is full!");
-        return;
+      net_log_info("server: no more players, num_players=%d, max=%d",
+                   num_players, net_sv_max_players());
+      net_sv_send_reject(addr, "Server is full!");
+      return;
     }
 
-    // TODO: Add server option to allow rejecting clients which set
-    // lowres_turn.  This is potentially desirable as the presence of such
-    // clients affects turning resolution.
+  /* TODO: Add server option to allow rejecting clients which set
+   * lowres_turn. This is potentially desirable as the presence of such
+   * clients affects turning resolution.
+   */
 
-    // Adopt the game mode and mission of the first connecting client:
-    if (num_players == 0 && !data.drone)
+  /* Adopt the game mode and mission of the first connecting client: */
+
+  if (num_players == 0 && !data.drone)
     {
-        sv_gamemode = data.gamemode;
-        sv_gamemission = data.gamemission;
-        NET_Log("server: new game, mode=%d, mission=%d",
-                sv_gamemode, sv_gamemission);
+      sv_gamemode = data.gamemode;
+      sv_gamemission = data.gamemission;
+      net_log_info("server: new game, mode=%d, mission=%d", sv_gamemode,
+                   sv_gamemission);
     }
 
-    // Check the connecting client is playing the same game as all
-    // the other clients
-    if (data.gamemode != sv_gamemode || data.gamemission != sv_gamemission)
-    {
-        char msg[128];
-        NET_Log("server: wrong mode/mission, %d != %d || %d != %d",
-                data.gamemode, sv_gamemode, data.gamemission, sv_gamemission);
-        M_snprintf(msg, sizeof(msg),
-                   "Game mismatch: server is %s (%s), client is %s (%s)",
-                   D_GameMissionString(sv_gamemission),
-                   D_GameModeString(sv_gamemode),
-                   D_GameMissionString(data.gamemission),
-                   D_GameModeString(data.gamemode));
+  /* Check the connecting client is playing the same game as all
+   * the other clients
+   */
 
-        NET_SV_SendReject(addr, msg);
-        return;
+  if (data.gamemode != sv_gamemode || data.gamemission != sv_gamemission)
+    {
+      char msg[128];
+      net_log_warn("server: wrong mode/mission, %d != %d || %d != %d",
+                   data.gamemode, sv_gamemode, data.gamemission,
+                   sv_gamemission);
+      snprintf(msg, sizeof(msg),
+               "Game mismatch: server is %s (%s), client is %s (%s)",
+               d_game_mission_string(sv_gamemission),
+               d_game_mode_string(sv_gamemode),
+               d_game_mission_string(data.gamemission),
+               d_game_mode_string(data.gamemode));
+
+      net_sv_send_reject(addr, msg);
+      return;
     }
 
-    // Allocate a client slot if there isn't one already
-    if (client == NULL)
-    {
-        // find a slot, or return if none found
+  /* Allocate a client slot if there isn't one already */
 
-        for (i=0; i<MAXNETNODES; ++i)
+  if (client == NULL)
+    {
+      /* find a slot, or return if none found */
+
+      for (i = 0; i < MAXNETNODES; ++i)
         {
-            if (!clients[i].active)
+          if (!clients[i].active)
             {
-                client = &clients[i];
-                break;
+              client = &clients[i];
+              break;
             }
         }
 
-        if (client == NULL)
+      if (client == NULL)
         {
-            return;
+          return;
         }
     }
-    else
+  else
     {
-        // If this is a recently-disconnected client, deactivate
-        // to allow immediate reconnection
+      /* If this is a recently-disconnected client, deactivate
+       * to allow immediate reconnection
+       */
 
-        if (client->connection.state == NET_CONN_STATE_DISCONNECTED)
+      if (client->connection.state == NET_CONN_STATE_DISCONNECTED)
         {
-            client->active = false;
+          client->active = false;
         }
     }
 
-    // Client already connected?
-    if (client->active)
+  /* Client already connected? */
+
+  if (client->active)
     {
-        NET_Log("server: client is already initialized (duplicate SYN?)");
-        return;
+      net_log_warn("server: client is already initialized (duplicate SYN?)");
+      return;
     }
 
-    // Activate, initialize connection
-    NET_SV_InitNewClient(client, addr, protocol);
+  /* Activate, initialize connection */
 
-    // Save the SHA1 checksums and other details.
-    memcpy(client->wad_sha1sum, data.wad_sha1sum, sizeof(sha1_digest_t));
-    memcpy(client->deh_sha1sum, data.deh_sha1sum, sizeof(sha1_digest_t));
-    client->is_freedoom = data.is_freedoom;
-    client->max_players = data.max_players;
-    client->name = M_StringDuplicate(player_name);
-    client->recording_lowres = data.lowres_turn;
-    client->drone = data.drone;
-    client->player_class = data.player_class;
+  net_sv_init_new_client(client, addr, protocol);
 
-    // Send a reply back to the client, indicating a successful connection
-    // and specifying the protocol that will be used for communications.
-    reply = NET_Conn_NewReliable(&client->connection, NET_PACKET_TYPE_SYN);
-    NET_WriteString(reply, PACKAGE_STRING);
-    NET_WriteProtocol(reply, protocol);
+  /* Save the SHA1 checksums and other details. */
+
+  memcpy(client->wad_sha1sum, data.wad_sha1sum, sizeof(sha1_digest_t));
+  memcpy(client->deh_sha1sum, data.deh_sha1sum, sizeof(sha1_digest_t));
+  client->is_freedoom = data.is_freedoom;
+  client->max_players = data.max_players;
+  client->name = m_string_duplicate(player_name);
+  client->recording_lowres = data.lowres_turn;
+  client->drone = data.drone;
+  client->player_class = data.player_class;
+
+  /* Send a reply back to the client, indicating a successful connection
+   * and specifying the protocol that will be used for communications.
+   */
+
+  reply = net_conn_new_reliable(&client->connection, NET_PACKET_TYPE_SYN);
+  net_write_string(reply, PACKAGE_STRING);
+  net_write_protocol(reply, protocol);
 }
 
-// Parse a launch packet. This is sent by the key player when the "start"
-// button is pressed, and causes the startup process to continue.
+/* Parse a launch packet. This is sent by the key player when the "start"
+ * button is pressed, and causes the startup process to continue.
+ */
 
-static void NET_SV_ParseLaunch(net_packet_t *packet, net_client_t *client)
+static void net_sv_parse_launch(net_packet_t *packet, net_client_t *client)
 {
-    net_packet_t *launchpacket;
-    int num_players;
-    unsigned int i;
+  net_packet_t *launchpacket;
+  int num_players;
+  unsigned int i;
 
-    NET_Log("server: processing launch packet");
+  net_log_info("server: processing launch packet");
 
-    // Only the controller can launch the game.
+  /* Only the controller can launch the game. */
 
-    if (client != NET_SV_Controller())
+  if (client != net_sv_controller())
     {
-        NET_Log("server: error: this client isn't the controller, %d != %d",
-                client, NET_SV_Controller());
-        return;
+      net_log_err("server: this client isn't the controller, %p != %p",
+                  client, net_sv_controller());
+      return;
     }
 
-    // Can only launch when we are in the waiting state.
+  /* Can only launch when we are in the waiting state. */
 
-    if (server_state != SERVER_WAITING_LAUNCH)
+  if (server_state != SERVER_WAITING_LAUNCH)
     {
-        NET_Log("server: error: not in waiting launch state, state=%d",
-                server_state);
-        return;
+      net_log_err("server: not in waiting launch state, state=%d",
+                  server_state);
+      return;
     }
 
-    // Forward launch on to all clients.
-    NET_Log("server: sending launch to all clients");
-    NET_SV_AssignPlayers();
-    num_players = NET_SV_NumPlayers();
+  /* Forward launch on to all clients. */
 
-    for (i=0; i<MAXNETNODES; ++i)
+  net_log_info("server: sending launch to all clients");
+  net_sv_assign_players();
+  num_players = net_sv_num_players();
+
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (!ClientConnected(&clients[i]))
-            continue;
+      if (!client_connected(&clients[i])) continue;
 
-        launchpacket = NET_Conn_NewReliable(&clients[i].connection,
-                                            NET_PACKET_TYPE_LAUNCH);
-        NET_WriteInt8(launchpacket, num_players);
+      launchpacket = net_conn_new_reliable(&clients[i].connection,
+                                          NET_PACKET_TYPE_LAUNCH);
+      net_write_int8(launchpacket, num_players);
     }
 
-    // Now in launch state.
+  /* Now in launch state. */
 
-    server_state = SERVER_WAITING_START;
+  server_state = SERVER_WAITING_START;
 }
 
-// Transition to the in-game state and send all players the start game
-// message. Invoked once all players have indicated they are ready to
-// start the game.
+/* Transition to the in-game state and send all players the start game
+ * message. Invoked once all players have indicated they are ready to
+ * start the game.
+ */
 
-static void StartGame(void)
+static void start_game(void)
 {
-    net_packet_t *startpacket;
-    unsigned int i;
-    int nowtime;
+  net_packet_t *startpacket;
+  unsigned int i;
+  int nowtime;
 
-    // Assign player numbers
+  /* Assign player numbers */
 
-    NET_SV_AssignPlayers();
+  net_sv_assign_players();
 
-    // Check if anyone is recording a demo and set lowres_turn if so.
+  /* Check if anyone is recording a demo and set lowres_turn if so. */
 
-    sv_settings.lowres_turn = false;
+  sv_settings.lowres_turn = false;
 
-    for (i = 0; i < NET_MAXPLAYERS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (sv_players[i] != NULL && sv_players[i]->recording_lowres)
+      if (sv_players[i] != NULL && sv_players[i]->recording_lowres)
         {
-            sv_settings.lowres_turn = true;
+          sv_settings.lowres_turn = true;
         }
     }
 
-    sv_settings.num_players = NET_SV_NumPlayers();
+  sv_settings.num_players = net_sv_num_players();
 
-    // Copy player classes:
+  /* Copy player classes: */
 
-    for (i = 0; i < NET_MAXPLAYERS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (sv_players[i] != NULL)
+      if (sv_players[i] != NULL)
         {
-            sv_settings.player_classes[i] = sv_players[i]->player_class;
+          sv_settings.player_classes[i] = sv_players[i]->player_class;
         }
-        else
+      else
         {
-            sv_settings.player_classes[i] = 0;
+          sv_settings.player_classes[i] = 0;
         }
     }
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    // Send start packets to each connected node
+  /* Send start packets to each connected node */
 
-    for (i = 0; i < MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (!ClientConnected(&clients[i]))
-            continue;
+      if (!client_connected(&clients[i])) continue;
 
-        clients[i].last_gamedata_time = nowtime;
+      clients[i].last_gamedata_time = nowtime;
 
-        startpacket = NET_Conn_NewReliable(&clients[i].connection,
-                                           NET_PACKET_TYPE_GAMESTART);
+      startpacket = net_conn_new_reliable(&clients[i].connection,
+                                         NET_PACKET_TYPE_GAMESTART);
 
-        sv_settings.consoleplayer = clients[i].player_number;
+      sv_settings.consoleplayer = clients[i].player_number;
 
-        NET_WriteSettings(startpacket, &sv_settings);
+      net_write_settings(startpacket, &sv_settings);
     }
 
-    // Change server state
-    NET_Log("server: beginning game state");
-    server_state = SERVER_IN_GAME;
+  /* Change server state */
 
-    memset(recvwindow, 0, sizeof(recvwindow));
-    recvwindow_start = 0;
+  net_log_info("server: beginning game state");
+  server_state = SERVER_IN_GAME;
+
+  memset(recvwindow, 0, sizeof(recvwindow));
+  recvwindow_start = 0;
 }
 
-// Returns true when all nodes have indicated readiness to start the game.
+/* Returns true when all nodes have indicated readiness to start the game. */
 
-static boolean AllNodesReady(void)
+static boolean all_nodes_ready(void)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i = 0; i < MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]) && !clients[i].ready)
+      if (client_connected(&clients[i]) && !clients[i].ready)
         {
-            return false;
+          return false;
         }
     }
 
-    return true;
+  return true;
 }
 
-// Check if the game should start, and if so, start it.
+/* Check if the game should start, and if so, start it. */
 
-static void CheckStartGame(void)
+static void check_start_game(void)
 {
-    if (!AllNodesReady())
+  if (!all_nodes_ready())
     {
-        NET_Log("server: not all clients ready to start yet");
-        return;
+      net_log_warn("server: not all clients ready to start yet");
+      return;
     }
 
-    NET_Log("server: all clients ready, starting game");
-    StartGame();
+  net_log_info("server: all clients ready, starting game");
+  start_game();
 }
 
-// Send waiting data with current status to all nodes that are ready to
-// start the game.
+/* Send waiting data with current status to all nodes that are ready to
+ * start the game.
+ */
 
-static void SendAllWaitingData(void)
+static void send_all_waiting_data(void)
 {
-    unsigned int i;
+  unsigned int i;
 
-    for (i = 0; i < MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (ClientConnected(&clients[i]) && clients[i].ready)
+      if (client_connected(&clients[i]) && clients[i].ready)
         {
-            NET_SV_SendWaitingData(&clients[i]);
+          net_sv_send_waiting_data(&clients[i]);
         }
     }
 }
 
-// Parse a game start packet
+/* Parse a game start packet */
 
-static void NET_SV_ParseGameStart(net_packet_t *packet, net_client_t *client)
+static void net_sv_parse_game_start(net_packet_t *packet,
+                                    net_client_t *client)
 {
-    net_gamesettings_t settings;
+  net_gamesettings_t settings;
 
-    NET_Log("server: processing game start packet");
+  net_log_info("server: processing game start packet");
 
-    // Can only start a game if we are in the waiting start state.
+  /* Can only start a game if we are in the waiting start state. */
 
-    if (server_state != SERVER_WAITING_START)
+  if (server_state != SERVER_WAITING_START)
     {
-        NET_Log("server: error: not in waiting start state, server_state=%d",
-                server_state);
-        return;
+      net_log_info(
+          "server: error: not in waiting start state, server_state=%d",
+          server_state);
+      return;
     }
 
-    if (client == NET_SV_Controller())
+  if (client == net_sv_controller())
     {
-        if (!NET_ReadSettings(packet, &settings))
+      if (!net_read_settings(packet, &settings))
         {
-            // Malformed packet
-            NET_Log("server: error: no settings from controller");
-            return;
+          /* Malformed packet */
+
+          net_log_err("server: no settings from controller");
+          return;
         }
 
-        // Check the game settings are valid
+      /* Check the game settings are valid */
 
-        if (!NET_ValidGameSettings(sv_gamemode, sv_gamemission, &settings))
+      if (!net_valid_game_settings(sv_gamemode, sv_gamemission, &settings))
         {
-            NET_Log("server: error: invalid game settings");
-            return;
+          net_log_err("server: invalid game settings");
+          return;
         }
 
-        sv_settings = settings;
+      sv_settings = settings;
     }
 
-    client->ready = true;
+  client->ready = true;
 
-    CheckStartGame();
+  check_start_game();
 
-    // Update all ready clients with the current state (number of players
-    // ready, etc.). This is used by games that show startup progress
-    // (eg. Hexen's spinal loading)
+  /* Update all ready clients with the current state (number of players
+   * ready, etc.). This is used by games that show startup progress
+   * (eg. Hexen's spinal loading)
+   */
 
-    SendAllWaitingData();
+  send_all_waiting_data();
 }
 
-// Send a resend request to a client
+/* Send a resend request to a client */
 
-static void NET_SV_SendResendRequest(net_client_t *client, int start, int end)
+static void net_sv_send_resend_request(net_client_t *client, int start,
+                                       int end)
 {
-    net_packet_t *packet;
-    net_client_recv_t *recvobj;
-    int i;
-    unsigned int nowtime;
-    int index;
+  net_packet_t *packet;
+  net_client_recv_t *recvobj;
+  int i;
+  unsigned int nowtime;
+  int index;
 
-    NET_Log("server: send resend to %s for tics %d-%d",
-            NET_AddrToString(client->addr), start, end);
+  net_log_info("server: send resend to %s for tics %d-%d",
+               net_addr_to_string(client->addr), start, end);
 
-    packet = NET_NewPacket(20);
+  packet = net_new_packet(20);
 
-    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA_RESEND);
-    NET_WriteInt32(packet, start);
-    NET_WriteInt8(packet, end - start + 1);
+  net_write_int16(packet, NET_PACKET_TYPE_GAMEDATA_RESEND);
+  net_write_int32(packet, start);
+  net_write_int8(packet, end - start + 1);
 
-    NET_Conn_SendPacket(&client->connection, packet);
-    NET_FreePacket(packet);
+  net_conn_send_packet(&client->connection, packet);
+  net_free_packet(packet);
 
-    // Store the time we send the resend request
+  /* Store the time we send the resend request */
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    for (i=start; i<=end; ++i)
+  for (i = start; i <= end; ++i)
     {
-        index = i - recvwindow_start;
+      index = i - recvwindow_start;
 
-        if (index >= BACKUPTICS)
+      if (index >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS)
         {
-            // Outside the range
+          /* Outside the range */
 
-            continue;
+          continue;
         }
-        
-        recvobj = &recvwindow[index][client->player_number];
 
-        recvobj->resend_time = nowtime;
+      recvobj = &recvwindow[index][client->player_number];
+
+      recvobj->resend_time = nowtime;
     }
 }
 
-// Check for expired resend requests
+/* Check for expired resend requests */
 
-static void NET_SV_CheckResends(net_client_t *client)
+static void net_sv_check_resends(net_client_t *client)
 {
-    int i;
-    int player;
-    int resend_start, resend_end;
-    unsigned int nowtime;
+  int i;
+  int player;
+  int resend_start;
+  int resend_end;
+  unsigned int nowtime;
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    player = client->player_number;
-    resend_start = -1;
-    resend_end = -1;
+  player = client->player_number;
+  resend_start = -1;
+  resend_end = -1;
 
-    for (i=0; i<BACKUPTICS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_BACKUPTICS; ++i)
     {
-        net_client_recv_t *recvobj;
-        boolean need_resend;
+      net_client_recv_t *recvobj;
+      boolean need_resend;
 
-        recvobj = &recvwindow[i][player];
+      recvobj = &recvwindow[i][player];
 
-        // if need_resend is true, this tic needs another retransmit
-        // request (300ms timeout)
+      /* if need_resend is true, this tic needs another retransmit
+       * request (300ms timeout)
+       */
 
-        need_resend = !recvobj->active
-                   && recvobj->resend_time != 0
-                   && nowtime > recvobj->resend_time + 300;
+      need_resend = !recvobj->active && recvobj->resend_time != 0 &&
+                    nowtime > recvobj->resend_time + 300;
 
-        if (need_resend)
+      if (need_resend)
         {
-            // Start a new run of resend tics?
-            if (resend_start < 0)
+          /* Start a new run of resend tics? */
+
+          if (resend_start < 0)
             {
-                resend_start = i;
+              resend_start = i;
             }
-            resend_end = i;
+
+          resend_end = i;
         }
-        else if (resend_start >= 0)
+      else if (resend_start >= 0)
         {
-            // End of a run of resend tics
-            NET_Log("server: resend request to %s timed out for %d-%d (%d)",
-                    NET_AddrToString(client->addr),
-                    recvwindow_start + resend_start,
-                    recvwindow_start + resend_end,
-                    &recvwindow[resend_start][player].resend_time);
-            NET_SV_SendResendRequest(client, 
-                                     recvwindow_start + resend_start,
+          /* End of a run of resend tics */
+
+          net_log_warn(
+              "server: resend request to %s timed out for %d-%d (%p)",
+              net_addr_to_string(client->addr),
+              recvwindow_start + resend_start,
+              recvwindow_start + resend_end,
+              &recvwindow[resend_start][player].resend_time);
+
+          net_sv_send_resend_request(client, recvwindow_start + resend_start,
                                      recvwindow_start + resend_end);
 
-            resend_start = -1;
+          resend_start = -1;
         }
     }
 
-    if (resend_start >= 0)
+  if (resend_start >= 0)
     {
-        NET_Log("server: resend request to %s timed out for %d-%d (%d)",
-                NET_AddrToString(client->addr),
-                recvwindow_start + resend_start,
-                recvwindow_start + resend_end,
-                &recvwindow[resend_start][player].resend_time);
-        NET_SV_SendResendRequest(client,
-                                 recvwindow_start + resend_start,
+      net_log_warn("server: resend request to %s timed out for %d-%d (%p)",
+                   net_addr_to_string(client->addr),
+                   recvwindow_start + resend_start,
+                   recvwindow_start + resend_end,
+                   &recvwindow[resend_start][player].resend_time);
+      net_sv_send_resend_request(client, recvwindow_start + resend_start,
                                  recvwindow_start + resend_end);
     }
 }
 
-// Process game data from a client
+/* Process game data from a client */
 
-static void NET_SV_ParseGameData(net_packet_t *packet, net_client_t *client)
+static void net_sv_parse_game_data(net_packet_t *packet,
+        net_client_t *client)
 {
-    net_client_recv_t *recvobj;
-    unsigned int seq;
-    unsigned int ackseq;
-    unsigned int num_tics;
-    unsigned int nowtime;
-    size_t i;
-    int player;
-    int resend_start, resend_end;
-    int index;
+  net_client_recv_t *recvobj;
+  unsigned int seq;
+  unsigned int ackseq;
+  unsigned int num_tics;
+  unsigned int nowtime;
+  size_t i;
+  int player;
+  int resend_start;
+  int resend_end;
+  int index;
 
-    if (server_state != SERVER_IN_GAME)
+  if (server_state != SERVER_IN_GAME)
     {
-        NET_Log("server: error: not in game state: server_state=%d",
-                server_state);
-        return;
+      net_log_err("server: not in game state: server_state=%d",
+              server_state);
+      return;
     }
 
-    if (client->drone)
+  if (client->drone)
     {
-        // Drones do not contribute any game data.
-        NET_Log("server: error: game data from a drone?");
-        return;
+      /* Drones do not contribute any game data. */
+
+      net_log_err("server: game data from a drone?");
+      return;
     }
 
-    player = client->player_number;
+  player = client->player_number;
 
-    // Read header
-    if (!NET_ReadInt8(packet, &ackseq)
-     || !NET_ReadInt8(packet, &seq)
-     || !NET_ReadInt8(packet, &num_tics))
+  /* Read header */
+
+  if (!net_read_int8(packet, &ackseq) || !net_read_int8(packet, &seq) ||
+      !net_read_int8(packet, &num_tics))
     {
-        NET_Log("server: error: failed to read header");
-        return;
+      net_log_err("server: failed to read header");
+      return;
     }
 
-    NET_Log("server: got game data, seq=%d, num_tics=%d, ackseq=%d",
-            seq, num_tics, ackseq);
+  net_log_info("server: got game data, seq=%d, num_tics=%d, ackseq=%d", seq,
+               num_tics, ackseq);
 
-    // Get the current time
-    nowtime = I_GetTimeMS();
+  /* Get the current time */
 
-    // Expand 8-bit values to the full sequence number
-    ackseq = NET_SV_ExpandTicNum(ackseq);
-    seq = NET_SV_ExpandTicNum(seq);
+  nowtime = i_get_time_ms();
 
-    // Sanity checks
+  /* Expand 8-bit values to the full sequence number */
 
-    for (i=0; i<num_tics; ++i)
+  ackseq = net_sv_expand_ticnum(ackseq);
+  seq = net_sv_expand_ticnum(seq);
+
+  /* Sanity checks */
+
+  for (i = 0; i < num_tics; ++i)
     {
-        net_ticdiff_t diff;
-        signed int latency;
+      net_ticdiff_t diff;
+      signed int latency;
 
-        if (!NET_ReadSInt16(packet, &latency)
-         || !NET_ReadTiccmdDiff(packet, &diff, sv_settings.lowres_turn))
+      if (!net_read_sint16(packet, &latency) ||
+          !net_read_ticcmd_diff(packet, &diff, sv_settings.lowres_turn))
         {
-            return;
+          return;
         }
 
-        index = seq + i - recvwindow_start;
+      index = seq + i - recvwindow_start;
 
-        if (index < 0 || index >= BACKUPTICS)
+      if (index < 0 || index >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS)
         {
-            // Not in range of the recv window
+          /* Not in range of the recv window */
 
-            continue;
+          continue;
         }
 
-        recvobj = &recvwindow[index][player];
-        recvobj->active = true;
-        recvobj->diff = diff;
-        recvobj->latency = latency;
+      recvobj = &recvwindow[index][player];
+      recvobj->active = true;
+      recvobj->diff = diff;
+      recvobj->latency = latency;
 
-        client->last_gamedata_time = nowtime;
-        NET_Log("server: stored tic %d for player %d", seq + i, player);
+      client->last_gamedata_time = nowtime;
+      net_log_info("server: stored tic %zu for player %d", seq + i, player);
     }
 
-    // Higher acknowledgement point?
+  /* Higher acknowledgement point? */
 
-    if (ackseq > client->acknowledged)
+  if (ackseq > client->acknowledged)
     {
-        NET_Log("server: acknowledged up to %d", ackseq);
-        client->acknowledged = ackseq;
+      net_log_info("server: acknowledged up to %d", ackseq);
+      client->acknowledged = ackseq;
     }
 
-    // Has this been received out of sequence, ie. have we not received
-    // all tics before the first tic in this packet?  If so, send a 
-    // resend request.
+  /* Has this been received out of sequence, ie. have we not received
+   * all tics before the first tic in this packet?  If so, send a
+   * resend request.
+   */
 
-    //printf("SV: %p: %i\n", client, seq);
+  resend_end = seq - recvwindow_start;
 
-    resend_end = seq - recvwindow_start;
+  if (resend_end <= 0) return;
 
-    if (resend_end <= 0)
-        return;
-
-    if (resend_end >= BACKUPTICS)
-        resend_end = BACKUPTICS - 1;
-
-    index = resend_end - 1;
-    resend_start = resend_end;
-    
-    while (index >= 0)
+  if (resend_end >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS)
     {
-        recvobj = &recvwindow[index][player];
+      resend_end = CONFIG_GAMES_NXDOOM_NET_BACKUPTICS - 1;
+    }
 
-        if (recvobj->active)
+  index = resend_end - 1;
+  resend_start = resend_end;
+
+  while (index >= 0)
+    {
+      recvobj = &recvwindow[index][player];
+
+      if (recvobj->active)
         {
-            // ended our run of unreceived tics
+          /* ended our run of unreceived tics */
 
-            break;
+          break;
         }
 
-        if (recvobj->resend_time != 0)
+      if (recvobj->resend_time != 0)
         {
-            // Already sent a resend request for this tic
+          /* Already sent a resend request for this tic */
 
-            break;
+          break;
         }
 
-        resend_start = index;
-        --index;
+      resend_start = index;
+      --index;
     }
 
-    // Possibly send a resend request
-    if (resend_start < resend_end)
+  /* Possibly send a resend request */
+
+  if (resend_start < resend_end)
     {
-        NET_Log("server: request resend for %d-%d before %d",
-                recvwindow_start + resend_start,
-                recvwindow_start + resend_end - 1, seq);
-        NET_SV_SendResendRequest(client, 
-                                 recvwindow_start + resend_start, 
+      net_log_info("server: request resend for %d-%d before %d",
+                   recvwindow_start + resend_start,
+                   recvwindow_start + resend_end - 1, seq);
+      net_sv_send_resend_request(client, recvwindow_start + resend_start,
                                  recvwindow_start + resend_end - 1);
     }
 }
 
-static void NET_SV_ParseGameDataACK(net_packet_t *packet, net_client_t *client)
+static void net_sv_parse_game_data_ack(net_packet_t *packet,
+                                       net_client_t *client)
 {
-    unsigned int ackseq;
+  unsigned int ackseq;
 
-    NET_Log("server: processing game data ack packet");
+  net_log_info("server: processing game data ack packet");
 
-    if (server_state != SERVER_IN_GAME)
+  if (server_state != SERVER_IN_GAME)
     {
-        NET_Log("server: error: not in game state, server_state=%d",
-                server_state);
-        return;
+      net_log_err("server: not in game state, server_state=%d",
+              server_state);
+      return;
     }
 
-    // Read header
+  /* Read header */
 
-    if (!NET_ReadInt8(packet, &ackseq))
+  if (!net_read_int8(packet, &ackseq))
     {
-        NET_Log("server: error: missing acknowledgement field");
-        return;
+      net_log_err("server: missing acknowledgement field");
+      return;
     }
 
-    // Expand 8-bit values to the full sequence number
+  /* Expand 8-bit values to the full sequence number */
 
-    ackseq = NET_SV_ExpandTicNum(ackseq);
+  ackseq = net_sv_expand_ticnum(ackseq);
 
-    // Higher acknowledgement point than we already have?
+  /* Higher acknowledgement point than we already have? */
 
-    if (ackseq > client->acknowledged)
+  if (ackseq > client->acknowledged)
     {
-        NET_Log("server: acknowledged up to %d", ackseq);
-        client->acknowledged = ackseq;
+      net_log_info("server: acknowledged up to %d", ackseq);
+      client->acknowledged = ackseq;
     }
 }
 
-static void NET_SV_SendTics(net_client_t *client, 
-                            unsigned int start, unsigned int end)
+static void net_sv_send_tics(net_client_t *client, unsigned int start,
+                             unsigned int end)
 {
-    net_packet_t *packet;
-    unsigned int i;
+  net_packet_t *packet;
+  unsigned int i;
 
-    packet = NET_NewPacket(500);
+  packet = net_new_packet(500);
 
-    NET_WriteInt16(packet, NET_PACKET_TYPE_GAMEDATA);
+  net_write_int16(packet, NET_PACKET_TYPE_GAMEDATA);
 
-    // Send the start tic and number of tics
+  /* Send the start tic and number of tics */
 
-    NET_WriteInt8(packet, start & 0xff);
-    NET_WriteInt8(packet, end-start + 1);
+  net_write_int8(packet, start & 0xff);
+  net_write_int8(packet, end - start + 1);
 
-    // Write the tics
+  /* Write the tics */
 
-    for (i=start; i<=end; ++i)
+  for (i = start; i <= end; ++i)
     {
-        net_full_ticcmd_t *cmd;
+      net_full_ticcmd_t *cmd;
 
-        cmd = &client->sendqueue[i % BACKUPTICS];
+      cmd = &client->sendqueue[i % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-        if (i != cmd->seq)
+      if (i != cmd->seq)
         {
-            I_Error("Wanted to send %i, but %i is in its place", i, cmd->seq);
+          i_error("Wanted to send %i, but %i is in its place", i, cmd->seq);
         }
 
-        // Add command
-       
-        NET_WriteFullTiccmd(packet, cmd, sv_settings.lowres_turn);
-    }
-    
-    // Send packet
+      /* Add command */
 
-    NET_Conn_SendPacket(&client->connection, packet);
-    
-    NET_FreePacket(packet);
+      net_write_full_ticcmd(packet, cmd, sv_settings.lowres_turn);
+    }
+
+  /* Send packet */
+
+  net_conn_send_packet(&client->connection, packet);
+
+  net_free_packet(packet);
 }
 
-// Parse a retransmission request from a client
+/* Parse a retransmission request from a client */
 
-static void NET_SV_ParseResendRequest(net_packet_t *packet, net_client_t *client)
+static void net_sv_parse_resend_request(net_packet_t *packet,
+                                        net_client_t *client)
 {
-    unsigned int start, last;
-    unsigned int num_tics;
-    unsigned int i;
+  unsigned int start;
+  unsigned int last;
+  unsigned int num_tics;
+  unsigned int i;
 
-    NET_Log("server: processing resend request");
+  net_log_info("server: processing resend request");
 
-    // Read the starting tic and number of tics
+  /* Read the starting tic and number of tics */
 
-    if (!NET_ReadInt32(packet, &start)
-     || !NET_ReadInt8(packet, &num_tics))
+  if (!net_read_int32(packet, &start) || !net_read_int8(packet, &num_tics))
     {
-        NET_Log("server: error: missing fields for resend");
-        return;
+      net_log_err("server: missing fields for resend");
+      return;
     }
 
-    //printf("SV: %p: resend %i-%i\n", client, start, start+num_tics-1);
+  /* Check we have all the requested tics */
 
-    // Check we have all the requested tics
+  last = start + num_tics - 1;
 
-    last = start + num_tics - 1;
-
-    for (i=start; i<=last; ++i)
+  for (i = start; i <= last; ++i)
     {
-        net_full_ticcmd_t *cmd;
+      net_full_ticcmd_t *cmd;
 
-        cmd = &client->sendqueue[i % BACKUPTICS];
+      cmd = &client->sendqueue[i % CONFIG_GAMES_NXDOOM_NET_BACKUPTICS];
 
-        if (i != cmd->seq)
+      if (i != cmd->seq)
         {
-            // We do not have the requested tic (any more)
-            // This is pretty fatal.  We could disconnect the client, 
-            // but then again this could be a spoofed packet.  Just 
-            // ignore it.
-            NET_Log("server: error: don't have tic %d any more, "
-                    "can't resend", i);
-            return;
+          /* We do not have the requested tic (any more)
+           * This is pretty fatal.  We could disconnect the client,
+           * but then again this could be a spoofed packet.  Just
+           * ignore it.
+           */
+
+          net_log_err("server: don't have tic %d any more, "
+                      "can't resend",
+                      i);
+          return;
         }
     }
 
-    // Resend those tics
-    NET_Log("server: resending tics %d-%d", start, last);
-    NET_SV_SendTics(client, start, last);
+  /* Resend those tics */
+
+  net_log_info("server: resending tics %d-%d", start, last);
+  net_sv_send_tics(client, start, last);
 }
 
-// Send a response back to the client
-
-void NET_SV_SendQueryResponse(net_addr_t *addr)
+static void net_sv_parse_hole_punch(net_packet_t *packet)
 {
-    net_packet_t *reply;
-    net_querydata_t querydata;
-    int p;
+  const char *addr_string;
+  net_packet_t *sendpacket;
+  net_addr_t *addr;
 
-    // Version
-
-    querydata.version = PACKAGE_STRING;
-
-    // Server state
-
-    querydata.server_state = server_state;
-
-    // Number of players/maximum players
-
-    querydata.num_players = NET_SV_NumPlayers();
-    querydata.max_players = NET_SV_MaxPlayers();
-
-    // Game mode/mission
-
-    querydata.gamemode = sv_gamemode;
-    querydata.gamemission = sv_gamemission;
-
-    //!
-    // @category net
-    // @arg <name>
-    //
-    // When starting a network server, specify a name for the server.
-    //
-
-    p = M_CheckParmWithArgs("-servername", 1);
-
-    if (p > 0)
+  addr_string = net_read_string(packet);
+  if (addr_string == NULL)
     {
-        querydata.description = myargv[p + 1];
-    }
-    else
-    {
-        querydata.description = "Unnamed server";
+      net_log_err("server: hole punch request but no address provided");
+      return;
     }
 
-    // Send it and we're done.
-    NET_Log("server: sending query response to %s", NET_AddrToString(addr));
-    reply = NET_NewPacket(64);
-    NET_WriteInt16(reply, NET_PACKET_TYPE_QUERY_RESPONSE);
-    NET_WriteQueryData(reply, &querydata);
-    NET_SendPacket(addr, reply);
-    NET_FreePacket(reply);
+  addr = net_resolve_address(server_context, addr_string);
+  if (addr == NULL)
+    {
+      net_log_err("server: failed to resolve address: %s", addr_string);
+      return;
+    }
+
+  sendpacket = net_new_packet(16);
+  net_write_int16(sendpacket, NET_PACKET_TYPE_NAT_HOLE_PUNCH);
+  net_send_packet(addr, sendpacket);
+  net_free_packet(sendpacket);
+  net_release_address(addr);
+  net_log_info("server: sent hole punch to %s", addr_string);
 }
 
-static void NET_SV_ParseHolePunch(net_packet_t *packet)
+static void net_sv_master_packet(net_packet_t *packet)
 {
-    const char *addr_string;
-    net_packet_t *sendpacket;
-    net_addr_t *addr;
+  unsigned int packet_type;
 
-    addr_string = NET_ReadString(packet);
-    if (addr_string == NULL)
+  /* Read the packet type */
+
+  if (!net_read_int16(packet, &packet_type))
     {
-        NET_Log("server: error: hole punch request but no address provided");
-        return;
+      net_log_err("server: no packet type in master server message");
+      return;
     }
 
-    addr = NET_ResolveAddress(server_context, addr_string);
-    if (addr == NULL)
+  net_log_info("server: packet from master server; type %d", packet_type);
+  net_log_packet(packet);
+
+  switch (packet_type)
     {
-        NET_Log("server: error: failed to resolve address: %s", addr_string);
-        return;
-    }
+    case NET_MASTER_PACKET_TYPE_ADD_RESPONSE:
+      net_query_add_response(packet);
+      break;
 
-    sendpacket = NET_NewPacket(16);
-    NET_WriteInt16(sendpacket, NET_PACKET_TYPE_NAT_HOLE_PUNCH);
-    NET_SendPacket(addr, sendpacket);
-    NET_FreePacket(sendpacket);
-    NET_ReleaseAddress(addr);
-    NET_Log("server: sent hole punch to %s", addr_string);
-}
-
-static void NET_SV_MasterPacket(net_packet_t *packet)
-{
-    unsigned int packet_type;
-
-    // Read the packet type
-
-    if (!NET_ReadInt16(packet, &packet_type))
-    {
-        NET_Log("server: error: no packet type in master server message");
-        return;
-    }
-
-    NET_Log("server: packet from master server; type %d", packet_type);
-    NET_LogPacket(packet);
-
-    switch (packet_type)
-    {
-        case NET_MASTER_PACKET_TYPE_ADD_RESPONSE:
-            NET_Query_AddResponse(packet);
-            break;
-
-        case NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH:
-            NET_SV_ParseHolePunch(packet);
-            break;
+    case NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH:
+      net_sv_parse_hole_punch(packet);
+      break;
     }
 }
 
-// Process a packet received by the server
+/* Send a response back to the client */
 
-static void NET_SV_Packet(net_packet_t *packet, net_addr_t *addr)
+static void net_sv_send_query_response(net_addr_t *addr)
 {
-    net_client_t *client;
-    unsigned int packet_type;
+  net_packet_t *reply;
+  net_querydata_t querydata;
+  int p;
 
-    // Response from master server?
+  /* Version */
 
-    if (addr != NULL && addr == master_server)
+  querydata.version = PACKAGE_STRING;
+
+  /* Server state */
+
+  querydata.server_state = server_state;
+
+  /* Number of players/maximum players */
+
+  querydata.num_players = net_sv_num_players();
+  querydata.max_players = net_sv_max_players();
+
+  /* Game mode/mission */
+
+  querydata.gamemode = sv_gamemode;
+  querydata.gamemission = sv_gamemission;
+
+  /* @category net
+   * @arg <name>
+   *
+   * When starting a network server, specify a name for the server.
+   */
+
+  p = m_check_parm_with_args("-servername", 1);
+
+  if (p > 0)
     {
-        NET_SV_MasterPacket(packet);
-        return;
+      querydata.description = myargv[p + 1];
+    }
+  else
+    {
+      querydata.description = "Unnamed server";
     }
 
-    // Find which client this packet came from
+  /* Send it and we're done. */
 
-    client = NET_SV_FindClient(addr);
+  net_log_info("server: sending query response to %s",
+               net_addr_to_string(addr));
+  reply = net_new_packet(64);
+  net_write_int16(reply, NET_PACKET_TYPE_QUERY_RESPONSE);
+  net_write_query_data(reply, &querydata);
+  net_send_packet(addr, reply);
+  net_free_packet(reply);
+}
 
-    // Read the packet type
+/* Process a packet received by the server */
 
-    if (!NET_ReadInt16(packet, &packet_type))
+static void net_sv_packet(net_packet_t *packet, net_addr_t *addr)
+{
+  net_client_t *client;
+  unsigned int packet_type;
+
+  /* Response from master server? */
+
+  if (addr != NULL && addr == master_server)
     {
-        // no packet type
-
-        return;
+      net_sv_master_packet(packet);
+      return;
     }
 
-    NET_Log("server: packet from %s; type %d", NET_AddrToString(addr),
-            packet_type & ~NET_RELIABLE_PACKET);
-    NET_LogPacket(packet);
+  /* Find which client this packet came from */
 
-    if (packet_type == NET_PACKET_TYPE_SYN)
-    {
-        NET_SV_ParseSYN(packet, client, addr);
-    }
-    else if (packet_type == NET_PACKET_TYPE_QUERY)
-    {
-        NET_SV_SendQueryResponse(addr);
-    }
-    else if (client == NULL)
-    {
-        // Must come from a valid client; ignore otherwise
-    }
-    else if (NET_Conn_Packet(&client->connection, packet, &packet_type))
-    {
-        // Packet was eaten by the common connection code
-    }
-    else
-    {
-        //printf("SV: %s: %i\n", NET_AddrToString(addr), packet_type);
+  client = net_sv_find_client(addr);
 
-        switch (packet_type)
+  /* Read the packet type */
+
+  if (!net_read_int16(packet, &packet_type))
+    {
+      /* no packet type */
+
+      return;
+    }
+
+  net_log_info("server: packet from %s; type %d", net_addr_to_string(addr),
+               packet_type & ~NET_RELIABLE_PACKET);
+  net_log_packet(packet);
+
+  if (packet_type == NET_PACKET_TYPE_SYN)
+    {
+      net_sv_parse_syn(packet, client, addr);
+    }
+  else if (packet_type == NET_PACKET_TYPE_QUERY)
+    {
+      net_sv_send_query_response(addr);
+    }
+  else if (client == NULL)
+    {
+      /* Must come from a valid client; ignore otherwise */
+    }
+  else if (net_conn_packet(&client->connection, packet, &packet_type))
+    {
+      /* Packet was eaten by the common connection code */
+    }
+  else
+    {
+      switch (packet_type)
         {
-            case NET_PACKET_TYPE_GAMESTART:
-                NET_SV_ParseGameStart(packet, client);
-                break;
-            case NET_PACKET_TYPE_LAUNCH:
-                NET_SV_ParseLaunch(packet, client);
-                break;
-            case NET_PACKET_TYPE_GAMEDATA:
-                NET_SV_ParseGameData(packet, client);
-                break;
-            case NET_PACKET_TYPE_GAMEDATA_ACK:
-                NET_SV_ParseGameDataACK(packet, client);
-                break;
-            case NET_PACKET_TYPE_GAMEDATA_RESEND:
-                NET_SV_ParseResendRequest(packet, client);
-                break;
-            default:
-                // unknown packet type
-
-                break;
+        case NET_PACKET_TYPE_GAMESTART:
+          net_sv_parse_game_start(packet, client);
+          break;
+        case NET_PACKET_TYPE_LAUNCH:
+          net_sv_parse_launch(packet, client);
+          break;
+        case NET_PACKET_TYPE_GAMEDATA:
+          net_sv_parse_game_data(packet, client);
+          break;
+        case NET_PACKET_TYPE_GAMEDATA_ACK:
+          net_sv_parse_game_data_ack(packet, client);
+          break;
+        case NET_PACKET_TYPE_GAMEDATA_RESEND:
+          net_sv_parse_resend_request(packet, client);
+          break;
+        default:
+          break; /* unknown packet type */
         }
     }
 }
 
-
-static void NET_SV_PumpSendQueue(net_client_t *client)
+static void net_sv_pump_send_queue(net_client_t *client)
 {
-    net_full_ticcmd_t cmd;
-    int recv_index;
-    int num_players;
-    int i;
-    int starttic, endtic;
+  net_full_ticcmd_t cmd;
+  int recv_index;
+  int num_players;
+  int i;
+  int starttic;
+  int endtic;
 
-    // If a client has not sent any acknowledgments for a while,
-    // wait until they catch up.
+  /* If a client has not sent any acknowledgments for a while,
+   * wait until they catch up.
+   */
 
-    if (client->sendseq - NET_SV_LatestAcknowledged() > 40)
+  if (client->sendseq - net_sv_latest_acknowledged() > 40)
     {
-        return;
-    }
-    
-    // Work out the index into the receive window
-   
-    recv_index = client->sendseq - recvwindow_start;
-
-    if (recv_index < 0 || recv_index >= BACKUPTICS)
-    {
-        return;
+      return;
     }
 
-    // Check if we can generate a new entry for the send queue
-    // using the data in recvwindow.
+  /* Work out the index into the receive window */
 
-    num_players = 0;
+  recv_index = client->sendseq - recvwindow_start;
 
-    for (i=0; i<NET_MAXPLAYERS; ++i)
+  if (recv_index < 0 || recv_index >= CONFIG_GAMES_NXDOOM_NET_BACKUPTICS)
     {
-        if (sv_players[i] == client)
-        {
-            // Client does not rely on itself for data
-
-            continue;
-        }
-
-        if (sv_players[i] == NULL || !ClientConnected(sv_players[i]))
-        {
-            continue;
-        }
-
-        if (!recvwindow[recv_index][i].active)
-        {
-            // We do not have this player's ticcmd, so we cannot
-            // generate a complete command yet.
-
-            return;
-        }
-
-        ++num_players;
+      return;
     }
 
-    // If this is a game with only a single player in it, we might
-    // be sending a ticcmd set containing 0 ticcmds. This is fine;
-    // however, there's nothing to stop the game running on ahead
-    // and never stopping. Don't let the server get too far ahead
-    // of the client.
+  /* Check if we can generate a new entry for the send queue
+   * using the data in recvwindow.
+   */
 
-    if (num_players == 0 && client->sendseq > recvwindow_start + 10)
+  num_players = 0;
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        return;
-    }
-
-    // We have all data we need to generate a command for this tic.
-    
-    cmd.seq = client->sendseq;
-
-    // Add ticcmds from all players
-
-    cmd.latency = 0;
-
-    for (i=0; i<NET_MAXPLAYERS; ++i)
-    {
-        net_client_recv_t *recvobj;
-
-        if (sv_players[i] == client)
+      if (sv_players[i] == client)
         {
-            // Not the player we are sending to
+          /* Client does not rely on itself for data */
 
-            cmd.playeringame[i] = false;
-            continue;
-        }
-        
-        if (sv_players[i] == NULL || !recvwindow[recv_index][i].active)
-        {
-            cmd.playeringame[i] = false;
-            continue;
+          continue;
         }
 
-        cmd.playeringame[i] = true;
+      if (sv_players[i] == NULL || !client_connected(sv_players[i]))
+        {
+          continue;
+        }
 
-        recvobj = &recvwindow[recv_index][i];
+      if (!recvwindow[recv_index][i].active)
+        {
+          /* We do not have this player's ticcmd, so we cannot generate a
+           * complete command yet.
+           */
 
-        cmd.cmds[i] = recvobj->diff;
+          return;
+        }
 
-        if (recvobj->latency > cmd.latency)
-            cmd.latency = recvobj->latency;
+      ++num_players;
     }
 
-    //printf("SV: %i: latency %i\n", client->player_number, cmd.latency);
+  /* If this is a game with only a single player in it, we might
+   * be sending a ticcmd set containing 0 ticcmds. This is fine;
+   * however, there's nothing to stop the game running on ahead
+   * and never stopping. Don't let the server get too far ahead
+   * of the client.
+   */
 
-    // Add into the queue
+  if (num_players == 0 && client->sendseq > recvwindow_start + 10)
+    {
+      return;
+    }
 
-    client->sendqueue[client->sendseq % BACKUPTICS] = cmd;
+  /* We have all data we need to generate a command for this tic. */
 
-    // Transmit the new tic to the client
+  cmd.seq = client->sendseq;
 
-    starttic = client->sendseq - sv_settings.extratics;
-    endtic = client->sendseq;
+  /* Add ticcmds from all players */
 
-    if (starttic < 0)
-        starttic = 0;
+  cmd.latency = 0;
 
-    NET_Log("server: send tics %d-%d to %s", starttic, endtic,
-            NET_AddrToString(client->addr));
-    NET_SV_SendTics(client, starttic, endtic);
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
+    {
+      net_client_recv_t *recvobj;
 
-    ++client->sendseq;
+      if (sv_players[i] == client)
+        {
+          /* Not the player we are sending to */
+
+          cmd.playeringame[i] = false;
+          continue;
+        }
+
+      if (sv_players[i] == NULL || !recvwindow[recv_index][i].active)
+        {
+          cmd.playeringame[i] = false;
+          continue;
+        }
+
+      cmd.playeringame[i] = true;
+
+      recvobj = &recvwindow[recv_index][i];
+
+      cmd.cmds[i] = recvobj->diff;
+
+      if (recvobj->latency > cmd.latency) cmd.latency = recvobj->latency;
+    }
+
+  /* Add into the queue */
+
+  client->sendqueue[client->sendseq %
+      CONFIG_GAMES_NXDOOM_NET_BACKUPTICS] = cmd;
+
+  /* Transmit the new tic to the client */
+
+  starttic = client->sendseq - sv_settings.extratics;
+  endtic = client->sendseq;
+
+  if (starttic < 0) starttic = 0;
+
+  net_log_info("server: send tics %d-%d to %s", starttic, endtic,
+               net_addr_to_string(client->addr));
+  net_sv_send_tics(client, starttic, endtic);
+
+  ++client->sendseq;
 }
 
-// Prevent against deadlock: resend requests are usually only
-// triggered if we miss a packet and receive the next one.
-// If we miss a whole load of packets, we can end up in a 
-// deadlock situation where the client will not send any more.
-// If we don't receive any game data in a while, trigger a resend
-// request for the next tic we're expecting.
+/* Called when all players have disconnected.  Return to listening for
+ * players to start a new game, and disconnect any drones still connected.
+ */
 
-void NET_SV_CheckDeadlock(net_client_t *client)
+static void net_sv_game_ended(void)
 {
-    int nowtime;
-    int i;
+  int i;
 
-    // Don't expect game data from clients.
+  server_state = SERVER_WAITING_LAUNCH;
+  sv_gamemode = indetermined;
 
-    if (client->drone)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        return;
+      if (clients[i].active)
+        {
+          net_sv_disconnect_client(&clients[i]);
+        }
+    }
+}
+
+/* Prevent against deadlock: resend requests are usually only
+ * triggered if we miss a packet and receive the next one.
+ * If we miss a whole load of packets, we can end up in a
+ * deadlock situation where the client will not send any more.
+ * If we don't receive any game data in a while, trigger a resend
+ * request for the next tic we're expecting.
+ */
+
+static void net_sv_check_deadlock(net_client_t *client)
+{
+  int nowtime;
+  int i;
+
+  /* Don't expect game data from clients. */
+
+  if (client->drone)
+    {
+      return;
     }
 
-    nowtime = I_GetTimeMS();
+  nowtime = i_get_time_ms();
 
-    // If we haven't received anything for a long time, it may be a deadlock.
+  /* If we haven't received anything for a long time, it may be a deadlock. */
 
-    if (nowtime - client->last_gamedata_time > 1000)
+  if (nowtime - client->last_gamedata_time > 1000)
     {
-        NET_Log("server: no gamedata from %s since %d - deadlock?",
-                NET_AddrToString(client->addr),
-                client->last_gamedata_time);
+      net_log_warn("server: no gamedata from %s since %d - deadlock?",
+                   net_addr_to_string(client->addr),
+                   client->last_gamedata_time);
 
-        // Search the receive window for the first tic we are expecting
-        // from this player.
+      /* Search the receive window for the first tic we are expecting
+       * from this player.
+       */
 
-        for (i=0; i<BACKUPTICS; ++i)
+      for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_BACKUPTICS; ++i)
         {
-            if (!recvwindow[i][client->player_number].active)
+          if (!recvwindow[i][client->player_number].active)
             {
-                NET_Log("server: deadlock: sending resend request for %d-%d",
-                        recvwindow_start + i, recvwindow_start + i + 5);
+              net_log_warn(
+                  "server: deadlock: sending resend request for %d-%d",
+                  recvwindow_start + i, recvwindow_start + i + 5);
 
-                // Found a tic we haven't received.  Send a resend request.
+              /* Found a tic we haven't received.  Send a resend request. */
 
-                NET_SV_SendResendRequest(client,
-                                         recvwindow_start + i,
+              net_sv_send_resend_request(client, recvwindow_start + i,
                                          recvwindow_start + i + 5);
 
-                client->last_gamedata_time = nowtime;
-                break;
+              client->last_gamedata_time = nowtime;
+              break;
             }
         }
 
-        // If we sent a resend request to break the deadlock, also trigger a
-        // resend of any tics we have sitting in the send queue, in case the
-        // client is blocked waiting on tics from us that have been lost.
-        // This fixes deadlock with some older clients which do not send
-        // resends to break deadlock.
-        if (i < BACKUPTICS && client->sendseq > client->acknowledged)
+      /* If we sent a resend request to break the deadlock, also trigger a
+       * resend of any tics we have sitting in the send queue, in case the
+       * client is blocked waiting on tics from us that have been lost.
+       * This fixes deadlock with some older clients which do not send
+       * resends to break deadlock.
+       */
+
+      if (i < CONFIG_GAMES_NXDOOM_NET_BACKUPTICS &&
+          client->sendseq > client->acknowledged)
         {
-            NET_Log("server: also resending tics %d-%d to break deadlock",
-                    client->acknowledged, client->sendseq - 1);
-            NET_SV_SendTics(client, client->acknowledged, client->sendseq - 1);
+          net_log_warn("server: also resending tics %d-%d to break deadlock",
+                       client->acknowledged, client->sendseq - 1);
+          net_sv_send_tics(client, client->acknowledged,
+                  client->sendseq - 1);
         }
     }
 }
 
-// Called when all players have disconnected.  Return to listening for 
-// players to start a new game, and disconnect any drones still connected.
+/* Perform any needed action on a client */
 
-static void NET_SV_GameEnded(void)
+static void net_sv_run_client(net_client_t *client)
 {
-    int i;
+  /* Run common code */
 
-    server_state = SERVER_WAITING_LAUNCH;
-    sv_gamemode = indetermined;
+  net_conn_run(&client->connection);
 
-    for (i=0; i<MAXNETNODES; ++i)
+  if (client->connection.state == NET_CONN_STATE_DISCONNECTED &&
+      client->connection.disconnect_reason == NET_DISCONNECT_TIMEOUT)
     {
-        if (clients[i].active)
-        {
-            NET_SV_DisconnectClient(&clients[i]);
-        }
-    }
-}
-
-// Perform any needed action on a client
-
-static void NET_SV_RunClient(net_client_t *client)
-{
-    // Run common code
-
-    NET_Conn_Run(&client->connection);
-
-    if (client->connection.state == NET_CONN_STATE_DISCONNECTED
-     && client->connection.disconnect_reason == NET_DISCONNECT_TIMEOUT)
-    {
-        NET_Log("server: client at %s timed out",
-                NET_AddrToString(client->addr));
-        NET_SV_BroadcastMessage("Client '%s' timed out and disconnected",
-                                client->name);
+      net_log_warn("server: client at %s timed out",
+                   net_addr_to_string(client->addr));
+      net_sv_broadcast_message("Client '%s' timed out and disconnected",
+                               client->name);
     }
 
-    // Is this client disconnected?
+  /* Is this client disconnected? */
 
-    if (client->connection.state == NET_CONN_STATE_DISCONNECTED)
+  if (client->connection.state == NET_CONN_STATE_DISCONNECTED)
     {
-        client->active = false;
+      client->active = false;
 
-        // If we were about to start a game, any player disconnecting
-        // should cause an abort.
+      /* If we were about to start a game, any player disconnecting
+       * should cause an abort.
+       */
 
-        if (server_state == SERVER_WAITING_START && !client->drone)
+      if (server_state == SERVER_WAITING_START && !client->drone)
         {
-            NET_SV_BroadcastMessage("Game startup aborted because "
-                                    "player '%s' disconnected.",
-                                    client->name);
-            NET_SV_GameEnded();
+          net_sv_broadcast_message("Game startup aborted because "
+                                   "player '%s' disconnected.",
+                                   client->name);
+          net_sv_game_ended();
         }
 
-        free(client->name);
-        NET_ReleaseAddress(client->addr);
+      free(client->name);
+      net_release_address(client->addr);
 
-        // Are there any clients left connected?  If not, return the
-        // server to the waiting-for-players state.
-        //
-	// Disconnect any drones still connected.
+      /* Are there any clients left connected?  If not, return the
+       * server to the waiting-for-players state.
+       *
+       * Disconnect any drones still connected.
+       */
 
-        if (NET_SV_NumPlayers() <= 0)
+      if (net_sv_num_players() <= 0)
         {
-            NET_Log("server: no player clients left, game ended");
-            NET_SV_GameEnded();
+          net_log_info("server: no player clients left, game ended");
+          net_sv_game_ended();
         }
     }
 
-    if (!ClientConnected(client))
+  if (!client_connected(client))
     {
-        // client has not yet finished connecting
+      /* client has not yet finished connecting */
 
-        return;
+      return;
     }
 
-    if (server_state == SERVER_WAITING_LAUNCH)
+  if (server_state == SERVER_WAITING_LAUNCH)
     {
-        // Waiting for the game to start
+      /* Waiting for the game to start */
 
-        // Send information once every second
+      /* Send information once every second */
 
-        if (client->last_send_time < 0 
-         || I_GetTimeMS() - client->last_send_time > 1000)
+      if (client->last_send_time < 0 ||
+          i_get_time_ms() - client->last_send_time > 1000)
         {
-            NET_SV_SendWaitingData(client);
-            client->last_send_time = I_GetTimeMS();
+          net_sv_send_waiting_data(client);
+          client->last_send_time = i_get_time_ms();
         }
     }
 
-    if (server_state == SERVER_IN_GAME)
+  if (server_state == SERVER_IN_GAME)
     {
-        NET_SV_PumpSendQueue(client);
-        NET_SV_CheckDeadlock(client);
+      net_sv_pump_send_queue(client);
+      net_sv_check_deadlock(client);
     }
 }
 
-// Add a network module to the server context
-
-void NET_SV_AddModule(net_module_t *module)
+static void update_master_server(void)
 {
-    module->InitServer();
-    NET_AddModule(server_context, module);
-}
+  unsigned int now;
 
-// Initialize server and wait for connections
+  now = i_get_time_ms();
 
-void NET_SV_Init(void)
-{
-    int i;
+  /* The address of the master server can change. Periodically
+   * re-resolve the master server to update.
+   */
 
-    // initialize send/receive context
-
-    server_context = NET_NewContext();
-
-    // no clients yet
-   
-    for (i=0; i<MAXNETNODES; ++i) 
+  if (now - master_resolve_time > MASTER_RESOLVE_PERIOD * 1000)
     {
-        clients[i].active = false;
+      net_addr_t *new_addr;
+
+      new_addr = net_query_resolve_master(server_context);
+      net_release_address(master_server);
+      master_server = new_addr;
+
+      master_resolve_time = now;
     }
 
-    NET_SV_AssignPlayers();
+  /* Possibly refresh our registration with the master server. */
 
-    server_state = SERVER_WAITING_LAUNCH;
-    sv_gamemode = indetermined;
-    server_initialized = true;
-}
-
-static void UpdateMasterServer(void)
-{
-    unsigned int now;
-
-    now = I_GetTimeMS();
-
-    // The address of the master server can change. Periodically
-    // re-resolve the master server to update.
-
-    if (now - master_resolve_time > MASTER_RESOLVE_PERIOD * 1000)
+  if (now - master_refresh_time > MASTER_REFRESH_PERIOD * 1000)
     {
-        net_addr_t *new_addr;
-
-        new_addr = NET_Query_ResolveMaster(server_context);
-        NET_ReleaseAddress(master_server);
-        master_server = new_addr;
-
-        master_resolve_time = now;
-    }
-
-    // Possibly refresh our registration with the master server.
-
-    if (now - master_refresh_time > MASTER_REFRESH_PERIOD * 1000)
-    {
-        NET_Query_AddToMaster(master_server);
-        master_refresh_time = now;
+      net_query_add_to_master(master_server);
+      master_refresh_time = now;
     }
 }
 
-void NET_SV_RegisterWithMaster(void)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Add a network module to the server context */
+
+void net_sv_add_module(net_module_t *module)
 {
-    //!
-    // @category net
-    //
-    // When running a server, don't register with the global master server.
-    // Implies -server.
-    //
+  module->init_server();
+  net_add_module(server_context, module);
+}
 
-    if (!M_CheckParm("-privateserver"))
+/* Initialize server and wait for connections */
+
+void net_sv_init(void)
+{
+  int i;
+
+  /* initialize send/receive context */
+
+  server_context = net_new_context();
+
+  /* no clients yet */
+
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        master_server = NET_Query_ResolveMaster(server_context);
-    }
-    else
-    {
-        master_server = NULL;
+      clients[i].active = false;
     }
 
-    // Send request.
+  net_sv_assign_players();
 
-    if (master_server != NULL)
+  server_state = SERVER_WAITING_LAUNCH;
+  sv_gamemode = indetermined;
+  server_initialized = true;
+}
+
+void net_sv_register_with_master(void)
+{
+  /* @category net
+   *
+   * When running a server, don't register with the global master server.
+   * Implies -server.
+   */
+
+  if (!m_check_parm("-privateserver"))
     {
-        NET_Query_AddToMaster(master_server);
-        master_refresh_time = I_GetTimeMS();
-        master_resolve_time = master_refresh_time;
+      master_server = net_query_resolve_master(server_context);
+    }
+  else
+    {
+      master_server = NULL;
+    }
+
+  /* Send request. */
+
+  if (master_server != NULL)
+    {
+      net_query_add_to_master(master_server);
+      master_refresh_time = i_get_time_ms();
+      master_resolve_time = master_refresh_time;
     }
 }
 
-// Run server code to check for new packets/send packets as the server
-// requires
+/* Run server code to check for new packets/send packets as the server
+ * requires
+ */
 
-void NET_SV_Run(void)
+void net_sv_run(void)
 {
-    net_addr_t *addr;
-    net_packet_t *packet;
-    int i;
+  net_addr_t *addr;
+  net_packet_t *packet;
+  int i;
 
-    if (!server_initialized)
+  if (!server_initialized)
     {
-        return;
+      return;
     }
 
-    while (NET_RecvPacket(server_context, &addr, &packet))
+  while (net_recv_packet(server_context, &addr, &packet))
     {
-        NET_SV_Packet(packet, addr);
-        NET_FreePacket(packet);
-        NET_ReleaseAddress(addr);
+      net_sv_packet(packet, addr);
+      net_free_packet(packet);
+      net_release_address(addr);
     }
 
-    if (master_server != NULL)
+  if (master_server != NULL)
     {
-        UpdateMasterServer();
+      update_master_server();
     }
 
-    // "Run" any clients that may have things to do, independent of responses
-    // to received packets
+  /* "Run" any clients that may have things to do, independent of responses
+   * to received packets
+   */
 
-    for (i=0; i<MAXNETNODES; ++i)
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (clients[i].active)
+      if (clients[i].active)
         {
-            NET_SV_RunClient(&clients[i]);
+          net_sv_run_client(&clients[i]);
         }
     }
 
-    switch (server_state)
+  switch (server_state)
     {
-        case SERVER_WAITING_LAUNCH:
-            break;
+    case SERVER_WAITING_LAUNCH:
+      break;
 
-        case SERVER_WAITING_START:
-            CheckStartGame();
-            break;
+    case SERVER_WAITING_START:
+      check_start_game();
+      break;
 
-        case SERVER_IN_GAME:
-            NET_SV_AdvanceWindow();
+    case SERVER_IN_GAME:
+      net_sv_advance_window();
 
-            for (i = 0; i < NET_MAXPLAYERS; ++i)
+      for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
+        {
+          if (sv_players[i] != NULL && client_connected(sv_players[i]))
             {
-                if (sv_players[i] != NULL && ClientConnected(sv_players[i]))
-                {
-                    NET_SV_CheckResends(sv_players[i]);
-                }
+              net_sv_check_resends(sv_players[i]);
             }
-            break;
+        }
+      break;
     }
 }
 
-void NET_SV_Shutdown(void)
+void net_sv_shutdown(void)
 {
-    int i;
-    boolean running;
-    int start_time;
+  int i;
+  boolean running;
+  int start_time;
 
-    if (!server_initialized)
+  if (!server_initialized)
     {
-        return;
+      return;
     }
-    
-    fprintf(stderr, "SV: Shutting down server...\n");
 
-    // Disconnect all clients
-    
-    for (i=0; i<MAXNETNODES; ++i)
+  fprintf(stderr, "SV: Shutting down server...\n");
+
+  /* Disconnect all clients */
+
+  for (i = 0; i < MAXNETNODES; ++i)
     {
-        if (clients[i].active)
+      if (clients[i].active)
         {
-            NET_SV_DisconnectClient(&clients[i]);
+          net_sv_disconnect_client(&clients[i]);
         }
     }
 
-    // Wait for all clients to finish disconnecting
+  /* Wait for all clients to finish disconnecting */
 
-    start_time = I_GetTimeMS();
-    running = true;
+  start_time = i_get_time_ms();
+  running = true;
 
-    while (running)
+  while (running)
     {
-        // Check if any clients are still not finished
+      /* Check if any clients are still not finished */
 
-        running = false;
+      running = false;
 
-        for (i=0; i<MAXNETNODES; ++i)
+      for (i = 0; i < MAXNETNODES; ++i)
         {
-            if (clients[i].active)
+          if (clients[i].active)
             {
-                running = true;
+              running = true;
             }
         }
 
-        // Timed out?
+      /* Timed out? */
 
-        if (I_GetTimeMS() - start_time > 5000)
+      if (i_get_time_ms() - start_time > 5000)
         {
-            running = false;
-            fprintf(stderr, "SV: Timed out waiting for clients to disconnect.\n");
+          running = false;
+          fprintf(stderr,
+                  "SV: Timed out waiting for clients to disconnect.\n");
         }
 
-        // Run the client code in case this is a loopback client.
+      /* Run the client code in case this is a loopback client. */
 
-        NET_CL_Run();
-        NET_SV_Run();
+      net_cl_run();
+      net_sv_run();
 
-        // Don't hog the CPU
+      /* Don't hog the CPU */
 
-        I_Sleep(1);
+      usleep(1000);
     }
 }
diff --git a/games/NXDoom/src/net_server.h b/games/NXDoom/src/net_server.h
index b9de7456e..9d1db98b9 100644
--- a/games/NXDoom/src/net_server.h
+++ b/games/NXDoom/src/net_server.h
@@ -1,42 +1,51 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Network server code
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_server.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Network server code
+ *
+ ****************************************************************************/
 
 #ifndef NET_SERVER_H
 #define NET_SERVER_H
 
-// initialize server and wait for connections
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void NET_SV_Init(void);
+/* initialize server and wait for connections */
 
-// run server: check for new packets received etc.
+void net_sv_init(void);
 
-void NET_SV_Run(void);
+/* run server: check for new packets received etc. */
 
-// Shut down the server
-// Blocks until all clients disconnect, or until a 5 second timeout
+void net_sv_run(void);
 
-void NET_SV_Shutdown(void);
+/* Shut down the server
+ * Blocks until all clients disconnect, or until a 5 second timeout
+ */
 
-// Add a network module to the context used by the server
+void net_sv_shutdown(void);
 
-void NET_SV_AddModule(net_module_t *module);
+/* Add a network module to the context used by the server */
 
-// Register server with master server.
+void net_sv_add_module(net_module_t *module);
 
-void NET_SV_RegisterWithMaster(void);
+/* Register server with master server. */
 
-#endif /* #ifndef NET_SERVER_H */
+void net_sv_register_with_master(void);
 
+#endif /* NET_SERVER_H */
diff --git a/games/NXDoom/src/net_structrw.c b/games/NXDoom/src/net_structrw.c
index 2dbd2740a..371aa4f7a 100644
--- a/games/NXDoom/src/net_structrw.c
+++ b/games/NXDoom/src/net_structrw.c
@@ -1,18 +1,27 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// Reading and writing various structures into packets
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_structrw.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Reading and writing various structures into packets
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,653 +33,682 @@
 #include "net_packet.h"
 #include "net_structrw.h"
 
-// String names for the enum values in net_protocol_t, which are what is
-// sent over the wire. Every enum value must have an entry in this list.
-static struct
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct protocol_name
 {
-    net_protocol_t protocol;
-    const char *name;
-} protocol_names[] = {
-    {NET_PROTOCOL_CHOCOLATE_DOOM_0, "CHOCOLATE_DOOM_0"},
+  net_protocol_t protocol;
+  const char *name;
 };
 
-void NET_WriteConnectData(net_packet_t *packet, net_connect_data_t *data)
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* String names for the enum values in net_protocol_t, which are what is
+ * sent over the wire. Every enum value must have an entry in this list.
+ */
+
+static struct protocol_name g_protocol_names[] =
 {
-    NET_WriteInt8(packet, data->gamemode);
-    NET_WriteInt8(packet, data->gamemission);
-    NET_WriteInt8(packet, data->lowres_turn);
-    NET_WriteInt8(packet, data->drone);
-    NET_WriteInt8(packet, data->max_players);
-    NET_WriteInt8(packet, data->is_freedoom);
-    NET_WriteSHA1Sum(packet, data->wad_sha1sum);
-    NET_WriteSHA1Sum(packet, data->deh_sha1sum);
-    NET_WriteInt8(packet, data->player_class);
-}
+  {NET_PROTOCOL_CHOCOLATE_DOOM_0, "CHOCOLATE_DOOM_0"},
+};
 
-boolean NET_ReadConnectData(net_packet_t *packet, net_connect_data_t *data)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static boolean net_read_blob(net_packet_t *packet, uint8_t *buf, size_t len)
 {
-    return NET_ReadInt8(packet, (unsigned int *) &data->gamemode)
-        && NET_ReadInt8(packet, (unsigned int *) &data->gamemission)
-        && NET_ReadInt8(packet, (unsigned int *) &data->lowres_turn)
-        && NET_ReadInt8(packet, (unsigned int *) &data->drone)
-        && NET_ReadInt8(packet, (unsigned int *) &data->max_players)
-        && NET_ReadInt8(packet, (unsigned int *) &data->is_freedoom)
-        && NET_ReadSHA1Sum(packet, data->wad_sha1sum)
-        && NET_ReadSHA1Sum(packet, data->deh_sha1sum)
-        && NET_ReadInt8(packet, (unsigned int *) &data->player_class);
-}
+  unsigned int b;
+  int i;
 
-void NET_WriteSettings(net_packet_t *packet, net_gamesettings_t *settings)
-{
-    int i;
-
-    NET_WriteInt8(packet, settings->ticdup);
-    NET_WriteInt8(packet, settings->extratics);
-    NET_WriteInt8(packet, settings->deathmatch);
-    NET_WriteInt8(packet, settings->nomonsters);
-    NET_WriteInt8(packet, settings->fast_monsters);
-    NET_WriteInt8(packet, settings->respawn_monsters);
-    NET_WriteInt8(packet, settings->episode);
-    NET_WriteInt8(packet, settings->map);
-    NET_WriteInt8(packet, settings->skill);
-    NET_WriteInt8(packet, settings->gameversion);
-    NET_WriteInt8(packet, settings->lowres_turn);
-    NET_WriteInt8(packet, settings->new_sync);
-    NET_WriteInt32(packet, settings->timelimit);
-    NET_WriteInt8(packet, settings->loadgame);
-    NET_WriteInt8(packet, settings->random);
-    NET_WriteInt8(packet, settings->num_players);
-    NET_WriteInt8(packet, settings->consoleplayer);
-
-    for (i = 0; i < settings->num_players; ++i)
+  for (i = 0; i < len; ++i)
     {
-        NET_WriteInt8(packet, settings->player_classes[i]);
-    }
-}
-
-boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings)
-{
-    boolean success;
-    int i;
-
-    success = NET_ReadInt8(packet, (unsigned int *) &settings->ticdup)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->extratics)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->deathmatch)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->nomonsters)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->fast_monsters)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->respawn_monsters)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->episode)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->map)
-           && NET_ReadSInt8(packet, &settings->skill)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->gameversion)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->lowres_turn)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->new_sync)
-           && NET_ReadInt32(packet, (unsigned int *) &settings->timelimit)
-           && NET_ReadSInt8(packet, (signed int *) &settings->loadgame)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->random)
-           && NET_ReadInt8(packet, (unsigned int *) &settings->num_players)
-           && NET_ReadSInt8(packet, (signed int *) &settings->consoleplayer);
-
-    if (!success)
-    {
-        return false;
-    }
-
-    for (i = 0; i < settings->num_players && i < NET_MAXPLAYERS; ++i)
-    {
-        if (!NET_ReadInt8(packet,
-                          (unsigned int *) &settings->player_classes[i]))
+      if (!net_read_int8(packet, &b))
         {
-            return false;
+          return false;
+        }
+
+      buf[i] = b;
+    }
+
+  return true;
+}
+
+static void net_write_blob(net_packet_t *packet, uint8_t *buf, size_t len)
+{
+  int i;
+
+  for (i = 0; i < len; ++i)
+    {
+      net_write_int8(packet, buf[i]);
+    }
+}
+
+static net_protocol_t parse_protocol_name(const char *name)
+{
+  int i;
+
+  for (i = 0; i < arrlen(g_protocol_names); ++i)
+    {
+      if (!strcmp(g_protocol_names[i].name, name))
+        {
+          return g_protocol_names[i].protocol;
         }
     }
 
-    return true;
+  return NET_PROTOCOL_UNKNOWN;
 }
 
-boolean NET_ReadQueryData(net_packet_t *packet, net_querydata_t *query)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void net_write_connect_data(net_packet_t *packet, net_connect_data_t *data)
 {
-    boolean success;
+  net_write_int8(packet, data->gamemode);
+  net_write_int8(packet, data->gamemission);
+  net_write_int8(packet, data->lowres_turn);
+  net_write_int8(packet, data->drone);
+  net_write_int8(packet, data->max_players);
+  net_write_int8(packet, data->is_freedoom);
+  net_write_sha1_sum(packet, data->wad_sha1sum);
+  net_write_sha1_sum(packet, data->deh_sha1sum);
+  net_write_int8(packet, data->player_class);
+}
 
-    query->version = NET_ReadSafeString(packet);
+boolean net_read_connect_data(net_packet_t *packet, net_connect_data_t *data)
+{
+  return net_read_int8(packet, (unsigned int *)&data->gamemode) &&
+         net_read_int8(packet, (unsigned int *)&data->gamemission) &&
+         net_read_int8(packet, (unsigned int *)&data->lowres_turn) &&
+         net_read_int8(packet, (unsigned int *)&data->drone) &&
+         net_read_int8(packet, (unsigned int *)&data->max_players) &&
+         net_read_int8(packet, (unsigned int *)&data->is_freedoom) &&
+         net_read_sha1_sum(packet, data->wad_sha1sum) &&
+         net_read_sha1_sum(packet, data->deh_sha1sum) &&
+         net_read_int8(packet, (unsigned int *)&data->player_class);
+}
 
-    success = query->version != NULL
-          && NET_ReadInt8(packet, (unsigned int *) &query->server_state)
-          && NET_ReadInt8(packet, (unsigned int *) &query->num_players)
-          && NET_ReadInt8(packet, (unsigned int *) &query->max_players)
-          && NET_ReadInt8(packet, (unsigned int *) &query->gamemode)
-          && NET_ReadInt8(packet, (unsigned int *) &query->gamemission);
+void net_write_settings(net_packet_t *packet, net_gamesettings_t *settings)
+{
+  int i;
 
-    if (!success)
+  net_write_int8(packet, settings->ticdup);
+  net_write_int8(packet, settings->extratics);
+  net_write_int8(packet, settings->deathmatch);
+  net_write_int8(packet, settings->nomonsters);
+  net_write_int8(packet, settings->fast_monsters);
+  net_write_int8(packet, settings->respawn_monsters);
+  net_write_int8(packet, settings->episode);
+  net_write_int8(packet, settings->map);
+  net_write_int8(packet, settings->skill);
+  net_write_int8(packet, settings->gameversion);
+  net_write_int8(packet, settings->lowres_turn);
+  net_write_int8(packet, settings->new_sync);
+  net_write_int32(packet, settings->timelimit);
+  net_write_int8(packet, settings->loadgame);
+  net_write_int8(packet, settings->random);
+  net_write_int8(packet, settings->num_players);
+  net_write_int8(packet, settings->consoleplayer);
+
+  for (i = 0; i < settings->num_players; ++i)
     {
-        return false;
+      net_write_int8(packet, settings->player_classes[i]);
+    }
+}
+
+boolean net_read_settings(net_packet_t *packet, net_gamesettings_t *settings)
+{
+  boolean success;
+  int i;
+
+  success =
+      net_read_int8(packet, (unsigned int *)&settings->ticdup) &&
+      net_read_int8(packet, (unsigned int *)&settings->extratics) &&
+      net_read_int8(packet, (unsigned int *)&settings->deathmatch) &&
+      net_read_int8(packet, (unsigned int *)&settings->nomonsters) &&
+      net_read_int8(packet, (unsigned int *)&settings->fast_monsters) &&
+      net_read_int8(packet, (unsigned int *)&settings->respawn_monsters) &&
+      net_read_int8(packet, (unsigned int *)&settings->episode) &&
+      net_read_int8(packet, (unsigned int *)&settings->map) &&
+      net_read_sint8(packet, &settings->skill) &&
+      net_read_int8(packet, (unsigned int *)&settings->gameversion) &&
+      net_read_int8(packet, (unsigned int *)&settings->lowres_turn) &&
+      net_read_int8(packet, (unsigned int *)&settings->new_sync) &&
+      net_read_int32(packet, (unsigned int *)&settings->timelimit) &&
+      net_read_sint8(packet, (signed int *)&settings->loadgame) &&
+      net_read_int8(packet, (unsigned int *)&settings->random) &&
+      net_read_int8(packet, (unsigned int *)&settings->num_players) &&
+      net_read_sint8(packet, (signed int *)&settings->consoleplayer);
+
+  if (!success)
+    {
+      return false;
     }
 
-    query->description = NET_ReadSafeString(packet);
+  for (i = 0;
+       i < settings->num_players && i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS;
+       ++i)
+    {
+      if (!net_read_int8(packet,
+                         (unsigned int *)&settings->player_classes[i]))
+        {
+          return false;
+        }
+    }
 
-    // We read the list of protocols supported by the server. However,
-    // old versions of Chocolate Doom do not support this field; it is
-    // okay if it cannot be successfully read.
-    query->protocol = NET_ReadProtocolList(packet);
-
-    return query->description != NULL;
+  return true;
 }
 
-void NET_WriteQueryData(net_packet_t *packet, net_querydata_t *query)
+boolean net_read_query_data(net_packet_t *packet, net_querydata_t *query)
 {
-    NET_WriteString(packet, query->version);
-    NET_WriteInt8(packet, query->server_state);
-    NET_WriteInt8(packet, query->num_players);
-    NET_WriteInt8(packet, query->max_players);
-    NET_WriteInt8(packet, query->gamemode);
-    NET_WriteInt8(packet, query->gamemission);
-    NET_WriteString(packet, query->description);
+  boolean success;
 
-    // Write a list of all supported protocols. Note that the query->protocol
-    // field is ignored here; it is only used when receiving.
-    NET_WriteProtocolList(packet);
+  query->version = net_read_safe_string(packet);
+
+  success = query->version != NULL &&
+            net_read_int8(packet, (unsigned int *)&query->server_state) &&
+            net_read_int8(packet, (unsigned int *)&query->num_players) &&
+            net_read_int8(packet, (unsigned int *)&query->max_players) &&
+            net_read_int8(packet, (unsigned int *)&query->gamemode) &&
+            net_read_int8(packet, (unsigned int *)&query->gamemission);
+
+  if (!success)
+    {
+      return false;
+    }
+
+  query->description = net_read_safe_string(packet);
+
+  /* We read the list of protocols supported by the server. However,
+   * old versions of Chocolate Doom do not support this field; it is
+   * okay if it cannot be successfully read.
+   */
+
+  query->protocol = net_read_protocol_list(packet);
+
+  return query->description != NULL;
 }
 
-void NET_WriteTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff,
+void net_write_query_data(net_packet_t *packet, net_querydata_t *query)
+{
+  net_write_string(packet, query->version);
+  net_write_int8(packet, query->server_state);
+  net_write_int8(packet, query->num_players);
+  net_write_int8(packet, query->max_players);
+  net_write_int8(packet, query->gamemode);
+  net_write_int8(packet, query->gamemission);
+  net_write_string(packet, query->description);
+
+  /* Write a list of all supported protocols. Note that the query->protocol
+   * field is ignored here; it is only used when receiving.
+   */
+
+  net_write_protocol_list(packet);
+}
+
+void net_write_ticcmd_diff(net_packet_t *packet, net_ticdiff_t *diff,
                          boolean lowres_turn)
 {
-    // Header
+  /* Header */
 
-    NET_WriteInt8(packet, diff->diff);
+  net_write_int8(packet, diff->diff);
 
-    // Write the fields which are enabled:
+  /* Write the fields which are enabled: */
 
-    if (diff->diff & NET_TICDIFF_FORWARD)
-        NET_WriteInt8(packet, diff->cmd.forwardmove);
-    if (diff->diff & NET_TICDIFF_SIDE)
-        NET_WriteInt8(packet, diff->cmd.sidemove);
-    if (diff->diff & NET_TICDIFF_TURN)
+  if (diff->diff & NET_TICDIFF_FORWARD)
+    net_write_int8(packet, diff->cmd.forwardmove);
+  if (diff->diff & NET_TICDIFF_SIDE)
+    net_write_int8(packet, diff->cmd.sidemove);
+  if (diff->diff & NET_TICDIFF_TURN)
     {
-        if (lowres_turn)
+      if (lowres_turn)
         {
-            NET_WriteInt8(packet, diff->cmd.angleturn / 256);
+          net_write_int8(packet, diff->cmd.angleturn / 256);
         }
-        else
+      else
         {
-            NET_WriteInt16(packet, diff->cmd.angleturn);
+          net_write_int16(packet, diff->cmd.angleturn);
         }
     }
-    if (diff->diff & NET_TICDIFF_BUTTONS)
-        NET_WriteInt8(packet, diff->cmd.buttons);
-    if (diff->diff & NET_TICDIFF_CONSISTANCY)
-        NET_WriteInt8(packet, diff->cmd.consistancy);
-    if (diff->diff & NET_TICDIFF_CHATCHAR)
-        NET_WriteInt8(packet, diff->cmd.chatchar);
-    if (diff->diff & NET_TICDIFF_RAVEN)
+
+  if (diff->diff & NET_TICDIFF_BUTTONS)
+    net_write_int8(packet, diff->cmd.buttons);
+  if (diff->diff & NET_TICDIFF_CONSISTANCY)
+    net_write_int8(packet, diff->cmd.consistency);
+  if (diff->diff & NET_TICDIFF_CHATCHAR)
+    net_write_int8(packet, diff->cmd.chatchar);
+  if (diff->diff & NET_TICDIFF_RAVEN)
     {
-        NET_WriteInt8(packet, diff->cmd.lookfly);
-        NET_WriteInt8(packet, diff->cmd.arti);
+      net_write_int8(packet, diff->cmd.lookfly);
+      net_write_int8(packet, diff->cmd.arti);
     }
-    if (diff->diff & NET_TICDIFF_STRIFE)
+
+  if (diff->diff & NET_TICDIFF_STRIFE)
     {
-        NET_WriteInt8(packet, diff->cmd.buttons2);
-        NET_WriteInt16(packet, diff->cmd.inventory);
+      net_write_int8(packet, diff->cmd.buttons2);
+      net_write_int16(packet, diff->cmd.inventory);
     }
 }
 
-boolean NET_ReadTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff,
+boolean net_read_ticcmd_diff(net_packet_t *packet, net_ticdiff_t *diff,
                            boolean lowres_turn)
 {
-    unsigned int val;
-    signed int sval;
+  unsigned int val;
+  signed int sval;
 
-    // Read header
+  /* Read header */
 
-    if (!NET_ReadInt8(packet, &diff->diff))
-        return false;
-    
-    // Read fields
+  if (!net_read_int8(packet, &diff->diff)) return false;
 
-    if (diff->diff & NET_TICDIFF_FORWARD)
+  /* Read fields */
+
+  if (diff->diff & NET_TICDIFF_FORWARD)
     {
-        if (!NET_ReadSInt8(packet, &sval))
-            return false;
-        diff->cmd.forwardmove = sval;
+      if (!net_read_sint8(packet, &sval)) return false;
+      diff->cmd.forwardmove = sval;
     }
 
-    if (diff->diff & NET_TICDIFF_SIDE)
+  if (diff->diff & NET_TICDIFF_SIDE)
     {
-        if (!NET_ReadSInt8(packet, &sval))
-            return false;
-        diff->cmd.sidemove = sval;
+      if (!net_read_sint8(packet, &sval)) return false;
+      diff->cmd.sidemove = sval;
     }
 
-    if (diff->diff & NET_TICDIFF_TURN)
+  if (diff->diff & NET_TICDIFF_TURN)
     {
-        if (lowres_turn)
+      if (lowres_turn)
         {
-            if (!NET_ReadSInt8(packet, &sval))
-                return false;
-            diff->cmd.angleturn = sval * 256;
+          if (!net_read_sint8(packet, &sval)) return false;
+          diff->cmd.angleturn = sval * 256;
         }
-        else
+      else
         {
-            if (!NET_ReadSInt16(packet, &sval))
-                return false;
-            diff->cmd.angleturn = sval;
+          if (!net_read_sint16(packet, &sval)) return false;
+          diff->cmd.angleturn = sval;
         }
     }
 
-    if (diff->diff & NET_TICDIFF_BUTTONS)
+  if (diff->diff & NET_TICDIFF_BUTTONS)
     {
-        if (!NET_ReadInt8(packet, &val))
-            return false;
-        diff->cmd.buttons = val;
+      if (!net_read_int8(packet, &val)) return false;
+      diff->cmd.buttons = val;
     }
 
-    if (diff->diff & NET_TICDIFF_CONSISTANCY)
+  if (diff->diff & NET_TICDIFF_CONSISTANCY)
     {
-        if (!NET_ReadInt8(packet, &val))
-            return false;
-        diff->cmd.consistancy = val;
+      if (!net_read_int8(packet, &val)) return false;
+      diff->cmd.consistency = val;
     }
 
-    if (diff->diff & NET_TICDIFF_CHATCHAR)
+  if (diff->diff & NET_TICDIFF_CHATCHAR)
     {
-        if (!NET_ReadInt8(packet, &val))
-            return false;
-        diff->cmd.chatchar = val;
+      if (!net_read_int8(packet, &val)) return false;
+      diff->cmd.chatchar = val;
     }
 
-    if (diff->diff & NET_TICDIFF_RAVEN)
+  if (diff->diff & NET_TICDIFF_RAVEN)
     {
-        if (!NET_ReadInt8(packet, &val))
-            return false;
-        diff->cmd.lookfly = val;
+      if (!net_read_int8(packet, &val)) return false;
+      diff->cmd.lookfly = val;
 
-        if (!NET_ReadInt8(packet, &val))
-            return false;
-        diff->cmd.arti = val;
+      if (!net_read_int8(packet, &val)) return false;
+      diff->cmd.arti = val;
     }
 
-    if (diff->diff & NET_TICDIFF_STRIFE)
+  if (diff->diff & NET_TICDIFF_STRIFE)
     {
-        if (!NET_ReadInt8(packet, &val))
-            return false;
-        diff->cmd.buttons2 = val;
+      if (!net_read_int8(packet, &val)) return false;
+      diff->cmd.buttons2 = val;
 
-        if (!NET_ReadInt16(packet, &val))
-            return false;
-        diff->cmd.inventory = val;
+      if (!net_read_int16(packet, &val)) return false;
+      diff->cmd.inventory = val;
     }
 
-    return true;
+  return true;
 }
 
-void NET_TiccmdDiff(ticcmd_t *tic1, ticcmd_t *tic2, net_ticdiff_t *diff)
+void net_ticcmd_diff(ticcmd_t *tic1, ticcmd_t *tic2, net_ticdiff_t *diff)
 {
-    diff->diff = 0;
-    diff->cmd = *tic2;
+  diff->diff = 0;
+  diff->cmd = *tic2;
 
-    if (tic1->forwardmove != tic2->forwardmove)
-        diff->diff |= NET_TICDIFF_FORWARD;
-    if (tic1->sidemove != tic2->sidemove)
-        diff->diff |= NET_TICDIFF_SIDE;
-    if (tic1->angleturn != tic2->angleturn)
-        diff->diff |= NET_TICDIFF_TURN;
-    if (tic1->buttons != tic2->buttons)
-        diff->diff |= NET_TICDIFF_BUTTONS;
-    if (tic1->consistancy != tic2->consistancy)
-        diff->diff |= NET_TICDIFF_CONSISTANCY;
-    if (tic2->chatchar != 0)
-        diff->diff |= NET_TICDIFF_CHATCHAR;
+  if (tic1->forwardmove != tic2->forwardmove)
+    diff->diff |= NET_TICDIFF_FORWARD;
+  if (tic1->sidemove != tic2->sidemove) diff->diff |= NET_TICDIFF_SIDE;
+  if (tic1->angleturn != tic2->angleturn) diff->diff |= NET_TICDIFF_TURN;
+  if (tic1->buttons != tic2->buttons) diff->diff |= NET_TICDIFF_BUTTONS;
+  if (tic1->consistency != tic2->consistency)
+    diff->diff |= NET_TICDIFF_CONSISTANCY;
+  if (tic2->chatchar != 0) diff->diff |= NET_TICDIFF_CHATCHAR;
 
-    // Heretic/Hexen-specific
+  /* Heretic/Hexen-specific */
 
-    if (tic1->lookfly != tic2->lookfly || tic2->arti != 0)
-        diff->diff |= NET_TICDIFF_RAVEN;
+  if (tic1->lookfly != tic2->lookfly || tic2->arti != 0)
+    diff->diff |= NET_TICDIFF_RAVEN;
 
-    // Strife-specific
+  /* Strife-specific */
 
-    if (tic1->buttons2 != tic2->buttons2 || tic2->inventory != 0)
-        diff->diff |= NET_TICDIFF_STRIFE;
+  if (tic1->buttons2 != tic2->buttons2 || tic2->inventory != 0)
+    diff->diff |= NET_TICDIFF_STRIFE;
 }
 
-void NET_TiccmdPatch(ticcmd_t *src, net_ticdiff_t *diff, ticcmd_t *dest)
+void net_ticcmd_patch(ticcmd_t *src, net_ticdiff_t *diff, ticcmd_t *dest)
 {
-    memmove(dest, src, sizeof(ticcmd_t));
+  memmove(dest, src, sizeof(ticcmd_t));
 
-    // Apply the diff
+  /* Apply the diff */
 
-    if (diff->diff & NET_TICDIFF_FORWARD)
-        dest->forwardmove = diff->cmd.forwardmove;
-    if (diff->diff & NET_TICDIFF_SIDE)
-        dest->sidemove = diff->cmd.sidemove;
-    if (diff->diff & NET_TICDIFF_TURN)
-        dest->angleturn = diff->cmd.angleturn;
-    if (diff->diff & NET_TICDIFF_BUTTONS)
-        dest->buttons = diff->cmd.buttons;
-    if (diff->diff & NET_TICDIFF_CONSISTANCY)
-        dest->consistancy = diff->cmd.consistancy;
+  if (diff->diff & NET_TICDIFF_FORWARD)
+    dest->forwardmove = diff->cmd.forwardmove;
+  if (diff->diff & NET_TICDIFF_SIDE) dest->sidemove = diff->cmd.sidemove;
+  if (diff->diff & NET_TICDIFF_TURN) dest->angleturn = diff->cmd.angleturn;
+  if (diff->diff & NET_TICDIFF_BUTTONS) dest->buttons = diff->cmd.buttons;
+  if (diff->diff & NET_TICDIFF_CONSISTANCY)
+    dest->consistency = diff->cmd.consistency;
 
-    if (diff->diff & NET_TICDIFF_CHATCHAR)
-        dest->chatchar = diff->cmd.chatchar;
-    else
-        dest->chatchar = 0;
+  if (diff->diff & NET_TICDIFF_CHATCHAR)
+    dest->chatchar = diff->cmd.chatchar;
+  else
+    dest->chatchar = 0;
 
-    // Heretic/Hexen specific:
+  /* Heretic/Hexen specific: */
 
-    if (diff->diff & NET_TICDIFF_RAVEN)
+  if (diff->diff & NET_TICDIFF_RAVEN)
     {
-        dest->lookfly = diff->cmd.lookfly;
-        dest->arti = diff->cmd.arti;
+      dest->lookfly = diff->cmd.lookfly;
+      dest->arti = diff->cmd.arti;
     }
-    else
+  else
     {
-        dest->arti = 0;
+      dest->arti = 0;
     }
 
-    // Strife-specific:
+  /* Strife-specific: */
 
-    if (diff->diff & NET_TICDIFF_STRIFE)
+  if (diff->diff & NET_TICDIFF_STRIFE)
     {
-        dest->buttons2 = diff->cmd.buttons2;
-        dest->inventory = diff->cmd.inventory;
+      dest->buttons2 = diff->cmd.buttons2;
+      dest->inventory = diff->cmd.inventory;
     }
-    else
+  else
     {
-        dest->inventory = 0;
+      dest->inventory = 0;
     }
 }
 
-// 
-// net_full_ticcmd_t
-// 
+/* net_full_ticcmd_t */
 
-boolean NET_ReadFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn)
+boolean net_read_full_ticcmd(net_packet_t *packet, net_full_ticcmd_t *cmd,
+                           boolean lowres_turn)
 {
-    unsigned int bitfield;
-    int i;
+  unsigned int bitfield;
+  int i;
 
-    // Latency
+  /* Latency */
 
-    if (!NET_ReadSInt16(packet, &cmd->latency))
+  if (!net_read_sint16(packet, &cmd->latency))
     {
-        return false;
+      return false;
     }
 
-    // Regenerate playeringame from the "header" bitfield
+  /* Regenerate playeringame from the "header" bitfield */
 
-    if (!NET_ReadInt8(packet, &bitfield))
+  if (!net_read_int8(packet, &bitfield))
     {
-        return false;
+      return false;
     }
-          
-    for (i=0; i<NET_MAXPLAYERS; ++i)
-    {
-        cmd->playeringame[i] = (bitfield & (1 << i)) != 0;
-    }
-        
-    // Read cmds
 
-    for (i=0; i<NET_MAXPLAYERS; ++i)
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (cmd->playeringame[i])
+      cmd->playeringame[i] = (bitfield & (1 << i)) != 0;
+    }
+
+  /* Read cmds */
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
+    {
+      if (cmd->playeringame[i])
         {
-            if (!NET_ReadTiccmdDiff(packet, &cmd->cmds[i], lowres_turn))
+          if (!net_read_ticcmd_diff(packet, &cmd->cmds[i], lowres_turn))
             {
-                return false;
+              return false;
             }
         }
     }
 
-    return true;
+  return true;
 }
 
-void NET_WriteFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn)
+void net_write_full_ticcmd(net_packet_t *packet, net_full_ticcmd_t *cmd,
+                         boolean lowres_turn)
 {
-    unsigned int bitfield;
-    int i;
+  unsigned int bitfield;
+  int i;
 
-    // Write the latency
+  /* Write the latency */
 
-    NET_WriteInt16(packet, cmd->latency);
+  net_write_int16(packet, cmd->latency);
 
-    // Write "header" byte indicating which players are active
-    // in this ticcmd
+  /* Write "header" byte indicating which players are active
+   * in this ticcmd
+   */
 
-    bitfield = 0;
-    
-    for (i=0; i<NET_MAXPLAYERS; ++i)
+  bitfield = 0;
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (cmd->playeringame[i])
+      if (cmd->playeringame[i])
         {
-            bitfield |= 1 << i;
+          bitfield |= 1 << i;
         }
     }
-    
-    NET_WriteInt8(packet, bitfield);
 
-    // Write player ticcmds
+  net_write_int8(packet, bitfield);
 
-    for (i=0; i<NET_MAXPLAYERS; ++i)
+  /* Write player ticcmds */
+
+  for (i = 0; i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS; ++i)
     {
-        if (cmd->playeringame[i])
+      if (cmd->playeringame[i])
         {
-            NET_WriteTiccmdDiff(packet, &cmd->cmds[i], lowres_turn);
+          net_write_ticcmd_diff(packet, &cmd->cmds[i], lowres_turn);
         }
     }
 }
 
-void NET_WriteWaitData(net_packet_t *packet, net_waitdata_t *data)
+void net_write_wait_data(net_packet_t *packet, net_waitdata_t *data)
 {
-    int i;
+  int i;
 
-    NET_WriteInt8(packet, data->num_players);
-    NET_WriteInt8(packet, data->num_drones);
-    NET_WriteInt8(packet, data->ready_players);
-    NET_WriteInt8(packet, data->max_players);
-    NET_WriteInt8(packet, data->is_controller);
-    NET_WriteInt8(packet, data->consoleplayer);
+  net_write_int8(packet, data->num_players);
+  net_write_int8(packet, data->num_drones);
+  net_write_int8(packet, data->ready_players);
+  net_write_int8(packet, data->max_players);
+  net_write_int8(packet, data->is_controller);
+  net_write_int8(packet, data->consoleplayer);
 
-    for (i = 0; i < data->num_players && i < NET_MAXPLAYERS; ++i)
+  for (i = 0;
+       i < data->num_players && i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS;
+       ++i)
     {
-        NET_WriteString(packet, data->player_names[i]);
-        NET_WriteString(packet, data->player_addrs[i]);
+      net_write_string(packet, data->player_names[i]);
+      net_write_string(packet, data->player_addrs[i]);
     }
 
-    NET_WriteSHA1Sum(packet, data->wad_sha1sum);
-    NET_WriteSHA1Sum(packet, data->deh_sha1sum);
-    NET_WriteInt8(packet, data->is_freedoom);
+  net_write_sha1_sum(packet, data->wad_sha1sum);
+  net_write_sha1_sum(packet, data->deh_sha1sum);
+  net_write_int8(packet, data->is_freedoom);
 }
 
-boolean NET_ReadWaitData(net_packet_t *packet, net_waitdata_t *data)
+boolean net_read_wait_data(net_packet_t *packet, net_waitdata_t *data)
 {
-    int i;
-    char *s;
+  int i;
+  char *s;
 
-    if (!NET_ReadInt8(packet, (unsigned int *) &data->num_players)
-     || !NET_ReadInt8(packet, (unsigned int *) &data->num_drones)
-     || !NET_ReadInt8(packet, (unsigned int *) &data->ready_players)
-     || !NET_ReadInt8(packet, (unsigned int *) &data->max_players)
-     || !NET_ReadInt8(packet, (unsigned int *) &data->is_controller)
-     || !NET_ReadSInt8(packet, &data->consoleplayer))
+  if (!net_read_int8(packet, (unsigned int *)&data->num_players) ||
+      !net_read_int8(packet, (unsigned int *)&data->num_drones) ||
+      !net_read_int8(packet, (unsigned int *)&data->ready_players) ||
+      !net_read_int8(packet, (unsigned int *)&data->max_players) ||
+      !net_read_int8(packet, (unsigned int *)&data->is_controller) ||
+      !net_read_sint8(packet, &data->consoleplayer))
     {
-        return false;
+      return false;
     }
 
-    for (i = 0; i < data->num_players && i < NET_MAXPLAYERS; ++i)
+  for (i = 0;
+       i < data->num_players && i < CONFIG_GAMES_NXDOOM_NET_MAXPLAYERS;
+       ++i)
     {
-        s = NET_ReadString(packet);
+      s = net_read_string(packet);
 
-        if (s == NULL || strlen(s) >= MAXPLAYERNAME)
+      if (s == NULL || strlen(s) >= CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME)
         {
-            return false;
+          return false;
         }
 
-        M_StringCopy(data->player_names[i], s, MAXPLAYERNAME);
+      m_str_copy(data->player_names[i], s,
+                 CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME);
 
-        s = NET_ReadString(packet);
+      s = net_read_string(packet);
 
-        if (s == NULL || strlen(s) >= MAXPLAYERNAME)
+      if (s == NULL || strlen(s) >= CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME)
         {
-            return false;
+          return false;
         }
 
-        M_StringCopy(data->player_addrs[i], s, MAXPLAYERNAME);
+      m_str_copy(data->player_addrs[i], s,
+                 CONFIG_GAMES_NXDOOM_NET_MAXPLAYERNAME);
     }
 
-    return NET_ReadSHA1Sum(packet, data->wad_sha1sum)
-        && NET_ReadSHA1Sum(packet, data->deh_sha1sum)
-        && NET_ReadInt8(packet, (unsigned int *) &data->is_freedoom);
+  return net_read_sha1_sum(packet, data->wad_sha1sum) &&
+         net_read_sha1_sum(packet, data->deh_sha1sum) &&
+         net_read_int8(packet, (unsigned int *)&data->is_freedoom);
 }
 
-static boolean NET_ReadBlob(net_packet_t *packet, uint8_t *buf, size_t len)
+boolean net_read_sha1_sum(net_packet_t *packet, sha1_digest_t digest)
 {
-    unsigned int b;
-    int i;
+  return net_read_blob(packet, digest, sizeof(sha1_digest_t));
+}
 
-    for (i=0; i<len; ++i)
+void net_write_sha1_sum(net_packet_t *packet, sha1_digest_t digest)
+{
+  net_write_blob(packet, digest, sizeof(sha1_digest_t));
+}
+
+boolean net_read_prng_seed(net_packet_t *packet, prng_seed_t seed)
+{
+  return net_read_blob(packet, seed, sizeof(prng_seed_t));
+}
+
+void net_write_prng_seed(net_packet_t *packet, prng_seed_t seed)
+{
+  net_write_blob(packet, seed, sizeof(prng_seed_t));
+}
+
+/* net_read_protocol reads a single string-format protocol name from the
+ * given packet, returning NET_PROTOCOL_UNKNOWN if the string describes an
+ * unknown protocol.
+ */
+
+net_protocol_t net_read_protocol(net_packet_t *packet)
+{
+  const char *name;
+
+  name = net_read_string(packet);
+  if (name == NULL)
     {
-        if (!NET_ReadInt8(packet, &b))
+      return NET_PROTOCOL_UNKNOWN;
+    }
+
+  return parse_protocol_name(name);
+}
+
+/* net_write_protocol writes a single string-format protocol name to a
+ * packet.
+ */
+
+void net_write_protocol(net_packet_t *packet, net_protocol_t protocol)
+{
+  int i;
+
+  for (i = 0; i < arrlen(g_protocol_names); ++i)
+    {
+      if (g_protocol_names[i].protocol == protocol)
         {
-            return false;
-        }
-
-        buf[i] = b;
-    }
-
-    return true;
-}
-
-static void NET_WriteBlob(net_packet_t *packet, uint8_t *buf, size_t len)
-{
-    int i;
-
-    for (i=0; i<len; ++i)
-    {
-        NET_WriteInt8(packet, buf[i]);
-    }
-}
-
-boolean NET_ReadSHA1Sum(net_packet_t *packet, sha1_digest_t digest)
-{
-    return NET_ReadBlob(packet, digest, sizeof(sha1_digest_t));
-}
-
-void NET_WriteSHA1Sum(net_packet_t *packet, sha1_digest_t digest)
-{
-    NET_WriteBlob(packet, digest, sizeof(sha1_digest_t));
-}
-
-boolean NET_ReadPRNGSeed(net_packet_t *packet, prng_seed_t seed)
-{
-    return NET_ReadBlob(packet, seed, sizeof(prng_seed_t));
-}
-
-void NET_WritePRNGSeed(net_packet_t *packet, prng_seed_t seed)
-{
-    NET_WriteBlob(packet, seed, sizeof(prng_seed_t));
-}
-
-static net_protocol_t ParseProtocolName(const char *name)
-{
-    int i;
-
-    for (i = 0; i < arrlen(protocol_names); ++i)
-    {
-        if (!strcmp(protocol_names[i].name, name))
-        {
-            return protocol_names[i].protocol;
+          net_write_string(packet, g_protocol_names[i].name);
+          return;
         }
     }
 
-    return NET_PROTOCOL_UNKNOWN;
+  /* If you add an entry to the net_protocol_t enum, a corresponding entry
+   * must be added to the protocol_names list.
+   */
+
+  i_error("net_write_protocol: protocol %d missing from protocol_names "
+          "list; please add it.",
+          protocol);
 }
 
-// NET_ReadProtocol reads a single string-format protocol name from the given
-// packet, returning NET_PROTOCOL_UNKNOWN if the string describes an unknown
-// protocol.
-net_protocol_t NET_ReadProtocol(net_packet_t *packet)
-{
-    const char *name;
+/* net_read_protocol_list reads a list of string-format protocol names from
+ * the given packet, returning a single protocol number. The protocol that is
+ * returned is the last protocol in the list that is a supported protocol. If
+ * no recognized protocols are read, NET_PROTOCOL_UNKNOWN is returned.
+ */
 
-    name = NET_ReadString(packet);
-    if (name == NULL)
+net_protocol_t net_read_protocol_list(net_packet_t *packet)
+{
+  net_protocol_t result;
+  unsigned int num_protocols;
+  int i;
+
+  if (!net_read_int8(packet, &num_protocols))
     {
-        return NET_PROTOCOL_UNKNOWN;
+      return NET_PROTOCOL_UNKNOWN;
     }
 
-    return ParseProtocolName(name);
-}
+  result = NET_PROTOCOL_UNKNOWN;
 
-// NET_WriteProtocol writes a single string-format protocol name to a packet.
-void NET_WriteProtocol(net_packet_t *packet, net_protocol_t protocol)
-{
-    int i;
-
-    for (i = 0; i < arrlen(protocol_names); ++i)
+  for (i = 0; i < num_protocols; ++i)
     {
-        if (protocol_names[i].protocol == protocol)
+      net_protocol_t p;
+      const char *name;
+
+      name = net_read_string(packet);
+      if (name == NULL)
         {
-            NET_WriteString(packet, protocol_names[i].name);
-            return;
+          return NET_PROTOCOL_UNKNOWN;
+        }
+
+      p = parse_protocol_name(name);
+      if (p != NET_PROTOCOL_UNKNOWN)
+        {
+          result = p;
         }
     }
 
-    // If you add an entry to the net_protocol_t enum, a corresponding entry
-    // must be added to the protocol_names list.
-    I_Error("NET_WriteProtocol: protocol %d missing from protocol_names "
-            "list; please add it.", protocol);
+  return result;
 }
 
-// NET_ReadProtocolList reads a list of string-format protocol names from
-// the given packet, returning a single protocol number. The protocol that is
-// returned is the last protocol in the list that is a supported protocol. If
-// no recognized protocols are read, NET_PROTOCOL_UNKNOWN is returned.
-net_protocol_t NET_ReadProtocolList(net_packet_t *packet)
+/* net_write_protocol_list writes a list of string-format protocol names into
+ * the given packet, all the supported protocols in the net_protocol_t enum.
+ * This is slightly different to other functions in this file, in that there
+ * is nothing the caller can "choose" to write; the built-in list of all
+ * protocols is always sent.
+ */
+
+void net_write_protocol_list(net_packet_t *packet)
 {
-    net_protocol_t result;
-    unsigned int num_protocols;
-    int i;
+  int i;
 
-    if (!NET_ReadInt8(packet, &num_protocols))
+  net_write_int8(packet, NET_NUM_PROTOCOLS);
+
+  for (i = 0; i < NET_NUM_PROTOCOLS; ++i)
     {
-        return NET_PROTOCOL_UNKNOWN;
-    }
-
-    result = NET_PROTOCOL_UNKNOWN;
-
-    for (i = 0; i < num_protocols; ++i)
-    {
-        net_protocol_t p;
-        const char *name;
-
-        name = NET_ReadString(packet);
-        if (name == NULL)
-        {
-            return NET_PROTOCOL_UNKNOWN;
-        }
-
-        p = ParseProtocolName(name);
-        if (p != NET_PROTOCOL_UNKNOWN)
-        {
-            result = p;
-        }
-    }
-
-    return result;
-}
-
-// NET_WriteProtocolList writes a list of string-format protocol names into
-// the given packet, all the supported protocols in the net_protocol_t enum.
-// This is slightly different to other functions in this file, in that there
-// is nothing the caller can "choose" to write; the built-in list of all
-// protocols is always sent.
-void NET_WriteProtocolList(net_packet_t *packet)
-{
-    int i;
-
-    NET_WriteInt8(packet, NET_NUM_PROTOCOLS);
-
-    for (i = 0; i < NET_NUM_PROTOCOLS; ++i)
-    {
-        NET_WriteProtocol(packet, i);
+      net_write_protocol(packet, i);
     }
 }
-
diff --git a/games/NXDoom/src/net_structrw.h b/games/NXDoom/src/net_structrw.h
index 68de20dd8..2a924173c 100644
--- a/games/NXDoom/src/net_structrw.h
+++ b/games/NXDoom/src/net_structrw.h
@@ -1,55 +1,80 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/net_structrw.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef NET_STRUCTRW_H
 #define NET_STRUCTRW_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "aes_prng.h"
-#include "sha1.h"
 #include "net_defs.h"
 #include "net_packet.h"
+#include "sha1.h"
 
-void NET_WriteConnectData(net_packet_t *packet, net_connect_data_t *data);
-boolean NET_ReadConnectData(net_packet_t *packet, net_connect_data_t *data);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-extern void NET_WriteSettings(net_packet_t *packet, net_gamesettings_t *settings);
-extern boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings);
+void net_write_connect_data(net_packet_t *packet, net_connect_data_t *data);
+boolean net_read_connect_data(net_packet_t *packet,
+        net_connect_data_t *data);
 
-extern void NET_WriteQueryData(net_packet_t *packet, net_querydata_t *querydata);
-extern boolean NET_ReadQueryData(net_packet_t *packet, net_querydata_t *querydata);
+extern void net_write_settings(net_packet_t *packet,
+                              net_gamesettings_t *settings);
+extern boolean net_read_settings(net_packet_t *packet,
+                                net_gamesettings_t *settings);
 
-extern void NET_WriteTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff, boolean lowres_turn);
-extern boolean NET_ReadTiccmdDiff(net_packet_t *packet, net_ticdiff_t *diff, boolean lowres_turn);
-extern void NET_TiccmdDiff(ticcmd_t *tic1, ticcmd_t *tic2, net_ticdiff_t *diff);
-extern void NET_TiccmdPatch(ticcmd_t *src, net_ticdiff_t *diff, ticcmd_t *dest);
+extern void net_write_query_data(net_packet_t *packet,
+                               net_querydata_t *querydata);
+extern boolean net_read_query_data(net_packet_t *packet,
+                                 net_querydata_t *querydata);
 
-boolean NET_ReadFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn);
-void NET_WriteFullTiccmd(net_packet_t *packet, net_full_ticcmd_t *cmd, boolean lowres_turn);
+extern void net_write_ticcmd_diff(net_packet_t *packet, net_ticdiff_t *diff,
+                                boolean lowres_turn);
+extern boolean net_read_ticcmd_diff(net_packet_t *packet,
+        net_ticdiff_t *diff, boolean lowres_turn);
+extern void net_ticcmd_diff(ticcmd_t *tic1, ticcmd_t *tic2,
+                           net_ticdiff_t *diff);
+extern void net_ticcmd_patch(ticcmd_t *src, net_ticdiff_t *diff,
+                            ticcmd_t *dest);
 
-boolean NET_ReadSHA1Sum(net_packet_t *packet, sha1_digest_t digest);
-void NET_WriteSHA1Sum(net_packet_t *packet, sha1_digest_t digest);
+boolean net_read_full_ticcmd(net_packet_t *packet, net_full_ticcmd_t *cmd,
+                           boolean lowres_turn);
+void net_write_full_ticcmd(net_packet_t *packet, net_full_ticcmd_t *cmd,
+                         boolean lowres_turn);
 
-void NET_WriteWaitData(net_packet_t *packet, net_waitdata_t *data);
-boolean NET_ReadWaitData(net_packet_t *packet, net_waitdata_t *data);
+boolean net_read_sha1_sum(net_packet_t *packet, sha1_digest_t digest);
+void net_write_sha1_sum(net_packet_t *packet, sha1_digest_t digest);
 
-boolean NET_ReadPRNGSeed(net_packet_t *packet, prng_seed_t seed);
-void NET_WritePRNGSeed(net_packet_t *packet, prng_seed_t seed);
+void net_write_wait_data(net_packet_t *packet, net_waitdata_t *data);
+boolean net_read_wait_data(net_packet_t *packet, net_waitdata_t *data);
 
-// Protocol list exchange.
-net_protocol_t NET_ReadProtocol(net_packet_t *packet);
-void NET_WriteProtocol(net_packet_t *packet, net_protocol_t protocol);
-net_protocol_t NET_ReadProtocolList(net_packet_t *packet);
-void NET_WriteProtocolList(net_packet_t *packet);
+boolean net_read_prng_seed(net_packet_t *packet, prng_seed_t seed);
+void net_write_prng_seed(net_packet_t *packet, prng_seed_t seed);
 
-#endif /* #ifndef NET_STRUCTRW_H */
+/* Protocol list exchange. */
+
+net_protocol_t net_read_protocol(net_packet_t *packet);
+void net_write_protocol(net_packet_t *packet, net_protocol_t protocol);
+net_protocol_t net_read_protocol_list(net_packet_t *packet);
+void net_write_protocol_list(net_packet_t *packet);
+
+#endif /* NET_STRUCTRW_H */
diff --git a/games/NXDoom/src/p_rejectpad.c b/games/NXDoom/src/p_rejectpad.c
index b336464c5..3099d59f9 100644
--- a/games/NXDoom/src/p_rejectpad.c
+++ b/games/NXDoom/src/p_rejectpad.c
@@ -1,21 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// Padding of Reject Lump
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/p_rejectpad.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ * Padding of Reject Lump
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <string.h>
@@ -23,59 +31,66 @@
 #include "m_argv.h"
 #include "p_rejectpad.h"
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-// Pad the REJECT lump with extra data when the lump is too small,
-// to simulate a REJECT buffer overflow in Vanilla Doom.
+/* Pad the REJECT lump with extra data when the lump is too small,
+ * to simulate a REJECT buffer overflow in Vanilla Doom.
+ */
 
-void PadRejectArray(byte *array, unsigned int len, int totallines)
+void pad_reject_array(byte *array, unsigned int len, int totallines)
 {
-    unsigned int i;
-    unsigned int byte_num;
-    byte *dest;
-    unsigned int padvalue;
+  unsigned int i;
+  unsigned int byte_num;
+  byte *dest;
+  unsigned int padvalue;
 
-    // Values to pad the REJECT array with:
+  /* Values to pad the REJECT array with: */
 
-    unsigned int rejectpad[4] =
+  unsigned int rejectpad[4] =
+  {
+    0,       /* Size */
+    0,       /* Part of z_zone block header */
+    50,      /* PU_LEVEL */
+    0x1d4a11 /* DOOM_CONST_ZONEID */
+  };
+
+  rejectpad[0] = ((totallines * 4 + 3) & ~3) + 24;
+
+  /* Copy values from rejectpad into the destination array. */
+
+  dest = array;
+
+  for (i = 0; i < len && i < sizeof(rejectpad); ++i)
     {
-        0,                                    // Size
-        0,                                    // Part of z_zone block header
-        50,                                   // PU_LEVEL
-        0x1d4a11                              // DOOM_CONST_ZONEID
-    };
-
-    rejectpad[0] = ((totallines * 4 + 3) & ~3) + 24;
-
-    // Copy values from rejectpad into the destination array.
-
-    dest = array;
-
-    for (i=0; i<len && i<sizeof(rejectpad); ++i)
-    {
-        byte_num = i % 4;
-        *dest = (rejectpad[i / 4] >> (byte_num * 8)) & 0xff;
-        ++dest;
+      byte_num = i % 4;
+      *dest = (rejectpad[i / 4] >> (byte_num * 8)) & 0xff;
+      ++dest;
     }
 
-    // We only have a limited pad size.  Print a warning if the
-    // REJECT lump is too small.
+  /* We only have a limited pad size.  Print a warning if the
+   * REJECT lump is too small.
+   */
 
-    if (len > sizeof(rejectpad))
+  if (len > sizeof(rejectpad))
     {
-        fprintf(stderr, "PadRejectArray: REJECT lump too short to pad! (%u > %i)\n",
-                        len, (int) sizeof(rejectpad));
+      fprintf(stderr,
+              "pad_reject_array: REJECT lump too short to pad! (%u > %i)\n",
+              len, (int)sizeof(rejectpad));
 
-        // Pad remaining space with 0 (or 0xff, if specified on command line).
+      /* Pad remaining space with 0 (or 0xff, if specified on command line).
+       */
 
-        if (M_CheckParm("-reject_pad_with_ff"))
+      if (m_check_parm("-reject_pad_with_ff"))
         {
-            padvalue = 0xff;
+          padvalue = 0xff;
         }
-        else
+      else
         {
-            padvalue = 0x00;
+          padvalue = 0x00;
         }
 
-        memset(array + sizeof(rejectpad), padvalue, len - sizeof(rejectpad));
+      memset(array + sizeof(rejectpad), padvalue, len - sizeof(rejectpad));
     }
 }
diff --git a/games/NXDoom/src/p_rejectpad.h b/games/NXDoom/src/p_rejectpad.h
index 78ab84070..adb0372dd 100644
--- a/games/NXDoom/src/p_rejectpad.h
+++ b/games/NXDoom/src/p_rejectpad.h
@@ -1,28 +1,41 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// Padding of Reject Lump
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/p_rejectpad.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ * Padding of Reject Lump
+ *
+ ****************************************************************************/
 
 #ifndef __P_REJECTPAD__
 #define __P_REJECTPAD__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-// Padding of Reject Lump
-void PadRejectArray(byte *array, unsigned int len, int totallines);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+/* Padding of Reject Lump */
+
+void pad_reject_array(byte *array, unsigned int len, int totallines);
+
+#endif /* __P_REJECTPAD__ */
diff --git a/games/NXDoom/src/setup-res.rc.in b/games/NXDoom/src/setup-res.rc.in
deleted file mode 100644
index 2be914f96..000000000
--- a/games/NXDoom/src/setup-res.rc.in
+++ /dev/null
@@ -1,28 +0,0 @@
-1 ICON "@top_srcdir@/data/setup.ico"
-
-1 24 MOVEABLE PURE "@top_builddir@/src/setup/setup-manifest.xml"
-
-1 VERSIONINFO
-PRODUCTVERSION @WINDOWS_RC_VERSION@
-FILEVERSION @WINDOWS_RC_VERSION@
-FILETYPE 1
-{
- BLOCK "StringFileInfo"
- {
-  BLOCK "040904E4"
-  {
-   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
-   VALUE "FileDescription", "@PACKAGE_STRING@ Setup"
-   VALUE "InternalName", "@PACKAGE_TARNAME@"
-   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
-   VALUE "LegalCopyright", "GNU General Public License"
-   VALUE "ProductName", "@PACKAGE_NAME@ Setup"
-   VALUE "ProductVersion", "@PACKAGE_VERSION@"
-  }
- }
- BLOCK "VarFileInfo"
- {
-  VALUE "Translation", 0x409, 1252
- }
-}
-
diff --git a/games/NXDoom/src/setup/.gitignore b/games/NXDoom/src/setup/.gitignore
deleted file mode 100644
index f41d11c73..000000000
--- a/games/NXDoom/src/setup/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.in
-Makefile
-.deps
-setup-manifest.xml
-*.rc
-tags
-TAGS
diff --git a/games/NXDoom/src/setup/CMakeLists.txt b/games/NXDoom/src/setup/CMakeLists.txt
deleted file mode 100644
index c25af6599..000000000
--- a/games/NXDoom/src/setup/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-add_library(setup STATIC
-            compatibility.c     compatibility.h
-            display.c           display.h
-            joystick.c          joystick.h
-            keyboard.c          keyboard.h
-            mainmenu.c
-            mode.c              mode.h
-            mouse.c             mouse.h
-            multiplayer.c       multiplayer.h
-            sound.c             sound.h
-            execute.c           execute.h
-            txt_joyaxis.c       txt_joyaxis.h
-            txt_joybinput.c     txt_joybinput.h
-            txt_keyinput.c      txt_keyinput.h
-            txt_mouseinput.c    txt_mouseinput.h)
-
-target_include_directories(setup PRIVATE "../" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-
-if (DEFINED EMSCRIPTEN)
-    set(SDL_FLAGS "-s USE_SDL=2")
-    if(ENABLE_SDL2_MIXER)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
-    endif()
-else()
-    set(SDL_LINK_LIBS, "SDL2::SDL2")
-    if(ENABLE_SDL2_MIXER)
-        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
-    endif()
-endif()
-target_link_libraries(setup textscreen ${SDL_LINK_LIBS})
-set_target_properties(setup PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-set_target_properties(setup PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/setup/Makefile.am b/games/NXDoom/src/setup/Makefile.am
deleted file mode 100644
index 493b0b472..000000000
--- a/games/NXDoom/src/setup/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-AM_CFLAGS = @SDL_CFLAGS@                                           \
-            @SDLMIXER_CFLAGS@                                      \
-            -I$(top_srcdir)/textscreen -I$(top_srcdir)/src
-
-noinst_LIBRARIES = libsetup.a
-
-libsetup_a_SOURCES =                            \
-    compatibility.c   compatibility.h           \
-    display.c         display.h                 \
-    joystick.c        joystick.h                \
-    keyboard.c        keyboard.h                \
-    mainmenu.c                                  \
-    mode.c            mode.h                    \
-    mouse.c           mouse.h                   \
-    multiplayer.c     multiplayer.h             \
-    sound.c           sound.h                   \
-    execute.c         execute.h                 \
-    txt_joyaxis.c     txt_joyaxis.h             \
-    txt_joybinput.c   txt_joybinput.h           \
-    txt_keyinput.c    txt_keyinput.h            \
-    txt_mouseinput.c  txt_mouseinput.h
-
-EXTRA_DIST=                                     \
-    CMakeLists.txt                              \
-    setup_icon.c
-
-appdir = $(prefix)/share/applications
-app_DATA = @PACKAGE_RDNS@.Setup.desktop
-
-CLEANFILES = $(app_DATA)
-
-@PACKAGE_RDNS@.Setup.desktop : Setup.desktop
-	cp Setup.desktop $@
-
-if HAVE_ICONS
-
-setup_icon.c : $(top_builddir)/data/setup.png
-	$(top_builddir)/data/convert-icon $(top_builddir)/data/setup.png $@
-
-endif
-
diff --git a/games/NXDoom/src/setup/Setup.desktop.in b/games/NXDoom/src/setup/Setup.desktop.in
deleted file mode 100644
index 2a5e71fa1..000000000
--- a/games/NXDoom/src/setup/Setup.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=@PACKAGE_SHORTNAME@ Setup
-Exec=@PROGRAM_PREFIX@setup
-Icon=@PROGRAM_PREFIX@setup
-Type=Application
-Comment=Setup tool for @PACKAGE_SHORTNAME@
-Categories=Settings;
-Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla;
diff --git a/games/NXDoom/src/setup/compatibility.c b/games/NXDoom/src/setup/compatibility.c
deleted file mode 100644
index b96228f61..000000000
--- a/games/NXDoom/src/setup/compatibility.c
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// Sound control menu
-
-#include <stdlib.h>
-
-#include "m_config.h"
-#include "textscreen.h"
-#include "mode.h"
-
-#include "compatibility.h"
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-compat"
-
-int vanilla_savegame_limit = 1;
-int vanilla_demo_limit = 1;
-
-void CompatibilitySettings(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-
-    window = TXT_NewWindow("Compatibility");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_AddWidgets(window,
-                   TXT_NewCheckBox("Vanilla savegame limit",
-                                   &vanilla_savegame_limit),
-                   TXT_NewCheckBox("Vanilla demo limit",
-                                   &vanilla_demo_limit),
-                   NULL);
-}
-
-void BindCompatibilityVariables(void)
-{
-    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
-    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
-}
-
diff --git a/games/NXDoom/src/setup/compatibility.h b/games/NXDoom/src/setup/compatibility.h
deleted file mode 100644
index 39a5fc8f7..000000000
--- a/games/NXDoom/src/setup/compatibility.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_COMPATIBILITY_H
-#define SETUP_COMPATIBILITY_H
-
-void CompatibilitySettings(void *widget, void *user_data);
-void BindCompatibilityVariables(void);
-
-extern int vanilla_savegame_limit;
-extern int vanilla_demo_limit;
-
-#endif /* #ifndef SETUP_COMPATIBILITY_H */
diff --git a/games/NXDoom/src/setup/display.c b/games/NXDoom/src/setup/display.c
deleted file mode 100644
index 0f89a0931..000000000
--- a/games/NXDoom/src/setup/display.c
+++ /dev/null
@@ -1,289 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#include "textscreen.h"
-#include "m_config.h"
-#include "m_misc.h"
-#include "mode.h"
-
-#include "display.h"
-#include "config.h"
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-display"
-
-
-typedef struct
-{
-    int w, h;
-} window_size_t;
-
-// List of aspect ratio-uncorrected window sizes:
-static window_size_t window_sizes_unscaled[] =
-{
-    { 320,  200 },
-    { 640,  400 },
-    { 960,  600 },
-    { 1280, 800 },
-    { 1600, 1000 },
-    { 0, 0},
-};
-
-// List of aspect ratio-corrected window sizes:
-static window_size_t window_sizes_scaled[] =
-{
-    { 320,  240 },
-    { 512,  400 },
-    { 640,  480 },
-    { 800,  600 },
-    { 960,  720 },
-    { 1024, 800 },
-    { 1280, 960 },
-    { 1600, 1200 },
-    { 1920, 1440 },
-    { 0, 0},
-};
-
-static char *video_driver = "";
-static char *window_position = "";
-static int video_display = 0;
-static int aspect_ratio_correct = 1;
-static int integer_scaling = 0;
-static int smooth_pixel_scaling = 1;
-static int vga_porch_flash = 0;
-static int force_software_renderer = 0;
-static int fullscreen = 1;
-static int fullscreen_width = 0, fullscreen_height = 0;
-static int window_width = 800, window_height = 600;
-static int startup_delay = 1000;
-static int max_scaling_buffer_pixels = 16000000;
-static int usegamma = 0;
-
-int graphical_startup = 1;
-int show_endoom = 1;
-int show_diskicon = 1;
-int png_screenshots = 0;
-
-static int system_video_env_set;
-
-// Set the SDL_VIDEODRIVER environment variable
-
-void SetDisplayDriver(void)
-{
-    static int first_time = 1;
-
-    if (first_time)
-    {
-        system_video_env_set = getenv("SDL_VIDEODRIVER") != NULL;
-
-        first_time = 0;
-    }
-
-    // Don't override the command line environment, if it has been set.
-
-    if (system_video_env_set)
-    {
-        return;
-    }
-
-    // Use the value from the configuration file, if it has been set.
-
-    if (strcmp(video_driver, "") != 0)
-    {
-        char *env_string;
-
-        env_string = M_StringJoin("SDL_VIDEODRIVER=", video_driver, NULL);
-        putenv(env_string);
-        free(env_string);
-    }
-}
-
-static void WindowSizeSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(size))
-{
-    TXT_CAST_ARG(window_size_t, size);
-
-    window_width = size->w;
-    window_height = size->h;
-}
-
-static txt_radiobutton_t *SizeSelectButton(window_size_t *size)
-{
-    char buf[15];
-    txt_radiobutton_t *result;
-
-    M_snprintf(buf, sizeof(buf), "%ix%i", size->w, size->h);
-    result = TXT_NewRadioButton(buf, &window_width, size->w);
-    TXT_SignalConnect(result, "selected", WindowSizeSelected, size);
-
-    return result;
-}
-
-static void GenerateSizesTable(TXT_UNCAST_ARG(widget),
-                               TXT_UNCAST_ARG(sizes_table))
-{
-    TXT_CAST_ARG(txt_table_t, sizes_table);
-    window_size_t *sizes;
-    boolean have_size;
-    int i;
-
-    // Pick which window sizes list to use
-    if (aspect_ratio_correct == 1)
-    {
-        sizes = window_sizes_scaled;
-    }
-    else
-    {
-        sizes = window_sizes_unscaled;
-    }
-
-    // Build the table
-    TXT_ClearTable(sizes_table);
-    TXT_SetColumnWidths(sizes_table, 14, 14, 14);
-
-    TXT_AddWidget(sizes_table, TXT_NewSeparator("Window size"));
-
-    have_size = false;
-
-    for (i = 0; sizes[i].w != 0; ++i)
-    {
-        TXT_AddWidget(sizes_table, SizeSelectButton(&sizes[i]));
-        have_size = have_size || window_width == sizes[i].w;
-    }
-
-    // Windows can be any arbitrary size. We key off the width of the
-    // window in pixels. If the current size is not in the list of
-    // standard (integer multiply) sizes, create a special button to
-    // mean "the current window size".
-    if (!have_size)
-    {
-        static window_size_t current_size;
-        current_size.w = window_width;
-        current_size.h = window_height;
-        TXT_AddWidget(sizes_table, SizeSelectButton(&current_size));
-    }
-}
-
-static void AdvancedDisplayConfig(TXT_UNCAST_ARG(widget),
-                                  TXT_UNCAST_ARG(sizes_table))
-{
-    TXT_CAST_ARG(txt_table_t, sizes_table);
-    txt_window_t *window;
-    txt_checkbox_t *ar_checkbox;
-
-    window = TXT_NewWindow("Advanced display options");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_SetColumnWidths(window, 40);
-
-    TXT_AddWidgets(window,
-        ar_checkbox = TXT_NewCheckBox("Force correct aspect ratio",
-                                      &aspect_ratio_correct),
-        TXT_If(gamemission == heretic || gamemission == hexen
-            || gamemission == strife,
-            TXT_NewCheckBox("Graphical startup", &graphical_startup)),
-        TXT_If(gamemission == doom || gamemission == heretic
-            || gamemission == strife,
-            TXT_NewCheckBox("Show ENDOOM screen on exit",
-                            &show_endoom)),
-#ifdef HAVE_LIBPNG
-        TXT_NewCheckBox("Save screenshots in PNG format",
-                        &png_screenshots),
-#endif
-        TXT_NewCheckBox("Smooth pixel scaling", &smooth_pixel_scaling),
-        NULL);
-
-    TXT_SignalConnect(ar_checkbox, "changed", GenerateSizesTable, sizes_table);
-}
-
-void ConfigDisplay(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-    txt_table_t *sizes_table;
-    txt_window_action_t *advanced_button;
-
-    // Open the window
-    window = TXT_NewWindow("Display Configuration");
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    // Build window:
-    TXT_AddWidgets(window,
-        TXT_NewCheckBox("Full screen", &fullscreen),
-        TXT_NewConditional(&fullscreen, 0,
-            sizes_table = TXT_NewTable(3)),
-        NULL);
-
-    TXT_SetColumnWidths(window, 42);
-
-    // The window is set at a fixed vertical position.  This keeps
-    // the top of the window stationary when switching between
-    // fullscreen and windowed mode (which causes the window's
-    // height to change).
-    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
-                                  TXT_SCREEN_W / 2, 6);
-
-    GenerateSizesTable(NULL, sizes_table);
-
-    // Button to open "advanced" window.
-    // Need to pass a pointer to the window sizes table, as some of the options
-    // in there trigger a rebuild of it.
-    advanced_button = TXT_NewWindowAction('a', "Advanced");
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, advanced_button);
-    TXT_SignalConnect(advanced_button, "pressed",
-                      AdvancedDisplayConfig, sizes_table);
-}
-
-void BindDisplayVariables(void)
-{
-    M_BindIntVariable("video_display",             &video_display);
-    M_BindIntVariable("aspect_ratio_correct",      &aspect_ratio_correct);
-    M_BindIntVariable("integer_scaling",           &integer_scaling);
-    M_BindIntVariable("smooth_pixel_scaling",      &smooth_pixel_scaling);
-    M_BindIntVariable("fullscreen",                &fullscreen);
-    M_BindIntVariable("fullscreen_width",          &fullscreen_width);
-    M_BindIntVariable("fullscreen_height",         &fullscreen_height);
-    M_BindIntVariable("window_width",              &window_width);
-    M_BindIntVariable("window_height",             &window_height);
-    M_BindIntVariable("startup_delay",             &startup_delay);
-    M_BindStringVariable("video_driver",           &video_driver);
-    M_BindStringVariable("window_position",        &window_position);
-    M_BindIntVariable("usegamma",                  &usegamma);
-    M_BindIntVariable("png_screenshots",           &png_screenshots);
-    M_BindIntVariable("vga_porch_flash",           &vga_porch_flash);
-    M_BindIntVariable("force_software_renderer",   &force_software_renderer);
-    M_BindIntVariable("max_scaling_buffer_pixels", &max_scaling_buffer_pixels);
-
-    if (gamemission == doom || gamemission == heretic
-     || gamemission == strife)
-    {
-        M_BindIntVariable("show_endoom",               &show_endoom);
-    }
-
-    if (gamemission == doom || gamemission == strife)
-    {
-        M_BindIntVariable("show_diskicon",             &show_diskicon);
-    }
-
-    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
-    {
-        M_BindIntVariable("graphical_startup",        &graphical_startup);
-    }
-}
\ No newline at end of file
diff --git a/games/NXDoom/src/setup/display.h b/games/NXDoom/src/setup/display.h
deleted file mode 100644
index 0c20c51a2..000000000
--- a/games/NXDoom/src/setup/display.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_DISPLAY_H 
-#define SETUP_DISPLAY_H
-
-void ConfigDisplay(void *widget, void *user_data);
-void SetDisplayDriver(void);
-void BindDisplayVariables(void);
-
-extern int show_endoom;
-extern int graphical_startup;
-extern int png_screenshots;
-
-#endif /* #ifndef SETUP_DISPLAY_H */
diff --git a/games/NXDoom/src/setup/execute.c b/games/NXDoom/src/setup/execute.c
deleted file mode 100644
index 2dc0ba85d..000000000
--- a/games/NXDoom/src/setup/execute.c
+++ /dev/null
@@ -1,429 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// Code for invoking Doom
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-
-#ifdef _WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <process.h>
-#include <shellapi.h>
-
-#else
-
-#include <sys/wait.h>
-#include <unistd.h>
-
-#endif
-
-#include "textscreen.h"
-
-#include "config.h"
-#include "execute.h"
-#include "mode.h"
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_misc.h"
-
-struct execute_context_s
-{
-    char *response_file;
-    FILE *stream;
-};
-
-// Returns the path to a temporary file of the given name, stored
-// inside the system temporary directory.
-
-static char *TempFile(const char *s)
-{
-    const char *tempdir;
-
-#ifdef _WIN32
-    // Check the TEMP environment variable to find the location.
-
-    tempdir = M_getenv("TEMP");
-
-    if (tempdir == NULL)
-    {
-        tempdir = ".";
-    }
-#else
-    // Check the $TMPDIR environment variable to find the location.
-
-    tempdir = getenv("TMPDIR");
-
-    if (tempdir == NULL)
-    {
-        tempdir = "/tmp";
-    }
-#endif
-
-    return M_StringJoin(tempdir, DIR_SEPARATOR_S, s, NULL);
-}
-
-static int ArgumentNeedsEscape(const char *arg)
-{
-    const char *p;
-
-    for (p = arg; *p != '\0'; ++p)
-    {
-        if (isspace(*p))
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-// Arguments passed to the setup tool should be passed through to the
-// game when launching a game.  Calling this adds all arguments from
-// myargv to the output context.
-
-void PassThroughArguments(execute_context_t *context)
-{
-    int i;
-
-    for (i = 1; i < myargc; ++i)
-    {
-        if (ArgumentNeedsEscape(myargv[i]))
-        {
-            AddCmdLineParameter(context, "\"%s\"", myargv[i]);
-        }
-        else
-        {
-            AddCmdLineParameter(context, "%s", myargv[i]);
-        }
-    }
-}
-
-execute_context_t *NewExecuteContext(void)
-{
-    execute_context_t *result;
-
-    result = malloc(sizeof(execute_context_t));
-    
-    result->response_file = TempFile("chocolat.rsp");
-    result->stream = M_fopen(result->response_file, "w");
-
-    if (result->stream == NULL)
-    {
-        fprintf(stderr, "Error opening response file\n");
-        exit(-1);
-    }
-    
-    return result;
-}
-
-void AddCmdLineParameter(execute_context_t *context, const char *s, ...)
-{
-    va_list args;
-
-    va_start(args, s);
-
-    vfprintf(context->stream, s, args);
-    fprintf(context->stream, "\n");
-
-    va_end(args);
-}
-
-#if defined(_WIN32)
-
-boolean OpenFolder(const char *path)
-{
-    // "If the function succeeds, it returns a value greater than 32."
-    return (int)ShellExecute(NULL, "open", path, NULL, NULL, SW_SHOWDEFAULT) > 32;
-}
-
-// Wait for the specified process to exit.  Returns the exit code.
-static unsigned int WaitForProcessExit(HANDLE subprocess)
-{
-    DWORD exit_code;
-
-    for (;;)
-    {
-        WaitForSingleObject(subprocess, INFINITE);
-
-        if (!GetExitCodeProcess(subprocess, &exit_code))
-        {
-            return -1;
-        }
-
-        if (exit_code != STILL_ACTIVE)
-        {
-            return exit_code;
-        }
-    }
-}
-
-static void ConcatWCString(wchar_t *buf, const char *value)
-{
-    MultiByteToWideChar(CP_OEMCP, 0,
-                        value, strlen(value) + 1,
-                        buf + wcslen(buf), strlen(value) + 1);
-}
-
-// Build the command line string, a wide character string of the form:
-//
-// "program" "arg"
-
-static wchar_t *BuildCommandLine(const char *program, const char *arg)
-{
-    wchar_t exe_path[MAX_PATH];
-    wchar_t *result;
-    wchar_t *sep;
-
-    // Get the path to this .exe file.
-
-    GetModuleFileNameW(NULL, exe_path, MAX_PATH);
-
-    // Allocate buffer to contain result string.
-
-    result = calloc(wcslen(exe_path) + strlen(program) + strlen(arg) + 6,
-                    sizeof(wchar_t));
-
-    wcscpy(result, L"\"");
-
-    // Copy the path part of the filename (including ending \)
-    // into the result buffer:
-
-    sep = wcsrchr(exe_path, DIR_SEPARATOR);
-
-    if (sep != NULL)
-    {
-        wcsncpy(result + 1, exe_path, sep - exe_path + 1);
-        result[sep - exe_path + 2] = '\0';
-    }
-
-    // Concatenate the name of the program:
-
-    ConcatWCString(result, program);
-
-    // End of program name, start of argument:
-
-    wcscat(result, L"\" \"");
-
-    ConcatWCString(result, arg);
-
-    wcscat(result, L"\"");
-
-    return result;
-}
-
-static int ExecuteCommand(const char *program, const char *arg)
-{
-    STARTUPINFOW startup_info;
-    PROCESS_INFORMATION proc_info;
-    wchar_t *command;
-    int result = 0;
-
-    command = BuildCommandLine(program, arg);
-
-    // Invoke the program:
-
-    memset(&proc_info, 0, sizeof(proc_info));
-    memset(&startup_info, 0, sizeof(startup_info));
-    startup_info.cb = sizeof(startup_info);
-
-    if (!CreateProcessW(NULL, command,
-                        NULL, NULL, FALSE, 0, NULL, NULL,
-                        &startup_info, &proc_info))
-    {
-        result = -1;
-    }
-    else
-    {
-        // Wait for the process to finish, and save the exit code.
-
-        result = WaitForProcessExit(proc_info.hProcess);
-
-        CloseHandle(proc_info.hProcess);
-        CloseHandle(proc_info.hThread);
-    }
-
-    free(command);
-
-    return result;
-}
-
-#else
-
-boolean OpenFolder(const char *path)
-{
-    char *cmd;
-    int result;
-
-#if defined(__MACOSX__)
-    cmd = M_StringJoin("open \"", path, "\"", NULL);
-#else
-    cmd = M_StringJoin("xdg-open \"", path, "\"", NULL);
-#endif
-    result = system(cmd);
-    free(cmd);
-
-    return result == 0;
-}
-
-// Given the specified program name, get the full path to the program,
-// assuming that it is in the same directory as this program is.
-
-static char *GetFullExePath(const char *program)
-{
-    char *result;
-    char *sep;
-    size_t result_len;
-    unsigned int path_len;
-
-    sep = strrchr(myargv[0], DIR_SEPARATOR);
-
-    if (sep == NULL)
-    {
-        result = M_StringDuplicate(program);
-    }
-    else
-    {
-        path_len = sep - myargv[0] + 1;
-        result_len = strlen(program) + path_len + 1;
-        result = malloc(result_len);
-
-        M_StringCopy(result, myargv[0], result_len);
-        result[path_len] = '\0';
-
-        M_StringConcat(result, program, result_len);
-    }
-
-    return result;
-}
-
-static int ExecuteCommand(const char *program, const char *arg)
-{
-    pid_t childpid;
-    int result;
-    const char *argv[3];
-
-    childpid = fork();
-
-    if (childpid == 0) 
-    {
-        // This is the child.  Execute the command.
-
-        argv[0] = GetFullExePath(program);
-        argv[1] = arg;
-        argv[2] = NULL;
-
-        execvp(argv[0], (char **) argv);
-
-        exit(0x80);
-    }
-    else
-    {
-        // This is the parent.  Wait for the child to finish, and return
-        // the status code.
-
-        waitpid(childpid, &result, 0);
-
-        if (WIFEXITED(result) && WEXITSTATUS(result) != 0x80) 
-        {
-            return WEXITSTATUS(result);
-        }
-        else
-        {
-            return -1;
-        }
-    }
-}
-
-#endif
-
-int ExecuteDoom(execute_context_t *context)
-{
-    char *response_file_arg;
-    int result;
-    
-    fclose(context->stream);
-
-    // Build the command line
-
-    response_file_arg = M_StringJoin("@", context->response_file, NULL);
-
-    // Run Doom
-
-    result = ExecuteCommand(GetExecutableName(), response_file_arg);
-
-    free(response_file_arg);
-
-    // Destroy context
-    M_remove(context->response_file);
-    free(context->response_file);
-    free(context);
-
-    return result;
-}
-
-static void TestCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(data))
-{
-    execute_context_t *exec;
-    char *main_cfg;
-    char *extra_cfg;
-    txt_window_t *testwindow;
-
-    testwindow = TXT_MessageBox("Starting Doom",
-                                "Starting Doom to test the\n"
-                                "settings.  Please wait.");
-    TXT_DrawDesktop();
-
-    // Save temporary configuration files with the current configuration
-
-    main_cfg = TempFile("tmp.cfg");
-    extra_cfg = TempFile("extratmp.cfg");
-
-    M_SaveDefaultsAlternate(main_cfg, extra_cfg);
-
-    // Run with the -testcontrols parameter
-
-    exec = NewExecuteContext();
-    AddCmdLineParameter(exec, "-testcontrols");
-    AddCmdLineParameter(exec, "-config \"%s\"", main_cfg);
-    AddCmdLineParameter(exec, "-extraconfig \"%s\"", extra_cfg);
-    ExecuteDoom(exec);
-
-    TXT_CloseWindow(testwindow);
-
-    // Delete the temporary config files
-
-    M_remove(main_cfg);
-    M_remove(extra_cfg);
-    free(main_cfg);
-    free(extra_cfg);
-}
-
-txt_window_action_t *TestConfigAction(void)
-{
-    txt_window_action_t *test_action;
-    
-    test_action = TXT_NewWindowAction('t', "Test");
-    TXT_SignalConnect(test_action, "pressed", TestCallback, NULL);
-
-    return test_action;
-}
-
diff --git a/games/NXDoom/src/setup/execute.h b/games/NXDoom/src/setup/execute.h
deleted file mode 100644
index 21530f14d..000000000
--- a/games/NXDoom/src/setup/execute.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef TESTCONFIG_H
-#define TESTCONFIG_H
-
-#include "doomtype.h"
-#include "textscreen.h"
-
-typedef struct execute_context_s execute_context_t;
-
-#define IWAD_DOOM2    (1 << 0)       /* doom2.wad */
-#define IWAD_PLUTONIA (1 << 1)       /* plutonia.wad */
-#define IWAD_TNT      (1 << 2)       /* tnt.wad */
-#define IWAD_DOOM     (1 << 3)       /* doom.wad */
-#define IWAD_DOOM1    (1 << 4)       /* doom1.wad */
-#define IWAD_CHEX     (1 << 5)       /* chex.wad */
-
-execute_context_t *NewExecuteContext(void);
-void AddCmdLineParameter(execute_context_t *context, const char *s, ...) PRINTF_ATTR(2, 3);
-void PassThroughArguments(execute_context_t *context);
-int ExecuteDoom(execute_context_t *context);
-int FindInstalledIWADs(void);
-boolean OpenFolder(const char *path);
-
-txt_window_action_t *TestConfigAction(void);
-
-#endif /* #ifndef TESTCONFIG_H */
-
diff --git a/games/NXDoom/src/setup/joystick.c b/games/NXDoom/src/setup/joystick.c
deleted file mode 100644
index 3a2b5a908..000000000
--- a/games/NXDoom/src/setup/joystick.c
+++ /dev/null
@@ -1,1365 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-#include "i_joystick.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "textscreen.h"
-
-#include "execute.h"
-#include "joystick.h"
-#include "mode.h"
-#include "txt_joyaxis.h"
-#include "txt_joybinput.h"
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-gamepad"
-
-typedef struct
-{
-    const char *name;  // Config file name
-    int value;
-} joystick_config_t;
-
-typedef struct
-{
-    const char *name;
-    int axes, buttons, hats;
-    const joystick_config_t *configs;
-} known_joystick_t;
-
-// SDL joystick successfully initialized?
-
-static int joystick_initted = 0;
-
-// Joystick enable/disable
-
-static int usejoystick = 0;
-
-// GUID and index of joystick to use.
-
-char *joystick_guid = "";
-int joystick_index = -1;
-
-// Calibration button. This is the button the user pressed at the
-// start of the calibration sequence. They *must* press this button
-// for each subsequent sequence.
-
-static int calibrate_button = -1;
-
-// Which joystick axis to use for horizontal movement, and whether to
-// invert the direction:
-
-static int joystick_x_axis = 0;
-static int joystick_x_invert = 0;
-
-// Which joystick axis to use for vertical movement, and whether to
-// invert the direction:
-
-static int joystick_y_axis = 1;
-static int joystick_y_invert = 0;
-
-// Strafe axis.
-
-static int joystick_strafe_axis = -1;
-static int joystick_strafe_invert = 0;
-
-// Look axis.
-
-static int joystick_look_axis = -1;
-static int joystick_look_invert = 0;
-
-// Configurable dead zone for each axis, specified as a percentage of the axis
-// max value.
-static int joystick_x_dead_zone = 33;
-static int joystick_y_dead_zone = 33;
-static int joystick_strafe_dead_zone = 33;
-static int joystick_look_dead_zone = 33;
-
-int use_analog = 0;
-
-int joystick_turn_sensitivity = 10;
-int joystick_move_sensitivity = 10;
-int joystick_look_sensitivity = 10;
-
-// Virtual to physical mapping.
-int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS] = {
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-};
-
-static txt_button_t *joystick_button;
-static txt_joystick_axis_t *x_axis_widget;
-static txt_joystick_axis_t *y_axis_widget;
-
-//
-// Calibration
-//
-
-static txt_window_t *calibration_window;
-static SDL_Joystick **all_joysticks = NULL;
-static int all_joysticks_len = 0;
-
-// Known controllers.
-// There are lots of game controllers on the market. Try to configure
-// them in a consistent way:
-//
-// * Use the D-pad rather than an analog stick. left/right turns the
-//   player, up/down moves forward/backward - ie. a "traditional"
-//   layout like Vanilla Doom rather than something more elaborate.
-// * No strafe axis.
-// * Fire and run keys together, on the main right-side buttons,
-//   ideally arranged so both can be controlled/covered simultaneously
-//   with the thumb.
-// * Jump/use keys in the same cluster if possible.
-// * Strafe left/right configured to map to shoulder buttons if they
-//   are present. No "strafe on" key unless shoulder buttons not present.
-// * If a second set of shoulder buttons are also present, these map
-//   to prev weapon/next weapon.
-// * Menu button mapped to start button.
-//
-// With the common right-side button arrangement that looks like this,
-// which is similar to the Vanilla default configuration when using
-// a Gravis Gamepad:
-//
-//    B        A = Fire
-//  A   D      B = Jump
-//    C        C = Speed
-//             D = Use
-
-// Always loaded before others, to get a known starting configuration.
-static const joystick_config_t empty_defaults[] =
-{
-    {"joystick_x_axis",            -1},
-    {"joystick_x_invert",          0},
-    {"joystick_y_axis",            -1},
-    {"joystick_y_invert",          0},
-    {"joystick_strafe_axis",       -1},
-    {"joystick_strafe_invert",     0},
-    {"joystick_look_axis",         -1},
-    {"joystick_look_invert",       0},
-    {"joyb_fire",                  -1},
-    {"joyb_use",                   -1},
-    {"joyb_strafe",                -1},
-    {"joyb_speed",                 -1},
-    {"joyb_strafeleft",            -1},
-    {"joyb_straferight",           -1},
-    {"joyb_prevweapon",            -1},
-    {"joyb_nextweapon",            -1},
-    {"joyb_jump",                  -1},
-    {"joyb_menu_activate",         -1},
-    {"joyb_toggle_automap",        -1},
-    {"joyb_useartifact",           -1},
-    {"joyb_invleft",               -1},
-    {"joyb_invright",              -1},
-    {"joyb_flyup",                 -1},
-    {"joyb_flydown",               -1},
-    {"joyb_flycenter",             -1},
-    {"joystick_physical_button0",  0},
-    {"joystick_physical_button1",  1},
-    {"joystick_physical_button2",  2},
-    {"joystick_physical_button3",  3},
-    {"joystick_physical_button4",  4},
-    {"joystick_physical_button5",  5},
-    {"joystick_physical_button6",  6},
-    {"joystick_physical_button7",  7},
-    {"joystick_physical_button8",  8},
-    {"joystick_physical_button9",  9},
-    {"joystick_physical_button10",  10},
-    {"joystick_physical_button11",  11},
-    {"joystick_physical_button12",  12},
-    {"joystick_physical_button13",  13},
-    {"joystick_physical_button14",  14},
-    {"joystick_physical_button15",  15},
-    {"joystick_physical_button16",  16},
-    {NULL, 0},
-};
-
-static const joystick_config_t ps3_controller[] =
-{
-    {"joystick_x_axis",        CREATE_BUTTON_AXIS(7, 5)},
-    {"joystick_y_axis",        CREATE_BUTTON_AXIS(4, 6)},
-    {"joyb_fire",              15},  // Square
-    {"joyb_speed",             14},  // X
-    {"joyb_use",               13},  // Circle
-    {"joyb_jump",              12},  // Triangle
-    {"joyb_strafeleft",        8},   // Bottom shoulder buttons
-    {"joyb_straferight",       9},
-    {"joyb_prevweapon",        10},  // Top shoulder buttons
-    {"joyb_nextweapon",        11},
-    {"joyb_menu_activate",     3},   // Start
-    {NULL, 0},
-};
-
-// Playstation 4 Dual Shock 4 (DS4)
-static const joystick_config_t ps4_ds4_controller[] =
-{
-    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
-    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
-    {"joyb_fire",              0},  // Square
-    {"joyb_speed",             1},  // X
-    {"joyb_use",               2},  // Circle
-    {"joyb_jump",              3},  // Triangle
-    {"joyb_strafeleft",        6},  // Bottom shoulder buttons
-    {"joyb_straferight",       7},
-    {"joyb_prevweapon",        4},  // Top shoulder buttons
-    {"joyb_nextweapon",        5},
-    {"joyb_menu_activate",     12}, // Playstation logo button
-};
-
-static const joystick_config_t airflo_controller[] =
-{
-    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
-    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
-    {"joyb_fire",              2},  // "3"
-    {"joyb_speed",             0},  // "1"
-    {"joyb_jump",              3},  // "4"
-    {"joyb_use",               1},  // "2"
-    {"joyb_strafeleft",        6},  // Bottom shoulder buttons
-    {"joyb_straferight",       7},
-    {"joyb_prevweapon",        4},  // Top shoulder buttons
-    {"joyb_nextweapon",        5},
-    {"joyb_menu_activate",     9},  // "10", where "Start" usually is.
-    {NULL, 0},
-};
-
-// Wii controller is weird, so we have to take some liberties.
-// Also it's not a HID device, so it won't appear the same everywhere.
-// Assume there is no nunchuk or classic controller attached.
-
-// When using WJoy on OS X.
-static const joystick_config_t wii_controller_wjoy[] =
-{
-    {"joystick_x_axis",        CREATE_BUTTON_AXIS(2, 3)},
-    {"joystick_y_axis",        CREATE_BUTTON_AXIS(1, 0)},
-    {"joyb_fire",              9},  // Button 1
-    {"joyb_speed",             10}, // Button 2
-    {"joyb_use",               5},  // Button B (trigger)
-    {"joyb_prevweapon",        7},  // -
-    {"joyb_nextweapon",        6},  // +
-    {"joyb_menu_activate",     9},  // Button A
-    {NULL, 0},
-};
-
-// Xbox 360 controller. Thanks to Brad Harding for the details.
-static const joystick_config_t xbox360_controller[] =
-{
-    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
-    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
-    {"joystick_strafe_axis",   2},  // Trigger buttons form an axis(???)
-    {"joyb_fire",              2},  // X
-    {"joyb_speed",             0},  // A
-    {"joyb_jump",              3},  // Y
-    {"joyb_use",               1},  // B
-    {"joyb_prevweapon",        4},  // LB
-    {"joyb_nextweapon",        5},  // RB
-    {"joyb_menu_activate",     9},  // Start
-    {NULL, 0},
-};
-
-// Xbox 360 controller under Linux.
-static const joystick_config_t xbox360_controller_linux[] =
-{
-    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
-    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
-    // Ideally we'd like the trigger buttons to be strafe left/right
-    // But Linux presents each trigger button as its own axis, which
-    // we can't really work with. So we have to settle for a
-    // suboptimal setup.
-    {"joyb_fire",              2},  // X
-    {"joyb_speed",             0},  // A
-    {"joyb_jump",              3},  // Y
-    {"joyb_use",               1},  // B
-    {"joyb_strafeleft",        4},  // LB
-    {"joyb_straferight",       5},  // RB
-    {"joyb_menu_activate",     7},  // Start
-    {"joyb_prevweapon",        6},  // Back
-    {NULL, 0},
-};
-
-// Logitech Dual Action (F310, F710). Thanks to Brad Harding for details.
-static const joystick_config_t logitech_f310_controller[] =
-{
-    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
-    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
-    {"joyb_fire",              0},  // X
-    {"joyb_speed",             1},  // A
-    {"joyb_jump",              3},  // Y
-    {"joyb_use",               2},  // B
-    {"joyb_strafeleft",        6},  // LT
-    {"joyb_straferight",       7},  // RT
-    {"joyb_prevweapon",        4},  // LB
-    {"joyb_nextweapon",        5},  // RB
-    {"joyb_menu_activate",     11}, // Start
-    {NULL, 0},
-};
-
-// Multilaser JS030 gamepad, similar to a PS2 controller.
-static const joystick_config_t multilaser_js030_controller[] =
-{
-    {"joystick_x_axis",        0},   // Left stick / D-pad
-    {"joystick_y_axis",        1},
-    {"joyb_fire",              3},   // Square
-    {"joyb_speed",             2},   // X
-    {"joyb_use",               1},   // Circle
-    {"joyb_jump",              0},   // Triangle
-    {"joyb_strafeleft",        6},   // Bottom shoulder buttons
-    {"joyb_straferight",       7},
-    {"joyb_prevweapon",        4},   // Top shoulder buttons
-    {"joyb_nextweapon",        5},
-    {"joyb_menu_activate",     9},   // Start
-    {NULL, 0},
-};
-
-// Buffalo Classic USB Gamepad (thanks Fabian Greffrath).
-static const joystick_config_t buffalo_classic_controller[] =
-{
-    {"joystick_x_axis",        0},
-    {"joystick_y_axis",        1},
-    {"joyb_use",               0},    // A
-    {"joyb_speed",             1},    // B
-    {"joyb_jump",              2},    // X
-    {"joyb_fire",              3},    // Y
-    {"joyb_strafeleft",        4},    // Left shoulder
-    {"joyb_straferight",       5},    // Right shoulder
-    {"joyb_prevweapon",        6},    // Select
-    {"joyb_menu_activate",     7},    // Start
-    {NULL, 0},
-};
-
-// Config for if the user is actually using an old PC joystick or gamepad,
-// probably via a USB-Gameport adapter.
-static const joystick_config_t pc_gameport_controller[] =
-{
-    {"joystick_x_axis",        0},
-    {"joystick_y_axis",        1},
-    // Button configuration is the default as used for Vanilla Doom,
-    // Heretic and Hexen. When playing with a Gravis Gamepad, this
-    // layout should also be vaguely similar to the standard layout
-    // described above.
-    {"joyb_fire",              0},
-    {"joyb_strafe",            1},
-    {"joyb_use",               3},
-    {"joyb_speed",             2},
-    {NULL, 0},
-};
-
-// http://www.8bitdo.com/nes30pro/ and http://www.8bitdo.com/fc30pro/
-static const joystick_config_t nes30_pro_controller[] =
-{
-    {"joystick_x_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)},
-    {"joystick_y_axis",        CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)},
-    {"joyb_fire",              4},  // Y
-    {"joyb_speed",             1},  // B
-    {"joyb_jump",              3},  // X
-    {"joyb_use",               0},  // A
-    {"joyb_strafeleft",        6},  // L1
-    {"joyb_straferight",       7}, // R1
-    {"joyb_prevweapon",        8},  // L2
-    {"joyb_nextweapon",        9},  // R2
-    {"joyb_menu_activate",     11}, // Start
-    {"joyb_toggle_automap",    10}, // Select
-    {NULL, 0},
-};
-
-// http://www.8bitdo.com/sfc30/ or http://www.8bitdo.com/snes30/
-// and http://www.nes30.com/ and http://www.fc30.com/
-static const joystick_config_t sfc30_controller[] =
-{
-    {"joystick_x_axis",        0},
-    {"joystick_y_axis",        1},
-    {"joyb_fire",              4}, // Y
-    {"joyb_speed",             1}, // B
-    {"joyb_jump",              3}, // X
-    {"joyb_use",               0}, // A
-    {"joyb_strafeleft",        6}, // L
-    {"joyb_straferight",       7}, // R
-    {"joyb_menu_activate",    11}, // Start
-    {"joyb_toggle_automap",   10}, // Select
-    {NULL, 0},
-};
-
-static const known_joystick_t known_joysticks[] =
-{
-    {
-        "PLAYSTATION(R)3 Controller",
-        4, 19, 0,
-        ps3_controller,
-    },
-
-    {
-        "AIRFLO             ",
-        4, 13, 1,
-        airflo_controller,
-    },
-
-    {
-        "Wiimote (*",  // WJoy includes the Wiimote MAC address.
-        6, 26, 0,
-        wii_controller_wjoy,
-    },
-
-    {
-        "Controller (XBOX 360 For Windows)",
-        5, 10, 1,
-        xbox360_controller,
-    },
-
-    {
-        "Controller (XBOX One For Windows)",
-        5, 10, 1,
-        xbox360_controller,
-    },
-
-    // Xbox 360 controller as it appears on Linux.
-    {
-        "Microsoft X-Box 360 pad",
-        6, 11, 1,
-        xbox360_controller_linux,
-    },
-
-    // Xbox One controller as it appears on Linux.
-    {
-        "Microsoft X-Box One pad",
-        6, 11, 1,
-        xbox360_controller_linux,
-    },
-
-    {
-        "Logitech Dual Action",
-        4, 12, 1,
-        logitech_f310_controller,
-    },
-
-    {
-        "USB Vibration Joystick",
-        4, 12, 1,
-        multilaser_js030_controller,
-    },
-
-    {
-        "USB,2-axis 8-button gamepad  ",
-        2, 8, 0,
-        buffalo_classic_controller,
-    },
-
-    // PS4 controller just appears as the generic-sounding "Wireless
-    // Controller". Hopefully the number of buttons/axes/hats should be
-    // enough to distinguish it from other gamepads.
-    {
-        "Wireless Controller",
-        6, 14, 1,
-        ps4_ds4_controller,
-    },
-
-    // This is the configuration for the USB-Gameport adapter listed on
-    // this page as the "Mayflash USB to Gameport Adapter" (though the
-    // device is labeled as "Super Joy Box 7"):
-    // https://sites.google.com/site/joystickrehab/itemcatal
-    // TODO: Add extra configurations here for other USB-Gameport adapters,
-    // which should just be the same configuration.
-    {
-        "WiseGroup.,Ltd Gameport to USB Controller",
-        4, 8, 1,
-        pc_gameport_controller,
-    },
-
-    // How the Super Joy Box 7 appears on Mac OS X.
-    {
-        "Gameport to USB Controller",
-        2, 8, 1,
-        pc_gameport_controller,
-    },
-
-    // 8Bitdo NES30 Pro, http://www.8bitdo.com/nes30pro/
-    {
-        "8Bitdo NES30 Pro",
-        4, 16, 1,
-        nes30_pro_controller,
-    },
-
-    // the above, NES variant, via USB on Linux/Raspbian (odd values)
-    {
-        "8Bitdo NES30 Pro*",
-        6, 15, 1,
-        nes30_pro_controller,
-    },
-
-    // the above, NES variant, connected over bluetooth
-    {
-        "8Bitdo NES30 Pro",
-        6, 16, 1,
-        nes30_pro_controller,
-    },
-
-    // 8bitdo NES30 Pro, in joystick mode (R1+Power), swaps the D-Pad
-    // and analog stick inputs.  Only applicable over Bluetooth. On USB,
-    // this mode registers the device as an Xbox 360 pad.
-    {
-        "8Bitdo NES30 Pro Joystick",
-        6, 16, 1,
-        nes30_pro_controller,
-    },
-
-    // variant of the above, via USB on Mac
-    // Note: untested, but theorized to exist based on us comparing
-    // a NES30 Pro tested on Linux with a FC30 Pro tested with Mac & Linux
-    {
-        "8Bitdo NES30 Pro",
-        4, 15, 1,
-        nes30_pro_controller,
-    },
-
-
-    // 8Bitdo FC30 Pro, http://8bitdo.cn/fc30pro/
-    // connected over bluetooth
-    {
-        "8Bitdo FC30 Pro",
-        4, 16, 1,
-        nes30_pro_controller,
-    },
-
-    // variant of the above, via USB on Linux/Raspbian
-    {
-        "8Bitdo FC30 Pro*",
-        6, 15, 1,
-        nes30_pro_controller,
-    },
-
-    // variant of the above, Linux/bluetooth
-    {
-        "8Bitdo FC30 Pro",
-	6, 16, 1,
-	nes30_pro_controller,
-    },
-
-    // variant of the above, via USB on Mac
-    {
-        "8Bitdo FC30 Pro",
-        4, 15, 1,
-        nes30_pro_controller,
-    },
-
-    // 8Bitdo SFC30 SNES replica controller
-    // in default mode and in controller mode (Start+R)
-    // the latter suffixes "Joystick" to the name
-    // http://www.8bitdo.com/sfc30/
-    {
-        "8Bitdo SFC30 GamePad*",
-        4, 16, 1,
-        sfc30_controller,
-    },
-
-    // As above, but as detected on RHEL Linux (odd extra axes)
-    {
-        "8Bitdo SFC30 GamePad*",
-        6, 16, 1,
-        sfc30_controller,
-    },
-
-    // SNES30 colour variation of the above
-    // http://www.8bitdo.com/snes30/
-    {
-        "8Bitdo SNES30 GamePad*",
-        4, 16, 1,
-        sfc30_controller,
-    },
-
-    // 8Bitdo SFC30 SNES replica controller in USB controller mode
-    // tested with firmware V2.68 (Beta); latest stable V2.65 doesn't work on
-    // OS X in USB controller mode
-    // Names seen so far:
-    //     'SFC30 Joystick' (OS X)
-    //     'SFC30              SFC30 Joystick' (Fedora 24; RHEL7)
-    // XXX: there is probably a SNES30 variant of this too
-    {
-        "SFC30 *",
-        4, 12, 1,
-        sfc30_controller,
-    },
-
-    // NES30 (not pro), tested in default and "hold R whilst turning on"
-    // mode, with whatever firmware it came with out of the box. Latter
-    // mode puts " Joystick" suffix on the name string
-    {
-        "8Bitdo NES30 GamePad*",
-        4, 16, 1,
-        sfc30_controller, // identical to SFC30
-    },
-    // FC30 variant of the above
-    {
-        "8Bitdo FC30 GamePad*",
-        4, 16, 1,
-        sfc30_controller, // identical to SFC30
-    },
-
-    // NES30 in USB mode
-    {
-        "NES30*",
-        4, 12, 1,
-        sfc30_controller, // identical to SFC30
-    },
-    // FC30 variant of the above
-    {
-        "FC30*",
-        4, 12, 1,
-        sfc30_controller, // identical to SFC30
-    },
-};
-
-// Use SDL_GameController interface
-int use_gamepad = 0;
-
-// SDL_GameControllerType of gamepad
-int gamepad_type = 0;
-
-// Based on Unity Doom mapping
-static const joystick_config_t modern_gamepad[] =
-{
-    {"joystick_x_axis", SDL_CONTROLLER_AXIS_RIGHTX},
-    {"joystick_y_axis", SDL_CONTROLLER_AXIS_LEFTY},
-    {"joystick_strafe_axis", SDL_CONTROLLER_AXIS_LEFTX},
-    {"joystick_look_axis", SDL_CONTROLLER_AXIS_RIGHTY},
-    {"joyb_fire", GAMEPAD_BUTTON_TRIGGERRIGHT},
-    {"joyb_speed", GAMEPAD_BUTTON_TRIGGERLEFT},
-    {"joyb_use", SDL_CONTROLLER_BUTTON_B},
-    {"joyb_jump", SDL_CONTROLLER_BUTTON_A},
-    {"joyb_prevweapon", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
-    {"joyb_nextweapon", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
-    {"joyb_menu_activate", SDL_CONTROLLER_BUTTON_START},
-    {"joyb_toggle_automap", SDL_CONTROLLER_BUTTON_Y},
-    {"joyb_useartifact", SDL_CONTROLLER_BUTTON_X},
-    {"joyb_invleft", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
-    {"joyb_invright", SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
-    {"joyb_flyup", SDL_CONTROLLER_BUTTON_DPAD_UP},
-    {"joyb_flydown", SDL_CONTROLLER_BUTTON_DPAD_DOWN},
-    {"joyb_flycenter", SDL_CONTROLLER_BUTTON_LEFTSTICK},
-    {NULL, 0},
-};
-
-// Based on the SNES Doom mapping
-static const joystick_config_t classic_gamepad[] =
-{
-    {"joystick_x_axis", SDL_CONTROLLER_AXIS_LEFTX},
-    {"joystick_y_axis", SDL_CONTROLLER_AXIS_LEFTY},
-    {"joyb_fire", SDL_CONTROLLER_BUTTON_X},                    // SNES Y
-    {"joyb_speed", SDL_CONTROLLER_BUTTON_A},                   // SNES B
-    {"joyb_use", SDL_CONTROLLER_BUTTON_B},                     // SNES A
-    {"joyb_strafeleft", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},   // SNES L
-    {"joyb_straferight", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER}, // SNES R
-    {"joyb_nextweapon", SDL_CONTROLLER_BUTTON_Y},              // SNES X
-    {"joyb_menu_activate", SDL_CONTROLLER_BUTTON_START},       // SNES Start
-    {"joyb_toggle_automap", SDL_CONTROLLER_BUTTON_BACK},       // SNES Select
-    {NULL, 0},
-};
-
-// SNES Doom mapping with extra shoulder buttons
-static const joystick_config_t classic_gamepad_plus[] =
-{
-    {"joystick_x_axis", SDL_CONTROLLER_AXIS_LEFTX},
-    {"joystick_y_axis", SDL_CONTROLLER_AXIS_LEFTY},
-    {"joyb_fire", SDL_CONTROLLER_BUTTON_X},                    // SNES Y
-    {"joyb_speed", SDL_CONTROLLER_BUTTON_A},                   // SNES B
-    {"joyb_use", SDL_CONTROLLER_BUTTON_B},                     // SNES A
-    {"joyb_strafeleft", SDL_CONTROLLER_BUTTON_LEFTSHOULDER},   // L1
-    {"joyb_straferight", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER}, // R1
-    {"joyb_prevweapon", GAMEPAD_BUTTON_TRIGGERLEFT},           // L2
-    {"joyb_nextweapon", GAMEPAD_BUTTON_TRIGGERRIGHT},          // R2
-    {"joyb_menu_activate", SDL_CONTROLLER_BUTTON_START},       // SNES Start
-    {"joyb_toggle_automap", SDL_CONTROLLER_BUTTON_BACK},       // SNES Select
-    {NULL, 0},
-};
-
-static const known_joystick_t *GetJoystickType(int index)
-{
-    SDL_Joystick *joystick;
-    const char *name;
-    int axes, buttons, hats;
-    int i;
-
-    joystick = all_joysticks[index];
-    name = SDL_JoystickName(joystick);
-    axes = SDL_JoystickNumAxes(joystick);
-    buttons = SDL_JoystickNumButtons(joystick);
-    hats = SDL_JoystickNumHats(joystick);
-
-    for (i = 0; i < arrlen(known_joysticks); ++i)
-    {
-        // Check for a name match. If the name ends in '*', this means
-        // ignore the rest.
-        if (M_StringEndsWith(known_joysticks[i].name, "*"))
-        {
-            if (strncmp(known_joysticks[i].name, name,
-                        strlen(known_joysticks[i].name) - 1) != 0)
-            {
-                continue;
-            }
-        }
-        else
-        {
-            if (strcmp(known_joysticks[i].name, name) != 0)
-            {
-                continue;
-            }
-        }
-
-        if (known_joysticks[i].axes == axes
-         && known_joysticks[i].buttons == buttons
-         && known_joysticks[i].hats == hats)
-        {
-            return &known_joysticks[i];
-        }
-    }
-
-    printf("Unknown joystick '%s' with %i axes, %i buttons, %i hats\n",
-           name, axes, buttons, hats);
-    printf("Please consider sending in details about your gamepad!\n");
-
-    return NULL;
-}
-
-// Query if the joystick at the given index is a known joystick type.
-static boolean IsKnownJoystick(int index)
-{
-    return GetJoystickType(index) != NULL;
-}
-
-// Load a configuration set.
-static void LoadConfigurationSet(const joystick_config_t *configs)
-{
-    const joystick_config_t *config;
-    char buf[10];
-    int button;
-    int i;
-
-    button = 0;
-
-    for (i = 0; configs[i].name != NULL; ++i)
-    {
-        config = &configs[i];
-
-        // Don't overwrite autorun if it is set.
-        if (!strcmp(config->name, "joyb_speed") &&
-            joybspeed >= MAX_VIRTUAL_BUTTONS)
-        {
-            continue;
-        }
-
-        // For buttons, set the virtual button mapping as well.
-        if (M_StringStartsWith(config->name, "joyb_") && config->value >= 0)
-        {
-            joystick_physical_buttons[button] = config->value;
-            M_snprintf(buf, sizeof(buf), "%i", button);
-            M_SetVariable(config->name, buf);
-            ++button;
-        }
-        else
-        {
-            M_snprintf(buf, sizeof(buf), "%i", config->value);
-            M_SetVariable(config->name, buf);
-        }
-    }
-}
-
-// Load configuration for joystick_index based on known types.
-static void LoadKnownConfiguration(void)
-{
-    const known_joystick_t *jstype;
-
-    jstype = GetJoystickType(joystick_index);
-    if (jstype == NULL)
-    {
-        return;
-    }
-
-    LoadConfigurationSet(empty_defaults);
-    LoadConfigurationSet(jstype->configs);
-}
-
-static void InitJoystick(void)
-{
-    if (!joystick_initted)
-    {
-        joystick_initted = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0;
-    }
-}
-
-static void UnInitJoystick(void)
-{
-    if (joystick_initted)
-    {
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-        joystick_initted = 0;
-    }
-}
-
-// We identify joysticks using GUID where possible, but joystick_index
-// is used to distinguish between different devices. As the index can
-// change, UpdateJoystickIndex() checks to see if it is still valid and
-// updates it as appropriate.
-static void UpdateJoystickIndex(void)
-{
-    SDL_JoystickGUID guid, dev_guid;
-    int i;
-
-    guid = SDL_JoystickGetGUIDFromString(joystick_guid);
-
-    // Is joystick_index already correct?
-    if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
-    {
-        dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
-        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-        {
-            return;
-        }
-    }
-
-    // If index is not correct, look for the first device with the
-    // expected GUID. It may have moved to a different index.
-    for (i = 0; i < SDL_NumJoysticks(); ++i)
-    {
-        dev_guid = SDL_JoystickGetDeviceGUID(i);
-        if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-        {
-            joystick_index = i;
-            return;
-        }
-    }
-
-    // Not found; it's possible the device is disconnected. Do not
-    // reset joystick_guid or joystick_index in case they are
-    // reconnected later.
-}
-
-// Set the label showing the name of the currently selected joystick
-static void SetJoystickButtonLabel(void)
-{
-    SDL_JoystickGUID guid, dev_guid;
-    const char *name;
-
-    if (!usejoystick || !strcmp(joystick_guid, ""))
-    {
-        name = "None set";
-    }
-    else
-    {
-        name = "Not found (device disconnected?)";
-
-        // Use the device name if the GUID and index match.
-        if (joystick_index >= 0 && joystick_index < SDL_NumJoysticks())
-        {
-            guid = SDL_JoystickGetGUIDFromString(joystick_guid);
-            dev_guid = SDL_JoystickGetDeviceGUID(joystick_index);
-            if (!memcmp(&guid, &dev_guid, sizeof(SDL_JoystickGUID)))
-            {
-                name = SDL_JoystickNameForIndex(joystick_index);
-            }
-        }
-    }
-
-    TXT_SetButtonLabel(joystick_button, (char *) name);
-}
-
-// Try to open all joysticks visible to SDL.
-
-static int OpenAllJoysticks(void)
-{
-    int i;
-    int result;
-
-    InitJoystick();
-
-    // SDL_JoystickOpen() all joysticks.
-
-    all_joysticks_len = SDL_NumJoysticks();
-    all_joysticks = calloc(all_joysticks_len, sizeof(SDL_Joystick *));
-
-    result = 0;
-
-    for (i = 0; i < all_joysticks_len; ++i)
-    {
-        all_joysticks[i] = SDL_JoystickOpen(i);
-
-        // If any joystick is successfully opened, return true.
-
-        if (all_joysticks[i] != NULL)
-        {
-            result = 1;
-        }
-    }
-
-    // Success? Turn on joystick events.
-
-    if (result)
-    {
-        SDL_JoystickEventState(SDL_ENABLE);
-    }
-    else
-    {
-        free(all_joysticks);
-        all_joysticks = NULL;
-    }
-
-    return result;
-}
-
-// Close all the joysticks opened with OpenAllJoysticks()
-
-static void CloseAllJoysticks(void)
-{
-    int i;
-
-    for (i = 0; i < all_joysticks_len; ++i)
-    {
-        if (all_joysticks[i] != NULL)
-        {
-            SDL_JoystickClose(all_joysticks[i]);
-        }
-    }
-
-    SDL_JoystickEventState(SDL_DISABLE);
-
-    free(all_joysticks);
-    all_joysticks = NULL;
-
-    UnInitJoystick();
-}
-
-static void CalibrateXAxis(void)
-{
-    TXT_ConfigureJoystickAxis(x_axis_widget, calibrate_button, NULL);
-}
-
-// Given the SDL_JoystickID instance ID from a button event, set the
-// joystick_guid and joystick_index config variables.
-static boolean SetJoystickGUID(SDL_JoystickID joy_id)
-{
-    SDL_JoystickGUID guid;
-    int i;
-
-    for (i = 0; i < all_joysticks_len; ++i)
-    {
-        if (SDL_JoystickInstanceID(all_joysticks[i]) == joy_id)
-        {
-            guid = SDL_JoystickGetGUID(all_joysticks[i]);
-            joystick_guid = malloc(GUID_STRING_BUF_SIZE);
-            SDL_JoystickGetGUIDString(guid, joystick_guid,
-                                      GUID_STRING_BUF_SIZE);
-            joystick_index = i;
-
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static void GetGamepadDefaultConfig(void)
-{
-    boolean have_four_shoulder, have_dual_sticks;
-    char *mapping;
-    SDL_JoystickGUID guid;
-
-    guid = SDL_JoystickGetGUID(all_joysticks[joystick_index]);
-    mapping = SDL_GameControllerMappingForGUID(guid);
-    have_four_shoulder =
-        strstr(mapping, "leftshoulder") && strstr(mapping, "rightshoulder") &&
-        strstr(mapping, "lefttrigger") && strstr(mapping, "righttrigger");
-    have_dual_sticks = strstr(mapping, "leftx") && strstr(mapping, "rightx");
-    SDL_free(mapping);
-
-    LoadConfigurationSet(empty_defaults);
-
-    if (have_four_shoulder && have_dual_sticks)
-    {
-        LoadConfigurationSet(modern_gamepad);
-    }
-    else if (have_four_shoulder)
-    {
-        LoadConfigurationSet(classic_gamepad_plus);
-    }
-    else
-    {
-        LoadConfigurationSet(classic_gamepad);
-    }
-}
-
-static int CalibrationEventCallback(SDL_Event *event, void *user_data)
-{
-    if (event->type != SDL_JOYBUTTONDOWN)
-    {
-        return 0;
-    }
-
-    if (!SetJoystickGUID(event->jbutton.which))
-    {
-        return 0;
-    }
-
-    if (SDL_IsGameController(joystick_index))
-    {
-        usejoystick = 1;
-        use_gamepad = 1;
-        gamepad_type = SDL_GameControllerTypeForIndex(joystick_index);
-        LoadConfigurationSet(empty_defaults);
-        GetGamepadDefaultConfig();
-        TXT_CloseWindow(calibration_window);
-        return 1;
-    }
-
-    // At this point, we have a button press.
-    // In the first "center" stage, we're just trying to work out which
-    // joystick is being configured and which button the user is pressing.
-    usejoystick = 1;
-    use_gamepad = 0;
-    gamepad_type = SDL_CONTROLLER_TYPE_UNKNOWN;
-    calibrate_button = event->jbutton.button;
-
-    // If the joystick is a known one, auto-load default
-    // config for it. Otherwise, proceed with calibration.
-    if (IsKnownJoystick(joystick_index))
-    {
-        LoadKnownConfiguration();
-        TXT_CloseWindow(calibration_window);
-    }
-    else
-    {
-        TXT_CloseWindow(calibration_window);
-
-        // Calibrate joystick axes: Y axis first, then X axis once
-        // completed.
-        TXT_ConfigureJoystickAxis(y_axis_widget, calibrate_button,
-                                  CalibrateXAxis);
-    }
-
-    return 1;
-}
-
-static void NoJoystick(void)
-{
-    TXT_MessageBox(NULL, "No gamepads or joysticks could be found.\n\n"
-                         "Try configuring your controller from within\n"
-                         "your OS first. Maybe you need to install\n"
-                         "some drivers or otherwise configure it.");
-
-    usejoystick = 0;
-    use_gamepad = 0;
-    joystick_index = -1;
-    SetJoystickButtonLabel();
-}
-
-static void RefreshJoystickWindow(TXT_UNCAST_ARG(widget),
-                                  TXT_UNCAST_ARG(unused))
-{
-    ConfigJoystick(NULL, NULL);
-}
-
-static void CalibrateWindowClosed(TXT_UNCAST_ARG(widget),
-                                  TXT_UNCAST_ARG(joystick_window))
-{
-    TXT_CAST_ARG(txt_window_t, joystick_window);
-    TXT_SDL_SetEventCallback(NULL, NULL);
-    SetJoystickButtonLabel();
-    CloseAllJoysticks();
-
-    // Refresh Joystick window to update button and axis widgets.
-    TXT_SignalConnect(joystick_window, "closed", RefreshJoystickWindow, NULL);
-    TXT_CloseWindow(joystick_window);
-}
-
-static void CalibrateJoystick(TXT_UNCAST_ARG(widget),
-                              TXT_UNCAST_ARG(joystick_window))
-{
-    TXT_CAST_ARG(txt_window_t, joystick_window);
-
-    // Try to open all available joysticks.  If none are opened successfully,
-    // bomb out with an error.
-
-    if (!OpenAllJoysticks())
-    {
-        NoJoystick();
-        return;
-    }
-
-    calibration_window = TXT_NewWindow("Gamepad/Joystick calibration");
-
-    TXT_AddWidgets(calibration_window,
-                   TXT_NewStrut(0, 1),
-                   TXT_NewLabel("Center the D-pad or joystick,\n"
-                                "and press a button."),
-                   TXT_NewStrut(0, 1),
-                   NULL);
-
-    TXT_SetWindowAction(calibration_window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(calibration_window, TXT_HORIZ_CENTER, 
-                        TXT_NewWindowAbortAction(calibration_window));
-    TXT_SetWindowAction(calibration_window, TXT_HORIZ_RIGHT, NULL);
-
-    TXT_SDL_SetEventCallback(CalibrationEventCallback, NULL);
-
-    TXT_SignalConnect(calibration_window, "closed", CalibrateWindowClosed,
-                      joystick_window);
-
-    // Start calibration
-}
-
-//
-// GUI
-//
-
-static void AddJoystickControl(TXT_UNCAST_ARG(table), const char *label, int *var)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_joystick_input_t *joy_input;
-
-    joy_input = TXT_NewJoystickInput(var);
-
-    TXT_AddWidgets(table,
-                   TXT_NewLabel(label),
-                   joy_input,
-                   TXT_TABLE_EMPTY,
-                   NULL);
-}
-
-static void SwapLRSticks(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    // Single pad/stick controllers don't get a joystick_strafe_axis value
-    if (joystick_strafe_axis >= 0)
-    {
-        if (joystick_x_axis == SDL_CONTROLLER_AXIS_LEFTX)
-        {
-            joystick_x_axis = SDL_CONTROLLER_AXIS_RIGHTX;
-            joystick_y_axis = SDL_CONTROLLER_AXIS_LEFTY;
-            joystick_strafe_axis = SDL_CONTROLLER_AXIS_LEFTX;
-            joystick_look_axis = SDL_CONTROLLER_AXIS_RIGHTY;
-        }
-        else
-        {
-            joystick_x_axis = SDL_CONTROLLER_AXIS_LEFTX;
-            joystick_y_axis = SDL_CONTROLLER_AXIS_RIGHTY;
-            joystick_strafe_axis = SDL_CONTROLLER_AXIS_RIGHTX;
-            joystick_look_axis = SDL_CONTROLLER_AXIS_LEFTY;
-        }
-    }
-}
-
-static void AdjustAnalog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    txt_window_t *window;
-
-    window = TXT_NewWindow("Analog Settings");
-    TXT_SetTableColumns(window, 2);
-    TXT_SetColumnWidths(window, 10, 6);
-    TXT_AddWidgets(window,
-        TXT_NewCheckBox("Use analog controls", &use_analog),
-        TXT_NewSeparator("Sensitivity"),
-        TXT_NewLabel("Movement"),
-        TXT_NewSpinControl(&joystick_move_sensitivity, 0, 20),
-        TXT_NewLabel("Turn"),
-        TXT_NewSpinControl(&joystick_turn_sensitivity, 0, 20),
-        NULL);
-    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
-    {
-        TXT_AddWidgets(window,
-            TXT_NewLabel("Look"),
-            TXT_NewSpinControl(&joystick_look_sensitivity, 0, 20), NULL);
-    }
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER,
-        TXT_NewWindowEscapeAction(window));
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
-    TXT_SetWidgetAlign(window, TXT_HORIZ_CENTER);
-}
-
-static void MoreControls(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    txt_window_t *window;
-
-    window = TXT_NewWindow("Additional Gamepad/Joystick buttons");
-    TXT_SetTableColumns(window, 6);
-    TXT_SetColumnWidths(window, 20, 10, 1, 20, 10, 0);
-
-    AddJoystickControl(window, "Use inventory item", &joybuseartifact);
-    AddJoystickControl(window, "Inventory left", &joybinvleft);
-    AddJoystickControl(window, "Inventory right", &joybinvright);
-    if (gamemission == heretic || gamemission == hexen)
-    {
-        AddJoystickControl(window, "Fly up", &joybflyup);
-        AddJoystickControl(window, "Fly down", &joybflydown);
-        AddJoystickControl(window, "Fly center", &joybflycenter);
-    }
-
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER,
-        TXT_NewWindowEscapeAction(window));
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
-    TXT_SetWidgetAlign(window, TXT_HORIZ_CENTER);
-}
-
-void ConfigJoystick(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-
-    window = TXT_NewWindow("Gamepad/Joystick configuration");
-    TXT_SetTableColumns(window, 6);
-    TXT_SetColumnWidths(window, 18, 10, 1, 18, 10, 0);
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_AddWidgets(window,
-                   TXT_NewLabel("Controller"),
-                   joystick_button = TXT_NewButton("zzzz"),
-                   TXT_TABLE_EOL,
-
-                   TXT_NewSeparator("Axes"),
-                   TXT_NewLabel("Forward/backward"),
-                   y_axis_widget = TXT_NewJoystickAxis(&joystick_y_axis,
-                                                       &joystick_y_invert,
-                                                       &joystick_y_dead_zone,
-                                                       JOYSTICK_AXIS_VERTICAL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_EMPTY,
-                   TXT_TABLE_EMPTY,
-
-                   TXT_NewLabel("Turn left/right"),
-                   x_axis_widget =
-                        TXT_NewJoystickAxis(&joystick_x_axis,
-                                            &joystick_x_invert,
-                                            &joystick_x_dead_zone,
-                                            JOYSTICK_AXIS_HORIZONTAL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_EMPTY,
-                   TXT_TABLE_EMPTY,
-
-                   TXT_NewLabel("Strafe left/right"),
-                   TXT_NewJoystickAxis(&joystick_strafe_axis,
-                                       &joystick_strafe_invert,
-                                       &joystick_strafe_dead_zone,
-                                        JOYSTICK_AXIS_HORIZONTAL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_EMPTY,
-                   TXT_TABLE_EMPTY,
-                   NULL);
-
-    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
-    {
-        TXT_AddWidgets(window,
-                   TXT_NewLabel("Look up/down"),
-                   TXT_NewJoystickAxis(&joystick_look_axis,
-                                       &joystick_look_invert,
-                                       &joystick_look_dead_zone,
-                                        JOYSTICK_AXIS_VERTICAL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_EMPTY,
-                   TXT_TABLE_EMPTY,
-                   NULL);
-    }
-
-    TXT_AddWidget(window,
-        TXT_NewConditional(&use_gamepad, 1,
-                   TXT_NewButton2("Swap L and R sticks", SwapLRSticks, NULL)));
-    TXT_AddWidget(window, TXT_TABLE_EOL);
-
-    TXT_AddWidget(window,
-                   TXT_NewButton2("Analog settings", AdjustAnalog, NULL));
-    TXT_AddWidget(window, TXT_TABLE_EOL);
-
-    TXT_AddWidget(window, TXT_NewSeparator("Buttons"));
-
-    AddJoystickControl(window, "Fire/Attack", &joybfire);
-    AddJoystickControl(window, "Strafe Left", &joybstrafeleft);
-
-    AddJoystickControl(window, "Use", &joybuse);
-    AddJoystickControl(window, "Strafe Right", &joybstraferight);
-
-    AddJoystickControl(window, "Previous weapon", &joybprevweapon);
-    AddJoystickControl(window, "Strafe", &joybstrafe);
-
-    AddJoystickControl(window, "Next weapon", &joybnextweapon);
-
-    // High values of joybspeed are used to activate the "always run mode"
-    // trick in Vanilla Doom.  If this has been enabled, not only is the
-    // joybspeed value meaningless, but the control itself is useless.
-
-    if (joybspeed < MAX_VIRTUAL_BUTTONS)
-    {
-        AddJoystickControl(window, "Run", &joybspeed);
-    }
-
-    if (gamemission == hexen || gamemission == strife)
-    {
-        AddJoystickControl(window, "Jump", &joybjump);
-    }
-
-    AddJoystickControl(window, "Activate menu", &joybmenu);
-
-    AddJoystickControl(window, "Toggle Automap", &joybautomap);
-
-    if (gamemission == heretic || gamemission == hexen || gamemission == strife)
-    {
-        TXT_AddWidget(window,
-                       TXT_NewButton2("More controls...", MoreControls, NULL));
-        TXT_AddWidget(window, TXT_TABLE_EOL);
-    }
-
-    TXT_SignalConnect(joystick_button, "pressed", CalibrateJoystick, window);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
-
-    InitJoystick();
-    UpdateJoystickIndex();
-    SetJoystickButtonLabel();
-    UnInitJoystick();
-}
-
-void BindJoystickVariables(void)
-{
-    int i;
-
-    M_BindIntVariable("use_joystick",           &usejoystick);
-    M_BindIntVariable("use_gamepad",            &use_gamepad);
-    M_BindIntVariable("gamepad_type",           &gamepad_type);
-    M_BindStringVariable("joystick_guid",       &joystick_guid);
-    M_BindIntVariable("joystick_index",         &joystick_index);
-    M_BindIntVariable("joystick_x_axis",        &joystick_x_axis);
-    M_BindIntVariable("joystick_y_axis",        &joystick_y_axis);
-    M_BindIntVariable("joystick_strafe_axis",   &joystick_strafe_axis);
-    M_BindIntVariable("joystick_x_invert",      &joystick_x_invert);
-    M_BindIntVariable("joystick_y_invert",      &joystick_y_invert);
-    M_BindIntVariable("joystick_strafe_invert", &joystick_strafe_invert);
-    M_BindIntVariable("joystick_look_axis",   &joystick_look_axis);
-    M_BindIntVariable("joystick_look_invert", &joystick_look_invert);
-    M_BindIntVariable("joystick_x_dead_zone", &joystick_x_dead_zone);
-    M_BindIntVariable("joystick_y_dead_zone", &joystick_y_dead_zone);
-    M_BindIntVariable("joystick_strafe_dead_zone", &joystick_strafe_dead_zone);
-    M_BindIntVariable("joystick_look_dead_zone", &joystick_look_dead_zone);
-    M_BindIntVariable("use_analog", &use_analog);
-    M_BindIntVariable("joystick_turn_sensitivity", &joystick_turn_sensitivity);
-    M_BindIntVariable("joystick_move_sensitivity", &joystick_move_sensitivity);
-    M_BindIntVariable("joystick_look_sensitivity", &joystick_look_sensitivity);
-
-    for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
-    {
-        char name[32];
-        M_snprintf(name, sizeof(name), "joystick_physical_button%i", i);
-        M_BindIntVariable(name, &joystick_physical_buttons[i]);
-    }
-}
-
diff --git a/games/NXDoom/src/setup/joystick.h b/games/NXDoom/src/setup/joystick.h
deleted file mode 100644
index dd17b7d92..000000000
--- a/games/NXDoom/src/setup/joystick.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_JOYSTICK_H
-#define SETUP_JOYSTICK_H
-
-
-#include "i_joystick.h"
-
-
-extern int joystick_index;
-extern int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS];
-extern int use_gamepad;
-extern int gamepad_type;
-
-
-void ConfigJoystick(void *widget, void *user_data);
-void BindJoystickVariables(void);
-
-#endif /* #ifndef SETUP_JOYSTICK_H */
-
diff --git a/games/NXDoom/src/setup/keyboard.c b/games/NXDoom/src/setup/keyboard.c
deleted file mode 100644
index 02de4f88b..000000000
--- a/games/NXDoom/src/setup/keyboard.c
+++ /dev/null
@@ -1,448 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include "textscreen.h"
-#include "doomtype.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "m_misc.h"
-
-#include "execute.h"
-#include "txt_keyinput.h"
-
-#include "mode.h"
-#include "joystick.h"
-#include "keyboard.h"
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-keyboard"
-
-int vanilla_keyboard_mapping = 1;
-
-static int always_run = 0;
-
-// Keys within these groups cannot have the same value.
-
-static int *controls[] = { &key_left, &key_right, &key_up, &key_down,
-                           &key_strafeleft, &key_straferight, &key_fire,
-                           &key_use, &key_strafe, &key_speed, &key_jump,
-                           &key_flyup, &key_flydown, &key_flycenter,
-                           &key_lookup, &key_lookdown, &key_lookcenter,
-                           &key_invleft, &key_invright, &key_invquery,
-                           &key_invuse, &key_invpop, &key_mission, &key_invkey,
-                           &key_invhome, &key_invend, &key_invdrop,
-                           &key_useartifact, &key_pause, &key_usehealth,
-                           &key_weapon1, &key_weapon2, &key_weapon3,
-                           &key_weapon4, &key_weapon5, &key_weapon6,
-                           &key_weapon7, &key_weapon8,
-                           &key_arti_quartz, &key_arti_urn, &key_arti_bomb,
-                           &key_arti_tome, &key_arti_ring, &key_arti_chaosdevice,
-                           &key_arti_shadowsphere, &key_arti_wings, 
-                           &key_arti_torch, &key_arti_morph,
-                           &key_arti_all, &key_arti_health, &key_arti_poisonbag,
-                           &key_arti_blastradius, &key_arti_teleport,
-                           &key_arti_teleportother, &key_arti_egg,
-                           &key_arti_invulnerability,
-                           &key_prevweapon, &key_nextweapon, NULL };
-
-static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,
-                           &key_menu_left, &key_menu_right, &key_menu_back,
-                           &key_menu_forward, NULL };
-
-static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
-                            &key_menu_volume, &key_menu_detail, &key_menu_qsave,
-                            &key_menu_endgame, &key_menu_messages, &key_spy,
-                            &key_menu_qload, &key_menu_quit, &key_menu_gamma,
-                            &key_menu_incscreen, &key_menu_decscreen, 
-                            &key_menu_screenshot,
-                            &key_message_refresh, &key_multi_msg,
-                            &key_multi_msgplayer[0], &key_multi_msgplayer[1],
-                            &key_multi_msgplayer[2], &key_multi_msgplayer[3], NULL };
-
-static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east,
-                           &key_map_west, &key_map_zoomin, &key_map_zoomout,
-                           &key_map_toggle, &key_map_maxzoom, &key_map_follow,
-                           &key_map_grid, &key_map_mark, &key_map_clearmark,
-                           NULL };
-
-static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
-{
-    if (always_run)
-    {
-        /*
-         <Janizdreg> if you want to pick one for chocolate doom to use, 
-                     pick 29, since that is the most universal one that 
-                     also works with heretic, hexen and strife =P
-
-         NB. This choice also works with original, ultimate and final exes.
-        */
-
-        joybspeed = 29;
-    }
-    else
-    {
-        joybspeed = 2;
-    }
-}
-
-static int VarInGroup(int *variable, int **group)
-{
-    unsigned int i;
-
-    for (i=0; group[i] != NULL; ++i)
-    {
-        if (group[i] == variable)
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-static void CheckKeyGroup(int *variable, int **group)
-{
-    unsigned int i;
-
-    // Don't check unless the variable is in this group.
-
-    if (!VarInGroup(variable, group))
-    {
-        return;
-    }
-
-    // If another variable has the same value as the new value, reset it.
-
-    for (i=0; group[i] != NULL; ++i)
-    {
-        if (*variable == *group[i] && group[i] != variable)
-        {
-            // A different key has the same value.  Clear the existing
-            // value. This ensures that no two keys can have the same
-            // value.
-
-            *group[i] = 0;
-        }
-    }
-}
-
-// Callback invoked when a key control is set
-
-static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
-{
-    TXT_CAST_ARG(int, variable);
-
-    CheckKeyGroup(variable, controls);
-    CheckKeyGroup(variable, menu_nav);
-    CheckKeyGroup(variable, shortcuts);
-    CheckKeyGroup(variable, map_keys);
-}
-
-// Add a label and keyboard input to the specified table.
-
-static void AddKeyControl(TXT_UNCAST_ARG(table), const char *name, int *var)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_key_input_t *key_input;
-
-    TXT_AddWidget(table, TXT_NewLabel(name));
-    key_input = TXT_NewKeyInput(var);
-    TXT_AddWidget(table, key_input);
-
-    TXT_SignalConnect(key_input, "set", KeySetCallback, var);
-}
-
-static void AddSectionLabel(TXT_UNCAST_ARG(table), const char *title,
-                            boolean add_space)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    char buf[64];
-
-    if (add_space)
-    {
-        TXT_AddWidgets(table,
-                       TXT_NewStrut(0, 1),
-                       TXT_TABLE_EOL,
-                       NULL);
-    }
-
-    M_snprintf(buf, sizeof(buf), " - %s - ", title);
-
-    TXT_AddWidgets(table,
-                   TXT_NewLabel(buf),
-                   TXT_TABLE_EOL,
-                   NULL);
-}
-static void ConfigExtraKeys(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    txt_window_t *window;
-    txt_scrollpane_t *scrollpane;
-    txt_table_t *table;
-    boolean extra_keys = gamemission == heretic
-                      || gamemission == hexen
-                      || gamemission == strife;
-
-    window = TXT_NewWindow("Extra keyboard controls");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    table = TXT_NewTable(2);
-
-    TXT_SetColumnWidths(table, 21, 9);
-
-    if (extra_keys)
-    {
-        // When we have extra controls, a scrollable pane must be used.
-
-        scrollpane = TXT_NewScrollPane(0, 13, table);
-        TXT_AddWidget(window, scrollpane);
-
-        AddSectionLabel(table, "View", false);
-
-        AddKeyControl(table, "Look up", &key_lookup);
-        AddKeyControl(table, "Look down", &key_lookdown);
-        AddKeyControl(table, "Center view", &key_lookcenter);
-
-        if (gamemission == heretic || gamemission == hexen)
-        {
-            AddSectionLabel(table, "Flying", true);
-
-            AddKeyControl(table, "Fly up", &key_flyup);
-            AddKeyControl(table, "Fly down", &key_flydown);
-            AddKeyControl(table, "Fly center", &key_flycenter);
-        }
-
-        AddSectionLabel(table, "Inventory", true);
-
-        AddKeyControl(table, "Inventory left", &key_invleft);
-        AddKeyControl(table, "Inventory right", &key_invright);
-
-        if (gamemission == strife)
-        {
-            AddKeyControl(table, "Home", &key_invhome);
-            AddKeyControl(table, "End", &key_invend);
-            AddKeyControl(table, "Query", &key_invquery);
-            AddKeyControl(table, "Drop", &key_invdrop);
-            AddKeyControl(table, "Show weapons", &key_invpop);
-            AddKeyControl(table, "Show mission", &key_mission);
-            AddKeyControl(table, "Show keys", &key_invkey);
-            AddKeyControl(table, "Use", &key_invuse);
-            AddKeyControl(table, "Use health", &key_usehealth);
-        }
-        else
-        {
-            AddKeyControl(table, "Use artifact", &key_useartifact);
-        }
-
-        if (gamemission == heretic)
-        {
-            AddSectionLabel(table, "Artifacts", true);
-
-            AddKeyControl(table, "Quartz Flask", &key_arti_quartz);
-            AddKeyControl(table, "Mystic Urn", &key_arti_urn);
-            AddKeyControl(table, "Timebomb", &key_arti_bomb);
-            AddKeyControl(table, "Tome of Power", &key_arti_tome);
-            AddKeyControl(table, "Ring of Invincibility ", &key_arti_ring);
-            AddKeyControl(table, "Chaos Device", &key_arti_chaosdevice);
-            AddKeyControl(table, "Shadowsphere", &key_arti_shadowsphere);
-            AddKeyControl(table, "Wings of Wrath", &key_arti_wings);
-            AddKeyControl(table, "Torch", &key_arti_torch);
-            AddKeyControl(table, "Morph Ovum", &key_arti_morph);
-        }
-
-        if (gamemission == hexen)
-        {
-            AddSectionLabel(table, "Artifacts", true);
-
-            AddKeyControl(table, "One of each", &key_arti_all);
-            AddKeyControl(table, "Quartz Flask", &key_arti_health);
-            AddKeyControl(table, "Flechette", &key_arti_poisonbag);
-            AddKeyControl(table, "Disc of Repulsion", &key_arti_blastradius);
-            AddKeyControl(table, "Chaos Device", &key_arti_teleport);
-            AddKeyControl(table, "Banishment Device", &key_arti_teleportother);
-            AddKeyControl(table, "Porkalator", &key_arti_egg);
-            AddKeyControl(table, "Icon of the Defender",
-                          &key_arti_invulnerability);
-        }
-    }
-    else
-    {
-        TXT_AddWidget(window, table);
-    }
-
-    AddSectionLabel(table, "Weapons", extra_keys);
-
-    AddKeyControl(table, "Weapon 1", &key_weapon1);
-    AddKeyControl(table, "Weapon 2", &key_weapon2);
-    AddKeyControl(table, "Weapon 3", &key_weapon3);
-    AddKeyControl(table, "Weapon 4", &key_weapon4);
-    AddKeyControl(table, "Weapon 5", &key_weapon5);
-    AddKeyControl(table, "Weapon 6", &key_weapon6);
-    AddKeyControl(table, "Weapon 7", &key_weapon7);
-    AddKeyControl(table, "Weapon 8", &key_weapon8);
-    AddKeyControl(table, "Previous weapon", &key_prevweapon);
-    AddKeyControl(table, "Next weapon", &key_nextweapon);
-}
-
-static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    txt_window_t *window;
-    txt_table_t *table;
-    txt_scrollpane_t *scrollpane;
-
-    window = TXT_NewWindow("Other keys");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    table = TXT_NewTable(2);
-
-    TXT_SetColumnWidths(table, 25, 9);
-
-    AddSectionLabel(table, "Menu navigation", false);
-
-    AddKeyControl(table, "Activate menu",         &key_menu_activate);
-    AddKeyControl(table, "Move cursor up",        &key_menu_up);
-    AddKeyControl(table, "Move cursor down",      &key_menu_down);
-    AddKeyControl(table, "Move slider left",      &key_menu_left);
-    AddKeyControl(table, "Move slider right",     &key_menu_right);
-    AddKeyControl(table, "Go to previous menu",   &key_menu_back);
-    AddKeyControl(table, "Activate menu item",    &key_menu_forward);
-    AddKeyControl(table, "Confirm action",        &key_menu_confirm);
-    AddKeyControl(table, "Cancel action",         &key_menu_abort);
-
-    AddSectionLabel(table, "Shortcut keys", true);
-
-    AddKeyControl(table, "Pause game",            &key_pause);
-    AddKeyControl(table, "Help screen",           &key_menu_help);
-    AddKeyControl(table, "Save game",             &key_menu_save);
-    AddKeyControl(table, "Load game",             &key_menu_load);
-    AddKeyControl(table, "Sound volume",          &key_menu_volume);
-    AddKeyControl(table, "Toggle detail",         &key_menu_detail);
-    AddKeyControl(table, "Quick save",            &key_menu_qsave);
-    AddKeyControl(table, "End game",              &key_menu_endgame);
-    AddKeyControl(table, "Toggle messages",       &key_menu_messages);
-    AddKeyControl(table, "Quick load",            &key_menu_qload);
-    AddKeyControl(table, "Quit game",             &key_menu_quit);
-    AddKeyControl(table, "Toggle gamma",          &key_menu_gamma);
-    AddKeyControl(table, "Multiplayer spy",       &key_spy);
-
-    AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
-    AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
-    AddKeyControl(table, "Save a screenshot",     &key_menu_screenshot);
-
-    AddKeyControl(table, "Display last message",  &key_message_refresh);
-    AddKeyControl(table, "Finish recording demo", &key_demo_quit);
-
-    AddSectionLabel(table, "Map", true);
-    AddKeyControl(table, "Toggle map",            &key_map_toggle);
-    AddKeyControl(table, "Zoom in",               &key_map_zoomin);
-    AddKeyControl(table, "Zoom out",              &key_map_zoomout);
-    AddKeyControl(table, "Maximum zoom out",      &key_map_maxzoom);
-    AddKeyControl(table, "Follow mode",           &key_map_follow);
-    AddKeyControl(table, "Pan north",             &key_map_north);
-    AddKeyControl(table, "Pan south",             &key_map_south);
-    AddKeyControl(table, "Pan east",              &key_map_east);
-    AddKeyControl(table, "Pan west",              &key_map_west);
-    AddKeyControl(table, "Toggle grid",           &key_map_grid);
-    AddKeyControl(table, "Mark location",         &key_map_mark);
-    AddKeyControl(table, "Clear all marks",       &key_map_clearmark);
-
-    AddSectionLabel(table, "Multiplayer", true);
-
-    AddKeyControl(table, "Send message",          &key_multi_msg);
-    AddKeyControl(table, "- to player 1",         &key_multi_msgplayer[0]);
-    AddKeyControl(table, "- to player 2",         &key_multi_msgplayer[1]);
-    AddKeyControl(table, "- to player 3",         &key_multi_msgplayer[2]);
-    AddKeyControl(table, "- to player 4",         &key_multi_msgplayer[3]);
-
-    if (gamemission == hexen || gamemission == strife)
-    {
-        AddKeyControl(table, "- to player 5",     &key_multi_msgplayer[4]);
-        AddKeyControl(table, "- to player 6",     &key_multi_msgplayer[5]);
-        AddKeyControl(table, "- to player 7",     &key_multi_msgplayer[6]);
-        AddKeyControl(table, "- to player 8",     &key_multi_msgplayer[7]);
-    }
-
-    scrollpane = TXT_NewScrollPane(0, 13, table);
-
-    TXT_AddWidget(window, scrollpane);
-}
-
-void ConfigKeyboard(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-    txt_checkbox_t *run_control;
-
-    always_run = joybspeed >= 20;
-
-    window = TXT_NewWindow("Keyboard configuration");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    // The window is on a 5-column grid layout that looks like:
-    // Label | Control | | Label | Control
-    // There is a small gap between the two conceptual "columns" of
-    // controls, just for spacing.
-    TXT_SetTableColumns(window, 5);
-    TXT_SetColumnWidths(window, 15, 8, 2, 15, 8);
-
-    TXT_AddWidget(window, TXT_NewSeparator("Movement"));
-    AddKeyControl(window, "Move Forward", &key_up);
-    TXT_AddWidget(window, TXT_TABLE_EMPTY);
-    AddKeyControl(window, "Strafe Left", &key_strafeleft);
-
-    AddKeyControl(window, "Move Backward", &key_down);
-    TXT_AddWidget(window, TXT_TABLE_EMPTY);
-    AddKeyControl(window, "Strafe Right", &key_straferight);
-
-    AddKeyControl(window, "Turn Left", &key_left);
-    TXT_AddWidget(window, TXT_TABLE_EMPTY);
-    AddKeyControl(window, "Run", &key_speed);
-
-    AddKeyControl(window, "Turn Right", &key_right);
-    TXT_AddWidget(window, TXT_TABLE_EMPTY);
-    AddKeyControl(window, "Strafe On", &key_strafe);
-
-    if (gamemission == hexen || gamemission == strife)
-    {
-        AddKeyControl(window, "Jump", &key_jump);
-    }
-
-    TXT_AddWidget(window, TXT_NewSeparator("Action"));
-    AddKeyControl(window, "Fire/Attack", &key_fire);
-    TXT_AddWidget(window, TXT_TABLE_EMPTY);
-    AddKeyControl(window, "Use", &key_use);
-
-    TXT_AddWidgets(window,
-                   TXT_NewButton2("More controls...", ConfigExtraKeys, NULL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_TABLE_EMPTY,
-                   TXT_NewButton2("Other keys...", OtherKeysDialog, NULL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-
-                   TXT_NewSeparator("Misc."),
-                   run_control = TXT_NewCheckBox("Always run", &always_run),
-                   TXT_TABLE_EOL,
-                   TXT_NewInvertedCheckBox("Use native keyboard mapping",
-                                           &vanilla_keyboard_mapping),
-                   TXT_TABLE_EOL,
-                   NULL);
-
-    TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
-}
-
-void BindKeyboardVariables(void)
-{
-    M_BindIntVariable("vanilla_keyboard_mapping", &vanilla_keyboard_mapping);
-}
diff --git a/games/NXDoom/src/setup/keyboard.h b/games/NXDoom/src/setup/keyboard.h
deleted file mode 100644
index 81b8b91a2..000000000
--- a/games/NXDoom/src/setup/keyboard.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_KEYBOARD_H 
-#define SETUP_KEYBOARD_H 
-
-void ConfigKeyboard(void *widget, void *user_data);
-void BindKeyboardVariables(void);
-
-extern int vanilla_keyboard_mapping;
-
-#endif /* #ifndef SETUP_KEYBOARD_H */
diff --git a/games/NXDoom/src/setup/mainmenu.c b/games/NXDoom/src/setup/mainmenu.c
deleted file mode 100644
index 94b765f37..000000000
--- a/games/NXDoom/src/setup/mainmenu.c
+++ /dev/null
@@ -1,346 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-#include "textscreen.h"
-
-#include "execute.h"
-
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "z_zone.h"
-
-#include "setup_icon.c"
-#include "mode.h"
-
-#include "compatibility.h"
-#include "display.h"
-#include "joystick.h"
-#include "keyboard.h"
-#include "mouse.h"
-#include "multiplayer.h"
-#include "sound.h"
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup"
-
-static const int cheat_sequence[] =
-{
-    KEY_UPARROW, KEY_UPARROW, KEY_DOWNARROW, KEY_DOWNARROW,
-    KEY_LEFTARROW, KEY_RIGHTARROW, KEY_LEFTARROW, KEY_RIGHTARROW,
-    'b', 'a', KEY_ENTER, 0
-};
-
-static unsigned int cheat_sequence_index = 0;
-
-// I think these are good "sensible" defaults:
-
-static void SensibleDefaults(void)
-{
-    key_up = 'w';
-    key_down = 's';
-    key_strafeleft = 'a';
-    key_straferight = 'd';
-    key_jump = '/';
-    key_lookup = KEY_PGUP;
-    key_lookdown = KEY_PGDN;
-    key_lookcenter = KEY_HOME;
-    key_flyup = KEY_INS;
-    key_flydown = KEY_DEL;
-    key_flycenter = KEY_END;
-    key_prevweapon = ',';
-    key_nextweapon = '.';
-    key_invleft = '[';
-    key_invright = ']';
-    key_message_refresh = '\'';
-    key_mission = 'i';              // Strife keys
-    key_invpop = 'o';
-    key_invkey = 'p';
-    key_multi_msgplayer[0] = 'g';
-    key_multi_msgplayer[1] = 'h';
-    key_multi_msgplayer[2] = 'j';
-    key_multi_msgplayer[3] = 'k';
-    key_multi_msgplayer[4] = 'v';
-    key_multi_msgplayer[5] = 'b';
-    key_multi_msgplayer[6] = 'n';
-    key_multi_msgplayer[7] = 'm';
-    mousebprevweapon = 4;           // Scroll wheel = weapon cycle
-    mousebnextweapon = 3;
-    snd_musicdevice = 3;
-    joybspeed = 29;                 // Always run
-    vanilla_savegame_limit = 0;
-    vanilla_keyboard_mapping = 0;
-    vanilla_demo_limit = 0;
-    graphical_startup = 0;
-    show_endoom = 0;
-    dclick_use = 0;
-    novert = 1;
-    snd_dmxoption = "-opl3 -reverse";
-    png_screenshots = 1;
-}
-
-static int MainMenuKeyPress(txt_window_t *window, int key, void *user_data)
-{
-    if (key == cheat_sequence[cheat_sequence_index])
-    {
-        ++cheat_sequence_index;
-
-        if (cheat_sequence[cheat_sequence_index] == 0)
-        {
-            SensibleDefaults();
-            cheat_sequence_index = 0;
-
-            window = TXT_MessageBox(NULL, "    \x01    ");
-
-            return 1;
-        }
-    }
-    else
-    {
-        cheat_sequence_index = 0;
-    }
-
-    return 0;
-}
-
-static void DoQuit(void *widget, void *dosave)
-{
-    if (dosave != NULL)
-    {
-        M_SaveDefaults();
-    }
-
-    TXT_Shutdown();
-
-    exit(0);
-}
-
-static void QuitConfirm(void *unused1, void *unused2)
-{
-    txt_window_t *window;
-    txt_label_t *label;
-    txt_button_t *yes_button;
-    txt_button_t *no_button;
-
-    window = TXT_NewWindow(NULL);
-
-    TXT_AddWidgets(window, 
-                   label = TXT_NewLabel("Exiting setup.\nSave settings?"),
-                   TXT_NewStrut(24, 0),
-                   yes_button = TXT_NewButton2("  Yes  ", DoQuit, DoQuit),
-                   no_button = TXT_NewButton2("  No   ", DoQuit, NULL),
-                   NULL);
-
-    TXT_SetWidgetAlign(label, TXT_HORIZ_CENTER);
-    TXT_SetWidgetAlign(yes_button, TXT_HORIZ_CENTER);
-    TXT_SetWidgetAlign(no_button, TXT_HORIZ_CENTER);
-
-    // Only an "abort" button in the middle.
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, 
-                        TXT_NewWindowAbortAction(window));
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
-}
-
-static void LaunchDoom(void *unused1, void *unused2)
-{
-    execute_context_t *exec;
-    
-    // Save configuration first
-
-    M_SaveDefaults();
-
-    // Shut down textscreen GUI
-
-    TXT_Shutdown();
-
-    // Launch Doom
-
-    exec = NewExecuteContext();
-    PassThroughArguments(exec);
-    ExecuteDoom(exec);
-
-    exit(0);
-}
-
-static txt_button_t *GetLaunchButton(void)
-{
-    const char *label;
-
-    switch (gamemission)
-    {
-        case doom:
-            label = "Save parameters and launch DOOM";
-            break;
-        case heretic:
-            label = "Save parameters and launch Heretic";
-            break;
-        case hexen:
-            label = "Save parameters and launch Hexen";
-            break;
-        case strife:
-            label = "Save parameters and launch STRIFE!";
-            break;
-        default:
-            label = "Save parameters and launch game";
-            break;
-    }
-
-    return TXT_NewButton2(label, LaunchDoom, NULL);
-}
-
-void MainMenu(void)
-{
-    txt_window_t *window;
-    txt_window_action_t *quit_action;
-    txt_window_action_t *warp_action;
-
-    window = TXT_NewWindow("Main Menu");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_AddWidgets(window,
-        TXT_NewButton2("Configure Display",
-                       (TxtWidgetSignalFunc) ConfigDisplay, NULL),
-        TXT_NewButton2("Configure Sound",
-                       (TxtWidgetSignalFunc) ConfigSound, NULL),
-        TXT_NewButton2("Configure Keyboard",
-                       (TxtWidgetSignalFunc) ConfigKeyboard, NULL),
-        TXT_NewButton2("Configure Mouse",
-                       (TxtWidgetSignalFunc) ConfigMouse, NULL),
-        TXT_NewButton2("Configure Gamepad/Joystick",
-                       (TxtWidgetSignalFunc) ConfigJoystick, NULL),
-        TXT_NewButton2("Compatibility",
-                       (TxtWidgetSignalFunc) CompatibilitySettings, NULL),
-        GetLaunchButton(),
-        TXT_NewStrut(0, 1),
-        TXT_NewButton2("Start a Network Game",
-                       (TxtWidgetSignalFunc) StartMultiGame, NULL),
-        TXT_NewButton2("Join a Network Game",
-                       (TxtWidgetSignalFunc) JoinMultiGame, NULL),
-        TXT_NewButton2("Multiplayer Configuration",
-                       (TxtWidgetSignalFunc) MultiplayerConfig, NULL),
-        NULL);
-
-    quit_action = TXT_NewWindowAction(KEY_ESCAPE, "Quit");
-    warp_action = TXT_NewWindowAction(KEY_F2, "Warp");
-    TXT_SignalConnect(quit_action, "pressed", QuitConfirm, NULL);
-    TXT_SignalConnect(warp_action, "pressed",
-                      (TxtWidgetSignalFunc) WarpMenu, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, quit_action);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, warp_action);
-
-    TXT_SetKeyListener(window, MainMenuKeyPress, NULL);
-}
-
-//
-// Initialize all configuration variables, load config file, etc
-//
-
-static void InitConfig(void)
-{
-    M_SetConfigDir(NULL);
-    InitBindings();
-
-    SetChatMacroDefaults();
-    SetPlayerNameDefault();
-
-    M_LoadDefaults();
-
-    // Create and configure the music pack directory if it does not
-    // already exist.
-    M_SetMusicPackDir();
-}
-
-//
-// Application icon
-//
-
-static void SetIcon(void)
-{
-    SDL_Surface *surface;
-
-    surface = SDL_CreateRGBSurfaceFrom((void *) setup_icon_data, setup_icon_w,
-                                       setup_icon_h, 32, setup_icon_w * 4,
-                                       0xffu << 24, 0xffu << 16,
-                                       0xffu << 8, 0xffu << 0);
-
-    SDL_SetWindowIcon(TXT_SDLWindow, surface);
-    SDL_FreeSurface(surface);
-}
-
-static void SetWindowTitle(void)
-{
-    char *title;
-
-    title = M_StringReplace(PACKAGE_NAME " Setup ver " PACKAGE_VERSION,
-                            "Doom",
-                            GetGameTitle());
-
-
-    TXT_SetDesktopTitle(title);
-
-    free(title);
-}
-
-// Initialize the textscreen library.
-
-static void InitTextscreen(void)
-{
-    SetDisplayDriver();
-
-    if (!TXT_Init())
-    {
-        fprintf(stderr, "Failed to initialize GUI\n");
-        exit(-1);
-    }
-
-    // Set Romero's "funky blue" color:
-    // <https://doomwiki.org/wiki/Romero_Blue>
-    TXT_SetColor(TXT_COLOR_BLUE, 0x04, 0x14, 0x40);
-
-    SetIcon();
-    SetWindowTitle();
-}
-
-
-// 
-// Initialize and run the textscreen GUI.
-//
-
-static void RunGUI(void)
-{
-    InitTextscreen();
-
-    TXT_GUIMainLoop();
-}
-
-static void MissionSet(void)
-{
-    SetWindowTitle();
-    InitConfig();
-    MainMenu();
-}
-
-void D_DoomMain(void)
-{
-    SetupMission(MissionSet);
-
-    RunGUI();
-}
diff --git a/games/NXDoom/src/setup/mode.c b/games/NXDoom/src/setup/mode.c
deleted file mode 100644
index 0f6040943..000000000
--- a/games/NXDoom/src/setup/mode.c
+++ /dev/null
@@ -1,384 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-
-#include "config.h"
-#include "textscreen.h"
-
-#include "doomtype.h"
-#include "d_mode.h"
-#include "d_iwad.h"
-#include "i_system.h"
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "m_misc.h"
-
-#include "compatibility.h"
-#include "display.h"
-#include "joystick.h"
-#include "keyboard.h"
-#include "mouse.h"
-#include "multiplayer.h"
-#include "sound.h"
-
-#include "mode.h"
-
-GameMission_t gamemission;
-static const iwad_t **iwads;
-
-typedef struct
-{
-    const char *label;
-    GameMission_t mission;
-    int mask;
-    const char *name;
-    const char *config_file;
-    const char *extra_config_file;
-    const char *executable;
-} mission_config_t;
-
-// Default mission to fall back on, if no IWADs are found at all:
-
-#define DEFAULT_MISSION (&mission_configs[0])
-
-static mission_config_t mission_configs[] =
-{
-    {
-        "Doom",
-        doom,
-        IWAD_MASK_DOOM,
-        "doom",
-        "default.cfg",
-        PROGRAM_PREFIX "doom.cfg",
-        PROGRAM_PREFIX "doom"
-    },
-    {
-        "Heretic",
-        heretic,
-        IWAD_MASK_HERETIC,
-        "heretic",
-        "heretic.cfg",
-        PROGRAM_PREFIX "heretic.cfg",
-        PROGRAM_PREFIX "heretic"
-    },
-    {
-        "Hexen",
-        hexen,
-        IWAD_MASK_HEXEN,
-        "hexen",
-        "hexen.cfg",
-        PROGRAM_PREFIX "hexen.cfg",
-        PROGRAM_PREFIX "hexen"
-    },
-    {
-        "Strife",
-        strife,
-        IWAD_MASK_STRIFE,
-        "strife",
-        "strife.cfg",
-        PROGRAM_PREFIX "strife.cfg",
-        PROGRAM_PREFIX "strife"
-    }
-};
-
-static GameSelectCallback game_selected_callback;
-
-// Miscellaneous variables that aren't used in setup.
-
-static int showMessages = 1;
-static int screenblocks = 9;
-static int detailLevel = 0;
-static char *savedir = NULL;
-static char *executable = NULL;
-static const char *game_title = "Doom";
-static char *back_flat = "F_PAVE01";
-static int comport = 0;
-static char *nickname = NULL;
-
-static void BindMiscVariables(void)
-{
-    if (gamemission == doom)
-    {
-        M_BindIntVariable("detaillevel",   &detailLevel);
-        M_BindIntVariable("show_messages", &showMessages);
-    }
-
-    if (gamemission == hexen)
-    {
-        M_BindStringVariable("savedir", &savedir);
-        M_BindIntVariable("messageson", &showMessages);
-
-        // Hexen has a variable to control the savegame directory
-        // that is used.
-
-        savedir = M_GetSaveGameDir("hexen.wad");
-
-        // On Windows, hexndata\ is the default.
-
-        if (!strcmp(savedir, ""))
-        {
-            free(savedir);
-            savedir = "hexndata" DIR_SEPARATOR_S;
-        }
-    }
-
-    if (gamemission == strife)
-    {
-        // Strife has a different default value than the other games
-        screenblocks = 10;
-
-        M_BindStringVariable("back_flat",   &back_flat);
-        M_BindStringVariable("nickname",    &nickname);
-
-        M_BindIntVariable("screensize",     &screenblocks);
-        M_BindIntVariable("comport",        &comport);
-    }
-    else
-    {
-        M_BindIntVariable("screenblocks",   &screenblocks);
-    }
-
-}
-
-//
-// Initialise all configuration file bindings.
-//
-
-void InitBindings(void)
-{
-    M_ApplyPlatformDefaults();
-
-    // Keyboard, mouse, joystick controls
-
-    M_BindBaseControls();
-    M_BindWeaponControls();
-    M_BindMapControls();
-    M_BindMenuControls();
-
-    if (gamemission == heretic || gamemission == hexen)
-    {
-        M_BindHereticControls();
-    }
-
-    if (gamemission == hexen)
-    {
-        M_BindHexenControls();
-    }
-
-    if (gamemission == strife)
-    {
-        M_BindStrifeControls();
-    }
-
-    // All other variables
-
-    BindCompatibilityVariables();
-    BindDisplayVariables();
-    BindJoystickVariables();
-    BindKeyboardVariables();
-    BindMouseVariables();
-    BindSoundVariables();
-    BindMiscVariables();
-    BindMultiplayerVariables();
-}
-
-// Set the name of the executable program to run the game:
-
-static void SetExecutable(mission_config_t *config)
-{
-    char *extension;
-
-    free(executable);
-
-#ifdef _WIN32
-    extension = ".exe";
-#else
-    extension = "";
-#endif
-
-    executable = M_StringJoin(config->executable, extension, NULL);
-}
-
-static void SetMission(mission_config_t *config)
-{
-    iwads = D_FindAllIWADs(config->mask);
-    gamemission = config->mission;
-    SetExecutable(config);
-    game_title = config->label;
-    M_SetConfigFilenames(config->config_file, config->extra_config_file);
-}
-
-static mission_config_t *GetMissionForName(const char *name)
-{
-    int i;
-
-    for (i=0; i<arrlen(mission_configs); ++i)
-    {
-        if (!strcmp(mission_configs[i].name, name))
-        {
-            return &mission_configs[i];
-        }
-    }
-
-    return NULL;
-}
-
-// Check the name of the executable.  If it contains one of the game
-// names (eg. chocolate-hexen-setup.exe) then use that game.
-
-static boolean CheckExecutableName(GameSelectCallback callback)
-{
-    mission_config_t *config;
-    const char *exe_name;
-    int i;
-
-    exe_name = M_GetExecutableName();
-
-    for (i=0; i<arrlen(mission_configs); ++i)
-    {
-        config = &mission_configs[i];
-
-        if (strstr(exe_name, config->name) != NULL)
-        {
-            SetMission(config);
-            callback();
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static void GameSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(config))
-{
-    TXT_CAST_ARG(mission_config_t, config);
-
-    SetMission(config);
-    game_selected_callback();
-}
-
-static void OpenGameSelectDialog(GameSelectCallback callback)
-{
-    mission_config_t *mission = NULL;
-    txt_window_t *window;
-    const iwad_t **iwads;
-    int num_games;
-    int i;
-
-    window = TXT_NewWindow("Select game");
-
-    TXT_AddWidget(window, TXT_NewLabel("Select a game to configure:\n"));
-    num_games = 0;
-
-    // Add a button for each game.
-
-    for (i=0; i<arrlen(mission_configs); ++i)
-    {
-        // Do we have any IWADs for this game installed?
-        // If so, add a button.
-
-        iwads = D_FindAllIWADs(mission_configs[i].mask);
-
-        if (iwads[0] != NULL)
-        {
-            mission = &mission_configs[i];
-            TXT_AddWidget(window, TXT_NewButton2(mission_configs[i].label,
-                                                 GameSelected,
-                                                 &mission_configs[i]));
-            ++num_games;
-        }
-
-        free(iwads);
-    }
-
-    TXT_AddWidget(window, TXT_NewStrut(0, 1));
-
-    // No IWADs found at all?  Fall back to doom, then.
-
-    if (num_games == 0)
-    {
-        TXT_CloseWindow(window);
-        SetMission(DEFAULT_MISSION);
-        callback();
-        return;
-    }
-
-    // Only one game? Use that game, and don't bother with a dialog.
-
-    if (num_games == 1)
-    {
-        TXT_CloseWindow(window);
-        SetMission(mission);
-        callback();
-        return;
-    }
-
-    game_selected_callback = callback;
-}
-
-void SetupMission(GameSelectCallback callback)
-{
-    mission_config_t *config;
-    const char *mission_name;
-    int p;
-
-    //!
-    // @arg <game>
-    //
-    // Specify the game to configure the settings for.  Valid
-    // values are 'doom', 'heretic', 'hexen' and 'strife'.
-    //
-
-    p = M_CheckParm("-game");
-
-    if (p > 0)
-    {
-        mission_name = myargv[p + 1];
-
-        config = GetMissionForName(mission_name);
-
-        if (config == NULL)
-        {
-            I_Error("Invalid parameter - '%s'", mission_name);
-        }
-
-        SetMission(config);
-        callback();
-    }
-    else if (!CheckExecutableName(callback))
-    {
-        OpenGameSelectDialog(callback);
-    }
-}
-
-const char *GetExecutableName(void)
-{
-    return executable;
-}
-
-const char *GetGameTitle(void)
-{
-    return game_title;
-}
-
-const iwad_t **GetIwads(void)
-{
-    return iwads;
-}
-
diff --git a/games/NXDoom/src/setup/mode.h b/games/NXDoom/src/setup/mode.h
deleted file mode 100644
index 2687a4889..000000000
--- a/games/NXDoom/src/setup/mode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_MODE_H
-#define SETUP_MODE_H
-
-#include "d_mode.h"
-#include "d_iwad.h"
-
-typedef void (*GameSelectCallback)(void);
-extern GameMission_t gamemission;
-
-void SetupMission(GameSelectCallback callback);
-void InitBindings(void);
-const char *GetExecutableName(void);
-const char *GetGameTitle(void);
-const iwad_t **GetIwads(void);
-
-#endif /* #ifndef SETUP_MODE_H */
-
diff --git a/games/NXDoom/src/setup/mouse.c b/games/NXDoom/src/setup/mouse.c
deleted file mode 100644
index 95a833209..000000000
--- a/games/NXDoom/src/setup/mouse.c
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdlib.h>
-
-#include "textscreen.h"
-#include "doomtype.h"
-#include "m_config.h"
-#include "m_controls.h"
-
-#include "execute.h"
-#include "txt_mouseinput.h"
-
-#include "mode.h"
-#include "mouse.h"
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-mouse"
-
-static int usemouse = 1;
-
-static int mouseSensitivity = 5;
-static float mouse_acceleration = 2.0;
-static int mouse_threshold = 10;
-static int grabmouse = 1;
-
-int novert = 0;
-
-static int *all_mouse_buttons[] = {
-    &mousebfire,
-    &mousebstrafe,
-    &mousebforward,
-    &mousebstrafeleft,
-    &mousebstraferight,
-    &mousebbackward,
-    &mousebuse,
-    &mousebjump,
-    &mousebprevweapon,
-    &mousebnextweapon,
-    &mousebspeed,
-    &mousebinvleft,
-    &mousebinvright,
-    &mousebuseartifact,
-    &mousebturnleft,
-    &mousebturnright,
-};
-
-static void MouseSetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
-{
-    TXT_CAST_ARG(int, variable);
-    unsigned int i;
-
-    // Check if the same mouse button is used for a different action
-    // If so, set the other action(s) to -1 (unset)
-
-    for (i=0; i<arrlen(all_mouse_buttons); ++i)
-    {
-        if (*all_mouse_buttons[i] == *variable
-         && all_mouse_buttons[i] != variable)
-        {
-            *all_mouse_buttons[i] = -1;
-        }
-    }
-}
-
-static void AddMouseControl(TXT_UNCAST_ARG(table), const char *label, int *var)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_mouse_input_t *mouse_input;
-
-    TXT_AddWidget(table, TXT_NewLabel(label));
-
-    mouse_input = TXT_NewMouseInput(var);
-    TXT_AddWidget(table, mouse_input);
-
-    TXT_SignalConnect(mouse_input, "set", MouseSetCallback, var);
-}
-
-static void ConfigExtraButtons(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    txt_window_t *window;
-    txt_table_t *buttons_table;
-
-    window = TXT_NewWindow("Additional mouse buttons");
-
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_AddWidgets(window,
-                   buttons_table = TXT_NewTable(4),
-                   NULL);
-
-    TXT_SetColumnWidths(buttons_table, 16, 11, 16, 10);
-
-    AddMouseControl(buttons_table, "Move forward", &mousebforward);
-    AddMouseControl(buttons_table, "Strafe left", &mousebstrafeleft);
-    AddMouseControl(buttons_table, "Move backward", &mousebbackward);
-    AddMouseControl(buttons_table, "Strafe right", &mousebstraferight);
-    AddMouseControl(buttons_table, "Previous weapon", &mousebprevweapon);
-    AddMouseControl(buttons_table, "Strafe on", &mousebstrafe);
-    AddMouseControl(buttons_table, "Next weapon", &mousebnextweapon);
-    AddMouseControl(buttons_table, "Run", &mousebspeed);
-    
-    if (gamemission == heretic || gamemission == hexen)
-    {
-      AddMouseControl(buttons_table, "Inventory left", &mousebinvleft);
-      AddMouseControl(buttons_table, "Inventory right", &mousebinvright);
-      AddMouseControl(buttons_table, "Use artifact", &mousebuseartifact);
-    }
-
-    if (gamemission == hexen || gamemission == strife)
-    {
-        AddMouseControl(buttons_table, "Jump", &mousebjump);
-    }
-}
-
-void ConfigMouse(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-
-    window = TXT_NewWindow("Mouse configuration");
-
-    TXT_SetTableColumns(window, 2);
-
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_AddWidgets(window,
-                   TXT_NewCheckBox("Enable mouse", &usemouse),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewInvertedCheckBox("Allow vertical mouse movement", 
-                                           &novert),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewCheckBox("Grab mouse in windowed mode", 
-                                   &grabmouse),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewCheckBox("Double click acts as \"use\"",
-                                   &dclick_use),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-
-                   TXT_NewSeparator("Mouse motion"),
-                   TXT_NewLabel("Speed"),
-                   TXT_NewSpinControl(&mouseSensitivity, 1, 256),
-                   TXT_NewLabel("Acceleration"),
-                   TXT_NewFloatSpinControl(&mouse_acceleration, 1.0, 5.0),
-                   TXT_NewLabel("Acceleration threshold"),
-                   TXT_NewSpinControl(&mouse_threshold, 0, 32),
-
-                   TXT_NewSeparator("Buttons"),
-                   NULL);
-
-    AddMouseControl(window, "Fire/Attack", &mousebfire);
-    AddMouseControl(window, "Use", &mousebuse);
-
-    TXT_AddWidget(window,
-                  TXT_NewButton2("More controls...", ConfigExtraButtons, NULL));
-}
-
-void BindMouseVariables(void)
-{
-    M_BindIntVariable("use_mouse",               &usemouse);
-    M_BindIntVariable("novert",                  &novert);
-    M_BindIntVariable("grabmouse",               &grabmouse);
-    M_BindIntVariable("mouse_sensitivity",       &mouseSensitivity);
-    M_BindIntVariable("mouse_threshold",         &mouse_threshold);
-    M_BindFloatVariable("mouse_acceleration",    &mouse_acceleration);
-}
diff --git a/games/NXDoom/src/setup/mouse.h b/games/NXDoom/src/setup/mouse.h
deleted file mode 100644
index bc32bd555..000000000
--- a/games/NXDoom/src/setup/mouse.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_MOUSE_H
-#define SETUP_MOUSE_H
-
-void ConfigMouse(void *widget, void *user_data);
-void BindMouseVariables(void);
-
-extern int novert;
-
-#endif /* #ifndef SETUP_MOUSE_H */
diff --git a/games/NXDoom/src/setup/multiplayer.c b/games/NXDoom/src/setup/multiplayer.c
deleted file mode 100644
index dfb2d2666..000000000
--- a/games/NXDoom/src/setup/multiplayer.c
+++ /dev/null
@@ -1,1191 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-
-#include "textscreen.h"
-
-#include "d_iwad.h"
-#include "m_config.h"
-#include "m_misc.h"
-#include "doom/d_englsh.h"
-#include "m_controls.h"
-
-#include "multiplayer.h"
-#include "mode.h"
-#include "execute.h"
-
-#include "net_io.h"
-#include "net_query.h"
-
-#include "net_petname.h"
-
-#define MULTI_START_HELP_URL "https://www.chocolate-doom.org/setup-multi-start"
-#define MULTI_JOIN_HELP_URL "https://www.chocolate-doom.org/setup-multi-join"
-#define MULTI_CONFIG_HELP_URL "https://www.chocolate-doom.org/setup-multi-config"
-#define LEVEL_WARP_HELP_URL "https://www.chocolate-doom.org/setup-level-warp"
-
-#define NUM_WADS 10
-#define NUM_EXTRA_PARAMS 10
-
-typedef enum
-{
-    WARP_ExMy,
-    WARP_MAPxy,
-} warptype_t;
-
-// Fallback IWADs to use if no IWADs are detected.
-
-static const iwad_t fallback_iwads[] = {
-    { "doom.wad",     doom,     registered,  "Doom" },
-    { "heretic.wad",  heretic,  retail,      "Heretic" },
-    { "hexen.wad",    hexen,    commercial,  "Hexen" },
-    { "strife1.wad",  strife,   commercial,  "Strife" },
-};
-
-// Array of IWADs found to be installed
-
-static const iwad_t **found_iwads;
-static const char **iwad_labels;
-
-// Index of the currently selected IWAD
-
-static int found_iwad_selected = -1;
-
-// Filename to pass to '-iwad'.
-
-static const char *iwadfile;
-
-static const char *wad_extensions[] = { "wad", "lmp", "deh", NULL };
-
-static const char *doom_skills[] =
-{
-    "I'm too young to die.", "Hey, not too rough.", "Hurt me plenty.",
-    "Ultra-Violence.", "NIGHTMARE!",
-};
-
-static const char *chex_skills[] =
-{
-    "Easy does it", "Not so sticky", "Gobs of goo", "Extreme ooze",
-    "SUPER SLIMEY!"
-};
-
-static const char *heretic_skills[] =
-{
-    "Thou needeth a wet-nurse", "Yellowbellies-R-us", "Bringest them oneth",
-    "Thou art a smite-meister", "Black plague possesses thee"
-};
-
-static const char *hexen_fighter_skills[] =
-{
-    "Squire", "Knight", "Warrior", "Berserker", "Titan"
-};
-
-static const char *hexen_cleric_skills[] =
-{
-    "Altar boy", "Acolyte", "Priest", "Cardinal", "Pope"
-};
-
-static const char *hexen_mage_skills[] =
-{
-    "Apprentice", "Enchanter", "Sorceror", "Warlock", "Archimage"
-};
-
-static const char *strife_skills[] =
-{
-    "Training", "Rookie", "Veteran", "Elite", "Bloodbath"
-};
-
-static const char *character_classes[] = { "Fighter", "Cleric", "Mage" };
-
-static const char *gamemodes[] = { "Co-operative", "Deathmatch", "Deathmatch 2.0" };
-
-static const char *strife_gamemodes[] =
-{
-    "Normal deathmatch",
-    "Items respawn", // (altdeath)
-};
-
-static char *net_player_name;
-static char *chat_macros[10];
-
-static char *wads[NUM_WADS];
-static char *extra_params[NUM_EXTRA_PARAMS];
-static int character_class = 0;
-static int skill = 2;
-static int nomonsters = 0;
-static int deathmatch = 0;
-static int strife_altdeath = 0;
-static int fast = 0;
-static int respawn = 0;
-static int udpport = 2342;
-static int timer = 0;
-static int privateserver = 0;
-
-static txt_dropdown_list_t *skillbutton;
-static txt_button_t *warpbutton;
-static warptype_t warptype = WARP_MAPxy;
-static int warpepisode = 1;
-static int warpmap = 1;
-
-// Address to connect to when joining a game
-
-static char *connect_address = NULL;
-
-static txt_window_t *query_window;
-static int query_servers_found;
-
-// Find an IWAD from its description
-
-static const iwad_t *GetCurrentIWAD(void)
-{
-    return found_iwads[found_iwad_selected];
-}
-
-// Is the currently selected IWAD the Chex Quest chex.wad?
-
-static boolean IsChexQuest(const iwad_t *iwad)
-{
-    return !strcmp(iwad->name, "chex.wad");
-}
-
-static void AddWADs(execute_context_t *exec)
-{
-    int have_wads = 0;
-    int i;
- 
-    for (i=0; i<NUM_WADS; ++i)
-    {
-        if (wads[i] != NULL && strlen(wads[i]) > 0)
-        {
-            if (!have_wads)
-            {
-                AddCmdLineParameter(exec, "-merge");
-                have_wads = 1;
-            }
-
-            AddCmdLineParameter(exec, "\"%s\"", wads[i]);
-        }
-    }
-}
-
-static void AddExtraParameters(execute_context_t *exec)
-{
-    int i;
-    
-    for (i=0; i<NUM_EXTRA_PARAMS; ++i)
-    {
-        if (extra_params[i] != NULL && strlen(extra_params[i]) > 0)
-        {
-            AddCmdLineParameter(exec, "%s", extra_params[i]);
-        }
-    }
-}
-
-static void AddIWADParameter(execute_context_t *exec)
-{
-    if (iwadfile != NULL)
-    {
-        AddCmdLineParameter(exec, "-iwad %s", iwadfile);
-    }
-}
-
-// Callback function invoked to launch the game.
-// This is used when starting a server and also when starting a
-// single player game via the "warp" menu.
-
-static void StartGame(int multiplayer)
-{
-    execute_context_t *exec;
-
-    exec = NewExecuteContext();
-
-    // Extra parameters come first, before all others; this way,
-    // they can override any of the options set in the dialog.
-
-    AddExtraParameters(exec);
-
-    AddIWADParameter(exec);
-    AddCmdLineParameter(exec, "-skill %i", skill + 1);
-
-    if (gamemission == hexen)
-    {
-        AddCmdLineParameter(exec, "-class %i", character_class);
-    }
-
-    if (nomonsters)
-    {
-        AddCmdLineParameter(exec, "-nomonsters");
-    }
-
-    if (fast)
-    {
-        AddCmdLineParameter(exec, "-fast");
-    }
-
-    if (respawn)
-    {
-        AddCmdLineParameter(exec, "-respawn");
-    }
-
-    if (warptype == WARP_ExMy)
-    {
-        // TODO: select IWAD based on warp type
-        AddCmdLineParameter(exec, "-warp %i %i", warpepisode, warpmap);
-    }
-    else if (warptype == WARP_MAPxy)
-    {
-        AddCmdLineParameter(exec, "-warp %i", warpmap);
-    }
-
-    // Multiplayer-specific options:
-
-    if (multiplayer)
-    {
-        AddCmdLineParameter(exec, "-server");
-        AddCmdLineParameter(exec, "-port %i", udpport);
-
-        if (deathmatch == 1)
-        {
-            AddCmdLineParameter(exec, "-deathmatch");
-        }
-        else if (deathmatch == 2 || strife_altdeath != 0)
-        {
-            AddCmdLineParameter(exec, "-altdeath");
-        }
-
-        if (timer > 0)
-        {
-            AddCmdLineParameter(exec, "-timer %i", timer);
-        }
-
-        if (privateserver)
-        {
-            AddCmdLineParameter(exec, "-privateserver");
-        }
-    }
-
-    AddWADs(exec);
-
-    TXT_Shutdown();
- 
-    M_SaveDefaults();
-    PassThroughArguments(exec);
-
-    ExecuteDoom(exec);
-
-    exit(0);
-}
-
-static void StartServerGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    StartGame(1);
-}
-
-static void StartSinglePlayerGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    StartGame(0);
-}
-
-static void UpdateWarpButton(void)
-{
-    char buf[10];
-
-    if (warptype == WARP_ExMy)
-    {
-        M_snprintf(buf, sizeof(buf), "E%iM%i", warpepisode, warpmap);
-    }
-    else if (warptype == WARP_MAPxy)
-    {
-        M_snprintf(buf, sizeof(buf), "MAP%02i", warpmap);
-    }
-
-    TXT_SetButtonLabel(warpbutton, buf);
-}
-
-static void UpdateSkillButton(void)
-{
-    const iwad_t *iwad = GetCurrentIWAD();
-
-    if (IsChexQuest(iwad))
-    {
-        skillbutton->values = chex_skills;
-    }
-    else switch(gamemission)
-    {
-        default:
-        case doom:
-            skillbutton->values = doom_skills;
-            break;
-
-        case heretic:
-            skillbutton->values = heretic_skills;
-            break;
-
-        case hexen:
-            if (character_class == 0)
-            {
-                skillbutton->values = hexen_fighter_skills;
-            }
-            else if (character_class == 1)
-            {
-                skillbutton->values = hexen_cleric_skills;
-            }
-            else
-            {
-                skillbutton->values = hexen_mage_skills;
-            }
-            break;
-
-        case strife:
-            skillbutton->values = strife_skills;
-            break;
-    }
-}
-
-static void SetExMyWarp(TXT_UNCAST_ARG(widget), void *val)
-{
-    int l;
-
-    l = (intptr_t) val;
-
-    warpepisode = l / 10;
-    warpmap = l % 10;
-
-    UpdateWarpButton();
-}
-
-static void SetMAPxyWarp(TXT_UNCAST_ARG(widget), void *val)
-{
-    int l;
-
-    l = (intptr_t) val;
-
-    warpmap = l;
-
-    UpdateWarpButton();
-}
-
-static void CloseLevelSelectDialog(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(window))
-{
-    TXT_CAST_ARG(txt_window_t, window);
-
-    TXT_CloseWindow(window);
-}
-
-static void LevelSelectDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
-{
-    txt_window_t *window;
-    txt_button_t *button;
-    const iwad_t *iwad;
-    char buf[10];
-    int episodes;
-    int x, y;
-    int l;
-    int i;
-
-    window = TXT_NewWindow("Select level");
-    iwad = GetCurrentIWAD();
-
-    if (warptype == WARP_ExMy)
-    {
-        episodes = D_GetNumEpisodes(iwad->mission, iwad->mode);
-        TXT_SetTableColumns(window, episodes);
-
-        // ExMy levels
-
-        for (y=1; y<10; ++y)
-        {
-            for (x=1; x<=episodes; ++x)
-            {
-                if (IsChexQuest(iwad) && (x > 1 || y > 5))
-                {
-                    continue;
-                }
-
-                if (!D_ValidEpisodeMap(iwad->mission, iwad->mode, x, y))
-                {
-                    TXT_AddWidget(window, NULL);
-                    continue;
-                }
-
-                M_snprintf(buf, sizeof(buf),
-                           " E%dM%d ", x, y);
-                button = TXT_NewButton(buf);
-                TXT_SignalConnect(button, "pressed",
-                                  SetExMyWarp, (void *) (intptr_t) (x * 10 + y));
-                TXT_SignalConnect(button, "pressed",
-                                  CloseLevelSelectDialog, window);
-                TXT_AddWidget(window, button);
-
-                if (warpepisode == x && warpmap == y)
-                {
-                    TXT_SelectWidget(window, button);
-                }
-            }
-        }
-    }
-    else
-    {
-        TXT_SetTableColumns(window, 6);
-
-        for (i=0; i<60; ++i)
-        {
-            x = i % 6;
-            y = i / 6;
-
-            l = x * 10 + y + 1;
-
-            if (!D_ValidEpisodeMap(iwad->mission, iwad->mode, 1, l))
-            {
-                TXT_AddWidget(window, NULL);
-                continue;
-            }
-
-            M_snprintf(buf, sizeof(buf), " MAP%02d ", l);
-            button = TXT_NewButton(buf);
-            TXT_SignalConnect(button, "pressed", 
-                              SetMAPxyWarp, (void *) (intptr_t) l);
-            TXT_SignalConnect(button, "pressed",
-                              CloseLevelSelectDialog, window);
-            TXT_AddWidget(window, button);
-
-            if (warpmap == l)
-            {
-                TXT_SelectWidget(window, button);
-            }
-        }
-    }
-}
-
-static void IWADSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    const iwad_t *iwad;
-
-    // Find the iwad_t selected
-
-    iwad = GetCurrentIWAD();
-
-    // Update iwadfile
-
-    iwadfile = iwad->name;
-}
-
-// Called when the IWAD button is changed, to update warptype.
-
-static void UpdateWarpType(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    warptype_t new_warptype;
-    const iwad_t *iwad;
-
-    // Get the selected IWAD
-
-    iwad = GetCurrentIWAD();
-
-    // Find the new warp type
-
-    if (D_IsEpisodeMap(iwad->mission))
-    {
-        new_warptype = WARP_ExMy;
-    }
-    else
-    {
-        new_warptype = WARP_MAPxy;
-    }
-
-    // Reset to E1M1 / MAP01 when the warp type is changed.
-
-    if (new_warptype != warptype)
-    {
-        warpepisode = 1;
-        warpmap = 1;
-    }
-
-    warptype = new_warptype;
-
-    UpdateWarpButton();
-    UpdateSkillButton();
-}
-
-// Get an IWAD list with a default fallback IWAD that is appropriate
-// for the game we are configuring (matches gamemission global variable).
-
-static const iwad_t **GetFallbackIwadList(void)
-{
-    static const iwad_t *fallback_iwad_list[2];
-    unsigned int i;
-
-    // Default to use if we don't find something better.
-
-    fallback_iwad_list[0] = &fallback_iwads[0];
-    fallback_iwad_list[1] = NULL;
-
-    for (i = 0; i < arrlen(fallback_iwads); ++i)
-    {
-        if (gamemission == fallback_iwads[i].mission)
-        {
-            fallback_iwad_list[0] = &fallback_iwads[i];
-            break;
-        }
-    }
-
-    return fallback_iwad_list;
-}
-
-static txt_widget_t *IWADSelector(void)
-{
-    txt_dropdown_list_t *dropdown;
-    txt_widget_t *result;
-    int num_iwads;
-    unsigned int i;
-
-    // Find out what WADs are installed
-
-    found_iwads = GetIwads();
-
-    // Build a list of the descriptions for all installed IWADs
-
-    num_iwads = 0;
-
-    for (i=0; found_iwads[i] != NULL; ++i)
-    {
-         ++num_iwads;
-    }
-
-    iwad_labels = malloc(sizeof(*iwad_labels) * num_iwads);
-
-    for (i=0; i < num_iwads; ++i)
-    {
-        iwad_labels[i] = found_iwads[i]->description;
-    }
-
-    // If no IWADs are found, provide Doom 2 as an option, but
-    // we're probably screwed.
-
-    if (num_iwads == 0)
-    {
-        found_iwads = GetFallbackIwadList();
-        num_iwads = 1;
-    }
-
-    // Build a dropdown list of IWADs
-
-    if (num_iwads < 2)
-    {
-        // We have only one IWAD.  Show as a label.
-
-        result = (txt_widget_t *) TXT_NewLabel(found_iwads[0]->description);
-    }
-    else
-    {
-        // Dropdown list allowing IWAD to be selected.
-
-        dropdown = TXT_NewDropdownList(&found_iwad_selected, 
-                                       iwad_labels, num_iwads);
-
-        TXT_SignalConnect(dropdown, "changed", IWADSelected, NULL);
-
-        result = (txt_widget_t *) dropdown;
-    }
-
-    // The first time the dialog is opened, found_iwad_selected=-1,
-    // so select the first IWAD in the list. Don't lose the setting
-    // if we close and reopen the dialog.
-
-    if (found_iwad_selected < 0 || found_iwad_selected >= num_iwads)
-    {
-        found_iwad_selected = 0;
-    }
-
-    IWADSelected(NULL, NULL);
-
-    return result;
-}
-
-// Create the window action button to start the game.  This invokes
-// a different callback depending on whether to start a multiplayer
-// or single player game.
-
-static txt_window_action_t *StartGameAction(int multiplayer)
-{
-    txt_window_action_t *action;
-    TxtWidgetSignalFunc callback;
-
-    action = TXT_NewWindowAction(KEY_F10, "Start");
-
-    if (multiplayer)
-    {
-        callback = StartServerGame;
-    }
-    else
-    {
-        callback = StartSinglePlayerGame;
-    }
-
-    TXT_SignalConnect(action, "pressed", callback, NULL);
-
-    return action;
-}
-
-static void OpenWadsWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
-{
-    txt_window_t *window;
-    int i;
-
-    window = TXT_NewWindow("Add WADs");
-
-    for (i=0; i<NUM_WADS; ++i)
-    {
-        TXT_AddWidget(window,
-                      TXT_NewFileSelector(&wads[i], 60, "Select a WAD file",
-                                          wad_extensions));
-    }
-}
-
-static void OpenExtraParamsWindow(TXT_UNCAST_ARG(widget), 
-                                  TXT_UNCAST_ARG(user_data))
-{
-    txt_window_t *window;
-    int i;
-
-    window = TXT_NewWindow("Extra command line parameters");
-    
-    for (i=0; i<NUM_EXTRA_PARAMS; ++i)
-    {
-        TXT_AddWidget(window, TXT_NewInputBox(&extra_params[i], 70));
-    }
-}
-
-static txt_window_action_t *WadWindowAction(void)
-{
-    txt_window_action_t *action;
-
-    action = TXT_NewWindowAction('w', "Add WADs");
-    TXT_SignalConnect(action, "pressed", OpenWadsWindow, NULL);
-
-    return action;
-}
-
-static txt_dropdown_list_t *GameTypeDropdown(void)
-{
-    switch (gamemission)
-    {
-        case doom:
-        default:
-            return TXT_NewDropdownList(&deathmatch, gamemodes, 3);
-
-        // Heretic and Hexen don't support Deathmatch II:
-
-        case heretic:
-        case hexen:
-            return TXT_NewDropdownList(&deathmatch, gamemodes, 2);
-
-        // Strife supports both deathmatch modes, but doesn't support
-        // multiplayer co-op. Use a different variable to indicate whether
-        // to use altdeath or not.
-
-        case strife:
-            return TXT_NewDropdownList(&strife_altdeath, strife_gamemodes, 2);
-    }
-}
-
-// "Start game" menu.  This is used for the start server window
-// and the single player warp menu.  The parameters specify
-// the window title and whether to display multiplayer options.
-
-static void StartGameMenu(const char *window_title, int multiplayer)
-{
-    txt_window_t *window;
-    txt_widget_t *iwad_selector;
-
-    window = TXT_NewWindow(window_title);
-    TXT_SetTableColumns(window, 2);
-    TXT_SetColumnWidths(window, 12, 6);
-
-    if (multiplayer)
-    {
-        TXT_SetWindowHelpURL(window, MULTI_START_HELP_URL);
-    }
-    else
-    {
-        TXT_SetWindowHelpURL(window, LEVEL_WARP_HELP_URL);
-    }
-
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, WadWindowAction());
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, StartGameAction(multiplayer));
-
-    TXT_AddWidgets(window,
-                   TXT_NewLabel("Game"),
-                   iwad_selector = IWADSelector(),
-                   NULL);
-
-    if (gamemission == hexen)
-    {
-        txt_dropdown_list_t *cc_dropdown;
-        TXT_AddWidgets(window,
-                       TXT_NewLabel("Character class "),
-                       cc_dropdown = TXT_NewDropdownList(&character_class,
-                                                         character_classes, 3),
-                       NULL);
-
-        // Update skill level dropdown when the character class is changed:
-
-        TXT_SignalConnect(cc_dropdown, "changed", UpdateWarpType, NULL);
-    }
-
-    TXT_AddWidgets(window,
-                   TXT_NewLabel("Skill"),
-                   skillbutton = TXT_NewDropdownList(&skill, doom_skills, 5),
-                   TXT_NewLabel("Level warp"),
-                   warpbutton = TXT_NewButton2("?", LevelSelectDialog, NULL),
-                   NULL);
-
-    if (multiplayer)
-    {
-        TXT_AddWidgets(window,
-               TXT_NewLabel("Game type"),
-               GameTypeDropdown(),
-               TXT_NewLabel("Time limit"),
-               TXT_NewHorizBox(TXT_NewIntInputBox(&timer, 2),
-                               TXT_NewLabel("minutes"),
-                               NULL),
-               NULL);
-    }
-
-    TXT_AddWidgets(window,
-                   TXT_NewSeparator("Monster options"),
-                   TXT_NewInvertedCheckBox("Monsters enabled", &nomonsters),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewCheckBox("Fast monsters", &fast),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewCheckBox("Respawning monsters", &respawn),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   NULL);
-
-    if (multiplayer)
-    {
-        TXT_AddWidgets(window,
-                       TXT_NewSeparator("Advanced"),
-                       TXT_NewLabel("UDP port"),
-                       TXT_NewIntInputBox(&udpport, 5),
-                       TXT_NewInvertedCheckBox("Register with master server",
-                                               &privateserver),
-                       TXT_TABLE_OVERFLOW_RIGHT,
-                       NULL);
-    }
-
-    TXT_AddWidgets(window,
-                   TXT_NewButton2("Add extra parameters...",
-                                  OpenExtraParamsWindow, NULL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   NULL);
-
-    TXT_SignalConnect(iwad_selector, "changed", UpdateWarpType, NULL);
-
-    UpdateWarpType(NULL, NULL);
-    UpdateWarpButton();
-}
-
-void StartMultiGame(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    StartGameMenu("Start multiplayer game", 1);
-}
-
-void WarpMenu(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    StartGameMenu("Level Warp", 0);
-}
-
-static void DoJoinGame(void *unused1, void *unused2)
-{
-    execute_context_t *exec;
-
-    if (connect_address == NULL || strlen(connect_address) <= 0)
-    {
-        TXT_MessageBox(NULL, "Please enter a server address\n"
-                             "to connect to.");
-        return;
-    }
-
-    exec = NewExecuteContext();
-
-    AddCmdLineParameter(exec, "-connect %s", connect_address);
-
-    if (gamemission == hexen)
-    {
-        AddCmdLineParameter(exec, "-class %i", character_class);
-    }
-
-    // Extra parameters come first, so that they can be used to override
-    // the other parameters.
-
-    AddExtraParameters(exec);
-    AddIWADParameter(exec);
-    AddWADs(exec);
-
-    TXT_Shutdown();
-    
-    M_SaveDefaults();
-
-    PassThroughArguments(exec);
-
-    ExecuteDoom(exec);
-
-    exit(0);
-}
-
-static txt_window_action_t *JoinGameAction(void)
-{
-    txt_window_action_t *action;
-
-    action = TXT_NewWindowAction(KEY_F10, "Connect");
-    TXT_SignalConnect(action, "pressed", DoJoinGame, NULL);
-
-    return action;
-}
-
-static void SelectQueryAddress(TXT_UNCAST_ARG(button),
-                               TXT_UNCAST_ARG(querydata))
-{
-    TXT_CAST_ARG(txt_button_t, button);
-    TXT_CAST_ARG(net_querydata_t, querydata);
-    int i;
-
-    if (querydata->server_state != 0)
-    {
-        TXT_MessageBox("Cannot connect to server",
-                       "Gameplay is already in progress\n"
-                       "on this server.");
-        return;
-    }
-
-    // Set address to connect to:
-
-    free(connect_address);
-    connect_address = M_StringDuplicate(button->label);
-
-    // Auto-choose IWAD if there is already a player connected.
-
-    if (querydata->num_players > 0)
-    {
-        for (i = 0; found_iwads[i] != NULL; ++i)
-        {
-            if (found_iwads[i]->mode == querydata->gamemode
-             && found_iwads[i]->mission == querydata->gamemission)
-            {
-                found_iwad_selected = i;
-                iwadfile = found_iwads[i]->name;
-                break;
-            }
-        }
-
-        if (found_iwads[i] == NULL)
-        {
-            TXT_MessageBox(NULL,
-                           "The game on this server seems to be:\n"
-                           "\n"
-                           "   %s\n"
-                           "\n"
-                           "but the IWAD file %s is not found!\n"
-                           "Without the required IWAD file, it may not be\n"
-                           "possible to join this game.",
-                           D_SuggestGameName(querydata->gamemission,
-                                             querydata->gamemode),
-                           D_SuggestIWADName(querydata->gamemission,
-                                             querydata->gamemode));
-        }
-    }
-
-    // Finished with search.
-
-    TXT_CloseWindow(query_window);
-}
-
-static void QueryResponseCallback(net_addr_t *addr,
-                                  net_querydata_t *querydata,
-                                  unsigned int ping_time,
-                                  TXT_UNCAST_ARG(results_table))
-{
-    TXT_CAST_ARG(txt_table_t, results_table);
-    char ping_time_str[16];
-    char description[47];
-
-    // When we connect we'll have to negotiate a common protocol that we
-    // can agree upon between the client and server. If we can't then we
-    // won't be able to connect, so it's pointless to include it in the
-    // results list. If protocol==NET_PROTOCOL_UNKNOWN then this may be
-    // an old, pre-3.0 Chocolate Doom server that doesn't support the new
-    // protocol negotiation mechanism, or it may be an incompatible fork.
-    if (querydata->protocol == NET_PROTOCOL_UNKNOWN)
-    {
-        return;
-    }
-
-    M_snprintf(ping_time_str, sizeof(ping_time_str), "%ims", ping_time);
-
-    // Build description from server name field. Because there is limited
-    // space, we only include the player count if there are already players
-    // connected to the server.
-    if (querydata->num_players > 0)
-    {
-        M_snprintf(description, sizeof(description), "(%d/%d) ",
-                   querydata->num_players, querydata->max_players);
-    }
-    else
-    {
-        M_StringCopy(description, "", sizeof(description));
-    }
-
-    M_StringConcat(description, querydata->description, sizeof(description));
-
-    TXT_AddWidgets(results_table,
-                   TXT_NewLabel(ping_time_str),
-                   TXT_NewButton2(NET_AddrToString(addr),
-                                  SelectQueryAddress, querydata),
-                   TXT_NewLabel(description),
-                   NULL);
-
-    ++query_servers_found;
-}
-
-static void QueryPeriodicCallback(TXT_UNCAST_ARG(results_table))
-{
-    TXT_CAST_ARG(txt_table_t, results_table);
-
-    if (!NET_Query_Poll(QueryResponseCallback, results_table))
-    {
-        TXT_SetPeriodicCallback(NULL, NULL, 0);
-
-        if (query_servers_found == 0)
-        {
-            TXT_AddWidgets(results_table,
-                TXT_TABLE_EMPTY,
-                TXT_NewLabel("No compatible servers found."),
-                NULL
-            );
-        }
-    }
-}
-
-static void QueryWindowClosed(TXT_UNCAST_ARG(window), void *unused)
-{
-    TXT_SetPeriodicCallback(NULL, NULL, 0);
-}
-
-static void ServerQueryWindow(const char *title)
-{
-    txt_table_t *results_table;
-
-    query_servers_found = 0;
-
-    query_window = TXT_NewWindow(title);
-
-    TXT_AddWidget(query_window,
-                  TXT_NewScrollPane(70, 10,
-                                    results_table = TXT_NewTable(3)));
-
-    TXT_SetColumnWidths(results_table, 7, 22, 40);
-    TXT_SetPeriodicCallback(QueryPeriodicCallback, results_table, 1);
-
-    TXT_SignalConnect(query_window, "closed", QueryWindowClosed, NULL);
-}
-
-static void FindInternetServer(TXT_UNCAST_ARG(widget),
-                               TXT_UNCAST_ARG(user_data))
-{
-    NET_StartMasterQuery();
-    ServerQueryWindow("Find Internet server");
-}
-
-static void FindLANServer(TXT_UNCAST_ARG(widget),
-                          TXT_UNCAST_ARG(user_data))
-{
-    NET_StartLANQuery();
-    ServerQueryWindow("Find LAN server");
-}
-
-void JoinMultiGame(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-    txt_inputbox_t *address_box;
-
-    window = TXT_NewWindow("Join multiplayer game");
-    TXT_SetTableColumns(window, 2);
-    TXT_SetColumnWidths(window, 12, 12);
-
-    TXT_SetWindowHelpURL(window, MULTI_JOIN_HELP_URL);
-
-    TXT_AddWidgets(window,
-                   TXT_NewLabel("Game"),
-                   IWADSelector(),
-                   NULL);
-
-    if (gamemission == hexen)
-    {
-        TXT_AddWidgets(window,
-                       TXT_NewLabel("Character class "),
-                       TXT_NewDropdownList(&character_class,
-                                           character_classes, 3),
-                       NULL);
-    }
-
-    TXT_AddWidgets(window,
-                   TXT_NewSeparator("Server"),
-                   TXT_NewLabel("Connect to address: "),
-                   address_box = TXT_NewInputBox(&connect_address, 30),
-
-                   TXT_NewButton2("Find server on Internet...",
-                                  FindInternetServer, NULL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewButton2("Find server on local network...",
-                                  FindLANServer, NULL),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewStrut(0, 1),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewButton2("Add extra parameters...",
-                                  OpenExtraParamsWindow, NULL),
-                   NULL);
-
-    TXT_SelectWidget(window, address_box);
-
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, WadWindowAction());
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, JoinGameAction());
-}
-
-void SetChatMacroDefaults(void)
-{
-    int i;
-    const char *const defaults[] =
-    {
-        HUSTR_CHATMACRO0,
-        HUSTR_CHATMACRO1,
-        HUSTR_CHATMACRO2,
-        HUSTR_CHATMACRO3,
-        HUSTR_CHATMACRO4,
-        HUSTR_CHATMACRO5,
-        HUSTR_CHATMACRO6,
-        HUSTR_CHATMACRO7,
-        HUSTR_CHATMACRO8,
-        HUSTR_CHATMACRO9,
-    };
-    
-    // If the chat macros have not been set, initialize with defaults.
-
-    for (i=0; i<10; ++i)
-    {
-        if (chat_macros[i] == NULL)
-        {
-            chat_macros[i] = M_StringDuplicate(defaults[i]);
-        }
-    }
-}
-
-void SetPlayerNameDefault(void)
-{
-    if (net_player_name == NULL)
-    {
-        net_player_name = NET_GetRandomPetName();
-    }
-}
-
-void MultiplayerConfig(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-    txt_label_t *label;
-    txt_table_t *table;
-    char buf[10];
-    int i;
-
-    window = TXT_NewWindow("Multiplayer Configuration");
-    TXT_SetWindowHelpURL(window, MULTI_CONFIG_HELP_URL);
-
-    TXT_AddWidgets(window,
-                   TXT_NewStrut(0, 1),
-                   TXT_NewHorizBox(TXT_NewLabel("Player name:  "),
-                                   TXT_NewInputBox(&net_player_name, 25),
-                                   NULL),
-                   TXT_NewStrut(0, 1),
-                   TXT_NewSeparator("Chat macros"),
-                   NULL);
-
-    table = TXT_NewTable(2);
-
-    for (i=0; i<10; ++i)
-    {
-        M_snprintf(buf, sizeof(buf), "#%i ", i + 1);
-
-        label = TXT_NewLabel(buf);
-        TXT_SetFGColor(label, TXT_COLOR_BRIGHT_CYAN);
-
-        TXT_AddWidgets(table,
-                       label,
-                       TXT_NewInputBox(&chat_macros[(i + 1) % 10], 40),
-                       NULL);
-    }
-
-    TXT_AddWidget(window, table);
-}
-
-void BindMultiplayerVariables(void)
-{
-    char buf[15];
-    int i;
-
-    M_BindStringVariable("player_name", &net_player_name);
-
-    for (i=0; i<10; ++i)
-    {
-        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
-        M_BindStringVariable(buf, &chat_macros[i]);
-    }
-
-    switch (gamemission)
-    {
-        case doom:
-            M_BindChatControls(4);
-            key_multi_msgplayer[0] = 'g';
-            key_multi_msgplayer[1] = 'i';
-            key_multi_msgplayer[2] = 'b';
-            key_multi_msgplayer[3] = 'r';
-            break;
-
-        case heretic:
-            M_BindChatControls(4);
-            key_multi_msgplayer[0] = 'g';
-            key_multi_msgplayer[1] = 'y';
-            key_multi_msgplayer[2] = 'r';
-            key_multi_msgplayer[3] = 'b';
-            break;
-
-        case hexen:
-            M_BindChatControls(8);
-            key_multi_msgplayer[0] = 'b';
-            key_multi_msgplayer[1] = 'r';
-            key_multi_msgplayer[2] = 'y';
-            key_multi_msgplayer[3] = 'g';
-            key_multi_msgplayer[4] = 'j';
-            key_multi_msgplayer[5] = 'w';
-            key_multi_msgplayer[6] = 'h';
-            key_multi_msgplayer[7] = 'p';
-            break;
-
-        default:
-            break;
-    }
-}
-
diff --git a/games/NXDoom/src/setup/multiplayer.h b/games/NXDoom/src/setup/multiplayer.h
deleted file mode 100644
index 911afbd0c..000000000
--- a/games/NXDoom/src/setup/multiplayer.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_MULTIPLAYER_H
-#define SETUP_MULTIPLAYER_H
-
-void StartMultiGame(void *widget, void *user_data);
-void WarpMenu(void *widget, void *user_data);
-void JoinMultiGame(void *widget, void *user_data);
-void MultiplayerConfig(void *widget, void *user_data);
-
-void SetChatMacroDefaults(void);
-void SetPlayerNameDefault(void);
-
-void BindMultiplayerVariables(void);
-
-#endif /* #ifndef SETUP_MULTIPLAYER_H */
-
diff --git a/games/NXDoom/src/setup/setup-manifest.xml.in b/games/NXDoom/src/setup/setup-manifest.xml.in
deleted file mode 100644
index 111ad0f88..000000000
--- a/games/NXDoom/src/setup/setup-manifest.xml.in
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!-- Magic manifest file that should make Windows Vista/7 not
-     attempt to gain elevated privileges for chocolate-setup.
-     
-     Based on:
-     
-     http://www.cygwin.com/ml/cygwin/2006-12/msg00580.html
-  -->
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
-          xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
-          manifestVersion="1.0">
-
-  <!-- The "name" field in this tag should be the same as the executable's
-       name -->
-  <assemblyIdentity version="0.0.0.0" processorArchitecture="X86"
-                    name="@PROGRAM_PREFIX@setup.exe" type="win32"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <!-- Stop the Program Compatibility Assistant appearing: -->
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- 8 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- 8.1 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- 10 -->
-    </application>
-  </compatibility>
-
-  <!-- Declare app as DPI aware, so that Windows Vista and later will not
-       apply DPI virtualization. -->
-
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</assembly>
-
diff --git a/games/NXDoom/src/setup/setup_icon.c b/games/NXDoom/src/setup/setup_icon.c
deleted file mode 100644
index 748cc93e9..000000000
--- a/games/NXDoom/src/setup/setup_icon.c
+++ /dev/null
@@ -1,2736 +0,0 @@
-static int setup_icon_w = 128;
-static int setup_icon_h = 128;
-
-static const unsigned int setup_icon_data[] = {
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
-    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
-    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
-    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
-    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
-    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
-    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
-    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
-    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
-    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
-    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
-    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
-    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
-    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
-    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
-    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
-    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
-    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
-    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
-    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
-    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
-    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
-    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
-    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
-    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
-    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
-    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
-    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
-    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
-    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
-    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
-    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
-    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
-    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
-    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
-    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
-    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
-    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
-    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
-    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
-    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
-    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
-    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
-    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
-    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
-    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x93756aff, 0x90756aff, 0x8b7974ff, 0x877b7bff, 
-    0x877b7bff, 0x877b7bff, 0x877b7bff, 0x877b7bff, 0x877b7bff, 0x928888ff, 
-    0xaba3a3ff, 0xaaa3a3ff, 0xaaa3a3ff, 0xa9a2a2ff, 0xa8a2a2ff, 0xa7a1a0ff, 
-    0xa6a09fff, 0xa6a09fff, 0xa59e9eff, 0x938989ff, 0x867a7aff, 0x867a79ff, 
-    0x867a79ff, 0x867979ff, 0x857878ff, 0x837676ff, 0x817474ff, 0x7f7272ff, 
-    0x807373ff, 0x928989ff, 0x968e8eff, 0x958d8dff, 0x938b8cff, 0x918989ff, 
-    0x8e8787ff, 0x8d8585ff, 0x8c8484ff, 0x898282ff, 0x837b7bff, 0x695c5cff, 
-    0x675a5aff, 0x655959ff, 0x635657ff, 0x615455ff, 0x5f5253ff, 0x5e5152ff, 
-    0x5c4e4fff, 0x5a4c4dff, 0x665a5bff, 0x756d6dff, 0x736b6bff, 0x72696aff, 
-    0x706767ff, 0x6e6666ff, 0x6d6464ff, 0x6b6262ff, 0x685f60ff, 0x685f5fff, 
-    0x504344ff, 0x443637ff, 0x423336ff, 0x45373bff, 0x473a41ff, 0x4a3c47ff, 
-    0x4c3f4bff, 0x54424dff, 0x5e454cff, 0x674e55ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
-    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
-    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
-    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
-    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
-    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
-    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
-    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
-    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
-    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
-    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
-    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
-    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
-    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
-    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
-    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
-    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
-    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
-    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
-    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
-    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8e9faeff, 0x94a5b3ff, 
-    0x93a3b2ff, 0x93a3b2ff, 0x92a2b1ff, 0x92a1b1ff, 0x91a0b0ff, 0x90a0afff, 
-    0x8f9faeff, 0x8394a5ff, 0x647b92ff, 0x647a92ff, 0x647a92ff, 0x647a91ff, 
-    0x647a91ff, 0x647990ff, 0x637890ff, 0x637890ff, 0x637890ff, 0x78899cff, 
-    0x8795a5ff, 0x8694a4ff, 0x8694a4ff, 0x8593a3ff, 0x8490a1ff, 0x828ea0ff, 
-    0x808d9dff, 0x7f8b9cff, 0x7c899aff, 0x5c6e86ff, 0x566882ff, 0x546680ff, 
-    0x53657eff, 0x51627cff, 0x4f617aff, 0x4d5e78ff, 0x4c5d77ff, 0x495b75ff, 
-    0x4f5f77ff, 0x697486ff, 0x687384ff, 0x677183ff, 0x656f81ff, 0x636e80ff, 
-    0x626c7eff, 0x606a7cff, 0x5e697aff, 0x5c6678ff, 0x4b576dff, 0x35435fff, 
-    0x33415cff, 0x32405bff, 0x2f3d58ff, 0x2e3b57ff, 0x2c3955ff, 0x2a3854ff, 
-    0x283552ff, 0x273450ff, 0x3f485eff, 0x485063ff, 0x464f61ff, 0x475065ff, 
-    0x485067ff, 0x475169ff, 0x49526cff, 0x4a536eff, 0x4b5471ff, 0x4c5573ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x1b3f5eff, 0x1a3e60ff, 0x1a3e5fff, 0x193d5fff, 0x193c5eff, 0x193c5eff, 
-    0x183b5dff, 0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 
-    0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 
-    0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
-    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
-    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
-    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
-    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
-    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
-    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
-    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x1b3e5eff, 0x1a3e5fff, 0x193d5fff, 0x193c5eff, 
-    0x193c5eff, 0x183b5dff, 0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 
-    0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 
-    0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 
-    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
-    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
-    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
-    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
-    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
-    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
-    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
-    0x041541ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1b3e5dff, 0x193d5fff, 
-    0x193c5eff, 0x193c5eff, 0x183b5dff, 0x183a5dff, 0x183a5cff, 0x17395cff, 
-    0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 
-    0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 
-    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
-    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
-    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
-    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
-    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
-    0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
-    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
-    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x1b3d5dff, 0x193c5eff, 0x193c5eff, 0x183b5dff, 0x183a5dff, 0x183a5cff, 
-    0x17395cff, 0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 
-    0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 
-    0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
-    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
-    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
-    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
-    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
-    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 
-    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
-    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x1b3c5cff, 0x193c5eff, 0x183b5dff, 0x183a5dff, 
-    0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 
-    0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 
-    0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
-    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
-    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
-    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
-    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
-    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
-    0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 
-    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1b3c5cff, 0x183b5dff, 
-    0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 0x16375aff, 
-    0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 
-    0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 
-    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
-    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
-    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
-    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
-    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
-    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 
-    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x1a3b5bff, 0x183a5dff, 0x183a5cff, 0x17395cff, 0x17385bff, 0x17385bff, 
-    0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 
-    0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
-    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
-    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
-    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
-    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
-    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
-    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
-    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x1a3a5bff, 0x183a5cff, 0x17395cff, 0x17385bff, 
-    0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 
-    0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 
-    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
-    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
-    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
-    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
-    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
-    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
-    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
-    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1a3a5aff, 0x17395cff, 
-    0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 0x153559ff, 
-    0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 
-    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
-    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
-    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
-    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
-    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
-    0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
-    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
-    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x19395aff, 0x17385bff, 0x17385bff, 0x16375aff, 0x16375aff, 0x163659ff, 
-    0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 
-    0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
-    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
-    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
-    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
-    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
-    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 
-    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
-    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x193859ff, 0x17385bff, 0x16375aff, 0x16375aff, 
-    0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 
-    0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
-    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
-    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
-    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
-    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
-    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
-    0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 
-    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x193859ff, 0x16375aff, 
-    0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 0x143357ff, 
-    0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 
-    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
-    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
-    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
-    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
-    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
-    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 
-    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x183758ff, 0x16375aff, 0x163659ff, 0x153559ff, 0x153558ff, 0x153458ff, 
-    0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
-    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
-    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
-    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x36496aff, 
-    0xadb5c3ff, 0xbec4cfff, 0xbec4cfff, 0xbec4cfff, 0xbec4cfff, 0xbec4ceff, 
-    0xbec4ceff, 0xacb3c1ff, 0x324364ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
-    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
-    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x183758ff, 0x163659ff, 0x153559ff, 0x153558ff, 
-    0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 
-    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
-    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
-    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
-    0x0d244cff, 0xc9ced7ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xc7cad0ff, 0x081b41ff, 
-    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
-    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
-    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x183657ff, 0x153559ff, 
-    0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 0x133156ff, 
-    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
-    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
-    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
-    0x0d254dff, 0x0d244cff, 0x0c244cff, 0xf4f5f7ff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xf4f5f6ff, 0x06122cff, 0x071a40ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
-    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
-    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x173557ff, 0x153558ff, 0x153458ff, 0x143357ff, 0x143357ff, 0x143256ff, 
-    0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
-    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
-    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
-    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x20355aff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfdfdfdff, 0x19243bff, 0x05112cff, 0x06193fff, 
-    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
-    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x173556ff, 0x153458ff, 0x143357ff, 0x143357ff, 
-    0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
-    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
-    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
-    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
-    0x3f5070ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0x374054ff, 
-    0x041029ff, 0x04102bff, 0x06173eff, 0x061944ff, 0x061843ff, 0x061743ff, 
-    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x173456ff, 0x143357ff, 
-    0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 0x122f55ff, 
-    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
-    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
-    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
-    0x0c234bff, 0x0c224bff, 0x5c6c86ff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 
-    0xfafafaff, 0x565e6eff, 0x041029ff, 0x040f29ff, 0x04102bff, 0x06163dff, 
-    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x163355ff, 0x143357ff, 0x143256ff, 0x133156ff, 0x133156ff, 0x133055ff, 
-    0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
-    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
-    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
-    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x7b879dff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 
-    0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0x737a87ff, 0x040f29ff, 0x040f29ff, 
-    0x040e28ff, 0x040e2aff, 0x05153dff, 0x051642ff, 0x051641ff, 0x041541ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x163355ff, 0x143256ff, 0x133156ff, 0x133156ff, 
-    0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
-    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
-    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
-    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x132850ff, 
-    0xaeb5c2ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xa5a9b2ff, 
-    0x0d1731ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 0x030e2aff, 0x05143cff, 
-    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x163254ff, 0x133156ff, 
-    0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 
-    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
-    0x0f2950ff, 0x253b5fff, 0x243b5fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
-    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x20355aff, 
-    0x909aadff, 0xeff0f3ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 
-    0xf5f5f5ff, 0xf4f4f4ff, 0xe3e4e6ff, 0x868a96ff, 0x18223aff, 0x030d28ff, 
-    0x030d27ff, 0x020d29ff, 0x04123bff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x17254dff, 0x18264eff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x153154ff, 0x133156ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 0x122e54ff, 
-    0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
-    0x0f2a50ff, 0x0f2950ff, 0x576883ff, 0xfafbfcff, 0xfdfdfeff, 0xb7becaff, 
-    0x50627fff, 0x0e264eff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0f254dff, 
-    0x78859bff, 0xf4f5f6ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 
-    0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 
-    0xe4e5e6ff, 0x6c7180ff, 0x05102aff, 0x020c26ff, 0x030d28ff, 0x04133bff, 
-    0x051541ff, 0x414d6cff, 0x9da2b0ff, 0xdededfff, 0xd9d9daff, 0x444e69ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x153154ff, 0x133055ff, 0x122f55ff, 0x122f54ff, 
-    0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
-    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x183056ff, 0xe3e6eaff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xdbdee4ff, 0x76839aff, 0x1a3056ff, 
-    0x22365bff, 0xc5cad4ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 
-    0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 
-    0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xb1b4baff, 0x172038ff, 
-    0x0f1831ff, 0x636979ff, 0xc1c3c9ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 
-    0xddddddff, 0xc1c3c6ff, 0x0c193fff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x153053ff, 0x122f55ff, 
-    0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 
-    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x8693a7ff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xf4f5f7ff, 0xe9ebefff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 
-    0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 
-    0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xd1d2d4ff, 0xd9dadbff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 
-    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0x6e7382ff, 0x031138ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x142f53ff, 0x122f54ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 0x112c52ff, 
-    0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
-    0x284062ff, 0xf5f6f7ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 
-    0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 
-    0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 
-    0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 
-    0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 
-    0xceced0ff, 0x1e2541ff, 0x041239ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x142f52ff, 0x122e54ff, 0x112d53ff, 0x112d53ff, 
-    0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
-    0x0f284fff, 0x0e284fff, 0xabb4c1ff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfdfdfdff, 0xfcfcfcff, 0xd4d6daff, 0x8a8f9aff, 0x606877ff, 0x4a5264ff, 
-    0x4a5264ff, 0x5e6575ff, 0x868a96ff, 0xcaccd0ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 
-    0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 
-    0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0x8b8e98ff, 0x050d2dff, 0x051239ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x142e52ff, 0x112d53ff, 
-    0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 
-    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x465977ff, 0xfefefeff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xfdfdfdff, 0xb6bac1ff, 0x353e53ff, 0x041029ff, 0x041029ff, 
-    0x040f29ff, 0x040f29ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 0x030d28ff, 
-    0x30384dff, 0xaaadb4ff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 
-    0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 
-    0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd1d1d1ff, 
-    0x343a53ff, 0x050e2eff, 0x05123aff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x132d51ff, 0x112d53ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 0x102a51ff, 
-    0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0xc0c6d0ff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xf1f2f3ff, 0x545d6dff, 0x05102aff, 0x041029ff, 
-    0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 
-    0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0x4c5365ff, 0xdbdcddff, 
-    0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 
-    0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 
-    0xd2d2d2ff, 0xd0d0d0ff, 0x999ca4ff, 0x050f2eff, 0x050f2eff, 0x05123aff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x132d51ff, 0x112c52ff, 0x102c52ff, 0x102b51ff, 
-    0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
-    0x0e264eff, 0xc4cad3ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xe7e8ebff, 0x323c50ff, 0x05102aff, 
-    0x041029ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0x040e28ff, 
-    0x030e28ff, 0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0x020c26ff, 
-    0x020c26ff, 0x2b3348ff, 0xcfd0d2ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 
-    0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 
-    0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0x9b9ea6ff, 0x050f2eff, 
-    0x050f30ff, 0x050f30ff, 0x05123aff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x132c50ff, 0x102c52ff, 
-    0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 
-    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x324666ff, 0xd9dce0ff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf7f7f8ff, 0x3f485bff, 
-    0x05102aff, 0x041029ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 
-    0x040e28ff, 0x030e28ff, 0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 
-    0x020c26ff, 0x020c26ff, 0x020c26ff, 0x020c27ff, 0x373e53ff, 0xdbdbdcff, 
-    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 
-    0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xafb0b5ff, 
-    0x242d47ff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 0x05123aff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x122c50ff, 0x102b51ff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 0x0f284fff, 
-    0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
-    0x172d51ff, 0xaaafb8ff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 
-    0x787e8cff, 0x05102aff, 0x041029ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 
-    0x09132cff, 0x5e6575ff, 0xabaeb6ff, 0xcbcdd1ff, 0xcaccd0ff, 0xa8abb2ff, 
-    0x595f70ff, 0x07112aff, 0x020c26ff, 0x020c26ff, 0x020c27ff, 0x020c27ff, 
-    0x020c27ff, 0x696e7eff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 
-    0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 
-    0x888b96ff, 0x0f1836ff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 
-    0x060f31ff, 0x061032ff, 0x05123bff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x122b4fff, 0x102a51ff, 0x0f2a50ff, 0x0f2950ff, 
-    0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
-    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0b2047ff, 0x6d7685ff, 0xf8f9f9ff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfdfdfdff, 0xe0e1e4ff, 0x0d1731ff, 0x041029ff, 0x041029ff, 0x040f29ff, 
-    0x040f29ff, 0x262f45ff, 0xcacbd0ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xbec0c5ff, 0x222a41ff, 0x020c27ff, 
-    0x020c27ff, 0x020c27ff, 0x020c29ff, 0x0b142fff, 0xc2c3c7ff, 0xdadadaff, 
-    0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 
-    0xc9c9caff, 0x585e70ff, 0x050f2eff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 
-    0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x05123bff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x122a4fff, 0x0f2a50ff, 
-    0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 
-    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
-    0x0a1f47ff, 0x384359ff, 0xdddfe2ff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0x747a88ff, 0x041029ff, 0x041029ff, 
-    0x040f29ff, 0x040f29ff, 0x1e273eff, 0xd8d9dcff, 0xefefefff, 0xeeeeeeff, 
-    0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 
-    0xcbcccfff, 0x19223aff, 0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 
-    0x656a7aff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 
-    0xd0d0d0ff, 0xb4b5b9ff, 0x2d354eff, 0x050f2eff, 0x050f30ff, 0x050f30ff, 
-    0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 
-    0x061034ff, 0x061034ff, 0x05123bff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x112a4eff, 0x0f2950ff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 0x0e264eff, 
-    0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
-    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a1e46ff, 0x888f9bff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 0x273247ff, 
-    0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0xa5a9b1ff, 0xefefefff, 
-    0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0x9699a2ff, 0x020c29ff, 0x040d29ff, 
-    0x040d29ff, 0x040d2aff, 0x212943ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 
-    0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0x6a6f7fff, 0x050f2eff, 0x050f30ff, 
-    0x050f30ff, 0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 
-    0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x05123cff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x11294eff, 0x0f284fff, 0x0e284fff, 0x0e274eff, 
-    0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
-    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
-    0xafb6c2ff, 0xffffffff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 0xfafafaff, 
-    0xdbdde0ff, 0x041029ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 0x1f273eff, 
-    0xeeeeeeff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 
-    0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xddddddff, 
-    0x1c243cff, 0x040d29ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 0xbebec2ff, 
-    0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0x898c97ff, 
-    0x050f30ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 
-    0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 
-    0x061035ff, 0x061136ff, 0x05123cff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11284dff, 0x0e284fff, 
-    0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 
-    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
-    0x0a1f48ff, 0x0a1f48ff, 0xc3c8d2ff, 0xffffffff, 0xfdfdfdff, 0xfcfcfcff, 
-    0xfafafaff, 0xf8f8f8ff, 0xc0c3c8ff, 0x040f29ff, 0x040f29ff, 0x040e28ff, 
-    0x040e28ff, 0x596070ff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 
-    0xdededeff, 0xddddddff, 0x525769ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 
-    0x050d2cff, 0xa5a7aeff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 
-    0xccccccff, 0x989ba3ff, 0x050f30ff, 0x050f30ff, 0x050f31ff, 0x060f31ff, 
-    0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 
-    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x07133bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x10284dff, 0x0e274eff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 0x0d244cff, 
-    0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
-    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0xcdd1d9ff, 0xfdfdfdff, 
-    0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xabafb7ff, 0x040f29ff, 
-    0x040e28ff, 0x040e28ff, 0x030e28ff, 0x6d7281ff, 0xecececff, 0xebebebff, 
-    0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 
-    0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0x646979ff, 0x040d2bff, 
-    0x040d2cff, 0x050d2cff, 0x050d2cff, 0x9496a0ff, 0xd0d0d0ff, 0xcfcfcfff, 
-    0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xa1a3aaff, 0x050f30ff, 0x050f31ff, 
-    0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 
-    0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
-    0x061137ff, 0x081237ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x10274cff, 0x0e264eff, 0x0d264dff, 0x0d254dff, 
-    0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
-    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
-    0xc2c7d1ff, 0xfcfcfcff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 
-    0xbbbec4ff, 0x040e28ff, 0x040e28ff, 0x030e28ff, 0x030d28ff, 0x5d6373ff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 
-    0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 
-    0x53596cff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x9fa1a9ff, 
-    0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0x989ba2ff, 
-    0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 
-    0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 
-    0x061136ff, 0x061137ff, 0x061137ff, 0x081237ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x10264cff, 0x0d264dff, 
-    0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 
-    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
-    0x091d47ff, 0x091d46ff, 0xb0b6c3ff, 0xfafafaff, 0xf8f8f8ff, 0xf7f7f7ff, 
-    0xf5f5f5ff, 0xf4f4f4ff, 0xd2d3d6ff, 0x040e28ff, 0x030e28ff, 0x030d28ff, 
-    0x030d27ff, 0x262f45ff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 
-    0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 
-    0xdadadaff, 0xd8d8d8ff, 0x222a45ff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 
-    0x050d2dff, 0xb4b5b9ff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0x8b8e98ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 
-    0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 
-    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x081237ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x0f264bff, 0x0d254dff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 0x0c224bff, 
-    0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
-    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x8992a6ff, 0xf8f8f8ff, 
-    0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf0f0f0ff, 0x1b253cff, 
-    0x030d28ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0xaeb0b7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 
-    0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0x9fa1aaff, 0x050d2cff, 0x050d2cff, 
-    0x050d2dff, 0x050d2dff, 0x1b233fff, 0xccccccff, 0xccccccff, 0xcacacaff, 
-    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0x6e7281ff, 0x061031ff, 0x061032ff, 
-    0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 
-    0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 
-    0x061138ff, 0x081238ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x0f254bff, 0x0d244cff, 0x0c244cff, 0x0c234bff, 
-    0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
-    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x223359ff, 
-    0xc5c9d2ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 
-    0xefefefff, 0x636979ff, 0x030d27ff, 0x020d27ff, 0x020c26ff, 0x020c26ff, 
-    0x283046ff, 0xd8d9daff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdededeff, 
-    0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xcacbccff, 0x252c46ff, 
-    0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x575d6fff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0x9a9ca3ff, 
-    0x1a2342ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 
-    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 
-    0x061137ff, 0x061138ff, 0x061138ff, 0x081238ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f244bff, 0x0c244cff, 
-    0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 
-    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
-    0x4c5979ff, 0xe5e6eaff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 
-    0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xc4c5caff, 0x05102aff, 0x020c26ff, 
-    0x020c26ff, 0x020c26ff, 0x020c26ff, 0x373e53ff, 0xcecfd1ff, 0xe0e0e0ff, 
-    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 0xc3c4c7ff, 
-    0x353b53ff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x07112fff, 
-    0xabacb2ff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 
-    0xc2c2c2ff, 0xc1c1c1ff, 0xafb0b3ff, 0x39415bff, 0x061034ff, 0x061034ff, 
-    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
-    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x081238ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x0e244bff, 0x0c234bff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 0x0b2149ff, 
-    0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
-    0x0b1f48ff, 0x848da2ff, 0xf6f6f7ff, 0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 
-    0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 
-    0x5b6171ff, 0x020c26ff, 0x020c26ff, 0x020c26ff, 0x020c27ff, 0x020c27ff, 
-    0x121b34ff, 0x737886ff, 0xbbbcc0ff, 0xd8d8d9ff, 0xd7d7d8ff, 0xb7b8bdff, 
-    0x707483ff, 0x131a37ff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 
-    0x050f2eff, 0x51576aff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbbbbbbff, 
-    0x636879ff, 0x081236ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
-    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
-    0x061239ff, 0x081339ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x0e234aff, 0x0c224bff, 0x0b224aff, 0x0b214aff, 
-    0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
-    0x091d46ff, 0x1e3057ff, 0xbcc1ccff, 0xf8f8f8ff, 0xf7f7f7ff, 0xf5f5f5ff, 
-    0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xd9dadbff, 0x252d43ff, 0x020c26ff, 0x020c27ff, 
-    0x020c27ff, 0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 0x060f2cff, 
-    0x060f2dff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 
-    0x050e2dff, 0x050f2eff, 0x242d47ff, 0xbebfc1ff, 0xc9c9c9ff, 0xc7c7c7ff, 
-    0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 
-    0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 0x8b8d97ff, 0x151f40ff, 0x061136ff, 
-    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
-    0x061138ff, 0x061239ff, 0x061239ff, 0x081339ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e224aff, 0x0b224aff, 
-    0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 
-    0x091d47ff, 0x091d46ff, 0x081c46ff, 0xb2b8c5ff, 0xf8f8f8ff, 0xf7f7f7ff, 
-    0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 
-    0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xc2c4c8ff, 
-    0x182139ff, 0x020c27ff, 0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 
-    0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 
-    0x050d2dff, 0x050e2dff, 0x050f2eff, 0x19223dff, 0xadaeb3ff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 
-    0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 
-    0x80838eff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
-    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x081339ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x0d2249ff, 0x0b214aff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 0x0a1f48ff, 
-    0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0xc3c7d0ff, 
-    0xf7f7f7ff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 0xefefefff, 
-    0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xe3e3e3ff, 0xc9cacdff, 0x2f374cff, 0x020c29ff, 0x040d29ff, 
-    0x040d29ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 
-    0x050d2dff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 0x2e364eff, 0xb6b7baff, 
-    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 
-    0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 
-    0xb6b6b6ff, 0xb5b5b5ff, 0x8b8e96ff, 0x061137ff, 0x061137ff, 0x061137ff, 
-    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
-    0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x0d2149ff, 0x0b2149ff, 0x0a2049ff, 0x0a1f48ff, 
-    0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
-    0x071b45ff, 0x525f7cff, 0xf5f5f5ff, 0xf4f4f4ff, 0xf2f2f2ff, 0xf1f1f1ff, 
-    0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 
-    0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 0xdadadbff, 
-    0x878a95ff, 0x19213aff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 
-    0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x151e3aff, 0x6f7482ff, 
-    0xc4c4c5ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 
-    0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 0xb9b9b9ff, 
-    0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb3b3b3ff, 0x3b435dff, 0x061137ff, 
-    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
-    0x06123aff, 0x06123aff, 0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0d2148ff, 0x0a2049ff, 
-    0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 
-    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0xb5bac5ff, 0xf2f2f2ff, 
-    0xf1f1f1ff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 0xe0e0e0ff, 
-    0xdededeff, 0xddddddff, 0xdbdbdbff, 0xd3d3d4ff, 0x999ca5ff, 0x595f71ff, 
-    0x383e55ff, 0x232a44ff, 0x232a45ff, 0x373d55ff, 0x585d6fff, 0x93969fff, 
-    0xc6c6c7ff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 
-    0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 
-    0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb3b3b3ff, 0x848791ff, 
-    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
-    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x08133aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x0c2048ff, 0x0a1f48ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 0x091d46ff, 
-    0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
-    0x2d3c60ff, 0xececedff, 0xefefefff, 0xeeeeeeff, 0xecececff, 0xebebebff, 
-    0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe3e3e3ff, 0xe1e1e1ff, 
-    0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 0xd8d8d8ff, 
-    0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 
-    0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 
-    0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb3b3b3ff, 
-    0xafafb0ff, 0x242d4cff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
-    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x0c1f47ff, 0x0a1f48ff, 0x091e47ff, 0x091d47ff, 
-    0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
-    0x061944ff, 0x061843ff, 0x061743ff, 0x8d95a7ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xe2e2e2ff, 
-    0xdbdbdcff, 0xe0e0e0ff, 0xdededeff, 0xddddddff, 0xdbdbdbff, 0xdadadaff, 
-    0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 
-    0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 
-    0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xb8b9baff, 
-    0xbbbbbbff, 0xbbbbbbff, 0xb9b9b9ff, 0xb8b8b8ff, 0xb6b6b6ff, 0xb5b5b5ff, 
-    0xb3b3b3ff, 0xb1b1b1ff, 0x696d7dff, 0x061137ff, 0x061138ff, 0x061138ff, 
-    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x06123aff, 0x06123aff, 0x08133aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0c1f47ff, 0x091e47ff, 
-    0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 
-    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x15254eff, 
-    0xdadcdfff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xd8d9daff, 
-    0x898d98ff, 0x293147ff, 0x242c43ff, 0xbabcc1ff, 0xddddddff, 0xdbdbdbff, 
-    0xdadadaff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 0xd2d2d2ff, 
-    0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 
-    0xa3a4aaff, 0x252d4bff, 0x202947ff, 0x666a7cff, 0xacadb0ff, 0xb6b6b6ff, 
-    0xb5b5b5ff, 0xb3b3b3ff, 0xb1b1b1ff, 0xa4a5a8ff, 0x141e41ff, 0x061138ff, 
-    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x08143bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x0b1e46ff, 0x091d47ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 0x071b45ff, 
-    0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
-    0x051642ff, 0x051641ff, 0x5f6a84ff, 0xe9e9e9ff, 0xe7e7e7ff, 0xc1c3c7ff, 
-    0x616776ff, 0x0e1731ff, 0x020c27ff, 0x020c27ff, 0x020c29ff, 0x0f1732ff, 
-    0x828591ff, 0xd9d9d9ff, 0xd8d8d8ff, 0xd6d6d6ff, 0xd5d5d5ff, 0xd3d3d3ff, 
-    0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 
-    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 
-    0xbebebeff, 0x707483ff, 0x0f183bff, 0x061034ff, 0x061035ff, 0x061035ff, 
-    0x0f183bff, 0x4f556bff, 0x97999fff, 0xb1b1b1ff, 0xb0b0b0ff, 0x484e65ff, 
-    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x07133bff, 0x07143bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x0b1d46ff, 0x091d46ff, 0x081c46ff, 0x081b46ff, 
-    0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 
-    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x323d59ff, 
-    0x353c51ff, 0x030d27ff, 0x020c27ff, 0x020c27ff, 0x020c27ff, 0x020c29ff, 
-    0x040d29ff, 0x040d29ff, 0x040d2aff, 0x2b334bff, 0x9497a1ff, 0xd3d3d3ff, 
-    0xd3d3d3ff, 0xd2d2d2ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 
-    0xbfbfc0ff, 0x838691ff, 0x272f4dff, 0x061034ff, 0x061034ff, 0x061035ff, 
-    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x071238ff, 0x2c3452ff, 
-    0x28314fff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
-    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x07133bff, 0x06133cff, 0x07143bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0b1d45ff, 0x081c46ff, 
-    0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 0x061843ff, 
-    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x031034ff, 0x020c27ff, 0x020c27ff, 0x020c27ff, 
-    0x020c29ff, 0x040d29ff, 0x040d29ff, 0x040d2aff, 0x040d2bff, 0x040d2cff, 
-    0x050d2cff, 0x1d2440ff, 0x9c9ea7ff, 0xd0d0d0ff, 0xcfcfcfff, 0xcdcdcdff, 
-    0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 
-    0xc2c2c2ff, 0x90929bff, 0x1a2342ff, 0x061034ff, 0x061034ff, 0x061034ff, 
-    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
-    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
-    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x07143cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x0a1c45ff, 0x081b46ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 0x061944ff, 
-    0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x031034ff, 
-    0x020c27ff, 0x020c29ff, 0x040d29ff, 0x040d29ff, 0x040d2aff, 0x040d2bff, 
-    0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x676b7bff, 0xcfcfcfff, 
-    0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0x5e6375ff, 0x061034ff, 0x061034ff, 
-    0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
-    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
-    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
-    0x06133cff, 0x07143cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x0a1b45ff, 0x071b45ff, 0x071a45ff, 0x071944ff, 
-    0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 
-    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x031035ff, 0x040d29ff, 0x040d29ff, 0x040d2aff, 
-    0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 0x050d2dff, 
-    0x4c5266ff, 0xcdcdcdff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 
-    0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0x464c64ff, 
-    0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 
-    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
-    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
-    0x06133cff, 0x06133cff, 0x06133dff, 0x07143cff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x091b44ff, 0x071a45ff, 
-    0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 0x051642ff, 
-    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x031135ff, 
-    0x040d2aff, 0x040d2bff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 0x050d2dff, 
-    0x050d2dff, 0x050e2dff, 0x333b53ff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 
-    0xbebebeff, 0x2f3652ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 
-    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
-    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
-    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x07143cff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x091a44ff, 0x071944ff, 0x061944ff, 0x061843ff, 0x061743ff, 0x051742ff, 
-    0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x031136ff, 0x040d2cff, 0x050d2cff, 0x050d2cff, 
-    0x050d2dff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 0x19223eff, 0xcacacaff, 
-    0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 0xc1c1c1ff, 
-    0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0x172041ff, 0x061035ff, 0x061035ff, 
-    0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 
-    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
-    0x06133cff, 0x08133cff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x091a43ff, 0x061944ff, 0x061843ff, 0x061743ff, 
-    0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041137ff, 
-    0x050d2cff, 0x050d2dff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 0x050f2eff, 
-    0x061031ff, 0xc3c3c5ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xc2c2c2ff, 
-    0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xb5b6b7ff, 0x071136ff, 
-    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 
-    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
-    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
-    0x06133dff, 0x06133cff, 0x06123dff, 0x08143dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x081a43ff, 0x061843ff, 
-    0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041137ff, 0x050d2dff, 0x050e2dff, 0x050f2eff, 
-    0x050f2eff, 0x050f30ff, 0x050f30ff, 0xa4a6acff, 0xc6c6c6ff, 0xc4c4c4ff, 
-    0xc2c2c2ff, 0xc1c1c1ff, 0xbfbfbfff, 0xbebebeff, 0xbcbcbcff, 0xbbbbbbff, 
-    0x999ba2ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
-    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
-    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 
-    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x08143dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x081942ff, 0x061743ff, 0x051742ff, 0x051642ff, 0x051641ff, 0x041541ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041137ff, 
-    0x050f2eff, 0x050f2eff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 0x363d57ff, 
-    0x9ea0a7ff, 0xa9aaafff, 0xa8a9aeff, 0xa7a8adff, 0xa6a7acff, 0xa4a5aaff, 
-    0xa3a4a9ff, 0x95979fff, 0x323955ff, 0x061035ff, 0x061136ff, 0x061136ff, 
-    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
-    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
-    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
-    0x06133eff, 0x08143dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x081842ff, 0x051742ff, 0x051642ff, 0x051641ff, 
-    0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041138ff, 0x050f30ff, 0x050f30ff, 0x050f30ff, 
-    0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 0x061034ff, 
-    0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 
-    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
-    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
-    0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 
-    0x06133dff, 0x06133eff, 0x06133eff, 0x08143eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x071841ff, 0x051642ff, 
-    0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041138ff, 
-    0x050f30ff, 0x050f31ff, 0x060f31ff, 0x061031ff, 0x061032ff, 0x061032ff, 
-    0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 
-    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
-    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
-    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 
-    0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x07143eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x071741ff, 0x051641ff, 0x041541ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041139ff, 0x060f31ff, 0x061031ff, 0x061032ff, 
-    0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 0x061035ff, 
-    0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 
-    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
-    0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 
-    0x05133fff, 0x07143eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x071740ff, 0x041541ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x04113aff, 
-    0x061032ff, 0x061032ff, 0x061034ff, 0x061034ff, 0x061034ff, 0x061035ff, 
-    0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 
-    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
-    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
-    0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 
-    0x06133eff, 0x05133fff, 0x05133fff, 0x07143eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x061640ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x05123aff, 0x061034ff, 0x061034ff, 0x061034ff, 
-    0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 0x061137ff, 
-    0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 
-    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 
-    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 
-    0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x07143eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05123aff, 
-    0x061034ff, 0x061035ff, 0x061035ff, 0x061035ff, 0x061136ff, 0x061136ff, 
-    0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 
-    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
-    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
-    0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 
-    0x05133fff, 0x07143eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x05123bff, 0x061035ff, 0x061035ff, 0x061136ff, 
-    0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 0x061138ff, 
-    0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
-    0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 
-    0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 
-    0x05133eff, 0x05133fff, 0x05133fff, 0x07153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06123bff, 
-    0x061136ff, 0x061136ff, 0x061137ff, 0x061137ff, 0x061137ff, 0x061138ff, 
-    0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
-    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 
-    0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 
-    0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x06153eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x06123cff, 0x061137ff, 0x061137ff, 0x061137ff, 
-    0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 0x06123aff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
-    0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 
-    0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 
-    0x04143fff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06123cff, 
-    0x061137ff, 0x061138ff, 0x061138ff, 0x061138ff, 0x061239ff, 0x061239ff, 
-    0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
-    0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 
-    0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 
-    0x051440ff, 0x04143fff, 0x04143fff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x06123cff, 0x061138ff, 0x061138ff, 0x061239ff, 
-    0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 0x06123aff, 
-    0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 
-    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 
-    0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 
-    0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06123dff, 
-    0x061239ff, 0x061239ff, 0x06123aff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 
-    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
-    0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 
-    0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x06123dff, 0x06123aff, 0x06123aff, 0x06123aff, 
-    0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 0x06133cff, 
-    0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 
-    0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 
-    0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05133dff, 
-    0x06123aff, 0x06123bff, 0x06123aff, 0x06123aff, 0x06123bff, 0x07133bff, 
-    0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 
-    0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 
-    0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 
-    0x04143fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x05133eff, 0x06123aff, 0x06123aff, 0x06123bff, 
-    0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 0x06133dff, 
-    0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 
-    0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 
-    0x04143fff, 0x04143fff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x06153fff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05133eff, 
-    0x06123bff, 0x07133bff, 0x06133cff, 0x06133cff, 0x06133cff, 0x06133dff, 
-    0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 0x06133eff, 
-    0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 0x05133fff, 
-    0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x06153fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e163bff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x05133eff, 0x06133cff, 0x06133cff, 0x06133cff, 
-    0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 0x06133eff, 
-    0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 0x05133fff, 
-    0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x0f163aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x2e1f2fea, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x05133dff, 
-    0x06133cff, 0x06133dff, 0x06133dff, 0x06133cff, 0x06123dff, 0x06133dff, 
-    0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 0x05133eff, 
-    0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x2e1f30e9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x5a2d2d22, 0x231c32f7, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x05133eff, 0x06133dff, 0x06133cff, 0x06123dff, 
-    0x06133dff, 0x06133eff, 0x06133eff, 0x06133eff, 0x05133fff, 0x05133fff, 
-    0x05133eff, 0x05133fff, 0x05133fff, 0x051440ff, 0x04143fff, 0x04143fff, 
-    0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 0x041440ff, 
-    0x041440ff, 0x041440ff, 0x231b33f6, 0x58303020, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x552c254b, 0x4c292a97, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4627299d, 
-    0x4625299d, 0x46272a9d, 0x4627299d, 0x4627299d, 0x4627299d, 0x4627299d, 
-    0x4627299c, 0x4627299c, 0x4827299c, 0x4827299c, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 0x4827299b, 
-    0x4827299b, 0x4827299b, 0x4c292a97, 0x552c254b, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-};
diff --git a/games/NXDoom/src/setup/sound.c b/games/NXDoom/src/setup/sound.c
deleted file mode 100644
index 982ce00bc..000000000
--- a/games/NXDoom/src/setup/sound.c
+++ /dev/null
@@ -1,410 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-// Sound control menu
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "textscreen.h"
-#include "m_config.h"
-#include "m_misc.h"
-
-#include "execute.h"
-#include "mode.h"
-#include "sound.h"
-
-#ifndef DISABLE_SDL2MIXER
-
-#include "SDL_mixer.h"
-
-#endif  // DISABLE_SDL2MIXER
-
-
-#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-sound"
-
-typedef enum
-{
-    OPLMODE_OPL2,
-    OPLMODE_OPL3,
-    NUM_OPLMODES,
-} oplmode_t;
-
-static const char *opltype_strings[] =
-{
-    "OPL2",
-    "OPL3"
-};
-
-static const char *cfg_extension[] = { "cfg", NULL };
-
-#ifdef HAVE_FLUIDSYNTH
-static const char *sf_extension[] = { "sf2", "sf3", NULL };
-#endif
-
-// Config file variables:
-
-int snd_sfxdevice = SNDDEVICE_SB;
-int snd_musicdevice = SNDDEVICE_SB;
-int snd_samplerate = 44100;
-int opl_io_port = 0x388;
-int snd_cachesize = 64 * 1024 * 1024;
-int snd_maxslicetime_ms = 28;
-char *snd_musiccmd = "";
-int snd_pitchshift = 0;
-char *snd_dmxoption = "";
-
-static int numChannels = 8;
-static int sfxVolume = 8;
-static int musicVolume = 8;
-static int voiceVolume = 15;
-static int show_talk = 0;
-int use_libsamplerate = 0;
-float libsamplerate_scale = 0.65;
-
-char *music_pack_path = NULL;
-char *timidity_cfg_path = NULL;
-static char *gus_patch_path = NULL;
-static int gus_ram_kb = 1024;
-#ifdef _WIN32
-#define MAX_MIDI_DEVICES 20
-static char *midi_names[MAX_MIDI_DEVICES];
-static int midi_index;
-char *winmm_midi_device = NULL;
-int winmm_complevel = 0;
-int winmm_reset_type = 1;
-int winmm_reset_delay = 0;
-#endif
-
-#ifdef HAVE_FLUIDSYNTH
-char *fsynth_sf_path = NULL;
-int fsynth_chorus_active = 1;
-float fsynth_chorus_depth = 5.0f;
-float fsynth_chorus_level = 0.35f;
-int fsynth_chorus_nr = 3;
-float fsynth_chorus_speed = 0.3f;
-char *fsynth_midibankselect = "gs";
-int fsynth_polyphony = 256;
-int fsynth_reverb_active = 1;
-float fsynth_reverb_damp = 0.4f;
-float fsynth_reverb_level = 0.15f;
-float fsynth_reverb_roomsize = 0.6f;
-float fsynth_reverb_width = 4.0f;
-float fsynth_gain = 1.0f;
-#endif // HAVE_FLUIDSYNTH
-
-// DOS specific variables: these are unused but should be maintained
-// so that the config file can be shared between chocolate
-// doom and doom.exe
-
-static int snd_sbport = 0;
-static int snd_sbirq = 0;
-static int snd_sbdma = 0;
-static int snd_mport = 0;
-
-static int snd_oplmode;
-
-static void UpdateSndDevices(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(data))
-{
-    switch (snd_oplmode)
-    {
-        default:
-        case OPLMODE_OPL2:
-            snd_dmxoption = "";
-            break;
-
-        case OPLMODE_OPL3:
-            snd_dmxoption = "-opl3";
-            break;
-    }
-}
-
-static txt_dropdown_list_t *OPLTypeSelector(void)
-{
-    txt_dropdown_list_t *result;
-
-    if (snd_dmxoption != NULL && strstr(snd_dmxoption, "-opl3") != NULL)
-    {
-        snd_oplmode = OPLMODE_OPL3;
-    }
-    else
-    {
-        snd_oplmode = OPLMODE_OPL2;
-    }
-
-    result = TXT_NewDropdownList(&snd_oplmode, opltype_strings, 2);
-
-    TXT_SignalConnect(result, "changed", UpdateSndDevices, NULL);
-
-    return result;
-}
-
-static void OpenMusicPackDir(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
-{
-    if (!OpenFolder(music_pack_path))
-    {
-        TXT_MessageBox("Error", "Failed to open music pack directory.");
-    }
-}
-
-#ifdef _WIN32
-static void UpdateMidiDevice(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(data))
-{
-    free(winmm_midi_device);
-    winmm_midi_device = M_StringDuplicate(midi_names[midi_index]);
-}
-
-static txt_dropdown_list_t *MidiDeviceSelector(void)
-{
-    txt_dropdown_list_t *result;
-    int num_devices = 1;
-    int all_devices = midiOutGetNumDevs();
-    int i;
-
-    midi_index = 0;
-    free(midi_names[0]);
-    midi_names[0] = M_StringDuplicate("Microsoft MIDI Mapper");
-
-    if (all_devices > MAX_MIDI_DEVICES - num_devices)
-    {
-        all_devices = MAX_MIDI_DEVICES - num_devices;
-    }
-
-    for (i = 0; i < all_devices; i++)
-    {
-        MIDIOUTCAPS caps;
-
-        if (midiOutGetDevCaps(i, &caps, sizeof(caps)) == MMSYSERR_NOERROR)
-        {
-            free(midi_names[num_devices]);
-            midi_names[num_devices] = M_StringDuplicate(caps.szPname);
-
-            if (!strncasecmp(winmm_midi_device, midi_names[num_devices],
-                             MAXPNAMELEN))
-            {
-                // Set the dropdown list index to the saved device.
-                midi_index = num_devices;
-            }
-
-            num_devices++;
-        }
-    }
-
-    free(winmm_midi_device);
-    winmm_midi_device = M_StringDuplicate(midi_names[midi_index]);
-
-    result = TXT_NewDropdownList(&midi_index, (const char **) midi_names,
-                                 num_devices);
-    TXT_SignalConnect(result, "changed", UpdateMidiDevice, NULL);
-
-    return result;
-}
-#endif
-
-void ConfigSound(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-    txt_window_action_t *music_action;
-
-    // Build the window
-
-    window = TXT_NewWindow("Sound configuration");
-    TXT_SetWindowHelpURL(window, WINDOW_HELP_URL);
-
-    TXT_SetColumnWidths(window, 40);
-    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
-                                  TXT_SCREEN_W / 2, 3);
-
-    music_action = TXT_NewWindowAction('m', "Music Packs");
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, music_action);
-    TXT_SignalConnect(music_action, "pressed", OpenMusicPackDir, NULL);
-
-    TXT_AddWidgets(window,
-        TXT_NewSeparator("Sound effects"),
-        TXT_NewRadioButton("Disabled", &snd_sfxdevice, SNDDEVICE_NONE),
-        TXT_If(gamemission == doom || gamemission == strife,
-            TXT_NewRadioButton("PC speaker effects", &snd_sfxdevice,
-                               SNDDEVICE_PCSPEAKER)),
-        TXT_NewRadioButton("Digital sound effects",
-                           &snd_sfxdevice,
-                           SNDDEVICE_SB),
-        TXT_If(gamemission == doom || gamemission == heretic
-            || gamemission == hexen,
-            TXT_NewConditional(&snd_sfxdevice, SNDDEVICE_SB,
-                TXT_NewHorizBox(
-                    TXT_NewStrut(4, 0),
-                    TXT_NewCheckBox("Pitch-shifted sounds", &snd_pitchshift),
-                    NULL))),
-        TXT_If(gamemission == strife,
-            TXT_NewConditional(&snd_sfxdevice, SNDDEVICE_SB,
-                TXT_NewHorizBox(
-                    TXT_NewStrut(4, 0),
-                    TXT_NewCheckBox("Show text with voices", &show_talk),
-                    NULL))),
-
-        TXT_NewSeparator("Music"),
-        TXT_NewRadioButton("Disabled", &snd_musicdevice, SNDDEVICE_NONE),
-
-        TXT_NewRadioButton("OPL (Adlib/Soundblaster)", &snd_musicdevice,
-                           SNDDEVICE_SB),
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_SB,
-            TXT_NewHorizBox(
-                TXT_NewStrut(4, 0),
-                TXT_NewLabel("Chip type: "),
-                OPLTypeSelector(),
-                NULL)),
-
-        TXT_NewRadioButton("GUS (emulated)", &snd_musicdevice, SNDDEVICE_GUS),
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GUS,
-            TXT_MakeTable(2,
-                TXT_NewStrut(4, 0),
-                TXT_NewLabel("Path to patch files: "),
-                TXT_NewStrut(4, 0),
-                TXT_NewFileSelector(&gus_patch_path, 34,
-                                    "Select directory containing GUS patches",
-                                    TXT_DIRECTORY),
-                NULL)),
-
-        TXT_NewRadioButton("Native MIDI", &snd_musicdevice, SNDDEVICE_GENMIDI),
-#ifdef _WIN32
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GENMIDI,
-            TXT_NewHorizBox(
-                TXT_NewStrut(4, 0),
-                TXT_NewLabel("Device: "),
-                MidiDeviceSelector(),
-                NULL)),
-#endif
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GENMIDI,
-            TXT_MakeTable(2,
-                TXT_NewStrut(4, 0),
-                TXT_NewLabel("Timidity configuration file: "),
-                TXT_NewStrut(4, 0),
-                TXT_NewFileSelector(&timidity_cfg_path, 34,
-                                    "Select Timidity config file",
-                                    cfg_extension),
-                NULL)),
-#ifdef HAVE_FLUIDSYNTH
-        TXT_NewRadioButton("FluidSynth", &snd_musicdevice, SNDDEVICE_FSYNTH),
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_FSYNTH,
-            TXT_MakeTable(2,
-                TXT_NewStrut(4, 0),
-                TXT_NewLabel("Soundfont file: "),
-                TXT_NewStrut(4, 0),
-                TXT_NewFileSelector(&fsynth_sf_path, 34,
-                                    "Select FluidSynth soundfont file",
-                                    sf_extension),
-                NULL)),
-#endif
-        NULL);
-}
-
-void BindSoundVariables(void)
-{
-    M_BindIntVariable("snd_sfxdevice",            &snd_sfxdevice);
-    M_BindIntVariable("snd_musicdevice",          &snd_musicdevice);
-    M_BindIntVariable("snd_channels",             &numChannels);
-    M_BindIntVariable("snd_samplerate",           &snd_samplerate);
-    M_BindIntVariable("sfx_volume",               &sfxVolume);
-    M_BindIntVariable("music_volume",             &musicVolume);
-
-    M_BindIntVariable("use_libsamplerate",        &use_libsamplerate);
-    M_BindFloatVariable("libsamplerate_scale",    &libsamplerate_scale);
-
-    M_BindIntVariable("gus_ram_kb",               &gus_ram_kb);
-    M_BindStringVariable("gus_patch_path",        &gus_patch_path);
-    M_BindStringVariable("music_pack_path",     &music_pack_path);
-    M_BindStringVariable("timidity_cfg_path",     &timidity_cfg_path);
-#ifdef _WIN32
-    M_BindStringVariable("winmm_midi_device",     &winmm_midi_device);
-    M_BindIntVariable("winmm_complevel",          &winmm_complevel);
-    M_BindIntVariable("winmm_reset_type",         &winmm_reset_type);
-    M_BindIntVariable("winmm_reset_delay",        &winmm_reset_delay);
-#endif
-
-#ifdef HAVE_FLUIDSYNTH
-    M_BindIntVariable("fsynth_chorus_active",     &fsynth_chorus_active);
-    M_BindFloatVariable("fsynth_chorus_depth",    &fsynth_chorus_depth);
-    M_BindFloatVariable("fsynth_chorus_level",    &fsynth_chorus_level);
-    M_BindIntVariable("fsynth_chorus_nr",         &fsynth_chorus_nr);
-    M_BindFloatVariable("fsynth_chorus_speed",    &fsynth_chorus_speed);
-    M_BindStringVariable("fsynth_midibankselect", &fsynth_midibankselect);
-    M_BindIntVariable("fsynth_polyphony",         &fsynth_polyphony);
-    M_BindIntVariable("fsynth_reverb_active",     &fsynth_reverb_active);
-    M_BindFloatVariable("fsynth_reverb_damp",     &fsynth_reverb_damp);
-    M_BindFloatVariable("fsynth_reverb_level",    &fsynth_reverb_level);
-    M_BindFloatVariable("fsynth_reverb_roomsize", &fsynth_reverb_roomsize);
-    M_BindFloatVariable("fsynth_reverb_width",    &fsynth_reverb_width);
-    M_BindFloatVariable("fsynth_gain",            &fsynth_gain);
-    M_BindStringVariable("fsynth_sf_path",        &fsynth_sf_path);
-#endif // HAVE_FLUIDSYNTH
-
-    M_BindIntVariable("snd_sbport",               &snd_sbport);
-    M_BindIntVariable("snd_sbirq",                &snd_sbirq);
-    M_BindIntVariable("snd_sbdma",                &snd_sbdma);
-    M_BindIntVariable("snd_mport",                &snd_mport);
-    M_BindIntVariable("snd_maxslicetime_ms",      &snd_maxslicetime_ms);
-    M_BindStringVariable("snd_musiccmd",          &snd_musiccmd);
-    M_BindStringVariable("snd_dmxoption",         &snd_dmxoption);
-
-    M_BindIntVariable("snd_cachesize",            &snd_cachesize);
-    M_BindIntVariable("opl_io_port",              &opl_io_port);
-
-    M_BindIntVariable("snd_pitchshift",           &snd_pitchshift);
-
-    if (gamemission == strife)
-    {
-        M_BindIntVariable("voice_volume",         &voiceVolume);
-        M_BindIntVariable("show_talk",            &show_talk);
-    }
-
-    music_pack_path = M_StringDuplicate("");
-    timidity_cfg_path = M_StringDuplicate("");
-    gus_patch_path = M_StringDuplicate("");
-
-#ifdef _WIN32
-    winmm_midi_device = M_StringDuplicate("");
-#endif
-
-#ifdef HAVE_FLUIDSYNTH
-    fsynth_sf_path = M_StringDuplicate("");
-#endif
-
-    // All versions of Heretic and Hexen did pitch-shifting.
-    // Most versions of Doom did not and Strife never did.
-    snd_pitchshift = gamemission == heretic || gamemission == hexen;
-
-    // Default sound volumes - different games use different values.
-
-    switch (gamemission)
-    {
-        case doom:
-        default:
-            sfxVolume = 8;  musicVolume = 8;
-            break;
-        case heretic:
-        case hexen:
-            sfxVolume = 10; musicVolume = 10;
-            break;
-        case strife:
-            sfxVolume = 8;  musicVolume = 13;
-            break;
-    }
-}
-
diff --git a/games/NXDoom/src/setup/sound.h b/games/NXDoom/src/setup/sound.h
deleted file mode 100644
index a21570135..000000000
--- a/games/NXDoom/src/setup/sound.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef SETUP_SOUND_H
-#define SETUP_SOUND_H
-
-#include "i_sound.h"
-
-void ConfigSound(void *widget, void *user_data);
-void BindSoundVariables(void);
-
-
-#endif /* #ifndef SETUP_SOUND_H */
diff --git a/games/NXDoom/src/setup/txt_joyaxis.c b/games/NXDoom/src/setup/txt_joyaxis.c
deleted file mode 100644
index 620c0bfa4..000000000
--- a/games/NXDoom/src/setup/txt_joyaxis.c
+++ /dev/null
@@ -1,654 +0,0 @@
-//
-// Copyright(C) 2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "SDL.h"
-
-#include "joystick.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "m_controls.h"
-#include "m_misc.h"
-
-#include "textscreen.h"
-#include "txt_gui.h"
-#include "txt_io.h"
-#include "txt_joyaxis.h"
-#include "txt_utf8.h"
-
-#define JOYSTICK_AXIS_WIDTH 20
-
-static const char *CalibrationLabel(txt_joystick_axis_t *joystick_axis)
-{
-    switch (joystick_axis->config_stage)
-    {
-        case CONFIG_CENTER:
-            return "Center the D-pad or joystick,\n"
-                   "and press a button.";
-
-        case CONFIG_STAGE1:
-            if (joystick_axis->dir == JOYSTICK_AXIS_VERTICAL)
-            {
-                return "Push the D-pad or joystick up,\n"
-                       "and press the button.";
-            }
-            else
-            {
-                return "Push the D-pad or joystick to the\n"
-                       "left, and press the button.";
-            }
-
-        case CONFIG_STAGE2:
-            if (joystick_axis->dir == JOYSTICK_AXIS_VERTICAL)
-            {
-                return "Push the D-pad or joystick down,\n"
-                       "and press the button.";
-            }
-            else
-            {
-                return "Push the D-pad or joystick to the\n"
-                       "right, and press the button.";
-            }
-    }
-
-    return NULL;
-}
-
-static void SetCalibrationLabel(txt_joystick_axis_t *joystick_axis)
-{
-    TXT_SetLabel(joystick_axis->config_label, CalibrationLabel(joystick_axis));
-}
-
-// Search all axes on joystick being configured; find a button that is
-// pressed (other than the calibrate button). Returns the button number.
-
-static int FindPressedAxisButton(txt_joystick_axis_t *joystick_axis)
-{
-    int i;
-
-    for (i = 0; i < SDL_JoystickNumButtons(joystick_axis->joystick); ++i)
-    {
-        if (i == joystick_axis->config_button)
-        {
-            continue;
-        }
-
-        if (SDL_JoystickGetButton(joystick_axis->joystick, i))
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-// Look for a hat that isn't centered. Returns the encoded hat axis.
-
-static int FindUncenteredHat(SDL_Joystick *joystick, int *axis_invert)
-{
-    int i, hatval;
-
-    for (i = 0; i < SDL_JoystickNumHats(joystick); ++i)
-    {
-        hatval = SDL_JoystickGetHat(joystick, i);
-
-        switch (hatval)
-        {
-            case SDL_HAT_LEFT:
-            case SDL_HAT_RIGHT:
-                *axis_invert = hatval != SDL_HAT_LEFT;
-                return CREATE_HAT_AXIS(i, HAT_AXIS_HORIZONTAL);
-
-            case SDL_HAT_UP:
-            case SDL_HAT_DOWN:
-                *axis_invert = hatval != SDL_HAT_UP;
-                return CREATE_HAT_AXIS(i, HAT_AXIS_VERTICAL);
-
-            // If the hat is centered, or is not pointing in a
-            // definite direction, then ignore it. We don't accept
-            // the hat being pointed to the upper-left for example,
-            // because it's ambiguous.
-            case SDL_HAT_CENTERED:
-            default:
-                break;
-        }
-    }
-
-    // None found.
-    return -1;
-}
-
-static boolean CalibrateAxis(txt_joystick_axis_t *joystick_axis)
-{
-    int best_axis;
-    int best_value;
-    int best_invert;
-    Sint16 axis_value;
-    int i;
-
-    // Check all axes to find which axis has the largest value.  We test
-    // for one axis at a time, so eg. when we prompt to push the joystick 
-    // left, whichever axis has the largest value is the left axis.
-
-    best_axis = 0;
-    best_value = 0;
-    best_invert = 0;
-
-    for (i = 0; i < SDL_JoystickNumAxes(joystick_axis->joystick); ++i)
-    {
-        axis_value = SDL_JoystickGetAxis(joystick_axis->joystick, i);
-
-        if (joystick_axis->bad_axis[i])
-        {
-            continue;
-        }
-
-        if (abs(axis_value) > best_value)
-        {
-            best_value = abs(axis_value);
-            best_invert = axis_value > 0;
-            best_axis = i;
-        }
-    }
-
-    // Did we find one axis that had a significant value?
-
-    if (best_value > 32768 / 4)
-    {
-        // Save the best values we have found
-
-        *joystick_axis->axis = best_axis;
-        *joystick_axis->invert = best_invert;
-        return true;
-    }
-
-    // Otherwise, maybe this is a "button axis", like the PS3 SIXAXIS
-    // controller that exposes the D-pad as four individual buttons.
-    // Search for a button.
-
-    i = FindPressedAxisButton(joystick_axis);
-
-    if (i >= 0)
-    {
-        *joystick_axis->axis = CREATE_BUTTON_AXIS(i, 0);
-        *joystick_axis->invert = 0;
-        return true;
-    }
-
-    // Maybe it's a D-pad that is presented as a hat. This sounds weird
-    // but gamepads like this really do exist; an example is the
-    // Nyko AIRFLO Ex.
-
-    i = FindUncenteredHat(joystick_axis->joystick, joystick_axis->invert);
-
-    if (i >= 0)
-    {
-        *joystick_axis->axis = i;
-        return true;
-    }
-
-    // User pressed the button without pushing the joystick anywhere.
-    return false;
-}
-
-static boolean SetButtonAxisPositive(txt_joystick_axis_t *joystick_axis)
-{
-    int button;
-
-    button = FindPressedAxisButton(joystick_axis);
-
-    if (button >= 0)
-    {
-        *joystick_axis->axis |= CREATE_BUTTON_AXIS(0, button);
-        return true;
-    }
-
-    return false;
-}
-
-static void IdentifyBadAxes(txt_joystick_axis_t *joystick_axis)
-{
-    int i, val;
-
-    free(joystick_axis->bad_axis);
-
-    joystick_axis->bad_axis
-        = calloc(SDL_JoystickNumAxes(joystick_axis->joystick),
-                                     sizeof(boolean));
-
-    // Look for uncentered axes.
-
-    for (i = 0; i < SDL_JoystickNumAxes(joystick_axis->joystick); ++i)
-    {
-        val = SDL_JoystickGetAxis(joystick_axis->joystick, i);
-
-        joystick_axis->bad_axis[i] = abs(val) > (32768 / 5);
-
-        if (joystick_axis->bad_axis[i])
-        {
-            printf("Ignoring uncentered joystick axis #%i: %i\n", i, val);
-        }
-    }
-}
-
-static int NextCalibrateStage(txt_joystick_axis_t *joystick_axis)
-{
-    switch (joystick_axis->config_stage)
-    {
-        case CONFIG_CENTER:
-            return CONFIG_STAGE1;
-
-        // After pushing to the left, there are two possibilities:
-        // either it is a button axis, in which case we need to find
-        // the other button, or we can just move on to the next axis.
-        case CONFIG_STAGE1:
-            if (IS_BUTTON_AXIS(*joystick_axis->axis))
-            {
-                return CONFIG_STAGE2;
-            }
-            else
-            {
-                return CONFIG_CENTER;
-            }
-
-        case CONFIG_STAGE2:
-            return CONFIG_CENTER;
-    }
-
-    return -1;
-}
-
-static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_axis))
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-    boolean advance;
-
-    if (event->type != SDL_JOYBUTTONDOWN)
-    {
-        return 0;
-    }
-
-    // At this point, we have a button press.
-    // In the first "center" stage, we're just trying to work out which
-    // joystick is being configured and which button the user is pressing.
-    if (joystick_axis->config_stage == CONFIG_CENTER)
-    {
-        joystick_axis->config_button = event->jbutton.button;
-        IdentifyBadAxes(joystick_axis);
-
-        // Advance to next stage.
-        joystick_axis->config_stage = CONFIG_STAGE1;
-        SetCalibrationLabel(joystick_axis);
-
-        return 1;
-    }
-
-    // In subsequent stages, the user is asked to push in a specific
-    // direction and press the button. They must push the same button
-    // as they did before; this is necessary to support button axes.
-    if (event->jbutton.which == SDL_JoystickInstanceID(joystick_axis->joystick)
-     && event->jbutton.button == joystick_axis->config_button)
-    {
-        switch (joystick_axis->config_stage)
-        {
-            default:
-            case CONFIG_STAGE1:
-                advance = CalibrateAxis(joystick_axis);
-                break;
-
-            case CONFIG_STAGE2:
-                advance = SetButtonAxisPositive(joystick_axis);
-                break;
-        }
-
-        // Advance to the next calibration stage?
-
-        if (advance)
-        {
-            joystick_axis->config_stage = NextCalibrateStage(joystick_axis);
-            SetCalibrationLabel(joystick_axis);
-
-            // Finished?
-            if (joystick_axis->config_stage == CONFIG_CENTER)
-            {
-                TXT_CloseWindow(joystick_axis->config_window);
-
-                if (joystick_axis->callback != NULL)
-                {
-                    joystick_axis->callback();
-                }
-            }
-
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-static void CalibrateWindowClosed(TXT_UNCAST_ARG(widget),
-                                  TXT_UNCAST_ARG(joystick_axis))
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-
-    free(joystick_axis->bad_axis);
-    joystick_axis->bad_axis = NULL;
-
-    SDL_JoystickClose(joystick_axis->joystick);
-    SDL_JoystickEventState(SDL_DISABLE);
-    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-    TXT_SDL_SetEventCallback(NULL, NULL);
-}
-
-void TXT_ConfigureJoystickAxis(txt_joystick_axis_t *joystick_axis,
-                               int using_button,
-                               txt_joystick_axis_callback_t callback)
-{
-    // Open the joystick first.
-    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
-    {
-        return;
-    }
-
-    joystick_axis->joystick = SDL_JoystickOpen(joystick_index);
-    if (joystick_axis->joystick == NULL)
-    {
-        TXT_MessageBox(NULL, "Please configure a controller first!");
-        return;
-    }
-
-    SDL_JoystickEventState(SDL_ENABLE);
-
-    // Build the prompt window.
-
-    joystick_axis->config_window
-        = TXT_NewWindow("Gamepad/Joystick calibration");
-    TXT_AddWidgets(joystick_axis->config_window,
-                   TXT_NewStrut(0, 1),
-                   joystick_axis->config_label = TXT_NewLabel(""),
-                   TXT_NewStrut(0, 1),
-                   NULL);
-
-    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_CENTER,
-                        TXT_NewWindowAbortAction(joystick_axis->config_window));
-    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_RIGHT, NULL);
-    TXT_SetWidgetAlign(joystick_axis->config_window, TXT_HORIZ_CENTER);
-
-    if (using_button >= 0)
-    {
-        joystick_axis->config_stage = CONFIG_STAGE1;
-        joystick_axis->config_button = using_button;
-        IdentifyBadAxes(joystick_axis);
-    }
-    else
-    {
-        joystick_axis->config_stage = CONFIG_CENTER;
-    }
-
-    SetCalibrationLabel(joystick_axis);
-
-    // Close the joystick and shut down joystick subsystem when the window
-    // is closed.
-    TXT_SignalConnect(joystick_axis->config_window, "closed",
-                      CalibrateWindowClosed, joystick_axis);
-
-    TXT_SDL_SetEventCallback(EventCallback, joystick_axis);
-
-    // When successfully calibrated, invoke this callback:
-    joystick_axis->callback = callback;
-}
-
-void TXT_ConfigureGamepadAxis(txt_joystick_axis_t *joystick_axis,
-                              int using_button,
-                              txt_joystick_axis_callback_t callback)
-{
-    // Build the prompt window.
-
-    joystick_axis->config_window = TXT_NewWindow("Configure axis");
-    TXT_SetTableColumns(joystick_axis->config_window, 2);
-    TXT_SetColumnWidths(joystick_axis->config_window, 10, 5);
-    TXT_AddWidgets(joystick_axis->config_window,
-                   TXT_NewCheckBox("Invert", joystick_axis->invert),
-                   TXT_TABLE_EMPTY,
-                   TXT_NewLabel("Dead zone"),
-                   TXT_NewSpinControl(joystick_axis->dead_zone, 10, 90),
-                   NULL);
-
-    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(
-        joystick_axis->config_window, TXT_HORIZ_CENTER,
-        TXT_NewWindowEscapeAction(joystick_axis->config_window));
-    TXT_SetWindowAction(joystick_axis->config_window, TXT_HORIZ_RIGHT, NULL);
-    TXT_SetWidgetAlign(joystick_axis->config_window, TXT_HORIZ_CENTER);
-}
-
-static void TXT_JoystickAxisSizeCalc(TXT_UNCAST_ARG(joystick_axis))
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-
-    // All joystickinputs are the same size.
-
-    joystick_axis->widget.w = JOYSTICK_AXIS_WIDTH;
-    joystick_axis->widget.h = 1;
-}
-
-static void TXT_JoystickAxisDrawer(TXT_UNCAST_ARG(joystick_axis))
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-    char buf[JOYSTICK_AXIS_WIDTH + 1];
-    int i;
-
-    if (*joystick_axis->axis < 0)
-    {
-        M_StringCopy(buf, "(none)", sizeof(buf));
-    }
-    else if (IS_BUTTON_AXIS(*joystick_axis->axis))
-    {
-        int neg, pos;
-
-        neg = BUTTON_AXIS_NEG(*joystick_axis->axis);
-        pos = BUTTON_AXIS_POS(*joystick_axis->axis);
-        M_snprintf(buf, sizeof(buf), "BUTTONS #%i+#%i", neg, pos);
-    }
-    else if (IS_HAT_AXIS(*joystick_axis->axis))
-    {
-        int hat, dir;
-
-        hat = HAT_AXIS_HAT(*joystick_axis->axis);
-        dir = HAT_AXIS_DIRECTION(*joystick_axis->axis);
-
-        M_snprintf(buf, sizeof(buf), "HAT #%i (%s)", hat,
-                   dir == HAT_AXIS_HORIZONTAL ? "horizontal" : "vertical");
-    }
-    else
-    {
-        M_snprintf(buf, sizeof(buf), "AXIS #%i", *joystick_axis->axis);
-    }
-
-    TXT_SetWidgetBG(joystick_axis);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    TXT_DrawString(buf);
-
-    for (i = TXT_UTF8_Strlen(buf); i < joystick_axis->widget.w; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void GetAxisDescription(int axis, char *buf, size_t buf_len)
-{
-    switch (axis)
-    {
-        case SDL_CONTROLLER_AXIS_INVALID:
-            M_StringCopy(buf, "(none)", sizeof(buf));
-            break;
-
-        case SDL_CONTROLLER_AXIS_LEFTX:
-            M_StringCopy(buf, "Left X", sizeof(buf));
-            break;
-
-        case SDL_CONTROLLER_AXIS_LEFTY:
-            M_StringCopy(buf, "Left Y", sizeof(buf));
-            break;
-
-        case SDL_CONTROLLER_AXIS_RIGHTX:
-            M_StringCopy(buf, "Right X", sizeof(buf));
-            break;
-
-        case SDL_CONTROLLER_AXIS_RIGHTY:
-            M_StringCopy(buf, "Right Y", sizeof(buf));
-            break;
-
-        default:
-            M_StringCopy(buf, "(unknown)", sizeof(buf));
-            break;
-    }
-}
-
-static void TXT_GamepadAxisDrawer(TXT_UNCAST_ARG(joystick_axis))
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-    char buf[JOYSTICK_AXIS_WIDTH + 1];
-    int i;
-
-    GetAxisDescription(*joystick_axis->axis, buf, sizeof(buf));
-
-    TXT_SetWidgetBG(joystick_axis);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    TXT_DrawString(buf);
-
-    for (i = TXT_UTF8_Strlen(buf); i < joystick_axis->widget.w; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_JoystickAxisDestructor(TXT_UNCAST_ARG(joystick_axis))
-{
-}
-
-static int TXT_JoystickAxisKeyPress(TXT_UNCAST_ARG(joystick_axis), int key)
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-
-    if (key == KEY_ENTER)
-    {
-        TXT_ConfigureJoystickAxis(joystick_axis, -1, NULL);
-        return 1;
-    }
-
-    if (key == KEY_BACKSPACE || key == KEY_DEL)
-    {
-        *joystick_axis->axis = -1;
-    }
-
-    return 0;
-}
-
-static int TXT_GamepadAxisKeyPress(TXT_UNCAST_ARG(joystick_axis), int key)
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, joystick_axis);
-
-    if (key == KEY_ENTER)
-    {
-        TXT_ConfigureGamepadAxis(joystick_axis, -1, NULL);
-        return 1;
-    }
-
-    if (key == KEY_BACKSPACE || key == KEY_DEL)
-    {
-        *joystick_axis->axis = -1;
-    }
-
-    return 0;
-}
-
-static void TXT_JoystickAxisMousePress(TXT_UNCAST_ARG(widget),
-                                       int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, widget);
-
-    // Clicking is like pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_JoystickAxisKeyPress(widget, KEY_ENTER);
-    }
-}
-
-static void TXT_GamepadAxisMousePress(TXT_UNCAST_ARG(widget), int x, int y,
-                                      int b)
-{
-    TXT_CAST_ARG(txt_joystick_axis_t, widget);
-
-    // Clicking is like pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_GamepadAxisKeyPress(widget, KEY_ENTER);
-    }
-}
-
-txt_widget_class_t txt_joystick_axis_class =
-{
-    TXT_AlwaysSelectable,
-    TXT_JoystickAxisSizeCalc,
-    TXT_JoystickAxisDrawer,
-    TXT_JoystickAxisKeyPress,
-    TXT_JoystickAxisDestructor,
-    TXT_JoystickAxisMousePress,
-    NULL,
-};
-
-txt_widget_class_t txt_gamepad_axis_class =
-{
-    TXT_AlwaysSelectable,
-    TXT_JoystickAxisSizeCalc,
-    TXT_GamepadAxisDrawer,
-    TXT_GamepadAxisKeyPress,
-    TXT_JoystickAxisDestructor,
-    TXT_GamepadAxisMousePress,
-    NULL,
-};
-
-txt_joystick_axis_t *TXT_NewJoystickAxis(int *axis, int *invert, int *dead_zone,
-                                         txt_joystick_axis_direction_t dir)
-{
-    txt_joystick_axis_t *joystick_axis;
-
-    joystick_axis = malloc(sizeof(txt_joystick_axis_t));
-
-    if (use_gamepad)
-    {
-        TXT_InitWidget(joystick_axis, &txt_gamepad_axis_class);
-    }
-    else
-    {
-        TXT_InitWidget(joystick_axis, &txt_joystick_axis_class);
-    }
-    joystick_axis->axis = axis;
-    joystick_axis->invert = invert;
-    joystick_axis->dead_zone = dead_zone;
-    joystick_axis->dir = dir;
-    joystick_axis->bad_axis = NULL;
-
-    return joystick_axis;
-}
-
diff --git a/games/NXDoom/src/setup/txt_joyaxis.h b/games/NXDoom/src/setup/txt_joyaxis.h
deleted file mode 100644
index f0527c5b1..000000000
--- a/games/NXDoom/src/setup/txt_joyaxis.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef TXT_JOY_AXIS_H
-#define TXT_JOY_AXIS_H
-
-typedef struct txt_joystick_axis_s txt_joystick_axis_t;
-
-typedef enum
-{
-    JOYSTICK_AXIS_HORIZONTAL,
-    JOYSTICK_AXIS_VERTICAL,
-} txt_joystick_axis_direction_t;
-
-typedef enum
-{
-    CONFIG_CENTER,      // "Center the joystick and press a button..."
-    CONFIG_STAGE1,      // "Top or left and press a button..."
-    CONFIG_STAGE2,      // [Optional] "Bottom or right and press a button..."
-} txt_joystick_axis_stage_t;
-
-// Callback invoked when calibration is completed.
-typedef void (*txt_joystick_axis_callback_t)(void);
-
-#include "txt_widget.h"
-#include "txt_window.h"
-
-#include "SDL.h"
-
-//
-// A joystick axis.
-//
-
-struct txt_joystick_axis_s
-{
-    txt_widget_t widget;
-    int *axis, *invert, *dead_zone;
-    txt_joystick_axis_direction_t dir;
-
-    // Only used when configuring:
-
-    // Configuration prompt window and label.
-    txt_window_t *config_window;
-    txt_label_t *config_label;
-
-    // SDL joystick handle for reading joystick state.
-    SDL_Joystick *joystick;
-
-    // "Bad" joystick axes. Sometimes an axis can be stuck or "bad". An
-    // example I found is that if you unplug the nunchuck extension from
-    // a Wii remote, the axes from the nunchuck can be stuck at one of
-    // the maximum values. These have to be ignored, so when we ask the
-    // user to center the joystick, we look for bad axes that are not
-    // close to zero.
-    boolean *bad_axis;
-
-    // Stage we have reached in configuring joystick axis.
-    txt_joystick_axis_stage_t config_stage;
-
-    // Button to press to advance to next stage.
-    int config_button;
-
-    // Callback invoked when the axis is calibrated.
-    txt_joystick_axis_callback_t callback;
-};
-
-txt_joystick_axis_t *TXT_NewJoystickAxis(int *axis, int *invert, int *dead_zone,
-                                         txt_joystick_axis_direction_t dir);
-
-// Configure a joystick axis widget.
-//   axis: The axis widget to configure.
-//   using_button: If non-negative, use this joystick button as the button
-//       to expect from the user. Otherwise, ask.
-void TXT_ConfigureJoystickAxis(txt_joystick_axis_t *axis, int using_button,
-                               txt_joystick_axis_callback_t callback);
-
-#endif /* #ifndef TXT_JOY_AXIS_H */
-
-
diff --git a/games/NXDoom/src/setup/txt_joybinput.c b/games/NXDoom/src/setup/txt_joybinput.c
deleted file mode 100644
index a4362e340..000000000
--- a/games/NXDoom/src/setup/txt_joybinput.c
+++ /dev/null
@@ -1,780 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "SDL_joystick.h"
-#include "SDL_gamecontroller.h"
-
-#include "doomkeys.h"
-#include "joystick.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "m_controls.h"
-#include "m_misc.h"
-
-#include "txt_joybinput.h"
-#include "txt_gui.h"
-#include "txt_io.h"
-#include "txt_label.h"
-#include "txt_sdl.h"
-#include "txt_utf8.h"
-#include "txt_window.h"
-
-#define JOYSTICK_INPUT_WIDTH 10
-
-
-// Joystick button variables.
-// The ordering of this array is important. We will always try to map
-// each variable to the virtual button with the same array index. For
-// example: joybfire should always be 0, and then we change
-// joystick_physical_buttons[0] to point to the physical joystick
-// button that the user wants to use for firing. We do this so that
-// the menus work (the game code is hard coded to interpret
-// button #0 = select menu item, button #1 = go back to previous menu).
-static int *all_joystick_buttons[NUM_VIRTUAL_BUTTONS] =
-{
-    &joybfire,
-    &joybuse,
-    &joybstrafe,
-    &joybspeed,
-    &joybstrafeleft,
-    &joybstraferight,
-    &joybprevweapon,
-    &joybnextweapon,
-    &joybjump,
-    &joybmenu,
-    &joybautomap,
-    &joybuseartifact,
-    &joybinvleft,
-    &joybinvright,
-    &joybflyup,
-    &joybflydown,
-    &joybflycenter,
-};
-
-// For indirection so that we're not dependent on item ordering in the
-// SDL_GameControllerButton enum.
-static const int gamepad_buttons[GAMEPAD_BUTTON_MAX] =
-{
-   SDL_CONTROLLER_BUTTON_A,
-   SDL_CONTROLLER_BUTTON_B,
-   SDL_CONTROLLER_BUTTON_X,
-   SDL_CONTROLLER_BUTTON_Y,
-   SDL_CONTROLLER_BUTTON_BACK,
-   SDL_CONTROLLER_BUTTON_GUIDE,
-   SDL_CONTROLLER_BUTTON_START,
-   SDL_CONTROLLER_BUTTON_LEFTSTICK,
-   SDL_CONTROLLER_BUTTON_RIGHTSTICK,
-   SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
-   SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
-   SDL_CONTROLLER_BUTTON_DPAD_UP,
-   SDL_CONTROLLER_BUTTON_DPAD_DOWN,
-   SDL_CONTROLLER_BUTTON_DPAD_LEFT,
-   SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
-   SDL_CONTROLLER_BUTTON_MISC1,
-   SDL_CONTROLLER_BUTTON_PADDLE1,
-   SDL_CONTROLLER_BUTTON_PADDLE2,
-   SDL_CONTROLLER_BUTTON_PADDLE3,
-   SDL_CONTROLLER_BUTTON_PADDLE4,
-   SDL_CONTROLLER_BUTTON_TOUCHPAD,
-   GAMEPAD_BUTTON_TRIGGERLEFT,
-   GAMEPAD_BUTTON_TRIGGERRIGHT,
-};
-
-// Items in the following button lists are ordered according to gamepad_buttons
-// above.
-static const char *xbox360_buttons[GAMEPAD_BUTTON_MAX] =
-{
-    "A",
-    "B",
-    "X",
-    "Y",
-    "BACK",
-    "GUIDE",
-    "START",
-    "LSB",
-    "RSB",
-    "LB",
-    "RB",
-    "DPAD U",
-    "DPAD D",
-    "DPAD L",
-    "DPAD R",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "LT",
-    "RT",
-};
-
-static const char *xboxone_buttons[GAMEPAD_BUTTON_MAX] =
-{
-    "A",
-    "B",
-    "X",
-    "Y",
-    "VIEW",
-    "XBOX",
-    "MENU",
-    "LSB",
-    "RSB",
-    "LB",
-    "RB",
-    "DPAD U",
-    "DPAD D",
-    "DPAD L",
-    "DPAD R",
-    "PROFILE",
-    "P1",
-    "P2",
-    "P3",
-    "P4",
-    "",
-    "LT",
-    "RT",
-};
-
-static const char *ps3_buttons[GAMEPAD_BUTTON_MAX] =
-{
-    "X",
-    "CIRCLE",
-    "SQUARE",
-    "TRIANGLE",
-    "SELECT",
-    "PS",
-    "START",
-    "L3",
-    "R3",
-    "L1",
-    "R1",
-    "DPAD U",
-    "DPAD D",
-    "DPAD L",
-    "DPAD R",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "L2",
-    "R2",
-};
-
-static const char *ps4_buttons[GAMEPAD_BUTTON_MAX] =
-{
-    "X",
-    "CIRCLE",
-    "SQUARE",
-    "TRIANGLE",
-    "SHARE",
-    "PS",
-    "OPTIONS",
-    "L3",
-    "R3",
-    "L1",
-    "R1",
-    "DPAD U",
-    "DPAD D",
-    "DPAD L",
-    "DPAD R",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "TOUCH",
-    "L2",
-    "R2",
-};
-
-static const char *ps5_buttons[GAMEPAD_BUTTON_MAX] =
-{
-    "X",
-    "CIRCLE",
-    "SQUARE",
-    "TRIANGLE",
-    "SHARE",
-    "PS",
-    "OPTIONS",
-    "L3",
-    "R3",
-    "L1",
-    "R1",
-    "DPAD U",
-    "DPAD D",
-    "DPAD L",
-    "DPAD R",
-    "MUTE",
-    "",
-    "",
-    "",
-    "",
-    "TOUCH",
-    "L2",
-    "R2",
-};
-
-static const char *switchpro_buttons[GAMEPAD_BUTTON_MAX] =
-{
-    "B",
-    "A",
-    "Y",
-    "X",
-    "MINUS",
-    "HOME",
-    "PLUS",
-    "LSB",
-    "RSB",
-    "L",
-    "R",
-    "DPAD U",
-    "DPAD D",
-    "DPAD L",
-    "DPAD R",
-    "CAPTURE",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "ZL",
-    "ZR",
-};
-
-static int PhysicalForVirtualButton(int vbutton)
-{
-    if (vbutton < NUM_VIRTUAL_BUTTONS)
-    {
-        return joystick_physical_buttons[vbutton];
-    }
-    else
-    {
-        return vbutton;
-    }
-}
-
-// Get the virtual button number for the given variable, ie. the
-// variable's index in all_joystick_buttons[NUM_VIRTUAL_BUTTONS].
-static int VirtualButtonForVariable(int *variable)
-{
-    int i;
-
-    for (i = 0; i < arrlen(all_joystick_buttons); ++i)
-    {
-        if (variable == all_joystick_buttons[i])
-        {
-            return i;
-        }
-    }
-
-    I_Error("Couldn't find virtual button");
-    return -1;
-}
-
-// Rearrange joystick button configuration to be in "canonical" form:
-// each joyb* variable should have a value equal to its index in
-// all_joystick_buttons[NUM_VIRTUAL_BUTTONS] above.
-static void CanonicalizeButtons(void)
-{
-    int new_mapping[NUM_VIRTUAL_BUTTONS];
-    int vbutton;
-    int i;
-
-    for (i = 0; i < arrlen(all_joystick_buttons); ++i)
-    {
-        vbutton = *all_joystick_buttons[i];
-
-        // Don't remap the speed key if it's bound to "always run".
-        // Also preserve "unbound" variables.
-        if ((all_joystick_buttons[i] == &joybspeed &&
-             vbutton >= MAX_VIRTUAL_BUTTONS) ||
-            vbutton < 0)
-        {
-            new_mapping[i] = i;
-        }
-        else
-        {
-            new_mapping[i] = PhysicalForVirtualButton(vbutton);
-            *all_joystick_buttons[i] = i;
-        }
-    }
-
-    for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i)
-    {
-        joystick_physical_buttons[i] = new_mapping[i];
-    }
-}
-
-// Check all existing buttons and clear any using the specified physical
-// button.
-static void ClearVariablesUsingButton(int physbutton)
-{
-    int vbutton;
-    int i;
-
-    for (i = 0; i < arrlen(all_joystick_buttons); ++i)
-    {
-        vbutton = *all_joystick_buttons[i];
-
-        if (vbutton >= 0 && physbutton == PhysicalForVirtualButton(vbutton))
-        {
-            *all_joystick_buttons[i] = -1;
-        }
-    }
-}
-
-// Called in response to SDL events when the prompt window is open:
-
-static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_input))
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-
-    // Got the joystick button press?
-
-    if (event->type == SDL_JOYBUTTONDOWN)
-    {
-        int vbutton, physbutton;
-
-        // Before changing anything, remap button configuration into
-        // canonical form, to avoid conflicts.
-        CanonicalizeButtons();
-
-        vbutton = VirtualButtonForVariable(joystick_input->variable);
-        physbutton = event->jbutton.button;
-
-        if (joystick_input->check_conflicts)
-        {
-            ClearVariablesUsingButton(physbutton);
-        }
-
-        // Set mapping.
-        *joystick_input->variable = vbutton;
-        joystick_physical_buttons[vbutton] = physbutton;
-
-        TXT_CloseWindow(joystick_input->prompt_window);
-        return 1;
-    }
-
-    return 0;
-}
-
-static int EventCallbackGamepad(SDL_Event *event,
-                                TXT_UNCAST_ARG(joystick_input))
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-
-    // Got the joystick button press?
-
-    if (event->type == SDL_CONTROLLERBUTTONDOWN ||
-        event->type == SDL_CONTROLLERAXISMOTION)
-    {
-        int vbutton, physbutton, axis;
-
-        // Before changing anything, remap button configuration into
-        // canonical form, to avoid conflicts.
-        CanonicalizeButtons();
-
-        vbutton = VirtualButtonForVariable(joystick_input->variable);
-        axis = event->caxis.axis;
-
-        if (event->type == SDL_CONTROLLERAXISMOTION &&
-            (axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT ||
-             axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT) &&
-            event->caxis.value > TRIGGER_THRESHOLD)
-        {
-            if (axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT)
-            {
-                physbutton = GAMEPAD_BUTTON_TRIGGERLEFT;
-            }
-            else
-            {
-                physbutton = GAMEPAD_BUTTON_TRIGGERRIGHT;
-            }
-        }
-        else if (event->type == SDL_CONTROLLERBUTTONDOWN)
-        {
-            physbutton = event->cbutton.button;
-        }
-        else
-        {
-            return 0;
-        }
-
-        if (joystick_input->check_conflicts)
-        {
-            ClearVariablesUsingButton(physbutton);
-        }
-
-        // Set mapping.
-        *joystick_input->variable = vbutton;
-        joystick_physical_buttons[vbutton] = physbutton;
-
-        TXT_CloseWindow(joystick_input->prompt_window);
-        return 1;
-    }
-
-    return 0;
-}
-
-// When the prompt window is closed, disable the event callback function;
-// we are no longer interested in receiving notification of events.
-
-static void PromptWindowClosed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(joystick))
-{
-    TXT_CAST_ARG(SDL_Joystick, joystick);
-
-    SDL_JoystickClose(joystick);
-    TXT_SDL_SetEventCallback(NULL, NULL);
-    SDL_JoystickEventState(SDL_DISABLE);
-    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-}
-
-static void PromptWindowClosedGamepad(TXT_UNCAST_ARG(widget),
-                                      TXT_UNCAST_ARG(joystick))
-{
-    TXT_CAST_ARG(SDL_GameController, joystick);
-
-    SDL_GameControllerClose(joystick);
-    TXT_SDL_SetEventCallback(NULL, NULL);
-    SDL_JoystickEventState(SDL_DISABLE);
-    SDL_GameControllerEventState(SDL_DISABLE);
-    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
-}
-
-static void OpenErrorWindow(void)
-{
-    TXT_MessageBox(NULL, "Please configure a controller first!");
-}
-
-static void OpenPromptWindow(txt_joystick_input_t *joystick_input)
-{
-    txt_window_t *window;
-    SDL_Joystick *joystick;
-
-    // Silently update when the shift button is held down.
-
-    joystick_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
-
-    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
-    {
-        return;
-    }
-
-    // Check the current joystick is valid
-
-    joystick = SDL_JoystickOpen(joystick_index);
-
-    if (joystick == NULL)
-    {
-        OpenErrorWindow();
-        return;
-    }
-
-    // Open the prompt window
-
-    window = TXT_MessageBox(NULL, "Press the new button on the controller...");
-
-    TXT_SDL_SetEventCallback(EventCallback, joystick_input);
-    TXT_SignalConnect(window, "closed", PromptWindowClosed, joystick);
-    joystick_input->prompt_window = window;
-
-    SDL_JoystickEventState(SDL_ENABLE);
-}
-
-static void OpenPromptWindowGamepad(txt_joystick_input_t *joystick_input)
-{
-    txt_window_t *window;
-    SDL_GameController *gamepad;
-
-    // Silently update when the shift button is held down.
-
-    joystick_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
-
-    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
-    {
-        return;
-    }
-
-    // Check the current joystick is valid
-
-    gamepad = SDL_GameControllerOpen(joystick_index);
-
-    if (gamepad == NULL)
-    {
-        OpenErrorWindow();
-        return;
-    }
-
-    // Open the prompt window
-
-    window = TXT_MessageBox(NULL, "Press the new button on the controller...");
-
-    TXT_SDL_SetEventCallback(EventCallbackGamepad, joystick_input);
-    TXT_SignalConnect(window, "closed", PromptWindowClosedGamepad, gamepad);
-    joystick_input->prompt_window = window;
-
-    // GameController events do not fire if Joystick events are disabled.
-    SDL_JoystickEventState(SDL_ENABLE);
-    SDL_GameControllerEventState(SDL_ENABLE);
-}
-
-static void TXT_JoystickInputSizeCalc(TXT_UNCAST_ARG(joystick_input))
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-
-    // All joystickinputs are the same size.
-
-    joystick_input->widget.w = JOYSTICK_INPUT_WIDTH;
-    joystick_input->widget.h = 1;
-}
-
-static void GetJoystickButtonDescription(int vbutton, char *buf,
-                                         size_t buf_len)
-{
-    M_snprintf(buf, buf_len, "BUTTON #%i",
-               PhysicalForVirtualButton(vbutton) + 1);
-}
-
-static void TXT_JoystickInputDrawer(TXT_UNCAST_ARG(joystick_input))
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-    char buf[20];
-    int i;
-
-    if (*joystick_input->variable < 0)
-    {
-        M_StringCopy(buf, "(none)", sizeof(buf));
-    }
-    else
-    {
-        GetJoystickButtonDescription(*joystick_input->variable,
-                                     buf, sizeof(buf));
-    }
-
-    TXT_SetWidgetBG(joystick_input);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    TXT_DrawString(buf);
-
-    for (i = TXT_UTF8_Strlen(buf); i < JOYSTICK_INPUT_WIDTH; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static int GetGamepadButtonIndex(int button)
-{
-    int i;
-
-    for (i = 0; i < arrlen(gamepad_buttons); ++i)
-    {
-        if (button == gamepad_buttons[i])
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-static void GetGamepadButtonDescription(int vbutton, char *buf, size_t buf_len)
-{
-    int index;
-
-    index = GetGamepadButtonIndex(PhysicalForVirtualButton(vbutton));
-
-    if (index < 0)
-    {
-        M_StringCopy(buf, "(unknown)", buf_len);
-        return;
-    }
-
-    switch (gamepad_type)
-    {
-        case SDL_CONTROLLER_TYPE_XBOX360:
-            M_snprintf(buf, buf_len, "%s", xbox360_buttons[index]);
-            break;
-
-        case SDL_CONTROLLER_TYPE_XBOXONE:
-            M_snprintf(buf, buf_len, "%s", xboxone_buttons[index]);
-            break;
-
-        case SDL_CONTROLLER_TYPE_PS3:
-            M_snprintf(buf, buf_len, "%s", ps3_buttons[index]);
-            break;
-
-        case SDL_CONTROLLER_TYPE_PS4:
-            M_snprintf(buf, buf_len, "%s", ps4_buttons[index]);
-            break;
-
-        case SDL_CONTROLLER_TYPE_PS5:
-            M_snprintf(buf, buf_len, "%s", ps5_buttons[index]);
-            break;
-
-        case SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO:
-            M_snprintf(buf, buf_len, "%s", switchpro_buttons[index]);
-            break;
-
-        default:
-            M_snprintf(buf, buf_len, "BUTTON #%i",
-                       PhysicalForVirtualButton(vbutton) + 1);
-            break;
-    }
-}
-
-static void TXT_GamepadInputDrawer(TXT_UNCAST_ARG(joystick_input))
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-    char buf[20]; // Need to fit "BUTTON #XX"
-    int i;
-
-    if (*joystick_input->variable < 0)
-    {
-        M_StringCopy(buf, "(none)", sizeof(buf));
-    }
-    else
-    {
-        GetGamepadButtonDescription(*joystick_input->variable, buf,
-                                    sizeof(buf));
-    }
-
-    TXT_SetWidgetBG(joystick_input);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    TXT_DrawString(buf);
-
-    for (i = TXT_UTF8_Strlen(buf); i < JOYSTICK_INPUT_WIDTH; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_JoystickInputDestructor(TXT_UNCAST_ARG(joystick_input))
-{
-}
-
-static int TXT_JoystickInputKeyPress(TXT_UNCAST_ARG(joystick_input), int key)
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-
-    if (key == KEY_ENTER)
-    {
-        // Open a window to prompt for the new joystick press
-        OpenPromptWindow(joystick_input);
-
-        return 1;
-    }
-
-    if (key == KEY_BACKSPACE || key == KEY_DEL)
-    {
-        *joystick_input->variable = -1;
-    }
-
-    return 0;
-}
-
-static int TXT_GamepadInputKeyPress(TXT_UNCAST_ARG(joystick_input), int key)
-{
-    TXT_CAST_ARG(txt_joystick_input_t, joystick_input);
-
-    if (key == KEY_ENTER)
-    {
-        // Open a window to prompt for the new joystick press
-        OpenPromptWindowGamepad(joystick_input);
-
-        return 1;
-    }
-
-    if (key == KEY_BACKSPACE || key == KEY_DEL)
-    {
-        *joystick_input->variable = -1;
-    }
-
-    return 0;
-}
-
-static void TXT_JoystickInputMousePress(TXT_UNCAST_ARG(widget),
-                                        int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_joystick_input_t, widget);
-
-    // Clicking is like pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_JoystickInputKeyPress(widget, KEY_ENTER);
-    }
-}
-
-static void TXT_GamepadInputMousePress(TXT_UNCAST_ARG(widget), int x, int y,
-                                       int b)
-{
-    TXT_CAST_ARG(txt_joystick_input_t, widget);
-
-    // Clicking is like pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_GamepadInputKeyPress(widget, KEY_ENTER);
-    }
-}
-
-txt_widget_class_t txt_joystick_input_class =
-{
-    TXT_AlwaysSelectable,
-    TXT_JoystickInputSizeCalc,
-    TXT_JoystickInputDrawer,
-    TXT_JoystickInputKeyPress,
-    TXT_JoystickInputDestructor,
-    TXT_JoystickInputMousePress,
-    NULL,
-};
-
-txt_widget_class_t txt_gamepad_input_class =
-{
-    TXT_AlwaysSelectable,
-    TXT_JoystickInputSizeCalc,
-    TXT_GamepadInputDrawer,
-    TXT_GamepadInputKeyPress,
-    TXT_JoystickInputDestructor,
-    TXT_GamepadInputMousePress,
-    NULL,
-};
-
-txt_joystick_input_t *TXT_NewJoystickInput(int *variable)
-{
-    txt_joystick_input_t *joystick_input;
-
-    joystick_input = malloc(sizeof(txt_joystick_input_t));
-
-    if (use_gamepad)
-    {
-        TXT_InitWidget(joystick_input, &txt_gamepad_input_class);
-    }
-    else
-    {
-        TXT_InitWidget(joystick_input, &txt_joystick_input_class);
-    }
-    joystick_input->variable = variable;
-
-    return joystick_input;
-}
-
diff --git a/games/NXDoom/src/setup/txt_joybinput.h b/games/NXDoom/src/setup/txt_joybinput.h
deleted file mode 100644
index 26a9f24c3..000000000
--- a/games/NXDoom/src/setup/txt_joybinput.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef TXT_JOYB_INPUT_H
-#define TXT_JOYB_INPUT_H
-
-typedef struct txt_joystick_input_s txt_joystick_input_t;
-
-#include "txt_widget.h"
-#include "txt_window.h"
-
-//
-// A joystick input is like an input box.  When selected, a box pops up
-// allowing a joystick button to be pressed to select it.
-//
-
-struct txt_joystick_input_s
-{
-    txt_widget_t widget;
-    int *variable;
-    txt_window_t *prompt_window;
-    int check_conflicts;
-};
-
-txt_joystick_input_t *TXT_NewJoystickInput(int *variable);
-
-#endif /* #ifndef TXT_JOYB_INPUT_H */
-
-
diff --git a/games/NXDoom/src/setup/txt_keyinput.c b/games/NXDoom/src/setup/txt_keyinput.c
deleted file mode 100644
index 6c3b35917..000000000
--- a/games/NXDoom/src/setup/txt_keyinput.c
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomkeys.h"
-#include "m_misc.h"
-
-#include "txt_keyinput.h"
-#include "txt_gui.h"
-#include "txt_io.h"
-#include "txt_label.h"
-#include "txt_utf8.h"
-#include "txt_window.h"
-
-#define KEY_INPUT_WIDTH 8
-
-static int KeyPressCallback(txt_window_t *window, int key, 
-                            TXT_UNCAST_ARG(key_input))
-{
-    TXT_CAST_ARG(txt_key_input_t, key_input);
-
-    if (key != KEY_ESCAPE)
-    {
-        // Got the key press. Save to the variable and close the window.
-
-        *key_input->variable = key;
-
-        if (key_input->check_conflicts)
-        {
-            TXT_EmitSignal(key_input, "set");
-        }
-
-        TXT_CloseWindow(window);
-
-        // Return to normal input mode now that we have the key.
-        TXT_SetInputMode(TXT_INPUT_NORMAL);
-
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-static void ReleaseGrab(TXT_UNCAST_ARG(window), TXT_UNCAST_ARG(unused))
-{
-    // SDL2-TODO: Needed?
-    // SDL_WM_GrabInput(SDL_GRAB_OFF);
-}
-
-static void OpenPromptWindow(txt_key_input_t *key_input)
-{
-    txt_window_t *window;
-
-    // Silently update when the shift button is held down.
-
-    key_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
-
-    window = TXT_MessageBox(NULL, "Press the new key...");
-
-    TXT_SetKeyListener(window, KeyPressCallback, key_input);
-
-    // Switch to raw input mode while we're grabbing the key.
-    TXT_SetInputMode(TXT_INPUT_RAW);
-
-    // Grab input while reading the key.  On Windows Mobile
-    // handheld devices, the hardware keypresses are only
-    // detected when input is grabbed.
-
-    // SDL2-TODO: Needed?
-    //SDL_WM_GrabInput(SDL_GRAB_ON);
-    TXT_SignalConnect(window, "closed", ReleaseGrab, NULL);
-}
-
-static void TXT_KeyInputSizeCalc(TXT_UNCAST_ARG(key_input))
-{
-    TXT_CAST_ARG(txt_key_input_t, key_input);
-
-    // All keyinputs are the same size.
-
-    key_input->widget.w = KEY_INPUT_WIDTH;
-    key_input->widget.h = 1;
-}
-
-
-static void TXT_KeyInputDrawer(TXT_UNCAST_ARG(key_input))
-{
-    TXT_CAST_ARG(txt_key_input_t, key_input);
-    char buf[20];
-    int i;
-
-    if (*key_input->variable == 0)
-    {
-        M_StringCopy(buf, "(none)", sizeof(buf));
-    }
-    else
-    {
-        TXT_GetKeyDescription(*key_input->variable, buf, sizeof(buf));
-    }
-
-    TXT_SetWidgetBG(key_input);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    TXT_DrawString(buf);
-
-    for (i = TXT_UTF8_Strlen(buf); i < KEY_INPUT_WIDTH; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_KeyInputDestructor(TXT_UNCAST_ARG(key_input))
-{
-}
-
-static int TXT_KeyInputKeyPress(TXT_UNCAST_ARG(key_input), int key)
-{
-    TXT_CAST_ARG(txt_key_input_t, key_input);
-
-    if (key == KEY_ENTER)
-    {
-        // Open a window to prompt for the new key press
-
-        OpenPromptWindow(key_input);
-
-        return 1;
-    }
-
-    if (key == KEY_BACKSPACE || key == KEY_DEL)
-    {
-        *key_input->variable = 0;
-    }
-
-    return 0;
-}
-
-static void TXT_KeyInputMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_key_input_t, widget);
-            
-    // Clicking is like pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_KeyInputKeyPress(widget, KEY_ENTER);
-    }
-}
-
-txt_widget_class_t txt_key_input_class =
-{
-    TXT_AlwaysSelectable,
-    TXT_KeyInputSizeCalc,
-    TXT_KeyInputDrawer,
-    TXT_KeyInputKeyPress,
-    TXT_KeyInputDestructor,
-    TXT_KeyInputMousePress,
-    NULL,
-};
-
-txt_key_input_t *TXT_NewKeyInput(int *variable)
-{
-    txt_key_input_t *key_input;
-
-    key_input = malloc(sizeof(txt_key_input_t));
-
-    TXT_InitWidget(key_input, &txt_key_input_class);
-    key_input->variable = variable;
-
-    return key_input;
-}
-
diff --git a/games/NXDoom/src/setup/txt_keyinput.h b/games/NXDoom/src/setup/txt_keyinput.h
deleted file mode 100644
index 334d6c1cf..000000000
--- a/games/NXDoom/src/setup/txt_keyinput.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef TXT_KEY_INPUT_H
-#define TXT_KEY_INPUT_H
-
-typedef struct txt_key_input_s txt_key_input_t;
-
-#include "txt_widget.h"
-
-//
-// A key input is like an input box.  When selected, a box pops up
-// allowing a key to be selected.
-//
-
-struct txt_key_input_s
-{
-    txt_widget_t widget;
-    int *variable;
-    int check_conflicts;
-};
-
-txt_key_input_t *TXT_NewKeyInput(int *variable);
-
-#endif /* #ifndef TXT_KEY_INPUT_H */
-
-
diff --git a/games/NXDoom/src/setup/txt_mouseinput.c b/games/NXDoom/src/setup/txt_mouseinput.c
deleted file mode 100644
index 99196a581..000000000
--- a/games/NXDoom/src/setup/txt_mouseinput.c
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomkeys.h"
-#include "m_misc.h"
-
-#include "txt_mouseinput.h"
-#include "txt_gui.h"
-#include "txt_io.h"
-#include "txt_label.h"
-#include "txt_utf8.h"
-#include "txt_window.h"
-
-// eg. "BUTTON #10"
-#define MOUSE_INPUT_WIDTH 10
-
-static int MousePressCallback(txt_window_t *window, 
-                              int x, int y, int b,
-                              TXT_UNCAST_ARG(mouse_input))
-{
-    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
-
-    // Got the mouse press.  Save to the variable and close the window.
-
-    *mouse_input->variable = b - TXT_MOUSE_BASE;
-
-    if (mouse_input->check_conflicts)
-    {
-        TXT_EmitSignal(mouse_input, "set");
-    }
-
-    TXT_CloseWindow(window);
-
-    return 1;
-}
-
-static void OpenPromptWindow(txt_mouse_input_t *mouse_input)
-{
-    txt_window_t *window;
-
-    // Silently update when the shift key is held down.
-    mouse_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);
-
-    window = TXT_MessageBox(NULL, "Press the new mouse button...");
-
-    TXT_SetMouseListener(window, MousePressCallback, mouse_input);
-}
-
-static void TXT_MouseInputSizeCalc(TXT_UNCAST_ARG(mouse_input))
-{
-    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
-
-    // All mouseinputs are the same size.
-
-    mouse_input->widget.w = MOUSE_INPUT_WIDTH;
-    mouse_input->widget.h = 1;
-}
-
-static void GetMouseButtonDescription(int button, char *buf, size_t buf_len)
-{
-    switch (button)
-    {
-        case 0:
-            M_StringCopy(buf, "LEFT", buf_len);
-            break;
-        case 1:
-            M_StringCopy(buf, "RIGHT", buf_len);
-            break;
-        case 2:
-            M_StringCopy(buf, "MID", buf_len);
-            break;
-        case 3:
-            M_StringCopy(buf, "WHEEL UP", buf_len);
-            break;
-        case 4:
-            M_StringCopy(buf, "WHEEL DOWN", buf_len);
-            break;
-        default:
-            M_snprintf(buf, buf_len, "BUTTON #%i", button - 1);
-            break;
-    }
-}
-
-static void TXT_MouseInputDrawer(TXT_UNCAST_ARG(mouse_input))
-{
-    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
-    char buf[20];
-    int i;
-
-    if (*mouse_input->variable < 0)
-    {
-        M_StringCopy(buf, "(none)", sizeof(buf));
-    }
-    else
-    {
-        GetMouseButtonDescription(*mouse_input->variable, buf, sizeof(buf));
-    }
-
-    TXT_SetWidgetBG(mouse_input);
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-    
-    TXT_DrawString(buf);
-    
-    for (i = TXT_UTF8_Strlen(buf); i < MOUSE_INPUT_WIDTH; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_MouseInputDestructor(TXT_UNCAST_ARG(mouse_input))
-{
-}
-
-static int TXT_MouseInputKeyPress(TXT_UNCAST_ARG(mouse_input), int key)
-{
-    TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
-
-    if (key == KEY_ENTER)
-    {
-        // Open a window to prompt for the new mouse press
-
-        OpenPromptWindow(mouse_input);
-
-        return 1;
-    }
-
-    if (key == KEY_BACKSPACE || key == KEY_DEL)
-    {
-        *mouse_input->variable = -1;
-    }
-
-    return 0;
-}
-
-static void TXT_MouseInputMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_mouse_input_t, widget);
-
-    // Clicking is like pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_MouseInputKeyPress(widget, KEY_ENTER);
-    }
-}
-
-txt_widget_class_t txt_mouse_input_class =
-{
-    TXT_AlwaysSelectable,
-    TXT_MouseInputSizeCalc,
-    TXT_MouseInputDrawer,
-    TXT_MouseInputKeyPress,
-    TXT_MouseInputDestructor,
-    TXT_MouseInputMousePress,
-    NULL,
-};
-
-txt_mouse_input_t *TXT_NewMouseInput(int *variable)
-{
-    txt_mouse_input_t *mouse_input;
-
-    mouse_input = malloc(sizeof(txt_mouse_input_t));
-
-    TXT_InitWidget(mouse_input, &txt_mouse_input_class);
-    mouse_input->variable = variable;
-
-    return mouse_input;
-}
-
diff --git a/games/NXDoom/src/setup/txt_mouseinput.h b/games/NXDoom/src/setup/txt_mouseinput.h
deleted file mode 100644
index 2b05c3718..000000000
--- a/games/NXDoom/src/setup/txt_mouseinput.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-
-#ifndef TXT_MOUSE_INPUT_H
-#define TXT_MOUSE_INPUT_H
-
-typedef struct txt_mouse_input_s txt_mouse_input_t;
-
-#include "txt_widget.h"
-
-//
-// A mouse input is like an input box.  When selected, a box pops up
-// allowing a mouse to be selected.
-//
-
-struct txt_mouse_input_s
-{
-    txt_widget_t widget;
-    int *variable;
-    int check_conflicts;
-};
-
-txt_mouse_input_t *TXT_NewMouseInput(int *variable);
-
-#endif /* #ifndef TXT_MOUSE_INPUT_H */
-
-
diff --git a/games/NXDoom/src/sha1.c b/games/NXDoom/src/sha1.c
deleted file mode 100644
index 8504134a9..000000000
--- a/games/NXDoom/src/sha1.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* sha1.c - SHA1 hash function
- *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * Please see below for more legal information!
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
-
-/*  Test vectors:
- *
- *  "abc"
- *  A999 3E36 4706 816A BA3E  2571 7850 C26C 9CD0 D89D
- *
- *  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- *  8498 3E44 1C3B D26E BAAE  4AA1 F951 29E5 E546 70F1
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "i_swap.h"
-#include "sha1.h"
-
-void SHA1_Init(sha1_context_t *hd)
-{
-    hd->h0 = 0x67452301;
-    hd->h1 = 0xefcdab89;
-    hd->h2 = 0x98badcfe;
-    hd->h3 = 0x10325476;
-    hd->h4 = 0xc3d2e1f0;
-    hd->nblocks = 0;
-    hd->count = 0;
-}
-
-
-/****************
- * Transform the message X which consists of 16 32-bit-words
- */
-static void Transform(sha1_context_t *hd, byte *data)
-{
-    uint32_t a,b,c,d,e,tm;
-    uint32_t x[16];
-
-    /* get values from the chaining vars */
-    a = hd->h0;
-    b = hd->h1;
-    c = hd->h2;
-    d = hd->h3;
-    e = hd->h4;
-
-#ifdef SYS_BIG_ENDIAN
-    memcpy(x, data, 64);
-#else
-    {
-        int i;
-        byte *p2;
-        for(i=0, p2=(byte*)x; i < 16; i++, p2 += 4 )
-        {
-            p2[3] = *data++;
-            p2[2] = *data++;
-            p2[1] = *data++;
-            p2[0] = *data++;
-        }
-    }
-#endif
-
-
-#define K1  0x5A827999L
-#define K2  0x6ED9EBA1L
-#define K3  0x8F1BBCDCL
-#define K4  0xCA62C1D6L
-#define F1(x,y,z)   ( z ^ ( x & ( y ^ z ) ) )
-#define F2(x,y,z)   ( x ^ y ^ z )
-#define F3(x,y,z)   ( ( x & y ) | ( z & ( x | y ) ) )
-#define F4(x,y,z)   ( x ^ y ^ z )
-
-#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
-
-#define M(i) ( tm =   x[i&0x0f] ^ x[(i-14)&0x0f] \
-		    ^ x[(i-8)&0x0f] ^ x[(i-3)&0x0f] \
-	       , (x[i&0x0f] = rol(tm,1)) )
-
-#define R(a,b,c,d,e,f,k,m)  do { e += rol( a, 5 )     \
-				      + f( b, c, d )  \
-				      + k	      \
-				      + m;	      \
-				 b = rol( b, 30 );    \
-			       } while(0)
-    R( a, b, c, d, e, F1, K1, x[ 0] );
-    R( e, a, b, c, d, F1, K1, x[ 1] );
-    R( d, e, a, b, c, F1, K1, x[ 2] );
-    R( c, d, e, a, b, F1, K1, x[ 3] );
-    R( b, c, d, e, a, F1, K1, x[ 4] );
-    R( a, b, c, d, e, F1, K1, x[ 5] );
-    R( e, a, b, c, d, F1, K1, x[ 6] );
-    R( d, e, a, b, c, F1, K1, x[ 7] );
-    R( c, d, e, a, b, F1, K1, x[ 8] );
-    R( b, c, d, e, a, F1, K1, x[ 9] );
-    R( a, b, c, d, e, F1, K1, x[10] );
-    R( e, a, b, c, d, F1, K1, x[11] );
-    R( d, e, a, b, c, F1, K1, x[12] );
-    R( c, d, e, a, b, F1, K1, x[13] );
-    R( b, c, d, e, a, F1, K1, x[14] );
-    R( a, b, c, d, e, F1, K1, x[15] );
-    R( e, a, b, c, d, F1, K1, M(16) );
-    R( d, e, a, b, c, F1, K1, M(17) );
-    R( c, d, e, a, b, F1, K1, M(18) );
-    R( b, c, d, e, a, F1, K1, M(19) );
-    R( a, b, c, d, e, F2, K2, M(20) );
-    R( e, a, b, c, d, F2, K2, M(21) );
-    R( d, e, a, b, c, F2, K2, M(22) );
-    R( c, d, e, a, b, F2, K2, M(23) );
-    R( b, c, d, e, a, F2, K2, M(24) );
-    R( a, b, c, d, e, F2, K2, M(25) );
-    R( e, a, b, c, d, F2, K2, M(26) );
-    R( d, e, a, b, c, F2, K2, M(27) );
-    R( c, d, e, a, b, F2, K2, M(28) );
-    R( b, c, d, e, a, F2, K2, M(29) );
-    R( a, b, c, d, e, F2, K2, M(30) );
-    R( e, a, b, c, d, F2, K2, M(31) );
-    R( d, e, a, b, c, F2, K2, M(32) );
-    R( c, d, e, a, b, F2, K2, M(33) );
-    R( b, c, d, e, a, F2, K2, M(34) );
-    R( a, b, c, d, e, F2, K2, M(35) );
-    R( e, a, b, c, d, F2, K2, M(36) );
-    R( d, e, a, b, c, F2, K2, M(37) );
-    R( c, d, e, a, b, F2, K2, M(38) );
-    R( b, c, d, e, a, F2, K2, M(39) );
-    R( a, b, c, d, e, F3, K3, M(40) );
-    R( e, a, b, c, d, F3, K3, M(41) );
-    R( d, e, a, b, c, F3, K3, M(42) );
-    R( c, d, e, a, b, F3, K3, M(43) );
-    R( b, c, d, e, a, F3, K3, M(44) );
-    R( a, b, c, d, e, F3, K3, M(45) );
-    R( e, a, b, c, d, F3, K3, M(46) );
-    R( d, e, a, b, c, F3, K3, M(47) );
-    R( c, d, e, a, b, F3, K3, M(48) );
-    R( b, c, d, e, a, F3, K3, M(49) );
-    R( a, b, c, d, e, F3, K3, M(50) );
-    R( e, a, b, c, d, F3, K3, M(51) );
-    R( d, e, a, b, c, F3, K3, M(52) );
-    R( c, d, e, a, b, F3, K3, M(53) );
-    R( b, c, d, e, a, F3, K3, M(54) );
-    R( a, b, c, d, e, F3, K3, M(55) );
-    R( e, a, b, c, d, F3, K3, M(56) );
-    R( d, e, a, b, c, F3, K3, M(57) );
-    R( c, d, e, a, b, F3, K3, M(58) );
-    R( b, c, d, e, a, F3, K3, M(59) );
-    R( a, b, c, d, e, F4, K4, M(60) );
-    R( e, a, b, c, d, F4, K4, M(61) );
-    R( d, e, a, b, c, F4, K4, M(62) );
-    R( c, d, e, a, b, F4, K4, M(63) );
-    R( b, c, d, e, a, F4, K4, M(64) );
-    R( a, b, c, d, e, F4, K4, M(65) );
-    R( e, a, b, c, d, F4, K4, M(66) );
-    R( d, e, a, b, c, F4, K4, M(67) );
-    R( c, d, e, a, b, F4, K4, M(68) );
-    R( b, c, d, e, a, F4, K4, M(69) );
-    R( a, b, c, d, e, F4, K4, M(70) );
-    R( e, a, b, c, d, F4, K4, M(71) );
-    R( d, e, a, b, c, F4, K4, M(72) );
-    R( c, d, e, a, b, F4, K4, M(73) );
-    R( b, c, d, e, a, F4, K4, M(74) );
-    R( a, b, c, d, e, F4, K4, M(75) );
-    R( e, a, b, c, d, F4, K4, M(76) );
-    R( d, e, a, b, c, F4, K4, M(77) );
-    R( c, d, e, a, b, F4, K4, M(78) );
-    R( b, c, d, e, a, F4, K4, M(79) );
-
-    /* update chainig vars */
-    hd->h0 += a;
-    hd->h1 += b;
-    hd->h2 += c;
-    hd->h3 += d;
-    hd->h4 += e;
-}
-
-
-/* Update the message digest with the contents
- * of INBUF with length INLEN.
- */
-void SHA1_Update(sha1_context_t *hd, byte *inbuf, size_t inlen)
-{
-    if (hd->count == 64)
-    {
-        /* flush the buffer */
-	Transform(hd, hd->buf);
-	hd->count = 0;
-	hd->nblocks++;
-    }
-    if (!inbuf)
-	return;
-    if (hd->count)
-    {
-	for (; inlen && hd->count < 64; inlen--)
-	    hd->buf[hd->count++] = *inbuf++;
-	SHA1_Update(hd, NULL, 0);
-	if (!inlen)
-	    return;
-    }
-
-    while (inlen >= 64)
-    {
-	Transform(hd, inbuf);
-	hd->count = 0;
-	hd->nblocks++;
-	inlen -= 64;
-	inbuf += 64;
-    }
-    for (; inlen && hd->count < 64; inlen--)
-	hd->buf[hd->count++] = *inbuf++;
-}
-
-
-/* The routine final terminates the computation and
- * returns the digest.
- * The handle is prepared for a new cycle, but adding bytes to the
- * handle will the destroy the returned buffer.
- * Returns: 20 bytes representing the digest.
- */
-
-void SHA1_Final(sha1_digest_t digest, sha1_context_t *hd)
-{
-    uint32_t t, msb, lsb;
-    byte *p;
-
-    SHA1_Update(hd, NULL, 0); /* flush */;
-
-    t = hd->nblocks;
-    /* multiply by 64 to make a byte count */
-    lsb = t << 6;
-    msb = t >> 26;
-    /* add the count */
-    t = lsb;
-    if ((lsb += hd->count) < t)
-	msb++;
-    /* multiply by 8 to make a bit count */
-    t = lsb;
-    lsb <<= 3;
-    msb <<= 3;
-    msb |= t >> 29;
-
-    if (hd->count < 56)
-    {
-        /* enough room */
-	hd->buf[hd->count++] = 0x80; /* pad */
-	while (hd->count < 56)
-	    hd->buf[hd->count++] = 0;  /* pad */
-    }
-    else
-    {
-        /* need one extra block */
-	hd->buf[hd->count++] = 0x80; /* pad character */
-	while (hd->count < 64)
-	    hd->buf[hd->count++] = 0;
-	SHA1_Update(hd, NULL, 0);  /* flush */;
-	memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
-    }
-    /* append the 64 bit count */
-    hd->buf[56] = msb >> 24;
-    hd->buf[57] = msb >> 16;
-    hd->buf[58] = msb >>  8;
-    hd->buf[59] = msb	   ;
-    hd->buf[60] = lsb >> 24;
-    hd->buf[61] = lsb >> 16;
-    hd->buf[62] = lsb >>  8;
-    hd->buf[63] = lsb	   ;
-    Transform(hd, hd->buf);
-
-    p = hd->buf;
-#ifdef SYS_BIG_ENDIAN
-#define X(a) do { *(uint32_t*)p = hd->h##a ; p += 4; } while(0)
-#else /* little endian */
-#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16;	 \
-		      *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0)
-#endif
-    X(0);
-    X(1);
-    X(2);
-    X(3);
-    X(4);
-#undef X
-
-    memcpy(digest, hd->buf, sizeof(sha1_digest_t));
-}
-
-void SHA1_UpdateInt32(sha1_context_t *context, unsigned int val)
-{
-    byte buf[4];
-
-    buf[0] = (val >> 24) & 0xff;
-    buf[1] = (val >> 16) & 0xff;
-    buf[2] = (val >> 8) & 0xff;
-    buf[3] = val & 0xff;
-
-    SHA1_Update(context, buf, 4);
-}
-
-void SHA1_UpdateString(sha1_context_t *context, char *str)
-{
-    SHA1_Update(context, (byte *) str, strlen(str) + 1);
-}
-
diff --git a/games/NXDoom/src/sha1.h b/games/NXDoom/src/sha1.h
index 249571be3..eb0f7c360 100644
--- a/games/NXDoom/src/sha1.h
+++ b/games/NXDoom/src/sha1.h
@@ -1,40 +1,59 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     SHA-1 digest.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/sha1.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   SHA-1 digest.
+ *
+ ****************************************************************************/
 
 #ifndef __SHA1_H__
 #define __SHA1_H__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <crypto/sha1.h>
+
 #include "doomtype.h"
 
-typedef struct sha1_context_s sha1_context_t;
-typedef byte sha1_digest_t[20];
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-struct sha1_context_s {
-    uint32_t h0,h1,h2,h3,h4;
-    uint32_t nblocks;
-    byte buf[64];
-    int count;
-};
+#define sha1_updatestring(ctx, str)                                          \
+  sha1update((ctx), (byte *)(str), strlen((str)) + 1)
 
-void SHA1_Init(sha1_context_t *context);
-void SHA1_Update(sha1_context_t *context, byte *buf, size_t len);
-void SHA1_Final(sha1_digest_t digest, sha1_context_t *context);
-void SHA1_UpdateInt32(sha1_context_t *context, unsigned int val);
-void SHA1_UpdateString(sha1_context_t *context, char *str);
+#define sha1_updateint32(ctx, val)                                           \
+  do                                                                         \
+    {                                                                        \
+      byte __sha1__tmp__buf[4];                                              \
+      __sha1__tmp__buf[0] = ((val) >> 24) & 0xff;                            \
+      __sha1__tmp__buf[1] = ((val) >> 16) & 0xff;                            \
+      __sha1__tmp__buf[2] = ((val) >> 8) & 0xff;                             \
+      __sha1__tmp__buf[3] = (val) & 0xff;                                    \
+      sha1update((ctx), __sha1__tmp__buf, 4);                                \
+    }                                                                        \
+  while (0)
 
-#endif /* #ifndef __SHA1_H__ */
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
+typedef byte sha1_digest_t[SHA1_DIGEST_LENGTH];
+
+#endif /* __SHA1_H__ */
diff --git a/games/NXDoom/src/strife-res.rc.in b/games/NXDoom/src/strife-res.rc.in
deleted file mode 100644
index ab9a2580d..000000000
--- a/games/NXDoom/src/strife-res.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-1 ICON "@top_srcdir@/data/strife.ico"
-
-#include <winuser.h>
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
-
-1 VERSIONINFO
-PRODUCTVERSION @WINDOWS_RC_VERSION@
-FILEVERSION @WINDOWS_RC_VERSION@
-FILETYPE 1
-{
- BLOCK "StringFileInfo"
- {
-  BLOCK "040904E4"
-  {
-   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
-   VALUE "FileDescription", "@PACKAGE_STRING@"
-   VALUE "InternalName", "@PACKAGE_TARNAME@"
-   VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
-   VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
-   VALUE "ProductName", "@PACKAGE_NAME@"
-   VALUE "ProductVersion", "@PACKAGE_VERSION@"
-  }
- }
- BLOCK "VarFileInfo"
- {
-  VALUE "Translation", 0x409, 1252
- }
-}
-
diff --git a/games/NXDoom/src/strife/.gitignore b/games/NXDoom/src/strife/.gitignore
deleted file mode 100644
index d4e88e5a2..000000000
--- a/games/NXDoom/src/strife/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-.deps
-tags
-TAGS
diff --git a/games/NXDoom/src/strife/CMakeLists.txt b/games/NXDoom/src/strife/CMakeLists.txt
deleted file mode 100644
index 20d336cdb..000000000
--- a/games/NXDoom/src/strife/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-set(STRIFE_SOURCES
-    am_map.c        am_map.h
-    deh_ammo.c
-    deh_cheat.c
-    deh_strife.c
-    deh_frame.c
-    deh_misc.c      deh_misc.h
-    deh_ptr.c
-    deh_sound.c
-    deh_thing.c
-    deh_weapon.c
-                    d_englsh.h
-    d_items.c       d_items.h
-    d_main.c        d_main.h
-    d_net.c
-                    doomdata.h
-    doomdef.c       doomdef.h
-    doomstat.c      doomstat.h
-                    d_player.h
-    dstrings.c      dstrings.h
-                    d_textur.h
-                    d_think.h
-    f_finale.c      f_finale.h
-    f_wipe.c        f_wipe.h
-    g_game.c        g_game.h
-    hu_lib.c        hu_lib.h
-    hu_stuff.c      hu_stuff.h
-    info.c          info.h
-    m_menu.c        m_menu.h
-    m_random.c      m_random.h
-    m_saves.c       m_saves.h
-    p_ceilng.c
-    p_dialog.c      p_dialog.h
-    p_doors.c
-    p_enemy.c
-    p_floor.c
-    p_inter.c       p_inter.h
-    p_lights.c
-                    p_local.h
-    p_map.c
-    p_maputl.c
-    p_mobj.c        p_mobj.h
-    p_plats.c
-    p_pspr.c        p_pspr.h
-    p_saveg.c       p_saveg.h
-    p_setup.c       p_setup.h
-    p_sight.c
-    p_spec.c        p_spec.h
-    p_switch.c
-    p_telept.c
-    p_tick.c        p_tick.h
-    p_user.c
-    r_bsp.c         r_bsp.h
-    r_data.c        r_data.h
-                    r_defs.h
-    r_draw.c        r_draw.h
-                    r_local.h
-    r_main.c        r_main.h
-    r_plane.c       r_plane.h
-    r_segs.c        r_segs.h
-    r_sky.c         r_sky.h
-                    r_state.h
-    r_things.c      r_things.h
-    s_sound.c       s_sound.h
-    sounds.c        sounds.h
-    st_lib.c        st_lib.h
-    st_stuff.c      st_stuff.h
-    wi_stuff.c      wi_stuff.h)
-
-add_library(strife STATIC ${STRIFE_SOURCES})
-
-target_include_directories(strife PRIVATE "../" "../../win32/" "${CMAKE_CURRENT_BINARY_DIR}/../../")
-if (DEFINED EMSCRIPTEN)
-    set(SDL_FLAGS "-s USE_SDL=2")
-    if(ENABLE_SDL2_MIXER)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_MIXER=2")
-    endif()
-    if(ENABLE_SDL2_NET)
-        set(SDL_FLAGS "${SDL_FLAGS} -s USE_SDL_NET=2")
-    endif()
-else()
-    set(SDL_LINK_LIBS, "SDL2::SDL2")
-    if(ENABLE_SDL2_MIXER)
-        list(APPEND SDL_LINK_LIBS SDL2_mixer::SDL2_mixer)
-    endif()
-    if(ENABLE_SDL2_NET)
-        list(APPEND SDL_LINK_LIBS SDL2_net::SDL2_net)
-    endif()
-endif()
-target_link_libraries(strife textscreen ${SDL_LINK_LIBS})
-set_target_properties(strife PROPERTIES COMPILE_FLAGS "${SDL_FLAGS}")
-set_target_properties(strife PROPERTIES LINK_FLAGS "${SDL_FLAGS}")
diff --git a/games/NXDoom/src/strife/Makefile.am b/games/NXDoom/src/strife/Makefile.am
deleted file mode 100644
index 36d7b0c58..000000000
--- a/games/NXDoom/src/strife/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-AM_CFLAGS=-I$(top_srcdir)/src                           \
-          -I$(top_srcdir)/textscreen                    \
-          @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
-
-EXTRA_DIST =                    \
-        CMakeLists.txt          \
-        strife_icon.c
-
-noinst_LIBRARIES=libstrife.a
-
-libstrife_a_SOURCES =           \
-am_map.c           am_map.h     \
-deh_ammo.c                      \
-deh_cheat.c                     \
-deh_strife.c                    \
-deh_frame.c                     \
-deh_misc.c         deh_misc.h   \
-deh_ptr.c                       \
-deh_sound.c                     \
-deh_thing.c                     \
-deh_weapon.c                    \
-                   d_englsh.h   \
-d_items.c          d_items.h    \
-d_main.c           d_main.h     \
-d_net.c                         \
-                   doomdata.h   \
-doomdef.c          doomdef.h    \
-doomstat.c         doomstat.h   \
-                   d_player.h   \
-dstrings.c         dstrings.h   \
-                   d_textur.h   \
-                   d_think.h    \
-f_finale.c         f_finale.h   \
-f_wipe.c           f_wipe.h     \
-g_game.c           g_game.h     \
-hu_lib.c           hu_lib.h     \
-hu_stuff.c         hu_stuff.h   \
-info.c             info.h       \
-m_menu.c           m_menu.h     \
-m_random.c         m_random.h   \
-m_saves.c          m_saves.h    \
-p_ceilng.c                      \
-p_dialog.c         p_dialog.h   \
-p_doors.c                       \
-p_enemy.c                       \
-p_floor.c                       \
-p_inter.c          p_inter.h    \
-p_lights.c                      \
-                   p_local.h    \
-p_map.c                         \
-p_maputl.c                      \
-p_mobj.c           p_mobj.h     \
-p_plats.c                       \
-p_pspr.c           p_pspr.h     \
-p_saveg.c          p_saveg.h    \
-p_setup.c          p_setup.h    \
-p_sight.c                       \
-p_spec.c           p_spec.h     \
-p_switch.c                      \
-p_telept.c                      \
-p_tick.c           p_tick.h     \
-p_user.c                        \
-r_bsp.c            r_bsp.h      \
-r_data.c           r_data.h     \
-                   r_defs.h     \
-r_draw.c           r_draw.h     \
-                   r_local.h    \
-r_main.c           r_main.h     \
-r_plane.c          r_plane.h    \
-r_segs.c           r_segs.h     \
-r_sky.c            r_sky.h      \
-                   r_state.h    \
-r_things.c         r_things.h   \
-s_sound.c          s_sound.h    \
-sounds.c           sounds.h     \
-st_lib.c           st_lib.h     \
-st_stuff.c         st_stuff.h   \
-wi_stuff.c         wi_stuff.h
-
-if HAVE_ICONS
-
-strife_icon.c : $(top_builddir)/data/strife.png
-	$(top_builddir)/data/convert-icon $(top_builddir)/data/strife.png $@
-
-endif
diff --git a/games/NXDoom/src/strife/am_map.c b/games/NXDoom/src/strife/am_map.c
deleted file mode 100644
index e36fb56d5..000000000
--- a/games/NXDoom/src/strife/am_map.c
+++ /dev/null
@@ -1,1415 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:  the automap code
-//
-
-
-#include <stdio.h>
-
-#include "deh_main.h"
-
-#include "z_zone.h"
-#include "doomkeys.h"
-#include "doomdef.h"
-#include "m_misc.h"
-#include "st_stuff.h"
-#include "p_local.h"
-#include "w_wad.h"
-
-#include "m_cheat.h"
-#include "m_controls.h"
-#include "i_system.h"
-#include "i_timer.h"
-
-// Needs access to LFB.
-#include "v_video.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "dstrings.h"
-
-#include "am_map.h"
-
-
-// Automap colors
-#define BACKGROUND      240         // haleyjd [STRIFE]
-#define WALLCOLORS      5           // villsa [STRIFE]
-#define WALLRANGE       16
-#define TSWALLCOLORS    16
-#define FDWALLCOLORS    122         // villsa [STRIFE]
-#define CDWALLCOLORS    116
-#define CTWALLCOLORS    19          // villsa [STRIFE]
-#define SPWALLCOLORS    243         // villsa [STRIFE]
-#define THINGCOLORS     233         // villsa [STRIFE]
-#define MISSILECOLORS   227         // villsa [STRIFE]
-#define SHOOTABLECOLORS 235         // villsa [STRIFE]
-
-// drawing stuff
-
-#define AM_NUMMARKPOINTS 10
-
-// scale on entry
-#define INITSCALEMTOF (.2*FRACUNIT)
-// how much the automap moves window per tic in frame-buffer coordinates
-// moves 140 pixels in 1 second
-#define F_PANINC	4
-// how much zoom-in per tic
-// goes to 2x in 1 second
-#define M_ZOOMIN        ((int) (1.02*FRACUNIT))
-// how much zoom-out per tic
-// pulls out to 0.5x in 1 second
-#define M_ZOOMOUT       ((int) (FRACUNIT/1.02))
-
-// translates between frame-buffer and map distances
-#define FTOM(x) FixedMul(((x)<<16),scale_ftom)
-#define MTOF(x) (FixedMul((x),scale_mtof)>>16)
-// translates between frame-buffer and map coordinates
-#define CXMTOF(x)  (f_x + MTOF((x)-m_x))
-#define CYMTOF(y)  (f_y + (f_h - MTOF((y)-m_y)))
-
-// the following is crap
-#define LINE_NEVERSEE ML_DONTDRAW
-
-typedef struct
-{
-    int x, y;
-} fpoint_t;
-
-typedef struct
-{
-    fpoint_t a, b;
-} fline_t;
-
-typedef struct
-{
-    fixed_t		x,y;
-} mpoint_t;
-
-typedef struct
-{
-    mpoint_t a, b;
-} mline_t;
-
-typedef struct
-{
-    fixed_t slp, islp;
-} islope_t;
-
-
-
-//
-// The vector graphics for the automap.
-//  A line drawing of the player pointing right,
-//   starting from the middle.
-//
-#define R ((8*PLAYERRADIUS)/7)
-mline_t player_arrow[] = {
-    { { -R+R/8, 0 }, { R, 0 } }, // -----
-    { { R, 0 }, { R-R/2, R/4 } },  // ----->
-    { { R, 0 }, { R-R/2, -R/4 } },
-    { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
-    { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
-    { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
-    { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
-};
-#undef R
-
-#define R ((8*PLAYERRADIUS)/7)
-mline_t cheat_player_arrow[] = {
-    { { -R+R/8, 0 }, { R, 0 } }, // -----
-    { { R, 0 }, { R-R/2, R/6 } },  // ----->
-    { { R, 0 }, { R-R/2, -R/6 } },
-    { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
-    { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
-    { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
-    { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
-    { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
-    { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
-    { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
-    { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
-    { { -R/6, -R/6 }, { 0, -R/6 } },
-    { { 0, -R/6 }, { 0, R/4 } },
-    { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
-    { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
-    { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
-};
-#undef R
-
-#define R (FRACUNIT)
-mline_t triangle_guy[] = {
-    { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
-    { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0      ), (fixed_t)(R    ) } },
-    { { (fixed_t)(0      ), (fixed_t)(R    ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
-};
-#undef R
-
-#define R (FRACUNIT)
-mline_t thintriangle_guy[] = {
-    { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
-    { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
-    { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
-};
-#undef R
-
-
-
-
-static int 	cheating = 0;
-//static int 	grid = 0;     [STRIFE]: no such variable
-
-boolean    	automapactive = false;
-static int 	finit_width = SCREENWIDTH;
-static int 	finit_height = SCREENHEIGHT - 32;
-
-// location of window on screen
-static int 	f_x;
-static int	f_y;
-
-// size of window on screen
-static int 	f_w;
-static int	f_h;
-
-static int 	lightlev; 		// used for funky strobing effect
-static byte*	fb; 			// pseudo-frame buffer
-static int 	amclock;
-
-static mpoint_t m_paninc; // how far the window pans each tic (map coords)
-static fixed_t 	mtof_zoommul; // how far the window zooms in each tic (map coords)
-static fixed_t 	ftom_zoommul; // how far the window zooms in each tic (fb coords)
-
-static fixed_t 	m_x, m_y;   // LL x,y where the window is on the map (map coords)
-static fixed_t 	m_x2, m_y2; // UR x,y where the window is on the map (map coords)
-
-//
-// width/height of window on map (map coords)
-//
-static fixed_t 	m_w;
-static fixed_t	m_h;
-
-// based on level size
-static fixed_t 	min_x;
-static fixed_t	min_y; 
-static fixed_t 	max_x;
-static fixed_t  max_y;
-
-static fixed_t 	max_w; // max_x-min_x,
-static fixed_t  max_h; // max_y-min_y
-
-// based on player size
-static fixed_t 	min_w;
-static fixed_t  min_h;
-
-
-static fixed_t 	min_scale_mtof; // used to tell when to stop zooming out
-static fixed_t 	max_scale_mtof; // used to tell when to stop zooming in
-
-// old stuff for recovery later
-static fixed_t old_m_w, old_m_h;
-static fixed_t old_m_x, old_m_y;
-
-// old location used by the Follower routine
-static mpoint_t f_oldloc;
-
-// used by MTOF to scale from map-to-frame-buffer coords
-static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
-// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
-static fixed_t scale_ftom;
-
-static player_t *plr; // the player represented by an arrow
-
-static patch_t *marknums[10]; // numbers used for marking by the automap
-static mpoint_t markpoints[AM_NUMMARKPOINTS]; // where the points are
-static int markpointnum = 0; // next point to be assigned
-static int mapmarknum = 0;  // villsa [STRIFE] unused but this was meant to be used for objective based markers
-static int followplayer = 1; // specifies whether to follow the player around
-
-cheatseq_t cheat_amap = CHEAT("topo", 0);   // villsa [STRIFE]
-
-static boolean stopped = true;
-
-
-// Calculates the slope and slope according to the x-axis of a line
-// segment in map coordinates (with the upright y-axis n' all) so
-// that it can be used with the brain-dead drawing stuff.
-
-void
-AM_getIslope
-( mline_t*	ml,
-  islope_t*	is )
-{
-    int dx, dy;
-
-    dy = ml->a.y - ml->b.y;
-    dx = ml->b.x - ml->a.x;
-    if (!dy) is->islp = (dx<0?-INT_MAX:INT_MAX);
-    else is->islp = FixedDiv(dx, dy);
-    if (!dx) is->slp = (dy<0?-INT_MAX:INT_MAX);
-    else is->slp = FixedDiv(dy, dx);
-
-}
-
-//
-//
-//
-void AM_activateNewScale(void)
-{
-    m_x += m_w/2;
-    m_y += m_h/2;
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-    m_x -= m_w/2;
-    m_y -= m_h/2;
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-}
-
-//
-//
-//
-void AM_saveScaleAndLoc(void)
-{
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
-}
-
-//
-//
-//
-void AM_restoreScaleAndLoc(void)
-{
-
-    m_w = old_m_w;
-    m_h = old_m_h;
-    if (!followplayer)
-    {
-	m_x = old_m_x;
-	m_y = old_m_y;
-    } else {
-	m_x = plr->mo->x - m_w/2;
-	m_y = plr->mo->y - m_h/2;
-    }
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-
-    // Change the scaling multipliers
-    scale_mtof = FixedDiv(f_w<<FRACBITS, m_w);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-//
-// adds a marker at the current location
-//
-void AM_addMark(void)
-{
-    markpoints[markpointnum].x = plr->mo->x; // 20160306 [STRIFE]: use player position
-    markpoints[markpointnum].y = plr->mo->y;
-    //markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS;
-    ++markpointnum; // haleyjd 20141101: [STRIFE] does not wrap around
-}
-
-//
-// Determines bounding box of all vertices,
-// sets global variables controlling zoom range.
-//
-void AM_findMinMaxBoundaries(void)
-{
-    int i;
-    fixed_t a;
-    fixed_t b;
-
-    min_x = min_y =  INT_MAX;
-    max_x = max_y = -INT_MAX;
-  
-    for (i=0;i<numvertexes;i++)
-    {
-	if (vertexes[i].x < min_x)
-	    min_x = vertexes[i].x;
-	else if (vertexes[i].x > max_x)
-	    max_x = vertexes[i].x;
-    
-	if (vertexes[i].y < min_y)
-	    min_y = vertexes[i].y;
-	else if (vertexes[i].y > max_y)
-	    max_y = vertexes[i].y;
-    }
-  
-    max_w = max_x - min_x;
-    max_h = max_y - min_y;
-
-    min_w = 2*PLAYERRADIUS; // const? never changed?
-    min_h = 2*PLAYERRADIUS;
-
-    a = FixedDiv(f_w<<FRACBITS, max_w);
-    b = FixedDiv(f_h<<FRACBITS, max_h);
-  
-    min_scale_mtof = a < b ? a : b;
-    max_scale_mtof = FixedDiv(f_h<<FRACBITS, 2*PLAYERRADIUS);
-
-}
-
-
-//
-//
-//
-void AM_changeWindowLoc(void)
-{
-    if (m_paninc.x || m_paninc.y)
-    {
-	followplayer = 0;
-	f_oldloc.x = INT_MAX;
-    }
-
-    m_x += m_paninc.x;
-    m_y += m_paninc.y;
-
-    if (m_x + m_w/2 > max_x)
-	m_x = max_x - m_w/2;
-    else if (m_x + m_w/2 < min_x)
-	m_x = min_x - m_w/2;
-  
-    if (m_y + m_h/2 > max_y)
-	m_y = max_y - m_h/2;
-    else if (m_y + m_h/2 < min_y)
-	m_y = min_y - m_h/2;
-
-    m_x2 = m_x + m_w;
-    m_y2 = m_y + m_h;
-}
-
-
-//
-//
-//
-void AM_initVariables(void)
-{
-    int pnum;
-    static event_t st_notify = { ev_keyup, AM_MSGENTERED, 0, 0 };
-
-    automapactive = true;
-    fb = I_VideoBuffer;
-
-    f_oldloc.x = INT_MAX;
-    amclock = 0;
-    lightlev = 0;
-
-    m_paninc.x = m_paninc.y = 0;
-    ftom_zoommul = FRACUNIT;
-    mtof_zoommul = FRACUNIT;
-
-    m_w = FTOM(f_w);
-    m_h = FTOM(f_h);
-
-    // find player to center on initially
-    if (playeringame[consoleplayer])
-    {
-        plr = &players[consoleplayer];
-    }
-    else
-    {
-        plr = &players[0];
-
-	for (pnum=0;pnum<MAXPLAYERS;pnum++)
-        {
-	    if (playeringame[pnum])
-            {
-                plr = &players[pnum];
-		break;
-            }
-        }
-    }
-
-    m_x = plr->mo->x - m_w/2;
-    m_y = plr->mo->y - m_h/2;
-    AM_changeWindowLoc();
-
-    // for saving & restoring
-    old_m_x = m_x;
-    old_m_y = m_y;
-    old_m_w = m_w;
-    old_m_h = m_h;
-
-    // inform the status bar of the change
-    ST_Responder(&st_notify);
-
-}
-
-//
-// AM_loadPics
-//
-// haleyjd 08/27/10: [STRIFE] Changed marknums to PLMNUM%d
-//
-void AM_loadPics(void)
-{
-    int i;
-    char namebuf[9];
-  
-    for (i=0;i<10;i++)
-    {
-        DEH_snprintf(namebuf, 9, "PLMNUM%d", i);
-        marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
-    }
-
-}
-
-void AM_unloadPics(void)
-{
-    int i;
-    char namebuf[9];
-  
-    for (i=0;i<10;i++)
-    {
-        DEH_snprintf(namebuf, 9, "PLMNUM%d", i);
-        W_ReleaseLumpName(namebuf);
-    }
-}
-
-void AM_clearMarks(void)
-{
-    int i;
-
-    for (i=0;i<AM_NUMMARKPOINTS;i++)
-	markpoints[i].x = -1; // means empty
-    markpointnum = 0;
-}
-
-//
-// should be called at the start of every level
-// right now, i figure it out myself
-//
-void AM_LevelInit(void)
-{
-    f_x = f_y = 0;
-    f_w = finit_width;
-    f_h = finit_height;
-
-    AM_clearMarks();
-
-    AM_findMinMaxBoundaries();
-    scale_mtof = FixedDiv(min_scale_mtof, (int) (0.7*FRACUNIT));
-    if (scale_mtof > max_scale_mtof)
-	scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-}
-
-
-
-
-//
-//
-//
-void AM_Stop (void)
-{
-    static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED, 0 };
-
-    AM_unloadPics();
-    automapactive = false;
-    ST_Responder(&st_notify);
-    stopped = true;
-}
-
-//
-//
-//
-void AM_Start (void)
-{
-    static int lastlevel = -1;
-    //static int lastepisode = -1;
-
-    if (!stopped) AM_Stop();
-    stopped = false;
-    if (lastlevel != gamemap  /*|| lastepisode != gameepisode*/)
-    {
-	AM_LevelInit();
-	lastlevel = gamemap;
-	//lastepisode = gameepisode;
-    }
-    AM_initVariables();
-    AM_loadPics();
-}
-
-//
-// set the window scale to the maximum size
-//
-void AM_minOutWindowScale(void)
-{
-    scale_mtof = min_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-//
-// set the window scale to the minimum size
-//
-void AM_maxOutWindowScale(void)
-{
-    scale_mtof = max_scale_mtof;
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-    AM_activateNewScale();
-}
-
-
-//
-// Handle events (user inputs) in automap mode
-//
-boolean
-AM_Responder
-( event_t*	ev )
-{
-
-    int rc;
-    static int bigstate=0;
-    static int joywait = 0;
-    static char buffer[20];
-    int key;
-
-    rc = false;
-
-    if (ev->type == ev_joystick && joybautomap >= 0
-        && (ev->data1 & (1 << joybautomap)) != 0 && joywait < I_GetTime())
-    {
-        joywait = I_GetTime() + 5;
-
-        if (!automapactive)
-        {
-            AM_Start ();
-            viewactive = false;
-        }
-        else
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop ();
-        }
-
-        return true;
-    }
-
-
-    if (!automapactive)
-    {
-	if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
-	{
-	    AM_Start ();
-	    viewactive = false;
-	    rc = true;
-	}
-    }
-    else if (ev->type == ev_keydown)
-    {
-	rc = true;
-        key = ev->data1;
-
-        if (key == key_map_east)          // pan right
-        {
-            if (!followplayer) m_paninc.x = FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_west)     // pan left
-        {
-            if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_north)    // pan up
-        {
-            if (!followplayer) m_paninc.y = FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_south)    // pan down
-        {
-            if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
-            else rc = false;
-        }
-        else if (key == key_map_zoomout)  // zoom out
-        {
-            mtof_zoommul = M_ZOOMOUT;
-            ftom_zoommul = M_ZOOMIN;
-        }
-        else if (key == key_map_zoomin)   // zoom in
-        {
-            mtof_zoommul = M_ZOOMIN;
-            ftom_zoommul = M_ZOOMOUT;
-        }
-        else if (key == key_map_toggle)
-        {
-            bigstate = 0;
-            viewactive = true;
-            AM_Stop ();
-        }
-        else if (key == key_map_maxzoom)
-        {
-            bigstate = !bigstate;
-            if (bigstate)
-            {
-                AM_saveScaleAndLoc();
-                AM_minOutWindowScale();
-            }
-            else AM_restoreScaleAndLoc();
-        }
-        else if (key == key_map_follow)
-        {
-            followplayer = !followplayer;
-            f_oldloc.x = INT_MAX;
-            if (followplayer)
-                plr->message = DEH_String(AMSTR_FOLLOWON);
-            else
-                plr->message = DEH_String(AMSTR_FOLLOWOFF);
-        }
-        // haleyjd 20141101: [STRIFE] grid is not supported
-        /*
-        else if (key == key_map_grid)
-        {
-            grid = !grid;
-            if (grid)
-                plr->message = DEH_String(AMSTR_GRIDON);
-            else
-                plr->message = DEH_String(AMSTR_GRIDOFF);
-        }
-        */
-        else if (key == key_map_mark)
-        {
-            // haleyjd 20141101: [STRIFE] if full, mark 9 is replaced
-            if(markpointnum == AM_NUMMARKPOINTS)
-                --markpointnum;
-            M_snprintf(buffer, sizeof(buffer),
-                       "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum + 1); // [STRIFE]
-            plr->message = buffer;
-            AM_addMark();
-        }
-        else if (key == key_map_clearmark)
-        {
-            // haleyjd 20141101: [STRIFE] clears last mark only
-            if(markpointnum > 0)
-            {
-                markpoints[markpointnum - 1].x = -1;
-                --markpointnum;
-                plr->message = DEH_String(AMSTR_MARKSCLEARED);
-            }
-        }
-        else
-        {
-            rc = false;
-        }
-
-	if (!deathmatch && cht_CheckCheat(&cheat_amap, ev->data2))
-	{
-	    rc = false;
-	    cheating = (cheating+1) % 3;
-	}
-    }
-    else if (ev->type == ev_keyup)
-    {
-        rc = false;
-        key = ev->data1;
-
-        if (key == key_map_east)
-        {
-            if (!followplayer) m_paninc.x = 0;
-        }
-        else if (key == key_map_west)
-        {
-            if (!followplayer) m_paninc.x = 0;
-        }
-        else if (key == key_map_north)
-        {
-            if (!followplayer) m_paninc.y = 0;
-        }
-        else if (key == key_map_south)
-        {
-            if (!followplayer) m_paninc.y = 0;
-        }
-        else if (key == key_map_zoomout || key == key_map_zoomin)
-        {
-            mtof_zoommul = FRACUNIT;
-            ftom_zoommul = FRACUNIT;
-        }
-    }
-
-    return rc;
-
-}
-
-
-//
-// Zooming
-//
-void AM_changeWindowScale(void)
-{
-
-    // Change the scaling multipliers
-    scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
-    scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
-
-    if (scale_mtof < min_scale_mtof)
-	AM_minOutWindowScale();
-    else if (scale_mtof > max_scale_mtof)
-	AM_maxOutWindowScale();
-    else
-	AM_activateNewScale();
-}
-
-
-//
-//
-//
-void AM_doFollowPlayer(void)
-{
-
-    if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
-    {
-	m_x = FTOM(MTOF(plr->mo->x)) - m_w/2;
-	m_y = FTOM(MTOF(plr->mo->y)) - m_h/2;
-	m_x2 = m_x + m_w;
-	m_y2 = m_y + m_h;
-	f_oldloc.x = plr->mo->x;
-	f_oldloc.y = plr->mo->y;
-
-	//  m_x = FTOM(MTOF(plr->mo->x - m_w/2));
-	//  m_y = FTOM(MTOF(plr->mo->y - m_h/2));
-	//  m_x = plr->mo->x - m_w/2;
-	//  m_y = plr->mo->y - m_h/2;
-
-    }
-
-}
-
-//
-//
-//
-void AM_updateLightLev(void)
-{
-    static int nexttic = 0;
-    //static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 };
-    static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 };
-    static int litelevelscnt = 0;
-   
-    // Change light level
-    if (amclock>nexttic)
-    {
-	lightlev = litelevels[litelevelscnt++];
-	if (litelevelscnt == arrlen(litelevels)) litelevelscnt = 0;
-	nexttic = amclock + 6 - (amclock % 6);
-    }
-
-}
-
-
-//
-// Updates on Game Tick
-//
-void AM_Ticker (void)
-{
-
-    if (!automapactive)
-	return;
-
-    amclock++;
-
-    if (followplayer)
-	AM_doFollowPlayer();
-
-    // Change the zoom if necessary
-    if (ftom_zoommul != FRACUNIT)
-	AM_changeWindowScale();
-
-    // Change x,y location
-    if (m_paninc.x || m_paninc.y)
-	AM_changeWindowLoc();
-
-    // Update light level
-    // AM_updateLightLev();
-
-}
-
-
-//
-// Clear automap frame buffer.
-//
-void AM_clearFB(int color)
-{
-    memset(fb, color, f_w*f_h);
-}
-
-
-//
-// Automap clipping of lines.
-//
-// Based on Cohen-Sutherland clipping algorithm but with a slightly
-// faster reject and precalculated slopes.  If the speed is needed,
-// use a hash algorithm to handle  the common cases.
-//
-boolean
-AM_clipMline
-( mline_t*	ml,
-  fline_t*	fl )
-{
-    enum
-    {
-	LEFT	=1,
-	RIGHT	=2,
-	BOTTOM	=4,
-	TOP	=8
-    };
-    
-    register int	outcode1 = 0;
-    register int	outcode2 = 0;
-    register int	outside;
-    
-    fpoint_t	tmp;
-    int		dx;
-    int		dy;
-
-    
-#define DOOUTCODE(oc, mx, my) \
-    (oc) = 0; \
-    if ((my) < 0) (oc) |= TOP; \
-    else if ((my) >= f_h) (oc) |= BOTTOM; \
-    if ((mx) < 0) (oc) |= LEFT; \
-    else if ((mx) >= f_w) (oc) |= RIGHT;
-
-    
-    // do trivial rejects and outcodes
-    if (ml->a.y > m_y2)
-	outcode1 = TOP;
-    else if (ml->a.y < m_y)
-	outcode1 = BOTTOM;
-
-    if (ml->b.y > m_y2)
-	outcode2 = TOP;
-    else if (ml->b.y < m_y)
-	outcode2 = BOTTOM;
-    
-    if (outcode1 & outcode2)
-	return false; // trivially outside
-
-    if (ml->a.x < m_x)
-	outcode1 |= LEFT;
-    else if (ml->a.x > m_x2)
-	outcode1 |= RIGHT;
-    
-    if (ml->b.x < m_x)
-	outcode2 |= LEFT;
-    else if (ml->b.x > m_x2)
-	outcode2 |= RIGHT;
-    
-    if (outcode1 & outcode2)
-	return false; // trivially outside
-
-    // transform to frame-buffer coordinates.
-    fl->a.x = CXMTOF(ml->a.x);
-    fl->a.y = CYMTOF(ml->a.y);
-    fl->b.x = CXMTOF(ml->b.x);
-    fl->b.y = CYMTOF(ml->b.y);
-
-    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-
-    if (outcode1 & outcode2)
-	return false;
-
-    while (outcode1 | outcode2)
-    {
-	// may be partially inside box
-	// find an outside point
-	if (outcode1)
-	    outside = outcode1;
-	else
-	    outside = outcode2;
-	
-	// clip to each side
-	if (outside & TOP)
-	{
-	    dy = fl->a.y - fl->b.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.x = fl->a.x + (dx*(fl->a.y))/dy;
-	    tmp.y = 0;
-	}
-	else if (outside & BOTTOM)
-	{
-	    dy = fl->a.y - fl->b.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.x = fl->a.x + (dx*(fl->a.y-f_h))/dy;
-	    tmp.y = f_h-1;
-	}
-	else if (outside & RIGHT)
-	{
-	    dy = fl->b.y - fl->a.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.y = fl->a.y + (dy*(f_w-1 - fl->a.x))/dx;
-	    tmp.x = f_w-1;
-	}
-	else if (outside & LEFT)
-	{
-	    dy = fl->b.y - fl->a.y;
-	    dx = fl->b.x - fl->a.x;
-	    tmp.y = fl->a.y + (dy*(-fl->a.x))/dx;
-	    tmp.x = 0;
-	}
-        else
-        {
-            tmp.x = 0;
-            tmp.y = 0;
-        }
-
-	if (outside == outcode1)
-	{
-	    fl->a = tmp;
-	    DOOUTCODE(outcode1, fl->a.x, fl->a.y);
-	}
-	else
-	{
-	    fl->b = tmp;
-	    DOOUTCODE(outcode2, fl->b.x, fl->b.y);
-	}
-	
-	if (outcode1 & outcode2)
-	    return false; // trivially outside
-    }
-
-    return true;
-}
-#undef DOOUTCODE
-
-
-//
-// Classic Bresenham w/ whatever optimizations needed for speed
-//
-void
-AM_drawFline
-( fline_t*	fl,
-  int		color )
-{
-    register int x;
-    register int y;
-    register int dx;
-    register int dy;
-    register int sx;
-    register int sy;
-    register int ax;
-    register int ay;
-    register int d;
-    
-    static int fuck = 0;
-
-    // For debugging only
-    if (      fl->a.x < 0 || fl->a.x >= f_w
-	   || fl->a.y < 0 || fl->a.y >= f_h
-	   || fl->b.x < 0 || fl->b.x >= f_w
-	   || fl->b.y < 0 || fl->b.y >= f_h)
-    {
-        DEH_fprintf(stderr, "fuck %d \r", fuck++);
-	return;
-    }
-
-#define PUTDOT(xx,yy,cc) fb[(yy)*f_w+(xx)]=(cc)
-
-    dx = fl->b.x - fl->a.x;
-    ax = 2 * (dx<0 ? -dx : dx);
-    sx = dx<0 ? -1 : 1;
-
-    dy = fl->b.y - fl->a.y;
-    ay = 2 * (dy<0 ? -dy : dy);
-    sy = dy<0 ? -1 : 1;
-
-    x = fl->a.x;
-    y = fl->a.y;
-
-    if (ax > ay)
-    {
-	d = ay - ax/2;
-	while (1)
-	{
-	    PUTDOT(x,y,color);
-	    if (x == fl->b.x) return;
-	    if (d>=0)
-	    {
-		y += sy;
-		d -= ax;
-	    }
-	    x += sx;
-	    d += ay;
-	}
-    }
-    else
-    {
-	d = ax - ay/2;
-	while (1)
-	{
-	    PUTDOT(x, y, color);
-	    if (y == fl->b.y) return;
-	    if (d >= 0)
-	    {
-		x += sx;
-		d -= ay;
-	    }
-	    y += sy;
-	    d += ax;
-	}
-    }
-}
-
-
-//
-// Clip lines, draw visible part sof lines.
-//
-void
-AM_drawMline
-( mline_t*	ml,
-  int		color )
-{
-    static fline_t fl;
-
-    if (AM_clipMline(ml, &fl))
-	AM_drawFline(&fl, color); // draws it on frame buffer using fb coords
-}
-
-
-
-//
-// Draws flat (floor/ceiling tile) aligned grid lines.
-//
-/*void AM_drawGrid(int color)
-{
-    fixed_t x, y;
-    fixed_t start, end;
-    mline_t ml;
-
-    // Figure out start of vertical gridlines
-    start = m_x;
-    if ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS))
-	start += (MAPBLOCKUNITS<<FRACBITS)
-	    - ((start-bmaporgx)%(MAPBLOCKUNITS<<FRACBITS));
-    end = m_x + m_w;
-
-    // draw vertical gridlines
-    ml.a.y = m_y;
-    ml.b.y = m_y+m_h;
-    for (x=start; x<end; x+=(MAPBLOCKUNITS<<FRACBITS))
-    {
-	ml.a.x = x;
-	ml.b.x = x;
-	AM_drawMline(&ml, color);
-    }
-
-    // Figure out start of horizontal gridlines
-    start = m_y;
-    if ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS))
-	start += (MAPBLOCKUNITS<<FRACBITS)
-	    - ((start-bmaporgy)%(MAPBLOCKUNITS<<FRACBITS));
-    end = m_y + m_h;
-
-    // draw horizontal gridlines
-    ml.a.x = m_x;
-    ml.b.x = m_x + m_w;
-    for (y=start; y<end; y+=(MAPBLOCKUNITS<<FRACBITS))
-    {
-	ml.a.y = y;
-	ml.b.y = y;
-	AM_drawMline(&ml, color);
-    }
-
-}*/
-
-//
-// Determines visible lines, draws them.
-// This is LineDef based, not LineSeg based.
-//
-void AM_drawWalls(void)
-{
-    int i;
-    line_t* line;
-    static mline_t l;
-
-    for(i = 0; i < numlines; i++)
-    {
-        line = &lines[i];
-
-        l.a.x = line->v1->x;
-        l.a.y = line->v1->y;
-        l.b.x = line->v2->x;
-        l.b.y = line->v2->y;
-
-        if(cheating || (line->flags & ML_MAPPED))
-        {
-            if((line->flags & LINE_NEVERSEE) && !cheating)
-                continue;
-
-            // villsa [STRIFE]
-            if(line->special == 145 || line->special == 186)
-            {
-                AM_drawMline(&l, SPWALLCOLORS);
-            }
-            // villsa [STRIFE] lightlev is unused here
-            else if(!line->backsector)
-            {
-                AM_drawMline(&l, WALLCOLORS);
-            }
-            else
-            {
-                if(line->special == 39)
-                { // teleporters
-                    AM_drawMline(&l, WALLCOLORS+WALLRANGE/2);
-                }
-                else if (line->flags & ML_SECRET) // secret door
-                {
-                    // villsa [STRIFE] just draw the wall as is!
-                    AM_drawMline(&l, WALLCOLORS);
-                }
-                else if(line->backsector->floorheight != line->frontsector->floorheight)
-                {
-                    AM_drawMline(&l, FDWALLCOLORS); // floor level change
-                }
-                else if(line->backsector->ceilingheight != line->frontsector->ceilingheight)
-                {
-                        AM_drawMline(&l, CDWALLCOLORS); // ceiling level change
-                }
-                else if (cheating)
-                {
-                    AM_drawMline(&l, TSWALLCOLORS);
-                }
-            }
-        }
-        // villsa [STRIFE] show all of the map on map 15
-        else if(plr->powers[pw_allmap] || gamemap == 15)
-        {
-            if(!(line->flags & LINE_NEVERSEE))
-                AM_drawMline(&l, CTWALLCOLORS);
-        }
-    }
-}
-
-
-//
-// Rotation in 2D.
-// Used to rotate player arrow line character.
-//
-void
-AM_rotate
-( fixed_t*	x,
-  fixed_t*	y,
-  angle_t	a )
-{
-    fixed_t tmpx;
-
-    tmpx =
-	FixedMul(*x,finecosine[a>>ANGLETOFINESHIFT])
-	- FixedMul(*y,finesine[a>>ANGLETOFINESHIFT]);
-    
-    *y   =
-	FixedMul(*x,finesine[a>>ANGLETOFINESHIFT])
-	+ FixedMul(*y,finecosine[a>>ANGLETOFINESHIFT]);
-
-    *x = tmpx;
-}
-
-void
-AM_drawLineCharacter
-( mline_t*	lineguy,
-  int		lineguylines,
-  fixed_t	scale,
-  angle_t	angle,
-  int		color,
-  fixed_t	x,
-  fixed_t	y )
-{
-    int		i;
-    mline_t	l;
-
-    for (i=0;i<lineguylines;i++)
-    {
-	l.a.x = lineguy[i].a.x;
-	l.a.y = lineguy[i].a.y;
-
-	if (scale)
-	{
-	    l.a.x = FixedMul(scale, l.a.x);
-	    l.a.y = FixedMul(scale, l.a.y);
-	}
-
-	if (angle)
-	    AM_rotate(&l.a.x, &l.a.y, angle);
-
-	l.a.x += x;
-	l.a.y += y;
-
-	l.b.x = lineguy[i].b.x;
-	l.b.y = lineguy[i].b.y;
-
-	if (scale)
-	{
-	    l.b.x = FixedMul(scale, l.b.x);
-	    l.b.y = FixedMul(scale, l.b.y);
-	}
-
-	if (angle)
-	    AM_rotate(&l.b.x, &l.b.y, angle);
-	
-	l.b.x += x;
-	l.b.y += y;
-
-	AM_drawMline(&l, color);
-    }
-}
-
-void AM_drawPlayers(void)
-{
-    int		i;
-    player_t*	p;
-    // villsa [STRIFE] updated array
-    static int 	their_colors[] = { 0x80, 0x40, 0xB0, 0x10, 0x30, 0x50, 0xA0, 0x60, 0x90 };
-    int		their_color = -1;
-    int		color;
-
-    if (!netgame)
-    {
-        // villsa [STRIFE] don't draw cheating player arrow.
-        // Player arrow is yellow instead of white
-        AM_drawLineCharacter
-		(player_arrow, arrlen(player_arrow), 0, plr->mo->angle,
-		 224, plr->mo->x, plr->mo->y);
-	return;
-    }
-
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-	their_color++;
-	p = &players[i];
-
-        // villsa [STRIFE] check for gameskill??
-	if((gameskill && deathmatch && !singledemo) && p != plr)
-	    continue;
-
-	if(!playeringame[i])
-	    continue;
-
-        // villsa [STRIFE] change to 27
-	if(p->powers[pw_invisibility])
-	    color = 27; // *close* to black
-	else
-	    color = their_colors[their_color];
-	
-	AM_drawLineCharacter
-	    (player_arrow, arrlen(player_arrow), 0, p->mo->angle,
-	     color, p->mo->x, p->mo->y);
-    }
-
-}
-
-//
-// AM_drawThings
-//
-// villsa [STRIFE] no arguments
-//
-void AM_drawThings(void)
-{
-    int         i;
-    mobj_t*     t;
-    int         colors;
-    fixed_t     radius;
-
-    // villsa [STRIFE] almost re-written
-    // specific things can have different radius, color and appearence
-    for(i = 0; i < numsectors; i++)
-    {
-        t = sectors[i].thinglist;
-        while(t)
-        {
-            radius = t->radius;
-
-            if(t->flags & (MF_MISSILE|MF_SPECIAL))
-            {
-                colors = MISSILECOLORS;
-            }
-            else if(t->flags & MF_COUNTKILL)
-            {
-                colors = SHOOTABLECOLORS;
-            }
-            else
-            {
-                colors = THINGCOLORS;
-                radius = (16<<FRACBITS);
-            }
-
-            AM_drawLineCharacter (thintriangle_guy, arrlen(thintriangle_guy),
-                radius, t->angle, colors, t->x, t->y);
-
-            t = t->snext;
-        }
-    }
-}
-
-//
-// AM_drawMarks
-//
-void AM_drawMarks(void)
-{
-    int i, fx, fy, w, h;
-
-    for(i = 0; i < AM_NUMMARKPOINTS; i++)
-    {
-        if(markpoints[i].x != -1)
-        {
-            //      w = SHORT(marknums[i]->width);
-            //      h = SHORT(marknums[i]->height);
-            w = 5; // because something's wrong with the wad, i guess
-            h = 6; // because something's wrong with the wad, i guess
-            fx = CXMTOF(markpoints[i].x);
-            fy = CYMTOF(markpoints[i].y);
-            if(fx >= f_x && fx <= f_w - w && fy >= f_y && fy <= f_h - h)
-            {
-                // villsa [STRIFE]
-                if(i >= mapmarknum)
-                    V_DrawPatch(fx, fy, marknums[i]);
-            }
-        }
-    }
-
-}
-
-// villsa [STRIFE] unused
-/*void AM_drawCrosshair(int color)
-{
-    fb[(f_w*(f_h+1))/2] = color; // single point for now
-}*/
-
-void AM_Drawer (void)
-{
-    if (!automapactive) return;
-
-    AM_clearFB(BACKGROUND);
-
-    // villsa [STRIFE] not used
-    /*if(grid)
-        AM_drawGrid(GRIDCOLORS);*/
-
-    AM_drawWalls();
-    AM_drawPlayers();
-
-    // villsa [STRIFE] draw things when map powerup is enabled
-    if(cheating == 2 || plr->powers[pw_allmap] > 1)
-        AM_drawThings();
-
-    // villsa [STRIFE] not used
-    //AM_drawCrosshair(XHAIRCOLORS);
-
-    AM_drawMarks();
-    V_MarkRect(f_x, f_y, f_w, f_h);
-
-}
diff --git a/games/NXDoom/src/strife/am_map.h b/games/NXDoom/src/strife/am_map.h
deleted file mode 100644
index 572d2389b..000000000
--- a/games/NXDoom/src/strife/am_map.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  AutoMap module.
-//
-
-#ifndef __AMMAP_H__
-#define __AMMAP_H__
-
-#include "d_event.h"
-#include "m_cheat.h"
-
-// Used by ST StatusBar stuff.
-#define AM_MSGHEADER (('a'<<24)+('m'<<16))
-#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
-#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
-
-
-// Called by main loop.
-boolean AM_Responder (event_t* ev);
-
-// Called by main loop.
-void AM_Ticker (void);
-
-// Called by main loop,
-// called instead of view drawer if automap active.
-void AM_Drawer (void);
-
-// Called to force the automap to quit
-// if the level is completed while it is up.
-void AM_Stop (void);
-
-
-extern cheatseq_t cheat_amap;
-
-
-#endif
diff --git a/games/NXDoom/src/strife/d_englsh.h b/games/NXDoom/src/strife/d_englsh.h
deleted file mode 100644
index 57312a89f..000000000
--- a/games/NXDoom/src/strife/d_englsh.h
+++ /dev/null
@@ -1,593 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Printed strings for translation.
-//	English language support (default).
-//
-
-#ifndef __D_ENGLSH__
-#define __D_ENGLSH__
-
-//
-//	Printed strings for translation
-//
-
-//
-// D_Main.C
-//
-#define D_DEVSTR	"Development mode ON.\n"
-#define D_CDROM	"CD-ROM Version: Accessing strife.cd\n"
-
-//
-//	M_Menu.C
-//
-#define PRESSKEY 	"press a key."
-#define PRESSYN 	"press y or n."
-#define QUITMSG	"are you sure you want to\nquit this great game?"
-// [STRIFE] modified:
-#define LOADNET 	"you can't load while in a net game!\n\n"PRESSKEY
-#define QLOADNET	"you can't quickload during a netgame!\n\n"PRESSKEY
-// [STRIFE] modified:
-#define QSAVESPOT	"you haven't picked a\nquicksave slot yet!\n\n"PRESSKEY
-// [STRIFE] modified:
-#define SAVEDEAD 	"you're not playing a game\n\n"PRESSKEY
-#define QSPROMPT 	"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
-// [STRIFE] modified:
-#define QLPROMPT	"do you want to quickload\n\n'%s'?\n\n"PRESSYN
-
-#define NEWGAME	\
-"you can't start a new game\n"\
-"while in a network game.\n\n"PRESSKEY
-
-#define NIGHTMARE	\
-"are you sure? this skill level\n"\
-"isn't even remotely fair.\n\n"PRESSYN
-
-#define SWSTRING	\
-"this is the shareware version of doom.\n\n"\
-"you need to order the entire trilogy.\n\n"PRESSKEY
-
-#define MSGOFF	"Messages OFF"
-#define MSGON		"Messages ON"
-#define NETEND	"you can't end a netgame!\n\n"PRESSKEY
-#define ENDGAME	"are you sure you want\nto end the game?\n\n"PRESSYN
-
-// haleyjd 09/11/10: [STRIFE] No "to dos." on this
-#define DOSY		"(press y to quit)" 
-
-#define DETAILHI	"High detail"
-#define DETAILLO	"Low detail"
-#define GAMMALVL0	"Gamma correction OFF"
-#define GAMMALVL1	"Gamma correction level 1"
-#define GAMMALVL2	"Gamma correction level 2"
-#define GAMMALVL3	"Gamma correction level 3"
-#define GAMMALVL4	"Gamma correction level 4"
-#define EMPTYSTRING	"empty slot"
-
-//
-//	P_inter.C
-//
-#define GOTARMOR	"Picked up the armor."
-#define GOTMEGA	"Picked up the MegaArmor!"
-#define GOTHTHBONUS	"Picked up a health bonus."
-#define GOTARMBONUS	"Picked up an armor bonus."
-#define GOTSTIM	"Picked up a stimpack."
-#define GOTMEDINEED	"Picked up a medikit that you REALLY need!"
-#define GOTMEDIKIT	"Picked up a medikit."
-#define GOTSUPER	"Supercharge!"
-
-#define GOTBLUECARD	"Picked up a blue keycard."
-#define GOTYELWCARD	"Picked up a yellow keycard."
-#define GOTREDCARD	"Picked up a red keycard."
-#define GOTBLUESKUL	"Picked up a blue skull key."
-#define GOTYELWSKUL	"Picked up a yellow skull key."
-#define GOTREDSKULL	"Picked up a red skull key."
-
-#define GOTINVUL	"Invulnerability!"
-#define GOTBERSERK	"Berserk!"
-#define GOTINVIS	"Partial Invisibility"
-#define GOTSUIT	"Radiation Shielding Suit"
-#define GOTMAP	"Computer Area Map"
-#define GOTVISOR	"Light Amplification Visor"
-#define GOTMSPHERE	"MegaSphere!"
-
-#define GOTCLIP	"Picked up a clip."
-#define GOTCLIPBOX	"Picked up a box of bullets."
-#define GOTROCKET	"Picked up a rocket."
-#define GOTROCKBOX	"Picked up a box of rockets."
-#define GOTCELL	"Picked up an energy cell."
-#define GOTCELLBOX	"Picked up an energy cell pack."
-#define GOTSHELLS	"Picked up 4 shotgun shells."
-#define GOTSHELLBOX	"Picked up a box of shotgun shells."
-#define GOTBACKPACK	"Picked up a backpack full of ammo!"
-
-#define GOTBFG9000	"You got the BFG9000!  Oh, yes."
-#define GOTCHAINGUN	"You got the chaingun!"
-#define GOTCHAINSAW	"A chainsaw!  Find some meat!"
-#define GOTLAUNCHER	"You got the rocket launcher!"
-#define GOTPLASMA	"You got the plasma gun!"
-#define GOTSHOTGUN	"You got the shotgun!"
-#define GOTSHOTGUN2	"You got the super shotgun!"
-
-//
-// P_Doors.C
-//
-#define PD_BLUEO	"You need a blue key to activate this object"
-#define PD_REDO	"You need a red key to activate this object"
-#define PD_YELLOWO	"You need a yellow key to activate this object"
-#define PD_BLUEK	"You need a blue key to open this door"
-#define PD_REDK	"You need a red key to open this door"
-#define PD_YELLOWK	"You need a yellow key to open this door"
-
-//
-//	G_game.C
-//
-#define GGSAVED	"game saved."
-
-//
-//	HU_stuff.C
-//
-#define HUSTR_MSGU	"[Message unsent]"
-
-// haleyjd 08/31/10: [STRIFE] Strife map names
-
-#define HUSTR_1         "AREA  1: sanctuary"
-#define HUSTR_2         "AREA  2: town"
-#define HUSTR_3         "AREA  3: front base"
-#define HUSTR_4         "AREA  4: power station"
-#define HUSTR_5         "AREA  5: prison"
-#define HUSTR_6         "AREA  6: sewers"
-#define HUSTR_7         "AREA  7: castle"
-#define HUSTR_8         "AREA  8: Audience Chamber"
-#define HUSTR_9         "AREA  9: Castle: Programmer's Keep"
-
-#define HUSTR_10        "AREA 10: New Front Base"
-#define HUSTR_11        "AREA 11: Borderlands"
-#define HUSTR_12        "AREA 12: the temple of the oracle"
-#define HUSTR_13        "AREA 13: Catacombs"
-#define HUSTR_14        "AREA 14: mines"
-#define HUSTR_15        "AREA 15: Fortress: Administration"
-#define HUSTR_16        "AREA 16: Fortress: Bishop's Tower"
-#define HUSTR_17        "AREA 17: Fortress: The Bailey"
-#define HUSTR_18        "AREA 18: Fortress: Stores"
-#define HUSTR_19        "AREA 19: Fortress: Security Complex"
-
-#define HUSTR_20        "AREA 20: Factory: Receiving"
-#define HUSTR_21        "AREA 21: Factory: Manufacturing"
-#define HUSTR_22        "AREA 22: Factory: Forge"
-#define HUSTR_23        "AREA 23: Order Commons"
-#define HUSTR_24        "AREA 24: Factory: Conversion Chapel"
-#define HUSTR_25        "AREA 25: Catacombs: Ruined Temple"
-#define HUSTR_26        "AREA 26: proving grounds"
-#define HUSTR_27        "AREA 27: The Lab"
-#define HUSTR_28        "AREA 28: Alien Ship"
-#define HUSTR_29        "AREA 29: Entity's Lair"
-
-#define HUSTR_30        "AREA 30: Abandoned Front Base"
-#define HUSTR_31        "AREA 31: Training Facility"
-
-#define HUSTR_32        "AREA  1: Sanctuary"
-#define HUSTR_33        "AREA  2: Town"
-#define HUSTR_34        "AREA  3: Movement Base"
-
-// haleyjd 20110219: [STRIFE] replaced all with Strife chat macros:
-#define HUSTR_CHATMACRO1        "Fucker!"
-#define HUSTR_CHATMACRO2        "--SPLAT-- Instant wall art."
-#define HUSTR_CHATMACRO3        "That had to hurt!"
-#define HUSTR_CHATMACRO4        "Smackings!"
-#define HUSTR_CHATMACRO5        "Gib-O-Matic baby."
-#define HUSTR_CHATMACRO6        "Burn!  Yah! Yah!"
-#define HUSTR_CHATMACRO7        "Buh-Bye!"
-#define HUSTR_CHATMACRO8        "Sizzle chest!"
-#define HUSTR_CHATMACRO9        "That sucked!"
-#define HUSTR_CHATMACRO0        "Mommy?"
-
-#define HUSTR_TALKTOSELF1	"You mumble to yourself"
-#define HUSTR_TALKTOSELF2	"Who's there?"
-#define HUSTR_TALKTOSELF3	"You scare yourself"
-#define HUSTR_TALKTOSELF4	"You start to rave"
-#define HUSTR_TALKTOSELF5	"You've lost it..."
-
-#define HUSTR_MESSAGESENT	"[Message Sent]"
-
-// The following should NOT be changed unless it seems
-// just AWFULLY necessary
-
-// [STRIFE]: Not used, as strings are local to hu_stuff.c
-//#define HUSTR_PLRGREEN	"Green: "
-//#define HUSTR_PLRINDIGO	"Indigo: "
-//#define HUSTR_PLRBROWN	"Brown: "
-//#define HUSTR_PLRRED		"Red: "
-
-#define HUSTR_KEYGREEN	'g'
-#define HUSTR_KEYINDIGO	'i'
-#define HUSTR_KEYBROWN	'b'
-#define HUSTR_KEYRED	'r'
-
-//
-//	AM_map.C
-//
-
-#define AMSTR_FOLLOWON	"Follow Mode ON"
-#define AMSTR_FOLLOWOFF	"Follow Mode OFF"
-
-#define AMSTR_GRIDON	"Grid ON"
-#define AMSTR_GRIDOFF	"Grid OFF"
-
-#define AMSTR_MARKEDSPOT        "Marked Spot"
-#define AMSTR_MARKSCLEARED      "Last Mark Cleared" // [STRIFE]
-
-//
-//	ST_stuff.C
-//
-
-#define STSTR_MUS               "Music Change"
-#define STSTR_NOMUS             "IMPOSSIBLE SELECTION"
-#define STSTR_DQDON             "You're Invincible!"   // [STRIFE]
-#define STSTR_DQDOFF            "You're a looney!"     // [STRIFE]
-
-#define STSTR_KFAADDED          "Very Happy Ammo Added"
-#define STSTR_FAADDED           "Ammo Added"           // [STRIFE]
-
-#define STSTR_NCON              "No Clipping Mode ON"
-#define STSTR_NCOFF             "No Clipping Mode OFF"
-
-#define STSTR_BEHOLD            "Bzrk, Inviso, Mask, Health, Pack, Stats"  // [STRIFE]
-#define STSTR_BEHOLDX           "Power-up Toggled"
-
-#define STSTR_CHOPPERS          "... doesn't suck - GM"
-#define STSTR_CLEV              "Changing Level..."
-
-//
-//	F_Finale.C
-//
-#define E1TEXT \
-"Once you beat the big badasses and\n"\
-"clean out the moon base you're supposed\n"\
-"to win, aren't you? Aren't you? Where's\n"\
-"your fat reward and ticket home? What\n"\
-"the hell is this? It's not supposed to\n"\
-"end this way!\n"\
-"\n" \
-"It stinks like rotten meat, but looks\n"\
-"like the lost Deimos base.  Looks like\n"\
-"you're stuck on The Shores of Hell.\n"\
-"The only way out is through.\n"\
-"\n"\
-"To continue the DOOM experience, play\n"\
-"The Shores of Hell and its amazing\n"\
-"sequel, Inferno!\n"
-
-
-#define E2TEXT \
-"You've done it! The hideous cyber-\n"\
-"demon lord that ruled the lost Deimos\n"\
-"moon base has been slain and you\n"\
-"are triumphant! But ... where are\n"\
-"you? You clamber to the edge of the\n"\
-"moon and look down to see the awful\n"\
-"truth.\n" \
-"\n"\
-"Deimos floats above Hell itself!\n"\
-"You've never heard of anyone escaping\n"\
-"from Hell, but you'll make the bastards\n"\
-"sorry they ever heard of you! Quickly,\n"\
-"you rappel down to  the surface of\n"\
-"Hell.\n"\
-"\n" \
-"Now, it's on to the final chapter of\n"\
-"DOOM! -- Inferno."
-
-
-#define E3TEXT \
-"The loathsome spiderdemon that\n"\
-"masterminded the invasion of the moon\n"\
-"bases and caused so much death has had\n"\
-"its ass kicked for all time.\n"\
-"\n"\
-"A hidden doorway opens and you enter.\n"\
-"You've proven too tough for Hell to\n"\
-"contain, and now Hell at last plays\n"\
-"fair -- for you emerge from the door\n"\
-"to see the green fields of Earth!\n"\
-"Home at last.\n" \
-"\n"\
-"You wonder what's been happening on\n"\
-"Earth while you were battling evil\n"\
-"unleashed. It's good that no Hell-\n"\
-"spawn could have come through that\n"\
-"door with you ..."
-
-
-#define E4TEXT \
-"the spider mastermind must have sent forth\n"\
-"its legions of hellspawn before your\n"\
-"final confrontation with that terrible\n"\
-"beast from hell.  but you stepped forward\n"\
-"and brought forth eternal damnation and\n"\
-"suffering upon the horde as a true hero\n"\
-"would in the face of something so evil.\n"\
-"\n"\
-"besides, someone was gonna pay for what\n"\
-"happened to daisy, your pet rabbit.\n"\
-"\n"\
-"but now, you see spread before you more\n"\
-"potential pain and gibbitude as a nation\n"\
-"of demons run amok among our cities.\n"\
-"\n"\
-"next stop, hell on earth!"
-
-
-// after level 6, put this:
-
-#define C1TEXT \
-"YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
-"STARPORT. BUT SOMETHING IS WRONG. THE\n" \
-"MONSTERS HAVE BROUGHT THEIR OWN REALITY\n" \
-"WITH THEM, AND THE STARPORT'S TECHNOLOGY\n" \
-"IS BEING SUBVERTED BY THEIR PRESENCE.\n" \
-"\n"\
-"AHEAD, YOU SEE AN OUTPOST OF HELL, A\n" \
-"FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n" \
-"YOU CAN PENETRATE INTO THE HAUNTED HEART\n" \
-"OF THE STARBASE AND FIND THE CONTROLLING\n" \
-"SWITCH WHICH HOLDS EARTH'S POPULATION\n" \
-"HOSTAGE."
-
-// After level 11, put this:
-
-#define C2TEXT \
-"YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
-"HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"\
-"THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"\
-"HUMAN LEFT ON THE FACE OF THE PLANET.\n"\
-"CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"\
-"AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"\
-"YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"\
-"THAT YOU HAVE SAVED YOUR SPECIES.\n"\
-"\n"\
-"BUT THEN, EARTH CONTROL BEAMS DOWN A\n"\
-"MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"\
-"THE SOURCE OF THE ALIEN INVASION. IF YOU\n"\
-"GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"\
-"ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"\
-"YOUR OWN HOME CITY, NOT FAR FROM THE\n"\
-"STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"\
-"UP AND RETURN TO THE FRAY."
-
-
-// After level 20, put this:
-
-#define C3TEXT \
-"YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
-"SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"\
-"YOU SEE NO WAY TO DESTROY THE CREATURES'\n"\
-"ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"\
-"TEETH AND PLUNGE THROUGH IT.\n"\
-"\n"\
-"THERE MUST BE A WAY TO CLOSE IT ON THE\n"\
-"OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"\
-"GOT TO GO THROUGH HELL TO GET TO IT?"
-
-
-// After level 29, put this:
-
-#define C4TEXT \
-"THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
-"DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"\
-"YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"\
-"HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"\
-"UP AND DIES, ITS THRASHING LIMBS\n"\
-"DEVASTATING UNTOLD MILES OF HELL'S\n"\
-"SURFACE.\n"\
-"\n"\
-"YOU'VE DONE IT. THE INVASION IS OVER.\n"\
-"EARTH IS SAVED. HELL IS A WRECK. YOU\n"\
-"WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"\
-"DIE, NOW. WIPING THE SWEAT FROM YOUR\n"\
-"FOREHEAD YOU BEGIN THE LONG TREK BACK\n"\
-"HOME. REBUILDING EARTH OUGHT TO BE A\n"\
-"LOT MORE FUN THAN RUINING IT WAS.\n"
-
-
-
-// Before level 31, put this:
-
-#define C5TEXT \
-"CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
-"LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"\
-"HUMANS, RATHER THAN DEMONS. YOU WONDER\n"\
-"WHO THE INMATES OF THIS CORNER OF HELL\n"\
-"WILL BE."
-
-
-// Before level 32, put this:
-
-#define C6TEXT \
-"CONGRATULATIONS, YOU'VE FOUND THE\n"\
-"SUPER SECRET LEVEL!  YOU'D BETTER\n"\
-"BLAZE THROUGH THIS ONE!\n"
-
-
-// after map 06	
-
-#define P1TEXT  \
-"You gloat over the steaming carcass of the\n"\
-"Guardian.  With its death, you've wrested\n"\
-"the Accelerator from the stinking claws\n"\
-"of Hell.  You relax and glance around the\n"\
-"room.  Damn!  There was supposed to be at\n"\
-"least one working prototype, but you can't\n"\
-"see it. The demons must have taken it.\n"\
-"\n"\
-"You must find the prototype, or all your\n"\
-"struggles will have been wasted. Keep\n"\
-"moving, keep fighting, keep killing.\n"\
-"Oh yes, keep living, too."
-
-
-// after map 11
-
-#define P2TEXT \
-"Even the deadly Arch-Vile labyrinth could\n"\
-"not stop you, and you've gotten to the\n"\
-"prototype Accelerator which is soon\n"\
-"efficiently and permanently deactivated.\n"\
-"\n"\
-"You're good at that kind of thing."
-
-
-// after map 20
-
-#define P3TEXT \
-"You've bashed and battered your way into\n"\
-"the heart of the devil-hive.  Time for a\n"\
-"Search-and-Destroy mission, aimed at the\n"\
-"Gatekeeper, whose foul offspring is\n"\
-"cascading to Earth.  Yeah, he's bad. But\n"\
-"you know who's worse!\n"\
-"\n"\
-"Grinning evilly, you check your gear, and\n"\
-"get ready to give the bastard a little Hell\n"\
-"of your own making!"
-
-// after map 30
-
-#define P4TEXT \
-"The Gatekeeper's evil face is splattered\n"\
-"all over the place.  As its tattered corpse\n"\
-"collapses, an inverted Gate forms and\n"\
-"sucks down the shards of the last\n"\
-"prototype Accelerator, not to mention the\n"\
-"few remaining demons.  You're done. Hell\n"\
-"has gone back to pounding bad dead folks \n"\
-"instead of good live ones.  Remember to\n"\
-"tell your grandkids to put a rocket\n"\
-"launcher in your coffin. If you go to Hell\n"\
-"when you die, you'll need it for some\n"\
-"final cleaning-up ..."
-
-// before map 31
-
-#define P5TEXT \
-"You've found the second-hardest level we\n"\
-"got. Hope you have a saved game a level or\n"\
-"two previous.  If not, be prepared to die\n"\
-"aplenty. For master marines only."
-
-// before map 32
-
-#define P6TEXT \
-"Betcha wondered just what WAS the hardest\n"\
-"level we had ready for ya?  Now you know.\n"\
-"No one gets out alive."
-
-
-#define T1TEXT \
-"You've fought your way out of the infested\n"\
-"experimental labs.   It seems that UAC has\n"\
-"once again gulped it down.  With their\n"\
-"high turnover, it must be hard for poor\n"\
-"old UAC to buy corporate health insurance\n"\
-"nowadays..\n"\
-"\n"\
-"Ahead lies the military complex, now\n"\
-"swarming with diseased horrors hot to get\n"\
-"their teeth into you. With luck, the\n"\
-"complex still has some warlike ordnance\n"\
-"laying around."
-
-
-#define T2TEXT \
-"You hear the grinding of heavy machinery\n"\
-"ahead.  You sure hope they're not stamping\n"\
-"out new hellspawn, but you're ready to\n"\
-"ream out a whole herd if you have to.\n"\
-"They might be planning a blood feast, but\n"\
-"you feel about as mean as two thousand\n"\
-"maniacs packed into one mad killer.\n"\
-"\n"\
-"You don't plan to go down easy."
-
-
-#define T3TEXT \
-"The vista opening ahead looks real damn\n"\
-"familiar. Smells familiar, too -- like\n"\
-"fried excrement. You didn't like this\n"\
-"place before, and you sure as hell ain't\n"\
-"planning to like it now. The more you\n"\
-"brood on it, the madder you get.\n"\
-"Hefting your gun, an evil grin trickles\n"\
-"onto your face. Time to take some names."
-
-#define T4TEXT \
-"Suddenly, all is silent, from one horizon\n"\
-"to the other. The agonizing echo of Hell\n"\
-"fades away, the nightmare sky turns to\n"\
-"blue, the heaps of monster corpses start \n"\
-"to evaporate along with the evil stench \n"\
-"that filled the air. Jeeze, maybe you've\n"\
-"done it. Have you really won?\n"\
-"\n"\
-"Something rumbles in the distance.\n"\
-"A blue light begins to glow inside the\n"\
-"ruined skull of the demon-spitter."
-
-
-#define T5TEXT \
-"What now? Looks totally different. Kind\n"\
-"of like King Tut's condo. Well,\n"\
-"whatever's here can't be any worse\n"\
-"than usual. Can it?  Or maybe it's best\n"\
-"to let sleeping gods lie.."
-
-
-#define T6TEXT \
-"Time for a vacation. You've burst the\n"\
-"bowels of hell and by golly you're ready\n"\
-"for a break. You mutter to yourself,\n"\
-"Maybe someone else can kick Hell's ass\n"\
-"next time around. Ahead lies a quiet town,\n"\
-"with peaceful flowing water, quaint\n"\
-"buildings, and presumably no Hellspawn.\n"\
-"\n"\
-"As you step off the transport, you hear\n"\
-"the stomp of a cyberdemon's iron shoe."
-
-
-
-//
-// Character cast strings F_FINALE.C
-//
-#define CC_ZOMBIE	"ZOMBIEMAN"
-#define CC_SHOTGUN	"SHOTGUN GUY"
-#define CC_HEAVY	"HEAVY WEAPON DUDE"
-#define CC_IMP	"IMP"
-#define CC_DEMON	"DEMON"
-#define CC_LOST	"LOST SOUL"
-#define CC_CACO	"CACODEMON"
-#define CC_HELL	"HELL KNIGHT"
-#define CC_BARON	"BARON OF HELL"
-#define CC_ARACH	"ARACHNOTRON"
-#define CC_PAIN	"PAIN ELEMENTAL"
-#define CC_REVEN	"REVENANT"
-#define CC_MANCU	"MANCUBUS"
-#define CC_ARCH	"ARCH-VILE"
-#define CC_SPIDER	"THE SPIDER MASTERMIND"
-#define CC_CYBER	"THE CYBERDEMON"
-#define CC_HERO	"OUR HERO"
-
-
-#endif
diff --git a/games/NXDoom/src/strife/d_items.c b/games/NXDoom/src/strife/d_items.c
deleted file mode 100644
index a57ed61ea..000000000
--- a/games/NXDoom/src/strife/d_items.c
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-
-
-// We are referring to sprite numbers.
-#include "info.h"
-
-#include "d_items.h"
-
-
-//
-// PSPRITE ACTIONS for waepons.
-// This struct controls the weapon animations.
-//
-// Each entry is:
-//   ammo/amunition type
-//  upstate
-//  downstate
-// readystate
-// atkstate, i.e. attack/fire/hit frame
-// flashstate, muzzle flash
-//
-
-// villsa [STRIFE]
-weaponinfo_t	weaponinfo[NUMWEAPONS] =
-{
-    {
-        // fist
-        am_noammo,
-        S_PNCH_03,
-        S_PNCH_02,
-        S_PNCH_01,
-        S_PNCH_04,
-        S_NULL,
-        1
-    },	
-    {
-        // electric bow
-        am_elecbolts,
-        S_XBOW_02,
-        S_XBOW_01,
-        S_XBOW_00,
-        S_XBOW_03,
-        S_NULL,
-        1
-    },	
-    {
-        // rifle
-        am_bullets,
-        S_RIFG_02,
-        S_RIFG_01,
-        S_RIFG_00,
-        S_RIFF_00,
-        S_NULL,
-        1
-    },
-    {
-        // missile launcher
-        am_missiles,
-        S_MMIS_02,
-        S_MMIS_01,
-        S_MMIS_00,
-        S_MMIS_03,
-        S_NULL,
-        0
-    },
-    {
-        // grenade launcher
-        am_hegrenades,
-        S_GREN_02,
-        S_GREN_01,
-        S_GREN_00,
-        S_GREN_03,
-        S_GREF_00,
-        0
-    },
-    {
-        // flame thrower
-        am_cell,
-        S_FLMT_03,
-        S_FLMT_02,
-        S_FLMT_00,
-        S_FLMF_00,
-        S_NULL,
-        1
-    },
-    {
-        // mauler
-        am_cell,
-        S_BLST_05,
-        S_BLST_04,
-        S_BLST_00,
-        S_BLSF_00,
-        S_NULL,
-        0
-    },
-    {
-        // sigil
-        am_noammo,
-        S_SIGH_06,
-        S_SIGH_05,
-        S_SIGH_00,
-        S_SIGH_07,
-        S_SIGF_00,
-        0
-    },
-    {
-        // poison bow
-        am_poisonbolts,
-        S_XBOW_15,
-        S_XBOW_14,
-        S_XBOW_13,
-        S_XBOW_16,
-        S_NULL,
-        1
-    },
-    {
-        // wp grenade launcher
-        am_wpgrenades,
-        S_GREN_10,
-        S_GREN_09,
-        S_GREN_08,
-        S_GREN_11,
-        S_GREF_03,
-        0
-    },
-    {
-        // torpedo
-        am_cell,
-        S_BLST_18,
-        S_BLST_17,
-        S_BLST_13,
-        S_BLST_19,
-        S_NULL,
-        0
-    },	
-};
-
-
-
-
-
-
-
-
diff --git a/games/NXDoom/src/strife/d_items.h b/games/NXDoom/src/strife/d_items.h
deleted file mode 100644
index eb4d725f2..000000000
--- a/games/NXDoom/src/strife/d_items.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Items: key cards, artifacts, weapon, ammunition.
-//
-
-
-#ifndef __D_ITEMS__
-#define __D_ITEMS__
-
-#include "doomdef.h"
-
-
-
-// Weapon info: sprite frames, ammunition use.
-typedef struct
-{
-    ammotype_t	ammo;
-    int		upstate;
-    int		downstate;
-    int		readystate;
-    int		atkstate;
-    int		flashstate;
-    boolean     availabledemo;    // villsa [STRIFE]
-
-} weaponinfo_t;
-
-extern  weaponinfo_t    weaponinfo[NUMWEAPONS];
-
-#endif
diff --git a/games/NXDoom/src/strife/d_main.c b/games/NXDoom/src/strife/d_main.c
deleted file mode 100644
index 56372b538..000000000
--- a/games/NXDoom/src/strife/d_main.c
+++ /dev/null
@@ -1,2191 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM main program (D_DoomMain) and game loop (D_DoomLoop),
-//	plus functions to determine game mode (shareware, registered),
-//	parse command line parameters, configure game parameters (turbo),
-//	and call the startup functions.
-//
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-#include "deh_main.h"
-#include "doomdef.h"
-#include "doomstat.h"
-
-#include "dstrings.h"
-#include "sounds.h"
-
-#include "txt_main.h"
-#include "txt_io.h"
-
-#include "d_iwad.h"
-
-#include "z_zone.h"
-#include "w_main.h"
-#include "w_wad.h"
-#include "s_sound.h"
-#include "v_diskicon.h"
-#include "v_video.h"
-
-#include "f_finale.h"
-#include "f_wipe.h"
-
-#include "m_argv.h"
-#include "m_config.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "m_menu.h"
-#include "m_saves.h" // haleyjd [STRIFE]
-#include "p_saveg.h"
-#include "p_dialog.h" // haleyjd [STRIFE]
-
-#include "i_endoom.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "i_swap.h"
-
-#include "g_game.h"
-
-#include "hu_stuff.h"
-#include "wi_stuff.h"
-#include "st_stuff.h"
-#include "am_map.h"
-#include "net_client.h"
-#include "net_dedicated.h"
-#include "net_query.h"
-
-#include "p_setup.h"
-#include "r_local.h"
-
-#include "d_main.h"
-
-#include "strife_icon.c"
-
-//
-// D-DoomLoop()
-// Not a globally visible function,
-//  just included for source reference,
-//  called by D_DoomMain, never exits.
-// Manages timing and IO,
-//  calls all ?_Responder, ?_Ticker, and ?_Drawer,
-//  calls I_GetTime, I_StartFrame, and I_StartTic
-//
-void D_DoomLoop (void);
-
-static boolean D_AddFile(char *filename);
-
-// Location where savegames are stored
-
-char *          savegamedir;
-
-// location of IWAD and WAD files
-
-char *          iwadfile;
-
-
-boolean         devparm;        // started game with -devparm
-boolean         nomonsters;     // checkparm of -nomonsters
-boolean         respawnparm;    // checkparm of -respawn
-boolean         fastparm;       // checkparm of -fast
-boolean         flipparm;       // [STRIFE] haleyjd 20110629: checkparm of -flip
-boolean         randomparm;     // [STRIFE] haleyjd 20130915: checkparm of -random
-
-boolean         showintro = true;   // [STRIFE] checkparm of -nograph, disables intro
-
-
-skill_t		startskill;
-int             startepisode;
-int		startmap;
-boolean		autostart;
-int             startloadgame;
-
-boolean		advancedemo;
-
-// villsa [STRIFE] workparm variable (similar to devparm?)
-boolean         workparm = false;
-
-// villsa [STRIFE] stonecold cheat variable
-boolean         stonecold = false;
-
-// haleyjd 09/11/10: [STRIFE] Game type variables
-boolean         isregistered;
-boolean         isdemoversion;
-
-// Store demo, do not accept any inputs
-// haleyjd [STRIFE] Unused.
-//boolean         storedemo;
-
-
-int             show_endoom = 1;
-int             show_diskicon = 1;
-int             graphical_startup = 1;
-static boolean  using_text_startup;
-
-// If true, startup has completed and the main game loop has started.
-
-static boolean main_loop_started = false;
-
-// fraggle 06/03/11 [STRIFE]: Unused config variable, preserved
-// for compatibility:
-
-static int comport = 0;
-
-// fraggle 06/03/11 [STRIFE]: Multiplayer nickname?
-char *nickname = NULL;
-
-void D_ConnectNetGame(void);
-void D_CheckNetGame(void);
-
-
-//
-// D_ProcessEvents
-// Send all the events of the given timestamp down the responder chain
-//
-void D_ProcessEvents (void)
-{
-    event_t*    ev;
-
-    // haleyjd 08/22/2010: [STRIFE] there is no such thing as a "store demo" 
-    // version of Strife
-
-    // IF STORE DEMO, DO NOT ACCEPT INPUT
-    //if (storedemo)
-    //    return;
-
-    while ((ev = D_PopEvent()) != NULL)
-    {
-        if (M_Responder (ev))
-            continue;               // menu ate the event
-        G_Responder (ev);
-    }
-}
-
-
-
-
-//
-// D_Display
-//  draw current display, possibly wiping it from the previous
-//
-// wipegamestate can be set to -1 to force a wipe on the next draw
-//
-// haleyjd 08/23/10: [STRIFE]:
-// * Changes to eliminate intermission and change timing of screenwipe
-// * 20100901: Added ST_DrawExternal and popupactivestate static variable
-// * 20110206: Start wipegamestate at GS_UNKNOWN (STRIFE-TODO: rename?)
-//
-gamestate_t     wipegamestate = GS_UNKNOWN;
-
-void D_Display (void)
-{
-    static  boolean             viewactivestate = false;
-    static  boolean             menuactivestate = false;
-    static  boolean             inhelpscreensstate = false;
-    static  boolean             popupactivestate = false; // [STRIFE]
-    static  boolean             fullscreen = false;
-    static  gamestate_t         oldgamestate = -1;
-    static  int                 borderdrawcount;
-    int                         nowtime;
-    int                         tics;
-    int                         wipestart;
-    int                         y;
-    boolean                     done;
-    boolean                     wipe;
-    boolean                     redrawsbar;
-
-    if (nodrawers)
-        return;                    // for comparative timing / profiling
-
-    redrawsbar = false;
-    
-    // change the view size if needed
-    if (setsizeneeded)
-    {
-        R_ExecuteSetViewSize ();
-        oldgamestate = -1;                      // force background redraw
-        borderdrawcount = 3;
-    }
-
-    // save the current screen if about to wipe
-    if (gamestate != wipegamestate)
-    {
-        wipe = true;
-        wipe_StartScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
-    }
-    else
-        wipe = false;
-
-    if (gamestate == GS_LEVEL && gametic)
-        HU_Erase();
-
-    // do buffered drawing
-    switch (gamestate)
-    {
-    case GS_LEVEL:
-        if (!gametic)
-            break;
-        if (automapactive)
-            AM_Drawer ();
-        if (wipe || (viewheight != 200 && fullscreen) )
-            redrawsbar = true;
-        // haleyjd 08/29/10: [STRIFE] Always redraw sbar if menu is/was active
-        if (menuactivestate || (inhelpscreensstate && !inhelpscreens))
-            redrawsbar = true;              // just put away the help screen
-        ST_Drawer (viewheight == 200, redrawsbar );
-        fullscreen = viewheight == 200;
-        break;
-      
-     // haleyjd 08/23/2010: [STRIFE] No intermission
-     /*
-     case GS_INTERMISSION:
-         WI_Drawer ();
-         break;
-     */
-
-    case GS_FINALE:
-        F_Drawer ();
-        break;
-
-    case GS_DEMOSCREEN:
-        D_PageDrawer ();
-        break;
-    
-    default:
-        break;
-    }
-    
-    // draw buffered stuff to screen
-    I_UpdateNoBlit ();
-
-    // draw the view directly
-    if (gamestate == GS_LEVEL && !automapactive && gametic)
-        R_RenderPlayerView (&players[displayplayer]);
-
-    // clean up border stuff
-    if (gamestate != oldgamestate && gamestate != GS_LEVEL)
-        I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
-
-    // see if the border needs to be initially drawn
-    if (gamestate == GS_LEVEL && oldgamestate != GS_LEVEL)
-    {
-        viewactivestate = false;        // view was not active
-        R_FillBackScreen ();    // draw the pattern into the back screen
-    }
-
-    // see if the border needs to be updated to the screen
-    if (gamestate == GS_LEVEL && !automapactive && scaledviewwidth != 320)
-    {
-        if (menuactive || menuactivestate || !viewactivestate)
-        {
-            borderdrawcount = 3;
-            popupactivestate = false;
-        }
-        if (borderdrawcount)
-        {
-            R_DrawViewBorder ();    // erase old menu stuff
-            borderdrawcount--;
-        }
-
-    }
-
-    if (testcontrols)
-    {
-        // Box showing current mouse speed
-
-        V_DrawMouseSpeedBox(testcontrols_mousespeed);
-    }
-
-    menuactivestate = menuactive;
-    viewactivestate = viewactive;
-    inhelpscreensstate = inhelpscreens;
-    oldgamestate = wipegamestate = gamestate;
-
-    // haleyjd 20120208: [STRIFE] Rogue moved this down to below border drawing
-    if (gamestate == GS_LEVEL && gametic)
-    {
-        HU_Drawer ();
-        if(ST_DrawExternal()) 
-            popupactivestate = true;
-        else if(popupactivestate)
-        {
-            popupactivestate = false;
-            menuactivestate = 1;
-        }
-    }
-
-    // draw pause pic
-    if (paused)
-    {
-        if (automapactive)
-            y = 4;
-        else
-            y = viewwindowy+4;
-        V_DrawPatchDirect(viewwindowx + (scaledviewwidth - 68) / 2, y,
-                          W_CacheLumpName (DEH_String("M_PAUSE"), PU_CACHE));
-    }
-
-
-    // menus go directly to the screen
-    M_Drawer ();          // menu is drawn even on top of everything
-    NetUpdate ();         // send out any new accumulation
-
-
-    // normal update
-    if (!wipe)
-    {
-        I_FinishUpdate ();              // page flip or blit buffer
-        return;
-    }
-    
-    // wipe update
-    wipe_EndScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
-
-    wipestart = I_GetTime () - 1;
-
-    do
-    {
-        do
-        {
-            nowtime = I_GetTime ();
-            tics = nowtime - wipestart;
-            I_Sleep(1);
-        } while (tics < 3); // haleyjd 08/23/2010: [STRIFE] Changed from == 0 to < 3
-
-        // haleyjd 08/26/10: [STRIFE] Changed to use ColorXForm wipe.
-        wipestart = nowtime;
-        done = wipe_ScreenWipe(wipe_ColorXForm
-                               , 0, 0, SCREENWIDTH, SCREENHEIGHT, tics);
-        I_UpdateNoBlit ();
-        M_Drawer ();                            // menu is drawn even on top of wipes
-        I_FinishUpdate ();                      // page flip or blit buffer
-    } while (!done);
-}
-
-//
-// Add configuration file variable bindings.
-//
-
-
-static const char * const chat_macro_defaults[10] =
-{
-    HUSTR_CHATMACRO0,
-    HUSTR_CHATMACRO1,
-    HUSTR_CHATMACRO2,
-    HUSTR_CHATMACRO3,
-    HUSTR_CHATMACRO4,
-    HUSTR_CHATMACRO5,
-    HUSTR_CHATMACRO6,
-    HUSTR_CHATMACRO7,
-    HUSTR_CHATMACRO8,
-    HUSTR_CHATMACRO9
-};
-
-
-void D_BindVariables(void)
-{
-    int i;
-
-    M_ApplyPlatformDefaults();
-
-    I_BindInputVariables();
-    I_BindVideoVariables();
-    I_BindJoystickVariables();
-    I_BindSoundVariables();
-
-    M_BindBaseControls();
-    M_BindWeaponControls();
-    M_BindMapControls();
-    M_BindMenuControls();
-    M_BindStrifeControls(); // haleyjd 09/01/10: [STRIFE]
-    M_BindChatControls(MAXPLAYERS);
-
-    // haleyjd 20130915: Strife chat keys
-    key_multi_msgplayer[0] = '1';
-    key_multi_msgplayer[1] = '2';
-    key_multi_msgplayer[2] = '3';
-    key_multi_msgplayer[3] = '4';
-    key_multi_msgplayer[4] = '5';
-    key_multi_msgplayer[5] = '6';
-    key_multi_msgplayer[6] = '7';
-    key_multi_msgplayer[7] = '8';
-
-    NET_BindVariables();
-
-    // haleyjd 08/29/10: [STRIFE]
-    // * Added voice volume
-    // * Added back flat
-    // * Removed show_messages
-    // * Added show_talk
-    // fraggle 03/06/10: [STRIFE]
-    // * Removed detailLevel
-    // * screenblocks -> screensize
-    // * Added nickname, comport
-
-    M_BindIntVariable("mouse_sensitivity",      &mouseSensitivity);
-    M_BindIntVariable("sfx_volume",             &sfxVolume);
-    M_BindIntVariable("music_volume",           &musicVolume);
-    M_BindIntVariable("voice_volume",           &voiceVolume); 
-    M_BindIntVariable("show_talk",              &dialogshowtext);
-    M_BindIntVariable("screensize",             &screenblocks);
-    M_BindIntVariable("snd_channels",           &snd_channels);
-    M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
-    M_BindIntVariable("vanilla_demo_limit",     &vanilla_demo_limit);
-    M_BindIntVariable("show_endoom",            &show_endoom);
-    M_BindIntVariable("show_diskicon",          &show_diskicon);
-    M_BindIntVariable("graphical_startup",      &graphical_startup);
-
-    M_BindStringVariable("back_flat",           &back_flat);
-    M_BindStringVariable("nickname",            &nickname);
-
-    M_BindIntVariable("comport",                &comport);
-
-    // Multiplayer chat macros
-
-    for (i=0; i<10; ++i)
-    {
-        char buf[12];
-
-        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
-        M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
-        M_BindStringVariable(buf, &chat_macros[i]);
-    }
-}
-
-//
-// D_GrabMouseCallback
-//
-// Called to determine whether to grab the mouse pointer
-//
-
-boolean D_GrabMouseCallback(void)
-{
-    // Drone players don't need mouse focus
-
-    if (drone)
-        return false;
-
-    // when menu is active or game is paused, release the mouse.
-
-    if (menuactive || paused)
-        return false;
-
-    // only grab mouse when playing levels (but not demos)
-
-    return (gamestate == GS_LEVEL) && !demoplayback;
-}
-
-// During startup, never grab the mouse.
-
-static boolean D_StartupGrabCallback(void)
-{
-    return false;
-}
-
-//
-//  D_DoomLoop
-//
-//  haleyjd 08/23/10: [STRIFE] Verified unmodified.
-//
-void D_DoomLoop (void)
-{
-    if (demorecording)
-        G_BeginRecording ();
-
-    main_loop_started = true;
-
-    TryRunTics();
-
-    if (!showintro)
-    {
-        I_RegisterWindowIcon(strife_icon_data, strife_icon_w, strife_icon_h);
-        I_InitGraphics();
-    }
-
-    if (show_diskicon)
-    {
-        V_EnableLoadingDisk("STDISK", SCREENWIDTH - LOADING_DISK_W, 3);
-    }
-    I_SetGrabMouseCallback(D_GrabMouseCallback);
-
-    V_RestoreBuffer();
-    R_ExecuteSetViewSize();
-
-    D_StartGameLoop();
-
-    if (testcontrols)
-    {
-        wipegamestate = gamestate;
-    }
-
-    while (1)
-    {
-        // frame syncronous IO operations
-        I_StartFrame ();
-
-        // process one or more tics
-        TryRunTics (); // will run at least one tic
-
-        S_UpdateSounds (players[consoleplayer].mo);// move positional sounds
-
-        // Update display, next frame, with current state.
-        if (screenvisible)
-            D_Display ();
-    }
-}
-
-
-
-//
-//  DEMO LOOP
-//
-int             demosequence;
-int             pagetic;
-const char      *pagename;
-
-
-//
-// D_PageTicker
-// Handles timing for warped projection
-//
-// haleyjd 08/22/2010: [STRIFE] verified unmodified
-//
-void D_PageTicker (void)
-{
-    if (--pagetic < 0)
-        D_AdvanceDemo ();
-}
-
-
-
-//
-// D_PageDrawer
-//
-// haleyjd 08/22/2010: [STRIFE] verified unmodified
-//
-void D_PageDrawer (void)
-{
-    V_DrawPatch (0, 0, W_CacheLumpName(pagename, PU_CACHE));
-}
-
-
-//
-// D_AdvanceDemo
-// Called after each demo or intro demosequence finishes
-//
-// haleyjd 08/22/2010: [STRIFE] verified unmodified
-//
-void D_AdvanceDemo (void)
-{
-    advancedemo = true;
-}
-
-
-//
-// This cycles through the demo sequences.
-// FIXME - version dependend demo numbers?
-//
-// [STRIFE] Modified for the opening slideshow and the exit screen
-//
-void D_DoAdvanceDemo (void)
-{
-    players[consoleplayer].playerstate = PST_LIVE;  // not reborn
-    advancedemo = false;
-    usergame = false;               // no save / end game here
-    paused = false;
-    gameaction = ga_nothing;
-    
-    // villsa 09/12/10: [STRIFE] converted pagetics to ticrate
-    switch (demosequence)
-    {
-    case -5: // exit the game
-        I_Quit();
-        return;
-    case -4: // show exit screen
-        menuactive = false;
-        pagetic = 3*TICRATE;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("PANEL7");
-        S_StartMusic(mus_fast);
-        if(isdemoversion)
-            demosequence = -3; // show Velocity logo
-        else
-            demosequence = -5; // exit
-        return;
-    case -3: // show Velocity logo for demo version
-        pagetic = 6*TICRATE;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("vellogo");
-        demosequence = -5; // exit
-        return;
-    case -2: // title screen
-        pagetic = 6*TICRATE;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("TITLEPIC");
-        S_StartMusic(mus_logo);
-        demosequence = -1; // start intro cinematic
-        return;
-    case -1: // start of intro cinematic
-        pagetic = 10;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("PANEL0");
-        S_StartSound(NULL, sfx_rb2act);
-        wipegamestate = -1;
-        break;
-    case 0: // Rogue logo
-        pagetic = 4*TICRATE;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("RGELOGO");
-        wipegamestate = -1;
-        break;
-    case 1:
-        pagetic = 7*TICRATE;              // The comet struck our planet without
-        gamestate = GS_DEMOSCREEN;        // warning.We lost our paradise in a 
-        pagename = DEH_String("PANEL1");  // single, violent stroke.
-        I_StartVoice(DEH_String("pro1")); 
-        S_StartMusic(mus_intro);
-        break;
-    case 2:
-        pagetic = 9*TICRATE;              // The impact released a virus which 
-        gamestate = GS_DEMOSCREEN;        // swept through the land and killed 
-        pagename = DEH_String("PANEL2");  // millions. They turned out to be 
-        I_StartVoice(DEH_String("pro2")); // the lucky ones...
-        break;
-    case 3:
-        pagetic = 12*TICRATE;             // For those that did not die became 
-        gamestate = GS_DEMOSCREEN;        // mutations of humanity. Some became
-        pagename = DEH_String("PANEL3");  // fanatics who heard the voice of a
-        I_StartVoice(DEH_String("pro3")); // malignant God in their heads, and 
-        break;                            // called themselves the Order.
-    case 4:
-        pagetic = 11*TICRATE;             // Those of us who were deaf to this
-        pagename = DEH_String("PANEL4");  // voice suffer horribly and are 
-        gamestate = GS_DEMOSCREEN;        // forced to serve these ruthless
-        I_StartVoice(DEH_String("pro4")); // psychotics, who wield weapons more
-        break;                            // powerful than anything we can muster.
-    case 5:
-        pagetic = 10*TICRATE;             // They destroy our women and children,
-        gamestate = GS_DEMOSCREEN;        // so that we must hide them underground,
-        pagename = DEH_String("PANEL5");  // and live like animals in constant
-        I_StartVoice(DEH_String("pro5")); // fear for our lives.
-        break;
-    case 6:                               // But there are whispers of discontent.
-        pagetic = 16*TICRATE;             // If we organize, can we defeat our
-        gamestate = GS_DEMOSCREEN;        // masters? Weapons are being stolen,
-        pagename = DEH_String("PANEL6");  // soldiers are being trained. A 
-        I_StartVoice(DEH_String("pro6")); // Movement is born! Born of lifelong 
-        break;                            // STRIFE!
-    case 7: // titlepic again - unused...
-        pagetic = 9*TICRATE;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("TITLEPIC");
-        wipegamestate = -1;
-        break;
-    case 8: // demo
-        ClearTmp();
-        pagetic = 9*TICRATE;
-        G_DeferedPlayDemo(DEH_String("demo1"));
-        break;
-    case 9: // velocity logo? - unused...
-        pagetic = 6*TICRATE;
-        gamestate = GS_DEMOSCREEN;
-        pagename = DEH_String("vellogo");
-        wipegamestate = -1;
-        break;
-    case 10: // credits
-        gamestate = GS_DEMOSCREEN;
-        pagetic = 12*TICRATE;
-        pagename = DEH_String("CREDIT");
-        wipegamestate = -1;
-        break;
-    default:
-        break;
-    }
-
-    ++demosequence;
-
-    if(demosequence > 11)
-        demosequence = -2;
-    if(demosequence == 7 || demosequence == 9)
-        ++demosequence;
-}
-
-
-
-//
-// D_StartTitle
-//
-// [STRIFE]
-// haleyjd 09/11/10: Small modifications for new demo sequence.
-//
-void D_StartTitle (void)
-{
-    gamestate = GS_DEMOSCREEN;
-    gameaction = ga_nothing;
-    demosequence = -2;
-    D_AdvanceDemo ();
-}
-
-//
-// D_QuitGame
-//
-// [STRIFE] New function
-// haleyjd 09/11/10: Sets up the quit game snippet powered by the
-// demo sequence.
-//
-void D_QuitGame(void)
-{
-    gameaction = ga_nothing;
-    demosequence = -4;
-    D_AdvanceDemo();
-}
-
-// Strings for dehacked replacements of the startup banner
-//
-// These are from the original source: some of them are perhaps
-// not used in any dehacked patches
-
-static const char *banners[] =
-{
-    // strife1.wad:
-
-    "                      "
-    "STRIFE:  Quest for the Sigil v1.2"
-    "                                 "
-};
-
-//
-// Get game name: if the startup banner has been replaced, use that.
-// Otherwise, use the name given
-// 
-
-static char *GetGameName(char *gamename)
-{
-    size_t i;
-    const char *deh_sub;
-    
-    for (i=0; i<arrlen(banners); ++i)
-    {
-        // Has the banner been replaced?
-
-        deh_sub = DEH_String(banners[i]);
-        
-        if (deh_sub != banners[i])
-        {
-            size_t gamename_size;
-
-            // Has been replaced
-            // We need to expand via printf to include the Doom version 
-            // number
-            // We also need to cut off spaces to get the basic name
-
-            gamename_size = strlen(deh_sub) + 10;
-            gamename = Z_Malloc(gamename_size, PU_STATIC, 0);
-            M_snprintf(gamename, gamename_size, deh_sub,
-                       STRIFE_VERSION / 100, STRIFE_VERSION % 100);
-
-            while (gamename[0] != '\0' && isspace(gamename[0]))
-            {
-                memmove(gamename, gamename + 1, gamename_size - 1);
-            }
-
-            while (gamename[0] != '\0' && isspace(gamename[strlen(gamename)-1]))
-                gamename[strlen(gamename) - 1] = '\0';
-
-            return gamename;
-        }
-    }
-
-    return gamename;
-}
-
-//
-// Find out what version of Doom is playing.
-//
-
-void D_IdentifyVersion(void)
-{
-    // gamemission is set up by the D_FindIWAD function.  But if 
-    // we specify '-iwad', we have to identify using 
-    // IdentifyIWADByName.  However, if the iwad does not match
-    // any known IWAD name, we may have a dilemma.  Try to 
-    // identify by its contents.
-    
-    // STRIFE-TODO: some elaborate checks? for now we assume...
-    // The logic in strife1.exe is simple:
-    // * if strife1.wad is found, set isregistered = true
-    // * if strife0.wad is found, set isdemoversion = true
-
-    // Make sure gamemode is set up correctly
-    gamemode = commercial;
-    gamemission = strife;
-    isregistered = true;
-
-    // Load voices.wad 
-    if(isregistered)
-    {
-        char *name = NULL;
-        int p;
-
-        // If -iwad was used, check and see if voices.wad exists on the same
-        // filepath.
-        if((p = M_CheckParm("-iwad")) && p < myargc - 1)
-        {
-            const char *iwad = myargv[p + 1];
-            size_t  len      = strlen(iwad) + 1;
-            char   *iwadpath = Z_Malloc(len, PU_STATIC, NULL);
-            char   *voiceswad;
-
-            // extract base path of IWAD parameter
-            M_GetFilePath(iwad, iwadpath, len);
-
-            // concatenate with /voices.wad
-            voiceswad = M_SafeFilePath(iwadpath, "voices.wad");
-            Z_Free(iwadpath);
-
-            name = M_FileCaseExists(voiceswad);
-            Z_Free(voiceswad);
-        }
-
-        // not found? try global search paths
-        if(!name)
-            name = D_FindWADByName("voices.wad");
-
-        // still not found? too bad.
-        if(!name)
-        {
-            disable_voices = 1;
-
-            if(devparm)
-                 printf("Voices disabled\n");
-        }
-        else
-        {
-            // add it.
-            D_AddFile(name);
-            free(name);
-        }
-    }
-}
-
-#if 0
-//
-// DoTimeBomb
-//
-// haleyjd 08/23/2010: [STRIFE] New function
-// Code with no xrefs; probably left over from a private alpha or beta.
-// Translated here because it explains what the SERIAL lump was meant to do.
-//
-void DoTimeBomb(void)
-{
-    dosdate_t date;
-    char *serial;
-    int serialnum;
-    int serial_year;
-    int serial_month;
-
-    serial = W_CacheLumpName("serial", PU_CACHE);
-    serialnum = atoi(serial);
-
-    // Rogue, much like Governor Mourel, were lousy liars. These deceptive
-    // error messages are pretty low :P
-    dos_getdate(&date);
-    if(date.year > 1996 || date.day > 15 && date.month > 4)
-        I_Error("Data error! Corrupted WAD File!");
-    serial_year = serialnum / 10000;
-    serial_month = serialnum / 100 - 100 * serial_year;
-    if(date.year < serial_year || 
-       date.day < serialnum - 100 * serial_month - 10000 * serial_year &&
-       date.month < serial_month)
-       I_Error("Bad wadfile");
-}
-#endif
-
-// Set the gamedescription string
-
-void D_SetGameDescription(void)
-{
-    gamedescription = GetGameName("Strife: Quest for the Sigil");
-}
-
-//      print title for every printed line
-static char title[128] = "";
-
-static void InitTitleString(void)
-{
-    switch (gameversion)
-    {
-    case exe_strife_1_2:
-        DEH_snprintf(title, sizeof(title), "                      "
-                                           "STRIFE:  Quest for the Sigil v1.2"
-                                           "                                  "
-                                           );
-        break;
-    case exe_strife_1_31:
-    default:
-        DEH_snprintf(title, sizeof(title), "                      "
-                                           "STRIFE:  Quest for the Sigil v1.31"
-                                           "                                 "
-                                           );
-        break;
-    }
-}
-
-static boolean D_AddFile(char *filename)
-{
-    wad_file_t *handle;
-
-    printf(" adding %s\n", filename);
-    handle = W_AddFile(filename);
-
-    return handle != NULL;
-}
-
-// Copyright message banners
-// Some dehacked mods replace these.  These are only displayed if they are 
-// replaced by dehacked.
-// haleyjd 08/22/2010: [STRIFE] altered to match strings from binary
-static const char *copyright_banners[] =
-{
-    "===========================================================================\n"
-    "ATTENTION:  This version of STRIFE has extra files added to it.\n"
-    "        You will not receive technical support for modified games.\n"
-    "===========================================================================\n",
-
-    "===========================================================================\n"
-    "             This version is NOT SHAREWARE, do not distribute!\n"
-    "         Please report software piracy to the SPA: 1-800-388-PIR8\n"
-    "===========================================================================\n",
-
-    "===========================================================================\n"
-    "                                Shareware!\n"
-    "===========================================================================\n"
-};
-
-// Prints a message only if it has been modified by dehacked.
-
-void PrintDehackedBanners(void)
-{
-    size_t i;
-
-    for (i=0; i<arrlen(copyright_banners); ++i)
-    {
-        const char *deh_s;
-
-        deh_s = DEH_String(copyright_banners[i]);
-
-        if (deh_s != copyright_banners[i])
-        {
-            printf("%s", deh_s);
-
-            // Make sure the modified banner always ends in a newline character.
-            // If it doesn't, add a newline.  This fixes av.wad.
-
-            if (deh_s[strlen(deh_s) - 1] != '\n')
-            {
-                printf("\n");
-            }
-        }
-    }
-}
-
-static const struct
-{
-    const char *description;
-    const char *cmdline;
-    GameVersion_t version;
-} gameversions[] = {
-    { "Strife 1.2",          "1.2",       exe_strife_1_2  },
-    { "Strife 1.31",         "1.31",      exe_strife_1_31 },
-    { NULL,                  NULL,        0               }
-};
-
-// Initialize the game version
-
-static void InitGameVersion(void)
-{
-    int p;
-
-    // haleyjd: we support emulating either the 1.2 or the 1.31 versions of
-    // Strife, which are the most significant. 1.2 is the most mature version
-    // that still has the single saveslot restriction, whereas 1.31 is the
-    // final revision. The differences between the two are barely worth
-    // mentioning aside from that main one.
-
-    //!
-    // @arg <version>
-    // @category compat
-    //
-    // Emulate a specific version of Strife. Valid values are "1.2" and "1.31".
-    //
-
-    p = M_CheckParmWithArgs("-gameversion", 1);
-
-    if (p)
-    {
-        int i;
-        for (i=0; gameversions[i].description != NULL; ++i)
-        {
-            if (!strcmp(myargv[p+1], gameversions[i].cmdline))
-            {
-                gameversion = gameversions[i].version;
-                break;
-            }
-        }
-
-        if (gameversions[i].description == NULL)
-        {
-            printf("Supported game versions:\n");
-
-            for (i=0; gameversions[i].description != NULL; ++i)
-            {
-                printf("\t%s (%s)\n", gameversions[i].cmdline,
-                        gameversions[i].description);
-            }
-
-            I_Error("Unknown game version '%s'", myargv[p+1]);
-        }
-    }
-    else
-    {
-        gameversion = exe_strife_1_31;
-    }
-}
-
-void PrintGameVersion(void)
-{
-    int i;
-
-    for (i=0; gameversions[i].description != NULL; ++i)
-    {
-        if (gameversions[i].version == gameversion)
-        {
-            printf("Emulating the behavior of the "
-                   "'%s' executable.\n", gameversions[i].description);
-            break;
-        }
-    }
-}
-
-// Function called at exit to display the ENDOOM screen
-
-static void D_Endoom(void)
-{
-    byte *endoom;
-
-    // Don't show ENDOOM if we have it disabled, or we're running
-    // in screensaver or control test mode. Only show it once the
-    // game has actually started.
-
-
-    if (!show_endoom || !main_loop_started || screensaver_mode || testcontrols)
-    {
-        return;
-    }
-
-    // haleyjd 08/27/10: [STRIFE] ENDOOM -> ENDSTRF
-    endoom = W_CacheLumpName(DEH_String("ENDSTRF"), PU_STATIC);
-
-    I_Endoom(endoom);
-}
-
-//
-// D_GetCursorColumn
-//
-static int D_GetCursorColumn(void)
-{
-    int x, y;
-    TXT_GetXY(&x, &y);
-    return x;
-}
-
-//
-// D_GetCursorRow
-//
-static int D_GetCursorRow(void)
-{
-    int x, y;
-    TXT_GetXY(&x, &y);
-    return y;
-}
-
-//
-// D_SetCursorPosition
-//
-static void D_SetCursorPosition(int column, int row)
-{
-    TXT_GotoXY(column, row);
-}
-
-//
-// D_SetChar
-//
-static void D_SetChar(char c)
-{
-    int x, y;
-    // Backup position
-    TXT_GetXY(&x, &y);
-    TXT_PutChar(c);
-    // Restore position
-    TXT_GotoXY(x, y);
-}
-
-//
-// D_DrawText
-//
-static void D_DrawText(const char *string, int bc, int fc)
-{
-    int column;
-    int row;
-    int i;
-
-    if (!using_text_startup)
-    {
-        return;
-    }
-
-    // Set text color
-    TXT_BGColor(bc, 0);
-    TXT_FGColor(fc);
-
-    // Get column position
-    column = D_GetCursorColumn();
-
-    // Get row position
-    row = D_GetCursorRow();
-
-    for (i = 0; i < strlen(string); i++)
-    {
-        // Set character
-        D_SetChar(string[i]);
-
-        // Check cursor position
-        if (++column >= 80)
-            column = 0;
-
-        // Set postition
-        D_SetCursorPosition(column, row);
-    }
-}
-
-//=============================================================================
-//
-// haleyjd: Chocolate Strife Specifics
-//
-// None of the code in here is from the original executable, but is needed for
-// other reasons.
-
-//
-// D_PatchClipCallback
-//
-// haleyjd 08/28/10: Clip patches to the framebuffer without errors.
-// Returns false if V_DrawPatch should return without drawing.
-//
-boolean D_PatchClipCallback(patch_t *patch, int x, int y)
-{
-    // note that offsets were already accounted for in V_DrawPatch
-    return (x >= 0 && y >= 0 
-            && x + SHORT(patch->width) <= SCREENWIDTH 
-            && y + SHORT(patch->height) <= SCREENHEIGHT);
-}
-
-//
-// D_InitChocoStrife
-//
-// haleyjd 08/28/10: Take care of some Strife-specific initialization
-// that is necessitated by Chocolate Doom issues, such as setting global 
-// callbacks.
-//
-static void D_InitChocoStrife(void)
-{
-    // set the V_DrawPatch clipping callback
-    V_SetPatchClipCallback(D_PatchClipCallback);
-}
-
-
-//
-// STRIFE Graphical Intro Sequence
-//
-
-#define MAXINTROPROGRESS 69
-
-static int introprogress;        // track the progress of the intro
-
-static byte *rawgfx_startup0;    // raw linear gfx for intro
-static byte *rawgfx_startp[4];
-static byte *rawgfx_startlz[2];
-static byte *rawgfx_startbot;
-
-//
-// D_IntroBackground
-//
-// [STRIFE] New function
-// haleyjd 20110206: Strife only drew this once, but for supporting double-
-// buffered or page-flipped surfaces it is best to redraw the entire screen
-// every frame.
-//
-static void D_IntroBackground(void)
-{
-    if(!showintro)
-        return;
-
-    // Fill the background entirely (wasn't needed in vanilla)
-    V_DrawFilledBox(0, 0, SCREENWIDTH, SCREENHEIGHT, 0);
-
-    // Strife cleared the screen somewhere in the low-level code between the
-    // intro and the titlescreen, so this is to take care of that and get
-    // proper fade-in behavior on the titlescreen
-    if(introprogress >= MAXINTROPROGRESS)
-    {
-        I_FinishUpdate();
-        return;
-    }
-
-    // Draw a 95-pixel rect from STARTUP0 starting at y=57 to (0,41) on the
-    // screen (this was a memcpy directly to 0xA3340 in low DOS memory)
-    V_DrawBlock(0, 41, 320, 95, rawgfx_startup0 + (320*57));
-}
-
-//
-// D_InitIntroSequence
-//
-// [STRIFE] New function
-// haleyjd 20110206: Initialize the graphical introduction sequence
-//
-
-static void D_InitIntroSequence(void)
-{
-    byte *textScreen;
-    char string[80];
-
-    if (devparm || !graphical_startup || testcontrols)
-    {
-        using_text_startup = false;
-        showintro = false;
-        return;
-    }
-
-    if(showintro)
-    {
-        // In vanilla Strife, Mode 13h was initialized directly in D_DoomMain.
-        // We have to be a little more courteous of the low-level code here.
-        I_SetGrabMouseCallback(D_StartupGrabCallback);
-        I_RegisterWindowIcon(strife_icon_data, strife_icon_h, strife_icon_w);
-        I_InitGraphics();
-        V_RestoreBuffer(); // make the V_ routines work
-
-        // Load all graphics
-        rawgfx_startup0   = W_CacheLumpName("STARTUP0", PU_STATIC);
-        rawgfx_startp[0]  = W_CacheLumpName("STRTPA1",  PU_STATIC);
-        rawgfx_startp[1]  = W_CacheLumpName("STRTPB1",  PU_STATIC);
-        rawgfx_startp[2]  = W_CacheLumpName("STRTPC1",  PU_STATIC);
-        rawgfx_startp[3]  = W_CacheLumpName("STRTPD1",  PU_STATIC);
-        rawgfx_startlz[0] = W_CacheLumpName("STRTLZ1",  PU_STATIC);
-        rawgfx_startlz[1] = W_CacheLumpName("STRTLZ2",  PU_STATIC);
-        rawgfx_startbot   = W_CacheLumpName("STRTBOT",  PU_STATIC);
-
-        // Draw the background
-        D_IntroBackground();
-
-        using_text_startup = false;
-    }
-    else
-    {
-        if (!TXT_Init())
-        {
-            using_text_startup = false;
-            return;
-        }
-
-        I_InitWindowTitle();
-        I_InitWindowIcon();
-
-        // Clear screen
-        textScreen = TXT_GetScreenData();
-        memset(textScreen, 0, 4000);
-
-        using_text_startup = true;
-
-        // Print title
-
-        D_SetCursorPosition(0, 0);
-        D_DrawText(title, TXT_COLOR_GREEN, TXT_COLOR_BLACK);
-
-        DEH_snprintf(string, sizeof(string), "Rogue Entertainment");
-        D_SetCursorPosition(40 - strlen(string) / 2, 5);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        DEH_snprintf(string, sizeof(string), "and");
-        D_SetCursorPosition(40 - strlen(string) / 2, 7);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        DEH_snprintf(string, sizeof(string), "Velocity Games");
-        D_SetCursorPosition(40 - strlen(string) / 2, 9);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        DEH_snprintf(string, sizeof(string), "present");
-        D_SetCursorPosition(40 - strlen(string) / 2, 11);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        DEH_snprintf(string, sizeof(string), "S T R I F E");
-        D_SetCursorPosition(40 - strlen(string) / 2, 14);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        DEH_snprintf(string, sizeof(string), "Loading...");
-        D_SetCursorPosition(40 - strlen(string) / 2, 17);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        DEH_snprintf(string, sizeof(string),
-                    "[                                                  ]");
-        D_SetCursorPosition(14, 18);
-        D_DrawText(string, TXT_COLOR_BLUE, TXT_COLOR_GREEN);
-
-        TXT_UpdateScreen();
-    }
-}
-
-//
-// D_DrawIntroSequence
-//
-// [STRIFE] New function
-// haleyjd 20110206: Refresh the intro sequence
-//
-static void D_DrawIntroSequence(void)
-{
-    int laserpos;
-    int robotpos;
-    int i;
-
-    if (showintro)
-    {
-        D_IntroBackground(); // haleyjd: refresh the background
-
-        // Laser position
-        laserpos = (200 * introprogress / MAXINTROPROGRESS) + 60;
-
-        // BUG: (?) Due to this clip, the laser never even comes close to
-        // touching the peasant; confirmed with vanilla. This MAY have been
-        // intentional, for effect, however, since no death frames are shown 
-        // either... kind of a black-out death.
-        if (laserpos > 200)
-            laserpos = 200;
-
-        // Draw the laser
-        // Blitted 16 bytes for 16 rows starting at 705280 + laserpos
-        // (705280 - 0xA0000) / 320 == 156
-        V_DrawBlock(laserpos, 156, 16, 16, rawgfx_startlz[laserpos % 2]);
-
-        // Robot position
-        robotpos = laserpos % 5 - 2;
-
-        // Draw the robot
-        // Blitted 48 bytes for 48 rows starting at 699534 + (320*robotpos)
-        // 699534 - 0xA0000 == 44174, which % 320 == 14, / 320 == 138
-        V_DrawBlock(14, 138 + robotpos, 48, 48, rawgfx_startbot);
-
-        // Draw the peasant
-        // Blitted 32 bytes for 64 rows starting at 699142
-        // 699142 - 0xA0000 == 43782, which % 320 == 262, / 320 == 136
-        V_DrawBlock(262, 136, 32, 64, rawgfx_startp[laserpos % 4]);
-
-        I_FinishUpdate();
-    }
-    else if (using_text_startup)
-    {
-        // Laser position
-        laserpos = 50 * introprogress / MAXINTROPROGRESS;
-
-        if (laserpos > 50)
-        {
-            laserpos = 50;
-        }
-
-        for (i = 0; i < laserpos; i++)
-        {
-            D_SetCursorPosition(15 + i, 18);
-            D_DrawText("#", TXT_COLOR_GREEN, TXT_COLOR_BLUE);
-        }
-
-        I_Sleep(10);
-
-        TXT_UpdateScreen();
-    }
-}
-
-//
-// D_IntroTick
-//
-// Advance the intro sequence
-//
-void D_IntroTick(void)
-{
-    static boolean didsound = false; // haleyjd 20120209
-    
-    if(devparm)
-        return;
-
-    ++introprogress;
-    if(introprogress >= MAXINTROPROGRESS)
-    {
-        D_IntroBackground(); // haleyjd: clear the bg anyway
-        
-        // haleyjd 20120209: This isn't 100% true to vanilla because vanilla
-        // would play this sound a half-dozen times. BUT, in vanilla, for 
-        // whatever reason, under DMX, playing the same sound multiple times
-        // doesn't add up violently like it does under SDL_mixer. This means
-        // that without this one-time limitation, the sound is far too loud.
-        if(!didsound)
-        {
-            S_StartSound(NULL, sfx_psdtha);
-            didsound = true;
-        }
-    }
-    else
-        D_DrawIntroSequence();
-}
-
-//
-// End Chocolate Strife Specifics
-//
-//=============================================================================
-
-static void G_CheckDemoStatusAtExit (void)
-{
-    G_CheckDemoStatus();
-}
-
-//
-// D_DoomMain
-//
-void D_DoomMain (void)
-{
-    int             p;
-    char            file[256];
-    char            demolumpname[9];
-
-    I_AtExit(D_Endoom, false);
-
-    // haleyjd 20110206 [STRIFE]: -nograph parameter
-
-    //!
-    // @vanilla
-    //
-    // Disable graphical introduction sequence
-    //
-
-    if (M_ParmExists("-nograph"))
-        showintro = false;
-
-    // Undocumented:
-    // Invoked by setup to test the controls.
-
-    if (M_ParmExists("-testcontrols"))
-    {
-        testcontrols = true;
-        showintro = false;
-    }
-
-    // haleyjd 20110206: Moved up -devparm for max visibility
-
-    //!
-    // @vanilla
-    //
-    // Developer mode. Implies -nograph.
-    //
-
-    devparm = M_CheckParm ("-devparm");
-
-    // print banner
-
-    I_PrintBanner(PACKAGE_STRING);
-
-    //DEH_printf("Z_Init: Init zone memory allocation daemon. \n"); [STRIFE] removed
-    Z_Init ();
-
-    //!
-    // @category net
-    //
-    // Start a dedicated server, routing packets but not participating
-    // in the game itself.
-    //
-
-    if (M_CheckParm("-dedicated") > 0)
-    {
-        printf("Dedicated server mode.\n");
-        NET_DedicatedServer();
-
-        // Never returns
-    }
-
-    //!
-    // @category net
-    //
-    // Query the Internet master server for a global list of active
-    // servers.
-    //
-
-    if (M_CheckParm("-search"))
-    {
-        NET_MasterQuery();
-        exit(0);
-    }
-
-    //!
-    // @arg <address>
-    // @category net
-    //
-    // Query the status of the server running on the given IP
-    // address.
-    //
-
-    p = M_CheckParmWithArgs("-query", 1);
-
-    if (p)
-    {
-        NET_QueryAddress(myargv[p+1]);
-        exit(0);
-    }
-
-    //!
-    // @category net
-    //
-    // Search the local LAN for running servers.
-    //
-
-    if (M_CheckParm("-localsearch"))
-    {
-        NET_LANQuery();
-        exit(0);
-    }
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Disable monsters.
-    //
-
-    nomonsters = M_CheckParm ("-nomonsters");
-
-    //!
-    // @category obscure
-    // @vanilla
-    //
-    // Set Rogue playtesting mode
-    // (god mode; no cliping mode toggled by backspace).
-    //
-
-    workparm = M_CheckParm ("-work");
-
-    //!
-    // @category obscure
-    // @vanilla
-    //
-    // Flip player gun sprites (broken).
-    //
-
-    flipparm = M_CheckParm ("-flip");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Respawn monsters after they are killed.
-    //
-
-    respawnparm = M_CheckParm ("-respawn");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Items respawn at random locations
-    //
-
-    randomparm = M_CheckParm ("-random");
-
-    //!
-    // @category game
-    // @vanilla
-    //
-    // Monsters move faster.
-    //
-
-    fastparm = M_CheckParm ("-fast");
-
-    I_DisplayFPSDots(devparm);
-
-    // haleyjd 20110206 [STRIFE]: -devparm implies -nograph
-    if(devparm)
-        showintro = false;
-
-    // Note: Vanilla Strife does not understand the -deathmatch command
-    // line parameter. deathmatch=1 is the default behavior when
-    // playing a netgame.
-
-    //!
-    // @category net
-    // @vanilla
-    //
-    // Start a deathmatch game.  Weapons do not stay in place and
-    // all items respawn after 30 seconds.
-    //
-
-    if (M_CheckParm ("-altdeath"))
-        deathmatch = 2;
-
-    if (devparm)
-        DEH_printf(D_DEVSTR);
-    
-    // find which dir to use for config files
-
-#ifdef _WIN32
-
-    //!
-    // @category obscure
-    // @platform windows
-    // @vanilla
-    //
-    // Save configuration data and savegames in c:\strife.cd,
-    // allowing play from CD.
-    //
-
-    if (M_CheckParm("-cdrom") > 0)
-    {
-        printf(D_CDROM);
-
-        // haleyjd 08/22/2010: [STRIFE] Use strife.cd folder for -cdrom
-        M_SetConfigDir("c:\\strife.cd\\");
-    }
-    else
-#endif
-    {
-        // Auto-detect the configuration dir.
-
-        M_SetConfigDir(NULL);
-    }
-    
-    //!
-    // @category game
-    // @arg <x>
-    // @vanilla
-    //
-    // Turbo mode.  The player's speed is multiplied by x%.  If unspecified,
-    // x defaults to 200.  Values are rounded up to 10 and down to 400.
-    //
-
-    if ( (p=M_CheckParm ("-turbo")) )
-    {
-        int     scale = 200;
-
-        if (p<myargc-1)
-            scale = atoi (myargv[p+1]);
-        if (scale < 10)
-            scale = 10;
-        if (scale > 400)
-            scale = 400;
-        DEH_printf("turbo scale: %i%%\n", scale);
-        forwardmove[0] = forwardmove[0]*scale/100;
-        forwardmove[1] = forwardmove[1]*scale/100;
-        sidemove[0] = sidemove[0]*scale/100;
-        sidemove[1] = sidemove[1]*scale/100;
-    }
-    
-    // init subsystems
-    // DEH_printf("V_Init: allocate screens.\n"); [STRIFE] removed
-    V_Init ();
-
-    // Load configuration files before initialising other subsystems.
-    // haleyjd 08/22/2010: [STRIFE] - use strife.cfg
-    // DEH_printf("M_LoadDefaults: Load system defaults.\n"); [STRIFE] removed
-    M_SetConfigFilenames("strife.cfg", PROGRAM_PREFIX "strife.cfg");
-    D_BindVariables();
-    M_LoadDefaults();
-
-    // Save configuration at exit.
-    I_AtExit(M_SaveDefaults, false);
-
-    // Find the main IWAD file and load it.
-    iwadfile = D_FindIWAD(IWAD_MASK_STRIFE, &gamemission);
-
-    // None found?
-    if (iwadfile == NULL)
-    {
-        I_Error("Game mode indeterminate.  No IWAD file was found.  Try\n"
-                "specifying one with the '-iwad' command line parameter.\n");
-    }
-
-    modifiedgame = false;
-
-    if(devparm) // [STRIFE] Devparm only
-        DEH_printf("W_Init: Init WADfiles.\n");
-    D_AddFile(iwadfile);
-    W_CheckCorrectIWAD(strife);
-    D_IdentifyVersion();
-
-    //!
-    // @category mod
-    //
-    // Disable auto-loading of .wad files.
-    //
-    if (!M_ParmExists("-noautoload"))
-    {
-        char *autoload_dir;
-        autoload_dir = M_GetAutoloadDir("strife1.wad");
-        if (autoload_dir != NULL)
-        {
-            DEH_AutoLoadPatches(autoload_dir);
-            W_AutoLoadWADs(autoload_dir);
-            free(autoload_dir);
-        }
-    }
-
-    // Load dehacked patches specified on the command line.
-    DEH_ParseCommandLine();
-
-    // Load PWAD files.
-    modifiedgame = W_ParseCommandLine();
-
-    // [STRIFE] serial number output
-    if(devparm)
-    {
-        char msgbuf[80];
-        char *serial  = W_CacheLumpName("SERIAL", PU_CACHE);
-        int serialnum = atoi(serial);
-
-        DEH_snprintf(msgbuf, sizeof(msgbuf), "Wad Serial Number: %d:", serialnum);
-        printf("%s\n", msgbuf);
-    }
-
-    // add any files specified on the command line with -file wadfile
-    // to the wad list
-    //
-
-    // Debug:
-//    W_PrintDirectory();
-
-    //!
-    // @arg <demo>
-    // @category demo
-    // @vanilla
-    //
-    // Play back the demo named demo.lmp.
-    //
-
-    p = M_CheckParmWithArgs ("-playdemo", 1);
-
-    if (!p)
-    {
-        //!
-        // @arg <demo>
-        // @category demo
-        // @vanilla
-        //
-        // Play back the demo named demo.lmp, determining the framerate
-        // of the screen.
-        //
-	p = M_CheckParmWithArgs("-timedemo", 1);
-
-    }
-
-    if (p)
-    {
-        char *uc_filename = strdup(myargv[p + 1]);
-        M_ForceUppercase(uc_filename);
-
-        // With Vanilla you have to specify the file without extension,
-        // but make that optional.
-        if (M_StringEndsWith(uc_filename, ".LMP"))
-        {
-            M_StringCopy(file, myargv[p + 1], sizeof(file));
-        }
-        else
-        {
-            DEH_snprintf(file, sizeof(file), "%s.lmp", myargv[p+1]);
-        }
-
-        free(uc_filename);
-
-        if (D_AddFile (file))
-        {
-            M_StringCopy(demolumpname, lumpinfo[numlumps - 1]->name,
-                         sizeof(demolumpname));
-        }
-        else
-        {
-            // If file failed to load, still continue trying to play
-            // the demo in the same way as Vanilla Doom.  This makes
-            // tricks like "-playdemo demo1" possible.
-
-            M_StringCopy(demolumpname, myargv[p + 1], sizeof(demolumpname));
-        }
-
-        printf("Playing demo %s.\n", file);
-    }
-
-    I_AtExit(G_CheckDemoStatusAtExit, true);
-
-    // Generate the WAD hash table.  Speed things up a bit.
-
-    W_GenerateHashTable();
-
-    InitGameVersion();
-    InitTitleString();
-    D_SetGameDescription();
-    I_SetWindowTitle(gamedescription);
-    savegamedir = M_GetSaveGameDir("strife1.wad");
-
-    // fraggle 20130405: I_InitTimer is needed here for the netgame
-    // startup. Start low-level sound init here too.
-    I_InitTimer();
-    I_InitSound(strife);
-    I_InitMusic();
-
-    if(devparm) // [STRIFE]
-        printf ("NET_Init: Init network subsystem.\n");
-    NET_Init();
-    D_ConnectNetGame();
-
-    // haleyjd 20110210: Create Strife hub save folders
-    M_CreateSaveDirs(savegamedir);
-
-    I_GraphicsCheckCommandLine();
-
-    // haleyjd 20110206 [STRIFE] Startup the introduction sequence
-    D_InitIntroSequence();
-
-    // haleyjd 20110924: moved S_Init up to here
-    if(devparm) // [STRIFE]
-        DEH_printf("S_Init: Setting up sound.\n");
-    S_Init (sfxVolume * 8, musicVolume * 8, voiceVolume * 8); // [STRIFE]: voice
-    D_IntroTick(); // [STRIFE]
-
-    // Check for -file in shareware
-    if (modifiedgame)
-    {
-        // These are the lumps that will be checked in IWAD,
-        // if any one is not present, execution will be aborted.
-        // haleyjd 08/22/2010: [STRIFE] Check for Strife lumps.
-        char name[3][8]=
-        {
-            "map23", "map30", "ROB3E1"
-        };
-        int i;
-
-        // haleyjd 08/22/2010: [STRIFE] Changed string to match binary
-        // STRIFE-FIXME: Needs to test isdemoversion variable
-        if ( gamemode == shareware)
-            I_Error(DEH_String("\nYou cannot -file with the demo "
-                               "version. You must buy the real game!"));
-
-        // Check for fake IWAD with right name,
-        // but w/o all the lumps of the registered version. 
-        // STRIFE-FIXME: Needs to test isregistered variable
-        if (gamemode == registered)
-            for (i = 0; i < 3; i++)
-                if (W_CheckNumForName(name[i])<0)
-                    I_Error(DEH_String("\nThis is not the registered version."));
-    }
-    
-    D_IntroTick(); // [STRIFE]
-    
-    // get skill / episode / map from parms
-    startskill = sk_easy; // [STRIFE]: inits to sk_easy
-    startepisode = 1;
-    startmap = 1;
-    autostart = false;
-
-    //!
-    // @category game
-    // @arg <skill>
-    // @vanilla
-    //
-    // Set the game skill, 1-5 (1: easiest, 5: hardest).  A skill of
-    // 0 disables all monsters.
-    //
-
-    p = M_CheckParmWithArgs("-skill", 1);
-
-    if (p)
-    {
-        startskill = myargv[p+1][0]-'1';
-        autostart = true;
-    }
-
-    // [STRIFE] no such thing in Strife
-    //
-    // // @category game
-    // // @arg <n>
-    // // @vanilla
-    // //
-    // // Start playing episode n (1-4).
-    // //
-
-    // p = M_CheckParmWithArgs("-episode", 1);
-
-    // if (p)
-    // {
-    //     startepisode = myargv[p+1][0]-'0';
-    //     startmap = 1;
-    //     autostart = true;
-    // }
-
-    timelimit = 0;
-
-    //! 
-    // @arg <n>
-    // @category net
-    // @vanilla
-    //
-    // For multiplayer games: exit each level after n minutes.
-    //
-
-    p = M_CheckParmWithArgs("-timer", 1);
-
-    if (p)
-    {
-        timelimit = atoi(myargv[p+1]);
-        printf("timer: %i\n", timelimit);
-    }
-
-    //!
-    // @category net
-    // @vanilla
-    //
-    // Austin Virtual Gaming: end levels after 20 minutes.
-    //
-
-    p = M_CheckParm ("-avg");
-
-    if (p)
-    {
-        timelimit = 20;
-    }
-
-    //!
-    // @category game
-    // @arg x
-    // @vanilla
-    //
-    // Start a game immediately, warping to level x.
-    //
-
-    p = M_CheckParmWithArgs("-warp", 1);
-
-    if (p)
-    {
-        if (gamemode == commercial)
-            startmap = atoi (myargv[p+1]);
-        else
-        {
-            startepisode = myargv[p+1][0]-'0';
-
-            if (p + 2 < myargc)
-            {
-                startmap = myargv[p+2][0]-'0';
-            }
-            else
-            {
-                startmap = 1;
-            }
-        }
-        autostart = true;
-    }
-
-    if (testcontrols)
-    {
-        startepisode = 1;
-        startmap = 3;
-        autostart = true;
-    }
-
-    // Check for load game parameter
-    // We do this here and save the slot number, so that the network code
-    // can override it or send the load slot to other players.
-
-    //!
-    // @category game
-    // @arg <s>
-    // @vanilla
-    //
-    // Load the game in slot s.
-    //
-
-    p = M_CheckParmWithArgs("-loadgame", 1);
-    
-    if (p)
-    {
-        startloadgame = atoi(myargv[p+1]);
-    }
-    else
-    {
-        // Not loading a game
-        startloadgame = -1;
-    }
-
-    if (W_CheckNumForName("SS_START") >= 0
-     || W_CheckNumForName("FF_END") >= 0)
-    {
-        I_PrintDivider();
-        printf(" WARNING: The loaded WAD file contains modified sprites or\n"
-               " floor textures.  You may want to use the '-merge' command\n"
-               " line option instead of '-file'.\n");
-    }
-
-    I_PrintStartupBanner(gamedescription);
-    PrintDehackedBanners();
-
-    // haleyjd 08/28/10: Init Choco Strife stuff.
-    D_InitChocoStrife();
-
-    // haleyjd 08/22/2010: [STRIFE] Modified string to match binary
-    if(devparm) // [STRIFE]
-       DEH_printf("R_Init: Loading Graphics - ");
-    R_Init ();
-    D_IntroTick(); // [STRIFE]
-
-    if(devparm) // [STRIFE]
-        DEH_printf("\nP_Init: Init Playloop state.\n");
-    P_Init ();
-    D_IntroTick(); // [STRIFE]
-
-    if(devparm) // [STRIFE]
-        DEH_printf("I_Init: Setting up machine state.\n");
-    I_CheckIsScreensaver();
-    I_InitJoystick();
-    D_IntroTick(); // [STRIFE]
-
-    D_IntroTick(); // [STRIFE]
-
-    if(devparm) // [STRIFE]
-        DEH_printf("M_Init: Init Menu.\n");
-    M_Init ();
-    D_IntroTick(); // [STRIFE]
-
-    // haleyjd 20110924: Moved S_Init up.
-    D_IntroTick();
-
-    // haleyjd 20110220: This stuff was done in I_StartupSound in vanilla, but 
-    // we'll do it here instead so we don't have to modify the low-level shared
-    // code with Strife-specific stuff.
-
-    //!
-    // @vanilla
-    //
-    // Disable voice dialog and show dialog as text instead,
-    // even if voices.wad can be found.
-    //
-
-    if(disable_voices || M_CheckParm("-novoice"))
-    {
-        dialogshowtext = disable_voices = 1;
-    }
-
-    if(devparm)
-        DEH_printf("  Play voices = %d\n", disable_voices == 0);
-
-    if(devparm) // [STRIFE]
-        DEH_printf("D_CheckNetGame: Checking network game status.\n");
-    D_CheckNetGame ();
-
-    PrintGameVersion();
-
-    if(devparm)
-        DEH_printf("HU_Init: Setting up heads up display.\n");
-    HU_Init ();
-    D_IntroTick(); // [STRIFE]
-
-    if(devparm)
-        DEH_printf("ST_Init: Init status bar.\n");
-    ST_Init ();
-    D_IntroTick(); // [STRIFE]
-
-    // haleyjd [STRIFE] -statcopy used to be here...
-    D_IntroTick(); // [STRIFE]
-
-    // If Doom II without a MAP01 lump, this is a store demo.  
-    // Moved this here so that MAP01 isn't constantly looked up
-    // in the main loop.
-    // haleyjd 08/23/2010: [STRIFE] There is no storedemo version of Strife
-    /*
-    if (gamemode == commercial && W_CheckNumForName("map01") < 0)
-        storedemo = true;
-    */
-
-    //!
-    // @arg <x>
-    // @category demo
-    // @vanilla
-    //
-    // Record a demo named x.lmp.
-    //
-
-    p = M_CheckParmWithArgs("-record", 1);
-
-    if (p)
-    {
-        G_RecordDemo (myargv[p+1]);
-        autostart = true;
-    }
-    D_IntroTick(); // [STRIFE]
-
-    p = M_CheckParmWithArgs("-playdemo", 1);
-    if (p)
-    {
-        singledemo = true;              // quit after one demo
-        G_DeferedPlayDemo (demolumpname);
-        D_DoomLoop ();  // never returns
-    }
-    D_IntroTick(); // [STRIFE]
-
-    p = M_CheckParmWithArgs("-timedemo", 1);
-    if (p)
-    {
-        G_TimeDemo (demolumpname);
-        D_DoomLoop ();  // never returns
-    }
-    D_IntroTick(); // [STRIFE]
-
-    if (startloadgame >= 0)
-    {
-        // [STRIFE]: different, for hubs
-        M_LoadSelect(startloadgame);
-    }
-    D_IntroTick(); // [STRIFE]
-
-
-    if (gameaction != ga_loadgame )
-    {
-        if (autostart || netgame)
-            G_InitNew (startskill, startmap);
-        else
-            D_StartTitle ();                // start up intro loop
-    }
-
-    if (using_text_startup)
-    {
-        TXT_Shutdown();
-    }
-
-    D_DoomLoop ();  // never returns
-}
diff --git a/games/NXDoom/src/strife/d_main.h b/games/NXDoom/src/strife/d_main.h
deleted file mode 100644
index 22f55488d..000000000
--- a/games/NXDoom/src/strife/d_main.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
-
-#ifndef __D_MAIN__
-#define __D_MAIN__
-
-#include "doomdef.h"
-
-#include "v_patch.h"
-
-
-// Read events from all input devices
-
-void D_ProcessEvents (void); 
-	
-
-//
-// BASE LEVEL
-//
-void D_PageTicker (void);
-void D_PageDrawer (void);
-void D_AdvanceDemo (void);
-void D_DoAdvanceDemo (void);
-void D_StartTitle (void);
-void D_QuitGame (void); // [STRIFE]
-
-void D_IntroTick(void); // [STRIFE]
-
-boolean D_PatchClipCallback(patch_t *patch, int x, int y); // [STRIFE]
-
-
-//
-// GLOBAL VARIABLES
-//
-
-extern  gameaction_t    gameaction;
-extern  boolean         isregistered;   // villsa [STRIFE]
-extern  boolean        isdemoversion;  // haleyjd [STRIFE]
-extern  boolean         stonecold;      // villsa [STRIFE]
-extern  boolean         workparm;       // villsa [STRIFE]
-extern boolean advancedemo;
-
-// haleyjd 20130915 [STRIFE]: need nickname
-extern char *nickname;
-
-
-#endif
-
diff --git a/games/NXDoom/src/strife/d_net.c b/games/NXDoom/src/strife/d_net.c
deleted file mode 100644
index 26d807830..000000000
--- a/games/NXDoom/src/strife/d_net.c
+++ /dev/null
@@ -1,290 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM Network game communication and protocol,
-//	all OS independend parts.
-//
-
-#include <stdlib.h>
-
-#include "d_main.h"
-#include "m_argv.h"
-#include "m_menu.h"
-#include "m_misc.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "g_game.h"
-#include "doomdef.h"
-#include "doomstat.h"
-#include "w_checksum.h"
-
-#include "deh_main.h"
-
-#include "d_loop.h"
-
-ticcmd_t *netcmds;
-
-// Called when a player leaves the game
-
-static void PlayerQuitGame(player_t *player)
-{
-    static char exitmsg[80];
-    unsigned int player_num;
-
-    player_num = player - players;
-
-    // Do this the same way as Vanilla Doom does, to allow dehacked
-    // replacements of this message
-
-    M_StringCopy(exitmsg, DEH_String("Player 1 left the game"),
-                 sizeof(exitmsg));
-
-    exitmsg[7] += player_num;
-
-    playeringame[player_num] = false;
-    players[consoleplayer].message = exitmsg;
-
-    // TODO: check if it is sensible to do this:
-
-    if (demorecording) 
-    {
-        G_CheckDemoStatus ();
-    }
-}
-
-static void RunTic(ticcmd_t *cmds, boolean *ingame)
-{
-    unsigned int i;
-
-    // Check for player quits.
-
-    for (i = 0; i < MAXPLAYERS; ++i)
-    {
-        if (!demoplayback && playeringame[i] && !ingame[i])
-        {
-            PlayerQuitGame(&players[i]);
-        }
-    }
-
-    netcmds = cmds;
-
-    // check that there are players in the game.  if not, we cannot
-    // run a tic.
-
-    if (advancedemo)
-        D_DoAdvanceDemo ();
-
-    M_Ticker();
-    G_Ticker();
-}
-
-static void NullMenuTicker()
-{
-    // no-op.
-}
-
-static loop_interface_t strife_loop_interface = {
-    D_ProcessEvents,
-    G_BuildTiccmd,
-    RunTic,
-    NullMenuTicker
-};
-
-
-// Load game settings from the specified structure and 
-// set global variables.
-
-static void LoadGameSettings(net_gamesettings_t *settings)
-{
-    unsigned int i;
-
-    deathmatch = settings->deathmatch;
-    ticdup = settings->ticdup;
-    startepisode = settings->episode;
-    startmap = settings->map;
-    startskill = settings->skill;
-    startloadgame = settings->loadgame;
-    lowres_turn = settings->lowres_turn;
-    nomonsters = settings->nomonsters;
-    fastparm = settings->fast_monsters;
-    respawnparm = settings->respawn_monsters;
-    timelimit = settings->timelimit;
-    consoleplayer = settings->consoleplayer;
-    randomparm = settings->random;
-
-    if (lowres_turn)
-    {
-        printf("NOTE: Turning resolution is reduced; this is probably "
-               "because there is a client recording a Vanilla demo.\n");
-    }
-
-    for (i = 0; i < MAXPLAYERS; ++i)
-    {
-        playeringame[i] = i < settings->num_players;
-    }
-}
-
-// Save the game settings from global variables to the specified
-// game settings structure.
-
-static void SaveGameSettings(net_gamesettings_t *settings)
-{
-    // Fill in game settings structure with appropriate parameters
-    // for the new game
-
-    settings->deathmatch = deathmatch;
-    settings->episode = startepisode;
-    settings->map = startmap;
-    settings->skill = startskill;
-    settings->loadgame = startloadgame;
-    settings->gameversion = gameversion;
-    settings->nomonsters = nomonsters;
-    settings->fast_monsters = fastparm;
-    settings->respawn_monsters = respawnparm;
-    settings->timelimit = timelimit;
-    settings->random = randomparm;
-
-    settings->lowres_turn = M_ParmExists("-record")
-                         && !M_ParmExists("-longtics");
-}
-
-static void InitConnectData(net_connect_data_t *connect_data)
-{
-    connect_data->drone = false;
-    connect_data->max_players = MAXPLAYERS;
-
-    //!
-    // @category net
-    //
-    // Run as the left screen in three screen mode.
-    //
-
-    if (M_CheckParm("-left") > 0)
-    {
-        viewangleoffset = ANG90;
-        connect_data->drone = true;
-    }
-
-    //! 
-    // @category net
-    //
-    // Run as the right screen in three screen mode.
-    //
-
-    if (M_CheckParm("-right") > 0)
-    {
-        viewangleoffset = ANG270;
-        connect_data->drone = true;
-    }
-
-    //
-    // Connect data
-    //
-
-    // Game type fields:
-
-    connect_data->gamemode = gamemode;
-    connect_data->gamemission = gamemission;
-
-    // Are we recording a demo? Possibly set lowres turn mode
-
-    connect_data->lowres_turn = M_CheckParm("-record") > 0
-                             && M_CheckParm("-longtics") == 0;
-
-    // Read checksums of our WAD directory and dehacked information
-
-    W_Checksum(connect_data->wad_sha1sum);
-    DEH_Checksum(connect_data->deh_sha1sum);
-
-    connect_data->is_freedoom = 0;
-}
-
-void D_ConnectNetGame(void)
-{
-    net_connect_data_t connect_data;
-
-    InitConnectData(&connect_data);
-    netgame = D_InitNetGame(&connect_data);
-
-    //!
-    // @category net
-    //
-    // Start the game playing as though in a netgame with a single
-    // player.  This can also be used to play back single player netgame
-    // demos.
-    //
-
-    if (M_CheckParm("-solo-net") > 0)
-    {
-        netgame = true;
-    }
-}
-
-//
-// D_CheckNetGame
-// Works out player numbers among the net participants
-//
-void D_CheckNetGame(void)
-{
-    net_gamesettings_t settings;
-
-    D_RegisterLoopCallbacks(&strife_loop_interface);
-
-    if (netgame)
-    {
-        autostart = true;
-    }
-
-    SaveGameSettings(&settings);
-    D_StartNetGame(&settings, NULL);
-    LoadGameSettings(&settings);
-
-    // Strife games are always deathmatch, though -altdeath is
-    // supported for respawning items.
-
-    if (netgame && deathmatch == 0)
-    {
-        deathmatch = 1;
-    }
-
-    DEH_printf("startmap: %i, skill: %i, enemies: %i, random: %i\n",
-               startmap, startskill, !nomonsters, randomparm);
-
-
-    DEH_printf("player %i of %i (%i nodes)\n",
-               consoleplayer+1, settings.num_players, settings.num_players);
-
-    // Show players here; the server might have specified a time limit
-
-    if (timelimit > 0 && deathmatch)
-    {
-        // Gross hack to work like Vanilla:
-
-        if (timelimit == 20 && M_CheckParm("-avg"))
-        {
-            DEH_printf("Austin Virtual Gaming: Levels will end "
-                           "after 20 minutes\n");
-        }
-        else
-        {
-            DEH_printf("Levels will end after %d minute", timelimit);
-            if (timelimit > 1)
-                printf("s");
-            printf(".\n");
-        }
-    }
-}
-
diff --git a/games/NXDoom/src/strife/d_player.h b/games/NXDoom/src/strife/d_player.h
deleted file mode 100644
index 1f5b4ec00..000000000
--- a/games/NXDoom/src/strife/d_player.h
+++ /dev/null
@@ -1,249 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//
-
-
-#ifndef __D_PLAYER__
-#define __D_PLAYER__
-
-
-// The player data structure depends on a number
-// of other structs: items (internal inventory),
-// animation states (closely tied to the sprites
-// used to represent them, unfortunately).
-#include "d_items.h"
-#include "p_pspr.h"
-
-// In addition, the player is just a special
-// case of the generic moving object/actor.
-#include "p_mobj.h"
-
-// Finally, for odd reasons, the player input
-// is buffered within the player data struct,
-// as commands per game tick.
-#include "d_ticcmd.h"
-
-#include "net_defs.h"
-
-
-
-
-//
-// Player states.
-//
-typedef enum
-{
-    // Playing or camping.
-    PST_LIVE,
-    // Dead on the ground, view follows killer.
-    PST_DEAD,
-    // Ready to restart/respawn???
-    PST_REBORN		
-
-} playerstate_t;
-
-
-//
-// Player internal flags, for cheats and debug.
-//
-typedef enum
-{
-    // No clipping, walk through barriers.
-    CF_NOCLIP		= 1,
-    // No damage, no health loss.
-    CF_GODMODE		= 2,
-    // Not really a cheat, just a debug aid.
-    CF_NOMOMENTUM	= 4,
-    // villsa [STRIFE] new cheat
-    // set when on fire and disable inventory
-    CF_ONFIRE           = 8,
-    // villsa [STRIFE] new cheat
-    // auto-use medkits
-    CF_AUTOHEALTH       = 16
-
-} cheat_t;
-
-// haleyjd 08/30/10: [STRIFE]
-// Player Inventory Item Structure
-typedef struct inventory_s
-{
-    int sprite; // a sprite number
-    int type;   // a thing type
-    int amount; // amount being carried
-} inventory_t;
-
-#define NUMINVENTORY 32
-
-//
-// Extended player object info: player_t
-//
-// haleyjd 08/30/10: [STRIFE]
-// * Transformed to match binary structure layout.
-//
-typedef struct player_s
-{
-    mobj_t*		mo;
-    playerstate_t	playerstate;
-    ticcmd_t		cmd;
-
-    // Determine POV,
-    //  including viewpoint bobbing during movement.
-    // Focal origin above r.z
-    fixed_t		viewz;
-    // Base height above floor for viewz.
-    fixed_t		viewheight;
-    // Bob/squat speed.
-    fixed_t         	deltaviewheight;
-    // bounded/scaled total momentum.
-    fixed_t         	bob;	
-
-    // This is only used between levels,
-    // mo->health is used during levels.
-    int			health;	
-    short		armorpoints; // [STRIFE] Changed to short
-    // Armor type is 0-2.
-    short		armortype;   // [STRIFE] Changed to short
-
-    // Power ups. invinc and invis are tic counters.
-    int			powers[NUMPOWERS];
-
-    // [STRIFE] Additions:
-    int			sigiltype;               // Type of Sigil carried
-    int			nukagecount;             // Nukage exposure counter
-    int			questflags;              // Quest bit flags
-    int			pitch;                   // Up/down look angle
-    boolean		centerview;              // True if view should be centered
-    inventory_t		inventory[NUMINVENTORY]; // Player inventory items
-    boolean		st_update;               // If true, update status bar
-    short		numinventory;            // Num. active inventory items
-    short		inventorycursor;         // Selected inventory item
-    short		accuracy;                // Accuracy stat
-    short		stamina;                 // Stamina stat
-    
-    boolean		cards[NUMCARDS];
-    boolean		backpack;
-
-    // True if button down last tic.
-    int			attackdown;
-    int			usedown;
-    int			inventorydown;   // [STRIFE] Use inventory item
-    
-    // Frags, kills of other players.
-    int			frags[MAXPLAYERS];
-    weapontype_t	readyweapon;
-    
-    // Is wp_nochange if not changing.
-    weapontype_t	pendingweapon;
-
-    boolean		weaponowned[NUMWEAPONS];
-    int			ammo[NUMAMMO];
-    int			maxammo[NUMAMMO];
-
-    // Bit flags, for cheats and debug.
-    // See cheat_t, above.
-    int			cheats;
-
-    // Refired shots are less accurate.
-    int			refire;
-
-     // For intermission stats.
-    short		killcount;    // [STRIFE] Changed to short
-    //int		itemcount;    // [STRIFE] Eliminated these.
-    //int		secretcount;
-
-    // Hint messages.
-    const char		*message;
-    
-    // For screen flashing (red or bright).
-    int			damagecount;
-    int			bonuscount;
-
-    // Who did damage (NULL for floors/ceilings).
-    mobj_t*		attacker;
-    
-    // So gun flashes light up areas.
-    int			extralight;
-
-    // Current PLAYPAL, ???
-    //  can be set to REDCOLORMAP for pain, etc.
-    int			fixedcolormap;
-
-    // Player skin colorshift,
-    //  0-3 for which color to draw player.
-    //int			colormap; [STRIFE] no such? or did it become the below?
-
-    // [STRIFE] For use of teleport beacons
-    short		allegiance;  
-
-    // Overlay view sprites (gun, etc).
-    pspdef_t		psprites[NUMPSPRITES];
-
-    // [STRIFE] Inefficient means of tracking automap state on all maps
-    boolean		mapstate[40];
-
-    // True if secret level has been done.
-    //boolean		didsecret;   [STRIFE] Removed this.
-
-} player_t;
-
-
-//
-// INTERMISSION
-// Structure passed e.g. to WI_Start(wb)
-//
-typedef struct
-{
-    boolean	in;	// whether the player is in game
-    
-    // Player stats, kills, collected items etc.
-    int		skills;
-    int		sitems;
-    int		ssecret;
-    int		stime; 
-    int		frags[4];
-    int		score;	// current score on entry, modified on return
-  
-} wbplayerstruct_t;
-
-typedef struct
-{
-    int		epsd;	// episode # (0-2)
-
-    // if true, splash the secret level
-    boolean	didsecret;
-    
-    // previous and next levels, origin 0
-    int		last;
-    int		next;	
-    
-    int		maxkills;
-    int		maxitems;
-    int		maxsecret;
-    int		maxfrags;
-
-    // the par time
-    int		partime;
-    
-    // index of this player in game
-    int		pnum;	
-
-    wbplayerstruct_t	plyr[MAXPLAYERS];
-
-} wbstartstruct_t;
-
-
-#endif
diff --git a/games/NXDoom/src/strife/d_textur.h b/games/NXDoom/src/strife/d_textur.h
deleted file mode 100644
index 1afe040eb..000000000
--- a/games/NXDoom/src/strife/d_textur.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Typedefs related to to textures etc.,
-//	 isolated here to make it easier separating modules.
-//    
-
-
-#ifndef __D_TEXTUR__
-#define __D_TEXTUR__
-
-#include "doomtype.h"
-
-
-
-
-//
-// Flats?
-//
-// a pic is an unmasked block of pixels
-typedef struct
-{
-    byte		width;
-    byte		height;
-    byte		data;
-} pic_t;
-
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/d_think.h b/games/NXDoom/src/strife/d_think.h
deleted file mode 100644
index 0966ad960..000000000
--- a/games/NXDoom/src/strife/d_think.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  MapObj data. Map Objects or mobjs are actors, entities,
-//  thinker, take-your-pick... anything that moves, acts, or
-//  suffers state changes of more or less violent nature.
-//
-
-
-#ifndef __D_THINK__
-#define __D_THINK__
-
-
-
-
-
-//
-// Experimental stuff.
-// To compile this as "ANSI C with classes"
-//  we will need to handle the various
-//  action functions cleanly.
-//
-typedef  void (*actionf_v)();
-typedef  void (*actionf_p1)( void* );
-typedef  void (*actionf_p2)( void*, void* );
-
-typedef union
-{
-  actionf_v	acv;
-  actionf_p1	acp1;
-  actionf_p2	acp2;
-
-} actionf_t;
-
-
-
-
-
-// Historically, "think_t" is yet another
-//  function pointer to a routine to handle
-//  an actor.
-typedef actionf_t  think_t;
-
-
-// Doubly linked list of actors.
-typedef struct thinker_s
-{
-    struct thinker_s*	prev;
-    struct thinker_s*	next;
-    think_t		function;
-    
-} thinker_t;
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/deh_ammo.c b/games/NXDoom/src/strife/deh_ammo.c
deleted file mode 100644
index dd8bee546..000000000
--- a/games/NXDoom/src/strife/deh_ammo.c
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Ammo" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomdef.h"
-#include "doomtype.h"
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-#include "p_local.h"
-
-static void *DEH_AmmoStart(deh_context_t *context, char *line)
-{
-    int ammo_number = 0;
-
-    if (sscanf(line, "Ammo %i", &ammo_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (ammo_number < 0 || ammo_number >= NUMAMMO)
-    {
-        DEH_Warning(context, "Invalid ammo number: %i", ammo_number);
-        return NULL;
-    }
-    
-    return &maxammo[ammo_number];
-}
-
-static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    int ivalue;
-    int ammo_number;
-
-    if (tag == NULL)
-        return;
-
-    ammo_number = ((int *) tag) - maxammo;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    // maxammo
-
-    if (!strcasecmp(variable_name, "Per ammo"))
-        clipammo[ammo_number] = ivalue;
-    else if (!strcasecmp(variable_name, "Max ammo"))
-        maxammo[ammo_number] = ivalue;
-    else
-    {
-        DEH_Warning(context, "Field named '%s' not found", variable_name);
-    }
-}
-
-static void DEH_AmmoSHA1Hash(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        SHA1_UpdateInt32(context, clipammo[i]);
-        SHA1_UpdateInt32(context, maxammo[i]);
-    }
-}
-
-deh_section_t deh_section_ammo =
-{
-    "Ammo",
-    NULL,
-    DEH_AmmoStart,
-    DEH_AmmoParseLine,
-    NULL,
-    DEH_AmmoSHA1Hash,
-};
-
diff --git a/games/NXDoom/src/strife/deh_cheat.c b/games/NXDoom/src/strife/deh_cheat.c
deleted file mode 100644
index 78e037f66..000000000
--- a/games/NXDoom/src/strife/deh_cheat.c
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Cheat" sections in dehacked files
-//
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-#include "am_map.h"
-#include "st_stuff.h"
-
-typedef struct 
-{
-    const char *name;
-    cheatseq_t *seq;
-} deh_cheat_t;
-
-static deh_cheat_t allcheats[] =
-{
-    // haleyjd 20110224: filled in all cheats
-    {"Change music",        &cheat_mus },
-    {"Level Warp",          &cheat_clev },
-    {"Stealth Boots",       &cheat_stealth },
-    {"Sigil piece",         &cheat_lego },
-    {"FPS",                 &cheat_mypos },
-    {"TeleportMapSpot",     &cheat_scoot },
-    {"Gold&StatTokens",     &cheat_midas },
-    {"God mode",            &cheat_god },
-    {"Keys",                &cheat_keys },
-    {"Weapons & Ammo",      &cheat_ammo },
-    {"Massacre",            &cheat_nuke },
-    {"No Clipping",         &cheat_noclip },
-    {"Berserk",             &cheat_powerup[0] },
-    {"Invisibility",        &cheat_powerup[1] },
-    {"Enviro Suit",         &cheat_powerup[2] },
-    {"Health",              &cheat_powerup[3] },
-    {"Backpack",            &cheat_powerup[4] },
-    // STRIFE-FIXME/TODO: Does SeHackEd not support PUMPUP{S,T,nil}, or "DOTS" ?
-};
-
-static deh_cheat_t *FindCheatByName(char *name)
-{
-    size_t i;
-    
-    for (i=0; i<arrlen(allcheats); ++i)
-    {
-        if (!strcasecmp(allcheats[i].name, name))
-            return &allcheats[i];
-    }
-
-    return NULL;
-}
-
-static void *DEH_CheatStart(deh_context_t *context, char *line)
-{
-    return NULL;
-}
-
-static void DEH_CheatParseLine(deh_context_t *context, char *line, void *tag)
-{
-    deh_cheat_t *cheat;
-    char *variable_name;
-    char *value;
-    unsigned char *unsvalue;
-    unsigned int i;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    unsvalue = (unsigned char *) value;
-
-    cheat = FindCheatByName(variable_name);
-
-    if (cheat == NULL)
-    {
-        DEH_Warning(context, "Unknown cheat '%s'", variable_name);
-        return;
-    }
-
-    // write the value into the cheat sequence
-
-    i = 0;
-
-    while (unsvalue[i] != 0 && unsvalue[i] != 0xff)
-    {
-        // If the cheat length exceeds the Vanilla limit, stop.  This
-        // does not apply if we have the limit turned off.
-
-        if (!deh_allow_long_cheats && i >= cheat->seq->sequence_len)
-        {
-            DEH_Warning(context, "Cheat sequence longer than supported by "
-                                 "Vanilla dehacked");
-            break;
-        }
-
-        if (deh_apply_cheats)
-        {
-            cheat->seq->sequence[i] = unsvalue[i];
-        }
-        ++i;
-
-        // Absolute limit - don't exceed
-
-        if (i >= MAX_CHEAT_LEN - cheat->seq->parameter_chars)
-        {
-            DEH_Error(context, "Cheat sequence too long!");
-            return;
-        }
-    }
-
-    if (deh_apply_cheats)
-    {
-        cheat->seq->sequence[i] = '\0';
-    }
-}
-
-deh_section_t deh_section_cheat =
-{
-    "Cheat",
-    NULL,
-    DEH_CheatStart,
-    DEH_CheatParseLine,
-    NULL,
-    NULL,
-};
-
diff --git a/games/NXDoom/src/strife/deh_frame.c b/games/NXDoom/src/strife/deh_frame.c
deleted file mode 100644
index c36f3e34c..000000000
--- a/games/NXDoom/src/strife/deh_frame.c
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Frame" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "doomtype.h"
-#include "d_items.h"
-#include "info.h"
-
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-
-DEH_BEGIN_MAPPING(state_mapping, state_t)
-  DEH_MAPPING("Sprite number",    sprite)
-  DEH_MAPPING("Sprite subnumber", frame)
-  DEH_MAPPING("Duration",         tics)
-  DEH_MAPPING("Next frame",       nextstate)
-  DEH_UNSUPPORTED_MAPPING("Action pointer")
-DEH_END_MAPPING
-
-static void *DEH_FrameStart(deh_context_t *context, char *line)
-{
-    int frame_number = 0;
-    state_t *state;
-    
-    if (sscanf(line, "Frame %i", &frame_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-    
-    if (frame_number < 0 || frame_number >= NUMSTATES)
-    {
-        DEH_Warning(context, "Invalid frame number: %i", frame_number);
-        return NULL;
-    }
-
-    if (frame_number >= DEH_VANILLA_NUMSTATES) 
-    {
-        DEH_Warning(context, "Attempt to modify frame %i: this will cause "
-                             "problems in Vanilla dehacked.", frame_number);
-    }
-
-    state = &states[frame_number];
-
-    return state;
-}
-
-// Simulate a frame overflow: Doom has 967 frames in the states[] array, but
-// DOS dehacked internally only allocates memory for 966.  As a result, 
-// attempts to set frame 966 (the last frame) will overflow the dehacked
-// array and overwrite the weaponinfo[] array instead.
-//
-// This is noticable in Batman Doom where it is impossible to switch weapons
-// away from the fist once selected.
-
-static void DEH_FrameOverflow(deh_context_t *context, char *varname, int value)
-{
-    if (!strcasecmp(varname, "Duration"))
-    {
-        weaponinfo[0].ammo = value;
-    }
-    else if (!strcasecmp(varname, "Codep frame")) 
-    {
-        weaponinfo[0].upstate = value;
-    }
-    else if (!strcasecmp(varname, "Next frame")) 
-    {
-        weaponinfo[0].downstate = value;
-    }
-    else if (!strcasecmp(varname, "Unknown 1"))
-    {
-        weaponinfo[0].readystate = value;
-    }
-    else if (!strcasecmp(varname, "Unknown 2"))
-    {
-        weaponinfo[0].atkstate = value;
-    }
-    else
-    {
-        DEH_Error(context, "Unable to simulate frame overflow: field '%s'",
-                  varname);
-    }
-}
-
-static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
-{
-    state_t *state;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    state = (state_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    if (state == &states[NUMSTATES - 1])
-    {
-        DEH_FrameOverflow(context, variable_name, ivalue);
-    }
-    else
-    {
-        // set the appropriate field
-
-        DEH_SetMapping(context, &state_mapping, state, variable_name, ivalue);
-    }
-}
-
-static void DEH_FrameSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
-    }
-}
-
-deh_section_t deh_section_frame =
-{
-    "Frame",
-    NULL,
-    DEH_FrameStart,
-    DEH_FrameParseLine,
-    NULL,
-    DEH_FrameSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/strife/deh_misc.c b/games/NXDoom/src/strife/deh_misc.c
deleted file mode 100644
index 7c78658b7..000000000
--- a/games/NXDoom/src/strife/deh_misc.c
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Misc" sections in dehacked files
-//
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-#include "deh_misc.h"
-
-// Dehacked: "Initial Health" 
-// This is the initial health a player has when starting anew.
-// See G_PlayerReborn in g_game.c
-
-int deh_initial_health = DEH_DEFAULT_INITIAL_HEALTH;
-
-// Dehacked: "Initial bullets"
-// This is the number of bullets the player has when starting anew.
-// See G_PlayerReborn in g_game.c
-
-int deh_initial_bullets = DEH_DEFAULT_INITIAL_BULLETS;
-
-// Dehacked: "Max Health"
-// This is the maximum health that can be reached using medikits 
-// alone.  See P_TouchSpecialThing in p_inter.c
-
-int deh_max_health = DEH_DEFAULT_MAX_HEALTH;
-
-// Dehacked: "Max Armor"
-// This is the maximum armor which can be reached by picking up
-// armor helmets. See P_TouchSpecialThing in p_inter.c
-
-int deh_max_armor = DEH_DEFAULT_MAX_ARMOR;
-
-// Dehacked: "Green Armor Class"
-// This is the armor class that is given when picking up the green 
-// armor or an armor helmet. See P_TouchSpecialThing in p_inter.c
-//
-// DOS dehacked only modifies the behavior of the green armor shirt,
-// the armor class set by armor helmets is not affected.
-
-int deh_green_armor_class = DEH_DEFAULT_GREEN_ARMOR_CLASS;
-
-// Dehacked: "Blue Armor Class"
-// This is the armor class that is given when picking up the blue 
-// armor or a megasphere. See P_TouchSpecialThing in p_inter.c
-//
-// DOS dehacked only modifies the MegaArmor behavior and not
-// the MegaSphere, which always gives armor type 2.
-
-int deh_blue_armor_class = DEH_DEFAULT_BLUE_ARMOR_CLASS;
-
-// Dehacked: "Max soulsphere"
-// The maximum health which can be reached by picking up the
-// soulsphere.  See P_TouchSpecialThing in p_inter.c
-
-int deh_max_soulsphere = DEH_DEFAULT_MAX_SOULSPHERE;
-
-// Dehacked: "Soulsphere health"
-// The amount of health bonus that picking up a soulsphere
-// gives.  See P_TouchSpecialThing in p_inter.c
-
-int deh_soulsphere_health = DEH_DEFAULT_SOULSPHERE_HEALTH;
-
-// Dehacked: "Megasphere health"
-// This is what the health is set to after picking up a 
-// megasphere.  See P_TouchSpecialThing in p_inter.c
-
-int deh_megasphere_health = DEH_DEFAULT_MEGASPHERE_HEALTH;
-
-// Dehacked: "God mode health"
-// This is what the health value is set to when cheating using
-// the IDDQD god mode cheat.  See ST_Responder in st_stuff.c
-
-int deh_god_mode_health = DEH_DEFAULT_GOD_MODE_HEALTH;
-
-// Dehacked: "IDFA Armor"
-// This is what the armor is set to when using the IDFA cheat.
-// See ST_Responder in st_stuff.c
-
-int deh_idfa_armor = DEH_DEFAULT_IDFA_ARMOR;
-
-// Dehacked: "IDFA Armor Class"
-// This is what the armor class is set to when using the IDFA cheat.
-// See ST_Responder in st_stuff.c
-
-int deh_idfa_armor_class = DEH_DEFAULT_IDFA_ARMOR_CLASS;
-
-// Dehacked: "IDKFA Armor"
-// This is what the armor is set to when using the IDKFA cheat.
-// See ST_Responder in st_stuff.c
-
-int deh_idkfa_armor = DEH_DEFAULT_IDKFA_ARMOR;
-
-// Dehacked: "IDKFA Armor Class"
-// This is what the armor class is set to when using the IDKFA cheat.
-// See ST_Responder in st_stuff.c
-
-int deh_idkfa_armor_class = DEH_DEFAULT_IDKFA_ARMOR_CLASS;
-
-// Dehacked: "BFG Cells/Shot"
-// This is the number of CELLs firing the BFG uses up.
-// See P_CheckAmmo and A_FireBFG in p_pspr.c
-
-int deh_bfg_cells_per_shot = DEH_DEFAULT_BFG_CELLS_PER_SHOT;
-
-// Dehacked: "Monsters infight"
-// This controls whether monsters can harm other monsters of the same 
-// species.  For example, whether an imp fireball will damage other
-// imps.  The value of this in dehacked patches is weird - '202' means
-// off, while '221' means on.
-//
-// See PIT_CheckThing in p_map.c
-
-int deh_species_infighting = DEH_DEFAULT_SPECIES_INFIGHTING;
-
-static struct
-{
-    const char *deh_name;
-    int *value;
-} misc_settings[] = {
-    {"Initial Health",      &deh_initial_health},
-    {"Initial Bullets",     &deh_initial_bullets},
-    {"Max Health",          &deh_max_health},
-    {"Max Armor",           &deh_max_armor},
-    {"LeatherArmorClass",   &deh_green_armor_class},
-    {"Metal Armor Class",   &deh_blue_armor_class},
-    {"Max Soulsphere",      &deh_max_soulsphere},
-    {"Soulsphere Health",   &deh_soulsphere_health},
-    {"Megasphere Health",   &deh_megasphere_health},
-    {"God Mode Health",     &deh_god_mode_health},
-    {"IDFA Armor",          &deh_idfa_armor},
-    {"IDFA Armor Class",    &deh_idfa_armor_class},
-    {"IDKFA Armor",         &deh_idkfa_armor},
-    {"IDKFA Armor Class",   &deh_idkfa_armor_class},
-    {"Mauler Cells/Shot",   &deh_bfg_cells_per_shot},
-};
-
-static void *DEH_MiscStart(deh_context_t *context, char *line)
-{
-    return NULL;
-}
-
-static void DEH_MiscParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    int ivalue;
-    size_t i;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    if (!strcasecmp(variable_name, "Monsters Infight"))
-    {
-        // See notes above.
- 
-        if (ivalue == 202)
-        {
-            deh_species_infighting = 0;
-        }
-        else if (ivalue == 221)
-        {
-            deh_species_infighting = 1;
-        }
-        else
-        {
-            DEH_Warning(context, 
-                        "Invalid value for 'Monsters Infight': %i", ivalue);
-        }
-
-        return;
-    }
-
-    for (i=0; i<arrlen(misc_settings); ++i)
-    {
-        if (!strcasecmp(variable_name, misc_settings[i].deh_name))
-        {
-            *misc_settings[i].value = ivalue;
-            return;
-        }
-    }
-
-    DEH_Warning(context, "Unknown Misc variable '%s'", variable_name);
-}
-
-static void DEH_MiscSHA1Sum(sha1_context_t *context)
-{
-    unsigned int i;
-
-    for (i=0; i<arrlen(misc_settings); ++i)
-    {
-        SHA1_UpdateInt32(context, *misc_settings[i].value);
-    }
-}
-
-deh_section_t deh_section_misc =
-{
-    "Misc",
-    NULL,
-    DEH_MiscStart,
-    DEH_MiscParseLine,
-    NULL,
-    DEH_MiscSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/strife/deh_misc.h b/games/NXDoom/src/strife/deh_misc.h
deleted file mode 100644
index f29428f55..000000000
--- a/games/NXDoom/src/strife/deh_misc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Misc" sections in dehacked files
-//
-
-#ifndef DEH_MISC_H
-#define DEH_MISC_H
-
-#define DEH_DEFAULT_INITIAL_HEALTH 100
-#define DEH_DEFAULT_INITIAL_BULLETS 50
-#define DEH_DEFAULT_MAX_HEALTH 200
-#define DEH_DEFAULT_MAX_ARMOR 200
-#define DEH_DEFAULT_GREEN_ARMOR_CLASS 1
-#define DEH_DEFAULT_BLUE_ARMOR_CLASS 2
-#define DEH_DEFAULT_MAX_SOULSPHERE 200
-#define DEH_DEFAULT_SOULSPHERE_HEALTH 100
-#define DEH_DEFAULT_MEGASPHERE_HEALTH 200
-#define DEH_DEFAULT_GOD_MODE_HEALTH 100
-#define DEH_DEFAULT_IDFA_ARMOR 200
-#define DEH_DEFAULT_IDFA_ARMOR_CLASS 2
-#define DEH_DEFAULT_IDKFA_ARMOR 200
-#define DEH_DEFAULT_IDKFA_ARMOR_CLASS 2
-#define DEH_DEFAULT_BFG_CELLS_PER_SHOT 40
-#define DEH_DEFAULT_SPECIES_INFIGHTING 0
-
-extern int deh_initial_health;
-extern int deh_initial_bullets;
-extern int deh_max_health;
-extern int deh_max_armor;
-extern int deh_green_armor_class;
-extern int deh_blue_armor_class;
-extern int deh_max_soulsphere;
-extern int deh_soulsphere_health;
-extern int deh_megasphere_health;
-extern int deh_god_mode_health;
-extern int deh_idfa_armor;
-extern int deh_idfa_armor_class;
-extern int deh_idkfa_armor;
-extern int deh_idkfa_armor_class;
-extern int deh_bfg_cells_per_shot;
-extern int deh_species_infighting;
-
-#if 0
-
-// To compile without dehacked, it's possible to use these:
-
-#define deh_initial_health      DEH_DEFAULT_INITIAL_HEALTH
-#define deh_initial_bullets     DEH_DEFAULT_INITIAL_BULLETS
-#define deh_max_health          DEH_DEFAULT_MAX_HEALTH
-#define deh_max_armor           DEH_DEFAULT_MAX_ARMOR
-#define deh_green_armor_class   DEH_DEFAULT_GREEN_ARMOR_CLASS
-#define deh_blue_armor_class    DEH_DEFAULT_BLUE_ARMOR_CLASS
-#define deh_max_soulsphere      DEH_DEFAULT_MAX_SOULSPHERE
-#define deh_soulsphere_health   DEH_DEFAULT_SOULSPHERE_HEALTH
-#define deh_megasphere_health   DEH_DEFAULT_MEGASPHERE_HEALTH
-#define deh_god_mode_health     DEH_DEFAULT_GOD_MODE_HEALTH
-#define deh_idfa_armor          DEH_DEFAULT_IDFA_ARMOR
-#define deh_idfa_armor_class    DEH_DEFAULT_IDFA_ARMOR_CLASS
-#define deh_idkfa_armor         DEH_DEFAULT_IDKFA_ARMOR
-#define deh_idkfa_armor_class   DEH_DEFAULT_IDKFA_ARMOR_CLASS
-#define deh_bfg_cells_per_shot  DEH_DEFAULT_BFG_CELLS_PER_SHOT
-#define deh_species_infighting  DEH_DEFAULT_SPECIES_INFIGHTING
-
-#endif
-
-#endif /* #ifndef DEH_MISC_H */
-
diff --git a/games/NXDoom/src/strife/deh_ptr.c b/games/NXDoom/src/strife/deh_ptr.c
deleted file mode 100644
index 5ca3116f2..000000000
--- a/games/NXDoom/src/strife/deh_ptr.c
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses Action Pointer entries in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-#include "info.h"
-
-#include "deh_defs.h"
-#include "deh_io.h"
-#include "deh_main.h"
-
-static actionf_t codeptrs[NUMSTATES];
-
-static int CodePointerIndex(actionf_t *ptr)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        if (!memcmp(&codeptrs[i], ptr, sizeof(actionf_t)))
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-static void DEH_PointerInit(void)
-{
-    int i;
-    
-    // Initialize list of dehacked pointers
-
-    for (i=0; i<NUMSTATES; ++i)
-        codeptrs[i] = states[i].action;
-}
-
-static void *DEH_PointerStart(deh_context_t *context, char *line)
-{
-    int frame_number = 0;
-    
-    // FIXME: can the third argument here be something other than "Frame"
-    // or are we ok?
-
-    if (sscanf(line, "Pointer %*i (%*s %i)", &frame_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (frame_number < 0 || frame_number >= NUMSTATES)
-    {
-        DEH_Warning(context, "Invalid frame number: %i", frame_number);
-        return NULL;
-    }
-
-    return &states[frame_number];
-}
-
-static void DEH_PointerParseLine(deh_context_t *context, char *line, void *tag)
-{
-    state_t *state;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    state = (state_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-//    printf("Set %s to %s for state\n", variable_name, value);
-
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    // set the appropriate field
-
-    if (!strcasecmp(variable_name, "Codep frame"))
-    {
-        if (ivalue < 0 || ivalue >= NUMSTATES)
-        {
-            DEH_Warning(context, "Invalid state '%i'", ivalue);
-        }
-        else
-        {        
-            state->action = codeptrs[ivalue];
-        }
-    }
-    else
-    {
-        DEH_Warning(context, "Unknown variable name '%s'", variable_name);
-    }
-}
-
-static void DEH_PointerSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMSTATES; ++i)
-    {
-        SHA1_UpdateInt32(context, CodePointerIndex(&states[i].action));
-    }
-}
-
-deh_section_t deh_section_pointer =
-{
-    "Pointer",
-    DEH_PointerInit,
-    DEH_PointerStart,
-    DEH_PointerParseLine,
-    NULL,
-    DEH_PointerSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/strife/deh_sound.c b/games/NXDoom/src/strife/deh_sound.c
deleted file mode 100644
index 8d178c785..000000000
--- a/games/NXDoom/src/strife/deh_sound.c
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Sound" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "doomtype.h"
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-#include "sounds.h"
-
-DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t)
-    DEH_UNSUPPORTED_MAPPING("Offset")
-    DEH_UNSUPPORTED_MAPPING("Zero/One")
-    DEH_MAPPING("Value", priority)
-    DEH_MAPPING("Zero 1", link)
-    DEH_MAPPING("Zero 2", pitch)
-    DEH_MAPPING("Zero 3", volume)
-    DEH_UNSUPPORTED_MAPPING("Zero 4")
-    DEH_MAPPING("Neg. One 1", usefulness)
-    DEH_MAPPING("Neg. One 2", lumpnum)
-DEH_END_MAPPING
-
-static void *DEH_SoundStart(deh_context_t *context, char *line)
-{
-    int sound_number = 0;
-    
-    if (sscanf(line, "Sound %i", &sound_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (sound_number < 0 || sound_number >= NUMSFX)
-    {
-        DEH_Warning(context, "Invalid sound number: %i", sound_number);
-        return NULL;
-    }
-
-    if (sound_number >= DEH_VANILLA_NUMSFX)
-    {
-        DEH_Warning(context, "Attempt to modify SFX %i.  This will cause "
-                             "problems in Vanilla dehacked.", sound_number); 
-    }
-
-    return &S_sfx[sound_number];
-}
-
-static void DEH_SoundParseLine(deh_context_t *context, char *line, void *tag)
-{
-    sfxinfo_t *sfx;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    sfx = (sfxinfo_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    // Set the field value
-
-    DEH_SetMapping(context, &sound_mapping, sfx, variable_name, ivalue);
-}
-
-deh_section_t deh_section_sound =
-{
-    "Sound",
-    NULL,
-    DEH_SoundStart,
-    DEH_SoundParseLine,
-    NULL,
-    NULL,
-};
-
diff --git a/games/NXDoom/src/strife/deh_strife.c b/games/NXDoom/src/strife/deh_strife.c
deleted file mode 100644
index 76cb496c1..000000000
--- a/games/NXDoom/src/strife/deh_strife.c
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Top-level dehacked definitions for Strife dehacked (sehacked)
-//
-
-#include <stdlib.h>
-#include "deh_defs.h"
-#include "deh_main.h"
-
-const char *deh_signatures[] =
-{
-    "Patch File for SeHackEd v0.4",
-    "Patch File for SeHackEd v0.3",
-    NULL
-};
-
-
-//
-// List of section types:
-//
-
-deh_section_t *deh_section_types[] =
-{
-    &deh_section_ammo,
-    &deh_section_cheat,
-    &deh_section_frame,
-    &deh_section_misc,
-    &deh_section_pointer,
-    &deh_section_sound,
-    &deh_section_text,
-    &deh_section_thing,
-    &deh_section_weapon,
-    NULL
-};
-
diff --git a/games/NXDoom/src/strife/deh_thing.c b/games/NXDoom/src/strife/deh_thing.c
deleted file mode 100644
index 72b92642e..000000000
--- a/games/NXDoom/src/strife/deh_thing.c
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Thing" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "doomtype.h"
-
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-
-#include "info.h"
-
-DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
-  DEH_MAPPING("ID #",                doomednum)
-  DEH_MAPPING("Initial frame",       spawnstate)
-  DEH_MAPPING("Hit points",          spawnhealth)
-  DEH_MAPPING("First moving frame",  seestate)
-  DEH_MAPPING("Alert sound",         seesound)
-  DEH_MAPPING("Reaction time",       reactiontime)
-  DEH_MAPPING("Attack sound",        attacksound)
-  DEH_MAPPING("Injury frame",        painstate)
-  DEH_MAPPING("Pain chance",         painchance)
-  DEH_MAPPING("Pain sound",          painsound)
-  DEH_MAPPING("Close attack frame",  meleestate)
-  DEH_MAPPING("Far attack frame",    missilestate)
-  DEH_MAPPING("Crash frame",         crashstate)
-  DEH_MAPPING("Death frame",         deathstate)
-  DEH_MAPPING("Exploding frame",     xdeathstate)
-  DEH_MAPPING("Death sound",         deathsound)
-  DEH_MAPPING("Speed",               speed)
-  DEH_MAPPING("Width",               radius)
-  DEH_MAPPING("Height",              height)
-  DEH_MAPPING("Mass",                mass)
-  DEH_MAPPING("Missile damage",      damage)
-  DEH_MAPPING("Action sound",        activesound)
-  DEH_MAPPING("Bits",                flags)
-  DEH_UNSUPPORTED_MAPPING("Name pointer")
-DEH_END_MAPPING
-
-static void *DEH_ThingStart(deh_context_t *context, char *line)
-{
-    int thing_number = 0;
-    mobjinfo_t *mobj;
-    
-    if (sscanf(line, "Thing %i", &thing_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    // dehacked files are indexed from 1
-    --thing_number;
-
-    if (thing_number < 0 || thing_number >= NUMMOBJTYPES)
-    {
-        DEH_Warning(context, "Invalid thing number: %i", thing_number);
-        return NULL;
-    }
-    
-    mobj = &mobjinfo[thing_number];
-    
-    return mobj;
-}
-
-static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
-{
-    mobjinfo_t *mobj;
-    char *variable_name, *value;
-    int ivalue;
-    
-    if (tag == NULL)
-       return;
-
-    mobj = (mobjinfo_t *) tag;
-
-    // Parse the assignment
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-    
-//    printf("Set %s to %s for mobj\n", variable_name, value);
-
-    // all values are integers
-
-    ivalue = atoi(value);
-    
-    // Set the field value
-
-    DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
-}
-
-static void DEH_ThingSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMMOBJTYPES; ++i)
-    {
-        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
-    }
-}
-
-deh_section_t deh_section_thing =
-{
-    "Thing",
-    NULL,
-    DEH_ThingStart,
-    DEH_ThingParseLine,
-    NULL,
-    DEH_ThingSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/strife/deh_weapon.c b/games/NXDoom/src/strife/deh_weapon.c
deleted file mode 100644
index a178c338b..000000000
--- a/games/NXDoom/src/strife/deh_weapon.c
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Parses "Weapon" sections in dehacked files
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "doomtype.h"
-
-#include "d_items.h"
-
-#include "deh_defs.h"
-#include "deh_main.h"
-#include "deh_mapping.h"
-
-DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
-  DEH_MAPPING("Ammo type",        ammo)
-  DEH_MAPPING("Deselect frame",   upstate)
-  DEH_MAPPING("Select frame",     downstate)
-  DEH_MAPPING("Bobbing frame",    readystate)
-  DEH_MAPPING("Shooting frame",   atkstate)
-  DEH_MAPPING("Firing frame",     flashstate)
-  DEH_UNSUPPORTED_MAPPING("? Unknown")
-DEH_END_MAPPING
-
-static void *DEH_WeaponStart(deh_context_t *context, char *line)
-{
-    int weapon_number = 0;
-
-    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
-    {
-        DEH_Warning(context, "Parse error on section start");
-        return NULL;
-    }
-
-    if (weapon_number < 0 || weapon_number >= NUMWEAPONS)
-    {
-        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
-        return NULL;
-    }
-    
-    return &weaponinfo[weapon_number];
-}
-
-static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
-{
-    char *variable_name, *value;
-    weaponinfo_t *weapon;
-    int ivalue;
-    
-    if (tag == NULL)
-        return;
-
-    weapon = (weaponinfo_t *) tag;
-
-    if (!DEH_ParseAssignment(line, &variable_name, &value))
-    {
-        // Failed to parse
-
-        DEH_Warning(context, "Failed to parse assignment");
-        return;
-    }
-
-    ivalue = atoi(value);
-
-    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
-}
-
-static void DEH_WeaponSHA1Sum(sha1_context_t *context)
-{
-    int i;
-
-    for (i=0; i<NUMWEAPONS ;++i)
-    {
-        DEH_StructSHA1Sum(context, &weapon_mapping, &weaponinfo[i]);
-    }
-}
-
-deh_section_t deh_section_weapon =
-{
-    "Weapon",
-    NULL,
-    DEH_WeaponStart,
-    DEH_WeaponParseLine,
-    NULL,
-    DEH_WeaponSHA1Sum,
-};
-
diff --git a/games/NXDoom/src/strife/doomdata.h b/games/NXDoom/src/strife/doomdata.h
deleted file mode 100644
index abf313266..000000000
--- a/games/NXDoom/src/strife/doomdata.h
+++ /dev/null
@@ -1,225 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  all external data is defined here
-//  most of the data is loaded into different structures at run time
-//  some internal structures shared by many modules are here
-//
-
-#ifndef __DOOMDATA__
-#define __DOOMDATA__
-
-// The most basic types we use, portability.
-#include "doomtype.h"
-
-// Some global defines, that configure the game.
-#include "doomdef.h"
-
-
-
-//
-// Map level types.
-// The following data structures define the persistent format
-// used in the lumps of the WAD files.
-//
-
-// Lump order in a map WAD: each map needs a couple of lumps
-// to provide a complete scene geometry description.
-enum
-{
-  ML_LABEL,		// A separator, name, ExMx or MAPxx
-  ML_THINGS,		// Monsters, items..
-  ML_LINEDEFS,		// LineDefs, from editing
-  ML_SIDEDEFS,		// SideDefs, from editing
-  ML_VERTEXES,		// Vertices, edited and BSP splits generated
-  ML_SEGS,		// LineSegs, from LineDefs split by BSP
-  ML_SSECTORS,		// SubSectors, list of LineSegs
-  ML_NODES,		// BSP nodes
-  ML_SECTORS,		// Sectors, from editing
-  ML_REJECT,		// LUT, sector-sector visibility	
-  ML_BLOCKMAP		// LUT, motion clipping, walls/grid element
-};
-
-
-// A single Vertex.
-typedef PACKED_STRUCT (
-{
-  short		x;
-  short		y;
-}) mapvertex_t;
-
-
-// A SideDef, defining the visual appearance of a wall,
-// by setting textures and offsets.
-typedef PACKED_STRUCT (
-{
-  short		textureoffset;
-  short		rowoffset;
-  char		toptexture[8];
-  char		bottomtexture[8];
-  char		midtexture[8];
-  // Front sector, towards viewer.
-  short		sector;
-}) mapsidedef_t;
-
-
-
-// A LineDef, as used for editing, and as input
-// to the BSP builder.
-typedef PACKED_STRUCT (
-{
-  short		v1;
-  short		v2;
-  short		flags;
-  short		special;
-  short		tag;
-  // sidenum[1] will be -1 if one sided
-  short		sidenum[2];		
-}) maplinedef_t;
-
-
-//
-// LineDef attributes.
-//
-
-// Solid, is an obstacle.
-#define ML_BLOCKING		1
-
-// Blocks monsters only.
-#define ML_BLOCKMONSTERS	2
-
-// Backside will not be present at all
-//  if not two sided.
-#define ML_TWOSIDED		4
-
-// If a texture is pegged, the texture will have
-// the end exposed to air held constant at the
-// top or bottom of the texture (stairs or pulled
-// down things) and will move with a height change
-// of one of the neighbor sectors.
-// Unpegged textures allways have the first row of
-// the texture at the top pixel of the line for both
-// top and bottom textures (use next to windows).
-
-// upper texture unpegged
-#define ML_DONTPEGTOP		8
-
-// lower texture unpegged
-#define ML_DONTPEGBOTTOM	16	
-
-// In AutoMap: don't map as two sided: IT'S A SECRET!
-#define ML_SECRET		32
-
-// Sound rendering: don't let sound cross two of these.
-#define ML_SOUNDBLOCK		64
-
-// Don't draw on the automap at all.
-#define ML_DONTDRAW		128
-
-// Set if already seen, thus drawn in automap.
-#define ML_MAPPED		256
-
-// villsa [STRIFE] jump over rails?
-#define ML_JUMPOVER             512
-
-// villsa [STRIFE] block flying things
-#define ML_BLOCKFLOATERS        1024
-
-// villsa [STRIFE] TODO - 25% or 75% transcluency?
-#define ML_TRANSPARENT1         2048
-
-// villsa [STRIFE] TODO - 25% or 75% transcluency?
-#define ML_TRANSPARENT2         4096
-
-
-
-
-// Sector definition, from editing.
-typedef	PACKED_STRUCT (
-{
-  short		floorheight;
-  short		ceilingheight;
-  char		floorpic[8];
-  char		ceilingpic[8];
-  short		lightlevel;
-  short		special;
-  short		tag;
-}) mapsector_t;
-
-// SubSector, as generated by BSP.
-typedef PACKED_STRUCT (
-{
-  short		numsegs;
-  // Index of first one, segs are stored sequentially.
-  short		firstseg;	
-}) mapsubsector_t;
-
-
-// LineSeg, generated by splitting LineDefs
-// using partition lines selected by BSP builder.
-typedef PACKED_STRUCT (
-{
-  short		v1;
-  short		v2;
-  short		angle;		
-  short		linedef;
-  short		side;
-  short		offset;
-}) mapseg_t;
-
-
-
-// BSP node structure.
-
-// Indicate a leaf.
-#define	NF_SUBSECTOR	0x8000
-
-typedef PACKED_STRUCT (
-{
-  // Partition line from (x,y) to x+dx,y+dy)
-  short		x;
-  short		y;
-  short		dx;
-  short		dy;
-
-  // Bounding box for each child,
-  // clip against view frustum.
-  short		bbox[2][4];
-
-  // If NF_SUBSECTOR its a subsector,
-  // else it's a node of another subtree.
-  unsigned short	children[2];
-
-}) mapnode_t;
-
-
-
-
-// Thing definition, position, orientation and type,
-// plus skill/visibility flags and attributes.
-typedef PACKED_STRUCT (
-{
-    short		x;
-    short		y;
-    short		angle;
-    short		type;
-    short		options;
-}) mapthing_t;
-
-
-
-
-
-#endif			// __DOOMDATA__
diff --git a/games/NXDoom/src/strife/doomdef.c b/games/NXDoom/src/strife/doomdef.c
deleted file mode 100644
index d31f3efa2..000000000
--- a/games/NXDoom/src/strife/doomdef.c
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  DoomDef - basic defines for DOOM, e.g. Version, game mode
-//   and skill level, and display parameters.
-//
-
-
-
-#include "doomdef.h"
-
-// Location for any defines turned variables.
-
-// None.
-
-
diff --git a/games/NXDoom/src/strife/doomdef.h b/games/NXDoom/src/strife/doomdef.h
deleted file mode 100644
index cdb645412..000000000
--- a/games/NXDoom/src/strife/doomdef.h
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Internally used data structures for virtually everything,
-//   lots of other stuff.
-//
-
-#ifndef __DOOMDEF__
-#define __DOOMDEF__
-
-#include <stdio.h>
-#include <string.h>
-
-#include "doomtype.h"
-#include "i_timer.h"
-#include "d_mode.h"
-
-//
-// Global parameters/defines.
-//
-// DOOM version
-//
-// haleyjd 09/28/10: Replaced with Strife version
-#define STRIFE_VERSION 101
-
-// Version code for cph's longtics hack ("v1.91")
-#define DOOM_191_VERSION 111
-
-
-// Maximum players for Strife:
-#define MAXPLAYERS 8
-
-// If rangecheck is undefined,
-// most parameter validation debugging code will not be compiled
-#define RANGECHECK
-
-// The current state of the game: whether we are
-// playing, gazing at the intermission screen,
-// the game final animation, or a demo. 
-typedef enum
-{
-    GS_LEVEL,
-    GS_UNKNOWN,
-    GS_FINALE,
-    GS_DEMOSCREEN,
-} gamestate_t;
-
-typedef enum
-{
-    ga_nothing,
-    ga_loadlevel,
-    ga_newgame,
-    ga_loadgame,
-    ga_savegame,
-    ga_playdemo,
-    ga_completed,
-    ga_victory,
-    ga_worlddone,
-    ga_screenshot
-} gameaction_t;
-
-//
-// Difficulty/skill settings/filters.
-//
-
-// Skill flags.
-#define	MTF_EASY                1
-#define	MTF_NORMAL              2
-#define	MTF_HARD                4
-// villsa [STRIFE] standing monsters
-#define MTF_STAND               8
-// villsa [STRIFE] don't spawn in single player
-#define MTF_NOTSINGLE           16
-// Deaf monsters/do not react to sound.
-#define MTF_AMBUSH              32
-// villsa [STRIFE] friendly to players
-#define MTF_FRIEND              64
-// villsa [STRIFE] TODO - identify
-#define MTF_UNKNOWN1            128
-// villsa [STRIFE] thing is translucent - STRIFE-TODO: But how much?
-#define MTF_TRANSLUCENT         256
-// villsa [STRIFE] thing is more - or less? - translucent - STRIFE-TODO
-#define MTF_MVIS                512
-// villsa [STRIFE] TODO - identify
-#define MTF_UNKNOWN2            1024
-
-
-
-//
-// Key cards.
-//
-// villsa [STRIFE]
-typedef enum
-{
-    key_BaseKey,        // 0
-    key_GovsKey,        // 1
-    key_Passcard,       // 2
-    key_IDCard,         // 3
-    key_PrisonKey,      // 4
-    key_SeveredHand,    // 5
-    key_Power1Key,      // 6
-    key_Power2Key,      // 7
-    key_Power3Key,      // 8
-    key_GoldKey,        // 9
-    key_IDBadge,        // 10
-    key_SilverKey,      // 11
-    key_OracleKey,      // 12
-    key_MilitaryID,     // 13
-    key_OrderKey,       // 14
-    key_WarehouseKey,   // 15
-    key_BrassKey,       // 16
-    key_RedCrystalKey,  // 17
-    key_BlueCrystalKey, // 18
-    key_ChapelKey,      // 19
-    key_CatacombKey,    // 20
-    key_SecurityKey,    // 21
-    key_CoreKey,        // 22
-    key_MaulerKey,      // 23
-    key_FactoryKey,     // 24
-    key_MineKey,        // 25
-    key_NewKey5,        // 26
-
-    NUMCARDS            // 27
-} card_t;
-
-
-
-// The defined weapons,
-//  including a marker indicating
-//  user has not changed weapon.
-// villsa [STRIFE]
-typedef enum
-{
-    wp_fist,
-    wp_elecbow,
-    wp_rifle,
-    wp_missile,
-    wp_hegrenade,
-    wp_flame,
-    wp_mauler,
-    wp_sigil,
-    wp_poisonbow,
-    wp_wpgrenade,
-    wp_torpedo,
-
-    NUMWEAPONS,
-    
-    // No pending weapon change.
-    wp_nochange
-
-} weapontype_t;
-
-
-// Ammunition types defined.
-typedef enum
-{
-    am_bullets,
-    am_elecbolts,
-    am_poisonbolts,
-    am_cell,
-    am_missiles,
-    am_hegrenades,
-    am_wpgrenades,
-
-    NUMAMMO,
-
-    am_noammo   // unlimited ammo
-
-} ammotype_t;
-
-
-// Power up artifacts.
-// villsa [STRIFE]
-typedef enum
-{
-    pw_strength,
-    pw_invisibility,
-    pw_ironfeet,
-    pw_allmap,
-    pw_communicator,
-    pw_targeter,
-    NUMPOWERS
-    
-} powertype_t;
-
-// villsa [STRIFE]
-// quest numbers
-typedef enum
-{               // Hex          Watcom Name               player_t offset
-    tk_quest1,  // 0x00000001   questflags & 1            0x4D
-    tk_quest2,  // 0x00000002   questflags & 2
-    tk_quest3,  // 0x00000004   questflags & 4
-    tk_quest4,  // 0x00000008   questflags & 8
-    tk_quest5,  // 0x00000010   questflags & 10h
-    tk_quest6,  // 0x00000020   questflags & 20h
-    tk_quest7,  // 0x00000040   questflags & 40h
-    tk_quest8,  // 0x00000080   questflags & 80h
-    tk_quest9,  // 0x00000100   BYTE1(questflags) & 1     0x4E
-    tk_quest10, // 0x00000200   BYTE1(questflags) & 2
-    tk_quest11, // 0x00000400   BYTE1(questflags) & 4
-    tk_quest12, // 0x00000800   BYTE1(questflags) & 8
-    tk_quest13, // 0x00001000   BYTE1(questflags) & 10h
-    tk_quest14, // 0x00002000   BYTE1(questflags) & 20h
-    tk_quest15, // 0x00004000   BYTE1(questflags) & 40h
-    tk_quest16, // 0x00008000   BYTE1(questflags) & 80h
-    tk_quest17, // 0x00010000   BYTE2(questflags) & 1     0x4F
-    tk_quest18, // 0x00020000   BYTE2(questflags) & 2
-    tk_quest19, // 0x00040000   BYTE2(questflags) & 4
-    tk_quest20, // 0x00080000   BYTE2(questflags) & 8
-    tk_quest21, // 0x00100000   BYTE2(questflags) & 10h
-    tk_quest22, // 0x00200000   BYTE2(questflags) & 20h
-    tk_quest23, // 0x00400000   BYTE2(questflags) & 40h
-    tk_quest24, // 0x00800000   BYTE2(questflags) & 80h
-    tk_quest25, // 0x01000000   BYTE3(questflags) & 1     0x50
-    tk_quest26, // 0x02000000   BYTE3(questflags) & 2
-    tk_quest27, // 0x04000000   BYTE3(questflags) & 4
-    tk_quest28, // 0x08000000   BYTE3(questflags) & 8
-    tk_quest29, // 0x10000000   BYTE3(questflags) & 10h
-    tk_quest30, // 0x20000000   BYTE3(questflags) & 20h
-    tk_quest31, // 0x40000000   BYTE3(questflags) & 40h
-    tk_quest32, // most likely unused
-    tk_numquests
-} questtype_t;
-
-// haleyjd 09/12/10: [STRIFE]
-// flag values for each quest.
-enum
-{ //  Name       Flag from bitnum      Purpose, if known
-    QF_QUEST1  = (1 << tk_quest1),  // Obtained Beldin's ring
-    QF_QUEST2  = (1 << tk_quest2),  // Stole the Chalice
-    QF_QUEST3  = (1 << tk_quest3),  // Permission to visit Irale (visited Macil)
-    QF_QUEST4  = (1 << tk_quest4),  // Accepted Gov. Mourel's "messy" chore
-    QF_QUEST5  = (1 << tk_quest5),  // Accepted Gov. Mourel's "bloody" chore
-    QF_QUEST6  = (1 << tk_quest6),  // Destroyed the Power Coupling
-    QF_QUEST7  = (1 << tk_quest7),  // Killed Blue Acolytes ("Scanning Team")
-    QF_QUEST8  = (1 << tk_quest8),  // Unused; formerly, picked up Broken Coupling
-    QF_QUEST9  = (1 << tk_quest9),  // Obtained Derwin's ear
-    QF_QUEST10 = (1 << tk_quest10), // Obtained Prison Pass
-    QF_QUEST11 = (1 << tk_quest11), // Obtained Prison Key
-    QF_QUEST12 = (1 << tk_quest12), // Obtained Judge Wolenick's hand
-    QF_QUEST13 = (1 << tk_quest13), // Freed the Prisoners
-    QF_QUEST14 = (1 << tk_quest14), // Destroyed the Power Crystal
-    QF_QUEST15 = (1 << tk_quest15), // Obtained Guard Uniform
-    QF_QUEST16 = (1 << tk_quest16), // Destroyed the Gate Mechanism
-    QF_QUEST17 = (1 << tk_quest17), // Heard Macil's story about the Sigil (MAP10)
-    QF_QUEST18 = (1 << tk_quest18), // Obtained Oracle Pass
-    QF_QUEST19 = (1 << tk_quest19),
-    QF_QUEST20 = (1 << tk_quest20),
-    QF_QUEST21 = (1 << tk_quest21), // Killed Bishop
-    QF_QUEST22 = (1 << tk_quest22), // Killed Oracle with QUEST21 set
-    QF_QUEST23 = (1 << tk_quest23), // Killed Oracle (always given)
-    QF_QUEST24 = (1 << tk_quest24), // Killed Macil
-    QF_QUEST25 = (1 << tk_quest25), // Destroyed the Converter
-    QF_QUEST26 = (1 << tk_quest26), // Killed Loremaster
-    QF_QUEST27 = (1 << tk_quest27), // Destroyed the Computer (checked for good ending)
-    QF_QUEST28 = (1 << tk_quest28), // Obtained Catacomb Key (checked by line type 228)
-    QF_QUEST29 = (1 << tk_quest29), // Destroyed the Mines Transmitter
-    QF_QUEST30 = (1 << tk_quest30),
-    QF_QUEST31 = (1 << tk_quest31),
-    QF_QUEST32 = (1U << tk_quest32), // Unused; BUG: Broken Coupling accidentally sets it.
-    
-    QF_ALLQUESTS  = (QF_QUEST31 + (QF_QUEST31 - 1)) // does not include bit 32!
-};
-
-//
-// Power up durations,
-//  how many seconds till expiration,
-//  assuming TICRATE is 35 ticks/second.
-//
-typedef enum
-{
-    INVISTICS	= (55*TICRATE), // villsa [STRIFE] changed from 60 to 55
-    IRONTICS	= (80*TICRATE), // villsa [STRIFE] changed from 60 to 80
-    PMUPTICS    = (80*TICRATE), // villsa [STRIFE]
-    TARGTICS    = (160*TICRATE),// villsa [STRIFE]
-    
-} powerduration_t;
-
-#endif          // __DOOMDEF__
diff --git a/games/NXDoom/src/strife/doomstat.c b/games/NXDoom/src/strife/doomstat.c
deleted file mode 100644
index 7f3116b5c..000000000
--- a/games/NXDoom/src/strife/doomstat.c
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Put all global tate variables here.
-//
-
-#include <stdio.h>
-
-#include "doomstat.h"
-
-
-// Game Mode - identify IWAD as shareware, retail etc.
-GameMode_t gamemode = indetermined;
-GameMission_t	gamemission = doom;
-GameVersion_t   gameversion = exe_strife_1_31;
-const char *gamedescription;
-
-// Set if homebrew PWAD stuff has been added.
-boolean	modifiedgame;
-
-
-
-
diff --git a/games/NXDoom/src/strife/doomstat.h b/games/NXDoom/src/strife/doomstat.h
deleted file mode 100644
index 4be2435b1..000000000
--- a/games/NXDoom/src/strife/doomstat.h
+++ /dev/null
@@ -1,281 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   All the global variables that store the internal state.
-//   Theoretically speaking, the internal state of the engine
-//    should be found by looking at the variables collected
-//    here, and every relevant module will have to include
-//    this header file.
-//   In practice, things are a bit messy.
-//
-
-
-#ifndef __D_STATE__
-#define __D_STATE__
-
-// We need globally shared data structures,
-//  for defining the global state variables.
-#include "doomdata.h"
-#include "d_loop.h"
-
-// We need the playr data structure as well.
-#include "d_player.h"
-
-// Game mode/mission
-#include "d_mode.h"
-
-#include "net_defs.h"
-
-
-
-// ------------------------
-// Command line parameters.
-//
-extern  boolean	nomonsters;	// checkparm of -nomonsters
-extern  boolean	respawnparm;	// checkparm of -respawn
-extern  boolean	fastparm;	// checkparm of -fast
-extern  boolean randomparm;     // [STRIFE] checkparm of -random
-extern  boolean flipparm;       // [STRIFE] checkparm of -flip
-
-extern  boolean	devparm;	// DEBUG: launched with -devparm
-
-
-// -----------------------------------------------------
-// Game Mode - identify IWAD as shareware, retail etc.
-//
-extern GameMode_t	gamemode;
-extern GameMission_t	gamemission;
-extern GameVersion_t    gameversion;
-extern const char       *gamedescription;
-
-// Set if homebrew PWAD stuff has been added.
-extern  boolean	modifiedgame;
-
-
-// -------------------------------------------
-// Selected skill type, map etc.
-//
-
-// Defaults for menu, methinks.
-extern  skill_t		startskill;
-extern  int             startepisode;
-extern	int		startmap;
-
-// Savegame slot to load on startup.  This is the value provided to
-// the -loadgame option.  If this has not been provided, this is -1.
-
-extern  int             startloadgame;
-
-extern  boolean		autostart;
-
-// Selected by user. 
-extern  skill_t         gameskill;
-extern  int		gameepisode;
-extern  int		gamemap;
-
-// If non-zero, exit the level after this number of minutes
-extern  int             timelimit;
-
-// Nightmare mode flag, single player.
-extern  boolean         respawnmonsters;
-
-// Netgame? Only true if >1 player.
-extern  boolean	netgame;
-
-// 0=Co-op; 1=Deathmatch; 2=Altdeath
-extern  int	deathmatch;
-
-// -------------------------
-// Internal parameters for sound rendering.
-// These have been taken from the DOS version,
-//  but are not (yet) supported with Linux
-//  (e.g. no sound volume adjustment with menu.
-
-// From m_menu.c:
-//  Sound FX volume has default, 0 - 15
-//  Music volume has default, 0 - 15
-// These are multiplied by 8.
-extern int sfxVolume;
-extern int musicVolume;
-extern int voiceVolume; // haleyjd 08/29/10: [STRIFE]
-
-// Current music/sfx card - index useless
-//  w/o a reference LUT in a sound module.
-// Ideally, this would use indices found
-//  in: /usr/include/linux/soundcard.h
-extern int snd_MusicDevice;
-extern int snd_SfxDevice;
-// Config file? Same disclaimer as above.
-extern int snd_DesiredMusicDevice;
-extern int snd_DesiredSfxDevice;
-
-
-// -------------------------
-// Status flags for refresh.
-//
-
-// Depending on view size - no status bar?
-// Note that there is no way to disable the
-//  status bar explicitely.
-extern  boolean statusbaractive;
-
-extern  boolean automapactive;  // In AutoMap mode?
-extern  boolean	menuactive;     // Menu overlayed?
-extern  boolean menupause;      // haleyjd 08/29/10: [STRIFE]
-extern  int     menupausetime;  // haleyjd 09/04/10: [STRIFE]
-extern  boolean menuindialog;   // haleyjd: ditto
-extern  boolean	paused;         // Game Pause?
-
-
-extern  boolean		viewactive;
-
-extern  boolean		nodrawers;
-
-extern  boolean         testcontrols;
-extern  int             testcontrols_mousespeed;
-
-
-
-
-// This one is related to the 3-screen display mode.
-// ANG90 = left side, ANG270 = right
-extern  int	viewangleoffset;
-
-// Player taking events, and displaying.
-extern  int	consoleplayer;	
-extern  int	displayplayer;
-
-
-// -------------------------------------
-// Scores, rating.
-// Statistics on a given map, for intermission.
-//
-extern  int	totalkills;
-//extern	int	totalitems; [STRIFE] unused
-extern	int	totalsecret;
-
-// Timer, for scores.
-extern  int	levelstarttic;	// gametic at level start
-extern  int	leveltime;	// tics in game play for par
-
-
-
-// --------------------------------------
-// DEMO playback/recording related stuff.
-// No demo, there is a human player in charge?
-// Disable save/end game?
-extern  boolean	usergame;
-
-//?
-extern  boolean	demoplayback;
-extern  boolean	demorecording;
-extern  int     mouse_fire_countdown;   // villsa [STRIFE]
-extern  int     joystick_fire_countdown;
-
-extern fixed_t forwardmove[2];
-extern fixed_t sidemove[2];
-
-// Round angleturn in ticcmds to the nearest 256.  This is used when
-// recording Vanilla demos in netgames.
-
-extern boolean lowres_turn;
-
-// Quit after playing a demo from cmdline.
-extern  boolean		singledemo;	
-
-
-
-
-//?
-extern  gamestate_t     gamestate;
-
-
-
-
-
-
-//-----------------------------
-// Internal parameters, fixed.
-// These are set by the engine, and not changed
-//  according to user inputs. Partly load from
-//  WAD, partly set at startup time.
-
-
-// Bookkeeping on players - state.
-extern	player_t	players[MAXPLAYERS];
-
-// Alive? Disconnected?
-extern  boolean		playeringame[MAXPLAYERS];
-
-
-// Player spawn spots for deathmatch.
-#define MAX_DM_STARTS   10
-extern  mapthing_t      deathmatchstarts[MAX_DM_STARTS];
-extern  mapthing_t*	deathmatch_p;
-
-// Player spawn spots.
-extern  mapthing_t      playerstarts[MAXPLAYERS];
-
-// haleyjd 08/24/10: [STRIFE] rift spots
-#define MAXRIFTSPOTS 16
-extern  mapthing_t      riftSpots[MAXRIFTSPOTS];
-
-// Intermission stats.
-// Parameters for world map / intermission.
-extern  wbstartstruct_t		wminfo;	
-
-
-
-
-
-
-//-----------------------------------------
-// Internal parameters, used for engine.
-//
-
-// File handling stuff.
-extern  char *          savegamedir;
-
-// if true, load all graphics at level load
-extern  boolean         precache;
-
-
-// wipegamestate can be set to -1
-//  to force a wipe on the next draw
-extern  gamestate_t     wipegamestate;
-
-extern  int             mouseSensitivity;
-
-//extern  int             bodyqueslot; [STRIFE] unused
-
-
-
-// Needed to store the number of the dummy sky flat.
-// Used for rendering,
-//  as well as tracking projectiles etc.
-extern int		skyflatnum;
-
-
-
-// Netgame stuff (buffers and pointers, i.e. indices).
-
-
-extern	int		rndindex;
-
-extern  ticcmd_t        *netcmds;
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/dstrings.c b/games/NXDoom/src/strife/dstrings.c
deleted file mode 100644
index 86433ab28..000000000
--- a/games/NXDoom/src/strife/dstrings.c
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Globally defined strings.
-// 
-
-
-
-#include "dstrings.h"
-
-const char *doom1_endmsg[] =
-{
-  "are you sure you want to\nquit this great game?",
-  "please don't leave, there's more\ndemons to toast!",
-  "let's beat it -- this is turning\ninto a bloodbath!",
-  "i wouldn't leave if i were you.\ndos is much worse.",
-  "you're trying to say you like dos\nbetter than me, right?",
-  "don't leave yet -- there's a\ndemon around that corner!",
-  "ya know, next time you come in here\ni'm gonna toast ya.",
-  "go ahead and leave. see if i care.",
-};
-
-const char *doom2_endmsg[] =
-{
-  // QuitDOOM II messages
-  "are you sure you want to\nquit this great game?",
-  "you want to quit?\nthen, thou hast lost an eighth!",
-  "don't go now, there's a \ndimensional shambler waiting\nat the dos prompt!",
-  "get outta here and go back\nto your boring programs.",
-  "if i were your boss, i'd \n deathmatch ya in a minute!",
-  "look, bud. you leave now\nand you forfeit your body count!",
-  "just leave. when you come\nback, i'll be waiting with a bat.",
-  "you're lucky i don't smack\nyou for thinking about leaving.",
-};
-
-#if 0
-
-// UNUSED messages included in the source release
-
-char* endmsg[] =
-{
-  // DOOM1
-  QUITMSG,
-  // FinalDOOM?
-  "fuck you, pussy!\nget the fuck out!",
-  "you quit and i'll jizz\nin your cystholes!",
-  "if you leave, i'll make\nthe lord drink my jizz.",
-  "hey, ron! can we say\n'fuck' in the game?",
-  "i'd leave: this is just\nmore monsters and levels.\nwhat a load.",
-  "suck it down, asshole!\nyou're a fucking wimp!",
-  "don't quit now! we're \nstill spending your money!",
-
-  // Internal debug. Different style, too.
-  "THIS IS NO MESSAGE!\nPage intentionally left blank."
-};
-
-#endif
-
-  
-
-
diff --git a/games/NXDoom/src/strife/dstrings.h b/games/NXDoom/src/strife/dstrings.h
deleted file mode 100644
index 81115792a..000000000
--- a/games/NXDoom/src/strife/dstrings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:
-//	DOOM strings, by language.
-//
-
-
-#ifndef __DSTRINGS__
-#define __DSTRINGS__
-
-
-// All important printed strings.
-
-#include "d_englsh.h"
-
-// Misc. other strings.
-#define SAVEGAMENAME	"doomsav"
-
-
-// QuitDOOM messages
-// 8 per each game type
-#define NUM_QUITMESSAGES   8
-
-extern const char *doom1_endmsg[];
-extern const char *doom2_endmsg[];
-
-
-#endif
diff --git a/games/NXDoom/src/strife/f_finale.c b/games/NXDoom/src/strife/f_finale.c
deleted file mode 100644
index a6d139938..000000000
--- a/games/NXDoom/src/strife/f_finale.c
+++ /dev/null
@@ -1,1047 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2010 James Haley, Samuel Villarreal
-//
-// 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.
-//
-// DESCRIPTION:
-//	Game completion, final screen animation.
-//
-// [STRIFE] Module marked finished 2010-09-13 22:56
-//
-
-
-#include <stdio.h>
-#include <ctype.h>
-
-// Functions.
-#include "deh_main.h"
-#include "i_system.h"
-#include "i_swap.h"
-#include "z_zone.h"
-#include "v_video.h"
-#include "w_wad.h"
-#include "s_sound.h"
-
-// Data.
-#include "d_main.h"
-#include "dstrings.h"
-#include "sounds.h"
-
-#include "doomstat.h"
-#include "r_state.h"
-
-#include "p_dialog.h" // [STRIFE]
-
-typedef enum
-{
-    F_STAGE_TEXT,
-    F_STAGE_ARTSCREEN,
-    F_STAGE_CAST,
-} finalestage_t;
-
-// ?
-//#include "doomstat.h"
-//#include "r_local.h"
-//#include "f_finale.h"
-
-// Stage of animation:
-finalestage_t finalestage;
-
-unsigned int finalecount;
-
-// haleyjd 09/12/10: [STRIFE] Slideshow variables
-const char   *slideshow_panel;
-unsigned int  slideshow_tics;
-int           slideshow_state;
-
-// haleyjd 09/13/10: [STRIFE] All this is unused.
-/*
-#define	TEXTSPEED	3
-#define	TEXTWAIT	250
-
-typedef struct
-{
-    GameMission_t mission;
-    int episode, level;
-    char *background;
-    char *text;
-} textscreen_t;
-
-static textscreen_t textscreens[] =
-{
-    { doom,      1, 8,  "FLOOR4_8",  E1TEXT},
-    { doom,      2, 8,  "SFLR6_1",   E2TEXT},
-    { doom,      3, 8,  "MFLR8_4",   E3TEXT},
-    { doom,      4, 8,  "MFLR8_3",   E4TEXT},
-
-    { doom2,     1, 6,  "SLIME16",   C1TEXT},
-    { doom2,     1, 11, "RROCK14",   C2TEXT},
-    { doom2,     1, 20, "RROCK07",   C3TEXT},
-    { doom2,     1, 30, "RROCK17",   C4TEXT},
-    { doom2,     1, 15, "RROCK13",   C5TEXT},
-    { doom2,     1, 31, "RROCK19",   C6TEXT},
-
-    { pack_tnt,  1, 6,  "SLIME16",   T1TEXT},
-    { pack_tnt,  1, 11, "RROCK14",   T2TEXT},
-    { pack_tnt,  1, 20, "RROCK07",   T3TEXT},
-    { pack_tnt,  1, 30, "RROCK17",   T4TEXT},
-    { pack_tnt,  1, 15, "RROCK13",   T5TEXT},
-    { pack_tnt,  1, 31, "RROCK19",   T6TEXT},
-
-    { pack_plut, 1, 6,  "SLIME16",   P1TEXT},
-    { pack_plut, 1, 11, "RROCK14",   P2TEXT},
-    { pack_plut, 1, 20, "RROCK07",   P3TEXT},
-    { pack_plut, 1, 30, "RROCK17",   P4TEXT},
-    { pack_plut, 1, 15, "RROCK13",   P5TEXT},
-    { pack_plut, 1, 31, "RROCK19",   P6TEXT},
-};
-
-char*	finaletext;
-char*	finaleflat;
-*/
-
-void	F_StartCast (void);
-void	F_CastTicker (void);
-boolean F_CastResponder (event_t *ev);
-void	F_CastDrawer (void);
-
-// [STRIFE] - Slideshow states enumeration
-enum
-{
-    // Exit states
-    SLIDE_EXITHACK    = -99, // Hacky exit - start a new dialog
-    SLIDE_HACKHACK    =  -9, // Bizarre unused state
-    SLIDE_EXIT        =  -1, // Exit to next finale state
-    SLIDE_CHOCO       =  -2, // haleyjd: This state is Choco-specific... see below.
-
-    // Unknown
-    SLIDE_UNKNOWN     =   0, // Dunno what it's for, possibly unused
-
-    // MAP03 - Macil's Programmer exposition
-    SLIDE_PROGRAMMER1 =   1, 
-    SLIDE_PROGRAMMER2,
-    SLIDE_PROGRAMMER3,
-    SLIDE_PROGRAMMER4, // Next state = -99
-
-    // MAP10 - Macil's Sigil exposition
-    SLIDE_SIGIL1      =   5,
-    SLIDE_SIGIL2,
-    SLIDE_SIGIL3,
-    SLIDE_SIGIL4, // Next state = -99
-
-    // MAP29 - Endings
-    // Good Ending
-    SLIDE_GOODEND1    =  10,
-    SLIDE_GOODEND2,
-    SLIDE_GOODEND3,
-    SLIDE_GOODEND4, // Next state = -1
-
-    // Bad Ending
-    SLIDE_BADEND1     =  14,
-    SLIDE_BADEND2,
-    SLIDE_BADEND3, // Next state = -1
-
-    // Blah Ending
-    SLIDE_BLAHEND1    =  17,
-    SLIDE_BLAHEND2,
-    SLIDE_BLAHEND3, // Next state = -1
-
-    // Demo Ending - haleyjd 20130301: v1.31 only
-    SLIDE_DEMOEND1    =  25,
-    SLIDE_DEMOEND2 // Next state = -1
-};
-
-//
-// F_StartFinale
-//
-// [STRIFE]
-// haleyjd 09/13/10: Modified to drive slideshow sequences.
-//
-void F_StartFinale (void)
-{
-#if 0
-    // haleyjd 20111006: see below...
-    patch_t *panel;
-#endif
-
-    gameaction = ga_nothing;
-    gamestate = GS_FINALE;
-    viewactive = false;
-    automapactive = false;
-    wipegamestate = -1; // [STRIFE]
-
-    // [STRIFE] Setup the slide show
-    slideshow_panel = DEH_String("PANEL0");
-
-    // haleyjd 20111006: These two lines of code *are* in vanilla Strife; 
-    // however, there, they were completely inconsequential due to the dirty
-    // rects system. No intervening V_MarkRect call means PANEL0 was never 
-    // drawn to the framebuffer. In Chocolate Strife, however, with no such
-    // system in place, this only manages to fuck up the fade-out that is
-    // supposed to happen at the beginning of all finales. So, don't do it!
-#if 0
-    panel = (patch_t *)W_CacheLumpName(slideshow_panel, PU_CACHE);
-    V_DrawPatch(0, 0, panel);
-#endif
-
-    switch(gamemap)
-    {
-    case 3:  // Macil's exposition on the Programmer
-        slideshow_state = SLIDE_PROGRAMMER1;
-        break;
-    case 9:  // Super hack for death of Programmer
-        slideshow_state = SLIDE_EXITHACK; 
-        break;
-    case 10: // Macil's exposition on the Sigil
-        slideshow_state = SLIDE_SIGIL1;
-        break;
-    case 29: // Endings
-        if(!netgame)
-        {
-            if(players[0].health <= 0)            // Bad ending 
-                slideshow_state = SLIDE_BADEND1;  // - Humanity goes extinct
-            else
-            {
-                if((players[0].questflags & QF_QUEST25) && // Converter destroyed
-                   (players[0].questflags & QF_QUEST27))   // Computer destroyed (wtf?!)
-                {
-                    // Good ending - You get the hot babe.
-                    slideshow_state = SLIDE_GOODEND1; 
-                }
-                else
-                {
-                    // Blah ending - You win the battle, but fail at life.
-                    slideshow_state = SLIDE_BLAHEND1;
-                }
-            }
-        }
-        break;
-    case 34: // For the demo version ending
-        slideshow_state = SLIDE_EXIT;
-        
-        // haleyjd 20130301: Somebody noticed the demo levels were missing the
-        // ending they used to have in the demo version EXE, I guess. But the
-        // weird thing is, this will only trigger if you run with strife0.wad,
-        // and no released version thereof actually works with the 1.31 EXE
-        // due to differing dialog formats... was there to be an updated demo
-        // that never got released?!
-        if(gameversion == exe_strife_1_31 && isdemoversion)
-            slideshow_state = SLIDE_DEMOEND1;
-        break;
-    }
-
-    S_ChangeMusic(mus_dark, 1);
-    slideshow_tics = 7;
-    finalestage = F_STAGE_TEXT;
-    finalecount = 0;
-}
-
-//
-// F_Responder
-//
-// [STRIFE] Verified unmodified
-//
-boolean F_Responder (event_t *event)
-{
-    if (finalestage == F_STAGE_CAST)
-        return F_CastResponder (event);
-
-    return false;
-}
-
-//
-// F_WaitTicker
-//
-// [STRIFE] New function
-// haleyjd 09/13/10: This is called from G_Ticker if gamestate is 1, but we
-// have no idea for what it's supposed to be. It is unused.
-//
-void F_WaitTicker(void)
-{
-    if(++finalecount >= 250)
-    {
-        gamestate   = GS_FINALE;
-        finalestage = 0;
-        finalecount = 0;
-    }
-}
-
-// 
-// F_DoSlideShow
-//
-// [STRIFE] New function
-// haleyjd 09/13/10: Handles slideshow states. Begging to be tabulated!
-//
-static void F_DoSlideShow(void)
-{
-    patch_t *patch;
-
-    switch(slideshow_state)
-    {
-    case SLIDE_UNKNOWN: // state #0, seems to be unused
-        slideshow_tics = 700;
-        slideshow_state = SLIDE_EXIT;
-        // falls through into state 1, so above is pointless? ...
-
-    case SLIDE_PROGRAMMER1: // state #1
-        slideshow_panel = DEH_String("SS2F1");
-        I_StartVoice(DEH_String("MAC10"));
-        slideshow_state = SLIDE_PROGRAMMER2;
-        slideshow_tics = 315;
-        break;
-    case SLIDE_PROGRAMMER2: // state #2
-        slideshow_panel = DEH_String("SS2F2");
-        I_StartVoice(DEH_String("MAC11"));
-        slideshow_state = SLIDE_PROGRAMMER3;
-        slideshow_tics = 350;
-        break;
-    case SLIDE_PROGRAMMER3: // state #3
-        slideshow_panel = DEH_String("SS2F3");
-        I_StartVoice(DEH_String("MAC12"));
-        slideshow_state = SLIDE_PROGRAMMER4;
-        slideshow_tics = 420;
-        break;
-    case SLIDE_PROGRAMMER4: // state #4
-        slideshow_panel = DEH_String("SS2F4");
-        I_StartVoice(DEH_String("MAC13"));
-        slideshow_state = SLIDE_EXITHACK; // End of slides
-        slideshow_tics = 595;
-        break;
-
-    case SLIDE_SIGIL1: // state #5
-        slideshow_panel = DEH_String("SS3F1");
-        I_StartVoice(DEH_String("MAC16"));
-        slideshow_state = SLIDE_SIGIL2;
-        slideshow_tics = 350;
-        break;
-    case SLIDE_SIGIL2: // state #6
-        slideshow_panel = DEH_String("SS3F2");
-        I_StartVoice(DEH_String("MAC17"));
-        slideshow_state = SLIDE_SIGIL3;
-        slideshow_tics = 420;
-        break;
-    case SLIDE_SIGIL3: // state #7
-        slideshow_panel = DEH_String("SS3F3");
-        I_StartVoice(DEH_String("MAC18"));
-        slideshow_tics = 420;
-        slideshow_state = SLIDE_SIGIL4;
-        break;
-    case SLIDE_SIGIL4: // state #8
-        slideshow_panel = DEH_String("SS3F4");
-        I_StartVoice(DEH_String("MAC19"));
-        slideshow_tics = 385;
-        slideshow_state = SLIDE_EXITHACK; // End of slides
-        break;
-
-    case SLIDE_GOODEND1: // state #10
-        slideshow_panel = DEH_String("SS4F1");
-        S_StartMusic(mus_happy);
-        I_StartVoice(DEH_String("RIE01"));
-        slideshow_state = SLIDE_GOODEND2;
-        slideshow_tics = 455;
-        break;
-    case SLIDE_GOODEND2: // state #11
-        slideshow_panel = DEH_String("SS4F2");
-        I_StartVoice(DEH_String("BBX01"));
-        slideshow_state = SLIDE_GOODEND3;
-        slideshow_tics = 385;
-        break;
-    case SLIDE_GOODEND3: // state #12
-        slideshow_panel = DEH_String("SS4F3");
-        I_StartVoice(DEH_String("BBX02"));
-        slideshow_state = SLIDE_GOODEND4;
-        slideshow_tics = 490;
-        break;
-    case SLIDE_GOODEND4: // state #13
-        slideshow_panel = DEH_String("SS4F4");
-        slideshow_state = SLIDE_EXIT; // Go to end credits
-        slideshow_tics = 980;
-        break;
-
-    case SLIDE_BADEND1: // state #14
-        S_StartMusic(mus_sad);
-        slideshow_panel = DEH_String("SS5F1");
-        I_StartVoice(DEH_String("SS501b"));
-        slideshow_state = SLIDE_BADEND2;
-        slideshow_tics = 385;
-        break;
-    case SLIDE_BADEND2: // state #15
-        slideshow_panel = DEH_String("SS5F2");
-        I_StartVoice(DEH_String("SS502b"));
-        slideshow_state = SLIDE_BADEND3;
-        slideshow_tics = 350;
-        break;
-    case SLIDE_BADEND3: // state #16
-        slideshow_panel = DEH_String("SS5F3");
-        I_StartVoice(DEH_String("SS503b"));
-        slideshow_state = SLIDE_EXIT; // Go to end credits
-        slideshow_tics = 385;
-        break;
-
-    case SLIDE_BLAHEND1: // state #17
-        S_StartMusic(mus_end);
-        slideshow_panel = DEH_String("SS6F1");
-        I_StartVoice(DEH_String("SS601A"));
-        slideshow_state = SLIDE_BLAHEND2;
-        slideshow_tics = 280;
-        break;
-    case SLIDE_BLAHEND2: // state #18
-        S_StartMusic(mus_end);
-        slideshow_panel = DEH_String("SS6F2");
-        I_StartVoice(DEH_String("SS602A"));
-        slideshow_state = SLIDE_BLAHEND3;
-        slideshow_tics = 280;
-        break;
-    case SLIDE_BLAHEND3: // state #19
-        S_StartMusic(mus_end);
-        slideshow_panel = DEH_String("SS6F3");
-        I_StartVoice(DEH_String("SS603A"));
-        slideshow_state = SLIDE_EXIT; // Go to credits
-        slideshow_tics = 315;
-        break;
-
-    case SLIDE_DEMOEND1: // state #25 - only exists in 1.31
-        slideshow_panel = DEH_String("PANEL7");
-        slideshow_tics = 175;
-        slideshow_state = SLIDE_DEMOEND2;
-        break;
-    case SLIDE_DEMOEND2: // state #26 - ditto
-        slideshow_panel = DEH_String("VELLOGO");
-        slideshow_tics = 175;
-        slideshow_state = SLIDE_EXIT; // Go to end credits
-        break;
-
-    case SLIDE_EXITHACK: // state -99: super hack state
-        gamestate = GS_LEVEL;
-        P_DialogStartP1();
-        break;
-    case SLIDE_HACKHACK: // state -9: unknown bizarre unused state
-        S_StartSound(NULL, sfx_rifle);
-        slideshow_tics = 3150;
-        break;
-    case SLIDE_EXIT: // state -1: proceed to next finale stage
-        finalecount = 0;
-        finalestage = F_STAGE_ARTSCREEN;
-        wipegamestate = -1;
-        S_StartMusic(mus_fast);
-        // haleyjd 20130301: The ONLY glitch fixed in 1.31 of Strife
-        // *would* be something this insignificant, of course!
-        if(gameversion != exe_strife_1_31)
-            slideshow_state = SLIDE_CHOCO; // haleyjd: see below...
-        break;
-    case SLIDE_CHOCO: 
-        // haleyjd 09/14/10: This wouldn't be necessary except that Choco
-        // doesn't support the V_MarkRect dirty rectangles system. This
-        // just so happens to have hidden the fact that the ending
-        // does a screenfade every ~19 seconds due to remaining stuck in
-        // SLIDE_EXIT state above, UNLESS the menus were active - the
-        // V_MarkRect calls in the menu system cause it to be visible. 
-        // This means that in order to get the same behavior as the vanilla
-        // EXE, I need different code. So, come to this state and only set 
-        // wipegamestate if menuactive is true.
-        finalecount = 0;
-        finalestage = F_STAGE_ARTSCREEN;
-        if(menuactive)
-            wipegamestate = -1;
-        S_StartMusic(mus_fast);
-        slideshow_state = SLIDE_CHOCO; // remain here.
-        break;
-    default:
-        break;
-    }
-
-    finalecount = 0;
-    if(gameversion != exe_strife_1_31) // See above. This was removed in 1.31.
-    {
-       patch = (patch_t *)W_CacheLumpName(DEH_String("PANEL0"), PU_CACHE);
-       V_DrawPatch(0, 0, patch);
-    }
-}
-
-//
-// F_Ticker
-//
-// [STRIFE] Modifications for new finales
-// haleyjd 09/13/10: Calls F_DoSlideShow
-//
-void F_Ticker (void)
-{
-    size_t          i;
-
-    // check for skipping
-    if (finalecount > 50) // [STRIFE] No commercial check
-    {
-        // go on to the next level
-        for (i=0 ; i<MAXPLAYERS ; i++)
-            if (players[i].cmd.buttons)
-                break;
-
-        if (i < MAXPLAYERS)
-            finalecount = slideshow_tics; // [STRIFE]
-    }
-    
-    // advance animation
-    finalecount++;
-
-    if (finalestage == F_STAGE_CAST)
-        F_CastTicker ();
-    else if(finalecount > slideshow_tics) // [STRIFE] Advance slideshow
-        F_DoSlideShow();
-
-    // [STRIFE]: Rest is unused
-    /*
-    if ( gamemode == commercial)
-        return;
-
-    if (finalestage == F_STAGE_TEXT
-        && finalecount>strlen (finaletext)*TEXTSPEED + TEXTWAIT)
-    {
-        finalecount = 0;
-        finalestage = F_STAGE_ARTSCREEN;
-        wipegamestate = -1;		// force a wipe
-        if (gameepisode == 3)
-            S_StartMusic (mus_logo);
-    }
-    */
-}
-
-// haleyjd 09/13/10: Not present in Strife: Cast drawing functions
-
-#include "hu_stuff.h"
-
-/*
-//
-// F_TextWrite
-//
-void F_TextWrite (void)
-{
-    byte*	src;
-    byte*	dest;
-    
-    int		x,y,w;
-    signed int	count;
-    char*	ch;
-    int		c;
-    int		cx;
-    int		cy;
-    
-    // erase the entire screen to a tiled background
-    src = W_CacheLumpName ( finaleflat , PU_CACHE);
-    dest = I_VideoBuffer;
-	
-    for (y=0 ; y<SCREENHEIGHT ; y++)
-    {
-	for (x=0 ; x<SCREENWIDTH/64 ; x++)
-	{
-	    memcpy (dest, src+((y&63)<<6), 64);
-	    dest += 64;
-	}
-	if (SCREENWIDTH&63)
-	{
-	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63);
-	    dest += (SCREENWIDTH&63);
-	}
-    }
-
-    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
-    
-    // draw some of the text onto the screen
-    cx = 10;
-    cy = 10;
-    ch = finaletext;
-	
-    count = ((signed int) finalecount - 10) / TEXTSPEED;
-    if (count < 0)
-	count = 0;
-    for ( ; count ; count-- )
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	if (c == '\n')
-	{
-	    cx = 10;
-	    cy += 11;
-	    continue;
-	}
-		
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c> HU_FONTSIZE)
-	{
-	    cx += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	if (cx+w > SCREENWIDTH)
-	    break;
-	V_DrawPatch(cx, cy, hu_font[c]);
-	cx+=w;
-    }
-	
-}
-*/
-
-//
-// Final DOOM 2 animation
-// Casting by id Software.
-//   in order of appearance
-//
-typedef struct
-{
-    int         isindemo; // [STRIFE] Changed from name, which is in mobjinfo
-    mobjtype_t  type;
-} castinfo_t;
-
-// haleyjd: [STRIFE] A new cast order was defined, however it is unused in any
-// of the released versions of Strife, even including the demo version :(
-castinfo_t      castorder[] = {
-    { 1, MT_PLAYER     },
-    { 1, MT_BEGGAR1    },
-    { 1, MT_PEASANT2_A },
-    { 1, MT_REBEL1     },
-    { 1, MT_GUARD1     },
-    { 1, MT_CRUSADER   },
-    { 1, MT_RLEADER2   },
-    { 0, MT_SENTINEL   },
-    { 0, MT_STALKER    },
-    { 0, MT_PROGRAMMER },
-    { 0, MT_REAVER     },
-    { 0, MT_PGUARD     },
-    { 0, MT_INQUISITOR },
-    { 0, MT_PRIEST     },
-    { 0, MT_SPECTRE_A  },
-    { 0, MT_BISHOP     },
-    { 0, MT_ENTITY     },
-    { 1, NUMMOBJTYPES  }
-};
-
-int		castnum;
-int		casttics;
-state_t*	caststate;
-boolean		castdeath;
-int		castframes;
-int		castonmelee;
-boolean		castattacking;
-
-//
-// F_StartCast
-//
-// haleyjd 09/13/10: [STRIFE] Heavily modified, yet unused.
-// Evidence suggests this was meant to be started from a menu item.
-// See m_menu.c for more info.
-//
-void F_StartCast (void)
-{
-    usergame = false;
-    gameaction = ga_nothing;
-    viewactive = false;
-    automapactive = false;
-    castnum = 0;
-    gamestate = GS_FINALE;
-    caststate = &states[mobjinfo[castorder[castnum].type].seestate];
-    casttics = caststate->tics;
-    if(casttics > 50)
-        casttics = 50;
-    wipegamestate = -1;             // force a screen wipe
-    castdeath = false;
-    finalestage = F_STAGE_CAST;
-    castframes = 0;
-    castonmelee = 0;
-    castattacking = false;
-}
-
-
-//
-// F_CastTicker
-//
-// [STRIFE] Heavily modified, but unused.
-// haleyjd 09/13/10: Yeah, I bothered translating this even though it isn't
-// going to be seen, in part because I hope some Strife port or another will
-// pick it up and finish it, adding it as the optional menu item it was 
-// meant to be, or just adding it as part of the ending sequence.
-//
-void F_CastTicker (void)
-{
-    int         st;
-
-    if (--casttics > 0)
-        return;                  // not time to change state yet
-
-    if (caststate->tics == -1 || caststate->nextstate == S_NULL)
-    {
-        // switch from deathstate to next monster
-        castnum++;
-        castdeath = false;
-        if (isdemoversion)
-        {
-            // [STRIFE] Demo version had a shorter cast
-            if(!castorder[castnum].isindemo)
-                castnum = 0;
-        }
-        // [STRIFE] Break on type == NUMMOBJTYPES rather than name == NULL
-        if (castorder[castnum].type == NUMMOBJTYPES)
-            castnum = 0;
-        if (mobjinfo[castorder[castnum].type].seesound)
-            S_StartSound (NULL, mobjinfo[castorder[castnum].type].seesound);
-        caststate = &states[mobjinfo[castorder[castnum].type].seestate];
-        castframes = 0;
-    }
-    else
-    {
-        int sfx = 0;
-
-        // just advance to next state in animation
-        if (caststate == &states[S_PLAY_05])    // villsa [STRIFE] - updated
-            goto stopattack;	// Oh, gross hack!
-        st = caststate->nextstate;
-        caststate = &states[st];
-        castframes++;
-
-        if (st != mobjinfo[castorder[castnum].type].meleestate &&
-            st != mobjinfo[castorder[castnum].type].missilestate)
-        {
-            if (st == S_PLAY_05)
-                sfx = sfx_rifle;
-            else
-                sfx = 0;
-        }
-        else
-            sfx = mobjinfo[castorder[castnum].type].attacksound;
-
-        if (sfx)
-            S_StartSound (NULL, sfx);
-    }
-
-    if (!castdeath && castframes == 12)
-    {
-        // go into attack frame
-        castattacking = true;
-        if (castonmelee)
-            caststate=&states[mobjinfo[castorder[castnum].type].meleestate];
-        else
-            caststate=&states[mobjinfo[castorder[castnum].type].missilestate];
-        castonmelee ^= 1;
-        if (caststate == &states[S_NULL])
-        {
-            if (castonmelee)
-                caststate = &states[mobjinfo[castorder[castnum].type].meleestate];
-            else
-                caststate = &states[mobjinfo[castorder[castnum].type].missilestate];
-        }
-    }
-
-    if (castattacking)
-    {
-        if (castframes == 24
-            ||	caststate == &states[mobjinfo[castorder[castnum].type].seestate] )
-        {
-stopattack:
-            castattacking = false;
-            castframes = 0;
-            caststate = &states[mobjinfo[castorder[castnum].type].seestate];
-        }
-    }
-
-    casttics = caststate->tics;
-    if (casttics > 50) // [STRIFE] Cap tics
-        casttics = 50;
-    else if (casttics == -1)
-        casttics = 15;
-}
-
-
-//
-// F_CastResponder
-//
-// [STRIFE] This still exists in Strife but is never used.
-// It was used at some point in development, however, as they made
-// numerous modifications to the cast call system.
-//
-boolean F_CastResponder (event_t* ev)
-{
-    if (ev->type != ev_keydown)
-        return false;
-
-    if (castdeath)
-        return true;                    // already in dying frames
-
-    // go into death frame
-    castdeath = true;
-    caststate = &states[mobjinfo[castorder[castnum].type].deathstate];
-    casttics = caststate->tics;
-    if(casttics > 50) // [STRIFE] Upper bound on casttics
-        casttics = 50;
-    castframes = 0;
-    castattacking = false;
-    if (mobjinfo[castorder[castnum].type].deathsound)
-        S_StartSound (NULL, mobjinfo[castorder[castnum].type].deathsound);
-
-    return true;
-}
-
-//
-// F_CastPrint
-//
-// [STRIFE] Verified unmodified, and unused.
-//
-void F_CastPrint (char* text)
-{
-    char*	ch;
-    int		c;
-    int		cx;
-    int		w;
-    int		width;
-    
-    // find width
-    ch = text;
-    width = 0;
-	
-    while (ch)
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c> HU_FONTSIZE)
-	{
-	    width += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	width += w;
-    }
-    
-    // draw it
-    cx = 160-width/2;
-    ch = text;
-    while (ch)
-    {
-	c = *ch++;
-	if (!c)
-	    break;
-	c = toupper(c) - HU_FONTSTART;
-	if (c < 0 || c> HU_FONTSIZE)
-	{
-	    cx += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	V_DrawPatch(cx, 180, hu_font[c]);
-	cx+=w;
-    }
-	
-}
-
-// haleyjd 09/13/10: [STRIFE] Unfortunately they removed whatever was
-// partway finished of this function from the binary, as there is no
-// trace of it. This means we cannot know for sure what the cast call
-// would have looked like. :(
-/*
-//
-// F_CastDrawer
-//
-void F_CastDrawer (void)
-{
-    spritedef_t*	sprdef;
-    spriteframe_t*	sprframe;
-    int			lump;
-    boolean		flip;
-    patch_t*		patch;
-    
-    // erase the entire screen to a background
-    V_DrawPatch (0, 0, W_CacheLumpName (DEH_String("BOSSBACK"), PU_CACHE));
-
-    F_CastPrint (DEH_String(castorder[castnum].name));
-    
-    // draw the current frame in the middle of the screen
-    sprdef = &sprites[caststate->sprite];
-    sprframe = &sprdef->spriteframes[ caststate->frame & FF_FRAMEMASK];
-    lump = sprframe->lump[0];
-    flip = (boolean)sprframe->flip[0];
-			
-    patch = W_CacheLumpNum (lump+firstspritelump, PU_CACHE);
-    if (flip)
-	V_DrawPatchFlipped(160, 170, patch);
-    else
-	V_DrawPatch(160, 170, patch);
-}
-*/
-
-#ifdef STRIFE_DEMO_CODE
-//
-// F_DrawPatchCol
-//
-// [STRIFE] Verified unmodified, but not present in 1.2
-// It WAS present in the demo version, however...
-//
-void
-F_DrawPatchCol
-( int		x,
-  patch_t*	patch,
-  int		col )
-{
-    column_t*	column;
-    byte*	source;
-    byte*	dest;
-    byte*	desttop;
-    int		count;
-	
-    column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
-    desttop = I_VideoBuffer + x;
-
-    // step through the posts in a column
-    while (column->topdelta != 0xff )
-    {
-	source = (byte *)column + 3;
-	dest = desttop + column->topdelta*SCREENWIDTH;
-	count = column->length;
-		
-	while (count--)
-	{
-	    *dest = *source++;
-	    dest += SCREENWIDTH;
-	}
-	column = (column_t *)(  (byte *)column + column->length + 4 );
-    }
-}
-#endif
-
-//
-// F_DrawMap34End
-//
-// [STRIFE] Modified from F_BunnyScroll
-// * In 1.2 and up this just causes a weird black screen.
-// * In the demo version, it was an actual scroll between two screens.
-// I have implemented both code segments, though only the black screen
-// one will currently be used, as full demo version support isn't looking
-// likely right now.
-//
-void F_DrawMap34End (void)
-{
-    signed int  scrolled;
-    int         x;
-//    patch_t*    p1;
-//    patch_t*    p2;
-
-//    p1 = W_CacheLumpName (DEH_String("credit"),  PU_LEVEL);
-//    p2 = W_CacheLumpName (DEH_String("vellogo"), PU_LEVEL);
-
-    V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
-
-
-    scrolled = (320 - ((signed int) finalecount-430)/2);
-    if (scrolled > 320)
-        scrolled = 320;
-    if (scrolled < 0)
-        scrolled = 0;
-
-#ifdef STRIFE_DEMO_CODE
-    for ( x=0 ; x<SCREENWIDTH ; x++)
-    {
-        if (x+scrolled < 320)
-            F_DrawPatchCol (x, p1, x+scrolled);
-        else
-            F_DrawPatchCol (x, p2, x+scrolled - 320);
-    }
-#else
-    // wtf this is supposed to do, I have no idea!
-    x = 1;
-    do
-    {
-        x += 11;
-    }
-    while(x < 320);
-#endif
-}
-
-// haleyjd 09/13/10: [STRIFE] Unused.
-/*
-static void F_ArtScreenDrawer(void)
-{
-    char *lumpname;
-    
-    if (gameepisode == 3)
-    {
-        F_BunnyScroll();
-    }
-    else
-    {
-        switch (gameepisode)
-        {
-            case 1:
-                if (gamemode == retail)
-                {
-                    lumpname = "CREDIT";
-                }
-                else
-                {
-                    lumpname = "HELP2";
-                }
-                break;
-            case 2:
-                lumpname = "VICTORY2";
-                break;
-            case 4:
-                lumpname = "ENDPIC";
-                break;
-            default:
-                return;
-        }
-
-        lumpname = DEH_String(lumpname);
-
-        V_DrawPatch (0, 0, W_CacheLumpName(lumpname, PU_CACHE));
-    }
-}
-*/
-
-//
-// F_Drawer
-//
-// [STRIFE]
-// haleyjd 09/13/10: Modified for slideshow, demo version, etc.
-//
-void F_Drawer (void)
-{
-    switch (finalestage)
-    {
-    case F_STAGE_CAST:
-        // Cast didn't have a drawer in any released version
-        //F_CastDrawer();
-        break;
-    case F_STAGE_TEXT:
-        // Draw slideshow panel
-        {
-            patch_t *slide = W_CacheLumpName(slideshow_panel, PU_CACHE);
-            V_DrawPatch(0, 0, slide);
-        }
-        break;
-    case F_STAGE_ARTSCREEN:
-        if(gamemap <= 29)
-        {
-            // draw credits
-            patch_t *credits = W_CacheLumpName(DEH_String("CREDIT"), PU_CACHE);
-            V_DrawPatch(0, 0, credits);
-        }
-        else if(gamemap == 34)
-        {
-            // demo version - does nothing meaningful in the final version
-            F_DrawMap34End();
-        }
-        break;
-    }
-}
-
diff --git a/games/NXDoom/src/strife/f_finale.h b/games/NXDoom/src/strife/f_finale.h
deleted file mode 100644
index 438083987..000000000
--- a/games/NXDoom/src/strife/f_finale.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//    
-
-
-#ifndef __F_FINALE__
-#define __F_FINALE__
-
-
-#include "doomtype.h"
-#include "d_event.h"
-//
-// FINALE
-//
-
-// Called by main loop.
-boolean F_Responder (event_t* ev);
-
-// Called by main loop.
-void F_Ticker (void);
-
-// haleyjd: [STRIFE] Called from G_Ticker as well...
-void F_WaitTicker(void);
-
-// Called by main loop.
-void F_Drawer (void);
-
-
-void F_StartFinale (void);
-
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/f_wipe.c b/games/NXDoom/src/strife/f_wipe.c
deleted file mode 100644
index 4e5176f51..000000000
--- a/games/NXDoom/src/strife/f_wipe.c
+++ /dev/null
@@ -1,292 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Mission begin melt/wipe screen special effect.
-//
-
-#include <string.h>
-
-#include "z_zone.h"
-#include "i_video.h"
-#include "v_video.h"
-#include "m_random.h"
-
-#include "doomtype.h"
-
-#include "r_defs.h"   // haleyjd [STRIFE]
-#include "r_draw.h"
-
-#include "f_wipe.h"
-
-//
-//                       SCREEN WIPE PACKAGE
-//
-
-// when zero, stop the wipe
-static boolean	go = 0;
-
-static byte*	wipe_scr_start;
-static byte*	wipe_scr_end;
-static byte*	wipe_scr;
-
-
-void
-wipe_shittyColMajorXform
-( short*	array,
-  int		width,
-  int		height )
-{
-    int		x;
-    int		y;
-    short*	dest;
-
-    dest = (short*) Z_Malloc(width*height*2, PU_STATIC, 0);
-
-    for(y=0;y<height;y++)
-	for(x=0;x<width;x++)
-	    dest[x*height+y] = array[y*width+x];
-
-    memcpy(array, dest, width*height*2);
-
-    Z_Free(dest);
-
-}
-
-// haleyjd 08/26/10: [STRIFE] Verified unmodified.
-int
-wipe_initColorXForm
-( int	width,
-  int	height,
-  int	ticks )
-{
-    memcpy(wipe_scr, wipe_scr_start, width*height);
-    return 0;
-}
-
-//
-// wipe_doColorXForm
-//
-// haleyjd 08/26/10: [STRIFE]
-// * Rogue modified the unused ColorXForm wipe in-place in order to implement 
-//   their distinctive crossfade wipe.
-//
-int
-wipe_doColorXForm
-( int	width,
-  int	height,
-  int	ticks )
-{
-    byte *cur_screen = wipe_scr;
-    byte *end_screen = wipe_scr_end;
-    int   pix = width*height;
-    int   i;
-    boolean changed = false;
-
-    for(i = pix; i > 0; i--)
-    {
-        if(*cur_screen != *end_screen)
-        {
-            changed = true;
-            *cur_screen = xlatab[(*cur_screen << 8) + *end_screen];
-        }
-        ++cur_screen;
-        ++end_screen;
-    }
-
-    return !changed;
-}
-
-// haleyjd 08/26/10: [STRIFE] Verified unmodified.
-int
-wipe_exitColorXForm
-( int	width,
-  int	height,
-  int	ticks )
-{
-    return 0;
-}
-
-
-static int*	y;
-
-int
-wipe_initMelt
-( int	width,
-  int	height,
-  int	ticks )
-{
-    int i, r;
-    
-    // copy start screen to main screen
-    memcpy(wipe_scr, wipe_scr_start, width*height);
-    
-    // makes this wipe faster (in theory)
-    // to have stuff in column-major format
-    wipe_shittyColMajorXform((short*)wipe_scr_start, width/2, height);
-    wipe_shittyColMajorXform((short*)wipe_scr_end, width/2, height);
-    
-    // setup initial column positions
-    // (y<0 => not ready to scroll yet)
-    y = (int *) Z_Malloc(width*sizeof(int), PU_STATIC, 0);
-    y[0] = -(M_Random()%16);
-    for (i=1;i<width;i++)
-    {
-	r = (M_Random()%3) - 1;
-	y[i] = y[i-1] + r;
-	if (y[i] > 0) y[i] = 0;
-	else if (y[i] == -16) y[i] = -15;
-    }
-
-    return 0;
-}
-
-int
-wipe_doMelt
-( int	width,
-  int	height,
-  int	ticks )
-{
-    int		i;
-    int		j;
-    int		dy;
-    int		idx;
-    
-    short*	s;
-    short*	d;
-    boolean	done = true;
-
-    width/=2;
-
-    while (ticks--)
-    {
-	for (i=0;i<width;i++)
-	{
-	    if (y[i]<0)
-	    {
-		y[i]++; done = false;
-	    }
-	    else if (y[i] < height)
-	    {
-		dy = (y[i] < 16) ? y[i]+1 : 8;
-		if (y[i]+dy >= height) dy = height - y[i];
-		s = &((short *)wipe_scr_end)[i*height+y[i]];
-		d = &((short *)wipe_scr)[y[i]*width+i];
-		idx = 0;
-		for (j=dy;j;j--)
-		{
-		    d[idx] = *(s++);
-		    idx += width;
-		}
-		y[i] += dy;
-		s = &((short *)wipe_scr_start)[i*height];
-		d = &((short *)wipe_scr)[y[i]*width+i];
-		idx = 0;
-		for (j=height-y[i];j;j--)
-		{
-		    d[idx] = *(s++);
-		    idx += width;
-		}
-		done = false;
-	    }
-	}
-    }
-
-    return done;
-
-}
-
-int
-wipe_exitMelt
-( int	width,
-  int	height,
-  int	ticks )
-{
-    Z_Free(y);
-    Z_Free(wipe_scr_start);
-    Z_Free(wipe_scr_end);
-    return 0;
-}
-
-// haleyjd 08/26/10: [STRIFE] Verified unmodified.
-int
-wipe_StartScreen
-( int	x,
-  int	y,
-  int	width,
-  int	height )
-{
-    wipe_scr_start = Z_Malloc(SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
-    I_ReadScreen(wipe_scr_start);
-    return 0;
-}
-
-// haleyjd 08/26/10: [STRIFE] Verified unmodified.
-int
-wipe_EndScreen
-( int	x,
-  int	y,
-  int	width,
-  int	height )
-{
-    wipe_scr_end = Z_Malloc(SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
-    I_ReadScreen(wipe_scr_end);
-    V_DrawBlock(x, y, width, height, wipe_scr_start); // restore start scr.
-    return 0;
-}
-
-// haleyjd 08/26/10: [STRIFE] Verified unmodified.
-int
-wipe_ScreenWipe
-( int	wipeno,
-  int	x,
-  int	y,
-  int	width,
-  int	height,
-  int	ticks )
-{
-    int rc;
-    static int (*wipes[])(int, int, int) =
-    {
-	wipe_initColorXForm, wipe_doColorXForm, wipe_exitColorXForm,
-	wipe_initMelt, wipe_doMelt, wipe_exitMelt
-    };
-
-    // initial stuff
-    if (!go)
-    {
-	go = 1;
-        // haleyjd 20110629 [STRIFE]: We *must* use a temp buffer here.
-	wipe_scr = (byte *) Z_Malloc(width*height, PU_STATIC, 0); // DEBUG
-	//wipe_scr = I_VideoBuffer;
-	(*wipes[wipeno*3])(width, height, ticks);
-    }
-
-    // do a piece of wipe-in
-    V_MarkRect(0, 0, width, height);
-    rc = (*wipes[wipeno*3+1])(width, height, ticks);
-
-    // haleyjd 20110629 [STRIFE]: Copy temp buffer to the real screen.
-    V_DrawBlock(x, y, width, height, wipe_scr);
-
-    // final stuff
-    if (rc)
-    {
-	go = 0;
-	(*wipes[wipeno*3+2])(width, height, ticks);
-    }
-
-    return !go;
-}
-
diff --git a/games/NXDoom/src/strife/f_wipe.h b/games/NXDoom/src/strife/f_wipe.h
deleted file mode 100644
index 6ffd05872..000000000
--- a/games/NXDoom/src/strife/f_wipe.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Mission start screen wipe/melt, special effects.
-//	
-
-
-#ifndef __F_WIPE_H__
-#define __F_WIPE_H__
-
-//
-//                       SCREEN WIPE PACKAGE
-//
-
-enum
-{
-    // [STRIFE]: ColorXForm reimplemented as a proper crossfade
-    wipe_ColorXForm,
-    
-    // weird screen melt
-    wipe_Melt,	
-
-    wipe_NUMWIPES
-};
-
-int
-wipe_StartScreen
-( int		x,
-  int		y,
-  int		width,
-  int		height );
-
-
-int
-wipe_EndScreen
-( int		x,
-  int		y,
-  int		width,
-  int		height );
-
-
-int
-wipe_ScreenWipe
-( int		wipeno,
-  int		x,
-  int		y,
-  int		width,
-  int		height,
-  int		ticks );
-
-#endif
diff --git a/games/NXDoom/src/strife/g_game.c b/games/NXDoom/src/strife/g_game.c
deleted file mode 100644
index 50faee1c8..000000000
--- a/games/NXDoom/src/strife/g_game.c
+++ /dev/null
@@ -1,2534 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
-
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "doomdef.h" 
-#include "doomkeys.h"
-#include "doomstat.h"
-
-#include "deh_main.h"
-#include "deh_misc.h"
-#include "z_zone.h"
-#include "f_finale.h"
-#include "m_argv.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "m_menu.h"
-#include "m_misc.h"
-#include "m_saves.h" // STRIFE
-#include "m_random.h"
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "p_setup.h"
-#include "p_saveg.h"
-#include "p_tick.h"
-#include "d_main.h"
-#include "wi_stuff.h"
-#include "hu_stuff.h"
-#include "st_stuff.h"
-#include "am_map.h"
-
-// Needs access to LFB.
-#include "v_video.h"
-
-#include "w_wad.h"
-
-#include "p_local.h" 
-
-#include "s_sound.h"
-
-// Data.
-#include "dstrings.h"
-#include "sounds.h"
-
-// SKY handling - still the wrong place.
-#include "r_data.h"
-#include "r_sky.h"
-
-#include "p_dialog.h"   // villsa [STRIFE]
-
-#include "g_game.h"
-
-
-#define SAVEGAMESIZE	0x2c000
-
-void	G_ReadDemoTiccmd (ticcmd_t* cmd); 
-void	G_WriteDemoTiccmd (ticcmd_t* cmd); 
-void	G_PlayerReborn (int player); 
- 
-void	G_DoReborn (int playernum); 
- 
-void	G_DoLoadLevel (void); 
-void	G_DoNewGame (void); 
-void	G_DoPlayDemo (void); 
-void	G_DoCompleted (void); 
-void	G_DoVictory (void); 
-void	G_DoWorldDone (void); 
-void	G_DoSaveGame (char *path); 
- 
-// Gamestate the last time G_Ticker was called.
-
-gamestate_t     oldgamestate; 
- 
-gameaction_t    gameaction; 
-gamestate_t     gamestate; 
-skill_t         gameskill = 2; // [STRIFE] Default value set to 2.
-boolean         respawnmonsters;
-//int             gameepisode; 
-int             gamemap;
-
-// haleyjd 08/24/10: [STRIFE] New variables
-int             destmap;   // current destination map when exiting
-int             riftdest;  // destination spot for player
-angle_t         riftangle; // player angle saved during exit
-
-// If non-zero, exit the level after this number of minutes.
-
-int             timelimit;
-
-boolean         paused; 
-boolean         sendpause;              // send a pause event next tic 
-boolean         sendsave;               // send a save event next tic 
-boolean         usergame;               // ok to save / end game 
- 
-boolean         timingdemo;             // if true, exit with report on completion 
-boolean         nodrawers;              // for comparative timing purposes 
-int             starttime;              // for comparative timing purposes 
- 
-boolean         viewactive; 
- 
-int             deathmatch;             // only if started as net death 
-boolean         netgame;                // only true if packets are broadcast 
-boolean         playeringame[MAXPLAYERS]; 
-player_t        players[MAXPLAYERS]; 
-
-boolean         turbodetected[MAXPLAYERS];
- 
-int             consoleplayer;          // player taking events and displaying 
-int             displayplayer;          // view being displayed 
-int             levelstarttic;          // gametic at level start 
-int             totalkills, /*totalitems,*/ totalsecret;    // for intermission 
- 
-char           *demoname;
-boolean         demorecording; 
-boolean         longtics;               // cph's doom 1.91 longtics hack
-boolean         lowres_turn;            // low resolution turning for longtics
-boolean         demoplayback; 
-boolean		netdemo; 
-byte*		demobuffer;
-byte*		demo_p;
-byte*		demoend; 
-boolean         singledemo;             // quit after playing a demo from cmdline 
- 
-boolean         precache = true;        // if true, load all graphics at start 
-
-boolean         testcontrols = false;    // Invoked by setup to test controls
- 
-wbstartstruct_t wminfo;                 // parms for world map / intermission 
- 
-byte            consistancy[MAXPLAYERS][BACKUPTICS]; 
- 
-#define MAXPLMOVE		(forwardmove[1]) 
- 
-#define TURBOTHRESHOLD	0x32
-
-fixed_t         forwardmove[2] = {0x19, 0x32}; 
-fixed_t         sidemove[2] = {0x18, 0x28}; 
-fixed_t         angleturn[3] = {640, 1280, 320};    // + slow turn 
-
-int mouse_fire_countdown = 0;    // villsa [STRIFE]
-int joystick_fire_countdown = 0;
-
-static int *weapon_keys[] = {
-    &key_weapon1,
-    &key_weapon2,
-    &key_weapon3,
-    &key_weapon4,
-    &key_weapon5,
-    &key_weapon6,
-    &key_weapon7,
-    &key_weapon8
-};
-
-// Set to -1 or +1 to switch to the previous or next weapon.
-
-static int next_weapon = 0;
-
-// Used for prev/next weapon keys.
-// STRIFE-TODO: Check this table makes sense.
-
-static const struct
-{
-    weapontype_t weapon;
-    weapontype_t weapon_num;
-} weapon_order_table[] = {
-    { wp_fist,                  wp_fist },
-    { wp_poisonbow,             wp_elecbow },
-    { wp_elecbow,               wp_elecbow },
-    { wp_rifle,                 wp_rifle },
-    { wp_missile,               wp_missile },
-    { wp_wpgrenade,             wp_hegrenade },
-    { wp_hegrenade,             wp_hegrenade },
-    { wp_flame,                 wp_flame },
-    { wp_torpedo,               wp_mauler },
-    { wp_mauler,                wp_mauler },
-    { wp_sigil,                 wp_sigil },
-};
-
-#define SLOWTURNTICS	6 
- 
-#define NUMKEYS		256 
-#define MAX_JOY_BUTTONS 20
-
-static boolean  gamekeydown[NUMKEYS]; 
-static int      turnheld;		// for accelerative turning 
- 
-static boolean  mousearray[MAX_MOUSE_BUTTONS + 1];
-static boolean *mousebuttons = &mousearray[1];  // allow [-1]
-
-// mouse values are used once 
-int             mousex;
-int             mousey;         
-
-static int      dclicktime;
-static boolean  dclickstate;
-static int      dclicks; 
-static int      dclicktime2;
-static boolean  dclickstate2;
-static int      dclicks2;
-
-// joystick values are repeated 
-static int      joyxmove;
-static int      joyymove;
-static int      joystrafemove;
-static int      joylook;
-static boolean  joyarray[MAX_JOY_BUTTONS + 1]; 
-static boolean *joybuttons = &joyarray[1];		// allow [-1] 
- 
-static int      savegameslot = 6; // [STRIFE] initialized to 6
-static char     savedescription[32]; 
- 
-int      testcontrols_mousespeed;
- 
-#define	BODYQUESIZE	32
-
-mobj_t*		bodyque[BODYQUESIZE]; 
-//int       bodyqueslot; [STRIFE] unused
- 
-int             vanilla_savegame_limit = 1;
-int             vanilla_demo_limit = 1;
- 
-
-int G_CmdChecksum (ticcmd_t* cmd) 
-{ 
-    size_t		i;
-    int		sum = 0; 
-	 
-    for (i=0 ; i< sizeof(*cmd)/4 - 1 ; i++) 
-	sum += ((int *)cmd)[i]; 
-		 
-    return sum; 
-} 
-
-static boolean WeaponSelectable(weapontype_t weapon)
-{
-    player_t *player;
-
-    player = &players[consoleplayer];
-
-    // Can't select a weapon if we don't own it.
-
-    if (!player->weaponowned[weapon])
-    {
-        return false;
-    }
-
-    // Can't use registered-only weapons in demo mode:
-
-    if (isdemoversion && !weaponinfo[weapon].availabledemo)
-    {
-        return false;
-    }
-
-    // Special rules for switching to alternate versions of weapons.
-    // These must match the weapon-switching rules in P_PlayerThink()
-
-    // haleyjd 20141024: same fix here as in P_PlayerThink for torpedo.
-
-    if (weapon == wp_torpedo
-     && player->ammo[weaponinfo[wp_torpedo].ammo] < 30)
-    {
-        return false;
-    }
-
-    if (player->ammo[weaponinfo[weapon].ammo] == 0)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-static int G_NextWeapon(int direction)
-{
-    weapontype_t weapon;
-    int start_i, i;
-
-    // Find index in the table.
-
-    if (players[consoleplayer].pendingweapon == wp_nochange)
-    {
-        weapon = players[consoleplayer].readyweapon;
-    }
-    else
-    {
-        weapon = players[consoleplayer].pendingweapon;
-    }
-
-    for (i=0; i<arrlen(weapon_order_table); ++i)
-    {
-        if (weapon_order_table[i].weapon == weapon)
-        {
-            break;
-        }
-    }
-
-    // The current weapon must be present in weapon_order_table
-    // otherwise something has gone terribly wrong
-    if (i >= arrlen(weapon_order_table)) {
-        I_Error("Internal error: weapon %d not present in weapon_order_table", weapon);
-    }
-
-    // Switch weapon.
-    start_i = i;
-    do
-    {
-        i += direction;
-        i = (i + arrlen(weapon_order_table)) % arrlen(weapon_order_table);
-    } while (i != start_i && !WeaponSelectable(weapon_order_table[i].weapon));
-
-    return weapon_order_table[i].weapon_num;
-}
-
-//
-// G_BuildTiccmd
-// Builds a ticcmd from all of the available inputs
-// or reads it from the demo buffer. 
-// If recording a demo, write it out 
-// 
-void G_BuildTiccmd (ticcmd_t* cmd, int maketic) 
-{ 
-    int		i; 
-    boolean	strafe;
-    boolean	bstrafe; 
-    int		speed;
-    int		tspeed; 
-    int		forward;
-    int		side;
-
-    memset(cmd, 0, sizeof(ticcmd_t));
-
-    cmd->consistancy = 
-        consistancy[consoleplayer][maketic%BACKUPTICS]; 
-
-    // villsa [STRIFE] look up key
-    if(gamekeydown[key_lookup] || (joylook < 0 && joystick_look_sensitivity))
-        cmd->buttons2 |= BT2_LOOKUP;
-
-    // villsa [STRIFE] look down key
-    if(gamekeydown[key_lookdown] || (joylook > 0 && joystick_look_sensitivity))
-        cmd->buttons2 |= BT2_LOOKDOWN;
-
-    // villsa [STRIFE] inventory use key
-    if(gamekeydown[key_invuse] || joybuttons[joybuseartifact])
-    {
-        player_t* player = &players[consoleplayer];
-        if(player->numinventory > 0)
-        {
-            cmd->buttons2 |= BT2_INVUSE;
-            cmd->inventory = player->inventory[player->inventorycursor].sprite;
-        }
-    }
-
-    // villsa [STRIFE] inventory drop key
-    if(gamekeydown[key_invdrop])
-    {
-        player_t* player = &players[consoleplayer];
-        if(player->numinventory > 0)
-        {
-            cmd->buttons2 |= BT2_INVDROP;
-            cmd->inventory = player->inventory[player->inventorycursor].sprite;
-        }
-    }
-
-    // villsa [STRIFE] use medkit
-    if(gamekeydown[key_usehealth])
-        cmd->buttons2 |= BT2_HEALTH;
-
-
- 
-    strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe] 
-        || joybuttons[joybstrafe]; 
-
-    // fraggle: support the old "joyb_speed = 31" hack which
-    // allowed an autorun effect
-
-    speed = key_speed >= NUMKEYS
-         || joybspeed >= MAX_JOY_BUTTONS
-         || gamekeydown[key_speed] 
-         || joybuttons[joybspeed]
-         || mousebuttons[mousebspeed];
- 
-    forward = side = 0;
-
-    // villsa [STRIFE] running causes centerview to occur
-    if(speed)
-        cmd->buttons2 |= BT2_CENTERVIEW;
-
-    // villsa [STRIFE] disable running if low on health
-    if (players[consoleplayer].health <= 15)
-        speed = 0;
-    
-    // use two stage accelerative turning
-    // on the keyboard and joystick
-    if (joyxmove < 0
-        || joyxmove > 0  
-        || gamekeydown[key_right]
-        || gamekeydown[key_left]
-        || mousebuttons[mousebturnright]
-        || mousebuttons[mousebturnleft])
-        turnheld += ticdup; 
-    else 
-        turnheld = 0; 
-
-    if (turnheld < SLOWTURNTICS) 
-        tspeed = 2;             // slow turn 
-    else 
-        tspeed = speed;
-    
-    // let movement keys cancel each other out
-    if (strafe) 
-    { 
-        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-        {
-            // fprintf(stderr, "strafe right\n");
-            side += sidemove[speed]; 
-        }
-        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-        {
-            //	fprintf(stderr, "strafe left\n");
-            side -= sidemove[speed]; 
-        }
-        if (use_analog && joyxmove)
-        {
-            joyxmove = joyxmove * joystick_move_sensitivity / 10;
-            joyxmove = (joyxmove > FRACUNIT) ? FRACUNIT : joyxmove;
-            joyxmove = (joyxmove < -FRACUNIT) ? -FRACUNIT : joyxmove;
-            side += FixedMul(sidemove[speed], joyxmove);
-        }
-        else if (joystick_move_sensitivity)
-        {
-            if (joyxmove > 0)
-                side += sidemove[speed];
-            if (joyxmove < 0)
-                side -= sidemove[speed];
-        }
-
-    } 
-    else 
-    { 
-        if (gamekeydown[key_right] || mousebuttons[mousebturnright])
-            cmd->angleturn -= angleturn[tspeed]; 
-        if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
-            cmd->angleturn += angleturn[tspeed]; 
-        if (use_analog && joyxmove)
-        {
-            // Cubic response curve allows for finer control when stick
-            // deflection is small.
-            joyxmove = FixedMul(FixedMul(joyxmove, joyxmove), joyxmove);
-            joyxmove = joyxmove * joystick_turn_sensitivity / 10;
-            cmd->angleturn -= FixedMul(angleturn[1], joyxmove);
-        }
-        else if (joystick_turn_sensitivity)
-        {
-            if (joyxmove > 0)
-                cmd->angleturn -= angleturn[tspeed];
-            if (joyxmove < 0)
-                cmd->angleturn += angleturn[tspeed];
-        }
-    } 
-
-    if (gamekeydown[key_up]) 
-    {
-        // fprintf(stderr, "up\n");
-        forward += forwardmove[speed]; 
-    }
-    if (gamekeydown[key_down]) 
-    {
-        // fprintf(stderr, "down\n");
-        forward -= forwardmove[speed]; 
-    }
-
-    if (use_analog && joyymove)
-    {
-        joyymove = joyymove * joystick_move_sensitivity / 10;
-        joyymove = (joyymove > FRACUNIT) ? FRACUNIT : joyymove;
-        joyymove = (joyymove < -FRACUNIT) ? FRACUNIT : joyymove;
-        forward -= FixedMul(forwardmove[speed], joyymove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joyymove < 0)
-            forward += forwardmove[speed];
-        if (joyymove > 0)
-            forward -= forwardmove[speed];
-    }
-
-    if (gamekeydown[key_strafeleft]
-     || joybuttons[joybstrafeleft]
-     || mousebuttons[mousebstrafeleft])
-    {
-        side -= sidemove[speed];
-    }
-
-    if (gamekeydown[key_straferight]
-     || joybuttons[joybstraferight]
-     || mousebuttons[mousebstraferight])
-    {
-        side += sidemove[speed]; 
-    }
-
-    if (use_analog && joystrafemove)
-    {
-        joystrafemove = joystrafemove * joystick_move_sensitivity / 10;
-        joystrafemove = (joystrafemove > FRACUNIT) ? FRACUNIT : joystrafemove;
-        joystrafemove = (joystrafemove < -FRACUNIT) ? -FRACUNIT : joystrafemove;
-        side += FixedMul(sidemove[speed], joystrafemove);
-    }
-    else if (joystick_move_sensitivity)
-    {
-        if (joystrafemove < 0)
-            side -= sidemove[speed];
-        if (joystrafemove > 0)
-            side += sidemove[speed];
-    }
-    // buttons
-    cmd->chatchar = HU_dequeueChatChar(); 
-
-    // villsa [STRIFE] - add mouse button support for jump
-    if (gamekeydown[key_jump] || mousebuttons[mousebjump]
-     || joybuttons[joybjump])
-        cmd->buttons2 |= BT2_JUMP;
- 
-    // villsa [STRIFE]: Moved mousebuttons[mousebfire] to below
-    if (gamekeydown[key_fire])
-        cmd->buttons |= BT_ATTACK;
-
-    // villsa [STRIFE]
-    if(mousebuttons[mousebfire])
-    {
-         if(mouse_fire_countdown <= 0)
-             cmd->buttons |= BT_ATTACK;
-         else
-             --mouse_fire_countdown;
-    }
-    if(joybuttons[joybfire])
-    {
-         if(joystick_fire_countdown <= 0)
-             cmd->buttons |= BT_ATTACK;
-         else
-             --joystick_fire_countdown;
-    }
- 
-    if (gamekeydown[key_use]
-     || joybuttons[joybuse]
-     || mousebuttons[mousebuse])
-    { 
-        cmd->buttons |= BT_USE;
-        // clear double clicks if hit use button 
-        dclicks = 0;
-    } 
-
-    // If the previous or next weapon button is pressed, the
-    // next_weapon variable is set to change weapons when
-    // we generate a ticcmd.  Choose a new weapon.
-
-    if (gamestate == GS_LEVEL && next_weapon != 0)
-    {
-        i = G_NextWeapon(next_weapon);
-        cmd->buttons |= BT_CHANGE;
-        cmd->buttons |= i << BT_WEAPONSHIFT;
-    }
-    else
-    {
-        // Check weapon keys.
-
-        for (i=0; i<arrlen(weapon_keys); ++i)
-        {
-            int key = *weapon_keys[i];
-
-            if (gamekeydown[key])
-            {
-                cmd->buttons |= BT_CHANGE;
-                cmd->buttons |= i<<BT_WEAPONSHIFT;
-                break;
-            }
-        }
-    }
-
-    next_weapon = 0;
-
-    // mouse
-    if (mousebuttons[mousebforward]) 
-    {
-        forward += forwardmove[speed];
-    }
-    if (mousebuttons[mousebbackward])
-    {
-        forward -= forwardmove[speed];
-    }
-
-    if (dclick_use)
-    {
-        // forward double click
-        if (mousebuttons[mousebforward] != dclickstate && dclicktime > 1 ) 
-        { 
-            dclickstate = mousebuttons[mousebforward]; 
-            if (dclickstate) 
-                dclicks++; 
-            if (dclicks == 2) 
-            { 
-                cmd->buttons |= BT_USE; 
-                dclicks = 0; 
-            } 
-            else 
-                dclicktime = 0; 
-        } 
-        else 
-        { 
-            dclicktime += ticdup; 
-            if (dclicktime > 20) 
-            { 
-                dclicks = 0; 
-                dclickstate = 0; 
-            } 
-        }
-        
-        // strafe double click
-        bstrafe =
-            mousebuttons[mousebstrafe] 
-            || joybuttons[joybstrafe]; 
-        if (bstrafe != dclickstate2 && dclicktime2 > 1 ) 
-        { 
-            dclickstate2 = bstrafe; 
-            if (dclickstate2) 
-                dclicks2++; 
-            if (dclicks2 == 2) 
-            { 
-                cmd->buttons |= BT_USE; 
-                dclicks2 = 0; 
-            } 
-            else 
-                dclicktime2 = 0; 
-        } 
-        else 
-        { 
-            dclicktime2 += ticdup; 
-            if (dclicktime2 > 20) 
-            { 
-                dclicks2 = 0; 
-                dclickstate2 = 0; 
-            } 
-        } 
-    }
-
-    forward += mousey; 
-
-    if (strafe) 
-        side += mousex*2; 
-    else 
-        cmd->angleturn -= mousex*0x8;
-
-    if (mousex == 0)
-    {
-        // No movement in the previous frame
-
-        testcontrols_mousespeed = 0;
-    }
-    
-    mousex = mousey = 0; 
-
-    if (forward > MAXPLMOVE) 
-        forward = MAXPLMOVE; 
-    else if (forward < -MAXPLMOVE) 
-        forward = -MAXPLMOVE; 
-    if (side > MAXPLMOVE) 
-        side = MAXPLMOVE; 
-    else if (side < -MAXPLMOVE) 
-        side = -MAXPLMOVE; 
- 
-    cmd->forwardmove += forward; 
-    cmd->sidemove += side;
-    
-    // special buttons
-    if (sendpause) 
-    { 
-        sendpause = false; 
-        cmd->buttons = BT_SPECIAL | BTS_PAUSE; 
-    } 
- 
-    if (sendsave) 
-    { 
-        sendsave = false; 
-        cmd->buttons = BT_SPECIAL | BTS_SAVEGAME | (savegameslot<<BTS_SAVESHIFT); 
-    } 
-
-    // low-res turning
-
-    if (lowres_turn)
-    {
-        static signed short carry = 0;
-        signed short desired_angleturn;
-
-        desired_angleturn = cmd->angleturn + carry;
-
-        // round angleturn to the nearest 256 unit boundary
-        // for recording demos with single byte values for turn
-
-        cmd->angleturn = (desired_angleturn + 128) & 0xff00;
-
-        // Carry forward the error from the reduced resolution to the
-        // next tic, so that successive small movements can accumulate.
-
-        carry = desired_angleturn - cmd->angleturn;
-    }
-} 
- 
-
-//
-// G_DoLoadLevel 
-//
-void G_DoLoadLevel (void) 
-{ 
-    int             i; 
-
-    // haleyjd 10/03/10: [STRIFE] This is not done here.
-    //skyflatnum = R_FlatNumForName(DEH_String(SKYFLATNAME));
-
-    levelstarttic = gametic;        // for time calculation
-
-    if (wipegamestate == GS_LEVEL) 
-        wipegamestate = -1;             // force a wipe 
-
-    gamestate = GS_LEVEL; 
-
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-    { 
-        turbodetected[i] = false;
-
-        // haleyjd 20110204 [STRIFE]: PST_REBORN if players[i].health <= 0
-        if (playeringame[i] && (players[i].playerstate == PST_DEAD || players[i].health <= 0))
-            players[i].playerstate = PST_REBORN; 
-        memset (players[i].frags,0,sizeof(players[i].frags)); 
-    } 
-
-    P_SetupLevel (gamemap, 0, gameskill);    
-    displayplayer = consoleplayer;      // view the guy you are playing    
-    starttime = I_GetTime(); // haleyjd 20110204 [STRIFE]
-    gameaction = ga_nothing; 
-    Z_CheckHeap ();
-
-    // clear cmd building stuff
-
-    memset (gamekeydown, 0, sizeof(gamekeydown));
-    joyxmove = joyymove = joystrafemove = joylook = 0;
-    mousex = mousey = 0;
-    sendpause = sendsave = paused = false;
-    memset(mousearray, 0, sizeof(mousearray));
-    memset(joyarray, 0, sizeof(joyarray));
-
-    if (testcontrols)
-    {
-        players[consoleplayer].message = "Press escape to quit.";
-    }
-
-    P_DialogLoad(); // villsa [STRIFE]
-} 
-
-static void SetJoyButtons(unsigned int buttons_mask)
-{
-    int i;
-    player_t *const player = &players[consoleplayer];
-
-    for (i=0; i<MAX_JOY_BUTTONS; ++i)
-    {
-        int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!joybuttons[i] && button_on)
-        {
-            // Weapon cycling:
-
-            if (i == joybprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == joybnextweapon)
-            {
-                next_weapon = 1;
-            }
-            else if (i == joybinvleft)
-            {
-                if (player->inventorycursor > 0)
-                    player->inventorycursor--;
-            }
-            else if (i == joybinvright)
-            {
-                if (player->inventorycursor < player->numinventory - 1)
-                    player->inventorycursor++;
-            }
-        }
-
-        joybuttons[i] = button_on;
-    }
-}
-
-static void SetMouseButtons(unsigned int buttons_mask)
-{
-    int i;
-
-    for (i=0; i<MAX_MOUSE_BUTTONS; ++i)
-    {
-        unsigned int button_on = (buttons_mask & (1 << i)) != 0;
-
-        // Detect button press:
-
-        if (!mousebuttons[i] && button_on)
-        {
-            if (i == mousebprevweapon)
-            {
-                next_weapon = -1;
-            }
-            else if (i == mousebnextweapon)
-            {
-                next_weapon = 1;
-            }
-        }
-
-	mousebuttons[i] = button_on;
-    }
-}
-
-//
-// G_Responder  
-// Get info needed to make ticcmd_ts for the players.
-// 
-boolean G_Responder (event_t* ev) 
-{ 
-    // allow spy mode changes even during the demo
-    if (gamestate == GS_LEVEL && ev->type == ev_keydown 
-        && ev->data1 == key_spy && (singledemo || !gameskill) ) // [STRIFE]: o_O
-    {
-        // spy mode 
-        do 
-        { 
-            displayplayer++; 
-            if (displayplayer == MAXPLAYERS) 
-                displayplayer = 0; 
-        } while (!playeringame[displayplayer] && displayplayer != consoleplayer); 
-        return true; 
-    }
-
-    // any other key pops up menu if in demos
-    if (gameaction == ga_nothing && !singledemo && 
-        (demoplayback || gamestate == GS_DEMOSCREEN) 
-        ) 
-    { 
-        if (ev->type == ev_keydown ||  
-            (ev->type == ev_mouse && ev->data1) || 
-            (ev->type == ev_joystick && ev->data1) ) 
-        { 
-            if(devparm && ev->data1 == 'g')
-                D_PageTicker(); // [STRIFE]: wat? o_O
-            else
-                M_StartControlPanel (); 
-            return true; 
-        } 
-        return false; 
-    } 
-
-    if (gamestate == GS_LEVEL) 
-    { 
-#if 0 
-        if (devparm && ev->type == ev_keydown && ev->data1 == ';') 
-        { 
-            G_DeathMatchSpawnPlayer (0); 
-            return true; 
-        } 
-#endif 
-        if (HU_Responder (ev)) 
-            return true;	// chat ate the event 
-        if (ST_Responder (ev)) 
-            return true;	// status window ate it 
-        if (AM_Responder (ev)) 
-            return true;	// automap ate it 
-    } 
-
-    if (gamestate == GS_FINALE) 
-    { 
-        if (F_Responder (ev)) 
-            return true;	// finale ate the event 
-    } 
-
-    if (testcontrols && ev->type == ev_mouse)
-    {
-        // If we are invoked by setup to test the controls, save the 
-        // mouse speed so that we can display it on-screen.
-        // Perform a low pass filter on this so that the thermometer 
-        // appears to move smoothly.
-
-        testcontrols_mousespeed = abs(ev->data2);
-    }
-
-    // If the next/previous weapon keys are pressed, set the next_weapon
-    // variable to change weapons when the next ticcmd is generated.
-
-    if (ev->type == ev_keydown && ev->data1 == key_prevweapon)
-    {
-        next_weapon = -1;
-    }
-    else if (ev->type == ev_keydown && ev->data1 == key_nextweapon)
-    {
-        next_weapon = 1;
-    }
-
-    switch (ev->type) 
-    { 
-    case ev_keydown: 
-        if (ev->data1 == key_pause) 
-        { 
-            sendpause = true; 
-        }
-        else if (ev->data1 <NUMKEYS) 
-        {
-            gamekeydown[ev->data1] = true; 
-        }
-
-        return true;    // eat key down events 
-
-    case ev_keyup: 
-        if (ev->data1 <NUMKEYS) 
-            gamekeydown[ev->data1] = false; 
-        return false;   // always let key up events filter down 
-
-    case ev_mouse: 
-        SetMouseButtons(ev->data1);
-        mousex = ev->data2*(mouseSensitivity+5)/10; 
-        mousey = ev->data3*(mouseSensitivity+5)/10; 
-        return true;    // eat events 
-
-    case ev_joystick: 
-        SetJoyButtons(ev->data1);
-        joyxmove = ev->data2; 
-        joyymove = ev->data3; 
-        joystrafemove = ev->data4;
-        joylook = ev->data5;
-        return true;    // eat events 
-
-    default: 
-        break; 
-    } 
-
-    return false; 
-} 
-
-//
-// G_Ticker
-// Make ticcmd_ts for the players.
-//
-void G_Ticker (void) 
-{ 
-    int         i;
-    int         buf; 
-    ticcmd_t*   cmd;
-
-    // do player reborns if needed
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-        if (playeringame[i] && players[i].playerstate == PST_REBORN) 
-            G_DoReborn (i);
-
-    // do things to change the game state
-    while (gameaction != ga_nothing)
-    { 
-        switch (gameaction) 
-        { 
-        case ga_loadlevel: 
-            G_DoLoadLevel (); 
-            break; 
-        case ga_newgame:
-            G_DoNewGame (); 
-            break; 
-        case ga_loadgame: 
-            G_DoLoadGame(true); 
-            M_SaveMoveHereToMap(); // [STRIFE]
-            M_ReadMisObj();
-            break; 
-        case ga_savegame: 
-            M_SaveMoveMapToHere(); // [STRIFE]
-            M_SaveMisObj(savepath);
-            G_DoSaveGame(savepath); 
-            break; 
-        case ga_playdemo: 
-            G_DoPlayDemo (); 
-            break; 
-        case ga_completed: 
-            G_DoCompleted (); 
-            break; 
-        case ga_victory: 
-            F_StartFinale (); 
-            break; 
-        case ga_worlddone: 
-            G_DoWorldDone (); 
-            break; 
-        case ga_screenshot: 
-            V_ScreenShot("STRIFE%02i.%s"); // [STRIFE] file name, message
-            players[consoleplayer].message = DEH_String("STRIFE  by Rogue entertainment");
-            gameaction = ga_nothing; 
-            break; 
-        case ga_nothing: 
-            break; 
-        } 
-    }
-    
-    // get commands, check consistancy,
-    // and build new consistancy check
-    buf = (gametic/ticdup)%BACKUPTICS; 
-
-    // STRIFE-TODO: pnameprefixes bullcrap
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-        if (playeringame[i]) 
-        { 
-            cmd = &players[i].cmd; 
-
-            memcpy (cmd, &netcmds[i], sizeof(ticcmd_t)); 
-
-            if (demoplayback)
-                G_ReadDemoTiccmd (cmd); 
-            if (demorecording)
-                G_WriteDemoTiccmd (cmd);
-
-            // check for turbo cheats
-
-            // check ~ 4 seconds whether to display the turbo message. 
-            // store if the turbo threshold was exceeded in any tics
-            // over the past 4 seconds.  offset the checking period
-            // for each player so messages are not displayed at the
-            // same time.
-
-            if (cmd->forwardmove > TURBOTHRESHOLD)
-            {
-                turbodetected[i] = true;
-            }
-
-            if ((gametic & 31) == 0 
-                && ((gametic >> 5) % MAXPLAYERS) == i
-                && turbodetected[i])
-            {
-                static char turbomessage[80];
-                M_snprintf(turbomessage, sizeof(turbomessage),
-                           "%s is turbo!", player_names[i]);
-                players[consoleplayer].message = turbomessage;
-                turbodetected[i] = false;
-            }
-
-            if (netgame && !netdemo && !(gametic%ticdup) ) 
-            { 
-                if (gametic > BACKUPTICS 
-                    && consistancy[i][buf] != cmd->consistancy) 
-                { 
-                    I_Error ("consistency failure (%i should be %i)",
-                             cmd->consistancy, consistancy[i][buf]); 
-                } 
-                if (players[i].mo) 
-                    consistancy[i][buf] = players[i].mo->x; 
-                else 
-                    consistancy[i][buf] = rndindex; 
-            } 
-        }
-    }
-    
-    // check for special buttons
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-        if (playeringame[i]) 
-        { 
-            if (players[i].cmd.buttons & BT_SPECIAL) 
-            { 
-                switch (players[i].cmd.buttons & BT_SPECIALMASK) 
-                { 
-                case BTS_PAUSE: 
-                    paused ^= 1; 
-                    if (paused) 
-                        S_PauseSound (); 
-                    else 
-                        S_ResumeSound (); 
-                    break; 
-
-                case BTS_SAVEGAME: 
-                    if (!character_name[0]) // [STRIFE]
-                    {
-                        M_StringCopy(character_name, "NET GAME",
-                                     sizeof(character_name));
-                    }
-                    savegameslot =  
-                        (players[i].cmd.buttons & BTS_SAVEMASK)>>BTS_SAVESHIFT; 
-                    gameaction = ga_savegame; 
-                    break; 
-                } 
-            } 
-        }
-    }
-
-    // Have we just finished displaying an intermission screen?
-    // haleyjd 08/23/10: [STRIFE] No intermission.
-    /*
-    if (oldgamestate == GS_INTERMISSION && gamestate != GS_INTERMISSION)
-    {
-        WI_End();
-    }
-    */
-
-    oldgamestate = gamestate;
-
-    // do main actions
-    switch (gamestate) 
-    { 
-    case GS_LEVEL: 
-        P_Ticker (); 
-        ST_Ticker (); 
-        AM_Ticker (); 
-        HU_Ticker ();
-        break; 
-
-        // haleyjd 08/23/10: [STRIFE] No intermission.
-        /*
-    case GS_INTERMISSION: 
-        WI_Ticker (); 
-        break; 
-        */
-    case GS_UNKNOWN: // STRIFE-TODO: What is this? is it ever used??
-        F_WaitTicker();
-        break;
-
-    case GS_FINALE: 
-        F_Ticker (); 
-        break; 
-
-    case GS_DEMOSCREEN: 
-        D_PageTicker (); 
-        break;
-    }        
-} 
- 
- 
-//
-// PLAYER STRUCTURE FUNCTIONS
-// also see P_SpawnPlayer in P_Things
-//
-
-//
-// G_InitPlayer 
-// Called at the start.
-// Called by the game initialization functions.
-//
-// [STRIFE] No such function.
-/*
-void G_InitPlayer (int player) 
-{ 
-    player_t*	p; 
- 
-    // set up the saved info         
-    p = &players[player]; 
-	 
-    // clear everything else to defaults 
-    G_PlayerReborn (player); 
-	 
-} 
-*/
- 
-
-//
-// G_PlayerFinishLevel
-// Can when a player completes a level.
-//
-// [STRIFE] No such function. The equivalent to this logic was moved into
-// G_DoCompleted.
-/*
-void G_PlayerFinishLevel (int player) 
-{ 
-    player_t*	p; 
-	 
-    p = &players[player]; 
-	 
-    memset (p->powers, 0, sizeof (p->powers)); 
-    memset (p->cards, 0, sizeof (p->cards)); 
-    p->mo->flags &= ~MF_SHADOW;		// cancel invisibility 
-    p->extralight = 0;			// cancel gun flashes 
-    p->fixedcolormap = 0;		// cancel ir gogles 
-    p->damagecount = 0;			// no palette changes 
-    p->bonuscount = 0; 
-} 
-*/
-
-//
-// G_PlayerReborn
-// Called after a player dies 
-// almost everything is cleared and initialized 
-//
-// [STRIFE] Small changes for allegiance, inventory, health auto-use, and
-// mission objective.
-//
-void G_PlayerReborn (int player) 
-{ 
-    player_t*   p; 
-    int         i; 
-    int         frags[MAXPLAYERS]; 
-    int         killcount;
-    int         allegiance;
-
-    killcount = players[player].killcount;
-    allegiance = players[player].allegiance; // [STRIFE]
-
-    memcpy(frags,players[player].frags,sizeof(frags));
-
-    p = &players[player]; 
-    memset (p, 0, sizeof(*p)); 
-
-    memcpy(p->frags, frags, sizeof(p->frags));
-
-    p->usedown               = true;                 // don't do anything immediately
-    p->attackdown            = true;
-    p->inventorydown         = true;                 // villsa [STRIFE]
-    p->playerstate           = PST_LIVE;       
-    p->health                = deh_initial_health;   // Use dehacked value
-    p->readyweapon           = wp_fist;              // villsa [STRIFE] default to fists
-    p->pendingweapon         = wp_fist;              // villsa [STRIFE] default to fists
-    p->weaponowned[wp_fist]  = true;                 // villsa [STRIFE] default to fists
-    p->cheats               |= CF_AUTOHEALTH;        // villsa [STRIFE]
-    p->killcount             = killcount;
-    p->allegiance            = allegiance;           // villsa [STRIFE]
-    p->centerview            = true;                 // villsa [STRIFE]
-
-    for(i = 0; i < NUMAMMO; i++) 
-        p->maxammo[i] = maxammo[i]; 
-
-    // [STRIFE] clear inventory
-    for(i = 0; i < 32; i++)
-        p->inventory[i].type = NUMMOBJTYPES;
-
-    // villsa [STRIFE]: Default objective
-    M_StringCopy(mission_objective, DEH_String("Find help"),
-                 OBJECTIVE_LEN);
-}
-
-//
-// G_CheckSpot  
-// Returns false if the player cannot be respawned
-// at the given mapthing_t spot  
-// because something is occupying it 
-//
-// [STRIFE] Changed to eliminate body queue and an odd error message was added.
-//
-void P_SpawnPlayer (mapthing_t* mthing); 
- 
-boolean
-G_CheckSpot
-( int		playernum,
-  mapthing_t*	mthing ) 
-{ 
-    fixed_t             x;
-    fixed_t             y; 
-    subsector_t*        ss; 
-    unsigned            an; 
-    mobj_t*             mo; 
-    int                 i;
-
-    if (!players[playernum].mo)
-    {
-        // [STRIFE] weird error message added here:
-        if(leveltime > 0)
-            players[playernum].message = DEH_String("you didn't have a body!");
-
-        // first spawn of level, before corpses
-        for (i=0 ; i<playernum ; i++)
-            if (players[i].mo->x == mthing->x << FRACBITS
-                && players[i].mo->y == mthing->y << FRACBITS)
-                return false;	
-        return true;
-    }
-
-    x = mthing->x << FRACBITS; 
-    y = mthing->y << FRACBITS; 
-
-    if (!P_CheckPosition (players[playernum].mo, x, y) ) 
-        return false; 
-
-    // flush an old corpse if needed
-    // [STRIFE] player corpses remove themselves after a short time, so
-    // evidently this wasn't needed.
-    /*
-    if (bodyqueslot >= BODYQUESIZE) 
-        P_RemoveMobj (bodyque[bodyqueslot%BODYQUESIZE]); 
-    bodyque[bodyqueslot%BODYQUESIZE] = players[playernum].mo; 
-    bodyqueslot++; 
-    */
-
-    // spawn a teleport fog 
-    ss = R_PointInSubsector (x,y); 
-    an = ( ANG45 * (((unsigned int) mthing->angle)/45) ) >> ANGLETOFINESHIFT; 
-
-    mo = P_SpawnMobj (x+20*finecosine[an], y+20*finesine[an] 
-                      , ss->sector->floorheight 
-                      , MT_TFOG); 
-
-    if (players[consoleplayer].viewz != 1) 
-        S_StartSound (mo, sfx_telept);	// don't start sound on first frame 
-
-    return true; 
-} 
-
-
-//
-// G_DeathMatchSpawnPlayer 
-// Spawns a player at one of the random death match spots 
-// called at level load and each death 
-//
-// [STRIFE]: Modified exit message to match binary.
-//
-void G_DeathMatchSpawnPlayer (int playernum) 
-{ 
-    int             i,j; 
-    int             selections; 
-
-    selections = deathmatch_p - deathmatchstarts; 
-    if (selections < 4) 
-        I_Error ("Only %i deathmatch spots, at least 4 required!", selections); 
-
-    for (j=0 ; j<20 ; j++) 
-    { 
-        i = P_Random() % selections; 
-        if (G_CheckSpot (playernum, &deathmatchstarts[i]) ) 
-        { 
-            deathmatchstarts[i].type = playernum+1; 
-            P_SpawnPlayer (&deathmatchstarts[i]); 
-            return; 
-        } 
-    } 
-
-    // no good spot, so the player will probably get stuck 
-    P_SpawnPlayer (&playerstarts[playernum]); 
-} 
-
-//
-// G_LoadPath
-//
-// haleyjd 20101003: [STRIFE] New function
-// Sets loadpath based on the map and "savepathtemp"
-//
-void G_LoadPath(int map)
-{
-    char mapbuf[33];
-
-    memset(mapbuf, 0, sizeof(mapbuf));
-    M_snprintf(mapbuf, sizeof(mapbuf), "%d", map);
-
-    // haleyjd: free if already set, and use M_SafeFilePath
-    if(loadpath)
-        Z_Free(loadpath);
-    loadpath = M_SafeFilePath(savepathtemp, mapbuf);
-}
-
-//
-// G_DoReborn
-// 
-void G_DoReborn (int playernum) 
-{ 
-    int                             i; 
-
-    if (!netgame)
-    {
-        // reload the level from scratch
-        // [STRIFE] Reborn level load
-        G_LoadPath(gamemap);
-        gameaction = ga_loadgame;
-    }
-    else 
-    {
-        // respawn at the start
-
-        // first dissasociate the corpse 
-        // [STRIFE] Checks for NULL first
-        if(players[playernum].mo)
-            players[playernum].mo->player = NULL;
-
-        // spawn at random spot if in death match 
-        if (deathmatch) 
-        { 
-            G_DeathMatchSpawnPlayer (playernum); 
-            return; 
-        } 
-
-        if (G_CheckSpot (playernum, &playerstarts[playernum]) ) 
-        { 
-            P_SpawnPlayer (&playerstarts[playernum]); 
-            return; 
-        }
-
-        // try to spawn at one of the other players spots 
-        for (i=0 ; i<MAXPLAYERS ; i++)
-        {
-            if (G_CheckSpot (playernum, &playerstarts[i]) ) 
-            { 
-                playerstarts[i].type = playernum+1;     // fake as other player 
-                P_SpawnPlayer (&playerstarts[i]);
-                playerstarts[i].type = i+1;             // restore 
-                return; 
-            }
-            // he's going to be inside something.  Too bad.
-        }
-        P_SpawnPlayer (&playerstarts[playernum]); 
-    } 
-} 
- 
-//
-// G_ScreenShot
-//
-// [STRIFE] Verified unmodified
-//
-void G_ScreenShot (void) 
-{ 
-    gameaction = ga_screenshot; 
-} 
-
-// haleyjd 20100823: [STRIFE] Removed par times.
-
-//
-// G_DoCompleted 
-//
-
-//
-// G_RiftExitLevel
-//
-// haleyjd 20100824: [STRIFE] New function
-// * Called from some exit linedefs to exit to a specific riftspot in the 
-//   given destination map.
-//
-void G_RiftExitLevel(int map, int spot, angle_t angle)
-{
-    gameaction = ga_completed;
-    
-    // special handling for post-Sigil map changes
-    if(players[0].weaponowned[wp_sigil])
-    {
-        if(map == 3) // Front Base -> Abandoned Front Base
-            map = 30;
-        if(map == 7) // Castle -> New Front Base
-            map = 10;
-    }
-
-    // no rifting in deathmatch games
-    if(deathmatch)
-        spot = 0;
-
-    riftangle = angle;
-    riftdest  = spot;
-    destmap   = map;
-}
-
-//
-// G_Exit2
-//
-// haleyjd 20101003: [STRIFE] New function.
-// No xrefs to this, doesn't seem to be used. Could have gotten inlined
-// somewhere but I haven't seen it.
-//
-void G_Exit2(int dest, angle_t angle)
-{
-    riftdest = dest;
-    gameaction = ga_completed;
-    riftangle = angle;
-    destmap = gamemap;
-}
-
-//
-// G_ExitLevel
-//
-// haleyjd 20100824: [STRIFE]:
-// * Default to next map in numeric order; init destmap and riftdest.
-//
-void G_ExitLevel (int dest) 
-{
-    if(dest == 0)
-        dest = gamemap + 1;
-    destmap = dest;
-    riftdest = 0;
-    gameaction = ga_completed; 
-} 
-
-/*
-// haleyjd 20100823: [STRIFE] No secret exits in Strife.
-// Here's for the german edition.
-void G_SecretExitLevel (void) 
-{
-    // IF NO WOLF3D LEVELS, NO SECRET EXIT!
-    if ( (gamemode == commercial)
-        && (W_CheckNumForName("map31")<0))
-        secretexit = false;
-    else
-        secretexit = true; 
-    gameaction = ga_completed; 
-}
-*/
-
-//
-// G_StartFinale
-//
-// haleyjd 20100921: [STRIFE] New function.
-// This replaced G_SecretExitLevel in Strife. I don't know that it's actually
-// used anywhere in the game, but it *is* usable in mods via linetype 124,
-// W1 Start Finale.
-//
-void G_StartFinale(void)
-{
-    gameaction = ga_victory;
-}
-
-//
-// G_DoCompleted
-//
-// haleyjd 20100823: [STRIFE]:
-// * Removed G_PlayerFinishLevel and just sets some powerup states.
-// * Removed Chex, as not relevant to Strife.
-// * Removed DOOM level transfer logic 
-// * Removed intermission code.
-// * Added setting gameaction to ga_worlddone.
-//
-void G_DoCompleted (void) 
-{
-    int i;
-
-    // deal with powerup states
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        if(playeringame[i])
-        {
-            // [STRIFE] restore pw_allmap power from mapstate cache
-            if(destmap < 40)
-                players[i].powers[pw_allmap] = players[i].mapstate[destmap];
-
-            // Shadowarmor doesn't persist between maps in netgames
-            if(netgame)
-                players[i].powers[pw_invisibility] = 0;
-        }
-    }
-
-    stonecold = false;  // villsa [STRIFE]
-
-    if (automapactive) 
-        AM_Stop (); 
-
-    // [STRIFE] HUB SAVE
-    if(!deathmatch)
-        G_DoSaveGame(savepathtemp);
-    
-    gameaction = ga_worlddone;
-} 
-
-
-// haleyjd 20100824: [STRIFE] No secret exits.
-/*
-//
-// G_WorldDone 
-//
-void G_WorldDone (void) 
-{ 
-    gameaction = ga_worlddone; 
-
-    if (secretexit) 
-        players[consoleplayer].didsecret = true; 
-
-    if ( gamemode == commercial )
-    {
-	switch (gamemap)
-	{
-	  case 15:
-	  case 31:
-	    if (!secretexit)
-		break;
-	  case 6:
-	  case 11:
-	  case 20:
-	  case 30:
-	    F_StartFinale ();
-	    break;
-	}
-    }
-} 
-*/
-
-//
-// G_RiftPlayer
-//
-// haleyjd 20100824: [STRIFE] New function
-// Teleports the player to the appropriate rift spot.
-//
-void G_RiftPlayer(void)
-{
-    if(riftdest)
-    {
-        P_TeleportMove(players[0].mo, 
-                       riftSpots[riftdest - 1].x << FRACBITS, 
-                       riftSpots[riftdest - 1].y << FRACBITS);
-        players[0].mo->angle  = riftangle;
-        players[0].mo->health = players[0].health;
-    }
-}
-
-//
-// G_RiftCheat
-//
-// haleyjd 20100824: [STRIFE] New function
-// Called from the cheat code to jump to a rift spot.
-//
-boolean G_RiftCheat(int riftSpotNum)
-{
-    return P_TeleportMove(players[0].mo,
-                          riftSpots[riftSpotNum - 1].x << FRACBITS,
-                          riftSpots[riftSpotNum - 1].y << FRACBITS);
-}
-
-//
-// G_DoWorldDone
-//
-// haleyjd 20100824: [STRIFE] Added destmap -> gamemap set.
-//
-void G_DoWorldDone (void) 
-{        
-    int temp_leveltime = leveltime;
-    boolean temp_shadow = false;
-    boolean temp_mvis   = false;
-
-    gamestate = GS_LEVEL; 
-    gamemap = destmap;
-
-    // [STRIFE] HUB LOAD
-    G_LoadPath(destmap);
-    if (!deathmatch)
-    {
-        // Remember Shadowarmor across hub loads
-        if(players[0].mo->flags & MF_SHADOW)
-            temp_shadow = true;
-        if(players[0].mo->flags & MF_MVIS)
-            temp_mvis = true;
-    }
-    G_DoLoadGame(false);
-
-    // [STRIFE] leveltime carries over between maps
-    leveltime = temp_leveltime;
-
-    if(!deathmatch)
-    {
-        // [STRIFE]: transfer saved powerups
-        players[0].mo->flags &= ~(MF_SHADOW|MF_MVIS);
-        if(temp_shadow)
-            players[0].mo->flags |= MF_SHADOW;
-        if(temp_mvis)
-            players[0].mo->flags |= MF_MVIS;
-
-        // [STRIFE] HUB SAVE
-        G_RiftPlayer();
-        G_DoSaveGame(savepathtemp);
-        M_SaveMisObj(savepathtemp);
-    }
-
-    gameaction = ga_nothing; 
-    viewactive = true; 
-} 
-
-//
-// G_DoWorldDone2
-//
-// haleyjd 20101003: [STRIFE] New function. No xrefs; unused.
-//
-void G_DoWorldDone2(void)
-{
-    gamestate = GS_LEVEL;
-    gameaction = ga_nothing;
-    viewactive = true;
-}
-
-//
-// G_ReadCurrent
-//
-// haleyjd 20101003: [STRIFE] New function.
-// Reads the "CURRENT" file from the given path and then sets it to
-// gamemap.
-//
-void G_ReadCurrent(const char *path)
-{
-    char *temppath = NULL;
-    byte *buffer = NULL;
-
-    temppath = M_SafeFilePath(path, "\\current");
-
-    if(M_ReadFile(temppath, &buffer) <= 0)
-        gameaction = ga_newgame;
-    else
-    {
-        // haleyjd 20110211: do endian-correct read
-        gamemap = (((int)buffer[0])       |
-                   ((int)buffer[1] <<  8) |
-                   ((int)buffer[2] << 16) |
-                   ((int)buffer[3] << 24));
-        gameaction = ga_loadgame;
-        Z_Free(buffer);
-    }
-
-    Z_Free(temppath);
-    
-    G_LoadPath(gamemap);
-}
-
-//
-// G_InitFromSavegame
-// Can be called by the startup code or the menu task. 
-//
-
-char	savename[256];
-
-// [STRIFE]: No such function.
-/*
-void G_LoadGame (char* name)
-{
-    M_StringCopy(savename, name, sizeof(savename));
-    gameaction = ga_loadgame;
-}
-*/
-
-// haleyjd 20100928: [STRIFE] VERSIONSIZE == 8
-#define VERSIONSIZE             8
-
-void G_DoLoadGame (boolean userload) 
-{
-    int savedleveltime;
-
-    gameaction = ga_nothing;
-
-    save_stream = M_fopen(loadpath, "rb");
-
-    // [STRIFE] If the file does not exist, G_DoLoadLevel is called.
-    if (save_stream == NULL)
-    {
-        G_DoLoadLevel();
-        return;
-    }
-
-    savegame_error = false;
-
-    if (!P_ReadSaveGameHeader())
-    {
-        fclose(save_stream);
-        return;
-    }
-
-    // haleyjd: A comment would be good here, fraggle...
-    // Evidently this is a Choco-ism, necessitated by reading the savegame
-    // header *before* calling G_DoLoadLevel.
-    savedleveltime = leveltime;
-    
-    // load a base level
-
-    // STRIFE-TODO: ????
-    if(userload)
-        G_InitNew(gameskill, gamemap); 
-    else
-        G_DoLoadLevel();
- 
-    leveltime = savedleveltime;
-
-    // dearchive all the modifications
-    // [STRIFE] some portions of player_t are not overwritten when loading
-    //   between hub levels
-    P_UnArchivePlayers (userload); 
-    P_UnArchiveWorld (); 
-    P_UnArchiveThinkers (); 
-    P_UnArchiveSpecials (); 
- 
-    if (!P_ReadSaveGameEOF())
-        I_Error ("Bad savegame");
-
-    fclose(save_stream);
-    
-    if (setsizeneeded)
-        R_ExecuteSetViewSize ();
-    
-    // draw the pattern into the back screen
-    R_FillBackScreen ();
-} 
-
-//
-// G_WriteSaveName
-//
-// haleyjd 20101003: [STRIFE] New function
-//
-// Writes the character name to the NAME file.
-//
-boolean G_WriteSaveName(int slot, const char *charname)
-{
-    //char savedir[16];
-    char *tmpname;
-    boolean retval;
-
-    savegameslot = slot;
-
-    // haleyjd: removed special -cdrom treatment, as I believe it is taken
-    // care of automatically via using Choco's savegamedir setting.
-
-    // haleyjd: free previous path, if any, and allocate new one using
-    // M_SafeFilePath routine, which isn't limited to 128 characters.
-    if(savepathtemp)
-        Z_Free(savepathtemp);
-    savepathtemp = M_SafeFilePath(savegamedir, "strfsav6.ssg");
-
-    // haleyjd: as above.
-    if(savepath)
-        Z_Free(savepath);
-    savepath = M_SafeFilePath(savegamedir, M_MakeStrifeSaveDir(savegameslot, ""));
-
-    // haleyjd: memset full character_name for safety
-    memset(character_name, 0, CHARACTER_NAME_LEN);
-    M_StringCopy(character_name, charname, sizeof(character_name));
-
-    // haleyjd: use M_SafeFilePath
-    tmpname = M_SafeFilePath(savepathtemp, "name");
-
-    // Write the "name" file under the directory
-    retval = M_WriteFile(tmpname, character_name, 32);
-
-    Z_Free(tmpname);
-
-    return retval;
-}
-
-//
-// G_SaveGame
-// Called by the menu task.
-// Description is a 24 byte text string
-//
-// [STRIFE] No such function, at least in v1.2
-// STRIFE-TODO: Does this make a comeback in v1.31?
-/*
-void
-G_SaveGame
-( int	slot,
-  char*	description )
-{
-    savegameslot = slot;
-    M_StringCopy(savedescription, description, sizeof(savedescription));
-    sendsave = true;
-}
-*/
-
-void G_DoSaveGame (char *path)
-{ 
-    char *current_path;
-    char *savegame_file;
-    char *temp_savegame_file;
-    byte gamemapbytes[4];
-    char gamemapstr[33];
-
-    temp_savegame_file = P_TempSaveGameFile();
-    
-    // [STRIFE] custom save file path logic
-    memset(gamemapstr, 0, sizeof(gamemapstr));
-    M_snprintf(gamemapstr, sizeof(gamemapstr), "%d", gamemap);
-    savegame_file = M_SafeFilePath(path, gamemapstr);
-
-    // [STRIFE] write the "current" file, which tells which hub map
-    //   the save slot is currently on.
-    current_path = M_SafeFilePath(path, "current");
-    // haleyjd: endian-agnostic IO
-    gamemapbytes[0] = (byte)( gamemap        & 0xff);
-    gamemapbytes[1] = (byte)((gamemap >>  8) & 0xff);
-    gamemapbytes[2] = (byte)((gamemap >> 16) & 0xff);
-    gamemapbytes[3] = (byte)((gamemap >> 24) & 0xff);
-    M_WriteFile(current_path, gamemapbytes, 4);
-    Z_Free(current_path);
-
-    // Open the savegame file for writing.  We write to a temporary file
-    // and then rename it at the end if it was successfully written.
-    // This prevents an existing savegame from being overwritten by 
-    // a corrupted one, or if a savegame buffer overrun occurs.
-
-    save_stream = M_fopen(temp_savegame_file, "wb");
-
-    if (save_stream == NULL)
-    {
-        return;
-    }
-
-    savegame_error = false;
-
-    P_WriteSaveGameHeader(savedescription);
- 
-    P_ArchivePlayers (); 
-    P_ArchiveWorld (); 
-    P_ArchiveThinkers (); 
-    P_ArchiveSpecials (); 
-
-    P_WriteSaveGameEOF();
-
-    // Enforce the same savegame size limit as in Vanilla Doom, 
-    // except if the vanilla_savegame_limit setting is turned off.
-    // [STRIFE]: Verified subject to same limit.
-
-    if (vanilla_savegame_limit && ftell(save_stream) > SAVEGAMESIZE)
-    {
-        I_Error ("Savegame buffer overrun");
-    }
-    
-    // Finish up, close the savegame file.
-
-    fclose(save_stream);
-
-    // Now rename the temporary savegame file to the actual savegame
-    // file, overwriting the old savegame if there was one there.
-
-    M_remove(savegame_file);
-    M_rename(temp_savegame_file, savegame_file);
-    
-    // haleyjd: free the savegame_file path
-    Z_Free(savegame_file);
-
-    gameaction = ga_nothing; 
-    //M_StringCopy(savedescription, "", sizeof(savedescription));
-
-    // [STRIFE]: custom message logic
-    if(!strcmp(path, savepath))
-    {
-        M_snprintf(savename, sizeof(savename), "%s saved.", character_name);
-        players[consoleplayer].message = savename;
-    }
-
-    // draw the pattern into the back screen
-    R_FillBackScreen ();
-} 
- 
-
-//
-skill_t d_skill; 
-//int     d_episode; [STRIFE] No such thing as episodes in Strife
-int     d_map; 
-
-//
-// G_DeferedInitNew
-//
-// Can be called by the startup code or the menu task,
-// consoleplayer, displayplayer, playeringame[] should be set. 
-//
-// haleyjd 20100922: [STRIFE] Removed episode parameter
-//
-void G_DeferedInitNew(skill_t skill, int map)
-{ 
-    d_skill = skill; 
-    d_map = map; 
-    gameaction = ga_newgame; 
-} 
-
-//
-// G_DoNewGame
-//
-// [STRIFE] Code added to turn off the stonecold effect.
-//   Someone also removed the nomonsters reset...
-//
-void G_DoNewGame (void) 
-{
-    demoplayback = false; 
-    netdemo = false;
-    netgame = false;
-    deathmatch = false;
-    playeringame[1] = playeringame[2] = playeringame[3] = 0;
-    respawnparm = false;
-    fastparm = false;
-    stonecold = false;      // villsa [STRIFE]
-    //nomonsters = false;   [STRIFE] not set here!?!
-    consoleplayer = 0;
-    G_InitNew (d_skill, d_map);
-    gameaction = ga_nothing; 
-} 
-
-//
-// G_InitNew
-//
-// haleyjd 20100824: [STRIFE]:
-// * Added riftdest initialization
-// * Removed episode parameter
-//
-void
-G_InitNew
-( skill_t       skill,
-  int           map ) 
-{ 
-    const char *skytexturename;
-    int             i; 
-
-    if (paused) 
-    { 
-        paused = false; 
-        S_ResumeSound (); 
-    } 
-
-    if (skill > sk_nightmare) 
-        skill = sk_nightmare;
-
-    // [STRIFE] Removed episode nonsense and gamemap clipping
-
-    M_ClearRandom (); 
-
-    if (skill == sk_nightmare || respawnparm )
-        respawnmonsters = true;
-    else
-        respawnmonsters = false;
-
-    // [STRIFE] Strife skill level mobjinfo/states tweaking
-    // BUG: None of this code runs properly when loading save games, so
-    // basically it's impossible to play any skill level properly unless
-    // you never quit and reload from the command line.
-    if(!skill && gameskill)
-    {
-        // Setting to Baby skill... make things easier.
-
-        // Acolytes walk, attack, and feel pain slower
-        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
-            states[i].tics *= 2; 
-
-        // Reavers attack slower
-        for(i = S_ROB1_10; i <= S_ROB1_15; i++)
-            states[i].tics *= 2;
-
-        // Turrets attack slower
-        for(i = S_TURT_02; i <= S_TURT_03; i++)
-            states[i].tics *= 2;
-
-        // Crusaders attack and feel pain slower
-        for(i = S_ROB2_09; i <= S_ROB2_19; i++)
-            states[i].tics *= 2;
-
-        // Stalkers think, walk, and attack slower
-        for(i = S_SPID_03; i <= S_SPID_10; i++)
-            states[i].tics *= 2;
-
-        // The Bishop's homing missiles are faster (what?? BUG?)
-        mobjinfo[MT_SEEKMISSILE].speed *= 2;
-    }
-    if(skill && !gameskill)
-    {
-        // Setting a higher skill when previously on baby... make things normal
-
-        // Acolytes
-        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
-            states[i].tics >>= 1; 
-
-        // Reavers
-        for(i = S_ROB1_10; i <= S_ROB1_15; i++)
-            states[i].tics >>= 1;
-
-        // Turrets
-        for(i = S_TURT_02; i <= S_TURT_03; i++)
-            states[i].tics >>= 1;
-
-        // Crusaders
-        for(i = S_ROB2_09; i <= S_ROB2_19; i++)
-            states[i].tics >>= 1;
-
-        // Stalkers
-        for(i = S_SPID_03; i <= S_SPID_10; i++)
-            states[i].tics >>= 1;
-
-        // The Bishop's homing missiles - again, seemingly backward.
-        mobjinfo[MT_SEEKMISSILE].speed >>= 1;
-    }
-    if(fastparm || (skill == sk_nightmare && skill != gameskill))
-    {
-        // BLOODBATH! Make some things super-aggressive.
-        
-        // Acolytes walk, attack, and feel pain twice as fast
-        // (This makes just getting out of the first room almost impossible)
-        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
-            states[i].tics >>= 1;
-
-        // Bishop's homing missiles again get SLOWER and not faster o_O
-        mobjinfo[MT_SEEKMISSILE].speed >>= 1;
-    }
-    else if(skill != sk_nightmare && gameskill == sk_nightmare)
-    {
-        // Setting back to an ordinary skill after being on Bloodbath?
-        // Put stuff back to normal.
-
-        // Acolytes
-        for(i = S_AGRD_13; i <= S_AGRD_23; i++)
-            states[i].tics *= 2;
-
-        // Bishop's homing missiles
-        mobjinfo[MT_SEEKMISSILE].speed *= 2;
-    }
-
-    // force players to be initialized upon first level load
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-        players[i].playerstate = PST_REBORN; 
-
-    usergame = true;                // will be set false if a demo 
-    paused = false; 
-    demoplayback = false; 
-    automapactive = false; 
-    viewactive = true; 
-    //gameepisode = episode; [STRIFE] no episodes
-    gamemap = map; 
-    gameskill = skill; 
-    riftdest = 0; // haleyjd 08/24/10: [STRIFE] init riftdest to zero on new game
-
-    // Set the sky to use.
-    //
-    // Note: This IS broken, but it is how Vanilla Doom behaves.
-    // See http://doomwiki.org/wiki/Sky_never_changes_in_Doom_II.
-    //
-    // Because we set the sky here at the start of a game, not at the
-    // start of a level, the sky texture never changes unless we
-    // restore from a saved game.  This was fixed before the Doom
-    // source release, but this IS the way Vanilla DOS Doom behaves.
-
-    // [STRIFE] Strife skies (of which there are but two)
-    if(gamemap >= 9 && gamemap < 32)
-        skytexturename = "skymnt01";
-    else
-        skytexturename = "skymnt02";
-
-    skytexturename = DEH_String(skytexturename);
-
-    skytexture = R_TextureNumForName(skytexturename);
-
-    // [STRIFE] HUBS
-    G_LoadPath(gamemap);
-    G_DoLoadLevel();
-} 
- 
-
-//
-// DEMO RECORDING 
-// 
-#define DEMOMARKER		0x80
-
-//
-// G_ReadDemoTiccmd
-//
-// [STRIFE] Modified for Strife ticcmd_t
-//
-void G_ReadDemoTiccmd (ticcmd_t* cmd) 
-{ 
-    if (*demo_p == DEMOMARKER) 
-    {
-        // end of demo data stream 
-        G_CheckDemoStatus (); 
-        return; 
-    }
-    cmd->forwardmove = ((signed char)*demo_p++); 
-    cmd->sidemove = ((signed char)*demo_p++); 
-    cmd->angleturn = ((unsigned char) *demo_p++)<<8; 
-    cmd->buttons = (unsigned char)*demo_p++; 
-    cmd->buttons2 = (unsigned char)*demo_p++; // [STRIFE]
-    cmd->inventory = (int)*demo_p++;          // [STRIFE]
-}
-
-// Increase the size of the demo buffer to allow unlimited demos
-
-static void IncreaseDemoBuffer(void)
-{
-    int current_length;
-    byte *new_demobuffer;
-    byte *new_demop;
-    int new_length;
-
-    // Find the current size
-
-    current_length = demoend - demobuffer;
-    
-    // Generate a new buffer twice the size
-    new_length = current_length * 2;
-    
-    new_demobuffer = Z_Malloc(new_length, PU_STATIC, 0);
-    new_demop = new_demobuffer + (demo_p - demobuffer);
-
-    // Copy over the old data
-
-    memcpy(new_demobuffer, demobuffer, current_length);
-
-    // Free the old buffer and point the demo pointers at the new buffer.
-
-    Z_Free(demobuffer);
-
-    demobuffer = new_demobuffer;
-    demo_p = new_demop;
-    demoend = demobuffer + new_length;
-}
-
-//
-// G_WriteDemoTiccmd
-//
-// [STRIFE] Modified for Strife ticcmd_t.
-//
-void G_WriteDemoTiccmd (ticcmd_t* cmd) 
-{ 
-    byte *demo_start;
-
-    if (gamekeydown[key_demo_quit])           // press q to end demo recording 
-        G_CheckDemoStatus (); 
-
-    demo_start = demo_p;
-
-    *demo_p++ = cmd->forwardmove; 
-    *demo_p++ = cmd->sidemove; 
-    *demo_p++ = cmd->angleturn >> 8; 
-    *demo_p++ = cmd->buttons; 
-    *demo_p++ = cmd->buttons2;                 // [STRIFE]
-    *demo_p++ = (byte)(cmd->inventory & 0xff); // [STRIFE]
-
-    // reset demo pointer back
-    demo_p = demo_start;
-
-    if (demo_p > demoend - 16)
-    {
-        if (vanilla_demo_limit)
-        {
-            // no more space 
-            G_CheckDemoStatus (); 
-            return; 
-        }
-        else
-        {
-            // Vanilla demo limit disabled: unlimited
-            // demo lengths!
-
-            IncreaseDemoBuffer();
-        }
-    } 
-
-    G_ReadDemoTiccmd (cmd);         // make SURE it is exactly the same 
-} 
- 
- 
- 
-//
-// G_RecordDemo 
-// 
-// [STRIFE] Verified unmodified
-//
-void G_RecordDemo (const char* name)
-{
-    size_t demoname_size;
-    int             i;
-    int             maxsize;
-
-    usergame = false;
-    demoname_size = strlen(name) + 5;
-    demoname = Z_Malloc(demoname_size, PU_STATIC, NULL);
-    M_snprintf(demoname, demoname_size, "%s.lmp", name);
-    maxsize = 0x20000;
-
-    //!
-    // @arg <size>
-    // @category demo
-    // @vanilla
-    //
-    // Specify the demo buffer size (KiB)
-    //
-
-    i = M_CheckParmWithArgs("-maxdemo", 1);
-    if (i)
-        maxsize = atoi(myargv[i+1])*1024;
-    demobuffer = Z_Malloc (maxsize,PU_STATIC,NULL); 
-    demoend = demobuffer + maxsize;
-
-    demorecording = true; 
-} 
- 
- 
-void G_BeginRecording (void) 
-{ 
-    int             i; 
-
-    //
-    // @category demo
-    //
-    // Record a high resolution "Doom 1.91" demo.
-    //
-    
-    // STRIFE-TODO: if somebody makes a "Strife Plus", we could add this.
-    /*
-    longtics = M_CheckParm("-longtics") != 0;
-    */
-    longtics = false;
-
-    // If not recording a longtics demo, record in low res
-    lowres_turn = !longtics;
-
-    demo_p = demobuffer;
-
-    // Save the right version code for this demo
-    *demo_p++ = STRIFE_VERSION;
-
-    *demo_p++ = gameskill; 
-    //*demo_p++ = gameepisode; [STRIFE] Doesn't have episodes.
-    *demo_p++ = gamemap; 
-    *demo_p++ = deathmatch; 
-    *demo_p++ = respawnparm;
-    *demo_p++ = fastparm;
-    *demo_p++ = nomonsters;
-    *demo_p++ = consoleplayer;
- 
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-        *demo_p++ = playeringame[i]; 
-} 
- 
-
-//
-// G_PlayDemo 
-//
-
-const char	*defdemoname;
- 
-//
-// G_DeferedPlayDemo
-//
-// [STRIFE] Verified unmodified
-//
-void G_DeferedPlayDemo(const char *name)
-{ 
-    defdemoname = name; 
-    gameaction = ga_playdemo; 
-} 
-
-// Generate a string describing a demo version
-// [STRIFE] Modified to handle the one and only Strife demo version.
-static const char *DemoVersionDescription(int version)
-{
-    static char resultbuf[16];
- 
-    // [STRIFE] All versions of Strife 1.1 and later use 101 as their 
-    // internal version number. Brilliant, huh? So we can't discern much
-    // here.
-
-    switch (version)
-    {
-    case 100: 
-        return "v1.0"; // v1.0 would be the ancient demo version
-    default:
-        break;
-    }
-
-    // Unknown version. Who knows?
-    M_snprintf(resultbuf, sizeof(resultbuf),
-               "%i.%i (unknown)", version / 100, version % 100);
-
-    return resultbuf;
-}
-
-//
-// G_DoPlayDemo
-//
-// [STRIFE] Modified for Strife demo format.
-//
-void G_DoPlayDemo (void) 
-{ 
-    skill_t skill; 
-    int     i, map; 
-    int     demoversion;
-
-    gameaction = ga_nothing; 
-    demobuffer = demo_p = W_CacheLumpName (defdemoname, PU_STATIC); 
-
-    demoversion = *demo_p++;
-
-    if (demoversion == STRIFE_VERSION)
-    {
-        longtics = false;
-    }
-    /* STRIFE-TODO: Not until/unless somebody makes a Strife-Plus :P
-    else if (demoversion == DOOM_191_VERSION)
-    {
-        // demo recorded with cph's modified "v1.91" doom exe
-        longtics = true;
-    }
-    */
-    else
-    {
-        const char *message = "Demo is from a different game version!\n"
-                              "(read %i, should be %i)\n"
-                              "\n"
-                              "*** You may need to upgrade your version "
-                                  "of Strife to v1.1 or later. ***\n"
-                              "    See: https://www.doomworld.com/classicdoom"
-                                        "/info/patches.php\n"
-                              "    This appears to be %s.";
-
-        I_Error(message, demoversion, STRIFE_VERSION,
-                         DemoVersionDescription(demoversion));
-    }
-    
-    skill = *demo_p++; 
-    //episode = *demo_p++; [STRIFE] No episodes
-    map = *demo_p++; 
-    deathmatch = *demo_p++;
-    respawnparm = *demo_p++;
-    fastparm = *demo_p++;
-    nomonsters = *demo_p++;
-    consoleplayer = *demo_p++;
-
-    for (i=0 ; i<MAXPLAYERS ; i++) 
-        playeringame[i] = *demo_p++; 
-
-    //!
-    // @category demo
-    // 
-    // Play back a demo recorded in a netgame with a single player.
-    //
-
-    if (playeringame[1] || M_ParmExists("-solo-net"))
-    {
-	netgame = true;
-	netdemo = true;
-    }
-
-    // don't spend a lot of time in loadlevel 
-    precache = false;
-    G_InitNew(skill, map); 
-    precache = true; 
-    
-    // [STRIFE] not here...
-    //starttime = I_GetTime (); 
-
-    usergame = false; 
-    demoplayback = true; 
-} 
-
-//
-// G_TimeDemo 
-//
-// [STRIFE] Verified unmodified
-//
-void G_TimeDemo (char* name) 
-{
-    //!
-    // @category video
-    // @vanilla
-    //
-    // Disable rendering the screen entirely.
-    //
-
-    nodrawers = M_ParmExists("-nodraw");
-
-    timingdemo = true; 
-    singletics = true; 
-
-    defdemoname = name; 
-    gameaction = ga_playdemo; 
-} 
- 
- 
-/* 
-=================== 
-= 
-= G_CheckDemoStatus 
-= 
-= Called after a death or level completion to allow demos to be cleaned up 
-= Returns true if a new demo loop action will take place 
-=================== 
-*/ 
-//
-// [STRIFE] Verified unmodified
-//
-boolean G_CheckDemoStatus (void) 
-{ 
-    int             endtime; 
-
-    if (timingdemo) 
-    { 
-        float fps;
-        int realtics;
-
-        endtime = I_GetTime (); 
-        realtics = endtime - starttime;
-        fps = ((float) gametic * TICRATE) / realtics;
-
-        // Prevent recursive calls
-        timingdemo = false;
-        demoplayback = false;
-
-        I_Error ("timed %i gametics in %i realtics (%f fps)",
-                 gametic, realtics, fps);
-    } 
-
-    if (demoplayback) 
-    { 
-        W_ReleaseLumpName(defdemoname);
-        demoplayback = false; 
-        netdemo = false;
-        netgame = false;
-        deathmatch = false;
-        playeringame[1] = playeringame[2] = playeringame[3] = 0;
-        respawnparm = false;
-        fastparm = false;
-        nomonsters = false;
-        consoleplayer = 0;
-        
-        if (singledemo) 
-            I_Quit (); 
-        else 
-            D_AdvanceDemo (); 
-
-        return true; 
-    } 
- 
-    if (demorecording) 
-    { 
-        *demo_p++ = DEMOMARKER; 
-        M_WriteFile (demoname, demobuffer, demo_p - demobuffer); 
-        Z_Free (demobuffer); 
-        demorecording = false; 
-        I_Error ("Demo %s recorded", demoname); 
-    } 
-
-    return false; 
-} 
diff --git a/games/NXDoom/src/strife/g_game.h b/games/NXDoom/src/strife/g_game.h
deleted file mode 100644
index 9a0e47fb4..000000000
--- a/games/NXDoom/src/strife/g_game.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Duh.
-// 
-
-
-#ifndef __G_GAME__
-#define __G_GAME__
-
-#include "doomdef.h"
-#include "d_event.h"
-#include "d_ticcmd.h"
-#include "tables.h"
-
-//
-// GAME
-//
-void G_DeathMatchSpawnPlayer (int playernum);
-
-// [STRIFE] Removed episode parameter
-void G_InitNew (skill_t skill, int map);
-
-// Can be called by the startup code or M_Responder.
-// A normal game starts at map 1,
-// but a warp test can start elsewhere
-// [STRIFE] Removed episode parameter
-void G_DeferedInitNew (skill_t skill, int map);
-
-void G_DeferedPlayDemo(const char *demo);
-
-// Can be called by the startup code or M_Responder,
-// calls P_SetupLevel or W_EnterWorld.
-void G_LoadGame (char* name);
-
-void G_DoLoadGame (boolean userload);
-
-// Called by M_Responder.
-void G_SaveGame (int slot, char* description);
-
-// Only called by startup code.
-void G_RecordDemo (const char* name);
-
-void G_BeginRecording (void);
-
-void G_PlayDemo (char* name);
-void G_TimeDemo (char* name);
-boolean G_CheckDemoStatus (void);
-
-void G_RiftExitLevel(int map, int spot, angle_t angle); // [STRIFE]
-void G_ExitLevel (int dest);
-//void G_SecretExitLevel (void);
-
-void G_StartFinale(void); // [STRIFE]
-
-//void G_WorldDone (void);
-
-boolean G_RiftCheat(int riftSpotNum); // [STRIFE]
-
-// Read current data from inputs and build a player movement command.
-
-void G_BuildTiccmd (ticcmd_t *cmd, int maketic);
-
-void G_Ticker (void);
-boolean G_Responder (event_t*	ev);
-
-void G_ScreenShot (void);
-
-void G_DrawMouseSpeedBox(void);
-
-// [STRIFE]
-boolean G_WriteSaveName(int slot, const char *charname);
-void    G_ReadCurrent(const char *path);
-
-extern int vanilla_savegame_limit;
-extern int vanilla_demo_limit;
-#endif
diff --git a/games/NXDoom/src/strife/hu_lib.c b/games/NXDoom/src/strife/hu_lib.c
deleted file mode 100644
index 386c17d9d..000000000
--- a/games/NXDoom/src/strife/hu_lib.c
+++ /dev/null
@@ -1,474 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  heads-up text and input code
-//
-
-
-#include <ctype.h>
-
-#include "doomdef.h"
-#include "doomkeys.h"
-
-#include "v_video.h"
-#include "i_swap.h"
-
-#include "d_main.h"
-#include "hu_lib.h"
-#include "r_local.h"
-#include "r_draw.h"
-#include "hu_stuff.h" // [STRIFE]
-
-#include "doomstat.h"
-
-// boolean : whether the screen is always erased
-#define noterased viewwindowx
-
-
-//
-// HUlib_drawYellowText
-//
-// haleyjd 20100918: [STRIFE] New function.
-//
-void HUlib_drawYellowText(int x, int y, const char *text)
-{
-    int start_x = x;
-    const char *rover = text;
-    char c;
-
-    while((c = *rover++))
-    {
-        if(c == '\n')
-        {
-            x = start_x;
-            y += 12;
-            continue;
-        }
-
-        // haleyjd 20110213: found MORE code ignored/misinterpreted by Hex-Rays:
-        // Underscores are replaced by spaces.
-        if(c == '_')
-            c = ' ';
-        else if (c == ' ' && x == start_x) // skip spaces at the start of a line
-            continue;
-
-        c = toupper(c) - HU_FONTSTART;
-
-        if(c >= 0 && c < HU_FONTSIZE)
-        {
-            patch_t *patch = yfont[(int) c];
-            int      width = SHORT(patch->width);
-
-            if(x + width <= (SCREENWIDTH - 20))
-            {
-                // haleyjd: STRIFE-TODO: bit different than the exe... for now
-                if(!D_PatchClipCallback(patch, x + SHORT(patch->leftoffset),
-                    y + SHORT(patch->topoffset)))
-                    return;
-                V_DrawPatchDirect(x, y, patch);
-                x = x + width;
-            }
-            else
-            {
-                x = start_x;
-                --rover;
-                y += 12;
-            }
-        }
-        else
-        {
-            x += 4;
-        }
-    }
-}
-
-//
-// HUlib_init
-//
-// [STRIFE] Verified unmodified.
-//
-void HUlib_init(void)
-{
-}
-
-//
-// HUlib_clearTextLine
-// 
-// [STRIFE] Verified unmodified.
-//
-void HUlib_clearTextLine(hu_textline_t* t)
-{
-    t->len = 0;
-    t->l[0] = 0;
-    t->needsupdate = true;
-}
-
-//
-// HUlib_initTextLine
-//
-// [STRIFE] Verified unmodified
-//
-void
-HUlib_initTextLine
-( hu_textline_t*        t,
-  int                   x,
-  int                   y,
-  patch_t**             f,
-  int                   sc )
-{
-    t->x = x;
-    t->y = y;
-    t->f = f;
-    t->sc = sc;
-    HUlib_clearTextLine(t);
-}
-
-//
-// HUlib_addCharToTextLine
-//
-// [STRIFE] Verified unmodified.
-//
-boolean
-HUlib_addCharToTextLine
-( hu_textline_t*        t,
-  char                  ch )
-{
-    if (t->len == HU_MAXLINELENGTH)
-        return false;
-    else
-    {
-        t->l[t->len++] = ch;
-        t->l[t->len] = 0;
-        t->needsupdate = 4;
-        return true;
-    }
-}
-
-//
-// HUlib_delCharFromTextLine
-//
-// [STRIFE] Verified unmodified.
-//
-boolean HUlib_delCharFromTextLine(hu_textline_t* t)
-{
-    if (!t->len) return false;
-    else
-    {
-        t->l[--t->len] = 0;
-        t->needsupdate = 4;
-        return true;
-    }
-}
-
-//
-// HUlib_drawTextLine
-//
-// haleyjd 09/18/10: [STRIFE] Modified to not draw underscores in text.
-//
-void
-HUlib_drawTextLine
-( hu_textline_t*        l,
-  boolean               drawcursor )
-{
-    int                 i;
-    int                 w;
-    int                 x;
-    unsigned char       c;
-
-    // draw the new stuff
-    x = l->x;
-
-    for(i = 0; i < l->len; i++)
-    {
-        c = toupper(l->l[i]);
-        if (c != ' ' && c >= l->sc && c < '_') // [STRIFE]: Underscores excluded
-        {
-            w = SHORT(l->f[c - l->sc]->width);
-            if (x+w > SCREENWIDTH)
-                break;
-            V_DrawPatchDirect(x, l->y, l->f[c - l->sc]);
-            x += w;
-        }
-        else
-        {
-            x += 4;
-            if (x >= SCREENWIDTH)
-                break;
-        }
-    }
-
-    // draw the cursor if requested
-    if (drawcursor
-        && x + SHORT(l->f['_' - l->sc]->width) <= SCREENWIDTH)
-    {
-        V_DrawPatchDirect(x, l->y, l->f['_' - l->sc]);
-    }
-}
-
-//
-// HUlib_eraseTextLine
-//
-// sorta called by HU_Erase and just better darn get things straight
-// 
-// [STRIFE] Verified unmodified.
-//
-void HUlib_eraseTextLine(hu_textline_t* l)
-{
-    int                 lh;
-    int                 y;
-    int                 yoffset;
-
-    // Only erases when NOT in automap and the screen is reduced,
-    // and the text must either need updating or refreshing
-    // (because of a recent change back from the automap)
-
-    if (!automapactive &&
-        viewwindowx && l->needsupdate)
-    {
-        lh = SHORT(l->f[0]->height) + 1;
-        for (y=l->y,yoffset=y*SCREENWIDTH ; y<l->y+lh ; y++,yoffset+=SCREENWIDTH)
-        {
-            if (y < viewwindowy || y >= viewwindowy + viewheight)
-                R_VideoErase(yoffset, SCREENWIDTH); // erase entire line
-            else
-            {
-                R_VideoErase(yoffset, viewwindowx); // erase left border
-                R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
-                // erase right border
-            }
-        }
-    }
-
-    if (l->needsupdate) l->needsupdate--;
-}
-
-//
-// HUlib_initSText
-//
-// [STRIFE] Verified unmodified.
-//
-void
-HUlib_initSText
-( hu_stext_t*   s,
-  int           x,
-  int           y,
-  int           h,
-  patch_t**     font,
-  int           startchar,
-  boolean*      on )
-{
-    int i;
-
-    s->h = h;
-    s->on = on;
-    s->laston = true;
-    s->cl = 0;
-    for (i=0;i<h;i++)
-    {
-        HUlib_initTextLine(&s->l[i],
-                           x, y - i*(SHORT(font[0]->height)+1),
-                           font, startchar);
-    }
-}
-
-//
-// HUlib_addLineToSText
-//
-// [STRIFE] Verified unmodified.
-//
-void HUlib_addLineToSText(hu_stext_t* s)
-{
-    int i;
-
-    // add a clear line
-    if (++s->cl == s->h)
-        s->cl = 0;
-    HUlib_clearTextLine(&s->l[s->cl]);
-
-    // everything needs updating
-    for (i=0 ; i<s->h ; i++)
-        s->l[i].needsupdate = 4;
-}
-
-//
-// HUlib_addMessageToSText
-//
-// [STRIFE] Verified unmodified.
-//
-void
-HUlib_addMessageToSText
-( hu_stext_t*	s,
-  const char	*prefix,
-  const char	*msg )
-{
-    HUlib_addLineToSText(s);
-    if (prefix)
-        while (*prefix)
-            HUlib_addCharToTextLine(&s->l[s->cl], *(prefix++));
-
-    while (*msg)
-        HUlib_addCharToTextLine(&s->l[s->cl], *(msg++));
-}
-
-//
-// HUlib_drawSText
-//
-// [STRIFE] Verified unmodified.
-//
-void HUlib_drawSText(hu_stext_t* s)
-{
-    int i, idx;
-    hu_textline_t *l;
-
-    if (!*s->on)
-        return; // if not on, don't draw
-
-    // draw everything
-    for (i=0 ; i<s->h ; i++)
-    {
-        idx = s->cl - i;
-        if (idx < 0)
-            idx += s->h; // handle queue of lines
-
-        l = &s->l[idx];
-
-        // need a decision made here on whether to skip the draw
-        HUlib_drawTextLine(l, false); // no cursor, please
-    }
-}
-
-//
-// HUlib_eraseSText
-//
-// [STRIFE] Verified unmodified.
-//
-void HUlib_eraseSText(hu_stext_t* s)
-{
-    int i;
-
-    for (i=0 ; i<s->h ; i++)
-    {
-        if (s->laston && !*s->on)
-            s->l[i].needsupdate = 4;
-        HUlib_eraseTextLine(&s->l[i]);
-    }
-    s->laston = *s->on;
-}
-
-//
-// HUlib_initIText
-//
-// [STRIFE] Verified unmodified.
-//
-void
-HUlib_initIText
-( hu_itext_t*   it,
-  int           x,
-  int           y,
-  patch_t**     font,
-  int           startchar,
-  boolean*      on )
-{
-    it->lm = 0; // default left margin is start of text
-    it->on = on;
-    it->laston = true;
-    HUlib_initTextLine(&it->l, x, y, font, startchar);
-}
-
-
-// The following deletion routines adhere to the left margin restriction
-// [STRIFE] Verified unmodified.
-void HUlib_delCharFromIText(hu_itext_t* it)
-{
-    if (it->l.len != it->lm)
-        HUlib_delCharFromTextLine(&it->l);
-}
-
-// [STRIFE] Verified unmodified.
-void HUlib_eraseLineFromIText(hu_itext_t* it)
-{
-    while (it->lm != it->l.len)
-        HUlib_delCharFromTextLine(&it->l);
-}
-
-// Resets left margin as well
-// [STRIFE] Verified unmodified.
-void HUlib_resetIText(hu_itext_t* it)
-{
-    it->lm = 0;
-    HUlib_clearTextLine(&it->l);
-}
-
-//
-// HUlib_addPrefixToIText
-//
-// [STRIFE] Verified unmodified.
-//
-void
-HUlib_addPrefixToIText
-( hu_itext_t*   it,
-  char*         str )
-{
-    while (*str)
-        HUlib_addCharToTextLine(&it->l, *(str++));
-    it->lm = it->l.len;
-}
-
-// wrapper function for handling general keyed input.
-// returns true if it ate the key
-// [STRIFE] Verified unmodified.
-boolean
-HUlib_keyInIText
-( hu_itext_t*	it,
-  unsigned char ch )
-{
-    ch = toupper(ch);
-
-    if (ch >= ' ' && ch <= '_') 
-        HUlib_addCharToTextLine(&it->l, (char) ch);
-    else if (ch == KEY_BACKSPACE) 
-        HUlib_delCharFromIText(it);
-    else if (ch != KEY_ENTER) 
-        return false; // did not eat key
-
-    return true; // ate the key
-}
-
-//
-// HUlib_drawIText
-//
-// [STRIFE] Verified unmodified.
-//
-void HUlib_drawIText(hu_itext_t* it)
-{
-    hu_textline_t *l = &it->l;
-
-    if (!*it->on)
-        return;
-    HUlib_drawTextLine(l, true); // draw the line w/ cursor
-}
-
-//
-// HUlib_eraseIText
-//
-// [STRIFE] Verified unmodified.
-//
-void HUlib_eraseIText(hu_itext_t* it)
-{
-    if (it->laston && !*it->on)
-        it->l.needsupdate = 4;
-    HUlib_eraseTextLine(&it->l);
-    it->laston = *it->on;
-}
-
diff --git a/games/NXDoom/src/strife/hu_lib.h b/games/NXDoom/src/strife/hu_lib.h
deleted file mode 100644
index 5639860d1..000000000
--- a/games/NXDoom/src/strife/hu_lib.h
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
-
-#ifndef __HULIB__
-#define __HULIB__
-
-// We are referring to patches.
-#include "r_defs.h"
-
-// font stuff
-#define HU_CHARERASE	KEY_BACKSPACE
-
-#define HU_MAXLINES		4
-#define HU_MAXLINELENGTH	80
-
-//
-// Typedefs of widgets
-//
-
-// Text Line widget
-//  (parent of Scrolling Text and Input Text widgets)
-typedef struct
-{
-    // left-justified position of scrolling text window
-    int		x;
-    int		y;
-    
-    patch_t**	f;			// font
-    int		sc;			// start character
-    char	l[HU_MAXLINELENGTH+1];	// line of text
-    int		len;		      	// current line length
-
-    // whether this line needs to be udpated
-    int		needsupdate;	      
-
-} hu_textline_t;
-
-
-
-// Scrolling Text window widget
-//  (child of Text Line widget)
-typedef struct
-{
-    hu_textline_t	l[HU_MAXLINES];	// text lines to draw
-    int			h;		// height in lines
-    int			cl;		// current line number
-
-    // pointer to boolean stating whether to update window
-    boolean*		on;
-    boolean		laston;		// last value of *->on.
-
-} hu_stext_t;
-
-
-
-// Input Text Line widget
-//  (child of Text Line widget)
-typedef struct
-{
-    hu_textline_t	l;		// text line to input on
-
-     // left margin past which I am not to delete characters
-    int			lm;
-
-    // pointer to boolean stating whether to update window
-    boolean*		on; 
-    boolean		laston; // last value of *->on;
-
-} hu_itext_t;
-
-
-//
-// Widget creation, access, and update routines
-//
-
-// initializes heads-up widget library
-void HUlib_init(void);
-
-//
-// textline code
-//
-
-// clear a line of text
-void	HUlib_clearTextLine(hu_textline_t *t);
-
-void	HUlib_initTextLine(hu_textline_t *t, int x, int y, patch_t **f, int sc);
-
-// returns success
-boolean HUlib_addCharToTextLine(hu_textline_t *t, char ch);
-
-// returns success
-boolean HUlib_delCharFromTextLine(hu_textline_t *t);
-
-// draws tline
-void	HUlib_drawTextLine(hu_textline_t *l, boolean drawcursor);
-
-// erases text line
-void	HUlib_eraseTextLine(hu_textline_t *l);
-
-// villsa [STRIFE]
-void HUlib_drawYellowText(int x, int y, const char *text);
-
-
-//
-// Scrolling Text window widget routines
-//
-
-// ?
-void
-HUlib_initSText
-( hu_stext_t*	s,
-  int		x,
-  int		y,
-  int		h,
-  patch_t**	font,
-  int		startchar,
-  boolean*	on );
-
-// add a new line
-void HUlib_addLineToSText(hu_stext_t* s);  
-
-// ?
-void
-HUlib_addMessageToSText
-( hu_stext_t*	s,
-  const char	*prefix,
-  const char	*msg );
-
-// draws stext
-void HUlib_drawSText(hu_stext_t* s);
-
-// erases all stext lines
-void HUlib_eraseSText(hu_stext_t* s); 
-
-// Input Text Line widget routines
-void
-HUlib_initIText
-( hu_itext_t*	it,
-  int		x,
-  int		y,
-  patch_t**	font,
-  int		startchar,
-  boolean*	on );
-
-// enforces left margin
-void HUlib_delCharFromIText(hu_itext_t* it);
-
-// enforces left margin
-void HUlib_eraseLineFromIText(hu_itext_t* it);
-
-// resets line and left margin
-void HUlib_resetIText(hu_itext_t* it);
-
-// left of left-margin
-void
-HUlib_addPrefixToIText
-( hu_itext_t*	it,
-  char*		str );
-
-// whether eaten
-boolean
-HUlib_keyInIText
-( hu_itext_t*	it,
-  unsigned char ch );
-
-void HUlib_drawIText(hu_itext_t* it);
-
-// erases all itext lines
-void HUlib_eraseIText(hu_itext_t* it); 
-
-#endif
diff --git a/games/NXDoom/src/strife/hu_stuff.c b/games/NXDoom/src/strife/hu_stuff.c
deleted file mode 100644
index 34f8ff457..000000000
--- a/games/NXDoom/src/strife/hu_stuff.c
+++ /dev/null
@@ -1,687 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  Heads-up displays
-//
-
-
-#include <ctype.h>
-
-#include "doomdef.h"
-#include "doomkeys.h"
-
-#include "z_zone.h"
-
-#include "deh_main.h"
-#include "i_input.h"
-#include "i_swap.h"
-#include "i_video.h"
-
-#include "d_main.h"
-#include "hu_stuff.h"
-#include "hu_lib.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "w_wad.h"
-
-#include "s_sound.h"
-
-#include "doomstat.h"
-
-// Data.
-#include "dstrings.h"
-#include "sounds.h"
-
-//
-// Locally used constants, shortcuts.
-//
-#define HU_TITLE        (mapnames[gamemap-1])
-#define HU_TITLEHEIGHT  1
-#define HU_TITLEX       0
-
-// haleyjd 09/01/10: [STRIFE] 167 -> 160 to move up level name
-#define HU_TITLEY       (160 - SHORT(hu_font[0]->height))
-
-#define HU_INPUTTOGGLE  't'
-#define HU_INPUTX       HU_MSGX
-#define HU_INPUTY       (HU_MSGY + HU_MSGHEIGHT*(SHORT(hu_font[0]->height) +1))
-#define HU_INPUTWIDTH   64
-#define HU_INPUTHEIGHT  1
-
-char *chat_macros[10];
-
-// villsa [STRIFE]
-char player_names[8][16] =
-{
-    "1: ",
-    "2: ",
-    "3: ",
-    "4: ",
-    "5: ",
-    "6: ",
-    "7: ",
-    "8: "
-};
-
-char                    chat_char; // remove later.
-static player_t*        plr;
-patch_t*                hu_font[HU_FONTSIZE];
-patch_t*                yfont[HU_FONTSIZE];   // haleyjd 09/18/10: [STRIFE]
-static hu_textline_t    w_title;
-boolean                 chat_on;
-static hu_itext_t       w_chat;
-static boolean          always_off = false;
-static char             chat_dest[MAXPLAYERS];
-static hu_itext_t       w_inputbuffer[MAXPLAYERS];
-
-static boolean          message_on;
-boolean                 message_dontfuckwithme;
-static boolean          message_nottobefuckedwith;
-
-static hu_stext_t       w_message;
-static int              message_counter;
-
-
-static boolean          headsupactive = false;
-
-// haleyjd 20130915 [STRIFE]: true if setting nickname
-static boolean hu_setting_name = false;
-
-//
-// Builtin map names.
-// The actual names can be found in DStrings.h.
-//
-
-// haleyjd 08/31/10: [STRIFE] Changed for Strife level names.
-// List of names for levels.
-
-const char *mapnames[] =
-{
-    // Strife map names
-
-    // First "episode" - Quest to destroy the Order's Castle
-    HUSTR_1,
-    HUSTR_2,
-    HUSTR_3,
-    HUSTR_4,
-    HUSTR_5,
-    HUSTR_6,
-    HUSTR_7,
-    HUSTR_8,
-    HUSTR_9,
-
-    // Second "episode" - Kill the Bishop and Make a Choice
-    HUSTR_10,
-    HUSTR_11,
-    HUSTR_12,
-    HUSTR_13,
-    HUSTR_14,
-    HUSTR_15,
-    HUSTR_16,
-    HUSTR_17,
-    HUSTR_18,
-    HUSTR_19,
-
-    // Third "episode" - Shut down Factory, kill Loremaster and Entity
-    HUSTR_20,
-    HUSTR_21,
-    HUSTR_22,
-    HUSTR_23,
-    HUSTR_24,
-    HUSTR_25,
-    HUSTR_26,
-    HUSTR_27,
-    HUSTR_28,
-    HUSTR_29,
-
-    // "Secret" levels - Abandoned Base and Training Facility
-    HUSTR_30,
-    HUSTR_31,
-
-    // Demo version maps
-    HUSTR_32,
-    HUSTR_33,
-    HUSTR_34
-};
-
-//
-// HU_Init
-//
-// haleyjd 09/18/10: [STRIFE]
-// * Modified to load yfont along with hu_font.
-//
-void HU_Init(void)
-{
-    int		i;
-    int		j;
-    char	buffer[9];
-
-    // load the heads-up font
-    j = HU_FONTSTART;
-    for (i=0;i<HU_FONTSIZE;i++)
-    {
-        DEH_snprintf(buffer, 9, "STCFN%.3d", j++);
-        hu_font[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
-
-        // haleyjd 09/18/10: load yfont as well; and yes, this is exactly
-        // how Rogue did it :P
-        buffer[2] = 'B';
-        yfont[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
-    }
-}
-
-//
-// HU_Stop
-//
-// [STRIFE] Verified unmodified.
-//
-void HU_Stop(void)
-{
-    headsupactive = false;
-}
-
-//
-// HU_Start
-//
-// haleyjd 09/18/10: [STRIFE] Added a hack for nickname at the end.
-//
-void HU_Start(void)
-{
-    int         i;
-    const char *s;
-
-    // haleyjd 20120211: [STRIFE] not called here.
-    //if (headsupactive)
-    //    HU_Stop();
-    
-    // haleyjd 20120211: [STRIFE] moved up
-    // create the map title widget
-    HUlib_initTextLine(&w_title,
-                       HU_TITLEX, HU_TITLEY,
-                       hu_font,
-                       HU_FONTSTART);
-
-    // haleyjd 08/31/10: [STRIFE] Get proper map name.
-    s = HU_TITLE;
-
-    // [STRIFE] Removed Chex Quest stuff.
-
-    // dehacked substitution to get modified level name
-    s = DEH_String(s);
-    
-    while (*s)
-        HUlib_addCharToTextLine(&w_title, *(s++));
-
-    // haleyjd 20120211: [STRIFE] check for headsupactive
-    if(!headsupactive)
-    {
-        plr = &players[consoleplayer];
-        message_on = false;
-        message_dontfuckwithme = false;
-        message_nottobefuckedwith = false;
-        chat_on = false;
-
-        // create the message widget
-        HUlib_initSText(&w_message,
-                        HU_MSGX, HU_MSGY, HU_MSGHEIGHT,
-                        hu_font,
-                        HU_FONTSTART, &message_on);
-
-        // create the chat widget
-        HUlib_initIText(&w_chat,
-                        HU_INPUTX, HU_INPUTY,
-                        hu_font,
-                        HU_FONTSTART, &chat_on);
-
-        // create the inputbuffer widgets
-        for (i=0 ; i<MAXPLAYERS ; i++)
-            HUlib_initIText(&w_inputbuffer[i], 0, 0, 0, 0, &always_off);
-
-        headsupactive = true;
-
-        // haleyjd 09/18/10: [STRIFE] nickname weirdness. 
-        if(nickname != player_names[consoleplayer])
-        {
-            if(nickname != NULL && *nickname)
-            {
-                DEH_printf("have one\n");
-                nickname = player_names[consoleplayer];
-            }
-        }
-    }
-}
-
-//
-// HU_Drawer
-//
-// [STRIFE] Verified unmodified.
-//
-void HU_Drawer(void)
-{
-    HUlib_drawSText(&w_message);
-    HUlib_drawIText(&w_chat);
-    if (automapactive)
-        HUlib_drawTextLine(&w_title, false);
-}
-
-//
-// HU_Erase
-//
-// [STRIFE] Verified unmodified.
-//
-void HU_Erase(void)
-{
-    HUlib_eraseSText(&w_message);
-    HUlib_eraseIText(&w_chat);
-    HUlib_eraseTextLine(&w_title);
-}
-
-//
-// HU_addMessage
-//
-// haleyjd 09/18/10: [STRIFE] New function
-// See if you can tell whether or not I had trouble with this :P
-// Looks to be extremely buggy, hackish, and error-prone.
-//
-// <Markov> This is definitely not the best that Rogue had to offer. Markov.
-//
-//  Fastcall Registers:   edx          ebx
-//      Temp Registers:   esi          edi
-static void HU_addMessage(const char *prefix, const char *message)
-{
-    char  c;         // eax
-    int   width = 0; // edx
-    const char *rover1;    // ebx (in first loop)
-    const char *rover2;    // ecx (in second loop)
-    char *bufptr;    // ebx (in second loop)
-    char buffer[HU_MAXLINELENGTH+2];  // esp+52h
-
-    // Loop 1: Total up width of prefix.
-    rover1 = prefix;
-    if(rover1)
-    {
-        while((c = *rover1))
-        {
-            c = toupper(c) - HU_FONTSTART;
-            ++rover1;
-
-            if(c < 0 || c >= HU_FONTSIZE)
-                width += 4;
-            else
-                width += SHORT(hu_font[(int) c]->width);
-        }
-    }
-
-    // Loop 2: Copy as much of message into buffer as will fit on screen
-    bufptr = buffer;
-    rover2 = message;
-    while((c = *rover2))
-    {
-        if((c == ' ' || c == '-') && width > 285)
-            break;
-
-        *bufptr = c;
-        ++bufptr;       // BUG: No check for overflow.
-        ++rover2;
-        c = toupper(c);
-
-        if(c == ' ' || c < '!' || c >= '_')
-            width += 4;
-        else
-        {
-            c -= HU_FONTSTART;
-            width += SHORT(hu_font[(int) c]->width);
-        }
-    }
-
-    // Too big to fit?
-    // BUG: doesn't consider by how much it's over.
-    if(width > 320) 
-    {
-        // backup a char... hell if I know why.
-        --bufptr;
-        --rover2;
-    }
-
-    // rover2 is not at the end?
-    if((c = *rover2))
-    {
-        // if not ON a space...
-        if(c != ' ')
-        {
-            // back up both pointers til one is found.
-            // BUG: no check against LHS of buffer. Hurr!
-            while(*bufptr != ' ')
-            {
-                --bufptr;
-                --rover2;
-            }
-        }
-    }
-
-    *bufptr = '\0';
-
-    // Add two message lines.
-    HUlib_addMessageToSText(&w_message, prefix, buffer);
-    HUlib_addMessageToSText(&w_message, NULL,   rover2);
-}
-
-//
-// HU_Ticker
-//
-// haleyjd 09/18/10: [STRIFE] Changes to split up message into two lines,
-// and support for player names (STRIFE-TODO: unfinished!)
-//
-void HU_Ticker(void)
-{
-    int i, rc;
-    char c;
-    //char *prefix;  STRIFE-TODO
-
-    // tick down message counter if message is up
-    if (message_counter && !--message_counter)
-    {
-        message_on = false;
-        message_nottobefuckedwith = false;
-    }
-
-    // haleyjd 20110219: [STRIFE] this condition was removed
-    //if (showMessages || message_dontfuckwithme)
-    //{
-        // display message if necessary
-        if ((plr->message && !message_nottobefuckedwith)
-            || (plr->message && message_dontfuckwithme))
-        {
-            //HUlib_addMessageToSText(&w_message, 0, plr->message);
-            HU_addMessage(NULL, plr->message); // haleyjd [STRIFE]
-            plr->message = 0;
-            message_on = true;
-            message_counter = HU_MSGTIMEOUT;
-            message_nottobefuckedwith = message_dontfuckwithme;
-            message_dontfuckwithme = 0;
-        }
-    //} // else message_on = false;
-
-    // check for incoming chat characters
-    if (netgame)
-    {
-        for (i=0 ; i<MAXPLAYERS; i++)
-        {
-            if (!playeringame[i])
-                continue;
-            if (i != consoleplayer
-                && (c = players[i].cmd.chatchar))
-            {
-                if (c <= HU_CHANGENAME) // [STRIFE]: allow HU_CHANGENAME here
-                    chat_dest[i] = c;
-                else
-                {
-                    rc = HUlib_keyInIText(&w_inputbuffer[i], c);
-                    if (rc && c == KEY_ENTER)
-                    {
-                        if (w_inputbuffer[i].l.len
-                            && (chat_dest[i] == consoleplayer+1
-                             || chat_dest[i] == HU_BROADCAST))
-                        {
-                            HU_addMessage(player_names[i],
-                                          w_inputbuffer[i].l.l);
-
-                            message_nottobefuckedwith = true;
-                            message_on = true;
-                            message_counter = HU_MSGTIMEOUT;
-                            S_StartSound(0, sfx_radio);
-                        }
-                        else if(chat_dest[i] == HU_CHANGENAME)
-                        {
-                            // haleyjd 20130915 [STRIFE]: set player name
-                            DEH_snprintf(player_names[i], sizeof(player_names[i]),
-                                         "%.13s: ", w_inputbuffer[i].l.l);
-                        }
-                        HUlib_resetIText(&w_inputbuffer[i]);
-                    }
-                }
-                players[i].cmd.chatchar = 0;
-            }
-        }
-    }
-}
-
-#define QUEUESIZE		128
-
-static char	chatchars[QUEUESIZE];
-static int	head = 0;
-static int	tail = 0;
-
-//
-// HU_queueChatChar
-//
-// haleyjd 09/18/10: [STRIFE]
-// * No message is given if a chat queue overflow occurs.
-//
-void HU_queueChatChar(char c)
-{
-    chatchars[head] = c;
-    if (((head + 1) & (QUEUESIZE-1)) != tail)
-    {
-        head = (head + 1) & (QUEUESIZE-1);
-    }
-}
-
-//
-// HU_dequeueChatChar
-//
-// [STRIFE] Verified unmodified.
-//
-char HU_dequeueChatChar(void)
-{
-    char c;
-
-    if (head != tail)
-    {
-        c = chatchars[tail];
-        tail = (tail + 1) & (QUEUESIZE-1);
-    }
-    else
-    {
-        c = 0;
-    }
-
-    return c;
-}
-
-// fraggle 01/05/15: New functions to support the Chocolate input interface.
-static void StartChatInput(void)
-{
-    chat_on = true;
-    I_StartTextInput(HU_INPUTX, HU_INPUTY, SCREENWIDTH, HU_INPUTY + 8);
-}
-
-static void StopChatInput(void)
-{
-    chat_on = false;
-    I_StopTextInput();
-}
-
-//
-// HU_Responder
-//
-// haleyjd 09/18/10: [STRIFE]
-// * Mostly unmodified, except:
-//   - The default value of key_message_refresh is changed. That is handled
-//     elsewhere in Choco, however.
-//   - There is support for setting the player name through the chat
-//     mechanism.
-//
-boolean HU_Responder(event_t *ev)
-{
-    static char         lastmessage[HU_MAXLINELENGTH+1];
-    char*               macromessage;
-    boolean             eatkey = false;
-    static boolean      altdown = false;
-    unsigned char       c;
-    int                 i;
-    
-    static int          num_nobrainers = 0;
-
-    if (ev->data1 == KEY_RSHIFT)
-    {
-        return false;
-    }
-    else if (ev->data1 == KEY_RALT || ev->data1 == KEY_LALT)
-    {
-        altdown = ev->type == ev_keydown;
-        return false;
-    }
-
-    if (ev->type != ev_keydown)
-        return false;
-
-    if (!chat_on)
-    {
-        if (ev->data1 == key_message_refresh)
-        {
-            message_on = true;
-            message_counter = HU_MSGTIMEOUT;
-            eatkey = true;
-        }
-        else if (netgame && ev->data2 == key_multi_msg)
-        {
-            StartChatInput();
-            eatkey = true;
-            HUlib_resetIText(&w_chat);
-            HU_queueChatChar(HU_BROADCAST);
-        }
-        // [STRIFE]: You cannot go straight to chatting with a particular
-        // player from here... you must press 't' first. See below.
-    }
-    else
-    {
-        c = ev->data3;
-        // send a macro
-        if (altdown)
-        {
-            c = c - '0';
-            if (c > 9)
-                return false;
-            // fprintf(stderr, "got here\n");
-            macromessage = chat_macros[c];
-
-            // kill last message with a '\n'
-            HU_queueChatChar(KEY_ENTER); // DEBUG!!!
-
-            // send the macro message
-            while (*macromessage)
-                HU_queueChatChar(*macromessage++);
-            HU_queueChatChar(KEY_ENTER);
-
-            // leave chat mode and notify that it was sent
-            StopChatInput();
-            M_StringCopy(lastmessage, chat_macros[c], sizeof(lastmessage));
-            plr->message = lastmessage;
-            eatkey = true;
-        }
-        else
-        {
-            if(w_chat.l.len) // [STRIFE]: past first char of chat?
-            {
-                eatkey = HUlib_keyInIText(&w_chat, c);
-                if (eatkey)
-                    HU_queueChatChar(c);
-            }
-            else
-            {
-                // [STRIFE]: check for player-specific message;
-                // slightly different than vanilla, to allow keys to be customized
-                for(i = 0; i < MAXPLAYERS; i++)
-                {
-                    if (ev->data1 == key_multi_msgplayer[i])
-                        break;
-                }
-                if(i < MAXPLAYERS)
-                {
-                    // talking to self?
-                    if(i == consoleplayer)
-                    {
-                        num_nobrainers++;
-                        if (num_nobrainers < 3)
-                            plr->message = DEH_String(HUSTR_TALKTOSELF1);
-                        else if (num_nobrainers < 6)
-                            plr->message = DEH_String(HUSTR_TALKTOSELF2);
-                        else if (num_nobrainers < 9)
-                            plr->message = DEH_String(HUSTR_TALKTOSELF3);
-                        else if (num_nobrainers < 32)
-                            plr->message = DEH_String(HUSTR_TALKTOSELF4);
-                        else
-                            plr->message = DEH_String(HUSTR_TALKTOSELF5);
-                    }
-                    else
-                    {
-                        eatkey = true;
-                        HU_queueChatChar(i+1);
-                        DEH_snprintf(lastmessage, sizeof(lastmessage),
-                            "Talking to: %c", '1' + i);
-                        plr->message = lastmessage;
-                    }
-                }
-                else if(c == '$') // [STRIFE]: name changing
-                {
-                    eatkey = true;
-                    HU_queueChatChar(HU_CHANGENAME);
-                    M_StringCopy(lastmessage, DEH_String("Changing Name:"),
-                                 sizeof(lastmessage));
-                    plr->message = lastmessage;
-                    hu_setting_name = true;
-                }
-                else
-                {
-                    eatkey = HUlib_keyInIText(&w_chat, c);
-                    if (eatkey)
-                        HU_queueChatChar(c);
-                }
-            }
-
-            if (c == KEY_ENTER)
-            {
-                StopChatInput();
-                if (w_chat.l.len)
-                {
-                    // [STRIFE]: name setting
-                    if(hu_setting_name)
-                    {
-                        DEH_snprintf(lastmessage, sizeof(lastmessage),
-                            "%s now %.13s", player_names[consoleplayer],
-                            w_chat.l.l);
-                        // haleyjd 20141024: missing name set for local client
-                        DEH_snprintf(player_names[consoleplayer],
-                            sizeof(player_names[consoleplayer]),
-                            "%.13s: ", w_chat.l.l);
-                        hu_setting_name = false;
-                    }
-                    else
-                    {
-                        M_StringCopy(lastmessage, w_chat.l.l,
-                                     sizeof(lastmessage));
-                    }
-                    plr->message = lastmessage;
-                }
-            }
-            else if (c == KEY_ESCAPE)
-            {
-                StopChatInput();
-            }
-        }
-    }
-
-    return eatkey;
-}
diff --git a/games/NXDoom/src/strife/hu_stuff.h b/games/NXDoom/src/strife/hu_stuff.h
deleted file mode 100644
index 2140d830e..000000000
--- a/games/NXDoom/src/strife/hu_stuff.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  Head up display
-//
-
-#ifndef __HU_STUFF_H__
-#define __HU_STUFF_H__
-
-#include "d_event.h"
-#include "v_patch.h"
-
-//
-// Globally visible constants.
-//
-#define HU_FONTSTART    '!'     // the first font characters
-#define HU_FONTEND      '_'     // the last font characters
-
-// Calculate # of glyphs in font.
-#define HU_FONTSIZE     (HU_FONTEND - HU_FONTSTART + 1)	
-
-#define HU_BROADCAST    9       // haleyjd [STRIFE] Changed 5 -> 9
-#define HU_CHANGENAME   10      // haleyjd [STRIFE] Special command
-
-#define HU_MSGX         0
-#define HU_MSGY         (SHORT(hu_font[0]->height) + 1) // [STRIFE]: DOOM bug fix
-#define HU_MSGWIDTH     64      // in characters
-#define HU_MSGHEIGHT    2       // in lines
-
-#define HU_MSGTIMEOUT   (8*TICRATE) // haleyjd [STRIFE] Doubled message timeout
-
-
-//
-// HEADS UP TEXT
-//
-
-void HU_Init(void);
-void HU_Start(void);
-
-boolean HU_Responder(event_t* ev);
-
-void HU_Ticker(void);
-void HU_Drawer(void);
-char HU_dequeueChatChar(void);
-void HU_Erase(void);
-
-extern char *chat_macros[10];
-extern char player_names[8][16];   // villsa [STRIFE]
-
-// haleyjd [STRIFE] externalized:
-extern const char *mapnames[];
-
-// [STRIFE]
-extern patch_t* yfont[HU_FONTSIZE];   // haleyjd 09/18/10: [STRIFE]
-extern patch_t *hu_font[HU_FONTSIZE];
-
-extern boolean message_dontfuckwithme;
-
-extern boolean chat_on;
-extern boolean sendsave;
-
-
-#endif
-
diff --git a/games/NXDoom/src/strife/info.c b/games/NXDoom/src/strife/info.c
deleted file mode 100644
index 7976299b8..000000000
--- a/games/NXDoom/src/strife/info.c
+++ /dev/null
@@ -1,11041 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Thing frame/state LUT,
-//	generated by multigen utilitiy.
-//	This one is the original DOOM version, preserved.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-// Data.
-#include "sounds.h"
-#include "m_fixed.h"
-
-#include "info.h"
-
-#include "p_mobj.h"
-
-// villsa [STRIFE]
-const char *sprnames[NUMSPRITES+1] =
-{
-    "PLAY", "PNCH", "WAVE", "RBPY", "TRGT", "XBOW", "MMIS", "RIFG", 
-    "RIFF", "FLMT", "FLMF", "BLST", "BLSF", "GREN", "GREF", "SIGH", 
-    "SIGF", "POW1", "POW2", "POW3", "ZAP1", "SPRY", "BLOD", "PUFY", 
-    "SHT1", "SHT2", "GRIN", "GRAP", "UBAM", "BNG2", "BNG4", "BNG3", 
-    "FLBE", "XPRK", "OCLW", "CCLW", "TEND", "MICR", "MISS", "AROW", 
-    "ARWP", "TORP", "THIT", "TWAV", "MISL", "TFOG", "IFOG", "SHRD", 
-    "RGIB", "MRYS", "MRNO", "MRST", "MRLK", "MRBD", "MRPN", "MRGT", 
-    "BURN", "DISR", "PEAS", "GIBS", "AGRD", "ARMR", "SACR", "TNK1", 
-    "TNK2", "TNK3", "TNK4", "TNK5", "TNK6", "NEAL", "BEGR", "HMN1", 
-    "LEDR", "LEAD", "ROB1", "PGRD", "ROB2", "MLDR", "ORCL", "PRST", 
-    "PDED", "ALN1", "AL1P", "NODE", "MTHD", "MNAM", "MNAL", "MDTH", 
-    "NEST", "PODD", "ZAP6", "ZOT3", "ZAP7", "ZOT1", "ZAP5", "ZOT2", 
-    "SEWR", "SPID", "ROB3", "RBB3", "PRGR", "BASE", "FRBL", "KLAX", 
-    "TURT", "BALL", "PSTN", "SECR", "TARG", "RING", "EARS", "COMM", 
-    "BOOM", "RATT", "HOGN", "DEAD", "SBAN", "BOTR", "HATR", "TOPR", 
-    "COUP", "BUBB", "BUBF", "BUBC", "ASPR", "SPDL", "TOKN", "OTOK", 
-    "HELT", "GUNT", "FULL", "MEAT", "JUNK", "FFOT", "DIE1", "BEAC", 
-    "ARM1", "ARM2", "BARW", "BART", "LAMP", "LANT", "BARL", "BOWL", 
-    "BRAZ", "TRCH", "LTRH", "LMPC", "LOGS", "TRHO", "WATR", "MUGG", 
-    "FUSL", "CRD1", "CRD2", "TPAS", "KY1G", "KY2S", "KY3B", "HAND", 
-    "CRYS", "PRIS", "PWR1", "PWR2", "PWR3", "ORAC", "GYID", "FUBR", 
-    "WARE", "RCRY", "BCRY", "CHAP", "TUNL", "BLTK", "SECK", "MINE", 
-    "REBL", "PROC", "ANKH", "GOID", "STMP", "MDKT", "COIN", "CRED", 
-    "SACK", "CHST", "SHD1", "MASK", "UNIF", "OFIC", "PMAP", "PMUP", 
-    "BLIT", "BBOX", "MSSL", "ROKT", "BRY1", "CPAC", "PQRL", "XQRL", 
-    "GRN1", "GRN2", "BKPK", "RELC", "RIFL", "FLAM", "BFLM", "MMSL", 
-    "TRPD", "GRND", "CBOW", "SIGL", "LITE", "CNDL", "CLBR", "LITS", 
-    "LITB", "LITG", "ROK1", "ROK2", "ROK3", "ROK4", "LOGG", "RUB1", 
-    "RUB2", "RUB3", "RUB4", "RUB5", "RUB6", "RUB7", "RUB8", "CHAN", 
-    "STAT", "DSTA", "CRAB", "CAGE", "TREE", "TRE1", "BUSH", "SHRB", 
-    "STAK", "BAR1", "VASE", "STOL", "POT1", "TUB1", "ANVL", "TLMP", 
-    "TRAY", "APOW", "AFED", "DRIP", "CDRP", "SPLH", "WTFT", "HERT", 
-    "TELP", "MONI", "STEL", "STLA", "STLE", "HUGE", "STLG", NULL
-};
-
-
-// Doesn't work with g++, needs actionf_p1
-// villsa [STRIFE]
-void A_Look();
-void A_RandomWalk();
-void A_FriendLook();
-void A_Listen();
-void A_Chase();
-void A_FaceTarget();
-void A_PeasantPunch();
-void A_ReaverAttack();
-void A_BulletAttack();
-void A_CheckTargetVisible();
-void A_SentinelAttack();
-void A_StalkerThink();
-void A_StalkerSetLook();
-void A_StalkerDrop();
-void A_StalkerScratch();
-void A_FloatWeave();
-void A_RobotMelee();
-void A_TemplarMauler();
-void A_CrusaderAttack();
-void A_CrusaderLeft();
-void A_CrusaderRight();
-void A_CheckTargetVisible2();
-void A_InqFlyCheck();
-void A_InqGrenade();
-void A_InqTakeOff();
-void A_InqFly();
-void A_FireSigilWeapon();
-void A_ProgrammerAttack();
-void A_Sigil_A_Action();
-void A_SpectreEAttack();
-void A_SpectreCAttack();
-void A_AlertSpectreC();
-void A_Sigil_E_Action();
-void A_SigilTrail();
-void A_SpectreDAttack();
-void A_FireSigilEOffshoot();
-void A_ShadowOff();
-void A_ModifyVisibility();
-void A_ShadowOn();
-void A_SetTLOptions();
-void A_BossMeleeAtk();
-void A_BishopAttack();
-void A_FireHookShot();
-void A_FireChainShot();
-void A_MissileSmoke();
-void A_SpawnSparkPuff();
-void A_Tracer();
-void A_ProgrammerMelee();
-void A_Scream();
-void A_XScream();
-void A_Pain();
-void A_PeasantCrash();
-void A_Fall();
-void A_HideZombie();
-void A_MerchantPain();
-void A_ProgrammerDie();
-void A_InqTossArm();
-void A_SpawnSpectreB();
-void A_SpawnSpectreD();
-void A_SpawnSpectreE();
-void A_SpawnEntity();
-void A_EntityDeath();
-void A_SpawnZombie();
-void A_ZombieInSpecialSector();
-void A_CrystalExplode();
-void A_QuestMsg();
-void A_ExtraLightOff();
-void A_CrystalRadiusAtk();
-void A_DeathExplode5();
-void A_DeathExplode1();
-void A_DeathExplode2();
-void A_DeathExplode3();
-void A_RaiseAlarm();
-void A_MissileTick();
-void A_SpawnGrenadeFire();
-void A_NodeChunk();
-void A_HeadChunk();
-void A_BurnSpread();
-void A_AcolyteSpecial();
-void A_BossDeath();
-void A_InqChase();
-void A_StalkerChase();
-void A_PlayerScream();
-void A_TeleportBeacon();
-void A_BodyParts();
-void A_ClaxonBlare();
-void A_ActiveSound();
-void A_ClearSoundTarget();
-void A_DropBurnFlesh();
-void A_FlameDeath();
-void A_ClearForceField();
-void A_WeaponReady();
-void A_ReFire();
-void A_CheckReload();
-void A_Lower();
-void A_Raise();
-void A_GunFlash();
-void A_Punch();
-void A_FireFlameThrower();
-void A_FireMissile();
-void A_FireMauler2();
-void A_FireGrenade();
-void A_FireElectricBolt();
-void A_FirePoisonBolt();
-void A_FireRifle();
-void A_FireMauler1();
-void A_SigilSound();
-void A_FireSigil();
-void A_GunFlashThinker();
-void A_Light0();
-void A_Light1();
-void A_Light2();
-void A_SigilShock();
-void A_TorpedoExplode();
-void A_MaulerSound();
-
-// villsa [STRIFE]
-state_t states[NUMSTATES] =
-{
-
-/*S_NULL*/          { SPR_PLAY, 0, -1, { NULL }, S_NULL },      //00
-/*S_PNCH_00*/       { SPR_PNCH, 0, 0, { A_Light0 }, S_NULL },       //01
-/*S_WAVE_00*/       { SPR_WAVE, 32768, 3, { NULL }, S_WAVE_01 },        //02
-/*S_WAVE_01*/       { SPR_WAVE, 32769, 3, { NULL }, S_WAVE_02 },        //03
-/*S_WAVE_02*/       { SPR_WAVE, 32770, 3, { NULL }, S_WAVE_03 },        //04
-/*S_WAVE_03*/       { SPR_WAVE, 32771, 3, { NULL }, S_WAVE_00 },        //05
-/*S_RBPY_00*/       { SPR_RBPY, 32768, 3, { NULL }, S_RBPY_01 },        //06
-/*S_RBPY_01*/       { SPR_RBPY, 32769, 3, { NULL }, S_RBPY_02 },        //07
-/*S_RBPY_02*/       { SPR_RBPY, 32770, 3, { NULL }, S_RBPY_03 },        //08
-/*S_RBPY_03*/       { SPR_RBPY, 32771, 3, { NULL }, S_RBPY_00 },        //09
-/*S_TRGT_00*/       { SPR_TRGT, 0, -1, { NULL }, S_NULL },      //10
-/*S_TRGT_01*/       { SPR_TRGT, 1, -1, { NULL }, S_NULL },      //11
-/*S_TRGT_02*/       { SPR_TRGT, 2, -1, { NULL }, S_NULL },      //12
-/*S_PNCH_01*/       { SPR_PNCH, 0, 1, { A_WeaponReady }, S_PNCH_01 },       //13
-/*S_PNCH_02*/       { SPR_PNCH, 0, 1, { A_Lower }, S_PNCH_02 },     //14
-/*S_PNCH_03*/       { SPR_PNCH, 0, 1, { A_Raise }, S_PNCH_03 },     //15
-/*S_PNCH_04*/       { SPR_PNCH, 1, 4, { NULL }, S_PNCH_05 },        //16
-/*S_PNCH_05*/       { SPR_PNCH, 2, 4, { A_Punch }, S_PNCH_06 },     //17
-/*S_PNCH_06*/       { SPR_PNCH, 3, 5, { NULL }, S_PNCH_07 },        //18
-/*S_PNCH_07*/       { SPR_PNCH, 2, 4, { NULL }, S_PNCH_08 },        //19
-/*S_PNCH_08*/       { SPR_PNCH, 1, 5, { A_ReFire }, S_PNCH_01 },        //20
-/*S_XBOW_00*/       { SPR_XBOW, 0, 1, { A_WeaponReady }, S_XBOW_00 },       //21
-/*S_XBOW_01*/       { SPR_XBOW, 0, 1, { A_Lower }, S_XBOW_01 },     //22
-/*S_XBOW_02*/       { SPR_XBOW, 0, 1, { A_Raise }, S_XBOW_02 },     //23
-/*S_XBOW_03*/       { SPR_XBOW, 0, 3, { A_GunFlashThinker }, S_XBOW_04 },       //24
-/*S_XBOW_04*/       { SPR_XBOW, 1, 6, { A_FireElectricBolt }, S_XBOW_05 },      //25
-/*S_XBOW_05*/       { SPR_XBOW, 2, 4, { NULL }, S_XBOW_06 },        //26
-/*S_XBOW_06*/       { SPR_XBOW, 3, 6, { NULL }, S_XBOW_07 },        //27
-/*S_XBOW_07*/       { SPR_XBOW, 4, 3, { NULL }, S_XBOW_08 },        //28
-/*S_XBOW_08*/       { SPR_XBOW, 5, 5, { NULL }, S_XBOW_09 },        //29
-/*S_XBOW_09*/       { SPR_XBOW, 6, 5, { A_CheckReload }, S_XBOW_00 },       //30
-/*S_XBOW_10*/       { SPR_XBOW, 10, 5, { NULL }, S_XBOW_11 },       //31
-/*S_XBOW_11*/       { SPR_XBOW, 11, 5, { NULL }, S_XBOW_12 },       //32
-/*S_XBOW_12*/       { SPR_XBOW, 12, 5, { NULL }, S_XBOW_10 },       //33
-/*S_XBOW_13*/       { SPR_XBOW, 7, 1, { A_WeaponReady }, S_XBOW_13 },       //34
-/*S_XBOW_14*/       { SPR_XBOW, 7, 1, { A_Lower }, S_XBOW_14 },     //35
-/*S_XBOW_15*/       { SPR_XBOW, 7, 1, { A_Raise }, S_XBOW_15 },     //36
-/*S_XBOW_16*/       { SPR_XBOW, 7, 3, { NULL }, S_XBOW_17 },        //37
-/*S_XBOW_17*/       { SPR_XBOW, 1, 6, { A_FirePoisonBolt }, S_XBOW_18 },        //38
-/*S_XBOW_18*/       { SPR_XBOW, 2, 4, { NULL }, S_XBOW_19 },        //39
-/*S_XBOW_19*/       { SPR_XBOW, 3, 6, { NULL }, S_XBOW_20 },        //40
-/*S_XBOW_20*/       { SPR_XBOW, 4, 3, { NULL }, S_XBOW_21 },        //41
-/*S_XBOW_21*/       { SPR_XBOW, 8, 5, { NULL }, S_XBOW_22 },        //42
-/*S_XBOW_22*/       { SPR_XBOW, 9, 5, { A_CheckReload }, S_XBOW_13 },       //43
-/*S_MMIS_00*/       { SPR_MMIS, 0, 1, { A_WeaponReady }, S_MMIS_00 },       //44
-/*S_MMIS_01*/       { SPR_MMIS, 0, 1, { A_Lower }, S_MMIS_01 },     //45
-/*S_MMIS_02*/       { SPR_MMIS, 0, 1, { A_Raise }, S_MMIS_02 },     //46
-/*S_MMIS_03*/       { SPR_MMIS, 0, 4, { A_FireMissile }, S_MMIS_04 },       //47
-/*S_MMIS_04*/       { SPR_MMIS, 1, 4, { A_Light1 }, S_MMIS_05 },        //48
-/*S_MMIS_05*/       { SPR_MMIS, 32770, 5, { NULL }, S_MMIS_06 },        //49
-/*S_MMIS_06*/       { SPR_MMIS, 32771, 2, { A_Light2 }, S_MMIS_07 },        //50
-/*S_MMIS_07*/       { SPR_MMIS, 32772, 2, { NULL }, S_MMIS_08 },        //51
-/*S_MMIS_08*/       { SPR_MMIS, 32773, 2, { A_Light0 }, S_MMIS_09 },        //52
-/*S_MMIS_09*/       { SPR_MMIS, 5, 0, { A_ReFire }, S_MMIS_00 },        //53
-/*S_RIFG_00*/       { SPR_RIFG, 0, 1, { A_WeaponReady }, S_RIFG_00 },       //54
-/*S_RIFG_01*/       { SPR_RIFG, 1, 1, { A_Lower }, S_RIFG_01 },     //55
-/*S_RIFG_02*/       { SPR_RIFG, 0, 1, { A_Raise }, S_RIFG_02 },     //56
-/*S_RIFF_00*/       { SPR_RIFF, 0, 3, { A_FireRifle }, S_RIFF_01 },     //57
-/*S_RIFF_01*/       { SPR_RIFF, 1, 3, { A_FireRifle }, S_RIFG_03 },     //58
-/*S_RIFG_03*/       { SPR_RIFG, 3, 3, { A_FireRifle }, S_RIFG_04 },     //59
-/*S_RIFG_04*/       { SPR_RIFG, 2, 0, { A_ReFire }, S_RIFG_05 },        //60
-/*S_RIFG_05*/       { SPR_RIFG, 1, 2, { NULL }, S_RIFG_00 },        //61
-/*S_FLMT_00*/       { SPR_FLMT, 0, 3, { A_WeaponReady }, S_FLMT_01 },       //62
-/*S_FLMT_01*/       { SPR_FLMT, 1, 3, { A_WeaponReady }, S_FLMT_00 },       //63
-/*S_FLMT_02*/       { SPR_FLMT, 0, 1, { A_Lower }, S_FLMT_02 },     //64
-/*S_FLMT_03*/       { SPR_FLMT, 0, 1, { A_Raise }, S_FLMT_03 },     //65
-/*S_FLMF_00*/       { SPR_FLMF, 0, 2, { A_FireFlameThrower }, S_FLMF_01 },      //66
-/*S_FLMF_01*/       { SPR_FLMF, 1, 3, { A_ReFire }, S_FLMT_00 },        //67
-/*S_BLST_00*/       { SPR_BLST, 5, 6, { A_WeaponReady }, S_BLST_01 },       //68
-/*S_BLST_01*/       { SPR_BLST, 6, 6, { A_WeaponReady }, S_BLST_02 },       //69
-/*S_BLST_02*/       { SPR_BLST, 7, 6, { A_WeaponReady }, S_BLST_03 },       //70
-/*S_BLST_03*/       { SPR_BLST, 0, 6, { A_WeaponReady }, S_BLST_00 },       //71
-/*S_BLST_04*/       { SPR_BLST, 0, 1, { A_Lower }, S_BLST_04 },     //72
-/*S_BLST_05*/       { SPR_BLST, 0, 1, { A_Raise }, S_BLST_05 },     //73
-/*S_BLSF_00*/       { SPR_BLSF, 32768, 5, { A_FireMauler1 }, S_BLST_06 },       //74
-/*S_BLST_06*/       { SPR_BLST, 32769, 3, { A_Light1 }, S_BLST_07 },        //75
-/*S_BLST_07*/       { SPR_BLST, 2, 2, { A_Light2 }, S_BLST_08 },        //76
-/*S_BLST_08*/       { SPR_BLST, 3, 2, { NULL }, S_BLST_09 },        //77
-/*S_BLST_09*/       { SPR_BLST, 4, 2, { NULL }, S_BLST_10 },        //78
-/*S_BLST_10*/       { SPR_BLST, 0, 7, { A_Light0 }, S_BLST_11 },        //79
-/*S_BLST_11*/       { SPR_BLST, 7, 7, { NULL }, S_BLST_12 },        //80
-/*S_BLST_12*/       { SPR_BLST, 6, 7, { A_CheckReload }, S_BLST_00 },       //81
-/*S_BLST_13*/       { SPR_BLST, 8, 7, { A_WeaponReady }, S_BLST_14 },       //82
-/*S_BLST_14*/       { SPR_BLST, 9, 7, { A_WeaponReady }, S_BLST_15 },       //83
-/*S_BLST_15*/       { SPR_BLST, 10, 7, { A_WeaponReady }, S_BLST_16 },      //84
-/*S_BLST_16*/       { SPR_BLST, 11, 7, { A_WeaponReady }, S_BLST_13 },      //85
-/*S_BLST_17*/       { SPR_BLST, 8, 1, { A_Lower }, S_BLST_17 },     //86
-/*S_BLST_18*/       { SPR_BLST, 8, 1, { A_Raise }, S_BLST_18 },     //87
-/*S_BLST_19*/       { SPR_BLST, 8, 20, { A_MaulerSound }, S_BLST_20 },      //88
-/*S_BLST_20*/       { SPR_BLST, 9, 10, { A_Light1 }, S_BLSF_01 },       //89
-/*S_BLSF_01*/       { SPR_BLSF, 32768, 10, { A_FireMauler2 }, S_BLST_21 },      //90
-/*S_BLST_21*/       { SPR_BLST, 32769, 3, { A_Light2 }, S_BLST_22 },        //91
-/*S_BLST_22*/       { SPR_BLST, 2, 2, { NULL }, S_BLST_23 },        //92
-/*S_BLST_23*/       { SPR_BLST, 3, 2, { A_Light0 }, S_BLST_24 },        //93
-/*S_BLST_24*/       { SPR_BLST, 4, 2, { A_ReFire }, S_BLST_13 },        //94
-/*S_GREN_00*/       { SPR_GREN, 0, 1, { A_WeaponReady }, S_GREN_00 },       //95
-/*S_GREN_01*/       { SPR_GREN, 0, 1, { A_Lower }, S_GREN_01 },     //96
-/*S_GREN_02*/       { SPR_GREN, 0, 1, { A_Raise }, S_GREN_02 },     //97
-/*S_GREN_03*/       { SPR_GREN, 0, 5, { A_FireGrenade }, S_GREN_04 },       //98
-/*S_GREN_04*/       { SPR_GREN, 1, 10, { NULL }, S_GREN_05 },       //99
-/*S_GREN_05*/       { SPR_GREN, 0, 5, { A_FireGrenade }, S_GREN_06 },       //100
-/*S_GREN_06*/       { SPR_GREN, 2, 10, { NULL }, S_GREN_07 },       //101
-/*S_GREN_07*/       { SPR_GREN, 0, 0, { A_ReFire }, S_GREN_00 },        //102
-/*S_GREF_00*/       { SPR_GREF, 32768, 5, { A_Light1 }, S_PNCH_00 },        //103
-/*S_GREF_01*/       { SPR_GREF, 0, 10, { A_Light0 }, S_PNCH_00 },       //104
-/*S_GREF_02*/       { SPR_GREF, 32769, 5, { A_Light2 }, S_PNCH_00 },        //105
-/*S_GREN_08*/       { SPR_GREN, 3, 1, { A_WeaponReady }, S_GREN_08 },       //106
-/*S_GREN_09*/       { SPR_GREN, 3, 1, { A_Lower }, S_GREN_09 },     //107
-/*S_GREN_10*/       { SPR_GREN, 3, 1, { A_Raise }, S_GREN_10 },     //108
-/*S_GREN_11*/       { SPR_GREN, 3, 5, { A_FireGrenade }, S_GREN_12 },       //109
-/*S_GREN_12*/       { SPR_GREN, 4, 10, { NULL }, S_GREN_13 },       //110
-/*S_GREN_13*/       { SPR_GREN, 3, 5, { A_FireGrenade }, S_GREN_14 },       //111
-/*S_GREN_14*/       { SPR_GREN, 5, 10, { NULL }, S_GREN_15 },       //112
-/*S_GREN_15*/       { SPR_GREN, 0, 0, { A_ReFire }, S_GREN_08 },        //113
-/*S_GREF_03*/       { SPR_GREF, 32770, 5, { A_Light1 }, S_PNCH_00 },        //114
-/*S_GREF_04*/       { SPR_GREF, 2, 10, { A_Light0 }, S_PNCH_00 },       //115
-/*S_GREF_05*/       { SPR_GREF, 32771, 5, { A_Light2 }, S_PNCH_00 },        //116
-/*S_SIGH_00*/       { SPR_SIGH, 32768, 1, { A_WeaponReady }, S_SIGH_00 },       //117
-/*S_SIGH_01*/       { SPR_SIGH, 32769, -1, { NULL }, S_NULL },      //118
-/*S_SIGH_02*/       { SPR_SIGH, 32770, -1, { NULL }, S_NULL },      //119
-/*S_SIGH_03*/       { SPR_SIGH, 32771, -1, { NULL }, S_NULL },      //120
-/*S_SIGH_04*/       { SPR_SIGH, 32772, -1, { NULL }, S_NULL },      //121
-/*S_SIGH_05*/       { SPR_SIGH, 32768, 1, { A_Lower }, S_SIGH_05 },     //122
-/*S_SIGH_06*/       { SPR_SIGH, 32768, 1, { A_Raise }, S_SIGH_06 },     //123
-/*S_SIGH_07*/       { SPR_SIGH, 32768, 18, { A_SigilSound }, S_SIGH_08 },       //124
-/*S_SIGH_08*/       { SPR_SIGH, 32768, 3, { A_GunFlash }, S_SIGH_09 },      //125
-/*S_SIGH_09*/       { SPR_SIGH, 0, 10, { A_FireSigil }, S_SIGH_10 },        //126
-/*S_SIGH_10*/       { SPR_SIGH, 0, 5, { A_GunFlashThinker }, S_SIGH_00 },       //127
-/*S_SIGF_00*/       { SPR_SIGF, 32768, 4, { A_Light2 }, S_SIGF_01 },        //128
-/*S_SIGF_01*/       { SPR_SIGF, 32769, 6, { A_SigilShock }, S_SIGF_02 },        //129
-/*S_SIGF_02*/       { SPR_SIGF, 32770, 4, { A_Light1 }, S_PNCH_00 },        //130
-/*S_POW1_00*/       { SPR_POW1, 0, 4, { NULL }, S_POW1_01 },        //131
-/*S_POW1_01*/       { SPR_POW1, 1, 4, { NULL }, S_POW1_02 },        //132
-/*S_POW1_02*/       { SPR_POW1, 2, 4, { NULL }, S_POW1_03 },        //133
-/*S_POW1_03*/       { SPR_POW1, 3, 4, { NULL }, S_POW1_04 },        //134
-/*S_POW1_04*/       { SPR_POW1, 4, 4, { NULL }, S_NULL },       //135
-/*S_POW1_05*/       { SPR_POW1, 5, 4, { NULL }, S_POW1_06 },        //136
-/*S_POW1_06*/       { SPR_POW1, 6, 4, { NULL }, S_POW1_07 },        //137
-/*S_POW1_07*/       { SPR_POW1, 7, 4, { NULL }, S_POW1_08 },        //138
-/*S_POW1_08*/       { SPR_POW1, 8, 4, { NULL }, S_POW1_09 },        //139
-/*S_POW1_09*/       { SPR_POW1, 9, 4, { NULL }, S_NULL },       //140
-/*S_POW2_00*/       { SPR_POW2, 0, 4, { NULL }, S_POW2_01 },        //141
-/*S_POW2_01*/       { SPR_POW2, 1, 4, { NULL }, S_POW2_02 },        //142
-/*S_POW2_02*/       { SPR_POW2, 2, 4, { NULL }, S_POW2_03 },        //143
-/*S_POW2_03*/       { SPR_POW2, 3, 4, { NULL }, S_NULL },       //144
-/*S_POW3_00*/       { SPR_POW3, 0, 3, { NULL }, S_POW3_01 },        //145
-/*S_POW3_01*/       { SPR_POW3, 1, 3, { NULL }, S_POW3_02 },        //146
-/*S_POW3_02*/       { SPR_POW3, 2, 3, { NULL }, S_POW3_03 },        //147
-/*S_POW3_03*/       { SPR_POW3, 3, 3, { NULL }, S_POW3_04 },        //148
-/*S_POW3_04*/       { SPR_POW3, 4, 3, { NULL }, S_POW3_05 },        //149
-/*S_POW3_05*/       { SPR_POW3, 5, 3, { NULL }, S_POW3_06 },        //150
-/*S_POW3_06*/       { SPR_POW3, 6, 3, { NULL }, S_POW3_07 },        //151
-/*S_POW3_07*/       { SPR_POW3, 7, 3, { NULL }, S_NULL },       //152
-/*S_ZAP1_00*/       { SPR_ZAP1, 1, 3, { A_DeathExplode3 }, S_ZAP1_02 },     //153
-/*S_ZAP1_01*/       { SPR_ZAP1, 0, 3, { A_RaiseAlarm }, S_ZAP1_02 },        //154
-/*S_ZAP1_02*/       { SPR_ZAP1, 1, 3, { NULL }, S_ZAP1_03 },        //155
-/*S_ZAP1_03*/       { SPR_ZAP1, 2, 3, { NULL }, S_ZAP1_04 },        //156
-/*S_ZAP1_04*/       { SPR_ZAP1, 3, 3, { NULL }, S_ZAP1_05 },        //157
-/*S_ZAP1_05*/       { SPR_ZAP1, 4, 3, { NULL }, S_ZAP1_06 },        //158
-/*S_ZAP1_06*/       { SPR_ZAP1, 5, 3, { NULL }, S_ZAP1_07 },        //159
-/*S_ZAP1_07*/       { SPR_ZAP1, 4, 3, { NULL }, S_ZAP1_08 },        //160
-/*S_ZAP1_08*/       { SPR_ZAP1, 3, 2, { NULL }, S_ZAP1_09 },        //161
-/*S_ZAP1_09*/       { SPR_ZAP1, 2, 2, { NULL }, S_ZAP1_10 },        //162
-/*S_ZAP1_10*/       { SPR_ZAP1, 1, 2, { NULL }, S_ZAP1_11 },        //163
-/*S_ZAP1_11*/       { SPR_ZAP1, 0, 1, { NULL }, S_NULL },       //164
-/*S_SPRY_00*/       { SPR_SPRY, 0, 3, { NULL }, S_SPRY_01 },        //165
-/*S_SPRY_01*/       { SPR_SPRY, 1, 3, { NULL }, S_SPRY_02 },        //166
-/*S_SPRY_02*/       { SPR_SPRY, 2, 3, { NULL }, S_SPRY_03 },        //167
-/*S_SPRY_03*/       { SPR_SPRY, 3, 3, { NULL }, S_SPRY_04 },        //168
-/*S_SPRY_04*/       { SPR_SPRY, 4, 3, { NULL }, S_SPRY_05 },        //169
-/*S_SPRY_05*/       { SPR_SPRY, 5, 3, { NULL }, S_SPRY_06 },        //170
-/*S_SPRY_06*/       { SPR_SPRY, 6, 2, { NULL }, S_NULL },       //171
-/*S_BLOD_00*/       { SPR_BLOD, 2, 8, { NULL }, S_BLOD_01 },        //172
-/*S_BLOD_01*/       { SPR_BLOD, 1, 8, { NULL }, S_BLOD_02 },        //173
-/*S_BLOD_02*/       { SPR_BLOD, 0, 8, { NULL }, S_NULL },       //174
-/*S_PUFY_00*/       { SPR_PUFY, 32768, 4, { NULL }, S_PUFY_01 },        //175
-/*S_PUFY_01*/       { SPR_PUFY, 1, 4, { NULL }, S_PUFY_02 },        //176
-/*S_PUFY_02*/       { SPR_PUFY, 2, 4, { NULL }, S_PUFY_03 },        //177
-/*S_PUFY_03*/       { SPR_PUFY, 3, 4, { NULL }, S_NULL },       //178
-/*S_SHT1_00*/       { SPR_SHT1, 0, 4, { NULL }, S_SHT1_01 },        //179
-/*S_SHT1_01*/       { SPR_SHT1, 1, 4, { NULL }, S_SHT1_00 },        //180
-/*S_SHT2_00*/       { SPR_SHT2, 0, 5, { NULL }, S_SHT2_01 },        //181
-/*S_SHT2_01*/       { SPR_SHT2, 1, 5, { NULL }, S_POW1_00 },        //182
-/*S_GRIN_00*/       { SPR_GRIN, 0, 3, { A_MissileTick }, S_GRIN_01 },       //183
-/*S_GRIN_01*/       { SPR_GRIN, 1, 3, { A_MissileTick }, S_GRIN_00 },       //184
-/*S_GRAP_00*/       { SPR_GRAP, 0, 3, { A_MissileTick }, S_GRAP_01 },       //185
-/*S_GRAP_01*/       { SPR_GRAP, 1, 3, { A_MissileTick }, S_GRAP_00 },       //186
-/*S_UBAM_00*/       { SPR_UBAM, 0, 3, { A_MissileTick }, S_UBAM_01 },       //187
-/*S_UBAM_01*/       { SPR_UBAM, 1, 3, { A_MissileTick }, S_UBAM_00 },       //188
-/*S_BNG2_00*/       { SPR_BNG2, 32768, 4, { A_DeathExplode5 }, S_BNG2_01 },     //189
-/*S_BNG2_01*/       { SPR_BNG2, 32769, 4, { NULL }, S_BNG2_02 },        //190
-/*S_BNG2_02*/       { SPR_BNG2, 32770, 4, { NULL }, S_BNG2_03 },        //191
-/*S_BNG2_03*/       { SPR_BNG2, 32771, 4, { NULL }, S_BNG2_04 },        //192
-/*S_BNG2_04*/       { SPR_BNG2, 32772, 4, { NULL }, S_BNG2_05 },        //193
-/*S_BNG2_05*/       { SPR_BNG2, 32773, 4, { NULL }, S_BNG2_06 },        //194
-/*S_BNG2_06*/       { SPR_BNG2, 32774, 4, { NULL }, S_BNG2_07 },        //195
-/*S_BNG2_07*/       { SPR_BNG2, 32775, 4, { NULL }, S_BNG2_08 },        //196
-/*S_BNG2_08*/       { SPR_BNG2, 32776, 4, { NULL }, S_NULL },       //197
-/*S_BNG4_00*/       { SPR_BNG4, 32768, 2, { A_DeathExplode5 }, S_BNG4_01 },     //198
-/*S_BNG4_01*/       { SPR_BNG4, 32769, 3, { NULL }, S_BNG4_02 },        //199
-/*S_BNG4_02*/       { SPR_BNG4, 32770, 3, { NULL }, S_BNG4_03 },        //200
-/*S_BNG4_03*/       { SPR_BNG4, 32771, 3, { NULL }, S_BNG4_04 },        //201
-/*S_BNG4_04*/       { SPR_BNG4, 32772, 3, { NULL }, S_BNG4_05 },        //202
-/*S_BNG4_05*/       { SPR_BNG4, 32773, 3, { NULL }, S_BNG4_06 },        //203
-/*S_BNG4_06*/       { SPR_BNG4, 32774, 3, { NULL }, S_BNG4_07 },        //204
-/*S_BNG4_07*/       { SPR_BNG4, 32775, 3, { NULL }, S_BNG4_08 },        //205
-/*S_BNG4_08*/       { SPR_BNG4, 32776, 3, { NULL }, S_BNG4_09 },        //206
-/*S_BNG4_09*/       { SPR_BNG4, 32777, 3, { NULL }, S_BNG4_10 },        //207
-/*S_BNG4_10*/       { SPR_BNG4, 32778, 3, { NULL }, S_BNG4_11 },        //208
-/*S_BNG4_11*/       { SPR_BNG4, 32779, 3, { NULL }, S_BNG4_12 },        //209
-/*S_BNG4_12*/       { SPR_BNG4, 32780, 3, { NULL }, S_BNG4_13 },        //210
-/*S_BNG4_13*/       { SPR_BNG4, 32781, 3, { NULL }, S_NULL },       //211
-/*S_BNG3_00*/       { SPR_BNG3, 32768, 3, { A_DeathExplode5 }, S_BNG3_01 },     //212
-/*S_BNG3_01*/       { SPR_BNG3, 32769, 3, { NULL }, S_BNG3_02 },        //213
-/*S_BNG3_02*/       { SPR_BNG3, 32770, 3, { NULL }, S_BNG3_03 },        //214
-/*S_BNG3_03*/       { SPR_BNG3, 32771, 3, { NULL }, S_BNG3_04 },        //215
-/*S_BNG3_04*/       { SPR_BNG3, 32772, 3, { NULL }, S_BNG3_05 },        //216
-/*S_BNG3_05*/       { SPR_BNG3, 32773, 3, { NULL }, S_BNG3_06 },        //217
-/*S_BNG3_06*/       { SPR_BNG3, 32774, 3, { NULL }, S_BNG3_07 },        //218
-/*S_BNG3_07*/       { SPR_BNG3, 32775, 3, { NULL }, S_NULL },       //219
-/*S_BNG3_08*/       { SPR_BNG3, 0, 1, { A_SpawnGrenadeFire }, S_NULL },     //220
-/*S_BNG3_09*/       { SPR_BNG3, 32769, 2, { A_DeathExplode1 }, S_BNG3_10 },     //221
-/*S_BNG3_10*/       { SPR_BNG3, 32770, 2, { A_MissileTick }, S_FLBE_00 },       //222
-/*S_FLBE_00*/       { SPR_FLBE, 32768, 2, { A_BurnSpread }, S_FLBE_01 },        //223
-/*S_FLBE_01*/       { SPR_FLBE, 32769, 2, { A_MissileTick }, S_FLBE_02 },       //224
-/*S_FLBE_02*/       { SPR_FLBE, 32770, 2, { A_DeathExplode1 }, S_FLBE_03 },     //225
-/*S_FLBE_03*/       { SPR_FLBE, 32771, 3, { A_MissileTick }, S_FLBE_04 },       //226
-/*S_FLBE_04*/       { SPR_FLBE, 32772, 3, { A_DeathExplode1 }, S_FLBE_05 },     //227
-/*S_FLBE_05*/       { SPR_FLBE, 32773, 3, { A_MissileTick }, S_FLBE_06 },       //228
-/*S_FLBE_06*/       { SPR_FLBE, 32774, 3, { A_BurnSpread }, S_FLBE_03 },        //229
-/*S_FLBE_07*/       { SPR_FLBE, 32775, 2, { NULL }, S_FLBE_08 },        //230
-/*S_FLBE_08*/       { SPR_FLBE, 32776, 2, { A_BurnSpread }, S_FLBE_09 },        //231
-/*S_FLBE_09*/       { SPR_FLBE, 32777, 2, { NULL }, S_FLBE_10 },        //232
-/*S_FLBE_10*/       { SPR_FLBE, 32778, 2, { NULL }, S_NULL },       //233
-/*S_XPRK_00*/       { SPR_XPRK, 0, 1, { A_ClearForceField }, S_NULL },      //234
-/*S_OCLW_00*/       { SPR_OCLW, 0, 2, { A_FireChainShot }, S_OCLW_00 },     //235
-/*S_CCLW_00*/       { SPR_CCLW, 0, 6, { NULL }, S_NULL },       //236
-/*S_TEND_00*/       { SPR_TEND, 0, 20, { NULL }, S_NULL },      //237
-/*S_MICR_00*/       { SPR_MICR, 32768, 6, { A_MissileSmoke }, S_MICR_00 },      //238
-/*S_MISS_00*/       { SPR_MISS, 32768, 4, { A_MissileSmoke }, S_MISS_01 },      //239
-/*S_MISS_01*/       { SPR_MISS, 32769, 3, { A_Tracer }, S_MISS_00 },        //240
-/*S_AROW_00*/       { SPR_AROW, 0, 10, { A_ActiveSound }, S_AROW_00 },      //241
-/*S_ARWP_00*/       { SPR_ARWP, 0, 10, { A_ActiveSound }, S_ARWP_00 },      //242
-/*S_AROW_01*/       { SPR_AROW, 0, 1, { NULL }, S_NULL },       //243
-/*S_TORP_00*/       { SPR_TORP, 32768, 4, { NULL }, S_TORP_01 },        //244
-/*S_TORP_01*/       { SPR_TORP, 32769, 4, { NULL }, S_TORP_02 },        //245
-/*S_TORP_02*/       { SPR_TORP, 32770, 4, { NULL }, S_TORP_03 },        //246
-/*S_TORP_03*/       { SPR_TORP, 32771, 4, { NULL }, S_TORP_00 },        //247
-/*S_THIT_00*/       { SPR_THIT, 32768, 8, { NULL }, S_THIT_01 },        //248
-/*S_THIT_01*/       { SPR_THIT, 32769, 8, { NULL }, S_THIT_02 },        //249
-/*S_THIT_02*/       { SPR_THIT, 32770, 8, { A_TorpedoExplode }, S_THIT_03 },        //250
-/*S_THIT_03*/       { SPR_THIT, 32771, 8, { NULL }, S_THIT_04 },        //251
-/*S_THIT_04*/       { SPR_THIT, 32772, 8, { NULL }, S_NULL },       //252
-/*S_TWAV_00*/       { SPR_TWAV, 32768, 9, { NULL }, S_TWAV_01 },        //253
-/*S_TWAV_01*/       { SPR_TWAV, 32769, 9, { NULL }, S_TWAV_02 },        //254
-/*S_TWAV_02*/       { SPR_TWAV, 32770, 9, { NULL }, S_NULL },       //255
-/*S_MISL_00*/       { SPR_MISL, 32768, 5, { NULL }, S_MISL_02 },        //256
-/*S_MISL_01*/       { SPR_MISL, 32768, 5, { A_DeathExplode2 }, S_MISL_02 },     //257
-/*S_MISL_02*/       { SPR_MISL, 32769, 5, { NULL }, S_MISL_03 },        //258
-/*S_MISL_03*/       { SPR_MISL, 32770, 4, { NULL }, S_MISL_04 },        //259
-/*S_MISL_04*/       { SPR_MISL, 32771, 2, { NULL }, S_MISL_05 },        //260
-/*S_MISL_05*/       { SPR_MISL, 32772, 2, { NULL }, S_MISL_06 },        //261
-/*S_MISL_06*/       { SPR_MISL, 32773, 2, { NULL }, S_MISL_07 },        //262
-/*S_MISL_07*/       { SPR_MISL, 32774, 2, { NULL }, S_NULL },       //263
-/*S_TFOG_00*/       { SPR_TFOG, 32768, 6, { NULL }, S_TFOG_01 },        //264
-/*S_TFOG_01*/       { SPR_TFOG, 32769, 6, { NULL }, S_TFOG_02 },        //265
-/*S_TFOG_02*/       { SPR_TFOG, 32770, 6, { NULL }, S_TFOG_03 },        //266
-/*S_TFOG_03*/       { SPR_TFOG, 32771, 6, { NULL }, S_TFOG_04 },        //267
-/*S_TFOG_04*/       { SPR_TFOG, 32772, 6, { NULL }, S_TFOG_05 },        //268
-/*S_TFOG_05*/       { SPR_TFOG, 32773, 6, { NULL }, S_TFOG_06 },        //269
-/*S_TFOG_06*/       { SPR_TFOG, 32772, 6, { NULL }, S_TFOG_07 },        //270
-/*S_TFOG_07*/       { SPR_TFOG, 32771, 6, { NULL }, S_TFOG_08 },        //271
-/*S_TFOG_08*/       { SPR_TFOG, 32770, 6, { NULL }, S_TFOG_09 },        //272
-/*S_TFOG_09*/       { SPR_TFOG, 32769, 6, { NULL }, S_NULL },       //273
-/*S_IFOG_00*/       { SPR_IFOG, 32768, 6, { NULL }, S_IFOG_01 },        //274
-/*S_IFOG_01*/       { SPR_IFOG, 32769, 6, { NULL }, S_IFOG_02 },        //275
-/*S_IFOG_02*/       { SPR_IFOG, 32768, 6, { NULL }, S_IFOG_03 },        //276
-/*S_IFOG_03*/       { SPR_IFOG, 32769, 6, { NULL }, S_IFOG_04 },        //277
-/*S_IFOG_04*/       { SPR_IFOG, 32770, 6, { NULL }, S_IFOG_05 },        //278
-/*S_IFOG_05*/       { SPR_IFOG, 32771, 6, { NULL }, S_IFOG_06 },        //279
-/*S_IFOG_06*/       { SPR_IFOG, 32772, 6, { NULL }, S_NULL },       //280
-/*S_SHRD_00*/       { SPR_SHRD, 0, 128, { NULL }, S_NULL },     //281
-/*S_SHRD_01*/       { SPR_SHRD, 1, 128, { NULL }, S_NULL },     //282
-/*S_SHRD_02*/       { SPR_SHRD, 2, 128, { NULL }, S_NULL },     //283
-/*S_SHRD_03*/       { SPR_SHRD, 3, 128, { NULL }, S_NULL },     //284
-/*S_SHRD_04*/       { SPR_SHRD, 4, 128, { NULL }, S_NULL },     //285
-/*S_SHRD_05*/       { SPR_SHRD, 5, 128, { NULL }, S_NULL },     //286
-/*S_PLAY_00*/       { SPR_PLAY, 0, -1, { NULL }, S_NULL },      //287
-/*S_PLAY_01*/       { SPR_PLAY, 0, 4, { NULL }, S_PLAY_02 },        //288
-/*S_PLAY_02*/       { SPR_PLAY, 1, 4, { NULL }, S_PLAY_03 },        //289
-/*S_PLAY_03*/       { SPR_PLAY, 2, 4, { NULL }, S_PLAY_04 },        //290
-/*S_PLAY_04*/       { SPR_PLAY, 3, 4, { NULL }, S_PLAY_01 },        //291
-/*S_PLAY_05*/       { SPR_PLAY, 4, 12, { NULL }, S_PLAY_00 },       //292
-/*S_PLAY_06*/       { SPR_PLAY, 5, 6, { NULL }, S_PLAY_05 },        //293
-/*S_PLAY_07*/       { SPR_PLAY, 16, 4, { A_Pain }, S_PLAY_08 },     //294
-/*S_PLAY_08*/       { SPR_PLAY, 16, 4, { NULL }, S_PLAY_00 },       //295
-/*S_PLAY_09*/       { SPR_PLAY, 6, 4, { NULL }, S_PLAY_10 },        //296
-/*S_PLAY_10*/       { SPR_PLAY, 7, 3, { A_PlayerScream }, S_PLAY_11 },      //297
-/*S_PLAY_11*/       { SPR_PLAY, 8, 3, { A_Fall }, S_PLAY_12 },      //298
-/*S_PLAY_12*/       { SPR_PLAY, 9, 4, { NULL }, S_PLAY_13 },        //299
-/*S_PLAY_13*/       { SPR_PLAY, 10, 4, { NULL }, S_PLAY_14 },       //300
-/*S_PLAY_14*/       { SPR_PLAY, 11, 4, { NULL }, S_PLAY_15 },       //301
-/*S_PLAY_15*/       { SPR_PLAY, 12, 4, { NULL }, S_PLAY_16 },       //302
-/*S_PLAY_16*/       { SPR_PLAY, 13, 4, { NULL }, S_PLAY_17 },       //303
-/*S_PLAY_17*/       { SPR_PLAY, 14, 4, { NULL }, S_PLAY_18 },       //304
-/*S_PLAY_18*/       { SPR_PLAY, 15, 700, { NULL }, S_RGIB_07 },     //305
-/*S_RGIB_00*/       { SPR_RGIB, 0, 5, { A_BodyParts }, S_RGIB_01 },     //306
-/*S_RGIB_01*/       { SPR_RGIB, 1, 5, { A_XScream }, S_RGIB_02 },       //307
-/*S_RGIB_02*/       { SPR_RGIB, 2, 5, { A_Fall }, S_RGIB_03 },      //308
-/*S_RGIB_03*/       { SPR_RGIB, 3, 5, { A_BodyParts }, S_RGIB_04 },     //309
-/*S_RGIB_04*/       { SPR_RGIB, 4, 5, { A_BodyParts }, S_RGIB_05 },     //310
-/*S_RGIB_05*/       { SPR_RGIB, 5, 5, { A_BodyParts }, S_RGIB_06 },     //311
-/*S_RGIB_06*/       { SPR_RGIB, 6, 5, { A_BodyParts }, S_RGIB_07 },     //312
-/*S_RGIB_07*/       { SPR_RGIB, 7, 1400, { NULL }, S_NULL },        //313
-/*S_MRYS_00*/       { SPR_MRYS, 0, 30, { NULL }, S_MRST_00 },       //314
-/*S_MRNO_00*/       { SPR_MRNO, 0, 6, { NULL }, S_MRNO_01 },        //315
-/*S_MRNO_01*/       { SPR_MRNO, 1, 6, { NULL }, S_MRNO_02 },        //316
-/*S_MRNO_02*/       { SPR_MRNO, 2, 10, { NULL }, S_MRNO_03 },       //317
-/*S_MRNO_03*/       { SPR_MRNO, 1, 6, { NULL }, S_MRNO_04 },        //318
-/*S_MRNO_04*/       { SPR_MRNO, 0, 6, { NULL }, S_MRST_00 },        //319
-/*S_MRST_00*/       { SPR_MRST, 0, 10, { A_FriendLook }, S_MRST_00 },       //320
-/*S_MRLK_00*/       { SPR_MRLK, 0, 30, { A_ActiveSound }, S_MRST_00 },      //321
-/*S_MRLK_01*/       { SPR_MRLK, 1, 30, { NULL }, S_MRST_00 },       //322
-/*S_MRBD_00*/       { SPR_MRBD, 0, 4, { NULL }, S_MRBD_01 },        //323
-/*S_MRBD_01*/       { SPR_MRBD, 1, 4, { NULL }, S_MRBD_02 },        //324
-/*S_MRBD_02*/       { SPR_MRBD, 2, 4, { NULL }, S_MRBD_03 },        //325
-/*S_MRBD_03*/       { SPR_MRBD, 3, 4, { NULL }, S_MRBD_04 },        //326
-/*S_MRBD_04*/       { SPR_MRBD, 4, 4, { NULL }, S_MRBD_05 },        //327
-/*S_MRBD_05*/       { SPR_MRBD, 3, 4, { NULL }, S_MRBD_06 },        //328
-/*S_MRBD_06*/       { SPR_MRBD, 2, 4, { NULL }, S_MRBD_07 },        //329
-/*S_MRBD_07*/       { SPR_MRBD, 1, 4, { NULL }, S_MRBD_08 },        //330
-/*S_MRBD_08*/       { SPR_MRBD, 0, 5, { NULL }, S_MRBD_09 },        //331
-/*S_MRBD_09*/       { SPR_MRBD, 5, 6, { NULL }, S_MRST_00 },        //332
-/*S_MRPN_00*/       { SPR_MRPN, 0, 3, { NULL }, S_MRPN_01 },        //333
-/*S_MRPN_01*/       { SPR_MRPN, 1, 3, { A_Pain }, S_MRPN_02 },      //334
-/*S_MRPN_02*/       { SPR_MRPN, 2, 3, { NULL }, S_MRPN_03 },        //335
-/*S_MRPN_03*/       { SPR_MRPN, 3, 9, { A_MerchantPain }, S_MRPN_04 },      //336
-/*S_MRPN_04*/       { SPR_MRPN, 2, 4, { NULL }, S_MRPN_05 },        //337
-/*S_MRPN_05*/       { SPR_MRPN, 1, 3, { NULL }, S_MRPN_06 },        //338
-/*S_MRPN_06*/       { SPR_MRPN, 0, 3, { A_ClearSoundTarget }, S_MRST_00 },      //339
-/*S_MRGT_00*/       { SPR_MRGT, 0, 5, { NULL }, S_MRGT_01 },        //340
-/*S_MRGT_01*/       { SPR_MRGT, 1, 5, { NULL }, S_MRGT_02 },        //341
-/*S_MRGT_02*/       { SPR_MRGT, 2, 5, { NULL }, S_MRGT_03 },        //342
-/*S_MRGT_03*/       { SPR_MRGT, 3, 5, { NULL }, S_MRGT_04 },        //343
-/*S_MRGT_04*/       { SPR_MRGT, 4, 5, { NULL }, S_MRGT_05 },        //344
-/*S_MRGT_05*/       { SPR_MRGT, 5, 5, { NULL }, S_MRGT_06 },        //345
-/*S_MRGT_06*/       { SPR_MRGT, 6, 5, { NULL }, S_MRGT_07 },        //346
-/*S_MRGT_07*/       { SPR_MRGT, 7, 5, { NULL }, S_MRGT_08 },        //347
-/*S_MRGT_08*/       { SPR_MRGT, 8, 5, { NULL }, S_MRST_00 },        //348
-/*S_BURN_00*/       { SPR_BURN, 0, 3, { A_Scream }, S_BURN_01 },        //349
-/*S_BURN_01*/       { SPR_BURN, 1, 3, { A_DropBurnFlesh }, S_BURN_02 },     //350
-/*S_BURN_02*/       { SPR_BURN, 2, 3, { A_RandomWalk }, S_BURN_03 },        //351
-/*S_BURN_03*/       { SPR_BURN, 3, 3, { A_Fall }, S_BURN_04 },      //352
-/*S_BURN_04*/       { SPR_BURN, 4, 5, { A_DropBurnFlesh }, S_BURN_05 },     //353
-/*S_BURN_05*/       { SPR_BURN, 5, 5, { A_RandomWalk }, S_BURN_06 },        //354
-/*S_BURN_06*/       { SPR_BURN, 6, 5, { A_RandomWalk }, S_BURN_07 },        //355
-/*S_BURN_07*/       { SPR_BURN, 7, 5, { A_RandomWalk }, S_BURN_08 },        //356
-/*S_BURN_08*/       { SPR_BURN, 8, 5, { A_DropBurnFlesh }, S_BURN_09 },     //357
-/*S_BURN_09*/       { SPR_BURN, 9, 5, { A_RandomWalk }, S_BURN_10 },        //358
-/*S_BURN_10*/       { SPR_BURN, 10, 5, { A_RandomWalk }, S_BURN_11 },       //359
-/*S_BURN_11*/       { SPR_BURN, 11, 5, { A_RandomWalk }, S_BURN_12 },       //360
-/*S_BURN_12*/       { SPR_BURN, 12, 3, { A_DropBurnFlesh }, S_BURN_13 },        //361
-/*S_BURN_13*/       { SPR_BURN, 13, 3, { NULL }, S_BURN_14 },       //362
-/*S_BURN_14*/       { SPR_BURN, 14, 5, { NULL }, S_BURN_15 },       //363
-/*S_BURN_15*/       { SPR_BURN, 15, 5, { NULL }, S_BURN_16 },       //364
-/*S_BURN_16*/       { SPR_BURN, 16, 5, { NULL }, S_BURN_17 },       //365
-/*S_BURN_17*/       { SPR_BURN, 15, 5, { NULL }, S_BURN_18 },       //366
-/*S_BURN_18*/       { SPR_BURN, 16, 5, { NULL }, S_BURN_19 },       //367
-/*S_BURN_19*/       { SPR_BURN, 17, 7, { NULL }, S_BURN_20 },       //368
-/*S_BURN_20*/       { SPR_BURN, 18, 7, { NULL }, S_BURN_21 },       //369
-/*S_BURN_21*/       { SPR_BURN, 19, 7, { NULL }, S_BURN_22 },       //370
-/*S_BURN_22*/       { SPR_BURN, 20, 7, { NULL }, S_BURN_23 },       //371
-/*S_BURN_23*/       { SPR_BURN, 21, 700, { A_PeasantCrash }, S_NULL },      //372
-/*S_DISR_00*/       { SPR_DISR, 0, 5, { NULL }, S_DISR_01 },        //373
-/*S_DISR_01*/       { SPR_DISR, 1, 5, { NULL }, S_DISR_02 },        //374
-/*S_DISR_02*/       { SPR_DISR, 2, 5, { NULL }, S_DISR_03 },        //375
-/*S_DISR_03*/       { SPR_DISR, 3, 5, { A_Fall }, S_DISR_04 },      //376
-/*S_DISR_04*/       { SPR_DISR, 4, 5, { NULL }, S_DISR_05 },        //377
-/*S_DISR_05*/       { SPR_DISR, 5, 5, { NULL }, S_DISR_06 },        //378
-/*S_DISR_06*/       { SPR_DISR, 6, 4, { NULL }, S_DISR_07 },        //379
-/*S_DISR_07*/       { SPR_DISR, 7, 4, { NULL }, S_DISR_08 },        //380
-/*S_DISR_08*/       { SPR_DISR, 8, 4, { NULL }, S_DISR_09 },        //381
-/*S_DISR_09*/       { SPR_DISR, 9, 4, { NULL }, S_MEAT_03 },        //382
-/*S_PEAS_00*/       { SPR_PEAS, 0, 10, { A_FriendLook }, S_PEAS_00 },       //383
-/*S_PEAS_01*/       { SPR_PEAS, 0, 5, { A_RandomWalk }, S_PEAS_02 },        //384
-/*S_PEAS_02*/       { SPR_PEAS, 0, 5, { A_RandomWalk }, S_PEAS_03 },        //385
-/*S_PEAS_03*/       { SPR_PEAS, 1, 5, { A_RandomWalk }, S_PEAS_04 },        //386
-/*S_PEAS_04*/       { SPR_PEAS, 1, 5, { A_RandomWalk }, S_PEAS_05 },        //387
-/*S_PEAS_05*/       { SPR_PEAS, 2, 5, { A_RandomWalk }, S_PEAS_06 },        //388
-/*S_PEAS_06*/       { SPR_PEAS, 2, 5, { A_RandomWalk }, S_PEAS_07 },        //389
-/*S_PEAS_07*/       { SPR_PEAS, 3, 5, { A_RandomWalk }, S_PEAS_08 },        //390
-/*S_PEAS_08*/       { SPR_PEAS, 3, 5, { A_RandomWalk }, S_PEAS_00 },        //391
-/*S_PEAS_09*/       { SPR_PEAS, 4, 10, { A_FaceTarget }, S_PEAS_10 },       //392
-/*S_PEAS_10*/       { SPR_PEAS, 5, 8, { A_PeasantPunch }, S_PEAS_11 },      //393
-/*S_PEAS_11*/       { SPR_PEAS, 4, 8, { NULL }, S_PEAS_01 },        //394
-/*S_PEAS_12*/       { SPR_PEAS, 14, 3, { NULL }, S_PEAS_13 },       //395
-/*S_PEAS_13*/       { SPR_PEAS, 14, 3, { A_Pain }, S_PEAS_09 },     //396
-/*S_PEAS_14*/       { SPR_PEAS, 6, 5, { NULL }, S_PEAS_15 },        //397
-/*S_PEAS_15*/       { SPR_PEAS, 7, 10, { A_PeasantCrash }, S_PEAS_16 },     //398
-/*S_PEAS_16*/       { SPR_PEAS, 8, 6, { NULL }, S_PEAS_15 },        //399
-/*S_PEAS_17*/       { SPR_PEAS, 6, 5, { NULL }, S_PEAS_18 },        //400
-/*S_PEAS_18*/       { SPR_PEAS, 7, 5, { A_Scream }, S_PEAS_19 },        //401
-/*S_PEAS_19*/       { SPR_PEAS, 8, 6, { NULL }, S_PEAS_20 },        //402
-/*S_PEAS_20*/       { SPR_PEAS, 9, 5, { A_Fall }, S_PEAS_21 },      //403
-/*S_PEAS_21*/       { SPR_PEAS, 10, 5, { NULL }, S_PEAS_22 },       //404
-/*S_PEAS_22*/       { SPR_PEAS, 11, 6, { NULL }, S_PEAS_23 },       //405
-/*S_PEAS_23*/       { SPR_PEAS, 12, 8, { NULL }, S_PEAS_24 },       //406
-/*S_PEAS_24*/       { SPR_PEAS, 13, 1400, { NULL }, S_GIBS_08 },        //407
-/*S_GIBS_00*/       { SPR_GIBS, 12, 5, { A_BodyParts }, S_GIBS_01 },        //408
-/*S_GIBS_01*/       { SPR_GIBS, 13, 5, { A_XScream }, S_GIBS_02 },      //409
-/*S_GIBS_02*/       { SPR_GIBS, 14, 5, { A_Fall }, S_GIBS_03 },     //410
-/*S_GIBS_03*/       { SPR_GIBS, 15, 4, { A_BodyParts }, S_GIBS_04 },        //411
-/*S_GIBS_04*/       { SPR_GIBS, 16, 4, { A_BodyParts }, S_GIBS_05 },        //412
-/*S_GIBS_05*/       { SPR_GIBS, 17, 4, { A_BodyParts }, S_GIBS_06 },        //413
-/*S_GIBS_06*/       { SPR_GIBS, 18, 4, { A_BodyParts }, S_GIBS_07 },        //414
-/*S_GIBS_07*/       { SPR_GIBS, 19, 4, { NULL }, S_GIBS_08 },       //415
-/*S_GIBS_08*/       { SPR_GIBS, 20, 5, { NULL }, S_GIBS_09 },       //416
-/*S_GIBS_09*/       { SPR_GIBS, 21, 1400, { NULL }, S_NULL },       //417
-/*S_PEAS_25*/       { SPR_PEAS, 0, 5, { A_ZombieInSpecialSector }, S_PEAS_25 },     //418
-/*S_AGRD_00*/       { SPR_AGRD, 0, 5, { A_ZombieInSpecialSector }, S_AGRD_00 },     //419
-/*S_ARMR_00*/       { SPR_ARMR, 0, -1, { NULL }, S_NULL },      //420
-/*S_ARMR_01*/       { SPR_ARMR, 0, -1, { A_HideZombie }, S_NULL },      //421
-/*S_PLAY_19*/       { SPR_PLAY, 0, 175, { A_SpawnZombie }, S_PLAY_19 },     //422
-/*S_SACR_00*/       { SPR_SACR, 0, -1, { NULL }, S_NULL },      //423
-/*S_TNK1_00*/       { SPR_TNK1, 0, 15, { NULL }, S_TNK1_01 },       //424
-/*S_TNK1_01*/       { SPR_TNK1, 1, 11, { NULL }, S_TNK1_02 },       //425
-/*S_TNK1_02*/       { SPR_TNK1, 2, 40, { NULL }, S_TNK1_00 },       //426
-/*S_TNK2_00*/       { SPR_TNK2, 0, 15, { NULL }, S_TNK2_01 },       //427
-/*S_TNK2_01*/       { SPR_TNK2, 1, 11, { NULL }, S_TNK2_02 },       //428
-/*S_TNK2_02*/       { SPR_TNK2, 2, 40, { NULL }, S_TNK2_00 },       //429
-/*S_TNK3_00*/       { SPR_TNK3, 0, 15, { NULL }, S_TNK3_01 },       //430
-/*S_TNK3_01*/       { SPR_TNK3, 1, 11, { NULL }, S_TNK3_02 },       //431
-/*S_TNK3_02*/       { SPR_TNK3, 2, 40, { NULL }, S_TNK3_00 },       //432
-/*S_TNK4_00*/       { SPR_TNK4, 0, 15, { NULL }, S_TNK4_01 },       //433
-/*S_TNK4_01*/       { SPR_TNK4, 1, 11, { NULL }, S_TNK4_02 },       //434
-/*S_TNK4_02*/       { SPR_TNK4, 2, 40, { NULL }, S_TNK4_00 },       //435
-/*S_TNK5_00*/       { SPR_TNK5, 0, 15, { NULL }, S_TNK5_01 },       //436
-/*S_TNK5_01*/       { SPR_TNK5, 1, 11, { NULL }, S_TNK5_02 },       //437
-/*S_TNK5_02*/       { SPR_TNK5, 2, 40, { NULL }, S_TNK5_00 },       //438
-/*S_TNK6_00*/       { SPR_TNK6, 0, 15, { NULL }, S_TNK6_01 },       //439
-/*S_TNK6_01*/       { SPR_TNK6, 1, 11, { NULL }, S_TNK6_02 },       //440
-/*S_TNK6_02*/       { SPR_TNK6, 2, 40, { NULL }, S_TNK6_00 },       //441
-/*S_NEAL_00*/       { SPR_NEAL, 0, 15, { A_ActiveSound }, S_NEAL_01 },      //442
-/*S_NEAL_01*/       { SPR_NEAL, 1, 40, { A_ActiveSound }, S_NEAL_00 },      //443
-/*S_NEAL_02*/       { SPR_NEAL, 2, 5, { A_ShadowOn }, S_NEAL_03 },      //444
-/*S_NEAL_03*/       { SPR_NEAL, 1, 4, { A_Pain }, S_NEAL_04 },      //445
-/*S_NEAL_04*/       { SPR_NEAL, 2, 5, { A_ShadowOff }, S_NEAL_00 },     //446
-/*S_NEAL_05*/       { SPR_NEAL, 1, 6, { NULL }, S_NEAL_06 },        //447
-/*S_NEAL_06*/       { SPR_NEAL, 2, 13, { A_PeasantCrash }, S_NEAL_05 },     //448
-/*S_NEAL_07*/       { SPR_NEAL, 3, 5, { NULL }, S_NEAL_08 },        //449
-/*S_NEAL_08*/       { SPR_NEAL, 4, 5, { A_Scream }, S_NEAL_09 },        //450
-/*S_NEAL_09*/       { SPR_NEAL, 5, 6, { NULL }, S_NEAL_10 },        //451
-/*S_NEAL_10*/       { SPR_NEAL, 6, 5, { A_Fall }, S_NEAL_11 },      //452
-/*S_NEAL_11*/       { SPR_NEAL, 7, 5, { NULL }, S_NEAL_12 },        //453
-/*S_NEAL_12*/       { SPR_NEAL, 8, 6, { NULL }, S_NEAL_13 },        //454
-/*S_NEAL_13*/       { SPR_NEAL, 9, -1, { NULL }, S_NULL },      //455
-/*S_BEGR_00*/       { SPR_BEGR, 0, 10, { A_Look }, S_BEGR_00 },     //456
-/*S_BEGR_01*/       { SPR_BEGR, 0, 4, { A_RandomWalk }, S_BEGR_02 },        //457
-/*S_BEGR_02*/       { SPR_BEGR, 0, 4, { A_RandomWalk }, S_BEGR_03 },        //458
-/*S_BEGR_03*/       { SPR_BEGR, 1, 4, { A_RandomWalk }, S_BEGR_04 },        //459
-/*S_BEGR_04*/       { SPR_BEGR, 1, 4, { A_RandomWalk }, S_BEGR_05 },        //460
-/*S_BEGR_05*/       { SPR_BEGR, 2, 4, { A_RandomWalk }, S_BEGR_06 },        //461
-/*S_BEGR_06*/       { SPR_BEGR, 2, 4, { A_RandomWalk }, S_BEGR_01 },        //462
-/*S_BEGR_07*/       { SPR_BEGR, 3, 8, { NULL }, S_BEGR_08 },        //463
-/*S_BEGR_08*/       { SPR_BEGR, 4, 8, { A_PeasantPunch }, S_BEGR_09 },      //464
-/*S_BEGR_09*/       { SPR_BEGR, 4, 1, { A_Chase }, S_BEGR_10 },     //465
-/*S_BEGR_10*/       { SPR_BEGR, 3, 8, { A_CheckTargetVisible }, S_BEGR_07 },        //466
-/*S_BEGR_11*/       { SPR_BEGR, 0, 3, { A_Pain }, S_BEGR_12 },      //467
-/*S_BEGR_12*/       { SPR_BEGR, 0, 3, { A_Chase }, S_BEGR_07 },     //468
-/*S_BEGR_13*/       { SPR_BEGR, 5, 4, { NULL }, S_BEGR_14 },        //469
-/*S_BEGR_14*/       { SPR_BEGR, 6, 4, { A_Scream }, S_BEGR_15 },        //470
-/*S_BEGR_15*/       { SPR_BEGR, 7, 4, { NULL }, S_BEGR_16 },        //471
-/*S_BEGR_16*/       { SPR_BEGR, 8, 4, { A_Fall }, S_BEGR_17 },      //472
-/*S_BEGR_17*/       { SPR_BEGR, 9, 4, { NULL }, S_BEGR_18 },        //473
-/*S_BEGR_18*/       { SPR_BEGR, 10, 4, { NULL }, S_BEGR_19 },       //474
-/*S_BEGR_19*/       { SPR_BEGR, 11, 4, { NULL }, S_BEGR_20 },       //475
-/*S_BEGR_20*/       { SPR_BEGR, 12, 4, { NULL }, S_BEGR_21 },       //476
-/*S_BEGR_21*/       { SPR_BEGR, 13, -1, { NULL }, S_NULL },     //477
-/*S_BEGR_22*/       { SPR_BEGR, 5, 5, { A_BodyParts }, S_GIBS_01 },     //478
-/*S_HMN1_00*/       { SPR_HMN1, 15, 5, { A_FriendLook }, S_HMN1_00 },       //479
-/*S_HMN1_01*/       { SPR_HMN1, 16, 8, { NULL }, S_HMN1_00 },       //480
-/*S_HMN1_02*/       { SPR_HMN1, 17, 8, { NULL }, S_HMN1_00 },       //481
-/*S_HMN1_03*/       { SPR_HMN1, 0, 6, { A_RandomWalk }, S_HMN1_04 },        //482
-/*S_HMN1_04*/       { SPR_HMN1, 1, 6, { A_RandomWalk }, S_HMN1_05 },        //483
-/*S_HMN1_05*/       { SPR_HMN1, 2, 6, { A_RandomWalk }, S_HMN1_06 },        //484
-/*S_HMN1_06*/       { SPR_HMN1, 3, 6, { A_RandomWalk }, S_HMN1_07 },        //485
-/*S_HMN1_07*/       { SPR_HMN1, 0, 6, { A_RandomWalk }, S_HMN1_08 },        //486
-/*S_HMN1_08*/       { SPR_HMN1, 1, 6, { A_RandomWalk }, S_HMN1_09 },        //487
-/*S_HMN1_09*/       { SPR_HMN1, 2, 6, { A_RandomWalk }, S_HMN1_10 },        //488
-/*S_HMN1_10*/       { SPR_HMN1, 3, 6, { A_RandomWalk }, S_HMN1_00 },        //489
-/*S_HMN1_11*/       { SPR_HMN1, 0, 3, { A_Chase }, S_HMN1_12 },     //490
-/*S_HMN1_12*/       { SPR_HMN1, 0, 3, { A_Chase }, S_HMN1_13 },     //491
-/*S_HMN1_13*/       { SPR_HMN1, 1, 3, { A_Chase }, S_HMN1_14 },     //492
-/*S_HMN1_14*/       { SPR_HMN1, 1, 3, { A_Chase }, S_HMN1_15 },     //493
-/*S_HMN1_15*/       { SPR_HMN1, 2, 3, { A_Chase }, S_HMN1_16 },     //494
-/*S_HMN1_16*/       { SPR_HMN1, 2, 3, { A_Chase }, S_HMN1_17 },     //495
-/*S_HMN1_17*/       { SPR_HMN1, 3, 3, { A_Chase }, S_HMN1_18 },     //496
-/*S_HMN1_18*/       { SPR_HMN1, 3, 3, { A_Chase }, S_HMN1_11 },     //497
-/*S_HMN1_19*/       { SPR_HMN1, 4, 10, { A_FaceTarget }, S_HMN1_20 },       //498
-/*S_HMN1_20*/       { SPR_HMN1, 32773, 10, { A_BulletAttack }, S_HMN1_21 },     //499
-/*S_HMN1_21*/       { SPR_HMN1, 4, 10, { A_BulletAttack }, S_HMN1_11 },     //500
-/*S_HMN1_22*/       { SPR_HMN1, 14, 3, { NULL }, S_HMN1_23 },       //501
-/*S_HMN1_23*/       { SPR_HMN1, 14, 3, { A_Pain }, S_HMN1_11 },     //502
-/*S_HMN1_24*/       { SPR_HMN1, 6, 5, { NULL }, S_HMN1_25 },        //503
-/*S_HMN1_25*/       { SPR_HMN1, 7, 5, { A_Scream }, S_HMN1_26 },        //504
-/*S_HMN1_26*/       { SPR_HMN1, 8, 3, { A_Fall }, S_HMN1_27 },      //505
-/*S_HMN1_27*/       { SPR_HMN1, 9, 4, { NULL }, S_HMN1_28 },        //506
-/*S_HMN1_28*/       { SPR_HMN1, 10, 3, { NULL }, S_HMN1_29 },       //507
-/*S_HMN1_29*/       { SPR_HMN1, 11, 3, { NULL }, S_HMN1_30 },       //508
-/*S_HMN1_30*/       { SPR_HMN1, 12, 3, { NULL }, S_HMN1_31 },       //509
-/*S_HMN1_31*/       { SPR_HMN1, 13, -1, { NULL }, S_NULL },     //510
-/*S_RGIB_08*/       { SPR_RGIB, 0, 4, { A_BodyParts }, S_RGIB_09 },     //511
-/*S_RGIB_09*/       { SPR_RGIB, 1, 4, { A_XScream }, S_RGIB_10 },       //512
-/*S_RGIB_10*/       { SPR_RGIB, 2, 3, { A_Fall }, S_RGIB_11 },      //513
-/*S_RGIB_11*/       { SPR_RGIB, 3, 3, { A_BodyParts }, S_RGIB_12 },     //514
-/*S_RGIB_12*/       { SPR_RGIB, 4, 3, { A_BodyParts }, S_RGIB_13 },     //515
-/*S_RGIB_13*/       { SPR_RGIB, 5, 3, { A_BodyParts }, S_RGIB_14 },     //516
-/*S_RGIB_14*/       { SPR_RGIB, 6, 3, { NULL }, S_RGIB_15 },        //517
-/*S_RGIB_15*/       { SPR_RGIB, 7, 1400, { NULL }, S_NULL },        //518
-/*S_LEDR_00*/       { SPR_LEDR, 2, 5, { A_FriendLook }, S_LEDR_00 },        //519
-/*S_LEDR_01*/       { SPR_LEDR, 0, 8, { NULL }, S_LEDR_00 },        //520
-/*S_LEDR_02*/       { SPR_LEDR, 1, 8, { NULL }, S_LEDR_00 },        //521
-/*S_LEAD_00*/       { SPR_LEAD, 0, 6, { A_RandomWalk }, S_LEAD_01 },        //522
-/*S_LEAD_01*/       { SPR_LEAD, 1, 6, { A_RandomWalk }, S_LEAD_02 },        //523
-/*S_LEAD_02*/       { SPR_LEAD, 2, 6, { A_RandomWalk }, S_LEAD_03 },        //524
-/*S_LEAD_03*/       { SPR_LEAD, 3, 6, { A_RandomWalk }, S_LEDR_00 },        //525
-/*S_LEAD_04*/       { SPR_LEAD, 0, 3, { A_Chase }, S_LEAD_05 },     //526
-/*S_LEAD_05*/       { SPR_LEAD, 0, 3, { A_Chase }, S_LEAD_06 },     //527
-/*S_LEAD_06*/       { SPR_LEAD, 1, 3, { A_Chase }, S_LEAD_07 },     //528
-/*S_LEAD_07*/       { SPR_LEAD, 1, 3, { A_Chase }, S_LEAD_08 },     //529
-/*S_LEAD_08*/       { SPR_LEAD, 2, 3, { A_Chase }, S_LEAD_09 },     //530
-/*S_LEAD_09*/       { SPR_LEAD, 2, 3, { A_Chase }, S_LEAD_10 },     //531
-/*S_LEAD_10*/       { SPR_LEAD, 3, 3, { A_Chase }, S_LEAD_11 },     //532
-/*S_LEAD_11*/       { SPR_LEAD, 3, 3, { A_Chase }, S_LEAD_04 },     //533
-/*S_LEAD_12*/       { SPR_LEAD, 4, 2, { A_FaceTarget }, S_LEAD_13 },        //534
-/*S_LEAD_13*/       { SPR_LEAD, 32773, 2, { A_BulletAttack }, S_LEAD_14 },      //535
-/*S_LEAD_14*/       { SPR_LEAD, 4, 1, { A_CheckTargetVisible }, S_LEAD_12 },        //536
-/*S_LEAD_15*/       { SPR_LEAD, 24, 3, { NULL }, S_LEAD_16 },       //537
-/*S_LEAD_16*/       { SPR_LEAD, 24, 3, { A_Pain }, S_LEAD_04 },     //538
-/*S_LEAD_17*/       { SPR_LEAD, 4, 4, { A_FaceTarget }, S_LEAD_18 },        //539
-/*S_LEAD_18*/       { SPR_LEAD, 32773, 4, { A_BulletAttack }, S_LEAD_19 },      //540
-/*S_LEAD_19*/       { SPR_LEAD, 4, 2, { A_CheckTargetVisible }, S_LEAD_17 },        //541
-/*S_LEAD_20*/       { SPR_LEAD, 6, 5, { NULL }, S_LEAD_21 },        //542
-/*S_LEAD_21*/       { SPR_LEAD, 7, 5, { A_Scream }, S_LEAD_22 },        //543
-/*S_LEAD_22*/       { SPR_LEAD, 8, 4, { NULL }, S_LEAD_23 },        //544
-/*S_LEAD_23*/       { SPR_LEAD, 9, 4, { NULL }, S_LEAD_24 },        //545
-/*S_LEAD_24*/       { SPR_LEAD, 10, 3, { NULL }, S_LEAD_25 },       //546
-/*S_LEAD_25*/       { SPR_LEAD, 11, 3, { A_Fall }, S_LEAD_26 },     //547
-/*S_LEAD_26*/       { SPR_LEAD, 12, 3, { NULL }, S_LEAD_27 },       //548
-/*S_LEAD_27*/       { SPR_LEAD, 13, 3, { NULL }, S_LEAD_28 },       //549
-/*S_LEAD_28*/       { SPR_LEAD, 14, 3, { NULL }, S_LEAD_29 },       //550
-/*S_LEAD_29*/       { SPR_LEAD, 15, 3, { NULL }, S_LEAD_30 },       //551
-/*S_LEAD_30*/       { SPR_LEAD, 16, 3, { NULL }, S_LEAD_31 },       //552
-/*S_LEAD_31*/       { SPR_LEAD, 17, 3, { NULL }, S_LEAD_32 },       //553
-/*S_LEAD_32*/       { SPR_LEAD, 18, 3, { NULL }, S_LEAD_33 },       //554
-/*S_LEAD_33*/       { SPR_LEAD, 19, 3, { NULL }, S_LEAD_34 },       //555
-/*S_LEAD_34*/       { SPR_LEAD, 20, 3, { NULL }, S_LEAD_35 },       //556
-/*S_LEAD_35*/       { SPR_LEAD, 21, 3, { NULL }, S_LEAD_36 },       //557
-/*S_LEAD_36*/       { SPR_LEAD, 22, 3, { A_SpawnSpectreD }, S_LEAD_37 },        //558
-/*S_LEAD_37*/       { SPR_LEAD, 23, -1, { NULL }, S_NULL },     //559
-/*S_PUFY_04*/       { SPR_PUFY, 1, 4, { NULL }, S_PUFY_05 },        //560
-/*S_PUFY_05*/       { SPR_PUFY, 2, 4, { NULL }, S_PUFY_06 },        //561
-/*S_PUFY_06*/       { SPR_PUFY, 1, 4, { NULL }, S_PUFY_07 },        //562
-/*S_PUFY_07*/       { SPR_PUFY, 2, 4, { NULL }, S_PUFY_08 },        //563
-/*S_PUFY_08*/       { SPR_PUFY, 3, 4, { NULL }, S_NULL },       //564
-/*S_MICR_01*/       { SPR_MICR, 32768, 2, { A_Tracer }, S_MICR_02 },        //565
-/*S_MICR_02*/       { SPR_MICR, 32768, 2, { A_Tracer }, S_MICR_01 },        //566
-/*S_ROB1_00*/       { SPR_ROB1, 0, 10, { A_Look }, S_ROB1_01 },     //567
-/*S_ROB1_01*/       { SPR_ROB1, 0, 10, { A_Look }, S_ROB1_00 },     //568
-/*S_ROB1_02*/       { SPR_ROB1, 1, 3, { A_Chase }, S_ROB1_03 },     //569
-/*S_ROB1_03*/       { SPR_ROB1, 1, 3, { A_Chase }, S_ROB1_04 },     //570
-/*S_ROB1_04*/       { SPR_ROB1, 2, 3, { A_Chase }, S_ROB1_05 },     //571
-/*S_ROB1_05*/       { SPR_ROB1, 2, 3, { A_Chase }, S_ROB1_06 },     //572
-/*S_ROB1_06*/       { SPR_ROB1, 3, 3, { A_Chase }, S_ROB1_07 },     //573
-/*S_ROB1_07*/       { SPR_ROB1, 3, 3, { A_Chase }, S_ROB1_08 },     //574
-/*S_ROB1_08*/       { SPR_ROB1, 4, 3, { A_Chase }, S_ROB1_09 },     //575
-/*S_ROB1_09*/       { SPR_ROB1, 4, 3, { A_Chase }, S_ROB1_02 },     //576
-/*S_ROB1_10*/       { SPR_ROB1, 7, 6, { A_FaceTarget }, S_ROB1_11 },        //577
-/*S_ROB1_11*/       { SPR_ROB1, 8, 8, { A_RobotMelee }, S_ROB1_12 },        //578
-/*S_ROB1_12*/       { SPR_ROB1, 7, 6, { NULL }, S_ROB1_02 },        //579
-/*S_ROB1_13*/       { SPR_ROB1, 5, 8, { A_FaceTarget }, S_ROB1_14 },        //580
-/*S_ROB1_14*/       { SPR_ROB1, 32774, 11, { A_ReaverAttack }, S_ROB1_02 },        //581
-/*S_ROB1_15*/       { SPR_ROB1, 0, 2, { NULL }, S_ROB1_16 },        //582
-/*S_ROB1_16*/       { SPR_ROB1, 0, 2, { A_Pain }, S_ROB1_02 },      //583
-/*S_ROB1_17*/       { SPR_ROB1, 32777, 6, { NULL }, S_ROB1_18 },        //584
-/*S_ROB1_18*/       { SPR_ROB1, 32778, 6, { A_Scream }, S_ROB1_19 },        //585
-/*S_ROB1_19*/       { SPR_ROB1, 32779, 5, { NULL }, S_ROB1_20 },        //586
-/*S_ROB1_20*/       { SPR_ROB1, 32780, 5, { A_Fall }, S_ROB1_21 },      //587
-/*S_ROB1_21*/       { SPR_ROB1, 32781, 5, { NULL }, S_ROB1_22 },        //588
-/*S_ROB1_22*/       { SPR_ROB1, 32782, 5, { NULL }, S_ROB1_23 },        //589
-/*S_ROB1_23*/       { SPR_ROB1, 32783, 5, { NULL }, S_ROB1_24 },        //590
-/*S_ROB1_24*/       { SPR_ROB1, 32784, 6, { A_DeathExplode3 }, S_ROB1_25 },     //591
-/*S_ROB1_25*/       { SPR_ROB1, 17, -1, { NULL }, S_NULL },     //592
-/*S_ROB1_26*/       { SPR_ROB1, 32779, 5, { A_BodyParts }, S_ROB1_27 },     //593
-/*S_ROB1_27*/       { SPR_ROB1, 32780, 5, { A_XScream }, S_ROB1_28 },       //594
-/*S_ROB1_28*/       { SPR_ROB1, 32781, 5, { A_BodyParts }, S_ROB1_29 },     //595
-/*S_ROB1_29*/       { SPR_ROB1, 32782, 5, { A_Fall }, S_ROB1_30 },      //596
-/*S_ROB1_30*/       { SPR_ROB1, 32783, 5, { A_BodyParts }, S_ROB1_31 },     //597
-/*S_ROB1_31*/       { SPR_ROB1, 32784, 5, { A_DeathExplode3 }, S_ROB1_32 },     //598
-/*S_ROB1_32*/       { SPR_ROB1, 17, -1, { NULL }, S_NULL },     //599
-/*S_AGRD_01*/       { SPR_AGRD, 0, 5, { A_FriendLook }, S_AGRD_01 },        //600
-/*S_AGRD_02*/       { SPR_AGRD, 1, 8, { A_ShadowOff }, S_AGRD_01 },     //601
-/*S_AGRD_03*/       { SPR_AGRD, 3, 8, { NULL }, S_AGRD_01 },        //602
-/*S_AGRD_04*/       { SPR_AGRD, 0, 5, { A_RandomWalk }, S_AGRD_05 },        //603
-/*S_AGRD_05*/       { SPR_AGRD, 1, 5, { A_RandomWalk }, S_AGRD_06 },        //604
-/*S_AGRD_06*/       { SPR_AGRD, 2, 5, { A_RandomWalk }, S_AGRD_07 },        //605
-/*S_AGRD_07*/       { SPR_AGRD, 3, 5, { A_RandomWalk }, S_AGRD_08 },        //606
-/*S_AGRD_08*/       { SPR_AGRD, 0, 5, { A_RandomWalk }, S_AGRD_09 },        //607
-/*S_AGRD_09*/       { SPR_AGRD, 1, 5, { A_RandomWalk }, S_AGRD_10 },        //608
-/*S_AGRD_10*/       { SPR_AGRD, 2, 5, { A_RandomWalk }, S_AGRD_11 },        //609
-/*S_AGRD_11*/       { SPR_AGRD, 3, 5, { A_RandomWalk }, S_AGRD_01 },        //610
-/*S_AGRD_12*/       { SPR_AGRD, 0, 6, { A_ModifyVisibility }, S_AGRD_14 },      //611
-/*S_AGRD_13*/       { SPR_AGRD, 0, 6, { A_SetTLOptions }, S_AGRD_14 },      //612
-/*S_AGRD_14*/       { SPR_AGRD, 1, 6, { A_Chase }, S_AGRD_15 },     //613
-/*S_AGRD_15*/       { SPR_AGRD, 2, 6, { A_Chase }, S_AGRD_16 },     //614
-/*S_AGRD_16*/       { SPR_AGRD, 3, 6, { A_Chase }, S_AGRD_13 },     //615
-/*S_AGRD_17*/       { SPR_AGRD, 4, 8, { A_FaceTarget }, S_AGRD_18 },        //616
-/*S_AGRD_18*/       { SPR_AGRD, 5, 4, { A_BulletAttack }, S_AGRD_19 },      //617
-/*S_AGRD_19*/       { SPR_AGRD, 4, 4, { A_BulletAttack }, S_AGRD_20 },      //618
-/*S_AGRD_20*/       { SPR_AGRD, 5, 6, { A_BulletAttack }, S_AGRD_13 },      //619
-/*S_AGRD_21*/       { SPR_AGRD, 14, 0, { A_ShadowOn }, S_AGRD_22 },     //620
-/*S_AGRD_22*/       { SPR_AGRD, 14, 8, { A_Pain }, S_AGRD_12 },     //621
-/*S_AGRD_23*/       { SPR_AGRD, 14, 8, { A_Pain }, S_AGRD_13 },     //622
-/*S_AGRD_24*/       { SPR_AGRD, 6, 4, { NULL }, S_AGRD_25 },        //623
-/*S_AGRD_25*/       { SPR_AGRD, 7, 4, { A_Scream }, S_AGRD_26 },        //624
-/*S_AGRD_26*/       { SPR_AGRD, 8, 4, { NULL }, S_AGRD_27 },        //625
-/*S_AGRD_27*/       { SPR_AGRD, 9, 3, { NULL }, S_AGRD_28 },        //626
-/*S_AGRD_28*/       { SPR_AGRD, 10, 3, { A_Fall }, S_AGRD_29 },     //627
-/*S_AGRD_29*/       { SPR_AGRD, 11, 3, { NULL }, S_AGRD_30 },       //628
-/*S_AGRD_30*/       { SPR_AGRD, 12, 3, { A_AcolyteSpecial }, S_AGRD_31 },       //629
-/*S_AGRD_31*/       { SPR_AGRD, 13, 1400, { NULL }, S_GIBS_20 },        //630
-/*S_GIBS_10*/       { SPR_GIBS, 0, 5, { A_Fall }, S_GIBS_11 },      //631
-/*S_GIBS_11*/       { SPR_GIBS, 1, 5, { A_BodyParts }, S_GIBS_12 },     //632
-/*S_GIBS_12*/       { SPR_GIBS, 2, 5, { A_BodyParts }, S_GIBS_13 },     //633
-/*S_GIBS_13*/       { SPR_GIBS, 3, 4, { A_BodyParts }, S_GIBS_14 },     //634
-/*S_GIBS_14*/       { SPR_GIBS, 4, 4, { A_XScream }, S_GIBS_15 },       //635
-/*S_GIBS_15*/       { SPR_GIBS, 5, 4, { A_BodyParts }, S_GIBS_16 },     //636
-/*S_GIBS_16*/       { SPR_GIBS, 6, 4, { NULL }, S_GIBS_17 },        //637
-/*S_GIBS_17*/       { SPR_GIBS, 7, 4, { NULL }, S_GIBS_18 },        //638
-/*S_GIBS_18*/       { SPR_GIBS, 8, 5, { NULL }, S_GIBS_19 },        //639
-/*S_GIBS_19*/       { SPR_GIBS, 9, 5, { A_AcolyteSpecial }, S_GIBS_20 },        //640
-/*S_GIBS_20*/       { SPR_GIBS, 10, 5, { NULL }, S_GIBS_21 },       //641
-/*S_GIBS_21*/       { SPR_GIBS, 11, 1400, { NULL }, S_NULL },       //642
-/*S_PGRD_00*/       { SPR_PGRD, 0, 5, { A_FriendLook }, S_PGRD_00 },        //643
-/*S_PGRD_01*/       { SPR_PGRD, 1, 10, { NULL }, S_PGRD_00 },       //644
-/*S_PGRD_02*/       { SPR_PGRD, 2, 10, { NULL }, S_PGRD_00 },       //645
-/*S_PGRD_03*/       { SPR_PGRD, 1, 10, { A_RandomWalk }, S_PGRD_00 },       //646
-/*S_PGRD_04*/       { SPR_PGRD, 0, 3, { A_Chase }, S_PGRD_05 },     //647
-/*S_PGRD_05*/       { SPR_PGRD, 0, 3, { A_Chase }, S_PGRD_06 },     //648
-/*S_PGRD_06*/       { SPR_PGRD, 1, 3, { A_Chase }, S_PGRD_07 },     //649
-/*S_PGRD_07*/       { SPR_PGRD, 1, 3, { A_Chase }, S_PGRD_08 },     //650
-/*S_PGRD_08*/       { SPR_PGRD, 2, 3, { A_Chase }, S_PGRD_09 },     //651
-/*S_PGRD_09*/       { SPR_PGRD, 2, 3, { A_Chase }, S_PGRD_10 },     //652
-/*S_PGRD_10*/       { SPR_PGRD, 3, 3, { A_Chase }, S_PGRD_11 },     //653
-/*S_PGRD_11*/       { SPR_PGRD, 3, 3, { A_Chase }, S_PGRD_04 },     //654
-/*S_PGRD_12*/       { SPR_PGRD, 4, 8, { A_FaceTarget }, S_PGRD_13 },        //655
-/*S_PGRD_13*/       { SPR_PGRD, 5, 8, { A_RobotMelee }, S_PGRD_04 },        //656
-/*S_PGRD_14*/       { SPR_PGRD, 32774, 8, { A_FaceTarget }, S_PGRD_15 },        //657
-/*S_PGRD_15*/       { SPR_PGRD, 32775, 8, { A_TemplarMauler }, S_PGRD_04 },     //658
-/*S_PGRD_16*/       { SPR_PGRD, 0, 2, { NULL }, S_PGRD_17 },        //659
-/*S_PGRD_17*/       { SPR_PGRD, 0, 2, { A_Pain }, S_PGRD_04 },      //660
-/*S_PGRD_18*/       { SPR_PGRD, 32776, 4, { A_BodyParts }, S_PGRD_19 },     //661
-/*S_PGRD_19*/       { SPR_PGRD, 32777, 4, { A_Scream }, S_PGRD_20 },        //662
-/*S_PGRD_20*/       { SPR_PGRD, 32778, 4, { A_BodyParts }, S_PGRD_21 },     //663
-/*S_PGRD_21*/       { SPR_PGRD, 32779, 4, { A_Fall }, S_PGRD_22 },      //664
-/*S_PGRD_22*/       { SPR_PGRD, 32780, 4, { NULL }, S_PGRD_23 },        //665
-/*S_PGRD_23*/       { SPR_PGRD, 32781, 4, { NULL }, S_PGRD_24 },        //666
-/*S_PGRD_24*/       { SPR_PGRD, 14, 4, { A_BodyParts }, S_PGRD_25 },        //667
-/*S_PGRD_25*/       { SPR_PGRD, 15, 4, { NULL }, S_PGRD_26 },       //668
-/*S_PGRD_26*/       { SPR_PGRD, 16, 4, { NULL }, S_PGRD_27 },       //669
-/*S_PGRD_27*/       { SPR_PGRD, 17, 4, { NULL }, S_PGRD_28 },       //670
-/*S_PGRD_28*/       { SPR_PGRD, 18, 3, { NULL }, S_PGRD_29 },       //671
-/*S_PGRD_29*/       { SPR_PGRD, 19, 3, { NULL }, S_PGRD_30 },       //672
-/*S_PGRD_30*/       { SPR_PGRD, 20, 3, { NULL }, S_PGRD_31 },       //673
-/*S_PGRD_31*/       { SPR_PGRD, 21, 3, { NULL }, S_PGRD_32 },       //674
-/*S_PGRD_32*/       { SPR_PGRD, 22, 3, { NULL }, S_PGRD_33 },       //675
-/*S_PGRD_33*/       { SPR_PGRD, 23, 3, { NULL }, S_PGRD_34 },       //676
-/*S_PGRD_34*/       { SPR_PGRD, 24, 3, { NULL }, S_PGRD_35 },       //677
-/*S_PGRD_35*/       { SPR_PGRD, 25, 3, { NULL }, S_PGRD_36 },       //678
-/*S_PGRD_36*/       { SPR_PGRD, 26, 3, { NULL }, S_PGRD_37 },       //679
-/*S_PGRD_37*/       { SPR_PGRD, 27, -1, { NULL }, S_NULL },     //680
-/*S_ROB2_00*/       { SPR_ROB2, 16, 10, { A_Look }, S_ROB2_00 },        //681
-/*S_ROB2_01*/       { SPR_ROB2, 0, 3, { A_Chase }, S_ROB2_02 },     //682
-/*S_ROB2_02*/       { SPR_ROB2, 0, 3, { A_Chase }, S_ROB2_03 },     //683
-/*S_ROB2_03*/       { SPR_ROB2, 1, 3, { A_Chase }, S_ROB2_04 },     //684
-/*S_ROB2_04*/       { SPR_ROB2, 1, 3, { A_Chase }, S_ROB2_05 },     //685
-/*S_ROB2_05*/       { SPR_ROB2, 2, 3, { A_Chase }, S_ROB2_06 },     //686
-/*S_ROB2_06*/       { SPR_ROB2, 2, 3, { A_Chase }, S_ROB2_07 },     //687
-/*S_ROB2_07*/       { SPR_ROB2, 3, 3, { A_Chase }, S_ROB2_08 },     //688
-/*S_ROB2_08*/       { SPR_ROB2, 3, 3, { A_Chase }, S_ROB2_01 },     //689
-/*S_ROB2_09*/       { SPR_ROB2, 4, 3, { A_FaceTarget }, S_ROB2_10 },        //690
-/*S_ROB2_10*/       { SPR_ROB2, 32773, 2, { A_CrusaderAttack }, S_ROB2_11 },        //691
-/*S_ROB2_11*/       { SPR_ROB2, 32772, 2, { A_CrusaderLeft }, S_ROB2_12 },      //692
-/*S_ROB2_12*/       { SPR_ROB2, 32773, 3, { A_CrusaderLeft }, S_ROB2_13 },      //693
-/*S_ROB2_13*/       { SPR_ROB2, 32772, 2, { A_CrusaderLeft }, S_ROB2_14 },      //694
-/*S_ROB2_14*/       { SPR_ROB2, 32773, 2, { A_CrusaderLeft }, S_ROB2_15 },      //695
-/*S_ROB2_15*/       { SPR_ROB2, 32772, 2, { A_CrusaderRight }, S_ROB2_16 },     //696
-/*S_ROB2_16*/       { SPR_ROB2, 32773, 2, { A_CrusaderRight }, S_ROB2_17 },     //697
-/*S_ROB2_17*/       { SPR_ROB2, 32772, 2, { A_CrusaderRight }, S_ROB2_18 },     //698
-/*S_ROB2_18*/       { SPR_ROB2, 5, 2, { A_CheckTargetVisible2 }, S_ROB2_09 },       //699
-/*S_ROB2_19*/       { SPR_ROB2, 3, 1, { A_Pain }, S_ROB2_01 },      //700
-/*S_ROB2_20*/       { SPR_ROB2, 6, 3, { A_Scream }, S_ROB2_21 },        //701
-/*S_ROB2_21*/       { SPR_ROB2, 7, 5, { A_BodyParts }, S_ROB2_22 },     //702
-/*S_ROB2_22*/       { SPR_ROB2, 32776, 4, { A_BodyParts }, S_ROB2_23 },     //703
-/*S_ROB2_23*/       { SPR_ROB2, 32777, 4, { A_DeathExplode2 }, S_ROB2_24 },     //704
-/*S_ROB2_24*/       { SPR_ROB2, 32778, 4, { A_Fall }, S_ROB2_25 },      //705
-/*S_ROB2_25*/       { SPR_ROB2, 11, 4, { A_DeathExplode2 }, S_ROB2_26 },        //706
-/*S_ROB2_26*/       { SPR_ROB2, 12, 4, { A_BodyParts }, S_ROB2_27 },        //707
-/*S_ROB2_27*/       { SPR_ROB2, 13, 4, { A_BodyParts }, S_ROB2_28 },        //708
-/*S_ROB2_28*/       { SPR_ROB2, 14, 4, { A_DeathExplode2 }, S_ROB2_29 },        //709
-/*S_ROB2_29*/       { SPR_ROB2, 15, -1, { A_BossDeath }, S_NULL },      //710
-/*S_MLDR_00*/       { SPR_MLDR, 0, 10, { A_Look }, S_MLDR_00 },     //711
-/*S_MLDR_01*/       { SPR_MLDR, 0, 3, { A_Chase }, S_MLDR_02 },     //712
-/*S_MLDR_02*/       { SPR_MLDR, 0, 3, { A_Chase }, S_MLDR_03 },     //713
-/*S_MLDR_03*/       { SPR_MLDR, 1, 3, { A_Chase }, S_MLDR_04 },     //714
-/*S_MLDR_04*/       { SPR_MLDR, 1, 3, { A_Chase }, S_MLDR_05 },     //715
-/*S_MLDR_05*/       { SPR_MLDR, 2, 3, { A_Chase }, S_MLDR_06 },     //716
-/*S_MLDR_06*/       { SPR_MLDR, 2, 3, { A_Chase }, S_MLDR_07 },     //717
-/*S_MLDR_07*/       { SPR_MLDR, 3, 3, { A_Chase }, S_MLDR_08 },     //718
-/*S_MLDR_08*/       { SPR_MLDR, 3, 3, { A_Chase }, S_MLDR_01 },     //719
-/*S_MLDR_09*/       { SPR_MLDR, 4, 3, { A_FaceTarget }, S_MLDR_10 },        //720
-/*S_MLDR_10*/       { SPR_MLDR, 32773, 2, { A_BishopAttack }, S_MLDR_01 },      //721
-/*S_MLDR_11*/       { SPR_MLDR, 3, 1, { A_Pain }, S_MLDR_01 },      //722
-/*S_MLDR_12*/       { SPR_MLDR, 32774, 3, { NULL }, S_MLDR_13 },        //723
-/*S_MLDR_13*/       { SPR_MLDR, 32775, 5, { A_Scream }, S_MLDR_14 },        //724
-/*S_MLDR_14*/       { SPR_MLDR, 32776, 4, { A_BodyParts }, S_MLDR_15 },     //725
-/*S_MLDR_15*/       { SPR_MLDR, 32777, 4, { A_DeathExplode2 }, S_MLDR_16 },     //726
-/*S_MLDR_16*/       { SPR_MLDR, 32778, 4, { NULL }, S_MLDR_17 },        //727
-/*S_MLDR_17*/       { SPR_MLDR, 32779, 4, { NULL }, S_MLDR_18 },        //728
-/*S_MLDR_18*/       { SPR_MLDR, 32780, 4, { A_Fall }, S_MLDR_19 },      //729
-/*S_MLDR_19*/       { SPR_MLDR, 32781, 4, { NULL }, S_MLDR_20 },        //730
-/*S_MLDR_20*/       { SPR_MLDR, 32782, 4, { A_BodyParts }, S_MLDR_21 },     //731
-/*S_MLDR_21*/       { SPR_MLDR, 32783, 4, { NULL }, S_MLDR_22 },        //732
-/*S_MLDR_22*/       { SPR_MLDR, 32784, 4, { A_BodyParts }, S_MLDR_23 },     //733
-/*S_MLDR_23*/       { SPR_MLDR, 32785, 4, { NULL }, S_MLDR_24 },        //734
-/*S_MLDR_24*/       { SPR_MLDR, 32786, 4, { A_BodyParts }, S_MLDR_25 },     //735
-/*S_MLDR_25*/       { SPR_MLDR, 32787, 4, { NULL }, S_MLDR_26 },        //736
-/*S_MLDR_26*/       { SPR_MLDR, 32788, 4, { A_BodyParts }, S_MLDR_27 },     //737
-/*S_MLDR_27*/       { SPR_MLDR, 21, 4, { A_SpawnSpectreB }, S_NULL },       //738
-/*S_ORCL_00*/       { SPR_ORCL, 0, -1, { NULL }, S_NULL },      //739
-/*S_ORCL_01*/       { SPR_ORCL, 1, 5, { NULL }, S_ORCL_02 },        //740
-/*S_ORCL_02*/       { SPR_ORCL, 2, 5, { NULL }, S_ORCL_03 },        //741
-/*S_ORCL_03*/       { SPR_ORCL, 3, 5, { NULL }, S_ORCL_04 },        //742
-/*S_ORCL_04*/       { SPR_ORCL, 4, 5, { NULL }, S_ORCL_05 },        //743
-/*S_ORCL_05*/       { SPR_ORCL, 5, 5, { NULL }, S_ORCL_06 },        //744
-/*S_ORCL_06*/       { SPR_ORCL, 6, 5, { NULL }, S_ORCL_07 },        //745
-/*S_ORCL_07*/       { SPR_ORCL, 7, 5, { NULL }, S_ORCL_08 },        //746
-/*S_ORCL_08*/       { SPR_ORCL, 8, 5, { NULL }, S_ORCL_09 },        //747
-/*S_ORCL_09*/       { SPR_ORCL, 9, 5, { NULL }, S_ORCL_10 },        //748
-/*S_ORCL_10*/       { SPR_ORCL, 10, 5, { NULL }, S_ORCL_11 },       //749
-/*S_ORCL_11*/       { SPR_ORCL, 11, 5, { A_Fall }, S_ORCL_12 },     //750
-/*S_ORCL_12*/       { SPR_ORCL, 12, 5, { NULL }, S_ORCL_13 },       //751
-/*S_ORCL_13*/       { SPR_ORCL, 13, 5, { A_AlertSpectreC }, S_ORCL_14 },        //752
-/*S_ORCL_14*/       { SPR_ORCL, 14, 5, { NULL }, S_ORCL_15 },       //753
-/*S_ORCL_15*/       { SPR_ORCL, 15, 5, { NULL }, S_ORCL_16 },       //754
-/*S_ORCL_16*/       { SPR_ORCL, 16, -1, { NULL }, S_NULL },     //755
-/*S_PRST_00*/       { SPR_PRST, 0, 10, { A_Look }, S_PRST_01 },     //756
-/*S_PRST_01*/       { SPR_PRST, 1, 10, { A_FloatWeave }, S_PRST_00 },       //757
-/*S_PRST_02*/       { SPR_PRST, 0, 4, { A_Chase }, S_PRST_03 },     //758
-/*S_PRST_03*/       { SPR_PRST, 0, 4, { A_FloatWeave }, S_PRST_04 },        //759
-/*S_PRST_04*/       { SPR_PRST, 1, 4, { A_Chase }, S_PRST_05 },     //760
-/*S_PRST_05*/       { SPR_PRST, 1, 4, { A_FloatWeave }, S_PRST_06 },        //761
-/*S_PRST_06*/       { SPR_PRST, 2, 4, { A_Chase }, S_PRST_07 },     //762
-/*S_PRST_07*/       { SPR_PRST, 2, 4, { A_FloatWeave }, S_PRST_08 },        //763
-/*S_PRST_08*/       { SPR_PRST, 3, 4, { A_Chase }, S_PRST_09 },     //764
-/*S_PRST_09*/       { SPR_PRST, 3, 4, { A_FloatWeave }, S_PRST_02 },        //765
-/*S_PRST_10*/       { SPR_PRST, 4, 4, { A_FaceTarget }, S_PRST_11 },        //766
-/*S_PRST_11*/       { SPR_PRST, 5, 4, { A_BossMeleeAtk }, S_PRST_12 },      //767
-/*S_PRST_12*/       { SPR_PRST, 4, 4, { A_FloatWeave }, S_PRST_02 },        //768
-/*S_PRST_13*/       { SPR_PRST, 4, 4, { A_FaceTarget }, S_PRST_14 },        //769
-/*S_PRST_14*/       { SPR_PRST, 5, 4, { A_FireHookShot }, S_PRST_15 },      //770
-/*S_PRST_15*/       { SPR_PRST, 4, 4, { A_FloatWeave }, S_PRST_02 },        //771
-/*S_PDED_00*/       { SPR_PDED, 0, 6, { NULL }, S_PDED_01 },        //772
-/*S_PDED_01*/       { SPR_PDED, 1, 6, { A_Scream }, S_PDED_02 },        //773
-/*S_PDED_02*/       { SPR_PDED, 2, 6, { NULL }, S_PDED_03 },        //774
-/*S_PDED_03*/       { SPR_PDED, 3, 6, { A_Fall }, S_PDED_04 },      //775
-/*S_PDED_04*/       { SPR_PDED, 4, 6, { NULL }, S_PDED_05 },        //776
-/*S_PDED_05*/       { SPR_PDED, 5, 5, { NULL }, S_PDED_06 },        //777
-/*S_PDED_06*/       { SPR_PDED, 6, 5, { NULL }, S_PDED_07 },        //778
-/*S_PDED_07*/       { SPR_PDED, 7, 5, { NULL }, S_PDED_08 },        //779
-/*S_PDED_08*/       { SPR_PDED, 8, 5, { NULL }, S_PDED_09 },        //780
-/*S_PDED_09*/       { SPR_PDED, 9, 5, { NULL }, S_PDED_10 },        //781
-/*S_PDED_10*/       { SPR_PDED, 8, 5, { NULL }, S_PDED_11 },        //782
-/*S_PDED_11*/       { SPR_PDED, 9, 5, { NULL }, S_PDED_12 },        //783
-/*S_PDED_12*/       { SPR_PDED, 8, 5, { NULL }, S_PDED_14 },        //784
-/*S_PDED_13*/       { SPR_PDED, 9, 5, { NULL }, S_PDED_14 },        //785
-/*S_PDED_14*/       { SPR_PDED, 10, 5, { NULL }, S_PDED_15 },       //786
-/*S_PDED_15*/       { SPR_PDED, 11, 5, { NULL }, S_PDED_16 },       //787
-/*S_PDED_16*/       { SPR_PDED, 12, 4, { NULL }, S_PDED_17 },       //788
-/*S_PDED_17*/       { SPR_PDED, 13, 4, { NULL }, S_PDED_18 },       //789
-/*S_PDED_18*/       { SPR_PDED, 14, 4, { NULL }, S_PDED_19 },       //790
-/*S_PDED_19*/       { SPR_PDED, 15, 4, { NULL }, S_PDED_20 },       //791
-/*S_PDED_20*/       { SPR_PDED, 16, 4, { A_SpawnSpectreE }, S_PDED_21 },        //792
-/*S_PDED_21*/       { SPR_PDED, 17, 4, { NULL }, S_PDED_22 },       //793
-/*S_PDED_22*/       { SPR_PDED, 18, 4, { NULL }, S_PDED_23 },       //794
-/*S_PDED_23*/       { SPR_PDED, 19, -1, { NULL }, S_NULL },     //795
-/*S_ALN1_00*/       { SPR_ALN1, 0, 10, { A_Look }, S_ALN1_01 },     //796
-/*S_ALN1_01*/       { SPR_ALN1, 1, 10, { A_FloatWeave }, S_ALN1_00 },       //797
-/*S_ALN1_02*/       { SPR_ALN1, 32768, 4, { A_Chase }, S_ALN1_03 },     //798
-/*S_ALN1_03*/       { SPR_ALN1, 32769, 4, { A_Chase }, S_ALN1_04 },     //799
-/*S_ALN1_04*/       { SPR_ALN1, 32770, 4, { A_FloatWeave }, S_ALN1_05 },        //800
-/*S_ALN1_05*/       { SPR_ALN1, 32771, 4, { A_Chase }, S_ALN1_06 },     //801
-/*S_ALN1_06*/       { SPR_ALN1, 32772, 4, { A_Chase }, S_ALN1_07 },     //802
-/*S_ALN1_07*/       { SPR_ALN1, 32773, 4, { A_Chase }, S_ALN1_08 },     //803
-/*S_ALN1_08*/       { SPR_ALN1, 32774, 4, { A_FloatWeave }, S_ALN1_09 },        //804
-/*S_ALN1_09*/       { SPR_ALN1, 32775, 4, { A_Chase }, S_ALN1_10 },     //805
-/*S_ALN1_10*/       { SPR_ALN1, 32776, 4, { A_Chase }, S_ALN1_11 },     //806
-/*S_ALN1_11*/       { SPR_ALN1, 32777, 4, { A_Chase }, S_ALN1_12 },     //807
-/*S_ALN1_12*/       { SPR_ALN1, 32778, 4, { A_FloatWeave }, S_ALN1_02 },        //808
-/*S_ALN1_13*/       { SPR_ALN1, 32777, 4, { A_FaceTarget }, S_ALN1_14 },        //809
-/*S_ALN1_14*/       { SPR_ALN1, 32776, 4, { A_BossMeleeAtk }, S_ALN1_15 },      //810
-/*S_ALN1_15*/       { SPR_ALN1, 32775, 4, { NULL }, S_ALN1_04 },        //811
-/*S_ALN1_16*/       { SPR_ALN1, 32777, 4, { A_FaceTarget }, S_ALN1_17 },        //812
-/*S_ALN1_17*/       { SPR_ALN1, 32776, 4, { A_ProgrammerAttack }, S_ALN1_18 },      //813
-/*S_ALN1_18*/       { SPR_ALN1, 32775, 4, { NULL }, S_ALN1_12 },        //814
-/*S_ALN1_19*/       { SPR_ALN1, 9, 2, { A_Pain }, S_ALN1_08 },      //815
-/*S_AL1P_00*/       { SPR_AL1P, 32768, 6, { A_NodeChunk }, S_AL1P_01 },     //816
-/*S_AL1P_01*/       { SPR_AL1P, 32769, 6, { A_Scream }, S_AL1P_02 },        //817
-/*S_AL1P_02*/       { SPR_AL1P, 32770, 6, { A_NodeChunk }, S_AL1P_03 },     //818
-/*S_AL1P_03*/       { SPR_AL1P, 32771, 6, { NULL }, S_AL1P_04 },        //819
-/*S_AL1P_04*/       { SPR_AL1P, 32772, 6, { NULL }, S_AL1P_05 },        //820
-/*S_AL1P_05*/       { SPR_AL1P, 32773, 6, { A_NodeChunk }, S_AL1P_06 },     //821
-/*S_AL1P_06*/       { SPR_AL1P, 32774, 6, { NULL }, S_AL1P_07 },        //822
-/*S_AL1P_07*/       { SPR_AL1P, 32775, 6, { A_NodeChunk }, S_AL1P_08 },     //823
-/*S_AL1P_08*/       { SPR_AL1P, 32776, 6, { NULL }, S_AL1P_09 },        //824
-/*S_AL1P_09*/       { SPR_AL1P, 32777, 6, { NULL }, S_AL1P_10 },        //825
-/*S_AL1P_10*/       { SPR_AL1P, 32778, 6, { NULL }, S_AL1P_11 },        //826
-/*S_AL1P_11*/       { SPR_AL1P, 32779, 5, { NULL }, S_AL1P_12 },        //827
-/*S_AL1P_12*/       { SPR_AL1P, 32780, 5, { NULL }, S_AL1P_13 },        //828
-/*S_AL1P_13*/       { SPR_AL1P, 32781, 5, { A_HeadChunk }, S_AL1P_14 },     //829
-/*S_AL1P_14*/       { SPR_AL1P, 32782, 5, { NULL }, S_AL1P_15 },        //830
-/*S_AL1P_15*/       { SPR_AL1P, 32783, 5, { NULL }, S_AL1P_16 },        //831
-/*S_AL1P_16*/       { SPR_AL1P, 32784, 5, { NULL }, S_AL1P_17 },        //832
-/*S_AL1P_17*/       { SPR_AL1P, 32785, 5, { A_BossDeath }, S_NULL },        //833
-/*S_NODE_00*/       { SPR_NODE, 32768, 6, { NULL }, S_NODE_01 },        //834
-/*S_NODE_01*/       { SPR_NODE, 32769, 6, { NULL }, S_NODE_02 },        //835
-/*S_NODE_02*/       { SPR_NODE, 32770, 6, { NULL }, S_NODE_03 },        //836
-/*S_NODE_03*/       { SPR_NODE, 32771, 6, { NULL }, S_NODE_04 },        //837
-/*S_NODE_04*/       { SPR_NODE, 32772, 6, { NULL }, S_NODE_05 },        //838
-/*S_NODE_05*/       { SPR_NODE, 32773, 6, { NULL }, S_NODE_06 },        //839
-/*S_NODE_06*/       { SPR_NODE, 32774, 6, { NULL }, S_NULL },       //840
-/*S_MTHD_00*/       { SPR_MTHD, 32768, 5, { NULL }, S_MTHD_01 },        //841
-/*S_MTHD_01*/       { SPR_MTHD, 32769, 5, { NULL }, S_MTHD_02 },        //842
-/*S_MTHD_02*/       { SPR_MTHD, 32770, 5, { NULL }, S_MTHD_03 },        //843
-/*S_MTHD_03*/       { SPR_MTHD, 32771, 5, { NULL }, S_MTHD_04 },        //844
-/*S_MTHD_04*/       { SPR_MTHD, 32772, 5, { NULL }, S_MTHD_05 },        //845
-/*S_MTHD_05*/       { SPR_MTHD, 32773, 5, { NULL }, S_MTHD_06 },        //846
-/*S_MTHD_06*/       { SPR_MTHD, 32774, 5, { NULL }, S_MTHD_07 },        //847
-/*S_MTHD_07*/       { SPR_MTHD, 32775, 5, { NULL }, S_MTHD_08 },        //848
-/*S_MTHD_08*/       { SPR_MTHD, 32776, 5, { NULL }, S_MTHD_09 },        //849
-/*S_MTHD_09*/       { SPR_MTHD, 32777, 5, { NULL }, S_MTHD_10 },        //850
-/*S_MTHD_10*/       { SPR_MTHD, 32778, 5, { NULL }, S_NULL },       //851
-/*S_ALN1_20*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_21 },        //852
-/*S_ALN1_21*/       { SPR_ALN1, 8, 4, { A_FireSigilEOffshoot }, S_ALN1_22 },        //853
-/*S_ALN1_22*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_12 },        //854
-/*S_ALN1_23*/       { SPR_ALN1, 0, 5, { A_FloatWeave }, S_ALN1_24 },        //855
-/*S_ALN1_24*/       { SPR_ALN1, 1, 5, { A_FloatWeave }, S_ALN1_25 },        //856
-/*S_ALN1_25*/       { SPR_ALN1, 2, 5, { A_FloatWeave }, S_ALN1_26 },        //857
-/*S_ALN1_26*/       { SPR_ALN1, 3, 5, { A_FloatWeave }, S_ALN1_27 },        //858
-/*S_ALN1_27*/       { SPR_ALN1, 4, 5, { A_FloatWeave }, S_ALN1_28 },        //859
-/*S_ALN1_28*/       { SPR_ALN1, 5, 5, { A_FloatWeave }, S_ALN1_29 },        //860
-/*S_ALN1_29*/       { SPR_ALN1, 6, 5, { A_FloatWeave }, S_ALN1_30 },        //861
-/*S_ALN1_30*/       { SPR_ALN1, 7, 5, { A_FloatWeave }, S_ALN1_31 },        //862
-/*S_ALN1_31*/       { SPR_ALN1, 8, 5, { A_FloatWeave }, S_ALN1_32 },        //863
-/*S_ALN1_32*/       { SPR_ALN1, 9, 5, { A_FloatWeave }, S_ALN1_33 },        //864
-/*S_ALN1_33*/       { SPR_ALN1, 10, 5, { A_FloatWeave }, S_ALN1_23 },       //865
-/*S_ALN1_34*/       { SPR_ALN1, 0, 5, { A_Chase }, S_ALN1_35 },     //866
-/*S_ALN1_35*/       { SPR_ALN1, 1, 5, { A_Chase }, S_ALN1_36 },     //867
-/*S_ALN1_36*/       { SPR_ALN1, 2, 5, { A_FloatWeave }, S_ALN1_37 },        //868
-/*S_ALN1_37*/       { SPR_ALN1, 3, 5, { A_Chase }, S_ALN1_38 },     //869
-/*S_ALN1_38*/       { SPR_ALN1, 4, 5, { A_Chase }, S_ALN1_39 },     //870
-/*S_ALN1_39*/       { SPR_ALN1, 5, 5, { A_Chase }, S_ALN1_40 },     //871
-/*S_ALN1_40*/       { SPR_ALN1, 6, 5, { A_FloatWeave }, S_ALN1_41 },        //872
-/*S_ALN1_41*/       { SPR_ALN1, 7, 5, { A_Chase }, S_ALN1_42 },     //873
-/*S_ALN1_42*/       { SPR_ALN1, 8, 5, { A_Chase }, S_ALN1_43 },     //874
-/*S_ALN1_43*/       { SPR_ALN1, 9, 5, { A_Chase }, S_ALN1_44 },     //875
-/*S_ALN1_44*/       { SPR_ALN1, 10, 5, { A_FloatWeave }, S_ALN1_34 },       //876
-/*S_ALN1_45*/       { SPR_ALN1, 9, 4, { A_FaceTarget }, S_ALN1_46 },        //877
-/*S_ALN1_46*/       { SPR_ALN1, 8, 4, { A_BossMeleeAtk }, S_ALN1_47 },      //878
-/*S_ALN1_47*/       { SPR_ALN1, 2, 4, { NULL }, S_ALN1_36 },        //879
-/*S_ALN1_48*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_49 },        //880
-/*S_ALN1_49*/       { SPR_ALN1, 8, 4, { A_SpectreCAttack }, S_ALN1_50 },        //881
-/*S_ALN1_50*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_44 },        //882
-/*S_ALN1_51*/       { SPR_ALN1, 9, 2, { A_Pain }, S_ALN1_40 },      //883
-/*S_ALN1_52*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_53 },        //884
-/*S_ALN1_53*/       { SPR_ALN1, 8, 4, { A_SpectreDAttack }, S_ALN1_54 },        //885
-/*S_ALN1_54*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_12 },        //886
-/*S_ALN1_55*/       { SPR_ALN1, 5, 4, { A_FaceTarget }, S_ALN1_56 },        //887
-/*S_ALN1_56*/       { SPR_ALN1, 8, 4, { A_SpectreEAttack }, S_ALN1_57 },        //888
-/*S_ALN1_57*/       { SPR_ALN1, 4, 4, { NULL }, S_ALN1_12 },        //889
-/*S_MNAM_00*/       { SPR_MNAM, 0, 100, { A_FloatWeave }, S_MNAM_01 },      //890
-/*S_MNAM_01*/       { SPR_MNAM, 32769, 60, { A_FloatWeave }, S_MNAM_02 },       //891
-/*S_MNAM_02*/       { SPR_MNAM, 32770, 4, { A_FloatWeave }, S_MNAM_03 },        //892
-/*S_MNAM_03*/       { SPR_MNAM, 32771, 4, { A_FloatWeave }, S_MNAM_04 },        //893
-/*S_MNAM_04*/       { SPR_MNAM, 32772, 4, { A_FloatWeave }, S_MNAM_05 },        //894
-/*S_MNAM_05*/       { SPR_MNAM, 32773, 4, { A_FloatWeave }, S_MNAM_06 },        //895
-/*S_MNAM_06*/       { SPR_MNAM, 32774, 4, { A_FloatWeave }, S_MNAM_07 },        //896
-/*S_MNAM_07*/       { SPR_MNAM, 32775, 4, { A_FloatWeave }, S_MNAM_08 },        //897
-/*S_MNAM_08*/       { SPR_MNAM, 32776, 4, { A_FloatWeave }, S_MNAM_09 },        //898
-/*S_MNAM_09*/       { SPR_MNAM, 32777, 4, { A_FloatWeave }, S_MNAM_10 },        //899
-/*S_MNAM_10*/       { SPR_MNAM, 32778, 4, { A_FloatWeave }, S_MNAM_11 },        //900
-/*S_MNAM_11*/       { SPR_MNAM, 32779, 4, { A_FloatWeave }, S_MNAL_00 },        //901
-/*S_MNAL_00*/       { SPR_MNAL, 32768, 4, { A_Look }, S_MNAL_01 },      //902
-/*S_MNAL_01*/       { SPR_MNAL, 32769, 4, { A_FloatWeave }, S_MNAL_00 },        //903
-/*S_MNAL_02*/       { SPR_MNAL, 32768, 4, { A_Chase }, S_MNAL_03 },     //904
-/*S_MNAL_03*/       { SPR_MNAL, 32769, 4, { A_Chase }, S_MNAL_04 },     //905
-/*S_MNAL_04*/       { SPR_MNAL, 32770, 4, { A_FloatWeave }, S_MNAL_05 },        //906
-/*S_MNAL_05*/       { SPR_MNAL, 32771, 4, { A_Chase }, S_MNAL_06 },     //907
-/*S_MNAL_06*/       { SPR_MNAL, 32772, 4, { A_Chase }, S_MNAL_07 },     //908
-/*S_MNAL_07*/       { SPR_MNAL, 32773, 4, { A_Chase }, S_MNAL_08 },     //909
-/*S_MNAL_08*/       { SPR_MNAL, 32774, 4, { A_FloatWeave }, S_MNAL_09 },        //910
-/*S_MNAL_09*/       { SPR_MNAL, 32775, 4, { A_Chase }, S_MNAL_10 },     //911
-/*S_MNAL_10*/       { SPR_MNAL, 32776, 4, { A_Chase }, S_MNAL_11 },     //912
-/*S_MNAL_11*/       { SPR_MNAL, 32777, 4, { A_Chase }, S_MNAL_12 },     //913
-/*S_MNAL_12*/       { SPR_MNAL, 32778, 4, { A_FloatWeave }, S_MNAL_02 },        //914
-/*S_MNAL_13*/       { SPR_MNAL, 32777, 4, { A_FaceTarget }, S_MNAL_14 },        //915
-/*S_MNAL_14*/       { SPR_MNAL, 32776, 4, { A_BossMeleeAtk }, S_MNAL_15 },      //916
-/*S_MNAL_15*/       { SPR_MNAL, 32770, 4, { NULL }, S_MNAL_04 },        //917
-/*S_MNAL_16*/       { SPR_MNAL, 32773, 4, { A_FaceTarget }, S_MNAL_17 },        //918
-/*S_MNAL_17*/       { SPR_MNAL, 32776, 4, { A_FireSigilWeapon }, S_MNAL_18 },       //919
-/*S_MNAL_18*/       { SPR_MNAL, 32772, 4, { NULL }, S_MNAL_12 },        //920
-/*S_MNAL_19*/       { SPR_MNAL, 32777, 2, { A_Pain }, S_MNAL_08 },      //921
-/*S_MNAL_20*/       { SPR_MNAL, 32779, 7, { A_NodeChunk }, S_MNAL_21 },     //922
-/*S_MNAL_21*/       { SPR_MNAL, 32780, 7, { A_Scream }, S_MNAL_22 },        //923
-/*S_MNAL_22*/       { SPR_MNAL, 32781, 7, { A_NodeChunk }, S_MNAL_23 },     //924
-/*S_MNAL_23*/       { SPR_MNAL, 32782, 7, { A_NodeChunk }, S_MNAL_24 },     //925
-/*S_MNAL_24*/       { SPR_MNAL, 32783, 7, { A_HeadChunk }, S_MNAL_25 },     //926
-/*S_MNAL_25*/       { SPR_MNAL, 32784, 64, { A_NodeChunk }, S_MNAL_26 },        //927
-/*S_MNAL_26*/       { SPR_MNAL, 32784, 6, { A_EntityDeath }, S_NULL },      //928
-/*S_MNAL_27*/       { SPR_MNAL, 32785, 10, { A_Look }, S_MNAL_27 },     //929
-/*S_MNAL_28*/       { SPR_MNAL, 32785, 5, { A_FloatWeave }, S_MNAL_29 },        //930
-/*S_MNAL_29*/       { SPR_MNAL, 32786, 5, { A_Chase }, S_MNAL_30 },     //931
-/*S_MNAL_30*/       { SPR_MNAL, 32787, 5, { A_Chase }, S_MNAL_31 },     //932
-/*S_MNAL_31*/       { SPR_MNAL, 32788, 5, { A_FloatWeave }, S_MNAL_32 },        //933
-/*S_MNAL_32*/       { SPR_MNAL, 32789, 5, { A_Chase }, S_MNAL_33 },     //934
-/*S_MNAL_33*/       { SPR_MNAL, 32790, 5, { A_FloatWeave }, S_MNAL_28 },        //935
-/*S_MNAL_34*/       { SPR_MNAL, 32786, 4, { A_FaceTarget }, S_MNAL_35 },        //936
-/*S_MNAL_35*/       { SPR_MNAL, 32785, 4, { A_BossMeleeAtk }, S_MNAL_36 },      //937
-/*S_MNAL_36*/       { SPR_MNAL, 32787, 4, { A_FloatWeave }, S_MNAL_29 },        //938
-/*S_MNAL_37*/       { SPR_MNAL, 32790, 4, { A_FaceTarget }, S_MNAL_38 },        //939
-/*S_MNAL_38*/       { SPR_MNAL, 32788, 4, { A_FireSigilEOffshoot }, S_MNAL_39 },        //940
-/*S_MNAL_39*/       { SPR_MNAL, 32789, 4, { A_FloatWeave }, S_MNAL_32 },        //941
-/*S_MNAL_40*/       { SPR_MNAL, 32785, 2, { A_Pain }, S_MNAL_28 },      //942
-/*S_MDTH_00*/       { SPR_MDTH, 32768, 3, { A_Scream }, S_MDTH_01 },        //943
-/*S_MDTH_01*/       { SPR_MDTH, 32769, 3, { A_BodyParts }, S_MDTH_02 },     //944
-/*S_MDTH_02*/       { SPR_MDTH, 32770, 3, { A_Fall }, S_MDTH_03 },      //945
-/*S_MDTH_03*/       { SPR_MDTH, 32771, 3, { A_BodyParts }, S_MDTH_04 },     //946
-/*S_MDTH_04*/       { SPR_MDTH, 32772, 3, { A_BodyParts }, S_MDTH_05 },     //947
-/*S_MDTH_05*/       { SPR_MDTH, 32773, 3, { A_BodyParts }, S_MDTH_06 },     //948
-/*S_MDTH_06*/       { SPR_MDTH, 32774, 3, { A_BodyParts }, S_MDTH_07 },     //949
-/*S_MDTH_07*/       { SPR_MDTH, 32775, 3, { A_BodyParts }, S_MDTH_08 },     //950
-/*S_MDTH_08*/       { SPR_MDTH, 32776, 3, { A_BodyParts }, S_MDTH_09 },     //951
-/*S_MDTH_09*/       { SPR_MDTH, 32777, 3, { A_BodyParts }, S_MDTH_10 },     //952
-/*S_MDTH_10*/       { SPR_MDTH, 32778, 3, { A_BodyParts }, S_MDTH_11 },     //953
-/*S_MDTH_11*/       { SPR_MDTH, 32779, 3, { A_BodyParts }, S_MDTH_12 },     //954
-/*S_MDTH_12*/       { SPR_MDTH, 32780, 3, { A_BodyParts }, S_MDTH_13 },     //955
-/*S_MDTH_13*/       { SPR_MDTH, 32781, 3, { A_BodyParts }, S_MDTH_14 },     //956
-/*S_MDTH_14*/       { SPR_MDTH, 32782, 3, { A_BossDeath }, S_NULL },        //957
-/*S_NEST_00*/       { SPR_NEST, 0, -1, { NULL }, S_NULL },      //958
-/*S_PODD_00*/       { SPR_PODD, 0, 60, { A_Look }, S_PODD_00 },     //959
-/*S_PODD_01*/       { SPR_PODD, 0, 360, { NULL }, S_PODD_02 },      //960
-/*S_PODD_02*/       { SPR_PODD, 1, 9, { A_Fall }, S_PODD_03 },      //961
-/*S_PODD_03*/       { SPR_PODD, 2, 9, { NULL }, S_PODD_04 },        //962
-/*S_PODD_04*/       { SPR_PODD, 3, 9, { A_SpawnEntity }, S_PODD_05 },       //963
-/*S_PODD_05*/       { SPR_PODD, 4, -1, { NULL }, S_NULL },      //964
-/*S_ZAP6_00*/       { SPR_ZAP6, 32768, 4, { NULL }, S_ZAP6_01 },        //965
-/*S_ZAP6_01*/       { SPR_ZAP6, 32769, 4, { A_SigilTrail }, S_ZAP6_02 },        //966
-/*S_ZAP6_02*/       { SPR_ZAP6, 32770, 4, { A_SigilTrail }, S_ZAP6_00 },        //967
-/*S_ZOT3_00*/       { SPR_ZOT3, 32768, 4, { NULL }, S_ZOT3_01 },        //968
-/*S_ZOT3_01*/       { SPR_ZOT3, 32769, 4, { NULL }, S_ZOT3_02 },        //969
-/*S_ZOT3_02*/       { SPR_ZOT3, 32770, 4, { NULL }, S_ZOT3_03 },        //970
-/*S_ZOT3_03*/       { SPR_ZOT3, 32771, 4, { NULL }, S_ZOT3_04 },        //971
-/*S_ZOT3_04*/       { SPR_ZOT3, 32772, 4, { NULL }, S_ZOT3_00 },        //972
-/*S_ZAP6_03*/       { SPR_ZAP6, 32768, 5, { NULL }, S_ZAP6_04 },        //973
-/*S_ZAP6_04*/       { SPR_ZAP6, 32769, 5, { NULL }, S_ZAP6_05 },        //974
-/*S_ZAP6_05*/       { SPR_ZAP6, 32770, 5, { NULL }, S_NULL },       //975
-/*S_ZAP7_00*/       { SPR_ZAP7, 32768, 4, { A_Sigil_E_Action }, S_ZAP7_01 },        //976
-/*S_ZAP7_01*/       { SPR_ZAP7, 32769, 4, { A_Sigil_E_Action }, S_ZAP7_02 },        //977
-/*S_ZAP7_02*/       { SPR_ZAP7, 32770, 6, { A_Sigil_E_Action }, S_ZAP7_03 },        //978
-/*S_ZAP7_03*/       { SPR_ZAP7, 32771, 6, { A_Sigil_E_Action }, S_ZAP7_04 },        //979
-/*S_ZAP7_04*/       { SPR_ZAP7, 32772, 6, { A_Sigil_E_Action }, S_ZAP7_00 },        //980
-/*S_ZOT1_00*/       { SPR_ZOT1, 32768, 4, { NULL }, S_ZOT1_01 },        //981
-/*S_ZOT1_01*/       { SPR_ZOT1, 32769, 4, { NULL }, S_ZOT1_02 },        //982
-/*S_ZOT1_02*/       { SPR_ZOT1, 32770, 6, { NULL }, S_ZOT1_03 },        //983
-/*S_ZOT1_03*/       { SPR_ZOT1, 32771, 6, { NULL }, S_ZOT1_04 },        //984
-/*S_ZOT1_04*/       { SPR_ZOT1, 32771, 6, { NULL }, S_ZOT1_00 },        //985
-/*S_ZAP5_00*/       { SPR_ZAP5, 32768, 4, { A_MissileTick }, S_ZAP5_01 },       //986
-/*S_ZAP5_01*/       { SPR_ZAP5, 32769, 4, { A_Sigil_A_Action }, S_ZAP5_02 },        //987
-/*S_ZAP5_02*/       { SPR_ZAP5, 32770, 4, { A_MissileTick }, S_ZAP5_03 },       //988
-/*S_ZAP5_03*/       { SPR_ZAP5, 32771, 4, { A_MissileTick }, S_ZAP5_00 },       //989
-/*S_ZOT2_00*/       { SPR_ZOT2, 32768, 4, { A_Tracer }, S_ZOT2_01 },        //990
-/*S_ZOT2_01*/       { SPR_ZOT2, 32769, 4, { A_Tracer }, S_ZOT2_02 },        //991
-/*S_ZOT2_02*/       { SPR_ZOT2, 32770, 6, { A_Tracer }, S_ZOT2_03 },        //992
-/*S_ZOT2_03*/       { SPR_ZOT2, 32771, 6, { A_Tracer }, S_ZOT2_04 },        //993
-/*S_ZOT2_04*/       { SPR_ZOT2, 32772, 5, { A_Tracer }, S_ZOT2_00 },        //994
-/*S_SEWR_00*/       { SPR_SEWR, 0, 10, { A_Look }, S_SEWR_00 },     //995
-/*S_SEWR_01*/       { SPR_SEWR, 0, 6, { A_FloatWeave }, S_SEWR_02 },        //996
-/*S_SEWR_02*/       { SPR_SEWR, 0, 6, { A_Chase }, S_SEWR_01 },     //997
-/*S_SEWR_03*/       { SPR_SEWR, 1, 4, { A_FaceTarget }, S_SEWR_04 },        //998
-/*S_SEWR_04*/       { SPR_SEWR, 32770, 8, { A_SentinelAttack }, S_SEWR_05 },        //999
-/*S_SEWR_05*/       { SPR_SEWR, 32770, 4, { A_CheckTargetVisible }, S_SEWR_04 },        //1000
-/*S_SEWR_06*/       { SPR_SEWR, 3, 5, { A_Pain }, S_SEWR_05 },      //1001
-/*S_SEWR_07*/       { SPR_SEWR, 3, 7, { A_Fall }, S_SEWR_08 },      //1002
-/*S_SEWR_08*/       { SPR_SEWR, 32772, 8, { A_BodyParts }, S_SEWR_09 },     //1003
-/*S_SEWR_09*/       { SPR_SEWR, 32773, 5, { A_Scream }, S_SEWR_10 },        //1004
-/*S_SEWR_10*/       { SPR_SEWR, 32774, 4, { A_BodyParts }, S_SEWR_11 },     //1005
-/*S_SEWR_11*/       { SPR_SEWR, 32775, 4, { A_BodyParts }, S_SEWR_12 },     //1006
-/*S_SEWR_12*/       { SPR_SEWR, 8, 4, { NULL }, S_SEWR_13 },        //1007
-/*S_SEWR_13*/       { SPR_SEWR, 9, 5, { NULL }, S_NULL },       //1008
-/*S_SPID_00*/       { SPR_SPID, 0, 1, { A_StalkerSetLook }, S_SPID_00 },        //1009
-/*S_SPID_01*/       { SPR_SPID, 0, 10, { A_Look }, S_SPID_01 },     //1010
-/*S_SPID_02*/       { SPR_SPID, 9, 10, { A_Look }, S_SPID_02 },     //1011
-/*S_SPID_03*/       { SPR_SPID, 0, 1, { A_StalkerThink }, S_SPID_04 },      //1012
-/*S_SPID_04*/       { SPR_SPID, 0, 3, { A_Chase }, S_SPID_05 },     //1013
-/*S_SPID_05*/       { SPR_SPID, 1, 3, { A_Chase }, S_SPID_06 },     //1014
-/*S_SPID_06*/       { SPR_SPID, 1, 3, { A_Chase }, S_SPID_07 },     //1015
-/*S_SPID_07*/       { SPR_SPID, 2, 3, { A_StalkerChase }, S_SPID_08 },      //1016
-/*S_SPID_08*/       { SPR_SPID, 2, 3, { A_Chase }, S_SPID_03 },     //1017
-/*S_SPID_09*/       { SPR_SPID, 9, 3, { A_FaceTarget }, S_SPID_10 },        //1018
-/*S_SPID_10*/       { SPR_SPID, 10, 3, { A_StalkerScratch }, S_SPID_18 },       //1019
-/*S_SPID_11*/       { SPR_SPID, 2, 2, { A_StalkerDrop }, S_SPID_12 },       //1020
-/*S_SPID_12*/       { SPR_SPID, 8, 3, { NULL }, S_SPID_13 },        //1021
-/*S_SPID_13*/       { SPR_SPID, 7, 3, { NULL }, S_SPID_14 },        //1022
-/*S_SPID_14*/       { SPR_SPID, 6, 3, { NULL }, S_SPID_15 },        //1023
-/*S_SPID_15*/       { SPR_SPID, 5, 3, { NULL }, S_SPID_16 },        //1024
-/*S_SPID_16*/       { SPR_SPID, 4, 3, { NULL }, S_SPID_17 },        //1025
-/*S_SPID_17*/       { SPR_SPID, 3, 3, { NULL }, S_SPID_09 },        //1026
-/*S_SPID_18*/       { SPR_SPID, 9, 3, { A_StalkerChase }, S_SPID_19 },      //1027
-/*S_SPID_19*/       { SPR_SPID, 9, 3, { A_Chase }, S_SPID_20 },     //1028
-/*S_SPID_20*/       { SPR_SPID, 10, 3, { A_Chase }, S_SPID_21 },        //1029
-/*S_SPID_21*/       { SPR_SPID, 10, 3, { A_Chase }, S_SPID_22 },        //1030
-/*S_SPID_22*/       { SPR_SPID, 11, 3, { A_StalkerChase }, S_SPID_23 },     //1031
-/*S_SPID_23*/       { SPR_SPID, 11, 3, { A_Chase }, S_SPID_18 },        //1032
-/*S_SPID_24*/       { SPR_SPID, 11, 1, { A_Pain }, S_SPID_03 },     //1033
-/*S_SPID_25*/       { SPR_SPID, 14, 4, { NULL }, S_SPID_26 },       //1034
-/*S_SPID_26*/       { SPR_SPID, 15, 4, { A_Scream }, S_SPID_27 },       //1035
-/*S_SPID_27*/       { SPR_SPID, 16, 4, { NULL }, S_SPID_28 },       //1036
-/*S_SPID_28*/       { SPR_SPID, 17, 4, { NULL }, S_SPID_29 },       //1037
-/*S_SPID_29*/       { SPR_SPID, 18, 4, { NULL }, S_SPID_30 },       //1038
-/*S_SPID_30*/       { SPR_SPID, 19, 4, { NULL }, S_SPID_31 },       //1039
-/*S_SPID_31*/       { SPR_SPID, 20, 4, { A_Fall }, S_SPID_32 },     //1040
-/*S_SPID_32*/       { SPR_SPID, 21, 4, { NULL }, S_SPID_33 },       //1041
-/*S_SPID_33*/       { SPR_SPID, 22, 4, { NULL }, S_SPID_34 },       //1042
-/*S_SPID_34*/       { SPR_SPID, 32791, 4, { NULL }, S_SPID_35 },        //1043
-/*S_SPID_35*/       { SPR_SPID, 32792, 4, { NULL }, S_SPID_36 },        //1044
-/*S_SPID_36*/       { SPR_SPID, 32793, 4, { NULL }, S_SPID_37 },        //1045
-/*S_SPID_37*/       { SPR_SPID, 32794, 4, { NULL }, S_NULL },       //1046
-/*S_ROB3_00*/       { SPR_ROB3, 0, 10, { A_Look }, S_ROB3_01 },     //1047
-/*S_ROB3_01*/       { SPR_ROB3, 1, 10, { A_Look }, S_ROB3_00 },     //1048
-/*S_ROB3_02*/       { SPR_ROB3, 1, 3, { A_InqChase }, S_ROB3_03 },      //1049
-/*S_ROB3_03*/       { SPR_ROB3, 1, 3, { A_Chase }, S_ROB3_04 },     //1050
-/*S_ROB3_04*/       { SPR_ROB3, 2, 4, { A_Chase }, S_ROB3_05 },     //1051
-/*S_ROB3_05*/       { SPR_ROB3, 2, 4, { A_Chase }, S_ROB3_06 },     //1052
-/*S_ROB3_06*/       { SPR_ROB3, 3, 4, { A_Chase }, S_ROB3_07 },     //1053
-/*S_ROB3_07*/       { SPR_ROB3, 3, 4, { A_Chase }, S_ROB3_08 },     //1054
-/*S_ROB3_08*/       { SPR_ROB3, 4, 3, { A_InqChase }, S_ROB3_09 },      //1055
-/*S_ROB3_09*/       { SPR_ROB3, 4, 3, { A_InqFlyCheck }, S_ROB3_02 },       //1056
-/*S_ROB3_10*/       { SPR_ROB3, 0, 2, { A_InqFlyCheck }, S_ROB3_11 },       //1057
-/*S_ROB3_11*/       { SPR_ROB3, 5, 6, { A_FaceTarget }, S_ROB3_12 },        //1058
-/*S_ROB3_12*/       { SPR_ROB3, 32774, 8, { A_ReaverAttack }, S_ROB3_13 },     //1059
-/*S_ROB3_13*/       { SPR_ROB3, 6, 8, { A_ReaverAttack }, S_ROB3_02 },     //1060
-/*S_ROB3_14*/       { SPR_ROB3, 10, 12, { A_FaceTarget }, S_ROB3_15 },      //1061
-/*S_ROB3_15*/       { SPR_ROB3, 32777, 6, { A_InqGrenade }, S_ROB3_16 },        //1062
-/*S_ROB3_16*/       { SPR_ROB3, 10, 12, { NULL }, S_ROB3_02 },      //1063
-/*S_ROB3_17*/       { SPR_ROB3, 32775, 8, { A_InqTakeOff }, S_ROB3_18 },        //1064
-/*S_ROB3_18*/       { SPR_ROB3, 32776, 4, { A_InqFly }, S_ROB3_19 },        //1065
-/*S_ROB3_19*/       { SPR_ROB3, 32775, 4, { A_InqFly }, S_ROB3_18 },        //1066
-/*S_ROB3_20*/       { SPR_ROB3, 11, 4, { A_BodyParts }, S_ROB3_21 },        //1067
-/*S_ROB3_21*/       { SPR_ROB3, 12, 4, { A_Scream }, S_ROB3_22 },       //1068
-/*S_ROB3_22*/       { SPR_ROB3, 13, 4, { A_BodyParts }, S_ROB3_23 },        //1069
-/*S_ROB3_23*/       { SPR_ROB3, 32782, 4, { A_DeathExplode1 }, S_ROB3_24 },     //1070
-/*S_ROB3_24*/       { SPR_ROB3, 32783, 4, { A_BodyParts }, S_ROB3_25 },     //1071
-/*S_ROB3_25*/       { SPR_ROB3, 32784, 4, { A_Fall }, S_ROB3_26 },      //1072
-/*S_ROB3_26*/       { SPR_ROB3, 17, 4, { A_BodyParts }, S_ROB3_27 },        //1073
-/*S_ROB3_27*/       { SPR_ROB3, 18, 4, { A_BodyParts }, S_ROB3_28 },        //1074
-/*S_ROB3_28*/       { SPR_ROB3, 19, 4, { A_BodyParts }, S_ROB3_29 },        //1075
-/*S_ROB3_29*/       { SPR_ROB3, 20, 4, { A_BodyParts }, S_ROB3_30 },        //1076
-/*S_ROB3_30*/       { SPR_ROB3, 21, 4, { A_BodyParts }, S_ROB3_31 },        //1077
-/*S_ROB3_31*/       { SPR_ROB3, 32790, 4, { A_DeathExplode1 }, S_ROB3_32 },     //1078
-/*S_ROB3_32*/       { SPR_ROB3, 32791, 4, { A_BodyParts }, S_ROB3_33 },     //1079
-/*S_ROB3_33*/       { SPR_ROB3, 32792, 4, { A_BodyParts }, S_ROB3_34 },     //1080
-/*S_ROB3_34*/       { SPR_ROB3, 25, 4, { A_BodyParts }, S_ROB3_35 },        //1081
-/*S_ROB3_35*/       { SPR_ROB3, 26, 4, { A_BodyParts }, S_ROB3_36 },        //1082
-/*S_ROB3_36*/       { SPR_ROB3, 27, 3, { A_BodyParts }, S_ROB3_37 },        //1083
-/*S_ROB3_37*/       { SPR_ROB3, 32796, 3, { A_DeathExplode1 }, S_RBB3_00 },     //1084
-/*S_RBB3_00*/       { SPR_RBB3, 32768, 3, { A_InqTossArm }, S_RBB3_01 },        //1085
-/*S_RBB3_01*/       { SPR_RBB3, 32769, 3, { A_BodyParts }, S_RBB3_02 },     //1086
-/*S_RBB3_02*/       { SPR_RBB3, 2, 3, { A_BodyParts }, S_RBB3_03 },     //1087
-/*S_RBB3_03*/       { SPR_RBB3, 3, 3, { A_BodyParts }, S_RBB3_04 },     //1088
-/*S_RBB3_04*/       { SPR_RBB3, 4, -1, { A_BossDeath }, S_NULL },       //1089
-/*S_RBB3_05*/       { SPR_RBB3, 32773, 5, { NULL }, S_RBB3_06 },        //1090
-/*S_RBB3_06*/       { SPR_RBB3, 32774, 5, { NULL }, S_RBB3_07 },        //1091
-/*S_RBB3_07*/       { SPR_RBB3, 7, -1, { NULL }, S_NULL },      //1092
-/*S_PRGR_00*/       { SPR_PRGR, 0, 5, { A_Look }, S_PRGR_01 },      //1093
-/*S_PRGR_01*/       { SPR_PRGR, 0, 1, { A_FloatWeave }, S_PRGR_00 },        //1094
-/*S_PRGR_02*/       { SPR_PRGR, 0, 160, { A_FloatWeave }, S_PRGR_03 },      //1095
-/*S_PRGR_03*/       { SPR_PRGR, 1, 5, { A_FloatWeave }, S_PRGR_04 },        //1096
-/*S_PRGR_04*/       { SPR_PRGR, 2, 5, { A_FloatWeave }, S_PRGR_05 },        //1097
-/*S_PRGR_05*/       { SPR_PRGR, 3, 5, { A_FloatWeave }, S_PRGR_06 },        //1098
-/*S_PRGR_06*/       { SPR_PRGR, 4, 2, { A_FloatWeave }, S_PRGR_07 },        //1099
-/*S_PRGR_07*/       { SPR_PRGR, 5, 2, { A_FloatWeave }, S_PRGR_08 },        //1100
-/*S_PRGR_08*/       { SPR_PRGR, 4, 3, { A_Chase }, S_PRGR_09 },     //1101
-/*S_PRGR_09*/       { SPR_PRGR, 5, 3, { A_Chase }, S_PRGR_06 },     //1102
-/*S_PRGR_10*/       { SPR_PRGR, 4, 2, { A_FloatWeave }, S_PRGR_11 },        //1103
-/*S_PRGR_11*/       { SPR_PRGR, 5, 3, { A_FloatWeave }, S_PRGR_12 },        //1104
-/*S_PRGR_12*/       { SPR_PRGR, 4, 3, { A_FaceTarget }, S_PRGR_13 },        //1105
-/*S_PRGR_13*/       { SPR_PRGR, 5, 4, { A_ProgrammerMelee }, S_PRGR_06 },       //1106
-/*S_PRGR_14*/       { SPR_PRGR, 6, 5, { A_FaceTarget }, S_PRGR_15 },        //1107
-/*S_PRGR_15*/       { SPR_PRGR, 7, 5, { A_FloatWeave }, S_PRGR_16 },        //1108
-/*S_PRGR_16*/       { SPR_PRGR, 32776, 5, { A_FaceTarget }, S_PRGR_17 },        //1109
-/*S_PRGR_17*/       { SPR_PRGR, 32777, 5, { A_ProgrammerAttack }, S_PRGR_06 },      //1110
-/*S_PRGR_18*/       { SPR_PRGR, 10, 5, { A_Pain }, S_PRGR_19 },     //1111
-/*S_PRGR_19*/       { SPR_PRGR, 11, 5, { A_FloatWeave }, S_PRGR_06 },       //1112
-/*S_PRGR_20*/       { SPR_PRGR, 32779, 7, { A_BodyParts }, S_PRGR_21 },     //1113
-/*S_PRGR_21*/       { SPR_PRGR, 32780, 7, { A_Scream }, S_PRGR_22 },        //1114
-/*S_PRGR_22*/       { SPR_PRGR, 32781, 7, { A_BodyParts }, S_PRGR_23 },     //1115
-/*S_PRGR_23*/       { SPR_PRGR, 32782, 7, { A_Fall }, S_PRGR_24 },      //1116
-/*S_PRGR_24*/       { SPR_PRGR, 32783, 7, { A_BodyParts }, S_PRGR_25 },     //1117
-/*S_PRGR_25*/       { SPR_PRGR, 32784, 7, { A_ProgrammerDie }, S_PRGR_26 },     //1118
-/*S_PRGR_26*/       { SPR_PRGR, 32785, 7, { NULL }, S_PRGR_27 },        //1119
-/*S_PRGR_27*/       { SPR_PRGR, 32786, 6, { NULL }, S_PRGR_28 },        //1120
-/*S_PRGR_28*/       { SPR_PRGR, 32787, 5, { NULL }, S_PRGR_29 },        //1121
-/*S_PRGR_29*/       { SPR_PRGR, 32788, 5, { NULL }, S_PRGR_30 },        //1122
-/*S_PRGR_30*/       { SPR_PRGR, 32789, 5, { NULL }, S_PRGR_31 },        //1123
-/*S_PRGR_31*/       { SPR_PRGR, 32790, 5, { NULL }, S_PRGR_32 },        //1124
-/*S_PRGR_32*/       { SPR_PRGR, 32791, 32, { NULL }, S_PRGR_33 },       //1125
-/*S_PRGR_33*/       { SPR_PRGR, 32791, -1, { A_BossDeath }, S_NULL },       //1126
-/*S_BASE_00*/       { SPR_BASE, 32768, 5, { A_DeathExplode3 }, S_BASE_01 },     //1127
-/*S_BASE_01*/       { SPR_BASE, 32769, 5, { NULL }, S_BASE_02 },        //1128
-/*S_BASE_02*/       { SPR_BASE, 32770, 5, { NULL }, S_BASE_03 },        //1129
-/*S_BASE_03*/       { SPR_BASE, 32771, 5, { NULL }, S_BASE_04 },        //1130
-/*S_BASE_04*/       { SPR_BASE, 4, 5, { NULL }, S_BASE_05 },        //1131
-/*S_BASE_05*/       { SPR_BASE, 5, 5, { NULL }, S_BASE_06 },        //1132
-/*S_BASE_06*/       { SPR_BASE, 6, 5, { NULL }, S_BASE_07 },        //1133
-/*S_BASE_07*/       { SPR_BASE, 7, -1, { NULL }, S_NULL },      //1134
-/*S_FRBL_00*/       { SPR_FRBL, 32768, 3, { NULL }, S_FRBL_01 },        //1135
-/*S_FRBL_01*/       { SPR_FRBL, 32769, 3, { NULL }, S_FRBL_02 },        //1136
-/*S_FRBL_02*/       { SPR_FRBL, 32770, 3, { A_MissileTick }, S_FRBL_00 },       //1137
-/*S_FRBL_03*/       { SPR_FRBL, 32771, 5, { A_FlameDeath }, S_FRBL_04 },        //1138
-/*S_FRBL_04*/       { SPR_FRBL, 32772, 5, { NULL }, S_FRBL_05 },        //1139
-/*S_FRBL_05*/       { SPR_FRBL, 32773, 5, { NULL }, S_FRBL_06 },        //1140
-/*S_FRBL_06*/       { SPR_FRBL, 32774, 5, { NULL }, S_FRBL_07 },        //1141
-/*S_FRBL_07*/       { SPR_FRBL, 32775, 5, { NULL }, S_FRBL_08 },        //1142
-/*S_FRBL_08*/       { SPR_FRBL, 32776, 5, { NULL }, S_NULL },       //1143
-/*S_KLAX_00*/       { SPR_KLAX, 0, 5, { A_Listen }, S_KLAX_00 },        //1144
-/*S_KLAX_01*/       { SPR_KLAX, 1, 6, { A_ClaxonBlare }, S_KLAX_02 },       //1145
-/*S_KLAX_02*/       { SPR_KLAX, 2, 60, { NULL }, S_KLAX_01 },       //1146
-/*S_TURT_00*/       { SPR_TURT, 0, 5, { A_Listen }, S_TURT_00 },        //1147
-/*S_TURT_01*/       { SPR_TURT, 0, 2, { A_Chase }, S_TURT_01 },     //1148
-/*S_TURT_02*/       { SPR_TURT, 1, 4, { A_BulletAttack }, S_TURT_03 },      //1149
-/*S_TURT_03*/       { SPR_TURT, 3, 3, { A_CheckTargetVisible }, S_TURT_04 },        //1150
-/*S_TURT_04*/       { SPR_TURT, 0, 4, { A_CheckTargetVisible }, S_TURT_02 },        //1151
-/*S_BALL_00*/       { SPR_BALL, 32768, 6, { NULL }, S_BALL_01 },        //1152
-/*S_BALL_01*/       { SPR_BALL, 32769, 6, { NULL }, S_BALL_02 },        //1153
-/*S_BALL_02*/       { SPR_BALL, 32770, 6, { NULL }, S_BALL_03 },        //1154
-/*S_BALL_03*/       { SPR_BALL, 32771, 6, { NULL }, S_BALL_04 },        //1155
-/*S_BALL_04*/       { SPR_BALL, 32772, 6, { NULL }, S_TURT_05 },        //1156
-/*S_TURT_05*/       { SPR_TURT, 2, -1, { NULL }, S_NULL },      //1157
-/*S_PSTN_00*/       { SPR_PSTN, 0, 8, { NULL }, S_PSTN_01 },        //1158
-/*S_PSTN_01*/       { SPR_PSTN, 1, 8, { NULL }, S_PSTN_00 },        //1159
-/*S_PSTN_02*/       { SPR_PSTN, 32768, 4, { A_Scream }, S_PSTN_03 },        //1160
-/*S_PSTN_03*/       { SPR_PSTN, 32769, 4, { A_Fall }, S_PSTN_04 },      //1161
-/*S_PSTN_04*/       { SPR_PSTN, 32770, 4, { A_QuestMsg }, S_PSTN_05 },      //1162
-/*S_PSTN_05*/       { SPR_PSTN, 32771, 4, { A_SpawnSparkPuff }, S_PSTN_06 },        //1163
-/*S_PSTN_06*/       { SPR_PSTN, 32772, 4, { A_BodyParts }, S_PSTN_07 },     //1164
-/*S_PSTN_07*/       { SPR_PSTN, 32773, 4, { NULL }, S_PSTN_08 },        //1165
-/*S_PSTN_08*/       { SPR_PSTN, 32774, 4, { A_SpawnSparkPuff }, S_PSTN_09 },        //1166
-/*S_PSTN_09*/       { SPR_PSTN, 7, 4, { NULL }, S_PSTN_10 },        //1167
-/*S_PSTN_10*/       { SPR_PSTN, 8, -1, { NULL }, S_NULL },      //1168
-/*S_SECR_00*/       { SPR_SECR, 32768, 4, { NULL }, S_SECR_01 },        //1169
-/*S_SECR_01*/       { SPR_SECR, 32769, 4, { NULL }, S_SECR_02 },        //1170
-/*S_SECR_02*/       { SPR_SECR, 32770, 4, { NULL }, S_SECR_03 },        //1171
-/*S_SECR_03*/       { SPR_SECR, 32771, 4, { NULL }, S_SECR_00 },        //1172
-/*S_SECR_04*/       { SPR_SECR, 32772, 5, { A_SpawnSparkPuff }, S_SECR_05 },        //1173
-/*S_SECR_05*/       { SPR_SECR, 32773, 5, { A_Fall }, S_SECR_06 },      //1174
-/*S_SECR_06*/       { SPR_SECR, 32774, 5, { A_QuestMsg }, S_SECR_07 },      //1175
-/*S_SECR_07*/       { SPR_SECR, 32775, 5, { A_BodyParts }, S_SECR_08 },     //1176
-/*S_SECR_08*/       { SPR_SECR, 32776, 5, { A_SpawnSparkPuff }, S_SECR_09 },        //1177
-/*S_SECR_09*/       { SPR_SECR, 9, 5, { NULL }, S_SECR_10 },        //1178
-/*S_SECR_10*/       { SPR_SECR, 10, 5, { A_SpawnSparkPuff }, S_SECR_11 },       //1179
-/*S_SECR_11*/       { SPR_SECR, 11, 5, { NULL }, S_SECR_12 },       //1180
-/*S_SECR_12*/       { SPR_SECR, 12, 5, { A_SpawnSparkPuff }, S_SECR_13 },       //1181
-/*S_SECR_13*/       { SPR_SECR, 13, 5, { NULL }, S_SECR_14 },       //1182
-/*S_SECR_14*/       { SPR_SECR, 14, 5, { A_SpawnSparkPuff }, S_SECR_15 },       //1183
-/*S_SECR_15*/       { SPR_SECR, 15, -1, { NULL }, S_NULL },     //1184
-/*S_XPRK_01*/       { SPR_XPRK, 0, -1, { NULL }, S_NULL },      //1185
-/*S_XPRK_02*/       { SPR_XPRK, 0, 1, { A_ClearForceField }, S_BNG3_00 },       //1186
-/*S_TARG_00*/       { SPR_TARG, 0, -1, { NULL }, S_NULL },      //1187
-/*S_RING_00*/       { SPR_RING, 0, -1, { NULL }, S_NULL },      //1188
-/*S_EARS_00*/       { SPR_EARS, 0, -1, { NULL }, S_NULL },      //1189
-/*S_COMM_00*/       { SPR_COMM, 0, -1, { NULL }, S_NULL },      //1190
-/*S_BOOM_00*/       { SPR_BOOM, 32768, 1, { A_CrystalRadiusAtk }, S_BOOM_01 },     //1191
-/*S_BOOM_01*/       { SPR_BOOM, 32769, 3, { A_QuestMsg }, S_BOOM_02 },      //1192
-/*S_BOOM_02*/       { SPR_BOOM, 32770, 2, { A_CrystalExplode }, S_BOOM_03 },        //1193
-/*S_BOOM_03*/       { SPR_BOOM, 32771, 3, { A_SpawnSparkPuff }, S_BOOM_04 },        //1194
-/*S_BOOM_04*/       { SPR_BOOM, 32772, 3, { NULL }, S_BOOM_05 },        //1195
-/*S_BOOM_05*/       { SPR_BOOM, 32773, 3, { NULL }, S_BOOM_06 },        //1196
-/*S_BOOM_06*/       { SPR_BOOM, 32774, 3, { A_SpawnSparkPuff }, S_BOOM_07 },        //1197
-/*S_BOOM_07*/       { SPR_BOOM, 32775, 1, { A_CrystalRadiusAtk }, S_BOOM_08 },     //1198
-/*S_BOOM_08*/       { SPR_BOOM, 32776, 3, { NULL }, S_BOOM_09 },        //1199
-/*S_BOOM_09*/       { SPR_BOOM, 32777, 3, { A_SpawnSparkPuff }, S_BOOM_10 },        //1200
-/*S_BOOM_10*/       { SPR_BOOM, 32778, 3, { A_SpawnSparkPuff }, S_BOOM_11 },        //1201
-/*S_BOOM_11*/       { SPR_BOOM, 32779, 3, { A_SpawnSparkPuff }, S_BOOM_12 },        //1202
-/*S_BOOM_12*/       { SPR_BOOM, 32780, 3, { NULL }, S_BOOM_13 },        //1203
-/*S_BOOM_13*/       { SPR_BOOM, 32781, 3, { NULL }, S_BOOM_14 },        //1204
-/*S_BOOM_14*/       { SPR_BOOM, 32782, 3, { A_SpawnSparkPuff }, S_BOOM_15 },        //1205
-/*S_BOOM_15*/       { SPR_BOOM, 32783, 3, { NULL }, S_BOOM_16 },        //1206
-/*S_BOOM_16*/       { SPR_BOOM, 32784, 3, { NULL }, S_BOOM_17 },        //1207
-/*S_BOOM_17*/       { SPR_BOOM, 32785, 3, { NULL }, S_BOOM_18 },        //1208
-/*S_BOOM_18*/       { SPR_BOOM, 32786, 3, { NULL }, S_BOOM_19 },        //1209
-/*S_BOOM_19*/       { SPR_BOOM, 32787, 3, { NULL }, S_BOOM_20 },        //1210
-/*S_BOOM_20*/       { SPR_BOOM, 32788, 3, { A_ExtraLightOff }, S_BOOM_21 },     //1211
-/*S_BOOM_21*/       { SPR_BOOM, 32789, 3, { NULL }, S_BOOM_22 },        //1212
-/*S_BOOM_22*/       { SPR_BOOM, 32790, 3, { NULL }, S_BOOM_23 },        //1213
-/*S_BOOM_23*/       { SPR_BOOM, 32791, 3, { NULL }, S_BOOM_24 },        //1214
-/*S_BOOM_24*/       { SPR_BOOM, 32792, 3, { NULL }, S_NULL },       //1215
-/*S_RATT_00*/       { SPR_RATT, 0, 10, { A_Look }, S_RATT_00 },     //1216
-/*S_RATT_01*/       { SPR_RATT, 0, 4, { A_Chase }, S_RATT_02 },     //1217
-/*S_RATT_02*/       { SPR_RATT, 0, 4, { A_Chase }, S_RATT_03 },     //1218
-/*S_RATT_03*/       { SPR_RATT, 1, 4, { A_Chase }, S_RATT_04 },     //1219
-/*S_RATT_04*/       { SPR_RATT, 1, 4, { A_Chase }, S_RATT_01 },     //1220
-/*S_RATT_05*/       { SPR_RATT, 0, 8, { A_RandomWalk }, S_RATT_06 },        //1221
-/*S_RATT_06*/       { SPR_RATT, 1, 4, { A_RandomWalk }, S_RATT_01 },        //1222
-/*S_HOGN_00*/       { SPR_HOGN, 0, 2, { A_ZombieInSpecialSector }, S_HOGN_00 },     //1223
-/*S_HOGN_01*/       { SPR_HOGN, 1, 1, { A_ZombieInSpecialSector }, S_HOGN_02 },     //1224
-/*S_HOGN_02*/       { SPR_HOGN, 2, 1, { A_Pain }, S_HOGN_00 },      //1225
-/*S_DEAD_00*/       { SPR_DEAD, 0, -1, { NULL }, S_NULL },      //1226
-/*S_SBAN_00*/       { SPR_SBAN, 0, -1, { NULL }, S_NULL },      //1227
-/*S_BOTR_00*/       { SPR_BOTR, 0, -1, { NULL }, S_NULL },      //1228
-/*S_HATR_00*/       { SPR_HATR, 0, -1, { NULL }, S_NULL },      //1229
-/*S_TOPR_00*/       { SPR_TOPR, 0, -1, { NULL }, S_NULL },      //1230
-/*S_COUP_00*/       { SPR_COUP, 0, 5, { NULL }, S_COUP_01 },        //1231
-/*S_COUP_01*/       { SPR_COUP, 1, 5, { NULL }, S_COUP_00 },        //1232
-/*S_COUP_02*/       { SPR_COUP, 2, -1, { NULL }, S_COUP_01 },       //1233
-/*S_BUBB_00*/       { SPR_BUBB, 0, 4, { A_ActiveSound }, S_BUBB_00 },       //1234
-/*S_BUBF_00*/       { SPR_BUBF, 0, 4, { A_ActiveSound }, S_BUBF_00 },       //1235
-/*S_BUBC_00*/       { SPR_BUBC, 0, 4, { A_ActiveSound }, S_BUBC_00 },       //1236
-/*S_ASPR_00*/       { SPR_ASPR, 0, 4, { A_ActiveSound }, S_ASPR_00 },       //1237
-/*S_SPDL_00*/       { SPR_SPDL, 0, 5, { A_ActiveSound }, S_SPDL_01 },       //1238
-/*S_SPDL_01*/       { SPR_SPDL, 1, 5, { A_ActiveSound }, S_SPDL_02 },       //1239
-/*S_SPDL_02*/       { SPR_SPDL, 2, 5, { A_ActiveSound }, S_SPDL_00 },       //1240
-/*S_TOKN_00*/       { SPR_TOKN, 0, -1, { NULL }, S_NULL },      //1241
-/*S_OTOK_00*/       { SPR_OTOK, 0, -1, { NULL }, S_NULL },      //1242
-/*S_HELT_00*/       { SPR_HELT, 0, -1, { NULL }, S_NULL },      //1243
-/*S_GUNT_00*/       { SPR_GUNT, 0, -1, { NULL }, S_NULL },      //1244
-/*S_FULL_00*/       { SPR_FULL, 0, 35, { NULL }, S_FULL_01 },       //1245
-/*S_FULL_01*/       { SPR_FULL, 1, 35, { NULL }, S_FULL_00 },       //1246
-/*S_MEAT_00*/       { SPR_MEAT, 0, 700, { NULL }, S_NULL },     //1247
-/*S_MEAT_01*/       { SPR_MEAT, 1, 700, { NULL }, S_NULL },     //1248
-/*S_MEAT_02*/       { SPR_MEAT, 2, 700, { NULL }, S_NULL },     //1249
-/*S_MEAT_03*/       { SPR_MEAT, 3, 700, { NULL }, S_NULL },     //1250
-/*S_MEAT_04*/       { SPR_MEAT, 4, 700, { NULL }, S_NULL },     //1251
-/*S_MEAT_05*/       { SPR_MEAT, 5, 700, { NULL }, S_NULL },     //1252
-/*S_MEAT_06*/       { SPR_MEAT, 6, 700, { NULL }, S_NULL },     //1253
-/*S_MEAT_07*/       { SPR_MEAT, 7, 700, { NULL }, S_NULL },     //1254
-/*S_MEAT_08*/       { SPR_MEAT, 8, 700, { NULL }, S_NULL },     //1255
-/*S_MEAT_09*/       { SPR_MEAT, 9, 700, { NULL }, S_NULL },     //1256
-/*S_MEAT_10*/       { SPR_MEAT, 10, 700, { NULL }, S_NULL },        //1257
-/*S_MEAT_11*/       { SPR_MEAT, 11, 700, { NULL }, S_NULL },        //1258
-/*S_MEAT_12*/       { SPR_MEAT, 12, 700, { NULL }, S_NULL },        //1259
-/*S_MEAT_13*/       { SPR_MEAT, 13, 700, { NULL }, S_NULL },        //1260
-/*S_MEAT_14*/       { SPR_MEAT, 14, 700, { NULL }, S_NULL },        //1261
-/*S_MEAT_15*/       { SPR_MEAT, 15, 700, { NULL }, S_NULL },        //1262
-/*S_MEAT_16*/       { SPR_MEAT, 16, 700, { NULL }, S_NULL },        //1263
-/*S_MEAT_17*/       { SPR_MEAT, 17, 700, { NULL }, S_NULL },        //1264
-/*S_MEAT_18*/       { SPR_MEAT, 18, 700, { NULL }, S_NULL },        //1265
-/*S_MEAT_19*/       { SPR_MEAT, 19, 700, { NULL }, S_NULL },        //1266
-/*S_JUNK_00*/       { SPR_JUNK, 0, 700, { NULL }, S_NULL },     //1267
-/*S_JUNK_01*/       { SPR_JUNK, 1, 700, { NULL }, S_NULL },     //1268
-/*S_JUNK_02*/       { SPR_JUNK, 2, 700, { NULL }, S_NULL },     //1269
-/*S_JUNK_03*/       { SPR_JUNK, 3, 700, { NULL }, S_NULL },     //1270
-/*S_JUNK_04*/       { SPR_JUNK, 4, 700, { NULL }, S_NULL },     //1271
-/*S_JUNK_05*/       { SPR_JUNK, 5, 700, { NULL }, S_NULL },     //1272
-/*S_JUNK_06*/       { SPR_JUNK, 6, 700, { NULL }, S_NULL },     //1273
-/*S_JUNK_07*/       { SPR_JUNK, 7, 700, { NULL }, S_NULL },     //1274
-/*S_JUNK_08*/       { SPR_JUNK, 8, 700, { NULL }, S_NULL },     //1275
-/*S_JUNK_09*/       { SPR_JUNK, 9, 700, { NULL }, S_NULL },     //1276
-/*S_JUNK_10*/       { SPR_JUNK, 10, 700, { NULL }, S_NULL },        //1277
-/*S_JUNK_11*/       { SPR_JUNK, 11, 700, { NULL }, S_NULL },        //1278
-/*S_JUNK_12*/       { SPR_JUNK, 12, 700, { NULL }, S_NULL },        //1279
-/*S_JUNK_13*/       { SPR_JUNK, 13, 700, { NULL }, S_NULL },        //1280
-/*S_JUNK_14*/       { SPR_JUNK, 14, 700, { NULL }, S_NULL },        //1281
-/*S_JUNK_15*/       { SPR_JUNK, 15, 700, { NULL }, S_NULL },        //1282
-/*S_JUNK_16*/       { SPR_JUNK, 16, 700, { NULL }, S_NULL },        //1283
-/*S_JUNK_17*/       { SPR_JUNK, 17, 700, { NULL }, S_NULL },        //1284
-/*S_JUNK_18*/       { SPR_JUNK, 18, 700, { NULL }, S_NULL },        //1285
-/*S_JUNK_19*/       { SPR_JUNK, 19, 700, { NULL }, S_NULL },        //1286
-/*S_FFOT_00*/       { SPR_FFOT, 0, 9, { NULL }, S_FFOT_01 },        //1287
-/*S_FFOT_01*/       { SPR_FFOT, 1, 9, { NULL }, S_FFOT_02 },        //1288
-/*S_FFOT_02*/       { SPR_FFOT, 2, 9, { NULL }, S_FFOT_03 },        //1289
-/*S_FFOT_03*/       { SPR_FFOT, 3, 9, { NULL }, S_NULL },       //1290
-/*S_DIE1_00*/       { SPR_DIE1, 0, -1, { NULL }, S_NULL },      //1291
-/*S_BEAC_00*/       { SPR_BEAC, 0, -1, { NULL }, S_NULL },      //1292
-/*S_BEAC_01*/       { SPR_BEAC, 0, 30, { NULL }, S_BEAC_02 },       //1293
-/*S_BEAC_02*/       { SPR_BEAC, 0, 160, { A_TeleportBeacon }, S_BEAC_01 },      //1294
-/*S_ARM1_00*/       { SPR_ARM1, 0, -1, { NULL }, S_NULL },      //1295
-/*S_ARM2_00*/       { SPR_ARM2, 0, -1, { NULL }, S_NULL },      //1296
-/*S_BARW_00*/       { SPR_BARW, 0, -1, { NULL }, S_NULL },      //1297
-/*S_BARW_01*/       { SPR_BARW, 1, 2, { A_Scream }, S_BARW_02 },        //1298
-/*S_BARW_02*/       { SPR_BARW, 2, 2, { NULL }, S_BARW_03 },        //1299
-/*S_BARW_03*/       { SPR_BARW, 3, 2, { A_Fall }, S_BARW_04 },      //1300
-/*S_BARW_04*/       { SPR_BARW, 4, 2, { NULL }, S_BARW_05 },        //1301
-/*S_BARW_05*/       { SPR_BARW, 5, 2, { NULL }, S_BARW_06 },        //1302
-/*S_BARW_06*/       { SPR_BARW, 6, 2, { NULL }, S_BARW_07 },        //1303
-/*S_BARW_07*/       { SPR_BARW, 7, -1, { NULL }, S_NULL },      //1304
-/*S_BART_00*/       { SPR_BART, 0, -1, { NULL }, S_NULL },      //1305
-/*S_BART_01*/       { SPR_BART, 32769, 2, { A_Scream }, S_BART_02 },        //1306
-/*S_BART_02*/       { SPR_BART, 32770, 2, { NULL }, S_BART_03 },        //1307
-/*S_BART_03*/       { SPR_BART, 32771, 2, { NULL }, S_BART_04 },        //1308
-/*S_BART_04*/       { SPR_BART, 32772, 2, { A_Fall }, S_BART_05 },      //1309
-/*S_BART_05*/       { SPR_BART, 32773, 2, { A_DeathExplode2 }, S_BART_06 },     //1310
-/*S_BART_06*/       { SPR_BART, 32774, 2, { NULL }, S_BART_07 },        //1311
-/*S_BART_07*/       { SPR_BART, 32775, 2, { NULL }, S_BART_08 },        //1312
-/*S_BART_08*/       { SPR_BART, 32776, 2, { NULL }, S_BART_09 },        //1313
-/*S_BART_09*/       { SPR_BART, 32777, 3, { NULL }, S_BART_10 },        //1314
-/*S_BART_10*/       { SPR_BART, 32778, 3, { NULL }, S_BART_11 },        //1315
-/*S_BART_11*/       { SPR_BART, 11, -1, { NULL }, S_NULL },     //1316
-/*S_LAMP_00*/       { SPR_LAMP, 0, -1, { NULL }, S_NULL },      //1317
-/*S_LANT_00*/       { SPR_LANT, 0, -1, { NULL }, S_NULL },      //1318
-/*S_BARL_00*/       { SPR_BARL, 32768, 4, { NULL }, S_BARL_01 },        //1319
-/*S_BARL_01*/       { SPR_BARL, 32769, 4, { NULL }, S_BARL_02 },        //1320
-/*S_BARL_02*/       { SPR_BARL, 32770, 4, { NULL }, S_BARL_03 },        //1321
-/*S_BARL_03*/       { SPR_BARL, 32771, 4, { NULL }, S_BARL_00 },        //1322
-/*S_BOWL_00*/       { SPR_BOWL, 32768, 4, { A_ActiveSound }, S_BOWL_01 },       //1323
-/*S_BOWL_01*/       { SPR_BOWL, 32769, 4, { NULL }, S_BOWL_02 },        //1324
-/*S_BOWL_02*/       { SPR_BOWL, 32770, 4, { NULL }, S_BOWL_03 },        //1325
-/*S_BOWL_03*/       { SPR_BOWL, 32771, 4, { NULL }, S_BOWL_00 },        //1326
-/*S_BRAZ_00*/       { SPR_BRAZ, 32768, 4, { A_ActiveSound }, S_BRAZ_01 },       //1327
-/*S_BRAZ_01*/       { SPR_BRAZ, 32769, 4, { NULL }, S_BRAZ_02 },        //1328
-/*S_BRAZ_02*/       { SPR_BRAZ, 32770, 4, { NULL }, S_BRAZ_03 },        //1329
-/*S_BRAZ_03*/       { SPR_BRAZ, 32771, 4, { NULL }, S_BRAZ_00 },        //1330
-/*S_TRCH_00*/       { SPR_TRCH, 32768, 4, { A_ActiveSound }, S_TRCH_01 },       //1331
-/*S_TRCH_01*/       { SPR_TRCH, 32769, 4, { NULL }, S_TRCH_02 },        //1332
-/*S_TRCH_02*/       { SPR_TRCH, 32770, 4, { NULL }, S_TRCH_03 },        //1333
-/*S_TRCH_03*/       { SPR_TRCH, 32771, 4, { NULL }, S_TRCH_00 },        //1334
-/*S_LTRH_00*/       { SPR_LTRH, 32768, 4, { NULL }, S_LTRH_01 },        //1335
-/*S_LTRH_01*/       { SPR_LTRH, 32769, 4, { NULL }, S_LTRH_02 },        //1336
-/*S_LTRH_02*/       { SPR_LTRH, 32770, 4, { NULL }, S_LTRH_03 },        //1337
-/*S_LTRH_03*/       { SPR_LTRH, 32771, 4, { NULL }, S_LTRH_00 },        //1338
-/*S_LMPC_00*/       { SPR_LMPC, 32768, 4, { A_ActiveSound }, S_LMPC_01 },       //1339
-/*S_LMPC_01*/       { SPR_LMPC, 32769, 4, { NULL }, S_LMPC_02 },        //1340
-/*S_LMPC_02*/       { SPR_LMPC, 32770, 4, { NULL }, S_LMPC_03 },        //1341
-/*S_LMPC_03*/       { SPR_LMPC, 32771, 4, { NULL }, S_LMPC_00 },        //1342
-/*S_LOGS_00*/       { SPR_LOGS, 32768, 4, { A_ActiveSound }, S_LOGS_01 },       //1343
-/*S_LOGS_01*/       { SPR_LOGS, 32769, 4, { NULL }, S_LOGS_02 },        //1344
-/*S_LOGS_02*/       { SPR_LOGS, 32770, 4, { NULL }, S_LOGS_03 },        //1345
-/*S_LOGS_03*/       { SPR_LOGS, 32771, 4, { NULL }, S_LOGS_00 },        //1346
-/*S_TRHO_00*/       { SPR_TRHO, 0, -1, { NULL }, S_NULL },      //1347
-/*S_WATR_00*/       { SPR_WATR, 0, -1, { NULL }, S_NULL },      //1348
-/*S_MUGG_00*/       { SPR_MUGG, 0, -1, { NULL }, S_NULL },      //1349
-/*S_FUSL_00*/       { SPR_FUSL, 0, -1, { NULL }, S_NULL },      //1350
-/*S_CRD1_00*/       { SPR_CRD1, 0, -1, { NULL }, S_NULL },      //1351
-/*S_CRD2_00*/       { SPR_CRD2, 0, -1, { NULL }, S_NULL },      //1352
-/*S_TPAS_00*/       { SPR_TPAS, 0, -1, { NULL }, S_NULL },      //1353
-/*S_KY1G_00*/       { SPR_KY1G, 0, -1, { NULL }, S_NULL },      //1354
-/*S_KY2S_00*/       { SPR_KY2S, 0, -1, { NULL }, S_NULL },      //1355
-/*S_KY3B_00*/       { SPR_KY3B, 0, -1, { NULL }, S_NULL },      //1356
-/*S_HAND_00*/       { SPR_HAND, 0, -1, { NULL }, S_NULL },      //1357
-/*S_CRYS_00*/       { SPR_CRYS, 0, 16, { A_ActiveSound }, S_CRYS_01 },      //1358
-/*S_CRYS_01*/       { SPR_CRYS, 1, 5, { A_ActiveSound }, S_CRYS_02 },       //1359
-/*S_CRYS_02*/       { SPR_CRYS, 2, 4, { A_ActiveSound }, S_CRYS_03 },       //1360
-/*S_CRYS_03*/       { SPR_CRYS, 3, 4, { A_ActiveSound }, S_CRYS_04 },       //1361
-/*S_CRYS_04*/       { SPR_CRYS, 4, 4, { A_ActiveSound }, S_CRYS_05 },       //1362
-/*S_CRYS_05*/       { SPR_CRYS, 5, 4, { A_ActiveSound }, S_CRYS_00 },       //1363
-/*S_PRIS_00*/       { SPR_PRIS, 0, -1, { NULL }, S_NULL },      //1364
-/*S_PWR1_00*/       { SPR_PWR1, 0, -1, { NULL }, S_NULL },      //1365
-/*S_PWR2_00*/       { SPR_PWR2, 0, -1, { NULL }, S_NULL },      //1366
-/*S_PWR3_00*/       { SPR_PWR3, 0, -1, { NULL }, S_NULL },      //1367
-/*S_ORAC_00*/       { SPR_ORAC, 0, -1, { NULL }, S_NULL },      //1368
-/*S_GYID_00*/       { SPR_GYID, 0, -1, { NULL }, S_NULL },      //1369
-/*S_FUBR_00*/       { SPR_FUBR, 0, -1, { NULL }, S_NULL },      //1370
-/*S_WARE_00*/       { SPR_WARE, 0, -1, { NULL }, S_NULL },      //1371
-/*S_RCRY_00*/       { SPR_RCRY, 32768, -1, { NULL }, S_NULL },      //1372
-/*S_BCRY_00*/       { SPR_BCRY, 32768, -1, { NULL }, S_NULL },      //1373
-/*S_CHAP_00*/       { SPR_CHAP, 0, -1, { NULL }, S_NULL },      //1374
-/*S_TUNL_00*/       { SPR_TUNL, 0, -1, { NULL }, S_NULL },      //1375
-/*S_BLTK_00*/       { SPR_BLTK, 0, -1, { NULL }, S_NULL },      //1376
-/*S_SECK_00*/       { SPR_SECK, 0, -1, { NULL }, S_NULL },      //1377
-/*S_MINE_00*/       { SPR_MINE, 0, -1, { NULL }, S_NULL },      //1378
-/*S_REBL_00*/       { SPR_REBL, 0, -1, { NULL }, S_NULL },      //1379
-/*S_PROC_00*/       { SPR_PROC, 0, -1, { NULL }, S_NULL },      //1380
-/*S_ANKH_00*/       { SPR_ANKH, 0, -1, { NULL }, S_NULL },      //1381
-/*S_GOID_00*/       { SPR_GOID, 0, -1, { NULL }, S_NULL },      //1382
-/*S_STMP_00*/       { SPR_STMP, 0, -1, { NULL }, S_NULL },      //1383
-/*S_MDKT_00*/       { SPR_MDKT, 0, -1, { NULL }, S_NULL },      //1384
-/*S_COIN_00*/       { SPR_COIN, 0, -1, { NULL }, S_NULL },      //1385
-/*S_CRED_00*/       { SPR_CRED, 0, -1, { NULL }, S_NULL },      //1386
-/*S_SACK_00*/       { SPR_SACK, 0, -1, { NULL }, S_NULL },      //1387
-/*S_CHST_00*/       { SPR_CHST, 0, -1, { NULL }, S_NULL },      //1388
-/*S_SHD1_00*/       { SPR_SHD1, 0, 17, { A_ShadowOff }, S_SHD1_01 },        //1389
-/*S_SHD1_01*/       { SPR_SHD1, 0, 17, { A_ModifyVisibility }, S_SHD1_02 },     //1390
-/*S_SHD1_02*/       { SPR_SHD1, 0, 17, { A_ShadowOn }, S_SHD1_03 },     //1391
-/*S_SHD1_03*/       { SPR_SHD1, 0, 17, { A_ModifyVisibility }, S_SHD1_00 },     //1392
-/*S_MASK_00*/       { SPR_MASK, 0, -1, { NULL }, S_NULL },      //1393
-/*S_UNIF_00*/       { SPR_UNIF, 0, -1, { NULL }, S_NULL },      //1394
-/*S_OFIC_00*/       { SPR_OFIC, 0, -1, { NULL }, S_NULL },      //1395
-/*S_PMAP_00*/       { SPR_PMAP, 32768, 6, { NULL }, S_PMAP_01 },        //1396
-/*S_PMAP_01*/       { SPR_PMAP, 32769, 6, { NULL }, S_PMAP_00 },        //1397
-/*S_PMUP_00*/       { SPR_PMUP, 32768, 6, { NULL }, S_PMUP_01 },        //1398
-/*S_PMUP_01*/       { SPR_PMUP, 32769, 6, { NULL }, S_PMUP_00 },        //1399
-/*S_BLIT_00*/       { SPR_BLIT, 0, -1, { NULL }, S_NULL },      //1400
-/*S_BBOX_00*/       { SPR_BBOX, 0, -1, { NULL }, S_NULL },      //1401
-/*S_MSSL_00*/       { SPR_MSSL, 0, -1, { NULL }, S_NULL },      //1402
-/*S_ROKT_00*/       { SPR_ROKT, 0, -1, { NULL }, S_NULL },      //1403
-/*S_BRY1_00*/       { SPR_BRY1, 0, 6, { NULL }, S_BRY1_01 },        //1404
-/*S_BRY1_01*/       { SPR_BRY1, 1, 6, { NULL }, S_BRY1_00 },        //1405
-/*S_CPAC_00*/       { SPR_CPAC, 0, 6, { NULL }, S_CPAC_01 },        //1406
-/*S_CPAC_01*/       { SPR_CPAC, 1, 6, { NULL }, S_CPAC_00 },        //1407
-/*S_PQRL_00*/       { SPR_PQRL, 0, -1, { NULL }, S_NULL },      //1408
-/*S_XQRL_00*/       { SPR_XQRL, 0, -1, { NULL }, S_NULL },      //1409
-/*S_GRN1_00*/       { SPR_GRN1, 0, -1, { NULL }, S_NULL },      //1410
-/*S_GRN2_00*/       { SPR_GRN2, 0, -1, { NULL }, S_NULL },      //1411
-/*S_BKPK_00*/       { SPR_BKPK, 0, -1, { NULL }, S_NULL },      //1412
-/*S_RELC_00*/       { SPR_RELC, 32768, -1, { NULL }, S_NULL },      //1413
-/*S_RIFL_00*/       { SPR_RIFL, 0, -1, { NULL }, S_NULL },      //1414
-/*S_RIFL_01*/       { SPR_RIFL, 1, -1, { NULL }, S_NULL },      //1415
-/*S_FLAM_00*/       { SPR_FLAM, 0, -1, { NULL }, S_NULL },      //1416
-/*S_BFLM_00*/       { SPR_BFLM, 0, -1, { NULL }, S_NULL },      //1417
-/*S_MMSL_00*/       { SPR_MMSL, 0, -1, { NULL }, S_NULL },      //1418
-/*S_TRPD_00*/       { SPR_TRPD, 0, -1, { NULL }, S_NULL },      //1419
-/*S_GRND_00*/       { SPR_GRND, 0, -1, { NULL }, S_NULL },      //1420
-/*S_CBOW_00*/       { SPR_CBOW, 0, -1, { NULL }, S_NULL },      //1421
-/*S_SIGL_00*/       { SPR_SIGL, 0, -1, { NULL }, S_NULL },      //1422
-/*S_SIGL_01*/       { SPR_SIGL, 1, -1, { NULL }, S_NULL },      //1423
-/*S_SIGL_02*/       { SPR_SIGL, 2, -1, { NULL }, S_NULL },      //1424
-/*S_SIGL_03*/       { SPR_SIGL, 3, -1, { NULL }, S_NULL },      //1425
-/*S_SIGL_04*/       { SPR_SIGL, 4, -1, { NULL }, S_NULL },      //1426
-/*S_LITE_00*/       { SPR_LITE, 32768, -1, { NULL }, S_NULL },      //1427
-/*S_CNDL_00*/       { SPR_CNDL, 32768, -1, { NULL }, S_NULL },      //1428
-/*S_CLBR_00*/       { SPR_CLBR, 32768, -1, { NULL }, S_NULL },      //1429
-/*S_LITS_00*/       { SPR_LITS, 32768, -1, { NULL }, S_NULL },      //1430
-/*S_LITB_00*/       { SPR_LITB, 32768, -1, { NULL }, S_NULL },      //1431
-/*S_LITG_00*/       { SPR_LITG, 32768, -1, { NULL }, S_NULL },      //1432
-/*S_ROK1_00*/       { SPR_ROK1, 0, -1, { NULL }, S_NULL },      //1433
-/*S_ROK2_00*/       { SPR_ROK2, 0, -1, { NULL }, S_NULL },      //1434
-/*S_ROK3_00*/       { SPR_ROK3, 0, -1, { NULL }, S_NULL },      //1435
-/*S_ROK4_00*/       { SPR_ROK4, 0, -1, { NULL }, S_NULL },      //1436
-/*S_LOGG_00*/       { SPR_LOGG, 0, 5, { A_ActiveSound }, S_LOGG_01 },       //1437
-/*S_LOGG_01*/       { SPR_LOGG, 1, 5, { A_ActiveSound }, S_LOGG_02 },       //1438
-/*S_LOGG_02*/       { SPR_LOGG, 2, 5, { A_ActiveSound }, S_LOGG_03 },       //1439
-/*S_LOGG_03*/       { SPR_LOGG, 3, 5, { A_ActiveSound }, S_LOGG_00 },       //1440
-/*S_RUB1_00*/       { SPR_RUB1, 0, -1, { NULL }, S_NULL },      //1441
-/*S_RUB2_00*/       { SPR_RUB2, 0, -1, { NULL }, S_NULL },      //1442
-/*S_RUB3_00*/       { SPR_RUB3, 0, -1, { NULL }, S_NULL },      //1443
-/*S_RUB4_00*/       { SPR_RUB4, 0, -1, { NULL }, S_NULL },      //1444
-/*S_RUB5_00*/       { SPR_RUB5, 0, -1, { NULL }, S_NULL },      //1445
-/*S_RUB6_00*/       { SPR_RUB6, 0, -1, { NULL }, S_NULL },      //1446
-/*S_RUB7_00*/       { SPR_RUB7, 0, -1, { NULL }, S_NULL },      //1447
-/*S_RUB8_00*/       { SPR_RUB8, 0, -1, { NULL }, S_NULL },      //1448
-/*S_CHAN_00*/       { SPR_CHAN, 0, -1, { NULL }, S_NULL },      //1449
-/*S_STAT_00*/       { SPR_STAT, 0, -1, { NULL }, S_NULL },      //1450
-/*S_DSTA_00*/       { SPR_DSTA, 0, -1, { NULL }, S_NULL },      //1451
-/*S_CRAB_00*/       { SPR_CRAB, 0, -1, { NULL }, S_NULL },      //1452
-/*S_CAGE_00*/       { SPR_CAGE, 0, -1, { NULL }, S_NULL },      //1453
-/*S_TREE_00*/       { SPR_TREE, 0, -1, { NULL }, S_NULL },      //1454
-/*S_TREE_01*/       { SPR_TREE, 1, -1, { NULL }, S_NULL },      //1455
-/*S_TREE_02*/       { SPR_TREE, 2, -1, { NULL }, S_NULL },      //1456
-/*S_TRE1_00*/       { SPR_TRE1, 0, -1, { NULL }, S_NULL },      //1457
-/*S_BUSH_00*/       { SPR_BUSH, 0, -1, { NULL }, S_NULL },      //1458
-/*S_SHRB_00*/       { SPR_SHRB, 0, -1, { NULL }, S_NULL },      //1459
-/*S_STAK_00*/       { SPR_STAK, 0, -1, { NULL }, S_NULL },      //1460
-/*S_BAR1_00*/       { SPR_BAR1, 0, -1, { NULL }, S_NULL },      //1461
-/*S_VASE_00*/       { SPR_VASE, 0, -1, { NULL }, S_NULL },      //1462
-/*S_VASE_01*/       { SPR_VASE, 1, -1, { NULL }, S_NULL },      //1463
-/*S_STOL_00*/       { SPR_STOL, 0, -1, { NULL }, S_NULL },      //1464
-/*S_POT1_00*/       { SPR_POT1, 0, -1, { NULL }, S_NULL },      //1465
-/*S_TUB1_00*/       { SPR_TUB1, 0, -1, { NULL }, S_NULL },      //1466
-/*S_ANVL_00*/       { SPR_ANVL, 0, -1, { NULL }, S_NULL },      //1467
-/*S_TLMP_00*/       { SPR_TLMP, 0, -1, { NULL }, S_NULL },      //1468
-/*S_TLMP_01*/       { SPR_TLMP, 1, -1, { NULL }, S_NULL },      //1469
-/*S_TRAY_00*/       { SPR_TRAY, 0, -1, { NULL }, S_NULL },      //1470
-/*S_APOW_00*/       { SPR_APOW, 0, 4, { A_ActiveSound }, S_APOW_00 },       //1471
-/*S_AFED_00*/       { SPR_AFED, 0, -1, { NULL }, S_NULL },      //1472
-/*S_DRIP_00*/       { SPR_DRIP, 0, 6, { A_ActiveSound }, S_DRIP_01 },       //1473
-/*S_DRIP_01*/       { SPR_DRIP, 1, 4, { NULL }, S_DRIP_02 },        //1474
-/*S_DRIP_02*/       { SPR_DRIP, 2, 4, { NULL }, S_DRIP_03 },        //1475
-/*S_DRIP_03*/       { SPR_DRIP, 3, 4, { A_ActiveSound }, S_DRIP_04 },       //1476
-/*S_DRIP_04*/       { SPR_DRIP, 4, 4, { NULL }, S_DRIP_05 },        //1477
-/*S_DRIP_05*/       { SPR_DRIP, 5, 4, { NULL }, S_DRIP_06 },        //1478
-/*S_DRIP_06*/       { SPR_DRIP, 6, 4, { A_ActiveSound }, S_DRIP_07 },       //1479
-/*S_DRIP_07*/       { SPR_DRIP, 7, 4, { NULL }, S_DRIP_00 },        //1480
-/*S_CDRP_00*/       { SPR_CDRP, 0, 10, { NULL }, S_CDRP_01 },       //1481
-/*S_CDRP_01*/       { SPR_CDRP, 1, 8, { NULL }, S_CDRP_02 },        //1482
-/*S_CDRP_02*/       { SPR_CDRP, 2, 8, { NULL }, S_CDRP_03 },        //1483
-/*S_CDRP_03*/       { SPR_CDRP, 3, 8, { NULL }, S_CDRP_00 },        //1484
-/*S_SPLH_00*/       { SPR_SPLH, 0, 4, { NULL }, S_SPLH_01 },        //1485
-/*S_SPLH_01*/       { SPR_SPLH, 1, 4, { NULL }, S_SPLH_02 },        //1486
-/*S_SPLH_02*/       { SPR_SPLH, 2, 4, { NULL }, S_SPLH_03 },        //1487
-/*S_SPLH_03*/       { SPR_SPLH, 3, 8, { NULL }, S_SPLH_04 },        //1488
-/*S_SPLH_04*/       { SPR_SPLH, 4, 4, { NULL }, S_SPLH_05 },        //1489
-/*S_SPLH_05*/       { SPR_SPLH, 5, 4, { NULL }, S_SPLH_06 },        //1490
-/*S_SPLH_06*/       { SPR_SPLH, 6, 4, { NULL }, S_SPLH_07 },        //1491
-/*S_SPLH_07*/       { SPR_SPLH, 7, 4, { A_ActiveSound }, S_SPLH_00 },       //1492
-/*S_WTFT_00*/       { SPR_WTFT, 0, 4, { NULL }, S_WTFT_01 },        //1493
-/*S_WTFT_01*/       { SPR_WTFT, 1, 4, { NULL }, S_WTFT_02 },        //1494
-/*S_WTFT_02*/       { SPR_WTFT, 2, 4, { NULL }, S_WTFT_03 },        //1495
-/*S_WTFT_03*/       { SPR_WTFT, 3, 4, { A_ActiveSound }, S_WTFT_00 },       //1496
-/*S_HERT_00*/       { SPR_HERT, 32768, 4, { NULL }, S_HERT_01 },        //1497
-/*S_HERT_01*/       { SPR_HERT, 32769, 4, { NULL }, S_HERT_02 },        //1498
-/*S_HERT_02*/       { SPR_HERT, 32770, 4, { NULL }, S_HERT_00 },        //1499
-/*S_TELP_00*/       { SPR_TELP, 32768, 3, { NULL }, S_TELP_01 },        //1500
-/*S_TELP_01*/       { SPR_TELP, 32769, 3, { NULL }, S_TELP_02 },        //1501
-/*S_TELP_02*/       { SPR_TELP, 32770, 3, { NULL }, S_TELP_03 },        //1502
-/*S_TELP_03*/       { SPR_TELP, 32771, 3, { NULL }, S_TELP_00 },        //1503
-/*S_MONI_00*/       { SPR_MONI, 0, -1, { NULL }, S_NULL },      //1504
-/*S_STEL_00*/       { SPR_STEL, 0, -1, { NULL }, S_NULL },      //1505
-/*S_STLA_00*/       { SPR_STLA, 0, -1, { NULL }, S_NULL },      //1506
-/*S_STLE_00*/       { SPR_STLE, 0, -1, { NULL }, S_NULL },      //1507
-/*S_HUGE_00*/       { SPR_HUGE, 0, 4, { NULL }, S_HUGE_01 },        //1508
-/*S_HUGE_01*/       { SPR_HUGE, 1, 5, { NULL }, S_HUGE_02 },        //1509
-/*S_HUGE_02*/       { SPR_HUGE, 2, 5, { NULL }, S_HUGE_03 },        //1510
-/*S_HUGE_03*/       { SPR_HUGE, 3, 5, { NULL }, S_HUGE_00 },        //1511
-/*S_STLG_00*/       { SPR_STLG, 0, -1, { NULL }, S_NULL },      //1512
-/*S_STLG_01*/       { SPR_STLG, 1, -1, { NULL }, S_NULL },      //1513
-/*S_STLG_02*/       { SPR_STLG, 2, -1, { NULL }, S_NULL },      //1514
-/*S_STLG_03*/       { SPR_STLG, 3, -1, { NULL }, S_NULL },      //1515
-/*S_STLG_04*/       { SPR_STLG, 4, -1, { NULL }, S_NULL },      //1516
-/*S_STLG_05*/       { SPR_STLG, 5, -1, { NULL }, S_NULL },      //1517
-};
-
-
-// villsa [STRIFE]
-mobjinfo_t mobjinfo[NUMMOBJTYPES] =
-{
-    {       /*MT_FIELDGUARD*/
-        25,     //doomednum
-        S_TOKN_00,      //spawnstate
-        10,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_XPRK_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        2*FRACUNIT,     //radius
-        1*FRACUNIT,     //height
-        10000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SHOOTABLE|MF_NOSECTOR|MF_NODIALOG,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PLAYER*/
-        -1,     //doomednum
-        S_PLAY_00,      //spawnstate
-        100,        //spawnhealth
-        S_PLAY_01,      //seestate
-        sfx_None,       //seesound
-        0,      //reactiontime
-        sfx_None,       //attacksound
-        S_PLAY_07,      //painstate
-        255,        //painchance
-        sfx_plpain,     //painsound
-        S_NULL,     //meleestate
-        S_PLAY_05,      //missilestate
-        S_NULL,     //crashstate
-        S_PLAY_09,      //deathstate
-        S_RGIB_00,      //xdeathstate
-        sfx_pldeth,     //deathsound
-        0,      //speed
-        18*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_NOTDMATCH|MF_ALLY,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SHOPKEEPER_W*/
-        116,        //doomednum
-        S_MRST_00,      //spawnstate
-        10000000,       //spawnhealth
-        S_MRPN_00,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_MRPN_00,      //painstate
-        150,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        5000,       //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH,      //flags
-        "Weapon_Smith",     //namepointer
-    },
-
-    {       /*MT_SHOPKEEPER_B*/
-        72,     //doomednum
-        S_MRST_00,      //spawnstate
-        10000000,       //spawnhealth
-        S_MRPN_00,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_MRPN_00,      //painstate
-        150,        //painchance
-        sfx_ambbar,     //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        5000,       //mass
-        0,      //damage
-        sfx_ambppl,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH|MF_COLORSWAP1|MF_COLORSWAP3,      //flags
-        "Bar_Keep",     //namepointer
-    },
-
-    {       /*MT_SHOPKEEPER_A*/
-        73,     //doomednum
-        S_MRST_00,      //spawnstate
-        10000000,       //spawnhealth
-        S_MRPN_00,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_MRPN_00,      //painstate
-        150,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        5000,       //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH|MF_COLORSWAP2|MF_COLORSWAP3,      //flags
-        "Armorer",      //namepointer
-    },
-
-    {       /*MT_SHOPKEEPER_M*/
-        74,     //doomednum
-        S_MRST_00,      //spawnstate
-        10000000,       //spawnhealth
-        S_MRPN_00,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_MRPN_00,      //painstate
-        150,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOTDMATCH|MF_COLORSWAP1|MF_COLORSWAP2
-        |MF_COLORSWAP3,     //flags
-        "Medic",        //namepointer
-    },
-
-    {       /*MT_PEASANT2_A*/
-        3004,       //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        4,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT2_B*/
-        130,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        5,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT2_C*/
-        131,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        5,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT5_A*/
-        65,     //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        7,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT5_B*/
-        132,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        7,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT5_C*/
-        133,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        7,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT4_A*/
-        66,     //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP2,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT4_B*/
-        134,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP2,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT4_C*/
-        135,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP2,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT6_A*/
-        67,     //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT6_B*/
-        136,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        7,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT6_C*/
-        137,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT3_A*/
-        172,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP3,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT3_B*/
-        173,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP3,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT3_C*/
-        174,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP3,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT8_A*/
-        175,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2
-        |MF_COLORSWAP3,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT8_B*/
-        176,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2
-        |MF_COLORSWAP3,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT8_C*/
-        177,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP2
-        |MF_COLORSWAP3,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT7_A*/
-        178,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP3,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT7_B*/
-        179,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP3,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT7_C*/
-        180,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP3,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PEASANT1*/
-        181,        //doomednum
-        S_PEAS_00,      //spawnstate
-        31,     //spawnhealth
-        S_PEAS_01,      //seestate
-        sfx_rebact,     //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_PEAS_12,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_PEAS_09,      //meleestate
-        S_NULL,     //missilestate
-        S_PEAS_14,      //crashstate
-        S_PEAS_17,      //deathstate
-        S_GIBS_00,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL|MF_COLORSWAP1
-        |MF_COLORSWAP2|MF_COLORSWAP3,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ZOMBIE*/
-        169,        //doomednum
-        S_PEAS_25,      //spawnstate
-        31,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_AGRD_00,      //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_GIBS_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_psdtha,     //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BECOMING*/
-        201,        //doomednum
-        S_ARMR_00,      //spawnstate
-        61,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_ARMR_01,      //painstate
-        255,        //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_GIBS_10,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_psdtha,     //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ZOMBIESPAWNER*/
-        170,        //doomednum
-        S_PLAY_19,      //spawnstate
-        20,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_telept,     //activesound
-        MF_SHOOTABLE|MF_NOSECTOR,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_HUGE_TANK_1*/
-        209,        //doomednum
-        S_TNK1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        192*FRACUNIT,       //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_HUGE_TANK_2*/
-        210,        //doomednum
-        S_TNK2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        192*FRACUNIT,       //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_HUGE_TANK_3*/
-        211,        //doomednum
-        S_TNK3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        192*FRACUNIT,       //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TANK_4*/
-        213,        //doomednum
-        S_TNK4_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TANK_5*/
-        214,        //doomednum
-        S_TNK5_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TANK_6*/
-        229,        //doomednum
-        S_TNK6_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        50000,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_KNEELING_GUY*/
-        204,        //doomednum
-        S_NEAL_00,      //spawnstate
-        51,     //spawnhealth
-        S_NEAL_00,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NEAL_02,      //painstate
-        255,        //painchance
-        sfx_static,     //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NEAL_05,      //crashstate
-        S_NEAL_07,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_static,     //deathsound
-        0,      //speed
-        6*FRACUNIT,     //radius
-        6*FRACUNIT,     //height
-        50000,      //mass
-        0,      //damage
-        sfx_chant,      //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BEGGAR1*/
-        141,        //doomednum
-        S_BEGR_00,      //spawnstate
-        20,     //spawnhealth
-        S_BEGR_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_BEGR_11,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_BEGR_07,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BEGR_13,      //deathstate
-        S_BEGR_22,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        3,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        "Beggar",       //namepointer
-    },
-
-    {       /*MT_BEGGAR2*/
-        155,        //doomednum
-        S_BEGR_00,      //spawnstate
-        20,     //spawnhealth
-        S_BEGR_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_BEGR_11,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_BEGR_07,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BEGR_13,      //deathstate
-        S_BEGR_22,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        3,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        "Beggar",       //namepointer
-    },
-
-    {       /*MT_BEGGAR3*/
-        156,        //doomednum
-        S_BEGR_00,      //spawnstate
-        20,     //spawnhealth
-        S_BEGR_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_BEGR_11,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_BEGR_07,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BEGR_13,      //deathstate
-        S_BEGR_22,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        3,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        "Beggar",       //namepointer
-    },
-
-    {       /*MT_BEGGAR4*/
-        157,        //doomednum
-        S_BEGR_00,      //spawnstate
-        20,     //spawnhealth
-        S_BEGR_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_BEGR_11,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_BEGR_07,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BEGR_13,      //deathstate
-        S_BEGR_22,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        3,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        "Beggar",       //namepointer
-    },
-
-    {       /*MT_BEGGAR5*/
-        158,        //doomednum
-        S_BEGR_00,      //spawnstate
-        20,     //spawnhealth
-        S_BEGR_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_meatht,     //attacksound
-        S_BEGR_11,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_BEGR_07,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BEGR_13,      //deathstate
-        S_BEGR_22,      //xdeathstate
-        sfx_psdtha,     //deathsound
-        3,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_JUSTHIT|MF_COUNTKILL,      //flags
-        "Beggar",       //namepointer
-    },
-
-    {       /*MT_REBEL1*/
-        9,      //doomednum
-        S_HMN1_00,      //spawnstate
-        60,     //spawnhealth
-        S_HMN1_11,      //seestate
-        sfx_wpnup,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HMN1_22,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_HMN1_19,      //missilestate
-        S_NULL,     //crashstate
-        S_HMN1_24,      //deathstate
-        S_RGIB_08,      //xdeathstate
-        sfx_rebdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
-        "Rebel",        //namepointer
-    },
-
-    {       /*MT_REBEL2*/
-        144,        //doomednum
-        S_HMN1_00,      //spawnstate
-        60,     //spawnhealth
-        S_HMN1_11,      //seestate
-        sfx_wpnup,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HMN1_22,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_HMN1_19,      //missilestate
-        S_NULL,     //crashstate
-        S_HMN1_24,      //deathstate
-        S_RGIB_08,      //xdeathstate
-        sfx_rebdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
-        "Rebel",        //namepointer
-    },
-
-    {       /*MT_REBEL3*/
-        145,        //doomednum
-        S_HMN1_00,      //spawnstate
-        60,     //spawnhealth
-        S_HMN1_11,      //seestate
-        sfx_wpnup,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HMN1_22,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_HMN1_19,      //missilestate
-        S_NULL,     //crashstate
-        S_HMN1_24,      //deathstate
-        S_RGIB_08,      //xdeathstate
-        sfx_rebdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
-        "Rebel",        //namepointer
-    },
-
-    {       /*MT_REBEL4*/
-        149,        //doomednum
-        S_HMN1_00,      //spawnstate
-        60,     //spawnhealth
-        S_HMN1_11,      //seestate
-        sfx_wpnup,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HMN1_22,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_HMN1_19,      //missilestate
-        S_NULL,     //crashstate
-        S_HMN1_24,      //deathstate
-        S_RGIB_08,      //xdeathstate
-        sfx_rebdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
-        "Rebel",        //namepointer
-    },
-
-    {       /*MT_REBEL5*/
-        150,        //doomednum
-        S_HMN1_00,      //spawnstate
-        60,     //spawnhealth
-        S_HMN1_11,      //seestate
-        sfx_wpnup,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HMN1_22,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_HMN1_19,      //missilestate
-        S_NULL,     //crashstate
-        S_HMN1_24,      //deathstate
-        S_RGIB_08,      //xdeathstate
-        sfx_rebdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
-        "Rebel",        //namepointer
-    },
-
-    {       /*MT_REBEL6*/
-        151,        //doomednum
-        S_HMN1_00,      //spawnstate
-        60,     //spawnhealth
-        S_HMN1_11,      //seestate
-        sfx_wpnup,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HMN1_22,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_HMN1_19,      //missilestate
-        S_NULL,     //crashstate
-        S_HMN1_24,      //deathstate
-        S_RGIB_08,      //xdeathstate
-        sfx_rebdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_ALLY,     //flags
-        "Rebel",        //namepointer
-    },
-
-    {       /*MT_RLEADER*/
-        64,     //doomednum
-        S_LEDR_00,      //spawnstate
-        95,     //spawnhealth
-        S_LEAD_04,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_LEAD_15,      //painstate
-        250,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_LEAD_12,      //missilestate
-        S_NULL,     //crashstate
-        S_LEAD_04,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOTDMATCH,     //flags
-        "MACIL",        //namepointer
-    },
-
-    {       /*MT_RLEADER2*/
-        200,        //doomednum
-        S_LEDR_00,      //spawnstate
-        95,     //spawnhealth
-        S_LEAD_04,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_LEAD_15,      //painstate
-        200,        //painchance
-        sfx_pespna,     //painsound
-        S_NULL,     //meleestate
-        S_LEAD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_LEAD_20,      //deathstate
-        S_LEAD_20,      //xdeathstate
-        sfx_slop,       //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_rebact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOTDMATCH|MF_SPECTRAL,     //flags
-        "MACIL",        //namepointer
-    },
-
-    {       /*MT_MISSILESMOKE*/
-        -1,     //doomednum
-        S_PUFY_04,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_rflite,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_REAVER*/
-        3001,       //doomednum
-        S_ROB1_00,      //spawnstate
-        150,        //spawnhealth
-        S_ROB1_02,      //seestate
-        sfx_revsee,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_ROB1_15,      //painstate
-        128,        //painchance
-        sfx_reavpn,     //painsound
-        S_ROB1_10,      //meleestate
-        S_ROB1_13,      //missilestate
-        S_NULL,     //crashstate
-        S_ROB1_17,      //deathstate
-        S_ROB1_26,      //xdeathstate
-        sfx_revdth,     //deathsound
-        12,     //speed
-        20*FRACUNIT,        //radius
-        60*FRACUNIT,        //height
-        500,        //mass
-        0,      //damage
-        sfx_revact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_GUARD1*/
-        3002,       //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac1,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,     //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD2*/
-        142,        //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac2,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1,       //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD3*/
-        143,        //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac3,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP2,       //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD4*/
-        146,        //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac1,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1|MF_COLORSWAP2,     //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD5*/
-        147,        //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac2,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP3,       //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD6*/
-        148,        //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac3,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1|MF_COLORSWAP3,     //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD7*/
-        232,        //doomednum
-        S_AGRD_01,      //spawnstate
-        60,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac3,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP2|MF_COLORSWAP3,     //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_GUARD8*/
-        231,        //doomednum
-        S_AGRD_01,      //spawnstate
-        60,     //spawnhealth
-        S_AGRD_13,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_23,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac3,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_COLORSWAP1|MF_COLORSWAP2
-        |MF_COLORSWAP3,     //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_SHADOWGUARD*/
-        58,     //doomednum
-        S_AGRD_01,      //spawnstate
-        70,     //spawnhealth
-        S_AGRD_12,      //seestate
-        sfx_agrsee,     //seesound
-        8,      //reactiontime
-        sfx_rifle,      //attacksound
-        S_AGRD_21,      //painstate
-        150,        //painchance
-        sfx_agrdpn,     //painsound
-        S_NULL,     //meleestate
-        S_AGRD_17,      //missilestate
-        S_NULL,     //crashstate
-        S_AGRD_24,      //deathstate
-        S_GIBS_10,      //xdeathstate
-        sfx_agrdth,     //deathsound
-        7,      //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_agrac2,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,     //flags
-        "ACOLYTE",      //namepointer
-    },
-
-    {       /*MT_PGUARD*/
-        3003,       //doomednum
-        S_PGRD_00,      //spawnstate
-        300,        //spawnhealth
-        S_PGRD_04,      //seestate
-        sfx_pgrsee,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_PGRD_16,      //painstate
-        100,        //painchance
-        sfx_pgrdpn,     //painsound
-        S_PGRD_12,      //meleestate
-        S_PGRD_14,      //missilestate
-        S_NULL,     //crashstate
-        S_PGRD_18,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_pgrdth,     //deathsound
-        8,      //speed
-        20*FRACUNIT,        //radius
-        60*FRACUNIT,        //height
-        500,        //mass
-        0,      //damage
-        sfx_pgract,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD|MF_COUNTKILL,      //flags
-        "TEMPLAR",      //namepointer
-    },
-
-    {       /*MT_CRUSADER*/
-        3005,       //doomednum
-        S_ROB2_00,      //spawnstate
-        400,        //spawnhealth
-        S_ROB2_01,      //seestate
-        sfx_rb2see,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_ROB2_19,      //painstate
-        128,        //painchance
-        sfx_rb2pn,      //painsound
-        S_NULL,     //meleestate
-        S_ROB2_09,      //missilestate
-        S_NULL,     //crashstate
-        S_ROB2_20,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_rb2dth,     //deathsound
-        8,      //speed
-        40*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        400,        //mass
-        0,      //damage
-        sfx_rb2act,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BISHOP*/
-        187,        //doomednum
-        S_MLDR_00,      //spawnstate
-        500,        //spawnhealth
-        S_MLDR_01,      //seestate
-        sfx_rb2see,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_MLDR_11,      //painstate
-        128,        //painchance
-        sfx_rb2pn,      //painsound
-        S_NULL,     //meleestate
-        S_MLDR_09,      //missilestate
-        S_NULL,     //crashstate
-        S_MLDR_12,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_pgrdth,     //deathsound
-        8,      //speed
-        40*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        500,        //mass
-        0,      //damage
-        sfx_rb2act,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL
-        |MF_NOTDMATCH,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ORACLE*/
-        199,        //doomednum
-        S_ORCL_00,      //spawnstate
-        1,      //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ORCL_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        15*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD|MF_COUNTKILL|MF_NOTDMATCH,      //flags
-        "ORACLE",       //namepointer
-    },
-
-    {       /*MT_PRIEST*/
-        12,     //doomednum
-        S_PRST_00,      //spawnstate
-        800,        //spawnhealth
-        S_PRST_02,      //seestate
-        sfx_lorsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_lorpn,      //painsound
-        S_PRST_10,      //meleestate
-        S_PRST_13,      //missilestate
-        S_NULL,     //crashstate
-        S_PDED_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_slop,       //deathsound
-        10,     //speed
-        15*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_tend,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST|MF_FLOAT
-        |MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL|MF_NOTDMATCH,       //flags
-        "PRIEST",       //namepointer
-    },
-
-    {       /*MT_SPECTRE_A*/
-        129,        //doomednum
-        S_ALN1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_ALN1_02,      //seestate
-        sfx_alnsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_ALN1_19,      //painstate
-        250,        //painchance
-        sfx_alnpn,      //painsound
-        S_ALN1_13,      //meleestate
-        S_ALN1_16,      //missilestate
-        S_NULL,     //crashstate
-        S_AL1P_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_alndth,     //deathsound
-        12,     //speed
-        64*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_NODE*/
-        -1,     //doomednum
-        S_NODE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOTDMATCH,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SPECTREHEAD*/
-        -1,     //doomednum
-        S_MTHD_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOTDMATCH,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SPECTRE_B*/
-        75,     //doomednum
-        S_ALN1_00,      //spawnstate
-        1200,       //spawnhealth
-        S_ALN1_02,      //seestate
-        sfx_alnsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_ALN1_19,      //painstate
-        50,     //painchance
-        sfx_alnpn,      //painsound
-        S_ALN1_13,      //meleestate
-        S_ALN1_20,      //missilestate
-        S_NULL,     //crashstate
-        S_AL1P_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_alndth,     //deathsound
-        12,     //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SPECTRE_C*/
-        76,     //doomednum
-        S_ALN1_23,      //spawnstate
-        1500,       //spawnhealth
-        S_ALN1_34,      //seestate
-        sfx_alnsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_ALN1_51,      //painstate
-        50,     //painchance
-        sfx_alnpn,      //painsound
-        S_ALN1_45,      //meleestate
-        S_ALN1_48,      //missilestate
-        S_NULL,     //crashstate
-        S_AL1P_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_alndth,     //deathsound
-        12,     //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SPECTRE_D*/
-        167,        //doomednum
-        S_ALN1_00,      //spawnstate
-        1700,       //spawnhealth
-        S_ALN1_02,      //seestate
-        sfx_alnsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_ALN1_19,      //painstate
-        50,     //painchance
-        sfx_alnpn,      //painsound
-        S_ALN1_13,      //meleestate
-        S_ALN1_52,      //missilestate
-        S_NULL,     //crashstate
-        S_AL1P_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_alndth,     //deathsound
-        12,     //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SPECTRE_E*/
-        168,        //doomednum
-        S_ALN1_00,      //spawnstate
-        2000,       //spawnhealth
-        S_ALN1_02,      //seestate
-        sfx_alnsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_ALN1_19,      //painstate
-        50,     //painchance
-        sfx_alnpn,      //painsound
-        S_ALN1_13,      //meleestate
-        S_ALN1_55,      //missilestate
-        S_NULL,     //crashstate
-        S_AL1P_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_alndth,     //deathsound
-        12,     //speed
-        24*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ENTITY*/
-        128,        //doomednum
-        S_MNAM_00,      //spawnstate
-        2500,       //spawnhealth
-        S_MNAL_02,      //seestate
-        sfx_mnalse,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_MNAL_19,      //painstate
-        255,        //painchance
-        sfx_alnpn,      //painsound
-        S_MNAL_13,      //meleestate
-        S_MNAL_16,      //missilestate
-        S_NULL,     //crashstate
-        S_MNAL_20,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_mnaldt,     //deathsound
-        13,     //speed
-        130*FRACUNIT,       //radius
-        200*FRACUNIT,       //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SUBENTITY*/
-        -1,     //doomednum
-        S_MNAL_27,      //spawnstate
-        990,        //spawnhealth
-        S_MNAL_28,      //seestate
-        sfx_alnsee,     //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_MNAL_40,      //painstate
-        255,        //painchance
-        sfx_alnpn,      //painsound
-        S_MNAL_34,      //meleestate
-        S_MNAL_37,      //missilestate
-        S_NULL,     //crashstate
-        S_MDTH_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_alndth,     //deathsound
-        14,     //speed
-        130*FRACUNIT,       //radius
-        200*FRACUNIT,       //height
-        1000,       //mass
-        0,      //damage
-        sfx_alnact,     //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_SHADOW|MF_COUNTKILL|MF_NOTDMATCH
-        |MF_MVIS|MF_SPECTRAL,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_NEST*/
-        26,     //doomednum
-        S_NEST_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        84*FRACUNIT,        //radius
-        47*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_NOTDMATCH,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_POD*/
-        198,        //doomednum
-        S_PODD_00,      //spawnstate
-        1000,       //spawnhealth
-        S_PODD_01,      //seestate
-        sfx_slop,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        25*FRACUNIT,        //radius
-        91*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_NOTDMATCH,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_B_SHOT*/
-        -1,     //doomednum
-        S_ZAP6_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        30*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        70,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_SB_SHOT*/
-        -1,     //doomednum
-        S_ZAP6_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        30*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        20,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_C_SHOT*/
-        -1,     //doomednum
-        S_ZOT3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        30*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        70,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_SC_SHOT*/
-        -1,     //doomednum
-        S_ZOT3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        30*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        20,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_E_OFFSHOOT*/
-        -1,     //doomednum
-        S_ZAP6_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        30*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        10,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_TRAIL*/
-        -1,     //doomednum
-        S_ZAP6_03,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_E_SHOT*/
-        -1,     //doomednum
-        S_ZAP7_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_02,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        18*FRACUNIT,        //speed
-        20*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        130,        //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_SE_SHOT*/
-        -1,     //doomednum
-        S_ZAP7_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_02,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        18*FRACUNIT,        //speed
-        20*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        30,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_A_ZAP_LEFT*/
-        -1,     //doomednum
-        S_ZOT1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_06,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        22*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        24*FRACUNIT,        //height
-        100,        //mass
-        100,        //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_A_ZAP_RIGHT*/
-        -1,     //doomednum
-        S_ZOT1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_06,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        22*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        24*FRACUNIT,        //height
-        100,        //mass
-        50,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_A_GROUND*/
-        -1,     //doomednum
-        S_ZAP5_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        70,     //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        18*FRACUNIT,        //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_SHADOW,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_D_SHOT*/
-        -1,     //doomednum
-        S_ZOT2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        28*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        120,        //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SIGIL_SD_SHOT*/
-        -1,     //doomednum
-        S_ZOT2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_sigil,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sglhit,     //deathsound
-        28*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        60,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE|MF_SPECTRAL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SENTINEL*/
-        3006,       //doomednum
-        S_SEWR_00,      //spawnstate
-        100,        //spawnhealth
-        S_SEWR_01,      //seestate
-        sfx_sntsee,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_SEWR_06,      //painstate
-        255,        //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_SEWR_03,      //missilestate
-        S_NULL,     //crashstate
-        S_SEWR_07,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_sntdth,     //deathsound
-        7,      //speed
-        23*FRACUNIT,        //radius
-        53*FRACUNIT,        //height
-        300,        //mass
-        0,      //damage
-        sfx_sntact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_SPAWNCEILING|MF_NOGRAVITY|MF_GIVEQUEST
-        |MF_FLOAT|MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_STALKER*/
-        186,        //doomednum
-        S_SPID_00,      //spawnstate
-        80,     //spawnhealth
-        S_SPID_03,      //seestate
-        sfx_spisit,     //seesound
-        8,      //reactiontime
-        sfx_spdatk,     //attacksound
-        S_SPID_24,      //painstate
-        40,     //painchance
-        sfx_spdatk,     //painsound
-        S_SPID_09,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_SPID_25,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_spidth,     //deathsound
-        16,     //speed
-        31*FRACUNIT,        //radius
-        25*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_spisit,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_SPAWNCEILING|MF_NOGRAVITY|MF_DROPOFF
-        |MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_INQUISITOR*/
-        16,     //doomednum
-        S_ROB3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_ROB3_02,      //seestate
-        sfx_inqsee,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_ROB3_10,      //missilestate
-        S_NULL,     //crashstate
-        S_ROB3_20,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_inqdth,     //deathsound
-        12,     //speed
-        40*FRACUNIT,        //radius
-        110*FRACUNIT,       //height
-        1000,       //mass
-        0,      //damage
-        sfx_inqact,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_NOBLOOD|MF_COUNTKILL,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_INQARM*/
-        -1,     //doomednum
-        S_RBB3_05,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        25,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOBLOOD,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PROGRAMMER*/
-        71,     //doomednum
-        S_PRGR_00,      //spawnstate
-        1100,       //spawnhealth
-        S_PRGR_02,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_revbld,     //attacksound
-        S_PRGR_18,      //painstate
-        50,     //painchance
-        sfx_prgpn,      //painsound
-        S_PRGR_10,      //meleestate
-        S_PRGR_14,      //missilestate
-        S_NULL,     //crashstate
-        S_PRGR_20,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_rb2dth,     //deathsound
-        26,     //speed
-        45*FRACUNIT,        //radius
-        60*FRACUNIT,        //height
-        800,        //mass
-        4,      //damage
-        sfx_progac,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST|MF_FLOAT
-        |MF_NOBLOOD|MF_COUNTKILL|MF_NOTDMATCH,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PROGRAMMERBASE*/
-        -1,     //doomednum
-        S_BASE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP|MF_NOBLOOD,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_HOOKSHOT*/
-        -1,     //doomednum
-        S_OCLW_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_chain,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_CCLW_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        20*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        14*FRACUNIT,        //height
-        100,        //mass
-        2,      //damage
-        sfx_swish,      //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CHAINSHOT*/
-        -1,     //doomednum
-        S_TEND_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_tend,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MINIMISSLE*/
-        -1,     //doomednum
-        S_MICR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_rlaunc,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_MISL_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_mislht,     //deathsound
-        20*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        14*FRACUNIT,        //height
-        100,        //mass
-        10,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_C_MISSILE*/
-        -1,     //doomednum
-        S_MICR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_rlaunc,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_MISL_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_mislht,     //deathsound
-        20*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        14*FRACUNIT,        //height
-        100,        //mass
-        7,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SEEKMISSILE*/
-        -1,     //doomednum
-        S_MISS_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_rlaunc,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_MISL_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_mislht,     //deathsound
-        20*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        14*FRACUNIT,        //height
-        100,        //mass
-        10,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ELECARROW*/
-        -1,     //doomednum
-        S_AROW_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_swish,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_ZAP1_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_firxpl,     //deathsound
-        30*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        10*FRACUNIT,        //height
-        100,        //mass
-        10,     //damage
-        sfx_swish,      //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_POISARROW*/
-        -1,     //doomednum
-        S_ARWP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_swish,      //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_AROW_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        30*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        10*FRACUNIT,        //height
-        100,        //mass
-        500,        //damage
-        sfx_swish,      //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_R_LASER*/
-        -1,     //doomednum
-        S_SHT1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_POW1_09,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        40*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        8*FRACUNIT,     //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_L_LASER*/
-        -1,     //doomednum
-        S_SHT1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_plasma,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_POW1_05,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        40*FRACUNIT,        //speed
-        10*FRACUNIT,        //radius
-        8*FRACUNIT,     //height
-        100,        //mass
-        1,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_HEGRENADE*/
-        -1,     //doomednum
-        S_GRAP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_phoot,      //seesound
-        30,     //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BNG4_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        15*FRACUNIT,        //speed
-        13*FRACUNIT,        //radius
-        13*FRACUNIT,        //height
-        20,     //mass
-        1,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PGRENADE*/
-        -1,     //doomednum
-        S_GRIN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_phoot,      //seesound
-        40,     //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BNG3_08,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        15*FRACUNIT,        //speed
-        13*FRACUNIT,        //radius
-        13*FRACUNIT,        //height
-        20,     //mass
-        1,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_INQGRENADE*/
-        -1,     //doomednum
-        S_UBAM_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_phoot,      //seesound
-        15,     //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BNG2_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        25*FRACUNIT,        //speed
-        13*FRACUNIT,        //radius
-        13*FRACUNIT,        //height
-        15,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PFLAME*/
-        -1,     //doomednum
-        S_BNG3_09,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        120,        //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_FLBE_07,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TORPEDO*/
-        -1,     //doomednum
-        S_TORP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_protfl,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_THIT_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        20*FRACUNIT,        //speed
-        13*FRACUNIT,        //radius
-        8*FRACUNIT,     //height
-        100,        //mass
-        1,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TORPEDOSPREAD*/
-        -1,     //doomednum
-        S_TWAV_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_TWAV_02,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        35*FRACUNIT,        //speed
-        13*FRACUNIT,        //radius
-        13*FRACUNIT,        //height
-        100,        //mass
-        10,     //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SFIREBALL*/
-        -1,     //doomednum
-        S_FRBL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_flburn,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_FRBL_03,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        15*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        11*FRACUNIT,        //height
-        10,     //mass
-        4,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_C_FLAME*/
-        -1,     //doomednum
-        S_FRBL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_flburn,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_FRBL_03,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        35*FRACUNIT,        //speed
-        8*FRACUNIT,     //radius
-        11*FRACUNIT,        //height
-        50,     //mass
-        1,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_STRIFEPUFF3*/
-        -1,     //doomednum
-        S_SHT2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_STRIFEPUFF*/
-        -1,     //doomednum
-        S_PUFY_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SPARKPUFF*/
-        -1,     //doomednum
-        S_POW3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BLOOD_DEATH*/
-        -1,     //doomednum
-        S_SPRY_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TFOG*/
-        -1,     //doomednum
-        S_TFOG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_IFOG*/
-        -1,     //doomednum
-        S_IFOG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SHADOW,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TELEPORTMAN*/
-        14,     //doomednum
-        S_NULL,     //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOSECTOR|MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_01*/
-        24,     //doomednum
-        S_KLAX_00,      //spawnstate
-        1000,       //spawnhealth
-        S_KLAX_01,      //seestate
-        sfx_None,       //seesound
-        60,     //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_STAND|MF_SPAWNCEILING|MF_NOGRAVITY,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TURRET*/
-        27,     //doomednum
-        S_TURT_00,      //spawnstate
-        125,        //spawnhealth
-        S_TURT_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_TURT_02,      //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_TURT_02,      //missilestate
-        S_NULL,     //crashstate
-        S_BALL_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_mislht,     //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        10000000,       //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SHOOTABLE|MF_STAND|MF_SPAWNCEILING|MF_NOGRAVITY|MF_NOBLOOD
-        |MF_COUNTKILL,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_GATE*/
-        45,     //doomednum
-        S_PSTN_00,      //spawnstate
-        100,        //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_PSTN_02,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        16,     //speed
-        20*FRACUNIT,        //radius
-        76*FRACUNIT,        //height
-        10000000,       //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_GIVEQUEST|MF_NODIALOG|MF_NOBLOOD,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_COMPUTER*/
-        182,        //doomednum
-        S_SECR_00,      //spawnstate
-        80,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_SECR_04,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        27,     //speed
-        26*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100000,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_GIVEQUEST|MF_NODIALOG|MF_NOBLOOD,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_INV_MED1*/
-        2011,       //doomednum
-        S_STMP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        20,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Med_patch",     //namepointer
-    },
-
-    {       /*MT_INV_MED2*/
-        2012,       //doomednum
-        S_MDKT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        15,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Medical_kit",      //namepointer
-    },
-
-    {       /*MT_INV_MED3*/
-        83,     //doomednum
-        S_FULL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        5,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Surgery_Kit",      //namepointer
-    },
-
-    {       /*MT_DEGNINORE*/
-        59,     //doomednum
-        S_XPRK_01,      //spawnstate
-        10,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_XPRK_02,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        10,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,        //flags
-        "Degnin_Ore",       //namepointer
-    },
-
-    {       /*MT_INV_ARMOR2*/
-        2019,       //doomednum
-        S_ARM1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        3,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Metal_Armor",      //namepointer
-    },
-
-    {       /*MT_INV_ARMOR1*/
-        2018,       //doomednum
-        S_ARM2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        5,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Leather_Armor",        //namepointer
-    },
-
-    {       /*MT_MISC_22*/
-        2014,       //doomednum
-        S_WATR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_11*/
-        164,        //doomednum
-        S_MUGG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_KEY_BASE*/
-        230,        //doomednum
-        S_FUSL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Base_Key",     //namepointer
-    },
-
-    {       /*MT_GOVSKEY*/
-        -1,     //doomednum
-        S_REBL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Govs_Key",     //namepointer
-    },
-
-    {       /*MT_KEY_TRAVEL*/
-        185,        //doomednum
-        S_TPAS_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Passcard",     //namepointer
-    },
-
-    {       /*MT_KEY_ID_BLUE*/
-        184,        //doomednum
-        S_CRD1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "ID_Badge",     //namepointer
-    },
-
-    {       /*MT_PRISONKEY*/
-        -1,     //doomednum
-        S_PRIS_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        11,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
-        "Prison_Key",       //namepointer
-    },
-
-    {       /*MT_KEY_HAND*/
-        91,     //doomednum
-        S_HAND_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        12,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
-        "Severed_Hand",     //namepointer
-    },
-
-    {       /*MT_POWER1KEY*/
-        -1,     //doomednum
-        S_PWR1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Power1_Key",       //namepointer
-    },
-
-    {       /*MT_POWER2KEY*/
-        -1,     //doomednum
-        S_PWR2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Power2_Key",       //namepointer
-    },
-
-    {       /*MT_POWER3KEY*/
-        -1,     //doomednum
-        S_PWR3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Power3_Key",       //namepointer
-    },
-
-    {       /*MT_KEY_GOLD*/
-        40,     //doomednum
-        S_KY1G_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Gold_Key",     //namepointer
-    },
-
-    {       /*MT_KEY_ID_GOLD*/
-        13,     //doomednum
-        S_CRD2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "ID_Card",      //namepointer
-    },
-
-    {       /*MT_KEY_SILVER*/
-        38,     //doomednum
-        S_KY2S_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Silver_Key",       //namepointer
-    },
-
-    {       /*MT_KEY_ORACLE*/
-        61,     //doomednum
-        S_ORAC_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Oracle_Key",       //namepointer
-    },
-
-    {       /*MT_MILITARYID*/
-        -1,     //doomednum
-        S_GYID_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Military_ID",      //namepointer
-    },
-
-    {       /*MT_KEY_ORDER*/
-        86,     //doomednum
-        S_FUBR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Order_Key",        //namepointer
-    },
-
-    {       /*MT_KEY_WAREHOUSE*/
-        166,        //doomednum
-        S_WARE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Warehouse_Key",        //namepointer
-    },
-
-    {       /*MT_KEY_BRASS*/
-        39,     //doomednum
-        S_KY3B_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Brass_Key",        //namepointer
-    },
-
-    {       /*MT_KEY_RED_CRYSTAL*/
-        192,        //doomednum
-        S_RCRY_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Red_Crystal_Key",      //namepointer
-    },
-
-    {       /*MT_KEY_BLUE_CRYSTAL*/
-        193,        //doomednum
-        S_BCRY_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Blue_Crystal_Key",     //namepointer
-    },
-
-    {       /*MT_KEY_CHAPEL*/
-        195,        //doomednum
-        S_CHAP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Chapel_Key",       //namepointer
-    },
-
-    {       /*MT_CATACOMBKEY*/
-        -1,     //doomednum
-        S_TUNL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        28,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
-        "Catacomb_Key",     //namepointer
-    },
-
-    {       /*MT_SECURITYKEY*/
-        -1,     //doomednum
-        S_SECK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Security_Key",     //namepointer
-    },
-
-    {       /*MT_KEY_CORE*/
-        236,        //doomednum
-        S_GOID_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Core_Key",     //namepointer
-    },
-
-    {       /*MT_KEY_MAULER*/
-        233,        //doomednum
-        S_BLTK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Mauler_Key",       //namepointer
-    },
-
-    {       /*MT_KEY_FACTORY*/
-        234,        //doomednum
-        S_PROC_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Factory_Key",      //namepointer
-    },
-
-    {       /*MT_KEY_MINE*/
-        235,        //doomednum
-        S_MINE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "MINE_KEY",     //namepointer
-    },
-
-    {       /*MT_NEWKEY5*/
-        -1,     //doomednum
-        S_BLTK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "New_Key5",     //namepointer
-    },
-
-    {       /*MT_INV_SHADOWARMOR*/
-        2024,       //doomednum
-        S_SHD1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        2,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Shadow_armor",     //namepointer
-    },
-
-    {       /*MT_INV_SUIT*/
-        2025,       //doomednum
-        S_MASK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        5,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Environmental_Suit",       //namepointer
-    },
-
-    {       /*MT_QUEST_UNIFORM*/
-        90,     //doomednum
-        S_UNIF_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        15,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST,        //flags
-        "Guard_Uniform",        //namepointer
-    },
-
-    {       /*MT_QUEST_GUARD_UNIFORM*/
-        52,     //doomednum
-        S_OFIC_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Officer's_Uniform",        //namepointer
-    },
-
-    {       /*MT_INV_SUPERMAP*/
-        2026,       //doomednum
-        S_PMAP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "map",      //namepointer
-    },
-
-    {       /*MT_INV_RADAR*/
-        2027,       //doomednum
-        S_PMUP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        1,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "scanner",      //namepointer
-    },
-
-    {       /*MT_BEACON*/
-        10,     //doomednum
-        S_BEAC_00,      //spawnstate
-        5,      //spawnhealth
-        S_BEAC_01,      //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        3,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_DROPPED,      //flags
-        "Teleporter_Beacon",        //namepointer
-    },
-
-    {       /*MT_INV_TARGETER*/
-        207,        //doomednum
-        S_TARG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        5,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Targeter",     //namepointer
-    },
-
-    {       /*MT_MONY_1*/
-        93,     //doomednum
-        S_COIN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        2147483647,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
-        "coin",     //namepointer
-    },
-
-    {       /*MT_MONY_10*/
-        138,        //doomednum
-        S_CRED_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
-        "10_gold",       //namepointer
-    },
-
-    {       /*MT_MONY_25*/
-        139,        //doomednum
-        S_SACK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
-        "25_gold",       //namepointer
-    },
-
-    {       /*MT_MONY_50*/
-        140,        //doomednum
-        S_CHST_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_DROPPED|MF_NOTDMATCH,      //flags
-        "50_gold",       //namepointer
-    },
-
-    {       /*MT_MONY_300*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        3,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_DROPPED,     //flags
-        "300_gold",      //namepointer
-    },
-
-    {       /*MT_TOKEN_RING*/
-        -1,     //doomednum
-        S_RING_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        1,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_NOTDMATCH,        //flags
-        "ring",     //namepointer
-    },
-
-    {       /*MT_INV_CHALICE*/
-        205,        //doomednum
-        S_RELC_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        2,      //speed
-        10*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_DROPPED,     //flags
-        "Offering_Chalice",      //namepointer
-    },
-
-    {       /*MT_TOKEN_EAR*/
-        -1,     //doomednum
-        S_EARS_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        9,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST,        //flags
-        "ear",      //namepointer
-    },
-
-    {       /*MT_INV_COMMUNICATOR*/
-        206,        //doomednum
-        S_COMM_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_NOTDMATCH,     //flags
-        "Communicator",        //namepointer
-    },
-
-    {       /*MT_AGREN*/
-        152,        //doomednum
-        S_GRN1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "HE-Grenade_Rounds",        //namepointer
-    },
-
-    {       /*MT_APGREN*/
-        153,        //doomednum
-        S_GRN2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Phosphorus-Grenade_Rounds",     //namepointer
-    },
-
-    {       /*MT_ACLIP*/
-        2007,       //doomednum
-        S_BLIT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "clip_of_bullets",      //namepointer
-    },
-
-    {       /*MT_AAMMOBOX*/
-        2048,       //doomednum
-        S_BBOX_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "ammo",       //namepointer
-    },
-
-    {       /*MT_AMINI*/
-        2010,       //doomednum
-        S_MSSL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "mini_missiles",        //namepointer
-    },
-
-    {       /*MT_AMINIBOX*/
-        2046,       //doomednum
-        S_ROKT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "crate_of_missiles",        //namepointer
-    },
-
-    {       /*MT_ACELL*/
-        2047,       //doomednum
-        S_BRY1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "energy_pod",       //namepointer
-    },
-
-    {       /*MT_APCELL*/
-        17,     //doomednum
-        S_CPAC_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "energy_pack",      //namepointer
-    },
-
-    {       /*MT_APAROW*/
-        115,        //doomednum
-        S_PQRL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "poison_bolts",     //namepointer
-    },
-
-    {       /*MT_AAROW*/
-        114,        //doomednum
-        S_XQRL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "electric_bolts",       //namepointer
-    },
-
-    {       /*MT_INV_SATCHEL*/
-        183,        //doomednum
-        S_BKPK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "ammo_satchel",     //namepointer
-    },
-
-    {       /*MT_PULSE*/
-        2002,       //doomednum
-        S_RIFL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "assault_gun",      //namepointer
-    },
-
-    {       /*MT_RIFLESTAND*/
-        2006,       //doomednum
-        S_RIFL_01,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "assault_gun",      //namepointer
-    },
-
-    {       /*MT_FLAMETHROWER*/
-        2005,       //doomednum
-        S_FLAM_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "flame_thrower",        //namepointer
-    },
-
-    {       /*MT_TOKEN_FLAME_THROWER_PARTS*/
-        -1,     //doomednum
-        S_BFLM_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "flame_thrower_parts",      //namepointer
-    },
-
-    {       /*MT_MISSILELAUNCHER*/
-        2003,       //doomednum
-        S_MMSL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "mini_missile_launcher",        //namepointer
-    },
-
-    {       /*MT_BLASTER*/
-        2004,       //doomednum
-        S_TRPD_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "mauler",       //namepointer
-    },
-
-    {       /*MT_CROSSBOW*/
-        2001,       //doomednum
-        S_CBOW_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "crossbow",     //namepointer
-    },
-
-    {       /*MT_GRENADELAUNCHER*/
-        154,        //doomednum
-        S_GRND_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Grenade_launcher",     //namepointer
-    },
-
-    {       /*MT_SIGIL_A*/
-        77,     //doomednum
-        S_SIGL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "SIGIL",        //namepointer
-    },
-
-    {       /*MT_SIGIL_B*/
-        78,     //doomednum
-        S_SIGL_01,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "SIGIL",        //namepointer
-    },
-
-    {       /*MT_SIGIL_C*/
-        79,     //doomednum
-        S_SIGL_02,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "SIGIL",        //namepointer
-    },
-
-    {       /*MT_SIGIL_D*/
-        80,     //doomednum
-        S_SIGL_03,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "SIGIL",        //namepointer
-    },
-
-    {       /*MT_SIGIL_E*/
-        81,     //doomednum
-        S_SIGL_04,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "SIGIL",        //namepointer
-    },
-
-    {       /*MT_POWER_CRYSTAL*/
-        92,     //doomednum
-        S_CRYS_00,      //spawnstate
-        50,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BOOM_00,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_explod,     //deathsound
-        14,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        99999999,       //mass
-        0,      //damage
-        sfx_reactr,     //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NOGRAVITY|MF_GIVEQUEST|MF_NOBLOOD,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RAT*/
-        85,     //doomednum
-        S_RATT_00,      //spawnstate
-        5,      //spawnhealth
-        S_RATT_01,      //seestate
-        sfx_ratact,     //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_RATT_05,      //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_MEAT_16,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_ratact,     //deathsound
-        13,     //speed
-        10*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_ratact,     //activesound
-        MF_NODIALOG|MF_NOBLOOD|MF_COUNTKILL,        //flags
-        "rat_buddy",        //namepointer
-    },
-
-    {       /*MT_MISC_05*/
-        82,     //doomednum
-        S_BARW_00,      //spawnstate
-        10,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BARW_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_wbrldt,     //deathsound
-        0,      //speed
-        10*FRACUNIT,        //radius
-        32*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_06*/
-        94,     //doomednum
-        S_BART_00,      //spawnstate
-        30,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_BART_01,      //deathstate
-        S_NULL,     //xdeathstate
-        sfx_barexp,     //deathsound
-        0,      //speed
-        10*FRACUNIT,        //radius
-        32*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_15*/
-        208,        //doomednum
-        S_HOGN_00,      //spawnstate
-        99999999,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_HOGN_01,      //painstate
-        255,        //painchance
-        sfx_mtalht,     //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        10*FRACUNIT,        //radius
-        72*FRACUNIT,        //height
-        9999999,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_NODIALOG|MF_NOBLOOD,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT14*/
-        95,     //doomednum
-        S_LITS_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        4*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT13*/
-        96,     //doomednum
-        S_LITB_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        4*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT12*/
-        97,     //doomednum
-        S_LITG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        4*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT18*/
-        2028,       //doomednum
-        S_LITE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR2*/
-        48,     //doomednum
-        S_MONI_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR3*/
-        54,     //doomednum
-        S_STEL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR4*/
-        55,     //doomednum
-        S_STLA_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        80*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR5*/
-        56,     //doomednum
-        S_STLE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR6*/
-        57,     //doomednum
-        S_HUGE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        24*FRACUNIT,        //radius
-        192*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR7*/
-        227,        //doomednum
-        S_APOW_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        24*FRACUNIT,        //radius
-        192*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_amaln2,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE2*/
-        98,     //doomednum
-        S_STLG_02,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        54*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE3*/
-        161,        //doomednum
-        S_STLG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE4*/
-        160,        //doomednum
-        S_STLG_01,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE6*/
-        159,        //doomednum
-        S_STLG_03,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE7*/
-        162,        //doomednum
-        S_STLG_04,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE5*/
-        163,        //doomednum
-        S_STLG_05,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        25*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT2*/
-        34,     //doomednum
-        S_CNDL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT3*/
-        35,     //doomednum
-        S_CLBR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_03*/
-        103,        //doomednum
-        S_DRIP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_wdrip,      //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_13*/
-        104,        //doomednum
-        S_SPLH_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_wfall,      //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_02*/
-        53,     //doomednum
-        S_CDRP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        1*FRACUNIT,     //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_SPAWNCEILING|MF_NOGRAVITY,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_07*/
-        112,        //doomednum
-        S_WTFT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_wsplsh,     //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BIO2*/
-        113,        //doomednum
-        S_HERT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TELEPORTSTAND*/
-        23,     //doomednum
-        S_TELP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_SHADOW,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_DEADTHING1*/
-        22,     //doomednum
-        S_ROB2_28,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_DEADTHING2*/
-        15,     //doomednum
-        S_PLAY_18,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_DEADTHING3*/
-        18,     //doomednum
-        S_PEAS_24,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_DEADTHING4*/
-        21,     //doomednum
-        S_AGRD_31,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_DEADTHING5*/
-        20,     //doomednum
-        S_ROB1_25,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_DEADTHING6*/
-        19,     //doomednum
-        S_HMN1_31,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BIO1*/
-        212,        //doomednum
-        S_SACR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_GIBS*/
-        54,     //doomednum
-        S_DEAD_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_04*/
-        70,     //doomednum
-        S_BARL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        48*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT11*/
-        105,        //doomednum
-        S_BOWL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_smfire,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT10*/
-        106,        //doomednum
-        S_BRAZ_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        10*FRACUNIT,        //radius
-        32*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_smfire,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT9*/
-        107,        //doomednum
-        S_TRCH_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        0*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_smfire,     //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT8*/
-        108,        //doomednum
-        S_TRHO_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        0*FRACUNIT,     //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_14*/
-        109,        //doomednum
-        S_CHAN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        93*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_SPAWNCEILING|MF_NOGRAVITY,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT1*/
-        28,     //doomednum
-        S_CAGE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        3*FRACUNIT,     //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_SPAWNCEILING|MF_NOGRAVITY,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR8*/
-        110,        //doomednum
-        S_STAT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR9*/
-        44,     //doomednum
-        S_DSTA_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT15*/
-        111,        //doomednum
-        S_LTRH_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        4*FRACUNIT,     //radius
-        72*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT4*/
-        43,     //doomednum
-        S_LAMP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        3*FRACUNIT,     //radius
-        80*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT5*/
-        46,     //doomednum
-        S_LANT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        3*FRACUNIT,     //radius
-        80*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ROCK1*/
-        99,     //doomednum
-        S_ROK1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ROCK2*/
-        100,        //doomednum
-        S_ROK2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ROCK3*/
-        101,        //doomednum
-        S_ROK3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_ROCK4*/
-        102,        //doomednum
-        S_ROK4_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE7*/
-        215,        //doomednum
-        S_LOGG_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_wriver,     //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE1*/
-        29,     //doomednum
-        S_RUB1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE2*/
-        30,     //doomednum
-        S_RUB2_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE3*/
-        31,     //doomednum
-        S_RUB3_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE4*/
-        32,     //doomednum
-        S_RUB4_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE5*/
-        36,     //doomednum
-        S_RUB5_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE6*/
-        37,     //doomednum
-        S_RUB6_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE7*/
-        41,     //doomednum
-        S_RUB7_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_RUBBLE8*/
-        42,     //doomednum
-        S_RUB8_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_08*/
-        117,        //doomednum
-        S_CRAB_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT6*/
-        47,     //doomednum
-        S_LMPC_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        10*FRACUNIT,        //radius
-        72*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_smfire,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT7*/
-        50,     //doomednum
-        S_LOGS_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        10*FRACUNIT,        //radius
-        80*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_smfire,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE2*/
-        51,     //doomednum
-        S_TREE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        15*FRACUNIT,        //radius
-        109*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE3*/
-        202,        //doomednum
-        S_TREE_01,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        15*FRACUNIT,        //radius
-        109*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE4*/
-        203,        //doomednum
-        S_TREE_02,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        15*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE1*/
-        33,     //doomednum
-        S_TRE1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        15*FRACUNIT,        //radius
-        80*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE6*/
-        60,     //doomednum
-        S_BUSH_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        15*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TREE5*/
-        62,     //doomednum
-        S_SHRB_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_CAVE1*/
-        63,     //doomednum
-        S_STAK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR1*/
-        69,     //doomednum
-        S_BAR1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_10*/
-        165,        //doomednum
-        S_VASE_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        12*FRACUNIT,        //radius
-        24*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_09*/
-        188,        //doomednum
-        S_VASE_01,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        12*FRACUNIT,        //radius
-        32*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_17*/
-        189,        //doomednum
-        S_STOL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        6*FRACUNIT,     //radius
-        24*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_18*/
-        190,        //doomednum
-        S_POT1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_19*/
-        191,        //doomednum
-        S_TUB1_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_20*/
-        194,        //doomednum
-        S_ANVL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        32*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT16*/
-        196,        //doomednum
-        S_TLMP_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        11*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT17*/
-        197,        //doomednum
-        S_TLMP_01,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        8*FRACUNIT,     //radius
-        64*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_21*/
-        68,     //doomednum
-        S_TRAY_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        24*FRACUNIT,        //radius
-        40*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_12*/
-        228,        //doomednum
-        S_AFED_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        12*FRACUNIT,        //radius
-        24*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_26*/
-        216,        //doomednum
-        S_SBAN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        24*FRACUNIT,        //radius
-        96*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_23*/
-        217,        //doomednum
-        S_BOTR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_24*/
-        218,        //doomednum
-        S_HATR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MISC_25*/
-        219,        //doomednum
-        S_TOPR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_COUPLING*/
-        220,        //doomednum
-        S_COUP_00,      //spawnstate
-        40,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        6,      //speed
-        17*FRACUNIT,        //radius
-        64*FRACUNIT,        //height
-        999999,     //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SOLID|MF_SHOOTABLE|MF_GIVEQUEST|MF_NODIALOG|MF_DROPPED
-        |MF_NOBLOOD|MF_NOTDMATCH,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_COUPLING_BROKEN*/
-        226,        //doomednum
-        S_COUP_02,      //spawnstate
-        40,     //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        512*FRACUNIT,       //speed
-        16*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        1,      //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST|MF_DROPPED,     //flags
-        "BROKEN_POWER_COUPLING",        //namepointer
-    },
-
-    {       /*MT_PILLAR10*/
-        221,        //doomednum
-        S_BUBB_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_amaln5,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR11*/
-        222,        //doomednum
-        S_BUBF_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        72*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_amaln6,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR12*/
-        223,        //doomednum
-        S_BUBF_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        72*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_amaln4,     //activesound
-        MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_PILLAR13*/
-        224,        //doomednum
-        S_ASPR_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        16*FRACUNIT,        //radius
-        128*FRACUNIT,       //height
-        100,        //mass
-        0,      //damage
-        sfx_amaln3,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_LIGHT19*/
-        225,        //doomednum
-        S_SPDL_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        32*FRACUNIT,        //radius
-        56*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_amaln1,     //activesound
-        MF_SOLID,       //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_MEAT*/
-        -1,     //doomednum
-        S_MEAT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_JUNK*/
-        -1,     //doomednum
-        S_JUNK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_BURNDROP*/
-        -1,     //doomednum
-        S_FFOT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_NOBLOCKMAP|MF_NOCLIP,        //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_AMMO*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Ammo",       //namepointer
-    },
-
-    {       /*MT_TOKEN_HEALTH*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Health",     //namepointer
-    },
-
-    {       /*MT_TOKEN*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "info",     //namepointer
-    },
-
-    {       /*MT_TOKEN_ALARM*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "alarm",        //namepointer
-    },
-
-    {       /*MT_TOKEN_DOOR1*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_SHOPCLOSE*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_PRISON_PASS*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        10,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST,        //flags
-        "Prison_pass",      //namepointer
-    },
-
-    {       /*MT_TOKEN_DOOR3*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_STAMINA*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_NEW_ACCURACY*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_REPORT*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "report",       //namepointer
-    },
-
-    {       /*MT_TOKEN_TOUGHNESS*/
-        -1,     //doomednum
-        S_HELT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Toughness",        //namepointer
-    },
-
-    {       /*MT_TOKEN_ACCURACY*/
-        -1,     //doomednum
-        S_GUNT_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        "Accuracy",     //namepointer
-    },
-
-    {       /*MT_TOKEN_ORACLE_PASS*/
-        -1,     //doomednum
-        S_OTOK_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        18,     //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL|MF_GIVEQUEST,        //flags
-        "Oracle_Pass",      //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST1*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST2*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST3*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST4*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "quest4",       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST5*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "quest5",       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST6*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "quest6",       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST7*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST8*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST9*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST10*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST11*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST12*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST13*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_CRYSTAL*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You've_Blown_Up_the_Crystal",     //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST15*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_GATEQUEST*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You've_Blown_Up_the_Gates",       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST17*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST18*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST19*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST20*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_BISHOP*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You_Killed_the_Bishop!",        //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST22*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_ORACLE*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You've_Killed_The_Oracle!",        //namepointer
-    },
-
-    {       /*MT_TOKEN_MACIL*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You_Killed_Macil!",     //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST25*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_LOREMASTER*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You've_Killed_The_Loremaster!",        //namepointer
-    },
-
-    {       /*MT_SECRQUEST*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        "You've_Blown_Up_the_Computer",      //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST28*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST29*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST30*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_TOKEN_QUEST31*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        0,      //flags
-        NULL,       //namepointer
-    },
-
-    {       /*MT_SLIDESHOW*/
-        -1,     //doomednum
-        S_TOKN_00,      //spawnstate
-        1000,       //spawnhealth
-        S_NULL,     //seestate
-        sfx_None,       //seesound
-        8,      //reactiontime
-        sfx_None,       //attacksound
-        S_NULL,     //painstate
-        0,      //painchance
-        sfx_None,       //painsound
-        S_NULL,     //meleestate
-        S_NULL,     //missilestate
-        S_NULL,     //crashstate
-        S_NULL,     //deathstate
-        S_NULL,     //xdeathstate
-        sfx_None,       //deathsound
-        0,      //speed
-        20*FRACUNIT,        //radius
-        16*FRACUNIT,        //height
-        100,        //mass
-        0,      //damage
-        sfx_None,       //activesound
-        MF_SPECIAL,     //flags
-        NULL,       //namepointer
-    },
-
-};
-
-
-
diff --git a/games/NXDoom/src/strife/info.h b/games/NXDoom/src/strife/info.h
deleted file mode 100644
index 4c8edc7b6..000000000
--- a/games/NXDoom/src/strife/info.h
+++ /dev/null
@@ -1,2219 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Thing frame/state LUT,
-//	generated by multigen utilitiy.
-//	This one is the original DOOM version, preserved.
-//
-
-#ifndef __INFO__
-#define __INFO__
-
-// Needed for action function pointer handling.
-#include "d_think.h"
-
-// villsa [STRIFE]
-typedef enum
-{
-    SPR_PLAY, // 0
-    SPR_PNCH, // 1
-    SPR_WAVE, // 2
-    SPR_RBPY, // 3
-    SPR_TRGT, // 4
-    SPR_XBOW, // 5
-    SPR_MMIS, // 6
-    SPR_RIFG, // 7
-    SPR_RIFF, // 8
-    SPR_FLMT, // 9
-    SPR_FLMF, // 10
-    SPR_BLST, // 11
-    SPR_BLSF, // 12
-    SPR_GREN, // 13
-    SPR_GREF, // 14
-    SPR_SIGH, // 15
-    SPR_SIGF, // 16
-    SPR_POW1, // 17
-    SPR_POW2, // 18
-    SPR_POW3, // 19
-    SPR_ZAP1, // 20
-    SPR_SPRY, // 21
-    SPR_BLOD, // 22
-    SPR_PUFY, // 23
-    SPR_SHT1, // 24
-    SPR_SHT2, // 25
-    SPR_GRIN, // 26
-    SPR_GRAP, // 27
-    SPR_UBAM, // 28
-    SPR_BNG2, // 29
-    SPR_BNG4, // 30
-    SPR_BNG3, // 31
-    SPR_FLBE, // 32
-    SPR_XPRK, // 33
-    SPR_OCLW, // 34
-    SPR_CCLW, // 35
-    SPR_TEND, // 36
-    SPR_MICR, // 37
-    SPR_MISS, // 38
-    SPR_AROW, // 39
-    SPR_ARWP, // 40
-    SPR_TORP, // 41
-    SPR_THIT, // 42
-    SPR_TWAV, // 43
-    SPR_MISL, // 44
-    SPR_TFOG, // 45
-    SPR_IFOG, // 46
-    SPR_SHRD, // 47
-    SPR_RGIB, // 48
-    SPR_MRYS, // 49
-    SPR_MRNO, // 50
-    SPR_MRST, // 51
-    SPR_MRLK, // 52
-    SPR_MRBD, // 53
-    SPR_MRPN, // 54
-    SPR_MRGT, // 55
-    SPR_BURN, // 56
-    SPR_DISR, // 57
-    SPR_PEAS, // 58
-    SPR_GIBS, // 59
-    SPR_AGRD, // 60
-    SPR_ARMR, // 61
-    SPR_SACR, // 62
-    SPR_TNK1, // 63
-    SPR_TNK2, // 64
-    SPR_TNK3, // 65
-    SPR_TNK4, // 66
-    SPR_TNK5, // 67
-    SPR_TNK6, // 68
-    SPR_NEAL, // 69
-    SPR_BEGR, // 70
-    SPR_HMN1, // 71
-    SPR_LEDR, // 72
-    SPR_LEAD, // 73
-    SPR_ROB1, // 74
-    SPR_PGRD, // 75
-    SPR_ROB2, // 76
-    SPR_MLDR, // 77
-    SPR_ORCL, // 78
-    SPR_PRST, // 79
-    SPR_PDED, // 80
-    SPR_ALN1, // 81
-    SPR_AL1P, // 82
-    SPR_NODE, // 83
-    SPR_MTHD, // 84
-    SPR_MNAM, // 85
-    SPR_MNAL, // 86
-    SPR_MDTH, // 87
-    SPR_NEST, // 88
-    SPR_PODD, // 89
-    SPR_ZAP6, // 90
-    SPR_ZOT3, // 91
-    SPR_ZAP7, // 92
-    SPR_ZOT1, // 93
-    SPR_ZAP5, // 94
-    SPR_ZOT2, // 95
-    SPR_SEWR, // 96
-    SPR_SPID, // 97
-    SPR_ROB3, // 98
-    SPR_RBB3, // 99
-    SPR_PRGR, // 100
-    SPR_BASE, // 
-    SPR_FRBL, // 
-    SPR_KLAX, // 
-    SPR_TURT, // 
-    SPR_BALL, // 105
-    SPR_PSTN, // 
-    SPR_SECR, // 
-    SPR_TARG, // 
-    SPR_RING, // 
-    SPR_EARS, // 110
-    SPR_COMM, // 
-    SPR_BOOM, // 
-    SPR_RATT, // 
-    SPR_HOGN, // 
-    SPR_DEAD, // 115
-    SPR_SBAN, // 
-    SPR_BOTR, // 
-    SPR_HATR, // 
-    SPR_TOPR, // 
-    SPR_COUP, // 120
-    SPR_BUBB, // 
-    SPR_BUBF, // 
-    SPR_BUBC, // 
-    SPR_ASPR, // 
-    SPR_SPDL, // 125
-    SPR_TOKN, // 
-    SPR_OTOK, // 
-    SPR_HELT, // 
-    SPR_GUNT, // 
-    SPR_FULL, // 130
-    SPR_MEAT, // 
-    SPR_JUNK, // 
-    SPR_FFOT, // 
-    SPR_DIE1, // 
-    SPR_BEAC, // 135
-    SPR_ARM1, // 
-    SPR_ARM2, // 
-    SPR_BARW, // 
-    SPR_BART, // 
-    SPR_LAMP, // 140
-    SPR_LANT, // 
-    SPR_BARL, // 
-    SPR_BOWL, // 
-    SPR_BRAZ, // 
-    SPR_TRCH, // 145
-    SPR_LTRH, // 
-    SPR_LMPC, // 
-    SPR_LOGS, // 
-    SPR_TRHO, // 
-    SPR_WATR, // 150
-    SPR_MUGG, // 
-    SPR_FUSL, // 
-    SPR_CRD1, // 
-    SPR_CRD2, // 
-    SPR_TPAS, // 155
-    SPR_KY1G, // 
-    SPR_KY2S, // 
-    SPR_KY3B, // 
-    SPR_HAND, // 
-    SPR_CRYS, // 160
-    SPR_PRIS, // 
-    SPR_PWR1, // 
-    SPR_PWR2, // 
-    SPR_PWR3, // 
-    SPR_ORAC, // 165
-    SPR_GYID, // 
-    SPR_FUBR, // 
-    SPR_WARE, // 
-    SPR_RCRY, // 
-    SPR_BCRY, // 170
-    SPR_CHAP, // 
-    SPR_TUNL, // 
-    SPR_BLTK, // 
-    SPR_SECK, // 
-    SPR_MINE, // 175
-    SPR_REBL, // 
-    SPR_PROC, // 
-    SPR_ANKH, // 
-    SPR_GOID, // 
-    SPR_STMP, // 180
-    SPR_MDKT, // 
-    SPR_COIN, // 
-    SPR_CRED, // 
-    SPR_SACK, // 
-    SPR_CHST, // 185
-    SPR_SHD1, // 
-    SPR_MASK, // 
-    SPR_UNIF, // 
-    SPR_OFIC, // 
-    SPR_PMAP, // 190
-    SPR_PMUP, // 
-    SPR_BLIT, // 
-    SPR_BBOX, // 
-    SPR_MSSL, // 
-    SPR_ROKT, // 195
-    SPR_BRY1, // 
-    SPR_CPAC, // 
-    SPR_PQRL, // 
-    SPR_XQRL, // 
-    SPR_GRN1, // 200
-    SPR_GRN2, // 
-    SPR_BKPK, // 
-    SPR_RELC, // 
-    SPR_RIFL, // 
-    SPR_FLAM, // 205
-    SPR_BFLM, // 
-    SPR_MMSL, // 
-    SPR_TRPD, // 
-    SPR_GRND, // 
-    SPR_CBOW, // 210
-    SPR_SIGL, // 
-    SPR_LITE, // 
-    SPR_CNDL, // 
-    SPR_CLBR, // 
-    SPR_LITS, // 215
-    SPR_LITB, // 
-    SPR_LITG, // 
-    SPR_ROK1, // 
-    SPR_ROK2, // 
-    SPR_ROK3, // 220
-    SPR_ROK4, // 
-    SPR_LOGG, // 
-    SPR_RUB1, // 
-    SPR_RUB2, // 
-    SPR_RUB3, // 225
-    SPR_RUB4, // 
-    SPR_RUB5, // 
-    SPR_RUB6, // 
-    SPR_RUB7, // 
-    SPR_RUB8, // 230
-    SPR_CHAN, // 
-    SPR_STAT, // 
-    SPR_DSTA, // 
-    SPR_CRAB, // 
-    SPR_CAGE, // 235
-    SPR_TREE, // 
-    SPR_TRE1, // 
-    SPR_BUSH, // 
-    SPR_SHRB, // 
-    SPR_STAK, // 240
-    SPR_BAR1, // 
-    SPR_VASE, // 
-    SPR_STOL, // 
-    SPR_POT1, // 
-    SPR_TUB1, // 245
-    SPR_ANVL, // 
-    SPR_TLMP, // 
-    SPR_TRAY, // 
-    SPR_APOW, // 
-    SPR_AFED, // 250
-    SPR_DRIP, // 
-    SPR_CDRP, // 
-    SPR_SPLH, // 
-    SPR_WTFT, // 
-    SPR_HERT, // 
-    SPR_TELP, // 
-    SPR_MONI, // 
-    SPR_STEL, // 
-    SPR_STLA, // 
-    SPR_STLE, // 260
-    SPR_HUGE, // 261
-    SPR_STLG, // 262
-    NUMSPRITES
-
-} spritenum_t;
-
-// villsa [STRIFE]
-typedef enum
-{
-    S_NULL,     // 00
-    S_PNCH_00,      // 01
-    S_WAVE_00,      // 02
-    S_WAVE_01,      // 03
-    S_WAVE_02,      // 04
-    S_WAVE_03,      // 05
-    S_RBPY_00,      // 06
-    S_RBPY_01,      // 07
-    S_RBPY_02,      // 08
-    S_RBPY_03,      // 09
-    S_TRGT_00,      // 10
-    S_TRGT_01,      // 11
-    S_TRGT_02,      // 12
-    S_PNCH_01,      // 13
-    S_PNCH_02,      // 14
-    S_PNCH_03,      // 15
-    S_PNCH_04,      // 16
-    S_PNCH_05,      // 17
-    S_PNCH_06,      // 18
-    S_PNCH_07,      // 19
-    S_PNCH_08,      // 20
-    S_XBOW_00,      // 21
-    S_XBOW_01,      // 22
-    S_XBOW_02,      // 23
-    S_XBOW_03,      // 24
-    S_XBOW_04,      // 25
-    S_XBOW_05,      // 26
-    S_XBOW_06,      // 27
-    S_XBOW_07,      // 28
-    S_XBOW_08,      // 29
-    S_XBOW_09,      // 30
-    S_XBOW_10,      // 31
-    S_XBOW_11,      // 32
-    S_XBOW_12,      // 33
-    S_XBOW_13,      // 34
-    S_XBOW_14,      // 35
-    S_XBOW_15,      // 36
-    S_XBOW_16,      // 37
-    S_XBOW_17,      // 38
-    S_XBOW_18,      // 39
-    S_XBOW_19,      // 40
-    S_XBOW_20,      // 41
-    S_XBOW_21,      // 42
-    S_XBOW_22,      // 43
-    S_MMIS_00,      // 44
-    S_MMIS_01,      // 45
-    S_MMIS_02,      // 46
-    S_MMIS_03,      // 47
-    S_MMIS_04,      // 48
-    S_MMIS_05,      // 49
-    S_MMIS_06,      // 50
-    S_MMIS_07,      // 51
-    S_MMIS_08,      // 52
-    S_MMIS_09,      // 53
-    S_RIFG_00,      // 54
-    S_RIFG_01,      // 55
-    S_RIFG_02,      // 56
-    S_RIFF_00,      // 57
-    S_RIFF_01,      // 58
-    S_RIFG_03,      // 59
-    S_RIFG_04,      // 60
-    S_RIFG_05,      // 61
-    S_FLMT_00,      // 62
-    S_FLMT_01,      // 63
-    S_FLMT_02,      // 64
-    S_FLMT_03,      // 65
-    S_FLMF_00,      // 66
-    S_FLMF_01,      // 67
-    S_BLST_00,      // 68
-    S_BLST_01,      // 69
-    S_BLST_02,      // 70
-    S_BLST_03,      // 71
-    S_BLST_04,      // 72
-    S_BLST_05,      // 73
-    S_BLSF_00,      // 74
-    S_BLST_06,      // 75
-    S_BLST_07,      // 76
-    S_BLST_08,      // 77
-    S_BLST_09,      // 78
-    S_BLST_10,      // 79
-    S_BLST_11,      // 80
-    S_BLST_12,      // 81
-    S_BLST_13,      // 82
-    S_BLST_14,      // 83
-    S_BLST_15,      // 84
-    S_BLST_16,      // 85
-    S_BLST_17,      // 86
-    S_BLST_18,      // 87
-    S_BLST_19,      // 88
-    S_BLST_20,      // 89
-    S_BLSF_01,      // 90
-    S_BLST_21,      // 91
-    S_BLST_22,      // 92
-    S_BLST_23,      // 93
-    S_BLST_24,      // 94
-    S_GREN_00,      // 95
-    S_GREN_01,      // 96
-    S_GREN_02,      // 97
-    S_GREN_03,      // 98
-    S_GREN_04,      // 99
-    S_GREN_05,      // 100
-    S_GREN_06,      // 101
-    S_GREN_07,      // 102
-    S_GREF_00,      // 103
-    S_GREF_01,      // 104
-    S_GREF_02,      // 105
-    S_GREN_08,      // 106
-    S_GREN_09,      // 107
-    S_GREN_10,      // 108
-    S_GREN_11,      // 109
-    S_GREN_12,      // 110
-    S_GREN_13,      // 111
-    S_GREN_14,      // 112
-    S_GREN_15,      // 113
-    S_GREF_03,      // 114
-    S_GREF_04,      // 115
-    S_GREF_05,      // 116
-    S_SIGH_00,      // 117
-    S_SIGH_01,      // 118
-    S_SIGH_02,      // 119
-    S_SIGH_03,      // 120
-    S_SIGH_04,      // 121
-    S_SIGH_05,      // 122
-    S_SIGH_06,      // 123
-    S_SIGH_07,      // 124
-    S_SIGH_08,      // 125
-    S_SIGH_09,      // 126
-    S_SIGH_10,      // 127
-    S_SIGF_00,      // 128
-    S_SIGF_01,      // 129
-    S_SIGF_02,      // 130
-    S_POW1_00,      // 131
-    S_POW1_01,      // 132
-    S_POW1_02,      // 133
-    S_POW1_03,      // 134
-    S_POW1_04,      // 135
-    S_POW1_05,      // 136
-    S_POW1_06,      // 137
-    S_POW1_07,      // 138
-    S_POW1_08,      // 139
-    S_POW1_09,      // 140
-    S_POW2_00,      // 141
-    S_POW2_01,      // 142
-    S_POW2_02,      // 143
-    S_POW2_03,      // 144
-    S_POW3_00,      // 145
-    S_POW3_01,      // 146
-    S_POW3_02,      // 147
-    S_POW3_03,      // 148
-    S_POW3_04,      // 149
-    S_POW3_05,      // 150
-    S_POW3_06,      // 151
-    S_POW3_07,      // 152
-    S_ZAP1_00,      // 153
-    S_ZAP1_01,      // 154
-    S_ZAP1_02,      // 155
-    S_ZAP1_03,      // 156
-    S_ZAP1_04,      // 157
-    S_ZAP1_05,      // 158
-    S_ZAP1_06,      // 159
-    S_ZAP1_07,      // 160
-    S_ZAP1_08,      // 161
-    S_ZAP1_09,      // 162
-    S_ZAP1_10,      // 163
-    S_ZAP1_11,      // 164
-    S_SPRY_00,      // 165
-    S_SPRY_01,      // 166
-    S_SPRY_02,      // 167
-    S_SPRY_03,      // 168
-    S_SPRY_04,      // 169
-    S_SPRY_05,      // 170
-    S_SPRY_06,      // 171
-    S_BLOD_00,      // 172
-    S_BLOD_01,      // 173
-    S_BLOD_02,      // 174
-    S_PUFY_00,      // 175
-    S_PUFY_01,      // 176
-    S_PUFY_02,      // 177
-    S_PUFY_03,      // 178
-    S_SHT1_00,      // 179
-    S_SHT1_01,      // 180
-    S_SHT2_00,      // 181
-    S_SHT2_01,      // 182
-    S_GRIN_00,      // 183
-    S_GRIN_01,      // 184
-    S_GRAP_00,      // 185
-    S_GRAP_01,      // 186
-    S_UBAM_00,      // 187
-    S_UBAM_01,      // 188
-    S_BNG2_00,      // 189
-    S_BNG2_01,      // 190
-    S_BNG2_02,      // 191
-    S_BNG2_03,      // 192
-    S_BNG2_04,      // 193
-    S_BNG2_05,      // 194
-    S_BNG2_06,      // 195
-    S_BNG2_07,      // 196
-    S_BNG2_08,      // 197
-    S_BNG4_00,      // 198
-    S_BNG4_01,      // 199
-    S_BNG4_02,      // 200
-    S_BNG4_03,      // 201
-    S_BNG4_04,      // 202
-    S_BNG4_05,      // 203
-    S_BNG4_06,      // 204
-    S_BNG4_07,      // 205
-    S_BNG4_08,      // 206
-    S_BNG4_09,      // 207
-    S_BNG4_10,      // 208
-    S_BNG4_11,      // 209
-    S_BNG4_12,      // 210
-    S_BNG4_13,      // 211
-    S_BNG3_00,      // 212
-    S_BNG3_01,      // 213
-    S_BNG3_02,      // 214
-    S_BNG3_03,      // 215
-    S_BNG3_04,      // 216
-    S_BNG3_05,      // 217
-    S_BNG3_06,      // 218
-    S_BNG3_07,      // 219
-    S_BNG3_08,      // 220
-    S_BNG3_09,      // 221
-    S_BNG3_10,      // 222
-    S_FLBE_00,      // 223
-    S_FLBE_01,      // 224
-    S_FLBE_02,      // 225
-    S_FLBE_03,      // 226
-    S_FLBE_04,      // 227
-    S_FLBE_05,      // 228
-    S_FLBE_06,      // 229
-    S_FLBE_07,      // 230
-    S_FLBE_08,      // 231
-    S_FLBE_09,      // 232
-    S_FLBE_10,      // 233
-    S_XPRK_00,      // 234
-    S_OCLW_00,      // 235
-    S_CCLW_00,      // 236
-    S_TEND_00,      // 237
-    S_MICR_00,      // 238
-    S_MISS_00,      // 239
-    S_MISS_01,      // 240
-    S_AROW_00,      // 241
-    S_ARWP_00,      // 242
-    S_AROW_01,      // 243
-    S_TORP_00,      // 244
-    S_TORP_01,      // 245
-    S_TORP_02,      // 246
-    S_TORP_03,      // 247
-    S_THIT_00,      // 248
-    S_THIT_01,      // 249
-    S_THIT_02,      // 250
-    S_THIT_03,      // 251
-    S_THIT_04,      // 252
-    S_TWAV_00,      // 253
-    S_TWAV_01,      // 254
-    S_TWAV_02,      // 255
-    S_MISL_00,      // 256
-    S_MISL_01,      // 257
-    S_MISL_02,      // 258
-    S_MISL_03,      // 259
-    S_MISL_04,      // 260
-    S_MISL_05,      // 261
-    S_MISL_06,      // 262
-    S_MISL_07,      // 263
-    S_TFOG_00,      // 264
-    S_TFOG_01,      // 265
-    S_TFOG_02,      // 266
-    S_TFOG_03,      // 267
-    S_TFOG_04,      // 268
-    S_TFOG_05,      // 269
-    S_TFOG_06,      // 270
-    S_TFOG_07,      // 271
-    S_TFOG_08,      // 272
-    S_TFOG_09,      // 273
-    S_IFOG_00,      // 274
-    S_IFOG_01,      // 275
-    S_IFOG_02,      // 276
-    S_IFOG_03,      // 277
-    S_IFOG_04,      // 278
-    S_IFOG_05,      // 279
-    S_IFOG_06,      // 280
-    S_SHRD_00,      // 281
-    S_SHRD_01,      // 282
-    S_SHRD_02,      // 283
-    S_SHRD_03,      // 284
-    S_SHRD_04,      // 285
-    S_SHRD_05,      // 286
-    S_PLAY_00,      // 287
-    S_PLAY_01,      // 288
-    S_PLAY_02,      // 289
-    S_PLAY_03,      // 290
-    S_PLAY_04,      // 291
-    S_PLAY_05,      // 292
-    S_PLAY_06,      // 293
-    S_PLAY_07,      // 294
-    S_PLAY_08,      // 295
-    S_PLAY_09,      // 296
-    S_PLAY_10,      // 297
-    S_PLAY_11,      // 298
-    S_PLAY_12,      // 299
-    S_PLAY_13,      // 300
-    S_PLAY_14,      // 301
-    S_PLAY_15,      // 302
-    S_PLAY_16,      // 303
-    S_PLAY_17,      // 304
-    S_PLAY_18,      // 305
-    S_RGIB_00,      // 306
-    S_RGIB_01,      // 307
-    S_RGIB_02,      // 308
-    S_RGIB_03,      // 309
-    S_RGIB_04,      // 310
-    S_RGIB_05,      // 311
-    S_RGIB_06,      // 312
-    S_RGIB_07,      // 313
-    S_MRYS_00,      // 314
-    S_MRNO_00,      // 315
-    S_MRNO_01,      // 316
-    S_MRNO_02,      // 317
-    S_MRNO_03,      // 318
-    S_MRNO_04,      // 319
-    S_MRST_00,      // 320
-    S_MRLK_00,      // 321
-    S_MRLK_01,      // 322
-    S_MRBD_00,      // 323
-    S_MRBD_01,      // 324
-    S_MRBD_02,      // 325
-    S_MRBD_03,      // 326
-    S_MRBD_04,      // 327
-    S_MRBD_05,      // 328
-    S_MRBD_06,      // 329
-    S_MRBD_07,      // 330
-    S_MRBD_08,      // 331
-    S_MRBD_09,      // 332
-    S_MRPN_00,      // 333
-    S_MRPN_01,      // 334
-    S_MRPN_02,      // 335
-    S_MRPN_03,      // 336
-    S_MRPN_04,      // 337
-    S_MRPN_05,      // 338
-    S_MRPN_06,      // 339
-    S_MRGT_00,      // 340
-    S_MRGT_01,      // 341
-    S_MRGT_02,      // 342
-    S_MRGT_03,      // 343
-    S_MRGT_04,      // 344
-    S_MRGT_05,      // 345
-    S_MRGT_06,      // 346
-    S_MRGT_07,      // 347
-    S_MRGT_08,      // 348
-    S_BURN_00,      // 349
-    S_BURN_01,      // 350
-    S_BURN_02,      // 351
-    S_BURN_03,      // 352
-    S_BURN_04,      // 353
-    S_BURN_05,      // 354
-    S_BURN_06,      // 355
-    S_BURN_07,      // 356
-    S_BURN_08,      // 357
-    S_BURN_09,      // 358
-    S_BURN_10,      // 359
-    S_BURN_11,      // 360
-    S_BURN_12,      // 361
-    S_BURN_13,      // 362
-    S_BURN_14,      // 363
-    S_BURN_15,      // 364
-    S_BURN_16,      // 365
-    S_BURN_17,      // 366
-    S_BURN_18,      // 367
-    S_BURN_19,      // 368
-    S_BURN_20,      // 369
-    S_BURN_21,      // 370
-    S_BURN_22,      // 371
-    S_BURN_23,      // 372
-    S_DISR_00,      // 373
-    S_DISR_01,      // 374
-    S_DISR_02,      // 375
-    S_DISR_03,      // 376
-    S_DISR_04,      // 377
-    S_DISR_05,      // 378
-    S_DISR_06,      // 379
-    S_DISR_07,      // 380
-    S_DISR_08,      // 381
-    S_DISR_09,      // 382
-    S_PEAS_00,      // 383
-    S_PEAS_01,      // 384
-    S_PEAS_02,      // 385
-    S_PEAS_03,      // 386
-    S_PEAS_04,      // 387
-    S_PEAS_05,      // 388
-    S_PEAS_06,      // 389
-    S_PEAS_07,      // 390
-    S_PEAS_08,      // 391
-    S_PEAS_09,      // 392
-    S_PEAS_10,      // 393
-    S_PEAS_11,      // 394
-    S_PEAS_12,      // 395
-    S_PEAS_13,      // 396
-    S_PEAS_14,      // 397
-    S_PEAS_15,      // 398
-    S_PEAS_16,      // 399
-    S_PEAS_17,      // 400
-    S_PEAS_18,      // 401
-    S_PEAS_19,      // 402
-    S_PEAS_20,      // 403
-    S_PEAS_21,      // 404
-    S_PEAS_22,      // 405
-    S_PEAS_23,      // 406
-    S_PEAS_24,      // 407
-    S_GIBS_00,      // 408
-    S_GIBS_01,      // 409
-    S_GIBS_02,      // 410
-    S_GIBS_03,      // 411
-    S_GIBS_04,      // 412
-    S_GIBS_05,      // 413
-    S_GIBS_06,      // 414
-    S_GIBS_07,      // 415
-    S_GIBS_08,      // 416
-    S_GIBS_09,      // 417
-    S_PEAS_25,      // 418
-    S_AGRD_00,      // 419
-    S_ARMR_00,      // 420
-    S_ARMR_01,      // 421
-    S_PLAY_19,      // 422
-    S_SACR_00,      // 423
-    S_TNK1_00,      // 424
-    S_TNK1_01,      // 425
-    S_TNK1_02,      // 426
-    S_TNK2_00,      // 427
-    S_TNK2_01,      // 428
-    S_TNK2_02,      // 429
-    S_TNK3_00,      // 430
-    S_TNK3_01,      // 431
-    S_TNK3_02,      // 432
-    S_TNK4_00,      // 433
-    S_TNK4_01,      // 434
-    S_TNK4_02,      // 435
-    S_TNK5_00,      // 436
-    S_TNK5_01,      // 437
-    S_TNK5_02,      // 438
-    S_TNK6_00,      // 439
-    S_TNK6_01,      // 440
-    S_TNK6_02,      // 441
-    S_NEAL_00,      // 442
-    S_NEAL_01,      // 443
-    S_NEAL_02,      // 444
-    S_NEAL_03,      // 445
-    S_NEAL_04,      // 446
-    S_NEAL_05,      // 447
-    S_NEAL_06,      // 448
-    S_NEAL_07,      // 449
-    S_NEAL_08,      // 450
-    S_NEAL_09,      // 451
-    S_NEAL_10,      // 452
-    S_NEAL_11,      // 453
-    S_NEAL_12,      // 454
-    S_NEAL_13,      // 455
-    S_BEGR_00,      // 456
-    S_BEGR_01,      // 457
-    S_BEGR_02,      // 458
-    S_BEGR_03,      // 459
-    S_BEGR_04,      // 460
-    S_BEGR_05,      // 461
-    S_BEGR_06,      // 462
-    S_BEGR_07,      // 463
-    S_BEGR_08,      // 464
-    S_BEGR_09,      // 465
-    S_BEGR_10,      // 466
-    S_BEGR_11,      // 467
-    S_BEGR_12,      // 468
-    S_BEGR_13,      // 469
-    S_BEGR_14,      // 470
-    S_BEGR_15,      // 471
-    S_BEGR_16,      // 472
-    S_BEGR_17,      // 473
-    S_BEGR_18,      // 474
-    S_BEGR_19,      // 475
-    S_BEGR_20,      // 476
-    S_BEGR_21,      // 477
-    S_BEGR_22,      // 478
-    S_HMN1_00,      // 479
-    S_HMN1_01,      // 480
-    S_HMN1_02,      // 481
-    S_HMN1_03,      // 482
-    S_HMN1_04,      // 483
-    S_HMN1_05,      // 484
-    S_HMN1_06,      // 485
-    S_HMN1_07,      // 486
-    S_HMN1_08,      // 487
-    S_HMN1_09,      // 488
-    S_HMN1_10,      // 489
-    S_HMN1_11,      // 490
-    S_HMN1_12,      // 491
-    S_HMN1_13,      // 492
-    S_HMN1_14,      // 493
-    S_HMN1_15,      // 494
-    S_HMN1_16,      // 495
-    S_HMN1_17,      // 496
-    S_HMN1_18,      // 497
-    S_HMN1_19,      // 498
-    S_HMN1_20,      // 499
-    S_HMN1_21,      // 500
-    S_HMN1_22,      // 501
-    S_HMN1_23,      // 502
-    S_HMN1_24,      // 503
-    S_HMN1_25,      // 504
-    S_HMN1_26,      // 505
-    S_HMN1_27,      // 506
-    S_HMN1_28,      // 507
-    S_HMN1_29,      // 508
-    S_HMN1_30,      // 509
-    S_HMN1_31,      // 510
-    S_RGIB_08,      // 511
-    S_RGIB_09,      // 512
-    S_RGIB_10,      // 513
-    S_RGIB_11,      // 514
-    S_RGIB_12,      // 515
-    S_RGIB_13,      // 516
-    S_RGIB_14,      // 517
-    S_RGIB_15,      // 518
-    S_LEDR_00,      // 519
-    S_LEDR_01,      // 520
-    S_LEDR_02,      // 521
-    S_LEAD_00,      // 522
-    S_LEAD_01,      // 523
-    S_LEAD_02,      // 524
-    S_LEAD_03,      // 525
-    S_LEAD_04,      // 526
-    S_LEAD_05,      // 527
-    S_LEAD_06,      // 528
-    S_LEAD_07,      // 529
-    S_LEAD_08,      // 530
-    S_LEAD_09,      // 531
-    S_LEAD_10,      // 532
-    S_LEAD_11,      // 533
-    S_LEAD_12,      // 534
-    S_LEAD_13,      // 535
-    S_LEAD_14,      // 536
-    S_LEAD_15,      // 537
-    S_LEAD_16,      // 538
-    S_LEAD_17,      // 539
-    S_LEAD_18,      // 540
-    S_LEAD_19,      // 541
-    S_LEAD_20,      // 542
-    S_LEAD_21,      // 543
-    S_LEAD_22,      // 544
-    S_LEAD_23,      // 545
-    S_LEAD_24,      // 546
-    S_LEAD_25,      // 547
-    S_LEAD_26,      // 548
-    S_LEAD_27,      // 549
-    S_LEAD_28,      // 550
-    S_LEAD_29,      // 551
-    S_LEAD_30,      // 552
-    S_LEAD_31,      // 553
-    S_LEAD_32,      // 554
-    S_LEAD_33,      // 555
-    S_LEAD_34,      // 556
-    S_LEAD_35,      // 557
-    S_LEAD_36,      // 558
-    S_LEAD_37,      // 559
-    S_PUFY_04,      // 560
-    S_PUFY_05,      // 561
-    S_PUFY_06,      // 562
-    S_PUFY_07,      // 563
-    S_PUFY_08,      // 564
-    S_MICR_01,      // 565
-    S_MICR_02,      // 566
-    S_ROB1_00,      // 567
-    S_ROB1_01,      // 568
-    S_ROB1_02,      // 569
-    S_ROB1_03,      // 570
-    S_ROB1_04,      // 571
-    S_ROB1_05,      // 572
-    S_ROB1_06,      // 573
-    S_ROB1_07,      // 574
-    S_ROB1_08,      // 575
-    S_ROB1_09,      // 576
-    S_ROB1_10,      // 577
-    S_ROB1_11,      // 578
-    S_ROB1_12,      // 579
-    S_ROB1_13,      // 580
-    S_ROB1_14,      // 581
-    S_ROB1_15,      // 582
-    S_ROB1_16,      // 583
-    S_ROB1_17,      // 584
-    S_ROB1_18,      // 585
-    S_ROB1_19,      // 586
-    S_ROB1_20,      // 587
-    S_ROB1_21,      // 588
-    S_ROB1_22,      // 589
-    S_ROB1_23,      // 590
-    S_ROB1_24,      // 591
-    S_ROB1_25,      // 592
-    S_ROB1_26,      // 593
-    S_ROB1_27,      // 594
-    S_ROB1_28,      // 595
-    S_ROB1_29,      // 596
-    S_ROB1_30,      // 597
-    S_ROB1_31,      // 598
-    S_ROB1_32,      // 599
-    S_AGRD_01,      // 600
-    S_AGRD_02,      // 601
-    S_AGRD_03,      // 602
-    S_AGRD_04,      // 603
-    S_AGRD_05,      // 604
-    S_AGRD_06,      // 605
-    S_AGRD_07,      // 606
-    S_AGRD_08,      // 607
-    S_AGRD_09,      // 608
-    S_AGRD_10,      // 609
-    S_AGRD_11,      // 610
-    S_AGRD_12,      // 611
-    S_AGRD_13,      // 612
-    S_AGRD_14,      // 613
-    S_AGRD_15,      // 614
-    S_AGRD_16,      // 615
-    S_AGRD_17,      // 616
-    S_AGRD_18,      // 617
-    S_AGRD_19,      // 618
-    S_AGRD_20,      // 619
-    S_AGRD_21,      // 620
-    S_AGRD_22,      // 621
-    S_AGRD_23,      // 622
-    S_AGRD_24,      // 623
-    S_AGRD_25,      // 624
-    S_AGRD_26,      // 625
-    S_AGRD_27,      // 626
-    S_AGRD_28,      // 627
-    S_AGRD_29,      // 628
-    S_AGRD_30,      // 629
-    S_AGRD_31,      // 630
-    S_GIBS_10,      // 631
-    S_GIBS_11,      // 632
-    S_GIBS_12,      // 633
-    S_GIBS_13,      // 634
-    S_GIBS_14,      // 635
-    S_GIBS_15,      // 636
-    S_GIBS_16,      // 637
-    S_GIBS_17,      // 638
-    S_GIBS_18,      // 639
-    S_GIBS_19,      // 640
-    S_GIBS_20,      // 641
-    S_GIBS_21,      // 642
-    S_PGRD_00,      // 643
-    S_PGRD_01,      // 644
-    S_PGRD_02,      // 645
-    S_PGRD_03,      // 646
-    S_PGRD_04,      // 647
-    S_PGRD_05,      // 648
-    S_PGRD_06,      // 649
-    S_PGRD_07,      // 650
-    S_PGRD_08,      // 651
-    S_PGRD_09,      // 652
-    S_PGRD_10,      // 653
-    S_PGRD_11,      // 654
-    S_PGRD_12,      // 655
-    S_PGRD_13,      // 656
-    S_PGRD_14,      // 657
-    S_PGRD_15,      // 658
-    S_PGRD_16,      // 659
-    S_PGRD_17,      // 660
-    S_PGRD_18,      // 661
-    S_PGRD_19,      // 662
-    S_PGRD_20,      // 663
-    S_PGRD_21,      // 664
-    S_PGRD_22,      // 665
-    S_PGRD_23,      // 666
-    S_PGRD_24,      // 667
-    S_PGRD_25,      // 668
-    S_PGRD_26,      // 669
-    S_PGRD_27,      // 670
-    S_PGRD_28,      // 671
-    S_PGRD_29,      // 672
-    S_PGRD_30,      // 673
-    S_PGRD_31,      // 674
-    S_PGRD_32,      // 675
-    S_PGRD_33,      // 676
-    S_PGRD_34,      // 677
-    S_PGRD_35,      // 678
-    S_PGRD_36,      // 679
-    S_PGRD_37,      // 680
-    S_ROB2_00,      // 681
-    S_ROB2_01,      // 682
-    S_ROB2_02,      // 683
-    S_ROB2_03,      // 684
-    S_ROB2_04,      // 685
-    S_ROB2_05,      // 686
-    S_ROB2_06,      // 687
-    S_ROB2_07,      // 688
-    S_ROB2_08,      // 689
-    S_ROB2_09,      // 690
-    S_ROB2_10,      // 691
-    S_ROB2_11,      // 692
-    S_ROB2_12,      // 693
-    S_ROB2_13,      // 694
-    S_ROB2_14,      // 695
-    S_ROB2_15,      // 696
-    S_ROB2_16,      // 697
-    S_ROB2_17,      // 698
-    S_ROB2_18,      // 699
-    S_ROB2_19,      // 700
-    S_ROB2_20,      // 701
-    S_ROB2_21,      // 702
-    S_ROB2_22,      // 703
-    S_ROB2_23,      // 704
-    S_ROB2_24,      // 705
-    S_ROB2_25,      // 706
-    S_ROB2_26,      // 707
-    S_ROB2_27,      // 708
-    S_ROB2_28,      // 709
-    S_ROB2_29,      // 710
-    S_MLDR_00,      // 711
-    S_MLDR_01,      // 712
-    S_MLDR_02,      // 713
-    S_MLDR_03,      // 714
-    S_MLDR_04,      // 715
-    S_MLDR_05,      // 716
-    S_MLDR_06,      // 717
-    S_MLDR_07,      // 718
-    S_MLDR_08,      // 719
-    S_MLDR_09,      // 720
-    S_MLDR_10,      // 721
-    S_MLDR_11,      // 722
-    S_MLDR_12,      // 723
-    S_MLDR_13,      // 724
-    S_MLDR_14,      // 725
-    S_MLDR_15,      // 726
-    S_MLDR_16,      // 727
-    S_MLDR_17,      // 728
-    S_MLDR_18,      // 729
-    S_MLDR_19,      // 730
-    S_MLDR_20,      // 731
-    S_MLDR_21,      // 732
-    S_MLDR_22,      // 733
-    S_MLDR_23,      // 734
-    S_MLDR_24,      // 735
-    S_MLDR_25,      // 736
-    S_MLDR_26,      // 737
-    S_MLDR_27,      // 738
-    S_ORCL_00,      // 739
-    S_ORCL_01,      // 740
-    S_ORCL_02,      // 741
-    S_ORCL_03,      // 742
-    S_ORCL_04,      // 743
-    S_ORCL_05,      // 744
-    S_ORCL_06,      // 745
-    S_ORCL_07,      // 746
-    S_ORCL_08,      // 747
-    S_ORCL_09,      // 748
-    S_ORCL_10,      // 749
-    S_ORCL_11,      // 750
-    S_ORCL_12,      // 751
-    S_ORCL_13,      // 752
-    S_ORCL_14,      // 753
-    S_ORCL_15,      // 754
-    S_ORCL_16,      // 755
-    S_PRST_00,      // 756
-    S_PRST_01,      // 757
-    S_PRST_02,      // 758
-    S_PRST_03,      // 759
-    S_PRST_04,      // 760
-    S_PRST_05,      // 761
-    S_PRST_06,      // 762
-    S_PRST_07,      // 763
-    S_PRST_08,      // 764
-    S_PRST_09,      // 765
-    S_PRST_10,      // 766
-    S_PRST_11,      // 767
-    S_PRST_12,      // 768
-    S_PRST_13,      // 769
-    S_PRST_14,      // 770
-    S_PRST_15,      // 771
-    S_PDED_00,      // 772
-    S_PDED_01,      // 773
-    S_PDED_02,      // 774
-    S_PDED_03,      // 775
-    S_PDED_04,      // 776
-    S_PDED_05,      // 777
-    S_PDED_06,      // 778
-    S_PDED_07,      // 779
-    S_PDED_08,      // 780
-    S_PDED_09,      // 781
-    S_PDED_10,      // 782
-    S_PDED_11,      // 783
-    S_PDED_12,      // 784
-    S_PDED_13,      // 785
-    S_PDED_14,      // 786
-    S_PDED_15,      // 787
-    S_PDED_16,      // 788
-    S_PDED_17,      // 789
-    S_PDED_18,      // 790
-    S_PDED_19,      // 791
-    S_PDED_20,      // 792
-    S_PDED_21,      // 793
-    S_PDED_22,      // 794
-    S_PDED_23,      // 795
-    S_ALN1_00,      // 796
-    S_ALN1_01,      // 797
-    S_ALN1_02,      // 798
-    S_ALN1_03,      // 799
-    S_ALN1_04,      // 800
-    S_ALN1_05,      // 801
-    S_ALN1_06,      // 802
-    S_ALN1_07,      // 803
-    S_ALN1_08,      // 804
-    S_ALN1_09,      // 805
-    S_ALN1_10,      // 806
-    S_ALN1_11,      // 807
-    S_ALN1_12,      // 808
-    S_ALN1_13,      // 809
-    S_ALN1_14,      // 810
-    S_ALN1_15,      // 811
-    S_ALN1_16,      // 812
-    S_ALN1_17,      // 813
-    S_ALN1_18,      // 814
-    S_ALN1_19,      // 815
-    S_AL1P_00,      // 816
-    S_AL1P_01,      // 817
-    S_AL1P_02,      // 818
-    S_AL1P_03,      // 819
-    S_AL1P_04,      // 820
-    S_AL1P_05,      // 821
-    S_AL1P_06,      // 822
-    S_AL1P_07,      // 823
-    S_AL1P_08,      // 824
-    S_AL1P_09,      // 825
-    S_AL1P_10,      // 826
-    S_AL1P_11,      // 827
-    S_AL1P_12,      // 828
-    S_AL1P_13,      // 829
-    S_AL1P_14,      // 830
-    S_AL1P_15,      // 831
-    S_AL1P_16,      // 832
-    S_AL1P_17,      // 833
-    S_NODE_00,      // 834
-    S_NODE_01,      // 835
-    S_NODE_02,      // 836
-    S_NODE_03,      // 837
-    S_NODE_04,      // 838
-    S_NODE_05,      // 839
-    S_NODE_06,      // 840
-    S_MTHD_00,      // 841
-    S_MTHD_01,      // 842
-    S_MTHD_02,      // 843
-    S_MTHD_03,      // 844
-    S_MTHD_04,      // 845
-    S_MTHD_05,      // 846
-    S_MTHD_06,      // 847
-    S_MTHD_07,      // 848
-    S_MTHD_08,      // 849
-    S_MTHD_09,      // 850
-    S_MTHD_10,      // 851
-    S_ALN1_20,      // 852
-    S_ALN1_21,      // 853
-    S_ALN1_22,      // 854
-    S_ALN1_23,      // 855
-    S_ALN1_24,      // 856
-    S_ALN1_25,      // 857
-    S_ALN1_26,      // 858
-    S_ALN1_27,      // 859
-    S_ALN1_28,      // 860
-    S_ALN1_29,      // 861
-    S_ALN1_30,      // 862
-    S_ALN1_31,      // 863
-    S_ALN1_32,      // 864
-    S_ALN1_33,      // 865
-    S_ALN1_34,      // 866
-    S_ALN1_35,      // 867
-    S_ALN1_36,      // 868
-    S_ALN1_37,      // 869
-    S_ALN1_38,      // 870
-    S_ALN1_39,      // 871
-    S_ALN1_40,      // 872
-    S_ALN1_41,      // 873
-    S_ALN1_42,      // 874
-    S_ALN1_43,      // 875
-    S_ALN1_44,      // 876
-    S_ALN1_45,      // 877
-    S_ALN1_46,      // 878
-    S_ALN1_47,      // 879
-    S_ALN1_48,      // 880
-    S_ALN1_49,      // 881
-    S_ALN1_50,      // 882
-    S_ALN1_51,      // 883
-    S_ALN1_52,      // 884
-    S_ALN1_53,      // 885
-    S_ALN1_54,      // 886
-    S_ALN1_55,      // 887
-    S_ALN1_56,      // 888
-    S_ALN1_57,      // 889
-    S_MNAM_00,      // 890
-    S_MNAM_01,      // 891
-    S_MNAM_02,      // 892
-    S_MNAM_03,      // 893
-    S_MNAM_04,      // 894
-    S_MNAM_05,      // 895
-    S_MNAM_06,      // 896
-    S_MNAM_07,      // 897
-    S_MNAM_08,      // 898
-    S_MNAM_09,      // 899
-    S_MNAM_10,      // 900
-    S_MNAM_11,      // 901
-    S_MNAL_00,      // 902
-    S_MNAL_01,      // 903
-    S_MNAL_02,      // 904
-    S_MNAL_03,      // 905
-    S_MNAL_04,      // 906
-    S_MNAL_05,      // 907
-    S_MNAL_06,      // 908
-    S_MNAL_07,      // 909
-    S_MNAL_08,      // 910
-    S_MNAL_09,      // 911
-    S_MNAL_10,      // 912
-    S_MNAL_11,      // 913
-    S_MNAL_12,      // 914
-    S_MNAL_13,      // 915
-    S_MNAL_14,      // 916
-    S_MNAL_15,      // 917
-    S_MNAL_16,      // 918
-    S_MNAL_17,      // 919
-    S_MNAL_18,      // 920
-    S_MNAL_19,      // 921
-    S_MNAL_20,      // 922
-    S_MNAL_21,      // 923
-    S_MNAL_22,      // 924
-    S_MNAL_23,      // 925
-    S_MNAL_24,      // 926
-    S_MNAL_25,      // 927
-    S_MNAL_26,      // 928
-    S_MNAL_27,      // 929
-    S_MNAL_28,      // 930
-    S_MNAL_29,      // 931
-    S_MNAL_30,      // 932
-    S_MNAL_31,      // 933
-    S_MNAL_32,      // 934
-    S_MNAL_33,      // 935
-    S_MNAL_34,      // 936
-    S_MNAL_35,      // 937
-    S_MNAL_36,      // 938
-    S_MNAL_37,      // 939
-    S_MNAL_38,      // 940
-    S_MNAL_39,      // 941
-    S_MNAL_40,      // 942
-    S_MDTH_00,      // 943
-    S_MDTH_01,      // 944
-    S_MDTH_02,      // 945
-    S_MDTH_03,      // 946
-    S_MDTH_04,      // 947
-    S_MDTH_05,      // 948
-    S_MDTH_06,      // 949
-    S_MDTH_07,      // 950
-    S_MDTH_08,      // 951
-    S_MDTH_09,      // 952
-    S_MDTH_10,      // 953
-    S_MDTH_11,      // 954
-    S_MDTH_12,      // 955
-    S_MDTH_13,      // 956
-    S_MDTH_14,      // 957
-    S_NEST_00,      // 958
-    S_PODD_00,      // 959
-    S_PODD_01,      // 960
-    S_PODD_02,      // 961
-    S_PODD_03,      // 962
-    S_PODD_04,      // 963
-    S_PODD_05,      // 964
-    S_ZAP6_00,      // 965
-    S_ZAP6_01,      // 966
-    S_ZAP6_02,      // 967
-    S_ZOT3_00,      // 968
-    S_ZOT3_01,      // 969
-    S_ZOT3_02,      // 970
-    S_ZOT3_03,      // 971
-    S_ZOT3_04,      // 972
-    S_ZAP6_03,      // 973
-    S_ZAP6_04,      // 974
-    S_ZAP6_05,      // 975
-    S_ZAP7_00,      // 976
-    S_ZAP7_01,      // 977
-    S_ZAP7_02,      // 978
-    S_ZAP7_03,      // 979
-    S_ZAP7_04,      // 980
-    S_ZOT1_00,      // 981
-    S_ZOT1_01,      // 982
-    S_ZOT1_02,      // 983
-    S_ZOT1_03,      // 984
-    S_ZOT1_04,      // 985
-    S_ZAP5_00,      // 986
-    S_ZAP5_01,      // 987
-    S_ZAP5_02,      // 988
-    S_ZAP5_03,      // 989
-    S_ZOT2_00,      // 990
-    S_ZOT2_01,      // 991
-    S_ZOT2_02,      // 992
-    S_ZOT2_03,      // 993
-    S_ZOT2_04,      // 994
-    S_SEWR_00,      // 995
-    S_SEWR_01,      // 996
-    S_SEWR_02,      // 997
-    S_SEWR_03,      // 998
-    S_SEWR_04,      // 999
-    S_SEWR_05,      // 1000
-    S_SEWR_06,      // 1001
-    S_SEWR_07,      // 1002
-    S_SEWR_08,      // 1003
-    S_SEWR_09,      // 1004
-    S_SEWR_10,      // 1005
-    S_SEWR_11,      // 1006
-    S_SEWR_12,      // 1007
-    S_SEWR_13,      // 1008
-    S_SPID_00,      // 1009
-    S_SPID_01,      // 1010
-    S_SPID_02,      // 1011
-    S_SPID_03,      // 1012
-    S_SPID_04,      // 1013
-    S_SPID_05,      // 1014
-    S_SPID_06,      // 1015
-    S_SPID_07,      // 1016
-    S_SPID_08,      // 1017
-    S_SPID_09,      // 1018
-    S_SPID_10,      // 1019
-    S_SPID_11,      // 1020
-    S_SPID_12,      // 1021
-    S_SPID_13,      // 1022
-    S_SPID_14,      // 1023
-    S_SPID_15,      // 1024
-    S_SPID_16,      // 1025
-    S_SPID_17,      // 1026
-    S_SPID_18,      // 1027
-    S_SPID_19,      // 1028
-    S_SPID_20,      // 1029
-    S_SPID_21,      // 1030
-    S_SPID_22,      // 1031
-    S_SPID_23,      // 1032
-    S_SPID_24,      // 1033
-    S_SPID_25,      // 1034
-    S_SPID_26,      // 1035
-    S_SPID_27,      // 1036
-    S_SPID_28,      // 1037
-    S_SPID_29,      // 1038
-    S_SPID_30,      // 1039
-    S_SPID_31,      // 1040
-    S_SPID_32,      // 1041
-    S_SPID_33,      // 1042
-    S_SPID_34,      // 1043
-    S_SPID_35,      // 1044
-    S_SPID_36,      // 1045
-    S_SPID_37,      // 1046
-    S_ROB3_00,      // 1047
-    S_ROB3_01,      // 1048
-    S_ROB3_02,      // 1049
-    S_ROB3_03,      // 1050
-    S_ROB3_04,      // 1051
-    S_ROB3_05,      // 1052
-    S_ROB3_06,      // 1053
-    S_ROB3_07,      // 1054
-    S_ROB3_08,      // 1055
-    S_ROB3_09,      // 1056
-    S_ROB3_10,      // 1057
-    S_ROB3_11,      // 1058
-    S_ROB3_12,      // 1059
-    S_ROB3_13,      // 1060
-    S_ROB3_14,      // 1061
-    S_ROB3_15,      // 1062
-    S_ROB3_16,      // 1063
-    S_ROB3_17,      // 1064
-    S_ROB3_18,      // 1065
-    S_ROB3_19,      // 1066
-    S_ROB3_20,      // 1067
-    S_ROB3_21,      // 1068
-    S_ROB3_22,      // 1069
-    S_ROB3_23,      // 1070
-    S_ROB3_24,      // 1071
-    S_ROB3_25,      // 1072
-    S_ROB3_26,      // 1073
-    S_ROB3_27,      // 1074
-    S_ROB3_28,      // 1075
-    S_ROB3_29,      // 1076
-    S_ROB3_30,      // 1077
-    S_ROB3_31,      // 1078
-    S_ROB3_32,      // 1079
-    S_ROB3_33,      // 1080
-    S_ROB3_34,      // 1081
-    S_ROB3_35,      // 1082
-    S_ROB3_36,      // 1083
-    S_ROB3_37,      // 1084
-    S_RBB3_00,      // 1085
-    S_RBB3_01,      // 1086
-    S_RBB3_02,      // 1087
-    S_RBB3_03,      // 1088
-    S_RBB3_04,      // 1089
-    S_RBB3_05,      // 1090
-    S_RBB3_06,      // 1091
-    S_RBB3_07,      // 1092
-    S_PRGR_00,      // 1093
-    S_PRGR_01,      // 1094
-    S_PRGR_02,      // 1095
-    S_PRGR_03,      // 1096
-    S_PRGR_04,      // 1097
-    S_PRGR_05,      // 1098
-    S_PRGR_06,      // 1099
-    S_PRGR_07,      // 1100
-    S_PRGR_08,      // 1101
-    S_PRGR_09,      // 1102
-    S_PRGR_10,      // 1103
-    S_PRGR_11,      // 1104
-    S_PRGR_12,      // 1105
-    S_PRGR_13,      // 1106
-    S_PRGR_14,      // 1107
-    S_PRGR_15,      // 1108
-    S_PRGR_16,      // 1109
-    S_PRGR_17,      // 1110
-    S_PRGR_18,      // 1111
-    S_PRGR_19,      // 1112
-    S_PRGR_20,      // 1113
-    S_PRGR_21,      // 1114
-    S_PRGR_22,      // 1115
-    S_PRGR_23,      // 1116
-    S_PRGR_24,      // 1117
-    S_PRGR_25,      // 1118
-    S_PRGR_26,      // 1119
-    S_PRGR_27,      // 1120
-    S_PRGR_28,      // 1121
-    S_PRGR_29,      // 1122
-    S_PRGR_30,      // 1123
-    S_PRGR_31,      // 1124
-    S_PRGR_32,      // 1125
-    S_PRGR_33,      // 1126
-    S_BASE_00,      // 1127
-    S_BASE_01,      // 1128
-    S_BASE_02,      // 1129
-    S_BASE_03,      // 1130
-    S_BASE_04,      // 1131
-    S_BASE_05,      // 1132
-    S_BASE_06,      // 1133
-    S_BASE_07,      // 1134
-    S_FRBL_00,      // 1135
-    S_FRBL_01,      // 1136
-    S_FRBL_02,      // 1137
-    S_FRBL_03,      // 1138
-    S_FRBL_04,      // 1139
-    S_FRBL_05,      // 1140
-    S_FRBL_06,      // 1141
-    S_FRBL_07,      // 1142
-    S_FRBL_08,      // 1143
-    S_KLAX_00,      // 1144
-    S_KLAX_01,      // 1145
-    S_KLAX_02,      // 1146
-    S_TURT_00,      // 1147
-    S_TURT_01,      // 1148
-    S_TURT_02,      // 1149
-    S_TURT_03,      // 1150
-    S_TURT_04,      // 1151
-    S_BALL_00,      // 1152
-    S_BALL_01,      // 1153
-    S_BALL_02,      // 1154
-    S_BALL_03,      // 1155
-    S_BALL_04,      // 1156
-    S_TURT_05,      // 1157
-    S_PSTN_00,      // 1158
-    S_PSTN_01,      // 1159
-    S_PSTN_02,      // 1160
-    S_PSTN_03,      // 1161
-    S_PSTN_04,      // 1162
-    S_PSTN_05,      // 1163
-    S_PSTN_06,      // 1164
-    S_PSTN_07,      // 1165
-    S_PSTN_08,      // 1166
-    S_PSTN_09,      // 1167
-    S_PSTN_10,      // 1168
-    S_SECR_00,      // 1169
-    S_SECR_01,      // 1170
-    S_SECR_02,      // 1171
-    S_SECR_03,      // 1172
-    S_SECR_04,      // 1173
-    S_SECR_05,      // 1174
-    S_SECR_06,      // 1175
-    S_SECR_07,      // 1176
-    S_SECR_08,      // 1177
-    S_SECR_09,      // 1178
-    S_SECR_10,      // 1179
-    S_SECR_11,      // 1180
-    S_SECR_12,      // 1181
-    S_SECR_13,      // 1182
-    S_SECR_14,      // 1183
-    S_SECR_15,      // 1184
-    S_XPRK_01,      // 1185
-    S_XPRK_02,      // 1186
-    S_TARG_00,      // 1187
-    S_RING_00,      // 1188
-    S_EARS_00,      // 1189
-    S_COMM_00,      // 1190
-    S_BOOM_00,      // 1191
-    S_BOOM_01,      // 1192
-    S_BOOM_02,      // 1193
-    S_BOOM_03,      // 1194
-    S_BOOM_04,      // 1195
-    S_BOOM_05,      // 1196
-    S_BOOM_06,      // 1197
-    S_BOOM_07,      // 1198
-    S_BOOM_08,      // 1199
-    S_BOOM_09,      // 1200
-    S_BOOM_10,      // 1201
-    S_BOOM_11,      // 1202
-    S_BOOM_12,      // 1203
-    S_BOOM_13,      // 1204
-    S_BOOM_14,      // 1205
-    S_BOOM_15,      // 1206
-    S_BOOM_16,      // 1207
-    S_BOOM_17,      // 1208
-    S_BOOM_18,      // 1209
-    S_BOOM_19,      // 1210
-    S_BOOM_20,      // 1211
-    S_BOOM_21,      // 1212
-    S_BOOM_22,      // 1213
-    S_BOOM_23,      // 1214
-    S_BOOM_24,      // 1215
-    S_RATT_00,      // 1216
-    S_RATT_01,      // 1217
-    S_RATT_02,      // 1218
-    S_RATT_03,      // 1219
-    S_RATT_04,      // 1220
-    S_RATT_05,      // 1221
-    S_RATT_06,      // 1222
-    S_HOGN_00,      // 1223
-    S_HOGN_01,      // 1224
-    S_HOGN_02,      // 1225
-    S_DEAD_00,      // 1226
-    S_SBAN_00,      // 1227
-    S_BOTR_00,      // 1228
-    S_HATR_00,      // 1229
-    S_TOPR_00,      // 1230
-    S_COUP_00,      // 1231
-    S_COUP_01,      // 1232
-    S_COUP_02,      // 1233
-    S_BUBB_00,      // 1234
-    S_BUBF_00,      // 1235
-    S_BUBC_00,      // 1236
-    S_ASPR_00,      // 1237
-    S_SPDL_00,      // 1238
-    S_SPDL_01,      // 1239
-    S_SPDL_02,      // 1240
-    S_TOKN_00,      // 1241
-    S_OTOK_00,      // 1242
-    S_HELT_00,      // 1243
-    S_GUNT_00,      // 1244
-    S_FULL_00,      // 1245
-    S_FULL_01,      // 1246
-    S_MEAT_00,      // 1247
-    S_MEAT_01,      // 1248
-    S_MEAT_02,      // 1249
-    S_MEAT_03,      // 1250
-    S_MEAT_04,      // 1251
-    S_MEAT_05,      // 1252
-    S_MEAT_06,      // 1253
-    S_MEAT_07,      // 1254
-    S_MEAT_08,      // 1255
-    S_MEAT_09,      // 1256
-    S_MEAT_10,      // 1257
-    S_MEAT_11,      // 1258
-    S_MEAT_12,      // 1259
-    S_MEAT_13,      // 1260
-    S_MEAT_14,      // 1261
-    S_MEAT_15,      // 1262
-    S_MEAT_16,      // 1263
-    S_MEAT_17,      // 1264
-    S_MEAT_18,      // 1265
-    S_MEAT_19,      // 1266
-    S_JUNK_00,      // 1267
-    S_JUNK_01,      // 1268
-    S_JUNK_02,      // 1269
-    S_JUNK_03,      // 1270
-    S_JUNK_04,      // 1271
-    S_JUNK_05,      // 1272
-    S_JUNK_06,      // 1273
-    S_JUNK_07,      // 1274
-    S_JUNK_08,      // 1275
-    S_JUNK_09,      // 1276
-    S_JUNK_10,      // 1277
-    S_JUNK_11,      // 1278
-    S_JUNK_12,      // 1279
-    S_JUNK_13,      // 1280
-    S_JUNK_14,      // 1281
-    S_JUNK_15,      // 1282
-    S_JUNK_16,      // 1283
-    S_JUNK_17,      // 1284
-    S_JUNK_18,      // 1285
-    S_JUNK_19,      // 1286
-    S_FFOT_00,      // 1287
-    S_FFOT_01,      // 1288
-    S_FFOT_02,      // 1289
-    S_FFOT_03,      // 1290
-    S_DIE1_00,      // 1291
-    S_BEAC_00,      // 1292
-    S_BEAC_01,      // 1293
-    S_BEAC_02,      // 1294
-    S_ARM1_00,      // 1295
-    S_ARM2_00,      // 1296
-    S_BARW_00,      // 1297
-    S_BARW_01,      // 1298
-    S_BARW_02,      // 1299
-    S_BARW_03,      // 1300
-    S_BARW_04,      // 1301
-    S_BARW_05,      // 1302
-    S_BARW_06,      // 1303
-    S_BARW_07,      // 1304
-    S_BART_00,      // 1305
-    S_BART_01,      // 1306
-    S_BART_02,      // 1307
-    S_BART_03,      // 1308
-    S_BART_04,      // 1309
-    S_BART_05,      // 1310
-    S_BART_06,      // 1311
-    S_BART_07,      // 1312
-    S_BART_08,      // 1313
-    S_BART_09,      // 1314
-    S_BART_10,      // 1315
-    S_BART_11,      // 1316
-    S_LAMP_00,      // 1317
-    S_LANT_00,      // 1318
-    S_BARL_00,      // 1319
-    S_BARL_01,      // 1320
-    S_BARL_02,      // 1321
-    S_BARL_03,      // 1322
-    S_BOWL_00,      // 1323
-    S_BOWL_01,      // 1324
-    S_BOWL_02,      // 1325
-    S_BOWL_03,      // 1326
-    S_BRAZ_00,      // 1327
-    S_BRAZ_01,      // 1328
-    S_BRAZ_02,      // 1329
-    S_BRAZ_03,      // 1330
-    S_TRCH_00,      // 1331
-    S_TRCH_01,      // 1332
-    S_TRCH_02,      // 1333
-    S_TRCH_03,      // 1334
-    S_LTRH_00,      // 1335
-    S_LTRH_01,      // 1336
-    S_LTRH_02,      // 1337
-    S_LTRH_03,      // 1338
-    S_LMPC_00,      // 1339
-    S_LMPC_01,      // 1340
-    S_LMPC_02,      // 1341
-    S_LMPC_03,      // 1342
-    S_LOGS_00,      // 1343
-    S_LOGS_01,      // 1344
-    S_LOGS_02,      // 1345
-    S_LOGS_03,      // 1346
-    S_TRHO_00,      // 1347
-    S_WATR_00,      // 1348
-    S_MUGG_00,      // 1349
-    S_FUSL_00,      // 1350
-    S_CRD1_00,      // 1351
-    S_CRD2_00,      // 1352
-    S_TPAS_00,      // 1353
-    S_KY1G_00,      // 1354
-    S_KY2S_00,      // 1355
-    S_KY3B_00,      // 1356
-    S_HAND_00,      // 1357
-    S_CRYS_00,      // 1358
-    S_CRYS_01,      // 1359
-    S_CRYS_02,      // 1360
-    S_CRYS_03,      // 1361
-    S_CRYS_04,      // 1362
-    S_CRYS_05,      // 1363
-    S_PRIS_00,      // 1364
-    S_PWR1_00,      // 1365
-    S_PWR2_00,      // 1366
-    S_PWR3_00,      // 1367
-    S_ORAC_00,      // 1368
-    S_GYID_00,      // 1369
-    S_FUBR_00,      // 1370
-    S_WARE_00,      // 1371
-    S_RCRY_00,      // 1372
-    S_BCRY_00,      // 1373
-    S_CHAP_00,      // 1374
-    S_TUNL_00,      // 1375
-    S_BLTK_00,      // 1376
-    S_SECK_00,      // 1377
-    S_MINE_00,      // 1378
-    S_REBL_00,      // 1379
-    S_PROC_00,      // 1380
-    S_ANKH_00,      // 1381
-    S_GOID_00,      // 1382
-    S_STMP_00,      // 1383
-    S_MDKT_00,      // 1384
-    S_COIN_00,      // 1385
-    S_CRED_00,      // 1386
-    S_SACK_00,      // 1387
-    S_CHST_00,      // 1388
-    S_SHD1_00,      // 1389
-    S_SHD1_01,      // 1390
-    S_SHD1_02,      // 1391
-    S_SHD1_03,      // 1392
-    S_MASK_00,      // 1393
-    S_UNIF_00,      // 1394
-    S_OFIC_00,      // 1395
-    S_PMAP_00,      // 1396
-    S_PMAP_01,      // 1397
-    S_PMUP_00,      // 1398
-    S_PMUP_01,      // 1399
-    S_BLIT_00,      // 1400
-    S_BBOX_00,      // 1401
-    S_MSSL_00,      // 1402
-    S_ROKT_00,      // 1403
-    S_BRY1_00,      // 1404
-    S_BRY1_01,      // 1405
-    S_CPAC_00,      // 1406
-    S_CPAC_01,      // 1407
-    S_PQRL_00,      // 1408
-    S_XQRL_00,      // 1409
-    S_GRN1_00,      // 1410
-    S_GRN2_00,      // 1411
-    S_BKPK_00,      // 1412
-    S_RELC_00,      // 1413
-    S_RIFL_00,      // 1414
-    S_RIFL_01,      // 1415
-    S_FLAM_00,      // 1416
-    S_BFLM_00,      // 1417
-    S_MMSL_00,      // 1418
-    S_TRPD_00,      // 1419
-    S_GRND_00,      // 1420
-    S_CBOW_00,      // 1421
-    S_SIGL_00,      // 1422
-    S_SIGL_01,      // 1423
-    S_SIGL_02,      // 1424
-    S_SIGL_03,      // 1425
-    S_SIGL_04,      // 1426
-    S_LITE_00,      // 1427
-    S_CNDL_00,      // 1428
-    S_CLBR_00,      // 1429
-    S_LITS_00,      // 1430
-    S_LITB_00,      // 1431
-    S_LITG_00,      // 1432
-    S_ROK1_00,      // 1433
-    S_ROK2_00,      // 1434
-    S_ROK3_00,      // 1435
-    S_ROK4_00,      // 1436
-    S_LOGG_00,      // 1437
-    S_LOGG_01,      // 1438
-    S_LOGG_02,      // 1439
-    S_LOGG_03,      // 1440
-    S_RUB1_00,      // 1441
-    S_RUB2_00,      // 1442
-    S_RUB3_00,      // 1443
-    S_RUB4_00,      // 1444
-    S_RUB5_00,      // 1445
-    S_RUB6_00,      // 1446
-    S_RUB7_00,      // 1447
-    S_RUB8_00,      // 1448
-    S_CHAN_00,      // 1449
-    S_STAT_00,      // 1450
-    S_DSTA_00,      // 1451
-    S_CRAB_00,      // 1452
-    S_CAGE_00,      // 1453
-    S_TREE_00,      // 1454
-    S_TREE_01,      // 1455
-    S_TREE_02,      // 1456
-    S_TRE1_00,      // 1457
-    S_BUSH_00,      // 1458
-    S_SHRB_00,      // 1459
-    S_STAK_00,      // 1460
-    S_BAR1_00,      // 1461
-    S_VASE_00,      // 1462
-    S_VASE_01,      // 1463
-    S_STOL_00,      // 1464
-    S_POT1_00,      // 1465
-    S_TUB1_00,      // 1466
-    S_ANVL_00,      // 1467
-    S_TLMP_00,      // 1468
-    S_TLMP_01,      // 1469
-    S_TRAY_00,      // 1470
-    S_APOW_00,      // 1471
-    S_AFED_00,      // 1472
-    S_DRIP_00,      // 1473
-    S_DRIP_01,      // 1474
-    S_DRIP_02,      // 1475
-    S_DRIP_03,      // 1476
-    S_DRIP_04,      // 1477
-    S_DRIP_05,      // 1478
-    S_DRIP_06,      // 1479
-    S_DRIP_07,      // 1480
-    S_CDRP_00,      // 1481
-    S_CDRP_01,      // 1482
-    S_CDRP_02,      // 1483
-    S_CDRP_03,      // 1484
-    S_SPLH_00,      // 1485
-    S_SPLH_01,      // 1486
-    S_SPLH_02,      // 1487
-    S_SPLH_03,      // 1488
-    S_SPLH_04,      // 1489
-    S_SPLH_05,      // 1490
-    S_SPLH_06,      // 1491
-    S_SPLH_07,      // 1492
-    S_WTFT_00,      // 1493
-    S_WTFT_01,      // 1494
-    S_WTFT_02,      // 1495
-    S_WTFT_03,      // 1496
-    S_HERT_00,      // 1497
-    S_HERT_01,      // 1498
-    S_HERT_02,      // 1499
-    S_TELP_00,      // 1500
-    S_TELP_01,      // 1501
-    S_TELP_02,      // 1502
-    S_TELP_03,      // 1503
-    S_MONI_00,      // 1504
-    S_STEL_00,      // 1505
-    S_STLA_00,      // 1506
-    S_STLE_00,      // 1507
-    S_HUGE_00,      // 1508
-    S_HUGE_01,      // 1509
-    S_HUGE_02,      // 1510
-    S_HUGE_03,      // 1511
-    S_STLG_00,      // 1512
-    S_STLG_01,      // 1513
-    S_STLG_02,      // 1514
-    S_STLG_03,      // 1515
-    S_STLG_04,      // 1516
-    S_STLG_05,      // 1517
-    NUMSTATES
-
-} statenum_t;
-
-
-typedef struct
-{
-    spritenum_t sprite;
-    int frame;
-    int tics;
-    // void (*action) ();
-    actionf_t action;
-    statenum_t nextstate;
-    //int misc1;    // villsa [STRIFE] unused
-    //int misc2;    // villsa [STRIFE] unused
-} state_t;
-
-extern state_t	states[NUMSTATES];
-extern const char *sprnames[];
-
-typedef enum
-{
-    MT_FIELDGUARD,      //000
-    MT_PLAYER,      //001
-    MT_SHOPKEEPER_W,        //002
-    MT_SHOPKEEPER_B,        //003
-    MT_SHOPKEEPER_A,        //004
-    MT_SHOPKEEPER_M,        //005
-    MT_PEASANT2_A,      //006
-    MT_PEASANT2_B,      //007
-    MT_PEASANT2_C,      //008
-    MT_PEASANT5_A,      //009
-    MT_PEASANT5_B,      //010
-    MT_PEASANT5_C,      //011
-    MT_PEASANT4_A,      //012
-    MT_PEASANT4_B,      //013
-    MT_PEASANT4_C,      //014
-    MT_PEASANT6_A,      //015
-    MT_PEASANT6_B,      //016
-    MT_PEASANT6_C,      //017
-    MT_PEASANT3_A,      //018
-    MT_PEASANT3_B,      //019
-    MT_PEASANT3_C,      //020
-    MT_PEASANT8_A,      //021
-    MT_PEASANT8_B,      //022
-    MT_PEASANT8_C,      //023
-    MT_PEASANT7_A,      //024
-    MT_PEASANT7_B,      //025
-    MT_PEASANT7_C,      //026
-    MT_PEASANT1,        //027
-    MT_ZOMBIE,      //028
-    MT_BECOMING,        //029
-    MT_ZOMBIESPAWNER,       //030
-    MT_HUGE_TANK_1,     //031
-    MT_HUGE_TANK_2,     //032
-    MT_HUGE_TANK_3,     //033
-    MT_TANK_4,      //034
-    MT_TANK_5,      //035
-    MT_TANK_6,      //036
-    MT_KNEELING_GUY,        //037
-    MT_BEGGAR1,     //038
-    MT_BEGGAR2,     //039
-    MT_BEGGAR3,     //040
-    MT_BEGGAR4,     //041
-    MT_BEGGAR5,     //042
-    MT_REBEL1,      //043
-    MT_REBEL2,      //044
-    MT_REBEL3,      //045
-    MT_REBEL4,      //046
-    MT_REBEL5,      //047
-    MT_REBEL6,      //048
-    MT_RLEADER,     //049
-    MT_RLEADER2,        //050
-    MT_MISSILESMOKE,        //051
-    MT_REAVER,      //052
-    MT_GUARD1,      //053
-    MT_GUARD2,      //054
-    MT_GUARD3,      //055
-    MT_GUARD4,      //056
-    MT_GUARD5,      //057
-    MT_GUARD6,      //058
-    MT_GUARD7,      //059
-    MT_GUARD8,      //060
-    MT_SHADOWGUARD,     //061
-    MT_PGUARD,      //062
-    MT_CRUSADER,        //063
-    MT_BISHOP,      //064
-    MT_ORACLE,      //065
-    MT_PRIEST,      //066
-    MT_SPECTRE_A,      //067
-    MT_NODE,        //068
-    MT_SPECTREHEAD,        //069
-    MT_SPECTRE_B,      //070
-    MT_SPECTRE_C,      //071
-    MT_SPECTRE_D,      //072
-    MT_SPECTRE_E,      //073
-    MT_ENTITY,      //074
-    MT_SUBENTITY,       //075
-    MT_NEST,        //076
-    MT_POD,     //077
-    MT_SIGIL_B_SHOT,        //078
-    MT_SIGIL_SB_SHOT,       //079
-    MT_SIGIL_C_SHOT,        //080
-    MT_SIGIL_SC_SHOT,       //081
-    MT_SIGIL_E_OFFSHOOT,        //082
-    MT_SIGIL_TRAIL,     //083
-    MT_SIGIL_E_SHOT,        //084
-    MT_SIGIL_SE_SHOT,       //085
-    MT_SIGIL_A_ZAP_LEFT,        //086
-    MT_SIGIL_A_ZAP_RIGHT,       //087
-    MT_SIGIL_A_GROUND,      //088
-    MT_SIGIL_D_SHOT,        //089
-    MT_SIGIL_SD_SHOT,       //090
-    MT_SENTINEL,        //091
-    MT_STALKER,     //092
-    MT_INQUISITOR,      //093
-    MT_INQARM,      //094
-    MT_PROGRAMMER,      //095
-    MT_PROGRAMMERBASE,      //096
-    MT_HOOKSHOT,        //097
-    MT_CHAINSHOT,       //098
-    MT_MINIMISSLE,      //099
-    MT_C_MISSILE,       //100
-    MT_SEEKMISSILE,     //101
-    MT_ELECARROW,       //102
-    MT_POISARROW,       //103
-    MT_R_LASER,     //104
-    MT_L_LASER,     //105
-    MT_HEGRENADE,       //106
-    MT_PGRENADE,        //107
-    MT_INQGRENADE,      //108
-    MT_PFLAME,      //109
-    MT_TORPEDO,     //110
-    MT_TORPEDOSPREAD,       //111
-    MT_SFIREBALL,       //112
-    MT_C_FLAME,     //113
-    MT_STRIFEPUFF3,     //114
-    MT_STRIFEPUFF,      //115
-    MT_SPARKPUFF,       //116
-    MT_BLOOD_DEATH,     //117
-    MT_TFOG,        //118
-    MT_IFOG,        //119
-    MT_TELEPORTMAN,     //120
-    MT_MISC_01,     //121
-    MT_TURRET,      //122
-    MT_GATE,        //123
-    MT_COMPUTER,        //124
-    MT_INV_MED1,        //125
-    MT_INV_MED2,        //126
-    MT_INV_MED3,        //127
-    MT_DEGNINORE,       //128
-    MT_INV_ARMOR2,      //129
-    MT_INV_ARMOR1,      //130
-    MT_MISC_22,     //131
-    MT_MISC_11,     //132
-    MT_KEY_BASE,        //133
-    MT_GOVSKEY,     //134
-    MT_KEY_TRAVEL,      //135
-    MT_KEY_ID_BLUE,     //136
-    MT_PRISONKEY,       //137
-    MT_KEY_HAND,        //138
-    MT_POWER1KEY,       //139
-    MT_POWER2KEY,       //140
-    MT_POWER3KEY,       //141
-    MT_KEY_GOLD,        //142
-    MT_KEY_ID_GOLD,     //143
-    MT_KEY_SILVER,      //144
-    MT_KEY_ORACLE,      //145
-    MT_MILITARYID,      //146
-    MT_KEY_ORDER,       //147
-    MT_KEY_WAREHOUSE,       //148
-    MT_KEY_BRASS,       //149
-    MT_KEY_RED_CRYSTAL,     //150
-    MT_KEY_BLUE_CRYSTAL,        //151
-    MT_KEY_CHAPEL,      //152
-    MT_CATACOMBKEY,     //153
-    MT_SECURITYKEY,     //154
-    MT_KEY_CORE,        //155
-    MT_KEY_MAULER,      //156
-    MT_KEY_FACTORY,     //157
-    MT_KEY_MINE,        //158
-    MT_NEWKEY5,     //159
-    MT_INV_SHADOWARMOR,     //160
-    MT_INV_SUIT,        //161
-    MT_QUEST_UNIFORM,       //162
-    MT_QUEST_GUARD_UNIFORM,     //163
-    MT_INV_SUPERMAP,        //164
-    MT_INV_RADAR,       //165
-    MT_BEACON,      //166
-    MT_INV_TARGETER,        //167
-    MT_MONY_1,      //168
-    MT_MONY_10,     //169
-    MT_MONY_25,     //170
-    MT_MONY_50,     //171
-    MT_MONY_300,        //172
-    MT_TOKEN_RING,      //173
-    MT_INV_CHALICE,     //174
-    MT_TOKEN_EAR,       //175
-    MT_INV_COMMUNICATOR,        //176
-    MT_AGREN,       //177
-    MT_APGREN,      //178
-    MT_ACLIP,       //179
-    MT_AAMMOBOX,        //180
-    MT_AMINI,       //181
-    MT_AMINIBOX,        //182
-    MT_ACELL,       //183
-    MT_APCELL,      //184
-    MT_APAROW,      //185
-    MT_AAROW,       //186
-    MT_INV_SATCHEL,     //187
-    MT_PULSE,       //188
-    MT_RIFLESTAND,      //189
-    MT_FLAMETHROWER,        //190
-    MT_TOKEN_FLAME_THROWER_PARTS,       //191
-    MT_MISSILELAUNCHER,     //192
-    MT_BLASTER,     //193
-    MT_CROSSBOW,        //194
-    MT_GRENADELAUNCHER,     //195
-    MT_SIGIL_A,     //196
-    MT_SIGIL_B,     //197
-    MT_SIGIL_C,     //198
-    MT_SIGIL_D,     //199
-    MT_SIGIL_E,     //200
-    MT_POWER_CRYSTAL,       //201
-    MT_RAT,     //202
-    MT_MISC_05,     //203
-    MT_MISC_06,     //204
-    MT_MISC_15,     //205
-    MT_LIGHT14,     //206
-    MT_LIGHT13,     //207
-    MT_LIGHT12,     //208
-    MT_LIGHT18,     //209
-    MT_PILLAR2,     //210
-    MT_PILLAR3,     //211
-    MT_PILLAR4,     //212
-    MT_PILLAR5,     //213
-    MT_PILLAR6,     //214
-    MT_PILLAR7,     //215
-    MT_CAVE2,       //216
-    MT_CAVE3,       //217
-    MT_CAVE4,       //218
-    MT_CAVE6,       //219
-    MT_CAVE7,       //220
-    MT_CAVE5,       //221
-    MT_LIGHT2,      //222
-    MT_LIGHT3,      //223
-    MT_MISC_03,     //224
-    MT_MISC_13,     //225
-    MT_MISC_02,     //226
-    MT_MISC_07,     //227
-    MT_BIO2,        //228
-    MT_TELEPORTSTAND,       //229
-    MT_DEADTHING1,      //230
-    MT_DEADTHING2,      //231
-    MT_DEADTHING3,      //232
-    MT_DEADTHING4,      //233
-    MT_DEADTHING5,      //234
-    MT_DEADTHING6,      //235
-    MT_BIO1,        //236
-    MT_GIBS,        //237
-    MT_MISC_04,     //238
-    MT_LIGHT11,     //239
-    MT_LIGHT10,     //240
-    MT_LIGHT9,      //241
-    MT_LIGHT8,      //242
-    MT_MISC_14,     //243
-    MT_LIGHT1,      //244
-    MT_PILLAR8,     //245
-    MT_PILLAR9,     //246
-    MT_LIGHT15,     //247
-    MT_LIGHT4,      //248
-    MT_LIGHT5,      //249
-    MT_ROCK1,       //250
-    MT_ROCK2,       //251
-    MT_ROCK3,       //252
-    MT_ROCK4,       //253
-    MT_TREE7,       //254
-    MT_RUBBLE1,     //255
-    MT_RUBBLE2,     //256
-    MT_RUBBLE3,     //257
-    MT_RUBBLE4,     //258
-    MT_RUBBLE5,     //259
-    MT_RUBBLE6,     //260
-    MT_RUBBLE7,     //261
-    MT_RUBBLE8,     //262
-    MT_MISC_08,     //263
-    MT_LIGHT6,      //264
-    MT_LIGHT7,      //265
-    MT_TREE2,       //266
-    MT_TREE3,       //267
-    MT_TREE4,       //268
-    MT_TREE1,       //269
-    MT_TREE6,       //270
-    MT_TREE5,       //271
-    MT_CAVE1,       //272
-    MT_PILLAR1,     //273
-    MT_MISC_10,     //274
-    MT_MISC_09,     //275
-    MT_MISC_17,     //276
-    MT_MISC_18,     //277
-    MT_MISC_19,     //278
-    MT_MISC_20,     //279
-    MT_LIGHT16,     //280
-    MT_LIGHT17,     //281
-    MT_MISC_21,     //282
-    MT_MISC_12,     //283
-    MT_MISC_26,     //284
-    MT_MISC_23,     //285
-    MT_MISC_24,     //286
-    MT_MISC_25,     //287
-    MT_COUPLING,        //288
-    MT_COUPLING_BROKEN,     //289
-    MT_PILLAR10,        //290
-    MT_PILLAR11,        //291
-    MT_PILLAR12,        //292
-    MT_PILLAR13,        //293
-    MT_LIGHT19,     //294
-    MT_MEAT,        //295
-    MT_JUNK,        //296
-    MT_BURNDROP,        //297
-    MT_TOKEN_AMMO,      //298
-    MT_TOKEN_HEALTH,        //299
-    MT_TOKEN,       //300
-    MT_TOKEN_ALARM,     //301
-    MT_TOKEN_DOOR1,     //302
-    MT_TOKEN_SHOPCLOSE,     //303
-    MT_TOKEN_PRISON_PASS,       //304
-    MT_TOKEN_DOOR3,     //305
-    MT_TOKEN_STAMINA,       //306
-    MT_TOKEN_NEW_ACCURACY,      //307
-    MT_TOKEN_REPORT,        //308
-    MT_TOKEN_TOUGHNESS,     //309
-    MT_TOKEN_ACCURACY,      //310
-    MT_TOKEN_ORACLE_PASS,       //311
-    MT_TOKEN_QUEST1,        //312
-    MT_TOKEN_QUEST2,        //313
-    MT_TOKEN_QUEST3,        //314
-    MT_TOKEN_QUEST4,        //315
-    MT_TOKEN_QUEST5,        //316
-    MT_TOKEN_QUEST6,        //317
-    MT_TOKEN_QUEST7,        //318
-    MT_TOKEN_QUEST8,        //319
-    MT_TOKEN_QUEST9,        //320
-    MT_TOKEN_QUEST10,       //321
-    MT_TOKEN_QUEST11,       //322
-    MT_TOKEN_QUEST12,       //323
-    MT_TOKEN_QUEST13,       //324
-    MT_TOKEN_CRYSTAL,       //325
-    MT_TOKEN_QUEST15,       //326
-    MT_GATEQUEST,       //327
-    MT_TOKEN_QUEST17,       //328
-    MT_TOKEN_QUEST18,       //329
-    MT_TOKEN_QUEST19,       //330
-    MT_TOKEN_QUEST20,       //331
-    MT_TOKEN_BISHOP,        //332
-    MT_TOKEN_QUEST22,       //333
-    MT_TOKEN_ORACLE,        //334
-    MT_TOKEN_MACIL,     //335
-    MT_TOKEN_QUEST25,       //336
-    MT_TOKEN_LOREMASTER,        //337
-    MT_SECRQUEST,       //338
-    MT_TOKEN_QUEST28,       //339
-    MT_TOKEN_QUEST29,       //340
-    MT_TOKEN_QUEST30,       //341
-    MT_TOKEN_QUEST31,       //342
-    MT_SLIDESHOW,       //343
-    NUMMOBJTYPES
-
-} mobjtype_t;
-
-// villsa [STRIFE] updated mobjinfo struct
-typedef struct
-{
-    int     doomednum;
-    int     spawnstate;
-    int     spawnhealth;
-    int     seestate;
-    int     seesound;
-    int     reactiontime;
-    int     attacksound;
-    int     painstate;
-    int     painchance;
-    int     painsound;
-    int     meleestate;
-    int     missilestate;
-    int     crashstate;
-    int     deathstate;
-    int     xdeathstate;
-    int     deathsound;
-    int     speed;
-    int     radius;
-    int     height;
-    int     mass;
-    int     damage;
-    int     activesound;
-    int     flags;
-    const char *name;
-} mobjinfo_t;
-
-extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
-
-#endif
diff --git a/games/NXDoom/src/strife/m_menu.c b/games/NXDoom/src/strife/m_menu.c
deleted file mode 100644
index d277fd3c7..000000000
--- a/games/NXDoom/src/strife/m_menu.c
+++ /dev/null
@@ -1,2466 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	DOOM selection menu, options, episode etc.
-//	Sliders and icons. Kinda widget stuff.
-//
-
-
-#include <stdlib.h>
-#include <ctype.h>
-
-
-#include "doomdef.h"
-#include "doomkeys.h"
-#include "dstrings.h"
-
-#include "d_main.h"
-#include "deh_main.h"
-
-#include "i_input.h"
-#include "i_joystick.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "i_timer.h"
-#include "i_video.h"
-#include "z_zone.h"
-#include "v_video.h"
-#include "w_wad.h"
-
-#include "r_local.h"
-
-
-#include "hu_stuff.h"
-
-#include "g_game.h"
-
-#include "m_argv.h"
-#include "m_controls.h"
-#include "m_misc.h"
-#include "m_saves.h"    // [STRIFE]
-#include "p_saveg.h"
-
-#include "s_sound.h"
-
-#include "doomstat.h"
-
-// Data.
-#include "sounds.h"
-
-#include "m_menu.h"
-#include "p_dialog.h"
-
-
-void M_QuitStrife(int);
-
-
-//
-// defaulted values
-//
-int			mouseSensitivity = 5;
-
-// [STRIFE]: removed this entirely
-// Show messages has default, 0 = off, 1 = on
-//int			showMessages = 1;
-	
-
-// Blocky mode, has default, 0 = high, 1 = normal
-int			detailLevel = 0;
-int			screenblocks = 10; // [STRIFE] default 10, not 9
-
-// temp for screenblocks (0-9)
-int			screenSize;
-
-// -1 = no quicksave slot picked!
-int			quickSaveSlot;
-
- // 1 = message to be printed
-int			messageToPrint;
-// ...and here is the message string!
-const char		*messageString;
-
-// message x & y
-int			messx;
-int			messy;
-int			messageLastMenuActive;
-
-// timed message = no input from user
-boolean			messageNeedsInput;
-
-void    (*messageRoutine)(int response);
-
-char gammamsg[5][26] =
-{
-    GAMMALVL0,
-    GAMMALVL1,
-    GAMMALVL2,
-    GAMMALVL3,
-    GAMMALVL4
-};
-
-// we are going to be entering a savegame string
-int			saveStringEnter;              
-int             	saveSlot;	// which slot to save in
-int			saveCharIndex;	// which char we're editing
-// old save description before edit
-char			saveOldString[SAVESTRINGSIZE];  
-
-boolean                 inhelpscreens;
-boolean                 menuactive;
-boolean                 menupause;      // haleyjd 08/29/10: [STRIFE] New global
-int                     menupausetime;  // haleyjd 09/04/10: [STRIFE] New global
-boolean                 menuindialog;   // haleyjd 09/04/10: ditto
-
-// haleyjd 08/27/10: [STRIFE] SKULLXOFF == -28, LINEHEIGHT == 19
-#define CURSORXOFF		-28
-#define LINEHEIGHT		19
-
-char			savegamestrings[10][SAVESTRINGSIZE];
-
-char	endstring[160];
-
-// haleyjd 09/04/10: [STRIFE] Moved menuitem / menu structures into header
-// because they are needed externally by the dialog engine.
-
-// haleyjd 08/27/10: [STRIFE] skull* stuff changed to cursor* stuff
-short		itemOn;			// menu item skull is on
-short		cursorAnimCounter;	// skull animation counter
-short		whichCursor;		// which skull to draw
-
-// graphic name of cursors
-// haleyjd 08/27/10: [STRIFE] M_SKULL* -> M_CURS*
-const char *cursorName[8] = {"M_CURS1", "M_CURS2", "M_CURS3", "M_CURS4",
-                             "M_CURS5", "M_CURS6", "M_CURS7", "M_CURS8" };
-
-// haleyjd 20110210 [STRIFE]: skill level for menus
-int menuskill;
-
-// current menudef
-menu_t*	currentMenu;                          
-
-// haleyjd 03/01/13: [STRIFE] v1.31-only:
-// Keeps track of whether the save game menu is being used to name a new
-// character slot, or to just save the current game. In the v1.31 disassembly
-// this was the new dword_8632C variable.
-boolean namingCharacter; 
-
-//
-// PROTOTYPES
-//
-void M_NewGame(int choice);
-void M_Episode(int choice);
-void M_ChooseSkill(int choice);
-void M_LoadGame(int choice);
-void M_SaveGame(int choice);
-void M_Options(int choice);
-void M_EndGame(int choice);
-void M_ReadThis(int choice);
-void M_ReadThis2(int choice);
-void M_ReadThis3(int choice); // [STRIFE]
-
-//void M_ChangeMessages(int choice); [STRIFE]
-void M_ChangeSensitivity(int choice);
-void M_SfxVol(int choice);
-void M_VoiceVol(int choice); // [STRIFE]
-void M_MusicVol(int choice);
-void M_SizeDisplay(int choice);
-void M_StartGame(int choice);
-void M_Sound(int choice);
-
-//void M_FinishReadThis(int choice); - [STRIFE] unused
-void M_SaveSelect(int choice);
-void M_ReadSaveStrings(void);
-void M_QuickSave(void);
-void M_QuickLoad(void);
-
-void M_DrawMainMenu(void);
-void M_DrawReadThis1(void);
-void M_DrawReadThis2(void);
-void M_DrawReadThis3(void); // [STRIFE]
-void M_DrawNewGame(void);
-void M_DrawEpisode(void);
-void M_DrawOptions(void);
-void M_DrawSound(void);
-void M_DrawLoad(void);
-void M_DrawSave(void);
-
-void M_DrawSaveLoadBorder(int x,int y);
-void M_SetupNextMenu(menu_t *menudef);
-void M_DrawThermo(int x,int y,int thermWidth,int thermDot);
-void M_DrawEmptyCell(menu_t *menu,int item);
-void M_DrawSelCell(menu_t *menu,int item);
-int  M_StringWidth(const char *string);
-int  M_StringHeight(const char *string);
-void M_StartMessage(const char *string,void *routine,boolean input);
-void M_StopMessage(void);
-
-
-
-
-//
-// DOOM MENU
-//
-enum
-{
-    newgame = 0,
-    options,
-    loadgame,
-    savegame,
-    readthis,
-    quitdoom,
-    main_end
-} main_e;
-
-menuitem_t MainMenu[]=
-{
-    {1,"M_NGAME",M_NewGame,'n'},
-    {1,"M_OPTION",M_Options,'o'},
-    {1,"M_LOADG",M_LoadGame,'l'},
-    {1,"M_SAVEG",M_SaveGame,'s'},
-    // Another hickup with Special edition.
-    {1,"M_RDTHIS",M_ReadThis,'h'}, // haleyjd 08/28/10: 'r' -> 'h'
-    {1,"M_QUITG",M_QuitStrife,'q'}
-};
-
-menu_t  MainDef =
-{
-    main_end,
-    NULL,
-    MainMenu,
-    M_DrawMainMenu,
-    97,45, // haleyjd 08/28/10: [STRIFE] changed y coord
-    0
-};
-
-
-//
-// EPISODE SELECT
-//
-/*
-enum
-{
-    ep1,
-    ep2,
-    ep3,
-    ep4,
-    ep_end
-} episodes_e;
-
-menuitem_t EpisodeMenu[]=
-{
-    {1,"M_EPI1", M_Episode,'k'},
-    {1,"M_EPI2", M_Episode,'t'},
-    {1,"M_EPI3", M_Episode,'i'},
-    {1,"M_EPI4", M_Episode,'t'}
-};
-
-menu_t  EpiDef =
-{
-    ep_end,		// # of menu items
-    &MainDef,		// previous menu
-    EpisodeMenu,	// menuitem_t ->
-    M_DrawEpisode,	// drawing routine ->
-    48,63,              // x,y
-    ep1			// lastOn
-};
-*/
-
-//
-// NEW GAME
-//
-enum
-{
-    killthings,
-    toorough,
-    hurtme,
-    violence,
-    nightmare,
-    newg_end
-} newgame_e;
-
-menuitem_t NewGameMenu[]=
-{
-    // haleyjd 08/28/10: [STRIFE] changed all shortcut letters
-    {1,"M_JKILL",   M_ChooseSkill, 't'},
-    {1,"M_ROUGH",   M_ChooseSkill, 'r'},
-    {1,"M_HURT",    M_ChooseSkill, 'v'},
-    {1,"M_ULTRA",   M_ChooseSkill, 'e'},
-    {1,"M_NMARE",   M_ChooseSkill, 'b'}
-};
-
-menu_t  NewDef =
-{
-    newg_end,           // # of menu items
-    &MainDef,           // previous menu - haleyjd [STRIFE] changed to MainDef
-    NewGameMenu,        // menuitem_t ->
-    M_DrawNewGame,      // drawing routine ->
-    48,63,              // x,y
-    toorough            // lastOn - haleyjd [STRIFE]: default to skill 1
-};
-
-//
-// OPTIONS MENU
-//
-enum
-{
-    // haleyjd 08/28/10: [STRIFE] Removed messages, mouse sens., detail.
-    endgame,
-    scrnsize,
-    option_empty1,
-    soundvol,
-    opt_end
-} options_e;
-
-menuitem_t OptionsMenu[]=
-{
-    // haleyjd 08/28/10: [STRIFE] Removed messages, mouse sens., detail.
-    {1,"M_ENDGAM",	M_EndGame,'e'},
-    {2,"M_SCRNSZ",	M_SizeDisplay,'s'},
-    {-1,"",0,'\0'},
-    {1,"M_SVOL",	M_Sound,'s'}
-};
-
-menu_t  OptionsDef =
-{
-    opt_end,
-    &MainDef,
-    OptionsMenu,
-    M_DrawOptions,
-    60,37,
-    0
-};
-
-//
-// Read This! MENU 1 & 2 & [STRIFE] 3
-//
-enum
-{
-    rdthsempty1,
-    read1_end
-} read_e;
-
-menuitem_t ReadMenu1[] =
-{
-    {1,"",M_ReadThis2,0}
-};
-
-menu_t  ReadDef1 =
-{
-    read1_end,
-    &MainDef,
-    ReadMenu1,
-    M_DrawReadThis1,
-    280,185,
-    0
-};
-
-enum
-{
-    rdthsempty2,
-    read2_end
-} read_e2;
-
-menuitem_t ReadMenu2[]=
-{
-    {1,"",M_ReadThis3,0} // haleyjd 08/28/10: [STRIFE] Go to ReadThis3
-};
-
-menu_t  ReadDef2 =
-{
-    read2_end,
-    &ReadDef1,
-    ReadMenu2,
-    M_DrawReadThis2,
-    250,185, // haleyjd 08/28/10: [STRIFE] changed coords
-    0
-};
-
-// haleyjd 08/28/10: Added Read This! menu 3
-enum
-{
-    rdthsempty3,
-    read3_end
-} read_e3;
-
-menuitem_t ReadMenu3[]=
-{
-    {1,"",M_ClearMenus,0}
-};
-
-menu_t  ReadDef3 =
-{
-    read3_end,
-    &ReadDef2,
-    ReadMenu3,
-    M_DrawReadThis3,
-    250, 185,
-    0
-};
-
-//
-// SOUND VOLUME MENU
-//
-enum
-{
-    sfx_vol,
-    sfx_empty1,
-    music_vol,
-    sfx_empty2,
-    voice_vol,
-    sfx_empty3,
-    sfx_mouse,
-    sfx_empty4,
-    sound_end
-} sound_e;
-
-// haleyjd 08/29/10:
-// [STRIFE] 
-// * Added voice volume
-// * Moved mouse sensitivity here (who knows why...)
-menuitem_t SoundMenu[]=
-{
-    {2,"M_SFXVOL",M_SfxVol,'s'},
-    {-1,"",0,'\0'},
-    {2,"M_MUSVOL",M_MusicVol,'m'},
-    {-1,"",0,'\0'},
-    {2,"M_VOIVOL",M_VoiceVol,'v'}, 
-    {-1,"",0,'\0'},
-    {2,"M_MSENS",M_ChangeSensitivity,'m'},
-    {-1,"",0,'\0'}
-};
-
-menu_t  SoundDef =
-{
-    sound_end,
-    &OptionsDef,
-    SoundMenu,
-    M_DrawSound,
-    80,35,       // [STRIFE] changed y coord 64 -> 35
-    0
-};
-
-//
-// LOAD GAME MENU
-//
-enum
-{
-    load1,
-    load2,
-    load3,
-    load4,
-    load5,
-    load6,
-    load_end
-} load_e;
-
-menuitem_t LoadMenu[]=
-{
-    {1,"", M_LoadSelect,'1'},
-    {1,"", M_LoadSelect,'2'},
-    {1,"", M_LoadSelect,'3'},
-    {1,"", M_LoadSelect,'4'},
-    {1,"", M_LoadSelect,'5'},
-    {1,"", M_LoadSelect,'6'}
-};
-
-menu_t  LoadDef =
-{
-    load_end,
-    &MainDef,
-    LoadMenu,
-    M_DrawLoad,
-    80,54,
-    0
-};
-
-//
-// SAVE GAME MENU
-//
-menuitem_t SaveMenu[]=
-{
-    {1,"", M_SaveSelect,'1'},
-    {1,"", M_SaveSelect,'2'},
-    {1,"", M_SaveSelect,'3'},
-    {1,"", M_SaveSelect,'4'},
-    {1,"", M_SaveSelect,'5'},
-    {1,"", M_SaveSelect,'6'}
-};
-
-menu_t  SaveDef =
-{
-    load_end,
-    &MainDef,
-    SaveMenu,
-    M_DrawSave,
-    80,54,
-    0
-};
-
-void M_DrawNameChar(void);
-
-//
-// NAME CHARACTER MENU
-//
-// [STRIFE]
-// haleyjd 20110210: New "Name Your Character" Menu
-//
-menu_t NameCharDef =
-{
-    load_end,
-    &NewDef,
-    SaveMenu,
-    M_DrawNameChar,
-    80,54,
-    0
-};
-
-
-//
-// M_ReadSaveStrings
-//  read the strings from the savegame files
-//
-// [STRIFE]
-// haleyjd 20110210: Rewritten to read "name" file in each slot directory
-//
-void M_ReadSaveStrings(void)
-{
-    FILE *handle;
-    int   i;
-    char *fname = NULL;
-
-    for(i = 0; i < load_end; i++)
-    {
-        int retval;
-        if(fname)
-            Z_Free(fname);
-        fname = M_SafeFilePath(savegamedir, M_MakeStrifeSaveDir(i, "\\name"));
-
-        handle = M_fopen(fname, "rb");
-        if(handle == NULL)
-        {
-            M_StringCopy(savegamestrings[i], DEH_String(EMPTYSTRING),
-                         sizeof(savegamestrings[i]));
-            LoadMenu[i].status = 0;
-            continue;
-        }
-        retval = fread(savegamestrings[i], 1, SAVESTRINGSIZE, handle);
-        fclose(handle);
-        LoadMenu[i].status = retval == SAVESTRINGSIZE;
-    }
-
-    if(fname)
-        Z_Free(fname);
-}
-
-//
-// M_DrawNameChar
-//
-// haleyjd 09/22/10: [STRIFE] New function
-// Handler for drawing the "Name Your Character" menu.
-//
-void M_DrawNameChar(void)
-{
-    int i;
-
-    M_WriteText(72, 28, DEH_String("Name Your Character"));
-
-    for (i = 0;i < load_end; i++)
-    {
-        M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
-        M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
-    }
-
-    if (saveStringEnter)
-    {
-        i = M_StringWidth(savegamestrings[quickSaveSlot]);
-        M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*quickSaveSlot,"_");
-    }
-}
-
-//
-// M_DoNameChar
-//
-// haleyjd 09/22/10: [STRIFE] New function
-// Handler for items in the "Name Your Character" menu.
-//
-void M_DoNameChar(int choice)
-{
-    int map;
-
-    // 20130301: clear naming character flag for 1.31 save logic
-    if(gameversion == exe_strife_1_31)
-        namingCharacter = false;
-    sendsave = 1;
-    ClearTmp();
-    G_WriteSaveName(choice, savegamestrings[choice]);
-    quickSaveSlot = choice;  
-    SaveDef.lastOn = choice;
-    ClearSlot();
-    FromCurr();
-    
-    if(isdemoversion)
-        map = 33;
-    else
-        map = 2;
-
-    G_DeferedInitNew(menuskill, map);
-    M_ClearMenus(0);
-}
-
-//
-// M_LoadGame & Cie.
-//
-void M_DrawLoad(void)
-{
-    int             i;
-
-    V_DrawPatchDirect(72, 28, 
-                      W_CacheLumpName(DEH_String("M_LOADG"), PU_CACHE));
-
-    for (i = 0;i < load_end; i++)
-    {
-        M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
-        M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
-    }
-}
-
-
-
-//
-// Draw border for the savegame description
-//
-void M_DrawSaveLoadBorder(int x,int y)
-{
-    int             i;
-
-    V_DrawPatchDirect(x - 8, y + 7,
-                      W_CacheLumpName(DEH_String("M_LSLEFT"), PU_CACHE));
-
-    for (i = 0;i < 24;i++)
-    {
-        V_DrawPatchDirect(x, y + 7,
-                          W_CacheLumpName(DEH_String("M_LSCNTR"), PU_CACHE));
-        x += 8;
-    }
-
-    V_DrawPatchDirect(x, y + 7, 
-                      W_CacheLumpName(DEH_String("M_LSRGHT"), PU_CACHE));
-}
-
-
-
-//
-// User wants to load this game
-//
-void M_LoadSelect(int choice)
-{
-    // [STRIFE]: completely rewritten
-    char *name = NULL;
-
-    G_WriteSaveName(choice, savegamestrings[choice]);
-    ToCurr();
-
-    // use safe & portable filepath concatenation for Choco
-    name = M_SafeFilePath(savegamedir, M_MakeStrifeSaveDir(choice, ""));
-
-    G_ReadCurrent(name);
-    quickSaveSlot = choice;
-    M_ClearMenus(0);
-
-    Z_Free(name);
-}
-
-//
-// Selected from DOOM menu
-//
-// [STRIFE] Verified unmodified
-//
-void M_LoadGame (int choice)
-{
-    if (netgame)
-    {
-        M_StartMessage(DEH_String(LOADNET), NULL, false);
-        return;
-    }
-
-    M_SetupNextMenu(&LoadDef);
-    M_ReadSaveStrings();
-}
-
-
-//
-//  M_SaveGame & Cie.
-//
-void M_DrawSave(void)
-{
-    int             i;
-
-    V_DrawPatchDirect(72, 28, W_CacheLumpName(DEH_String("M_SAVEG"), PU_CACHE));
-    for (i = 0;i < load_end; i++)
-    {
-        M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
-        M_WriteText(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
-    }
-
-    if (saveStringEnter)
-    {
-        i = M_StringWidth(savegamestrings[quickSaveSlot]);
-        M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*quickSaveSlot,"_");
-    }
-}
-
-//
-// M_Responder calls this when user is finished
-//
-void M_DoSave(int slot)
-{
-    // [STRIFE]: completely rewritten
-    if(slot >= 0)
-    {
-        sendsave = 1;
-        G_WriteSaveName(slot, savegamestrings[slot]);
-        M_ClearMenus(0);
-        quickSaveSlot = slot;        
-        // haleyjd 20130922: slight divergence. We clear the destination slot 
-        // of files here, which vanilla did not do. As a result, 1.31 had 
-        // broken save behavior to the point of unusability. fraggle agrees 
-        // this is detrimental enough to be fixed - unconditionally, for now.
-        ClearSlot();        
-        FromCurr();
-    }
-    else
-        M_StartMessage(DEH_String(QSAVESPOT), NULL, false);
-}
-
-//
-// User wants to save. Start string input for M_Responder
-//
-void M_SaveSelect(int choice)
-{
-    int x, y;
-
-    // we are going to be intercepting all chars
-    saveStringEnter = 1;
-
-    // We need to turn on text input:
-    x = LoadDef.x - 11;
-    y = LoadDef.y + choice * LINEHEIGHT - 4;
-    I_StartTextInput(x, y, x + 8 + 24 * 8 + 8, y + LINEHEIGHT - 2);
-
-    // [STRIFE]
-    quickSaveSlot = choice;
-    //saveSlot = choice;
-
-    M_StringCopy(saveOldString, savegamestrings[choice], sizeof(saveOldString));
-    if (!strcmp(savegamestrings[choice], DEH_String(EMPTYSTRING)))
-        savegamestrings[choice][0] = 0;
-    saveCharIndex = strlen(savegamestrings[choice]);
-}
-
-//
-// Selected from DOOM menu
-//
-void M_SaveGame (int choice)
-{
-    // [STRIFE]
-    if (netgame)
-    {
-        // haleyjd 20110211: Hooray for Rogue's awesome multiplayer support...
-        M_StartMessage(DEH_String("You can't save a netgame"), NULL, false);
-        return;
-    }
-    if (!usergame)
-    {
-        M_StartMessage(DEH_String(SAVEDEAD),NULL,false);
-        return;
-    }
-
-    if (gamestate != GS_LEVEL)
-        return;
-
-    // [STRIFE]
-    if(gameversion == exe_strife_1_31)
-    {
-        // haleyjd 20130301: in 1.31, we can choose a slot again.
-        M_SetupNextMenu(&SaveDef);
-        M_ReadSaveStrings();
-    }
-    else
-    {
-        // In 1.2 and lower, you save over your character slot exclusively
-        M_ReadSaveStrings();
-        M_DoSave(quickSaveSlot);
-    }
-}
-
-
-
-//
-//      M_QuickSave
-//
-char    tempstring[80];
-
-void M_QuickSaveResponse(int key)
-{
-    if (key == key_menu_confirm)
-    {
-        M_DoSave(quickSaveSlot);
-        S_StartSound(NULL, sfx_mtalht); // [STRIFE] sound
-    }
-}
-
-void M_QuickSave(void)
-{
-    if (netgame)
-    {
-        // haleyjd 20110211 [STRIFE]: More fun...
-        M_StartMessage(DEH_String("You can't save a netgame"), NULL, false);
-        return;
-    }
-
-    if (!usergame)
-    {
-        S_StartSound(NULL, sfx_oof);
-        return;
-    }
-
-    if (gamestate != GS_LEVEL)
-        return;
-
-    if (quickSaveSlot < 0)
-    {
-        M_StartControlPanel();
-        M_ReadSaveStrings();
-        M_SetupNextMenu(&SaveDef);
-        quickSaveSlot = -2;	// means to pick a slot now
-        return;
-    }
-    DEH_snprintf(tempstring, 80, QSPROMPT, savegamestrings[quickSaveSlot]);
-    M_StartMessage(tempstring,M_QuickSaveResponse,true);
-}
-
-
-
-//
-// M_QuickLoadResponse
-//
-void M_QuickLoadResponse(int key)
-{
-    if (key == key_menu_confirm)
-    {
-        M_LoadSelect(quickSaveSlot);
-        S_StartSound(NULL, sfx_mtalht); // [STRIFE] sound
-    }
-}
-
-//
-// M_QuickLoad
-//
-// [STRIFE] Verified unmodified
-//
-void M_QuickLoad(void)
-{
-    if (netgame)
-    {
-        M_StartMessage(DEH_String(QLOADNET),NULL,false);
-        return;
-    }
-
-    if (quickSaveSlot < 0)
-    {
-        M_StartMessage(DEH_String(QSAVESPOT),NULL,false);
-        return;
-    }
-    DEH_snprintf(tempstring, 80, QLPROMPT, savegamestrings[quickSaveSlot]);
-    M_StartMessage(tempstring,M_QuickLoadResponse,true);
-}
-
-
-
-
-//
-// Read This Menus
-// Had a "quick hack to fix romero bug"
-// haleyjd 08/28/10: [STRIFE] Draw HELP1, unconditionally.
-//
-void M_DrawReadThis1(void)
-{
-    inhelpscreens = true;
-
-    V_DrawPatchDirect (0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE));
-}
-
-
-
-//
-// Read This Menus
-// haleyjd 08/28/10: [STRIFE] Not optional, draws HELP2
-//
-void M_DrawReadThis2(void)
-{
-    inhelpscreens = true;
-
-    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP2"), PU_CACHE));
-}
-
-
-//
-// Read This Menus
-// haleyjd 08/28/10: [STRIFE] New function to draw HELP3.
-//
-void M_DrawReadThis3(void)
-{
-    inhelpscreens = true;
-    
-    V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP3"), PU_CACHE));
-}
-
-//
-// Change Sfx & Music volumes
-//
-// haleyjd 08/29/10: [STRIFE]
-// * Changed title graphic coordinates
-// * Added voice volume and sensitivity sliders
-//
-void M_DrawSound(void)
-{
-    V_DrawPatchDirect (100, 10, W_CacheLumpName(DEH_String("M_SVOL"), PU_CACHE));
-
-    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_vol+1),
-                 16,sfxVolume);
-
-    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(music_vol+1),
-                 16,musicVolume);
-
-    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(voice_vol+1),
-                 16,voiceVolume);
-
-    M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_mouse+1),
-                 16,mouseSensitivity);
-}
-
-void M_Sound(int choice)
-{
-    M_SetupNextMenu(&SoundDef);
-}
-
-void M_SfxVol(int choice)
-{
-    switch(choice)
-    {
-    case 0:
-        if (sfxVolume)
-            sfxVolume--;
-        break;
-    case 1:
-        if (sfxVolume < 15)
-            sfxVolume++;
-        break;
-    }
-
-    S_SetSfxVolume(sfxVolume * 8);
-}
-
-//
-// M_VoiceVol
-//
-// haleyjd 08/29/10: [STRIFE] New function
-// Sets voice volume level.
-//
-void M_VoiceVol(int choice)
-{
-    switch(choice)
-    {
-    case 0:
-        if (voiceVolume)
-            voiceVolume--;
-        break;
-    case 1:
-        if (voiceVolume < 15)
-            voiceVolume++;
-        break;
-    }
-
-    S_SetVoiceVolume(voiceVolume * 8);
-}
-
-void M_MusicVol(int choice)
-{
-    switch(choice)
-    {
-    case 0:
-        if (musicVolume)
-            musicVolume--;
-        break;
-    case 1:
-        if (musicVolume < 15)
-            musicVolume++;
-        break;
-    }
-
-    S_SetMusicVolume(musicVolume * 8);
-}
-
-
-
-
-//
-// M_DrawMainMenu
-//
-// haleyjd 08/27/10: [STRIFE] Changed x coordinate; M_DOOM -> M_STRIFE
-//
-void M_DrawMainMenu(void)
-{
-    V_DrawPatchDirect(84, 2,
-                      W_CacheLumpName(DEH_String("M_STRIFE"), PU_CACHE));
-}
-
-
-
-
-//
-// M_NewGame
-//
-// haleyjd 08/31/10: [STRIFE] Changed M_NEWG -> M_NGAME
-//
-void M_DrawNewGame(void)
-{
-    V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NGAME"), PU_CACHE));
-    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_SKILL"), PU_CACHE));
-}
-
-void M_NewGame(int choice)
-{
-    if (netgame && !demoplayback)
-    {
-        M_StartMessage(DEH_String(NEWGAME),NULL,false);
-        return;
-    }
-    // haleyjd 09/07/10: [STRIFE] Removed Chex Quest and DOOM gamemodes
-    if(gameversion == exe_strife_1_31)
-       namingCharacter = true; // for 1.31 save logic
-    M_SetupNextMenu(&NewDef);
-}
-
-
-//
-//      M_Episode
-//
-
-// haleyjd: [STRIFE] Unused
-/*
-int     epi;
-
-void M_DrawEpisode(void)
-{
-    V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_EPISOD"), PU_CACHE));
-}
-
-void M_VerifyNightmare(int key)
-{
-    if (key != key_menu_confirm)
-        return;
-
-    G_DeferedInitNew(nightmare, 1);
-    M_ClearMenus (0);
-}
-*/
-
-void M_ChooseSkill(int choice)
-{
-    // haleyjd 09/07/10: Removed nightmare confirmation
-    // [STRIFE]: start "Name Your Character" menu
-    menuskill = choice;
-    currentMenu = &NameCharDef;
-    itemOn = NameCharDef.lastOn;
-    M_ReadSaveStrings();
-}
-
-/*
-// haleyjd [STRIFE] Unused
-void M_Episode(int choice)
-{
-    if ( (gamemode == shareware)
-	 && choice)
-    {
-	M_StartMessage(DEH_String(SWSTRING),NULL,false);
-	M_SetupNextMenu(&ReadDef1);
-	return;
-    }
-
-    // Yet another hack...
-    if ( (gamemode == registered)
-	 && (choice > 2))
-    {
-      fprintf( stderr,
-	       "M_Episode: 4th episode requires UltimateDOOM\n");
-      choice = 0;
-    }
-	 
-    epi = choice;
-    M_SetupNextMenu(&NewDef);
-}
-*/
-
-
-//
-// M_Options
-//
-char    detailNames[2][9]	= {"M_GDHIGH","M_GDLOW"};
-char	msgNames[2][9]		= {"M_MSGOFF","M_MSGON"};
-
-
-void M_DrawOptions(void)
-{
-    // haleyjd 08/27/10: [STRIFE] M_OPTTTL -> M_OPTION
-    V_DrawPatchDirect(108, 15, 
-                      W_CacheLumpName(DEH_String("M_OPTION"), PU_CACHE));
-
-    // haleyjd 08/26/10: [STRIFE] Removed messages, sensitivity, detail.
-
-    M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(scrnsize+1),
-                 9,screenSize);
-}
-
-void M_Options(int choice)
-{
-    M_SetupNextMenu(&OptionsDef);
-}
-
-//
-// M_AutoUseHealth
-//
-// [STRIFE] New function
-// haleyjd 20110211: toggle autouse health state
-//
-void M_AutoUseHealth(void)
-{
-    if(!netgame && usergame)
-    {
-        players[consoleplayer].cheats ^= CF_AUTOHEALTH;
-
-        if(players[consoleplayer].cheats & CF_AUTOHEALTH)
-            players[consoleplayer].message = DEH_String("Auto use health ON");
-        else
-            players[consoleplayer].message = DEH_String("Auto use health OFF");
-    }
-}
-
-//
-// M_ChangeShowText
-//
-// [STRIFE] New function
-//
-void M_ChangeShowText(void)
-{
-    dialogshowtext ^= true;
-
-    if(dialogshowtext)
-        players[consoleplayer].message = DEH_String("Conversation Text On");
-    else
-        players[consoleplayer].message = DEH_String("Conversation Text Off");
-}
-
-//
-//      Toggle messages on/off
-//
-// [STRIFE] Messages cannot be disabled in Strife
-/*
-void M_ChangeMessages(int choice)
-{
-    // warning: unused parameter `int choice'
-    choice = 0;
-    showMessages = 1 - showMessages;
-
-    if (!showMessages)
-        players[consoleplayer].message = DEH_String(MSGOFF);
-    else
-        players[consoleplayer].message = DEH_String(MSGON);
-
-    message_dontfuckwithme = true;
-}
-*/
-
-
-//
-// M_EndGame
-//
-void M_EndGameResponse(int key)
-{
-    if (key != key_menu_confirm)
-        return;
-
-    currentMenu->lastOn = itemOn;
-    M_ClearMenus (0);
-    D_StartTitle ();
-}
-
-void M_EndGame(int choice)
-{
-    choice = 0;
-    if (!usergame)
-    {
-        S_StartSound(NULL,sfx_oof);
-        return;
-    }
-
-    if (netgame)
-    {
-        M_StartMessage(DEH_String(NETEND),NULL,false);
-        return;
-    }
-
-    M_StartMessage(DEH_String(ENDGAME),M_EndGameResponse,true);
-}
-
-
-
-
-//
-// M_ReadThis
-//
-void M_ReadThis(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&ReadDef1);
-}
-
-//
-// M_ReadThis2
-//
-// haleyjd 08/28/10: [STRIFE] Eliminated DOOM stuff.
-//
-void M_ReadThis2(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&ReadDef2);
-}
-
-//
-// M_ReadThis3
-//
-// haleyjd 08/28/10: [STRIFE] New function.
-//
-void M_ReadThis3(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&ReadDef3);
-}
-
-/*
-// haleyjd 08/28/10: [STRIFE] Not used.
-void M_FinishReadThis(int choice)
-{
-    choice = 0;
-    M_SetupNextMenu(&MainDef);
-}
-*/
-
-#if 0
-
-//
-// M_CheckStartCast
-//
-// [STRIFE] New but unused function. Was going to start a cast
-//   call from within the menu system... not functional even in
-//   the earliest demo version.
-//
-void M_CheckStartCast()
-{
-    if(usergame)
-    {
-        M_StartMessage(DEH_String("You have to end your game first."), NULL, false);
-        return;
-    }
-
-    F_StartCast();
-    M_ClearMenus(0);
-}
-#endif
-
-//
-// M_QuitResponse
-//
-// haleyjd 09/11/10: [STRIFE] Modifications to start up endgame
-// demosequence.
-//
-void M_QuitResponse(int key)
-{
-    char buffer[20];
-
-    if (key != key_menu_confirm)
-        return;
-
-    if(netgame)
-        I_Quit();
-    else
-    {
-        DEH_snprintf(buffer, sizeof(buffer), "qfmrm%i", gametic % 8 + 1);
-        I_StartVoice(buffer);
-        D_QuitGame();
-    }
-}
-
-/*
-// haleyjd 09/11/10: [STRIFE] Unused
-static char *M_SelectEndMessage(void)
-{
-}
-*/
-
-//
-// M_QuitStrife
-//
-// [STRIFE] Renamed from M_QuitDOOM
-// haleyjd 09/11/10: No randomized text message; that's taken care of
-// by the randomized voice message after confirmation.
-//
-void M_QuitStrife(int choice)
-{
-    DEH_snprintf(endstring, sizeof(endstring),
-                 "Do you really want to leave?\n\n" DOSY);
-  
-    M_StartMessage(endstring, M_QuitResponse, true);
-}
-
-
-
-
-void M_ChangeSensitivity(int choice)
-{
-    switch(choice)
-    {
-    case 0:
-        if (mouseSensitivity)
-            mouseSensitivity--;
-        break;
-    case 1:
-        if (mouseSensitivity < 9)
-            mouseSensitivity++;
-        break;
-    }
-}
-
-/*
-// haleyjd [STRIFE] Unused
-void M_ChangeDetail(int choice)
-{
-    choice = 0;
-    detailLevel = 1 - detailLevel;
-
-    R_SetViewSize (screenblocks, detailLevel);
-
-    if (!detailLevel)
-	players[consoleplayer].message = DEH_String(DETAILHI);
-    else
-	players[consoleplayer].message = DEH_String(DETAILLO);
-}
-*/
-
-// [STRIFE] Verified unmodified
-void M_SizeDisplay(int choice)
-{
-    switch(choice)
-    {
-    case 0:
-        if (screenSize > 0)
-        {
-            screenblocks--;
-            screenSize--;
-        }
-        break;
-    case 1:
-        if (screenSize < 8)
-        {
-            screenblocks++;
-            screenSize++;
-        }
-        break;
-    }
-
-    R_SetViewSize (screenblocks, detailLevel);
-}
-
-
-
-
-//
-//      Menu Functions
-//
-
-//
-// M_DrawThermo
-//
-// haleyjd 08/28/10: [STRIFE] Changes to some patch coordinates.
-//
-void
-M_DrawThermo
-( int	x,
-  int	y,
-  int	thermWidth,
-  int	thermDot )
-{
-    int         xx;
-    int         yy; // [STRIFE] Needs a temp y coordinate variable
-    int         i;
-
-    xx = x;
-    yy = y + 6; // [STRIFE] +6 to y coordinate
-    V_DrawPatchDirect(xx, yy, W_CacheLumpName(DEH_String("M_THERML"), PU_CACHE));
-    xx += 8;
-    for (i=0;i<thermWidth;i++)
-    {
-        V_DrawPatchDirect(xx, yy, W_CacheLumpName(DEH_String("M_THERMM"), PU_CACHE));
-        xx += 8;
-    }
-    V_DrawPatchDirect(xx, yy, W_CacheLumpName(DEH_String("M_THERMR"), PU_CACHE));
-
-    // [STRIFE] +2 to initial y coordinate
-    V_DrawPatchDirect((x + 8) + thermDot * 8, y + 2,
-                      W_CacheLumpName(DEH_String("M_THERMO"), PU_CACHE));
-}
-
-
-// haleyjd: These are from DOOM v0.5 and the prebeta! They drew those ugly red &
-// blue checkboxes... preserved for historical interest, as not in Strife.
-void
-M_DrawEmptyCell
-( menu_t*	menu,
-  int		item )
-{
-    V_DrawPatchDirect(menu->x - 10, menu->y + item * LINEHEIGHT - 1, 
-                      W_CacheLumpName(DEH_String("M_CELL1"), PU_CACHE));
-}
-
-void
-M_DrawSelCell
-( menu_t*	menu,
-  int		item )
-{
-    V_DrawPatchDirect(menu->x - 10, menu->y + item * LINEHEIGHT - 1,
-                      W_CacheLumpName(DEH_String("M_CELL2"), PU_CACHE));
-}
-
-
-void
-M_StartMessage
-( const char	*string,
-  void*		routine,
-  boolean	input )
-{
-    messageLastMenuActive = menuactive;
-    messageToPrint = 1;
-    messageString = string;
-    messageRoutine = routine;
-    messageNeedsInput = input;
-    menuactive = true;
-    return;
-}
-
-
-
-void M_StopMessage(void)
-{
-    menuactive = messageLastMenuActive;
-    messageToPrint = 0;
-}
-
-
-
-//
-// Find string width from hu_font chars
-//
-int M_StringWidth(const char *string)
-{
-    size_t             i;
-    int             w = 0;
-    int             c;
-
-    for (i = 0;i < strlen(string);i++)
-    {
-        c = toupper(string[i]) - HU_FONTSTART;
-        if (c < 0 || c >= HU_FONTSIZE)
-            w += 4;
-        else
-            w += SHORT (hu_font[c]->width);
-    }
-
-    return w;
-}
-
-
-
-//
-//      Find string height from hu_font chars
-//
-int M_StringHeight(const char *string)
-{
-    size_t             i;
-    int             h;
-    int             height = SHORT(hu_font[0]->height);
-
-    h = height;
-    for (i = 0;i < strlen(string);i++)
-        if (string[i] == '\n')
-            h += height;
-
-    return h;
-}
-
-
-//
-// M_WriteText
-//
-// Write a string using the hu_font
-// haleyjd 09/04/10: [STRIFE]
-// * Rogue made a lot of changes to this for the dialog system.
-//
-int
-M_WriteText
-( int           x,
-  int           y,
-  const char*   string) // haleyjd: made const for safety w/dialog engine
-{
-    int	        w;
-    const char* ch;
-    int         c;
-    int         cx;
-    int         cy;
-
-    ch = string;
-    cx = x;
-    cy = y;
-
-    while(1)
-    {
-        c = *ch++;
-        if (!c)
-            break;
-
-        // haleyjd 09/04/10: [STRIFE] Don't draw spaces at the start of lines.
-        if(c == ' ' && cx == x)
-            continue;
-
-        if (c == '\n')
-        {
-            cx = x;
-            cy += 11; // haleyjd 09/04/10: [STRIFE]: Changed 12 -> 11
-            continue;
-        }
-
-        c = toupper(c) - HU_FONTSTART;
-        if (c < 0 || c>= HU_FONTSIZE)
-        {
-            cx += 4;
-            continue;
-        }
-
-        w = SHORT (hu_font[c]->width);
-
-        // haleyjd 09/04/10: [STRIFE] Different linebreak handling
-        if (cx + w > SCREENWIDTH - 20)
-        {
-            cx = x;
-            cy += 11;
-            --ch;
-        }
-        else
-        {
-            V_DrawPatchDirect(cx, cy, hu_font[c]);
-            cx += w;
-        }
-    }
-
-    // [STRIFE] Return final y coordinate.
-    return cy + 12;
-}
-
-//
-// M_DialogDimMsg
-//
-// [STRIFE] New function
-// haleyjd 09/04/10: Painstakingly transformed from the assembly code, as the
-// decompiler could not touch it. Redimensions a string to fit on screen, leaving
-// at least a 20 pixel margin on the right side. The string passed in must be
-// writable.
-//
-void M_DialogDimMsg(int x, int y, char *str, boolean useyfont)
-{
-    int rightbound = (SCREENWIDTH - 20) - x;
-    patch_t **fontarray;  // ebp
-    int linewidth = 0;    // esi
-    int i = 0;            // edx
-    char *message = str;  // edi
-    char  bl;             // bl
-
-    if(useyfont)
-       fontarray = yfont;
-    else
-       fontarray = hu_font;
-
-    bl = toupper(*message);
-
-    if(!bl)
-        return;
-
-    // outer loop - run to end of string
-    do
-    {
-        if(bl != '\n')
-        {
-            int charwidth; // eax
-            int tempwidth; // ecx
-
-            if(bl < HU_FONTSTART || bl > HU_FONTEND)
-                charwidth = 4;
-            else
-                charwidth = SHORT(fontarray[bl - HU_FONTSTART]->width);
-
-            tempwidth = linewidth + charwidth;
-
-            // Test if the line still fits within the boundary...
-            if(tempwidth >= rightbound)
-            {
-                // Doesn't fit...
-                char *tempptr = &message[i]; // ebx
-                char  al;                    // al
-
-                // inner loop - run backward til a space (or the start of the
-                // string) is found, subtracting width off the current line.
-                // BUG: shouldn't we stop at a previous '\n' too?
-                while(*tempptr != ' ' && i > 0)
-                {
-                    tempptr--;
-                    // BUG: they didn't add the first char to linewidth yet...
-                    linewidth -= charwidth; 
-                    i--;
-                    al = toupper(*tempptr);
-                    if(al < HU_FONTSTART || al > HU_FONTEND)
-                        charwidth = 4;
-                    else
-                        charwidth = SHORT(fontarray[al - HU_FONTSTART]->width);
-                }
-                // Replace the space with a linebreak.
-                // BUG: what if i is zero? ... infinite loop time!
-                message[i] = '\n';
-                linewidth = 0;
-            }
-            else
-            {
-                // The line does fit.
-                // Spaces at the start of a line don't count though.
-                if(!(bl == ' ' && linewidth == 0))
-                    linewidth += charwidth;
-            }
-        }
-        else
-            linewidth = 0; // '\n' seen, so reset the line width
-    }
-    while((bl = toupper(message[++i])) != 0); // step to the next character
-}
-
-// These keys evaluate to a "null" key in Vanilla Doom that allows weird
-// jumping in the menus. Preserve this behavior for accuracy.
-
-static boolean IsNullKey(int key)
-{
-    return key == KEY_PAUSE || key == KEY_CAPSLOCK
-        || key == KEY_SCRLCK || key == KEY_NUMLOCK;
-}
-
-//
-// CONTROL PANEL
-//
-
-//
-// M_Responder
-//
-boolean M_Responder (event_t* ev)
-{
-    int             ch;
-    int             key;
-    int             i;
-    static  int     joywait = 0;
-    static  int     mousewait = 0;
-    static  int     mousey = 0;
-    static  int     lasty = 0;
-    static  int     mousex = 0;
-    static  int     lastx = 0;
-    int dir;
-
-    // In testcontrols mode, none of the function keys should do anything
-    // - the only key is escape to quit.
-
-    if (testcontrols)
-    {
-        if (ev->type == ev_quit
-         || (ev->type == ev_keydown
-          && (ev->data1 == key_menu_activate || ev->data1 == key_menu_quit)))
-        {
-            I_Quit();
-            return true;
-        }
-
-        return false;
-    }
-
-    // "close" button pressed on window?
-    if (ev->type == ev_quit)
-    {
-        // First click on close button = bring up quit confirm message.
-        // Second click on close button = confirm quit
-
-        if (menuactive && messageToPrint && messageRoutine == M_QuitResponse)
-        {
-            M_QuitResponse(key_menu_confirm);
-        }
-        else
-        {
-            S_StartSound(NULL, sfx_swtchn);
-            M_QuitStrife(0);
-        }
-
-        return true;
-    }
-
-    // key is the key pressed, ch is the actual character typed
-  
-    ch = 0;
-    key = -1;
-
-    if (ev->type == ev_joystick && joywait < I_GetTime())
-    {
-        if (JOY_GET_DPAD(ev->data6) != JOY_DIR_NONE)
-        {
-            dir = JOY_GET_DPAD(ev->data6);
-        }
-        else if (JOY_GET_LSTICK(ev->data6) != JOY_DIR_NONE)
-        {
-            dir = JOY_GET_LSTICK(ev->data6);
-        }
-        else
-        {
-            dir = JOY_GET_RSTICK(ev->data6);
-        }
-
-        if (dir & JOY_DIR_UP)
-        {
-            key = key_menu_up;
-            joywait = I_GetTime() + 5;
-        }
-        else if (dir & JOY_DIR_DOWN)
-        {
-            key = key_menu_down;
-            joywait = I_GetTime() + 5;
-        }
-        if (dir & JOY_DIR_LEFT)
-        {
-            key = key_menu_left;
-            joywait = I_GetTime() + 5;
-        }
-        else if (dir & JOY_DIR_RIGHT)
-        {
-            key = key_menu_right;
-            joywait = I_GetTime() + 5;
-        }
-
-#define JOY_BUTTON_MAPPED(x) ((x) >= 0)
-#define JOY_BUTTON_PRESSED(x) (JOY_BUTTON_MAPPED(x) && (ev->data1 & (1 << (x))) != 0)
-
-        if (JOY_BUTTON_PRESSED(joybfire))
-        {
-            // Simulate a 'Y' keypress when Doom show a Y/N dialog with Fire button.
-            if (messageToPrint && messageNeedsInput)
-            {
-                key = key_menu_confirm;
-            }
-            else
-            {
-                key = key_menu_forward;
-            }
-            joywait = I_GetTime() + 5;
-            joystick_fire_countdown = 5;
-        }
-        if (JOY_BUTTON_PRESSED(joybuse))
-        {
-            // Simulate a 'N' keypress when Doom show a Y/N dialog with Use button.
-            if (messageToPrint && messageNeedsInput)
-            {
-                key = key_menu_abort;
-            }
-            else
-            {
-                key = key_menu_back;
-            }
-            joywait = I_GetTime() + 5;
-        }
-        if (JOY_BUTTON_PRESSED(joybmenu))
-        {
-            key = key_menu_activate;
-            joywait = I_GetTime() + 5;
-        }
-    }
-    else
-    {
-        if (ev->type == ev_mouse && mousewait < I_GetTime())
-        {
-            mousey += ev->data3;
-            if (mousey < lasty-30)
-            {
-                key = key_menu_down;
-                mousewait = I_GetTime() + 5;
-                mousey = lasty -= 30;
-            }
-            else if (mousey > lasty+30)
-            {
-                key = key_menu_up;
-                mousewait = I_GetTime() + 5;
-                mousey = lasty += 30;
-            }
-
-            mousex += ev->data2;
-            if (mousex < lastx-30)
-            {
-                key = key_menu_left;
-                mousewait = I_GetTime() + 5;
-                mousex = lastx -= 30;
-            }
-            else if (mousex > lastx+30)
-            {
-                key = key_menu_right;
-                mousewait = I_GetTime() + 5;
-                mousex = lastx += 30;
-            }
-
-            if (ev->data1&1)
-            {
-                key = key_menu_forward;
-                mousewait = I_GetTime() + 15;
-                mouse_fire_countdown = 5;   // villsa [STRIFE]
-            }
-
-            if (ev->data1&2)
-            {
-                key = key_menu_back;
-                mousewait = I_GetTime() + 15;
-            }
-        }
-        else
-        {
-            if (ev->type == ev_keydown)
-            {
-                key = ev->data1;
-                ch = ev->data2;
-            }
-        }
-    }
-
-    if (key == -1)
-        return false;
-
-    // Save Game string input
-    if (saveStringEnter)
-    {
-        switch(key)
-        {
-        case KEY_BACKSPACE:
-            if (saveCharIndex > 0)
-            {
-                saveCharIndex--;
-                savegamestrings[quickSaveSlot][saveCharIndex] = 0;
-            }
-            break;
-
-        case KEY_ESCAPE:
-            saveStringEnter = 0;
-            I_StopTextInput();
-            M_StringCopy(savegamestrings[quickSaveSlot], saveOldString,
-                         sizeof(savegamestrings[quickSaveSlot]));
-            break;
-
-        case KEY_ENTER:
-            // [STRIFE]
-            saveStringEnter = 0;
-            I_StopTextInput();
-            if(gameversion == exe_strife_1_31 && !namingCharacter)
-            {
-               // In 1.31, we can be here as a result of normal saving again,
-               // whereas in 1.2 this only ever happens when naming your
-               // character to begin a new game.
-               M_DoSave(quickSaveSlot);
-               return true;
-            }
-            if (savegamestrings[quickSaveSlot][0])
-                M_DoNameChar(quickSaveSlot);
-            break;
-
-        default:
-            // Savegame name entry. This is complicated.
-            // Vanilla has a bug where the shift key is ignored when entering
-            // a savegame name. If vanilla_keyboard_mapping is on, we want
-            // to emulate this bug by using ev->data1. But if it's turned off,
-            // it implies the user doesn't care about Vanilla emulation:
-            // instead, use ev->data3 which gives the fully-translated and
-            // modified key input.
-
-            if (ev->type != ev_keydown)
-            {
-                break;
-            }
-
-            if (vanilla_keyboard_mapping)
-            {
-                ch = ev->data1;
-            }
-            else
-            {
-                ch = ev->data3;
-            }
-
-            ch = toupper(ch);
-
-            if (ch != ' '
-                && (ch - HU_FONTSTART < 0 || ch - HU_FONTSTART >= HU_FONTSIZE))
-            {
-                break;
-            }
-
-            if (ch >= 32 && ch <= 127 &&
-                saveCharIndex < SAVESTRINGSIZE-1 &&
-                M_StringWidth(savegamestrings[quickSaveSlot]) <
-                (SAVESTRINGSIZE-2)*8)
-            {
-                savegamestrings[quickSaveSlot][saveCharIndex++] = ch;
-                savegamestrings[quickSaveSlot][saveCharIndex] = 0;
-            }
-            break;
-        }
-        return true;
-    }
-
-    // Take care of any messages that need input
-    if (messageToPrint)
-    {
-        if (messageNeedsInput)
-        {
-            if (key != ' ' && key != KEY_ESCAPE
-                && key != key_menu_confirm && key != key_menu_abort)
-            {
-                return false;
-            }
-        }
-
-        menuactive = messageLastMenuActive;
-        messageToPrint = 0;
-        if (messageRoutine)
-            messageRoutine(key);
-
-        menupause = false;                // [STRIFE] unpause
-        menuactive = false;
-        S_StartSound(NULL, sfx_mtalht);   // [STRIFE] sound
-        return true;
-    }
-
-    // [STRIFE]:
-    // * In v1.2 this is moved to F9 (quickload)
-    // * In v1.31 it is moved to F12 with DM spy, and quicksave
-    //   functionality is restored separate from normal saving
-    /*
-    if (devparm && key == key_menu_help)
-    {
-        G_ScreenShot ();
-        return true;
-    }
-    */
-
-    // F-Keys
-    if (!menuactive)
-    {
-        if (key == key_menu_decscreen)      // Screen size down
-        {
-            if (automapactive || chat_on)
-                return false;
-            M_SizeDisplay(0);
-            S_StartSound(NULL, sfx_stnmov);
-            return true;
-        }
-        else if (key == key_menu_incscreen) // Screen size up
-        {
-            if (automapactive || chat_on)
-                return false;
-            M_SizeDisplay(1);
-            S_StartSound(NULL, sfx_stnmov);
-            return true;
-        }
-        else if (key == key_menu_help)     // Help key
-        {
-            M_StartControlPanel ();
-            // haleyjd 08/29/10: [STRIFE] always ReadDef1
-            currentMenu = &ReadDef1; 
-
-            itemOn = 0;
-            S_StartSound(NULL, sfx_swtchn);
-            return true;
-        }
-        else if (key == key_menu_save)     // Save
-        {
-            // [STRIFE]: Hub saves
-            if(gameversion == exe_strife_1_31)
-                namingCharacter = false; // just saving normally, in 1.31
-
-            if(netgame || players[consoleplayer].health <= 0 ||
-                players[consoleplayer].cheats & CF_ONFIRE)
-            {
-                S_StartSound(NULL, sfx_oof);
-            }
-            else
-            {
-                M_StartControlPanel();
-                S_StartSound(NULL, sfx_swtchn);
-                M_SaveGame(0);
-            }
-            return true;
-        }
-        else if (key == key_menu_load)     // Load
-        {
-            // [STRIFE]: Hub saves
-            if(gameversion == exe_strife_1_31)
-            {
-                // 1.31: normal save loading
-                namingCharacter = false;
-                M_StartControlPanel();
-                M_LoadGame(0);
-                S_StartSound(NULL, sfx_swtchn);
-            }
-            else
-            {
-                // Pre 1.31: quickload only
-                S_StartSound(NULL, sfx_swtchn);
-                M_QuickLoad();
-            }
-            return true;
-        }
-        else if (key == key_menu_volume)   // Sound Volume
-        {
-            M_StartControlPanel ();
-            currentMenu = &SoundDef;
-            itemOn = sfx_vol;
-            S_StartSound(NULL, sfx_swtchn);
-            return true;
-        }
-        else if (key == key_menu_detail)   // Detail toggle
-        {
-            //M_ChangeDetail(0);
-            M_AutoUseHealth(); // [STRIFE]
-            S_StartSound(NULL, sfx_swtchn);
-            return true;
-        }
-        else if (key == key_menu_qsave)    // Quicksave
-        {
-            // [STRIFE]: Hub saves
-            if(gameversion == exe_strife_1_31)
-                namingCharacter = false; // for 1.31 save changes
-
-            if(netgame || players[consoleplayer].health <= 0 ||
-               players[consoleplayer].cheats & CF_ONFIRE)
-            {
-                S_StartSound(NULL, sfx_oof);
-            }
-            else
-            {
-                S_StartSound(NULL, sfx_swtchn);
-                M_QuickSave();
-            }
-            return true;
-        }
-        else if (key == key_menu_endgame)  // End game
-        {
-            S_StartSound(NULL, sfx_swtchn);
-            M_EndGame(0);
-            return true;
-        }
-        else if (key == key_menu_messages) // Toggle messages
-        {
-            //M_ChangeMessages(0);
-            M_ChangeShowText(); // [STRIFE]
-            S_StartSound(NULL, sfx_swtchn);
-            return true;
-        }
-        else if (key == key_menu_qload)    // Quickload
-        {
-            // [STRIFE]
-            // * v1.2: takes a screenshot
-            // * v1.31: does quickload again
-            if(gameversion == exe_strife_1_31)
-            {
-                namingCharacter = false;
-                S_StartSound(NULL, sfx_swtchn);
-                M_QuickLoad();
-            }
-            else
-                G_ScreenShot();
-            return true;
-        }
-        else if (key == key_menu_quit)     // Quit DOOM
-        {
-            S_StartSound(NULL, sfx_swtchn);
-            M_QuitStrife(0);
-            return true;
-        }
-        else if (key == key_menu_gamma)    // gamma toggle
-        {
-            usegamma++;
-            if (usegamma > 4)
-                usegamma = 0;
-            players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
-            I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
-            return true;
-        }
-        else if(gameversion == exe_strife_1_31 && key == key_spy)
-        {
-            // haleyjd 20130301: 1.31 moved screenshots to F12.
-            G_ScreenShot();
-            return true;
-        }
-        else if (key != 0 && key == key_menu_screenshot)
-        {
-            G_ScreenShot();
-            return true;
-        }
-    }
-
-    // Pop-up menu?
-    if (!menuactive)
-    {
-        if (key == key_menu_activate)
-        {
-            M_StartControlPanel ();
-            S_StartSound(NULL, sfx_swtchn);
-            return true;
-        }
-        return false;
-    }
-
-    
-    // Keys usable within menu
-
-    if (key == key_menu_down)
-    {
-        // Move down to next item
-
-        do
-        {
-            if (itemOn+1 > currentMenu->numitems-1)
-                itemOn = 0;
-            else itemOn++;
-            S_StartSound(NULL, sfx_pstop);
-        } while(currentMenu->menuitems[itemOn].status==-1);
-
-        return true;
-    }
-    else if (key == key_menu_up)
-    {
-        // Move back up to previous item
-
-        do
-        {
-            if (!itemOn)
-                itemOn = currentMenu->numitems-1;
-            else itemOn--;
-            S_StartSound(NULL, sfx_pstop);
-        } while(currentMenu->menuitems[itemOn].status==-1);
-
-        return true;
-    }
-    else if (key == key_menu_left)
-    {
-        // Slide slider left
-
-        if (currentMenu->menuitems[itemOn].routine &&
-            currentMenu->menuitems[itemOn].status == 2)
-        {
-            S_StartSound(NULL, sfx_stnmov);
-            currentMenu->menuitems[itemOn].routine(0);
-        }
-        return true;
-    }
-    else if (key == key_menu_right)
-    {
-        // Slide slider right
-
-        if (currentMenu->menuitems[itemOn].routine &&
-            currentMenu->menuitems[itemOn].status == 2)
-        {
-            S_StartSound(NULL, sfx_stnmov);
-            currentMenu->menuitems[itemOn].routine(1);
-        }
-        return true;
-    }
-    else if (key == key_menu_forward)
-    {
-        // Activate menu item
-
-        if (currentMenu->menuitems[itemOn].routine &&
-            currentMenu->menuitems[itemOn].status)
-        {
-            currentMenu->lastOn = itemOn;
-            if (currentMenu->menuitems[itemOn].status == 2)
-            {
-                currentMenu->menuitems[itemOn].routine(1);      // right arrow
-                S_StartSound(NULL, sfx_stnmov);
-            }
-            else
-            {
-                currentMenu->menuitems[itemOn].routine(itemOn);
-                //S_StartSound(NULL, sfx_swish); [STRIFE] No sound is played here.
-            }
-        }
-        return true;
-    }
-    else if (key == key_menu_activate)
-    {
-        // Deactivate menu
-        if(gameversion == exe_strife_1_31) // [STRIFE]: 1.31 saving
-            namingCharacter = false;
-
-        if(menuindialog) // [STRIFE] - Get out of dialog engine semi-gracefully
-            P_DialogDoChoice(-1);
-
-        currentMenu->lastOn = itemOn;
-        M_ClearMenus (0);
-        S_StartSound(NULL, sfx_mtalht); // villsa [STRIFE]: sounds
-        return true;
-    }
-    else if (key == key_menu_back)
-    {
-        // Go back to previous menu
-
-        currentMenu->lastOn = itemOn;
-        if (currentMenu->prevMenu)
-        {
-            currentMenu = currentMenu->prevMenu;
-            itemOn = currentMenu->lastOn;
-            S_StartSound(NULL, sfx_swtchn);
-        }
-        return true;
-    }
-
-    // Keyboard shortcut?
-    // Vanilla Strife has a weird behavior where it jumps to the scroll bars
-    // when certain keys are pressed, so emulate this.
-
-    else if (ch != 0 || IsNullKey(key))
-    {
-        // Keyboard shortcut?
-
-        for (i = itemOn+1;i < currentMenu->numitems;i++)
-        {
-            if (currentMenu->menuitems[i].alphaKey == ch)
-            {
-                itemOn = i;
-                S_StartSound(NULL, sfx_pstop);
-                return true;
-            }
-        }
-
-        for (i = 0;i <= itemOn;i++)
-        {
-            if (currentMenu->menuitems[i].alphaKey == ch)
-            {
-                itemOn = i;
-                S_StartSound(NULL, sfx_pstop);
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-
-
-//
-// M_StartControlPanel
-//
-void M_StartControlPanel (void)
-{
-    // intro might call this repeatedly
-    if (menuactive)
-        return;
-    
-    menuactive = 1;
-    menupause = true;
-    currentMenu = &MainDef;         // JDC
-    itemOn = currentMenu->lastOn;   // JDC
-}
-
-
-//
-// M_Drawer
-// Called after the view has been rendered,
-// but before it has been blitted.
-//
-void M_Drawer (void)
-{
-    static short	x;
-    static short	y;
-    unsigned int	i;
-    unsigned int	max;
-    char		string[80];
-    const char          *name;
-    int			start;
-
-    inhelpscreens = false;
-    
-    // Horiz. & Vertically center string and print it.
-    if (messageToPrint)
-    {
-        start = 0;
-        y = 100 - M_StringHeight(messageString) / 2;
-        while (messageString[start] != '\0')
-        {
-            int foundnewline = 0;
-
-            for (i = 0; i < strlen(messageString + start); i++)
-            {
-                if (messageString[start + i] == '\n')
-                {
-                    M_StringCopy(string, messageString + start,
-                                 sizeof(string));
-                    if (i < sizeof(string))
-                    {
-                        string[i] = '\0';
-                    }
-
-                    foundnewline = 1;
-                    start += i + 1;
-                    break;
-                }
-            }
-
-            if (!foundnewline)
-            {
-                M_StringCopy(string, messageString + start,
-                             sizeof(string));
-                start += strlen(string);
-            }
-
-            x = 160 - M_StringWidth(string) / 2;
-            M_WriteText(x, y, string);
-            y += SHORT(hu_font[0]->height);
-        }
-
-        return;
-    }
-
-    if (!menuactive)
-        return;
-
-    if (currentMenu->routine)
-        currentMenu->routine();         // call Draw routine
-    
-    // DRAW MENU
-    x = currentMenu->x;
-    y = currentMenu->y;
-    max = currentMenu->numitems;
-
-    for (i=0;i<max;i++)
-    {
-        name = DEH_String(currentMenu->menuitems[i].name);
-
-        if (name[0])
-        {
-            V_DrawPatchDirect (x, y, W_CacheLumpName(name, PU_CACHE));
-        }
-        y += LINEHEIGHT;
-    }
-
-    
-    // haleyjd 08/27/10: [STRIFE] Adjust to draw spinning Sigil
-    // DRAW SIGIL
-    V_DrawPatchDirect(x + CURSORXOFF, currentMenu->y - 5 + itemOn*LINEHEIGHT,
-                      W_CacheLumpName(DEH_String(cursorName[whichCursor]),
-                                      PU_CACHE));
-
-}
-
-
-//
-// M_ClearMenus
-//
-// haleyjd 08/28/10: [STRIFE] Added an int param so this can be called by menus.
-//         09/08/10: Added menupause.
-//
-void M_ClearMenus (int choice)
-{
-    choice = 0;     // haleyjd: for no warning; not from decompilation.
-    menuactive = 0;
-    menupause = 0;
-}
-
-
-
-
-//
-// M_SetupNextMenu
-//
-void M_SetupNextMenu(menu_t *menudef)
-{
-    currentMenu = menudef;
-    itemOn = currentMenu->lastOn;
-}
-
-
-//
-// M_Ticker
-//
-// haleyjd 08/27/10: [STRIFE] Rewritten for Sigil cursor
-//
-void M_Ticker (void)
-{
-    if (--cursorAnimCounter <= 0)
-    {
-        whichCursor = (whichCursor + 1) % 8;
-        cursorAnimCounter = 5;
-    }
-}
-
-
-//
-// M_Init
-//
-// haleyjd 08/27/10: [STRIFE] Removed DOOM gamemode stuff
-//
-void M_Init (void)
-{
-    currentMenu = &MainDef;
-    menuactive = 0;
-    itemOn = currentMenu->lastOn;
-    whichCursor = 0;
-    cursorAnimCounter = 10;
-    screenSize = screenblocks - 3;
-    messageToPrint = 0;
-    messageString = NULL;
-    messageLastMenuActive = menuactive; // STRIFE-FIXME: assigns 0 here...
-    quickSaveSlot = -1;
-
-    // [STRIFE]: Initialize savegame paths and clear temporary directory
-    G_WriteSaveName(5, "ME");
-    ClearTmp();
-
-    // Here we could catch other version dependencies,
-    //  like HELP1/2, and four episodes.
-}
-
diff --git a/games/NXDoom/src/strife/m_menu.h b/games/NXDoom/src/strife/m_menu.h
deleted file mode 100644
index 08ad1a244..000000000
--- a/games/NXDoom/src/strife/m_menu.h
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Menu widget stuff, episode selection and such.
-//    
-
-
-#ifndef __M_MENU__
-#define __M_MENU__
-
-#include "d_event.h"
-
-//
-// MENU TYPEDEFS
-//
-
-// haleyjd 09/04/10: [STRIFE] Made external
-
-typedef struct
-{
-    // 0 = no cursor here, 1 = ok, 2 = arrows ok
-    short	status;
-    
-    char	name[10];
-    
-    // choice = menu item #.
-    // if status = 2,
-    //   choice=0:leftarrow,1:rightarrow
-    void	(*routine)(int choice);
-    
-    // hotkey in menu
-    char	alphaKey;			
-} menuitem_t;
-
-typedef struct menu_s
-{
-    short		numitems;	// # of menu items
-    struct menu_s*	prevMenu;	// previous menu
-    menuitem_t*		menuitems;	// menu items
-    void		(*routine)();	// draw routine
-    short		x;
-    short		y;		// x,y of menu
-    short		lastOn;		// last item user was on in menu
-} menu_t;
-
-extern menu_t*	currentMenu;    // villsa [STRIFE] made external
-extern short itemOn;
-
-//
-// MENUS
-//
-// Called by main loop,
-// saves config file and calls I_Quit when user exits.
-// Even when the menu is not displayed,
-// this can resize the view and change game parameters.
-// Does all the real work of the menu interaction.
-boolean M_Responder (event_t *ev);
-
-
-// Called by main loop,
-// only used for menu (skull cursor) animation.
-void M_Ticker (void);
-
-// Called by main loop,
-// draws the menus directly into the screen buffer.
-void M_Drawer (void);
-
-// Called by D_DoomMain,
-// loads the config file.
-void M_Init (void);
-
-// Called by intro code to force menu up upon a keypress,
-// does nothing if menu is already up.
-void M_StartControlPanel (void);
-
-// haleyjd 09/04/10: Externalized. Draws menu text.
-int M_WriteText(int x, int y, const char *string);
-
-// haleyjd 09/04/10: [STRIFE] New function.
-void M_DialogDimMsg(int x, int y, char *str, boolean useyfont);
-
-// haleyjd [STRIFE] Externalized
-void M_ClearMenus (int choice);
-void M_LoadSelect(int choice);
-
-extern int detailLevel;
-extern int screenblocks;
-
-extern  boolean	inhelpscreens;
-
-
-#endif    
diff --git a/games/NXDoom/src/strife/m_random.c b/games/NXDoom/src/strife/m_random.c
deleted file mode 100644
index 2098c1a7a..000000000
--- a/games/NXDoom/src/strife/m_random.c
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Random number LUT.
-//
-
-
-#include <time.h>
-
-#include "m_random.h"
-
-//
-// M_Random
-// Returns a 0-255 number
-//
-
-static const unsigned char rndtable[256] = {
-    0,   8, 109, 220, 222, 241, 149, 107,  75, 248, 254, 140,  16,  66 ,
-    74,  21, 211,  47,  80, 242, 154,  27, 205, 128, 161,  89,  77,  36 ,
-    95, 110,  85,  48, 212, 140, 211, 249,  22,  79, 200,  50,  28, 188 ,
-    52, 140, 202, 120,  68, 145,  62,  70, 184, 190,  91, 197, 152, 224 ,
-    149, 104,  25, 178, 252, 182, 202, 182, 141, 197,   4,  81, 181, 242 ,
-    145,  42,  39, 227, 156, 198, 225, 193, 219,  93, 122, 175, 249,   0 ,
-    175, 143,  70, 239,  46, 246, 163,  53, 163, 109, 168, 135,   2, 235 ,
-    25,  92,  20, 145, 138,  77,  69, 166,  78, 176, 173, 212, 166, 113 ,
-    94, 161,  41,  50, 239,  49, 111, 164,  70,  60,   2,  37, 171,  75 ,
-    136, 156,  11,  56,  42, 146, 138, 229,  73, 146,  77,  61,  98, 196 ,
-    135, 106,  63, 197, 195,  86,  96, 203, 113, 101, 170, 247, 181, 113 ,
-    80, 250, 108,   7, 255, 237, 129, 226,  79, 107, 112, 166, 103, 241 ,
-    24, 223, 239, 120, 198,  58,  60,  82, 128,   3, 184,  66, 143, 224 ,
-    145, 224,  81, 206, 163,  45,  63,  90, 168, 114,  59,  33, 159,  95 ,
-    28, 139, 123,  98, 125, 196,  15,  70, 194, 253,  54,  14, 109, 226 ,
-    71,  17, 161,  93, 186,  87, 244, 138,  20,  52, 123, 251,  26,  36 ,
-    17,  46,  52, 231, 232,  76,  31, 221,  84,  37, 216, 165, 212, 106 ,
-    197, 242,  98,  43,  39, 175, 254, 145, 190,  84, 118, 222, 187, 136 ,
-    120, 163, 236, 249
-};
-
-int	rndindex = 0;
-int	prndindex = 0;
-
-// Which one is deterministic?
-int P_Random (void)
-{
-    prndindex = (prndindex+1)&0xff;
-    return rndtable[prndindex];
-}
-
-int M_Random (void)
-{
-    rndindex = (rndindex+1)&0xff;
-    return rndtable[rndindex];
-}
-
-//
-// M_ClearRandom
-//
-// haleyjd 20110204 [STRIFE]: No "seeding" of M_Random index
-//
-void M_ClearRandom (void)
-{
-    prndindex = 0;
-    rndindex = 0;
-}
-
-
-
-
diff --git a/games/NXDoom/src/strife/m_random.h b/games/NXDoom/src/strife/m_random.h
deleted file mode 100644
index aa6291ae9..000000000
--- a/games/NXDoom/src/strife/m_random.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//    
-
-
-#ifndef __M_RANDOM__
-#define __M_RANDOM__
-
-
-#include "doomtype.h"
-
-
-
-// Returns a number from 0 to 255,
-// from a lookup table.
-int M_Random (void);
-
-// As M_Random, but used only by the play simulation.
-int P_Random (void);
-
-// Fix randoms for demos.
-void M_ClearRandom (void);
-
-
-#endif
diff --git a/games/NXDoom/src/strife/m_saves.c b/games/NXDoom/src/strife/m_saves.c
deleted file mode 100644
index 561ec6a23..000000000
--- a/games/NXDoom/src/strife/m_saves.c
+++ /dev/null
@@ -1,482 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2010 James Haley, Samuel Villarreal
-//
-// 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.
-//
-// DESCRIPTION:
-//
-// [STRIFE] New Module
-//
-// Strife Hub Saving Code
-//
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "z_zone.h"
-#include "i_glob.h"
-#include "i_system.h"
-#include "d_player.h"
-#include "deh_str.h"
-#include "doomstat.h"
-#include "m_misc.h"
-#include "m_saves.h"
-#include "p_dialog.h"
-
-//
-// File Paths
-//
-// Strife maintains multiple file paths related to savegames.
-//
-char *savepath;     // The actual path of the selected saveslot
-char *savepathtemp; // The path of the temporary saveslot (strfsav6.ssg)
-char *loadpath;     // Path used while loading the game
-
-char character_name[CHARACTER_NAME_LEN]; // Name of "character" for saveslot
-
-//
-// ClearTmp
-//
-// Clear the temporary save directory
-//
-void ClearTmp(void)
-{
-    glob_t *glob;
-
-    if(savepathtemp == NULL)
-        I_Error("you fucked up savedir man!");
-
-    glob = I_StartGlob(savepathtemp, "*", 0);
-    if (glob == NULL)
-        I_Error("ClearTmp: Couldn't open dir %s", savepathtemp);
-
-    for (;;)
-    {
-        const char *path = I_NextGlob(glob);
-
-        if (path == NULL)
-        {
-            break;
-        }
-        M_remove(path);
-    }
-
-    I_EndGlob(glob);
-}
-
-//
-// ClearSlot
-//
-// Clear a single save slot folder
-//
-void ClearSlot(void)
-{
-    glob_t *glob;
-
-    if(savepath == NULL)
-        I_Error("userdir is fucked up man!");
-
-    glob = I_StartGlob(savepath, "*", 0);
-    if (glob == NULL)
-        I_Error("ClearSlot: Couldn't open dir %s", savepath);
-
-    for (;;)
-    {
-        const char *filepath = I_NextGlob(glob);
-
-        if (filepath == NULL)
-        {
-            break;
-        }
-
-        M_remove(filepath);
-    }
-
-    I_EndGlob(glob);
-}
-
-//
-// FromCurr
-//
-// Copying files from savepathtemp to savepath
-//
-void FromCurr(void)
-{
-    glob_t *glob;
-
-    glob = I_StartGlob(savepathtemp, "*", 0);
-
-    if (glob == NULL)
-        I_Error("FromCurr: Couldn't open dir %s", savepathtemp);
-
-    for (;;)
-    {
-        byte *filebuffer;
-        int filelen;
-        const char *srcfilename;
-        char *dstfilename;
-
-        srcfilename = I_NextGlob(glob);
-        if (srcfilename == NULL)
-        {
-            break;
-        }
-
-        dstfilename = M_SafeFilePath(savepath, M_BaseName(srcfilename));
-
-        filelen = M_ReadFile(srcfilename, &filebuffer);
-        M_WriteFile(dstfilename, filebuffer, filelen);
-
-        Z_Free(filebuffer);
-        Z_Free(dstfilename);
-    }
-
-    I_EndGlob(glob);
-}
-
-//
-// ToCurr
-//
-// Copying files from savepath to savepathtemp
-//
-void ToCurr(void)
-{
-    glob_t *glob;
-
-    ClearTmp();
-
-    // BUG: Rogue copypasta'd this error message, which is why we don't know
-    // the real original name of this function.
-    glob = I_StartGlob(savepath, "*", 0);
-    if (glob == NULL)
-        I_Error("ClearSlot: Couldn't open dir %s", savepath);
-
-    for (;;)
-    {
-        byte *filebuffer;
-        int filelen;
-        const char *srcfilename;
-        char *dstfilename;
-
-        srcfilename = I_NextGlob(glob);
-        if (srcfilename == NULL)
-        {
-            break;
-        }
-
-        dstfilename = M_SafeFilePath(savepathtemp, M_BaseName(srcfilename));
-
-        filelen = M_ReadFile(srcfilename, &filebuffer);
-        M_WriteFile(dstfilename, filebuffer, filelen);
-
-        Z_Free(filebuffer);
-        Z_Free(dstfilename);
-    }
-
-    I_EndGlob(glob);
-}
-
-//
-// M_SaveMoveMapToHere
-//
-// Moves a map to the "HERE" save.
-//
-void M_SaveMoveMapToHere(void)
-{
-    char *mapsave  = NULL;
-    char *heresave = NULL;
-    char tmpnum[33];
-
-    // haleyjd: no itoa available...
-    M_snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
-
-    // haleyjd: use M_SafeFilePath, not sprintf
-    mapsave  = M_SafeFilePath(savepath, tmpnum);
-    heresave = M_SafeFilePath(savepath, "here");
-
-    // haleyjd: use M_FileExists, not access
-    if(M_FileExists(mapsave))
-    {
-        M_remove(heresave);
-        M_rename(mapsave, heresave);
-    }
-
-    Z_Free(mapsave);
-    Z_Free(heresave);
-}
-
-//
-// M_SaveMoveHereToMap
-//
-// Moves the "HERE" save to a map.
-//
-void M_SaveMoveHereToMap(void)
-{
-    char *mapsave  = NULL;
-    char *heresave = NULL;
-    char tmpnum[33];
-
-    // haleyjd: no itoa available...
-    M_snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
-
-    mapsave  = M_SafeFilePath(savepathtemp, tmpnum);
-    heresave = M_SafeFilePath(savepathtemp, "here");
-
-    if(M_FileExists(heresave))
-    {
-        M_remove(mapsave);
-        M_rename(heresave, mapsave);
-    }
-
-    Z_Free(mapsave);
-    Z_Free(heresave);
-}
-
-//
-// M_SaveMisObj
-//
-// Writes the mission objective into the MIS_OBJ file.
-//
-boolean M_SaveMisObj(const char *path)
-{
-    boolean result;
-    char *destpath = NULL;
-
-    // haleyjd 20110210: use M_SafeFilePath, not sprintf
-    destpath = M_SafeFilePath(path, "mis_obj");
-    result   = M_WriteFile(destpath, mission_objective, OBJECTIVE_LEN);
-
-    Z_Free(destpath);
-    return result;
-}
-
-//
-// M_ReadMisObj
-//
-// Reads the mission objective from the MIS_OBJ file.
-//
-void M_ReadMisObj(void)
-{
-    FILE *f = NULL;
-    char *srcpath = NULL;
-
-    // haleyjd: use M_SafeFilePath, not sprintf
-    srcpath = M_SafeFilePath(savepathtemp, "mis_obj");
-
-    if((f = M_fopen(srcpath, "rb")))
-    {
-        int retval = fread(mission_objective, 1, OBJECTIVE_LEN, f);
-        fclose(f);
-        if (retval != OBJECTIVE_LEN)
-        {
-            I_Error("M_ReadMisObj: error while reading mission objective");
-        }
-    }
-
-    Z_Free(srcpath);
-}
-
-//=============================================================================
-//
-// Original Routines
-//
-// haleyjd - None of the below code is derived from Strife itself, but has been
-// adapted or created in order to provide secure, portable filepath handling
-// for the purposes of savegame support. This is partially needed to allow for
-// differences in Choco due to it being multiplatform. The rest exists because
-// I cannot stand programming in an impoverished ANSI C environment that
-// calls sprintf on fixed-size buffers. :P
-//
-
-//
-// M_Calloc
-//
-// haleyjd 20110210 - original routine
-// Because Choco doesn't have Z_Calloc O_o
-//
-void *M_Calloc(size_t n1, size_t n2)
-{
-    return (n1 *= n2) ? memset(Z_Malloc(n1, PU_STATIC, NULL), 0, n1) : NULL;
-}
-
-//
-// M_StringAlloc
-//
-// haleyjd: This routine takes any number of strings and a number of extra
-// characters, calculates their combined length, and calls Z_Alloca to create
-// a temporary buffer of that size. This is extremely useful for allocation of
-// file paths, and is used extensively in d_main.c.  The pointer returned is
-// to a temporary Z_Alloca buffer, which lives until the next main loop
-// iteration, so don't cache it. Note that this idiom is not possible with the
-// normal non-standard alloca function, which allocates stack space.
-//
-// [STRIFE] - haleyjd 20110210
-// This routine is taken from the Eternity Engine and adapted to do without
-// Z_Alloca. I need secure string concatenation for filepath handling. The
-// only difference from use in EE is that the pointer returned in *str must
-// be manually freed.
-//
-int M_StringAlloc(char **str, int numstrs, size_t extra, const char *str1, ...)
-{
-    va_list args;
-    size_t len = extra;
-
-    if(numstrs < 1)
-        I_Error("M_StringAlloc: invalid input\n");
-
-    len += strlen(str1);
-
-    --numstrs;
-
-    if(numstrs != 0)
-    {   
-        va_start(args, str1);
-
-        while(numstrs != 0)
-        {
-            const char *argstr = va_arg(args, const char *);
-
-            len += strlen(argstr);
-
-            --numstrs;
-        }
-
-        va_end(args);
-    }
-
-    ++len;
-
-    *str = (char *)(M_Calloc(1, len));
-
-    return len;
-}
-
-//
-// M_SafeFilePath
-//
-// haleyjd 20110210 - original routine.
-// This routine performs safe, portable concatenation of a base file path
-// with another path component or file name. The returned string is Z_Malloc'd
-// and should be freed when it has exhausted its usefulness.
-//
-char *M_SafeFilePath(const char *basepath, const char *newcomponent)
-{
-    int   newstrlen = 0;
-    char *newstr = NULL;
-
-    if (!strcmp(basepath, ""))
-    {
-        basepath = ".";
-    }
-
-    // Always throw in a slash. M_NormalizeSlashes will remove it in the case
-    // that either basepath or newcomponent includes a redundant slash at the
-    // end or beginning respectively.
-    newstrlen = M_StringAlloc(&newstr, 3, 1, basepath, "/", newcomponent);
-    M_snprintf(newstr, newstrlen, "%s/%s", basepath, newcomponent);
-    M_NormalizeSlashes(newstr);
-
-    return newstr;
-}
-
-//
-// M_CreateSaveDirs
-//
-// haleyjd 20110210: Vanilla Strife went tits-up if it didn't have the full set
-// of save folders which were created externally by the installer. fraggle says
-// that's no good for Choco purposes, and I agree, so this routine will create
-// the full set of folders under the configured savegamedir.
-//
-void M_CreateSaveDirs(const char *savedir)
-{
-    int i;
-
-    for(i = 0; i < 7; i++)
-    {
-        char *compositedir;
-
-        // compose the full path by concatenating with savedir
-        compositedir = M_SafeFilePath(savedir, M_MakeStrifeSaveDir(i, ""));
-
-        M_MakeDirectory(compositedir);
-
-        Z_Free(compositedir);
-    }
-}
-
-//
-// M_MakeStrifeSaveDir
-//
-// haleyjd 20110211: Convenience routine
-//
-char *M_MakeStrifeSaveDir(int slotnum, const char *extra)
-{
-    static char tmpbuffer[32];
-
-    M_snprintf(tmpbuffer, sizeof(tmpbuffer),
-               "strfsav%d.ssg%s", slotnum, extra);
-
-    return tmpbuffer;
-}
-
-// 
-// M_GetFilePath
-//
-// haleyjd: STRIFE-FIXME: Temporary?
-// Code borrowed from Eternity, and modified to return separator char
-//
-char M_GetFilePath(const char *fn, char *dest, size_t len)
-{
-    boolean found_slash = false;
-    char *p;
-    char sepchar = '\0';
-
-    memset(dest, 0, len);
-
-    p = dest + len - 1;
-
-    M_StringCopy(dest, fn, len);
-
-    while(p >= dest)
-    {
-        if(*p == '/' || *p == '\\')
-        {
-            sepchar = *p;
-            found_slash = true; // mark that the path ended with a slash
-            *p = '\0';
-            break;
-        }
-        *p = '\0';
-        p--;
-    }
-
-    // haleyjd: in the case that no slash was ever found, yet the
-    // path string is empty, we are dealing with a file local to the
-    // working directory. The proper path to return for such a string is
-    // not "", but ".", since the format strings add a slash now. When
-    // the string is empty but a slash WAS found, we really do want to
-    // return the empty string, since the path is relative to the root.
-    if(!found_slash && *dest == '\0')
-        *dest = '.';
-
-    // if a separator is not found, default to forward, because Windows 
-    // supports that too.
-    if(sepchar == '\0') 
-        sepchar = '/';
-
-    return sepchar;
-}
-
-// EOF
-
-
diff --git a/games/NXDoom/src/strife/m_saves.h b/games/NXDoom/src/strife/m_saves.h
deleted file mode 100644
index ce278cba9..000000000
--- a/games/NXDoom/src/strife/m_saves.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2010 James Haley, Samuel Villareal
-//
-// 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.
-//
-// DESCRIPTION:
-//
-// [STRIFE] New Module
-//
-// Strife Hub Saving Code
-//
-
-#ifndef M_SAVES_H__
-#define M_SAVES_H__
-
-#define CHARACTER_NAME_LEN 32
-
-extern char *savepath;
-extern char *savepathtemp;
-extern char *loadpath;
-extern char character_name[CHARACTER_NAME_LEN];
-
-// Strife Savegame Functions
-void ClearTmp(void);
-void ClearSlot(void);
-void FromCurr(void);
-void ToCurr(void);
-void M_SaveMoveMapToHere(void);
-void M_SaveMoveHereToMap(void);
-
-boolean M_SaveMisObj(const char *path);
-void    M_ReadMisObj(void);
-
-// Custom Utilities for Filepath Handling
-void *M_Calloc(size_t n1, size_t n2);
-int   M_StringAlloc(char **str, int numstrs, size_t extra, const char *str1, ...);
-char *M_SafeFilePath(const char *basepath, const char *newcomponent);
-char  M_GetFilePath(const char *fn, char *dest, size_t len);
-char *M_MakeStrifeSaveDir(int slotnum, const char *extra);
-void  M_CreateSaveDirs(const char *savedir);
-
-#endif
-
-// EOF
-
-
diff --git a/games/NXDoom/src/strife/p_ceilng.c b/games/NXDoom/src/strife/p_ceilng.c
deleted file mode 100644
index 93c0c7f2e..000000000
--- a/games/NXDoom/src/strife/p_ceilng.c
+++ /dev/null
@@ -1,343 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
-//
-
-
-
-#include "z_zone.h"
-#include "doomdef.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "sounds.h"
-
-//
-// CEILINGS
-//
-
-
-ceiling_t*	activeceilings[MAXCEILINGS];
-
-
-//
-// T_MoveCeiling
-//
-
-void T_MoveCeiling (ceiling_t* ceiling)
-{
-    result_e	res;
-	
-    switch(ceiling->direction)
-    {
-      case 0:
-	// IN STASIS
-	break;
-      case 1:
-	// UP
-	res = T_MovePlane(ceiling->sector,
-			  ceiling->speed,
-			  ceiling->topheight,
-			  false,1,ceiling->direction);
-	
-	if (!(leveltime&7))
-	{
-	    switch(ceiling->type)
-	    {
-	      case silentCrushAndRaise:
-		break;
-	      default:
-		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
-		// ?
-		break;
-	    }
-	}
-	
-	if (res == pastdest)
-	{
-	    switch(ceiling->type)
-	    {
-	      case raiseToHighest:
-		P_RemoveActiveCeiling(ceiling);
-		break;
-		
-	      case silentCrushAndRaise:
-		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
-	      case fastCrushAndRaise:
-	      case crushAndRaise:
-		ceiling->direction = -1;
-		break;
-		
-	      default:
-		break;
-	    }
-	    
-	}
-	break;
-	
-      case -1:
-	// DOWN
-	res = T_MovePlane(ceiling->sector,
-			  ceiling->speed,
-			  ceiling->bottomheight,
-			  ceiling->crush,1,ceiling->direction);
-	
-	if (!(leveltime&7))
-	{
-	    switch(ceiling->type)
-	    {
-	      case silentCrushAndRaise: break;
-	      default:
-		S_StartSound(&ceiling->sector->soundorg, sfx_stnmov);
-	    }
-	}
-	
-	if (res == pastdest)
-	{
-	    switch(ceiling->type)
-	    {
-	      case silentCrushAndRaise:
-		S_StartSound(&ceiling->sector->soundorg, sfx_pstop);
-	      case crushAndRaise:
-		ceiling->speed = CEILSPEED;
-	      case fastCrushAndRaise:
-		ceiling->direction = 1;
-		break;
-
-	      case lowerAndCrush:
-	      case lowerToFloor:
-		P_RemoveActiveCeiling(ceiling);
-		break;
-
-	      default:
-		break;
-	    }
-	}
-	else // ( res != pastdest )
-	{
-	    if (res == crushed)
-	    {
-		switch(ceiling->type)
-		{
-		  case silentCrushAndRaise:
-		  case crushAndRaise:
-		  case lowerAndCrush:
-		    ceiling->speed = CEILSPEED / 8;
-		    break;
-
-		  default:
-		    break;
-		}
-	    }
-	}
-	break;
-    }
-}
-
-
-//
-// EV_DoCeiling
-// Move a ceiling up/down and all around!
-//
-// haleyjd 10/04/10: [STRIFE] Changes:
-// * Fast crushers were made 2x as fast.
-// * lowerAndCrush was apparently "fixed" to actually crush, and was also
-//   altered to lower all the way to the floor rather than remain 8 above.
-// * silentCrushAndRaise and crushAndRaise no longer crush.
-int
-EV_DoCeiling
-( line_t*       line,
-  ceiling_e     type )
-{
-    int         secnum;
-    int         rtn;
-    sector_t*   sec;
-    ceiling_t*  ceiling;
-
-    secnum = -1;
-    rtn = 0;
-
-    //	Reactivate in-stasis ceilings...for certain types.
-    switch(type)
-    {
-    case fastCrushAndRaise:
-    case silentCrushAndRaise:
-    case crushAndRaise:
-        P_ActivateInStasisCeiling(line);
-    default:
-        break;
-    }
-
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        // new door thinker
-        rtn = 1;
-        ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVSPEC, 0);
-        P_AddThinker (&ceiling->thinker);
-        sec->specialdata = ceiling;
-        ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
-        ceiling->sector = sec;
-        ceiling->crush = false;
-
-        switch(type)
-        {
-        case fastCrushAndRaise:
-            // [STRIFE]: Speed of fast crushers increased by 2x!
-            ceiling->crush = true;
-            ceiling->topheight = sec->ceilingheight;
-            ceiling->bottomheight = sec->floorheight + (8*FRACUNIT);
-            ceiling->direction = -1;
-            ceiling->speed = CEILSPEED * 4; // [STRIFE] Was CEILSPEED * 2
-            break;
-        
-        case lowerAndCrush:
-            // [STRIFE] lowerAndCrush doesn't seem to have crushed in DOOM,
-            // but it was certainly made to do so in Strife! It is also
-            // changed to lower all the way to the floor.
-            ceiling->crush = 1;
-            ceiling->direction = -1;
-            ceiling->speed = CEILSPEED;
-            ceiling->bottomheight = sec->floorheight;
-            break;
-
-        case silentCrushAndRaise:
-        case crushAndRaise:
-            // [STRIFE] haleyjd 20130209: Turns out these types do NOT crush
-            // in Strife... yeah, that makes a lot of sense. Thanks to Gez for
-            // having detected this difference.
-            //ceiling->crush = true;
-            ceiling->topheight = sec->ceilingheight;
-
-        case lowerToFloor:
-            ceiling->bottomheight = sec->floorheight;
-            if (type != lowerToFloor)
-                ceiling->bottomheight += 8*FRACUNIT;
-            ceiling->direction = -1;
-            ceiling->speed = CEILSPEED;
-            break;
-
-        case raiseToHighest:
-            ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
-            ceiling->direction = 1;
-            ceiling->speed = CEILSPEED;
-            break;
-        }
-
-        ceiling->tag = sec->tag;
-        ceiling->type = type;
-        P_AddActiveCeiling(ceiling);
-    }
-    return rtn;
-}
-
-
-//
-// Add an active ceiling
-//
-void P_AddActiveCeiling(ceiling_t* c)
-{
-    int		i;
-    
-    for (i = 0; i < MAXCEILINGS;i++)
-    {
-	if (activeceilings[i] == NULL)
-	{
-	    activeceilings[i] = c;
-	    return;
-	}
-    }
-}
-
-
-
-//
-// Remove a ceiling's thinker
-//
-void P_RemoveActiveCeiling(ceiling_t* c)
-{
-    int		i;
-	
-    for (i = 0;i < MAXCEILINGS;i++)
-    {
-	if (activeceilings[i] == c)
-	{
-	    activeceilings[i]->sector->specialdata = NULL;
-	    P_RemoveThinker (&activeceilings[i]->thinker);
-	    activeceilings[i] = NULL;
-	    break;
-	}
-    }
-}
-
-
-
-//
-// Restart a ceiling that's in-stasis
-//
-void P_ActivateInStasisCeiling(line_t* line)
-{
-    int		i;
-	
-    for (i = 0;i < MAXCEILINGS;i++)
-    {
-	if (activeceilings[i]
-	    && (activeceilings[i]->tag == line->tag)
-	    && (activeceilings[i]->direction == 0))
-	{
-	    activeceilings[i]->direction = activeceilings[i]->olddirection;
-	    activeceilings[i]->thinker.function.acp1
-	      = (actionf_p1)T_MoveCeiling;
-	}
-    }
-}
-
-
-
-//
-// EV_CeilingCrushStop
-// Stop a ceiling from crushing!
-//
-int	EV_CeilingCrushStop(line_t	*line)
-{
-    int		i;
-    int		rtn;
-	
-    rtn = 0;
-    for (i = 0;i < MAXCEILINGS;i++)
-    {
-	if (activeceilings[i]
-	    && (activeceilings[i]->tag == line->tag)
-	    && (activeceilings[i]->direction != 0))
-	{
-	    activeceilings[i]->olddirection = activeceilings[i]->direction;
-	    activeceilings[i]->thinker.function.acv = (actionf_v)NULL;
-	    activeceilings[i]->direction = 0;		// in-stasis
-	    rtn = 1;
-	}
-    }
-    
-
-    return rtn;
-}
diff --git a/games/NXDoom/src/strife/p_dialog.c b/games/NXDoom/src/strife/p_dialog.c
deleted file mode 100644
index e2988a481..000000000
--- a/games/NXDoom/src/strife/p_dialog.c
+++ /dev/null
@@ -1,1413 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2010 James Haley, Samuel Villarreal
-//
-// 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.
-//
-// DESCRIPTION:
-//
-// [STRIFE] New Module
-//
-// Dialog Engine for Strife
-//
-
-#include <stdlib.h>
-
-#include "z_zone.h"
-#include "w_wad.h"
-#include "deh_str.h"
-#include "d_main.h"
-#include "d_mode.h"
-#include "d_player.h"
-#include "doomstat.h"
-#include "m_random.h"
-#include "m_menu.h"
-#include "m_misc.h"
-#include "r_main.h"
-#include "v_video.h"
-#include "p_local.h"
-#include "sounds.h"
-#include "p_dialog.h"
-#include "s_sound.h"
-#include "p_local.h"
-#include "p_inter.h"
-
-//
-// Defines and Macros
-//
-
-// haleyjd: size of the original Strife mapdialog_t structure.
-#define ORIG_MAPDIALOG_SIZE 0x5EC
-
-#define DIALOG_INT(field, ptr)    \
-    field = ((int)ptr[0]        | \
-            ((int)ptr[1] <<  8) | \
-            ((int)ptr[2] << 16) | \
-            ((int)ptr[3] << 24)); \
-    ptr += 4;
-
-#define DIALOG_STR(field, ptr, len) \
-    memcpy(field, ptr, len);        \
-    ptr += len;
-
-//
-// Globals
-//
-
-// This can be toggled at runtime to determine if the full dialog messages
-// are subtitled on screen or not. Defaults to off.
-int dialogshowtext = false;
-
-// The global mission objective buffer. This gets written to and read from file,
-// and is set by dialogs and line actions.
-char mission_objective[OBJECTIVE_LEN];
-
-//
-// Static Globals
-//
-
-// True if SCRIPT00 is loaded.
-static boolean script0loaded;
-
-// Number of dialogs defined in the current level's script.
-static int numleveldialogs;
-
-// The actual level dialogs. This didn't exist in Strife, but is new to account
-// for structure alignment/packing concerns, given that Chocolate Doom is
-// multiplatform.
-static mapdialog_t *leveldialogs;
-
-// The actual script00 dialogs. As above.
-static mapdialog_t *script0dialogs;
-
-// Number of dialogs defined in the SCRIPT00 lump.
-static int numscript0dialogs;
-
-// The player engaged in dialog. This is always player 1, though, since Rogue
-// never completed the ability to use dialog outside of single-player mode.
-static player_t *dialogplayer;
-
-// The object to which the player is speaking.
-static mobj_t   *dialogtalker;
-
-// The talker's current angle
-static angle_t dialogtalkerangle;
-
-// The currently active mapdialog object.
-static mapdialog_t *currentdialog;
-
-// Text at the end of the choices
-static char dialoglastmsgbuffer[48];
-
-// Item to display to player when picked up or recieved
-static char pickupstring[46];
-
-// Health based on gameskill given by the front's medic
-static const int healthamounts[] = { -100 , -75, -50, -50, -100 };
-
-//=============================================================================
-//
-// Dialog State Sets
-//
-// These are used to animate certain actors in response to what happens in
-// their dialog sequences.
-//
-
-typedef struct dialogstateset_s
-{
-    mobjtype_t type;  // the type of object
-    statenum_t greet; // greeting state, for start of dialog
-    statenum_t yes;   // "yes" state, for an affirmative response
-    statenum_t no;    // "no" state, when you don't have the right items
-} dialogstateset_t;
-
-static dialogstateset_t dialogstatesets[] =
-{
-    { MT_PLAYER,       S_NULL,    S_NULL,    S_NULL    },
-    { MT_SHOPKEEPER_W, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
-    { MT_SHOPKEEPER_B, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
-    { MT_SHOPKEEPER_A, S_MRGT_00, S_MRYS_00, S_MRNO_00 },
-    { MT_SHOPKEEPER_M, S_MRGT_00, S_MRYS_00, S_MRNO_00 }
-};
-
-// Rogue stored this in a static global rather than making it a define...
-static int numdialogstatesets = arrlen(dialogstatesets);
-
-// Current dialog talker state
-static dialogstateset_t *dialogtalkerstates;
-
-//=============================================================================
-//
-// Random Messages
-//
-// Rogue hard-coded these so they wouldn't have to repeat them several times
-// in the SCRIPT00 lump, apparently.
-//
-
-#define MAXRNDMESSAGES 10
-
-typedef struct rndmessage_s
-{
-    const char *type_name;
-    int nummessages;
-    const char *messages[MAXRNDMESSAGES];
-} rndmessage_t;
-
-static rndmessage_t rndMessages[] = 
-{
-    // Peasants
-    {
-        "PEASANT",
-        10,
-        {
-            "PLEASE DON'T HURT ME.",
-            
-            "IF YOU'RE LOOKING TO HURT ME, I'M \n"
-            "NOT REALLY WORTH THE EFFORT.",
-            
-            "I DON'T KNOW ANYTHING.",
-            
-            "GO AWAY OR I'LL CALL THE GUARDS!",
-            
-            "I WISH SOMETIMES THAT ALL THESE \n"
-            "REBELS WOULD JUST LEARN THEIR \n"
-            "PLACE AND STOP THIS NONSENSE.",
-
-            "JUST LEAVE ME ALONE, OK?",
-
-            "I'M NOT SURE, BUT SOMETIMES I THINK \n"
-            "THAT I KNOW SOME OF THE ACOLYTES.",
-
-            "THE ORDER'S GOT EVERYTHING AROUND HERE PRETTY WELL LOCKED UP TIGHT.",
-
-            "THERE'S NO WAY THAT THIS IS JUST A \n"
-            "SECURITY FORCE.",
-
-            "I'VE HEARD THAT THE ORDER IS REALLY \n"
-            "NERVOUS ABOUT THE FRONT'S \n"
-            "ACTIONS AROUND HERE."
-        }
-    },
-    // Rebel
-    {
-        "REBEL",
-        10,
-        {
-            "THERE'S NO WAY THE ORDER WILL \n"
-            "STAND AGAINST US.",
-
-            "WE'RE ALMOST READY TO STRIKE. \n"
-            "MACIL'S PLANS ARE FALLING IN PLACE.",
-
-            "WE'RE ALL BEHIND YOU, DON'T WORRY.",
-
-            "DON'T GET TOO CLOSE TO ANY OF THOSE BIG ROBOTS. THEY'LL MELT YOU DOWN \n"
-            "FOR SCRAP!",
-
-            "THE DAY OF OUR GLORY WILL SOON \n"
-            "COME, AND THOSE WHO OPPOSE US WILL \n"
-            "BE CRUSHED!",
-
-            "DON'T GET TOO COMFORTABLE. WE'VE \n"
-            "STILL GOT OUR WORK CUT OUT FOR US.",
-
-            "MACIL SAYS THAT YOU'RE THE NEW \n"
-            "HOPE. BEAR THAT IN MIND.",
-
-            "ONCE WE'VE TAKEN THESE CHARLATANS DOWN, WE'LL BE ABLE TO REBUILD THIS "
-            "WORLD AS IT SHOULD BE.",
-
-            "REMEMBER THAT YOU AREN'T FIGHTING \n"
-            "JUST FOR YOURSELF, BUT FOR \n"
-            "EVERYONE HERE AND OUTSIDE.",
-
-            "AS LONG AS ONE OF US STILL STANDS, \n"
-            "WE WILL WIN."
-        }
-    },
-    // Acolyte
-    {
-        "AGUARD",
-        10,
-        {
-            "MOVE ALONG,  PEASANT.",
-
-            "FOLLOW THE TRUE FAITH, ONLY THEN \n"
-            "WILL YOU BEGIN TO UNDERSTAND.",
-
-            "ONLY THROUGH DEATH CAN ONE BE \n"
-            "TRULY REBORN.",
-
-            "I'M NOT INTERESTED IN YOUR USELESS \n"
-            "DRIVEL.",
-
-            "IF I HAD WANTED TO TALK TO YOU I \n"
-            "WOULD HAVE TOLD YOU SO.",
-
-            "GO AND ANNOY SOMEONE ELSE!",
-
-            "KEEP MOVING!",
-
-            "IF THE ALARM GOES OFF, JUST STAY OUT OF OUR WAY!",
-
-            "THE ORDER WILL CLEANSE THE WORLD \n"
-            "AND USHER IT INTO THE NEW ERA.",
-
-            "PROBLEM?  NO, I THOUGHT NOT.",
-        }
-    },
-    // Beggar
-    {
-        "BEGGAR",
-        10,
-        {
-            "ALMS FOR THE POOR?",
-
-            "WHAT ARE YOU LOOKING AT, SURFACER?",
-
-            "YOU WOULDN'T HAVE ANY EXTRA FOOD, WOULD YOU?",
-
-            "YOU  SURFACE PEOPLE WILL NEVER \n"
-            "                                                                 "
-            "                                      UNDERSTAND US.",
-
-            "HA, THE GUARDS CAN'T FIND US.  THOSE \n"
-            "IDIOTS DON'T EVEN KNOW WE EXIST.",
-
-            "ONE DAY EVERYONE BUT THOSE WHO SERVE THE ORDER WILL BE FORCED TO "
-            "  JOIN US.",
-
-            "STARE NOW,  BUT YOU KNOW THAT THIS WILL BE YOUR OWN FACE ONE DAY.",
-
-            // Note: "NOTHING THING" is an authentic typo
-            "THERE'S NOTHING THING MORE \n"
-            "ANNOYING THAN A SURFACER WITH AN ATTITUDE!",
-
-            "THE ORDER WILL MAKE SHORT WORK OF YOUR PATHETIC FRONT.",
-
-            "WATCH YOURSELF SURFACER. WE KNOW OUR ENEMIES!"
-        }
-    },
-    // Templar
-    {
-        "PGUARD",
-        10,
-        {
-            "WE ARE THE HANDS OF FATE. TO EARN \n"
-            "OUR WRATH IS TO FIND OBLIVION!",
-
-            "THE ORDER WILL CLEANSE THE WORLD \n"
-            "OF THE WEAK AND CORRUPT!",
-
-            "OBEY THE WILL OF THE MASTERS!",
-
-            "LONG LIFE TO THE BROTHERS OF THE \n"
-            "ORDER!",
-
-            "FREE WILL IS AN ILLUSION THAT BINDS \n"
-            "THE WEAK MINDED.",
-
-            "POWER IS THE PATH TO GLORY. TO \n"
-            "FOLLOW THE ORDER IS TO WALK THAT \n"
-            "PATH!",
-
-            "TAKE YOUR PLACE AMONG THE \n"
-            "RIGHTEOUS, JOIN US!",
-
-            "THE ORDER PROTECTS ITS OWN.",
-
-            "ACOLYTES?  THEY HAVE YET TO SEE THE FULL GLORY OF THE ORDER.",
-
-            "IF THERE IS ANY HONOR INSIDE THAT \n"
-            "PATHETIC SHELL OF A BODY, \n"
-            "YOU'LL ENTER INTO THE ARMS OF THE \n"
-            "ORDER."
-        }
-    }
-};
-
-// And again, this could have been a define, but was a variable.
-static int numrndmessages = arrlen(rndMessages);
-
-//=============================================================================
-//
-// Dialog Menu Structure
-//
-// The Strife dialog system is actually just a serious abuse of the DOOM menu
-// engine. Hence why it doesn't work in multiplayer games or during demo
-// recording.
-//
-
-#define NUMDIALOGMENUITEMS 6
-
-static void P_DialogDrawer(void);
-
-static menuitem_t dialogmenuitems[] =
-{
-    { 1, "", P_DialogDoChoice, '1' }, // These items are loaded dynamically
-    { 1, "", P_DialogDoChoice, '2' },
-    { 1, "", P_DialogDoChoice, '3' },
-    { 1, "", P_DialogDoChoice, '4' },
-    { 1, "", P_DialogDoChoice, '5' },
-    { 1, "", P_DialogDoChoice, '6' }  // Item 6 is always the dismissal item
-};
-
-static menu_t dialogmenu =
-{
-    NUMDIALOGMENUITEMS, 
-    NULL, 
-    dialogmenuitems, 
-    P_DialogDrawer, 
-    42, 
-    75, 
-    0
-};
-
-// Lump number of the dialog background picture, if any.
-static int dialogbgpiclumpnum;
-
-// Name of current speaking character.
-static const char *dialogname;
-
-// Current dialog text.
-static const char *dialogtext;
-
-//=============================================================================
-//
-// Routines
-//
-
-//
-// P_ParseDialogLump
-//
-// haleyjd 09/02/10: This is an original function added to parse out the 
-// dialogs from the dialog lump rather than reading them raw from the lump 
-// pointer. This avoids problems with structure packing.
-//
-static void P_ParseDialogLump(byte *lump, mapdialog_t **dialogs, 
-                              int numdialogs, int tag)
-{
-    int i;
-    byte *rover = lump;
-
-    *dialogs = Z_Malloc(numdialogs * sizeof(mapdialog_t), tag, NULL);
-
-    for(i = 0; i < numdialogs; i++)
-    {
-        int j;
-        mapdialog_t *curdialog = &((*dialogs)[i]);
-
-        DIALOG_INT(curdialog->speakerid,    rover);
-        DIALOG_INT(curdialog->dropitem,     rover);
-        DIALOG_INT(curdialog->checkitem[0], rover);
-        DIALOG_INT(curdialog->checkitem[1], rover);
-        DIALOG_INT(curdialog->checkitem[2], rover);
-        DIALOG_INT(curdialog->jumptoconv,   rover);
-        DIALOG_STR(curdialog->name,         rover, MDLG_NAMELEN);
-        DIALOG_STR(curdialog->voice,        rover, MDLG_LUMPLEN);
-        DIALOG_STR(curdialog->backpic,      rover, MDLG_LUMPLEN);
-        DIALOG_STR(curdialog->text,         rover, MDLG_TEXTLEN);
-
-        // copy choices
-        for(j = 0; j < 5; j++)
-        {
-            mapdlgchoice_t *curchoice = &(curdialog->choices[j]);
-            DIALOG_INT(curchoice->giveitem,         rover);
-            DIALOG_INT(curchoice->needitems[0],     rover);
-            DIALOG_INT(curchoice->needitems[1],     rover);
-            DIALOG_INT(curchoice->needitems[2],     rover);
-            DIALOG_INT(curchoice->needamounts[0],   rover);
-            DIALOG_INT(curchoice->needamounts[1],   rover);
-            DIALOG_INT(curchoice->needamounts[2],   rover);
-            DIALOG_STR(curchoice->text,             rover, MDLG_CHOICELEN);
-            DIALOG_STR(curchoice->textok,           rover, MDLG_MSGLEN);
-            DIALOG_INT(curchoice->next,             rover);
-            DIALOG_INT(curchoice->objective,        rover);
-            DIALOG_STR(curchoice->textno,           rover, MDLG_MSGLEN);
-        }
-    }
-}
-
-//
-// P_DialogLoad
-//
-// [STRIFE] New function
-// haleyjd 09/02/10: Loads the dialog script for the current map. Also loads 
-// SCRIPT00 if it has not yet been loaded.
-//
-void P_DialogLoad(void)
-{
-    char lumpname[9];
-    int  lumpnum;
-
-    // load the SCRIPTxy lump corresponding to MAPxy, if it exists.
-    DEH_snprintf(lumpname, sizeof(lumpname), "script%02d", gamemap);
-    if((lumpnum = W_CheckNumForName(lumpname)) == -1)
-        numleveldialogs = 0;
-    else
-    {
-        byte *leveldialogptr = W_CacheLumpNum(lumpnum, PU_STATIC);
-        numleveldialogs = W_LumpLength(lumpnum) / ORIG_MAPDIALOG_SIZE;
-        P_ParseDialogLump(leveldialogptr, &leveldialogs, numleveldialogs, 
-                          PU_LEVEL);
-        Z_Free(leveldialogptr); // haleyjd: free the original lump
-    }
-
-    // also load SCRIPT00 if it has not been loaded yet
-    if(!script0loaded)
-    {
-        byte *script0ptr;
-
-        script0loaded = true; 
-        // BUG: Rogue should have used W_GetNumForName here...
-        lumpnum = W_CheckNumForName(DEH_String("script00")); 
-        script0ptr = W_CacheLumpNum(lumpnum, PU_STATIC);
-        numscript0dialogs = W_LumpLength(lumpnum) / ORIG_MAPDIALOG_SIZE;
-        P_ParseDialogLump(script0ptr, &script0dialogs, numscript0dialogs,
-                          PU_STATIC);
-        Z_Free(script0ptr); // haleyjd: free the original lump
-    }
-}
-
-//
-// P_PlayerHasItem
-//
-// [STRIFE] New function
-// haleyjd 09/02/10: Checks for inventory items, quest flags, etc. for dialogs.
-// Returns the amount possessed, or 0 if none.
-//
-int P_PlayerHasItem(player_t *player, mobjtype_t type)
-{
-    int i;
-
-    if(type > 0)
-    {
-        // check keys
-        if(type >= MT_KEY_BASE && type < MT_INV_SHADOWARMOR)
-            return (player->cards[type - MT_KEY_BASE]);
-
-        // check sigil pieces
-        if(type >= MT_SIGIL_A && type <= MT_SIGIL_E)
-            return (type - MT_SIGIL_A <= player->sigiltype);
-
-        // check quest tokens
-        if(type >= MT_TOKEN_QUEST1 && type <= MT_TOKEN_QUEST31)
-            return (player->questflags & (1 << (type - MT_TOKEN_QUEST1)));
-
-        // check inventory
-        for(i = 0; i < 32; i++)
-        {
-            if(type == player->inventory[i].type)
-                return player->inventory[i].amount;
-        }
-    }
-    return 0;
-}
-
-//
-// P_DialogFind
-//
-// [STRIFE] New function
-// haleyjd 09/03/10: Looks for a dialog definition matching the given 
-// Script ID # for an mobj.
-//
-mapdialog_t *P_DialogFind(mobjtype_t type, int jumptoconv)
-{
-    int i;
-
-    // check the map-specific dialogs first
-    for(i = 0; i < numleveldialogs; i++)
-    {
-        if(type == leveldialogs[i].speakerid)
-        {
-            if(jumptoconv <= 1)
-                return &leveldialogs[i];
-            else
-                --jumptoconv;
-        }
-    }
-
-    // check SCRIPT00 dialogs next
-    for(i = 0; i < numscript0dialogs; i++)
-    {
-        if(type == script0dialogs[i].speakerid)
-            return &script0dialogs[i];
-    }
-
-    // the default dialog is script 0 in the SCRIPT00 lump.
-    return &script0dialogs[0];
-}
-
-//
-// P_DialogGetStates
-//
-// [STRIFE] New function
-// haleyjd 09/03/10: Find the set of special dialog states (greetings, yes, no)
-// for a particular thing type.
-//
-static dialogstateset_t *P_DialogGetStates(mobjtype_t type)
-{
-    int i;
-
-    // look for a match by type
-    for(i = 0; i < numdialogstatesets; i++)
-    {
-        if(type == dialogstatesets[i].type)
-            return &dialogstatesets[i];
-    }
-
-    // return the default 0 record if no match.
-    return &dialogstatesets[0];
-}
-
-//
-// P_DialogGetMsg
-//
-// [STRIFE] New function
-// haleyjd 09/03/10: Redirects dialog messages when the script indicates that
-// the actor should use a random message stored in the executable instead.
-//
-static const char *P_DialogGetMsg(const char *message)
-{
-    // if the message starts with "RANDOM"...
-    if(!strncasecmp(message, DEH_String("RANDOM"), 6))
-    {
-        int i;
-        const char *nameloc = message + 7;
-
-        // look for a match in rndMessages for the string starting 
-        // 7 chars after "RANDOM_"
-        for(i = 0; i < numrndmessages; i++)
-        {
-            if(!strncasecmp(nameloc, rndMessages[i].type_name, 4))
-            {
-                // found a match, so return a random message
-                int rnd = M_Random();
-                int nummessages = rndMessages[i].nummessages;
-                return DEH_String(rndMessages[i].messages[rnd % nummessages]);
-            }
-        }
-    }
-
-    // otherwise, just return the message passed in.
-    return message;
-}
-
-//
-// P_GiveInventoryItem
-//
-// [STRIFE] New function
-// haleyjd 09/03/10: Give an inventory item to the player, if possible.
-// villsa 09/09/10: Fleshed out routine
-//
-boolean P_GiveInventoryItem(player_t *player, int sprnum, mobjtype_t type)
-{
-    int curinv = 0;
-    int i;
-    boolean ok = false;
-    mobjtype_t item = 0;
-    inventory_t* invtail;
-
-    // repaint the status bar due to inventory changing
-    player->st_update = true;
-
-    while(1)
-    {
-        // inventory is full
-        if(curinv > player->numinventory)
-            return true;
-
-        item = player->inventory[curinv].type;
-        if(type < item)
-        {
-            if(curinv != MAXINVENTORYSLOTS)
-            {
-                // villsa - sort inventory item if needed
-                invtail = &player->inventory[player->numinventory - 1];
-                if(player->numinventory >= (curinv + 1))
-                {
-                    for(i = player->numinventory; i >= (curinv + 1); --i)    
-                    {
-                        invtail[1].sprite   = invtail[0].sprite;
-                        invtail[1].type     = invtail[0].type;
-                        invtail[1].amount   = invtail[0].amount;
-
-                        invtail--;
-                    }
-                }
-
-                // villsa - add inventory item
-                player->inventory[curinv].amount = 1;
-                player->inventory[curinv].sprite = sprnum;
-                player->inventory[curinv].type = type;
-
-                // sort cursor if needed
-                if(player->numinventory)
-                {
-                    if(curinv <= player->inventorycursor)
-                        player->inventorycursor++;
-                }
-
-                player->numinventory++;
-
-                return true;
-            }
-
-            return false;
-        }
-
-        if(type == item)
-            break;
-
-        curinv++;
-    }
-
-    // check amount of inventory item by using the mass from mobjinfo
-    if(player->inventory[curinv].amount < mobjinfo[item].mass)
-    {
-        player->inventory[curinv].amount++;
-        ok = true;
-    }
-    else
-        ok = false;
-
-    return ok;
-}
-
-//
-// P_GiveItemToPlayer
-//
-// [STRIFE] New function
-// haleyjd 09/03/10: Sorts out how to give something to the player.
-// Not strictly just for inventory items.
-// villsa 09/09/10: Fleshed out function
-//
-boolean P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type)
-{
-    int i = 0;
-    line_t junk;
-    int sound = sfx_itemup; // haleyjd 09/21/10: different sounds for items
-
-    // set quest if mf_givequest flag is set
-    if(mobjinfo[type].flags & MF_GIVEQUEST)
-        player->questflags |= 1 << (mobjinfo[type].speed - 1);
-
-    // check for keys
-    if(type >= MT_KEY_BASE && type <= MT_NEWKEY5)
-    {
-        P_GiveCard(player, type - MT_KEY_BASE);
-        return true;
-    }
-
-    // check for quest tokens
-    if(type >= MT_TOKEN_QUEST1 && type <= MT_TOKEN_QUEST31)
-    {
-        if(mobjinfo[type].name)
-        {
-            M_StringCopy(pickupstring, DEH_String(mobjinfo[type].name), 39);
-            player->message = pickupstring;
-        }
-        player->questflags |= 1 << (type - MT_TOKEN_QUEST1);
-
-        if(player == &players[consoleplayer])
-            S_StartSound(NULL, sound);
-        return true;
-    }
-
-    // haleyjd 09/22/10: Refactored to give sprites higher priority than
-    // mobjtypes and to implement missing logic.
-    switch(sprnum)
-    {
-    case SPR_HELT: // This is given only by the "DONNYTRUMP" cheat (aka Midas)
-        P_GiveInventoryItem(player, SPR_HELT, MT_TOKEN_TOUGHNESS);
-        P_GiveInventoryItem(player, SPR_GUNT, MT_TOKEN_ACCURACY);
-
-        // [STRIFE] Bizarre...
-        for(i = 0; i < 5 * player->accuracy + 300; i++)
-            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    case SPR_ARM1: // Armor 1
-        if(!P_GiveArmor(player, -2))
-            P_GiveInventoryItem(player, sprnum, type);
-        break;
-
-    case SPR_ARM2: // Armor 2
-        if(!P_GiveArmor(player, -1))
-            P_GiveInventoryItem(player, sprnum, type);
-        break;
-
-    case SPR_COIN: // 1 Gold
-        P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    case SPR_CRED: // 10 Gold
-        for(i = 0; i < 10; i++)
-            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    case SPR_SACK: // 25 gold
-        for(i = 0; i < 25; i++)
-            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    case SPR_CHST: // 50 gold
-        for(i = 0; i < 50; i++)
-            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break; // haleyjd 20141215: missing break, caused Rowan to not take ring from you.
-
-    case SPR_BBOX: // Box of Bullets
-        if(!P_GiveAmmo(player, am_bullets, 5))
-            return false;
-        break;
-
-    case SPR_BLIT: // Bullet Clip
-        if(!P_GiveAmmo(player, am_bullets, 1))
-            return false;
-        break;
-
-    case SPR_PMAP: // Map powerup
-        if(!P_GivePower(player, pw_allmap))
-            return false;
-        sound = sfx_yeah; // bluh-doop!
-        break;
-
-    case SPR_COMM: // Communicator
-        if(!P_GivePower(player, pw_communicator))
-            return false;
-        sound = sfx_yeah; // bluh-doop!
-        break;
-
-    case SPR_MSSL: // Mini-missile
-        if(!P_GiveAmmo(player, am_missiles, 1))
-            return false;
-        break;
-
-    case SPR_ROKT: // Crate of missiles
-        if(!P_GiveAmmo(player, am_missiles, 5))
-            return false;
-        break;
-
-    case SPR_BRY1: // Battery cell
-        if(!P_GiveAmmo(player, am_cell, 1))
-            return false;
-        break;
-
-    case SPR_CPAC: // Cell pack
-        if(!P_GiveAmmo(player, am_cell, 5))
-            return false;
-        break;
-
-    case SPR_PQRL: // Poison bolts
-        if(!P_GiveAmmo(player, am_poisonbolts, 5))
-            return false;
-        break;
-
-    case SPR_XQRL: // Electric bolts
-        if(!P_GiveAmmo(player, am_elecbolts, 5))
-            return false;
-        break;
-
-    case SPR_GRN1: // HE Grenades
-        if(!P_GiveAmmo(player, am_hegrenades, 1))
-            return false;
-        break;
-
-    case SPR_GRN2: // WP Grenades
-        if(!P_GiveAmmo(player, am_wpgrenades, 1))
-            return false;
-        break;
-
-    case SPR_BKPK: // Backpack (aka Ammo Satchel)
-        if(!player->backpack)
-        {
-            for(i = 0; i < NUMAMMO; i++)
-                player->maxammo[i] *= 2;
-
-            player->backpack = true;
-        }
-        for(i = 0; i < NUMAMMO; i++)
-            P_GiveAmmo(player, i, 1);
-        break;
-
-    case SPR_RIFL: // Assault Rifle
-        if(player->weaponowned[wp_rifle])
-            return false;
-
-        if(!P_GiveWeapon(player, wp_rifle, false))
-            return false;
-        
-        sound = sfx_wpnup; // SHK-CHK!
-        break;
-
-    case SPR_FLAM: // Flamethrower
-        if(player->weaponowned[wp_flame])
-            return false;
-
-        if(!P_GiveWeapon(player, wp_flame, false))
-            return false;
-
-        sound = sfx_wpnup; // SHK-CHK!
-        break;
-
-    case SPR_MMSL: // Mini-missile Launcher
-        if(player->weaponowned[wp_missile])
-            return false;
-
-        if(!P_GiveWeapon(player, wp_missile, false))
-            return false;
-
-        sound = sfx_wpnup; // SHK-CHK!
-        break;
-
-    case SPR_TRPD: // Mauler
-        if(player->weaponowned[wp_mauler])
-            return false;
-
-        if(!P_GiveWeapon(player, wp_mauler, false))
-            return false;
-
-        sound = sfx_wpnup; // SHK-CHK!
-        break;
-
-    case SPR_CBOW: // Here's a crossbow. Just aim straight, and *SPLAT!*
-        if(player->weaponowned[wp_elecbow])
-            return false;
-
-        if(!P_GiveWeapon(player, wp_elecbow, false))
-            return false;
-
-        sound = sfx_wpnup; // SHK-CHK!
-        break;
-
-    case SPR_TOKN: // Miscellaneous items - These are determined by thingtype.
-        switch(type)
-        {
-        case MT_KEY_HAND: // Severed hand
-            P_GiveCard(player, key_SeveredHand);
-            break;
-
-        case MT_MONY_300: // 300 Gold (this is the only way to get it, in fact)
-            for(i = 0; i < 300; i++)
-                P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-            break;
-
-        case MT_TOKEN_AMMO: // Ammo token - you get this from the Weapons Trainer
-            if(player->ammo[am_bullets] >= 50)
-                return false;
-
-            player->ammo[am_bullets] = 50;
-            break;
-
-        case MT_TOKEN_HEALTH: // Health token - from the Front's doctor
-            if(!P_GiveBody(player, healthamounts[gameskill]))
-                return false;
-            break;
-
-        case MT_TOKEN_ALARM: // Alarm token - particularly from the Oracle.
-            P_NoiseAlert(player->mo, player->mo);
-            A_AlertSpectreC(dialogtalker); // BUG: assumes in a dialog o_O
-            break;
-
-        case MT_TOKEN_DOOR1: // Door special 1
-            junk.tag = 222;
-            EV_DoDoor(&junk, vld_open);
-            break;
-
-        case MT_TOKEN_PRISON_PASS: // Door special 1 - Prison pass
-            junk.tag = 223;
-            EV_DoDoor(&junk, vld_open);
-            if(gamemap == 2) // If on Tarnhill, give Prison pass object
-                P_GiveInventoryItem(player, sprnum, type);
-            break;
-
-        case MT_TOKEN_SHOPCLOSE: // Door special 3 - "Shop close" - unused?
-            junk.tag = 222;
-            EV_DoDoor(&junk, vld_close);
-            break;
-
-        case MT_TOKEN_DOOR3: // Door special 4 (or 3? :P ) 
-            junk.tag = 224;
-            EV_DoDoor(&junk, vld_close);
-            break;
-
-        case MT_TOKEN_STAMINA: // Stamina upgrade
-            if(player->stamina >= 100)
-                return false;
-
-            player->stamina += 10;
-            P_GiveBody(player, 200); // full healing
-            break;
-
-        case MT_TOKEN_NEW_ACCURACY: // Accuracy upgrade
-            if(player->accuracy >= 100)
-                return false;
-
-            player->accuracy += 10;
-            break;
-
-        case MT_SLIDESHOW: // Slideshow (start a finale)
-            gameaction = ga_victory;
-            if(gamemap == 10)
-                P_GiveItemToPlayer(player, SPR_TOKN, MT_TOKEN_QUEST17);
-            break;
-        
-        default: // The default is to just give it as an inventory item.
-            P_GiveInventoryItem(player, sprnum, type);
-            break;
-        }
-        break;
-
-    default: // The ultimate default: Give it as an inventory item.
-        if(!P_GiveInventoryItem(player, sprnum, type))
-            return false;
-        break;
-    }
-
-    // Play sound.
-    if(player == &players[consoleplayer])
-        S_StartSound(NULL, sound);
-
-    return true;
-}
-
-//
-// P_TakeDialogItem
-//
-// [STRIFE] New function
-// haleyjd 09/03/10: Removes needed items from the player's inventory.
-//
-static void P_TakeDialogItem(player_t *player, int type, int amount)
-{
-    int i;
-
-    if(amount <= 0)
-        return;
-
-    for(i = 0; i < player->numinventory; i++)
-    {
-        // find a matching item
-        if(type != player->inventory[i].type)
-            continue;
-
-        // if there is none left...
-        if((player->inventory[i].amount -= amount) < 1)
-        {
-            // ...shift everything above it down
-            int j;
-
-            // BUG: They should have stopped at j < numinventory. This
-            // seems to implicitly assume that numinventory is always at
-            // least one less than the max # of slots, otherwise it 
-            // pulls in data from the following player_t fields:
-            // st_update, numinventory, inventorycursor, accuracy, stamina
-            for(j = i + 1; j <= player->numinventory; j++)
-            {
-                inventory_t *item1 = &(player->inventory[j - 1]);
-                inventory_t *item2 = &(player->inventory[j]);
-
-                *item1 = *item2;
-            }
-
-            // blank the topmost slot
-            // BUG: This will overwrite the aforementioned fields if
-            // numinventory is equal to the number of slots!
-            // STRIFE-TODO: Overflow emulation?
-            player->inventory[player->numinventory].type = NUMMOBJTYPES;
-            player->inventory[player->numinventory].sprite = -1;
-            player->numinventory--;
-
-            // update cursor position
-            if(player->inventorycursor >= player->numinventory)
-            {
-                if(player->inventorycursor)
-                    player->inventorycursor--;
-            }
-        } // end if
-        
-        return; // done!
-
-    } // end for
-}
-
-//
-// P_DialogDrawer
-//
-// This function is set as the drawer callback for the dialog menu.
-//
-static void P_DialogDrawer(void)
-{
-    angle_t angle;
-    int y;
-    int i;
-    int height;
-    int finaly;
-    char choicetext[64];
-    char choicetext2[64];
-
-    // Run down bonuscount faster than usual so that flashes from being given
-    // items are less obvious.
-    if(dialogplayer->bonuscount)
-    {
-        dialogplayer->bonuscount -= 3;
-        if(dialogplayer->bonuscount < 0)
-            dialogplayer->bonuscount = 0;
-    }
-
-    angle = R_PointToAngle2(dialogplayer->mo->x,
-                            dialogplayer->mo->y,
-                            dialogtalker->x,
-                            dialogtalker->y);
-    angle -= dialogplayer->mo->angle;
-
-    // Dismiss the dialog if the player is out of alignment, or the thing he was
-    // talking to is now engaged in battle.
-    if ((angle > ANG45 && angle < (ANG270+ANG45))
-     || (dialogtalker->flags & MF_NODIALOG) != 0)
-    {
-        P_DialogDoChoice(dialogmenu.numitems - 1);
-    }
-
-    dialogtalker->reactiontime = 2;
-
-    // draw background
-    if(dialogbgpiclumpnum != -1)
-    {
-        patch_t *patch = W_CacheLumpNum(dialogbgpiclumpnum, PU_CACHE);
-        V_DrawPatchDirect(0, 0, patch);
-    }
-
-    // if there's a valid background pic, delay drawing the rest of the menu 
-    // for a while; otherwise, it will appear immediately
-    if(dialogbgpiclumpnum == -1 || menupausetime <= gametic)
-    {
-        if(menuindialog)
-        {
-            // time to pause the game?
-            if(menupausetime + 3 < gametic)
-                menupause = true;
-        }
-
-        // draw character name
-        M_WriteText(12, 18, dialogname);
-        y = 28;
-
-        // show text (optional for dialogs with voices)
-        if(dialogshowtext || currentdialog->voice[0] == '\0')
-            y = M_WriteText(20, 28, dialogtext);
-
-        height = 20 * dialogmenu.numitems;
-
-        finaly = 175 - height;     // preferred height
-        if(y > finaly)
-            finaly = 199 - height; // height it will bump down to if necessary.
-
-        // draw divider
-        M_WriteText(42, finaly - 6, DEH_String("______________________________"));
-
-        dialogmenu.y = finaly + 6;
-        y = 0;
-
-        // draw the menu items
-        for(i = 0; i < dialogmenu.numitems - 1; i++)
-        {
-            DEH_snprintf(choicetext, sizeof(choicetext),
-                         "%d) %s", i + 1, currentdialog->choices[i].text);
-            
-            // alternate text for items that need money
-            if(currentdialog->choices[i].needamounts[0] > 0)
-            {
-                // haleyjd 20120401: necessary to avoid undefined behavior:
-                M_StringCopy(choicetext2, choicetext, sizeof(choicetext2));
-                DEH_snprintf(choicetext, sizeof(choicetext),
-                             "%s for %d", choicetext2,
-                             currentdialog->choices[i].needamounts[0]);
-            }
-
-            M_WriteText(dialogmenu.x, dialogmenu.y + 3 + y, choicetext);
-            y += 19;
-        }
-
-        // draw the final item for dismissing the dialog
-        M_WriteText(dialogmenu.x, 19 * i + dialogmenu.y + 3, dialoglastmsgbuffer);
-    }
-}
-
-//
-// P_DialogDoChoice
-//
-// [STRIFE] New function
-// haleyjd 09/05/10: Handles making a choice in a dialog. Installed as the
-// callback for all items in the dialogmenu structure.
-//
-void P_DialogDoChoice(int choice)
-{
-    int i = 0, nextdialog = 0;
-    boolean candochoice = true;
-    const char *message = NULL;
-    mapdlgchoice_t *currentchoice;
-
-    if(choice == -1)
-        choice = dialogmenu.numitems - 1;
-
-    currentchoice = &(currentdialog->choices[choice]);
-
-    I_StartVoice(NULL); // STRIFE-TODO: verify (should stop previous voice I believe)
-
-    // villsa 09/08/10: converted into for loop
-    for(i = 0; i < MDLG_MAXITEMS; i++)
-    {
-        if(P_PlayerHasItem(dialogplayer, currentchoice->needitems[i]) <
-                                         currentchoice->needamounts[i])
-        {
-            candochoice = false; // nope, missing something
-        }
-    }
-
-    if(choice != dialogmenu.numitems - 1 && candochoice)
-    {
-        int item;
-
-        message = currentchoice->textok;
-        if(dialogtalkerstates->yes)
-            P_SetMobjState(dialogtalker, dialogtalkerstates->yes);
-
-        item = currentchoice->giveitem;
-        if(item < 0 || 
-           P_GiveItemToPlayer(dialogplayer, 
-                              states[mobjinfo[item].spawnstate].sprite, 
-                              item))
-        {
-            // if successful, take needed items
-            int count = 0;
-            // villsa 09/08/10: converted into for loop
-            for(count = 0; count < MDLG_MAXITEMS; count++)
-            {
-                P_TakeDialogItem(dialogplayer, 
-                                 currentchoice->needitems[count],
-                                 currentchoice->needamounts[count]);
-            }
-        }
-        else
-            message = DEH_String("You seem to have enough!");
-
-        // store next dialog into the talking actor
-        nextdialog = currentchoice->next;
-        if(nextdialog != 0)
-            dialogtalker->miscdata = (byte)(abs(nextdialog));
-    }
-    else
-    {
-        // not successful
-        message = currentchoice->textno;
-        if(dialogtalkerstates->no)
-            P_SetMobjState(dialogtalker, dialogtalkerstates->no);
-    }
-    
-    if(choice != dialogmenu.numitems - 1)
-    {
-        int objective;
-        char *objlump;
-
-        if((objective = currentchoice->objective))
-        {
-            DEH_snprintf(mission_objective, OBJECTIVE_LEN, "log%i", objective);
-            objlump = W_CacheLumpName(mission_objective, PU_CACHE);
-            M_StringCopy(mission_objective, objlump, OBJECTIVE_LEN);
-        }
-        // haleyjd 20130301: v1.31 hack: if first char of message is a period,
-        // clear the player's message. Is this actually used anywhere?
-        if(gameversion == exe_strife_1_31 && message[0] == '.')
-            message = NULL;
-        dialogplayer->message = message;
-    }
-
-    dialogtalker->angle = dialogtalkerangle;
-    dialogplayer->st_update = true;
-    M_ClearMenus(0);
-
-    if(nextdialog >= 0 || gameaction == ga_victory) // Macil hack
-        menuindialog = false;
-    else
-        P_DialogStart(dialogplayer);
-}
-
-//
-// P_DialogStartP1
-//
-// [STRIFE] New function
-// haleyjd 09/13/10: This is a hack used by the finale system.
-//
-void P_DialogStartP1(void)
-{
-    P_DialogStart(&players[0]);
-}
-
-//
-// P_DialogStart
-//
-// villsa [STRIFE] New function
-//
-void P_DialogStart(player_t *player)
-{
-    int i = 0;
-    int pic;
-    int rnd = 0;
-    const char *byetext;
-    int jumptoconv;
-
-    if(menuactive || netgame)
-        return;
-
-    // are we facing towards our NPC?
-    P_AimLineAttack(player->mo, player->mo->angle, (128*FRACUNIT));
-    if(!linetarget)
-    {
-        P_AimLineAttack(player->mo, player->mo->angle + (ANG90/16), (128*FRACUNIT));
-        if(!linetarget)
-            P_AimLineAttack(player->mo, player->mo->angle - (ANG90/16), (128*FRACUNIT));
-    }
-
-    if(!linetarget)
-       return;
-
-    // already in combat, can't talk to it
-    if(linetarget->flags & MF_NODIALOG)
-       return;
-
-    // set pointer to the character talking
-    dialogtalker = linetarget;
-
-    // play a sound
-    if(player == &players[consoleplayer])
-       S_StartSound(0, sfx_radio);
-
-    linetarget->target = player->mo;         // target the player
-    dialogtalker->reactiontime = 2;          // set reactiontime
-    dialogtalkerangle = dialogtalker->angle; // remember original angle
-
-    // face talker towards player
-    A_FaceTarget(dialogtalker);
-
-    // face towards NPC's direction
-    player->mo->angle = R_PointToAngle2(player->mo->x,
-                                        player->mo->y,
-                                        dialogtalker->x,
-                                        dialogtalker->y);
-    // set pointer to player talking
-    dialogplayer = player;
-
-    // haleyjd 09/08/10: get any stored dialog state from this object
-    jumptoconv = linetarget->miscdata;
-
-    // check item requirements
-    while(1)
-    {
-        int i = 0;
-        currentdialog = P_DialogFind(linetarget->type, jumptoconv);
-
-        // dialog's jumptoconv equal to 0? There's nothing to jump to.
-        if(currentdialog->jumptoconv == 0)
-            break;
-
-        // villsa 09/08/10: converted into for loop
-        for(i = 0; i < MDLG_MAXITEMS; i++)
-        {
-            // if the item is non-zero, the player must have at least one in his
-            // or her inventory
-            if(currentdialog->checkitem[i] != 0 &&
-                P_PlayerHasItem(dialogplayer, currentdialog->checkitem[i]) < 1)
-                break;
-        }
-
-        if(i < MDLG_MAXITEMS) // didn't find them all? this is our dialog!
-            break;
-
-        jumptoconv = currentdialog->jumptoconv;
-    }
-
-    M_DialogDimMsg(20, 28, currentdialog->text, false);
-    dialogtext = P_DialogGetMsg(currentdialog->text);
-
-    // get states
-    dialogtalkerstates = P_DialogGetStates(linetarget->type);
-
-    // have talker greet the player
-    if(dialogtalkerstates->greet)
-        P_SetMobjState(dialogtalker, dialogtalkerstates->greet);
-
-    // get talker's name
-    if(currentdialog->name[0])
-        dialogname = currentdialog->name;
-    else
-    {
-        // use a fallback:
-        if(mobjinfo[linetarget->type].name)
-            dialogname = DEH_String(mobjinfo[linetarget->type].name); // mobjtype name
-        else
-            dialogname = DEH_String("Person"); // default name - like Joe in Doom 3 :P
-    }
-
-    // setup number of choices to choose from
-    for(i = 0; i < MDLG_MAXCHOICES; i++)
-    {
-        if(!currentdialog->choices[i].giveitem)
-            break;
-    }
-
-    // set number of choices to menu
-    dialogmenu.numitems = i + 1;
-
-    rnd = M_Random() % 3;
-
-    // setup dialog menu
-    M_StartControlPanel();
-    menupause = false;
-    menuindialog = true;
-    menupausetime = gametic + 17;
-    currentMenu = &dialogmenu;
-
-    if(i >= dialogmenu.lastOn)
-        itemOn = dialogmenu.lastOn;
-    else
-        itemOn = 0;
-
-    // get backdrop
-    pic = W_CheckNumForName(currentdialog->backpic);
-    dialogbgpiclumpnum = pic;
-    if(pic != -1)
-        V_DrawPatchDirect(0, 0, W_CacheLumpNum(pic, PU_CACHE));
-
-    // get voice
-    I_StartVoice(currentdialog->voice);
-
-    // get bye text
-    switch(rnd)
-    {
-    case 2:
-        byetext = DEH_String("BYE!");
-        break;
-    case 1:
-        byetext = DEH_String("Thanks, Bye!");
-        break;
-    default:
-    case 0:
-        byetext = DEH_String("See you later!");
-        break;
-    }
-
-    DEH_snprintf(dialoglastmsgbuffer, sizeof(dialoglastmsgbuffer),
-                 "%d) %s", i + 1, byetext);
-}
-
-// EOF
-
-
diff --git a/games/NXDoom/src/strife/p_dialog.h b/games/NXDoom/src/strife/p_dialog.h
deleted file mode 100644
index 08bef81ea..000000000
--- a/games/NXDoom/src/strife/p_dialog.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1996 Rogue Entertainment / Velocity, Inc.
-// Copyright(C) 2010 James Haley, Samuel Villareal
-//
-// 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.
-//
-// DESCRIPTION:
-//
-// [STRIFE] New Module
-//
-// Dialog Engine for Strife
-//
-
-#ifndef P_DIALOG_H__
-#define P_DIALOG_H__
-
-#define OBJECTIVE_LEN       300
-
-#define MAXINVENTORYSLOTS   30
-
-#define MDLG_CHOICELEN      32
-#define MDLG_MSGLEN         80
-#define MDLG_NAMELEN        16
-#define MDLG_LUMPLEN        8
-#define MDLG_TEXTLEN        320
-#define MDLG_MAXCHOICES     5
-#define MDLG_MAXITEMS       3
-
-extern char mission_objective[OBJECTIVE_LEN];
-
-extern int dialogshowtext;
-
-// villsa - convenient macro for giving objective logs to player
-#define GiveObjective(x, minlumpnum) \
-do { \
-  int obj_ln  = W_CheckNumForName(DEH_String(x)); \
-  if(obj_ln > minlumpnum) \
-    M_StringCopy(mission_objective, W_CacheLumpNum(obj_ln, PU_CACHE), \
-                 OBJECTIVE_LEN);\
-} while(0)
-
-// haleyjd - voice and objective in one
-#define GiveVoiceObjective(voice, log, minlumpnum) \
-do { \
-  int obj_ln = W_CheckNumForName(DEH_String(log)); \
-  I_StartVoice(DEH_String(voice)); \
-  if(obj_ln > minlumpnum) \
-    M_StringCopy(mission_objective, W_CacheLumpNum(obj_ln, PU_CACHE), \
-                 OBJECTIVE_LEN);\
-} while(0)
-
-typedef struct mapdlgchoice_s
-{
-    int  giveitem;                      // item given when successful
-    int  needitems[MDLG_MAXITEMS];      // item needed for success
-    int  needamounts[MDLG_MAXITEMS];    // amount of items needed
-    char text[MDLG_CHOICELEN];          // normal text
-    char textok[MDLG_MSGLEN];           // message given on success
-    int next;                           // next dialog?
-    int objective;                      // ???
-    char textno[MDLG_MSGLEN];           // message given on failure
-} mapdlgchoice_t;
-
-typedef struct mapdialog_s
-{
-    int speakerid;                      // script ID# for mobjtype that will use this dialog
-    int dropitem;                       // item to drop if that thingtype is killed
-    int checkitem[MDLG_MAXITEMS];       // item(s) needed to see this dialog
-    int jumptoconv;                     // conversation to jump to when... ?
-    char name[MDLG_NAMELEN];            // name of speaker
-    char voice[MDLG_LUMPLEN];           // voice file to play
-    char backpic[MDLG_LUMPLEN];         // backdrop pic for character, if any
-    char text[MDLG_TEXTLEN];            // main message text
-    
-    // options that this dialog gives the player
-    mapdlgchoice_t choices[MDLG_MAXCHOICES];
-} mapdialog_t;
-
-void         P_DialogLoad(void);
-void         P_DialogStart(player_t *player);
-void         P_DialogDoChoice(int choice);
-boolean      P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type);
-boolean      P_GiveInventoryItem(player_t *player, int sprnum, mobjtype_t type);
-boolean      P_UseInventoryItem(player_t* player, int item);
-void         P_DialogStartP1(void);
-mapdialog_t* P_DialogFind(mobjtype_t type, int jumptoconv);
-int          P_PlayerHasItem(player_t *player, mobjtype_t type);
-
-#endif
-
-// EOF
-
-
diff --git a/games/NXDoom/src/strife/p_doors.c b/games/NXDoom/src/strife/p_doors.c
deleted file mode 100644
index 30f6e3118..000000000
--- a/games/NXDoom/src/strife/p_doors.c
+++ /dev/null
@@ -1,1370 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION: Door animation code (opening/closing)
-//
-
-
-
-#include "z_zone.h"
-#include "doomdef.h"
-#include "deh_main.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "dstrings.h"
-#include "sounds.h"
-
-// [STRIFE]
-#include "p_dialog.h"
-#include "i_system.h"
-
-
-//
-// VERTICAL DOORS
-//
-
-//
-// T_VerticalDoor
-//
-void T_VerticalDoor(vldoor_t* door)
-{
-    result_e res1;
-    result_e res2;
-
-    switch(door->direction)
-    {
-    case 0:
-        // WAITING
-        if (!--door->topcountdown)
-        {
-            switch(door->type)
-            {
-            case vld_blazeRaise:
-                door->direction = -1; // time to go back down
-                S_StartSound(&door->sector->soundorg, sfx_bdcls);
-                break;
-
-            case vld_normal:
-                door->direction = -1; // time to go back down
-                // villsa [STRIFE] closesound added
-                S_StartSound(&door->sector->soundorg, door->closesound);
-                break;
-
-                // villsa [STRIFE]
-            case vld_shopClose:
-                door->direction = 1;
-                door->speed = (2*FRACUNIT);
-                S_StartSound(&door->sector->soundorg, door->opensound);
-                break;
-
-            case vld_close30ThenOpen:
-                door->direction = 1;
-
-                // villsa [STRIFE] opensound added
-                S_StartSound(&door->sector->soundorg, door->opensound);
-                break;
-
-            default:
-                break;
-            }
-        }
-        break;
-
-    case 2:
-        //  INITIAL WAIT
-        if (!--door->topcountdown)
-        {
-            switch(door->type)
-            {
-            case vld_raiseIn5Mins:
-                door->direction = 1;
-                door->type = vld_normal;
-
-                // villsa [STRIFE] opensound added
-                S_StartSound(&door->sector->soundorg, door->opensound);
-                break;
-
-            default:
-                break;
-            }
-        }
-        break;
-
-        // villsa [STRIFE]
-    case -2:
-        // SPLIT
-        res1 = T_MovePlane(door->sector, door->speed, door->topheight, 0, 1, 1);
-        res2 = T_MovePlane(door->sector, door->speed, door->topwait, 0, 0, -1);
-
-        if(res1 == pastdest && res2 == pastdest)
-        {
-            door->sector->specialdata = NULL;
-            P_RemoveThinker(&door->thinker);  // unlink and free
-        }
-
-        break;
-
-    case -1:
-        // DOWN
-        res1 = T_MovePlane(door->sector, door->speed, door->sector->floorheight, false, 1, door->direction);
-        if(res1 == pastdest)
-        {
-            switch(door->type)
-            {
-            case vld_normal:
-            case vld_close:
-            case vld_blazeRaise:
-            case vld_blazeClose:
-                door->sector->specialdata = NULL;
-                P_RemoveThinker (&door->thinker);  // unlink and free
-                // villsa [STRIFE] no sounds
-                break;
-
-            case vld_close30ThenOpen:
-                door->direction = 0;
-                door->topcountdown = TICRATE*30;
-                break;
-
-                // villsa [STRIFE]
-            case vld_shopClose:
-                door->direction = 0;
-                door->topcountdown = TICRATE*120;
-                break;
-
-            default:
-                break;
-            }
-        }
-        else if(res1 == crushed)
-        {
-            switch(door->type)
-            {
-            case vld_blazeClose:
-            case vld_close:		// DO NOT GO BACK UP!
-            case vld_shopClose:     // villsa [STRIFE]
-                break;
-
-            default:
-                door->direction = 1;
-                // villsa [STRIFE] opensound added
-                S_StartSound(&door->sector->soundorg, door->opensound);
-                break;
-            }
-        }
-        break;
-
-    case 1:
-        // UP
-        res1 = T_MovePlane(door->sector,
-            door->speed,
-            door->topheight,
-            false,1,door->direction);
-
-        if(res1 == pastdest)
-        {
-            switch(door->type)
-            {
-            case vld_blazeRaise:
-            case vld_normal:
-                door->direction = 0; // wait at top
-                door->topcountdown = door->topwait;
-                break;
-
-            case vld_close30ThenOpen:
-            case vld_blazeOpen:
-            case vld_open:
-            case vld_shopClose:     // villsa [STRIFE]
-                door->sector->specialdata = NULL;
-                P_RemoveThinker (&door->thinker);  // unlink and free
-                break;
-
-            default:
-                break;
-            }
-        }
-        break;
-    }
-}
-
-
-//
-// EV_DoLockedDoor
-// Move a locked door up/down
-//
-// [STRIFE] This game has a crap load of keys. And this function doesn't even
-// deal with all of them...
-//
-int EV_DoLockedDoor(line_t* line, vldoor_e type, mobj_t* thing)
-{
-    player_t* p;
-
-    p = thing->player;
-
-    if(!p)
-        return 0;
-
-    switch(line->special)
-    {
-    case 99:
-    case 133:
-        if(!p->cards[key_IDCard])
-        {
-            p->message = DEH_String("You need an id card");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 134:
-    case 135:
-        if(!p->cards[key_IDBadge])
-        {
-            p->message = DEH_String("You need an id badge");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 136:
-    case 137:
-        if(!p->cards[key_Passcard])
-        {
-            p->message = DEH_String("You need a pass card");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 151:
-    case 164:
-        if(!p->cards[key_GoldKey])
-        {
-            p->message = DEH_String("You need a gold key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 153:
-    case 163:
-        if(!p->cards[key_SilverKey])
-        {
-            p->message = DEH_String("You need a silver key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 152:
-    case 162:
-        if(!p->cards[key_BrassKey])
-        {
-            p->message = DEH_String("You need a brass key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 167:
-    case 168:
-        if(!p->cards[key_SeveredHand])
-        {
-            p->message = DEH_String("Hand print not on file");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 171:
-        if(!p->cards[key_PrisonKey])
-        {
-            p->message = DEH_String("You don't have the key to the prison");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 172:
-        if(!p->cards[key_Power1Key])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 173:
-        if(!p->cards[key_Power2Key])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 176:
-        if(!p->cards[key_Power3Key])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 189:
-        if(!p->cards[key_OracleKey])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 191:
-        if(!p->cards[key_MilitaryID])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 192:
-        if(!p->cards[key_WarehouseKey])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-
-    case 223:
-        if(!p->cards[key_MineKey])
-        {
-            p->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return 0;
-        }
-        break;
-    }
-
-    return EV_DoDoor(line,type);
-}
-
-
-//
-// EV_DoDoor
-//
-
-int EV_DoDoor(line_t* line, vldoor_e type)
-{
-    int         secnum, rtn;
-    sector_t*   sec;
-    vldoor_t*   door;
-
-    secnum = -1;
-    rtn = 0;
-
-    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if(sec->specialdata)
-            continue;
-
-
-        // new door thinker
-        rtn = 1;
-        door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-        P_AddThinker (&door->thinker);
-        sec->specialdata = door;
-
-        door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-        door->sector = sec;
-        door->type = type;
-        door->topwait = VDOORWAIT;
-        door->speed = VDOORSPEED;
-        R_SoundNumForDoor(door);    // villsa [STRIFE] set door sounds
-
-        switch(type)
-        {
-            // villsa [STRIFE] new door type
-        case vld_splitOpen:
-            door->direction = -2;
-            door->topheight = P_FindLowestCeilingSurrounding(sec);
-            door->topheight -= 4*FRACUNIT;
-            door->speed = FRACUNIT;
-            // yes, it using topwait to get the floor height
-            door->topwait = P_FindLowestFloorSurrounding(sec);
-            if(door->topheight == sec->ceilingheight)
-                continue;
-
-            S_StartSound(&sec->soundorg, door->opensound);
-            break;
-
-            // villsa [STRIFE] new door type
-        case vld_splitRaiseNearest:
-            door->direction = -2;
-            door->topheight = P_FindLowestCeilingSurrounding(sec);
-            door->topheight -= 4*FRACUNIT;
-            door->speed = FRACUNIT;
-            // yes, it using topwait to get the floor height
-            door->topwait = P_FindHighestFloorSurrounding(sec);
-            if(door->topheight == sec->ceilingheight)
-                continue;
-
-            S_StartSound(&sec->soundorg, door->opensound);
-            break;
-
-        case vld_blazeClose:
-        case vld_shopClose:     // villsa [STRIFE]
-            door->topheight = P_FindLowestCeilingSurrounding(sec);
-            door->topheight -= 4*FRACUNIT;
-            door->direction = -1;
-            door->speed = VDOORSPEED * 4;
-            S_StartSound(&door->sector->soundorg, sfx_bdcls);
-            break;
-
-        case vld_close:
-            door->topheight = P_FindLowestCeilingSurrounding(sec);
-            door->topheight -= 4*FRACUNIT;
-            door->direction = -1;
-
-            // villsa [STRIFE] set door sounds
-            S_StartSound(&door->sector->soundorg, door->opensound);
-            break;
-
-        case vld_close30ThenOpen:
-            door->topheight = sec->ceilingheight;
-            door->direction = -1;
-
-            // villsa [STRIFE] set door sounds
-            S_StartSound(&door->sector->soundorg, door->closesound);
-            break;
-
-        case vld_blazeRaise:
-        case vld_blazeOpen:
-            door->direction = 1;
-            door->topheight = P_FindLowestCeilingSurrounding(sec);
-            door->topheight -= 4*FRACUNIT;
-            door->speed = VDOORSPEED * 4;
-            if (door->topheight != sec->ceilingheight)
-                S_StartSound(&door->sector->soundorg, sfx_bdopn);
-            break;
-
-        case vld_normal:
-        case vld_open:
-            door->direction = 1;
-            door->topheight = P_FindLowestCeilingSurrounding(sec);
-            door->topheight -= 4*FRACUNIT;
-
-            if(door->topheight != sec->ceilingheight)
-                S_StartSound(&door->sector->soundorg, door->opensound);
-            break;
-
-        default:
-            break;
-        }
-
-    }
-    return rtn;
-}
-
-//
-// EV_ClearForceFields
-//
-// villsa [STRIFE] new function
-//
-boolean EV_ClearForceFields(line_t* line)
-{
-    int         secnum;
-    sector_t*   sec;
-    int         i;
-    line_t*     secline;
-    boolean     ret = false;
-
-    secnum = -1;
-
-    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        line->special = 0;
-        ret = true;
-
-        // haleyjd 09/18/10: fixed to continue w/linecount == 0, not return
-        for(i = 0; i < sec->linecount; i++)
-        {
-            secline = sec->lines[i];
-            if(!(secline->flags & ML_TWOSIDED))
-                continue;
-            if(secline->special != 148)
-                continue;
-
-            secline->flags &= ~ML_BLOCKING;
-            secline->special = 0;
-            sides[secline->sidenum[0]].midtexture = 0;
-            sides[secline->sidenum[1]].midtexture = 0;
-        }
-    }
-
-    return ret;
-}
-
-
-//
-// EV_VerticalDoor : open a door manually, no tag value
-//
-// [STRIFE] Tons of new door types were added.
-//
-void EV_VerticalDoor(line_t* line, mobj_t* thing)
-{
-    player_t*   player;
-    sector_t*   sec;
-    vldoor_t*   door;
-    int         side;
-
-    side = 0;   // only front sides can be used
-
-    //	Check for locks
-    player = thing->player;
-
-    // haleyjd 09/15/10: [STRIFE] myriad checks here...
-    switch(line->special)
-    {
-    case 26:  // DR ID Card door
-    case 32:  // D1 ID Card door
-        if(!player->cards[key_IDCard])
-        {
-            player->message = DEH_String("You need an id card to open this door");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 27:  // DR Pass Card door
-    case 34:  // D1 Pass Card door
-        if(!player->cards[key_Passcard])
-        {
-            player->message = DEH_String("You need a pass card key to open this door");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 28:  // DR ID Badge door
-    case 33:  // D1 ID Badge door
-        if(!player->cards[key_IDBadge])
-        {
-            player->message = DEH_String("You need an id badge to open this door");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 156: // D1 brass key door
-    case 161: // DR brass key door
-        if(!player->cards[key_BrassKey])
-        {
-            player->message = DEH_String("You need a brass key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 157: // D1 silver key door
-    case 160: // DR silver key door
-        if(!player->cards[key_SilverKey])
-        {
-            player->message = DEH_String("You need a silver key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 158: // D1 gold key door
-    case 159: // DR gold key door
-        if(!player->cards[key_GoldKey])
-        {
-            player->message = DEH_String("You need a gold key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-        // villsa [STRIFE] added 09/15/10
-    case 165:
-        player->message = DEH_String("That doesn't seem to work");
-        S_StartSound(NULL, sfx_oof);
-        return;
-
-    case 166: // DR Hand Print door
-        if(!player->cards[key_SeveredHand])
-        {
-            player->message = DEH_String("Hand print not on file");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 169: // DR Base key door
-        if(!player->cards[key_BaseKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 170: // DR Gov's Key door
-        if(!player->cards[key_GovsKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 190: // DR Order Key door
-        if(!player->cards[key_OrderKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 205: // DR "Only in retail"
-        player->message = DEH_String("THIS AREA IS ONLY AVAILABLE IN THE "
-                                     "RETAIL VERSION OF STRIFE");
-        S_StartSound(NULL, sfx_oof);
-        return;
-
-    case 213: // DR Chalice door
-        if(!P_PlayerHasItem(player, MT_INV_CHALICE))
-        {
-            player->message = DEH_String("You need the chalice!");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 217: // DR Core Key door
-        if(!player->cards[key_CoreKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 221: // DR Mauler Key door
-        if(!player->cards[key_MaulerKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 224: // DR Chapel Key door
-        if(!player->cards[key_ChapelKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 225: // DR Catacomb Key door
-        if(!player->cards[key_CatacombKey])
-        {
-            player->message = DEH_String("You don't have the key");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    case 232: // DR Oracle Pass door
-        if(!(player->questflags & QF_QUEST18))
-        {
-            player->message = DEH_String("You need the Oracle Pass!");
-            S_StartSound(NULL, sfx_oof);
-            return;
-        }
-        break;
-
-    default:
-        break;
-    }
-
-    // if the sector has an active thinker, use it
-    sec = sides[ line->sidenum[side^1]] .sector;
-
-    if (sec->specialdata)
-    {
-        door = sec->specialdata;
-        // [STRIFE] Adjusted to handle linetypes handled here by Strife.
-        // BUG: Not all door types are checked here. This means that certain 
-        // door lines are allowed to fall through and start a new thinker on the
-        // sector! This is why some doors can become jammed in Strife - stuck in 
-        // midair, or unable to be opened at all. Multiple thinkers will fight 
-        // over how to move the door. They should have added a default return if
-        // they weren't going to handle this unconditionally...
-        switch(line->special)
-        {
-        case 1:         // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
-        case 26:
-        case 27:
-        case 28:
-        case 117:
-        case 159:       // villsa
-        case 160:       // haleyjd
-        case 161:       // villsa
-        case 166:       // villsa
-        case 169:       // villsa
-        case 170:       // villsa
-        case 190:       // villsa
-        case 213:       // villsa
-        case 232:       // villsa
-            if(door->direction == -1)
-                door->direction = 1;    // go back up
-            else
-            {
-                if (!thing->player)
-                    return;
-
-                // When is a door not a door?
-                // In Vanilla, door->direction is set, even though
-                // "specialdata" might not actually point at a door.
-
-                if (door->thinker.function.acp1 == (actionf_p1) T_VerticalDoor)
-                {
-                    door->direction = -1;   // start going down immediately
-                }
-                else if (door->thinker.function.acp1 == (actionf_p1) T_PlatRaise)
-                {
-                    // Erm, this is a plat, not a door.
-                    // This notably causes a problem in ep1-0500.lmp where
-                    // a plat and a door are cross-referenced; the door
-                    // doesn't open on 64-bit.
-                    // The direction field in vldoor_t corresponds to the wait
-                    // field in plat_t.  Let's set that to -1 instead.
-
-                    plat_t *plat;
-
-                    plat = (plat_t *) door;
-                    plat->wait = -1;
-                }
-                else
-                {
-                    // This isn't a door OR a plat.  Now we're in trouble.
-
-                    fprintf(stderr, "EV_VerticalDoor: Tried to close "
-                        "something that wasn't a door.\n");
-
-                    // Try closing it anyway. At least it will work on 32-bit
-                    // machines.
-
-                    door->direction = -1;
-                }
-            }
-            return;
-        default:
-            break;
-        }
-    }
-
-    // haleyjd 09/15/10: [STRIFE] Removed DOOM door sounds
-
-    // new door thinker
-    door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-    P_AddThinker (&door->thinker);
-    sec->specialdata = door;
-    door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 1;
-    door->speed = VDOORSPEED;
-    door->topwait = VDOORWAIT;
-    R_SoundNumForDoor(door);   // haleyjd 09/15/10: [STRIFE] Get door sounds
-
-    // for proper sound - [STRIFE] - verified complete
-    switch(line->special)
-    {
-    case 117:   // BLAZING DOOR RAISE
-    case 118:   // BLAZING DOOR OPEN
-        S_StartSound(&sec->soundorg, sfx_bdopn);
-        break;
-
-    default:    // NORMAL DOOR SOUND
-        S_StartSound(&sec->soundorg, door->opensound);
-        break;
-    }
-
-    // haleyjd: [STRIFE] - verified all.
-    switch(line->special)
-    {
-    case 1:
-    case 26:
-    case 27:
-    case 28:
-        door->type = vld_normal;
-        break;
-
-    case 31:
-    case 32:
-    case 33:
-    case 34:
-    case 156:   // villsa [STRIFE]
-    case 157:   // villsa [STRIFE]
-    case 158:   // villsa [STRIFE]
-        door->type = vld_open;
-        line->special = 0;
-        break;
-
-    case 117:	// blazing door raise
-        door->type = vld_blazeRaise;
-        door->speed = VDOORSPEED*4;
-        break;
-
-    case 118:	// blazing door open
-        door->type = vld_blazeOpen;
-        line->special = 0;
-        door->speed = VDOORSPEED*4;
-        break;
-
-    default:
-        // haleyjd: [STRIFE] pretty important to have this here!
-        door->type = vld_normal;
-        break;
-    }
-
-    // find the top and bottom of the movement range
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4*FRACUNIT;
-}
-
-
-//
-// Spawn a door that closes after 30 seconds
-//
-void P_SpawnDoorCloseIn30 (sector_t* sec)
-{
-    vldoor_t*   door;
-
-    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
-
-    P_AddThinker (&door->thinker);
-
-    sec->specialdata = door;
-    sec->special = 0;
-
-    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 0;
-    door->type = vld_normal;
-    door->speed = VDOORSPEED;
-    door->topcountdown = 30 * TICRATE;
-}
-
-//
-// Spawn a door that opens after 5 minutes
-//
-void
-P_SpawnDoorRaiseIn5Mins
-( sector_t*	sec,
-  int		secnum )
-{
-    vldoor_t*	door;
-	
-    door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
-    
-    P_AddThinker (&door->thinker);
-
-    sec->specialdata = door;
-    sec->special = 0;
-
-    door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-    door->sector = sec;
-    door->direction = 2;
-    door->type = vld_raiseIn5Mins;
-    door->speed = VDOORSPEED;
-    door->topheight = P_FindLowestCeilingSurrounding(sec);
-    door->topheight -= 4*FRACUNIT;
-    door->topwait = VDOORWAIT;
-    door->topcountdown = 5 * 60 * TICRATE;
-}
-
-
-// villsa [STRIFE] resurrected sliding doors
-//
-
-//
-// villsa [STRIFE]
-//
-// Sliding door name information
-//
-static slidename_t slideFrameNames[MAXSLIDEDOORS] =
-{
-    // SIGLDR
-    {
-        "SIGLDR01",  // frame1
-        "SIGLDR02",  // frame2
-        "SIGLDR03",  // frame3
-        "SIGLDR04",  // frame4
-        "SIGLDR05",  // frame5
-        "SIGLDR06",  // frame6
-        "SIGLDR07",  // frame7
-        "SIGLDR08"   // frame8
-    },
-    // DORSTN
-    {
-        "DORSTN01",  // frame1
-        "DORSTN02",  // frame2
-        "DORSTN03",  // frame3
-        "DORSTN04",  // frame4
-        "DORSTN05",  // frame5
-        "DORSTN06",  // frame6
-        "DORSTN07",  // frame7
-        "DORSTN08"   // frame8
-    },
-
-    // DORQTR
-    {
-        "DORQTR01",  // frame1
-        "DORQTR02",  // frame2
-        "DORQTR03",  // frame3
-        "DORQTR04",  // frame4
-        "DORQTR05",  // frame5
-        "DORQTR06",  // frame6
-        "DORQTR07",  // frame7
-        "DORQTR08"   // frame8
-    },
-
-    // DORCRG
-    {
-        "DORCRG01",  // frame1
-        "DORCRG02",  // frame2
-        "DORCRG03",  // frame3
-        "DORCRG04",  // frame4
-        "DORCRG05",  // frame5
-        "DORCRG06",  // frame6
-        "DORCRG07",  // frame7
-        "DORCRG08"   // frame8
-    },
-
-    // DORCHN
-    {
-        "DORCHN01",  // frame1
-        "DORCHN02",  // frame2
-        "DORCHN03",  // frame3
-        "DORCHN04",  // frame4
-        "DORCHN05",  // frame5
-        "DORCHN06",  // frame6
-        "DORCHN07",  // frame7
-        "DORCHN08"   // frame8
-    },
-
-    // DORIRS
-    {
-        "DORIRS01",  // frame1
-        "DORIRS02",  // frame2
-        "DORIRS03",  // frame3
-        "DORIRS04",  // frame4
-        "DORIRS05",  // frame5
-        "DORIRS06",  // frame6
-        "DORIRS07",  // frame7
-        "DORIRS08"   // frame8
-    },
-
-    // DORALN
-    {
-        "DORALN01",  // frame1
-        "DORALN02",  // frame2
-        "DORALN03",  // frame3
-        "DORALN04",  // frame4
-        "DORALN05",  // frame5
-        "DORALN06",  // frame6
-        "DORALN07",  // frame7
-        "DORALN08"   // frame8
-    },
-
-    {"\0","\0","\0","\0","\0","\0","\0","\0"}
-};
-
-//
-// villsa [STRIFE]
-//
-// Sliding door open sounds
-//
-static sfxenum_t slideOpenSounds[MAXSLIDEDOORS] =
-{
-    sfx_drlmto, sfx_drston, sfx_airlck, sfx_drsmto,
-    sfx_drchno, sfx_airlck, sfx_airlck, sfx_None
-};
-
-//
-// villsa [STRIFE]
-//
-// Sliding door close sounds
-//
-static sfxenum_t slideCloseSounds[MAXSLIDEDOORS] =
-{
-    sfx_drlmtc, sfx_drston, sfx_airlck, sfx_drsmtc,
-    sfx_drchnc, sfx_airlck, sfx_airlck, sfx_None
-};
-
-slideframe_t slideFrames[MAXSLIDEDOORS];
-
-//
-// P_InitSlidingDoorFrames
-//
-// villsa [STRIFE] resurrected
-//
-void P_InitSlidingDoorFrames(void)
-{
-    int i;
-    int f1;
-    int f2;
-    int f3;
-    int f4;
-
-    memset(slideFrames, 0, sizeof(slideframe_t) * MAXSLIDEDOORS);
-	
-    for(i = 0; i < MAXSLIDEDOORS; i++)
-    {
-	if(!slideFrameNames[i].frame1[0])
-	    break;
-			
-	f1 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame1));
-	f2 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame2));
-	f3 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame3));
-	f4 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame4));
-
-	slideFrames[i].frames[0] = f1;
-	slideFrames[i].frames[1] = f2;
-	slideFrames[i].frames[2] = f3;
-	slideFrames[i].frames[3] = f4;
-		
-	f1 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame5));
-	f2 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame6));
-	f3 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame7));
-	f4 = R_TextureNumForName(DEH_String(slideFrameNames[i].frame8));
-
-	slideFrames[i].frames[4] = f1;
-	slideFrames[i].frames[5] = f2;
-	slideFrames[i].frames[6] = f3;
-	slideFrames[i].frames[7] = f4;
-    }
-}
-
-
-//
-// P_FindSlidingDoorType
-//
-// Return index into "slideFrames" array
-// for which door type to use
-//
-// villsa [STRIFE] resurrected
-//
-int P_FindSlidingDoorType(line_t* line)
-{
-    int i;
-    int val;
-	
-    for(i = 0; i < MAXSLIDEDOORS-1; i++)
-    {
-        val = sides[line->sidenum[0]].toptexture;
-	if(val == slideFrames[i].frames[0])
-	    return i;
-    }
-	
-    return -1;
-}
-
-//
-// T_SlidingDoor
-//
-// villsa [STRIFE] resurrected
-//
-void T_SlidingDoor(slidedoor_t* door)
-{
-    sector_t* sec;
-
-    sec = door->frontsector;
-
-    switch(door->status)
-    {
-    case sd_opening:
-        if(!door->timer--)
-        {
-            if(++door->frame == SNUMFRAMES)
-            {
-                // IF DOOR IS DONE OPENING...
-                door->line1->flags &= ~ML_BLOCKING;
-                door->line2->flags &= ~ML_BLOCKING;
-
-                if(door->type == sdt_openOnly)
-                {
-                    door->frontsector->specialdata = NULL;
-                    P_RemoveThinker (&door->thinker);
-                    return;
-                }
-
-                door->timer = SDOORWAIT;
-                door->status = sd_waiting;
-            }
-            else
-            {
-                // IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
-                door->timer = SWAITTICS;
-
-                sides[door->line2->sidenum[0]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-
-                sides[door->line2->sidenum[1]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-
-                sides[door->line1->sidenum[0]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-
-                sides[door->line1->sidenum[1]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-            }
-        }
-
-        return;
-
-    case sd_waiting:
-        // IF DOOR IS DONE WAITING...
-        if(!door->timer--)
-        {
-            fixed_t speed;
-            fixed_t cheight;
-
-            sec = door->frontsector;
-
-            // CAN DOOR CLOSE?
-            if(sec->thinglist != NULL)
-            {
-                door->timer = SDOORWAIT;
-                return;
-            }
-            else
-            {
-
-                cheight = sec->ceilingheight;
-                speed = cheight - sec->floorheight - (10*FRACUNIT);
-
-                // something blocking it?
-                if(T_MovePlane(sec, speed, sec->floorheight, 0, 1, -1) == crushed)
-                {
-                    door->timer = SDOORWAIT;
-                    return;
-                }
-                else
-                {
-                    // Instantly move plane
-                    T_MovePlane(sec, (128*FRACUNIT), cheight, 0, 1, 1);
-
-                    // turn line blocking back on
-                    door->line1->flags |= ML_BLOCKING;
-                    door->line2->flags |= ML_BLOCKING;
-
-                    // play close sound
-                    S_StartSound(&sec->soundorg, slideCloseSounds[door->whichDoorIndex]);
-
-                    door->status = sd_closing;
-                    door->timer = SWAITTICS;
-                }
-            }
-        }
-
-        return;
-
-    case sd_closing:
-        if (!door->timer--)
-        {
-            if(--door->frame < 0)
-            {
-                // IF DOOR IS DONE CLOSING...
-                T_MovePlane(sec, (128*FRACUNIT), sec->floorheight, 0, 1, -1);
-                door->frontsector->specialdata = NULL;
-                P_RemoveThinker (&door->thinker);
-                return;
-            }
-            else
-            {
-                // IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
-                door->timer = SWAITTICS;
-
-                sides[door->line2->sidenum[0]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-
-                sides[door->line2->sidenum[1]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-
-                sides[door->line1->sidenum[0]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-
-                sides[door->line1->sidenum[1]].midtexture =
-                    slideFrames[door->whichDoorIndex].frames[door->frame];
-            }
-        }
-
-        return;
-    }
-}
-
-//
-// EV_RemoteSlidingDoor
-//
-// villsa [STRIFE] new function
-//
-int EV_RemoteSlidingDoor(line_t* line, mobj_t* thing)
-{
-    int		    secnum;
-    sector_t*       sec;
-    int             i;
-    int             rtn;
-    line_t*         secline;
-	
-    secnum = -1;
-    rtn = 0;
-    
-    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if(sec->specialdata)
-            continue;
-
-        for(i = 0; i < 4; i++)
-        {
-            secline = sec->lines[i];
-
-            if(P_FindSlidingDoorType(secline) < 0)
-                continue;
-
-            EV_SlidingDoor(secline, thing);
-            rtn = 1;
-        }
-    }
-
-    return rtn;
-}
-
-
-//
-// EV_SlidingDoor
-//
-// villsa [STRIFE]
-//
-void EV_SlidingDoor(line_t* line, mobj_t* thing)
-{
-    sector_t*       sec;
-    slidedoor_t*    door;
-    int             i;
-    line_t*         secline;
-
-    // Make sure door isn't already being animated
-    sec = sides[line->sidenum[1]].sector;
-    door = NULL;
-    if(sec->specialdata)
-    {
-        if (!thing->player)
-            return;
-
-        door = sec->specialdata;
-        if(door->type == sdt_openAndClose)
-        {
-            if(door->status == sd_waiting)
-            {
-                door->status = sd_closing;
-                door->timer = SWAITTICS;    // villsa [STRIFE]
-            }
-        }
-        else
-            return;
-    }
-
-    // Init sliding door vars
-    if(!door)
-    {
-        door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-        P_AddThinker (&door->thinker);
-
-        sec->specialdata = door;
-
-        door->type = sdt_openAndClose;
-        door->status = sd_opening;
-        door->whichDoorIndex = P_FindSlidingDoorType(line);
-
-        // villsa [STRIFE] different error message
-        if(door->whichDoorIndex < 0)
-            I_Error(DEH_String("EV_SlidingDoor: Textures are not defined for sliding door!"));
-
-        sides[line->sidenum[0]].midtexture = sides[line->sidenum[0]].toptexture;
-
-        // villsa [STRIFE]
-        door->line1 = line;
-        door->line2 = line;
-
-        // villsa [STRIFE] this loop assumes that the sliding door is made up
-        // of only four linedefs!
-        for(i = 0; i < 4; i++)
-        {
-            secline = sec->lines[i];
-            if(secline != line)
-            {
-                side_t* side1;
-                side_t* side2;
-
-                side1 = &sides[secline->sidenum[0]];
-                side2 = &sides[line->sidenum[0]];
-
-                if(side1->toptexture == side2->toptexture)
-                    door->line2 = secline;
-            }
-        }
-
-        door->thinker.function.acp1 = (actionf_p1)T_SlidingDoor;
-        door->timer = SWAITTICS;
-        door->frontsector = sec;
-        door->frame = 0;
-
-        // villsa [STRIFE] preset flags
-        door->line1->flags |= ML_BLOCKING;
-        door->line2->flags |= ML_BLOCKING;
-
-        // villsa [STRIFE] set the closing sector
-        T_MovePlane(
-            door->frontsector,
-            (128*FRACUNIT),
-            P_FindLowestCeilingSurrounding(door->frontsector),
-            0,
-            1,
-            1);
-
-        // villsa [STRIFE] play open sound
-        S_StartSound(&door->frontsector->soundorg, slideOpenSounds[door->whichDoorIndex]);
-    }
-}
-
diff --git a/games/NXDoom/src/strife/p_enemy.c b/games/NXDoom/src/strife/p_enemy.c
deleted file mode 100644
index 7763a87b0..000000000
--- a/games/NXDoom/src/strife/p_enemy.c
+++ /dev/null
@@ -1,3388 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Enemy thinking, AI.
-//	Action Pointer Functions
-//	that are associated with states/frames. 
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "m_random.h"
-#include "i_system.h"
-#include "doomdef.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "s_sound.h"
-#include "g_game.h"
-#include "z_zone.h"     // villsa [STRIFE]
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "sounds.h"
-
-// [STRIFE] Dialog / Inventory
-#include "p_dialog.h"
-#include "deh_str.h"
-#include "w_wad.h"
-#include "f_finale.h"
-#include "p_inter.h"
-
-// Forward Declarations:
-void A_RandomWalk(mobj_t *);
-void A_ProgrammerAttack(mobj_t* actor);
-void A_FireSigilEOffshoot(mobj_t *actor);
-void A_SpectreCAttack(mobj_t *actor);
-void A_SpectreDAttack(mobj_t *actor);
-void A_SpectreEAttack(mobj_t *actor);
-
-void P_ThrustMobj(mobj_t *actor, angle_t angle, fixed_t force);
-
-typedef enum
-{
-    DI_EAST,
-    DI_NORTHEAST,
-    DI_NORTH,
-    DI_NORTHWEST,
-    DI_WEST,
-    DI_SOUTHWEST,
-    DI_SOUTH,
-    DI_SOUTHEAST,
-    DI_NODIR,
-    NUMDIRS
-    
-} dirtype_t;
-
-
-//
-// P_NewChaseDir related LUT.
-//
-dirtype_t opposite[] =
-{
-  DI_WEST, DI_SOUTHWEST, DI_SOUTH, DI_SOUTHEAST,
-  DI_EAST, DI_NORTHEAST, DI_NORTH, DI_NORTHWEST, DI_NODIR
-};
-
-dirtype_t diags[] =
-{
-    DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST
-};
-
-
-
-
-
-void A_Fall (mobj_t *actor);
-
-
-//
-// ENEMY THINKING
-// Enemies are allways spawned
-// with targetplayer = -1, threshold = 0
-// Most monsters are spawned unaware of all players,
-// but some can be made preaware
-//
-
-
-//
-// Called by P_NoiseAlert.
-// Recursively traverse adjacent sectors,
-// sound blocking lines cut off traversal.
-//
-// haleyjd 09/05/10: [STRIFE] Verified unmodified
-//
-
-mobj_t*		soundtarget;
-
-void
-P_RecursiveSound
-( sector_t*	sec,
-  int		soundblocks )
-{
-    int		i;
-    line_t*	check;
-    sector_t*	other;
-	
-    // wake up all monsters in this sector
-    if (sec->validcount == validcount
-	&& sec->soundtraversed <= soundblocks+1)
-    {
-	return;		// already flooded
-    }
-    
-    sec->validcount = validcount;
-    sec->soundtraversed = soundblocks+1;
-    sec->soundtarget = soundtarget;
-	
-    for (i=0 ;i<sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	if (! (check->flags & ML_TWOSIDED) )
-	    continue;
-	
-	P_LineOpening (check);
-
-	if (openrange <= 0)
-	    continue;	// closed door
-	
-	if ( sides[ check->sidenum[0] ].sector == sec)
-	    other = sides[ check->sidenum[1] ] .sector;
-	else
-	    other = sides[ check->sidenum[0] ].sector;
-	
-	if (check->flags & ML_SOUNDBLOCK)
-	{
-	    if (!soundblocks)
-		P_RecursiveSound (other, 1);
-	}
-	else
-	    P_RecursiveSound (other, soundblocks);
-    }
-}
-
-
-
-//
-// P_NoiseAlert
-// If a monster yells at a player,
-// it will alert other monsters to the player.
-//
-// haleyjd 09/05/10: [STRIFE] Verified unmodified
-//
-void
-P_NoiseAlert
-( mobj_t*	target,
-  mobj_t*	emmiter )
-{
-    soundtarget = target;
-    validcount++;
-    P_RecursiveSound (emmiter->subsector->sector, 0);
-}
-
-//
-// P_WakeUpThing
-//
-// villsa [STRIFE] New function
-// Wakes up an mobj.nearby when somebody has been punched.
-//
-static void P_WakeUpThing(mobj_t* puncher, mobj_t* bystander)
-{
-    if(!(bystander->flags & MF_NODIALOG))
-    {
-        bystander->target = puncher;
-        if(bystander->info->seesound)
-            S_StartSound(bystander, bystander->info->seesound);
-        P_SetMobjState(bystander, bystander->info->seestate);
-    }
-}
-
-//
-// P_DoPunchAlert
-//
-// villsa [STRIFE] New function (by Quasar ;)
-// Wake up buddies nearby when the player thinks he's gotten too clever
-// with the punch dagger. Walks sector links.
-//
-void P_DoPunchAlert(mobj_t *puncher, mobj_t *punchee)
-{   
-   mobj_t *rover;
-   
-   // don't bother with this crap if we're already on alert
-   if(punchee->subsector->sector->soundtarget)
-      return;
-      
-   // gotta still be alive to call for help
-   if(punchee->health <= 0)
-      return;
-      
-   // has to be something you can wake up and kill too
-   if(!(punchee->flags & MF_COUNTKILL) || punchee->flags & MF_NODIALOG)
-      return;
-   
-   // make the punchee hurt - haleyjd 09/05/10: Fixed to use painstate.
-   punchee->target = puncher;
-   P_SetMobjState(punchee, punchee->info->painstate); 
-   
-   // wake up everybody nearby
-   
-   // scan forward on sector list
-   for(rover = punchee->snext; rover; rover = rover->snext)
-   {
-      // we only wake up certain thing types (Acolytes and Templars?)
-      if(rover->health > 0 && rover->type >= MT_GUARD1 && rover->type <= MT_PGUARD &&
-         (P_CheckSight(rover, puncher) || P_CheckSight(rover, punchee)))
-      {
-         P_WakeUpThing(puncher, rover);
-         rover->flags |= MF_NODIALOG;
-      }
-   }
-
-   // scan backward on sector list
-   for(rover = punchee->sprev; rover; rover = rover->sprev)
-   {
-      // we only wake up certain thing types (Acolytes and Templars?)
-      if(rover->health > 0 && rover->type >= MT_GUARD1 && rover->type <= MT_PGUARD &&
-         (P_CheckSight(rover, puncher) || P_CheckSight(rover, punchee)))
-      {
-         P_WakeUpThing(puncher, rover);
-         rover->flags |= MF_NODIALOG;
-      }
-   }
-}
-
-
-
-
-//
-// P_CheckMeleeRange
-//
-// [STRIFE] Minor change to meleerange.
-//
-boolean P_CheckMeleeRange(mobj_t* actor)
-{
-    mobj_t*	pl;
-    fixed_t	dist;
-
-    if(!actor->target)
-        return false;
-
-    pl = actor->target;
-    if(actor->z + 3 * actor->height / 2 < pl->z) // villsa [STRIFE]
-        return false;
-
-    dist = P_AproxDistance(pl->x - actor->x, pl->y - actor->y);
-
-    if(dist >= MELEERANGE - 20*FRACUNIT + pl->info->radius)
-        return false;
-
-    if(!P_CheckSight (actor, actor->target))
-        return false;
-
-    return true;
-}
-
-//
-// P_CheckMissileRange
-//
-// [STRIFE]
-// Changes to eliminate DOOM-specific code and to allow for
-// varying attack ranges for Strife monsters, as well as a general tweak
-// to considered distance for all monsters.
-//
-boolean P_CheckMissileRange(mobj_t* actor)
-{
-    fixed_t dist;
-
-    if(!P_CheckSight(actor, actor->target))
-        return false;
-
-    if(actor->flags & MF_JUSTHIT)
-    {
-        // the target just hit the enemy,
-        // so fight back!
-        actor->flags &= ~MF_JUSTHIT;
-        return true;
-    }
-
-    if(actor->reactiontime)
-        return false;	// do not attack yet
-
-    // OPTIMIZE: get this from a global checksight
-    dist = P_AproxDistance(actor->x-actor->target->x,
-                           actor->y-actor->target->y) - 64*FRACUNIT;
-    
-    if (!actor->info->meleestate)
-        dist -= 128*FRACUNIT;       // no melee attack, so fire more
-
-    dist >>= 16;
-
-    // villsa [STRIFE] checks for acolytes
-    //  haleyjd 09/05/10: Repaired to match disassembly: Was including 
-    //  SHADOWGUARD in the wrong case, was missing MT_SENTINEL entirely.
-    //  Structure of ASM also indicates this was probably a switch 
-    //  statement turned into a cascading if/else by the compiler.
-    switch(actor->type)
-    {
-    case MT_GUARD1:
-    case MT_GUARD2:
-    case MT_GUARD3:
-    case MT_GUARD4:
-    case MT_GUARD5:
-    case MT_GUARD6:
-        // oddly, not all Acolytes are included here...
-        dist >>= 4;
-        break;
-    case MT_SHADOWGUARD:
-    case MT_CRUSADER:
-    case MT_SENTINEL:
-        dist >>= 1;
-        break;
-    default:
-        break;
-    }
-    
-    // villsa [STRIFE] changed to 150
-    if (dist > 150)
-        dist = 150;
-
-    // haleyjd 20100910: Hex-Rays was leaving this out completely:
-    if (actor->type == MT_CRUSADER && dist > 120)
-        dist = 120;
-
-    // haleyjd 20110224 [STRIFE]: reversed predicate
-    return (dist < P_Random());
-}
-
-//
-// P_CheckRobotRange
-//
-// villsa [STRIFE] New function
-//
-boolean P_CheckRobotRange(mobj_t *actor)
-{
-    fixed_t dist;
-
-    if(!P_CheckSight(actor, actor->target))
-        return false;
-
-    if(actor->reactiontime)
-        return false;    // do not attack yet
-
-    dist = (P_AproxDistance(actor->x-actor->target->x,
-                            actor->y-actor->target->y) - 64*FRACUNIT) >> FRACBITS;
-
-    return (dist < 200);
-}
-
-
-//
-// P_Move
-// Move in the current direction,
-// returns false if the move is blocked.
-//
-// [STRIFE]
-// villsa/haleyjd 09/05/10: Modified for terrain types and 3D object 
-// clipping. Below constants are verified to be unmodified:
-//
-fixed_t	xspeed[8] = {FRACUNIT,47000,0,-47000,-FRACUNIT,-47000,0,47000};
-fixed_t yspeed[8] = {0,47000,FRACUNIT,47000,0,-47000,-FRACUNIT,-47000};
-
-
-boolean P_Move (mobj_t*	actor)
-{
-    fixed_t	tryx;
-    fixed_t	tryy;
-
-    line_t*	ld;
-
-    // warning: 'catch', 'throw', and 'try'
-    // are all C++ reserved words
-    boolean	try_ok;
-    boolean	good;
-
-    if (actor->movedir == DI_NODIR)
-        return false;
-
-    if ((unsigned)actor->movedir >= 8)
-        I_Error ("Weird actor->movedir!");
-
-    tryx = actor->x + actor->info->speed*xspeed[actor->movedir];
-    tryy = actor->y + actor->info->speed*yspeed[actor->movedir];
-
-    try_ok = P_TryMove (actor, tryx, tryy);
-
-    if (!try_ok)
-    {
-        // open any specials
-        if (actor->flags & MF_FLOAT && floatok)
-        {
-            // must adjust height
-            if (actor->z < tmfloorz)
-                actor->z += FLOATSPEED; // [STRIFE] Note FLOATSPEED == 5*FRACUNIT
-            else
-                actor->z -= FLOATSPEED;
-
-            actor->flags |= MF_INFLOAT;
-            return true;
-        }
-
-        if (!numspechit)
-            return false;
-
-        actor->movedir = DI_NODIR;
-        good = false;
-        while (numspechit--)
-        {
-            ld = spechit[numspechit];
-            // if the special is not a door
-            // that can be opened,
-            // return false
-            if (P_UseSpecialLine (actor, ld,0))
-                good = true;
-        }
-        return good;
-    }
-    else
-    {
-        actor->flags &= ~(MF_INFLOAT|MF_FEETCLIPPED);   // villsa [STRIFE]
-
-        // villsa [STRIFE]
-        if(P_GetTerrainType(actor) != FLOOR_SOLID)
-            actor->flags |= MF_FEETCLIPPED;
-    }
-
-
-    // villsa [STRIFE] Removed pulling non-floating actors down to the ground.
-    //  (haleyjd 09/05/10: Verified)
-    /*if (! (actor->flags & MF_FLOAT) )	
-          actor->z = actor->floorz;*/
-
-    return true; 
-}
-
-
-//
-// TryWalk
-// Attempts to move actor on
-// in its current (ob->moveangle) direction.
-// If blocked by either a wall or an actor
-// returns FALSE
-// If move is either clear or blocked only by a door,
-// returns TRUE and sets...
-// If a door is in the way,
-// an OpenDoor call is made to start it opening.
-//
-// haleyjd 09/05/10: [STRIFE] Verified unmodified.
-//
-boolean P_TryWalk (mobj_t* actor)
-{
-    if (!P_Move (actor))
-    {
-        return false;
-    }
-
-    actor->movecount = P_Random()&15;
-    return true;
-}
-
-
-
-//
-// P_NewChaseDir
-//
-
-void P_NewChaseDir(mobj_t* actor)
-{
-    fixed_t	deltax;
-    fixed_t	deltay;
-    
-    dirtype_t	d[3];
-    
-    int		tdir;
-    dirtype_t	olddir;
-    
-    dirtype_t	turnaround;
-
-    // villsa [STRIFE] don't bomb out and instead set spawnstate
-    if(!actor->target)
-    {
-        //I_Error("P_NewChaseDir: called with no target");
-        P_SetMobjState(actor, actor->info->spawnstate);
-        return;
-    }
-
-    olddir = actor->movedir;
-    turnaround=opposite[olddir];
-
-    deltax = actor->target->x - actor->x;
-    deltay = actor->target->y - actor->y;
-
-    if (deltax>10*FRACUNIT)
-        d[1]= DI_EAST;
-    else if (deltax<-10*FRACUNIT)
-        d[1]= DI_WEST;
-    else
-        d[1]=DI_NODIR;
-
-    if (deltay<-10*FRACUNIT)
-        d[2]= DI_SOUTH;
-    else if (deltay>10*FRACUNIT)
-        d[2]= DI_NORTH;
-    else
-        d[2]=DI_NODIR;
-
-    // try direct route
-    if (d[1] != DI_NODIR
-        && d[2] != DI_NODIR)
-    {
-        actor->movedir = diags[((deltay<0)<<1)+(deltax>0)];
-        if (actor->movedir != (int) turnaround && P_TryWalk(actor))
-            return;
-    }
-
-    // try other directions
-    if (P_Random() > 200
-        ||  abs(deltay)>abs(deltax))
-    {
-        tdir=d[1];
-        d[1]=d[2];
-        d[2]=tdir;
-    }
-
-    if (d[1]==turnaround)
-        d[1]=DI_NODIR;
-    if (d[2]==turnaround)
-        d[2]=DI_NODIR;
-
-    if (d[1]!=DI_NODIR)
-    {
-        actor->movedir = d[1];
-        if (P_TryWalk(actor))
-        {
-            // either moved forward or attacked
-            return;
-        }
-    }
-
-    if (d[2]!=DI_NODIR)
-    {
-        actor->movedir =d[2];
-
-        if (P_TryWalk(actor))
-            return;
-    }
-
-    // there is no direct path to the player,
-    // so pick another direction.
-    if (olddir!=DI_NODIR)
-    {
-        actor->movedir =olddir;
-
-        if (P_TryWalk(actor))
-            return;
-    }
-
-    // randomly determine direction of search
-    if (P_Random()&1) 	
-    {
-        for ( tdir=DI_EAST;
-              tdir<=DI_SOUTHEAST;
-              tdir++ )
-        {
-            if (tdir != (int) turnaround)
-            {
-                actor->movedir =tdir;
-
-                if ( P_TryWalk(actor) )
-                    return;
-            }
-        }
-    }
-    else
-    {
-        for ( tdir=DI_SOUTHEAST;
-              tdir != (DI_EAST-1);
-              tdir-- )
-        {
-            if (tdir != (int) turnaround)
-            {
-                actor->movedir = tdir;
-
-                if ( P_TryWalk(actor) )
-                    return;
-            }
-        }
-    }
-
-    if (turnaround !=  DI_NODIR)
-    {
-        actor->movedir =turnaround;
-        if ( P_TryWalk(actor) )
-            return;
-    }
-
-    actor->movedir = DI_NODIR;	// can not move
-}
-
-//
-// P_NewRandomDir
-//
-// villsa [STRIFE] new function
-//
-// haleyjd: Almost identical to the tail-end of P_NewChaseDir, this function 
-// finds a purely random direction for an object to walk. Called from 
-// A_RandomWalk.
-//
-// Shockingly similar to the RandomWalk pointer in Eternity :)
-//
-void P_NewRandomDir(mobj_t* actor)
-{
-    int dir = 0;
-    int omovedir = opposite[actor->movedir]; // haleyjd 20110223: nerfed this...
-
-    // randomly determine direction of search
-    if(P_Random() & 1)
-    {
-        // Try all non-reversal directions forward, first
-        for(dir = 0; dir < DI_NODIR; dir++)
-        {
-            if(dir != omovedir)
-            {
-                actor->movedir = dir;
-                if(P_Random() & 1)
-                {
-                    if(P_TryWalk(actor))
-                        break;
-                }
-            }
-        }
-
-        // haleyjd 20110223: logic missing entirely:
-        // failed all non-reversal directions? try reversing
-        if(dir > DI_SOUTHEAST) 
-        {
-            if(omovedir == DI_NODIR)
-            {
-                actor->movedir = DI_NODIR;
-                return;
-            }
-            actor->movedir = omovedir;
-            if(P_TryWalk(actor))
-                return;
-            else
-            {
-                actor->movedir = DI_NODIR;
-                return;
-            }
-        }
-    }
-    else
-    {
-        // Try directions one at a time in backward order
-        dir = DI_SOUTHEAST;
-        while(1)
-        {
-            // haleyjd 09/05/10: missing random code.
-            if(dir != omovedir)
-            {
-                actor->movedir = dir;
-
-                // villsa 09/06/10: un-inlined code
-                if(P_TryWalk(actor))
-                    return;
-            }
-
-            // Ran out of non-reversal directions to try? Reverse.
-            if(--dir == -1)
-            {
-                if(omovedir == DI_NODIR)
-                {
-                    actor->movedir = DI_NODIR;
-                    return;
-                }
-                actor->movedir = omovedir;
-                // villsa 09/06/10: un-inlined code
-                if(P_TryWalk(actor))
-                    return;
-                else
-                {
-                    actor->movedir = DI_NODIR;
-                    return;
-                }
-            } // end if(--dir == -1)
-        } // end while(1)
-    } // end else
-}
-
-
-//
-// P_LookForPlayers
-//
-// If allaround is false, only look 180 degrees in front.
-// Returns true if a player is targeted.
-//
-// [STRIFE]
-// haleyjd 09/05/10: Modifications to support friendly units.
-//
-boolean
-P_LookForPlayers
-( mobj_t*	actor,
-  boolean	allaround )
-{
-    int         c;
-    int         stop;
-    player_t*   player;
-    angle_t     an;
-    fixed_t     dist;
-    mobj_t  *   master = players[actor->miscdata].mo;
-    int consecutive_missing = 0; // for breaking infinite loop
-
-    // haleyjd 09/05/10: handle Allies
-    if(actor->flags & MF_ALLY)
-    {
-        // Deathmatch: support team behavior for Rebels.
-        if(netgame)
-        {
-            // Rebels adopt the allied player's target if it is not of the same
-            // allegiance. Other allies do it unconditionally.
-            if(master && master->target && 
-               (master->target->type != MT_REBEL1 ||
-                master->target->miscdata != actor->miscdata))
-            {
-                actor->target = master->target;
-            }
-            else
-            {
-                // haleyjd 09/06/10: Note that this sets actor->target in Strife!
-                P_BulletSlope(actor);
-
-                // Clear target if nothing is visible, or if the target is a
-                // friendly Rebel or the allied player.
-                if (linetarget == NULL
-                 || (actor->target->type == MT_REBEL1
-                  && actor->target->miscdata == actor->miscdata)
-                 || actor->target == master)
-                {
-                    actor->target = NULL;
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            // Single-player: Adopt any non-allied player target.
-            if(master && master->target && !(master->target->flags & MF_ALLY))
-            {
-                actor->target = master->target;
-                return true;
-            }
-
-            // haleyjd 09/06/10: Note that this sets actor->target in Strife!
-            P_BulletSlope(actor);
-
-            // Clear target if nothing is visible, or if the target is an ally.
-            if(!linetarget || actor->target->flags & MF_ALLY)
-            {
-                actor->target = NULL;
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    c = 0;
-
-    // The 3 below is probably a mistake (it should be MAXPLAYERS - 1, or 7)
-    // and in vanilla this can potentially cause an infinite loop in
-    // multiplayer. Unfortunately we can't correct the mistake - doing so will
-    // cause desyncs. Upon spawning, each enemy's lastlook is initialized to a
-    // random value between 0 and 7 (i.e MAXPLAYERS - 1). There's a chance
-    // that the first call of this function for that enemy will return early
-    // courtesy of the actor->lastlook == stop condition. In a single-player
-    // game this occurs when (actor->lastlook - 1) & 3 equals 0, or when
-    // lastlook equals 1 or 5.
-
-    // If you use MAXPLAYERS - 1, it has the side effect of altering which
-    // enemies are affected by an early actor->lastlook == stop return. Now it
-    // happens when (actor->lastlook - 1) & 7 equals 0, or when lastlook equals
-    // 1, *not* 1 and 5 as above.
-
-    stop = (actor->lastlook-1)&3;
-
-    for ( ; ; actor->lastlook = (actor->lastlook+1)&3 )
-    {
-        if (!playeringame[actor->lastlook])
-        {
-            // Break the vanilla infinite loop here. It can occur if there are
-            // > 4 players and players 0 - 3 all quit the game. Error out
-            // instead.
-            if (consecutive_missing == 4)
-            {
-                I_Error("P_LookForPlayers: No player 1 - 4.\n");
-            }
-            consecutive_missing++;
-            continue;
-        }
-
-        consecutive_missing = 0;
-
-        if (c++ == 2
-            || actor->lastlook == stop)
-        {
-            // done looking
-            return false;	
-        }
-
-        player = &players[actor->lastlook];
-
-        if (player->health <= 0)
-            continue;           // dead
-
-        if (!P_CheckSight (actor, player->mo))
-            continue;           // out of sight
-
-        if (!allaround)
-        {
-            an = R_PointToAngle2(actor->x,
-                                 actor->y, 
-                                 player->mo->x,
-                                 player->mo->y) - actor->angle;
-
-            if (an > ANG90 && an < ANG270)
-            {
-                dist = P_AproxDistance (player->mo->x - actor->x,
-                    player->mo->y - actor->y);
-                // if real close, react anyway
-                if (dist > MELEERANGE)
-                    continue;       // behind back
-            }
-        }
-
-        actor->target = player->mo;
-        return true;
-    }
-
-    return false;
-}
-
-// haleyjd 09/05/10: [STRIFE] Removed A_KeenDie
-
-//
-// ACTION ROUTINES
-//
-
-//
-// A_Look
-// Stay in state until a player is sighted.
-//
-// [STRIFE]
-// haleyjd 09/05/10: Adjusted for allies, Inquisitors, etc.
-//
-void A_Look (mobj_t* actor)
-{
-    mobj_t*         targ;
-
-    actor->threshold = 0;       // any shot will wake up
-    targ = actor->subsector->sector->soundtarget;
-
-    if (targ
-        && (targ->flags & MF_SHOOTABLE) )
-    {
-        // [STRIFE] Allies wander when they call this.
-        if(actor->flags & MF_ALLY)
-            A_RandomWalk(actor);
-        else
-        {
-            actor->target = targ;
-
-            if ( actor->flags & MF_AMBUSH )
-            {
-                if (P_CheckSight (actor, actor->target))
-                    goto seeyou;
-            }
-            else
-                goto seeyou;
-        }
-    }
-
-    // haleyjd 09/05/10: This is bizarre, as Rogue keeps using the GIVEQUEST flag
-    // as a parameter to control allaround look behavior. Did they just run out of
-    // flags, or what? 
-    // STRIFE-TODO: Needs serious verification.
-    if (!P_LookForPlayers(actor, (actor->flags & MF_GIVEQUEST) != 0))
-        return;
-
-    // go into chase state
-seeyou:
-    if (actor->info->seesound)
-    {
-        int         sound   = actor->info->seesound;
-        mobj_t *    emitter = actor;
-
-        // [STRIFE] Removed DOOM random sounds.
-
-        // [STRIFE] Only Inquisitors roar loudly here.
-        if (actor->type == MT_INQUISITOR)
-            emitter = NULL;
-
-        S_StartSound (emitter, sound);
-    }
-
-    // [STRIFE] Set threshold (kinda odd as it's still set to 0 above...)
-    actor->threshold = 20;
-
-    P_SetMobjState (actor, actor->info->seestate);
-}
-
-//
-// A_RandomWalk
-//
-// [STRIFE] New function.
-// haleyjd 09/05/10: Action routine used to meander about.
-//
-void A_RandomWalk(mobj_t* actor)
-{
-    // Standing actors do not wander.
-    if(actor->flags & MF_STAND)
-        return;
-
-    if(actor->reactiontime)
-        actor->reactiontime--; // count down reaction time
-    else
-    {
-        // turn to a new angle
-        if(actor->movedir < DI_NODIR)
-        {
-            int delta;
-
-            actor->angle &= (7u << 29);
-            delta = actor->angle - (actor->movedir << 29);
-
-            if(delta < 0)
-                actor->angle += ANG90/2;
-            else if(delta > 0)
-                actor->angle -= ANG90/2;
-        }
-
-        // try moving
-        if(--actor->movecount < 0 || !P_Move(actor))
-        {
-            P_NewRandomDir(actor);
-            actor->movecount += 5;
-        }
-    }
-}
-
-//
-// A_FriendLook
-//
-// [STRIFE] New function
-// haleyjd 09/05/10: Action function used mostly by mundane characters such as
-// peasants.
-//
-void A_FriendLook(mobj_t* actor)
-{
-    mobj_t *soundtarget = actor->subsector->sector->soundtarget;
-
-    actor->threshold = 0;
-
-    if(soundtarget && soundtarget->flags & MF_SHOOTABLE)
-    {
-        // Handle allies, except on maps 3 and 34 (Front Base/Movement Base)
-        if((actor->flags & MF_ALLY) == (soundtarget->flags & MF_ALLY) &&
-            gamemap != 3 && gamemap != 34)
-        {
-            // STRIFE-TODO: Needs serious verification.
-            if(P_LookForPlayers(actor, (actor->flags & MF_GIVEQUEST) != 0))
-            {
-                P_SetMobjState(actor, actor->info->seestate);
-                actor->flags |= MF_NODIALOG;
-                return;
-            }
-        }
-        else
-        {
-            actor->target = soundtarget;
-
-            if(!(actor->flags & MF_AMBUSH) || P_CheckSight(actor, actor->target))
-            {
-                actor->threshold = 10;
-                P_SetMobjState(actor, actor->info->seestate);
-                return;
-            }
-        }
-    }
-
-    // do some idle animation
-    if(P_Random() < 30)
-    {
-        int t = P_Random();
-        P_SetMobjState(actor, (t & 1) + actor->info->spawnstate + 1);
-    }
-
-    // wander around a bit
-    if(!(actor->flags & MF_STAND) && P_Random() < 40)
-        P_SetMobjState(actor, actor->info->spawnstate + 3);
-}
-
-//
-// A_Listen
-//
-// [STRIFE] New function
-// haleyjd 09/05/10: Action routine used to strictly listen for a target.
-//
-void A_Listen(mobj_t* actor)
-{
-    mobj_t *soundtarget;
-
-    actor->threshold = 0;
-
-    soundtarget = actor->subsector->sector->soundtarget;
-
-    if(soundtarget && (soundtarget->flags & MF_SHOOTABLE))
-    {
-        if((actor->flags & MF_ALLY) != (soundtarget->flags & MF_ALLY))
-        {
-            actor->target = soundtarget;
-
-            if(!(actor->flags & MF_AMBUSH) || P_CheckSight(actor, actor->target))
-            {
-                if(actor->info->seesound)
-                    S_StartSound(actor, actor->info->seesound);
-
-                actor->threshold = 10;
-
-                P_SetMobjState(actor, actor->info->seestate);
-            }
-        }
-    }
-}
-
-
-//
-// A_Chase
-// Actor has a melee attack,
-// so it tries to close as fast as possible
-//
-// haleyjd 09/05/10: [STRIFE] Various minor changes
-//
-void A_Chase (mobj_t*	actor)
-{
-    int         delta;
-
-    if (actor->reactiontime)
-        actor->reactiontime--;
-
-    // modify target threshold
-    if  (actor->threshold)
-    {
-        // haleyjd 20110204 [STRIFE]: No health <= 0 check here!
-        if (actor->target)
-            actor->threshold--;
-        else
-            actor->threshold = 0;
-    }
-    
-    // turn towards movement direction if not there yet
-    if (actor->movedir < 8)
-    {
-        actor->angle &= (7u << 29);
-        delta = actor->angle - (actor->movedir << 29);
-
-        if (delta > 0)
-            actor->angle -= ANG90/2;
-        else if (delta < 0)
-            actor->angle += ANG90/2;
-    }
-
-    if (!actor->target
-        || !(actor->target->flags&MF_SHOOTABLE))
-    {
-        // look for a new target
-        if (P_LookForPlayers(actor, true))
-            return; 	// got a new target
-
-        P_SetMobjState (actor, actor->info->spawnstate);
-        return;
-    }
-    
-    // do not attack twice in a row
-    if (actor->flags & MF_JUSTATTACKED)
-    {
-        actor->flags &= ~MF_JUSTATTACKED;
-        // [STRIFE] Checks only against fastparm, not gameskill == 5
-        if (!fastparm)
-            P_NewChaseDir (actor);
-        return;
-    }
-    
-    // check for melee attack
-    if (actor->info->meleestate
-        && P_CheckMeleeRange (actor))
-    {
-        if (actor->info->attacksound)
-            S_StartSound (actor, actor->info->attacksound);
-
-        P_SetMobjState (actor, actor->info->meleestate);
-        return;
-    }
-    
-    // check for missile attack
-    if (actor->info->missilestate)
-    {
-        // [STRIFE] Checks only fastparm.
-        if (!fastparm && actor->movecount)
-        {
-            goto nomissile;
-        }
-
-        if (!P_CheckMissileRange (actor))
-            goto nomissile;
-
-        P_SetMobjState (actor, actor->info->missilestate);
-
-        // [STRIFE] Add NODIALOG flag to disable dialog
-        actor->flags |= (MF_NODIALOG|MF_JUSTATTACKED);
-        return;
-    }
-
-    // ?
-nomissile:
-    // possibly choose another target
-    if (netgame
-        && !actor->threshold
-        && !P_CheckSight (actor, actor->target) )
-    {
-        if (P_LookForPlayers(actor, true))
-            return; // got a new target
-    }
-    
-    // chase towards player
-    if (--actor->movecount<0
-        || !P_Move (actor))
-    {
-        P_NewChaseDir (actor);
-    }
-
-    // [STRIFE] Changes to active sound behavior:
-    // * Significantly more frequent
-    // * Acolytes have randomized wandering sounds
-
-    // make active sound
-    if (actor->info->activesound && P_Random () < 38)
-    {
-        if(actor->info->activesound >= sfx_agrac1 &&
-           actor->info->activesound <= sfx_agrac4)
-        {
-            S_StartSound(actor, sfx_agrac1 + P_Random() % 4);
-        }
-        else
-            S_StartSound(actor, actor->info->activesound);
-    }
-}
-
-
-//
-// A_FaceTarget
-//
-// [STRIFE]
-// haleyjd 09/05/10: Handling for visibility-modifying flags.
-//
-void A_FaceTarget (mobj_t* actor)
-{
-    if (!actor->target)
-        return;
-
-    actor->flags &= ~MF_AMBUSH;
-
-    actor->angle = R_PointToAngle2 (actor->x,
-                                    actor->y,
-                                    actor->target->x,
-                                    actor->target->y);
-
-    if(actor->target->flags & MF_SHADOW)
-    {
-        // [STRIFE] increased SHADOW inaccuracy by a power of 2
-        int t = P_Random();
-        actor->angle += (t - P_Random()) << 22;
-    }
-    else if(actor->target->flags & MF_MVIS)
-    {
-        // [STRIFE] MVIS gives even worse aiming!
-        int t = P_Random();
-        actor->angle += (t - P_Random()) << 23;
-    }
-}
-
-//
-// A_PeasantPunch
-//
-// [STRIFE] New function
-// haleyjd 09/05/10: Attack used by Peasants as a one-time retaliation
-// when the player or a monster injures them. Weak doesn't begin to
-// describe it :P
-//
-void A_PeasantPunch(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    A_FaceTarget(actor);
-    if(P_CheckMeleeRange(actor))
-        P_DamageMobj(actor->target, actor, actor, 2 * (P_Random() % 5) + 2);
-}
-
-//
-// A_ReaverAttack
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action routine used by Reavers to fire bullets.
-// Also apparently used by Inquistors, though they don't seem to use
-// it too often, as they're content to blow your face off with their
-// HE grenades instead.
-//
-void A_ReaverAttack(mobj_t* actor)
-{
-    int i = 0;
-    fixed_t slope;
-
-    if(!actor->target)
-        return;
-
-    S_StartSound(actor, sfx_reavat);
-    A_FaceTarget(actor);
-
-    slope = P_AimLineAttack(actor, actor->angle, 2048*FRACUNIT);
-
-    do
-    {
-        int     t          = P_Random();
-        angle_t shootangle = actor->angle + ((t - P_Random()) << 20);
-        int     damage     = 3*((P_Random() & 7) + 1);
-
-        P_LineAttack(actor, shootangle, 2048*FRACUNIT, slope, damage);
-        ++i;
-    }
-    while(i < 3);
-}
-
-//
-// A_BulletAttack
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for generic bullet attacks. Used by
-// a lot of different characters, including Acolytes, Rebels, and Macil.
-//
-void A_BulletAttack(mobj_t* actor)
-{
-    int t, damage;
-    fixed_t slope;
-    angle_t shootangle;
-
-    if(!actor->target)
-        return;
-
-    S_StartSound(actor, sfx_rifle);
-    A_FaceTarget(actor);
-    
-    slope = P_AimLineAttack(actor, actor->angle, 2048*FRACUNIT);
-    t = P_Random();
-    shootangle = ((t - P_Random()) << 19) + actor->angle;
-    damage = 3 * (P_Random() % 5 + 1);
-
-    P_LineAttack(actor, shootangle, 2048*FRACUNIT, slope, damage);
-}
-
-//
-// A_CheckTargetVisible
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action routine which sets a thing back to its
-// seestate at random, or if it cannot see its target, or its target
-// is dead. Used by diverse actors.
-//
-void A_CheckTargetVisible(mobj_t* actor)
-{
-    A_FaceTarget(actor);
-
-    if(P_Random() >= 30)
-    {
-        mobj_t *target = actor->target;
-        
-        if(!target || target->health <= 0 || !P_CheckSight(actor, target) ||
-            P_Random() < 40)
-        {
-            P_SetMobjState(actor, actor->info->seestate);
-        }
-    }
-}
-
-//
-// A_SentinelAttack
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function implementing the Sentinel's laser attack
-// villsa 09/06/10 implemented
-//
-void A_SentinelAttack(mobj_t* actor)
-{
-    mobj_t* mo;
-    mobj_t* mo2;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    angle_t an;
-    int i;
-
-    mo = P_SpawnFacingMissile(actor, actor->target, MT_L_LASER);
-    an = actor->angle >> ANGLETOFINESHIFT;
-
-    if(mo->momy | mo->momx) // villsa - fixed typo (yes, they actually used '|' instead of'||')
-    {
-        for(i = 8; i > 1; i--)
-        {
-            x = mo->x + FixedMul(mobjinfo[MT_L_LASER].radius * i, finecosine[an]);
-            y = mo->y + FixedMul(mobjinfo[MT_L_LASER].radius * i, finesine[an]);
-            z = mo->z + i * (mo->momz >> 2);
-            mo2 = P_SpawnMobj(x, y, z, MT_R_LASER);
-            mo2->target = actor;
-            mo2->momx = mo->momx;
-            mo2->momy = mo->momy;
-            mo2->momz = mo->momz;
-            P_CheckMissileSpawn(mo2);
-        }
-    }
-
-    mo->z += mo->momz >> 2;
-}
-
-//
-// A_StalkerThink
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function to drive Stalker logic.
-//
-void A_StalkerThink(mobj_t* actor)
-{
-    statenum_t statenum;
-
-    if(actor->flags & MF_NOGRAVITY)
-    {
-        if(actor->ceilingz - actor->info->height <= actor->z)
-            return;
-        statenum = S_SPID_11; // 1020
-    }
-    else
-        statenum = S_SPID_18; // 1027
-
-    P_SetMobjState(actor, statenum);
-}
-
-//
-// A_StalkerSetLook
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function to marshall transitions to the
-// Stalker's spawnstate.
-//
-void A_StalkerSetLook(mobj_t* actor)
-{
-    statenum_t statenum;
-
-    if(!actor) // weird; totally unnecessary.
-        return;
-
-    if(actor->flags & MF_NOGRAVITY)
-    {
-        if(actor->state->nextstate == S_SPID_01) // 1010
-            return;
-        statenum = S_SPID_01; // 1010
-    }
-    else
-    {
-        if(actor->state->nextstate == S_SPID_02) // 1011
-            return;
-        statenum = S_SPID_02; // 1011
-    }
-
-    P_SetMobjState(actor, statenum);
-}
-
-//
-// A_StalkerDrop
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Dead simple: removes NOGRAVITY status.
-//
-void A_StalkerDrop(mobj_t* actor)
-{
-    actor->flags &= ~MF_NOGRAVITY;
-}
-
-//
-// A_StalkerScratch
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for Stalker's attack.
-//
-void A_StalkerScratch(mobj_t* actor)
-{
-    if(actor->flags & MF_NOGRAVITY)
-    {
-        // Drop him down before he can attack
-        P_SetMobjState(actor, S_SPID_11); // 1020
-        return;
-    }
-
-    if(!actor->target)
-        return;
-
-    A_FaceTarget(actor);
-    if(P_CheckMeleeRange(actor))
-        P_DamageMobj(actor->target, actor, actor, 2 * (P_Random() % 8) + 2);
-}
-
-//
-// A_FloatWeave
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function which is responsible for floating
-// actors' constant upward and downward movement. Probably a really bad
-// idea in retrospect given how dodgy the 3D clipping implementation is.
-//
-void A_FloatWeave(mobj_t* actor)
-{
-    fixed_t height;
-    fixed_t z;
-
-    if(actor->threshold)
-        return;
-
-    if(actor->flags & MF_INFLOAT)
-        return;
-
-    height = actor->info->height;         // v2
-    z      = actor->floorz + 96*FRACUNIT; // v1
-
-    if ( z > actor->ceilingz - height - 16*FRACUNIT )
-        z = actor->ceilingz - height - 16*FRACUNIT;
-
-    if ( z >= actor->z )
-        actor->momz += FRACUNIT;
-    else
-        actor->momz -= FRACUNIT;
-
-    if ( z == actor->z )
-        actor->threshold = 4;
-    else
-        actor->threshold = 8;
-}
-
-//
-// A_RobotMelee
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for Reaver and Templar melee attacks.
-//
-void A_RobotMelee(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    A_FaceTarget(actor);
-    if(P_CheckMeleeRange(actor))
-    {
-        S_StartSound(actor, sfx_revbld);
-        P_DamageMobj(actor->target, actor, actor, 3 * (P_Random() % 8 + 1));
-    }
-}
-
-//
-// A_TemplarMauler
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Exactly what it sounds like. Kicks your ass.
-//
-void A_TemplarMauler(mobj_t* actor)
-{
-    int i, t;
-    int angle;
-    int bangle;
-    int damage;
-    int slope;
-
-    if(!actor->target)
-        return;
-
-    S_StartSound(actor, sfx_pgrdat);
-    A_FaceTarget(actor);
-    bangle = actor->angle;
-    slope = P_AimLineAttack(actor, bangle, 2048*FRACUNIT);
-
-    for(i = 0; i < 10; i++)
-    {
-        // haleyjd 09/06/10: Very carefully preserved order of P_Random calls
-        damage = (P_Random() & 4) * 2;
-        t = P_Random();
-        angle = bangle + ((t - P_Random()) << 19);
-        t = P_Random();
-        slope = ((t - P_Random()) << 5) + slope;
-        P_LineAttack(actor, angle, 2112*FRACUNIT, slope, damage);
-    }
-}
-
-//
-// A_CrusaderAttack
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Action function for the Crusader's Flamethrower.
-// Very similar to the player's flamethrower, seeing how it was ripped
-// off a Crusader by the Rat People ;)
-//
-void A_CrusaderAttack(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    actor->z += (8*FRACUNIT);
-
-    if(P_CheckRobotRange(actor))
-    {
-        A_FaceTarget(actor);
-        actor->angle -= (ANG90 / 8);
-        P_SpawnFacingMissile(actor, actor->target, MT_C_FLAME);
-    }
-    else if(P_CheckMissileRange(actor))
-    {
-        A_FaceTarget(actor);
-        actor->z += (16*FRACUNIT);
-        P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
-
-        actor->angle -= (ANG45 / 32);
-        actor->z -= (16*FRACUNIT);
-        P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
-
-        actor->angle += (ANG45 / 16);
-        P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
-
-        P_SetMobjState(actor, actor->info->seestate);
-        actor->reactiontime += 15;
-    }
-    else
-        P_SetMobjState(actor, actor->info->seestate);
-    
-    actor->z -= (8*FRACUNIT);
-}
-
-//
-// A_CrusaderLeft
-//
-// villsa [STRIFE] new codepointer
-//
-void A_CrusaderLeft(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    actor->angle += (ANG90 / 16);
-    mo = P_SpawnFacingMissile(actor, actor->target, MT_C_FLAME);
-    mo->momz = FRACUNIT;
-    mo->z += (16*FRACUNIT);
-
-}
-
-//
-// A_CrusaderRight
-//
-// villsa [STRIFE] new codepointer
-//
-void A_CrusaderRight(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    actor->angle -= (ANG90 / 16);
-    mo = P_SpawnFacingMissile(actor, actor->target, MT_C_FLAME);
-    mo->momz = FRACUNIT;
-    mo->z += (16*FRACUNIT);
-}
-
-//
-// A_CheckTargetVisible2
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Mostly the same as CheckTargetVisible, except without
-// the randomness.
-//
-void A_CheckTargetVisible2(mobj_t* actor)
-{
-    if(!actor->target || actor->target->health <= 0 || 
-        !P_CheckSight(actor, actor->target))
-    {
-        P_SetMobjState(actor, actor->info->seestate);
-    }
-}
-
-//
-// A_InqFlyCheck
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function to check if an Inquisitor wishes
-// to take to flight.
-//
-void A_InqFlyCheck(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    A_FaceTarget(actor);
-
-    // if not in "robot" range, shoot grenades.
-    if(!P_CheckRobotRange(actor))
-        P_SetMobjState(actor, S_ROB3_14); // 1061
-
-    if(actor->z != actor->target->z)
-    {
-        // Take off all zig!
-        if(actor->z + actor->height + 54*FRACUNIT < actor->ceilingz)
-            P_SetMobjState(actor, S_ROB3_17); // 1064
-    }
-}
-
-//
-// A_InqGrenade
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Inquisitor grenade attack action routine.
-//
-void A_InqGrenade(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    if(!actor->target)
-        return;
-
-    A_FaceTarget(actor);
-
-    actor->z += MAXRADIUS;
-
-    // grenade 1
-    actor->angle -= (ANG45 / 32);
-    mo = P_SpawnFacingMissile(actor, actor->target, MT_INQGRENADE);
-    mo->momz += (9*FRACUNIT);
-
-    // grenade 2
-    actor->angle += (ANG45 / 16);
-    mo = P_SpawnFacingMissile(actor, actor->target, MT_INQGRENADE);
-    mo->momz += (16*FRACUNIT);
-
-    actor->z -= MAXRADIUS;
-}
-
-//
-// A_InqTakeOff
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Makes an Inquisitor start flying.
-//
-void A_InqTakeOff(mobj_t* actor)
-{
-    angle_t an;
-    fixed_t speed = actor->info->speed * (2 * FRACUNIT / 3);
-    fixed_t dist;
-
-    if(!actor->target)
-        return;
-
-    S_StartSound(actor, sfx_inqjmp);
-
-    actor->z += 64 * FRACUNIT;
-
-    A_FaceTarget(actor);
-
-    an = actor->angle >> ANGLETOFINESHIFT;
-
-    actor->momx = FixedMul(finecosine[an], speed);
-    actor->momy = FixedMul(finesine[an],   speed);
-
-    dist = P_AproxDistance(actor->target->x - actor->x,
-                           actor->target->y - actor->y);
-
-    dist /= speed;
-    if(dist < 1)
-        dist = 1;
-
-    actor->momz = (actor->target->z - actor->z) / dist;
-    actor->reactiontime = 60;
-    actor->flags |= MF_NOGRAVITY;
-}
-
-//
-// A_InqFly
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Handles an Inquisitor in flight.
-//
-void A_InqFly(mobj_t* actor)
-{
-    if(!(leveltime & 7))
-        S_StartSound(actor, sfx_inqjmp);
-
-    if(--actor->reactiontime < 0 || !actor->momx || !actor->momy ||
-        actor->z <= actor->floorz)
-    {
-        // Come in for a landing.
-        P_SetMobjState(actor, actor->info->seestate);
-        actor->reactiontime = 0;
-        actor->flags &= ~MF_NOGRAVITY;
-    }
-}
-
-//
-// A_FireSigilWeapon
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for the Entity's attack.
-//
-void A_FireSigilWeapon(mobj_t* actor)
-{
-    int choice = P_Random() % 5;
-
-    // STRIFE-TODO: Needs verification. This switch is just weird.
-    switch(choice)
-    {
-    case 0:
-        A_ProgrammerAttack(actor);
-        break;
-    // ain't not seen no case 1, bub...
-    case 2:
-        A_FireSigilEOffshoot(actor);
-        break;
-    case 3:
-        A_SpectreCAttack(actor);
-        break;
-    case 4:
-        A_SpectreDAttack(actor);
-        break;
-    case 5: // BUG: never used? wtf were they thinking?
-        A_SpectreEAttack(actor);
-        break;
-    default:
-        break;
-    }
-}
-
-//
-// A_ProgrammerAttack
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for the Programmer's main
-// attack; equivalent to the player's first Sigil.
-//
-void A_ProgrammerAttack(mobj_t* actor)
-{
-    mobj_t *mo;
-
-    if(!actor->target)
-        return;
-
-    mo = P_SpawnMobj(actor->target->x, actor->target->y, ONFLOORZ, 
-                     MT_SIGIL_A_GROUND);
-    mo->threshold = 25;
-    mo->target = actor;
-    mo->health = -2;
-    mo->tracer = actor->target;
-}
-
-//
-// A_Sigil_A_Action
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Called by MT_SIGIL_A_GROUND to zot anyone nearby with
-// corny looking lightning bolts.
-//
-void A_Sigil_A_Action(mobj_t* actor)
-{
-    int t, x, y, type;
-    mobj_t *mo;
-
-    if(actor->threshold)
-        actor->threshold--;
-
-    t = P_Random();
-    actor->momx += ((t & 3) - (P_Random() & 3)) << FRACBITS;
-    t = P_Random();
-    actor->momy += ((t & 3) - (P_Random() & 3)) << FRACBITS;
-
-    t = P_Random();
-    x = 50*FRACUNIT * ((t & 3) - (P_Random() & 3)) + actor->x;
-    t = P_Random();
-    y = 50*FRACUNIT * ((t & 3) - (P_Random() & 3)) + actor->y;
-
-    if(actor->threshold <= 25)
-        type = MT_SIGIL_A_ZAP_LEFT;
-    else
-        type = MT_SIGIL_A_ZAP_RIGHT;
-
-    mo = P_SpawnMobj(x, y, ONCEILINGZ, type);
-    mo->momz = -18 * FRACUNIT;
-    mo->target = actor->target;
-    mo->health = actor->health;
-
-    mo = P_SpawnMobj(actor->x, actor->y,  ONCEILINGZ, MT_SIGIL_A_ZAP_RIGHT);
-    mo->momz = -18 * FRACUNIT;
-    mo->target = actor->target;
-    mo->health = actor->health;
-}
-
-//
-// A_SpectreEAttack
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for the Loremaster's Spectre.
-// Equivalent to the player's final Sigil attack.
-//
-void A_SpectreEAttack(mobj_t* actor)
-{
-    mobj_t *mo;
-
-    if(!actor->target)
-        return;
-    
-    mo = P_SpawnMissile(actor, actor->target, MT_SIGIL_SE_SHOT);
-    mo->health = -2;
-}
-
-//
-// A_SpectreCAttack
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Action routine for the Oracle's Spectre. Equivalent to the player's
-// third Sigil attack.
-//
-void A_SpectreCAttack(mobj_t* actor)
-{
-    mobj_t* mo;
-    int i;
-
-    if(!actor->target)
-        return;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (32*FRACUNIT), MT_SIGIL_A_ZAP_RIGHT);
-    mo->momz = -(18*FRACUNIT);
-    mo->target = actor;
-    mo->health = -2;
-    mo->tracer = actor->target;
-    
-    actor->angle -= ANG90;
-    for(i = 0; i < 20; i++)
-    {
-        actor->angle += (ANG90 / 10);
-        mo = P_SpawnMortar(actor, MT_SIGIL_C_SHOT);
-        mo->health = -2;
-        mo->z = actor->z + (32*FRACUNIT);
-    }
-    actor->angle -= ANG90;
-}
-
-//
-// A_AlertSpectreC
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function called by the Oracle when it is
-// killed. Finds an MT_SPECTRE_C anywhere on the map and awakens it.
-//
-void A_AlertSpectreC(mobj_t* actor)
-{
-    thinker_t *th;
-
-    for(th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if(th->function.acp1 == (actionf_p1)P_MobjThinker)
-        {
-            mobj_t *mo = (mobj_t *)th;
-
-            if(mo->type == MT_SPECTRE_C)
-            {
-                P_SetMobjState(mo, mo->info->seestate);
-                mo->target = actor->target;
-                return;
-            }
-        }
-    }
-}
-
-//
-// A_Sigil_E_Action
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Action routine for Sigil "E" shots. Spawns the room-filling
-// lightning bolts that seem to often do almost nothing.
-//
-void A_Sigil_E_Action(mobj_t* actor)
-{
-    actor->angle += ANG90;
-    P_SpawnMortar(actor, MT_SIGIL_E_OFFSHOOT);
-
-    actor->angle -= ANG180;
-    P_SpawnMortar(actor, MT_SIGIL_E_OFFSHOOT);
-
-    actor->angle += ANG90;
-    P_SpawnMortar(actor, MT_SIGIL_E_OFFSHOOT);
-
-}
-
-//
-// A_SigilTrail
-//
-// villsa [STRIFE] new codepointer
-//
-void A_SigilTrail(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x - actor->momx,
-                     actor->y - actor->momy,
-                     actor->z, MT_SIGIL_TRAIL);
-
-    mo->angle = actor->angle;
-    mo->health = actor->health;
-
-}
-
-//
-// A_SpectreDAttack
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function for Macil's Spectre.
-// Equivalent of the player's fourth Sigil attack.
-//
-void A_SpectreDAttack(mobj_t* actor)
-{
-    mobj_t *mo;
-
-    if(!actor->target)
-        return;
-
-    mo = P_SpawnMissile(actor, actor->target, MT_SIGIL_SD_SHOT);
-    mo->health = -2;
-    mo->tracer = actor->target;
-}
-
-//
-// A_FireSigilEOffshoot
-//
-// [STRIFE] New function
-// haleyjd 09/06/10: Action function to fire part of a Sigil E
-// attack. Used at least by the Entity.
-//
-void A_FireSigilEOffshoot(mobj_t* actor)
-{
-    mobj_t *mo;
-
-    if(!actor->target)
-        return;
-
-    mo = P_SpawnMissile(actor, actor->target, MT_SIGIL_E_OFFSHOOT);
-    mo->health = -2;
-}
-
-//
-// A_ShadowOff
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Disables SHADOW and MVIS flags.
-//
-void A_ShadowOff(mobj_t* actor)
-{
-    actor->flags &= ~(MF_SHADOW|MF_MVIS);
-}
-
-//
-// A_ModifyVisibility
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Turns on SHADOW, and turns off MVIS.
-//
-void A_ModifyVisibility(mobj_t* actor)
-{
-    actor->flags |= MF_SHADOW;
-    actor->flags &= ~MF_MVIS;
-}
-
-//
-// A_ShadowOn
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Turns on SHADOW and MVIS.
-//
-void A_ShadowOn(mobj_t* actor)
-{
-    actor->flags |= (MF_SHADOW|MF_MVIS);
-}
-
-//
-// A_SetTLOptions
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Sets SHADOW and/or MVIS based on the thing's spawnpoint options.
-//
-void A_SetTLOptions(mobj_t* actor)
-{
-    if(actor->spawnpoint.options & MTF_TRANSLUCENT)
-        actor->flags |= MF_SHADOW;
-    if(actor->spawnpoint.options & MTF_MVIS)
-        actor->flags |= MF_MVIS;
-}
-
-//
-// A_BossMeleeAtk
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Gratuitous melee attack used by multiple boss characters,
-// just for the sake of having one. It's not like anybody in their right
-// mind would get close to any of the maniacs that use this ;)
-//
-void A_BossMeleeAtk(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    P_DamageMobj(actor->target, actor, actor, 10 * (P_Random() & 9));
-}
-
-//
-// A_BishopAttack
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Bishop's homing missile attack.
-//
-void A_BishopAttack(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    if(!actor->target)
-        return;
-
-    actor->z += MAXRADIUS;
-
-    mo = P_SpawnMissile(actor, actor->target, MT_SEEKMISSILE);
-    mo->tracer = actor->target;
-
-    actor->z -= MAXRADIUS;
-}
-
-//
-// A_FireHookShot
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Action function for the Loremaster's hookshot attack.
-//
-void A_FireHookShot(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    P_SpawnMissile(actor, actor->target, MT_HOOKSHOT);
-}
-
-//
-// A_FireChainShot
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Action function for the hookshot projectile. Spawns echoes
-// to create a chain-like appearance.
-//
-void A_FireChainShot(mobj_t* actor)
-{
-    S_StartSound(actor, sfx_tend);
-
-    P_SpawnMobj(actor->x, actor->y, actor->z, MT_CHAINSHOT); // haleyjd: fixed type
-
-    P_SpawnMobj(actor->x - (actor->momx >> 1),
-                actor->y - (actor->momy >> 1),
-                actor->z, MT_CHAINSHOT);
-
-    P_SpawnMobj(actor->x - actor->momx,
-                actor->y - actor->momy,
-                actor->z, MT_CHAINSHOT);
-}
-
-//
-// A_MissileSmoke
-//
-// villsa [STRIFE] new codepointer
-//
-void A_MissileSmoke(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    S_StartSound(actor, sfx_rflite);
-    P_SpawnPuff(actor->x, actor->y, actor->z);
-    mo = P_SpawnMobj(actor->x - actor->momx,
-                     actor->y - actor->momy,
-                     actor->z, MT_MISSILESMOKE);
-
-    mo->momz = FRACUNIT;
-}
-
-//
-// A_SpawnSparkPuff
-//
-// villsa [STRIFE] new codepointer
-//
-void A_SpawnSparkPuff(mobj_t* actor)
-{
-    int r;
-    mobj_t* mo;
-    fixed_t x;
-    fixed_t y;
-
-    r = P_Random();
-    x = (10*FRACUNIT) * ((r & 3) - (P_Random() & 3)) + actor->x;
-    r = P_Random();
-    y = (10*FRACUNIT) * ((r & 3) - (P_Random() & 3)) + actor->y;
-
-    mo = P_SpawnMobj(x, y, actor->z, MT_SPARKPUFF);
-    P_SetMobjState(mo, S_BNG4_01); // 199
-    mo->momz = FRACUNIT;
-}
-
-
-// haleyjd 09/05/10: [STRIFE] Removed:
-// A_PosAttack, A_SPosAttack, A_CPosAttack, A_CPosRefire, A_SpidRefire, 
-// A_BspiAttack, A_TroopAttack, A_SargAttack, A_HeadAttack, A_CyberAttack,
-// A_BruisAttack, A_SkelMissile
-
-
-int TRACEANGLE = 0xE000000; // villsa [STRIFE] changed from 0xC000000 to 0xE000000
-
-//
-// A_Tracer
-//
-void A_Tracer (mobj_t* actor)
-{
-    angle_t exact;
-    fixed_t dist;
-    fixed_t slope;
-    mobj_t* dest;
-    //mobj_t* th;
-
-    // villsa [STRIFE] removed all randomization and puff code
-
-    // adjust direction
-    dest = actor->tracer;
-
-    if(!dest || dest->health <= 0)
-        return;
-
-    // change angle	
-    exact = R_PointToAngle2(actor->x, actor->y, dest->x, dest->y);
-
-    if(exact != actor->angle)
-    {
-        // villsa [STRIFE] slightly different algorithm
-        if(exact - actor->angle <= 0x80000000)
-        {
-            actor->angle += TRACEANGLE;
-            if(exact - actor->angle > 0x80000000)
-                actor->angle = exact;
-        }
-        else
-        {
-            actor->angle -= TRACEANGLE;
-            if (exact - actor->angle < 0x80000000)
-                actor->angle = exact;
-        }
-    }
-
-    exact = actor->angle>>ANGLETOFINESHIFT;
-    actor->momx = FixedMul (actor->info->speed, finecosine[exact]);
-    actor->momy = FixedMul (actor->info->speed, finesine[exact]);
-
-    // change slope
-    dist = P_AproxDistance (dest->x - actor->x,
-        dest->y - actor->y);
-
-    dist = dist / actor->info->speed;
-
-    if (dist < 1)
-        dist = 1;
-    slope = (dest->z+40*FRACUNIT - actor->z) / dist;
-
-    if (slope < actor->momz)
-        actor->momz -= FRACUNIT/8;
-    else
-        actor->momz += FRACUNIT/8;
-}
-
-//
-// A_ProgrammerMelee
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Melee attack for the Programmer.
-// haleyjd - fixed damage formula
-//
-void A_ProgrammerMelee(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    A_FaceTarget(actor);
-    if(P_CheckMeleeRange(actor))
-    {
-        int damage = 6 * (P_Random() % 10 + 1);
-        
-        S_StartSound(actor, sfx_mtalht);
-        P_DamageMobj(actor->target, actor, actor, damage);
-    }
-
-}
-
-// haleyjd 09/05/10: [STRIFE] Removed:
-// A_SkelWhoosh, A_SkelFist, PIT_VileCheck, A_VileChase, A_VileStart, 
-// A_StartFire, A_FireCrackle, A_Fire, A_VileTarget, A_VileAttack
-// A_FatRaise, A_FatAttack1, A_FatAttack2, A_FatAttack3, A_SkullAttack, 
-// A_PainShootSkull, A_PainAttack, A_PainDie
-
-//
-// A_Scream
-//
-// villsa [STRIFE] 
-// * Has no random death sounds, so play deathsound directly
-// * Full-volume roars for the Entity and Inquisitor.
-//
-void A_Scream(mobj_t* actor)
-{
-    if(!actor->info->deathsound)
-        return;
-
-    // Check for bosses.
-    if(actor->type == MT_ENTITY || actor->type == MT_INQUISITOR)
-        S_StartSound(NULL, actor->info->deathsound);   // full volume
-    else
-        S_StartSound(actor, actor->info->deathsound);
-}
-
-//
-// A_XScream
-//
-// villsa [STRIFE]
-// * Robots will play deathsound while non-robots play the slop sfx
-//
-void A_XScream(mobj_t* actor)
-{
-    int sound;
-
-    if(actor->flags & MF_NOBLOOD && actor->info->deathsound)
-        sound = actor->info->deathsound;
-    else
-        sound = sfx_slop;
-
-    S_StartSound(actor, sound);
-}
-
-//
-// A_Pain
-//
-// villsa [STRIFE] 
-// * Play random peasant sounds; otherwise play painsound directly
-//
-void A_Pain(mobj_t* actor)
-{
-    int sound = actor->info->painsound;
-
-    if(sound)
-    {
-        if(sound >= sfx_pespna && sound <= sfx_pespnd)
-            sound = sfx_pespna + (P_Random() % 4);
-        
-        S_StartSound(actor, sound);
-    }
-}
-
-//
-// A_PeasantCrash
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Called from Peasant's "crash" state (not to be confused with
-// Heretic crash states), which is invoked when the Peasant has taken
-// critical but sub-fatal damage. It will "bleed out" the rest of its
-// health by calling this function repeatedly.
-//
-void A_PeasantCrash(mobj_t* actor)
-{
-    // Set NODIALOG, because you probably wouldn't feel like talking either
-    // if somebody just stabbed you in the gut with a punch dagger...
-    actor->flags |= MF_NODIALOG;
-
-    if(!(P_Random() % 5))
-    {
-        A_Pain(actor);  // inlined in asm
-        actor->health--;
-    }
-
-    if(actor->health <= 0)
-        P_KillMobj(actor->target, actor);
-}
-
-//
-// A_Fall
-//
-// [STRIFE]
-// * Set NODIALOG, and clear NOGRAVITY and SHADOW
-//
-void A_Fall (mobj_t *actor)
-{
-    // villsa [STRIFE] set NODIALOG flag to stop dialog
-    actor->flags |= MF_NODIALOG;
-
-    // actor is on ground, it can be walked over
-    // villsa [STRIFE] remove nogravity/shadow flags as well
-    actor->flags &= ~(MF_SOLID|MF_NOGRAVITY|MF_SHADOW);
-}
-
-//
-// A_HideZombie
-//
-// villsa [STRIFE] new codepointer
-// Used by the "Becoming" Acolytes on the Loremaster's level.
-//
-void A_HideZombie(mobj_t* actor)
-{
-    line_t junk;
-
-    junk.tag = 999;
-    EV_DoDoor(&junk, vld_blazeClose);
-
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-//
-// A_MerchantPain
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Pain pointer for merchant characters. They close up shop for
-// a while and set off the alarm.
-//
-void A_MerchantPain(mobj_t* actor)
-{
-    line_t junk;
-
-    junk.tag = 999;
-    EV_DoDoor(&junk, vld_shopClose);
-
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-// haleyjd 09/05/10: Removed unused CheckBossEnd Choco routine.
-
-// haleyjd 09/05/10: [STRIFE] Removed:
-// A_Hoof, A_Metal, A_BabyMetal, A_OpenShotgun2, A_LoadShotgun2, 
-// A_CloseShotgun2, A_BrainAwake, A_BrainPain, A_BrainScream, A_BrainExplode,
-// A_BrainDie, A_BrainSpit, A_SpawnSound, A_SpawnFly
-
-//
-// A_ProgrammerDie
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Action routine for the Programmer's grisly death. Spawns the 
-// separate mechanical base object and sends it flying off in some random 
-// direction.
-//
-void A_ProgrammerDie(mobj_t* actor)
-{
-    int r;
-    angle_t an;
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 24*FRACUNIT, MT_PROGRAMMERBASE);
-
-    // haleyjd 20110223: fix add w/ANG180
-    r = P_Random();
-    an = ((r - P_Random()) << 22) + actor->angle + ANG180;
-    mo->angle = an;
-
-    P_ThrustMobj(mo, an, mo->info->speed);  // inlined in asm
-
-    mo->momz = P_Random() << 9;
-}
-
-//
-// A_InqTossArm
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Inquisitor death action. Spawns an arm and tosses it.
-//
-void A_InqTossArm(mobj_t* actor)
-{
-    int r;
-    angle_t an;
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (24*FRACUNIT), MT_INQARM);
-
-    r = P_Random();
-    an = ((r - P_Random()) << 22) + actor->angle - ANG90;
-    mo->angle = an;
-
-    P_ThrustMobj(mo, an, mo->info->speed);  // inlined in asm
-
-    mo->momz = P_Random() << 10;
-}
-
-//
-// A_SpawnSpectreA
-//
-// villsa [STRIFE] new codepointer (unused)
-// 09/08/10: Spawns Spectre A. Or would, if anything actually used this.
-// This is evidence that the Programmer's spectre, which appears in the 
-// Catacombs in the final version, was originally meant to be spawned
-// after his death.
-//
-void A_SpawnSpectreA(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_A);
-    mo->momz = P_Random() << 9;
-}
-
-//
-// A_SpawnSpectreB
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Action function to spawn the Bishop's spectre.
-//
-void A_SpawnSpectreB(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_B);
-    mo->momz = P_Random() << 9;
-}
-
-//
-// A_SpawnSpectreC
-//
-// villsa [STRIFE] new codepointer (unused)
-// 09/08/10: Action function to spawn the Oracle's spectre. Also
-// unused, because the Oracle's spectre is already present on the
-// map and is awakened on his death. Also left over from the 
-// unreleased beta (and demo) versions.
-//
-void A_SpawnSpectreC(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_C);
-    mo->momz = P_Random() << 9;
-}
-
-//
-// A_SpawnSpectreD
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Action function to spawn Macil's Spectre.
-//
-void A_SpawnSpectreD(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_D);
-    mo->momz = P_Random() << 9;
-}
-
-//
-// A_SpawnSpectreE
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Action function to spawn the Loremaster's Spectre.
-//
-void A_SpawnSpectreE(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_SPECTRE_E);
-    mo->momz = P_Random() << 9;
-}
-
-// [STRIFE] New statics - Remember the Entity's spawning position.
-static fixed_t entity_pos_x = 0;
-static fixed_t entity_pos_y = 0;
-static fixed_t entity_pos_z = 0;
-
-//
-// A_SpawnEntity
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: You will fall on your knees before the True God, the One Light.
-//
-void A_SpawnEntity(mobj_t* actor)
-{
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 70*FRACUNIT, MT_ENTITY);
-    mo->momz = 5*FRACUNIT;
-
-    entity_pos_x = mo->x;
-    entity_pos_y = mo->y;
-    entity_pos_z = mo->z;
-}
-
-//
-// P_ThrustMobj
-//
-// villsa [STRIFE] new function
-// Thrusts an thing in a specified force/direction
-// Beware! This is inlined everywhere in the asm
-//
-void P_ThrustMobj(mobj_t *actor, angle_t angle, fixed_t force)
-{
-    angle_t an = angle >> ANGLETOFINESHIFT;
-    actor->momx += FixedMul(finecosine[an], force);
-    actor->momy += FixedMul(finesine[an],   force);
-}
-
-//
-// A_EntityDeath
-//
-// [STRIFE]
-// haleyjd 09/08/10: The death of the Entity's spectre brings forth
-// three subentities, which are significantly less dangerous on their
-// own but threatening together.
-//
-void A_EntityDeath(mobj_t* actor)
-{
-    mobj_t *subentity;
-    angle_t an;
-    fixed_t dist;
-
-    dist = 2 * mobjinfo[MT_SUBENTITY].radius;
-
-    // Subentity One
-    an = actor->angle >> ANGLETOFINESHIFT;
-    subentity = P_SpawnMobj(FixedMul(finecosine[an], dist) + entity_pos_x,
-                            FixedMul(finesine[an],   dist) + entity_pos_y,
-                            entity_pos_z, MT_SUBENTITY);
-    subentity->target = actor->target;
-    A_FaceTarget(subentity);
-    P_ThrustMobj(subentity, subentity->angle, 625 << 13);
-
-    // Subentity Two
-    an = (actor->angle + ANG90) >> ANGLETOFINESHIFT;
-    subentity = P_SpawnMobj(FixedMul(finecosine[an], dist) + entity_pos_x, 
-                            FixedMul(finesine[an],   dist) + entity_pos_y,
-                            entity_pos_z, MT_SUBENTITY);
-    subentity->target = actor->target;
-    P_ThrustMobj(subentity, actor->angle + ANG90, 4);
-    A_FaceTarget(subentity);
-
-    // Subentity Three
-    an = (actor->angle - ANG90) >> ANGLETOFINESHIFT;
-    subentity = P_SpawnMobj(FixedMul(finecosine[an], dist) + entity_pos_x, 
-                            FixedMul(finesine[an],   dist) + entity_pos_y,
-                            entity_pos_z, MT_SUBENTITY);
-    subentity->target = actor->target;
-    P_ThrustMobj(subentity, actor->angle - ANG90, 4);
-    A_FaceTarget(subentity);
-}
-
-//
-// A_SpawnZombie
-//
-// villsa [STRIFE] new codepointer
-//
-void A_SpawnZombie(mobj_t* actor)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z, MT_ZOMBIE);
-}
-
-//
-// A_ZombieInSpecialSector
-//
-// villsa [STRIFE] new codepointer
-//
-void A_ZombieInSpecialSector(mobj_t* actor)
-{
-    sector_t* sector;
-    fixed_t force;
-    angle_t angle;
-    int tagval;
-
-    sector = actor->subsector->sector;
-    if(actor->z != sector->floorheight)
-        return;
-
-    if(sector->special <= 15)
-        P_DamageMobj(actor, NULL, NULL, 999);
-    else if(sector->special == 18)
-    {
-        tagval = sector->tag - 100;
-        force = (tagval % 10) << 12;
-        angle = (tagval / 10) << 29;
-        P_ThrustMobj(actor, angle, force);  // inlined in asm
-    }
-}
-
-//
-// A_CrystalExplode
-//
-// villsa [STRIFE] new codepointer
-// Throws out debris from the Power Crystal and sets its sector floorheight
-// to the lowest surrounding floor (this is maybe the only time a direct
-// level-changing action is done by an object in this fashion in any of
-// the DOOM engine games... they usually call a line special instead)
-//
-void A_CrystalExplode(mobj_t* actor)
-{
-    sector_t* sector;
-    mobj_t* rubble;
-    int i;
-    int r;
-
-    sector = actor->subsector->sector;
-    sector->lightlevel = 0;
-    sector->floorheight = P_FindLowestFloorSurrounding(sector);
-
-    // spawn rubble
-    for(i = 0; i < 8; i++)
-    {
-        rubble = P_SpawnMobj(actor->x, actor->y, actor->z, MT_RUBBLE1 + i);
-        r = P_Random();
-        rubble->momx = ((r & 0x0f) - (P_Random() & 7)) << FRACBITS;
-        r = P_Random();
-        rubble->momy = ((r & 7) - (P_Random() & 7)) << FRACBITS;
-        rubble->momz = ((P_Random() & 3) << FRACBITS) + (7*FRACUNIT);
-    }
-}
-
-// [STRIFE] New static global - buffer used for various player messages.
-static char pmsgbuffer[80];
-
-// 
-// P_FreePrisoners
-//
-// haleyjd 09/08/10: [STRIFE] New function
-// * Called when the prisoners get freed, obviously. Gives a
-//   message and awards quest token 13.
-//
-void P_FreePrisoners(void)
-{
-    int i;
-
-    DEH_snprintf(pmsgbuffer, sizeof(pmsgbuffer), "You've freed the prisoners!");
-
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_QUEST13);
-        players[i].message = pmsgbuffer;
-    }
-}
-
-//
-// P_DestroyConverter
-//
-// haleyjd 09/08/10: [STRIFE] New function
-// * Called when the converter is shut down in the factory.
-//   Gives several items and a message.
-//
-void P_DestroyConverter(void)
-{
-    int i;
-
-    DEH_snprintf(pmsgbuffer, sizeof(pmsgbuffer), "You've destroyed the Converter!");
-
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_QUEST25);
-        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_STAMINA);
-        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
-        players[i].message = pmsgbuffer;
-    }
-}
-
-//
-// A_QuestMsg
-//
-// villsa [STRIFE] new codepointer
-// Displays text based on quest item's name
-// Quest item is based on actor's speed
-//
-void A_QuestMsg(mobj_t* actor)
-{
-    const char *name;
-    int quest;
-    int i;
-
-    // get name
-    name = DEH_String(mobjinfo[(MT_TOKEN_QUEST1 - 1) + actor->info->speed].name);
-    M_StringCopy(pmsgbuffer, name, sizeof(pmsgbuffer));   // inlined in asm
-
-    // give quest and display message to players
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        quest = 1 << (actor->info->speed - 1);
-        players[i].message = pmsgbuffer;
-        players[i].questflags |= quest;
-    }
-}
-
-//
-// A_ExtraLightOff
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Called by the Power Crystal to turn off the extended
-// flash of light caused by its explosion.
-//
-void A_ExtraLightOff(mobj_t* actor)
-{
-    if(!actor->target)
-        return;
-
-    if(!actor->target->player)
-        return;
-
-    actor->target->player->extralight = 0;
-}
-
-//
-// A_CrystalRadiusAtk
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Called by the power crystal when it dies.
-//
-void A_CrystalRadiusAtk(mobj_t* actor)
-{
-    P_RadiusAttack(actor, actor->target, 512);
-
-    if(!(actor->target && actor->target->player))
-        return;
-
-    // set extralight to 5 for near full-bright
-    actor->target->player->extralight = 5;
-}
-
-//
-// A_DeathExplode5
-//
-// villsa [STRIFE] new codepointer
-//
-void A_DeathExplode5(mobj_t* actor)
-{
-    P_RadiusAttack(actor, actor->target, 192);
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-//
-// A_DeathExplode1
-//
-// villsa [STRIFE] new codepointer
-//
-void A_DeathExplode1(mobj_t* actor)
-{
-    P_RadiusAttack(actor, actor->target, 128);
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-//
-// A_DeathExplode2
-//
-// villsa [STRIFE] new codepointer
-//
-void A_DeathExplode2(mobj_t* actor)
-{
-    P_RadiusAttack(actor, actor->target, 64);
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-//
-// A_DeathExplode3
-//
-// villsa [STRIFE] new codepointer
-//
-void A_DeathExplode3(mobj_t* actor)
-{
-    P_RadiusAttack(actor, actor->target, 32);
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-//
-// A_RaiseAlarm
-//
-// villsa [STRIFE] new codepointer
-// 09/08/10: Set off the infamous alarm. This is just a noise alert.
-//
-void A_RaiseAlarm(mobj_t* actor)
-{
-    if(actor->target && actor->target->player)
-        P_NoiseAlert(actor->target, actor); // inlined in asm
-}
-
-//
-// A_MissileTick
-// villsa [STRIFE] - new codepointer
-//
-void A_MissileTick(mobj_t* actor)
-{
-    if(--actor->reactiontime <= 0)
-    {
-        P_ExplodeMissile(actor);
-        actor->flags &= ~MF_MISSILE;
-    }
-}
-
-//
-// A_SpawnGrenadeFire
-// villsa [STRIFE] - new codepointer
-//
-void A_SpawnGrenadeFire(mobj_t* actor)
-{
-    P_SpawnMobj(actor->x, actor->y, actor->z, MT_PFLAME);
-}
-
-//
-// A_NodeChunk
-//
-// villsa [STRIFE] - new codepointer
-// Throw out "nodes" from a spectral entity
-//
-void A_NodeChunk(mobj_t* actor)
-{
-    int r;
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 10*FRACUNIT, MT_NODE);
-    r = P_Random();
-    mo->momx = ((r & 0x0f) - (P_Random() & 7)) << FRACBITS;
-    r = P_Random();
-    mo->momy = ((r & 7) - (P_Random() & 0x0f)) << FRACBITS;
-    mo->momz = (P_Random() & 0x0f) << FRACBITS;
-}
-
-//
-// A_HeadChunk
-//
-// villsa [STRIFE] - new codepointer
-// Throw out the little "eye"-like object from a spectral entity when it dies.
-//
-void A_HeadChunk(mobj_t* actor)
-{
-    int r;
-    mobj_t* mo;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + 10*FRACUNIT, MT_SPECTREHEAD);
-    r = P_Random();
-    mo->momx = ((r & 7) - (P_Random() & 0x0f)) << FRACBITS;
-    r = P_Random();
-    mo->momy = ((r & 0x0f) - (P_Random() & 7)) << FRACBITS;
-    mo->momz = (P_Random() & 7) << FRACBITS;
-}
-
-//
-// A_BurnSpread
-// villsa [STRIFE] - new codepointer
-//
-void A_BurnSpread(mobj_t* actor)
-{
-    int t;
-    mobj_t* mo;
-    fixed_t x;
-    fixed_t y;
-
-    actor->momz -= (8*FRACUNIT);
-
-    t = P_Random();
-    actor->momx += ((t & 3) - (P_Random() & 3)) << FRACBITS;
-    t = P_Random();
-    actor->momy += ((t & 3) - (P_Random() & 3)) << FRACBITS;
-
-    S_StartSound(actor, sfx_lgfire);
-
-    if(actor->flags & MF_DROPPED)
-        return; // not the parent
-
-    // haleyjd 20110223: match order of calls in binary
-    y = actor->y + (((P_Random() + 12) & 31) << FRACBITS);
-    x = actor->x + (((P_Random() + 12) & 31) << FRACBITS);
-
-    // spawn child
-    mo = P_SpawnMobj(x, y, actor->z + (4*FRACUNIT), MT_PFLAME);
-
-    t = P_Random();
-    mo->momx += ((t & 7) - (P_Random() & 7)) << FRACBITS;
-    t = P_Random();
-    mo->momy += ((t & 7) - (P_Random() & 7)) << FRACBITS;
-    mo->momz -= FRACUNIT;
-    mo->flags |= MF_DROPPED;
-    mo->reactiontime = (P_Random() & 3) + 2;
-}
-
-//
-// A_BossDeath
-//
-// Possibly trigger special effects
-// if on first boss level
-//
-// haleyjd 09/17/10: [STRIFE]
-// * Modified to handle all Strife bosses.
-//
-void A_BossDeath (mobj_t* actor)
-{
-    int i;
-    thinker_t *th;
-    line_t junk;
-
-    // only the following types can be a boss:
-    switch(actor->type)
-    {
-    case MT_CRUSADER:
-    case MT_SPECTRE_A:
-    case MT_SPECTRE_B:
-    case MT_SPECTRE_C:
-    case MT_SPECTRE_D:
-    case MT_SPECTRE_E:
-    case MT_SUBENTITY:
-    case MT_PROGRAMMER:
-        break;
-    default:
-        return;
-    }
-
-    // check for a living player
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        if(playeringame[i] && players[i].health > 0)
-            break;
-    }
-    if(i == MAXPLAYERS)
-        return; // everybody's dead.
-
-    // check for a still living boss
-    for(th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if(th->function.acp1 == (actionf_p1) P_MobjThinker)
-        {
-            mobj_t *mo = (mobj_t *)th;
-
-            if(mo != actor && mo->type == actor->type && mo->health > 0)
-                return; // one is still alive.
-        }
-    }
-
-    // Victory!
-    switch(actor->type)
-    {
-    case MT_CRUSADER:
-        junk.tag = 667;
-        EV_DoFloor(&junk, lowerFloorToLowest);
-        break;
-
-    case MT_SPECTRE_A:
-        GiveVoiceObjective("VOC95", "LOG95", 0);
-        junk.tag = 999;
-        EV_DoFloor(&junk, lowerFloorToLowest);
-        break;
-
-    case MT_SPECTRE_B:
-        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_BISHOP);
-        GiveVoiceObjective("VOC74", "LOG74", 0);
-        break;
-
-    case MT_SPECTRE_C:
-        // Look for an MT_ORACLE - this is for in case the player awakened the 
-        // Oracle's spectre without killing the Oracle, which is possible by 
-        // looking up to max and firing the Sigil at it. If this were not done,
-        // a serious sequence break possibility would arise where one could 
-        // kill both the Oracle AND Macil, possibly throwing the game out of
-        // sorts entirely. Too bad they thought of it ;)  However this also
-        // causes a bug sometimes! The Oracle, in its death state, sets the
-        // Spectre C back to its seestate. If the Spectre C is already dead,
-        // it becomes an undead ghost monster. Then it's a REAL spectre ;)
-        for(th = thinkercap.next; th != &thinkercap; th = th->next)
-        {
-            if(th->function.acp1 == (actionf_p1) P_MobjThinker)
-            {
-                mobj_t *mo = (mobj_t *)th;
-
-                // KILL ALL ORACLES! RAWWR!
-                if(mo != actor && mo->type == MT_ORACLE && mo->health > 0)
-                    P_KillMobj(actor, mo);
-            }
-        }
-        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_ORACLE);
-        
-        // Bishop is dead? - verify.
-        if(players[0].questflags & QF_QUEST21) 
-            P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_QUEST22);
-
-        // Macil is dead?
-        if(players[0].questflags & QF_QUEST24)
-        {
-            // Loremaster is dead?
-            if(players[0].questflags & QF_QUEST26)
-            {
-                // We wield the complete sigil, blahblah
-                GiveVoiceObjective("VOC85", "LOG85", 0);
-            }
-        }
-        else
-        {
-            // So much for prognostication!
-            GiveVoiceObjective("VOC87", "LOG87", 0);
-        }
-        junk.tag = 222;         // Open the exit door again;
-        EV_DoDoor(&junk, vld_open); // Note this is NOT the Loremaster door...
-        break;
-
-    case MT_SPECTRE_D:
-        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_MACIL);
-        if(players[0].questflags & QF_QUEST25) // Destroyed converter?
-            GiveVoiceObjective("VOC106", "LOG106", 0);
-        else
-            GiveVoiceObjective("VOC79", "LOG79", 0);
-        break;
-
-    case MT_SPECTRE_E:
-        P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_LOREMASTER);
-        if(!netgame)
-        {
-            P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_STAMINA);
-            P_GiveItemToPlayer(&players[0], SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
-        }
-        if(players[0].sigiltype == 4)
-            GiveVoiceObjective("VOC85", "LOG85", 0);
-        else
-            GiveVoiceObjective("VOC83", "LOG83", 0);
-        junk.tag = 666;
-        EV_DoFloor(&junk, lowerFloorToLowest);
-        break;
-
-    case MT_SUBENTITY:
-        F_StartFinale();
-        break;
-
-    case MT_PROGRAMMER:
-        F_StartFinale();
-        G_ExitLevel(0);
-        break;
-
-    default:
-        // Real classy, Rogue.
-        if(actor->type)
-            I_Error("Error: Unconnected BossDeath id %d", actor->type);
-        break;
-    }
-}
-
-//
-// A_AcolyteSpecial
-//
-// villsa [STRIFE] - new codepointer
-// Awards quest #7 when all the Blue Acolytes are killed in Tarnhill
-//
-void A_AcolyteSpecial(mobj_t* actor)
-{
-    int i;
-    thinker_t* th;
-
-    if(actor->type != MT_GUARD8)
-        return; // must be MT_GUARD8
-
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        if(playeringame[i] && players[i].health > 0)
-            break;
-    }
-
-    if(i == 8)
-        return;
-
-    for(th = thinkercap.next; th != &thinkercap; th = th->next)
-    {
-        if(th->function.acp1 == (actionf_p1) P_MobjThinker)
-        {
-            mobj_t *mo = (mobj_t *)th;
-
-            // Found a living MT_GUARD8?
-            if(mo != actor && mo->type == actor->type && mo->health > 0)
-                return;
-        }
-    }
-
-    // All MT_GUARD8 are dead, give quest token #7 to all players
-    for(i = 0; i < MAXPLAYERS; i++)
-        P_GiveItemToPlayer(&players[i], SPR_TOKN, MT_TOKEN_QUEST7);
-
-    // play voice, give objective
-    GiveVoiceObjective("VOC14", "LOG14", 0);
-}
-
-//
-// A_InqChase
-// villsa [STRIFE] - new codepointer
-//
-void A_InqChase(mobj_t* actor)
-{
-    S_StartSound(actor, sfx_inqact);
-    A_Chase(actor);
-}
-
-//
-// A_StalkerChase
-// villsa [STRIFE] - new codepointer
-//
-void A_StalkerChase(mobj_t* actor)
-{
-    S_StartSound(actor, sfx_spdwlk);
-    A_Chase(actor);
-}
-
-//
-// A_PlayerScream
-//
-// [STRIFE]
-// * Modified to eliminate gamemode check and to use Strife sound.
-//
-void A_PlayerScream (mobj_t* mo)
-{
-    // Default death sound.
-    int sound = sfx_pldeth;
-
-    // villsa [STRIFE] don't check for gamemode
-    if(mo->health < -50)
-    {
-        // IF THE PLAYER DIES
-        // LESS THAN -50% WITHOUT GIBBING
-        sound = sfx_plxdth;  // villsa [STRIFE] different sound
-    }
-
-    S_StartSound (mo, sound);
-}
-
-//
-// A_TeleportBeacon
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_TeleportBeacon(mobj_t* actor)
-{
-    mobj_t* mobj;
-    mobj_t* fog;
-    fixed_t fog_x;
-    fixed_t fog_y;
-
-    if(actor->target != players[actor->miscdata].mo)
-        actor->target = players[actor->miscdata].mo;
-
-    mobj = P_SpawnMobj(actor->x, actor->y, ONFLOORZ, MT_REBEL1);
-
-    // haleyjd 20141024: missing code from disassembly; transfer allegiance
-    // originally from master player to the rebel.
-    mobj->miscdata = actor->miscdata;
-
-    if(!P_TryMove(mobj, mobj->x, mobj->y))
-    {
-        // Rebel is probably stuck in something.. too bad
-        P_RemoveMobj(mobj);
-        return;
-    }
-
-    // beacon no longer special
-    actor->flags &= ~MF_SPECIAL;
-
-    // 20160306: set rebel threshold
-    mobj->threshold = 100;
-
-    // set rebel color and flags
-    mobj->flags |= ((actor->miscdata << MF_TRANSSHIFT) | MF_NODIALOG);
-    mobj->target = NULL;
-
-    // double Rebel's health in deathmatch mode
-    if(deathmatch)
-        mobj->health <<= 1;
-
-    if(actor->target)
-    {
-        mobj_t* targ = actor->target->target;
-
-        if(targ)
-        {
-            if(targ->type != MT_REBEL1 || targ->miscdata != mobj->miscdata)
-                mobj->target = targ;
-        }
-    }
-
-    P_SetMobjState(mobj, mobj->info->seestate);
-    mobj->angle = actor->angle;
-
-    fog_x = mobj->x + FixedMul(20*FRACUNIT, finecosine[actor->angle>>ANGLETOFINESHIFT]);
-    fog_y = mobj->y + FixedMul(20*FRACUNIT, finesine[actor->angle>>ANGLETOFINESHIFT]);
-
-    fog = P_SpawnMobj(fog_x, fog_y, mobj->z, MT_TFOG);
-    S_StartSound(fog, sfx_telept);
-
-    if(--actor->health < 0)
-        P_RemoveMobj(actor);
-}
-
-//
-// A_BodyParts
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Spawns gibs when organic actors get splattered, or junk
-// when robots explode.
-//
-void A_BodyParts(mobj_t* actor)
-{
-    mobjtype_t type;
-    mobj_t* mo;
-    angle_t an;
-
-    if(actor->flags & MF_NOBLOOD) // Robots are flagged NOBLOOD
-        type = MT_JUNK;
-    else
-        type = MT_MEAT;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (24*FRACUNIT), type);
-    P_SetMobjState(mo, mo->info->spawnstate + (P_Random() % 19));
-
-    an = (P_Random() << 13) / 255;
-    mo->angle = an << ANGLETOFINESHIFT;
-
-    mo->momx = FixedMul(finecosine[an], (P_Random() & 0x0f) << FRACBITS);
-    mo->momy = FixedMul(finesine[an], (P_Random() & 0x0f) << FRACBITS);
-    mo->momz = (P_Random() & 0x0f) << FRACBITS;
-}
-
-//
-// A_ClaxonBlare
-//
-// [STRIFE] New function
-// haleyjd 09/08/10: The ever-dreadful Strife alarm!
-//
-void A_ClaxonBlare(mobj_t* actor)
-{
-    // Timer ran down?
-    if(--actor->reactiontime < 0)
-    {
-        // reset to initial state
-        actor->target = NULL;
-        actor->reactiontime = actor->info->reactiontime;
-
-        // listen for more noise
-        A_Listen(actor);
-        
-        // If we heard something, stay on for a while,
-        // otherwise return to spawnstate.
-        if(actor->target)
-            actor->reactiontime = 50;
-        else
-            P_SetMobjState(actor, actor->info->spawnstate);
-    }
-
-    // When almost ran down, clear the soundtarget so it doesn't
-    // retrigger the alarm.
-    // Also, play the harsh, grating claxon.
-    if(actor->reactiontime == 2)
-        actor->subsector->sector->soundtarget = NULL;
-    else if(actor->reactiontime > 50)
-        S_StartSound(actor, sfx_alarm);
-}
-
-//
-// A_ActiveSound
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Plays an object's active sound periodically.
-//
-void A_ActiveSound(mobj_t* actor)
-{
-    if(actor->info->activesound)
-    {
-        if(!(leveltime & 7)) // haleyjd: added parens
-            S_StartSound(actor, actor->info->activesound);
-    }
-}
-
-//
-// A_ClearSoundTarget
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Clears the actor's sector soundtarget, so that the actor
-// will not be continually alerted/awakened ad infinitum. Used by
-// shopkeepers.
-//
-void A_ClearSoundTarget(mobj_t* actor)
-{
-    actor->subsector->sector->soundtarget = NULL;
-}
-
-//
-// A_DropBurnFlesh
-//
-// villsa [STRIFE] new codepointer
-//
-void A_DropBurnFlesh(mobj_t* actor)
-{
-    mobj_t* mo;
-    mobjtype_t type;
-
-    type = actor->type;
-
-    mo = P_SpawnMobj(actor->x, actor->y, actor->z + (24*FRACUNIT), MT_BURNDROP);
-    mo->momz = -FRACUNIT;
-
-    actor->type = MT_SFIREBALL;
-    P_RadiusAttack(actor, actor, 64);
-    actor->type = type;
-}
-
-//
-// A_FlameDeath
-//
-// villsa [STRIFE] new codepointer
-// 09/06/10: Death animation for flamethrower fireballs.
-//
-void A_FlameDeath(mobj_t* actor)
-{
-    actor->flags |= MF_NOGRAVITY;
-    actor->momz = (P_Random() & 3) << FRACBITS;
-}
-
-//
-// A_ClearForceField
-//
-// villsa [STRIFE] new codepointer
-// check for all matching lines in the sector
-// and disable blocking/midtextures
-//
-void A_ClearForceField(mobj_t* actor)
-{
-    int i;
-    sector_t *sec;
-    line_t *secline;
-
-    actor->flags &= ~(MF_SOLID|MF_SPECIAL);
-    sec = actor->subsector->sector;
-
-    if(!sec->linecount)
-        return;
-
-    for(i = 0; i < sec->linecount; i++)
-    {
-        secline = sec->lines[i];
-        // BUG: will crash if 1S line has TWOSIDED flag!
-        if(!(secline->flags & ML_TWOSIDED))
-            continue;
-        if(secline->special != 148)
-            continue;
-
-        secline->flags &= ~ML_BLOCKING;
-        secline->special = 0;
-        sides[secline->sidenum[0]].midtexture = 0;
-        sides[secline->sidenum[1]].midtexture = 0;
-    }
-}
-
diff --git a/games/NXDoom/src/strife/p_floor.c b/games/NXDoom/src/strife/p_floor.c
deleted file mode 100644
index 8efb52cca..000000000
--- a/games/NXDoom/src/strife/p_floor.c
+++ /dev/null
@@ -1,597 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Floor animation: raising stairs.
-//
-
-
-
-#include "z_zone.h"
-#include "doomdef.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-// Data.
-#include "sounds.h"
-
-//entryway
-#define STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE 10
-
-//
-// FLOORS
-//
-
-//
-// Move a plane (floor or ceiling) and check for crushing
-//
-// [STRIFE] Various changes were made to remove calls to P_ChangeSector when
-// P_ChangeSector returns true.
-//
-result_e
-T_MovePlane
-( sector_t*     sector,
- fixed_t        speed,
- fixed_t        dest,
- boolean        crush,
- int            floorOrCeiling,
- int            direction )
-{
-    boolean     flag;
-    fixed_t     lastpos;
-
-    switch(floorOrCeiling)
-    {
-    case 0:
-        // FLOOR
-        switch(direction)
-        {
-        case -1:
-            // DOWN
-            if (sector->floorheight - speed < dest)
-            {
-                // villsa [STRIFE] unused
-                //lastpos = sector->floorheight;
-                sector->floorheight = dest;
-                flag = P_ChangeSector(sector,crush);
-
-                // villsa [STRIFE] unused
-                /*if (flag == true)
-                {
-                    sector->floorheight =lastpos;
-                    P_ChangeSector(sector,crush);
-                    //return crushed;
-                }*/
-                return pastdest;
-            }
-            else
-            {
-                // villsa [STRIFE] unused
-                //lastpos = sector->floorheight;
-                sector->floorheight -= speed;
-                flag = P_ChangeSector(sector,crush);
-
-                // villsa [STRIFE] unused
-                /*if (flag == true)
-                {
-                    sector->floorheight = lastpos;
-                    P_ChangeSector(sector,crush);
-                    return crushed;
-                }*/
-                return ok;
-             }
-             break;
-
-        case 1:
-            // UP
-            if (sector->floorheight + speed > dest)
-            {
-                lastpos = sector->floorheight;
-                sector->floorheight = dest;
-                flag = P_ChangeSector(sector,crush);
-                if (flag == true)
-                {
-                    sector->floorheight = lastpos;
-                    P_ChangeSector(sector,crush);
-                    //return crushed;
-                }
-                return pastdest;
-            }
-            else
-            {
-                // COULD GET CRUSHED
-                lastpos = sector->floorheight;
-                sector->floorheight += speed;
-                flag = P_ChangeSector(sector,crush);
-                if (flag == true)
-                {
-                    // haleyjd 20130210: Bug fix - Strife DOES do this.
-                    if (crush == true)
-                        return crushed;
-                    sector->floorheight = lastpos;
-                    P_ChangeSector(sector,crush);
-                    return crushed;
-                }
-                else
-                    return ok;
-            }
-            break;
-        }
-        break;
-
-    case 1:
-        // CEILING
-        switch(direction)
-        {
-        case -1:
-            // DOWN
-            if (sector->ceilingheight - speed < dest)
-            {
-                lastpos = sector->ceilingheight;
-                sector->ceilingheight = dest;
-                flag = P_ChangeSector(sector,crush);
-
-                if (flag == true)
-                {
-                    sector->ceilingheight = lastpos;
-                    P_ChangeSector(sector,crush);
-                    //return crushed;
-                }
-                return pastdest;
-            }
-            else
-            {
-                // COULD GET CRUSHED
-                lastpos = sector->ceilingheight;
-                sector->ceilingheight -= speed;
-                flag = P_ChangeSector(sector,crush);
-
-                if (flag == true)
-                {
-                    if (crush == true)
-                        return crushed;
-                    sector->ceilingheight = lastpos;
-                    P_ChangeSector(sector,crush);
-                    return crushed;
-                }
-            }
-            break;
-
-        case 1:
-            // UP
-            if (sector->ceilingheight + speed > dest)
-            {
-                // villsa [STRIFE] unused
-                //lastpos = sector->ceilingheight;
-                sector->ceilingheight = dest;
-
-                // villsa [STRIFE] unused
-                //flag = P_ChangeSector(sector,crush);
-                /*if (flag == true)
-                {
-                    sector->ceilingheight = lastpos;
-                    P_ChangeSector(sector,crush);
-                    //return crushed;
-                }*/
-                return pastdest;
-            }
-            else
-            {
-                // villsa [STRIFE] unused
-                //lastpos = sector->ceilingheight;
-                sector->ceilingheight += speed;
-
-                // villsa [STRIFE] unused
-                //flag = P_ChangeSector(sector,crush);
-                return ok;
-            }
-            break;
-        }
-        break;
-
-    }
-    return ok;
-}
-
-
-//
-// MOVE A FLOOR TO IT'S DESTINATION (UP OR DOWN)
-//
-void T_MoveFloor(floormove_t* floor)
-{
-    result_e	res;
-	
-    res = T_MovePlane(floor->sector,
-		      floor->speed,
-		      floor->floordestheight,
-		      floor->crush,0,floor->direction);
-    
-    if (!(leveltime&7))
-	S_StartSound(&floor->sector->soundorg, sfx_stnmov);
-    
-    if (res == pastdest)
-    {
-	floor->sector->specialdata = NULL;
-
-	if (floor->direction == 1)
-	{
-	    switch(floor->type)
-	    {
-	      case donutRaise:
-		floor->sector->special = floor->newspecial;
-		floor->sector->floorpic = floor->texture;
-	      default:
-		break;
-	    }
-	}
-	else if (floor->direction == -1)
-	{
-	    switch(floor->type)
-	    {
-	      case lowerAndChange:
-		floor->sector->special = floor->newspecial;
-		floor->sector->floorpic = floor->texture;
-	      default:
-		break;
-	    }
-	}
-	P_RemoveThinker(&floor->thinker);
-
-	S_StartSound(&floor->sector->soundorg, sfx_pstop);
-    }
-
-}
-
-//
-// HANDLE FLOOR TYPES
-//
-// haleyjd 09/16/2010: [STRIFE] Modifications to floortypes:
-// * raiseFloor24 was changed into raiseFloor64
-// * turboLower does not appear to adjust the floor height (STRIFE-TODO: verify)
-// * raiseFloor512AndChange type was added.
-//
-int
-EV_DoFloor
-( line_t*       line,
-  floor_e       floortype )
-{
-    int                 secnum;
-    int                 rtn;
-    int                 i;
-    sector_t*           sec;
-    floormove_t*        floor;
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        // ALREADY MOVING?  IF SO, KEEP GOING...
-        if (sec->specialdata)
-            continue;
-
-        // new floor thinker
-        rtn = 1;
-        floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-        P_AddThinker (&floor->thinker);
-        sec->specialdata = floor;
-        floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-        floor->type = floortype;
-        floor->crush = false;
-
-        switch(floortype)
-        {
-        case lowerFloor: // [STRIFE] verified unmodified
-            floor->direction = -1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = 
-                P_FindHighestFloorSurrounding(sec);
-            break;
-
-        case lowerFloorToLowest: // [STRIFE] verified unmodified
-            floor->direction = -1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = 
-                P_FindLowestFloorSurrounding(sec);
-            break;
-
-        case turboLower: // [STRIFE] Modified: does not += 8
-            floor->direction = -1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED * 4;
-            floor->floordestheight = 
-                P_FindHighestFloorSurrounding(sec);
-            //if (floor->floordestheight != sec->floorheight)
-            //    floor->floordestheight += 8*FRACUNIT;
-            break;
-
-        case raiseFloorCrush: // [STRIFE] verified unmodified
-            floor->crush = true;
-        case raiseFloor:
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = 
-                P_FindLowestCeilingSurrounding(sec);
-            if (floor->floordestheight > sec->ceilingheight)
-                floor->floordestheight = sec->ceilingheight;
-            floor->floordestheight -= (8*FRACUNIT)*
-                (floortype == raiseFloorCrush);
-            break;
-
-        case raiseFloorTurbo: // [STRIFE] verified unmodified
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED*4;
-            floor->floordestheight = 
-                P_FindNextHighestFloor(sec,sec->floorheight);
-            break;
-
-        case raiseFloorToNearest: // [STRIFE] verified unmodified
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = 
-                P_FindNextHighestFloor(sec,sec->floorheight);
-            break;
-
-        case raiseFloor64: // [STRIFE] modified from raiseFloor24!
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = floor->sector->floorheight + 
-                64 * FRACUNIT; // [STRIFE]
-            break;
-
-        case raiseFloor512: // [STRIFE] verified unmodified
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = floor->sector->floorheight +
-                512 * FRACUNIT;
-            break;
-
-        case raiseFloor24AndChange: // [STRIFE] verified unmodified
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = floor->sector->floorheight +
-                24 * FRACUNIT;
-            sec->floorpic = line->frontsector->floorpic;
-            sec->special = line->frontsector->special;
-            break;
-
-        case raiseFloor512AndChange: // [STRIFE] New floor type
-            floor->direction = 1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = floor->sector->floorheight +
-                512 * FRACUNIT;
-            sec->floorpic = line->frontsector->floorpic;
-            sec->special = line->frontsector->special;
-            break;
-
-        case raiseToTexture: // [STRIFE] verified unmodified
-            {
-                int	minsize = INT_MAX;
-                side_t*	side;
-
-                floor->direction = 1;
-                floor->sector = sec;
-                floor->speed = FLOORSPEED;
-                for (i = 0; i < sec->linecount; i++)
-                {
-                    if (twoSided (secnum, i) )
-                    {
-                        side = getSide(secnum,i,0);
-                        if (side->bottomtexture >= 0)
-                            if (textureheight[side->bottomtexture] < 
-                                minsize)
-                                minsize = 
-                                textureheight[side->bottomtexture];
-                        side = getSide(secnum,i,1);
-                        if (side->bottomtexture >= 0)
-                            if (textureheight[side->bottomtexture] < 
-                                minsize)
-                                minsize = 
-                                textureheight[side->bottomtexture];
-                    }
-                }
-                floor->floordestheight =
-                    floor->sector->floorheight + minsize;
-            }
-            break;
-
-        case lowerAndChange: // [STRIFE] verified unmodified
-            floor->direction = -1;
-            floor->sector = sec;
-            floor->speed = FLOORSPEED;
-            floor->floordestheight = 
-                P_FindLowestFloorSurrounding(sec);
-            floor->texture = sec->floorpic;
-
-            for (i = 0; i < sec->linecount; i++)
-            {
-                if ( twoSided(secnum, i) )
-                {
-                    if (getSide(secnum,i,0)->sector-sectors == secnum)
-                    {
-                        sec = getSector(secnum,i,1);
-
-                        if (sec->floorheight == floor->floordestheight)
-                        {
-                            floor->texture = sec->floorpic;
-                            floor->newspecial = sec->special;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        sec = getSector(secnum,i,0);
-
-                        if (sec->floorheight == floor->floordestheight)
-                        {
-                            floor->texture = sec->floorpic;
-                            floor->newspecial = sec->special;
-                            break;
-                        }
-                    }
-                }
-            }
-        default:
-            break;
-        }
-    }
-    return rtn;
-}
-
-
-
-
-//
-// BUILD A STAIRCASE!
-//
-int
-EV_BuildStairs
-( line_t*	line,
-  stair_e	type )
-{
-    int                 secnum;
-    int                 height;
-    int                 i;
-    int                 newsecnum;
-    int                 texture;
-    int                 ok;
-    int                 rtn;
-
-    sector_t*           sec;
-    sector_t*           tsec;
-
-    floormove_t*        floor;
-
-    // Either Watcom or Rogue moved the switch out of the loop below, probably
-    // because it was a loop invariant, and put the default values in the 
-    // initializers here. I cannot be bothered to figure it out without doing
-    // this myself :P
-    fixed_t             stairsize = 8*FRACUNIT;
-    fixed_t             speed     = FLOORSPEED;
-    int                 direction = 1;
-
-    switch(type)
-    {
-    case build8: // [STRIFE] Verified unmodified.
-        speed = FLOORSPEED/4;
-        break;
-    case turbo16: // [STRIFE] Verified unmodified.
-        speed = FLOORSPEED*4;
-        stairsize = 16*FRACUNIT;
-        break;
-    case buildDown16: // [STRIFE] New stair type
-        stairsize = -16*FRACUNIT;
-        direction = -1;
-        break;
-    }
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        // ALREADY MOVING?  IF SO, KEEP GOING...
-        if (sec->specialdata)
-            continue;
-
-        // new floor thinker
-        rtn = 1;
-        floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-        P_AddThinker (&floor->thinker);
-        sec->tag = 0; // haleyjd 20140919: [STRIFE] clears tag of first stair sector
-        sec->specialdata = floor;
-        floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-        floor->direction = direction; // haleyjd 20140919: bug fix: direction, not "1"
-        floor->sector = sec;
-        floor->speed = speed;
-        height = sec->floorheight + stairsize;
-        floor->floordestheight = height;
-        // Initialize
-        floor->type = lowerFloor;
-        // entryway
-        // Uninitialized crush field will not be equal to 0 or 1 (true)
-        // with high probability. So, initialize it with any other value
-        floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
-
-        texture = sec->floorpic;
-
-        // Find next sector to raise
-        // 1.	Find 2-sided line with same sector side[0]
-        // 2.	Other side is the next sector to raise
-        do
-        {
-            ok = 0;
-            for (i = 0;i < sec->linecount;i++)
-            {
-                if ( !((sec->lines[i])->flags & ML_TWOSIDED) )
-                    continue;
-
-                tsec = (sec->lines[i])->frontsector;
-                newsecnum = tsec-sectors;
-
-                if (secnum != newsecnum)
-                    continue;
-
-                tsec = (sec->lines[i])->backsector;
-                newsecnum = tsec - sectors;
-
-                if (tsec->floorpic != texture)
-                    continue;
-
-                height += stairsize;
-
-                if (tsec->specialdata)
-                    continue;
-
-                sec = tsec;
-                secnum = newsecnum;
-                floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-
-                P_AddThinker (&floor->thinker);
-
-                sec->specialdata = floor;
-                floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-                floor->direction = direction; // [STRIFE]: for buildDown16
-                floor->sector = sec;
-                floor->speed = speed;
-                floor->floordestheight = height;
-                // Initialize
-                floor->type = lowerFloor;
-                // entryway
-                // Uninitialized crush field will not be equal to 0 or 1 (true)
-                // with high probability. So, initialize it with any other value
-                floor->crush = STAIRS_UNINITIALIZED_CRUSH_FIELD_VALUE;
-                ok = 1;
-                break;
-            }
-        } while(ok);
-    }
-    return rtn;
-}
-
diff --git a/games/NXDoom/src/strife/p_inter.c b/games/NXDoom/src/strife/p_inter.c
deleted file mode 100644
index bf36cb147..000000000
--- a/games/NXDoom/src/strife/p_inter.c
+++ /dev/null
@@ -1,1411 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Handling interactions (i.e., collisions).
-//
-
-// Data.
-#include "doomdef.h"
-#include "dstrings.h"
-#include "sounds.h"
-#include "deh_main.h"
-#include "deh_misc.h"
-#include "doomstat.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "i_system.h"
-#include "am_map.h"
-#include "p_local.h"
-#include "p_dialog.h"   // villsa [STRIFE]
-#include "s_sound.h"
-#include "p_inter.h"
-
-#include "hu_stuff.h"   // villsa [STRIFE]
-#include "z_zone.h"     // villsa [STRIFE]
-
-// haleyjd [STRIFE]
-#include "w_wad.h"
-#include "p_pspr.h"
-#include "p_dialog.h"
-#include "f_finale.h"
-
-
-#define BONUSADD    6
-
-
-// a weapon is found with two clip loads,
-// a big item has five clip loads
-// villsa [STRIFE] updated arrays
-int maxammo[NUMAMMO]    = { 250, 50, 25, 400, 100, 30, 16 };
-int clipammo[NUMAMMO]   = { 10, 4, 2, 20, 4, 6, 4 };
-
-
-//
-// GET STUFF
-//
-
-//
-// P_GiveAmmo
-// Num is the number of clip loads,
-// not the individual count (0= 1/2 clip).
-// Returns false if the ammo can't be picked up at all
-//
-// [STRIFE] Modified for Strife ammo types
-//
-boolean P_GiveAmmo(player_t* player, ammotype_t ammo, int num)
-{
-    int		oldammo;
-
-    if(ammo == am_noammo)
-        return false;
-
-    if(ammo >= NUMAMMO)
-        I_Error ("P_GiveAmmo: bad type %i", ammo);
-
-    if(player->ammo[ammo] == player->maxammo[ammo])
-        return false;
-
-    if(num)
-        num *= clipammo[ammo];
-    else
-        num = clipammo[ammo]/2;
-
-    if(gameskill == sk_baby
-        || gameskill == sk_nightmare)
-    {
-        // give double ammo in trainer mode,
-        // you'll need in nightmare
-        num <<= 1;
-    }
-
-    oldammo = player->ammo[ammo];
-    player->ammo[ammo] += num;
-
-    if(player->ammo[ammo] > player->maxammo[ammo])
-        player->ammo[ammo] = player->maxammo[ammo];
-
-    // If non zero ammo, 
-    // don't change up weapons,
-    // player was lower on purpose.
-    if(oldammo)
-        return true;
-
-    // We were down to zero,
-    // so select a new weapon.
-    // Preferences are not user selectable.
-
-    // villsa [STRIFE] ammo update
-    // where's the check for grenades? - haleyjd: verified no switch to grenades
-    //   haleyjd 10/03/10: don't change to electric bow when picking up poison
-    //   arrows.
-    if(!player->readyweapon)
-    {
-        switch(ammo)
-        {
-        case am_bullets:
-            if(player->weaponowned[wp_rifle])
-                player->pendingweapon = wp_rifle;
-            break;
-
-        case am_elecbolts:
-            if(player->weaponowned[wp_elecbow])
-                player->pendingweapon = wp_elecbow;
-            break;
-
-        case am_cell:
-            if(player->weaponowned[wp_mauler])
-                player->pendingweapon = wp_mauler;
-            break;
-
-        case am_missiles:
-            if(player->weaponowned[wp_missile])
-                player->pendingweapon = wp_missile;
-            break;
-
-        default:
-            break;
-        }
-    }
-
-    return true;
-}
-
-
-//
-// P_GiveWeapon
-// The weapon name may have a MF_DROPPED flag ored in.
-//
-// villsa [STRIFE] some stuff has been changed/moved around
-//
-boolean P_GiveWeapon(player_t* player, weapontype_t weapon, boolean dropped)
-{
-    boolean gaveammo;
-    boolean gaveweapon;
-
-    // villsa [STRIFE] new code for giving alternate version
-    // of the weapon to player
-    if(player->weaponowned[weapon])
-        gaveweapon = false;
-    else
-    {
-        gaveweapon = true;
-        player->weaponowned[weapon] = true;
-
-        // Alternate "sister" weapons that you also get as a bonus:
-        switch(weapon)
-        {
-        case wp_elecbow:
-            player->weaponowned[wp_poisonbow] = true;
-            break;
-
-        case wp_hegrenade:
-            player->weaponowned[wp_wpgrenade] = true;
-            break;
-
-        case wp_mauler:
-            player->weaponowned[wp_torpedo] = true;
-            break;
-
-        default:
-            break;
-        }
-
-        // check for the standard weapons only
-        if(weapon > player->readyweapon && weapon <= wp_sigil)
-            player->pendingweapon = weapon;
-
-    }
-
-    if(netgame && (deathmatch != 2) && !dropped)
-    {
-        // leave placed weapons forever on net games
-        if(!gaveweapon)
-            return false;
-
-        player->bonuscount += BONUSADD;
-        player->weaponowned[weapon] = true;
-
-        if(deathmatch)
-            P_GiveAmmo(player, weaponinfo[weapon].ammo, 5);
-        else
-            P_GiveAmmo(player, weaponinfo[weapon].ammo, 2);
-
-        if(player == &players[consoleplayer])
-            S_StartSound (NULL, sfx_wpnup);
-        return false;
-    }
-
-    if(weaponinfo[weapon].ammo != am_noammo)
-    {
-        // give one clip with a dropped weapon,
-        // two clips with a found weapon
-        if(dropped)
-            gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 1);
-        else
-            gaveammo = P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
-    }
-    else
-        gaveammo = false;
-
-    return(gaveweapon || gaveammo);
-}
-
-
-
-//
-// P_GiveBody
-// Returns false if the body isn't needed at all
-//
-// villsa [STRIFE] a lot of changes have been added for stamina
-//
-boolean P_GiveBody(player_t* player, int num)
-{
-    int maxhealth;
-    int healing;
-
-    maxhealth = MAXHEALTH + player->stamina;
-
-    if(num >= 0) // haleyjd 20100923: fixed to give proper amount of health
-    {
-        mobj_t *mo; // haleyjd 20110225: needed below...
-
-        // any healing to do?
-        if(player->health >= maxhealth)
-            return false;
-
-        // give, and cap to maxhealth
-        player->health += num;
-        if(player->health >= maxhealth)
-            player->health = maxhealth;
-
-        // Set mo->health for consistency.
-        // haleyjd 20110225: Seems Strife can call this on a NULL player->mo
-        // when giving items to players that are not in the game...
-        mo = P_SubstNullMobj(player->mo);
-        mo->health = player->health;
-    }
-    else
-    {
-        // [STRIFE] handle healing from the Front's medic
-        // The amount the player's health will be set to scales up with stamina
-        // increases.
-        // Ex 1: On the wimpiest skill level, -100 is sent in. This restores 
-        //       full health no matter what your stamina.
-        //       (100*100)/100 = 100
-        //       (200*100)/100 = 200
-        // Ex 2: On the most stringent skill levels, -50 is sent in. This will
-        //       restore at most half of your health.
-        //       (100*50)/100 = 50
-        //       (200*50)/100 = 100
-        healing = (-num * maxhealth) / MAXHEALTH;
-
-        // This is also the "threshold" of healing. You need less health than
-        // the amount that will be restored in order to get any benefit.
-        // So on the easiest skill you will always be fully healed.
-        // On the hardest skill you must have less than 50 health, and will
-        // only recover to 50 (assuming base stamina stat)
-        if(player->health >= healing)
-            return false;
-
-        // Set health. BUG: Oddly, mo->health is NOT set here...
-        player->health = healing;
-    }
-
-    return true;
-}
-
-
-
-//
-// P_GiveArmor
-// Returns false if the armor is worse
-// than the current armor.
-//
-// [STRIFE] Modified for Strife armor items
-//
-boolean P_GiveArmor(player_t* player, int armortype)
-{
-    int hits;
-
-    // villsa [STRIFE]
-    if(armortype < 0)
-    {
-        if(player->armorpoints)
-            return false;
-
-        armortype = -armortype;
-    }
-
-    hits = armortype * 100;
-    if(player->armorpoints >= hits)
-        return false;   // don't pick up
-
-    player->armortype = armortype;
-    player->armorpoints = hits;
-
-    return true;
-}
-
-
-
-//
-// P_GiveCard
-//
-// [STRIFE] Modified to use larger bonuscount
-//
-boolean P_GiveCard(player_t* player, card_t card)
-{
-    if (player->cards[card])
-        return false;
-    
-    // villsa [STRIFE] multiply by 2
-    player->bonuscount = BONUSADD * 2;
-    player->cards[card] = true;
-
-    return true;
-}
-
-
-//
-// P_GivePower
-//
-// [STRIFE] Modifications for new powerups
-//
-boolean P_GivePower(player_t* player, powertype_t power)
-{
-    // haleyjd 09/14/10: [STRIFE] moved to top, exception for Shadow Armor
-    if(player->powers[power] && power != pw_invisibility)
-        return false;	// already got it
-
-    // if giving pw_invisibility and player already has MVIS, no can do.
-    if(power == pw_invisibility && (player->mo->flags & MF_MVIS))
-        return false;
-
-    // villsa [STRIFE]
-    switch (power) {
-    case pw_targeter:
-    {
-        player->powers[power] = TARGTICS;
-        P_SetPsprite(player, ps_targcenter, S_TRGT_00); // 10
-        P_SetPsprite(player, ps_targleft,   S_TRGT_01); // 11
-        P_SetPsprite(player, ps_targright,  S_TRGT_02); // 12
-
-        player->psprites[ps_targcenter].sx  = (160*FRACUNIT);
-        player->psprites[ps_targleft  ].sy  = (100*FRACUNIT);
-        player->psprites[ps_targcenter].sy  = (100*FRACUNIT);
-        player->psprites[ps_targright ].sy  = (100*FRACUNIT);
-        return true;
-    }
-
-    case pw_invisibility:
-    {
-        // if player already had this power...
-        if(player->powers[power])
-        {
-            // remove SHADOW, give MVIS.
-            player->mo->flags &= ~MF_SHADOW;
-            player->mo->flags |= MF_MVIS;
-        }
-        else // give SHADOW
-            player->mo->flags |= MF_SHADOW;
-
-        // set tics if giving shadow, or renew them if MVIS.
-        player->powers[power] = INVISTICS;
-
-        return true;
-    }
-
-    case pw_ironfeet:
-    {
-        player->powers[power] = IRONTICS;
-        return true;
-    }
-
-    case pw_strength:
-    {
-        P_GiveBody(player, 100);
-        player->powers[power] = 1;
-        return true;
-    }
-
-    // villsa [STRIFE]
-    case pw_allmap:
-    {
-        // remember in mapstate
-        if(gamemap < 40)
-            player->mapstate[gamemap] = true;
-
-        player->powers[power] = 1;
-        return true;
-    }
-
-    // villsa [STRIFE]
-    case pw_communicator:
-    {
-        player->powers[power] = 1;
-        return true;
-    }
-
-    case NUMPOWERS:
-        // This should never actually happen
-        break;
-    }
-
-    return true;
-}
-
-
-// villsa [STRIFE]
-static char pickupmsg[80];
-
-//
-// P_TouchSpecialThing
-//
-// [STRIFE] Rewritten for Strife collectables.
-//
-void P_TouchSpecialThing(mobj_t* special, mobj_t* toucher)
-{
-    player_t*   player;
-    int         i;
-    fixed_t     delta;
-    int         sound;
-
-    delta = special->z - toucher->z;
-
-    if(delta > toucher->height || delta < -8*FRACUNIT)
-        return; // out of reach
-
-    sound = sfx_itemup;
-    player = toucher->player;
-
-    // Dead thing touching.
-    // Can happen with a sliding player corpse.
-    if(toucher->health <= 0)
-        return;
-
-    // villsa [STRIFE] damage toucher if special is spectral
-    // haleyjd 09/21/10: corrected to test for SPECTRE thingtypes specifically
-    switch(special->type)
-    {
-    case MT_SPECTRE_A:
-    case MT_SPECTRE_B:
-    case MT_SPECTRE_C:
-    case MT_SPECTRE_D:
-    case MT_SPECTRE_E:
-    case MT_ENTITY:
-    case MT_SUBENTITY:
-        P_DamageMobj(toucher, NULL, NULL, 5);
-        return;
-    default:
-        break;
-    }
-
-    // villsa [STRIFE]
-    pickupmsg[0] = 0;
-
-    // Identify by sprite.
-    // villsa [STRIFE] new items
-    switch(special->sprite)
-    {
-    // bullets
-    case SPR_BLIT: // haleyjd: fixed missing MF_DROPPED check
-        if(!P_GiveAmmo(player, am_bullets, !(special->flags & MF_DROPPED)))
-            return;
-        break;
-
-    // box of bullets
-    case SPR_BBOX:
-        if(!P_GiveAmmo(player, am_bullets, 5))
-            return;
-        break;
-
-    // missile
-    case SPR_MSSL:
-        if(!P_GiveAmmo(player, am_missiles, 1))
-            return;
-        break;
-
-    // box of missiles
-    case SPR_ROKT:
-        if(!P_GiveAmmo(player, am_missiles, 5))
-            return;
-        break;
-
-    // battery
-    case SPR_BRY1:
-        if(!P_GiveAmmo(player, am_cell, 1))
-            return;
-        break;
-
-    // cell pack
-    case SPR_CPAC:
-        if(!P_GiveAmmo(player, am_cell, 5))
-            return;
-        break;
-
-    // poison bolts
-    case SPR_PQRL:
-        if(!P_GiveAmmo(player, am_poisonbolts, 5))
-            return;
-        break;
-
-    // electric bolts
-    case SPR_XQRL:
-        if(!P_GiveAmmo(player, am_elecbolts, 5))
-            return;
-        break;
-
-    // he grenades
-    case SPR_GRN1:
-        if(!P_GiveAmmo(player, am_hegrenades, 1))
-            return;
-        break;
-
-    // wp grenades
-    case SPR_GRN2:
-        if(!P_GiveAmmo(player, am_wpgrenades, 1))
-            return;
-        break;
-
-    // rifle
-    case SPR_RIFL:
-        if(!P_GiveWeapon(player, wp_rifle, (special->flags & MF_DROPPED) != 0))
-            return;
-        sound = sfx_wpnup; // haleyjd: SHK-CHK!
-        break;
-
-    // flame thrower
-    case SPR_FLAM:
-        if(!P_GiveWeapon(player, wp_flame, false))
-            return;
-        // haleyjd: gives extra ammo.
-        P_GiveAmmo(player, am_cell, 3);
-        sound = sfx_wpnup; // haleyjd: SHK-CHK!
-        break;
-
-    // missile launcher
-    case SPR_MMSL:
-        if(!P_GiveWeapon(player, wp_missile, false))
-            return;
-        sound = sfx_wpnup; // haleyjd: SHK-CHK!
-        break;
-
-    // grenade launcher
-    case SPR_GRND:
-        if(!P_GiveWeapon(player, wp_hegrenade,
-                         (special->flags & MF_DROPPED) != 0))
-            return;
-        sound = sfx_wpnup; // haleyjd: SHK-CHK!
-        break;
-
-    // mauler
-    case SPR_TRPD:
-        if(!P_GiveWeapon(player, wp_mauler, false))
-            return;
-        sound = sfx_wpnup; // haleyjd: SHK-CHK!
-        break;
-
-    // electric bolt crossbow
-    case SPR_CBOW:
-        if(!P_GiveWeapon(player, wp_elecbow,
-                         (special->flags & MF_DROPPED) != 0))
-            return;
-        sound = sfx_wpnup; // haleyjd: SHK-CHK!
-        break;
-
-    // haleyjd 09/21/10: missed case: THE SIGIL!
-    case SPR_SIGL:
-        if(!P_GiveWeapon(player, wp_sigil, (special->flags & MF_DROPPED) != 0))
-        {
-            player->sigiltype = special->frame;
-            return;
-        }
-        
-        if(netgame)
-            player->sigiltype = 4;
-
-        player->pendingweapon = wp_sigil;
-        player->st_update = true;
-        if(deathmatch)
-            return;
-        sound = sfx_wpnup;
-        break;
-
-    // backpack
-    case SPR_BKPK:
-        if(!player->backpack)
-        {
-            for(i = 0; i < NUMAMMO; i++)
-                player->maxammo[i] *= 2;
-
-            player->backpack = true;
-        }
-        for(i = 0; i < NUMAMMO; i++)
-            P_GiveAmmo(player, i, 1);
-        break;
-
-    // 1 Gold
-    case SPR_COIN:
-        P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    // 10 Gold
-    case SPR_CRED:
-        for(i = 0; i < 10; i++)
-            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    // 25 Gold
-    case SPR_SACK:
-        // haleyjd 09/21/10: missed code: if a SPR_SACK object has negative
-        // health, it will give that much gold - STRIFE-TODO: verify
-        if(special->health < 0)
-        {
-            for(i = special->health; i != 0; i++)
-                P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        }
-        else
-        {
-            for(i = 0; i < 25; i++)
-                P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        }
-        break;
-
-    // 50 Gold
-    case SPR_CHST:
-        for(i = 0; i < 50; i++)
-            P_GiveInventoryItem(player, SPR_COIN, MT_MONY_1);
-        break;
-
-    // Leather Armor
-    case SPR_ARM1:
-        if(!P_GiveArmor(player, -2))
-            if(!P_GiveInventoryItem(player, special->sprite, special->type))
-                pickupmsg[0] = '!';
-        break;
-
-    // Metal Armor
-    case SPR_ARM2:
-        if(!P_GiveArmor(player, -1))
-            if(!P_GiveInventoryItem(player, special->sprite, special->type))
-                pickupmsg[0] = '!';
-        break;
-
-    // All-map powerup
-    case SPR_PMAP:
-        if(!P_GivePower(player, pw_allmap))
-            return;
-        sound = sfx_yeah;
-        break;
-
-    // The Comm Unit - because you need Blackbird whining in your ear the
-    // whole time and telling you how lost she is :P
-    case SPR_COMM:
-        if(!P_GivePower(player, pw_communicator))
-            return;
-        sound = sfx_yeah;
-        break;
-
-    // haleyjd 09/21/10: missed case - Shadow Armor; though, I do not know why
-    // this has a case distinct from generic inventory items... Maybe it started
-    // out as an auto-use-if-possible item much like regular armor...
-    case SPR_SHD1:
-        if(!P_GiveInventoryItem(player, SPR_SHD1, special->type))
-            pickupmsg[0] = '!';
-        break;
-
-    // villsa [STRIFE] check default items
-    case SPR_TOKN:
-    default:
-        if(special->type >= MT_KEY_BASE && special->type <= MT_NEWKEY5)
-        {
-            // haleyjd 09/21/10: Strife player still picks up keys that
-            // he has already found. (break, not return)
-            if(!P_GiveCard(player, special->type - MT_KEY_BASE))
-                break; 
-        }
-        else
-        {
-            if(!P_GiveInventoryItem(player, special->sprite, special->type))
-                pickupmsg[0] = '!';
-        }
-        break;
-    }
-
-    // villsa [STRIFE] set message
-    if(!pickupmsg[0])
-    {
-        if(special->info->name)
-        {
-            DEH_snprintf(pickupmsg, sizeof(pickupmsg), 
-                         "You picked up the %s.", DEH_String(special->info->name));
-        }
-        else
-            DEH_snprintf(pickupmsg, sizeof(pickupmsg), "You picked up the item.");
-    }
-    // use the first character to indicate that the player is full on items
-    else if(pickupmsg[0] == '!')
-    {
-        DEH_snprintf(pickupmsg, sizeof(pickupmsg), "You cannot hold any more.");
-        player->message = pickupmsg;
-        return;
-    }
-
-    if(special->flags & MF_GIVEQUEST)
-    {
-        // [STRIFE]: Award quest flag based on the thing's speed. Quest 8 was
-        // apparently at some point given by the Broken Power Coupling, which is
-        // why they don't want to award it if you have Quest 6 (which is 
-        // acquired by destroying the Front's working power coupling). BUT, the 
-        // broken coupling object's speed is NOT 8... it is 512*FRACUNIT. For
-        // strict portability beyond the x86, we need to AND the operand by 31.
-        if(special->info->speed != 8 || !(player->questflags & QF_QUEST6))
-            player->questflags |= 1 << ((special->info->speed - 1) & 31);
-    }
-
-
-    // haleyjd 08/30/10: [STRIFE] No itemcount
-    //if (special->flags & MF_COUNTITEM)
-    //    player->itemcount++;
-
-    P_RemoveMobj(special);
-    player->message = pickupmsg;
-    player->bonuscount += BONUSADD;
-
-    if(player == &players[consoleplayer])
-        S_StartSound(NULL, sound);
-}
-
-// villsa [STRIFE]
-static char plrkilledmsg[80];
-
-//
-// KillMobj
-//
-// [STRIFE] Major modifications for drop types, no tic randomization, etc.
-//
-void P_KillMobj(mobj_t* source, mobj_t* target)
-{
-    mobjtype_t  item;
-    mobj_t*     mo;
-    line_t      junk;
-    int         i;
-
-    // villsa [STRIFE] corpse and dropoff are removed, but why when these two flags
-    // are set a few lines later? watcom nonsense perhaps?
-    target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_BOUNCE|MF_CORPSE|MF_DROPOFF);
-
-    // villsa [STRIFE] unused
-    /*
-    if (target->type != MT_SKULL)
-        target->flags &= ~MF_NOGRAVITY;
-    */
-
-    target->flags |= MF_CORPSE|MF_DROPOFF;
-    target->height = FRACUNIT;  // villsa [STRIFE] set to fracunit instead of >>= 2
-
-    if(source && source->player)
-    {
-        // count for intermission
-        if(target->flags & MF_COUNTKILL)
-            source->player->killcount++;
-
-        if(target->player)
-        {
-            source->player->frags[target->player-players]++;
-
-            // villsa [STRIFE] new messages when fragging players
-            // haleyjd 20141024: corrected; uses player->allegiance, not mo->miscdata
-            DEH_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
-                         "%s killed %s",
-                         player_names[source->player->allegiance],
-                         player_names[target->player->allegiance]);
-
-            if(netgame)
-                players[consoleplayer].message = plrkilledmsg;
-        }
-    }
-    else if(!netgame && (target->flags & MF_COUNTKILL))
-    {
-        // count all monster deaths,
-        // even those caused by other monsters
-        players[0].killcount++;
-    }
-    
-    if(target->player)
-    {
-        // count environment kills against you
-        if(!source)
-            target->player->frags[target->player-players]++;
-
-        if(gamemap == 29 && !netgame)
-        {
-            // haleyjd 09/13/10: [STRIFE] Give player the bad ending.
-            F_StartFinale();
-            return;
-        }
-
-        // villsa [STRIFE] spit out inventory items when killed
-        if(netgame)
-        {
-            int amount = 0;
-            mobj_t* loot;
-            int r = 0;
-
-            while(1)
-            {
-                if(target->player->inventory[0].amount <= 0)
-                    break;
-
-                item = target->player->inventory[0].type;
-                if(item == MT_MONY_1)
-                {
-                    loot = P_SpawnMobj(target->x, target->y, 
-                                       target->z + (24*FRACUNIT), MT_MONY_25);
-
-                    // [STRIFE] TODO - what the hell is it doing here?
-                    loot->health =  target->player->inventory[0].amount;
-                    loot->health = -target->player->inventory[0].amount;
-
-                    amount = target->player->inventory[0].amount;
-                }
-                else
-                {
-                    loot = P_SpawnMobj(target->x, target->y, 
-                                       target->z + (24*FRACUNIT), item);
-                    amount = 1;
-                }
-
-                P_RemoveInventoryItem(target->player, 0, amount);
-                r = P_Random();
-                loot->momx += ((r & 7) - (P_Random() & 7)) << FRACBITS;
-                loot->momy += ((P_Random() & 7) + 1) << FRACBITS;
-                loot->flags |= MF_DROPPED;
-            }
-        }
-
-        //target->flags &= ~MF_SOLID;
-        target->player->playerstate = PST_DEAD;
-        target->player->mo->momz += 5*FRACUNIT;  // [STRIFE]: small hop!
-        P_DropWeapon(target->player);
-
-        if(target->player == &players[consoleplayer]
-           && automapactive)
-        {
-            // don't die in auto map,
-            // switch view prior to dying
-            AM_Stop ();
-        }
-
-    }
-
-    // villsa [STRIFE] some modifications to setting states
-    if(target->state != &states[S_BURN_23])
-    {
-        if(target->health == -6666)
-            P_SetMobjState(target, S_DISR_00);  // 373
-        else
-        {
-            // haleyjd [STRIFE] 20160111: Rogue changed check from < to <=
-            if(target->health <= -target->info->spawnhealth 
-                && target->info->xdeathstate)
-                P_SetMobjState(target, target->info->xdeathstate);
-            else
-                P_SetMobjState(target, target->info->deathstate);
-        }
-    }
-
-    // villsa [STRIFE] no death tics randomization
-
-    // Drop stuff.
-    // villsa [STRIFE] get item from dialog target
-    item = P_DialogFind(target->type, target->miscdata)->dropitem;
-
-    if(!item)
-    {
-        // villsa [STRIFE] drop default items
-        switch(target->type)
-        {
-        case MT_ORACLE:
-            item = MT_MEAT;
-            break;
-
-        case MT_PROGRAMMER:
-            item = MT_SIGIL_A;
-            break;
-
-        case MT_PRIEST:
-            item = MT_JUNK;
-            break;
-
-        case MT_BISHOP:
-            item = MT_AMINIBOX;
-            break;
-
-        case MT_PGUARD:
-        case MT_CRUSADER:
-            item = MT_ACELL;
-            break;
-
-        case MT_RLEADER:
-            item = MT_AAMMOBOX;
-            break;
-
-        case MT_GUARD1:
-        case MT_REBEL1:
-        case MT_SHADOWGUARD:
-            item = MT_ACLIP;
-            break;
-
-        case MT_SPECTRE_B:
-            item = MT_SIGIL_B;
-            break;
-
-        case MT_SPECTRE_C:
-            item = MT_SIGIL_C;
-            break;
-
-        case MT_SPECTRE_D:
-            item = MT_SIGIL_D;
-            break;
-
-        case MT_SPECTRE_E:
-            item = MT_SIGIL_E;
-            break;
-
-        case MT_COUPLING:
-            junk.tag = 225;
-            EV_DoDoor(&junk, vld_close);
-
-            junk.tag = 44;
-            EV_DoFloor(&junk, lowerFloor);
-
-            GiveVoiceObjective("VOC13", "LOG13", 0);
-
-            item = MT_COUPLING_BROKEN;
-            players[0].questflags |= (1 << (mobjinfo[MT_COUPLING].speed - 1));
-            break;
-
-        default:
-            return;
-        }
-    }
-
-    // handle special case for scripted target's dropped item
-    switch(item)
-    {
-    case MT_TOKEN_SHOPCLOSE:
-        junk.tag = 222;
-        EV_DoDoor(&junk, vld_close);
-        P_NoiseAlert(players[0].mo, players[0].mo);
-
-        M_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
-                   "%s", DEH_String("You're dead!  You set off the alarm."));
-        if(!deathmatch)
-            players[consoleplayer].message = plrkilledmsg;
-
-        return;
-
-    case MT_TOKEN_PRISON_PASS:
-        junk.tag = 223;
-        EV_DoDoor(&junk, vld_open);
-        return;
-
-    case MT_TOKEN_DOOR3:
-        junk.tag = 224;
-        EV_DoDoor(&junk, vld_open);
-        return;
-
-    case MT_SIGIL_A:
-    case MT_SIGIL_B:
-    case MT_SIGIL_C:
-    case MT_SIGIL_D:
-    case MT_SIGIL_E:
-        for(i = 0; i < MAXPLAYERS; i++)
-        {
-            if(!P_GiveWeapon(&players[i], wp_sigil, false))
-            {
-                if(players[i].sigiltype++ > 4)
-                    players[i].sigiltype = 4;
-            }
-
-            // haleyjd 20110225: fixed these two assignments which Watcom munged
-            // up in the assembly by pre-incrementing the pointer into players[]
-            players[i].st_update = true;
-            players[i].pendingweapon = wp_sigil;
-        }
-        return;
-
-    case MT_TOKEN_ALARM:
-        P_NoiseAlert(players[0].mo, players[0].mo);
-
-        M_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
-                   "%s", DEH_String("You Fool!  You've set off the alarm"));
-        if(!deathmatch)
-            players[consoleplayer].message = plrkilledmsg;
-        return;
-
-    default:
-        break;
-    }
-
-    // villsa [STRIFE] toss out item
-    if(!deathmatch || !(mobjinfo[item].flags & MF_NOTDMATCH))
-    {
-        int r;
-
-        mo = P_SpawnMobj(target->x, target->y, target->z + (24*FRACUNIT), item);
-        r = P_Random();
-        mo->momx += ((r & 7) - (P_Random() & 7)) << FRACBITS;
-        r = P_Random();
-        mo->momy += ((r & 7) - (P_Random() & 7)) << FRACBITS;
-        mo->flags |= (MF_SPECIAL|MF_DROPPED);   // special versions of items
-    }
-}
-
-//
-// P_IsMobjBoss
-//
-// villsa [STRIFE] new function
-//
-static boolean P_IsMobjBoss(mobjtype_t type)
-{
-    switch(type)
-    {
-    case MT_PROGRAMMER:
-    case MT_BISHOP:
-    case MT_RLEADER:
-    case MT_ORACLE:
-    case MT_PRIEST:
-        return true;
-
-    default:
-        return false;
-    }
-}
-
-
-//
-// P_DamageMobj
-// Damages both enemies and players
-// "inflictor" is the thing that caused the damage
-//  creature or missile, can be NULL (slime, etc)
-// "source" is the thing to target after taking damage
-//  creature or NULL
-// Source and inflictor are the same for melee attacks.
-// Source can be NULL for slime, barrel explosions
-// and other environmental stuff.
-//
-// [STRIFE] Extensive changes for spectrals, fire damage, disintegration, and
-//  a plethora of mobjtype-specific hacks.
-//
-void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage)
-{
-    angle_t     ang;
-    int         saved;
-    player_t*   player;
-    fixed_t     thrust;
-    int         temp;
-
-    if(!(target->flags & MF_SHOOTABLE) )
-        return; // shouldn't happen...
-
-    if(target->health <= 0)
-        return;
-
-    player = target->player;
-
-    // villsa [STRIFE] unused - skullfly check (removed)
-
-    // villsa [STRIFE] handle spectral stuff
-    // notes on projectile health:
-    // -2 == enemy spectral projectile
-    // -1 == player spectral projectile
-
-    // haleyjd 20110203: refactored completely
-    if(inflictor && (inflictor->flags & MF_SPECTRAL))
-    {
-        // players aren't damaged by their own (or others???) sigils
-        // STRIFE-TODO: verify in deathmatch
-        if(target->type == MT_PLAYER && inflictor->health == -1)
-            return;
-        // enemies aren't damaged by enemy sigil attacks
-        if((target->flags & MF_SPECTRAL) && inflictor->health == -2)
-            return;
-        // Macil2, Oracle, and Spectre C cannot be damaged by Sigil A
-        switch(target->type)
-        {
-        case MT_RLEADER2:
-        case MT_ORACLE:
-        case MT_SPECTRE_C:
-            // haleyjd: added source->player validity check for safety...
-            if(source->player && source->player->sigiltype < 1)
-                return;
-        default:
-            break;
-        }
-    }
-
-    // villsa [STRIFE] new checks for various actors
-    if(inflictor)
-    {
-        // Fire damage inflictors
-        if(inflictor->type == MT_SFIREBALL || 
-           inflictor->type == MT_C_FLAME   ||
-           inflictor->type == MT_PFLAME)
-        {
-            temp = damage / 2;
-
-            if(P_IsMobjBoss(target->type))
-                damage /= 2;
-            else if(inflictor->type == MT_PFLAME)
-            {
-                damage /= 2;
-                // robots take very little damage
-                if(target->flags & MF_NOBLOOD)
-                    damage = temp / 2;
-            }
-        }
-        else
-        {
-            switch(inflictor->type)
-            {
-            case MT_HOOKSHOT:
-                // haleyjd 20110203: should use source, not inflictor
-                ang = R_PointToAngle2(
-                        target->x,
-                        target->y,
-                        source->x,
-                        source->y) >> ANGLETOFINESHIFT;
-
-                target->momx += FixedMul(finecosine[ang], (12750*FRACUNIT) / target->info->mass);
-                target->momy += FixedMul(finesine[ang],   (12750*FRACUNIT) / target->info->mass);
-                target->reactiontime += 10;
-
-                temp = P_AproxDistance(target->x - source->x, target->y - source->y);
-                temp /= target->info->mass;
-
-                if(temp < 1)
-                    temp = 1;
-
-                target->momz = (source->z - target->z) / temp;
-                break;
-
-            case MT_POISARROW:
-                // don't affect robots
-                if(target->flags & MF_NOBLOOD)
-                    return;
-
-                // instant kill
-                damage = target->health + 10;
-                break;
-
-            default:
-                // Spectral retaliation, though this may in fact be unreachable
-                // since non-spectral inflictors are mostly filtered out.
-                if(target->flags & MF_SPECTRAL
-                    && !(inflictor->flags & MF_SPECTRAL))
-                {
-                    P_SetMobjState(target, target->info->missilestate);
-                    return; // take no damage
-                }
-                break;
-            }
-        }
-    }
-
-    // villsa [STRIFE] special cases for shopkeepers and macil
-    if((target->type >= MT_SHOPKEEPER_W && target->type <= MT_SHOPKEEPER_M)
-        || target->type == MT_RLEADER)
-    {
-        if(source)
-            target->target = source;
-
-        P_SetMobjState(target, target->info->painstate);
-        return;
-    }
-
-    // villsa [STRIFE] handle fieldguard damage
-    if(target->type == MT_FIELDGUARD)
-    {
-        // degnin ores are only allowed to damage the fieldguard
-        if(!inflictor || inflictor->type != MT_DEGNINORE)
-            return;
-
-        damage = target->health;
-    }
-
-    if(player && gameskill == sk_baby)
-        damage >>= 1;   // take half damage in trainer mode
-
-
-    // Some close combat weapons should not
-    // inflict thrust and push the victim out of reach,
-    // thus kick away unless using the chainsaw.
-    if (inflictor
-        && !(target->flags & MF_NOCLIP)
-        && (!source
-         || !source->player
-         || source->player->readyweapon != wp_flame))
-    {
-        ang = R_PointToAngle2(inflictor->x,
-                              inflictor->y,
-                              target->x,
-                              target->y);
-
-        thrust = damage * (FRACUNIT>>3) * 100 / target->info->mass;
-
-        // make fall forwards sometimes
-        if(damage < 40
-            && damage > target->health
-            && target->z - inflictor->z > 64*FRACUNIT
-            && (P_Random() & 1))
-        {
-            ang += ANG180;
-            thrust *= 4;
-        }
-
-        ang >>= ANGLETOFINESHIFT;
-        target->momx += FixedMul (thrust, finecosine[ang]);
-        target->momy += FixedMul (thrust, finesine[ang]);
-    }
-
-    // player specific
-    if(player)
-    {
-        // end of game hell hack
-        if (target->subsector->sector->special == 11
-            && damage >= target->health)
-        {
-            damage = target->health - 1;
-        }
-
-
-        // Below certain threshold,
-        // ignore damage in GOD mode.
-        // villsa [STRIFE] removed pw_invulnerability check
-        if(damage < 1000 && (player->cheats & CF_GODMODE))
-            return;
-
-        // villsa [STRIFE] flame attacks don't damage player if wearing envirosuit
-        if(player->powers[pw_ironfeet] && inflictor)
-        {
-            if(inflictor->type == MT_SFIREBALL || 
-               inflictor->type == MT_C_FLAME   || 
-               inflictor->type == MT_PFLAME)
-            {
-                damage = 0;
-            }
-        }
-
-        if(player->armortype)
-        {
-            if (player->armortype == 1)
-                saved = damage/3;
-            else
-                saved = damage/2;
-
-            if(player->armorpoints <= saved)
-            {
-                // armor is used up
-                saved = player->armorpoints;
-                player->armortype = 0;
-
-                // villsa [STRIFE]
-                P_UseInventoryItem(player, SPR_ARM1);
-                P_UseInventoryItem(player, SPR_ARM2);
-            }
-            player->armorpoints -= saved;
-            damage -= saved;
-        }
-        player->health -= damage;   // mirror mobj health here for Dave
-        
-        // [STRIFE] haleyjd 20130302: bug fix - this is *not* capped here.
-        //if(player->health < 0)
-        //    player->health = 0;
-
-        player->attacker = source;
-        player->damagecount += damage;  // add damage after armor / invuln
-
-        // haleyjd 20110203 [STRIFE]: target->target set here
-        if(target != source)
-            target->target = source;
-
-        if(player->damagecount > 100)
-            player->damagecount = 100;  // teleport stomp does 10k points...
-
-        temp = damage < 100 ? damage : 100;
-
-        if(player == &players[consoleplayer])
-            I_Tactile (40,10,40+temp*2);
-    }
-
-    // do the damage	
-    target->health -= damage;
-
-    // villsa [STRIFE] auto use medkits
-    if(player && player->health < 50)
-    {
-        if(deathmatch || player->cheats & CF_AUTOHEALTH)
-        {
-            while(player->health < 50 && P_UseInventoryItem(player, SPR_MDKT));
-            while(player->health < 50 && P_UseInventoryItem(player, SPR_STMP));
-        }
-    }
-
-
-    if(target->health <= 0)
-    {
-        // villsa [STRIFE] grenades hurt... OUCH
-        if(inflictor && inflictor->type == MT_HEGRENADE)
-            target->health = -target->info->spawnhealth;
-        else if(!(target->flags & MF_NOBLOOD))
-        {
-            // villsa [STRIFE] disintegration death
-            if(inflictor &&
-                (inflictor->type == MT_STRIFEPUFF3 || 
-                 inflictor->type == MT_L_LASER     || 
-                 inflictor->type == MT_TORPEDO     || 
-                 inflictor->type == MT_TORPEDOSPREAD))
-            {
-                S_StartSound(target, sfx_dsrptr);
-                target->health = -6666;
-            }
-        }
-
-        // villsa [STRIFE] flame death stuff
-        if(!(target->flags & MF_NOBLOOD)
-            && inflictor
-            && (inflictor->type == MT_SFIREBALL || 
-                inflictor->type == MT_C_FLAME   || 
-                inflictor->type == MT_PFLAME))
-        {
-            target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SHADOW|MF_MVIS);
-            if(target->player)
-            {
-                target->player->cheats |= CF_ONFIRE;
-                target->player->powers[pw_invisibility] = false;
-                target->player->readyweapon = 0;
-                P_SetPsprite(target->player, ps_weapon, S_WAVE_00); // 02
-                P_SetPsprite(target->player, ps_flash, S_NULL);
-            }
-
-            P_SetMobjState(target, S_BURN_00);  // 349
-            S_StartSound(target, sfx_burnme);
-
-            return;
-        }
-        
-        P_KillMobj(source, target);
-        return;
-    }
-
-    // villsa [STRIFE] set crash state
-    if(target->health <= 6 && target->info->crashstate)
-    {
-        P_SetMobjState(target, target->info->crashstate);
-        return;
-    }
-
-    if(damage)
-    {
-        // villsa [STRIFE] removed unused skullfly flag
-        if(P_Random() < target->info->painchance) 
-        {
-            target->flags |= MF_JUSTHIT;    // fight back!
-            P_SetMobjState (target, target->info->painstate);
-        }
-    }
-
-    target->reactiontime = 0;       // we're awake now...
-
-    // villsa [STRIFE] new checks for thing types
-    if (target->type != MT_PROGRAMMER
-        && (!target->threshold || target->type == MT_ENTITY)
-        && source && source != target
-        && source->type != MT_ENTITY
-        && ((source->flags & MF_ALLY) != (target->flags & MF_ALLY)))
-    {
-        // if not intent on another player,
-        // chase after this one
-        target->target = source;
-        target->threshold = BASETHRESHOLD;
-
-        if(target->state == &states[target->info->spawnstate]
-           && target->info->seestate != S_NULL)
-            P_SetMobjState (target, target->info->seestate);
-    }
-}
-
diff --git a/games/NXDoom/src/strife/p_inter.h b/games/NXDoom/src/strife/p_inter.h
deleted file mode 100644
index c43fc0156..000000000
--- a/games/NXDoom/src/strife/p_inter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//
-//
-
-
-#ifndef __P_INTER__
-#define __P_INTER__
-
-// haleyjd [STRIFE]: Multiple externals added
-boolean P_GiveCard(player_t* player, card_t card);
-boolean P_GiveBody(player_t* player, int num);
-boolean P_GiveArmor(player_t* player, int armortype);
-boolean P_GivePower(player_t* player, powertype_t power);
-boolean P_GiveAmmo(player_t* player, ammotype_t ammo, int num);
-boolean P_GiveWeapon(player_t* player, weapontype_t weapon, boolean dropped);
-void    P_KillMobj(mobj_t* source, mobj_t* target);
-
-#endif
diff --git a/games/NXDoom/src/strife/p_lights.c b/games/NXDoom/src/strife/p_lights.c
deleted file mode 100644
index 7fe509939..000000000
--- a/games/NXDoom/src/strife/p_lights.c
+++ /dev/null
@@ -1,372 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Handle Sector base lighting effects.
-//	Muzzle flash?
-//
-
-
-
-#include "z_zone.h"
-#include "m_random.h"
-
-#include "doomdef.h"
-#include "p_local.h"
-
-
-// State.
-#include "r_state.h"
-
-//
-// FIRELIGHT FLICKER
-//
-
-//
-// T_FireFlicker
-//
-// [STRIFE] 
-// haleyjd 2011023: Changes to amount and duration of flicker
-//
-void T_FireFlicker (fireflicker_t* flick)
-{
-    int	amount;
-
-    if (--flick->count)
-        return;
-
-    amount = (P_Random() & 3) * 8; // [STRIFE] 16 -> 8
-
-    if (flick->sector->lightlevel - amount < flick->minlight)
-        flick->sector->lightlevel = flick->minlight;
-    else
-        flick->sector->lightlevel = flick->maxlight - amount;
-
-    // [STRIFE] flicker count made random!
-    flick->count = (P_Random() & 3) + 1;
-}
-
-
-
-//
-// P_SpawnFireFlicker
-//
-// [STRIFE] 
-// haleyjd 2011023: Changes to minimum light level and initial duration
-//
-void P_SpawnFireFlicker (sector_t*      sector)
-{
-    fireflicker_t*      flick;
-
-    // Note that we are resetting sector attributes.
-    // Nothing special about it during gameplay.
-    sector->special = 0; 
-
-    flick = Z_Malloc ( sizeof(*flick), PU_LEVSPEC, 0);
-
-    P_AddThinker (&flick->thinker);
-
-    flick->thinker.function.acp1 = (actionf_p1) T_FireFlicker;
-    flick->sector = sector;
-    flick->maxlight = sector->lightlevel;
-    flick->minlight = sector->lightlevel - 32; // [STRIFE] changed from min surrounding+16
-    flick->count = 2;                          // [STRIFE]: Initial count 4 -> 2
-}
-
-
-
-//
-// BROKEN LIGHT FLASHING
-//
-
-
-//
-// T_LightFlash
-// Do flashing lights.
-//
-// [STRIFE] Verified unmodified
-//
-void T_LightFlash (lightflash_t* flash)
-{
-    if (--flash->count)
-        return;
-
-    if (flash->sector->lightlevel == flash->maxlight)
-    {
-        flash->sector->lightlevel = flash->minlight;
-        flash->count = (P_Random()&flash->mintime)+1;
-    }
-    else
-    {
-        flash->sector->lightlevel = flash->maxlight;
-        flash->count = (P_Random()&flash->maxtime)+1;
-    }
-}
-
-
-
-
-//
-// P_SpawnLightFlash
-// After the map has been loaded, scan each sector
-// for specials that spawn thinkers
-//
-// [STRIFE] Verified unmodified
-//
-void P_SpawnLightFlash (sector_t*	sector)
-{
-    lightflash_t*	flash;
-
-    // nothing special about it during gameplay
-    sector->special = 0;
-
-    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
-
-    P_AddThinker (&flash->thinker);
-
-    flash->thinker.function.acp1 = (actionf_p1) T_LightFlash;
-    flash->sector = sector;
-    flash->maxlight = sector->lightlevel;
-
-    flash->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
-    flash->maxtime = 64;
-    flash->mintime = 7;
-    flash->count = (P_Random()&flash->maxtime)+1;
-}
-
-
-
-//
-// STROBE LIGHT FLASHING
-//
-
-
-//
-// T_StrobeFlash
-//
-// [STRIFE] Verified unmodified
-//
-void T_StrobeFlash (strobe_t*           flash)
-{
-    if (--flash->count)
-        return;
-
-    if (flash->sector->lightlevel == flash->minlight)
-    {
-        flash-> sector->lightlevel = flash->maxlight;
-        flash->count = flash->brighttime;
-    }
-    else
-    {
-        flash-> sector->lightlevel = flash->minlight;
-        flash->count =flash->darktime;
-    }
-}
-
-
-
-//
-// P_SpawnStrobeFlash
-// After the map has been loaded, scan each sector
-// for specials that spawn thinkers
-//
-// [STRIFE] Verified unmodified
-//
-void
-P_SpawnStrobeFlash
-( sector_t*     sector,
-  int           fastOrSlow,
-  int           inSync )
-{
-    strobe_t*   flash;
-
-    flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
-
-    P_AddThinker (&flash->thinker);
-
-    flash->sector = sector;
-    flash->darktime = fastOrSlow;
-    flash->brighttime = STROBEBRIGHT;
-    flash->thinker.function.acp1 = (actionf_p1) T_StrobeFlash;
-    flash->maxlight = sector->lightlevel;
-    flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
-
-    if (flash->minlight == flash->maxlight)
-        flash->minlight = 0;
-
-    // nothing special about it during gameplay
-    sector->special = 0;
-
-    if (!inSync)
-        flash->count = (P_Random()&7)+1;
-    else
-        flash->count = 1;
-}
-
-
-//
-// Start strobing lights (usually from a trigger)
-//
-// [STRIFE] Verified unmodified
-//
-void EV_StartLightStrobing(line_t*      line)
-{
-    int         secnum;
-    sector_t*   sec;
-
-    secnum = -1;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-        if (sec->specialdata)
-            continue;
-
-        P_SpawnStrobeFlash (sec, SLOWDARK, 0);
-    }
-}
-
-
-
-//
-// TURN LINE'S TAG LIGHTS OFF
-//
-// [STRIFE] Verified unmodified
-//
-void EV_TurnTagLightsOff(line_t* line)
-{
-    int             i;
-    int             j;
-    int             min;
-    sector_t*       sector;
-    sector_t*       tsec;
-    line_t*         templine;
-
-    sector = sectors;
-
-    for (j = 0;j < numsectors; j++, sector++)
-    {
-        if (sector->tag == line->tag)
-        {
-            min = sector->lightlevel;
-            for (i = 0;i < sector->linecount; i++)
-            {
-                templine = sector->lines[i];
-                tsec = getNextSector(templine,sector);
-                if (!tsec)
-                    continue;
-                if (tsec->lightlevel < min)
-                    min = tsec->lightlevel;
-            }
-            sector->lightlevel = min;
-        }
-    }
-}
-
-
-//
-// TURN LINE'S TAG LIGHTS ON
-//
-// [STRIFE] Verified unmodified
-//
-void
-EV_LightTurnOn
-( line_t*       line,
-  int           bright )
-{
-    int         i;
-    int         j;
-    sector_t*   sector;
-    sector_t*   temp;
-    line_t*     templine;
-
-    sector = sectors;
-
-    for (i=0;i<numsectors;i++, sector++)
-    {
-        if (sector->tag == line->tag)
-        {
-            // bright = 0 means to search
-            // for highest light level
-            // surrounding sector
-            if (!bright)
-            {
-                for (j = 0;j < sector->linecount; j++)
-                {
-                    templine = sector->lines[j];
-                    temp = getNextSector(templine,sector);
-
-                    if (!temp)
-                        continue;
-
-                    if (temp->lightlevel > bright)
-                        bright = temp->lightlevel;
-                }
-            }
-            sector-> lightlevel = bright;
-        }
-    }
-}
-
-    
-//
-// Spawn glowing light
-//
-// [STRIFE] Verified unmodified
-//
-void T_Glow(glow_t*     g)
-{
-    switch(g->direction)
-    {
-    case -1:
-        // DOWN
-        g->sector->lightlevel -= GLOWSPEED;
-        if (g->sector->lightlevel <= g->minlight)
-        {
-            g->sector->lightlevel += GLOWSPEED;
-            g->direction = 1;
-        }
-        break;
-
-    case 1:
-        // UP
-        g->sector->lightlevel += GLOWSPEED;
-        if (g->sector->lightlevel >= g->maxlight)
-        {
-            g->sector->lightlevel -= GLOWSPEED;
-            g->direction = -1;
-        }
-        break;
-    }
-}
-
-//
-// [STRIFE] Verified unmodified
-//
-void P_SpawnGlowingLight(sector_t*	sector)
-{
-    glow_t*	g;
-
-    g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
-
-    P_AddThinker(&g->thinker);
-
-    g->sector = sector;
-    g->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
-    g->maxlight = sector->lightlevel;
-    g->thinker.function.acp1 = (actionf_p1) T_Glow;
-    g->direction = -1;
-
-    sector->special = 0;
-}
-
diff --git a/games/NXDoom/src/strife/p_local.h b/games/NXDoom/src/strife/p_local.h
deleted file mode 100644
index abbb071ba..000000000
--- a/games/NXDoom/src/strife/p_local.h
+++ /dev/null
@@ -1,311 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Play functions, animation, global header.
-//
-
-
-#ifndef __P_LOCAL__
-#define __P_LOCAL__
-
-#ifndef __R_LOCAL__
-#include "r_local.h"
-#endif
-
-#define FLOATSPEED		(FRACUNIT*5)    // villsa [STRIFE] change to 5 (was 4)
-
-
-#define MAXHEALTH		100
-#define VIEWHEIGHT		(41*FRACUNIT)
-
-// mapblocks are used to check movement
-// against lines and things
-#define MAPBLOCKUNITS	128
-#define MAPBLOCKSIZE	(MAPBLOCKUNITS*FRACUNIT)
-#define MAPBLOCKSHIFT	(FRACBITS+7)
-#define MAPBMASK		(MAPBLOCKSIZE-1)
-#define MAPBTOFRAC		(MAPBLOCKSHIFT-FRACBITS)
-
-
-// player radius for movement checking
-#define PLAYERRADIUS	16*FRACUNIT
-
-// MAXRADIUS is for precalculated sector block boxes
-// the spider demon is larger,
-// but we do not have any moving sectors nearby
-#define MAXRADIUS		32*FRACUNIT
-
-#define GRAVITY		FRACUNIT
-#define MAXMOVE		(30*FRACUNIT)
-
-#define USERANGE		(64*FRACUNIT)
-#define MELEERANGE		(64*FRACUNIT)
-#define PLAYERMELEERANGE	(80*FRACUNIT) // haleyjd [STRIFE] New constant
-#define MISSILERANGE	(32*64*FRACUNIT)
-
-// follow a player exlusively for 3 seconds
-#define	BASETHRESHOLD	 	100
-
-
-
-//
-// P_TICK
-//
-
-// both the head and tail of the thinker list
-extern	thinker_t	thinkercap;	
-
-
-void P_InitThinkers (void);
-void P_AddThinker (thinker_t* thinker);
-void P_RemoveThinker (thinker_t* thinker);
-
-
-//
-// P_PSPR
-//
-void P_SetupPsprites (player_t* curplayer);
-void P_MovePsprites (player_t* curplayer);
-void P_DropWeapon (player_t* player);
-
-
-//
-// P_USER
-//
-
-// haleyjd 09/15/10: externalized
-#define INVERSECOLORMAP         32
-
-void    P_PlayerThink (player_t* player);
-// haleyjd 08/30/10: [STRIFE] Needed externally
-void    P_Thrust (player_t* player, angle_t angle, fixed_t move);
-// villsa [STRIFE]
-const char *P_RemoveInventoryItem(player_t *player, int slot, int amount);
-
-
-//
-// P_MOBJ
-//
-#define ONFLOORZ		INT_MIN
-#define ONCEILINGZ		INT_MAX
-
-// Time interval for item respawning.
-#define ITEMQUESIZE		128
-
-extern mapthing_t	itemrespawnque[ITEMQUESIZE];
-extern int		itemrespawntime[ITEMQUESIZE];
-extern int		iquehead;
-extern int		iquetail;
-
-
-void P_RespawnSpecials (void);
-
-mobj_t*
-P_SpawnMobj
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z,
-  mobjtype_t	type );
-
-void 	P_RemoveMobj (mobj_t* th);
-mobj_t* P_SubstNullMobj (mobj_t* th);
-boolean	P_SetMobjState (mobj_t* mobj, statenum_t state);
-void 	P_MobjThinker (mobj_t* mobj);
-
-void	P_SpawnPuff (fixed_t x, fixed_t y, fixed_t z);
-mobj_t* P_SpawnSparkPuff(fixed_t x, fixed_t y, fixed_t z);  // villsa [STRIFE]
-void 	P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage);
-mobj_t* P_SpawnMissile (mobj_t* source, mobj_t* dest, mobjtype_t type);
-mobj_t* P_SpawnFacingMissile(mobj_t* source, mobj_t* target, mobjtype_t type);  // villsa [STRIFE]
-mobj_t* P_SpawnPlayerMissile(mobj_t* source, mobjtype_t type);
-mobj_t* P_SpawnMortar(mobj_t *source, mobjtype_t type); // villsa [STRIFE]
-void    P_ExplodeMissile (mobj_t* mo); // villsa [STRIFE]
-
-
-//
-// P_ENEMY
-//
-void P_NoiseAlert (mobj_t* target, mobj_t* emmiter);
-void P_DoPunchAlert(mobj_t *puncher, mobj_t *punchee);  // villsa [STRIFE]
-void A_BodyParts(mobj_t *actor);                        // haleyjd: [STRIFE]
-void A_AlertSpectreC(mobj_t* actor);
-void A_FaceTarget (mobj_t* actor);
-void P_FreePrisoners(void);
-void P_DestroyConverter(void);
-
-//
-// P_MAPUTL
-//
-typedef struct
-{
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	dx;
-    fixed_t	dy;
-    
-} divline_t;
-
-typedef struct
-{
-    fixed_t	frac;		// along trace line
-    boolean	isaline;
-    union {
-	mobj_t*	thing;
-	line_t*	line;
-    }			d;
-} intercept_t;
-
-// Extended MAXINTERCEPTS, to allow for intercepts overrun emulation.
-
-#define MAXINTERCEPTS_ORIGINAL 128
-#define MAXINTERCEPTS          (MAXINTERCEPTS_ORIGINAL + 61)
-
-extern intercept_t	intercepts[MAXINTERCEPTS];
-extern intercept_t*	intercept_p;
-
-typedef boolean (*traverser_t) (intercept_t *in);
-
-fixed_t P_AproxDistance (fixed_t dx, fixed_t dy);
-int 	P_PointOnLineSide (fixed_t x, fixed_t y, line_t* line);
-int 	P_PointOnDivlineSide (fixed_t x, fixed_t y, divline_t* line);
-void 	P_MakeDivline (line_t* li, divline_t* dl);
-fixed_t P_InterceptVector (divline_t* v2, divline_t* v1);
-int 	P_BoxOnLineSide (fixed_t* tmbox, line_t* ld);
-
-extern fixed_t		opentop;
-extern fixed_t 		openbottom;
-extern fixed_t		openrange;
-extern fixed_t		lowfloor;
-
-void 	P_LineOpening (line_t* linedef);
-
-boolean P_BlockLinesIterator (int x, int y, boolean(*func)(line_t*) );
-boolean P_BlockThingsIterator (int x, int y, boolean(*func)(mobj_t*) );
-
-#define PT_ADDLINES		1
-#define PT_ADDTHINGS	2
-#define PT_EARLYOUT		4
-
-extern divline_t	trace;
-
-boolean
-P_PathTraverse
-( fixed_t	x1,
-  fixed_t	y1,
-  fixed_t	x2,
-  fixed_t	y2,
-  int		flags,
-  boolean	(*trav) (intercept_t *));
-
-void P_UnsetThingPosition (mobj_t* thing);
-void P_SetThingPosition (mobj_t* thing);
-
-
-//
-// P_MAP
-//
-
-// If "floatok" true, move would be ok
-// if within "tmfloorz - tmceilingz".
-extern boolean      floatok;
-extern fixed_t      tmfloorz;
-extern fixed_t      tmceilingz;
-
-extern line_t      *ceilingline;
-extern line_t      *blockingline; // [STRIFE] New global
-
-extern int numspechit;
-extern line_t *spechit[];
-
-extern fixed_t attackrange;
-
-// slopes to top and bottom of target
-extern fixed_t topslope;
-extern fixed_t bottomslope;
-
-
-boolean P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y);
-boolean P_TryMove (mobj_t* thing, fixed_t x, fixed_t y);
-boolean P_CheckPositionZ(mobj_t* thing, fixed_t z);   // villsa [STRIFE]
-boolean P_TeleportMove (mobj_t* thing, fixed_t x, fixed_t y);
-void	P_SlideMove (mobj_t* mo);
-boolean P_CheckSight (mobj_t* t1, mobj_t* t2);
-void 	P_UseLines (player_t* player);
-
-boolean P_ChangeSector (sector_t* sector, boolean crunch);
-
-extern mobj_t*	linetarget;	// who got hit (or NULL)
-
-fixed_t
-P_AimLineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance );
-
-void
-P_LineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance,
-  fixed_t	slope,
-  int		damage );
-
-void
-P_RadiusAttack
-( mobj_t*	spot,
-  mobj_t*	source,
-  int		damage );
-
-
-
-//
-// P_SETUP
-//
-extern byte*		rejectmatrix;	// for fast sight rejection
-extern short*		blockmaplump;	// offsets in blockmap are from here
-extern short*		blockmap;
-extern int		bmapwidth;
-extern int		bmapheight;	// in mapblocks
-extern fixed_t		bmaporgx;
-extern fixed_t		bmaporgy;	// origin of block map
-extern mobj_t**		blocklinks;	// for thing chains
-
-
-//
-// P_INTER
-//
-extern int		maxammo[NUMAMMO];
-extern int		clipammo[NUMAMMO];
-
-void
-P_TouchSpecialThing
-( mobj_t*	special,
-  mobj_t*	toucher );
-
-void
-P_DamageMobj
-( mobj_t*	target,
-  mobj_t*	inflictor,
-  mobj_t*	source,
-  int		damage );
-
-
-//
-// P_SPEC
-//
-#include "p_spec.h"
-
-
-#endif	// __P_LOCAL__
diff --git a/games/NXDoom/src/strife/p_map.c b/games/NXDoom/src/strife/p_map.c
deleted file mode 100644
index 0aa2862f9..000000000
--- a/games/NXDoom/src/strife/p_map.c
+++ /dev/null
@@ -1,1643 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard, Andrey Budko
-//
-// 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.
-//
-// DESCRIPTION:
-//	Movement, collision handling.
-//	Shooting and aiming.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "deh_misc.h"
-
-#include "m_bbox.h"
-#include "m_random.h"
-#include "i_system.h"
-
-#include "doomdef.h"
-#include "m_argv.h"
-#include "m_misc.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-// Data.
-#include "sounds.h"
-
-// Spechit overrun magic value.
-//
-// This is the value used by PrBoom-plus.  I think the value below is 
-// actually better and works with more demos.  However, I think
-// it's better for the spechits emulation to be compatible with
-// PrBoom-plus, at least so that the big spechits emulation list
-// on Doomworld can also be used with Chocolate Doom.
-
-#define DEFAULT_SPECHIT_MAGIC 0x01C09C98
-
-// This is from a post by myk on the Doomworld forums, 
-// outputted from entryway's spechit_magic generator for
-// s205n546.lmp.  The _exact_ value of this isn't too
-// important; as long as it is in the right general
-// range, it will usually work.  Otherwise, we can use
-// the generator (hacked doom2.exe) and provide it 
-// with -spechit.
-
-//#define DEFAULT_SPECHIT_MAGIC 0x84f968e8
-
-
-fixed_t     tmbbox[4];
-mobj_t*     tmthing;
-int         tmflags;
-fixed_t     tmx;
-fixed_t     tmy;
-
-
-// If "floatok" true, move would be ok
-// if within "tmfloorz - tmceilingz".
-boolean     floatok;
-
-fixed_t     tmfloorz;
-fixed_t     tmceilingz;
-fixed_t     tmdropoffz;
-
-// keep track of the line that lowers the ceiling,
-// so missiles don't explode against sky hack walls
-line_t*     ceilingline;
-
-// haleyjd 20110203: [STRIFE] New global
-// "blockingline" tracks the linedef responsible for blocking motion of an mobj
-// for purposes of doing impact special activation by missiles. Suspiciously 
-// similar to the solution used by Raven in Heretic and Hexen.
-line_t     *blockingline;
-
-// keep track of special lines as they are hit,
-// but don't process them until the move is proven valid
-
-// fraggle: I have increased the size of this buffer.  In the original Doom,
-// overrunning past this limit caused other bits of memory to be overwritten,
-// affecting demo playback.  However, in doing so, the limit was still 
-// exceeded.  So we have to support more than 8 specials.
-//
-// We keep the original limit, to detect what variables in memory were 
-// overwritten (see SpechitOverrun())
-
-#define MAXSPECIALCROSS 		20
-#define MAXSPECIALCROSS_ORIGINAL	8
-
-line_t*		spechit[MAXSPECIALCROSS];
-int		numspechit;
-
-
-
-//
-// TELEPORT MOVE
-// 
-
-//
-// PIT_StompThing
-//
-// [STRIFE] haleyjd 09/15/10: Modified so monsters can telestomp.
-//
-boolean PIT_StompThing (mobj_t* thing)
-{
-    fixed_t blockdist;
-
-    if (!(thing->flags & MF_SHOOTABLE) )
-        return true;
-
-    blockdist = thing->radius + tmthing->radius;
-
-    if ( abs(thing->x - tmx) >= blockdist
-        || abs(thing->y - tmy) >= blockdist )
-    {
-        // didn't hit it
-        return true;
-    }
-
-    // don't clip against self
-    if (thing == tmthing)
-        return true;
-
-    // [STRIFE] monsters DO stomp things, on all levels
-    // Basically, one thing involved must be a player.
-    // Monsters can telefrag players, and players can telefrag monsters, but
-    // monsters cannot telefrag other monsters.
-    if (!(tmthing->player || thing->player))
-        return false;
-
-    P_DamageMobj (thing, tmthing, tmthing, 10000);
-
-    return true;
-}
-
-
-//
-// P_TeleportMove
-//
-// [STRIFE]
-// haleyjd 09/15/10: Modified to set thing z position.
-//
-boolean P_TeleportMove(mobj_t*  thing, fixed_t  x, fixed_t  y)
-{
-    int                 xl;
-    int                 xh;
-    int                 yl;
-    int                 yh;
-    int                 bx;
-    int                 by;
-    
-    subsector_t*        newsubsec;
-    
-    // kill anything occupying the position
-    tmthing = thing;
-    tmflags = thing->flags;
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector (x,y);
-    ceilingline = NULL;
-    
-    // The base floor/ceiling is from the subsector
-    // that contains the point.
-    // Any contacted lines the step closer together
-    // will adjust them.
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-
-    validcount++;
-    numspechit = 0;
-    
-    // stomp on any things contacted
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
-
-    for (bx=xl ; bx<=xh ; bx++)
-        for (by=yl ; by<=yh ; by++)
-            if (!P_BlockThingsIterator(bx,by,PIT_StompThing))
-                return false;
-    
-    // the move is ok,
-    // so link the thing into its new position
-    P_UnsetThingPosition (thing);
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->x = x;
-    thing->y = y;
-    thing->z = tmfloorz; // haleyjd 09/15/10: [STRIFE] Rogue added a z-set here
-
-    P_SetThingPosition (thing);
-
-    return true;
-}
-
-
-//
-// MOVEMENT ITERATOR FUNCTIONS
-//
-
-static void SpechitOverrun(line_t *ld);
-
-//
-// PIT_CheckLine
-// Adjusts tmfloorz and tmceilingz as lines are contacted
-//
-boolean PIT_CheckLine (line_t* ld)
-{
-    if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
-        || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-        || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM]
-        || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP] )
-        return true;
-
-    if (P_BoxOnLineSide (tmbbox, ld) != -1)
-        return true;
-
-    // A line has been hit
-    
-    // The moving thing's destination position will cross
-    // the given line.
-    // If this should not be allowed, return false.
-    // If the line is special, keep track of it
-    // to process later if the move is proven ok.
-    // NOTE: specials are NOT sorted by order,
-    // so two special lines that are only 8 pixels apart
-    // could be crossed in either order.
-    
-    if (!ld->backsector)
-        return false;           // one sided line
-
-    if (!(tmthing->flags & MF_MISSILE) )
-    {
-        // villsa [STRIFE] include jumpover flag
-        if ( ld->flags & ML_BLOCKING &&
-            (!(ld->flags & ML_JUMPOVER) || tmfloorz + (32*FRACUNIT) > tmthing->z) )
-            return false;   // explicitly blocking everything
-
-        // villsa [STRIFE] exclude floaters from blockmonster lines
-        if ( !tmthing->player && (ld->flags & ML_BLOCKMONSTERS) &&
-            !(tmthing->flags & MF_FLOAT))
-            return false;   // block monsters only
-
-        // villsa [STRIFE]
-        if ( ld->flags & ML_BLOCKFLOATERS && tmthing->flags & MF_FLOAT )
-            return false;   // block floaters only
-    }
-
-    // set openrange, opentop, openbottom
-    P_LineOpening (ld);	
-
-    // adjust floor / ceiling heights
-    if (opentop < tmceilingz)
-    {
-        tmceilingz = opentop;
-        ceilingline = ld;
-    }
-
-    if (openbottom > tmfloorz)
-        tmfloorz = openbottom;	
-
-    if (lowfloor < tmdropoffz)
-        tmdropoffz = lowfloor;
-
-    // if contacted a special line, add it to the list
-    if (ld->special)
-    {
-        spechit[numspechit] = ld;
-        numspechit++;
-
-        // fraggle: spechits overrun emulation code from prboom-plus
-        if (numspechit > MAXSPECIALCROSS_ORIGINAL)
-        {
-            SpechitOverrun(ld);
-        }
-    }
-
-    return true;
-}
-
-//
-// PIT_CheckThing
-//
-boolean PIT_CheckThing (mobj_t* thing)
-{
-    fixed_t             blockdist;
-    boolean             solid;
-    int                 damage;
-
-    if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE) ))
-        return true;
-
-    // don't clip against self
-    if (thing == tmthing)
-        return true;
-
-    blockdist = thing->radius + tmthing->radius;
-
-    if ( abs(thing->x - tmx) >= blockdist
-        || abs(thing->y - tmy) >= blockdist )
-    {
-        // didn't hit it
-        return true;	
-    }
-
-    // villsa [STRIFE] see if it went over / under
-    if(thing->height + thing->z < tmthing->z)
-        return true;    // overhead
-
-    // villsa [STRIFE] see if it went over / under
-    if (tmthing->z + tmthing->height < thing->z)
-        return true;    // underneath
-
-    // villsa [STRIFE] unused
-    // check for skulls slamming into things (removed)
-
-    // missiles can hit other things
-    if (tmthing->flags & MF_MISSILE)
-    {
-        // villsa [STRIFE] code to check over/under clipping moved to the beginning of the 
-        // function, so that it applies to everything.
-
-        // villsa [STRIFE] updated to strife version
-        if (tmthing->target && (tmthing->target->type == thing->type))
-        {
-            // Don't hit same species as originator.
-            if (thing == tmthing->target)
-                return true;
-
-            // sdh: Add deh_species_infighting here.  We can override the
-            // "monsters of the same species cant hurt each other" behavior
-            // through dehacked patches
-
-            if (thing->type != MT_PLAYER && !deh_species_infighting)
-            {
-                // Explode, but do no damage.
-                // Let players missile other players.
-                return false;
-            }
-        }
-
-        if (!(thing->flags & MF_SHOOTABLE))
-        {
-            // didn't do any damage
-            return !(thing->flags & MF_SOLID);
-        }
-
-        // haleyjd 09/01/10: [STRIFE] Spectral check:
-        // Missiles cannot hit SPECTRAL entities unless the missiles are also
-        // flagged as SPECTRAL.
-        if (thing->flags & MF_SPECTRAL && !(tmthing->flags & MF_SPECTRAL))
-            return true; // keep going
-
-        // damage / explode
-        // haleyjd 09/01/10: [STRIFE] Modified missile damage formula
-        damage = ((P_Random()&3)+1)*tmthing->info->damage;
-        P_DamageMobj (thing, tmthing, tmthing->target, damage);
-
-        // don't traverse any more
-        return false;
-    }
-    
-    // check for special pickup
-    if (thing->flags & MF_SPECIAL)
-    {
-        solid = (thing->flags & MF_SOLID) != 0;
-        if (tmthing->player) // villsa [STRIFE] no longer checks MF_PICKUP flag
-        {
-            // can remove thing
-            P_TouchSpecialThing (thing, tmthing);
-        }
-        return !solid;
-    }
-
-    return !(thing->flags & MF_SOLID);
-}
-
-
-//
-// MOVEMENT CLIPPING
-//
-
-//
-// P_CheckPosition
-// This is purely informative, nothing is modified
-// (except things picked up).
-// 
-// in:
-//  a mobj_t (can be valid or invalid)
-//  a position to be checked
-//   (doesn't need to be related to the mobj_t->x,y)
-//
-// during:
-//  special things are touched if MF_PICKUP
-//  early out on solid lines?
-//
-// out:
-//  newsubsec
-//  floorz
-//  ceilingz
-//  tmdropoffz
-//   the lowest point contacted
-//   (monsters won't move to a dropoff)
-//  speciallines[]
-//  numspeciallines
-//
-// haleyjd 20110203:
-// [STRIFE] Modified to clear blockingline in advance of P_BlockLinesIterator
-//
-boolean
-P_CheckPosition
-( mobj_t*   thing,
-  fixed_t   x,
-  fixed_t   y )
-{
-    int             xl;
-    int             xh;
-    int             yl;
-    int             yh;
-    int             bx;
-    int             by;
-    subsector_t*    newsubsec;
-
-    tmthing = thing;
-    tmflags = thing->flags;
-
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    newsubsec = R_PointInSubsector (x,y);
-    
-    // [STRIFE] clear blockingline (see P_XYMovement, P_BlockLinesIterator)
-    blockingline = NULL;
-    ceilingline  = NULL;
-    
-    // The base floor / ceiling is from the subsector
-    // that contains the point.
-    // Any contacted lines the step closer together
-    // will adjust them.
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-
-    validcount++;
-    numspechit = 0;
-
-    if ( tmflags & MF_NOCLIP )
-        return true;
-    
-    // Check things first, possibly picking things up.
-    // The bounding box is extended by MAXRADIUS
-    // because mobj_ts are grouped into mapblocks
-    // based on their origin point, and can overlap
-    // into adjacent blocks by up to MAXRADIUS units.
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
-
-    for (bx=xl ; bx<=xh ; bx++)
-        for (by=yl ; by<=yh ; by++)
-            if (!P_BlockThingsIterator(bx,by,PIT_CheckThing))
-                return false;
-    
-    // check lines
-    xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
-
-    for (bx=xl ; bx<=xh ; bx++)
-        for (by=yl ; by<=yh ; by++)
-            if (!P_BlockLinesIterator (bx,by,PIT_CheckLine))
-                return false;
-
-    return true;
-}
-
-
-//
-// P_TryMove
-// Attempt to move to a new position,
-// crossing special lines unless MF_TELEPORT is set.
-//
-boolean
-P_TryMove
-( mobj_t*	thing,
-  fixed_t	x,
-  fixed_t	y )
-{
-    fixed_t oldx;
-    fixed_t oldy;
-    int     side;
-    int     oldside;
-    line_t* ld;
-
-    floatok = false;
-    if (!P_CheckPosition (thing, x, y))
-        return false;       // solid wall or thing
-
-    if ( !(thing->flags & MF_NOCLIP) )
-    {
-        if (tmceilingz - tmfloorz < thing->height)
-            return false;   // doesn't fit
-
-        floatok = true;
-
-        // villsa [STRIFE] Removed MF_TELEPORT
-        if (tmceilingz - thing->z < thing->height)
-            return false;       // mobj must lower itself to fit
-
-        // villsa [STRIFE] non-robots are limited to 16 unit step height
-        if ((thing->flags & MF_NOBLOOD) == 0 && tmfloorz - thing->z > (16*FRACUNIT))
-            return false;
-        if (tmfloorz - thing->z > 24*FRACUNIT)
-            return false;       // too big a step up
-
-        // villsa [STRIFE] special case for missiles
-        if((thing->flags & MF_MISSILE) && tmfloorz - thing->z > 4*FRACUNIT)
-            return false;
-
-        // haleyjd 20110204 [STRIFE]: dropoff height changed 24 -> 32
-        if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT))
-            && tmfloorz - tmdropoffz > 32*FRACUNIT ) 
-            return false;       // don't stand over a dropoff
-    }
-    
-    // the move is ok,
-    // so link the thing into its new position
-    P_UnsetThingPosition (thing);
-
-    oldx = thing->x;
-    oldy = thing->y;
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-    thing->x = x;
-    thing->y = y;
-
-    P_SetThingPosition (thing);
-    
-    // if any special lines were hit, do the effect
-    if (! (thing->flags&MF_NOCLIP) ) // villsa [STRIFE] MF_TELEPORT not used
-    {
-        while (numspechit--)
-        {
-            // see if the line was crossed
-            ld = spechit[numspechit];
-            side = P_PointOnLineSide (thing->x, thing->y, ld);
-            oldside = P_PointOnLineSide (oldx, oldy, ld);
-            if (side != oldside)
-            {
-                if (ld->special)
-                    P_CrossSpecialLine (ld-lines, oldside, thing);
-            }
-        }
-    }
-
-    return true;
-}
-
-//
-// P_CheckPositionZ
-//
-// villsa [STRIFE] new function
-// Check colliding things on top of one another; ie., 3D Object Clipping
-//
-boolean P_CheckPositionZ(mobj_t* thing, fixed_t height)
-{
-    fixed_t         x;
-    fixed_t         y;
-    fixed_t         z;
-    int             xl;
-    int             xh;
-    int             yl;
-    int             yh;
-    int             bx;
-    int             by;
-    subsector_t*    newsubsec;
-
-    x = thing->x;
-    y = thing->y;
-    z = thing->z;
-
-    thing->z = height;
-
-    tmthing = thing;
-    tmflags = thing->flags;
-    tmx = x;
-    tmy = y;
-
-    tmbbox[BOXTOP] = y + tmthing->radius;
-    tmbbox[BOXBOTTOM] = y - tmthing->radius;
-    tmbbox[BOXRIGHT] = x + tmthing->radius;
-    tmbbox[BOXLEFT] = x - tmthing->radius;
-
-    ceilingline = 0;
-    newsubsec = thing->subsector;
-
-    // The base floor / ceiling is from the subsector
-    // that contains the point.
-    // Any contacted lines the step closer together
-    // will adjust them.
-
-    tmfloorz = tmdropoffz = newsubsec->sector->floorheight;
-    tmceilingz = newsubsec->sector->ceilingheight;
-
-    if(tmflags & MF_NOCLIP)
-        return true;
-
-    // Check things first, possibly picking things up.
-    // The bounding box is extended by MAXRADIUS
-    // because mobj_ts are grouped into mapblocks
-    // based on their origin point, and can overlap
-    // into adjacent blocks by up to MAXRADIUS units.
-
-    xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
-    xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
-    yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
-    yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
-
-    for(bx = xl; bx <= xh; bx++)
-    {
-        for(by = yl; by <= yh; by++)
-        {
-            if(!P_BlockThingsIterator(bx, by, PIT_CheckThing))
-            {
-                tmthing->z = z;
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-
-//
-// P_ThingHeightClip
-// Takes a valid thing and adjusts the thing->floorz,
-// thing->ceilingz, and possibly thing->z.
-// This is called for all nearby monsters
-// whenever a sector changes height.
-// If the thing doesn't fit,
-// the z will be set to the lowest value
-// and false will be returned.
-//
-// [STRIFE] Verified unmodified
-//
-boolean P_ThingHeightClip (mobj_t* thing)
-{
-    boolean     onfloor;
-
-    onfloor = (thing->z == thing->floorz);
-
-    P_CheckPosition (thing, thing->x, thing->y);
-    // what about stranding a monster partially off an edge?
-
-    thing->floorz = tmfloorz;
-    thing->ceilingz = tmceilingz;
-
-    if (onfloor)
-    {
-        // walking monsters rise and fall with the floor
-        thing->z = thing->floorz;
-    }
-    else
-    {
-        // don't adjust a floating monster unless forced to
-        if (thing->z+thing->height > thing->ceilingz)
-            thing->z = thing->ceilingz - thing->height;
-    }
-
-    if (thing->ceilingz - thing->floorz < thing->height)
-        return false;
-
-    return true;
-}
-
-
-
-//
-// SLIDE MOVE
-// Allows the player to slide along any angled walls.
-//
-fixed_t		bestslidefrac;
-fixed_t		secondslidefrac;
-
-line_t*		bestslideline;
-line_t*		secondslideline;
-
-mobj_t*		slidemo;
-
-fixed_t		tmxmove;
-fixed_t		tmymove;
-
-
-
-//
-// P_HitSlideLine
-// Adjusts the xmove / ymove
-// so that the next move will slide along the wall.
-//
-// [STRIFE] Verified unmodified
-//
-void P_HitSlideLine (line_t* ld)
-{
-    int         side;
-
-    angle_t     lineangle;
-    angle_t     moveangle;
-    angle_t     deltaangle;
-
-    fixed_t     movelen;
-    fixed_t     newlen;
-
-
-    if (ld->slopetype == ST_HORIZONTAL)
-    {
-        tmymove = 0;
-        return;
-    }
-
-    if (ld->slopetype == ST_VERTICAL)
-    {
-        tmxmove = 0;
-        return;
-    }
-
-    side = P_PointOnLineSide (slidemo->x, slidemo->y, ld);
-
-    lineangle = R_PointToAngle2 (0,0, ld->dx, ld->dy);
-
-    if (side == 1)
-        lineangle += ANG180;
-
-    moveangle = R_PointToAngle2 (0,0, tmxmove, tmymove);
-    deltaangle = moveangle-lineangle;
-
-    if (deltaangle > ANG180)
-        deltaangle += ANG180;
-    //  I_Error ("SlideLine: ang>ANG180");
-
-    lineangle >>= ANGLETOFINESHIFT;
-    deltaangle >>= ANGLETOFINESHIFT;
-
-    movelen = P_AproxDistance (tmxmove, tmymove);
-    newlen = FixedMul (movelen, finecosine[deltaangle]);
-
-    tmxmove = FixedMul (newlen, finecosine[lineangle]);	
-    tmymove = FixedMul (newlen, finesine[lineangle]);	
-}
-
-
-//
-// PTR_SlideTraverse
-//
-// [STRIFE] Modified for smaller step-up height
-//
-boolean PTR_SlideTraverse (intercept_t* in)
-{
-    line_t* li;
-
-    if (!in->isaline)
-        I_Error ("PTR_SlideTraverse: not a line?");
-
-    li = in->d.line;
-
-    if ( ! (li->flags & ML_TWOSIDED) )
-    {
-        if (P_PointOnLineSide (slidemo->x, slidemo->y, li))
-        {
-            // don't hit the back side
-            return true;
-        }
-        goto isblocking;
-    }
-
-    // set openrange, opentop, openbottom
-    P_LineOpening (li);
-
-    if (openrange < slidemo->height)
-        goto isblocking;        // doesn't fit
-
-    if (opentop - slidemo->z < slidemo->height)
-        goto isblocking;        // mobj is too high
-
-    // villsa [STRIFE] change from 24 to 16
-    if (openbottom - slidemo->z > 16*FRACUNIT )
-        goto isblocking;        // too big a step up
-
-    // this line doesn't block movement
-    return true;
-
-    // the line does block movement,
-    // see if it is closer than best so far
-isblocking:
-    if (in->frac < bestslidefrac)
-    {
-        secondslidefrac = bestslidefrac;
-        secondslideline = bestslideline;
-        bestslidefrac = in->frac;
-        bestslideline = li;
-    }
-
-    return false;   // stop
-}
-
-
-
-//
-// P_SlideMove
-// The momx / momy move is bad, so try to slide
-// along a wall.
-// Find the first line hit, move flush to it,
-// and slide along it
-//
-// This is a kludgy mess.
-//
-// [STRIFE] Verified unmodified
-//
-void P_SlideMove (mobj_t* mo)
-{
-    fixed_t     leadx;
-    fixed_t     leady;
-    fixed_t     trailx;
-    fixed_t     traily;
-    fixed_t     newx;
-    fixed_t     newy;
-    int         hitcount;
-
-    slidemo = mo;
-    hitcount = 0;
-    
-retry:
-    if (++hitcount == 3)
-        goto stairstep;     // don't loop forever
-
-    // trace along the three leading corners
-    if (mo->momx > 0)
-    {
-        leadx = mo->x + mo->radius;
-        trailx = mo->x - mo->radius;
-    }
-    else
-    {
-        leadx = mo->x - mo->radius;
-        trailx = mo->x + mo->radius;
-    }
-
-    if (mo->momy > 0)
-    {
-        leady = mo->y + mo->radius;
-        traily = mo->y - mo->radius;
-    }
-    else
-    {
-        leady = mo->y - mo->radius;
-        traily = mo->y + mo->radius;
-    }
-
-    bestslidefrac = FRACUNIT+1;
-
-    P_PathTraverse ( leadx, leady, leadx+mo->momx, leady+mo->momy,
-                     PT_ADDLINES, PTR_SlideTraverse );
-    P_PathTraverse ( trailx, leady, trailx+mo->momx, leady+mo->momy,
-                     PT_ADDLINES, PTR_SlideTraverse );
-    P_PathTraverse ( leadx, traily, leadx+mo->momx, traily+mo->momy,
-                     PT_ADDLINES, PTR_SlideTraverse );
-    
-    // move up to the wall
-    if (bestslidefrac == FRACUNIT+1)
-    {
-        // the move most have hit the middle, so stairstep
-stairstep:
-        if (!P_TryMove (mo, mo->x, mo->y + mo->momy))
-            P_TryMove (mo, mo->x + mo->momx, mo->y);
-        return;
-    }
-
-    // fudge a bit to make sure it doesn't hit
-    bestslidefrac -= 0x800;
-    if (bestslidefrac > 0)
-    {
-        newx = FixedMul (mo->momx, bestslidefrac);
-        newy = FixedMul (mo->momy, bestslidefrac);
-
-        if (!P_TryMove (mo, mo->x+newx, mo->y+newy))
-            goto stairstep;
-    }
-    
-    // Now continue along the wall.
-    // First calculate remainder.
-    bestslidefrac = FRACUNIT-(bestslidefrac+0x800);
-
-    if (bestslidefrac > FRACUNIT)
-        bestslidefrac = FRACUNIT;
-
-    if (bestslidefrac <= 0)
-        return;
-
-    tmxmove = FixedMul (mo->momx, bestslidefrac);
-    tmymove = FixedMul (mo->momy, bestslidefrac);
-
-    P_HitSlideLine (bestslideline); // clip the moves
-
-    mo->momx = tmxmove;
-    mo->momy = tmymove;
-
-    if (!P_TryMove (mo, mo->x+tmxmove, mo->y+tmymove))
-    {
-        goto retry;
-    }
-}
-
-
-//
-// P_LineAttack
-//
-mobj_t*		linetarget;	// who got hit (or NULL)
-mobj_t*		shootthing;
-
-// Height if not aiming up or down
-// ???: use slope for monsters?
-fixed_t		shootz;	
-
-int		la_damage;
-fixed_t		attackrange;
-
-fixed_t		aimslope;
-
-
-//
-// PTR_AimTraverse
-// Sets linetaget and aimslope when a target is aimed at.
-//
-// [STRIFE] Verified unmodified
-//
-boolean
-PTR_AimTraverse (intercept_t* in)
-{
-    line_t*     li;
-    mobj_t*     th;
-    fixed_t     slope;
-    fixed_t     thingtopslope;
-    fixed_t     thingbottomslope;
-    fixed_t     dist;
-
-    if (in->isaline)
-    {
-        li = in->d.line;
-
-        if ( !(li->flags & ML_TWOSIDED) )
-            return false;       // stop
-
-        // Crosses a two sided line.
-        // A two sided line will restrict
-        // the possible target ranges.
-        P_LineOpening (li);
-
-        if (openbottom >= opentop)
-            return false;       // stop
-
-        dist = FixedMul (attackrange, in->frac);
-
-        // Return false if there is no back sector.  This should never
-        // be the case if the line is two-sided; however, some WADs
-        // (eg. ottawau.wad) use this as an "impassible glass" trick
-        // and rely on Vanilla Doom's (unintentional) support for this.
-
-        if (li->backsector == NULL)
-        {
-            return false;
-        }
-
-        if (li->frontsector->floorheight != li->backsector->floorheight)
-        {
-            slope = FixedDiv (openbottom - shootz , dist);
-            if (slope > bottomslope)
-                bottomslope = slope;
-        }
-
-        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-        {
-            slope = FixedDiv (opentop - shootz , dist);
-            if (slope < topslope)
-                topslope = slope;
-        }
-
-        if (topslope <= bottomslope)
-            return false;       // stop
-
-        return true;            // shot continues
-    }
-
-    // shoot a thing
-    th = in->d.thing;
-    if (th == shootthing)
-        return true;            // can't shoot self
-
-    if (!(th->flags&MF_SHOOTABLE))
-        return true;            // corpse or something
-
-    // check angles to see if the thing can be aimed at
-    dist = FixedMul (attackrange, in->frac);
-    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
-
-    if (thingtopslope < bottomslope)
-        return true;            // shot over the thing
-
-    thingbottomslope = FixedDiv (th->z - shootz, dist);
-
-    if (thingbottomslope > topslope)
-        return true;            // shot under the thing
-
-    // this thing can be hit!
-    if (thingtopslope > topslope)
-        thingtopslope = topslope;
-
-    if (thingbottomslope < bottomslope)
-        thingbottomslope = bottomslope;
-
-    aimslope = (thingtopslope+thingbottomslope)/2;
-    linetarget = th;
-
-    return false;               // don't go any farther
-}
-
-
-//
-// PTR_ShootTraverse
-//
-// [STRIFE] Changes for Spectres and Mauler puff/damage inflictor
-//
-boolean PTR_ShootTraverse (intercept_t* in)
-{
-    fixed_t             x;
-    fixed_t             y;
-    fixed_t             z;
-    fixed_t             frac;
-
-    line_t*             li;
-
-    mobj_t*             th;
-    mobj_t*             th2;    // villsa [STRIFE]
-
-    fixed_t             slope;
-    fixed_t             dist;
-    fixed_t             thingtopslope;
-    fixed_t             thingbottomslope;
-
-    if (in->isaline)
-    {
-        li = in->d.line;
-
-        if (li->special)
-            P_ShootSpecialLine (shootthing, li);
-
-        if ( !(li->flags & ML_TWOSIDED) )
-            goto hitline;
-
-        // crosses a two sided line
-        P_LineOpening (li);
-
-        dist = FixedMul (attackrange, in->frac);
-
-        // Check if backsector is NULL.  See comment in PTR_AimTraverse.
-
-        if (li->backsector == NULL)
-        {
-            goto hitline;
-        }
-
-        if (li->frontsector->floorheight != li->backsector->floorheight)
-        {
-            slope = FixedDiv (openbottom - shootz , dist);
-            if (slope > aimslope)
-                goto hitline;
-        }
-
-        if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
-        {
-            slope = FixedDiv (opentop - shootz , dist);
-            if (slope < aimslope)
-                goto hitline;
-        }
-
-        // shot continues
-        return true;
-
-
-        // hit line
-hitline:
-        // position a bit closer
-        frac = in->frac - FixedDiv (4*FRACUNIT,attackrange);
-        x = trace.x + FixedMul (trace.dx, frac);
-        y = trace.y + FixedMul (trace.dy, frac);
-        z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
-
-        if (li->frontsector->ceilingpic == skyflatnum)
-        {
-            // don't shoot the sky!
-            if (z > li->frontsector->ceilingheight)
-                return false;
-
-            // it's a sky hack wall
-            if	(li->backsector && li->backsector->ceilingpic == skyflatnum)
-                return false;
-        }
-
-        // villsa [STRIFE]
-        if(la_damage > 0)
-        {
-            // villsa [STRIFE] Test against Mauler attack range
-            if(attackrange != 2112*FRACUNIT)
-                P_SpawnPuff(x, y, z); // Spawn bullet puffs.
-            else
-                P_SpawnMobj(x, y, z, MT_STRIFEPUFF3);
-        }
-        
-        // don't go any farther
-        return false;	
-    }
-
-    // shoot a thing
-    th = in->d.thing;
-    if (th == shootthing)
-        return true;        // can't shoot self
-
-    if (!(th->flags&MF_SHOOTABLE))
-        return true;        // corpse or something
-
-    // haleyjd 09/18/10: [STRIFE] Corrected - not MVIS, but SPECTRAL.
-    if(th->flags & MF_SPECTRAL)
-        return true;        // is a spectral entity
-
-    // check angles to see if the thing can be aimed at
-    dist = FixedMul (attackrange, in->frac);
-    thingtopslope = FixedDiv (th->z+th->height - shootz , dist);
-
-    if (thingtopslope < aimslope)
-        return true;        // shot over the thing
-
-    thingbottomslope = FixedDiv (th->z - shootz, dist);
-
-    if (thingbottomslope > aimslope)
-        return true;        // shot under the thing
-
-    // hit thing
-    // position a bit closer
-    frac = in->frac - FixedDiv (10*FRACUNIT,attackrange);
-
-    x = trace.x + FixedMul (trace.dx, frac);
-    y = trace.y + FixedMul (trace.dy, frac);
-    z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
-
-    // villsa [STRIFE] Check for Mauler attack range
-    if(attackrange == 2112*FRACUNIT)
-    {
-        th2 = P_SpawnMobj(x, y, z, MT_STRIFEPUFF3);
-        th2->momz = -FRACUNIT;
-        P_DamageMobj(th, th2, shootthing, la_damage);
-        return false;
-    }
-
-    // villsa [STRIFE] disabled check for damage
-    //if (la_damage)
-    P_DamageMobj (th, shootthing, shootthing, la_damage);
-
-    // Spawn bullet puffs or blod spots,
-    // depending on target type.
-    if (in->d.thing->flags & MF_NOBLOOD)
-        P_SpawnSparkPuff(x, y, z);  // villsa [STRIFE] call spark puff function instead
-    else
-        P_SpawnBlood (x,y,z, la_damage);
-
-    // don't go any farther
-    return false;
-
-}
-
-
-//
-// P_AimLineAttack
-//
-// [STRIFE] Modified to support player->pitch
-//
-fixed_t
-P_AimLineAttack
-( mobj_t*	t1,
-  angle_t	angle,
-  fixed_t	distance )
-{
-    fixed_t     x2;
-    fixed_t     y2;
-
-    t1 = P_SubstNullMobj(t1);
-
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    
-    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
-    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
-    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
-
-    // can't shoot outside view angles
-    topslope = 100*FRACUNIT/160;	
-    bottomslope = -100*FRACUNIT/160;
-    
-    attackrange = distance;
-    linetarget = NULL;
-
-    P_PathTraverse ( t1->x, t1->y,
-                     x2, y2,
-                     PT_ADDLINES|PT_ADDTHINGS,
-                     PTR_AimTraverse );
-
-    if (linetarget)
-        return aimslope;
-    else    // villsa [STRIFE] checks for player pitch
-    {
-        if(t1->player)
-            return (t1->player->pitch << FRACBITS) / 160;
-    }
-
-    return 0;
-}
- 
-
-//
-// P_LineAttack
-// If damage == 0, it is just a test trace
-// that will leave linetarget set.
-//
-// [STRIFE] Modified to check lines only if damage <= 0 (see P_RadiusAttack)
-//
-void
-P_LineAttack
-( mobj_t*       t1,
-  angle_t       angle,
-  fixed_t       distance,
-  fixed_t       slope,
-  int	        damage )
-{
-    fixed_t     x2;
-    fixed_t     y2;
-    int         traverseflags;
-
-    angle >>= ANGLETOFINESHIFT;
-    shootthing = t1;
-    la_damage = damage;
-    x2 = t1->x + (distance>>FRACBITS)*finecosine[angle];
-    y2 = t1->y + (distance>>FRACBITS)*finesine[angle];
-    shootz = t1->z + (t1->height>>1) + 8*FRACUNIT;
-    attackrange = distance;
-    aimslope = slope;
-
-    // villsa [STRIFE] test lines only if damage is <= 0
-    if(damage >= 1)
-        traverseflags = (PT_ADDLINES|PT_ADDTHINGS);
-    else
-        traverseflags = PT_ADDLINES;
-
-    P_PathTraverse(t1->x, t1->y,
-                   x2, y2,
-                   traverseflags,
-                   PTR_ShootTraverse);
-}
- 
-
-
-//
-// USE LINES
-//
-// [STRIFE] Verified unmodified
-//
-mobj_t*     usething;
-
-boolean PTR_UseTraverse (intercept_t* in)
-{
-    int     side;
-
-    if (!in->d.line->special)
-    {
-        P_LineOpening (in->d.line);
-        if (openrange <= 0)
-        {
-            S_StartSound (usething, sfx_noway);
-
-            // can't use through a wall
-            return false;
-        }
-        // not a special line, but keep checking
-        return true ;
-    }
-
-    side = 0;
-    if (P_PointOnLineSide (usething->x, usething->y, in->d.line) == 1)
-        side = 1;
-
-    //  return false;       // don't use back side
-
-    P_UseSpecialLine (usething, in->d.line, side);
-
-    // can't use for than one special line in a row
-    return false;
-}
-
-
-//
-// P_UseLines
-// Looks for special lines in front of the player to activate.
-//
-// [STRIFE] Verified unmodified
-//
-void P_UseLines (player_t*	player)
-{
-    int     angle;
-    fixed_t x1;
-    fixed_t y1;
-    fixed_t x2;
-    fixed_t y2;
-
-    usething = player->mo;
-
-    angle = player->mo->angle >> ANGLETOFINESHIFT;
-
-    x1 = player->mo->x;
-    y1 = player->mo->y;
-    x2 = x1 + (USERANGE>>FRACBITS)*finecosine[angle];
-    y2 = y1 + (USERANGE>>FRACBITS)*finesine[angle];
-
-    P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse );
-}
-
-
-//
-// RADIUS ATTACK
-//
-mobj_t*     bombsource;
-mobj_t*     bombspot;
-int         bombdamage;
-
-
-//
-// PIT_RadiusAttack
-// "bombsource" is the creature
-// that caused the explosion at "bombspot".
-//
-// [STRIFE] Modified for Spectral and Inquisitor exclusions
-//
-boolean PIT_RadiusAttack (mobj_t* thing)
-{
-    fixed_t dx;
-    fixed_t dy;
-    fixed_t dist;
-
-    if (!(thing->flags & MF_SHOOTABLE))
-        return true;
-
-    // haleyjd 10/04/10: Spectrals are not damaged by blast radii
-    if(thing->flags & MF_SPECTRAL)
-        return true;
-
-    // Boss spider and cyborg
-    // take no damage from concussion.
-    // villsa [STRIFE] unused
-    // - haleyjd: INQUISITOR
-
-    if(thing->type == MT_INQUISITOR)
-        return true;
-
-    dx = abs(thing->x - bombspot->x);
-    dy = abs(thing->y - bombspot->y);
-
-    dist = dx>dy ? dx : dy;
-    dist = (dist - thing->radius) >> FRACBITS;
-
-    if (dist < 0)
-        dist = 0;
-
-    if (dist >= bombdamage)
-        return true;        // out of range
-
-    if ( P_CheckSight (thing, bombspot) )
-    {
-        // must be in direct path
-        P_DamageMobj (thing, bombspot, bombsource, bombdamage - dist);
-    }
-
-    return true;
-}
-
-
-//
-// P_RadiusAttack
-// Source is the creature that caused the explosion at spot.
-//
-// [STRIFE] Modified to emit "test" tracers which can shatter glass screens
-//          and windows.
-//
-void
-P_RadiusAttack
-( mobj_t*       spot,
-  mobj_t*       source,
-  int           damage )
-{
-    int         x;
-    int         y;
-    
-    int         xl;
-    int         xh;
-    int         yl;
-    int         yh;
-    
-    fixed_t     dist;
-
-    dist = (damage+MAXRADIUS)<<FRACBITS;
-    yh = (spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
-    yl = (spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
-    xh = (spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
-    xl = (spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
-    bombspot = spot;
-    bombsource = source;
-    bombdamage = damage;
-
-    for (y=yl ; y<=yh ; y++)
-        for (x=xl ; x<=xh ; x++)
-            P_BlockThingsIterator (x, y, PIT_RadiusAttack );
-
-    // villsa [STRIFE] Send out 0 damage tracers to shatter nearby glass.
-    spot->z += 32*FRACUNIT;
-    P_LineAttack(spot, 0,      dist, 1, 0);
-    P_LineAttack(spot, ANG90,  dist, 1, 0);
-    P_LineAttack(spot, ANG180, dist, 1, 0);
-    P_LineAttack(spot, ANG270, dist, 1, 0);
-    spot->z -= 32*FRACUNIT;
-}
-
-
-
-//
-// SECTOR HEIGHT CHANGING
-// After modifying a sectors floor or ceiling height,
-// call this routine to adjust the positions
-// of all things that touch the sector.
-//
-// If anything doesn't fit anymore, true will be returned.
-// If crunch is true, they will take damage
-//  as they are being crushed.
-// If Crunch is false, you should set the sector height back
-//  the way it was and call P_ChangeSector again
-//  to undo the changes.
-//
-boolean		crushchange;
-boolean		nofit;
-
-
-//
-// PIT_ChangeSector
-//
-// [STRIFE] Changes to crushing behavior
-//
-boolean PIT_ChangeSector (mobj_t*   thing)
-{
-    mobj_t*	mo;
-
-    if (P_ThingHeightClip (thing))
-    {
-        // keep checking
-        return true;
-    }
-
-    // crunch bodies to giblets
-    if (thing->health <= 0)
-    {
-        // villsa [STRIFE] do something with the player
-        if(thing->player && thing->subsector->sector->specialdata)
-        {
-            nofit = true;
-            return false;
-        }
-        //P_SetMobjState (thing, S_GIBS);   // villsa [STRIFE] unused
-
-        A_BodyParts(thing); // villsa [STRIFE] spit out meat/junk stuff
-        thing->flags &= ~MF_SOLID;
-        thing->height = 0;
-        thing->radius = 0;
-
-        // keep checking
-        return true;
-    }
-
-    // crunch dropped items
-    if (thing->flags & MF_DROPPED)
-    {
-        P_RemoveMobj (thing);
-
-        // keep checking
-        return true;
-    }
-
-    if (! (thing->flags & MF_SHOOTABLE) )
-    {
-        // assume it is bloody gibs or something
-        return true;
-    }
-    
-    nofit = true;
-
-    if (crushchange && !(leveltime&3) )
-    {
-        int t;
-        S_StartSound(thing, sfx_pcrush);   // villsa [STRIFE]
-        P_DamageMobj(thing,NULL,NULL,10);
-
-        // spray blood in a random direction
-        mo = P_SpawnMobj (thing->x,
-                          thing->y,
-                          thing->z + thing->height/2, MT_BLOOD_DEATH);
-
-        t = P_Random();
-        mo->momx = (t - P_Random ()) << 12;
-        t = P_Random();
-        mo->momy = (t - P_Random ()) << 12;
-    }
-
-    // keep checking (crush other things)
-    return true;
-}
-
-
-
-//
-// P_ChangeSector
-//
-// [STRIFE] Verified unmodified
-//
-boolean
-P_ChangeSector
-( sector_t* sector,
-  boolean   crunch )
-{
-    int     x;
-    int     y;
-
-    nofit = false;
-    crushchange = crunch;
-
-    // re-check heights for all things near the moving sector
-    for (x=sector->blockbox[BOXLEFT] ; x<= sector->blockbox[BOXRIGHT] ; x++)
-        for (y=sector->blockbox[BOXBOTTOM];y<= sector->blockbox[BOXTOP] ; y++)
-            P_BlockThingsIterator (x, y, PIT_ChangeSector);
-
-    return nofit;
-}
-
-// Code to emulate the behavior of Vanilla Doom when encountering an overrun
-// of the spechit array.  This is by Andrey Budko (e6y) and comes from his
-// PrBoom plus port.  A big thanks to Andrey for this.
-
-static void SpechitOverrun(line_t *ld)
-{
-    static unsigned int baseaddr = 0;
-    unsigned int addr;
-   
-    if (baseaddr == 0)
-    {
-        int p;
-
-        // This is the first time we have had an overrun.  Work out
-        // what base address we are going to use.
-        // Allow a spechit value to be specified on the command line.
-
-        //!
-        // @category compat
-        // @arg <n>
-        //
-        // Use the specified magic value when emulating spechit overruns.
-        //
-
-        p = M_CheckParmWithArgs("-spechit", 1);
-        
-        if (p > 0)
-        {
-            M_StrToInt(myargv[p+1], (int *) &baseaddr);
-        }
-        else
-        {
-            baseaddr = DEFAULT_SPECHIT_MAGIC;
-        }
-    }
-    
-    // Calculate address used in doom2.exe
-
-    addr = baseaddr + (ld - lines) * 0x3E;
-
-    switch(numspechit)
-    {
-        case 9: 
-        case 10:
-        case 11:
-        case 12:
-            tmbbox[numspechit-9] = addr;
-            break;
-        case 13: 
-            nofit = addr; // haleyjd 20110204: nofit/crushchange are in opposite 
-            break;        // order in the Strife binary.
-        case 14: 
-            crushchange = addr; 
-            break;
-        default:
-            fprintf(stderr, "SpechitOverrun: Warning: unable to emulate"
-                            "an overrun where numspechit=%i\n",
-                            numspechit);
-            break;
-    }
-}
-
diff --git a/games/NXDoom/src/strife/p_maputl.c b/games/NXDoom/src/strife/p_maputl.c
deleted file mode 100644
index 78ae34712..000000000
--- a/games/NXDoom/src/strife/p_maputl.c
+++ /dev/null
@@ -1,1056 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-// Copyright(C) 2005, 2006 Andrey Budko
-//
-// 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.
-//
-// DESCRIPTION:
-//	Movement/collision utility functions,
-//	as used by function in p_map.c. 
-//	BLOCKMAP Iterator functions,
-//	and some PIT_* functions to use for iteration.
-//
-
-
-
-#include <stdlib.h>
-
-
-#include "m_bbox.h"
-#include "m_misc.h"
-
-#include "doomdef.h"
-#include "doomstat.h"
-#include "p_local.h"
-
-
-// State.
-#include "r_state.h"
-
-//
-// P_AproxDistance
-// Gives an estimation of distance (not exact)
-//
-// [STRIFE] Verified unmodified
-//
-fixed_t
-P_AproxDistance
-( fixed_t	dx,
-  fixed_t	dy )
-{
-    dx = abs(dx);
-    dy = abs(dy);
-    if (dx < dy)
-        return dx+dy-(dx>>1);
-    return dx+dy-(dy>>1);
-}
-
-
-//
-// P_PointOnLineSide
-// Returns 0 or 1
-//
-// [STRIFE] Verified unmodified
-//
-int
-P_PointOnLineSide
-( fixed_t	x,
-  fixed_t	y,
-  line_t*	line )
-{
-    fixed_t dx;
-    fixed_t dy;
-    fixed_t left;
-    fixed_t right;
-
-    if (!line->dx)
-    {
-        if (x <= line->v1->x)
-            return line->dy > 0;
-
-        return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-        if (y <= line->v1->y)
-            return line->dx < 0;
-
-        return line->dx > 0;
-    }
-
-    dx = (x - line->v1->x);
-    dy = (y - line->v1->y);
-
-    left = FixedMul ( line->dy>>FRACBITS , dx );
-    right = FixedMul ( dy , line->dx>>FRACBITS );
-
-    if (right < left)
-        return 0;       // front side
-    return 1;           // back side
-}
-
-
-
-//
-// P_BoxOnLineSide
-// Considers the line to be infinite
-// Returns side 0 or 1, -1 if box crosses the line.
-//
-// [STRIFE] Verified unmodified
-//
-int
-P_BoxOnLineSide
-( fixed_t*  tmbox,
-  line_t*   ld )
-{
-    int     p1 = 0;
-    int     p2 = 0;
-
-    switch (ld->slopetype)
-    {
-    case ST_HORIZONTAL:
-        p1 = tmbox[BOXTOP] > ld->v1->y;
-        p2 = tmbox[BOXBOTTOM] > ld->v1->y;
-        if (ld->dx < 0)
-        {
-            p1 ^= 1;
-            p2 ^= 1;
-        }
-        break;
-
-    case ST_VERTICAL:
-        p1 = tmbox[BOXRIGHT] < ld->v1->x;
-        p2 = tmbox[BOXLEFT] < ld->v1->x;
-        if (ld->dy < 0)
-        {
-            p1 ^= 1;
-            p2 ^= 1;
-        }
-        break;
-
-    case ST_POSITIVE:
-        p1 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXTOP], ld);
-        p2 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXBOTTOM], ld);
-        break;
-
-    case ST_NEGATIVE:
-        p1 = P_PointOnLineSide (tmbox[BOXRIGHT], tmbox[BOXTOP], ld);
-        p2 = P_PointOnLineSide (tmbox[BOXLEFT], tmbox[BOXBOTTOM], ld);
-        break;
-    }
-
-    if (p1 == p2)
-        return p1;
-    return -1;
-}
-
-
-//
-// P_PointOnDivlineSide
-// Returns 0 or 1.
-//
-// [STRIFE] Verified unmodified
-//
-int
-P_PointOnDivlineSide
-( fixed_t       x,
-  fixed_t       y,
-  divline_t*    line )
-{
-    fixed_t dx;
-    fixed_t dy;
-    fixed_t left;
-    fixed_t right;
-
-    if (!line->dx)
-    {
-        if (x <= line->x)
-            return line->dy > 0;
-
-        return line->dy < 0;
-    }
-    if (!line->dy)
-    {
-        if (y <= line->y)
-            return line->dx < 0;
-
-        return line->dx > 0;
-    }
-
-    dx = (x - line->x);
-    dy = (y - line->y);
-
-    // try to quickly decide by looking at sign bits
-    if ( (line->dy ^ line->dx ^ dx ^ dy)&0x80000000 )
-    {
-        if ( (line->dy ^ dx) & 0x80000000 )
-            return 1;		// (left is negative)
-        return 0;
-    }
-
-    left = FixedMul ( line->dy>>8, dx>>8 );
-    right = FixedMul ( dy>>8 , line->dx>>8 );
-
-    if (right < left)
-        return 0;		// front side
-    return 1;			// back side
-}
-
-
-
-//
-// P_MakeDivline
-//
-void
-P_MakeDivline
-( line_t*	li,
-  divline_t*	dl )
-{
-    dl->x = li->v1->x;
-    dl->y = li->v1->y;
-    dl->dx = li->dx;
-    dl->dy = li->dy;
-}
-
-
-
-//
-// P_InterceptVector
-// Returns the fractional intercept point
-// along the first divline.
-// This is only called by the addthings
-// and addlines traversers.
-//
-// [STRIFE] Verified unmodified
-//
-fixed_t
-P_InterceptVector
-( divline_t*    v2,
-  divline_t*    v1 )
-{
-#if 1
-    fixed_t frac;
-    fixed_t num;
-    fixed_t den;
-
-    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
-
-    if (den == 0)
-        return 0;
-    //  I_Error ("P_InterceptVector: parallel");
-
-    num =
-        FixedMul ( (v1->x - v2->x)>>8 ,v1->dy )
-        +FixedMul ( (v2->y - v1->y)>>8, v1->dx );
-
-    frac = FixedDiv (num , den);
-
-    return frac;
-#else	// UNUSED, float debug.
-    float	frac;
-    float	num;
-    float	den;
-    float	v1x;
-    float	v1y;
-    float	v1dx;
-    float	v1dy;
-    float	v2x;
-    float	v2y;
-    float	v2dx;
-    float	v2dy;
-
-    v1x = (float)v1->x/FRACUNIT;
-    v1y = (float)v1->y/FRACUNIT;
-    v1dx = (float)v1->dx/FRACUNIT;
-    v1dy = (float)v1->dy/FRACUNIT;
-    v2x = (float)v2->x/FRACUNIT;
-    v2y = (float)v2->y/FRACUNIT;
-    v2dx = (float)v2->dx/FRACUNIT;
-    v2dy = (float)v2->dy/FRACUNIT;
-	
-    den = v1dy*v2dx - v1dx*v2dy;
-
-    if (den == 0)
-	return 0;	// parallel
-    
-    num = (v1x - v2x)*v1dy + (v2y - v1y)*v1dx;
-    frac = num / den;
-
-    return frac*FRACUNIT;
-#endif
-}
-
-
-//
-// P_LineOpening
-// Sets opentop and openbottom to the window
-// through a two sided line.
-// OPTIMIZE: keep this precalculated
-//
-// [STRIFE] Verified unmodified
-//
-fixed_t opentop;
-fixed_t openbottom;
-fixed_t openrange;
-fixed_t	lowfloor;
-
-
-void P_LineOpening (line_t* linedef)
-{
-    sector_t*   front;
-    sector_t*   back;
-
-    if (linedef->sidenum[1] == -1)
-    {
-        // single sided line
-        openrange = 0;
-        return;
-    }
-
-    front = linedef->frontsector;
-    back = linedef->backsector;
-
-    if (front->ceilingheight < back->ceilingheight)
-        opentop = front->ceilingheight;
-    else
-        opentop = back->ceilingheight;
-
-    if (front->floorheight > back->floorheight)
-    {
-        openbottom = front->floorheight;
-        lowfloor = back->floorheight;
-    }
-    else
-    {
-        openbottom = back->floorheight;
-        lowfloor = front->floorheight;
-    }
-
-    openrange = opentop - openbottom;
-}
-
-
-//
-// THING POSITION SETTING
-//
-
-
-//
-// P_UnsetThingPosition
-// Unlinks a thing from block map and sectors.
-// On each position change, BLOCKMAP and other
-// lookups maintaining lists ot things inside
-// these structures need to be updated.
-//
-// [STRIFE] Verified unmodified
-//
-void P_UnsetThingPosition (mobj_t* thing)
-{
-    int     blockx;
-    int     blocky;
-
-    if ( ! (thing->flags & MF_NOSECTOR) )
-    {
-        // inert things don't need to be in blockmap?
-        // unlink from subsector
-        if (thing->snext)
-            thing->snext->sprev = thing->sprev;
-
-        if (thing->sprev)
-            thing->sprev->snext = thing->snext;
-        else
-            thing->subsector->sector->thinglist = thing->snext;
-    }
-
-    if ( ! (thing->flags & MF_NOBLOCKMAP) )
-    {
-        // inert things don't need to be in blockmap
-        // unlink from block map
-        if (thing->bnext)
-            thing->bnext->bprev = thing->bprev;
-
-        if (thing->bprev)
-            thing->bprev->bnext = thing->bnext;
-        else
-        {
-            blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
-            blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
-
-            if (blockx>=0 && blockx < bmapwidth
-                && blocky>=0 && blocky <bmapheight)
-            {
-                blocklinks[blocky*bmapwidth+blockx] = thing->bnext;
-            }
-        }
-    }
-}
-
-
-//
-// P_SetThingPosition
-// Links a thing into both a block and a subsector
-// based on it's x y.
-// Sets thing->subsector properly
-//
-// [STRIFE] Verified unmodified
-//
-void
-P_SetThingPosition (mobj_t* thing)
-{
-    subsector_t*    ss;
-    sector_t*       sec;
-    int             blockx;
-    int             blocky;
-    mobj_t**        link;
-
-
-    // link into subsector
-    ss = R_PointInSubsector (thing->x,thing->y);
-    thing->subsector = ss;
-
-    if ( ! (thing->flags & MF_NOSECTOR) )
-    {
-        // invisible things don't go into the sector links
-        sec = ss->sector;
-
-        thing->sprev = NULL;
-        thing->snext = sec->thinglist;
-
-        if (sec->thinglist)
-            sec->thinglist->sprev = thing;
-
-        sec->thinglist = thing;
-    }
-
-
-    // link into blockmap
-    if ( ! (thing->flags & MF_NOBLOCKMAP) )
-    {
-        // inert things don't need to be in blockmap
-        blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
-        blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
-
-        if (blockx>=0
-            && blockx < bmapwidth
-            && blocky>=0
-            && blocky < bmapheight)
-        {
-            link = &blocklinks[blocky*bmapwidth+blockx];
-            thing->bprev = NULL;
-            thing->bnext = *link;
-            if (*link)
-                (*link)->bprev = thing;
-
-            *link = thing;
-        }
-        else
-        {
-            // thing is off the map
-            thing->bnext = thing->bprev = NULL;
-        }
-    }
-}
-
-
-
-//
-// BLOCK MAP ITERATORS
-// For each line/thing in the given mapblock,
-// call the passed PIT_* function.
-// If the function returns false,
-// exit with false without checking anything else.
-//
-
-
-//
-// P_BlockLinesIterator
-// The validcount flags are used to avoid checking lines
-// that are marked in multiple mapblocks,
-// so increment validcount before the first call
-// to P_BlockLinesIterator, then make one or more calls
-// to it.
-//
-// haleyjd 20110203:
-// [STRIFE] Modified to track blockingline
-//
-boolean
-P_BlockLinesIterator
-( int           x,
-  int           y,
-  boolean(*func)(line_t*) )
-{
-    int         offset;
-    short*      list;
-    line_t*     ld;
-
-    if (x<0
-     || y<0
-     || x>=bmapwidth
-     || y>=bmapheight)
-    {
-        return true;
-    }
-    
-    offset = y*bmapwidth+x;
-
-    offset = *(blockmap+offset);
-
-    for ( list = blockmaplump+offset ; *list != -1 ; list++)
-    {
-        ld = &lines[*list];
-
-        // [STRIFE]: set blockingline (see P_XYMovement @ p_mobj.c)
-        blockingline = ld;
-
-        if (ld->validcount == validcount)
-            continue; 	// line has already been checked
-
-        ld->validcount = validcount;
-
-        if ( !func(ld) )
-            return false;
-    }
-    return true;	// everything was checked
-}
-
-
-//
-// P_BlockThingsIterator
-//
-// [STRIFE] Verified unmodified
-//
-boolean
-P_BlockThingsIterator
-( int           x,
-  int           y,
-  boolean(*func)(mobj_t*) )
-{
-    mobj_t*     mobj;
-
-    if ( x<0
-      || y<0
-      || x>=bmapwidth
-      || y>=bmapheight)
-    {
-        return true;
-    }
-
-    LINKED_LIST_CHECK_NO_CYCLE(mobj_t, blocklinks[y*bmapwidth+x], bnext);
-
-    for (mobj = blocklinks[y*bmapwidth+x] ;
-         mobj ;
-         mobj = mobj->bnext)
-    {
-        if (!func( mobj ) )
-            return false;
-    }
-    return true;
-}
-
-
-
-//
-// INTERCEPT ROUTINES
-//
-intercept_t	intercepts[MAXINTERCEPTS];
-intercept_t*	intercept_p;
-
-divline_t 	trace;
-boolean 	earlyout;
-int		ptflags;
-
-//static void InterceptsOverrun(int num_intercepts, intercept_t *intercept);
-
-//
-// PIT_AddLineIntercepts.
-// Looks for lines in the given block
-// that intercept the given trace
-// to add to the intercepts list.
-//
-// A line is crossed if its endpoints
-// are on opposite sides of the trace.
-// Returns true if earlyout and a solid line hit.
-//
-// haleyjd 20110204 [STRIFE]: Added Rogue's fix for intercepts overflows
-//
-boolean
-PIT_AddLineIntercepts (line_t* ld)
-{
-    int         s1;
-    int         s2;
-    fixed_t     frac;
-    divline_t   dl;
-
-    // avoid precision problems with two routines
-    if ( trace.dx > FRACUNIT*16
-      || trace.dy > FRACUNIT*16
-      || trace.dx < -FRACUNIT*16
-      || trace.dy < -FRACUNIT*16)
-    {
-        s1 = P_PointOnDivlineSide (ld->v1->x, ld->v1->y, &trace);
-        s2 = P_PointOnDivlineSide (ld->v2->x, ld->v2->y, &trace);
-    }
-    else
-    {
-        s1 = P_PointOnLineSide (trace.x, trace.y, ld);
-        s2 = P_PointOnLineSide (trace.x+trace.dx, trace.y+trace.dy, ld);
-    }
-
-    if (s1 == s2)
-        return true;    // line isn't crossed
-
-    // hit the line
-    P_MakeDivline (ld, &dl);
-    frac = P_InterceptVector (&trace, &dl);
-
-    if (frac < 0)
-        return true;    // behind source
-
-    // try to early out the check
-    if (earlyout
-        && frac < FRACUNIT
-        && !ld->backsector)
-    {
-        return false;   // stop checking
-    }
-
-
-    intercept_p->frac = frac;
-    intercept_p->isaline = true;
-    intercept_p->d.line = ld;
-    intercept_p++;
-
-    // haleyjd 20110204 [STRIFE]
-    // Evidently Rogue had trouble with intercepts overflows during
-    // development, as they added this check here which will stop adding
-    // intercepts if the array would be overflown.
-    if(intercept_p <= &intercepts[MAXINTERCEPTS_ORIGINAL-2])
-        return true;    // continue
-    else
-        return false;
-
-    // [STRIFE] Not needed?
-    //InterceptsOverrun(intercept_p - intercepts, intercept_p);
-}
-
-
-
-//
-// PIT_AddThingIntercepts
-//
-boolean PIT_AddThingIntercepts (mobj_t* thing)
-{
-    fixed_t     x1;
-    fixed_t     y1;
-    fixed_t     x2;
-    fixed_t     y2;
-
-    int         s1;
-    int         s2;
-
-    boolean     tracepositive;
-
-    divline_t   dl;
-
-    fixed_t     frac;
-
-    tracepositive = (trace.dx ^ trace.dy)>0;
-
-    // check a corner to corner crossection for hit
-    if (tracepositive)
-    {
-        x1 = thing->x - thing->radius;
-        y1 = thing->y + thing->radius;
-
-        x2 = thing->x + thing->radius;
-        y2 = thing->y - thing->radius;
-    }
-    else
-    {
-        x1 = thing->x - thing->radius;
-        y1 = thing->y - thing->radius;
-
-        x2 = thing->x + thing->radius;
-        y2 = thing->y + thing->radius;
-    }
-
-    s1 = P_PointOnDivlineSide (x1, y1, &trace);
-    s2 = P_PointOnDivlineSide (x2, y2, &trace);
-
-    if (s1 == s2)
-        return true;        // line isn't crossed
-
-    dl.x = x1;
-    dl.y = y1;
-    dl.dx = x2-x1;
-    dl.dy = y2-y1;
-
-    frac = P_InterceptVector (&trace, &dl);
-
-    if (frac < 0)
-        return true;        // behind source
-
-    intercept_p->frac = frac;
-    intercept_p->isaline = false;
-    intercept_p->d.thing = thing;
-    
-    intercept_p++;
-    
-    // haleyjd 20110204 [STRIFE]: As above, protection against intercepts
-    // overflows, courtesy of Rogue Software.
-    if(intercept_p <= &intercepts[MAXINTERCEPTS_ORIGINAL-2])
-        return true;            // keep going
-    else
-        return false;
-
-    // haleyjd [STRIFE]: Not needed?
-    //InterceptsOverrun(intercept_p - intercepts, intercept_p);
-}
-
-
-//
-// P_TraverseIntercepts
-// Returns true if the traverser function returns true
-// for all lines.
-//
-// [STRIFE] Verified unmodified.
-// 
-boolean
-P_TraverseIntercepts
-( traverser_t	func,
-  fixed_t	maxfrac )
-{
-    int             count;
-    fixed_t         dist;
-    intercept_t*    scan;
-    intercept_t*    in;
-
-    count = intercept_p - intercepts;
-
-    in = 0;         // shut up compiler warning
-
-    while (count--)
-    {
-        dist = INT_MAX;
-        for (scan = intercepts ; scan<intercept_p ; scan++)
-        {
-            if (scan->frac < dist)
-            {
-                dist = scan->frac;
-                in = scan;
-            }
-        }
-
-        if (dist > maxfrac)
-            return true;    // checked everything in range
-
-#if 0  // UNUSED
-        {
-            // don't check these yet, there may be others inserted
-            in = scan = intercepts;
-            for ( scan = intercepts ; scan<intercept_p ; scan++)
-                if (scan->frac > maxfrac)
-                    *in++ = *scan;
-            intercept_p = in;
-            return false;
-        }
-#endif
-
-        if ( !func (in) )
-            return false;   // don't bother going farther
-
-        in->frac = INT_MAX;
-    }
-
-    return true;            // everything was traversed
-}
-
-
-#if 0
-// Intercepts Overrun emulation, from PrBoom-plus.
-// Thanks to Andrey Budko (entryway) for researching this and his 
-// implementation of Intercepts Overrun emulation in PrBoom-plus
-// which this is based on.
-
-typedef struct
-{
-    int len;
-    void *addr;
-    boolean int16_array;
-} intercepts_overrun_t;
-
-// Intercepts memory table.  This is where various variables are located
-// in memory in Vanilla Doom.  When the intercepts table overflows, we
-// need to write to them.
-//
-// Almost all of the values to overwrite are 32-bit integers, except for
-// playerstarts, which is effectively an array of 16-bit integers and
-// must be treated differently.
-
-// haleyjd 20110204: NB: This array has *not* been updated for Strife,
-// because Strife has protection against intercepts overflows. The memory
-// layout of the 1.2 and 1.31 EXEs is radically different with respect
-// to this area of the BSS segment, so it would have to be redone entirely
-// if it were needed.
-
-static intercepts_overrun_t intercepts_overrun[] =
-{
-    {4,   NULL,                          false},
-    {4,   NULL, /* &earlyout, */         false},
-    {4,   NULL, /* &intercept_p, */      false},
-    {4,   &lowfloor,                     false},
-    {4,   &openbottom,                   false},
-    {4,   &opentop,                      false},
-    {4,   &openrange,                    false},
-    {4,   NULL,                          false},
-    {120, NULL, /* &activeplats, */      false},
-    {8,   NULL,                          false},
-    {4,   &bulletslope,                  false},
-    {4,   NULL, /* &swingx, */           false},
-    {4,   NULL, /* &swingy, */           false},
-    {4,   NULL,                          false},
-    {40,  &playerstarts,                 true},
-    {4,   NULL, /* &blocklinks, */       false},
-    {4,   &bmapwidth,                    false},
-    {4,   NULL, /* &blockmap, */         false},
-    {4,   &bmaporgx,                     false},
-    {4,   &bmaporgy,                     false},
-    {4,   NULL, /* &blockmaplump, */     false},
-    {4,   &bmapheight,                   false},
-    {0,   NULL,                          false},
-};
-
-// Overwrite a specific memory location with a value.
-
-static void InterceptsMemoryOverrun(int location, int value)
-{
-    int i, offset;
-    int index;
-    void *addr;
-
-    i = 0;
-    offset = 0;
-
-    // Search down the array until we find the right entry
-
-    while (intercepts_overrun[i].len != 0)
-    {
-        if (offset + intercepts_overrun[i].len > location)
-        {
-            addr = intercepts_overrun[i].addr;
-
-            // Write the value to the memory location.
-            // 16-bit and 32-bit values are written differently.
-
-            if (addr != NULL)
-            {
-                if (intercepts_overrun[i].int16_array)
-                {
-                    index = (location - offset) / 2;
-                    ((short *) addr)[index] = value & 0xffff;
-                    ((short *) addr)[index + 1] = (value >> 16) & 0xffff;
-                }
-                else
-                {
-                    index = (location - offset) / 4;
-                    ((int *) addr)[index] = value;
-                }
-            }
-
-            break;
-        }
-
-        offset += intercepts_overrun[i].len;
-        ++i;
-    }
-}
-
-// Emulate overruns of the intercepts[] array.
-
-static void InterceptsOverrun(int num_intercepts, intercept_t *intercept)
-{
-    int location;
-
-    if (num_intercepts <= MAXINTERCEPTS_ORIGINAL)
-    {
-        // No overrun
-
-        return;
-    }
-
-    location = (num_intercepts - MAXINTERCEPTS_ORIGINAL - 1) * 12;
-
-    // Overwrite memory that is overwritten in Vanilla Doom, using
-    // the values from the intercept structure.
-    //
-    // Note: the ->d.{thing,line} member should really have its
-    // address translated into the correct address value for 
-    // Vanilla Doom.
-
-    InterceptsMemoryOverrun(location, intercept->frac);
-    InterceptsMemoryOverrun(location + 4, intercept->isaline);
-    InterceptsMemoryOverrun(location + 8, (int) intercept->d.thing);
-}
-#endif
-
-
-//
-// P_PathTraverse
-// Traces a line from x1,y1 to x2,y2,
-// calling the traverser function for each.
-// Returns true if the traverser function returns true
-// for all lines.
-//
-// [STRIFE] Verified unmodified
-//
-boolean
-P_PathTraverse
-( fixed_t       x1,
-  fixed_t       y1,
-  fixed_t       x2,
-  fixed_t       y2,
-  int           flags,
-  boolean (*trav) (intercept_t *))
-{
-    fixed_t xt1;
-    fixed_t yt1;
-    fixed_t xt2;
-    fixed_t yt2;
-    
-    fixed_t xstep;
-    fixed_t ystep;
-    
-    fixed_t partial;
-    
-    fixed_t xintercept;
-    fixed_t yintercept;
-    
-    int     mapx;
-    int     mapy;
-    
-    int     mapxstep;
-    int     mapystep;
-
-    int     count;
-
-    earlyout = (flags & PT_EARLYOUT) != 0;
-
-    validcount++;
-    intercept_p = intercepts;
-
-    if ( ((x1-bmaporgx)&(MAPBLOCKSIZE-1)) == 0)
-        x1 += FRACUNIT;	// don't side exactly on a line
-
-    if ( ((y1-bmaporgy)&(MAPBLOCKSIZE-1)) == 0)
-        y1 += FRACUNIT;	// don't side exactly on a line
-
-    trace.x = x1;
-    trace.y = y1;
-    trace.dx = x2 - x1;
-    trace.dy = y2 - y1;
-
-    x1 -= bmaporgx;
-    y1 -= bmaporgy;
-    xt1 = x1>>MAPBLOCKSHIFT;
-    yt1 = y1>>MAPBLOCKSHIFT;
-
-    x2 -= bmaporgx;
-    y2 -= bmaporgy;
-    xt2 = x2>>MAPBLOCKSHIFT;
-    yt2 = y2>>MAPBLOCKSHIFT;
-
-    if (xt2 > xt1)
-    {
-        mapxstep = 1;
-        partial = FRACUNIT - ((x1>>MAPBTOFRAC)&(FRACUNIT-1));
-        ystep = FixedDiv (y2-y1,abs(x2-x1));
-    }
-    else if (xt2 < xt1)
-    {
-        mapxstep = -1;
-        partial = (x1>>MAPBTOFRAC)&(FRACUNIT-1);
-        ystep = FixedDiv (y2-y1,abs(x2-x1));
-    }
-    else
-    {
-        mapxstep = 0;
-        partial = FRACUNIT;
-        ystep = 256*FRACUNIT;
-    }	
-
-    yintercept = (y1>>MAPBTOFRAC) + FixedMul (partial, ystep);
-
-
-    if (yt2 > yt1)
-    {
-        mapystep = 1;
-        partial = FRACUNIT - ((y1>>MAPBTOFRAC)&(FRACUNIT-1));
-        xstep = FixedDiv (x2-x1,abs(y2-y1));
-    }
-    else if (yt2 < yt1)
-    {
-        mapystep = -1;
-        partial = (y1>>MAPBTOFRAC)&(FRACUNIT-1);
-        xstep = FixedDiv (x2-x1,abs(y2-y1));
-    }
-    else
-    {
-        mapystep = 0;
-        partial = FRACUNIT;
-        xstep = 256*FRACUNIT;
-    }	
-    xintercept = (x1>>MAPBTOFRAC) + FixedMul (partial, xstep);
-
-    // Step through map blocks.
-    // Count is present to prevent a round off error
-    // from skipping the break.
-    mapx = xt1;
-    mapy = yt1;
-
-    for (count = 0 ; count < 64 ; count++)
-    {
-        if (flags & PT_ADDLINES)
-        {
-            if (!P_BlockLinesIterator (mapx, mapy,PIT_AddLineIntercepts))
-                return false;   // early out
-        }
-
-        if (flags & PT_ADDTHINGS)
-        {
-            if (!P_BlockThingsIterator (mapx, mapy,PIT_AddThingIntercepts))
-                return false;   // early out
-        }
-
-        if (mapx == xt2
-         && mapy == yt2)
-        {
-            break;
-        }
-
-        if ( (yintercept >> FRACBITS) == mapy)
-        {
-            yintercept += ystep;
-            mapx += mapxstep;
-        }
-        else if ( (xintercept >> FRACBITS) == mapx)
-        {
-            xintercept += xstep;
-            mapy += mapystep;
-        }
-
-    }
-    // go through the sorted list
-    return P_TraverseIntercepts ( trav, FRACUNIT );
-}
-
-
-
diff --git a/games/NXDoom/src/strife/p_mobj.c b/games/NXDoom/src/strife/p_mobj.c
deleted file mode 100644
index 038c3edbe..000000000
--- a/games/NXDoom/src/strife/p_mobj.c
+++ /dev/null
@@ -1,1360 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Moving object handling. Spawn functions.
-//
-
-#include <stdio.h>
-
-#include "i_system.h"
-#include "z_zone.h"
-#include "m_random.h"
-#include "doomdef.h"
-#include "p_local.h"
-#include "sounds.h"
-#include "st_stuff.h"
-#include "hu_stuff.h"
-#include "s_sound.h"
-#include "doomstat.h"
-#include "d_main.h"     // villsa [STRIFE]
-
-
-void G_PlayerReborn (int player);
-void P_SpawnMapThing (mapthing_t*	mthing);
-
-
-//
-// P_SetMobjState
-// Returns true if the mobj is still present.
-//
-// [STRIFE] Verified unmodified
-//
-int test;
-
-boolean
-P_SetMobjState
-( mobj_t*	mobj,
-  statenum_t	state )
-{
-    state_t*	st;
-
-    do
-    {
-	if (state == S_NULL)
-	{
-	    mobj->state = (state_t *) S_NULL;
-	    P_RemoveMobj (mobj);
-	    return false;
-	}
-
-	st = &states[state];
-	mobj->state = st;
-	mobj->tics = st->tics;
-	mobj->sprite = st->sprite;
-	mobj->frame = st->frame;
-
-	// Modified handling.
-	// Call action functions when the state is set
-	if (st->action.acp1)		
-	    st->action.acp1(mobj);	
-	
-	state = st->nextstate;
-    } while (!mobj->tics);
-				
-    return true;
-}
-
-
-//
-// P_ExplodeMissile
-//
-// [STRIFE] Removed randomization of deathstate tics
-//
-void P_ExplodeMissile (mobj_t* mo)
-{
-    mo->momx = mo->momy = mo->momz = 0;
-
-    P_SetMobjState (mo, mobjinfo[mo->type].deathstate);
-
-    // villsa [STRIFE] removed tics randomization
-
-    mo->flags &= ~MF_MISSILE;
-
-    if (mo->info->deathsound)
-        S_StartSound (mo, mo->info->deathsound);
-}
-
-
-//
-// P_XYMovement
-//
-// [STRIFE] Modifications for:
-// * No SKULLFLY logic (replaced by BOUNCE flag)
-// * Missiles can activate G1/GR line types
-// * Player walking logic
-// * Air friction for players
-//
-#define STOPSPEED       0x1000
-#define FRICTION        0xe800
-#define AIRFRICTION     0xfff0  // [STRIFE]
-
-void P_XYMovement (mobj_t* mo) 
-{
-    fixed_t     ptryx;
-    fixed_t     ptryy;
-    player_t*   player;
-    fixed_t     xmove;
-    fixed_t     ymove;
-
-    // villsa [STRIFE] unused
-    /*
-    if (!mo->momx && !mo->momy)
-    {
-        if (mo->flags & MF_SKULLFLY)
-        {
-            // the skull slammed into something
-            mo->flags &= ~MF_SKULLFLY;
-            mo->momx = mo->momy = mo->momz = 0;
-
-            P_SetMobjState (mo, mo->info->spawnstate);
-        }
-        return;
-    }
-    */
-
-    player = mo->player;
-
-    if (mo->momx > MAXMOVE)
-        mo->momx = MAXMOVE;
-    else if (mo->momx < -MAXMOVE)
-        mo->momx = -MAXMOVE;
-
-    if (mo->momy > MAXMOVE)
-        mo->momy = MAXMOVE;
-    else if (mo->momy < -MAXMOVE)
-        mo->momy = -MAXMOVE;
-
-    xmove = mo->momx;
-    ymove = mo->momy;
-
-    do
-    {
-        if (xmove > MAXMOVE/2 || ymove > MAXMOVE/2)
-        {
-            ptryx = mo->x + xmove/2;
-            ptryy = mo->y + ymove/2;
-            xmove >>= 1;
-            ymove >>= 1;
-        }
-        else
-        {
-            ptryx = mo->x + xmove;
-            ptryy = mo->y + ymove;
-            xmove = ymove = 0;
-        }
-
-        if (!P_TryMove (mo, ptryx, ptryy))
-        {
-            // blocked move
-            if (mo->player)
-            {   // try to slide along it
-                P_SlideMove (mo);
-            }
-            // villsa [STRIFE] check for bouncy missiles
-            else if(mo->flags & MF_BOUNCE)
-            {
-                mo->momx >>= 3;
-                mo->momy >>= 3;
-
-                if (P_TryMove(mo, mo->x - xmove, ymove + mo->y))
-                    mo->momy = -mo->momy;
-                else
-                    mo->momx = -mo->momx;
-
-                xmove = 0;
-                ymove = 0;
-            }
-            else if (mo->flags & MF_MISSILE)
-            {
-                // haley 20110203: [STRIFE]
-                // This modification allows missiles to activate shoot specials.
-                // *** BUG: In vanilla Strife the second condition is simply
-                // if(numspechit). However, numspechit can be negative, and
-                // when it is, this accesses spechit[-2]. This always causes the
-                // DOS exe to read from NULL, and the 'special' value there (in
-                // DOS 6.22 at least) is 0x70, which does nothing.
-                if(blockingline && blockingline->special)
-                    P_ShootSpecialLine(mo, blockingline);
-                if(numspechit > 0)
-                    P_ShootSpecialLine(mo, spechit[numspechit-1]);
-
-                // explode a missile
-                if (ceilingline &&
-                    ceilingline->backsector &&
-                    ceilingline->backsector->ceilingpic == skyflatnum)
-                {
-                    // Hack to prevent missiles exploding
-                    // against the sky.
-                    // Does not handle sky floors.
-                    P_RemoveMobj (mo);
-                    return;
-                }
-                P_ExplodeMissile (mo);
-            }
-            else
-                mo->momx = mo->momy = 0;
-        }
-    } while (xmove || ymove);
-    
-    // slow down
-    if (player && player->cheats & CF_NOMOMENTUM)
-    {
-        // debug option for no sliding at all
-        mo->momx = mo->momy = 0;
-        return;
-    }
-
-    // villsa [STRIFE] replace skullfly flag with MF_BOUNCE
-    if (mo->flags & (MF_MISSILE | MF_BOUNCE) )
-        return;     // no friction for missiles ever
-
-    // haleyjd 20110224: [STRIFE] players experience friction even in the air,
-    // although less than when on the ground. With this fix, the 1.2-and-up 
-    // IWAD demo is now in sync!
-    if (mo->z > mo->floorz)
-    {
-        if(player)
-        {
-            mo->momx = FixedMul (mo->momx, AIRFRICTION);
-            mo->momy = FixedMul (mo->momy, AIRFRICTION);
-        }
-        return;     // no friction when airborne
-    }
-
-    if (mo->flags & MF_CORPSE)
-    {
-        // do not stop sliding
-        //  if halfway off a step with some momentum
-        if (mo->momx > FRACUNIT/4
-            || mo->momx < -FRACUNIT/4
-            || mo->momy > FRACUNIT/4
-            || mo->momy < -FRACUNIT/4)
-        {
-            if (mo->floorz != mo->subsector->sector->floorheight)
-                return;
-        }
-    }
-
-    if (mo->momx > -STOPSPEED
-        && mo->momx < STOPSPEED
-        && mo->momy > -STOPSPEED
-        && mo->momy < STOPSPEED
-        && (!player
-            || (player->cmd.forwardmove == 0
-                && player->cmd.sidemove == 0 ) ) )
-    {
-        // if in a walking frame, stop moving
-        // villsa [STRIFE]: different player state (haleyjd - verified 20110202)
-        if ( player&&(unsigned)((player->mo->state - states) - S_PLAY_01) < 4)
-            P_SetMobjState (player->mo, S_PLAY_00);
-
-        mo->momx = 0;
-        mo->momy = 0;
-    }
-    else
-    {
-        mo->momx = FixedMul (mo->momx, FRICTION);
-        mo->momy = FixedMul (mo->momy, FRICTION);
-    }
-}
-
-//
-// P_ZMovement
-//
-// [STRIFE] Modifications for:
-// * 3D Object Clipping
-// * Different momz handling
-// * No SKULLFLY logic (replaced with BOUNCE)
-// * Missiles don't hit sky flats
-//
-void P_ZMovement (mobj_t* mo)
-{
-    fixed_t	dist;
-    fixed_t	delta;
-
-    // check for smooth step up
-    if (mo->player && mo->z < mo->floorz)
-    {
-        mo->player->viewheight -= mo->floorz-mo->z;
-
-        mo->player->deltaviewheight
-            = (VIEWHEIGHT - mo->player->viewheight)>>3;
-    }
-    
-    // adjust height
-    // villsa [STRIFE] check for things standing on top of other things
-    if(!P_CheckPositionZ(mo, mo->z + mo->momz))
-    {
-        if(mo->momz >= 0)
-            mo->ceilingz = mo->height + mo->z;
-        else
-            mo->floorz = mo->z;
-    }
-
-    //mo->z += mo->momz; // villsa [STRIFE] unused
-
-    if ( mo->flags & MF_FLOAT
-        && mo->target)
-    {
-        // float down towards target if too close
-        if ( /*!(mo->flags & MF_SKULLFLY)   // villsa [STRIFE] unused
-             &&*/ !(mo->flags & MF_INFLOAT) )
-        {
-            dist = P_AproxDistance (mo->x - mo->target->x,
-                                    mo->y - mo->target->y);
-
-            delta =(mo->target->z + (mo->height>>1)) - mo->z;
-
-            if (delta<0 && dist < -(delta*3) )
-                mo->z -= FLOATSPEED;
-            else if (delta>0 && dist < (delta*3) )
-                mo->z += FLOATSPEED;
-        }
-    }
-    
-    // clip movement
-    if (mo->z <= mo->floorz)
-    {
-        // hit the floor
-
-        if (mo->flags & MF_BOUNCE)
-        {
-            // the skull slammed into something
-            // villsa [STRIFE] affect reactiontime
-            // momz is also shifted by 1
-            mo->momz = -mo->momz >> 1;
-            mo->reactiontime >>= 1;
-
-            // villsa [STRIFE] get terrain type
-            if(P_GetTerrainType(mo) != FLOOR_SOLID)
-                mo->flags &= ~MF_BOUNCE;
-        }
-
-        if (mo->momz < 0)
-        {
-            if (mo->player
-                && mo->momz < -GRAVITY*8)
-            {
-                // Squat down.
-                // Decrease viewheight for a moment
-                // after hitting the ground (hard),
-                // and utter appropriate sound.
-                mo->player->deltaviewheight = mo->momz>>3;
-
-                // villsa [STRIFE] fall damage
-                // haleyjd 09/18/10: Repaired calculation
-                if(mo->momz < -20*FRACUNIT)
-                    P_DamageMobj(mo, NULL, mo, mo->momz / -25000);
-
-                // haleyjd 20110224: *Any* fall centers your view, not just
-                // damaging falls (moved outside the above if).
-                mo->player->centerview = 1;
-                S_StartSound (mo, sfx_oof);
-            }
-            mo->momz = 0;
-        }
-        mo->z = mo->floorz;
-
-
-        // cph 2001/05/26 -
-        // See lost soul bouncing comment above. We need this here for bug
-        // compatibility with original Doom2 v1.9 - if a soul is charging and
-        // hit by a raising floor this incorrectly reverses its Y momentum.
-        //
-
-        // villsa [STRIFE] unused
-        /*
-        if (!correct_lost_soul_bounce && mo->flags & MF_SKULLFLY)
-            mo->momz = -mo->momz;
-        */
-
-        // villsa [STRIFE] also check for MF_BOUNCE
-        if ( (mo->flags & MF_MISSILE)
-            && !(mo->flags & (MF_NOCLIP|MF_BOUNCE)) )
-        {
-            P_ExplodeMissile (mo);
-        }
-    }
-    else // haleyjd 20110224: else here, not else if - Strife change or what?
-    {
-        if (! (mo->flags & MF_NOGRAVITY) )
-        {
-            if (mo->momz == 0)
-                mo->momz = -GRAVITY*2;
-            else
-                mo->momz -= GRAVITY;
-        }
-
-        if (mo->z + mo->height > mo->ceilingz)
-        {
-            // villsa [STRIFE] replace skullfly flag with MF_BOUNCE
-            if (mo->flags & MF_BOUNCE)
-            {
-                // villsa [STRIFE] affect reactiontime
-                // momz is also shifted by 1
-                mo->momz = -mo->momz >> 1;
-                mo->reactiontime >>= 1;
-            }
-
-            // hit the ceiling
-            if (mo->momz > 0)
-                mo->momz = 0;
-
-            mo->z = mo->ceilingz - mo->height;
-
-            // villsa [STRIFE] also check for MF_BOUNCE
-            if ( (mo->flags & MF_MISSILE)
-                && !(mo->flags & (MF_NOCLIP|MF_BOUNCE)) )
-            {
-                // villsa [STRIFE] check against skies
-                if(mo->subsector->sector->ceilingpic == skyflatnum)
-                    P_RemoveMobj(mo);
-                else
-                    P_ExplodeMissile (mo);
-            }
-        }
-    }
-} 
-
-
-
-//
-// P_NightmareRespawn
-//
-// [STRIFE] Modifications for:
-// * Destination fog z coordinate
-// * Restoration of all Strife mapthing flags
-//
-void
-P_NightmareRespawn (mobj_t* mobj)
-{
-    fixed_t      x;
-    fixed_t      y;
-    fixed_t      z; 
-    mobj_t*      mo;
-    mapthing_t*  mthing;
-
-    x = mobj->spawnpoint.x << FRACBITS; 
-    y = mobj->spawnpoint.y << FRACBITS; 
-
-    // somthing is occupying it's position?
-    if (!P_CheckPosition (mobj, x, y) ) 
-        return;	// no respwan
-
-    // spawn a teleport fog at old spot
-    // because of removal of the body?
-    mo = P_SpawnMobj (mobj->x,
-                      mobj->y,
-                      mobj->subsector->sector->floorheight , MT_TFOG); 
-    // initiate teleport sound
-    S_StartSound (mo, sfx_telept);
-
-    // spawn a teleport fog at the new spot
-    //ss = R_PointInSubsector (x,y); 
-
-    // haleyjd [STRIFE]: Uses ONFLOORZ instead of ss->sector->floorheight
-    mo = P_SpawnMobj (x, y, ONFLOORZ , MT_TFOG); 
-
-    S_StartSound (mo, sfx_telept);
-
-    // spawn the new monster
-    mthing = &mobj->spawnpoint;
-
-    // spawn it
-    if (mobj->info->flags & MF_SPAWNCEILING)
-        z = ONCEILINGZ;
-    else
-        z = ONFLOORZ;
-
-    // inherit attributes from deceased one
-    mo = P_SpawnMobj (x,y,z, mobj->type);
-    mo->spawnpoint = mobj->spawnpoint;
-    mo->angle = ANG45 * (mthing->angle/45);
-
-    if (mthing->options & MTF_AMBUSH)
-        mo->flags |= MF_AMBUSH;
-    if (mthing->options & MTF_STAND)       // [STRIFE] Standing mode, for NPCs
-        mobj->flags |= MF_STAND;
-    if (mthing->options & MTF_FRIEND)      // [STRIFE] Allies
-        mobj->flags |= MF_ALLY;
-    if (mthing->options & MTF_TRANSLUCENT) // [STRIFE] Translucent object
-        mobj->flags |= MF_SHADOW;
-    if (mthing->options & MTF_MVIS)        // [STRIFE] Alt. Translucency
-        mobj->flags |= MF_MVIS;
-
-    mo->reactiontime = 18;
-
-    // remove the old monster,
-    P_RemoveMobj (mobj);
-}
-
-
-//
-// P_MobjThinker
-//
-// [STRIFE] Modified for:
-// * Terrain effects
-// * Stonecold cheat
-// * Altered skill 5 respawn behavior
-//
-void P_MobjThinker (mobj_t* mobj)
-{
-    // momentum movement
-    if (mobj->momx
-        || mobj->momy
-        /*|| (mobj->flags&MF_SKULLFLY)*/ )  // villsa [STRIFE] unused
-    {
-        P_XYMovement (mobj);
-
-        // FIXME: decent NOP/NULL/Nil function pointer please.
-        if (mobj->thinker.function.acv == (actionf_v) (-1))
-            return;     // mobj was removed
-
-        // villsa [STRIFE] terrain clipping
-        if(P_GetTerrainType(mobj) == FLOOR_SOLID)
-            mobj->flags &= ~MF_FEETCLIPPED;
-        else
-            mobj->flags |= MF_FEETCLIPPED;
-
-    }
-    if ( (mobj->z != mobj->floorz && !(mobj->flags & MF_NOGRAVITY)) // villsa [STRIFE]
-        || mobj->momz )
-    {
-        P_ZMovement (mobj);
-
-        // FIXME: decent NOP/NULL/Nil function pointer please.
-        if (mobj->thinker.function.acv == (actionf_v) (-1))
-            return;     // mobj was removed
-
-        // villsa [STRIFE] terrain clipping and sounds
-        if(P_GetTerrainType(mobj) == FLOOR_SOLID)
-            mobj->flags &= ~MF_FEETCLIPPED;
-        else
-        {
-            S_StartSound(mobj, sfx_wsplsh);
-            mobj->flags |= MF_FEETCLIPPED;
-        }
-
-    }
-
-    
-    // cycle through states,
-    // calling action functions at transitions
-    if (mobj->tics != -1)
-    {
-        mobj->tics--;
-
-        // villsa [STRIFE] stonecold cheat
-        if(stonecold)
-        {
-            if(mobj->flags & MF_COUNTKILL)
-                P_DamageMobj(mobj, mobj, mobj, 10);
-        }
-
-        // you can cycle through multiple states in a tic
-        if (!mobj->tics)
-            if (!P_SetMobjState (mobj, mobj->state->nextstate) )
-                return;     // freed itself
-    }
-    else
-    {
-        // check for nightmare respawn
-        if (! (mobj->flags & MF_COUNTKILL) )
-            return;
-
-        if (!respawnmonsters)
-            return;
-
-        mobj->movecount++;
-
-        // haleyjd [STRIFE]: respawn time increased from 12 to 16
-        if (mobj->movecount < 16*TICRATE)
-            return;
-
-        if ( leveltime&31 )
-            return;
-
-        if (P_Random () > 4)
-            return;
-
-        // haleyjd [STRIFE]: NOTDMATCH things don't respawn
-        if(mobj->flags & MF_NOTDMATCH)
-            return;
-
-        P_NightmareRespawn (mobj);
-    }
-}
-
-
-//
-// P_SpawnMobj
-//
-// [STRIFE] Modifications to reactiontime and for terrain types.
-//
-mobj_t*
-P_SpawnMobj
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z,
-  mobjtype_t	type )
-{
-    mobj_t*	mobj;
-    state_t*	st;
-    mobjinfo_t*	info;
-
-    mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
-    memset (mobj, 0, sizeof (*mobj));
-    info = &mobjinfo[type];
-
-    mobj->type = type;
-    mobj->info = info;
-    mobj->x = x;
-    mobj->y = y;
-    mobj->radius = info->radius;
-    mobj->height = info->height;
-    mobj->flags = info->flags;
-    mobj->health = info->spawnhealth;
-
-    // haleyjd 09/25/10: [STRIFE] Doesn't do this; messes up flamethrower
-    // and a lot of other stuff using reactiontime as a counter.
-    //if (gameskill != sk_nightmare)
-    mobj->reactiontime = info->reactiontime;
-    
-    mobj->lastlook = P_Random () % MAXPLAYERS;
-    // do not set the state with P_SetMobjState,
-    // because action routines can not be called yet
-    st = &states[info->spawnstate];
-
-    mobj->state = st;
-    mobj->tics = st->tics;
-    mobj->sprite = st->sprite;
-    mobj->frame = st->frame;
-
-    // set subsector and/or block links
-    P_SetThingPosition (mobj);
-
-    mobj->floorz = mobj->subsector->sector->floorheight;
-    mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-
-    if (z == ONFLOORZ)
-    {
-        mobj->z = mobj->floorz;
-
-        // villsa [STRIFE]
-        if(P_GetTerrainType(mobj) != FLOOR_SOLID)
-            mobj->flags |= MF_FEETCLIPPED;
-
-    }
-    else if (z == ONCEILINGZ)
-        mobj->z = mobj->ceilingz - mobj->info->height;
-    else 
-        mobj->z = z;
-
-    mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-
-    P_AddThinker (&mobj->thinker);
-
-    return mobj;
-}
-
-
-//
-// P_RemoveMobj
-//
-// [STRIFE] Modifications for item respawn timing
-//
-mapthing_t  itemrespawnque[ITEMQUESIZE];
-int         itemrespawntime[ITEMQUESIZE];
-int         iquehead;
-int         iquetail;
-
-void P_RemoveMobj (mobj_t* mobj)
-{
-    // villsa [STRIFE] removed invuln/invis. sphere exceptions
-    if ((mobj->flags & MF_SPECIAL)
-        && !(mobj->flags & MF_DROPPED))
-    {
-        itemrespawnque[iquehead] = mobj->spawnpoint;
-        itemrespawntime[iquehead] = leveltime + 30*TICRATE; // [STRIFE]
-
-        // [STRIFE] haleyjd 20130915
-        // -random parameter affects the behavior of respawning items here.
-        if(randomparm && iquehead != iquetail)
-        {
-            short type    = itemrespawnque[iquehead].type;
-            short options = itemrespawnque[iquehead].options;
-
-            // swap the type and options of iquehead and iquetail
-            itemrespawnque[iquehead].type    = itemrespawnque[iquetail].type;
-            itemrespawnque[iquehead].options = itemrespawnque[iquetail].options;
-            itemrespawnque[iquetail].type    = type;
-            itemrespawnque[iquetail].options = options;
-        }
-
-        iquehead = (iquehead+1)&(ITEMQUESIZE-1);
-
-        // lose one off the end?
-        if (iquehead == iquetail)
-            iquetail = (iquetail+1)&(ITEMQUESIZE-1);
-    }
-
-    // unlink from sector and block lists
-    P_UnsetThingPosition (mobj);
-    
-    // stop any playing sound
-    S_StopSound (mobj);
-    
-    // free block
-    P_RemoveThinker ((thinker_t*)mobj);
-}
-
-
-
-
-//
-// P_RespawnSpecials
-//
-// [STRIFE] modification to item respawn time handling
-//
-void P_RespawnSpecials (void)
-{
-    fixed_t     x;
-    fixed_t     y;
-    fixed_t     z;
-    
-    subsector_t*    ss; 
-    mobj_t*         mo;
-    mapthing_t*     mthing;
-    
-    int         i;
-
-    // only respawn items in deathmatch
-    if (deathmatch != 2)
-        return;
-
-    // nothing left to respawn?
-    if (iquehead == iquetail)
-        return;
-
-    // haleyjd [STRIFE]: 30 second wait is not accounted for here, see above.
-    if (leveltime < itemrespawntime[iquetail])
-        return;
-
-    mthing = &itemrespawnque[iquetail];
-
-    x = mthing->x << FRACBITS; 
-    y = mthing->y << FRACBITS; 
-
-    // spawn a teleport fog at the new spot
-    ss = R_PointInSubsector (x,y); 
-    mo = P_SpawnMobj (x, y, ss->sector->floorheight , MT_IFOG); 
-    S_StartSound (mo, sfx_itmbk);
-
-    // find which type to spawn
-    for (i=0 ; i< NUMMOBJTYPES ; i++)
-    {
-        if (mthing->type == mobjinfo[i].doomednum)
-            break;
-    }
-
-    if (i >= NUMMOBJTYPES)
-    {
-        I_Error("P_RespawnSpecials: Failed to find mobj type with doomednum "
-                "%d when respawning thing. This would cause a buffer overrun "
-                "in vanilla Strife.", mthing->type);
-    }
-
-    // spawn it
-    if (mobjinfo[i].flags & MF_SPAWNCEILING)
-        z = ONCEILINGZ;
-    else
-        z = ONFLOORZ;
-
-    mo = P_SpawnMobj (x,y,z, i);
-    mo->spawnpoint = *mthing;
-    mo->angle = ANG45 * (mthing->angle/45);
-
-    // pull it from the que
-    iquetail = (iquetail+1)&(ITEMQUESIZE-1);
-}
-
-
-
-
-//
-// P_SpawnPlayer
-// Called when a player is spawned on the level.
-// Most of the player structure stays unchanged
-//  between levels.
-//
-// [STRIFE] Modifications for:
-// * stonecold cheat, -workparm
-// * default inventory/questflags
-//
-void P_SpawnPlayer(mapthing_t* mthing)
-{
-    player_t*   p;
-    fixed_t     x;
-    fixed_t     y;
-    fixed_t     z;
-    mobj_t*     mobj;
-
-    if(mthing->type == 0)
-        return;
-
-    // not playing?
-    if(!playeringame[mthing->type-1])
-        return;
-
-    p = &players[mthing->type-1];
-
-    if (p->playerstate == PST_REBORN)
-        G_PlayerReborn (mthing->type-1);
-
-    x       = mthing->x << FRACBITS;
-    y       = mthing->y << FRACBITS;
-    z       = ONFLOORZ;
-    mobj    = P_SpawnMobj (x,y,z, MT_PLAYER);
-
-    // set color translations for player sprites
-    if(mthing->type > 1)
-        mobj->flags |= (mthing->type-1)<<MF_TRANSSHIFT;
-
-    mobj->angle  = ANG45 * (mthing->angle/45);
-    mobj->player = p;
-    mobj->health = p->health;
-
-    p->mo               = mobj;
-    p->playerstate      = PST_LIVE;	
-    p->refire           = 0;
-    p->message          = NULL;
-    p->damagecount      = 0;
-    p->bonuscount       = 0;
-    p->extralight       = 0;
-    p->fixedcolormap    = 0;
-    p->viewheight       = VIEWHEIGHT;
-
-    // setup gun psprite
-    P_SetupPsprites(p);
-
-    // villsa [STRIFE]
-    stonecold = false;
-
-    // villsa [STRIFE] what a nasty hack...
-    if(gamemap == 10)
-        p->weaponowned[wp_sigil] = true;
-
-    // villsa [STRIFE] instead of just giving cards in deathmatch mode, also
-    // set accuracy to 50 and give all quest flags
-    if(deathmatch)
-    {
-        int i;
-
-        p->accuracy = 50;
-        p->questflags = QF_ALLQUESTS; // 0x7fffffff
-
-        for(i = 0; i < NUMCARDS; i++)
-            p->cards[i] = true;
-    }
-
-    // villsa [STRIFE] set godmode?
-    if(workparm)
-        p->cheats |= CF_GODMODE;
-
-    if(mthing->type - 1 == consoleplayer)
-    {
-        // wake up the status bar
-        ST_Start ();
-        // wake up the heads up text
-        HU_Start ();
-    }
-}
-
-
-//
-// P_SpawnMapThing
-// The fields of the mapthing should
-// already be in host byte order.
-//
-// [STRIFE] Modifications for:
-// * No Lost Souls, item count
-// * New mapthing_t flag bits
-// * 8-player support
-//
-void P_SpawnMapThing (mapthing_t* mthing)
-{
-    int         i;
-    int         bit;
-    mobj_t*     mobj;
-    fixed_t     x;
-    fixed_t     y;
-    fixed_t     z;
-
-    // count deathmatch start positions
-    if (mthing->type == 11)
-    {
-        if (deathmatch_p < &deathmatchstarts[10])
-        {
-            memcpy (deathmatch_p, mthing, sizeof(*mthing));
-            deathmatch_p++;
-        }
-        return;
-    }
-
-    if (mthing->type <= 0)
-    {
-        // Thing type 0 is actually "player -1 start".  
-        // For some reason, Vanilla Doom accepts/ignores this.
-
-        return;
-    }
-
-    // check for players specially
-    // haleyjd 20120209: [STRIFE] 8 player starts
-    if (mthing->type <= 8)
-    {
-        // save spots for respawning in network games
-        playerstarts[mthing->type-1] = *mthing;
-        if (!deathmatch)
-            P_SpawnPlayer (mthing);
-
-        return;
-    }
-
-    // check for appropriate skill level
-    if (!netgame && (mthing->options & 16) )
-        return;
-
-    if (gameskill == sk_baby)
-        bit = 1;
-    else if (gameskill == sk_nightmare)
-        bit = 4;
-    else
-        // avoid undefined behavior (left shift by negative value and rhs too big)
-        // by accurately emulating what doom.exe did: reduce mod 32.
-        // For more details check:
-        // https://github.com/chocolate-doom/chocolate-doom/issues/1677
-        bit = (int) (1U << ((gameskill - 1) & 0x1F));
-
-    if (!(mthing->options & bit) )
-        return;
-
-    // find which type to spawn
-    for (i=0 ; i< NUMMOBJTYPES ; i++)
-        if (mthing->type == mobjinfo[i].doomednum)
-            break;
-
-    if (i==NUMMOBJTYPES)
-        I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",
-                 mthing->type,
-                 mthing->x, mthing->y);
-
-    // don't spawn keycards and players in deathmatch
-    if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
-        return;
-
-    // don't spawn any monsters if -nomonsters
-    // villsa [STRIFE] Removed MT_SKULL
-    if (nomonsters && (mobjinfo[i].flags & MF_COUNTKILL))
-        return;
-    
-    // spawn it
-    x = mthing->x << FRACBITS;
-    y = mthing->y << FRACBITS;
-
-    if (mobjinfo[i].flags & MF_SPAWNCEILING)
-        z = ONCEILINGZ;
-    else
-        z = ONFLOORZ;
-    
-    mobj = P_SpawnMobj (x,y,z, i);
-    mobj->spawnpoint = *mthing;
-
-    if (mobj->tics > 0)
-        mobj->tics = 1 + (P_Random () % mobj->tics);
-    if (mobj->flags & MF_COUNTKILL)
-        totalkills++;
-
-    // villsa [STRIFE] unused
-    /*
-    if (mobj->flags & MF_COUNTITEM)
-        totalitems++;
-    */
-
-    mobj->angle = ANG45 * (mthing->angle/45);
-    if (mthing->options & MTF_AMBUSH)
-        mobj->flags |= MF_AMBUSH;
-    if (mthing->options & MTF_STAND)       // [STRIFE] Standing mode, for NPCs
-        mobj->flags |= MF_STAND;
-    if (mthing->options & MTF_FRIEND)      // [STRIFE] Allies
-        mobj->flags |= MF_ALLY;
-    if (mthing->options & MTF_TRANSLUCENT) // [STRIFE] Translucent object
-        mobj->flags |= MF_SHADOW;
-    if (mthing->options & MTF_MVIS)        // [STRIFE] Alt. Translucency
-        mobj->flags |= MF_MVIS;
-}
-
-
-
-//
-// GAME SPAWN FUNCTIONS
-//
-
-
-//
-// P_SpawnPuff
-//
-// [STRIFE] Modifications for:
-// * No spawn tics randomization
-// * Player melee behavior
-//
-
-void
-P_SpawnPuff
-( fixed_t	x,
-  fixed_t	y,
-  fixed_t	z )
-{
-    mobj_t*	th;
-    int t;
-    
-    t = P_Random();
-    z += ((t - P_Random()) << 10);
-
-    // [STRIFE] removed momz and tics randomization
-
-    th = P_SpawnMobj(x, y, z, MT_STRIFEPUFF); // [STRIFE]: new type
-
-    // don't make punches spark on the wall
-    // [STRIFE] Use a separate melee attack range for the player
-    if(attackrange == PLAYERMELEERANGE)
-        P_SetMobjState(th, S_POW2_00); // 141
-
-    // villsa [STRIFE] unused
-    /*
-    if (th->tics < 1)
-        th->tics = 1;
-    */
-}
-
-//
-// P_SpawnSparkPuff
-//
-// villsa [STRIFE] new function
-//
-mobj_t* P_SpawnSparkPuff(fixed_t x, fixed_t y, fixed_t z)
-{
-    int t = P_Random();
-    return P_SpawnMobj(x, y, ((t - P_Random()) << 10) + z, MT_SPARKPUFF);
-}
-
-//
-// P_SpawnBlood
-// 
-// [STRIFE] Modifications for:
-// * No spawn tics randomization
-// * Different damage ranges for state setting
-//
-void
-P_SpawnBlood
-( fixed_t       x,
-  fixed_t       y,
-  fixed_t       z,
-  int           damage )
-{
-    mobj_t*     th;
-    int temp;
-    
-    temp = P_Random();
-    z += (temp - P_Random()) << 10;
-    th = P_SpawnMobj(x, y, z, MT_BLOOD_DEATH);
-    th->momz = FRACUNIT*2;
-    
-    // villsa [STRIFE]: removed tics randomization
-
-    // villsa [STRIFE] different checks for damage range
-    if(damage >= 10 && damage <= 13)
-        P_SetMobjState(th, S_BLOD_00);
-    else if(damage >= 7 && damage < 10)
-        P_SetMobjState(th, S_BLOD_01);
-    else if(damage < 7)
-        P_SetMobjState(th, S_BLOD_02);
-}
-
-
-
-//
-// P_CheckMissileSpawn
-// Moves the missile forward a bit
-//  and possibly explodes it right there.
-//
-// [STRIFE] Modifications for:
-// * No spawn tics randomization
-//
-void P_CheckMissileSpawn (mobj_t* th)
-{
-    // villsa [STRIFE] removed tics randomization
-    
-    // move a little forward so an angle can
-    // be computed if it immediately explodes
-    th->x += (th->momx>>1);
-    th->y += (th->momy>>1);
-    th->z += (th->momz>>1);
-
-    if (!P_TryMove (th, th->x, th->y))
-        P_ExplodeMissile (th);
-}
-
-// Certain functions assume that a mobj_t pointer is non-NULL,
-// causing a crash in some situations where it is NULL.  Vanilla
-// Doom did not crash because of the lack of proper memory 
-// protection. This function substitutes NULL pointers for
-// pointers to a dummy mobj, to avoid a crash.
-
-mobj_t *P_SubstNullMobj(mobj_t *mobj)
-{
-    if (mobj == NULL)
-    {
-        static mobj_t dummy_mobj;
-
-        dummy_mobj.x = 0;
-        dummy_mobj.y = 0;
-        dummy_mobj.z = 0;
-        dummy_mobj.flags = 0;
-
-        mobj = &dummy_mobj;
-    }
-
-    return mobj;
-}
-
-//
-// P_SpawnMissile
-//
-// [STRIFE] Added MVIS inaccuracy
-//
-mobj_t*
-P_SpawnMissile
-( mobj_t*       source,
-  mobj_t*       dest,
-  mobjtype_t    type )
-{
-    mobj_t*     th;
-    angle_t     an;
-    int         dist;
-
-    th = P_SpawnMobj (source->x,
-                      source->y,
-                      source->z + 4*8*FRACUNIT, type);
-
-    if (th->info->seesound)
-        S_StartSound (th, th->info->seesound);
-
-    th->target = source;	// where it came from
-    an = R_PointToAngle2 (source->x, source->y, dest->x, dest->y);
-
-    // fuzzy player
-    if (dest->flags & MF_SHADOW)
-    {
-        int t = P_Random(); // haleyjd 20110223: remove order-of-evaluation dependencies
-        an += (t - P_Random()) << 21;
-    }
-    // villsa [STRIFE] check for heavily transparent things
-    else if(dest->flags & MF_MVIS)
-    {
-        int t = P_Random();
-        an += (t - P_Random()) << 22;
-    }
-
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul (th->info->speed, finecosine[an]);
-    th->momy = FixedMul (th->info->speed, finesine[an]);
-
-    dist = P_AproxDistance (dest->x - source->x, dest->y - source->y);
-    dist = dist / th->info->speed;
-
-    if (dist < 1)
-        dist = 1;
-
-    th->momz = (dest->z - source->z) / dist;
-    P_CheckMissileSpawn (th);
-
-    return th;
-}
-
-//
-// P_SpawnFacingMissile
-//
-// villsa [STRIFE] new function
-// Spawn a missile based on source's angle
-//
-mobj_t* P_SpawnFacingMissile(mobj_t* source, mobj_t* target, mobjtype_t type)
-{
-    mobj_t* th;
-    angle_t an;
-    fixed_t dist;
-
-    th = P_SpawnMobj(source->x, source->y, source->z + (32*FRACUNIT), type);
-
-    if(th->info->seesound)
-        S_StartSound(th, th->info->seesound);
-
-    th->target = source;    // where it came from
-    th->angle = source->angle; // haleyjd 09/06/10: fix0red
-    an = th->angle;
-
-    // fuzzy player
-    if (target->flags & MF_SHADOW)
-    {
-        int t = P_Random();
-        an += (t - P_Random()) << 21;
-    }
-    // villsa [STRIFE] check for heavily transparent things
-    else if(target->flags & MF_MVIS)
-    {
-        int t = P_Random();
-        an += (t - P_Random()) << 22;
-    }
-
-    an >>= ANGLETOFINESHIFT;
-    th->momx = FixedMul (th->info->speed, finecosine[an]);
-    th->momy = FixedMul (th->info->speed, finesine[an]);
-
-    dist = P_AproxDistance (target->x - source->x, target->y - source->y);
-    dist = dist / th->info->speed;
-
-    if(dist < 1)
-        dist = 1;
-
-    th->momz = (target->z - source->z) / dist;
-    P_CheckMissileSpawn (th);
-
-    return th;
-}
-
-//
-// P_SpawnPlayerMissile
-//
-// Tries to aim at a nearby monster
-// villsa [STRIFE] now returns a mobj
-// * Also modified to allow up/down look, and to account for foot-clipping
-//   by liquid terrain.
-//
-mobj_t* P_SpawnPlayerMissile(mobj_t* source, mobjtype_t type)
-{
-    mobj_t*	th;
-    angle_t	an;
-    
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	z;
-    fixed_t	slope;
-    
-    // see which target is to be aimed at
-    an = source->angle;
-    slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
-    
-    if (!linetarget)
-    {
-        an += 1<<26;
-        slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
-
-        if (!linetarget)
-        {
-            an -= 2<<26;
-            slope = P_AimLineAttack (source, an, 16*64*FRACUNIT);
-        }
-
-        if (!linetarget)
-        {
-            an = source->angle;
-
-            // haleyjd 09/21/10: [STRIFE] Removed, for look up/down support.
-            //slope = 0; 
-        }
-    }
-
-    // villsa [STRIFE]
-    if(linetarget)
-        source->target = linetarget;
-
-    x = source->x;
-    y = source->y;
-    
-    // villsa [STRIFE]
-    if(!(source->flags & MF_FEETCLIPPED))
-        z = source->z + 32*FRACUNIT;
-    else
-        z = source->z + 22*FRACUNIT;
-
-    th = P_SpawnMobj (x,y,z, type);
-
-    if (th->info->seesound)
-        S_StartSound (th, th->info->seesound);
-
-    th->target = source;
-    th->angle = an;
-    th->momx = FixedMul( th->info->speed,
-                         finecosine[an>>ANGLETOFINESHIFT]);
-    th->momy = FixedMul( th->info->speed,
-                         finesine[an>>ANGLETOFINESHIFT]);
-    th->momz = FixedMul( th->info->speed, slope);
-
-    P_CheckMissileSpawn (th);
-
-    return th;
-}
-
-//
-// P_SpawnMortar
-//
-// villsa [STRIFE] new function
-// Spawn a high-arcing ballistic projectile
-//
-mobj_t* P_SpawnMortar(mobj_t *source, mobjtype_t type)
-{
-    mobj_t* th;
-    angle_t an;
-    fixed_t slope;
-
-    an = source->angle;
-
-    th = P_SpawnMobj(source->x, source->y, source->z, type);
-    th->target = source;
-    th->angle = an;
-    an >>= ANGLETOFINESHIFT;
-
-    // haleyjd 20110203: corrected order of function calls
-    th->momx = FixedMul(th->info->speed, finecosine[an]);
-    th->momy = FixedMul(th->info->speed, finesine[an]);
-
-    P_CheckMissileSpawn(th);
-    
-    slope = P_AimLineAttack(source, source->angle, 1024*FRACUNIT);
-    th->momz = FixedMul(th->info->speed, slope);
-
-    return th;
-}
diff --git a/games/NXDoom/src/strife/p_mobj.h b/games/NXDoom/src/strife/p_mobj.h
deleted file mode 100644
index 3872f9d03..000000000
--- a/games/NXDoom/src/strife/p_mobj.h
+++ /dev/null
@@ -1,330 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Map Objects, MObj, definition and handling.
-//
-
-
-#ifndef __P_MOBJ__
-#define __P_MOBJ__
-
-// Basics.
-#include "tables.h"
-#include "m_fixed.h"
-
-// We need the thinker_t stuff.
-#include "d_think.h"
-
-// We need the WAD data structure for Map things,
-// from the THINGS lump.
-#include "doomdata.h"
-
-// States are tied to finite states are
-//  tied to animation frames.
-// Needs precompiled tables/data structures.
-#include "info.h"
-
-
-
-
-
-
-//
-// NOTES: mobj_t
-//
-// mobj_ts are used to tell the refresh where to draw an image,
-// tell the world simulation when objects are contacted,
-// and tell the sound driver how to position a sound.
-//
-// The refresh uses the next and prev links to follow
-// lists of things in sectors as they are being drawn.
-// The sprite, frame, and angle elements determine which patch_t
-// is used to draw the sprite if it is visible.
-// The sprite and frame values are allmost allways set
-// from state_t structures.
-// The statescr.exe utility generates the states.h and states.c
-// files that contain the sprite/frame numbers from the
-// statescr.txt source file.
-// The xyz origin point represents a point at the bottom middle
-// of the sprite (between the feet of a biped).
-// This is the default origin position for patch_ts grabbed
-// with lumpy.exe.
-// A walking creature will have its z equal to the floor
-// it is standing on.
-//
-// The sound code uses the x,y, and subsector fields
-// to do stereo positioning of any sound effited by the mobj_t.
-//
-// The play simulation uses the blocklinks, x,y,z, radius, height
-// to determine when mobj_ts are touching each other,
-// touching lines in the map, or hit by trace lines (gunshots,
-// lines of sight, etc).
-// The mobj_t->flags element has various bit flags
-// used by the simulation.
-//
-// Every mobj_t is linked into a single sector
-// based on its origin coordinates.
-// The subsector_t is found with R_PointInSubsector(x,y),
-// and the sector_t can be found with subsector->sector.
-// The sector links are only used by the rendering code,
-// the play simulation does not care about them at all.
-//
-// Any mobj_t that needs to be acted upon by something else
-// in the play world (block movement, be shot, etc) will also
-// need to be linked into the blockmap.
-// If the thing has the MF_NOBLOCK flag set, it will not use
-// the block links. It can still interact with other things,
-// but only as the instigator (missiles will run into other
-// things, but nothing can run into a missile).
-// Each block in the grid is 128*128 units, and knows about
-// every line_t that it contains a piece of, and every
-// interactable mobj_t that has its origin contained.  
-//
-// A valid mobj_t is a mobj_t that has the proper subsector_t
-// filled in for its xy coordinates and is linked into the
-// sector from which the subsector was made, or has the
-// MF_NOSECTOR flag set (the subsector_t needs to be valid
-// even if MF_NOSECTOR is set), and is linked into a blockmap
-// block or has the MF_NOBLOCKMAP flag set.
-// Links should only be modified by the P_[Un]SetThingPosition()
-// functions.
-// Do not change the MF_NO? flags while a thing is valid.
-//
-// Any questions?
-//
-
-//
-// Misc. mobj flags
-//
-typedef enum
-{
-    // Call P_SpecialThing when touched.
-    MF_SPECIAL          = 1,
-
-    // Blocks.
-    MF_SOLID            = 2,
-
-    // Can be hit.
-    MF_SHOOTABLE        = 4,
-
-    // Don't use the sector links (invisible but touchable).
-    MF_NOSECTOR         = 8,
-
-    // Don't use the blocklinks (inert but displayable)
-    MF_NOBLOCKMAP       = 16,
-
-    // villsa [STRIFE] Stand around until alerted
-    MF_STAND            = 32,
-
-    // Will try to attack right back.
-    MF_JUSTHIT          = 64,
-
-    // Will take at least one step before attacking.
-    MF_JUSTATTACKED     = 128,
-
-    // On level spawning (initial position),
-    //  hang from ceiling instead of stand on floor.
-    MF_SPAWNCEILING     = 256,
-
-    // Don't apply gravity (every tic),
-    //  that is, object will float, keeping current height
-    //  or changing it actively.
-    MF_NOGRAVITY        = 512,
-
-    // Movement flags.
-    // This allows jumps from high places.
-    MF_DROPOFF          = 0x400,
-
-    // villsa [STRIFE] For players, count as quest item
-    MF_GIVEQUEST        = 0x800,
-
-    // Player cheat. ???
-    MF_NOCLIP           = 0x1000,
-
-    // villsa [STRIFE] are feet clipped into water/slude floor?
-    MF_FEETCLIPPED      = 0x2000,
-
-    // Allow moves to any height, no gravity.
-    // For active floaters, e.g. cacodemons, pain elementals.
-    MF_FLOAT            = 0x4000,
-
-    // villsa [STRIFE] can NPC talk?
-    MF_NODIALOG         = 0x8000,
-
-    // Don't hit same species, explode on block.
-    // Player missiles as well as fireballs of various kinds.
-    MF_MISSILE          = 0x10000,
-
-    // Dropped by a demon, not level spawned.
-    // E.g. ammo clips dropped by dying former humans.
-    MF_DROPPED          = 0x20000,
-
-    // Use fuzzy draw (shadow demons or spectres),
-    //  temporary player invisibility powerup.
-    MF_SHADOW           = 0x40000,
-
-    // Flag: don't bleed when shot (use puff),
-    //  barrels and shootable furniture shall not bleed.
-    MF_NOBLOOD          = 0x80000,
-
-    // Don't stop moving halfway off a step,
-    //  that is, have dead bodies slide down all the way.
-    MF_CORPSE           = 0x100000,
-
-    // Floating to a height for a move, ???
-    //  don't auto float to target's height.
-    MF_INFLOAT          = 0x200000,
-
-    // On kill, count this enemy object
-    //  towards intermission kill total.
-    // Happy gathering.
-    MF_COUNTKILL        = 0x400000,
-
-    // Not to be activated by sound, deaf monster.
-    MF_AMBUSH           = 0x800000,
-
-    // villsa [STRIFE] flag used for bouncing projectiles
-    MF_BOUNCE           = 0x1000000,
-
-    // Don't spawn this object
-    //  in death match mode (e.g. key cards).
-    MF_NOTDMATCH        = 0x2000000,
-
-    // villsa [STRIFE] friendly towards player with matching flag
-    MF_ALLY             = 0x4000000,
-
-    // villsa [STRIFE] 75% or 25% transparency? -- NEEDS VERIFICATION
-    MF_MVIS             = 0x8000000,
-
-    // villsa [STRIFE] color translation
-    MF_COLORSWAP1       = 0x10000000,
-
-    // villsa [STRIFE] color translation
-    MF_COLORSWAP2       = 0x20000000,
-
-    // villsa [STRIFE] color translation
-    MF_COLORSWAP3       = 0x40000000,
-
-    // villsa [STRIFE] spectral entity, only damaged by spectral missiles
-    MF_SPECTRAL         = 0x80000000,
-
-    // Player sprites in multiplayer modes are modified
-    //  using an internal color lookup table for re-indexing.
-    // haleyjd 09/06/10: redid for Strife translations
-    MF_TRANSLATION      = (MF_COLORSWAP1|MF_COLORSWAP2|MF_COLORSWAP3),
-
-    // Turns 0x10000000 into 0x01 to get a translation index.
-    // villsa [STRIFE] change from 26 to 28
-    MF_TRANSSHIFT       = 28
-
-} mobjflag_t;
-
-
-// Map Object definition.
-//
-// [STRIFE]: Amazingly, only one modification was made to mobj_t over DOOM 
-// 1.666, and that was the addition of the single-byte allegiance field for
-// tracking with which player friendly monsters are allied.
-//
-typedef struct mobj_s
-{
-    // List: thinker links.
-    thinker_t           thinker;
-
-    // Info for drawing: position.
-    fixed_t             x;
-    fixed_t             y;
-    fixed_t             z;
-
-    // More list: links in sector (if needed)
-    struct mobj_s*      snext;
-    struct mobj_s*      sprev;
-
-    //More drawing info: to determine current sprite.
-    angle_t             angle;  // orientation
-    spritenum_t         sprite; // used to find patch_t and flip value
-    int                 frame;  // might be ORed with FF_FULLBRIGHT
-
-    // Interaction info, by BLOCKMAP.
-    // Links in blocks (if needed).
-    struct mobj_s*      bnext;
-    struct mobj_s*      bprev;
-    
-    struct subsector_s* subsector;
-
-    // The closest interval over all contacted Sectors.
-    fixed_t             floorz;
-    fixed_t             ceilingz;
-
-    // For movement checking.
-    fixed_t             radius;
-    fixed_t             height;
-
-    // Momentums, used to update position.
-    fixed_t             momx;
-    fixed_t             momy;
-    fixed_t             momz;
-
-    // If == validcount, already checked.
-    int                 validcount;
-
-    mobjtype_t          type;
-    mobjinfo_t*         info;   // &mobjinfo[mobj->type]
-    
-    int                 tics;   // state tic counter
-    state_t*            state;
-    int                 flags;
-    int                 health;
-
-    // Movement direction, movement generation (zig-zagging).
-    int                 movedir;        // 0-7
-    int                 movecount;      // when 0, select a new dir
-
-    // Thing being chased/attacked (or NULL),
-    // also the originator for missiles.
-    struct mobj_s*      target;
-
-    // Reaction time: if non 0, don't attack yet.
-    // Used by player to freeze a bit after teleporting.
-    int                 reactiontime;   
-
-    // If >0, the target will be chased
-    // no matter what (even if shot)
-    int                 threshold;
-
-    // Additional info record for player avatars only.
-    // Only valid if type == MT_PLAYER
-    struct player_s*    player;
-
-    // Player number last looked for.
-    int                 lastlook;
-
-    // For nightmare respawn.
-    mapthing_t          spawnpoint;
-
-    // Thing being chased/attacked for tracers.
-    struct mobj_s*      tracer;
-
-    // [STRIFE] haleyjd 09/05/10: 
-    // * In multiplayer this stores allegiance, for friends and teleport beacons
-    // * In single-player this tracks dialog state.
-    byte                miscdata;
-    
-} mobj_t;
-
-// haleyjd [STRIFE] Exported
-void P_CheckMissileSpawn (mobj_t* th);
-
-#endif
diff --git a/games/NXDoom/src/strife/p_plats.c b/games/NXDoom/src/strife/p_plats.c
deleted file mode 100644
index aeb0eb5aa..000000000
--- a/games/NXDoom/src/strife/p_plats.c
+++ /dev/null
@@ -1,358 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Plats (i.e. elevator platforms) code, raising/lowering.
-//
-
-#include <stdio.h>
-
-#include "i_system.h"
-#include "z_zone.h"
-#include "m_random.h"
-
-#include "doomdef.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "sounds.h"
-
-
-plat_t* activeplats[MAXPLATS];
-
-
-
-//
-// Move a plat up and down
-//
-void T_PlatRaise(plat_t* plat)
-{
-    result_e	res;
-
-    switch(plat->status)
-    {
-    case up:
-        res = T_MovePlane(plat->sector, plat->speed, plat->high, plat->crush, 0, 1);
-
-        if(plat->type == raiseAndChange
-            || plat->type == raiseToNearestAndChange)
-        {
-            if(!(leveltime&7))
-                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
-        }
-
-        // villsa [STRIFE]
-        if(plat->type == slowDWUS)
-        {
-            if(!(leveltime&7))
-                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
-        }
-
-
-        if(res == crushed && (!plat->crush))
-        {
-            plat->count = plat->wait;
-            plat->status = down;
-            S_StartSound(&plat->sector->soundorg, sfx_pstart);
-        }
-        else
-        {
-            if(res == pastdest)
-            {
-                plat->count = plat->wait;
-                plat->status = waiting;
-                S_StartSound(&plat->sector->soundorg, sfx_pstop);
-
-                switch(plat->type)
-                {
-                case blazeDWUS:
-                case downWaitUpStay:
-                case raiseAndChange:
-                case slowDWUS:  // villsa [STRIFE]
-                case raiseToNearestAndChange:
-                    P_RemoveActivePlat(plat);
-                    break;
-
-                default:
-                    break;
-                }
-            }
-        }
-        break;
-
-    case down:
-        res = T_MovePlane(plat->sector, plat->speed, plat->low, false, 0, -1);
-
-        // villsa [STRIFE]
-        if(plat->type == slowDWUS)
-        {
-            if(!(leveltime&7))
-                S_StartSound(&plat->sector->soundorg, sfx_stnmov);
-        }
-
-        if(res == pastdest)
-        {
-            plat->count = plat->wait;
-            plat->status = waiting;
-            S_StartSound(&plat->sector->soundorg,sfx_pstop);
-
-            // villsa [STRIFE]
-            if(plat->type == upWaitDownStay)
-                P_RemoveActivePlat(plat);
-        }
-        break;
-
-    case waiting:
-        if(!--plat->count)
-        {
-            if(plat->sector->floorheight == plat->low)
-                plat->status = up;
-            else
-                plat->status = down;
-            S_StartSound(&plat->sector->soundorg,sfx_pstart);
-        }
-
-    case in_stasis:
-        break;
-    }
-}
-
-
-//
-// EV_DoPlat
-//
-// Do Platforms "amount" is only used for SOME platforms.
-//
-int EV_DoPlat(line_t* line, plattype_e type, int amount)
-{
-    plat_t*     plat;
-    int         secnum;
-    int         rtn;
-    sector_t*   sec;
-
-    secnum = -1;
-    rtn = 0;
-
-
-    //	Activate all <type> plats that are in_stasis
-    switch(type)
-    {
-    case perpetualRaise:
-        P_ActivateInStasis(line->tag);
-        break;
-
-    default:
-        break;
-    }
-
-    while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-        sec = &sectors[secnum];
-
-        if (sec->specialdata)
-            continue;
-
-        // Find lowest & highest floors around sector
-        rtn = 1;
-        plat = Z_Malloc( sizeof(*plat), PU_LEVSPEC, 0);
-        P_AddThinker(&plat->thinker);
-
-        plat->type = type;
-        plat->sector = sec;
-        plat->sector->specialdata = plat;
-        plat->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
-        plat->crush = false;
-        plat->tag = line->tag;
-
-        switch(type)
-        {
-        case raiseToNearestAndChange:
-            plat->speed = PLATSPEED/2;
-            sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-            plat->high = P_FindNextHighestFloor(sec,sec->floorheight);
-            plat->wait = 0;
-            plat->status = up;
-
-            // NO MORE DAMAGE, IF APPLICABLE
-            sec->special = 0;		
-
-            S_StartSound(&sec->soundorg, sfx_stnmov);
-            break;
-
-        case raiseAndChange:
-            plat->speed = PLATSPEED/2;
-            sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-            plat->high = sec->floorheight + amount * FRACUNIT;
-            plat->wait = 0;
-            plat->status = up;
-
-            S_StartSound(&sec->soundorg, sfx_stnmov);
-            break;
-
-            // villsa [STRIFE]
-        case upWaitDownStay:
-            plat->speed = PLATSPEED * 4;
-            plat->high = P_FindNextHighestFloor(sec, sec->floorheight);
-            plat->low = sec->floorheight;
-            plat->wait = TICRATE * PLATWAIT;
-            plat->status = up;
-            S_StartSound(&sec->soundorg, sfx_pstart);
-            break;
-
-        case downWaitUpStay:
-            plat->speed = PLATSPEED * 4;
-            plat->low = P_FindLowestFloorSurrounding(sec);
-
-            if(plat->low > sec->floorheight)
-                plat->low = sec->floorheight;
-
-            plat->high = sec->floorheight;
-            plat->wait = TICRATE * PLATWAIT;
-            plat->status = down;
-            S_StartSound(&sec->soundorg, sfx_pstart);
-            break;
-
-            // villsa [STRIFE]
-        case slowDWUS:
-            plat->speed = PLATSPEED;
-            plat->low = P_FindLowestFloorSurrounding(sec);
-
-            if(plat->low > sec->floorheight)
-                plat->low = sec->floorheight;
-
-            plat->high = sec->floorheight;
-            plat->wait = TICRATE * (PLATWAIT * 10);
-            plat->status = down;
-            S_StartSound(&sec->soundorg,sfx_pstart);
-            break;
-
-        case blazeDWUS:
-            plat->speed = PLATSPEED * 8;
-            plat->low = P_FindLowestFloorSurrounding(sec);
-
-            if(plat->low > sec->floorheight)
-                plat->low = sec->floorheight;
-
-            plat->high = sec->floorheight;
-            plat->wait = TICRATE * PLATWAIT;
-            plat->status = down;
-            S_StartSound(&sec->soundorg, sfx_pstart);
-            break;
-
-        case perpetualRaise:
-            plat->speed = PLATSPEED;
-            plat->low = P_FindLowestFloorSurrounding(sec);
-
-            if(plat->low > sec->floorheight)
-                plat->low = sec->floorheight;
-
-            plat->high = P_FindHighestFloorSurrounding(sec);
-
-            if(plat->high < sec->floorheight)
-                plat->high = sec->floorheight;
-
-            plat->wait = TICRATE * PLATWAIT;
-            plat->status = P_Random() & 1;
-
-            S_StartSound(&sec->soundorg, sfx_pstart);
-            break;
-        }
-
-        P_AddActivePlat(plat);
-    }
-    return rtn;
-}
-
-
-//
-// P_ActivateInStasis
-//
-void P_ActivateInStasis(int tag)
-{
-    int i;
-
-    for(i = 0; i < MAXPLATS; i++)
-        if(activeplats[i]
-        && (activeplats[i])->tag == tag
-            && (activeplats[i])->status == in_stasis)
-        {
-            (activeplats[i])->status = (activeplats[i])->oldstatus;
-            (activeplats[i])->thinker.function.acp1
-                = (actionf_p1)T_PlatRaise;
-        }
-}
-
-//
-// EV_StopPlat
-//
-void EV_StopPlat(line_t* line)
-{
-    int j;
-
-    for(j = 0; j < MAXPLATS; j++)
-        if (activeplats[j]
-        && ((activeplats[j])->status != in_stasis)
-            && ((activeplats[j])->tag == line->tag))
-        {
-            (activeplats[j])->oldstatus = (activeplats[j])->status;
-            (activeplats[j])->status = in_stasis;
-            (activeplats[j])->thinker.function.acv = (actionf_v)NULL;
-        }
-}
-
-//
-// P_AddActivePlat
-//
-void P_AddActivePlat(plat_t* plat)
-{
-    int i;
-
-    for(i = 0; i < MAXPLATS; i++)
-    {
-        if (activeplats[i] == NULL)
-        {
-            activeplats[i] = plat;
-            return;
-        }
-    }
-
-    I_Error("P_AddActivePlat: no more plats!");
-}
-
-//
-// P_RemoveActivePlat
-//
-void P_RemoveActivePlat(plat_t* plat)
-{
-    int i;
-    for(i = 0; i < MAXPLATS; i++)
-    {
-        if(plat == activeplats[i])
-        {
-            (activeplats[i])->sector->specialdata = NULL;
-            P_RemoveThinker(&(activeplats[i])->thinker);
-            activeplats[i] = NULL;
-
-            return;
-        }
-    }
-
-    I_Error("P_RemoveActivePlat: can't find plat!");
-}
diff --git a/games/NXDoom/src/strife/p_pspr.c b/games/NXDoom/src/strife/p_pspr.c
deleted file mode 100644
index f7f283935..000000000
--- a/games/NXDoom/src/strife/p_pspr.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Weapon sprite animation, weapon objects.
-//	Action functions for weapons.
-//
-
-
-#include "doomdef.h"
-#include "d_event.h"
-
-#include "deh_misc.h"
-
-#include "m_random.h"
-#include "p_local.h"
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-
-// Data.
-#include "sounds.h"
-
-#include "p_pspr.h"
-
-#define LOWERSPEED		FRACUNIT*6
-#define RAISESPEED		FRACUNIT*6
-
-#define WEAPONBOTTOM	128*FRACUNIT
-#define WEAPONTOP		32*FRACUNIT
-
-
-
-//
-// P_SetPsprite
-//
-// [STRIFE]
-// villsa: Removed psprite sx, sy modification via misc1/2
-//
-void
-P_SetPsprite
-( player_t*     player,
-  int           position,
-  statenum_t    stnum )
-{
-    pspdef_t*   psp;
-    state_t*    state;
-
-    psp = &player->psprites[position];
-
-    do
-    {
-        if (!stnum)
-        {
-            // object removed itself
-            psp->state = NULL;
-            break;
-        }
-
-        state = &states[stnum];
-        psp->state = state;
-        psp->tics = state->tics;        // could be 0
-
-        // villsa [STRIFE] unused
-        /*if (state->misc1)
-        {
-            // coordinate set
-            psp->sx = state->misc1 << FRACBITS;
-            psp->sy = state->misc2 << FRACBITS;
-        }*/
-
-        // Call action routine.
-        // Modified handling.
-        if (state->action.acp2)
-        {
-            state->action.acp2(player, psp);
-            if (!psp->state)
-                break;
-        }
-
-        stnum = psp->state->nextstate;
-
-    } while (!psp->tics);
-    // an initial state of 0 could cycle through
-}
-
-// haleyjd 09/06/10: [STRIFE] Removed P_CalcSwing
-
-//
-// P_BringUpWeapon
-// Starts bringing the pending weapon up
-// from the bottom of the screen.
-// Uses player
-//
-// villsa [STRIFE] Modifications for Strife weapons
-//
-void P_BringUpWeapon (player_t* player)
-{
-    statenum_t  newstate;
-
-    if (player->pendingweapon == wp_nochange)
-        player->pendingweapon = player->readyweapon;
-
-    if (player->pendingweapon == wp_flame)
-        S_StartSound (player->mo, sfx_flidl);   // villsa [STRIFE] flame sounds
-
-    newstate = weaponinfo[player->pendingweapon].upstate;
-
-    player->psprites[ps_weapon].sy = WEAPONBOTTOM;
-    P_SetPsprite (player, ps_weapon, newstate);
-
-    // villsa [STRIFE] set various flash states
-    if(player->pendingweapon == wp_elecbow)
-        P_SetPsprite(player, ps_flash, S_XBOW_10); // 31
-    else if(player->pendingweapon == wp_sigil && player->sigiltype)
-        P_SetPsprite(player, ps_flash, S_SIGH_00 + player->sigiltype); // 117
-    else
-        P_SetPsprite(player, ps_flash, S_NULL);
-
-    player->pendingweapon = wp_nochange;
-}
-
-//
-// P_CheckAmmo
-// Returns true if there is enough ammo to shoot.
-// If not, selects the next weapon to use.
-//
-// villsa [STRIFE] Changes to handle Strife weapons
-//
-boolean P_CheckAmmo (player_t* player)
-{
-    ammotype_t          ammo;
-    int                 count;
-
-    ammo = weaponinfo[player->readyweapon].ammo;
-
-    // Minimal amount for one shot varies.
-    if (player->readyweapon == wp_torpedo)
-        count = 30;
-    else if (player->readyweapon == wp_mauler)
-        count = 20;
-    else
-        count = 1;      // Regular.
-
-    // Some do not need ammunition anyway.
-    // Return if current ammunition sufficient.
-    if (ammo == am_noammo || player->ammo[ammo] >= count)
-        return true;
-
-    // Out of ammo, pick a weapon to change to.
-    // Preferences are set here.
-
-    // villsa [STRIFE] new weapon preferences
-    if (player->weaponowned[wp_mauler] && player->ammo[am_cell] >= 20)
-        player->pendingweapon = wp_mauler;
-
-    else if(player->weaponowned[wp_rifle] && player->ammo[am_bullets])
-        player->pendingweapon = wp_rifle;
-
-    else if (player->weaponowned[wp_elecbow] && player->ammo[am_elecbolts])
-        player->pendingweapon = wp_elecbow;
-
-    else if (player->weaponowned[wp_missile] && player->ammo[am_missiles])
-        player->pendingweapon = wp_missile;
-
-    else if (player->weaponowned[wp_flame] && player->ammo[am_cell])
-        player->pendingweapon = wp_flame;
-
-    else if (player->weaponowned[wp_hegrenade] && player->ammo[am_hegrenades])
-        player->pendingweapon = wp_hegrenade;
-
-    else if (player->weaponowned[wp_poisonbow] && player->ammo[am_poisonbolts])
-        player->pendingweapon = wp_poisonbow;
-
-    else if (player->weaponowned[wp_wpgrenade] && player->ammo[am_wpgrenades])
-        player->pendingweapon = wp_wpgrenade;
-
-    // BUG: This will *never* be selected for an automatic switch because the 
-    // normal Mauler is higher priority and uses less ammo.
-    else if (player->weaponowned[wp_torpedo] && player->ammo[am_cell] >= 30)
-        player->pendingweapon = wp_torpedo; 
-
-    else
-        player->pendingweapon = wp_fist;
-
-
-    // Now set appropriate weapon overlay.
-    P_SetPsprite(player, ps_weapon, weaponinfo[player->readyweapon].downstate);
-
-    return false;
-}
-
-
-//
-// P_FireWeapon.
-//
-// villsa [STRIFE] Changes for player state and weapons
-//
-void P_FireWeapon (player_t* player)
-{
-    statenum_t  newstate;
-
-    if (!P_CheckAmmo (player))
-        return;
-
-    P_SetMobjState (player->mo, S_PLAY_05); // 292
-    newstate = weaponinfo[player->readyweapon].atkstate;
-    P_SetPsprite (player, ps_weapon, newstate);
-    
-    // villsa [STRIFE] exclude these weapons from causing noise
-    if(player->readyweapon > wp_elecbow && player->readyweapon != wp_poisonbow)
-        P_NoiseAlert (player->mo, player->mo);
-}
-
-
-
-//
-// P_DropWeapon
-// Player died, so put the weapon away.
-//
-void P_DropWeapon (player_t* player)
-{
-    P_SetPsprite (player,
-                  ps_weapon,
-                  weaponinfo[player->readyweapon].downstate);
-}
-
-
-
-//
-// A_WeaponReady
-// The player can fire the weapon
-// or change to another weapon at this time.
-// Follows after getting weapon up,
-// or after previous attack/fire sequence.
-//
-void A_WeaponReady( player_t* player, pspdef_t* psp)
-{
-    statenum_t  newstate;
-    int         angle;
-    
-    // get out of attack state
-    if (player->mo->state == &states[S_PLAY_05] || // 292
-        player->mo->state == &states[S_PLAY_06])   // 293
-    {
-        P_SetMobjState (player->mo, S_PLAY_00); // 287
-    }
-    
-    // villsa [STRIFE] check for wp_flame instead of chainsaw
-    // haleyjd 09/06/10: fixed state (00 rather than 01)
-    if (player->readyweapon == wp_flame
-        && psp->state == &states[S_FLMT_00]) // 62
-    {
-        S_StartSound (player->mo, sfx_flidl);
-    }
-    
-    // check for change
-    //  if player is dead, put the weapon away
-    if (player->pendingweapon != wp_nochange || !player->health)
-    {
-        // change weapon
-        //  (pending weapon should allready be validated)
-        newstate = weaponinfo[player->readyweapon].downstate;
-        P_SetPsprite (player, ps_weapon, newstate);
-        return;
-    }
-    
-    // check for fire
-    //  the missile launcher and torpedo do not auto fire
-    if (player->cmd.buttons & BT_ATTACK)
-    {
-        if ( !player->attackdown
-            || (player->readyweapon != wp_missile
-            && player->readyweapon != wp_torpedo)) // villsa [STRIFE] replace bfg with torpedo
-        {
-            player->attackdown = true;
-            P_FireWeapon (player);
-            return;
-        }
-    }
-    else
-        player->attackdown = false;
-    
-    // bob the weapon based on movement speed
-    angle = (128*leveltime)&FINEMASK;
-    psp->sx = FRACUNIT + FixedMul (player->bob, finecosine[angle]);
-    angle &= FINEANGLES/2-1;
-    psp->sy = WEAPONTOP + FixedMul (player->bob, finesine[angle]);
-}
-
-
-
-//
-// A_ReFire
-// The player can re-fire the weapon
-// without lowering it entirely.
-//
-void A_ReFire
-( player_t*	player,
-  pspdef_t*	psp )
-{
-    
-    // check for fire
-    //  (if a weaponchange is pending, let it go through instead)
-    if ( (player->cmd.buttons & BT_ATTACK) 
-        && player->pendingweapon == wp_nochange
-        && player->health)
-    {
-        player->refire++;
-        P_FireWeapon (player);
-    }
-    else
-    {
-        player->refire = 0;
-        P_CheckAmmo (player);
-    }
-}
-
-//
-// A_CheckReload
-//
-void A_CheckReload(player_t* player, pspdef_t* psp)
-{
-    P_CheckAmmo(player);
-
-    // villsa [STRIFE] set animating sprite for crossbow
-    if(player->readyweapon == wp_elecbow)
-        P_SetPsprite(player, player->readyweapon, S_XBOW_10);
-}
-
-
-
-//
-// A_Lower
-// Lowers current weapon,
-//  and changes weapon at bottom.
-//
-void
-A_Lower
-( player_t*	player,
-  pspdef_t*	psp )
-{	
-    psp->sy += LOWERSPEED;
-
-    // Is already down.
-    if (psp->sy < WEAPONBOTTOM )
-        return;
-
-    // Player is dead.
-    if (player->playerstate == PST_DEAD)
-    {
-        psp->sy = WEAPONBOTTOM;
-
-        // don't bring weapon back up
-        return;
-    }
-    
-    // The old weapon has been lowered off the screen,
-    // so change the weapon and start raising it
-    if (!player->health)
-    {
-        // Player is dead, so keep the weapon off screen.
-        P_SetPsprite (player,  ps_weapon, S_NULL);
-        return;
-    }
-
-    player->readyweapon = player->pendingweapon; 
-
-    P_BringUpWeapon (player);
-}
-
-
-//
-// A_Raise
-//
-void
-A_Raise
-( player_t*	player,
-  pspdef_t*	psp )
-{
-    statenum_t  newstate;
-
-    psp->sy -= RAISESPEED;
-
-    if (psp->sy > WEAPONTOP )
-        return;
-
-    psp->sy = WEAPONTOP;
-
-    // The weapon has been raised all the way,
-    //  so change to the ready state.
-    newstate = weaponinfo[player->readyweapon].readystate;
-
-    P_SetPsprite (player, ps_weapon, newstate);
-}
-
-
-
-//
-// A_GunFlash
-//
-void
-A_GunFlash
-( player_t*	player,
-  pspdef_t*	psp ) 
-{
-    P_SetMobjState (player->mo, S_PLAY_06);
-    P_SetPsprite (player,ps_flash,weaponinfo[player->readyweapon].flashstate);
-}
-
-
-
-//
-// WEAPON ATTACKS
-//
-
-
-//
-// A_Punch
-//
-
-void A_Punch(player_t* player, pspdef_t* psp) 
-{
-    angle_t     angle;
-    int         damage;
-    int         slope;
-    int         sound;
-    int         stamina;
-    int         t;
-
-    // villsa [STRIFE] new damage formula
-    // haleyjd 09/19/10: seriously corrected...
-    stamina = player->stamina;
-    damage = (P_Random() & ((stamina/10) + 7)) * ((stamina/10) + 2);
-
-    if(player->powers[pw_strength])
-        damage *= 10;
-
-    angle = player->mo->angle;
-    t = P_Random();
-    angle += (t - P_Random()) << 18;
-    slope = P_AimLineAttack (player->mo, angle, PLAYERMELEERANGE);
-    P_LineAttack (player->mo, angle, PLAYERMELEERANGE, slope, damage);
-
-    // turn to face target
-    if(linetarget)
-    {
-        // villsa [STRIFE] check for non-flesh types
-        if(linetarget->flags & MF_NOBLOOD)
-            sound = sfx_mtalht;
-        else
-            sound = sfx_meatht;
-
-        S_StartSound (player->mo, sound);
-        player->mo->angle = R_PointToAngle2 (player->mo->x,
-                                             player->mo->y,
-                                             linetarget->x,
-                                             linetarget->y);
-
-        // villsa [STRIFE] apply flag
-        player->mo->flags |= MF_JUSTATTACKED;
-
-        // villsa [STRIFE] do punch alert routine
-        P_DoPunchAlert(player->mo, linetarget);
-    }
-    else
-        S_StartSound (player->mo, sfx_swish);
-}
-
-
-//
-// A_FireFlameThrower
-//
-// villsa [STRIFE] new codepointer
-//
-void A_FireFlameThrower(player_t* player, pspdef_t* psp) 
-{
-    mobj_t* mo;
-    int t;
-
-    P_SetMobjState(player->mo, S_PLAY_06);
-    player->ammo[weaponinfo[player->readyweapon].ammo]--;
-    t = P_Random();
-    player->mo->angle += (t - P_Random()) << 18;
-
-    mo = P_SpawnPlayerMissile(player->mo, MT_SFIREBALL);
-    mo->momz += (5*FRACUNIT);
-}
-
-//
-// A_FireMissile
-//
-// villsa [STRIFE] completly new compared to the original
-//
-void A_FireMissile(player_t* player, pspdef_t* psp) 
-{
-    angle_t an;
-    int t;
-
-    // haleyjd 09/19/10: I previously missed an add op that meant it should be
-    // accuracy * 5, not 4. Checks out with other sources.
-    an = player->mo->angle;
-    t = P_Random();
-    player->mo->angle += (t - P_Random()) << (19 - (player->accuracy * 5 / 100));
-    P_SetMobjState(player->mo, S_PLAY_06);
-    player->ammo[weaponinfo[player->readyweapon].ammo]--;
-    P_SpawnPlayerMissile(player->mo, MT_MINIMISSLE);
-    player->mo->angle = an;
-}
-
-//
-// A_FireMauler2
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_FireMauler2(player_t* player, pspdef_t* pspr)
-{
-    P_SetMobjState(player->mo, S_PLAY_06);
-    P_DamageMobj(player->mo, player->mo, NULL, 20);
-    player->ammo[weaponinfo[player->readyweapon].ammo] -= 30;
-    P_SpawnPlayerMissile(player->mo, MT_TORPEDO);
-    P_Thrust(player, player->mo->angle + ANG180, 512000);
-}
-
-//
-// A_FireGrenade
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_FireGrenade(player_t* player, pspdef_t* pspr)
-{
-    mobjtype_t type;
-    mobj_t* mo;
-    state_t* st1;
-    state_t* st2;
-    angle_t an;
-    fixed_t radius;
-
-    // decide on what type of grenade to spawn
-    if(player->readyweapon == wp_hegrenade)
-    {
-        type = MT_HEGRENADE;
-    }
-    else if(player->readyweapon == wp_wpgrenade)
-    {
-        type = MT_PGRENADE;
-    }
-    else
-    {
-        type = MT_HEGRENADE;
-        fprintf(stderr, "Warning: A_FireGrenade used on wrong weapon!\n");
-    }
-
-    player->ammo[weaponinfo[player->readyweapon].ammo]--;
-
-    // set flash frame
-    st1 = &states[(pspr->state - states) + weaponinfo[player->readyweapon].flashstate];
-    st2 = &states[weaponinfo[player->readyweapon].atkstate];
-    P_SetPsprite(player, ps_flash, st1 - st2);
-
-    player->mo->z += 32*FRACUNIT; // ugh
-    mo = P_SpawnMortar(player->mo, type);
-    player->mo->z -= 32*FRACUNIT; // ugh
-
-    // change momz based on player's pitch
-    mo->momz = FixedMul((player->pitch<<FRACBITS) / 160, mo->info->speed) + (8*FRACUNIT);
-    S_StartSound(mo, mo->info->seesound);
-
-    radius = mobjinfo[type].radius + player->mo->info->radius;
-    an = (player->mo->angle >> ANGLETOFINESHIFT);
-
-    mo->x += FixedMul(finecosine[an], radius + (4*FRACUNIT));
-    mo->y += FixedMul(finesine[an], radius + (4*FRACUNIT));
-
-    // shoot grenade from left or right side?
-    if(&states[weaponinfo[player->readyweapon].atkstate] == pspr->state)
-        an = (player->mo->angle - ANG90) >> ANGLETOFINESHIFT;
-    else
-        an = (player->mo->angle + ANG90) >> ANGLETOFINESHIFT;
-
-    mo->x += FixedMul((15*FRACUNIT), finecosine[an]);
-    mo->y += FixedMul((15*FRACUNIT), finesine[an]);
-
-    // set bounce flag
-    mo->flags |= MF_BOUNCE;
-}
-
-//
-// A_FireElectricBolt
-// villsa [STRIFE] - new codepointer
-//
-
-void A_FireElectricBolt(player_t* player, pspdef_t* pspr)
-{
-    angle_t an = player->mo->angle;
-    int t;
-
-    // haleyjd 09/19/10: Use 5 mul on accuracy here as well
-    t = P_Random();
-    player->mo->angle += (t - P_Random()) << (18 - (player->accuracy * 5 / 100));
-    player->ammo[weaponinfo[player->readyweapon].ammo]--;
-    P_SpawnPlayerMissile(player->mo, MT_ELECARROW);
-    player->mo->angle = an;
-    S_StartSound(player->mo, sfx_xbow);
-}
-
-//
-// A_FirePoisonBolt
-// villsa [STRIFE] - new codepointer
-//
-
-void A_FirePoisonBolt(player_t* player, pspdef_t* pspr)
-{
-    angle_t an = player->mo->angle;
-    int t;
-
-    // haleyjd 09/19/10: Use 5 mul on accuracy here as well
-    t = P_Random();
-    player->mo->angle += (t - P_Random()) << (18 - (player->accuracy * 5 / 100));
-    player->ammo[weaponinfo[player->readyweapon].ammo]--;
-    P_SpawnPlayerMissile(player->mo, MT_POISARROW);
-    player->mo->angle = an;
-    S_StartSound(player->mo, sfx_xbow);
-}
-
-//
-// P_BulletSlope
-// Sets a slope so a near miss is at aproximately
-// the height of the intended target
-//
-// haleyjd 09/06/10 [STRIFE] Modified with a little target hack...
-//
-fixed_t         bulletslope;
-
-
-void P_BulletSlope (mobj_t *mo)
-{
-    angle_t	an;
-    
-    // see which target is to be aimed at
-    an = mo->angle;
-    bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-
-    if (!linetarget)
-    {
-        an += 1<<26;
-        bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-        if (!linetarget)
-        {
-            an -= 2<<26;
-            bulletslope = P_AimLineAttack (mo, an, 16*64*FRACUNIT);
-        }
-    }
-
-    // haleyjd 09/06/10: [STRIFE] Somebody added this here, and without it, you
-    // will get spurious crashing in routines such as P_LookForPlayers!
-    if(linetarget)
-        mo->target = linetarget;
-}
-
-
-//
-// P_GunShot
-//
-// [STRIFE] Modifications to support accuracy.
-//
-void
-P_GunShot
-( mobj_t*	mo,
-  boolean	accurate )
-{
-    angle_t     angle;
-    int         damage;
-
-    angle = mo->angle;
-
-    // villsa [STRIFE] apply player accuracy
-    // haleyjd 09/18/10: made some corrections: use 5x accuracy;
-    // eliminated order-of-evaluation dependency
-    if (!accurate)
-    {
-        int t = P_Random();
-        angle += (t - P_Random()) << (20 - ((mo->player->accuracy * 5) / 100));
-    }
-
-    // haleyjd 09/18/10 [STRIFE] corrected damage formula and moved down to
-    // preserve proper P_Random call order.
-    damage = 4 * (P_Random() % 3 + 1);
-
-    P_LineAttack (mo, angle, MISSILERANGE, bulletslope, damage);
-}
-
-//
-// A_FireRifle
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_FireRifle(player_t* player, pspdef_t* pspr)
-{
-    S_StartSound(player->mo, sfx_rifle);
-
-    if(player->ammo[weaponinfo[player->readyweapon].ammo])
-    {
-        P_SetMobjState(player->mo, S_PLAY_06); // 293
-        player->ammo[weaponinfo[player->readyweapon].ammo]--;
-        P_BulletSlope(player->mo);
-        P_GunShot(player->mo, !player->refire);
-    }
-}
-
-//
-// A_FireMauler1
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_FireMauler1(player_t* player, pspdef_t* pspr)
-{
-    int i;
-    angle_t angle;
-    int damage;
-
-    // haleyjd 09/18/10: Corrected ammo check to use >=
-    if(player->ammo[weaponinfo[player->readyweapon].ammo] >= 20)
-    {
-        player->ammo[weaponinfo[player->readyweapon].ammo] -= 20;
-        P_BulletSlope(player->mo);
-        S_StartSound(player->mo, sfx_pgrdat);
-
-        for(i = 0; i < 20; i++)
-        {
-            int t;
-            damage = 5*(P_Random ()%3+1);
-            angle = player->mo->angle;
-            t = P_Random();
-            angle += (t - P_Random()) << 19;
-            t = P_Random();
-            P_LineAttack(player->mo, angle, 2112*FRACUNIT,
-                         bulletslope + ((t - P_Random())<<5), damage);
-        }
-    }
-}
-
-//
-// A_SigilSound
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_SigilSound(player_t* player, pspdef_t* pspr)
-{
-    S_StartSound(player->mo, sfx_siglup);
-    player->extralight = 2;
-
-}
-
-//
-// A_FireSigil
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_FireSigil(player_t* player, pspdef_t* pspr)
-{
-    mobj_t* mo;
-    angle_t an;
-    int i;
-
-    // keep info on armor because sigil does piercing damage
-    i = player->armortype;
-    player->armortype = 0;
-
-    // BUG: setting inflictor causes firing the Sigil to always push the player
-    // toward the east, no matter what direction he is facing.
-    P_DamageMobj(player->mo, player->mo, NULL, 4 * (player->sigiltype + 1));
-
-    // restore armor
-    player->armortype = i;
-
-    S_StartSound(player->mo, sfx_siglup);
-
-    switch(player->sigiltype)
-    {
-        // falling lightning bolts from the sky
-    case 0:
-        P_BulletSlope(player->mo);
-        if(linetarget)
-        {
-            // haleyjd 09/18/10: corrected z coordinate
-            mo = P_SpawnMobj(linetarget->x, linetarget->y, ONFLOORZ, 
-                             MT_SIGIL_A_GROUND);
-            mo->tracer = linetarget;
-        }
-        else
-        {
-            an = player->mo->angle>>ANGLETOFINESHIFT;
-            mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, 
-                             MT_SIGIL_A_GROUND);
-            mo->momx += FixedMul((28*FRACUNIT), finecosine[an]);
-            mo->momy += FixedMul((28*FRACUNIT), finesine[an]);
-        }
-        mo->health = -1;
-        mo->target = player->mo;
-        break;
-
-        // simple projectile
-    case 1:
-        P_SpawnPlayerMissile(player->mo, MT_SIGIL_B_SHOT)->health = -1;
-        break;
-
-        // spread shot
-    case 2:
-        player->mo->angle -= ANG90; // starting at 270...
-        for(i = 0; i < 20; i++)     // increment by 1/10 of 90, 20 times.
-        {
-            player->mo->angle += (ANG90 / 10);
-            mo = P_SpawnMortar(player->mo, MT_SIGIL_C_SHOT);
-            mo->health = -1;
-            mo->z = player->mo->z + (32*FRACUNIT);
-        }
-        player->mo->angle -= ANG90; // subtract off the extra 90
-        break;
-
-        // tracer attack
-    case 3:
-        P_BulletSlope(player->mo);
-        if(linetarget)
-        {
-            mo = P_SpawnPlayerMissile(player->mo, MT_SIGIL_D_SHOT);
-            mo->tracer = linetarget;
-        }
-        else
-        {
-            an = player->mo->angle >> ANGLETOFINESHIFT;
-            mo = P_SpawnPlayerMissile(player->mo, MT_SIGIL_D_SHOT);
-            mo->momx += FixedMul(mo->info->speed, finecosine[an]);
-            mo->momy += FixedMul(mo->info->speed, finesine[an]);
-        }
-        mo->health = -1;
-        break;
-
-        // mega blast
-    case 4:
-        mo = P_SpawnPlayerMissile(player->mo, MT_SIGIL_E_SHOT);
-        mo->health = -1;
-        if(!linetarget)
-        {
-            an = (unsigned int)player->pitch >> ANGLETOFINESHIFT;
-            mo->momz += FixedMul(finesine[an], mo->info->speed); 
-        }
-        break;
-
-    default:
-        break;
-    }
-}
-
-//
-// A_GunFlashThinker
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_GunFlashThinker(player_t* player, pspdef_t* pspr)
-{
-    if(player->readyweapon == wp_sigil && player->sigiltype)
-        P_SetPsprite(player, ps_flash, S_SIGH_00 + player->sigiltype);
-    else
-        P_SetPsprite(player, ps_flash, S_NULL);
-
-}
-
-
-//
-// ?
-//
-void A_Light0 (player_t *player, pspdef_t *psp)
-{
-    player->extralight = 0;
-}
-
-void A_Light1 (player_t *player, pspdef_t *psp)
-{
-    player->extralight = 1;
-}
-
-void A_Light2 (player_t *player, pspdef_t *psp)
-{
-    player->extralight = 2;
-}
-
-//
-// A_SigilShock
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_SigilShock (player_t *player, pspdef_t *psp)
-{
-    player->extralight = -3;
-}
-
-//
-// A_TorpedoExplode
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_TorpedoExplode(mobj_t* actor)
-{
-    int i;
-
-    actor->angle -= ANG180;
-
-    for(i = 0; i < 80; i++)
-    {
-        actor->angle += (ANG90 / 20);
-        P_SpawnMortar(actor, MT_TORPEDOSPREAD)->target = actor->target;
-    }
-}
-
-//
-// A_MaulerSound
-//
-// villsa [STRIFE] - new codepointer
-//
-void A_MaulerSound(player_t *player, pspdef_t *psp)
-{
-    int t;
-    S_StartSound(player->mo, sfx_proton);
-    t = P_Random();
-    psp->sx += (t - P_Random()) << 10;
-    t = P_Random();
-    psp->sy += (t - P_Random()) << 10;
-
-}
-
-
-//
-// P_SetupPsprites
-// Called at start of level for each player.
-//
-void P_SetupPsprites(player_t* player) 
-{
-    int	i;
-
-    // remove all psprites
-    for(i = 0; i < NUMPSPRITES; i++)
-        player->psprites[i].state = NULL;
-
-    // spawn the gun
-    player->pendingweapon = player->readyweapon;
-    P_BringUpWeapon(player);
-}
-
-
-
-
-//
-// P_MovePsprites
-// Called every tic by player thinking routine.
-//
-void P_MovePsprites (player_t* player) 
-{
-    int		i;
-    pspdef_t*	psp;
-
-    psp = &player->psprites[0];
-    for(i = 0; i < NUMPSPRITES; i++, psp++)
-    {
-        // a null state means not active
-        if(psp->state)
-        {
-            // drop tic count and possibly change state
-
-            // a -1 tic count never changes
-            if(psp->tics != -1)	
-            {
-                psp->tics--;
-                if(!psp->tics)
-                    P_SetPsprite (player, i, psp->state->nextstate);
-            }
-        }
-    }
-    
-    player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
-    player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
-
-    // villsa [STRIFE] extra stuff for targeter
-    player->psprites[ps_targleft].sx =
-        (160*FRACUNIT) - ((100 - player->accuracy) << FRACBITS);
-
-    player->psprites[ps_targright].sx =
-        ((100 - player->accuracy) << FRACBITS) + (160*FRACUNIT);
-}
-
-
diff --git a/games/NXDoom/src/strife/p_pspr.h b/games/NXDoom/src/strife/p_pspr.h
deleted file mode 100644
index ec4d13700..000000000
--- a/games/NXDoom/src/strife/p_pspr.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Sprite animation.
-//
-
-
-#ifndef __P_PSPR__
-#define __P_PSPR__
-
-// Basic data types.
-// Needs fixed point, and BAM angles.
-#include "m_fixed.h"
-#include "p_mobj.h"
-#include "tables.h"
-
-
-//
-// Needs to include the precompiled
-//  sprite animation tables.
-// Header generated by multigen utility.
-// This includes all the data for thing animation,
-// i.e. the Thing Atrributes table
-// and the Frame Sequence table.
-#include "info.h"
-
-
-
-//
-// Frame flags:
-// handles maximum brightness (torches, muzzle flare, light sources)
-//
-#define FF_FULLBRIGHT	0x8000	// flag in thing->frame
-#define FF_FRAMEMASK	0x7fff
-
-
-
-//
-// Overlay psprites are scaled shapes
-// drawn directly on the view screen,
-// coordinates are given for a 320*200 view screen.
-//
-typedef enum
-{
-    ps_weapon,
-    ps_flash,
-    ps_targcenter,  // villsa [STRIFE]
-    ps_targleft,    // villsa [STRIFE]
-    ps_targright,   // villsa [STRIFE]
-    NUMPSPRITES
-
-} psprnum_t;
-
-typedef struct
-{
-    state_t*	state;	// a NULL state means not active
-    int		tics;
-    fixed_t	sx;
-    fixed_t	sy;
-
-} pspdef_t;
-
-typedef struct player_s *playerptr;
-
-
-extern fixed_t bulletslope;
-
-
-// haleyjd [STRIFE] Exported
-void P_SetPsprite(playerptr player, int position, statenum_t stnum);
-void P_BulletSlope(mobj_t *mo);
-
-
-#endif
diff --git a/games/NXDoom/src/strife/p_saveg.c b/games/NXDoom/src/strife/p_saveg.c
deleted file mode 100644
index f1782c1e5..000000000
--- a/games/NXDoom/src/strife/p_saveg.c
+++ /dev/null
@@ -1,2208 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Archiving: SaveGame I/O.
-//
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "dstrings.h"
-#include "deh_main.h"
-#include "i_system.h"
-#include "z_zone.h"
-#include "m_misc.h"
-#include "p_local.h"
-#include "p_saveg.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-#define SAVEGAME_EOF 0x1d
-
-// haleyjd 09/28/10: [STRIFE] VERSIONSIZE == 8
-#define VERSIONSIZE 8 
-
-FILE *save_stream;
-int savegamelength;
-boolean savegame_error;
-
-// Get the filename of a temporary file to write the savegame to.  After
-// the file has been successfully saved, it will be renamed to the 
-// real file.
-
-char *P_TempSaveGameFile(void)
-{
-    static char *filename = NULL;
-
-    if (filename == NULL)
-    {
-        filename = M_StringJoin(savegamedir, "temp.dsg", NULL);
-    }
-
-    return filename;
-}
-
-// Get the filename of the save game file to use for the specified slot.
-
-char *P_SaveGameFile(int slot)
-{
-    static char *filename = NULL;
-    static size_t filename_size;
-    char basename[32];
-
-    if (filename == NULL)
-    {
-        filename_size = strlen(savegamedir) + 32;
-        filename = malloc(filename_size);
-    }
-
-    DEH_snprintf(basename, 32, SAVEGAMENAME "%d.dsg", slot);
-
-    M_snprintf(filename, filename_size, "%s%s", savegamedir, basename);
-
-    return filename;
-}
-
-// Endian-safe integer read/write functions
-
-static byte saveg_read8(void)
-{
-    byte result;
-
-    if (fread(&result, 1, 1, save_stream) < 1)
-    {
-        if (!savegame_error)
-        {
-            fprintf(stderr, "saveg_read8: Unexpected end of file while "
-                            "reading save game\n");
-
-            savegame_error = true;
-        }
-    }
-
-    return result;
-}
-
-static void saveg_write8(byte value)
-{
-    if (fwrite(&value, 1, 1, save_stream) < 1)
-    {
-        if (!savegame_error)
-        {
-            fprintf(stderr, "saveg_write8: Error while writing save game\n");
-
-            savegame_error = true;
-        }
-    }
-}
-
-static short saveg_read16(void)
-{
-    int result;
-
-    result = saveg_read8();
-    result |= saveg_read8() << 8;
-
-    return result;
-}
-
-static void saveg_write16(short value)
-{
-    saveg_write8(value & 0xff);
-    saveg_write8((value >> 8) & 0xff);
-}
-
-static int saveg_read32(void)
-{
-    int result;
-
-    result = saveg_read8();
-    result |= saveg_read8() << 8;
-    result |= saveg_read8() << 16;
-    result |= saveg_read8() << 24;
-
-    return result;
-}
-
-static void saveg_write32(int value)
-{
-    saveg_write8(value & 0xff);
-    saveg_write8((value >> 8) & 0xff);
-    saveg_write8((value >> 16) & 0xff);
-    saveg_write8((value >> 24) & 0xff);
-}
-
-// Pad to 4-byte boundaries
-
-static void saveg_read_pad(void)
-{
-    unsigned long pos;
-    int padding;
-    int i;
-
-    pos = ftell(save_stream);
-
-    padding = (4 - (pos & 3)) & 3;
-
-    for (i=0; i<padding; ++i)
-    {
-        saveg_read8();
-    }
-}
-
-static void saveg_write_pad(void)
-{
-    unsigned long pos;
-    int padding;
-    int i;
-
-    pos = ftell(save_stream);
-
-    padding = (4 - (pos & 3)) & 3;
-
-    for (i=0; i<padding; ++i)
-    {
-        saveg_write8(0);
-    }
-}
-
-
-// Pointers
-
-static void *saveg_readp(void)
-{
-    return (void *) (intptr_t) saveg_read32();
-}
-
-static void saveg_writep(const void *p)
-{
-    saveg_write32((intptr_t) p);
-}
-
-// Enum values are 32-bit integers.
-
-#define saveg_read_enum saveg_read32
-#define saveg_write_enum saveg_write32
-
-//
-// Structure read/write functions
-//
-
-//
-// mapthing_t
-//
-
-static void saveg_read_mapthing_t(mapthing_t *str)
-{
-    // short x;
-    str->x = saveg_read16();
-
-    // short y;
-    str->y = saveg_read16();
-
-    // short angle;
-    str->angle = saveg_read16();
-
-    // short type;
-    str->type = saveg_read16();
-
-    // short options;
-    str->options = saveg_read16();
-}
-
-static void saveg_write_mapthing_t(mapthing_t *str)
-{
-    // short x;
-    saveg_write16(str->x);
-
-    // short y;
-    saveg_write16(str->y);
-
-    // short angle;
-    saveg_write16(str->angle);
-
-    // short type;
-    saveg_write16(str->type);
-
-    // short options;
-    saveg_write16(str->options);
-}
-
-//
-// actionf_t
-// 
-
-static void saveg_read_actionf_t(actionf_t *str)
-{
-    // actionf_p1 acp1;
-    str->acp1 = saveg_readp();
-}
-
-static void saveg_write_actionf_t(actionf_t *str)
-{
-    // actionf_p1 acp1;
-    saveg_writep(str->acp1);
-}
-
-//
-// think_t
-//
-// This is just an actionf_t.
-//
-
-#define saveg_read_think_t saveg_read_actionf_t
-#define saveg_write_think_t saveg_write_actionf_t
-
-//
-// thinker_t
-//
-
-static void saveg_read_thinker_t(thinker_t *str)
-{
-    // struct thinker_s* prev;
-    str->prev = saveg_readp();
-
-    // struct thinker_s* next;
-    str->next = saveg_readp();
-
-    // think_t function;
-    saveg_read_think_t(&str->function);
-}
-
-static void saveg_write_thinker_t(thinker_t *str)
-{
-    // struct thinker_s* prev;
-    saveg_writep(str->prev);
-
-    // struct thinker_s* next;
-    saveg_writep(str->next);
-
-    // think_t function;
-    saveg_write_think_t(&str->function);
-}
-
-//
-// mobj_t
-//
-// haleyjd 09/28/10: [STRIFE] Changed to match Strife binary mobj_t structure.
-// 
-
-static void saveg_read_mobj_t(mobj_t *str)
-{
-    int pl;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // fixed_t x;
-    str->x = saveg_read32();
-
-    // fixed_t y;
-    str->y = saveg_read32();
-
-    // fixed_t z;
-    str->z = saveg_read32();
-
-    // struct mobj_s* snext;
-    str->snext = saveg_readp();
-
-    // struct mobj_s* sprev;
-    str->sprev = saveg_readp();
-
-    // angle_t angle;
-    str->angle = saveg_read32();
-
-    // spritenum_t sprite;
-    str->sprite = saveg_read_enum();
-
-    // int frame;
-    str->frame = saveg_read32();
-
-    // struct mobj_s* bnext;
-    str->bnext = saveg_readp();
-
-    // struct mobj_s* bprev;
-    str->bprev = saveg_readp();
-
-    // struct subsector_s* subsector;
-    str->subsector = saveg_readp();
-
-    // fixed_t floorz;
-    str->floorz = saveg_read32();
-
-    // fixed_t ceilingz;
-    str->ceilingz = saveg_read32();
-
-    // fixed_t radius;
-    str->radius = saveg_read32();
-
-    // fixed_t height;
-    str->height = saveg_read32();
-
-    // fixed_t momx;
-    str->momx = saveg_read32();
-
-    // fixed_t momy;
-    str->momy = saveg_read32();
-
-    // fixed_t momz;
-    str->momz = saveg_read32();
-
-    // int validcount;
-    str->validcount = saveg_read32();
-
-    // mobjtype_t type;
-    str->type = saveg_read_enum();
-
-    // mobjinfo_t* info;
-    str->info = saveg_readp();
-
-    // int tics;
-    str->tics = saveg_read32();
-
-    // state_t* state;
-    str->state = &states[saveg_read32()];
-
-    // int flags;
-    str->flags = saveg_read32();
-
-    // int health;
-    str->health = saveg_read32();
-
-    // int movedir;
-    str->movedir = saveg_read32();
-
-    // int movecount;
-    str->movecount = saveg_read32();
-
-    // struct mobj_s* target;
-    str->target = saveg_readp();
-
-    // int reactiontime;
-    str->reactiontime = saveg_read32();
-
-    // int threshold;
-    str->threshold = saveg_read32();
-
-    // struct player_s* player;
-    pl = saveg_read32();
-
-    if (pl > 0)
-    {
-        str->player = &players[pl - 1];
-        str->player->mo = str;
-    }
-    else
-    {
-        str->player = NULL;
-    }
-
-    // int lastlook;
-    str->lastlook = saveg_read32();
-
-    // mapthing_t spawnpoint;
-    saveg_read_mapthing_t(&str->spawnpoint);
-
-    // struct mobj_s* tracer;
-    str->tracer = saveg_readp();
-
-    // byte miscdata;
-    str->miscdata = saveg_read8(); // [STRIFE] Only change to mobj_t.
-}
-
-static void saveg_write_mobj_t(mobj_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // fixed_t x;
-    saveg_write32(str->x);
-
-    // fixed_t y;
-    saveg_write32(str->y);
-
-    // fixed_t z;
-    saveg_write32(str->z);
-
-    // struct mobj_s* snext;
-    saveg_writep(str->snext);
-
-    // struct mobj_s* sprev;
-    saveg_writep(str->sprev);
-
-    // angle_t angle;
-    saveg_write32(str->angle);
-
-    // spritenum_t sprite;
-    saveg_write_enum(str->sprite);
-
-    // int frame;
-    saveg_write32(str->frame);
-
-    // struct mobj_s* bnext;
-    saveg_writep(str->bnext);
-
-    // struct mobj_s* bprev;
-    saveg_writep(str->bprev);
-
-    // struct subsector_s* subsector;
-    saveg_writep(str->subsector);
-
-    // fixed_t floorz;
-    saveg_write32(str->floorz);
-
-    // fixed_t ceilingz;
-    saveg_write32(str->ceilingz);
-
-    // fixed_t radius;
-    saveg_write32(str->radius);
-
-    // fixed_t height;
-    saveg_write32(str->height);
-
-    // fixed_t momx;
-    saveg_write32(str->momx);
-
-    // fixed_t momy;
-    saveg_write32(str->momy);
-
-    // fixed_t momz;
-    saveg_write32(str->momz);
-
-    // int validcount;
-    saveg_write32(str->validcount);
-
-    // mobjtype_t type;
-    saveg_write_enum(str->type);
-
-    // mobjinfo_t* info;
-    saveg_writep(str->info);
-
-    // int tics;
-    saveg_write32(str->tics);
-
-    // state_t* state;
-    saveg_write32(str->state - states);
-
-    // int flags;
-    saveg_write32(str->flags);
-
-    // int health;
-    saveg_write32(str->health);
-
-    // int movedir;
-    saveg_write32(str->movedir);
-
-    // int movecount;
-    saveg_write32(str->movecount);
-
-    // struct mobj_s* target;
-    saveg_writep(str->target);
-
-    // int reactiontime;
-    saveg_write32(str->reactiontime);
-
-    // int threshold;
-    saveg_write32(str->threshold);
-
-    // struct player_s* player;
-    if (str->player)
-    {
-        saveg_write32(str->player - players + 1);
-    }
-    else
-    {
-        saveg_write32(0);
-    }
-
-    // int lastlook;
-    saveg_write32(str->lastlook);
-
-    // mapthing_t spawnpoint;
-    saveg_write_mapthing_t(&str->spawnpoint);
-
-    // struct mobj_s* tracer;
-    saveg_writep(str->tracer);
-
-    // byte miscdata;
-    saveg_write8(str->miscdata); // [STRIFE] Only change to mobj_t.
-}
-
-
-//
-// ticcmd_t
-//
-// haleyjd 09/28/10: [STRIFE] Modified for Strife binary ticcmd_t structure.
-//
-
-static void saveg_read_ticcmd_t(ticcmd_t *str)
-{
-    // signed char forwardmove;
-    str->forwardmove = saveg_read8();
-
-    // signed char sidemove;
-    str->sidemove = saveg_read8();
-
-    // short angleturn;
-    str->angleturn = saveg_read16();
-
-    // short consistancy;
-    // STRIFE-FIXME: throwing away top byte of consistancy until
-    // the true Strife ticcmd_t structure is available.
-    str->consistancy = (byte)saveg_read16();
-
-    // byte chatchar;
-    str->chatchar = saveg_read8();
-
-    // byte buttons;
-    str->buttons = saveg_read8();
-
-    // byte buttons2;
-    str->buttons2 = saveg_read8(); // [STRIFE]
-
-    // int inventory;
-    str->inventory = saveg_read32(); // [STRIFE]
-}
-
-static void saveg_write_ticcmd_t(ticcmd_t *str)
-{
-    // signed char forwardmove;
-    saveg_write8(str->forwardmove);
-
-    // signed char sidemove;
-    saveg_write8(str->sidemove);
-
-    // short angleturn;
-    saveg_write16(str->angleturn);
-
-    // short consistancy;
-    saveg_write16(str->consistancy);
-
-    // byte chatchar;
-    saveg_write8(str->chatchar);
-
-    // byte buttons;
-    saveg_write8(str->buttons);
-
-    // byte buttons2;
-    saveg_write8(str->buttons2); // [STRIFE]
-
-    // int inventory;
-    saveg_write32(str->inventory); // [STRIFE]
-}
-
-//
-// pspdef_t
-//
-
-static void saveg_read_pspdef_t(pspdef_t *str)
-{
-    int state;
-
-    // state_t* state;
-    state = saveg_read32();
-
-    if (state > 0)
-    {
-        str->state = &states[state];
-    }
-    else
-    {
-        str->state = NULL;
-    }
-
-    // int tics;
-    str->tics = saveg_read32();
-
-    // fixed_t sx;
-    str->sx = saveg_read32();
-
-    // fixed_t sy;
-    str->sy = saveg_read32();
-}
-
-static void saveg_write_pspdef_t(pspdef_t *str)
-{
-    // state_t* state;
-    if (str->state)
-    {
-        saveg_write32(str->state - states);
-    }
-    else
-    {
-        saveg_write32(0);
-    }
-
-    // int tics;
-    saveg_write32(str->tics);
-
-    // fixed_t sx;
-    saveg_write32(str->sx);
-
-    // fixed_t sy;
-    saveg_write32(str->sy);
-}
-
-//
-// inventory_t 
-//
-// haleyjd 09/28/10: [STRIFE] handle inventory input/output
-//
-
-static void saveg_read_inventory_t(inventory_t *str)
-{
-    //int sprite;
-    str->sprite = saveg_read32();
-
-    //int type;
-    str->type = saveg_read32();
-
-    //int amount;
-    str->amount = saveg_read32();
-}
-
-static void saveg_write_inventory_t(inventory_t *str)
-{
-    saveg_write32(str->sprite);
-    saveg_write32(str->type);
-    saveg_write32(str->amount);
-}
-
-//
-// player_t
-//
-// haleyjd 09/28/10: [STRIFE] Modified for Strife binary player_t structure.
-//
-
-static void saveg_read_player_t(player_t *str)
-{
-    int i;
-
-    // mobj_t* mo;
-    str->mo = saveg_readp();
-
-    // playerstate_t playerstate;
-    str->playerstate = saveg_read_enum();
-
-    // ticcmd_t cmd;
-    saveg_read_ticcmd_t(&str->cmd);
-
-    // fixed_t viewz;
-    str->viewz = saveg_read32();
-
-    // fixed_t viewheight;
-    str->viewheight = saveg_read32();
-
-    // fixed_t deltaviewheight;
-    str->deltaviewheight = saveg_read32();
-
-    // fixed_t bob;
-    str->bob = saveg_read32();
-
-    // int health;
-    str->health = saveg_read32();
-
-    // int armorpoints;
-    str->armorpoints = saveg_read16(); // [STRIFE] 32 -> 16
-
-    // int armortype;
-    str->armortype = saveg_read16(); // [STRIFE] 32 -> 16
-
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
-    {
-        str->powers[i] = saveg_read32();
-    }
-
-    // int sigiltype;
-    str->sigiltype = saveg_read32(); // [STRIFE]
-
-    // int nukagecount;
-    str->nukagecount = saveg_read32(); // [STRIFE]
-
-    // int questflags;
-    str->questflags = saveg_read32(); // [STRIFE]
-
-    // int pitch;
-    str->pitch = saveg_read32(); // [STRIFE]
-
-    // int centerview;
-    str->centerview = saveg_read32(); // [STRIFE]
-
-    // inventory_t inventory[NUMINVENTORY];
-    for(i = 0; i < NUMINVENTORY; i++)
-    {
-        saveg_read_inventory_t(&(str->inventory[i])); // [STRIFE]
-    }
-
-    // int st_update;
-    str->st_update = saveg_read32(); // [STRIFE]
-
-    // short numinventory;
-    str->numinventory = saveg_read16(); // [STRIFE]
-
-    // short inventorycursor;
-    str->inventorycursor = saveg_read16(); // [STRIFE]
-
-    // short accuracy;
-    str->accuracy = saveg_read16(); // [STRIFE]
-
-    // short stamina;
-    str->stamina = saveg_read16(); // [STRIFE]
-
-    // boolean cards[NUMCARDS];
-    for (i=0; i<NUMCARDS; ++i)
-    {
-        str->cards[i] = saveg_read32();
-    }
-
-    // boolean backpack;
-    str->backpack = saveg_read32();
-
-    // int attackdown;
-    str->attackdown = saveg_read32();
-
-    // int usedown;
-    str->usedown = saveg_read32();
-
-    // int inventorydown;
-    str->inventorydown = saveg_read32(); // [STRIFE]
-
-    // int frags[MAXPLAYERS];
-    for (i=0; i<MAXPLAYERS; ++i)
-    {
-        str->frags[i] = saveg_read32();
-    }
-
-    // weapontype_t readyweapon;
-    str->readyweapon = saveg_read_enum();
-
-    // weapontype_t pendingweapon;
-    str->pendingweapon = saveg_read_enum();
-
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        str->weaponowned[i] = saveg_read32();
-    }
-
-    // int ammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        str->ammo[i] = saveg_read32();
-    }
-
-    // int maxammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        str->maxammo[i] = saveg_read32();
-    }
-
-    // int cheats;
-    str->cheats = saveg_read32();
-
-    // int refire;
-    str->refire = saveg_read32();
-
-    // short killcount;
-    str->killcount = saveg_read16(); // [STRIFE] 32 -> 16
-
-    // haleyjd 08/30/10 [STRIFE] No itemcount.
-    // int itemcount;
-    //str->itemcount = saveg_read32();
-
-    // haleyjd 08/30/10 [STRIFE] No secretcount.
-    // int secretcount;
-    //str->secretcount = saveg_read32();
-
-    // char* message;
-    str->message = saveg_readp();
-
-    // int damagecount;
-    str->damagecount = saveg_read32();
-
-    // int bonuscount;
-    str->bonuscount = saveg_read32();
-
-    // mobj_t* attacker;
-    str->attacker = saveg_readp();
-
-    // int extralight;
-    str->extralight = saveg_read32();
-
-    // int fixedcolormap;
-    str->fixedcolormap = saveg_read32();
-
-    // int colormap; - [STRIFE] no such field
-    //str->colormap = saveg_read32();
-
-    // short allegiance;
-    str->allegiance = saveg_read16(); // [STRIFE]
-
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
-    {
-        saveg_read_pspdef_t(&str->psprites[i]);
-    }
-
-    // int mapstate[40];
-    for(i = 0; i < 40; ++i) // [STRIFE]
-    {
-        str->mapstate[i] = saveg_read32();
-    }
-
-    // haleyjd 08/30/10: [STRIFE] No intermission, no didsecret.
-    // boolean didsecret;
-    //str->didsecret = saveg_read32();
-}
-
-static void saveg_write_player_t(player_t *str)
-{
-    int i;
-
-    // mobj_t* mo;
-    saveg_writep(str->mo);
-
-    // playerstate_t playerstate;
-    saveg_write_enum(str->playerstate);
-
-    // ticcmd_t cmd;
-    saveg_write_ticcmd_t(&str->cmd);
-
-    // fixed_t viewz;
-    saveg_write32(str->viewz);
-
-    // fixed_t viewheight;
-    saveg_write32(str->viewheight);
-
-    // fixed_t deltaviewheight;
-    saveg_write32(str->deltaviewheight);
-
-    // fixed_t bob;
-    saveg_write32(str->bob);
-
-    // int health;
-    saveg_write32(str->health);
-
-    // int armorpoints;
-    saveg_write16(str->armorpoints); // [STRIFE] 32 -> 16
-
-    // int armortype;
-    saveg_write16(str->armortype); // [STRIFE] 32 -> 16
-
-    // int powers[NUMPOWERS];
-    for (i=0; i<NUMPOWERS; ++i)
-    {
-        saveg_write32(str->powers[i]);
-    }
-
-    // int sigiltype;
-    saveg_write32(str->sigiltype); // [STRIFE]
-
-    // int nukagecount;
-    saveg_write32(str->nukagecount); // [STRIFE]
-
-    // int questflags;
-    saveg_write32(str->questflags); // [STRIFE]
-
-    // int pitch;
-    saveg_write32(str->pitch); // [STRIFE]
-
-    // int centerview;
-    saveg_write32(str->centerview); // [STRIFE]
-
-    // inventory_t inventory[NUMINVENTORY];
-    for(i = 0; i < NUMINVENTORY; ++i) // [STRIFE]
-    {
-        saveg_write_inventory_t(&str->inventory[i]);
-    }
-
-    // int st_update;
-    saveg_write32(str->st_update); // [STRIFE]
-
-    // short numinventory;
-    saveg_write16(str->numinventory); // [STRIFE]
-
-    // short inventorycursor;
-    saveg_write16(str->inventorycursor); // [STRIFE]
-
-    // short accuracy;
-    saveg_write16(str->accuracy); // [STRIFE]
-
-    // short stamina;
-    saveg_write16(str->stamina); // [STRIFE]
-
-    // boolean cards[NUMCARDS];
-    for (i=0; i<NUMCARDS; ++i)
-    {
-        saveg_write32(str->cards[i]);
-    }
-
-    // boolean backpack;
-    saveg_write32(str->backpack);
-
-    // int attackdown;
-    saveg_write32(str->attackdown);
-
-    // int usedown;
-    saveg_write32(str->usedown);
-
-    // int inventorydown;
-    saveg_write32(str->inventorydown); // [STRIFE]
-
-    // int frags[MAXPLAYERS];
-    for (i=0; i<MAXPLAYERS; ++i)
-    {
-        saveg_write32(str->frags[i]);
-    }
-
-    // weapontype_t readyweapon;
-    saveg_write_enum(str->readyweapon);
-
-    // weapontype_t pendingweapon;
-    saveg_write_enum(str->pendingweapon);
-
-    // boolean weaponowned[NUMWEAPONS];
-    for (i=0; i<NUMWEAPONS; ++i)
-    {
-        saveg_write32(str->weaponowned[i]);
-    }
-
-    // int ammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        saveg_write32(str->ammo[i]);
-    }
-
-    // int maxammo[NUMAMMO];
-    for (i=0; i<NUMAMMO; ++i)
-    {
-        saveg_write32(str->maxammo[i]);
-    }
-
-
-    // int cheats;
-    saveg_write32(str->cheats);
-
-    // int refire;
-    saveg_write32(str->refire);
-
-    // short killcount;
-    saveg_write16(str->killcount); // [STRIFE] 32 -> 16
-
-    // haleyjd 08/30/10 [STRIFE] No itemcount
-    // int itemcount;
-    //saveg_write32(str->itemcount);
-
-    // haleyjd 08/30/10 [STRIFE] No secretcount
-    // int secretcount;
-    //saveg_write32(str->secretcount);
-
-    // char* message;
-    saveg_writep(str->message);
-
-    // int damagecount;
-    saveg_write32(str->damagecount);
-
-    // int bonuscount;
-    saveg_write32(str->bonuscount);
-
-    // mobj_t* attacker;
-    saveg_writep(str->attacker);
-
-    // int extralight;
-    saveg_write32(str->extralight);
-
-    // int fixedcolormap;
-    saveg_write32(str->fixedcolormap);
-
-    // int colormap; [STRIFE] no such field
-    //saveg_write32(str->colormap);
-
-    // short allegiance;
-    saveg_write16(str->allegiance); // [STRIFE]
-
-    // pspdef_t psprites[NUMPSPRITES];
-    for (i=0; i<NUMPSPRITES; ++i)
-    {
-        saveg_write_pspdef_t(&str->psprites[i]);
-    }
-
-    // int mapstate[40];
-    for(i = 0; i < 40; ++i) // [STRIFE]
-    {
-        saveg_write32(str->mapstate[i]);
-    }
-
-    // haleyjd 08/30/10: [STRIFE] No intermission, no secret.
-    // boolean didsecret;
-    //saveg_write32(str->didsecret);
-}
-
-
-//
-// ceiling_t
-//
-
-static void saveg_read_ceiling_t(ceiling_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // ceiling_e type;
-    str->type = saveg_read_enum();
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // fixed_t bottomheight;
-    str->bottomheight = saveg_read32();
-
-    // fixed_t topheight;
-    str->topheight = saveg_read32();
-
-    // fixed_t speed;
-    str->speed = saveg_read32();
-
-    // boolean crush;
-    str->crush = saveg_read32();
-
-    // int direction;
-    str->direction = saveg_read32();
-
-    // int tag;
-    str->tag = saveg_read32();
-
-    // int olddirection;
-    str->olddirection = saveg_read32();
-}
-
-static void saveg_write_ceiling_t(ceiling_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // ceiling_e type;
-    saveg_write_enum(str->type);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // fixed_t bottomheight;
-    saveg_write32(str->bottomheight);
-
-    // fixed_t topheight;
-    saveg_write32(str->topheight);
-
-    // fixed_t speed;
-    saveg_write32(str->speed);
-
-    // boolean crush;
-    saveg_write32(str->crush);
-
-    // int direction;
-    saveg_write32(str->direction);
-
-    // int tag;
-    saveg_write32(str->tag);
-
-    // int olddirection;
-    saveg_write32(str->olddirection);
-}
-
-//
-// vldoor_t
-//
-// haleyjd 09/28/10: [STRIFE] Modified for Strife binary vldoor_t structure.
-//
-
-static void saveg_read_vldoor_t(vldoor_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // vldoor_e type;
-    str->type = saveg_read_enum();
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // fixed_t topheight;
-    str->topheight = saveg_read32();
-
-    // fixed_t speed;
-    str->speed = saveg_read32();
-
-    // int direction;
-    str->direction = saveg_read32();
-
-    // int topwait;
-    str->topwait = saveg_read32();
-
-    // int topcountdown;
-    str->topcountdown = saveg_read32();
-
-    // villsa [STRIFE] new field - sound to play when opening
-    //int         opensound;
-    str->opensound = saveg_read32();
-
-    // villsa [STRIFE] new field - sound to play when closing
-    //int         closesound;
-    str->closesound = saveg_read32();
-}
-
-static void saveg_write_vldoor_t(vldoor_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // vldoor_e type;
-    saveg_write_enum(str->type);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // fixed_t topheight;
-    saveg_write32(str->topheight);
-
-    // fixed_t speed;
-    saveg_write32(str->speed);
-
-    // int direction;
-    saveg_write32(str->direction);
-
-    // int topwait;
-    saveg_write32(str->topwait);
-
-    // int topcountdown;
-    saveg_write32(str->topcountdown);
-
-    // villsa [STRIFE] new field - sound to play when opening
-    //int         opensound;
-    saveg_write32(str->opensound);
-
-    // villsa [STRIFE] new field - sound to play when closing
-    //int         closesound;
-    saveg_write32(str->closesound);
-}
-
-//
-// slidedoor_t [STRIFE]: new thinker type
-//
-
-static void saveg_read_slidedoor_t(slidedoor_t *str)
-{
-    int sector;
-    int line;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sdt_e type;
-    str->type = saveg_read_enum();
-
-    // line_t *line1;
-    line = saveg_read32();
-    str->line1 = &lines[line];
-
-    // line_t *line2;
-    line = saveg_read32();
-    str->line2 = &lines[line];
-
-    // int frame;
-    str->frame = saveg_read32();
-
-    // int whichDoorIndex;
-    str->whichDoorIndex = saveg_read32();
-
-    // int timer;
-    str->timer = saveg_read32();
-
-    // sector_t *frontsector;
-    sector = saveg_read32();
-    str->frontsector = &sectors[sector];
-
-    // sd_e status;
-    str->status = saveg_read_enum();
-}
-
-static void saveg_write_slidedoor_t(slidedoor_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sdt_e type;
-    saveg_write_enum(str->type);
-
-    // line_t *line1;
-    saveg_write32(str->line1 - lines);
-
-    // line_t *line2;
-    saveg_write32(str->line2 - lines);
-
-    // int frame;
-    saveg_write32(str->frame);
-
-    // int whichDoorIndex;
-    saveg_write32(str->whichDoorIndex);
-
-    // int timer;
-    saveg_write32(str->timer);
-
-    // sector_t *frontsector;
-    saveg_write32(str->frontsector - sectors);
-
-    // sd_e status;
-    saveg_write_enum(str->status);
-}
-
-//
-// floormove_t
-//
-
-static void saveg_read_floormove_t(floormove_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // floor_e type;
-    str->type = saveg_read_enum();
-
-    // boolean crush;
-    str->crush = saveg_read32();
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // int direction;
-    str->direction = saveg_read32();
-
-    // int newspecial;
-    str->newspecial = saveg_read32();
-
-    // short texture;
-    str->texture = saveg_read16();
-
-    // fixed_t floordestheight;
-    str->floordestheight = saveg_read32();
-
-    // fixed_t speed;
-    str->speed = saveg_read32();
-}
-
-static void saveg_write_floormove_t(floormove_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // floor_e type;
-    saveg_write_enum(str->type);
-
-    // boolean crush;
-    saveg_write32(str->crush);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // int direction;
-    saveg_write32(str->direction);
-
-    // int newspecial;
-    saveg_write32(str->newspecial);
-
-    // short texture;
-    saveg_write16(str->texture);
-
-    // fixed_t floordestheight;
-    saveg_write32(str->floordestheight);
-
-    // fixed_t speed;
-    saveg_write32(str->speed);
-}
-
-//
-// plat_t
-//
-
-static void saveg_read_plat_t(plat_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // fixed_t speed;
-    str->speed = saveg_read32();
-
-    // fixed_t low;
-    str->low = saveg_read32();
-
-    // fixed_t high;
-    str->high = saveg_read32();
-
-    // int wait;
-    str->wait = saveg_read32();
-
-    // int count;
-    str->count = saveg_read32();
-
-    // plat_e status;
-    str->status = saveg_read_enum();
-
-    // plat_e oldstatus;
-    str->oldstatus = saveg_read_enum();
-
-    // boolean crush;
-    str->crush = saveg_read32();
-
-    // int tag;
-    str->tag = saveg_read32();
-
-    // plattype_e type;
-    str->type = saveg_read_enum();
-}
-
-static void saveg_write_plat_t(plat_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // fixed_t speed;
-    saveg_write32(str->speed);
-
-    // fixed_t low;
-    saveg_write32(str->low);
-
-    // fixed_t high;
-    saveg_write32(str->high);
-
-    // int wait;
-    saveg_write32(str->wait);
-
-    // int count;
-    saveg_write32(str->count);
-
-    // plat_e status;
-    saveg_write_enum(str->status);
-
-    // plat_e oldstatus;
-    saveg_write_enum(str->oldstatus);
-
-    // boolean crush;
-    saveg_write32(str->crush);
-
-    // int tag;
-    saveg_write32(str->tag);
-
-    // plattype_e type;
-    saveg_write_enum(str->type);
-}
-
-//
-// lightflash_t
-//
-
-static void saveg_read_lightflash_t(lightflash_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // int count;
-    str->count = saveg_read32();
-
-    // int maxlight;
-    str->maxlight = saveg_read32();
-
-    // int minlight;
-    str->minlight = saveg_read32();
-
-    // int maxtime;
-    str->maxtime = saveg_read32();
-
-    // int mintime;
-    str->mintime = saveg_read32();
-}
-
-static void saveg_write_lightflash_t(lightflash_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // int count;
-    saveg_write32(str->count);
-
-    // int maxlight;
-    saveg_write32(str->maxlight);
-
-    // int minlight;
-    saveg_write32(str->minlight);
-
-    // int maxtime;
-    saveg_write32(str->maxtime);
-
-    // int mintime;
-    saveg_write32(str->mintime);
-}
-
-//
-// strobe_t
-//
-
-static void saveg_read_strobe_t(strobe_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // int count;
-    str->count = saveg_read32();
-
-    // int minlight;
-    str->minlight = saveg_read32();
-
-    // int maxlight;
-    str->maxlight = saveg_read32();
-
-    // int darktime;
-    str->darktime = saveg_read32();
-
-    // int brighttime;
-    str->brighttime = saveg_read32();
-}
-
-static void saveg_write_strobe_t(strobe_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // int count;
-    saveg_write32(str->count);
-
-    // int minlight;
-    saveg_write32(str->minlight);
-
-    // int maxlight;
-    saveg_write32(str->maxlight);
-
-    // int darktime;
-    saveg_write32(str->darktime);
-
-    // int brighttime;
-    saveg_write32(str->brighttime);
-}
-
-//
-// glow_t
-//
-
-static void saveg_read_glow_t(glow_t *str)
-{
-    int sector;
-
-    // thinker_t thinker;
-    saveg_read_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    sector = saveg_read32();
-    str->sector = &sectors[sector];
-
-    // int minlight;
-    str->minlight = saveg_read32();
-
-    // int maxlight;
-    str->maxlight = saveg_read32();
-
-    // int direction;
-    str->direction = saveg_read32();
-}
-
-static void saveg_write_glow_t(glow_t *str)
-{
-    // thinker_t thinker;
-    saveg_write_thinker_t(&str->thinker);
-
-    // sector_t* sector;
-    saveg_write32(str->sector - sectors);
-
-    // int minlight;
-    saveg_write32(str->minlight);
-
-    // int maxlight;
-    saveg_write32(str->maxlight);
-
-    // int direction;
-    saveg_write32(str->direction);
-}
-
-//
-// Write the header for a savegame
-//
-// haleyjd 09/28/10: [STRIFE] numerous modifications.
-//
-
-void P_WriteSaveGameHeader(char *description)
-{
-    char name[VERSIONSIZE]; 
-    int i; 
-
-    /*
-    [STRIFE] This is in the "NAME" file in a Strife save directory.
-    for (i=0; description[i] != '\0'; ++i)
-        saveg_write8(description[i]);
-    for (; i<SAVESTRINGSIZE; ++i)
-        saveg_write8(0);
-    */
-
-    memset (name,0,sizeof(name)); 
-    M_snprintf(name, sizeof(name), "ver %i", STRIFE_VERSION);
-
-    for (i=0; i<VERSIONSIZE; ++i)
-        saveg_write8(name[i]);
-
-    saveg_write8(gameskill);
-    
-    // [STRIFE] This information is implicit in the file being loaded.
-    //saveg_write8(gameepisode);
-    //saveg_write8(gamemap);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-        saveg_write8(playeringame[i]);
-
-    saveg_write8((leveltime >> 16) & 0xff);
-    saveg_write8((leveltime >> 8) & 0xff);
-    saveg_write8(leveltime & 0xff);
-}
-
-// 
-// Read the header for a savegame
-//
-
-boolean P_ReadSaveGameHeader(void)
-{
-    int	 i; 
-    byte a, b, c; 
-    char vcheck[VERSIONSIZE]; 
-    char read_vcheck[VERSIONSIZE];
-
-    // skip the description field 
-    /*
-    for (i=0; i<SAVESTRINGSIZE; ++i)
-        saveg_read8();
-    */
-    
-    for (i=0; i<VERSIONSIZE; ++i)
-        read_vcheck[i] = saveg_read8();
-
-    memset (vcheck,0,sizeof(vcheck));
-    M_snprintf(vcheck, sizeof(vcheck), "ver %i", STRIFE_VERSION);
-    if (strcmp(read_vcheck, vcheck) != 0)
-        return false;                       // bad version 
-
-    gameskill = saveg_read8();
-
-    // [STRIFE] This info is implicit in the file being read.
-    //gameepisode = saveg_read8();
-    //gamemap = saveg_read8();
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-        playeringame[i] = saveg_read8();
-
-    // get the times 
-    a = saveg_read8();
-    b = saveg_read8();
-    c = saveg_read8();
-    leveltime = (a<<16) + (b<<8) + c; 
-
-    return true;
-}
-
-//
-// Read the end of file marker.  Returns true if read successfully.
-// 
-
-boolean P_ReadSaveGameEOF(void)
-{
-    int value;
-
-    value = saveg_read8();
-
-    return value == SAVEGAME_EOF;
-}
-
-//
-// Write the end of file marker
-//
-
-void P_WriteSaveGameEOF(void)
-{
-    saveg_write8(SAVEGAME_EOF);
-}
-
-//
-// P_ArchivePlayers
-//
-// [STRIFE] Verified unmodified.
-//
-void P_ArchivePlayers (void)
-{
-    int         i;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-        if (!playeringame[i])
-            continue;
-
-        saveg_write_pad();
-
-        saveg_write_player_t(&players[i]);
-    }
-}
-
-
-
-//
-// P_UnArchivePlayers
-//
-// [STRIFE] Verified unmodified.
-//
-void P_UnArchivePlayers (boolean userload)
-{
-    int         i;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-        player_t dummy;
-
-        if (!playeringame[i])
-            continue;
-
-        saveg_read_pad();
-
-        // haleyjd [STRIFE]: not exactly how vanilla did it, but this is
-        // necessary because of Choco's change to the savegame code which
-        // reads it directly from file. When not a userload, all the player_t
-        // data loaded from the save is thrown away.
-        if(userload)
-        {
-            saveg_read_player_t(&players[i]);
-            players[i].mo = NULL;
-        }
-        else
-            saveg_read_player_t(&dummy);
-
-        // will be set when unarc thinker
-        players[i].message = NULL;
-        players[i].attacker = NULL;
-    }
-}
-
-
-//
-// P_ArchiveWorld
-//
-// haleyjd 09/28/10: [STRIFE] Minor modifications.
-//
-void P_ArchiveWorld (void)
-{
-    int                 i;
-    int                 j;
-    sector_t*           sec;
-    line_t*             li;
-    side_t*             si;
-    
-    // do sectors
-    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
-    {
-        saveg_write16(sec->floorheight >> FRACBITS);
-        saveg_write16(sec->ceilingheight >> FRACBITS);
-        saveg_write16(sec->floorpic);
-        //saveg_write16(sec->ceilingpic); [STRIFE] not saved.
-        saveg_write16(sec->lightlevel);
-        saveg_write16(sec->special);            // needed?
-        //saveg_write16(sec->tag);                // needed? [STRIFE] not saved.
-    }
-
-    
-    // do lines
-    for (i=0, li = lines ; i<numlines ; i++,li++)
-    {
-        saveg_write16(li->flags);
-        saveg_write16(li->special);
-        //saveg_write16(li->tag); [STRIFE] not saved.
-        for (j=0 ; j<2 ; j++)
-        {
-            if (li->sidenum[j] == -1)
-                continue;
-
-            si = &sides[li->sidenum[j]];
-
-            // [STRIFE] offsets not saved.
-            //saveg_write16(si->textureoffset >> FRACBITS);
-            //saveg_write16(si->rowoffset >> FRACBITS);
-            saveg_write16(si->toptexture);
-            saveg_write16(si->bottomtexture);
-            saveg_write16(si->midtexture);
-        }
-    }
-}
-
-
-
-//
-// P_UnArchiveWorld
-//
-void P_UnArchiveWorld (void)
-{
-    int			i;
-    int			j;
-    sector_t*		sec;
-    line_t*		li;
-    side_t*		si;
-    
-    // do sectors
-    for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
-    {
-        sec->floorheight = saveg_read16() << FRACBITS;
-        sec->ceilingheight = saveg_read16() << FRACBITS;
-        sec->floorpic = saveg_read16();
-        //sec->ceilingpic = saveg_read16(); [STRIFE] not saved
-        sec->lightlevel = saveg_read16();
-        sec->special = saveg_read16();          // needed?
-        //sec->tag = saveg_read16();              // needed? [STRIFE] not saved
-        sec->specialdata = 0;
-        sec->soundtarget = 0;
-    }
-    
-    // do lines
-    for (i=0, li = lines ; i<numlines ; i++,li++)
-    {
-        li->flags = saveg_read16();
-        li->special = saveg_read16();
-        //li->tag = saveg_read16(); [STRIFE] not saved
-        for (j=0 ; j<2 ; j++)
-        {
-            if (li->sidenum[j] == -1)
-                continue;
-            si = &sides[li->sidenum[j]];
-            // [STRIFE] offsets not saved.
-            //si->textureoffset = saveg_read16() << FRACBITS;
-            //si->rowoffset = saveg_read16() << FRACBITS;
-            si->toptexture = saveg_read16();
-            si->bottomtexture = saveg_read16();
-            si->midtexture = saveg_read16();
-        }
-    }
-}
-
-
-
-
-
-//
-// Thinkers
-//
-typedef enum
-{
-    tc_end,
-    tc_mobj
-
-} thinkerclass_t;
-
-
-//
-// P_ArchiveThinkers
-//
-// [STRIFE] Verified unmodified.
-//
-void P_ArchiveThinkers (void)
-{
-    thinker_t*          th;
-
-    // save off the current thinkers
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
-    {
-        if (th->function.acp1 == (actionf_p1)P_MobjThinker)
-        {
-            saveg_write8(tc_mobj);
-            saveg_write_pad();
-            saveg_write_mobj_t((mobj_t *) th);
-
-            continue;
-        }
-
-        // haleyjd: This may seem mysterious but in the DOOM prebeta, 
-        // different types of things used different thinker functions. 
-        // Those would have all been handled here and this message is 
-        // probably a relic of that old system, not to mention the odd
-        // name of this function, and use of an enumeration with only
-        // two values in it.
-
-        // I_Error ("P_ArchiveThinkers: Unknown thinker function");
-    }
-
-    // add a terminating marker
-    saveg_write8(tc_end);
-}
-
-
-
-//
-// P_UnArchiveThinkers
-//
-void P_UnArchiveThinkers (void)
-{
-    byte                tclass;
-    thinker_t*          currentthinker;
-    thinker_t*          next;
-    mobj_t*             mobj;
-    
-    // remove all the current thinkers
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
-    {
-        next = currentthinker->next;
-
-        if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
-            P_RemoveMobj ((mobj_t *)currentthinker);
-        else
-            Z_Free (currentthinker);
-
-        currentthinker = next;
-    }
-    P_InitThinkers ();
-    
-    // read in saved thinkers
-    while (1)
-    {
-        tclass = saveg_read8();
-        switch (tclass)
-        {
-        case tc_end:
-            return; 	// end of list
-
-        case tc_mobj:
-            saveg_read_pad();
-            mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
-            saveg_read_mobj_t(mobj);
-
-            // haleyjd 09/29/10: Strife sets the targets of non-allied creatures
-            // who had a non-NULL target at save time to players[0].mo so that
-            // they won't fall back asleep.
-            //
-            // BUG: As the player may not have been spawned yet, we could be
-            // setting monsters' targets to the mobj which was spawned by 
-            // P_SetupLevel and then removed just above. Due to a subtle glitch
-            // in the DOOM engine whereby all things removed in this function
-            // are leaked until the next time P_SetupLevel is called, this is a
-            // safe operation - the call to P_InitThinkers above stops any of
-            // the objects removed, including the player's previous body, from
-            // being passed to Z_Free. One glitch relying on another!
-
-            if(mobj->target != NULL && (mobj->flags & MF_ALLY) != MF_ALLY)
-                mobj->target = players[0].mo;
-            else
-                mobj->target = NULL;
-
-            // WARNING! Strife does not seem to set tracer! I am leaving it be
-            // for now because so far no crashes have been observed, and failing
-            // to set this here will almost certainly crash Choco.
-            mobj->tracer = NULL;
-            P_SetThingPosition (mobj);
-            mobj->info = &mobjinfo[mobj->type];
-            // [STRIFE]: doesn't set these
-            //mobj->floorz = mobj->subsector->sector->floorheight;
-            //mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-            mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-            P_AddThinker (&mobj->thinker);
-            break;
-
-        default:
-            I_Error ("Unknown tclass %i in savegame",tclass);
-        }
-    }
-}
-
-
-//
-// P_ArchiveSpecials
-//
-enum
-{
-    tc_ceiling,
-    tc_door,
-    tc_floor,
-    tc_plat,
-    tc_flash,
-    tc_strobe,
-    tc_glow,
-    tc_slidingdoor, // [STRIFE]
-    tc_endspecials
-
-} specials_e;
-
-
-
-//
-// Things to handle:
-//
-// T_MoveCeiling, (ceiling_t: sector_t * swizzle), - active list
-// T_VerticalDoor, (vldoor_t: sector_t * swizzle),
-// T_SlidingDoor, (slidedoor_t: sector_t *, line_t * x 2 swizzle) [STRIFE]
-// T_MoveFloor, (floormove_t: sector_t * swizzle),
-// T_LightFlash, (lightflash_t: sector_t * swizzle),
-// T_StrobeFlash, (strobe_t: sector_t *),
-// T_Glow, (glow_t: sector_t *),
-// T_PlatRaise, (plat_t: sector_t *), - active list
-//
-void P_ArchiveSpecials (void)
-{
-    thinker_t*          th;
-    int                 i;
-
-    // save off the current thinkers
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
-    {
-        if (th->function.acv == (actionf_v)NULL)
-        {
-            for (i = 0; i < MAXCEILINGS;i++)
-                if (activeceilings[i] == (ceiling_t *)th)
-                    break;
-
-            if (i<MAXCEILINGS)
-            {
-                saveg_write8(tc_ceiling);
-                saveg_write_pad();
-                saveg_write_ceiling_t((ceiling_t *) th);
-            }
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
-        {
-            saveg_write8(tc_ceiling);
-            saveg_write_pad();
-            saveg_write_ceiling_t((ceiling_t *) th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_VerticalDoor)
-        {
-            saveg_write8(tc_door);
-            saveg_write_pad();
-            saveg_write_vldoor_t((vldoor_t *) th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_SlidingDoor)
-        {
-            saveg_write8(tc_slidingdoor);
-            saveg_write_pad();
-            saveg_write_slidedoor_t((slidedoor_t *)th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_MoveFloor)
-        {
-            saveg_write8(tc_floor);
-            saveg_write_pad();
-            saveg_write_floormove_t((floormove_t *) th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_PlatRaise)
-        {
-            saveg_write8(tc_plat);
-            saveg_write_pad();
-            saveg_write_plat_t((plat_t *) th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_LightFlash)
-        {
-            saveg_write8(tc_flash);
-            saveg_write_pad();
-            saveg_write_lightflash_t((lightflash_t *) th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_StrobeFlash)
-        {
-            saveg_write8(tc_strobe);
-            saveg_write_pad();
-            saveg_write_strobe_t((strobe_t *) th);
-            continue;
-        }
-
-        if (th->function.acp1 == (actionf_p1)T_Glow)
-        {
-            saveg_write8(tc_glow);
-            saveg_write_pad();
-            saveg_write_glow_t((glow_t *) th);
-            continue;
-        }
-    }
-
-    // add a terminating marker
-    saveg_write8(tc_endspecials);
-}
-
-
-//
-// P_UnArchiveSpecials
-//
-void P_UnArchiveSpecials (void)
-{
-    byte                tclass;
-    ceiling_t*          ceiling;
-    vldoor_t*           door;
-    slidedoor_t*        slidedoor; // haleyjd [STRIFE]
-    floormove_t*        floor;
-    plat_t*             plat;
-    lightflash_t*       flash;
-    strobe_t*           strobe;
-    glow_t*             glow;
-
-
-    // read in saved thinkers
-    while (1)
-    {
-        tclass = saveg_read8();
-
-        switch (tclass)
-        {
-        case tc_endspecials:
-            return;	// end of list
-
-        case tc_ceiling:
-            saveg_read_pad();
-            ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL);
-            saveg_read_ceiling_t(ceiling);
-            ceiling->sector->specialdata = ceiling;
-
-            if (ceiling->thinker.function.acp1)
-                ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
-
-            P_AddThinker (&ceiling->thinker);
-            P_AddActiveCeiling(ceiling);
-            break;
-
-        case tc_door:
-            saveg_read_pad();
-            door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL);
-            saveg_read_vldoor_t(door);
-            door->sector->specialdata = door;
-            door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
-            P_AddThinker (&door->thinker);
-            break;
-
-        case tc_slidingdoor:
-            // haleyjd 09/29/10: [STRIFE] New thinker type for sliding doors
-            saveg_read_pad();
-            slidedoor = Z_Malloc(sizeof(*slidedoor), PU_LEVEL, NULL);
-            saveg_read_slidedoor_t(slidedoor);
-            slidedoor->frontsector->specialdata = slidedoor;
-            slidedoor->thinker.function.acp1 = (actionf_p1)T_SlidingDoor;
-            P_AddThinker(&slidedoor->thinker);
-            break;
-
-        case tc_floor:
-            saveg_read_pad();
-            floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL);
-            saveg_read_floormove_t(floor);
-            floor->sector->specialdata = floor;
-            floor->thinker.function.acp1 = (actionf_p1)T_MoveFloor;
-            P_AddThinker (&floor->thinker);
-            break;
-
-        case tc_plat:
-            saveg_read_pad();
-            plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL);
-            saveg_read_plat_t(plat);
-            plat->sector->specialdata = plat;
-
-            if (plat->thinker.function.acp1)
-                plat->thinker.function.acp1 = (actionf_p1)T_PlatRaise;
-
-            P_AddThinker (&plat->thinker);
-            P_AddActivePlat(plat);
-            break;
-
-        case tc_flash:
-            saveg_read_pad();
-            flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL);
-            saveg_read_lightflash_t(flash);
-            flash->thinker.function.acp1 = (actionf_p1)T_LightFlash;
-            P_AddThinker (&flash->thinker);
-            break;
-
-        case tc_strobe:
-            saveg_read_pad();
-            strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL);
-            saveg_read_strobe_t(strobe);
-            strobe->thinker.function.acp1 = (actionf_p1)T_StrobeFlash;
-            P_AddThinker (&strobe->thinker);
-            break;
-
-        case tc_glow:
-            saveg_read_pad();
-            glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL);
-            saveg_read_glow_t(glow);
-            glow->thinker.function.acp1 = (actionf_p1)T_Glow;
-            P_AddThinker (&glow->thinker);
-            break;
-
-        default:
-            I_Error ("P_UnarchiveSpecials:Unknown tclass %i "
-                     "in savegame",tclass);
-        }
-    }
-}
-
diff --git a/games/NXDoom/src/strife/p_saveg.h b/games/NXDoom/src/strife/p_saveg.h
deleted file mode 100644
index d36f3b0da..000000000
--- a/games/NXDoom/src/strife/p_saveg.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Savegame I/O, archiving, persistence.
-//
-
-
-#ifndef __P_SAVEG__
-#define __P_SAVEG__
-
-#include <stdio.h>
-
-// maximum size of a savegame description
-
-#define SAVESTRINGSIZE 24
-
-// temporary filename to use while saving.
-
-char *P_TempSaveGameFile(void);
-
-// filename to use for a savegame slot
-
-char *P_SaveGameFile(int slot);
-
-// Savegame file header read/write functions
-
-boolean P_ReadSaveGameHeader(void);
-void P_WriteSaveGameHeader(char *description);
-
-// Savegame end-of-file read/write functions
-
-boolean P_ReadSaveGameEOF(void);
-void P_WriteSaveGameEOF(void);
-
-// Persistent storage/archiving.
-// These are the load / save game routines.
-void P_ArchivePlayers (void);
-void P_UnArchivePlayers (boolean userload);
-void P_ArchiveWorld (void);
-void P_UnArchiveWorld (void);
-void P_ArchiveThinkers (void);
-void P_UnArchiveThinkers (void);
-void P_ArchiveSpecials (void);
-void P_UnArchiveSpecials (void);
-
-extern FILE *save_stream;
-extern boolean savegame_error;
-
-
-#endif
diff --git a/games/NXDoom/src/strife/p_setup.c b/games/NXDoom/src/strife/p_setup.c
deleted file mode 100644
index d6c3057b5..000000000
--- a/games/NXDoom/src/strife/p_setup.c
+++ /dev/null
@@ -1,808 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Do all the WAD I/O, get map description,
-//	set up initial state and misc. LUTs.
-//
-
-
-
-#include <math.h>
-
-#include "z_zone.h"
-
-#include "deh_main.h"
-#include "i_swap.h"
-#include "m_argv.h"
-#include "m_bbox.h"
-
-#include "g_game.h"
-
-#include "i_system.h"
-#include "w_wad.h"
-
-#include "doomdef.h"
-#include "p_local.h"
-#include "p_rejectpad.h"
-
-#include "s_sound.h"
-
-#include "doomstat.h"
-
-
-void	P_SpawnMapThing (mapthing_t*	mthing);
-
-
-//
-// MAP related Lookup tables.
-// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
-//
-int		numvertexes;
-vertex_t*	vertexes;
-
-int		numsegs;
-seg_t*		segs;
-
-int		numsectors;
-sector_t*	sectors;
-
-int		numsubsectors;
-subsector_t*	subsectors;
-
-int		numnodes;
-node_t*		nodes;
-
-int		numlines;
-line_t*		lines;
-
-int		numsides;
-side_t*		sides;
-
-static int      totallines;
-
-// BLOCKMAP
-// Created from axis aligned bounding box
-// of the map, a rectangular array of
-// blocks of size ...
-// Used to speed up collision detection
-// by spatial subdivision in 2D.
-//
-// Blockmap size.
-int		bmapwidth;
-int		bmapheight;	// size in mapblocks
-short*		blockmap;	// int for larger maps
-// offsets in blockmap are from here
-short*		blockmaplump;		
-// origin of block map
-fixed_t		bmaporgx;
-fixed_t		bmaporgy;
-// for thing chains
-mobj_t**	blocklinks;		
-
-
-// REJECT
-// For fast sight rejection.
-// Speeds up enemy AI by skipping detailed
-//  LineOf Sight calculation.
-// Without special effect, this could be
-//  used as a PVS lookup as well.
-//
-byte*		rejectmatrix;
-
-
-// Maintain single and multi player starting spots.
-#define MAX_DEATHMATCH_STARTS	10
-
-mapthing_t	deathmatchstarts[MAX_DEATHMATCH_STARTS];
-mapthing_t*	deathmatch_p;
-mapthing_t	playerstarts[MAXPLAYERS];
-
-// haleyjd 08/24/10: [STRIFE] rift spots for player spawning
-mapthing_t      riftSpots[MAXRIFTSPOTS];
-
-
-
-
-//
-// P_LoadVertexes
-//
-void P_LoadVertexes (int lump)
-{
-    byte*		data;
-    int			i;
-    mapvertex_t*	ml;
-    vertex_t*		li;
-
-    // Determine number of lumps:
-    //  total lump length / vertex record length.
-    numvertexes = W_LumpLength (lump) / sizeof(mapvertex_t);
-
-    // Allocate zone memory for buffer.
-    vertexes = Z_Malloc (numvertexes*sizeof(vertex_t),PU_LEVEL,0);	
-
-    // Load data into cache.
-    data = W_CacheLumpNum (lump, PU_STATIC);
-	
-    ml = (mapvertex_t *)data;
-    li = vertexes;
-
-    // Copy and convert vertex coordinates,
-    // internal representation as fixed.
-    for (i=0 ; i<numvertexes ; i++, li++, ml++)
-    {
-	li->x = SHORT(ml->x)<<FRACBITS;
-	li->y = SHORT(ml->y)<<FRACBITS;
-    }
-
-    // Free buffer memory.
-    W_ReleaseLumpNum(lump);
-}
-
-
-
-//
-// P_LoadSegs
-//
-void P_LoadSegs (int lump)
-{
-    byte*		data;
-    int			i;
-    mapseg_t*		ml;
-    seg_t*		li;
-    line_t*		ldef;
-    int			linedef;
-    int			side;
-    int                 sidenum;
-	
-    numsegs = W_LumpLength (lump) / sizeof(mapseg_t);
-    segs = Z_Malloc (numsegs*sizeof(seg_t),PU_LEVEL,0);	
-    memset (segs, 0, numsegs*sizeof(seg_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    ml = (mapseg_t *)data;
-    li = segs;
-    for (i=0 ; i<numsegs ; i++, li++, ml++)
-    {
-	li->v1 = &vertexes[SHORT(ml->v1)];
-	li->v2 = &vertexes[SHORT(ml->v2)];
-
-	li->angle = (SHORT(ml->angle))<<16;
-	li->offset = (SHORT(ml->offset))<<16;
-	linedef = SHORT(ml->linedef);
-	ldef = &lines[linedef];
-	li->linedef = ldef;
-	side = SHORT(ml->side);
-	li->sidedef = &sides[ldef->sidenum[side]];
-	li->frontsector = sides[ldef->sidenum[side]].sector;
-
-        if (ldef-> flags & ML_TWOSIDED)
-        {
-            sidenum = ldef->sidenum[side ^ 1];
-
-            // If the sidenum is out of range, this may be a "glass hack"
-            // impassible window.  Point at side #0 (this may not be
-            // the correct Vanilla behavior; however, it seems to work for
-            // OTTAWAU.WAD, which is the one place I've seen this trick
-            // used).
-
-            if (sidenum < 0 || sidenum >= numsides)
-            {
-                sidenum = 0;
-            }
-
-            li->backsector = sides[sidenum].sector;
-        }
-        else
-        {
-	    li->backsector = 0;
-        }
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadSubsectors
-//
-void P_LoadSubsectors (int lump)
-{
-    byte*		data;
-    int			i;
-    mapsubsector_t*	ms;
-    subsector_t*	ss;
-	
-    numsubsectors = W_LumpLength (lump) / sizeof(mapsubsector_t);
-    subsectors = Z_Malloc (numsubsectors*sizeof(subsector_t),PU_LEVEL,0);	
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    ms = (mapsubsector_t *)data;
-    memset (subsectors,0, numsubsectors*sizeof(subsector_t));
-    ss = subsectors;
-    
-    for (i=0 ; i<numsubsectors ; i++, ss++, ms++)
-    {
-	ss->numlines = SHORT(ms->numsegs);
-	ss->firstline = SHORT(ms->firstseg);
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-
-//
-// P_LoadSectors
-//
-void P_LoadSectors (int lump)
-{
-    byte*		data;
-    int			i;
-    mapsector_t*	ms;
-    sector_t*		ss;
-	
-    numsectors = W_LumpLength (lump) / sizeof(mapsector_t);
-    sectors = Z_Malloc (numsectors*sizeof(sector_t),PU_LEVEL,0);	
-    memset (sectors, 0, numsectors*sizeof(sector_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    ms = (mapsector_t *)data;
-    ss = sectors;
-    for (i=0 ; i<numsectors ; i++, ss++, ms++)
-    {
-	ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
-	ss->ceilingheight = SHORT(ms->ceilingheight)<<FRACBITS;
-	ss->floorpic = R_FlatNumForName(ms->floorpic);
-	ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
-	ss->lightlevel = SHORT(ms->lightlevel);
-	ss->special = SHORT(ms->special);
-	ss->tag = SHORT(ms->tag);
-	ss->thinglist = NULL;
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadNodes
-//
-void P_LoadNodes (int lump)
-{
-    byte*	data;
-    int		i;
-    int		j;
-    int		k;
-    mapnode_t*	mn;
-    node_t*	no;
-	
-    numnodes = W_LumpLength (lump) / sizeof(mapnode_t);
-    nodes = Z_Malloc (numnodes*sizeof(node_t),PU_LEVEL,0);	
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    mn = (mapnode_t *)data;
-    no = nodes;
-    
-    for (i=0 ; i<numnodes ; i++, no++, mn++)
-    {
-	no->x = SHORT(mn->x)<<FRACBITS;
-	no->y = SHORT(mn->y)<<FRACBITS;
-	no->dx = SHORT(mn->dx)<<FRACBITS;
-	no->dy = SHORT(mn->dy)<<FRACBITS;
-	for (j=0 ; j<2 ; j++)
-	{
-	    no->children[j] = SHORT(mn->children[j]);
-	    for (k=0 ; k<4 ; k++)
-		no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
-	}
-    }
-	
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadThings
-//
-// haleyjd 08/24/10: [STRIFE]:
-// * Added code to record rift spots
-void P_LoadThings (int lump)
-{
-    byte               *data;
-    int			i;
-    mapthing_t         *mt;
-    mapthing_t          spawnthing;
-    int			numthings;
-//    boolean		spawn;
-
-    data = W_CacheLumpNum (lump,PU_STATIC);
-    numthings = W_LumpLength (lump) / sizeof(mapthing_t);
-
-    mt = (mapthing_t *)data;
-    for (i=0 ; i<numthings ; i++, mt++)
-    {
-//        spawn = true;
-
-        // Do not spawn cool, new monsters if !commercial
-        // STRIFE-TODO: replace with isregistered stuff
-        /*
-        if (gamemode != commercial)
-        {
-            switch (SHORT(mt->type))
-            {
-            case 68:	// Arachnotron
-            case 64:	// Archvile
-            case 88:	// Boss Brain
-            case 89:	// Boss Shooter
-            case 69:	// Hell Knight
-            case 67:	// Mancubus
-            case 71:	// Pain Elemental
-            case 65:	// Former Human Commando
-            case 66:	// Revenant
-            case 84:	// Wolf SS
-                spawn = false;
-                break;
-            }
-        }
-        if (spawn == false)
-            break;
-        */
-
-        // Do spawn all other stuff. 
-        spawnthing.x = SHORT(mt->x);
-        spawnthing.y = SHORT(mt->y);
-        spawnthing.angle = SHORT(mt->angle);
-        spawnthing.type = SHORT(mt->type);
-        spawnthing.options = SHORT(mt->options);
-
-        // haleyjd 08/24/2010: Special Strife checks
-        if(spawnthing.type >= 118 && spawnthing.type < 128)
-        {
-            // initialize riftSpots
-            int riftSpotNum = spawnthing.type - 118;
-            riftSpots[riftSpotNum] = spawnthing;
-            riftSpots[riftSpotNum].type = 1;
-        }
-        else if(spawnthing.type >= 9001 && spawnthing.type < 9011)
-        {
-            // STRIFE-TODO: mystery array of 90xx objects
-        }
-        else
-            P_SpawnMapThing(&spawnthing);
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadLineDefs
-// Also counts secret lines for intermissions.
-//
-void P_LoadLineDefs (int lump)
-{
-    byte*		data;
-    int			i;
-    maplinedef_t*	mld;
-    line_t*		ld;
-    vertex_t*		v1;
-    vertex_t*		v2;
-	
-    numlines = W_LumpLength (lump) / sizeof(maplinedef_t);
-    lines = Z_Malloc (numlines*sizeof(line_t),PU_LEVEL,0);	
-    memset (lines, 0, numlines*sizeof(line_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    mld = (maplinedef_t *)data;
-    ld = lines;
-    for (i=0 ; i<numlines ; i++, mld++, ld++)
-    {
-	ld->flags = SHORT(mld->flags);
-	ld->special = SHORT(mld->special);
-	ld->tag = SHORT(mld->tag);
-	v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
-	v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
-	ld->dx = v2->x - v1->x;
-	ld->dy = v2->y - v1->y;
-	
-	if (!ld->dx)
-	    ld->slopetype = ST_VERTICAL;
-	else if (!ld->dy)
-	    ld->slopetype = ST_HORIZONTAL;
-	else
-	{
-	    if (FixedDiv (ld->dy , ld->dx) > 0)
-		ld->slopetype = ST_POSITIVE;
-	    else
-		ld->slopetype = ST_NEGATIVE;
-	}
-		
-	if (v1->x < v2->x)
-	{
-	    ld->bbox[BOXLEFT] = v1->x;
-	    ld->bbox[BOXRIGHT] = v2->x;
-	}
-	else
-	{
-	    ld->bbox[BOXLEFT] = v2->x;
-	    ld->bbox[BOXRIGHT] = v1->x;
-	}
-
-	if (v1->y < v2->y)
-	{
-	    ld->bbox[BOXBOTTOM] = v1->y;
-	    ld->bbox[BOXTOP] = v2->y;
-	}
-	else
-	{
-	    ld->bbox[BOXBOTTOM] = v2->y;
-	    ld->bbox[BOXTOP] = v1->y;
-	}
-
-	ld->sidenum[0] = SHORT(mld->sidenum[0]);
-	ld->sidenum[1] = SHORT(mld->sidenum[1]);
-
-	if (ld->sidenum[0] != -1)
-	    ld->frontsector = sides[ld->sidenum[0]].sector;
-	else
-	    ld->frontsector = 0;
-
-	if (ld->sidenum[1] != -1)
-	    ld->backsector = sides[ld->sidenum[1]].sector;
-	else
-	    ld->backsector = 0;
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadSideDefs
-//
-void P_LoadSideDefs (int lump)
-{
-    byte*		data;
-    int			i;
-    mapsidedef_t*	msd;
-    side_t*		sd;
-	
-    numsides = W_LumpLength (lump) / sizeof(mapsidedef_t);
-    sides = Z_Malloc (numsides*sizeof(side_t),PU_LEVEL,0);	
-    memset (sides, 0, numsides*sizeof(side_t));
-    data = W_CacheLumpNum (lump,PU_STATIC);
-	
-    msd = (mapsidedef_t *)data;
-    sd = sides;
-    for (i=0 ; i<numsides ; i++, msd++, sd++)
-    {
-	sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
-	sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
-	sd->toptexture = R_TextureNumForName(msd->toptexture);
-	sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
-	sd->midtexture = R_TextureNumForName(msd->midtexture);
-	sd->sector = &sectors[SHORT(msd->sector)];
-    }
-
-    W_ReleaseLumpNum(lump);
-}
-
-
-//
-// P_LoadBlockMap
-//
-void P_LoadBlockMap (int lump)
-{
-    int i;
-    int count;
-    int lumplen;
-
-    lumplen = W_LumpLength(lump);
-    count = lumplen / 2;
-	
-    blockmaplump = Z_Malloc(lumplen, PU_LEVEL, NULL);
-    W_ReadLump(lump, blockmaplump);
-    blockmap = blockmaplump + 4;
-
-    // Swap all short integers to native byte ordering.
-  
-    for (i=0; i<count; i++)
-    {
-	blockmaplump[i] = SHORT(blockmaplump[i]);
-    }
-		
-    // Read the header
-
-    bmaporgx = blockmaplump[0]<<FRACBITS;
-    bmaporgy = blockmaplump[1]<<FRACBITS;
-    bmapwidth = blockmaplump[2];
-    bmapheight = blockmaplump[3];
-	
-    // Clear out mobj chains
-
-    count = sizeof(*blocklinks) * bmapwidth * bmapheight;
-    blocklinks = Z_Malloc(count, PU_LEVEL, 0);
-    memset(blocklinks, 0, count);
-}
-
-
-
-//
-// P_GroupLines
-// Builds sector line lists and subsector sector numbers.
-// Finds block bounding boxes for sectors.
-//
-void P_GroupLines (void)
-{
-    line_t**		linebuffer;
-    int			i;
-    int			j;
-    line_t*		li;
-    sector_t*		sector;
-    subsector_t*	ss;
-    seg_t*		seg;
-    fixed_t		bbox[4];
-    int			block;
-	
-    // look up sector number for each subsector
-    ss = subsectors;
-    for (i=0 ; i<numsubsectors ; i++, ss++)
-    {
-	seg = &segs[ss->firstline];
-	ss->sector = seg->sidedef->sector;
-    }
-
-    // count number of lines in each sector
-    li = lines;
-    totallines = 0;
-    for (i=0 ; i<numlines ; i++, li++)
-    {
-	totallines++;
-	li->frontsector->linecount++;
-
-	if (li->backsector && li->backsector != li->frontsector)
-	{
-	    li->backsector->linecount++;
-	    totallines++;
-	}
-    }
-
-    // build line tables for each sector	
-    linebuffer = Z_Malloc (totallines*sizeof(line_t *), PU_LEVEL, 0);
-
-    for (i=0; i<numsectors; ++i)
-    {
-        // Assign the line buffer for this sector
-
-        sectors[i].lines = linebuffer;
-        linebuffer += sectors[i].linecount;
-
-        // Reset linecount to zero so in the next stage we can count
-        // lines into the list.
-
-        sectors[i].linecount = 0;
-    }
-
-    // Assign lines to sectors
-
-    for (i=0; i<numlines; ++i)
-    { 
-        li = &lines[i];
-
-        if (li->frontsector != NULL)
-        {
-            sector = li->frontsector;
-
-            sector->lines[sector->linecount] = li;
-            ++sector->linecount;
-        }
-
-        if (li->backsector != NULL && li->frontsector != li->backsector)
-        {
-            sector = li->backsector;
-
-            sector->lines[sector->linecount] = li;
-            ++sector->linecount;
-        }
-    }
-    
-    // Generate bounding boxes for sectors
-	
-    sector = sectors;
-    for (i=0 ; i<numsectors ; i++, sector++)
-    {
-	M_ClearBox (bbox);
-
-	for (j=0 ; j<sector->linecount; j++)
-	{
-            li = sector->lines[j];
-
-            M_AddToBox (bbox, li->v1->x, li->v1->y);
-            M_AddToBox (bbox, li->v2->x, li->v2->y);
-	}
-
-	// set the degenmobj_t to the middle of the bounding box
-	sector->soundorg.x = (bbox[BOXRIGHT]+bbox[BOXLEFT])/2;
-	sector->soundorg.y = (bbox[BOXTOP]+bbox[BOXBOTTOM])/2;
-		
-	// adjust bounding box to map blocks
-	block = (bbox[BOXTOP]-bmaporgy+MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block >= bmapheight ? bmapheight-1 : block;
-	sector->blockbox[BOXTOP]=block;
-
-	block = (bbox[BOXBOTTOM]-bmaporgy-MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block < 0 ? 0 : block;
-	sector->blockbox[BOXBOTTOM]=block;
-
-	block = (bbox[BOXRIGHT]-bmaporgx+MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block >= bmapwidth ? bmapwidth-1 : block;
-	sector->blockbox[BOXRIGHT]=block;
-
-	block = (bbox[BOXLEFT]-bmaporgx-MAXRADIUS)>>MAPBLOCKSHIFT;
-	block = block < 0 ? 0 : block;
-	sector->blockbox[BOXLEFT]=block;
-    }
-	
-}
-
-
-static void P_LoadReject(int lumpnum)
-{
-    int minlength;
-    int lumplen;
-
-    // Calculate the size that the REJECT lump *should* be.
-
-    minlength = (numsectors * numsectors + 7) / 8;
-
-    // If the lump meets the minimum length, it can be loaded directly.
-    // Otherwise, we need to allocate a buffer of the correct size
-    // and pad it with appropriate data.
-
-    lumplen = W_LumpLength(lumpnum);
-
-    if (lumplen >= minlength)
-    {
-        rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
-    }
-    else
-    {
-        rejectmatrix = Z_Malloc(minlength, PU_LEVEL, &rejectmatrix);
-        W_ReadLump(lumpnum, rejectmatrix);
-
-        PadRejectArray(rejectmatrix + lumplen, minlength - lumplen, totallines);
-    }
-}
-
-//
-// P_SetupLevel
-//
-void
-P_SetupLevel
-( int       map,
-  int       playermask,
-  skill_t   skill)
-{
-    int     i;
-    char    lumpname[9];
-    int     lumpnum;
-
-    // haleyjd 20110205 [STRIFE]: removed totalitems and wminfo
-    totalkills =  totalsecret = 0;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-        // haleyjd 20100830: [STRIFE] Removed secretcount, itemcount
-        //         20110205: [STRIFE] Initialize players.allegiance
-        players[i].allegiance = i;
-        players[i].killcount = 0;
-    }
-
-    // Initial height of PointOfView
-    // will be set by player think.
-    players[consoleplayer].viewz = 1; 
-
-    // Make sure all sounds are stopped before Z_FreeTags.
-    S_Start ();
-
-    
-#if 0 // UNUSED
-    if (debugfile)
-    {
-        Z_FreeTags (PU_LEVEL, INT_MAX);
-        Z_FileDumpHeap (debugfile);
-    }
-    else
-#endif
-    Z_FreeTags (PU_LEVEL, PU_PURGELEVEL-1);
-
-
-    // UNUSED W_Profile ();
-    P_InitThinkers ();
-
-    // if working with a devlopment map, reload it
-    W_Reload();
-
-    // [STRIFE] Removed ExMy map support
-    if (map<10)
-        DEH_snprintf(lumpname, 9, "map0%i", map);
-    else
-        DEH_snprintf(lumpname, 9, "map%i", map);
-
-    lumpnum = W_GetNumForName (lumpname);
-
-    leveltime = 0;
-
-    // note: most of this ordering is important	
-    P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
-    P_LoadVertexes (lumpnum+ML_VERTEXES);
-    P_LoadSectors (lumpnum+ML_SECTORS);
-    P_LoadSideDefs (lumpnum+ML_SIDEDEFS);
-
-    P_LoadLineDefs (lumpnum+ML_LINEDEFS);
-    P_LoadSubsectors (lumpnum+ML_SSECTORS);
-    P_LoadNodes (lumpnum+ML_NODES);
-    P_LoadSegs (lumpnum+ML_SEGS);
-
-    P_GroupLines ();
-    P_LoadReject (lumpnum+ML_REJECT);
-
-    //bodyqueslot = 0; [STRIFE] unused
-    deathmatch_p = deathmatchstarts;
-    P_LoadThings (lumpnum+ML_THINGS);
-    
-    // if deathmatch, randomly spawn the active players
-    if (deathmatch)
-    {
-        for (i=0 ; i<MAXPLAYERS ; i++)
-            if (playeringame[i])
-            {
-                players[i].mo = NULL;
-                G_DeathMatchSpawnPlayer (i);
-            }
-
-    }
-
-    // clear special respawning que
-    iquehead = iquetail = 0;
-
-    // set up world state
-    P_SpawnSpecials ();
-
-    // build subsector connect matrix
-    // UNUSED P_ConnectSubsectors ();
-
-    // preload graphics
-    if (precache)
-        R_PrecacheLevel ();
-
-    //printf ("free memory: 0x%x\n", Z_FreeMemory());
-}
-
-
-
-//
-// P_Init
-//
-void P_Init (void)
-{
-    P_InitSwitchList();
-    P_InitPicAnims();
-    P_InitTerrainTypes();   // villsa [STRIFE]
-    R_InitSprites(sprnames);
-}
-
-
-
diff --git a/games/NXDoom/src/strife/p_setup.h b/games/NXDoom/src/strife/p_setup.h
deleted file mode 100644
index 393d76d8c..000000000
--- a/games/NXDoom/src/strife/p_setup.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//   Setup a game, startup stuff.
-//
-
-
-#ifndef __P_SETUP__
-#define __P_SETUP__
-
-
-
-
-// NOT called by W_Ticker. Fixme.
-// [STRIFE] Removed episode parameter
-void
-P_SetupLevel
-( int		map,
-  int		playermask,
-  skill_t	skill);
-
-// Called by startup code.
-void P_Init (void);
-
-#endif
diff --git a/games/NXDoom/src/strife/p_sight.c b/games/NXDoom/src/strife/p_sight.c
deleted file mode 100644
index ed6e09e6e..000000000
--- a/games/NXDoom/src/strife/p_sight.c
+++ /dev/null
@@ -1,360 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	LineOfSight/Visibility checks, uses REJECT Lookup Table.
-//
-
-
-
-#include "doomdef.h"
-
-#include "i_system.h"
-#include "p_local.h"
-
-// State.
-#include "r_state.h"
-
-//
-// P_CheckSight
-//
-fixed_t         sightzstart;        // eye z of looker
-fixed_t         topslope;
-fixed_t         bottomslope;        // slopes to top and bottom of target
-
-divline_t       strace;             // from t1 to t2
-fixed_t         t2x;
-fixed_t         t2y;
-
-int             sightcounts[2];
-
-
-//
-// P_DivlineSide
-// Returns side 0 (front), 1 (back), or 2 (on).
-//
-// [STRIFE] Verified unmodified
-//
-int
-P_DivlineSide
-( fixed_t       x,
-  fixed_t       y,
-  divline_t*    node )
-{
-    fixed_t     dx;
-    fixed_t     dy;
-    fixed_t     left;
-    fixed_t     right;
-
-    if (!node->dx)
-    {
-        if (x==node->x)
-            return 2;
-
-        if (x <= node->x)
-            return node->dy > 0;
-
-        return node->dy < 0;
-    }
-
-    if (!node->dy)
-    {
-        if (x==node->y)
-            return 2;
-
-        if (y <= node->y)
-            return node->dx < 0;
-
-        return node->dx > 0;
-    }
-
-    dx = (x - node->x);
-    dy = (y - node->y);
-
-    left =  (node->dy>>FRACBITS) * (dx>>FRACBITS);
-    right = (dy>>FRACBITS) * (node->dx>>FRACBITS);
-
-    if (right < left)
-        return 0;       // front side
-
-    if (left == right)
-        return 2;
-    return 1;           // back side
-}
-
-
-//
-// P_InterceptVector2
-// Returns the fractional intercept point
-// along the first divline.
-// This is only called by the addthings and addlines traversers.
-//
-// [STRIFE] Verified unmodified
-//
-fixed_t
-P_InterceptVector2
-( divline_t*        v2,
-  divline_t*        v1 )
-{
-    fixed_t	frac;
-    fixed_t	num;
-    fixed_t	den;
-
-    den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
-
-    if (den == 0)
-        return 0;
-    //	I_Error ("P_InterceptVector: parallel");
-
-    num = FixedMul ( (v1->x - v2->x)>>8 ,v1->dy) + 
-        FixedMul ( (v2->y - v1->y)>>8 , v1->dx);
-    frac = FixedDiv (num , den);
-
-    return frac;
-}
-
-//
-// P_CrossSubsector
-// Returns true
-//  if strace crosses the given subsector successfully.
-//
-// [STRIFE] Verified unmodified
-//
-boolean P_CrossSubsector (int num)
-{
-    seg_t*          seg;
-    line_t*         line;
-    int             s1;
-    int             s2;
-    int             count;
-    subsector_t*    sub;
-    sector_t*       front;
-    sector_t*       back;
-    fixed_t         opentop;
-    fixed_t         openbottom;
-    divline_t       divl;
-    vertex_t*       v1;
-    vertex_t*       v2;
-    fixed_t         frac;
-    fixed_t         slope;
-
-#ifdef RANGECHECK
-    if (num>=numsubsectors)
-        I_Error ("P_CrossSubsector: ss %i with numss = %i",
-                 num,
-                 numsubsectors);
-#endif
-
-    sub = &subsectors[num];
-    
-    // check lines
-    count = sub->numlines;
-    seg = &segs[sub->firstline];
-
-    for ( ; count ; seg++, count--)
-    {
-        line = seg->linedef;
-
-        // allready checked other side?
-        if (line->validcount == validcount)
-            continue;
-
-        line->validcount = validcount;
-
-        v1 = line->v1;
-        v2 = line->v2;
-        s1 = P_DivlineSide (v1->x, v1->y, &strace);
-        s2 = P_DivlineSide (v2->x, v2->y, &strace);
-
-        // line isn't crossed?
-        if (s1 == s2)
-            continue;
-
-        divl.x = v1->x;
-        divl.y = v1->y;
-        divl.dx = v2->x - v1->x;
-        divl.dy = v2->y - v1->y;
-        s1 = P_DivlineSide (strace.x, strace.y, &divl);
-        s2 = P_DivlineSide (t2x, t2y, &divl);
-
-        // line isn't crossed?
-        if (s1 == s2)
-            continue;
-
-        // Backsector may be NULL if this is an "impassible
-        // glass" hack line.
-
-        if (line->backsector == NULL)
-        {
-            return false;
-        }
-
-        // stop because it is not two sided anyway
-        // might do this after updating validcount?
-        if ( !(line->flags & ML_TWOSIDED) )
-            return false;
-
-        // crosses a two sided line
-        front = seg->frontsector;
-        back = seg->backsector;
-
-        // no wall to block sight with?
-        if (front->floorheight == back->floorheight
-            && front->ceilingheight == back->ceilingheight)
-            continue;
-
-        // possible occluder
-        // because of ceiling height differences
-        if (front->ceilingheight < back->ceilingheight)
-            opentop = front->ceilingheight;
-        else
-            opentop = back->ceilingheight;
-
-        // because of ceiling height differences
-        if (front->floorheight > back->floorheight)
-            openbottom = front->floorheight;
-        else
-            openbottom = back->floorheight;
-
-        // quick test for totally closed doors
-        if (openbottom >= opentop)
-            return false;           // stop
-
-        frac = P_InterceptVector2 (&strace, &divl);
-
-        if (front->floorheight != back->floorheight)
-        {
-            slope = FixedDiv (openbottom - sightzstart , frac);
-            if (slope > bottomslope)
-                bottomslope = slope;
-        }
-
-        if (front->ceilingheight != back->ceilingheight)
-        {
-            slope = FixedDiv (opentop - sightzstart , frac);
-            if (slope < topslope)
-                topslope = slope;
-        }
-
-        if (topslope <= bottomslope)
-            return false;           // stop
-    }
-    // passed the subsector ok
-    return true;
-}
-
-
-
-//
-// P_CrossBSPNode
-// Returns true
-//  if strace crosses the given node successfully.
-//
-// [STRIFE] Verified unmodified
-//
-boolean P_CrossBSPNode (int bspnum)
-{
-    node_t*     bsp;
-    int         side;
-
-    if (bspnum & NF_SUBSECTOR)
-    {
-        if (bspnum == -1)
-            return P_CrossSubsector (0);
-        else
-            return P_CrossSubsector (bspnum&(~NF_SUBSECTOR));
-    }
-
-    bsp = &nodes[bspnum];
-
-    // decide which side the start point is on
-    side = P_DivlineSide (strace.x, strace.y, (divline_t *)bsp);
-    if (side == 2)
-        side = 0;       // an "on" should cross both sides
-
-    // cross the starting side
-    if (!P_CrossBSPNode (bsp->children[side]) )
-        return false;
-
-    // the partition plane is crossed here
-    if (side == P_DivlineSide (t2x, t2y,(divline_t *)bsp))
-    {
-        // the line doesn't touch the other side
-        return true;
-    }
-
-    // cross the ending side
-    return P_CrossBSPNode (bsp->children[side^1]);
-}
-
-
-//
-// P_CheckSight
-// Returns true
-//  if a straight line between t1 and t2 is unobstructed.
-// Uses REJECT.
-//
-// [STRIFE] Verified unmodified
-//
-boolean
-P_CheckSight
-( mobj_t*       t1,
-  mobj_t*       t2 )
-{
-    int         s1;
-    int         s2;
-    int         pnum;
-    int         bytenum;
-    int         bitnum;
-    
-    // First check for trivial rejection.
-
-    // Determine subsector entries in REJECT table.
-    s1 = (t1->subsector->sector - sectors);
-    s2 = (t2->subsector->sector - sectors);
-    pnum = s1*numsectors + s2;
-    bytenum = pnum>>3;
-    bitnum = 1 << (pnum&7);
-
-    // Check in REJECT table.
-    if (rejectmatrix[bytenum]&bitnum)
-    {
-        sightcounts[0]++;
-
-        // can't possibly be connected
-        return false;
-    }
-
-    // An unobstructed LOS is possible.
-    // Now look from eyes of t1 to any part of t2.
-    sightcounts[1]++;
-
-    validcount++;
-
-    sightzstart = t1->z + t1->height - (t1->height>>2);
-    topslope = (t2->z+t2->height) - sightzstart;
-    bottomslope = (t2->z) - sightzstart;
-
-    strace.x = t1->x;
-    strace.y = t1->y;
-    t2x = t2->x;
-    t2y = t2->y;
-    strace.dx = t2->x - t1->x;
-    strace.dy = t2->y - t1->y;
-
-    // the head node is the last node output
-    return P_CrossBSPNode (numnodes-1);	
-}
-
-
diff --git a/games/NXDoom/src/strife/p_spec.c b/games/NXDoom/src/strife/p_spec.c
deleted file mode 100644
index de01eaa44..000000000
--- a/games/NXDoom/src/strife/p_spec.c
+++ /dev/null
@@ -1,1984 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Implements special effects:
-//	Texture animation, height or lighting changes
-//	 according to adjacent sectors, respective
-//	 utility functions, etc.
-//	Line Tag handling. Line and Sector triggers.
-//
-
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "doomstat.h"
-
-#include "deh_main.h"
-#include "i_system.h"
-#include "z_zone.h"
-#include "m_argv.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "w_wad.h"
-
-#include "r_local.h"
-#include "p_local.h"
-
-#include "g_game.h"
-
-#include "s_sound.h"
-
-// State.
-#include "r_state.h"
-
-// Data.
-#include "sounds.h"
-
-// [STRIFE]
-#include "hu_stuff.h"
-#include "p_dialog.h"
-
-
-//
-// Animating textures and planes
-// There is another anim_t used in wi_stuff, unrelated.
-//
-typedef struct
-{
-    boolean	istexture;
-    int		picnum;
-    int		basepic;
-    int		numpics;
-    int		speed;
-    
-} anim_t;
-
-//
-//      source animation definition
-//
-typedef struct
-{
-    int 	istexture;	// if false, it is a flat
-    char	endname[9];
-    char	startname[9];
-    int		speed;
-} animdef_t;
-
-
-// haleyjd 08/30/10: [STRIFE] MAXANIMS raised from 32 to 40
-#define MAXANIMS                40
-
-//
-// P_InitPicAnims
-//
-
-// Floor/ceiling animation sequences,
-//  defined by first and last frame,
-//  i.e. the flat (64x64 tile) name to
-//  be used.
-// The full animation sequence is given
-//  using all the flats between the start
-//  and end entry, in the order found in
-//  the WAD file.
-//
-// haleyjd 08/29/10: [STRIFE] Changed animdefs.
-//
-animdef_t               animdefs[] =
-{
-    { false, "F_SCANR8", "F_SCANR5",  4},
-    { false, "F_WATR03", "F_WATR01",  8},
-    { false, "F_PWATR3", "F_PWATR1", 11},
-    { false, "F_SCANR4", "F_SCANR1",  4},
-    { true,  "SCAN08",   "SCAN05",    4},
-    { true,  "SWTRMG03", "SWTRMG01",  4},
-    { true,  "SCAN04",   "SCAN01",    4},
-    { true,  "COMP04",   "COMP01",    4},
-    { true,  "COMP08",   "COMP05",    6},
-    { true,  "COMP12",   "COMP09",   11},
-    { true,  "COMP16",   "COMP13",   12},
-    { true,  "COMP20",   "COMP17",   12},
-    { true,  "COMP24",   "COMP21",   12},
-    { true,  "COMP28",   "COMP25",   12},
-    { true,  "COMP32",   "COMP29",   12},
-    { true,  "COMP37",   "COMP33",   12},
-    { true,  "COMP41",   "COMP38",   12},
-    { true,  "COMP49",   "COMP42",   10},
-    { true,  "BRKGRY16", "BRKGRY13", 10},
-    { true,  "BRNSCN04", "BRNSCN01", 10},
-    { true,  "CONCRT12", "CONCRT09", 11},
-    { true,  "CONCRT25", "CONCRT22", 11},
-    { true,  "WALPMP02", "WALPMP01", 16},
-    { true,  "WALTEK17", "WALTEK16",  8},
-    { true,  "FORCE04",  "FORCE01",   4},
-    { true,  "FORCE08",  "FORCE05",   4},
-    { true,  "FAN02",    "FAN01",     4},
-    { false, "F_VWATR3", "P_VWATR1",  4},
-    { false, "F_HWATR3", "F_HWATR1",  4},
-    { false, "F_TELE2",  "F_TELE1",   4},
-    { false, "F_FAN2",   "F_FAN1",    4},
-    { false, "F_CONVY2", "F_CONVY1",  4},
-    { false, "F_RDALN4", "F_RDALN1",  4},
-    { -1,    "",         "",          0},
-};
-
-anim_t  anims[MAXANIMS];
-anim_t* lastanim;
-
-//
-//      Animating line specials
-//
-// haleyjd 08/29/10: [STRIFE] MAXLINEANIMS raised from 64 to 96
-#define MAXLINEANIMS            96
-
-short   numlinespecials = 0;
-line_t *linespeciallist[MAXLINEANIMS];
-
-
-
-void P_InitPicAnims (void)
-{
-    int		i;
-
-    
-    //	Init animation
-    lastanim = anims;
-    for (i=0 ; animdefs[i].istexture != -1 ; i++)
-    {
-        const char *startname, *endname;
-
-        startname = DEH_String(animdefs[i].startname);
-        endname = DEH_String(animdefs[i].endname);
-
-        if (animdefs[i].istexture)
-        {
-            // different episode ?
-            if (R_CheckTextureNumForName(startname) == -1)
-                continue;	
-
-            lastanim->picnum = R_TextureNumForName(endname);
-            lastanim->basepic = R_TextureNumForName(startname);
-        }
-        else
-        {
-            if (W_CheckNumForName(startname) == -1)
-                continue;
-
-            lastanim->picnum = R_FlatNumForName(endname);
-            lastanim->basepic = R_FlatNumForName(startname);
-        }
-
-        lastanim->istexture = animdefs[i].istexture;
-        lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
-
-        if (lastanim->numpics < 2)
-            I_Error ("P_InitPicAnims: bad cycle from %s to %s",
-            startname, endname);
-
-        lastanim->speed = animdefs[i].speed;
-        lastanim++;
-    }
-
-}
-
-// villsa [STRIFE] terrain type definitions
-typedef struct
-{
-    const char *flat;
-    int     type;
-    int     num;
-} terraintype_t;
-
-terraintype_t   terraintypes[] =
-{
-    {   "F_WATR03", FLOOR_WATER,    -1  },
-    {   "F_WATR02", FLOOR_WATER,    -1  },
-    {   "F_WATR01", FLOOR_WATER,    -1  },
-    {   "F_VWATR3", FLOOR_WATER,    -1  },
-    {   "F_VWATR2", FLOOR_WATER,    -1  },
-    {   "P_VWATR1", FLOOR_WATER,    -1  },
-    {   "F_HWATR3", FLOOR_WATER,    -1  },
-    {   "F_HWATR2", FLOOR_WATER,    -1  },
-    {   "F_HWATR1", FLOOR_WATER,    -1  },
-    {   "F_PWATR3", FLOOR_SLIME,    -1  },
-    {   "F_PWATR2", FLOOR_SLIME,    -1  },
-    {   "F_PWATR1", FLOOR_SLIME,    -1  },
-    {   "END",      FLOOR_END,      -1  },
-};
-
-//
-// P_GetTerrainType
-// villsa [STRIFE] new function
-//
-
-terraintype_e P_GetTerrainType(mobj_t* mobj)
-{
-    int i = 0;
-    subsector_t* ss = mobj->subsector;
-
-    if(mobj->z <= ss->sector->floorheight &&
-        terraintypes[0].type != FLOOR_END)
-    {
-        while(ss->sector->floorpic != terraintypes[i].num)
-        {
-            if(terraintypes[i+1].type == FLOOR_END)
-                return FLOOR_SOLID;
-
-            i++;
-        }
-
-        return terraintypes[i].type;
-    }
-
-    return FLOOR_SOLID;
-}
-
-//
-// P_InitTerrainTypes
-// villsa [STRIFE] new function
-// Initialize terrain types
-//
-
-void P_InitTerrainTypes(void)
-{
-    int i = 0;
-
-    if(terraintypes[0].type != FLOOR_END)
-    {
-        while(terraintypes[i].type != FLOOR_END)
-        {
-            terraintypes[i].num = R_FlatNumForName(terraintypes[i].flat);
-            i++;
-        }
-    }
-}
-
-
-
-//
-// UTILITIES
-//
-
-
-
-//
-// getSide()
-// Will return a side_t*
-//  given the number of the current sector,
-//  the line number, and the side (0/1) that you want.
-//
-side_t*
-getSide
-( int		currentSector,
-  int		line,
-  int		side )
-{
-    return &sides[ (sectors[currentSector].lines[line])->sidenum[side] ];
-}
-
-
-//
-// getSector()
-// Will return a sector_t*
-//  given the number of the current sector,
-//  the line number and the side (0/1) that you want.
-//
-sector_t*
-getSector
-( int		currentSector,
-  int		line,
-  int		side )
-{
-    return sides[ (sectors[currentSector].lines[line])->sidenum[side] ].sector;
-}
-
-
-//
-// twoSided()
-// Given the sector number and the line number,
-//  it will tell you whether the line is two-sided or not.
-//
-int
-twoSided
-( int	sector,
-  int	line )
-{
-    return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
-}
-
-
-
-
-//
-// getNextSector()
-// Return sector_t * of sector next to current.
-// NULL if not two-sided line
-//
-sector_t*
-getNextSector
-( line_t*	line,
-  sector_t*	sec )
-{
-    if (!(line->flags & ML_TWOSIDED))
-	return NULL;
-		
-    if (line->frontsector == sec)
-	return line->backsector;
-	
-    return line->frontsector;
-}
-
-
-
-//
-// P_FindLowestFloorSurrounding()
-// FIND LOWEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-fixed_t	P_FindLowestFloorSurrounding(sector_t* sec)
-{
-    int			i;
-    line_t*		check;
-    sector_t*		other;
-    fixed_t		floor = sec->floorheight;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-
-	if (!other)
-	    continue;
-	
-	if (other->floorheight < floor)
-	    floor = other->floorheight;
-    }
-    return floor;
-}
-
-
-
-//
-// P_FindHighestFloorSurrounding()
-// FIND HIGHEST FLOOR HEIGHT IN SURROUNDING SECTORS
-//
-fixed_t	P_FindHighestFloorSurrounding(sector_t *sec)
-{
-    int			i;
-    line_t*		check;
-    sector_t*		other;
-    fixed_t		floor = -500*FRACUNIT;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-	
-	if (!other)
-	    continue;
-	
-	if (other->floorheight > floor)
-	    floor = other->floorheight;
-    }
-    return floor;
-}
-
-
-
-//
-// P_FindNextHighestFloor
-// FIND NEXT HIGHEST FLOOR IN SURROUNDING SECTORS
-// Note: this should be doable w/o a fixed array.
-
-// Thanks to entryway for the Vanilla overflow emulation.
-
-// 20 adjoining sectors max!
-#define MAX_ADJOINING_SECTORS     20
-
-fixed_t
-P_FindNextHighestFloor
-( sector_t* sec,
-  int       currentheight )
-{
-    int         i;
-    int         h;
-    int         min;
-    line_t*     check;
-    sector_t*   other;
-    fixed_t     height = currentheight;
-    fixed_t     heightlist[MAX_ADJOINING_SECTORS + 2];
-
-    for (i=0, h=0; i < sec->linecount; i++)
-    {
-        check = sec->lines[i];
-        other = getNextSector(check,sec);
-
-        if (!other)
-            continue;
-        
-        if (other->floorheight > height)
-        {
-            // Emulation of memory (stack) overflow
-            if (h == MAX_ADJOINING_SECTORS + 1)
-            {
-                height = other->floorheight;
-            }
-            else if (h == MAX_ADJOINING_SECTORS + 2)
-            {
-                // Fatal overflow: game crashes at 22 sectors
-                I_Error("Sector with more than 22 adjoining sectors. "
-                        "Vanilla will crash here");
-            }
-
-            heightlist[h++] = other->floorheight;
-        }
-    }
-    
-    // Find lowest height in list
-    if (!h)
-    {
-        return currentheight;
-    }
-        
-    min = heightlist[0];
-    
-    // Range checking? 
-    for (i = 1; i < h; i++)
-    {
-        if (heightlist[i] < min)
-        {
-            min = heightlist[i];
-        }
-    }
-
-    return min;
-}
-
-//
-// FIND LOWEST CEILING IN THE SURROUNDING SECTORS
-//
-fixed_t
-P_FindLowestCeilingSurrounding(sector_t* sec)
-{
-    int			i;
-    line_t*		check;
-    sector_t*		other;
-    fixed_t		height = INT_MAX;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-
-	if (!other)
-	    continue;
-
-	if (other->ceilingheight < height)
-	    height = other->ceilingheight;
-    }
-    return height;
-}
-
-
-//
-// FIND HIGHEST CEILING IN THE SURROUNDING SECTORS
-//
-fixed_t	P_FindHighestCeilingSurrounding(sector_t* sec)
-{
-    int		i;
-    line_t*	check;
-    sector_t*	other;
-    fixed_t	height = 0;
-	
-    for (i=0 ;i < sec->linecount ; i++)
-    {
-	check = sec->lines[i];
-	other = getNextSector(check,sec);
-
-	if (!other)
-	    continue;
-
-	if (other->ceilingheight > height)
-	    height = other->ceilingheight;
-    }
-    return height;
-}
-
-
-
-//
-// RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
-//
-int
-P_FindSectorFromLineTag
-( line_t*	line,
-  int		start )
-{
-    int	i;
-	
-    for (i=start+1;i<numsectors;i++)
-	if (sectors[i].tag == line->tag)
-	    return i;
-    
-    return -1;
-}
-
-
-
-
-//
-// Find minimum light from an adjacent sector
-//
-int
-P_FindMinSurroundingLight
-( sector_t*	sector,
-  int		max )
-{
-    int		i;
-    int		min;
-    line_t*	line;
-    sector_t*	check;
-	
-    min = max;
-    for (i=0 ; i < sector->linecount ; i++)
-    {
-	line = sector->lines[i];
-	check = getNextSector(line,sector);
-
-	if (!check)
-	    continue;
-
-	if (check->lightlevel < min)
-	    min = check->lightlevel;
-    }
-    return min;
-}
-
-
-
-//
-// EVENTS
-// Events are operations triggered by using, crossing,
-// or shooting special lines, or by timed thinkers.
-//
-
-// [STRIFE]
-static char crosslinestr[90];
-
-//
-// P_CrossSpecialLine - TRIGGER
-// Called every time a thing origin is about
-//  to cross a line with a non 0 special.
-//
-void
-P_CrossSpecialLine
-( int           linenum,
-  int           side,
-  mobj_t*       thing )
-{
-    line_t*     line;
-    side_t*     sidedef; // [STRIFE]
-    int         flag;    // [STRIFE]
-    int         ok;
-
-    line = &lines[linenum];
-
-    // haleyjd 09/21/10: corpses and missiles cannot activate any cross-over
-    // line types, *except* 182 (which is for the sake of missiles).
-    if((thing->flags & (MF_MISSILE|MF_CORPSE)) && line->special != 182)
-        return;
-
-    //	Triggers that other things can activate
-    if (!thing->player)
-    {
-        // Things that should NOT trigger specials...
-        // villsa [STRIFE] unused
-        //   haleyjd: removed dead switch. Strife only excludes missiles and
-        //   corpses, which is handled above.
- 
-        ok = 0;
-
-        // [STRIFE] Added several line types. Removed none.
-        switch(line->special)
-        {
-        case 97:        // TELEPORT RETRIGGER
-        case 185:       // haleyjd: [STRIFE] Silent Teleport (used for Converter)
-        case 195:       // haleyjd: [STRIFE] Silent Teleport and Change Zombie
-        case 231:       // haleyjd: [STRIFE] WR Teleport (Silent at Source)
-        case 125:       // TELEPORT MONSTERONLY TRIGGER
-        case 126:       // TELEPORT MONSTERONLY RETRIGGER
-        case 182:       // haleyjd: [STRIFE] Break glass - it's a W1 type too!
-        case 10:        // PLAT DOWN-WAIT-UP-STAY TRIGGER
-        case 39:        // TELEPORT TRIGGER
-        case 88:        // PLAT DOWN-WAIT-UP-STAY RETRIGGER
-        case 4:         // RAISE DOOR
-            ok = 1;
-            break;
-        }
-        if (!ok)
-            return;
-    }
-
-    
-    // Note: could use some const's here.
-    switch (line->special)
-    {
-    //
-    // TRIGGERS.
-    // All from here to RETRIGGERS.
-    //
-    case 230:
-        // haleyjd 09/21/10: [STRIFE] W1 Open Door if Quest
-        sidedef = &sides[line->sidenum[0]];
-        flag = (sidedef->rowoffset >> FRACBITS) - 1;
-
-        if(!(thing->player->questflags & (1 << flag)))
-            break;
-        // fall-through:
-    case 2:
-        // Open Door - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_open);
-        line->special = 0;
-        break;
-
-    case 227:
-        // haleyjd 09/21/10: [STRIFE] W1 Close Door if Quest
-        sidedef = &sides[line->sidenum[0]];
-        flag = (sidedef->rowoffset >> FRACBITS) - 1;
-
-        if(!(thing->player->questflags & (1 << flag)))
-            break;
-        // fall-through:
-    case 3:
-        // Close Door - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_close);
-        line->special = 0;
-        break;
-
-    case 4:
-        // Raise Door - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_normal);
-        line->special = 0;
-        break;
-
-    case 5:
-        // Raise Floor - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloor);
-        line->special = 0;
-        break;
-
-    case 6:
-        // Fast Ceiling Crush & Raise - [STRIFE] Verified unmodified.
-        EV_DoCeiling(line,fastCrushAndRaise);
-        line->special = 0;
-        break;
-
-    case 8:
-        // Build Stairs - [STRIFE] Verified unmodified.
-        EV_BuildStairs(line,build8);
-        line->special = 0;
-        break;
-
-    case 10:
-        // PlatDownWaitUp - [STRIFE] Verified unmodified.
-        EV_DoPlat(line,downWaitUpStay,0);
-        line->special = 0;
-        break;
-
-    case 12:
-        // Light Turn On - brightest near - [STRIFE] Verified unmodified.
-        EV_LightTurnOn(line,0);
-        line->special = 0;
-        break;
-
-    case 13:
-        // Light Turn On 255 - [STRIFE] Verified unmodified.
-        EV_LightTurnOn(line,255);
-        line->special = 0;
-        break;
-
-    case 16:
-        // Close Door 30 - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_close30ThenOpen);
-        line->special = 0;
-        break;
-
-    case 17:
-        // Start Light Strobing - [STRIFE] Verified unmodified.
-        EV_StartLightStrobing(line);
-        line->special = 0;
-        break;
-
-    case 19:
-        // Lower Floor - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,lowerFloor);
-        line->special = 0;
-        break;
-
-    case 22:
-        // villsa [STRIFE] Verified unmodified.
-        // Raise floor to nearest height and change texture
-        EV_DoPlat(line,raiseToNearestAndChange,0);
-        line->special = 0;
-        break;
-
-    case 25:
-        // Ceiling Crush and Raise - [STRIFE] Verified unmodified.
-        EV_DoCeiling(line,crushAndRaise);
-        line->special = 0;
-        break;
-
-    case 30:
-        // Raise floor to shortest texture height - [STRIFE] Verified unmodified.
-        //  on either side of lines.
-        EV_DoFloor(line,raiseToTexture);
-        line->special = 0;
-        break;
-
-    case 35:
-        // Lights Very Dark - [STRIFE] Verified unmodified.
-        EV_LightTurnOn(line,35);
-        line->special = 0;
-        break;
-
-    case 36:
-        // Lower Floor (TURBO) - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,turboLower);
-        line->special = 0;
-        break;
-
-    case 37:
-        // LowerAndChange - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,lowerAndChange);
-        line->special = 0;
-        break;
-
-    case 193:
-        // haleyjd 09/21/10: [STRIFE] W1 Floor Lower to Lowest if Quest
-        sidedef = &sides[line->sidenum[0]];
-        flag = (sidedef->rowoffset >> FRACBITS) - 1; // note is fixed_t
-
-        // must have the questflag indicated in the line's y offset
-        if(!(thing->player->questflags & (1 << flag)))
-            break;
-        // fall-through:
-    case 38: 
-        // Lower Floor To Lowest - [STRIFE] Verified unmodified.
-        EV_DoFloor( line, lowerFloorToLowest );
-        line->special = 0;
-        break;
-
-    case 39:
-        // TELEPORT! - [STRIFE] Verified unmodified (except for 0 flags param)
-        EV_Teleport( line, side, thing, TF_NORMAL );
-        line->special = 0;
-        break;
-
-        /*case 40:
-        // RaiseCeilingLowerFloor
-        EV_DoCeiling( line, raiseToHighest );
-        EV_DoFloor( line, lowerFloorToLowest );
-        line->special = 0;
-        break;*/
-
-    case 44:
-        // Ceiling Crush - [STRIFE] Verified unmodified.
-        EV_DoCeiling( line, lowerAndCrush );
-        line->special = 0;
-        break;
-
-    case 52:
-        // EXIT! - haleyjd 09/21/10: [STRIFE] Exit to level tag/100
-        G_ExitLevel (line->tag / 100);
-        break;
-
-    case 53:
-        // Perpetual Platform Raise - [STRIFE] Verified unmodified.
-        EV_DoPlat(line,perpetualRaise,0);
-        line->special = 0;
-        break;
-
-    case 54:
-        // Platform Stop - [STRIFE] Verified unmodified.
-        EV_StopPlat(line);
-        line->special = 0;
-        break;
-
-    case 56:
-        // Raise Floor Crush - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloorCrush);
-        line->special = 0;
-        break;
-
-    case 57:
-        // Ceiling Crush Stop - [STRIFE] Verified unmodified.
-        EV_CeilingCrushStop(line);
-        line->special = 0;
-        break;
-
-    case 58:
-        // [STRIFE] raiseFloor24 was modified into raiseFloor64
-        // Raise Floor 64 
-        EV_DoFloor(line,raiseFloor64);
-        line->special = 0;
-        break;
-
-    case 59:
-        // Raise Floor 24 And Change - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloor24AndChange);
-        line->special = 0;
-        break;
-
-    case 104:
-        // Turn lights off in sector(tag) - [STRIFE] Verified unmodified.
-        EV_TurnTagLightsOff(line);
-        line->special = 0;
-        break;
-
-    case 108:
-        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified.
-        EV_DoDoor (line,vld_blazeRaise);
-        line->special = 0;
-        break;
-
-    case 109:
-        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified.
-        EV_DoDoor (line,vld_blazeOpen);
-        line->special = 0;
-        break;
-
-    case 100:
-        // Build Stairs Turbo 16 - [STRIFE] Verified unmodified.
-        EV_BuildStairs(line,turbo16);
-        line->special = 0;
-        break;
-
-    case 197:
-        // haleyjd 09/21/10: [STRIFE] Blazing Door Close if Has Sigil B
-        if(thing->player->sigiltype <= 0)
-            break;
-        // fall-through:
-    case 110:
-        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified.
-        EV_DoDoor (line,vld_blazeClose);
-        line->special = 0;
-        break;
-
-    case 119:
-        // Raise floor to nearest surr. floor - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloorToNearest);
-        line->special = 0;
-        break;
-
-    case 121:
-        // villsa [STRIFE] Verified unmodified.
-        // Blazing PlatDownWaitUpStay
-        EV_DoPlat(line,blazeDWUS,0);
-        line->special = 0;
-        break;
-
-    case 124:
-        // haleyjd 09/21/10: [STRIFE] W1 Start Finale
-        // Altered from G_SecretExitLevel.
-        G_StartFinale();
-        break;
-
-    case 125:
-        // TELEPORT MonsterONLY - [STRIFE] Verified unmodified
-        //    (except for 0 flags parameter)
-        if (!thing->player)
-        {
-            EV_Teleport( line, side, thing, TF_NORMAL );
-            line->special = 0;
-        }
-        break;
-
-    case 130:
-        // Raise Floor Turbo - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloorTurbo);
-        line->special = 0;
-        break;
-
-    case 141:
-        // Silent Ceiling Crush & Raise - [STRIFE] Verified unmodified.
-        EV_DoCeiling(line,silentCrushAndRaise);
-        line->special = 0;
-        break;
-
-    case 174:
-        // villsa [STRIFE] Split Open
-        EV_DoDoor(line, vld_splitOpen);
-        line->special = 0;
-        break;
-
-    case 183:
-        // villsa [STRIFE] Split Raise Nearest
-        EV_DoDoor(line, vld_splitRaiseNearest);
-        line->special = 0;
-        break;
-
-    case 178: 
-        // haleyjd 09/24/10: [STRIFE] W1 Build Stairs Down 16
-        EV_BuildStairs(line, buildDown16);
-        line->special = 0;
-        break;
-
-    case 179: 
-        // haleyjd 09/25/10: [STRIFE] W1 Ceiling Lower to Floor
-        EV_DoCeiling(line, lowerToFloor);
-        line->special = 0;
-        break;
-
-    case 182:
-        // haleyjd 09/21/10: [STRIFE] Break Glass
-        // 182 is a unique linetype in that it is both a G1 and a W1 linetype,
-        // but only missiles may activate it as a W1 type.
-        if(thing->flags & MF_MISSILE)
-            P_ChangeSwitchTexture(line, 1); // why 1? it will be cleared anyway.
-        break;
-
-    case 187:
-        // haleyjd 09/21/10: [STRIFE] W1 Clear Force Fields if Quest
-        sidedef = &sides[line->sidenum[0]];
-        flag = (sidedef->rowoffset >> FRACBITS) - 1; // note is fixed_t
-
-        // must have the questflag indicated in the line's y offset
-        if(!(thing->player->questflags & (1 << flag)))
-            break;
-
-        // Do it!
-        EV_ClearForceFields(line);
-        line->special = 0;
-        break;
-
-    case 188:
-        // haleyjd 09/21/10: [STRIFE] W1 Open Door if Quest 16 (Gate Mechanism 
-        // Destroyed)
-        if(!(thing->player->questflags & QF_QUEST16))
-            break;
-        EV_DoDoor(line, vld_open);
-        line->special = 0;
-        break;
-
-    case 196:
-        // haleyjd 09/26/10: [STRIFE] W1 Floor Lower to Lowest if Sigil Type > 0
-        if(thing->player->sigiltype > 0)
-        {
-            EV_DoFloor(line, lowerFloorToLowest);
-            line->special = 0;
-        }
-        break;
-
-    case 200:
-        // haleyjd 09/21/10: [STRIFE] W1 Open Door if Sigil Owned
-        if(!(thing->player->weaponowned[wp_sigil]))
-            break;
-        EV_DoDoor(line, vld_open);
-        line->special = 0;
-        break;
-
-    case 201:
-        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective (First Side Only)
-        if(side == 1)
-            break;
-        // fall-through:
-    case 202:
-        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective (Tag = VOC/LOG #)
-        // must be consoleplayer
-        if(thing->player != &players[consoleplayer])
-            break;
-
-        // must have comm unit
-        if(!(thing->player->powers[pw_communicator]))
-            break;
-
-        // load voice
-        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "voc%i", line->tag);
-        I_StartVoice(crosslinestr);
-
-        // load objective
-        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "log%i", line->tag);
-        GiveObjective(crosslinestr, 0);
-
-        // Put up a message
-        thing->player->message = DEH_String("Incoming Message...");
-        line->special = 0;
-        break;
-
-    case 210:
-        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective if Flamethrower????
-        // I don't think this is actually used anywhere o_O
-        // must be player 1...
-        if(thing->player != &players[0])
-            break;
-
-        // must have comm unit
-        if(!(thing->player->powers[pw_communicator]))
-            break;
-
-        // must have... the flamethrower?!
-        if(!(thing->player->weaponowned[wp_flame]))
-            break;
-
-        // load voice
-        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "voc%i", line->tag);
-        I_StartVoice(crosslinestr);
-
-        // load objective
-        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "log%i", line->tag);
-        GiveObjective(crosslinestr, 0);
-
-        // Put up a message
-        thing->player->message = DEH_String("Incoming Message from BlackBird...");
-        line->special = 0;
-        break;
-
-    case 212:
-        // haleyjd 09/25/10: [STRIFE] W1 Floor Lower to Lowest if Have Flamethrower
-        if(thing->player->weaponowned[wp_flame])
-        {
-            EV_DoFloor(line, lowerFloorToLowest);
-            line->special = 0;
-        }
-        break;
-
-    case 215:
-        // haleyjd 09/21/10: [STRIFE] W1 Voiced Objective if Quest (Tag/100, Tag%100)
-        // must be player 1...
-        if(thing->player != &players[0])
-            break;
-
-        // must have comm unit
-        if(!(thing->player->powers[pw_communicator]))
-            break;
-
-        if(line->tag != 0)
-        {
-            // test for questflag
-            if(!(thing->player->questflags & (1 << (line->tag % 100 - 1))))
-                break;
-        }
-
-        // start voice
-        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "voc%i", line->tag/100);
-        I_StartVoice(crosslinestr);
-
-        // give objective
-        DEH_snprintf(crosslinestr, sizeof(crosslinestr), "log%i", line->tag/100);
-        GiveObjective(crosslinestr, 0);
-
-        // Put up a message
-        thing->player->message = DEH_String("Incoming Message from BlackBird...");
-        line->special = 0;
-        break;
-
-    case 204:
-        // haleyjd 09/21/10: [STRIFE] W1 Change Music (unused!)
-        if(thing->player != &players[0])
-            break;
-        S_ChangeMusic(line->tag, 1);
-        line->special = 0;
-        break;
-
-    case 228:
-        // haleyjd 09/21/10: [STRIFE] W1 Entity Voice?
-        if(!(thing->player->questflags & QF_QUEST24)) // Not killed Macil???
-            break; // STRIFE-TODO: verify...
-
-        if(!(thing->player->questflags & QF_QUEST28)) // ????? STRIFE-TODO
-            I_StartVoice(DEH_String("voc128"));
-        else
-            I_StartVoice(DEH_String("voc130"));
-        
-        line->special = 0;
-        break;
-
-        //
-        // RETRIGGERS.  All from here till end.
-        //
-    case 72:
-        // Ceiling Crush - [STRIFE] Verified unmodified.
-        EV_DoCeiling( line, lowerAndCrush );
-        break;
-
-    case 73:
-        // Ceiling Crush and Raise - [STRIFE] Verified unmodified.
-        EV_DoCeiling(line,crushAndRaise);
-        break;
-
-    case 74:
-        // Ceiling Crush Stop - [STRIFE] Verified unmodified.
-        EV_CeilingCrushStop(line);
-        break;
-
-    case 75:
-        // Close Door - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_close);
-        break;
-
-    case 76:
-        // Close Door 30 - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_close30ThenOpen);
-        break;
-
-    case 77:
-        // Fast Ceiling Crush & Raise - [STRIFE] Verified unmodified.
-        EV_DoCeiling(line,fastCrushAndRaise);
-        break;
-
-    case 79:
-        // Lights Very Dark - [STRIFE] Verified unmodified.
-        EV_LightTurnOn(line,35);
-        break;
-
-    case 80:
-        // Light Turn On - brightest near - [STRIFE] Verified unmodified.
-        EV_LightTurnOn(line,0);
-        break;
-
-    case 81:
-        // Light Turn On 255 - [STRIFE] Verified unmodified.
-        EV_LightTurnOn(line,255);
-        break;
-
-    case 82:
-        // Lower Floor To Lowest - [STRIFE] Verified unmodified.
-        EV_DoFloor( line, lowerFloorToLowest );
-        break;
-
-    case 83:
-        // Lower Floor - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,lowerFloor);
-        break;
-
-    case 84:
-        // LowerAndChange - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,lowerAndChange);
-        break;
-
-    case 86:
-        // Open Door - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_open);
-        break;
-
-    case 87:
-        // Perpetual Platform Raise - [STRIFE] Verified unmodified.
-        EV_DoPlat(line,perpetualRaise,0);
-        break;
-
-    case 88:
-        // PlatDownWaitUp - [STRIFE] Verified unmodified.
-        EV_DoPlat(line,downWaitUpStay,0);
-        break;
-
-    case 89:
-        // Platform Stop - [STRIFE] Verified unmodified.
-        EV_StopPlat(line);
-        break;
-
-    case 216:
-        // haleyjd 09/21/10: [STRIFE] WR Raise Door if Quest
-        sidedef = &sides[line->sidenum[0]];
-        flag = (sidedef->rowoffset >> FRACBITS) - 1; // note is fixed_t.
-
-        if(!(thing->player->questflags & (1 << flag)))
-            break;
-        // fall-through:
-    case 90: 
-        // Raise Door - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_normal);
-        break;
-
-    case 91:
-        // Raise Floor - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloor);
-        break;
-
-    case 92:
-        // [STRIFE] raiseFloor24 changed to raiseFloor64
-        // Raise Floor 64
-        EV_DoFloor(line,raiseFloor64);
-        break;
-
-    case 93:
-        // Raise Floor 24 And Change - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloor24AndChange);
-        break;
-
-    case 94:
-        // Raise Floor Crush - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloorCrush);
-        break;
-
-    case 95:
-        // villsa [STRIFE] Verified unmodified.
-        // Raise floor to nearest height
-        // and change texture.
-        EV_DoPlat(line,raiseToNearestAndChange,0);
-        break;
-
-    case 96:
-        // Raise floor to shortest texture height - [STRIFE] Verified unmodified.
-        // on either side of lines.
-        EV_DoFloor(line,raiseToTexture);
-        break;
-
-    case 97:
-        // TELEPORT! - [STRIFE] Verified unmodified (except for 0 flags param)
-        EV_Teleport( line, side, thing, TF_NORMAL );
-        break;
-
-    case 98:
-        // Lower Floor (TURBO) - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,turboLower);
-        break;
-
-    case 105:
-        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified.
-        EV_DoDoor (line,vld_blazeRaise);
-        break;
-
-    case 106:
-        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified.
-        EV_DoDoor (line,vld_blazeOpen);
-        break;
-
-    case 107:
-        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified.
-        EV_DoDoor (line,vld_blazeClose);
-        break;
-
-    case 120:
-        // villsa [STRIFE] Verified unmodified.
-        // Blazing PlatDownWaitUpStay.
-        EV_DoPlat(line,blazeDWUS,0);
-        break;
-
-    case 126:
-        // TELEPORT MonsterONLY. - [STRIFE] Verified unmodified (except for 0 flags param)
-        if (!thing->player)
-            EV_Teleport( line, side, thing, TF_NORMAL );
-        break;
-
-    case 128:
-        // Raise To Nearest Floor - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloorToNearest);
-        break;
-
-    case 129:
-        // Raise Floor Turbo - [STRIFE] Verified unmodified.
-        EV_DoFloor(line,raiseFloorTurbo);
-        break;
-
-    case 186:
-        // haleyjd [STRIFE] Exit Level to Spot, First Side Only
-        if(side == 1)
-            break;
-        // fall-through:
-    case 145:
-        // haleyjd [STRIFE] Exit Level to Spot
-        thing->momx = thing->momy = thing->momz = 0;
-        {
-            int map  = line->tag / 100;
-            int spot = line->tag % 100;
-
-            if(thing->player->weaponowned[wp_sigil])
-            {
-                if(map == 3)
-                    map = 30;
-                else if(map == 7)
-                    map = 10;
-            }
-
-            DEH_snprintf(crosslinestr, sizeof(crosslinestr), 
-                         "Entering%s", 
-                         DEH_String(mapnames[map - 1]) + 8);
-            thing->player->message = crosslinestr;
-
-            if(netgame && deathmatch)
-            {
-                if(levelTimer && levelTimeCount != 0)
-                {
-                    DEH_snprintf(crosslinestr, sizeof(crosslinestr), 
-                                 "%d min left", 
-                                 (levelTimeCount/TICRATE)/60);
-                    break;
-                }
-
-                // raise switch from floor
-                EV_DoFloor(line, raiseFloor64);
-            }
-            else
-            {
-                // normal single-player exit
-
-                // BUG: Here is the opening for a flaming player to cross past
-                // the exit line and hit a deathmatch switch ;) It's not so much
-                // that this is incorrect, as that they forgot to add such a 
-                // check to the other kind of exit lines too ;)
-                if(thing->player->health <= 0)
-                    break;
-
-                G_RiftExitLevel(map, spot, thing->angle);
-            }
-        }
-        break;
-
-    case 175:
-        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if < 16 Above Floor
-        if(thing->z < thing->floorz + 16 * FRACUNIT)
-            P_NoiseAlert(thing->player->mo, thing->player->mo);
-        break;
-
-    case 198:
-        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if No Guard Uniform
-        if(P_PlayerHasItem(thing->player, MT_QUEST_GUARD_UNIFORM))
-            break;
-        // fall-through:
-    case 150:
-        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm
-        P_NoiseAlert(thing->player->mo, thing->player->mo);
-        break;
-
-    case 208:
-        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if Have Flamethrower
-        // O_o - this is definitely unused. Was an entire flamethrower quest
-        // cut out of the game before release?
-        if(thing->player->weaponowned[wp_flame])
-            P_NoiseAlert(thing->player->mo, thing->player->mo);
-        break;
-
-    case 206:
-        // haleyjd 09/21/10: [STRIFE] WR Raise Alarm if Have Chalice
-        // This *is* used, inside the Tavern in Tarnhill. Oddly there is also
-        // one just randomly placed outside the entrance to the Power Station.
-        if(P_PlayerHasItem(thing->player, MT_INV_CHALICE))
-            P_NoiseAlert(thing->player->mo, thing->player->mo);
-        break;
-
-    case 184:
-        // villsa [STRIFE] plat up wait down stay
-        if(EV_DoPlat(line, upWaitDownStay, 0))
-            P_ChangeSwitchTexture(line, 1); // In P_CrossSpecialLine? Copypasta error?
-        break;
-
-    case 185:
-        // haleyjd 09/21/10: [STRIFE] Silent Teleport (used for Converter)
-        EV_Teleport(line, side, thing, TF_FULLSILENCE);
-        break;
-
-    case 195:
-        // haleyjd 09/21/10: [STRIFE] Silent Teleport and Change Zombie
-        EV_Teleport(line, side, thing, TF_FULLSILENCE);
-        P_SetMobjState(thing, S_AGRD_00); // 419
-        break;
-
-    case 203:
-        // haleyjd 09/21/10: [STRIFE] WR Change Music
-        if(thing->player != &players[0])
-            break;
-        S_ChangeMusic(line->tag, 1);
-        break;
-
-    case 231:
-        // haleyjd 09/21/10: [STRIFE] WR Teleport (Silent at Source)
-        EV_Teleport(line, side, thing, TF_SRCSILENCE);
-        break;
-        
-        // haleyjd 09/21/10: Moved one-time-use lines up above with the others.
-    }
-}
-
-
-
-//
-// P_ShootSpecialLine - IMPACT SPECIALS
-// Called when a thing shoots a special line.
-//
-void
-P_ShootSpecialLine
-( mobj_t*       thing,
-  line_t*       line )
-{
-    int         ok;
-
-    //	Impacts that other things can activate.
-    if (!thing->player)
-    {
-        ok = 0;
-        switch(line->special)
-        {
-        case 46:  // OPEN DOOR IMPACT
-        case 182: // villsa [STRIFE] for windows
-            ok = 1;
-            break;
-        }
-        if (!ok)
-            return;
-    }
-
-    switch(line->special)
-    {
-    case 24:
-        // RAISE FLOOR - [STRIFE] Verified unmodified
-        EV_DoFloor(line,raiseFloor);
-        P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 46:
-        // OPEN DOOR - [STRIFE] Verified unmodified.
-        EV_DoDoor(line,vld_open);
-        P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 47:
-        // villsa [STRIFE] Verified unmodified.
-        // RAISE FLOOR NEAR AND CHANGE
-        EV_DoPlat(line,raiseToNearestAndChange,0);
-        P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 180:
-        // haleyjd 09/22/10: [STRIFE] G1 Raise Floor 512 & Change
-        EV_DoFloor(line, raiseFloor512AndChange);
-        P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 182:
-        // villsa [STRIFE] G1 Break Glass
-        //   haleyjd: note that 182 is also a W1 type in P_CrossSpecialLine, but
-        //   can only be activated in that manner by an MF_MISSILE object.
-        P_ChangeSwitchTexture(line, 0);
-        break;
-    }
-}
-
-
-
-//
-// P_PlayerInSpecialSector
-// Called every tic frame
-//  that the player origin is in a special sector
-//
-// [STRIFE] Modified for new sector types and changes to old ones.
-//
-void P_PlayerInSpecialSector (player_t* player)
-{
-    sector_t*	sector;
-
-    sector = player->mo->subsector->sector;
-
-    // Falling, not all the way down yet?
-    if (player->mo->z != sector->floorheight)
-        return;	
-
-    // Has hitten ground.
-    switch (sector->special)
-    {
-    case 5:
-        // HELLSLIME DAMAGE
-        // [STRIFE] +2 to nukagecount
-        if(!player->powers[pw_ironfeet])
-            player->nukagecount += 2;
-        break;
-    
-    case 16:
-        // [STRIFE] +4 to nukagecount
-        if(!player->powers[pw_ironfeet])
-            player->nukagecount += 4;
-        break;
-
-    case 4:
-    case 7:
-        // [STRIFE] Immediate 5 damage every 31 tics
-        if(!player->powers[pw_ironfeet])
-            if(!(leveltime & 0x1f))
-                P_DamageMobj(player->mo, NULL, NULL, 5);
-        break;
-
-    case 9:
-        // SECRET SECTOR
-        //player->secretcount++; [STRIFE] Don't have a secret count.
-        sector->special = 0;
-        if(player - players == consoleplayer)
-            S_StartSound(NULL, sfx_yeah);
-        break;
-
-    case 11:
-        // EXIT SUPER DAMAGE! (for E1M8 finale)
-        player->cheats &= ~CF_GODMODE;
-
-        if (!(leveltime&0x1f))
-            P_DamageMobj (player->mo, NULL, NULL, 20);
-
-        if (player->health <= 10)
-            G_ExitLevel(0);
-        break;
-
-    case 15:
-        // haleyjd 08/30/10: [STRIFE] "Instant" Death sector
-        P_DamageMobj(player->mo, NULL, NULL, 999);
-        break;
-
-
-    case 18:
-        // haleyjd 08/30/10: [STRIFE] Water current
-        {
-            int tagval = sector->tag - 100;
-            fixed_t force;
-            angle_t angle;
-
-            if(player->cheats & CF_NOCLIP)
-                return;
-
-            force = (tagval % 10) << 12;
-            angle = (tagval / 10) << 29;
-
-            P_Thrust(player, angle, force);
-        }
-        break;
-
-    default:
-        I_Error ("P_PlayerInSpecialSector: "
-                 "unknown special %i",
-                 sector->special);
-        break;
-    };
-}
-
-
-
-
-//
-// P_UpdateSpecials
-// Animate planes, scroll walls, etc.
-//
-// [STRIFE] Modifications to support multiple scrolling line types.
-//
-boolean         levelTimer;
-int             levelTimeCount;
-
-void P_UpdateSpecials (void)
-{
-    anim_t*     anim;
-    int         pic;
-    int         i;
-    line_t*     line;
-
-
-    //  LEVEL TIMER
-    if (levelTimer == true)
-    {
-        if(levelTimeCount) // [STRIFE] Does not allow to go negative
-            levelTimeCount--;
-        
-        /*
-        // [STRIFE] Not done here. Exit lines check this manually instead.
-        if (!levelTimeCount)
-            G_ExitLevel(0);
-        */
-    }
-
-    //  ANIMATE FLATS AND TEXTURES GLOBALLY
-    for (anim = anims ; anim < lastanim ; anim++)
-    {
-        for (i=anim->basepic ; i<anim->basepic+anim->numpics ; i++)
-        {
-            pic = anim->basepic + ( (leveltime/anim->speed + i)%anim->numpics );
-            if (anim->istexture)
-                texturetranslation[i] = pic;
-            else
-                flattranslation[i] = pic;
-        }
-    }
-
-    
-    //  ANIMATE LINE SPECIALS
-    for (i = 0; i < numlinespecials; i++)
-    {
-        line = linespeciallist[i];
-        switch(line->special)
-        {
-        case 48:
-            // EFFECT FIRSTCOL SCROLL +
-            sides[line->sidenum[0]].textureoffset += FRACUNIT;
-            break;
-
-        case 142:
-            // haleyjd 09/25/10 [STRIFE] Scroll Up Slow
-            sides[line->sidenum[0]].rowoffset += FRACUNIT;
-            break;
-
-        case 143:
-            // haleyjd 09/25/10 [STRIFE] Scroll Down Fast (3 Units/Tic)
-            sides[line->sidenum[0]].rowoffset -= 3*FRACUNIT;
-            break;
-
-        case 149:
-            // haleyjd 09/25/10 [STRIFE] Scroll Down Slow
-            sides[line->sidenum[0]].rowoffset -= FRACUNIT;
-            break;
-        }
-    }
-
-    
-    //  DO BUTTONS
-    for (i = 0; i < MAXBUTTONS; i++)
-        if (buttonlist[i].btimer)
-        {
-            buttonlist[i].btimer--;
-            if (!buttonlist[i].btimer)
-            {
-                switch(buttonlist[i].where)
-                {
-                case top:
-                    sides[buttonlist[i].line->sidenum[0]].toptexture =
-                        buttonlist[i].btexture;
-                    break;
-
-                case middle:
-                    sides[buttonlist[i].line->sidenum[0]].midtexture =
-                        buttonlist[i].btexture;
-                    break;
-
-                case bottom:
-                    sides[buttonlist[i].line->sidenum[0]].bottomtexture =
-                        buttonlist[i].btexture;
-                    break;
-                }
-                S_StartSound(&buttonlist[i].soundorg,sfx_swtchn);
-                memset(&buttonlist[i],0,sizeof(button_t));
-            }
-        }
-}
-
-
-//
-// Donut overrun emulation
-//
-// Derived from the code from PrBoom+.  Thanks go to Andrey Budko (entryway)
-// as usual :-)
-//
-
-#define DONUT_FLOORHEIGHT_DEFAULT 0x00000000
-#define DONUT_FLOORPIC_DEFAULT 0x16
-
-static void DonutOverrun(fixed_t *s3_floorheight, short *s3_floorpic,
-                         line_t *line, sector_t *pillar_sector)
-{
-    static int first = 1;
-    static int tmp_s3_floorheight;
-    static int tmp_s3_floorpic;
-
-    if (first)
-    {
-        int p;
-
-        // This is the first time we have had an overrun.
-        first = 0;
-
-        // Default values
-        tmp_s3_floorheight = DONUT_FLOORHEIGHT_DEFAULT;
-        tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
-
-        //!
-        // @category compat
-        // @arg <x> <y>
-        //
-        // Use the specified magic values when emulating behavior caused
-        // by memory overruns from improperly constructed donuts.
-        // In Vanilla Strife this can differ depending on the operating
-        // system.  The default (if this option is not specified) is to
-        // emulate the behavior when running under Windows 98.
-
-        p = M_CheckParmWithArgs("-donut", 2);
-
-        if (p > 0)
-        {
-            // Dump of needed memory: (fixed_t)0000:0000 and (short)0000:0008
-            //
-            // C:\>debug
-            // -d 0:0
-            //
-            // DOS 6.22:
-            // 0000:0000    (57 92 19 00) F4 06 70 00-(16 00)
-            // DOS 7.1:
-            // 0000:0000    (9E 0F C9 00) 65 04 70 00-(16 00)
-            // Win98:
-            // 0000:0000    (00 00 00 00) 65 04 70 00-(16 00)
-            // DOSBox under XP:
-            // 0000:0000    (00 00 00 F1) ?? ?? ?? 00-(07 00)
-
-            M_StrToInt(myargv[p + 1], &tmp_s3_floorheight);
-            M_StrToInt(myargv[p + 2], &tmp_s3_floorpic);
-
-            if (tmp_s3_floorpic >= numflats)
-            {
-                fprintf(stderr,
-                        "DonutOverrun: The second parameter for \"-donut\" "
-                        "switch should be greater than 0 and less than number "
-                        "of flats (%d). Using default value (%d) instead. \n",
-                        numflats, DONUT_FLOORPIC_DEFAULT);
-                tmp_s3_floorpic = DONUT_FLOORPIC_DEFAULT;
-            }
-        }
-    }
-
-    /*
-    fprintf(stderr,
-            "Linedef: %d; Sector: %d; "
-            "New floor height: %d; New floor pic: %d\n",
-            line->iLineID, pillar_sector->iSectorID,
-            tmp_s3_floorheight >> 16, tmp_s3_floorpic);
-     */
-
-    *s3_floorheight = (fixed_t) tmp_s3_floorheight;
-    *s3_floorpic = (short) tmp_s3_floorpic;
-}
-
-
-//
-// Special Stuff that can not be categorized
-//
-int EV_DoDonut(line_t*	line)
-{
-    sector_t*		s1;
-    sector_t*		s2;
-    sector_t*		s3;
-    int			secnum;
-    int			rtn;
-    int			i;
-    floormove_t*	floor;
-    fixed_t s3_floorheight;
-    short s3_floorpic;
-
-    secnum = -1;
-    rtn = 0;
-    while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-    {
-	s1 = &sectors[secnum];
-
-	// ALREADY MOVING?  IF SO, KEEP GOING...
-	if (s1->specialdata)
-	    continue;
-
-	rtn = 1;
-	s2 = getNextSector(s1->lines[0],s1);
-
-        // Vanilla Doom does not check if the linedef is one sided.  The
-        // game does not crash, but reads invalid memory and causes the
-        // sector floor to move "down" to some unknown height.
-        // DOSbox prints a warning about an invalid memory access.
-        //
-        // I'm not sure exactly what invalid memory is being read.  This
-        // isn't something that should be done, anyway.
-        // Just print a warning and return.
-
-        if (s2 == NULL)
-        {
-            fprintf(stderr,
-                    "EV_DoDonut: linedef had no second sidedef! "
-                    "Unexpected behavior may occur in Vanilla Doom. \n");
-	    break;
-        }
-
-	for (i = 0; i < s2->linecount; i++)
-	{
-	    s3 = s2->lines[i]->backsector;
-
-	    if (s3 == s1)
-		continue;
-
-            if (s3 == NULL)
-            {
-                // e6y
-                // s3 is NULL, so
-                // s3->floorheight is an int at 0000:0000
-                // s3->floorpic is a short at 0000:0008
-                // Trying to emulate
-
-                fprintf(stderr,
-                        "EV_DoDonut: WARNING: emulating buffer overrun due to "
-                        "NULL back sector. "
-                        "Unexpected behavior may occur in Vanilla Doom.\n");
-
-                DonutOverrun(&s3_floorheight, &s3_floorpic, line, s1);
-            }
-            else
-            {
-                s3_floorheight = s3->floorheight;
-                s3_floorpic = s3->floorpic;
-            }
-
-	    //	Spawn rising slime
-	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-	    P_AddThinker (&floor->thinker);
-	    s2->specialdata = floor;
-	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-	    floor->type = donutRaise;
-	    floor->crush = false;
-	    floor->direction = 1;
-	    floor->sector = s2;
-	    floor->speed = FLOORSPEED / 2;
-	    floor->texture = s3_floorpic;
-	    floor->newspecial = 0;
-	    floor->floordestheight = s3_floorheight;
-	    
-	    //	Spawn lowering donut-hole
-	    floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-	    P_AddThinker (&floor->thinker);
-	    s1->specialdata = floor;
-	    floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-	    floor->type = lowerFloor;
-	    floor->crush = false;
-	    floor->direction = -1;
-	    floor->sector = s1;
-	    floor->speed = FLOORSPEED / 2;
-	    floor->floordestheight = s3_floorheight;
-	    break;
-	}
-    }
-    return rtn;
-}
-
-
-
-//
-// SPECIAL SPAWNING
-//
-
-//
-// P_SpawnSpecials
-// After the map has been loaded, scan for specials
-//  that spawn thinkers
-//
-
-
-// Parses command line parameters.
-//
-// haleyjd 09/25/10: [STRIFE] Modifications for more scrolling line types and
-// for initialization of sliding door resources.
-//
-void P_SpawnSpecials (void)
-{
-    sector_t*   sector;
-    int         i;
-
-    // See if -TIMER was specified.
-
-    if (timelimit > 0 && deathmatch)
-    {
-        levelTimer = true;
-        levelTimeCount = timelimit * 60 * TICRATE;
-    }
-    else
-    {
-        levelTimer = false;
-    }
-
-    //	Init special SECTORs - [STRIFE] Verified unmodified.
-    sector = sectors;
-    for (i=0 ; i<numsectors ; i++, sector++)
-    {
-        if (!sector->special)
-            continue;
-
-        switch (sector->special)
-        {
-        case 1:
-            // FLICKERING LIGHTS
-            P_SpawnLightFlash (sector);
-            break;
-
-        case 2:
-            // STROBE FAST
-            P_SpawnStrobeFlash(sector,FASTDARK,0);
-            break;
-
-        case 3:
-            // STROBE SLOW
-            P_SpawnStrobeFlash(sector,SLOWDARK,0);
-            break;
-
-        case 4:
-            // STROBE FAST/DEATH SLIME
-            P_SpawnStrobeFlash(sector,FASTDARK,0);
-            sector->special = 4;
-            break;
-
-        case 8:
-            // GLOWING LIGHT
-            P_SpawnGlowingLight(sector);
-            break;
-        case 9:
-            // SECRET SECTOR
-            totalsecret++;
-            break;
-
-        case 10:
-            // DOOR CLOSE IN 30 SECONDS
-            P_SpawnDoorCloseIn30 (sector);
-            break;
-
-        case 12:
-            // SYNC STROBE SLOW
-            P_SpawnStrobeFlash (sector, SLOWDARK, 1);
-            break;
-
-        case 13:
-            // SYNC STROBE FAST
-            P_SpawnStrobeFlash (sector, FASTDARK, 1);
-            break;
-
-        case 14:
-            // DOOR RAISE IN 5 MINUTES
-            P_SpawnDoorRaiseIn5Mins (sector, i);
-            break;
-
-        case 17:
-            P_SpawnFireFlicker(sector);
-            break;
-        }
-    }
-
-
-    //	Init line EFFECTs
-    numlinespecials = 0;
-    for (i = 0;i < numlines; i++)
-    {
-        switch(lines[i].special)
-        {
-        case 48:  // EFFECT FIRSTCOL SCROLL+
-        case 142:
-        case 143:
-        case 149:
-            linespeciallist[numlinespecials] = &lines[i];
-            numlinespecials++;
-            break;
-        }
-    }
-
-    //	Init other misc stuff
-    for (i = 0;i < MAXCEILINGS;i++)
-        activeceilings[i] = NULL;
-
-    for (i = 0;i < MAXPLATS;i++)
-        activeplats[i] = NULL;
-
-    for (i = 0;i < MAXBUTTONS;i++)
-        memset(&buttonlist[i],0,sizeof(button_t));
-
-    // villsa [STRIFE]
-    P_InitSlidingDoorFrames();
-}
diff --git a/games/NXDoom/src/strife/p_spec.h b/games/NXDoom/src/strife/p_spec.h
deleted file mode 100644
index 684386afe..000000000
--- a/games/NXDoom/src/strife/p_spec.h
+++ /dev/null
@@ -1,678 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//	Implements special effects:
-//	Texture animation, height or lighting changes
-//	 according to adjacent sectors, respective
-//	 utility functions, etc.
-//
-
-
-#ifndef __P_SPEC__
-#define __P_SPEC__
-
-
-//
-// End-level timer (-TIMER option)
-//
-extern	boolean levelTimer;
-extern	int	levelTimeCount;
-
-
-//      Define values for map objects
-#define MO_TELEPORTMAN          14
-
-
-// at game start
-void    P_InitPicAnims (void);
-
-// villsa [STRIFE]
-typedef enum
-{
-    FLOOR_WATER = 0,
-    FLOOR_SLIME = 1,
-    FLOOR_SOLID = 2,
-    FLOOR_END   = -1
-} terraintype_e;
-
-void P_InitTerrainTypes(void);                  // villsa [STRIFE]
-terraintype_e P_GetTerrainType(mobj_t* mobj);   // villsa [STRIFE]
-
-// at map load
-void    P_SpawnSpecials (void);
-
-// every tic
-void    P_UpdateSpecials (void);
-
-// when needed
-boolean
-P_UseSpecialLine
-( mobj_t*	thing,
-  line_t*	line,
-  int		side );
-
-void
-P_ShootSpecialLine
-( mobj_t*	thing,
-  line_t*	line );
-
-void
-P_CrossSpecialLine
-( int		linenum,
-  int		side,
-  mobj_t*	thing );
-
-void    P_PlayerInSpecialSector (player_t* player);
-
-int
-twoSided
-( int		sector,
-  int		line );
-
-sector_t*
-getSector
-( int		currentSector,
-  int		line,
-  int		side );
-
-side_t*
-getSide
-( int		currentSector,
-  int		line,
-  int		side );
-
-fixed_t P_FindLowestFloorSurrounding(sector_t* sec);
-fixed_t P_FindHighestFloorSurrounding(sector_t* sec);
-
-fixed_t
-P_FindNextHighestFloor
-( sector_t*	sec,
-  int		currentheight );
-
-fixed_t P_FindLowestCeilingSurrounding(sector_t* sec);
-fixed_t P_FindHighestCeilingSurrounding(sector_t* sec);
-
-int
-P_FindSectorFromLineTag
-( line_t*	line,
-  int		start );
-
-int
-P_FindMinSurroundingLight
-( sector_t*	sector,
-  int		max );
-
-sector_t*
-getNextSector
-( line_t*	line,
-  sector_t*	sec );
-
-
-//
-// SPECIAL
-//
-int     EV_DoDonut(line_t* line);
-boolean EV_ClearForceFields(line_t* line);  // villsa [STRIFE]
-
-
-//
-// P_LIGHTS
-//
-typedef struct
-{
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		count;
-    int		maxlight;
-    int		minlight;
-    
-} fireflicker_t;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		count;
-    int		maxlight;
-    int		minlight;
-    int		maxtime;
-    int		mintime;
-    
-} lightflash_t;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		count;
-    int		minlight;
-    int		maxlight;
-    int		darktime;
-    int		brighttime;
-    
-} strobe_t;
-
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    sector_t*	sector;
-    int		minlight;
-    int		maxlight;
-    int		direction;
-
-} glow_t;
-
-
-#define GLOWSPEED			8
-#define STROBEBRIGHT		5
-#define FASTDARK			15
-#define SLOWDARK			35
-
-void    P_SpawnFireFlicker (sector_t* sector);
-void    T_LightFlash (lightflash_t* flash);
-void    P_SpawnLightFlash (sector_t* sector);
-void    T_StrobeFlash (strobe_t* flash);
-
-void
-P_SpawnStrobeFlash
-( sector_t*	sector,
-  int		fastOrSlow,
-  int		inSync );
-
-void    EV_StartLightStrobing(line_t* line);
-void    EV_TurnTagLightsOff(line_t* line);
-
-void
-EV_LightTurnOn
-( line_t*	line,
-  int		bright );
-
-void    T_Glow(glow_t* g);
-void    P_SpawnGlowingLight(sector_t* sector);
-
-
-
-
-//
-// P_SWITCH
-//
-typedef struct
-{
-    char	name1[9];
-    char	name2[9];
-    short	episode;
-    int         sound;  // villsa [STRIFE]
-
-} switchlist_t;
-
-
-typedef enum
-{
-    top,
-    middle,
-    bottom
-
-} bwhere_e;
-
-
-typedef struct
-{
-    line_t*	line;
-    bwhere_e	where;
-    int		btexture;
-    int		btimer;
-    degenmobj_t *soundorg;
-
-} button_t;
-
-
-
-
- // max # of wall switches in a level
-#define MAXSWITCHES		80  // villsa [STRIFE] changed from 50 to 80
-
- // 4 players, 4 buttons each at once, max.
-#define MAXBUTTONS		16
-
- // 1 second, in ticks. 
-#define BUTTONTIME      35             
-
-extern button_t	buttonlist[MAXBUTTONS]; 
-
-void
-P_ChangeSwitchTexture
-( line_t*	line,
-  int		useAgain );
-
-void P_InitSwitchList(void);
-
-
-//
-// P_PLATS
-//
-typedef enum
-{
-    up,
-    down,
-    waiting,
-    in_stasis
-
-} plat_e;
-
-
-
-typedef enum
-{
-    perpetualRaise,
-    downWaitUpStay,
-    slowDWUS,           // villsa [STRIFE]
-    raiseAndChange,
-    raiseToNearestAndChange,
-    blazeDWUS,
-    upWaitDownStay      // villsa [STRIFE]
-
-} plattype_e;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    sector_t*	sector;
-    fixed_t	speed;
-    fixed_t	low;
-    fixed_t	high;
-    int		wait;
-    int		count;
-    plat_e	status;
-    plat_e	oldstatus;
-    boolean	crush;
-    int		tag;
-    plattype_e	type;
-    
-} plat_t;
-
-
-
-#define PLATWAIT		3
-#define PLATSPEED		FRACUNIT
-#define MAXPLATS		30
-
-
-extern plat_t*	activeplats[MAXPLATS];
-
-void    T_PlatRaise(plat_t*	plat);
-
-int
-EV_DoPlat
-( line_t*	line,
-  plattype_e	type,
-  int		amount );
-
-void    P_AddActivePlat(plat_t* plat);
-void    P_RemoveActivePlat(plat_t* plat);
-void    EV_StopPlat(line_t* line);
-void    P_ActivateInStasis(int tag);
-
-
-//
-// P_DOORS
-//
-typedef enum
-{
-    vld_normal,
-    vld_close30ThenOpen,
-    vld_close,
-    vld_open,
-    vld_raiseIn5Mins,
-    vld_blazeRaise,
-    vld_blazeOpen,
-    vld_blazeClose,
-    vld_shopClose,          // villsa [STRIFE]
-    vld_splitRaiseNearest,  // villsa [STRIFE]
-    vld_splitOpen           // villsa [STRIFE]
-
-} vldoor_e;
-
-
-
-typedef struct
-{
-    thinker_t   thinker;
-    vldoor_e    type;
-    sector_t*   sector;
-    fixed_t     topheight;
-    fixed_t     speed;
-
-    // 1 = up, 0 = waiting at top, -1 = down
-    int         direction;
-    
-    // tics to wait at the top
-    int         topwait;
-    // (keep in case a door going down is reset)
-    // when it reaches 0, start going down
-    int         topcountdown;
-
-    // villsa [STRIFE] new field - sound to play when opening
-    int         opensound;
-
-    // villsa [STRIFE] new field - sound to play when closing
-    int         closesound;
-    
-} vldoor_t;
-
-
-
-#define VDOORSPEED		FRACUNIT*2
-#define VDOORWAIT		150
-
-void
-EV_VerticalDoor
-( line_t*	line,
-  mobj_t*	thing );
-
-int
-EV_DoDoor
-( line_t*	line,
-  vldoor_e	type );
-
-int
-EV_DoLockedDoor
-( line_t*	line,
-  vldoor_e	type,
-  mobj_t*	thing );
-
-void    T_VerticalDoor (vldoor_t* door);
-void    P_SpawnDoorCloseIn30 (sector_t* sec);
-
-void
-P_SpawnDoorRaiseIn5Mins
-( sector_t*	sec,
-  int		secnum );
-
-
-
-// villsa [STRIFE] resurrected sliding doors
-//
-//      Sliding doors...
-//
-typedef enum
-{
-    sd_opening,
-    sd_waiting,
-    sd_closing
-
-} sd_e;
-
-
-
-typedef enum
-{
-    sdt_openOnly,
-    sdt_closeOnly,
-    sdt_openAndClose
-
-} sdt_e;
-
-
-
-// villsa [STRIFE] Rogue added a second line_t in the struct
-// backsector is removed
-typedef struct
-{
-    thinker_t   thinker;
-    sdt_e       type;
-    line_t*     line1;
-    line_t*     line2;
-    int         frame;
-    int         whichDoorIndex;
-    int         timer;
-    sector_t*   frontsector;
-    sd_e        status;
-
-} slidedoor_t;
-
-// villsa [STRIFE] no front/back frames
-typedef struct
-{
-    char    frame1[9];
-    char    frame2[9];
-    char    frame3[9];
-    char    frame4[9];
-    char    frame5[9];
-    char    frame6[9];
-    char    frame7[9];
-    char    frame8[9];
-    
-} slidename_t;
-
-// villsa [STRIFE] no front/back frames
-typedef struct
-{
-    int frames[8];
-
-} slideframe_t;
-
-// haleyjd 09/29/10: [STRIFE] Externalized for savegames
-void T_SlidingDoor(slidedoor_t* door);
-
-
-// how many frames of animation
-#define SNUMFRAMES      8       // villsa [STRIFE] changed from 4 to 8
-
-#define SDOORWAIT       TICRATE*3
-#define SWAITTICS       4
-
-// how many diff. types of anims
-#define MAXSLIDEDOORS	8       // villsa [STRIFE] changed from 5 to 8                     
-
-void P_InitSlidingDoorFrames(void);
-void EV_SlidingDoor(line_t* line, mobj_t* thing);
-int EV_RemoteSlidingDoor(line_t* line, mobj_t* thing);
-
-
-
-//
-// P_CEILNG
-//
-typedef enum
-{
-    lowerToFloor,
-    raiseToHighest,
-    lowerAndCrush,
-    crushAndRaise,
-    fastCrushAndRaise,
-    silentCrushAndRaise
-
-} ceiling_e;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    ceiling_e	type;
-    sector_t*	sector;
-    fixed_t	bottomheight;
-    fixed_t	topheight;
-    fixed_t	speed;
-    boolean	crush;
-
-    // 1 = up, 0 = waiting, -1 = down
-    int		direction;
-
-    // ID
-    int		tag;                   
-    int		olddirection;
-    
-} ceiling_t;
-
-
-
-
-
-#define CEILSPEED		FRACUNIT
-#define CEILWAIT		150
-#define MAXCEILINGS		30
-
-extern ceiling_t*	activeceilings[MAXCEILINGS];
-
-int
-EV_DoCeiling
-( line_t*	line,
-  ceiling_e	type );
-
-void    T_MoveCeiling (ceiling_t* ceiling);
-void    P_AddActiveCeiling(ceiling_t* c);
-void    P_RemoveActiveCeiling(ceiling_t* c);
-int	EV_CeilingCrushStop(line_t* line);
-void    P_ActivateInStasisCeiling(line_t* line);
-
-
-//
-// P_FLOOR
-//
-typedef enum
-{
-    // lower floor to highest surrounding floor
-    lowerFloor,
-    
-    // lower floor to lowest surrounding floor
-    lowerFloorToLowest,
-    
-    // lower floor to highest surrounding floor VERY FAST
-    turboLower,
-    
-    // raise floor to lowest surrounding CEILING
-    raiseFloor,
-    
-    // raise floor to next highest surrounding floor
-    raiseFloorToNearest,
-
-    // raise floor to shortest height texture around it
-    raiseToTexture,
-    
-    // lower floor to lowest surrounding floor
-    //  and change floorpic
-    lowerAndChange,
-  
-    raiseFloor64,          // [STRIFE] changed from 24 to 64
-    raiseFloor24AndChange,
-    raiseFloorCrush,
-
-     // raise to next highest floor, turbo-speed
-    raiseFloorTurbo,       
-    donutRaise,
-    raiseFloor512,
-
-    // [STRIFE] New floor type - used for the coolant reactor pit
-    raiseFloor512AndChange
-    
-} floor_e;
-
-
-
-
-typedef enum
-{
-    build8,     // slowly build by 8
-    turbo16,    // quickly build by 16
-    buildDown16 // haleyjd 09/24/10: [STRIFE] new stair type
-} stair_e;
-
-
-
-typedef struct
-{
-    thinker_t	thinker;
-    floor_e	type;
-    boolean	crush;
-    sector_t*	sector;
-    int		direction;
-    int		newspecial;
-    short	texture;
-    fixed_t	floordestheight;
-    fixed_t	speed;
-
-} floormove_t;
-
-
-
-#define FLOORSPEED		FRACUNIT
-
-typedef enum
-{
-    ok,
-    crushed,
-    pastdest
-    
-} result_e;
-
-result_e
-T_MovePlane
-( sector_t*	sector,
-  fixed_t	speed,
-  fixed_t	dest,
-  boolean	crush,
-  int		floorOrCeiling,
-  int		direction );
-
-int
-EV_BuildStairs
-( line_t*	line,
-  stair_e	type );
-
-int
-EV_DoFloor
-( line_t*	line,
-  floor_e	floortype );
-
-void T_MoveFloor( floormove_t* floor);
-
-//
-// P_TELEPT
-//
-
-// [STRIFE] Teleportation flags - teleflags
-// Not to be conflated with telefrags, though they be tangentially related ;)
-typedef enum teleflags
-{
-    TF_NOSRCSND = 0x01,
-    TF_NODSTSND = 0x02,
-    TF_NODSTFOG = 0x10,
-    TF_NOSRCFOG = 0x20,
-
-    TF_NORMAL      = 0,
-    TF_DSTSILENCE  = (TF_NODSTSND|TF_NODSTFOG),    // 0x12 (18) (Not used)
-    TF_SRCSILENCE  = (TF_NOSRCSND|TF_NOSRCFOG),    // 0x21 (33)
-    TF_FULLSILENCE = (TF_SRCSILENCE|TF_DSTSILENCE) // 0x33 (51)
-
-} teleflags_e;
-
-int
-EV_Teleport
-( line_t*       line,
-  int           side,
-  mobj_t*       thing,
-  teleflags_e   flags);
-
-#endif
diff --git a/games/NXDoom/src/strife/p_switch.c b/games/NXDoom/src/strife/p_switch.c
deleted file mode 100644
index 849ab2bc0..000000000
--- a/games/NXDoom/src/strife/p_switch.c
+++ /dev/null
@@ -1,1078 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// DESCRIPTION:
-//	Switches, buttons. Two-state animation. Exits.
-//
-
-#include <stdio.h>
-
-#include "i_system.h"
-#include "deh_main.h"
-#include "doomdef.h"
-#include "p_local.h"
-
-#include "g_game.h"
-#include "d_main.h" // villsa [STRIFE]
-#include "z_zone.h" // villsa [STRIFE]
-#include "w_wad.h"  // villsa [STRIFE]
-#include "s_sound.h"
-#include "m_random.h" // haleyjd [STRIFE]
-#include "p_dialog.h"
-#include "p_local.h"  // haleyjd [STRIFE]
-#include "m_bbox.h"   // villsa [STRIFE]
-#include "m_misc.h"
-
-// Data.
-#include "sounds.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-//
-// CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
-//
-// villsa [STRIFE] new switch list
-switchlist_t alphSwitchList[] =
-{
-    { "GLASS01",    "GLASS02",      1,  sfx_bglass  },
-    { "GLASS03",    "GLASS04",      1,  sfx_bglass  },
-    { "GLASS05",    "GLASS06",      1,  sfx_bglass  },
-    { "GLASS07",    "GLASS08",      1,  sfx_bglass  },
-    { "GLASS17",    "GLASS18",      1,  sfx_bglass  },
-    { "GLASS19",    "GLASS20",      1,  sfx_bglass  },
-    { "SWKNOB01",   "SWKNOB02",     1,  sfx_swknob  },
-    { "SWLITE01",   "SWLITE02",     1,  sfx_None    },
-    { "SWCHN01",    "SWCHN02",      1,  sfx_pulchn  },
-    { "COMP01",     "COMP04B",      1,  sfx_bglass  },
-    { "COMP05",     "COMP12B",      1,  sfx_bglass  },
-    { "COMP09",     "COMP12B",      1,  sfx_bglass  },
-    { "COMP12",     "COMP04B",      1,  sfx_bglass  },
-    { "COMP13",     "COMP12B",      1,  sfx_bglass  },
-    { "COMP17",     "COMP20B",      1,  sfx_bglass  },
-    { "COMP21",     "COMP28B",      1,  sfx_bglass  },
-    { "WALTEK09",   "WALTEKB1",     1,  sfx_None    },
-    { "WALTEK10",   "WALTEKB1",     1,  sfx_None    },
-    { "WALTEK15",   "WALTEKB1",     1,  sfx_None    },
-    { "SWFORC01",   "SWFORC02",     1,  sfx_None    },
-    { "SWEXIT01",   "SWEXIT02",     1,  sfx_None    },
-    { "DORSBK01",   "DORSBK02",     1,  sfx_swston  },
-    { "SWSLD01",    "SWSLD02",      1,  sfx_None    },
-    { "DORWS04",    "DORWS05",      1,  sfx_swbolt  },
-    { "SWIRON01",   "SWIRON02",     1,  sfx_None    },
-    { "GLASS09",    "GLASS10",      2,  sfx_bglass  },
-    { "GLASS11",    "GLASS12",      2,  sfx_bglass  },
-    { "GLASS13",    "GLASS14",      2,  sfx_bglass  },
-    { "GLASS15",    "GLASS16",      2,  sfx_bglass  },
-    { "SWFORC03",   "SWFORC04",     2,  sfx_None    },
-    { "SWCIT01",    "SWCIT02",      2,  sfx_None    },
-    { "SWTRMG01",   "SWTRMG04",     2,  sfx_None    },
-    { "SWMETL01",   "SWMETL02",     2,  sfx_None    },
-    { "SWWOOD01",   "SWWOOD02",     2,  sfx_None    },
-    { "SWTKBL01",   "SWTKBL02",     2,  sfx_None    },
-    { "AZWAL21",    "AZWAL22",      2,  sfx_None    },
-    { "SWINDT01",   "SWINDT02",     2,  sfx_None    },
-    { "SWRUST01",   "SWRUST02",     2,  sfx_None    },
-    { "SWCHAP01",   "SWCHAP02",     2,  sfx_None    },
-    { "SWALIN01",   "SWALIN02",     2,  sfx_None    },
-    { "SWWALG01",   "SWWALG02",     2,  sfx_None    },
-    { "SWWALG03",   "SWWALG04",     2,  sfx_None    },
-    { "SWTRAM01",   "SWTRAM02",     2,  sfx_None    },
-    { "SWTRAM03",   "SWTRAM04",     2,  sfx_None    },
-    { "SWORC01",    "SWORC02",      2,  sfx_None    },
-    { "SWBRIK01",   "SWBRIK02",     2,  sfx_None    },
-    { "SWIRON03",   "SWIRON04",     2,  sfx_None    },
-    { "SWIRON05",   "SWIRON06",     2,  sfx_None    },
-    { "SWIRON07",   "SWIRON08",     2,  sfx_None    },
-    { "SWCARD01",   "SWCARD02",     2,  sfx_keycrd  },
-    { "SWSIGN01",   "SWSIGN02",     2,  sfx_None    },
-    { "SWLEV01",    "SWLEV02",      2,  sfx_None    },
-    { "SWLEV03",    "SWLEV04",      2,  sfx_None    },
-    { "SWLEV05",    "SWLEV06",      2,  sfx_None    },
-    { "SWBRN01",    "SWBRN02",      2,  sfx_keycrd  },
-    { "SWPIP01",    "SWPIP02",      2,  sfx_valve   },
-    { "SWPALM01",   "SWPALM02",     2,  sfx_swscan  },
-    { "SWKNOB03",   "SWKNOB04",     2,  sfx_swknob  },
-    { "ALTSW01",    "ALTSW02",      2,  sfx_None    },
-    { "COMP25",     "COMP28B",      2,  sfx_bglass  },
-    { "COMP29",     "COMP20B",      2,  sfx_bglass  },
-    { "COMP33",     "COMP50",       2,  sfx_bglass  },
-    { "COMP42",     "COMP51",       2,  sfx_bglass  },
-    { "GODSCRN1",   "GODSCRN2",     2,  sfx_difool  },
-    { "ALIEN04",    "ALIEN05",      2,  sfx_None    },
-    { "CITADL04",   "CITADL05",     2,  sfx_None    },
-    { "SWITE03",    "SWITE04",      2,  sfx_None    },
-    { "SWTELP01",   "SWTELP02",     2,  sfx_None    },
-    { "BRNSCN01",   "BRNSCN05",     2,  sfx_firxpl  },
-};
-
-int		switchlist[MAXSWITCHES * 2];
-int		numswitches;
-button_t        buttonlist[MAXBUTTONS];
-
-//
-// P_InitSwitchList
-// Only called at game initialization.
-//
-void P_InitSwitchList(void)
-{
-    int i, slindex, episode;
-
-    // Note that this is called "episode" here but it's actually something
-    // quite different. As we progress from Shareware->Registered->Doom II
-    // we support more switch textures.
-    if (isregistered)
-    {
-        episode = 2;
-    }
-    else
-    {
-        episode = 1;
-    }
-
-    slindex = 0;
-
-    for (i = 0; i < arrlen(alphSwitchList); i++)
-    {
-	if (alphSwitchList[i].episode <= episode)
-	{
-	    switchlist[slindex++] =
-                R_TextureNumForName(DEH_String(alphSwitchList[i].name1));
-	    switchlist[slindex++] =
-                R_TextureNumForName(DEH_String(alphSwitchList[i].name2));
-	}
-    }
-
-    numswitches = slindex / 2;
-    switchlist[slindex] = -1;
-}
-
-
-//
-// P_StartButton
-// Start a button counting down till it turns off.
-//
-void P_StartButton(line_t* line, bwhere_e w, int texture, int time)
-{
-    int		i;
-    
-    // See if button is already pressed
-    for(i = 0; i < MAXBUTTONS; i++)
-    {
-	if(buttonlist[i].btimer && buttonlist[i].line == line)
-            return;
-    }
-    
-
-    
-    for(i = 0; i < MAXBUTTONS; i++)
-    {
-	if(!buttonlist[i].btimer)
-	{
-	    buttonlist[i].line = line;
-	    buttonlist[i].where = w;
-	    buttonlist[i].btexture = texture;
-	    buttonlist[i].btimer = time;
-	    buttonlist[i].soundorg = &line->frontsector->soundorg;
-	    return;
-	}
-    }
-    
-    I_Error("P_StartButton: no button slots left!");
-}
-
-
-//
-// P_SpawnBrokenGlass
-// villsa [STRIFE] new function
-//
-static void P_SpawnBrokenGlass(line_t* line)
-{
-    fixed_t x1;
-    fixed_t x2;
-    fixed_t y1;
-    fixed_t y2;
-    int i;
-    mobj_t* glass;
-    angle_t an;
-
-    x1 = (line->v2->x + line->v1->x) / 2;
-    y1 = (line->v2->y + line->v1->y) / 2;
-    x2 = ((line->frontsector->soundorg.x - x1) / 5) + x1;
-    y2 = ((line->frontsector->soundorg.y - y1) / 5) + y1;
-
-    for(i = 0; i < 7; i++)
-    {
-        glass = P_SpawnMobj(x2, y2, ONFLOORZ, MT_JUNK);
-        glass->z += (24*FRACUNIT);
-        glass->flags |= (MF_SHADOW|MF_MVIS);
-
-        P_SetMobjState(glass, P_Random() % 3 + S_SHRD_03); // 284
-
-        an = ((P_Random() << 13) / 255);
-
-        glass->angle = (an << ANGLETOFINESHIFT);
-        glass->momx = FixedMul(finecosine[an], (P_Random() & 3) << FRACBITS);
-        glass->momy = FixedMul(finesine[an],   (P_Random() & 3) << FRACBITS);
-        glass->momz = (P_Random() & 7) << FRACBITS;
-        glass->tics += (P_Random() + 7) & 7;
-    }
-}
-
-
-//
-// Function that changes wall texture.
-// Tell it if switch is ok to use again (1=yes, it's a button).
-//
-void P_ChangeSwitchTexture(line_t* line, int useAgain)
-{
-    int     texTop;
-    int     texMid;
-    int     texBot;
-    int     i;
-    int     sound;
-    boolean breakglass; // villsa [STRIFE]
-    switchlist_t* sl;   // villsa [STRIFE]
-
-    breakglass = false; // villsa [STRIFE]
-
-    texTop = sides[line->sidenum[0]].toptexture;
-    texMid = sides[line->sidenum[0]].midtexture;
-    texBot = sides[line->sidenum[0]].bottomtexture;
-
-    sound = sfx_swtchn;
-
-    // villsa [STRIFE] check for linetype 182 (break glass)
-    if(line->special == 182)
-    {
-        line->flags &= ~ML_BLOCKING;
-        breakglass = true;
-
-        if(useAgain)
-        {
-            // haleyjd 09/21/10: Corrected (>> 16 == next field)
-            texTop = 0;
-            texBot = 0;
-        }
-
-        if(texMid) // haleyjd 09/21/10: Corrected (>> 16 == next field)
-            useAgain = 0;
-
-        sound = sfx_bglass;
-    }
-
-    if(!useAgain)
-        line->special = 0;
-
-    for(i = 0; i < numswitches*2; i++)
-    {
-        sl = &alphSwitchList[i / 2]; // villsa [STRIFE]
-
-        if(switchlist[i] == texTop)
-        {
-            // villsa [STRIFE] set sound
-            if(sl->sound)
-                sound = sl->sound;
-
-            // haleyjd 20141026: [STRIFE]: Rogue fixed wrong sound origin
-            S_StartSound(&line->frontsector->soundorg, sound);
-            sides[line->sidenum[0]].toptexture = switchlist[i^1];
-
-            if(useAgain)
-                P_StartButton(line,top,switchlist[i],BUTTONTIME);
-
-            if(breakglass)
-                P_SpawnBrokenGlass(line);
-
-            return;
-        }
-        else
-        {
-            if(switchlist[i] == texMid)
-            {
-                // villsa [STRIFE] set sound
-                if(sl->sound)
-                    sound = sl->sound;
-
-                // haleyjd 20141026: [STRIFE]: Rogue fixed wrong sound origin
-                S_StartSound(&line->frontsector->soundorg, sound);
-                sides[line->sidenum[0]].midtexture = switchlist[i^1];
-
-                // villsa [STRIFE] affect second side of line
-                // BUG: will crash if 1S line is marked with TWOSIDED flag!
-                if(line->flags & ML_TWOSIDED)
-                    sides[line->sidenum[1]].midtexture = switchlist[i^1];
-
-                if(useAgain)
-                    P_StartButton(line, middle,switchlist[i],BUTTONTIME);
-
-                // villsa [STRIFE]: Mines Transmitter hack
-                if(sound == sfx_firxpl)
-                {
-                    breakglass = true;
-
-                    // give quest flag 29 to player
-                    players[0].questflags |= QF_QUEST29;
-
-                    // give stamina/accuracy items
-                    if(!netgame)
-                    {
-                        P_GiveItemToPlayer(players, SPR_TOKN, MT_TOKEN_STAMINA);
-                        P_GiveItemToPlayer(players, SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
-                    }
-
-                }
-
-                // villsa [STRIFE]
-                if(breakglass || sound == sfx_bglass)
-                    P_SpawnBrokenGlass(line);
-
-                return;
-            }
-            else
-            {
-                if(switchlist[i] == texBot)
-                {
-                    // villsa [STRIFE] set sound
-                    if(sl->sound)
-                        sound = sl->sound;
-
-                    // haleyjd 20141026: [STRIFE]: Rogue fixed wrong sound origin
-                    S_StartSound(&line->frontsector->soundorg, sound);
-                    sides[line->sidenum[0]].bottomtexture = switchlist[i^1];
-
-                    if(useAgain)
-                        P_StartButton(line, bottom,switchlist[i],BUTTONTIME);
-
-                    if(breakglass)
-                        P_SpawnBrokenGlass(line);
-
-                    return;
-                }
-            }
-        }
-    }
-}
-
-//
-// P_MoveWall
-//
-// villsa [STRIFE] New function.
-// Dynamically move a solid line. Unused in Strife
-//
-static void P_MoveWall(line_t *line, mobj_t *thing)
-{
-    vertex_t *v2;
-    vertex_t *v1;
-    fixed_t x;
-    fixed_t y;
-
-    v1 = line->v1;
-    v2 = line->v2;
-    S_StartSound(thing, sfx_stnmov);
-
-    if (line->dx)
-    {
-        if (thing->x >= v1->x)
-        {
-            v1->y -= (8 * FRACUNIT);
-            v2->y -= (8 * FRACUNIT);
-        }
-        else
-        {
-            v1->y += (8 * FRACUNIT);
-            v2->y += (8 * FRACUNIT);
-        }
-    }
-    else
-    {
-        if (thing->y >= v1->y)
-        {
-            v1->x -= (8 * FRACUNIT);
-            v2->x -= (8 * FRACUNIT);
-        }
-        else
-        {
-            v1->x += (8 * FRACUNIT);
-            v2->x += (8 * FRACUNIT);
-        }
-    }
-
-    if (v1->x >= v2->x)
-    {
-        line->bbox[BOXLEFT] = v2->x;
-        x = v1->x;
-    }
-    else
-    {
-        line->bbox[BOXLEFT] = v1->x;
-        x = v2->x;
-    }
-
-    line->bbox[BOXRIGHT] = x;
-
-    if (v1->y >= v2->y)
-    {
-        line->bbox[BOXBOTTOM] = v2->y;
-        y = v1->y;
-    }
-    else
-    {
-        line->bbox[BOXBOTTOM] = v1->y;
-        y = v2->y;
-    }
-
-    line->bbox[BOXTOP] = y;
-}
-
-// villsa [STRIFE]
-static char usemessage[92];
-
-//
-// P_UseSpecialLine
-// Called when a thing uses a special line.
-// Only the front sides of lines are usable.
-//
-boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side)
-{
-    // Err...
-    // Use the back sides of VERY SPECIAL lines...
-    if (side)
-    {
-        switch(line->special)
-        {
-        case 148: // haleyjd [STRIFE]
-            break;
-
-        default:
-            return false;
-        }
-    }
-    
-    // Switches that other things can activate.
-    if (!thing->player)
-    {
-        // never open secret doors
-        if (line->flags & ML_SECRET)
-            return false;
-
-        switch(line->special)
-        {
-        case 1:         // MANUAL DOOR RAISE
-        case 31:        // haleyjd [STRIFE]
-        case 144:       // haleyjd [STRIFE] Manual sliding door
-            break;
-
-        default:
-            return false;
-            break;
-        }
-    }
-   
-    // do something  
-    switch(line->special)
-    {
-        // MANUALS
-    case 1:             // Vertical Door
-    case 26:            // DR ID Card
-    case 27:            // DR Pass Card
-    case 28:            // DR ID Badge
-    case 31:            // Manual door open
-    case 32:            // D1 ID Card
-    case 33:            // D1 ID Badge
-    case 34:            // D1 Pass Card
-    case 117:           // Blazing door raise
-    case 118:           // Blazing door open
-    case 156:           // haleyjd [STRIFE] D1 Brass Key
-    case 157:           // haleyjd [STRIFE] D1 Silver Key
-    case 158:           // haleyjd [STRIFE] D1 Gold Key
-    case 159:           // haleyjd [STRIFE] DR Gold Key
-    case 160:           // haleyjd [STRIFE] DR Silver Key
-    case 161:           // haleyjd [STRIFE] DR Brass Key
-    case 165:           // villsa  [STRIFE] That doesn't seem to work
-    case 166:           // haleyjd [STRIFE] DR Hand Print
-    case 169:           // haleyjd [STRIFE] DR Base Key
-    case 170:           // haleyjd [STRIFE] DR Gov's Key
-    case 190:           // haleyjd [STRIFE] DR Order Key
-    case 205:           // villsa  [STRIFE] Available in retail only
-    case 213:           // haleyjd [STRIFE] DR Chalice
-    case 217:           // haleyjd [STRIFE] DR Core Key
-    case 221:           // haleyjd [STRIFE] DR Mauler Key
-    case 224:           // haleyjd [STRIFE] DR Chapel Key
-    case 225:           // haleyjd [STRIFE] DR Catacomb Key
-    case 232:           // villsa  [STRIFE] DR Oracle Pass
-        EV_VerticalDoor (line, thing);
-        break;
-
-    // haleyjd: For the sake of our sanity, I have reordered all the line
-    // specials from this point down so that they are strictly in numeric
-    // order, and not divided up in a semi-arbitrary fashion.
-
-    case 7:
-        // Build Stairs - [STRIFE] Verified unmodified
-        if (EV_BuildStairs(line,build8))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 9:
-        // Change Donut - [STRIFE] Verified unmodified
-        if (EV_DoDonut(line))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 11:
-        // Exit level - [STRIFE] Modified to take tag, etc.
-        P_ChangeSwitchTexture(line, 1);
-        if(levelTimer && levelTimeCount)
-            break;
-        G_ExitLevel(line->tag);
-        break;
-
-    case 14:
-        // Raise Floor 32 and change texture - [STRIFE] Verified unmodified
-        if (EV_DoPlat(line, raiseAndChange,32))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 15:
-        // Raise Floor 24 and change texture
-        if (EV_DoPlat(line, raiseAndChange,24))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 18:
-        // Raise Floor to next highest floor - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line, raiseFloorToNearest))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 20:
-        // Raise Plat next highest floor and change texture - [STRIFE] Verified unmodified
-        if(EV_DoPlat(line, raiseToNearestAndChange, 0))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 21:
-        // PlatDownWaitUpStay - [STRIFE] Verified unmodified
-        if (EV_DoPlat(line, downWaitUpStay,0))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 23:
-        // Lower Floor to Lowest - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,lowerFloorToLowest))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 29:
-        // Raise Door - [STRIFE] Verified unmodified
-        if (EV_DoDoor(line,vld_normal))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 40:
-        // villsa [STRIFE] Split Open Door
-        if(EV_DoDoor(line, vld_splitOpen))
-            P_ChangeSwitchTexture(line, 0);
-        break; // haleyjd
-
-    case 41:
-        // Lower Ceiling to Floor - [STRIFE] Verified unmodified
-        if (EV_DoCeiling(line,lowerToFloor))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 42:
-        // Close Door - [STRIFE] Verified unmodified
-        if (EV_DoDoor(line,vld_close))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 43:
-        // Lower Ceiling to Floor - [STRIFE] Verified unmodified
-        if (EV_DoCeiling(line,lowerToFloor))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 45:
-        // Lower Floor to Surrounding floor height - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,lowerFloor))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 49:
-        // Ceiling Crush And Raise - [STRIFE] Verified unmodified
-        if (EV_DoCeiling(line,crushAndRaise))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 50:
-        // Close Door - [STRIFE] Verified unmodified
-        if (EV_DoDoor(line,vld_close))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 51:
-        // [STRIFE] Modifed into S1 Start Finale (was Secret Exit)
-        P_ChangeSwitchTexture(line,0);
-        G_StartFinale();
-        break;
-
-    case 55:
-        // Raise Floor Crush - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloorCrush))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 60:
-        // Lower Floor to Lowest - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,lowerFloorToLowest))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 61:
-        // Open Door - [STRIFE] Verified unmodified
-        if (EV_DoDoor(line,vld_open))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 62:
-        // PlatDownWaitUpStay - [STRIFE] Verified unmodified
-        if (EV_DoPlat(line, downWaitUpStay,1))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 63:
-        // Raise Door - [STRIFE] Verified unmodified
-        if (EV_DoDoor(line,vld_normal))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 64:
-        // Raise Floor to ceiling - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloor))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 65:
-        // Raise Floor Crush - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloorCrush))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 66:
-        // Raise Floor 24 and change texture - [STRIFE] Verified unmodified
-        if (EV_DoPlat(line, raiseAndChange, 24))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 67:
-        // Raise Floor 32 and change texture - [STRIFE] Verified unmodified
-        if (EV_DoPlat(line, raiseAndChange, 32))
-            P_ChangeSwitchTexture(line,1);
-        break;
-   
-    case 68:
-        // Raise Plat to next highest floor and change texture - [STRIFE] Verified unmodified
-        if (EV_DoPlat(line, raiseToNearestAndChange, 0))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 69:
-        // Raise Floor to next highest floor - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line, raiseFloorToNearest))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 70:
-        // Turbo Lower Floor - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,turboLower))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 71:
-        // Turbo Lower Floor - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,turboLower))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 101:
-        // Raise Floor - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloor))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 102:
-        // Lower Floor to Surrounding floor height - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,lowerFloor))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 103:
-        // Open Door - [STRIFE] Verified unmodified
-        if (EV_DoDoor(line,vld_open))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 111:
-        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified
-        if (EV_DoDoor (line,vld_blazeRaise))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 112:
-        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified
-        if (EV_DoDoor (line,vld_blazeOpen))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 113:
-        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified
-        if (EV_DoDoor (line,vld_blazeClose))
-            P_ChangeSwitchTexture(line,0);
-        break;
-    
-    case 114:
-        // Blazing Door Raise (faster than TURBO!) - [STRIFE] Verified unmodified
-        if (EV_DoDoor (line,vld_blazeRaise))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 115:
-        // Blazing Door Open (faster than TURBO!) - [STRIFE] Verified unmodified
-        if (EV_DoDoor (line,vld_blazeOpen))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 116:
-        // Blazing Door Close (faster than TURBO!) - [STRIFE] Verified unmodified
-        if (EV_DoDoor (line,vld_blazeClose))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 122:
-        // Blazing PlatDownWaitUpStay - [STRIFE] Verified unmodified
-        if(EV_DoPlat(line, blazeDWUS, 0))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 123:
-        // Blazing PlatDownWaitUpStay - [STRIFE] Verified unmodified
-        if(EV_DoPlat(line, blazeDWUS, 0))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 127:
-        // Build Stairs Turbo 16 - [STRIFE] Verified unmodified
-        if (EV_BuildStairs(line,turbo16))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 131:
-        // Raise Floor Turbo - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloorTurbo))
-            P_ChangeSwitchTexture(line,0);
-        break;
-    
-    case 132:
-        // Raise Floor Turbo - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloorTurbo))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 133: // [STRIFE] TODO - which key is it?
-    case 135: // [STRIFE] TODO - which key is it?
-    case 137: // [STRIFE] TODO - which key is it?
-        if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 99:  // [STRIFE] TODO: which key is it?
-    case 134: // [STRIFE] TODO: which key is it?
-    case 136: // [STRIFE] TODO: which key is it?
-        if (EV_DoLockedDoor (line,vld_blazeOpen,thing))
-            P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 138:
-        // Light Turn On - [STRIFE] Verified unmodified
-        EV_LightTurnOn(line,255);
-        P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 139:
-        // Light Turn Off - [STRIFE] Verified unmodified
-        EV_LightTurnOn(line,35);
-        P_ChangeSwitchTexture(line,1);
-        break;
-
-    case 140:
-        // Raise Floor 512 - [STRIFE] Verified unmodified
-        if (EV_DoFloor(line,raiseFloor512))
-            P_ChangeSwitchTexture(line,0);
-        break;
-
-    case 144:
-        // villsa [STRIFE] manual sliding door
-        EV_SlidingDoor(line, thing);
-        break;
-
-    case 146:
-        // haleyjd 09/24/10: [STRIFE] S1 Build Stairs Down 16 (new type)
-        if(EV_BuildStairs(line, buildDown16))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 147:
-        // haleyjd 09/24/10: [STRIFE] S1 Clear Force Fields
-        if(EV_ClearForceFields(line))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 148:
-        // haleyjd 09/16/10: [STRIFE] using forcefields hurts
-        P_DamageMobj(thing, NULL, NULL, 16);
-        P_Thrust(thing->player, thing->angle + ANG180, 125*FRACUNIT/16);
-        break;
-
-    case 151: // villsa [STRIFE] BlzOpenDoor Gold key
-    case 152: // [STRIFE] TODO: which key is it?
-    case 153: // [STRIFE] TODO: which key is it?
-        if(EV_DoLockedDoor(line, vld_blazeOpen, thing))
-            P_ChangeSwitchTexture(line, 1);
-        break;
-
-    case 154:
-        // villsa [STRIFE] plat lower wait rise if have gold key
-        if(thing->player->cards[key_GoldKey])
-        {
-            if(EV_DoPlat(line, downWaitUpStay, 0))
-                P_ChangeSwitchTexture(line, 1);
-        }
-        else
-        {
-            thing->player->message = DEH_String("You need a gold key");
-            S_StartSound(thing, sfx_oof);
-        }
-        break;
-
-    case 155:
-        // villsa [STRIFE] raise plat wait lower
-        if(EV_DoPlat(line, upWaitDownStay, 0))
-            P_ChangeSwitchTexture(line, 1);
-        break;
-
-    case 162: // [STRIFE] TODO: which key is it?
-    case 163: // [STRIFE] TODO: which key is it?
-    case 164: // villsa [STRIFE] BlzOpenDoor Gold key
-    case 167: // [STRIFE] TODO: which key is it?
-        if(EV_DoLockedDoor(line, vld_blazeOpen, thing))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 168: // [STRIFE] TODO: which key is it?
-        // haleyjd 09/25/10: [STRIFE] SR Blaze Open Door ???? Key
-        if(EV_DoLockedDoor(line, vld_blazeOpen, thing))
-            P_ChangeSwitchTexture(line, 1);
-        break;
-
-    case 171: // [STRIFE] TODO: which key is it?
-        // haleyjd 09/25/10: [STRIFE] S1 Open Door ???? Key
-        if(EV_DoLockedDoor(line, vld_open, thing))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 172: // [STRIFE] TODO: which key is it?
-    case 173: // [STRIFE] TODO: which key is it?
-    case 176: // [STRIFE] TODO: which key is it?
-    case 191: // [STRIFE] TODO: which key is it?
-    case 192: // [STRIFE] TODO: which key is it?
-    case 223: // [STRIFE] TODO: which key is it?
-        if(EV_DoLockedDoor(line, vld_normal, thing))
-            P_ChangeSwitchTexture(line, 1);
-        break;
-
-    case 177:
-        // villsa [STRIFE] plat lower wait rise if have power3 key
-        if(thing->player->cards[key_Power3Key])
-        {
-            if(EV_DoPlat(line, downWaitUpStay, 0))
-                P_ChangeSwitchTexture(line, 1);
-        }
-        else
-        {
-            thing->player->message = DEH_String("You don't have the key");
-            S_StartSound(thing, sfx_oof);
-        }
-        break;
-
-    case 181:
-        // haleyjd 09/25/10: [STRIFE] S1 Floor Raise 512 & Change
-        if(EV_DoFloor(line, raiseFloor512AndChange))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 189: // [STRIFE] TODO: which key is it???
-        // haleyjd 09/25/10: [STRIFE] S1 Split Open Door ???? Key
-        if(EV_DoLockedDoor(line, vld_splitOpen, thing))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 194:
-        // villsa [STRIFE] S1 Free Prisoners
-        if(EV_DoDoor(line, vld_open))
-        {
-            P_ChangeSwitchTexture(line, 0);
-            P_FreePrisoners();
-        }
-        break;
-
-    case 199:
-        // haleyjd 09/25/10: [STRIFE] S1 Destroy Converter
-        if(EV_DoCeiling(line, lowerAndCrush))
-        {
-            P_ChangeSwitchTexture(line, 0);
-            P_DestroyConverter();
-        }
-        break;
-
-    case 207:
-        // villsa [STRIFE] SR Remote Sliding Door
-        if(EV_RemoteSlidingDoor(line, thing))
-            P_ChangeSwitchTexture(line, 1);
-        break; // haleyjd
-
-    case 209:
-        // haleyjd 09/24/10: [STRIFE] S1 Build Stairs Down 16 if Have Chalice
-        if(!P_PlayerHasItem(thing->player, MT_INV_CHALICE))
-        {
-            DEH_snprintf(usemessage, sizeof(usemessage), "You need the chalice!");
-            thing->player->message = usemessage;
-            S_StartSound(thing, sfx_oof);
-            break;
-        }
-        else if(EV_BuildStairs(line, buildDown16))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 211:
-        // villsa [STRIFE] S1 Play VOC## sound
-        if(&players[consoleplayer] == thing->player &&
-            thing->player->powers[pw_communicator])
-        {
-            DEH_snprintf(usemessage, sizeof(usemessage), "voc%i", line->tag);
-            I_StartVoice(usemessage);
-            line->special = 0;
-        }
-        break;
-
-    case 214:
-        // villsa [STRIFE] S1 slow lift lower wait up stay
-        if(EV_DoPlat(line, slowDWUS, 1))
-            P_ChangeSwitchTexture(line, 1);
-        break;
-
-    case 219:
-        // haleyjd 09/25/10: S1 Lower Floor Blue Crystal
-        if(!thing->player->cards[key_BlueCrystalKey])
-        {
-            thing->player->message = DEH_String("You need the Blue Crystal");
-            S_StartSound(thing, sfx_oof);
-        }
-        else if(EV_DoFloor(line, lowerFloor))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 220:
-        // haleyjd 09/25/10: S1 Lower Floor Red Crystal
-        if(!thing->player->cards[key_RedCrystalKey])
-        {
-            thing->player->message = DEH_String("You need the Red Crystal");
-            S_StartSound(thing, sfx_oof);
-        }
-        else if(EV_DoFloor(line, lowerFloor))
-            P_ChangeSwitchTexture(line, 0);
-        break;
-
-    case 226:
-        // villsa [STRIFE] S1 Complete Training Area
-        if(EV_DoFloor(line, lowerFloor))
-        {
-            P_GiveItemToPlayer(thing->player, SPR_TOKN, MT_TOKEN_STAMINA);
-            P_GiveItemToPlayer(thing->player, SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
-            P_ChangeSwitchTexture(line, 0);
-            DEH_snprintf(usemessage, sizeof(usemessage),
-                "Congratulations! You have completed the training area.");
-            thing->player->message = usemessage;
-        }
-        break;
-
-    case 229:
-        // villsa [STRIFE] SR Sigil Sliding Door
-        if(thing->player->sigiltype == 4)
-        {
-            if(EV_RemoteSlidingDoor(line, thing))
-                P_ChangeSwitchTexture(line, 1);
-        }
-        break; // haleyjd
-
-    case 233:
-        // villsa [STRIFE] objective given after revealing the computer
-        if(!EV_DoDoor(line, vld_splitOpen))
-            return true;
-
-        P_ChangeSwitchTexture(line, 1);
-        GiveVoiceObjective("voc70", "log70", 0);
-        
-        // haleyjd: Strife used sprintf here, not a direct set.
-        DEH_snprintf(usemessage, sizeof(usemessage), 
-                     "Incoming Message from BlackBird...");
-        thing->player->message = usemessage;
-
-        break;
-
-    case 234:
-        // haleyjd 09/24/10: [STRIFE] SR Raise Door if Quest 3
-        if(!(thing->player->questflags & QF_QUEST3)) // QUEST3 == Irale
-        {
-            // BUG: doesn't make sfx_oof sound like all other message-
-            // giving door types. I highly doubt this was intentional.
-            DEH_snprintf(usemessage, sizeof(usemessage), 
-                         "That doesn't seem to work!");
-            thing->player->message = usemessage;
-        }
-        else if(EV_DoDoor(line, vld_normal))
-            P_ChangeSwitchTexture(line, 1);
-        break;
-
-    case 235:
-        // haleyjd 09/25/10: [STRIFE] S1 Split Open Door if Have Sigil 4
-        if(thing->player->sigiltype == 4)
-        {
-            if(EV_DoDoor(line, vld_splitOpen))
-                P_ChangeSwitchTexture(line, 0);
-        }
-        break;
-
-    case 666:
-        // villsa [STRIFE] SR Move Wall
-        P_MoveWall(line, thing);
-        break;
-    }
-
-    return true;
-}
-
diff --git a/games/NXDoom/src/strife/p_telept.c b/games/NXDoom/src/strife/p_telept.c
deleted file mode 100644
index aff3b0c3b..000000000
--- a/games/NXDoom/src/strife/p_telept.c
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Teleportation.
-//
-
-
-
-
-#include "doomdef.h"
-#include "doomstat.h"
-
-#include "s_sound.h"
-
-#include "p_local.h"
-
-
-// Data.
-#include "sounds.h"
-
-// State.
-#include "r_state.h"
-
-
-
-//
-// TELEPORTATION
-//
-// haleyjd 09/22/10: [STRIFE] Modified to take a flags parameter to control
-// silent teleportation. Rogue also removed the check for missiles, and the 
-// z-set was replaced with one in P_TeleportMove.
-//
-int
-EV_Teleport
-( line_t*       line,
-  int           side,
-  mobj_t*       thing,
-  teleflags_e   flags)
-{
-    int         i;
-    int         tag;
-    mobj_t*     m;
-    mobj_t*     fog = NULL;
-    unsigned    an;
-    thinker_t*  thinker;
-    sector_t*   sector;
-    fixed_t     oldx;
-    fixed_t     oldy;
-    fixed_t     oldz;
-
-    // haleyjd 20110205 [STRIFE]: this is not checked here
-    // don't teleport missiles
-    //if (thing->flags & MF_MISSILE)
-    //    return 0;
-
-    // Don't teleport if hit back of line,
-    //  so you can get out of teleporter.
-    if (side == 1)
-        return 0;
-
-    tag = line->tag;
-    for (i = 0; i < numsectors; i++)
-    {
-        if (sectors[ i ].tag == tag )
-        {
-            for (thinker = thinkercap.next;
-                thinker != &thinkercap;
-                thinker = thinker->next)
-            {
-                // not a mobj
-                if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
-                    continue;
-
-                m = (mobj_t *)thinker;
-
-                // not a teleportman
-                if (m->type != MT_TELEPORTMAN )
-                    continue;
-
-                sector = m->subsector->sector;
-                // wrong sector
-                if (sector-sectors != i )
-                    continue;
-
-                oldx = thing->x;
-                oldy = thing->y;
-                oldz = thing->z;
-
-                if (!P_TeleportMove (thing, m->x, m->y))
-                    return 0;
-
-                // fraggle: this was changed in final doom, 
-                // problem between normal doom2 1.9 and final doom
-                //
-                // Note that although chex.exe is based on Final Doom,
-                // it does not have this quirk.
-                //
-                // haleyjd 20110205 [STRIFE] This code is *not* present,
-                // because of a z-set which Rogue added to P_TeleportMove.
-                /*
-                if (gameversion < exe_final || gameversion == exe_chex)
-                    thing->z = thing->floorz;
-                */
-
-                if (thing->player)
-                    thing->player->viewz = thing->z+thing->player->viewheight;
-
-                // spawn teleport fog at source and destination
-                // haleyjd 09/22/10: [STRIFE] controlled by teleport flags
-                // BUG: Behavior would be undefined if this function were passed
-                // any combination of teleflags that has the NO*FOG but not the
-                // corresponding NO*SND flag - fortunately this is never done
-                // anywhere in the code.
-                if(!(flags & TF_NOSRCFOG))
-                    fog = P_SpawnMobj (oldx, oldy, oldz, MT_TFOG);
-                if(!(flags & TF_NOSRCSND))
-                    S_StartSound (fog, sfx_telept);
-                
-                an = m->angle >> ANGLETOFINESHIFT;
-                
-                if(!(flags & TF_NODSTFOG))
-                    fog = P_SpawnMobj (m->x+20*finecosine[an], m->y+20*finesine[an], 
-                                       thing->z, MT_TFOG);
-                if(!(flags & TF_NODSTSND))
-                    S_StartSound (fog, sfx_telept);
-
-                // don't move for a bit
-                if (thing->player)
-                    thing->reactiontime = 18;
-
-                thing->angle = m->angle;
-                thing->momx = thing->momy = thing->momz = 0;
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
diff --git a/games/NXDoom/src/strife/p_tick.c b/games/NXDoom/src/strife/p_tick.c
deleted file mode 100644
index 3c6caa06c..000000000
--- a/games/NXDoom/src/strife/p_tick.c
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Archiving: SaveGame I/O.
-//	Thinker, Ticker.
-//
-
-
-#include "z_zone.h"
-#include "p_local.h"
-
-#include "doomstat.h"
-
-
-int leveltime;
-
-//
-// THINKERS
-// All thinkers should be allocated by Z_Malloc
-// so they can be operated on uniformly.
-// The actual structures will vary in size,
-// but the first element must be thinker_t.
-//
-
-
-
-// Both the head and tail of the thinker list.
-thinker_t   thinkercap;
-
-
-//
-// P_InitThinkers
-//
-// [STRIFE] Verified unmodified
-//
-void P_InitThinkers (void)
-{
-    thinkercap.prev = thinkercap.next  = &thinkercap;
-}
-
-
-
-
-//
-// P_AddThinker
-// Adds a new thinker at the end of the list.
-//
-// [STRIFE] Verified unmodified
-//
-void P_AddThinker (thinker_t* thinker)
-{
-    thinkercap.prev->next = thinker;
-    thinker->next = &thinkercap;
-    thinker->prev = thinkercap.prev;
-    thinkercap.prev = thinker;
-}
-
-
-
-//
-// P_RemoveThinker
-// Deallocation is lazy -- it will not actually be freed
-// until its thinking turn comes up.
-//
-// [STRIFE] Verified unmodified
-//
-void P_RemoveThinker (thinker_t* thinker)
-{
-  // FIXME: NOP.
-  thinker->function.acv = (actionf_v)(-1);
-}
-
-
-
-//
-// P_AllocateThinker
-// Allocates memory and adds a new thinker at the end of the list.
-//
-void P_AllocateThinker (thinker_t*	thinker)
-{
-}
-
-//
-// P_RunThinkers
-//
-// [STRIFE] Verified unmodified
-//
-void P_RunThinkers (void)
-{
-    thinker_t *currentthinker, *nextthinker;
-
-    currentthinker = thinkercap.next;
-    while (currentthinker != &thinkercap)
-    {
-        if ( currentthinker->function.acv == (actionf_v)(-1) )
-        {
-            // time to remove it
-            nextthinker = currentthinker->next;
-            currentthinker->next->prev = currentthinker->prev;
-            currentthinker->prev->next = currentthinker->next;
-            Z_Free (currentthinker);
-        }
-        else
-        {
-            if (currentthinker->function.acp1)
-                currentthinker->function.acp1 (currentthinker);
-            nextthinker = currentthinker->next;
-        }
-
-        currentthinker = nextthinker;
-    }
-}
-
-//
-// P_Ticker
-//
-// [STRIFE] Menu pause behavior modified
-//
-void P_Ticker (void)
-{
-    int     i;
-    
-    // run the tic
-    if (paused)
-        return;
-
-    // pause if in menu and at least one tic has been run
-    // haleyjd 09/08/10 [STRIFE]: menuactive -> menupause
-    if (!netgame 
-        && menupause 
-        && !demoplayback 
-        && players[consoleplayer].viewz != 1)
-    {
-        return;
-    }
-    
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-        if (playeringame[i])
-            P_PlayerThink (&players[i]);
-
-    P_RunThinkers ();
-    P_UpdateSpecials ();
-    P_RespawnSpecials ();
-
-    // for par times
-    leveltime++;
-}
diff --git a/games/NXDoom/src/strife/p_tick.h b/games/NXDoom/src/strife/p_tick.h
deleted file mode 100644
index ddfcd74fc..000000000
--- a/games/NXDoom/src/strife/p_tick.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	?
-//
-
-
-#ifndef __P_TICK__
-#define __P_TICK__
-
-
-
-
-// Called by C_Ticker,
-// can call G_PlayerExited.
-// Carries out all thinking of monsters and players.
-void P_Ticker (void);
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/p_user.c b/games/NXDoom/src/strife/p_user.c
deleted file mode 100644
index 567608d11..000000000
--- a/games/NXDoom/src/strife/p_user.c
+++ /dev/null
@@ -1,920 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Player related stuff.
-//	Bobbing POV/weapon, movement.
-//	Pending weapon.
-//
-
-#include <stdlib.h>
-
-#include "doomdef.h"
-#include "d_event.h"
-#include "p_local.h"
-#include "sounds.h"     // villsa [STRIFE]
-#include "p_dialog.h"   // villsa [STRIFE]
-#include "d_main.h"     // villsa [STRIFE]
-#include "doomstat.h"
-#include "deh_str.h"    // haleyjd [STRIFE]
-#include "z_zone.h"
-#include "w_wad.h"
-#include "p_pspr.h"
-#include "m_misc.h"
-#include "m_random.h"
-#include "s_sound.h"
-#include "p_inter.h"
-
-
-
-// Index of the special effects (INVUL inverse) map.
-#define LOOKPITCHAMOUNT         6                       // villsa [STRIFE]
-#define CENTERVIEWAMOUNT        (LOOKPITCHAMOUNT + 2)   // villsa [STRIFE]
-#define LOOKUPMAX               90                      // villsa [STRIFE]
-#define LOOKDOWNMAX             -110                    // villsa [STRIFE]
-
-
-void P_DropInventoryItem(player_t* player, int sprite); // villsa [STRIFE]
-boolean P_ItemBehavior(player_t* player, int item);     // villsa [STRIFE]
-static char useinventorymsg[44];    // villsa [STRIFE]
-
-//
-// Movement.
-//
-
-// 16 pixels of bob
-#define MAXBOB	0x100000	
-
-boolean		onground;
-
-
-//
-// P_Thrust
-// Moves the given origin along a given angle.
-//
-// [STRIFE] Verified unmodified
-//
-void
-P_Thrust
-( player_t*	player,
-  angle_t	angle,
-  fixed_t	move ) 
-{
-    angle >>= ANGLETOFINESHIFT;
-    
-    player->mo->momx += FixedMul(move,finecosine[angle]); 
-    player->mo->momy += FixedMul(move,finesine[angle]);
-}
-
-
-
-
-//
-// P_CalcHeight
-// Calculate the walking / running height adjustment
-//
-// [STRIFE] Some odd adjustments, and terrain view height adjustment
-//
-void P_CalcHeight (player_t* player) 
-{
-    int     angle;
-    fixed_t bob;
-    
-    // Regular movement bobbing
-    // (needs to be calculated for gun swing
-    // even if not on ground)
-    // OPTIMIZE: tablify angle
-    // Note: a LUT allows for effects
-    //  like a ramp with low health.
-    player->bob =
-        FixedMul (player->mo->momx, player->mo->momx)
-        + FixedMul (player->mo->momy,player->mo->momy);
-
-    player->bob >>= 2;
-
-    if (player->bob>MAXBOB)
-        player->bob = MAXBOB;
-
-    // haleyjd 20110205 [STRIFE]: No CF_NOMOMENTUM check, and Rogue also removed
-    // the dead code inside.
-    if (!onground)
-    {
-        /*
-        player->viewz = player->mo->z + VIEWHEIGHT;
-
-        if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
-            player->viewz = player->mo->ceilingz-4*FRACUNIT;
-        */
-
-        player->viewz = player->mo->z + player->viewheight;
-        return;
-    }
-
-    angle = (FINEANGLES/20*leveltime)&FINEMASK;
-    bob = FixedMul ( player->bob/2, finesine[angle]);
-
-    // move viewheight
-    if (player->playerstate == PST_LIVE)
-    {
-        player->viewheight += player->deltaviewheight;
-
-        if (player->viewheight > VIEWHEIGHT)
-        {
-            player->viewheight = VIEWHEIGHT;
-            player->deltaviewheight = 0;
-        }
-
-        if (player->viewheight < VIEWHEIGHT/2)
-        {
-            player->viewheight = VIEWHEIGHT/2;
-            if (player->deltaviewheight <= 0)
-                player->deltaviewheight = 1;
-        }
-
-        if (player->deltaviewheight)
-        {
-            player->deltaviewheight += FRACUNIT/4;
-            if (!player->deltaviewheight)
-                player->deltaviewheight = 1;
-        }
-    }
-    player->viewz = player->mo->z + player->viewheight + bob;
-
-    // villsa [STRIFE] account for terrain lowering the view
-    if(player->mo->flags & MF_FEETCLIPPED)
-        player->viewz -= 13*FRACUNIT;
-
-    if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
-        player->viewz = player->mo->ceilingz-4*FRACUNIT;
-
-    // haleyjd [STRIFE]: added a floorz clip here
-    if (player->viewz < player->mo->floorz)
-        player->viewz = player->mo->floorz;
-}
-
-
-
-//
-// P_MovePlayer
-//
-// [STRIFE] Adjustments to allow air control, jumping, and up/down look.
-//
-void P_MovePlayer (player_t* player)
-{
-    ticcmd_t*      cmd;
-
-    cmd = &player->cmd;
-
-    player->mo->angle += (cmd->angleturn<<16);
-
-    // Do not let the player control movement
-    //  if not onground.
-    onground = (player->mo->z <= player->mo->floorz);
-
-    // villsa [STRIFE] allows player to climb over things by jumping
-    // haleyjd 20110205: air control thrust should be 256, not cmd->forwardmove
-    if(!onground)
-    {
-        if(cmd->forwardmove)
-            P_Thrust (player, player->mo->angle, 256);
-    }
-    else
-    {
-        // villsa [STRIFE] jump button
-        if (cmd->buttons2 & BT2_JUMP)
-        {
-            if(!player->deltaviewheight)
-                player->mo->momz += 8*FRACUNIT;
-        }
-
-        // haleyjd 20110205 [STRIFE] Either Rogue or Watcom removed the
-        // redundant "onground" checks from these if's.
-        if (cmd->forwardmove)
-            P_Thrust (player, player->mo->angle, cmd->forwardmove*2048);
-
-        if (cmd->sidemove)
-            P_Thrust (player, player->mo->angle-ANG90, cmd->sidemove*2048);
-    }
-
-    // villsa [STRIFE] player walking state set
-    if ( (cmd->forwardmove || cmd->sidemove) 
-        && player->mo->state == &states[S_PLAY_00] )
-    {
-        P_SetMobjState (player->mo, S_PLAY_01);
-    }
-
-    // villsa [STRIFE] centerview button
-    if (cmd->buttons2 & BT2_CENTERVIEW)
-        player->centerview = 1;
-
-    // villsa [STRIFE] adjust player's pitch when centerviewing
-    if (player->centerview)
-    {
-        if (player->pitch <= 0)
-        {
-            if (player->pitch < 0)
-                player->pitch = player->pitch + CENTERVIEWAMOUNT;
-        }
-        else
-        {
-            player->pitch = player->pitch - CENTERVIEWAMOUNT;
-        }
-        if (abs(player->pitch) < CENTERVIEWAMOUNT)
-        {
-            player->pitch = 0;
-            player->centerview = 0;
-        }
-    }
-    
-    // villsa [STRIFE] look up action
-    if (cmd->buttons2 & BT2_LOOKUP)
-    {
-        player->pitch += LOOKPITCHAMOUNT;
-        if (player->pitch > LOOKUPMAX ||
-            player->pitch < LOOKDOWNMAX)
-            player->pitch -= LOOKPITCHAMOUNT;
-    }
-    else
-    {
-        // villsa [STRIFE] look down action
-        if (cmd->buttons2 & BT2_LOOKDOWN)
-        {
-            player->pitch -= LOOKPITCHAMOUNT;
-            if (player->pitch > LOOKUPMAX ||
-                player->pitch < LOOKDOWNMAX)
-                player->pitch += LOOKPITCHAMOUNT;
-        }
-    }
-
-}
-
-
-
-//
-// P_DeathThink
-// Fall on your face when dying.
-// Decrease POV height to floor height.
-//
-// [STRIFE] Modifications for up/down look.
-//
-#define ANG5    (ANG90/18)
-
-void P_DeathThink(player_t* player)
-{
-    angle_t angle;
-    angle_t delta;
-
-    P_MovePsprites(player);
-
-    // fall to the ground
-    if (player->viewheight > 6*FRACUNIT)
-        player->viewheight -= FRACUNIT;
-
-    if (player->viewheight < 6*FRACUNIT)
-        player->viewheight = 6*FRACUNIT;
-
-    player->deltaviewheight = 0;
-    onground = (player->mo->z <= player->mo->floorz);
-    P_CalcHeight(player);
-
-    if(player->attacker && player->attacker != player->mo)
-    {
-        angle = R_PointToAngle2 (player->mo->x,
-                                 player->mo->y,
-                                 player->attacker->x,
-                                 player->attacker->y);
-
-        delta = angle - player->mo->angle;
-
-        if (delta < ANG5 || delta > (unsigned)-ANG5)
-        {
-            // Looking at killer,
-            //  so fade damage flash down.
-            player->mo->angle = angle;
-
-            if (player->damagecount)
-                player->damagecount--;
-        }
-        else if (delta < ANG180)
-            player->mo->angle += ANG5;
-        else
-            player->mo->angle -= ANG5;
-    }
-    else if (player->damagecount)
-        player->damagecount--;
-
-    // villsa [STRIFE]
-    if(player->pitch <= 90)
-        player->pitch = player->pitch + 3;
-
-    if(player->cmd.buttons & BT_USE)
-        player->playerstate = PST_REBORN;
-}
-
-
-
-//
-// P_PlayerThink
-//
-// [STRIFE] Massive changes/additions:
-// * NOCLIP hack removed
-// * P_DeathThink moved up
-// * Inventory use/dropping
-// * Strife weapons logic
-// * Dialog
-// * Strife powerups and nukage behavior
-// * Fire Death/Sigil Shock
-//
-void P_PlayerThink (player_t* player)
-{
-    ticcmd_t*       cmd;
-    weapontype_t    newweapon;
-
-    // villsa [STRIFE] unused code (see ST_Responder)
-    /*
-    // fixme: do this in the cheat code
-    if (player->cheats & CF_NOCLIP)
-        player->mo->flags |= MF_NOCLIP;
-    else
-        player->mo->flags &= ~MF_NOCLIP;
-    */
-
-    // haleyjd 20110205 [STRIFE]: P_DeathThink moved up
-    if (player->playerstate == PST_DEAD)
-    {
-        P_DeathThink (player);
-        return;
-    }
-
-    // chain saw run forward
-    cmd = &player->cmd;
-    if (player->mo->flags & MF_JUSTATTACKED)
-    {
-        cmd->angleturn = 0;
-        cmd->forwardmove = 0xc800/512;
-        cmd->sidemove = 0;
-        player->mo->flags &= ~MF_JUSTATTACKED;
-    }
-
-    // Move around.
-    // Reactiontime is used to prevent movement
-    //  for a bit after a teleport.
-    if (player->mo->reactiontime)
-        player->mo->reactiontime--;
-    else
-        P_MovePlayer (player);
-
-    P_CalcHeight (player);
-
-    if (player->mo->subsector->sector->special)
-        P_PlayerInSpecialSector (player);
-
-    // villsa [STRIFE] handle inventory input
-    if(cmd->buttons2 & (BT2_HEALTH|BT2_INVUSE|BT2_INVDROP))
-    {
-        if(!player->inventorydown)
-        {
-            if(cmd->buttons2 & BT2_HEALTH)
-                P_UseInventoryItem(player, SPR_FULL);
-            else if(cmd->buttons2 & BT2_INVUSE)
-                P_UseInventoryItem(player, cmd->inventory);
-            else if(cmd->buttons2 & BT2_INVDROP)
-            {
-                P_DropInventoryItem(player, cmd->inventory);
-
-                // haleyjd 20110205: removed incorrect "else" here
-                // villsa [STRIFE]
-                if(workparm)
-                {
-                    int cheat = player->cheats ^ 1;
-                    player->cheats ^= CF_NOCLIP;
-
-                    if(cheat & CF_NOCLIP)
-                    {
-                        player->message = DEH_String("No Clipping Mode ON");
-                        player->mo->flags |= MF_NOCLIP;
-                    }
-                    else
-                    {
-                        player->mo->flags &= ~MF_NOCLIP;
-                        player->message = DEH_String("No Clipping Mode OFF");
-                    }
-                }
-            }
-        }
-
-        player->inventorydown = true;
-    }
-    else
-        player->inventorydown = false;
-
-    // Check for weapon change.
-
-    // A special event has no other buttons.
-    if(cmd->buttons & BT_SPECIAL)
-        cmd->buttons = 0;
-
-    if(cmd->buttons & BT_CHANGE)
-    {
-        // The actual changing of the weapon is done
-        //  when the weapon psprite can do it
-        //  (read: not in the middle of an attack).
-        newweapon = (cmd->buttons & BT_WEAPONMASK) >> BT_WEAPONSHIFT;
-
-        // villsa [STRIFE] select poison bow
-        if(newweapon == wp_elecbow)
-        {
-            if(player->weaponowned[wp_poisonbow] && player->readyweapon == wp_elecbow)
-            {
-                if(player->ammo[weaponinfo[wp_poisonbow].ammo])
-                    newweapon = wp_poisonbow;
-            }
-        }
-
-        // villsa [STRIFE] select wp grenade launcher
-        if(newweapon == wp_hegrenade)
-        {
-            if(player->weaponowned[wp_wpgrenade] && player->readyweapon == wp_hegrenade)
-            {
-                if(player->ammo[weaponinfo[wp_wpgrenade].ammo])
-                    newweapon = wp_wpgrenade;
-            }
-        }
-
-        // villsa [STRIFE] select torpedo
-        if(newweapon == wp_mauler)
-        {
-            if(player->weaponowned[wp_torpedo] && player->readyweapon == wp_mauler)
-            {
-                // haleyjd 20140924: bug fix - using wrong enum value am_cell
-                // caused this to check the missile launcher for rocket ammo
-                if(player->ammo[weaponinfo[wp_torpedo].ammo] >= 30)
-                    newweapon = wp_torpedo;
-            }
-        }
-
-        if(player->weaponowned[newweapon] && newweapon != player->readyweapon)
-        {
-            // villsa [STRIFE] check weapon if in demo mode or not
-            if(weaponinfo[newweapon].availabledemo || !isdemoversion)
-            {
-                if(player->ammo[weaponinfo[newweapon].ammo])
-                    player->pendingweapon = newweapon;
-                else
-                {
-                    // decide between electric bow or poison arrow
-                    if(newweapon == wp_elecbow &&
-                        player->ammo[am_poisonbolts] &&
-                        player->readyweapon != wp_poisonbow)
-                    {
-                        player->pendingweapon = wp_poisonbow;
-                    }
-                    // decide between hp grenade launcher or wp grenade launcher
-                    else if(newweapon == wp_hegrenade &&
-                        player->ammo[am_wpgrenades] &&
-                        player->readyweapon != wp_wpgrenade)
-                    {
-                        player->pendingweapon = wp_wpgrenade;
-                    }
-
-                    // villsa [STRIFE] - no check for mauler/torpedo??
-                }
-            }
-        }
-    }
-
-    // check for use
-    if(cmd->buttons & BT_USE)
-    {
-        if(!player->usedown)
-        {
-            P_DialogStart(player);  // villsa [STRIFE]
-            P_UseLines (player);
-            player->usedown = true;
-        }
-    }
-    else
-        player->usedown = false;
-
-    // cycle psprites
-    P_MovePsprites (player);
-
-    // Counters, time dependend power ups.
-
-    // Strength counts up to diminish fade.
-    if (player->powers[pw_strength])
-        player->powers[pw_strength]++;
-
-    // villsa [STRIFE] targeter powerup
-    if(player->powers[pw_targeter])
-    {
-        player->powers[pw_targeter]--;
-        if(player->powers[pw_targeter] == 1)
-        {
-            P_SetPsprite(player, ps_targcenter, S_NULL);
-            P_SetPsprite(player, ps_targleft,   S_NULL);
-            P_SetPsprite(player, ps_targright,  S_NULL);
-        }
-        else if(player->powers[pw_targeter] - 1 < 5*TICRATE)
-        {
-            if(player->powers[pw_targeter] & 32)
-            {
-                P_SetPsprite(player, ps_targright, S_NULL);
-                P_SetPsprite(player, ps_targleft,  S_TRGT_01);   // 11
-            }
-            else if(player->powers[pw_targeter] & 16) // haleyjd 20110205: missing else
-            {
-                P_SetPsprite(player, ps_targright, S_TRGT_02);  // 12
-                P_SetPsprite(player, ps_targleft,  S_NULL);
-            }
-        }
-    }
-
-    if(player->powers[pw_invisibility])
-    {
-        // villsa [STRIFE] remove mvis flag as well
-        if(!--player->powers[pw_invisibility])
-            player->mo->flags &= ~(MF_SHADOW|MF_MVIS);
-    }
-
-    if(player->powers[pw_ironfeet])
-    {
-        player->powers[pw_ironfeet]--;
-
-        // villsa [STRIFE] gasmask sound
-        if(!(leveltime & 0x3f))
-            S_StartSound(player->mo, sfx_mask);
-    }
-
-    if(player->powers[pw_allmap] > 1)
-        player->powers[pw_allmap]--;
-
-    // haleyjd 08/30/10: [STRIFE]
-    // Nukage count keeps track of exposure to hazardous conditions over time.
-    // After accumulating 16 total seconds or more of exposure, you will take
-    // 5 damage roughly once per second until the count drops back under 560
-    // tics.
-    if(player->nukagecount)
-    {
-        player->nukagecount--;
-        if(!(leveltime & 0x1f) && player->nukagecount > 16*TICRATE)
-            P_DamageMobj(player->mo, NULL, NULL, 5);
-    }
-
-    if(player->damagecount)
-        player->damagecount--;
-
-    if(player->bonuscount)
-        player->bonuscount--;
-
-    // villsa [STRIFE] checks for extralight
-    if(player->extralight >= 0)
-    {
-        if(player->cheats & CF_ONFIRE)
-            player->fixedcolormap = 1;
-        else
-            player->fixedcolormap = 0;
-    }
-    else // Sigil shock:
-        player->fixedcolormap = INVERSECOLORMAP;
-}
-
-
-//
-// P_RemoveInventoryItem
-// villsa [STRIFE] new function
-//
-const char* P_RemoveInventoryItem(player_t *player, int slot, int amount)
-{
-    mobjtype_t type;
-
-    player->inventory[slot].amount -= amount;
-    player->st_update = true;
-
-    type = player->inventory[slot].type;
-
-    if(!player->inventory[slot].amount)
-    {
-        // shift everything above it down
-        // see P_TakeDialogItem for notes on possible bugs
-        int j;
-
-        for(j = slot + 1; j <= player->numinventory; j++)
-        {
-            inventory_t *item1 = &(player->inventory[j - 1]);
-            inventory_t *item2 = &(player->inventory[j]);
-
-            *item1 = *item2;
-        }
-
-        player->inventory[player->numinventory].type = NUMMOBJTYPES;
-        player->inventory[player->numinventory].sprite = -1;
-        player->numinventory--;
-
-        // update cursor position
-        if(player->inventorycursor >= player->numinventory)
-        {
-            if(player->inventorycursor)
-                player->inventorycursor--;
-        }
-    }
-
-    return mobjinfo[type].name;
-}
-
-//
-// P_DropInventoryItem
-// villsa [STRIFE] new function
-//
-void P_DropInventoryItem(player_t* player, int sprite)
-{
-    int invslot;
-    inventory_t *item;
-    mobjtype_t type;
-    int amount;
-
-    invslot = 0;
-    amount = 1;
-
-    while(invslot < player->numinventory && sprite != player->inventory[invslot].sprite)
-        invslot++;
-
-    item = &(player->inventory[invslot]);
-    type = item->type;
-
-    if(item->amount)
-    {
-        angle_t angle;
-        fixed_t dist;
-        mobj_t* mo;
-        mobj_t* mobjitem;
-        fixed_t x;
-        fixed_t y;
-        fixed_t z;
-        int r;
-
-        if(item->type == MT_MONY_1)
-        {
-            if(item->amount >= 50)
-            {
-                type = MT_MONY_50;
-                amount = 50;
-            }
-            else if(item->amount >= 25)
-            {
-                type = MT_MONY_25;
-                amount = 25;
-            }
-            else if(item->amount >= 10)
-            {
-                type = MT_MONY_10;
-                amount = 10;
-            }
-        }
-
-        if(type >= NUMMOBJTYPES)
-            return;
-
-        angle = player->mo->angle;
-        r = P_Random();
-        angle = (angle + ((r - P_Random()) << 18)) >> ANGLETOFINESHIFT;
-
-        if(angle < 7618 && angle >= 6718)
-            angle = 7618;
-
-        else if(angle < 5570 && angle >= 4670)
-            angle = 5570;
-
-        else if(angle < 3522 && angle >= 2622)
-            angle = 3522;
-
-        else if(angle < 1474 && angle >= 574)
-            angle = 1474;
-
-        mo = player->mo;
-        dist = mobjinfo[type].radius + mo->info->radius + (4*FRACUNIT);
-
-        x = mo->x + FixedMul(finecosine[angle], dist);
-        y = mo->y + FixedMul(finesine[angle], dist);
-        z = mo->z + (10*FRACUNIT);
-        mobjitem = P_SpawnMobj(x, y, z, type);
-        mobjitem->flags |= (MF_SPECIAL|MF_DROPPED);
-
-        if(P_CheckPosition(mobjitem, x, y))
-        {
-            mobjitem->angle = (angle << ANGLETOFINESHIFT);
-            mobjitem->momx = FixedMul(finecosine[angle], (5*FRACUNIT)) + mo->momx;
-            mobjitem->momy = FixedMul(finesine[angle], (5*FRACUNIT)) + mo->momy;
-            mobjitem->momz = FRACUNIT;
-
-            P_RemoveInventoryItem(player, invslot, amount);
-        }
-        else
-            P_RemoveMobj(mobjitem);
-    }
-}
-
-//
-// P_TossDegninOre
-// villsa [STRIFE] new function
-//
-boolean P_TossDegninOre(player_t* player)
-{
-    angle_t angle;
-    mobj_t* mo;
-    mobj_t* ore;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    fixed_t dist;
-
-    angle = player->mo->angle >> ANGLETOFINESHIFT;
-
-    if(angle < 7618 && angle >= 6718)
-        angle = 7618;
-
-    else if(angle < 5570 && angle >= 4670)
-        angle = 5570;
-
-    else if(angle < 3522 && angle >= 2622)
-        angle = 3522;
-
-    else if(angle < 1474 && angle >= 574)
-        angle = 1474;
-
-    mo = player->mo;
-    dist = mobjinfo[MT_DEGNINORE].radius + mo->info->radius + (4*FRACUNIT);
-
-    x = mo->x + FixedMul(finecosine[angle], dist);
-    y = mo->y + FixedMul(finesine[angle], dist);
-    z = mo->z + (10*FRACUNIT);
-    ore = P_SpawnMobj(x, y, z, MT_DEGNINORE);
-
-    if(P_CheckPosition(ore, x, y))
-    {
-        ore->target = mo;
-        ore->angle = (angle << ANGLETOFINESHIFT);
-        ore->momx = FixedMul(finecosine[angle], (5*FRACUNIT));
-        ore->momy = FixedMul(finesine[angle], (5*FRACUNIT));
-        ore->momz = FRACUNIT;
-        return true;
-    }
-    else
-        P_RemoveMobj(ore);
-
-    return false;
-}
-
-//
-// P_SpawnTeleportBeacon
-//
-// villsa [STRIFE] new function
-// haleyjd 20140918: bug fixed to propagate allegiance properly.
-//
-boolean P_SpawnTeleportBeacon(player_t* player)
-{
-    angle_t angle;
-    int r;
-    mobj_t* mo;
-    mobj_t* beacon;
-    fixed_t x;
-    fixed_t y;
-    fixed_t z;
-    fixed_t dist;
-
-    angle = player->mo->angle;
-    r = P_Random();
-    angle = (angle + ((r - P_Random()) << 18)) >> ANGLETOFINESHIFT;
-
-    if(angle < 7618 && angle >= 6718)
-        angle = 7618;
-
-    else if(angle < 5570 && angle >= 4670)
-        angle = 5570;
-
-    else if(angle < 3522 && angle >= 2622)
-        angle = 3522;
-
-    else if(angle < 1474 && angle >= 574)
-        angle = 1474;
-
-    mo = player->mo;
-    dist = mobjinfo[MT_BEACON].radius + mo->info->radius + (4*FRACUNIT);
-
-    x = mo->x + FixedMul(finecosine[angle], dist);
-    y = mo->y + FixedMul(finesine[angle], dist);
-    z = mo->z + (10*FRACUNIT);
-    beacon = P_SpawnMobj(x, y, z, MT_BEACON);
-
-    if(P_CheckPosition(beacon, x, y))
-    {
-        beacon->target = mo;
-        beacon->miscdata = (byte)(player->allegiance);
-        beacon->angle = (angle << ANGLETOFINESHIFT);
-        beacon->momx = FixedMul(finecosine[angle], (5*FRACUNIT));
-        beacon->momy = FixedMul(finesine[angle], (5*FRACUNIT));
-        beacon->momz = FRACUNIT;
-        P_SetMobjState(beacon, beacon->info->seestate);
-        return true;
-    }
-    else
-        P_RemoveMobj(beacon);
-
-    return false;
-}
-
-//
-// P_UseInventoryItem
-// villsa [STRIFE] new function
-//
-boolean P_UseInventoryItem(player_t* player, int item)
-{
-    int i;
-    const char *name;
-
-    if(player->cheats & CF_ONFIRE)
-        return false;
-
-    for(i = 0; i < player->numinventory; i++)
-    {
-        if(item != player->inventory[i].sprite)
-            continue;
-
-        if(!P_ItemBehavior(player, item))
-            return false;
-
-        name = P_RemoveInventoryItem(player, i, 1);
-        if(name == NULL)
-            name = "Item";
-
-        M_snprintf(useinventorymsg, sizeof(useinventorymsg),
-                   "You used the %s.", name);
-        player->message = useinventorymsg;
-
-        if(player == &players[consoleplayer])
-            S_StartSound(NULL, sfx_itemup);
-
-        return true;
-    }
-    
-    return false;
-}
-
-//
-// P_ItemBehavior
-// villsa [STRIFE] new function
-//
-boolean P_ItemBehavior(player_t* player, int item)
-{
-    switch(item)
-    {
-    case SPR_ARM1:  // 136
-        return P_GiveArmor(player, 2);
-
-    case SPR_ARM2:  // 137
-        return P_GiveArmor(player, 1);
-
-    case SPR_SHD1:  // 186
-        return P_GivePower(player, pw_invisibility);
-
-    case SPR_MASK:  // 187
-        return P_GivePower(player, pw_ironfeet);
-
-    case SPR_PMUP:  // 191
-        if(!player->powers[pw_allmap])
-        {
-            player->message = "The scanner won't work without a map!";
-            return false;
-        }
-        player->powers[pw_allmap] = PMUPTICS;
-        return true; // haleyjd 20110228: repaired
-
-    case SPR_STMP:  // 180
-        return P_GiveBody(player, 10);
-
-    case SPR_MDKT:  // 181
-        return P_GiveBody(player, 25);
-
-    case SPR_FULL:  // 130
-        return P_GiveBody(player, 200);
-
-    case SPR_BEAC:  // 135
-        return P_SpawnTeleportBeacon(player);
-
-    case SPR_TARG:  // 108
-        return P_GivePower(player, pw_targeter);
-    }
-
-    return false;
-}
diff --git a/games/NXDoom/src/strife/r_bsp.c b/games/NXDoom/src/strife/r_bsp.c
deleted file mode 100644
index 64b9d5dfe..000000000
--- a/games/NXDoom/src/strife/r_bsp.c
+++ /dev/null
@@ -1,583 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	BSP traversal, handling of LineSegs for rendering.
-//
-
-
-
-
-#include "doomdef.h"
-
-#include "m_bbox.h"
-
-#include "i_system.h"
-
-#include "r_main.h"
-#include "r_plane.h"
-#include "r_things.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-//#include "r_local.h"
-
-
-
-seg_t*		curline;
-side_t*		sidedef;
-line_t*		linedef;
-sector_t*	frontsector;
-sector_t*	backsector;
-
-drawseg_t	drawsegs[MAXDRAWSEGS];
-drawseg_t*	ds_p;
-
-
-void
-R_StoreWallRange
-( int	start,
-  int	stop );
-
-
-
-
-//
-// R_ClearDrawSegs
-//
-void R_ClearDrawSegs (void)
-{
-    ds_p = drawsegs;
-}
-
-
-
-//
-// ClipWallSegment
-// Clips the given range of columns
-// and includes it in the new clip list.
-//
-typedef	struct
-{
-    int	first;
-    int last;
-    
-} cliprange_t;
-
-// We must expand MAXSEGS to the theoretical limit of the number of solidsegs
-// that can be generated in a scene by the DOOM engine. This was determined by
-// Lee Killough during BOOM development to be a function of the screensize.
-// The simplest thing we can do, other than fix this bug, is to let the game
-// render overage and then bomb out by detecting the overflow after the 
-// fact. -haleyjd
-//#define MAXSEGS		32
-#define MAXSEGS (SCREENWIDTH / 2 + 1)
-
-// newend is one past the last valid seg
-cliprange_t*	newend;
-cliprange_t	solidsegs[MAXSEGS];
-
-
-
-
-//
-// R_ClipSolidWallSegment
-// Does handle solid walls,
-//  e.g. single sided LineDefs (middle texture)
-//  that entirely block the view.
-// 
-void
-R_ClipSolidWallSegment
-( int			first,
-  int			last )
-{
-    cliprange_t*	next;
-    cliprange_t*	start;
-
-    // Find the first range that touches the range
-    //  (adjacent pixels are touching).
-    start = solidsegs;
-    while (start->last < first-1)
-	start++;
-
-    if (first < start->first)
-    {
-	if (last < start->first-1)
-	{
-	    // Post is entirely visible (above start),
-	    //  so insert a new clippost.
-	    R_StoreWallRange (first, last);
-	    next = newend;
-	    newend++;
-	    
-	    while (next != start)
-	    {
-		*next = *(next-1);
-		next--;
-	    }
-	    next->first = first;
-	    next->last = last;
-	    return;
-	}
-		
-	// There is a fragment above *start.
-	R_StoreWallRange (first, start->first - 1);
-	// Now adjust the clip size.
-	start->first = first;	
-    }
-
-    // Bottom contained in start?
-    if (last <= start->last)
-	return;			
-		
-    next = start;
-    while (last >= (next+1)->first-1)
-    {
-	// There is a fragment between two posts.
-	R_StoreWallRange (next->last + 1, (next+1)->first - 1);
-	next++;
-	
-	if (last <= next->last)
-	{
-	    // Bottom is contained in next.
-	    // Adjust the clip size.
-	    start->last = next->last;	
-	    goto crunch;
-	}
-    }
-	
-    // There is a fragment after *next.
-    R_StoreWallRange (next->last + 1, last);
-    // Adjust the clip size.
-    start->last = last;
-	
-    // Remove start+1 to next from the clip list,
-    // because start now covers their area.
-  crunch:
-    if (next == start)
-    {
-	// Post just extended past the bottom of one post.
-	return;
-    }
-    
-
-    while (next++ != newend)
-    {
-	// Remove a post.
-	*++start = *next;
-    }
-
-    newend = start+1;
-}
-
-
-
-//
-// R_ClipPassWallSegment
-// Clips the given range of columns,
-//  but does not includes it in the clip list.
-// Does handle windows,
-//  e.g. LineDefs with upper and lower texture.
-//
-void
-R_ClipPassWallSegment
-( int	first,
-  int	last )
-{
-    cliprange_t*	start;
-
-    // Find the first range that touches the range
-    //  (adjacent pixels are touching).
-    start = solidsegs;
-    while (start->last < first-1)
-	start++;
-
-    if (first < start->first)
-    {
-	if (last < start->first-1)
-	{
-	    // Post is entirely visible (above start).
-	    R_StoreWallRange (first, last);
-	    return;
-	}
-		
-	// There is a fragment above *start.
-	R_StoreWallRange (first, start->first - 1);
-    }
-
-    // Bottom contained in start?
-    if (last <= start->last)
-	return;			
-		
-    while (last >= (start+1)->first-1)
-    {
-	// There is a fragment between two posts.
-	R_StoreWallRange (start->last + 1, (start+1)->first - 1);
-	start++;
-	
-	if (last <= start->last)
-	    return;
-    }
-	
-    // There is a fragment after *next.
-    R_StoreWallRange (start->last + 1, last);
-}
-
-
-
-//
-// R_ClearClipSegs
-//
-void R_ClearClipSegs (void)
-{
-    solidsegs[0].first = -0x7fffffff;
-    solidsegs[0].last = -1;
-    solidsegs[1].first = viewwidth;
-    solidsegs[1].last = 0x7fffffff;
-    newend = solidsegs+2;
-}
-
-//
-// R_AddLine
-// Clips the given segment
-// and adds any visible pieces to the line list.
-//
-void R_AddLine (seg_t*	line)
-{
-    int			x1;
-    int			x2;
-    angle_t		angle1;
-    angle_t		angle2;
-    angle_t		span;
-    angle_t		tspan;
-    
-    curline = line;
-
-    // OPTIMIZE: quickly reject orthogonal back sides.
-    angle1 = R_PointToAngle (line->v1->x, line->v1->y);
-    angle2 = R_PointToAngle (line->v2->x, line->v2->y);
-    
-    // Clip to view edges.
-    // OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW).
-    span = angle1 - angle2;
-    
-    // Back side? I.e. backface culling?
-    if (span >= ANG180)
-	return;		
-
-    // Global angle needed by segcalc.
-    rw_angle1 = angle1;
-    angle1 -= viewangle;
-    angle2 -= viewangle;
-	
-    tspan = angle1 + clipangle;
-    if (tspan > 2*clipangle)
-    {
-	tspan -= 2*clipangle;
-
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return;
-	
-	angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2*clipangle)
-    {
-	tspan -= 2*clipangle;
-
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return;	
-	angle2 = 0 - clipangle;
-    }
-    
-    // The seg is in the view range,
-    // but not necessarily visible.
-    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
-    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
-    x1 = viewangletox[angle1];
-    x2 = viewangletox[angle2];
-
-    // Does not cross a pixel?
-    if (x1 == x2)
-	return;				
-	
-    backsector = line->backsector;
-
-    // Single sided line?
-    if (!backsector)
-	goto clipsolid;		
-
-    // Closed door.
-    if (backsector->ceilingheight <= frontsector->floorheight
-	|| backsector->floorheight >= frontsector->ceilingheight)
-	goto clipsolid;		
-
-    // Window.
-    if (backsector->ceilingheight != frontsector->ceilingheight
-	|| backsector->floorheight != frontsector->floorheight)
-	goto clippass;	
-		
-    // Reject empty lines used for triggers
-    //  and special events.
-    // Identical floor and ceiling on both sides,
-    // identical light levels on both sides,
-    // and no middle texture.
-    if (backsector->ceilingpic == frontsector->ceilingpic
-	&& backsector->floorpic == frontsector->floorpic
-	&& backsector->lightlevel == frontsector->lightlevel
-	&& curline->sidedef->midtexture == 0)
-    {
-	return;
-    }
-    
-				
-  clippass:
-    R_ClipPassWallSegment (x1, x2-1);	
-    return;
-		
-  clipsolid:
-    R_ClipSolidWallSegment (x1, x2-1);
-}
-
-
-//
-// R_CheckBBox
-// Checks BSP node/subtree bounding box.
-// Returns true
-//  if some part of the bbox might be visible.
-//
-int	checkcoord[12][4] =
-{
-    {3,0,2,1},
-    {3,0,2,0},
-    {3,1,2,0},
-    {0},
-    {2,0,2,1},
-    {0,0,0,0},
-    {3,1,3,0},
-    {0},
-    {2,0,3,1},
-    {2,1,3,1},
-    {2,1,3,0}
-};
-
-
-boolean R_CheckBBox (fixed_t*	bspcoord)
-{
-    int			boxx;
-    int			boxy;
-    int			boxpos;
-
-    fixed_t		x1;
-    fixed_t		y1;
-    fixed_t		x2;
-    fixed_t		y2;
-    
-    angle_t		angle1;
-    angle_t		angle2;
-    angle_t		span;
-    angle_t		tspan;
-    
-    cliprange_t*	start;
-
-    int			sx1;
-    int			sx2;
-    
-    // Find the corners of the box
-    // that define the edges from current viewpoint.
-    if (viewx <= bspcoord[BOXLEFT])
-	boxx = 0;
-    else if (viewx < bspcoord[BOXRIGHT])
-	boxx = 1;
-    else
-	boxx = 2;
-		
-    if (viewy >= bspcoord[BOXTOP])
-	boxy = 0;
-    else if (viewy > bspcoord[BOXBOTTOM])
-	boxy = 1;
-    else
-	boxy = 2;
-		
-    boxpos = (boxy<<2)+boxx;
-    if (boxpos == 5)
-	return true;
-	
-    x1 = bspcoord[checkcoord[boxpos][0]];
-    y1 = bspcoord[checkcoord[boxpos][1]];
-    x2 = bspcoord[checkcoord[boxpos][2]];
-    y2 = bspcoord[checkcoord[boxpos][3]];
-    
-    // check clip list for an open space
-    angle1 = R_PointToAngle (x1, y1) - viewangle;
-    angle2 = R_PointToAngle (x2, y2) - viewangle;
-	
-    span = angle1 - angle2;
-
-    // Sitting on a line?
-    if (span >= ANG180)
-	return true;
-    
-    tspan = angle1 + clipangle;
-
-    if (tspan > 2*clipangle)
-    {
-	tspan -= 2*clipangle;
-
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return false;	
-
-	angle1 = clipangle;
-    }
-    tspan = clipangle - angle2;
-    if (tspan > 2*clipangle)
-    {
-	tspan -= 2*clipangle;
-
-	// Totally off the left edge?
-	if (tspan >= span)
-	    return false;
-	
-	angle2 = 0 - clipangle;
-    }
-
-
-    // Find the first clippost
-    //  that touches the source post
-    //  (adjacent pixels are touching).
-    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
-    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
-    sx1 = viewangletox[angle1];
-    sx2 = viewangletox[angle2];
-
-    // Does not cross a pixel.
-    if (sx1 == sx2)
-	return false;			
-    sx2--;
-	
-    start = solidsegs;
-    while (start->last < sx2)
-	start++;
-    
-    if (sx1 >= start->first
-	&& sx2 <= start->last)
-    {
-	// The clippost contains the new span.
-	return false;
-    }
-
-    return true;
-}
-
-
-
-//
-// R_Subsector
-// Determine floor/ceiling planes.
-// Add sprites of things in sector.
-// Draw one or more line segments.
-//
-void R_Subsector (int num)
-{
-    int			count;
-    seg_t*		line;
-    subsector_t*	sub;
-	
-#ifdef RANGECHECK
-    if (num>=numsubsectors)
-	I_Error ("R_Subsector: ss %i with numss = %i",
-		 num,
-		 numsubsectors);
-#endif
-
-    sscount++;
-    sub = &subsectors[num];
-    frontsector = sub->sector;
-    count = sub->numlines;
-    line = &segs[sub->firstline];
-
-    if (frontsector->floorheight < viewz)
-    {
-	floorplane = R_FindPlane (frontsector->floorheight,
-				  frontsector->floorpic,
-				  frontsector->lightlevel);
-    }
-    else
-	floorplane = NULL;
-    
-    if (frontsector->ceilingheight > viewz 
-	|| frontsector->ceilingpic == skyflatnum)
-    {
-	ceilingplane = R_FindPlane (frontsector->ceilingheight,
-				    frontsector->ceilingpic,
-				    frontsector->lightlevel);
-    }
-    else
-	ceilingplane = NULL;
-		
-    R_AddSprites (frontsector);	
-
-    while (count--)
-    {
-	R_AddLine (line);
-	line++;
-    }
-
-    // check for solidsegs overflow - extremely unsatisfactory!
-    if(newend > &solidsegs[32])
-        I_Error("R_Subsector: solidsegs overflow (vanilla may crash here)\n");
-}
-
-
-
-
-//
-// RenderBSPNode
-// Renders all subsectors below a given node,
-//  traversing subtree recursively.
-// Just call with BSP root.
-void R_RenderBSPNode (int bspnum)
-{
-    node_t*	bsp;
-    int		side;
-
-    // Found a subsector?
-    if (bspnum & NF_SUBSECTOR)
-    {
-	if (bspnum == -1)			
-	    R_Subsector (0);
-	else
-	    R_Subsector (bspnum&(~NF_SUBSECTOR));
-	return;
-    }
-		
-    bsp = &nodes[bspnum];
-    
-    // Decide which side the view point is on.
-    side = R_PointOnSide (viewx, viewy, bsp);
-
-    // Recursively divide front space.
-    R_RenderBSPNode (bsp->children[side]); 
-
-    // Possibly divide back space.
-    if (R_CheckBBox (bsp->bbox[side^1]))	
-	R_RenderBSPNode (bsp->children[side^1]);
-}
-
-
diff --git a/games/NXDoom/src/strife/r_bsp.h b/games/NXDoom/src/strife/r_bsp.h
deleted file mode 100644
index 1723e6861..000000000
--- a/games/NXDoom/src/strife/r_bsp.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh module, BSP traversal and handling.
-//
-
-
-#ifndef __R_BSP__
-#define __R_BSP__
-
-
-
-extern seg_t*		curline;
-extern side_t*		sidedef;
-extern line_t*		linedef;
-extern sector_t*	frontsector;
-extern sector_t*	backsector;
-
-extern int		rw_x;
-extern int		rw_stopx;
-
-extern boolean		segtextured;
-
-// false if the back side is the same plane
-extern boolean		markfloor;		
-extern boolean		markceiling;
-
-extern boolean		skymap;
-
-extern drawseg_t	drawsegs[MAXDRAWSEGS];
-extern drawseg_t*	ds_p;
-
-extern lighttable_t**	hscalelight;
-extern lighttable_t**	vscalelight;
-extern lighttable_t**	dscalelight;
-
-
-typedef void (*drawfunc_t) (int start, int stop);
-
-
-// BSP?
-void R_ClearClipSegs (void);
-void R_ClearDrawSegs (void);
-
-
-void R_RenderBSPNode (int bspnum);
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_data.c b/games/NXDoom/src/strife/r_data.c
deleted file mode 100644
index e7d70e073..000000000
--- a/games/NXDoom/src/strife/r_data.c
+++ /dev/null
@@ -1,1010 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Preparation of data for rendering,
-//	generation of lookups, caching, retrieval by name.
-//
-
-#include <stdio.h>
-
-#include "d_main.h"
-#include "deh_main.h"
-#include "i_swap.h"
-#include "i_system.h"
-#include "z_zone.h"
-#include "w_wad.h"
-#include "doomdef.h"
-#include "r_local.h"
-#include "p_local.h"
-#include "doomstat.h"
-#include "m_misc.h"
-#include "r_sky.h"
-#include "r_data.h"
-#include "sounds.h" // villsa [STRIFE]
-
-//
-// Graphics.
-// DOOM graphics for walls and sprites
-// is stored in vertical runs of opaque pixels (posts).
-// A column is composed of zero or more posts,
-// a patch or sprite is composed of zero or more columns.
-// 
-
-
-
-//
-// Texture definition.
-// Each texture is composed of one or more patches,
-// with patches being lumps stored in the WAD.
-// The lumps are referenced by number, and patched
-// into the rectangular texture space using origin
-// and possibly other attributes.
-//
-typedef PACKED_STRUCT (
-{
-    short	originx;
-    short	originy;
-    short	patch;
-    //short	stepdir;    // villsa [STRIFE] removed
-    //short	colormap;   // villsa [STRIFE] removed
-}) mappatch_t;
-
-
-//
-// Texture definition.
-// A DOOM wall texture is a list of patches
-// which are to be combined in a predefined order.
-//
-typedef PACKED_STRUCT (
-{
-    char		name[8];
-    int			masked;	
-    short		width;
-    short		height;
-    //int               obsolete;   // villsa [STRIFE] removed
-    short		patchcount;
-    mappatch_t	patches[1];
-}) maptexture_t;
-
-
-// A single patch from a texture definition,
-//  basically a rectangular area within
-//  the texture rectangle.
-typedef struct
-{
-    // Block origin (allways UL),
-    // which has allready accounted
-    // for the internal origin of the patch.
-    short	originx;	
-    short	originy;
-    int		patch;
-} texpatch_t;
-
-
-// A maptexturedef_t describes a rectangular texture,
-//  which is composed of one or more mappatch_t structures
-//  that arrange graphic patches.
-
-typedef struct texture_s texture_t;
-
-struct texture_s
-{
-    // Keep name for switch changing, etc.
-    char	name[8];		
-    short	width;
-    short	height;
-
-    // Index in textures list
-
-    int         index;
-
-    // Next in hash table chain
-
-    texture_t  *next;
-    
-    // All the patches[patchcount]
-    //  are drawn back to front into the cached texture.
-    short	patchcount;
-    texpatch_t	patches[1];		
-};
-
-
-
-int		firstflat;
-int		lastflat;
-int		numflats;
-
-int		firstpatch;
-int		lastpatch;
-int		numpatches;
-
-int		firstspritelump;
-int		lastspritelump;
-int		numspritelumps;
-
-int		numtextures;
-texture_t**	textures;
-texture_t**     textures_hashtable;
-
-
-int*			texturewidthmask;
-// needed for texture pegging
-fixed_t*		textureheight;		
-int*			texturecompositesize;
-short**			texturecolumnlump;
-unsigned short**	texturecolumnofs;
-byte**			texturecomposite;
-
-// for global animation
-int*		flattranslation;
-int*		texturetranslation;
-
-// needed for pre rendering
-fixed_t*	spritewidth;	
-fixed_t*	spriteoffset;
-fixed_t*	spritetopoffset;
-
-lighttable_t	*colormaps;
-
-
-//
-// MAPTEXTURE_T CACHING
-// When a texture is first needed,
-//  it counts the number of composite columns
-//  required in the texture and allocates space
-//  for a column directory and any new columns.
-// The directory will simply point inside other patches
-//  if there is only one patch in a given column,
-//  but any columns with multiple patches
-//  will have new column_ts generated.
-//
-
-
-
-//
-// R_DrawColumnInCache
-// Clip and draw a column
-//  from a patch into a cached post.
-//
-void
-R_DrawColumnInCache
-( column_t*	patch,
-  byte*		cache,
-  int		originy,
-  int		cacheheight )
-{
-    int		count;
-    int		position;
-    byte*	source;
-
-    while (patch->topdelta != 0xff)
-    {
-	source = (byte *)patch + 3;
-	count = patch->length;
-	position = originy + patch->topdelta;
-
-	if (position < 0)
-	{
-	    count += position;
-	    position = 0;
-	}
-
-	if (position + count > cacheheight)
-	    count = cacheheight - position;
-
-	if (count > 0)
-	    memcpy (cache + position, source, count);
-		
-	patch = (column_t *)(  (byte *)patch + patch->length + 4); 
-    }
-}
-
-
-
-//
-// R_GenerateComposite
-// Using the texture definition,
-//  the composite texture is created from the patches,
-//  and each column is cached.
-//
-void R_GenerateComposite (int texnum)
-{
-    byte*		block;
-    texture_t*		texture;
-    texpatch_t*		patch;	
-    patch_t*		realpatch;
-    int			x;
-    int			x1;
-    int			x2;
-    int			i;
-    column_t*		patchcol;
-    short*		collump;
-    unsigned short*	colofs;
-	
-    texture = textures[texnum];
-
-    block = Z_Malloc (texturecompositesize[texnum],
-		      PU_STATIC, 
-		      &texturecomposite[texnum]);	
-
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-    
-    // Composite the columns together.
-    for (i=0 , patch = texture->patches;
-	 i<texture->patchcount;
-	 i++, patch++)
-    {
-	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
-	x1 = patch->originx;
-	x2 = x1 + SHORT(realpatch->width);
-
-	if (x1<0)
-	    x = 0;
-	else
-	    x = x1;
-	
-	if (x2 > texture->width)
-	    x2 = texture->width;
-
-	for ( ; x<x2 ; x++)
-	{
-	    // Column does not have multiple patches?
-	    if (collump[x] >= 0)
-		continue;
-	    
-	    patchcol = (column_t *)((byte *)realpatch
-				    + LONG(realpatch->columnofs[x-x1]));
-	    R_DrawColumnInCache (patchcol,
-				 block + colofs[x],
-				 patch->originy,
-				 texture->height);
-	}
-						
-    }
-
-    // Now that the texture has been built in column cache,
-    //  it is purgable from zone memory.
-    Z_ChangeTag (block, PU_CACHE);
-}
-
-
-
-//
-// R_GenerateLookup
-//
-void R_GenerateLookup (int texnum)
-{
-    texture_t*		texture;
-    byte*		patchcount;	// patchcount[texture->width]
-    texpatch_t*		patch;	
-    patch_t*		realpatch;
-    int			x;
-    int			x1;
-    int			x2;
-    int			i;
-    short*		collump;
-    unsigned short*	colofs;
-	
-    texture = textures[texnum];
-
-    // Composited texture not created yet.
-    texturecomposite[texnum] = 0;
-    
-    texturecompositesize[texnum] = 0;
-    collump = texturecolumnlump[texnum];
-    colofs = texturecolumnofs[texnum];
-    
-    // Now count the number of columns
-    //  that are covered by more than one patch.
-    // Fill in the lump / offset, so columns
-    //  with only a single patch are all done.
-    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
-    memset (patchcount, 0, texture->width);
-
-    for (i=0 , patch = texture->patches;
-	 i<texture->patchcount;
-	 i++, patch++)
-    {
-	realpatch = W_CacheLumpNum (patch->patch, PU_CACHE);
-	x1 = patch->originx;
-	x2 = x1 + SHORT(realpatch->width);
-	
-	if (x1 < 0)
-	    x = 0;
-	else
-	    x = x1;
-
-	if (x2 > texture->width)
-	    x2 = texture->width;
-	for ( ; x<x2 ; x++)
-	{
-	    patchcount[x]++;
-	    collump[x] = patch->patch;
-	    colofs[x] = LONG(realpatch->columnofs[x-x1])+3;
-	}
-    }
-	
-    for (x=0 ; x<texture->width ; x++)
-    {
-	if (!patchcount[x])
-	{
-	    printf ("R_GenerateLookup: column without a patch (%s)\n",
-		    texture->name);
-	    return;
-	}
-	// I_Error ("R_GenerateLookup: column without a patch");
-	
-	if (patchcount[x] > 1)
-	{
-	    // Use the cached block.
-	    collump[x] = -1;	
-	    colofs[x] = texturecompositesize[texnum];
-	    
-	    if (texturecompositesize[texnum] > 0x10000-texture->height)
-	    {
-		I_Error ("R_GenerateLookup: texture %i is >64k",
-			 texnum);
-	    }
-	    
-	    texturecompositesize[texnum] += texture->height;
-	}
-    }
-
-    Z_Free(patchcount);
-}
-
-
-
-
-//
-// R_GetColumn
-//
-byte*
-R_GetColumn
-( int		tex,
-  int		col )
-{
-    int		lump;
-    int		ofs;
-	
-    col &= texturewidthmask[tex];
-    lump = texturecolumnlump[tex][col];
-    ofs = texturecolumnofs[tex][col];
-    
-    if (lump > 0)
-	return (byte *)W_CacheLumpNum(lump,PU_CACHE)+ofs;
-
-    if (!texturecomposite[tex])
-	R_GenerateComposite (tex);
-
-    return texturecomposite[tex] + ofs;
-}
-
-
-static void GenerateTextureHashTable(void)
-{
-    texture_t **rover;
-    int i;
-    int key;
-
-    textures_hashtable 
-            = Z_Malloc(sizeof(texture_t *) * numtextures, PU_STATIC, 0);
-
-    memset(textures_hashtable, 0, sizeof(texture_t *) * numtextures);
-
-    // Add all textures to hash table
-
-    for (i=0; i<numtextures; ++i)
-    {
-        // Store index
-
-        textures[i]->index = i;
-
-        // Vanilla Doom does a linear search of the texures array
-        // and stops at the first entry it finds.  If there are two
-        // entries with the same name, the first one in the array
-        // wins. The new entry must therefore be added at the end
-        // of the hash chain, so that earlier entries win.
-
-        key = W_LumpNameHash(textures[i]->name) % numtextures;
-
-        rover = &textures_hashtable[key];
-
-        while (*rover != NULL)
-        {
-            rover = &(*rover)->next;
-        }
-
-        // Hook into hash table
-
-        textures[i]->next = NULL;
-        *rover = textures[i];
-    }
-}
-
-
-//
-// R_InitTextures
-// Initializes the texture list
-//  with the textures from the world map.
-//
-void R_InitTextures (void)
-{
-    maptexture_t*	mtexture;
-    texture_t*		texture;
-    mappatch_t*		mpatch;
-    texpatch_t*		patch;
-
-    int			i;
-    int			j;
-
-    int*		maptex;
-    int*		maptex2;
-    int*		maptex1;
-    
-    char		name[9];
-    char*		names;
-    char*		name_p;
-    
-    int*		patchlookup;
-    
-    int			nummappatches;
-    int			offset;
-    int			maxoff;
-    int			maxoff2;
-    int			numtextures1;
-    int			numtextures2;
-
-    int*		directory;
-    
-    int			temp1;
-    int			temp2;
-    int			temp3;
-
-
-    // Load the patch names from pnames.lmp.
-    names = W_CacheLumpName (DEH_String("PNAMES"), PU_STATIC);
-    nummappatches = LONG ( *((int *)names) );
-    name_p = names+4;
-    patchlookup = Z_Malloc(nummappatches*sizeof(*patchlookup), PU_STATIC, NULL);
-
-    for (i = 0; i < nummappatches; i++)
-    {
-        M_StringCopy(name, name_p + i * 8, sizeof(name));
-        patchlookup[i] = W_CheckNumForName (name);
-    }
-    W_ReleaseLumpName(DEH_String("PNAMES"));
-
-    // Load the map texture definitions from textures.lmp.
-    // The data is contained in one or two lumps,
-    //  TEXTURE1 for shareware, plus TEXTURE2 for commercial.
-    maptex = maptex1 = W_CacheLumpName (DEH_String("TEXTURE1"), PU_STATIC);
-    numtextures1 = LONG(*maptex);
-    maxoff = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE1")));
-    directory = maptex+1;
-
-    if (W_CheckNumForName (DEH_String("TEXTURE2")) != -1)
-    {
-        maptex2 = W_CacheLumpName (DEH_String("TEXTURE2"), PU_STATIC);
-        numtextures2 = LONG(*maptex2);
-        maxoff2 = W_LumpLength (W_GetNumForName (DEH_String("TEXTURE2")));
-    }
-    else
-    {
-        maptex2 = NULL;
-        numtextures2 = 0;
-        maxoff2 = 0;
-    }
-    numtextures = numtextures1 + numtextures2;
-
-    textures = Z_Malloc (numtextures * sizeof(*textures), PU_STATIC, 0);
-    texturecolumnlump = Z_Malloc (numtextures * sizeof(*texturecolumnlump), PU_STATIC, 0);
-    texturecolumnofs = Z_Malloc (numtextures * sizeof(*texturecolumnofs), PU_STATIC, 0);
-    texturecomposite = Z_Malloc (numtextures * sizeof(*texturecomposite), PU_STATIC, 0);
-    texturecompositesize = Z_Malloc (numtextures * sizeof(*texturecompositesize), PU_STATIC, 0);
-    texturewidthmask = Z_Malloc (numtextures * sizeof(*texturewidthmask), PU_STATIC, 0);
-    textureheight = Z_Malloc (numtextures * sizeof(*textureheight), PU_STATIC, 0);
-
-    //	Really complex printing shit...
-    temp1 = W_GetNumForName (DEH_String("S_START"));  // P_???????
-    temp2 = W_GetNumForName (DEH_String("S_END")) - 1;
-    temp3 = ((temp2-temp1+63)/64) + ((numtextures+63)/64);
-
-    // If stdout is a real console, use the classic vanilla "filling
-    // up the box" effect, which uses backspace to "step back" inside
-    // the box.  If stdout is a file, don't draw the box.
-
-    // haleyjd 20110206 [STRIFE]: box is in devparm only
-    if (devparm && I_ConsoleStdout())
-    {
-        printf("[");
-        for (i = 0; i < temp3 + 9; i++)
-            printf(" ");
-        printf("]");
-        for (i = 0; i < temp3 + 10; i++)
-            printf("\b");
-    }
-
-    for (i=0 ; i<numtextures ; i++, directory++)
-    {
-        if (!(i&63))
-        {
-            // [STRIFE]: tick intro if not in devparm
-            if(devparm)
-                printf (".");
-            else
-                D_IntroTick();
-        }
-
-        if (i == numtextures1)
-        {
-            // Start looking in second texture file.
-            maptex = maptex2;
-            maxoff = maxoff2;
-            directory = maptex+1;
-        }
-
-        offset = LONG(*directory);
-
-        if (offset > maxoff)
-            I_Error ("R_InitTextures: bad texture directory");
-
-        mtexture = (maptexture_t *) ( (byte *)maptex + offset);
-
-        texture = textures[i] =
-            Z_Malloc (sizeof(texture_t)
-                      + sizeof(texpatch_t)*(SHORT(mtexture->patchcount)-1),
-                      PU_STATIC, 0);
-
-        texture->width = SHORT(mtexture->width);
-        texture->height = SHORT(mtexture->height);
-        texture->patchcount = SHORT(mtexture->patchcount);
-
-        memcpy (texture->name, mtexture->name, sizeof(texture->name));
-        mpatch = &mtexture->patches[0];
-        patch = &texture->patches[0];
-
-        for (j=0 ; j<texture->patchcount ; j++, mpatch++, patch++)
-        {
-            patch->originx = SHORT(mpatch->originx);
-            patch->originy = SHORT(mpatch->originy);
-            patch->patch = patchlookup[SHORT(mpatch->patch)];
-            if (patch->patch == -1)
-            {
-                I_Error ("R_InitTextures: Missing patch in texture %s",
-                         texture->name);
-            }
-        }		
-        texturecolumnlump[i] = Z_Malloc (texture->width*sizeof(**texturecolumnlump), PU_STATIC,0);
-        texturecolumnofs[i] = Z_Malloc (texture->width*sizeof(**texturecolumnofs), PU_STATIC,0);
-
-        j = 1;
-        while (j*2 <= texture->width)
-            j<<=1;
-
-        texturewidthmask[i] = j-1;
-        textureheight[i] = texture->height<<FRACBITS;
-    }
-
-    Z_Free(patchlookup);
-
-    W_ReleaseLumpName(DEH_String("TEXTURE1"));
-    if (maptex2)
-        W_ReleaseLumpName(DEH_String("TEXTURE2"));
-
-    // Precalculate whatever possible.	
-
-    for (i=0 ; i<numtextures ; i++)
-    {
-        // [STRIFE]: tick intro
-        if(!(i & 63))
-            D_IntroTick();
-        R_GenerateLookup (i);
-    }
-
-    // Create translation table for global animation.
-    texturetranslation = Z_Malloc ((numtextures+1)*sizeof(*texturetranslation), PU_STATIC, 0);
-
-    for (i=0 ; i<numtextures ; i++)
-        texturetranslation[i] = i;
-
-    GenerateTextureHashTable();
-}
-
-
-
-//
-// R_InitFlats
-//
-void R_InitFlats (void)
-{
-    int		i;
-	
-    firstflat = W_GetNumForName (DEH_String("F_START")) + 1;
-    lastflat = W_GetNumForName (DEH_String("F_END")) - 1;
-    numflats = lastflat - firstflat + 1;
-	
-    // Create translation table for global animation.
-    flattranslation = Z_Malloc ((numflats+1)*sizeof(*flattranslation), PU_STATIC, 0);
-    
-    for (i=0 ; i<numflats ; i++)
-	flattranslation[i] = i;
-}
-
-
-//
-// R_InitSpriteLumps
-// Finds the width and hoffset of all sprites in the wad,
-//  so the sprite does not need to be cached completely
-//  just for having the header info ready during rendering.
-//
-void R_InitSpriteLumps (void)
-{
-    int		i;
-    patch_t	*patch;
-
-    firstspritelump = W_GetNumForName (DEH_String("S_START")) + 1;
-    lastspritelump = W_GetNumForName (DEH_String("S_END")) - 1;
-
-    numspritelumps = lastspritelump - firstspritelump + 1;
-    spritewidth = Z_Malloc (numspritelumps*sizeof(*spritewidth), PU_STATIC, 0);
-    spriteoffset = Z_Malloc (numspritelumps*sizeof(*spriteoffset), PU_STATIC, 0);
-    spritetopoffset = Z_Malloc (numspritelumps*sizeof(*spritetopoffset), PU_STATIC, 0);
-
-    for (i=0 ; i< numspritelumps ; i++)
-    {
-        if(!(i&63))
-        {
-            // [STRIFE] tick intro if not in devparm
-            if(devparm)
-                printf (".");
-            else
-                D_IntroTick();
-        }
-
-        patch = W_CacheLumpNum (firstspritelump+i, PU_CACHE);
-        spritewidth[i] = SHORT(patch->width)<<FRACBITS;
-        spriteoffset[i] = SHORT(patch->leftoffset)<<FRACBITS;
-        spritetopoffset[i] = SHORT(patch->topoffset)<<FRACBITS;
-    }
-}
-
-
-
-//
-// R_InitColormaps
-//
-void R_InitColormaps (void)
-{
-    int	lump;
-
-    // Load in the light tables, 256 byte align tables.
-    lump = W_GetNumForName(DEH_String("COLORMAP"));
-    colormaps = W_CacheLumpNum(lump, PU_STATIC);
-}
-
-
-
-//
-// R_InitData
-// Locates all the lumps
-//  that will be used by all views
-// Must be called after W_Init.
-//
-void R_InitData (void)
-{
-    R_InitTextures ();
-    if(devparm)
-        printf (".");
-    else
-        D_IntroTick(); // [STRIFE] tick intro
-
-    R_InitFlats ();
-    if(devparm)
-        printf (".");
-    else
-        D_IntroTick();
-
-    R_InitSpriteLumps ();
-    if(devparm)
-        printf (".");
-    else
-        D_IntroTick();
-
-    R_InitColormaps ();
-}
-
-
-
-//
-// R_FlatNumForName
-// Retrieval, get a flat number for a flat name.
-//
-int R_FlatNumForName(const char *name)
-{
-    int		i;
-    char	namet[9];
-
-    i = W_CheckNumForName (name);
-
-    if (i == -1)
-    {
-	namet[8] = 0;
-	memcpy (namet, name,8);
-	I_Error ("R_FlatNumForName: %s not found",namet);
-    }
-    return i - firstflat;
-}
-
-
-
-
-//
-// R_CheckTextureNumForName
-// Check whether texture is available.
-// Filter out NoTexture indicator.
-//
-int	R_CheckTextureNumForName(const char *name)
-{
-    texture_t *texture;
-    int key;
-
-    // "NoTexture" marker.
-    if (name[0] == '-')		
-	return 0;
-		
-    key = W_LumpNameHash(name) % numtextures;
-
-    texture=textures_hashtable[key]; 
-    
-    while (texture != NULL)
-    {
-	if (!strncasecmp (texture->name, name, 8) )
-	    return texture->index;
-
-        texture = texture->next;
-    }
-    
-    return -1;
-}
-
-
-
-//
-// R_TextureNumForName
-// Calls R_CheckTextureNumForName,
-//  aborts with error message.
-//
-int	R_TextureNumForName (const char* name)
-{
-    int		i;
-	
-    i = R_CheckTextureNumForName (name);
-
-    if (i==-1)
-    {
-	I_Error ("R_TextureNumForName: %s not found",
-		 name);
-    }
-    return i;
-}
-
-//
-// R_SoundNumForDoor
-//
-// villsa [STRIFE] - new function
-// Set sounds associated with door though why
-// on earth is this function placed here?
-//
-void R_SoundNumForDoor(vldoor_t* door)
-{
-    int         i;
-    sector_t    *sector;
-    line_t      *line;
-    texture_t   *texture;
-    char        name[8];
-    char        c1;
-    char        c2;
-
-    // set default sounds
-    door->opensound = sfx_drsmto;
-    door->closesound = sfx_drsmtc;
-
-    for(sector = door->sector, i = 0; i < sector->linecount; i++)
-    {
-        line = sector->lines[i];
-
-        if(!(line->flags & ML_TWOSIDED))
-            continue;
-
-        texture = textures[sides[line->sidenum[0]].toptexture];
-        memcpy(name, texture->name, 8);
-
-        if(strncmp(name, "DOR", 3))
-            continue;
-
-        c1 = name[3];
-        c2 = name[4];
-
-        // S type
-        if(c1 == 'S')
-        {
-            door->opensound = sfx_drston;
-            door->closesound = sfx_drston;
-            return;
-        }
-
-        // M type
-        if(c1 == 'M')
-        {
-            // L subtype
-            if(c2 == 'L')
-            {
-                door->opensound = sfx_drlmto;
-                door->closesound = sfx_drlmtc;
-            }
-            // S subtype
-            else if(c2 == 'S')
-            {
-                door->opensound = sfx_drsmto;
-                door->closesound = sfx_drsmtc;
-            }
-            return;
-        }
-        // W type
-        else if(c1 == 'W')
-        {
-            // L subtype
-            if(c2 == 'L')
-            {
-                door->opensound = sfx_drlwud;
-                door->closesound = sfx_drlwud;
-            }
-            // S subtype
-            else if(c2 == 'S')
-            {
-                door->opensound = sfx_drswud;
-                door->closesound = sfx_drswud;
-            }
-            return;
-        }
-    }
-}
-
-
-
-
-//
-// R_PrecacheLevel
-// Preloads all relevant graphics for the level.
-//
-int		flatmemory;
-int		texturememory;
-int		spritememory;
-
-void R_PrecacheLevel (void)
-{
-    char*		flatpresent;
-    char*		texturepresent;
-    char*		spritepresent;
-
-    int			i;
-    int			j;
-    int			k;
-    int			lump;
-    
-    texture_t*		texture;
-    thinker_t*		th;
-    spriteframe_t*	sf;
-
-    if (demoplayback)
-	return;
-    
-    // Precache flats.
-    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
-    memset (flatpresent,0,numflats);	
-
-    for (i=0 ; i<numsectors ; i++)
-    {
-	flatpresent[sectors[i].floorpic] = 1;
-	flatpresent[sectors[i].ceilingpic] = 1;
-    }
-	
-    flatmemory = 0;
-
-    for (i=0 ; i<numflats ; i++)
-    {
-	if (flatpresent[i])
-	{
-	    lump = firstflat + i;
-	    flatmemory += lumpinfo[lump]->size;
-	    W_CacheLumpNum(lump, PU_CACHE);
-	}
-    }
-
-    Z_Free(flatpresent);
-    
-    // Precache textures.
-    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
-    memset (texturepresent,0, numtextures);
-	
-    for (i=0 ; i<numsides ; i++)
-    {
-	texturepresent[sides[i].toptexture] = 1;
-	texturepresent[sides[i].midtexture] = 1;
-	texturepresent[sides[i].bottomtexture] = 1;
-    }
-
-    // Sky texture is always present.
-    // Note that F_SKY1 is the name used to
-    //  indicate a sky floor/ceiling as a flat,
-    //  while the sky texture is stored like
-    //  a wall texture, with an episode dependend
-    //  name.
-    texturepresent[skytexture] = 1;
-	
-    texturememory = 0;
-    for (i=0 ; i<numtextures ; i++)
-    {
-	if (!texturepresent[i])
-	    continue;
-
-	texture = textures[i];
-	
-	for (j=0 ; j<texture->patchcount ; j++)
-	{
-	    lump = texture->patches[j].patch;
-	    texturememory += lumpinfo[lump]->size;
-	    W_CacheLumpNum(lump , PU_CACHE);
-	}
-    }
-
-    Z_Free(texturepresent);
-    
-    // Precache sprites.
-    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
-    memset (spritepresent,0, numsprites);
-	
-    for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
-    {
-	if (th->function.acp1 == (actionf_p1)P_MobjThinker)
-	    spritepresent[((mobj_t *)th)->sprite] = 1;
-    }
-	
-    spritememory = 0;
-    for (i=0 ; i<numsprites ; i++)
-    {
-	if (!spritepresent[i])
-	    continue;
-
-	for (j=0 ; j<sprites[i].numframes ; j++)
-	{
-	    sf = &sprites[i].spriteframes[j];
-	    for (k=0 ; k<8 ; k++)
-	    {
-		lump = firstspritelump + sf->lump[k];
-		spritememory += lumpinfo[lump]->size;
-		W_CacheLumpNum(lump , PU_CACHE);
-	    }
-	}
-    }
-
-    Z_Free(spritepresent);
-}
-
-
-
-
diff --git a/games/NXDoom/src/strife/r_data.h b/games/NXDoom/src/strife/r_data.h
deleted file mode 100644
index efeb4f753..000000000
--- a/games/NXDoom/src/strife/r_data.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Refresh module, data I/O, caching, retrieval of graphics
-//  by name.
-//
-
-
-#ifndef __R_DATA__
-#define __R_DATA__
-
-#include "r_defs.h"
-#include "r_state.h"
-#include "p_spec.h"    // villsa [STRIFE]
-
-
-extern int numflats;
-
-
-// Retrieve column data for span blitting.
-byte*
-R_GetColumn
-( int		tex,
-  int		col );
-
-
-// I/O, setting up the stuff.
-void R_InitData (void);
-void R_PrecacheLevel (void);
-
-
-// Retrieval.
-// Floor/ceiling opaque texture tiles,
-// lookup by name. For animation?
-int R_FlatNumForName(const char *name);
-
-
-// Called by P_Ticker for switches and animations,
-// returns the texture number for the texture name.
-int R_TextureNumForName (const char *name);
-int R_CheckTextureNumForName (const char *name);
-void R_SoundNumForDoor(vldoor_t* door); // villsa [STRIFE]
-
-#endif
diff --git a/games/NXDoom/src/strife/r_defs.h b/games/NXDoom/src/strife/r_defs.h
deleted file mode 100644
index a64ac8424..000000000
--- a/games/NXDoom/src/strife/r_defs.h
+++ /dev/null
@@ -1,448 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Refresh/rendering module, shared data struct definitions.
-//
-
-
-#ifndef __R_DEFS__
-#define __R_DEFS__
-
-
-// Screenwidth.
-#include "doomdef.h"
-
-// Some more or less basic data types
-// we depend on.
-#include "m_fixed.h"
-
-// We rely on the thinker data struct
-// to handle sound origins in sectors.
-#include "d_think.h"
-// SECTORS do store MObjs anyway.
-#include "p_mobj.h"
-
-#include "i_video.h"
-
-#include "v_patch.h"
-
-
-
-
-// Silhouette, needed for clipping Segs (mainly)
-// and sprites representing things.
-#define SIL_NONE		0
-#define SIL_BOTTOM		1
-#define SIL_TOP			2
-#define SIL_BOTH		3
-
-#define MAXDRAWSEGS		256
-
-
-
-
-
-//
-// INTERNAL MAP TYPES
-//  used by play and refresh
-//
-
-//
-// Your plain vanilla vertex.
-// Note: transformed values not buffered locally,
-//  like some DOOM-alikes ("wt", "WebView") did.
-//
-typedef struct
-{
-    fixed_t	x;
-    fixed_t	y;
-    
-} vertex_t;
-
-
-// Forward of LineDefs, for Sectors.
-struct line_s;
-
-// Each sector has a degenmobj_t in its center
-//  for sound origin purposes.
-// I suppose this does not handle sound from
-//  moving objects (doppler), because
-//  position is prolly just buffered, not
-//  updated.
-typedef struct
-{
-    thinker_t		thinker;	// not used for anything
-    fixed_t		x;
-    fixed_t		y;
-    fixed_t		z;
-
-} degenmobj_t;
-
-//
-// The SECTORS record, at runtime.
-// Stores things/mobjs.
-//
-typedef	struct
-{
-    fixed_t	floorheight;
-    fixed_t	ceilingheight;
-    short	floorpic;
-    short	ceilingpic;
-    short	lightlevel;
-    short	special;
-    short	tag;
-
-    // 0 = untraversed, 1,2 = sndlines -1
-    int		soundtraversed;
-
-    // thing that made a sound (or null)
-    mobj_t*	soundtarget;
-
-    // mapblock bounding box for height changes
-    int		blockbox[4];
-
-    // origin for any sounds played by the sector
-    degenmobj_t	soundorg;
-
-    // if == validcount, already checked
-    int		validcount;
-
-    // list of mobjs in sector
-    mobj_t*	thinglist;
-
-    // thinker_t for reversable actions
-    void*	specialdata;
-
-    int			linecount;
-    struct line_s**	lines;	// [linecount] size
-    
-} sector_t;
-
-
-
-
-//
-// The SideDef.
-//
-
-typedef struct
-{
-    // add this to the calculated texture column
-    fixed_t	textureoffset;
-    
-    // add this to the calculated texture top
-    fixed_t	rowoffset;
-
-    // Texture indices.
-    // We do not maintain names here. 
-    short	toptexture;
-    short	bottomtexture;
-    short	midtexture;
-
-    // Sector the SideDef is facing.
-    sector_t*	sector;
-    
-} side_t;
-
-
-
-//
-// Move clipping aid for LineDefs.
-//
-typedef enum
-{
-    ST_HORIZONTAL,
-    ST_VERTICAL,
-    ST_POSITIVE,
-    ST_NEGATIVE
-
-} slopetype_t;
-
-
-
-typedef struct line_s
-{
-    // Vertices, from v1 to v2.
-    vertex_t*	v1;
-    vertex_t*	v2;
-
-    // Precalculated v2 - v1 for side checking.
-    fixed_t	dx;
-    fixed_t	dy;
-
-    // Animation related.
-    short	flags;
-    short	special;
-    short	tag;
-
-    // Visual appearance: SideDefs.
-    //  sidenum[1] will be -1 if one sided
-    short	sidenum[2];			
-
-    // Neat. Another bounding box, for the extent
-    //  of the LineDef.
-    fixed_t	bbox[4];
-
-    // To aid move clipping.
-    slopetype_t	slopetype;
-
-    // Front and back sector.
-    // Note: redundant? Can be retrieved from SideDefs.
-    sector_t*	frontsector;
-    sector_t*	backsector;
-
-    // if == validcount, already checked
-    int		validcount;
-
-    // thinker_t for reversable actions
-    void*	specialdata;		
-} line_t;
-
-
-
-
-//
-// A SubSector.
-// References a Sector.
-// Basically, this is a list of LineSegs,
-//  indicating the visible walls that define
-//  (all or some) sides of a convex BSP leaf.
-//
-typedef struct subsector_s
-{
-    sector_t*	sector;
-    short	numlines;
-    short	firstline;
-    
-} subsector_t;
-
-
-
-//
-// The LineSeg.
-//
-typedef struct
-{
-    vertex_t*	v1;
-    vertex_t*	v2;
-    
-    fixed_t	offset;
-
-    angle_t	angle;
-
-    side_t*	sidedef;
-    line_t*	linedef;
-
-    // Sector references.
-    // Could be retrieved from linedef, too.
-    // backsector is NULL for one sided lines
-    sector_t*	frontsector;
-    sector_t*	backsector;
-    
-} seg_t;
-
-
-
-//
-// BSP node.
-//
-typedef struct
-{
-    // Partition line.
-    fixed_t	x;
-    fixed_t	y;
-    fixed_t	dx;
-    fixed_t	dy;
-
-    // Bounding box for each child.
-    fixed_t	bbox[2][4];
-
-    // If NF_SUBSECTOR its a subsector.
-    unsigned short children[2];
-    
-} node_t;
-
-
-
-
-// PC direct to screen pointers
-//B UNUSED - keep till detailshift in r_draw.c resolved
-//extern byte*	destview;
-//extern byte*	destscreen;
-
-
-
-
-
-//
-// OTHER TYPES
-//
-
-// This could be wider for >8 bit display.
-// Indeed, true color support is posibble
-//  precalculating 24bpp lightmap/colormap LUT.
-//  from darkening PLAYPAL to all black.
-// Could even us emore than 32 levels.
-typedef byte	lighttable_t;	
-
-
-
-
-//
-// ?
-//
-typedef struct drawseg_s
-{
-    seg_t*		curline;
-    int			x1;
-    int			x2;
-
-    fixed_t		scale1;
-    fixed_t		scale2;
-    fixed_t		scalestep;
-
-    // 0=none, 1=bottom, 2=top, 3=both
-    int			silhouette;
-
-    // do not clip sprites above this
-    fixed_t		bsilheight;
-
-    // do not clip sprites below this
-    fixed_t		tsilheight;
-    
-    // Pointers to lists for sprite clipping,
-    //  all three adjusted so [x1] is first value.
-    short*		sprtopclip;		
-    short*		sprbottomclip;	
-    short*		maskedtexturecol;
-    
-} drawseg_t;
-
-
-
-// A vissprite_t is a thing
-//  that will be drawn during a refresh.
-// I.e. a sprite object that is partly visible.
-typedef struct vissprite_s
-{
-    // Doubly linked list.
-    struct vissprite_s*	prev;
-    struct vissprite_s*	next;
-    
-    int			x1;
-    int			x2;
-
-    // for line side calculation
-    fixed_t		gx;
-    fixed_t		gy;		
-
-    // global bottom / top for silhouette clipping
-    fixed_t		gz;
-    fixed_t		gzt;
-
-    // horizontal position of x1
-    fixed_t		startfrac;
-    
-    fixed_t		scale;
-    
-    // negative if flipped
-    fixed_t		xiscale;	
-
-    fixed_t		texturemid;
-    int			patch;
-
-    // for color translation and shadow draw,
-    //  maxbright frames as well
-    lighttable_t*	colormap;
-   
-    int			mobjflags;
-    
-} vissprite_t;
-
-
-//	
-// Sprites are patches with a special naming convention
-//  so they can be recognized by R_InitSprites.
-// The base name is NNNNFx or NNNNFxFx, with
-//  x indicating the rotation, x = 0, 1-7.
-// The sprite and frame specified by a thing_t
-//  is range checked at run time.
-// A sprite is a patch_t that is assumed to represent
-//  a three dimensional object and may have multiple
-//  rotations pre drawn.
-// Horizontal flipping is used to save space,
-//  thus NNNNF2F5 defines a mirrored patch.
-// Some sprites will only have one picture used
-// for all views: NNNNF0
-//
-typedef struct
-{
-    // If false use 0 for any position.
-    // Note: as eight entries are available,
-    //  we might as well insert the same name eight times.
-    boolean	rotate;
-
-    // Lump to use for view angles 0-7.
-    short	lump[8];
-
-    // Flip bit (1 = flip) to use for view angles 0-7.
-    byte	flip[8];
-    
-} spriteframe_t;
-
-
-
-//
-// A sprite definition:
-//  a number of animation frames.
-//
-typedef struct
-{
-    int			numframes;
-    spriteframe_t*	spriteframes;
-
-} spritedef_t;
-
-
-
-//
-// Now what is a visplane, anyway?
-// 
-typedef struct
-{
-  fixed_t		height;
-  int			picnum;
-  int			lightlevel;
-  int			minx;
-  int			maxx;
-  
-  // leave pads for [minx-1]/[maxx+1]
-  
-  byte		pad1;
-  // Here lies the rub for all
-  //  dynamic resize/change of resolution.
-  byte		top[SCREENWIDTH];
-  byte		pad2;
-  byte		pad3;
-  // See above.
-  byte		bottom[SCREENWIDTH];
-  byte		pad4;
-
-} visplane_t;
-
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_draw.c b/games/NXDoom/src/strife/r_draw.c
deleted file mode 100644
index de6d1d0a9..000000000
--- a/games/NXDoom/src/strife/r_draw.c
+++ /dev/null
@@ -1,968 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The actual span/column drawing functions.
-//	Here find the main potential for optimization,
-//	 e.g. inline assembly, different algorithms.
-//
-
-
-
-
-#include "doomdef.h"
-#include "deh_main.h"
-
-#include "i_system.h"
-#include "z_zone.h"
-#include "w_wad.h"
-
-#include "r_local.h"
-
-// Needs access to LFB (guess what).
-#include "v_video.h"
-
-// State.
-#include "doomstat.h"
-
-
-// ?
-#define MAXWIDTH			1120
-#define MAXHEIGHT			832
-
-// status bar height at bottom of screen
-// haleyjd 08/31/10: Verified unmodified.
-#define SBARHEIGHT              32
-
-//
-// All drawing to the view buffer is accomplished in this file.
-// The other refresh files only know about ccordinates,
-//  not the architecture of the frame buffer.
-// Conveniently, the frame buffer is a linear one,
-//  and we need only the base address,
-//  and the total size == width*height*depth/8.,
-//
-
-
-byte*		viewimage; 
-int		viewwidth;
-int		scaledviewwidth;
-int		viewheight;
-int		viewwindowx;
-int		viewwindowy; 
-byte*		ylookup[MAXHEIGHT]; 
-int		columnofs[MAXWIDTH]; 
-
-// Color tables for different players,
-//  translate a limited part to another
-//  (color ramps used for  suit colors).
-//
-// [STRIFE] Unused.
-//byte          translations[3][256];	
- 
-// Backing buffer containing the bezel drawn around the screen and 
-// surrounding background.
-
-static byte *background_buffer = NULL;
-
-// haleyjd 08/29/10: [STRIFE] Rogue added the ability to customize the view
-// border flat by storing it in the configuration file.
-char *back_flat = "F_PAVE01";
-
-//
-// R_DrawColumn
-// Source is the top of the column to scale.
-//
-lighttable_t*		dc_colormap; 
-int			dc_x; 
-int			dc_yl; 
-int			dc_yh; 
-fixed_t			dc_iscale; 
-fixed_t			dc_texturemid;
-
-// first pixel in a column (possibly virtual) 
-byte*			dc_source;		
-
-// just for profiling 
-int			dccount;
-
-//
-// A column is a vertical slice/span from a wall texture that,
-//  given the DOOM style restrictions on the view orientation,
-//  will always have constant z depth.
-// Thus a special case loop for very fast rendering can
-//  be used. It has also been used with Wolfenstein 3D.
-// 
-void R_DrawColumn (void) 
-{ 
-    int			count; 
-    byte*		dest; 
-    fixed_t		frac;
-    fixed_t		fracstep;	 
- 
-    count = dc_yh - dc_yl; 
-
-    // Zero length, column does not exceed a pixel.
-    if (count < 0) 
-	return; 
-				 
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-	|| dc_yl < 0
-	|| dc_yh >= SCREENHEIGHT) 
-	I_Error ("R_DrawColumn: %i to %i at %i", dc_yl, dc_yh, dc_x); 
-#endif 
-
-    // Framebuffer destination address.
-    // Use ylookup LUT to avoid multiply with ScreenWidth.
-    // Use columnofs LUT for subwindows? 
-    dest = ylookup[dc_yl] + columnofs[dc_x];  
-
-    // Determine scaling,
-    //  which is the only mapping to be done.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    // Inner loop that does the actual texture mapping,
-    //  e.g. a DDA-lile scaling.
-    // This is as fast as it gets.
-    do 
-    {
-	// Re-map color indices from wall texture column
-	//  using a lighting/special effects LUT.
-	*dest = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
-	
-	dest += SCREENWIDTH; 
-	frac += fracstep;
-	
-    } while (count--); 
-} 
-
-
-
-// UNUSED.
-// Loop unrolled.
-#if 0
-void R_DrawColumn (void) 
-{ 
-    int			count; 
-    byte*		source;
-    byte*		dest;
-    byte*		colormap;
-    
-    unsigned		frac;
-    unsigned		fracstep;
-    unsigned		fracstep2;
-    unsigned		fracstep3;
-    unsigned		fracstep4;	 
- 
-    count = dc_yh - dc_yl + 1; 
-
-    source = dc_source;
-    colormap = dc_colormap;		 
-    dest = ylookup[dc_yl] + columnofs[dc_x];  
-	 
-    fracstep = dc_iscale<<9; 
-    frac = (dc_texturemid + (dc_yl-centery)*dc_iscale)<<9; 
- 
-    fracstep2 = fracstep+fracstep;
-    fracstep3 = fracstep2+fracstep;
-    fracstep4 = fracstep3+fracstep;
-	
-    while (count >= 8) 
-    { 
-	dest[0] = colormap[source[frac>>25]]; 
-	dest[SCREENWIDTH] = colormap[source[(frac+fracstep)>>25]]; 
-	dest[SCREENWIDTH*2] = colormap[source[(frac+fracstep2)>>25]]; 
-	dest[SCREENWIDTH*3] = colormap[source[(frac+fracstep3)>>25]];
-	
-	frac += fracstep4; 
-
-	dest[SCREENWIDTH*4] = colormap[source[frac>>25]]; 
-	dest[SCREENWIDTH*5] = colormap[source[(frac+fracstep)>>25]]; 
-	dest[SCREENWIDTH*6] = colormap[source[(frac+fracstep2)>>25]]; 
-	dest[SCREENWIDTH*7] = colormap[source[(frac+fracstep3)>>25]]; 
-
-	frac += fracstep4; 
-	dest += SCREENWIDTH*8; 
-	count -= 8;
-    } 
-	
-    while (count > 0)
-    { 
-	*dest = colormap[source[frac>>25]]; 
-	dest += SCREENWIDTH; 
-	frac += fracstep; 
-	count--;
-    } 
-}
-#endif
-
-// haleyjd 09/06/10 [STRIFE] Removed low detail
-
-//
-// Spectre/Invisibility.
-//
-
-// haleyjd 09/06/10: ]STRIFE] replaced fuzzdraw with translucency.
-
-//
-// R_DrawMVisTLColumn
-//
-// villsa [STRIFE] new function
-// Replacement for R_DrawFuzzColumn
-//
-void R_DrawMVisTLColumn(void)
-{
-    int                 count; 
-    byte*               dest; 
-    fixed_t             frac;
-    fixed_t             fracstep;
-
-    // Adjust borders. Low... 
-    if (!dc_yl) 
-        dc_yl = 1;
-
-    // .. and high.
-    if (dc_yh == viewheight-1) 
-        dc_yh = viewheight - 2; 
-
-    count = dc_yh - dc_yl; 
-
-    // Zero length.
-    if (count < 0) 
-        return; 
-
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-        || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-    {
-        I_Error ("R_DrawFuzzColumn: %i to %i at %i",
-                 dc_yl, dc_yh, dc_x);
-    }
-#endif
-    
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    // Looks familiar.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    do
-    {
-        byte src = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
-        byte col = xlatab[*dest + (src << 8)];
-        *dest = col;
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    } while(count--);
-}
-
-//
-// R_DrawTLColumn
-//
-// villsa [STRIFE] new function
-// Achieves a second translucency level using the same lookup table,
-// via inversion of the colors in the index computation.
-//
-void R_DrawTLColumn(void)
-{
-    int                 count; 
-    byte*               dest; 
-    fixed_t             frac;
-    fixed_t             fracstep;	 
-
-    // Adjust borders. Low... 
-    if (!dc_yl) 
-        dc_yl = 1;
-
-    // .. and high.
-    if (dc_yh == viewheight-1) 
-        dc_yh = viewheight - 2; 
-
-    count = dc_yh - dc_yl; 
-
-    // Zero length.
-    if (count < 0) 
-        return; 
-
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-        || dc_yl < 0 || dc_yh >= SCREENHEIGHT)
-    {
-        I_Error ("R_DrawFuzzColumn2: %i to %i at %i",
-                 dc_yl, dc_yh, dc_x);
-    }
-#endif
-    
-    dest = ylookup[dc_yl] + columnofs[dc_x];
-
-    // Looks familiar.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    do
-    {
-        byte src = dc_colormap[dc_source[(frac>>FRACBITS)&127]];
-        byte col = xlatab[(*dest << 8) + src];
-        *dest = col;
-        dest += SCREENWIDTH;
-        frac += fracstep;
-    } while(count--);
-}
-  
- 
-
-//
-// R_DrawTranslatedColumn
-// Used to draw player sprites
-//  with the green colorramp mapped to others.
-// Could be used with different translation
-//  tables, e.g. the lighter colored version
-//  of the BaronOfHell, the HellKnight, uses
-//  identical sprites, kinda brightened up.
-//
-byte*	dc_translation;
-byte*	translationtables;
-
-void R_DrawTranslatedColumn (void) 
-{ 
-    int                 count; 
-    byte*               dest; 
-    fixed_t             frac;
-    fixed_t             fracstep;
-
-    count = dc_yh - dc_yl; 
-    if (count < 0) 
-        return; 
-
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-        || dc_yl < 0
-        || dc_yh >= SCREENHEIGHT)
-    {
-        I_Error ( "R_DrawColumn: %i to %i at %i",
-                 dc_yl, dc_yh, dc_x);
-    }
-
-#endif 
-
-    dest = ylookup[dc_yl] + columnofs[dc_x]; 
-
-    // Looks familiar.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    // Here we do an additional index re-mapping.
-    do 
-    {
-        // Translation tables are used
-        //  to map certain colorramps to other ones,
-        //  used with PLAY sprites.
-        // Thus the "green" ramp of the player 0 sprite
-        //  is mapped to gray, red, black/indigo. 
-        *dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
-        dest += SCREENWIDTH;
-        frac += fracstep; 
-    } while (count--); 
-} 
-
-// haleyjd 09/06/10 [STRIFE] Removed low detail
-
-//
-// R_DrawTRTLColumn
-//
-// villsa [STRIFE] new function
-// Combines translucency and color translation.
-//
-void R_DrawTRTLColumn(void)
-{
-    int                 count; 
-    byte*               dest; 
-    fixed_t             frac;
-    fixed_t             fracstep;
-
-    count = dc_yh - dc_yl; 
-    if (count < 0) 
-        return; 
-
-#ifdef RANGECHECK 
-    if ((unsigned)dc_x >= SCREENWIDTH
-        || dc_yl < 0
-        || dc_yh >= SCREENHEIGHT)
-    {
-        I_Error ( "R_DrawColumn: %i to %i at %i",
-                 dc_yl, dc_yh, dc_x);
-    }
-#endif 
-
-    dest = ylookup[dc_yl] + columnofs[dc_x]; 
-
-    // Looks familiar.
-    fracstep = dc_iscale; 
-    frac = dc_texturemid + (dc_yl-centery)*fracstep; 
-
-    // Here we do an additional index re-mapping.
-    do 
-    {
-        byte src = dc_colormap[dc_translation[dc_source[frac>>FRACBITS&127]]];
-        byte col = xlatab[(*dest << 8) + src];
-        *dest = col;
-        dest += SCREENWIDTH;
-        frac += fracstep; 
-    } while (count--); 
-}
-
-
-//
-// R_InitTranslationTables
-// Creates the translation tables to map
-//  the green color ramp to gray, brown, red.
-// Assumes a given structure of the PLAYPAL.
-// Could be read from a lump instead.
-//
-// haleyjd 08/26/10: [STRIFE]
-// * Added loading of XLATAB
-//
-void R_InitTranslationTables (void)
-{
-    int i;
-    byte col1, col2;
-
-    // [STRIFE] Load xlatab. Here's how Rogue did it:
-    //   v7 = W_CacheLumpName("XLATAB", PU_CACHE); // note potential cache bug...
-    //   HIWORD(v8) = (Z_Malloc(131072, PU_STATIC, NULL) + 65535) >> 16;
-    //   LOWORD(v8) = 0; // aligning to a 64K boundary, as if this is Wolf3D.
-    //   xlatab = v8;
-    //   memcpy(v8, v7, 65536);
-    // As you can see, they copypasta'd id's unnecessary 64K boundary alignment
-    // from the colormap code. Since this doesn't accomplish anything, and isn't
-    // strictly portable, all we need to do is this:
-
-    // villsa [STRIFE] 09/26/10: load table through this function instead
-    V_LoadXlaTable();
-
-    // villsa [STRIFE] allocate a larger size for translation tables
-    translationtables = Z_Malloc (256*8, PU_STATIC, 0);
-
-    col1 = 0xFA;
-    col2 = 0xE0;
-
-    // villsa [STRIFE] setup all translation tables
-    for(i = 0; i < 256; i++)
-    {
-        if(i >= 0x80 && i <= 0x8f)
-        {
-            translationtables [i      ] = (i & 0x0f) + 64;
-            translationtables [i+  256] = (i & 0x0f) - 80;
-            translationtables [i+2*256] = (i & 0x0f) + 16;
-            translationtables [i+3*256] = (i & 0x0f) + 48;
-            translationtables [i+4*256] = (i & 0x0f) + 80;
-            translationtables [i+5*256] = (i & 0x0f) + 96;
-            translationtables [i+6*256] = (i & 0x0f) - 112;
-        }
-        else if(i >= 0x50 && i<= 0x5f)
-        {
-            translationtables [i      ] = i;
-            translationtables [i+  256] = i;
-            translationtables [i+2*256] = i;
-            translationtables [i+3*256] = i;
-            translationtables [i+4*256] = (i & 0x0f) + 0x80;
-            translationtables [i+5*256] = (i & 0x0f) + 16;
-            translationtables [i+6*256] = (i & 0x0f) + 64;
-        }
-        else if(i >= 0xd0 && i<= 0xdf)
-        {
-            translationtables [i      ] = i;
-            translationtables [i+  256] = i;
-            translationtables [i+2*256] = i;
-            translationtables [i+3*256] = i;
-            translationtables [i+4*256] = (i & 0x0f) - 80;
-            translationtables [i+5*256] = (i & 0x0f) + 48;
-            translationtables [i+6*256] = (i & 0x0f) + 16;
-        }
-        else if(i >= 0xc0 && i<= 0xcf)
-        {
-            translationtables [i      ] = i;
-            translationtables [i+  256] = i;
-            translationtables [i+2*256] = i;
-            translationtables [i+3*256] = i;
-            translationtables [i+4*256] = (i & 0x0f) - 96;
-            translationtables [i+5*256] = (i & 0x0f) + 32;
-            translationtables [i+6*256] = (i & 0x0f);
-            // haleyjd 20110213: missing code:
-            if(!(i & 0x0f))
-                translationtables[i+6*256] = 1;
-        }
-        else if(i >= 0xf7 && i<= 0xfb)
-        {
-            translationtables [i      ] = col1;
-            translationtables [i+  256] = i;
-            translationtables [i+2*256] = i;
-            translationtables [i+3*256] = i;
-            translationtables [i+4*256] = i;
-            translationtables [i+5*256] = i;
-            translationtables [i+6*256] = i;
-        }
-        else if(i >= 0xf1 && i<= 0xf6)
-        {
-            translationtables [i      ] = (i & 0x0f) - 33;
-            translationtables [i+  256] = i;
-            translationtables [i+2*256] = i;
-            translationtables [i+3*256] = i;
-            translationtables [i+4*256] = i;
-            translationtables [i+5*256] = i;
-            translationtables [i+6*256] = i;
-        }
-        else if(i >= 0x20 && i <= 0x3f) // haleyjd 20110213: fixed upper end
-        {
-            translationtables [i      ] = col2;
-            translationtables [i+  256] = col2;
-            translationtables [i+2*256] = (i & 0x0f) - 48;
-            translationtables [i+3*256] = (i & 0x0f) - 48;
-            translationtables [i+4*256] = col2;
-            translationtables [i+5*256] = col2;
-            translationtables [i+6*256] = col2;
-        }
-        else  // Keep all other colors as is.
-        {
-            translationtables[i]=
-            translationtables[i+256]=
-            translationtables[i+2*256]=
-            translationtables[i+3*256]=
-            translationtables[i+4*256]=
-            translationtables[i+5*256]=
-            translationtables[i+6*256]=i;
-        }
-
-        ++col1;
-        ++col2;
-    }
-}
-
-
-
-
-//
-// R_DrawSpan 
-// With DOOM style restrictions on view orientation,
-//  the floors and ceilings consist of horizontal slices
-//  or spans with constant z depth.
-// However, rotation around the world z axis is possible,
-//  thus this mapping, while simpler and faster than
-//  perspective correct texture mapping, has to traverse
-//  the texture at an angle in all but a few cases.
-// In consequence, flats are not stored by column (like walls),
-//  and the inner loop has to step in texture space u and v.
-//
-int			ds_y; 
-int			ds_x1; 
-int			ds_x2;
-
-lighttable_t*		ds_colormap; 
-
-fixed_t			ds_xfrac; 
-fixed_t			ds_yfrac; 
-fixed_t			ds_xstep; 
-fixed_t			ds_ystep;
-
-// start of a 64*64 tile image 
-byte*			ds_source;	
-
-// just for profiling
-int			dscount;
-
-
-//
-// Draws the actual span.
-void R_DrawSpan (void) 
-{ 
-    unsigned int position, step;
-    byte *dest;
-    int count;
-    int spot;
-    unsigned int xtemp, ytemp;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1
-	|| ds_x1<0
-	|| ds_x2>=SCREENWIDTH
-	|| (unsigned)ds_y>SCREENHEIGHT)
-    {
-	I_Error( "R_DrawSpan: %i to %i at %i",
-		 ds_x1,ds_x2,ds_y);
-    }
-//	dscount++;
-#endif
-
-    // Pack position and step variables into a single 32-bit integer,
-    // with x in the top 16 bits and y in the bottom 16 bits.  For
-    // each 16-bit part, the top 6 bits are the integer part and the
-    // bottom 10 bits are the fractional part of the pixel position.
-
-    position = ((ds_xfrac << 10) & 0xffff0000)
-             | ((ds_yfrac >> 6)  & 0x0000ffff);
-    step = ((ds_xstep << 10) & 0xffff0000)
-         | ((ds_ystep >> 6)  & 0x0000ffff);
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-
-    // We do not check for zero spans here?
-    count = ds_x2 - ds_x1;
-
-    do
-    {
-	// Calculate current texture index in u,v.
-        ytemp = (position >> 4) & 0x0fc0;
-        xtemp = (position >> 26);
-        spot = xtemp | ytemp;
-
-	// Lookup pixel from flat texture tile,
-	//  re-index using light/colormap.
-	*dest++ = ds_colormap[ds_source[spot]];
-
-        position += step;
-
-    } while (count--);
-}
-
-
-
-// UNUSED.
-// Loop unrolled by 4.
-#if 0
-void R_DrawSpan (void) 
-{ 
-    unsigned	position, step;
-
-    byte*	source;
-    byte*	colormap;
-    byte*	dest;
-    
-    unsigned	count;
-    usingned	spot; 
-    unsigned	value;
-    unsigned	temp;
-    unsigned	xtemp;
-    unsigned	ytemp;
-		
-    position = ((ds_xfrac<<10)&0xffff0000) | ((ds_yfrac>>6)&0xffff);
-    step = ((ds_xstep<<10)&0xffff0000) | ((ds_ystep>>6)&0xffff);
-		
-    source = ds_source;
-    colormap = ds_colormap;
-    dest = ylookup[ds_y] + columnofs[ds_x1];	 
-    count = ds_x2 - ds_x1 + 1; 
-	
-    while (count >= 4) 
-    { 
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[0] = colormap[source[spot]]; 
-
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[1] = colormap[source[spot]];
-	
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[2] = colormap[source[spot]];
-	
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	dest[3] = colormap[source[spot]]; 
-		
-	count -= 4;
-	dest += 4;
-    } 
-    while (count > 0) 
-    { 
-	ytemp = position>>4;
-	ytemp = ytemp & 4032;
-	xtemp = position>>26;
-	spot = xtemp | ytemp;
-	position += step;
-	*dest++ = colormap[source[spot]]; 
-	count--;
-    } 
-} 
-#endif
-
-
-//
-// Again..
-//
-void R_DrawSpanLow (void)
-{
-    unsigned int position, step;
-    unsigned int xtemp, ytemp;
-    byte *dest;
-    int count;
-    int spot;
-
-#ifdef RANGECHECK
-    if (ds_x2 < ds_x1
-	|| ds_x1<0
-	|| ds_x2>=SCREENWIDTH
-	|| (unsigned)ds_y>SCREENHEIGHT)
-    {
-	I_Error( "R_DrawSpan: %i to %i at %i",
-		 ds_x1,ds_x2,ds_y);
-    }
-//	dscount++; 
-#endif
-
-    position = ((ds_xfrac << 10) & 0xffff0000)
-             | ((ds_yfrac >> 6)  & 0x0000ffff);
-    step = ((ds_xstep << 10) & 0xffff0000)
-         | ((ds_ystep >> 6)  & 0x0000ffff);
-
-    count = (ds_x2 - ds_x1);
-
-    // Blocky mode, need to multiply by 2.
-    ds_x1 <<= 1;
-    ds_x2 <<= 1;
-
-    dest = ylookup[ds_y] + columnofs[ds_x1];
-
-    do
-    {
-	// Calculate current texture index in u,v.
-        ytemp = (position >> 4) & 0x0fc0;
-        xtemp = (position >> 26);
-        spot = xtemp | ytemp;
-
-	// Lowres/blocky mode does it twice,
-	//  while scale is adjusted appropriately.
-	*dest++ = ds_colormap[ds_source[spot]];
-	*dest++ = ds_colormap[ds_source[spot]];
-
-	position += step;
-
-    } while (count--);
-}
-
-//
-// R_InitBuffer 
-// Creats lookup tables that avoid
-//  multiplies and other hazzles
-//  for getting the framebuffer address
-//  of a pixel to draw.
-//
-void
-R_InitBuffer
-( int		width,
-  int		height ) 
-{ 
-    int		i; 
-
-    // Handle resize,
-    //  e.g. smaller view windows
-    //  with border and/or status bar.
-    viewwindowx = (SCREENWIDTH-width) >> 1; 
-
-    // Column offset. For windows.
-    for (i=0 ; i<width ; i++) 
-	columnofs[i] = viewwindowx + i;
-
-    // Samw with base row offset.
-    if (width == SCREENWIDTH) 
-	viewwindowy = 0; 
-    else 
-	viewwindowy = (SCREENHEIGHT-SBARHEIGHT-height) >> 1; 
-
-    // Preclaculate all row offsets.
-    for (i=0 ; i<height ; i++) 
-	ylookup[i] = I_VideoBuffer + (i+viewwindowy)*SCREENWIDTH; 
-} 
- 
- 
-
-
-//
-// R_FillBackScreen
-// Fills the back screen with a pattern
-//  for variable screen sizes
-// Also draws a beveled edge.
-//
-// haleyjd 08/29/10: [STRIFE] Added support for configurable back_flat.
-//
-void R_FillBackScreen (void) 
-{ 
-    byte*	src;
-    byte*	dest; 
-    int		x;
-    int		y; 
-    patch_t*	patch;
-
-    char *name;
-
-    // If we are running full screen, there is no need to do any of this,
-    // and the background buffer can be freed if it was previously in use.
-
-    if (scaledviewwidth == SCREENWIDTH)
-    {
-        if (background_buffer != NULL)
-        {
-            Z_Free(background_buffer);
-            background_buffer = NULL;
-        }
-
-	return;
-    }
-
-    // Allocate the background buffer if necessary
-	
-    if (background_buffer == NULL)
-    {
-        background_buffer = Z_Malloc(SCREENWIDTH * (SCREENHEIGHT - SBARHEIGHT),
-                                     PU_STATIC, NULL);
-    }
-
-    // haleyjd 08/29/10: [STRIFE] Use configurable back_flat
-    name = back_flat;
-    
-    src = W_CacheLumpName(name, PU_CACHE); 
-    dest = background_buffer;
-	 
-    for (y=0 ; y<SCREENHEIGHT-SBARHEIGHT ; y++) 
-    { 
-	for (x=0 ; x<SCREENWIDTH/64 ; x++) 
-	{ 
-	    memcpy (dest, src+((y&63)<<6), 64); 
-	    dest += 64; 
-	} 
-
-	if (SCREENWIDTH&63) 
-	{ 
-	    memcpy (dest, src+((y&63)<<6), SCREENWIDTH&63); 
-	    dest += (SCREENWIDTH&63); 
-	} 
-    } 
-     
-    // Draw screen and bezel; this is done to a separate screen buffer.
-
-    V_UseBuffer(background_buffer);
-
-    patch = W_CacheLumpName(DEH_String("brdr_t"),PU_CACHE);
-
-    for (x=0 ; x<scaledviewwidth ; x+=8)
-	V_DrawPatch(viewwindowx+x, viewwindowy-8, patch);
-    patch = W_CacheLumpName(DEH_String("brdr_b"),PU_CACHE);
-
-    for (x=0 ; x<scaledviewwidth ; x+=8)
-	V_DrawPatch(viewwindowx+x, viewwindowy+viewheight, patch);
-    patch = W_CacheLumpName(DEH_String("brdr_l"),PU_CACHE);
-
-    for (y=0 ; y<viewheight ; y+=8)
-	V_DrawPatch(viewwindowx-8, viewwindowy+y, patch);
-    patch = W_CacheLumpName(DEH_String("brdr_r"),PU_CACHE);
-
-    for (y=0 ; y<viewheight ; y+=8)
-	V_DrawPatch(viewwindowx+scaledviewwidth, viewwindowy+y, patch);
-
-    // Draw beveled edge. 
-    V_DrawPatch(viewwindowx-8,
-                viewwindowy-8,
-                W_CacheLumpName(DEH_String("brdr_tl"),PU_CACHE));
-    
-    V_DrawPatch(viewwindowx+scaledviewwidth,
-                viewwindowy-8,
-                W_CacheLumpName(DEH_String("brdr_tr"),PU_CACHE));
-    
-    V_DrawPatch(viewwindowx-8,
-                viewwindowy+viewheight,
-                W_CacheLumpName(DEH_String("brdr_bl"),PU_CACHE));
-    
-    V_DrawPatch(viewwindowx+scaledviewwidth,
-                viewwindowy+viewheight,
-                W_CacheLumpName(DEH_String("brdr_br"),PU_CACHE));
-
-    V_RestoreBuffer();
-} 
- 
-
-//
-// Copy a screen buffer.
-//
-void
-R_VideoErase
-( unsigned	ofs,
-  int		count ) 
-{ 
-  // LFB copy.
-  // This might not be a good idea if memcpy
-  //  is not optiomal, e.g. byte by byte on
-  //  a 32bit CPU, as GNU GCC/Linux libc did
-  //  at one point.
-
-    if (background_buffer != NULL)
-    {
-        memcpy(I_VideoBuffer + ofs, background_buffer + ofs, count); 
-    }
-} 
-
-
-//
-// R_DrawViewBorder
-// Draws the border around the view
-//  for different size windows?
-//
-void R_DrawViewBorder (void) 
-{ 
-    int		top;
-    int		side;
-    int		ofs;
-    int		i; 
- 
-    if (scaledviewwidth == SCREENWIDTH) 
-	return; 
-  
-    top = ((SCREENHEIGHT-SBARHEIGHT)-viewheight)/2; 
-    side = (SCREENWIDTH-scaledviewwidth)/2; 
- 
-    // copy top and one line of left side 
-    R_VideoErase (0, top*SCREENWIDTH+side); 
- 
-    // copy one line of right side and bottom 
-    ofs = (viewheight+top)*SCREENWIDTH-side; 
-    R_VideoErase (ofs, top*SCREENWIDTH+side); 
- 
-    // copy sides using wraparound 
-    ofs = top*SCREENWIDTH + SCREENWIDTH-side; 
-    side <<= 1;
-    
-    for (i=1 ; i<viewheight ; i++) 
-    { 
-	R_VideoErase (ofs, side); 
-	ofs += SCREENWIDTH; 
-    } 
-
-    // ? 
-    V_MarkRect (0,0,SCREENWIDTH, SCREENHEIGHT-SBARHEIGHT); 
-} 
- 
- 
diff --git a/games/NXDoom/src/strife/r_draw.h b/games/NXDoom/src/strife/r_draw.h
deleted file mode 100644
index b5c35a2d2..000000000
--- a/games/NXDoom/src/strife/r_draw.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
-
-#ifndef __R_DRAW__
-#define __R_DRAW__
-
-
-
-
-extern lighttable_t*	dc_colormap;
-extern int		dc_x;
-extern int		dc_yl;
-extern int		dc_yh;
-extern fixed_t		dc_iscale;
-extern fixed_t		dc_texturemid;
-
-// first pixel in a column
-extern byte*		dc_source;		
-
-
-// The span blitting interface.
-// Hook in assembler or system specific BLT
-//  here.
-void 	R_DrawColumn (void);
-void 	R_DrawColumnLow (void);
-
-// The Spectre/Invisibility effect.
-//void 	R_DrawFuzzColumn (void);
-//void 	R_DrawFuzzColumnLow (void);
-
-// Draw with color translation tables,
-//  for player sprite rendering,
-//  Green/Red/Blue/Indigo shirts.
-void	R_DrawTranslatedColumn (void);
-void	R_DrawTranslatedColumnLow (void);
-
-// villsa [STRIFE] - transclucent rendering
-void    R_DrawTLColumn (void);
-void    R_DrawMVisTLColumn (void);
-void    R_DrawTRTLColumn (void);
-
-void
-R_VideoErase
-( unsigned	ofs,
-  int		count );
-
-extern int		ds_y;
-extern int		ds_x1;
-extern int		ds_x2;
-
-extern lighttable_t*	ds_colormap;
-
-extern fixed_t		ds_xfrac;
-extern fixed_t		ds_yfrac;
-extern fixed_t		ds_xstep;
-extern fixed_t		ds_ystep;
-
-// start of a 64*64 tile image
-extern byte*		ds_source;		
-
-extern byte*		translationtables;
-extern byte*		dc_translation;
-extern byte*		xlatab;            // haleyjd 08/26/10: [STRIFE]
-
-extern char *back_flat; // haleyjd 08/29/10: [STRIFE]
-
-// Span blitting for rows, floor/ceiling.
-// No Sepctre effect needed.
-void 	R_DrawSpan (void);
-
-// Low resolution mode, 160x200?
-void 	R_DrawSpanLow (void);
-
-
-void
-R_InitBuffer
-( int		width,
-  int		height );
-
-
-// Initialize color translation tables,
-//  for player rendering etc.
-void	R_InitTranslationTables (void);
-
-
-
-// Rendering function.
-void R_FillBackScreen (void);
-
-// If the view size is not full screen, draws a border around it.
-void R_DrawViewBorder (void);
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_local.h b/games/NXDoom/src/strife/r_local.h
deleted file mode 100644
index 1b9249210..000000000
--- a/games/NXDoom/src/strife/r_local.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh (R_*) module, global header.
-//	All the rendering/drawing stuff is here.
-//
-
-#ifndef __R_LOCAL__
-#define __R_LOCAL__
-
-// Binary Angles, sine/cosine/atan lookups.
-#include "tables.h"
-
-// Screen size related parameters.
-#include "doomdef.h"
-
-// Include the refresh/render data structs.
-#include "r_data.h"
-
-
-
-//
-// Separate header file for each module.
-//
-#include "r_main.h"
-#include "r_bsp.h"
-#include "r_segs.h"
-#include "r_plane.h"
-#include "r_data.h"
-#include "r_things.h"
-#include "r_draw.h"
-
-#endif		// __R_LOCAL__
diff --git a/games/NXDoom/src/strife/r_main.c b/games/NXDoom/src/strife/r_main.c
deleted file mode 100644
index f940bb0df..000000000
--- a/games/NXDoom/src/strife/r_main.c
+++ /dev/null
@@ -1,944 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Rendering main loop and setup functions,
-//	 utility functions (BSP, geometry, trigonometry).
-//	See tables.c, too.
-//
-
-
-
-
-
-#include <stdlib.h>
-#include <math.h>
-
-
-#include "doomdef.h"
-#include "doomstat.h"   // villsa [STRIFE]
-#include "d_main.h"
-
-#include "m_bbox.h"
-#include "m_menu.h"
-
-#include "r_local.h"
-#include "r_sky.h"
-
-
-
-
-
-// Fineangles in the SCREENWIDTH wide window.
-#define FIELDOFVIEW		2048	
-
-
-
-int			viewangleoffset;
-
-// increment every time a check is made
-int			validcount = 1;		
-
-
-lighttable_t*		fixedcolormap;
-
-int			centerx;
-int			centery;
-
-fixed_t			centerxfrac;
-fixed_t			centeryfrac;
-fixed_t			projection;
-
-// just for profiling purposes
-int			framecount;	
-
-int			sscount;
-int			linecount;
-int			loopcount;
-
-fixed_t			viewx;
-fixed_t			viewy;
-fixed_t			viewz;
-
-int                     viewpitch;  // villsa [STRIFE]
-
-angle_t			viewangle;
-
-fixed_t			viewcos;
-fixed_t			viewsin;
-
-player_t*		viewplayer;
-
-// 0 = high, 1 = low
-int			detailshift;	
-
-//
-// precalculated math tables
-//
-angle_t			clipangle;
-
-// The viewangletox[viewangle + FINEANGLES/4] lookup
-// maps the visible view angles to screen X coordinates,
-// flattening the arc to a flat projection plane.
-// There will be many angles mapped to the same X. 
-int			viewangletox[FINEANGLES/2];
-
-// The xtoviewangleangle[] table maps a screen pixel
-// to the lowest viewangle that maps back to x ranges
-// from clipangle to -clipangle.
-angle_t			xtoviewangle[SCREENWIDTH+1];
-
-lighttable_t*		scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-lighttable_t*		scalelightfixed[MAXLIGHTSCALE];
-lighttable_t*		zlight[LIGHTLEVELS][MAXLIGHTZ];
-
-// bumped light from gun blasts
-int			extralight;			
-
-
-
-void (*colfunc) (void);
-void (*basecolfunc) (void);
-void (*fuzzcolfunc) (void);
-void (*transcolfunc) (void);
-void (*spanfunc) (void);
-
-
-
-//
-// R_AddPointToBox
-// Expand a given bbox
-// so that it encloses a given point.
-//
-void
-R_AddPointToBox
-( int		x,
-  int		y,
-  fixed_t*	box )
-{
-    if (x< box[BOXLEFT])
-	box[BOXLEFT] = x;
-    if (x> box[BOXRIGHT])
-	box[BOXRIGHT] = x;
-    if (y< box[BOXBOTTOM])
-	box[BOXBOTTOM] = y;
-    if (y> box[BOXTOP])
-	box[BOXTOP] = y;
-}
-
-
-//
-// R_PointOnSide
-// Traverse BSP (sub) tree,
-//  check point against partition plane.
-// Returns side 0 (front) or 1 (back).
-//
-int
-R_PointOnSide
-( fixed_t	x,
-  fixed_t	y,
-  node_t*	node )
-{
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
-	
-    if (!node->dx)
-    {
-	if (x <= node->x)
-	    return node->dy > 0;
-	
-	return node->dy < 0;
-    }
-    if (!node->dy)
-    {
-	if (y <= node->y)
-	    return node->dx < 0;
-	
-	return node->dx > 0;
-    }
-	
-    dx = (x - node->x);
-    dy = (y - node->y);
-	
-    // Try to quickly decide by looking at sign bits.
-    if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
-    {
-	if  ( (node->dy ^ dx) & 0x80000000 )
-	{
-	    // (left is negative)
-	    return 1;
-	}
-	return 0;
-    }
-
-    left = FixedMul ( node->dy>>FRACBITS , dx );
-    right = FixedMul ( dy , node->dx>>FRACBITS );
-	
-    if (right < left)
-    {
-	// front side
-	return 0;
-    }
-    // back side
-    return 1;			
-}
-
-
-int
-R_PointOnSegSide
-( fixed_t	x,
-  fixed_t	y,
-  seg_t*	line )
-{
-    fixed_t	lx;
-    fixed_t	ly;
-    fixed_t	ldx;
-    fixed_t	ldy;
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	left;
-    fixed_t	right;
-	
-    lx = line->v1->x;
-    ly = line->v1->y;
-	
-    ldx = line->v2->x - lx;
-    ldy = line->v2->y - ly;
-	
-    if (!ldx)
-    {
-	if (x <= lx)
-	    return ldy > 0;
-	
-	return ldy < 0;
-    }
-    if (!ldy)
-    {
-	if (y <= ly)
-	    return ldx < 0;
-	
-	return ldx > 0;
-    }
-	
-    dx = (x - lx);
-    dy = (y - ly);
-	
-    // Try to quickly decide by looking at sign bits.
-    if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
-    {
-	if  ( (ldy ^ dx) & 0x80000000 )
-	{
-	    // (left is negative)
-	    return 1;
-	}
-	return 0;
-    }
-
-    left = FixedMul ( ldy>>FRACBITS , dx );
-    right = FixedMul ( dy , ldx>>FRACBITS );
-	
-    if (right < left)
-    {
-	// front side
-	return 0;
-    }
-    // back side
-    return 1;			
-}
-
-
-//
-// R_PointToAngle
-// To get a global angle from cartesian coordinates,
-//  the coordinates are flipped until they are in
-//  the first octant of the coordinate system, then
-//  the y (<=x) is scaled and divided by x to get a
-//  tangent (slope) value which is looked up in the
-//  tantoangle[] table.
-
-//
-
-
-
-
-angle_t
-R_PointToAngle
-( fixed_t	x,
-  fixed_t	y )
-{	
-    x -= viewx;
-    y -= viewy;
-    
-    if ( (!x) && (!y) )
-	return 0;
-
-    if (x>= 0)
-    {
-	// x >=0
-	if (y>= 0)
-	{
-	    // y>= 0
-
-	    if (x>y)
-	    {
-		// octant 0
-		return tantoangle[ SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		// octant 1
-		return ANG90-1-tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-	else
-	{
-	    // y<0
-	    y = -y;
-
-	    if (x>y)
-	    {
-		// octant 8
-		return 0 - tantoangle[SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		// octant 7
-		return ANG270+tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-    }
-    else
-    {
-	// x<0
-	x = -x;
-
-	if (y>= 0)
-	{
-	    // y>= 0
-	    if (x>y)
-	    {
-		// octant 3
-		return ANG180-1-tantoangle[ SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		// octant 2
-		return ANG90+ tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-	else
-	{
-	    // y<0
-	    y = -y;
-
-	    if (x>y)
-	    {
-		// octant 4
-		return ANG180+tantoangle[ SlopeDiv(y,x)];
-	    }
-	    else
-	    {
-		 // octant 5
-		return ANG270-1-tantoangle[ SlopeDiv(x,y)];
-	    }
-	}
-    }
-    return 0;
-}
-
-
-angle_t
-R_PointToAngle2
-( fixed_t	x1,
-  fixed_t	y1,
-  fixed_t	x2,
-  fixed_t	y2 )
-{	
-    viewx = x1;
-    viewy = y1;
-    
-    return R_PointToAngle (x2, y2);
-}
-
-
-fixed_t
-R_PointToDist
-( fixed_t	x,
-  fixed_t	y )
-{
-    int		angle;
-    fixed_t	dx;
-    fixed_t	dy;
-    fixed_t	temp;
-    fixed_t	dist;
-    fixed_t     frac;
-	
-    dx = abs(x - viewx);
-    dy = abs(y - viewy);
-	
-    if (dy>dx)
-    {
-	temp = dx;
-	dx = dy;
-	dy = temp;
-    }
-
-    // Fix crashes in udm1.wad
-
-    if (dx != 0)
-    {
-        frac = FixedDiv(dy, dx);
-    }
-    else
-    {
-	frac = 0;
-    }
-	
-    angle = (tantoangle[frac>>DBITS]+ANG90) >> ANGLETOFINESHIFT;
-
-    // use as cosine
-    dist = FixedDiv (dx, finesine[angle] );	
-	
-    return dist;
-}
-
-
-
-
-//
-// R_InitPointToAngle
-//
-void R_InitPointToAngle (void)
-{
-    // UNUSED - now getting from tables.c
-#if 0
-    int	i;
-    long	t;
-    float	f;
-//
-// slope (tangent) to angle lookup
-//
-    for (i=0 ; i<=SLOPERANGE ; i++)
-    {
-	f = atan( (float)i/SLOPERANGE )/(3.141592657*2);
-	t = 0xffffffff*f;
-	tantoangle[i] = t;
-    }
-#endif
-}
-
-
-//
-// R_ScaleFromGlobalAngle
-// Returns the texture mapping scale
-//  for the current line (horizontal span)
-//  at the given angle.
-// rw_distance must be calculated first.
-//
-fixed_t R_ScaleFromGlobalAngle (angle_t visangle)
-{
-    fixed_t		scale;
-    angle_t		anglea;
-    angle_t		angleb;
-    int			sinea;
-    int			sineb;
-    fixed_t		num;
-    int			den;
-
-    // UNUSED
-#if 0
-{
-    fixed_t		dist;
-    fixed_t		z;
-    fixed_t		sinv;
-    fixed_t		cosv;
-	
-    sinv = finesine[(visangle-rw_normalangle)>>ANGLETOFINESHIFT];	
-    dist = FixedDiv (rw_distance, sinv);
-    cosv = finecosine[(viewangle-visangle)>>ANGLETOFINESHIFT];
-    z = abs(FixedMul (dist, cosv));
-    scale = FixedDiv(projection, z);
-    return scale;
-}
-#endif
-
-    anglea = ANG90 + (visangle-viewangle);
-    angleb = ANG90 + (visangle-rw_normalangle);
-
-    // both sines are allways positive
-    sinea = finesine[anglea>>ANGLETOFINESHIFT];	
-    sineb = finesine[angleb>>ANGLETOFINESHIFT];
-    num = FixedMul(projection,sineb)<<detailshift;
-    den = FixedMul(rw_distance,sinea);
-
-    if (den > num>>16)
-    {
-	scale = FixedDiv (num, den);
-
-	if (scale > 64*FRACUNIT)
-	    scale = 64*FRACUNIT;
-	else if (scale < 256)
-	    scale = 256;
-    }
-    else
-	scale = 64*FRACUNIT;
-	
-    return scale;
-}
-
-
-
-//
-// R_InitTables
-//
-void R_InitTables (void)
-{
-    // UNUSED: now getting from tables.c
-#if 0
-    int		i;
-    float	a;
-    float	fv;
-    int		t;
-    
-    // viewangle tangent table
-    for (i=0 ; i<FINEANGLES/2 ; i++)
-    {
-	a = (i-FINEANGLES/4+0.5)*PI*2/FINEANGLES;
-	fv = FRACUNIT*tan (a);
-	t = fv;
-	finetangent[i] = t;
-    }
-    
-    // finesine table
-    for (i=0 ; i<5*FINEANGLES/4 ; i++)
-    {
-	// OPTIMIZE: mirror...
-	a = (i+0.5)*PI*2/FINEANGLES;
-	t = FRACUNIT*sin (a);
-	finesine[i] = t;
-    }
-#endif
-
-}
-
-
-
-//
-// R_InitTextureMapping
-//
-void R_InitTextureMapping (void)
-{
-    int			i;
-    int			x;
-    int			t;
-    fixed_t		focallength;
-    
-    // Use tangent table to generate viewangletox:
-    //  viewangletox will give the next greatest x
-    //  after the view angle.
-    //
-    // Calc focallength
-    //  so FIELDOFVIEW angles covers SCREENWIDTH.
-    focallength = FixedDiv (centerxfrac,
-			    finetangent[FINEANGLES/4+FIELDOFVIEW/2] );
-	
-    for (i=0 ; i<FINEANGLES/2 ; i++)
-    {
-	if (finetangent[i] > FRACUNIT*2)
-	    t = -1;
-	else if (finetangent[i] < -FRACUNIT*2)
-	    t = viewwidth+1;
-	else
-	{
-	    t = FixedMul (finetangent[i], focallength);
-	    t = (centerxfrac - t+FRACUNIT-1)>>FRACBITS;
-
-	    if (t < -1)
-		t = -1;
-	    else if (t>viewwidth+1)
-		t = viewwidth+1;
-	}
-	viewangletox[i] = t;
-    }
-    
-    // Scan viewangletox[] to generate xtoviewangle[]:
-    //  xtoviewangle will give the smallest view angle
-    //  that maps to x.	
-    for (x=0;x<=viewwidth;x++)
-    {
-	i = 0;
-	while (viewangletox[i]>x)
-	    i++;
-	xtoviewangle[x] = (i<<ANGLETOFINESHIFT)-ANG90;
-    }
-    
-    // Take out the fencepost cases from viewangletox.
-    for (i=0 ; i<FINEANGLES/2 ; i++)
-    {
-	t = FixedMul (finetangent[i], focallength);
-	t = centerx - t;
-	
-	if (viewangletox[i] == -1)
-	    viewangletox[i] = 0;
-	else if (viewangletox[i] == viewwidth+1)
-	    viewangletox[i]  = viewwidth;
-    }
-	
-    clipangle = xtoviewangle[0];
-}
-
-
-
-//
-// R_InitLightTables
-// Only inits the zlight table,
-//  because the scalelight table changes with view size.
-//
-#define DISTMAP		2
-
-void R_InitLightTables (void)
-{
-    int		i;
-    int		j;
-    int		level;
-    int		startmap; 	
-    int		scale;
-    
-    // Calculate the light levels to use
-    //  for each level / distance combination.
-    for (i=0 ; i< LIGHTLEVELS ; i++)
-    {
-	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
-	for (j=0 ; j<MAXLIGHTZ ; j++)
-	{
-	    scale = FixedDiv ((SCREENWIDTH/2*FRACUNIT), (j+1)<<LIGHTZSHIFT);
-	    scale >>= LIGHTSCALESHIFT;
-	    level = startmap - scale/DISTMAP;
-	    
-	    if (level < 0)
-		level = 0;
-
-	    if (level >= NUMCOLORMAPS)
-		level = NUMCOLORMAPS-1;
-
-	    zlight[i][j] = colormaps + level*256;
-	}
-    }
-}
-
-
-
-//
-// R_SetViewSize
-// Do not really change anything here,
-//  because it might be in the middle of a refresh.
-// The change will take effect next refresh.
-//
-boolean		setsizeneeded;
-int		setblocks;
-int		setdetail;
-
-
-void
-R_SetViewSize
-( int		blocks,
-  int		detail )
-{
-    setsizeneeded = true;
-    setblocks = blocks;
-    setdetail = detail;
-}
-
-
-//
-// R_ExecuteSetViewSize
-//
-void R_ExecuteSetViewSize (void)
-{
-    fixed_t	cosadj;
-    fixed_t	dy;
-    int		i;
-    int		j;
-    int		level;
-    int		startmap; 	
-
-    setsizeneeded = false;
-
-    if (setblocks == 11)
-    {
-	scaledviewwidth = SCREENWIDTH;
-	viewheight = SCREENHEIGHT;
-    }
-    else
-    {
-	scaledviewwidth = setblocks*32;
-	viewheight = (setblocks*168/10)&~7;
-    }
-    
-    detailshift = setdetail;
-    viewwidth = scaledviewwidth>>detailshift;
-	
-    // villsa [STRIFE] calculate centery from player's pitch
-    centery = (setblocks*players[consoleplayer].pitch);
-    centery = (unsigned int)(centery/10)+viewheight/2;
-
-    centerx = viewwidth/2;
-    centerxfrac = centerx<<FRACBITS;
-    centeryfrac = centery<<FRACBITS;
-    projection = centerxfrac;
-
-    //if (!detailshift) // villsa [STRIFE]
-    {
-	colfunc = basecolfunc = R_DrawColumn;
-	fuzzcolfunc = R_DrawTLColumn;   // villsa [STRIFE]
-	transcolfunc = R_DrawTranslatedColumn;
-	spanfunc = R_DrawSpan;
-    }
-    // villsa [STRIFE] unused detail stuff
-    /*else
-    {
-	colfunc = basecolfunc = R_DrawColumnLow;
-	fuzzcolfunc = R_DrawFuzzColumnLow;
-	transcolfunc = R_DrawTranslatedColumnLow;
-	spanfunc = R_DrawSpanLow;
-    }*/
-
-    R_InitBuffer (scaledviewwidth, viewheight);
-	
-    R_InitTextureMapping ();
-    
-    // psprite scales
-    pspritescale = FRACUNIT*viewwidth/SCREENWIDTH;
-    pspriteiscale = FRACUNIT*SCREENWIDTH/viewwidth;
-    
-    // thing clipping
-    for (i=0 ; i<viewwidth ; i++)
-	screenheightarray[i] = viewheight;
-    
-    // planes
-    for (i=0 ; i<viewheight ; i++)
-    {
-	// haleyjd 20120208: [STRIFE] viewheight/2 -> centery, accounts for up/down look
-        dy = ((i - centery)<<FRACBITS) + FRACUNIT/2;
-	dy = abs(dy);
-	yslope[i] = FixedDiv ( (viewwidth<<detailshift)/2*FRACUNIT, dy);
-    }
-	
-    for (i=0 ; i<viewwidth ; i++)
-    {
-	cosadj = abs(finecosine[xtoviewangle[i]>>ANGLETOFINESHIFT]);
-	distscale[i] = FixedDiv (FRACUNIT,cosadj);
-    }
-    
-    // Calculate the light levels to use
-    //  for each level / scale combination.
-    for (i=0 ; i< LIGHTLEVELS ; i++)
-    {
-	startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
-	for (j=0 ; j<MAXLIGHTSCALE ; j++)
-	{
-	    level = startmap - j*SCREENWIDTH/(viewwidth<<detailshift)/DISTMAP;
-	    
-	    if (level < 0)
-		level = 0;
-
-	    if (level >= NUMCOLORMAPS)
-		level = NUMCOLORMAPS-1;
-
-	    scalelight[i][j] = colormaps + level*256;
-	}
-    }
-}
-
-
-
-//
-// R_Init
-//
-
-
-
-void R_Init (void)
-{
-    R_InitData ();
-    if(devparm)
-        printf (".");
-    else
-        D_IntroTick(); // [STRIFE] tick intro
-
-    R_InitPointToAngle ();
-    if(devparm)
-        printf (".");
-
-    R_InitTables ();
-    // viewwidth / viewheight / detailLevel are set by the defaults
-    if(devparm)
-        printf (".");
-
-    R_SetViewSize (screenblocks, detailLevel);
-    R_InitPlanes ();
-    if(devparm)
-        printf (".");
-    
-    R_InitLightTables ();
-    if(devparm)
-        printf (".");
-    else
-        D_IntroTick();
-    
-    R_InitSkyMap ();
-    if(!devparm)
-        D_IntroTick();
-
-    R_InitTranslationTables ();
-    if(devparm)
-        printf (".");
-    else
-        D_IntroTick();
-
-    framecount = 0;
-}
-
-
-//
-// R_PointInSubsector
-//
-subsector_t*
-R_PointInSubsector
-( fixed_t	x,
-  fixed_t	y )
-{
-    node_t*	node;
-    int		side;
-    int		nodenum;
-
-    // single subsector is a special case
-    if (!numnodes)				
-	return subsectors;
-		
-    nodenum = numnodes-1;
-
-    while (! (nodenum & NF_SUBSECTOR) )
-    {
-	node = &nodes[nodenum];
-	side = R_PointOnSide (x, y, node);
-	nodenum = node->children[side];
-    }
-	
-    return &subsectors[nodenum & ~NF_SUBSECTOR];
-}
-
-//
-// R_SetupPitch
-// villsa [STRIFE] new function
-// Calculate centery/centeryfrac for player viewpitch
-//
-
-void R_SetupPitch(player_t* player)
-{
-    int pitchfrac;
-    int i = 0;
-
-    if(viewpitch != player->pitch)
-    {
-        viewpitch   = player->pitch;
-        pitchfrac   = (setblocks * player->pitch) / 10;
-        centery     = pitchfrac + viewheight / 2;
-        centeryfrac = centery << FRACBITS;
-
-        for(i = 0; i < viewheight; i++)
-        {
-            yslope[i] = FixedDiv(viewwidth / 2 * FRACUNIT,
-                                 abs(((i - centery) << FRACBITS) + (FRACUNIT/2)));
-        }
-    }
-}
-
-
-//
-// R_SetupFrame
-//
-void R_SetupFrame (player_t* player)
-{		
-    int		i;
-    
-    R_SetupPitch(player);  // villsa [STRIFE]
-
-    viewplayer = player;
-    viewx = player->mo->x;
-    viewy = player->mo->y;
-    viewangle = player->mo->angle + viewangleoffset;
-    extralight = player->extralight;
-
-    viewz = player->viewz;
-    
-    viewsin = finesine[viewangle>>ANGLETOFINESHIFT];
-    viewcos = finecosine[viewangle>>ANGLETOFINESHIFT];
-	
-    sscount = 0;
-	
-    if (player->fixedcolormap)
-    {
-	fixedcolormap =
-	    colormaps
-	    + player->fixedcolormap*256*sizeof(lighttable_t);
-	
-	walllights = scalelightfixed;
-
-	for (i=0 ; i<MAXLIGHTSCALE ; i++)
-	    scalelightfixed[i] = fixedcolormap;
-    }
-    else
-	fixedcolormap = 0;
-		
-    framecount++;
-    validcount++;
-}
-
-
-
-//
-// R_RenderView
-//
-void R_RenderPlayerView (player_t* player)
-{	
-    R_SetupFrame (player);
-
-    // Clear buffers.
-    R_ClearClipSegs ();
-    R_ClearDrawSegs ();
-    R_ClearPlanes ();
-    R_ClearSprites ();
-    
-    // check for new console commands.
-    NetUpdate ();
-
-    // The head node is the last node output.
-    R_RenderBSPNode (numnodes-1);
-    
-    // Check for new console commands.
-    NetUpdate ();
-    
-    R_DrawPlanes ();
-    
-    // Check for new console commands.
-    NetUpdate ();
-    
-    R_DrawMasked ();
-
-    // Check for new console commands.
-    NetUpdate ();				
-}
diff --git a/games/NXDoom/src/strife/r_main.h b/games/NXDoom/src/strife/r_main.h
deleted file mode 100644
index 5a79bc622..000000000
--- a/games/NXDoom/src/strife/r_main.h
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	System specific interface stuff.
-//
-
-
-#ifndef __R_MAIN__
-#define __R_MAIN__
-
-#include "d_player.h"
-#include "r_data.h"
-
-
-
-
-//
-// POV related.
-//
-extern fixed_t		viewcos;
-extern fixed_t		viewsin;
-
-extern int		viewwindowx;
-extern int		viewwindowy;
-
-extern boolean setsizeneeded;
-
-
-extern int		centerx;
-extern int		centery;
-
-extern fixed_t		centerxfrac;
-extern fixed_t		centeryfrac;
-extern fixed_t		projection;
-
-extern int		validcount;
-
-extern int		linecount;
-extern int		loopcount;
-
-
-//
-// Lighting LUT.
-// Used for z-depth cuing per column/row,
-//  and other lighting effects (sector ambient, flash).
-//
-
-// Lighting constants.
-// Now why not 32 levels here?
-#define LIGHTLEVELS	        16
-#define LIGHTSEGSHIFT	         4
-
-#define MAXLIGHTSCALE		48
-#define LIGHTSCALESHIFT		12
-#define MAXLIGHTZ	       128
-#define LIGHTZSHIFT		20
-
-extern lighttable_t*	scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-extern lighttable_t*	scalelightfixed[MAXLIGHTSCALE];
-extern lighttable_t*	zlight[LIGHTLEVELS][MAXLIGHTZ];
-
-extern int		extralight;
-extern lighttable_t*	fixedcolormap;
-
-
-// Number of diminishing brightness levels.
-// There a 0-31, i.e. 32 LUT in the COLORMAP lump.
-#define NUMCOLORMAPS		32
-
-
-// Blocky/low detail mode.
-//B remove this?
-//  0 = high, 1 = low
-extern	int		detailshift;	
-
-
-//
-// Function pointers to switch refresh/drawing functions.
-// Used to select shadow mode etc.
-//
-extern void		(*colfunc) (void);
-extern void		(*transcolfunc) (void);
-extern void		(*basecolfunc) (void);
-extern void		(*fuzzcolfunc) (void);
-// No shadow effects on floors.
-extern void		(*spanfunc) (void);
-
-
-//
-// Utility functions.
-int
-R_PointOnSide
-( fixed_t	x,
-  fixed_t	y,
-  node_t*	node );
-
-int
-R_PointOnSegSide
-( fixed_t	x,
-  fixed_t	y,
-  seg_t*	line );
-
-angle_t
-R_PointToAngle
-( fixed_t	x,
-  fixed_t	y );
-
-angle_t
-R_PointToAngle2
-( fixed_t	x1,
-  fixed_t	y1,
-  fixed_t	x2,
-  fixed_t	y2 );
-
-fixed_t
-R_PointToDist
-( fixed_t	x,
-  fixed_t	y );
-
-
-fixed_t R_ScaleFromGlobalAngle (angle_t visangle);
-
-subsector_t*
-R_PointInSubsector
-( fixed_t	x,
-  fixed_t	y );
-
-void
-R_AddPointToBox
-( int		x,
-  int		y,
-  fixed_t*	box );
-
-
-
-//
-// REFRESH - the actual rendering functions.
-//
-
-// Called by G_Drawer.
-void R_RenderPlayerView (player_t *player);
-
-// Called by startup code.
-void R_Init (void);
-
-// Called by M_Responder.
-void R_SetViewSize (int blocks, int detail);
-
-void R_ExecuteSetViewSize(void);
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_plane.c b/games/NXDoom/src/strife/r_plane.c
deleted file mode 100644
index 5bc643cbc..000000000
--- a/games/NXDoom/src/strife/r_plane.c
+++ /dev/null
@@ -1,447 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Here is a core component: drawing the floors and ceilings,
-//	 while maintaining a per column clipping list only.
-//	Moreover, the sky areas have to be determined.
-//
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "i_system.h"
-#include "z_zone.h"
-#include "w_wad.h"
-
-#include "doomdef.h"
-#include "doomstat.h"
-
-#include "r_local.h"
-#include "r_sky.h"
-
-
-
-planefunction_t		floorfunc;
-planefunction_t		ceilingfunc;
-
-//
-// opening
-//
-
-// Here comes the obnoxious "visplane".
-// haleyjd 08/29/10: [STRIFE] MAXVISPLANES increased to 200
-#define MAXVISPLANES	200
-visplane_t		visplanes[MAXVISPLANES];
-visplane_t*		lastvisplane;
-visplane_t*		floorplane;
-visplane_t*		ceilingplane;
-
-// ?
-#define MAXOPENINGS	SCREENWIDTH*64
-short			openings[MAXOPENINGS];
-short*			lastopening;
-
-
-//
-// Clip values are the solid pixel bounding the range.
-//  floorclip starts out SCREENHEIGHT
-//  ceilingclip starts out -1
-//
-short			floorclip[SCREENWIDTH];
-short			ceilingclip[SCREENWIDTH];
-
-//
-// spanstart holds the start of a plane span
-// initialized to 0 at start
-//
-int			spanstart[SCREENHEIGHT];
-int			spanstop[SCREENHEIGHT];
-
-//
-// texture mapping
-//
-lighttable_t**		planezlight;
-fixed_t			planeheight;
-
-fixed_t			yslope[SCREENHEIGHT];
-fixed_t			distscale[SCREENWIDTH];
-fixed_t			basexscale;
-fixed_t			baseyscale;
-
-fixed_t			cachedheight[SCREENHEIGHT];
-fixed_t			cacheddistance[SCREENHEIGHT];
-fixed_t			cachedxstep[SCREENHEIGHT];
-fixed_t			cachedystep[SCREENHEIGHT];
-
-
-
-//
-// R_InitPlanes
-// Only at game startup.
-//
-void R_InitPlanes (void)
-{
-  // Doh!
-}
-
-
-//
-// R_MapPlane
-//
-// Uses global vars:
-//  planeheight
-//  ds_source
-//  basexscale
-//  baseyscale
-//  viewx
-//  viewy
-//
-// BASIC PRIMITIVE
-//
-void
-R_MapPlane
-( int		y,
-  int		x1,
-  int		x2 )
-{
-    angle_t	angle;
-    fixed_t	distance;
-    fixed_t	length;
-    unsigned	index;
-	
-#ifdef RANGECHECK
-    if (x2 < x1
-     || x1 < 0
-     || x2 >= viewwidth
-     || y > viewheight)
-    {
-	I_Error ("R_MapPlane: %i, %i at %i",x1,x2,y);
-    }
-#endif
-
-    if (planeheight != cachedheight[y])
-    {
-	cachedheight[y] = planeheight;
-	distance = cacheddistance[y] = FixedMul (planeheight, yslope[y]);
-	ds_xstep = cachedxstep[y] = FixedMul (distance,basexscale);
-	ds_ystep = cachedystep[y] = FixedMul (distance,baseyscale);
-    }
-    else
-    {
-	distance = cacheddistance[y];
-	ds_xstep = cachedxstep[y];
-	ds_ystep = cachedystep[y];
-    }
-	
-    length = FixedMul (distance,distscale[x1]);
-    angle = (viewangle + xtoviewangle[x1])>>ANGLETOFINESHIFT;
-    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
-    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
-
-    if (fixedcolormap)
-	ds_colormap = fixedcolormap;
-    else
-    {
-	index = distance >> LIGHTZSHIFT;
-	
-	if (index >= MAXLIGHTZ )
-	    index = MAXLIGHTZ-1;
-
-	ds_colormap = planezlight[index];
-    }
-	
-    ds_y = y;
-    ds_x1 = x1;
-    ds_x2 = x2;
-
-    // high or low detail
-    spanfunc ();	
-}
-
-
-//
-// R_ClearPlanes
-// At begining of frame.
-//
-void R_ClearPlanes (void)
-{
-    int		i;
-    angle_t	angle;
-    
-    // opening / clipping determination
-    for (i=0 ; i<viewwidth ; i++)
-    {
-	floorclip[i] = viewheight;
-	ceilingclip[i] = -1;
-    }
-
-    lastvisplane = visplanes;
-    lastopening = openings;
-    
-    // texture calculation
-    memset (cachedheight, 0, sizeof(cachedheight));
-
-    // left to right mapping
-    angle = (viewangle-ANG90)>>ANGLETOFINESHIFT;
-	
-    // scale will be unit scale at SCREENWIDTH/2 distance
-    basexscale = FixedDiv (finecosine[angle],centerxfrac);
-    baseyscale = -FixedDiv (finesine[angle],centerxfrac);
-}
-
-
-
-
-//
-// R_FindPlane
-//
-visplane_t*
-R_FindPlane
-( fixed_t	height,
-  int		picnum,
-  int		lightlevel )
-{
-    visplane_t*	check;
-	
-    if (picnum == skyflatnum)
-    {
-	height = 0;			// all skys map together
-	lightlevel = 0;
-    }
-	
-    for (check=visplanes; check<lastvisplane; check++)
-    {
-	if (height == check->height
-	    && picnum == check->picnum
-	    && lightlevel == check->lightlevel)
-	{
-	    break;
-	}
-    }
-    
-			
-    if (check < lastvisplane)
-	return check;
-		
-    if (lastvisplane - visplanes == MAXVISPLANES)
-	I_Error ("R_FindPlane: no more visplanes");
-		
-    lastvisplane++;
-
-    check->height = height;
-    check->picnum = picnum;
-    check->lightlevel = lightlevel;
-    check->minx = SCREENWIDTH;
-    check->maxx = -1;
-    
-    memset (check->top,0xff,sizeof(check->top));
-		
-    return check;
-}
-
-
-//
-// R_CheckPlane
-//
-visplane_t*
-R_CheckPlane
-( visplane_t*	pl,
-  int		start,
-  int		stop )
-{
-    int		intrl;
-    int		intrh;
-    int		unionl;
-    int		unionh;
-    int		x;
-	
-    if (start < pl->minx)
-    {
-	intrl = pl->minx;
-	unionl = start;
-    }
-    else
-    {
-	unionl = pl->minx;
-	intrl = start;
-    }
-	
-    if (stop > pl->maxx)
-    {
-	intrh = pl->maxx;
-	unionh = stop;
-    }
-    else
-    {
-	unionh = pl->maxx;
-	intrh = stop;
-    }
-
-    for (x=intrl ; x<= intrh ; x++)
-	if (pl->top[x] != 0xff)
-	    break;
-
-    if (x > intrh)
-    {
-	pl->minx = unionl;
-	pl->maxx = unionh;
-
-	// use the same one
-	return pl;		
-    }
-	
-    // make a new visplane
-    lastvisplane->height = pl->height;
-    lastvisplane->picnum = pl->picnum;
-    lastvisplane->lightlevel = pl->lightlevel;
-    
-    pl = lastvisplane++;
-    pl->minx = start;
-    pl->maxx = stop;
-
-    memset (pl->top,0xff,sizeof(pl->top));
-		
-    return pl;
-}
-
-
-//
-// R_MakeSpans
-//
-void
-R_MakeSpans
-( int		x,
-  int		t1,
-  int		b1,
-  int		t2,
-  int		b2 )
-{
-    while (t1 < t2 && t1<=b1)
-    {
-	R_MapPlane (t1,spanstart[t1],x-1);
-	t1++;
-    }
-    while (b1 > b2 && b1>=t1)
-    {
-	R_MapPlane (b1,spanstart[b1],x-1);
-	b1--;
-    }
-	
-    while (t2 < t1 && t2<=b2)
-    {
-	spanstart[t2] = x;
-	t2++;
-    }
-    while (b2 > b1 && b2>=t2)
-    {
-	spanstart[b2] = x;
-	b2--;
-    }
-}
-
-
-
-//
-// R_DrawPlanes
-// At the end of each frame.
-//
-void R_DrawPlanes (void)
-{
-    visplane_t*		pl;
-    int			light;
-    int			x;
-    int			stop;
-    int			angle;
-    int                 lumpnum;
-				
-#ifdef RANGECHECK
-    if (ds_p - drawsegs > MAXDRAWSEGS)
-	I_Error ("R_DrawPlanes: drawsegs overflow (%td)",
-		 ds_p - drawsegs);
-    
-    if (lastvisplane - visplanes > MAXVISPLANES)
-	I_Error ("R_DrawPlanes: visplane overflow (%td)",
-		 lastvisplane - visplanes);
-    
-    if (lastopening - openings > MAXOPENINGS)
-	I_Error ("R_DrawPlanes: opening overflow (%td)",
-		 lastopening - openings);
-#endif
-
-    for (pl = visplanes ; pl < lastvisplane ; pl++)
-    {
-	if (pl->minx > pl->maxx)
-	    continue;
-
-	
-	// sky flat
-	if (pl->picnum == skyflatnum)
-	{
-	    dc_iscale = pspriteiscale>>detailshift;
-	    
-	    // Sky is allways drawn full bright,
-	    //  i.e. colormaps[0] is used.
-	    // Because of this hack, sky is not affected
-	    //  by INVUL inverse mapping.
-	    dc_colormap = colormaps;
-	    dc_texturemid = skytexturemid;
-	    for (x=pl->minx ; x <= pl->maxx ; x++)
-	    {
-		dc_yl = pl->top[x];
-		dc_yh = pl->bottom[x];
-
-		if (dc_yl <= dc_yh)
-		{
-		    angle = (viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
-		    dc_x = x;
-		    dc_source = R_GetColumn(skytexture, angle);
-		    colfunc ();
-		}
-	    }
-	    continue;
-	}
-	
-	// regular flat
-        lumpnum = firstflat + flattranslation[pl->picnum];
-	ds_source = W_CacheLumpNum(lumpnum, PU_STATIC);
-	
-	planeheight = abs(pl->height-viewz);
-	light = (pl->lightlevel >> LIGHTSEGSHIFT)+extralight;
-
-	if (light >= LIGHTLEVELS)
-	    light = LIGHTLEVELS-1;
-
-	if (light < 0)
-	    light = 0;
-
-	planezlight = zlight[light];
-
-	pl->top[pl->maxx+1] = 0xff;
-	pl->top[pl->minx-1] = 0xff;
-		
-	stop = pl->maxx + 1;
-
-	for (x=pl->minx ; x<= stop ; x++)
-	{
-	    R_MakeSpans(x,pl->top[x-1],
-			pl->bottom[x-1],
-			pl->top[x],
-			pl->bottom[x]);
-	}
-	
-        W_ReleaseLumpNum(lumpnum);
-    }
-}
diff --git a/games/NXDoom/src/strife/r_plane.h b/games/NXDoom/src/strife/r_plane.h
deleted file mode 100644
index 57b50e5bc..000000000
--- a/games/NXDoom/src/strife/r_plane.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh, visplane stuff (floor, ceilings).
-//
-
-
-#ifndef __R_PLANE__
-#define __R_PLANE__
-
-
-#include "r_data.h"
-
-
-
-// Visplane related.
-extern  short*		lastopening;
-
-
-typedef void (*planefunction_t) (int top, int bottom);
-
-extern planefunction_t	floorfunc;
-extern planefunction_t	ceilingfunc_t;
-
-extern short		floorclip[SCREENWIDTH];
-extern short		ceilingclip[SCREENWIDTH];
-
-extern fixed_t		yslope[SCREENHEIGHT];
-extern fixed_t		distscale[SCREENWIDTH];
-
-void R_InitPlanes (void);
-void R_ClearPlanes (void);
-
-void
-R_MapPlane
-( int		y,
-  int		x1,
-  int		x2 );
-
-void
-R_MakeSpans
-( int		x,
-  int		t1,
-  int		b1,
-  int		t2,
-  int		b2 );
-
-void R_DrawPlanes (void);
-
-visplane_t*
-R_FindPlane
-( fixed_t	height,
-  int		picnum,
-  int		lightlevel );
-
-visplane_t*
-R_CheckPlane
-( visplane_t*	pl,
-  int		start,
-  int		stop );
-
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_segs.c b/games/NXDoom/src/strife/r_segs.c
deleted file mode 100644
index 179565035..000000000
--- a/games/NXDoom/src/strife/r_segs.c
+++ /dev/null
@@ -1,754 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	All the clipping: columns, horizontal spans, sky columns.
-//
-
-
-
-
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "i_system.h"
-
-#include "doomdef.h"
-#include "doomstat.h"
-
-#include "r_local.h"
-#include "r_sky.h"
-
-
-// OPTIMIZE: closed two sided lines as single sided
-
-// True if any of the segs textures might be visible.
-boolean		segtextured;	
-
-// False if the back side is the same plane.
-boolean		markfloor;	
-boolean		markceiling;
-
-boolean		maskedtexture;
-int		toptexture;
-int		bottomtexture;
-int		midtexture;
-
-
-angle_t		rw_normalangle;
-// angle to line origin
-int		rw_angle1;	
-
-//
-// regular wall
-//
-int		rw_x;
-int		rw_stopx;
-angle_t		rw_centerangle;
-fixed_t		rw_offset;
-fixed_t		rw_distance;
-fixed_t		rw_scale;
-fixed_t		rw_scalestep;
-fixed_t		rw_midtexturemid;
-fixed_t		rw_toptexturemid;
-fixed_t		rw_bottomtexturemid;
-
-int		worldtop;
-int		worldbottom;
-int		worldhigh;
-int		worldlow;
-
-fixed_t		pixhigh;
-fixed_t		pixlow;
-fixed_t		pixhighstep;
-fixed_t		pixlowstep;
-
-fixed_t		topfrac;
-fixed_t		topstep;
-
-fixed_t		bottomfrac;
-fixed_t		bottomstep;
-
-
-lighttable_t**	walllights;
-
-short*		maskedtexturecol;
-
-
-
-//
-// R_RenderMaskedSegRange
-//
-void
-R_RenderMaskedSegRange
-( drawseg_t*	ds,
-  int		x1,
-  int		x2 )
-{
-    unsigned	index;
-    column_t*	col;
-    int		lightnum;
-    int		texnum;
-    
-    // Calculate light table.
-    // Use different light tables
-    //   for horizontal / vertical / diagonal. Diagonal?
-    // OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-    curline = ds->curline;
-    frontsector = curline->frontsector;
-    backsector = curline->backsector;
-    texnum = texturetranslation[curline->sidedef->midtexture];
-	
-    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
-
-    if (curline->v1->y == curline->v2->y)
-	lightnum--;
-    else if (curline->v1->x == curline->v2->x)
-	lightnum++;
-
-    if (lightnum < 0)		
-	walllights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-	walllights = scalelight[LIGHTLEVELS-1];
-    else
-	walllights = scalelight[lightnum];
-
-    maskedtexturecol = ds->maskedtexturecol;
-
-    rw_scalestep = ds->scalestep;		
-    spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
-    mfloorclip = ds->sprbottomclip;
-    mceilingclip = ds->sprtopclip;
-    
-    // find positioning
-    if (curline->linedef->flags & ML_DONTPEGBOTTOM)
-    {
-	dc_texturemid = frontsector->floorheight > backsector->floorheight
-	    ? frontsector->floorheight : backsector->floorheight;
-	dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
-    }
-    else
-    {
-	dc_texturemid =frontsector->ceilingheight<backsector->ceilingheight
-	    ? frontsector->ceilingheight : backsector->ceilingheight;
-	dc_texturemid = dc_texturemid - viewz;
-    }
-    dc_texturemid += curline->sidedef->rowoffset;
-			
-    if (fixedcolormap)
-	dc_colormap = fixedcolormap;
-
-    // villsa [STRIFE] render as transparent (25% or 75%?)
-    if(curline->linedef->flags & ML_TRANSPARENT1)
-        colfunc = fuzzcolfunc;
-
-    // villsa [STRIFE] render as transparent (25% or 75%?)
-    if(curline->linedef->flags & ML_TRANSPARENT2)
-        colfunc = R_DrawMVisTLColumn;
-    
-    // draw the columns
-    for (dc_x = x1 ; dc_x <= x2 ; dc_x++)
-    {
-	// calculate lighting
-	if (maskedtexturecol[dc_x] != SHRT_MAX)
-	{
-	    if (!fixedcolormap)
-	    {
-		index = spryscale>>LIGHTSCALESHIFT;
-
-		if (index >=  MAXLIGHTSCALE )
-		    index = MAXLIGHTSCALE-1;
-
-		dc_colormap = walllights[index];
-	    }
-			
-	    sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-	    dc_iscale = 0xffffffffu / (unsigned)spryscale;
-	    
-	    // draw the texture
-	    col = (column_t *)( 
-		(byte *)R_GetColumn(texnum,maskedtexturecol[dc_x]) -3);
-			
-            // villsa [STRIFE] added 0 argument
-	    R_DrawMaskedColumn (col, 0);
-	    maskedtexturecol[dc_x] = SHRT_MAX;
-	}
-	spryscale += rw_scalestep;
-    }
-
-    colfunc = basecolfunc;  // villsa [STRIFE] reset draw routines
-	
-}
-
-
-
-
-//
-// R_RenderSegLoop
-// Draws zero, one, or two textures (and possibly a masked
-//  texture) for walls.
-// Can draw or mark the starting pixel of floor and ceiling
-//  textures.
-// CALLED: CORE LOOPING ROUTINE.
-//
-#define HEIGHTBITS		12
-#define HEIGHTUNIT		(1<<HEIGHTBITS)
-
-void R_RenderSegLoop (void)
-{
-    angle_t		angle;
-    unsigned		index;
-    int			yl;
-    int			yh;
-    int			mid;
-    fixed_t		texturecolumn;
-    int			top;
-    int			bottom;
-
-    for ( ; rw_x < rw_stopx ; rw_x++)
-    {
-	// mark floor / ceiling areas
-	yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
-
-	// no space above wall?
-	if (yl < ceilingclip[rw_x]+1)
-	    yl = ceilingclip[rw_x]+1;
-	
-	if (markceiling)
-	{
-	    top = ceilingclip[rw_x]+1;
-	    bottom = yl-1;
-
-	    if (bottom >= floorclip[rw_x])
-		bottom = floorclip[rw_x]-1;
-
-	    if (top <= bottom)
-	    {
-		ceilingplane->top[rw_x] = top;
-		ceilingplane->bottom[rw_x] = bottom;
-	    }
-	}
-		
-	yh = bottomfrac>>HEIGHTBITS;
-
-	if (yh >= floorclip[rw_x])
-	    yh = floorclip[rw_x]-1;
-
-	if (markfloor)
-	{
-	    top = yh+1;
-	    bottom = floorclip[rw_x]-1;
-	    if (top <= ceilingclip[rw_x])
-		top = ceilingclip[rw_x]+1;
-	    if (top <= bottom)
-	    {
-		floorplane->top[rw_x] = top;
-		floorplane->bottom[rw_x] = bottom;
-	    }
-	}
-	
-	// texturecolumn and lighting are independent of wall tiers
-	if (segtextured)
-	{
-	    // calculate texture offset
-	    angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
-	    texturecolumn = rw_offset-FixedMul(finetangent[angle],rw_distance);
-	    texturecolumn >>= FRACBITS;
-	    // calculate lighting
-	    index = rw_scale>>LIGHTSCALESHIFT;
-
-	    if (index >=  MAXLIGHTSCALE )
-		index = MAXLIGHTSCALE-1;
-
-	    dc_colormap = walllights[index];
-	    dc_x = rw_x;
-	    dc_iscale = 0xffffffffu / (unsigned)rw_scale;
-	}
-        else
-        {
-            // purely to shut up the compiler
-
-            texturecolumn = 0;
-        }
-	
-	// draw the wall tiers
-	if (midtexture)
-	{
-	    // single sided line
-	    dc_yl = yl;
-	    dc_yh = yh;
-	    dc_texturemid = rw_midtexturemid;
-	    dc_source = R_GetColumn(midtexture,texturecolumn);
-	    colfunc ();
-	    ceilingclip[rw_x] = viewheight;
-	    floorclip[rw_x] = -1;
-	}
-	else
-	{
-	    // two sided line
-	    if (toptexture)
-	    {
-		// top wall
-		mid = pixhigh>>HEIGHTBITS;
-		pixhigh += pixhighstep;
-
-		if (mid >= floorclip[rw_x])
-		    mid = floorclip[rw_x]-1;
-
-		if (mid >= yl)
-		{
-		    dc_yl = yl;
-		    dc_yh = mid;
-		    dc_texturemid = rw_toptexturemid;
-		    dc_source = R_GetColumn(toptexture,texturecolumn);
-		    colfunc ();
-		    ceilingclip[rw_x] = mid;
-		}
-		else
-		    ceilingclip[rw_x] = yl-1;
-	    }
-	    else
-	    {
-		// no top wall
-		if (markceiling)
-		    ceilingclip[rw_x] = yl-1;
-	    }
-			
-	    if (bottomtexture)
-	    {
-		// bottom wall
-		mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
-		pixlow += pixlowstep;
-
-		// no space above wall?
-		if (mid <= ceilingclip[rw_x])
-		    mid = ceilingclip[rw_x]+1;
-		
-		if (mid <= yh)
-		{
-		    dc_yl = mid;
-		    dc_yh = yh;
-		    dc_texturemid = rw_bottomtexturemid;
-		    dc_source = R_GetColumn(bottomtexture,
-					    texturecolumn);
-		    colfunc ();
-		    floorclip[rw_x] = mid;
-		}
-		else
-		    floorclip[rw_x] = yh+1;
-	    }
-	    else
-	    {
-		// no bottom wall
-		if (markfloor)
-		    floorclip[rw_x] = yh+1;
-	    }
-			
-	    if (maskedtexture)
-	    {
-		// save texturecol
-		//  for backdrawing of masked mid texture
-		maskedtexturecol[rw_x] = texturecolumn;
-	    }
-	}
-		
-	rw_scale += rw_scalestep;
-	topfrac += topstep;
-	bottomfrac += bottomstep;
-    }
-}
-
-
-
-
-//
-// R_StoreWallRange
-// A wall segment will be drawn
-//  between start and stop pixels (inclusive).
-//
-void
-R_StoreWallRange
-( int	start,
-  int	stop )
-{
-    fixed_t		hyp;
-    fixed_t		sineval;
-    angle_t		distangle, offsetangle;
-    fixed_t		vtop;
-    int			lightnum;
-
-    // don't overflow and crash
-    if (ds_p == &drawsegs[MAXDRAWSEGS])
-	return;		
-		
-#ifdef RANGECHECK
-    if (start >=viewwidth || start > stop)
-	I_Error ("Bad R_RenderWallRange: %i to %i", start , stop);
-#endif
-    
-    sidedef = curline->sidedef;
-    linedef = curline->linedef;
-
-    // mark the segment as visible for auto map
-    linedef->flags |= ML_MAPPED;
-    
-    // calculate rw_distance for scale calculation
-    rw_normalangle = curline->angle + ANG90;
-    offsetangle = abs((int) rw_normalangle - (int) rw_angle1);
-    
-    if (offsetangle > ANG90)
-	offsetangle = ANG90;
-
-    distangle = ANG90 - offsetangle;
-    hyp = R_PointToDist (curline->v1->x, curline->v1->y);
-    sineval = finesine[distangle>>ANGLETOFINESHIFT];
-    rw_distance = FixedMul (hyp, sineval);
-		
-	
-    ds_p->x1 = rw_x = start;
-    ds_p->x2 = stop;
-    ds_p->curline = curline;
-    rw_stopx = stop+1;
-    
-    // calculate scale at both ends and step
-    ds_p->scale1 = rw_scale = 
-	R_ScaleFromGlobalAngle (viewangle + xtoviewangle[start]);
-    
-    if (stop > start )
-    {
-	ds_p->scale2 = R_ScaleFromGlobalAngle (viewangle + xtoviewangle[stop]);
-	ds_p->scalestep = rw_scalestep = 
-	    (ds_p->scale2 - rw_scale) / (stop-start);
-    }
-    else
-    {
-	// UNUSED: try to fix the stretched line bug
-#if 0
-	if (rw_distance < FRACUNIT/2)
-	{
-	    fixed_t		trx,try;
-	    fixed_t		gxt,gyt;
-
-	    trx = curline->v1->x - viewx;
-	    try = curline->v1->y - viewy;
-			
-	    gxt = FixedMul(trx,viewcos); 
-	    gyt = -FixedMul(try,viewsin); 
-	    ds_p->scale1 = FixedDiv(projection, gxt-gyt)<<detailshift;
-	}
-#endif
-	ds_p->scale2 = ds_p->scale1;
-    }
-    
-    // calculate texture boundaries
-    //  and decide if floor / ceiling marks are needed
-    worldtop = frontsector->ceilingheight - viewz;
-    worldbottom = frontsector->floorheight - viewz;
-	
-    midtexture = toptexture = bottomtexture = maskedtexture = 0;
-    ds_p->maskedtexturecol = NULL;
-	
-    if (!backsector)
-    {
-	// single sided line
-	midtexture = texturetranslation[sidedef->midtexture];
-	// a single sided line is terminal, so it must mark ends
-	markfloor = markceiling = true;
-	if (linedef->flags & ML_DONTPEGBOTTOM)
-	{
-	    vtop = frontsector->floorheight +
-		textureheight[sidedef->midtexture];
-	    // bottom of texture at bottom
-	    rw_midtexturemid = vtop - viewz;	
-	}
-	else
-	{
-	    // top of texture at top
-	    rw_midtexturemid = worldtop;
-	}
-	rw_midtexturemid += sidedef->rowoffset;
-
-	ds_p->silhouette = SIL_BOTH;
-	ds_p->sprtopclip = screenheightarray;
-	ds_p->sprbottomclip = negonearray;
-	ds_p->bsilheight = INT_MAX;
-	ds_p->tsilheight = INT_MIN;
-    }
-    else
-    {
-	// two sided line
-	ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
-	ds_p->silhouette = 0;
-	
-	if (frontsector->floorheight > backsector->floorheight)
-	{
-	    ds_p->silhouette = SIL_BOTTOM;
-	    ds_p->bsilheight = frontsector->floorheight;
-	}
-	else if (backsector->floorheight > viewz)
-	{
-	    ds_p->silhouette = SIL_BOTTOM;
-	    ds_p->bsilheight = INT_MAX;
-	    // ds_p->sprbottomclip = negonearray;
-	}
-	
-	if (frontsector->ceilingheight < backsector->ceilingheight)
-	{
-	    ds_p->silhouette |= SIL_TOP;
-	    ds_p->tsilheight = frontsector->ceilingheight;
-	}
-	else if (backsector->ceilingheight < viewz)
-	{
-	    ds_p->silhouette |= SIL_TOP;
-	    ds_p->tsilheight = INT_MIN;
-	    // ds_p->sprtopclip = screenheightarray;
-	}
-		
-	if (backsector->ceilingheight <= frontsector->floorheight)
-	{
-	    ds_p->sprbottomclip = negonearray;
-	    ds_p->bsilheight = INT_MAX;
-	    ds_p->silhouette |= SIL_BOTTOM;
-	}
-	
-	if (backsector->floorheight >= frontsector->ceilingheight)
-	{
-	    ds_p->sprtopclip = screenheightarray;
-	    ds_p->tsilheight = INT_MIN;
-	    ds_p->silhouette |= SIL_TOP;
-	}
-	
-	worldhigh = backsector->ceilingheight - viewz;
-	worldlow = backsector->floorheight - viewz;
-		
-	// hack to allow height changes in outdoor areas
-	if (frontsector->ceilingpic == skyflatnum 
-	    && backsector->ceilingpic == skyflatnum)
-	{
-	    worldtop = worldhigh;
-	}
-	
-			
-	if (worldlow != worldbottom 
-	    || backsector->floorpic != frontsector->floorpic
-	    || backsector->lightlevel != frontsector->lightlevel)
-	{
-	    markfloor = true;
-	}
-	else
-	{
-	    // same plane on both sides
-	    markfloor = false;
-	}
-	
-			
-	if (worldhigh != worldtop 
-	    || backsector->ceilingpic != frontsector->ceilingpic
-	    || backsector->lightlevel != frontsector->lightlevel)
-	{
-	    markceiling = true;
-	}
-	else
-	{
-	    // same plane on both sides
-	    markceiling = false;
-	}
-	
-	if (backsector->ceilingheight <= frontsector->floorheight
-	    || backsector->floorheight >= frontsector->ceilingheight)
-	{
-	    // closed door
-	    markceiling = markfloor = true;
-	}
-	
-
-	if (worldhigh < worldtop)
-	{
-	    // top texture
-	    toptexture = texturetranslation[sidedef->toptexture];
-	    if (linedef->flags & ML_DONTPEGTOP)
-	    {
-		// top of texture at top
-		rw_toptexturemid = worldtop;
-	    }
-	    else
-	    {
-		vtop =
-		    backsector->ceilingheight
-		    + textureheight[sidedef->toptexture];
-		
-		// bottom of texture
-		rw_toptexturemid = vtop - viewz;	
-	    }
-	}
-	if (worldlow > worldbottom)
-	{
-	    // bottom texture
-	    bottomtexture = texturetranslation[sidedef->bottomtexture];
-
-	    if (linedef->flags & ML_DONTPEGBOTTOM )
-	    {
-		// bottom of texture at bottom
-		// top of texture at top
-		rw_bottomtexturemid = worldtop;
-	    }
-	    else	// top of texture at top
-		rw_bottomtexturemid = worldlow;
-	}
-	rw_toptexturemid += sidedef->rowoffset;
-	rw_bottomtexturemid += sidedef->rowoffset;
-	
-	// allocate space for masked texture tables
-	if (sidedef->midtexture)
-	{
-	    // masked midtexture
-	    maskedtexture = true;
-	    ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
-	    lastopening += rw_stopx - rw_x;
-	}
-    }
-    
-    // calculate rw_offset (only needed for textured lines)
-    segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
-
-    if (segtextured)
-    {
-	offsetangle = rw_normalangle-rw_angle1;
-	
-	if (offsetangle > ANG180)
-	    offsetangle = 0 - offsetangle;
-
-	if (offsetangle > ANG90)
-	    offsetangle = ANG90;
-
-	sineval = finesine[offsetangle >>ANGLETOFINESHIFT];
-	rw_offset = FixedMul (hyp, sineval);
-
-	if (rw_normalangle-rw_angle1 < ANG180)
-	    rw_offset = -rw_offset;
-
-	rw_offset += sidedef->textureoffset + curline->offset;
-	rw_centerangle = ANG90 + viewangle - rw_normalangle;
-	
-	// calculate light table
-	//  use different light tables
-	//  for horizontal / vertical / diagonal
-	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-	if (!fixedcolormap)
-	{
-	    lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT)+extralight;
-
-	    if (curline->v1->y == curline->v2->y)
-		lightnum--;
-	    else if (curline->v1->x == curline->v2->x)
-		lightnum++;
-
-	    if (lightnum < 0)		
-		walllights = scalelight[0];
-	    else if (lightnum >= LIGHTLEVELS)
-		walllights = scalelight[LIGHTLEVELS-1];
-	    else
-		walllights = scalelight[lightnum];
-	}
-    }
-    
-    // if a floor / ceiling plane is on the wrong side
-    //  of the view plane, it is definitely invisible
-    //  and doesn't need to be marked.
-    
-  
-    if (frontsector->floorheight >= viewz)
-    {
-	// above view plane
-	markfloor = false;
-    }
-    
-    if (frontsector->ceilingheight <= viewz 
-	&& frontsector->ceilingpic != skyflatnum)
-    {
-	// below view plane
-	markceiling = false;
-    }
-
-    
-    // calculate incremental stepping values for texture edges
-    worldtop >>= 4;
-    worldbottom >>= 4;
-	
-    topstep = -FixedMul (rw_scalestep, worldtop);
-    topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
-
-    bottomstep = -FixedMul (rw_scalestep,worldbottom);
-    bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
-	
-    if (backsector)
-    {	
-	worldhigh >>= 4;
-	worldlow >>= 4;
-
-	if (worldhigh < worldtop)
-	{
-	    pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
-	    pixhighstep = -FixedMul (rw_scalestep,worldhigh);
-	}
-	
-	if (worldlow > worldbottom)
-	{
-	    pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
-	    pixlowstep = -FixedMul (rw_scalestep,worldlow);
-	}
-    }
-    
-    // render it
-    if (markceiling)
-	ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
-    
-    if (markfloor)
-	floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
-
-    R_RenderSegLoop ();
-
-    
-    // save sprite clipping info
-    if ( ((ds_p->silhouette & SIL_TOP) || maskedtexture)
-	 && !ds_p->sprtopclip)
-    {
-	memcpy (lastopening, ceilingclip+start, 2*(rw_stopx-start));
-	ds_p->sprtopclip = lastopening - start;
-	lastopening += rw_stopx - start;
-    }
-    
-    if ( ((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
-	 && !ds_p->sprbottomclip)
-    {
-	memcpy (lastopening, floorclip+start, 2*(rw_stopx-start));
-	ds_p->sprbottomclip = lastopening - start;
-	lastopening += rw_stopx - start;	
-    }
-
-    if (maskedtexture && !(ds_p->silhouette&SIL_TOP))
-    {
-	ds_p->silhouette |= SIL_TOP;
-	ds_p->tsilheight = INT_MIN;
-    }
-    if (maskedtexture && !(ds_p->silhouette&SIL_BOTTOM))
-    {
-	ds_p->silhouette |= SIL_BOTTOM;
-	ds_p->bsilheight = INT_MAX;
-    }
-    ds_p++;
-}
-
diff --git a/games/NXDoom/src/strife/r_segs.h b/games/NXDoom/src/strife/r_segs.h
deleted file mode 100644
index 8e6a768f4..000000000
--- a/games/NXDoom/src/strife/r_segs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh module, drawing LineSegs from BSP.
-//
-
-
-#ifndef __R_SEGS__
-#define __R_SEGS__
-
-
-extern lighttable_t **walllights;
-
-
-void
-R_RenderMaskedSegRange
-( drawseg_t*	ds,
-  int		x1,
-  int		x2 );
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_sky.c b/games/NXDoom/src/strife/r_sky.c
deleted file mode 100644
index 007740a8a..000000000
--- a/games/NXDoom/src/strife/r_sky.c
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Sky rendering. The DOOM sky is a texture map like any
-//  wall, wrapping around. A 1024 columns equal 360 degrees.
-//  The default sky map is 256 columns and repeats 4 times
-//  on a 320 screen?
-//  
-//
-
-
-
-// Needed for FRACUNIT.
-#include "m_fixed.h"
-
-// Needed for Flat retrieval.
-#include "r_data.h"
-
-
-#include "r_sky.h"
-
-//
-// sky mapping
-//
-int			skyflatnum;
-int			skytexture;
-int			skytexturemid;
-
-
-
-//
-// R_InitSkyMap
-// Called whenever the view size changes.
-//
-void R_InitSkyMap (void)
-{
-    // haleyjd 10/03/10: [STRIFE] Sky is set here, not in G_DoLoadLevel.
-    // Also skytexturemid changed from 100 to 199.
-    skyflatnum = R_FlatNumForName ( SKYFLATNAME );
-    skytexturemid = 199*FRACUNIT;
-}
-
diff --git a/games/NXDoom/src/strife/r_sky.h b/games/NXDoom/src/strife/r_sky.h
deleted file mode 100644
index fbcfa1ae9..000000000
--- a/games/NXDoom/src/strife/r_sky.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Sky rendering.
-//
-
-
-#ifndef __R_SKY__
-#define __R_SKY__
-
-
-
-// SKY, store the number for name.
-#define			SKYFLATNAME  "F_SKY001" // villsa [STRIFE]
-
-// The sky map is 256*128*4 maps.
-#define ANGLETOSKYSHIFT		22
-
-extern  int		skytexture;
-extern int		skytexturemid;
-
-// Called whenever the view size changes.
-void R_InitSkyMap (void);
-
-#endif
diff --git a/games/NXDoom/src/strife/r_state.h b/games/NXDoom/src/strife/r_state.h
deleted file mode 100644
index 2a60e2fe8..000000000
--- a/games/NXDoom/src/strife/r_state.h
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh/render internal state variables (global).
-//
-
-
-#ifndef __R_STATE__
-#define __R_STATE__
-
-// Need data structure definitions.
-#include "d_player.h"
-#include "r_data.h"
-
-
-
-
-
-
-//
-// Refresh internal data structures,
-//  for rendering.
-//
-
-// needed for texture pegging
-extern fixed_t*		textureheight;
-
-// needed for pre rendering (fracs)
-extern fixed_t*		spritewidth;
-
-extern fixed_t*		spriteoffset;
-extern fixed_t*		spritetopoffset;
-
-extern lighttable_t*	colormaps;
-
-extern int		viewwidth;
-extern int		scaledviewwidth;
-extern int		viewheight;
-
-extern int		firstflat;
-
-// for global animation
-extern int*		flattranslation;	
-extern int*		texturetranslation;	
-
-
-// Sprite....
-extern int		firstspritelump;
-extern int		lastspritelump;
-extern int		numspritelumps;
-
-
-
-//
-// Lookup tables for map data.
-//
-extern int		numsprites;
-extern spritedef_t*	sprites;
-
-extern int		numvertexes;
-extern vertex_t*	vertexes;
-
-extern int		numsegs;
-extern seg_t*		segs;
-
-extern int		numsectors;
-extern sector_t*	sectors;
-
-extern int		numsubsectors;
-extern subsector_t*	subsectors;
-
-extern int		numnodes;
-extern node_t*		nodes;
-
-extern int		numlines;
-extern line_t*		lines;
-
-extern int		numsides;
-extern side_t*		sides;
-
-
-//
-// POV data.
-//
-extern fixed_t		viewx;
-extern fixed_t		viewy;
-extern fixed_t		viewz;
-
-extern angle_t		viewangle;
-extern player_t*	viewplayer;
-
-
-// ?
-extern angle_t		clipangle;
-
-extern int		viewangletox[FINEANGLES/2];
-extern angle_t		xtoviewangle[SCREENWIDTH+1];
-//extern fixed_t		finetangent[FINEANGLES/2];
-
-extern fixed_t		rw_distance;
-extern angle_t		rw_normalangle;
-
-
-
-// angle to line origin
-extern int		rw_angle1;
-
-// Segs count?
-extern int		sscount;
-
-extern visplane_t*	floorplane;
-extern visplane_t*	ceilingplane;
-
-
-#endif
diff --git a/games/NXDoom/src/strife/r_things.c b/games/NXDoom/src/strife/r_things.c
deleted file mode 100644
index e49f7bc10..000000000
--- a/games/NXDoom/src/strife/r_things.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Refresh of things, i.e. objects represented by sprites.
-//
-
-
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-
-#include "deh_main.h"
-#include "doomdef.h"
-
-#include "i_swap.h"
-#include "i_system.h"
-#include "z_zone.h"
-#include "w_wad.h"
-
-#include "r_local.h"
-
-#include "doomstat.h"
-
-// haleyjd
-#include "p_local.h"
-
-
-
-#define MINZ				(FRACUNIT*4)
-#define BASEYCENTER			100
-
-//void R_DrawColumn (void);
-//void R_DrawFuzzColumn (void);
-
-
-
-typedef struct
-{
-    int		x1;
-    int		x2;
-	
-    int		column;
-    int		topclip;
-    int		bottomclip;
-
-} maskdraw_t;
-
-
-
-//
-// Sprite rotation 0 is facing the viewer,
-//  rotation 1 is one angle turn CLOCKWISE around the axis.
-// This is not the same as the angle,
-//  which increases counter clockwise (protractor).
-// There was a lot of stuff grabbed wrong, so I changed it...
-//
-fixed_t		pspritescale;
-fixed_t		pspriteiscale;
-
-lighttable_t**	spritelights;
-
-// constant arrays
-//  used for psprite clipping and initializing clipping
-short		negonearray[SCREENWIDTH];
-short		screenheightarray[SCREENWIDTH];
-
-
-//
-// INITIALIZATION FUNCTIONS
-//
-
-// variables used to look up
-//  and range check thing_t sprites patches
-spritedef_t*	sprites;
-int		numsprites;
-
-spriteframe_t	sprtemp[29];
-int		maxframe;
-const char	*spritename;
-
-
-
-
-//
-// R_InstallSpriteLump
-// Local function for R_InitSprites.
-//
-void
-R_InstallSpriteLump
-( int		lump,
-  unsigned	frame,
-  unsigned	rotation,
-  boolean	flipped )
-{
-    int		r;
-	
-    if (frame >= 29 || rotation > 8)
-	I_Error("R_InstallSpriteLump: "
-		"Bad frame characters in lump %i", lump);
-	
-    if ((int)frame > maxframe)
-	maxframe = frame;
-		
-    if (rotation == 0)
-    {
-	// the lump should be used for all rotations
-	if (sprtemp[frame].rotate == false)
-	    I_Error ("R_InitSprites: Sprite %s frame %c has "
-		     "multip rot=0 lump", spritename, 'A'+frame);
-
-	if (sprtemp[frame].rotate == true)
-	    I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
-		     "and a rot=0 lump", spritename, 'A'+frame);
-			
-	sprtemp[frame].rotate = false;
-	for (r=0 ; r<8 ; r++)
-	{
-	    sprtemp[frame].lump[r] = lump - firstspritelump;
-	    sprtemp[frame].flip[r] = (byte)flipped;
-	}
-	return;
-    }
-	
-    // the lump is only used for one rotation
-    if (sprtemp[frame].rotate == false)
-	I_Error ("R_InitSprites: Sprite %s frame %c has rotations "
-		 "and a rot=0 lump", spritename, 'A'+frame);
-		
-    sprtemp[frame].rotate = true;
-
-    // make 0 based
-    rotation--;		
-    if (sprtemp[frame].lump[rotation] != -1)
-	I_Error ("R_InitSprites: Sprite %s : %c : %c "
-		 "has two lumps mapped to it",
-		 spritename, 'A'+frame, '1'+rotation);
-		
-    sprtemp[frame].lump[rotation] = lump - firstspritelump;
-    sprtemp[frame].flip[rotation] = (byte)flipped;
-}
-
-
-
-
-//
-// R_InitSpriteDefs
-// Pass a null terminated list of sprite names
-//  (4 chars exactly) to be used.
-// Builds the sprite rotation matrixes to account
-//  for horizontally flipped sprites.
-// Will report an error if the lumps are inconsistant. 
-// Only called at startup.
-//
-// Sprite lump names are 4 characters for the actor,
-//  a letter for the frame, and a number for the rotation.
-// A sprite that is flippable will have an additional
-//  letter/number appended.
-// The rotation character can be 0 to signify no rotations.
-//
-void R_InitSpriteDefs (const char** namelist)
-{ 
-    const char **check;
-    int		i;
-    int		l;
-    int		frame;
-    int		rotation;
-    int		start;
-    int		end;
-    int		patched;
-		
-    // count the number of sprite names
-    check = namelist;
-    while (*check != NULL)
-	check++;
-
-    numsprites = check-namelist;
-	
-    if (!numsprites)
-	return;
-		
-    sprites = Z_Malloc(numsprites *sizeof(*sprites), PU_STATIC, NULL);
-	
-    start = firstspritelump-1;
-    end = lastspritelump+1;
-	
-    // scan all the lump names for each of the names,
-    //  noting the highest frame letter.
-    // Just compare 4 characters as ints
-    for (i=0 ; i<numsprites ; i++)
-    {
-	spritename = DEH_String(namelist[i]);
-	memset (sprtemp,-1, sizeof(sprtemp));
-		
-	maxframe = -1;
-	
-	// scan the lumps,
-	//  filling in the frames for whatever is found
-	for (l=start+1 ; l<end ; l++)
-	{
-	    if (!strncasecmp(lumpinfo[l]->name, spritename, 4))
-	    {
-		frame = lumpinfo[l]->name[4] - 'A';
-		rotation = lumpinfo[l]->name[5] - '0';
-
-		if (modifiedgame)
-		    patched = W_GetNumForName (lumpinfo[l]->name);
-		else
-		    patched = l;
-
-		R_InstallSpriteLump (patched, frame, rotation, false);
-
-		if (lumpinfo[l]->name[6])
-		{
-		    frame = lumpinfo[l]->name[6] - 'A';
-		    rotation = lumpinfo[l]->name[7] - '0';
-		    R_InstallSpriteLump (l, frame, rotation, true);
-		}
-	    }
-	}
-	
-	// check the frames that were found for completeness
-	if (maxframe == -1)
-	{
-	    sprites[i].numframes = 0;
-	    continue;
-	}
-		
-	maxframe++;
-	
-	for (frame = 0 ; frame < maxframe ; frame++)
-	{
-	    switch ((int)sprtemp[frame].rotate)
-	    {
-	      case -1:
-		// no rotations were found for that frame at all
-		I_Error ("R_InitSprites: No patches found "
-			 "for %s frame %c", spritename, frame+'A');
-		break;
-		
-	      case 0:
-		// only the first rotation is needed
-		break;
-			
-	      case 1:
-		// must have all 8 frames
-		for (rotation=0 ; rotation<8 ; rotation++)
-		    if (sprtemp[frame].lump[rotation] == -1)
-			I_Error ("R_InitSprites: Sprite %s frame %c "
-				 "is missing rotations",
-				 spritename, frame+'A');
-		break;
-	    }
-	}
-	
-	// allocate space for the frames present and copy sprtemp to it
-	sprites[i].numframes = maxframe;
-	sprites[i].spriteframes = 
-	    Z_Malloc (maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
-	memcpy (sprites[i].spriteframes, sprtemp, maxframe*sizeof(spriteframe_t));
-    }
-
-}
-
-
-
-
-//
-// GAME FUNCTIONS
-//
-vissprite_t	vissprites[MAXVISSPRITES];
-vissprite_t*	vissprite_p;
-int		newvissprite;
-int             sprbotscreen;       // villsa [STRIFE]
-
-
-
-//
-// R_InitSprites
-// Called at program start.
-//
-void R_InitSprites (const char** namelist)
-{
-    int		i;
-	
-    for (i=0 ; i<SCREENWIDTH ; i++)
-    {
-	negonearray[i] = -1;
-    }
-	
-    R_InitSpriteDefs (namelist);
-}
-
-
-
-//
-// R_ClearSprites
-// Called at frame start.
-//
-void R_ClearSprites (void)
-{
-    vissprite_p = vissprites;
-}
-
-
-//
-// R_NewVisSprite
-//
-vissprite_t	overflowsprite;
-
-vissprite_t* R_NewVisSprite (void)
-{
-    if (vissprite_p == &vissprites[MAXVISSPRITES])
-	return &overflowsprite;
-    
-    vissprite_p++;
-    return vissprite_p-1;
-}
-
-
-
-//
-// R_DrawMaskedColumn
-// Used for sprites and masked mid textures.
-// Masked means: partly transparent, i.e. stored
-//  in posts/runs of opaque pixels.
-//
-short*		mfloorclip;
-short*		mceilingclip;
-
-fixed_t		spryscale;
-fixed_t		sprtopscreen;
-
-//
-// R_DrawMaskedColumn
-//
-// villsa [STRIFE] new baseclip argument
-//
-void R_DrawMaskedColumn (column_t *column, int baseclip)
-{
-    int		topscreen;
-    int 	bottomscreen;
-    fixed_t	basetexturemid;
-
-    basetexturemid = dc_texturemid;
-
-    for ( ; column->topdelta != 0xff ; ) 
-    {
-        // calculate unclipped screen coordinates
-        //  for post
-        topscreen = sprtopscreen + spryscale*column->topdelta;
-        bottomscreen = topscreen + spryscale*column->length;
-
-        dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
-        dc_yh = (bottomscreen-1)>>FRACBITS;
-
-        if (dc_yh >= mfloorclip[dc_x])
-            dc_yh = mfloorclip[dc_x]-1;
-        if (dc_yl <= mceilingclip[dc_x])
-            dc_yl = mceilingclip[dc_x]+1;
-
-        // villsa [STRIFE] checks for clipping
-        if(baseclip)
-        {
-            if(dc_yh > baseclip)
-                dc_yh = baseclip;
-        }
-
-        if (dc_yl <= dc_yh)
-        {
-            dc_source = (byte *)column + 3;
-            dc_texturemid = basetexturemid - (column->topdelta<<FRACBITS);
-            // dc_source = (byte *)column + 3 - column->topdelta;
-
-            // Drawn by either R_DrawColumn
-            //  or (SHADOW) R_DrawFuzzColumn.
-            colfunc ();	
-        }
-        column = (column_t *)(  (byte *)column + column->length + 4);
-    }
-
-    dc_texturemid = basetexturemid;
-}
-
-
-
-//
-// R_DrawVisSprite
-//  mfloorclip and mceilingclip should also be set.
-//
-void
-R_DrawVisSprite
-( vissprite_t*          vis,
-  int                   x1,
-  int                   x2 )
-{
-    column_t*           column;
-    int                 texturecolumn;
-    fixed_t             frac;
-    patch_t*            patch;
-    int                 clip;   // villsa [STRIFE]
-    int                 translation;    // villsa [STRIFE]
-
-    patch = W_CacheLumpNum (vis->patch+firstspritelump, PU_CACHE);
-
-    dc_colormap = vis->colormap;
-
-    // villsa [STRIFE]
-    // haleyjd 09/06/10: updated MF_TRANSLATION for Strife
-    translation = vis->mobjflags & MF_TRANSLATION;
-    
-    // villsa [STRIFE] unused
-    /*if (!dc_colormap)
-    {
-        // NULL colormap = shadow draw
-        colfunc = fuzzcolfunc;
-    }*/
-
-    // villsa [STRIFE] Handle the two types of translucency
-    if(vis->mobjflags & MF_SHADOW)
-    {
-        if(!translation)
-        {
-            if(vis->mobjflags & MF_MVIS)
-                colfunc = R_DrawMVisTLColumn;
-            else
-                colfunc = fuzzcolfunc;
-        }
-        else
-        {
-            colfunc = R_DrawTRTLColumn;
-            dc_translation = translationtables - 256 + (translation >> (MF_TRANSSHIFT - 8));
-        }
-    }
-    else if(vis->mobjflags & MF_MVIS)
-    {
-        // haleyjd 20141215: [STRIFE] Objects which are *only* MF_MVIS (players
-        // using double Shadow Armors, in particular) are totally invisible. 
-        // Upstreamed after discovered in SVE. Note this causes a 
-        // vanilla-accurate glitch with Shadow Acolytes - if they die while
-        // MF_MVIS is set, A_Fall fails to remove it and their corpse will
-        // completely disappear (that's also fixed in SVE, but not here).
-        return;
-    }
-    else if(translation)     // villsa [STRIFE] new translation tables
-    {
-        colfunc = transcolfunc;
-        dc_translation = translationtables - 256 + (translation >> (MF_TRANSSHIFT - 8));
-    }
-
-    dc_iscale = abs(vis->xiscale)>>detailshift;
-    dc_texturemid = vis->texturemid;
-    frac = vis->startfrac;
-    spryscale = vis->scale;
-    sprtopscreen = centeryfrac - FixedMul(dc_texturemid,spryscale);
-
-    // villsa [STRIFE] clip sprite's feet if needed
-    if(vis->mobjflags & MF_FEETCLIPPED)
-    {
-        sprbotscreen = sprtopscreen + FixedMul(spryscale, SHORT(patch->height) << FRACBITS);
-        clip = (sprbotscreen - FixedMul(10*FRACUNIT, spryscale)) >> FRACBITS;
-    }
-    else
-        clip = 0;
-
-    for (dc_x=vis->x1 ; dc_x<=vis->x2 ; dc_x++, frac += vis->xiscale)
-    {
-        texturecolumn = frac>>FRACBITS;
-#ifdef RANGECHECK
-        if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
-            I_Error ("R_DrawSpriteRange: bad texturecolumn");
-#endif
-        column = (column_t *) ((byte *)patch +
-                               LONG(patch->columnofs[texturecolumn]));
-        R_DrawMaskedColumn (column, clip);  // villsa [STRIFE] clip argument
-    }
-
-    colfunc = basecolfunc;
-}
-
-
-
-//
-// R_ProjectSprite
-// Generates a vissprite for a thing
-//  if it might be visible.
-//
-void R_ProjectSprite (mobj_t* thing)
-{
-    fixed_t		tr_x;
-    fixed_t		tr_y;
-    
-    fixed_t		gxt;
-    fixed_t		gyt;
-    
-    fixed_t		tx;
-    fixed_t		tz;
-
-    fixed_t		xscale;
-    
-    int			x1;
-    int			x2;
-
-    spritedef_t*	sprdef;
-    spriteframe_t*	sprframe;
-    int			lump;
-    
-    unsigned		rot;
-    boolean		flip;
-    
-    int			index;
-
-    vissprite_t*	vis;
-    
-    angle_t		ang;
-    fixed_t		iscale;
-    
-    // transform the origin point
-    tr_x = thing->x - viewx;
-    tr_y = thing->y - viewy;
-	
-    gxt = FixedMul(tr_x,viewcos); 
-    gyt = -FixedMul(tr_y,viewsin);
-    
-    tz = gxt-gyt; 
-
-    // thing is behind view plane?
-    if (tz < MINZ)
-	return;
-    
-    xscale = FixedDiv(projection, tz);
-	
-    gxt = -FixedMul(tr_x,viewsin); 
-    gyt = FixedMul(tr_y,viewcos); 
-    tx = -(gyt+gxt); 
-
-    // too far off the side?
-    if (abs(tx)>(tz<<2))
-	return;
-    
-    // decide which patch to use for sprite relative to player
-#ifdef RANGECHECK
-    if ((unsigned int) thing->sprite >= (unsigned int) numsprites)
-	I_Error ("R_ProjectSprite: invalid sprite number %i ",
-		 thing->sprite);
-#endif
-    sprdef = &sprites[thing->sprite];
-#ifdef RANGECHECK
-    if ( (thing->frame&FF_FRAMEMASK) >= sprdef->numframes )
-	I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
-		 thing->sprite, thing->frame);
-#endif
-    sprframe = &sprdef->spriteframes[ thing->frame & FF_FRAMEMASK];
-
-    if (sprframe->rotate)
-    {
-	// choose a different rotation based on player view
-	ang = R_PointToAngle (thing->x, thing->y);
-	rot = (ang-thing->angle+(unsigned)(ANG45/2)*9)>>29;
-	lump = sprframe->lump[rot];
-	flip = (boolean)sprframe->flip[rot];
-    }
-    else
-    {
-	// use single rotation for all views
-	lump = sprframe->lump[0];
-	flip = (boolean)sprframe->flip[0];
-    }
-    
-    // calculate edges of the shape
-    tx -= spriteoffset[lump];	
-    x1 = (centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS;
-
-    // off the right side?
-    if (x1 > viewwidth)
-	return;
-    
-    tx +=  spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS) - 1;
-
-    // off the left side
-    if (x2 < 0)
-	return;
-    
-    // store information in a vissprite
-    vis = R_NewVisSprite ();
-    vis->mobjflags = thing->flags;
-    vis->scale = xscale<<detailshift;
-    vis->gx = thing->x;
-    vis->gy = thing->y;
-    vis->gz = thing->z;
-
-    // villsa [STRIFE]
-    if(thing->flags & MF_FEETCLIPPED)
-        vis->gz -= (10*FRACUNIT);
-
-    // villsa [STRIFE]
-    vis->gzt = vis->gz + spritetopoffset[lump];
-
-    vis->texturemid = vis->gzt - viewz;
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
-    iscale = FixedDiv (FRACUNIT, xscale);
-
-    if (flip)
-    {
-	vis->startfrac = spritewidth[lump]-1;
-	vis->xiscale = -iscale;
-    }
-    else
-    {
-	vis->startfrac = 0;
-	vis->xiscale = iscale;
-    }
-
-    if (vis->x1 > x1)
-	vis->startfrac += vis->xiscale*(vis->x1-x1);
-    vis->patch = lump;
-    
-    // get light level
-    // villsa [STRIFE] unused
-    /*if (thing->flags & MF_SHADOW)
-    {
-	// shadow draw
-	vis->colormap = NULL;
-    }
-    else */if (fixedcolormap)
-    {
-	// fixed map
-	vis->colormap = fixedcolormap;
-    }
-    else if (thing->frame & FF_FULLBRIGHT)
-    {
-	// full bright
-	vis->colormap = colormaps;
-    }
-    
-    else
-    {
-	// diminished light
-	index = xscale>>(LIGHTSCALESHIFT-detailshift);
-
-	if (index >= MAXLIGHTSCALE) 
-	    index = MAXLIGHTSCALE-1;
-
-	vis->colormap = spritelights[index];
-    }	
-}
-
-
-
-
-//
-// R_AddSprites
-// During BSP traversal, this adds sprites by sector.
-//
-void R_AddSprites (sector_t* sec)
-{
-    mobj_t*		thing;
-    int			lightnum;
-
-    // BSP is traversed by subsector.
-    // A sector might have been split into several
-    //  subsectors during BSP building.
-    // Thus we check whether its already added.
-    if (sec->validcount == validcount)
-	return;		
-
-    // Well, now it will be done.
-    sec->validcount = validcount;
-	
-    lightnum = (sec->lightlevel >> LIGHTSEGSHIFT)+extralight;
-
-    if (lightnum < 0)		
-	spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-	spritelights = scalelight[LIGHTLEVELS-1];
-    else
-	spritelights = scalelight[lightnum];
-
-    // Handle all things in sector.
-    for (thing = sec->thinglist ; thing ; thing = thing->snext)
-	R_ProjectSprite (thing);
-}
-
-
-//
-// R_DrawPSprite
-//
-void R_DrawPSprite (pspdef_t* psp)
-{
-    fixed_t		tx;
-    int			x1;
-    int			x2;
-    spritedef_t*	sprdef;
-    spriteframe_t*	sprframe;
-    int			lump;
-    boolean		flip;
-    vissprite_t*	vis;
-    vissprite_t		avis;
-    
-    // decide which patch to use
-#ifdef RANGECHECK
-    if ( (unsigned)psp->state->sprite >= (unsigned int) numsprites)
-        I_Error ("R_ProjectSprite: invalid sprite number %i ",
-                 psp->state->sprite);
-#endif
-    sprdef = &sprites[psp->state->sprite];
-#ifdef RANGECHECK
-    if ( (psp->state->frame & FF_FRAMEMASK)  >= sprdef->numframes)
-        I_Error ("R_ProjectSprite: invalid sprite frame %i : %i ",
-                 psp->state->sprite, psp->state->frame);
-#endif
-    sprframe = &sprdef->spriteframes[ psp->state->frame & FF_FRAMEMASK ];
-
-    lump = sprframe->lump[0];
-    // [STRIFE] haleyjd 20110629: -flip replaces this.
-    //flip = (boolean)sprframe->flip[0];
-    flip = flipparm;
-    
-    // calculate edges of the shape
-    tx = psp->sx-160*FRACUNIT;
-
-    tx -= spriteoffset[lump];	
-    x1 = (centerxfrac + FixedMul (tx,pspritescale) ) >>FRACBITS;
-
-    // off the right side
-    if (x1 > viewwidth)
-        return;
-
-    tx +=  spritewidth[lump];
-    x2 = ((centerxfrac + FixedMul (tx, pspritescale) ) >>FRACBITS) - 1;
-
-    // off the left side
-    if (x2 < 0)
-        return;
-    
-    // store information in a vissprite
-    vis = &avis;
-    vis->mobjflags = 0;
-    vis->x1 = x1 < 0 ? 0 : x1;
-    vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;	
-    vis->scale = pspritescale<<detailshift;
-    
-    if (flip)
-    {
-        vis->xiscale = -pspriteiscale;
-        vis->startfrac = spritewidth[lump]-1;
-    }
-    else
-    {
-        vis->xiscale = pspriteiscale;
-        vis->startfrac = 0;
-    }
-
-    // villsa [STRIFE] calculate y offset with view pitch
-    vis->texturemid = ((BASEYCENTER<<FRACBITS)+FRACUNIT/2)-(psp->sy-spritetopoffset[lump])
-        + FixedMul(vis->xiscale, (centery-viewheight/2)<<FRACBITS);
-
-    if (vis->x1 > x1)
-        vis->startfrac += vis->xiscale*(vis->x1-x1);
-
-    vis->patch = lump;
-
-    if (viewplayer->powers[pw_invisibility] > 4*32
-        || (viewplayer->powers[pw_invisibility] & 8))
-    {
-        // shadow draw
-        vis->colormap   = spritelights[MAXLIGHTSCALE-1];
-        vis->mobjflags |= MF_SHADOW;
-    }
-    else if(viewplayer->powers[pw_invisibility] & 4)
-    {
-        vis->mobjflags |= (MF_SHADOW|MF_MVIS);
-    }
-
-    // When not MVIS, or if SHADOW, behave normally:
-    if(!(viewplayer->mo->flags & MF_MVIS) || (viewplayer->mo->flags & MF_SHADOW))
-    {
-        if (fixedcolormap)
-        {
-            // fixed color
-            vis->colormap = fixedcolormap;
-        }
-        else if (psp->state->frame & FF_FULLBRIGHT)
-        {
-            // full bright
-            vis->colormap = colormaps;
-        }
-        else
-        {
-            // local light
-            vis->colormap = spritelights[MAXLIGHTSCALE-1];
-        }
-    }
-    else
-    {
-        // When MVIS, use invulnerability colormap
-        vis->colormap = colormaps + INVERSECOLORMAP * 256 * sizeof(lighttable_t);
-    }
-
-    R_DrawVisSprite (vis, vis->x1, vis->x2);
-}
-
-
-
-//
-// R_DrawPlayerSprites
-//
-void R_DrawPlayerSprites (void)
-{
-    int		i;
-    int		lightnum;
-    pspdef_t*	psp;
-    
-    // get light level
-    lightnum =
-	(viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) 
-	+extralight;
-
-    if (lightnum < 0)		
-	spritelights = scalelight[0];
-    else if (lightnum >= LIGHTLEVELS)
-	spritelights = scalelight[LIGHTLEVELS-1];
-    else
-	spritelights = scalelight[lightnum];
-    
-    // clip to screen bounds
-    mfloorclip = screenheightarray;
-    mceilingclip = negonearray;
-    
-    // add all active psprites
-    for (i=0, psp=viewplayer->psprites;
-	 i<NUMPSPRITES;
-	 i++,psp++)
-    {
-	if (psp->state)
-	    R_DrawPSprite (psp);
-    }
-}
-
-
-
-
-//
-// R_SortVisSprites
-//
-vissprite_t	vsprsortedhead;
-
-
-void R_SortVisSprites (void)
-{
-    int			i;
-    int			count;
-    vissprite_t*	ds;
-    vissprite_t*	best;
-    static vissprite_t	unsorted;
-    fixed_t		bestscale;
-
-    count = vissprite_p - vissprites;
-	
-    unsorted.next = unsorted.prev = &unsorted;
-
-    if (!count)
-	return;
-		
-    for (ds=vissprites ; ds<vissprite_p ; ds++)
-    {
-	ds->next = ds+1;
-	ds->prev = ds-1;
-    }
-    
-    vissprites[0].prev = &unsorted;
-    unsorted.next = &vissprites[0];
-    (vissprite_p-1)->next = &unsorted;
-    unsorted.prev = vissprite_p-1;
-    
-    // pull the vissprites out by scale
-
-    vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
-    for (i=0 ; i<count ; i++)
-    {
-	bestscale = INT_MAX;
-        best = unsorted.next;
-	for (ds=unsorted.next ; ds!= &unsorted ; ds=ds->next)
-	{
-	    if (ds->scale < bestscale)
-	    {
-		bestscale = ds->scale;
-		best = ds;
-	    }
-	}
-	best->next->prev = best->prev;
-	best->prev->next = best->next;
-	best->next = &vsprsortedhead;
-	best->prev = vsprsortedhead.prev;
-	vsprsortedhead.prev->next = best;
-	vsprsortedhead.prev = best;
-    }
-}
-
-
-
-//
-// R_DrawSprite
-//
-void R_DrawSprite (vissprite_t* spr)
-{
-    drawseg_t*		ds;
-    short		clipbot[SCREENWIDTH];
-    short		cliptop[SCREENWIDTH];
-    int			x;
-    int			r1;
-    int			r2;
-    fixed_t		scale;
-    fixed_t		lowscale;
-    int			silhouette;
-		
-    for (x = spr->x1 ; x<=spr->x2 ; x++)
-	clipbot[x] = cliptop[x] = -2;
-    
-    // Scan drawsegs from end to start for obscuring segs.
-    // The first drawseg that has a greater scale
-    //  is the clip seg.
-    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
-    {
-	// determine if the drawseg obscures the sprite
-	if (ds->x1 > spr->x2
-	    || ds->x2 < spr->x1
-	    || (!ds->silhouette
-		&& !ds->maskedtexturecol) )
-	{
-	    // does not cover sprite
-	    continue;
-	}
-			
-	r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
-	r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
-
-	if (ds->scale1 > ds->scale2)
-	{
-	    lowscale = ds->scale2;
-	    scale = ds->scale1;
-	}
-	else
-	{
-	    lowscale = ds->scale1;
-	    scale = ds->scale2;
-	}
-		
-	if (scale < spr->scale
-	    || ( lowscale < spr->scale
-		 && !R_PointOnSegSide (spr->gx, spr->gy, ds->curline) ) )
-	{
-	    // masked mid texture?
-	    if (ds->maskedtexturecol)	
-		R_RenderMaskedSegRange (ds, r1, r2);
-	    // seg is behind sprite
-	    continue;			
-	}
-
-	
-	// clip this piece of the sprite
-	silhouette = ds->silhouette;
-	
-	if (spr->gz >= ds->bsilheight)
-	    silhouette &= ~SIL_BOTTOM;
-
-	if (spr->gzt <= ds->tsilheight)
-	    silhouette &= ~SIL_TOP;
-			
-	if (silhouette == 1)
-	{
-	    // bottom sil
-	    for (x=r1 ; x<=r2 ; x++)
-		if (clipbot[x] == -2)
-		    clipbot[x] = ds->sprbottomclip[x];
-	}
-	else if (silhouette == 2)
-	{
-	    // top sil
-	    for (x=r1 ; x<=r2 ; x++)
-		if (cliptop[x] == -2)
-		    cliptop[x] = ds->sprtopclip[x];
-	}
-	else if (silhouette == 3)
-	{
-	    // both
-	    for (x=r1 ; x<=r2 ; x++)
-	    {
-		if (clipbot[x] == -2)
-		    clipbot[x] = ds->sprbottomclip[x];
-		if (cliptop[x] == -2)
-		    cliptop[x] = ds->sprtopclip[x];
-	    }
-	}
-		
-    }
-    
-    // all clipping has been performed, so draw the sprite
-
-    // check for unclipped columns
-    for (x = spr->x1 ; x<=spr->x2 ; x++)
-    {
-	if (clipbot[x] == -2)		
-	    clipbot[x] = viewheight;
-
-	if (cliptop[x] == -2)
-	    cliptop[x] = -1;
-    }
-		
-    mfloorclip = clipbot;
-    mceilingclip = cliptop;
-    R_DrawVisSprite (spr, spr->x1, spr->x2);
-}
-
-
-
-
-//
-// R_DrawMasked
-//
-void R_DrawMasked (void)
-{
-    vissprite_t*	spr;
-    drawseg_t*		ds;
-	
-    R_SortVisSprites ();
-
-    if (vissprite_p > vissprites)
-    {
-	// draw all vissprites back to front
-	for (spr = vsprsortedhead.next ;
-	     spr != &vsprsortedhead ;
-	     spr=spr->next)
-	{
-	    
-	    R_DrawSprite (spr);
-	}
-    }
-    
-    // render any remaining masked mid textures
-    for (ds=ds_p-1 ; ds >= drawsegs ; ds--)
-	if (ds->maskedtexturecol)
-	    R_RenderMaskedSegRange (ds, ds->x1, ds->x2);
-    
-    // draw the psprites on top of everything
-    //  but does not draw on side views
-    if (!viewangleoffset)		
-	R_DrawPlayerSprites ();
-}
-
-
-
diff --git a/games/NXDoom/src/strife/r_things.h b/games/NXDoom/src/strife/r_things.h
deleted file mode 100644
index edb14a54d..000000000
--- a/games/NXDoom/src/strife/r_things.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Rendering of moving objects, sprites.
-//
-
-
-#ifndef __R_THINGS__
-#define __R_THINGS__
-
-
-
-#define MAXVISSPRITES  	128
-
-extern vissprite_t	vissprites[MAXVISSPRITES];
-extern vissprite_t*	vissprite_p;
-extern vissprite_t	vsprsortedhead;
-
-// Constant arrays used for psprite clipping
-//  and initializing clipping.
-extern short		negonearray[SCREENWIDTH];
-extern short		screenheightarray[SCREENWIDTH];
-
-// vars for R_DrawMaskedColumn
-extern short*		mfloorclip;
-extern short*		mceilingclip;
-extern fixed_t		spryscale;
-extern fixed_t		sprtopscreen;
-
-extern fixed_t		pspritescale;
-extern fixed_t		pspriteiscale;
-
-
-// villsa [STIFE] new argument
-void R_DrawMaskedColumn (column_t *column, int baseclip);
-
-
-void R_SortVisSprites (void);
-
-void R_AddSprites (sector_t* sec);
-void R_AddPSprites (void);
-void R_DrawSprites (void);
-void R_InitSprites (const char** namelist);
-void R_ClearSprites (void);
-void R_DrawMasked (void);
-
-void
-R_ClipVisSprite
-( vissprite_t*		vis,
-  int			xl,
-  int			xh );
-
-
-#endif
diff --git a/games/NXDoom/src/strife/s_sound.c b/games/NXDoom/src/strife/s_sound.c
deleted file mode 100644
index 1de853fc0..000000000
--- a/games/NXDoom/src/strife/s_sound.c
+++ /dev/null
@@ -1,825 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:  none
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "i_sound.h"
-#include "i_system.h"
-
-#include "deh_str.h"
-
-#include "doomstat.h"
-#include "doomtype.h"
-
-#include "sounds.h"
-#include "s_sound.h"
-
-#include "m_misc.h"
-#include "m_random.h"
-#include "m_argv.h"
-
-#include "p_local.h"
-#include "w_wad.h"
-#include "z_zone.h"
-
-// when to clip out sounds
-// Does not fit the large outdoor areas.
-
-#define S_CLIPPING_DIST (1200 * FRACUNIT)
-
-// Distance tp origin when sounds should be maxed out.
-// This should relate to movement clipping resolution
-// (see BLOCKMAP handling).
-// In the source code release: (160*FRACUNIT).  Changed back to the 
-// Vanilla value of 200 (why was this changed?)
-
-#define S_CLOSE_DIST (200 * FRACUNIT)
-
-// The range over which sound attenuates
-
-#define S_ATTENUATOR ((S_CLIPPING_DIST - S_CLOSE_DIST) >> FRACBITS)
-
-// Stereo separation
-
-#define S_STEREO_SWING (96 * FRACUNIT)
-
-#define NORM_PRIORITY 64
-#define NORM_SEP 128
-
-typedef struct
-{
-    // sound information (if null, channel avail.)
-    sfxinfo_t *sfxinfo;
-
-    // origin of sound
-    mobj_t *origin;
-
-    // handle of the sound being played
-    int handle;
-
-    int pitch;
-    
-} channel_t;
-
-// The set of channels available
-
-static channel_t *channels;
-
-// Maximum volume of a sound effect.
-// Internal default is max out of 0-15.
-
-int sfxVolume = 8;
-
-// Maximum volume of music. 
-
-int musicVolume = 13;
-
-// haleyjd 08/29/10: [STRIFE] New global variable
-// Volume of voice channel.
-
-int voiceVolume = 15;
-
-// Internal volume level, ranging from 0-127
-
-static int snd_SfxVolume;
-
-// haleyjd 09/11/10: [STRIFE] Internal voice volume level
-
-static int snd_VoiceVolume;
-
-// Whether songs are mus_paused
-
-static boolean mus_paused;        
-
-// Music currently being played
-
-static musicinfo_t *mus_playing = NULL;
-
-// Number of channels to use
-
-int snd_channels = 8;
-
-// haleyjd 09/11/10: [STRIFE] Handle of current voice channel.
-// This has been implemented at a higher level than it was implemented
-// in strife1.exe, as there it relied on a priority system which was
-// implicit in the SFX_PlayPatch API of DMX. Here we'll just ignore
-// the current voice channel when doing normal sound playing.
-
-static int i_voicehandle = -1;
-
-// haleyjd 09/11/10: [STRIFE] whether to play voices or not
-int disable_voices = 0;
-
-//
-// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume,
-//  allocates channel buffer, sets S_sfx lookup.
-//
-// haleyjd 09/11/10: [STRIFE] Added voice volume
-//
-void S_Init(int sfxVolume, int musicVolume, int voiceVolume)
-{  
-    int i;
-
-    I_SetOPLDriverVer(opl_doom_1_9);
-    I_PrecacheSounds(S_sfx, NUMSFX);
-
-    S_SetSfxVolume(sfxVolume);
-    S_SetMusicVolume(musicVolume);
-    S_SetVoiceVolume(voiceVolume);
-
-    // Allocating the internal channels for mixing
-    // (the maximum numer of sounds rendered
-    // simultaneously) within zone memory.
-    channels = Z_Malloc(snd_channels*sizeof(channel_t), PU_STATIC, 0);
-
-    // Free all channels for use
-    for (i=0 ; i<snd_channels ; i++)
-    {
-        channels[i].sfxinfo = 0;
-    }
-
-    // no sounds are playing, and they are not mus_paused
-    mus_paused = 0;
-
-    // Note that sounds have not been cached (yet).
-    for (i=1 ; i<NUMSFX ; i++)
-    {
-        S_sfx[i].lumpnum = S_sfx[i].usefulness = -1;
-    }
-
-    I_AtExit(S_Shutdown, true);
-}
-
-void S_Shutdown(void)
-{
-    I_ShutdownSound();
-    I_ShutdownMusic();
-}
-
-static void S_StopChannel(int cnum)
-{
-    int i;
-    channel_t *c;
-
-    c = &channels[cnum];
-
-    // haleyjd: [STRIFE] If stopping the voice channel, set i_voicehandle to -1
-    if (cnum == i_voicehandle)
-        i_voicehandle = -1;
-
-    if (c->sfxinfo)
-    {
-        // stop the sound playing
-
-        if (I_SoundIsPlaying(c->handle))
-        {
-            I_StopSound(c->handle);
-        }
-
-        // check to see if other channels are playing the sound
-
-        for (i=0; i<snd_channels; i++)
-        {
-            if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
-            {
-                break;
-            }
-        }
-        
-        // degrade usefulness of sound data
-
-        c->sfxinfo->usefulness--;
-        c->sfxinfo = NULL;
-    }
-}
-
-//
-// Per level startup code.
-// Kills playing sounds at start of level,
-//  determines music if any, changes music.
-//
-// haleyjd 08/31/10: [STRIFE]
-// * Removed DOOM music handling and replaced with Strife code.
-//
-void S_Start(void)
-{
-    int cnum;
-    int mnum;
-
-    // kill all playing sounds at start of level
-    //  (trust me - a good idea)
-    for (cnum=0 ; cnum<snd_channels ; cnum++)
-    {
-        if (channels[cnum].sfxinfo)
-        {
-            S_StopChannel(cnum);
-        }
-    }
-
-    // start new music for the level
-    mus_paused = 0;
-
-    // [STRIFE] Some interesting math here ;)
-    if(gamemap <= 31)
-        mnum = 1;
-    else
-        mnum = -30;
-
-    S_ChangeMusic(gamemap + mnum, true);
-}
-
-void S_StopSound(mobj_t *origin)
-{
-    int cnum;
-
-    for (cnum=0 ; cnum<snd_channels ; cnum++)
-    {
-        // haleyjd: do not stop voice here.
-        if(cnum == i_voicehandle)
-            continue;
-
-        if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
-        {
-            S_StopChannel(cnum);
-            break;
-        }
-    }
-}
-
-//
-// S_GetChannel :
-//   If none available, return -1.  Otherwise channel #.
-//
-// haleyjd 09/11/10: [STRIFE] Added an "isvoice" parameter for supporting
-// voice playing.
-//
-static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo, boolean isvoice)
-{
-    // channel number to use
-    int                cnum;
-    
-    channel_t*        c;
-
-    // Find an open channel
-    for (cnum=0 ; cnum<snd_channels ; cnum++)
-    {
-        if (!channels[cnum].sfxinfo)
-        {
-            break;
-        } 
-        else if (origin && channels[cnum].origin == origin &&
-                 (isvoice || cnum != i_voicehandle)) // haleyjd
-        {
-            // haleyjd 20150220: [STRIFE] missing sound channel priority check
-            // Is a higher priority sound by same origin already playing?
-            if(!isvoice && sfxinfo->priority > channels[cnum].sfxinfo->priority)
-                return -1;
-
-            S_StopChannel(cnum);
-            break;
-        }
-    }
-
-    // None available
-    if (cnum == snd_channels)
-    {
-        // Look for lower priority
-        for (cnum=0 ; cnum<snd_channels ; cnum++)
-        {
-            if (channels[cnum].sfxinfo->priority >= sfxinfo->priority)
-            {
-                // haleyjd 09/11/10: [STRIFE] voice has absolute priority
-                if (isvoice || cnum != i_voicehandle)
-                    break;
-            }
-        }
-
-        if (cnum == snd_channels)
-        {
-            // FUCK!  No lower priority.  Sorry, Charlie.    
-            return -1;
-        }
-        else
-        {
-            // Otherwise, kick out lower priority.
-            S_StopChannel(cnum);
-        }
-    }
-
-    c = &channels[cnum];
-
-    // channel is decided to be cnum.
-    c->sfxinfo = sfxinfo;
-    c->origin = origin;
-
-    return cnum;
-}
-
-//
-// Changes volume and stereo-separation variables
-//  from the norm of a sound effect to be played.
-// If the sound is not audible, returns a 0.
-// Otherwise, modifies parameters and returns 1.
-//
-// [STRIFE]
-// haleyjd 20110220: changed to eliminate the gamemap == 8 hack that was
-// left over from Doom 1's original boss levels. Kind of amazing that Rogue
-// was able to catch the smallest things like that.
-//
-static int S_AdjustSoundParams(mobj_t *listener, mobj_t *source,
-                               int *vol, int *sep)
-{
-    fixed_t        approx_dist;
-    fixed_t        adx;
-    fixed_t        ady;
-    angle_t        angle;
-
-    // calculate the distance to sound origin
-    //  and clip it if necessary
-    adx = abs(listener->x - source->x);
-    ady = abs(listener->y - source->y);
-
-    // From _GG1_ p.428. Appox. eucledian distance fast.
-    approx_dist = adx + ady - ((adx < ady ? adx : ady)>>1);
-    
-    // [STRIFE] removed gamemap == 8 hack
-    if (approx_dist > S_CLIPPING_DIST)
-    {
-        return 0;
-    }
-    
-    // angle of source to listener
-    angle = R_PointToAngle2(listener->x,
-                            listener->y,
-                            source->x,
-                            source->y);
-
-    if (angle > listener->angle)
-    {
-        angle = angle - listener->angle;
-    }
-    else
-    {
-        angle = angle + (0xffffffff - listener->angle);
-    }
-
-    angle >>= ANGLETOFINESHIFT;
-
-    // stereo separation
-    *sep = 128 - (FixedMul(S_STEREO_SWING, finesine[angle]) >> FRACBITS);
-
-    // volume calculation
-    // [STRIFE] Removed gamemap == 8 hack
-    if (approx_dist < S_CLOSE_DIST)
-    {
-        *vol = snd_SfxVolume;
-    }
-    else
-    {
-        // distance effect
-        *vol = (snd_SfxVolume
-                * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
-            / S_ATTENUATOR; 
-    }
-    
-    return (*vol > 0);
-}
-
-void S_StartSound(void *origin_p, int sfx_id)
-{
-    sfxinfo_t *sfx;
-    mobj_t *origin;
-    int rc;
-    int sep;
-    int pitch;
-    int cnum;
-    int volume;
-
-    origin = (mobj_t *) origin_p;
-    volume = snd_SfxVolume;
-
-    // check for bogus sound #
-    if (sfx_id < 1 || sfx_id > NUMSFX)
-    {
-        // [STRIFE]: BUG - Note: vanilla had some extremely buggy and dangerous
-        // code here that tried to print the sprite name of the object playing 
-        // the bad sound. Because it invokes multiple undefined behaviors and 
-        // is of basically no consequence, it has deliberately not been ported.
-        I_Error("Bad sfx #: %d", sfx_id);
-    }
-
-    sfx = &S_sfx[sfx_id];
-
-    // Initialize sound parameters
-    if (sfx->link)
-    {
-        volume += sfx->volume;
-
-        if (volume < 1)
-        {
-            return;
-        }
-
-        if (volume > snd_SfxVolume)
-        {
-            volume = snd_SfxVolume;
-        }
-    }
-
-
-    // Check to see if it is audible,
-    //  and if not, modify the params
-    if (origin && origin != players[consoleplayer].mo)
-    {
-        rc = S_AdjustSoundParams(players[consoleplayer].mo,
-                                 origin,
-                                 &volume,
-                                 &sep);
-
-        if (origin->x == players[consoleplayer].mo->x
-         && origin->y == players[consoleplayer].mo->y)
-        {
-            sep = NORM_SEP;
-        }
-
-        if (!rc)
-        {
-            return;
-        }
-    }
-    else
-    {
-        sep = NORM_SEP;
-    }
-    pitch = NORM_PITCH;
-
-    // kill old sound [STRIFE] - nope!
-    //S_StopSound(origin);
-
-    // try to find a channel
-    cnum = S_GetChannel(origin, sfx, false); // haleyjd: not a voice.
-
-    if (cnum < 0)
-    {
-        return;
-    }
-
-    // increase the usefulness
-    if (sfx->usefulness++ < 0)
-    {
-        sfx->usefulness = 1;
-    }
-
-    if (sfx->lumpnum < 0)
-    {
-        sfx->lumpnum = I_GetSfxLumpNum(sfx);
-    }
-
-    channels[cnum].handle = I_StartSound(sfx, cnum, volume, sep, pitch);
-}
-
-
-// haleyjd 09/11/10: [STRIFE]
-// None of this was necessary in the vanilla EXE but Choco's low-level code
-// won't play nice with a temporary sfxinfo because it insists that the
-// "driver_data" member remain valid from the last time the sound was used,
-// even if it has already stopped playing. Thanks to this cuteness I get
-// to maintain a dynamic cache of sfxinfo objects!
-
-typedef struct voiceinfo_s
-{
-    sfxinfo_t sfx;
-    struct voiceinfo_s *next; // next on hash chain
-} voiceinfo_t;
-
-#define NUMVOICECHAINS 257
-
-//
-// Ripped from Eternity.
-//
-static unsigned int S_voiceHash(const char *str)
-{
-   const char *c = str;
-   unsigned int h = 0;
-
-   if(!str)
-      I_Error("S_voiceHash: cannot hash NULL string!\n");
-
-   // note: this needs to be case insensitive for lump names
-   while(*c)
-   {
-      h = 5 * h + toupper(*c);
-      ++c;
-   }
-
-   return h;
-}
-
-static voiceinfo_t *voices[NUMVOICECHAINS];
-
-//
-// S_getVoice
-//
-// Gets an entry from the voice table, if it exists. If it does not, one will be
-// created.
-//
-static voiceinfo_t *S_getVoice(const char *name, int lumpnum)
-{
-    voiceinfo_t *voice;
-    unsigned int hashkey = S_voiceHash(name) % NUMVOICECHAINS;
-
-    voice = voices[hashkey];
-
-    while(voice && strcasecmp(voice->sfx.name, name))
-        voice = voice->next;
-
-    if(!voice)
-    {
-        voice = calloc(1, sizeof(voiceinfo_t));
-
-        M_StringCopy(voice->sfx.name, name, sizeof(voice->sfx.name));
-        voice->sfx.priority = INT_MIN; // make highest possible priority
-        voice->sfx.pitch = -1;
-        voice->sfx.volume = -1;
-        voice->sfx.numchannels = -1;
-        voice->sfx.usefulness = -1;
-        voice->sfx.lumpnum = lumpnum;
-
-        // throw it onto the table.
-        voice->next = voices[hashkey];
-        voices[hashkey] = voice;
-    }
-
-    return voice;
-}
-
-//
-// I_StartVoice
-//
-// haleyjd 09/11/10: [STRIFE] New function
-// Note this was in i_sound.c in Strife itself, but relied on DMX-specific
-// features to ensure voice channels had absolute priority. Here we must
-// populate a fake sfxinfo_t and send the sound through some of the normal
-// routines. But in the end, it still works the same.
-//
-void I_StartVoice(const char *lumpname)
-{
-    int lumpnum;
-    voiceinfo_t *voice; // choco-specific
-    char lumpnamedup[9];
-
-    // no voices in deathmatch mode.
-    if(netgame)
-        return;
-
-    // STRIFE-TODO: checks if snd_SfxDevice == 83
-    // This is probably turning off voice if using PC speaker...
-
-    // user has disabled voices?
-    if(disable_voices)
-        return;
-
-    // have a voice playing already? stop it.
-    if(i_voicehandle >= 0)
-        S_StopChannel(i_voicehandle);
-
-    // Vanilla STRIFE appears to have stopped any current voice without
-    // starting a new one if NULL was passed in here, though I cannot 
-    // find an explicit check for NULL in the assembly. Either way, it 
-    // didn't crash, so do a check now:
-    if(lumpname == NULL)
-        return;
-
-    // Because of constness problems...
-    M_StringCopy(lumpnamedup, lumpname, sizeof(lumpnamedup));
-
-    if((lumpnum = W_CheckNumForName(lumpnamedup)) != -1)
-    {
-        // haleyjd: Choco-specific: get a voice structure
-        voice = S_getVoice(lumpnamedup, lumpnum);
-
-        // get a channel for the voice
-        i_voicehandle = S_GetChannel(NULL, &voice->sfx, true);
-
-        channels[i_voicehandle].handle 
-            = I_StartSound(&voice->sfx, i_voicehandle, snd_VoiceVolume, NORM_SEP, NORM_PITCH);
-    }
-}
-
-//
-// Stop and resume music, during game PAUSE.
-//
-
-void S_PauseSound(void)
-{
-    if (mus_playing && !mus_paused)
-    {
-        I_PauseSong();
-        mus_paused = true;
-    }
-}
-
-void S_ResumeSound(void)
-{
-    if (mus_playing && mus_paused)
-    {
-        I_ResumeSong();
-        mus_paused = false;
-    }
-}
-
-//
-// Updates music & sounds
-//
-
-void S_UpdateSounds(mobj_t *listener)
-{
-    int                audible;
-    int                cnum;
-    int                volume;
-    int                sep;
-    sfxinfo_t*        sfx;
-    channel_t*        c;
-
-    I_UpdateSound();
-
-    for (cnum=0; cnum<snd_channels; cnum++)
-    {
-        c = &channels[cnum];
-        sfx = c->sfxinfo;
-
-        if (c->sfxinfo)
-        {
-            if (I_SoundIsPlaying(c->handle))
-            {
-                // initialize parameters
-                volume = snd_SfxVolume;
-                sep = NORM_SEP;
-
-                if (sfx->link)
-                {
-                    volume += sfx->volume;
-                    if (volume < 1)
-                    {
-                        S_StopChannel(cnum);
-                        continue;
-                    }
-                    else if (volume > snd_SfxVolume)
-                    {
-                        volume = snd_SfxVolume;
-                    }
-                }
-
-                // check non-local sounds for distance clipping
-                //  or modify their params
-                if (c->origin && listener != c->origin)
-                {
-                    audible = S_AdjustSoundParams(listener,
-                                                  c->origin,
-                                                  &volume,
-                                                  &sep);
-
-                    if (!audible)
-                    {
-                        S_StopChannel(cnum);
-                    }
-                    else
-                    {
-                        I_UpdateSoundParams(c->handle, volume, sep);
-                    }
-                }
-            }
-            else
-            {
-                // if channel is allocated but sound has stopped,
-                //  free it
-                S_StopChannel(cnum);
-            }
-        }
-    }
-}
-
-void S_SetMusicVolume(int volume)
-{
-    if (volume < 0 || volume > 127)
-    {
-        I_Error("Attempt to set music volume at %d",
-                volume);
-    }    
-
-    I_SetMusicVolume(volume);
-}
-
-void S_SetSfxVolume(int volume)
-{
-    if (volume < 0 || volume > 127)
-    {
-        I_Error("Attempt to set sfx volume at %d", volume);
-    }
-
-    snd_SfxVolume = volume;
-}
-
-//
-// S_SetVoiceVolume
-//
-// haleyjd 09/11/10: [STRIFE]
-// Set the internal voice volume level.
-//
-void S_SetVoiceVolume(int volume)
-{
-    if (volume < 0 || volume > 127)
-    {
-        I_Error("Attempt to set voice volume at %d", volume);
-    }
-
-    snd_VoiceVolume = volume;
-}
-
-//
-// Starts some music with the music id found in sounds.h.
-//
-
-void S_StartMusic(int m_id)
-{
-    S_ChangeMusic(m_id, false);
-}
-
-void S_ChangeMusic(int musicnum, int looping)
-{
-    musicinfo_t *music = NULL;
-    char namebuf[9];
-    void *handle;
-
-    if (musicnum <= mus_None || musicnum >= NUMMUSIC)
-    {
-        I_Error("Bad music number %d", musicnum);
-    }
-    else
-    {
-        music = &S_music[musicnum];
-    }
-
-    if (mus_playing == music)
-    {
-        return;
-    }
-
-    // shutdown old music
-    S_StopMusic();
-
-    // get lumpnum if neccessary
-    if (!music->lumpnum)
-    {
-        M_snprintf(namebuf, sizeof(namebuf), "d_%s", DEH_String(music->name));
-        music->lumpnum = W_GetNumForName(namebuf);
-    }
-
-    music->data = W_CacheLumpNum(music->lumpnum, PU_STATIC);
-
-    handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-    music->handle = handle;
-    I_PlaySong(handle, looping);
-
-    mus_playing = music;
-}
-
-boolean S_MusicPlaying(void)
-{
-    return I_MusicIsPlaying();
-}
-
-void S_StopMusic(void)
-{
-    if (mus_playing)
-    {
-        if (mus_paused)
-        {
-            I_ResumeSong();
-        }
-
-        I_StopSong();
-        I_UnRegisterSong(mus_playing->handle);
-        W_ReleaseLumpNum(mus_playing->lumpnum);
-        mus_playing->data = NULL;
-        mus_playing = NULL;
-    }
-}
-
diff --git a/games/NXDoom/src/strife/s_sound.h b/games/NXDoom/src/strife/s_sound.h
deleted file mode 100644
index 0521a94e1..000000000
--- a/games/NXDoom/src/strife/s_sound.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The not so system specific sound interface.
-//
-
-
-#ifndef __S_SOUND__
-#define __S_SOUND__
-
-#include "p_mobj.h"
-#include "sounds.h"
-
-//
-// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume,
-//  allocates channel buffer, sets S_sfx lookup.
-//
-
-void S_Init(int sfxVolume, int musicVolume, int voiceVolume);
-
-
-// Shut down sound 
-
-void S_Shutdown(void);
-
-
-
-//
-// Per level startup code.
-// Kills playing sounds at start of level,
-//  determines music if any, changes music.
-//
-
-void S_Start(void);
-
-//
-// Start sound for thing at <origin>
-//  using <sound_id> from sounds.h
-//
-
-void S_StartSound(void *origin, int sound_id);
-
-// haleyjd 09/11/10: [STRIFE] Start a voice.
-void I_StartVoice(const char *lumpname);
-
-// Stop sound for thing at <origin>
-void S_StopSound(mobj_t *origin);
-
-
-// Start music using <music_id> from sounds.h
-void S_StartMusic(int music_id);
-
-// Start music using <music_id> from sounds.h,
-//  and set whether looping
-void S_ChangeMusic(int music_id, int looping);
-
-// query if music is playing
-boolean S_MusicPlaying(void);
-
-// Stops the music fer sure.
-void S_StopMusic(void);
-
-// Stop and resume music, during game PAUSE.
-void S_PauseSound(void);
-void S_ResumeSound(void);
-
-
-//
-// Updates music & sounds
-//
-void S_UpdateSounds(mobj_t *listener);
-
-void S_SetMusicVolume(int volume);
-void S_SetSfxVolume(int volume);
-void S_SetVoiceVolume(int volume); // haleyjd 09/11/10: [STRIFE]
-
-extern int snd_channels;
-
-extern int disable_voices;
-
-#endif
-
diff --git a/games/NXDoom/src/strife/sounds.c b/games/NXDoom/src/strife/sounds.c
deleted file mode 100644
index 27a4948f2..000000000
--- a/games/NXDoom/src/strife/sounds.c
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Created by a sound utility.
-//	Kept as a sample, DOOM2 sounds.
-//
-
-
-#include <stdlib.h>
-
-
-#include "doomtype.h"
-#include "sounds.h"
-
-//
-// Information about all the music
-//
-
-#define MUSIC(name) \
-    { name, 0, NULL, NULL }
-
-// villsa [STRIFE]
-musicinfo_t S_music[] =
-{
-    MUSIC(NULL),
-    MUSIC("logo"),
-    MUSIC("action"),
-    MUSIC("tavern"),
-    MUSIC("danger"),
-    MUSIC("fast"),
-    MUSIC("intro"),
-    MUSIC("darker"),
-    MUSIC("strike"),
-    MUSIC("slide"),
-    MUSIC("tribal"),
-    MUSIC("march"),
-    MUSIC("danger"),
-    MUSIC("mood"),
-    MUSIC("castle"),
-    MUSIC("darker"),
-    MUSIC("action"),
-    MUSIC("fight"),
-    MUSIC("spense"),
-    MUSIC("slide"),
-    MUSIC("strike"),
-    MUSIC("dark"),
-    MUSIC("tech"),
-    MUSIC("slide"),
-    MUSIC("drone"),
-    MUSIC("panthr"),
-    MUSIC("sad"),
-    MUSIC("instry"),
-    MUSIC("tech"),
-    MUSIC("action"),
-    MUSIC("instry"),
-    MUSIC("drone"),
-    MUSIC("fight"),
-    MUSIC("happy"),
-    MUSIC("end")
-
-
-};
-
-
-//
-// Information about all the sfx
-//
-
-#define SOUND(name, priority) \
-  { NULL, name, priority, NULL, -1, -1, 0, 0, -1, NULL }
-#define SOUND_LINK(name, priority, link_id, pitch, volume) \
-  { NULL, name, priority, &S_sfx[link_id], pitch, volume, 0, 0, -1, NULL }
-
-// villsa [STRIFE]
-sfxinfo_t S_sfx[] =
-{
-  // S_sfx[0] needs to be a dummy for odd reasons.
-  SOUND("none",     0),
-  SOUND("swish",     64),
-  SOUND("meatht",    64),
-  SOUND("mtalht",    64),
-  SOUND("wpnup",     78),
-  SOUND("rifle",     64),
-  SOUND("mislht",    64),
-  SOUND("barexp",    32),
-  SOUND("flburn",    64),
-  SOUND("flidl",     118),
-  SOUND("agrsee",    98),
-  SOUND("plpain",    96),
-  SOUND("pcrush",    96),
-  SOUND("pespna",    98),
-  SOUND("pespnb",    98),
-  SOUND("pespnc",    98),
-  SOUND("pespnd",    98),
-  SOUND("agrdpn",    98),
-  SOUND("pldeth",    32),
-  SOUND("plxdth",    32),
-  SOUND("slop",      78),
-  SOUND("rebdth",    98),
-  SOUND("agrdth",    98),
-  SOUND("lgfire",    211),
-  SOUND("smfire",    211),
-  SOUND("alarm",     210),
-  SOUND("drlmto",    98),
-  SOUND("drlmtc",    98),
-  SOUND("drsmto",    98),
-  SOUND("drsmtc",    98),
-  SOUND("drlwud",    98),
-  SOUND("drswud",    98),
-  SOUND("drston",    98),
-  SOUND("bdopn",     98),
-  SOUND("bdcls",     98),
-  SOUND("swtchn",    78),
-  SOUND("swbolt",    98),
-  SOUND("swscan",    98),
-  SOUND("yeah",      10),
-  SOUND("mask",      210),
-  SOUND("pstart",    100),
-  SOUND("pstop",     100),
-  SOUND("itemup",    78),
-  SOUND("bglass",    200),
-  SOUND("wriver",    201),
-  SOUND("wfall",     201),
-  SOUND("wdrip",     201),
-  SOUND("wsplsh",    95),
-  SOUND("rebact",    200),
-  SOUND("agrac1",    98),
-  SOUND("agrac2",    98),
-  SOUND("agrac3",    98),
-  SOUND("agrac4",    98),
-  SOUND("ambppl",    218),
-  SOUND("ambbar",    218),
-  SOUND("telept",    32),
-  SOUND("ratact",    99),
-  SOUND("itmbk",     100),
-  SOUND("xbow",      99),
-  SOUND("burnme",    95),
-  SOUND("oof",       96),
-  SOUND("wbrldt",    98),
-  SOUND("psdtha",    109),
-  SOUND("psdthb",    109),
-  SOUND("psdthc",    109),
-  SOUND("rb2pn",     96),
-  SOUND("rb2dth",    32),
-  SOUND("rb2see",    98),
-  SOUND("rb2act",    98),
-  SOUND("firxpl",    70),
-  SOUND("stnmov",    100),
-  SOUND("noway",     78),
-  SOUND("rlaunc",    64),
-  SOUND("rflite",    65),
-  SOUND("radio",     60),
-  SOUND("pulchn",    98),
-  SOUND("swknob",    98),
-  SOUND("keycrd",    98),
-  SOUND("swston",    98),
-  SOUND("sntsee",    98),
-  SOUND("sntdth",    98),
-  SOUND("sntact",    98),
-  SOUND("pgrdat",    64),
-  SOUND("pgrsee",    90),
-  SOUND("pgrdpn",    96),
-  SOUND("pgrdth",    32),
-  SOUND("pgract",    120),
-  SOUND("proton",    64),
-  SOUND("protfl",    64),
-  SOUND("plasma",    64),
-  SOUND("dsrptr",    30),
-  SOUND("reavat",    64),
-  SOUND("revbld",    64),
-  SOUND("revsee",    90),
-  SOUND("reavpn",    96),
-  SOUND("revdth",    32),
-  SOUND("revact",    120),
-  SOUND("spisit",    90),
-  SOUND("spdwlk",    65),
-  SOUND("spidth",    32),
-  SOUND("spdatk",    32),
-  SOUND("chant",     218),
-  SOUND("static",    32),
-  SOUND("chain",     70),
-  SOUND("tend",      100),
-  SOUND("phoot",     32),
-  SOUND("explod",    32),
-  SOUND("sigil",     32),
-  SOUND("sglhit",    32),
-  SOUND("siglup",    32),
-  SOUND("prgpn",     96),
-  SOUND("progac",    120),
-  SOUND("lorpn",     96),
-  SOUND("lorsee",    90),
-  SOUND("difool",    32),
-  SOUND("inqdth",    32),
-  SOUND("inqact",    98),
-  SOUND("inqsee",    90),
-  SOUND("inqjmp",    65),
-  SOUND("amaln1",    99),
-  SOUND("amaln2",    99),
-  SOUND("amaln3",    99),
-  SOUND("amaln4",    99),
-  SOUND("amaln5",    99),
-  SOUND("amaln6",    99),
-  SOUND("mnalse",    64),
-  SOUND("alnsee",    64),
-  SOUND("alnpn",     96),
-  SOUND("alnact",    120),
-  SOUND("alndth",    32),
-  SOUND("mnaldt",    32),
-  SOUND("reactr",    31),
-  SOUND("airlck",    98),
-  SOUND("drchno",    98),
-  SOUND("drchnc",    98),
-  SOUND("valve",     98)
-};
-
diff --git a/games/NXDoom/src/strife/sounds.h b/games/NXDoom/src/strife/sounds.h
deleted file mode 100644
index 38ed0bfcf..000000000
--- a/games/NXDoom/src/strife/sounds.h
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Created by the sound utility written by Dave Taylor.
-//	Kept as a sample, DOOM2  sounds. Frozen.
-//
-
-#ifndef __SOUNDS__
-#define __SOUNDS__
-
-#include "i_sound.h"
-
-// the complete set of sound effects
-extern sfxinfo_t	S_sfx[];
-
-// the complete set of music
-extern musicinfo_t	S_music[];
-
-//
-// Identifiers for all music in game.
-//
-
-// villsa [STRIFE]
-typedef enum
-{
-    mus_None,
-    mus_logo,
-    mus_action,
-    mus_tavern,
-    mus_danger,
-    mus_fast,
-    mus_intro,
-    mus_darker,
-    mus_strike,
-    mus_slide,
-    mus_tribal,
-    mus_march,
-    mus_danger2,
-    mus_mood,
-    mus_castle,
-    mus_darker2,
-    mus_action2,
-    mus_fight,
-    mus_spense,
-    mus_slide2,
-    mus_strike2,
-    mus_dark,
-    mus_tech,
-    mus_slide3,
-    mus_drone,
-    mus_panthr,
-    mus_sad,
-    mus_instry,
-    mus_tech2,
-    mus_action3,
-    mus_instry2,
-    mus_drone2,
-    mus_fight2,
-    mus_happy,
-    mus_end,
-    NUMMUSIC
-} musicenum_t;
-
-
-//
-// Identifiers for all sfx in game.
-//
-
-typedef enum
-{
-    sfx_None,
-    sfx_swish,
-    sfx_meatht,
-    sfx_mtalht,
-    sfx_wpnup,
-    sfx_rifle,
-    sfx_mislht,
-    sfx_barexp,
-    sfx_flburn,
-    sfx_flidl,
-    sfx_agrsee,
-    sfx_plpain,
-    sfx_pcrush,
-    sfx_pespna,
-    sfx_pespnb,
-    sfx_pespnc,
-    sfx_pespnd,
-    sfx_agrdpn,
-    sfx_pldeth,
-    sfx_plxdth,
-    sfx_slop,
-    sfx_rebdth,
-    sfx_agrdth,
-    sfx_lgfire,
-    sfx_smfire,
-    sfx_alarm,
-    sfx_drlmto,
-    sfx_drlmtc,
-    sfx_drsmto,
-    sfx_drsmtc,
-    sfx_drlwud,
-    sfx_drswud,
-    sfx_drston,
-    sfx_bdopn,
-    sfx_bdcls,
-    sfx_swtchn,
-    sfx_swbolt,
-    sfx_swscan,
-    sfx_yeah,
-    sfx_mask,
-    sfx_pstart,
-    sfx_pstop,
-    sfx_itemup,
-    sfx_bglass,
-    sfx_wriver,
-    sfx_wfall,
-    sfx_wdrip,
-    sfx_wsplsh,
-    sfx_rebact,
-    sfx_agrac1,
-    sfx_agrac2,
-    sfx_agrac3,
-    sfx_agrac4,
-    sfx_ambppl,
-    sfx_ambbar,
-    sfx_telept,
-    sfx_ratact,
-    sfx_itmbk,
-    sfx_xbow,
-    sfx_burnme,
-    sfx_oof,
-    sfx_wbrldt,
-    sfx_psdtha,
-    sfx_psdthb,
-    sfx_psdthc,
-    sfx_rb2pn,
-    sfx_rb2dth,
-    sfx_rb2see,
-    sfx_rb2act,
-    sfx_firxpl,
-    sfx_stnmov,
-    sfx_noway,
-    sfx_rlaunc,
-    sfx_rflite,
-    sfx_radio,
-    sfx_pulchn,
-    sfx_swknob,
-    sfx_keycrd,
-    sfx_swston,
-    sfx_sntsee,
-    sfx_sntdth,
-    sfx_sntact,
-    sfx_pgrdat,
-    sfx_pgrsee,
-    sfx_pgrdpn,
-    sfx_pgrdth,
-    sfx_pgract,
-    sfx_proton,
-    sfx_protfl,
-    sfx_plasma,
-    sfx_dsrptr,
-    sfx_reavat,
-    sfx_revbld,
-    sfx_revsee,
-    sfx_reavpn,
-    sfx_revdth,
-    sfx_revact,
-    sfx_spisit,
-    sfx_spdwlk,
-    sfx_spidth,
-    sfx_spdatk,
-    sfx_chant,
-    sfx_static,
-    sfx_chain,
-    sfx_tend,
-    sfx_phoot,
-    sfx_explod,
-    sfx_sigil,
-    sfx_sglhit,
-    sfx_siglup,
-    sfx_prgpn,
-    sfx_progac,
-    sfx_lorpn,
-    sfx_lorsee,
-    sfx_difool,
-    sfx_inqdth,
-    sfx_inqact,
-    sfx_inqsee,
-    sfx_inqjmp,
-    sfx_amaln1,
-    sfx_amaln2,
-    sfx_amaln3,
-    sfx_amaln4,
-    sfx_amaln5,
-    sfx_amaln6,
-    sfx_mnalse,
-    sfx_alnsee,
-    sfx_alnpn,
-    sfx_alnact,
-    sfx_alndth,
-    sfx_mnaldt,
-    sfx_reactr,
-    sfx_airlck,
-    sfx_drchno,
-    sfx_drchnc,
-    sfx_valve,
-    NUMSFX
-} sfxenum_t;
-
-#endif
diff --git a/games/NXDoom/src/strife/st_lib.c b/games/NXDoom/src/strife/st_lib.c
deleted file mode 100644
index 3ade09557..000000000
--- a/games/NXDoom/src/strife/st_lib.c
+++ /dev/null
@@ -1,326 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	The status bar widget code.
-//
-
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include "deh_main.h"
-#include "doomdef.h"
-
-#include "z_zone.h"
-#include "v_video.h"
-
-#include "i_swap.h"
-#include "i_system.h"
-
-#include "w_wad.h"
-
-#include "st_stuff.h"
-#include "st_lib.h"
-#include "r_local.h"
-
-
-//
-// Hack display negative frags.
-//  Loads and store the stminus lump.
-//
-patch_t*		sttminus;
-
-void STlib_init(void)
-{
-    // haleyjd 08/28/10: [STRIFE] STTMINUS -> STCFN045
-    sttminus = (patch_t *) W_CacheLumpName(DEH_String("STCFN045"), PU_STATIC);
-}
-
-
-// 
-// STlib_initNum
-//
-// haleyjd 09/01/10: [STRIFE]
-// * Rogue removed the "on" member of st_number_t.
-void
-STlib_initNum
-( st_number_t*		n,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  int			width )
-{
-    n->x	= x;
-    n->y	= y;
-    n->width	= width;
-    n->num	= num;
-    n->p	= pl;
-}
-
-
-// 
-// STlib_drawNum
-//
-// A fairly efficient way to draw a number
-//  based on differences from the old number.
-// Note: worth the trouble?
-//
-// haleyjd 09/01/10: [STRIFE]
-// * Rogue removed the "refresh" parameter and caching code
-//
-void
-STlib_drawNum
-( st_number_t*  n)
-{
-    int         numdigits = n->width;
-    int         num = *n->num;
-
-    int         w = SHORT(n->p[0]->width) + 1; // [STRIFE] +1
-    int         x = n->x;
-
-    int         neg;
-
-    neg = num < 0;
-
-    if (neg)
-    {
-        if (numdigits == 2 && num < -9)
-            num = -9;
-        else if (numdigits == 3 && num < -99)
-            num = -99;
-
-        num = -num;
-    }
-
-    /* haleyjd 09/01/10: [STRIFE] Widget caching system removed by Rogue
-    // clear the area
-    x = n->x - numdigits*w;
-
-    if (n->y - ST_Y < 0)
-        I_Error("drawNum: n->y - ST_Y < 0");
-
-    V_CopyRect(x, n->y - ST_Y, st_backing_screen, w*numdigits, h, x, n->y);
-    */
-
-    // if non-number, do not draw it
-    if (num == 1994)
-        return;
-
-    x = n->x;
-
-    // in the special case of 0, you draw 0
-    if (!num)
-        V_DrawPatch(x - w, n->y, n->p[ 0 ]);
-
-    // draw the new number
-    while (num && numdigits--)
-    {
-        x -= w;
-        V_DrawPatch(x, n->y, n->p[ num % 10 ]);
-        num /= 10;
-    }
-
-    // draw a minus sign if necessary
-    if (neg)
-        V_DrawPatch(x - 8, n->y, sttminus);
-}
-
-
-// 
-// STlib_drawNumPositive
-//
-// haleyjd 09/01/10: [STRIFE] New function.
-// * Mostly the same as STlib_drawNum, except doesn't draw negatives.
-//
-void
-STlib_drawNumPositive
-( st_number_t*  n)
-{
-    int         numdigits = n->width;
-    int         num = *n->num;
-
-    int         w = SHORT(n->p[0]->width) + 1; // [STRIFE] +1
-    int         x = n->x;
-
-    // Don't draw negative values.
-    if (num < 0)
-        num = 0;
-
-    // if non-number, do not draw it
-    if (num == 1994)
-        return;
-
-    x = n->x;
-
-    // in the special case of 0, you draw 0
-    if (!num)
-        V_DrawPatch(x - w, n->y, n->p[ 0 ]);
-
-    // draw the new number
-    while (num && numdigits--)
-    {
-        x -= w;
-        V_DrawPatch(x, n->y, n->p[ num % 10 ]);
-        num /= 10;
-    }
-}
-
-
-// haleyjd 09/01/10: [STRIFE] All other functions were removed.
-/*
-void
-STlib_updateNum
-( st_number_t*		n,
-  boolean		refresh )
-{
-    if (*n->on) STlib_drawNum(n, refresh);
-}
-
-
-//
-void
-STlib_initPercent
-( st_percent_t*		p,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  boolean*		on,
-  patch_t*		percent )
-{
-    STlib_initNum(&p->n, x, y, pl, num, on, 3);
-    p->p = percent;
-}
-
-
-
-
-void
-STlib_updatePercent
-( st_percent_t*		per,
-  int			refresh )
-{
-    if (refresh && *per->n.on)
-	V_DrawPatch(per->n.x, per->n.y, per->p);
-    
-    STlib_updateNum(&per->n, refresh);
-}
-
-
-
-void
-STlib_initMultIcon
-( st_multicon_t*	i,
-  int			x,
-  int			y,
-  patch_t**		il,
-  int*			inum,
-  boolean*		on )
-{
-    i->x	= x;
-    i->y	= y;
-    i->oldinum 	= -1;
-    i->inum	= inum;
-    i->on	= on;
-    i->p	= il;
-}
-
-
-
-void
-STlib_updateMultIcon
-( st_multicon_t*	mi,
-  boolean		refresh )
-{
-    int			w;
-    int			h;
-    int			x;
-    int			y;
-
-    if (*mi->on
-	&& (mi->oldinum != *mi->inum || refresh)
-	&& (*mi->inum!=-1))
-    {
-	if (mi->oldinum != -1)
-	{
-	    x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
-	    y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
-	    w = SHORT(mi->p[mi->oldinum]->width);
-	    h = SHORT(mi->p[mi->oldinum]->height);
-
-	    if (y - ST_Y < 0)
-		I_Error("updateMultIcon: y - ST_Y < 0");
-
-	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
-	}
-	V_DrawPatch(mi->x, mi->y, mi->p[*mi->inum]);
-	mi->oldinum = *mi->inum;
-    }
-}
-
-
-
-void
-STlib_initBinIcon
-( st_binicon_t*		b,
-  int			x,
-  int			y,
-  patch_t*		i,
-  boolean*		val,
-  boolean*		on )
-{
-    b->x	= x;
-    b->y	= y;
-    b->oldval	= false;
-    b->val	= val;
-    b->on	= on;
-    b->p	= i;
-}
-
-
-
-void
-STlib_updateBinIcon
-( st_binicon_t*		bi,
-  boolean		refresh )
-{
-    int			x;
-    int			y;
-    int			w;
-    int			h;
-
-    if (*bi->on
-     && (bi->oldval != *bi->val || refresh))
-    {
-	x = bi->x - SHORT(bi->p->leftoffset);
-	y = bi->y - SHORT(bi->p->topoffset);
-	w = SHORT(bi->p->width);
-	h = SHORT(bi->p->height);
-
-	if (y - ST_Y < 0)
-	    I_Error("updateBinIcon: y - ST_Y < 0");
-
-	if (*bi->val)
-	    V_DrawPatch(bi->x, bi->y, bi->p);
-	else
-	    V_CopyRect(x, y-ST_Y, st_backing_screen, w, h, x, y);
-
-	bi->oldval = *bi->val;
-    }
-
-}
-*/
-
diff --git a/games/NXDoom/src/strife/st_lib.h b/games/NXDoom/src/strife/st_lib.h
deleted file mode 100644
index b2c85a818..000000000
--- a/games/NXDoom/src/strife/st_lib.h
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// 	The status bar widget code.
-//
-
-#ifndef __STLIB__
-#define __STLIB__
-
-
-// We are referring to patches.
-#include "r_defs.h"
-
-//
-// Typedefs of widgets
-//
-
-// Number widget
-
-typedef struct
-{
-    // upper right-hand corner
-    //  of the number (right-justified)
-    int         x;
-    int         y;
-
-    // max # of digits in number
-    int width;
-
-    // haleyjd 09/01/10: [STRIFE] Removed "oldnum" member
-    //int         oldnum;
-    
-    // pointer to current value
-    int*        num;
-
-    // haleyjd 09/01/10: [STRIFE] Removed "on" member
-    // boolean*    on;
-
-    // list of patches for 0-9
-    patch_t**   p;
-
-    // user data
-    int data;
-    
-} st_number_t;
-
-
-
-// Percent widget ("child" of number widget,
-//  or, more precisely, contains a number widget.)
-typedef struct
-{
-    // number information
-    st_number_t		n;
-
-    // percent sign graphic
-    patch_t*		p;
-    
-} st_percent_t;
-
-
-
-// Multiple Icon widget
-typedef struct
-{
-     // center-justified location of icons
-    int			x;
-    int			y;
-
-    // last icon number
-    int			oldinum;
-
-    // pointer to current icon
-    int*		inum;
-
-    // pointer to boolean stating
-    //  whether to update icon
-    boolean*		on;
-
-    // list of icons
-    patch_t**		p;
-    
-    // user data
-    int			data;
-    
-} st_multicon_t;
-
-
-
-
-// Binary Icon widget
-
-typedef struct
-{
-    // center-justified location of icon
-    int			x;
-    int			y;
-
-    // last icon value
-    boolean		oldval;
-
-    // pointer to current icon status
-    boolean*		val;
-
-    // pointer to boolean
-    //  stating whether to update icon
-    boolean*		on;  
-
-
-    patch_t*		p;	// icon
-    int			data;   // user data
-    
-} st_binicon_t;
-
-
-
-//
-// Widget creation, access, and update routines
-//
-
-// Initializes widget library.
-// More precisely, initialize STMINUS,
-//  everything else is done somewhere else.
-//
-void STlib_init(void);
-
-
-
-// Number widget routines
-
-// haleyjd 09/01/10: [STRIFE] Removed "on" parameter.
-void
-STlib_initNum
-( st_number_t*          n,
-  int                   x,
-  int                   y,
-  patch_t**             pl,
-  int*                  num,
-  int                   width );
-
-// haleyjd 09/01/10: [STRIFE] Made globally visible.
-void
-STlib_drawNum
-( st_number_t*  n);
-
-// haleyjd 09/01/10: [STRIFE] New function
-void
-STlib_drawNumPositive
-( st_number_t*  n);
-
-/* haleyjd 09/01/10: [STRIFE] All the below were removed
-void
-STlib_updateNum
-( st_number_t*		n,
-  boolean		refresh );
-
-
-// Percent widget routines
-void
-STlib_initPercent
-( st_percent_t*		p,
-  int			x,
-  int			y,
-  patch_t**		pl,
-  int*			num,
-  boolean*		on,
-  patch_t*		percent );
-
-
-void
-STlib_updatePercent
-( st_percent_t*		per,
-  int			refresh );
-
-
-// Multiple Icon widget routines
-void
-STlib_initMultIcon
-( st_multicon_t*	mi,
-  int			x,
-  int			y,
-  patch_t**		il,
-  int*			inum,
-  boolean*		on );
-
-
-void
-STlib_updateMultIcon
-( st_multicon_t*	mi,
-  boolean		refresh );
-
-// Binary Icon widget routines
-
-void
-STlib_initBinIcon
-( st_binicon_t*		b,
-  int			x,
-  int			y,
-  patch_t*		i,
-  boolean*		val,
-  boolean*		on );
-
-void
-STlib_updateBinIcon
-( st_binicon_t*		bi,
-  boolean		refresh );
-*/
-
-#endif
diff --git a/games/NXDoom/src/strife/st_stuff.c b/games/NXDoom/src/strife/st_stuff.c
deleted file mode 100644
index ae1d4cd90..000000000
--- a/games/NXDoom/src/strife/st_stuff.c
+++ /dev/null
@@ -1,1605 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Status bar code.
-//	Does the face/direction indicator animatin.
-//	Does palette indicators as well (red pain/berserk, bright pickup)
-//
-
-
-
-#include <stdio.h>
-
-#include "i_system.h"
-#include "i_video.h"
-#include "z_zone.h"
-#include "m_random.h"
-#include "w_wad.h"
-
-#include "deh_main.h"
-#include "deh_misc.h"
-#include "doomdef.h"
-#include "doomkeys.h"
-
-#include "g_game.h"
-
-#include "st_stuff.h"
-#include "st_lib.h"
-#include "r_local.h"
-
-#include "p_local.h"
-#include "p_inter.h"
-#include "p_dialog.h"   // villsa [STRIFE]
-
-#include "am_map.h"
-#include "m_cheat.h"
-#include "m_menu.h" // villsa [STRIFE]
-#include "m_misc.h"
-
-#include "s_sound.h"
-
-// Needs access to LFB.
-#include "v_video.h"
-#include "i_swap.h"
-
-// State.
-#include "doomstat.h"
-#include "d_main.h"    // [STRIFE]
-
-// Data.
-#include "dstrings.h"
-#include "sounds.h"
-#include "m_controls.h"
-#include "hu_lib.h"     // [STRIFE]
-#include "hu_stuff.h"
-
-//
-// STATUS BAR DATA
-//
-
-// Palette indices.
-// For damage/bonus red-/gold-shifts
-#define STARTREDPALS            1
-#define STARTBONUSPALS          9
-#define NUMREDPALS              8
-#define NUMBONUSPALS            4
-// Radiation suit, green shift.
-#define RADIATIONPAL            13
-
-// Location of status bar
-#define ST_X                    0
-
-// Location and size of statistics,
-//  justified according to widget type.
-// Problem is, within which space? STbar? Screen?
-// Note: this could be read in by a lump.
-//       Problem is, is the stuff rendered
-//       into a buffer,
-//       or into the frame buffer?
-
-// AMMO number pos.
-// haleyjd 20100901: [STRIFE] Adjusted.
-#define ST_AMMOWIDTH            3
-#define ST_AMMOX                311
-#define ST_AMMOY                162
-
-// HEALTH number pos.
-// haleyjd 20100901: [STRIFE] Adjusted.
-#define ST_HEALTHWIDTH          3
-#define ST_HEALTHX              79
-#define ST_HEALTHY              162
-
-// [STRIFE]
-// Removed:
-// * Weapon pos.
-// * Frags pos.
-// * ARMOR number pos.
-// * Key icon positions.
-
-// Ammunition counter.
-// haleyjd 20110213 [STRIFE]: ammo counters for the popup widget
-#define ST_POPUPAMMOX       206
-static const int st_yforammo[NUMAMMO] = { 75, 99, 91, 139, 131, 115, 123 };
-static const int st_wforammo[NUMAMMO] = { 3,  3,  2,  3,   3,   2,   3   };
-
-// Indicate maximum ammunition.
-// Only needed because backpack exists.
-// haleyjd 20110213 [STRIFE]: maxammo counters for the popup widget
-#define ST_POPUPMAXAMMOX        239
-
-// [STRIFE]
-// Removed:
-// * Doom weapon stuff
-// * DETH title (???)
-
-// Dimensions given in characters.
-#define ST_MSGWIDTH             52
-
-// haleyjd 20100831: [STRIFE] 
-// * Removed faces.
-// haleyjd 20100901:
-// * Removed DOOM pre-beta cruft.
-// * Removed deathmatch frags/arms-related stuff.
-// * Removed arms panel stuff.
-// * Removed unused widgets.
-// * Removed more faces, keyboxes, st_randomnumber
-
-// graphics are drawn to a backing screen and blitted to the real screen
-//byte                   *st_backing_screen;  - [STRIFE]: Unused.
-
-// main player in game
-static player_t*        plyr; 
-
-// ST_Start() has just been called
-static boolean          st_firsttime;
-
-// lump number for PLAYPAL
-static int              lu_palette;
-
-// whether left-side main status bar is active
-static boolean          st_statusbaron;
-
-// villsa [STRIFE]
-static boolean          st_dosizedisplay = false;
-
-// haleyjd 09/01/10: [STRIFE]
-// Whether or not a popup is currently displayed
-static boolean          st_displaypopup = false;
-
-// villsa [STRIFE]
-static int              st_popupdisplaytics = 0;
-
-// villsa [STRIFE]
-// Whether or not show popup objective screen
-static boolean          st_showobjective = false;
-
-// villsa [STRIFE]
-static boolean          st_showinvpop = false;
-
-// villsa [STRIFE]
-static boolean          st_showkeys = false;
-
-// villsa [STRIFE] TODO - identify variables
-static int              st_keypage = -1;
-// [unused] static int              dword_88490 = 0;
-
-// haleyjd 09/19/10: [STRIFE] Cached player data
-static int              st_lastcursorpos;
-static int              st_lastammo;
-static int              st_lastarmortype;
-static int              st_lasthealth;
-
-// haleyjd 20100901: [STRIFE] sbar -> invback
-// main inventory background and other bits
-static patch_t*         invback;     // main bar
-static patch_t*         stback;      // multiplayer background
-static patch_t*         invtop;      // top bit
-static patch_t*         invpop;      // popup frame with text
-static patch_t*         invpop2;     // plain popup frame
-static patch_t*         invpbak;     // popup background w/details
-static patch_t*         invpbak2;    // plain popup background
-static patch_t*         invcursor;   // cursor
-
-// ammo/weapon/armor patches
-static patch_t*         invammo[NUMAMMO]; // ammo/weapons
-static patch_t*         invsigil[5];      // sigil pieces
-static patch_t*         invarmor[2];      // armor icons
-
-// names for ammo patches
-static const char *invammonames[NUMAMMO] =
-{
-    "I_BLIT",
-    "I_XQRL",
-    "I_PQRL",
-    "I_BRY1",
-    "I_ROKT",
-    "I_GRN1",
-    "I_GRN2"
-};
-
-// haleyjd 20100901: [STRIFE] Replaced tallnum, shortnum w/inv fonts
-// 0-9, green numbers
-static patch_t*         invfontg[10];
-
-// 0-9, yellow numbers
-static patch_t*         invfonty[10];
-
-// [unused] 3 key-cards, 3 skulls -- [STRIFE] has a lot more keys than 3 :P
-//static patch_t*         keys[NUMCARDS]; 
-
-// ready-weapon widget
-static st_number_t      w_ready; // haleyjd [STRIFE]: This is still used.
-
-// haleyjd: [STRIFE] This is still used but was changed to a st_number_t.
-// health widget
-static st_number_t      w_health;
-
-// ammo widgets
-static st_number_t      w_ammo[NUMAMMO];     // haleyjd [STRIFE]: Still used.
-
-// max ammo widgets
-static st_number_t      w_maxammo[NUMAMMO];  // haleyjd [STRIFE]: Still used.
-
-// [unused] number of frags so far in deathmatch
-//static int              st_fragscount;
-
-
-cheatseq_t cheat_mus        = CHEAT("spin", 2);         // [STRIFE]: idmus -> spin
-cheatseq_t cheat_god        = CHEAT("omnipotent", 0);   // [STRIFE]: iddqd -> omnipotent
-cheatseq_t cheat_ammo       = CHEAT("boomstix", 0);     // [STRIFE]: idfa -> boomstix
-cheatseq_t cheat_noclip     = CHEAT("elvis", 0);        // [STRIFE]: idclip -> elvis
-cheatseq_t cheat_clev       = CHEAT("rift", 2);         // [STRIFE]: idclev -> rift
-cheatseq_t cheat_mypos      = CHEAT("gps", 0);          // [STRIFE]: idmypos -> gps
-cheatseq_t cheat_scoot      = CHEAT("scoot", 1);        // [STRIFE]: new cheat scoot
-cheatseq_t cheat_nuke       = CHEAT("stonecold", 0);    // [STRIFE]: new cheat stonecold
-cheatseq_t cheat_keys       = CHEAT("jimmy", 0);        // [STRIFE]: new cheat jimmy (all keys)
-cheatseq_t cheat_stealth    = CHEAT("gripper", 0);      // [STRIFE]: new cheat gripper
-cheatseq_t cheat_midas      = CHEAT("donnytrump", 0);   // [STRIFE]: new cheat
-cheatseq_t cheat_lego       = CHEAT("lego", 0);         // [STRIFE]: new cheat
-cheatseq_t cheat_dev        = CHEAT("dots", 0);         // [STRIFE]: new cheat
-
-// haleyjd 20110224: enumeration for access to powerup cheats
-enum
-{
-    ST_PUMPUP_B,
-    ST_PUMPUP_I,
-    ST_PUMPUP_M,
-    ST_PUMPUP_H,
-    ST_PUMPUP_P,
-    ST_PUMPUP_S,
-    ST_PUMPUP_T,
-    ST_PUMPUP,
-    NUM_ST_PUMPUP
-};
-
-cheatseq_t cheat_powerup[NUM_ST_PUMPUP] = // [STRIFE]
-{
-    CHEAT("pumpupb", 0),
-    CHEAT("pumpupi", 0),
-    CHEAT("pumpupm", 0),
-    CHEAT("pumpuph", 0),
-    CHEAT("pumpupp", 0),
-    CHEAT("pumpups", 0),
-    CHEAT("pumpupt", 0),
-    CHEAT("pumpup", 0),
-};
-
-//cheatseq_t cheat_choppers = CHEAT("idchoppers", 0); [STRIFE] no such thing
-
-void M_SizeDisplay(int choice); // villsa [STRIFE]
-
-//
-// STATUS BAR CODE
-//
-void ST_Stop(void);
-
-// [STRIFE]
-static char st_msgbuf[ST_MSGWIDTH];
-
-// Respond to keyboard input events,
-//  intercept cheats.
-boolean ST_Responder(event_t* ev)
-{
-    // haleyjd 09/27/10: made static to ST_Responder
-    static boolean st_keystate = false;
-    int i;
-
-    // Filter automap on/off.
-    if(ev->type == ev_keyup)
-    {
-        if((ev->data1 & 0xffff0000) == AM_MSGHEADER)
-        {
-            switch(ev->data1)
-            {
-            case AM_MSGENTERED:
-                st_firsttime = true;
-                break;
-
-            case AM_MSGEXITED:
-                break;
-            }
-
-            return false;
-        }
-
-        // villsa [STRIFE]
-        if(ev->data1 != key_invpop &&
-           ev->data1 != key_mission &&
-           ev->data1 != key_invkey)
-            return false;
-
-        // villsa [STRIFE]
-        if(ev->data1 == key_invpop)
-            st_showinvpop = false;
-        else
-        {
-            if(ev->data1 == key_mission)
-                st_showobjective = false;
-            else
-            {
-                if(ev->data1 == key_invkey)
-                {
-                    st_showkeys = false;
-                    st_keystate = false;
-                }
-            }
-        }
-
-        if(!st_showkeys && !st_showobjective && !st_showinvpop)
-        {
-             if(!st_popupdisplaytics)
-             {
-                 st_displaypopup = false;
-                 if(st_dosizedisplay)
-                     M_SizeDisplay(true);
-
-                 st_dosizedisplay = false;
-             }
-        }
-
-        return true;
-    }
-
-    // if a user keypress...
-    if(ev->type != ev_keydown)
-        return false;
-
-    // haleyjd 20100927: No input allowed when the player is dead
-    if(plyr->mo->health <= 0)
-        return false;
-
-    // keydown events
-    if(ev->data1 == key_invquery) // inventory query
-    {
-        inventory_t *inv = &(plyr->inventory[plyr->inventorycursor]);
-        if(inv->amount)
-        {
-            DEH_snprintf(st_msgbuf, sizeof(st_msgbuf), "%d %s",
-                         inv->amount, 
-                         DEH_String(mobjinfo[inv->type].name));
-            plyr->message = st_msgbuf;
-        }
-    }
-
-    // villsa [STRIFE]
-    if(ev->data1 == key_invpop || ev->data1 == key_invkey || ev->data1 == key_mission)
-    {
-        if(ev->data1 == key_invkey)
-        {
-            st_showobjective = false;
-            st_showinvpop = false;
-
-            if(!st_keystate)
-            {
-                st_keystate = true;
-                if(++st_keypage > 2)
-                {
-                    st_popupdisplaytics = 0;
-                    st_showkeys = false;
-                    st_displaypopup = false;
-                    st_keypage = -1;
-                    return true;
-                }
-            }
-
-            if(netgame)
-                st_popupdisplaytics = 20;
-            else
-                st_popupdisplaytics = 50;
-
-            st_showkeys = true;
-        }
-        else
-        {
-            if(ev->data1 != key_mission || netgame)
-            {
-                if(ev->data1 ==  key_invpop)
-                {
-                    st_keypage = -1;
-                    st_popupdisplaytics = false;
-                    st_showkeys = false;
-                    st_showobjective = false;
-                    st_showinvpop = true;
-                }
-            }
-            else
-            {
-                st_showkeys = netgame;
-                st_showinvpop = netgame;
-                st_keypage = -1;
-
-                st_popupdisplaytics = ev->data2 ^ key_mission;
-
-                st_showobjective = true;
-            }
-        }
-
-        if(st_showkeys || st_showobjective || st_showinvpop)
-        {
-            st_displaypopup = true;
-            if(viewheight == SCREENHEIGHT)
-            {
-                M_SizeDisplay(false);
-                st_dosizedisplay = true;
-            }
-        }
-    }
-    
-    if(ev->data1 == key_invleft) // inventory move left
-    {
-        if(plyr->inventorycursor > 0)
-            plyr->inventorycursor--;
-        return true;
-    }
-    else if(ev->data1 == key_invright)
-    {
-        if(plyr->inventorycursor < plyr->numinventory - 1)
-            plyr->inventorycursor++;
-        return true;
-    }
-    else if(ev->data1 == key_invhome)
-    {
-        plyr->inventorycursor = 0;
-        return true;
-    }
-    else if(ev->data1 == key_invend)
-    {
-        if(plyr->numinventory)
-            plyr->inventorycursor = plyr->numinventory - 1;
-        else 
-            plyr->inventorycursor = 0;
-        return true;
-    }
-
-    //
-    // [STRIFE] Cheats which are allowed in netgames/demos:
-    //
-
-    // 'spin' cheat for changing music
-    if (cht_CheckCheat(&cheat_mus, ev->data2))
-    {
-        char        buf[3];
-        int         musnum;
-
-        plyr->message = DEH_String(STSTR_MUS);
-        cht_GetParam(&cheat_mus, buf);
-
-        musnum = (buf[0] - '0') * 10 + buf[1] - '0';
-
-        if (((buf[0]-'0')*10 + buf[1]-'0') > 35)
-            plyr->message = DEH_String(STSTR_NOMUS);
-        else
-            S_ChangeMusic(musnum, 1);
-    }
-    // [STRIFE]: "dev" cheat - "DOTS"
-    else if (cht_CheckCheat(&cheat_dev, ev->data2))
-    {
-        devparm = !devparm;
-        if (devparm)
-            plyr->message = DEH_String("devparm ON");
-        else
-            plyr->message = DEH_String("devparm OFF");
-    }
-
-    // [STRIFE] Cheats below are not allowed in netgames or demos
-    if(netgame || !usergame)
-        return false;
-
-    if (cht_CheckCheat(&cheat_god, ev->data2))
-    {
-        // 'omnipotent' cheat for toggleable god mode
-        plyr->cheats ^= CF_GODMODE;
-        if (plyr->cheats & CF_GODMODE)
-        {
-            if (plyr->mo)
-                plyr->mo->health = 100;
-
-            plyr->health = deh_god_mode_health;
-            plyr->st_update = true; // [STRIFE]
-            plyr->message = DEH_String(STSTR_DQDON);
-        }
-        else 
-        {
-            plyr->st_update = true;
-            plyr->message = DEH_String(STSTR_DQDOFF);
-        }
-    }
-    else if (cht_CheckCheat(&cheat_ammo, ev->data2))
-    {
-        // [STRIFE]: "BOOMSTIX" cheat for all normal weapons
-        plyr->armorpoints = deh_idkfa_armor;
-        plyr->armortype = deh_idkfa_armor_class;
-
-        for (i = 0; i < NUMWEAPONS; i++)
-            if(!isdemoversion || weaponinfo[i].availabledemo)
-                plyr->weaponowned[i] = true;
-        
-        // Takes away the Sigil, even if you already had it...
-        plyr->weaponowned[wp_sigil] = false;
-
-        for (i=0;i<NUMAMMO;i++)
-            plyr->ammo[i] = plyr->maxammo[i];
-
-        plyr->message = DEH_String(STSTR_FAADDED);
-    }
-    else if(cht_CheckCheat(&cheat_keys, ev->data2))
-    {
-        // villsa [STRIFE]: "JIMMY" cheat for all keys
-        #define FIRSTKEYSETAMOUNT   16
-
-        if(plyr->cards[FIRSTKEYSETAMOUNT - 1])
-        {
-            if(plyr->cards[NUMCARDS - 1] || isdemoversion)
-            {
-                for(i = 0; i < NUMCARDS; i++)
-                    plyr->cards[i] = false;
-
-                plyr->message = DEH_String("Keys removed");
-            }
-            else
-            {
-                for(i = 0; i < NUMCARDS; i++)
-                    plyr->cards[i] = true;
-
-                plyr->message = DEH_String("Cheater Keys Added");
-            }
-        }
-        else
-        {
-            for(i = 0; i < FIRSTKEYSETAMOUNT; i++)
-                plyr->cards[i] = true;
-
-            plyr->message = DEH_String("Cheater Keys Added");
-        }
-    }
-    else if (cht_CheckCheat(&cheat_noclip, ev->data2))
-    {
-        // [STRIFE] Removed idspispopd, added NOCLIP flag setting/removal
-        // Noclip cheat - "ELVIS" (hah-hah :P )
-
-        plyr->cheats ^= CF_NOCLIP;
-
-        if (plyr->cheats & CF_NOCLIP)
-        {
-            plyr->message = DEH_String(STSTR_NCON);
-            plyr->mo->flags |= MF_NOCLIP;
-        }
-        else
-        {
-            plyr->message = DEH_String(STSTR_NCOFF);
-            plyr->mo->flags &= ~MF_NOCLIP;
-        }
-    }
-    else if(cht_CheckCheat(&cheat_stealth, ev->data2))
-    {
-        // villsa [STRIFE]: "GRIPPER" cheat; nothing to do with stealth...
-        plyr->cheats ^= CF_NOMOMENTUM;
-        if(plyr->cheats & CF_NOMOMENTUM)
-            plyr->message = DEH_String("STEALTH BOOTS ON");
-        else
-            plyr->message = DEH_String("STEALTH BOOTS OFF");
-    }
-    
-    for(i = 0; i < ST_PUMPUP_B + 3; ++i)
-    {
-        // [STRIFE]: Handle berserk, invisibility, and envirosuit
-        if(cht_CheckCheat(&cheat_powerup[i], ev->data2))
-        {
-            if(plyr->powers[i])
-                plyr->powers[i] = (i != 1);
-            else
-                P_GivePower(plyr, i);
-            plyr->message = DEH_String(STSTR_BEHOLDX);
-        }
-    }
-    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_H], ev->data2))
-    {
-        // [STRIFE]: PUMPUPH gives medical inventory items
-        P_GiveItemToPlayer(plyr, SPR_STMP, MT_INV_MED1);
-        P_GiveItemToPlayer(plyr, SPR_MDKT, MT_INV_MED2);
-        P_GiveItemToPlayer(plyr, SPR_FULL, MT_INV_MED3);
-        plyr->message = DEH_String("you got the stuff!");
-    }
-    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_P], ev->data2))
-    {
-        // [STRIFE]: PUMPUPP gives backpack
-        if(!plyr->backpack)
-        {
-            for(i = 0; i < NUMAMMO; ++i)
-                plyr->maxammo[i] = 2 * plyr->maxammo[i];
-        }
-        plyr->backpack = true;
-
-        for(i = 0; i < NUMAMMO; ++i)
-            P_GiveAmmo(plyr, i, 1);
-        plyr->message = DEH_String("you got the stuff!");
-    }
-    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_S], ev->data2))
-    {
-        // [STRIFE]: PUMPUPS gives stamina and accuracy upgrades
-        P_GiveItemToPlayer(plyr, SPR_TOKN, MT_TOKEN_STAMINA);
-        P_GiveItemToPlayer(plyr, SPR_TOKN, MT_TOKEN_NEW_ACCURACY);
-        plyr->message = DEH_String("you got the stuff!");
-    }
-    if(cht_CheckCheat(&cheat_powerup[ST_PUMPUP_T], ev->data2))
-    {
-        // [STRIFE] PUMPUPT gives targeter
-        P_GivePower(plyr, pw_targeter);
-        plyr->message = DEH_String("you got the stuff!");
-    }
-    // [STRIFE]: PUMPUP
-    if (cht_CheckCheat(&cheat_powerup[ST_PUMPUP], ev->data2))
-    {
-        // 'behold' power-up menu
-        plyr->message = DEH_String(STSTR_BEHOLD);
-        return false;
-    }
-
-    if (cht_CheckCheat(&cheat_mypos, ev->data2))
-    {
-        // [STRIFE] 'GPS' for player position
-        static char buf[ST_MSGWIDTH];
-        M_snprintf(buf, sizeof(buf),
-                   "ang=0x%x;x,y=(0x%x,0x%x)",
-                   players[consoleplayer].mo->angle,
-                   players[consoleplayer].mo->x,
-                   players[consoleplayer].mo->y);
-        plyr->message = buf;
-    }
-
-    // 'rift' change-level cheat
-    if (cht_CheckCheat(&cheat_clev, ev->data2))
-    {
-        char            buf[3];
-        int             map;
-
-        cht_GetParam(&cheat_clev, buf);
-
-        map = (buf[0] - '0') * 10 + buf[1] - '0';
-
-        // haleyjd 20100901: Removed Chex Quest stuff.
-        // haleyjd 20100915: Removed retail/registered/shareware stuff
-
-        // haleyjd 20130301: different bounds in v1.31
-        // Ohmygod - this is not going to work.
-        if(gameversion == exe_strife_1_31)
-        {
-            if ((isdemoversion && (map < 32 || map > 34)) ||
-                (isregistered  && (map <= 0 || map > 34)))
-                return false;
-        }
-        else
-        {
-            if (map <= 0 || map > 40)
-                return false;
-        }
-
-        // So be it.
-        plyr->message = DEH_String(STSTR_CLEV);
-        G_RiftExitLevel(map, 0, plyr->mo->angle);
-    }
-    else if(cht_CheckCheat(&cheat_scoot, ev->data2))
-    {
-        char            buf[3];
-        int             spot;
-        
-        cht_GetParam(&cheat_scoot, buf);
-
-        spot = buf[0] - '0';
-
-        // BUG: should be <= 9. Shouldn't do anything bad though...
-        if(spot <= 10) 
-        {
-            plyr->message = DEH_String("Spawning to spot");
-            G_RiftCheat(spot);
-            return false;
-        }
-    }
-
-    // villsa [STRIFE]
-    if(cht_CheckCheat(&cheat_nuke, ev->data2))
-    {
-        stonecold ^= 1;
-        plyr->message = DEH_String("Kill 'em.  Kill 'em All");
-        return false;
-    }
-
-    // villsa [STRIFE]
-    if(cht_CheckCheat(&cheat_midas, ev->data2))
-    {
-        plyr->message = DEH_String("YOU GOT THE MIDAS TOUCH, BABY");
-        P_GiveItemToPlayer(plyr, SPR_HELT, MT_TOKEN_TOUGHNESS);
-    }
-
-    // villsa [STRIFE] 
-    // haleyjd 20110224: No sigil in demo version
-    if(!isdemoversion && cht_CheckCheat(&cheat_lego, ev->data2))
-    {
-        plyr->st_update = true;
-        if(plyr->weaponowned[wp_sigil])
-        {
-            if(++plyr->sigiltype > 4)
-            {
-                plyr->sigiltype = -1;
-                plyr->pendingweapon = wp_fist;
-                plyr->weaponowned[wp_sigil] = false;
-            }
-        }
-        else
-        {
-            plyr->weaponowned[wp_sigil] = true;
-            plyr->sigiltype = 0;
-        }
-        // BUG: This brings up a bad version of the Sigil (sigiltype -1) which
-        // causes some VERY interesting behavior, when you type LEGO for the
-        // sixth time. This shouldn't be done when taking it away, and yet it
-        // is here... verified with vanilla.
-        plyr->pendingweapon = wp_sigil;
-    }
-
-    return false;
-}
-
-
-/*
-int ST_calcPainOffset(void)
-{
-    // haleyjd 08/31/10: [STRIFE] Removed.
-}
-*/
-
-//
-// This is a not-very-pretty routine which handles
-//  the face states and their timing.
-// the precedence of expressions is:
-//  dead > evil grin > turned head > straight ahead
-//
-/*
-void ST_updateFaceWidget(void)
-{
-    // haleyjd 08/31/10: [STRIFE] Removed.
-}
-*/
-
-/*
-void ST_updateWidgets(void)
-{
-    // haleyjd 09/01/10: [STRIFE] Rogue merged this into ST_Ticker below.
-}
-*/
-
-//
-// ST_Ticker
-//
-// haleyjd 09/01/10: [STRIFE]
-// * Removed st_clock and st_randomnumber.
-// * Merged ST_updateWidgets here. Wasn't inlined, as doesn't exist separately 
-//   in the binary as inlined functions normally do.
-//
-void ST_Ticker (void)
-{
-    static int  largeammo = 1994; // means "n/a"
-
-    // must redirect the pointer if the ready weapon has changed.
-    if (weaponinfo[plyr->readyweapon].ammo == am_noammo)
-        w_ready.num = &largeammo;
-    else
-        w_ready.num = &plyr->ammo[weaponinfo[plyr->readyweapon].ammo];
-
-    w_ready.data = plyr->readyweapon;
-
-    // STRIFE-TODO: Gobbledeegunk.
-    /*
-    v2 = dword_88490-- == 1; // no clue yet...
-    if(v2)
-        dword_DC7F4 = dword_DC7F0;*/
-
-    if(st_popupdisplaytics)
-    {
-        int tics = st_popupdisplaytics;
-
-        --st_popupdisplaytics;
-        if(tics == 1)
-        {
-            st_displaypopup = false;
-            st_showkeys = false;
-            st_keypage = -1;
-
-            if(st_dosizedisplay)
-                M_SizeDisplay(true);  // mondo hack?
-
-            st_dosizedisplay = false;
-        }
-    }
-
-    // haleyjd 20100901: [STRIFE] Keys are handled on a popup
-    // haleyjd 20100831: [STRIFE] No face widget
-    // haleyjd 20100901: [STRIFE] Armor, weapons, frags, etc. handled elsewhere
-
-    // haleyjd: This is from the PRE-BETA! Left here because it amuses me ;)
-    // get rid of chat window if up because of message
-    //if (!--st_msgcounter)
-    //    st_chat = st_oldchat;
-}
-
-static int st_palette = 0;
-
-//
-// ST_doPaletteStuff
-//
-// haleyjd 20100831: [STRIFE]
-// * Changed radsuit palette handling for Strife nukagecount.
-// * All other logic verified to be unmodified.
-//
-void ST_doPaletteStuff(void)
-{
-
-    int		palette;
-    byte*	pal;
-    int		cnt;
-    int		bzc;
-
-    cnt = plyr->damagecount;
-
-    if (plyr->powers[pw_strength])
-    {
-        // slowly fade the berzerk out
-        bzc = 12 - (plyr->powers[pw_strength]>>6);
-
-        if (bzc > cnt)
-            cnt = bzc;
-    }
-
-    if (cnt)
-    {
-        palette = (cnt+7)>>3;
-
-        if (palette >= NUMREDPALS)
-            palette = NUMREDPALS-1;
-
-        palette += STARTREDPALS;
-    }
-
-    else if (plyr->bonuscount)
-    {
-        palette = (plyr->bonuscount+7)>>3;
-
-        if (palette >= NUMBONUSPALS)
-            palette = NUMBONUSPALS-1;
-
-        palette += STARTBONUSPALS;
-    }
-    // haleyjd 20100831: [STRIFE] Flash green when in nukage, not when has
-    // an environment suit (a breathing sound is played to indicate that
-    // instead).
-    else if ( plyr->nukagecount > 16*TICRATE || 
-              (plyr->nukagecount & 8))
-        palette = RADIATIONPAL;
-    else
-        palette = 0;
-
-    // haleyjd 08/31/10: Removed Chex Quest
-
-    if (palette != st_palette)
-    {
-        st_palette = palette;
-        pal = (byte *) W_CacheLumpNum (lu_palette, PU_CACHE)+palette*768;
-        I_SetPalette (pal);
-    }
-
-}
-
-/* 
-void ST_drawWidgets(boolean refresh)
-{
-    haleyjd 09/01/10: [STRIFE] Removed
-}
-*/
-
-//
-// ST_drawNumFontY
-//
-// haleyjd 20100919: [STRIFE] New function
-// Draws a small yellow number for inventory etc.
-//
-void ST_drawNumFontY(int x, int y, int num)
-{
-    if(!num)
-        V_DrawPatch(x, y, invfonty[0]);
-    
-    while(num)
-    {
-        V_DrawPatch(x, y, invfonty[num % 10]);
-        x -= SHORT(invfonty[0]->width) + 1;
-        num /= 10;
-    }
-}
-
-//
-// ST_drawNumFontY2
-//
-// haleyjd 20100919: [STRIFE] New function
-// As above, but turns negative numbers into zero.
-//
-void ST_drawNumFontY2(int x, int y, int num)
-{
-    if(!num)
-        V_DrawPatch(x, y, invfonty[0]);
-
-    if(num < 0)
-        num = 0;
-
-    while(num)
-    {
-        V_DrawPatchDirect(x, y, invfonty[num % 10]);
-        x -= SHORT(invfonty[0]->width) + 1;
-        num /= 10;
-    }
-}
-
-//
-// ST_drawLine
-//
-// haleyjd 20100920: [STRIFE] New function
-// Basic horizontal line drawing routine used for the health bars.
-//
-void ST_drawLine(int x, int y, int len, int color)
-{
-    byte putcolor = (byte)(color);
-    byte *drawpos = I_VideoBuffer + y * SCREENWIDTH + x;
-    int i = 0;
-
-    while(i < len)
-    {
-        *drawpos++ = putcolor;
-        ++i;
-    }
-}
-
-//
-// ST_doRefresh
-//
-// haleyjd 20100920: Evidence more than suggests that Rogue moved all status bar
-// drawing down to this function.
-//
-void ST_doRefresh(void)
-{
-    // draw status bar background to off-screen buff
-    if (st_statusbaron)
-    {
-        int firstinventory, icon_x, num_x, i, numdrawn;
-
-        // haleyjd 20100919: No backscreen caching in Strife.
-        //V_UseBuffer(st_backing_screen);
-
-        // TODO: only sometimes drawing?
-
-        plyr->st_update = false;
-
-        // cache data
-        st_lastcursorpos = plyr->inventorycursor;
-        st_lastammo      = weaponinfo[plyr->readyweapon].ammo;
-        st_lastarmortype = plyr->armortype;
-        st_lasthealth    = plyr->health;
-        st_firsttime     = false;
-
-        // draw main status bar
-        V_DrawPatch(ST_X, ST_Y, invback);
-
-        // draw multiplayer armor backdrop if netgame
-        // haleyjd 20131031: BUG - vanilla is accessing a NULL pointer here when
-        // playing back netdemos! It doesn't appear to draw anything, and there 
-        // is no apparent ill effect on gameplay, so the best we can do is check.
-        if(netgame && stback)
-            V_DrawPatch(ST_X, 173, stback);
-
-        if(plyr->inventorycursor >= 6)
-            firstinventory = plyr->inventorycursor - 5;
-        else
-            firstinventory = 0;
-
-        // Draw cursor.
-        if(plyr->numinventory)
-        {
-            V_DrawPatch(35 * (plyr->inventorycursor - firstinventory) + 42,
-                        180, invcursor);
-        }
-
-        // Draw inventory bar
-        for(num_x = 68, icon_x = 48, i = firstinventory, numdrawn = 0; 
-            num_x < 278; 
-            num_x += 35, icon_x += 35, i++, numdrawn++)
-        {
-            int lumpnum;
-            patch_t *patch;
-            char iconname[8];
-
-            if(plyr->numinventory <= numdrawn)
-                break;
-            
-            DEH_snprintf(iconname, sizeof(iconname), "I_%s",
-                         DEH_String(sprnames[plyr->inventory[i].sprite]));
-
-            lumpnum = W_CheckNumForName(iconname);
-            if(lumpnum == -1)
-                patch = W_CacheLumpName(DEH_String("STCFN063"), PU_CACHE);
-            else
-                patch = W_CacheLumpNum(lumpnum, PU_STATIC);
-
-            V_DrawPatch(icon_x, 182, patch);
-            ST_drawNumFontY(num_x, 191, plyr->inventory[i].amount);
-        }
-
-        // haleyjd 20100919: Draw sigil icon
-        if(plyr->weaponowned[wp_sigil])
-            V_DrawPatch(253, 175, invsigil[plyr->sigiltype]);
-
-        // haleyjd 20100919: Draw ammo
-        if(st_lastammo < NUMAMMO)
-            V_DrawPatch(290, 180, invammo[st_lastammo]);
-
-        // haleyjd 20100919: Draw armor
-        if(plyr->armortype)
-        {
-            V_DrawPatch(2, 177, invarmor[plyr->armortype - 1]);
-            ST_drawNumFontY(20, 191, plyr->armorpoints);
-        }
-
-        // haleyjd 20100920: Draw life bars.
-        {
-            int barlength;
-            int lifecolor1;
-            int lifecolor2;
-
-            barlength = plyr->health;
-            if(barlength > 100)
-                barlength = 200 - plyr->health;
-            barlength *= 2;
-
-            if(plyr->health < 11)      // Danger, Will Robinson!
-                lifecolor1 = 64;
-            else if(plyr->health < 21) // Caution
-                lifecolor1 = 80;
-            else                       // All is well.
-                lifecolor1 = 96;
-
-            if(plyr->cheats & CF_GODMODE) // Gold, probably a throwback to DOOM.
-                lifecolor1 = 226;
-
-            lifecolor2 = lifecolor1 + 3;
-
-            // Draw the normal health bars
-            ST_drawLine(49, 172, barlength, lifecolor1);
-            ST_drawLine(49, 173, barlength, lifecolor2);
-            ST_drawLine(49, 175, barlength, lifecolor1);
-            ST_drawLine(49, 176, barlength, lifecolor2);
-
-            // Draw the > 100 health lines
-            if(plyr->health > 100)
-            {
-                int oldbarlength = barlength;
-                lifecolor1 = 112;             // Shades of blue
-                lifecolor2 = lifecolor1 + 3;
-
-                // take up the difference not drawn by the first (<= 100) bar
-                barlength = 200 - barlength;
-
-                ST_drawLine(49 + oldbarlength, 172, barlength, lifecolor1);
-                ST_drawLine(49 + oldbarlength, 173, barlength, lifecolor2);
-                ST_drawLine(49 + oldbarlength, 175, barlength, lifecolor1);
-                ST_drawLine(49 + oldbarlength, 176, barlength, lifecolor2);
-            }
-        } // end local-scope block
-
-        // haleyjd 20100919: nope, not in Strife.
-        //V_RestoreBuffer();
-        //V_CopyRect(ST_X, 0, st_backing_screen, ST_WIDTH, ST_HEIGHT, ST_X, ST_Y);
-    }
-}
-
-// haleyjd [STRIFE]: Removed ST_diffDraw
-
-void ST_Drawer (boolean fullscreen, boolean refresh)
-{
-    st_statusbaron = (!fullscreen) || automapactive;
-    st_firsttime = st_firsttime || refresh;
-
-    // Do red-/gold-shifts from damage/items
-    ST_doPaletteStuff();
-
-    // If just after ST_Start(), refresh all
-    ST_doRefresh();
-    // Otherwise, update as little as possible
-    //ST_diffDraw(); [STRIFE]: nope
-}
-
-//
-// ST_calcFrags
-//
-// haleyjd [STRIFE] New function.
-// Calculate frags for display on the frags popup.
-//
-static int ST_calcFrags(int pnum)
-{
-    int i;
-    int result = 0;
-
-    for(i = 0; i < MAXPLAYERS; i++)
-    {
-        if(i == pnum) // self-frags
-            result -= players[pnum].frags[i];
-        else
-            result += players[pnum].frags[i];
-    }
-
-    return result;
-}
-
-//
-// ST_drawTime
-//
-// villsa [STRIFE] New function.
-// Draws game time on pop up screen
-//
-static void ST_drawTime(int x, int y, int time)
-{
-    int hours;
-    int minutes;
-    int seconds;
-    char string[16];
-
-    // haleyjd 20110213: fixed minutes
-    hours   = time / 3600;
-    minutes = (time / 60) % 60;
-    seconds = time % 60;
-
-    DEH_snprintf(string, 16, "%02d:%02d:%02d", hours, minutes, seconds);
-    HUlib_drawYellowText(x, y, string);
-}
-
-#define ST_KEYSPERPAGE   10
-#define ST_KEYS_X        20
-#define ST_KEYS_Y        63
-#define ST_KEYNAME_X     17
-#define ST_KEYNAME_Y      4
-#define ST_KEYS_YSTEP    17
-#define ST_KEYS_NUMROWS   4
-#define ST_KEYS_COL2X   160
-
-//
-// ST_drawKeysPopup
-//
-// haleyjd 20110213: [STRIFE] New function
-// This has taken the longest out of almost everything to get working properly.
-//
-static boolean ST_drawKeysPopup(void)
-{
-    int x, y, yt, key, keycount;
-    mobjinfo_t *info;
-
-    V_DrawXlaPatch(0, 56, invpbak2);
-    V_DrawPatchDirect(0, 56, invpop2);
-
-    if(deathmatch)
-    {
-        int pnum;
-        patch_t *colpatch;
-        char buffer[128];
-        int frags;
-
-        // In deathmatch, the keys popup is replaced by a chart of frag counts
-        
-        // first column
-        y  = 64;
-        yt = 66;
-        for(pnum = 0; pnum < MAXPLAYERS/2; pnum++)
-        {
-            DEH_snprintf(buffer, sizeof(buffer), "stcolor%d", pnum+1);
-            colpatch = W_CacheLumpName(buffer, PU_CACHE);
-            V_DrawPatchDirect(28, y, colpatch);
-            frags = ST_calcFrags(pnum);
-            DEH_snprintf(buffer, sizeof(buffer), "%s%d", player_names[pnum], frags);
-            HUlib_drawYellowText(38, yt, buffer);
-            if(!playeringame[pnum])
-                HUlib_drawYellowText(28, pnum*17 + 65, "X");
-            y  += 17;
-            yt += 17;
-        }
-
-        // second column
-        y  = 64;
-        yt = 66;
-        for(pnum = MAXPLAYERS/2; pnum < MAXPLAYERS; pnum++)
-        {
-            DEH_snprintf(buffer, sizeof(buffer), "stcolor%d", pnum+1);
-            colpatch = W_CacheLumpName(buffer, PU_CACHE);
-            V_DrawPatchDirect(158, y, colpatch);
-            frags = ST_calcFrags(pnum);
-            DEH_snprintf(buffer, sizeof(buffer), "%s%d", player_names[pnum], frags);
-            HUlib_drawYellowText(168, yt, buffer);
-            if(!playeringame[pnum])
-                HUlib_drawYellowText(158, pnum*17 - 3, "X");
-            y  += 17;
-            yt += 17;
-        }
-    }
-    else
-    {
-        // Bounds-check page number
-        if(st_keypage < 0 || st_keypage > 2)
-        {
-            st_keypage = -1;
-            st_popupdisplaytics = 0;
-            st_displaypopup = false;
-
-            return false;
-        }
-
-        // Are there any keys to display on this page?
-        if(st_keypage > 0)
-        {
-            boolean haskeyinrange = false;
-
-            for(key = ST_KEYSPERPAGE * st_keypage, keycount = 0;
-                keycount < ST_KEYSPERPAGE && key < NUMCARDS;
-                ++key, ++keycount)
-            {
-                if(plyr->cards[key])
-                    haskeyinrange = true;
-            }
-
-            if(!haskeyinrange)
-            {
-                st_displaypopup = false;
-                st_showkeys = false;
-                st_keypage = -1;
-                
-                return false;
-            }
-        }
-
-        // Draw the keys for the current page
-        key = ST_KEYSPERPAGE * st_keypage;
-        keycount = 0;
-        x = ST_KEYS_X;
-        y = ST_KEYS_Y;
-        info = &mobjinfo[MT_KEY_BASE + key];
-
-        for(; keycount < ST_KEYSPERPAGE && key < NUMCARDS; ++key, ++keycount, ++info)
-        {
-            char sprname[8];
-            patch_t *patch;
-            memset(sprname, 0, sizeof(sprname));
-
-            if(plyr->cards[key])
-            {
-                // Get spawnstate sprite name and load corresponding icon
-                DEH_snprintf(sprname, sizeof(sprname), "I_%s",
-                    sprnames[states[info->spawnstate].sprite]);
-                patch = W_CacheLumpName(sprname, PU_CACHE);
-                V_DrawPatchDirect(x, y, patch);
-                HUlib_drawYellowText(x + ST_KEYNAME_X, y + ST_KEYNAME_Y, info->name);
-            }
-
-            if(keycount != ST_KEYS_NUMROWS)
-                y += ST_KEYS_YSTEP;
-            else
-            {
-                x = ST_KEYS_COL2X;
-                y = ST_KEYS_Y;
-            }
-        }
-    }
-
-    return true;
-}
-
-//
-// ST_DrawExternal
-//
-// haleyjd 20100901: [STRIFE] New function.
-// * Draws external portions of the status bar such the top bar and popups.
-//
-boolean ST_DrawExternal(void)
-{
-    int i;
-
-    if(st_statusbaron)
-    {
-        V_DrawPatchDirect(0, 160, invtop);
-        STlib_drawNumPositive(&w_health);
-        STlib_drawNumPositive(&w_ready);
-    }
-    else
-    {
-        ammotype_t ammo;
-
-        ST_drawNumFontY2(15, 194, plyr->health);
-        ammo = weaponinfo[plyr->readyweapon].ammo;
-        if (ammo != am_noammo)
-            ST_drawNumFontY2(310, 194, plyr->ammo[ammo]);
-    }
-
-    if(!st_displaypopup)
-        return false;
-
-    // villsa [STRIFE] added 20100926
-    if(st_showobjective)
-    {
-        V_DrawXlaPatch(0, 56, invpbak2);
-        V_DrawPatchDirect(0, 56, invpop2);
-        M_DialogDimMsg(24, 74, mission_objective, true);
-        HUlib_drawYellowText(24, 74, mission_objective);
-        ST_drawTime(210, 64, leveltime / TICRATE);
-    }
-    else
-    {
-        int keys = 0;
-
-        // villsa [STRIFE] keys popup
-        if(st_showkeys || st_popupdisplaytics)
-            return ST_drawKeysPopup();
-
-        V_DrawXlaPatch(0, 56, invpbak);
-        V_DrawPatchDirect(0, 56, invpop);
-
-        for(i = 0; i < NUMCARDS; i++)
-        {
-            if(plyr->cards[i])
-                keys++;
-        }
-
-        ST_drawNumFontY2(261, 132, keys);
-
-         if(plyr->weaponowned[wp_elecbow])
-         {
-             V_DrawPatchDirect(38, 86, 
-                 W_CacheLumpName(DEH_String("CBOWA0"), PU_CACHE));
-         }
-         if(plyr->weaponowned[wp_rifle])
-         {
-             V_DrawPatchDirect(40, 107, 
-                 W_CacheLumpName(DEH_String("RIFLA0"), PU_CACHE));
-         }
-         if(plyr->weaponowned[wp_missile])
-         {
-             V_DrawPatchDirect(39, 131, 
-                 W_CacheLumpName(DEH_String("MMSLA0"), PU_CACHE));
-         }
-         if(plyr->weaponowned[wp_hegrenade])
-         {
-             V_DrawPatchDirect(78, 87, 
-                 W_CacheLumpName(DEH_String("GRNDA0"), PU_CACHE));
-         }
-         if(plyr->weaponowned[wp_flame])
-         {
-             V_DrawPatchDirect(80, 117, 
-                 W_CacheLumpName(DEH_String("FLAMA0"), PU_CACHE));
-         }
-         if(plyr->weaponowned[wp_mauler])
-         {
-             V_DrawPatchDirect(75, 142, 
-                 W_CacheLumpName(DEH_String("TRPDA0"), PU_CACHE));
-         }
-         
-         // haleyjd 20110213: draw ammo
-         for(i = 0; i < NUMAMMO; i++)
-         {
-             STlib_drawNumPositive(&w_ammo[i]);
-             STlib_drawNumPositive(&w_maxammo[i]);
-         }
-
-         ST_drawNumFontY2(261, 84,  plyr->accuracy);
-         ST_drawNumFontY2(261, 108, plyr->stamina);
-
-         if(plyr->powers[pw_communicator])
-         {
-             V_DrawPatchDirect(280, 130, 
-                 W_CacheLumpName(DEH_String("I_COMM"), PU_CACHE));
-         }
-    }
-
-    return true;
-}
-
-typedef void (*load_callback_t)(const char *lumpname, patch_t **variable);
-
-//
-// ST_loadUnloadGraphics
-//
-// Iterates through all graphics to be loaded or unloaded, along with
-// the variable they use, invoking the specified callback function.
-//
-// [STRIFE] Altered to load all Strife status bar resources.
-//
-static void ST_loadUnloadGraphics(load_callback_t callback)
-{
-    int         i;
-    char        namebuf[9];
-
-    // haleyjd 20100901: [STRIFE]
-    // Load the numbers, green and yellow
-    for (i=0;i<10;i++)
-    {
-        DEH_snprintf(namebuf, 9, "INVFONG%d", i);
-        callback(namebuf, &invfontg[i]);
-
-        DEH_snprintf(namebuf, 9, "INVFONY%d", i);
-        callback(namebuf, &invfonty[i]);
-    }
-
-    // haleyjd 20100919: load Sigil patches
-    if(!isdemoversion)
-    {
-        for(i = 0; i < 5; i++)
-        {
-            DEH_snprintf(namebuf, 9, "I_SGL%d", i+1);
-            callback(namebuf, &invsigil[i]);
-        }
-    }
-
-    // load ammo patches
-    for(i = 0; i < NUMAMMO; i++)
-        callback(DEH_String(invammonames[i]), &invammo[i]);
-
-    // load armor patches
-    callback(DEH_String("I_ARM2"), &invarmor[0]);
-    callback(DEH_String("I_ARM1"), &invarmor[1]);
-
-    // haleyjd 20100919: [STRIFE] 
-    // * No face, but there is this patch, which appears behind the armor
-    DEH_snprintf(namebuf, 9, "STBACK0%d", consoleplayer + 1);
-    if(netgame)
-        callback(namebuf, &stback);
-    
-    // 20100901:
-    // * Removed all unused DOOM stuff (arms, numbers, %, etc).
-
-    // haleyjd 20100901: [STRIFE]: stbar -> invback, added new patches
-    // status bar background bits
-    callback(DEH_String("INVBACK"),  &invback);
-    callback(DEH_String("INVTOP"),   &invtop);
-    callback(DEH_String("INVPOP"),   &invpop);
-    callback(DEH_String("INVPOP2"),  &invpop2);
-    callback(DEH_String("INVPBAK"),  &invpbak);
-    callback(DEH_String("INVPBAK2"), &invpbak2);
-    callback(DEH_String("INVCURS"),  &invcursor);
-}
-
-static void ST_loadCallback(const char *lumpname, patch_t **variable)
-{
-    *variable = W_CacheLumpName(lumpname, PU_STATIC);
-}
-
-void ST_loadGraphics(void)
-{
-    ST_loadUnloadGraphics(ST_loadCallback);
-}
-
-void ST_loadData(void)
-{
-//    static int dword_8848C = 1; // STRIFE-TODO: what is the purpose of this?
-//    dword_8848C = 0;
-
-    lu_palette = W_GetNumForName (DEH_String("PLAYPAL"));
-    ST_loadGraphics();
-}
-
-static void ST_unloadCallback(const char *lumpname, patch_t **variable)
-{
-    W_ReleaseLumpName(lumpname);
-    *variable = NULL;
-}
-
-void ST_unloadGraphics(void)
-{
-    ST_loadUnloadGraphics(ST_unloadCallback);
-}
-
-void ST_unloadData(void)
-{
-    ST_unloadGraphics();
-}
-
-//
-// ST_initData
-//
-// haleyjd 20100901: [STRIFE]
-// * Removed prebeta cruft, face stuff, keyboxes, and oldwe
-//
-void ST_initData(void)
-{
-    st_firsttime = true;
-    plyr = &players[consoleplayer];
-
-    st_statusbaron = true;
-
-    st_palette = -1;
-
-    STlib_init();
-}
-
-
-
-void ST_createWidgets(void)
-{
-    int i;
-
-    // ready weapon ammo
-    STlib_initNum(&w_ready,
-                  ST_AMMOX,
-                  ST_AMMOY,
-                  invfontg,
-                  &plyr->ammo[weaponinfo[plyr->readyweapon].ammo],
-                  ST_AMMOWIDTH);
-
-    // the last weapon type
-    w_ready.data = plyr->readyweapon; 
-
-    // health percentage
-    STlib_initNum(&w_health,
-                  ST_HEALTHX,
-                  ST_HEALTHY,
-                  invfontg,
-                  &plyr->health,
-                  ST_HEALTHWIDTH);
-
-    // haleyjd 20100831: [STRIFE] 
-    // * No face.
-    // 20100901:
-    // * No arms, weaponsowned, frags, armor, keyboxes
-
-    // haleyjd 20110213: Ammo Widgets!!!
-    for(i = 0; i < NUMAMMO; i++)
-    {
-        STlib_initNum(&w_ammo[i], ST_POPUPAMMOX, st_yforammo[i], 
-                      invfonty, &plyr->ammo[i], st_wforammo[i]);
-
-        STlib_initNum(&w_maxammo[i], ST_POPUPMAXAMMOX, st_yforammo[i],
-                      invfonty, &plyr->maxammo[i], st_wforammo[i]);
-    }
-}
-
-static boolean	st_stopped = true;
-
-
-void ST_Start (void)
-{
-    if (!st_stopped)
-        ST_Stop();
-
-    ST_initData();
-    ST_createWidgets();
-    st_stopped = false;
-}
-
-void ST_Stop (void)
-{
-    if (st_stopped)
-        return;
-
-    I_SetPalette (W_CacheLumpNum (lu_palette, PU_CACHE));
-
-    st_stopped = true;
-}
-
-void ST_Init (void)
-{
-    ST_loadData();
-
-    // haleyjd 20100919: This is not used by Strife. More memory for voices!
-    //st_backing_screen = (byte *) Z_Malloc(ST_WIDTH * ST_HEIGHT, PU_STATIC, 0);
-}
-
diff --git a/games/NXDoom/src/strife/st_stuff.h b/games/NXDoom/src/strife/st_stuff.h
deleted file mode 100644
index 167888ed7..000000000
--- a/games/NXDoom/src/strife/st_stuff.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Status bar code.
-//	Does the face/direction indicator animatin.
-//	Does palette indicators as well (red pain/berserk, bright pickup)
-//
-
-#ifndef __STSTUFF_H__
-#define __STSTUFF_H__
-
-#include "doomtype.h"
-#include "d_event.h"
-#include "m_cheat.h"
-
-// Size of statusbar.
-// Now sensitive for scaling.
-#define ST_HEIGHT	32
-#define ST_WIDTH	SCREENWIDTH
-#define ST_Y		(SCREENHEIGHT - ST_HEIGHT)
-
-
-//
-// STATUS BAR
-//
-
-// Called by main loop.
-boolean ST_Responder (event_t* ev);
-
-// Called by main loop.
-void ST_Ticker (void);
-
-// Called by main loop.
-void ST_Drawer (boolean fullscreen, boolean refresh);
-
-// haleyjd 09/01/10: [STRIFE] New function.
-// Called by main loop to draw external status bar bits.
-// Returns true if a popup is drawing.
-boolean ST_DrawExternal(void);
-
-// Called when the console player is spawned on each level.
-void ST_Start (void);
-
-// Called by startup code.
-void ST_Init (void);
-
-
-
-extern byte *st_backing_screen;
-
-extern cheatseq_t cheat_mus;     // [STRIFE]: idmus -> spin
-extern cheatseq_t cheat_god;     // [STRIFE]: iddqd -> omnipotent
-extern cheatseq_t cheat_ammo;    // [STRIFE]: idfa -> boomstix
-extern cheatseq_t cheat_noclip;  // [STRIFE]: idclip -> elvis
-extern cheatseq_t cheat_clev;    // [STRIFE]: idclev -> rift
-extern cheatseq_t cheat_mypos;   // [STRIFE]: idmypos -> gps
-extern cheatseq_t cheat_scoot;   // [STRIFE]: new cheat scoot
-extern cheatseq_t cheat_nuke;    // [STRIFE]: new cheat stonecold
-extern cheatseq_t cheat_keys;    // [STRIFE]: new cheat jimmy (all keys)
-extern cheatseq_t cheat_stealth; // [STRIFE]: new cheat gripper
-extern cheatseq_t cheat_midas;   // [STRIFE]: new cheat
-extern cheatseq_t cheat_lego;    // [STRIFE]: new cheat
-extern cheatseq_t cheat_dev;     // [STRIFE]: new cheat
-
-extern cheatseq_t cheat_powerup[];
-
-
-#endif
diff --git a/games/NXDoom/src/strife/strife_icon.c b/games/NXDoom/src/strife/strife_icon.c
deleted file mode 100644
index 93c43f9ad..000000000
--- a/games/NXDoom/src/strife/strife_icon.c
+++ /dev/null
@@ -1,2736 +0,0 @@
-static int strife_icon_w = 128;
-static int strife_icon_h = 128;
-
-static const unsigned int strife_icon_data[] = {
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0001, 
-    0xe580463a, 0xe17e476f, 0xdf7e456f, 0xdc7d486e, 0xde7d476c, 0xdd7d466a, 
-    0xdd794469, 0xdc794367, 0xda7b4466, 0xdb784264, 0xd8764063, 0xda763f61, 
-    0xd7723d60, 0xd9753e5e, 0xd874405c, 0xd8733e5b, 0xd7703c59, 0xd46e3a58, 
-    0xd5713b56, 0xd26c3955, 0xd46c3753, 0xd06a3552, 0xcf663350, 0xd169344e, 
-    0xd167324d, 0xcf63334b, 0xcb60304a, 0xca602e48, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 0xc75a2944, 
-    0xc75a2944, 0xc75a2944, 0xc8592945, 0xbc552748, 0xb951284c, 0xaf4d2350, 
-    0xa94a2253, 0xa4492057, 0x9e452059, 0x993e222d, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xd8804e1a, 0xeb9054e5, 0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 
-    0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 
-    0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 
-    0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 
-    0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 
-    0xca5c2dff, 0xc8592bff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 
-    0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 
-    0x873a1ad0, 0x99402614, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xe88d53d2, 0xf39d5fff, 0xf29b5dff, 0xf1995cff, 
-    0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 0xea8d53ff, 0xe88b51ff, 
-    0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 0xe08049ff, 0xe07e47ff, 
-    0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 0xd8733fff, 0xd7713dff, 
-    0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 0xd06634ff, 0xcf6433ff, 
-    0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xc95b2cff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 0xa14621ff, 0x99421eff, 
-    0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x86391abc, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf19a5cfc, 0xf39d5fff, 
-    0xf29b5dff, 0xf1995cff, 0xee965aff, 0xed9458ff, 0xec9256ff, 0xea9055ff, 
-    0xea8d53ff, 0xe88b51ff, 0xe78950ff, 0xe5874eff, 0xe3844cff, 0xe2824aff, 
-    0xe08049ff, 0xe07e47ff, 0xde7b45ff, 0xdd7a44ff, 0xdc7842ff, 0xda7640ff, 
-    0xd8733fff, 0xd7713dff, 0xd66f3bff, 0xd46d39ff, 0xd36a38ff, 0xd26836ff, 
-    0xd06634ff, 0xcf6433ff, 0xcd6131ff, 0xcc5f2fff, 0xca5d2eff, 0xca5b2cff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0xc8592aff, 0xc65929ff, 0xbc5427ff, 0xb45025ff, 0xab4b23ff, 
-    0xa14621ff, 0x99421eff, 0x903e1dff, 0x873a1aff, 0x7d3618ff, 0x793317f3, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xf39e61ff, 0xa9643aff, 0x602d16ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x53210eff, 
-    0x672b12ff, 0x743015fd, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xac683dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x622911fe, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x663219ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x50210eff, 0x4c1e0cff, 0x4c1e0cff, 0x884322ff, 0xe78c53ff, 0xe1854dff, 
-    0xb5542aff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xaf5027ff, 0x843b1bff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6b3118ff, 0xe2874fff, 0xe58a51ff, 0xbc5b2fff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0x94421fff, 0x4d1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x532210ff, 
-    0xd97f48ff, 0xe98e54ff, 0xc56535ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa04822ff, 
-    0x55230eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0xc8713fff, 0xe99056ff, 
-    0xce6e3cff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 0xb15127ff, 
-    0xb15127ff, 0xb15127ff, 0xb15127ff, 0xa74c24ff, 0x602812ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4d1e0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f200eff, 0x4c1e0cff, 0x4c1e0cff, 0xe48950ff, 
-    0xf5a062ff, 0xf5a062ff, 0xdc7843ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5e2eff, 
-    0x5a2610ff, 0x4c1e0cff, 0x4c1e0cff, 0xcf7543ff, 0xf5a062ff, 0xf5a062ff, 
-    0xe4854dff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x733216ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xad5d32ff, 0xf5a062ff, 0xf5a062ff, 0xeb9156ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x8b3d1dff, 0x4c1e0cff, 0x4c1e0cff, 0x793a1dff, 
-    0xf5a062ff, 0xf5a062ff, 0xf39d60ff, 0xcc5f2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xa34a23ff, 0x4c1e0cff, 0x4c1e0cff, 0x4e1e0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xdc7f48ff, 0xf5a062ff, 0xf5a062ff, 0xd56f3bff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xc2592cff, 0x52210dff, 0x4c1e0cff, 0x4c1e0cff, 0xc2693aff, 
-    0xf5a062ff, 0xf5a062ff, 0xde7c45ff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xca5d2dff, 
-    0x632a12ff, 0x4c1e0cff, 0x4c1e0cff, 0x9e4e28ff, 0xf49f62ff, 0xf5a062ff, 
-    0xe6884fff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0x793418ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x6f3217ff, 0xf29b5eff, 0xf5a062ff, 0xee9459ff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 0xcb5e2eff, 
-    0xcb5e2eff, 0xcb5e2eff, 0x91411fff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xab4d24ff, 0xd8723eff, 0xd46c38ff, 
-    0xa34922ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7e3719ff, 0x5c2610ff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xd56e3aff, 0xd7703cff, 0xb05025ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x652a13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xd26836ff, 0xd8743fff, 0xc0582bff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x6f3016ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xce6331ff, 0xda7541ff, 
-    0xcc612fff, 0x823a1aff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 
-    0x7f3819ff, 0x7f3819ff, 0x7f3819ff, 0x773317ff, 0x4e1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 
-    0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 
-    0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 0xc8592aff, 0xc8592aff, 
-    0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 0x9e4520ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7c3417ff, 
-    0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 0xc8592aff, 0xc8592aff, 
-    0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0xaa4b23ff, 
-    0xc8592aff, 0xc8592aff, 0x883b1aff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x93401dff, 0xc8592aff, 0xc8592aff, 
-    0x9e4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x7c3417ff, 0xc8592aff, 0xc8592aff, 0xb65026ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x632912ff, 
-    0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51210dff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0xa94a23ff, 0xc8592aff, 0xc8592aff, 0x863a1aff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x923f1dff, 
-    0xc8592aff, 0xc8592aff, 0x9f4520ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x7a3517ff, 0xc8592aff, 0xc8592aff, 
-    0xb55026ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x632812ff, 0xc8592aff, 0xc8592aff, 0xc8592aff, 0x51200eff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x8d3d1cff, 0xc8592aff, 0xc7582aff, 
-    0x6a2c13ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x763216ff, 0xc8592aff, 0xc8592aff, 0x813719ff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 
-    0xc55829ff, 0xc8592aff, 0x98431fff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x52210dff, 0xbd5427ff, 0xc8592aff, 
-    0xb04e24ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4d1f0cff, 
-    0x712f14ff, 0x632912ff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x682b13ff, 0x6d2d14ff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x602811ff, 0x723115ff, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x58240fff, 0x753116ff, 0x54220eff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4f1f0dff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4f1f0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x4f1f0dff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 0x4c1e0cff, 
-    0x4c1e0cff, 0x4f1f0dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x93756aff, 0x91766aff, 0xa89078ff, 0xb6a07fff, 
-    0xb6a07fff, 0xb6a07fff, 0xb6a07fff, 0xb6a07fff, 0xb6a07fff, 0xbca88bff, 
-    0xc7baa6ff, 0xc6b9a5ff, 0xc6b9a5ff, 0xc5b7a4ff, 0xc5b7a4ff, 0xc4b6a2ff, 
-    0xc3b5a0ff, 0xc3b5a0ff, 0xc2b49fff, 0xbba78bff, 0xb69e7bff, 0xb69d7bff, 
-    0xb69d7bff, 0xb69d7aff, 0xb59b79ff, 0xb39976ff, 0xb19774ff, 0xaf9572ff, 
-    0xae9573ff, 0xb3a188ff, 0xb3a38eff, 0xb1a18cff, 0xb0a08aff, 0xae9e88ff, 
-    0xac9c85ff, 0xab9a84ff, 0xa99883ff, 0xa79580ff, 0xa49179ff, 0x9a7d58ff, 
-    0x987b56ff, 0x977a55ff, 0x957852ff, 0x937550ff, 0x91734eff, 0x90724dff, 
-    0x8e704aff, 0x8c6e48ff, 0x8f7556ff, 0x93816aff, 0x917e68ff, 0x907d66ff, 
-    0x8e7a64ff, 0x8c7963ff, 0x8b7861ff, 0x89755fff, 0x86735cff, 0x86735cff, 
-    0x7c603eff, 0x775631ff, 0x755430ff, 0x785835ff, 0x7a5b3bff, 0x7d5c41ff, 
-    0x7f5f46ff, 0x74564aff, 0x5f464bff, 0x674e55ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xf9f9f9ff, 0xedededff, 0xf3f3f3ff, 0xdfdfdfff, 0xdededeff, 0xdcdcdcff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf7f7f7ff, 
-    0xf2f2f2ff, 0xedededff, 0xcfcfcfff, 0xdcdcdcff, 0xc6c6c6ff, 0xbfbfbfff, 
-    0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa0a0a0ff, 0x9b9b9bff, 0x979797ff, 0x989898ff, 0x9a9a9aff, 0x969696ff, 
-    0xa0a0a0ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6a6e84ff, 0x717693ff, 0x777ea1ff, 0x7d85adff, 0x858791ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xf9f9f9ff, 0xe5e5e5ff, 0xebebebff, 0xffffffff, 0xf2f2f2ff, 
-    0xdededeff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xfcfcfcff, 0xf7f7f7ff, 0xf1f1f1ff, 0xd2d2d2ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xdcdcdcff, 0xc3c3c3ff, 0xbdbdbdff, 0xbcbcbcff, 0xbababaff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0x9b9b9bff, 0x9c9c9cff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x939393ff, 0x9f9f9fff, 0x9d9d9dff, 0x9b9b9bff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 0x717693ff, 0x797fa0ff, 
-    0x84868fff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfafafaff, 0xe7e7e7ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xf2f2f2ff, 0xdcdcdcff, 0xdbdbdbff, 0xd9d9d9ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xfcfcfcff, 0xf6f6f6ff, 0xd4d4d4ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xd9d9d9ff, 0xc0c0c0ff, 0xbcbcbcff, 
-    0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 0xa0a0a0ff, 0xa0a0a0ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x909090ff, 
-    0x9d9d9dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 0x646775ff, 0x6a6e84ff, 
-    0x737893ff, 0x84868dff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xfafafaff, 0xe8e8e8ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf1f1f1ff, 
-    0xdbdbdbff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xd7d7d7ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd4d4d4ff, 0xbfbfbfff, 0xbababaff, 0xb9b9b9ff, 0xb7b7b7ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xa9a9a9ff, 0xa5a5a5ff, 
-    0xa3a3a3ff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x8d8d8dff, 0x9b9b9bff, 0x9a9a9aff, 0x989898ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x5e5f66ff, 
-    0x646775ff, 0x6c7085ff, 0x85868cff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 0xeaeaeaff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xf1f1f1ff, 0xd9d9d9ff, 0xd7d7d7ff, 0xd6d6d6ff, 
-    0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfefefeff, 
-    0xd9d9d9ff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd0d0d0ff, 0xbdbdbdff, 0xb9b9b9ff, 
-    0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 
-    0xa9a9a9ff, 0xa7a7a7ff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x8a8a8aff, 
-    0x9a9a9aff, 0x989898ff, 0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 
-    0x575758ff, 0x5e5f66ff, 0x676a77ff, 0x85858aff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0xfbfbfbff, 
-    0xecececff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xf0f0f0ff, 
-    0xd7d7d7ff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 0xffffffff, 0xffffffff, 
-    0xfefefeff, 0xdbdbdbff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcbcbcbff, 0xbbbbbbff, 0xb7b7b7ff, 0xb5b5b5ff, 0xb5b5b5ff, 0xb7b7b7ff, 
-    0xb2b2b2ff, 0xaeaeaeff, 0xaaaaaaff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x878787ff, 0x989898ff, 0x979797ff, 0x959595ff, 
-    0x6f6f6fff, 0x5b5b5bff, 0x575758ff, 0x616269ff, 0x848588ff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 
-    0xfbfbfbff, 0xedededff, 0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 
-    0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xefefefff, 0xd6d6d6ff, 0xd4d4d4ff, 0xecececff, 
-    0xffffffff, 0xfefefeff, 0xddddddff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 
-    0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 
-    0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc7c7c7ff, 0xb9b9b9ff, 0xb5b5b5ff, 
-    0xb5b5b5ff, 0xb7b7b7ff, 0xb2b2b2ff, 0xaeaeaeff, 0xadadadff, 0xacacacff, 
-    0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 
-    0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 0x727272ff, 0x848484ff, 
-    0x979797ff, 0x959595ff, 0x6f6f6fff, 0x5b5b5bff, 0x5b5b5bff, 0x858587ff, 
-    0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xffffffff, 0xfcfcfcff, 0xefefefff, 0xecececff, 0xebebebff, 0xe9e9e9ff, 
-    0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xefefefff, 
-    0xd4d4d4ff, 0xecececff, 0xfefefeff, 0xddddddff, 0xcececeff, 0xccccccff, 
-    0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 0xc4c4c4ff, 0xe0e0e0ff, 
-    0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 0xcececeff, 0xc9c9c9ff, 
-    0xc3c3c3ff, 0xb6b6b6ff, 0xb5b5b5ff, 0xb7b7b7ff, 0xb1b1b1ff, 0xafafafff, 
-    0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 0xa7a7a7ff, 0xa5a5a5ff, 
-    0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 0x7b7b7bff, 0x777777ff, 
-    0x727272ff, 0x6e6e6eff, 0x818181ff, 0x959595ff, 0x6f6f6fff, 0x5e5e5eff, 
-    0x858585ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 0x8a8a8aff, 0x888888ff, 
-    0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcfcfcff, 0xf1f1f1ff, 0xeeeeeeff, 0xecececff, 
-    0xebebebff, 0xe9e9e9ff, 0xe7e7e7ff, 0xe6e6e6ff, 0xe4e4e4ff, 0xebebebff, 
-    0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 
-    0xffffffff, 0xffffffff, 0xeeeeeeff, 0xebebebff, 0xdfdfdfff, 0xcfcfcfff, 
-    0xcececeff, 0xccccccff, 0xcacacaff, 0xc9c9c9ff, 0xc7c7c7ff, 0xc6c6c6ff, 
-    0xc4c4c4ff, 0xe0e0e0ff, 0xe0e0e0ff, 0xdcdcdcff, 0xd7d7d7ff, 0xd2d2d2ff, 
-    0xcececeff, 0xc9c9c9ff, 0xc5c5c5ff, 0xbfbfbfff, 0xb6b6b6ff, 0xb5b5b5ff, 
-    0xb0b0b0ff, 0xafafafff, 0xadadadff, 0xacacacff, 0xaaaaaaff, 0xa8a8a8ff, 
-    0xa7a7a7ff, 0xa5a5a5ff, 0x9a9a9aff, 0x898989ff, 0x858585ff, 0x808080ff, 
-    0x7b7b7bff, 0x777777ff, 0x727272ff, 0x6e6e6eff, 0x696969ff, 0x7e7e7eff, 
-    0x717171ff, 0x878787ff, 0x909090ff, 0x8f8f8fff, 0x8d8d8dff, 0x8b8b8bff, 
-    0x8a8a8aff, 0x888888ff, 0x868686ff, 0x858585ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfaf2b8ff, 0xfaf3bcff, 
-    0xf9f2baff, 0xf9f2baff, 0xf8f0b7ff, 0xf8efb7ff, 0xf7eeb5ff, 0xf7edb4ff, 
-    0xf6ecb3ff, 0xf8ecaaff, 0xffee97ff, 0xffee96ff, 0xffed95ff, 0xffec94ff, 
-    0xffec93ff, 0xffeb92ff, 0xffea90ff, 0xffe98fff, 0xffe88eff, 0xf7e49aff, 
-    0xf0e0a3ff, 0xefdea1ff, 0xefdea1ff, 0xeedd9fff, 0xecda9cff, 0xebd89aff, 
-    0xe9d698ff, 0xe8d596ff, 0xe6d293ff, 0xf3d67cff, 0xf5d676ff, 0xf3d373ff, 
-    0xf2d171ff, 0xf0cf6eff, 0xefcc6cff, 0xedca68ff, 0xecc867ff, 0xeac563ff, 
-    0xe5c367ff, 0xd7bd79ff, 0xd4ba78ff, 0xd2b876ff, 0xd1b674ff, 0xcfb472ff, 
-    0xceb271ff, 0xccb16fff, 0xcbaf6eff, 0xc9ad6cff, 0xcfac5eff, 0xd8ad4cff, 
-    0xd6aa4aff, 0xd5a848ff, 0xd3a646ff, 0xd2a545ff, 0xd0a243ff, 0xcfa042ff, 
-    0xcd9e40ff, 0xcc9d3eff, 0xbd9851ff, 0xb69658ff, 0xb59455ff, 0xb69659ff, 
-    0xb6965bff, 0xb7965dff, 0xb99761ff, 0xb99863ff, 0xba9966ff, 0xb99967ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcec71ff, 0xffef71ff, 0xffee70ff, 0xffed6eff, 0xffec6cff, 0xffeb6aff, 
-    0xffe969ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 
-    0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 
-    0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
-    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
-    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
-    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
-    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
-    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
-    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
-    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
-    0xffb027ff, 0xfcae26ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfceb6fff, 0xffee70ff, 0xffed6eff, 0xffec6cff, 
-    0xffeb6aff, 0xffe969ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 
-    0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 
-    0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
-    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
-    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
-    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
-    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
-    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
-    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
-    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xfcad25ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcea6eff, 0xffed6eff, 
-    0xffec6cff, 0xffeb6aff, 0xffe969ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 
-    0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 
-    0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 
-    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
-    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
-    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
-    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
-    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
-    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
-    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xfcac25ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfce96cff, 0xffec6cff, 0xffeb6aff, 0xffe969ff, 0xffe867ff, 0xffe765ff, 
-    0xffe663ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 
-    0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 
-    0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
-    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
-    0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 
-    0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
-    0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
-    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
-    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
-    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
-    0xffae26ff, 0xfcab25ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfce86aff, 0xffeb6aff, 0xffe969ff, 0xffe867ff, 
-    0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 
-    0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 
-    0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
-    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
-    0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
-    0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
-    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
-    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
-    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
-    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xfcab24ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfce768ff, 0xffe969ff, 
-    0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 
-    0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 
-    0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 
-    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
-    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 
-    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 
-    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 
-    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
-    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
-    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
-    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xfcaa24ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfce567ff, 0xffe867ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 0xffe460ff, 
-    0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 
-    0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
-    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
-    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
-    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
-    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
-    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
-    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
-    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
-    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
-    0xffac25ff, 0xfca924ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfce465ff, 0xffe765ff, 0xffe663ff, 0xffe562ff, 
-    0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 
-    0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
-    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
-    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
-    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
-    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
-    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
-    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
-    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
-    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xfca823ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfce363ff, 0xffe663ff, 
-    0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 
-    0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 
-    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
-    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
-    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
-    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
-    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
-    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
-    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
-    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xfca823ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfce261ff, 0xffe562ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 0xffe15bff, 
-    0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 
-    0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
-    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
-    0xffcb3aff, 0xffca38ff, 0xe8bf48ff, 0xbfac62ff, 0x9f9c74ff, 0x90937aff, 
-    0x828a7fff, 0x7f877dff, 0x7e847aff, 0x7c8277ff, 0x7b7f74ff, 0x7a7d70ff, 
-    0x797a6dff, 0x77776aff, 0x767567ff, 0x757264ff, 0x737060ff, 0x726d5eff, 
-    0x706a5aff, 0x6f6757ff, 0x6d6454ff, 0x6c6250ff, 0x6c5f4eff, 0x796647ff, 
-    0xaf8539ff, 0xfcb42aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
-    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
-    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
-    0xffaa24ff, 0xfca723ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfce260ff, 0xffe460ff, 0xffe35eff, 0xffe25dff, 
-    0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 
-    0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
-    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
-    0xffcd3cff, 0xffcb3aff, 0xdbbb52ff, 0x959c82ff, 0x7c8e91ff, 0x7a8b8dff, 
-    0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 
-    0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 
-    0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 
-    0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x987336ff, 0xfeb429ff, 0xffb429ff, 
-    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xfca622ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfce15eff, 0xffe35eff, 
-    0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 
-    0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 
-    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
-    0xffce3dff, 0xffcd3cff, 0xf7c740ff, 0xa6a47aff, 0x7d9194ff, 0x7c8e91ff, 
-    0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 
-    0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 
-    0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 
-    0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x5b4c3eff, 
-    0xe6a027ff, 0xfeb228ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
-    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
-    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xfca522ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfce05cff, 0xffe25dff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 0xffdd56ff, 
-    0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
-    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
-    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xedc348ff, 0x939c88ff, 0x7d9194ff, 
-    0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 
-    0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 
-    0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 
-    0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 
-    0x594b3fff, 0x58483bff, 0xca8c27ff, 0xeda425ff, 0xfeb128ff, 0xffb127ff, 
-    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
-    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
-    0xffa723ff, 0xfca522ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcdf5bff, 0xffe15bff, 0xffdf59ff, 0xffde57ff, 
-    0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
-    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
-    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xf6c742ff, 0x919b8aff, 
-    0x7d9194ff, 0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 
-    0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 
-    0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 
-    0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 
-    0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0xc88b27ff, 0xe49b24ff, 
-    0xeca124ff, 0xfeaf27ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
-    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
-    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xfca421ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcde59ff, 0xffdf59ff, 
-    0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 
-    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
-    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xfecb3bff, 
-    0x9fa180ff, 0x7d9194ff, 0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 
-    0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 
-    0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 
-    0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 
-    0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 
-    0xc88926ff, 0xe49b23ff, 0xe49a23ff, 0xeca024ff, 0xfeae26ff, 0xffae26ff, 
-    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
-    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xfca321ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcdc57ff, 0xffde57ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 0xffda50ff, 
-    0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
-    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
-    0xffcb3aff, 0xcdb55dff, 0x7d9194ff, 0x7c8e91ff, 0x7a8b8dff, 0x79888aff, 
-    0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 
-    0x6f7572ff, 0x6d726eff, 0x797563ff, 0x9c834eff, 0xa28648ff, 0xa18446ff, 
-    0xa08244ff, 0x746954ff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 
-    0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 
-    0x554335ff, 0x544031ff, 0xca8b25ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 
-    0xed9f23ff, 0xfeac26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
-    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
-    0xffa522ff, 0xfca221ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcdb55ff, 0xffdd56ff, 0xffdc54ff, 0xffdb52ff, 
-    0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
-    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
-    0xffcd3cff, 0xffcb3aff, 0xfac83bff, 0x8b978aff, 0x7c8e91ff, 0x7a8b8dff, 
-    0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 
-    0x707875ff, 0x6f7572ff, 0x6d726eff, 0x998452ff, 0xe2a529ff, 0xe4a528ff, 
-    0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 0x826e4bff, 0x625c53ff, 0x615950ff, 
-    0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 
-    0x574538ff, 0x554335ff, 0x544031ff, 0x58412eff, 0xdd9623ff, 0xe49a23ff, 
-    0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xed9f22ff, 0xfeab25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
-    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xfca120ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcda54ff, 0xffdc54ff, 
-    0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 
-    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
-    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xd2b657ff, 0x7c8e91ff, 
-    0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 
-    0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x727268ff, 0xdda42bff, 
-    0xe4a528ff, 0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 0xe4a227ff, 0x816d48ff, 
-    0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 
-    0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x9f6e26ff, 
-    0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 
-    0xee9e23ff, 0xfea924ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
-    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xfca120ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcd952ff, 0xffdb52ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 0xffd74bff, 
-    0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
-    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
-    0xa9a271ff, 0x7a8b8dff, 0x79888aff, 0x778586ff, 0x768383ff, 0x75807fff, 
-    0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 
-    0x83785cff, 0xe4a528ff, 0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 0xe4a227ff, 
-    0xe4a127ff, 0x806a46ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 
-    0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x674a2cff, 
-    0xb27a25ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xe79922ff, 
-    0xe69822ff, 0xe79822ff, 0xe79721ff, 0xef9e22ff, 0xfea824ff, 0xffa823ff, 
-    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
-    0xffa321ff, 0xfca020ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcd850ff, 0xffda50ff, 0xffd94fff, 0xffd84dff, 
-    0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
-    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
-    0xffc937ff, 0xffc835ff, 0x849086ff, 0x79888aff, 0x778586ff, 0x768383ff, 
-    0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 
-    0x6c6f6bff, 0x6b6c68ff, 0x736f5fff, 0xe4a427ff, 0xe4a427ff, 0xe4a327ff, 
-    0xe4a227ff, 0xe4a127ff, 0xe4a127ff, 0x92733eff, 0x5e5349ff, 0x5c5146ff, 
-    0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x694d2fff, 
-    0xae7827ff, 0xe19923ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 
-    0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 
-    0xf09d21ff, 0xfea623ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
-    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xfc9f1fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcd74eff, 0xffd94fff, 
-    0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 
-    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
-    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xf9c437ff, 0x79888aff, 0x778586ff, 
-    0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 
-    0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0xbc8f38ff, 
-    0xe4a327ff, 0xe4a227ff, 0xe4a127ff, 0xe4a127ff, 0xe4a126ff, 0xca912dff, 
-    0x5e5246ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x674f33ff, 
-    0xab772aff, 0xe19a23ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe69923ff, 
-    0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 
-    0xe99820ff, 0xe89720ff, 0xe99720ff, 0xef9c21ff, 0xfea522ff, 0xffa522ff, 
-    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xfc9e1fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcd64dff, 0xffd84dff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 0xffd346ff, 
-    0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
-    0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xecbd3dff, 
-    0x778586ff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 0x707875ff, 
-    0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 
-    0x66645dff, 0x716755ff, 0xd3992eff, 0xe4a127ff, 0xe4a127ff, 0xe4a126ff, 
-    0xe4a026ff, 0xe49f26ff, 0xbf8a2dff, 0x765c3aff, 0x5e4b3aff, 0x735634ff, 
-    0xaf7b2bff, 0xe19a24ff, 0xe49b23ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 
-    0xe69923ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 
-    0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 
-    0xf09920ff, 0xfea322ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
-    0xffa020ff, 0xfc9e1fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcd54bff, 0xffd74bff, 0xffd54aff, 0xffd448ff, 
-    0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
-    0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
-    0xffc631ff, 0xebbc3dff, 0x768383ff, 0x75807fff, 0x737d7cff, 0x727a79ff, 
-    0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 
-    0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x73644eff, 0xce942eff, 
-    0xe4a126ff, 0xe4a026ff, 0xe49f26ff, 0xe49f25ff, 0xe49e25ff, 0xe49d25ff, 
-    0xe49c24ff, 0xe49c24ff, 0xe49b24ff, 0xe49b23ff, 0xe49a23ff, 0xe49a23ff, 
-    0xe59a22ff, 0xe69923ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 
-    0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 
-    0xea961fff, 0xeb951fff, 0xeb941fff, 0xf1981fff, 0xfea221ff, 0xffa221ff, 
-    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xfc9d1eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcd44aff, 0xffd54aff, 
-    0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 
-    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 
-    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xf6c035ff, 0x75807fff, 0x737d7cff, 
-    0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 
-    0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 
-    0x615950ff, 0x675a4aff, 0xb38433ff, 0xe49f26ff, 0xe49f25ff, 0xe49e25ff, 
-    0xe49d25ff, 0xe49c24ff, 0xe49c24ff, 0xe49b24ff, 0xe49b23ff, 0xe49a23ff, 
-    0xe49a23ff, 0xe59a22ff, 0xe69923ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 
-    0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 
-    0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 
-    0xf29820ff, 0xfea020ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xfc9c1eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcd249ff, 0xffd448ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 0xffd041ff, 
-    0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
-    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xfec32fff, 
-    0x798079ff, 0x727a79ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 0x6c6f6bff, 
-    0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 
-    0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x876839ff, 
-    0xd89727ff, 0xe49d25ff, 0xe49c24ff, 0xe49c24ff, 0xe49b24ff, 0xe49b23ff, 
-    0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 0xe79922ff, 
-    0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 
-    0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 
-    0xeb941eff, 0xec941fff, 0xec931eff, 0xf3971fff, 0xfe9f20ff, 0xff9f1fff, 
-    0xff9e1fff, 0xfc9b1eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcd147ff, 0xffd346ff, 0xffd244ff, 0xffd143ff, 
-    0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
-    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
-    0xffc32fff, 0xffc32fff, 0x9b8f64ff, 0x707875ff, 0x6f7572ff, 0x6d726eff, 
-    0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 0x65615aff, 
-    0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 
-    0x5b4e42ff, 0x594b3fff, 0x655039ff, 0xb8812aff, 0xe49c24ff, 0xe49b24ff, 
-    0xe49b23ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 0xe69923ff, 
-    0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 
-    0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 
-    0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 
-    0xf3961eff, 0xfe9d1fff, 0xff9d1fff, 0xfc9b1dff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcd045ff, 0xffd244ff, 
-    0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 
-    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
-    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xc2a24dff, 0x6f7572ff, 
-    0x6d726eff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 0x66645dff, 
-    0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 
-    0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 
-    0x88622cff, 0xdb9524ff, 0xe49a23ff, 0xe49a23ff, 0xe59a22ff, 0xe59922ff, 
-    0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 0xe89820ff, 
-    0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 
-    0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 
-    0xee931eff, 0xed921dff, 0xee921dff, 0xf3951eff, 0xfe9c1eff, 0xfc9a1dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfccf43ff, 0xffd143ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 0xffcd3cff, 
-    0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 
-    0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
-    0xf7bb31ff, 0x777869ff, 0x6c6f6bff, 0x6b6c68ff, 0x696a64ff, 0x686761ff, 
-    0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 0x5f564cff, 
-    0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 
-    0x554335ff, 0x544031ff, 0x523d2eff, 0x60442aff, 0xba7e24ff, 0xe59a22ff, 
-    0xe59922ff, 0xe69923ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 0xe79721ff, 
-    0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 
-    0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 
-    0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 
-    0xf4941dff, 0xfb981dff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcce42ff, 0xffd041ff, 0xffcf3fff, 0xffce3dff, 
-    0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
-    0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
-    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xba9a4aff, 0x6b6c68ff, 0x696a64ff, 
-    0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 0x615950ff, 
-    0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 
-    0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 
-    0x4f3624ff, 0x926120ff, 0xe39822ff, 0xe79922ff, 0xe69822ff, 0xe79822ff, 
-    0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 0xe99720ff, 
-    0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 
-    0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 
-    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf2921bff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfccd40ff, 0xffcf3fff, 
-    0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 
-    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 
-    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xfdbd2dff, 
-    0x8f7e56ff, 0x686761ff, 0x66645dff, 0x65615aff, 0x635e57ff, 0x625c53ff, 
-    0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 
-    0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 
-    0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x71481cff, 0xdb9022ff, 
-    0xe79822ff, 0xe79721ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 0xe99720ff, 
-    0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 
-    0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 
-    0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xee8e1bff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfccc3eff, 0xffce3dff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 0xffc937ff, 
-    0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
-    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
-    0xffbe2dff, 0xffbd2dff, 0xf1b431ff, 0x7f7255ff, 0x65615aff, 0x635e57ff, 
-    0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 0x5b4e42ff, 
-    0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 
-    0x513a2aff, 0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 
-    0x492c1aff, 0x603d1bff, 0xd48a20ff, 0xe89820ff, 0xe99820ff, 0xe89720ff, 
-    0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 
-    0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 
-    0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
-    0xf08f1cff, 0xef8e1bff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfccb3cff, 0xffcd3cff, 0xffcb3aff, 0xffca38ff, 
-    0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
-    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
-    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xf2b330ff, 
-    0x82704fff, 0x625c53ff, 0x615950ff, 0x5f564cff, 0x5e5349ff, 0x5c5146ff, 
-    0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 0x544031ff, 
-    0x523d2eff, 0x513a2aff, 0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 
-    0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x5b391bff, 0xd78d20ff, 
-    0xe89720ff, 0xe99720ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 0xeb941fff, 
-    0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 
-    0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 
-    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xef8d1aff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcca3bff, 0xffcb3aff, 
-    0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 
-    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
-    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
-    0xffbb2cff, 0xffba2bff, 0xfab62dff, 0xa38141ff, 0x60574cff, 0x5e5349ff, 
-    0x5c5146ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 0x554335ff, 
-    0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 
-    0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 
-    0x442b1aff, 0x5d3b1bff, 0xdf9020ff, 0xe99720ff, 0xea961fff, 0xeb951fff, 
-    0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 0xed931eff, 
-    0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 
-    0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf08c1aff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcc839ff, 0xffca38ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 0xffc631ff, 
-    0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
-    0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
-    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
-    0xdda230ff, 0x816840ff, 0x5b4e42ff, 0x594b3fff, 0x58483bff, 0x574538ff, 
-    0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 0x4e3524ff, 
-    0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 
-    0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x734a1cff, 0xe9951fff, 
-    0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 0xec931eff, 
-    0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 
-    0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
-    0xf28e1bff, 0xf08d1aff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcc737ff, 0xffc937ff, 0xffc835ff, 0xffc733ff, 
-    0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
-    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
-    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
-    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xfeb529ff, 0xc28e31ff, 0x6a543aff, 
-    0x574538ff, 0x554335ff, 0x544031ff, 0x523d2eff, 0x513a2aff, 0x4f3827ff, 
-    0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 
-    0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 
-    0x3f291aff, 0xa6691dff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 
-    0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 
-    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
-    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf08c19ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcc636ff, 0xffc835ff, 
-    0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 
-    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 
-    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
-    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
-    0xffb429ff, 0xfbb128ff, 0xc08a2dff, 0x6d5130ff, 0x523d2eff, 0x513a2aff, 
-    0x4f3827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 
-    0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 
-    0x40291aff, 0x3f291aff, 0x3e281aff, 0x4b311bff, 0xe08d1eff, 0xeb941eff, 
-    0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 
-    0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 
-    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf18c19ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcc534ff, 0xffc733ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 0xffc32fff, 
-    0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
-    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
-    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
-    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xfcaf27ff, 
-    0xbd8428ff, 0x674827ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 
-    0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 
-    0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 
-    0x8f5b1bff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 
-    0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
-    0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
-    0xf38d1aff, 0xf18b19ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcc432ff, 0xffc631ff, 0xffc530ff, 0xffc430ff, 
-    0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
-    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
-    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
-    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xfcad26ff, 0xb87c24ff, 0x5a391eff, 
-    0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 
-    0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 
-    0x3b271aff, 0x3a271aff, 0x49301bff, 0xe8911eff, 0xed931eff, 0xee931eff, 
-    0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 
-    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 
-    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf28b19ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcc330ff, 0xffc530ff, 
-    0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 
-    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
-    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
-    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
-    0xffad26ff, 0xf3a425ff, 0x8e5c1eff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 
-    0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 
-    0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0xb6721dff, 
-    0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 
-    0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 
-    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf18a19ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcc22fff, 0xffc430ff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 0xffc12eff, 
-    0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
-    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
-    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
-    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
-    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xae731fff, 
-    0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 
-    0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 
-    0x37261aff, 0x81531bff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 
-    0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
-    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
-    0xf58c19ff, 0xf28a19ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcc12fff, 0xffc32fff, 0xffc32fff, 0xffc22fff, 
-    0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
-    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
-    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
-    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0x925f1eff, 0x432a1aff, 0x412a1aff, 0x40291aff, 
-    0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 
-    0x38261aff, 0x37261aff, 0x35251aff, 0x593b1bff, 0xee921dff, 0xee911dff, 
-    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
-    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
-    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf28919ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcc02eff, 0xffc32fff, 
-    0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 
-    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
-    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
-    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
-    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
-    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xef9e22ff, 0x452c1aff, 
-    0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 
-    0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x38261aff, 
-    0xea8f1dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 
-    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
-    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf38a19ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcc02eff, 0xffc22fff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 0xffbf2dff, 
-    0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
-    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
-    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
-    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
-    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
-    0xffa723ff, 0x5d3d1bff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 
-    0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 
-    0x33241aff, 0x32241bff, 0xe18a1cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
-    0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
-    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
-    0xf58b19ff, 0xf38819ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcbf2eff, 0xffc12eff, 0xffc02eff, 0xffc02eff, 
-    0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
-    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
-    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
-    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
-    0xffa823ff, 0xffa723ff, 0xffa723ff, 0x68441bff, 0x3e281aff, 0x3d281aff, 
-    0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 
-    0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0xd7841bff, 0xf0911cff, 
-    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 
-    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
-    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf48719ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcbe2dff, 0xffc02eff, 
-    0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 
-    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
-    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
-    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
-    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0x5b3b1bff, 
-    0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 
-    0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 
-    0xcf7e1cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 
-    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
-    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf48718ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcbd2dff, 0xffc02eff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 0xffbc2cff, 
-    0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
-    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
-    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
-    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
-    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
-    0xf8a022ff, 0x412a1aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 
-    0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 
-    0x2f231bff, 0x2e221bff, 0xdd841cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
-    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
-    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
-    0xf78818ff, 0xf48718ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcbd2dff, 0xffbf2dff, 0xffbe2dff, 0xffbd2dff, 
-    0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
-    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
-    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
-    0xffa622ff, 0xffa522ff, 0xcb8320ff, 0x3b271aff, 0x3a271aff, 0x39261aff, 
-    0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 
-    0x31231bff, 0x2f231bff, 0x2e221bff, 0x2f241bff, 0xed8e1cff, 0xf18f1cff, 
-    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
-    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
-    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf58717ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcbc2cff, 0xffbe2dff, 
-    0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 
-    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
-    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
-    0xfcae27ff, 0xf8aa26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
-    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
-    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0x764c1cff, 0x3a271aff, 
-    0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 
-    0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 0x4a321bff, 
-    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
-    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
-    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf58616ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcbb2cff, 0xffbd2dff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 0xffba2bff, 
-    0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
-    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
-    0xf4a928ff, 0x8e6327ff, 0x543824ff, 0x4e3320ff, 0x7b501fff, 0xd28d23ff, 
-    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
-    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xb8761eff, 
-    0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 
-    0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 
-    0x2c211bff, 0x85531cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
-    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
-    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
-    0xf88816ff, 0xf68516ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcba2cff, 0xffbc2cff, 0xffbc2cff, 0xffbb2cff, 
-    0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
-    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0x875e27ff, 0x4e3524ff, 0x4d3220ff, 0x4b2f1dff, 
-    0x4a2d1aff, 0x492c1aff, 0x744b1dff, 0xd18a22ff, 0xffaa24ff, 0xffa924ff, 
-    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xfda322ff, 
-    0xa96c1eff, 0x3e291aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 
-    0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 
-    0x2d221bff, 0x2c211bff, 0x2b211bff, 0xc5761bff, 0xf28e1bff, 0xf28e1bff, 
-    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
-    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
-    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf78516ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb92bff, 0xffbc2cff, 
-    0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 
-    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xf3a827ff, 0x4f3624ff, 0x4d3220ff, 
-    0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 0x452b1aff, 
-    0x724a1dff, 0xd08921ff, 0xffa723ff, 0xffa723ff, 0xfba422ff, 0xd88b20ff, 
-    0xa86d1fff, 0x56381bff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 
-    0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 
-    0x2e221bff, 0x2d221bff, 0x2c211bff, 0x2b211bff, 0x5e3e1bff, 0xf28e1bff, 
-    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
-    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
-    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xf68515ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcb92bff, 0xffbb2cff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 0xffb82aff, 
-    0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
-    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xe59d25ff, 
-    0x4d3220ff, 0x4b2f1dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 0x462c1aff, 
-    0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x55361bff, 0x4b301aff, 
-    0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 
-    0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 
-    0x2f231bff, 0x2e221bff, 0x2d221bff, 0x2c211bff, 0x2b211bff, 0x2b221bff, 
-    0xcb781bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
-    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
-    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
-    0xfa8715ff, 0xf78415ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcb82bff, 0xffba2bff, 0xffb92bff, 0xffb92bff, 
-    0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
-    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xf8a926ff, 0x4f321dff, 0x4a2d1aff, 0x492c1aff, 0x472c1aff, 
-    0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 0x40291aff, 
-    0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 
-    0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 
-    0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 0x2c211bff, 0x2b211bff, 
-    0x29211bff, 0x90591bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
-    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
-    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
-    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xf78315ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb72aff, 0xffb92bff, 
-    0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 
-    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
-    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0x7e521eff, 0x492c1aff, 
-    0x472c1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 0x412a1aff, 
-    0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 0x3a271aff, 
-    0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 0x33241aff, 
-    0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 0x2c211bff, 
-    0x2b211bff, 0x29211bff, 0x6e471bff, 0xf18d1bff, 0xf28d1aff, 0xf38d1aff, 
-    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
-    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
-    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xf88315ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcb62aff, 0xffb92bff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 0xffb629ff, 
-    0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
-    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
-    0xd69023ff, 0x482d1aff, 0x462c1aff, 0x452b1aff, 0x442b1aff, 0x432a1aff, 
-    0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 0x3b271aff, 
-    0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 0x34251aff, 
-    0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 0x2d221bff, 
-    0x2c211bff, 0x2b211bff, 0x29211bff, 0x81511bff, 0xef8c1bff, 0xf28d1aff, 
-    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
-    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
-    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
-    0xfa8414ff, 0xf88315ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcb62aff, 0xffb82aff, 0xffb72aff, 0xffb62aff, 
-    0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
-    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xa96f1fff, 0x452b1aff, 0x442b1aff, 
-    0x432a1aff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 0x3d281aff, 
-    0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 0x35251aff, 
-    0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 0x2e221bff, 
-    0x2d221bff, 0x2c211bff, 0x2b211bff, 0x3f2d1bff, 0xac671bff, 0xf28e1bff, 
-    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
-    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
-    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
-    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xf98215ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb529ff, 0xffb72aff, 
-    0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
-    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
-    0xb47620ff, 0x52341bff, 0x412a1aff, 0x40291aff, 0x3f291aff, 0x3e281aff, 
-    0x3d281aff, 0x3b271aff, 0x3a271aff, 0x39261aff, 0x38261aff, 0x37261aff, 
-    0x35251aff, 0x34251aff, 0x33241aff, 0x32241bff, 0x31231bff, 0x2f231bff, 
-    0x2e221bff, 0x2d221bff, 0x2c211bff, 0x4a321bff, 0x935c1bff, 0xeb891bff, 
-    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
-    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
-    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
-    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xf88114ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcb429ff, 0xffb62aff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 0xffb328ff, 
-    0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
-    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
-    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xec9a22ff, 0xb1731eff, 0x8e5b1cff, 
-    0x83541cff, 0x83531cff, 0x81521cff, 0x81521cff, 0x80521cff, 0x80521cff, 
-    0x80521cff, 0x7f511cff, 0x7e501cff, 0x7e501cff, 0x7d501cff, 0x7d4f1bff, 
-    0x7c4f1bff, 0x7f501cff, 0x8f5a1bff, 0xa4641bff, 0xd37e1cff, 0xf28f1bff, 
-    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
-    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
-    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
-    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
-    0xfb8314ff, 0xf98014ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcb329ff, 0xffb629ff, 0xffb529ff, 0xffb429ff, 
-    0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
-    0xf49e21ff, 0xeb951fff, 0xeb941fff, 0xeb941eff, 0xeb941eff, 0xec941fff, 
-    0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 0xee911dff, 
-    0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
-    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
-    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
-    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
-    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
-    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfa8014ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb328ff, 0xffb529ff, 
-    0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 
-    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
-    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
-    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xf49c21ff, 0xeb941eff, 0xeb941eff, 
-    0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 0xee921dff, 
-    0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 
-    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
-    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
-    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
-    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 
-    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfa7f13ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcb228ff, 0xffb429ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 0xffb127ff, 
-    0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
-    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
-    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
-    0xf59c20ff, 0xec941fff, 0xec931eff, 0xed931eff, 0xee931eff, 0xed921dff, 
-    0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 
-    0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
-    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
-    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
-    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
-    0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
-    0xfd8113ff, 0xfb7f13ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcb128ff, 0xffb328ff, 0xffb328ff, 0xffb228ff, 
-    0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
-    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
-    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
-    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xf59a1fff, 0xed931eff, 0xee931eff, 
-    0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 0xf0911cff, 
-    0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 
-    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
-    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
-    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
-    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 
-    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfb7e13ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcb027ff, 0xffb328ff, 
-    0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 
-    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
-    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 
-    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 
-    0xf69a1fff, 0xed921dff, 0xee921dff, 0xee911dff, 0xef921cff, 0xf0921cff, 
-    0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 
-    0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
-    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
-    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
-    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 
-    0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfb7f12ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcb027ff, 0xffb228ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 0xffaf26ff, 
-    0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
-    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
-    0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
-    0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xf6971eff, 0xee911dff, 0xef921cff, 
-    0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 0xf28f1bff, 
-    0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 
-    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
-    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
-    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
-    0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 
-    0xfe8012ff, 0xfb7e12ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcb027ff, 0xffb127ff, 0xffb027ff, 0xffb027ff, 
-    0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
-    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 
-    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 
-    0xf7971eff, 0xf0921cff, 0xf0911cff, 0xf0901cff, 0xf08f1cff, 0xf18f1cff, 
-    0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 
-    0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
-    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
-    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
-    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 
-    0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xfc7e12ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcaf26ff, 0xffb027ff, 
-    0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 
-    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
-    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 
-    0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 
-    0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xf7951eff, 0xf0901cff, 0xf08f1cff, 
-    0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 0xf38d1aff, 
-    0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 
-    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
-    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 
-    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 
-    0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xfc7d11ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcae26ff, 0xffb027ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 0xffad25ff, 
-    0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
-    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
-    0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 
-    0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 
-    0xf7941dff, 0xf18f1cff, 0xf28f1bff, 0xf28e1bff, 0xf28e1bff, 0xf28d1aff, 
-    0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 
-    0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
-    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
-    0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
-    0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 
-    0xff7e11ff, 0xfc7d11ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcae26ff, 0xffaf26ff, 0xffae26ff, 0xffad26ff, 
-    0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
-    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
-    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 
-    0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 
-    0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xf8931bff, 0xf28e1bff, 0xf28e1bff, 
-    0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 0xf48b19ff, 
-    0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 
-    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
-    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 
-    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 
-    0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xfc7c11ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcad25ff, 0xffae26ff, 
-    0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 
-    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 
-    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 
-    0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 
-    0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 
-    0xf8921bff, 0xf28d1aff, 0xf38d1aff, 0xf38c1aff, 0xf48d1aff, 0xf58c19ff, 
-    0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 
-    0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
-    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 
-    0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 
-    0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xfc7b10ff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcac25ff, 0xffad26ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 0xffaa24ff, 
-    0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
-    0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
-    0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 
-    0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 
-    0xff971cff, 0xff971cff, 0xff961bff, 0xf9911aff, 0xf38c1aff, 0xf48d1aff, 
-    0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 0xf78919ff, 
-    0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 
-    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
-    0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 
-    0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 
-    0xff7c10ff, 0xfc7a10ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfcab25ff, 0xffad25ff, 0xffac25ff, 0xffab25ff, 
-    0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
-    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 
-    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 
-    0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 
-    0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 
-    0xfa901aff, 0xf58c19ff, 0xf48b19ff, 0xf58b1aff, 0xf58b19ff, 0xf68a19ff, 
-    0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 
-    0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
-    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 
-    0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 
-    0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xfc7a10ff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfcab24ff, 0xffac25ff, 
-    0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 
-    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 
-    0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 
-    0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 
-    0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 
-    0xff941bff, 0xff941bff, 0xff931aff, 0xf98e19ff, 0xf58b1aff, 0xf58b19ff, 
-    0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 0xf88816ff, 
-    0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 
-    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 
-    0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 
-    0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xfc790fff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfcaa24ff, 0xffab25ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 0xffa823ff, 
-    0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
-    0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 
-    0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 
-    0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 
-    0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 
-    0xfa8e18ff, 0xf68a19ff, 0xf78919ff, 0xf78818ff, 0xf78918ff, 0xf78817ff, 
-    0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 
-    0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
-    0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 
-    0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 
-    0xff7a0fff, 0xfc780fff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfca924ff, 0xffaa24ff, 0xffaa24ff, 0xffa924ff, 
-    0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 
-    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 
-    0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 
-    0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 
-    0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 
-    0xff911aff, 0xff9119ff, 0xff9019ff, 0xfa8c18ff, 0xf78818ff, 0xf78918ff, 
-    0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 0xf98615ff, 
-    0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 
-    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 
-    0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 
-    0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xfc770fff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfca823ff, 0xffaa24ff, 
-    0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 0xffa522ff, 
-    0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 
-    0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 
-    0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 
-    0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 
-    0xff921aff, 0xff911aff, 0xff9119ff, 0xff9019ff, 0xff8f19ff, 0xff8e18ff, 
-    0xfb8c17ff, 0xf78817ff, 0xf88816ff, 0xf98716ff, 0xf98616ff, 0xfa8715ff, 
-    0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 
-    0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 
-    0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 
-    0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xff780fff, 0xfc770eff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xfca823ff, 0xffa924ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 0xffa622ff, 
-    0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 
-    0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 
-    0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 
-    0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 
-    0xff931aff, 0xff921aff, 0xff911aff, 0xff9119ff, 0xff9019ff, 0xff8f19ff, 
-    0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 0xfc8a17ff, 0xf98716ff, 0xf98616ff, 
-    0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 0xfc8415ff, 
-    0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 
-    0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 
-    0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xff780fff, 
-    0xff780eff, 0xfc760eff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xfca723ff, 0xffa823ff, 0xffa723ff, 0xffa723ff, 
-    0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 0xffa221ff, 
-    0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 
-    0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 0xff991dff, 
-    0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 0xff941bff, 
-    0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 0xff9119ff, 0xff9019ff, 
-    0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 0xff8c17ff, 0xff8b17ff, 
-    0xfb8817ff, 0xfa8715ff, 0xf98615ff, 0xfa8515ff, 0xfa8414ff, 0xfb8515ff, 
-    0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 
-    0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 
-    0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 0xff790fff, 
-    0xff780fff, 0xff780eff, 0xff770eff, 0xfc750eff, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xec9921ff, 0xffa723ff, 
-    0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 0xffa321ff, 
-    0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 0xff9e1fff, 
-    0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 0xff9a1dff, 
-    0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 0xff951bff, 
-    0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 0xff9119ff, 
-    0xff9019ff, 0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 0xff8c17ff, 
-    0xff8b17ff, 0xff8a17ff, 0xff8a16ff, 0xfc8716ff, 0xfa8515ff, 0xfa8414ff, 
-    0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 0xfd8113ff, 
-    0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 0xff7e11ff, 
-    0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 0xff7a0fff, 
-    0xff790fff, 0xff780fff, 0xff780eff, 0xff770eff, 0xff760eff, 0xeb6b0dff, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xc9791dea, 0xffa723ff, 0xffa622ff, 0xffa522ff, 0xffa422ff, 0xffa321ff, 
-    0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 0xff9f1fff, 
-    0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 0xff9a1dff, 
-    0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 0xff961bff, 
-    0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 0xff911aff, 
-    0xff9119ff, 0xff9019ff, 0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 0xff8d18ff, 
-    0xff8c17ff, 0xff8b17ff, 0xff8a17ff, 0xff8a16ff, 0xff8916ff, 0xff8816ff, 
-    0xfc8515ff, 0xfb8515ff, 0xfc8415ff, 0xfb8314ff, 0xfc8214ff, 0xfc8214ff, 
-    0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 0xff7f12ff, 
-    0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 0xff7b10ff, 
-    0xff7a0fff, 0xff790fff, 0xff780fff, 0xff780eff, 0xff770eff, 0xff760eff, 
-    0xff750dff, 0xc85b10e9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0xb4622622, 0xd3821df7, 0xffa522ff, 0xffa422ff, 
-    0xffa321ff, 0xffa321ff, 0xffa221ff, 0xffa120ff, 0xffa020ff, 0xffa020ff, 
-    0xff9f1fff, 0xff9e1fff, 0xff9d1fff, 0xff9d1eff, 0xff9c1eff, 0xff9b1eff, 
-    0xff9a1dff, 0xff9a1dff, 0xff991dff, 0xff981cff, 0xff971cff, 0xff971cff, 
-    0xff961bff, 0xff951bff, 0xff941bff, 0xff941bff, 0xff931aff, 0xff921aff, 
-    0xff911aff, 0xff9119ff, 0xff9019ff, 0xff8f19ff, 0xff8e18ff, 0xff8e18ff, 
-    0xff8d18ff, 0xff8c17ff, 0xff8b17ff, 0xff8a17ff, 0xff8a16ff, 0xff8916ff, 
-    0xff8816ff, 0xff8715ff, 0xff8715ff, 0xfd8415ff, 0xfb8314ff, 0xfc8214ff, 
-    0xfc8214ff, 0xfd8113ff, 0xfe8113ff, 0xfe8013ff, 0xfe8012ff, 0xfe7f12ff, 
-    0xff7f12ff, 0xff7e11ff, 0xff7e11ff, 0xff7d11ff, 0xff7c10ff, 0xff7b10ff, 
-    0xff7b10ff, 0xff7a0fff, 0xff790fff, 0xff780fff, 0xff780eff, 0xff770eff, 
-    0xff760eff, 0xff750dff, 0xd25f10f6, 0xaf502020, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0xb4631b4b, 0xba671d97, 0xb7661c9b, 0xb7661c9b, 0xb7661c9b, 0xb7661c9b, 
-    0xb7661c9b, 0xb7641a9b, 0xb7641a9b, 0xb7641a9b, 0xb7641a9b, 0xb7641a9b, 
-    0xb7631a9b, 0xb7631a9b, 0xb7631a9b, 0xb7631a9b, 0xb763199b, 0xb761199b, 
-    0xb761199b, 0xb761199b, 0xb761199b, 0xb75f199b, 0xb75f199b, 0xb75f199b, 
-    0xb75f199b, 0xb75f199b, 0xb75f199b, 0xb75e199b, 0xb75e199b, 0xb75e179b, 
-    0xb75e179b, 0xb75e179b, 0xb75c179b, 0xb75c179b, 0xb75c179b, 0xb75c179b, 
-    0xb75c179b, 0xb75a179b, 0xb75a179b, 0xb75a179b, 0xb75a179b, 0xb759159b, 
-    0xb759159b, 0xb759159b, 0xb759159b, 0xb759159b, 0xb757159b, 0xb757159b, 
-    0xb757159b, 0xb757159b, 0xb757159b, 0xb757159b, 0xb756159b, 0xb756149b, 
-    0xb756149b, 0xb756149b, 0xb756149b, 0xb754149b, 0xb754149b, 0xb754149b, 
-    0xb754149b, 0xb752149b, 0xba531397, 0xb452114b, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-};
diff --git a/games/NXDoom/src/strife/wi_stuff.c b/games/NXDoom/src/strife/wi_stuff.c
deleted file mode 100644
index f8193b19b..000000000
--- a/games/NXDoom/src/strife/wi_stuff.c
+++ /dev/null
@@ -1,1836 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Intermission screens.
-//
-
-// haleyjd 08/23/2010: There is no intermission in Strife
-#if 0
-#include <stdio.h>
-
-#include "z_zone.h"
-
-#include "m_random.h"
-
-#include "deh_main.h"
-#include "i_swap.h"
-#include "i_system.h"
-
-#include "w_wad.h"
-
-#include "g_game.h"
-
-#include "r_local.h"
-#include "s_sound.h"
-
-#include "doomstat.h"
-
-// Data.
-#include "sounds.h"
-
-// Needs access to LFB.
-#include "v_video.h"
-
-#include "wi_stuff.h"
-
-//
-// Data needed to add patches to full screen intermission pics.
-// Patches are statistics messages, and animations.
-// Loads of by-pixel layout and placement, offsets etc.
-//
-
-
-//
-// Different vetween registered DOOM (1994) and
-//  Ultimate DOOM - Final edition (retail, 1995?).
-// This is supposedly ignored for commercial
-//  release (aka DOOM II), which had 34 maps
-//  in one episode. So there.
-#define NUMEPISODES	4
-#define NUMMAPS		9
-
-
-// in tics
-//U #define PAUSELEN		(TICRATE*2) 
-//U #define SCORESTEP		100
-//U #define ANIMPERIOD		32
-// pixel distance from "(YOU)" to "PLAYER N"
-//U #define STARDIST		10 
-//U #define WK 1
-
-
-// GLOBAL LOCATIONS
-#define WI_TITLEY		2
-#define WI_SPACINGY    		33
-
-// SINGPLE-PLAYER STUFF
-#define SP_STATSX		50
-#define SP_STATSY		50
-
-#define SP_TIMEX		16
-#define SP_TIMEY		(SCREENHEIGHT-32)
-
-
-// NET GAME STUFF
-#define NG_STATSY		50
-#define NG_STATSX		(32 + SHORT(star->width)/2 + 32*!dofrags)
-
-#define NG_SPACINGX    		64
-
-
-// DEATHMATCH STUFF
-#define DM_MATRIXX		42
-#define DM_MATRIXY		68
-
-#define DM_SPACINGX		40
-
-#define DM_TOTALSX		269
-
-#define DM_KILLERSX		10
-#define DM_KILLERSY		100
-#define DM_VICTIMSX    		5
-#define DM_VICTIMSY		50
-
-
-
-
-typedef enum
-{
-    ANIM_ALWAYS,
-    ANIM_RANDOM,
-    ANIM_LEVEL
-
-} animenum_t;
-
-typedef struct
-{
-    int		x;
-    int		y;
-    
-} point_t;
-
-
-//
-// Animation.
-// There is another anim_t used in p_spec.
-//
-typedef struct
-{
-    animenum_t	type;
-
-    // period in tics between animations
-    int		period;
-
-    // number of animation frames
-    int		nanims;
-
-    // location of animation
-    point_t	loc;
-
-    // ALWAYS: n/a,
-    // RANDOM: period deviation (<256),
-    // LEVEL: level
-    int		data1;
-
-    // ALWAYS: n/a,
-    // RANDOM: random base period,
-    // LEVEL: n/a
-    int		data2; 
-
-    // actual graphics for frames of animations
-    patch_t*	p[3]; 
-
-    // following must be initialized to zero before use!
-
-    // next value of bcnt (used in conjunction with period)
-    int		nexttic;
-
-    // last drawn animation frame
-    int		lastdrawn;
-
-    // next frame number to animate
-    int		ctr;
-    
-    // used by RANDOM and LEVEL when animating
-    int		state;  
-
-} anim_t;
-
-
-static point_t lnodes[NUMEPISODES][NUMMAPS] =
-{
-    // Episode 0 World Map
-    {
-	{ 185, 164 },	// location of level 0 (CJ)
-	{ 148, 143 },	// location of level 1 (CJ)
-	{ 69, 122 },	// location of level 2 (CJ)
-	{ 209, 102 },	// location of level 3 (CJ)
-	{ 116, 89 },	// location of level 4 (CJ)
-	{ 166, 55 },	// location of level 5 (CJ)
-	{ 71, 56 },	// location of level 6 (CJ)
-	{ 135, 29 },	// location of level 7 (CJ)
-	{ 71, 24 }	// location of level 8 (CJ)
-    },
-
-    // Episode 1 World Map should go here
-    {
-	{ 254, 25 },	// location of level 0 (CJ)
-	{ 97, 50 },	// location of level 1 (CJ)
-	{ 188, 64 },	// location of level 2 (CJ)
-	{ 128, 78 },	// location of level 3 (CJ)
-	{ 214, 92 },	// location of level 4 (CJ)
-	{ 133, 130 },	// location of level 5 (CJ)
-	{ 208, 136 },	// location of level 6 (CJ)
-	{ 148, 140 },	// location of level 7 (CJ)
-	{ 235, 158 }	// location of level 8 (CJ)
-    },
-
-    // Episode 2 World Map should go here
-    {
-	{ 156, 168 },	// location of level 0 (CJ)
-	{ 48, 154 },	// location of level 1 (CJ)
-	{ 174, 95 },	// location of level 2 (CJ)
-	{ 265, 75 },	// location of level 3 (CJ)
-	{ 130, 48 },	// location of level 4 (CJ)
-	{ 279, 23 },	// location of level 5 (CJ)
-	{ 198, 48 },	// location of level 6 (CJ)
-	{ 140, 25 },	// location of level 7 (CJ)
-	{ 281, 136 }	// location of level 8 (CJ)
-    }
-
-};
-
-
-//
-// Animation locations for episode 0 (1).
-// Using patches saves a lot of space,
-//  as they replace 320x200 full screen frames.
-//
-
-#define ANIM(type, period, nanims, x, y, nexttic)            \
-   { (type), (period), (nanims), { (x), (y) }, (nexttic),    \
-     0, { NULL, NULL, NULL }, 0, 0, 0, 0 }
-
-
-static anim_t epsd0animinfo[] =
-{
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 224, 104, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 184, 160, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 112, 136, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 72, 112, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 88, 96, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 48, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 192, 40, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 136, 16, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 80, 16, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 64, 24, 0),
-};
-
-static anim_t epsd1animinfo[] =
-{
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 1),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 2),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 3),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 4),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 5),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 6),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 7),
-    ANIM(ANIM_LEVEL, TICRATE/3, 3, 192, 144, 8),
-    ANIM(ANIM_LEVEL, TICRATE/3, 1, 128, 136, 8),
-};
-
-static anim_t epsd2animinfo[] =
-{
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 168, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 40, 136, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 160, 96, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 104, 80, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/3, 3, 120, 32, 0),
-    ANIM(ANIM_ALWAYS, TICRATE/4, 3, 40, 0, 0),
-};
-
-static int NUMANIMS[NUMEPISODES] =
-{
-    arrlen(epsd0animinfo),
-    arrlen(epsd1animinfo),
-    arrlen(epsd2animinfo),
-};
-
-static anim_t *anims[NUMEPISODES] =
-{
-    epsd0animinfo,
-    epsd1animinfo,
-    epsd2animinfo
-};
-
-
-//
-// GENERAL DATA
-//
-
-//
-// Locally used stuff.
-//
-
-// States for single-player
-#define SP_KILLS		0
-#define SP_ITEMS		2
-#define SP_SECRET		4
-#define SP_FRAGS		6 
-#define SP_TIME			8 
-#define SP_PAR			ST_TIME
-
-#define SP_PAUSE		1
-
-// in seconds
-#define SHOWNEXTLOCDELAY	4
-//#define SHOWLASTLOCDELAY	SHOWNEXTLOCDELAY
-
-
-// used to accelerate or skip a stage
-static int		acceleratestage;
-
-// wbs->pnum
-static int		me;
-
- // specifies current state
-static stateenum_t	state;
-
-// contains information passed into intermission
-static wbstartstruct_t*	wbs;
-
-static wbplayerstruct_t* plrs;  // wbs->plyr[]
-
-// used for general timing
-static int 		cnt;  
-
-// used for timing of background animation
-static int 		bcnt;
-
-// signals to refresh everything for one frame
-static int 		firstrefresh; 
-
-static int		cnt_kills[MAXPLAYERS];
-static int		cnt_items[MAXPLAYERS];
-static int		cnt_secret[MAXPLAYERS];
-static int		cnt_time;
-static int		cnt_par;
-static int		cnt_pause;
-
-// # of commercial levels
-static int		NUMCMAPS; 
-
-
-//
-//	GRAPHICS
-//
-
-// You Are Here graphic
-static patch_t*		yah[3] = { NULL, NULL, NULL }; 
-
-// splat
-static patch_t*		splat[2] = { NULL, NULL };
-
-// %, : graphics
-static patch_t*		percent;
-static patch_t*		colon;
-
-// 0-9 graphic
-static patch_t*		num[10];
-
-// minus sign
-static patch_t*		wiminus;
-
-// "Finished!" graphics
-static patch_t*		finished;
-
-// "Entering" graphic
-static patch_t*		entering; 
-
-// "secret"
-static patch_t*		sp_secret;
-
- // "Kills", "Scrt", "Items", "Frags"
-static patch_t*		kills;
-static patch_t*		secret;
-static patch_t*		items;
-static patch_t*		frags;
-
-// Time sucks.
-static patch_t*		timepatch;
-static patch_t*		par;
-static patch_t*		sucks;
-
-// "killers", "victims"
-static patch_t*		killers;
-static patch_t*		victims; 
-
-// "Total", your face, your dead face
-static patch_t*		total;
-static patch_t*		star;
-static patch_t*		bstar;
-
-// "red P[1..MAXPLAYERS]"
-static patch_t*		p[MAXPLAYERS];
-
-// "gray P[1..MAXPLAYERS]"
-static patch_t*		bp[MAXPLAYERS];
-
- // Name graphics of each level (centered)
-static patch_t**	lnames;
-
-// Buffer storing the backdrop
-static patch_t *background;
-
-//
-// CODE
-//
-
-// slam background
-void WI_slamBackground(void)
-{
-    V_DrawPatch(0, 0, background);
-}
-
-// The ticker is used to detect keys
-//  because of timing issues in netgames.
-boolean WI_Responder(event_t* ev)
-{
-    return false;
-}
-
-
-// Draws "<Levelname> Finished!"
-void WI_drawLF(void)
-{
-    int y = WI_TITLEY;
-
-    if (gamemode != commercial || wbs->last < NUMCMAPS)
-    {
-        // draw <LevelName> 
-        V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2,
-                    y, lnames[wbs->last]);
-
-        // draw "Finished!"
-        y += (5*SHORT(lnames[wbs->last]->height))/4;
-
-        V_DrawPatch((SCREENWIDTH - SHORT(finished->width)) / 2, y, finished);
-    }
-    else if (wbs->last == NUMCMAPS)
-    {
-        // MAP33 - nothing is displayed!
-    }
-    else if (wbs->last > NUMCMAPS)
-    {
-        // > MAP33.  Doom bombs out here with a Bad V_DrawPatch error.
-        // I'm pretty sure that doom2.exe is just reading into random
-        // bits of memory at this point, but let's try to be accurate
-        // anyway.  This deliberately triggers a V_DrawPatch error.
-
-        patch_t tmp = { SCREENWIDTH, SCREENHEIGHT, 1, 1, 
-                        { 0, 0, 0, 0, 0, 0, 0, 0 } };
-
-        V_DrawPatch(0, y, &tmp);
-    }
-}
-
-
-
-// Draws "Entering <LevelName>"
-void WI_drawEL(void)
-{
-    int y = WI_TITLEY;
-
-    // draw "Entering"
-    V_DrawPatch((SCREENWIDTH - SHORT(entering->width))/2,
-		y,
-                entering);
-
-    // draw level
-    y += (5*SHORT(lnames[wbs->next]->height))/4;
-
-    V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->next]->width))/2,
-		y, 
-                lnames[wbs->next]);
-
-}
-
-void
-WI_drawOnLnode
-( int		n,
-  patch_t*	c[] )
-{
-
-    int		i;
-    int		left;
-    int		top;
-    int		right;
-    int		bottom;
-    boolean	fits = false;
-
-    i = 0;
-    do
-    {
-	left = lnodes[wbs->epsd][n].x - SHORT(c[i]->leftoffset);
-	top = lnodes[wbs->epsd][n].y - SHORT(c[i]->topoffset);
-	right = left + SHORT(c[i]->width);
-	bottom = top + SHORT(c[i]->height);
-
-	if (left >= 0
-	    && right < SCREENWIDTH
-	    && top >= 0
-	    && bottom < SCREENHEIGHT)
-	{
-	    fits = true;
-	}
-	else
-	{
-	    i++;
-	}
-    } while (!fits && i!=2 && c[i] != NULL);
-
-    if (fits && i<2)
-    {
-	V_DrawPatch(lnodes[wbs->epsd][n].x,
-                    lnodes[wbs->epsd][n].y,
-		    c[i]);
-    }
-    else
-    {
-	// DEBUG
-	printf("Could not place patch on level %d", n+1); 
-    }
-}
-
-
-
-void WI_initAnimatedBack(void)
-{
-    int		i;
-    anim_t*	a;
-
-    if (gamemode == commercial)
-	return;
-
-    if (wbs->epsd > 2)
-	return;
-
-    for (i=0;i<NUMANIMS[wbs->epsd];i++)
-    {
-	a = &anims[wbs->epsd][i];
-
-	// init variables
-	a->ctr = -1;
-
-	// specify the next time to draw it
-	if (a->type == ANIM_ALWAYS)
-	    a->nexttic = bcnt + 1 + (M_Random()%a->period);
-	else if (a->type == ANIM_RANDOM)
-	    a->nexttic = bcnt + 1 + a->data2+(M_Random()%a->data1);
-	else if (a->type == ANIM_LEVEL)
-	    a->nexttic = bcnt + 1;
-    }
-
-}
-
-void WI_updateAnimatedBack(void)
-{
-    int		i;
-    anim_t*	a;
-
-    if (gamemode == commercial)
-	return;
-
-    if (wbs->epsd > 2)
-	return;
-
-    for (i=0;i<NUMANIMS[wbs->epsd];i++)
-    {
-	a = &anims[wbs->epsd][i];
-
-	if (bcnt == a->nexttic)
-	{
-	    switch (a->type)
-	    {
-	      case ANIM_ALWAYS:
-		if (++a->ctr >= a->nanims) a->ctr = 0;
-		a->nexttic = bcnt + a->period;
-		break;
-
-	      case ANIM_RANDOM:
-		a->ctr++;
-		if (a->ctr == a->nanims)
-		{
-		    a->ctr = -1;
-		    a->nexttic = bcnt+a->data2+(M_Random()%a->data1);
-		}
-		else a->nexttic = bcnt + a->period;
-		break;
-		
-	      case ANIM_LEVEL:
-		// gawd-awful hack for level anims
-		if (!(state == StatCount && i == 7)
-		    && wbs->next == a->data1)
-		{
-		    a->ctr++;
-		    if (a->ctr == a->nanims) a->ctr--;
-		    a->nexttic = bcnt + a->period;
-		}
-		break;
-	    }
-	}
-
-    }
-
-}
-
-void WI_drawAnimatedBack(void)
-{
-    int			i;
-    anim_t*		a;
-
-    if (gamemode == commercial)
-	return;
-
-    if (wbs->epsd > 2)
-	return;
-
-    for (i=0 ; i<NUMANIMS[wbs->epsd] ; i++)
-    {
-	a = &anims[wbs->epsd][i];
-
-	if (a->ctr >= 0)
-	    V_DrawPatch(a->loc.x, a->loc.y, a->p[a->ctr]);
-    }
-
-}
-
-//
-// Draws a number.
-// If digits > 0, then use that many digits minimum,
-//  otherwise only use as many as necessary.
-// Returns new x position.
-//
-
-int
-WI_drawNum
-( int		x,
-  int		y,
-  int		n,
-  int		digits )
-{
-
-    int		fontwidth = SHORT(num[0]->width);
-    int		neg;
-    int		temp;
-
-    if (digits < 0)
-    {
-	if (!n)
-	{
-	    // make variable-length zeros 1 digit long
-	    digits = 1;
-	}
-	else
-	{
-	    // figure out # of digits in #
-	    digits = 0;
-	    temp = n;
-
-	    while (temp)
-	    {
-		temp /= 10;
-		digits++;
-	    }
-	}
-    }
-
-    neg = n < 0;
-    if (neg)
-	n = -n;
-
-    // if non-number, do not draw it
-    if (n == 1994)
-	return 0;
-
-    // draw the new number
-    while (digits--)
-    {
-	x -= fontwidth;
-	V_DrawPatch(x, y, num[ n % 10 ]);
-	n /= 10;
-    }
-
-    // draw a minus sign if necessary
-    if (neg)
-	V_DrawPatch(x-=8, y, wiminus);
-
-    return x;
-
-}
-
-void
-WI_drawPercent
-( int		x,
-  int		y,
-  int		p )
-{
-    if (p < 0)
-	return;
-
-    V_DrawPatch(x, y, percent);
-    WI_drawNum(x, y, p, -1);
-}
-
-
-
-//
-// Display level completion time and par,
-//  or "sucks" message if overflow.
-//
-void
-WI_drawTime
-( int		x,
-  int		y,
-  int		t )
-{
-
-    int		div;
-    int		n;
-
-    if (t<0)
-	return;
-
-    if (t <= 61*59)
-    {
-	div = 1;
-
-	do
-	{
-	    n = (t / div) % 60;
-	    x = WI_drawNum(x, y, n, 2) - SHORT(colon->width);
-	    div *= 60;
-
-	    // draw
-	    if (div==60 || t / div)
-		V_DrawPatch(x, y, colon);
-	    
-	} while (t / div);
-    }
-    else
-    {
-	// "sucks"
-	V_DrawPatch(x - SHORT(sucks->width), y, sucks); 
-    }
-}
-
-
-void WI_End(void)
-{
-    void WI_unloadData(void);
-    WI_unloadData();
-}
-
-void WI_initNoState(void)
-{
-    state = NoState;
-    acceleratestage = 0;
-    cnt = 10;
-}
-
-void WI_updateNoState(void) {
-
-    WI_updateAnimatedBack();
-
-    if (!--cnt)
-    {
-        // Don't call WI_End yet.  G_WorldDone doesnt immediately 
-        // change gamestate, so WI_Drawer is still going to get
-        // run until that happens.  If we do that after WI_End
-        // (which unloads all the graphics), we're in trouble.
-	//WI_End();
-	G_WorldDone();
-    }
-
-}
-
-static boolean		snl_pointeron = false;
-
-
-void WI_initShowNextLoc(void)
-{
-    state = ShowNextLoc;
-    acceleratestage = 0;
-    cnt = SHOWNEXTLOCDELAY * TICRATE;
-
-    WI_initAnimatedBack();
-}
-
-void WI_updateShowNextLoc(void)
-{
-    WI_updateAnimatedBack();
-
-    if (!--cnt || acceleratestage)
-	WI_initNoState();
-    else
-	snl_pointeron = (cnt & 31) < 20;
-}
-
-void WI_drawShowNextLoc(void)
-{
-
-    int		i;
-    int		last;
-
-    WI_slamBackground();
-
-    // draw animated background
-    WI_drawAnimatedBack(); 
-
-    if ( gamemode != commercial)
-    {
-  	if (wbs->epsd > 2)
-	{
-	    WI_drawEL();
-	    return;
-	}
-	
-	last = (wbs->last == 8) ? wbs->next - 1 : wbs->last;
-
-	// draw a splat on taken cities.
-	for (i=0 ; i<=last ; i++)
-	    WI_drawOnLnode(i, splat);
-
-	// splat the secret level?
-	if (wbs->didsecret)
-	    WI_drawOnLnode(8, splat);
-
-	// draw flashing ptr
-	if (snl_pointeron)
-	    WI_drawOnLnode(wbs->next, yah); 
-    }
-
-    // draws which level you are entering..
-    if ( (gamemode != commercial)
-	 || wbs->next != 30)
-	WI_drawEL();  
-
-}
-
-void WI_drawNoState(void)
-{
-    snl_pointeron = true;
-    WI_drawShowNextLoc();
-}
-
-int WI_fragSum(int playernum)
-{
-    int		i;
-    int		frags = 0;
-    
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i]
-	    && i!=playernum)
-	{
-	    frags += plrs[playernum].frags[i];
-	}
-    }
-
-	
-    // JDC hack - negative frags.
-    frags -= plrs[playernum].frags[playernum];
-    // UNUSED if (frags < 0)
-    // 	frags = 0;
-
-    return frags;
-}
-
-
-
-static int		dm_state;
-static int		dm_frags[MAXPLAYERS][MAXPLAYERS];
-static int		dm_totals[MAXPLAYERS];
-
-
-
-void WI_initDeathmatchStats(void)
-{
-
-    int		i;
-    int		j;
-
-    state = StatCount;
-    acceleratestage = 0;
-    dm_state = 1;
-
-    cnt_pause = TICRATE;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i])
-	{
-	    for (j=0 ; j<MAXPLAYERS ; j++)
-		if (playeringame[j])
-		    dm_frags[i][j] = 0;
-
-	    dm_totals[i] = 0;
-	}
-    }
-    
-    WI_initAnimatedBack();
-}
-
-
-
-void WI_updateDeathmatchStats(void)
-{
-
-    int		i;
-    int		j;
-    
-    boolean	stillticking;
-
-    WI_updateAnimatedBack();
-
-    if (acceleratestage && dm_state != 4)
-    {
-	acceleratestage = 0;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (playeringame[i])
-	    {
-		for (j=0 ; j<MAXPLAYERS ; j++)
-		    if (playeringame[j])
-			dm_frags[i][j] = plrs[i].frags[j];
-
-		dm_totals[i] = WI_fragSum(i);
-	    }
-	}
-	
-
-	S_StartSound(0, sfx_barexp);
-	dm_state = 4;
-    }
-
-    
-    if (dm_state == 2)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-	
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (playeringame[i])
-	    {
-		for (j=0 ; j<MAXPLAYERS ; j++)
-		{
-		    if (playeringame[j]
-			&& dm_frags[i][j] != plrs[i].frags[j])
-		    {
-			if (plrs[i].frags[j] < 0)
-			    dm_frags[i][j]--;
-			else
-			    dm_frags[i][j]++;
-
-			if (dm_frags[i][j] > 99)
-			    dm_frags[i][j] = 99;
-
-			if (dm_frags[i][j] < -99)
-			    dm_frags[i][j] = -99;
-			
-			stillticking = true;
-		    }
-		}
-		dm_totals[i] = WI_fragSum(i);
-
-		if (dm_totals[i] > 99)
-		    dm_totals[i] = 99;
-		
-		if (dm_totals[i] < -99)
-		    dm_totals[i] = -99;
-	    }
-	    
-	}
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    dm_state++;
-	}
-
-    }
-    else if (dm_state == 4)
-    {
-	if (acceleratestage)
-	{
-	    S_StartSound(0, sfx_slop);
-
-	    if ( gamemode == commercial)
-		WI_initNoState();
-	    else
-		WI_initShowNextLoc();
-	}
-    }
-    else if (dm_state & 1)
-    {
-	if (!--cnt_pause)
-	{
-	    dm_state++;
-	    cnt_pause = TICRATE;
-	}
-    }
-}
-
-
-
-void WI_drawDeathmatchStats(void)
-{
-
-    int		i;
-    int		j;
-    int		x;
-    int		y;
-    int		w;
-    
-    int		lh;	// line height
-
-    lh = WI_SPACINGY;
-
-    WI_slamBackground();
-    
-    // draw animated background
-    WI_drawAnimatedBack(); 
-    WI_drawLF();
-
-    // draw stat titles (top line)
-    V_DrawPatch(DM_TOTALSX-SHORT(total->width)/2,
-		DM_MATRIXY-WI_SPACINGY+10,
-		total);
-    
-    V_DrawPatch(DM_KILLERSX, DM_KILLERSY, killers);
-    V_DrawPatch(DM_VICTIMSX, DM_VICTIMSY, victims);
-
-    // draw P?
-    x = DM_MATRIXX + DM_SPACINGX;
-    y = DM_MATRIXY;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (playeringame[i])
-	{
-	    V_DrawPatch(x-SHORT(p[i]->width)/2,
-			DM_MATRIXY - WI_SPACINGY,
-			p[i]);
-	    
-	    V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
-			y,
-			p[i]);
-
-	    if (i == me)
-	    {
-		V_DrawPatch(x-SHORT(p[i]->width)/2,
-			    DM_MATRIXY - WI_SPACINGY,
-			    bstar);
-
-		V_DrawPatch(DM_MATRIXX-SHORT(p[i]->width)/2,
-			    y,
-			    star);
-	    }
-	}
-	else
-	{
-	    // V_DrawPatch(x-SHORT(bp[i]->width)/2,
-	    //   DM_MATRIXY - WI_SPACINGY, bp[i]);
-	    // V_DrawPatch(DM_MATRIXX-SHORT(bp[i]->width)/2,
-	    //   y, bp[i]);
-	}
-	x += DM_SPACINGX;
-	y += WI_SPACINGY;
-    }
-
-    // draw stats
-    y = DM_MATRIXY+10;
-    w = SHORT(num[0]->width);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	x = DM_MATRIXX + DM_SPACINGX;
-
-	if (playeringame[i])
-	{
-	    for (j=0 ; j<MAXPLAYERS ; j++)
-	    {
-		if (playeringame[j])
-		    WI_drawNum(x+w, y, dm_frags[i][j], 2);
-
-		x += DM_SPACINGX;
-	    }
-	    WI_drawNum(DM_TOTALSX+w, y, dm_totals[i], 2);
-	}
-	y += WI_SPACINGY;
-    }
-}
-
-static int	cnt_frags[MAXPLAYERS];
-static int	dofrags;
-static int	ng_state;
-
-void WI_initNetgameStats(void)
-{
-
-    int i;
-
-    state = StatCount;
-    acceleratestage = 0;
-    ng_state = 1;
-
-    cnt_pause = TICRATE;
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (!playeringame[i])
-	    continue;
-
-	cnt_kills[i] = cnt_items[i] = cnt_secret[i] = cnt_frags[i] = 0;
-
-	dofrags += WI_fragSum(i);
-    }
-
-    dofrags = !!dofrags;
-
-    WI_initAnimatedBack();
-}
-
-
-
-void WI_updateNetgameStats(void)
-{
-
-    int		i;
-    int		fsum;
-    
-    boolean	stillticking;
-
-    WI_updateAnimatedBack();
-
-    if (acceleratestage && ng_state != 10)
-    {
-	acceleratestage = 0;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
-	    cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
-	    cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
-
-	    if (dofrags)
-		cnt_frags[i] = WI_fragSum(i);
-	}
-	S_StartSound(0, sfx_barexp);
-	ng_state = 10;
-    }
-
-    if (ng_state == 2)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_kills[i] += 2;
-
-	    if (cnt_kills[i] >= (plrs[i].skills * 100) / wbs->maxkills)
-		cnt_kills[i] = (plrs[i].skills * 100) / wbs->maxkills;
-	    else
-		stillticking = true;
-	}
-	
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    ng_state++;
-	}
-    }
-    else if (ng_state == 4)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_items[i] += 2;
-	    if (cnt_items[i] >= (plrs[i].sitems * 100) / wbs->maxitems)
-		cnt_items[i] = (plrs[i].sitems * 100) / wbs->maxitems;
-	    else
-		stillticking = true;
-	}
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    ng_state++;
-	}
-    }
-    else if (ng_state == 6)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_secret[i] += 2;
-
-	    if (cnt_secret[i] >= (plrs[i].ssecret * 100) / wbs->maxsecret)
-		cnt_secret[i] = (plrs[i].ssecret * 100) / wbs->maxsecret;
-	    else
-		stillticking = true;
-	}
-	
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_barexp);
-	    ng_state += 1 + 2*!dofrags;
-	}
-    }
-    else if (ng_state == 8)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	stillticking = false;
-
-	for (i=0 ; i<MAXPLAYERS ; i++)
-	{
-	    if (!playeringame[i])
-		continue;
-
-	    cnt_frags[i] += 1;
-
-	    if (cnt_frags[i] >= (fsum = WI_fragSum(i)))
-		cnt_frags[i] = fsum;
-	    else
-		stillticking = true;
-	}
-	
-	if (!stillticking)
-	{
-	    S_StartSound(0, sfx_pldeth);
-	    ng_state++;
-	}
-    }
-    else if (ng_state == 10)
-    {
-	if (acceleratestage)
-	{
-	    S_StartSound(0, sfx_sgcock);
-	    if ( gamemode == commercial )
-		WI_initNoState();
-	    else
-		WI_initShowNextLoc();
-	}
-    }
-    else if (ng_state & 1)
-    {
-	if (!--cnt_pause)
-	{
-	    ng_state++;
-	    cnt_pause = TICRATE;
-	}
-    }
-}
-
-
-
-void WI_drawNetgameStats(void)
-{
-    int		i;
-    int		x;
-    int		y;
-    int		pwidth = SHORT(percent->width);
-
-    WI_slamBackground();
-    
-    // draw animated background
-    WI_drawAnimatedBack(); 
-
-    WI_drawLF();
-
-    // draw stat titles (top line)
-    V_DrawPatch(NG_STATSX+NG_SPACINGX-SHORT(kills->width),
-		NG_STATSY, kills);
-
-    V_DrawPatch(NG_STATSX+2*NG_SPACINGX-SHORT(items->width),
-		NG_STATSY, items);
-
-    V_DrawPatch(NG_STATSX+3*NG_SPACINGX-SHORT(secret->width),
-		NG_STATSY, secret);
-    
-    if (dofrags)
-	V_DrawPatch(NG_STATSX+4*NG_SPACINGX-SHORT(frags->width),
-		    NG_STATSY, frags);
-
-    // draw stats
-    y = NG_STATSY + SHORT(kills->height);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	if (!playeringame[i])
-	    continue;
-
-	x = NG_STATSX;
-	V_DrawPatch(x-SHORT(p[i]->width), y, p[i]);
-
-	if (i == me)
-	    V_DrawPatch(x-SHORT(p[i]->width), y, star);
-
-	x += NG_SPACINGX;
-	WI_drawPercent(x-pwidth, y+10, cnt_kills[i]);	x += NG_SPACINGX;
-	WI_drawPercent(x-pwidth, y+10, cnt_items[i]);	x += NG_SPACINGX;
-	WI_drawPercent(x-pwidth, y+10, cnt_secret[i]);	x += NG_SPACINGX;
-
-	if (dofrags)
-	    WI_drawNum(x, y+10, cnt_frags[i], -1);
-
-	y += WI_SPACINGY;
-    }
-
-}
-
-static int	sp_state;
-
-void WI_initStats(void)
-{
-    state = StatCount;
-    acceleratestage = 0;
-    sp_state = 1;
-    cnt_kills[0] = cnt_items[0] = cnt_secret[0] = -1;
-    cnt_time = cnt_par = -1;
-    cnt_pause = TICRATE;
-
-    WI_initAnimatedBack();
-}
-
-void WI_updateStats(void)
-{
-
-    WI_updateAnimatedBack();
-
-    if (acceleratestage && sp_state != 10)
-    {
-	acceleratestage = 0;
-	cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
-	cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
-	cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
-	cnt_time = plrs[me].stime / TICRATE;
-	cnt_par = wbs->partime / TICRATE;
-	S_StartSound(0, sfx_barexp);
-	sp_state = 10;
-    }
-
-    if (sp_state == 2)
-    {
-	cnt_kills[0] += 2;
-
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	if (cnt_kills[0] >= (plrs[me].skills * 100) / wbs->maxkills)
-	{
-	    cnt_kills[0] = (plrs[me].skills * 100) / wbs->maxkills;
-	    S_StartSound(0, sfx_barexp);
-	    sp_state++;
-	}
-    }
-    else if (sp_state == 4)
-    {
-	cnt_items[0] += 2;
-
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	if (cnt_items[0] >= (plrs[me].sitems * 100) / wbs->maxitems)
-	{
-	    cnt_items[0] = (plrs[me].sitems * 100) / wbs->maxitems;
-	    S_StartSound(0, sfx_barexp);
-	    sp_state++;
-	}
-    }
-    else if (sp_state == 6)
-    {
-	cnt_secret[0] += 2;
-
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	if (cnt_secret[0] >= (plrs[me].ssecret * 100) / wbs->maxsecret)
-	{
-	    cnt_secret[0] = (plrs[me].ssecret * 100) / wbs->maxsecret;
-	    S_StartSound(0, sfx_barexp);
-	    sp_state++;
-	}
-    }
-
-    else if (sp_state == 8)
-    {
-	if (!(bcnt&3))
-	    S_StartSound(0, sfx_pistol);
-
-	cnt_time += 3;
-
-	if (cnt_time >= plrs[me].stime / TICRATE)
-	    cnt_time = plrs[me].stime / TICRATE;
-
-	cnt_par += 3;
-
-	if (cnt_par >= wbs->partime / TICRATE)
-	{
-	    cnt_par = wbs->partime / TICRATE;
-
-	    if (cnt_time >= plrs[me].stime / TICRATE)
-	    {
-		S_StartSound(0, sfx_barexp);
-		sp_state++;
-	    }
-	}
-    }
-    else if (sp_state == 10)
-    {
-	if (acceleratestage)
-	{
-	    S_StartSound(0, sfx_sgcock);
-
-	    if (gamemode == commercial)
-		WI_initNoState();
-	    else
-		WI_initShowNextLoc();
-	}
-    }
-    else if (sp_state & 1)
-    {
-	if (!--cnt_pause)
-	{
-	    sp_state++;
-	    cnt_pause = TICRATE;
-	}
-    }
-
-}
-
-void WI_drawStats(void)
-{
-    // line height
-    int lh;	
-
-    lh = (3*SHORT(num[0]->height))/2;
-
-    WI_slamBackground();
-
-    // draw animated background
-    WI_drawAnimatedBack();
-    
-    WI_drawLF();
-
-    V_DrawPatch(SP_STATSX, SP_STATSY, kills);
-    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY, cnt_kills[0]);
-
-    V_DrawPatch(SP_STATSX, SP_STATSY+lh, items);
-    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+lh, cnt_items[0]);
-
-    V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, sp_secret);
-    WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
-
-    V_DrawPatch(SP_TIMEX, SP_TIMEY, timepatch);
-    WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time);
-
-    if (wbs->epsd < 3)
-    {
-	V_DrawPatch(SCREENWIDTH/2 + SP_TIMEX, SP_TIMEY, par);
-	WI_drawTime(SCREENWIDTH - SP_TIMEX, SP_TIMEY, cnt_par);
-    }
-
-}
-
-void WI_checkForAccelerate(void)
-{
-    int   i;
-    player_t  *player;
-
-    // check for button presses to skip delays
-    for (i=0, player = players ; i<MAXPLAYERS ; i++, player++)
-    {
-	if (playeringame[i])
-	{
-	    if (player->cmd.buttons & BT_ATTACK)
-	    {
-		if (!player->attackdown)
-		    acceleratestage = 1;
-		player->attackdown = true;
-	    }
-	    else
-		player->attackdown = false;
-	    if (player->cmd.buttons & BT_USE)
-	    {
-		if (!player->usedown)
-		    acceleratestage = 1;
-		player->usedown = true;
-	    }
-	    else
-		player->usedown = false;
-	}
-    }
-}
-
-
-
-// Updates stuff each tick
-void WI_Ticker(void)
-{
-    // counter for general background animation
-    bcnt++;  
-
-    if (bcnt == 1)
-    {
-	// intermission music
-  	if ( gamemode == commercial )
-	  S_ChangeMusic(mus_dm2int, true);
-	else
-	  S_ChangeMusic(mus_inter, true); 
-    }
-
-    WI_checkForAccelerate();
-
-    switch (state)
-    {
-      case StatCount:
-	if (deathmatch) WI_updateDeathmatchStats();
-	else if (netgame) WI_updateNetgameStats();
-	else WI_updateStats();
-	break;
-	
-      case ShowNextLoc:
-	WI_updateShowNextLoc();
-	break;
-	
-      case NoState:
-	WI_updateNoState();
-	break;
-    }
-
-}
-
-typedef void (*load_callback_t)(char *lumpname, patch_t **variable);
-
-// Common load/unload function.  Iterates over all the graphics
-// lumps to be loaded/unloaded into memory.
-
-static void WI_loadUnloadData(load_callback_t callback)
-{
-    int i, j;
-    char name[9];
-    anim_t *a;
-
-    if (gamemode == commercial)
-    {
-	for (i=0 ; i<NUMCMAPS ; i++)
-	{
-	    DEH_snprintf(name, 9, "CWILV%2.2d", i);
-            callback(name, &lnames[i]);
-	}
-    }
-    else
-    {
-	for (i=0 ; i<NUMMAPS ; i++)
-	{
-	    DEH_snprintf(name, 9, "WILV%d%d", wbs->epsd, i);
-            callback(name, &lnames[i]);
-	}
-
-	// you are here
-        callback(DEH_String("WIURH0"), &yah[0]);
-
-	// you are here (alt.)
-        callback(DEH_String("WIURH1"), &yah[1]);
-
-	// splat
-        callback(DEH_String("WISPLAT"), &splat[0]);
-
-	if (wbs->epsd < 3)
-	{
-	    for (j=0;j<NUMANIMS[wbs->epsd];j++)
-	    {
-		a = &anims[wbs->epsd][j];
-		for (i=0;i<a->nanims;i++)
-		{
-		    // MONDO HACK!
-		    if (wbs->epsd != 1 || j != 8)
-		    {
-			// animations
-			DEH_snprintf(name, 9, "WIA%d%.2d%.2d", wbs->epsd, j, i);
-                        callback(name, &a->p[i]);
-		    }
-		    else
-		    {
-			// HACK ALERT!
-			a->p[i] = anims[1][4].p[i];
-		    }
-		}
-	    }
-	}
-    }
-
-    // More hacks on minus sign.
-    callback(DEH_String("WIMINUS"), &wiminus);
-
-    for (i=0;i<10;i++)
-    {
-	 // numbers 0-9
-	DEH_snprintf(name, 9, "WINUM%d", i);
-        callback(name, &num[i]);
-    }
-
-    // percent sign
-    callback(DEH_String("WIPCNT"), &percent);
-
-    // "finished"
-    callback(DEH_String("WIF"), &finished);
-
-    // "entering"
-    callback(DEH_String("WIENTER"), &entering);
-
-    // "kills"
-    callback(DEH_String("WIOSTK"), &kills);
-
-    // "scrt"
-    callback(DEH_String("WIOSTS"), &secret);
-
-     // "secret"
-    callback(DEH_String("WISCRT2"), &sp_secret);
-
-    // french wad uses WIOBJ (?)
-    if (W_CheckNumForName(DEH_String("WIOBJ")) >= 0)
-    {
-    	// "items"
-    	if (netgame && !deathmatch)
-            callback(DEH_String("WIOBJ"), &items);
-    	else
-            callback(DEH_String("WIOSTI"), &items);
-    } else {
-        callback(DEH_String("WIOSTI"), &items);
-    }
-
-    // "frgs"
-    callback(DEH_String("WIFRGS"), &frags);
-
-    // ":"
-    callback(DEH_String("WICOLON"), &colon);
-
-    // "time"
-    callback(DEH_String("WITIME"), &timepatch);
-
-    // "sucks"
-    callback(DEH_String("WISUCKS"), &sucks);
-
-    // "par"
-    callback(DEH_String("WIPAR"), &par);
-
-    // "killers" (vertical)
-    callback(DEH_String("WIKILRS"), &killers);
-
-    // "victims" (horiz)
-    callback(DEH_String("WIVCTMS"), &victims);
-
-    // "total"
-    callback(DEH_String("WIMSTT"), &total);
-
-    for (i=0 ; i<MAXPLAYERS ; i++)
-    {
-	// "1,2,3,4"
-	DEH_snprintf(name, 9, "STPB%d", i);
-        callback(name, &p[i]);
-
-	// "1,2,3,4"
-	DEH_snprintf(name, 9, "WIBP%d", i+1);
-        callback(name, &bp[i]);
-    }
-
-    // Background image
-
-    if (gamemode == commercial)
-    {
-	M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
-        name[8] = '\0';
-    }
-    else if (gamemode == retail && wbs->epsd == 3)
-    {
-	M_StringCopy(name, DEH_String("INTERPIC"), sizeof(name));
-        name[8] = '\0';
-    }
-    else
-    {
-	DEH_snprintf(name, 9, "WIMAP%d", wbs->epsd);
-    }
-
-    // Draw backdrop and save to a temporary buffer
-
-    callback(name, &background);
-}
-
-static void WI_loadCallback(char *name, patch_t **variable)
-{
-    *variable = W_CacheLumpName(name, PU_STATIC);
-}
-
-void WI_loadData(void)
-{
-    if (gamemode == commercial)
-    {
-	NUMCMAPS = 32;
-	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMCMAPS,
-				       PU_STATIC, NULL);
-    }
-    else
-    {
-	lnames = (patch_t **) Z_Malloc(sizeof(patch_t*) * NUMMAPS,
-				       PU_STATIC, NULL);
-    }
-
-    WI_loadUnloadData(WI_loadCallback);
-
-    // These two graphics are special cased because we're sharing
-    // them with the status bar code
-
-    // your face
-    star = W_CacheLumpName(DEH_String("STFST01"), PU_STATIC);
-
-    // dead face
-    bstar = W_CacheLumpName(DEH_String("STFDEAD0"), PU_STATIC);
-}
-
-static void WI_unloadCallback(char *name, patch_t **variable)
-{
-    W_ReleaseLumpName(name);
-    *variable = NULL;
-}
-
-void WI_unloadData(void)
-{
-    WI_loadUnloadData(WI_unloadCallback);
-
-    // We do not free these lumps as they are shared with the status
-    // bar code.
-   
-    // W_ReleaseLumpName("STFST01");
-    // W_ReleaseLumpName("STFDEAD0");
-}
-
-void WI_Drawer (void)
-{
-    switch (state)
-    {
-      case StatCount:
-	if (deathmatch)
-	    WI_drawDeathmatchStats();
-	else if (netgame)
-	    WI_drawNetgameStats();
-	else
-	    WI_drawStats();
-	break;
-	
-      case ShowNextLoc:
-	WI_drawShowNextLoc();
-	break;
-	
-      case NoState:
-	WI_drawNoState();
-	break;
-    }
-}
-
-
-void WI_initVariables(wbstartstruct_t* wbstartstruct)
-{
-
-    wbs = wbstartstruct;
-
-#ifdef RANGECHECKING
-    if (gamemode != commercial)
-    {
-      if ( gamemode == retail )
-	RNGCHECK(wbs->epsd, 0, 3);
-      else
-	RNGCHECK(wbs->epsd, 0, 2);
-    }
-    else
-    {
-	RNGCHECK(wbs->last, 0, 8);
-	RNGCHECK(wbs->next, 0, 8);
-    }
-    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
-    RNGCHECK(wbs->pnum, 0, MAXPLAYERS);
-#endif
-
-    acceleratestage = 0;
-    cnt = bcnt = 0;
-    firstrefresh = 1;
-    me = wbs->pnum;
-    plrs = wbs->plyr;
-
-    if (!wbs->maxkills)
-	wbs->maxkills = 1;
-
-    if (!wbs->maxitems)
-	wbs->maxitems = 1;
-
-    if (!wbs->maxsecret)
-	wbs->maxsecret = 1;
-
-    if ( gamemode != retail )
-      if (wbs->epsd > 2)
-	wbs->epsd -= 3;
-}
-
-void WI_Start(wbstartstruct_t* wbstartstruct)
-{
-    WI_initVariables(wbstartstruct);
-    WI_loadData();
-
-    if (deathmatch)
-	WI_initDeathmatchStats();
-    else if (netgame)
-	WI_initNetgameStats();
-    else
-	WI_initStats();
-}
-#endif
diff --git a/games/NXDoom/src/strife/wi_stuff.h b/games/NXDoom/src/strife/wi_stuff.h
deleted file mode 100644
index 88ed1c636..000000000
--- a/games/NXDoom/src/strife/wi_stuff.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//  Intermission.
-//
-
-#ifndef __WI_STUFF__
-#define __WI_STUFF__
-
-// haleyjd 08/23/2010: Strife does not have an intermission
-#if 0
-//#include "v_video.h"
-
-#include "doomdef.h"
-
-// States for the intermission
-
-typedef enum
-{
-    NoState = -1,
-    StatCount,
-    ShowNextLoc,
-} stateenum_t;
-
-// Called by main loop, animate the intermission.
-void WI_Ticker (void);
-
-// Called by main loop,
-// draws the intermission directly into the screen buffer.
-void WI_Drawer (void);
-
-// Setup for an intermission screen.
-void WI_Start(wbstartstruct_t*	 wbstartstruct);
-
-// Shut down the intermission screen
-void WI_End(void);
-
-#endif
-#endif
diff --git a/games/NXDoom/src/tables.c b/games/NXDoom/src/tables.c
index 698ae98f5..61f0198c3 100644
--- a/games/NXDoom/src/tables.c
+++ b/games/NXDoom/src/tables.c
@@ -1,2227 +1,2369 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Lookup tables.
-//	Do not try to look them up :-).
-//	In the order of appearance: 
-//
-//	int finetangent[4096]	- Tangens LUT.
-//	 Should work with BAM fairly well (12 of 16bit,
-//      effectively, by shifting).
-//
-//	int finesine[10240]		- Sine lookup.
-//	 Guess what, serves as cosine, too.
-//	 Remarkable thing is, how to use BAMs with this? 
-//
-//	int tantoangle[2049]	- ArcTan LUT,
-//	  maps tan(angle) to angle fast. Gotta search.
-//	
-//    
+/****************************************************************************
+ * apps/games/NXDoom/src/tables.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Lookup tables.
+ *  Do not try to look them up :-).
+ *  In the order of appearance:
+ *
+ *  int finetangent[4096]  - Tangens LUT.
+ *   Should work with BAM fairly well (12 of 16bit,
+ *      effectively, by shifting).
+ *
+ *  int finesine[10240]    - Sine lookup.
+ *   Guess what, serves as cosine, too.
+ *   Remarkable thing is, how to use BAMs with this?
+ *
+ *  int tantoangle[2049]  - ArcTan LUT,
+ *    maps tan(angle) to angle fast. Gotta search.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "tables.h"
 
-// to get a global angle from cartesian coordinates, the coordinates are
-// flipped until they are in the first octant of the coordinate system, then
-// the y (<=x) is scaled and divided by x to get a tangent (slope) value
-// which is looked up in the tantoangle[] table.  The +1 size is to handle
-// the case when x==y without additional checking.
-
-int SlopeDiv(unsigned int num, unsigned int den)
-{
-    unsigned ans;
-    
-    if (den < 512)
-    {
-        return SLOPERANGE;
-    }
-    else
-    {
-        ans = (num << 3) / (den >> 8);
-
-        if (ans <= SLOPERANGE)
-        {
-            return ans;
-        }
-        else
-        {
-            return SLOPERANGE;
-        }
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 const fixed_t finetangent[4096] =
 {
-    -170910304,-56965752,-34178904,-24413316,-18988036,-15535599,-13145455,-11392683,
-    -10052327,-8994149,-8137527,-7429880,-6835455,-6329090,-5892567,-5512368,
-    -5178251,-4882318,-4618375,-4381502,-4167737,-3973855,-3797206,-3635590,
-    -3487165,-3350381,-3223918,-3106651,-2997613,-2895966,-2800983,-2712030,
-    -2628549,-2550052,-2476104,-2406322,-2340362,-2277919,-2218719,-2162516,
-    -2109087,-2058233,-2009771,-1963536,-1919378,-1877161,-1836758,-1798063,
-    -1760956,-1725348,-1691149,-1658278,-1626658,-1596220,-1566898,-1538632,
-    -1511367,-1485049,-1459630,-1435065,-1411312,-1388330,-1366084,-1344537,
-    -1323658,-1303416,-1283783,-1264730,-1246234,-1228269,-1210813,-1193846,
-    -1177345,-1161294,-1145673,-1130465,-1115654,-1101225,-1087164,-1073455,
-    -1060087,-1047046,-1034322,-1021901,-1009774,-997931,-986361,-975054,
-    -964003,-953199,-942633,-932298,-922186,-912289,-902602,-893117,
-    -883829,-874730,-865817,-857081,-848520,-840127,-831898,-823827,
-    -815910,-808143,-800521,-793041,-785699,-778490,-771411,-764460,
-    -757631,-750922,-744331,-737853,-731486,-725227,-719074,-713023,
-    -707072,-701219,-695462,-689797,-684223,-678737,-673338,-668024,
-    -662792,-657640,-652568,-647572,-642651,-637803,-633028,-628323,
-    -623686,-619117,-614613,-610174,-605798,-601483,-597229,-593033,
-    -588896,-584815,-580789,-576818,-572901,-569035,-565221,-561456,
-    -557741,-554074,-550455,-546881,-543354,-539870,-536431,-533034,
-    -529680,-526366,-523094,-519861,-516667,-513512,-510394,-507313,
-    -504269,-501261,-498287,-495348,-492443,-489571,-486732,-483925,
-    -481150,-478406,-475692,-473009,-470355,-467730,-465133,-462565,
-    -460024,-457511,-455024,-452564,-450129,-447720,-445337,-442978,
-    -440643,-438332,-436045,-433781,-431540,-429321,-427125,-424951,
-    -422798,-420666,-418555,-416465,-414395,-412344,-410314,-408303,
-    -406311,-404338,-402384,-400448,-398530,-396630,-394747,-392882,
-    -391034,-389202,-387387,-385589,-383807,-382040,-380290,-378555,
-    -376835,-375130,-373440,-371765,-370105,-368459,-366826,-365208,
-    -363604,-362013,-360436,-358872,-357321,-355783,-354257,-352744,
-    -351244,-349756,-348280,-346816,-345364,-343924,-342495,-341078,
-    -339671,-338276,-336892,-335519,-334157,-332805,-331464,-330133,
-    -328812,-327502,-326201,-324910,-323629,-322358,-321097,-319844,
-    -318601,-317368,-316143,-314928,-313721,-312524,-311335,-310154,
-    -308983,-307819,-306664,-305517,-304379,-303248,-302126,-301011,
-    -299904,-298805,-297714,-296630,-295554,-294485,-293423,-292369,
-    -291322,-290282,-289249,-288223,-287204,-286192,-285186,-284188,
-    -283195,-282210,-281231,-280258,-279292,-278332,-277378,-276430,
-    -275489,-274553,-273624,-272700,-271782,-270871,-269965,-269064,
-    -268169,-267280,-266397,-265519,-264646,-263779,-262917,-262060,
-    -261209,-260363,-259522,-258686,-257855,-257029,-256208,-255392,
-    -254581,-253774,-252973,-252176,-251384,-250596,-249813,-249035,
-    -248261,-247492,-246727,-245966,-245210,-244458,-243711,-242967,
-    -242228,-241493,-240763,-240036,-239314,-238595,-237881,-237170,
-    -236463,-235761,-235062,-234367,-233676,-232988,-232304,-231624,
-    -230948,-230275,-229606,-228941,-228279,-227621,-226966,-226314,
-    -225666,-225022,-224381,-223743,-223108,-222477,-221849,-221225,
-    -220603,-219985,-219370,-218758,-218149,-217544,-216941,-216341,
-    -215745,-215151,-214561,-213973,-213389,-212807,-212228,-211652,
-    -211079,-210509,-209941,-209376,-208815,-208255,-207699,-207145,
-    -206594,-206045,-205500,-204956,-204416,-203878,-203342,-202809,
-    -202279,-201751,-201226,-200703,-200182,-199664,-199149,-198636,
-    -198125,-197616,-197110,-196606,-196105,-195606,-195109,-194614,
-    -194122,-193631,-193143,-192658,-192174,-191693,-191213,-190736,
-    -190261,-189789,-189318,-188849,-188382,-187918,-187455,-186995,
-    -186536,-186080,-185625,-185173,-184722,-184274,-183827,-183382,
-    -182939,-182498,-182059,-181622,-181186,-180753,-180321,-179891,
-    -179463,-179037,-178612,-178190,-177769,-177349,-176932,-176516,
-    -176102,-175690,-175279,-174870,-174463,-174057,-173653,-173251,
-    -172850,-172451,-172053,-171657,-171263,-170870,-170479,-170089,
-    -169701,-169315,-168930,-168546,-168164,-167784,-167405,-167027,
-    -166651,-166277,-165904,-165532,-165162,-164793,-164426,-164060,
-    -163695,-163332,-162970,-162610,-162251,-161893,-161537,-161182,
-    -160828,-160476,-160125,-159775,-159427,-159079,-158734,-158389,
-    -158046,-157704,-157363,-157024,-156686,-156349,-156013,-155678,
-    -155345,-155013,-154682,-154352,-154024,-153697,-153370,-153045,
-    -152722,-152399,-152077,-151757,-151438,-151120,-150803,-150487,
-    -150172,-149859,-149546,-149235,-148924,-148615,-148307,-148000,
-    -147693,-147388,-147084,-146782,-146480,-146179,-145879,-145580,
-    -145282,-144986,-144690,-144395,-144101,-143808,-143517,-143226,
-    -142936,-142647,-142359,-142072,-141786,-141501,-141217,-140934,
-    -140651,-140370,-140090,-139810,-139532,-139254,-138977,-138701,
-    -138426,-138152,-137879,-137607,-137335,-137065,-136795,-136526,
-    -136258,-135991,-135725,-135459,-135195,-134931,-134668,-134406,
-    -134145,-133884,-133625,-133366,-133108,-132851,-132594,-132339,
-    -132084,-131830,-131576,-131324,-131072,-130821,-130571,-130322,
-    -130073,-129825,-129578,-129332,-129086,-128841,-128597,-128353,
-    -128111,-127869,-127627,-127387,-127147,-126908,-126669,-126432,
-    -126195,-125959,-125723,-125488,-125254,-125020,-124787,-124555,
-    -124324,-124093,-123863,-123633,-123404,-123176,-122949,-122722,
-    -122496,-122270,-122045,-121821,-121597,-121374,-121152,-120930,
-    -120709,-120489,-120269,-120050,-119831,-119613,-119396,-119179,
-    -118963,-118747,-118532,-118318,-118104,-117891,-117678,-117466,
-    -117254,-117044,-116833,-116623,-116414,-116206,-115998,-115790,
-    -115583,-115377,-115171,-114966,-114761,-114557,-114354,-114151,
-    -113948,-113746,-113545,-113344,-113143,-112944,-112744,-112546,
-    -112347,-112150,-111952,-111756,-111560,-111364,-111169,-110974,
-    -110780,-110586,-110393,-110200,-110008,-109817,-109626,-109435,
-    -109245,-109055,-108866,-108677,-108489,-108301,-108114,-107927,
-    -107741,-107555,-107369,-107184,-107000,-106816,-106632,-106449,
-    -106266,-106084,-105902,-105721,-105540,-105360,-105180,-105000,
-    -104821,-104643,-104465,-104287,-104109,-103933,-103756,-103580,
-    -103404,-103229,-103054,-102880,-102706,-102533,-102360,-102187,
-    -102015,-101843,-101671,-101500,-101330,-101159,-100990,-100820,
-    -100651,-100482,-100314,-100146,-99979,-99812,-99645,-99479,
-    -99313,-99148,-98982,-98818,-98653,-98489,-98326,-98163,
-    -98000,-97837,-97675,-97513,-97352,-97191,-97030,-96870,
-    -96710,-96551,-96391,-96233,-96074,-95916,-95758,-95601,
-    -95444,-95287,-95131,-94975,-94819,-94664,-94509,-94354,
-    -94200,-94046,-93892,-93739,-93586,-93434,-93281,-93129,
-    -92978,-92826,-92675,-92525,-92375,-92225,-92075,-91926,
-    -91777,-91628,-91480,-91332,-91184,-91036,-90889,-90742,
-    -90596,-90450,-90304,-90158,-90013,-89868,-89724,-89579,
-    -89435,-89292,-89148,-89005,-88862,-88720,-88577,-88435,
-    -88294,-88152,-88011,-87871,-87730,-87590,-87450,-87310,
-    -87171,-87032,-86893,-86755,-86616,-86479,-86341,-86204,
-    -86066,-85930,-85793,-85657,-85521,-85385,-85250,-85114,
-    -84980,-84845,-84710,-84576,-84443,-84309,-84176,-84043,
-    -83910,-83777,-83645,-83513,-83381,-83250,-83118,-82987,
-    -82857,-82726,-82596,-82466,-82336,-82207,-82078,-81949,
-    -81820,-81691,-81563,-81435,-81307,-81180,-81053,-80925,
-    -80799,-80672,-80546,-80420,-80294,-80168,-80043,-79918,
-    -79793,-79668,-79544,-79420,-79296,-79172,-79048,-78925,
-    -78802,-78679,-78557,-78434,-78312,-78190,-78068,-77947,
-    -77826,-77705,-77584,-77463,-77343,-77223,-77103,-76983,
-    -76864,-76744,-76625,-76506,-76388,-76269,-76151,-76033,
-    -75915,-75797,-75680,-75563,-75446,-75329,-75213,-75096,
-    -74980,-74864,-74748,-74633,-74517,-74402,-74287,-74172,
-    -74058,-73944,-73829,-73715,-73602,-73488,-73375,-73262,
-    -73149,-73036,-72923,-72811,-72699,-72587,-72475,-72363,
-    -72252,-72140,-72029,-71918,-71808,-71697,-71587,-71477,
-    -71367,-71257,-71147,-71038,-70929,-70820,-70711,-70602,
-    -70494,-70385,-70277,-70169,-70061,-69954,-69846,-69739,
-    -69632,-69525,-69418,-69312,-69205,-69099,-68993,-68887,
-    -68781,-68676,-68570,-68465,-68360,-68255,-68151,-68046,
-    -67942,-67837,-67733,-67629,-67526,-67422,-67319,-67216,
-    -67113,-67010,-66907,-66804,-66702,-66600,-66498,-66396,
-    -66294,-66192,-66091,-65989,-65888,-65787,-65686,-65586,
-    -65485,-65385,-65285,-65185,-65085,-64985,-64885,-64786,
-    -64687,-64587,-64488,-64389,-64291,-64192,-64094,-63996,
-    -63897,-63799,-63702,-63604,-63506,-63409,-63312,-63215,
-    -63118,-63021,-62924,-62828,-62731,-62635,-62539,-62443,
-    -62347,-62251,-62156,-62060,-61965,-61870,-61775,-61680,
-    -61585,-61491,-61396,-61302,-61208,-61114,-61020,-60926,
-    -60833,-60739,-60646,-60552,-60459,-60366,-60273,-60181,
-    -60088,-59996,-59903,-59811,-59719,-59627,-59535,-59444,
-    -59352,-59261,-59169,-59078,-58987,-58896,-58805,-58715,
-    -58624,-58534,-58443,-58353,-58263,-58173,-58083,-57994,
-    -57904,-57815,-57725,-57636,-57547,-57458,-57369,-57281,
-    -57192,-57104,-57015,-56927,-56839,-56751,-56663,-56575,
-    -56487,-56400,-56312,-56225,-56138,-56051,-55964,-55877,
-    -55790,-55704,-55617,-55531,-55444,-55358,-55272,-55186,
-    -55100,-55015,-54929,-54843,-54758,-54673,-54587,-54502,
-    -54417,-54333,-54248,-54163,-54079,-53994,-53910,-53826,
-    -53741,-53657,-53574,-53490,-53406,-53322,-53239,-53156,
-    -53072,-52989,-52906,-52823,-52740,-52657,-52575,-52492,
-    -52410,-52327,-52245,-52163,-52081,-51999,-51917,-51835,
-    -51754,-51672,-51591,-51509,-51428,-51347,-51266,-51185,
-    -51104,-51023,-50942,-50862,-50781,-50701,-50621,-50540,
-    -50460,-50380,-50300,-50221,-50141,-50061,-49982,-49902,
-    -49823,-49744,-49664,-49585,-49506,-49427,-49349,-49270,
-    -49191,-49113,-49034,-48956,-48878,-48799,-48721,-48643,
-    -48565,-48488,-48410,-48332,-48255,-48177,-48100,-48022,
-    -47945,-47868,-47791,-47714,-47637,-47560,-47484,-47407,
-    -47331,-47254,-47178,-47102,-47025,-46949,-46873,-46797,
-    -46721,-46646,-46570,-46494,-46419,-46343,-46268,-46193,
-    -46118,-46042,-45967,-45892,-45818,-45743,-45668,-45593,
-    -45519,-45444,-45370,-45296,-45221,-45147,-45073,-44999,
-    -44925,-44851,-44778,-44704,-44630,-44557,-44483,-44410,
-    -44337,-44263,-44190,-44117,-44044,-43971,-43898,-43826,
-    -43753,-43680,-43608,-43535,-43463,-43390,-43318,-43246,
-    -43174,-43102,-43030,-42958,-42886,-42814,-42743,-42671,
-    -42600,-42528,-42457,-42385,-42314,-42243,-42172,-42101,
-    -42030,-41959,-41888,-41817,-41747,-41676,-41605,-41535,
-    -41465,-41394,-41324,-41254,-41184,-41113,-41043,-40973,
-    -40904,-40834,-40764,-40694,-40625,-40555,-40486,-40416,
-    -40347,-40278,-40208,-40139,-40070,-40001,-39932,-39863,
-    -39794,-39726,-39657,-39588,-39520,-39451,-39383,-39314,
-    -39246,-39178,-39110,-39042,-38973,-38905,-38837,-38770,
-    -38702,-38634,-38566,-38499,-38431,-38364,-38296,-38229,
-    -38161,-38094,-38027,-37960,-37893,-37826,-37759,-37692,
-    -37625,-37558,-37491,-37425,-37358,-37291,-37225,-37158,
-    -37092,-37026,-36959,-36893,-36827,-36761,-36695,-36629,
-    -36563,-36497,-36431,-36365,-36300,-36234,-36168,-36103,
-    -36037,-35972,-35907,-35841,-35776,-35711,-35646,-35580,
-    -35515,-35450,-35385,-35321,-35256,-35191,-35126,-35062,
-    -34997,-34932,-34868,-34803,-34739,-34675,-34610,-34546,
-    -34482,-34418,-34354,-34289,-34225,-34162,-34098,-34034,
-    -33970,-33906,-33843,-33779,-33715,-33652,-33588,-33525,
-    -33461,-33398,-33335,-33272,-33208,-33145,-33082,-33019,
-    -32956,-32893,-32830,-32767,-32705,-32642,-32579,-32516,
-    -32454,-32391,-32329,-32266,-32204,-32141,-32079,-32017,
-    -31955,-31892,-31830,-31768,-31706,-31644,-31582,-31520,
-    -31458,-31396,-31335,-31273,-31211,-31150,-31088,-31026,
-    -30965,-30904,-30842,-30781,-30719,-30658,-30597,-30536,
-    -30474,-30413,-30352,-30291,-30230,-30169,-30108,-30048,
-    -29987,-29926,-29865,-29805,-29744,-29683,-29623,-29562,
-    -29502,-29441,-29381,-29321,-29260,-29200,-29140,-29080,
-    -29020,-28959,-28899,-28839,-28779,-28719,-28660,-28600,
-    -28540,-28480,-28420,-28361,-28301,-28241,-28182,-28122,
-    -28063,-28003,-27944,-27884,-27825,-27766,-27707,-27647,
-    -27588,-27529,-27470,-27411,-27352,-27293,-27234,-27175,
-    -27116,-27057,-26998,-26940,-26881,-26822,-26763,-26705,
-    -26646,-26588,-26529,-26471,-26412,-26354,-26295,-26237,
-    -26179,-26120,-26062,-26004,-25946,-25888,-25830,-25772,
-    -25714,-25656,-25598,-25540,-25482,-25424,-25366,-25308,
-    -25251,-25193,-25135,-25078,-25020,-24962,-24905,-24847,
-    -24790,-24732,-24675,-24618,-24560,-24503,-24446,-24389,
-    -24331,-24274,-24217,-24160,-24103,-24046,-23989,-23932,
-    -23875,-23818,-23761,-23704,-23647,-23591,-23534,-23477,
-    -23420,-23364,-23307,-23250,-23194,-23137,-23081,-23024,
-    -22968,-22911,-22855,-22799,-22742,-22686,-22630,-22573,
-    -22517,-22461,-22405,-22349,-22293,-22237,-22181,-22125,
-    -22069,-22013,-21957,-21901,-21845,-21789,-21733,-21678,
-    -21622,-21566,-21510,-21455,-21399,-21343,-21288,-21232,
-    -21177,-21121,-21066,-21010,-20955,-20900,-20844,-20789,
-    -20734,-20678,-20623,-20568,-20513,-20457,-20402,-20347,
-    -20292,-20237,-20182,-20127,-20072,-20017,-19962,-19907,
-    -19852,-19797,-19742,-19688,-19633,-19578,-19523,-19469,
-    -19414,-19359,-19305,-19250,-19195,-19141,-19086,-19032,
-    -18977,-18923,-18868,-18814,-18760,-18705,-18651,-18597,
-    -18542,-18488,-18434,-18380,-18325,-18271,-18217,-18163,
-    -18109,-18055,-18001,-17946,-17892,-17838,-17784,-17731,
-    -17677,-17623,-17569,-17515,-17461,-17407,-17353,-17300,
-    -17246,-17192,-17138,-17085,-17031,-16977,-16924,-16870,
-    -16817,-16763,-16710,-16656,-16603,-16549,-16496,-16442,
-    -16389,-16335,-16282,-16229,-16175,-16122,-16069,-16015,
-    -15962,-15909,-15856,-15802,-15749,-15696,-15643,-15590,
-    -15537,-15484,-15431,-15378,-15325,-15272,-15219,-15166,
-    -15113,-15060,-15007,-14954,-14901,-14848,-14795,-14743,
-    -14690,-14637,-14584,-14531,-14479,-14426,-14373,-14321,
-    -14268,-14215,-14163,-14110,-14057,-14005,-13952,-13900,
-    -13847,-13795,-13742,-13690,-13637,-13585,-13533,-13480,
-    -13428,-13375,-13323,-13271,-13218,-13166,-13114,-13062,
-    -13009,-12957,-12905,-12853,-12800,-12748,-12696,-12644,
-    -12592,-12540,-12488,-12436,-12383,-12331,-12279,-12227,
-    -12175,-12123,-12071,-12019,-11967,-11916,-11864,-11812,
-    -11760,-11708,-11656,-11604,-11552,-11501,-11449,-11397,
-    -11345,-11293,-11242,-11190,-11138,-11086,-11035,-10983,
-    -10931,-10880,-10828,-10777,-10725,-10673,-10622,-10570,
-    -10519,-10467,-10415,-10364,-10312,-10261,-10209,-10158,
-    -10106,-10055,-10004,-9952,-9901,-9849,-9798,-9747,
-    -9695,-9644,-9592,-9541,-9490,-9438,-9387,-9336,
-    -9285,-9233,-9182,-9131,-9080,-9028,-8977,-8926,
-    -8875,-8824,-8772,-8721,-8670,-8619,-8568,-8517,
-    -8466,-8414,-8363,-8312,-8261,-8210,-8159,-8108,
-    -8057,-8006,-7955,-7904,-7853,-7802,-7751,-7700,
-    -7649,-7598,-7547,-7496,-7445,-7395,-7344,-7293,
-    -7242,-7191,-7140,-7089,-7038,-6988,-6937,-6886,
-    -6835,-6784,-6733,-6683,-6632,-6581,-6530,-6480,
-    -6429,-6378,-6327,-6277,-6226,-6175,-6124,-6074,
-    -6023,-5972,-5922,-5871,-5820,-5770,-5719,-5668,
-    -5618,-5567,-5517,-5466,-5415,-5365,-5314,-5264,
-    -5213,-5162,-5112,-5061,-5011,-4960,-4910,-4859,
-    -4808,-4758,-4707,-4657,-4606,-4556,-4505,-4455,
-    -4404,-4354,-4303,-4253,-4202,-4152,-4101,-4051,
-    -4001,-3950,-3900,-3849,-3799,-3748,-3698,-3648,
-    -3597,-3547,-3496,-3446,-3395,-3345,-3295,-3244,
-    -3194,-3144,-3093,-3043,-2992,-2942,-2892,-2841,
-    -2791,-2741,-2690,-2640,-2590,-2539,-2489,-2439,
-    -2388,-2338,-2288,-2237,-2187,-2137,-2086,-2036,
-    -1986,-1935,-1885,-1835,-1784,-1734,-1684,-1633,
-    -1583,-1533,-1483,-1432,-1382,-1332,-1281,-1231,
-    -1181,-1131,-1080,-1030,-980,-929,-879,-829,
-    -779,-728,-678,-628,-578,-527,-477,-427,
-    -376,-326,-276,-226,-175,-125,-75,-25,
-    25,75,125,175,226,276,326,376,
-    427,477,527,578,628,678,728,779,
-    829,879,929,980,1030,1080,1131,1181,
-    1231,1281,1332,1382,1432,1483,1533,1583,
-    1633,1684,1734,1784,1835,1885,1935,1986,
-    2036,2086,2137,2187,2237,2288,2338,2388,
-    2439,2489,2539,2590,2640,2690,2741,2791,
-    2841,2892,2942,2992,3043,3093,3144,3194,
-    3244,3295,3345,3395,3446,3496,3547,3597,
-    3648,3698,3748,3799,3849,3900,3950,4001,
-    4051,4101,4152,4202,4253,4303,4354,4404,
-    4455,4505,4556,4606,4657,4707,4758,4808,
-    4859,4910,4960,5011,5061,5112,5162,5213,
-    5264,5314,5365,5415,5466,5517,5567,5618,
-    5668,5719,5770,5820,5871,5922,5972,6023,
-    6074,6124,6175,6226,6277,6327,6378,6429,
-    6480,6530,6581,6632,6683,6733,6784,6835,
-    6886,6937,6988,7038,7089,7140,7191,7242,
-    7293,7344,7395,7445,7496,7547,7598,7649,
-    7700,7751,7802,7853,7904,7955,8006,8057,
-    8108,8159,8210,8261,8312,8363,8414,8466,
-    8517,8568,8619,8670,8721,8772,8824,8875,
-    8926,8977,9028,9080,9131,9182,9233,9285,
-    9336,9387,9438,9490,9541,9592,9644,9695,
-    9747,9798,9849,9901,9952,10004,10055,10106,
-    10158,10209,10261,10312,10364,10415,10467,10519,
-    10570,10622,10673,10725,10777,10828,10880,10931,
-    10983,11035,11086,11138,11190,11242,11293,11345,
-    11397,11449,11501,11552,11604,11656,11708,11760,
-    11812,11864,11916,11967,12019,12071,12123,12175,
-    12227,12279,12331,12383,12436,12488,12540,12592,
-    12644,12696,12748,12800,12853,12905,12957,13009,
-    13062,13114,13166,13218,13271,13323,13375,13428,
-    13480,13533,13585,13637,13690,13742,13795,13847,
-    13900,13952,14005,14057,14110,14163,14215,14268,
-    14321,14373,14426,14479,14531,14584,14637,14690,
-    14743,14795,14848,14901,14954,15007,15060,15113,
-    15166,15219,15272,15325,15378,15431,15484,15537,
-    15590,15643,15696,15749,15802,15856,15909,15962,
-    16015,16069,16122,16175,16229,16282,16335,16389,
-    16442,16496,16549,16603,16656,16710,16763,16817,
-    16870,16924,16977,17031,17085,17138,17192,17246,
-    17300,17353,17407,17461,17515,17569,17623,17677,
-    17731,17784,17838,17892,17946,18001,18055,18109,
-    18163,18217,18271,18325,18380,18434,18488,18542,
-    18597,18651,18705,18760,18814,18868,18923,18977,
-    19032,19086,19141,19195,19250,19305,19359,19414,
-    19469,19523,19578,19633,19688,19742,19797,19852,
-    19907,19962,20017,20072,20127,20182,20237,20292,
-    20347,20402,20457,20513,20568,20623,20678,20734,
-    20789,20844,20900,20955,21010,21066,21121,21177,
-    21232,21288,21343,21399,21455,21510,21566,21622,
-    21678,21733,21789,21845,21901,21957,22013,22069,
-    22125,22181,22237,22293,22349,22405,22461,22517,
-    22573,22630,22686,22742,22799,22855,22911,22968,
-    23024,23081,23137,23194,23250,23307,23364,23420,
-    23477,23534,23591,23647,23704,23761,23818,23875,
-    23932,23989,24046,24103,24160,24217,24274,24331,
-    24389,24446,24503,24560,24618,24675,24732,24790,
-    24847,24905,24962,25020,25078,25135,25193,25251,
-    25308,25366,25424,25482,25540,25598,25656,25714,
-    25772,25830,25888,25946,26004,26062,26120,26179,
-    26237,26295,26354,26412,26471,26529,26588,26646,
-    26705,26763,26822,26881,26940,26998,27057,27116,
-    27175,27234,27293,27352,27411,27470,27529,27588,
-    27647,27707,27766,27825,27884,27944,28003,28063,
-    28122,28182,28241,28301,28361,28420,28480,28540,
-    28600,28660,28719,28779,28839,28899,28959,29020,
-    29080,29140,29200,29260,29321,29381,29441,29502,
-    29562,29623,29683,29744,29805,29865,29926,29987,
-    30048,30108,30169,30230,30291,30352,30413,30474,
-    30536,30597,30658,30719,30781,30842,30904,30965,
-    31026,31088,31150,31211,31273,31335,31396,31458,
-    31520,31582,31644,31706,31768,31830,31892,31955,
-    32017,32079,32141,32204,32266,32329,32391,32454,
-    32516,32579,32642,32705,32767,32830,32893,32956,
-    33019,33082,33145,33208,33272,33335,33398,33461,
-    33525,33588,33652,33715,33779,33843,33906,33970,
-    34034,34098,34162,34225,34289,34354,34418,34482,
-    34546,34610,34675,34739,34803,34868,34932,34997,
-    35062,35126,35191,35256,35321,35385,35450,35515,
-    35580,35646,35711,35776,35841,35907,35972,36037,
-    36103,36168,36234,36300,36365,36431,36497,36563,
-    36629,36695,36761,36827,36893,36959,37026,37092,
-    37158,37225,37291,37358,37425,37491,37558,37625,
-    37692,37759,37826,37893,37960,38027,38094,38161,
-    38229,38296,38364,38431,38499,38566,38634,38702,
-    38770,38837,38905,38973,39042,39110,39178,39246,
-    39314,39383,39451,39520,39588,39657,39726,39794,
-    39863,39932,40001,40070,40139,40208,40278,40347,
-    40416,40486,40555,40625,40694,40764,40834,40904,
-    40973,41043,41113,41184,41254,41324,41394,41465,
-    41535,41605,41676,41747,41817,41888,41959,42030,
-    42101,42172,42243,42314,42385,42457,42528,42600,
-    42671,42743,42814,42886,42958,43030,43102,43174,
-    43246,43318,43390,43463,43535,43608,43680,43753,
-    43826,43898,43971,44044,44117,44190,44263,44337,
-    44410,44483,44557,44630,44704,44778,44851,44925,
-    44999,45073,45147,45221,45296,45370,45444,45519,
-    45593,45668,45743,45818,45892,45967,46042,46118,
-    46193,46268,46343,46419,46494,46570,46646,46721,
-    46797,46873,46949,47025,47102,47178,47254,47331,
-    47407,47484,47560,47637,47714,47791,47868,47945,
-    48022,48100,48177,48255,48332,48410,48488,48565,
-    48643,48721,48799,48878,48956,49034,49113,49191,
-    49270,49349,49427,49506,49585,49664,49744,49823,
-    49902,49982,50061,50141,50221,50300,50380,50460,
-    50540,50621,50701,50781,50862,50942,51023,51104,
-    51185,51266,51347,51428,51509,51591,51672,51754,
-    51835,51917,51999,52081,52163,52245,52327,52410,
-    52492,52575,52657,52740,52823,52906,52989,53072,
-    53156,53239,53322,53406,53490,53574,53657,53741,
-    53826,53910,53994,54079,54163,54248,54333,54417,
-    54502,54587,54673,54758,54843,54929,55015,55100,
-    55186,55272,55358,55444,55531,55617,55704,55790,
-    55877,55964,56051,56138,56225,56312,56400,56487,
-    56575,56663,56751,56839,56927,57015,57104,57192,
-    57281,57369,57458,57547,57636,57725,57815,57904,
-    57994,58083,58173,58263,58353,58443,58534,58624,
-    58715,58805,58896,58987,59078,59169,59261,59352,
-    59444,59535,59627,59719,59811,59903,59996,60088,
-    60181,60273,60366,60459,60552,60646,60739,60833,
-    60926,61020,61114,61208,61302,61396,61491,61585,
-    61680,61775,61870,61965,62060,62156,62251,62347,
-    62443,62539,62635,62731,62828,62924,63021,63118,
-    63215,63312,63409,63506,63604,63702,63799,63897,
-    63996,64094,64192,64291,64389,64488,64587,64687,
-    64786,64885,64985,65085,65185,65285,65385,65485,
-    65586,65686,65787,65888,65989,66091,66192,66294,
-    66396,66498,66600,66702,66804,66907,67010,67113,
-    67216,67319,67422,67526,67629,67733,67837,67942,
-    68046,68151,68255,68360,68465,68570,68676,68781,
-    68887,68993,69099,69205,69312,69418,69525,69632,
-    69739,69846,69954,70061,70169,70277,70385,70494,
-    70602,70711,70820,70929,71038,71147,71257,71367,
-    71477,71587,71697,71808,71918,72029,72140,72252,
-    72363,72475,72587,72699,72811,72923,73036,73149,
-    73262,73375,73488,73602,73715,73829,73944,74058,
-    74172,74287,74402,74517,74633,74748,74864,74980,
-    75096,75213,75329,75446,75563,75680,75797,75915,
-    76033,76151,76269,76388,76506,76625,76744,76864,
-    76983,77103,77223,77343,77463,77584,77705,77826,
-    77947,78068,78190,78312,78434,78557,78679,78802,
-    78925,79048,79172,79296,79420,79544,79668,79793,
-    79918,80043,80168,80294,80420,80546,80672,80799,
-    80925,81053,81180,81307,81435,81563,81691,81820,
-    81949,82078,82207,82336,82466,82596,82726,82857,
-    82987,83118,83250,83381,83513,83645,83777,83910,
-    84043,84176,84309,84443,84576,84710,84845,84980,
-    85114,85250,85385,85521,85657,85793,85930,86066,
-    86204,86341,86479,86616,86755,86893,87032,87171,
-    87310,87450,87590,87730,87871,88011,88152,88294,
-    88435,88577,88720,88862,89005,89148,89292,89435,
-    89579,89724,89868,90013,90158,90304,90450,90596,
-    90742,90889,91036,91184,91332,91480,91628,91777,
-    91926,92075,92225,92375,92525,92675,92826,92978,
-    93129,93281,93434,93586,93739,93892,94046,94200,
-    94354,94509,94664,94819,94975,95131,95287,95444,
-    95601,95758,95916,96074,96233,96391,96551,96710,
-    96870,97030,97191,97352,97513,97675,97837,98000,
-    98163,98326,98489,98653,98818,98982,99148,99313,
-    99479,99645,99812,99979,100146,100314,100482,100651,
-    100820,100990,101159,101330,101500,101671,101843,102015,
-    102187,102360,102533,102706,102880,103054,103229,103404,
-    103580,103756,103933,104109,104287,104465,104643,104821,
-    105000,105180,105360,105540,105721,105902,106084,106266,
-    106449,106632,106816,107000,107184,107369,107555,107741,
-    107927,108114,108301,108489,108677,108866,109055,109245,
-    109435,109626,109817,110008,110200,110393,110586,110780,
-    110974,111169,111364,111560,111756,111952,112150,112347,
-    112546,112744,112944,113143,113344,113545,113746,113948,
-    114151,114354,114557,114761,114966,115171,115377,115583,
-    115790,115998,116206,116414,116623,116833,117044,117254,
-    117466,117678,117891,118104,118318,118532,118747,118963,
-    119179,119396,119613,119831,120050,120269,120489,120709,
-    120930,121152,121374,121597,121821,122045,122270,122496,
-    122722,122949,123176,123404,123633,123863,124093,124324,
-    124555,124787,125020,125254,125488,125723,125959,126195,
-    126432,126669,126908,127147,127387,127627,127869,128111,
-    128353,128597,128841,129086,129332,129578,129825,130073,
-    130322,130571,130821,131072,131324,131576,131830,132084,
-    132339,132594,132851,133108,133366,133625,133884,134145,
-    134406,134668,134931,135195,135459,135725,135991,136258,
-    136526,136795,137065,137335,137607,137879,138152,138426,
-    138701,138977,139254,139532,139810,140090,140370,140651,
-    140934,141217,141501,141786,142072,142359,142647,142936,
-    143226,143517,143808,144101,144395,144690,144986,145282,
-    145580,145879,146179,146480,146782,147084,147388,147693,
-    148000,148307,148615,148924,149235,149546,149859,150172,
-    150487,150803,151120,151438,151757,152077,152399,152722,
-    153045,153370,153697,154024,154352,154682,155013,155345,
-    155678,156013,156349,156686,157024,157363,157704,158046,
-    158389,158734,159079,159427,159775,160125,160476,160828,
-    161182,161537,161893,162251,162610,162970,163332,163695,
-    164060,164426,164793,165162,165532,165904,166277,166651,
-    167027,167405,167784,168164,168546,168930,169315,169701,
-    170089,170479,170870,171263,171657,172053,172451,172850,
-    173251,173653,174057,174463,174870,175279,175690,176102,
-    176516,176932,177349,177769,178190,178612,179037,179463,
-    179891,180321,180753,181186,181622,182059,182498,182939,
-    183382,183827,184274,184722,185173,185625,186080,186536,
-    186995,187455,187918,188382,188849,189318,189789,190261,
-    190736,191213,191693,192174,192658,193143,193631,194122,
-    194614,195109,195606,196105,196606,197110,197616,198125,
-    198636,199149,199664,200182,200703,201226,201751,202279,
-    202809,203342,203878,204416,204956,205500,206045,206594,
-    207145,207699,208255,208815,209376,209941,210509,211079,
-    211652,212228,212807,213389,213973,214561,215151,215745,
-    216341,216941,217544,218149,218758,219370,219985,220603,
-    221225,221849,222477,223108,223743,224381,225022,225666,
-    226314,226966,227621,228279,228941,229606,230275,230948,
-    231624,232304,232988,233676,234367,235062,235761,236463,
-    237170,237881,238595,239314,240036,240763,241493,242228,
-    242967,243711,244458,245210,245966,246727,247492,248261,
-    249035,249813,250596,251384,252176,252973,253774,254581,
-    255392,256208,257029,257855,258686,259522,260363,261209,
-    262060,262917,263779,264646,265519,266397,267280,268169,
-    269064,269965,270871,271782,272700,273624,274553,275489,
-    276430,277378,278332,279292,280258,281231,282210,283195,
-    284188,285186,286192,287204,288223,289249,290282,291322,
-    292369,293423,294485,295554,296630,297714,298805,299904,
-    301011,302126,303248,304379,305517,306664,307819,308983,
-    310154,311335,312524,313721,314928,316143,317368,318601,
-    319844,321097,322358,323629,324910,326201,327502,328812,
-    330133,331464,332805,334157,335519,336892,338276,339671,
-    341078,342495,343924,345364,346816,348280,349756,351244,
-    352744,354257,355783,357321,358872,360436,362013,363604,
-    365208,366826,368459,370105,371765,373440,375130,376835,
-    378555,380290,382040,383807,385589,387387,389202,391034,
-    392882,394747,396630,398530,400448,402384,404338,406311,
-    408303,410314,412344,414395,416465,418555,420666,422798,
-    424951,427125,429321,431540,433781,436045,438332,440643,
-    442978,445337,447720,450129,452564,455024,457511,460024,
-    462565,465133,467730,470355,473009,475692,478406,481150,
-    483925,486732,489571,492443,495348,498287,501261,504269,
-    507313,510394,513512,516667,519861,523094,526366,529680,
-    533034,536431,539870,543354,546881,550455,554074,557741,
-    561456,565221,569035,572901,576818,580789,584815,588896,
-    593033,597229,601483,605798,610174,614613,619117,623686,
-    628323,633028,637803,642651,647572,652568,657640,662792,
-    668024,673338,678737,684223,689797,695462,701219,707072,
-    713023,719074,725227,731486,737853,744331,750922,757631,
-    764460,771411,778490,785699,793041,800521,808143,815910,
-    823827,831898,840127,848520,857081,865817,874730,883829,
-    893117,902602,912289,922186,932298,942633,953199,964003,
-    975054,986361,997931,1009774,1021901,1034322,1047046,1060087,
-    1073455,1087164,1101225,1115654,1130465,1145673,1161294,1177345,
-    1193846,1210813,1228269,1246234,1264730,1283783,1303416,1323658,
-    1344537,1366084,1388330,1411312,1435065,1459630,1485049,1511367,
-    1538632,1566898,1596220,1626658,1658278,1691149,1725348,1760956,
-    1798063,1836758,1877161,1919378,1963536,2009771,2058233,2109087,
-    2162516,2218719,2277919,2340362,2406322,2476104,2550052,2628549,
-    2712030,2800983,2895966,2997613,3106651,3223918,3350381,3487165,
-    3635590,3797206,3973855,4167737,4381502,4618375,4882318,5178251,
-    5512368,5892567,6329090,6835455,7429880,8137527,8994149,10052327,
-    11392683,13145455,15535599,18988036,24413316,34178904,56965752,170910304
+    -170910304, -56965752, -34178904, -24413316, -18988036, -15535599,
+    -13145455,  -11392683, -10052327, -8994149,  -8137527,  -7429880,
+    -6835455,   -6329090,  -5892567,  -5512368,  -5178251,  -4882318,
+    -4618375,   -4381502,  -4167737,  -3973855,  -3797206,  -3635590,
+    -3487165,   -3350381,  -3223918,  -3106651,  -2997613,  -2895966,
+    -2800983,   -2712030,  -2628549,  -2550052,  -2476104,  -2406322,
+    -2340362,   -2277919,  -2218719,  -2162516,  -2109087,  -2058233,
+    -2009771,   -1963536,  -1919378,  -1877161,  -1836758,  -1798063,
+    -1760956,   -1725348,  -1691149,  -1658278,  -1626658,  -1596220,
+    -1566898,   -1538632,  -1511367,  -1485049,  -1459630,  -1435065,
+    -1411312,   -1388330,  -1366084,  -1344537,  -1323658,  -1303416,
+    -1283783,   -1264730,  -1246234,  -1228269,  -1210813,  -1193846,
+    -1177345,   -1161294,  -1145673,  -1130465,  -1115654,  -1101225,
+    -1087164,   -1073455,  -1060087,  -1047046,  -1034322,  -1021901,
+    -1009774,   -997931,   -986361,   -975054,   -964003,   -953199,
+    -942633,    -932298,   -922186,   -912289,   -902602,   -893117,
+    -883829,    -874730,   -865817,   -857081,   -848520,   -840127,
+    -831898,    -823827,   -815910,   -808143,   -800521,   -793041,
+    -785699,    -778490,   -771411,   -764460,   -757631,   -750922,
+    -744331,    -737853,   -731486,   -725227,   -719074,   -713023,
+    -707072,    -701219,   -695462,   -689797,   -684223,   -678737,
+    -673338,    -668024,   -662792,   -657640,   -652568,   -647572,
+    -642651,    -637803,   -633028,   -628323,   -623686,   -619117,
+    -614613,    -610174,   -605798,   -601483,   -597229,   -593033,
+    -588896,    -584815,   -580789,   -576818,   -572901,   -569035,
+    -565221,    -561456,   -557741,   -554074,   -550455,   -546881,
+    -543354,    -539870,   -536431,   -533034,   -529680,   -526366,
+    -523094,    -519861,   -516667,   -513512,   -510394,   -507313,
+    -504269,    -501261,   -498287,   -495348,   -492443,   -489571,
+    -486732,    -483925,   -481150,   -478406,   -475692,   -473009,
+    -470355,    -467730,   -465133,   -462565,   -460024,   -457511,
+    -455024,    -452564,   -450129,   -447720,   -445337,   -442978,
+    -440643,    -438332,   -436045,   -433781,   -431540,   -429321,
+    -427125,    -424951,   -422798,   -420666,   -418555,   -416465,
+    -414395,    -412344,   -410314,   -408303,   -406311,   -404338,
+    -402384,    -400448,   -398530,   -396630,   -394747,   -392882,
+    -391034,    -389202,   -387387,   -385589,   -383807,   -382040,
+    -380290,    -378555,   -376835,   -375130,   -373440,   -371765,
+    -370105,    -368459,   -366826,   -365208,   -363604,   -362013,
+    -360436,    -358872,   -357321,   -355783,   -354257,   -352744,
+    -351244,    -349756,   -348280,   -346816,   -345364,   -343924,
+    -342495,    -341078,   -339671,   -338276,   -336892,   -335519,
+    -334157,    -332805,   -331464,   -330133,   -328812,   -327502,
+    -326201,    -324910,   -323629,   -322358,   -321097,   -319844,
+    -318601,    -317368,   -316143,   -314928,   -313721,   -312524,
+    -311335,    -310154,   -308983,   -307819,   -306664,   -305517,
+    -304379,    -303248,   -302126,   -301011,   -299904,   -298805,
+    -297714,    -296630,   -295554,   -294485,   -293423,   -292369,
+    -291322,    -290282,   -289249,   -288223,   -287204,   -286192,
+    -285186,    -284188,   -283195,   -282210,   -281231,   -280258,
+    -279292,    -278332,   -277378,   -276430,   -275489,   -274553,
+    -273624,    -272700,   -271782,   -270871,   -269965,   -269064,
+    -268169,    -267280,   -266397,   -265519,   -264646,   -263779,
+    -262917,    -262060,   -261209,   -260363,   -259522,   -258686,
+    -257855,    -257029,   -256208,   -255392,   -254581,   -253774,
+    -252973,    -252176,   -251384,   -250596,   -249813,   -249035,
+    -248261,    -247492,   -246727,   -245966,   -245210,   -244458,
+    -243711,    -242967,   -242228,   -241493,   -240763,   -240036,
+    -239314,    -238595,   -237881,   -237170,   -236463,   -235761,
+    -235062,    -234367,   -233676,   -232988,   -232304,   -231624,
+    -230948,    -230275,   -229606,   -228941,   -228279,   -227621,
+    -226966,    -226314,   -225666,   -225022,   -224381,   -223743,
+    -223108,    -222477,   -221849,   -221225,   -220603,   -219985,
+    -219370,    -218758,   -218149,   -217544,   -216941,   -216341,
+    -215745,    -215151,   -214561,   -213973,   -213389,   -212807,
+    -212228,    -211652,   -211079,   -210509,   -209941,   -209376,
+    -208815,    -208255,   -207699,   -207145,   -206594,   -206045,
+    -205500,    -204956,   -204416,   -203878,   -203342,   -202809,
+    -202279,    -201751,   -201226,   -200703,   -200182,   -199664,
+    -199149,    -198636,   -198125,   -197616,   -197110,   -196606,
+    -196105,    -195606,   -195109,   -194614,   -194122,   -193631,
+    -193143,    -192658,   -192174,   -191693,   -191213,   -190736,
+    -190261,    -189789,   -189318,   -188849,   -188382,   -187918,
+    -187455,    -186995,   -186536,   -186080,   -185625,   -185173,
+    -184722,    -184274,   -183827,   -183382,   -182939,   -182498,
+    -182059,    -181622,   -181186,   -180753,   -180321,   -179891,
+    -179463,    -179037,   -178612,   -178190,   -177769,   -177349,
+    -176932,    -176516,   -176102,   -175690,   -175279,   -174870,
+    -174463,    -174057,   -173653,   -173251,   -172850,   -172451,
+    -172053,    -171657,   -171263,   -170870,   -170479,   -170089,
+    -169701,    -169315,   -168930,   -168546,   -168164,   -167784,
+    -167405,    -167027,   -166651,   -166277,   -165904,   -165532,
+    -165162,    -164793,   -164426,   -164060,   -163695,   -163332,
+    -162970,    -162610,   -162251,   -161893,   -161537,   -161182,
+    -160828,    -160476,   -160125,   -159775,   -159427,   -159079,
+    -158734,    -158389,   -158046,   -157704,   -157363,   -157024,
+    -156686,    -156349,   -156013,   -155678,   -155345,   -155013,
+    -154682,    -154352,   -154024,   -153697,   -153370,   -153045,
+    -152722,    -152399,   -152077,   -151757,   -151438,   -151120,
+    -150803,    -150487,   -150172,   -149859,   -149546,   -149235,
+    -148924,    -148615,   -148307,   -148000,   -147693,   -147388,
+    -147084,    -146782,   -146480,   -146179,   -145879,   -145580,
+    -145282,    -144986,   -144690,   -144395,   -144101,   -143808,
+    -143517,    -143226,   -142936,   -142647,   -142359,   -142072,
+    -141786,    -141501,   -141217,   -140934,   -140651,   -140370,
+    -140090,    -139810,   -139532,   -139254,   -138977,   -138701,
+    -138426,    -138152,   -137879,   -137607,   -137335,   -137065,
+    -136795,    -136526,   -136258,   -135991,   -135725,   -135459,
+    -135195,    -134931,   -134668,   -134406,   -134145,   -133884,
+    -133625,    -133366,   -133108,   -132851,   -132594,   -132339,
+    -132084,    -131830,   -131576,   -131324,   -131072,   -130821,
+    -130571,    -130322,   -130073,   -129825,   -129578,   -129332,
+    -129086,    -128841,   -128597,   -128353,   -128111,   -127869,
+    -127627,    -127387,   -127147,   -126908,   -126669,   -126432,
+    -126195,    -125959,   -125723,   -125488,   -125254,   -125020,
+    -124787,    -124555,   -124324,   -124093,   -123863,   -123633,
+    -123404,    -123176,   -122949,   -122722,   -122496,   -122270,
+    -122045,    -121821,   -121597,   -121374,   -121152,   -120930,
+    -120709,    -120489,   -120269,   -120050,   -119831,   -119613,
+    -119396,    -119179,   -118963,   -118747,   -118532,   -118318,
+    -118104,    -117891,   -117678,   -117466,   -117254,   -117044,
+    -116833,    -116623,   -116414,   -116206,   -115998,   -115790,
+    -115583,    -115377,   -115171,   -114966,   -114761,   -114557,
+    -114354,    -114151,   -113948,   -113746,   -113545,   -113344,
+    -113143,    -112944,   -112744,   -112546,   -112347,   -112150,
+    -111952,    -111756,   -111560,   -111364,   -111169,   -110974,
+    -110780,    -110586,   -110393,   -110200,   -110008,   -109817,
+    -109626,    -109435,   -109245,   -109055,   -108866,   -108677,
+    -108489,    -108301,   -108114,   -107927,   -107741,   -107555,
+    -107369,    -107184,   -107000,   -106816,   -106632,   -106449,
+    -106266,    -106084,   -105902,   -105721,   -105540,   -105360,
+    -105180,    -105000,   -104821,   -104643,   -104465,   -104287,
+    -104109,    -103933,   -103756,   -103580,   -103404,   -103229,
+    -103054,    -102880,   -102706,   -102533,   -102360,   -102187,
+    -102015,    -101843,   -101671,   -101500,   -101330,   -101159,
+    -100990,    -100820,   -100651,   -100482,   -100314,   -100146,
+    -99979,     -99812,    -99645,    -99479,    -99313,    -99148,
+    -98982,     -98818,    -98653,    -98489,    -98326,    -98163,
+    -98000,     -97837,    -97675,    -97513,    -97352,    -97191,
+    -97030,     -96870,    -96710,    -96551,    -96391,    -96233,
+    -96074,     -95916,    -95758,    -95601,    -95444,    -95287,
+    -95131,     -94975,    -94819,    -94664,    -94509,    -94354,
+    -94200,     -94046,    -93892,    -93739,    -93586,    -93434,
+    -93281,     -93129,    -92978,    -92826,    -92675,    -92525,
+    -92375,     -92225,    -92075,    -91926,    -91777,    -91628,
+    -91480,     -91332,    -91184,    -91036,    -90889,    -90742,
+    -90596,     -90450,    -90304,    -90158,    -90013,    -89868,
+    -89724,     -89579,    -89435,    -89292,    -89148,    -89005,
+    -88862,     -88720,    -88577,    -88435,    -88294,    -88152,
+    -88011,     -87871,    -87730,    -87590,    -87450,    -87310,
+    -87171,     -87032,    -86893,    -86755,    -86616,    -86479,
+    -86341,     -86204,    -86066,    -85930,    -85793,    -85657,
+    -85521,     -85385,    -85250,    -85114,    -84980,    -84845,
+    -84710,     -84576,    -84443,    -84309,    -84176,    -84043,
+    -83910,     -83777,    -83645,    -83513,    -83381,    -83250,
+    -83118,     -82987,    -82857,    -82726,    -82596,    -82466,
+    -82336,     -82207,    -82078,    -81949,    -81820,    -81691,
+    -81563,     -81435,    -81307,    -81180,    -81053,    -80925,
+    -80799,     -80672,    -80546,    -80420,    -80294,    -80168,
+    -80043,     -79918,    -79793,    -79668,    -79544,    -79420,
+    -79296,     -79172,    -79048,    -78925,    -78802,    -78679,
+    -78557,     -78434,    -78312,    -78190,    -78068,    -77947,
+    -77826,     -77705,    -77584,    -77463,    -77343,    -77223,
+    -77103,     -76983,    -76864,    -76744,    -76625,    -76506,
+    -76388,     -76269,    -76151,    -76033,    -75915,    -75797,
+    -75680,     -75563,    -75446,    -75329,    -75213,    -75096,
+    -74980,     -74864,    -74748,    -74633,    -74517,    -74402,
+    -74287,     -74172,    -74058,    -73944,    -73829,    -73715,
+    -73602,     -73488,    -73375,    -73262,    -73149,    -73036,
+    -72923,     -72811,    -72699,    -72587,    -72475,    -72363,
+    -72252,     -72140,    -72029,    -71918,    -71808,    -71697,
+    -71587,     -71477,    -71367,    -71257,    -71147,    -71038,
+    -70929,     -70820,    -70711,    -70602,    -70494,    -70385,
+    -70277,     -70169,    -70061,    -69954,    -69846,    -69739,
+    -69632,     -69525,    -69418,    -69312,    -69205,    -69099,
+    -68993,     -68887,    -68781,    -68676,    -68570,    -68465,
+    -68360,     -68255,    -68151,    -68046,    -67942,    -67837,
+    -67733,     -67629,    -67526,    -67422,    -67319,    -67216,
+    -67113,     -67010,    -66907,    -66804,    -66702,    -66600,
+    -66498,     -66396,    -66294,    -66192,    -66091,    -65989,
+    -65888,     -65787,    -65686,    -65586,    -65485,    -65385,
+    -65285,     -65185,    -65085,    -64985,    -64885,    -64786,
+    -64687,     -64587,    -64488,    -64389,    -64291,    -64192,
+    -64094,     -63996,    -63897,    -63799,    -63702,    -63604,
+    -63506,     -63409,    -63312,    -63215,    -63118,    -63021,
+    -62924,     -62828,    -62731,    -62635,    -62539,    -62443,
+    -62347,     -62251,    -62156,    -62060,    -61965,    -61870,
+    -61775,     -61680,    -61585,    -61491,    -61396,    -61302,
+    -61208,     -61114,    -61020,    -60926,    -60833,    -60739,
+    -60646,     -60552,    -60459,    -60366,    -60273,    -60181,
+    -60088,     -59996,    -59903,    -59811,    -59719,    -59627,
+    -59535,     -59444,    -59352,    -59261,    -59169,    -59078,
+    -58987,     -58896,    -58805,    -58715,    -58624,    -58534,
+    -58443,     -58353,    -58263,    -58173,    -58083,    -57994,
+    -57904,     -57815,    -57725,    -57636,    -57547,    -57458,
+    -57369,     -57281,    -57192,    -57104,    -57015,    -56927,
+    -56839,     -56751,    -56663,    -56575,    -56487,    -56400,
+    -56312,     -56225,    -56138,    -56051,    -55964,    -55877,
+    -55790,     -55704,    -55617,    -55531,    -55444,    -55358,
+    -55272,     -55186,    -55100,    -55015,    -54929,    -54843,
+    -54758,     -54673,    -54587,    -54502,    -54417,    -54333,
+    -54248,     -54163,    -54079,    -53994,    -53910,    -53826,
+    -53741,     -53657,    -53574,    -53490,    -53406,    -53322,
+    -53239,     -53156,    -53072,    -52989,    -52906,    -52823,
+    -52740,     -52657,    -52575,    -52492,    -52410,    -52327,
+    -52245,     -52163,    -52081,    -51999,    -51917,    -51835,
+    -51754,     -51672,    -51591,    -51509,    -51428,    -51347,
+    -51266,     -51185,    -51104,    -51023,    -50942,    -50862,
+    -50781,     -50701,    -50621,    -50540,    -50460,    -50380,
+    -50300,     -50221,    -50141,    -50061,    -49982,    -49902,
+    -49823,     -49744,    -49664,    -49585,    -49506,    -49427,
+    -49349,     -49270,    -49191,    -49113,    -49034,    -48956,
+    -48878,     -48799,    -48721,    -48643,    -48565,    -48488,
+    -48410,     -48332,    -48255,    -48177,    -48100,    -48022,
+    -47945,     -47868,    -47791,    -47714,    -47637,    -47560,
+    -47484,     -47407,    -47331,    -47254,    -47178,    -47102,
+    -47025,     -46949,    -46873,    -46797,    -46721,    -46646,
+    -46570,     -46494,    -46419,    -46343,    -46268,    -46193,
+    -46118,     -46042,    -45967,    -45892,    -45818,    -45743,
+    -45668,     -45593,    -45519,    -45444,    -45370,    -45296,
+    -45221,     -45147,    -45073,    -44999,    -44925,    -44851,
+    -44778,     -44704,    -44630,    -44557,    -44483,    -44410,
+    -44337,     -44263,    -44190,    -44117,    -44044,    -43971,
+    -43898,     -43826,    -43753,    -43680,    -43608,    -43535,
+    -43463,     -43390,    -43318,    -43246,    -43174,    -43102,
+    -43030,     -42958,    -42886,    -42814,    -42743,    -42671,
+    -42600,     -42528,    -42457,    -42385,    -42314,    -42243,
+    -42172,     -42101,    -42030,    -41959,    -41888,    -41817,
+    -41747,     -41676,    -41605,    -41535,    -41465,    -41394,
+    -41324,     -41254,    -41184,    -41113,    -41043,    -40973,
+    -40904,     -40834,    -40764,    -40694,    -40625,    -40555,
+    -40486,     -40416,    -40347,    -40278,    -40208,    -40139,
+    -40070,     -40001,    -39932,    -39863,    -39794,    -39726,
+    -39657,     -39588,    -39520,    -39451,    -39383,    -39314,
+    -39246,     -39178,    -39110,    -39042,    -38973,    -38905,
+    -38837,     -38770,    -38702,    -38634,    -38566,    -38499,
+    -38431,     -38364,    -38296,    -38229,    -38161,    -38094,
+    -38027,     -37960,    -37893,    -37826,    -37759,    -37692,
+    -37625,     -37558,    -37491,    -37425,    -37358,    -37291,
+    -37225,     -37158,    -37092,    -37026,    -36959,    -36893,
+    -36827,     -36761,    -36695,    -36629,    -36563,    -36497,
+    -36431,     -36365,    -36300,    -36234,    -36168,    -36103,
+    -36037,     -35972,    -35907,    -35841,    -35776,    -35711,
+    -35646,     -35580,    -35515,    -35450,    -35385,    -35321,
+    -35256,     -35191,    -35126,    -35062,    -34997,    -34932,
+    -34868,     -34803,    -34739,    -34675,    -34610,    -34546,
+    -34482,     -34418,    -34354,    -34289,    -34225,    -34162,
+    -34098,     -34034,    -33970,    -33906,    -33843,    -33779,
+    -33715,     -33652,    -33588,    -33525,    -33461,    -33398,
+    -33335,     -33272,    -33208,    -33145,    -33082,    -33019,
+    -32956,     -32893,    -32830,    -32767,    -32705,    -32642,
+    -32579,     -32516,    -32454,    -32391,    -32329,    -32266,
+    -32204,     -32141,    -32079,    -32017,    -31955,    -31892,
+    -31830,     -31768,    -31706,    -31644,    -31582,    -31520,
+    -31458,     -31396,    -31335,    -31273,    -31211,    -31150,
+    -31088,     -31026,    -30965,    -30904,    -30842,    -30781,
+    -30719,     -30658,    -30597,    -30536,    -30474,    -30413,
+    -30352,     -30291,    -30230,    -30169,    -30108,    -30048,
+    -29987,     -29926,    -29865,    -29805,    -29744,    -29683,
+    -29623,     -29562,    -29502,    -29441,    -29381,    -29321,
+    -29260,     -29200,    -29140,    -29080,    -29020,    -28959,
+    -28899,     -28839,    -28779,    -28719,    -28660,    -28600,
+    -28540,     -28480,    -28420,    -28361,    -28301,    -28241,
+    -28182,     -28122,    -28063,    -28003,    -27944,    -27884,
+    -27825,     -27766,    -27707,    -27647,    -27588,    -27529,
+    -27470,     -27411,    -27352,    -27293,    -27234,    -27175,
+    -27116,     -27057,    -26998,    -26940,    -26881,    -26822,
+    -26763,     -26705,    -26646,    -26588,    -26529,    -26471,
+    -26412,     -26354,    -26295,    -26237,    -26179,    -26120,
+    -26062,     -26004,    -25946,    -25888,    -25830,    -25772,
+    -25714,     -25656,    -25598,    -25540,    -25482,    -25424,
+    -25366,     -25308,    -25251,    -25193,    -25135,    -25078,
+    -25020,     -24962,    -24905,    -24847,    -24790,    -24732,
+    -24675,     -24618,    -24560,    -24503,    -24446,    -24389,
+    -24331,     -24274,    -24217,    -24160,    -24103,    -24046,
+    -23989,     -23932,    -23875,    -23818,    -23761,    -23704,
+    -23647,     -23591,    -23534,    -23477,    -23420,    -23364,
+    -23307,     -23250,    -23194,    -23137,    -23081,    -23024,
+    -22968,     -22911,    -22855,    -22799,    -22742,    -22686,
+    -22630,     -22573,    -22517,    -22461,    -22405,    -22349,
+    -22293,     -22237,    -22181,    -22125,    -22069,    -22013,
+    -21957,     -21901,    -21845,    -21789,    -21733,    -21678,
+    -21622,     -21566,    -21510,    -21455,    -21399,    -21343,
+    -21288,     -21232,    -21177,    -21121,    -21066,    -21010,
+    -20955,     -20900,    -20844,    -20789,    -20734,    -20678,
+    -20623,     -20568,    -20513,    -20457,    -20402,    -20347,
+    -20292,     -20237,    -20182,    -20127,    -20072,    -20017,
+    -19962,     -19907,    -19852,    -19797,    -19742,    -19688,
+    -19633,     -19578,    -19523,    -19469,    -19414,    -19359,
+    -19305,     -19250,    -19195,    -19141,    -19086,    -19032,
+    -18977,     -18923,    -18868,    -18814,    -18760,    -18705,
+    -18651,     -18597,    -18542,    -18488,    -18434,    -18380,
+    -18325,     -18271,    -18217,    -18163,    -18109,    -18055,
+    -18001,     -17946,    -17892,    -17838,    -17784,    -17731,
+    -17677,     -17623,    -17569,    -17515,    -17461,    -17407,
+    -17353,     -17300,    -17246,    -17192,    -17138,    -17085,
+    -17031,     -16977,    -16924,    -16870,    -16817,    -16763,
+    -16710,     -16656,    -16603,    -16549,    -16496,    -16442,
+    -16389,     -16335,    -16282,    -16229,    -16175,    -16122,
+    -16069,     -16015,    -15962,    -15909,    -15856,    -15802,
+    -15749,     -15696,    -15643,    -15590,    -15537,    -15484,
+    -15431,     -15378,    -15325,    -15272,    -15219,    -15166,
+    -15113,     -15060,    -15007,    -14954,    -14901,    -14848,
+    -14795,     -14743,    -14690,    -14637,    -14584,    -14531,
+    -14479,     -14426,    -14373,    -14321,    -14268,    -14215,
+    -14163,     -14110,    -14057,    -14005,    -13952,    -13900,
+    -13847,     -13795,    -13742,    -13690,    -13637,    -13585,
+    -13533,     -13480,    -13428,    -13375,    -13323,    -13271,
+    -13218,     -13166,    -13114,    -13062,    -13009,    -12957,
+    -12905,     -12853,    -12800,    -12748,    -12696,    -12644,
+    -12592,     -12540,    -12488,    -12436,    -12383,    -12331,
+    -12279,     -12227,    -12175,    -12123,    -12071,    -12019,
+    -11967,     -11916,    -11864,    -11812,    -11760,    -11708,
+    -11656,     -11604,    -11552,    -11501,    -11449,    -11397,
+    -11345,     -11293,    -11242,    -11190,    -11138,    -11086,
+    -11035,     -10983,    -10931,    -10880,    -10828,    -10777,
+    -10725,     -10673,    -10622,    -10570,    -10519,    -10467,
+    -10415,     -10364,    -10312,    -10261,    -10209,    -10158,
+    -10106,     -10055,    -10004,    -9952,     -9901,     -9849,
+    -9798,      -9747,     -9695,     -9644,     -9592,     -9541,
+    -9490,      -9438,     -9387,     -9336,     -9285,     -9233,
+    -9182,      -9131,     -9080,     -9028,     -8977,     -8926,
+    -8875,      -8824,     -8772,     -8721,     -8670,     -8619,
+    -8568,      -8517,     -8466,     -8414,     -8363,     -8312,
+    -8261,      -8210,     -8159,     -8108,     -8057,     -8006,
+    -7955,      -7904,     -7853,     -7802,     -7751,     -7700,
+    -7649,      -7598,     -7547,     -7496,     -7445,     -7395,
+    -7344,      -7293,     -7242,     -7191,     -7140,     -7089,
+    -7038,      -6988,     -6937,     -6886,     -6835,     -6784,
+    -6733,      -6683,     -6632,     -6581,     -6530,     -6480,
+    -6429,      -6378,     -6327,     -6277,     -6226,     -6175,
+    -6124,      -6074,     -6023,     -5972,     -5922,     -5871,
+    -5820,      -5770,     -5719,     -5668,     -5618,     -5567,
+    -5517,      -5466,     -5415,     -5365,     -5314,     -5264,
+    -5213,      -5162,     -5112,     -5061,     -5011,     -4960,
+    -4910,      -4859,     -4808,     -4758,     -4707,     -4657,
+    -4606,      -4556,     -4505,     -4455,     -4404,     -4354,
+    -4303,      -4253,     -4202,     -4152,     -4101,     -4051,
+    -4001,      -3950,     -3900,     -3849,     -3799,     -3748,
+    -3698,      -3648,     -3597,     -3547,     -3496,     -3446,
+    -3395,      -3345,     -3295,     -3244,     -3194,     -3144,
+    -3093,      -3043,     -2992,     -2942,     -2892,     -2841,
+    -2791,      -2741,     -2690,     -2640,     -2590,     -2539,
+    -2489,      -2439,     -2388,     -2338,     -2288,     -2237,
+    -2187,      -2137,     -2086,     -2036,     -1986,     -1935,
+    -1885,      -1835,     -1784,     -1734,     -1684,     -1633,
+    -1583,      -1533,     -1483,     -1432,     -1382,     -1332,
+    -1281,      -1231,     -1181,     -1131,     -1080,     -1030,
+    -980,       -929,      -879,      -829,      -779,      -728,
+    -678,       -628,      -578,      -527,      -477,      -427,
+    -376,       -326,      -276,      -226,      -175,      -125,
+    -75,        -25,       25,        75,        125,       175,
+    226,        276,       326,       376,       427,       477,
+    527,        578,       628,       678,       728,       779,
+    829,        879,       929,       980,       1030,      1080,
+    1131,       1181,      1231,      1281,      1332,      1382,
+    1432,       1483,      1533,      1583,      1633,      1684,
+    1734,       1784,      1835,      1885,      1935,      1986,
+    2036,       2086,      2137,      2187,      2237,      2288,
+    2338,       2388,      2439,      2489,      2539,      2590,
+    2640,       2690,      2741,      2791,      2841,      2892,
+    2942,       2992,      3043,      3093,      3144,      3194,
+    3244,       3295,      3345,      3395,      3446,      3496,
+    3547,       3597,      3648,      3698,      3748,      3799,
+    3849,       3900,      3950,      4001,      4051,      4101,
+    4152,       4202,      4253,      4303,      4354,      4404,
+    4455,       4505,      4556,      4606,      4657,      4707,
+    4758,       4808,      4859,      4910,      4960,      5011,
+    5061,       5112,      5162,      5213,      5264,      5314,
+    5365,       5415,      5466,      5517,      5567,      5618,
+    5668,       5719,      5770,      5820,      5871,      5922,
+    5972,       6023,      6074,      6124,      6175,      6226,
+    6277,       6327,      6378,      6429,      6480,      6530,
+    6581,       6632,      6683,      6733,      6784,      6835,
+    6886,       6937,      6988,      7038,      7089,      7140,
+    7191,       7242,      7293,      7344,      7395,      7445,
+    7496,       7547,      7598,      7649,      7700,      7751,
+    7802,       7853,      7904,      7955,      8006,      8057,
+    8108,       8159,      8210,      8261,      8312,      8363,
+    8414,       8466,      8517,      8568,      8619,      8670,
+    8721,       8772,      8824,      8875,      8926,      8977,
+    9028,       9080,      9131,      9182,      9233,      9285,
+    9336,       9387,      9438,      9490,      9541,      9592,
+    9644,       9695,      9747,      9798,      9849,      9901,
+    9952,       10004,     10055,     10106,     10158,     10209,
+    10261,      10312,     10364,     10415,     10467,     10519,
+    10570,      10622,     10673,     10725,     10777,     10828,
+    10880,      10931,     10983,     11035,     11086,     11138,
+    11190,      11242,     11293,     11345,     11397,     11449,
+    11501,      11552,     11604,     11656,     11708,     11760,
+    11812,      11864,     11916,     11967,     12019,     12071,
+    12123,      12175,     12227,     12279,     12331,     12383,
+    12436,      12488,     12540,     12592,     12644,     12696,
+    12748,      12800,     12853,     12905,     12957,     13009,
+    13062,      13114,     13166,     13218,     13271,     13323,
+    13375,      13428,     13480,     13533,     13585,     13637,
+    13690,      13742,     13795,     13847,     13900,     13952,
+    14005,      14057,     14110,     14163,     14215,     14268,
+    14321,      14373,     14426,     14479,     14531,     14584,
+    14637,      14690,     14743,     14795,     14848,     14901,
+    14954,      15007,     15060,     15113,     15166,     15219,
+    15272,      15325,     15378,     15431,     15484,     15537,
+    15590,      15643,     15696,     15749,     15802,     15856,
+    15909,      15962,     16015,     16069,     16122,     16175,
+    16229,      16282,     16335,     16389,     16442,     16496,
+    16549,      16603,     16656,     16710,     16763,     16817,
+    16870,      16924,     16977,     17031,     17085,     17138,
+    17192,      17246,     17300,     17353,     17407,     17461,
+    17515,      17569,     17623,     17677,     17731,     17784,
+    17838,      17892,     17946,     18001,     18055,     18109,
+    18163,      18217,     18271,     18325,     18380,     18434,
+    18488,      18542,     18597,     18651,     18705,     18760,
+    18814,      18868,     18923,     18977,     19032,     19086,
+    19141,      19195,     19250,     19305,     19359,     19414,
+    19469,      19523,     19578,     19633,     19688,     19742,
+    19797,      19852,     19907,     19962,     20017,     20072,
+    20127,      20182,     20237,     20292,     20347,     20402,
+    20457,      20513,     20568,     20623,     20678,     20734,
+    20789,      20844,     20900,     20955,     21010,     21066,
+    21121,      21177,     21232,     21288,     21343,     21399,
+    21455,      21510,     21566,     21622,     21678,     21733,
+    21789,      21845,     21901,     21957,     22013,     22069,
+    22125,      22181,     22237,     22293,     22349,     22405,
+    22461,      22517,     22573,     22630,     22686,     22742,
+    22799,      22855,     22911,     22968,     23024,     23081,
+    23137,      23194,     23250,     23307,     23364,     23420,
+    23477,      23534,     23591,     23647,     23704,     23761,
+    23818,      23875,     23932,     23989,     24046,     24103,
+    24160,      24217,     24274,     24331,     24389,     24446,
+    24503,      24560,     24618,     24675,     24732,     24790,
+    24847,      24905,     24962,     25020,     25078,     25135,
+    25193,      25251,     25308,     25366,     25424,     25482,
+    25540,      25598,     25656,     25714,     25772,     25830,
+    25888,      25946,     26004,     26062,     26120,     26179,
+    26237,      26295,     26354,     26412,     26471,     26529,
+    26588,      26646,     26705,     26763,     26822,     26881,
+    26940,      26998,     27057,     27116,     27175,     27234,
+    27293,      27352,     27411,     27470,     27529,     27588,
+    27647,      27707,     27766,     27825,     27884,     27944,
+    28003,      28063,     28122,     28182,     28241,     28301,
+    28361,      28420,     28480,     28540,     28600,     28660,
+    28719,      28779,     28839,     28899,     28959,     29020,
+    29080,      29140,     29200,     29260,     29321,     29381,
+    29441,      29502,     29562,     29623,     29683,     29744,
+    29805,      29865,     29926,     29987,     30048,     30108,
+    30169,      30230,     30291,     30352,     30413,     30474,
+    30536,      30597,     30658,     30719,     30781,     30842,
+    30904,      30965,     31026,     31088,     31150,     31211,
+    31273,      31335,     31396,     31458,     31520,     31582,
+    31644,      31706,     31768,     31830,     31892,     31955,
+    32017,      32079,     32141,     32204,     32266,     32329,
+    32391,      32454,     32516,     32579,     32642,     32705,
+    32767,      32830,     32893,     32956,     33019,     33082,
+    33145,      33208,     33272,     33335,     33398,     33461,
+    33525,      33588,     33652,     33715,     33779,     33843,
+    33906,      33970,     34034,     34098,     34162,     34225,
+    34289,      34354,     34418,     34482,     34546,     34610,
+    34675,      34739,     34803,     34868,     34932,     34997,
+    35062,      35126,     35191,     35256,     35321,     35385,
+    35450,      35515,     35580,     35646,     35711,     35776,
+    35841,      35907,     35972,     36037,     36103,     36168,
+    36234,      36300,     36365,     36431,     36497,     36563,
+    36629,      36695,     36761,     36827,     36893,     36959,
+    37026,      37092,     37158,     37225,     37291,     37358,
+    37425,      37491,     37558,     37625,     37692,     37759,
+    37826,      37893,     37960,     38027,     38094,     38161,
+    38229,      38296,     38364,     38431,     38499,     38566,
+    38634,      38702,     38770,     38837,     38905,     38973,
+    39042,      39110,     39178,     39246,     39314,     39383,
+    39451,      39520,     39588,     39657,     39726,     39794,
+    39863,      39932,     40001,     40070,     40139,     40208,
+    40278,      40347,     40416,     40486,     40555,     40625,
+    40694,      40764,     40834,     40904,     40973,     41043,
+    41113,      41184,     41254,     41324,     41394,     41465,
+    41535,      41605,     41676,     41747,     41817,     41888,
+    41959,      42030,     42101,     42172,     42243,     42314,
+    42385,      42457,     42528,     42600,     42671,     42743,
+    42814,      42886,     42958,     43030,     43102,     43174,
+    43246,      43318,     43390,     43463,     43535,     43608,
+    43680,      43753,     43826,     43898,     43971,     44044,
+    44117,      44190,     44263,     44337,     44410,     44483,
+    44557,      44630,     44704,     44778,     44851,     44925,
+    44999,      45073,     45147,     45221,     45296,     45370,
+    45444,      45519,     45593,     45668,     45743,     45818,
+    45892,      45967,     46042,     46118,     46193,     46268,
+    46343,      46419,     46494,     46570,     46646,     46721,
+    46797,      46873,     46949,     47025,     47102,     47178,
+    47254,      47331,     47407,     47484,     47560,     47637,
+    47714,      47791,     47868,     47945,     48022,     48100,
+    48177,      48255,     48332,     48410,     48488,     48565,
+    48643,      48721,     48799,     48878,     48956,     49034,
+    49113,      49191,     49270,     49349,     49427,     49506,
+    49585,      49664,     49744,     49823,     49902,     49982,
+    50061,      50141,     50221,     50300,     50380,     50460,
+    50540,      50621,     50701,     50781,     50862,     50942,
+    51023,      51104,     51185,     51266,     51347,     51428,
+    51509,      51591,     51672,     51754,     51835,     51917,
+    51999,      52081,     52163,     52245,     52327,     52410,
+    52492,      52575,     52657,     52740,     52823,     52906,
+    52989,      53072,     53156,     53239,     53322,     53406,
+    53490,      53574,     53657,     53741,     53826,     53910,
+    53994,      54079,     54163,     54248,     54333,     54417,
+    54502,      54587,     54673,     54758,     54843,     54929,
+    55015,      55100,     55186,     55272,     55358,     55444,
+    55531,      55617,     55704,     55790,     55877,     55964,
+    56051,      56138,     56225,     56312,     56400,     56487,
+    56575,      56663,     56751,     56839,     56927,     57015,
+    57104,      57192,     57281,     57369,     57458,     57547,
+    57636,      57725,     57815,     57904,     57994,     58083,
+    58173,      58263,     58353,     58443,     58534,     58624,
+    58715,      58805,     58896,     58987,     59078,     59169,
+    59261,      59352,     59444,     59535,     59627,     59719,
+    59811,      59903,     59996,     60088,     60181,     60273,
+    60366,      60459,     60552,     60646,     60739,     60833,
+    60926,      61020,     61114,     61208,     61302,     61396,
+    61491,      61585,     61680,     61775,     61870,     61965,
+    62060,      62156,     62251,     62347,     62443,     62539,
+    62635,      62731,     62828,     62924,     63021,     63118,
+    63215,      63312,     63409,     63506,     63604,     63702,
+    63799,      63897,     63996,     64094,     64192,     64291,
+    64389,      64488,     64587,     64687,     64786,     64885,
+    64985,      65085,     65185,     65285,     65385,     65485,
+    65586,      65686,     65787,     65888,     65989,     66091,
+    66192,      66294,     66396,     66498,     66600,     66702,
+    66804,      66907,     67010,     67113,     67216,     67319,
+    67422,      67526,     67629,     67733,     67837,     67942,
+    68046,      68151,     68255,     68360,     68465,     68570,
+    68676,      68781,     68887,     68993,     69099,     69205,
+    69312,      69418,     69525,     69632,     69739,     69846,
+    69954,      70061,     70169,     70277,     70385,     70494,
+    70602,      70711,     70820,     70929,     71038,     71147,
+    71257,      71367,     71477,     71587,     71697,     71808,
+    71918,      72029,     72140,     72252,     72363,     72475,
+    72587,      72699,     72811,     72923,     73036,     73149,
+    73262,      73375,     73488,     73602,     73715,     73829,
+    73944,      74058,     74172,     74287,     74402,     74517,
+    74633,      74748,     74864,     74980,     75096,     75213,
+    75329,      75446,     75563,     75680,     75797,     75915,
+    76033,      76151,     76269,     76388,     76506,     76625,
+    76744,      76864,     76983,     77103,     77223,     77343,
+    77463,      77584,     77705,     77826,     77947,     78068,
+    78190,      78312,     78434,     78557,     78679,     78802,
+    78925,      79048,     79172,     79296,     79420,     79544,
+    79668,      79793,     79918,     80043,     80168,     80294,
+    80420,      80546,     80672,     80799,     80925,     81053,
+    81180,      81307,     81435,     81563,     81691,     81820,
+    81949,      82078,     82207,     82336,     82466,     82596,
+    82726,      82857,     82987,     83118,     83250,     83381,
+    83513,      83645,     83777,     83910,     84043,     84176,
+    84309,      84443,     84576,     84710,     84845,     84980,
+    85114,      85250,     85385,     85521,     85657,     85793,
+    85930,      86066,     86204,     86341,     86479,     86616,
+    86755,      86893,     87032,     87171,     87310,     87450,
+    87590,      87730,     87871,     88011,     88152,     88294,
+    88435,      88577,     88720,     88862,     89005,     89148,
+    89292,      89435,     89579,     89724,     89868,     90013,
+    90158,      90304,     90450,     90596,     90742,     90889,
+    91036,      91184,     91332,     91480,     91628,     91777,
+    91926,      92075,     92225,     92375,     92525,     92675,
+    92826,      92978,     93129,     93281,     93434,     93586,
+    93739,      93892,     94046,     94200,     94354,     94509,
+    94664,      94819,     94975,     95131,     95287,     95444,
+    95601,      95758,     95916,     96074,     96233,     96391,
+    96551,      96710,     96870,     97030,     97191,     97352,
+    97513,      97675,     97837,     98000,     98163,     98326,
+    98489,      98653,     98818,     98982,     99148,     99313,
+    99479,      99645,     99812,     99979,     100146,    100314,
+    100482,     100651,    100820,    100990,    101159,    101330,
+    101500,     101671,    101843,    102015,    102187,    102360,
+    102533,     102706,    102880,    103054,    103229,    103404,
+    103580,     103756,    103933,    104109,    104287,    104465,
+    104643,     104821,    105000,    105180,    105360,    105540,
+    105721,     105902,    106084,    106266,    106449,    106632,
+    106816,     107000,    107184,    107369,    107555,    107741,
+    107927,     108114,    108301,    108489,    108677,    108866,
+    109055,     109245,    109435,    109626,    109817,    110008,
+    110200,     110393,    110586,    110780,    110974,    111169,
+    111364,     111560,    111756,    111952,    112150,    112347,
+    112546,     112744,    112944,    113143,    113344,    113545,
+    113746,     113948,    114151,    114354,    114557,    114761,
+    114966,     115171,    115377,    115583,    115790,    115998,
+    116206,     116414,    116623,    116833,    117044,    117254,
+    117466,     117678,    117891,    118104,    118318,    118532,
+    118747,     118963,    119179,    119396,    119613,    119831,
+    120050,     120269,    120489,    120709,    120930,    121152,
+    121374,     121597,    121821,    122045,    122270,    122496,
+    122722,     122949,    123176,    123404,    123633,    123863,
+    124093,     124324,    124555,    124787,    125020,    125254,
+    125488,     125723,    125959,    126195,    126432,    126669,
+    126908,     127147,    127387,    127627,    127869,    128111,
+    128353,     128597,    128841,    129086,    129332,    129578,
+    129825,     130073,    130322,    130571,    130821,    131072,
+    131324,     131576,    131830,    132084,    132339,    132594,
+    132851,     133108,    133366,    133625,    133884,    134145,
+    134406,     134668,    134931,    135195,    135459,    135725,
+    135991,     136258,    136526,    136795,    137065,    137335,
+    137607,     137879,    138152,    138426,    138701,    138977,
+    139254,     139532,    139810,    140090,    140370,    140651,
+    140934,     141217,    141501,    141786,    142072,    142359,
+    142647,     142936,    143226,    143517,    143808,    144101,
+    144395,     144690,    144986,    145282,    145580,    145879,
+    146179,     146480,    146782,    147084,    147388,    147693,
+    148000,     148307,    148615,    148924,    149235,    149546,
+    149859,     150172,    150487,    150803,    151120,    151438,
+    151757,     152077,    152399,    152722,    153045,    153370,
+    153697,     154024,    154352,    154682,    155013,    155345,
+    155678,     156013,    156349,    156686,    157024,    157363,
+    157704,     158046,    158389,    158734,    159079,    159427,
+    159775,     160125,    160476,    160828,    161182,    161537,
+    161893,     162251,    162610,    162970,    163332,    163695,
+    164060,     164426,    164793,    165162,    165532,    165904,
+    166277,     166651,    167027,    167405,    167784,    168164,
+    168546,     168930,    169315,    169701,    170089,    170479,
+    170870,     171263,    171657,    172053,    172451,    172850,
+    173251,     173653,    174057,    174463,    174870,    175279,
+    175690,     176102,    176516,    176932,    177349,    177769,
+    178190,     178612,    179037,    179463,    179891,    180321,
+    180753,     181186,    181622,    182059,    182498,    182939,
+    183382,     183827,    184274,    184722,    185173,    185625,
+    186080,     186536,    186995,    187455,    187918,    188382,
+    188849,     189318,    189789,    190261,    190736,    191213,
+    191693,     192174,    192658,    193143,    193631,    194122,
+    194614,     195109,    195606,    196105,    196606,    197110,
+    197616,     198125,    198636,    199149,    199664,    200182,
+    200703,     201226,    201751,    202279,    202809,    203342,
+    203878,     204416,    204956,    205500,    206045,    206594,
+    207145,     207699,    208255,    208815,    209376,    209941,
+    210509,     211079,    211652,    212228,    212807,    213389,
+    213973,     214561,    215151,    215745,    216341,    216941,
+    217544,     218149,    218758,    219370,    219985,    220603,
+    221225,     221849,    222477,    223108,    223743,    224381,
+    225022,     225666,    226314,    226966,    227621,    228279,
+    228941,     229606,    230275,    230948,    231624,    232304,
+    232988,     233676,    234367,    235062,    235761,    236463,
+    237170,     237881,    238595,    239314,    240036,    240763,
+    241493,     242228,    242967,    243711,    244458,    245210,
+    245966,     246727,    247492,    248261,    249035,    249813,
+    250596,     251384,    252176,    252973,    253774,    254581,
+    255392,     256208,    257029,    257855,    258686,    259522,
+    260363,     261209,    262060,    262917,    263779,    264646,
+    265519,     266397,    267280,    268169,    269064,    269965,
+    270871,     271782,    272700,    273624,    274553,    275489,
+    276430,     277378,    278332,    279292,    280258,    281231,
+    282210,     283195,    284188,    285186,    286192,    287204,
+    288223,     289249,    290282,    291322,    292369,    293423,
+    294485,     295554,    296630,    297714,    298805,    299904,
+    301011,     302126,    303248,    304379,    305517,    306664,
+    307819,     308983,    310154,    311335,    312524,    313721,
+    314928,     316143,    317368,    318601,    319844,    321097,
+    322358,     323629,    324910,    326201,    327502,    328812,
+    330133,     331464,    332805,    334157,    335519,    336892,
+    338276,     339671,    341078,    342495,    343924,    345364,
+    346816,     348280,    349756,    351244,    352744,    354257,
+    355783,     357321,    358872,    360436,    362013,    363604,
+    365208,     366826,    368459,    370105,    371765,    373440,
+    375130,     376835,    378555,    380290,    382040,    383807,
+    385589,     387387,    389202,    391034,    392882,    394747,
+    396630,     398530,    400448,    402384,    404338,    406311,
+    408303,     410314,    412344,    414395,    416465,    418555,
+    420666,     422798,    424951,    427125,    429321,    431540,
+    433781,     436045,    438332,    440643,    442978,    445337,
+    447720,     450129,    452564,    455024,    457511,    460024,
+    462565,     465133,    467730,    470355,    473009,    475692,
+    478406,     481150,    483925,    486732,    489571,    492443,
+    495348,     498287,    501261,    504269,    507313,    510394,
+    513512,     516667,    519861,    523094,    526366,    529680,
+    533034,     536431,    539870,    543354,    546881,    550455,
+    554074,     557741,    561456,    565221,    569035,    572901,
+    576818,     580789,    584815,    588896,    593033,    597229,
+    601483,     605798,    610174,    614613,    619117,    623686,
+    628323,     633028,    637803,    642651,    647572,    652568,
+    657640,     662792,    668024,    673338,    678737,    684223,
+    689797,     695462,    701219,    707072,    713023,    719074,
+    725227,     731486,    737853,    744331,    750922,    757631,
+    764460,     771411,    778490,    785699,    793041,    800521,
+    808143,     815910,    823827,    831898,    840127,    848520,
+    857081,     865817,    874730,    883829,    893117,    902602,
+    912289,     922186,    932298,    942633,    953199,    964003,
+    975054,     986361,    997931,    1009774,   1021901,   1034322,
+    1047046,    1060087,   1073455,   1087164,   1101225,   1115654,
+    1130465,    1145673,   1161294,   1177345,   1193846,   1210813,
+    1228269,    1246234,   1264730,   1283783,   1303416,   1323658,
+    1344537,    1366084,   1388330,   1411312,   1435065,   1459630,
+    1485049,    1511367,   1538632,   1566898,   1596220,   1626658,
+    1658278,    1691149,   1725348,   1760956,   1798063,   1836758,
+    1877161,    1919378,   1963536,   2009771,   2058233,   2109087,
+    2162516,    2218719,   2277919,   2340362,   2406322,   2476104,
+    2550052,    2628549,   2712030,   2800983,   2895966,   2997613,
+    3106651,    3223918,   3350381,   3487165,   3635590,   3797206,
+    3973855,    4167737,   4381502,   4618375,   4882318,   5178251,
+    5512368,    5892567,   6329090,   6835455,   7429880,   8137527,
+    8994149,    10052327,  11392683,  13145455,  15535599,  18988036,
+    24413316,   34178904,  56965752,  170910304,
 };
 
-
 const fixed_t finesine[10240] =
 {
-    25,75,125,175,226,276,326,376,
-    427,477,527,578,628,678,728,779,
-    829,879,929,980,1030,1080,1130,1181,
-    1231,1281,1331,1382,1432,1482,1532,1583,
-    1633,1683,1733,1784,1834,1884,1934,1985,
-    2035,2085,2135,2186,2236,2286,2336,2387,
-    2437,2487,2537,2587,2638,2688,2738,2788,
-    2839,2889,2939,2989,3039,3090,3140,3190,
-    3240,3291,3341,3391,3441,3491,3541,3592,
-    3642,3692,3742,3792,3843,3893,3943,3993,
-    4043,4093,4144,4194,4244,4294,4344,4394,
-    4445,4495,4545,4595,4645,4695,4745,4796,
-    4846,4896,4946,4996,5046,5096,5146,5197,
-    5247,5297,5347,5397,5447,5497,5547,5597,
-    5647,5697,5748,5798,5848,5898,5948,5998,
-    6048,6098,6148,6198,6248,6298,6348,6398,
-    6448,6498,6548,6598,6648,6698,6748,6798,
-    6848,6898,6948,6998,7048,7098,7148,7198,
-    7248,7298,7348,7398,7448,7498,7548,7598,
-    7648,7697,7747,7797,7847,7897,7947,7997,
-    8047,8097,8147,8196,8246,8296,8346,8396,
-    8446,8496,8545,8595,8645,8695,8745,8794,
-    8844,8894,8944,8994,9043,9093,9143,9193,
-    9243,9292,9342,9392,9442,9491,9541,9591,
-    9640,9690,9740,9790,9839,9889,9939,9988,
-    10038,10088,10137,10187,10237,10286,10336,10386,
-    10435,10485,10534,10584,10634,10683,10733,10782,
-    10832,10882,10931,10981,11030,11080,11129,11179,
-    11228,11278,11327,11377,11426,11476,11525,11575,
-    11624,11674,11723,11773,11822,11872,11921,11970,
-    12020,12069,12119,12168,12218,12267,12316,12366,
-    12415,12464,12514,12563,12612,12662,12711,12760,
-    12810,12859,12908,12957,13007,13056,13105,13154,
-    13204,13253,13302,13351,13401,13450,13499,13548,
-    13597,13647,13696,13745,13794,13843,13892,13941,
-    13990,14040,14089,14138,14187,14236,14285,14334,
-    14383,14432,14481,14530,14579,14628,14677,14726,
-    14775,14824,14873,14922,14971,15020,15069,15118,
-    15167,15215,15264,15313,15362,15411,15460,15509,
-    15557,15606,15655,15704,15753,15802,15850,15899,
-    15948,15997,16045,16094,16143,16191,16240,16289,
-    16338,16386,16435,16484,16532,16581,16629,16678,
-    16727,16775,16824,16872,16921,16970,17018,17067,
-    17115,17164,17212,17261,17309,17358,17406,17455,
-    17503,17551,17600,17648,17697,17745,17793,17842,
-    17890,17939,17987,18035,18084,18132,18180,18228,
-    18277,18325,18373,18421,18470,18518,18566,18614,
-    18663,18711,18759,18807,18855,18903,18951,19000,
-    19048,19096,19144,19192,19240,19288,19336,19384,
-    19432,19480,19528,19576,19624,19672,19720,19768,
-    19816,19864,19912,19959,20007,20055,20103,20151,
-    20199,20246,20294,20342,20390,20438,20485,20533,
-    20581,20629,20676,20724,20772,20819,20867,20915,
-    20962,21010,21057,21105,21153,21200,21248,21295,
-    21343,21390,21438,21485,21533,21580,21628,21675,
-    21723,21770,21817,21865,21912,21960,22007,22054,
-    22102,22149,22196,22243,22291,22338,22385,22433,
-    22480,22527,22574,22621,22668,22716,22763,22810,
-    22857,22904,22951,22998,23045,23092,23139,23186,
-    23233,23280,23327,23374,23421,23468,23515,23562,
-    23609,23656,23703,23750,23796,23843,23890,23937,
-    23984,24030,24077,24124,24171,24217,24264,24311,
-    24357,24404,24451,24497,24544,24591,24637,24684,
-    24730,24777,24823,24870,24916,24963,25009,25056,
-    25102,25149,25195,25241,25288,25334,25381,25427,
-    25473,25520,25566,25612,25658,25705,25751,25797,
-    25843,25889,25936,25982,26028,26074,26120,26166,
-    26212,26258,26304,26350,26396,26442,26488,26534,
-    26580,26626,26672,26718,26764,26810,26856,26902,
-    26947,26993,27039,27085,27131,27176,27222,27268,
-    27313,27359,27405,27450,27496,27542,27587,27633,
-    27678,27724,27770,27815,27861,27906,27952,27997,
-    28042,28088,28133,28179,28224,28269,28315,28360,
-    28405,28451,28496,28541,28586,28632,28677,28722,
-    28767,28812,28858,28903,28948,28993,29038,29083,
-    29128,29173,29218,29263,29308,29353,29398,29443,
-    29488,29533,29577,29622,29667,29712,29757,29801,
-    29846,29891,29936,29980,30025,30070,30114,30159,
-    30204,30248,30293,30337,30382,30426,30471,30515,
-    30560,30604,30649,30693,30738,30782,30826,30871,
-    30915,30959,31004,31048,31092,31136,31181,31225,
-    31269,31313,31357,31402,31446,31490,31534,31578,
-    31622,31666,31710,31754,31798,31842,31886,31930,
-    31974,32017,32061,32105,32149,32193,32236,32280,
-    32324,32368,32411,32455,32499,32542,32586,32630,
-    32673,32717,32760,32804,32847,32891,32934,32978,
-    33021,33065,33108,33151,33195,33238,33281,33325,
-    33368,33411,33454,33498,33541,33584,33627,33670,
-    33713,33756,33799,33843,33886,33929,33972,34015,
-    34057,34100,34143,34186,34229,34272,34315,34358,
-    34400,34443,34486,34529,34571,34614,34657,34699,
-    34742,34785,34827,34870,34912,34955,34997,35040,
-    35082,35125,35167,35210,35252,35294,35337,35379,
-    35421,35464,35506,35548,35590,35633,35675,35717,
-    35759,35801,35843,35885,35927,35969,36011,36053,
-    36095,36137,36179,36221,36263,36305,36347,36388,
-    36430,36472,36514,36555,36597,36639,36681,36722,
-    36764,36805,36847,36889,36930,36972,37013,37055,
-    37096,37137,37179,37220,37262,37303,37344,37386,
-    37427,37468,37509,37551,37592,37633,37674,37715,
-    37756,37797,37838,37879,37920,37961,38002,38043,
-    38084,38125,38166,38207,38248,38288,38329,38370,
-    38411,38451,38492,38533,38573,38614,38655,38695,
-    38736,38776,38817,38857,38898,38938,38979,39019,
-    39059,39100,39140,39180,39221,39261,39301,39341,
-    39382,39422,39462,39502,39542,39582,39622,39662,
-    39702,39742,39782,39822,39862,39902,39942,39982,
-    40021,40061,40101,40141,40180,40220,40260,40300,
-    40339,40379,40418,40458,40497,40537,40576,40616,
-    40655,40695,40734,40773,40813,40852,40891,40931,
-    40970,41009,41048,41087,41127,41166,41205,41244,
-    41283,41322,41361,41400,41439,41478,41517,41556,
-    41595,41633,41672,41711,41750,41788,41827,41866,
-    41904,41943,41982,42020,42059,42097,42136,42174,
-    42213,42251,42290,42328,42366,42405,42443,42481,
-    42520,42558,42596,42634,42672,42711,42749,42787,
-    42825,42863,42901,42939,42977,43015,43053,43091,
-    43128,43166,43204,43242,43280,43317,43355,43393,
-    43430,43468,43506,43543,43581,43618,43656,43693,
-    43731,43768,43806,43843,43880,43918,43955,43992,
-    44029,44067,44104,44141,44178,44215,44252,44289,
-    44326,44363,44400,44437,44474,44511,44548,44585,
-    44622,44659,44695,44732,44769,44806,44842,44879,
-    44915,44952,44989,45025,45062,45098,45135,45171,
-    45207,45244,45280,45316,45353,45389,45425,45462,
-    45498,45534,45570,45606,45642,45678,45714,45750,
-    45786,45822,45858,45894,45930,45966,46002,46037,
-    46073,46109,46145,46180,46216,46252,46287,46323,
-    46358,46394,46429,46465,46500,46536,46571,46606,
-    46642,46677,46712,46747,46783,46818,46853,46888,
-    46923,46958,46993,47028,47063,47098,47133,47168,
-    47203,47238,47273,47308,47342,47377,47412,47446,
-    47481,47516,47550,47585,47619,47654,47688,47723,
-    47757,47792,47826,47860,47895,47929,47963,47998,
-    48032,48066,48100,48134,48168,48202,48237,48271,
-    48305,48338,48372,48406,48440,48474,48508,48542,
-    48575,48609,48643,48676,48710,48744,48777,48811,
-    48844,48878,48911,48945,48978,49012,49045,49078,
-    49112,49145,49178,49211,49244,49278,49311,49344,
-    49377,49410,49443,49476,49509,49542,49575,49608,
-    49640,49673,49706,49739,49771,49804,49837,49869,
-    49902,49935,49967,50000,50032,50065,50097,50129,
-    50162,50194,50226,50259,50291,50323,50355,50387,
-    50420,50452,50484,50516,50548,50580,50612,50644,
-    50675,50707,50739,50771,50803,50834,50866,50898,
-    50929,50961,50993,51024,51056,51087,51119,51150,
-    51182,51213,51244,51276,51307,51338,51369,51401,
-    51432,51463,51494,51525,51556,51587,51618,51649,
-    51680,51711,51742,51773,51803,51834,51865,51896,
-    51926,51957,51988,52018,52049,52079,52110,52140,
-    52171,52201,52231,52262,52292,52322,52353,52383,
-    52413,52443,52473,52503,52534,52564,52594,52624,
-    52653,52683,52713,52743,52773,52803,52832,52862,
-    52892,52922,52951,52981,53010,53040,53069,53099,
-    53128,53158,53187,53216,53246,53275,53304,53334,
-    53363,53392,53421,53450,53479,53508,53537,53566,
-    53595,53624,53653,53682,53711,53739,53768,53797,
-    53826,53854,53883,53911,53940,53969,53997,54026,
-    54054,54082,54111,54139,54167,54196,54224,54252,
-    54280,54308,54337,54365,54393,54421,54449,54477,
-    54505,54533,54560,54588,54616,54644,54672,54699,
-    54727,54755,54782,54810,54837,54865,54892,54920,
-    54947,54974,55002,55029,55056,55084,55111,55138,
-    55165,55192,55219,55246,55274,55300,55327,55354,
-    55381,55408,55435,55462,55489,55515,55542,55569,
-    55595,55622,55648,55675,55701,55728,55754,55781,
-    55807,55833,55860,55886,55912,55938,55965,55991,
-    56017,56043,56069,56095,56121,56147,56173,56199,
-    56225,56250,56276,56302,56328,56353,56379,56404,
-    56430,56456,56481,56507,56532,56557,56583,56608,
-    56633,56659,56684,56709,56734,56760,56785,56810,
-    56835,56860,56885,56910,56935,56959,56984,57009,
-    57034,57059,57083,57108,57133,57157,57182,57206,
-    57231,57255,57280,57304,57329,57353,57377,57402,
-    57426,57450,57474,57498,57522,57546,57570,57594,
-    57618,57642,57666,57690,57714,57738,57762,57785,
-    57809,57833,57856,57880,57903,57927,57950,57974,
-    57997,58021,58044,58067,58091,58114,58137,58160,
-    58183,58207,58230,58253,58276,58299,58322,58345,
-    58367,58390,58413,58436,58459,58481,58504,58527,
-    58549,58572,58594,58617,58639,58662,58684,58706,
-    58729,58751,58773,58795,58818,58840,58862,58884,
-    58906,58928,58950,58972,58994,59016,59038,59059,
-    59081,59103,59125,59146,59168,59190,59211,59233,
-    59254,59276,59297,59318,59340,59361,59382,59404,
-    59425,59446,59467,59488,59509,59530,59551,59572,
-    59593,59614,59635,59656,59677,59697,59718,59739,
-    59759,59780,59801,59821,59842,59862,59883,59903,
-    59923,59944,59964,59984,60004,60025,60045,60065,
-    60085,60105,60125,60145,60165,60185,60205,60225,
-    60244,60264,60284,60304,60323,60343,60363,60382,
-    60402,60421,60441,60460,60479,60499,60518,60537,
-    60556,60576,60595,60614,60633,60652,60671,60690,
-    60709,60728,60747,60766,60785,60803,60822,60841,
-    60859,60878,60897,60915,60934,60952,60971,60989,
-    61007,61026,61044,61062,61081,61099,61117,61135,
-    61153,61171,61189,61207,61225,61243,61261,61279,
-    61297,61314,61332,61350,61367,61385,61403,61420,
-    61438,61455,61473,61490,61507,61525,61542,61559,
-    61577,61594,61611,61628,61645,61662,61679,61696,
-    61713,61730,61747,61764,61780,61797,61814,61831,
-    61847,61864,61880,61897,61913,61930,61946,61963,
-    61979,61995,62012,62028,62044,62060,62076,62092,
-    62108,62125,62141,62156,62172,62188,62204,62220,
-    62236,62251,62267,62283,62298,62314,62329,62345,
-    62360,62376,62391,62407,62422,62437,62453,62468,
-    62483,62498,62513,62528,62543,62558,62573,62588,
-    62603,62618,62633,62648,62662,62677,62692,62706,
-    62721,62735,62750,62764,62779,62793,62808,62822,
-    62836,62850,62865,62879,62893,62907,62921,62935,
-    62949,62963,62977,62991,63005,63019,63032,63046,
-    63060,63074,63087,63101,63114,63128,63141,63155,
-    63168,63182,63195,63208,63221,63235,63248,63261,
-    63274,63287,63300,63313,63326,63339,63352,63365,
-    63378,63390,63403,63416,63429,63441,63454,63466,
-    63479,63491,63504,63516,63528,63541,63553,63565,
-    63578,63590,63602,63614,63626,63638,63650,63662,
-    63674,63686,63698,63709,63721,63733,63745,63756,
-    63768,63779,63791,63803,63814,63825,63837,63848,
-    63859,63871,63882,63893,63904,63915,63927,63938,
-    63949,63960,63971,63981,63992,64003,64014,64025,
-    64035,64046,64057,64067,64078,64088,64099,64109,
-    64120,64130,64140,64151,64161,64171,64181,64192,
-    64202,64212,64222,64232,64242,64252,64261,64271,
-    64281,64291,64301,64310,64320,64330,64339,64349,
-    64358,64368,64377,64387,64396,64405,64414,64424,
-    64433,64442,64451,64460,64469,64478,64487,64496,
-    64505,64514,64523,64532,64540,64549,64558,64566,
-    64575,64584,64592,64601,64609,64617,64626,64634,
-    64642,64651,64659,64667,64675,64683,64691,64699,
-    64707,64715,64723,64731,64739,64747,64754,64762,
-    64770,64777,64785,64793,64800,64808,64815,64822,
-    64830,64837,64844,64852,64859,64866,64873,64880,
-    64887,64895,64902,64908,64915,64922,64929,64936,
-    64943,64949,64956,64963,64969,64976,64982,64989,
-    64995,65002,65008,65015,65021,65027,65033,65040,
-    65046,65052,65058,65064,65070,65076,65082,65088,
-    65094,65099,65105,65111,65117,65122,65128,65133,
-    65139,65144,65150,65155,65161,65166,65171,65177,
-    65182,65187,65192,65197,65202,65207,65212,65217,
-    65222,65227,65232,65237,65242,65246,65251,65256,
-    65260,65265,65270,65274,65279,65283,65287,65292,
-    65296,65300,65305,65309,65313,65317,65321,65325,
-    65329,65333,65337,65341,65345,65349,65352,65356,
-    65360,65363,65367,65371,65374,65378,65381,65385,
-    65388,65391,65395,65398,65401,65404,65408,65411,
-    65414,65417,65420,65423,65426,65429,65431,65434,
-    65437,65440,65442,65445,65448,65450,65453,65455,
-    65458,65460,65463,65465,65467,65470,65472,65474,
-    65476,65478,65480,65482,65484,65486,65488,65490,
-    65492,65494,65496,65497,65499,65501,65502,65504,
-    65505,65507,65508,65510,65511,65513,65514,65515,
-    65516,65518,65519,65520,65521,65522,65523,65524,
-    65525,65526,65527,65527,65528,65529,65530,65530,
-    65531,65531,65532,65532,65533,65533,65534,65534,
-    65534,65535,65535,65535,65535,65535,65535,65535,
-    65535,65535,65535,65535,65535,65535,65535,65534,
-    65534,65534,65533,65533,65532,65532,65531,65531,
-    65530,65530,65529,65528,65527,65527,65526,65525,
-    65524,65523,65522,65521,65520,65519,65518,65516,
-    65515,65514,65513,65511,65510,65508,65507,65505,
-    65504,65502,65501,65499,65497,65496,65494,65492,
-    65490,65488,65486,65484,65482,65480,65478,65476,
-    65474,65472,65470,65467,65465,65463,65460,65458,
-    65455,65453,65450,65448,65445,65442,65440,65437,
-    65434,65431,65429,65426,65423,65420,65417,65414,
-    65411,65408,65404,65401,65398,65395,65391,65388,
-    65385,65381,65378,65374,65371,65367,65363,65360,
-    65356,65352,65349,65345,65341,65337,65333,65329,
-    65325,65321,65317,65313,65309,65305,65300,65296,
-    65292,65287,65283,65279,65274,65270,65265,65260,
-    65256,65251,65246,65242,65237,65232,65227,65222,
-    65217,65212,65207,65202,65197,65192,65187,65182,
-    65177,65171,65166,65161,65155,65150,65144,65139,
-    65133,65128,65122,65117,65111,65105,65099,65094,
-    65088,65082,65076,65070,65064,65058,65052,65046,
-    65040,65033,65027,65021,65015,65008,65002,64995,
-    64989,64982,64976,64969,64963,64956,64949,64943,
-    64936,64929,64922,64915,64908,64902,64895,64887,
-    64880,64873,64866,64859,64852,64844,64837,64830,
-    64822,64815,64808,64800,64793,64785,64777,64770,
-    64762,64754,64747,64739,64731,64723,64715,64707,
-    64699,64691,64683,64675,64667,64659,64651,64642,
-    64634,64626,64617,64609,64600,64592,64584,64575,
-    64566,64558,64549,64540,64532,64523,64514,64505,
-    64496,64487,64478,64469,64460,64451,64442,64433,
-    64424,64414,64405,64396,64387,64377,64368,64358,
-    64349,64339,64330,64320,64310,64301,64291,64281,
-    64271,64261,64252,64242,64232,64222,64212,64202,
-    64192,64181,64171,64161,64151,64140,64130,64120,
-    64109,64099,64088,64078,64067,64057,64046,64035,
-    64025,64014,64003,63992,63981,63971,63960,63949,
-    63938,63927,63915,63904,63893,63882,63871,63859,
-    63848,63837,63825,63814,63803,63791,63779,63768,
-    63756,63745,63733,63721,63709,63698,63686,63674,
-    63662,63650,63638,63626,63614,63602,63590,63578,
-    63565,63553,63541,63528,63516,63504,63491,63479,
-    63466,63454,63441,63429,63416,63403,63390,63378,
-    63365,63352,63339,63326,63313,63300,63287,63274,
-    63261,63248,63235,63221,63208,63195,63182,63168,
-    63155,63141,63128,63114,63101,63087,63074,63060,
-    63046,63032,63019,63005,62991,62977,62963,62949,
-    62935,62921,62907,62893,62879,62865,62850,62836,
-    62822,62808,62793,62779,62764,62750,62735,62721,
-    62706,62692,62677,62662,62648,62633,62618,62603,
-    62588,62573,62558,62543,62528,62513,62498,62483,
-    62468,62453,62437,62422,62407,62391,62376,62360,
-    62345,62329,62314,62298,62283,62267,62251,62236,
-    62220,62204,62188,62172,62156,62141,62125,62108,
-    62092,62076,62060,62044,62028,62012,61995,61979,
-    61963,61946,61930,61913,61897,61880,61864,61847,
-    61831,61814,61797,61780,61764,61747,61730,61713,
-    61696,61679,61662,61645,61628,61611,61594,61577,
-    61559,61542,61525,61507,61490,61473,61455,61438,
-    61420,61403,61385,61367,61350,61332,61314,61297,
-    61279,61261,61243,61225,61207,61189,61171,61153,
-    61135,61117,61099,61081,61062,61044,61026,61007,
-    60989,60971,60952,60934,60915,60897,60878,60859,
-    60841,60822,60803,60785,60766,60747,60728,60709,
-    60690,60671,60652,60633,60614,60595,60576,60556,
-    60537,60518,60499,60479,60460,60441,60421,60402,
-    60382,60363,60343,60323,60304,60284,60264,60244,
-    60225,60205,60185,60165,60145,60125,60105,60085,
-    60065,60045,60025,60004,59984,59964,59944,59923,
-    59903,59883,59862,59842,59821,59801,59780,59759,
-    59739,59718,59697,59677,59656,59635,59614,59593,
-    59572,59551,59530,59509,59488,59467,59446,59425,
-    59404,59382,59361,59340,59318,59297,59276,59254,
-    59233,59211,59190,59168,59146,59125,59103,59081,
-    59059,59038,59016,58994,58972,58950,58928,58906,
-    58884,58862,58840,58818,58795,58773,58751,58729,
-    58706,58684,58662,58639,58617,58594,58572,58549,
-    58527,58504,58481,58459,58436,58413,58390,58367,
-    58345,58322,58299,58276,58253,58230,58207,58183,
-    58160,58137,58114,58091,58067,58044,58021,57997,
-    57974,57950,57927,57903,57880,57856,57833,57809,
-    57785,57762,57738,57714,57690,57666,57642,57618,
-    57594,57570,57546,57522,57498,57474,57450,57426,
-    57402,57377,57353,57329,57304,57280,57255,57231,
-    57206,57182,57157,57133,57108,57083,57059,57034,
-    57009,56984,56959,56935,56910,56885,56860,56835,
-    56810,56785,56760,56734,56709,56684,56659,56633,
-    56608,56583,56557,56532,56507,56481,56456,56430,
-    56404,56379,56353,56328,56302,56276,56250,56225,
-    56199,56173,56147,56121,56095,56069,56043,56017,
-    55991,55965,55938,55912,55886,55860,55833,55807,
-    55781,55754,55728,55701,55675,55648,55622,55595,
-    55569,55542,55515,55489,55462,55435,55408,55381,
-    55354,55327,55300,55274,55246,55219,55192,55165,
-    55138,55111,55084,55056,55029,55002,54974,54947,
-    54920,54892,54865,54837,54810,54782,54755,54727,
-    54699,54672,54644,54616,54588,54560,54533,54505,
-    54477,54449,54421,54393,54365,54337,54308,54280,
-    54252,54224,54196,54167,54139,54111,54082,54054,
-    54026,53997,53969,53940,53911,53883,53854,53826,
-    53797,53768,53739,53711,53682,53653,53624,53595,
-    53566,53537,53508,53479,53450,53421,53392,53363,
-    53334,53304,53275,53246,53216,53187,53158,53128,
-    53099,53069,53040,53010,52981,52951,52922,52892,
-    52862,52832,52803,52773,52743,52713,52683,52653,
-    52624,52594,52564,52534,52503,52473,52443,52413,
-    52383,52353,52322,52292,52262,52231,52201,52171,
-    52140,52110,52079,52049,52018,51988,51957,51926,
-    51896,51865,51834,51803,51773,51742,51711,51680,
-    51649,51618,51587,51556,51525,51494,51463,51432,
-    51401,51369,51338,51307,51276,51244,51213,51182,
-    51150,51119,51087,51056,51024,50993,50961,50929,
-    50898,50866,50834,50803,50771,50739,50707,50675,
-    50644,50612,50580,50548,50516,50484,50452,50420,
-    50387,50355,50323,50291,50259,50226,50194,50162,
-    50129,50097,50065,50032,50000,49967,49935,49902,
-    49869,49837,49804,49771,49739,49706,49673,49640,
-    49608,49575,49542,49509,49476,49443,49410,49377,
-    49344,49311,49278,49244,49211,49178,49145,49112,
-    49078,49045,49012,48978,48945,48911,48878,48844,
-    48811,48777,48744,48710,48676,48643,48609,48575,
-    48542,48508,48474,48440,48406,48372,48338,48304,
-    48271,48237,48202,48168,48134,48100,48066,48032,
-    47998,47963,47929,47895,47860,47826,47792,47757,
-    47723,47688,47654,47619,47585,47550,47516,47481,
-    47446,47412,47377,47342,47308,47273,47238,47203,
-    47168,47133,47098,47063,47028,46993,46958,46923,
-    46888,46853,46818,46783,46747,46712,46677,46642,
-    46606,46571,46536,46500,46465,46429,46394,46358,
-    46323,46287,46252,46216,46180,46145,46109,46073,
-    46037,46002,45966,45930,45894,45858,45822,45786,
-    45750,45714,45678,45642,45606,45570,45534,45498,
-    45462,45425,45389,45353,45316,45280,45244,45207,
-    45171,45135,45098,45062,45025,44989,44952,44915,
-    44879,44842,44806,44769,44732,44695,44659,44622,
-    44585,44548,44511,44474,44437,44400,44363,44326,
-    44289,44252,44215,44178,44141,44104,44067,44029,
-    43992,43955,43918,43880,43843,43806,43768,43731,
-    43693,43656,43618,43581,43543,43506,43468,43430,
-    43393,43355,43317,43280,43242,43204,43166,43128,
-    43091,43053,43015,42977,42939,42901,42863,42825,
-    42787,42749,42711,42672,42634,42596,42558,42520,
-    42481,42443,42405,42366,42328,42290,42251,42213,
-    42174,42136,42097,42059,42020,41982,41943,41904,
-    41866,41827,41788,41750,41711,41672,41633,41595,
-    41556,41517,41478,41439,41400,41361,41322,41283,
-    41244,41205,41166,41127,41088,41048,41009,40970,
-    40931,40891,40852,40813,40773,40734,40695,40655,
-    40616,40576,40537,40497,40458,40418,40379,40339,
-    40300,40260,40220,40180,40141,40101,40061,40021,
-    39982,39942,39902,39862,39822,39782,39742,39702,
-    39662,39622,39582,39542,39502,39462,39422,39382,
-    39341,39301,39261,39221,39180,39140,39100,39059,
-    39019,38979,38938,38898,38857,38817,38776,38736,
-    38695,38655,38614,38573,38533,38492,38451,38411,
-    38370,38329,38288,38248,38207,38166,38125,38084,
-    38043,38002,37961,37920,37879,37838,37797,37756,
-    37715,37674,37633,37592,37551,37509,37468,37427,
-    37386,37344,37303,37262,37220,37179,37137,37096,
-    37055,37013,36972,36930,36889,36847,36805,36764,
-    36722,36681,36639,36597,36556,36514,36472,36430,
-    36388,36347,36305,36263,36221,36179,36137,36095,
-    36053,36011,35969,35927,35885,35843,35801,35759,
-    35717,35675,35633,35590,35548,35506,35464,35421,
-    35379,35337,35294,35252,35210,35167,35125,35082,
-    35040,34997,34955,34912,34870,34827,34785,34742,
-    34699,34657,34614,34571,34529,34486,34443,34400,
-    34358,34315,34272,34229,34186,34143,34100,34057,
-    34015,33972,33929,33886,33843,33799,33756,33713,
-    33670,33627,33584,33541,33498,33454,33411,33368,
-    33325,33281,33238,33195,33151,33108,33065,33021,
-    32978,32934,32891,32847,32804,32760,32717,32673,
-    32630,32586,32542,32499,32455,32411,32368,32324,
-    32280,32236,32193,32149,32105,32061,32017,31974,
-    31930,31886,31842,31798,31754,31710,31666,31622,
-    31578,31534,31490,31446,31402,31357,31313,31269,
-    31225,31181,31136,31092,31048,31004,30959,30915,
-    30871,30826,30782,30738,30693,30649,30604,30560,
-    30515,30471,30426,30382,30337,30293,30248,30204,
-    30159,30114,30070,30025,29980,29936,29891,29846,
-    29801,29757,29712,29667,29622,29577,29533,29488,
-    29443,29398,29353,29308,29263,29218,29173,29128,
-    29083,29038,28993,28948,28903,28858,28812,28767,
-    28722,28677,28632,28586,28541,28496,28451,28405,
-    28360,28315,28269,28224,28179,28133,28088,28042,
-    27997,27952,27906,27861,27815,27770,27724,27678,
-    27633,27587,27542,27496,27450,27405,27359,27313,
-    27268,27222,27176,27131,27085,27039,26993,26947,
-    26902,26856,26810,26764,26718,26672,26626,26580,
-    26534,26488,26442,26396,26350,26304,26258,26212,
-    26166,26120,26074,26028,25982,25936,25889,25843,
-    25797,25751,25705,25658,25612,25566,25520,25473,
-    25427,25381,25334,25288,25241,25195,25149,25102,
-    25056,25009,24963,24916,24870,24823,24777,24730,
-    24684,24637,24591,24544,24497,24451,24404,24357,
-    24311,24264,24217,24171,24124,24077,24030,23984,
-    23937,23890,23843,23796,23750,23703,23656,23609,
-    23562,23515,23468,23421,23374,23327,23280,23233,
-    23186,23139,23092,23045,22998,22951,22904,22857,
-    22810,22763,22716,22668,22621,22574,22527,22480,
-    22433,22385,22338,22291,22243,22196,22149,22102,
-    22054,22007,21960,21912,21865,21817,21770,21723,
-    21675,21628,21580,21533,21485,21438,21390,21343,
-    21295,21248,21200,21153,21105,21057,21010,20962,
-    20915,20867,20819,20772,20724,20676,20629,20581,
-    20533,20485,20438,20390,20342,20294,20246,20199,
-    20151,20103,20055,20007,19959,19912,19864,19816,
-    19768,19720,19672,19624,19576,19528,19480,19432,
-    19384,19336,19288,19240,19192,19144,19096,19048,
-    19000,18951,18903,18855,18807,18759,18711,18663,
-    18614,18566,18518,18470,18421,18373,18325,18277,
-    18228,18180,18132,18084,18035,17987,17939,17890,
-    17842,17793,17745,17697,17648,17600,17551,17503,
-    17455,17406,17358,17309,17261,17212,17164,17115,
-    17067,17018,16970,16921,16872,16824,16775,16727,
-    16678,16629,16581,16532,16484,16435,16386,16338,
-    16289,16240,16191,16143,16094,16045,15997,15948,
-    15899,15850,15802,15753,15704,15655,15606,15557,
-    15509,15460,15411,15362,15313,15264,15215,15167,
-    15118,15069,15020,14971,14922,14873,14824,14775,
-    14726,14677,14628,14579,14530,14481,14432,14383,
-    14334,14285,14236,14187,14138,14089,14040,13990,
-    13941,13892,13843,13794,13745,13696,13646,13597,
-    13548,13499,13450,13401,13351,13302,13253,13204,
-    13154,13105,13056,13007,12957,12908,12859,12810,
-    12760,12711,12662,12612,12563,12514,12464,12415,
-    12366,12316,12267,12218,12168,12119,12069,12020,
-    11970,11921,11872,11822,11773,11723,11674,11624,
-    11575,11525,11476,11426,11377,11327,11278,11228,
-    11179,11129,11080,11030,10981,10931,10882,10832,
-    10782,10733,10683,10634,10584,10534,10485,10435,
-    10386,10336,10286,10237,10187,10137,10088,10038,
-    9988,9939,9889,9839,9790,9740,9690,9640,
-    9591,9541,9491,9442,9392,9342,9292,9243,
-    9193,9143,9093,9043,8994,8944,8894,8844,
-    8794,8745,8695,8645,8595,8545,8496,8446,
-    8396,8346,8296,8246,8196,8147,8097,8047,
-    7997,7947,7897,7847,7797,7747,7697,7648,
-    7598,7548,7498,7448,7398,7348,7298,7248,
-    7198,7148,7098,7048,6998,6948,6898,6848,
-    6798,6748,6698,6648,6598,6548,6498,6448,
-    6398,6348,6298,6248,6198,6148,6098,6048,
-    5998,5948,5898,5848,5798,5748,5697,5647,
-    5597,5547,5497,5447,5397,5347,5297,5247,
-    5197,5146,5096,5046,4996,4946,4896,4846,
-    4796,4745,4695,4645,4595,4545,4495,4445,
-    4394,4344,4294,4244,4194,4144,4093,4043,
-    3993,3943,3893,3843,3792,3742,3692,3642,
-    3592,3541,3491,3441,3391,3341,3291,3240,
-    3190,3140,3090,3039,2989,2939,2889,2839,
-    2788,2738,2688,2638,2587,2537,2487,2437,
-    2387,2336,2286,2236,2186,2135,2085,2035,
-    1985,1934,1884,1834,1784,1733,1683,1633,
-    1583,1532,1482,1432,1382,1331,1281,1231,
-    1181,1130,1080,1030,980,929,879,829,
-    779,728,678,628,578,527,477,427,
-    376,326,276,226,175,125,75,25,
-    -25,-75,-125,-175,-226,-276,-326,-376,
-    -427,-477,-527,-578,-628,-678,-728,-779,
-    -829,-879,-929,-980,-1030,-1080,-1130,-1181,
-    -1231,-1281,-1331,-1382,-1432,-1482,-1532,-1583,
-    -1633,-1683,-1733,-1784,-1834,-1884,-1934,-1985,
-    -2035,-2085,-2135,-2186,-2236,-2286,-2336,-2387,
-    -2437,-2487,-2537,-2588,-2638,-2688,-2738,-2788,
-    -2839,-2889,-2939,-2989,-3039,-3090,-3140,-3190,
-    -3240,-3291,-3341,-3391,-3441,-3491,-3541,-3592,
-    -3642,-3692,-3742,-3792,-3843,-3893,-3943,-3993,
-    -4043,-4093,-4144,-4194,-4244,-4294,-4344,-4394,
-    -4445,-4495,-4545,-4595,-4645,-4695,-4745,-4796,
-    -4846,-4896,-4946,-4996,-5046,-5096,-5146,-5197,
-    -5247,-5297,-5347,-5397,-5447,-5497,-5547,-5597,
-    -5647,-5697,-5748,-5798,-5848,-5898,-5948,-5998,
-    -6048,-6098,-6148,-6198,-6248,-6298,-6348,-6398,
-    -6448,-6498,-6548,-6598,-6648,-6698,-6748,-6798,
-    -6848,-6898,-6948,-6998,-7048,-7098,-7148,-7198,
-    -7248,-7298,-7348,-7398,-7448,-7498,-7548,-7598,
-    -7648,-7697,-7747,-7797,-7847,-7897,-7947,-7997,
-    -8047,-8097,-8147,-8196,-8246,-8296,-8346,-8396,
-    -8446,-8496,-8545,-8595,-8645,-8695,-8745,-8794,
-    -8844,-8894,-8944,-8994,-9043,-9093,-9143,-9193,
-    -9243,-9292,-9342,-9392,-9442,-9491,-9541,-9591,
-    -9640,-9690,-9740,-9790,-9839,-9889,-9939,-9988,
-    -10038,-10088,-10137,-10187,-10237,-10286,-10336,-10386,
-    -10435,-10485,-10534,-10584,-10634,-10683,-10733,-10782,
-    -10832,-10882,-10931,-10981,-11030,-11080,-11129,-11179,
-    -11228,-11278,-11327,-11377,-11426,-11476,-11525,-11575,
-    -11624,-11674,-11723,-11773,-11822,-11872,-11921,-11970,
-    -12020,-12069,-12119,-12168,-12218,-12267,-12316,-12366,
-    -12415,-12464,-12514,-12563,-12612,-12662,-12711,-12760,
-    -12810,-12859,-12908,-12957,-13007,-13056,-13105,-13154,
-    -13204,-13253,-13302,-13351,-13401,-13450,-13499,-13548,
-    -13597,-13647,-13696,-13745,-13794,-13843,-13892,-13941,
-    -13990,-14040,-14089,-14138,-14187,-14236,-14285,-14334,
-    -14383,-14432,-14481,-14530,-14579,-14628,-14677,-14726,
-    -14775,-14824,-14873,-14922,-14971,-15020,-15069,-15118,
-    -15167,-15215,-15264,-15313,-15362,-15411,-15460,-15509,
-    -15557,-15606,-15655,-15704,-15753,-15802,-15850,-15899,
-    -15948,-15997,-16045,-16094,-16143,-16191,-16240,-16289,
-    -16338,-16386,-16435,-16484,-16532,-16581,-16629,-16678,
-    -16727,-16775,-16824,-16872,-16921,-16970,-17018,-17067,
-    -17115,-17164,-17212,-17261,-17309,-17358,-17406,-17455,
-    -17503,-17551,-17600,-17648,-17697,-17745,-17793,-17842,
-    -17890,-17939,-17987,-18035,-18084,-18132,-18180,-18228,
-    -18277,-18325,-18373,-18421,-18470,-18518,-18566,-18614,
-    -18663,-18711,-18759,-18807,-18855,-18903,-18951,-19000,
-    -19048,-19096,-19144,-19192,-19240,-19288,-19336,-19384,
-    -19432,-19480,-19528,-19576,-19624,-19672,-19720,-19768,
-    -19816,-19864,-19912,-19959,-20007,-20055,-20103,-20151,
-    -20199,-20246,-20294,-20342,-20390,-20438,-20485,-20533,
-    -20581,-20629,-20676,-20724,-20772,-20819,-20867,-20915,
-    -20962,-21010,-21057,-21105,-21153,-21200,-21248,-21295,
-    -21343,-21390,-21438,-21485,-21533,-21580,-21628,-21675,
-    -21723,-21770,-21817,-21865,-21912,-21960,-22007,-22054,
-    -22102,-22149,-22196,-22243,-22291,-22338,-22385,-22433,
-    -22480,-22527,-22574,-22621,-22668,-22716,-22763,-22810,
-    -22857,-22904,-22951,-22998,-23045,-23092,-23139,-23186,
-    -23233,-23280,-23327,-23374,-23421,-23468,-23515,-23562,
-    -23609,-23656,-23703,-23750,-23796,-23843,-23890,-23937,
-    -23984,-24030,-24077,-24124,-24171,-24217,-24264,-24311,
-    -24357,-24404,-24451,-24497,-24544,-24591,-24637,-24684,
-    -24730,-24777,-24823,-24870,-24916,-24963,-25009,-25056,
-    -25102,-25149,-25195,-25241,-25288,-25334,-25381,-25427,
-    -25473,-25520,-25566,-25612,-25658,-25705,-25751,-25797,
-    -25843,-25889,-25936,-25982,-26028,-26074,-26120,-26166,
-    -26212,-26258,-26304,-26350,-26396,-26442,-26488,-26534,
-    -26580,-26626,-26672,-26718,-26764,-26810,-26856,-26902,
-    -26947,-26993,-27039,-27085,-27131,-27176,-27222,-27268,
-    -27313,-27359,-27405,-27450,-27496,-27542,-27587,-27633,
-    -27678,-27724,-27770,-27815,-27861,-27906,-27952,-27997,
-    -28042,-28088,-28133,-28179,-28224,-28269,-28315,-28360,
-    -28405,-28451,-28496,-28541,-28586,-28632,-28677,-28722,
-    -28767,-28812,-28858,-28903,-28948,-28993,-29038,-29083,
-    -29128,-29173,-29218,-29263,-29308,-29353,-29398,-29443,
-    -29488,-29533,-29577,-29622,-29667,-29712,-29757,-29801,
-    -29846,-29891,-29936,-29980,-30025,-30070,-30114,-30159,
-    -30204,-30248,-30293,-30337,-30382,-30426,-30471,-30515,
-    -30560,-30604,-30649,-30693,-30738,-30782,-30826,-30871,
-    -30915,-30959,-31004,-31048,-31092,-31136,-31181,-31225,
-    -31269,-31313,-31357,-31402,-31446,-31490,-31534,-31578,
-    -31622,-31666,-31710,-31754,-31798,-31842,-31886,-31930,
-    -31974,-32017,-32061,-32105,-32149,-32193,-32236,-32280,
-    -32324,-32368,-32411,-32455,-32499,-32542,-32586,-32630,
-    -32673,-32717,-32760,-32804,-32847,-32891,-32934,-32978,
-    -33021,-33065,-33108,-33151,-33195,-33238,-33281,-33325,
-    -33368,-33411,-33454,-33498,-33541,-33584,-33627,-33670,
-    -33713,-33756,-33799,-33843,-33886,-33929,-33972,-34015,
-    -34057,-34100,-34143,-34186,-34229,-34272,-34315,-34358,
-    -34400,-34443,-34486,-34529,-34571,-34614,-34657,-34699,
-    -34742,-34785,-34827,-34870,-34912,-34955,-34997,-35040,
-    -35082,-35125,-35167,-35210,-35252,-35294,-35337,-35379,
-    -35421,-35464,-35506,-35548,-35590,-35633,-35675,-35717,
-    -35759,-35801,-35843,-35885,-35927,-35969,-36011,-36053,
-    -36095,-36137,-36179,-36221,-36263,-36305,-36347,-36388,
-    -36430,-36472,-36514,-36555,-36597,-36639,-36681,-36722,
-    -36764,-36805,-36847,-36889,-36930,-36972,-37013,-37055,
-    -37096,-37137,-37179,-37220,-37262,-37303,-37344,-37386,
-    -37427,-37468,-37509,-37551,-37592,-37633,-37674,-37715,
-    -37756,-37797,-37838,-37879,-37920,-37961,-38002,-38043,
-    -38084,-38125,-38166,-38207,-38248,-38288,-38329,-38370,
-    -38411,-38451,-38492,-38533,-38573,-38614,-38655,-38695,
-    -38736,-38776,-38817,-38857,-38898,-38938,-38979,-39019,
-    -39059,-39100,-39140,-39180,-39221,-39261,-39301,-39341,
-    -39382,-39422,-39462,-39502,-39542,-39582,-39622,-39662,
-    -39702,-39742,-39782,-39822,-39862,-39902,-39942,-39982,
-    -40021,-40061,-40101,-40141,-40180,-40220,-40260,-40299,
-    -40339,-40379,-40418,-40458,-40497,-40537,-40576,-40616,
-    -40655,-40695,-40734,-40773,-40813,-40852,-40891,-40931,
-    -40970,-41009,-41048,-41087,-41127,-41166,-41205,-41244,
-    -41283,-41322,-41361,-41400,-41439,-41478,-41517,-41556,
-    -41595,-41633,-41672,-41711,-41750,-41788,-41827,-41866,
-    -41904,-41943,-41982,-42020,-42059,-42097,-42136,-42174,
-    -42213,-42251,-42290,-42328,-42366,-42405,-42443,-42481,
-    -42520,-42558,-42596,-42634,-42672,-42711,-42749,-42787,
-    -42825,-42863,-42901,-42939,-42977,-43015,-43053,-43091,
-    -43128,-43166,-43204,-43242,-43280,-43317,-43355,-43393,
-    -43430,-43468,-43506,-43543,-43581,-43618,-43656,-43693,
-    -43731,-43768,-43806,-43843,-43880,-43918,-43955,-43992,
-    -44029,-44067,-44104,-44141,-44178,-44215,-44252,-44289,
-    -44326,-44363,-44400,-44437,-44474,-44511,-44548,-44585,
-    -44622,-44659,-44695,-44732,-44769,-44806,-44842,-44879,
-    -44915,-44952,-44989,-45025,-45062,-45098,-45135,-45171,
-    -45207,-45244,-45280,-45316,-45353,-45389,-45425,-45462,
-    -45498,-45534,-45570,-45606,-45642,-45678,-45714,-45750,
-    -45786,-45822,-45858,-45894,-45930,-45966,-46002,-46037,
-    -46073,-46109,-46145,-46180,-46216,-46252,-46287,-46323,
-    -46358,-46394,-46429,-46465,-46500,-46536,-46571,-46606,
-    -46642,-46677,-46712,-46747,-46783,-46818,-46853,-46888,
-    -46923,-46958,-46993,-47028,-47063,-47098,-47133,-47168,
-    -47203,-47238,-47273,-47308,-47342,-47377,-47412,-47446,
-    -47481,-47516,-47550,-47585,-47619,-47654,-47688,-47723,
-    -47757,-47792,-47826,-47860,-47895,-47929,-47963,-47998,
-    -48032,-48066,-48100,-48134,-48168,-48202,-48236,-48271,
-    -48304,-48338,-48372,-48406,-48440,-48474,-48508,-48542,
-    -48575,-48609,-48643,-48676,-48710,-48744,-48777,-48811,
-    -48844,-48878,-48911,-48945,-48978,-49012,-49045,-49078,
-    -49112,-49145,-49178,-49211,-49244,-49278,-49311,-49344,
-    -49377,-49410,-49443,-49476,-49509,-49542,-49575,-49608,
-    -49640,-49673,-49706,-49739,-49771,-49804,-49837,-49869,
-    -49902,-49935,-49967,-50000,-50032,-50065,-50097,-50129,
-    -50162,-50194,-50226,-50259,-50291,-50323,-50355,-50387,
-    -50420,-50452,-50484,-50516,-50548,-50580,-50612,-50644,
-    -50675,-50707,-50739,-50771,-50803,-50834,-50866,-50898,
-    -50929,-50961,-50993,-51024,-51056,-51087,-51119,-51150,
-    -51182,-51213,-51244,-51276,-51307,-51338,-51369,-51401,
-    -51432,-51463,-51494,-51525,-51556,-51587,-51618,-51649,
-    -51680,-51711,-51742,-51773,-51803,-51834,-51865,-51896,
-    -51926,-51957,-51988,-52018,-52049,-52079,-52110,-52140,
-    -52171,-52201,-52231,-52262,-52292,-52322,-52353,-52383,
-    -52413,-52443,-52473,-52503,-52534,-52564,-52594,-52624,
-    -52653,-52683,-52713,-52743,-52773,-52803,-52832,-52862,
-    -52892,-52922,-52951,-52981,-53010,-53040,-53069,-53099,
-    -53128,-53158,-53187,-53216,-53246,-53275,-53304,-53334,
-    -53363,-53392,-53421,-53450,-53479,-53508,-53537,-53566,
-    -53595,-53624,-53653,-53682,-53711,-53739,-53768,-53797,
-    -53826,-53854,-53883,-53911,-53940,-53969,-53997,-54026,
-    -54054,-54082,-54111,-54139,-54167,-54196,-54224,-54252,
-    -54280,-54308,-54337,-54365,-54393,-54421,-54449,-54477,
-    -54505,-54533,-54560,-54588,-54616,-54644,-54672,-54699,
-    -54727,-54755,-54782,-54810,-54837,-54865,-54892,-54920,
-    -54947,-54974,-55002,-55029,-55056,-55084,-55111,-55138,
-    -55165,-55192,-55219,-55246,-55274,-55300,-55327,-55354,
-    -55381,-55408,-55435,-55462,-55489,-55515,-55542,-55569,
-    -55595,-55622,-55648,-55675,-55701,-55728,-55754,-55781,
-    -55807,-55833,-55860,-55886,-55912,-55938,-55965,-55991,
-    -56017,-56043,-56069,-56095,-56121,-56147,-56173,-56199,
-    -56225,-56250,-56276,-56302,-56328,-56353,-56379,-56404,
-    -56430,-56456,-56481,-56507,-56532,-56557,-56583,-56608,
-    -56633,-56659,-56684,-56709,-56734,-56760,-56785,-56810,
-    -56835,-56860,-56885,-56910,-56935,-56959,-56984,-57009,
-    -57034,-57059,-57083,-57108,-57133,-57157,-57182,-57206,
-    -57231,-57255,-57280,-57304,-57329,-57353,-57377,-57402,
-    -57426,-57450,-57474,-57498,-57522,-57546,-57570,-57594,
-    -57618,-57642,-57666,-57690,-57714,-57738,-57762,-57785,
-    -57809,-57833,-57856,-57880,-57903,-57927,-57950,-57974,
-    -57997,-58021,-58044,-58067,-58091,-58114,-58137,-58160,
-    -58183,-58207,-58230,-58253,-58276,-58299,-58322,-58345,
-    -58367,-58390,-58413,-58436,-58459,-58481,-58504,-58527,
-    -58549,-58572,-58594,-58617,-58639,-58662,-58684,-58706,
-    -58729,-58751,-58773,-58795,-58818,-58840,-58862,-58884,
-    -58906,-58928,-58950,-58972,-58994,-59016,-59038,-59059,
-    -59081,-59103,-59125,-59146,-59168,-59190,-59211,-59233,
-    -59254,-59276,-59297,-59318,-59340,-59361,-59382,-59404,
-    -59425,-59446,-59467,-59488,-59509,-59530,-59551,-59572,
-    -59593,-59614,-59635,-59656,-59677,-59697,-59718,-59739,
-    -59759,-59780,-59801,-59821,-59842,-59862,-59883,-59903,
-    -59923,-59944,-59964,-59984,-60004,-60025,-60045,-60065,
-    -60085,-60105,-60125,-60145,-60165,-60185,-60205,-60225,
-    -60244,-60264,-60284,-60304,-60323,-60343,-60363,-60382,
-    -60402,-60421,-60441,-60460,-60479,-60499,-60518,-60537,
-    -60556,-60576,-60595,-60614,-60633,-60652,-60671,-60690,
-    -60709,-60728,-60747,-60766,-60785,-60803,-60822,-60841,
-    -60859,-60878,-60897,-60915,-60934,-60952,-60971,-60989,
-    -61007,-61026,-61044,-61062,-61081,-61099,-61117,-61135,
-    -61153,-61171,-61189,-61207,-61225,-61243,-61261,-61279,
-    -61297,-61314,-61332,-61350,-61367,-61385,-61403,-61420,
-    -61438,-61455,-61473,-61490,-61507,-61525,-61542,-61559,
-    -61577,-61594,-61611,-61628,-61645,-61662,-61679,-61696,
-    -61713,-61730,-61747,-61764,-61780,-61797,-61814,-61831,
-    -61847,-61864,-61880,-61897,-61913,-61930,-61946,-61963,
-    -61979,-61995,-62012,-62028,-62044,-62060,-62076,-62092,
-    -62108,-62125,-62141,-62156,-62172,-62188,-62204,-62220,
-    -62236,-62251,-62267,-62283,-62298,-62314,-62329,-62345,
-    -62360,-62376,-62391,-62407,-62422,-62437,-62453,-62468,
-    -62483,-62498,-62513,-62528,-62543,-62558,-62573,-62588,
-    -62603,-62618,-62633,-62648,-62662,-62677,-62692,-62706,
-    -62721,-62735,-62750,-62764,-62779,-62793,-62808,-62822,
-    -62836,-62850,-62865,-62879,-62893,-62907,-62921,-62935,
-    -62949,-62963,-62977,-62991,-63005,-63019,-63032,-63046,
-    -63060,-63074,-63087,-63101,-63114,-63128,-63141,-63155,
-    -63168,-63182,-63195,-63208,-63221,-63235,-63248,-63261,
-    -63274,-63287,-63300,-63313,-63326,-63339,-63352,-63365,
-    -63378,-63390,-63403,-63416,-63429,-63441,-63454,-63466,
-    -63479,-63491,-63504,-63516,-63528,-63541,-63553,-63565,
-    -63578,-63590,-63602,-63614,-63626,-63638,-63650,-63662,
-    -63674,-63686,-63698,-63709,-63721,-63733,-63745,-63756,
-    -63768,-63779,-63791,-63803,-63814,-63825,-63837,-63848,
-    -63859,-63871,-63882,-63893,-63904,-63915,-63927,-63938,
-    -63949,-63960,-63971,-63981,-63992,-64003,-64014,-64025,
-    -64035,-64046,-64057,-64067,-64078,-64088,-64099,-64109,
-    -64120,-64130,-64140,-64151,-64161,-64171,-64181,-64192,
-    -64202,-64212,-64222,-64232,-64242,-64252,-64261,-64271,
-    -64281,-64291,-64301,-64310,-64320,-64330,-64339,-64349,
-    -64358,-64368,-64377,-64387,-64396,-64405,-64414,-64424,
-    -64433,-64442,-64451,-64460,-64469,-64478,-64487,-64496,
-    -64505,-64514,-64523,-64532,-64540,-64549,-64558,-64566,
-    -64575,-64584,-64592,-64601,-64609,-64617,-64626,-64634,
-    -64642,-64651,-64659,-64667,-64675,-64683,-64691,-64699,
-    -64707,-64715,-64723,-64731,-64739,-64747,-64754,-64762,
-    -64770,-64777,-64785,-64793,-64800,-64808,-64815,-64822,
-    -64830,-64837,-64844,-64852,-64859,-64866,-64873,-64880,
-    -64887,-64895,-64902,-64908,-64915,-64922,-64929,-64936,
-    -64943,-64949,-64956,-64963,-64969,-64976,-64982,-64989,
-    -64995,-65002,-65008,-65015,-65021,-65027,-65033,-65040,
-    -65046,-65052,-65058,-65064,-65070,-65076,-65082,-65088,
-    -65094,-65099,-65105,-65111,-65117,-65122,-65128,-65133,
-    -65139,-65144,-65150,-65155,-65161,-65166,-65171,-65177,
-    -65182,-65187,-65192,-65197,-65202,-65207,-65212,-65217,
-    -65222,-65227,-65232,-65237,-65242,-65246,-65251,-65256,
-    -65260,-65265,-65270,-65274,-65279,-65283,-65287,-65292,
-    -65296,-65300,-65305,-65309,-65313,-65317,-65321,-65325,
-    -65329,-65333,-65337,-65341,-65345,-65349,-65352,-65356,
-    -65360,-65363,-65367,-65371,-65374,-65378,-65381,-65385,
-    -65388,-65391,-65395,-65398,-65401,-65404,-65408,-65411,
-    -65414,-65417,-65420,-65423,-65426,-65429,-65431,-65434,
-    -65437,-65440,-65442,-65445,-65448,-65450,-65453,-65455,
-    -65458,-65460,-65463,-65465,-65467,-65470,-65472,-65474,
-    -65476,-65478,-65480,-65482,-65484,-65486,-65488,-65490,
-    -65492,-65494,-65496,-65497,-65499,-65501,-65502,-65504,
-    -65505,-65507,-65508,-65510,-65511,-65513,-65514,-65515,
-    -65516,-65518,-65519,-65520,-65521,-65522,-65523,-65524,
-    -65525,-65526,-65527,-65527,-65528,-65529,-65530,-65530,
-    -65531,-65531,-65532,-65532,-65533,-65533,-65534,-65534,
-    -65534,-65535,-65535,-65535,-65535,-65535,-65535,-65535,
-    -65535,-65535,-65535,-65535,-65535,-65535,-65535,-65534,
-    -65534,-65534,-65533,-65533,-65532,-65532,-65531,-65531,
-    -65530,-65530,-65529,-65528,-65527,-65527,-65526,-65525,
-    -65524,-65523,-65522,-65521,-65520,-65519,-65518,-65516,
-    -65515,-65514,-65513,-65511,-65510,-65508,-65507,-65505,
-    -65504,-65502,-65501,-65499,-65497,-65496,-65494,-65492,
-    -65490,-65488,-65486,-65484,-65482,-65480,-65478,-65476,
-    -65474,-65472,-65470,-65467,-65465,-65463,-65460,-65458,
-    -65455,-65453,-65450,-65448,-65445,-65442,-65440,-65437,
-    -65434,-65431,-65429,-65426,-65423,-65420,-65417,-65414,
-    -65411,-65408,-65404,-65401,-65398,-65395,-65391,-65388,
-    -65385,-65381,-65378,-65374,-65371,-65367,-65363,-65360,
-    -65356,-65352,-65349,-65345,-65341,-65337,-65333,-65329,
-    -65325,-65321,-65317,-65313,-65309,-65305,-65300,-65296,
-    -65292,-65287,-65283,-65279,-65274,-65270,-65265,-65260,
-    -65256,-65251,-65246,-65242,-65237,-65232,-65227,-65222,
-    -65217,-65212,-65207,-65202,-65197,-65192,-65187,-65182,
-    -65177,-65171,-65166,-65161,-65155,-65150,-65144,-65139,
-    -65133,-65128,-65122,-65117,-65111,-65105,-65099,-65094,
-    -65088,-65082,-65076,-65070,-65064,-65058,-65052,-65046,
-    -65040,-65033,-65027,-65021,-65015,-65008,-65002,-64995,
-    -64989,-64982,-64976,-64969,-64963,-64956,-64949,-64943,
-    -64936,-64929,-64922,-64915,-64908,-64902,-64895,-64887,
-    -64880,-64873,-64866,-64859,-64852,-64844,-64837,-64830,
-    -64822,-64815,-64808,-64800,-64793,-64785,-64777,-64770,
-    -64762,-64754,-64747,-64739,-64731,-64723,-64715,-64707,
-    -64699,-64691,-64683,-64675,-64667,-64659,-64651,-64642,
-    -64634,-64626,-64617,-64609,-64601,-64592,-64584,-64575,
-    -64566,-64558,-64549,-64540,-64532,-64523,-64514,-64505,
-    -64496,-64487,-64478,-64469,-64460,-64451,-64442,-64433,
-    -64424,-64414,-64405,-64396,-64387,-64377,-64368,-64358,
-    -64349,-64339,-64330,-64320,-64310,-64301,-64291,-64281,
-    -64271,-64261,-64252,-64242,-64232,-64222,-64212,-64202,
-    -64192,-64181,-64171,-64161,-64151,-64140,-64130,-64120,
-    -64109,-64099,-64088,-64078,-64067,-64057,-64046,-64035,
-    -64025,-64014,-64003,-63992,-63981,-63971,-63960,-63949,
-    -63938,-63927,-63915,-63904,-63893,-63882,-63871,-63859,
-    -63848,-63837,-63825,-63814,-63803,-63791,-63779,-63768,
-    -63756,-63745,-63733,-63721,-63709,-63698,-63686,-63674,
-    -63662,-63650,-63638,-63626,-63614,-63602,-63590,-63578,
-    -63565,-63553,-63541,-63528,-63516,-63504,-63491,-63479,
-    -63466,-63454,-63441,-63429,-63416,-63403,-63390,-63378,
-    -63365,-63352,-63339,-63326,-63313,-63300,-63287,-63274,
-    -63261,-63248,-63235,-63221,-63208,-63195,-63182,-63168,
-    -63155,-63141,-63128,-63114,-63101,-63087,-63074,-63060,
-    -63046,-63032,-63019,-63005,-62991,-62977,-62963,-62949,
-    -62935,-62921,-62907,-62893,-62879,-62865,-62850,-62836,
-    -62822,-62808,-62793,-62779,-62764,-62750,-62735,-62721,
-    -62706,-62692,-62677,-62662,-62648,-62633,-62618,-62603,
-    -62588,-62573,-62558,-62543,-62528,-62513,-62498,-62483,
-    -62468,-62453,-62437,-62422,-62407,-62391,-62376,-62360,
-    -62345,-62329,-62314,-62298,-62283,-62267,-62251,-62236,
-    -62220,-62204,-62188,-62172,-62156,-62141,-62125,-62108,
-    -62092,-62076,-62060,-62044,-62028,-62012,-61995,-61979,
-    -61963,-61946,-61930,-61913,-61897,-61880,-61864,-61847,
-    -61831,-61814,-61797,-61780,-61764,-61747,-61730,-61713,
-    -61696,-61679,-61662,-61645,-61628,-61611,-61594,-61577,
-    -61559,-61542,-61525,-61507,-61490,-61473,-61455,-61438,
-    -61420,-61403,-61385,-61367,-61350,-61332,-61314,-61297,
-    -61279,-61261,-61243,-61225,-61207,-61189,-61171,-61153,
-    -61135,-61117,-61099,-61081,-61062,-61044,-61026,-61007,
-    -60989,-60971,-60952,-60934,-60915,-60897,-60878,-60859,
-    -60841,-60822,-60803,-60785,-60766,-60747,-60728,-60709,
-    -60690,-60671,-60652,-60633,-60614,-60595,-60576,-60556,
-    -60537,-60518,-60499,-60479,-60460,-60441,-60421,-60402,
-    -60382,-60363,-60343,-60323,-60304,-60284,-60264,-60244,
-    -60225,-60205,-60185,-60165,-60145,-60125,-60105,-60085,
-    -60065,-60045,-60025,-60004,-59984,-59964,-59944,-59923,
-    -59903,-59883,-59862,-59842,-59821,-59801,-59780,-59759,
-    -59739,-59718,-59697,-59677,-59656,-59635,-59614,-59593,
-    -59572,-59551,-59530,-59509,-59488,-59467,-59446,-59425,
-    -59404,-59382,-59361,-59340,-59318,-59297,-59276,-59254,
-    -59233,-59211,-59189,-59168,-59146,-59125,-59103,-59081,
-    -59059,-59038,-59016,-58994,-58972,-58950,-58928,-58906,
-    -58884,-58862,-58840,-58818,-58795,-58773,-58751,-58729,
-    -58706,-58684,-58662,-58639,-58617,-58594,-58572,-58549,
-    -58527,-58504,-58481,-58459,-58436,-58413,-58390,-58367,
-    -58345,-58322,-58299,-58276,-58253,-58230,-58207,-58183,
-    -58160,-58137,-58114,-58091,-58067,-58044,-58021,-57997,
-    -57974,-57950,-57927,-57903,-57880,-57856,-57833,-57809,
-    -57785,-57762,-57738,-57714,-57690,-57666,-57642,-57618,
-    -57594,-57570,-57546,-57522,-57498,-57474,-57450,-57426,
-    -57402,-57377,-57353,-57329,-57304,-57280,-57255,-57231,
-    -57206,-57182,-57157,-57133,-57108,-57083,-57059,-57034,
-    -57009,-56984,-56959,-56935,-56910,-56885,-56860,-56835,
-    -56810,-56785,-56760,-56734,-56709,-56684,-56659,-56633,
-    -56608,-56583,-56557,-56532,-56507,-56481,-56456,-56430,
-    -56404,-56379,-56353,-56328,-56302,-56276,-56250,-56225,
-    -56199,-56173,-56147,-56121,-56095,-56069,-56043,-56017,
-    -55991,-55965,-55938,-55912,-55886,-55860,-55833,-55807,
-    -55781,-55754,-55728,-55701,-55675,-55648,-55622,-55595,
-    -55569,-55542,-55515,-55489,-55462,-55435,-55408,-55381,
-    -55354,-55327,-55300,-55274,-55246,-55219,-55192,-55165,
-    -55138,-55111,-55084,-55056,-55029,-55002,-54974,-54947,
-    -54920,-54892,-54865,-54837,-54810,-54782,-54755,-54727,
-    -54699,-54672,-54644,-54616,-54588,-54560,-54533,-54505,
-    -54477,-54449,-54421,-54393,-54365,-54337,-54308,-54280,
-    -54252,-54224,-54196,-54167,-54139,-54111,-54082,-54054,
-    -54026,-53997,-53969,-53940,-53911,-53883,-53854,-53826,
-    -53797,-53768,-53739,-53711,-53682,-53653,-53624,-53595,
-    -53566,-53537,-53508,-53479,-53450,-53421,-53392,-53363,
-    -53334,-53304,-53275,-53246,-53216,-53187,-53158,-53128,
-    -53099,-53069,-53040,-53010,-52981,-52951,-52922,-52892,
-    -52862,-52832,-52803,-52773,-52743,-52713,-52683,-52653,
-    -52624,-52594,-52564,-52534,-52503,-52473,-52443,-52413,
-    -52383,-52353,-52322,-52292,-52262,-52231,-52201,-52171,
-    -52140,-52110,-52079,-52049,-52018,-51988,-51957,-51926,
-    -51896,-51865,-51834,-51803,-51773,-51742,-51711,-51680,
-    -51649,-51618,-51587,-51556,-51525,-51494,-51463,-51432,
-    -51401,-51369,-51338,-51307,-51276,-51244,-51213,-51182,
-    -51150,-51119,-51087,-51056,-51024,-50993,-50961,-50929,
-    -50898,-50866,-50834,-50803,-50771,-50739,-50707,-50675,
-    -50644,-50612,-50580,-50548,-50516,-50484,-50452,-50420,
-    -50387,-50355,-50323,-50291,-50259,-50226,-50194,-50162,
-    -50129,-50097,-50065,-50032,-50000,-49967,-49935,-49902,
-    -49869,-49837,-49804,-49771,-49739,-49706,-49673,-49640,
-    -49608,-49575,-49542,-49509,-49476,-49443,-49410,-49377,
-    -49344,-49311,-49278,-49244,-49211,-49178,-49145,-49112,
-    -49078,-49045,-49012,-48978,-48945,-48911,-48878,-48844,
-    -48811,-48777,-48744,-48710,-48676,-48643,-48609,-48575,
-    -48542,-48508,-48474,-48440,-48406,-48372,-48338,-48305,
-    -48271,-48237,-48202,-48168,-48134,-48100,-48066,-48032,
-    -47998,-47963,-47929,-47895,-47860,-47826,-47792,-47757,
-    -47723,-47688,-47654,-47619,-47585,-47550,-47516,-47481,
-    -47446,-47412,-47377,-47342,-47307,-47273,-47238,-47203,
-    -47168,-47133,-47098,-47063,-47028,-46993,-46958,-46923,
-    -46888,-46853,-46818,-46783,-46747,-46712,-46677,-46642,
-    -46606,-46571,-46536,-46500,-46465,-46429,-46394,-46358,
-    -46323,-46287,-46251,-46216,-46180,-46145,-46109,-46073,
-    -46037,-46002,-45966,-45930,-45894,-45858,-45822,-45786,
-    -45750,-45714,-45678,-45642,-45606,-45570,-45534,-45498,
-    -45462,-45425,-45389,-45353,-45316,-45280,-45244,-45207,
-    -45171,-45135,-45098,-45062,-45025,-44989,-44952,-44915,
-    -44879,-44842,-44806,-44769,-44732,-44695,-44659,-44622,
-    -44585,-44548,-44511,-44474,-44437,-44400,-44363,-44326,
-    -44289,-44252,-44215,-44178,-44141,-44104,-44067,-44029,
-    -43992,-43955,-43918,-43880,-43843,-43806,-43768,-43731,
-    -43693,-43656,-43618,-43581,-43543,-43506,-43468,-43430,
-    -43393,-43355,-43317,-43280,-43242,-43204,-43166,-43128,
-    -43091,-43053,-43015,-42977,-42939,-42901,-42863,-42825,
-    -42787,-42749,-42711,-42672,-42634,-42596,-42558,-42520,
-    -42481,-42443,-42405,-42366,-42328,-42290,-42251,-42213,
-    -42174,-42136,-42097,-42059,-42020,-41982,-41943,-41904,
-    -41866,-41827,-41788,-41750,-41711,-41672,-41633,-41595,
-    -41556,-41517,-41478,-41439,-41400,-41361,-41322,-41283,
-    -41244,-41205,-41166,-41127,-41087,-41048,-41009,-40970,
-    -40931,-40891,-40852,-40813,-40773,-40734,-40695,-40655,
-    -40616,-40576,-40537,-40497,-40458,-40418,-40379,-40339,
-    -40299,-40260,-40220,-40180,-40141,-40101,-40061,-40021,
-    -39982,-39942,-39902,-39862,-39822,-39782,-39742,-39702,
-    -39662,-39622,-39582,-39542,-39502,-39462,-39422,-39382,
-    -39341,-39301,-39261,-39221,-39180,-39140,-39100,-39059,
-    -39019,-38979,-38938,-38898,-38857,-38817,-38776,-38736,
-    -38695,-38655,-38614,-38573,-38533,-38492,-38451,-38411,
-    -38370,-38329,-38288,-38248,-38207,-38166,-38125,-38084,
-    -38043,-38002,-37961,-37920,-37879,-37838,-37797,-37756,
-    -37715,-37674,-37633,-37592,-37550,-37509,-37468,-37427,
-    -37386,-37344,-37303,-37262,-37220,-37179,-37137,-37096,
-    -37055,-37013,-36972,-36930,-36889,-36847,-36805,-36764,
-    -36722,-36681,-36639,-36597,-36556,-36514,-36472,-36430,
-    -36388,-36347,-36305,-36263,-36221,-36179,-36137,-36095,
-    -36053,-36011,-35969,-35927,-35885,-35843,-35801,-35759,
-    -35717,-35675,-35633,-35590,-35548,-35506,-35464,-35421,
-    -35379,-35337,-35294,-35252,-35210,-35167,-35125,-35082,
-    -35040,-34997,-34955,-34912,-34870,-34827,-34785,-34742,
-    -34699,-34657,-34614,-34571,-34529,-34486,-34443,-34400,
-    -34358,-34315,-34272,-34229,-34186,-34143,-34100,-34057,
-    -34015,-33972,-33929,-33886,-33843,-33799,-33756,-33713,
-    -33670,-33627,-33584,-33541,-33498,-33454,-33411,-33368,
-    -33325,-33281,-33238,-33195,-33151,-33108,-33065,-33021,
-    -32978,-32934,-32891,-32847,-32804,-32760,-32717,-32673,
-    -32630,-32586,-32542,-32499,-32455,-32411,-32368,-32324,
-    -32280,-32236,-32193,-32149,-32105,-32061,-32017,-31974,
-    -31930,-31886,-31842,-31798,-31754,-31710,-31666,-31622,
-    -31578,-31534,-31490,-31446,-31402,-31357,-31313,-31269,
-    -31225,-31181,-31136,-31092,-31048,-31004,-30959,-30915,
-    -30871,-30826,-30782,-30738,-30693,-30649,-30604,-30560,
-    -30515,-30471,-30426,-30382,-30337,-30293,-30248,-30204,
-    -30159,-30114,-30070,-30025,-29980,-29936,-29891,-29846,
-    -29801,-29757,-29712,-29667,-29622,-29577,-29533,-29488,
-    -29443,-29398,-29353,-29308,-29263,-29218,-29173,-29128,
-    -29083,-29038,-28993,-28948,-28903,-28858,-28812,-28767,
-    -28722,-28677,-28632,-28586,-28541,-28496,-28451,-28405,
-    -28360,-28315,-28269,-28224,-28179,-28133,-28088,-28042,
-    -27997,-27952,-27906,-27861,-27815,-27770,-27724,-27678,
-    -27633,-27587,-27542,-27496,-27450,-27405,-27359,-27313,
-    -27268,-27222,-27176,-27131,-27085,-27039,-26993,-26947,
-    -26902,-26856,-26810,-26764,-26718,-26672,-26626,-26580,
-    -26534,-26488,-26442,-26396,-26350,-26304,-26258,-26212,
-    -26166,-26120,-26074,-26028,-25982,-25936,-25889,-25843,
-    -25797,-25751,-25705,-25658,-25612,-25566,-25520,-25473,
-    -25427,-25381,-25334,-25288,-25241,-25195,-25149,-25102,
-    -25056,-25009,-24963,-24916,-24870,-24823,-24777,-24730,
-    -24684,-24637,-24591,-24544,-24497,-24451,-24404,-24357,
-    -24311,-24264,-24217,-24171,-24124,-24077,-24030,-23984,
-    -23937,-23890,-23843,-23796,-23750,-23703,-23656,-23609,
-    -23562,-23515,-23468,-23421,-23374,-23327,-23280,-23233,
-    -23186,-23139,-23092,-23045,-22998,-22951,-22904,-22857,
-    -22810,-22763,-22716,-22668,-22621,-22574,-22527,-22480,
-    -22432,-22385,-22338,-22291,-22243,-22196,-22149,-22102,
-    -22054,-22007,-21960,-21912,-21865,-21817,-21770,-21723,
-    -21675,-21628,-21580,-21533,-21485,-21438,-21390,-21343,
-    -21295,-21248,-21200,-21153,-21105,-21057,-21010,-20962,
-    -20915,-20867,-20819,-20772,-20724,-20676,-20629,-20581,
-    -20533,-20485,-20438,-20390,-20342,-20294,-20246,-20199,
-    -20151,-20103,-20055,-20007,-19959,-19912,-19864,-19816,
-    -19768,-19720,-19672,-19624,-19576,-19528,-19480,-19432,
-    -19384,-19336,-19288,-19240,-19192,-19144,-19096,-19048,
-    -19000,-18951,-18903,-18855,-18807,-18759,-18711,-18663,
-    -18614,-18566,-18518,-18470,-18421,-18373,-18325,-18277,
-    -18228,-18180,-18132,-18084,-18035,-17987,-17939,-17890,
-    -17842,-17793,-17745,-17697,-17648,-17600,-17551,-17503,
-    -17455,-17406,-17358,-17309,-17261,-17212,-17164,-17115,
-    -17067,-17018,-16970,-16921,-16872,-16824,-16775,-16727,
-    -16678,-16629,-16581,-16532,-16484,-16435,-16386,-16338,
-    -16289,-16240,-16191,-16143,-16094,-16045,-15997,-15948,
-    -15899,-15850,-15802,-15753,-15704,-15655,-15606,-15557,
-    -15509,-15460,-15411,-15362,-15313,-15264,-15215,-15167,
-    -15118,-15069,-15020,-14971,-14922,-14873,-14824,-14775,
-    -14726,-14677,-14628,-14579,-14530,-14481,-14432,-14383,
-    -14334,-14285,-14236,-14187,-14138,-14089,-14040,-13990,
-    -13941,-13892,-13843,-13794,-13745,-13696,-13647,-13597,
-    -13548,-13499,-13450,-13401,-13351,-13302,-13253,-13204,
-    -13154,-13105,-13056,-13007,-12957,-12908,-12859,-12810,
-    -12760,-12711,-12662,-12612,-12563,-12514,-12464,-12415,
-    -12366,-12316,-12267,-12217,-12168,-12119,-12069,-12020,
-    -11970,-11921,-11872,-11822,-11773,-11723,-11674,-11624,
-    -11575,-11525,-11476,-11426,-11377,-11327,-11278,-11228,
-    -11179,-11129,-11080,-11030,-10981,-10931,-10882,-10832,
-    -10782,-10733,-10683,-10634,-10584,-10534,-10485,-10435,
-    -10386,-10336,-10286,-10237,-10187,-10137,-10088,-10038,
-    -9988,-9939,-9889,-9839,-9790,-9740,-9690,-9640,
-    -9591,-9541,-9491,-9442,-9392,-9342,-9292,-9243,
-    -9193,-9143,-9093,-9043,-8994,-8944,-8894,-8844,
-    -8794,-8745,-8695,-8645,-8595,-8545,-8496,-8446,
-    -8396,-8346,-8296,-8246,-8196,-8147,-8097,-8047,
-    -7997,-7947,-7897,-7847,-7797,-7747,-7697,-7648,
-    -7598,-7548,-7498,-7448,-7398,-7348,-7298,-7248,
-    -7198,-7148,-7098,-7048,-6998,-6948,-6898,-6848,
-    -6798,-6748,-6698,-6648,-6598,-6548,-6498,-6448,
-    -6398,-6348,-6298,-6248,-6198,-6148,-6098,-6048,
-    -5998,-5948,-5898,-5848,-5798,-5747,-5697,-5647,
-    -5597,-5547,-5497,-5447,-5397,-5347,-5297,-5247,
-    -5197,-5146,-5096,-5046,-4996,-4946,-4896,-4846,
-    -4796,-4745,-4695,-4645,-4595,-4545,-4495,-4445,
-    -4394,-4344,-4294,-4244,-4194,-4144,-4093,-4043,
-    -3993,-3943,-3893,-3843,-3792,-3742,-3692,-3642,
-    -3592,-3541,-3491,-3441,-3391,-3341,-3291,-3240,
-    -3190,-3140,-3090,-3039,-2989,-2939,-2889,-2839,
-    -2788,-2738,-2688,-2638,-2588,-2537,-2487,-2437,
-    -2387,-2336,-2286,-2236,-2186,-2135,-2085,-2035,
-    -1985,-1934,-1884,-1834,-1784,-1733,-1683,-1633,
-    -1583,-1532,-1482,-1432,-1382,-1331,-1281,-1231,
-    -1181,-1130,-1080,-1030,-980,-929,-879,-829,
-    -779,-728,-678,-628,-578,-527,-477,-427,
-    -376,-326,-276,-226,-175,-125,-75,-25,
-    25,75,125,175,226,276,326,376,
-    427,477,527,578,628,678,728,779,
-    829,879,929,980,1030,1080,1130,1181,
-    1231,1281,1331,1382,1432,1482,1532,1583,
-    1633,1683,1733,1784,1834,1884,1934,1985,
-    2035,2085,2135,2186,2236,2286,2336,2387,
-    2437,2487,2537,2587,2638,2688,2738,2788,
-    2839,2889,2939,2989,3039,3090,3140,3190,
-    3240,3291,3341,3391,3441,3491,3542,3592,
-    3642,3692,3742,3792,3843,3893,3943,3993,
-    4043,4093,4144,4194,4244,4294,4344,4394,
-    4445,4495,4545,4595,4645,4695,4745,4796,
-    4846,4896,4946,4996,5046,5096,5146,5197,
-    5247,5297,5347,5397,5447,5497,5547,5597,
-    5647,5697,5747,5798,5848,5898,5948,5998,
-    6048,6098,6148,6198,6248,6298,6348,6398,
-    6448,6498,6548,6598,6648,6698,6748,6798,
-    6848,6898,6948,6998,7048,7098,7148,7198,
-    7248,7298,7348,7398,7448,7498,7548,7598,
-    7648,7697,7747,7797,7847,7897,7947,7997,
-    8047,8097,8147,8196,8246,8296,8346,8396,
-    8446,8496,8545,8595,8645,8695,8745,8794,
-    8844,8894,8944,8994,9043,9093,9143,9193,
-    9243,9292,9342,9392,9442,9491,9541,9591,
-    9640,9690,9740,9790,9839,9889,9939,9988,
-    10038,10088,10137,10187,10237,10286,10336,10386,
-    10435,10485,10534,10584,10634,10683,10733,10782,
-    10832,10882,10931,10981,11030,11080,11129,11179,
-    11228,11278,11327,11377,11426,11476,11525,11575,
-    11624,11674,11723,11773,11822,11872,11921,11970,
-    12020,12069,12119,12168,12218,12267,12316,12366,
-    12415,12464,12514,12563,12612,12662,12711,12760,
-    12810,12859,12908,12957,13007,13056,13105,13154,
-    13204,13253,13302,13351,13401,13450,13499,13548,
-    13597,13647,13696,13745,13794,13843,13892,13941,
-    13990,14040,14089,14138,14187,14236,14285,14334,
-    14383,14432,14481,14530,14579,14628,14677,14726,
-    14775,14824,14873,14922,14971,15020,15069,15118,
-    15167,15215,15264,15313,15362,15411,15460,15509,
-    15557,15606,15655,15704,15753,15802,15850,15899,
-    15948,15997,16045,16094,16143,16191,16240,16289,
-    16338,16386,16435,16484,16532,16581,16629,16678,
-    16727,16775,16824,16872,16921,16970,17018,17067,
-    17115,17164,17212,17261,17309,17358,17406,17455,
-    17503,17551,17600,17648,17697,17745,17793,17842,
-    17890,17939,17987,18035,18084,18132,18180,18228,
-    18277,18325,18373,18421,18470,18518,18566,18614,
-    18663,18711,18759,18807,18855,18903,18951,19000,
-    19048,19096,19144,19192,19240,19288,19336,19384,
-    19432,19480,19528,19576,19624,19672,19720,19768,
-    19816,19864,19912,19959,20007,20055,20103,20151,
-    20199,20246,20294,20342,20390,20438,20485,20533,
-    20581,20629,20676,20724,20772,20819,20867,20915,
-    20962,21010,21057,21105,21153,21200,21248,21295,
-    21343,21390,21438,21485,21533,21580,21628,21675,
-    21723,21770,21817,21865,21912,21960,22007,22054,
-    22102,22149,22196,22243,22291,22338,22385,22432,
-    22480,22527,22574,22621,22668,22716,22763,22810,
-    22857,22904,22951,22998,23045,23092,23139,23186,
-    23233,23280,23327,23374,23421,23468,23515,23562,
-    23609,23656,23703,23750,23796,23843,23890,23937,
-    23984,24030,24077,24124,24171,24217,24264,24311,
-    24357,24404,24451,24497,24544,24591,24637,24684,
-    24730,24777,24823,24870,24916,24963,25009,25056,
-    25102,25149,25195,25241,25288,25334,25381,25427,
-    25473,25520,25566,25612,25658,25705,25751,25797,
-    25843,25889,25936,25982,26028,26074,26120,26166,
-    26212,26258,26304,26350,26396,26442,26488,26534,
-    26580,26626,26672,26718,26764,26810,26856,26902,
-    26947,26993,27039,27085,27131,27176,27222,27268,
-    27313,27359,27405,27450,27496,27542,27587,27633,
-    27678,27724,27770,27815,27861,27906,27952,27997,
-    28042,28088,28133,28179,28224,28269,28315,28360,
-    28405,28451,28496,28541,28586,28632,28677,28722,
-    28767,28812,28858,28903,28948,28993,29038,29083,
-    29128,29173,29218,29263,29308,29353,29398,29443,
-    29488,29533,29577,29622,29667,29712,29757,29801,
-    29846,29891,29936,29980,30025,30070,30114,30159,
-    30204,30248,30293,30337,30382,30427,30471,30516,
-    30560,30604,30649,30693,30738,30782,30826,30871,
-    30915,30959,31004,31048,31092,31136,31181,31225,
-    31269,31313,31357,31402,31446,31490,31534,31578,
-    31622,31666,31710,31754,31798,31842,31886,31930,
-    31974,32017,32061,32105,32149,32193,32236,32280,
-    32324,32368,32411,32455,32499,32542,32586,32630,
-    32673,32717,32760,32804,32847,32891,32934,32978,
-    33021,33065,33108,33151,33195,33238,33281,33325,
-    33368,33411,33454,33498,33541,33584,33627,33670,
-    33713,33756,33799,33843,33886,33929,33972,34015,
-    34057,34100,34143,34186,34229,34272,34315,34358,
-    34400,34443,34486,34529,34571,34614,34657,34699,
-    34742,34785,34827,34870,34912,34955,34997,35040,
-    35082,35125,35167,35210,35252,35294,35337,35379,
-    35421,35464,35506,35548,35590,35633,35675,35717,
-    35759,35801,35843,35885,35927,35969,36011,36053,
-    36095,36137,36179,36221,36263,36305,36347,36388,
-    36430,36472,36514,36556,36597,36639,36681,36722,
-    36764,36805,36847,36889,36930,36972,37013,37055,
-    37096,37137,37179,37220,37262,37303,37344,37386,
-    37427,37468,37509,37551,37592,37633,37674,37715,
-    37756,37797,37838,37879,37920,37961,38002,38043,
-    38084,38125,38166,38207,38248,38288,38329,38370,
-    38411,38451,38492,38533,38573,38614,38655,38695,
-    38736,38776,38817,38857,38898,38938,38979,39019,
-    39059,39100,39140,39180,39221,39261,39301,39341,
-    39382,39422,39462,39502,39542,39582,39622,39662,
-    39702,39742,39782,39822,39862,39902,39942,39982,
-    40021,40061,40101,40141,40180,40220,40260,40299,
-    40339,40379,40418,40458,40497,40537,40576,40616,
-    40655,40695,40734,40773,40813,40852,40891,40931,
-    40970,41009,41048,41087,41127,41166,41205,41244,
-    41283,41322,41361,41400,41439,41478,41517,41556,
-    41595,41633,41672,41711,41750,41788,41827,41866,
-    41904,41943,41982,42020,42059,42097,42136,42174,
-    42213,42251,42290,42328,42366,42405,42443,42481,
-    42520,42558,42596,42634,42672,42711,42749,42787,
-    42825,42863,42901,42939,42977,43015,43053,43091,
-    43128,43166,43204,43242,43280,43317,43355,43393,
-    43430,43468,43506,43543,43581,43618,43656,43693,
-    43731,43768,43806,43843,43880,43918,43955,43992,
-    44029,44067,44104,44141,44178,44215,44252,44289,
-    44326,44363,44400,44437,44474,44511,44548,44585,
-    44622,44659,44695,44732,44769,44806,44842,44879,
-    44915,44952,44989,45025,45062,45098,45135,45171,
-    45207,45244,45280,45316,45353,45389,45425,45462,
-    45498,45534,45570,45606,45642,45678,45714,45750,
-    45786,45822,45858,45894,45930,45966,46002,46037,
-    46073,46109,46145,46180,46216,46252,46287,46323,
-    46358,46394,46429,46465,46500,46536,46571,46606,
-    46642,46677,46712,46747,46783,46818,46853,46888,
-    46923,46958,46993,47028,47063,47098,47133,47168,
-    47203,47238,47273,47308,47342,47377,47412,47446,
-    47481,47516,47550,47585,47619,47654,47688,47723,
-    47757,47792,47826,47861,47895,47929,47963,47998,
-    48032,48066,48100,48134,48168,48202,48237,48271,
-    48305,48338,48372,48406,48440,48474,48508,48542,
-    48575,48609,48643,48676,48710,48744,48777,48811,
-    48844,48878,48911,48945,48978,49012,49045,49078,
-    49112,49145,49178,49211,49244,49278,49311,49344,
-    49377,49410,49443,49476,49509,49542,49575,49608,
-    49640,49673,49706,49739,49771,49804,49837,49869,
-    49902,49935,49967,50000,50032,50064,50097,50129,
-    50162,50194,50226,50259,50291,50323,50355,50387,
-    50420,50452,50484,50516,50548,50580,50612,50644,
-    50675,50707,50739,50771,50803,50834,50866,50898,
-    50929,50961,50993,51024,51056,51087,51119,51150,
-    51182,51213,51244,51276,51307,51338,51369,51401,
-    51432,51463,51494,51525,51556,51587,51618,51649,
-    51680,51711,51742,51773,51803,51834,51865,51896,
-    51926,51957,51988,52018,52049,52079,52110,52140,
-    52171,52201,52231,52262,52292,52322,52353,52383,
-    52413,52443,52473,52503,52534,52564,52594,52624,
-    52653,52683,52713,52743,52773,52803,52832,52862,
-    52892,52922,52951,52981,53010,53040,53069,53099,
-    53128,53158,53187,53216,53246,53275,53304,53334,
-    53363,53392,53421,53450,53479,53508,53537,53566,
-    53595,53624,53653,53682,53711,53739,53768,53797,
-    53826,53854,53883,53912,53940,53969,53997,54026,
-    54054,54082,54111,54139,54167,54196,54224,54252,
-    54280,54309,54337,54365,54393,54421,54449,54477,
-    54505,54533,54560,54588,54616,54644,54672,54699,
-    54727,54755,54782,54810,54837,54865,54892,54920,
-    54947,54974,55002,55029,55056,55084,55111,55138,
-    55165,55192,55219,55246,55274,55300,55327,55354,
-    55381,55408,55435,55462,55489,55515,55542,55569,
-    55595,55622,55648,55675,55701,55728,55754,55781,
-    55807,55833,55860,55886,55912,55938,55965,55991,
-    56017,56043,56069,56095,56121,56147,56173,56199,
-    56225,56250,56276,56302,56328,56353,56379,56404,
-    56430,56456,56481,56507,56532,56557,56583,56608,
-    56633,56659,56684,56709,56734,56760,56785,56810,
-    56835,56860,56885,56910,56935,56959,56984,57009,
-    57034,57059,57083,57108,57133,57157,57182,57206,
-    57231,57255,57280,57304,57329,57353,57377,57402,
-    57426,57450,57474,57498,57522,57546,57570,57594,
-    57618,57642,57666,57690,57714,57738,57762,57785,
-    57809,57833,57856,57880,57903,57927,57950,57974,
-    57997,58021,58044,58067,58091,58114,58137,58160,
-    58183,58207,58230,58253,58276,58299,58322,58345,
-    58367,58390,58413,58436,58459,58481,58504,58527,
-    58549,58572,58594,58617,58639,58662,58684,58706,
-    58729,58751,58773,58795,58818,58840,58862,58884,
-    58906,58928,58950,58972,58994,59016,59038,59059,
-    59081,59103,59125,59146,59168,59190,59211,59233,
-    59254,59276,59297,59318,59340,59361,59382,59404,
-    59425,59446,59467,59488,59509,59530,59551,59572,
-    59593,59614,59635,59656,59677,59697,59718,59739,
-    59759,59780,59801,59821,59842,59862,59883,59903,
-    59923,59944,59964,59984,60004,60025,60045,60065,
-    60085,60105,60125,60145,60165,60185,60205,60225,
-    60244,60264,60284,60304,60323,60343,60363,60382,
-    60402,60421,60441,60460,60479,60499,60518,60537,
-    60556,60576,60595,60614,60633,60652,60671,60690,
-    60709,60728,60747,60766,60785,60803,60822,60841,
-    60859,60878,60897,60915,60934,60952,60971,60989,
-    61007,61026,61044,61062,61081,61099,61117,61135,
-    61153,61171,61189,61207,61225,61243,61261,61279,
-    61297,61314,61332,61350,61367,61385,61403,61420,
-    61438,61455,61473,61490,61507,61525,61542,61559,
-    61577,61594,61611,61628,61645,61662,61679,61696,
-    61713,61730,61747,61764,61780,61797,61814,61831,
-    61847,61864,61880,61897,61913,61930,61946,61963,
-    61979,61995,62012,62028,62044,62060,62076,62092,
-    62108,62125,62141,62156,62172,62188,62204,62220,
-    62236,62251,62267,62283,62298,62314,62329,62345,
-    62360,62376,62391,62407,62422,62437,62453,62468,
-    62483,62498,62513,62528,62543,62558,62573,62588,
-    62603,62618,62633,62648,62662,62677,62692,62706,
-    62721,62735,62750,62764,62779,62793,62808,62822,
-    62836,62850,62865,62879,62893,62907,62921,62935,
-    62949,62963,62977,62991,63005,63019,63032,63046,
-    63060,63074,63087,63101,63114,63128,63141,63155,
-    63168,63182,63195,63208,63221,63235,63248,63261,
-    63274,63287,63300,63313,63326,63339,63352,63365,
-    63378,63390,63403,63416,63429,63441,63454,63466,
-    63479,63491,63504,63516,63528,63541,63553,63565,
-    63578,63590,63602,63614,63626,63638,63650,63662,
-    63674,63686,63698,63709,63721,63733,63745,63756,
-    63768,63779,63791,63803,63814,63825,63837,63848,
-    63859,63871,63882,63893,63904,63915,63927,63938,
-    63949,63960,63971,63981,63992,64003,64014,64025,
-    64035,64046,64057,64067,64078,64088,64099,64109,
-    64120,64130,64140,64151,64161,64171,64181,64192,
-    64202,64212,64222,64232,64242,64252,64261,64271,
-    64281,64291,64301,64310,64320,64330,64339,64349,
-    64358,64368,64377,64387,64396,64405,64414,64424,
-    64433,64442,64451,64460,64469,64478,64487,64496,
-    64505,64514,64523,64532,64540,64549,64558,64566,
-    64575,64584,64592,64600,64609,64617,64626,64634,
-    64642,64651,64659,64667,64675,64683,64691,64699,
-    64707,64715,64723,64731,64739,64747,64754,64762,
-    64770,64777,64785,64793,64800,64808,64815,64822,
-    64830,64837,64844,64852,64859,64866,64873,64880,
-    64887,64895,64902,64908,64915,64922,64929,64936,
-    64943,64949,64956,64963,64969,64976,64982,64989,
-    64995,65002,65008,65015,65021,65027,65033,65040,
-    65046,65052,65058,65064,65070,65076,65082,65088,
-    65094,65099,65105,65111,65117,65122,65128,65133,
-    65139,65144,65150,65155,65161,65166,65171,65177,
-    65182,65187,65192,65197,65202,65207,65212,65217,
-    65222,65227,65232,65237,65242,65246,65251,65256,
-    65260,65265,65270,65274,65279,65283,65287,65292,
-    65296,65300,65305,65309,65313,65317,65321,65325,
-    65329,65333,65337,65341,65345,65349,65352,65356,
-    65360,65363,65367,65371,65374,65378,65381,65385,
-    65388,65391,65395,65398,65401,65404,65408,65411,
-    65414,65417,65420,65423,65426,65429,65431,65434,
-    65437,65440,65442,65445,65448,65450,65453,65455,
-    65458,65460,65463,65465,65467,65470,65472,65474,
-    65476,65478,65480,65482,65484,65486,65488,65490,
-    65492,65494,65496,65497,65499,65501,65502,65504,
-    65505,65507,65508,65510,65511,65513,65514,65515,
-    65516,65518,65519,65520,65521,65522,65523,65524,
-    65525,65526,65527,65527,65528,65529,65530,65530,
-    65531,65531,65532,65532,65533,65533,65534,65534,
-    65534,65535,65535,65535,65535,65535,65535,65535
+    25,     75,     125,    175,    226,    276,    326,    376,    427,
+    477,    527,    578,    628,    678,    728,    779,    829,    879,
+    929,    980,    1030,   1080,   1130,   1181,   1231,   1281,   1331,
+    1382,   1432,   1482,   1532,   1583,   1633,   1683,   1733,   1784,
+    1834,   1884,   1934,   1985,   2035,   2085,   2135,   2186,   2236,
+    2286,   2336,   2387,   2437,   2487,   2537,   2587,   2638,   2688,
+    2738,   2788,   2839,   2889,   2939,   2989,   3039,   3090,   3140,
+    3190,   3240,   3291,   3341,   3391,   3441,   3491,   3541,   3592,
+    3642,   3692,   3742,   3792,   3843,   3893,   3943,   3993,   4043,
+    4093,   4144,   4194,   4244,   4294,   4344,   4394,   4445,   4495,
+    4545,   4595,   4645,   4695,   4745,   4796,   4846,   4896,   4946,
+    4996,   5046,   5096,   5146,   5197,   5247,   5297,   5347,   5397,
+    5447,   5497,   5547,   5597,   5647,   5697,   5748,   5798,   5848,
+    5898,   5948,   5998,   6048,   6098,   6148,   6198,   6248,   6298,
+    6348,   6398,   6448,   6498,   6548,   6598,   6648,   6698,   6748,
+    6798,   6848,   6898,   6948,   6998,   7048,   7098,   7148,   7198,
+    7248,   7298,   7348,   7398,   7448,   7498,   7548,   7598,   7648,
+    7697,   7747,   7797,   7847,   7897,   7947,   7997,   8047,   8097,
+    8147,   8196,   8246,   8296,   8346,   8396,   8446,   8496,   8545,
+    8595,   8645,   8695,   8745,   8794,   8844,   8894,   8944,   8994,
+    9043,   9093,   9143,   9193,   9243,   9292,   9342,   9392,   9442,
+    9491,   9541,   9591,   9640,   9690,   9740,   9790,   9839,   9889,
+    9939,   9988,   10038,  10088,  10137,  10187,  10237,  10286,  10336,
+    10386,  10435,  10485,  10534,  10584,  10634,  10683,  10733,  10782,
+    10832,  10882,  10931,  10981,  11030,  11080,  11129,  11179,  11228,
+    11278,  11327,  11377,  11426,  11476,  11525,  11575,  11624,  11674,
+    11723,  11773,  11822,  11872,  11921,  11970,  12020,  12069,  12119,
+    12168,  12218,  12267,  12316,  12366,  12415,  12464,  12514,  12563,
+    12612,  12662,  12711,  12760,  12810,  12859,  12908,  12957,  13007,
+    13056,  13105,  13154,  13204,  13253,  13302,  13351,  13401,  13450,
+    13499,  13548,  13597,  13647,  13696,  13745,  13794,  13843,  13892,
+    13941,  13990,  14040,  14089,  14138,  14187,  14236,  14285,  14334,
+    14383,  14432,  14481,  14530,  14579,  14628,  14677,  14726,  14775,
+    14824,  14873,  14922,  14971,  15020,  15069,  15118,  15167,  15215,
+    15264,  15313,  15362,  15411,  15460,  15509,  15557,  15606,  15655,
+    15704,  15753,  15802,  15850,  15899,  15948,  15997,  16045,  16094,
+    16143,  16191,  16240,  16289,  16338,  16386,  16435,  16484,  16532,
+    16581,  16629,  16678,  16727,  16775,  16824,  16872,  16921,  16970,
+    17018,  17067,  17115,  17164,  17212,  17261,  17309,  17358,  17406,
+    17455,  17503,  17551,  17600,  17648,  17697,  17745,  17793,  17842,
+    17890,  17939,  17987,  18035,  18084,  18132,  18180,  18228,  18277,
+    18325,  18373,  18421,  18470,  18518,  18566,  18614,  18663,  18711,
+    18759,  18807,  18855,  18903,  18951,  19000,  19048,  19096,  19144,
+    19192,  19240,  19288,  19336,  19384,  19432,  19480,  19528,  19576,
+    19624,  19672,  19720,  19768,  19816,  19864,  19912,  19959,  20007,
+    20055,  20103,  20151,  20199,  20246,  20294,  20342,  20390,  20438,
+    20485,  20533,  20581,  20629,  20676,  20724,  20772,  20819,  20867,
+    20915,  20962,  21010,  21057,  21105,  21153,  21200,  21248,  21295,
+    21343,  21390,  21438,  21485,  21533,  21580,  21628,  21675,  21723,
+    21770,  21817,  21865,  21912,  21960,  22007,  22054,  22102,  22149,
+    22196,  22243,  22291,  22338,  22385,  22433,  22480,  22527,  22574,
+    22621,  22668,  22716,  22763,  22810,  22857,  22904,  22951,  22998,
+    23045,  23092,  23139,  23186,  23233,  23280,  23327,  23374,  23421,
+    23468,  23515,  23562,  23609,  23656,  23703,  23750,  23796,  23843,
+    23890,  23937,  23984,  24030,  24077,  24124,  24171,  24217,  24264,
+    24311,  24357,  24404,  24451,  24497,  24544,  24591,  24637,  24684,
+    24730,  24777,  24823,  24870,  24916,  24963,  25009,  25056,  25102,
+    25149,  25195,  25241,  25288,  25334,  25381,  25427,  25473,  25520,
+    25566,  25612,  25658,  25705,  25751,  25797,  25843,  25889,  25936,
+    25982,  26028,  26074,  26120,  26166,  26212,  26258,  26304,  26350,
+    26396,  26442,  26488,  26534,  26580,  26626,  26672,  26718,  26764,
+    26810,  26856,  26902,  26947,  26993,  27039,  27085,  27131,  27176,
+    27222,  27268,  27313,  27359,  27405,  27450,  27496,  27542,  27587,
+    27633,  27678,  27724,  27770,  27815,  27861,  27906,  27952,  27997,
+    28042,  28088,  28133,  28179,  28224,  28269,  28315,  28360,  28405,
+    28451,  28496,  28541,  28586,  28632,  28677,  28722,  28767,  28812,
+    28858,  28903,  28948,  28993,  29038,  29083,  29128,  29173,  29218,
+    29263,  29308,  29353,  29398,  29443,  29488,  29533,  29577,  29622,
+    29667,  29712,  29757,  29801,  29846,  29891,  29936,  29980,  30025,
+    30070,  30114,  30159,  30204,  30248,  30293,  30337,  30382,  30426,
+    30471,  30515,  30560,  30604,  30649,  30693,  30738,  30782,  30826,
+    30871,  30915,  30959,  31004,  31048,  31092,  31136,  31181,  31225,
+    31269,  31313,  31357,  31402,  31446,  31490,  31534,  31578,  31622,
+    31666,  31710,  31754,  31798,  31842,  31886,  31930,  31974,  32017,
+    32061,  32105,  32149,  32193,  32236,  32280,  32324,  32368,  32411,
+    32455,  32499,  32542,  32586,  32630,  32673,  32717,  32760,  32804,
+    32847,  32891,  32934,  32978,  33021,  33065,  33108,  33151,  33195,
+    33238,  33281,  33325,  33368,  33411,  33454,  33498,  33541,  33584,
+    33627,  33670,  33713,  33756,  33799,  33843,  33886,  33929,  33972,
+    34015,  34057,  34100,  34143,  34186,  34229,  34272,  34315,  34358,
+    34400,  34443,  34486,  34529,  34571,  34614,  34657,  34699,  34742,
+    34785,  34827,  34870,  34912,  34955,  34997,  35040,  35082,  35125,
+    35167,  35210,  35252,  35294,  35337,  35379,  35421,  35464,  35506,
+    35548,  35590,  35633,  35675,  35717,  35759,  35801,  35843,  35885,
+    35927,  35969,  36011,  36053,  36095,  36137,  36179,  36221,  36263,
+    36305,  36347,  36388,  36430,  36472,  36514,  36555,  36597,  36639,
+    36681,  36722,  36764,  36805,  36847,  36889,  36930,  36972,  37013,
+    37055,  37096,  37137,  37179,  37220,  37262,  37303,  37344,  37386,
+    37427,  37468,  37509,  37551,  37592,  37633,  37674,  37715,  37756,
+    37797,  37838,  37879,  37920,  37961,  38002,  38043,  38084,  38125,
+    38166,  38207,  38248,  38288,  38329,  38370,  38411,  38451,  38492,
+    38533,  38573,  38614,  38655,  38695,  38736,  38776,  38817,  38857,
+    38898,  38938,  38979,  39019,  39059,  39100,  39140,  39180,  39221,
+    39261,  39301,  39341,  39382,  39422,  39462,  39502,  39542,  39582,
+    39622,  39662,  39702,  39742,  39782,  39822,  39862,  39902,  39942,
+    39982,  40021,  40061,  40101,  40141,  40180,  40220,  40260,  40300,
+    40339,  40379,  40418,  40458,  40497,  40537,  40576,  40616,  40655,
+    40695,  40734,  40773,  40813,  40852,  40891,  40931,  40970,  41009,
+    41048,  41087,  41127,  41166,  41205,  41244,  41283,  41322,  41361,
+    41400,  41439,  41478,  41517,  41556,  41595,  41633,  41672,  41711,
+    41750,  41788,  41827,  41866,  41904,  41943,  41982,  42020,  42059,
+    42097,  42136,  42174,  42213,  42251,  42290,  42328,  42366,  42405,
+    42443,  42481,  42520,  42558,  42596,  42634,  42672,  42711,  42749,
+    42787,  42825,  42863,  42901,  42939,  42977,  43015,  43053,  43091,
+    43128,  43166,  43204,  43242,  43280,  43317,  43355,  43393,  43430,
+    43468,  43506,  43543,  43581,  43618,  43656,  43693,  43731,  43768,
+    43806,  43843,  43880,  43918,  43955,  43992,  44029,  44067,  44104,
+    44141,  44178,  44215,  44252,  44289,  44326,  44363,  44400,  44437,
+    44474,  44511,  44548,  44585,  44622,  44659,  44695,  44732,  44769,
+    44806,  44842,  44879,  44915,  44952,  44989,  45025,  45062,  45098,
+    45135,  45171,  45207,  45244,  45280,  45316,  45353,  45389,  45425,
+    45462,  45498,  45534,  45570,  45606,  45642,  45678,  45714,  45750,
+    45786,  45822,  45858,  45894,  45930,  45966,  46002,  46037,  46073,
+    46109,  46145,  46180,  46216,  46252,  46287,  46323,  46358,  46394,
+    46429,  46465,  46500,  46536,  46571,  46606,  46642,  46677,  46712,
+    46747,  46783,  46818,  46853,  46888,  46923,  46958,  46993,  47028,
+    47063,  47098,  47133,  47168,  47203,  47238,  47273,  47308,  47342,
+    47377,  47412,  47446,  47481,  47516,  47550,  47585,  47619,  47654,
+    47688,  47723,  47757,  47792,  47826,  47860,  47895,  47929,  47963,
+    47998,  48032,  48066,  48100,  48134,  48168,  48202,  48237,  48271,
+    48305,  48338,  48372,  48406,  48440,  48474,  48508,  48542,  48575,
+    48609,  48643,  48676,  48710,  48744,  48777,  48811,  48844,  48878,
+    48911,  48945,  48978,  49012,  49045,  49078,  49112,  49145,  49178,
+    49211,  49244,  49278,  49311,  49344,  49377,  49410,  49443,  49476,
+    49509,  49542,  49575,  49608,  49640,  49673,  49706,  49739,  49771,
+    49804,  49837,  49869,  49902,  49935,  49967,  50000,  50032,  50065,
+    50097,  50129,  50162,  50194,  50226,  50259,  50291,  50323,  50355,
+    50387,  50420,  50452,  50484,  50516,  50548,  50580,  50612,  50644,
+    50675,  50707,  50739,  50771,  50803,  50834,  50866,  50898,  50929,
+    50961,  50993,  51024,  51056,  51087,  51119,  51150,  51182,  51213,
+    51244,  51276,  51307,  51338,  51369,  51401,  51432,  51463,  51494,
+    51525,  51556,  51587,  51618,  51649,  51680,  51711,  51742,  51773,
+    51803,  51834,  51865,  51896,  51926,  51957,  51988,  52018,  52049,
+    52079,  52110,  52140,  52171,  52201,  52231,  52262,  52292,  52322,
+    52353,  52383,  52413,  52443,  52473,  52503,  52534,  52564,  52594,
+    52624,  52653,  52683,  52713,  52743,  52773,  52803,  52832,  52862,
+    52892,  52922,  52951,  52981,  53010,  53040,  53069,  53099,  53128,
+    53158,  53187,  53216,  53246,  53275,  53304,  53334,  53363,  53392,
+    53421,  53450,  53479,  53508,  53537,  53566,  53595,  53624,  53653,
+    53682,  53711,  53739,  53768,  53797,  53826,  53854,  53883,  53911,
+    53940,  53969,  53997,  54026,  54054,  54082,  54111,  54139,  54167,
+    54196,  54224,  54252,  54280,  54308,  54337,  54365,  54393,  54421,
+    54449,  54477,  54505,  54533,  54560,  54588,  54616,  54644,  54672,
+    54699,  54727,  54755,  54782,  54810,  54837,  54865,  54892,  54920,
+    54947,  54974,  55002,  55029,  55056,  55084,  55111,  55138,  55165,
+    55192,  55219,  55246,  55274,  55300,  55327,  55354,  55381,  55408,
+    55435,  55462,  55489,  55515,  55542,  55569,  55595,  55622,  55648,
+    55675,  55701,  55728,  55754,  55781,  55807,  55833,  55860,  55886,
+    55912,  55938,  55965,  55991,  56017,  56043,  56069,  56095,  56121,
+    56147,  56173,  56199,  56225,  56250,  56276,  56302,  56328,  56353,
+    56379,  56404,  56430,  56456,  56481,  56507,  56532,  56557,  56583,
+    56608,  56633,  56659,  56684,  56709,  56734,  56760,  56785,  56810,
+    56835,  56860,  56885,  56910,  56935,  56959,  56984,  57009,  57034,
+    57059,  57083,  57108,  57133,  57157,  57182,  57206,  57231,  57255,
+    57280,  57304,  57329,  57353,  57377,  57402,  57426,  57450,  57474,
+    57498,  57522,  57546,  57570,  57594,  57618,  57642,  57666,  57690,
+    57714,  57738,  57762,  57785,  57809,  57833,  57856,  57880,  57903,
+    57927,  57950,  57974,  57997,  58021,  58044,  58067,  58091,  58114,
+    58137,  58160,  58183,  58207,  58230,  58253,  58276,  58299,  58322,
+    58345,  58367,  58390,  58413,  58436,  58459,  58481,  58504,  58527,
+    58549,  58572,  58594,  58617,  58639,  58662,  58684,  58706,  58729,
+    58751,  58773,  58795,  58818,  58840,  58862,  58884,  58906,  58928,
+    58950,  58972,  58994,  59016,  59038,  59059,  59081,  59103,  59125,
+    59146,  59168,  59190,  59211,  59233,  59254,  59276,  59297,  59318,
+    59340,  59361,  59382,  59404,  59425,  59446,  59467,  59488,  59509,
+    59530,  59551,  59572,  59593,  59614,  59635,  59656,  59677,  59697,
+    59718,  59739,  59759,  59780,  59801,  59821,  59842,  59862,  59883,
+    59903,  59923,  59944,  59964,  59984,  60004,  60025,  60045,  60065,
+    60085,  60105,  60125,  60145,  60165,  60185,  60205,  60225,  60244,
+    60264,  60284,  60304,  60323,  60343,  60363,  60382,  60402,  60421,
+    60441,  60460,  60479,  60499,  60518,  60537,  60556,  60576,  60595,
+    60614,  60633,  60652,  60671,  60690,  60709,  60728,  60747,  60766,
+    60785,  60803,  60822,  60841,  60859,  60878,  60897,  60915,  60934,
+    60952,  60971,  60989,  61007,  61026,  61044,  61062,  61081,  61099,
+    61117,  61135,  61153,  61171,  61189,  61207,  61225,  61243,  61261,
+    61279,  61297,  61314,  61332,  61350,  61367,  61385,  61403,  61420,
+    61438,  61455,  61473,  61490,  61507,  61525,  61542,  61559,  61577,
+    61594,  61611,  61628,  61645,  61662,  61679,  61696,  61713,  61730,
+    61747,  61764,  61780,  61797,  61814,  61831,  61847,  61864,  61880,
+    61897,  61913,  61930,  61946,  61963,  61979,  61995,  62012,  62028,
+    62044,  62060,  62076,  62092,  62108,  62125,  62141,  62156,  62172,
+    62188,  62204,  62220,  62236,  62251,  62267,  62283,  62298,  62314,
+    62329,  62345,  62360,  62376,  62391,  62407,  62422,  62437,  62453,
+    62468,  62483,  62498,  62513,  62528,  62543,  62558,  62573,  62588,
+    62603,  62618,  62633,  62648,  62662,  62677,  62692,  62706,  62721,
+    62735,  62750,  62764,  62779,  62793,  62808,  62822,  62836,  62850,
+    62865,  62879,  62893,  62907,  62921,  62935,  62949,  62963,  62977,
+    62991,  63005,  63019,  63032,  63046,  63060,  63074,  63087,  63101,
+    63114,  63128,  63141,  63155,  63168,  63182,  63195,  63208,  63221,
+    63235,  63248,  63261,  63274,  63287,  63300,  63313,  63326,  63339,
+    63352,  63365,  63378,  63390,  63403,  63416,  63429,  63441,  63454,
+    63466,  63479,  63491,  63504,  63516,  63528,  63541,  63553,  63565,
+    63578,  63590,  63602,  63614,  63626,  63638,  63650,  63662,  63674,
+    63686,  63698,  63709,  63721,  63733,  63745,  63756,  63768,  63779,
+    63791,  63803,  63814,  63825,  63837,  63848,  63859,  63871,  63882,
+    63893,  63904,  63915,  63927,  63938,  63949,  63960,  63971,  63981,
+    63992,  64003,  64014,  64025,  64035,  64046,  64057,  64067,  64078,
+    64088,  64099,  64109,  64120,  64130,  64140,  64151,  64161,  64171,
+    64181,  64192,  64202,  64212,  64222,  64232,  64242,  64252,  64261,
+    64271,  64281,  64291,  64301,  64310,  64320,  64330,  64339,  64349,
+    64358,  64368,  64377,  64387,  64396,  64405,  64414,  64424,  64433,
+    64442,  64451,  64460,  64469,  64478,  64487,  64496,  64505,  64514,
+    64523,  64532,  64540,  64549,  64558,  64566,  64575,  64584,  64592,
+    64601,  64609,  64617,  64626,  64634,  64642,  64651,  64659,  64667,
+    64675,  64683,  64691,  64699,  64707,  64715,  64723,  64731,  64739,
+    64747,  64754,  64762,  64770,  64777,  64785,  64793,  64800,  64808,
+    64815,  64822,  64830,  64837,  64844,  64852,  64859,  64866,  64873,
+    64880,  64887,  64895,  64902,  64908,  64915,  64922,  64929,  64936,
+    64943,  64949,  64956,  64963,  64969,  64976,  64982,  64989,  64995,
+    65002,  65008,  65015,  65021,  65027,  65033,  65040,  65046,  65052,
+    65058,  65064,  65070,  65076,  65082,  65088,  65094,  65099,  65105,
+    65111,  65117,  65122,  65128,  65133,  65139,  65144,  65150,  65155,
+    65161,  65166,  65171,  65177,  65182,  65187,  65192,  65197,  65202,
+    65207,  65212,  65217,  65222,  65227,  65232,  65237,  65242,  65246,
+    65251,  65256,  65260,  65265,  65270,  65274,  65279,  65283,  65287,
+    65292,  65296,  65300,  65305,  65309,  65313,  65317,  65321,  65325,
+    65329,  65333,  65337,  65341,  65345,  65349,  65352,  65356,  65360,
+    65363,  65367,  65371,  65374,  65378,  65381,  65385,  65388,  65391,
+    65395,  65398,  65401,  65404,  65408,  65411,  65414,  65417,  65420,
+    65423,  65426,  65429,  65431,  65434,  65437,  65440,  65442,  65445,
+    65448,  65450,  65453,  65455,  65458,  65460,  65463,  65465,  65467,
+    65470,  65472,  65474,  65476,  65478,  65480,  65482,  65484,  65486,
+    65488,  65490,  65492,  65494,  65496,  65497,  65499,  65501,  65502,
+    65504,  65505,  65507,  65508,  65510,  65511,  65513,  65514,  65515,
+    65516,  65518,  65519,  65520,  65521,  65522,  65523,  65524,  65525,
+    65526,  65527,  65527,  65528,  65529,  65530,  65530,  65531,  65531,
+    65532,  65532,  65533,  65533,  65534,  65534,  65534,  65535,  65535,
+    65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
+    65535,  65535,  65535,  65534,  65534,  65534,  65533,  65533,  65532,
+    65532,  65531,  65531,  65530,  65530,  65529,  65528,  65527,  65527,
+    65526,  65525,  65524,  65523,  65522,  65521,  65520,  65519,  65518,
+    65516,  65515,  65514,  65513,  65511,  65510,  65508,  65507,  65505,
+    65504,  65502,  65501,  65499,  65497,  65496,  65494,  65492,  65490,
+    65488,  65486,  65484,  65482,  65480,  65478,  65476,  65474,  65472,
+    65470,  65467,  65465,  65463,  65460,  65458,  65455,  65453,  65450,
+    65448,  65445,  65442,  65440,  65437,  65434,  65431,  65429,  65426,
+    65423,  65420,  65417,  65414,  65411,  65408,  65404,  65401,  65398,
+    65395,  65391,  65388,  65385,  65381,  65378,  65374,  65371,  65367,
+    65363,  65360,  65356,  65352,  65349,  65345,  65341,  65337,  65333,
+    65329,  65325,  65321,  65317,  65313,  65309,  65305,  65300,  65296,
+    65292,  65287,  65283,  65279,  65274,  65270,  65265,  65260,  65256,
+    65251,  65246,  65242,  65237,  65232,  65227,  65222,  65217,  65212,
+    65207,  65202,  65197,  65192,  65187,  65182,  65177,  65171,  65166,
+    65161,  65155,  65150,  65144,  65139,  65133,  65128,  65122,  65117,
+    65111,  65105,  65099,  65094,  65088,  65082,  65076,  65070,  65064,
+    65058,  65052,  65046,  65040,  65033,  65027,  65021,  65015,  65008,
+    65002,  64995,  64989,  64982,  64976,  64969,  64963,  64956,  64949,
+    64943,  64936,  64929,  64922,  64915,  64908,  64902,  64895,  64887,
+    64880,  64873,  64866,  64859,  64852,  64844,  64837,  64830,  64822,
+    64815,  64808,  64800,  64793,  64785,  64777,  64770,  64762,  64754,
+    64747,  64739,  64731,  64723,  64715,  64707,  64699,  64691,  64683,
+    64675,  64667,  64659,  64651,  64642,  64634,  64626,  64617,  64609,
+    64600,  64592,  64584,  64575,  64566,  64558,  64549,  64540,  64532,
+    64523,  64514,  64505,  64496,  64487,  64478,  64469,  64460,  64451,
+    64442,  64433,  64424,  64414,  64405,  64396,  64387,  64377,  64368,
+    64358,  64349,  64339,  64330,  64320,  64310,  64301,  64291,  64281,
+    64271,  64261,  64252,  64242,  64232,  64222,  64212,  64202,  64192,
+    64181,  64171,  64161,  64151,  64140,  64130,  64120,  64109,  64099,
+    64088,  64078,  64067,  64057,  64046,  64035,  64025,  64014,  64003,
+    63992,  63981,  63971,  63960,  63949,  63938,  63927,  63915,  63904,
+    63893,  63882,  63871,  63859,  63848,  63837,  63825,  63814,  63803,
+    63791,  63779,  63768,  63756,  63745,  63733,  63721,  63709,  63698,
+    63686,  63674,  63662,  63650,  63638,  63626,  63614,  63602,  63590,
+    63578,  63565,  63553,  63541,  63528,  63516,  63504,  63491,  63479,
+    63466,  63454,  63441,  63429,  63416,  63403,  63390,  63378,  63365,
+    63352,  63339,  63326,  63313,  63300,  63287,  63274,  63261,  63248,
+    63235,  63221,  63208,  63195,  63182,  63168,  63155,  63141,  63128,
+    63114,  63101,  63087,  63074,  63060,  63046,  63032,  63019,  63005,
+    62991,  62977,  62963,  62949,  62935,  62921,  62907,  62893,  62879,
+    62865,  62850,  62836,  62822,  62808,  62793,  62779,  62764,  62750,
+    62735,  62721,  62706,  62692,  62677,  62662,  62648,  62633,  62618,
+    62603,  62588,  62573,  62558,  62543,  62528,  62513,  62498,  62483,
+    62468,  62453,  62437,  62422,  62407,  62391,  62376,  62360,  62345,
+    62329,  62314,  62298,  62283,  62267,  62251,  62236,  62220,  62204,
+    62188,  62172,  62156,  62141,  62125,  62108,  62092,  62076,  62060,
+    62044,  62028,  62012,  61995,  61979,  61963,  61946,  61930,  61913,
+    61897,  61880,  61864,  61847,  61831,  61814,  61797,  61780,  61764,
+    61747,  61730,  61713,  61696,  61679,  61662,  61645,  61628,  61611,
+    61594,  61577,  61559,  61542,  61525,  61507,  61490,  61473,  61455,
+    61438,  61420,  61403,  61385,  61367,  61350,  61332,  61314,  61297,
+    61279,  61261,  61243,  61225,  61207,  61189,  61171,  61153,  61135,
+    61117,  61099,  61081,  61062,  61044,  61026,  61007,  60989,  60971,
+    60952,  60934,  60915,  60897,  60878,  60859,  60841,  60822,  60803,
+    60785,  60766,  60747,  60728,  60709,  60690,  60671,  60652,  60633,
+    60614,  60595,  60576,  60556,  60537,  60518,  60499,  60479,  60460,
+    60441,  60421,  60402,  60382,  60363,  60343,  60323,  60304,  60284,
+    60264,  60244,  60225,  60205,  60185,  60165,  60145,  60125,  60105,
+    60085,  60065,  60045,  60025,  60004,  59984,  59964,  59944,  59923,
+    59903,  59883,  59862,  59842,  59821,  59801,  59780,  59759,  59739,
+    59718,  59697,  59677,  59656,  59635,  59614,  59593,  59572,  59551,
+    59530,  59509,  59488,  59467,  59446,  59425,  59404,  59382,  59361,
+    59340,  59318,  59297,  59276,  59254,  59233,  59211,  59190,  59168,
+    59146,  59125,  59103,  59081,  59059,  59038,  59016,  58994,  58972,
+    58950,  58928,  58906,  58884,  58862,  58840,  58818,  58795,  58773,
+    58751,  58729,  58706,  58684,  58662,  58639,  58617,  58594,  58572,
+    58549,  58527,  58504,  58481,  58459,  58436,  58413,  58390,  58367,
+    58345,  58322,  58299,  58276,  58253,  58230,  58207,  58183,  58160,
+    58137,  58114,  58091,  58067,  58044,  58021,  57997,  57974,  57950,
+    57927,  57903,  57880,  57856,  57833,  57809,  57785,  57762,  57738,
+    57714,  57690,  57666,  57642,  57618,  57594,  57570,  57546,  57522,
+    57498,  57474,  57450,  57426,  57402,  57377,  57353,  57329,  57304,
+    57280,  57255,  57231,  57206,  57182,  57157,  57133,  57108,  57083,
+    57059,  57034,  57009,  56984,  56959,  56935,  56910,  56885,  56860,
+    56835,  56810,  56785,  56760,  56734,  56709,  56684,  56659,  56633,
+    56608,  56583,  56557,  56532,  56507,  56481,  56456,  56430,  56404,
+    56379,  56353,  56328,  56302,  56276,  56250,  56225,  56199,  56173,
+    56147,  56121,  56095,  56069,  56043,  56017,  55991,  55965,  55938,
+    55912,  55886,  55860,  55833,  55807,  55781,  55754,  55728,  55701,
+    55675,  55648,  55622,  55595,  55569,  55542,  55515,  55489,  55462,
+    55435,  55408,  55381,  55354,  55327,  55300,  55274,  55246,  55219,
+    55192,  55165,  55138,  55111,  55084,  55056,  55029,  55002,  54974,
+    54947,  54920,  54892,  54865,  54837,  54810,  54782,  54755,  54727,
+    54699,  54672,  54644,  54616,  54588,  54560,  54533,  54505,  54477,
+    54449,  54421,  54393,  54365,  54337,  54308,  54280,  54252,  54224,
+    54196,  54167,  54139,  54111,  54082,  54054,  54026,  53997,  53969,
+    53940,  53911,  53883,  53854,  53826,  53797,  53768,  53739,  53711,
+    53682,  53653,  53624,  53595,  53566,  53537,  53508,  53479,  53450,
+    53421,  53392,  53363,  53334,  53304,  53275,  53246,  53216,  53187,
+    53158,  53128,  53099,  53069,  53040,  53010,  52981,  52951,  52922,
+    52892,  52862,  52832,  52803,  52773,  52743,  52713,  52683,  52653,
+    52624,  52594,  52564,  52534,  52503,  52473,  52443,  52413,  52383,
+    52353,  52322,  52292,  52262,  52231,  52201,  52171,  52140,  52110,
+    52079,  52049,  52018,  51988,  51957,  51926,  51896,  51865,  51834,
+    51803,  51773,  51742,  51711,  51680,  51649,  51618,  51587,  51556,
+    51525,  51494,  51463,  51432,  51401,  51369,  51338,  51307,  51276,
+    51244,  51213,  51182,  51150,  51119,  51087,  51056,  51024,  50993,
+    50961,  50929,  50898,  50866,  50834,  50803,  50771,  50739,  50707,
+    50675,  50644,  50612,  50580,  50548,  50516,  50484,  50452,  50420,
+    50387,  50355,  50323,  50291,  50259,  50226,  50194,  50162,  50129,
+    50097,  50065,  50032,  50000,  49967,  49935,  49902,  49869,  49837,
+    49804,  49771,  49739,  49706,  49673,  49640,  49608,  49575,  49542,
+    49509,  49476,  49443,  49410,  49377,  49344,  49311,  49278,  49244,
+    49211,  49178,  49145,  49112,  49078,  49045,  49012,  48978,  48945,
+    48911,  48878,  48844,  48811,  48777,  48744,  48710,  48676,  48643,
+    48609,  48575,  48542,  48508,  48474,  48440,  48406,  48372,  48338,
+    48304,  48271,  48237,  48202,  48168,  48134,  48100,  48066,  48032,
+    47998,  47963,  47929,  47895,  47860,  47826,  47792,  47757,  47723,
+    47688,  47654,  47619,  47585,  47550,  47516,  47481,  47446,  47412,
+    47377,  47342,  47308,  47273,  47238,  47203,  47168,  47133,  47098,
+    47063,  47028,  46993,  46958,  46923,  46888,  46853,  46818,  46783,
+    46747,  46712,  46677,  46642,  46606,  46571,  46536,  46500,  46465,
+    46429,  46394,  46358,  46323,  46287,  46252,  46216,  46180,  46145,
+    46109,  46073,  46037,  46002,  45966,  45930,  45894,  45858,  45822,
+    45786,  45750,  45714,  45678,  45642,  45606,  45570,  45534,  45498,
+    45462,  45425,  45389,  45353,  45316,  45280,  45244,  45207,  45171,
+    45135,  45098,  45062,  45025,  44989,  44952,  44915,  44879,  44842,
+    44806,  44769,  44732,  44695,  44659,  44622,  44585,  44548,  44511,
+    44474,  44437,  44400,  44363,  44326,  44289,  44252,  44215,  44178,
+    44141,  44104,  44067,  44029,  43992,  43955,  43918,  43880,  43843,
+    43806,  43768,  43731,  43693,  43656,  43618,  43581,  43543,  43506,
+    43468,  43430,  43393,  43355,  43317,  43280,  43242,  43204,  43166,
+    43128,  43091,  43053,  43015,  42977,  42939,  42901,  42863,  42825,
+    42787,  42749,  42711,  42672,  42634,  42596,  42558,  42520,  42481,
+    42443,  42405,  42366,  42328,  42290,  42251,  42213,  42174,  42136,
+    42097,  42059,  42020,  41982,  41943,  41904,  41866,  41827,  41788,
+    41750,  41711,  41672,  41633,  41595,  41556,  41517,  41478,  41439,
+    41400,  41361,  41322,  41283,  41244,  41205,  41166,  41127,  41088,
+    41048,  41009,  40970,  40931,  40891,  40852,  40813,  40773,  40734,
+    40695,  40655,  40616,  40576,  40537,  40497,  40458,  40418,  40379,
+    40339,  40300,  40260,  40220,  40180,  40141,  40101,  40061,  40021,
+    39982,  39942,  39902,  39862,  39822,  39782,  39742,  39702,  39662,
+    39622,  39582,  39542,  39502,  39462,  39422,  39382,  39341,  39301,
+    39261,  39221,  39180,  39140,  39100,  39059,  39019,  38979,  38938,
+    38898,  38857,  38817,  38776,  38736,  38695,  38655,  38614,  38573,
+    38533,  38492,  38451,  38411,  38370,  38329,  38288,  38248,  38207,
+    38166,  38125,  38084,  38043,  38002,  37961,  37920,  37879,  37838,
+    37797,  37756,  37715,  37674,  37633,  37592,  37551,  37509,  37468,
+    37427,  37386,  37344,  37303,  37262,  37220,  37179,  37137,  37096,
+    37055,  37013,  36972,  36930,  36889,  36847,  36805,  36764,  36722,
+    36681,  36639,  36597,  36556,  36514,  36472,  36430,  36388,  36347,
+    36305,  36263,  36221,  36179,  36137,  36095,  36053,  36011,  35969,
+    35927,  35885,  35843,  35801,  35759,  35717,  35675,  35633,  35590,
+    35548,  35506,  35464,  35421,  35379,  35337,  35294,  35252,  35210,
+    35167,  35125,  35082,  35040,  34997,  34955,  34912,  34870,  34827,
+    34785,  34742,  34699,  34657,  34614,  34571,  34529,  34486,  34443,
+    34400,  34358,  34315,  34272,  34229,  34186,  34143,  34100,  34057,
+    34015,  33972,  33929,  33886,  33843,  33799,  33756,  33713,  33670,
+    33627,  33584,  33541,  33498,  33454,  33411,  33368,  33325,  33281,
+    33238,  33195,  33151,  33108,  33065,  33021,  32978,  32934,  32891,
+    32847,  32804,  32760,  32717,  32673,  32630,  32586,  32542,  32499,
+    32455,  32411,  32368,  32324,  32280,  32236,  32193,  32149,  32105,
+    32061,  32017,  31974,  31930,  31886,  31842,  31798,  31754,  31710,
+    31666,  31622,  31578,  31534,  31490,  31446,  31402,  31357,  31313,
+    31269,  31225,  31181,  31136,  31092,  31048,  31004,  30959,  30915,
+    30871,  30826,  30782,  30738,  30693,  30649,  30604,  30560,  30515,
+    30471,  30426,  30382,  30337,  30293,  30248,  30204,  30159,  30114,
+    30070,  30025,  29980,  29936,  29891,  29846,  29801,  29757,  29712,
+    29667,  29622,  29577,  29533,  29488,  29443,  29398,  29353,  29308,
+    29263,  29218,  29173,  29128,  29083,  29038,  28993,  28948,  28903,
+    28858,  28812,  28767,  28722,  28677,  28632,  28586,  28541,  28496,
+    28451,  28405,  28360,  28315,  28269,  28224,  28179,  28133,  28088,
+    28042,  27997,  27952,  27906,  27861,  27815,  27770,  27724,  27678,
+    27633,  27587,  27542,  27496,  27450,  27405,  27359,  27313,  27268,
+    27222,  27176,  27131,  27085,  27039,  26993,  26947,  26902,  26856,
+    26810,  26764,  26718,  26672,  26626,  26580,  26534,  26488,  26442,
+    26396,  26350,  26304,  26258,  26212,  26166,  26120,  26074,  26028,
+    25982,  25936,  25889,  25843,  25797,  25751,  25705,  25658,  25612,
+    25566,  25520,  25473,  25427,  25381,  25334,  25288,  25241,  25195,
+    25149,  25102,  25056,  25009,  24963,  24916,  24870,  24823,  24777,
+    24730,  24684,  24637,  24591,  24544,  24497,  24451,  24404,  24357,
+    24311,  24264,  24217,  24171,  24124,  24077,  24030,  23984,  23937,
+    23890,  23843,  23796,  23750,  23703,  23656,  23609,  23562,  23515,
+    23468,  23421,  23374,  23327,  23280,  23233,  23186,  23139,  23092,
+    23045,  22998,  22951,  22904,  22857,  22810,  22763,  22716,  22668,
+    22621,  22574,  22527,  22480,  22433,  22385,  22338,  22291,  22243,
+    22196,  22149,  22102,  22054,  22007,  21960,  21912,  21865,  21817,
+    21770,  21723,  21675,  21628,  21580,  21533,  21485,  21438,  21390,
+    21343,  21295,  21248,  21200,  21153,  21105,  21057,  21010,  20962,
+    20915,  20867,  20819,  20772,  20724,  20676,  20629,  20581,  20533,
+    20485,  20438,  20390,  20342,  20294,  20246,  20199,  20151,  20103,
+    20055,  20007,  19959,  19912,  19864,  19816,  19768,  19720,  19672,
+    19624,  19576,  19528,  19480,  19432,  19384,  19336,  19288,  19240,
+    19192,  19144,  19096,  19048,  19000,  18951,  18903,  18855,  18807,
+    18759,  18711,  18663,  18614,  18566,  18518,  18470,  18421,  18373,
+    18325,  18277,  18228,  18180,  18132,  18084,  18035,  17987,  17939,
+    17890,  17842,  17793,  17745,  17697,  17648,  17600,  17551,  17503,
+    17455,  17406,  17358,  17309,  17261,  17212,  17164,  17115,  17067,
+    17018,  16970,  16921,  16872,  16824,  16775,  16727,  16678,  16629,
+    16581,  16532,  16484,  16435,  16386,  16338,  16289,  16240,  16191,
+    16143,  16094,  16045,  15997,  15948,  15899,  15850,  15802,  15753,
+    15704,  15655,  15606,  15557,  15509,  15460,  15411,  15362,  15313,
+    15264,  15215,  15167,  15118,  15069,  15020,  14971,  14922,  14873,
+    14824,  14775,  14726,  14677,  14628,  14579,  14530,  14481,  14432,
+    14383,  14334,  14285,  14236,  14187,  14138,  14089,  14040,  13990,
+    13941,  13892,  13843,  13794,  13745,  13696,  13646,  13597,  13548,
+    13499,  13450,  13401,  13351,  13302,  13253,  13204,  13154,  13105,
+    13056,  13007,  12957,  12908,  12859,  12810,  12760,  12711,  12662,
+    12612,  12563,  12514,  12464,  12415,  12366,  12316,  12267,  12218,
+    12168,  12119,  12069,  12020,  11970,  11921,  11872,  11822,  11773,
+    11723,  11674,  11624,  11575,  11525,  11476,  11426,  11377,  11327,
+    11278,  11228,  11179,  11129,  11080,  11030,  10981,  10931,  10882,
+    10832,  10782,  10733,  10683,  10634,  10584,  10534,  10485,  10435,
+    10386,  10336,  10286,  10237,  10187,  10137,  10088,  10038,  9988,
+    9939,   9889,   9839,   9790,   9740,   9690,   9640,   9591,   9541,
+    9491,   9442,   9392,   9342,   9292,   9243,   9193,   9143,   9093,
+    9043,   8994,   8944,   8894,   8844,   8794,   8745,   8695,   8645,
+    8595,   8545,   8496,   8446,   8396,   8346,   8296,   8246,   8196,
+    8147,   8097,   8047,   7997,   7947,   7897,   7847,   7797,   7747,
+    7697,   7648,   7598,   7548,   7498,   7448,   7398,   7348,   7298,
+    7248,   7198,   7148,   7098,   7048,   6998,   6948,   6898,   6848,
+    6798,   6748,   6698,   6648,   6598,   6548,   6498,   6448,   6398,
+    6348,   6298,   6248,   6198,   6148,   6098,   6048,   5998,   5948,
+    5898,   5848,   5798,   5748,   5697,   5647,   5597,   5547,   5497,
+    5447,   5397,   5347,   5297,   5247,   5197,   5146,   5096,   5046,
+    4996,   4946,   4896,   4846,   4796,   4745,   4695,   4645,   4595,
+    4545,   4495,   4445,   4394,   4344,   4294,   4244,   4194,   4144,
+    4093,   4043,   3993,   3943,   3893,   3843,   3792,   3742,   3692,
+    3642,   3592,   3541,   3491,   3441,   3391,   3341,   3291,   3240,
+    3190,   3140,   3090,   3039,   2989,   2939,   2889,   2839,   2788,
+    2738,   2688,   2638,   2587,   2537,   2487,   2437,   2387,   2336,
+    2286,   2236,   2186,   2135,   2085,   2035,   1985,   1934,   1884,
+    1834,   1784,   1733,   1683,   1633,   1583,   1532,   1482,   1432,
+    1382,   1331,   1281,   1231,   1181,   1130,   1080,   1030,   980,
+    929,    879,    829,    779,    728,    678,    628,    578,    527,
+    477,    427,    376,    326,    276,    226,    175,    125,    75,
+    25,     -25,    -75,    -125,   -175,   -226,   -276,   -326,   -376,
+    -427,   -477,   -527,   -578,   -628,   -678,   -728,   -779,   -829,
+    -879,   -929,   -980,   -1030,  -1080,  -1130,  -1181,  -1231,  -1281,
+    -1331,  -1382,  -1432,  -1482,  -1532,  -1583,  -1633,  -1683,  -1733,
+    -1784,  -1834,  -1884,  -1934,  -1985,  -2035,  -2085,  -2135,  -2186,
+    -2236,  -2286,  -2336,  -2387,  -2437,  -2487,  -2537,  -2588,  -2638,
+    -2688,  -2738,  -2788,  -2839,  -2889,  -2939,  -2989,  -3039,  -3090,
+    -3140,  -3190,  -3240,  -3291,  -3341,  -3391,  -3441,  -3491,  -3541,
+    -3592,  -3642,  -3692,  -3742,  -3792,  -3843,  -3893,  -3943,  -3993,
+    -4043,  -4093,  -4144,  -4194,  -4244,  -4294,  -4344,  -4394,  -4445,
+    -4495,  -4545,  -4595,  -4645,  -4695,  -4745,  -4796,  -4846,  -4896,
+    -4946,  -4996,  -5046,  -5096,  -5146,  -5197,  -5247,  -5297,  -5347,
+    -5397,  -5447,  -5497,  -5547,  -5597,  -5647,  -5697,  -5748,  -5798,
+    -5848,  -5898,  -5948,  -5998,  -6048,  -6098,  -6148,  -6198,  -6248,
+    -6298,  -6348,  -6398,  -6448,  -6498,  -6548,  -6598,  -6648,  -6698,
+    -6748,  -6798,  -6848,  -6898,  -6948,  -6998,  -7048,  -7098,  -7148,
+    -7198,  -7248,  -7298,  -7348,  -7398,  -7448,  -7498,  -7548,  -7598,
+    -7648,  -7697,  -7747,  -7797,  -7847,  -7897,  -7947,  -7997,  -8047,
+    -8097,  -8147,  -8196,  -8246,  -8296,  -8346,  -8396,  -8446,  -8496,
+    -8545,  -8595,  -8645,  -8695,  -8745,  -8794,  -8844,  -8894,  -8944,
+    -8994,  -9043,  -9093,  -9143,  -9193,  -9243,  -9292,  -9342,  -9392,
+    -9442,  -9491,  -9541,  -9591,  -9640,  -9690,  -9740,  -9790,  -9839,
+    -9889,  -9939,  -9988,  -10038, -10088, -10137, -10187, -10237, -10286,
+    -10336, -10386, -10435, -10485, -10534, -10584, -10634, -10683, -10733,
+    -10782, -10832, -10882, -10931, -10981, -11030, -11080, -11129, -11179,
+    -11228, -11278, -11327, -11377, -11426, -11476, -11525, -11575, -11624,
+    -11674, -11723, -11773, -11822, -11872, -11921, -11970, -12020, -12069,
+    -12119, -12168, -12218, -12267, -12316, -12366, -12415, -12464, -12514,
+    -12563, -12612, -12662, -12711, -12760, -12810, -12859, -12908, -12957,
+    -13007, -13056, -13105, -13154, -13204, -13253, -13302, -13351, -13401,
+    -13450, -13499, -13548, -13597, -13647, -13696, -13745, -13794, -13843,
+    -13892, -13941, -13990, -14040, -14089, -14138, -14187, -14236, -14285,
+    -14334, -14383, -14432, -14481, -14530, -14579, -14628, -14677, -14726,
+    -14775, -14824, -14873, -14922, -14971, -15020, -15069, -15118, -15167,
+    -15215, -15264, -15313, -15362, -15411, -15460, -15509, -15557, -15606,
+    -15655, -15704, -15753, -15802, -15850, -15899, -15948, -15997, -16045,
+    -16094, -16143, -16191, -16240, -16289, -16338, -16386, -16435, -16484,
+    -16532, -16581, -16629, -16678, -16727, -16775, -16824, -16872, -16921,
+    -16970, -17018, -17067, -17115, -17164, -17212, -17261, -17309, -17358,
+    -17406, -17455, -17503, -17551, -17600, -17648, -17697, -17745, -17793,
+    -17842, -17890, -17939, -17987, -18035, -18084, -18132, -18180, -18228,
+    -18277, -18325, -18373, -18421, -18470, -18518, -18566, -18614, -18663,
+    -18711, -18759, -18807, -18855, -18903, -18951, -19000, -19048, -19096,
+    -19144, -19192, -19240, -19288, -19336, -19384, -19432, -19480, -19528,
+    -19576, -19624, -19672, -19720, -19768, -19816, -19864, -19912, -19959,
+    -20007, -20055, -20103, -20151, -20199, -20246, -20294, -20342, -20390,
+    -20438, -20485, -20533, -20581, -20629, -20676, -20724, -20772, -20819,
+    -20867, -20915, -20962, -21010, -21057, -21105, -21153, -21200, -21248,
+    -21295, -21343, -21390, -21438, -21485, -21533, -21580, -21628, -21675,
+    -21723, -21770, -21817, -21865, -21912, -21960, -22007, -22054, -22102,
+    -22149, -22196, -22243, -22291, -22338, -22385, -22433, -22480, -22527,
+    -22574, -22621, -22668, -22716, -22763, -22810, -22857, -22904, -22951,
+    -22998, -23045, -23092, -23139, -23186, -23233, -23280, -23327, -23374,
+    -23421, -23468, -23515, -23562, -23609, -23656, -23703, -23750, -23796,
+    -23843, -23890, -23937, -23984, -24030, -24077, -24124, -24171, -24217,
+    -24264, -24311, -24357, -24404, -24451, -24497, -24544, -24591, -24637,
+    -24684, -24730, -24777, -24823, -24870, -24916, -24963, -25009, -25056,
+    -25102, -25149, -25195, -25241, -25288, -25334, -25381, -25427, -25473,
+    -25520, -25566, -25612, -25658, -25705, -25751, -25797, -25843, -25889,
+    -25936, -25982, -26028, -26074, -26120, -26166, -26212, -26258, -26304,
+    -26350, -26396, -26442, -26488, -26534, -26580, -26626, -26672, -26718,
+    -26764, -26810, -26856, -26902, -26947, -26993, -27039, -27085, -27131,
+    -27176, -27222, -27268, -27313, -27359, -27405, -27450, -27496, -27542,
+    -27587, -27633, -27678, -27724, -27770, -27815, -27861, -27906, -27952,
+    -27997, -28042, -28088, -28133, -28179, -28224, -28269, -28315, -28360,
+    -28405, -28451, -28496, -28541, -28586, -28632, -28677, -28722, -28767,
+    -28812, -28858, -28903, -28948, -28993, -29038, -29083, -29128, -29173,
+    -29218, -29263, -29308, -29353, -29398, -29443, -29488, -29533, -29577,
+    -29622, -29667, -29712, -29757, -29801, -29846, -29891, -29936, -29980,
+    -30025, -30070, -30114, -30159, -30204, -30248, -30293, -30337, -30382,
+    -30426, -30471, -30515, -30560, -30604, -30649, -30693, -30738, -30782,
+    -30826, -30871, -30915, -30959, -31004, -31048, -31092, -31136, -31181,
+    -31225, -31269, -31313, -31357, -31402, -31446, -31490, -31534, -31578,
+    -31622, -31666, -31710, -31754, -31798, -31842, -31886, -31930, -31974,
+    -32017, -32061, -32105, -32149, -32193, -32236, -32280, -32324, -32368,
+    -32411, -32455, -32499, -32542, -32586, -32630, -32673, -32717, -32760,
+    -32804, -32847, -32891, -32934, -32978, -33021, -33065, -33108, -33151,
+    -33195, -33238, -33281, -33325, -33368, -33411, -33454, -33498, -33541,
+    -33584, -33627, -33670, -33713, -33756, -33799, -33843, -33886, -33929,
+    -33972, -34015, -34057, -34100, -34143, -34186, -34229, -34272, -34315,
+    -34358, -34400, -34443, -34486, -34529, -34571, -34614, -34657, -34699,
+    -34742, -34785, -34827, -34870, -34912, -34955, -34997, -35040, -35082,
+    -35125, -35167, -35210, -35252, -35294, -35337, -35379, -35421, -35464,
+    -35506, -35548, -35590, -35633, -35675, -35717, -35759, -35801, -35843,
+    -35885, -35927, -35969, -36011, -36053, -36095, -36137, -36179, -36221,
+    -36263, -36305, -36347, -36388, -36430, -36472, -36514, -36555, -36597,
+    -36639, -36681, -36722, -36764, -36805, -36847, -36889, -36930, -36972,
+    -37013, -37055, -37096, -37137, -37179, -37220, -37262, -37303, -37344,
+    -37386, -37427, -37468, -37509, -37551, -37592, -37633, -37674, -37715,
+    -37756, -37797, -37838, -37879, -37920, -37961, -38002, -38043, -38084,
+    -38125, -38166, -38207, -38248, -38288, -38329, -38370, -38411, -38451,
+    -38492, -38533, -38573, -38614, -38655, -38695, -38736, -38776, -38817,
+    -38857, -38898, -38938, -38979, -39019, -39059, -39100, -39140, -39180,
+    -39221, -39261, -39301, -39341, -39382, -39422, -39462, -39502, -39542,
+    -39582, -39622, -39662, -39702, -39742, -39782, -39822, -39862, -39902,
+    -39942, -39982, -40021, -40061, -40101, -40141, -40180, -40220, -40260,
+    -40299, -40339, -40379, -40418, -40458, -40497, -40537, -40576, -40616,
+    -40655, -40695, -40734, -40773, -40813, -40852, -40891, -40931, -40970,
+    -41009, -41048, -41087, -41127, -41166, -41205, -41244, -41283, -41322,
+    -41361, -41400, -41439, -41478, -41517, -41556, -41595, -41633, -41672,
+    -41711, -41750, -41788, -41827, -41866, -41904, -41943, -41982, -42020,
+    -42059, -42097, -42136, -42174, -42213, -42251, -42290, -42328, -42366,
+    -42405, -42443, -42481, -42520, -42558, -42596, -42634, -42672, -42711,
+    -42749, -42787, -42825, -42863, -42901, -42939, -42977, -43015, -43053,
+    -43091, -43128, -43166, -43204, -43242, -43280, -43317, -43355, -43393,
+    -43430, -43468, -43506, -43543, -43581, -43618, -43656, -43693, -43731,
+    -43768, -43806, -43843, -43880, -43918, -43955, -43992, -44029, -44067,
+    -44104, -44141, -44178, -44215, -44252, -44289, -44326, -44363, -44400,
+    -44437, -44474, -44511, -44548, -44585, -44622, -44659, -44695, -44732,
+    -44769, -44806, -44842, -44879, -44915, -44952, -44989, -45025, -45062,
+    -45098, -45135, -45171, -45207, -45244, -45280, -45316, -45353, -45389,
+    -45425, -45462, -45498, -45534, -45570, -45606, -45642, -45678, -45714,
+    -45750, -45786, -45822, -45858, -45894, -45930, -45966, -46002, -46037,
+    -46073, -46109, -46145, -46180, -46216, -46252, -46287, -46323, -46358,
+    -46394, -46429, -46465, -46500, -46536, -46571, -46606, -46642, -46677,
+    -46712, -46747, -46783, -46818, -46853, -46888, -46923, -46958, -46993,
+    -47028, -47063, -47098, -47133, -47168, -47203, -47238, -47273, -47308,
+    -47342, -47377, -47412, -47446, -47481, -47516, -47550, -47585, -47619,
+    -47654, -47688, -47723, -47757, -47792, -47826, -47860, -47895, -47929,
+    -47963, -47998, -48032, -48066, -48100, -48134, -48168, -48202, -48236,
+    -48271, -48304, -48338, -48372, -48406, -48440, -48474, -48508, -48542,
+    -48575, -48609, -48643, -48676, -48710, -48744, -48777, -48811, -48844,
+    -48878, -48911, -48945, -48978, -49012, -49045, -49078, -49112, -49145,
+    -49178, -49211, -49244, -49278, -49311, -49344, -49377, -49410, -49443,
+    -49476, -49509, -49542, -49575, -49608, -49640, -49673, -49706, -49739,
+    -49771, -49804, -49837, -49869, -49902, -49935, -49967, -50000, -50032,
+    -50065, -50097, -50129, -50162, -50194, -50226, -50259, -50291, -50323,
+    -50355, -50387, -50420, -50452, -50484, -50516, -50548, -50580, -50612,
+    -50644, -50675, -50707, -50739, -50771, -50803, -50834, -50866, -50898,
+    -50929, -50961, -50993, -51024, -51056, -51087, -51119, -51150, -51182,
+    -51213, -51244, -51276, -51307, -51338, -51369, -51401, -51432, -51463,
+    -51494, -51525, -51556, -51587, -51618, -51649, -51680, -51711, -51742,
+    -51773, -51803, -51834, -51865, -51896, -51926, -51957, -51988, -52018,
+    -52049, -52079, -52110, -52140, -52171, -52201, -52231, -52262, -52292,
+    -52322, -52353, -52383, -52413, -52443, -52473, -52503, -52534, -52564,
+    -52594, -52624, -52653, -52683, -52713, -52743, -52773, -52803, -52832,
+    -52862, -52892, -52922, -52951, -52981, -53010, -53040, -53069, -53099,
+    -53128, -53158, -53187, -53216, -53246, -53275, -53304, -53334, -53363,
+    -53392, -53421, -53450, -53479, -53508, -53537, -53566, -53595, -53624,
+    -53653, -53682, -53711, -53739, -53768, -53797, -53826, -53854, -53883,
+    -53911, -53940, -53969, -53997, -54026, -54054, -54082, -54111, -54139,
+    -54167, -54196, -54224, -54252, -54280, -54308, -54337, -54365, -54393,
+    -54421, -54449, -54477, -54505, -54533, -54560, -54588, -54616, -54644,
+    -54672, -54699, -54727, -54755, -54782, -54810, -54837, -54865, -54892,
+    -54920, -54947, -54974, -55002, -55029, -55056, -55084, -55111, -55138,
+    -55165, -55192, -55219, -55246, -55274, -55300, -55327, -55354, -55381,
+    -55408, -55435, -55462, -55489, -55515, -55542, -55569, -55595, -55622,
+    -55648, -55675, -55701, -55728, -55754, -55781, -55807, -55833, -55860,
+    -55886, -55912, -55938, -55965, -55991, -56017, -56043, -56069, -56095,
+    -56121, -56147, -56173, -56199, -56225, -56250, -56276, -56302, -56328,
+    -56353, -56379, -56404, -56430, -56456, -56481, -56507, -56532, -56557,
+    -56583, -56608, -56633, -56659, -56684, -56709, -56734, -56760, -56785,
+    -56810, -56835, -56860, -56885, -56910, -56935, -56959, -56984, -57009,
+    -57034, -57059, -57083, -57108, -57133, -57157, -57182, -57206, -57231,
+    -57255, -57280, -57304, -57329, -57353, -57377, -57402, -57426, -57450,
+    -57474, -57498, -57522, -57546, -57570, -57594, -57618, -57642, -57666,
+    -57690, -57714, -57738, -57762, -57785, -57809, -57833, -57856, -57880,
+    -57903, -57927, -57950, -57974, -57997, -58021, -58044, -58067, -58091,
+    -58114, -58137, -58160, -58183, -58207, -58230, -58253, -58276, -58299,
+    -58322, -58345, -58367, -58390, -58413, -58436, -58459, -58481, -58504,
+    -58527, -58549, -58572, -58594, -58617, -58639, -58662, -58684, -58706,
+    -58729, -58751, -58773, -58795, -58818, -58840, -58862, -58884, -58906,
+    -58928, -58950, -58972, -58994, -59016, -59038, -59059, -59081, -59103,
+    -59125, -59146, -59168, -59190, -59211, -59233, -59254, -59276, -59297,
+    -59318, -59340, -59361, -59382, -59404, -59425, -59446, -59467, -59488,
+    -59509, -59530, -59551, -59572, -59593, -59614, -59635, -59656, -59677,
+    -59697, -59718, -59739, -59759, -59780, -59801, -59821, -59842, -59862,
+    -59883, -59903, -59923, -59944, -59964, -59984, -60004, -60025, -60045,
+    -60065, -60085, -60105, -60125, -60145, -60165, -60185, -60205, -60225,
+    -60244, -60264, -60284, -60304, -60323, -60343, -60363, -60382, -60402,
+    -60421, -60441, -60460, -60479, -60499, -60518, -60537, -60556, -60576,
+    -60595, -60614, -60633, -60652, -60671, -60690, -60709, -60728, -60747,
+    -60766, -60785, -60803, -60822, -60841, -60859, -60878, -60897, -60915,
+    -60934, -60952, -60971, -60989, -61007, -61026, -61044, -61062, -61081,
+    -61099, -61117, -61135, -61153, -61171, -61189, -61207, -61225, -61243,
+    -61261, -61279, -61297, -61314, -61332, -61350, -61367, -61385, -61403,
+    -61420, -61438, -61455, -61473, -61490, -61507, -61525, -61542, -61559,
+    -61577, -61594, -61611, -61628, -61645, -61662, -61679, -61696, -61713,
+    -61730, -61747, -61764, -61780, -61797, -61814, -61831, -61847, -61864,
+    -61880, -61897, -61913, -61930, -61946, -61963, -61979, -61995, -62012,
+    -62028, -62044, -62060, -62076, -62092, -62108, -62125, -62141, -62156,
+    -62172, -62188, -62204, -62220, -62236, -62251, -62267, -62283, -62298,
+    -62314, -62329, -62345, -62360, -62376, -62391, -62407, -62422, -62437,
+    -62453, -62468, -62483, -62498, -62513, -62528, -62543, -62558, -62573,
+    -62588, -62603, -62618, -62633, -62648, -62662, -62677, -62692, -62706,
+    -62721, -62735, -62750, -62764, -62779, -62793, -62808, -62822, -62836,
+    -62850, -62865, -62879, -62893, -62907, -62921, -62935, -62949, -62963,
+    -62977, -62991, -63005, -63019, -63032, -63046, -63060, -63074, -63087,
+    -63101, -63114, -63128, -63141, -63155, -63168, -63182, -63195, -63208,
+    -63221, -63235, -63248, -63261, -63274, -63287, -63300, -63313, -63326,
+    -63339, -63352, -63365, -63378, -63390, -63403, -63416, -63429, -63441,
+    -63454, -63466, -63479, -63491, -63504, -63516, -63528, -63541, -63553,
+    -63565, -63578, -63590, -63602, -63614, -63626, -63638, -63650, -63662,
+    -63674, -63686, -63698, -63709, -63721, -63733, -63745, -63756, -63768,
+    -63779, -63791, -63803, -63814, -63825, -63837, -63848, -63859, -63871,
+    -63882, -63893, -63904, -63915, -63927, -63938, -63949, -63960, -63971,
+    -63981, -63992, -64003, -64014, -64025, -64035, -64046, -64057, -64067,
+    -64078, -64088, -64099, -64109, -64120, -64130, -64140, -64151, -64161,
+    -64171, -64181, -64192, -64202, -64212, -64222, -64232, -64242, -64252,
+    -64261, -64271, -64281, -64291, -64301, -64310, -64320, -64330, -64339,
+    -64349, -64358, -64368, -64377, -64387, -64396, -64405, -64414, -64424,
+    -64433, -64442, -64451, -64460, -64469, -64478, -64487, -64496, -64505,
+    -64514, -64523, -64532, -64540, -64549, -64558, -64566, -64575, -64584,
+    -64592, -64601, -64609, -64617, -64626, -64634, -64642, -64651, -64659,
+    -64667, -64675, -64683, -64691, -64699, -64707, -64715, -64723, -64731,
+    -64739, -64747, -64754, -64762, -64770, -64777, -64785, -64793, -64800,
+    -64808, -64815, -64822, -64830, -64837, -64844, -64852, -64859, -64866,
+    -64873, -64880, -64887, -64895, -64902, -64908, -64915, -64922, -64929,
+    -64936, -64943, -64949, -64956, -64963, -64969, -64976, -64982, -64989,
+    -64995, -65002, -65008, -65015, -65021, -65027, -65033, -65040, -65046,
+    -65052, -65058, -65064, -65070, -65076, -65082, -65088, -65094, -65099,
+    -65105, -65111, -65117, -65122, -65128, -65133, -65139, -65144, -65150,
+    -65155, -65161, -65166, -65171, -65177, -65182, -65187, -65192, -65197,
+    -65202, -65207, -65212, -65217, -65222, -65227, -65232, -65237, -65242,
+    -65246, -65251, -65256, -65260, -65265, -65270, -65274, -65279, -65283,
+    -65287, -65292, -65296, -65300, -65305, -65309, -65313, -65317, -65321,
+    -65325, -65329, -65333, -65337, -65341, -65345, -65349, -65352, -65356,
+    -65360, -65363, -65367, -65371, -65374, -65378, -65381, -65385, -65388,
+    -65391, -65395, -65398, -65401, -65404, -65408, -65411, -65414, -65417,
+    -65420, -65423, -65426, -65429, -65431, -65434, -65437, -65440, -65442,
+    -65445, -65448, -65450, -65453, -65455, -65458, -65460, -65463, -65465,
+    -65467, -65470, -65472, -65474, -65476, -65478, -65480, -65482, -65484,
+    -65486, -65488, -65490, -65492, -65494, -65496, -65497, -65499, -65501,
+    -65502, -65504, -65505, -65507, -65508, -65510, -65511, -65513, -65514,
+    -65515, -65516, -65518, -65519, -65520, -65521, -65522, -65523, -65524,
+    -65525, -65526, -65527, -65527, -65528, -65529, -65530, -65530, -65531,
+    -65531, -65532, -65532, -65533, -65533, -65534, -65534, -65534, -65535,
+    -65535, -65535, -65535, -65535, -65535, -65535, -65535, -65535, -65535,
+    -65535, -65535, -65535, -65535, -65534, -65534, -65534, -65533, -65533,
+    -65532, -65532, -65531, -65531, -65530, -65530, -65529, -65528, -65527,
+    -65527, -65526, -65525, -65524, -65523, -65522, -65521, -65520, -65519,
+    -65518, -65516, -65515, -65514, -65513, -65511, -65510, -65508, -65507,
+    -65505, -65504, -65502, -65501, -65499, -65497, -65496, -65494, -65492,
+    -65490, -65488, -65486, -65484, -65482, -65480, -65478, -65476, -65474,
+    -65472, -65470, -65467, -65465, -65463, -65460, -65458, -65455, -65453,
+    -65450, -65448, -65445, -65442, -65440, -65437, -65434, -65431, -65429,
+    -65426, -65423, -65420, -65417, -65414, -65411, -65408, -65404, -65401,
+    -65398, -65395, -65391, -65388, -65385, -65381, -65378, -65374, -65371,
+    -65367, -65363, -65360, -65356, -65352, -65349, -65345, -65341, -65337,
+    -65333, -65329, -65325, -65321, -65317, -65313, -65309, -65305, -65300,
+    -65296, -65292, -65287, -65283, -65279, -65274, -65270, -65265, -65260,
+    -65256, -65251, -65246, -65242, -65237, -65232, -65227, -65222, -65217,
+    -65212, -65207, -65202, -65197, -65192, -65187, -65182, -65177, -65171,
+    -65166, -65161, -65155, -65150, -65144, -65139, -65133, -65128, -65122,
+    -65117, -65111, -65105, -65099, -65094, -65088, -65082, -65076, -65070,
+    -65064, -65058, -65052, -65046, -65040, -65033, -65027, -65021, -65015,
+    -65008, -65002, -64995, -64989, -64982, -64976, -64969, -64963, -64956,
+    -64949, -64943, -64936, -64929, -64922, -64915, -64908, -64902, -64895,
+    -64887, -64880, -64873, -64866, -64859, -64852, -64844, -64837, -64830,
+    -64822, -64815, -64808, -64800, -64793, -64785, -64777, -64770, -64762,
+    -64754, -64747, -64739, -64731, -64723, -64715, -64707, -64699, -64691,
+    -64683, -64675, -64667, -64659, -64651, -64642, -64634, -64626, -64617,
+    -64609, -64601, -64592, -64584, -64575, -64566, -64558, -64549, -64540,
+    -64532, -64523, -64514, -64505, -64496, -64487, -64478, -64469, -64460,
+    -64451, -64442, -64433, -64424, -64414, -64405, -64396, -64387, -64377,
+    -64368, -64358, -64349, -64339, -64330, -64320, -64310, -64301, -64291,
+    -64281, -64271, -64261, -64252, -64242, -64232, -64222, -64212, -64202,
+    -64192, -64181, -64171, -64161, -64151, -64140, -64130, -64120, -64109,
+    -64099, -64088, -64078, -64067, -64057, -64046, -64035, -64025, -64014,
+    -64003, -63992, -63981, -63971, -63960, -63949, -63938, -63927, -63915,
+    -63904, -63893, -63882, -63871, -63859, -63848, -63837, -63825, -63814,
+    -63803, -63791, -63779, -63768, -63756, -63745, -63733, -63721, -63709,
+    -63698, -63686, -63674, -63662, -63650, -63638, -63626, -63614, -63602,
+    -63590, -63578, -63565, -63553, -63541, -63528, -63516, -63504, -63491,
+    -63479, -63466, -63454, -63441, -63429, -63416, -63403, -63390, -63378,
+    -63365, -63352, -63339, -63326, -63313, -63300, -63287, -63274, -63261,
+    -63248, -63235, -63221, -63208, -63195, -63182, -63168, -63155, -63141,
+    -63128, -63114, -63101, -63087, -63074, -63060, -63046, -63032, -63019,
+    -63005, -62991, -62977, -62963, -62949, -62935, -62921, -62907, -62893,
+    -62879, -62865, -62850, -62836, -62822, -62808, -62793, -62779, -62764,
+    -62750, -62735, -62721, -62706, -62692, -62677, -62662, -62648, -62633,
+    -62618, -62603, -62588, -62573, -62558, -62543, -62528, -62513, -62498,
+    -62483, -62468, -62453, -62437, -62422, -62407, -62391, -62376, -62360,
+    -62345, -62329, -62314, -62298, -62283, -62267, -62251, -62236, -62220,
+    -62204, -62188, -62172, -62156, -62141, -62125, -62108, -62092, -62076,
+    -62060, -62044, -62028, -62012, -61995, -61979, -61963, -61946, -61930,
+    -61913, -61897, -61880, -61864, -61847, -61831, -61814, -61797, -61780,
+    -61764, -61747, -61730, -61713, -61696, -61679, -61662, -61645, -61628,
+    -61611, -61594, -61577, -61559, -61542, -61525, -61507, -61490, -61473,
+    -61455, -61438, -61420, -61403, -61385, -61367, -61350, -61332, -61314,
+    -61297, -61279, -61261, -61243, -61225, -61207, -61189, -61171, -61153,
+    -61135, -61117, -61099, -61081, -61062, -61044, -61026, -61007, -60989,
+    -60971, -60952, -60934, -60915, -60897, -60878, -60859, -60841, -60822,
+    -60803, -60785, -60766, -60747, -60728, -60709, -60690, -60671, -60652,
+    -60633, -60614, -60595, -60576, -60556, -60537, -60518, -60499, -60479,
+    -60460, -60441, -60421, -60402, -60382, -60363, -60343, -60323, -60304,
+    -60284, -60264, -60244, -60225, -60205, -60185, -60165, -60145, -60125,
+    -60105, -60085, -60065, -60045, -60025, -60004, -59984, -59964, -59944,
+    -59923, -59903, -59883, -59862, -59842, -59821, -59801, -59780, -59759,
+    -59739, -59718, -59697, -59677, -59656, -59635, -59614, -59593, -59572,
+    -59551, -59530, -59509, -59488, -59467, -59446, -59425, -59404, -59382,
+    -59361, -59340, -59318, -59297, -59276, -59254, -59233, -59211, -59189,
+    -59168, -59146, -59125, -59103, -59081, -59059, -59038, -59016, -58994,
+    -58972, -58950, -58928, -58906, -58884, -58862, -58840, -58818, -58795,
+    -58773, -58751, -58729, -58706, -58684, -58662, -58639, -58617, -58594,
+    -58572, -58549, -58527, -58504, -58481, -58459, -58436, -58413, -58390,
+    -58367, -58345, -58322, -58299, -58276, -58253, -58230, -58207, -58183,
+    -58160, -58137, -58114, -58091, -58067, -58044, -58021, -57997, -57974,
+    -57950, -57927, -57903, -57880, -57856, -57833, -57809, -57785, -57762,
+    -57738, -57714, -57690, -57666, -57642, -57618, -57594, -57570, -57546,
+    -57522, -57498, -57474, -57450, -57426, -57402, -57377, -57353, -57329,
+    -57304, -57280, -57255, -57231, -57206, -57182, -57157, -57133, -57108,
+    -57083, -57059, -57034, -57009, -56984, -56959, -56935, -56910, -56885,
+    -56860, -56835, -56810, -56785, -56760, -56734, -56709, -56684, -56659,
+    -56633, -56608, -56583, -56557, -56532, -56507, -56481, -56456, -56430,
+    -56404, -56379, -56353, -56328, -56302, -56276, -56250, -56225, -56199,
+    -56173, -56147, -56121, -56095, -56069, -56043, -56017, -55991, -55965,
+    -55938, -55912, -55886, -55860, -55833, -55807, -55781, -55754, -55728,
+    -55701, -55675, -55648, -55622, -55595, -55569, -55542, -55515, -55489,
+    -55462, -55435, -55408, -55381, -55354, -55327, -55300, -55274, -55246,
+    -55219, -55192, -55165, -55138, -55111, -55084, -55056, -55029, -55002,
+    -54974, -54947, -54920, -54892, -54865, -54837, -54810, -54782, -54755,
+    -54727, -54699, -54672, -54644, -54616, -54588, -54560, -54533, -54505,
+    -54477, -54449, -54421, -54393, -54365, -54337, -54308, -54280, -54252,
+    -54224, -54196, -54167, -54139, -54111, -54082, -54054, -54026, -53997,
+    -53969, -53940, -53911, -53883, -53854, -53826, -53797, -53768, -53739,
+    -53711, -53682, -53653, -53624, -53595, -53566, -53537, -53508, -53479,
+    -53450, -53421, -53392, -53363, -53334, -53304, -53275, -53246, -53216,
+    -53187, -53158, -53128, -53099, -53069, -53040, -53010, -52981, -52951,
+    -52922, -52892, -52862, -52832, -52803, -52773, -52743, -52713, -52683,
+    -52653, -52624, -52594, -52564, -52534, -52503, -52473, -52443, -52413,
+    -52383, -52353, -52322, -52292, -52262, -52231, -52201, -52171, -52140,
+    -52110, -52079, -52049, -52018, -51988, -51957, -51926, -51896, -51865,
+    -51834, -51803, -51773, -51742, -51711, -51680, -51649, -51618, -51587,
+    -51556, -51525, -51494, -51463, -51432, -51401, -51369, -51338, -51307,
+    -51276, -51244, -51213, -51182, -51150, -51119, -51087, -51056, -51024,
+    -50993, -50961, -50929, -50898, -50866, -50834, -50803, -50771, -50739,
+    -50707, -50675, -50644, -50612, -50580, -50548, -50516, -50484, -50452,
+    -50420, -50387, -50355, -50323, -50291, -50259, -50226, -50194, -50162,
+    -50129, -50097, -50065, -50032, -50000, -49967, -49935, -49902, -49869,
+    -49837, -49804, -49771, -49739, -49706, -49673, -49640, -49608, -49575,
+    -49542, -49509, -49476, -49443, -49410, -49377, -49344, -49311, -49278,
+    -49244, -49211, -49178, -49145, -49112, -49078, -49045, -49012, -48978,
+    -48945, -48911, -48878, -48844, -48811, -48777, -48744, -48710, -48676,
+    -48643, -48609, -48575, -48542, -48508, -48474, -48440, -48406, -48372,
+    -48338, -48305, -48271, -48237, -48202, -48168, -48134, -48100, -48066,
+    -48032, -47998, -47963, -47929, -47895, -47860, -47826, -47792, -47757,
+    -47723, -47688, -47654, -47619, -47585, -47550, -47516, -47481, -47446,
+    -47412, -47377, -47342, -47307, -47273, -47238, -47203, -47168, -47133,
+    -47098, -47063, -47028, -46993, -46958, -46923, -46888, -46853, -46818,
+    -46783, -46747, -46712, -46677, -46642, -46606, -46571, -46536, -46500,
+    -46465, -46429, -46394, -46358, -46323, -46287, -46251, -46216, -46180,
+    -46145, -46109, -46073, -46037, -46002, -45966, -45930, -45894, -45858,
+    -45822, -45786, -45750, -45714, -45678, -45642, -45606, -45570, -45534,
+    -45498, -45462, -45425, -45389, -45353, -45316, -45280, -45244, -45207,
+    -45171, -45135, -45098, -45062, -45025, -44989, -44952, -44915, -44879,
+    -44842, -44806, -44769, -44732, -44695, -44659, -44622, -44585, -44548,
+    -44511, -44474, -44437, -44400, -44363, -44326, -44289, -44252, -44215,
+    -44178, -44141, -44104, -44067, -44029, -43992, -43955, -43918, -43880,
+    -43843, -43806, -43768, -43731, -43693, -43656, -43618, -43581, -43543,
+    -43506, -43468, -43430, -43393, -43355, -43317, -43280, -43242, -43204,
+    -43166, -43128, -43091, -43053, -43015, -42977, -42939, -42901, -42863,
+    -42825, -42787, -42749, -42711, -42672, -42634, -42596, -42558, -42520,
+    -42481, -42443, -42405, -42366, -42328, -42290, -42251, -42213, -42174,
+    -42136, -42097, -42059, -42020, -41982, -41943, -41904, -41866, -41827,
+    -41788, -41750, -41711, -41672, -41633, -41595, -41556, -41517, -41478,
+    -41439, -41400, -41361, -41322, -41283, -41244, -41205, -41166, -41127,
+    -41087, -41048, -41009, -40970, -40931, -40891, -40852, -40813, -40773,
+    -40734, -40695, -40655, -40616, -40576, -40537, -40497, -40458, -40418,
+    -40379, -40339, -40299, -40260, -40220, -40180, -40141, -40101, -40061,
+    -40021, -39982, -39942, -39902, -39862, -39822, -39782, -39742, -39702,
+    -39662, -39622, -39582, -39542, -39502, -39462, -39422, -39382, -39341,
+    -39301, -39261, -39221, -39180, -39140, -39100, -39059, -39019, -38979,
+    -38938, -38898, -38857, -38817, -38776, -38736, -38695, -38655, -38614,
+    -38573, -38533, -38492, -38451, -38411, -38370, -38329, -38288, -38248,
+    -38207, -38166, -38125, -38084, -38043, -38002, -37961, -37920, -37879,
+    -37838, -37797, -37756, -37715, -37674, -37633, -37592, -37550, -37509,
+    -37468, -37427, -37386, -37344, -37303, -37262, -37220, -37179, -37137,
+    -37096, -37055, -37013, -36972, -36930, -36889, -36847, -36805, -36764,
+    -36722, -36681, -36639, -36597, -36556, -36514, -36472, -36430, -36388,
+    -36347, -36305, -36263, -36221, -36179, -36137, -36095, -36053, -36011,
+    -35969, -35927, -35885, -35843, -35801, -35759, -35717, -35675, -35633,
+    -35590, -35548, -35506, -35464, -35421, -35379, -35337, -35294, -35252,
+    -35210, -35167, -35125, -35082, -35040, -34997, -34955, -34912, -34870,
+    -34827, -34785, -34742, -34699, -34657, -34614, -34571, -34529, -34486,
+    -34443, -34400, -34358, -34315, -34272, -34229, -34186, -34143, -34100,
+    -34057, -34015, -33972, -33929, -33886, -33843, -33799, -33756, -33713,
+    -33670, -33627, -33584, -33541, -33498, -33454, -33411, -33368, -33325,
+    -33281, -33238, -33195, -33151, -33108, -33065, -33021, -32978, -32934,
+    -32891, -32847, -32804, -32760, -32717, -32673, -32630, -32586, -32542,
+    -32499, -32455, -32411, -32368, -32324, -32280, -32236, -32193, -32149,
+    -32105, -32061, -32017, -31974, -31930, -31886, -31842, -31798, -31754,
+    -31710, -31666, -31622, -31578, -31534, -31490, -31446, -31402, -31357,
+    -31313, -31269, -31225, -31181, -31136, -31092, -31048, -31004, -30959,
+    -30915, -30871, -30826, -30782, -30738, -30693, -30649, -30604, -30560,
+    -30515, -30471, -30426, -30382, -30337, -30293, -30248, -30204, -30159,
+    -30114, -30070, -30025, -29980, -29936, -29891, -29846, -29801, -29757,
+    -29712, -29667, -29622, -29577, -29533, -29488, -29443, -29398, -29353,
+    -29308, -29263, -29218, -29173, -29128, -29083, -29038, -28993, -28948,
+    -28903, -28858, -28812, -28767, -28722, -28677, -28632, -28586, -28541,
+    -28496, -28451, -28405, -28360, -28315, -28269, -28224, -28179, -28133,
+    -28088, -28042, -27997, -27952, -27906, -27861, -27815, -27770, -27724,
+    -27678, -27633, -27587, -27542, -27496, -27450, -27405, -27359, -27313,
+    -27268, -27222, -27176, -27131, -27085, -27039, -26993, -26947, -26902,
+    -26856, -26810, -26764, -26718, -26672, -26626, -26580, -26534, -26488,
+    -26442, -26396, -26350, -26304, -26258, -26212, -26166, -26120, -26074,
+    -26028, -25982, -25936, -25889, -25843, -25797, -25751, -25705, -25658,
+    -25612, -25566, -25520, -25473, -25427, -25381, -25334, -25288, -25241,
+    -25195, -25149, -25102, -25056, -25009, -24963, -24916, -24870, -24823,
+    -24777, -24730, -24684, -24637, -24591, -24544, -24497, -24451, -24404,
+    -24357, -24311, -24264, -24217, -24171, -24124, -24077, -24030, -23984,
+    -23937, -23890, -23843, -23796, -23750, -23703, -23656, -23609, -23562,
+    -23515, -23468, -23421, -23374, -23327, -23280, -23233, -23186, -23139,
+    -23092, -23045, -22998, -22951, -22904, -22857, -22810, -22763, -22716,
+    -22668, -22621, -22574, -22527, -22480, -22432, -22385, -22338, -22291,
+    -22243, -22196, -22149, -22102, -22054, -22007, -21960, -21912, -21865,
+    -21817, -21770, -21723, -21675, -21628, -21580, -21533, -21485, -21438,
+    -21390, -21343, -21295, -21248, -21200, -21153, -21105, -21057, -21010,
+    -20962, -20915, -20867, -20819, -20772, -20724, -20676, -20629, -20581,
+    -20533, -20485, -20438, -20390, -20342, -20294, -20246, -20199, -20151,
+    -20103, -20055, -20007, -19959, -19912, -19864, -19816, -19768, -19720,
+    -19672, -19624, -19576, -19528, -19480, -19432, -19384, -19336, -19288,
+    -19240, -19192, -19144, -19096, -19048, -19000, -18951, -18903, -18855,
+    -18807, -18759, -18711, -18663, -18614, -18566, -18518, -18470, -18421,
+    -18373, -18325, -18277, -18228, -18180, -18132, -18084, -18035, -17987,
+    -17939, -17890, -17842, -17793, -17745, -17697, -17648, -17600, -17551,
+    -17503, -17455, -17406, -17358, -17309, -17261, -17212, -17164, -17115,
+    -17067, -17018, -16970, -16921, -16872, -16824, -16775, -16727, -16678,
+    -16629, -16581, -16532, -16484, -16435, -16386, -16338, -16289, -16240,
+    -16191, -16143, -16094, -16045, -15997, -15948, -15899, -15850, -15802,
+    -15753, -15704, -15655, -15606, -15557, -15509, -15460, -15411, -15362,
+    -15313, -15264, -15215, -15167, -15118, -15069, -15020, -14971, -14922,
+    -14873, -14824, -14775, -14726, -14677, -14628, -14579, -14530, -14481,
+    -14432, -14383, -14334, -14285, -14236, -14187, -14138, -14089, -14040,
+    -13990, -13941, -13892, -13843, -13794, -13745, -13696, -13647, -13597,
+    -13548, -13499, -13450, -13401, -13351, -13302, -13253, -13204, -13154,
+    -13105, -13056, -13007, -12957, -12908, -12859, -12810, -12760, -12711,
+    -12662, -12612, -12563, -12514, -12464, -12415, -12366, -12316, -12267,
+    -12217, -12168, -12119, -12069, -12020, -11970, -11921, -11872, -11822,
+    -11773, -11723, -11674, -11624, -11575, -11525, -11476, -11426, -11377,
+    -11327, -11278, -11228, -11179, -11129, -11080, -11030, -10981, -10931,
+    -10882, -10832, -10782, -10733, -10683, -10634, -10584, -10534, -10485,
+    -10435, -10386, -10336, -10286, -10237, -10187, -10137, -10088, -10038,
+    -9988,  -9939,  -9889,  -9839,  -9790,  -9740,  -9690,  -9640,  -9591,
+    -9541,  -9491,  -9442,  -9392,  -9342,  -9292,  -9243,  -9193,  -9143,
+    -9093,  -9043,  -8994,  -8944,  -8894,  -8844,  -8794,  -8745,  -8695,
+    -8645,  -8595,  -8545,  -8496,  -8446,  -8396,  -8346,  -8296,  -8246,
+    -8196,  -8147,  -8097,  -8047,  -7997,  -7947,  -7897,  -7847,  -7797,
+    -7747,  -7697,  -7648,  -7598,  -7548,  -7498,  -7448,  -7398,  -7348,
+    -7298,  -7248,  -7198,  -7148,  -7098,  -7048,  -6998,  -6948,  -6898,
+    -6848,  -6798,  -6748,  -6698,  -6648,  -6598,  -6548,  -6498,  -6448,
+    -6398,  -6348,  -6298,  -6248,  -6198,  -6148,  -6098,  -6048,  -5998,
+    -5948,  -5898,  -5848,  -5798,  -5747,  -5697,  -5647,  -5597,  -5547,
+    -5497,  -5447,  -5397,  -5347,  -5297,  -5247,  -5197,  -5146,  -5096,
+    -5046,  -4996,  -4946,  -4896,  -4846,  -4796,  -4745,  -4695,  -4645,
+    -4595,  -4545,  -4495,  -4445,  -4394,  -4344,  -4294,  -4244,  -4194,
+    -4144,  -4093,  -4043,  -3993,  -3943,  -3893,  -3843,  -3792,  -3742,
+    -3692,  -3642,  -3592,  -3541,  -3491,  -3441,  -3391,  -3341,  -3291,
+    -3240,  -3190,  -3140,  -3090,  -3039,  -2989,  -2939,  -2889,  -2839,
+    -2788,  -2738,  -2688,  -2638,  -2588,  -2537,  -2487,  -2437,  -2387,
+    -2336,  -2286,  -2236,  -2186,  -2135,  -2085,  -2035,  -1985,  -1934,
+    -1884,  -1834,  -1784,  -1733,  -1683,  -1633,  -1583,  -1532,  -1482,
+    -1432,  -1382,  -1331,  -1281,  -1231,  -1181,  -1130,  -1080,  -1030,
+    -980,   -929,   -879,   -829,   -779,   -728,   -678,   -628,   -578,
+    -527,   -477,   -427,   -376,   -326,   -276,   -226,   -175,   -125,
+    -75,    -25,    25,     75,     125,    175,    226,    276,    326,
+    376,    427,    477,    527,    578,    628,    678,    728,    779,
+    829,    879,    929,    980,    1030,   1080,   1130,   1181,   1231,
+    1281,   1331,   1382,   1432,   1482,   1532,   1583,   1633,   1683,
+    1733,   1784,   1834,   1884,   1934,   1985,   2035,   2085,   2135,
+    2186,   2236,   2286,   2336,   2387,   2437,   2487,   2537,   2587,
+    2638,   2688,   2738,   2788,   2839,   2889,   2939,   2989,   3039,
+    3090,   3140,   3190,   3240,   3291,   3341,   3391,   3441,   3491,
+    3542,   3592,   3642,   3692,   3742,   3792,   3843,   3893,   3943,
+    3993,   4043,   4093,   4144,   4194,   4244,   4294,   4344,   4394,
+    4445,   4495,   4545,   4595,   4645,   4695,   4745,   4796,   4846,
+    4896,   4946,   4996,   5046,   5096,   5146,   5197,   5247,   5297,
+    5347,   5397,   5447,   5497,   5547,   5597,   5647,   5697,   5747,
+    5798,   5848,   5898,   5948,   5998,   6048,   6098,   6148,   6198,
+    6248,   6298,   6348,   6398,   6448,   6498,   6548,   6598,   6648,
+    6698,   6748,   6798,   6848,   6898,   6948,   6998,   7048,   7098,
+    7148,   7198,   7248,   7298,   7348,   7398,   7448,   7498,   7548,
+    7598,   7648,   7697,   7747,   7797,   7847,   7897,   7947,   7997,
+    8047,   8097,   8147,   8196,   8246,   8296,   8346,   8396,   8446,
+    8496,   8545,   8595,   8645,   8695,   8745,   8794,   8844,   8894,
+    8944,   8994,   9043,   9093,   9143,   9193,   9243,   9292,   9342,
+    9392,   9442,   9491,   9541,   9591,   9640,   9690,   9740,   9790,
+    9839,   9889,   9939,   9988,   10038,  10088,  10137,  10187,  10237,
+    10286,  10336,  10386,  10435,  10485,  10534,  10584,  10634,  10683,
+    10733,  10782,  10832,  10882,  10931,  10981,  11030,  11080,  11129,
+    11179,  11228,  11278,  11327,  11377,  11426,  11476,  11525,  11575,
+    11624,  11674,  11723,  11773,  11822,  11872,  11921,  11970,  12020,
+    12069,  12119,  12168,  12218,  12267,  12316,  12366,  12415,  12464,
+    12514,  12563,  12612,  12662,  12711,  12760,  12810,  12859,  12908,
+    12957,  13007,  13056,  13105,  13154,  13204,  13253,  13302,  13351,
+    13401,  13450,  13499,  13548,  13597,  13647,  13696,  13745,  13794,
+    13843,  13892,  13941,  13990,  14040,  14089,  14138,  14187,  14236,
+    14285,  14334,  14383,  14432,  14481,  14530,  14579,  14628,  14677,
+    14726,  14775,  14824,  14873,  14922,  14971,  15020,  15069,  15118,
+    15167,  15215,  15264,  15313,  15362,  15411,  15460,  15509,  15557,
+    15606,  15655,  15704,  15753,  15802,  15850,  15899,  15948,  15997,
+    16045,  16094,  16143,  16191,  16240,  16289,  16338,  16386,  16435,
+    16484,  16532,  16581,  16629,  16678,  16727,  16775,  16824,  16872,
+    16921,  16970,  17018,  17067,  17115,  17164,  17212,  17261,  17309,
+    17358,  17406,  17455,  17503,  17551,  17600,  17648,  17697,  17745,
+    17793,  17842,  17890,  17939,  17987,  18035,  18084,  18132,  18180,
+    18228,  18277,  18325,  18373,  18421,  18470,  18518,  18566,  18614,
+    18663,  18711,  18759,  18807,  18855,  18903,  18951,  19000,  19048,
+    19096,  19144,  19192,  19240,  19288,  19336,  19384,  19432,  19480,
+    19528,  19576,  19624,  19672,  19720,  19768,  19816,  19864,  19912,
+    19959,  20007,  20055,  20103,  20151,  20199,  20246,  20294,  20342,
+    20390,  20438,  20485,  20533,  20581,  20629,  20676,  20724,  20772,
+    20819,  20867,  20915,  20962,  21010,  21057,  21105,  21153,  21200,
+    21248,  21295,  21343,  21390,  21438,  21485,  21533,  21580,  21628,
+    21675,  21723,  21770,  21817,  21865,  21912,  21960,  22007,  22054,
+    22102,  22149,  22196,  22243,  22291,  22338,  22385,  22432,  22480,
+    22527,  22574,  22621,  22668,  22716,  22763,  22810,  22857,  22904,
+    22951,  22998,  23045,  23092,  23139,  23186,  23233,  23280,  23327,
+    23374,  23421,  23468,  23515,  23562,  23609,  23656,  23703,  23750,
+    23796,  23843,  23890,  23937,  23984,  24030,  24077,  24124,  24171,
+    24217,  24264,  24311,  24357,  24404,  24451,  24497,  24544,  24591,
+    24637,  24684,  24730,  24777,  24823,  24870,  24916,  24963,  25009,
+    25056,  25102,  25149,  25195,  25241,  25288,  25334,  25381,  25427,
+    25473,  25520,  25566,  25612,  25658,  25705,  25751,  25797,  25843,
+    25889,  25936,  25982,  26028,  26074,  26120,  26166,  26212,  26258,
+    26304,  26350,  26396,  26442,  26488,  26534,  26580,  26626,  26672,
+    26718,  26764,  26810,  26856,  26902,  26947,  26993,  27039,  27085,
+    27131,  27176,  27222,  27268,  27313,  27359,  27405,  27450,  27496,
+    27542,  27587,  27633,  27678,  27724,  27770,  27815,  27861,  27906,
+    27952,  27997,  28042,  28088,  28133,  28179,  28224,  28269,  28315,
+    28360,  28405,  28451,  28496,  28541,  28586,  28632,  28677,  28722,
+    28767,  28812,  28858,  28903,  28948,  28993,  29038,  29083,  29128,
+    29173,  29218,  29263,  29308,  29353,  29398,  29443,  29488,  29533,
+    29577,  29622,  29667,  29712,  29757,  29801,  29846,  29891,  29936,
+    29980,  30025,  30070,  30114,  30159,  30204,  30248,  30293,  30337,
+    30382,  30427,  30471,  30516,  30560,  30604,  30649,  30693,  30738,
+    30782,  30826,  30871,  30915,  30959,  31004,  31048,  31092,  31136,
+    31181,  31225,  31269,  31313,  31357,  31402,  31446,  31490,  31534,
+    31578,  31622,  31666,  31710,  31754,  31798,  31842,  31886,  31930,
+    31974,  32017,  32061,  32105,  32149,  32193,  32236,  32280,  32324,
+    32368,  32411,  32455,  32499,  32542,  32586,  32630,  32673,  32717,
+    32760,  32804,  32847,  32891,  32934,  32978,  33021,  33065,  33108,
+    33151,  33195,  33238,  33281,  33325,  33368,  33411,  33454,  33498,
+    33541,  33584,  33627,  33670,  33713,  33756,  33799,  33843,  33886,
+    33929,  33972,  34015,  34057,  34100,  34143,  34186,  34229,  34272,
+    34315,  34358,  34400,  34443,  34486,  34529,  34571,  34614,  34657,
+    34699,  34742,  34785,  34827,  34870,  34912,  34955,  34997,  35040,
+    35082,  35125,  35167,  35210,  35252,  35294,  35337,  35379,  35421,
+    35464,  35506,  35548,  35590,  35633,  35675,  35717,  35759,  35801,
+    35843,  35885,  35927,  35969,  36011,  36053,  36095,  36137,  36179,
+    36221,  36263,  36305,  36347,  36388,  36430,  36472,  36514,  36556,
+    36597,  36639,  36681,  36722,  36764,  36805,  36847,  36889,  36930,
+    36972,  37013,  37055,  37096,  37137,  37179,  37220,  37262,  37303,
+    37344,  37386,  37427,  37468,  37509,  37551,  37592,  37633,  37674,
+    37715,  37756,  37797,  37838,  37879,  37920,  37961,  38002,  38043,
+    38084,  38125,  38166,  38207,  38248,  38288,  38329,  38370,  38411,
+    38451,  38492,  38533,  38573,  38614,  38655,  38695,  38736,  38776,
+    38817,  38857,  38898,  38938,  38979,  39019,  39059,  39100,  39140,
+    39180,  39221,  39261,  39301,  39341,  39382,  39422,  39462,  39502,
+    39542,  39582,  39622,  39662,  39702,  39742,  39782,  39822,  39862,
+    39902,  39942,  39982,  40021,  40061,  40101,  40141,  40180,  40220,
+    40260,  40299,  40339,  40379,  40418,  40458,  40497,  40537,  40576,
+    40616,  40655,  40695,  40734,  40773,  40813,  40852,  40891,  40931,
+    40970,  41009,  41048,  41087,  41127,  41166,  41205,  41244,  41283,
+    41322,  41361,  41400,  41439,  41478,  41517,  41556,  41595,  41633,
+    41672,  41711,  41750,  41788,  41827,  41866,  41904,  41943,  41982,
+    42020,  42059,  42097,  42136,  42174,  42213,  42251,  42290,  42328,
+    42366,  42405,  42443,  42481,  42520,  42558,  42596,  42634,  42672,
+    42711,  42749,  42787,  42825,  42863,  42901,  42939,  42977,  43015,
+    43053,  43091,  43128,  43166,  43204,  43242,  43280,  43317,  43355,
+    43393,  43430,  43468,  43506,  43543,  43581,  43618,  43656,  43693,
+    43731,  43768,  43806,  43843,  43880,  43918,  43955,  43992,  44029,
+    44067,  44104,  44141,  44178,  44215,  44252,  44289,  44326,  44363,
+    44400,  44437,  44474,  44511,  44548,  44585,  44622,  44659,  44695,
+    44732,  44769,  44806,  44842,  44879,  44915,  44952,  44989,  45025,
+    45062,  45098,  45135,  45171,  45207,  45244,  45280,  45316,  45353,
+    45389,  45425,  45462,  45498,  45534,  45570,  45606,  45642,  45678,
+    45714,  45750,  45786,  45822,  45858,  45894,  45930,  45966,  46002,
+    46037,  46073,  46109,  46145,  46180,  46216,  46252,  46287,  46323,
+    46358,  46394,  46429,  46465,  46500,  46536,  46571,  46606,  46642,
+    46677,  46712,  46747,  46783,  46818,  46853,  46888,  46923,  46958,
+    46993,  47028,  47063,  47098,  47133,  47168,  47203,  47238,  47273,
+    47308,  47342,  47377,  47412,  47446,  47481,  47516,  47550,  47585,
+    47619,  47654,  47688,  47723,  47757,  47792,  47826,  47861,  47895,
+    47929,  47963,  47998,  48032,  48066,  48100,  48134,  48168,  48202,
+    48237,  48271,  48305,  48338,  48372,  48406,  48440,  48474,  48508,
+    48542,  48575,  48609,  48643,  48676,  48710,  48744,  48777,  48811,
+    48844,  48878,  48911,  48945,  48978,  49012,  49045,  49078,  49112,
+    49145,  49178,  49211,  49244,  49278,  49311,  49344,  49377,  49410,
+    49443,  49476,  49509,  49542,  49575,  49608,  49640,  49673,  49706,
+    49739,  49771,  49804,  49837,  49869,  49902,  49935,  49967,  50000,
+    50032,  50064,  50097,  50129,  50162,  50194,  50226,  50259,  50291,
+    50323,  50355,  50387,  50420,  50452,  50484,  50516,  50548,  50580,
+    50612,  50644,  50675,  50707,  50739,  50771,  50803,  50834,  50866,
+    50898,  50929,  50961,  50993,  51024,  51056,  51087,  51119,  51150,
+    51182,  51213,  51244,  51276,  51307,  51338,  51369,  51401,  51432,
+    51463,  51494,  51525,  51556,  51587,  51618,  51649,  51680,  51711,
+    51742,  51773,  51803,  51834,  51865,  51896,  51926,  51957,  51988,
+    52018,  52049,  52079,  52110,  52140,  52171,  52201,  52231,  52262,
+    52292,  52322,  52353,  52383,  52413,  52443,  52473,  52503,  52534,
+    52564,  52594,  52624,  52653,  52683,  52713,  52743,  52773,  52803,
+    52832,  52862,  52892,  52922,  52951,  52981,  53010,  53040,  53069,
+    53099,  53128,  53158,  53187,  53216,  53246,  53275,  53304,  53334,
+    53363,  53392,  53421,  53450,  53479,  53508,  53537,  53566,  53595,
+    53624,  53653,  53682,  53711,  53739,  53768,  53797,  53826,  53854,
+    53883,  53912,  53940,  53969,  53997,  54026,  54054,  54082,  54111,
+    54139,  54167,  54196,  54224,  54252,  54280,  54309,  54337,  54365,
+    54393,  54421,  54449,  54477,  54505,  54533,  54560,  54588,  54616,
+    54644,  54672,  54699,  54727,  54755,  54782,  54810,  54837,  54865,
+    54892,  54920,  54947,  54974,  55002,  55029,  55056,  55084,  55111,
+    55138,  55165,  55192,  55219,  55246,  55274,  55300,  55327,  55354,
+    55381,  55408,  55435,  55462,  55489,  55515,  55542,  55569,  55595,
+    55622,  55648,  55675,  55701,  55728,  55754,  55781,  55807,  55833,
+    55860,  55886,  55912,  55938,  55965,  55991,  56017,  56043,  56069,
+    56095,  56121,  56147,  56173,  56199,  56225,  56250,  56276,  56302,
+    56328,  56353,  56379,  56404,  56430,  56456,  56481,  56507,  56532,
+    56557,  56583,  56608,  56633,  56659,  56684,  56709,  56734,  56760,
+    56785,  56810,  56835,  56860,  56885,  56910,  56935,  56959,  56984,
+    57009,  57034,  57059,  57083,  57108,  57133,  57157,  57182,  57206,
+    57231,  57255,  57280,  57304,  57329,  57353,  57377,  57402,  57426,
+    57450,  57474,  57498,  57522,  57546,  57570,  57594,  57618,  57642,
+    57666,  57690,  57714,  57738,  57762,  57785,  57809,  57833,  57856,
+    57880,  57903,  57927,  57950,  57974,  57997,  58021,  58044,  58067,
+    58091,  58114,  58137,  58160,  58183,  58207,  58230,  58253,  58276,
+    58299,  58322,  58345,  58367,  58390,  58413,  58436,  58459,  58481,
+    58504,  58527,  58549,  58572,  58594,  58617,  58639,  58662,  58684,
+    58706,  58729,  58751,  58773,  58795,  58818,  58840,  58862,  58884,
+    58906,  58928,  58950,  58972,  58994,  59016,  59038,  59059,  59081,
+    59103,  59125,  59146,  59168,  59190,  59211,  59233,  59254,  59276,
+    59297,  59318,  59340,  59361,  59382,  59404,  59425,  59446,  59467,
+    59488,  59509,  59530,  59551,  59572,  59593,  59614,  59635,  59656,
+    59677,  59697,  59718,  59739,  59759,  59780,  59801,  59821,  59842,
+    59862,  59883,  59903,  59923,  59944,  59964,  59984,  60004,  60025,
+    60045,  60065,  60085,  60105,  60125,  60145,  60165,  60185,  60205,
+    60225,  60244,  60264,  60284,  60304,  60323,  60343,  60363,  60382,
+    60402,  60421,  60441,  60460,  60479,  60499,  60518,  60537,  60556,
+    60576,  60595,  60614,  60633,  60652,  60671,  60690,  60709,  60728,
+    60747,  60766,  60785,  60803,  60822,  60841,  60859,  60878,  60897,
+    60915,  60934,  60952,  60971,  60989,  61007,  61026,  61044,  61062,
+    61081,  61099,  61117,  61135,  61153,  61171,  61189,  61207,  61225,
+    61243,  61261,  61279,  61297,  61314,  61332,  61350,  61367,  61385,
+    61403,  61420,  61438,  61455,  61473,  61490,  61507,  61525,  61542,
+    61559,  61577,  61594,  61611,  61628,  61645,  61662,  61679,  61696,
+    61713,  61730,  61747,  61764,  61780,  61797,  61814,  61831,  61847,
+    61864,  61880,  61897,  61913,  61930,  61946,  61963,  61979,  61995,
+    62012,  62028,  62044,  62060,  62076,  62092,  62108,  62125,  62141,
+    62156,  62172,  62188,  62204,  62220,  62236,  62251,  62267,  62283,
+    62298,  62314,  62329,  62345,  62360,  62376,  62391,  62407,  62422,
+    62437,  62453,  62468,  62483,  62498,  62513,  62528,  62543,  62558,
+    62573,  62588,  62603,  62618,  62633,  62648,  62662,  62677,  62692,
+    62706,  62721,  62735,  62750,  62764,  62779,  62793,  62808,  62822,
+    62836,  62850,  62865,  62879,  62893,  62907,  62921,  62935,  62949,
+    62963,  62977,  62991,  63005,  63019,  63032,  63046,  63060,  63074,
+    63087,  63101,  63114,  63128,  63141,  63155,  63168,  63182,  63195,
+    63208,  63221,  63235,  63248,  63261,  63274,  63287,  63300,  63313,
+    63326,  63339,  63352,  63365,  63378,  63390,  63403,  63416,  63429,
+    63441,  63454,  63466,  63479,  63491,  63504,  63516,  63528,  63541,
+    63553,  63565,  63578,  63590,  63602,  63614,  63626,  63638,  63650,
+    63662,  63674,  63686,  63698,  63709,  63721,  63733,  63745,  63756,
+    63768,  63779,  63791,  63803,  63814,  63825,  63837,  63848,  63859,
+    63871,  63882,  63893,  63904,  63915,  63927,  63938,  63949,  63960,
+    63971,  63981,  63992,  64003,  64014,  64025,  64035,  64046,  64057,
+    64067,  64078,  64088,  64099,  64109,  64120,  64130,  64140,  64151,
+    64161,  64171,  64181,  64192,  64202,  64212,  64222,  64232,  64242,
+    64252,  64261,  64271,  64281,  64291,  64301,  64310,  64320,  64330,
+    64339,  64349,  64358,  64368,  64377,  64387,  64396,  64405,  64414,
+    64424,  64433,  64442,  64451,  64460,  64469,  64478,  64487,  64496,
+    64505,  64514,  64523,  64532,  64540,  64549,  64558,  64566,  64575,
+    64584,  64592,  64600,  64609,  64617,  64626,  64634,  64642,  64651,
+    64659,  64667,  64675,  64683,  64691,  64699,  64707,  64715,  64723,
+    64731,  64739,  64747,  64754,  64762,  64770,  64777,  64785,  64793,
+    64800,  64808,  64815,  64822,  64830,  64837,  64844,  64852,  64859,
+    64866,  64873,  64880,  64887,  64895,  64902,  64908,  64915,  64922,
+    64929,  64936,  64943,  64949,  64956,  64963,  64969,  64976,  64982,
+    64989,  64995,  65002,  65008,  65015,  65021,  65027,  65033,  65040,
+    65046,  65052,  65058,  65064,  65070,  65076,  65082,  65088,  65094,
+    65099,  65105,  65111,  65117,  65122,  65128,  65133,  65139,  65144,
+    65150,  65155,  65161,  65166,  65171,  65177,  65182,  65187,  65192,
+    65197,  65202,  65207,  65212,  65217,  65222,  65227,  65232,  65237,
+    65242,  65246,  65251,  65256,  65260,  65265,  65270,  65274,  65279,
+    65283,  65287,  65292,  65296,  65300,  65305,  65309,  65313,  65317,
+    65321,  65325,  65329,  65333,  65337,  65341,  65345,  65349,  65352,
+    65356,  65360,  65363,  65367,  65371,  65374,  65378,  65381,  65385,
+    65388,  65391,  65395,  65398,  65401,  65404,  65408,  65411,  65414,
+    65417,  65420,  65423,  65426,  65429,  65431,  65434,  65437,  65440,
+    65442,  65445,  65448,  65450,  65453,  65455,  65458,  65460,  65463,
+    65465,  65467,  65470,  65472,  65474,  65476,  65478,  65480,  65482,
+    65484,  65486,  65488,  65490,  65492,  65494,  65496,  65497,  65499,
+    65501,  65502,  65504,  65505,  65507,  65508,  65510,  65511,  65513,
+    65514,  65515,  65516,  65518,  65519,  65520,  65521,  65522,  65523,
+    65524,  65525,  65526,  65527,  65527,  65528,  65529,  65530,  65530,
+    65531,  65531,  65532,  65532,  65533,  65533,  65534,  65534,  65534,
+    65535,  65535,  65535,  65535,  65535,  65535,  65535,
 };
 
-const fixed_t *finecosine = &finesine[FINEANGLES/4];
+const fixed_t *finecosine = &finesine[FINEANGLES / 4];
 
 const angle_t tantoangle[2049] =
 {
-    0,333772,667544,1001315,1335086,1668857,2002626,2336395,
-    2670163,3003929,3337694,3671457,4005219,4338979,4672736,5006492,
-    5340245,5673995,6007743,6341488,6675230,7008968,7342704,7676435,
-    8010164,8343888,8677609,9011325,9345037,9678744,10012447,10346145,
-    10679838,11013526,11347209,11680887,12014558,12348225,12681885,13015539,
-    13349187,13682829,14016464,14350092,14683714,15017328,15350936,15684536,
-    16018129,16351714,16685291,17018860,17352422,17685974,18019518,18353054,
-    18686582,19020100,19353610,19687110,20020600,20354080,20687552,21021014,
-    21354466,21687906,22021338,22354758,22688168,23021568,23354956,23688332,
-    24021698,24355052,24688396,25021726,25355046,25688352,26021648,26354930,
-    26688200,27021456,27354702,27687932,28021150,28354356,28687548,29020724,
-    29353888,29687038,30020174,30353296,30686404,31019496,31352574,31685636,
-    32018684,32351718,32684734,33017736,33350722,33683692,34016648,34349584,
-    34682508,35015412,35348300,35681172,36014028,36346868,36679688,37012492,
-    37345276,37678044,38010792,38343524,38676240,39008936,39341612,39674272,
-    40006912,40339532,40672132,41004716,41337276,41669820,42002344,42334848,
-    42667332,42999796,43332236,43664660,43997060,44329444,44661800,44994140,
-    45326456,45658752,45991028,46323280,46655512,46987720,47319908,47652072,
-    47984212,48316332,48648428,48980500,49312548,49644576,49976580,50308556,
-    50640512,50972444,51304352,51636236,51968096,52299928,52631740,52963524,
-    53295284,53627020,53958728,54290412,54622068,54953704,55285308,55616888,
-    55948444,56279972,56611472,56942948,57274396,57605816,57937212,58268576,
-    58599916,58931228,59262512,59593768,59924992,60256192,60587364,60918508,
-    61249620,61580704,61911760,62242788,62573788,62904756,63235692,63566604,
-    63897480,64228332,64559148,64889940,65220696,65551424,65882120,66212788,
-    66543420,66874024,67204600,67535136,67865648,68196120,68526568,68856984,
-    69187360,69517712,69848024,70178304,70508560,70838776,71168960,71499112,
-    71829224,72159312,72489360,72819376,73149360,73479304,73809216,74139096,
-    74468936,74798744,75128520,75458264,75787968,76117632,76447264,76776864,
-    77106424,77435952,77765440,78094888,78424304,78753688,79083032,79412336,
-    79741608,80070840,80400032,80729192,81058312,81387392,81716432,82045440,
-    82374408,82703336,83032224,83361080,83689896,84018664,84347400,84676096,
-    85004760,85333376,85661952,85990488,86318984,86647448,86975864,87304240,
-    87632576,87960872,88289128,88617344,88945520,89273648,89601736,89929792,
-    90257792,90585760,90913688,91241568,91569408,91897200,92224960,92552672,
-    92880336,93207968,93535552,93863088,94190584,94518040,94845448,95172816,
-    95500136,95827416,96154648,96481832,96808976,97136080,97463136,97790144,
-    98117112,98444032,98770904,99097736,99424520,99751256,100077944,100404592,
-    100731192,101057744,101384248,101710712,102037128,102363488,102689808,103016080,
-    103342312,103668488,103994616,104320696,104646736,104972720,105298656,105624552,
-    105950392,106276184,106601928,106927624,107253272,107578872,107904416,108229920,
-    108555368,108880768,109206120,109531416,109856664,110181872,110507016,110832120,
-    111157168,111482168,111807112,112132008,112456856,112781648,113106392,113431080,
-    113755720,114080312,114404848,114729328,115053760,115378136,115702464,116026744,
-    116350960,116675128,116999248,117323312,117647320,117971272,118295176,118619024,
-    118942816,119266560,119590248,119913880,120237456,120560984,120884456,121207864,
-    121531224,121854528,122177784,122500976,122824112,123147200,123470224,123793200,
-    124116120,124438976,124761784,125084528,125407224,125729856,126052432,126374960,
-    126697424,127019832,127342184,127664472,127986712,128308888,128631008,128953072,
-    129275080,129597024,129918912,130240744,130562520,130884232,131205888,131527480,
-    131849016,132170496,132491912,132813272,133134576,133455816,133776992,134098120,
-    134419184,134740176,135061120,135382000,135702816,136023584,136344272,136664912,
-    136985488,137306016,137626464,137946864,138267184,138587456,138907664,139227808,
-    139547904,139867920,140187888,140507776,140827616,141147392,141467104,141786752,
-    142106336,142425856,142745312,143064720,143384048,143703312,144022512,144341664,
-    144660736,144979744,145298704,145617584,145936400,146255168,146573856,146892480,
-    147211040,147529536,147847968,148166336,148484640,148802880,149121056,149439152,
-    149757200,150075168,150393072,150710912,151028688,151346400,151664048,151981616,
-    152299136,152616576,152933952,153251264,153568496,153885680,154202784,154519824,
-    154836784,155153696,155470528,155787296,156104000,156420624,156737200,157053696,
-    157370112,157686480,158002768,158318976,158635136,158951216,159267232,159583168,
-    159899040,160214848,160530592,160846256,161161840,161477376,161792832,162108208,
-    162423520,162738768,163053952,163369040,163684080,163999040,164313936,164628752,
-    164943504,165258176,165572784,165887312,166201776,166516160,166830480,167144736,
-    167458912,167773008,168087040,168400992,168714880,169028688,169342432,169656096,
-    169969696,170283216,170596672,170910032,171223344,171536576,171849728,172162800,
-    172475808,172788736,173101600,173414384,173727104,174039728,174352288,174664784,
-    174977200,175289536,175601792,175913984,176226096,176538144,176850096,177161984,
-    177473792,177785536,178097200,178408784,178720288,179031728,179343088,179654368,
-    179965568,180276704,180587744,180898720,181209616,181520448,181831184,182141856,
-    182452448,182762960,183073408,183383760,183694048,184004240,184314368,184624416,
-    184934400,185244288,185554096,185863840,186173504,186483072,186792576,187102000,
-    187411344,187720608,188029808,188338912,188647936,188956896,189265760,189574560,
-    189883264,190191904,190500448,190808928,191117312,191425632,191733872,192042016,
-    192350096,192658096,192966000,193273840,193581584,193889264,194196848,194504352,
-    194811792,195119136,195426400,195733584,196040688,196347712,196654656,196961520,
-    197268304,197574992,197881616,198188144,198494592,198800960,199107248,199413456,
-    199719584,200025616,200331584,200637456,200943248,201248960,201554576,201860128,
-    202165584,202470960,202776256,203081456,203386592,203691632,203996592,204301472,
-    204606256,204910976,205215600,205520144,205824592,206128960,206433248,206737456,
-    207041584,207345616,207649568,207953424,208257216,208560912,208864512,209168048,
-    209471488,209774832,210078112,210381296,210684384,210987408,211290336,211593184,
-    211895936,212198608,212501184,212803680,213106096,213408432,213710672,214012816,
-    214314880,214616864,214918768,215220576,215522288,215823920,216125472,216426928,
-    216728304,217029584,217330784,217631904,217932928,218233856,218534704,218835472,
-    219136144,219436720,219737216,220037632,220337952,220638192,220938336,221238384,
-    221538352,221838240,222138032,222437728,222737344,223036880,223336304,223635664,
-    223934912,224234096,224533168,224832160,225131072,225429872,225728608,226027232,
-    226325776,226624240,226922608,227220880,227519056,227817152,228115168,228413088,
-    228710912,229008640,229306288,229603840,229901312,230198688,230495968,230793152,
-    231090256,231387280,231684192,231981024,232277760,232574416,232870960,233167440,
-    233463808,233760096,234056288,234352384,234648384,234944304,235240128,235535872,
-    235831504,236127056,236422512,236717888,237013152,237308336,237603424,237898416,
-    238193328,238488144,238782864,239077488,239372016,239666464,239960816,240255072,
-    240549232,240843312,241137280,241431168,241724960,242018656,242312256,242605776,
-    242899200,243192512,243485744,243778896,244071936,244364880,244657744,244950496,
-    245243168,245535744,245828224,246120608,246412912,246705104,246997216,247289216,
-    247581136,247872960,248164688,248456320,248747856,249039296,249330640,249621904,
-    249913056,250204128,250495088,250785968,251076736,251367424,251658016,251948512,
-    252238912,252529200,252819408,253109520,253399536,253689456,253979280,254269008,
-    254558640,254848176,255137632,255426976,255716224,256005376,256294432,256583392,
-    256872256,257161024,257449696,257738272,258026752,258315136,258603424,258891600,
-    259179696,259467696,259755600,260043392,260331104,260618704,260906224,261193632,
-    261480960,261768176,262055296,262342320,262629248,262916080,263202816,263489456,
-    263776000,264062432,264348784,264635024,264921168,265207216,265493168,265779024,
-    266064784,266350448,266636000,266921472,267206832,267492096,267777264,268062336,
-    268347312,268632192,268916960,269201632,269486208,269770688,270055072,270339360,
-    270623552,270907616,271191616,271475488,271759296,272042976,272326560,272610048,
-    272893440,273176736,273459936,273743040,274026048,274308928,274591744,274874432,
-    275157024,275439520,275721920,276004224,276286432,276568512,276850528,277132416,
-    277414240,277695936,277977536,278259040,278540448,278821728,279102944,279384032,
-    279665056,279945952,280226752,280507456,280788064,281068544,281348960,281629248,
-    281909472,282189568,282469568,282749440,283029248,283308960,283588544,283868032,
-    284147424,284426720,284705920,284985024,285264000,285542912,285821696,286100384,
-    286378976,286657440,286935840,287214112,287492320,287770400,288048384,288326240,
-    288604032,288881696,289159264,289436768,289714112,289991392,290268576,290545632,
-    290822592,291099456,291376224,291652896,291929440,292205888,292482272,292758528,
-    293034656,293310720,293586656,293862496,294138240,294413888,294689440,294964864,
-    295240192,295515424,295790560,296065600,296340512,296615360,296890080,297164704,
-    297439200,297713632,297987936,298262144,298536256,298810240,299084160,299357952,
-    299631648,299905248,300178720,300452128,300725408,300998592,301271680,301544640,
-    301817536,302090304,302362976,302635520,302908000,303180352,303452608,303724768,
-    303996800,304268768,304540608,304812320,305083968,305355520,305626944,305898272,
-    306169472,306440608,306711616,306982528,307253344,307524064,307794656,308065152,
-    308335552,308605856,308876032,309146112,309416096,309685984,309955744,310225408,
-    310494976,310764448,311033824,311303072,311572224,311841280,312110208,312379040,
-    312647776,312916416,313184960,313453376,313721696,313989920,314258016,314526016,
-    314793920,315061728,315329408,315597024,315864512,316131872,316399168,316666336,
-    316933408,317200384,317467232,317733984,318000640,318267200,318533632,318799968,
-    319066208,319332352,319598368,319864288,320130112,320395808,320661408,320926912,
-    321192320,321457632,321722816,321987904,322252864,322517760,322782528,323047200,
-    323311744,323576192,323840544,324104800,324368928,324632992,324896928,325160736,
-    325424448,325688096,325951584,326215008,326478304,326741504,327004608,327267584,
-    327530464,327793248,328055904,328318496,328580960,328843296,329105568,329367712,
-    329629760,329891680,330153536,330415264,330676864,330938400,331199808,331461120,
-    331722304,331983392,332244384,332505280,332766048,333026752,333287296,333547776,
-    333808128,334068384,334328544,334588576,334848512,335108352,335368064,335627712,
-    335887200,336146624,336405920,336665120,336924224,337183200,337442112,337700864,
-    337959552,338218112,338476576,338734944,338993184,339251328,339509376,339767296,
-    340025120,340282848,340540480,340797984,341055392,341312704,341569888,341826976,
-    342083968,342340832,342597600,342854272,343110848,343367296,343623648,343879904,
-    344136032,344392064,344648000,344903808,345159520,345415136,345670656,345926048,
-    346181344,346436512,346691616,346946592,347201440,347456224,347710880,347965440,
-    348219872,348474208,348728448,348982592,349236608,349490528,349744320,349998048,
-    350251648,350505152,350758528,351011808,351264992,351518048,351771040,352023872,
-    352276640,352529280,352781824,353034272,353286592,353538816,353790944,354042944,
-    354294880,354546656,354798368,355049952,355301440,355552800,355804096,356055264,
-    356306304,356557280,356808128,357058848,357309504,357560032,357810464,358060768,
-    358311008,358561088,358811104,359060992,359310784,359560480,359810048,360059520,
-    360308896,360558144,360807296,361056352,361305312,361554144,361802880,362051488,
-    362300032,362548448,362796736,363044960,363293056,363541024,363788928,364036704,
-    364284384,364531936,364779392,365026752,365274016,365521152,365768192,366015136,
-    366261952,366508672,366755296,367001792,367248192,367494496,367740704,367986784,
-    368232768,368478656,368724416,368970080,369215648,369461088,369706432,369951680,
-    370196800,370441824,370686752,370931584,371176288,371420896,371665408,371909792,
-    372154080,372398272,372642336,372886304,373130176,373373952,373617600,373861152,
-    374104608,374347936,374591168,374834304,375077312,375320224,375563040,375805760,
-    376048352,376290848,376533248,376775520,377017696,377259776,377501728,377743584,
-    377985344,378227008,378468544,378709984,378951328,379192544,379433664,379674688,
-    379915584,380156416,380397088,380637696,380878176,381118560,381358848,381599040,
-    381839104,382079072,382318912,382558656,382798304,383037856,383277280,383516640,
-    383755840,383994976,384233984,384472896,384711712,384950400,385188992,385427488,
-    385665888,385904160,386142336,386380384,386618368,386856224,387093984,387331616,
-    387569152,387806592,388043936,388281152,388518272,388755296,388992224,389229024,
-    389465728,389702336,389938816,390175200,390411488,390647680,390883744,391119712,
-    391355584,391591328,391826976,392062528,392297984,392533312,392768544,393003680,
-    393238720,393473632,393708448,393943168,394177760,394412256,394646656,394880960,
-    395115136,395349216,395583200,395817088,396050848,396284512,396518080,396751520,
-    396984864,397218112,397451264,397684288,397917248,398150080,398382784,398615424,
-    398847936,399080320,399312640,399544832,399776928,400008928,400240832,400472608,
-    400704288,400935872,401167328,401398720,401629984,401861120,402092192,402323136,
-    402553984,402784736,403015360,403245888,403476320,403706656,403936896,404167008,
-    404397024,404626944,404856736,405086432,405316032,405545536,405774912,406004224,
-    406233408,406462464,406691456,406920320,407149088,407377760,407606336,407834784,
-    408063136,408291392,408519520,408747584,408975520,409203360,409431072,409658720,
-    409886240,410113664,410340992,410568192,410795296,411022304,411249216,411476032,
-    411702720,411929312,412155808,412382176,412608480,412834656,413060736,413286720,
-    413512576,413738336,413964000,414189568,414415040,414640384,414865632,415090784,
-    415315840,415540800,415765632,415990368,416215008,416439552,416663968,416888288,
-    417112512,417336640,417560672,417784576,418008384,418232096,418455712,418679200,
-    418902624,419125920,419349120,419572192,419795200,420018080,420240864,420463552,
-    420686144,420908608,421130976,421353280,421575424,421797504,422019488,422241344,
-    422463104,422684768,422906336,423127776,423349120,423570400,423791520,424012576,
-    424233536,424454368,424675104,424895744,425116288,425336736,425557056,425777280,
-    425997408,426217440,426437376,426657184,426876928,427096544,427316064,427535488,
-    427754784,427974016,428193120,428412128,428631040,428849856,429068544,429287168,
-    429505664,429724064,429942368,430160576,430378656,430596672,430814560,431032352,
-    431250048,431467616,431685120,431902496,432119808,432336992,432554080,432771040,
-    432987936,433204736,433421408,433637984,433854464,434070848,434287104,434503296,
-    434719360,434935360,435151232,435367008,435582656,435798240,436013696,436229088,
-    436444352,436659520,436874592,437089568,437304416,437519200,437733856,437948416,
-    438162880,438377248,438591520,438805696,439019744,439233728,439447584,439661344,
-    439875008,440088576,440302048,440515392,440728672,440941824,441154880,441367872,
-    441580736,441793472,442006144,442218720,442431168,442643552,442855808,443067968,
-    443280032,443492000,443703872,443915648,444127296,444338880,444550336,444761696,
-    444972992,445184160,445395232,445606176,445817056,446027840,446238496,446449088,
-    446659552,446869920,447080192,447290400,447500448,447710432,447920320,448130112,
-    448339776,448549376,448758848,448968224,449177536,449386720,449595808,449804800,
-    450013664,450222464,450431168,450639776,450848256,451056640,451264960,451473152,
-    451681248,451889248,452097152,452304960,452512672,452720288,452927808,453135232,
-    453342528,453549760,453756864,453963904,454170816,454377632,454584384,454791008,
-    454997536,455203968,455410304,455616544,455822688,456028704,456234656,456440512,
-    456646240,456851904,457057472,457262912,457468256,457673536,457878688,458083744,
-    458288736,458493600,458698368,458903040,459107616,459312096,459516480,459720768,
-    459924960,460129056,460333056,460536960,460740736,460944448,461148064,461351584,
-    461554976,461758304,461961536,462164640,462367680,462570592,462773440,462976160,
-    463178816,463381344,463583776,463786144,463988384,464190560,464392608,464594560,
-    464796448,464998208,465199872,465401472,465602944,465804320,466005600,466206816,
-    466407904,466608896,466809824,467010624,467211328,467411936,467612480,467812896,
-    468013216,468213440,468413600,468613632,468813568,469013440,469213184,469412832,
-    469612416,469811872,470011232,470210528,470409696,470608800,470807776,471006688,
-    471205472,471404192,471602784,471801312,471999712,472198048,472396288,472594400,
-    472792448,472990400,473188256,473385984,473583648,473781216,473978688,474176064,
-    474373344,474570528,474767616,474964608,475161504,475358336,475555040,475751648,
-    475948192,476144608,476340928,476537184,476733312,476929376,477125344,477321184,
-    477516960,477712640,477908224,478103712,478299104,478494400,478689600,478884704,
-    479079744,479274656,479469504,479664224,479858880,480053408,480247872,480442240,
-    480636512,480830656,481024736,481218752,481412640,481606432,481800128,481993760,
-    482187264,482380704,482574016,482767264,482960416,483153472,483346432,483539296,
-    483732064,483924768,484117344,484309856,484502240,484694560,484886784,485078912,
-    485270944,485462880,485654720,485846464,486038144,486229696,486421184,486612576,
-    486803840,486995040,487186176,487377184,487568096,487758912,487949664,488140320,
-    488330880,488521312,488711712,488901984,489092160,489282240,489472256,489662176,
-    489851968,490041696,490231328,490420896,490610336,490799712,490988960,491178144,
-    491367232,491556224,491745120,491933920,492122656,492311264,492499808,492688256,
-    492876608,493064864,493253056,493441120,493629120,493817024,494004832,494192544,
-    494380160,494567712,494755136,494942496,495129760,495316928,495504000,495691008,
-    495877888,496064704,496251424,496438048,496624608,496811040,496997408,497183680,
-    497369856,497555936,497741920,497927840,498113632,498299360,498484992,498670560,
-    498856000,499041376,499226656,499411840,499596928,499781920,499966848,500151680,
-    500336416,500521056,500705600,500890080,501074464,501258752,501442944,501627040,
-    501811072,501995008,502178848,502362592,502546240,502729824,502913312,503096704,
-    503280000,503463232,503646368,503829408,504012352,504195200,504377984,504560672,
-    504743264,504925760,505108192,505290496,505472736,505654912,505836960,506018944,
-    506200832,506382624,506564320,506745952,506927488,507108928,507290272,507471552,
-    507652736,507833824,508014816,508195744,508376576,508557312,508737952,508918528,
-    509099008,509279392,509459680,509639904,509820032,510000064,510180000,510359872,
-    510539648,510719328,510898944,511078432,511257856,511437216,511616448,511795616,
-    511974688,512153664,512332576,512511392,512690112,512868768,513047296,513225792,
-    513404160,513582432,513760640,513938784,514116800,514294752,514472608,514650368,
-    514828064,515005664,515183168,515360608,515537952,515715200,515892352,516069440,
-    516246432,516423328,516600160,516776896,516953536,517130112,517306592,517482976,
-    517659264,517835488,518011616,518187680,518363648,518539520,518715296,518891008,
-    519066624,519242144,519417600,519592960,519768256,519943424,520118528,520293568,
-    520468480,520643328,520818112,520992800,521167392,521341888,521516320,521690656,
-    521864896,522039072,522213152,522387168,522561056,522734912,522908640,523082304,
-    523255872,523429376,523602784,523776096,523949312,524122464,524295552,524468512,
-    524641440,524814240,524986976,525159616,525332192,525504640,525677056,525849344,
-    526021568,526193728,526365792,526537760,526709632,526881440,527053152,527224800,
-    527396352,527567840,527739200,527910528,528081728,528252864,528423936,528594880,
-    528765760,528936576,529107296,529277920,529448480,529618944,529789344,529959648,
-    530129856,530300000,530470048,530640000,530809888,530979712,531149440,531319072,
-    531488608,531658080,531827488,531996800,532166016,532335168,532504224,532673184,
-    532842080,533010912,533179616,533348288,533516832,533685312,533853728,534022048,
-    534190272,534358432,534526496,534694496,534862400,535030240,535197984,535365632,
-    535533216,535700704,535868128,536035456,536202720,536369888,536536992,536704000,
-    536870912
+    0,         333772,    667544,    1001315,   1335086,   1668857,
+    2002626,   2336395,   2670163,   3003929,   3337694,   3671457,
+    4005219,   4338979,   4672736,   5006492,   5340245,   5673995,
+    6007743,   6341488,   6675230,   7008968,   7342704,   7676435,
+    8010164,   8343888,   8677609,   9011325,   9345037,   9678744,
+    10012447,  10346145,  10679838,  11013526,  11347209,  11680887,
+    12014558,  12348225,  12681885,  13015539,  13349187,  13682829,
+    14016464,  14350092,  14683714,  15017328,  15350936,  15684536,
+    16018129,  16351714,  16685291,  17018860,  17352422,  17685974,
+    18019518,  18353054,  18686582,  19020100,  19353610,  19687110,
+    20020600,  20354080,  20687552,  21021014,  21354466,  21687906,
+    22021338,  22354758,  22688168,  23021568,  23354956,  23688332,
+    24021698,  24355052,  24688396,  25021726,  25355046,  25688352,
+    26021648,  26354930,  26688200,  27021456,  27354702,  27687932,
+    28021150,  28354356,  28687548,  29020724,  29353888,  29687038,
+    30020174,  30353296,  30686404,  31019496,  31352574,  31685636,
+    32018684,  32351718,  32684734,  33017736,  33350722,  33683692,
+    34016648,  34349584,  34682508,  35015412,  35348300,  35681172,
+    36014028,  36346868,  36679688,  37012492,  37345276,  37678044,
+    38010792,  38343524,  38676240,  39008936,  39341612,  39674272,
+    40006912,  40339532,  40672132,  41004716,  41337276,  41669820,
+    42002344,  42334848,  42667332,  42999796,  43332236,  43664660,
+    43997060,  44329444,  44661800,  44994140,  45326456,  45658752,
+    45991028,  46323280,  46655512,  46987720,  47319908,  47652072,
+    47984212,  48316332,  48648428,  48980500,  49312548,  49644576,
+    49976580,  50308556,  50640512,  50972444,  51304352,  51636236,
+    51968096,  52299928,  52631740,  52963524,  53295284,  53627020,
+    53958728,  54290412,  54622068,  54953704,  55285308,  55616888,
+    55948444,  56279972,  56611472,  56942948,  57274396,  57605816,
+    57937212,  58268576,  58599916,  58931228,  59262512,  59593768,
+    59924992,  60256192,  60587364,  60918508,  61249620,  61580704,
+    61911760,  62242788,  62573788,  62904756,  63235692,  63566604,
+    63897480,  64228332,  64559148,  64889940,  65220696,  65551424,
+    65882120,  66212788,  66543420,  66874024,  67204600,  67535136,
+    67865648,  68196120,  68526568,  68856984,  69187360,  69517712,
+    69848024,  70178304,  70508560,  70838776,  71168960,  71499112,
+    71829224,  72159312,  72489360,  72819376,  73149360,  73479304,
+    73809216,  74139096,  74468936,  74798744,  75128520,  75458264,
+    75787968,  76117632,  76447264,  76776864,  77106424,  77435952,
+    77765440,  78094888,  78424304,  78753688,  79083032,  79412336,
+    79741608,  80070840,  80400032,  80729192,  81058312,  81387392,
+    81716432,  82045440,  82374408,  82703336,  83032224,  83361080,
+    83689896,  84018664,  84347400,  84676096,  85004760,  85333376,
+    85661952,  85990488,  86318984,  86647448,  86975864,  87304240,
+    87632576,  87960872,  88289128,  88617344,  88945520,  89273648,
+    89601736,  89929792,  90257792,  90585760,  90913688,  91241568,
+    91569408,  91897200,  92224960,  92552672,  92880336,  93207968,
+    93535552,  93863088,  94190584,  94518040,  94845448,  95172816,
+    95500136,  95827416,  96154648,  96481832,  96808976,  97136080,
+    97463136,  97790144,  98117112,  98444032,  98770904,  99097736,
+    99424520,  99751256,  100077944, 100404592, 100731192, 101057744,
+    101384248, 101710712, 102037128, 102363488, 102689808, 103016080,
+    103342312, 103668488, 103994616, 104320696, 104646736, 104972720,
+    105298656, 105624552, 105950392, 106276184, 106601928, 106927624,
+    107253272, 107578872, 107904416, 108229920, 108555368, 108880768,
+    109206120, 109531416, 109856664, 110181872, 110507016, 110832120,
+    111157168, 111482168, 111807112, 112132008, 112456856, 112781648,
+    113106392, 113431080, 113755720, 114080312, 114404848, 114729328,
+    115053760, 115378136, 115702464, 116026744, 116350960, 116675128,
+    116999248, 117323312, 117647320, 117971272, 118295176, 118619024,
+    118942816, 119266560, 119590248, 119913880, 120237456, 120560984,
+    120884456, 121207864, 121531224, 121854528, 122177784, 122500976,
+    122824112, 123147200, 123470224, 123793200, 124116120, 124438976,
+    124761784, 125084528, 125407224, 125729856, 126052432, 126374960,
+    126697424, 127019832, 127342184, 127664472, 127986712, 128308888,
+    128631008, 128953072, 129275080, 129597024, 129918912, 130240744,
+    130562520, 130884232, 131205888, 131527480, 131849016, 132170496,
+    132491912, 132813272, 133134576, 133455816, 133776992, 134098120,
+    134419184, 134740176, 135061120, 135382000, 135702816, 136023584,
+    136344272, 136664912, 136985488, 137306016, 137626464, 137946864,
+    138267184, 138587456, 138907664, 139227808, 139547904, 139867920,
+    140187888, 140507776, 140827616, 141147392, 141467104, 141786752,
+    142106336, 142425856, 142745312, 143064720, 143384048, 143703312,
+    144022512, 144341664, 144660736, 144979744, 145298704, 145617584,
+    145936400, 146255168, 146573856, 146892480, 147211040, 147529536,
+    147847968, 148166336, 148484640, 148802880, 149121056, 149439152,
+    149757200, 150075168, 150393072, 150710912, 151028688, 151346400,
+    151664048, 151981616, 152299136, 152616576, 152933952, 153251264,
+    153568496, 153885680, 154202784, 154519824, 154836784, 155153696,
+    155470528, 155787296, 156104000, 156420624, 156737200, 157053696,
+    157370112, 157686480, 158002768, 158318976, 158635136, 158951216,
+    159267232, 159583168, 159899040, 160214848, 160530592, 160846256,
+    161161840, 161477376, 161792832, 162108208, 162423520, 162738768,
+    163053952, 163369040, 163684080, 163999040, 164313936, 164628752,
+    164943504, 165258176, 165572784, 165887312, 166201776, 166516160,
+    166830480, 167144736, 167458912, 167773008, 168087040, 168400992,
+    168714880, 169028688, 169342432, 169656096, 169969696, 170283216,
+    170596672, 170910032, 171223344, 171536576, 171849728, 172162800,
+    172475808, 172788736, 173101600, 173414384, 173727104, 174039728,
+    174352288, 174664784, 174977200, 175289536, 175601792, 175913984,
+    176226096, 176538144, 176850096, 177161984, 177473792, 177785536,
+    178097200, 178408784, 178720288, 179031728, 179343088, 179654368,
+    179965568, 180276704, 180587744, 180898720, 181209616, 181520448,
+    181831184, 182141856, 182452448, 182762960, 183073408, 183383760,
+    183694048, 184004240, 184314368, 184624416, 184934400, 185244288,
+    185554096, 185863840, 186173504, 186483072, 186792576, 187102000,
+    187411344, 187720608, 188029808, 188338912, 188647936, 188956896,
+    189265760, 189574560, 189883264, 190191904, 190500448, 190808928,
+    191117312, 191425632, 191733872, 192042016, 192350096, 192658096,
+    192966000, 193273840, 193581584, 193889264, 194196848, 194504352,
+    194811792, 195119136, 195426400, 195733584, 196040688, 196347712,
+    196654656, 196961520, 197268304, 197574992, 197881616, 198188144,
+    198494592, 198800960, 199107248, 199413456, 199719584, 200025616,
+    200331584, 200637456, 200943248, 201248960, 201554576, 201860128,
+    202165584, 202470960, 202776256, 203081456, 203386592, 203691632,
+    203996592, 204301472, 204606256, 204910976, 205215600, 205520144,
+    205824592, 206128960, 206433248, 206737456, 207041584, 207345616,
+    207649568, 207953424, 208257216, 208560912, 208864512, 209168048,
+    209471488, 209774832, 210078112, 210381296, 210684384, 210987408,
+    211290336, 211593184, 211895936, 212198608, 212501184, 212803680,
+    213106096, 213408432, 213710672, 214012816, 214314880, 214616864,
+    214918768, 215220576, 215522288, 215823920, 216125472, 216426928,
+    216728304, 217029584, 217330784, 217631904, 217932928, 218233856,
+    218534704, 218835472, 219136144, 219436720, 219737216, 220037632,
+    220337952, 220638192, 220938336, 221238384, 221538352, 221838240,
+    222138032, 222437728, 222737344, 223036880, 223336304, 223635664,
+    223934912, 224234096, 224533168, 224832160, 225131072, 225429872,
+    225728608, 226027232, 226325776, 226624240, 226922608, 227220880,
+    227519056, 227817152, 228115168, 228413088, 228710912, 229008640,
+    229306288, 229603840, 229901312, 230198688, 230495968, 230793152,
+    231090256, 231387280, 231684192, 231981024, 232277760, 232574416,
+    232870960, 233167440, 233463808, 233760096, 234056288, 234352384,
+    234648384, 234944304, 235240128, 235535872, 235831504, 236127056,
+    236422512, 236717888, 237013152, 237308336, 237603424, 237898416,
+    238193328, 238488144, 238782864, 239077488, 239372016, 239666464,
+    239960816, 240255072, 240549232, 240843312, 241137280, 241431168,
+    241724960, 242018656, 242312256, 242605776, 242899200, 243192512,
+    243485744, 243778896, 244071936, 244364880, 244657744, 244950496,
+    245243168, 245535744, 245828224, 246120608, 246412912, 246705104,
+    246997216, 247289216, 247581136, 247872960, 248164688, 248456320,
+    248747856, 249039296, 249330640, 249621904, 249913056, 250204128,
+    250495088, 250785968, 251076736, 251367424, 251658016, 251948512,
+    252238912, 252529200, 252819408, 253109520, 253399536, 253689456,
+    253979280, 254269008, 254558640, 254848176, 255137632, 255426976,
+    255716224, 256005376, 256294432, 256583392, 256872256, 257161024,
+    257449696, 257738272, 258026752, 258315136, 258603424, 258891600,
+    259179696, 259467696, 259755600, 260043392, 260331104, 260618704,
+    260906224, 261193632, 261480960, 261768176, 262055296, 262342320,
+    262629248, 262916080, 263202816, 263489456, 263776000, 264062432,
+    264348784, 264635024, 264921168, 265207216, 265493168, 265779024,
+    266064784, 266350448, 266636000, 266921472, 267206832, 267492096,
+    267777264, 268062336, 268347312, 268632192, 268916960, 269201632,
+    269486208, 269770688, 270055072, 270339360, 270623552, 270907616,
+    271191616, 271475488, 271759296, 272042976, 272326560, 272610048,
+    272893440, 273176736, 273459936, 273743040, 274026048, 274308928,
+    274591744, 274874432, 275157024, 275439520, 275721920, 276004224,
+    276286432, 276568512, 276850528, 277132416, 277414240, 277695936,
+    277977536, 278259040, 278540448, 278821728, 279102944, 279384032,
+    279665056, 279945952, 280226752, 280507456, 280788064, 281068544,
+    281348960, 281629248, 281909472, 282189568, 282469568, 282749440,
+    283029248, 283308960, 283588544, 283868032, 284147424, 284426720,
+    284705920, 284985024, 285264000, 285542912, 285821696, 286100384,
+    286378976, 286657440, 286935840, 287214112, 287492320, 287770400,
+    288048384, 288326240, 288604032, 288881696, 289159264, 289436768,
+    289714112, 289991392, 290268576, 290545632, 290822592, 291099456,
+    291376224, 291652896, 291929440, 292205888, 292482272, 292758528,
+    293034656, 293310720, 293586656, 293862496, 294138240, 294413888,
+    294689440, 294964864, 295240192, 295515424, 295790560, 296065600,
+    296340512, 296615360, 296890080, 297164704, 297439200, 297713632,
+    297987936, 298262144, 298536256, 298810240, 299084160, 299357952,
+    299631648, 299905248, 300178720, 300452128, 300725408, 300998592,
+    301271680, 301544640, 301817536, 302090304, 302362976, 302635520,
+    302908000, 303180352, 303452608, 303724768, 303996800, 304268768,
+    304540608, 304812320, 305083968, 305355520, 305626944, 305898272,
+    306169472, 306440608, 306711616, 306982528, 307253344, 307524064,
+    307794656, 308065152, 308335552, 308605856, 308876032, 309146112,
+    309416096, 309685984, 309955744, 310225408, 310494976, 310764448,
+    311033824, 311303072, 311572224, 311841280, 312110208, 312379040,
+    312647776, 312916416, 313184960, 313453376, 313721696, 313989920,
+    314258016, 314526016, 314793920, 315061728, 315329408, 315597024,
+    315864512, 316131872, 316399168, 316666336, 316933408, 317200384,
+    317467232, 317733984, 318000640, 318267200, 318533632, 318799968,
+    319066208, 319332352, 319598368, 319864288, 320130112, 320395808,
+    320661408, 320926912, 321192320, 321457632, 321722816, 321987904,
+    322252864, 322517760, 322782528, 323047200, 323311744, 323576192,
+    323840544, 324104800, 324368928, 324632992, 324896928, 325160736,
+    325424448, 325688096, 325951584, 326215008, 326478304, 326741504,
+    327004608, 327267584, 327530464, 327793248, 328055904, 328318496,
+    328580960, 328843296, 329105568, 329367712, 329629760, 329891680,
+    330153536, 330415264, 330676864, 330938400, 331199808, 331461120,
+    331722304, 331983392, 332244384, 332505280, 332766048, 333026752,
+    333287296, 333547776, 333808128, 334068384, 334328544, 334588576,
+    334848512, 335108352, 335368064, 335627712, 335887200, 336146624,
+    336405920, 336665120, 336924224, 337183200, 337442112, 337700864,
+    337959552, 338218112, 338476576, 338734944, 338993184, 339251328,
+    339509376, 339767296, 340025120, 340282848, 340540480, 340797984,
+    341055392, 341312704, 341569888, 341826976, 342083968, 342340832,
+    342597600, 342854272, 343110848, 343367296, 343623648, 343879904,
+    344136032, 344392064, 344648000, 344903808, 345159520, 345415136,
+    345670656, 345926048, 346181344, 346436512, 346691616, 346946592,
+    347201440, 347456224, 347710880, 347965440, 348219872, 348474208,
+    348728448, 348982592, 349236608, 349490528, 349744320, 349998048,
+    350251648, 350505152, 350758528, 351011808, 351264992, 351518048,
+    351771040, 352023872, 352276640, 352529280, 352781824, 353034272,
+    353286592, 353538816, 353790944, 354042944, 354294880, 354546656,
+    354798368, 355049952, 355301440, 355552800, 355804096, 356055264,
+    356306304, 356557280, 356808128, 357058848, 357309504, 357560032,
+    357810464, 358060768, 358311008, 358561088, 358811104, 359060992,
+    359310784, 359560480, 359810048, 360059520, 360308896, 360558144,
+    360807296, 361056352, 361305312, 361554144, 361802880, 362051488,
+    362300032, 362548448, 362796736, 363044960, 363293056, 363541024,
+    363788928, 364036704, 364284384, 364531936, 364779392, 365026752,
+    365274016, 365521152, 365768192, 366015136, 366261952, 366508672,
+    366755296, 367001792, 367248192, 367494496, 367740704, 367986784,
+    368232768, 368478656, 368724416, 368970080, 369215648, 369461088,
+    369706432, 369951680, 370196800, 370441824, 370686752, 370931584,
+    371176288, 371420896, 371665408, 371909792, 372154080, 372398272,
+    372642336, 372886304, 373130176, 373373952, 373617600, 373861152,
+    374104608, 374347936, 374591168, 374834304, 375077312, 375320224,
+    375563040, 375805760, 376048352, 376290848, 376533248, 376775520,
+    377017696, 377259776, 377501728, 377743584, 377985344, 378227008,
+    378468544, 378709984, 378951328, 379192544, 379433664, 379674688,
+    379915584, 380156416, 380397088, 380637696, 380878176, 381118560,
+    381358848, 381599040, 381839104, 382079072, 382318912, 382558656,
+    382798304, 383037856, 383277280, 383516640, 383755840, 383994976,
+    384233984, 384472896, 384711712, 384950400, 385188992, 385427488,
+    385665888, 385904160, 386142336, 386380384, 386618368, 386856224,
+    387093984, 387331616, 387569152, 387806592, 388043936, 388281152,
+    388518272, 388755296, 388992224, 389229024, 389465728, 389702336,
+    389938816, 390175200, 390411488, 390647680, 390883744, 391119712,
+    391355584, 391591328, 391826976, 392062528, 392297984, 392533312,
+    392768544, 393003680, 393238720, 393473632, 393708448, 393943168,
+    394177760, 394412256, 394646656, 394880960, 395115136, 395349216,
+    395583200, 395817088, 396050848, 396284512, 396518080, 396751520,
+    396984864, 397218112, 397451264, 397684288, 397917248, 398150080,
+    398382784, 398615424, 398847936, 399080320, 399312640, 399544832,
+    399776928, 400008928, 400240832, 400472608, 400704288, 400935872,
+    401167328, 401398720, 401629984, 401861120, 402092192, 402323136,
+    402553984, 402784736, 403015360, 403245888, 403476320, 403706656,
+    403936896, 404167008, 404397024, 404626944, 404856736, 405086432,
+    405316032, 405545536, 405774912, 406004224, 406233408, 406462464,
+    406691456, 406920320, 407149088, 407377760, 407606336, 407834784,
+    408063136, 408291392, 408519520, 408747584, 408975520, 409203360,
+    409431072, 409658720, 409886240, 410113664, 410340992, 410568192,
+    410795296, 411022304, 411249216, 411476032, 411702720, 411929312,
+    412155808, 412382176, 412608480, 412834656, 413060736, 413286720,
+    413512576, 413738336, 413964000, 414189568, 414415040, 414640384,
+    414865632, 415090784, 415315840, 415540800, 415765632, 415990368,
+    416215008, 416439552, 416663968, 416888288, 417112512, 417336640,
+    417560672, 417784576, 418008384, 418232096, 418455712, 418679200,
+    418902624, 419125920, 419349120, 419572192, 419795200, 420018080,
+    420240864, 420463552, 420686144, 420908608, 421130976, 421353280,
+    421575424, 421797504, 422019488, 422241344, 422463104, 422684768,
+    422906336, 423127776, 423349120, 423570400, 423791520, 424012576,
+    424233536, 424454368, 424675104, 424895744, 425116288, 425336736,
+    425557056, 425777280, 425997408, 426217440, 426437376, 426657184,
+    426876928, 427096544, 427316064, 427535488, 427754784, 427974016,
+    428193120, 428412128, 428631040, 428849856, 429068544, 429287168,
+    429505664, 429724064, 429942368, 430160576, 430378656, 430596672,
+    430814560, 431032352, 431250048, 431467616, 431685120, 431902496,
+    432119808, 432336992, 432554080, 432771040, 432987936, 433204736,
+    433421408, 433637984, 433854464, 434070848, 434287104, 434503296,
+    434719360, 434935360, 435151232, 435367008, 435582656, 435798240,
+    436013696, 436229088, 436444352, 436659520, 436874592, 437089568,
+    437304416, 437519200, 437733856, 437948416, 438162880, 438377248,
+    438591520, 438805696, 439019744, 439233728, 439447584, 439661344,
+    439875008, 440088576, 440302048, 440515392, 440728672, 440941824,
+    441154880, 441367872, 441580736, 441793472, 442006144, 442218720,
+    442431168, 442643552, 442855808, 443067968, 443280032, 443492000,
+    443703872, 443915648, 444127296, 444338880, 444550336, 444761696,
+    444972992, 445184160, 445395232, 445606176, 445817056, 446027840,
+    446238496, 446449088, 446659552, 446869920, 447080192, 447290400,
+    447500448, 447710432, 447920320, 448130112, 448339776, 448549376,
+    448758848, 448968224, 449177536, 449386720, 449595808, 449804800,
+    450013664, 450222464, 450431168, 450639776, 450848256, 451056640,
+    451264960, 451473152, 451681248, 451889248, 452097152, 452304960,
+    452512672, 452720288, 452927808, 453135232, 453342528, 453549760,
+    453756864, 453963904, 454170816, 454377632, 454584384, 454791008,
+    454997536, 455203968, 455410304, 455616544, 455822688, 456028704,
+    456234656, 456440512, 456646240, 456851904, 457057472, 457262912,
+    457468256, 457673536, 457878688, 458083744, 458288736, 458493600,
+    458698368, 458903040, 459107616, 459312096, 459516480, 459720768,
+    459924960, 460129056, 460333056, 460536960, 460740736, 460944448,
+    461148064, 461351584, 461554976, 461758304, 461961536, 462164640,
+    462367680, 462570592, 462773440, 462976160, 463178816, 463381344,
+    463583776, 463786144, 463988384, 464190560, 464392608, 464594560,
+    464796448, 464998208, 465199872, 465401472, 465602944, 465804320,
+    466005600, 466206816, 466407904, 466608896, 466809824, 467010624,
+    467211328, 467411936, 467612480, 467812896, 468013216, 468213440,
+    468413600, 468613632, 468813568, 469013440, 469213184, 469412832,
+    469612416, 469811872, 470011232, 470210528, 470409696, 470608800,
+    470807776, 471006688, 471205472, 471404192, 471602784, 471801312,
+    471999712, 472198048, 472396288, 472594400, 472792448, 472990400,
+    473188256, 473385984, 473583648, 473781216, 473978688, 474176064,
+    474373344, 474570528, 474767616, 474964608, 475161504, 475358336,
+    475555040, 475751648, 475948192, 476144608, 476340928, 476537184,
+    476733312, 476929376, 477125344, 477321184, 477516960, 477712640,
+    477908224, 478103712, 478299104, 478494400, 478689600, 478884704,
+    479079744, 479274656, 479469504, 479664224, 479858880, 480053408,
+    480247872, 480442240, 480636512, 480830656, 481024736, 481218752,
+    481412640, 481606432, 481800128, 481993760, 482187264, 482380704,
+    482574016, 482767264, 482960416, 483153472, 483346432, 483539296,
+    483732064, 483924768, 484117344, 484309856, 484502240, 484694560,
+    484886784, 485078912, 485270944, 485462880, 485654720, 485846464,
+    486038144, 486229696, 486421184, 486612576, 486803840, 486995040,
+    487186176, 487377184, 487568096, 487758912, 487949664, 488140320,
+    488330880, 488521312, 488711712, 488901984, 489092160, 489282240,
+    489472256, 489662176, 489851968, 490041696, 490231328, 490420896,
+    490610336, 490799712, 490988960, 491178144, 491367232, 491556224,
+    491745120, 491933920, 492122656, 492311264, 492499808, 492688256,
+    492876608, 493064864, 493253056, 493441120, 493629120, 493817024,
+    494004832, 494192544, 494380160, 494567712, 494755136, 494942496,
+    495129760, 495316928, 495504000, 495691008, 495877888, 496064704,
+    496251424, 496438048, 496624608, 496811040, 496997408, 497183680,
+    497369856, 497555936, 497741920, 497927840, 498113632, 498299360,
+    498484992, 498670560, 498856000, 499041376, 499226656, 499411840,
+    499596928, 499781920, 499966848, 500151680, 500336416, 500521056,
+    500705600, 500890080, 501074464, 501258752, 501442944, 501627040,
+    501811072, 501995008, 502178848, 502362592, 502546240, 502729824,
+    502913312, 503096704, 503280000, 503463232, 503646368, 503829408,
+    504012352, 504195200, 504377984, 504560672, 504743264, 504925760,
+    505108192, 505290496, 505472736, 505654912, 505836960, 506018944,
+    506200832, 506382624, 506564320, 506745952, 506927488, 507108928,
+    507290272, 507471552, 507652736, 507833824, 508014816, 508195744,
+    508376576, 508557312, 508737952, 508918528, 509099008, 509279392,
+    509459680, 509639904, 509820032, 510000064, 510180000, 510359872,
+    510539648, 510719328, 510898944, 511078432, 511257856, 511437216,
+    511616448, 511795616, 511974688, 512153664, 512332576, 512511392,
+    512690112, 512868768, 513047296, 513225792, 513404160, 513582432,
+    513760640, 513938784, 514116800, 514294752, 514472608, 514650368,
+    514828064, 515005664, 515183168, 515360608, 515537952, 515715200,
+    515892352, 516069440, 516246432, 516423328, 516600160, 516776896,
+    516953536, 517130112, 517306592, 517482976, 517659264, 517835488,
+    518011616, 518187680, 518363648, 518539520, 518715296, 518891008,
+    519066624, 519242144, 519417600, 519592960, 519768256, 519943424,
+    520118528, 520293568, 520468480, 520643328, 520818112, 520992800,
+    521167392, 521341888, 521516320, 521690656, 521864896, 522039072,
+    522213152, 522387168, 522561056, 522734912, 522908640, 523082304,
+    523255872, 523429376, 523602784, 523776096, 523949312, 524122464,
+    524295552, 524468512, 524641440, 524814240, 524986976, 525159616,
+    525332192, 525504640, 525677056, 525849344, 526021568, 526193728,
+    526365792, 526537760, 526709632, 526881440, 527053152, 527224800,
+    527396352, 527567840, 527739200, 527910528, 528081728, 528252864,
+    528423936, 528594880, 528765760, 528936576, 529107296, 529277920,
+    529448480, 529618944, 529789344, 529959648, 530129856, 530300000,
+    530470048, 530640000, 530809888, 530979712, 531149440, 531319072,
+    531488608, 531658080, 531827488, 531996800, 532166016, 532335168,
+    532504224, 532673184, 532842080, 533010912, 533179616, 533348288,
+    533516832, 533685312, 533853728, 534022048, 534190272, 534358432,
+    534526496, 534694496, 534862400, 535030240, 535197984, 535365632,
+    535533216, 535700704, 535868128, 536035456, 536202720, 536369888,
+    536536992, 536704000, 536870912,
 };
 
-// Now where did these came from?
+/* Now where did these came from? */
+
 const byte gammatable[5][256] =
 {
+    {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,  65,  66,  67,  68,  69,  70,
+     71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,
+     85,  86,  87,  88,  89,  90,  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, 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, 192, 193, 194, 195,
+     196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+     210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 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},
+
     {
-        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,
-        65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
-        81,82,83,84,85,86,87,88,89,90,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,
-        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,
-        192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-        208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,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
+        2,   4,   5,   7,   8,   10,  11,  12,  14,  15,  16,  18,  19,  20,
+        21,  23,  24,  25,  26,  27,  29,  30,  31,  32,  33,  34,  36,  37,
+        38,  39,  40,  41,  42,  44,  45,  46,  47,  48,  49,  50,  51,  52,
+        54,  55,  56,  57,  58,  59,  60,  61,  62,  63,  64,  65,  66,  67,
+        69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,
+        83,  84,  85,  86,  87,  88,  89,  90,  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, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+        138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 148, 149, 150,
+        151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 163,
+        164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 175, 176,
+        177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 186, 187, 188, 189,
+        190, 191, 192, 193, 194, 195, 196, 196, 197, 198, 199, 200, 201, 202,
+        203, 204, 205, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 214,
+        215, 216, 217, 218, 219, 220, 221, 222, 222, 223, 224, 225, 226, 227,
+        228, 229, 230, 230, 231, 232, 233, 234, 235, 236, 237, 237, 238, 239,
+        240, 241, 242, 243, 244, 245, 245, 246, 247, 248, 249, 250, 251, 252,
+        252, 253, 254, 255,
     },
 
     {
-        2,4,5,7,8,10,11,12,14,15,16,18,19,20,21,23,
-        24,25,26,27,29,30,31,32,33,34,36,37,38,39,40,41,
-        42,44,45,46,47,48,49,50,51,52,54,55,56,57,58,59,
-        60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,76,
-        77,78,79,80,81,82,83,84,85,86,87,88,89,90,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,129,130,131,132,133,134,135,136,137,138,139,
-        140,141,142,143,144,145,146,147,148,148,149,150,151,152,153,154,
-        155,156,157,158,159,160,161,162,163,163,164,165,166,167,168,169,
-        170,171,172,173,174,175,175,176,177,178,179,180,181,182,183,184,
-        185,186,186,187,188,189,190,191,192,193,194,195,196,196,197,198,
-        199,200,201,202,203,204,205,205,206,207,208,209,210,211,212,213,
-        214,214,215,216,217,218,219,220,221,222,222,223,224,225,226,227,
-        228,229,230,230,231,232,233,234,235,236,237,237,238,239,240,241,
-        242,243,244,245,245,246,247,248,249,250,251,252,252,253,254,255
+        4,   7,   9,   11,  13,  15,  17,  19,  21,  22,  24,  26,  27,  29,
+        30,  32,  33,  35,  36,  38,  39,  40,  42,  43,  45,  46,  47,  48,
+        50,  51,  52,  54,  55,  56,  57,  59,  60,  61,  62,  63,  65,  66,
+        67,  68,  69,  70,  72,  73,  74,  75,  76,  77,  78,  79,  80,  82,
+        83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,  96,
+        97,  98,  100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+        112, 113, 114, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+        125, 126, 127, 128, 129, 130, 131, 132, 133, 133, 134, 135, 136, 137,
+        138, 139, 140, 141, 142, 143, 144, 144, 145, 146, 147, 148, 149, 150,
+        151, 152, 153, 153, 154, 155, 156, 157, 158, 159, 160, 160, 161, 162,
+        163, 164, 165, 166, 166, 167, 168, 169, 170, 171, 172, 172, 173, 174,
+        175, 176, 177, 178, 178, 179, 180, 181, 182, 183, 183, 184, 185, 186,
+        187, 188, 188, 189, 190, 191, 192, 193, 193, 194, 195, 196, 197, 197,
+        198, 199, 200, 201, 201, 202, 203, 204, 205, 206, 206, 207, 208, 209,
+        210, 210, 211, 212, 213, 213, 214, 215, 216, 217, 217, 218, 219, 220,
+        221, 221, 222, 223, 224, 224, 225, 226, 227, 228, 228, 229, 230, 231,
+        231, 232, 233, 234, 235, 235, 236, 237, 238, 238, 239, 240, 241, 241,
+        242, 243, 244, 244, 245, 246, 247, 247, 248, 249, 250, 251, 251, 252,
+        253, 254, 254, 255,
     },
 
     {
-        4,7,9,11,13,15,17,19,21,22,24,26,27,29,30,32,
-        33,35,36,38,39,40,42,43,45,46,47,48,50,51,52,54,
-        55,56,57,59,60,61,62,63,65,66,67,68,69,70,72,73,
-        74,75,76,77,78,79,80,82,83,84,85,86,87,88,89,90,
-        91,92,93,94,95,96,97,98,100,101,102,103,104,105,106,107,
-        108,109,110,111,112,113,114,114,115,116,117,118,119,120,121,122,
-        123,124,125,126,127,128,129,130,131,132,133,133,134,135,136,137,
-        138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,152,
-        153,153,154,155,156,157,158,159,160,160,161,162,163,164,165,166,
-        166,167,168,169,170,171,172,172,173,174,175,176,177,178,178,179,
-        180,181,182,183,183,184,185,186,187,188,188,189,190,191,192,193,
-        193,194,195,196,197,197,198,199,200,201,201,202,203,204,205,206,
-        206,207,208,209,210,210,211,212,213,213,214,215,216,217,217,218,
-        219,220,221,221,222,223,224,224,225,226,227,228,228,229,230,231,
-        231,232,233,234,235,235,236,237,238,238,239,240,241,241,242,243,
-        244,244,245,246,247,247,248,249,250,251,251,252,253,254,254,255
+        8,   12,  16,  19,  22,  24,  27,  29,  31,  34,  36,  38,  40,  41,
+        43,  45,  47,  49,  50,  52,  53,  55,  57,  58,  60,  61,  63,  64,
+        65,  67,  68,  70,  71,  72,  74,  75,  76,  77,  79,  80,  81,  82,
+        84,  85,  86,  87,  88,  90,  91,  92,  93,  94,  95,  96,  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, 135, 136, 137, 138, 139, 140,
+        141, 142, 143, 143, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152,
+        153, 154, 155, 155, 156, 157, 158, 159, 160, 160, 161, 162, 163, 164,
+        165, 165, 166, 167, 168, 169, 169, 170, 171, 172, 173, 173, 174, 175,
+        176, 176, 177, 178, 179, 180, 180, 181, 182, 183, 183, 184, 185, 186,
+        186, 187, 188, 189, 189, 190, 191, 192, 192, 193, 194, 195, 195, 196,
+        197, 197, 198, 199, 200, 200, 201, 202, 202, 203, 204, 205, 205, 206,
+        207, 207, 208, 209, 210, 210, 211, 212, 212, 213, 214, 214, 215, 216,
+        216, 217, 218, 219, 219, 220, 221, 221, 222, 223, 223, 224, 225, 225,
+        226, 227, 227, 228, 229, 229, 230, 231, 231, 232, 233, 233, 234, 235,
+        235, 236, 237, 237, 238, 238, 239, 240, 240, 241, 242, 242, 243, 244,
+        244, 245, 246, 246, 247, 247, 248, 249, 249, 250, 251, 251, 252, 253,
+        253, 254, 254, 255,
     },
 
     {
-        8,12,16,19,22,24,27,29,31,34,36,38,40,41,43,45,
-        47,49,50,52,53,55,57,58,60,61,63,64,65,67,68,70,
-        71,72,74,75,76,77,79,80,81,82,84,85,86,87,88,90,
-        91,92,93,94,95,96,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,135,136,137,138,
-        139,140,141,142,143,143,144,145,146,147,148,149,150,150,151,152,
-        153,154,155,155,156,157,158,159,160,160,161,162,163,164,165,165,
-        166,167,168,169,169,170,171,172,173,173,174,175,176,176,177,178,
-        179,180,180,181,182,183,183,184,185,186,186,187,188,189,189,190,
-        191,192,192,193,194,195,195,196,197,197,198,199,200,200,201,202,
-        202,203,204,205,205,206,207,207,208,209,210,210,211,212,212,213,
-        214,214,215,216,216,217,218,219,219,220,221,221,222,223,223,224,
-        225,225,226,227,227,228,229,229,230,231,231,232,233,233,234,235,
-        235,236,237,237,238,238,239,240,240,241,242,242,243,244,244,245,
-        246,246,247,247,248,249,249,250,251,251,252,253,253,254,254,255
+        16,  23,  28,  32,  36,  39,  42,  45,  48,  50,  53,  55,  57,  60,
+        62,  64,  66,  68,  69,  71,  73,  75,  76,  78,  80,  81,  83,  84,
+        86,  87,  89,  90,  92,  93,  94,  96,  97,  98,  100, 101, 102, 103,
+        105, 106, 107, 108, 109, 110, 112, 113, 114, 115, 116, 117, 118, 119,
+        120, 121, 122, 123, 124, 125, 126, 128, 128, 129, 130, 131, 132, 133,
+        134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 143, 144, 145, 146,
+        147, 148, 149, 150, 150, 151, 152, 153, 154, 155, 155, 156, 157, 158,
+        159, 159, 160, 161, 162, 163, 163, 164, 165, 166, 166, 167, 168, 169,
+        169, 170, 171, 172, 172, 173, 174, 175, 175, 176, 177, 177, 178, 179,
+        180, 180, 181, 182, 182, 183, 184, 184, 185, 186, 187, 187, 188, 189,
+        189, 190, 191, 191, 192, 193, 193, 194, 195, 195, 196, 196, 197, 198,
+        198, 199, 200, 200, 201, 202, 202, 203, 203, 204, 205, 205, 206, 207,
+        207, 208, 208, 209, 210, 210, 211, 211, 212, 213, 213, 214, 214, 215,
+        216, 216, 217, 217, 218, 219, 219, 220, 220, 221, 221, 222, 223, 223,
+        224, 224, 225, 225, 226, 227, 227, 228, 228, 229, 229, 230, 230, 231,
+        232, 232, 233, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 239,
+        239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246,
+        246, 247, 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253,
+        254, 254, 255, 255,
     },
-
-
-    {
-        16,23,28,32,36,39,42,45,48,50,53,55,57,60,62,64,
-        66,68,69,71,73,75,76,78,80,81,83,84,86,87,89,90,
-        92,93,94,96,97,98,100,101,102,103,105,106,107,108,109,110,
-        112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,128,
-        128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-        143,144,145,146,147,148,149,150,150,151,152,153,154,155,155,156,
-        157,158,159,159,160,161,162,163,163,164,165,166,166,167,168,169,
-        169,170,171,172,172,173,174,175,175,176,177,177,178,179,180,180,
-        181,182,182,183,184,184,185,186,187,187,188,189,189,190,191,191,
-        192,193,193,194,195,195,196,196,197,198,198,199,200,200,201,202,
-        202,203,203,204,205,205,206,207,207,208,208,209,210,210,211,211,
-        212,213,213,214,214,215,216,216,217,217,218,219,219,220,220,221,
-        221,222,223,223,224,224,225,225,226,227,227,228,228,229,229,230,
-        230,231,232,232,233,233,234,234,235,235,236,236,237,237,238,239,
-        239,240,240,241,241,242,242,243,243,244,244,245,245,246,246,247,
-        247,248,248,249,249,250,250,251,251,252,252,253,254,254,255,255
-    }
 };
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* to get a global angle from cartesian coordinates, the coordinates are
+ * flipped until they are in the first octant of the coordinate system, then
+ * the y (<=x) is scaled and divided by x to get a tangent (slope) value
+ * which is looked up in the tantoangle[] table.  The +1 size is to handle
+ * the case when x==y without additional checking.
+ */
+
+int slope_div(unsigned int num, unsigned int den)
+{
+  unsigned answer;
+
+  if (den < 512)
+    {
+      return SLOPERANGE;
+    }
+  else
+    {
+      answer = (num << 3) / (den >> 8);
+
+      if (answer <= SLOPERANGE)
+        {
+          return answer;
+        }
+      else
+        {
+          return SLOPERANGE;
+        }
+    }
+}
diff --git a/games/NXDoom/src/tables.h b/games/NXDoom/src/tables.h
index f72406da4..1a30ee74e 100644
--- a/games/NXDoom/src/tables.h
+++ b/games/NXDoom/src/tables.h
@@ -1,96 +1,125 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Lookup tables.
-//	Do not try to look them up :-).
-//	In the order of appearance: 
-//
-//	int finetangent[4096]	- Tangens LUT.
-//	 Should work with BAM fairly well (12 of 16bit,
-//      effectively, by shifting).
-//
-//	int finesine[10240]		- Sine lookup.
-//	 Guess what, serves as cosine, too.
-//	 Remarkable thing is, how to use BAMs with this? 
-//
-//	int tantoangle[2049]	- ArcTan LUT,
-//	  maps tan(angle) to angle fast. Gotta search.	
-//    
-
+/****************************************************************************
+ * apps/games/NXDoom/src/tables.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Lookup tables.
+ *  Do not try to look them up :-).
+ *  In the order of appearance:
+ *
+ *  int finetangent[4096]  - Tangens LUT.
+ *   Should work with BAM fairly well (12 of 16bit, effectively,
+ *   by shifting).
+ *
+ *  int finesine[10240]  - Sine lookup.
+ *   Guess what, serves as cosine, too.
+ *   Remarkable thing is, how to use BAMs with this?
+ *
+ *  int tantoangle[2049]  - ArcTan LUT,
+ *    maps tan(angle) to angle fast. Gotta search.
+ *
+ *
+ * DESCRIPTION:
+ *  System specific interface stuff.
+ *
+ ****************************************************************************/
 
 #ifndef __TABLES__
 #define __TABLES__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
 #include "m_fixed.h"
-	
-#define FINEANGLES		8192
-#define FINEMASK		(FINEANGLES-1)
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// 0x100000000 to 0x2000
-#define ANGLETOFINESHIFT	19		
+#define FINEANGLES 8192
+#define FINEMASK (FINEANGLES - 1)
 
-// Effective size is 10240.
-extern const fixed_t finesine[5*FINEANGLES/4];
+/* 0x100000000 to 0x2000 */
 
-// Re-use data, is just PI/2 pahse shift.
-extern const fixed_t *finecosine;
+#define ANGLETOFINESHIFT 19
 
+/* Binary Angle Measurement, BAM. */
 
-// Effective size is 4096.
-extern const fixed_t finetangent[FINEANGLES/2];
+#define ANG45 0x20000000
+#define ANG90 0x40000000
+#define ANG180 0x80000000
+#define ANG270 0xc0000000
+#define ANG_MAX 0xffffffff
 
-// Gamma correction tables.
-extern const byte gammatable[5][256];
+#define ANG1 (ANG45 / 45)
+#define ANG60 (ANG180 / 3)
 
-// Binary Angle Measument, BAM.
+/* Heretic code uses this definition as though it represents one
+ * degree, but it is not!  This is actually ~1.40 degrees.
+ */
 
-#define ANG45           0x20000000
-#define ANG90           0x40000000
-#define ANG180          0x80000000
-#define ANG270          0xc0000000
-#define ANG_MAX         0xffffffff
+#define ANG1_X 0x01000000
 
-#define ANG1            (ANG45 / 45)
-#define ANG60           (ANG180 / 3)
+#define SLOPERANGE 2048
+#define SLOPEBITS 11
+#define DBITS (FRACBITS - SLOPEBITS)
 
-// Heretic code uses this definition as though it represents one 
-// degree, but it is not!  This is actually ~1.40 degrees.
-
-#define ANG1_X          0x01000000
-
-#define SLOPERANGE		2048
-#define SLOPEBITS		11
-#define DBITS			(FRACBITS-SLOPEBITS)
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef unsigned int angle_t;
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
-// Effective size is 2049;
-// The +1 size is to handle the case when x==y
-//  without additional checking.
-extern const angle_t tantoangle[SLOPERANGE+1];
+/* Effective size is 10240. */
 
+extern const fixed_t finesine[5 * FINEANGLES / 4];
 
-// Utility function,
-//  called by R_PointToAngle.
-int SlopeDiv(unsigned int num, unsigned int den);
+/* Reuse data, is just PI/2 pahse shift. */
 
+extern const fixed_t *finecosine;
 
-#endif
+/* Effective size is 4096. */
 
+extern const fixed_t finetangent[FINEANGLES / 2];
+
+/* Gamma correction tables. */
+
+extern const byte gammatable[5][256];
+
+/* Effective size is 2049;
+ * The +1 size is to handle the case when x==y without additional checking.
+ */
+
+extern const angle_t tantoangle[SLOPERANGE + 1];
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Utility function, called by r_point_to_angle. */
+
+int slope_div(unsigned int num, unsigned int den);
+
+#endif /* __TABLES__ */
diff --git a/games/NXDoom/src/v_diskicon.c b/games/NXDoom/src/v_diskicon.c
index 1631ba7b9..755d281a9 100644
--- a/games/NXDoom/src/v_diskicon.c
+++ b/games/NXDoom/src/v_diskicon.c
@@ -1,23 +1,32 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Disk load indicator.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/v_diskicon.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Disk load indicator.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-#include "doomtype.h"
 #include "deh_str.h"
+#include "doomtype.h"
 #include "i_swap.h"
 #include "i_video.h"
 #include "m_argv.h"
@@ -29,132 +38,148 @@
 
 #include <string.h>
 
-// Only display the disk icon if more then this much bytes have been read
-// during the previous tic.
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static const int diskicon_threshold = 20*1024;
+/* Only display the disk icon if more then this much bytes have been read
+ * during the previous tic.
+ */
+
+static const int diskicon_threshold = 20 * 1024;
+
+/* Two buffers: disk_data contains the data representing the disk icon
+ * (raw, not a patch_t) while saved_background is an equivalently-sized
+ * buffer where we save the background data while the disk is on screen.
+ */
 
-// Two buffers: disk_data contains the data representing the disk icon
-// (raw, not a patch_t) while saved_background is an equivalently-sized
-// buffer where we save the background data while the disk is on screen.
 static pixel_t *disk_data;
 static pixel_t *saved_background;
 
 static int loading_disk_xoffs = 0;
 static int loading_disk_yoffs = 0;
 
-// Number of bytes read since the last call to V_DrawDiskIcon().
+/* Number of bytes read since the last call to v_draw_disk_icon(). */
+
 static size_t recent_bytes_read = 0;
 static boolean disk_drawn;
 
-static void CopyRegion(pixel_t *dest, int dest_pitch,
-                       pixel_t *src, int src_pitch,
-                       int w, int h)
-{
-    pixel_t *s, *d;
-    int y;
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-    s = src; d = dest;
-    for (y = 0; y < h; ++y)
+static void copy_region(pixel_t *dest, int dest_pitch, pixel_t *src,
+                        int src_pitch, int w, int h)
+{
+  pixel_t *s, *d;
+  int y;
+
+  s = src;
+  d = dest;
+  for (y = 0; y < h; ++y)
     {
-        memcpy(d, s, w * sizeof(*d));
-        s += src_pitch;
-        d += dest_pitch;
+      memcpy(d, s, w * sizeof(*d));
+      s += src_pitch;
+      d += dest_pitch;
     }
 }
 
-static void SaveDiskData(const char *disk_lump, int xoffs, int yoffs)
+static void save_disk_data(const char *disk_lump, int xoffs, int yoffs)
 {
-    pixel_t *tmpscreen;
-    patch_t *disk;
+  pixel_t *tmpscreen;
+  patch_t *disk;
 
-    // Allocate a complete temporary screen where we'll draw the patch.
-    tmpscreen = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*tmpscreen),
-                         PU_STATIC, NULL);
-    memset(tmpscreen, 0, SCREENWIDTH * SCREENHEIGHT * sizeof(*tmpscreen));
-    V_UseBuffer(tmpscreen);
+  /* Allocate a complete temporary screen where we'll draw the patch. */
 
-    // Buffer where we'll save the disk data.
+  tmpscreen = z_malloc(SCREENWIDTH * SCREENHEIGHT * sizeof(*tmpscreen),
+                       PU_STATIC, NULL);
+  memset(tmpscreen, 0, SCREENWIDTH * SCREENHEIGHT * sizeof(*tmpscreen));
+  v_use_buffer(tmpscreen);
 
-    if (disk_data != NULL)
+  /* Buffer where we'll save the disk data. */
+
+  if (disk_data != NULL)
     {
-        Z_Free(disk_data);
-        disk_data = NULL;
+      z_free(disk_data);
+      disk_data = NULL;
     }
 
-    disk_data = Z_Malloc(LOADING_DISK_W * LOADING_DISK_H * sizeof(*disk_data),
-                         PU_STATIC, NULL);
+  disk_data = z_malloc(LOADING_DISK_W * LOADING_DISK_H * sizeof(*disk_data),
+                       PU_STATIC, NULL);
 
-    // Draw the patch and save the result to disk_data.
-    disk = W_CacheLumpName(disk_lump, PU_STATIC);
-    V_DrawPatch(loading_disk_xoffs, loading_disk_yoffs, disk);
-    CopyRegion(disk_data, LOADING_DISK_W,
-               tmpscreen + yoffs * SCREENWIDTH + xoffs, SCREENWIDTH,
-               LOADING_DISK_W, LOADING_DISK_H);
-    W_ReleaseLumpName(disk_lump);
+  /* Draw the patch and save the result to disk_data. */
 
-    V_RestoreBuffer();
-    Z_Free(tmpscreen);
+  disk = w_cache_lump_name(disk_lump, PU_STATIC);
+  v_draw_patch(loading_disk_xoffs, loading_disk_yoffs, disk);
+  copy_region(disk_data, LOADING_DISK_W,
+              tmpscreen + yoffs * SCREENWIDTH + xoffs, SCREENWIDTH,
+              LOADING_DISK_W, LOADING_DISK_H);
+  w_release_lump_name(disk_lump);
+
+  v_restore_buffer();
+  z_free(tmpscreen);
 }
 
-void V_EnableLoadingDisk(const char *lump_name, int xoffs, int yoffs)
+static pixel_t *disk_region_pointer(void)
 {
-    loading_disk_xoffs = xoffs;
-    loading_disk_yoffs = yoffs;
+  return i_video_buffer + loading_disk_yoffs * SCREENWIDTH +
+         loading_disk_xoffs;
+}
 
-    if (saved_background != NULL)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void v_enable_loading_disk(const char *lump_name, int xoffs, int yoffs)
+{
+  loading_disk_xoffs = xoffs;
+  loading_disk_yoffs = yoffs;
+
+  if (saved_background != NULL)
     {
-        Z_Free(saved_background);
-        saved_background = NULL;
+      z_free(saved_background);
+      saved_background = NULL;
     }
 
-    saved_background = Z_Malloc(LOADING_DISK_W * LOADING_DISK_H
-                                 * sizeof(*saved_background),
-                                PU_STATIC, NULL);
-    SaveDiskData(lump_name, xoffs, yoffs);
+  saved_background =
+      z_malloc(LOADING_DISK_W * LOADING_DISK_H * sizeof(*saved_background),
+               PU_STATIC, NULL);
+  save_disk_data(lump_name, xoffs, yoffs);
 }
 
-void V_BeginRead(size_t nbytes)
+void v_begin_read(size_t nbytes)
 {
-    recent_bytes_read += nbytes;
+  recent_bytes_read += nbytes;
 }
 
-static pixel_t *DiskRegionPointer(void)
+void v_draw_disk_icon(void)
 {
-    return I_VideoBuffer
-         + loading_disk_yoffs * SCREENWIDTH
-         + loading_disk_xoffs;
-}
-
-void V_DrawDiskIcon(void)
-{
-    if (disk_data != NULL && recent_bytes_read > diskicon_threshold)
+  if (disk_data != NULL && recent_bytes_read > diskicon_threshold)
     {
-        // Save the background behind the disk before we draw it.
-        CopyRegion(saved_background, LOADING_DISK_W,
-                   DiskRegionPointer(), SCREENWIDTH,
-                   LOADING_DISK_W, LOADING_DISK_H);
+      /* Save the background behind the disk before we draw it. */
 
-        // Write the disk to the screen buffer.
-        CopyRegion(DiskRegionPointer(), SCREENWIDTH,
-                   disk_data, LOADING_DISK_W,
-                   LOADING_DISK_W, LOADING_DISK_H);
-        disk_drawn = true;
+      copy_region(saved_background, LOADING_DISK_W, disk_region_pointer(),
+                  SCREENWIDTH, LOADING_DISK_W, LOADING_DISK_H);
+
+      /* Write the disk to the screen buffer. */
+
+      copy_region(disk_region_pointer(), SCREENWIDTH, disk_data,
+                  LOADING_DISK_W, LOADING_DISK_W, LOADING_DISK_H);
+      disk_drawn = true;
     }
 
-    recent_bytes_read = 0;
+  recent_bytes_read = 0;
 }
 
-void V_RestoreDiskBackground(void)
+void v_restore_disk_background(void)
 {
-    if (disk_drawn)
+  if (disk_drawn)
     {
-        // Restore the background.
-        CopyRegion(DiskRegionPointer(), SCREENWIDTH,
-                   saved_background, LOADING_DISK_W,
-                   LOADING_DISK_W, LOADING_DISK_H);
+      /* Restore the background. */
 
-        disk_drawn = false;
+      copy_region(disk_region_pointer(), SCREENWIDTH, saved_background,
+                  LOADING_DISK_W, LOADING_DISK_W, LOADING_DISK_H);
+
+      disk_drawn = false;
     }
 }
-
diff --git a/games/NXDoom/src/v_diskicon.h b/games/NXDoom/src/v_diskicon.h
index 0dee04d19..4bd9b54aa 100644
--- a/games/NXDoom/src/v_diskicon.h
+++ b/games/NXDoom/src/v_diskicon.h
@@ -1,32 +1,46 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Disk load indicator.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/v_diskicon.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Disk load indicator.
+ *
+ ****************************************************************************/
 
 #ifndef __V_DISKICON__
 #define __V_DISKICON__
 
-// Dimensions of the flashing "loading" disk icon
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Dimensions of the flashing "loading" disk icon */
 
 #define LOADING_DISK_W 16
 #define LOADING_DISK_H 16
 
-extern void V_EnableLoadingDisk(const char *lump_name, int xoffs, int yoffs);
-extern void V_BeginRead(size_t nbytes);
-extern void V_DrawDiskIcon(void);
-extern void V_RestoreDiskBackground(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif
+extern void v_enable_loading_disk(const char *lump_name, int xoffs,
+                                  int yoffs);
+extern void v_begin_read(size_t nbytes);
+extern void v_draw_disk_icon(void);
+extern void v_restore_disk_background(void);
+
+#endif /* __V_DISKICON__ */
diff --git a/games/NXDoom/src/v_patch.h b/games/NXDoom/src/v_patch.h
index 767f9e3a2..5bfac559c 100644
--- a/games/NXDoom/src/v_patch.h
+++ b/games/NXDoom/src/v_patch.h
@@ -1,50 +1,70 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Refresh/rendering module, shared data struct definitions.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/v_patch.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Refresh/rendering module, shared data struct definitions.
+ *
+ ****************************************************************************/
 
 #ifndef V_PATCH_H
 #define V_PATCH_H
 
-// Patches.
-// A patch holds one or more columns.
-// Patches are used for sprites and all masked pictures,
-// and we compose textures from the TEXTURE1/2 lists
-// of patches.
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-typedef PACKED_STRUCT (
+#include <nuttx/compiler.h>
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Patches.
+ * A patch holds one or more columns.
+ * Patches are used for sprites and all masked pictures,
+ * and we compose textures from the TEXTURE1/2 lists
+ * of patches.
+ */
+
+begin_packed_struct struct patch_t
 {
-    short		width;		// bounding box size
-    short		height;
-    short		leftoffset;	// pixels to the left of origin
-    short		topoffset;	// pixels below the origin
-    int			columnofs[8];	// only [width] used
-    // the [0] is &columnofs[width]
-}) patch_t;
+  short width; /* bounding box size */
+  short height;
+  short leftoffset; /* pixels to the left of origin */
+  short topoffset;  /* pixels below the origin */
+  int columnofs[8]; /* only [width] used the [0] is &columnofs[width] */
+} end_packed_struct;
 
-// posts are runs of non masked source pixels
-typedef PACKED_STRUCT (
+typedef struct patch_t patch_t;
+
+/* posts are runs of non masked source pixels */
+
+begin_packed_struct struct post_t
 {
-    byte		topdelta;	// -1 is the last post in a column
-    byte		length; 	// length data bytes follows
-}) post_t;
+  byte topdelta; /* -1 is the last post in a column */
+  byte length;   /* length data bytes follows */
+} end_packed_struct;
 
-// column_t is a list of 0 or more post_t, (byte)-1 terminated
-typedef post_t	column_t;
+typedef struct post_t post_t;
 
-#endif 
+/* column_t is a list of 0 or more post_t, (byte)-1 terminated */
 
+typedef post_t column_t;
+
+#endif /* V_PATCH_H */
diff --git a/games/NXDoom/src/v_video.c b/games/NXDoom/src/v_video.c
index c35f259f4..55f455cce 100644
--- a/games/NXDoom/src/v_video.c
+++ b/games/NXDoom/src/v_video.c
@@ -1,28 +1,37 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 1993-2008 Raven Software
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Gamma correction LUT stuff.
-//	Functions to draw patches (by post) directly to screen.
-//	Functions to blit a block to the screen.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/v_video.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 1993-2008 Raven Software
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Gamma correction LUT stuff.
+ *  Functions to draw patches (by post) directly to screen.
+ *  Functions to blit a block to the screen.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include "i_system.h"
 
@@ -39,985 +48,834 @@
 #include "z_zone.h"
 
 #include "config.h"
-#ifdef HAVE_LIBPNG
-#include <png.h>
-#endif
 
-// TODO: There are separate RANGECHECK defines for different games, but this
-// is common code. Fix this.
-#define RANGECHECK
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Blending table used for fuzzpatch, etc.
-// Only used in Heretic/Hexen
-
-byte *tinttable = NULL;
-
-// villsa [STRIFE] Blending table used for Strife
-byte *xlatab = NULL;
-
-// The screen buffer that the v_video.c code draws to.
-
-static pixel_t *dest_screen = NULL;
-
-int dirtybox[4]; 
-
-// haleyjd 08/28/10: clipping callback function for patches.
-// This is needed for Chocolate Strife, which clips patches to the screen.
-static vpatchclipfunc_t patchclip_callback = NULL;
-
-//
-// V_MarkRect 
-// 
-void V_MarkRect(int x, int y, int width, int height) 
-{ 
-    // If we are temporarily using an alternate screen, do not 
-    // affect the update box.
-
-    if (dest_screen == I_VideoBuffer)
-    {
-        M_AddToBox (dirtybox, x, y); 
-        M_AddToBox (dirtybox, x + width-1, y + height-1); 
-    }
-} 
- 
-
-//
-// V_CopyRect 
-// 
-void V_CopyRect(int srcx, int srcy, pixel_t *source,
-                int width, int height,
-                int destx, int desty)
-{ 
-    pixel_t *src;
-    pixel_t *dest;
- 
-#ifdef RANGECHECK 
-    if (srcx < 0
-     || srcx + width > SCREENWIDTH
-     || srcy < 0
-     || srcy + height > SCREENHEIGHT 
-     || destx < 0
-     || destx + width > SCREENWIDTH
-     || desty < 0
-     || desty + height > SCREENHEIGHT)
-    {
-        I_Error ("Bad V_CopyRect");
-    }
-#endif 
-
-    V_MarkRect(destx, desty, width, height); 
- 
-    src = source + SCREENWIDTH * srcy + srcx; 
-    dest = dest_screen + SCREENWIDTH * desty + destx; 
-
-    for ( ; height>0 ; height--) 
-    { 
-        memcpy(dest, src, width * sizeof(*dest));
-        src += SCREENWIDTH; 
-        dest += SCREENWIDTH; 
-    } 
-} 
- 
-//
-// V_SetPatchClipCallback
-//
-// haleyjd 08/28/10: Added for Strife support.
-// By calling this function, you can setup runtime error checking for patch 
-// clipping. Strife never caused errors by drawing patches partway off-screen.
-// Some versions of vanilla DOOM also behaved differently than the default
-// implementation, so this could possibly be extended to those as well for
-// accurate emulation.
-//
-void V_SetPatchClipCallback(vpatchclipfunc_t func)
-{
-    patchclip_callback = func;
-}
-
-//
-// V_DrawPatch
-// Masks a column based masked pic to the screen. 
-//
-
-void V_DrawPatch(int x, int y, patch_t *patch)
-{ 
-    int count;
-    int col;
-    column_t *column;
-    pixel_t *desttop;
-    pixel_t *dest;
-    byte *source;
-    int w;
-
-    y -= SHORT(patch->topoffset);
-    x -= SHORT(patch->leftoffset);
-
-    // haleyjd 08/28/10: Strife needs silent error checking here.
-    if(patchclip_callback)
-    {
-        if(!patchclip_callback(patch, x, y))
-            return;
-    }
-
-#ifdef RANGECHECK
-    if (x < 0
-     || x + SHORT(patch->width) > SCREENWIDTH
-     || y < 0
-     || y + SHORT(patch->height) > SCREENHEIGHT)
-    {
-        I_Error("Bad V_DrawPatch");
-    }
-#endif
-
-    V_MarkRect(x, y, SHORT(patch->width), SHORT(patch->height));
-
-    col = 0;
-    desttop = dest_screen + y * SCREENWIDTH + x;
-
-    w = SHORT(patch->width);
-
-    for ( ; col<w ; x++, col++, desttop++)
-    {
-        column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
-
-        // step through the posts in a column
-        while (column->topdelta != 0xff)
-        {
-            source = (byte *)column + 3;
-            dest = desttop + column->topdelta*SCREENWIDTH;
-            count = column->length;
-
-            while (count--)
-            {
-                *dest = *source++;
-                dest += SCREENWIDTH;
-            }
-            column = (column_t *)((byte *)column + column->length + 4);
-        }
-    }
-}
-
-//
-// V_DrawPatchFlipped
-// Masks a column based masked pic to the screen.
-// Flips horizontally, e.g. to mirror face.
-//
-
-void V_DrawPatchFlipped(int x, int y, patch_t *patch)
-{
-    int count;
-    int col; 
-    column_t *column; 
-    pixel_t *desttop;
-    pixel_t *dest;
-    byte *source; 
-    int w; 
- 
-    y -= SHORT(patch->topoffset); 
-    x -= SHORT(patch->leftoffset); 
-
-    // haleyjd 08/28/10: Strife needs silent error checking here.
-    if(patchclip_callback)
-    {
-        if(!patchclip_callback(patch, x, y))
-            return;
-    }
-
-#ifdef RANGECHECK 
-    if (x < 0
-     || x + SHORT(patch->width) > SCREENWIDTH
-     || y < 0
-     || y + SHORT(patch->height) > SCREENHEIGHT)
-    {
-        I_Error("Bad V_DrawPatchFlipped");
-    }
-#endif
-
-    V_MarkRect (x, y, SHORT(patch->width), SHORT(patch->height));
-
-    col = 0;
-    desttop = dest_screen + y * SCREENWIDTH + x;
-
-    w = SHORT(patch->width);
-
-    for ( ; col<w ; x++, col++, desttop++)
-    {
-        column = (column_t *)((byte *)patch + LONG(patch->columnofs[w-1-col]));
-
-        // step through the posts in a column
-        while (column->topdelta != 0xff )
-        {
-            source = (byte *)column + 3;
-            dest = desttop + column->topdelta*SCREENWIDTH;
-            count = column->length;
-
-            while (count--)
-            {
-                *dest = *source++;
-                dest += SCREENWIDTH;
-            }
-            column = (column_t *)((byte *)column + column->length + 4);
-        }
-    }
-}
-
-
-
-//
-// V_DrawPatchDirect
-// Draws directly to the screen on the pc. 
-//
-
-void V_DrawPatchDirect(int x, int y, patch_t *patch)
-{
-    V_DrawPatch(x, y, patch); 
-} 
-
-//
-// V_DrawTLPatch
-//
-// Masks a column based translucent masked pic to the screen.
-//
-
-void V_DrawTLPatch(int x, int y, patch_t * patch)
-{
-    int count, col;
-    column_t *column;
-    pixel_t *desttop, *dest;
-    byte *source;
-    int w;
-
-    y -= SHORT(patch->topoffset);
-    x -= SHORT(patch->leftoffset);
-
-    if (x < 0
-     || x + SHORT(patch->width) > SCREENWIDTH 
-     || y < 0
-     || y + SHORT(patch->height) > SCREENHEIGHT)
-    {
-        I_Error("Bad V_DrawTLPatch");
-    }
-
-    col = 0;
-    desttop = dest_screen + y * SCREENWIDTH + x;
-
-    w = SHORT(patch->width);
-    for (; col < w; x++, col++, desttop++)
-    {
-        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
-
-        // step through the posts in a column
-
-        while (column->topdelta != 0xff)
-        {
-            source = (byte *) column + 3;
-            dest = desttop + column->topdelta * SCREENWIDTH;
-            count = column->length;
-
-            while (count--)
-            {
-                *dest = tinttable[*dest + ((*source++) << 8)];
-                dest += SCREENWIDTH;
-            }
-            column = (column_t *) ((byte *) column + column->length + 4);
-        }
-    }
-}
-
-//
-// V_DrawXlaPatch
-//
-// villsa [STRIFE] Masks a column based translucent masked pic to the screen.
-//
-
-void V_DrawXlaPatch(int x, int y, patch_t * patch)
-{
-    int count, col;
-    column_t *column;
-    pixel_t *desttop, *dest;
-    byte *source;
-    int w;
-
-    y -= SHORT(patch->topoffset);
-    x -= SHORT(patch->leftoffset);
-
-    if(patchclip_callback)
-    {
-        if(!patchclip_callback(patch, x, y))
-            return;
-    }
-
-    col = 0;
-    desttop = dest_screen + y * SCREENWIDTH + x;
-
-    w = SHORT(patch->width);
-    for(; col < w; x++, col++, desttop++)
-    {
-        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
-
-        // step through the posts in a column
-
-        while(column->topdelta != 0xff)
-        {
-            source = (byte *) column + 3;
-            dest = desttop + column->topdelta * SCREENWIDTH;
-            count = column->length;
-
-            while(count--)
-            {
-                *dest = xlatab[*dest + ((*source) << 8)];
-                source++;
-                dest += SCREENWIDTH;
-            }
-            column = (column_t *) ((byte *) column + column->length + 4);
-        }
-    }
-}
-
-//
-// V_DrawAltTLPatch
-//
-// Masks a column based translucent masked pic to the screen.
-//
-
-void V_DrawAltTLPatch(int x, int y, patch_t * patch)
-{
-    int count, col;
-    column_t *column;
-    pixel_t *desttop, *dest;
-    byte *source;
-    int w;
-
-    y -= SHORT(patch->topoffset);
-    x -= SHORT(patch->leftoffset);
-
-    if (x < 0
-     || x + SHORT(patch->width) > SCREENWIDTH
-     || y < 0
-     || y + SHORT(patch->height) > SCREENHEIGHT)
-    {
-        I_Error("Bad V_DrawAltTLPatch");
-    }
-
-    col = 0;
-    desttop = dest_screen + y * SCREENWIDTH + x;
-
-    w = SHORT(patch->width);
-    for (; col < w; x++, col++, desttop++)
-    {
-        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
-
-        // step through the posts in a column
-
-        while (column->topdelta != 0xff)
-        {
-            source = (byte *) column + 3;
-            dest = desttop + column->topdelta * SCREENWIDTH;
-            count = column->length;
-
-            while (count--)
-            {
-                *dest = tinttable[((*dest) << 8) + *source++];
-                dest += SCREENWIDTH;
-            }
-            column = (column_t *) ((byte *) column + column->length + 4);
-        }
-    }
-}
-
-//
-// V_DrawShadowedPatch
-//
-// Masks a column based masked pic to the screen.
-//
-
-void V_DrawShadowedPatch(int x, int y, patch_t *patch)
-{
-    int count, col;
-    column_t *column;
-    pixel_t *desttop, *dest;
-    byte *source;
-    pixel_t *desttop2, *dest2;
-    int w;
-
-    y -= SHORT(patch->topoffset);
-    x -= SHORT(patch->leftoffset);
-
-    if (x < 0
-     || x + SHORT(patch->width) > SCREENWIDTH
-     || y < 0
-     || y + SHORT(patch->height) > SCREENHEIGHT)
-    {
-        I_Error("Bad V_DrawShadowedPatch");
-    }
-
-    col = 0;
-    desttop = dest_screen + y * SCREENWIDTH + x;
-    desttop2 = dest_screen + (y + 2) * SCREENWIDTH + x + 2;
-
-    w = SHORT(patch->width);
-    for (; col < w; x++, col++, desttop++, desttop2++)
-    {
-        column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col]));
-
-        // step through the posts in a column
-
-        while (column->topdelta != 0xff)
-        {
-            source = (byte *) column + 3;
-            dest = desttop + column->topdelta * SCREENWIDTH;
-            dest2 = desttop2 + column->topdelta * SCREENWIDTH;
-            count = column->length;
-
-            while (count--)
-            {
-                *dest2 = tinttable[((*dest2) << 8)];
-                dest2 += SCREENWIDTH;
-                *dest = *source++;
-                dest += SCREENWIDTH;
-
-            }
-            column = (column_t *) ((byte *) column + column->length + 4);
-        }
-    }
-}
-
-//
-// Load tint table from TINTTAB lump.
-//
-
-void V_LoadTintTable(void)
-{
-    tinttable = W_CacheLumpName("TINTTAB", PU_STATIC);
-}
-
-//
-// V_LoadXlaTable
-//
-// villsa [STRIFE] Load xla table from XLATAB lump.
-//
-
-void V_LoadXlaTable(void)
-{
-    xlatab = W_CacheLumpName("XLATAB", PU_STATIC);
-}
-
-//
-// V_DrawBlock
-// Draw a linear block of pixels into the view buffer.
-//
-
-void V_DrawBlock(int x, int y, int width, int height, pixel_t *src)
-{ 
-    pixel_t *dest;
- 
-#ifdef RANGECHECK 
-    if (x < 0
-     || x + width >SCREENWIDTH
-     || y < 0
-     || y + height > SCREENHEIGHT)
-    {
-	I_Error ("Bad V_DrawBlock");
-    }
-#endif 
- 
-    V_MarkRect (x, y, width, height); 
- 
-    dest = dest_screen + y * SCREENWIDTH + x; 
-
-    while (height--) 
-    { 
-	memcpy (dest, src, width * sizeof(*dest));
-	src += width; 
-	dest += SCREENWIDTH; 
-    } 
-} 
-
-void V_DrawFilledBox(int x, int y, int w, int h, int c)
-{
-    pixel_t *buf, *buf1;
-    int x1, y1;
-
-    buf = I_VideoBuffer + SCREENWIDTH * y + x;
-
-    for (y1 = 0; y1 < h; ++y1)
-    {
-        buf1 = buf;
-
-        for (x1 = 0; x1 < w; ++x1)
-        {
-            *buf1++ = c;
-        }
-
-        buf += SCREENWIDTH;
-    }
-}
-
-void V_DrawHorizLine(int x, int y, int w, int c)
-{
-    pixel_t *buf;
-    int x1;
-
-    buf = I_VideoBuffer + SCREENWIDTH * y + x;
-
-    for (x1 = 0; x1 < w; ++x1)
-    {
-        *buf++ = c;
-    }
-}
-
-void V_DrawVertLine(int x, int y, int h, int c)
-{
-    pixel_t *buf;
-    int y1;
-
-    buf = I_VideoBuffer + SCREENWIDTH * y + x;
-
-    for (y1 = 0; y1 < h; ++y1)
-    {
-        *buf = c;
-        buf += SCREENWIDTH;
-    }
-}
-
-void V_DrawBox(int x, int y, int w, int h, int c)
-{
-    V_DrawHorizLine(x, y, w, c);
-    V_DrawHorizLine(x, y+h-1, w, c);
-    V_DrawVertLine(x, y, h, c);
-    V_DrawVertLine(x+w-1, y, h, c);
-}
-
-//
-// Draw a "raw" screen (lump containing raw data to blit directly
-// to the screen)
-//
- 
-void V_DrawRawScreen(pixel_t *raw)
-{
-    memcpy(dest_screen, raw, SCREENWIDTH * SCREENHEIGHT * sizeof(*dest_screen));
-}
-
-//
-// V_Init
-// 
-void V_Init (void) 
-{ 
-    // no-op!
-    // There used to be separate screens that could be drawn to; these are
-    // now handled in the upper layers.
-}
-
-// Set the buffer that the code draws to.
-
-void V_UseBuffer(pixel_t *buffer)
-{
-    dest_screen = buffer;
-}
-
-// Restore screen buffer to the i_video screen buffer.
-
-void V_RestoreBuffer(void)
-{
-    dest_screen = I_VideoBuffer;
-}
-
-//
-// SCREEN SHOTS
-//
-
-typedef PACKED_STRUCT (
-{
-    char		manufacturer;
-    char		version;
-    char		encoding;
-    char		bits_per_pixel;
-
-    unsigned short	xmin;
-    unsigned short	ymin;
-    unsigned short	xmax;
-    unsigned short	ymax;
-    
-    unsigned short	hres;
-    unsigned short	vres;
-
-    unsigned char	palette[48];
-    
-    char		reserved;
-    char		color_planes;
-    unsigned short	bytes_per_line;
-    unsigned short	palette_type;
-    
-    char		filler[58];
-    unsigned char	data;		// unbounded
-}) pcx_t;
-
-
-//
-// WritePCXfile
-//
-
-void WritePCXfile(char *filename, pixel_t *data,
-                  int width, int height,
-                  byte *palette)
-{
-    int		i;
-    int		length;
-    pcx_t*	pcx;
-    byte*	pack;
-	
-    pcx = Z_Malloc (width*height*2+1000, PU_STATIC, NULL);
-
-    pcx->manufacturer = 0x0a;		// PCX id
-    pcx->version = 5;			// 256 color
-    pcx->encoding = 1;			// uncompressed
-    pcx->bits_per_pixel = 8;		// 256 color
-    pcx->xmin = 0;
-    pcx->ymin = 0;
-    pcx->xmax = SHORT(width-1);
-    pcx->ymax = SHORT(height-1);
-    pcx->hres = SHORT(1);
-    pcx->vres = SHORT(1);
-    memset (pcx->palette,0,sizeof(pcx->palette));
-    pcx->reserved = 0;                  // PCX spec: reserved byte must be zero
-    pcx->color_planes = 1;		// chunky image
-    pcx->bytes_per_line = SHORT(width);
-    pcx->palette_type = SHORT(2);	// not a grey scale
-    memset (pcx->filler,0,sizeof(pcx->filler));
-
-    // pack the image
-    pack = &pcx->data;
-	
-    for (i=0 ; i<width*height ; i++)
-    {
-	if ( (*data & 0xc0) != 0xc0)
-	    *pack++ = *data++;
-	else
-	{
-	    *pack++ = 0xc1;
-	    *pack++ = *data++;
-	}
-    }
-    
-    // write the palette
-    *pack++ = 0x0c;	// palette ID byte
-    for (i=0 ; i<768 ; i++)
-	*pack++ = *palette++;
-    
-    // write output file
-    length = pack - (byte *)pcx;
-    M_WriteFile (filename, pcx, length);
-
-    Z_Free (pcx);
-}
-
-#ifdef HAVE_LIBPNG
-//
-// WritePNGfile
-//
-
-static void error_fn(png_structp p, png_const_charp s)
-{
-    printf("libpng error: %s\n", s);
-}
-
-static void warning_fn(png_structp p, png_const_charp s)
-{
-    printf("libpng warning: %s\n", s);
-}
-
-void WritePNGfile(char *filename, pixel_t *data,
-                  int width, int height,
-                  byte *palette)
-{
-    png_structp ppng;
-    png_infop pinfo;
-    png_colorp pcolor;
-    FILE *handle;
-    int i, j;
-    int w_factor, h_factor;
-    byte *rowbuf;
-
-    if (aspect_ratio_correct == 1)
-    {
-        // scale up to accommodate aspect ratio correction
-        w_factor = 5;
-        h_factor = 6;
-
-        width *= w_factor;
-        height *= h_factor;
-    }
-    else
-    {
-        w_factor = 1;
-        h_factor = 1;
-    }
-
-    handle = M_fopen(filename, "wb");
-    if (!handle)
-    {
-        return;
-    }
-
-    ppng = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
-                                   error_fn, warning_fn);
-    if (!ppng)
-    {
-        fclose(handle);
-        return;
-    }
-
-    pinfo = png_create_info_struct(ppng);
-    if (!pinfo)
-    {
-        fclose(handle);
-        png_destroy_write_struct(&ppng, NULL);
-        return;
-    }
-
-    png_init_io(ppng, handle);
-
-    png_set_IHDR(ppng, pinfo, width, height,
-                 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
-                 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-
-    pcolor = malloc(sizeof(*pcolor) * 256);
-    if (!pcolor)
-    {
-        fclose(handle);
-        png_destroy_write_struct(&ppng, &pinfo);
-        return;
-    }
-
-    for (i = 0; i < 256; i++)
-    {
-        pcolor[i].red   = *(palette + 3 * i);
-        pcolor[i].green = *(palette + 3 * i + 1);
-        pcolor[i].blue  = *(palette + 3 * i + 2);
-    }
-
-    png_set_PLTE(ppng, pinfo, pcolor, 256);
-    free(pcolor);
-
-    png_write_info(ppng, pinfo);
-
-    rowbuf = malloc(width);
-
-    if (rowbuf)
-    {
-        for (i = 0; i < SCREENHEIGHT; i++)
-        {
-            // expand the row 5x
-            for (j = 0; j < SCREENWIDTH; j++)
-            {
-                memset(rowbuf + j * w_factor, *(data + i*SCREENWIDTH + j), w_factor);
-            }
-
-            // write the row 6 times
-            for (j = 0; j < h_factor; j++)
-            {
-                png_write_row(ppng, rowbuf);
-            }
-        }
-
-        free(rowbuf);
-    }
-
-    png_write_end(ppng, pinfo);
-    png_destroy_write_struct(&ppng, &pinfo);
-    fclose(handle);
-}
-#endif
-
-//
-// V_ScreenShot
-//
-
-void V_ScreenShot(const char *format)
-{
-    int i;
-    char lbmname[16]; // haleyjd 20110213: BUG FIX - 12 is too small!
-    const char *ext;
-    
-    // find a file name to save it to
-
-#ifdef HAVE_LIBPNG
-    if (png_screenshots)
-    {
-        ext = "png";
-    }
-    else
-#endif
-    {
-        ext = "pcx";
-    }
-
-    for (i=0; i<=99; i++)
-    {
-        M_snprintf(lbmname, sizeof(lbmname), format, i, ext);
-
-        if (!M_FileExists(lbmname))
-        {
-            break;      // file doesn't exist
-        }
-    }
-
-    if (i == 100)
-    {
-#ifdef HAVE_LIBPNG
-        if (png_screenshots)
-        {
-            I_Error ("V_ScreenShot: Couldn't create a PNG");
-        }
-        else
-#endif
-        {
-            I_Error ("V_ScreenShot: Couldn't create a PCX");
-        }
-    }
-
-#ifdef HAVE_LIBPNG
-    if (png_screenshots)
-    {
-    WritePNGfile(lbmname, I_VideoBuffer,
-                 SCREENWIDTH, SCREENHEIGHT,
-                 W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE));
-    }
-    else
-#endif
-    {
-    // save the pcx file
-    WritePCXfile(lbmname, I_VideoBuffer,
-                 SCREENWIDTH, SCREENHEIGHT,
-                 W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE));
-    }
-}
-
-#define MOUSE_SPEED_BOX_WIDTH  120
+#define MOUSE_SPEED_BOX_WIDTH 120
 #define MOUSE_SPEED_BOX_HEIGHT 9
 #define MOUSE_SPEED_BOX_X (SCREENWIDTH - MOUSE_SPEED_BOX_WIDTH - 10)
 #define MOUSE_SPEED_BOX_Y 15
 
-//
-// V_DrawMouseSpeedBox
-//
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
-static void DrawAcceleratingBox(int speed)
+/* SCREEN SHOTS */
+
+begin_packed_struct struct pcx_t
 {
-    int red, white, yellow;
-    int original_speed;
-    int redline_x;
-    int linelen;
+  char manufacturer;
+  char version;
+  char encoding;
+  char bits_per_pixel;
 
-    red = I_GetPaletteIndex(0xff, 0x00, 0x00);
-    white = I_GetPaletteIndex(0xff, 0xff, 0xff);
-    yellow = I_GetPaletteIndex(0xff, 0xff, 0x00);
+  unsigned short xmin;
+  unsigned short ymin;
+  unsigned short xmax;
+  unsigned short ymax;
 
-    // Calculate the position of the red threshold line when calibrating
-    // acceleration.  This is 1/3 of the way along the box.
+  unsigned short hres;
+  unsigned short vres;
 
-    redline_x = MOUSE_SPEED_BOX_WIDTH / 3;
+  unsigned char palette[48];
 
-    if (speed >= mouse_threshold)
+  char reserved;
+  char color_planes;
+  unsigned short bytes_per_line;
+  unsigned short palette_type;
+
+  char filler[58];
+  unsigned char data; /* unbounded */
+} end_packed_struct;
+
+typedef struct pcx_t pcx_t;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* The screen buffer that the v_video.c code draws to. */
+
+static pixel_t *dest_screen = NULL;
+
+/* haleyjd 08/28/10: clipping callback function for patches.
+ * This is needed for Chocolate Strife, which clips patches to the screen.
+ */
+
+static vpatchclipfunc_t patchclip_callback = NULL;
+
+/* Highest seen mouse turn speed. We scale the range of the thermometer
+ * according to this value, so that it never exceeds the range. Initially
+ * this is set to a 1:1 setting where 1 pixel = 1 unit of speed.
+ */
+
+static int max_seen_speed = MOUSE_SPEED_BOX_WIDTH - 1;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Blending table used for fuzzpatch, etc. Only used in Heretic/Hexen */
+
+byte *tinttable = NULL;
+
+/* villsa [STRIFE] Blending table used for Strife */
+
+byte *xlatab = NULL;
+
+int dirtybox[4];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void draw_accelerating_box(int speed)
+{
+  int red;
+  int white;
+  int yellow;
+  int original_speed;
+  int redline_x;
+  int linelen;
+
+  red = i_get_palette_index(0xff, 0x00, 0x00);
+  white = i_get_palette_index(0xff, 0xff, 0xff);
+  yellow = i_get_palette_index(0xff, 0xff, 0x00);
+
+  /* Calculate the position of the red threshold line when calibrating
+   * acceleration.  This is 1/3 of the way along the box.
+   */
+
+  redline_x = MOUSE_SPEED_BOX_WIDTH / 3;
+
+  if (speed >= mouse_threshold)
     {
-        // Undo acceleration and get back the original mouse speed
-        original_speed = speed - mouse_threshold;
-        original_speed = (int) (original_speed / mouse_acceleration);
-        original_speed += mouse_threshold;
+      /* Undo acceleration and get back the original mouse speed */
 
-        linelen = (original_speed * redline_x) / mouse_threshold;
+      original_speed = speed - mouse_threshold;
+      original_speed = (int)(original_speed / mouse_acceleration);
+      original_speed += mouse_threshold;
+
+      linelen = (original_speed * redline_x) / mouse_threshold;
     }
-    else
+  else
     {
-        linelen = (speed * redline_x) / mouse_threshold;
+      linelen = (speed * redline_x) / mouse_threshold;
     }
 
-    // Horizontal "thermometer"
-    if (linelen > MOUSE_SPEED_BOX_WIDTH - 1)
+  /* Horizontal "thermometer" */
+
+  if (linelen > MOUSE_SPEED_BOX_WIDTH - 1)
     {
-        linelen = MOUSE_SPEED_BOX_WIDTH - 1;
+      linelen = MOUSE_SPEED_BOX_WIDTH - 1;
     }
 
-    if (linelen < redline_x)
+  if (linelen < redline_x)
     {
-        V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1,
+      v_draw_horiz_line(MOUSE_SPEED_BOX_X + 1,
                         MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
                         linelen, white);
     }
-    else
+  else
     {
-        V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1,
+      v_draw_horiz_line(MOUSE_SPEED_BOX_X + 1,
                         MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
                         redline_x, white);
-        V_DrawHorizLine(MOUSE_SPEED_BOX_X + redline_x,
+      v_draw_horiz_line(MOUSE_SPEED_BOX_X + redline_x,
                         MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
                         linelen - redline_x, yellow);
     }
 
-    // Draw acceleration threshold line
-    V_DrawVertLine(MOUSE_SPEED_BOX_X + redline_x, MOUSE_SPEED_BOX_Y + 1,
+  /* Draw acceleration threshold line */
+
+  v_draw_vert_line(MOUSE_SPEED_BOX_X + redline_x, MOUSE_SPEED_BOX_Y + 1,
                    MOUSE_SPEED_BOX_HEIGHT - 2, red);
 }
 
-// Highest seen mouse turn speed. We scale the range of the thermometer
-// according to this value, so that it never exceeds the range. Initially
-// this is set to a 1:1 setting where 1 pixel = 1 unit of speed.
-static int max_seen_speed = MOUSE_SPEED_BOX_WIDTH - 1;
-
-static void DrawNonAcceleratingBox(int speed)
+static void draw_non_accelerating_box(int speed)
 {
-    int white;
-    int linelen;
+  int white;
+  int linelen;
 
-    white = I_GetPaletteIndex(0xff, 0xff, 0xff);
+  white = i_get_palette_index(0xff, 0xff, 0xff);
 
-    if (speed > max_seen_speed)
+  if (speed > max_seen_speed)
     {
-        max_seen_speed = speed;
+      max_seen_speed = speed;
     }
 
-    // Draw horizontal "thermometer":
-    linelen = speed * (MOUSE_SPEED_BOX_WIDTH - 1) / max_seen_speed;
+  /* Draw horizontal "thermometer": */
 
-    V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1,
-                    MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2,
-                    linelen, white);
+  linelen = speed * (MOUSE_SPEED_BOX_WIDTH - 1) / max_seen_speed;
+
+  v_draw_horiz_line(MOUSE_SPEED_BOX_X + 1,
+                    MOUSE_SPEED_BOX_Y + MOUSE_SPEED_BOX_HEIGHT / 2, linelen,
+                    white);
 }
 
-void V_DrawMouseSpeedBox(int speed)
+static void write_pcx_file(char *filename, pixel_t *data, int width,
+                           int height, byte *palette)
 {
-    int bgcolor, bordercolor, black;
+  int i;
+  int length;
+  pcx_t *pcx;
+  byte *pack;
 
-    // If the mouse is turned off, don't draw the box at all.
-    if (!usemouse)
+  pcx = z_malloc(width * height * 2 + 1000, PU_STATIC, NULL);
+
+  pcx->manufacturer = 0x0a; /* PCX id */
+  pcx->version = 5;         /* 256 color */
+  pcx->encoding = 1;        /* uncompressed */
+  pcx->bits_per_pixel = 8;  /* 256 color */
+  pcx->xmin = 0;
+  pcx->ymin = 0;
+  pcx->xmax = SHORT(width - 1);
+  pcx->ymax = SHORT(height - 1);
+  pcx->hres = SHORT(1);
+  pcx->vres = SHORT(1);
+  memset(pcx->palette, 0, sizeof(pcx->palette));
+  pcx->reserved = 0;     /* PCX spec: reserved byte must be zero */
+  pcx->color_planes = 1; /* chunky image */
+  pcx->bytes_per_line = SHORT(width);
+  pcx->palette_type = SHORT(2); /* not a grey scale */
+  memset(pcx->filler, 0, sizeof(pcx->filler));
+
+  /* pack the image */
+
+  pack = &pcx->data;
+
+  for (i = 0; i < width * height; i++)
     {
-        return;
+      if ((*data & 0xc0) != 0xc0)
+        *pack++ = *data++;
+      else
+        {
+          *pack++ = 0xc1;
+          *pack++ = *data++;
+        }
     }
 
-    // Get palette indices for colors for widget. These depend on the
-    // palette of the game being played.
+  /* write the palette */
 
-    bgcolor = I_GetPaletteIndex(0x77, 0x77, 0x77);
-    bordercolor = I_GetPaletteIndex(0x55, 0x55, 0x55);
-    black = I_GetPaletteIndex(0x00, 0x00, 0x00);
+  *pack++ = 0x0c; /* palette ID byte */
+  for (i = 0; i < 768; i++)
+    *pack++ = *palette++;
 
-    // Calculate box position
+  /* write output file */
 
-    V_DrawFilledBox(MOUSE_SPEED_BOX_X, MOUSE_SPEED_BOX_Y,
+  length = pack - (byte *)pcx;
+  m_write_file(filename, pcx, length);
+
+  z_free(pcx);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void v_mark_rect(int x, int y, int width, int height)
+{
+  /* If we are temporarily using an alternate screen, do not affect the
+   * update box.
+   */
+
+  if (dest_screen == i_video_buffer)
+    {
+      m_add_to_box(dirtybox, x, y);
+      m_add_to_box(dirtybox, x + width - 1, y + height - 1);
+    }
+}
+
+void v_copy_rect(int srcx, int srcy, pixel_t *source, int width, int height,
+                 int destx, int desty)
+{
+  pixel_t *src;
+  pixel_t *dest;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (srcx < 0 || srcx + width > SCREENWIDTH || srcy < 0 ||
+      srcy + height > SCREENHEIGHT || destx < 0 ||
+      destx + width > SCREENWIDTH || desty < 0 ||
+      desty + height > SCREENHEIGHT)
+    {
+      i_error("Bad v_copy_rect");
+    }
+#endif
+
+  v_mark_rect(destx, desty, width, height);
+
+  src = source + SCREENWIDTH * srcy + srcx;
+  dest = dest_screen + SCREENWIDTH * desty + destx;
+
+  for (; height > 0; height--)
+    {
+      memcpy(dest, src, width * sizeof(*dest));
+      src += SCREENWIDTH;
+      dest += SCREENWIDTH;
+    }
+}
+
+/* v_set_patch_clip_callback
+ *
+ * haleyjd 08/28/10: Added for Strife support.
+ * By calling this function, you can setup runtime error checking for patch
+ * clipping. Strife never caused errors by drawing patches partway
+ * off-screen.
+ *
+ * Some versions of vanilla DOOM also behaved differently than the default
+ * implementation, so this could possibly be extended to those as well for
+ * accurate emulation.
+ */
+
+void v_set_patch_clip_callback(vpatchclipfunc_t func)
+{
+  patchclip_callback = func;
+}
+
+/* V_DrawPatch
+ * Masks a column based masked pic to the screen.
+ */
+
+void v_draw_patch(int x, int y, patch_t *patch)
+{
+  int count;
+  int col;
+  column_t *column;
+  pixel_t *desttop;
+  pixel_t *dest;
+  byte *source;
+  int w;
+
+  y -= SHORT(patch->topoffset);
+  x -= SHORT(patch->leftoffset);
+
+  /* haleyjd 08/28/10: Strife needs silent error checking here. */
+
+  if (patchclip_callback)
+    {
+      if (!patchclip_callback(patch, x, y)) return;
+    }
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (x < 0 || x + SHORT(patch->width) > SCREENWIDTH || y < 0 ||
+      y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+      i_error("Bad V_DrawPatch");
+    }
+#endif
+
+  v_mark_rect(x, y, SHORT(patch->width), SHORT(patch->height));
+
+  col = 0;
+  desttop = dest_screen + y * SCREENWIDTH + x;
+
+  w = SHORT(patch->width);
+
+  for (; col < w; x++, col++, desttop++)
+    {
+      column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+
+      /* step through the posts in a column */
+
+      while (column->topdelta != 0xff)
+        {
+          source = (byte *)column + 3;
+          dest = desttop + column->topdelta * SCREENWIDTH;
+          count = column->length;
+
+          while (count--)
+            {
+              *dest = *source++;
+              dest += SCREENWIDTH;
+            }
+
+          column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+/* v_draw_patch_flipped
+ * Masks a column based masked pic to the screen.
+ * Flips horizontally, e.g. to mirror face.
+ */
+
+void v_draw_patch_flipped(int x, int y, patch_t *patch)
+{
+  int count;
+  int col;
+  column_t *column;
+  pixel_t *desttop;
+  pixel_t *dest;
+  byte *source;
+  int w;
+
+  y -= SHORT(patch->topoffset);
+  x -= SHORT(patch->leftoffset);
+
+  /* haleyjd 08/28/10: Strife needs silent error checking here. */
+
+  if (patchclip_callback)
+    {
+      if (!patchclip_callback(patch, x, y)) return;
+    }
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (x < 0 || x + SHORT(patch->width) > SCREENWIDTH || y < 0 ||
+      y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+      i_error("Bad v_draw_patch_flipped");
+    }
+#endif
+
+  v_mark_rect(x, y, SHORT(patch->width), SHORT(patch->height));
+
+  col = 0;
+  desttop = dest_screen + y * SCREENWIDTH + x;
+
+  w = SHORT(patch->width);
+
+  for (; col < w; x++, col++, desttop++)
+    {
+      column =
+          (column_t *)((byte *)patch + LONG(patch->columnofs[w - 1 - col]));
+
+      /* step through the posts in a column */
+
+      while (column->topdelta != 0xff)
+        {
+          source = (byte *)column + 3;
+          dest = desttop + column->topdelta * SCREENWIDTH;
+          count = column->length;
+
+          while (count--)
+            {
+              *dest = *source++;
+              dest += SCREENWIDTH;
+            }
+
+          column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+/* v_draw_patch_direct
+ * Draws directly to the screen on the pc.
+ */
+
+void v_draw_patch_direct(int x, int y, patch_t *patch)
+{
+  v_draw_patch(x, y, patch);
+}
+
+/* v_draw_tl_patch
+ * Masks a column based translucent masked pic to the screen.
+ */
+
+void v_draw_tl_patch(int x, int y, patch_t *patch)
+{
+  int count;
+  int col;
+  column_t *column;
+  pixel_t *desttop;
+  pixel_t *dest;
+  byte *source;
+  int w;
+
+  y -= SHORT(patch->topoffset);
+  x -= SHORT(patch->leftoffset);
+
+  if (x < 0 || x + SHORT(patch->width) > SCREENWIDTH || y < 0 ||
+      y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+      i_error("Bad v_draw_tl_patch");
+    }
+
+  col = 0;
+  desttop = dest_screen + y * SCREENWIDTH + x;
+
+  w = SHORT(patch->width);
+  for (; col < w; x++, col++, desttop++)
+    {
+      column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+
+      /* step through the posts in a column */
+
+      while (column->topdelta != 0xff)
+        {
+          source = (byte *)column + 3;
+          dest = desttop + column->topdelta * SCREENWIDTH;
+          count = column->length;
+
+          while (count--)
+            {
+              *dest = tinttable[*dest + ((*source++) << 8)];
+              dest += SCREENWIDTH;
+            }
+
+          column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+/* v_draw_xla_patch
+ * villsa [STRIFE] Masks a column based translucent masked pic to the screen.
+ */
+
+void v_draw_xla_patch(int x, int y, patch_t *patch)
+{
+  int count;
+  int col;
+  column_t *column;
+  pixel_t *desttop, *dest;
+  byte *source;
+  int w;
+
+  y -= SHORT(patch->topoffset);
+  x -= SHORT(patch->leftoffset);
+
+  if (patchclip_callback)
+    {
+      if (!patchclip_callback(patch, x, y)) return;
+    }
+
+  col = 0;
+  desttop = dest_screen + y * SCREENWIDTH + x;
+
+  w = SHORT(patch->width);
+  for (; col < w; x++, col++, desttop++)
+    {
+      column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+
+      /* step through the posts in a column */
+
+      while (column->topdelta != 0xff)
+        {
+          source = (byte *)column + 3;
+          dest = desttop + column->topdelta * SCREENWIDTH;
+          count = column->length;
+
+          while (count--)
+            {
+              *dest = xlatab[*dest + ((*source) << 8)];
+              source++;
+              dest += SCREENWIDTH;
+            }
+
+          column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+/* v_draw_alt_tl_patch
+ * Masks a column based translucent masked pic to the screen.
+ */
+
+void v_draw_alt_tl_patch(int x, int y, patch_t *patch)
+{
+  int count;
+  int col;
+  column_t *column;
+  pixel_t *desttop;
+  pixel_t *dest;
+  byte *source;
+  int w;
+
+  y -= SHORT(patch->topoffset);
+  x -= SHORT(patch->leftoffset);
+
+  if (x < 0 || x + SHORT(patch->width) > SCREENWIDTH || y < 0 ||
+      y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+      i_error("Bad v_draw_alt_tl_patch");
+    }
+
+  col = 0;
+  desttop = dest_screen + y * SCREENWIDTH + x;
+
+  w = SHORT(patch->width);
+  for (; col < w; x++, col++, desttop++)
+    {
+      column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+
+      /* step through the posts in a column */
+
+      while (column->topdelta != 0xff)
+        {
+          source = (byte *)column + 3;
+          dest = desttop + column->topdelta * SCREENWIDTH;
+          count = column->length;
+
+          while (count--)
+            {
+              *dest = tinttable[((*dest) << 8) + *source++];
+              dest += SCREENWIDTH;
+            }
+
+          column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+/* v_draw_shadowed_patch
+ * Masks a column based masked pic to the screen.
+ */
+
+void v_draw_shadowed_patch(int x, int y, patch_t *patch)
+{
+  int count;
+  int col;
+  column_t *column;
+  pixel_t *desttop;
+  pixel_t *dest;
+  byte *source;
+  pixel_t *desttop2;
+  pixel_t *dest2;
+  int w;
+
+  y -= SHORT(patch->topoffset);
+  x -= SHORT(patch->leftoffset);
+
+  if (x < 0 || x + SHORT(patch->width) > SCREENWIDTH || y < 0 ||
+      y + SHORT(patch->height) > SCREENHEIGHT)
+    {
+      i_error("Bad v_draw_shadowed_patch");
+    }
+
+  col = 0;
+  desttop = dest_screen + y * SCREENWIDTH + x;
+  desttop2 = dest_screen + (y + 2) * SCREENWIDTH + x + 2;
+
+  w = SHORT(patch->width);
+  for (; col < w; x++, col++, desttop++, desttop2++)
+    {
+      column = (column_t *)((byte *)patch + LONG(patch->columnofs[col]));
+
+      /* step through the posts in a column */
+
+      while (column->topdelta != 0xff)
+        {
+          source = (byte *)column + 3;
+          dest = desttop + column->topdelta * SCREENWIDTH;
+          dest2 = desttop2 + column->topdelta * SCREENWIDTH;
+          count = column->length;
+
+          while (count--)
+            {
+              *dest2 = tinttable[((*dest2) << 8)];
+              dest2 += SCREENWIDTH;
+              *dest = *source++;
+              dest += SCREENWIDTH;
+            }
+
+          column = (column_t *)((byte *)column + column->length + 4);
+        }
+    }
+}
+
+/* Load tint table from TINTTAB lump. */
+
+void v_load_tint_table(void)
+{
+  tinttable = w_cache_lump_name("TINTTAB", PU_STATIC);
+}
+
+/* v_load_xla_table
+ * villsa [STRIFE] Load xla table from XLATAB lump.
+ */
+
+void v_load_xla_table(void)
+{
+  xlatab = w_cache_lump_name("XLATAB", PU_STATIC);
+}
+
+/* v_draw_block
+ * Draw a linear block of pixels into the view buffer.
+ */
+
+void v_draw_block(int x, int y, int width, int height, pixel_t *src)
+{
+  pixel_t *dest;
+
+#ifdef CONFIG_GAMES_NXDOOM_RANGECHECK
+  if (x < 0 || x + width > SCREENWIDTH || y < 0 || y + height > SCREENHEIGHT)
+    {
+      i_error("Bad v_draw_block");
+    }
+#endif
+
+  v_mark_rect(x, y, width, height);
+
+  dest = dest_screen + y * SCREENWIDTH + x;
+
+  while (height--)
+    {
+      memcpy(dest, src, width * sizeof(*dest));
+      src += width;
+      dest += SCREENWIDTH;
+    }
+}
+
+void v_draw_filled_box(int x, int y, int w, int h, int c)
+{
+  pixel_t *buf, *buf1;
+  int x1;
+  int y1;
+
+  buf = i_video_buffer + SCREENWIDTH * y + x;
+
+  for (y1 = 0; y1 < h; ++y1)
+    {
+      buf1 = buf;
+
+      for (x1 = 0; x1 < w; ++x1)
+        {
+          *buf1++ = c;
+        }
+
+      buf += SCREENWIDTH;
+    }
+}
+
+void v_draw_horiz_line(int x, int y, int w, int c)
+{
+  pixel_t *buf;
+  int x1;
+
+  buf = i_video_buffer + SCREENWIDTH * y + x;
+
+  for (x1 = 0; x1 < w; ++x1)
+    {
+      *buf++ = c;
+    }
+}
+
+void v_draw_vert_line(int x, int y, int h, int c)
+{
+  pixel_t *buf;
+  int y1;
+
+  buf = i_video_buffer + SCREENWIDTH * y + x;
+
+  for (y1 = 0; y1 < h; ++y1)
+    {
+      *buf = c;
+      buf += SCREENWIDTH;
+    }
+}
+
+void v_draw_box(int x, int y, int w, int h, int c)
+{
+  v_draw_horiz_line(x, y, w, c);
+  v_draw_horiz_line(x, y + h - 1, w, c);
+  v_draw_vert_line(x, y, h, c);
+  v_draw_vert_line(x + w - 1, y, h, c);
+}
+
+/* Draw a "raw" screen (lump containing raw data to blit directly
+ * to the screen)
+ */
+
+void v_draw_raw_screen(pixel_t *raw)
+{
+  memcpy(dest_screen, raw,
+         SCREENWIDTH * SCREENHEIGHT * sizeof(*dest_screen));
+}
+
+void v_init(void)
+{
+  /* no-op!
+   * There used to be separate screens that could be drawn to; these are
+   * now handled in the upper layers.
+   */
+}
+
+/* Set the buffer that the code draws to. */
+
+void v_use_buffer(pixel_t *buffer)
+{
+  dest_screen = buffer;
+}
+
+/* Restore screen buffer to the i_video screen buffer. */
+
+void v_restore_buffer(void)
+{
+  dest_screen = i_video_buffer;
+}
+
+void v_screenshot(const char *format)
+{
+  int i;
+  char lbmname[16]; /* haleyjd 20110213: BUG FIX - 12 is too small! */
+  const char *ext;
+
+  /* find a file name to save it to */
+
+  ext = "pcx";
+
+  for (i = 0; i <= 99; i++)
+    {
+      snprintf(lbmname, sizeof(lbmname), format, i, ext);
+
+      if (!m_file_exists(lbmname))
+        {
+          break; /* file doesn't exist */
+        }
+    }
+
+  if (i == 100)
+    {
+      i_error("v_screenshot: Couldn't create a PCX");
+    }
+
+  /* save the pcx file */
+
+  write_pcx_file(lbmname, i_video_buffer, SCREENWIDTH, SCREENHEIGHT,
+                 w_cache_lump_name(("PLAYPAL"), PU_CACHE));
+}
+
+void v_draw_mouse_speed_box(int speed)
+{
+  int bgcolor;
+  int bordercolor;
+  int black;
+
+  /* If the mouse is turned off, don't draw the box at all. */
+
+  if (!usemouse)
+    {
+      return;
+    }
+
+  /* Get palette indices for colors for widget. These depend on the
+   * palette of the game being played.
+   */
+
+  bgcolor = i_get_palette_index(0x77, 0x77, 0x77);
+  bordercolor = i_get_palette_index(0x55, 0x55, 0x55);
+  black = i_get_palette_index(0x00, 0x00, 0x00);
+
+  /* Calculate box position */
+
+  v_draw_filled_box(MOUSE_SPEED_BOX_X, MOUSE_SPEED_BOX_Y,
                     MOUSE_SPEED_BOX_WIDTH, MOUSE_SPEED_BOX_HEIGHT, bgcolor);
-    V_DrawBox(MOUSE_SPEED_BOX_X, MOUSE_SPEED_BOX_Y,
-              MOUSE_SPEED_BOX_WIDTH, MOUSE_SPEED_BOX_HEIGHT, bordercolor);
-    V_DrawHorizLine(MOUSE_SPEED_BOX_X + 1, MOUSE_SPEED_BOX_Y + 4,
+  v_draw_box(MOUSE_SPEED_BOX_X, MOUSE_SPEED_BOX_Y, MOUSE_SPEED_BOX_WIDTH,
+             MOUSE_SPEED_BOX_HEIGHT, bordercolor);
+  v_draw_horiz_line(MOUSE_SPEED_BOX_X + 1, MOUSE_SPEED_BOX_Y + 4,
                     MOUSE_SPEED_BOX_WIDTH - 2, black);
 
-    // If acceleration is used, draw a box that helps to calibrate the
-    // threshold point.
-    if (mouse_threshold > 0 && fabs(mouse_acceleration - 1) > 0.01)
+  /* If acceleration is used, draw a box that helps to calibrate the
+   * threshold point.
+   */
+
+  if (mouse_threshold > 0 && fabs(mouse_acceleration - 1) > 0.01)
     {
-        DrawAcceleratingBox(speed);
+      draw_accelerating_box(speed);
     }
-    else
+  else
     {
-        DrawNonAcceleratingBox(speed);
+      draw_non_accelerating_box(speed);
     }
 }
-
diff --git a/games/NXDoom/src/v_video.h b/games/NXDoom/src/v_video.h
index f9c18f9a7..07ac56730 100644
--- a/games/NXDoom/src/v_video.h
+++ b/games/NXDoom/src/v_video.h
@@ -1,108 +1,181 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Gamma correction LUT.
-//	Functions to draw patches (by post) directly to screen.
-//	Functions to blit a block to the screen.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/v_video.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Gamma correction LUT.
+ *  Functions to draw patches (by post) directly to screen.
+ *  Functions to blit a block to the screen.
+ *
+ ****************************************************************************/
 
 #ifndef __V_VIDEO__
 #define __V_VIDEO__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-// Needed because we are refering to patches.
+/* Needed because we are referring to patches. */
+
 #include "v_patch.h"
 
-//
-// VIDEO
-//
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#define CENTERY			(SCREENHEIGHT/2)
+#define CENTERY (SCREENHEIGHT / 2)
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern int dirtybox[4];
 
 extern byte *tinttable;
 
-// haleyjd 08/28/10: implemented for Strife support
-// haleyjd 08/28/10: Patch clipping callback, implemented to support Choco
-// Strife.
+/* haleyjd 08/28/10: implemented for Strife support
+ * haleyjd 08/28/10: Patch clipping callback, implemented to support Choco
+ * Strife.
+ */
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef boolean (*vpatchclipfunc_t)(patch_t *, int, int);
-void V_SetPatchClipCallback(vpatchclipfunc_t func);
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Allocates buffer screens, call before R_Init.
-void V_Init (void);
+void v_set_patch_clip_callback(vpatchclipfunc_t func);
 
-// Draw a block from the specified source screen to the screen.
+/****************************************************************************
+ * Name: v_init
+ *
+ * Description:
+ *  Allocates buffer screens, call before r_init.
+ *
+ ****************************************************************************/
 
-void V_CopyRect(int srcx, int srcy, pixel_t *source,
-                int width, int height,
-                int destx, int desty);
+void v_init(void);
 
-void V_DrawPatch(int x, int y, patch_t *patch);
-void V_DrawPatchFlipped(int x, int y, patch_t *patch);
-void V_DrawTLPatch(int x, int y, patch_t *patch);
-void V_DrawAltTLPatch(int x, int y, patch_t * patch);
-void V_DrawShadowedPatch(int x, int y, patch_t *patch);
-void V_DrawXlaPatch(int x, int y, patch_t * patch);     // villsa [STRIFE]
-void V_DrawPatchDirect(int x, int y, patch_t *patch);
+/****************************************************************************
+ * Name: v_copy_rect
+ *
+ * Description:
+ *  Draw a block from the specified source screen to the screen.
+ *
+ ****************************************************************************/
 
-// Draw a linear block of pixels into the view buffer.
+void v_copy_rect(int srcx, int srcy, pixel_t *source, int width, int height,
+                 int destx, int desty);
 
-void V_DrawBlock(int x, int y, int width, int height, pixel_t *src);
+void v_draw_patch(int x, int y, patch_t *patch);
+void v_draw_patch_flipped(int x, int y, patch_t *patch);
+void v_draw_tl_patch(int x, int y, patch_t *patch);
+void v_draw_alt_tl_patch(int x, int y, patch_t *patch);
+void v_draw_shadowed_patch(int x, int y, patch_t *patch);
+void v_draw_xla_patch(int x, int y, patch_t *patch); /* villsa [STRIFE] */
+void v_draw_patch_direct(int x, int y, patch_t *patch);
 
-void V_MarkRect(int x, int y, int width, int height);
+/****************************************************************************
+ * Name: v_draw_block
+ *
+ * Description:
+ *  Draw a linear block of pixels into the view buffer.
+ *
+ ****************************************************************************/
 
-void V_DrawFilledBox(int x, int y, int w, int h, int c);
-void V_DrawHorizLine(int x, int y, int w, int c);
-void V_DrawVertLine(int x, int y, int h, int c);
-void V_DrawBox(int x, int y, int w, int h, int c);
+void v_draw_block(int x, int y, int width, int height, pixel_t *src);
 
-// Draw a raw screen lump
+void v_mark_rect(int x, int y, int width, int height);
 
-void V_DrawRawScreen(pixel_t *raw);
+void v_draw_filled_box(int x, int y, int w, int h, int c);
+void v_draw_horiz_line(int x, int y, int w, int c);
+void v_draw_vert_line(int x, int y, int h, int c);
+void v_draw_box(int x, int y, int w, int h, int c);
 
-// Temporarily switch to using a different buffer to draw graphics, etc.
+/****************************************************************************
+ * Name: v_draw_raw_screen
+ *
+ * Description:
+ *  Draw a raw screen lump
+ *
+ ****************************************************************************/
 
-void V_UseBuffer(pixel_t *buffer);
+void v_draw_raw_screen(pixel_t *raw);
 
-// Return to using the normal screen buffer to draw graphics.
+/****************************************************************************
+ * Name: v_use_buffer
+ *
+ * Description:
+ *  Temporarily switch to using a different buffer to draw graphics, etc.
+ *
+ ****************************************************************************/
 
-void V_RestoreBuffer(void);
+void v_use_buffer(pixel_t *buffer);
 
-// Save a screenshot of the current screen to a file, named in the 
-// format described in the string passed to the function, eg.
-// "DOOM%02i.pcx"
+/****************************************************************************
+ * Name: v_restore_buffer
+ *
+ * Description:
+ *  Return to using the normal screen buffer to draw graphics.
+ *
+ ****************************************************************************/
 
-void V_ScreenShot(const char *format);
+void v_restore_buffer(void);
 
-// Load the lookup table for translucency calculations from the TINTTAB
-// lump.
+/****************************************************************************
+ * Name: v_screenshot
+ *
+ * Description:
+ *  Save a screenshot of the current screen to a file, named in the format
+ *  described in the string passed to the function, eg. "DOOM%02i.pcx"
+ *
+ ****************************************************************************/
 
-void V_LoadTintTable(void);
+void v_screenshot(const char *format);
 
-// villsa [STRIFE]
-// Load the lookup table for translucency calculations from the XLATAB
-// lump.
+/****************************************************************************
+ * Name: v_load_tint_table
+ *
+ * Description:
+ *  Load the lookup table for translucency calculations from the TINTTAB
+ *  lump.
+ *
+ ****************************************************************************/
 
-void V_LoadXlaTable(void);
+void v_load_tint_table(void);
 
-void V_DrawMouseSpeedBox(int speed);
+/****************************************************************************
+ * Name: v_load_xla_table
+ *
+ * Description:
+ *  villsa [STRIFE]
+ *  Load the lookup table for translucency calculations from the XLATAB lump.
+ *
+ ****************************************************************************/
+
+void v_load_xla_table(void);
+
+void v_draw_mouse_speed_box(int speed);
 
 #endif
-
diff --git a/games/NXDoom/src/w_checksum.c b/games/NXDoom/src/w_checksum.c
index 09d8d2a6c..28dbf8d16 100644
--- a/games/NXDoom/src/w_checksum.c
+++ b/games/NXDoom/src/w_checksum.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//       Generate a checksum of the WAD directory.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_checksum.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Generate a checksum of the WAD directory.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,63 +35,79 @@
 #include "w_checksum.h"
 #include "w_wad.h"
 
-static wad_file_t **open_wadfiles = NULL;
-static int num_open_wadfiles = 0;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static int GetFileNumber(wad_file_t *handle)
+static wad_file_t **g_open_wadfiles = NULL;
+static int g_num_open_wadfiles = 0;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int get_file_number(wad_file_t *handle)
 {
-    int i;
-    int result;
+  int i;
+  int result;
 
-    for (i = 0; i < num_open_wadfiles; ++i)
+  for (i = 0; i < g_num_open_wadfiles; ++i)
     {
-        if (open_wadfiles[i] == handle)
+      if (g_open_wadfiles[i] == handle)
         {
-            return i;
+          return i;
         }
     }
 
-    // Not found in list.  This is a new file we haven't seen yet.
-    // Allocate another slot for this file.
+  /* Not found in list.  This is a new file we haven't seen yet.
+   * Allocate another slot for this file.
+   */
 
-    open_wadfiles = I_Realloc(open_wadfiles,
-                            sizeof(wad_file_t *) * (num_open_wadfiles + 1));
-    open_wadfiles[num_open_wadfiles] = handle;
+  g_open_wadfiles = i_realloc(g_open_wadfiles,
+          sizeof(wad_file_t *) * (g_num_open_wadfiles + 1));
+  g_open_wadfiles[g_num_open_wadfiles] = handle;
 
-    result = num_open_wadfiles;
-    ++num_open_wadfiles;
+  result = g_num_open_wadfiles;
+  ++g_num_open_wadfiles;
 
-    return result;
+  return result;
 }
 
-static void ChecksumAddLump(sha1_context_t *sha1_context, lumpinfo_t *lump)
+static void checksum_add_lump(SHA1_CTX *sha1_context, lumpinfo_t *lump)
 {
-    char buf[9];
+  char buf[9];
+  int fileno;
 
-    M_StringCopy(buf, lump->name, sizeof(buf));
-    SHA1_UpdateString(sha1_context, buf);
-    SHA1_UpdateInt32(sha1_context, GetFileNumber(lump->wad_file));
-    SHA1_UpdateInt32(sha1_context, lump->position);
-    SHA1_UpdateInt32(sha1_context, lump->size);
+  fileno = get_file_number(lump->wad_file);
+
+  m_str_copy(buf, lump->name, sizeof(buf));
+  sha1_updatestring(sha1_context, buf);
+  sha1_updateint32(sha1_context, fileno);
+  sha1_updateint32(sha1_context, lump->position);
+  sha1_updateint32(sha1_context, lump->size);
 }
 
-void W_Checksum(sha1_digest_t digest)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void w_checksum(sha1_digest_t digest)
 {
-    sha1_context_t sha1_context;
-    unsigned int i;
+  SHA1_CTX sha1_context;
+  unsigned int i;
 
-    SHA1_Init(&sha1_context);
+  sha1init(&sha1_context);
 
-    num_open_wadfiles = 0;
+  g_num_open_wadfiles = 0;
 
-    // Go through each entry in the WAD directory, adding information
-    // about each entry to the SHA1 hash.
+  /* Go through each entry in the WAD directory, adding information
+   * about each entry to the SHA1 hash.
+   */
 
-    for (i = 0; i < numlumps; ++i)
+  for (i = 0; i < numlumps; ++i)
     {
-        ChecksumAddLump(&sha1_context, lumpinfo[i]);
+      checksum_add_lump(&sha1_context, lumpinfo[i]);
     }
 
-    SHA1_Final(digest, &sha1_context);
+  sha1final(digest, &sha1_context);
 }
-
diff --git a/games/NXDoom/src/w_checksum.h b/games/NXDoom/src/w_checksum.h
index e1ce5b89e..316239b70 100644
--- a/games/NXDoom/src/w_checksum.h
+++ b/games/NXDoom/src/w_checksum.h
@@ -1,27 +1,39 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//       Generate a checksum of the WAD directory.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_checksum.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *   Generate a checksum of the WAD directory.
+ *
+ ****************************************************************************/
 
 #ifndef W_CHECKSUM_H
 #define W_CHECKSUM_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
 
-extern void W_Checksum(sha1_digest_t digest);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef W_CHECKSUM_H */
+extern void w_checksum(sha1_digest_t digest);
 
+#endif /* W_CHECKSUM_H */
diff --git a/games/NXDoom/src/w_file.c b/games/NXDoom/src/w_file.c
index 87fc2c95a..38b4d9574 100644
--- a/games/NXDoom/src/w_file.c
+++ b/games/NXDoom/src/w_file.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	WAD I/O functions.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_file.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  WAD I/O functions.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
@@ -25,60 +34,59 @@
 
 #include "w_file.h"
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static wad_file_class_t *wad_file_classes[] = 
+static wad_file_class_t *wad_file_classes[] =
 {
-#ifdef _WIN32
-    &win32_wad_file,
-#endif
-#ifdef HAVE_MMAP
-    &posix_wad_file,
-#endif
-    &stdc_wad_file,
+  &stdc_wad_file,
 };
 
-wad_file_t *W_OpenFile(const char *path)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+wad_file_t *w_open_file(const char *path)
 {
-    wad_file_t *result;
-    int i;
+  wad_file_t *result;
+  int i;
 
-    //!
-    // @category obscure
-    //
-    // Use the OS's virtual memory subsystem to map WAD files
-    // directly into memory.
-    //
+  /* @category obscure
+   *
+   * Use the OS's virtual memory subsystem to map WAD files
+   * directly into memory.
+   */
 
-    if (!M_CheckParm("-mmap"))
+  if (!m_check_parm("-mmap"))
     {
-        return stdc_wad_file.OpenFile(path);
+      return stdc_wad_file.open_file(path);
     }
 
-    // Try all classes in order until we find one that works
+  /* Try all classes in order until we find one that works */
 
-    result = NULL;
+  result = NULL;
 
-    for (i=0; i<arrlen(wad_file_classes); ++i)
+  for (i = 0; i < arrlen(wad_file_classes); ++i)
     {
-        result = wad_file_classes[i]->OpenFile(path);
+      result = wad_file_classes[i]->open_file(path);
 
-        if (result != NULL)
+      if (result != NULL)
         {
-            break;
+          break;
         }
     }
 
-    return result;
+  return result;
 }
 
-void W_CloseFile(wad_file_t *wad)
+void w_close_file(wad_file_t *wad)
 {
-    wad->file_class->CloseFile(wad);
+  wad->file_class->close_file(wad);
 }
 
-size_t W_Read(wad_file_t *wad, unsigned int offset,
-              void *buffer, size_t buffer_len)
+size_t w_read(wad_file_t *wad, unsigned int offset, void *buffer,
+              size_t buffer_len)
 {
-    return wad->file_class->Read(wad, offset, buffer, buffer_len);
+  return wad->file_class->read(wad, offset, buffer, buffer_len);
 }
-
diff --git a/games/NXDoom/src/w_file.h b/games/NXDoom/src/w_file.h
index be8065cc3..32ac34222 100644
--- a/games/NXDoom/src/w_file.h
+++ b/games/NXDoom/src/w_file.h
@@ -1,86 +1,111 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	WAD I/O functions.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/w_file.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  WAD I/O functions.
+ *
+ ****************************************************************************/
 
 #ifndef __W_FILE__
 #define __W_FILE__
 
-#include <stdio.h>
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "doomtype.h"
+#include <stdio.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 typedef struct _wad_file_s wad_file_t;
 
 typedef struct
 {
-    // Open a file for reading.
-    wad_file_t *(*OpenFile)(const char *path);
+  /* Open a file for reading. */
 
-    // Close the specified file.
-    void (*CloseFile)(wad_file_t *file);
+  wad_file_t *(*open_file)(const char *path);
 
-    // Read data from the specified position in the file into the 
-    // provided buffer.  Returns the number of bytes read.
-    size_t (*Read)(wad_file_t *file, unsigned int offset,
-                   void *buffer, size_t buffer_len);
+  /* Close the specified file. */
+
+  void (*close_file)(wad_file_t *file);
+
+  /* Read data from the specified position in the file into the provided
+   * buffer. Returns the number of bytes read.
+   */
+
+  size_t (*read)(wad_file_t *file, unsigned int offset, void *buffer,
+                 size_t buffer_len);
 } wad_file_class_t;
 
+struct _wad_file_s
+{
+  /* Class of this file. */
+
+  wad_file_class_t *file_class;
+
+  /* If this is NULL, the file cannot be mapped into memory.  If this is
+   * non-NULL, it is a pointer to the mapped file.
+   */
+
+  byte *mapped;
+
+  /* Length of the file, in bytes. */
+
+  unsigned int length;
+
+  /* File's location on disk. */
+
+  const char *path;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern wad_file_class_t stdc_wad_file;
 
-#ifdef _WIN32
-extern wad_file_class_t win32_wad_file;
-#endif
-
 #ifdef HAVE_MMAP
 extern wad_file_class_t posix_wad_file;
 #endif
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-struct _wad_file_s
-{
-    // Class of this file.
-    wad_file_class_t *file_class;
+/* Open the specified file. Returns a pointer to a new wad_file_t
+ * handle for the WAD file, or NULL if it could not be opened.
+ */
 
-    // If this is NULL, the file cannot be mapped into memory.  If this
-    // is non-NULL, it is a pointer to the mapped file.
-    byte *mapped;
+wad_file_t *w_open_file(const char *path);
 
-    // Length of the file, in bytes.
-    unsigned int length;
+/* Close the specified WAD file. */
 
-    // File's location on disk.
-    const char *path;
-};
+void w_close_file(wad_file_t *wad);
 
-// Open the specified file. Returns a pointer to a new wad_file_t 
-// handle for the WAD file, or NULL if it could not be opened.
+/* Read data from the specified file into the provided buffer. The
+ * data is read from the specified offset from the start of the file.
+ * Returns the number of bytes read.
+ */
 
-wad_file_t *W_OpenFile(const char *path);
+size_t w_read(wad_file_t *wad, unsigned int offset, void *buffer,
+              size_t buffer_len);
 
-// Close the specified WAD file.
-
-void W_CloseFile(wad_file_t *wad);
-
-// Read data from the specified file into the provided buffer.  The
-// data is read from the specified offset from the start of the file.
-// Returns the number of bytes read.
-
-size_t W_Read(wad_file_t *wad, unsigned int offset,
-              void *buffer, size_t buffer_len);
-
-#endif /* #ifndef __W_FILE__ */
+#endif /* __W_FILE__ */
diff --git a/games/NXDoom/src/w_file_posix.c b/games/NXDoom/src/w_file_posix.c
deleted file mode 100644
index d4fdc22f9..000000000
--- a/games/NXDoom/src/w_file_posix.c
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	WAD I/O functions.
-//
-
-#include "config.h"
-
-#ifdef HAVE_MMAP
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <string.h>
-
-#include "m_misc.h"
-#include "w_file.h"
-#include "z_zone.h"
-
-typedef struct
-{
-    wad_file_t wad;
-    int handle;
-} posix_wad_file_t;
-
-
-static void MapFile(posix_wad_file_t *wad, const char *filename)
-{
-    void *result;
-    int protection;
-    int flags;
-
-    // Mapped area can be read and written to.  Ideally
-    // this should be read-only, as none of the Doom code should 
-    // change the WAD files after being read.  However, there may
-    // be code lurking in the source that does.
-
-    protection = PROT_READ|PROT_WRITE;
-
-    // Writes to the mapped area result in private changes that are
-    // *not* written to disk.
-
-    flags = MAP_PRIVATE;
-
-    result = mmap(NULL, wad->wad.length,
-                  protection, flags, 
-                  wad->handle, 0);
-
-    if (result == NULL || result == (void *)-1)
-    {
-        fprintf(stderr, "W_POSIX_OpenFile: Unable to mmap() %s - %s\n",
-                        filename, strerror(errno));
-    }
-    else
-    {
-        wad->wad.mapped = result;
-    }
-}
-
-unsigned int GetFileLength(int handle)
-{
-    return lseek(handle, 0, SEEK_END);
-}
-   
-static wad_file_t *W_POSIX_OpenFile(const char *path)
-{
-    posix_wad_file_t *result;
-    int handle;
-
-    handle = open(path, 0);
-
-    if (handle < 0)
-    {
-        return NULL;
-    }
-
-    // Create a new posix_wad_file_t to hold the file handle.
-
-    result = Z_Malloc(sizeof(posix_wad_file_t), PU_STATIC, 0);
-    result->wad.file_class = &posix_wad_file;
-    result->wad.length = GetFileLength(handle);
-    result->wad.path = M_StringDuplicate(path);
-    result->wad.mapped = NULL;
-    result->handle = handle;
-
-    // Try to map the file into memory with mmap:
-
-    MapFile(result, path);
-
-    return &result->wad;
-}
-
-static void W_POSIX_CloseFile(wad_file_t *wad)
-{
-    posix_wad_file_t *posix_wad;
-
-    posix_wad = (posix_wad_file_t *) wad;
-
-    // If mapped, unmap it.
-
-    // Close the file
-
-    if (posix_wad->wad.mapped)
-    {
-        munmap(posix_wad->wad.mapped, posix_wad->wad.length);
-    }
-    close(posix_wad->handle);
-    Z_Free(posix_wad);
-}
-
-// Read data from the specified position in the file into the 
-// provided buffer.  Returns the number of bytes read.
-
-size_t W_POSIX_Read(wad_file_t *wad, unsigned int offset,
-                   void *buffer, size_t buffer_len)
-{
-    posix_wad_file_t *posix_wad;
-    byte *byte_buffer;
-    size_t bytes_read;
-    int result;
-
-    posix_wad = (posix_wad_file_t *) wad;
-
-    // Jump to the specified position in the file.
-
-    lseek(posix_wad->handle, offset, SEEK_SET);
-
-    // Read into the buffer.
-
-    bytes_read = 0;
-    byte_buffer = buffer;
-
-    while (buffer_len > 0) {
-        result = read(posix_wad->handle, byte_buffer, buffer_len);
-
-        if (result < 0) {
-            perror("W_POSIX_Read");
-            break;
-        } else if (result == 0) {
-            break;
-        }
-
-        // Successfully read some bytes
-
-        byte_buffer += result;
-        buffer_len -= result;
-        bytes_read += result;
-    }
-
-    return bytes_read;
-}
-
-
-wad_file_class_t posix_wad_file = 
-{
-    W_POSIX_OpenFile,
-    W_POSIX_CloseFile,
-    W_POSIX_Read,
-};
-
-
-#endif /* #ifdef HAVE_MMAP */
-
diff --git a/games/NXDoom/src/w_file_stdc.c b/games/NXDoom/src/w_file_stdc.c
index 90846a4e1..361bf2060 100644
--- a/games/NXDoom/src/w_file_stdc.c
+++ b/games/NXDoom/src/w_file_stdc.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	WAD I/O functions.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_file_stdc.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  WAD I/O functions.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 
@@ -22,75 +31,93 @@
 #include "w_file.h"
 #include "z_zone.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct
 {
-    wad_file_t wad;
-    FILE *fstream;
+  wad_file_t wad;
+  FILE *fstream;
 } stdc_wad_file_t;
 
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-static wad_file_t *W_StdC_OpenFile(const char *path)
+static wad_file_t *w_stdc_openfile(const char *path);
+static void w_stdc_closefile(wad_file_t *wad);
+static size_t w_stdc_read(wad_file_t *wad, unsigned int offset, void *buffer,
+                          size_t buffer_len);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+wad_file_class_t stdc_wad_file =
 {
-    stdc_wad_file_t *result;
-    FILE *fstream;
-
-    fstream = M_fopen(path, "rb");
-
-    if (fstream == NULL)
-    {
-        return NULL;
-    }
-
-    // Create a new stdc_wad_file_t to hold the file handle.
-
-    result = Z_Malloc(sizeof(stdc_wad_file_t), PU_STATIC, 0);
-    result->wad.file_class = &stdc_wad_file;
-    result->wad.mapped = NULL;
-    result->wad.length = M_FileLength(fstream);
-    result->wad.path = M_StringDuplicate(path);
-    result->fstream = fstream;
-
-    return &result->wad;
-}
-
-static void W_StdC_CloseFile(wad_file_t *wad)
-{
-    stdc_wad_file_t *stdc_wad;
-
-    stdc_wad = (stdc_wad_file_t *) wad;
-
-    fclose(stdc_wad->fstream);
-    Z_Free(stdc_wad);
-}
-
-// Read data from the specified position in the file into the 
-// provided buffer.  Returns the number of bytes read.
-
-size_t W_StdC_Read(wad_file_t *wad, unsigned int offset,
-                   void *buffer, size_t buffer_len)
-{
-    stdc_wad_file_t *stdc_wad;
-    size_t result;
-
-    stdc_wad = (stdc_wad_file_t *) wad;
-
-    // Jump to the specified position in the file.
-
-    fseek(stdc_wad->fstream, offset, SEEK_SET);
-
-    // Read into the buffer.
-
-    result = fread(buffer, 1, buffer_len, stdc_wad->fstream);
-
-    return result;
-}
-
-
-wad_file_class_t stdc_wad_file = 
-{
-    W_StdC_OpenFile,
-    W_StdC_CloseFile,
-    W_StdC_Read,
+  w_stdc_openfile,
+  w_stdc_closefile,
+  w_stdc_read,
 };
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
+static wad_file_t *w_stdc_openfile(const char *path)
+{
+  stdc_wad_file_t *result;
+  FILE *fstream;
+
+  fstream = fopen(path, "rb");
+
+  if (fstream == NULL)
+    {
+      return NULL;
+    }
+
+  /* Create a new stdc_wad_file_t to hold the file handle. */
+
+  result = z_malloc(sizeof(stdc_wad_file_t), PU_STATIC, 0);
+  result->wad.file_class = &stdc_wad_file;
+  result->wad.mapped = NULL;
+  result->wad.length = m_file_length(fstream);
+  result->wad.path = m_string_duplicate(path);
+  result->fstream = fstream;
+
+  return &result->wad;
+}
+
+static void w_stdc_closefile(wad_file_t *wad)
+{
+  stdc_wad_file_t *stdc_wad;
+
+  stdc_wad = (stdc_wad_file_t *)wad;
+
+  fclose(stdc_wad->fstream);
+  z_free(stdc_wad);
+}
+
+/* Read data from the specified position in the file into the
+ * provided buffer.  Returns the number of bytes read.
+ */
+
+static size_t w_stdc_read(wad_file_t *wad, unsigned int offset, void *buffer,
+                          size_t buffer_len)
+{
+  stdc_wad_file_t *stdc_wad;
+  size_t result;
+
+  stdc_wad = (stdc_wad_file_t *)wad;
+
+  /* Jump to the specified position in the file. */
+
+  fseek(stdc_wad->fstream, offset, SEEK_SET);
+
+  /* Read into the buffer. */
+
+  result = fread(buffer, 1, buffer_len, stdc_wad->fstream);
+
+  return result;
+}
diff --git a/games/NXDoom/src/w_file_win32.c b/games/NXDoom/src/w_file_win32.c
deleted file mode 100644
index dba576be3..000000000
--- a/games/NXDoom/src/w_file_win32.c
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	WAD I/O functions.
-//
-
-#include "config.h"
-
-#ifdef _WIN32
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "i_system.h"
-#include "m_misc.h"
-#include "w_file.h"
-#include "z_zone.h"
-
-// This constant doesn't exist in VC6:
-
-#ifndef INVALID_SET_FILE_POINTER
-#define INVALID_SET_FILE_POINTER 0xffffffff
-#endif
-
-typedef struct
-{
-    wad_file_t wad;
-    HANDLE handle;
-    HANDLE handle_map;
-} win32_wad_file_t;
-
-
-static void MapFile(win32_wad_file_t *wad, const char *filename)
-{
-    wad->handle_map = CreateFileMapping(wad->handle,
-                                        NULL,
-                                        PAGE_WRITECOPY,
-                                        0,
-                                        0,
-                                        NULL);
-
-    if (wad->handle_map == NULL)
-    {
-        fprintf(stderr, "W_Win32_OpenFile: Unable to CreateFileMapping() "
-                        "for %s\n", filename);
-        return;
-    }
-
-    wad->wad.mapped = MapViewOfFile(wad->handle_map,
-                                    FILE_MAP_COPY,
-                                    0, 0, 0);
-
-    if (wad->wad.mapped == NULL)
-    {
-        fprintf(stderr, "W_Win32_OpenFile: Unable to MapViewOfFile() for %s\n",
-                        filename);
-    }
-}
-
-unsigned int GetFileLength(HANDLE handle)
-{
-    DWORD result;
-
-    result = SetFilePointer(handle, 0, NULL, FILE_END);
-
-    if (result == INVALID_SET_FILE_POINTER)
-    {
-        I_Error("W_Win32_OpenFile: Failed to read file length");
-    }
-
-    return result;
-}
-   
-static wad_file_t *W_Win32_OpenFile(const char *path)
-{
-    win32_wad_file_t *result;
-    wchar_t *wpath = NULL;
-    HANDLE handle;
-
-    // Open the file:
-
-    wpath = M_ConvertUtf8ToWide(path);
-
-    if (wpath == NULL)
-    {
-       return NULL;
-    }
-
-    handle = CreateFileW(wpath,
-                         GENERIC_READ,
-                         FILE_SHARE_READ,
-                         NULL,
-                         OPEN_EXISTING,
-                         FILE_ATTRIBUTE_NORMAL,
-                         NULL);
-
-    free(wpath);
-
-    if (handle == INVALID_HANDLE_VALUE)
-    {
-        return NULL;
-    }
-
-    // Create a new win32_wad_file_t to hold the file handle.
-
-    result = Z_Malloc(sizeof(win32_wad_file_t), PU_STATIC, 0);
-    result->wad.file_class = &win32_wad_file;
-    result->wad.length = GetFileLength(handle);
-    result->wad.path = M_StringDuplicate(path);
-    result->handle = handle;
-
-    // Try to map the file into memory with mmap:
-
-    MapFile(result, path);
-
-    return &result->wad;
-}
-
-static void W_Win32_CloseFile(wad_file_t *wad)
-{
-    win32_wad_file_t *win32_wad;
-
-    win32_wad = (win32_wad_file_t *) wad;
-
-    // If mapped, unmap it.
-
-    if (win32_wad->wad.mapped != NULL)
-    {
-        UnmapViewOfFile(win32_wad->wad.mapped);
-    }
-
-    if (win32_wad->handle_map != NULL)
-    {
-        CloseHandle(win32_wad->handle_map);
-    }
-
-    // Close the file
-  
-    if (win32_wad->handle != NULL)
-    {
-        CloseHandle(win32_wad->handle);
-    }
-
-    Z_Free(win32_wad);
-}
-
-// Read data from the specified position in the file into the 
-// provided buffer.  Returns the number of bytes read.
-
-size_t W_Win32_Read(wad_file_t *wad, unsigned int offset,
-                   void *buffer, size_t buffer_len)
-{
-    win32_wad_file_t *win32_wad;
-    DWORD bytes_read;
-    DWORD result;
-
-    win32_wad = (win32_wad_file_t *) wad;
-
-    // Jump to the specified position in the file.
-
-    result = SetFilePointer(win32_wad->handle, offset, NULL, FILE_BEGIN);
-
-    if (result == INVALID_SET_FILE_POINTER)
-    {
-        I_Error("W_Win32_Read: Failed to set file pointer to %i",
-                offset);
-    }
-
-    // Read into the buffer.
-
-    if (!ReadFile(win32_wad->handle, buffer, buffer_len, &bytes_read, NULL))
-    {
-        I_Error("W_Win32_Read: Error reading from file");
-    }
-
-    return bytes_read;
-}
-
-
-wad_file_class_t win32_wad_file = 
-{
-    W_Win32_OpenFile,
-    W_Win32_CloseFile,
-    W_Win32_Read,
-};
-
-
-#endif /* #ifdef _WIN32 */
-
diff --git a/games/NXDoom/src/w_main.c b/games/NXDoom/src/w_main.c
index 3496fd1dd..ce1176547 100644
--- a/games/NXDoom/src/w_main.c
+++ b/games/NXDoom/src/w_main.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Common code to parse command line, identifying WAD files to load.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_main.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Common code to parse command line, identifying WAD files to load.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 
@@ -28,241 +37,258 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-// Parse the command line, merging WAD files that are sppecified.
-// Returns true if at least one file was added.
-boolean W_ParseCommandLine(void)
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct uniquelump
 {
-    boolean modifiedgame = false;
-    int p;
-
-    // Merged PWADs are loaded first, because they are supposed to be 
-    // modified IWADs.
-
-    //!
-    // @arg <files>
-    // @category mod
-    //
-    // Simulates the behavior of deutex's -merge option, merging a PWAD
-    // into the main IWAD.  Multiple files may be specified.
-    //
-
-    p = M_CheckParmWithArgs("-merge", 1);
-
-    if (p > 0)
-    {
-        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
-        {
-            char *filename;
-
-            modifiedgame = true;
-
-            filename = D_TryFindWADByName(myargv[p]);
-
-            printf(" merging %s\n", filename);
-            W_MergeFile(filename);
-            free(filename);
-        }
-    }
-
-    // NWT-style merging:
-
-    // NWT's -merge option:
-
-    //!
-    // @arg <files>
-    // @category mod
-    //
-    // Simulates the behavior of NWT's -merge option.  Multiple files
-    // may be specified.
-
-    p = M_CheckParmWithArgs("-nwtmerge", 1);
-
-    if (p > 0)
-    {
-        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
-        {
-            char *filename;
-
-            modifiedgame = true;
-
-            filename = D_TryFindWADByName(myargv[p]);
-
-            printf(" performing NWT-style merge of %s\n", filename);
-            W_NWTDashMerge(filename);
-            free(filename);
-        }
-    }
-    
-    // Add flats
-
-    //!
-    // @arg <files>
-    // @category mod
-    //
-    // Simulates the behavior of NWT's -af option, merging flats into
-    // the main IWAD directory.  Multiple files may be specified.
-    //
-
-    p = M_CheckParmWithArgs("-af", 1);
-
-    if (p > 0)
-    {
-        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
-        {
-            char *filename;
-
-            modifiedgame = true;
-
-            filename = D_TryFindWADByName(myargv[p]);
-
-            printf(" merging flats from %s\n", filename);
-            W_NWTMergeFile(filename, W_NWT_MERGE_FLATS);
-            free(filename);
-        }
-    }
-
-    //!
-    // @arg <files>
-    // @category mod
-    //
-    // Simulates the behavior of NWT's -as option, merging sprites
-    // into the main IWAD directory.  Multiple files may be specified.
-    //
-
-    p = M_CheckParmWithArgs("-as", 1);
-
-    if (p > 0)
-    {
-        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
-        {
-            char *filename;
-
-            modifiedgame = true;
-            filename = D_TryFindWADByName(myargv[p]);
-
-            printf(" merging sprites from %s\n", filename);
-            W_NWTMergeFile(filename, W_NWT_MERGE_SPRITES);
-            free(filename);
-        }
-    }
-
-    //!
-    // @arg <files>
-    // @category mod
-    //
-    // Equivalent to "-af <files> -as <files>".
-    //
-
-    p = M_CheckParmWithArgs("-aa", 1);
-
-    if (p > 0)
-    {
-        for (p = p + 1; p<myargc && myargv[p][0] != '-'; ++p)
-        {
-            char *filename;
-
-            modifiedgame = true;
-
-            filename = D_TryFindWADByName(myargv[p]);
-
-            printf(" merging sprites and flats from %s\n", filename);
-            W_NWTMergeFile(filename, W_NWT_MERGE_SPRITES | W_NWT_MERGE_FLATS);
-            free(filename);
-        }
-    }
-
-    //!
-    // @arg <files>
-    // @vanilla
-    //
-    // Load the specified PWAD files.  Each succeeding argument is
-    // treated as a PWAD file name until one starts with a dash or the
-    // argument list is exhausted.
-    //
-
-    p = M_CheckParmWithArgs ("-file", 1);
-    if (p)
-    {
-	// the parms after p are wadfile/lump names,
-	// until end of parms or another - preceded parm
-	modifiedgame = true;            // homebrew levels
-	while (++p != myargc && myargv[p][0] != '-')
-        {
-            char *filename;
-
-            filename = D_TryFindWADByName(myargv[p]);
-
-            printf(" adding %s\n", filename);
-	    W_AddFile(filename);
-            free(filename);
-        }
-    }
-
-//    W_PrintDirectory();
-
-    return modifiedgame;
-}
-
-// Load all WAD files from the given directory.
-void W_AutoLoadWADs(const char *path)
-{
-    glob_t *glob;
-    const char *filename;
-
-    glob = I_StartMultiGlob(path, GLOB_FLAG_NOCASE|GLOB_FLAG_SORTED,
-                            "*.wad", "*.lmp", NULL);
-    for (;;)
-    {
-        filename = I_NextGlob(glob);
-        if (filename == NULL)
-        {
-            break;
-        }
-        printf(" [autoload] merging %s\n", filename);
-        W_MergeFile(filename);
-    }
-
-    I_EndGlob(glob);
-}
-
-// Lump names that are unique to particular game types. This lets us check
-// the user is not trying to play with the wrong executable, eg.
-// chocolate-doom -iwad hexen.wad.
-static const struct
-{
-    GameMission_t mission;
-    const char *lumpname;
-} unique_lumps[] = {
-    { doom,    "POSSA1" },
-    { heretic, "IMPXA1" },
-    { hexen,   "ETTNA1" },
-    { strife,  "AGRDA1" },
+  gamemission_t mission;
+  const char *lumpname;
 };
 
-void W_CheckCorrectIWAD(GameMission_t mission)
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Lump names that are unique to particular game types. This lets us check
+ * the user is not trying to play with the wrong executable, eg.
+ * chocolate-doom -iwad hexen.wad.
+ */
+
+static const struct uniquelump g_unique_lumps[] =
 {
-    int i;
-    lumpindex_t lumpnum;
+  {doom, "POSSA1"},
+  {heretic, "IMPXA1"},
+  {hexen, "ETTNA1"},
+  {strife, "AGRDA1"},
+};
 
-    for (i = 0; i < arrlen(unique_lumps); ++i)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Parse the command line, merging WAD files that are sppecified.
+ * Returns true if at least one file was added.
+ */
+
+boolean w_parse_command_line(void)
+{
+  boolean modifiedgame = false;
+  int p;
+
+  /* Merged PWADs are loaded first, because they are supposed to be
+   * modified IWADs.
+   */
+
+  /* @arg <files>
+   * @category mod
+   *
+   * Simulates the behavior of deutex's -merge option, merging a PWAD
+   * into the main IWAD.  Multiple files may be specified.
+   */
+
+  p = m_check_parm_with_args("-merge", 1);
+
+  if (p > 0)
     {
-        if (mission != unique_lumps[i].mission)
+      for (p = p + 1; p < myargc && myargv[p][0] != '-'; ++p)
         {
-            lumpnum = W_CheckNumForName(unique_lumps[i].lumpname);
+          char *filename;
 
-            if (lumpnum >= 0)
+          modifiedgame = true;
+
+          filename = d_try_find_wad_by_name(myargv[p]);
+
+          printf(" merging %s\n", filename);
+          w_merge_file(filename);
+          free(filename);
+        }
+    }
+
+  /* NWT-style merging: */
+
+  /* NWT's -merge option: */
+
+  /* @arg <files>
+   * @category mod
+   *
+   * Simulates the behavior of NWT's -merge option.  Multiple files
+   * may be specified.
+   */
+
+  p = m_check_parm_with_args("-nwtmerge", 1);
+
+  if (p > 0)
+    {
+      for (p = p + 1; p < myargc && myargv[p][0] != '-'; ++p)
+        {
+          char *filename;
+
+          modifiedgame = true;
+
+          filename = d_try_find_wad_by_name(myargv[p]);
+
+          printf(" performing NWT-style merge of %s\n", filename);
+          w_nwt_dash_merge(filename);
+          free(filename);
+        }
+    }
+
+  /* Add flats */
+
+  /* @arg <files>
+   * @category mod
+   *
+   * Simulates the behavior of NWT's -af option, merging flats into
+   * the main IWAD directory.  Multiple files may be specified.
+   */
+
+  p = m_check_parm_with_args("-af", 1);
+
+  if (p > 0)
+    {
+      for (p = p + 1; p < myargc && myargv[p][0] != '-'; ++p)
+        {
+          char *filename;
+
+          modifiedgame = true;
+
+          filename = d_try_find_wad_by_name(myargv[p]);
+
+          printf(" merging flats from %s\n", filename);
+          w_nwt_merge_file(filename, W_NWT_MERGE_FLATS);
+          free(filename);
+        }
+    }
+
+  /* @arg <files>
+   * @category mod
+   *
+   * Simulates the behavior of NWT's -as option, merging sprites
+   * into the main IWAD directory.  Multiple files may be specified.
+   */
+
+  p = m_check_parm_with_args("-as", 1);
+
+  if (p > 0)
+    {
+      for (p = p + 1; p < myargc && myargv[p][0] != '-'; ++p)
+        {
+          char *filename;
+
+          modifiedgame = true;
+          filename = d_try_find_wad_by_name(myargv[p]);
+
+          printf(" merging sprites from %s\n", filename);
+          w_nwt_merge_file(filename, W_NWT_MERGE_SPRITES);
+          free(filename);
+        }
+    }
+
+  /* @arg <files>
+   * @category mod
+   *
+   * Equivalent to "-af <files> -as <files>".
+   */
+
+  p = m_check_parm_with_args("-aa", 1);
+
+  if (p > 0)
+    {
+      for (p = p + 1; p < myargc && myargv[p][0] != '-'; ++p)
+        {
+          char *filename;
+
+          modifiedgame = true;
+
+          filename = d_try_find_wad_by_name(myargv[p]);
+
+          printf(" merging sprites and flats from %s\n", filename);
+          w_nwt_merge_file(filename,
+                  W_NWT_MERGE_SPRITES | W_NWT_MERGE_FLATS);
+          free(filename);
+        }
+    }
+
+  /* @arg <files>
+   * @vanilla
+   *
+   * Load the specified PWAD files.  Each succeeding argument is
+   * treated as a PWAD file name until one starts with a dash or the
+   * argument list is exhausted.
+   */
+
+  p = m_check_parm_with_args("-file", 1);
+  if (p)
+    {
+      /* the params after p are wadfile/lump names,
+       * until end of params or another - preceded param
+       */
+
+      modifiedgame = true; /* homebrew levels */
+      while (++p != myargc && myargv[p][0] != '-')
+        {
+          char *filename;
+
+          filename = d_try_find_wad_by_name(myargv[p]);
+
+          printf(" adding %s\n", filename);
+          w_add_file(filename);
+          free(filename);
+        }
+    }
+
+  return modifiedgame;
+}
+
+/* Load all WAD files from the given directory. */
+
+void w_auto_load_wads(const char *path)
+{
+  glob_t *glob;
+  const char *filename;
+
+  glob = i_start_multi_glob(path, GLOB_FLAG_NOCASE | GLOB_FLAG_SORTED,
+                            "*.wad", "*.lmp", NULL);
+  for (; ; )
+    {
+      filename = i_next_glob(glob);
+      if (filename == NULL)
+        {
+          break;
+        }
+
+      printf(" [autoload] merging %s\n", filename);
+      w_merge_file(filename);
+    }
+
+  i_end_glob(glob);
+}
+
+void w_check_correct_iwad(gamemission_t mission)
+{
+  int i;
+  lumpindex_t lumpnum;
+
+  for (i = 0; i < arrlen(g_unique_lumps); ++i)
+    {
+      if (mission != g_unique_lumps[i].mission)
+        {
+          lumpnum = w_check_num_for_name(g_unique_lumps[i].lumpname);
+
+          if (lumpnum >= 0)
             {
-                I_Error("\nYou are trying to use a %s IWAD file with "
-                        "the %s%s binary.\nThis isn't going to work.\n"
-                        "You probably want to use the %s%s binary.",
-                        D_SuggestGameName(unique_lumps[i].mission,
-                                          indetermined),
-                        PROGRAM_PREFIX,
-                        D_GameMissionString(mission),
-                        PROGRAM_PREFIX,
-                        D_GameMissionString(unique_lumps[i].mission));
+              i_error(
+                  "\nYou are trying to use a %s IWAD file with "
+                  "the %s%s binary.\nThis isn't going to work.\n"
+                  "You probably want to use the %s%s binary.",
+                  d_suggest_game_name(
+                      g_unique_lumps[i].mission, indetermined),
+                  PROGRAM_PREFIX, d_game_mission_string(mission),
+                  PROGRAM_PREFIX,
+                  d_game_mission_string(g_unique_lumps[i].mission));
             }
         }
     }
 }
-
diff --git a/games/NXDoom/src/w_main.h b/games/NXDoom/src/w_main.h
index 4565c657f..beab3f29b 100644
--- a/games/NXDoom/src/w_main.h
+++ b/games/NXDoom/src/w_main.h
@@ -1,30 +1,43 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//     Common code to parse command line, identifying WAD files to load.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_main.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *     Common code to parse command line, identifying WAD files to load.
+ *
+ ****************************************************************************/
 
 #ifndef W_MAIN_H
 #define W_MAIN_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "d_mode.h"
 
-boolean W_ParseCommandLine(void);
-void W_CheckCorrectIWAD(GameMission_t mission);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Autoload all .wad files from the given directory:
-void W_AutoLoadWADs(const char *path);
+boolean w_parse_command_line(void);
+void w_check_correct_iwad(gamemission_t mission);
 
-#endif /* #ifndef W_MAIN_H */
+/* Autoload all .wad files from the given directory: */
 
+void w_auto_load_wads(const char *path);
+
+#endif /* W_MAIN_H */
diff --git a/games/NXDoom/src/w_merge.c b/games/NXDoom/src/w_merge.c
index 3d71a9aee..88a05b4bd 100644
--- a/games/NXDoom/src/w_merge.c
+++ b/games/NXDoom/src/w_merge.c
@@ -1,27 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// Handles merging of PWADs, similar to deutex's -merge option
-//
-// Ideally this should work exactly the same as in deutex, but trying to
-// read the deutex source code made my brain hurt.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_merge.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ * Handles merging of PWADs, similar to deutex's -merge option
+ *
+ * Ideally this should work exactly the same as in deutex, but trying to
+ * read the deutex source code made my brain hurt.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "doomtype.h"
 #include "i_system.h"
@@ -30,26 +39,34 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-typedef enum 
-{ 
-    SECTION_NORMAL, 
-    SECTION_FLATS, 
-    SECTION_SPRITES,
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef enum
+{
+  SECTION_NORMAL,
+  SECTION_FLATS,
+  SECTION_SPRITES,
 } section_t;
 
 typedef struct
 {
-    lumpinfo_t **lumps;
-    int numlumps;
+  lumpinfo_t **lumps;
+  int numlumps;
 } searchlist_t;
 
 typedef struct
 {
-    char sprname[4];
-    char frame;
-    lumpinfo_t *angle_lumps[8];
+  char sprname[4];
+  char frame;
+  lumpinfo_t *angle_lumps[8];
 } sprite_frame_t;
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
 static searchlist_t iwad;
 static searchlist_t iwad_sprites;
 static searchlist_t pwad;
@@ -58,665 +75,690 @@ static searchlist_t iwad_flats;
 static searchlist_t pwad_sprites;
 static searchlist_t pwad_flats;
 
-// lumps with these sprites must be replaced in the IWAD
+/* lumps with these sprites must be replaced in the IWAD */
+
 static sprite_frame_t *sprite_frames;
 static int num_sprite_frames;
 static int sprite_frames_alloced;
 
-// Search in a list to find a lump with a particular name
-// Linear search (slow!)
-//
-// Returns -1 if not found
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static int FindInList(searchlist_t *list, const char *name)
+/* Search in a list to find a lump with a particular name
+ * Linear search (slow!)
+ *
+ * Returns -1 if not found
+ */
+
+static int find_in_list(searchlist_t *list, const char *name)
 {
-    int i;
+  int i;
 
-    for (i=0; i<list->numlumps; ++i)
+  for (i = 0; i < list->numlumps; ++i)
     {
-        if (!strncasecmp(list->lumps[i]->name, name, 8))
-            return i;
+      if (!strncasecmp(list->lumps[i]->name, name, 8)) return i;
     }
 
-    return -1;
+  return -1;
 }
 
-static boolean SetupList(searchlist_t *list, searchlist_t *src_list,
-                         const char *startname, const char *endname,
-                         const char *startname2, const char *endname2)
+static boolean setup_list(searchlist_t *list, searchlist_t *src_list,
+                          const char *startname, const char *endname,
+                          const char *startname2, const char *endname2)
 {
-    int startlump, endlump;
+  int startlump;
+  int endlump;
 
-    list->numlumps = 0;
-    startlump = FindInList(src_list, startname);
+  list->numlumps = 0;
+  startlump = find_in_list(src_list, startname);
 
-    if (startname2 != NULL && startlump < 0)
+  if (startname2 != NULL && startlump < 0)
     {
-        startlump = FindInList(src_list, startname2);
+      startlump = find_in_list(src_list, startname2);
     }
 
-    if (startlump >= 0)
+  if (startlump >= 0)
     {
-        endlump = FindInList(src_list, endname);
+      endlump = find_in_list(src_list, endname);
 
-        if (endname2 != NULL && endlump < 0)
+      if (endname2 != NULL && endlump < 0)
         {
-            endlump = FindInList(src_list, endname2);
+          endlump = find_in_list(src_list, endname2);
         }
 
-        if (endlump > startlump)
+      if (endlump > startlump)
         {
-            list->lumps = src_list->lumps + startlump + 1;
-            list->numlumps = endlump - startlump - 1;
-            return true;
+          list->lumps = src_list->lumps + startlump + 1;
+          list->numlumps = endlump - startlump - 1;
+          return true;
         }
     }
 
-    return false;
+  return false;
 }
 
-// Sets up the sprite/flat search lists
+/* Sets up the sprite/flat search lists */
 
-static void SetupLists(void)
+static void setup_lists(void)
 {
-    // IWAD
+  /* IWAD */
 
-    if (!SetupList(&iwad_flats, &iwad, "F_START", "F_END", NULL, NULL))
+  if (!setup_list(&iwad_flats, &iwad, "F_START", "F_END", NULL, NULL))
     {
-        I_Error("Flats section not found in IWAD");
+      i_error("Flats section not found in IWAD");
     }
 
-    if (!SetupList(&iwad_sprites, &iwad, "S_START", "S_END", NULL, NULL))
+  if (!setup_list(&iwad_sprites, &iwad, "S_START", "S_END", NULL, NULL))
 
     {
-        I_Error("Sprites section not found in IWAD");
+      i_error("Sprites section not found in IWAD");
     }
-    
-    // PWAD
 
-    SetupList(&pwad_flats, &pwad, "F_START", "F_END", "FF_START", "FF_END");
-    SetupList(&pwad_sprites, &pwad, "S_START", "S_END", "SS_START", "SS_END");
+  /* PWAD */
+
+  setup_list(&pwad_flats, &pwad, "F_START", "F_END", "FF_START", "FF_END");
+  setup_list(&pwad_sprites, &pwad, "S_START", "S_END", "SS_START", "SS_END");
 }
 
-// Initialize the replace list
+/* Initialize the replace list */
 
-static void InitSpriteList(void)
+static void init_sprite_list(void)
 {
-    if (sprite_frames == NULL)
+  if (sprite_frames == NULL)
     {
-        sprite_frames_alloced = 128;
-        sprite_frames = Z_Malloc(sizeof(*sprite_frames) * sprite_frames_alloced,
-                                 PU_STATIC, NULL);
+      sprite_frames_alloced = 128;
+      sprite_frames = z_malloc(
+        sizeof(*sprite_frames) * sprite_frames_alloced,
+        PU_STATIC, NULL
+      );
     }
 
-    num_sprite_frames = 0;
+  num_sprite_frames = 0;
 }
 
-static boolean ValidSpriteLumpName(char *name)
+static boolean valid_sprite_lump_name(char *name)
 {
-    if (name[0] == '\0' || name[1] == '\0'
-     || name[2] == '\0' || name[3] == '\0')
+  if (name[0] == '\0' || name[1] == '\0' || name[2] == '\0' ||
+      name[3] == '\0')
     {
-        return false;
+      return false;
     }
 
-    // First frame:
+  /* First frame: */
 
-    if (name[4] == '\0' || !isdigit(name[5]))
+  if (name[4] == '\0' || !isdigit(name[5]))
     {
-        return false;
+      return false;
     }
 
-    // Second frame (optional):
+  /* Second frame (optional): */
 
-    if (name[6] != '\0' && !isdigit(name[7]))
+  if (name[6] != '\0' && !isdigit(name[7]))
     {
-        return false;
+      return false;
     }
 
-    return true;
+  return true;
 }
 
-// Find a sprite frame
-
-static sprite_frame_t *FindSpriteFrame(char *name, int frame)
+static sprite_frame_t *find_sprite_frame(char *name, int frame)
 {
-    sprite_frame_t *result;
-    int i;
+  sprite_frame_t *result;
+  int i;
 
-    // Search the list and try to find the frame
+  /* Search the list and try to find the frame */
 
-    for (i=0; i<num_sprite_frames; ++i)
+  for (i = 0; i < num_sprite_frames; ++i)
     {
-        sprite_frame_t *cur = &sprite_frames[i];
+      sprite_frame_t *cur = &sprite_frames[i];
 
-        if (!strncasecmp(cur->sprname, name, 4) && cur->frame == frame)
+      if (!strncasecmp(cur->sprname, name, 4) && cur->frame == frame)
         {
-            return cur;
+          return cur;
         }
     }
 
-    // Not found in list; Need to add to the list
+  /* Not found in list; Need to add to the list */
 
-    // Grow list?
+  /* Grow list? */
 
-    if (num_sprite_frames >= sprite_frames_alloced)
+  if (num_sprite_frames >= sprite_frames_alloced)
     {
-        sprite_frame_t *newframes;
+      sprite_frame_t *newframes;
 
-        newframes = Z_Malloc(sprite_frames_alloced * 2 * sizeof(*sprite_frames),
-                             PU_STATIC, NULL);
-        memcpy(newframes, sprite_frames,
-               sprite_frames_alloced * sizeof(*sprite_frames));
-        Z_Free(sprite_frames);
-        sprite_frames_alloced *= 2;
-        sprite_frames = newframes;
+      newframes = z_malloc(
+        sprite_frames_alloced * 2 * sizeof(*sprite_frames),
+        PU_STATIC, NULL
+      );
+      memcpy(newframes, sprite_frames,
+             sprite_frames_alloced * sizeof(*sprite_frames));
+      z_free(sprite_frames);
+      sprite_frames_alloced *= 2;
+      sprite_frames = newframes;
     }
 
-    // Add to end of list
-    
-    result = &sprite_frames[num_sprite_frames];
-    memcpy(result->sprname, name, 4);
-    result->frame = frame;
+  /* Add to end of list */
 
-    for (i=0; i<8; ++i)
-        result->angle_lumps[i] = NULL;
+  result = &sprite_frames[num_sprite_frames];
+  memcpy(result->sprname, name, 4);
+  result->frame = frame;
 
-    ++num_sprite_frames;
+  for (i = 0; i < 8; ++i)
+    result->angle_lumps[i] = NULL;
 
-    return result;
+  ++num_sprite_frames;
+
+  return result;
 }
 
-// Check if sprite lump is needed in the new wad
+/* Check if sprite lump is needed in the new wad */
 
-static boolean SpriteLumpNeeded(lumpinfo_t *lump)
+static boolean sprite_lump_needed(lumpinfo_t *lump)
 {
-    sprite_frame_t *sprite;
-    int angle_num;
-    int i;
+  sprite_frame_t *sprite;
+  int angle_num;
+  int i;
 
-    if (!ValidSpriteLumpName(lump->name))
+  if (!valid_sprite_lump_name(lump->name))
     {
-        return true;
+      return true;
     }
 
-    // check the first frame
+  /* check the first frame */
 
-    sprite = FindSpriteFrame(lump->name, lump->name[4]);
-    angle_num = lump->name[5] - '0';
+  sprite = find_sprite_frame(lump->name, lump->name[4]);
+  angle_num = lump->name[5] - '0';
 
-    if (angle_num == 0)
+  if (angle_num == 0)
     {
-        // must check all frames
+      /* must check all frames */
 
-        for (i=0; i<8; ++i)
+      for (i = 0; i < 8; ++i)
         {
-            if (sprite->angle_lumps[i] == lump)
-                return true;
+          if (sprite->angle_lumps[i] == lump) return true;
         }
     }
-    else 
+  else
     {
-        // check if this lump is being used for this frame
+      /* check if this lump is being used for this frame */
 
-        if (sprite->angle_lumps[angle_num - 1] == lump)
-            return true;
+      if (sprite->angle_lumps[angle_num - 1] == lump) return true;
     }
-            
-    // second frame if any
-    
-    // no second frame?
-    if (lump->name[6] == '\0')
-        return false;
 
-    sprite = FindSpriteFrame(lump->name, lump->name[6]);
-    angle_num = lump->name[7] - '0';
+  /* second frame if any */
 
-    if (angle_num == 0)
+  /* no second frame? */
+
+  if (lump->name[6] == '\0') return false;
+
+  sprite = find_sprite_frame(lump->name, lump->name[6]);
+  angle_num = lump->name[7] - '0';
+
+  if (angle_num == 0)
     {
-        // must check all frames
+      /* must check all frames */
 
-        for (i=0; i<8; ++i)
+      for (i = 0; i < 8; ++i)
         {
-            if (sprite->angle_lumps[i] == lump)
-                return true;
+          if (sprite->angle_lumps[i] == lump) return true;
         }
     }
-    else 
+  else
     {
-        // check if this lump is being used for this frame
+      /* check if this lump is being used for this frame */
 
-        if (sprite->angle_lumps[angle_num - 1] == lump)
-            return true;
+      if (sprite->angle_lumps[angle_num - 1] == lump) return true;
     }
 
-    return false;
+  return false;
 }
 
-static void AddSpriteLump(lumpinfo_t *lump)
+static void add_sprite_lump(lumpinfo_t *lump)
 {
-    sprite_frame_t *sprite;
-    int angle_num;
-    int i;
+  sprite_frame_t *sprite;
+  int angle_num;
+  int i;
 
-    if (!ValidSpriteLumpName(lump->name))
+  if (!valid_sprite_lump_name(lump->name))
     {
-        return;
+      return;
     }
-    
-    // first angle
 
-    sprite = FindSpriteFrame(lump->name, lump->name[4]);
-    angle_num = lump->name[5] - '0';
-    
-    if (angle_num == 0) 
-    {
-        for (i=0; i<8; ++i)
-            sprite->angle_lumps[i] = lump;
-    }
-    else
-    {
-        sprite->angle_lumps[angle_num - 1] = lump;
-    }
-    
-    // second angle
+  /* first angle */
 
-    // no second angle?
-  
-    if (lump->name[6] == '\0')
-        return;
-    
-    sprite = FindSpriteFrame(lump->name, lump->name[6]);
-    angle_num = lump->name[7] - '0';
-    
-    if (angle_num == 0) 
+  sprite = find_sprite_frame(lump->name, lump->name[4]);
+  angle_num = lump->name[5] - '0';
+
+  if (angle_num == 0)
     {
-        for (i=0; i<8; ++i)
-            sprite->angle_lumps[i] = lump;
+      for (i = 0; i < 8; ++i)
+        sprite->angle_lumps[i] = lump;
     }
-    else
+  else
     {
-        sprite->angle_lumps[angle_num - 1] = lump;
+      sprite->angle_lumps[angle_num - 1] = lump;
+    }
+
+  /* second angle */
+
+  /* no second angle? */
+
+  if (lump->name[6] == '\0') return;
+
+  sprite = find_sprite_frame(lump->name, lump->name[6]);
+  angle_num = lump->name[7] - '0';
+
+  if (angle_num == 0)
+    {
+      for (i = 0; i < 8; ++i)
+        sprite->angle_lumps[i] = lump;
+    }
+  else
+    {
+      sprite->angle_lumps[angle_num - 1] = lump;
     }
 }
 
-// Generate the list.  Run at the start, before merging
+/* Generate the list.  Run at the start, before merging */
 
-static void GenerateSpriteList(void)
+static void generate_sprite_list(void)
 {
-    int i;
+  int i;
 
-    InitSpriteList();
-    
-    // Add all sprites from the IWAD
-    
-    for (i=0; i<iwad_sprites.numlumps; ++i)
+  init_sprite_list();
+
+  /* Add all sprites from the IWAD */
+
+  for (i = 0; i < iwad_sprites.numlumps; ++i)
     {
-        AddSpriteLump(iwad_sprites.lumps[i]);
+      add_sprite_lump(iwad_sprites.lumps[i]);
     }
-    
-    // Add all sprites from the PWAD
-    // (replaces IWAD sprites)
 
-    for (i=0; i<pwad_sprites.numlumps; ++i)
+  /* Add all sprites from the PWAD
+   * (replaces IWAD sprites)
+   */
+
+  for (i = 0; i < pwad_sprites.numlumps; ++i)
     {
-        AddSpriteLump(pwad_sprites.lumps[i]);
+      add_sprite_lump(pwad_sprites.lumps[i]);
     }
 }
 
-// Perform the merge.
-//
-// The merge code creates a new lumpinfo list, adding entries from the
-// IWAD first followed by the PWAD.
-//
-// For the IWAD:
-//  * Flats are added.  If a flat with the same name is in the PWAD, 
-//    it is ignored(deleted).  At the end of the section, all flats in the 
-//    PWAD are inserted.  This is consistent with the behavior of 
-//    deutex/deusf.
-//  * Sprites are added.  The "replace list" is generated before the merge
-//    from the list of sprites in the PWAD.  Any sprites in the IWAD found
-//    to match the replace list are removed.  At the end of the section,
-//    the sprites from the PWAD are inserted.
-// 
-// For the PWAD:
-//  * All Sprites and Flats are ignored, with the assumption they have 
-//    already been merged into the IWAD's sections.
+/* Perform the merge.
+ *
+ * The merge code creates a new lumpinfo list, adding entries from the
+ * IWAD first followed by the PWAD.
+ *
+ * For the IWAD:
+ *  * Flats are added.  If a flat with the same name is in the PWAD,
+ *    it is ignored(deleted).  At the end of the section, all flats in the
+ *    PWAD are inserted.  This is consistent with the behavior of
+ *    deutex/deusf.
+ *  * Sprites are added.  The "replace list" is generated before the merge
+ *    from the list of sprites in the PWAD.  Any sprites in the IWAD found
+ *    to match the replace list are removed.  At the end of the section,
+ *    the sprites from the PWAD are inserted.
+ *
+ * For the PWAD:
+ *  * All Sprites and Flats are ignored, with the assumption they have
+ *    already been merged into the IWAD's sections.
+ */
 
-static void DoMerge(void)
+static void do_merge(void)
 {
-    section_t current_section;
-    lumpinfo_t **newlumps;
-    int num_newlumps;
-    int lumpindex;
-    int i, n;
+  section_t current_section;
+  lumpinfo_t **newlumps;
+  int num_newlumps;
+  int lumpindex;
+  int i;
+  int n;
 
-    // Can't ever have more lumps than we already have
-    newlumps = calloc(numlumps, sizeof(lumpinfo_t *));
-    num_newlumps = 0;
+  /* Can't ever have more lumps than we already have */
 
-    // Add IWAD lumps
-    current_section = SECTION_NORMAL;
+  newlumps = calloc(numlumps, sizeof(lumpinfo_t *));
+  num_newlumps = 0;
 
-    for (i=0; i<iwad.numlumps; ++i)
+  /* Add IWAD lumps */
+
+  current_section = SECTION_NORMAL;
+
+  for (i = 0; i < iwad.numlumps; ++i)
     {
-        lumpinfo_t *lump = iwad.lumps[i];
+      lumpinfo_t *lump = iwad.lumps[i];
 
-        switch (current_section)
+      switch (current_section)
         {
-            case SECTION_NORMAL:
-                if (!strncasecmp(lump->name, "F_START", 8))
+        case SECTION_NORMAL:
+          if (!strncasecmp(lump->name, "F_START", 8))
+            {
+              current_section = SECTION_FLATS;
+            }
+          else if (!strncasecmp(lump->name, "S_START", 8))
+            {
+              current_section = SECTION_SPRITES;
+            }
+
+          newlumps[num_newlumps++] = lump;
+
+          break;
+
+        case SECTION_FLATS:
+
+          /* Have we reached the end of the section? */
+
+          if (!strncasecmp(lump->name, "F_END", 8))
+            {
+              /* Add all new flats from the PWAD to the end
+               * of the section
+               */
+
+              for (n = 0; n < pwad_flats.numlumps; ++n)
                 {
-                    current_section = SECTION_FLATS;
-                }
-                else if (!strncasecmp(lump->name, "S_START", 8))
-                {
-                    current_section = SECTION_SPRITES;
+                  newlumps[num_newlumps++] = pwad_flats.lumps[n];
                 }
 
-                newlumps[num_newlumps++] = lump;
+              newlumps[num_newlumps++] = lump;
 
-                break;
+              /* back to normal reading */
 
-            case SECTION_FLATS:
+              current_section = SECTION_NORMAL;
+            }
+          else
+            {
+              /* If there is a flat in the PWAD with the same name,
+               * do not add it now.  All PWAD flats are added to the
+               * end of the section. Otherwise, if it is only in the
+               * IWAD, add it now
+               */
 
-                // Have we reached the end of the section?
+              lumpindex = find_in_list(&pwad_flats, lump->name);
 
-                if (!strncasecmp(lump->name, "F_END", 8))
+              if (lumpindex < 0)
                 {
-                    // Add all new flats from the PWAD to the end
-                    // of the section
+                  newlumps[num_newlumps++] = lump;
+                }
+            }
 
-                    for (n=0; n<pwad_flats.numlumps; ++n)
+          break;
+
+        case SECTION_SPRITES:
+
+          /* Have we reached the end of the section? */
+
+          if (!strncasecmp(lump->name, "S_END", 8))
+            {
+              /* add all the PWAD sprites */
+
+              for (n = 0; n < pwad_sprites.numlumps; ++n)
+                {
+                  if (sprite_lump_needed(pwad_sprites.lumps[n]))
                     {
-                        newlumps[num_newlumps++] = pwad_flats.lumps[n];
-                    }
-
-                    newlumps[num_newlumps++] = lump;
-
-                    // back to normal reading
-                    current_section = SECTION_NORMAL;
-                }
-                else
-                {
-                    // If there is a flat in the PWAD with the same name,
-                    // do not add it now.  All PWAD flats are added to the
-                    // end of the section. Otherwise, if it is only in the
-                    // IWAD, add it now
-
-                    lumpindex = FindInList(&pwad_flats, lump->name);
-
-                    if (lumpindex < 0)
-                    {
-                        newlumps[num_newlumps++] = lump;
+                      newlumps[num_newlumps++] = pwad_sprites.lumps[n];
                     }
                 }
 
-                break;
+              /* copy the ending */
 
-            case SECTION_SPRITES:
+              newlumps[num_newlumps++] = lump;
 
-                // Have we reached the end of the section?
+              /* back to normal reading */
 
-                if (!strncasecmp(lump->name, "S_END", 8))
+              current_section = SECTION_NORMAL;
+            }
+          else
+            {
+              /* Is this lump holding a sprite to be replaced in the
+               * PWAD? If so, wait until the end to add it.
+               */
+
+              if (sprite_lump_needed(lump))
                 {
-                    // add all the PWAD sprites
-
-                    for (n=0; n<pwad_sprites.numlumps; ++n)
-                    {
-                        if (SpriteLumpNeeded(pwad_sprites.lumps[n]))
-                        {
-                            newlumps[num_newlumps++] = pwad_sprites.lumps[n];
-                        }
-                    }
-
-                    // copy the ending
-                    newlumps[num_newlumps++] = lump;
-
-                    // back to normal reading
-                    current_section = SECTION_NORMAL;
+                  newlumps[num_newlumps++] = lump;
                 }
-                else
-                {
-                    // Is this lump holding a sprite to be replaced in the
-                    // PWAD? If so, wait until the end to add it.
+            }
 
-                    if (SpriteLumpNeeded(lump))
-                    {
-                        newlumps[num_newlumps++] = lump;
-                    }
-                }
-
-                break;
+          break;
         }
     }
-   
-    // Add PWAD lumps
-    current_section = SECTION_NORMAL;
 
-    for (i=0; i<pwad.numlumps; ++i)
+  /* Add PWAD lumps */
+
+  current_section = SECTION_NORMAL;
+
+  for (i = 0; i < pwad.numlumps; ++i)
     {
-        lumpinfo_t *lump = pwad.lumps[i];
+      lumpinfo_t *lump = pwad.lumps[i];
 
-        switch (current_section)
+      switch (current_section)
         {
-            case SECTION_NORMAL:
-                if (!strncasecmp(lump->name, "F_START", 8)
-                 || !strncasecmp(lump->name, "FF_START", 8))
-                {
-                    current_section = SECTION_FLATS;
-                }
-                else if (!strncasecmp(lump->name, "S_START", 8)
-                      || !strncasecmp(lump->name, "SS_START", 8))
-                {
-                    current_section = SECTION_SPRITES;
-                }
-                else
-                {
-                    // Don't include the headers of sections
-       
-                    newlumps[num_newlumps++] = lump;
-                }
-                break;
+        case SECTION_NORMAL:
+          if (!strncasecmp(lump->name, "F_START", 8) ||
+              !strncasecmp(lump->name, "FF_START", 8))
+            {
+              current_section = SECTION_FLATS;
+            }
+          else if (!strncasecmp(lump->name, "S_START", 8) ||
+                   !strncasecmp(lump->name, "SS_START", 8))
+            {
+              current_section = SECTION_SPRITES;
+            }
+          else
+            {
+              /* Don't include the headers of sections */
 
-            case SECTION_FLATS:
+              newlumps[num_newlumps++] = lump;
+            }
+          break;
 
-                // PWAD flats are ignored (already merged)
-  
-                if (!strncasecmp(lump->name, "FF_END", 8)
-                 || !strncasecmp(lump->name, "F_END", 8))
-                {
-                    // end of section
-                    current_section = SECTION_NORMAL;
-                }
-                break;
+        case SECTION_FLATS:
 
-            case SECTION_SPRITES:
+          /* PWAD flats are ignored (already merged) */
 
-                // PWAD sprites are ignored (already merged)
+          if (!strncasecmp(lump->name, "FF_END", 8) ||
+              !strncasecmp(lump->name, "F_END", 8))
+            {
+              /* end of section */
 
-                if (!strncasecmp(lump->name, "SS_END", 8)
-                 || !strncasecmp(lump->name, "S_END", 8))
-                {
-                    // end of section
-                    current_section = SECTION_NORMAL;
-                }
-                break;
+              current_section = SECTION_NORMAL;
+            }
+          break;
+
+        case SECTION_SPRITES:
+
+          /* PWAD sprites are ignored (already merged) */
+
+          if (!strncasecmp(lump->name, "SS_END", 8) ||
+              !strncasecmp(lump->name, "S_END", 8))
+            {
+              /* end of section */
+
+              current_section = SECTION_NORMAL;
+            }
+          break;
         }
     }
 
-    // Switch to the new lumpinfo, and free the old one
+  /* Switch to the new lumpinfo, and free the old one */
 
-    free(lumpinfo);
-    lumpinfo = newlumps;
-    numlumps = num_newlumps;
+  free(lumpinfo);
+  lumpinfo = newlumps;
+  numlumps = num_newlumps;
 }
 
-void W_PrintDirectory(void)
-{
-    unsigned int i, n;
+/* Replace lumps in the given list with lumps from the PWAD */
 
-    // debug
-    for (i=0; i<numlumps; ++i)
+static void w_nwt_add_lumps(searchlist_t *list)
+{
+  int i;
+
+  /* Go through the IWAD list given, replacing lumps with lumps of
+   * the same name from the PWAD
+   */
+
+  for (i = 0; i < list->numlumps; ++i)
     {
-        for (n=0; n<8 && lumpinfo[i]->name[n] != '\0'; ++n)
-            putchar(lumpinfo[i]->name[n]);
-        putchar('\n');
-    }
-}
+      int index;
 
-// Merge in a file by name
+      index = find_in_list(&pwad, list->lumps[i]->name);
 
-void W_MergeFile(const char *filename)
-{
-    int old_numlumps;
-
-    old_numlumps = numlumps;
-
-    // Load PWAD
-
-    if (W_AddFile(filename) == NULL)
-        return;
-
-    // IWAD is at the start, PWAD was appended to the end
-
-    iwad.lumps = lumpinfo;
-    iwad.numlumps = old_numlumps;
-
-    pwad.lumps = lumpinfo + old_numlumps;
-    pwad.numlumps = numlumps - old_numlumps;
-    
-    // Setup sprite/flat lists
-
-    SetupLists();
-
-    // Generate list of sprites to be replaced by the PWAD
-
-    GenerateSpriteList();
-
-    // Perform the merge
-
-    DoMerge();
-}
-
-// Replace lumps in the given list with lumps from the PWAD
-
-static void W_NWTAddLumps(searchlist_t *list)
-{
-    int i;
-
-    // Go through the IWAD list given, replacing lumps with lumps of
-    // the same name from the PWAD
-    for (i=0; i<list->numlumps; ++i)
-    {
-        int index;
-
-        index = FindInList(&pwad, list->lumps[i]->name);
-
-        if (index > 0)
+      if (index > 0)
         {
-            memcpy(list->lumps[i], pwad.lumps[index],
-                   sizeof(lumpinfo_t));
+          memcpy(list->lumps[i], pwad.lumps[index], sizeof(lumpinfo_t));
         }
     }
 }
 
-// Merge sprites and flats in the way NWT does with its -af and -as
-// command-line options.
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-void W_NWTMergeFile(const char *filename, int flags)
+void w_print_directory(void)
 {
-    int old_numlumps;
+  unsigned int i;
+  unsigned int n;
 
-    old_numlumps = numlumps;
+  /* debug */
 
-    // Load PWAD
-
-    if (W_AddFile(filename) == NULL)
-        return;
-
-    // IWAD is at the start, PWAD was appended to the end
-
-    iwad.lumps = lumpinfo;
-    iwad.numlumps = old_numlumps;
-
-    pwad.lumps = lumpinfo + old_numlumps;
-    pwad.numlumps = numlumps - old_numlumps;
-
-    // Setup sprite/flat lists
-
-    SetupLists();
-
-    // Merge in flats?
-
-    if (flags & W_NWT_MERGE_FLATS)
+  for (i = 0; i < numlumps; ++i)
     {
-        W_NWTAddLumps(&iwad_flats);
+      for (n = 0; n < 8 && lumpinfo[i]->name[n] != '\0'; ++n)
+        putchar(lumpinfo[i]->name[n]);
+      putchar('\n');
     }
-
-    // Sprites?
-
-    if (flags & W_NWT_MERGE_SPRITES)
-    {
-        W_NWTAddLumps(&iwad_sprites);
-    }
-    
-    // Discard the PWAD
-
-    numlumps = old_numlumps;
 }
 
-// Simulates the NWT -merge command line parameter.  What this does is load
-// a PWAD, then search the IWAD sprites, removing any sprite lumps that also
-// exist in the PWAD.
+/* Merge in a file by name */
 
-void W_NWTDashMerge(const char *filename)
+void w_merge_file(const char *filename)
 {
-    wad_file_t *wad_file;
-    int old_numlumps;
-    int i;
+  int old_numlumps;
 
-    old_numlumps = numlumps;
+  old_numlumps = numlumps;
 
-    // Load PWAD
+  /* Load PWAD */
 
-    wad_file = W_AddFile(filename);
+  if (w_add_file(filename) == NULL) return;
 
-    if (wad_file == NULL)
+  /* IWAD is at the start, PWAD was appended to the end */
+
+  iwad.lumps = lumpinfo;
+  iwad.numlumps = old_numlumps;
+
+  pwad.lumps = lumpinfo + old_numlumps;
+  pwad.numlumps = numlumps - old_numlumps;
+
+  /* Setup sprite/flat lists */
+
+  setup_lists();
+
+  /* Generate list of sprites to be replaced by the PWAD */
+
+  generate_sprite_list();
+
+  /* Perform the merge */
+
+  do_merge();
+}
+
+/* Merge sprites and flats in the way NWT does with its -af and -as
+ * command-line options.
+ */
+
+void w_nwt_merge_file(const char *filename, int flags)
+{
+  int old_numlumps;
+
+  old_numlumps = numlumps;
+
+  /* Load PWAD */
+
+  if (w_add_file(filename) == NULL) return;
+
+  /* IWAD is at the start, PWAD was appended to the end */
+
+  iwad.lumps = lumpinfo;
+  iwad.numlumps = old_numlumps;
+
+  pwad.lumps = lumpinfo + old_numlumps;
+  pwad.numlumps = numlumps - old_numlumps;
+
+  /* Setup sprite/flat lists */
+
+  setup_lists();
+
+  /* Merge in flats? */
+
+  if (flags & W_NWT_MERGE_FLATS)
     {
-        return;
+      w_nwt_add_lumps(&iwad_flats);
     }
 
-    // IWAD is at the start, PWAD was appended to the end
+  /* Sprites? */
 
-    iwad.lumps = lumpinfo;
-    iwad.numlumps = old_numlumps;
-
-    pwad.lumps = lumpinfo + old_numlumps;
-    pwad.numlumps = numlumps - old_numlumps;
-
-    // Setup sprite/flat lists
-
-    SetupLists();
-
-    // Search through the IWAD sprites list.
-
-    for (i=0; i<iwad_sprites.numlumps; ++i)
+  if (flags & W_NWT_MERGE_SPRITES)
     {
-        if (FindInList(&pwad, iwad_sprites.lumps[i]->name) >= 0)
+      w_nwt_add_lumps(&iwad_sprites);
+    }
+
+  /* Discard the PWAD */
+
+  numlumps = old_numlumps;
+}
+
+/* Simulates the NWT -merge command line parameter.  What this does is load
+ * a PWAD, then search the IWAD sprites, removing any sprite lumps that also
+ * exist in the PWAD.
+ */
+
+void w_nwt_dash_merge(const char *filename)
+{
+  wad_file_t *wad_file;
+  int old_numlumps;
+  int i;
+
+  old_numlumps = numlumps;
+
+  /* Load PWAD */
+
+  wad_file = w_add_file(filename);
+
+  if (wad_file == NULL)
+    {
+      return;
+    }
+
+  /* IWAD is at the start, PWAD was appended to the end */
+
+  iwad.lumps = lumpinfo;
+  iwad.numlumps = old_numlumps;
+
+  pwad.lumps = lumpinfo + old_numlumps;
+  pwad.numlumps = numlumps - old_numlumps;
+
+  /* Setup sprite/flat lists */
+
+  setup_lists();
+
+  /* Search through the IWAD sprites list. */
+
+  for (i = 0; i < iwad_sprites.numlumps; ++i)
+    {
+      if (find_in_list(&pwad, iwad_sprites.lumps[i]->name) >= 0)
         {
-            // Replace this entry with an empty string.  This is what
-            // nwt -merge does.
+          /* Replace this entry with an empty string.  This is what
+           * nwt -merge does.
+           */
 
-            M_StringCopy(iwad_sprites.lumps[i]->name, "", 8);
+          m_str_copy(iwad_sprites.lumps[i]->name, "", 8);
         }
     }
 
-    // Discard PWAD
-    // The PWAD must now be added in again with -file.
+  /* Discard PWAD
+   * The PWAD must now be added in again with -file.
+   */
 
-    numlumps = old_numlumps;
+  numlumps = old_numlumps;
 
-    W_CloseFile(wad_file);
+  w_close_file(wad_file);
 }
-
diff --git a/games/NXDoom/src/w_merge.h b/games/NXDoom/src/w_merge.h
index b88c9a3a1..ce580afc5 100644
--- a/games/NXDoom/src/w_merge.h
+++ b/games/NXDoom/src/w_merge.h
@@ -1,44 +1,56 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-// Handles merging of PWADs, similar to deutex's -merge option
-//
-// Ideally this should work exactly the same as in deutex, but trying to
-// read the deutex source code made my brain hurt.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/w_merge.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ * Handles merging of PWADs, similar to deutex's -merge option
+ *
+ * Ideally this should work exactly the same as in deutex, but trying to
+ * read the deutex source code made my brain hurt.
+ *
+ ****************************************************************************/
 
 #ifndef W_MERGE_H
 #define W_MERGE_H
 
-#define W_NWT_MERGE_SPRITES   0x1
-#define W_NWT_MERGE_FLATS     0x2
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Add a new WAD and merge it into the main directory
+#define W_NWT_MERGE_SPRITES 0x1
+#define W_NWT_MERGE_FLATS 0x2
 
-void W_MergeFile(const char *filename);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// NWT-style merging
+/* Add a new WAD and merge it into the main directory */
 
-void W_NWTMergeFile(const char *filename, int flags);
+void w_merge_file(const char *filename);
 
-// Acts the same as NWT's "-merge" option.
+/* NWT-style merging */
 
-void W_NWTDashMerge(const char *filename);
+void w_nwt_merge_file(const char *filename, int flags);
 
-// Debug function that prints the WAD directory.
+/* Acts the same as NWT's "-merge" option. */
 
-void W_PrintDirectory(void);
+void w_nwt_dash_merge(const char *filename);
 
-#endif /* #ifndef W_MERGE_H */
+/* Debug function that prints the WAD directory. */
 
+void w_print_directory(void);
+
+#endif /* W_MERGE_H */
diff --git a/games/NXDoom/src/w_wad.c b/games/NXDoom/src/w_wad.c
index 1b091834f..88c75ada5 100644
--- a/games/NXDoom/src/w_wad.c
+++ b/games/NXDoom/src/w_wad.c
@@ -1,23 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Handles WAD file header, directory, lump I/O.
-//
-
-
+/****************************************************************************
+ * apps/games/NXDoom/src/w_wad.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Handles WAD file header, directory, lump I/O.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdio.h>
@@ -35,595 +41,623 @@
 
 #include "w_wad.h"
 
-typedef PACKED_STRUCT (
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+begin_packed_struct struct wadinfo_t
 {
-    // Should be "IWAD" or "PWAD".
-    char		identification[4];
-    int			numlumps;
-    int			infotableofs;
-}) wadinfo_t;
+  /* Should be "IWAD" or "PWAD". */
 
+  char identification[4];
+  int numlumps;
+  int infotableofs;
+} end_packed_struct;
 
-typedef PACKED_STRUCT (
+typedef struct wadinfo_t wadinfo_t;
+
+begin_packed_struct struct filelump_t
 {
-    int			filepos;
-    int			size;
-    char		name[8];
-}) filelump_t;
+  int filepos;
+  int size;
+  char name[8];
+} end_packed_struct;
 
-//
-// GLOBALS
-//
+typedef struct filelump_t filelump_t;
 
-// Location of each lump on disk.
-lumpinfo_t **lumpinfo;
-unsigned int numlumps = 0;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Hash table for fast lookups */
 
-// Hash table for fast lookups
 static lumpindex_t *lumphash;
 
-// Variables for the reload hack: filename of the PWAD to reload, and the
-// lumps from WADs before the reload file, so we can resent numlumps and
-// load the file again.
+/* Variables for the reload hack: filename of the PWAD to reload, and the
+ * lumps from WADs before the reload file, so we can resent numlumps and
+ * load the file again.
+ */
+
 static wad_file_t *reloadhandle = NULL;
 static lumpinfo_t *reloadlumps = NULL;
 static char *reloadname = NULL;
 static int reloadlump = -1;
 
-// Hash function used for lump names.
-unsigned int W_LumpNameHash(const char *s)
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Location of each lump on disk. */
+
+lumpinfo_t **lumpinfo;
+unsigned int numlumps = 0;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Hash function used for lump names. */
+
+unsigned int w_lump_name_hash(const char *s)
 {
-    // This is the djb2 string hash function, modded to work on strings
-    // that have a maximum length of 8.
+  /* This is the djb2 string hash function, modded to work on strings
+   * that have a maximum length of 8.
+   */
 
-    unsigned int result = 5381;
-    unsigned int i;
+  unsigned int result = 5381;
+  unsigned int i;
 
-    for (i=0; i < 8 && s[i] != '\0'; ++i)
+  for (i = 0; i < 8 && s[i] != '\0'; ++i)
     {
-        result = ((result << 5) ^ result ) ^ toupper(s[i]);
+      result = ((result << 5) ^ result) ^ toupper(s[i]);
     }
 
-    return result;
+  return result;
 }
 
-//
-// LUMP BASED ROUTINES.
-//
+/* LUMP BASED ROUTINES. */
 
-//
-// W_AddFile
-// All files are optional, but at least one file must be
-//  found (PWAD, if all required lumps are present).
-// Files with a .wad extension are wadlink files
-//  with multiple lumps.
-// Other files are single lumps with the base filename
-//  for the lump name.
+/* w_add_file
+ *
+ * All files are optional, but at least one file must be found (PWAD, if all
+ * required lumps are present).
+ *
+ * Files with a .wad extension are wadlink files with multiple lumps.
+ *
+ * Other files are single lumps with the base filename for the lump name.
+ */
 
-wad_file_t *W_AddFile (const char *filename)
+wad_file_t *w_add_file(const char *filename)
 {
-    wadinfo_t header;
-    lumpindex_t i;
-    wad_file_t *wad_file;
-    int length;
-    int startlump;
-    filelump_t *fileinfo;
-    filelump_t *filerover;
-    lumpinfo_t *filelumps;
-    int numfilelumps;
+  wadinfo_t header;
+  lumpindex_t i;
+  wad_file_t *wad_file;
+  int length;
+  int startlump;
+  filelump_t *fileinfo;
+  filelump_t *filerover;
+  lumpinfo_t *filelumps;
+  int numfilelumps;
 
-    // If the filename begins with a ~, it indicates that we should use the
-    // reload hack.
-    if (filename[0] == '~')
+  /* If the filename begins with a ~, it indicates that we should use the
+   * reload hack.
+   */
+
+  if (filename[0] == '~')
     {
-        if (reloadname != NULL)
+      if (reloadname != NULL)
         {
-            I_Error("Prefixing a WAD filename with '~' indicates that the "
-                    "WAD should be reloaded\n"
-                    "on each level restart, for use by level authors for "
-                    "rapid development. You\n"
-                    "can only reload one WAD file, and it must be the last "
-                    "file in the -file list.");
+          i_error("Prefixing a WAD filename with '~' indicates that the "
+                  "WAD should be reloaded\n"
+                  "on each level restart, for use by level authors for "
+                  "rapid development. You\n"
+                  "can only reload one WAD file, and it must be the last "
+                  "file in the -file list.");
         }
 
-        reloadname = strdup(filename);
-        reloadlump = numlumps;
-        ++filename;
+      reloadname = strdup(filename);
+      reloadlump = numlumps;
+      ++filename;
     }
 
-    // Open the file and add to directory
-    wad_file = W_OpenFile(filename);
+  /* Open the file and add to directory */
 
-    if (wad_file == NULL)
+  wad_file = w_open_file(filename);
+
+  if (wad_file == NULL)
     {
-	printf (" couldn't open %s\n", filename);
-	return NULL;
+      printf(" couldn't open %s\n", filename);
+      return NULL;
     }
 
-    if (strcasecmp(filename+strlen(filename)-3 , "wad" ) )
+  if (strcasecmp(filename + strlen(filename) - 3, "wad"))
     {
-	// single lump file
+      /* single lump file */
 
-        // fraggle: Swap the filepos and size here.  The WAD directory
-        // parsing code expects a little-endian directory, so will swap
-        // them back.  Effectively we're constructing a "fake WAD directory"
-        // here, as it would appear on disk.
+      /* fraggle: Swap the filepos and size here.  The WAD directory
+       * parsing code expects a little-endian directory, so will swap
+       * them back.  Effectively we're constructing a "fake WAD directory"
+       * here, as it would appear on disk.
+       */
 
-	fileinfo = Z_Malloc(sizeof(filelump_t), PU_STATIC, 0);
-	fileinfo->filepos = LONG(0);
-	fileinfo->size = LONG(wad_file->length);
+      fileinfo = z_malloc(sizeof(filelump_t), PU_STATIC, 0);
+      fileinfo->filepos = LONG(0);
+      fileinfo->size = LONG(wad_file->length);
 
-        // Name the lump after the base of the filename (without the
-        // extension).
+      /* Name the lump after the base of the filename (without the
+       * extension).
+       */
 
-	M_ExtractFileBase (filename, fileinfo->name);
-	numfilelumps = 1;
+      m_extract_file_base(filename, fileinfo->name);
+      numfilelumps = 1;
     }
-    else
+  else
     {
-	// WAD file
-        W_Read(wad_file, 0, &header, sizeof(header));
+      /* WAD file */
 
-	if (strncmp(header.identification,"IWAD",4))
-	{
-	    // Homebrew levels?
-	    if (strncmp(header.identification,"PWAD",4))
-	    {
-		W_CloseFile(wad_file);
-		I_Error ("Wad file %s doesn't have IWAD "
-			 "or PWAD id\n", filename);
-	    }
+      w_read(wad_file, 0, &header, sizeof(header));
 
-	    // ???modifiedgame = true;
-	}
-
-	header.numlumps = LONG(header.numlumps);
-
-         // Vanilla Doom doesn't like WADs with more than 4046 lumps
-         // https://www.doomworld.com/vb/post/1010985
-         if (!strncmp(header.identification,"PWAD",4) && header.numlumps > 4046)
-         {
-                 W_CloseFile(wad_file);
-                 I_Error ("Error: Vanilla limit for lumps in a WAD is 4046, "
-                          "PWAD %s has %d", filename, header.numlumps);
-         }
-
-	header.infotableofs = LONG(header.infotableofs);
-	length = header.numlumps*sizeof(filelump_t);
-	fileinfo = Z_Malloc(length, PU_STATIC, 0);
-
-        W_Read(wad_file, header.infotableofs, fileinfo, length);
-	numfilelumps = header.numlumps;
-    }
-
-    // Increase size of numlumps array to accomodate the new file.
-    filelumps = calloc(numfilelumps, sizeof(lumpinfo_t));
-    if (filelumps == NULL)
-    {
-        W_CloseFile(wad_file);
-        I_Error("Failed to allocate array for lumps from new file.");
-    }
-
-    startlump = numlumps;
-    numlumps += numfilelumps;
-    lumpinfo = I_Realloc(lumpinfo, numlumps * sizeof(lumpinfo_t *));
-    filerover = fileinfo;
-
-    for (i = startlump; i < numlumps; ++i)
-    {
-        lumpinfo_t *lump_p = &filelumps[i - startlump];
-        lump_p->wad_file = wad_file;
-        lump_p->position = LONG(filerover->filepos);
-        lump_p->size = LONG(filerover->size);
-        lump_p->cache = NULL;
-        strncpy(lump_p->name, filerover->name, 8);
-        lumpinfo[i] = lump_p;
-
-        ++filerover;
-    }
-
-    Z_Free(fileinfo);
-
-    if (lumphash != NULL)
-    {
-        Z_Free(lumphash);
-        lumphash = NULL;
-    }
-
-    // If this is the reload file, we need to save some details about the
-    // file so that we can close it later on when we do a reload.
-    if (reloadname)
-    {
-        reloadhandle = wad_file;
-        reloadlumps = filelumps;
-    }
-
-    return wad_file;
-}
-
-
-
-//
-// W_NumLumps
-//
-int W_NumLumps (void)
-{
-    return numlumps;
-}
-
-
-
-//
-// W_CheckNumForName
-// Returns -1 if name not found.
-//
-
-lumpindex_t W_CheckNumForName(const char *name)
-{
-    lumpindex_t i;
-
-    // Do we have a hash table yet?
-
-    if (lumphash != NULL)
-    {
-        int hash;
-
-        // We do! Excellent.
-
-        hash = W_LumpNameHash(name) % numlumps;
-
-        for (i = lumphash[hash]; i != -1; i = lumpinfo[i]->next)
+      if (strncmp(header.identification, "IWAD", 4))
         {
-            if (!strncasecmp(lumpinfo[i]->name, name, 8))
+          /* Homebrew levels? */
+
+          if (strncmp(header.identification, "PWAD", 4))
             {
-                return i;
+              w_close_file(wad_file);
+              i_error("Wad file %s doesn't have IWAD "
+                      "or PWAD id\n",
+                      filename);
+            }
+
+          /* ???modifiedgame = true; */
+        }
+
+      header.numlumps = LONG(header.numlumps);
+
+      /* Vanilla Doom doesn't like WADs with more than 4046 lumps
+       * https://www.doomworld.com/vb/post/1010985
+       */
+
+      if (!strncmp(header.identification, "PWAD", 4) &&
+          header.numlumps > 4046)
+        {
+          w_close_file(wad_file);
+          i_error("Error: Vanilla limit for lumps in a WAD is 4046, "
+                  "PWAD %s has %d",
+                  filename, header.numlumps);
+        }
+
+      header.infotableofs = LONG(header.infotableofs);
+      length = header.numlumps * sizeof(filelump_t);
+      fileinfo = z_malloc(length, PU_STATIC, 0);
+
+      w_read(wad_file, header.infotableofs, fileinfo, length);
+      numfilelumps = header.numlumps;
+    }
+
+  /* Increase size of numlumps array to accommodate the new file. */
+
+  filelumps = calloc(numfilelumps, sizeof(lumpinfo_t));
+  if (filelumps == NULL)
+    {
+      w_close_file(wad_file);
+      i_error("Failed to allocate array for lumps from new file.");
+    }
+
+  startlump = numlumps;
+  numlumps += numfilelumps;
+  lumpinfo = i_realloc(lumpinfo, numlumps * sizeof(lumpinfo_t *));
+  filerover = fileinfo;
+
+  for (i = startlump; i < numlumps; ++i)
+    {
+      lumpinfo_t *lump_p = &filelumps[i - startlump];
+      lump_p->wad_file = wad_file;
+      lump_p->position = LONG(filerover->filepos);
+      lump_p->size = LONG(filerover->size);
+      lump_p->cache = NULL;
+      strncpy(lump_p->name, filerover->name, 8);
+      lumpinfo[i] = lump_p;
+
+      ++filerover;
+    }
+
+  z_free(fileinfo);
+
+  if (lumphash != NULL)
+    {
+      z_free(lumphash);
+      lumphash = NULL;
+    }
+
+  /* If this is the reload file, we need to save some details about the
+   * file so that we can close it later on when we do a reload.
+   */
+
+  if (reloadname)
+    {
+      reloadhandle = wad_file;
+      reloadlumps = filelumps;
+    }
+
+  return wad_file;
+}
+
+/* w_check_num_for_name
+ * Returns -1 if name not found.
+ */
+
+lumpindex_t w_check_num_for_name(const char *name)
+{
+  lumpindex_t i;
+
+  /* Do we have a hash table yet? */
+
+  if (lumphash != NULL)
+    {
+      int hash;
+
+      /* We do! Excellent. */
+
+      hash = w_lump_name_hash(name) % numlumps;
+
+      for (i = lumphash[hash]; i != -1; i = lumpinfo[i]->next)
+        {
+          if (!strncasecmp(lumpinfo[i]->name, name, 8))
+            {
+              return i;
             }
         }
     }
-    else
+  else
     {
-        // We don't have a hash table generate yet. Linear search :-(
-        //
-        // scan backwards so patch lump files take precedence
+      /* We don't have a hash table generate yet. Linear search :-(
+       *
+       * scan backwards so patch lump files take precedence
+       */
 
-        for (i = numlumps - 1; i >= 0; --i)
+      for (i = numlumps - 1; i >= 0; --i)
         {
-            if (!strncasecmp(lumpinfo[i]->name, name, 8))
+          if (!strncasecmp(lumpinfo[i]->name, name, 8))
             {
-                return i;
+              return i;
             }
         }
     }
 
-    // TFB. Not found.
+  /* TFB. Not found. */
 
-    return -1;
+  return -1;
 }
 
+/* w_get_num_for_name
+ * Calls w_check_num_for_name, but bombs out if not found.
+ */
 
-
-
-//
-// W_GetNumForName
-// Calls W_CheckNumForName, but bombs out if not found.
-//
-lumpindex_t W_GetNumForName(const char *name)
+lumpindex_t w_get_num_for_name(const char *name)
 {
-    lumpindex_t i;
+  lumpindex_t i;
 
-    i = W_CheckNumForName (name);
+  i = w_check_num_for_name(name);
 
-    if (i < 0)
+  if (i < 0)
     {
-        I_Error ("W_GetNumForName: %s not found!", name);
+      i_error("w_get_num_for_name: %s not found!", name);
     }
- 
-    return i;
+
+  return i;
 }
 
+/* w_lump_length
+ * Returns the buffer size needed to load the given lump.
+ */
 
-//
-// W_LumpLength
-// Returns the buffer size needed to load the given lump.
-//
-int W_LumpLength(lumpindex_t lump)
+int w_lump_length(lumpindex_t lump)
 {
-    if (lump >= numlumps)
+  if (lump >= numlumps)
     {
-	I_Error ("W_LumpLength: %i >= numlumps", lump);
+      i_error("w_lump_length: %i >= numlumps", lump);
     }
 
-    return lumpinfo[lump]->size;
+  return lumpinfo[lump]->size;
 }
 
+/* w_read_lump
+ * Loads the lump into the given buffer,
+ *  which must be >= w_lump_length().
+ */
 
-
-//
-// W_ReadLump
-// Loads the lump into the given buffer,
-//  which must be >= W_LumpLength().
-//
-void W_ReadLump(lumpindex_t lump, void *dest)
+void w_read_lump(lumpindex_t lump, void *dest)
 {
-    int c;
-    lumpinfo_t *l;
+  int c;
+  lumpinfo_t *l;
 
-    if (lump >= numlumps)
+  if (lump >= numlumps)
     {
-        I_Error ("W_ReadLump: %i >= numlumps", lump);
+      i_error("w_read_lump: %i >= numlumps", lump);
     }
 
-    l = lumpinfo[lump];
+  l = lumpinfo[lump];
 
-    V_BeginRead(l->size);
+  v_begin_read(l->size);
 
-    c = W_Read(l->wad_file, l->position, dest, l->size);
+  c = w_read(l->wad_file, l->position, dest, l->size);
 
-    if (c < l->size)
+  if (c < l->size)
     {
-        I_Error("W_ReadLump: only read %i of %i on lump %i",
-                c, l->size, lump);
+      i_error("w_read_lump: only read %i of %i on lump %i",
+              c, l->size, lump);
     }
 }
 
+/* w_cache_lump_num
+ *
+ * Load a lump into memory and return a pointer to a buffer containing
+ * the lump data.
+ *
+ * 'tag' is the type of zone memory buffer to allocate for the lump
+ * (usually PU_STATIC or PU_CACHE).  If the lump is loaded as
+ * PU_STATIC, it should be released back using w_release_lump_num
+ * when no longer needed (do not use z_change_tag).
+ */
 
-
-
-//
-// W_CacheLumpNum
-//
-// Load a lump into memory and return a pointer to a buffer containing
-// the lump data.
-//
-// 'tag' is the type of zone memory buffer to allocate for the lump
-// (usually PU_STATIC or PU_CACHE).  If the lump is loaded as 
-// PU_STATIC, it should be released back using W_ReleaseLumpNum
-// when no longer needed (do not use Z_ChangeTag).
-//
-
-void *W_CacheLumpNum(lumpindex_t lumpnum, int tag)
+void *w_cache_lump_num(lumpindex_t lumpnum, int tag)
 {
-    byte *result;
-    lumpinfo_t *lump;
+  byte *result;
+  lumpinfo_t *lump;
 
-    if ((unsigned)lumpnum >= numlumps)
+  if ((unsigned)lumpnum >= numlumps)
     {
-	I_Error ("W_CacheLumpNum: %i >= numlumps", lumpnum);
+      i_error("w_cache_lump_num: %i >= numlumps", lumpnum);
     }
 
-    lump = lumpinfo[lumpnum];
+  lump = lumpinfo[lumpnum];
 
-    // Get the pointer to return.  If the lump is in a memory-mapped
-    // file, we can just return a pointer to within the memory-mapped
-    // region.  If the lump is in an ordinary file, we may already
-    // have it cached; otherwise, load it into memory.
+  /* Get the pointer to return.  If the lump is in a memory-mapped
+   * file, we can just return a pointer to within the memory-mapped
+   * region.  If the lump is in an ordinary file, we may already
+   * have it cached; otherwise, load it into memory.
+   */
 
-    if (lump->wad_file->mapped != NULL)
+  if (lump->wad_file->mapped != NULL)
     {
-        // Memory mapped file, return from the mmapped region.
+      /* Memory mapped file, return from the mmapped region. */
 
-        result = lump->wad_file->mapped + lump->position;
+      result = lump->wad_file->mapped + lump->position;
     }
-    else if (lump->cache != NULL)
+  else if (lump->cache != NULL)
     {
-        // Already cached, so just switch the zone tag.
+      /* Already cached, so just switch the zone tag. */
 
-        result = lump->cache;
-        Z_ChangeTag(lump->cache, tag);
+      result = lump->cache;
+      z_change_tag(lump->cache, tag);
     }
-    else
+  else
     {
-        // Not yet loaded, so load it now
+      /* Not yet loaded, so load it now */
 
-        lump->cache = Z_Malloc(W_LumpLength(lumpnum), tag, &lump->cache);
-	W_ReadLump (lumpnum, lump->cache);
-        result = lump->cache;
+      lump->cache = z_malloc(w_lump_length(lumpnum), tag, &lump->cache);
+      w_read_lump(lumpnum, lump->cache);
+      result = lump->cache;
     }
-	
-    return result;
+
+  return result;
 }
 
+/* w_cache_lump_name */
 
-
-//
-// W_CacheLumpName
-//
-void *W_CacheLumpName(const char *name, int tag)
+void *w_cache_lump_name(const char *name, int tag)
 {
-    return W_CacheLumpNum(W_GetNumForName(name), tag);
+  return w_cache_lump_num(w_get_num_for_name(name), tag);
 }
 
-// 
-// Release a lump back to the cache, so that it can be reused later 
-// without having to read from disk again, or alternatively, discarded
-// if we run out of memory.
-//
-// Back in Vanilla Doom, this was just done using Z_ChangeTag 
-// directly, but now that we have WAD mmap, things are a bit more
-// complicated ...
-//
+/* Release a lump back to the cache, so that it can be reused later
+ * without having to read from disk again, or alternatively, discarded
+ * if we run out of memory.
+ *
+ * Back in Vanilla Doom, this was just done using z_change_tag
+ * directly, but now that we have WAD mmap, things are a bit more
+ * complicated ...
+ */
 
-void W_ReleaseLumpNum(lumpindex_t lumpnum)
+void w_release_lump_num(lumpindex_t lumpnum)
 {
-    lumpinfo_t *lump;
+  lumpinfo_t *lump;
 
-    if ((unsigned)lumpnum >= numlumps)
+  if ((unsigned)lumpnum >= numlumps)
     {
-	I_Error ("W_ReleaseLumpNum: %i >= numlumps", lumpnum);
+      i_error("w_release_lump_num: %i >= numlumps", lumpnum);
     }
 
-    lump = lumpinfo[lumpnum];
+  lump = lumpinfo[lumpnum];
 
-    if (lump->wad_file->mapped != NULL)
+  if (lump->wad_file->mapped != NULL)
     {
-        // Memory-mapped file, so nothing needs to be done here.
+      /* Memory-mapped file, so nothing needs to be done here. */
     }
-    else
+  else
     {
-        Z_ChangeTag(lump->cache, PU_CACHE);
+      z_change_tag(lump->cache, PU_CACHE);
     }
 }
 
-void W_ReleaseLumpName(const char *name)
+void w_release_lump_name(const char *name)
 {
-    W_ReleaseLumpNum(W_GetNumForName(name));
+  w_release_lump_num(w_get_num_for_name(name));
 }
 
 #if 0
 
-//
-// W_Profile
-//
-int		info[2500][10];
-int		profilecount;
+/* w_profile */
 
-void W_Profile (void)
+int info[2500][10];
+int profilecount;
+
+void w_profile(void)
 {
-    int		i;
-    memblock_t*	block;
-    void*	ptr;
-    char	ch;
-    FILE*	f;
-    int		j;
-    char	name[9];
-	
-	
-    for (i=0 ; i<numlumps ; i++)
-    {	
-	ptr = lumpinfo[i].cache;
-	if (!ptr)
-	{
-	    ch = ' ';
-	    continue;
-	}
-	else
-	{
-	    block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
-	    if (block->tag < PU_PURGELEVEL)
-		ch = 'S';
-	    else
-		ch = 'P';
-	}
-	info[i][profilecount] = ch;
-    }
-    profilecount++;
-	
-    f = M_fopen ("waddump.txt","w");
-    name[8] = 0;
+  int i;
+  memblock_t *block;
+  void *ptr;
+  char ch;
+  FILE *f;
+  int j;
+  char name[9];
 
-    for (i=0 ; i<numlumps ; i++)
+  for (i = 0; i < numlumps; i++)
     {
-	memcpy (name,lumpinfo[i].name,8);
+      ptr = lumpinfo[i].cache;
+      if (!ptr)
+        {
+          ch = ' ';
+          continue;
+        }
+      else
+        {
+          block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
+          if (block->tag < PU_PURGELEVEL)
+            ch = 'S';
+          else
+            ch = 'P';
+        }
 
-	for (j=0 ; j<8 ; j++)
-	    if (!name[j])
-		break;
-
-	for ( ; j<8 ; j++)
-	    name[j] = ' ';
-
-	fprintf (f,"%s ",name);
-
-	for (j=0 ; j<profilecount ; j++)
-	    fprintf (f,"    %c",info[i][j]);
-
-	fprintf (f,"\n");
+      info[i][profilecount] = ch;
     }
-    fclose (f);
+
+  profilecount++;
+
+  f = fopen("waddump.txt", "w");
+  name[8] = 0;
+
+  for (i = 0; i < numlumps; i++)
+    {
+      memcpy(name, lumpinfo[i].name, 8);
+
+      for (j = 0; j < 8; j++)
+        {
+          if (!name[j])
+            {
+              break;
+            }
+        }
+
+      for (; j < 8; j++)
+        {
+          name[j] = ' ';
+        }
+
+      fprintf(f, "%s ", name);
+
+      for (j = 0; j < profilecount; j++)
+        {
+          fprintf(f, "    %c", info[i][j]);
+        }
+
+      fprintf(f, "\n");
+    }
+
+  fclose(f);
 }
-
-
 #endif
 
-// Generate a hash table for fast lookups
+/* Generate a hash table for fast lookups */
 
-void W_GenerateHashTable(void)
+void w_generate_hash_table(void)
 {
-    lumpindex_t i;
+  lumpindex_t i;
 
-    // Free the old hash table, if there is one:
-    if (lumphash != NULL)
+  /* Free the old hash table, if there is one: */
+
+  if (lumphash != NULL)
     {
-        Z_Free(lumphash);
+      z_free(lumphash);
     }
 
-    // Generate hash table
-    if (numlumps > 0)
-    {
-        lumphash = Z_Malloc(sizeof(lumpindex_t) * numlumps, PU_STATIC, NULL);
+  /* Generate hash table */
 
-        for (i = 0; i < numlumps; ++i)
+  if (numlumps > 0)
+    {
+      lumphash = z_malloc(sizeof(lumpindex_t) * numlumps, PU_STATIC, NULL);
+
+      for (i = 0; i < numlumps; ++i)
         {
-            lumphash[i] = -1;
+          lumphash[i] = -1;
         }
 
-        for (i = 0; i < numlumps; ++i)
+      for (i = 0; i < numlumps; ++i)
         {
-            unsigned int hash;
+          unsigned int hash;
 
-            hash = W_LumpNameHash(lumpinfo[i]->name) % numlumps;
+          hash = w_lump_name_hash(lumpinfo[i]->name) % numlumps;
 
-            // Hook into the hash table
+          /* Hook into the hash table */
 
-            lumpinfo[i]->next = lumphash[hash];
-            lumphash[hash] = i;
+          lumpinfo[i]->next = lumphash[hash];
+          lumphash[hash] = i;
         }
     }
 
-    // All done!
+  /* All done! */
 }
 
-// The Doom reload hack. The idea here is that if you give a WAD file to -file
-// prefixed with the ~ hack, that WAD file will be reloaded each time a new
-// level is loaded. This lets you use a level editor in parallel and make
-// incremental changes to the level you're working on without having to restart
-// the game after every change.
-// But: the reload feature is a fragile hack...
-void W_Reload(void)
-{
-    char *filename;
-    lumpindex_t i;
+/* The Doom reload hack. The idea here is that if you give a WAD file to
+ * -file prefixed with the ~ hack, that WAD file will be reloaded each time a
+ * new level is loaded. This lets you use a level editor in parallel and make
+ * incremental changes to the level you're working on without having to
+ * restart the game after every change. But: the reload feature is a fragile
+ * hack...
+ */
 
-    if (reloadname == NULL)
+void w_reload(void)
+{
+  char *filename;
+  lumpindex_t i;
+
+  if (reloadname == NULL)
     {
-        return;
+      return;
     }
 
-    // We must free any lumps being cached from the PWAD we're about to reload:
-    for (i = reloadlump; i < numlumps; ++i)
+  /* We must free any lumps being cached from the PWAD we're about to reload:
+   */
+
+  for (i = reloadlump; i < numlumps; ++i)
     {
-        if (lumpinfo[i]->cache != NULL)
+      if (lumpinfo[i]->cache != NULL)
         {
-            Z_Free(lumpinfo[i]->cache);
+          z_free(lumpinfo[i]->cache);
         }
     }
 
-    // Reset numlumps to remove the reload WAD file:
-    numlumps = reloadlump;
+  /* Reset numlumps to remove the reload WAD file: */
 
-    // Now reload the WAD file.
-    filename = reloadname;
+  numlumps = reloadlump;
 
-    W_CloseFile(reloadhandle);
-    free(reloadlumps);
+  /* Now reload the WAD file. */
 
-    reloadname = NULL;
-    reloadlump = -1;
-    reloadhandle = NULL;
-    W_AddFile(filename);
-    free(filename);
+  filename = reloadname;
 
-    // The WAD directory has changed, so we have to regenerate the
-    // fast lookup hashtable:
-    W_GenerateHashTable();
+  w_close_file(reloadhandle);
+  free(reloadlumps);
+
+  reloadname = NULL;
+  reloadlump = -1;
+  reloadhandle = NULL;
+  w_add_file(filename);
+  free(filename);
+
+  /* The WAD directory has changed, so we have to regenerate the
+   * fast lookup hashtable:
+   */
+
+  w_generate_hash_table();
 }
 
-const char *W_WadNameForLump(const lumpinfo_t *lump)
+const char *w_wad_name_for_lump(const lumpinfo_t *lump)
 {
-	return M_BaseName(lump->wad_file->path);
+  return m_base_name(lump->wad_file->path);
 }
 
-boolean W_IsIWADLump(const lumpinfo_t *lump)
+boolean w_is_iwad_lump(const lumpinfo_t *lump)
 {
-	return lump->wad_file == lumpinfo[0]->wad_file;
+  return lump->wad_file == lumpinfo[0]->wad_file;
 }
diff --git a/games/NXDoom/src/w_wad.h b/games/NXDoom/src/w_wad.h
index ae5977a27..867ac5add 100644
--- a/games/NXDoom/src/w_wad.h
+++ b/games/NXDoom/src/w_wad.h
@@ -1,78 +1,91 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	WAD I/O functions.
-//
-
+/****************************************************************************
+ * apps/games/NXDoom/src/w_wad.h
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  WAD I/O functions.
+ *
+ ****************************************************************************/
 
 #ifndef __W_WAD__
 #define __W_WAD__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <stdio.h>
 
 #include "doomtype.h"
 #include "w_file.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-//
-// TYPES
-//
-
-//
-// WADFILE I/O related stuff.
-//
+/* WADFILE I/O related stuff. */
 
 typedef struct lumpinfo_s lumpinfo_t;
 typedef int lumpindex_t;
 
 struct lumpinfo_s
 {
-    char	name[8];
-    wad_file_t *wad_file;
-    int		position;
-    int		size;
-    void       *cache;
+  char name[8];
+  wad_file_t *wad_file;
+  int position;
+  int size;
+  void *cache;
 
-    // Used for hash table lookups
-    lumpindex_t next;
+  /* Used for hash table lookups */
+
+  lumpindex_t next;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 extern lumpinfo_t **lumpinfo;
 extern unsigned int numlumps;
 
-wad_file_t *W_AddFile(const char *filename);
-void W_Reload(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-lumpindex_t W_CheckNumForName(const char *name);
-lumpindex_t W_GetNumForName(const char *name);
+wad_file_t *w_add_file(const char *filename);
+void w_reload(void);
 
-int W_LumpLength(lumpindex_t lump);
-void W_ReadLump(lumpindex_t lump, void *dest);
+lumpindex_t w_check_num_for_name(const char *name);
+lumpindex_t w_get_num_for_name(const char *name);
 
-void *W_CacheLumpNum(lumpindex_t lump, int tag);
-void *W_CacheLumpName(const char *name, int tag);
+int w_lump_length(lumpindex_t lump);
+void w_read_lump(lumpindex_t lump, void *dest);
 
-void W_GenerateHashTable(void);
+void *w_cache_lump_num(lumpindex_t lump, int tag);
+void *w_cache_lump_name(const char *name, int tag);
 
-extern unsigned int W_LumpNameHash(const char *s);
+void w_generate_hash_table(void);
 
-void W_ReleaseLumpNum(lumpindex_t lump);
-void W_ReleaseLumpName(const char *name);
+extern unsigned int w_lump_name_hash(const char *s);
 
-const char *W_WadNameForLump(const lumpinfo_t *lump);
-boolean W_IsIWADLump(const lumpinfo_t *lump);
+void w_release_lump_num(lumpindex_t lump);
+void w_release_lump_name(const char *name);
 
-#endif
+const char *w_wad_name_for_lump(const lumpinfo_t *lump);
+boolean w_is_iwad_lump(const lumpinfo_t *lump);
+
+#endif /* __W_WAD_H__ */
diff --git a/games/NXDoom/src/z_native.c b/games/NXDoom/src/z_native.c
index c7f8f3cd5..3d962bbd0 100644
--- a/games/NXDoom/src/z_native.c
+++ b/games/NXDoom/src/z_native.c
@@ -1,506 +1,556 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Zone Memory Allocation. Neat.
-//
-//	This is an implementation of the zone memory API which
-//	uses native calls to malloc() and free().
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/z_native.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Zone Memory Allocation. Neat.
+ *
+ *  This is an implementation of the zone memory API which
+ *  uses native calls to malloc() and free().
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "z_zone.h"
-#include "i_system.h"
 #include "doomtype.h"
+#include "i_system.h"
+#include "z_zone.h"
 
-#define ZONEID	0x1d4a11
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define ZONEID 0x1d4a11
+
+#ifdef TESTING
+#define malloc test_malloc
+#define free test_free
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef struct memblock_s memblock_t;
 
 struct memblock_s
 {
-    int id; // = ZONEID
-    int tag;
-    int size;
-    void **user;
-    memblock_t *prev;
-    memblock_t *next;
+  int id; /* = ZONEID */
+  int tag;
+  int size;
+  void **user;
+  memblock_t *prev;
+  memblock_t *next;
 };
 
-// Linked list of allocated blocks for each tag type
- 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Linked list of allocated blocks for each tag type */
+
 static memblock_t *allocated_blocks[PU_NUM_TAGS];
 
 #ifdef TESTING
-
 static int test_malloced = 0;
+#endif
 
-void *test_malloc(size_t size)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: z_insert_block
+ *
+ * Description:
+ *  Add a block into the linked list for its type.
+ *
+ ****************************************************************************/
+
+static void z_insert_block(memblock_t *block)
 {
-    int *result;
+  block->prev = NULL;
+  block->next = allocated_blocks[block->tag];
+  allocated_blocks[block->tag] = block;
 
-    if (test_malloced + size > 2 * 1024 * 1024)
+  if (block->next != NULL)
     {
-        return NULL;
+      block->next->prev = block;
+    }
+}
+
+/****************************************************************************
+ * Name: z_insert_block
+ *
+ * Description:
+ *  Remove a block from its linked list.
+ *
+ ****************************************************************************/
+
+static void z_remove_block(memblock_t *block)
+{
+  /* Unlink from list */
+
+  if (block->prev == NULL)
+    {
+      /* Start of list */
+
+      allocated_blocks[block->tag] = block->next;
+    }
+  else
+    {
+      if (block->prev->next != block)
+        {
+          i_error("Z_RemoveBlock: Doubly-linked list corrupted!");
+        }
+
+      block->prev->next = block->next;
     }
 
-    test_malloced += size;
+  if (block->next != NULL)
+    {
+      if (block->next->prev != block)
+        {
+          i_error("Z_RemoveBlock: Doubly-linked list corrupted!");
+        }
 
-    result = malloc(size + sizeof(int));
+      block->next->prev = block->prev;
+    }
+}
 
-    *result = size;
+/****************************************************************************
+ * Name: clear_cache
+ *
+ * Description:
+ *  Empty data from the cache list to allocate enough data of the size
+ *  required.
+ *
+ * Return:
+ *  Returns true if any blocks were freed.
+ *
+ ****************************************************************************/
 
-    return result + 1;
+static boolean clear_cache(int size)
+{
+  memblock_t *block;
+  memblock_t *next_block;
+  int remaining;
+
+  block = allocated_blocks[PU_CACHE];
+
+  if (block == NULL)
+    {
+      /* Cache is already empty. */
+
+      return false;
+    }
+
+  /* Search to the end of the PU_CACHE list.  The blocks at the end
+   * of the list are the ones that have been free for longer and
+   * are more likely to be unneeded now.
+   */
+
+  while (block->next != NULL)
+    {
+      block = block->next;
+    }
+
+  /* Search backwards through the list freeing blocks until we have
+   * freed the amount of memory required.
+   */
+
+  remaining = size;
+
+  while (remaining > 0)
+    {
+      if (block == NULL)
+        {
+          break; /* No blocks left to free; we've done our best. */
+        }
+
+      next_block = block->prev;
+
+      z_remove_block(block);
+
+      remaining -= block->size;
+
+      if (block->user)
+        {
+          *block->user = NULL;
+        }
+
+      free(block);
+
+      block = next_block;
+    }
+
+  return true;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#ifdef TESTING
+void *test_malloc(size_t size)
+{
+  int *result;
+
+  if (test_malloced + size > 2 * 1024 * 1024)
+    {
+      return NULL;
+    }
+
+  test_malloced += size;
+
+  result = malloc(size + sizeof(int));
+
+  *result = size;
+
+  return result + 1;
 }
 
 void test_free(void *data)
 {
-    int *i;
+  int *i;
 
-    i = ((int *) data) - 1;
+  i = ((int *)data) - 1;
 
-    test_malloced -= *i;
+  test_malloced -= *i;
 
-    free(i);
+  free(i);
 }
-
-#define malloc test_malloc
-#define free test_free
-
 #endif /* #ifdef TESTING */
 
+/****************************************************************************
+ * Name: z_init
+ ****************************************************************************/
 
-// Add a block into the linked list for its type.
-
-static void Z_InsertBlock(memblock_t *block)
+void z_init(void)
 {
-    block->prev = NULL;
-    block->next = allocated_blocks[block->tag];
-    allocated_blocks[block->tag] = block;
-    
-    if (block->next != NULL)
-    {
-        block->next->prev = block;
-    }
+  memset(allocated_blocks, 0, sizeof(allocated_blocks));
+  printf("zone memory: Using native C allocator.\n");
 }
 
-// Remove a block from its linked list.
+/****************************************************************************
+ * Name: z_free
+ ****************************************************************************/
 
-static void Z_RemoveBlock(memblock_t *block)
+void z_free(void *ptr)
 {
-    // Unlink from list
+  memblock_t *block;
 
-    if (block->prev == NULL)
-    {
-        // Start of list
+  block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
 
-        allocated_blocks[block->tag] = block->next;
-    }
-    else
+  if (block->id != ZONEID)
     {
-        if (block->prev->next != block)
-        {
-            I_Error("Z_RemoveBlock: Doubly-linked list corrupted!");
-        }
-        block->prev->next = block->next;
+      i_error("z_free: freed a pointer without ZONEID");
     }
 
-    if (block->next != NULL)
+  if (block->tag != PU_FREE && block->user != NULL)
     {
-        if (block->next->prev != block)
-        {
-            I_Error("Z_RemoveBlock: Doubly-linked list corrupted!");
-        }
-        block->next->prev = block->prev;
+      /* clear the user's mark */
+
+      *block->user = NULL;
     }
+
+  z_remove_block(block);
+
+  /* Free back to system */
+
+  free(block);
 }
 
-//
-// Z_Init
-//
-void Z_Init (void)
+/****************************************************************************
+ * Name: z_malloc
+ *
+ * Description:
+ *  You can pass a NULL user if the tag is < PU_PURGELEVEL.
+ *
+ * Return:
+ *   The translated key code.
+ *
+ ****************************************************************************/
+
+void *z_malloc(int size, int tag, void *user)
 {
-    memset(allocated_blocks, 0, sizeof(allocated_blocks));
-    printf("zone memory: Using native C allocator.\n");
-}
+  memblock_t *newblock;
+  unsigned char *data;
+  void *result;
 
-
-//
-// Z_Free
-//
-void Z_Free (void* ptr)
-{
-    memblock_t*		block;
-
-    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
-
-    if (block->id != ZONEID)
+  if (tag < 0 || tag >= PU_NUM_TAGS || tag == PU_FREE)
     {
-        I_Error ("Z_Free: freed a pointer without ZONEID");
-    }
-		
-    if (block->tag != PU_FREE && block->user != NULL)
-    {
-        // clear the user's mark
-
-        *block->user = NULL;
+      i_error("z_malloc: attempted to allocate a block with an invalid "
+              "tag: %i",
+              tag);
     }
 
-    Z_RemoveBlock(block);
-
-    // Free back to system
-
-    free(block);
-}
-
-// Empty data from the cache list to allocate enough data of the size
-// required.
-//
-// Returns true if any blocks were freed.
-
-static boolean ClearCache(int size)
-{
-    memblock_t *block;
-    memblock_t *next_block;
-    int remaining;
-
-    block = allocated_blocks[PU_CACHE];
-
-    if (block == NULL)
+  if (user == NULL && tag >= PU_PURGELEVEL)
     {
-        // Cache is already empty.
-
-        return false;
+      i_error("z_malloc: an owner is required for purgeable blocks");
     }
 
-    // Search to the end of the PU_CACHE list.  The blocks at the end
-    // of the list are the ones that have been free for longer and
-    // are more likely to be unneeded now.
+  /* Malloc a block of the required size */
 
-    while (block->next != NULL)
+  newblock = NULL;
+
+  while (newblock == NULL)
     {
-        block = block->next;
-    }
+      newblock = (memblock_t *)malloc(sizeof(memblock_t) + size);
 
-    //printf("out of memory; cleaning out the cache: %i\n", test_malloced);
-
-    // Search backwards through the list freeing blocks until we have
-    // freed the amount of memory required.
-
-    remaining = size;
-
-    while (remaining > 0)
-    {
-        if (block == NULL)
+      if (newblock == NULL)
         {
-            // No blocks left to free; we've done our best.
-  
-            break;
-        }
-
-        next_block = block->prev;
-
-        Z_RemoveBlock(block);
-
-        remaining -= block->size;
-
-        if (block->user)
-        {
-            *block->user = NULL;
-        }
-
-        free(block);
-
-        block = next_block;
-    }
-
-    return true;
-}
-
-//
-// Z_Malloc
-// You can pass a NULL user if the tag is < PU_PURGELEVEL.
-//
-
-void *Z_Malloc(int size, int tag, void *user)
-{
-    memblock_t *newblock;
-    unsigned char *data;
-    void *result;
-
-    if (tag < 0 || tag >= PU_NUM_TAGS || tag == PU_FREE)
-    {
-        I_Error("Z_Malloc: attempted to allocate a block with an invalid "
-                "tag: %i", tag);
-    }
-
-    if (user == NULL && tag >= PU_PURGELEVEL)
-    {
-        I_Error ("Z_Malloc: an owner is required for purgable blocks");
-    }
-
-    // Malloc a block of the required size
-    
-    newblock = NULL;
-
-    while (newblock == NULL)
-    {
-        newblock = (memblock_t *) malloc(sizeof(memblock_t) + size);
-
-        if (newblock == NULL)
-        {
-            if (!ClearCache(sizeof(memblock_t) + size))
+          if (!clear_cache(sizeof(memblock_t) + size))
             {
-                I_Error("Z_Malloc: failed on allocation of %i bytes", size);
+              i_error("z_malloc: failed on allocation of %i bytes", size);
             }
         }
     }
 
-    newblock->tag = tag;
-    
-    // Hook into the linked list for this tag type
+  newblock->tag = tag;
 
-    newblock->id = ZONEID;
-    newblock->user = user;
-    newblock->size = size;
+  /* Hook into the linked list for this tag type */
 
-    Z_InsertBlock(newblock);
+  newblock->id = ZONEID;
+  newblock->user = user;
+  newblock->size = size;
 
-    data = (unsigned char *) newblock;
-    result = data + sizeof(memblock_t);
+  z_insert_block(newblock);
 
-    if (user != NULL)
+  data = (unsigned char *)newblock;
+  result = data + sizeof(memblock_t);
+
+  if (user != NULL)
     {
-        *newblock->user = result;
+      *newblock->user = result;
     }
-    
-    return result;
+
+  return result;
 }
 
+/****************************************************************************
+ * Name: z_free_tags
+ ****************************************************************************/
 
-
-//
-// Z_FreeTags
-//
-
-void Z_FreeTags(int lowtag, int hightag)
+void z_free_tags(int lowtag, int hightag)
 {
-    int i;
+  int i;
 
-    for (i=lowtag; i<= hightag; ++i)
+  for (i = lowtag; i <= hightag; ++i)
     {
-        memblock_t *block;
-        memblock_t *next;
+      memblock_t *block;
+      memblock_t *next;
 
-        // Free all in this chain
+      /* Free all in this chain */
 
-        for (block=allocated_blocks[i]; block != NULL; )
+      for (block = allocated_blocks[i]; block != NULL; )
         {
-            next = block->next;
+          next = block->next;
 
-            // Free this block
+          /* Free this block */
 
-            if (block->user != NULL)
+          if (block->user != NULL)
             {
-                *block->user = NULL;
+              *block->user = NULL;
             }
-            
-            free(block);
 
-            // Jump to the next in the chain
+          free(block);
 
-            block = next;
+          /* Jump to the next in the chain */
+
+          block = next;
         }
 
-	// This chain is empty now
+      /* This chain is empty now */
 
-	allocated_blocks[i] = NULL;
+      allocated_blocks[i] = NULL;
     }
 }
 
+/****************************************************************************
+ * Name: z_dump_heap
+ ****************************************************************************/
 
-
-//
-// Z_DumpHeap
-//
-void Z_DumpHeap(int lowtag, int	hightag)
+void z_dump_heap(int lowtag, int hightag)
 {
-    // broken
+  /* WARN: broken */
 
 #if 0
-    memblock_t*	block;
-	
-    printf ("zone size: %i  location: %p\n",
-	    mainzone->size,mainzone);
-    
-    printf ("tag range: %i to %i\n",
-	    lowtag, hightag);
-	
-    for (block = mainzone->blocklist.next ; ; block = block->next)
+  memblock_t *block;
+
+  printf("zone size: %i  location: %p\n", mainzone->size, mainzone);
+
+  printf("tag range: %i to %i\n", lowtag, hightag);
+
+  for (block = mainzone->blocklist.next; ; block = block->next)
     {
-	if (block->tag >= lowtag && block->tag <= hightag)
-	    printf ("block:%p    size:%7i    user:%p    tag:%3i\n",
-		    block, block->size, block->user, block->tag);
-		
-	if (block->next == &mainzone->blocklist)
-	{
-	    // all blocks have been hit
-	    break;
-	}
-	
-	if ( (byte *)block + block->size != (byte *)block->next)
-	    printf ("ERROR: block size does not touch the next block\n");
+      if (block->tag >= lowtag && block->tag <= hightag)
+        printf("block:%p    size:%7i    user:%p    tag:%3i\n", block,
+               block->size, block->user, block->tag);
 
-	if ( block->next->prev != block)
-	    printf ("ERROR: next block doesn't have proper back link\n");
+      if (block->next == &mainzone->blocklist)
+        {
+          /* all blocks have been hit */
 
-	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
-	    printf ("ERROR: two consecutive free blocks\n");
+          break;
+        }
+
+      if ((byte *)block + block->size != (byte *)block->next)
+        printf("ERROR: block size does not touch the next block\n");
+
+      if (block->next->prev != block)
+        printf("ERROR: next block doesn't have proper back link\n");
+
+      if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+        printf("ERROR: two consecutive free blocks\n");
     }
 #endif
 }
 
+/****************************************************************************
+ * Name: z_file_dump_heap
+ ****************************************************************************/
 
-//
-// Z_FileDumpHeap
-//
-void Z_FileDumpHeap(FILE *f)
+void z_file_dump_heap(FILE *f)
 {
-    // broken
+  /* WARN: broken */
 #if 0
-    memblock_t*	block;
-	
-    fprintf (f,"zone size: %i  location: %p\n",mainzone->size,mainzone);
-	
-    for (block = mainzone->blocklist.next ; ; block = block->next)
+  memblock_t *block;
+
+  fprintf(f, "zone size: %i  location: %p\n", mainzone->size, mainzone);
+
+  for (block = mainzone->blocklist.next; ; block = block->next)
     {
-	fprintf (f,"block:%p    size:%7i    user:%p    tag:%3i\n",
-		 block, block->size, block->user, block->tag);
-		
-	if (block->next == &mainzone->blocklist)
-	{
-	    // all blocks have been hit
-	    break;
-	}
-	
-	if ( (byte *)block + block->size != (byte *)block->next)
-	    fprintf (f,"ERROR: block size does not touch the next block\n");
+      fprintf(f, "block:%p    size:%7i    user:%p    tag:%3i\n", block,
+              block->size, block->user, block->tag);
 
-	if ( block->next->prev != block)
-	    fprintf (f,"ERROR: next block doesn't have proper back link\n");
+      if (block->next == &mainzone->blocklist)
+        {
+          /* all blocks have been hit */
 
-	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
-	    fprintf (f,"ERROR: two consecutive free blocks\n");
+          break;
+        }
+
+      if ((byte *)block + block->size != (byte *)block->next)
+        fprintf(f, "ERROR: block size does not touch the next block\n");
+
+      if (block->next->prev != block)
+        fprintf(f, "ERROR: next block doesn't have proper back link\n");
+
+      if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+        fprintf(f, "ERROR: two consecutive free blocks\n");
     }
 #endif
 }
 
+/****************************************************************************
+ * Name: z_check_heap
+ ****************************************************************************/
 
-
-//
-// Z_CheckHeap
-//
-void Z_CheckHeap (void)
+void z_check_heap(void)
 {
-    memblock_t *block;
-    memblock_t *prev;
-    int i;
+  memblock_t *block;
+  memblock_t *prev;
+  int i;
 
-    // Check all chains
+  /* Check all chains */
 
-    for (i=0; i<PU_NUM_TAGS; ++i)
+  for (i = 0; i < PU_NUM_TAGS; ++i)
     {
-        prev = NULL;
+      prev = NULL;
 
-        for (block=allocated_blocks[i]; block != NULL; block = block->next)
+      for (block = allocated_blocks[i]; block != NULL; block = block->next)
         {
-            if (block->id != ZONEID)
+          if (block->id != ZONEID)
             {
-                I_Error("Z_CheckHeap: Block without a ZONEID!");
+              i_error("z_check_heap: Block without a ZONEID!");
             }
-            
-            if (block->prev != prev)
+
+          if (block->prev != prev)
             {
-                I_Error("Z_CheckHeap: Doubly-linked list corrupted!");
+              i_error("z_check_heap: Doubly-linked list corrupted!");
             }
-            
-            prev = block;
+
+          prev = block;
         }
     }
 }
 
+/****************************************************************************
+ * Name: z_change_tag2
+ ****************************************************************************/
 
-
-
-//
-// Z_ChangeTag
-//
-
-void Z_ChangeTag2(void *ptr, int tag, const char *file, int line)
+void z_change_tag2(void *ptr, int tag, const char *file, int line)
 {
-    memblock_t*	block;
-	
-    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+  memblock_t *block;
 
-    if (block->id != ZONEID)
-        I_Error("%s:%i: Z_ChangeTag: block without a ZONEID!",
-                file, line);
+  block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
 
-    if (tag >= PU_PURGELEVEL && block->user == NULL)
-        I_Error("%s:%i: Z_ChangeTag: an owner is required "
-                "for purgable blocks", file, line);
+  if (block->id != ZONEID)
+    i_error("%s:%i: z_change_tag: block without a ZONEID!", file, line);
 
-    // Remove the block from its current list, and rehook it into
-    // its new list.
+  if (tag >= PU_PURGELEVEL && block->user == NULL)
+    i_error("%s:%i: z_change_tag: an owner is required "
+            "for purgeable blocks",
+            file, line);
 
-    Z_RemoveBlock(block);
-    block->tag = tag;
-    Z_InsertBlock(block);
+  /* Remove the block from its current list, and rehook it into
+   * its new list.
+   */
+
+  z_remove_block(block);
+  block->tag = tag;
+  z_insert_block(block);
 }
 
-void Z_ChangeUser(void *ptr, void **user)
+void z_change_user(void *ptr, void **user)
 {
-    memblock_t*	block;
+  memblock_t *block;
 
-    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+  block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
 
-    if (block->id != ZONEID)
+  if (block->id != ZONEID)
     {
-        I_Error("Z_ChangeUser: Tried to change user for invalid block!");
+      i_error("z_change_user: Tried to change user for invalid block!");
     }
 
-    block->user = user;
-    *user = ptr;
+  block->user = user;
+  *user = ptr;
 }
 
+/****************************************************************************
+ * Name: z_free_memory
+ ****************************************************************************/
 
-//
-// Z_FreeMemory
-//
-
-int Z_FreeMemory(void)
+int z_free_memory(void)
 {
-    // Limited by the system??
-
-    return -1;
+  return -1; /* Limited by the system?? */
 }
 
-unsigned int Z_ZoneSize(void)
+/****************************************************************************
+ * Name: z_zone_size
+ ****************************************************************************/
+
+unsigned int z_zone_size(void)
 {
-    return 0;
+  return 0;
 }
-
diff --git a/games/NXDoom/src/z_zone.c b/games/NXDoom/src/z_zone.c
index c5c2dbf7c..f5274e334 100644
--- a/games/NXDoom/src/z_zone.c
+++ b/games/NXDoom/src/z_zone.c
@@ -1,20 +1,29 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//	Zone Memory Allocation. Neat.
-//
+/****************************************************************************
+ * apps/games/NXDoom/src/z_zone.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Zone Memory Allocation. Neat.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <string.h>
 
@@ -24,529 +33,525 @@
 
 #include "z_zone.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* ZONE MEMORY ALLOCATION
+ *
+ * There is never any space between memblocks,
+ *  and there will never be two contiguous free memblocks.
+ * The rover can be left pointing at a non-empty block.
+ *
+ * It is of no value to free a cacheable block,
+ *  because it will get overwritten automatically if needed.
+ */
 
-//
-// ZONE MEMORY ALLOCATION
-//
-// There is never any space between memblocks,
-//  and there will never be two contiguous free memblocks.
-// The rover can be left pointing at a non-empty block.
-//
-// It is of no value to free a cachable block,
-//  because it will get overwritten automatically if needed.
-// 
- 
 #define MEM_ALIGN sizeof(void *)
-#define ZONEID	0x1d4a11
+#define ZONEID 0x1d4a11
+
+#define MINFRAGMENT 64
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef struct memblock_s
 {
-    int			size;	// including the header and possibly tiny fragments
-    void**		user;
-    int			tag;	// PU_FREE if this is free
-    int			id;	// should be ZONEID
-    struct memblock_s*	next;
-    struct memblock_s*	prev;
+  int size; /* including the header and possibly tiny fragments */
+  void **user;
+  int tag; /* PU_FREE if this is free */
+  int id;  /* should be ZONEID */
+  struct memblock_s *next;
+  struct memblock_s *prev;
 } memblock_t;
 
-
 typedef struct
 {
-    // total bytes malloced, including header
-    int		size;
+  /* total bytes malloced, including header */
 
-    // start / end cap for linked list
-    memblock_t	blocklist;
-    
-    memblock_t*	rover;
-    
+  int size;
+
+  /* start / end cap for linked list */
+
+  memblock_t blocklist;
+
+  memblock_t *rover;
 } memzone_t;
 
-
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
 static memzone_t *mainzone;
 static boolean zero_on_free;
 static boolean scan_on_free;
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-//
-// Z_ClearZone
-//
-void Z_ClearZone (memzone_t* zone)
+/****************************************************************************
+ * Name: scan_for_block
+ *
+ * Description:
+ *  Scan the zone heap for pointers within the specified range, and warn
+ *  about any remaining pointers.
+ *
+ ****************************************************************************/
+
+static void scan_for_block(void *start, void *end)
 {
-    memblock_t*		block;
-	
-    // set the entire zone to one free block
-    zone->blocklist.next =
-	zone->blocklist.prev =
-	block = (memblock_t *)( (byte *)zone + sizeof(memzone_t) );
-    
-    zone->blocklist.user = (void *)zone;
-    zone->blocklist.tag = PU_STATIC;
-    zone->rover = block;
-	
-    block->prev = block->next = &zone->blocklist;
-    
-    // a free block.
-    block->tag = PU_FREE;
+  memblock_t *block;
+  void **mem;
+  int i;
+  int len;
+  int tag;
 
-    block->size = zone->size - sizeof(memzone_t);
-}
+  block = mainzone->blocklist.next;
 
-
-
-//
-// Z_Init
-//
-void Z_Init (void)
-{
-    memblock_t*	block;
-    int		size;
-
-    mainzone = (memzone_t *)I_ZoneBase (&size);
-    mainzone->size = size;
-
-    // set the entire zone to one free block
-    mainzone->blocklist.next =
-	mainzone->blocklist.prev =
-	block = (memblock_t *)( (byte *)mainzone + sizeof(memzone_t) );
-
-    mainzone->blocklist.user = (void *)mainzone;
-    mainzone->blocklist.tag = PU_STATIC;
-    mainzone->rover = block;
-
-    block->prev = block->next = &mainzone->blocklist;
-
-    // free block
-    block->tag = PU_FREE;
-
-    block->size = mainzone->size - sizeof(memzone_t);
-
-    // [Deliberately undocumented]
-    // Zone memory debugging flag. If set, memory is zeroed after it is freed
-    // to deliberately break any code that attempts to use it after free.
-    //
-    zero_on_free = M_ParmExists("-zonezero");
-
-    // [Deliberately undocumented]
-    // Zone memory debugging flag. If set, each time memory is freed, the zone
-    // heap is scanned to look for remaining pointers to the freed block.
-    //
-    scan_on_free = M_ParmExists("-zonescan");
-}
-
-// Scan the zone heap for pointers within the specified range, and warn about
-// any remaining pointers.
-static void ScanForBlock(void *start, void *end)
-{
-    memblock_t *block;
-    void **mem;
-    int i, len, tag;
-
-    block = mainzone->blocklist.next;
-
-    while (block->next != &mainzone->blocklist)
+  while (block->next != &mainzone->blocklist)
     {
-        tag = block->tag;
+      tag = block->tag;
 
-        if (tag == PU_STATIC || tag == PU_LEVEL || tag == PU_LEVSPEC)
+      if (tag == PU_STATIC || tag == PU_LEVEL || tag == PU_LEVSPEC)
         {
-            // Scan for pointers on the assumption that pointers are aligned
-            // on word boundaries (word size depending on pointer size):
-            mem = (void **) ((byte *) block + sizeof(memblock_t));
-            len = (block->size - sizeof(memblock_t)) / sizeof(void *);
+          /* Scan for pointers on the assumption that pointers are aligned
+           * on word boundaries (word size depending on pointer size):
+           */
 
-            for (i = 0; i < len; ++i)
+          mem = (void **)((byte *)block + sizeof(memblock_t));
+          len = (block->size - sizeof(memblock_t)) / sizeof(void *);
+
+          for (i = 0; i < len; ++i)
             {
-                if (start <= mem[i] && mem[i] <= end)
+              if (start <= mem[i] && mem[i] <= end)
                 {
-                    fprintf(stderr,
-                            "%p has dangling pointer into freed block "
-                            "%p (%p -> %p)\n",
-                            mem, start, &mem[i], mem[i]);
+                  fprintf(stderr,
+                          "%p has dangling pointer into freed block "
+                          "%p (%p -> %p)\n",
+                          mem, start, &mem[i], mem[i]);
                 }
             }
         }
 
-        block = block->next;
+      block = block->next;
     }
 }
 
-//
-// Z_Free
-//
-void Z_Free (void* ptr)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: z_init
+ ****************************************************************************/
+
+void z_init(void)
 {
-    memblock_t*		block;
-    memblock_t*		other;
+  memblock_t *block;
+  int size;
 
-    block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
+  mainzone = (memzone_t *)i_zone_base(&size);
+  mainzone->size = size;
 
-    if (block->id != ZONEID)
-	I_Error ("Z_Free: freed a pointer without ZONEID");
+  /* set the entire zone to one free block */
 
-    if (block->tag != PU_FREE && block->user != NULL)
+  mainzone->blocklist.next = mainzone->blocklist.prev = block =
+      (memblock_t *)((byte *)mainzone + sizeof(memzone_t));
+
+  mainzone->blocklist.user = (void *)mainzone;
+  mainzone->blocklist.tag = PU_STATIC;
+  mainzone->rover = block;
+
+  block->prev = block->next = &mainzone->blocklist;
+
+  block->tag = PU_FREE; /* free block */
+
+  block->size = mainzone->size - sizeof(memzone_t);
+
+  /* [Deliberately undocumented]
+   * Zone memory debugging flag. If set, memory is zeroed after it is freed
+   * to deliberately break any code that attempts to use it after free.
+   */
+
+  zero_on_free = m_parm_exists("-zonezero");
+
+  /* [Deliberately undocumented]
+   * Zone memory debugging flag. If set, each time memory is freed, the zone
+   * heap is scanned to look for remaining pointers to the freed block.
+   */
+
+  scan_on_free = m_parm_exists("-zonescan");
+}
+
+/****************************************************************************
+ * Name: z_free
+ ****************************************************************************/
+
+void z_free(void *ptr)
+{
+  memblock_t *block;
+  memblock_t *other;
+
+  block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
+
+  if (block->id != ZONEID) i_error("z_free: freed a pointer without ZONEID");
+
+  if (block->tag != PU_FREE && block->user != NULL)
     {
-    	// clear the user's mark
-	    *block->user = 0;
+      *block->user = 0; /* clear the user's mark */
     }
 
-    // mark as free
-    block->tag = PU_FREE;
-    block->user = NULL;
-    block->id = 0;
+  /* mark as free */
 
-    // If the -zonezero flag is provided, we zero out the block on free
-    // to break code that depends on reading freed memory.
-    if (zero_on_free)
+  block->tag = PU_FREE;
+  block->user = NULL;
+  block->id = 0;
+
+  /* If the -zonezero flag is provided, we zero out the block on free
+   * to break code that depends on reading freed memory.
+   */
+
+  if (zero_on_free)
     {
-        memset(ptr, 0, block->size - sizeof(memblock_t));
-    }
-    if (scan_on_free)
-    {
-        ScanForBlock(ptr,
-                     (byte *) ptr + block->size - sizeof(memblock_t));
+      memset(ptr, 0, block->size - sizeof(memblock_t));
     }
 
-    other = block->prev;
-
-    if (other->tag == PU_FREE)
+  if (scan_on_free)
     {
-        // merge with previous free block
-        other->size += block->size;
-        other->next = block->next;
-        other->next->prev = other;
-
-        if (block == mainzone->rover)
-            mainzone->rover = other;
-
-        block = other;
+      scan_for_block(ptr, (byte *)ptr + block->size - sizeof(memblock_t));
     }
 
-    other = block->next;
-    if (other->tag == PU_FREE)
-    {
-        // merge the next free block onto the end
-        block->size += other->size;
-        block->next = other->next;
-        block->next->prev = block;
+  other = block->prev;
 
-        if (other == mainzone->rover)
-            mainzone->rover = block;
+  if (other->tag == PU_FREE)
+    {
+      /* merge with previous free block */
+
+      other->size += block->size;
+      other->next = block->next;
+      other->next->prev = other;
+
+      if (block == mainzone->rover) mainzone->rover = other;
+
+      block = other;
+    }
+
+  other = block->next;
+  if (other->tag == PU_FREE)
+    {
+      /* merge with previous free block */
+
+      block->size += other->size;
+      block->next = other->next;
+      block->next->prev = block;
+
+      if (other == mainzone->rover) mainzone->rover = block;
     }
 }
 
+/****************************************************************************
+ * Name: z_malloc
+ *
+ * Description:
+ *  You can pass a NULL user if the tag is < PU_PURGELEVEL.
+ *
+ ****************************************************************************/
 
-
-//
-// Z_Malloc
-// You can pass a NULL user if the tag is < PU_PURGELEVEL.
-//
-#define MINFRAGMENT		64
-
-
-void*
-Z_Malloc
-( int		size,
-  int		tag,
-  void*		user )
+void *z_malloc(int size, int tag, void *user)
 {
-    int		extra;
-    memblock_t*	start;
-    memblock_t* rover;
-    memblock_t* newblock;
-    memblock_t*	base;
-    void *result;
+  int extra;
+  memblock_t *start;
+  memblock_t *rover;
+  memblock_t *newblock;
+  memblock_t *base;
+  void *result;
 
-    size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
-    
-    // scan through the block list,
-    // looking for the first free block
-    // of sufficient size,
-    // throwing out any purgable blocks along the way.
+  size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
 
-    // account for size of block header
-    size += sizeof(memblock_t);
-    
-    // if there is a free block behind the rover,
-    //  back up over them
-    base = mainzone->rover;
-    
-    if (base->prev->tag == PU_FREE)
-        base = base->prev;
-	
-    rover = base;
-    start = base->prev;
-	
-    do
+  /* scan through the block list, looking for the first free block of
+   * sufficient size, throwing out any purgeable blocks along the way.
+   */
+
+  /* account for size of block header */
+
+  size += sizeof(memblock_t);
+
+  /* if there is a free block behind the rover, back up over them */
+
+  base = mainzone->rover;
+
+  if (base->prev->tag == PU_FREE) base = base->prev;
+
+  rover = base;
+  start = base->prev;
+
+  do
     {
-        if (rover == start)
+      if (rover == start)
         {
-            // scanned all the way around the list
-            I_Error ("Z_Malloc: failed on allocation of %i bytes", size);
+          /* scanned all the way around the list */
+
+          i_error("z_malloc: failed on allocation of %i bytes", size);
         }
-	
-        if (rover->tag != PU_FREE)
-        {
-            if (rover->tag < PU_PURGELEVEL)
-            {
-                // hit a block that can't be purged,
-                // so move base past it
-                base = rover = rover->next;
-            }
-            else
-            {
-                // free the rover block (adding the size to base)
 
-                // the rover can be the base block
-                base = base->prev;
-                Z_Free ((byte *)rover+sizeof(memblock_t));
-                base = base->next;
-                rover = base->next;
+      if (rover->tag != PU_FREE)
+        {
+          if (rover->tag < PU_PURGELEVEL)
+            {
+              /* hit a block that can't be purged, so move base past it */
+
+              base = rover = rover->next;
+            }
+          else
+            {
+              /* free the rover block (adding the size to base) the rover can
+               * be the base block
+               */
+
+              base = base->prev;
+              z_free((byte *)rover + sizeof(memblock_t));
+              base = base->next;
+              rover = base->next;
             }
         }
-        else
+      else
         {
-            rover = rover->next;
+          rover = rover->next;
+        }
+    }
+  while (base->tag != PU_FREE || base->size < size);
+
+  /* found a block big enough */
+
+  extra = base->size - size;
+
+  if (extra > MINFRAGMENT)
+    {
+      /* there will be a free fragment after the allocated block */
+
+      newblock = (memblock_t *)((byte *)base + size);
+      newblock->size = extra;
+
+      newblock->tag = PU_FREE;
+      newblock->user = NULL;
+      newblock->prev = base;
+      newblock->next = base->next;
+      newblock->next->prev = newblock;
+
+      base->next = newblock;
+      base->size = size;
+    }
+
+  if (user == NULL && tag >= PU_PURGELEVEL)
+    i_error("z_malloc: an owner is required for purgeable blocks");
+
+  base->user = user;
+  base->tag = tag;
+
+  result = (void *)((byte *)base + sizeof(memblock_t));
+
+  if (base->user)
+    {
+      *base->user = result;
+    }
+
+  /* next allocation will start looking here */
+
+  mainzone->rover = base->next;
+
+  base->id = ZONEID;
+
+  return result;
+}
+
+/****************************************************************************
+ * Name: z_free_tags
+ ****************************************************************************/
+
+void z_free_tags(int lowtag, int hightag)
+{
+  memblock_t *block;
+  memblock_t *next;
+
+  for (block = mainzone->blocklist.next; block != &mainzone->blocklist;
+       block = next)
+    {
+      /* get link before freeing */
+
+      next = block->next;
+
+      /* free block? */
+
+      if (block->tag == PU_FREE) continue;
+
+      if (block->tag >= lowtag && block->tag <= hightag)
+        z_free((byte *)block + sizeof(memblock_t));
+    }
+}
+
+/****************************************************************************
+ * Name: z_dump_heap
+ *
+ * Description:
+ *  Note: TFileDumpHeap( stdout ) ?
+ *
+ ****************************************************************************/
+
+void z_dump_heap(int lowtag, int hightag)
+{
+  memblock_t *block;
+
+  printf("zone size: %i  location: %p\n", mainzone->size, mainzone);
+
+  printf("tag range: %i to %i\n", lowtag, hightag);
+
+  for (block = mainzone->blocklist.next; ; block = block->next)
+    {
+      if (block->tag >= lowtag && block->tag <= hightag)
+        printf("block:%p    size:%7i    user:%p    tag:%3i\n", block,
+               block->size, block->user, block->tag);
+
+      if (block->next == &mainzone->blocklist)
+        {
+          break; /* all blocks have been hit */
         }
 
-    } while (base->tag != PU_FREE || base->size < size);
+      if ((byte *)block + block->size != (byte *)block->next)
+        printf("ERROR: block size does not touch the next block\n");
 
-    
-    // found a block big enough
-    extra = base->size - size;
-    
-    if (extra >  MINFRAGMENT)
-    {
-        // there will be a free fragment after the allocated block
-        newblock = (memblock_t *) ((byte *)base + size );
-        newblock->size = extra;
-	
-        newblock->tag = PU_FREE;
-        newblock->user = NULL;	
-        newblock->prev = base;
-        newblock->next = base->next;
-        newblock->next->prev = newblock;
+      if (block->next->prev != block)
+        printf("ERROR: next block doesn't have proper back link\n");
 
-        base->next = newblock;
-        base->size = size;
-    }
-	
-	if (user == NULL && tag >= PU_PURGELEVEL)
-	    I_Error ("Z_Malloc: an owner is required for purgable blocks");
-
-    base->user = user;
-    base->tag = tag;
-
-    result  = (void *) ((byte *)base + sizeof(memblock_t));
-
-    if (base->user)
-    {
-        *base->user = result;
-    }
-
-    // next allocation will start looking here
-    mainzone->rover = base->next;	
-	
-    base->id = ZONEID;
-   
-    return result;
-}
-
-
-
-//
-// Z_FreeTags
-//
-void
-Z_FreeTags
-( int		lowtag,
-  int		hightag )
-{
-    memblock_t*	block;
-    memblock_t*	next;
-	
-    for (block = mainzone->blocklist.next ;
-	 block != &mainzone->blocklist ;
-	 block = next)
-    {
-	// get link before freeing
-	next = block->next;
-
-	// free block?
-	if (block->tag == PU_FREE)
-	    continue;
-	
-	if (block->tag >= lowtag && block->tag <= hightag)
-	    Z_Free ( (byte *)block+sizeof(memblock_t));
+      if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+        printf("ERROR: two consecutive free blocks\n");
     }
 }
 
+/****************************************************************************
+ * Name: z_file_dump_heap
+ ****************************************************************************/
 
-
-//
-// Z_DumpHeap
-// Note: TFileDumpHeap( stdout ) ?
-//
-void
-Z_DumpHeap
-( int		lowtag,
-  int		hightag )
+void z_file_dump_heap(FILE *f)
 {
-    memblock_t*	block;
-	
-    printf ("zone size: %i  location: %p\n",
-	    mainzone->size,mainzone);
-    
-    printf ("tag range: %i to %i\n",
-	    lowtag, hightag);
-	
-    for (block = mainzone->blocklist.next ; ; block = block->next)
+  memblock_t *block;
+
+  fprintf(f, "zone size: %i  location: %p\n", mainzone->size, mainzone);
+
+  for (block = mainzone->blocklist.next; ; block = block->next)
     {
-	if (block->tag >= lowtag && block->tag <= hightag)
-	    printf ("block:%p    size:%7i    user:%p    tag:%3i\n",
-		    block, block->size, block->user, block->tag);
-		
-	if (block->next == &mainzone->blocklist)
-	{
-	    // all blocks have been hit
-	    break;
-	}
-	
-	if ( (byte *)block + block->size != (byte *)block->next)
-	    printf ("ERROR: block size does not touch the next block\n");
+      fprintf(f, "block:%p    size:%7i    user:%p    tag:%3i\n", block,
+              block->size, block->user, block->tag);
 
-	if ( block->next->prev != block)
-	    printf ("ERROR: next block doesn't have proper back link\n");
+      if (block->next == &mainzone->blocklist)
+        {
+          break; /* all blocks have been hit */
+        }
 
-	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
-	    printf ("ERROR: two consecutive free blocks\n");
+      if ((byte *)block + block->size != (byte *)block->next)
+        fprintf(f, "ERROR: block size does not touch the next block\n");
+
+      if (block->next->prev != block)
+        fprintf(f, "ERROR: next block doesn't have proper back link\n");
+
+      if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+        fprintf(f, "ERROR: two consecutive free blocks\n");
     }
 }
 
+/****************************************************************************
+ * Name: z_check_heap
+ ****************************************************************************/
 
-//
-// Z_FileDumpHeap
-//
-void Z_FileDumpHeap (FILE* f)
+void z_check_heap(void)
 {
-    memblock_t*	block;
-	
-    fprintf (f,"zone size: %i  location: %p\n",mainzone->size,mainzone);
-	
-    for (block = mainzone->blocklist.next ; ; block = block->next)
+  memblock_t *block;
+
+  for (block = mainzone->blocklist.next; ; block = block->next)
     {
-	fprintf (f,"block:%p    size:%7i    user:%p    tag:%3i\n",
-		 block, block->size, block->user, block->tag);
-		
-	if (block->next == &mainzone->blocklist)
-	{
-	    // all blocks have been hit
-	    break;
-	}
-	
-	if ( (byte *)block + block->size != (byte *)block->next)
-	    fprintf (f,"ERROR: block size does not touch the next block\n");
+      if (block->next == &mainzone->blocklist)
+        {
+          break; /* all blocks have been hit */
+        }
 
-	if ( block->next->prev != block)
-	    fprintf (f,"ERROR: next block doesn't have proper back link\n");
+      if ((byte *)block + block->size != (byte *)block->next)
+        i_error("z_check_heap: block size does not touch the next block\n");
 
-	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
-	    fprintf (f,"ERROR: two consecutive free blocks\n");
+      if (block->next->prev != block)
+        i_error("z_check_heap: next block doesn't have proper back link\n");
+
+      if (block->tag == PU_FREE && block->next->tag == PU_FREE)
+        i_error("z_check_heap: two consecutive free blocks\n");
     }
 }
 
+/****************************************************************************
+ * Name: z_change_tag2
+ ****************************************************************************/
 
-
-//
-// Z_CheckHeap
-//
-void Z_CheckHeap (void)
+void z_change_tag2(void *ptr, int tag, const char *file, int line)
 {
-    memblock_t*	block;
-	
-    for (block = mainzone->blocklist.next ; ; block = block->next)
-    {
-	if (block->next == &mainzone->blocklist)
-	{
-	    // all blocks have been hit
-	    break;
-	}
-	
-	if ( (byte *)block + block->size != (byte *)block->next)
-	    I_Error ("Z_CheckHeap: block size does not touch the next block\n");
+  memblock_t *block;
 
-	if ( block->next->prev != block)
-	    I_Error ("Z_CheckHeap: next block doesn't have proper back link\n");
+  block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
 
-	if (block->tag == PU_FREE && block->next->tag == PU_FREE)
-	    I_Error ("Z_CheckHeap: two consecutive free blocks\n");
-    }
+  if (block->id != ZONEID)
+    i_error("%s:%i: z_change_tag: block without a ZONEID!", file, line);
+
+  if (tag >= PU_PURGELEVEL && block->user == NULL)
+    i_error("%s:%i: z_change_tag: an owner is required "
+            "for purgeable blocks",
+            file, line);
+
+  block->tag = tag;
 }
 
+/****************************************************************************
+ * Name: z_change_user
+ ****************************************************************************/
 
-
-
-//
-// Z_ChangeTag
-//
-void Z_ChangeTag2(void *ptr, int tag, const char *file, int line)
+void z_change_user(void *ptr, void **user)
 {
-    memblock_t*	block;
-	
-    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
+  memblock_t *block;
 
-    if (block->id != ZONEID)
-        I_Error("%s:%i: Z_ChangeTag: block without a ZONEID!",
-                file, line);
+  block = (memblock_t *)((byte *)ptr - sizeof(memblock_t));
 
-    if (tag >= PU_PURGELEVEL && block->user == NULL)
-        I_Error("%s:%i: Z_ChangeTag: an owner is required "
-                "for purgable blocks", file, line);
-
-    block->tag = tag;
-}
-
-void Z_ChangeUser(void *ptr, void **user)
-{
-    memblock_t*	block;
-
-    block = (memblock_t *) ((byte *)ptr - sizeof(memblock_t));
-
-    if (block->id != ZONEID)
+  if (block->id != ZONEID)
     {
-        I_Error("Z_ChangeUser: Tried to change user for invalid block!");
+      i_error("z_change_user: Tried to change user for invalid block!");
     }
 
-    block->user = user;
-    *user = ptr;
+  block->user = user;
+  *user = ptr;
 }
 
+/****************************************************************************
+ * Name: z_free_memory
+ ****************************************************************************/
 
-
-//
-// Z_FreeMemory
-//
-int Z_FreeMemory (void)
+int z_free_memory(void)
 {
-    memblock_t*		block;
-    int			free;
-	
-    free = 0;
-    
-    for (block = mainzone->blocklist.next ;
-         block != &mainzone->blocklist;
-         block = block->next)
+  memblock_t *block;
+  int free;
+
+  free = 0;
+
+  for (block = mainzone->blocklist.next; block != &mainzone->blocklist;
+       block = block->next)
     {
-        if (block->tag == PU_FREE || block->tag >= PU_PURGELEVEL)
-            free += block->size;
+      if (block->tag == PU_FREE || block->tag >= PU_PURGELEVEL)
+        free += block->size;
     }
 
-    return free;
+  return free;
 }
 
-unsigned int Z_ZoneSize(void)
+/****************************************************************************
+ * Name: z_zone_size
+ ****************************************************************************/
+
+unsigned int z_zone_size(void)
 {
-    return mainzone->size;
+  return mainzone->size;
 }
-
diff --git a/games/NXDoom/src/z_zone.h b/games/NXDoom/src/z_zone.h
index 22bd62643..4df6bb3fb 100644
--- a/games/NXDoom/src/z_zone.h
+++ b/games/NXDoom/src/z_zone.h
@@ -1,73 +1,89 @@
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-// DESCRIPTION:
-//      Zone Memory Allocation, perhaps NeXT ObjectiveC inspired.
-//	Remark: this was the only stuff that, according
-//	 to John Carmack, might have been useful for
-//	 Quake.
-//
-
-
+/****************************************************************************
+ * apps/games/NXDoom/src/z_zone.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  Zone Memory Allocation, perhaps NeXT ObjectiveC inspired.
+ *
+ *  Remark: this was the only stuff that, according to John Carmack, might
+ *  have been useful for Quake.
+ *
+ ****************************************************************************/
 
 #ifndef __Z_ZONE__
 #define __Z_ZONE__
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <stdio.h>
 
-//
-// ZONE MEMORY
-// PU - purge tags.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* This is used to get the local FILE:LINE info from CPP prior to really call
+ * the function in question.
+ */
+
+#define z_change_tag(p, t) z_change_tag2((p), (t), __FILE__, __LINE__)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* ZONE MEMORY
+ * PU - purge tags.
+ */
 
 enum
 {
-    PU_STATIC = 1,                  // static entire execution time
-    PU_SOUND,                       // static while playing
-    PU_MUSIC,                       // static while playing
-    PU_FREE,                        // a free block
-    PU_LEVEL,                       // static until level exited
-    PU_LEVSPEC,                     // a special thinker in a level
-    
-    // Tags >= PU_PURGELEVEL are purgable whenever needed.
+  PU_STATIC = 1, /* static entire execution time */
+  PU_SOUND,      /* static while playing */
+  PU_MUSIC,      /* static while playing */
+  PU_FREE,       /* a free block */
+  PU_LEVEL,      /* static until level exited */
+  PU_LEVSPEC,    /* a special thinker in a level */
 
-    PU_PURGELEVEL,
-    PU_CACHE,
+  /* Tags >= PU_PURGELEVEL are purgeable whenever needed. */
 
-    // Total number of different tag types
+  PU_PURGELEVEL,
+  PU_CACHE,
 
-    PU_NUM_TAGS
+  /* Total number of different tag types */
+
+  PU_NUM_TAGS
 };
-        
 
-void	Z_Init (void);
-void*	Z_Malloc (int size, int tag, void *ptr);
-void    Z_Free (void *ptr);
-void    Z_FreeTags (int lowtag, int hightag);
-void    Z_DumpHeap (int lowtag, int hightag);
-void    Z_FileDumpHeap (FILE *f);
-void    Z_CheckHeap (void);
-void    Z_ChangeTag2 (void *ptr, int tag, const char *file, int line);
-void    Z_ChangeUser(void *ptr, void **user);
-int     Z_FreeMemory (void);
-unsigned int Z_ZoneSize(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-//
-// This is used to get the local FILE:LINE info from CPP
-// prior to really call the function in question.
-//
-#define Z_ChangeTag(p,t)                                       \
-    Z_ChangeTag2((p), (t), __FILE__, __LINE__)
+void z_init(void);
+void *z_malloc(int size, int tag, void *ptr);
+void z_free(void *ptr);
+void z_free_tags(int lowtag, int hightag);
+void z_dump_heap(int lowtag, int hightag);
+void z_file_dump_heap(FILE *f);
+void z_check_heap(void);
+void z_change_tag2(void *ptr, int tag, const char *file, int line);
+void z_change_user(void *ptr, void **user);
+int z_free_memory(void);
+unsigned int z_zone_size(void);
 
-
-#endif
+#endif /* __Z_ZONE__ */
diff --git a/games/NXDoom/textscreen/CMakeLists.txt b/games/NXDoom/textscreen/CMakeLists.txt
deleted file mode 100644
index 7e33826d6..000000000
--- a/games/NXDoom/textscreen/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-add_library(textscreen STATIC
-            textscreen.h
-            txt_conditional.c   txt_conditional.h
-            txt_checkbox.c      txt_checkbox.h
-            txt_desktop.c       txt_desktop.h
-            txt_dropdown.c      txt_dropdown.h
-            txt_fileselect.c    txt_fileselect.h
-            txt_gui.c           txt_gui.h
-            txt_inputbox.c      txt_inputbox.h
-            txt_io.c            txt_io.h
-                                txt_main.h
-            txt_button.c        txt_button.h
-            txt_label.c         txt_label.h
-            txt_radiobutton.c   txt_radiobutton.h
-            txt_scrollpane.c    txt_scrollpane.h
-            txt_separator.c     txt_separator.h
-            txt_spinctrl.c      txt_spinctrl.h
-            txt_sdl.c           txt_sdl.h
-            txt_strut.c         txt_strut.h
-            txt_table.c         txt_table.h
-            txt_utf8.c          txt_utf8.h
-            txt_widget.c        txt_widget.h
-            txt_window.c        txt_window.h
-            txt_window_action.c txt_window_action.h)
-target_include_directories(textscreen
-                           INTERFACE "."
-                           PRIVATE "../src/")
-if (DEFINED EMSCRIPTEN)
-    set_target_properties(textscreen PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-    set_target_properties(textscreen PROPERTIES LINK_FLAGS "-s USE_SDL=2")
-else()
-    target_link_libraries(textscreen m SDL2::SDL2)
-endif()
diff --git a/games/NXDoom/textscreen/Doxyfile b/games/NXDoom/textscreen/Doxyfile
deleted file mode 100644
index 84b607a04..000000000
--- a/games/NXDoom/textscreen/Doxyfile
+++ /dev/null
@@ -1,2451 +0,0 @@
-# Doxyfile 1.8.13
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "libtextscreen"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 0
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = .
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
-
-FILE_PATTERNS          = *.h
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = NO
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse-libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = YES
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = DOXYGEN
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: YES.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 1000
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/games/NXDoom/textscreen/Makefile.am b/games/NXDoom/textscreen/Makefile.am
deleted file mode 100644
index f55236f65..000000000
--- a/games/NXDoom/textscreen/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-
-AM_CFLAGS = -I$(top_srcdir)/src
-
-CTAGS_ARGS=-I TXT_UNCAST_ARG+
-
-# build this directory before the examples directory.
-
-SUBDIRS = fonts . examples
-
-noinst_LIBRARIES=libtextscreen.a
-
-EXTRA_DIST=CMakeLists.txt Doxyfile
-
-libtextscreen_a_SOURCES =                                 \
-	textscreen.h                                      \
-	txt_conditional.c        txt_conditional.h        \
-	txt_checkbox.c           txt_checkbox.h           \
-	txt_desktop.c            txt_desktop.h            \
-	txt_dropdown.c           txt_dropdown.h           \
-	txt_fileselect.c         txt_fileselect.h         \
-	txt_gui.c                txt_gui.h                \
-	txt_inputbox.c           txt_inputbox.h           \
-	txt_io.c                 txt_io.h                 \
-	                         txt_main.h               \
-	txt_button.c             txt_button.h             \
-	txt_label.c              txt_label.h              \
-	txt_radiobutton.c        txt_radiobutton.h        \
-	txt_scrollpane.c         txt_scrollpane.h         \
-	txt_separator.c          txt_separator.h          \
-	txt_spinctrl.c           txt_spinctrl.h           \
-	txt_sdl.c                txt_sdl.h                \
-	txt_strut.c              txt_strut.h              \
-	txt_table.c              txt_table.h              \
-	txt_utf8.c               txt_utf8.h               \
-	txt_widget.c             txt_widget.h             \
-	txt_window.c             txt_window.h             \
-	txt_window_action.c      txt_window_action.h
-
-doc:
-	doxygen
-
diff --git a/games/NXDoom/textscreen/examples/.gitignore b/games/NXDoom/textscreen/examples/.gitignore
deleted file mode 100644
index cb0fd52cf..000000000
--- a/games/NXDoom/textscreen/examples/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-Makefile
-.deps
-guitest
-calculator
-*.exe
-tags
-TAGS
diff --git a/games/NXDoom/textscreen/examples/Makefile.am b/games/NXDoom/textscreen/examples/Makefile.am
deleted file mode 100644
index 4632d921d..000000000
--- a/games/NXDoom/textscreen/examples/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-AM_CFLAGS =  -I$(top_srcdir)/src -I$(top_srcdir)/textscreen
-
-noinst_PROGRAMS=guitest calculator
-
-guitest_LDADD = ../libtextscreen.a @LDFLAGS@ @SDL_LIBS@
-guitest_SOURCES = guitest.c
-
-calculator_LDADD = ../libtextscreen.a @LDFLAGS@ @SDL_LIBS@
-calculator_SOURCES = calculator.c
-
diff --git a/games/NXDoom/textscreen/examples/calculator.c b/games/NXDoom/textscreen/examples/calculator.c
deleted file mode 100644
index c50af2eaf..000000000
--- a/games/NXDoom/textscreen/examples/calculator.c
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Example program: desktop calculator
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "textscreen.h"
-
-typedef enum
-{
-    OP_NONE,
-    OP_PLUS,
-    OP_MINUS,
-    OP_MULT,
-    OP_DIV,
-} operator_t;
-
-int starting_input = 0;
-int input_value = 0;
-txt_label_t *input_box;
-int first_operand;
-operator_t operator = OP_NONE;
-
-void UpdateInputBox(void)
-{
-    char buf[20];
-
-    TXT_snprintf(buf, sizeof(buf), "  %i", input_value);
-    TXT_SetLabel(input_box, buf);
-}
-
-void InsertNumber(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(value))
-{
-    TXT_CAST_ARG(int, value);
-
-    if (starting_input)
-    {
-        input_value = 0;
-        starting_input = 0;
-    }
-    
-    input_value *= 10;
-    input_value += *value;
-    UpdateInputBox();
-}
-
-void AddNumberButton(txt_table_t *table, int value)
-{
-    char buf[10];
-    int *val_copy;
-
-    val_copy = malloc(sizeof(int));
-    *val_copy = value;
-
-    TXT_snprintf(buf, sizeof(buf), "  %i  ", value);
-
-    TXT_AddWidget(table, TXT_NewButton2(buf, InsertNumber, val_copy));
-}
-
-void Operator(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(op))
-{
-    TXT_CAST_ARG(operator_t, op);
-
-    first_operand = input_value;
-    operator = *op;
-    starting_input = 1;
-}
-
-void AddOperatorButton(txt_table_t *table, const char *label, operator_t op)
-{
-    char buf[10];
-    operator_t *op_copy;
-
-    op_copy = malloc(sizeof(operator_t));
-    *op_copy = op;
-
-    TXT_snprintf(buf, sizeof(buf), "  %s  ", label);
-
-    TXT_AddWidget(table, TXT_NewButton2(buf, Operator, op_copy));
-}
-
-void Calculate(TXT_UNCAST_ARG(button), void *unused)
-{
-    switch (operator)
-    {
-        case OP_PLUS:
-            input_value = first_operand + input_value;
-            break;
-        case OP_MINUS:
-            input_value = first_operand - input_value;
-            break;
-        case OP_MULT:
-            input_value = first_operand * input_value;
-            break;
-        case OP_DIV:
-            input_value = first_operand / input_value;
-            break;
-        case OP_NONE:
-            break;
-    }
-
-    UpdateInputBox();
-
-    operator = OP_NONE;
-    starting_input = 1;
-}
-
-void BuildGUI()
-{
-    txt_window_t *window;
-    txt_table_t *table;
-    
-    window = TXT_NewWindow("Calculator");
-
-    input_box = TXT_NewLabel("asdf");
-    TXT_SetBGColor(input_box, TXT_COLOR_BLACK);
-    TXT_AddWidget(window, input_box);
-    TXT_AddWidget(window, TXT_NewSeparator(NULL));
-    TXT_AddWidget(window, TXT_NewStrut(0, 1));
-
-    table = TXT_NewTable(4);
-    TXT_AddWidget(window, table);
-    TXT_SetWidgetAlign(table, TXT_HORIZ_CENTER);
-
-    AddNumberButton(table, 7);
-    AddNumberButton(table, 8);
-    AddNumberButton(table, 9);
-    AddOperatorButton(table, "*", OP_MULT);
-    AddNumberButton(table, 4);
-    AddNumberButton(table, 5);
-    AddNumberButton(table, 6);
-    AddOperatorButton(table, "-", OP_MINUS);
-    AddNumberButton(table, 1);
-    AddNumberButton(table, 2);
-    AddNumberButton(table, 3);
-    AddOperatorButton(table, "+", OP_PLUS);
-    AddNumberButton(table, 0);
-    TXT_AddWidget(table, NULL);
-
-    TXT_AddWidget(table, TXT_NewButton2("  =  ", Calculate, NULL));
-    AddOperatorButton(table, "/", OP_DIV);
-    
-    TXT_AddWidget(window, TXT_NewStrut(0, 1));
-    UpdateInputBox();
-}
-
-int main(int argc, char *argv[])
-{
-    if (!TXT_Init())
-    {
-        fprintf(stderr, "Failed to initialise GUI\n");
-        exit(-1);
-    }
-    
-    TXT_SetDesktopTitle("Calculator demo");
-
-    BuildGUI();
-
-    TXT_GUIMainLoop();
-
-    TXT_Shutdown();
-
-    return 0;
-}
-
diff --git a/games/NXDoom/textscreen/examples/guitest.c b/games/NXDoom/textscreen/examples/guitest.c
deleted file mode 100644
index 1df95ce4c..000000000
--- a/games/NXDoom/textscreen/examples/guitest.c
+++ /dev/null
@@ -1,308 +0,0 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Example program: GUI test program
-//
-// Demonstrates all the main textscreen widgets in use and shows how
-// a simple textscreen program can be written.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "textscreen.h"
-
-enum 
-{
-    RADIO_VALUE_BADGER,
-    RADIO_VALUE_MUSHROOM,
-    RADIO_VALUE_SNAKE,
-};
-
-// also put some crazy extensions to test the escape function. a"b"c"""dd
-const char *extensions[] = { "wad", "lmp", "txt", "a\"b\"c\"\"\"dd", "",
-     "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"", NULL };
-const char *radio_values[] = { "Badger", "Mushroom", "Snake" };
-char *textbox_value = NULL;
-int numbox_value = 0;
-int radiobutton_value;
-char *file_path = NULL;
-char *dir_path = NULL;
-txt_label_t *value_label;
-txt_window_t *firstwin;
-int cheesy;
-
-void ClosePwnBox(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
-{
-    TXT_CAST_ARG(txt_window_t, window);
-
-    TXT_CloseWindow(window);
-}
-
-void PwnBox(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    txt_window_t *window;
-    txt_window_action_t *close_button;
-    
-    window = TXT_NewWindow("Pwned!");
-    TXT_AddWidget(window, TXT_NewLabel(" BOOM! HEADSHOT! "));
-
-    close_button = TXT_NewWindowAction(KEY_ENTER, "Close");
-    TXT_SignalConnect(close_button, "pressed", ClosePwnBox, window);
-
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, close_button);
-}
-
-void UpdateLabel(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    char buf[40];
-    
-    TXT_StringCopy(buf, " Current value: ", sizeof(buf));
-    if (cheesy)
-    {
-        TXT_StringConcat(buf, "Cheesy ", sizeof(buf));
-    }
-    TXT_StringConcat(buf, radio_values[radiobutton_value], sizeof(buf));
-    TXT_StringConcat(buf, "\n", sizeof(buf));
-
-    TXT_SetLabel(value_label, buf);
-}
-
-void CloseWindow(TXT_UNCAST_ARG(button), void *user_data)
-{
-    TXT_CloseWindow(firstwin);
-}
-
-void UnicodeWindow(TXT_UNCAST_ARG(widget), void *user_data)
-{
-    static const char *strings[] = {
-        "lunedì", "martedì", "mercoledì", "giovedì",
-        "venerdì", "sabato", "domenica",
-    };
-    static int var1, var2;
-    txt_window_t *window;
-
-    window = TXT_NewWindow("Questo è in Italiano");
-
-    TXT_AddWidgets(window,
-                   TXT_NewButton("Questo è un tasto"),
-                   TXT_NewCheckBox("Questo è un checkbox", &var1),
-                   TXT_NewDropdownList(&var2, strings, 7),
-                   TXT_NewSeparator("Questo è un separatore"),
-                   TXT_NewLabel("Leggi questo, è pieno di\n"
-                                "informazioni interessanti"),
-                   TXT_NewRadioButton("Ma questo non è un radio??",
-                                      &var1, 0),
-                   NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT,
-                        TXT_NewWindowAction(KEY_ENTER, "Nullità"));
-
-}
-
-void SetupWindow(void)
-{
-    txt_window_t *window;
-    txt_table_t *table;
-    txt_table_t *rightpane;
-    txt_checkbox_t *cheesy_checkbox;
-    txt_window_action_t *pwn;
-    txt_label_t *toplabel;
-    char buf[100];
-    int i;
-
-    window = TXT_NewWindow("Window test");
-
-    TXT_SetWindowHelpURL(window, "https://www.youtube.com/watch?v=dQw4w9WgXcQ");
-
-    TXT_AddWidget(window, TXT_NewSeparator("Main section"));
-    table = TXT_NewTable(3);
-
-    toplabel = TXT_NewLabel("This is a multiline label.\n"
-                            "A single label object contains \n"
-                            "all three of these lines.");
-    TXT_AddWidget(window, toplabel);
-    TXT_SetWidgetAlign(toplabel, TXT_HORIZ_CENTER);
-
-    //TXT_AddWidget(window, TXT_NewScrollPane(15, 4, table));
-    TXT_AddWidget(window, table);
-
-    for (i=0; i<3; ++i)
-    {
-        TXT_snprintf(buf, sizeof(buf), "Option %i in a table:", i + 1);
-        TXT_AddWidget(table, TXT_NewLabel(buf));
-        TXT_snprintf(buf, sizeof(buf), " Button %i-1 ", i + 1);
-        TXT_AddWidget(table, TXT_NewButton(buf));
-        TXT_snprintf(buf, sizeof(buf), " Button %i-2 ", i + 1);
-        TXT_AddWidget(table, TXT_NewButton(buf));
-    }
-
-    TXT_AddWidgets(table,
-                   TXT_NewLabel("Still the same table, but:\n"
-                                "This label magically overflows\n"
-                                "across multiple cells! Cool, huh? "),
-                   TXT_TABLE_OVERFLOW_RIGHT,
-                   TXT_NewButton("Do nothing"),
-                   TXT_TABLE_OVERFLOW_DOWN,
-                   TXT_TABLE_OVERFLOW_DOWN,
-                   TXT_NewButton2("Qualcosa?", UnicodeWindow, NULL),
-                   NULL);
-
-    TXT_AddWidget(window, TXT_NewStrut(0, 1));
-    value_label = TXT_NewLabel("");
-    TXT_AddWidget(window, value_label);
-
-    table = TXT_NewTable(2);
-    TXT_AddWidget(window, table);
-    TXT_SetWidgetAlign(table, TXT_HORIZ_CENTER);
-
-    cheesy_checkbox = TXT_NewCheckBox("Cheesy", &cheesy);
-    TXT_AddWidget(table, cheesy_checkbox);
-    TXT_SignalConnect(cheesy_checkbox, "changed", UpdateLabel, NULL);
-
-    rightpane = TXT_NewTable(1);
-    TXT_AddWidget(table, rightpane);
-
-    for (i=0; i<3; ++i)
-    {
-        txt_radiobutton_t *rbut;
-
-        rbut = TXT_NewRadioButton(radio_values[i], &radiobutton_value, i);
-        TXT_AddWidget(rightpane, rbut);
-        TXT_SignalConnect(rbut, "selected", UpdateLabel, NULL);
-    }
-
-    UpdateLabel(NULL, NULL);
-
-    TXT_AddWidget(window, TXT_NewButton2("Close Window", CloseWindow, NULL));
-
-    pwn = TXT_NewWindowAction(KEY_F1, "PWN!");
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, pwn);
-    TXT_SignalConnect(pwn, "pressed", PwnBox, NULL);
-
-    firstwin = window;
-}
-
-void Window2(void)
-{
-    txt_window_t *window;
-    txt_table_t *table;
-    txt_table_t *unselectable_table;
-    txt_scrollpane_t *scrollpane;
-
-    window = TXT_NewWindow("Another test");
-    TXT_SetWindowPosition(window, 
-                          TXT_HORIZ_RIGHT, 
-                          TXT_VERT_TOP, 
-                          TXT_SCREEN_W - 1, 1);
-
-    TXT_AddWidgets(window,
-                   TXT_NewScrollPane(40, 1,
-                        TXT_NewLabel("* Unselectable scroll pane *")),
-                   unselectable_table = TXT_NewTable(1),
-                   NULL);
-
-    TXT_AddWidget(unselectable_table, TXT_NewLabel("* Unselectable table *"));
-    TXT_AddWidget(unselectable_table, TXT_NewLabel(
-        "This is a UTF-8 string:\n"
-        "\xc3\x80 bient\xc3\xb4t na\xc3\xaet "
-        "\xc3\xa9v\xc3\xaaque \xc3\xa0 l'\xc5\x93uvre p\xc3\xa8re."));
-
-    TXT_AddWidget(window, TXT_NewSeparator("Input boxes"));
-    table = TXT_NewTable(2);
-    TXT_AddWidget(window, table);
-    TXT_AddWidgets(table,
-                   TXT_NewLabel("String: "),
-                   TXT_NewInputBox(&textbox_value, 20),
-                   TXT_NewLabel("Int: "),
-                   TXT_NewIntInputBox(&numbox_value, 10),
-                   TXT_NewLabel("Spin control:"),
-                   TXT_NewSpinControl(&numbox_value, 0, 15),
-                   TXT_NewLabel("File:"),
-                   TXT_NewFileSelector(&file_path, 28, "Select file:",
-                                       extensions),
-                   TXT_NewLabel("Directory:"),
-                   TXT_NewFileSelector(&dir_path, 28, "Select directory:",
-                                       TXT_DIRECTORY),
-                   NULL);
-
-    TXT_AddWidget(window, TXT_NewSeparator("Scroll pane test"));
-    scrollpane = TXT_NewScrollPane(40, 5, TXT_NewLabel(
-        "This is a scrollable pane. The contents\n"
-        "of this box are larger than the box\n"
-        "itself, but it can be scrolled around\n"
-        "to explore the full contents.\n"
-        "\n"
-        "Scrollable panes can be scrolled both\n"
-        "vertically and horizontally. They\n"
-        "can contain any widget. The scroll bars\n"
-        "appear automatically as needed.\n"
-        "\n"
-        "This is a very long line of text that forces a horizontal scrollbar"
-    ));
-    TXT_AddWidget(window, scrollpane);
-}
-
-void ScrollingMenu(void)
-{
-    txt_window_t *window;
-    txt_button_t *button;
-    txt_table_t *table;
-
-    window = TXT_NewWindow("Scrollable menu");
-
-    table = TXT_NewTable(1);
-
-    TXT_AddWidgets(table,
-                   TXT_NewButton("Configure display"),
-                   TXT_NewButton("Configure joystick"),
-                   TXT_NewButton("Configure keyboard"),
-                   TXT_NewButton("Configure mouse"),
-                   TXT_NewButton("Configure sound"),
-                   TXT_NewStrut(0, 1),
-                   button = TXT_NewButton("Save Parameters and launch DOOM"),
-                   TXT_NewStrut(0, 1),
-                   TXT_NewButton("Start a network game"),
-                   TXT_NewButton("Join a network game"),
-                   TXT_NewButton("Multiplayer configuration"),
-                   NULL);
-
-    TXT_SignalConnect(button, "pressed", PwnBox, NULL);
-
-    TXT_AddWidget(window, TXT_NewScrollPane(0, 6, table));
-}
-
-int main(int argc, char *argv[])
-{
-    if (!TXT_Init())
-    {
-        fprintf(stderr, "Failed to initialise GUI\n");
-        exit(-1);
-    }
-
-    TXT_SetDesktopTitle("Not Chocolate Doom Setup");
-
-    ScrollingMenu();
-    Window2();
-    SetupWindow();
-
-    TXT_GUIMainLoop();
-
-    TXT_Shutdown();
-
-    return 0;
-}
-
-
diff --git a/games/NXDoom/textscreen/fonts/Makefile.am b/games/NXDoom/textscreen/fonts/Makefile.am
deleted file mode 100644
index 130486b71..000000000
--- a/games/NXDoom/textscreen/fonts/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-FONT_HDRS = small.h normal.h large.h codepage.h
-EXTRA_DIST = small.png normal.png large.png convert-font $(FONT_HDRS)
-
-noinst_DATA = $(FONT_HDRS)
-
-if HAVE_FONTS
-
-small.h: small.png convert-font
-	$(srcdir)/convert-font small small.png small.h
-
-normal.h: normal.png convert-font
-	$(srcdir)/convert-font normal normal.png normal.h
-
-large.h: large.png convert-font
-	$(srcdir)/convert-font large large.png large.h
-
-endif
-
diff --git a/games/NXDoom/textscreen/fonts/codepage.h b/games/NXDoom/textscreen/fonts/codepage.h
index 666149323..f506c90e4 100644
--- a/games/NXDoom/textscreen/fonts/codepage.h
+++ b/games/NXDoom/textscreen/fonts/codepage.h
@@ -1,113 +1,105 @@
-//
-// Copyright(C) 2017 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/fonts/codepage.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2017 Simon Howard
+ *
+ * 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.
+ *
+ * This file contains a #define macro mapping from the characters
+ * in the CP437 code page to the equivalent Unicode characters. It
+ * therefore defines which Unicode characters can be represented on
+ * a text screen using such a code page.
+ *
+ * If you're changing the textscreen font to show a different code
+ * page, you should update the mapping in this file to match. The
+ * Wikipedia pages for DOS code pages are a good place to look for
+ * this information.
+ *
+ ****************************************************************************/
 
-// This file contains a #define macro mapping from the characters
-// in the CP437 code page to the equivalent Unicode characters. It
-// therefore defines which Unicode characters can be represented on
-// a text screen using such a code page.
-//
-// If you're changing the textscreen font to show a different code
-// page, you should update the mapping in this file to match. The
-// Wikipedia pages for DOS code pages are a good place to look for
-// this information.
-
-#define CODE_PAGE_TO_UNICODE {                      \
-                                                    \
-       /* CP437 control codes: */                   \
-                                                    \
-    0x0000, 0x263a, 0x263b, 0x2665,  /* 00 - 0f */  \
-    0x2666, 0x2663, 0x2660, 0x2022,                 \
-    0x25d8, 0x25cb, 0x25d9, 0x2642,                 \
-    0x2640, 0x266a, 0x266b, 0x263c,                 \
-                                                    \
-    0x25ba, 0x25c4, 0x2195, 0x203c,  /* 10 - 1f */  \
-    0x00b6, 0x00a7, 0x25ac, 0x21a8,                 \
-    0x2191, 0x2193, 0x2192, 0x2190,                 \
-    0x221f, 0x2194, 0x25b2, 0x25bc,                 \
-                                                    \
-       /* Standard ASCII range: */                  \
-                                                    \
-    0x0020, 0x0021, 0x0022, 0x0023,  /* 20 - 2f */  \
-    0x0024, 0x0025, 0x0026, 0x0027,                 \
-    0x0028, 0x0029, 0x002a, 0x002b,                 \
-    0x002c, 0x002d, 0x002e, 0x002f,                 \
-                                                    \
-    0x0030, 0x0031, 0x0032, 0x0033,  /* 30 - 3f */  \
-    0x0034, 0x0035, 0x0036, 0x0037,                 \
-    0x0038, 0x0039, 0x003a, 0x003b,                 \
-    0x003c, 0x003d, 0x003e, 0x003f,                 \
-                                                    \
-    0x0040, 0x0041, 0x0042, 0x0043,  /* 40 - 4f */  \
-    0x0044, 0x0045, 0x0046, 0x0047,                 \
-    0x0048, 0x0049, 0x004a, 0x004b,                 \
-    0x004c, 0x004d, 0x004e, 0x004f,                 \
-                                                    \
-    0x0050, 0x0051, 0x0052, 0x0053,  /* 50 - 5f */  \
-    0x0054, 0x0055, 0x0056, 0x0057,                 \
-    0x0058, 0x0059, 0x005a, 0x005b,                 \
-    0x005c, 0x005d, 0x005e, 0x005f,                 \
-                                                    \
-    0x0060, 0x0061, 0x0062, 0x0063,  /* 60 - 6f */  \
-    0x0064, 0x0065, 0x0066, 0x0067,                 \
-    0x0068, 0x0069, 0x006a, 0x006b,                 \
-    0x006c, 0x006d, 0x006e, 0x006f,                 \
-                                                    \
-    0x0070, 0x0071, 0x0072, 0x0073,  /* 70 - 7f */  \
-    0x0074, 0x0075, 0x0076, 0x0077,                 \
-    0x0078, 0x0079, 0x007a, 0x007b,                 \
-    0x007c, 0x007d, 0x007e, 0x2302,                 \
-                                                    \
-       /* CP437 Extended ASCII range: */            \
-                                                    \
-    0x00c7, 0x00fc, 0x00e9, 0x00e2,  /*  80-8f */   \
-    0x00e4, 0x00e0, 0x00e5, 0x00e7,                 \
-    0x00ea, 0x00eb, 0x00e8, 0x00ef,                 \
-    0x00ee, 0x00ec, 0x00c4, 0x00c5,                 \
-                                                    \
-    0x00c9, 0x00e6, 0x00c6, 0x00f4,  /*  90-9f */   \
-    0x00f6, 0x00f2, 0x00fb, 0x00f9,                 \
-    0x00ff, 0x00d6, 0x00dc, 0x00a2,                 \
-    0x00a3, 0x00a5, 0x20a7, 0x0192,                 \
-                                                    \
-    0x00e1, 0x00ed, 0x00f3, 0x00fa,  /*  a0-af */   \
-    0x00f1, 0x00d1, 0x00aa, 0x00ba,                 \
-    0x00bf, 0x2310, 0x00ac, 0x00bd,                 \
-    0x00bc, 0x00a1, 0x00ab, 0x00bb,                 \
-                                                    \
-    0x2591, 0x2592, 0x2593, 0x2502,  /*  b0-bf */   \
-    0x2524, 0x2561, 0x2562, 0x2556,                 \
-    0x2555, 0x2563, 0x2551, 0x2557,                 \
-    0x255d, 0x255c, 0x255b, 0x2510,                 \
-                                                    \
-    0x2514, 0x2534, 0x252c, 0x251c,  /*  c0-cf */   \
-    0x2500, 0x253c, 0x255e, 0x255f,                 \
-    0x255a, 0x2554, 0x2569, 0x2566,                 \
-    0x2560, 0x2550, 0x256c, 0x2567,                 \
-                                                    \
-    0x2568, 0x2564, 0x2565, 0x2559,  /*  d0-df */   \
-    0x2558, 0x2552, 0x2553, 0x256b,                 \
-    0x256a, 0x2518, 0x250c, 0x2588,                 \
-    0x2584, 0x258c, 0x2590, 0x2580,                 \
-                                                    \
-    0x03b1, 0x00df, 0x0393, 0x03c0,  /*  e0-ef */   \
-    0x03a3, 0x03c3, 0x00b5, 0x03c4,                 \
-    0x03a6, 0x0398, 0x03a9, 0x03b4,                 \
-    0x221e, 0x03c6, 0x03b5, 0x2229,                 \
-                                                    \
-    0x2261, 0x00b1, 0x2265, 0x2264,  /*  f0-ff */   \
-    0x2320, 0x2321, 0x00f7, 0x2248,                 \
-    0x00b0, 0x2219, 0x00b7, 0x221a,                 \
-    0x207f, 0x00b2, 0x25a0, 0x00a0,                 \
-}
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
+#define CODE_PAGE_TO_UNICODE                                                 \
+  {                                                                          \
+      /* CP437 control codes: */                                             \
+                                                                             \
+      0x0000, 0x263a, 0x263b, 0x2665, /* 00 - 0f */                          \
+      0x2666, 0x2663, 0x2660, 0x2022, 0x25d8, 0x25cb, 0x25d9,                \
+      0x2642, 0x2640, 0x266a, 0x266b, 0x263c,                                \
+                                                                             \
+      0x25ba, 0x25c4, 0x2195, 0x203c, /* 10 - 1f */                          \
+      0x00b6, 0x00a7, 0x25ac, 0x21a8, 0x2191, 0x2193, 0x2192,                \
+      0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc,                                \
+                                                                             \
+      /* Standard ASCII range: */                                            \
+                                                                             \
+      0x0020, 0x0021, 0x0022, 0x0023, /* 20 - 2f */                          \
+      0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a,                \
+      0x002b, 0x002c, 0x002d, 0x002e, 0x002f,                                \
+                                                                             \
+      0x0030, 0x0031, 0x0032, 0x0033, /* 30 - 3f */                          \
+      0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a,                \
+      0x003b, 0x003c, 0x003d, 0x003e, 0x003f,                                \
+                                                                             \
+      0x0040, 0x0041, 0x0042, 0x0043, /* 40 - 4f */                          \
+      0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a,                \
+      0x004b, 0x004c, 0x004d, 0x004e, 0x004f,                                \
+                                                                             \
+      0x0050, 0x0051, 0x0052, 0x0053, /* 50 - 5f */                          \
+      0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a,                \
+      0x005b, 0x005c, 0x005d, 0x005e, 0x005f,                                \
+                                                                             \
+      0x0060, 0x0061, 0x0062, 0x0063, /* 60 - 6f */                          \
+      0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a,                \
+      0x006b, 0x006c, 0x006d, 0x006e, 0x006f,                                \
+                                                                             \
+      0x0070, 0x0071, 0x0072, 0x0073, /* 70 - 7f */                          \
+      0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a,                \
+      0x007b, 0x007c, 0x007d, 0x007e, 0x2302,                                \
+                                                                             \
+      /* CP437 Extended ASCII range: */                                      \
+                                                                             \
+      0x00c7, 0x00fc, 0x00e9, 0x00e2, /*  80-8f */                           \
+      0x00e4, 0x00e0, 0x00e5, 0x00e7, 0x00ea, 0x00eb, 0x00e8,                \
+      0x00ef, 0x00ee, 0x00ec, 0x00c4, 0x00c5,                                \
+                                                                             \
+      0x00c9, 0x00e6, 0x00c6, 0x00f4, /*  90-9f */                           \
+      0x00f6, 0x00f2, 0x00fb, 0x00f9, 0x00ff, 0x00d6, 0x00dc,                \
+      0x00a2, 0x00a3, 0x00a5, 0x20a7, 0x0192,                                \
+                                                                             \
+      0x00e1, 0x00ed, 0x00f3, 0x00fa, /*  a0-af */                           \
+      0x00f1, 0x00d1, 0x00aa, 0x00ba, 0x00bf, 0x2310, 0x00ac,                \
+      0x00bd, 0x00bc, 0x00a1, 0x00ab, 0x00bb,                                \
+                                                                             \
+      0x2591, 0x2592, 0x2593, 0x2502, /*  b0-bf */                           \
+      0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551,                \
+      0x2557, 0x255d, 0x255c, 0x255b, 0x2510,                                \
+                                                                             \
+      0x2514, 0x2534, 0x252c, 0x251c, /*  c0-cf */                           \
+      0x2500, 0x253c, 0x255e, 0x255f, 0x255a, 0x2554, 0x2569,                \
+      0x2566, 0x2560, 0x2550, 0x256c, 0x2567,                                \
+                                                                             \
+      0x2568, 0x2564, 0x2565, 0x2559, /*  d0-df */                           \
+      0x2558, 0x2552, 0x2553, 0x256b, 0x256a, 0x2518, 0x250c,                \
+      0x2588, 0x2584, 0x258c, 0x2590, 0x2580,                                \
+                                                                             \
+      0x03b1, 0x00df, 0x0393, 0x03c0, /*  e0-ef */                           \
+      0x03a3, 0x03c3, 0x00b5, 0x03c4, 0x03a6, 0x0398, 0x03a9,                \
+      0x03b4, 0x221e, 0x03c6, 0x03b5, 0x2229,                                \
+                                                                             \
+      0x2261, 0x00b1, 0x2265, 0x2264, /*  f0-ff */                           \
+      0x2320, 0x2321, 0x00f7, 0x2248, 0x00b0, 0x2219, 0x00b7,                \
+      0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0,                                \
+  }
diff --git a/games/NXDoom/textscreen/fonts/large.h b/games/NXDoom/textscreen/fonts/large.h
index 5dac05ed4..a58692d91 100644
--- a/games/NXDoom/textscreen/fonts/large.h
+++ b/games/NXDoom/textscreen/fonts/large.h
@@ -1,2060 +1,1391 @@
-/* Font data generated from large.png; do not edit.
-   Please see textscreen/fonts/README for copyright
-   information. */
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/fonts/large.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Font data generated from large.png; do not edit. Please see
+ * textscreen/fonts/README for copyright information.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 static const uint8_t large_font_data[] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x3f, 0xfe, 0x7f, 0x07, 0xe0, 0x03, 0xc0,
-    0x33, 0xcc, 0x33, 0xcc, 0x03, 0xc0, 0x03, 0xc0,
-    0x03, 0xc0, 0x03, 0xc0, 0xf3, 0xcf, 0xf3, 0xcf,
-    0xe3, 0xc7, 0xc3, 0xc3, 0x03, 0xc0, 0x03, 0xc0,
-    0x03, 0xc0, 0x07, 0xe0, 0xfe, 0x7f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x3f, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff,
-    0xcf, 0xf3, 0xcf, 0xf3, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x1f, 0xf8, 0x3f, 0xfc, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x1c, 0x0e, 0x3e, 0x1f, 0xff, 0x3f, 0xff, 0x3f,
-    0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xfe, 0x1f,
-    0xfe, 0x1f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf8, 0x07,
-    0xf0, 0x03, 0xe0, 0x01, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0xf8, 0x07,
-    0xfc, 0x0f, 0xfe, 0x1f, 0xff, 0x3f, 0xff, 0x3f,
-    0xfe, 0x1f, 0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03,
-    0xe0, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x3e, 0x7c, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc,
-    0x3f, 0xfc, 0x3e, 0x7c, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07,
-    0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xfe, 0x7f, 0xdc, 0x3b, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x3f, 0xfc, 0x1f, 0xf8, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x1f,
-    0x3c, 0x3c, 0x1c, 0x38, 0x0c, 0x30, 0x0c, 0x30,
-    0x0c, 0x30, 0x0c, 0x30, 0x1c, 0x38, 0x3c, 0x3c,
-    0xf8, 0x1f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0xe0,
-    0xc3, 0xc3, 0xe3, 0xc7, 0xf3, 0xcf, 0xf3, 0xcf,
-    0xf3, 0xcf, 0xf3, 0xcf, 0xe3, 0xc7, 0xc3, 0xc3,
-    0x07, 0xe0, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x3f, 0x00, 0x3f,
-    0x80, 0x37, 0xc0, 0x33, 0xe0, 0x31, 0xf0, 0x30,
-    0xfc, 0x03, 0xfe, 0x07, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0x07, 0xfc, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x0f, 0xf8, 0x1f, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f,
-    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xf0, 0xf0, 0xf0,
-    0xf0, 0xff, 0xf0, 0xff, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfe, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0x7f, 0x00, 0x3e, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0xff, 0xfc, 0xff, 0x3c, 0xf0, 0x3c, 0xf0,
-    0xfc, 0xff, 0xfc, 0xff, 0x3c, 0xf0, 0x3c, 0xf0,
-    0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0,
-    0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf8, 0x3c, 0xfc,
-    0x3e, 0xfc, 0x3f, 0xfc, 0x3f, 0x7c, 0x3f, 0x38,
-    0x1f, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc3, 0xc3, 0xcf, 0xf3,
-    0xfc, 0x3f, 0xf0, 0x0f, 0x3f, 0xfc, 0x3f, 0xfc,
-    0xf0, 0x0f, 0xfc, 0x3f, 0xcf, 0xf3, 0xc3, 0xc3,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00,
-    0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00,
-    0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03,
-    0xff, 0x07, 0xff, 0x07, 0xff, 0x03, 0xff, 0x01,
-    0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00,
-    0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30,
-    0x00, 0x38, 0x00, 0x3c, 0x00, 0x3e, 0x00, 0x3f,
-    0x80, 0x3f, 0xc0, 0x3f, 0xe0, 0x3f, 0xf0, 0x3f,
-    0xf8, 0x3f, 0xf8, 0x3f, 0xf0, 0x3f, 0xe0, 0x3f,
-    0xc0, 0x3f, 0x80, 0x3f, 0x00, 0x3f, 0x00, 0x3e,
-    0x00, 0x3c, 0x00, 0x38, 0x00, 0x30, 0x00, 0x20,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
-    0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xe0, 0x07,
-    0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x3c, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0xff, 0xfe, 0xff, 0xc7, 0xf3, 0xc7, 0xf3,
-    0xc7, 0xf3, 0xc7, 0xf3, 0xc7, 0xf3, 0xc7, 0xf3,
-    0xfe, 0xf3, 0xfc, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
-    0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
-    0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x38, 0x3e, 0x00, 0xfc, 0x00,
-    0xf8, 0x03, 0xf0, 0x07, 0x38, 0x0f, 0x1c, 0x1e,
-    0x0e, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x1c,
-    0x1e, 0x0e, 0x3c, 0x07, 0xf8, 0x03, 0xf0, 0x03,
-    0xc0, 0x0f, 0x00, 0x1f, 0x07, 0x3e, 0x0f, 0x3c,
-    0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f,
-    0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
-    0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xe0, 0x07,
-    0xc0, 0x03, 0x80, 0x01, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
-    0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xf8, 0x1f,
-    0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x00, 0x07, 0x00, 0x0e, 0xff, 0x1f, 0xff, 0x1f,
-    0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x70, 0x00,
-    0x38, 0x00, 0x1c, 0x00, 0xfe, 0x3f, 0xfe, 0x3f,
-    0x1c, 0x00, 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x30, 0x0c,
-    0x38, 0x1c, 0x3c, 0x3c, 0xfe, 0x7f, 0xfe, 0x7f,
-    0x3c, 0x3c, 0x38, 0x1c, 0x30, 0x0c, 0x20, 0x04,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xe0, 0x01,
-    0xf0, 0x03, 0xf0, 0x03, 0xf8, 0x07, 0xf8, 0x07,
-    0xfc, 0x0f, 0xfc, 0x0f, 0xfe, 0x1f, 0xfe, 0x1f,
-    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0xfe, 0x1f, 0xfe, 0x1f,
-    0xfc, 0x0f, 0xfc, 0x0f, 0xf8, 0x07, 0xf8, 0x07,
-    0xf0, 0x03, 0xf0, 0x03, 0xe0, 0x01, 0xe0, 0x01,
-    0xc0, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-    0xe0, 0x07, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x38, 0x1c, 0x30, 0x0c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0x38, 0x07,
-    0x38, 0x07, 0x38, 0x07, 0xff, 0x3f, 0xff, 0x3f,
-    0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07,
-    0x38, 0x07, 0x38, 0x07, 0xff, 0x3f, 0xff, 0x3f,
-    0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x38,
-    0x0f, 0x30, 0x0f, 0x30, 0x0f, 0x00, 0x0f, 0x00,
-    0xfe, 0x0f, 0xfc, 0x1f, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x03, 0x3c, 0x03, 0x3c,
-    0x07, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x06, 0x30, 0x0f, 0x38, 0x0f, 0x3c, 0x06, 0x1e,
-    0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
-    0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00,
-    0x0f, 0x18, 0x07, 0x3c, 0x03, 0x3c, 0x01, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x03, 0xf8, 0x07, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x3c, 0x0f, 0x38, 0x07, 0xf0, 0x03, 0xf0, 0x03,
-    0xfc, 0x30, 0xfe, 0x38, 0xcf, 0x1f, 0xcf, 0x1f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3f, 0xfc, 0x1c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0x78, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x03, 0xe0, 0x01,
-    0xe0, 0x00, 0xe0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xe0, 0x00, 0xe0, 0x00,
-    0xe0, 0x01, 0xc0, 0x03, 0x80, 0x0f, 0x00, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x00, 0xf0, 0x01, 0xc0, 0x03, 0x80, 0x07,
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x07,
-    0x80, 0x07, 0xc0, 0x03, 0xf0, 0x01, 0xf0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x38, 0x3c, 0x3c, 0x78, 0x1e,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff,
-    0xf0, 0x0f, 0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c,
-    0x1c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xe0, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x20, 0x00, 0x30, 0x00, 0x38, 0x00, 0x3c,
-    0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
-    0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
-    0x1e, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x03, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x0f, 0xf8, 0x1f, 0x3c, 0x3c, 0x1e, 0x78,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x8f, 0xf1, 0xcf, 0xf3, 0xcf, 0xf3, 0x8f, 0xf1,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x1e, 0x78, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x03, 0xc0, 0x03, 0xe0, 0x03, 0xf0, 0x03,
-    0xf8, 0x03, 0xfc, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x07, 0xfc, 0x0f, 0x0e, 0x1c, 0x07, 0x3c,
-    0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07,
-    0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00,
-    0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x0e, 0x00,
-    0x0f, 0x30, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f,
-    0xe0, 0x0f, 0xf0, 0x0f, 0x78, 0x0f, 0x3c, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0xc0, 0x3f, 0xc0, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0xff, 0x0f, 0xff, 0x1f, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x03, 0xf8, 0x03, 0x3c, 0x00, 0x1e, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0xff, 0x0f, 0xff, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
-    0xe0, 0x01, 0xe0, 0x01, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e,
-    0xfc, 0x0f, 0xfc, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0xfe, 0x3f, 0xfc, 0x3f, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x1e, 0x00, 0x0f, 0xfc, 0x07, 0xfc, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
-    0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e,
-    0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
-    0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x78, 0x00, 0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03,
-    0x80, 0x07, 0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x78, 0x00,
-    0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07,
-    0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
-    0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3e, 0x00, 0x1f, 0x80, 0x0f,
-    0xc0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x8f, 0x3f, 0xcf, 0x3f, 0xcf, 0x3f, 0xcf, 0x3f,
-    0xcf, 0x3f, 0xcf, 0x3f, 0xcf, 0x1f, 0x8f, 0x0f,
-    0x0f, 0x00, 0x0f, 0x00, 0xfe, 0x0f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0xf8, 0x07,
-    0x3c, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c,
-    0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x1c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x1c, 0xff, 0x0f, 0xff, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c,
-    0x1e, 0x38, 0x1e, 0x30, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x1e, 0x30, 0x1e, 0x38,
-    0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x01, 0xff, 0x03, 0xbc, 0x07, 0x3c, 0x0f,
-    0x3c, 0x1e, 0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c, 0x3c, 0x1e,
-    0x3c, 0x0f, 0xbc, 0x07, 0xff, 0x03, 0xff, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x3c, 0x3c, 0x38,
-    0x3c, 0x30, 0x3c, 0x20, 0x3c, 0x03, 0x3c, 0x03,
-    0xfc, 0x03, 0xfc, 0x03, 0x3c, 0x03, 0x3c, 0x03,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x20, 0x3c, 0x30,
-    0x3c, 0x38, 0x3c, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x3c, 0x3c, 0x38,
-    0x3c, 0x30, 0x3c, 0x20, 0x3c, 0x03, 0x3c, 0x03,
-    0xfc, 0x03, 0xfc, 0x03, 0x3c, 0x03, 0x3c, 0x03,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x07, 0xf0, 0x0f, 0x78, 0x1c, 0x3c, 0x38,
-    0x1e, 0x30, 0x0e, 0x30, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0xcf, 0x3f, 0xcf, 0x3f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0e, 0x3c, 0x1e, 0x3c,
-    0x3c, 0x3c, 0x78, 0x3e, 0xf0, 0x37, 0xe0, 0x33,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0x07, 0xfc, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x3c, 0x3f, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e, 0x3c, 0x0f,
-    0xfc, 0x07, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x07,
-    0x3c, 0x0f, 0x3c, 0x1e, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3f, 0x3c, 0x3f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x20, 0x3c, 0x30,
-    0x3c, 0x38, 0x3c, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x07, 0xe0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xcf, 0xf3, 0x8f, 0xf1, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x07, 0x3c, 0x0f, 0x3c, 0x1f, 0x3c, 0x3f, 0x3c,
-    0x7f, 0x3c, 0xff, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0xcf, 0x3f, 0x8f, 0x3f, 0x0f, 0x3f, 0x0f, 0x3e,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf8, 0x07, 0xfc, 0x0f, 0x1e, 0x1e, 0x1e, 0x1e,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x1e, 0x1e, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1e, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e,
-    0xfc, 0x0f, 0xfc, 0x07, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xcf, 0x3c, 0xcf, 0x3c,
-    0xcf, 0x3f, 0xcf, 0x3f, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1c, 0x3c, 0x38,
-    0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x3c, 0x3c, 0x1c,
-    0xfc, 0x0f, 0xfc, 0x07, 0x3c, 0x07, 0x3c, 0x0e,
-    0x3c, 0x1c, 0x3c, 0x1c, 0x3c, 0x38, 0x3c, 0x38,
-    0x3c, 0x38, 0x3c, 0x38, 0x3f, 0x38, 0x3f, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x00, 0x3c, 0x00,
-    0xf8, 0x00, 0xf0, 0x03, 0xc0, 0x0f, 0x00, 0x1f,
-    0x00, 0x3c, 0x00, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xc7, 0xe3,
-    0xc3, 0xc3, 0xc1, 0x83, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
-    0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x8f, 0xf1, 0x8f, 0xf1,
-    0xcf, 0xf3, 0xcf, 0xf3, 0xef, 0xf7, 0xef, 0xf7,
-    0x7e, 0x7e, 0x7e, 0x7e, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x1e, 0x78, 0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f,
-    0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07,
-    0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c, 0x1e, 0x78,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c, 0x78, 0x1e,
-    0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0x78,
-    0x03, 0x3c, 0x01, 0x1e, 0x00, 0x0f, 0x80, 0x07,
-    0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00,
-    0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x0f, 0xc0,
-    0x0f, 0xe0, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0x3f, 0x00,
-    0xfc, 0x00, 0xfc, 0x00, 0xf0, 0x03, 0xf0, 0x03,
-    0xc0, 0x0f, 0xc0, 0x0f, 0x00, 0x3f, 0x00, 0x3f,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x30, 0x00, 0x30,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x07, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0xe0, 0x00,
-    0xc0, 0x03, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x3c, 0x07, 0x3c, 0x0e, 0x3c, 0x1c, 0x3c, 0x1c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x1c, 0x3c, 0x1c, 0xfc, 0x0f, 0xfc, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x1e, 0x1c, 0x0f, 0x3c, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x38, 0x1e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x0f, 0xc0, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0xf0, 0x0f, 0xf8, 0x0f,
-    0x3c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x1f, 0x0f, 0xfe, 0x3d, 0xfc, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x3c, 0x0e,
-    0x3c, 0x0c, 0x3c, 0x0c, 0x3c, 0x00, 0x3c, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xfc, 0x3d,
-    0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0e, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x07, 0x0f, 0x0e, 0x0f,
-    0xfc, 0x03, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x0f, 0xbc, 0x1f,
-    0xfc, 0x3c, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3f, 0x3c, 0x3f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x1c,
-    0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x38, 0x3c, 0x1c,
-    0x3c, 0x0e, 0x3c, 0x07, 0xbc, 0x03, 0xfc, 0x01,
-    0xfc, 0x01, 0xfc, 0x03, 0x3c, 0x07, 0x3c, 0x0e,
-    0x3c, 0x1c, 0x3c, 0x38, 0x3f, 0x38, 0x3f, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3f, 0x3c, 0x7f, 0x7e,
-    0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xcf, 0xf3,
-    0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
-    0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f,
-    0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f,
-    0x7c, 0x1e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x1e, 0xfc, 0x0f, 0xfc, 0x07,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xfc, 0x3d,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x1e, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x87, 0x07, 0xcf, 0x0f,
-    0xfc, 0x1c, 0x7c, 0x38, 0x3c, 0x38, 0x3c, 0x38,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x3e, 0x00, 0xfc, 0x00,
-    0xf0, 0x03, 0xc0, 0x07, 0x00, 0x0f, 0x00, 0x1e,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xff, 0x0f, 0xff, 0x0f,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x38, 0xe0, 0x3c, 0xc0, 0x0f, 0x80, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
-    0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0,
-    0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
-    0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
-    0xff, 0xff, 0xff, 0xff, 0x7e, 0x7e, 0x3c, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8,
-    0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07,
-    0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0x78, 0x1e,
-    0x3c, 0x3c, 0x1e, 0x78, 0x0f, 0xf0, 0x07, 0xe0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0e, 0x3c, 0xfc, 0x3f, 0xf8, 0x3f,
-    0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x07,
-    0xff, 0x03, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x1f,
-    0x07, 0x0e, 0x03, 0x07, 0x80, 0x03, 0xc0, 0x01,
-    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
-    0x0e, 0x30, 0x07, 0x38, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x3e, 0x00, 0x3f, 0x80, 0x03, 0xc0, 0x01,
-    0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
-    0xfc, 0x00, 0xfc, 0x00, 0xc0, 0x01, 0xc0, 0x01,
-    0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
-    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x3f, 0x00, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x7c, 0x00, 0xfc, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03,
-    0x00, 0x3f, 0x00, 0x3f, 0x80, 0x03, 0x80, 0x03,
-    0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03,
-    0xc0, 0x03, 0xc0, 0x01, 0xfc, 0x00, 0x7c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x78, 0x38, 0xfc, 0x3c, 0xce, 0x0f, 0x87, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x07, 0x38,
-    0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38,
-    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x1c, 0x38,
-    0x0e, 0x30, 0x0f, 0x30, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x30, 0x0e, 0x30, 0x1c, 0x38, 0x38, 0x1c,
-    0xf0, 0x0f, 0xe0, 0x0f, 0x00, 0x0f, 0x00, 0x0e,
-    0x00, 0x1c, 0x00, 0x1c, 0xfc, 0x0f, 0xfc, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x07,
-    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
-    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
-    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x1c, 0x0e, 0x1c, 0x0e, 0xf0, 0x03, 0xe0, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x3c, 0x38,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x0f,
-    0x00, 0x0f, 0x00, 0x0e, 0x00, 0x1c, 0x00, 0x1c,
-    0xf0, 0x0f, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
-    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
-    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
-    0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c, 0x1c, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
-    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
-    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
-    0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x01, 0xf0, 0x03, 0x1c, 0x0e, 0x1c, 0x0e,
-    0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x00,
-    0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
-    0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
-    0x38, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x38, 0x3c, 0x30,
-    0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x0f, 0xfc, 0x0f,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x30, 0x3c, 0x38, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1c, 0x1e, 0x38, 0x3f,
-    0xf0, 0x73, 0xe0, 0xf3, 0xc0, 0xf3, 0xc0, 0x73,
-    0xf8, 0x3f, 0xfc, 0x1f, 0xce, 0x03, 0xc7, 0x03,
-    0xc7, 0x07, 0xce, 0x1e, 0xfc, 0xfc, 0x78, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x3f, 0xf0, 0x3f, 0x38, 0x0f, 0x1c, 0x0f,
-    0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x3f, 0x0f, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01,
-    0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
-    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
-    0xf8, 0x01, 0x9c, 0x03, 0x0e, 0x07, 0x07, 0x0e,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
-    0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0e, 0x3c, 0xfc, 0x3f, 0xf8, 0x3f,
-    0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x07,
-    0xfc, 0x03, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf8, 0x1f, 0xfc, 0x3f,
-    0x0e, 0x70, 0x07, 0xe0, 0x07, 0x00, 0x07, 0x00,
-    0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00,
-    0x07, 0xe0, 0x0e, 0x70, 0xfc, 0x3f, 0xf8, 0x1f,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x38, 0x07, 0x3c, 0x0e, 0x3c, 0x0c, 0x3c, 0x0c,
-    0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0x3f, 0x38, 0x3f, 0x1c, 0xff, 0x0f, 0xff, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x07, 0xe0, 0x0e, 0x70, 0x1c, 0x38, 0x38, 0x1c,
-    0x70, 0x0e, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
-    0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03,
-    0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, 0xff, 0x1f,
-    0x3c, 0x3c, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x3c,
-    0xfc, 0x1f, 0xfc, 0x0f, 0x3c, 0x30, 0x3c, 0x38,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0xff, 0x3c, 0xff,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0xff, 0xf8, 0xff, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x3f,
-    0x80, 0x77, 0xc0, 0xe3, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc7, 0x03, 0xee, 0x01, 0xfc, 0x00, 0x78, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
-    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
-    0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-    0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x07,
-    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
-    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
-    0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
-    0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x07, 0x3c, 0x0f, 0x3c,
-    0x1f, 0x3c, 0x3f, 0x3c, 0x7f, 0x3c, 0xff, 0x3c,
-    0xff, 0x3d, 0xef, 0x3f, 0xcf, 0x3f, 0x8f, 0x3f,
-    0x0f, 0x3f, 0x0f, 0x3e, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0xf0, 0x0f,
-    0x38, 0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x38, 0x0f,
-    0xf0, 0x3f, 0xe0, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x38, 0x07, 0x1c, 0x0e, 0x1c, 0x0e, 0x38, 0x07,
-    0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x60, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0x60, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0x00,
-    0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00,
-    0x0f, 0x00, 0x07, 0x00, 0x07, 0x38, 0x07, 0x38,
-    0x07, 0x38, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x20, 0x0f, 0x30,
-    0x0f, 0x38, 0x0f, 0x1c, 0x0f, 0x0e, 0x0f, 0x07,
-    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
-    0x38, 0x00, 0x1c, 0x00, 0x0e, 0x3e, 0x07, 0x7f,
-    0x83, 0xf3, 0xc1, 0xf1, 0x00, 0x38, 0x00, 0x1c,
-    0x00, 0x0e, 0x00, 0x07, 0x80, 0xff, 0xc0, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x20, 0x0f, 0x30,
-    0x0f, 0x38, 0x0f, 0x1c, 0x0f, 0x0e, 0x0f, 0x07,
-    0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
-    0x38, 0x3c, 0x1c, 0x3e, 0x0e, 0x3f, 0x87, 0x3d,
-    0xc3, 0x3c, 0x61, 0x3c, 0xf0, 0x3f, 0xf0, 0x3f,
-    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0xe0, 0x07,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-    0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0x78, 0x1e,
-    0x3c, 0x0f, 0x9e, 0x07, 0xcf, 0x03, 0xcf, 0x03,
-    0x9e, 0x07, 0x3c, 0x0f, 0x78, 0x1e, 0xf0, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xcf, 0x03, 0x9e, 0x07,
-    0x3c, 0x0f, 0x78, 0x1e, 0xf0, 0x3c, 0xf0, 0x3c,
-    0x78, 0x1e, 0x3c, 0x0f, 0x9e, 0x07, 0xcf, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
-    0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xff, 0xf0, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf0, 0xff,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xfc, 0xf0, 0xfc,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xfc, 0xff, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0xff, 0xfc,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
-    0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xfc, 0xf0, 0xfc,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xfc, 0xff, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0xff, 0xfc,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xff, 0xf0, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf0, 0xff,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xff, 0xff, 0xff,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x7c, 0x3c, 0xfe, 0x3e,
-    0xcf, 0x1f, 0x87, 0x0f, 0x87, 0x03, 0x87, 0x03,
-    0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
-    0x87, 0x0f, 0xcf, 0x1f, 0xfe, 0x3d, 0xfc, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf8, 0x01, 0xfc, 0x03, 0x0e, 0x07, 0x0e, 0x07,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x8f, 0x07,
-    0xcf, 0x03, 0xcf, 0x03, 0x8f, 0x07, 0x0f, 0x0f,
-    0x0f, 0x0e, 0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x1c,
-    0x0f, 0x1c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
-    0x0f, 0x38, 0x1e, 0x30, 0x3c, 0x00, 0x78, 0x00,
-    0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03,
-    0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
-    0x1e, 0x30, 0x0f, 0x38, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x3f, 0xfc, 0x3f,
-    0xce, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
-    0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
-    0x87, 0x03, 0xce, 0x01, 0xfc, 0x00, 0x78, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-    0x3c, 0x1c, 0x3c, 0x1e, 0xfc, 0x0f, 0xfc, 0x07,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1c, 0x00,
-    0x0f, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0xc7, 0x07,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
-    0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
-    0x38, 0x1c, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38,
-    0x1c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x07,
-    0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x0e, 0x1c,
-    0x07, 0x38, 0x07, 0x38, 0xff, 0x3f, 0xff, 0x3f,
-    0x07, 0x38, 0x07, 0x38, 0x0e, 0x1c, 0x0e, 0x1c,
-    0x1c, 0x0e, 0x38, 0x07, 0xf0, 0x03, 0xe0, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0x03, 0xf8, 0x07, 0x3c, 0x0f, 0x1e, 0x1e,
-    0x0f, 0x3c, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38,
-    0x07, 0x38, 0x07, 0x38, 0x0e, 0x1c, 0x1e, 0x1e,
-    0x1c, 0x0e, 0x3c, 0x0f, 0x38, 0x07, 0x38, 0x07,
-    0x38, 0x07, 0x38, 0x07, 0x3f, 0x3f, 0x3f, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x3f, 0xc0, 0x3f, 0xe0, 0x00, 0xe0, 0x00,
-    0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0f,
-    0xe0, 0x1f, 0xf0, 0x3f, 0x38, 0x3c, 0x1c, 0x38,
-    0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38,
-    0x1c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0xfc, 0x3f,
-    0xce, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
-    0xcf, 0xf3, 0xce, 0xf3, 0xfc, 0x3f, 0xf8, 0x1f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x70,
-    0x00, 0x38, 0x00, 0x1c, 0xf8, 0x1f, 0xfc, 0x3f,
-    0x0e, 0x77, 0x8f, 0xf3, 0xcf, 0xf3, 0xef, 0xf1,
-    0xff, 0xf0, 0xff, 0x70, 0xfc, 0x3f, 0xfc, 0x1f,
-    0x1c, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x07, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0f, 0xc0, 0x0f, 0xe0, 0x01, 0xf0, 0x00,
-    0x78, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
-    0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x00, 0x3c, 0x00,
-    0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x78, 0x00,
-    0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x0f, 0x00, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0xf0, 0x00,
-    0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f,
-    0x00, 0x1e, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07,
-    0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x70, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x0f,
-    0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
-    0x78, 0x00, 0x78, 0x00, 0xf0, 0x00, 0xe0, 0x01,
-    0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x0e,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x3f, 0x80, 0x7f, 0xc0, 0xf3, 0xc0, 0xf3,
-    0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
-    0xcf, 0x03, 0xcf, 0x03, 0xcf, 0x03, 0xcf, 0x03,
-    0xcf, 0x03, 0xcf, 0x03, 0xfe, 0x01, 0xfc, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
-    0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x78, 0x38, 0xfc, 0x3c,
-    0xcf, 0x0f, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
-    0x38, 0x07, 0x1c, 0x0e, 0x1c, 0x0e, 0x38, 0x07,
-    0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
-    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
-    0x00, 0x0f, 0x00, 0x0f, 0x07, 0x0f, 0x0f, 0x0f,
-    0x1e, 0x0f, 0x3c, 0x0f, 0x78, 0x0f, 0xf0, 0x0f,
-    0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f, 0x00, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xcf, 0x03, 0xef, 0x07,
-    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
-    0x3c, 0x0f, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0xfc, 0x00,
-    0xce, 0x01, 0xc7, 0x03, 0xe0, 0x00, 0x70, 0x00,
-    0x38, 0x00, 0x1c, 0x00, 0x0e, 0x03, 0x07, 0x03,
-    0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
-    0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
-    0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
-    0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x3f, 0xfe, 0x7f, 0x07, 0xe0, 0x03, 0xc0, 0x33, 0xcc, 0x33, 0xcc,
+  0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xf3, 0xcf, 0xf3, 0xcf,
+  0xe3, 0xc7, 0xc3, 0xc3, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x07, 0xe0,
+  0xfe, 0x7f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff,
+  0xcf, 0xf3, 0xcf, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1c, 0x0e, 0x3e, 0x1f, 0xff, 0x3f, 0xff, 0x3f,
+  0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfc, 0x0f,
+  0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01, 0xc0, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01,
+  0xf0, 0x03, 0xf8, 0x07, 0xfc, 0x0f, 0xfe, 0x1f, 0xff, 0x3f, 0xff, 0x3f,
+  0xfe, 0x1f, 0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01, 0xc0, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0x3e, 0x7c, 0x3f, 0xfc,
+  0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3e, 0x7c, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xdc, 0x3b,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xfc, 0x1f, 0xf8,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x1f,
+  0x3c, 0x3c, 0x1c, 0x38, 0x0c, 0x30, 0x0c, 0x30, 0x0c, 0x30, 0x0c, 0x30,
+  0x1c, 0x38, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x0f, 0xf0, 0x07, 0xe0, 0xc3, 0xc3, 0xe3, 0xc7, 0xf3, 0xcf, 0xf3, 0xcf,
+  0xf3, 0xcf, 0xf3, 0xcf, 0xe3, 0xc7, 0xc3, 0xc3, 0x07, 0xe0, 0x0f, 0xf0,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x3f, 0x00, 0x3f,
+  0x80, 0x37, 0xc0, 0x33, 0xe0, 0x31, 0xf0, 0x30, 0xfc, 0x03, 0xfe, 0x07,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0x07, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x1f,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03,
+  0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xf0, 0xff,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfe, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0x7f, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xfc, 0xff, 0x3c, 0xf0, 0x3c, 0xf0,
+  0xfc, 0xff, 0xfc, 0xff, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0,
+  0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf8, 0x3c, 0xfc,
+  0x3e, 0xfc, 0x3f, 0xfc, 0x3f, 0x7c, 0x3f, 0x38, 0x1f, 0x00, 0x0e, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc3, 0xc3, 0xcf, 0xf3,
+  0xfc, 0x3f, 0xf0, 0x0f, 0x3f, 0xfc, 0x3f, 0xfc, 0xf0, 0x0f, 0xfc, 0x3f,
+  0xcf, 0xf3, 0xc3, 0xc3, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00,
+  0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, 0x7f, 0x00, 0xff, 0x00,
+  0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0xff, 0x07, 0xff, 0x03, 0xff, 0x01,
+  0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00, 0x0f, 0x00, 0x07, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x20, 0x00, 0x30, 0x00, 0x38, 0x00, 0x3c, 0x00, 0x3e, 0x00, 0x3f,
+  0x80, 0x3f, 0xc0, 0x3f, 0xe0, 0x3f, 0xf0, 0x3f, 0xf8, 0x3f, 0xf8, 0x3f,
+  0xf0, 0x3f, 0xe0, 0x3f, 0xc0, 0x3f, 0x80, 0x3f, 0x00, 0x3f, 0x00, 0x3e,
+  0x00, 0x3c, 0x00, 0x38, 0x00, 0x30, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+  0xe0, 0x07, 0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xf8, 0x1f,
+  0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xfe, 0xff, 0xc7, 0xf3, 0xc7, 0xf3,
+  0xc7, 0xf3, 0xc7, 0xf3, 0xc7, 0xf3, 0xc7, 0xf3, 0xfe, 0xf3, 0xfc, 0xf3,
+  0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
+  0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x38,
+  0x3e, 0x00, 0xfc, 0x00, 0xf8, 0x03, 0xf0, 0x07, 0x38, 0x0f, 0x1c, 0x1e,
+  0x0e, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x1c, 0x1e, 0x0e, 0x3c, 0x07,
+  0xf8, 0x03, 0xf0, 0x03, 0xc0, 0x0f, 0x00, 0x1f, 0x07, 0x3e, 0x0f, 0x3c,
+  0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f,
+  0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
+  0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xe0, 0x07,
+  0xc0, 0x03, 0x80, 0x01, 0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+  0xe0, 0x07, 0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xe0, 0x07,
+  0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e,
+  0xff, 0x1f, 0xff, 0x1f, 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x70, 0x00,
+  0x38, 0x00, 0x1c, 0x00, 0xfe, 0x3f, 0xfe, 0x3f, 0x1c, 0x00, 0x38, 0x00,
+  0x70, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x30, 0x0c, 0x38, 0x1c, 0x3c, 0x3c,
+  0xfe, 0x7f, 0xfe, 0x7f, 0x3c, 0x3c, 0x38, 0x1c, 0x30, 0x0c, 0x20, 0x04,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xe0, 0x01,
+  0xf0, 0x03, 0xf0, 0x03, 0xf8, 0x07, 0xf8, 0x07, 0xfc, 0x0f, 0xfc, 0x0f,
+  0xfe, 0x1f, 0xfe, 0x1f, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+  0xfe, 0x1f, 0xfe, 0x1f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf8, 0x07, 0xf8, 0x07,
+  0xf0, 0x03, 0xf0, 0x03, 0xe0, 0x01, 0xe0, 0x01, 0xc0, 0x00, 0xc0, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0, 0x07,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+  0xe0, 0x07, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x1c, 0x30, 0x0c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0x38, 0x07,
+  0x38, 0x07, 0x38, 0x07, 0xff, 0x3f, 0xff, 0x3f, 0x38, 0x07, 0x38, 0x07,
+  0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0xff, 0x3f, 0xff, 0x3f,
+  0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x0f, 0x3c, 0x0f, 0x38, 0x0f, 0x30, 0x0f, 0x30, 0x0f, 0x00, 0x0f, 0x00,
+  0xfe, 0x0f, 0xfc, 0x1f, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x03, 0x3c, 0x03, 0x3c, 0x07, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x30, 0x0f, 0x38,
+  0x0f, 0x3c, 0x06, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
+  0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x18, 0x07, 0x3c,
+  0x03, 0x3c, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf8, 0x07, 0x3c, 0x0f, 0x3c, 0x0f,
+  0x3c, 0x0f, 0x38, 0x07, 0xf0, 0x03, 0xf0, 0x03, 0xfc, 0x30, 0xfe, 0x38,
+  0xcf, 0x1f, 0xcf, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3f, 0xfc, 0x1c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x03, 0xe0, 0x01, 0xe0, 0x00, 0xe0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x01, 0xc0, 0x03,
+  0x80, 0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0x01, 0xc0, 0x03, 0x80, 0x07,
+  0x00, 0x07, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x07,
+  0x80, 0x07, 0xc0, 0x03, 0xf0, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x38, 0x3c, 0x3c, 0x78, 0x1e,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x78, 0x1e, 0x3c, 0x3c, 0x1c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x20, 0x00, 0x30, 0x00, 0x38, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f,
+  0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
+  0x1e, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x1f,
+  0x3c, 0x3c, 0x1e, 0x78, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x8f, 0xf1, 0xcf, 0xf3, 0xcf, 0xf3, 0x8f, 0xf1, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c, 0xf8, 0x1f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x03, 0xc0, 0x03, 0xe0, 0x03, 0xf0, 0x03, 0xf8, 0x03, 0xfc, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xfc, 0x0f, 0x0e, 0x1c, 0x07, 0x3c,
+  0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
+  0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x0e, 0x00,
+  0x0f, 0x30, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x1f, 0x3e, 0x0f, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x3c, 0x00, 0x3c, 0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f, 0xe0, 0x0f, 0xf0, 0x0f,
+  0x78, 0x0f, 0x3c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0xff, 0x3f, 0xff, 0x3f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0xff, 0x0f, 0xff, 0x1f,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf8, 0x03,
+  0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0xff, 0x0f, 0xff, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
+  0xe0, 0x01, 0xe0, 0x01, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f, 0x1f, 0x3e, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xfc, 0x0f,
+  0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xfe, 0x3f, 0xfc, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0xfc, 0x07, 0xfc, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+  0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
+  0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, 0x00,
+  0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x78, 0x00,
+  0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x1e,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03,
+  0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3e, 0x00, 0x1f, 0x80, 0x0f,
+  0xc0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x8f, 0x3f, 0xcf, 0x3f, 0xcf, 0x3f, 0xcf, 0x3f,
+  0xcf, 0x3f, 0xcf, 0x3f, 0xcf, 0x1f, 0x8f, 0x0f, 0x0f, 0x00, 0x0f, 0x00,
+  0xfe, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0xf8, 0x07,
+  0x3c, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x07, 0xff, 0x0f,
+  0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c,
+  0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c, 0xff, 0x0f, 0xff, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c, 0x1e, 0x38, 0x1e, 0x30,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x1e, 0x30, 0x1e, 0x38, 0x3c, 0x3c, 0x78, 0x1e,
+  0xf0, 0x0f, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x01, 0xff, 0x03, 0xbc, 0x07, 0x3c, 0x0f,
+  0x3c, 0x1e, 0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c, 0x3c, 0x1e,
+  0x3c, 0x0f, 0xbc, 0x07, 0xff, 0x03, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+  0x3c, 0x3c, 0x3c, 0x38, 0x3c, 0x30, 0x3c, 0x20, 0x3c, 0x03, 0x3c, 0x03,
+  0xfc, 0x03, 0xfc, 0x03, 0x3c, 0x03, 0x3c, 0x03, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x20, 0x3c, 0x30, 0x3c, 0x38, 0x3c, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x3c, 0x3c, 0x38, 0x3c, 0x30, 0x3c, 0x20,
+  0x3c, 0x03, 0x3c, 0x03, 0xfc, 0x03, 0xfc, 0x03, 0x3c, 0x03, 0x3c, 0x03,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xf0, 0x0f, 0x78, 0x1c, 0x3c, 0x38,
+  0x1e, 0x30, 0x0e, 0x30, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0xcf, 0x3f, 0xcf, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c, 0x0e, 0x3c, 0x1e, 0x3c,
+  0x3c, 0x3c, 0x78, 0x3e, 0xf0, 0x37, 0xe0, 0x33, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0x07, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3c, 0x3f, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e, 0x3c, 0x0f,
+  0xfc, 0x07, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x07, 0x3c, 0x0f, 0x3c, 0x1e,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3f, 0x3c, 0x3f, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x20, 0x3c, 0x30, 0x3c, 0x38, 0x3c, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0x8f, 0xf1,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3c, 0x0f, 0x3c,
+  0x1f, 0x3c, 0x3f, 0x3c, 0x7f, 0x3c, 0xff, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+  0xcf, 0x3f, 0x8f, 0x3f, 0x0f, 0x3f, 0x0f, 0x3e, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x07, 0xfc, 0x0f, 0x1e, 0x1e, 0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e, 0x1e, 0x1e,
+  0xfc, 0x0f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1e, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e, 0xfc, 0x0f, 0xfc, 0x07,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xcf, 0x3c, 0xcf, 0x3c, 0xcf, 0x3f, 0xcf, 0x3f, 0xfe, 0x1f, 0xfc, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x07, 0xff, 0x0f, 0x3c, 0x1c, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x38,
+  0x3c, 0x3c, 0x3c, 0x1c, 0xfc, 0x0f, 0xfc, 0x07, 0x3c, 0x07, 0x3c, 0x0e,
+  0x3c, 0x1c, 0x3c, 0x1c, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x38,
+  0x3f, 0x38, 0x3f, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x00, 0x3c, 0x00, 0xf8, 0x00, 0xf0, 0x03,
+  0xc0, 0x0f, 0x00, 0x1f, 0x00, 0x3c, 0x00, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x1f, 0x3e, 0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0xcf, 0xf3, 0xc7, 0xe3, 0xc3, 0xc3, 0xc1, 0x83, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e,
+  0xfc, 0x0f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
+  0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x8f, 0xf1, 0x8f, 0xf1, 0xcf, 0xf3, 0xcf, 0xf3,
+  0xef, 0xf7, 0xef, 0xf7, 0x7e, 0x7e, 0x7e, 0x7e, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
+  0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07,
+  0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c, 0x1e, 0x78, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x0f, 0xf0, 0x07, 0x78, 0x03, 0x3c, 0x01, 0x1e, 0x00, 0x0f, 0x80, 0x07,
+  0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00,
+  0x0f, 0x80, 0x0f, 0xc0, 0x0f, 0xe0, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0xfc, 0x00, 0xfc, 0x00,
+  0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x0f, 0xc0, 0x0f, 0x00, 0x3f, 0x00, 0x3f,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+  0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x07, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x03, 0x80, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x01, 0xfc, 0x03, 0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+  0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x9e, 0x0f,
+  0xfc, 0x3c, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x01, 0xfc, 0x03, 0x3c, 0x07, 0x3c, 0x0e,
+  0x3c, 0x1c, 0x3c, 0x1c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x1c, 0x3c, 0x1c, 0xfc, 0x0f, 0xfc, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+  0x1e, 0x1c, 0x0f, 0x3c, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x38, 0x1e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x0f, 0xc0, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0xf0, 0x0f, 0xf8, 0x0f, 0x3c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f,
+  0xfe, 0x3d, 0xfc, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+  0x38, 0x07, 0x3c, 0x0e, 0x3c, 0x0c, 0x3c, 0x0c, 0x3c, 0x00, 0x3c, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x38, 0xfc, 0x3d, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0f,
+  0xfc, 0x0f, 0xf8, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x07, 0x0f, 0x0e, 0x0f,
+  0xfc, 0x03, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x0f, 0xbc, 0x1f, 0xfc, 0x3c, 0x7c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3f, 0x3c, 0x3f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03,
+  0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x18, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x3c, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x1c,
+  0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x38, 0x3c, 0x1c, 0x3c, 0x0e, 0x3c, 0x07,
+  0xbc, 0x03, 0xfc, 0x01, 0xfc, 0x01, 0xfc, 0x03, 0x3c, 0x07, 0x3c, 0x0e,
+  0x3c, 0x1c, 0x3c, 0x38, 0x3f, 0x38, 0x3f, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3f, 0x3c, 0x7f, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xcf, 0xf3,
+  0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
+  0xcf, 0xf3, 0xcf, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f, 0x3c, 0x1c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+  0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc7, 0x07, 0xef, 0x0f, 0x7c, 0x1e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e,
+  0xfc, 0x0f, 0xfc, 0x07, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf8, 0x38, 0xfc, 0x3d, 0x1e, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x1e, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0xc0, 0x3f, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x07, 0xcf, 0x0f,
+  0xfc, 0x1c, 0x7c, 0x38, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c, 0x3e, 0x00, 0xfc, 0x00,
+  0xf0, 0x03, 0xc0, 0x07, 0x00, 0x0f, 0x00, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xff, 0x0f, 0xff, 0x0f, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x38, 0xe0, 0x3c, 0xc0, 0x0f, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f,
+  0xe0, 0x07, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0,
+  0x0f, 0xf0, 0x0f, 0xf0, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3,
+  0xff, 0xff, 0xff, 0xff, 0x7e, 0x7e, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8,
+  0x3c, 0x3c, 0x78, 0x1e, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0xe0, 0x07,
+  0xf0, 0x0f, 0x78, 0x1e, 0x3c, 0x3c, 0x1e, 0x78, 0x0f, 0xf0, 0x07, 0xe0,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0e, 0x3c,
+  0xfc, 0x3f, 0xf8, 0x3f, 0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x07,
+  0xff, 0x03, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x1f, 0x07, 0x0e, 0x03, 0x07,
+  0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+  0x0e, 0x30, 0x07, 0x38, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x3f,
+  0x80, 0x03, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
+  0xfc, 0x00, 0xfc, 0x00, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
+  0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x3f, 0x00, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0xfc, 0x00, 0xc0, 0x01, 0x80, 0x03,
+  0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x00, 0x3f, 0x00, 0x3f,
+  0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03,
+  0xc0, 0x03, 0xc0, 0x01, 0xfc, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x38, 0xfc, 0x3c,
+  0xce, 0x0f, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
+  0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x07, 0x38,
+  0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x1c, 0x38,
+  0x0e, 0x30, 0x0f, 0x30, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x30, 0x0e, 0x30, 0x1c, 0x38, 0x38, 0x1c,
+  0xf0, 0x0f, 0xe0, 0x0f, 0x00, 0x0f, 0x00, 0x0e, 0x00, 0x1c, 0x00, 0x1c,
+  0xfc, 0x0f, 0xfc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x07,
+  0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x38, 0x1f, 0x3c,
+  0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03, 0x00, 0x07, 0x00, 0x0f,
+  0xf8, 0x0f, 0xfc, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03,
+  0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+  0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x01, 0xfc, 0x03, 0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+  0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x9e, 0x0f,
+  0xfc, 0x3c, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0xf0, 0x03, 0x1c, 0x0e, 0x1c, 0x0e, 0xf0, 0x03, 0xe0, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x03, 0x00, 0x07, 0x00, 0x0f,
+  0xf8, 0x0f, 0xfc, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x9e, 0x0f, 0xfc, 0x3c, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x3c, 0x38,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x38, 0x38, 0x1c,
+  0xf0, 0x0f, 0xe0, 0x0f, 0x00, 0x0f, 0x00, 0x0e, 0x00, 0x1c, 0x00, 0x1c,
+  0xf0, 0x0f, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
+  0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x38, 0x1f, 0x3c,
+  0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00,
+  0xc0, 0x01, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x38, 0x1f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c, 0x1c, 0x38,
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00,
+  0xc0, 0x01, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+  0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+  0x1c, 0x0e, 0x1c, 0x0e, 0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x00,
+  0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x38, 0x3c, 0x30,
+  0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x30, 0x3c, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1c, 0x1e, 0x38, 0x3f, 0xf0, 0x73, 0xe0, 0xf3, 0xc0, 0xf3, 0xc0, 0x73,
+  0xf8, 0x3f, 0xfc, 0x1f, 0xce, 0x03, 0xc7, 0x03, 0xc7, 0x07, 0xce, 0x1e,
+  0xfc, 0xfc, 0x78, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x3f, 0xf0, 0x3f, 0x38, 0x0f, 0x1c, 0x0f,
+  0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0x3f, 0xff, 0x3f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x3f, 0x0f, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07,
+  0x1c, 0x0e, 0x0e, 0x1c, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+  0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x07, 0xfc, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e,
+  0xfc, 0x0f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1c, 0x00, 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00, 0xf8, 0x01, 0x9c, 0x03,
+  0x0e, 0x07, 0x07, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0x0f, 0xfe, 0x3d, 0xfc, 0x38,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x00,
+  0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0x0f,
+  0xfe, 0x3d, 0xfc, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0e, 0x3c, 0xfc, 0x3f, 0xf8, 0x3f, 0x00, 0x3c, 0x00, 0x1c,
+  0x00, 0x0e, 0x00, 0x07, 0xfc, 0x03, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x07, 0xfc, 0x0f, 0x0e, 0x1c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0e, 0x1c, 0xfc, 0x0f, 0xf8, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0e, 0x1c,
+  0xfc, 0x0f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf8, 0x1f, 0xfc, 0x3f,
+  0x0e, 0x70, 0x07, 0xe0, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00,
+  0x07, 0x00, 0x07, 0x00, 0x07, 0xe0, 0x0e, 0x70, 0xfc, 0x3f, 0xf8, 0x1f,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x3c, 0x0e,
+  0x3c, 0x0c, 0x3c, 0x0c, 0x3c, 0x00, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3f, 0x38, 0x3f, 0x1c, 0xff, 0x0f, 0xff, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x07, 0xe0, 0x0e, 0x70, 0x1c, 0x38, 0x38, 0x1c, 0x70, 0x0e, 0xe0, 0x07,
+  0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+  0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x0f, 0xff, 0x1f, 0x3c, 0x3c, 0x3c, 0x38, 0x3c, 0x38, 0x3c, 0x3c,
+  0xfc, 0x1f, 0xfc, 0x0f, 0x3c, 0x30, 0x3c, 0x38, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0xff, 0x3c, 0xff, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0xff, 0xf8, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x3f, 0x80, 0x77, 0xc0, 0xe3,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc7, 0x03, 0xee, 0x01, 0xfc, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
+  0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x01, 0xfc, 0x03, 0x00, 0x07, 0x00, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
+  0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x9e, 0x0f,
+  0xfc, 0x3c, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+  0x38, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xfc, 0x0f,
+  0x1e, 0x1e, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x1e, 0x1e, 0xfc, 0x0f, 0xf8, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01,
+  0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0x0f,
+  0xfe, 0x3d, 0xfc, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0xc7, 0x07, 0xef, 0x0f, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x07, 0x3c, 0x0f, 0x3c, 0x1f, 0x3c, 0x3f, 0x3c, 0x7f, 0x3c, 0xff, 0x3c,
+  0xff, 0x3d, 0xef, 0x3f, 0xcf, 0x3f, 0x8f, 0x3f, 0x0f, 0x3f, 0x0f, 0x3e,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0xf0, 0x0f,
+  0x38, 0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x38, 0x0f, 0xf0, 0x3f, 0xe0, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x1c, 0x0e, 0x38, 0x07,
+  0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x0f, 0x00, 0x07, 0x00,
+  0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x0f, 0x3c, 0xfe, 0x1f, 0xfc, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x3c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x20, 0x0f, 0x30, 0x0f, 0x38, 0x0f, 0x1c, 0x0f, 0x0e, 0x0f, 0x07,
+  0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+  0x0e, 0x3e, 0x07, 0x7f, 0x83, 0xf3, 0xc1, 0xf1, 0x00, 0x38, 0x00, 0x1c,
+  0x00, 0x0e, 0x00, 0x07, 0x80, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x20, 0x0f, 0x30, 0x0f, 0x38, 0x0f, 0x1c,
+  0x0f, 0x0e, 0x0f, 0x07, 0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00,
+  0x38, 0x3c, 0x1c, 0x3e, 0x0e, 0x3f, 0x87, 0x3d, 0xc3, 0x3c, 0x61, 0x3c,
+  0xf0, 0x3f, 0xf0, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xe0, 0x07, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
+  0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0x78, 0x1e,
+  0x3c, 0x0f, 0x9e, 0x07, 0xcf, 0x03, 0xcf, 0x03, 0x9e, 0x07, 0x3c, 0x0f,
+  0x78, 0x1e, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xcf, 0x03, 0x9e, 0x07, 0x3c, 0x0f, 0x78, 0x1e, 0xf0, 0x3c, 0xf0, 0x3c,
+  0x78, 0x1e, 0x3c, 0x0f, 0x9e, 0x07, 0xcf, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0,
+  0x0c, 0x0c, 0x0c, 0x0c, 0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+  0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c, 0xc0, 0xc0, 0xc0, 0xc0,
+  0x0c, 0x0c, 0x0c, 0x0c, 0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+  0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c, 0xc0, 0xc0, 0xc0, 0xc0,
+  0x0c, 0x0c, 0x0c, 0x0c, 0xc0, 0xc0, 0xc0, 0xc0, 0x0c, 0x0c, 0x0c, 0x0c,
+  0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+  0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+  0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+  0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33,
+  0xcc, 0xcc, 0xcc, 0xcc, 0x33, 0x33, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xcc,
+  0x33, 0x33, 0x33, 0x33, 0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+  0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc, 0xcf, 0xcf, 0xcf, 0xcf,
+  0xfc, 0xfc, 0xfc, 0xfc, 0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+  0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc, 0xcf, 0xcf, 0xcf, 0xcf,
+  0xfc, 0xfc, 0xfc, 0xfc, 0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc,
+  0xcf, 0xcf, 0xcf, 0xcf, 0xfc, 0xfc, 0xfc, 0xfc, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xff, 0x03, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xff, 0x3c, 0xff, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x03, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0xff, 0x3c, 0xff, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0x00, 0x3c, 0x00, 0x3c, 0xff, 0x3c, 0xff, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3c, 0xff, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+  0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xff, 0x03, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x03, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc, 0xf0, 0x00, 0xf0, 0x00,
+  0xf0, 0xff, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf0, 0xff,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xfc, 0xf0, 0xfc, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xff, 0xfc, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xfc, 0xff, 0xfc, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xfc, 0xf0, 0xfc,
+  0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xfc, 0xf0, 0xfc, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xfc, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xfc, 0xff, 0xfc, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0xff, 0xf0, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xff, 0xc0, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf0, 0xff,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xff, 0xff, 0xff, 0xff, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff,
+  0xc0, 0x03, 0xc0, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0xff, 0xc0, 0xff, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00,
+  0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+  0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+  0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+  0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+  0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+  0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x7c, 0x3c, 0xfe, 0x3e, 0xcf, 0x1f, 0x87, 0x0f,
+  0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
+  0x87, 0x0f, 0xcf, 0x1f, 0xfe, 0x3d, 0xfc, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0xfc, 0x03,
+  0x0e, 0x07, 0x0e, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x8f, 0x07,
+  0xcf, 0x03, 0xcf, 0x03, 0x8f, 0x07, 0x0f, 0x0f, 0x0f, 0x0e, 0x0f, 0x1c,
+  0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x1c, 0x0f, 0x1e, 0x0f, 0x0f, 0x0f, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
+  0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+  0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+  0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0x3f, 0xff, 0x3f, 0x0f, 0x38, 0x1e, 0x30, 0x3c, 0x00, 0x78, 0x00,
+  0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
+  0x78, 0x00, 0x3c, 0x00, 0x1e, 0x30, 0x0f, 0x38, 0xff, 0x3f, 0xff, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x3f, 0xfc, 0x3f, 0xce, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03,
+  0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0x87, 0x03, 0xce, 0x01,
+  0xfc, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c, 0x3c, 0x1e, 0xfc, 0x0f, 0xfc, 0x07,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x1c, 0x00, 0x0f, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0xc7, 0x07,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+  0xe0, 0x07, 0xf0, 0x0f, 0x38, 0x1c, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38,
+  0x1c, 0x38, 0x38, 0x1c, 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03,
+  0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xf0, 0x03,
+  0x38, 0x07, 0x1c, 0x0e, 0x0e, 0x1c, 0x0e, 0x1c, 0x07, 0x38, 0x07, 0x38,
+  0xff, 0x3f, 0xff, 0x3f, 0x07, 0x38, 0x07, 0x38, 0x0e, 0x1c, 0x0e, 0x1c,
+  0x1c, 0x0e, 0x38, 0x07, 0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf8, 0x07,
+  0x3c, 0x0f, 0x1e, 0x1e, 0x0f, 0x3c, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38,
+  0x07, 0x38, 0x07, 0x38, 0x0e, 0x1c, 0x1e, 0x1e, 0x1c, 0x0e, 0x3c, 0x0f,
+  0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x38, 0x07, 0x3f, 0x3f, 0x3f, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3f, 0xc0, 0x3f, 0xe0, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x80, 0x03,
+  0x00, 0x07, 0x00, 0x0f, 0xe0, 0x1f, 0xf0, 0x3f, 0x38, 0x3c, 0x1c, 0x38,
+  0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38, 0x1c, 0x38, 0x38, 0x1c,
+  0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0xfc, 0x3f, 0xce, 0xf3, 0xcf, 0xf3,
+  0xcf, 0xf3, 0xcf, 0xf3, 0xcf, 0xf3, 0xce, 0xf3, 0xfc, 0x3f, 0xf8, 0x1f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0xf8, 0x1f, 0xfc, 0x3f,
+  0x0e, 0x77, 0x8f, 0xf3, 0xcf, 0xf3, 0xef, 0xf1, 0xff, 0xf0, 0xff, 0x70,
+  0xfc, 0x3f, 0xfc, 0x1f, 0x1c, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0f, 0xc0, 0x0f, 0xe0, 0x01, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0x3c, 0x00, 0x3c, 0x00,
+  0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, 0x00, 0xe0, 0x01,
+  0xc0, 0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0xfe, 0x1f,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c,
+  0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0xf0, 0x00,
+  0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x1e, 0x00, 0x1e,
+  0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00, 0x70, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0e, 0x00, 0x0f, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01, 0xf0, 0x00,
+  0x78, 0x00, 0x78, 0x00, 0xf0, 0x00, 0xe0, 0x01, 0xc0, 0x03, 0x80, 0x07,
+  0x00, 0x0f, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3f, 0x80, 0x7f, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3, 0xc0, 0xf3,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0xc0, 0x03, 0xc0, 0x03, 0xcf, 0x03, 0xcf, 0x03, 0xcf, 0x03, 0xcf, 0x03,
+  0xcf, 0x03, 0xcf, 0x03, 0xfe, 0x01, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x78, 0x38, 0xfc, 0x3c, 0xcf, 0x0f, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0xf0, 0x03, 0x38, 0x07, 0x1c, 0x0e, 0x1c, 0x0e, 0x38, 0x07,
+  0xf0, 0x03, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xff, 0x00, 0xff, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f,
+  0x07, 0x0f, 0x0f, 0x0f, 0x1e, 0x0f, 0x3c, 0x0f, 0x78, 0x0f, 0xf0, 0x0f,
+  0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xcf, 0x03, 0xef, 0x07, 0x3c, 0x0f, 0x3c, 0x0f,
+  0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f, 0x3c, 0x0f,
+  0x3c, 0x0f, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0xfc, 0x00,
+  0xce, 0x01, 0xc7, 0x03, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+  0x0e, 0x03, 0x07, 0x03, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
+  0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
+  0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
 };
 
 static const txt_font_t large_font =
 {
-    "large", large_font_data, 16, 32,
+  "large",
+  large_font_data,
+  16,
+  32,
 };
diff --git a/games/NXDoom/textscreen/fonts/normal.h b/games/NXDoom/textscreen/fonts/normal.h
index 8b6d20ed5..4ecaf3787 100644
--- a/games/NXDoom/textscreen/fonts/normal.h
+++ b/games/NXDoom/textscreen/fonts/normal.h
@@ -1,524 +1,367 @@
-/* Font data generated from normal.png; do not edit.
-   Please see textscreen/fonts/README for copyright
-   information. */
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/fonts/normal.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Font data generated from normal.png; do not edit. Please see
+ * textscreen/fonts/README for copyright information.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 static const uint8_t normal_font_data[] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
-    0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xc3,
-    0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x36, 0x7f, 0x7f, 0x7f,
-    0x7f, 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x3e, 0x7f,
-    0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0xe7, 0xe7,
-    0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff,
-    0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
-    0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3,
-    0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42,
-    0x42, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
-    0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x78, 0x70, 0x58, 0x4c, 0x1e, 0x33,
-    0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c,
-    0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfc, 0xcc, 0xfc, 0x0c, 0x0c, 0x0c,
-    0x0c, 0x0e, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xe6, 0xe7, 0x67, 0x03, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7,
-    0x3c, 0xdb, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x7f, 0x1f,
-    0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7f, 0x7c,
-    0x78, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
-    0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-    0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0xdb, 0xdb, 0xdb, 0xde, 0xd8,
-    0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x3e, 0x63, 0x06, 0x1c, 0x36, 0x63, 0x63,
-    0x36, 0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
-    0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x7f,
-    0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0x7f,
-    0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-    0x03, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xff,
-    0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x1c, 0x3e,
-    0x3e, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x3e, 0x3e,
-    0x1c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18,
-    0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x36, 0x36, 0x7f, 0x36, 0x36,
-    0x36, 0x7f, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x3e, 0x63, 0x43, 0x03, 0x3e, 0x60,
-    0x60, 0x61, 0x63, 0x3e, 0x18, 0x18, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x43, 0x63, 0x30, 0x18,
-    0x0c, 0x06, 0x63, 0x61, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x6e, 0x3b,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0c, 0x0c, 0x0c, 0x06, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c,
-    0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff,
-    0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
-    0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x30, 0x18,
-    0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x66, 0xc3, 0xc3, 0xdb, 0xdb,
-    0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x1c, 0x1e, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x60, 0x30, 0x18, 0x0c,
-    0x06, 0x03, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x60, 0x60, 0x3c, 0x60,
-    0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x38, 0x3c, 0x36, 0x33, 0x7f,
-    0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7f, 0x03, 0x03, 0x03, 0x3f, 0x60,
-    0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x06, 0x03, 0x03, 0x3f, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7f, 0x63, 0x60, 0x60, 0x30, 0x18,
-    0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x3e, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x7e, 0x60,
-    0x60, 0x60, 0x30, 0x1e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
-    0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
-    0x00, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06,
-    0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-    0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60,
-    0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x63, 0x30, 0x18, 0x18,
-    0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x7b, 0x7b,
-    0x7b, 0x3b, 0x03, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63, 0x7f,
-    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x66,
-    0x66, 0x66, 0x66, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
-    0x03, 0x43, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1f, 0x36, 0x66, 0x66, 0x66, 0x66,
-    0x66, 0x66, 0x36, 0x1f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
-    0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
-    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x7b,
-    0x63, 0x63, 0x66, 0x5c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x7f, 0x63,
-    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x78, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x67, 0x66, 0x66, 0x36, 0x1e, 0x1e,
-    0x36, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x06,
-    0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xc3,
-    0xc3, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b, 0x73,
-    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x06,
-    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
-    0x63, 0x6b, 0x7b, 0x3e, 0x30, 0x70, 0x00, 0x00,
-    0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x36,
-    0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3e, 0x63, 0x63, 0x06, 0x1c, 0x30,
-    0x60, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xdb, 0x99, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3,
-    0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb,
-    0xdb, 0xff, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18,
-    0x3c, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xc3, 0x61, 0x30, 0x18, 0x0c,
-    0x06, 0x83, 0xc3, 0xff, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-    0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0x1c,
-    0x38, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x08, 0x1c, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
-    0x0c, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x3e,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x07, 0x06, 0x06, 0x1e, 0x36, 0x66,
-    0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x03,
-    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x30, 0x30, 0x3c, 0x36, 0x33,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x7f,
-    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06,
-    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x3e, 0x30, 0x33, 0x1e, 0x00,
-    0x00, 0x00, 0x07, 0x06, 0x06, 0x36, 0x6e, 0x66,
-    0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x00, 0x1c, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x00, 0x70, 0x60, 0x60,
-    0x60, 0x60, 0x60, 0x60, 0x66, 0x66, 0x3c, 0x00,
-    0x00, 0x00, 0x07, 0x06, 0x06, 0x66, 0x36, 0x1e,
-    0x1e, 0x36, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0xff, 0xdb,
-    0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
-    0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
-    0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x0f, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x3e, 0x30, 0x30, 0x78, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x6e, 0x66,
-    0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x06,
-    0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x08, 0x0c, 0x0c, 0x3f, 0x0c, 0x0c,
-    0x0c, 0x0c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
-    0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
-    0xdb, 0xdb, 0xff, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c,
-    0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1f, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x33, 0x18,
-    0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18,
-    0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18,
-    0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36, 0x63,
-    0x63, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
-    0x43, 0x66, 0x3c, 0x30, 0x60, 0x3e, 0x00, 0x00,
-    0x00, 0x00, 0x33, 0x00, 0x00, 0x33, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x30, 0x18, 0x0c, 0x00, 0x3e, 0x63, 0x7f,
-    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x1c, 0x36, 0x00, 0x1e, 0x30, 0x3e,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x33, 0x00, 0x00, 0x1e, 0x30, 0x3e,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x06, 0x0c, 0x18, 0x00, 0x1e, 0x30, 0x3e,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x1c, 0x36, 0x1c, 0x00, 0x1e, 0x30, 0x3e,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x06, 0x06,
-    0x66, 0x3c, 0x30, 0x60, 0x3c, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x7f,
-    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x7f,
-    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x7f,
-    0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x66, 0x00, 0x00, 0x1c, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x3c, 0x66, 0x00, 0x1c, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x06, 0x0c, 0x18, 0x00, 0x1c, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x63, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63,
-    0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x1c, 0x36, 0x1c, 0x00, 0x1c, 0x36, 0x63, 0x63,
-    0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x0c, 0x06, 0x00, 0x7f, 0x66, 0x06, 0x3e,
-    0x06, 0x06, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0xd8,
-    0x7e, 0x1b, 0x3b, 0xee, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0x36, 0x33, 0x33, 0x7f, 0x33,
-    0x33, 0x33, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0c, 0x1e, 0x33, 0x00, 0x33, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x06, 0x0c, 0x18, 0x00, 0x33, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x63, 0x00, 0x00, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1e, 0x00,
-    0x00, 0x63, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x63, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x18, 0x7e, 0xc3, 0x03, 0x03, 0x03,
-    0xc3, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06, 0x06,
-    0x06, 0x06, 0x67, 0x3f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0xff, 0x18,
-    0xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x3f, 0x66, 0x66, 0x3e, 0x46, 0x66, 0xf6,
-    0x66, 0x66, 0x66, 0xcf, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x7e, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00, 0x00,
-    0x00, 0x18, 0x0c, 0x06, 0x00, 0x1e, 0x30, 0x3e,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x30, 0x18, 0x0c, 0x00, 0x1c, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x0c, 0x06, 0x00, 0x3e, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x0c, 0x06, 0x00, 0x33, 0x33, 0x33,
-    0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x6e, 0x3b, 0x00, 0x3b, 0x66, 0x66,
-    0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x6e, 0x3b, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b,
-    0x73, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x7e, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x1c, 0x36, 0x36, 0x1c, 0x00, 0x3e, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x06,
-    0x03, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x03,
-    0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60,
-    0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
-    0x06, 0x73, 0xd9, 0x60, 0x30, 0xf8, 0x00, 0x00,
-    0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
-    0x66, 0x73, 0x69, 0x7c, 0x60, 0x60, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18,
-    0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0x1b,
-    0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x36, 0x6c,
-    0x36, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
-    0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
-    0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
-    0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
-    0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
-    0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f, 0x60, 0x6f,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60, 0x6f,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f, 0x60, 0x7f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x7f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0xec,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xef,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xec,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xef,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
-    0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x1b,
-    0x1b, 0x1b, 0x3b, 0x6e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x1b, 0x33,
-    0x63, 0x63, 0x63, 0x33, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7f, 0x63, 0x63, 0x03, 0x03, 0x03,
-    0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x7f, 0x63, 0x06, 0x0c, 0x18,
-    0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x1b, 0x1b,
-    0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66,
-    0x66, 0x3e, 0x06, 0x06, 0x03, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
-    0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x7f,
-    0x63, 0x63, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x63, 0x36,
-    0x36, 0x36, 0x36, 0x77, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x78, 0x0c, 0x18, 0x30, 0x7c, 0x66,
-    0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb,
-    0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xc0, 0x60, 0x7e, 0xdb, 0xdb,
-    0xcf, 0x7e, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x0c, 0x06, 0x06, 0x3e, 0x06,
-    0x06, 0x06, 0x0c, 0x38, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63,
-    0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x7f,
-    0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
-    0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30,
-    0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c,
-    0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x70, 0xd8, 0xd8, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e,
-    0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x00,
-    0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x1c, 0x36, 0x36, 0x1c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
-    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xf0, 0x30, 0x30, 0x30, 0x30, 0x30, 0x37,
-    0x36, 0x36, 0x3c, 0x38, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x1b, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0e, 0x1b, 0x0c, 0x06, 0x13, 0x1f, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e,
-    0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
+  0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xff,
+  0xdb, 0xff, 0xff, 0xc3, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x36, 0x7f, 0x7f, 0x7f, 0x7f, 0x3e, 0x1c, 0x08,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x3e, 0x7f,
+  0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+  0x3c, 0x3c, 0xe7, 0xe7, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
+  0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
+  0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x78, 0x70,
+  0x58, 0x4c, 0x1e, 0x33, 0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xcc, 0xfc, 0x0c, 0x0c, 0x0c,
+  0x0c, 0x0e, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6,
+  0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xe6, 0xe7, 0x67, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7, 0x3c, 0xdb, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x7f, 0x1f,
+  0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x70,
+  0x78, 0x7c, 0x7f, 0x7c, 0x78, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+  0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xdb,
+  0xdb, 0xdb, 0xde, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3e, 0x63, 0x06, 0x1c, 0x36, 0x63, 0x63, 0x36, 0x1c, 0x30, 0x63,
+  0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
+  0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x18, 0x30, 0x7f, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0x7f, 0x06, 0x0c, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
+  0x03, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x1c, 0x3e, 0x3e, 0x7f, 0x7f, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x3e, 0x3e,
+  0x1c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36,
+  0x36, 0x7f, 0x36, 0x36, 0x36, 0x7f, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x18, 0x3e, 0x63, 0x43, 0x03, 0x3e, 0x60, 0x60, 0x61, 0x63, 0x3e,
+  0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x63, 0x30, 0x18,
+  0x0c, 0x06, 0x63, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36,
+  0x36, 0x1c, 0x6e, 0x3b, 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0c, 0x0c, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c,
+  0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18,
+  0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
+  0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x40, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3c, 0x66, 0xc3, 0xc3, 0xdb, 0xdb, 0xc3, 0xc3, 0x66, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x1e, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63,
+  0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3e, 0x63, 0x60, 0x60, 0x3c, 0x60, 0x60, 0x60, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x38, 0x3c, 0x36, 0x33, 0x7f,
+  0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x03,
+  0x03, 0x03, 0x3f, 0x60, 0x60, 0x60, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x1c, 0x06, 0x03, 0x03, 0x3f, 0x63, 0x63, 0x63, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x63, 0x60, 0x60, 0x30, 0x18,
+  0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63,
+  0x63, 0x63, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x7e, 0x60, 0x60, 0x60, 0x30, 0x1e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+  0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
+  0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+  0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3e, 0x63, 0x63, 0x30, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x7b, 0x7b,
+  0x7b, 0x3b, 0x03, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c,
+  0x36, 0x63, 0x63, 0x7f, 0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x43, 0x03, 0x03, 0x03,
+  0x03, 0x43, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x36,
+  0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x36, 0x1f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16, 0x06, 0x46, 0x66, 0x7f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x66, 0x46, 0x16, 0x1e, 0x16,
+  0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
+  0x43, 0x03, 0x03, 0x7b, 0x63, 0x63, 0x66, 0x5c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x7f, 0x63, 0x63, 0x63, 0x63, 0x63,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x30,
+  0x30, 0x30, 0x30, 0x30, 0x33, 0x33, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x67, 0x66, 0x66, 0x36, 0x1e, 0x1e, 0x36, 0x66, 0x66, 0x67,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x06,
+  0x06, 0x46, 0x66, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xe7,
+  0xff, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b, 0x73, 0x63, 0x63, 0x63, 0x63,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63,
+  0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x66,
+  0x66, 0x66, 0x3e, 0x06, 0x06, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x6b, 0x7b, 0x3e,
+  0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x66, 0x66, 0x66, 0x3e, 0x36,
+  0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63,
+  0x63, 0x06, 0x1c, 0x30, 0x60, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xff, 0xdb, 0x99, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+  0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3,
+  0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xff, 0x66, 0x66,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18,
+  0x3c, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3,
+  0xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xff, 0xc3, 0x61, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc3, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+  0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+  0x03, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
+  0x0c, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x3e,
+  0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x06,
+  0x06, 0x1e, 0x36, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x03, 0x03, 0x03, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x30, 0x30, 0x3c, 0x36, 0x33,
+  0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3e, 0x63, 0x7f, 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x33, 0x33,
+  0x33, 0x33, 0x33, 0x3e, 0x30, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x07, 0x06,
+  0x06, 0x36, 0x6e, 0x66, 0x66, 0x66, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x18, 0x18, 0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x70, 0x60, 0x60,
+  0x60, 0x60, 0x60, 0x60, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x07, 0x06,
+  0x06, 0x66, 0x36, 0x1e, 0x1e, 0x36, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0xff, 0xdb,
+  0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x3b, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x66, 0x66,
+  0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x6e, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3e, 0x30, 0x30, 0x78, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x6e, 0x66, 0x06, 0x06, 0x06, 0x0f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x63, 0x06,
+  0x1c, 0x30, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0c,
+  0x0c, 0x3f, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x6e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
+  0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xff, 0x66, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x63, 0x63,
+  0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x7f, 0x33, 0x18, 0x0c, 0x06, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18, 0x18, 0x18, 0x18, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x18,
+  0x18, 0x18, 0x70, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36, 0x63,
+  0x63, 0x63, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
+  0x43, 0x03, 0x03, 0x03, 0x43, 0x66, 0x3c, 0x30, 0x60, 0x3e, 0x00, 0x00,
+  0x00, 0x00, 0x33, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x6e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x00, 0x3e, 0x63, 0x7f,
+  0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36,
+  0x00, 0x1e, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x33, 0x00, 0x00, 0x1e, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x6e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x00, 0x1e, 0x30, 0x3e,
+  0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x1c,
+  0x00, 0x1e, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x06, 0x06, 0x66, 0x3c, 0x30, 0x60,
+  0x3c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x7f,
+  0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x00,
+  0x00, 0x3e, 0x63, 0x7f, 0x03, 0x03, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x06, 0x0c, 0x18, 0x00, 0x3e, 0x63, 0x7f, 0x03, 0x03, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x1c, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66,
+  0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x06, 0x0c, 0x18, 0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x08, 0x1c, 0x36, 0x63, 0x63,
+  0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x1c, 0x00,
+  0x1c, 0x36, 0x63, 0x63, 0x7f, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x0c, 0x06, 0x00, 0x7f, 0x66, 0x06, 0x3e, 0x06, 0x06, 0x66, 0x7f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0xd8,
+  0x7e, 0x1b, 0x3b, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x36,
+  0x33, 0x33, 0x7f, 0x33, 0x33, 0x33, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x08, 0x1c, 0x36, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x3e, 0x63, 0x63,
+  0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18,
+  0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x0c, 0x1e, 0x33, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x6e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x00, 0x33, 0x33, 0x33,
+  0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x00,
+  0x00, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x7e, 0x60, 0x30, 0x1e, 0x00,
+  0x00, 0x63, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x63, 0x63, 0x63, 0x63, 0x63,
+  0x63, 0x63, 0x63, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
+  0xc3, 0x03, 0x03, 0x03, 0xc3, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x1c, 0x36, 0x26, 0x06, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x67, 0x3f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0xff, 0x18,
+  0xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x66, 0x66,
+  0x3e, 0x46, 0x66, 0xf6, 0x66, 0x66, 0x66, 0xcf, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x1b, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x06, 0x00, 0x1e, 0x30, 0x3e,
+  0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x0c,
+  0x00, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x18, 0x0c, 0x06, 0x00, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x06, 0x00, 0x33, 0x33, 0x33,
+  0x33, 0x33, 0x33, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b,
+  0x00, 0x3b, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
+  0x6e, 0x3b, 0x00, 0x63, 0x67, 0x6f, 0x7f, 0x7b, 0x73, 0x63, 0x63, 0x63,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x7e, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x36,
+  0x1c, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x06, 0x03, 0x63, 0x63, 0x3e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x03,
+  0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x7f, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c, 0x06, 0x73, 0xd9, 0x60,
+  0x30, 0xf8, 0x00, 0x00, 0x00, 0x03, 0x03, 0x43, 0x63, 0x33, 0x18, 0x0c,
+  0x66, 0x73, 0x69, 0x7c, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+  0x00, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0x1b, 0x36, 0x6c, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x36, 0x6c,
+  0x36, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x22, 0x88, 0x22,
+  0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
+  0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
+  0xaa, 0x55, 0xaa, 0x55, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee,
+  0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6f, 0x60, 0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60, 0x6f,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6f, 0x60, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x7f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0xec, 0x0c, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0xec, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xef, 0x00, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xff, 0x00, 0xef, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec, 0x0c, 0xec, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0xef, 0x00, 0xef, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfc,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0xf8, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+  0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x6c, 0x6c, 0x6c, 0xff, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f,
+  0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+  0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x6e, 0x3b, 0x1b, 0x1b, 0x1b, 0x3b, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x1b, 0x33, 0x63, 0x63, 0x63, 0x33,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x63, 0x63, 0x03, 0x03, 0x03,
+  0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x7f, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x7f, 0x63, 0x06, 0x0c, 0x18, 0x0c, 0x06, 0x63, 0x7f,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x1b, 0x1b,
+  0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
+  0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c,
+  0x36, 0x63, 0x63, 0x7f, 0x63, 0x63, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x1c, 0x36, 0x63, 0x63, 0x63, 0x36, 0x36, 0x36, 0x36, 0x77,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x18, 0x30, 0x7c, 0x66,
+  0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0xc0, 0x60, 0x7e, 0xdb, 0xdb, 0xcf, 0x7e, 0x06, 0x03,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x06, 0x06, 0x3e, 0x06,
+  0x06, 0x06, 0x0c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
+  0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x7f, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
+  0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+  0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xd8, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+  0x18, 0x18, 0x18, 0x18, 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x00,
+  0x6e, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x36,
+  0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x30, 0x30,
+  0x30, 0x30, 0x30, 0x37, 0x36, 0x36, 0x3c, 0x38, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x1b, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b, 0x0c, 0x06, 0x13, 0x1f, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
 };
 
 static const txt_font_t normal_font =
 {
-    "normal", normal_font_data, 8, 16,
+  "normal",
+  normal_font_data,
+  8,
+  16,
 };
diff --git a/games/NXDoom/textscreen/fonts/small.h b/games/NXDoom/textscreen/fonts/small.h
index 06a479bfb..b7dd28d22 100644
--- a/games/NXDoom/textscreen/fonts/small.h
+++ b/games/NXDoom/textscreen/fonts/small.h
@@ -1,140 +1,111 @@
-/* Font data generated from small.png; do not edit.
-   Please see textscreen/fonts/README for copyright
-   information. */
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/fonts/small.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Font data generated from small.png; do not edit. Please see
+ * textscreen/fonts/README for copyright information.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 static const uint8_t small_font_data[] =
 {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x4e, 0x00,
-    0xf6, 0xf5, 0xb1, 0x6f, 0x00, 0xea, 0x04, 0x00,
-    0x00, 0xe4, 0x04, 0x00, 0x40, 0xaa, 0xe4, 0x00,
-    0x40, 0xee, 0xe4, 0x00, 0x00, 0x60, 0x06, 0x00,
-    0xff, 0x9f, 0xf9, 0xff, 0x00, 0x96, 0x69, 0x00,
-    0xff, 0x69, 0x96, 0xff, 0xe0, 0x74, 0x75, 0x00,
-    0x60, 0x69, 0x6f, 0x06, 0xc0, 0x44, 0x74, 0x03,
-    0xe0, 0xaa, 0xba, 0x03, 0x22, 0x27, 0x27, 0x22,
-    0x10, 0x73, 0x13, 0x00, 0x80, 0xec, 0x8c, 0x00,
-    0x40, 0x4e, 0xe4, 0x04, 0xa0, 0xaa, 0xa0, 0x00,
-    0xf0, 0xb9, 0xaa, 0x00, 0x16, 0x96, 0x86, 0x06,
-    0x00, 0x00, 0xff, 0x00, 0x40, 0x4e, 0xe4, 0xf4,
-    0x40, 0x4e, 0x44, 0x04, 0x40, 0x44, 0xe4, 0x04,
-    0x20, 0xf4, 0x24, 0x00, 0x40, 0xf2, 0x42, 0x00,
-    0x00, 0x10, 0x07, 0x00, 0x00, 0xf5, 0x05, 0x00,
-    0x00, 0x72, 0x0f, 0x00, 0x00, 0x7f, 0x02, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x20, 0x22, 0x02, 0x02,
-    0x50, 0x05, 0x00, 0x00, 0x50, 0x57, 0x75, 0x05,
-    0x22, 0x25, 0x54, 0x22, 0x50, 0x24, 0x12, 0x05,
-    0x52, 0x52, 0x35, 0x06, 0x20, 0x02, 0x00, 0x00,
-    0x40, 0x22, 0x22, 0x04, 0x10, 0x22, 0x22, 0x01,
-    0x50, 0x72, 0x52, 0x00, 0x20, 0x72, 0x22, 0x00,
-    0x00, 0x00, 0x20, 0x12, 0x00, 0x70, 0x00, 0x00,
-    0x00, 0x00, 0x20, 0x02, 0x40, 0x24, 0x12, 0x01,
-    0x20, 0x75, 0x55, 0x02, 0x20, 0x23, 0x22, 0x07,
-    0x20, 0x45, 0x12, 0x07, 0x70, 0x24, 0x54, 0x02,
-    0x40, 0x56, 0x47, 0x04, 0x70, 0x31, 0x54, 0x02,
-    0x60, 0x31, 0x55, 0x02, 0x70, 0x44, 0x22, 0x02,
-    0x20, 0x25, 0x55, 0x02, 0x20, 0x55, 0x46, 0x03,
-    0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x20, 0x01,
-    0x00, 0x24, 0x21, 0x04, 0x00, 0x07, 0x07, 0x00,
-    0x00, 0x21, 0x24, 0x01, 0x20, 0x45, 0x02, 0x02,
-    0x20, 0x55, 0x11, 0x06, 0x20, 0x55, 0x57, 0x05,
-    0x30, 0x35, 0x55, 0x03, 0x20, 0x15, 0x51, 0x02,
-    0x30, 0x55, 0x55, 0x03, 0x70, 0x71, 0x11, 0x07,
-    0x70, 0x71, 0x11, 0x01, 0x20, 0x15, 0x55, 0x02,
-    0x50, 0x75, 0x55, 0x05, 0x70, 0x22, 0x22, 0x07,
-    0x40, 0x44, 0x54, 0x02, 0x50, 0x35, 0x55, 0x05,
-    0x10, 0x11, 0x11, 0x07, 0x50, 0x57, 0x55, 0x05,
-    0x40, 0x75, 0x57, 0x01, 0x20, 0x55, 0x55, 0x02,
-    0x30, 0x55, 0x13, 0x01, 0x20, 0x55, 0x35, 0x06,
-    0x30, 0x55, 0x53, 0x05, 0x20, 0x25, 0x54, 0x02,
-    0x70, 0x22, 0x22, 0x02, 0x50, 0x55, 0x55, 0x07,
-    0x50, 0x55, 0x55, 0x02, 0x50, 0x55, 0x75, 0x05,
-    0x50, 0x25, 0x55, 0x05, 0x50, 0x25, 0x22, 0x02,
-    0x70, 0x24, 0x12, 0x07, 0x60, 0x22, 0x22, 0x06,
-    0x10, 0x21, 0x42, 0x04, 0x30, 0x22, 0x22, 0x03,
-    0x20, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-    0x10, 0x02, 0x00, 0x00, 0x00, 0x43, 0x56, 0x06,
-    0x10, 0x31, 0x55, 0x03, 0x00, 0x16, 0x11, 0x06,
-    0x40, 0x64, 0x55, 0x06, 0x00, 0x52, 0x17, 0x06,
-    0x40, 0x72, 0x22, 0x02, 0x00, 0x56, 0x65, 0x34,
-    0x10, 0x31, 0x55, 0x05, 0x20, 0x30, 0x22, 0x07,
-    0x40, 0x60, 0x44, 0x34, 0x10, 0x51, 0x53, 0x05,
-    0x20, 0x22, 0x22, 0x02, 0x00, 0x75, 0x55, 0x05,
-    0x00, 0x53, 0x55, 0x05, 0x00, 0x52, 0x55, 0x02,
-    0x00, 0x53, 0x35, 0x11, 0x00, 0x56, 0x65, 0x44,
-    0x00, 0x16, 0x11, 0x01, 0x00, 0x16, 0x42, 0x03,
-    0x20, 0x72, 0x22, 0x02, 0x00, 0x55, 0x55, 0x07,
-    0x00, 0x55, 0x55, 0x02, 0x00, 0x55, 0x75, 0x05,
-    0x00, 0x55, 0x52, 0x05, 0x00, 0x55, 0x65, 0x34,
-    0x00, 0x47, 0x12, 0x07, 0x24, 0x12, 0x22, 0x04,
-    0x22, 0x02, 0x22, 0x02, 0x21, 0x42, 0x22, 0x01,
-    0xa0, 0x05, 0x00, 0x00, 0x20, 0x55, 0x75, 0x00,
-    0x20, 0x15, 0x51, 0x32, 0x05, 0x55, 0x55, 0x07,
-    0x12, 0x52, 0x17, 0x06, 0xa4, 0x43, 0x56, 0x06,
-    0x05, 0x43, 0x56, 0x06, 0x42, 0x43, 0x56, 0x06,
-    0x52, 0x42, 0x56, 0x06, 0x00, 0x16, 0x11, 0x36,
-    0x52, 0x52, 0x17, 0x06, 0x05, 0x52, 0x17, 0x06,
-    0x42, 0x52, 0x17, 0x06, 0x50, 0x30, 0x22, 0x07,
-    0x52, 0x30, 0x22, 0x07, 0x42, 0x30, 0x22, 0x07,
-    0x05, 0x52, 0x57, 0x05, 0x52, 0x52, 0x57, 0x05,
-    0x24, 0x17, 0x13, 0x07, 0x00, 0xad, 0x5e, 0x0e,
-    0xe0, 0xf5, 0x55, 0x0d, 0x52, 0x20, 0x55, 0x02,
-    0x05, 0x52, 0x55, 0x02, 0x42, 0x52, 0x55, 0x02,
-    0x52, 0x50, 0x55, 0x07, 0x42, 0x50, 0x55, 0x07,
-    0x05, 0x55, 0x65, 0x34, 0x05, 0x52, 0x55, 0x02,
-    0x05, 0x55, 0x55, 0x07, 0x20, 0x16, 0x61, 0x02,
-    0x2c, 0x72, 0x22, 0x0f, 0x50, 0x25, 0x27, 0x02,
-    0x30, 0x35, 0xd5, 0x05, 0x48, 0xe4, 0x54, 0x02,
-    0x24, 0x43, 0x56, 0x06, 0x24, 0x30, 0x22, 0x07,
-    0x12, 0x52, 0x55, 0x02, 0x24, 0x50, 0x55, 0x07,
-    0x5a, 0x30, 0x55, 0x05, 0x5a, 0x90, 0xdb, 0x09,
-    0x56, 0x0e, 0x0f, 0x00, 0x52, 0x02, 0x07, 0x00,
-    0x20, 0x20, 0x51, 0x02, 0x00, 0x70, 0x11, 0x00,
-    0x00, 0xe0, 0x88, 0x00, 0x11, 0x25, 0x8d, 0xc4,
-    0x11, 0x25, 0xa1, 0x8e, 0x20, 0x20, 0x22, 0x02,
-    0x00, 0xa0, 0xa5, 0x00, 0x00, 0x50, 0x5a, 0x00,
-    0x28, 0x28, 0x28, 0x28, 0x5a, 0x5a, 0x5a, 0x5a,
-    0xeb, 0xeb, 0xeb, 0xeb, 0x44, 0x44, 0x44, 0x44,
-    0x44, 0x74, 0x44, 0x44, 0x44, 0x47, 0x47, 0x44,
-    0xaa, 0xba, 0xaa, 0xaa, 0x00, 0xf0, 0xaa, 0xaa,
-    0x00, 0x47, 0x47, 0x44, 0xaa, 0x8b, 0xab, 0xaa,
-    0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x8f, 0xab, 0xaa,
-    0xaa, 0x8b, 0x0f, 0x00, 0xaa, 0xfa, 0x00, 0x00,
-    0x44, 0x47, 0x07, 0x00, 0x00, 0x70, 0x44, 0x44,
-    0x44, 0xc4, 0x00, 0x00, 0x44, 0xf4, 0x00, 0x00,
-    0x00, 0xf0, 0x44, 0x44, 0x44, 0xc4, 0x44, 0x44,
-    0x00, 0xf0, 0x00, 0x00, 0x44, 0xf4, 0x44, 0x44,
-    0x44, 0x4c, 0x4c, 0x44, 0xaa, 0xaa, 0xaa, 0xaa,
-    0xaa, 0x2a, 0x0e, 0x00, 0x00, 0x2e, 0xaa, 0xaa,
-    0xaa, 0x0b, 0x0f, 0x00, 0x00, 0x0f, 0xab, 0xaa,
-    0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x0f, 0x0f, 0x00,
-    0xaa, 0x0b, 0xab, 0xaa, 0x44, 0x0f, 0x0f, 0x00,
-    0xaa, 0xfa, 0x00, 0x00, 0x00, 0x0f, 0x4f, 0x44,
-    0x00, 0xf0, 0xaa, 0xaa, 0xaa, 0xea, 0x00, 0x00,
-    0x44, 0x4c, 0x0c, 0x00, 0x00, 0x4c, 0x4c, 0x44,
-    0x00, 0xe0, 0xaa, 0xaa, 0xaa, 0xfa, 0xaa, 0xaa,
-    0x44, 0x4f, 0x4f, 0x44, 0x44, 0x74, 0x00, 0x00,
-    0x00, 0xc0, 0x44, 0x44, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0xff, 0xff, 0x33, 0x33, 0x33, 0x33,
-    0xcc, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0xa0, 0x55, 0x0a, 0x30, 0x35, 0x95, 0x05,
-    0xf0, 0x19, 0x11, 0x01, 0x00, 0x5f, 0x55, 0x05,
-    0x00, 0x17, 0x12, 0x07, 0x00, 0x5e, 0x55, 0x02,
-    0x00, 0xaa, 0x2e, 0x01, 0x00, 0x5a, 0x44, 0x04,
-    0x70, 0x52, 0x25, 0x07, 0x20, 0x75, 0x55, 0x02,
-    0x60, 0x99, 0x66, 0x0f, 0x60, 0x21, 0x55, 0x02,
-    0x00, 0xd6, 0x6b, 0x00, 0x80, 0x9f, 0xf9, 0x01,
-    0x60, 0x71, 0x11, 0x06, 0x20, 0x55, 0x55, 0x05,
-    0x70, 0x70, 0x70, 0x00, 0x20, 0x27, 0x70, 0x00,
-    0x10, 0x42, 0x12, 0x07, 0x40, 0x12, 0x42, 0x07,
-    0x80, 0x44, 0x44, 0x44, 0x44, 0x44, 0x25, 0x00,
-    0x00, 0x02, 0x07, 0x02, 0xa0, 0x05, 0x5a, 0x00,
-    0x52, 0x02, 0x00, 0x00, 0x00, 0x60, 0x06, 0x00,
-    0x00, 0x00, 0x02, 0x00, 0x4c, 0x54, 0x46, 0x00,
-    0x57, 0x55, 0x00, 0x00, 0x43, 0x72, 0x00, 0x00,
-    0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x4e, 0x00, 0xf6, 0xf5, 0xb1, 0x6f,
+  0x00, 0xea, 0x04, 0x00, 0x00, 0xe4, 0x04, 0x00, 0x40, 0xaa, 0xe4, 0x00,
+  0x40, 0xee, 0xe4, 0x00, 0x00, 0x60, 0x06, 0x00, 0xff, 0x9f, 0xf9, 0xff,
+  0x00, 0x96, 0x69, 0x00, 0xff, 0x69, 0x96, 0xff, 0xe0, 0x74, 0x75, 0x00,
+  0x60, 0x69, 0x6f, 0x06, 0xc0, 0x44, 0x74, 0x03, 0xe0, 0xaa, 0xba, 0x03,
+  0x22, 0x27, 0x27, 0x22, 0x10, 0x73, 0x13, 0x00, 0x80, 0xec, 0x8c, 0x00,
+  0x40, 0x4e, 0xe4, 0x04, 0xa0, 0xaa, 0xa0, 0x00, 0xf0, 0xb9, 0xaa, 0x00,
+  0x16, 0x96, 0x86, 0x06, 0x00, 0x00, 0xff, 0x00, 0x40, 0x4e, 0xe4, 0xf4,
+  0x40, 0x4e, 0x44, 0x04, 0x40, 0x44, 0xe4, 0x04, 0x20, 0xf4, 0x24, 0x00,
+  0x40, 0xf2, 0x42, 0x00, 0x00, 0x10, 0x07, 0x00, 0x00, 0xf5, 0x05, 0x00,
+  0x00, 0x72, 0x0f, 0x00, 0x00, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x20, 0x22, 0x02, 0x02, 0x50, 0x05, 0x00, 0x00, 0x50, 0x57, 0x75, 0x05,
+  0x22, 0x25, 0x54, 0x22, 0x50, 0x24, 0x12, 0x05, 0x52, 0x52, 0x35, 0x06,
+  0x20, 0x02, 0x00, 0x00, 0x40, 0x22, 0x22, 0x04, 0x10, 0x22, 0x22, 0x01,
+  0x50, 0x72, 0x52, 0x00, 0x20, 0x72, 0x22, 0x00, 0x00, 0x00, 0x20, 0x12,
+  0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x02, 0x40, 0x24, 0x12, 0x01,
+  0x20, 0x75, 0x55, 0x02, 0x20, 0x23, 0x22, 0x07, 0x20, 0x45, 0x12, 0x07,
+  0x70, 0x24, 0x54, 0x02, 0x40, 0x56, 0x47, 0x04, 0x70, 0x31, 0x54, 0x02,
+  0x60, 0x31, 0x55, 0x02, 0x70, 0x44, 0x22, 0x02, 0x20, 0x25, 0x55, 0x02,
+  0x20, 0x55, 0x46, 0x03, 0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x20, 0x01,
+  0x00, 0x24, 0x21, 0x04, 0x00, 0x07, 0x07, 0x00, 0x00, 0x21, 0x24, 0x01,
+  0x20, 0x45, 0x02, 0x02, 0x20, 0x55, 0x11, 0x06, 0x20, 0x55, 0x57, 0x05,
+  0x30, 0x35, 0x55, 0x03, 0x20, 0x15, 0x51, 0x02, 0x30, 0x55, 0x55, 0x03,
+  0x70, 0x71, 0x11, 0x07, 0x70, 0x71, 0x11, 0x01, 0x20, 0x15, 0x55, 0x02,
+  0x50, 0x75, 0x55, 0x05, 0x70, 0x22, 0x22, 0x07, 0x40, 0x44, 0x54, 0x02,
+  0x50, 0x35, 0x55, 0x05, 0x10, 0x11, 0x11, 0x07, 0x50, 0x57, 0x55, 0x05,
+  0x40, 0x75, 0x57, 0x01, 0x20, 0x55, 0x55, 0x02, 0x30, 0x55, 0x13, 0x01,
+  0x20, 0x55, 0x35, 0x06, 0x30, 0x55, 0x53, 0x05, 0x20, 0x25, 0x54, 0x02,
+  0x70, 0x22, 0x22, 0x02, 0x50, 0x55, 0x55, 0x07, 0x50, 0x55, 0x55, 0x02,
+  0x50, 0x55, 0x75, 0x05, 0x50, 0x25, 0x55, 0x05, 0x50, 0x25, 0x22, 0x02,
+  0x70, 0x24, 0x12, 0x07, 0x60, 0x22, 0x22, 0x06, 0x10, 0x21, 0x42, 0x04,
+  0x30, 0x22, 0x22, 0x03, 0x20, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
+  0x10, 0x02, 0x00, 0x00, 0x00, 0x43, 0x56, 0x06, 0x10, 0x31, 0x55, 0x03,
+  0x00, 0x16, 0x11, 0x06, 0x40, 0x64, 0x55, 0x06, 0x00, 0x52, 0x17, 0x06,
+  0x40, 0x72, 0x22, 0x02, 0x00, 0x56, 0x65, 0x34, 0x10, 0x31, 0x55, 0x05,
+  0x20, 0x30, 0x22, 0x07, 0x40, 0x60, 0x44, 0x34, 0x10, 0x51, 0x53, 0x05,
+  0x20, 0x22, 0x22, 0x02, 0x00, 0x75, 0x55, 0x05, 0x00, 0x53, 0x55, 0x05,
+  0x00, 0x52, 0x55, 0x02, 0x00, 0x53, 0x35, 0x11, 0x00, 0x56, 0x65, 0x44,
+  0x00, 0x16, 0x11, 0x01, 0x00, 0x16, 0x42, 0x03, 0x20, 0x72, 0x22, 0x02,
+  0x00, 0x55, 0x55, 0x07, 0x00, 0x55, 0x55, 0x02, 0x00, 0x55, 0x75, 0x05,
+  0x00, 0x55, 0x52, 0x05, 0x00, 0x55, 0x65, 0x34, 0x00, 0x47, 0x12, 0x07,
+  0x24, 0x12, 0x22, 0x04, 0x22, 0x02, 0x22, 0x02, 0x21, 0x42, 0x22, 0x01,
+  0xa0, 0x05, 0x00, 0x00, 0x20, 0x55, 0x75, 0x00, 0x20, 0x15, 0x51, 0x32,
+  0x05, 0x55, 0x55, 0x07, 0x12, 0x52, 0x17, 0x06, 0xa4, 0x43, 0x56, 0x06,
+  0x05, 0x43, 0x56, 0x06, 0x42, 0x43, 0x56, 0x06, 0x52, 0x42, 0x56, 0x06,
+  0x00, 0x16, 0x11, 0x36, 0x52, 0x52, 0x17, 0x06, 0x05, 0x52, 0x17, 0x06,
+  0x42, 0x52, 0x17, 0x06, 0x50, 0x30, 0x22, 0x07, 0x52, 0x30, 0x22, 0x07,
+  0x42, 0x30, 0x22, 0x07, 0x05, 0x52, 0x57, 0x05, 0x52, 0x52, 0x57, 0x05,
+  0x24, 0x17, 0x13, 0x07, 0x00, 0xad, 0x5e, 0x0e, 0xe0, 0xf5, 0x55, 0x0d,
+  0x52, 0x20, 0x55, 0x02, 0x05, 0x52, 0x55, 0x02, 0x42, 0x52, 0x55, 0x02,
+  0x52, 0x50, 0x55, 0x07, 0x42, 0x50, 0x55, 0x07, 0x05, 0x55, 0x65, 0x34,
+  0x05, 0x52, 0x55, 0x02, 0x05, 0x55, 0x55, 0x07, 0x20, 0x16, 0x61, 0x02,
+  0x2c, 0x72, 0x22, 0x0f, 0x50, 0x25, 0x27, 0x02, 0x30, 0x35, 0xd5, 0x05,
+  0x48, 0xe4, 0x54, 0x02, 0x24, 0x43, 0x56, 0x06, 0x24, 0x30, 0x22, 0x07,
+  0x12, 0x52, 0x55, 0x02, 0x24, 0x50, 0x55, 0x07, 0x5a, 0x30, 0x55, 0x05,
+  0x5a, 0x90, 0xdb, 0x09, 0x56, 0x0e, 0x0f, 0x00, 0x52, 0x02, 0x07, 0x00,
+  0x20, 0x20, 0x51, 0x02, 0x00, 0x70, 0x11, 0x00, 0x00, 0xe0, 0x88, 0x00,
+  0x11, 0x25, 0x8d, 0xc4, 0x11, 0x25, 0xa1, 0x8e, 0x20, 0x20, 0x22, 0x02,
+  0x00, 0xa0, 0xa5, 0x00, 0x00, 0x50, 0x5a, 0x00, 0x28, 0x28, 0x28, 0x28,
+  0x5a, 0x5a, 0x5a, 0x5a, 0xeb, 0xeb, 0xeb, 0xeb, 0x44, 0x44, 0x44, 0x44,
+  0x44, 0x74, 0x44, 0x44, 0x44, 0x47, 0x47, 0x44, 0xaa, 0xba, 0xaa, 0xaa,
+  0x00, 0xf0, 0xaa, 0xaa, 0x00, 0x47, 0x47, 0x44, 0xaa, 0x8b, 0xab, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x8f, 0xab, 0xaa, 0xaa, 0x8b, 0x0f, 0x00,
+  0xaa, 0xfa, 0x00, 0x00, 0x44, 0x47, 0x07, 0x00, 0x00, 0x70, 0x44, 0x44,
+  0x44, 0xc4, 0x00, 0x00, 0x44, 0xf4, 0x00, 0x00, 0x00, 0xf0, 0x44, 0x44,
+  0x44, 0xc4, 0x44, 0x44, 0x00, 0xf0, 0x00, 0x00, 0x44, 0xf4, 0x44, 0x44,
+  0x44, 0x4c, 0x4c, 0x44, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a, 0x0e, 0x00,
+  0x00, 0x2e, 0xaa, 0xaa, 0xaa, 0x0b, 0x0f, 0x00, 0x00, 0x0f, 0xab, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x0f, 0x0f, 0x00, 0xaa, 0x0b, 0xab, 0xaa,
+  0x44, 0x0f, 0x0f, 0x00, 0xaa, 0xfa, 0x00, 0x00, 0x00, 0x0f, 0x4f, 0x44,
+  0x00, 0xf0, 0xaa, 0xaa, 0xaa, 0xea, 0x00, 0x00, 0x44, 0x4c, 0x0c, 0x00,
+  0x00, 0x4c, 0x4c, 0x44, 0x00, 0xe0, 0xaa, 0xaa, 0xaa, 0xfa, 0xaa, 0xaa,
+  0x44, 0x4f, 0x4f, 0x44, 0x44, 0x74, 0x00, 0x00, 0x00, 0xc0, 0x44, 0x44,
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x33, 0x33, 0x33, 0x33,
+  0xcc, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0x00, 0x00, 0x00, 0xa0, 0x55, 0x0a,
+  0x30, 0x35, 0x95, 0x05, 0xf0, 0x19, 0x11, 0x01, 0x00, 0x5f, 0x55, 0x05,
+  0x00, 0x17, 0x12, 0x07, 0x00, 0x5e, 0x55, 0x02, 0x00, 0xaa, 0x2e, 0x01,
+  0x00, 0x5a, 0x44, 0x04, 0x70, 0x52, 0x25, 0x07, 0x20, 0x75, 0x55, 0x02,
+  0x60, 0x99, 0x66, 0x0f, 0x60, 0x21, 0x55, 0x02, 0x00, 0xd6, 0x6b, 0x00,
+  0x80, 0x9f, 0xf9, 0x01, 0x60, 0x71, 0x11, 0x06, 0x20, 0x55, 0x55, 0x05,
+  0x70, 0x70, 0x70, 0x00, 0x20, 0x27, 0x70, 0x00, 0x10, 0x42, 0x12, 0x07,
+  0x40, 0x12, 0x42, 0x07, 0x80, 0x44, 0x44, 0x44, 0x44, 0x44, 0x25, 0x00,
+  0x00, 0x02, 0x07, 0x02, 0xa0, 0x05, 0x5a, 0x00, 0x52, 0x02, 0x00, 0x00,
+  0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x4c, 0x54, 0x46, 0x00,
+  0x57, 0x55, 0x00, 0x00, 0x43, 0x72, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
+  0x00, 0x00, 0x00, 0x00,
 };
 
 static const txt_font_t small_font =
 {
-    "small", small_font_data, 4, 8,
+  "small",
+  small_font_data,
+  4,
+  8,
 };
diff --git a/games/NXDoom/textscreen/textscreen.h b/games/NXDoom/textscreen/textscreen.h
index c778994ab..40824da68 100644
--- a/games/NXDoom/textscreen/textscreen.h
+++ b/games/NXDoom/textscreen/textscreen.h
@@ -1,24 +1,34 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/textscreen.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TEXTSCREEN_H
 #define TEXTSCREEN_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "../src/doomkeys.h"
 #include "txt_main.h"
 
@@ -37,12 +47,11 @@ extern "C" {
 #include "txt_strut.h"
 #include "txt_table.h"
 #include "txt_widget.h"
-#include "txt_window_action.h"
 #include "txt_window.h"
+#include "txt_window_action.h"
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* #ifndef TEXTSCREEN_H */
-
+#endif /* TEXTSCREEN_H */
diff --git a/games/NXDoom/textscreen/txt_button.c b/games/NXDoom/textscreen/txt_button.c
index aaf711d7a..0eadb71a4 100644
--- a/games/NXDoom/textscreen/txt_button.c
+++ b/games/NXDoom/textscreen/txt_button.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_button.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -24,104 +33,127 @@
 #include "txt_utf8.h"
 #include "txt_window.h"
 
-static void TXT_ButtonSizeCalc(TXT_UNCAST_ARG(button))
-{
-    TXT_CAST_ARG(txt_button_t, button);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-    button->widget.w = TXT_UTF8_Strlen(button->label);
-    button->widget.h = 1;
-}
+static void txt_button_size_calc(TXT_UNCAST_ARG(button));
+static void txt_button_drawer(TXT_UNCAST_ARG(button));
+static void txt_button_destructor(TXT_UNCAST_ARG(button));
+static int txt_button_keypress(TXT_UNCAST_ARG(button), int key);
+static void txt_button_mousepress(TXT_UNCAST_ARG(button), int x, int y,
+                                  int b);
 
-static void TXT_ButtonDrawer(TXT_UNCAST_ARG(button))
-{
-    TXT_CAST_ARG(txt_button_t, button);
-    int i;
-    int w;
-
-    w = button->widget.w;
-
-    TXT_SetWidgetBG(button);
-
-    TXT_DrawString(button->label);
-
-    for (i = TXT_UTF8_Strlen(button->label); i < w; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_ButtonDestructor(TXT_UNCAST_ARG(button))
-{
-    TXT_CAST_ARG(txt_button_t, button);
-
-    free(button->label);
-}
-
-static int TXT_ButtonKeyPress(TXT_UNCAST_ARG(button), int key)
-{
-    TXT_CAST_ARG(txt_button_t, button);
-
-    if (key == KEY_ENTER)
-    {
-        TXT_EmitSignal(button, "pressed");
-        return 1;
-    }
-    
-    return 0;
-}
-
-static void TXT_ButtonMousePress(TXT_UNCAST_ARG(button), int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_button_t, button);
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        // Equivalent to pressing enter
-
-        TXT_ButtonKeyPress(button, KEY_ENTER);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_button_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_ButtonSizeCalc,
-    TXT_ButtonDrawer,
-    TXT_ButtonKeyPress,
-    TXT_ButtonDestructor,
-    TXT_ButtonMousePress,
-    NULL,
+  txt_always_selectable,
+  txt_button_size_calc,
+  txt_button_drawer,
+  txt_button_keypress,
+  txt_button_destructor,
+  txt_button_mousepress,
+  NULL,
 };
 
-void TXT_SetButtonLabel(txt_button_t *button, const char *label)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_button_size_calc(TXT_UNCAST_ARG(button))
 {
-    free(button->label);
-    button->label = strdup(label);
+  TXT_CAST_ARG(txt_button_t, button);
+
+  button->widget.w = txt_utf8_strlen(button->label);
+  button->widget.h = 1;
 }
 
-txt_button_t *TXT_NewButton(const char *label)
+static void txt_button_drawer(TXT_UNCAST_ARG(button))
 {
-    txt_button_t *button;
+  TXT_CAST_ARG(txt_button_t, button);
+  int i;
+  int w;
 
-    button = malloc(sizeof(txt_button_t));
+  w = button->widget.w;
 
-    TXT_InitWidget(button, &txt_button_class);
-    button->label = strdup(label);
+  txt_set_widget_bg(button);
 
-    return button;
+  txt_draw_string(button->label);
+
+  for (i = txt_utf8_strlen(button->label); i < w; ++i)
+    {
+      txt_draw_string(" ");
+    }
 }
 
-// Button with a callback set automatically
-
-txt_button_t *TXT_NewButton2(const char *label, TxtWidgetSignalFunc func,
-                             void *user_data)
+static void txt_button_destructor(TXT_UNCAST_ARG(button))
 {
-    txt_button_t *button;
+  TXT_CAST_ARG(txt_button_t, button);
 
-    button = TXT_NewButton(label);
-
-    TXT_SignalConnect(button, "pressed", func, user_data);
-
-    return button;
+  free(button->label);
 }
 
+static int txt_button_keypress(TXT_UNCAST_ARG(button), int key)
+{
+  TXT_CAST_ARG(txt_button_t, button);
+
+  if (key == KEY_ENTER)
+    {
+      txt_emit_signal(button, "pressed");
+      return 1;
+    }
+
+  return 0;
+}
+
+static void txt_button_mousepress(TXT_UNCAST_ARG(button), int x, int y,
+        int b)
+{
+  TXT_CAST_ARG(txt_button_t, button);
+
+  if (b == TXT_MOUSE_LEFT)
+    {
+      /* Equivalent to pressing enter */
+
+      txt_button_keypress(button, KEY_ENTER);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void txt_set_button_label(txt_button_t *button, const char *label)
+{
+  free(button->label);
+  button->label = strdup(label);
+}
+
+txt_button_t *txt_new_button(const char *label)
+{
+  txt_button_t *button;
+
+  button = malloc(sizeof(txt_button_t));
+
+  txt_init_widget(button, &txt_button_class);
+  button->label = strdup(label);
+
+  return button;
+}
+
+/* Button with a callback set automatically */
+
+txt_button_t *txt_new_button2(const char *label, txt_widget_signal_f func,
+                              void *user_data)
+{
+  txt_button_t *button;
+
+  button = txt_new_button(label);
+
+  txt_signal_connect(button, "pressed", func, user_data);
+
+  return button;
+}
diff --git a/games/NXDoom/textscreen/txt_button.h b/games/NXDoom/textscreen/txt_button.h
index e04554414..1982e894a 100644
--- a/games/NXDoom/textscreen/txt_button.h
+++ b/games/NXDoom/textscreen/txt_button.h
@@ -1,43 +1,51 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_button.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_BUTTON_H
 #define TXT_BUTTON_H
 
-/**
- * @file txt_button.h
- *
- * Button widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Button widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Button widget.
  *
  * A button is a widget that can be selected to perform some action.
  * When a button is pressed, it emits the "pressed" signal.
  */
 
-typedef struct txt_button_s txt_button_t;
-
-#include "txt_widget.h"
-
 struct txt_button_s
 {
-    txt_widget_t widget;
-    char *label;
+  txt_widget_t widget;
+  char *label;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new button widget.
  *
@@ -45,7 +53,7 @@ struct txt_button_s
  * @return             Pointer to the new button widget.
  */
 
-txt_button_t *TXT_NewButton(const char *label);
+txt_button_t *txt_new_button(const char *label);
 
 /**
  * Create a new button widget, binding the "pressed" signal to a
@@ -57,8 +65,8 @@ txt_button_t *TXT_NewButton(const char *label);
  * @return             Pointer to the new button widget.
  */
 
-txt_button_t *TXT_NewButton2(const char *label, TxtWidgetSignalFunc func,
-                             void *user_data);
+txt_button_t *txt_new_button2(const char *label, txt_widget_signal_f func,
+                              void *user_data);
 
 /**
  * Change the label used on a button.
@@ -67,8 +75,6 @@ txt_button_t *TXT_NewButton2(const char *label, TxtWidgetSignalFunc func,
  * @param label        The new label (UTF-8 format).
  */
 
-void TXT_SetButtonLabel(txt_button_t *button, const char *label);
-
-#endif /* #ifndef TXT_BUTTON_H */
-
+void txt_set_button_label(txt_button_t *button, const char *label);
 
+#endif /* TXT_BUTTON_H */
diff --git a/games/NXDoom/textscreen/txt_checkbox.c b/games/NXDoom/textscreen/txt_checkbox.c
index a5984dc50..cd467ff3b 100644
--- a/games/NXDoom/textscreen/txt_checkbox.c
+++ b/games/NXDoom/textscreen/txt_checkbox.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_checkbox.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -24,119 +33,142 @@
 #include "txt_utf8.h"
 #include "txt_window.h"
 
-static void TXT_CheckBoxSizeCalc(TXT_UNCAST_ARG(checkbox))
-{
-    TXT_CAST_ARG(txt_checkbox_t, checkbox);
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    // Minimum width is the string length + right-side space for padding
+static void txt_checkbox_size_calc(TXT_UNCAST_ARG(checkbox));
+static void txt_checkbox_drawer(TXT_UNCAST_ARG(checkbox));
+static void txt_checkbox_destructor(TXT_UNCAST_ARG(checkbox));
+static int txt_check_box_keypress(TXT_UNCAST_ARG(checkbox), int key);
+static void txt_checkbox_mousepress(TXT_UNCAST_ARG(checkbox), int x, int y,
+                                   int b);
 
-    checkbox->widget.w = TXT_UTF8_Strlen(checkbox->label) + 5;
-    checkbox->widget.h = 1;
-}
-
-static void TXT_CheckBoxDrawer(TXT_UNCAST_ARG(checkbox))
-{
-    TXT_CAST_ARG(txt_checkbox_t, checkbox);
-    txt_saved_colors_t colors;
-    int i;
-    int w;
-
-    w = checkbox->widget.w;
-
-    TXT_SaveColors(&colors);
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-    TXT_DrawString("(");
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    if ((*checkbox->variable != 0) ^ checkbox->inverted)
-    {
-        TXT_DrawCodePageString("\x07");
-    }
-    else
-    {
-        TXT_DrawString(" ");
-    }
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-
-    TXT_DrawString(") ");
-
-    TXT_RestoreColors(&colors);
-    TXT_SetWidgetBG(checkbox);
-    TXT_DrawString(checkbox->label);
-
-    for (i = TXT_UTF8_Strlen(checkbox->label); i < w-4; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_CheckBoxDestructor(TXT_UNCAST_ARG(checkbox))
-{
-    TXT_CAST_ARG(txt_checkbox_t, checkbox);
-
-    free(checkbox->label);
-}
-
-static int TXT_CheckBoxKeyPress(TXT_UNCAST_ARG(checkbox), int key)
-{
-    TXT_CAST_ARG(txt_checkbox_t, checkbox);
-
-    if (key == KEY_ENTER || key == ' ')
-    {
-        *checkbox->variable = !*checkbox->variable;
-        TXT_EmitSignal(checkbox, "changed");
-        return 1;
-    }
-    
-    return 0;
-}
-
-static void TXT_CheckBoxMousePress(TXT_UNCAST_ARG(checkbox), int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_checkbox_t, checkbox);
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        // Equivalent to pressing enter
-
-        TXT_CheckBoxKeyPress(checkbox, KEY_ENTER);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_checkbox_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_CheckBoxSizeCalc,
-    TXT_CheckBoxDrawer,
-    TXT_CheckBoxKeyPress,
-    TXT_CheckBoxDestructor,
-    TXT_CheckBoxMousePress,
-    NULL,
+  txt_always_selectable,
+  txt_checkbox_size_calc,
+  txt_checkbox_drawer,
+  txt_check_box_keypress,
+  txt_checkbox_destructor,
+  txt_checkbox_mousepress,
+  NULL,
 };
 
-txt_checkbox_t *TXT_NewCheckBox(const char *label, int *variable)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_checkbox_size_calc(TXT_UNCAST_ARG(checkbox))
 {
-    txt_checkbox_t *checkbox;
+  TXT_CAST_ARG(txt_checkbox_t, checkbox);
 
-    checkbox = malloc(sizeof(txt_checkbox_t));
+  /* Minimum width is the string length + right-side space for padding */
 
-    TXT_InitWidget(checkbox, &txt_checkbox_class);
-    checkbox->label = strdup(label);
-    checkbox->variable = variable;
-    checkbox->inverted = 0;
-
-    return checkbox;
+  checkbox->widget.w = txt_utf8_strlen(checkbox->label) + 5;
+  checkbox->widget.h = 1;
 }
 
-txt_checkbox_t *TXT_NewInvertedCheckBox(const char *label, int *variable)
+static void txt_checkbox_drawer(TXT_UNCAST_ARG(checkbox))
 {
-    txt_checkbox_t *result;
+  TXT_CAST_ARG(txt_checkbox_t, checkbox);
+  txt_saved_colors_t colors;
+  int i;
+  int w;
 
-    result = TXT_NewCheckBox(label, variable);
-    result->inverted = 1;
+  w = checkbox->widget.w;
 
-    return result;
+  txt_save_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+  txt_draw_string("(");
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_WHITE);
+
+  if ((*checkbox->variable != 0) ^ checkbox->inverted)
+    {
+      txt_draw_code_page_string("\x07");
+    }
+  else
+    {
+      txt_draw_string(" ");
+    }
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+
+  txt_draw_string(") ");
+
+  txt_restore_colours(&colors);
+  txt_set_widget_bg(checkbox);
+  txt_draw_string(checkbox->label);
+
+  for (i = txt_utf8_strlen(checkbox->label); i < w - 4; ++i)
+    {
+      txt_draw_string(" ");
+    }
 }
 
+static void txt_checkbox_destructor(TXT_UNCAST_ARG(checkbox))
+{
+  TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+  free(checkbox->label);
+}
+
+static int txt_check_box_keypress(TXT_UNCAST_ARG(checkbox), int key)
+{
+  TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+  if (key == KEY_ENTER || key == ' ')
+    {
+      *checkbox->variable = !*checkbox->variable;
+      txt_emit_signal(checkbox, "changed");
+      return 1;
+    }
+
+  return 0;
+}
+
+static void txt_checkbox_mousepress(TXT_UNCAST_ARG(checkbox), int x, int y,
+                                    int b)
+{
+  TXT_CAST_ARG(txt_checkbox_t, checkbox);
+
+  if (b == TXT_MOUSE_LEFT)
+    {
+      /* Equivalent to pressing enter */
+
+      txt_check_box_keypress(checkbox, KEY_ENTER);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_checkbox_t *txt_new_check_box(const char *label, int *variable)
+{
+  txt_checkbox_t *checkbox;
+
+  checkbox = malloc(sizeof(txt_checkbox_t));
+
+  txt_init_widget(checkbox, &txt_checkbox_class);
+  checkbox->label = strdup(label);
+  checkbox->variable = variable;
+  checkbox->inverted = 0;
+
+  return checkbox;
+}
+
+txt_checkbox_t *txt_new_inverted_checkbox(const char *label, int *variable)
+{
+  txt_checkbox_t *result;
+
+  result = txt_new_check_box(label, variable);
+  result->inverted = 1;
+
+  return result;
+}
diff --git a/games/NXDoom/textscreen/txt_checkbox.h b/games/NXDoom/textscreen/txt_checkbox.h
index 039c06435..b988f2cf1 100644
--- a/games/NXDoom/textscreen/txt_checkbox.h
+++ b/games/NXDoom/textscreen/txt_checkbox.h
@@ -1,28 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_checkbox.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_CHECKBOX_H
 #define TXT_CHECKBOX_H
 
-/**
- * @file txt_checkbox.h
- *
- * Checkbox widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Checkbox widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Checkbox widget.
  *
  * A checkbox is used to control boolean values that may be either on
  * or off.  The widget has a label that is displayed to the right of
@@ -34,18 +42,18 @@
  * When a checkbox is changed, it emits the "changed" signal.
  */
 
-typedef struct txt_checkbox_s txt_checkbox_t;
-
-#include "txt_widget.h"
-
 struct txt_checkbox_s
 {
-    txt_widget_t widget;
-    char *label;
-    int *variable;
-    int inverted;
+  txt_widget_t widget;
+  char *label;
+  int *variable;
+  int inverted;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new checkbox.
  *
@@ -55,7 +63,7 @@ struct txt_checkbox_s
  * @return              Pointer to the new checkbox.
  */
 
-txt_checkbox_t *TXT_NewCheckBox(const char *label, int *variable);
+txt_checkbox_t *txt_new_check_box(const char *label, int *variable);
 
 /**
  * Create a new inverted checkbox.
@@ -69,8 +77,6 @@ txt_checkbox_t *TXT_NewCheckBox(const char *label, int *variable);
  * @return              Pointer to the new checkbox.
  */
 
-txt_checkbox_t *TXT_NewInvertedCheckBox(const char *label, int *variable);
-
-#endif /* #ifndef TXT_CHECKBOX_H */
-
+txt_checkbox_t *txt_new_inverted_checkbox(const char *label, int *variable);
 
+#endif /* TXT_CHECKBOX_H */
diff --git a/games/NXDoom/textscreen/txt_conditional.c b/games/NXDoom/textscreen/txt_conditional.c
index 8a23618c0..182711915 100644
--- a/games/NXDoom/textscreen/txt_conditional.c
+++ b/games/NXDoom/textscreen/txt_conditional.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2016 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_conditional.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2016 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -18,151 +27,163 @@
 #include "txt_conditional.h"
 #include "txt_strut.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 struct txt_conditional_s
 {
-    txt_widget_t widget;
-    int *var;
-    int expected_value;
-    txt_widget_t *child;
+  txt_widget_t widget;
+  int *var;
+  int expected_value;
+  txt_widget_t *child;
 };
 
-static int ConditionTrue(txt_conditional_t *conditional)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int condition_true(txt_conditional_t *conditional)
 {
-    return *conditional->var == conditional->expected_value;
+  return *conditional->var == conditional->expected_value;
 }
 
-static int TXT_CondSelectable(TXT_UNCAST_ARG(conditional))
+static int txt_cond_selectable(TXT_UNCAST_ARG(conditional))
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
-    return ConditionTrue(conditional)
-        && TXT_SelectableWidget(conditional->child);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
+  return condition_true(conditional) &&
+         txt_selectable_widget(conditional->child);
 }
 
-static void TXT_CondSizeCalc(TXT_UNCAST_ARG(conditional))
+static void txt_cond_size_calc(TXT_UNCAST_ARG(conditional))
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
 
-    if (!ConditionTrue(conditional))
+  if (!condition_true(conditional))
     {
-        conditional->widget.w = 0;
-        conditional->widget.h = 0;
+      conditional->widget.w = 0;
+      conditional->widget.h = 0;
     }
-    else
+  else
     {
-        TXT_CalcWidgetSize(conditional->child);
-        conditional->widget.w = conditional->child->w;
-        conditional->widget.h = conditional->child->h;
+      txt_calc_widget_size(conditional->child);
+      conditional->widget.w = conditional->child->w;
+      conditional->widget.h = conditional->child->h;
     }
 }
 
-static void TXT_CondLayout(TXT_UNCAST_ARG(conditional))
+static void txt_cond_layout(TXT_UNCAST_ARG(conditional))
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
 
-    if (ConditionTrue(conditional))
+  if (condition_true(conditional))
     {
-        conditional->child->x = conditional->widget.x;
-        conditional->child->y = conditional->widget.y;
-        TXT_LayoutWidget(conditional->child);
+      conditional->child->x = conditional->widget.x;
+      conditional->child->y = conditional->widget.y;
+      txt_layout_widget(conditional->child);
     }
 }
 
-static void TXT_CondDrawer(TXT_UNCAST_ARG(conditional))
+static void txt_cond_drawer(TXT_UNCAST_ARG(conditional))
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
 
-    if (ConditionTrue(conditional))
+  if (condition_true(conditional))
     {
-        TXT_DrawWidget(conditional->child);
+      txt_draw_widget(conditional->child);
     }
 }
 
-static void TXT_CondDestructor(TXT_UNCAST_ARG(conditional))
+static void txt_cond_destructor(TXT_UNCAST_ARG(conditional))
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
-    TXT_DestroyWidget(conditional->child);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
+  txt_destroy_widget(conditional->child);
 }
 
-static void TXT_CondFocused(TXT_UNCAST_ARG(conditional), int focused)
+static void txt_cond_focused(TXT_UNCAST_ARG(conditional), int focused)
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
 
-    if (ConditionTrue(conditional))
+  if (condition_true(conditional))
     {
-        TXT_SetWidgetFocus(conditional->child, focused);
+      txt_set_widget_focus(conditional->child, focused);
     }
 }
 
-static int TXT_CondKeyPress(TXT_UNCAST_ARG(conditional), int key)
+static int txt_cond_key_press(TXT_UNCAST_ARG(conditional), int key)
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
 
-    if (ConditionTrue(conditional))
+  if (condition_true(conditional))
     {
-        return TXT_WidgetKeyPress(conditional->child, key);
+      return txt_widget_key_press(conditional->child, key);
     }
 
-    return 0;
+  return 0;
 }
 
-static void TXT_CondMousePress(TXT_UNCAST_ARG(conditional),
-                               int x, int y, int b)
+static void txt_cond_mouse_press(TXT_UNCAST_ARG(conditional), int x, int y,
+                                 int b)
 {
-    TXT_CAST_ARG(txt_conditional_t, conditional);
+  TXT_CAST_ARG(txt_conditional_t, conditional);
 
-    if (ConditionTrue(conditional))
+  if (condition_true(conditional))
     {
-        TXT_WidgetMousePress(conditional->child, x, y, b);
+      txt_widget_mouse_press(conditional->child, x, y, b);
     }
 }
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 txt_widget_class_t txt_conditional_class =
 {
-    TXT_CondSelectable,
-    TXT_CondSizeCalc,
-    TXT_CondDrawer,
-    TXT_CondKeyPress,
-    TXT_CondDestructor,
-    TXT_CondMousePress,
-    TXT_CondLayout,
-    TXT_CondFocused,
+  txt_cond_selectable, txt_cond_size_calc,  txt_cond_drawer,
+  txt_cond_key_press,  txt_cond_destructor, txt_cond_mouse_press,
+  txt_cond_layout,     txt_cond_focused,
 };
 
-txt_conditional_t *TXT_NewConditional(int *var, int expected_value,
-                                      TXT_UNCAST_ARG(child))
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_conditional_t *txt_new_conidtional(int *var, int expected_value,
+                                       TXT_UNCAST_ARG(child))
 {
-    TXT_CAST_ARG(txt_widget_t, child);
-    txt_conditional_t *conditional;
+  TXT_CAST_ARG(txt_widget_t, child);
+  txt_conditional_t *conditional;
 
-    conditional = malloc(sizeof(txt_conditional_t));
+  conditional = malloc(sizeof(txt_conditional_t));
 
-    TXT_InitWidget(conditional, &txt_conditional_class);
-    conditional->var = var;
-    conditional->expected_value = expected_value;
-    conditional->child = child;
+  txt_init_widget(conditional, &txt_conditional_class);
+  conditional->var = var;
+  conditional->expected_value = expected_value;
+  conditional->child = child;
 
-    child->parent = &conditional->widget;
+  child->parent = &conditional->widget;
 
-    return conditional;
+  return conditional;
 }
 
-// "Static" conditional that returns an empty strut if the given static
-// value is false. Kind of like a conditional but we only evaluate it at
-// creation time.
-txt_widget_t *TXT_If(int conditional, TXT_UNCAST_ARG(child))
-{
-    TXT_CAST_ARG(txt_widget_t, child);
+/* "Static" conditional that returns an empty strut if the given static
+ * value is false. Kind of like a conditional but we only evaluate it at
+ * creation time.
+ */
 
-    if (conditional)
+txt_widget_t *txt_if(int conditional, TXT_UNCAST_ARG(child))
+{
+  TXT_CAST_ARG(txt_widget_t, child);
+
+  if (conditional)
     {
-        return child;
+      return child;
     }
-    else
+  else
     {
-        txt_strut_t *nullwidget;
-        TXT_DestroyWidget(child);
-        nullwidget = TXT_NewStrut(0, 0);
-        return &nullwidget->widget;
+      txt_strut_t *nullwidget;
+      txt_destroy_widget(child);
+      nullwidget = txt_new_strut(0, 0);
+      return &nullwidget->widget;
     }
 }
-
diff --git a/games/NXDoom/textscreen/txt_conditional.h b/games/NXDoom/textscreen/txt_conditional.h
index e30d81ba9..691c891e4 100644
--- a/games/NXDoom/textscreen/txt_conditional.h
+++ b/games/NXDoom/textscreen/txt_conditional.h
@@ -1,26 +1,41 @@
-//
-// Copyright(C) 2016 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_conditional.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2016 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_CONDITIONAL_H
 #define TXT_CONDITIONAL_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 /**
  * @file txt_conditional.h
  *
  * Conditional widget.
  */
 
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 /**
  * Conditional widget.
  *
@@ -30,19 +45,22 @@
 
 typedef struct txt_conditional_s txt_conditional_t;
 
-#include "txt_widget.h"
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
 /**
  * Create a new conditional widget.
  *
  * @param var             The variable to check.
- * @param expected_value  If the variable has this value, the widget is shown.
+ * @param expected_value  If the variable has this value, the widget is
+ *                        shown.
  * @param child           The inner widget to show or hide.
  * @return                Pointer to the new conditional widget.
  */
 
-txt_conditional_t *TXT_NewConditional(int *var, int expected_value,
-                                      TXT_UNCAST_ARG(child));
+txt_conditional_t *txt_new_conidtional(int *var, int expected_value,
+                                       TXT_UNCAST_ARG(child));
 
 /**
  * Return the given child widget if the given boolean condition is true.
@@ -56,8 +74,6 @@ txt_conditional_t *TXT_NewConditional(int *var, int expected_value,
  *                         widget.
  */
 
-txt_widget_t *TXT_If(int condition, TXT_UNCAST_ARG(child));
+txt_widget_t *txt_if(int condition, TXT_UNCAST_ARG(child));
 
 #endif /* #ifndef TXT_CONDITIONAL_H */
-
-
diff --git a/games/NXDoom/textscreen/txt_desktop.c b/games/NXDoom/textscreen/txt_desktop.c
index d84282948..06416a233 100644
--- a/games/NXDoom/textscreen/txt_desktop.c
+++ b/games/NXDoom/textscreen/txt_desktop.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_desktop.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,362 +34,383 @@
 #include "txt_separator.h"
 #include "txt_window.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 #define HELP_KEY KEY_F1
 #define MAXWINDOWS 128
 
-static char *desktop_title;
-static txt_window_t *all_windows[MAXWINDOWS];
-static int num_windows = 0;
-static int main_loop_running = 0;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static TxtIdleCallback periodic_callback = NULL;
-static void *periodic_callback_data;
-static unsigned int periodic_callback_period;
+static char *g_desktop_title;
+static txt_window_t *g_all_windows[MAXWINDOWS];
+static int g_num_windows = 0;
+static int g_main_loop_running = 0;
 
-void TXT_AddDesktopWindow(txt_window_t *win)
+static txt_idle_callback_f g_periodic_callback = NULL;
+static void *g_periodic_callback_data;
+static unsigned int g_periodic_callback_period;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_exit_mainloop(void)
 {
-    // Previously-top window loses focus:
-
-    if (num_windows > 0)
-    {
-        TXT_SetWindowFocus(all_windows[num_windows - 1], 0);
-    }
-
-    all_windows[num_windows] = win;
-    ++num_windows;
-
-    // New window gains focus:
-
-    TXT_SetWindowFocus(win, 1);
+  g_main_loop_running = 0;
 }
 
-void TXT_RemoveDesktopWindow(txt_window_t *win)
+static int txt_raise_window(txt_window_t *window)
 {
-    int from, to;
+  int i;
 
-    // Window must lose focus if it's being removed:
-
-    TXT_SetWindowFocus(win, 0);
-
-    for (from=0, to=0; from<num_windows; ++from)
+  for (i = 0; i < g_num_windows - 1; ++i)
     {
-        if (all_windows[from] != win)
+      if (g_all_windows[i] == window)
         {
-            all_windows[to] = all_windows[from];
-            ++to;
-        }
-    }
+          g_all_windows[i] = g_all_windows[i + 1];
+          g_all_windows[i + 1] = window;
 
-    num_windows = to;
-
-    // Top window gains focus:
-
-    if (num_windows > 0)
-    {
-        TXT_SetWindowFocus(all_windows[num_windows - 1], 1);
-    }
-}
-
-txt_window_t *TXT_GetActiveWindow(void)
-{
-    if (num_windows == 0)
-    {
-        return NULL;
-    }
-
-    return all_windows[num_windows - 1];
-}
-
-int TXT_RaiseWindow(txt_window_t *window)
-{
-    int i;
-
-    for (i = 0; i < num_windows - 1; ++i)
-    {
-        if (all_windows[i] == window)
-        {
-            all_windows[i] = all_windows[i + 1];
-            all_windows[i + 1] = window;
-
-            if (i == num_windows - 2)
+          if (i == g_num_windows - 2)
             {
-                TXT_SetWindowFocus(all_windows[i], 0);
-                TXT_SetWindowFocus(window, 1);
+              txt_set_window_focus(g_all_windows[i], 0);
+              txt_set_window_focus(window, 1);
             }
 
-            return 1;
+          return 1;
         }
     }
 
-    // Window not in the list, or at the end of the list (top) already.
+  /* Window not in the list, or at the end of the list (top) already. */
 
-    return 0;
+  return 0;
 }
 
-int TXT_LowerWindow(txt_window_t *window)
+static void draw_desktop_background(const char *title)
 {
-    int i;
+  int i;
+  unsigned char *screendata;
+  unsigned char *p;
 
-    for (i = 0; i < num_windows - 1; ++i)
+  screendata = txt_get_screen_data();
+
+  /* Fill the screen with gradient characters */
+
+  p = screendata;
+
+  for (i = 0; i < TXT_SCREEN_W * TXT_SCREEN_H; ++i)
     {
-        if (all_windows[i + 1] == window)
-        {
-            all_windows[i + 1] = all_windows[i];
-            all_windows[i] = window;
+      *p++ = 0xb1;
+      *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
+    }
 
-            if (i == num_windows - 2)
+  /* Draw the top and bottom banners */
+
+  p = screendata;
+
+  for (i = 0; i < TXT_SCREEN_W; ++i)
+    {
+      *p++ = ' ';
+      *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+    }
+
+  p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
+
+  for (i = 0; i < TXT_SCREEN_W; ++i)
+    {
+      *p++ = ' ';
+      *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+    }
+
+  /* Print the title */
+
+  txt_goto_xy(0, 0);
+  txt_fgcolour(TXT_COLOR_BLACK);
+  txt_bgcolour(TXT_COLOR_GREY, 0);
+
+  txt_putchar(' ');
+  txt_puts(title);
+}
+
+static void draw_help_indicator(void)
+{
+  char keybuf[10];
+  int fgcolor;
+  int x;
+  int y;
+
+  txt_get_key_description(HELP_KEY, keybuf, sizeof(keybuf));
+
+  txt_get_mouse_position(&x, &y);
+
+  if (y == 0 && x >= TXT_SCREEN_W - 9)
+    {
+      fgcolor = TXT_COLOR_GREY;
+      txt_bgcolour(TXT_COLOR_BLACK, 0);
+    }
+  else
+    {
+      fgcolor = TXT_COLOR_BLACK;
+      txt_bgcolour(TXT_COLOR_GREY, 0);
+    }
+
+  txt_goto_xy(TXT_SCREEN_W - 9, 0);
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_WHITE);
+  txt_draw_string(" ");
+  txt_draw_string(keybuf);
+
+  txt_fgcolour(fgcolor);
+  txt_draw_string("=Help ");
+}
+
+static void desktop_input_event(int c)
+{
+  txt_window_t *active_window;
+  int x;
+  int y;
+
+  switch (c)
+    {
+    case TXT_MOUSE_LEFT:
+      txt_get_mouse_position(&x, &y);
+
+      /* Clicking the top-right of the screen is equivalent
+       * to pressing the help key.
+       */
+
+      if (y == 0 && x >= TXT_SCREEN_W - 9)
+        {
+          desktop_input_event(HELP_KEY);
+        }
+      break;
+
+    case HELP_KEY:
+      active_window = txt_get_active_window();
+      if (active_window != NULL)
+        {
+          txt_open_window_help_url(active_window);
+        }
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void txt_draw_ascii_table(void)
+{
+  unsigned char *screendata;
+  char buf[10];
+  int x;
+  int y;
+  int n;
+
+  screendata = txt_get_screen_data();
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_WHITE);
+  txt_bgcolour(TXT_COLOR_BLACK, 0);
+
+  for (y = 0; y < 16; ++y)
+    {
+      for (x = 0; x < 16; ++x)
+        {
+          n = y * 16 + x;
+
+          txt_goto_xy(x * 5, y);
+          txt_snprintf(buf, sizeof(buf), "%02x   ", n);
+          txt_puts(buf);
+
+          /* Write the character directly to the screen memory buffer: */
+
+          screendata[(y * TXT_SCREEN_W + x * 5 + 3) * 2] = n;
+        }
+    }
+
+  txt_update_screen();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void txt_add_desktop_window(txt_window_t *win)
+{
+  /* Previously-top window loses focus: */
+
+  if (g_num_windows > 0)
+    {
+      txt_set_window_focus(g_all_windows[g_num_windows - 1], 0);
+    }
+
+  g_all_windows[g_num_windows] = win;
+  ++g_num_windows;
+
+  /* New window gains focus: */
+
+  txt_set_window_focus(win, 1);
+}
+
+void txt_remove_desktop_window(txt_window_t *win)
+{
+  int from;
+  int to;
+
+  /* Window must lose focus if it's being removed: */
+
+  txt_set_window_focus(win, 0);
+
+  for (from = 0, to = 0; from < g_num_windows; ++from)
+    {
+      if (g_all_windows[from] != win)
+        {
+          g_all_windows[to] = g_all_windows[from];
+          ++to;
+        }
+    }
+
+  g_num_windows = to;
+
+  /* Top window gains focus: */
+
+  if (g_num_windows > 0)
+    {
+      txt_set_window_focus(g_all_windows[g_num_windows - 1], 1);
+    }
+}
+
+txt_window_t *txt_get_active_window(void)
+{
+  if (g_num_windows == 0)
+    {
+      return NULL;
+    }
+
+  return g_all_windows[g_num_windows - 1];
+}
+
+int txt_lower_window(txt_window_t *window)
+{
+  int i;
+
+  for (i = 0; i < g_num_windows - 1; ++i)
+    {
+      if (g_all_windows[i + 1] == window)
+        {
+          g_all_windows[i + 1] = g_all_windows[i];
+          g_all_windows[i] = window;
+
+          if (i == g_num_windows - 2)
             {
-                TXT_SetWindowFocus(window, 0);
-                TXT_SetWindowFocus(all_windows[i + 1], 1);
+              txt_set_window_focus(window, 0);
+              txt_set_window_focus(g_all_windows[i + 1], 1);
             }
 
-            return 1;
+          return 1;
         }
     }
 
-    // Window not in the list, or at the start of the list (bottom) already.
+  /* Window not in the list, or at the start of the list (bottom) already. */
 
-    return 0;
+  return 0;
 }
 
-static void DrawDesktopBackground(const char *title)
+void txt_set_desktop_title(const char *title)
 {
-    int i;
-    unsigned char *screendata;
-    unsigned char *p;
-
-    screendata = TXT_GetScreenData();
-    
-    // Fill the screen with gradient characters
-
-    p = screendata;
-    
-    for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
-    {
-        *p++ = 0xb1;
-        *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
-    }
-
-    // Draw the top and bottom banners
-
-    p = screendata;
-
-    for (i=0; i<TXT_SCREEN_W; ++i)
-    {
-        *p++ = ' ';
-        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
-    }
-
-    p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
-
-    for (i=0; i<TXT_SCREEN_W; ++i)
-    {
-        *p++ = ' ';
-        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
-    }
-
-    // Print the title
-
-    TXT_GotoXY(0, 0);
-    TXT_FGColor(TXT_COLOR_BLACK);
-    TXT_BGColor(TXT_COLOR_GREY, 0);
-
-    TXT_PutChar(' ');
-    TXT_Puts(title);
+  free(g_desktop_title);
+  g_desktop_title = strdup(title);
+  txt_set_window_title(title);
 }
 
-static void DrawHelpIndicator(void)
+void txt_draw_desktop(void)
 {
-    char keybuf[10];
-    int fgcolor;
-    int x, y;
+  txt_window_t *active_window;
+  const char *title;
+  int i;
 
-    TXT_GetKeyDescription(HELP_KEY, keybuf, sizeof(keybuf));
+  txt_init_clip_area();
 
-    TXT_GetMousePosition(&x, &y);
+  if (g_desktop_title == NULL)
+    title = "";
+  else
+    title = g_desktop_title;
 
-    if (y == 0 && x >= TXT_SCREEN_W - 9)
+  draw_desktop_background(title);
+
+  active_window = txt_get_active_window();
+  if (active_window != NULL && active_window->help_url != NULL)
     {
-        fgcolor = TXT_COLOR_GREY;
-        TXT_BGColor(TXT_COLOR_BLACK, 0);
-    }
-    else
-    {
-        fgcolor = TXT_COLOR_BLACK;
-        TXT_BGColor(TXT_COLOR_GREY, 0);
+      draw_help_indicator();
     }
 
-    TXT_GotoXY(TXT_SCREEN_W - 9, 0);
+  for (i = 0; i < g_num_windows; ++i)
+    {
+      txt_draw_window(g_all_windows[i]);
+    }
 
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-    TXT_DrawString(" ");
-    TXT_DrawString(keybuf);
-
-    TXT_FGColor(fgcolor);
-    TXT_DrawString("=Help ");
+  txt_update_screen();
 }
 
-void TXT_SetDesktopTitle(const char *title)
+/* Fallback function to handle key/mouse events that are not handled by
+ * the active window.
+ */
+
+void txt_dispatch_events(void)
 {
-    free(desktop_title);
-    desktop_title = strdup(title);
-    TXT_SetWindowTitle(title);
-}
+  txt_window_t *active_window;
+  int c;
 
-void TXT_DrawDesktop(void)
-{
-    txt_window_t *active_window;
-    const char *title;
-    int i;
-
-    TXT_InitClipArea();
-
-    if (desktop_title == NULL)
-        title = "";
-    else
-        title = desktop_title;
-
-    DrawDesktopBackground(title);
-
-    active_window = TXT_GetActiveWindow();
-    if (active_window != NULL && active_window->help_url != NULL)
+  while ((c = txt_getchar()) > 0)
     {
-        DrawHelpIndicator();
-    }
+      active_window = txt_get_active_window();
 
-    for (i=0; i<num_windows; ++i)
-    {
-        TXT_DrawWindow(all_windows[i]);
-    }
-
-    TXT_UpdateScreen();
-}
-
-// Fallback function to handle key/mouse events that are not handled by
-// the active window.
-static void DesktopInputEvent(int c)
-{
-    txt_window_t *active_window;
-    int x, y;
-
-    switch (c)
-    {
-        case TXT_MOUSE_LEFT:
-            TXT_GetMousePosition(&x, &y);
-
-            // Clicking the top-right of the screen is equivalent
-            // to pressing the help key.
-            if (y == 0 && x >= TXT_SCREEN_W - 9)
-            {
-                DesktopInputEvent(HELP_KEY);
-            }
-            break;
-
-        case HELP_KEY:
-            active_window = TXT_GetActiveWindow();
-            if (active_window != NULL)
-            {
-                TXT_OpenWindowHelpURL(active_window);
-            }
-            break;
-
-        default:
-            break;
-    }
-
-
-}
-
-void TXT_DispatchEvents(void)
-{
-    txt_window_t *active_window;
-    int c;
-
-    while ((c = TXT_GetChar()) > 0)
-    {
-        active_window = TXT_GetActiveWindow();
-
-        if (active_window != NULL && !TXT_WindowKeyPress(active_window, c))
+      if (active_window != NULL && !txt_window_keypress(active_window, c))
         {
-            DesktopInputEvent(c);
+          desktop_input_event(c);
         }
     }
 }
 
-void TXT_ExitMainLoop(void)
+void txt_set_periodic_callback(txt_idle_callback_f callback, void *user_data,
+                               unsigned int period)
 {
-    main_loop_running = 0;
+  g_periodic_callback = callback;
+  g_periodic_callback_data = user_data;
+  g_periodic_callback_period = period;
 }
 
-void TXT_DrawASCIITable(void)
+void txt_gui_mainloop(void)
 {
-    unsigned char *screendata;
-    char buf[10];
-    int x, y;
-    int n;
+  g_main_loop_running = 1;
 
-    screendata = TXT_GetScreenData();
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-    TXT_BGColor(TXT_COLOR_BLACK, 0);
-
-    for (y=0; y<16; ++y)
+  while (g_main_loop_running)
     {
-        for (x=0; x<16; ++x)
+      txt_dispatch_events();
+
+      /* After the last window is closed, exit the loop */
+
+      if (g_num_windows <= 0)
         {
-            n = y * 16 + x;
-
-            TXT_GotoXY(x * 5, y);
-            TXT_snprintf(buf, sizeof(buf), "%02x   ", n);
-            TXT_Puts(buf);
-
-            // Write the character directly to the screen memory buffer:
-
-            screendata[(y * TXT_SCREEN_W + x * 5 + 3) * 2] = n;
-        }
-    }
-
-    TXT_UpdateScreen();
-}
-
-void TXT_SetPeriodicCallback(TxtIdleCallback callback,
-                             void *user_data,
-                             unsigned int period)
-{
-    periodic_callback = callback;
-    periodic_callback_data = user_data;
-    periodic_callback_period = period;
-}
-
-void TXT_GUIMainLoop(void)
-{
-    main_loop_running = 1;
-
-    while (main_loop_running)
-    {
-        TXT_DispatchEvents();
-
-        // After the last window is closed, exit the loop
-
-        if (num_windows <= 0)
-        {
-            TXT_ExitMainLoop();
-            continue;
+          txt_exit_mainloop();
+          continue;
         }
 
-        TXT_DrawDesktop();
-//        TXT_DrawASCIITable();
+      txt_draw_desktop();
 
-        if (periodic_callback == NULL)
+      /*        TXT_DrawASCIITable(); */
+
+      if (g_periodic_callback == NULL)
         {
-            TXT_Sleep(0);
+          txt_sleep(0);
         }
-        else
+      else
         {
-            TXT_Sleep(periodic_callback_period);
+          txt_sleep(g_periodic_callback_period);
 
-            periodic_callback(periodic_callback_data);
+          g_periodic_callback(g_periodic_callback_data);
         }
     }
 }
-
diff --git a/games/NXDoom/textscreen/txt_desktop.h b/games/NXDoom/textscreen/txt_desktop.h
index 8883c39da..faae8c834 100644
--- a/games/NXDoom/textscreen/txt_desktop.h
+++ b/games/NXDoom/textscreen/txt_desktop.h
@@ -1,37 +1,48 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_desktop.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_DESKTOP_H
 #define TXT_DESKTOP_H
 
-/**
- * @file txt_desktop.h
- *
- * Textscreen desktop.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include "txt_window.h"
 
-typedef void (*TxtIdleCallback)(void *user_data);
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-void TXT_AddDesktopWindow(txt_window_t *win);
-void TXT_RemoveDesktopWindow(txt_window_t *win);
-void TXT_DrawDesktop(void);
-void TXT_DispatchEvents(void);
-void TXT_DrawWindow(txt_window_t *window);
-void TXT_SetWindowFocus(txt_window_t *window, int focused);
-int TXT_WindowKeyPress(txt_window_t *window, int c);
+typedef void (*txt_idle_callback_f)(void *user_data);
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void txt_add_desktop_window(txt_window_t *win);
+void txt_remove_desktop_window(txt_window_t *win);
+void txt_draw_desktop(void);
+void txt_dispatch_events(void);
+void txt_draw_window(txt_window_t *window);
+void txt_set_window_focus(txt_window_t *window, int focused);
+int txt_window_keypress(txt_window_t *window, int c);
 
 /**
  * Set the title displayed at the top of the screen.
@@ -39,14 +50,7 @@ int TXT_WindowKeyPress(txt_window_t *window, int c);
  * @param title         The title to display (UTF-8 format).
  */
 
-void TXT_SetDesktopTitle(const char *title);
-
-/**
- * Exit the currently-running main loop and return from the
- * @ref TXT_GUIMainLoop function.
- */
-
-void TXT_ExitMainLoop(void);
+void txt_set_desktop_title(const char *title);
 
 /**
  * Start the main event loop.  At least one window must have been
@@ -57,7 +61,7 @@ void TXT_ExitMainLoop(void);
  * @ref TXT_ExitMainLoop function.
  */
 
-void TXT_GUIMainLoop(void);
+void txt_gui_mainloop(void);
 
 /**
  * Get the top window on the desktop that is currently receiving
@@ -66,7 +70,7 @@ void TXT_GUIMainLoop(void);
  * @return    The active window, or NULL if no windows are present.
  */
 
-txt_window_t *TXT_GetActiveWindow(void);
+txt_window_t *txt_get_active_window(void);
 
 /**
  * Set a callback function to be invoked periodically by the main
@@ -80,20 +84,8 @@ txt_window_t *TXT_GetActiveWindow(void);
  *                      to be invoked at least once every 200ms.
  */
 
-void TXT_SetPeriodicCallback(TxtIdleCallback callback,
-                             void *user_data,
+void txt_set_periodic_callback(txt_idle_callback_f callback, void *user_data,
                              unsigned int period);
-
-/**
- * Raise the z-position of the given window relative to other windows.
- *
- * @param window        The window to raise.
- * @return              Non-zero if the window was raised successfully,
- *                      or zero if the window could not be raised further.
- */
-
-int TXT_RaiseWindow(txt_window_t *window);
-
 /**
  * Lower the z-position of the given window relative to other windows.
  *
@@ -102,7 +94,6 @@ int TXT_RaiseWindow(txt_window_t *window);
  *                      or zero if the window could not be lowered further.
  */
 
-int TXT_LowerWindow(txt_window_t *window);
-
-#endif /* #ifndef TXT_DESKTOP_H */
+int txt_lower_window(txt_window_t *window);
 
+#endif /* TXT_DESKTOP_H */
diff --git a/games/NXDoom/textscreen/txt_dropdown.c b/games/NXDoom/textscreen/txt_dropdown.c
index 2439015b7..da19a8efd 100644
--- a/games/NXDoom/textscreen/txt_dropdown.c
+++ b/games/NXDoom/textscreen/txt_dropdown.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_dropdown.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -25,281 +34,310 @@
 #include "txt_utf8.h"
 #include "txt_window.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct
 {
-    txt_window_t *window;
-    txt_dropdown_list_t *list;
-    int item;
+  txt_window_t *window;
+  txt_dropdown_list_t *list;
+  int item;
 } callback_data_t;
 
-// Check if the selected value for a list is valid
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-static int ValidSelection(txt_dropdown_list_t *list)
-{
-    return *list->variable >= 0 && *list->variable < list->num_values;
-}
-
-// Calculate the Y position for the selector window
-
-static int SelectorWindowY(txt_dropdown_list_t *list)
-{
-    int result;
-
-    if (ValidSelection(list))
-    {
-        result = list->widget.y - 1 - *list->variable;
-    }
-    else
-    {
-        result = list->widget.y - 1 - (list->num_values / 2);
-    }
-
-    // Keep dropdown inside the screen.
-
-    if (result < 1)
-    {
-        result = 1;
-    }
-    else if (result + list->num_values > (TXT_SCREEN_H - 3))
-    {
-        result = TXT_SCREEN_H - list->num_values - 3;
-    }
-
-    return result;
-}
-
-// Called when a button in the selector window is pressed
-
-static void ItemSelected(TXT_UNCAST_ARG(button), TXT_UNCAST_ARG(callback_data))
-{
-    TXT_CAST_ARG(callback_data_t, callback_data);
-
-    // Set the variable
-
-    *callback_data->list->variable = callback_data->item;
-
-    TXT_EmitSignal(callback_data->list, "changed");
-
-    // Close the window
-
-    TXT_CloseWindow(callback_data->window);
-}
-
-// Free callback data when the window is closed
-
-static void FreeCallbackData(TXT_UNCAST_ARG(list), 
-                             TXT_UNCAST_ARG(callback_data))
-{
-    TXT_CAST_ARG(callback_data_t, callback_data);
-
-    free(callback_data);
-}
-
-// Catch presses of escape and close the window.
-
-static int SelectorWindowListener(txt_window_t *window, int key, void *user_data)
-{
-    if (key == KEY_ESCAPE)
-    {
-        TXT_CloseWindow(window);
-        return 1;
-    }
-
-    return 0;
-}
-
-static int SelectorMouseListener(txt_window_t *window, int x, int y, int b,
-                                 void *unused)
-{
-    txt_widget_t *win;
-
-    win = (txt_widget_t *) window;
-
-    if (x < win->x || x > win->x + win->w || y < win->y || y > win->y + win->h)
-    {
-        TXT_CloseWindow(window);
-        return 1;
-    }
-
-    return 0;
-}
-
-// Open the dropdown list window to select an item
-
-static void OpenSelectorWindow(txt_dropdown_list_t *list)
-{
-    txt_window_t *window;
-    int i;
-
-    // Open a simple window with no title bar or action buttons.
-
-    window = TXT_NewWindow(NULL);
-
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
-
-    // Position the window so that the currently selected item appears
-    // over the top of the list widget.
-
-    TXT_SetWindowPosition(window, TXT_HORIZ_LEFT, TXT_VERT_TOP,
-                          list->widget.x - 2, SelectorWindowY(list));
-
-    // Add a button to the window for each option in the list.
-
-    for (i=0; i<list->num_values; ++i)
-    {
-        txt_button_t *button;
-        callback_data_t *data;
-
-        button = TXT_NewButton(list->values[i]);
-
-        TXT_AddWidget(window, button);
-
-        // Callback struct
-
-        data = malloc(sizeof(callback_data_t));
-        data->list = list;
-        data->window = window;
-        data->item = i;
-        
-        // When the button is pressed, invoke the button press callback
-       
-        TXT_SignalConnect(button, "pressed", ItemSelected, data);
-        
-        // When the window is closed, free back the callback struct
-
-        TXT_SignalConnect(window, "closed", FreeCallbackData, data);
-
-        // Is this the currently-selected value?  If so, select the button
-        // in the window as the default.
-        
-        if (i == *list->variable)
-        {
-            TXT_SelectWidget(window, button);
-        }
-    }
-
-    // Catch presses of escape in this window and close it.
-
-    TXT_SetKeyListener(window, SelectorWindowListener, NULL);
-    TXT_SetMouseListener(window, SelectorMouseListener, NULL);
-}
-
-static int DropdownListWidth(txt_dropdown_list_t *list)
-{
-    int i;
-    int result;
-
-    // Find the maximum string width
- 
-    result = 0;
-
-    for (i=0; i<list->num_values; ++i)
-    {
-        int w = TXT_UTF8_Strlen(list->values[i]);
-        if (w > result) 
-        {
-            result = w;
-        }
-    }
-
-    return result;
-}
-
-static void TXT_DropdownListSizeCalc(TXT_UNCAST_ARG(list))
-{
-    TXT_CAST_ARG(txt_dropdown_list_t, list);
-
-    list->widget.w = DropdownListWidth(list);
-    list->widget.h = 1;
-}
-
-static void TXT_DropdownListDrawer(TXT_UNCAST_ARG(list))
-{
-    TXT_CAST_ARG(txt_dropdown_list_t, list);
-    unsigned int i;
-    const char *str;
-
-    // Set bg/fg text colors.
-
-    TXT_SetWidgetBG(list);
-
-    // Select a string to draw from the list, if the current value is
-    // in range.  Otherwise fall back to a default.
-
-    if (ValidSelection(list))
-    {
-        str = list->values[*list->variable];
-    }
-    else
-    {
-        str = "???";
-    }
-
-    // Draw the string and fill to the end with spaces
-
-    TXT_DrawString(str);
-
-    for (i = TXT_UTF8_Strlen(str); i < list->widget.w; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_DropdownListDestructor(TXT_UNCAST_ARG(list))
-{
-}
-
-static int TXT_DropdownListKeyPress(TXT_UNCAST_ARG(list), int key)
-{
-    TXT_CAST_ARG(txt_dropdown_list_t, list);
-
-    if (key == KEY_ENTER)
-    {
-        OpenSelectorWindow(list);
-        return 1;
-    }
-    
-    return 0;
-}
-
-static void TXT_DropdownListMousePress(TXT_UNCAST_ARG(list), 
-                                       int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_dropdown_list_t, list);
-
-    // Left mouse click does the same as selecting and pressing enter
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_DropdownListKeyPress(list, KEY_ENTER);
-    }
-}
+static void txt_dropdown_list_size_calc(TXT_UNCAST_ARG(list));
+static void txt_dropdown_list_drawer(TXT_UNCAST_ARG(list));
+static void txt_dropdown_list_destructor(TXT_UNCAST_ARG(list));
+static int txt_dropdown_lis_keypress(TXT_UNCAST_ARG(list), int key);
+static void txt_dropdown_list_mousepress(TXT_UNCAST_ARG(list), int x, int y,
+                                         int b);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_dropdown_list_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_DropdownListSizeCalc,
-    TXT_DropdownListDrawer,
-    TXT_DropdownListKeyPress,
-    TXT_DropdownListDestructor,
-    TXT_DropdownListMousePress,
-    NULL,
+  txt_always_selectable,
+  txt_dropdown_list_size_calc,
+  txt_dropdown_list_drawer,
+  txt_dropdown_lis_keypress,
+  txt_dropdown_list_destructor,
+  txt_dropdown_list_mousepress,
+  NULL,
 };
 
-txt_dropdown_list_t *TXT_NewDropdownList(int *variable, const char **values,
-                                         int num_values)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Check if the selected value for a list is valid */
+
+static int valid_selection(txt_dropdown_list_t *list)
 {
-    txt_dropdown_list_t *list;
-
-    list = malloc(sizeof(txt_dropdown_list_t));
-
-    TXT_InitWidget(list, &txt_dropdown_list_class);
-    list->variable = variable;
-    list->values = values;
-    list->num_values = num_values;
-
-    return list;
+  return *list->variable >= 0 && *list->variable < list->num_values;
 }
 
+/* Calculate the Y position for the selector window */
+
+static int selector_window_y(txt_dropdown_list_t *list)
+{
+  int result;
+
+  if (valid_selection(list))
+    {
+      result = list->widget.y - 1 - *list->variable;
+    }
+  else
+    {
+      result = list->widget.y - 1 - (list->num_values / 2);
+    }
+
+  /* Keep dropdown inside the screen. */
+
+  if (result < 1)
+    {
+      result = 1;
+    }
+  else if (result + list->num_values > (TXT_SCREEN_H - 3))
+    {
+      result = TXT_SCREEN_H - list->num_values - 3;
+    }
+
+  return result;
+}
+
+/* Called when a button in the selector window is pressed */
+
+static void item_selected(TXT_UNCAST_ARG(button),
+                          TXT_UNCAST_ARG(callback_data))
+{
+  TXT_CAST_ARG(callback_data_t, callback_data);
+
+  /* Set the variable */
+
+  *callback_data->list->variable = callback_data->item;
+
+  txt_emit_signal(callback_data->list, "changed");
+
+  /* Close the window */
+
+  txt_close_window(callback_data->window);
+}
+
+/* Free callback data when the window is closed */
+
+static void free_callback_data(TXT_UNCAST_ARG(list),
+                               TXT_UNCAST_ARG(callback_data))
+{
+  TXT_CAST_ARG(callback_data_t, callback_data);
+  free(callback_data);
+}
+
+/* Catch presses of escape and close the window. */
+
+static int selector_window_listener(txt_window_t *window, int key,
+                                    void *user_data)
+{
+  if (key == KEY_ESCAPE)
+    {
+      txt_close_window(window);
+      return 1;
+    }
+
+  return 0;
+}
+
+static int selector_mouse_listener(txt_window_t *window, int x, int y, int b,
+                                   void *unused)
+{
+  txt_widget_t *win;
+
+  win = (txt_widget_t *)window;
+
+  if (x < win->x || x > win->x + win->w || y < win->y || y > win->y + win->h)
+    {
+      txt_close_window(window);
+      return 1;
+    }
+
+  return 0;
+}
+
+/* Open the dropdown list window to select an item */
+
+static void open_selector_window(txt_dropdown_list_t *list)
+{
+  txt_window_t *window;
+  int i;
+
+  /* Open a simple window with no title bar or action buttons. */
+
+  window = txt_new_window(NULL);
+
+  txt_set_window_action(window, TXT_HORIZ_LEFT, NULL);
+  txt_set_window_action(window, TXT_HORIZ_CENTER, NULL);
+  txt_set_window_action(window, TXT_HORIZ_RIGHT, NULL);
+
+  /* Position the window so that the currently selected item appears
+   * over the top of the list widget.
+   */
+
+  txt_set_window_position(window, TXT_HORIZ_LEFT, TXT_VERT_TOP,
+                          list->widget.x - 2, selector_window_y(list));
+
+  /* Add a button to the window for each option in the list. */
+
+  for (i = 0; i < list->num_values; ++i)
+    {
+      txt_button_t *button;
+      callback_data_t *data;
+
+      button = txt_new_button(list->values[i]);
+
+      txt_add_widget(window, button);
+
+      /* Callback struct */
+
+      data = malloc(sizeof(callback_data_t));
+      data->list = list;
+      data->window = window;
+      data->item = i;
+
+      /* When the button is pressed, invoke the button press callback */
+
+      txt_signal_connect(button, "pressed", item_selected, data);
+
+      /* When the window is closed, free back the callback struct */
+
+      txt_signal_connect(window, "closed", free_callback_data, data);
+
+      /* Is this the currently-selected value?  If so, select the button
+       * in the window as the default.
+       */
+
+      if (i == *list->variable)
+        {
+          txt_select_widget(window, button);
+        }
+    }
+
+  /* Catch presses of escape in this window and close it. */
+
+  txt_set_key_listener(window, selector_window_listener, NULL);
+  txt_set_mouse_listener(window, selector_mouse_listener, NULL);
+}
+
+static int dropdown_list_width(txt_dropdown_list_t *list)
+{
+  int i;
+  int result;
+
+  /* Find the maximum string width */
+
+  result = 0;
+
+  for (i = 0; i < list->num_values; ++i)
+    {
+      int w = txt_utf8_strlen(list->values[i]);
+      if (w > result)
+        {
+          result = w;
+        }
+    }
+
+  return result;
+}
+
+static void txt_dropdown_list_size_calc(TXT_UNCAST_ARG(list))
+{
+  TXT_CAST_ARG(txt_dropdown_list_t, list);
+
+  list->widget.w = dropdown_list_width(list);
+  list->widget.h = 1;
+}
+
+static void txt_dropdown_list_drawer(TXT_UNCAST_ARG(list))
+{
+  TXT_CAST_ARG(txt_dropdown_list_t, list);
+  unsigned int i;
+  const char *str;
+
+  /* Set bg/fg text colors. */
+
+  txt_set_widget_bg(list);
+
+  /* Select a string to draw from the list, if the current value is
+   * in range.  Otherwise fall back to a default.
+   */
+
+  if (valid_selection(list))
+    {
+      str = list->values[*list->variable];
+    }
+  else
+    {
+      str = "???";
+    }
+
+  /* Draw the string and fill to the end with spaces */
+
+  txt_draw_string(str);
+
+  for (i = txt_utf8_strlen(str); i < list->widget.w; ++i)
+    {
+      txt_draw_string(" ");
+    }
+}
+
+static void txt_dropdown_list_destructor(TXT_UNCAST_ARG(list))
+{
+}
+
+static int txt_dropdown_lis_keypress(TXT_UNCAST_ARG(list), int key)
+{
+  TXT_CAST_ARG(txt_dropdown_list_t, list);
+
+  if (key == KEY_ENTER)
+    {
+      open_selector_window(list);
+      return 1;
+    }
+
+  return 0;
+}
+
+static void txt_dropdown_list_mousepress(TXT_UNCAST_ARG(list), int x, int y,
+                                         int b)
+{
+  TXT_CAST_ARG(txt_dropdown_list_t, list);
+
+  /* Left mouse click does the same as selecting and pressing enter */
+
+  if (b == TXT_MOUSE_LEFT)
+    {
+      txt_dropdown_lis_keypress(list, KEY_ENTER);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_dropdown_list_t *txt_new_dropdown_list(int *variable,
+        const char **values, int num_values)
+{
+  txt_dropdown_list_t *list;
+
+  list = malloc(sizeof(txt_dropdown_list_t));
+
+  txt_init_widget(list, &txt_dropdown_list_class);
+  list->variable = variable;
+  list->values = values;
+  list->num_values = num_values;
+
+  return list;
+}
diff --git a/games/NXDoom/textscreen/txt_dropdown.h b/games/NXDoom/textscreen/txt_dropdown.h
index 69bc7d506..08286325b 100644
--- a/games/NXDoom/textscreen/txt_dropdown.h
+++ b/games/NXDoom/textscreen/txt_dropdown.h
@@ -1,28 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_dropdown.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_DROPDOWN_H
 #define TXT_DROPDOWN_H
 
-/**
- * @file txt_dropdown.h
- *
- * Dropdown list widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Dropdown list widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Dropdown list widget.
  *
  * A dropdown list allows the user to select from a list of values,
  * which appears when the list is selected.
@@ -31,22 +39,18 @@
  * is emitted.
  */
 
-typedef struct txt_dropdown_list_s txt_dropdown_list_t;
-
-#include "txt_widget.h"
-
-//
-// Drop-down list box.
-// 
-
 struct txt_dropdown_list_s
 {
-    txt_widget_t widget;
-    int *variable;
-    const char **values;
-    int num_values;
+  txt_widget_t widget;
+  int *variable;
+  const char **values;
+  int num_values;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new dropdown list widget.
  *
@@ -61,9 +65,7 @@ struct txt_dropdown_list_s
  * @param num_values      The number of variables in the list.
  */
 
-txt_dropdown_list_t *TXT_NewDropdownList(int *variable, 
-                                         const char **values, int num_values);
-
-#endif /* #ifndef TXT_DROPDOWN_H */
-
+txt_dropdown_list_t *txt_new_dropdown_list(int *variable,
+        const char **values, int num_values);
 
+#endif /* TXT_DROPDOWN_H */
diff --git a/games/NXDoom/textscreen/txt_fileselect.c b/games/NXDoom/textscreen/txt_fileselect.c
index 08c0c8f7b..b1343efd6 100644
--- a/games/NXDoom/textscreen/txt_fileselect.c
+++ b/games/NXDoom/textscreen/txt_fileselect.c
@@ -1,836 +1,359 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Routines for selecting files.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_fileselect.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Routines for selecting files.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
 #include "doomkeys.h"
 
 #include "txt_fileselect.h"
-#include "txt_inputbox.h"
 #include "txt_gui.h"
+#include "txt_inputbox.h"
 #include "txt_io.h"
 #include "txt_main.h"
 #include "txt_widget.h"
 
-struct txt_fileselect_s {
-    txt_widget_t widget;
-    txt_inputbox_t *inputbox;
-    int size;
-    const char *prompt;
-    const char **extensions;
-};
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Dummy value to select a directory.
-
-const char *TXT_DIRECTORY[] = { "__directory__", NULL };
-
-#ifndef _WIN32
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/wait.h>
-
-static char *ExecReadOutput(char **argv)
-{
-    char *result;
-    int completed;
-    int pid, status, result_len;
-    int pipefd[2];
-
-    if (pipe(pipefd) != 0)
-    {
-        return NULL;
-    }
-
-    pid = fork();
-
-    if (pid == 0)
-    {
-        dup2(pipefd[1], fileno(stdout));
-        execv(argv[0], argv);
-        exit(-1);
-    }
-
-    fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
-
-    // Read program output into 'result' string.
-    // Wait until the program has completed and (if it was successful)
-    // a full line has been read.
-
-    result = NULL;
-    result_len = 0;
-    completed = 0;
-
-    while (!completed
-        || (status == 0 && (result == NULL || strchr(result, '\n') == NULL)))
-    {
-        char buf[64];
-        int bytes;
-
-        if (!completed && waitpid(pid, &status, WNOHANG) != 0)
-        {
-            completed = 1;
-        }
-
-        bytes = read(pipefd[0], buf, sizeof(buf));
-
-        if (bytes < 0)
-        {
-            if (errno != EAGAIN && errno != EWOULDBLOCK)
-            {
-                status = -1;
-                break;
-            }
-        }
-        else
-        {
-            char *new_result = realloc(result, result_len + bytes + 1);
-            if (new_result == NULL)
-            {
-                break;
-            }
-            result = new_result;
-            memcpy(result + result_len, buf, bytes);
-            result_len += bytes;
-            result[result_len] = '\0';
-        }
-
-        usleep(100 * 1000);
-        TXT_Sleep(1);
-        TXT_UpdateScreen();
-    }
-
-    close(pipefd[0]);
-    close(pipefd[1]);
-
-    // Must have a success exit code.
-
-    if (WEXITSTATUS(status) != 0)
-    {
-        free(result);
-        result = NULL;
-    }
-
-    // Strip off newline from the end.
-
-    if (result != NULL && result[result_len - 1] == '\n')
-    {
-        result[result_len - 1] = '\0';
-    }
-
-    return result;
-}
-
-#endif
-
-// This is currently disabled on Windows because it doesn't work.
-// Current issues:
-//   * On Windows Vista+ the mouse cursor freezes when the dialog is
-//     opened. This is probably some conflict with SDL (might be
-//     resolved by opening the dialog in a separate thread so that
-//     TXT_UpdateScreen can be run in the background).
-//   * On Windows XP the program exits/crashes when the dialog is
-//     closed.
-#if defined(_WIN32)
-
-int TXT_CanSelectFiles(void)
-{
-    return 0;
-}
-
-char *TXT_SelectFile(const char *window_title, const char **extensions)
-{
-    return NULL;
-}
-
-#elif defined(xxxdisabled_WIN32)
-
-// Windows code. Use comdlg32 to pop up a dialog box.
-
-#include <windows.h>
-#include <shlobj.h>
-
-static BOOL (*MyGetOpenFileName)(LPOPENFILENAME) = NULL;
-static LPITEMIDLIST (*MySHBrowseForFolder)(LPBROWSEINFO) = NULL;
-static BOOL (*MySHGetPathFromIDList)(LPITEMIDLIST, LPTSTR) = NULL;
-
-// Load library functions from DLL files.
-
-static int LoadDLLs(void)
-{
-    HMODULE comdlg32, shell32
-
-    comdlg32 = LoadLibraryW(L"comdlg32.dll");
-    if (comdlg32 == NULL)
-    {
-        return 0;
-    }
-
-    shell32 = LoadLibraryW(L"shell32.dll");
-    if (shell32 == NULL)
-    {
-        FreeLibrary(comdlg32);
-        return 0;
-    }
-
-    MyGetOpenFileName =
-        (void *) GetProcAddress(comdlg32, "GetOpenFileNameA");
-    MySHBrowseForFolder =
-        (void *) GetProcAddress(shell32, "SHBrowseForFolder");
-    MySHGetPathFromIDList =
-        (void *) GetProcAddress(shell32, "SHGetPathFromIDList");
-
-    return MyGetOpenFileName != NULL
-        && MySHBrowseForFolder != NULL
-        && MySHGetPathFromIDList != NULL;
-}
-
-static int InitLibraries(void)
-{
-    static int initted = 0, success = 0;
-
-    if (!initted)
-    {
-        success = LoadDLLs();
-        initted = 1;
-    }
-
-    return success;
-}
-
-// Generate the "filter" string from the list of extensions.
-
-static char *GenerateFilterString(const char **extensions)
-{
-    unsigned int result_len = 1;
-    unsigned int i;
-    char *result, *out;
-    size_t out_len, offset;
-
-    if (extensions == NULL)
-    {
-        return NULL;
-    }
-
-    for (i = 0; extensions[i] != NULL; ++i)
-    {
-        result_len += 16 + strlen(extensions[i]) * 3;
-    }
-
-    result = malloc(result_len);
-    out = result; out_len = result_len;
-
-    for (i = 0; extensions[i] != NULL; ++i)
-    {
-        // .wad files (*.wad)\0
-        offset = TXT_snprintf(out, out_len, "%s files (*.%s)",
-                              extensions[i], extensions[i]);
-        out += offset + 1; out_len -= offset + 1;
-
-        // *.wad\0
-        offset = TXT_snprintf(out, out_len, "*.%s", extensions[i]);
-        out_len += offset + 1; out_len -= offset + 1;
-    }
-
-    *out = '\0';
-
-    return result;
-}
-
-int TXT_CanSelectFiles(void)
-{
-    return InitLibraries();
-}
-
-static char *SelectDirectory(char *window_title)
-{
-    LPITEMIDLIST pidl;
-    BROWSEINFO bi;
-    char selected[MAX_PATH] = "";
-    char *result;
-
-    ZeroMemory(&bi, sizeof(bi));
-    bi.hwndOwner = NULL;
-    bi.lpszTitle = window_title;
-    bi.pszDisplayName = selected;
-    bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE;
-
-    pidl = MySHBrowseForFolder(&bi);
-
-    result = NULL;
-
-    if (pidl != NULL)
-    {
-        if (MySHGetPathFromIDList(pidl, selected))
-        {
-            result = strdup(selected);
-        }
-
-        // TODO: Free pidl
-    }
-
-    return result;
-}
-
-char *TXT_SelectFile(const char *window_title, const char **extensions)
-{
-    OPENFILENAME fm;
-    char selected[MAX_PATH] = "";
-    char *filter_string, *result;
-
-    if (!InitLibraries())
-    {
-        return NULL;
-    }
-
-    if (extensions == TXT_DIRECTORY)
-    {
-        return SelectDirectory(window_title);
-    }
-
-    filter_string = GenerateFilterString(extensions);
-
-    ZeroMemory(&fm, sizeof(fm));
-    fm.lStructSize = sizeof(OPENFILENAME);
-    fm.hwndOwner = NULL;
-    fm.lpstrTitle = window_title;
-    fm.lpstrFilter = filter_string;
-    fm.lpstrFile = selected;
-    fm.nMaxFile = MAX_PATH;
-    fm.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
-    fm.lpstrDefExt = "";
-
-    if (!MyGetOpenFileName(&fm))
-    {
-        result = NULL;
-    }
-    else
-    {
-        result = strdup(selected);
-    }
-
-    free(filter_string);
-
-    return result;
-}
-
-#elif defined(__MACOSX__)
-
-// Mac OS X code. Popping up a dialog requires Objective C/Cocoa
-// but we can get away with using AppleScript which avoids adding
-// an Objective C dependency. This is rather silly.
-
-// Printf format string for the "wrapper" portion of the AppleScript:
-#define APPLESCRIPT_WRAPPER "copy POSIX path of (%s) to stdout"
-
-static char *CreateEscapedString(const char *original)
-{
-    char *result;
-    const char *in;
-    char *out;
-
-    // We need to take care not to overflow the buffer, so count exactly.
-#define ESCAPED_CHARS "\"\\"
-    size_t count_extras = 2;    // start counting the two quotes
-    for (in = original; *in; ++in)
-    {
-        if (strchr(ESCAPED_CHARS, *in))
-        {
-            ++count_extras;
-        }
-    }
-
-    result = malloc(strlen(original) + count_extras + 1);
-    if (!result)
-    {
-        return NULL;
-    }
-    out = result;
-    *out++ = '"';
-    for (in = original; *in; ++in)
-    {
-        if (strchr(ESCAPED_CHARS, *in))
-        {
-            *out++ = '\\';
-        }
-        *out++ = *in;
-    }
-    *out++ = '"';
-    *out = 0;
-
-    return result;
-#undef ESCAPED_CHARS
-}
-
-// Build list of extensions, like: {"wad","lmp","txt"}
-
-static char *CreateExtensionsList(const char **extensions)
-{
-    char *result, *escaped;
-    unsigned int result_len;
-    unsigned int i;
-
-    if (extensions == NULL)
-    {
-        return NULL;
-    }
-
-    result_len = 3;
-    for (i = 0; extensions[i] != NULL; ++i)
-    {
-        result_len += 5 + strlen(extensions[i]) * 2;
-    }
-
-    result = malloc(result_len);
-    if (!result)
-    {
-        return NULL;
-    }
-    TXT_StringCopy(result, "{", result_len);
-
-    for (i = 0; extensions[i] != NULL; ++i)
-    {
-        escaped = CreateEscapedString(extensions[i]);
-        if (!escaped)
-        {
-            free(result);
-            return NULL;
-        }
-        TXT_StringConcat(result, escaped, result_len);
-        free(escaped);
-
-        if (extensions[i + 1] != NULL)
-        {
-            TXT_StringConcat(result, ",", result_len);
-        }
-    }
-
-    TXT_StringConcat(result, "}", result_len);
-
-    return result;
-}
-
-static char *GenerateSelector(const char *const window_title, const char **extensions)
-{
-    const char *chooser;
-    char *ext_list = NULL;
-    char *window_title_escaped = NULL;
-    char *result = NULL;
-    unsigned int result_len = 64;
-
-    if (extensions == TXT_DIRECTORY)
-    {
-        chooser = "choose folder";
-    }
-    else
-    {
-        chooser = "choose file";
-        ext_list = CreateExtensionsList(extensions);
-        if (!ext_list)
-        {
-            return NULL;
-        }
-    }
-
-    // Calculate size.
-
-    if (window_title != NULL)
-    {
-        window_title_escaped = CreateEscapedString(window_title);
-        if (!window_title_escaped)
-        {
-            free(ext_list);
-            return NULL;
-        }
-        result_len += strlen(window_title_escaped);
-    }
-    if (ext_list != NULL)
-    {
-        result_len += strlen(ext_list);
-    }
-
-    result = malloc(result_len);
-    if (!result)
-    {
-        free(window_title_escaped);
-        free(ext_list);
-        return NULL;
-    }
-
-    TXT_StringCopy(result, chooser, result_len);
-
-    if (window_title_escaped != NULL)
-    {
-        TXT_StringConcat(result, " with prompt ", result_len);
-        TXT_StringConcat(result, window_title_escaped, result_len);
-    }
-
-    if (ext_list != NULL)
-    {
-        TXT_StringConcat(result, " of type ", result_len);
-        TXT_StringConcat(result, ext_list, result_len);
-    }
-
-    free(window_title_escaped);
-    free(ext_list);
-    return result;
-}
-
-static char *GenerateAppleScript(const char *window_title, const char **extensions)
-{
-    char *selector, *result;
-    size_t result_len;
-
-    selector = GenerateSelector(window_title, extensions);
-    if (!selector)
-    {
-        return NULL;
-    }
-
-    result_len = strlen(APPLESCRIPT_WRAPPER) + strlen(selector);
-    result = malloc(result_len);
-    if (!result)
-    {
-        free(selector);
-        return NULL;
-    }
-
-    TXT_snprintf(result, result_len, APPLESCRIPT_WRAPPER, selector);
-    free(selector);
-
-    return result;
-}
-
-int TXT_CanSelectFiles(void)
-{
-    return 1;
-}
-
-char *TXT_SelectFile(const char *window_title, const char **extensions)
-{
-    char *argv[4];
-    char *result, *applescript;
-
-    applescript = GenerateAppleScript(window_title, extensions);
-    if (!applescript)
-    {
-        return NULL;
-    }
-
-    argv[0] = "/usr/bin/osascript";
-    argv[1] = "-e";
-    argv[2] = applescript;
-    argv[3] = NULL;
-
-    result = ExecReadOutput(argv);
-
-    free(applescript);
-
-    return result;
-}
-
-#else
-
-// Linux version: invoke the Zenity command line program to pop up a
-// dialog box. This avoids adding Gtk+ as a compile dependency.
+/* Linux version: invoke the Zenity command line program to pop up a
+ * dialog box. This avoids adding Gtk+ as a compile dependency.
+ */
 
 #define ZENITY_BINARY "/usr/bin/zenity"
 
-static unsigned int NumExtensions(const char **extensions)
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct txt_fileselect_s
 {
-    unsigned int result = 0;
+  txt_widget_t widget;
+  txt_inputbox_t *inputbox;
+  int size;
+  const char *prompt;
+  const char **extensions;
+};
 
-    if (extensions != NULL)
-    {
-        for (result = 0; extensions[result] != NULL; ++result);
-    }
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    return result;
-}
+static void txt_file_select_size_calc(TXT_UNCAST_ARG(fileselect));
+static void txt_file_select_drawer(TXT_UNCAST_ARG(fileselect));
+static int txt_file_select_keypress(TXT_UNCAST_ARG(fileselect), int key);
+static void txt_file_select_destructor(TXT_UNCAST_ARG(fileselect));
+static void txt_file_select_mousepress(TXT_UNCAST_ARG(fileselect), int x,
+                                       int y, int b);
+static void txt_file_select_focused(TXT_UNCAST_ARG(fileselect), int focused);
 
-static int ZenityAvailable(void)
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Dummy value to select a directory. */
+
+const char *TXT_DIRECTORY[] =
 {
-    return system(ZENITY_BINARY " --help >/dev/null 2>&1") == 0;
-}
-
-int TXT_CanSelectFiles(void)
-{
-    return ZenityAvailable();
-}
-
-//
-// ExpandExtension
-// given an extension (like wad)
-// return a pointer to a string that is a case-insensitive
-// pattern representation (like [Ww][Aa][Dd])
-//
-static char *ExpandExtension(const char *orig)
-{
-    int oldlen, newlen, i;
-    char *c, *newext = NULL;
-
-    oldlen = strlen(orig);
-    newlen = oldlen * 4; // pathological case: 'w' => '[Ww]'
-    newext = malloc(newlen+1);
-
-    if (newext == NULL)
-    {
-        return NULL;
-    }
-
-    c = newext;
-    for (i = 0; i < oldlen; ++i)
-    {
-        if (isalpha(orig[i]))
-        {
-            *c++ = '[';
-            *c++ = tolower(orig[i]);
-            *c++ = toupper(orig[i]);
-            *c++ = ']';
-        }
-        else
-        {
-            *c++ = orig[i];
-        }
-    }
-    *c = '\0';
-    return newext;
-}
-
-char *TXT_SelectFile(const char *window_title, const char **extensions)
-{
-    unsigned int i;
-    size_t len;
-    char *result;
-    char **argv;
-    int argc;
-
-    if (!ZenityAvailable())
-    {
-        return NULL;
-    }
-
-    argv = calloc(5 + NumExtensions(extensions), sizeof(char *));
-    argv[0] = strdup(ZENITY_BINARY);
-    argv[1] = strdup("--file-selection");
-    argc = 2;
-
-    if (window_title != NULL)
-    {
-        len = 10 + strlen(window_title);
-        argv[argc] = malloc(len);
-        TXT_snprintf(argv[argc], len, "--title=%s", window_title);
-        ++argc;
-    }
-
-    if (extensions == TXT_DIRECTORY)
-    {
-        argv[argc] = strdup("--directory");
-        ++argc;
-    }
-    else if (extensions != NULL)
-    {
-        for (i = 0; extensions[i] != NULL; ++i)
-        {
-            char * newext = ExpandExtension(extensions[i]);
-            if (newext)
-            {
-                len = 30 + strlen(extensions[i]) + strlen(newext);
-                argv[argc] = malloc(len);
-                TXT_snprintf(argv[argc], len, "--file-filter=.%s | *.%s",
-                             extensions[i], newext);
-                ++argc;
-                free(newext);
-            }
-        }
-
-        argv[argc] = strdup("--file-filter=*.* | *.*");
-        ++argc;
-    }
-
-    argv[argc] = NULL;
-
-    result = ExecReadOutput(argv);
-
-    for (i = 0; i < argc; ++i)
-    {
-        free(argv[i]);
-    }
-
-    free(argv);
-
-    return result;
-}
-
-#endif
-
-static void TXT_FileSelectSizeCalc(TXT_UNCAST_ARG(fileselect))
-{
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
-
-    // Calculate widget size, but override the width to always
-    // be the configured size.
-
-    TXT_CalcWidgetSize(fileselect->inputbox);
-    fileselect->widget.w = fileselect->size;
-    fileselect->widget.h = fileselect->inputbox->widget.h;
-}
-
-static void TXT_FileSelectDrawer(TXT_UNCAST_ARG(fileselect))
-{
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
-
-    // Input box widget inherits all the properties of the
-    // file selector.
-
-    fileselect->inputbox->widget.x = fileselect->widget.x + 2;
-    fileselect->inputbox->widget.y = fileselect->widget.y;
-    fileselect->inputbox->widget.w = fileselect->widget.w - 2;
-    fileselect->inputbox->widget.h = fileselect->widget.h;
-
-    // Triple bar symbol gives a distinguishing look to the file selector.
-    TXT_DrawCodePageString("\xf0 ");
-    TXT_BGColor(TXT_COLOR_BLACK, 0);
-    TXT_DrawWidget(fileselect->inputbox);
-}
-
-static void TXT_FileSelectDestructor(TXT_UNCAST_ARG(fileselect))
-{
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
-
-    TXT_DestroyWidget(fileselect->inputbox);
-}
-
-static int DoSelectFile(txt_fileselect_t *fileselect)
-{
-    char *path;
-    char **var;
-
-    if (TXT_CanSelectFiles())
-    {
-        path = TXT_SelectFile(fileselect->prompt,
-                              fileselect->extensions);
-
-        // Update inputbox variable.
-        // If cancel was pressed (ie. NULL was returned by TXT_SelectFile)
-        // then reset to empty string, not NULL).
-
-        if (path == NULL)
-        {
-            path = strdup("");
-        }
-
-        var = fileselect->inputbox->value;
-        free(*var);
-        *var = path;
-        return 1;
-    }
-
-    return 0;
-}
-
-static int TXT_FileSelectKeyPress(TXT_UNCAST_ARG(fileselect), int key)
-{
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
-
-    // When the enter key is pressed, pop up a file selection dialog,
-    // if file selectors work. Allow holding down 'alt' to override
-    // use of the native file selector, so the user can just type a path.
-
-    if (!fileselect->inputbox->editing
-     && !TXT_GetModifierState(TXT_MOD_ALT)
-     && key == KEY_ENTER)
-    {
-        if (DoSelectFile(fileselect))
-        {
-            return 1;
-        }
-    }
-
-    return TXT_WidgetKeyPress(fileselect->inputbox, key);
-}
-
-static void TXT_FileSelectMousePress(TXT_UNCAST_ARG(fileselect),
-                                     int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
-
-    if (!fileselect->inputbox->editing
-     && !TXT_GetModifierState(TXT_MOD_ALT)
-     && b == TXT_MOUSE_LEFT)
-    {
-        if (DoSelectFile(fileselect))
-        {
-            return;
-        }
-    }
-
-    TXT_WidgetMousePress(fileselect->inputbox, x, y, b);
-}
-
-static void TXT_FileSelectFocused(TXT_UNCAST_ARG(fileselect), int focused)
-{
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
-
-    TXT_SetWidgetFocus(fileselect->inputbox, focused);
-}
+  "__directory__",
+  NULL,
+};
 
 txt_widget_class_t txt_fileselect_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_FileSelectSizeCalc,
-    TXT_FileSelectDrawer,
-    TXT_FileSelectKeyPress,
-    TXT_FileSelectDestructor,
-    TXT_FileSelectMousePress,
-    NULL,
-    TXT_FileSelectFocused,
+  txt_always_selectable,
+  txt_file_select_size_calc,
+  txt_file_select_drawer,
+  txt_file_select_keypress,
+  txt_file_select_destructor,
+  txt_file_select_mousepress,
+  NULL,
+  txt_file_select_focused,
 };
 
-// If the (inner) inputbox widget is changed, emit a change to the
-// outer (fileselect) widget.
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-static void InputBoxChanged(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(fileselect))
+static char *exec_read_output(char **argv)
 {
-    TXT_CAST_ARG(txt_fileselect_t, fileselect);
+  char *result;
+  int completed;
+  int pid;
+  int status;
+  int result_len;
+  int pipefd[2];
 
-    TXT_EmitSignal(&fileselect->widget, "changed");
+  if (pipe(pipefd) != 0)
+    {
+      return NULL;
+    }
+
+  pid = fork();
+
+  if (pid == 0)
+    {
+      dup2(pipefd[1], fileno(stdout));
+      execv(argv[0], argv);
+      exit(-1);
+    }
+
+  fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
+
+  /* Read program output into 'result' string.
+   * Wait until the program has completed and (if it was successful)
+   * a full line has been read.
+   */
+
+  result = NULL;
+  result_len = 0;
+  completed = 0;
+
+  while (!completed ||
+         (status == 0 && (result == NULL || strchr(result, '\n') == NULL)))
+    {
+      char buf[64];
+      int bytes;
+
+      if (!completed && waitpid(pid, &status, WNOHANG) != 0)
+        {
+          completed = 1;
+        }
+
+      bytes = read(pipefd[0], buf, sizeof(buf));
+
+      if (bytes < 0)
+        {
+          if (errno != EAGAIN && errno != EWOULDBLOCK)
+            {
+              status = -1;
+              break;
+            }
+        }
+      else
+        {
+          char *new_result = realloc(result, result_len + bytes + 1);
+          if (new_result == NULL)
+            {
+              break;
+            }
+
+          result = new_result;
+          memcpy(result + result_len, buf, bytes);
+          result_len += bytes;
+          result[result_len] = '\0';
+        }
+
+      usleep(100 * 1000);
+      txt_sleep(1);
+      txt_update_screen();
+    }
+
+  close(pipefd[0]);
+  close(pipefd[1]);
+
+  /* Must have a success exit code. */
+
+  if (WEXITSTATUS(status) != 0)
+    {
+      free(result);
+      result = NULL;
+    }
+
+  /* Strip off newline from the end. */
+
+  if (result != NULL && result[result_len - 1] == '\n')
+    {
+      result[result_len - 1] = '\0';
+    }
+
+  return result;
 }
 
-txt_fileselect_t *TXT_NewFileSelector(char **variable, int size,
-                                      const char *prompt, const char **extensions)
+static unsigned int num_extensions(const char **extensions)
 {
-    txt_fileselect_t *fileselect;
+  unsigned int result = 0;
 
-    fileselect = malloc(sizeof(txt_fileselect_t));
-    TXT_InitWidget(fileselect, &txt_fileselect_class);
-    fileselect->inputbox = TXT_NewInputBox(variable, 1024);
-    fileselect->inputbox->widget.parent = &fileselect->widget;
-    fileselect->size = size;
-    fileselect->prompt = prompt;
-    fileselect->extensions = extensions;
+  if (extensions != NULL)
+    {
+      for (result = 0; extensions[result] != NULL; ++result)
+        ;
+    }
 
-    TXT_SignalConnect(fileselect->inputbox, "changed",
-                      InputBoxChanged, fileselect);
-
-    return fileselect;
+  return result;
 }
 
+/* ExpandExtension
+ * given an extension (like wad)
+ * return a pointer to a string that is a case-insensitive
+ * pattern representation (like [Ww][Aa][Dd])
+ */
+
+static char *expand_extension(const char *orig)
+{
+  int oldlen;
+  int newlen;
+  int i;
+  char *c;
+  char *newext = NULL;
+
+  oldlen = strlen(orig);
+  newlen = oldlen * 4; /* pathological case: 'w' => '[Ww]' */
+  newext = malloc(newlen + 1);
+
+  if (newext == NULL)
+    {
+      return NULL;
+    }
+
+  c = newext;
+
+  for (i = 0; i < oldlen; ++i)
+    {
+      if (isalpha(orig[i]))
+        {
+          *c++ = '[';
+          *c++ = tolower(orig[i]);
+          *c++ = toupper(orig[i]);
+          *c++ = ']';
+        }
+      else
+        {
+          *c++ = orig[i];
+        }
+    }
+
+  *c = '\0';
+  return newext;
+}
+
+static char *txt_select_file(const char *window_title,
+                             const char **extensions)
+{
+  return NULL;
+}
+
+static void txt_file_select_size_calc(TXT_UNCAST_ARG(fileselect))
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+  /* Calculate widget size, but override the width to always
+   * be the configured size.
+   */
+
+  txt_calc_widget_size(fileselect->inputbox);
+  fileselect->widget.w = fileselect->size;
+  fileselect->widget.h = fileselect->inputbox->widget.h;
+}
+
+static void txt_file_select_drawer(TXT_UNCAST_ARG(fileselect))
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+  /* Input box widget inherits all the properties of the
+   * file selector.
+   */
+
+  fileselect->inputbox->widget.x = fileselect->widget.x + 2;
+  fileselect->inputbox->widget.y = fileselect->widget.y;
+  fileselect->inputbox->widget.w = fileselect->widget.w - 2;
+  fileselect->inputbox->widget.h = fileselect->widget.h;
+
+  /* Triple bar symbol gives a distinguishing look to the file selector. */
+
+  txt_draw_code_page_string("\xf0 ");
+  txt_bgcolour(TXT_COLOR_BLACK, 0);
+  txt_draw_widget(fileselect->inputbox);
+}
+
+static void txt_file_select_destructor(TXT_UNCAST_ARG(fileselect))
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+  txt_destroy_widget(fileselect->inputbox);
+}
+
+static int txt_file_select_keypress(TXT_UNCAST_ARG(fileselect), int key)
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+  return txt_widget_key_press(fileselect->inputbox, key);
+}
+
+static void txt_file_select_mousepress(TXT_UNCAST_ARG(fileselect), int x,
+                                       int y, int b)
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+  txt_widget_mouse_press(fileselect->inputbox, x, y, b);
+}
+
+static void txt_file_select_focused(TXT_UNCAST_ARG(fileselect), int focused)
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+  txt_set_widget_focus(fileselect->inputbox, focused);
+}
+
+/* If the (inner) inputbox widget is changed, emit a change to the
+ * outer (fileselect) widget.
+ */
+
+static void input_box_changed(TXT_UNCAST_ARG(widget),
+                              TXT_UNCAST_ARG(fileselect))
+{
+  TXT_CAST_ARG(txt_fileselect_t, fileselect);
+
+  txt_emit_signal(&fileselect->widget, "changed");
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_fileselect_t *txt_new_file_selector(char **variable, int size,
+                                        const char *prompt,
+                                        const char **extensions)
+{
+  txt_fileselect_t *fileselect;
+
+  fileselect = malloc(sizeof(txt_fileselect_t));
+  txt_init_widget(fileselect, &txt_fileselect_class);
+  fileselect->inputbox = txt_new_input_box(variable, 1024);
+  fileselect->inputbox->widget.parent = &fileselect->widget;
+  fileselect->size = size;
+  fileselect->prompt = prompt;
+  fileselect->extensions = extensions;
+
+  txt_signal_connect(fileselect->inputbox, "changed", input_box_changed,
+                     fileselect);
+
+  return fileselect;
+}
diff --git a/games/NXDoom/textscreen/txt_fileselect.h b/games/NXDoom/textscreen/txt_fileselect.h
index fe5fac79b..a8bc7eb5c 100644
--- a/games/NXDoom/textscreen/txt_fileselect.h
+++ b/games/NXDoom/textscreen/txt_fileselect.h
@@ -1,28 +1,30 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Routines for selecting files, and the txt_fileselect_t widget.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_fileselect.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Routines for selecting files, and the txt_fileselect_t widget.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_FILESELECT_H
 #define TXT_FILESELECT_H
 
-/**
- * @file txt_fileselect.h
- *
- * File selection widget.
- */
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 /**
  * File selection widget.
@@ -33,24 +35,20 @@
 
 typedef struct txt_fileselect_s txt_fileselect_t;
 
-/**
- * Returns non-zero if a native file selector is available on this
- * platform.
- */
-
-int TXT_CanSelectFiles(void);
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 /**
- * Open a native file selector to select a file.
- *
- * @param prompt      Pointer to a string containing a prompt to display
- *                    in the window.
- * @param extensions  NULL-terminated list of filename extensions for
- *                    files that can be selected, or @ref TXT_DIRECTORY
- *                    to select directories.
+ * Special value to use for 'extensions' that selects a directory
+ * instead of a file.
  */
 
-char *TXT_SelectFile(const char *prompt, const char **extensions);
+extern const char *TXT_DIRECTORY[];
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
 /**
  * Create a new txt_fileselect_t widget.
@@ -65,15 +63,8 @@ char *TXT_SelectFile(const char *prompt, const char **extensions);
  *                    to select directories.
  */
 
-txt_fileselect_t *TXT_NewFileSelector(char **variable, int size,
-                                      const char *prompt, const char **extensions);
-
-/**
- * Special value to use for 'extensions' that selects a directory
- * instead of a file.
- */
-
-extern const char *TXT_DIRECTORY[];
-
-#endif /* #ifndef TXT_FILESELECT_H */
+txt_fileselect_t *txt_new_file_selector(char **variable, int size,
+                                        const char *prompt,
+                                        const char **extensions);
 
+#endif /* TXT_FILESELECT_H */
diff --git a/games/NXDoom/textscreen/txt_font.h b/games/NXDoom/textscreen/txt_font.h
new file mode 100644
index 000000000..9815f8378
--- /dev/null
+++ b/games/NXDoom/textscreen/txt_font.h
@@ -0,0 +1,29 @@
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_font.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ ****************************************************************************/
+
+#ifndef __TEXTSCREEN_FONT_H__
+#define __TEXTSCREEN_FONT_H__
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdint.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+typedef struct
+{
+  const char *name;
+  const uint8_t *data;
+  unsigned int w;
+  unsigned int h;
+} txt_font_t;
+
+#endif /* __TEXTSCREEN_FONT_H__ */
diff --git a/games/NXDoom/textscreen/txt_gui.c b/games/NXDoom/textscreen/txt_gui.c
index a80bd8503..9df99e62d 100644
--- a/games/NXDoom/textscreen/txt_gui.c
+++ b/games/NXDoom/textscreen/txt_gui.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_gui.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -20,461 +29,491 @@
 #include "txt_main.h"
 #include "txt_utf8.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define VALID_X(x) ((x) >= g_cliparea->x1 && (x) < g_cliparea->x2)
+#define VALID_Y(y) ((y) >= g_cliparea->y1 && (y) < g_cliparea->y2)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
 typedef struct txt_cliparea_s txt_cliparea_t;
 
 struct txt_cliparea_s
 {
-    int x1, x2;
-    int y1, y2;
-    txt_cliparea_t *next;
+  int x1;
+  int x2;
+  int y1;
+  int y2;
+  txt_cliparea_t *next;
 };
 
-// Array of border characters for drawing windows. The array looks like this:
-//
-// +-++
-// | ||
-// +-++
-// +-++
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static const int borders[4][4] = 
+/* Array of border characters for drawing windows. The array looks like this:
+ *
+ * +-++
+ * | ||
+ * +-++
+ * +-++
+ */
+
+static const int g_borders[4][4] =
 {
-    {0xda, 0xc4, 0xc2, 0xbf},
-    {0xb3, ' ',  0xb3, 0xb3},
-    {0xc3, 0xc4, 0xc5, 0xb4},
-    {0xc0, 0xc4, 0xc1, 0xd9},
+  {0xda, 0xc4, 0xc2, 0xbf},
+  {0xb3, ' ', 0xb3, 0xb3},
+  {0xc3, 0xc4, 0xc5, 0xb4},
+  {0xc0, 0xc4, 0xc1, 0xd9},
 };
 
-static txt_cliparea_t *cliparea = NULL;
+static txt_cliparea_t *g_cliparea = NULL;
 
-#define VALID_X(x) ((x) >= cliparea->x1 && (x) < cliparea->x2)
-#define VALID_Y(y) ((y) >= cliparea->y1 && (y) < cliparea->y2)
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-void TXT_DrawDesktopBackground(const char *title)
+#if 0 /* UNUSED */
+static void txt_draw_desktop_background(const char *title)
 {
-    int i;
-    unsigned char *screendata;
-    unsigned char *p;
+  int i;
+  unsigned char *screendata;
+  unsigned char *p;
 
-    screendata = TXT_GetScreenData();
-    
-    // Fill the screen with gradient characters
+  screendata = txt_get_screen_data();
 
-    p = screendata;
-    
-    for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
+  /* Fill the screen with gradient characters */
+
+  p = screendata;
+
+  for (i = 0; i < TXT_SCREEN_W * TXT_SCREEN_H; ++i)
     {
-        *p++ = 0xb1;
-        *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
+      *p++ = 0xb1;
+      *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
     }
 
-    // Draw the top and bottom banners
+  /* Draw the top and bottom banners */
 
-    p = screendata;
+  p = screendata;
 
-    for (i=0; i<TXT_SCREEN_W; ++i)
+  for (i = 0; i < TXT_SCREEN_W; ++i)
     {
-        *p++ = ' ';
-        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+      *p++ = ' ';
+      *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
     }
 
-    p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
+  p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
 
-    for (i=0; i<TXT_SCREEN_W; ++i)
+  for (i = 0; i < TXT_SCREEN_W; ++i)
     {
-        *p++ = ' ';
-        *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
+      *p++ = ' ';
+      *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
     }
 
-    // Print the title
+  /* Print the title */
 
-    TXT_GotoXY(0, 0);
-    TXT_FGColor(TXT_COLOR_BLACK);
-    TXT_BGColor(TXT_COLOR_GREY, 0);
+  txt_goto_xy(0, 0);
+  txt_fgcolour(TXT_COLOR_BLACK);
+  txt_bgcolour(TXT_COLOR_GREY, 0);
 
-    TXT_DrawString(" ");
-    TXT_DrawString(title);
+  txt_draw_string(" ");
+  txt_draw_string(title);
 }
+#endif
 
-void TXT_DrawShadow(int x, int y, int w, int h)
+static void txt_draw_shadow(int x, int y, int w, int h)
 {
-    unsigned char *screendata;
-    unsigned char *p;
-    int x1, y1;
+  unsigned char *screendata;
+  unsigned char *p;
+  int x1;
+  int y1;
 
-    screendata = TXT_GetScreenData();
+  screendata = txt_get_screen_data();
 
-    for (y1=y; y1<y+h; ++y1)
+  for (y1 = y; y1 < y + h; ++y1)
     {
-        p = screendata + (y1 * TXT_SCREEN_W + x) * 2;
+      p = screendata + (y1 * TXT_SCREEN_W + x) * 2;
 
-        for (x1=x; x1<x+w; ++x1)
+      for (x1 = x; x1 < x + w; ++x1)
         {
-            if (VALID_X(x1) && VALID_Y(y1))
+          if (VALID_X(x1) && VALID_Y(y1))
             {
-                p[1] = TXT_COLOR_DARK_GREY;
+              p[1] = TXT_COLOR_DARK_GREY;
             }
 
-            p += 2;
+          p += 2;
         }
     }
 }
 
-void TXT_DrawWindowFrame(const char *title, int x, int y, int w, int h)
+static void put_unicode_char(unsigned int c)
 {
-    txt_saved_colors_t colors;
-    int x1, y1;
-    int bx, by;
+  int d;
 
-    TXT_SaveColors(&colors);
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+  /* Treat control characters specially. */
 
-    for (y1=y; y1<y+h; ++y1)
+  if (c == '\n' || c == '\b')
     {
-        // Select the appropriate row and column in the borders
-        // array to pick the appropriate character to draw at
-        // this location.
-        //
-        // Draw a horizontal line on the third line down, so we
-        // draw a box around the title.
+      txt_putchar(c);
+      return;
+    }
 
-        by = y1 == y ? 0 :
-             y1 == y + 2 && title != NULL ? 2 :
-             y1 == y + h - 1 ? 3 : 1;
+  /* Map Unicode character into the symbol used to represent it in this
+   * code page. For unrepresentable characters, print a fallback instead.
+   * Note that we use txt_put_symbol() here because we just want to do a
+   * raw write into the screen buffer.
+   */
 
-        for (x1=x; x1<x+w; ++x1)
+  d = txt_unicode_character(c);
+
+  if (d >= 0)
+    {
+      txt_put_symbol(d);
+    }
+  else
+    {
+      txt_put_symbol('\xa8');
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void txt_draw_window_frame(const char *title, int x, int y, int w, int h)
+{
+  txt_saved_colors_t colors;
+  int x1;
+  int y1;
+  int bx;
+  int by;
+
+  txt_save_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+
+  for (y1 = y; y1 < y + h; ++y1)
+    {
+      /* Select the appropriate row and column in the borders
+       * array to pick the appropriate character to draw at
+       * this location.
+       *
+       * Draw a horizontal line on the third line down, so we
+       * draw a box around the title.
+       */
+
+      by = y1 == y                        ? 0
+           : y1 == y + 2 && title != NULL ? 2
+           : y1 == y + h - 1              ? 3
+                                          : 1;
+
+      for (x1 = x; x1 < x + w; ++x1)
         {
-            bx = x1 == x ? 0 :
-                 x1 == x + w - 1 ? 3 : 1;
-                 
-            if (VALID_X(x1) && VALID_Y(y1))
+          bx = x1 == x ? 0 : x1 == x + w - 1 ? 3 : 1;
+
+          if (VALID_X(x1) && VALID_Y(y1))
             {
-                TXT_GotoXY(x1, y1);
-                TXT_PutChar(borders[by][bx]);
+              txt_goto_xy(x1, y1);
+              txt_putchar(g_borders[by][bx]);
             }
         }
     }
 
-    // Draw the title
+  /* Draw the title */
 
-    if (title != NULL)
+  if (title != NULL)
     {
-        TXT_GotoXY(x + 1, y + 1);
-        TXT_BGColor(TXT_COLOR_GREY, 0);
-        TXT_FGColor(TXT_COLOR_BLUE);
+      txt_goto_xy(x + 1, y + 1);
+      txt_bgcolour(TXT_COLOR_GREY, 0);
+      txt_fgcolour(TXT_COLOR_BLUE);
 
-        for (x1=0; x1<w-2; ++x1)
+      for (x1 = 0; x1 < w - 2; ++x1)
         {
-            TXT_DrawString(" ");
+          txt_draw_string(" ");
         }
-    
-        TXT_GotoXY(x + (w - TXT_UTF8_Strlen(title)) / 2, y + 1);
-        TXT_DrawString(title);
+
+      txt_goto_xy(x + (w - txt_utf8_strlen(title)) / 2, y + 1);
+      txt_draw_string(title);
     }
 
-    // Draw the window's shadow.
+  /* Draw the window's shadow. */
 
-    TXT_DrawShadow(x + 2, y + h, w, 1);
-    TXT_DrawShadow(x + w, y + 1, 2, h);
+  txt_draw_shadow(x + 2, y + h, w, 1);
+  txt_draw_shadow(x + w, y + 1, 2, h);
 
-    TXT_RestoreColors(&colors);
+  txt_restore_colours(&colors);
 }
 
-void TXT_DrawSeparator(int x, int y, int w)
+void txt_draw_separator(int x, int y, int w)
 {
-    txt_saved_colors_t colors;
-    unsigned char *data;
-    int x1;
-    int b;
+  txt_saved_colors_t colors;
+  unsigned char *data;
+  int x1;
+  int b;
 
-    data = TXT_GetScreenData();
+  data = txt_get_screen_data();
 
-    TXT_SaveColors(&colors);
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+  txt_save_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
 
-    if (!VALID_Y(y))
+  if (!VALID_Y(y))
     {
-        return;
+      return;
     }
 
-    data += (y * TXT_SCREEN_W + x) * 2;
+  data += (y * TXT_SCREEN_W + x) * 2;
 
-    for (x1=x; x1<x+w; ++x1)
+  for (x1 = x; x1 < x + w; ++x1)
     {
-        TXT_GotoXY(x1, y);
+      txt_goto_xy(x1, y);
 
-        b = x1 == x ? 0 :
-            x1 == x + w - 1 ? 3 :
-            1;
+      b = x1 == x ? 0 : x1 == x + w - 1 ? 3 : 1;
 
-        if (VALID_X(x1))
+      if (VALID_X(x1))
         {
-            // Read the current value from the screen
-            // Check that it matches what the window should look like if
-            // there is no separator, then apply the separator
+          /* Read the current value from the screen
+           * Check that it matches what the window should look like if
+           * there is no separator, then apply the separator
+           */
 
-            if (*data == borders[1][b])
+          if (*data == g_borders[1][b])
             {
-                TXT_PutChar(borders[2][b]);
+              txt_putchar(g_borders[2][b]);
             }
         }
 
-        data += 2;
+      data += 2;
     }
 
-    TXT_RestoreColors(&colors);
+  txt_restore_colours(&colors);
 }
 
-// Alternative to TXT_DrawString() where the argument is a "code page
-// string" - characters are in native code page format and not UTF-8.
-void TXT_DrawCodePageString(const char *s)
+/* Alternative to txt_draw_string() where the argument is a "code page
+ * string" - characters are in native code page format and not UTF-8.
+ */
+
+void txt_draw_code_page_string(const char *s)
 {
-    int x, y;
-    int x1;
-    const char *p;
+  int x;
+  int y;
+  int x1;
+  const char *p;
 
-    TXT_GetXY(&x, &y);
+  txt_get_xy(&x, &y);
 
-    if (VALID_Y(y))
+  if (VALID_Y(y))
     {
-        x1 = x;
+      x1 = x;
 
-        for (p = s; *p != '\0'; ++p)
+      for (p = s; *p != '\0'; ++p)
         {
-            if (VALID_X(x1))
+          if (VALID_X(x1))
             {
-                TXT_GotoXY(x1, y);
-                TXT_PutChar(*p);
+              txt_goto_xy(x1, y);
+              txt_putchar(*p);
             }
 
-            x1 += 1;
+          x1 += 1;
         }
     }
 
-    TXT_GotoXY(x + strlen(s), y);
+  txt_goto_xy(x + strlen(s), y);
 }
 
-static void PutUnicodeChar(unsigned int c)
+void txt_draw_string(const char *s)
 {
-    int d;
+  int x;
+  int y;
+  int x1;
+  const char *p;
+  unsigned int c;
 
-    // Treat control characters specially.
-    if (c == '\n' || c == '\b')
+  txt_get_xy(&x, &y);
+
+  if (VALID_Y(y))
     {
-        TXT_PutChar(c);
-        return;
-    }
+      x1 = x;
 
-    // Map Unicode character into the symbol used to represent it in this
-    // code page. For unrepresentable characters, print a fallback instead.
-    // Note that we use TXT_PutSymbol() here because we just want to do a
-    // raw write into the screen buffer.
-    d = TXT_UnicodeCharacter(c);
-
-    if (d >= 0)
-    {
-        TXT_PutSymbol(d);
-    }
-    else
-    {
-        TXT_PutSymbol('\xa8');
-    }
-}
-
-void TXT_DrawString(const char *s)
-{
-    int x, y;
-    int x1;
-    const char *p;
-    unsigned int c;
-
-    TXT_GetXY(&x, &y);
-
-    if (VALID_Y(y))
-    {
-        x1 = x;
-
-        for (p = s; *p != '\0'; )
+      for (p = s; *p != '\0'; )
         {
-            c = TXT_DecodeUTF8(&p);
+          c = txt_decode_utf8(&p);
 
-            if (c == 0)
+          if (c == 0)
             {
-                break;
+              break;
             }
 
-            if (VALID_X(x1))
+          if (VALID_X(x1))
             {
-                TXT_GotoXY(x1, y);
-                PutUnicodeChar(c);
+              txt_goto_xy(x1, y);
+              put_unicode_char(c);
             }
 
-            x1 += 1;
+          x1 += 1;
         }
     }
 
-    TXT_GotoXY(x + TXT_UTF8_Strlen(s), y);
+  txt_goto_xy(x + txt_utf8_strlen(s), y);
 }
 
-void TXT_DrawHorizScrollbar(int x, int y, int w, int cursor, int range)
+void txt_draw_horiz_scrollbar(int x, int y, int w, int cursor, int range)
 {
-    txt_saved_colors_t colors;
-    int x1;
-    int cursor_x;
+  txt_saved_colors_t colors;
+  int x1;
+  int cursor_x;
 
-    if (!VALID_Y(y))
+  if (!VALID_Y(y))
     {
-        return;
+      return;
     }
 
-    TXT_SaveColors(&colors);
-    TXT_FGColor(TXT_COLOR_BLACK);
-    TXT_BGColor(TXT_COLOR_GREY, 0);
+  txt_save_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BLACK);
+  txt_bgcolour(TXT_COLOR_GREY, 0);
 
-    TXT_GotoXY(x, y);
-    TXT_PutChar('\x1b');
+  txt_goto_xy(x, y);
+  txt_putchar('\x1b');
 
-    cursor_x = x + 1;
+  cursor_x = x + 1;
 
-    if (range > 0)
+  if (range > 0)
     {
-        cursor_x += (cursor * (w - 3)) / range;
+      cursor_x += (cursor * (w - 3)) / range;
     }
 
-    if (cursor_x > x + w - 2)
+  if (cursor_x > x + w - 2)
     {
-        cursor_x = x + w - 2;
+      cursor_x = x + w - 2;
     }
 
-    for (x1=x+1; x1<x+w-1; ++x1)
+  for (x1 = x + 1; x1 < x + w - 1; ++x1)
     {
-        if (VALID_X(x1))
+      if (VALID_X(x1))
         {
-            if (x1 == cursor_x)
+          if (x1 == cursor_x)
             {
-                TXT_PutChar('\xdb');
+              txt_putchar('\xdb');
             }
-            else
+          else
             {
-                TXT_PutChar('\xb1');
+              txt_putchar('\xb1');
             }
         }
     }
 
-    TXT_PutChar('\x1a');
-    TXT_RestoreColors(&colors);
+  txt_putchar('\x1a');
+  txt_restore_colours(&colors);
 }
 
-void TXT_DrawVertScrollbar(int x, int y, int h, int cursor, int range)
+void txt_draw_vert_scrollbar(int x, int y, int h, int cursor, int range)
 {
-    txt_saved_colors_t colors;
-    int y1;
-    int cursor_y;
+  txt_saved_colors_t colors;
+  int y1;
+  int cursor_y;
 
-    if (!VALID_X(x))
+  if (!VALID_X(x))
     {
-        return;
+      return;
     }
 
-    TXT_SaveColors(&colors);
-    TXT_FGColor(TXT_COLOR_BLACK);
-    TXT_BGColor(TXT_COLOR_GREY, 0);
+  txt_save_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BLACK);
+  txt_bgcolour(TXT_COLOR_GREY, 0);
 
-    TXT_GotoXY(x, y);
-    TXT_PutChar('\x18');
+  txt_goto_xy(x, y);
+  txt_putchar('\x18');
 
-    cursor_y = y + 1;
+  cursor_y = y + 1;
 
-    if (cursor_y > y + h - 2)
+  if (cursor_y > y + h - 2)
     {
-        cursor_y = y + h - 2;
+      cursor_y = y + h - 2;
     }
 
-    if (range > 0)
+  if (range > 0)
     {
-        cursor_y += (cursor * (h - 3)) / range;
+      cursor_y += (cursor * (h - 3)) / range;
     }
 
-    for (y1=y+1; y1<y+h-1; ++y1)
+  for (y1 = y + 1; y1 < y + h - 1; ++y1)
     {
-        if (VALID_Y(y1))
+      if (VALID_Y(y1))
         {
-            TXT_GotoXY(x, y1);
+          txt_goto_xy(x, y1);
 
-            if (y1 == cursor_y)
+          if (y1 == cursor_y)
             {
-                TXT_PutChar('\xdb');
+              txt_putchar('\xdb');
             }
-            else
+          else
             {
-                TXT_PutChar('\xb1');
+              txt_putchar('\xb1');
             }
         }
     }
 
-    TXT_GotoXY(x, y + h - 1);
-    TXT_PutChar('\x19');
-    TXT_RestoreColors(&colors);
+  txt_goto_xy(x, y + h - 1);
+  txt_putchar('\x19');
+  txt_restore_colours(&colors);
 }
 
-void TXT_InitClipArea(void)
+void txt_init_clip_area(void)
 {
-    if (cliparea == NULL)
+  if (g_cliparea == NULL)
     {
-        cliparea = malloc(sizeof(txt_cliparea_t));
-        cliparea->x1 = 0;
-        cliparea->x2 = TXT_SCREEN_W;
-        cliparea->y1 = 0;
-        cliparea->y2 = TXT_SCREEN_H;
-        cliparea->next = NULL;
+      g_cliparea = malloc(sizeof(txt_cliparea_t));
+      g_cliparea->x1 = 0;
+      g_cliparea->x2 = TXT_SCREEN_W;
+      g_cliparea->y1 = 0;
+      g_cliparea->y2 = TXT_SCREEN_H;
+      g_cliparea->next = NULL;
     }
 }
 
-void TXT_PushClipArea(int x1, int x2, int y1, int y2)
+void txt_push_clip_area(int x1, int x2, int y1, int y2)
 {
-    txt_cliparea_t *newarea;
+  txt_cliparea_t *newarea;
 
-    newarea = malloc(sizeof(txt_cliparea_t));
+  newarea = malloc(sizeof(txt_cliparea_t));
 
-    // Set the new clip area to the intersection of the old
-    // area and the new one.
+  /* Set the new clip area to the intersection of the old
+   * area and the new one.
+   */
 
-    newarea->x1 = cliparea->x1;
-    newarea->x2 = cliparea->x2;
-    newarea->y1 = cliparea->y1;
-    newarea->y2 = cliparea->y2;
+  newarea->x1 = g_cliparea->x1;
+  newarea->x2 = g_cliparea->x2;
+  newarea->y1 = g_cliparea->y1;
+  newarea->y2 = g_cliparea->y2;
 
-    if (x1 > newarea->x1)
-        newarea->x1 = x1;
-    if (x2 < newarea->x2)
-        newarea->x2 = x2;
-    if (y1 > newarea->y1)
-        newarea->y1 = y1;
-    if (y2 < newarea->y2)
-        newarea->y2 = y2;
+  if (x1 > newarea->x1) newarea->x1 = x1;
+  if (x2 < newarea->x2) newarea->x2 = x2;
+  if (y1 > newarea->y1) newarea->y1 = y1;
+  if (y2 < newarea->y2) newarea->y2 = y2;
 
 #if 0
     printf("New scrollable area: %i,%i-%i,%i\n", x1, y1, x2, y2);
 #endif
 
-    // Hook into the list
+  /* Hook into the list */
 
-    newarea->next = cliparea;
-    cliparea = newarea;
+  newarea->next = g_cliparea;
+  g_cliparea = newarea;
 }
 
-void TXT_PopClipArea(void)
+void txt_pop_clip_area(void)
 {
-    txt_cliparea_t *next_cliparea;
+  txt_cliparea_t *next_cliparea;
 
-    // Never pop the last entry
+  /* Never pop the last entry */
 
-    if (cliparea->next == NULL)
-        return;
+  if (g_cliparea->next == NULL) return;
 
-    // Unlink the last entry and delete
-   
-    next_cliparea = cliparea->next;
-    free(cliparea);
-    cliparea = next_cliparea;
+  /* Unlink the last entry and delete */
+
+  next_cliparea = g_cliparea->next;
+  free(g_cliparea);
+  g_cliparea = next_cliparea;
 }
-
diff --git a/games/NXDoom/textscreen/txt_gui.h b/games/NXDoom/textscreen/txt_gui.h
index 85920922a..3dfe0f59a 100644
--- a/games/NXDoom/textscreen/txt_gui.h
+++ b/games/NXDoom/textscreen/txt_gui.h
@@ -1,40 +1,50 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Text mode emulation in SDL
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_gui.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Text mode emulation in SDL
+ *
+ ****************************************************************************/
 
 #ifndef TXT_GUI_H
 #define TXT_GUI_H
 
-#define TXT_INACTIVE_WINDOW_BACKGROUND   TXT_COLOR_BLACK
-#define TXT_ACTIVE_WINDOW_BACKGROUND     TXT_COLOR_BLUE
-#define TXT_HOVER_BACKGROUND             TXT_COLOR_CYAN
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-void TXT_DrawDesktopBackground(const char *title);
-void TXT_DrawWindowFrame(const char *title, int x, int y, int w, int h);
-void TXT_DrawSeparator(int x, int y, int w);
-void TXT_DrawCodePageString(const char *s);
-void TXT_DrawString(const char *s);
-int TXT_CanDrawCharacter(unsigned int c);
+#define TXT_INACTIVE_WINDOW_BACKGROUND TXT_COLOR_BLACK
+#define TXT_ACTIVE_WINDOW_BACKGROUND TXT_COLOR_BLUE
+#define TXT_HOVER_BACKGROUND TXT_COLOR_CYAN
 
-void TXT_DrawHorizScrollbar(int x, int y, int w, int cursor, int range);
-void TXT_DrawVertScrollbar(int x, int y, int h, int cursor, int range);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-void TXT_InitClipArea(void);
-void TXT_PushClipArea(int x1, int x2, int y1, int y2);
-void TXT_PopClipArea(void);
+void txt_draw_window_frame(const char *title, int x, int y, int w, int h);
+void txt_draw_separator(int x, int y, int w);
+void txt_draw_code_page_string(const char *s);
+void txt_draw_string(const char *s);
 
-#endif /* #ifndef TXT_GUI_H */
+void txt_draw_horiz_scrollbar(int x, int y, int w, int cursor, int range);
+void txt_draw_vert_scrollbar(int x, int y, int h, int cursor, int range);
 
+void txt_init_clip_area(void);
+void txt_push_clip_area(int x1, int x2, int y1, int y2);
+void txt_pop_clip_area(void);
+
+#endif /* TXT_GUI_H */
diff --git a/games/NXDoom/textscreen/txt_inputbox.c b/games/NXDoom/textscreen/txt_inputbox.c
index 68d4347db..17801687a 100644
--- a/games/NXDoom/textscreen/txt_inputbox.c
+++ b/games/NXDoom/textscreen/txt_inputbox.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_inputbox.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdio.h>
@@ -19,329 +28,360 @@
 
 #include "doomkeys.h"
 
-#include "txt_inputbox.h"
 #include "txt_gui.h"
+#include "txt_inputbox.h"
 #include "txt_io.h"
 #include "txt_main.h"
 #include "txt_utf8.h"
 #include "txt_window.h"
 
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void txt_input_box_size_calc(TXT_UNCAST_ARG(inputbox));
+static void txt_input_box_drawer(TXT_UNCAST_ARG(inputbox));
+static int txt_input_box_keypress(TXT_UNCAST_ARG(inputbox), int key);
+static void txt_input_box_destructor(TXT_UNCAST_ARG(inputbox));
+static void txt_input_box_mousepress(TXT_UNCAST_ARG(inputbox), int x, int y,
+                                     int b);
+static void txt_input_box_focused(TXT_UNCAST_ARG(inputbox), int focused);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 txt_widget_class_t txt_inputbox_class;
 txt_widget_class_t txt_int_inputbox_class;
 
-static void SetBufferFromValue(txt_inputbox_t *inputbox)
-{
-    if (inputbox->widget.widget_class == &txt_inputbox_class)
-    {
-        char **value = (char **) inputbox->value;
-
-        if (*value != NULL)
-        {
-            TXT_StringCopy(inputbox->buffer, *value, strnlen(*value, inputbox->buffer_len) + 1);
-        }
-        else
-        {
-            TXT_StringCopy(inputbox->buffer, "", inputbox->buffer_len);
-        }
-    }
-    else if (inputbox->widget.widget_class == &txt_int_inputbox_class)
-    {
-        int *value = (int *) inputbox->value;
-        TXT_snprintf(inputbox->buffer, inputbox->buffer_len, "%i", *value);
-    }
-}
-
-static void StartEditing(txt_inputbox_t *inputbox)
-{
-    // Integer input boxes start from an empty buffer:
-
-    if (inputbox->widget.widget_class == &txt_int_inputbox_class)
-    {
-        TXT_StringCopy(inputbox->buffer, "", inputbox->buffer_len);
-    }
-    else
-    {
-        SetBufferFromValue(inputbox);
-    }
-
-    // Switch to text input mode so we get shifted input.
-    TXT_SetInputMode(TXT_INPUT_TEXT);
-    inputbox->editing = 1;
-}
-
-static void StopEditing(txt_inputbox_t *inputbox)
-{
-    if (inputbox->editing)
-    {
-        // Switch back to normal input mode.
-        TXT_SetInputMode(TXT_INPUT_NORMAL);
-        inputbox->editing = 0;
-    }
-}
-
-static void FinishEditing(txt_inputbox_t *inputbox)
-{
-    if (!inputbox->editing)
-    {
-        return;
-    }
-
-    // Save the new value back to the variable.
-
-    if (inputbox->widget.widget_class == &txt_inputbox_class)
-    {
-        free(*((char **)inputbox->value));
-        *((char **) inputbox->value) = strdup(inputbox->buffer);
-    }
-    else if (inputbox->widget.widget_class == &txt_int_inputbox_class)
-    {
-        *((int *) inputbox->value) = atoi(inputbox->buffer);
-    }
-
-    TXT_EmitSignal(&inputbox->widget, "changed");
-
-    StopEditing(inputbox);
-}
-
-static void TXT_InputBoxSizeCalc(TXT_UNCAST_ARG(inputbox))
-{
-    TXT_CAST_ARG(txt_inputbox_t, inputbox);
-
-    // Enough space for the box + cursor
-
-    inputbox->widget.w = inputbox->size + 1;
-    inputbox->widget.h = 1;
-}
-
-static void TXT_InputBoxDrawer(TXT_UNCAST_ARG(inputbox))
-{
-    TXT_CAST_ARG(txt_inputbox_t, inputbox);
-    int focused;
-    int i;
-    int chars;
-    int w;
-
-    focused = inputbox->widget.focused;
-    w = inputbox->widget.w;
-
-    // Select the background color based on whether we are currently
-    // editing, and if not, whether the widget is focused.
-
-    if (inputbox->editing && focused)
-    {
-        TXT_BGColor(TXT_COLOR_BLACK, 0);
-    }
-    else
-    {
-        TXT_SetWidgetBG(inputbox);
-    }
-
-    if (!inputbox->editing)
-    {
-        // If not editing, use the current value from inputbox->value.
-
-        SetBufferFromValue(inputbox);
-    }
-
-    // If string size exceeds the widget's width, show only the end.
-
-    if (TXT_UTF8_Strlen(inputbox->buffer) > w - 1)
-    {
-        TXT_DrawCodePageString("\xae");
-        TXT_DrawString(
-            TXT_UTF8_SkipChars(inputbox->buffer,
-                               TXT_UTF8_Strlen(inputbox->buffer) - w + 2));
-        chars = w - 1;
-    }
-    else
-    {
-        TXT_DrawString(inputbox->buffer);
-        chars = TXT_UTF8_Strlen(inputbox->buffer);
-    }
-
-    if (chars < w && inputbox->editing && focused)
-    {
-        TXT_BGColor(TXT_COLOR_BLACK, 1);
-        TXT_DrawString("_");
-        ++chars;
-    }
-
-    for (i=chars; i < w; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_InputBoxDestructor(TXT_UNCAST_ARG(inputbox))
-{
-    TXT_CAST_ARG(txt_inputbox_t, inputbox);
-
-    StopEditing(inputbox);
-    free(inputbox->buffer);
-}
-
-static void Backspace(txt_inputbox_t *inputbox)
-{
-    unsigned int len;
-    char *p;
-
-    len = TXT_UTF8_Strlen(inputbox->buffer);
-
-    if (len > 0)
-    {
-        p = TXT_UTF8_SkipChars(inputbox->buffer, len - 1);
-        *p = '\0';
-    }
-}
-
-static void AddCharacter(txt_inputbox_t *inputbox, int key)
-{
-    char *end, *p;
-
-    if (TXT_UTF8_Strlen(inputbox->buffer) < inputbox->size)
-    {
-        // Add character to the buffer
-
-        end = inputbox->buffer + strlen(inputbox->buffer);
-        p = TXT_EncodeUTF8(end, key);
-        *p = '\0';
-    }
-}
-
-static int TXT_InputBoxKeyPress(TXT_UNCAST_ARG(inputbox), int key)
-{
-    TXT_CAST_ARG(txt_inputbox_t, inputbox);
-    unsigned int c;
-
-    if (!inputbox->editing)
-    {
-        if (key == KEY_ENTER)
-        {
-            StartEditing(inputbox);
-            return 1;
-        }
-
-        // Backspace or delete erases the contents of the box.
-
-        if ((key == KEY_DEL || key == KEY_BACKSPACE)
-         && inputbox->widget.widget_class == &txt_inputbox_class)
-        {
-            free(*((char **)inputbox->value));
-            *((char **) inputbox->value) = strdup("");
-        }
-
-        return 0;
-    }
-
-    if (key == KEY_ENTER)
-    {
-        FinishEditing(inputbox);
-    }
-
-    if (key == KEY_ESCAPE)
-    {
-        StopEditing(inputbox);
-    }
-
-    if (key == KEY_BACKSPACE)
-    {
-        Backspace(inputbox);
-    }
-
-    c = TXT_KEY_TO_UNICODE(key);
-
-    // Add character to the buffer, but only if it's a printable character
-    // that we can represent on the screen.
-    if (isprint(c)
-     || (c >= 128 && TXT_UnicodeCharacter(c) >= 0))
-    {
-        AddCharacter(inputbox, c);
-    }
-
-    return 1;
-}
-
-static void TXT_InputBoxMousePress(TXT_UNCAST_ARG(inputbox),
-                                   int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_inputbox_t, inputbox);
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        // Make mouse clicks start editing the box
-
-        if (!inputbox->editing)
-        {
-            // Send a simulated keypress to start editing
-
-            TXT_WidgetKeyPress(inputbox, KEY_ENTER);
-        }
-    }
-}
-
-static void TXT_InputBoxFocused(TXT_UNCAST_ARG(inputbox), int focused)
-{
-    TXT_CAST_ARG(txt_inputbox_t, inputbox);
-
-    // Stop editing when we lose focus.
-
-    if (inputbox->editing && !focused)
-    {
-        FinishEditing(inputbox);
-    }
-}
-
 txt_widget_class_t txt_inputbox_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_InputBoxSizeCalc,
-    TXT_InputBoxDrawer,
-    TXT_InputBoxKeyPress,
-    TXT_InputBoxDestructor,
-    TXT_InputBoxMousePress,
-    NULL,
-    TXT_InputBoxFocused,
+  txt_always_selectable,
+  txt_input_box_size_calc,
+  txt_input_box_drawer,
+  txt_input_box_keypress,
+  txt_input_box_destructor,
+  txt_input_box_mousepress,
+  NULL,
+  txt_input_box_focused,
 };
 
 txt_widget_class_t txt_int_inputbox_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_InputBoxSizeCalc,
-    TXT_InputBoxDrawer,
-    TXT_InputBoxKeyPress,
-    TXT_InputBoxDestructor,
-    TXT_InputBoxMousePress,
-    NULL,
-    TXT_InputBoxFocused,
+  txt_always_selectable,
+  txt_input_box_size_calc,
+  txt_input_box_drawer,
+  txt_input_box_keypress,
+  txt_input_box_destructor,
+  txt_input_box_mousepress,
+  NULL,
+  txt_input_box_focused,
 };
 
-static txt_inputbox_t *NewInputBox(txt_widget_class_t *widget_class,
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void set_buffer_from_value(txt_inputbox_t *inputbox)
+{
+  if (inputbox->widget.widget_class == &txt_inputbox_class)
+    {
+      char **value = (char **)inputbox->value;
+
+      if (*value != NULL)
+        {
+          txt_string_copy(inputbox->buffer, *value,
+                         strnlen(*value, inputbox->buffer_len) + 1);
+        }
+      else
+        {
+          txt_string_copy(inputbox->buffer, "", inputbox->buffer_len);
+        }
+    }
+  else if (inputbox->widget.widget_class == &txt_int_inputbox_class)
+    {
+      int *value = (int *)inputbox->value;
+      txt_snprintf(inputbox->buffer, inputbox->buffer_len, "%i", *value);
+    }
+}
+
+static void start_editing(txt_inputbox_t *inputbox)
+{
+  /* Integer input boxes start from an empty buffer: */
+
+  if (inputbox->widget.widget_class == &txt_int_inputbox_class)
+    {
+      txt_string_copy(inputbox->buffer, "", inputbox->buffer_len);
+    }
+  else
+    {
+      set_buffer_from_value(inputbox);
+    }
+
+  /* Switch to text input mode so we get shifted input. */
+
+  txt_set_input_mode(TXT_INPUT_TEXT);
+  inputbox->editing = 1;
+}
+
+static void stop_editing(txt_inputbox_t *inputbox)
+{
+  if (inputbox->editing)
+    {
+      /* Switch back to normal input mode. */
+
+      txt_set_input_mode(TXT_INPUT_NORMAL);
+      inputbox->editing = 0;
+    }
+}
+
+static void finish_editing(txt_inputbox_t *inputbox)
+{
+  if (!inputbox->editing)
+    {
+      return;
+    }
+
+  /* Save the new value back to the variable. */
+
+  if (inputbox->widget.widget_class == &txt_inputbox_class)
+    {
+      free(*((char **)inputbox->value));
+      *((char **)inputbox->value) = strdup(inputbox->buffer);
+    }
+  else if (inputbox->widget.widget_class == &txt_int_inputbox_class)
+    {
+      *((int *)inputbox->value) = atoi(inputbox->buffer);
+    }
+
+  txt_emit_signal(&inputbox->widget, "changed");
+
+  stop_editing(inputbox);
+}
+
+static void txt_input_box_size_calc(TXT_UNCAST_ARG(inputbox))
+{
+  TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+  /* Enough space for the box + cursor */
+
+  inputbox->widget.w = inputbox->size + 1;
+  inputbox->widget.h = 1;
+}
+
+static void txt_input_box_drawer(TXT_UNCAST_ARG(inputbox))
+{
+  TXT_CAST_ARG(txt_inputbox_t, inputbox);
+  int focused;
+  int i;
+  int chars;
+  int w;
+
+  focused = inputbox->widget.focused;
+  w = inputbox->widget.w;
+
+  /* Select the background color based on whether we are currently
+   * editing, and if not, whether the widget is focused.
+   */
+
+  if (inputbox->editing && focused)
+    {
+      txt_bgcolour(TXT_COLOR_BLACK, 0);
+    }
+  else
+    {
+      txt_set_widget_bg(inputbox);
+    }
+
+  if (!inputbox->editing)
+    {
+      /* If not editing, use the current value from inputbox->value. */
+
+      set_buffer_from_value(inputbox);
+    }
+
+  /* If string size exceeds the widget's width, show only the end. */
+
+  if (txt_utf8_strlen(inputbox->buffer) > w - 1)
+    {
+      txt_draw_code_page_string("\xae");
+      txt_draw_string(txt_utf8_skip_chars(
+          inputbox->buffer, txt_utf8_strlen(inputbox->buffer) - w + 2));
+      chars = w - 1;
+    }
+  else
+    {
+      txt_draw_string(inputbox->buffer);
+      chars = txt_utf8_strlen(inputbox->buffer);
+    }
+
+  if (chars < w && inputbox->editing && focused)
+    {
+      txt_bgcolour(TXT_COLOR_BLACK, 1);
+      txt_draw_string("_");
+      ++chars;
+    }
+
+  for (i = chars; i < w; ++i)
+    {
+      txt_draw_string(" ");
+    }
+}
+
+static void txt_input_box_destructor(TXT_UNCAST_ARG(inputbox))
+{
+  TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+  stop_editing(inputbox);
+  free(inputbox->buffer);
+}
+
+static void backspace(txt_inputbox_t *inputbox)
+{
+  unsigned int len;
+  char *p;
+
+  len = txt_utf8_strlen(inputbox->buffer);
+
+  if (len > 0)
+    {
+      p = txt_utf8_skip_chars(inputbox->buffer, len - 1);
+      *p = '\0';
+    }
+}
+
+static void add_character(txt_inputbox_t *inputbox, int key)
+{
+  char *end;
+  char *p;
+
+  if (txt_utf8_strlen(inputbox->buffer) < inputbox->size)
+    {
+      /* Add character to the buffer */
+
+      end = inputbox->buffer + strlen(inputbox->buffer);
+      p = txt_encode_utf8(end, key);
+      *p = '\0';
+    }
+}
+
+static int txt_input_box_keypress(TXT_UNCAST_ARG(inputbox), int key)
+{
+  TXT_CAST_ARG(txt_inputbox_t, inputbox);
+  unsigned int c;
+
+  if (!inputbox->editing)
+    {
+      if (key == KEY_ENTER)
+        {
+          start_editing(inputbox);
+          return 1;
+        }
+
+      /* Backspace or delete erases the contents of the box. */
+
+      if ((key == KEY_DEL || key == KEY_BACKSPACE) &&
+          inputbox->widget.widget_class == &txt_inputbox_class)
+        {
+          free(*((char **)inputbox->value));
+          *((char **)inputbox->value) = strdup("");
+        }
+
+      return 0;
+    }
+
+  if (key == KEY_ENTER)
+    {
+      finish_editing(inputbox);
+    }
+
+  if (key == KEY_ESCAPE)
+    {
+      stop_editing(inputbox);
+    }
+
+  if (key == KEY_BACKSPACE)
+    {
+      backspace(inputbox);
+    }
+
+  c = TXT_KEY_TO_UNICODE(key);
+
+  /* Add character to the buffer, but only if it's a printable character
+   * that we can represent on the screen.
+   */
+
+  if (isprint(c) || (c >= 128 && txt_unicode_character(c) >= 0))
+    {
+      add_character(inputbox, c);
+    }
+
+  return 1;
+}
+
+static void txt_input_box_mousepress(TXT_UNCAST_ARG(inputbox), int x, int y,
+                                     int b)
+{
+  TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+  if (b == TXT_MOUSE_LEFT)
+    {
+      /* Make mouse clicks start editing the box */
+
+      if (!inputbox->editing)
+        {
+          /* Send a simulated keypress to start editing */
+
+          txt_widget_key_press(inputbox, KEY_ENTER);
+        }
+    }
+}
+
+static void txt_input_box_focused(TXT_UNCAST_ARG(inputbox), int focused)
+{
+  TXT_CAST_ARG(txt_inputbox_t, inputbox);
+
+  /* Stop editing when we lose focus. */
+
+  if (inputbox->editing && !focused)
+    {
+      finish_editing(inputbox);
+    }
+}
+
+static txt_inputbox_t *new_input_box(txt_widget_class_t *widget_class,
                                    void *value, int size)
 {
-    txt_inputbox_t *inputbox;
+  txt_inputbox_t *inputbox;
 
-    inputbox = malloc(sizeof(txt_inputbox_t));
+  inputbox = malloc(sizeof(txt_inputbox_t));
 
-    TXT_InitWidget(inputbox, widget_class);
-    inputbox->value = value;
-    inputbox->size = size;
-    // 'size' is the maximum number of characters that can be entered,
-    // but for a UTF-8 string, each character can take up to four
-    // characters.
-    inputbox->buffer_len = size * 4 + 1;
-    inputbox->buffer = malloc(inputbox->buffer_len);
-    inputbox->editing = 0;
+  txt_init_widget(inputbox, widget_class);
+  inputbox->value = value;
+  inputbox->size = size;
 
-    return inputbox;
+  /* 'size' is the maximum number of characters that can be entered,
+   * but for a UTF-8 string, each character can take up to four
+   * characters.
+   */
+
+  inputbox->buffer_len = size * 4 + 1;
+  inputbox->buffer = malloc(inputbox->buffer_len);
+  inputbox->editing = 0;
+
+  return inputbox;
 }
 
-txt_inputbox_t *TXT_NewInputBox(char **value, int size)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_inputbox_t *txt_new_input_box(char **value, int size)
 {
-    return NewInputBox(&txt_inputbox_class, value, size);
+  return new_input_box(&txt_inputbox_class, value, size);
 }
 
-txt_inputbox_t *TXT_NewIntInputBox(int *value, int size)
+txt_inputbox_t *txt_new_int_input_box(int *value, int size)
 {
-    return NewInputBox(&txt_int_inputbox_class, value, size);
+  return new_input_box(&txt_int_inputbox_class, value, size);
 }
-
diff --git a/games/NXDoom/textscreen/txt_inputbox.h b/games/NXDoom/textscreen/txt_inputbox.h
index 7396eebd9..077df013e 100644
--- a/games/NXDoom/textscreen/txt_inputbox.h
+++ b/games/NXDoom/textscreen/txt_inputbox.h
@@ -1,28 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_inputbox.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_INPUTBOX_H
 #define TXT_INPUTBOX_H
 
-/**
- * @file txt_inputbox.h
- *
- * Input box widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Input box widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Input box widget.
  *
  * An input box is a widget that displays a value, which can be
  * selected to enter a new value.
@@ -30,20 +38,20 @@
  * Input box widgets can be of an integer or string type.
  */
 
-typedef struct txt_inputbox_s txt_inputbox_t;
-
-#include "txt_widget.h"
-
 struct txt_inputbox_s
 {
-    txt_widget_t widget;
-    char *buffer;
-    size_t buffer_len;
-    unsigned int size;
-    int editing;
-    void *value;
+  txt_widget_t widget;
+  char *buffer;
+  size_t buffer_len;
+  unsigned int size;
+  int editing;
+  void *value;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new input box widget for controlling a string value.
  *
@@ -58,7 +66,7 @@ struct txt_inputbox_s
  * @return              Pointer to the new input box widget.
  */
 
-txt_inputbox_t *TXT_NewInputBox(char **value, int size);
+txt_inputbox_t *txt_new_input_box(char **value, int size);
 
 /**
  * Create a new input box widget for controlling an integer value.
@@ -69,8 +77,6 @@ txt_inputbox_t *TXT_NewInputBox(char **value, int size);
  * @return              Pointer to the new input box widget.
  */
 
-txt_inputbox_t *TXT_NewIntInputBox(int *value, int size);
-
-#endif /* #ifndef TXT_INPUTBOX_H */
-
+txt_inputbox_t *txt_new_int_input_box(int *value, int size);
 
+#endif /* TXT_INPUTBOX_H */
diff --git a/games/NXDoom/textscreen/txt_io.c b/games/NXDoom/textscreen/txt_io.c
index 44ffa3829..f8127f17d 100644
--- a/games/NXDoom/textscreen/txt_io.c
+++ b/games/NXDoom/textscreen/txt_io.c
@@ -1,19 +1,28 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Text mode I/O functions, similar to C stdio
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_io.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Text mode I/O functions, similar to C stdio
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
@@ -21,156 +30,168 @@
 #include "txt_io.h"
 #include "txt_main.h"
 
-static int cur_x = 0, cur_y = 0;
-static txt_color_t fgcolor = TXT_COLOR_GREY;
-static txt_color_t bgcolor = TXT_COLOR_BLACK;
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-static void NewLine(unsigned char *screendata)
+static int g_cur_x = 0;
+static int g_cur_y = 0;
+static txt_color_t g_fgcolour = TXT_COLOR_GREY;
+static txt_color_t g_bgcolour = TXT_COLOR_BLACK;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#if 0 /* UNUSED */
+static void txt_clear_screen(void)
 {
-    int i;
-    unsigned char *p;
+  unsigned char *screen;
+  int i;
 
-    cur_x = 0;
-    ++cur_y;
+  screen = txt_get_screen_data();
 
-    if (cur_y >= TXT_SCREEN_H)
+  for (i = 0; i < TXT_SCREEN_W * TXT_SCREEN_H; ++i)
     {
-        // Scroll the screen up
+      screen[i * 2] = ' ';
+      screen[i * 2 + 1] = (bgcolor << 4) | fgcolor;
+    }
 
-        cur_y = TXT_SCREEN_H - 1;
+  cur_x = 0;
+  cur_y = 0;
+}
+#endif
 
-        memmove(screendata, screendata + TXT_SCREEN_W * 2,
-                TXT_SCREEN_W * 2 * (TXT_SCREEN_H -1));
+static void new_line(unsigned char *screendata)
+{
+  int i;
+  unsigned char *p;
 
-        // Clear the bottom line
+  g_cur_x = 0;
+  ++g_cur_y;
 
-        p = screendata + (TXT_SCREEN_H - 1) * 2 * TXT_SCREEN_W;
+  if (g_cur_y >= TXT_SCREEN_H)
+    {
+      /* Scroll the screen up */
 
-        for (i=0; i<TXT_SCREEN_W; ++i) 
+      g_cur_y = TXT_SCREEN_H - 1;
+
+      memmove(screendata, screendata + TXT_SCREEN_W * 2,
+              TXT_SCREEN_W * 2 * (TXT_SCREEN_H - 1));
+
+      /* Clear the bottom line */
+
+      p = screendata + (TXT_SCREEN_H - 1) * 2 * TXT_SCREEN_W;
+
+      for (i = 0; i < TXT_SCREEN_W; ++i)
         {
-            *p++ = ' ';
-            *p++ = fgcolor | (bgcolor << 4);
+          *p++ = ' ';
+          *p++ = g_fgcolour | (g_bgcolour << 4);
         }
     }
 }
 
-static void PutSymbol(unsigned char *screendata, int c)
+static void put_symbol(unsigned char *screendata, int c)
 {
-    unsigned char *p;
+  unsigned char *p;
 
-    p = screendata + cur_y * TXT_SCREEN_W * 2 +  cur_x * 2;
+  p = screendata + g_cur_y * TXT_SCREEN_W * 2 + g_cur_x * 2;
 
-    // Add a new character to the buffer
+  /* Add a new character to the buffer */
 
-    p[0] = c;
-    p[1] = fgcolor | (bgcolor << 4);
+  p[0] = c;
+  p[1] = g_fgcolour | (g_bgcolour << 4);
 
-    ++cur_x;
+  ++g_cur_x;
 
-    if (cur_x >= TXT_SCREEN_W)
+  if (g_cur_x >= TXT_SCREEN_W)
     {
-        NewLine(screendata);
+      new_line(screendata);
     }
 }
 
-// "Blind" version of TXT_PutChar() below which doesn't do any interpretation
-// of control signals. Just write a particular symbol to the screen buffer.
-void TXT_PutSymbol(int c)
+static void put_char(unsigned char *screendata, int c)
 {
-    PutSymbol(TXT_GetScreenData(), c);
-}
-
-static void PutChar(unsigned char *screendata, int c)
-{
-    switch (c)
+  switch (c)
     {
-        case '\n':
-            NewLine(screendata);
-            break;
+    case '\n':
+      new_line(screendata);
+      break;
 
-        case '\b':
-            // backspace
-            --cur_x;
-            if (cur_x < 0)
-                cur_x = 0;
-            break;
+    case '\b':
 
-        default:
-            PutSymbol(screendata, c);
-            break;
+      /* backspace */
+
+      --g_cur_x;
+      if (g_cur_x < 0) g_cur_x = 0;
+      break;
+
+    default:
+      put_symbol(screendata, c);
+      break;
     }
 }
 
-void TXT_PutChar(int c)
+/* "Blind" version of txt_putchar() below which doesn't do any interpretation
+ * of control signals. Just write a particular symbol to the screen buffer.
+ */
+
+void txt_put_symbol(int c)
 {
-    PutChar(TXT_GetScreenData(), c);
+  put_symbol(txt_get_screen_data(), c);
 }
 
-void TXT_Puts(const char *s)
+void txt_putchar(int c)
 {
-    unsigned char *screen;
-    const char *p;
+  put_char(txt_get_screen_data(), c);
+}
 
-    screen = TXT_GetScreenData();
+void txt_puts(const char *s)
+{
+  unsigned char *screen;
+  const char *p;
 
-    for (p=s; *p != '\0'; ++p)
+  screen = txt_get_screen_data();
+
+  for (p = s; *p != '\0'; ++p)
     {
-        PutChar(screen, *p);
+      put_char(screen, *p);
     }
 
-    PutChar(screen, '\n');
+  put_char(screen, '\n');
 }
 
-void TXT_GotoXY(int x, int y)
+void txt_goto_xy(int x, int y)
 {
-    cur_x = x;
-    cur_y = y;
+  g_cur_x = x;
+  g_cur_y = y;
 }
 
-void TXT_GetXY(int *x, int *y)
+void txt_get_xy(int *x, int *y)
 {
-    *x = cur_x;
-    *y = cur_y;
+  *x = g_cur_x;
+  *y = g_cur_y;
 }
 
-void TXT_FGColor(txt_color_t color)
+void txt_fgcolour(txt_color_t color)
 {
-    fgcolor = color;
+  g_fgcolour = color;
 }
 
-void TXT_BGColor(int color, int blinking)
+void txt_bgcolour(int color, int blinking)
 {
-    bgcolor = color;
-    if (blinking)
-        bgcolor |= TXT_COLOR_BLINKING;
+  g_bgcolour = color;
+  if (blinking) g_bgcolour |= TXT_COLOR_BLINKING;
 }
 
-void TXT_SaveColors(txt_saved_colors_t *save)
+void txt_save_colours(txt_saved_colors_t *save)
 {
-    save->bgcolor = bgcolor;
-    save->fgcolor = fgcolor;
+  save->bgcolor = g_bgcolour;
+  save->fgcolor = g_fgcolour;
 }
 
-void TXT_RestoreColors(txt_saved_colors_t *save)
+void txt_restore_colours(txt_saved_colors_t *save)
 {
-    bgcolor = save->bgcolor;
-    fgcolor = save->fgcolor;
+  g_bgcolour = save->bgcolor;
+  g_fgcolour = save->fgcolor;
 }
-
-void TXT_ClearScreen(void)
-{
-    unsigned char *screen;
-    int i;
-
-    screen = TXT_GetScreenData();
-
-    for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
-    {
-        screen[i * 2] = ' ';
-        screen[i * 2 +  1] = (bgcolor << 4) | fgcolor;
-    }
-
-    cur_x = 0;
-    cur_y = 0;
-}
-
diff --git a/games/NXDoom/textscreen/txt_io.h b/games/NXDoom/textscreen/txt_io.h
index 54a5e0e60..7d91b885b 100644
--- a/games/NXDoom/textscreen/txt_io.h
+++ b/games/NXDoom/textscreen/txt_io.h
@@ -1,41 +1,55 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Text mode emulation in SDL
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_io.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Text mode emulation in SDL
+ *
+ ****************************************************************************/
 
 #ifndef TXT_IO_H
 #define TXT_IO_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include "txt_main.h"
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef struct
 {
-    int bgcolor;
-    int fgcolor;
+  int bgcolor;
+  int fgcolor;
 } txt_saved_colors_t;
 
-void TXT_PutSymbol(int c);
-void TXT_PutChar(int c);
-void TXT_Puts(const char *s);
-void TXT_GotoXY(int x, int y);
-void TXT_GetXY(int *x, int *y);
-void TXT_FGColor(txt_color_t color);
-void TXT_BGColor(int color, int blinking);
-void TXT_SaveColors(txt_saved_colors_t *save);
-void TXT_RestoreColors(txt_saved_colors_t *save);
-void TXT_ClearScreen(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef TXT_IO_H */
+void txt_put_symbol(int c);
+void txt_putchar(int c);
+void txt_puts(const char *s);
+void txt_goto_xy(int x, int y);
+void txt_get_xy(int *x, int *y);
+void txt_fgcolour(txt_color_t color);
+void txt_bgcolour(int color, int blinking);
+void txt_save_colours(txt_saved_colors_t *save);
+void txt_restore_colours(txt_saved_colors_t *save);
 
+#endif /* TXT_IO_H */
diff --git a/games/NXDoom/textscreen/txt_label.c b/games/NXDoom/textscreen/txt_label.c
index 07834f460..c943b1b50 100644
--- a/games/NXDoom/textscreen/txt_label.c
+++ b/games/NXDoom/textscreen/txt_label.c
@@ -1,200 +1,234 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_label.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "txt_label.h"
 #include "txt_gui.h"
 #include "txt_io.h"
+#include "txt_label.h"
 #include "txt_main.h"
 #include "txt_utf8.h"
 #include "txt_window.h"
 
-static void TXT_LabelSizeCalc(TXT_UNCAST_ARG(label))
-{
-    TXT_CAST_ARG(txt_label_t, label);
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    label->widget.w = label->w;
-    label->widget.h = label->h;
-}
+static void txt_label_size_calc(TXT_UNCAST_ARG(label));
+static void txt_label_drawer(TXT_UNCAST_ARG(label));
+static void txt_label_destructor(TXT_UNCAST_ARG(label));
 
-static void TXT_LabelDrawer(TXT_UNCAST_ARG(label))
-{
-    TXT_CAST_ARG(txt_label_t, label);
-    unsigned int x, y;
-    int origin_x, origin_y;
-    unsigned int align_indent = 0;
-    unsigned int w, sw;
-
-    w = label->widget.w;
-
-    if (label->bgcolor >= 0)
-    {
-        TXT_BGColor(label->bgcolor, 0);
-    }
-    if (label->fgcolor >= 0)
-    {
-        TXT_FGColor(label->fgcolor);
-    }
-
-    TXT_GetXY(&origin_x, &origin_y);
-
-    for (y=0; y<label->h; ++y)
-    {
-        // Calculate the amount to indent this line due to the align
-        // setting
-        sw = TXT_UTF8_Strlen(label->lines[y]);
-        switch (label->widget.align)
-        {
-            case TXT_HORIZ_LEFT:
-                align_indent = 0;
-                break;
-            case TXT_HORIZ_CENTER:
-                align_indent = (label->w - sw) / 2;
-                break;
-            case TXT_HORIZ_RIGHT:
-                align_indent = label->w - sw;
-                break;
-        }
-
-        // Draw this line
-
-        TXT_GotoXY(origin_x, origin_y + y);
-
-        // Gap at the start
-
-        for (x=0; x<align_indent; ++x)
-        {
-            TXT_DrawString(" ");
-        }
-
-        // The string itself
-
-        TXT_DrawString(label->lines[y]);
-        x += sw;
-
-        // Gap at the end
-
-        for (; x<w; ++x)
-        {
-            TXT_DrawString(" ");
-        }
-    }
-}
-
-static void TXT_LabelDestructor(TXT_UNCAST_ARG(label))
-{
-    TXT_CAST_ARG(txt_label_t, label);
-
-    free(label->label);
-    free(label->lines);
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_label_class =
 {
-    TXT_NeverSelectable,
-    TXT_LabelSizeCalc,
-    TXT_LabelDrawer,
-    NULL,
-    TXT_LabelDestructor,
-    NULL,
-    NULL,
+  txt_never_selectable,
+  txt_label_size_calc,
+  txt_label_drawer,
+  NULL,
+  txt_label_destructor,
+  NULL,
+  NULL,
 };
 
-void TXT_SetLabel(txt_label_t *label, const char *value)
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void txt_label_size_calc(TXT_UNCAST_ARG(label))
 {
-    char *p;
-    unsigned int y;
+  TXT_CAST_ARG(txt_label_t, label);
 
-    // Free back the old label
+  label->widget.w = label->w;
+  label->widget.h = label->h;
+}
 
-    free(label->label);
-    free(label->lines);
+static void txt_label_drawer(TXT_UNCAST_ARG(label))
+{
+  TXT_CAST_ARG(txt_label_t, label);
+  unsigned int x;
+  unsigned int y;
+  int origin_x;
+  int origin_y;
+  unsigned int align_indent = 0;
+  unsigned int w;
+  unsigned int sw;
 
-    // Set the new value
+  w = label->widget.w;
 
-    label->label = strdup(value);
-
-    // Work out how many lines in this label
-
-    label->h = 1;
-
-    for (p = label->label; *p != '\0'; ++p)
+  if (label->bgcolor >= 0)
     {
-        if (*p == '\n')
+      txt_bgcolour(label->bgcolor, 0);
+    }
+  if (label->fgcolor >= 0)
+    {
+      txt_fgcolour(label->fgcolor);
+    }
+
+  txt_get_xy(&origin_x, &origin_y);
+
+  for (y = 0; y < label->h; ++y)
+    {
+      /* Calculate the amount to indent this line due to the align
+       * setting
+       */
+
+      sw = txt_utf8_strlen(label->lines[y]);
+      switch (label->widget.align)
         {
-            ++label->h;
+        case TXT_HORIZ_LEFT:
+          align_indent = 0;
+          break;
+        case TXT_HORIZ_CENTER:
+          align_indent = (label->w - sw) / 2;
+          break;
+        case TXT_HORIZ_RIGHT:
+          align_indent = label->w - sw;
+          break;
+        }
+
+      /* Draw this line */
+
+      txt_goto_xy(origin_x, origin_y + y);
+
+      /* Gap at the start */
+
+      for (x = 0; x < align_indent; ++x)
+        {
+          txt_draw_string(" ");
+        }
+
+      /* The string itself */
+
+      txt_draw_string(label->lines[y]);
+      x += sw;
+
+      /* Gap at the end */
+
+      for (; x < w; ++x)
+        {
+          txt_draw_string(" ");
+        }
+    }
+}
+
+static void txt_label_destructor(TXT_UNCAST_ARG(label))
+{
+  TXT_CAST_ARG(txt_label_t, label);
+
+  free(label->label);
+  free(label->lines);
+}
+
+#if 0 /* UNUSED */
+static void txt_set_bg_colour(txt_label_t *label, txt_color_t color)
+{
+  label->bgcolor = color;
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void txt_set_label(txt_label_t *label, const char *value)
+{
+  char *p;
+  unsigned int y;
+
+  /* Free back the old label */
+
+  free(label->label);
+  free(label->lines);
+
+  /* Set the new value */
+
+  label->label = strdup(value);
+
+  /* Work out how many lines in this label */
+
+  label->h = 1;
+
+  for (p = label->label; *p != '\0'; ++p)
+    {
+      if (*p == '\n')
+        {
+          ++label->h;
         }
     }
 
-    // Split into lines
+  /* Split into lines */
 
-    label->lines = malloc(sizeof(char *) * label->h);
-    label->lines[0] = label->label;
-    y = 1;
+  label->lines = malloc(sizeof(char *) * label->h);
+  label->lines[0] = label->label;
+  y = 1;
 
-    for (p = label->label; *p != '\0'; ++p)
+  for (p = label->label; *p != '\0'; ++p)
     {
-        if (*p == '\n')
+      if (*p == '\n')
         {
-            label->lines[y] = p + 1;
-            *p = '\0';
-            ++y;
+          label->lines[y] = p + 1;
+          *p = '\0';
+          ++y;
         }
     }
 
-    label->w = 0;
+  label->w = 0;
 
-    for (y=0; y<label->h; ++y)
+  for (y = 0; y < label->h; ++y)
     {
-        unsigned int line_len;
+      unsigned int line_len;
 
-        line_len = TXT_UTF8_Strlen(label->lines[y]);
+      line_len = txt_utf8_strlen(label->lines[y]);
 
-        if (line_len > label->w)
-            label->w = line_len;
+      if (line_len > label->w) label->w = line_len;
     }
 }
 
-txt_label_t *TXT_NewLabel(const char *text)
+txt_label_t *txt_new_label(const char *text)
 {
-    txt_label_t *label;
+  txt_label_t *label;
 
-    label = malloc(sizeof(txt_label_t));
+  label = malloc(sizeof(txt_label_t));
 
-    TXT_InitWidget(label, &txt_label_class);
-    label->label = NULL;
-    label->lines = NULL;
+  txt_init_widget(label, &txt_label_class);
+  label->label = NULL;
+  label->lines = NULL;
 
-    // Default colors
+  /* Default colors */
 
-    label->bgcolor = -1;
-    label->fgcolor = -1;
+  label->bgcolor = -1;
+  label->fgcolor = -1;
 
-    TXT_SetLabel(label, text);
+  txt_set_label(label, text);
 
-    return label;
+  return label;
 }
 
-void TXT_SetFGColor(txt_label_t *label, txt_color_t color)
+void txt_set_fg_colour(txt_label_t *label, txt_color_t color)
 {
-    label->fgcolor = color;
+  label->fgcolor = color;
 }
-
-void TXT_SetBGColor(txt_label_t *label, txt_color_t color)
-{
-    label->bgcolor = color;
-}
-
diff --git a/games/NXDoom/textscreen/txt_label.h b/games/NXDoom/textscreen/txt_label.h
index 8700c326b..f7f1b1033 100644
--- a/games/NXDoom/textscreen/txt_label.h
+++ b/games/NXDoom/textscreen/txt_label.h
@@ -1,25 +1,35 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_label.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_LABEL_H
 #define TXT_LABEL_H
 
-/**
- * @file txt_label.h
- *
- * Text label widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "txt_main.h"
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
 /**
  * Label widget.
@@ -29,19 +39,21 @@
 
 typedef struct txt_label_s txt_label_t;
 
-#include "txt_main.h"
-#include "txt_widget.h"
-
 struct txt_label_s
 {
-    txt_widget_t widget;
-    char *label;
-    char **lines;
-    unsigned int w, h;
-    int fgcolor;
-    int bgcolor;
+  txt_widget_t widget;
+  char *label;
+  char **lines;
+  unsigned int w;
+  unsigned int h;
+  int fgcolor;
+  int bgcolor;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new label widget.
  *
@@ -49,7 +61,7 @@ struct txt_label_s
  * @return              Pointer to the new label widget.
  */
 
-txt_label_t *TXT_NewLabel(const char *label);
+txt_label_t *txt_new_label(const char *label);
 
 /**
  * Set the string displayed in a label widget.
@@ -58,16 +70,7 @@ txt_label_t *TXT_NewLabel(const char *label);
  * @param value         The string to display (UTF-8 format).
  */
 
-void TXT_SetLabel(txt_label_t *label, const char *value);
-
-/**
- * Set the background color of a label widget.
- *
- * @param label         The widget.
- * @param color         The background color to use.
- */
-
-void TXT_SetBGColor(txt_label_t *label, txt_color_t color);
+void txt_set_label(txt_label_t *label, const char *value);
 
 /**
  * Set the foreground color of a label widget.
@@ -76,8 +79,6 @@ void TXT_SetBGColor(txt_label_t *label, txt_color_t color);
  * @param color         The foreground color to use.
  */
 
-void TXT_SetFGColor(txt_label_t *label, txt_color_t color);
-
-#endif /* #ifndef TXT_LABEL_H */
-
+void txt_set_fg_colour(txt_label_t *label, txt_color_t color);
 
+#endif /* TXT_LABEL_H */
diff --git a/games/NXDoom/textscreen/txt_main.h b/games/NXDoom/textscreen/txt_main.h
index 183cc9a92..34a92bde8 100644
--- a/games/NXDoom/textscreen/txt_main.h
+++ b/games/NXDoom/textscreen/txt_main.h
@@ -1,203 +1,255 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Base interface that abstracts the text mode screen.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_main.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Base interface that abstracts the text mode screen.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_MAIN_H
 #define TXT_MAIN_H
 
-// For the moment, txt_sdl.c is the only implementation of the base 
-// text mode screen API:
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
+
+/* For the moment, txt_sdl.c is the only implementation of the base
+ * text mode screen API:
+ */
 
 #include "txt_sdl.h"
 
-// textscreen key values:
-// Key values are difficult because we have to support multiple conflicting
-// address spaces.
-// First, Doom's key constants use 0-127 as ASCII and extra values from
-// 128-255 to represent special keys. Second, mouse buttons are represented
-// as buttons. Finally, we want to be able to support Unicode.
-//
-// So we define different ranges:
-// 0-255:    Doom key constants, including ASCII.
-// 256-511:  Mouse buttons and other reserved.
-// >=512:    Unicode values greater than 127 are offset up into this range.
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-// Special keypress values that correspond to mouse button clicks
+/* textscreen key values:
+ * Key values are difficult because we have to support multiple conflicting
+ * address spaces.
+ * First, Doom's key constants use 0-127 as ASCII and extra values from
+ * 128-255 to represent special keys. Second, mouse buttons are represented
+ * as buttons. Finally, we want to be able to support Unicode.
+ *
+ * So we define different ranges:
+ * 0-255:    Doom key constants, including ASCII.
+ * 256-511:  Mouse buttons and other reserved.
+ * >=512:    Unicode values greater than 127 are offset up into this range.
 
-#define TXT_MOUSE_BASE         256
-#define TXT_MOUSE_LEFT         (TXT_MOUSE_BASE + 0)
-#define TXT_MOUSE_RIGHT        (TXT_MOUSE_BASE + 1)
-#define TXT_MOUSE_MIDDLE       (TXT_MOUSE_BASE + 2)
-#define TXT_MOUSE_SCROLLUP     (TXT_MOUSE_BASE + 3)
-#define TXT_MOUSE_SCROLLDOWN   (TXT_MOUSE_BASE + 4)
-#define TXT_MOUSE_X1           (TXT_MOUSE_BASE + 5)
-#define TXT_MOUSE_X2           (TXT_MOUSE_BASE + 6)
-#define TXT_MAX_MOUSE_BUTTONS  16
+ * Special keypress values that correspond to mouse button clicks
+ */
 
-#define TXT_KEY_TO_MOUSE_BUTTON(x)                                        \
-        ( (x) >= TXT_MOUSE_BASE                                           \
-       && (x) < TXT_MOUSE_BASE + TXT_MAX_MOUSE_BUTTONS ?                  \
-          (x) - TXT_MOUSE_BASE : -1 )
+#define TXT_MOUSE_BASE 256
+#define TXT_MOUSE_LEFT (TXT_MOUSE_BASE + 0)
+#define TXT_MOUSE_RIGHT (TXT_MOUSE_BASE + 1)
+#define TXT_MOUSE_MIDDLE (TXT_MOUSE_BASE + 2)
+#define TXT_MOUSE_SCROLLUP (TXT_MOUSE_BASE + 3)
+#define TXT_MOUSE_SCROLLDOWN (TXT_MOUSE_BASE + 4)
+#define TXT_MOUSE_X1 (TXT_MOUSE_BASE + 5)
+#define TXT_MOUSE_X2 (TXT_MOUSE_BASE + 6)
+#define TXT_MAX_MOUSE_BUTTONS 16
 
-// Unicode offset. Unicode values from 128 onwards are offset up into
-// this range, so TXT_UNICODE_BASE = Unicode character #128, and so on.
+#define TXT_KEY_TO_MOUSE_BUTTON(x)                                           \
+  ((x) >= TXT_MOUSE_BASE && (x) < TXT_MOUSE_BASE + TXT_MAX_MOUSE_BUTTONS     \
+       ? (x) - TXT_MOUSE_BASE                                                \
+       : -1)
 
-#define TXT_UNICODE_BASE       512
+/* Unicode offset. Unicode values from 128 onwards are offset up into
+ * this range, so TXT_UNICODE_BASE = Unicode character #128, and so on.
+ */
 
-// Convert a key value to a Unicode character:
+#define TXT_UNICODE_BASE 512
 
-#define TXT_KEY_TO_UNICODE(x)                                             \
-        ( (x) < 128 ? (x) :                                               \
-          (x) >= TXT_UNICODE_BASE ? ((x) - TXT_UNICODE_BASE + 128) : 0 )
+/* Convert a key value to a Unicode character: */
 
-// Convert a Unicode character to a key value:
+#define TXT_KEY_TO_UNICODE(x)                                                \
+  ((x) < 128                 ? (x)                                           \
+   : (x) >= TXT_UNICODE_BASE ? ((x) - TXT_UNICODE_BASE + 128)                \
+                             : 0)
 
-#define TXT_UNICODE_TO_KEY(u)                                            \
-        ( (u) < 128 ? (u) : ((u) - 128 + TXT_UNICODE_BASE) )
+/* Convert a Unicode character to a key value: */
 
-// Screen size
+#define TXT_UNICODE_TO_KEY(u)                                                \
+  ((u) < 128 ? (u) : ((u) - 128 + TXT_UNICODE_BASE))
+
+/* Screen size */
 
 #define TXT_SCREEN_W 80
 #define TXT_SCREEN_H 25
 
 #define TXT_COLOR_BLINKING (1 << 3)
 
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 typedef enum
 {
-    TXT_COLOR_BLACK,
-    TXT_COLOR_BLUE,
-    TXT_COLOR_GREEN,
-    TXT_COLOR_CYAN,
-    TXT_COLOR_RED,
-    TXT_COLOR_MAGENTA,
-    TXT_COLOR_BROWN,
-    TXT_COLOR_GREY,
-    TXT_COLOR_DARK_GREY,
-    TXT_COLOR_BRIGHT_BLUE,
-    TXT_COLOR_BRIGHT_GREEN,
-    TXT_COLOR_BRIGHT_CYAN,
-    TXT_COLOR_BRIGHT_RED,
-    TXT_COLOR_BRIGHT_MAGENTA,
-    TXT_COLOR_YELLOW,
-    TXT_COLOR_BRIGHT_WHITE,
+  TXT_COLOR_BLACK,
+  TXT_COLOR_BLUE,
+  TXT_COLOR_GREEN,
+  TXT_COLOR_CYAN,
+  TXT_COLOR_RED,
+  TXT_COLOR_MAGENTA,
+  TXT_COLOR_BROWN,
+  TXT_COLOR_GREY,
+  TXT_COLOR_DARK_GREY,
+  TXT_COLOR_BRIGHT_BLUE,
+  TXT_COLOR_BRIGHT_GREEN,
+  TXT_COLOR_BRIGHT_CYAN,
+  TXT_COLOR_BRIGHT_RED,
+  TXT_COLOR_BRIGHT_MAGENTA,
+  TXT_COLOR_YELLOW,
+  TXT_COLOR_BRIGHT_WHITE,
 } txt_color_t;
 
-// Modifier keys.
+/* Modifier keys. */
 
 typedef enum
 {
-    TXT_MOD_SHIFT,
-    TXT_MOD_CTRL,
-    TXT_MOD_ALT,
-    TXT_NUM_MODIFIERS
+  TXT_MOD_SHIFT,
+  TXT_MOD_CTRL,
+  TXT_MOD_ALT,
+  TXT_NUM_MODIFIERS
 } txt_modifier_t;
 
-// Due to the way the SDL API works, we provide different ways of configuring
-// how we read input events, each of which is useful in different scenarios.
+/* Due to the way the SDL API works, we provide different ways of configuring
+ * how we read input events, each of which is useful in different scenarios.
+ */
+
 typedef enum
 {
-    // "Localized" output that takes software keyboard layout into account,
-    // but key shifting has no effect.
-    TXT_INPUT_NORMAL,
+  /* "Localized" output that takes software keyboard layout into account,
+   * but key shifting has no effect.
+   */
 
-    // "Raw" input; the keys correspond to physical keyboard layout and
-    // software keyboard layout has no effect.
-    TXT_INPUT_RAW,
+  TXT_INPUT_NORMAL,
 
-    // Used for full text input. Events are fully shifted and localized.
-    // However, not all keyboard keys will generate input.
-    // Setting this mode may activate the on-screen keyboard, depending on
-    // device and OS.
-    TXT_INPUT_TEXT,
+  /* "Raw" input; the keys correspond to physical keyboard layout and
+   * software keyboard layout has no effect.
+   */
+
+  TXT_INPUT_RAW,
+
+  /* Used for full text input. Events are fully shifted and localized.
+   * However, not all keyboard keys will generate input.
+   * Setting this mode may activate the on-screen keyboard, depending on
+   * device and OS.
+   */
+
+  TXT_INPUT_TEXT,
 } txt_input_mode_t;
 
-
 #ifdef __GNUC__
 
 #define PRINTF_ATTR(fmt, first) __attribute__((format(printf, fmt, first)))
 
-#else  // __GNUC__
+#else /* __GNUC__ */
 
 #define PRINTF_ATTR(fmt, first)
 
-#endif  // __GNUC__
+#endif /* __GNUC__ */
 
-// Initialize the screen
-// Returns 1 if successful, 0 if failed.
-int TXT_Init(void);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Shut down text mode emulation
-void TXT_Shutdown(void);
+/* Initialize the screen
+ * Returns 1 if successful, 0 if failed.
+ */
 
-// Get a pointer to the buffer containing the raw screen data.
-unsigned char *TXT_GetScreenData(void);
+int txt_init(void);
 
-// Update an area of the screen
-void TXT_UpdateScreenArea(int x, int y, int w, int h);
+/* Shut down text mode emulation */
 
-// Update the whole screen
-void TXT_UpdateScreen(void);
+void txt_shutdown(void);
 
-// Set the RGB value for a particular entry in the color palette:
-void TXT_SetColor(txt_color_t color, int r, int g, int b);
+/* Get a pointer to the buffer containing the raw screen data. */
 
-// Read a character from the keyboard
-int TXT_GetChar(void);
+unsigned char *txt_get_screen_data(void);
 
-// Given a Unicode character, get a character that can be used to represent
-// it on the code page being displayed on the screen. If the character cannot
-// be represented, this returns -1.
-int TXT_UnicodeCharacter(unsigned int c);
+/* Update an area of the screen */
 
-// Read the current state of modifier keys that are held down.
-int TXT_GetModifierState(txt_modifier_t mod);
+void txt_update_screen_area(int x, int y, int w, int h);
 
-// Provides a short description of a key code, placing into the provided
-// buffer. Note that the key is assumed to represent a physical key on the
-// keyboard (like that returned by TXT_INPUT_RAW), and the resulting string
-// takes keyboard layout into consideration. For example,
-// TXT_GetKeyDescription('q') on a French keyboard returns "A".
-// The contents of the filled buffer will be in UTF-8 format, but will never
-// contain characters which can't be shown on the screen.
-void TXT_GetKeyDescription(int key, char *buf, size_t buf_len);
+/* Update the whole screen */
 
-// Retrieve the current position of the mouse
-void TXT_GetMousePosition(int *x, int *y);
+void txt_update_screen(void);
 
-// Sleep until an event is received or the screen needs updating
-// Optional timeout in ms (timeout == 0 : sleep forever)
-void TXT_Sleep(int timeout);
+/* Set the RGB value for a particular entry in the color palette: */
 
-// Change mode for text input.
-void TXT_SetInputMode(txt_input_mode_t mode);
+void txt_set_colour(txt_color_t color, int r, int g, int b);
 
-// Set the window title of the window containing the text mode screen
-void TXT_SetWindowTitle(const char *title);
+/* Read a character from the keyboard */
 
-// Safe string copy.
-void TXT_StringCopy(char *dest, const char *src, size_t dest_len);
+int txt_getchar(void);
 
-// Safe string concatenate.
-void TXT_StringConcat(char *dest, const char *src, size_t dest_len);
+/* Given a Unicode character, get a character that can be used to represent
+ * it on the code page being displayed on the screen. If the character cannot
+ * be represented, this returns -1.
+ */
 
-// Safe version of vsnprintf().
-int TXT_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args);
+int txt_unicode_character(unsigned int c);
 
-// Safe version of snprintf().
-int TXT_snprintf(char *buf, size_t buf_len, const char *s, ...) PRINTF_ATTR(3, 4);
+/* Read the current state of modifier keys that are held down. */
 
-#endif /* #ifndef TXT_MAIN_H */
+int txt_get_modifier_state(txt_modifier_t mod);
 
+/* Provides a short description of a key code, placing into the provided
+ * buffer. Note that the key is assumed to represent a physical key on the
+ * keyboard (like that returned by TXT_INPUT_RAW), and the resulting string
+ * takes keyboard layout into consideration. For example,
+ * txt_get_key_description('q') on a French keyboard returns "A".
+ * The contents of the filled buffer will be in UTF-8 format, but will never
+ * contain characters which can't be shown on the screen.
+ */
+
+void txt_get_key_description(int key, char *buf, size_t buf_len);
+
+/* Retrieve the current position of the mouse */
+
+void txt_get_mouse_position(int *x, int *y);
+
+/* Sleep until an event is received or the screen needs updating
+ * Optional timeout in ms (timeout == 0 : sleep forever)
+ */
+
+void txt_sleep(int timeout);
+
+/* Change mode for text input. */
+
+void txt_set_input_mode(txt_input_mode_t mode);
+
+/* Set the window title of the window containing the text mode screen */
+
+void txt_set_window_title(const char *title);
+
+/* Safe string copy. */
+
+void txt_string_copy(char *dest, const char *src, size_t dest_len);
+
+/* Safe version of vsnprintf(). */
+
+int txt_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args);
+
+/* Safe version of snprintf(). */
+
+int txt_snprintf(char *buf, size_t buf_len, const char *s, ...)
+    PRINTF_ATTR(3, 4);
+
+#endif /* TXT_MAIN_H */
diff --git a/games/NXDoom/textscreen/txt_radiobutton.c b/games/NXDoom/textscreen/txt_radiobutton.c
index 1319bd69c..b13c617c9 100644
--- a/games/NXDoom/textscreen/txt_radiobutton.c
+++ b/games/NXDoom/textscreen/txt_radiobutton.c
@@ -1,143 +1,179 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_radiobutton.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "doomkeys.h"
 
-#include "txt_radiobutton.h"
 #include "txt_gui.h"
 #include "txt_io.h"
 #include "txt_main.h"
+#include "txt_radiobutton.h"
 #include "txt_utf8.h"
 #include "txt_window.h"
 
-static void TXT_RadioButtonSizeCalc(TXT_UNCAST_ARG(radiobutton))
-{
-    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-    // Minimum width is the string length + right-side spaces for padding
+static void txt_radio_button_size_calc(TXT_UNCAST_ARG(radiobutton));
+static void txt_radio_button_drawer(TXT_UNCAST_ARG(radiobutton));
+static void txt_radio_button_destructor(TXT_UNCAST_ARG(radiobutton));
+static int txt_radio_button_keypress(TXT_UNCAST_ARG(radiobutton), int key);
+static void txt_radio_button_mousepress(TXT_UNCAST_ARG(radiobutton), int x,
+                                        int y, int b);
 
-    radiobutton->widget.w = TXT_UTF8_Strlen(radiobutton->label) + 5;
-    radiobutton->widget.h = 1;
-}
-
-static void TXT_RadioButtonDrawer(TXT_UNCAST_ARG(radiobutton))
-{
-    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
-    txt_saved_colors_t colors;
-    int i;
-    int w;
-
-    w = radiobutton->widget.w;
-
-    TXT_SaveColors(&colors);
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-    TXT_DrawString("(");
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-
-    if (*radiobutton->variable == radiobutton->value)
-    {
-        TXT_DrawCodePageString("\x07");
-    }
-    else
-    {
-        TXT_DrawString(" ");
-    }
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-
-    TXT_DrawString(") ");
-
-    TXT_RestoreColors(&colors);
-    TXT_SetWidgetBG(radiobutton);
-
-    TXT_DrawString(radiobutton->label);
-
-    for (i=TXT_UTF8_Strlen(radiobutton->label); i < w-5; ++i)
-    {
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_RadioButtonDestructor(TXT_UNCAST_ARG(radiobutton))
-{
-    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
-
-    free(radiobutton->label);
-}
-
-static int TXT_RadioButtonKeyPress(TXT_UNCAST_ARG(radiobutton), int key)
-{
-    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
-
-    if (key == KEY_ENTER || key == ' ')
-    {
-        if (*radiobutton->variable != radiobutton->value)
-        {
-            *radiobutton->variable = radiobutton->value;
-            TXT_EmitSignal(radiobutton, "selected");
-        }
-        return 1;
-    }
-    
-    return 0;
-}
-
-static void TXT_RadioButtonMousePress(TXT_UNCAST_ARG(radiobutton), 
-                                      int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        // Equivalent to pressing enter
-
-        TXT_RadioButtonKeyPress(radiobutton, KEY_ENTER);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_radiobutton_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_RadioButtonSizeCalc,
-    TXT_RadioButtonDrawer,
-    TXT_RadioButtonKeyPress,
-    TXT_RadioButtonDestructor,
-    TXT_RadioButtonMousePress,
-    NULL,
+  txt_always_selectable,
+  txt_radio_button_size_calc,
+  txt_radio_button_drawer,
+  txt_radio_button_keypress,
+  txt_radio_button_destructor,
+  txt_radio_button_mousepress,
+  NULL,
 };
 
-txt_radiobutton_t *TXT_NewRadioButton(const char *label, int *variable, int value)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_radio_button_size_calc(TXT_UNCAST_ARG(radiobutton))
 {
-    txt_radiobutton_t *radiobutton;
+  TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
 
-    radiobutton = malloc(sizeof(txt_radiobutton_t));
+  /* Minimum width is the string length + right-side spaces for padding */
 
-    TXT_InitWidget(radiobutton, &txt_radiobutton_class);
-    radiobutton->label = strdup(label);
-    radiobutton->variable = variable;
-    radiobutton->value = value;
-
-    return radiobutton;
+  radiobutton->widget.w = txt_utf8_strlen(radiobutton->label) + 5;
+  radiobutton->widget.h = 1;
 }
 
-void TXT_SetRadioButtonLabel(txt_radiobutton_t *radiobutton, const char *value)
+static void txt_radio_button_drawer(TXT_UNCAST_ARG(radiobutton))
 {
-    free(radiobutton->label);
-    radiobutton->label = strdup(value);
+  TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+  txt_saved_colors_t colors;
+  int i;
+  int w;
+
+  w = radiobutton->widget.w;
+
+  txt_save_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+  txt_draw_string("(");
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_WHITE);
+
+  if (*radiobutton->variable == radiobutton->value)
+    {
+      txt_draw_code_page_string("\x07");
+    }
+  else
+    {
+      txt_draw_string(" ");
+    }
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+
+  txt_draw_string(") ");
+
+  txt_restore_colours(&colors);
+  txt_set_widget_bg(radiobutton);
+
+  txt_draw_string(radiobutton->label);
+
+  for (i = txt_utf8_strlen(radiobutton->label); i < w - 5; ++i)
+    {
+      txt_draw_string(" ");
+    }
 }
 
+static void txt_radio_button_destructor(TXT_UNCAST_ARG(radiobutton))
+{
+  TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+  free(radiobutton->label);
+}
+
+static int txt_radio_button_keypress(TXT_UNCAST_ARG(radiobutton), int key)
+{
+  TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+  if (key == KEY_ENTER || key == ' ')
+    {
+      if (*radiobutton->variable != radiobutton->value)
+        {
+          *radiobutton->variable = radiobutton->value;
+          txt_emit_signal(radiobutton, "selected");
+        }
+
+      return 1;
+    }
+
+  return 0;
+}
+
+static void txt_radio_button_mousepress(TXT_UNCAST_ARG(radiobutton), int x,
+                                      int y, int b)
+{
+  TXT_CAST_ARG(txt_radiobutton_t, radiobutton);
+
+  if (b == TXT_MOUSE_LEFT)
+    {
+      /* Equivalent to pressing enter */
+
+      txt_radio_button_keypress(radiobutton, KEY_ENTER);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_radiobutton_t *txt_new_radio_button(const char *label, int *variable,
+                                        int value)
+{
+  txt_radiobutton_t *radiobutton;
+
+  radiobutton = malloc(sizeof(txt_radiobutton_t));
+
+  txt_init_widget(radiobutton, &txt_radiobutton_class);
+  radiobutton->label = strdup(label);
+  radiobutton->variable = variable;
+  radiobutton->value = value;
+
+  return radiobutton;
+}
+
+#if 0 /* UNUSED */
+static void txt_set_radio_button_label(txt_radiobutton_t *radiobutton,
+                                       const char *value)
+{
+  free(radiobutton->label);
+  radiobutton->label = strdup(value);
+}
+#endif
diff --git a/games/NXDoom/textscreen/txt_radiobutton.h b/games/NXDoom/textscreen/txt_radiobutton.h
index 6ba25a5fc..f5cafb6c8 100644
--- a/games/NXDoom/textscreen/txt_radiobutton.h
+++ b/games/NXDoom/textscreen/txt_radiobutton.h
@@ -1,28 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_radiobutton.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_RADIOBUTTON_H
 #define TXT_RADIOBUTTON_H
 
-/**
- * @file txt_radiobutton.h
- *
- * Radio button widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * A radio button widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* A radio button widget.
  *
  * Radio buttons are typically used in groups, to allow a value to be
  * selected from a range of options.  Each radio button corresponds
@@ -39,18 +47,18 @@
  * When a radio button is selected, the "selected" signal is emitted.
  */
 
-typedef struct txt_radiobutton_s txt_radiobutton_t;
-
-#include "txt_widget.h"
-
 struct txt_radiobutton_s
 {
-    txt_widget_t widget;
-    char *label;
-    int *variable;
-    int value;
+  txt_widget_t widget;
+  char *label;
+  int *variable;
+  int value;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new radio button widget.
  *
@@ -63,17 +71,7 @@ struct txt_radiobutton_s
  * @return               Pointer to the new radio button widget.
  */
 
-txt_radiobutton_t *TXT_NewRadioButton(const char *label, int *variable, int value);
-
-/**
- * Set the label on a radio button.
- *
- * @param radiobutton    The radio button.
- * @param value          The new label (UTF-8 format).
- */
-
-void TXT_SetRadioButtonLabel(txt_radiobutton_t *radiobutton, const char *value);
-
-#endif /* #ifndef TXT_RADIOBUTTON_H */
-
+txt_radiobutton_t *txt_new_radio_button(const char *label, int *variable,
+                                        int value);
 
+#endif /* TXT_RADIOBUTTON_H */
diff --git a/games/NXDoom/textscreen/txt_scrollpane.c b/games/NXDoom/textscreen/txt_scrollpane.c
index 7c4508a81..4fa3b7184 100644
--- a/games/NXDoom/textscreen/txt_scrollpane.c
+++ b/games/NXDoom/textscreen/txt_scrollpane.c
@@ -1,586 +1,638 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_scrollpane.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
-#include "txt_scrollpane.h"
 #include "txt_gui.h"
 #include "txt_io.h"
 #include "txt_main.h"
+#include "txt_scrollpane.h"
 #include "txt_table.h"
 
 #include "doomkeys.h"
 
-#define SCROLLBAR_VERTICAL   (1 << 0)
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SCROLLBAR_VERTICAL (1 << 0)
 #define SCROLLBAR_HORIZONTAL (1 << 1)
 
-static int FullWidth(txt_scrollpane_t *scrollpane)
-{
-    if (scrollpane->child != NULL)
-    {
-        return scrollpane->child->w;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-static int FullHeight(txt_scrollpane_t *scrollpane)
-{
-    if (scrollpane->child != NULL)
-    {
-        return scrollpane->child->h;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-// Calculate which scroll bars the pane needs.
-
-static int NeedsScrollbars(txt_scrollpane_t *scrollpane)
-{
-    int result;
-
-    result = 0;
-
-    if (FullWidth(scrollpane) > scrollpane->w)
-    {
-        result |= SCROLLBAR_HORIZONTAL;
-    }
-    if (FullHeight(scrollpane) > scrollpane->h)
-    {
-        result |= SCROLLBAR_VERTICAL;
-    }
-
-    return result;
-}
-
-// If a scrollbar isn't needed, the scroll position is reset.
-
-static void SanityCheckScrollbars(txt_scrollpane_t *scrollpane)
-{
-    int scrollbars;
-    int max_x, max_y;
-
-    scrollbars = NeedsScrollbars(scrollpane);
-
-    if ((scrollbars & SCROLLBAR_HORIZONTAL) == 0)
-    {
-        scrollpane->x = 0;
-    }
-    if ((scrollbars & SCROLLBAR_VERTICAL) == 0)
-    {
-        scrollpane->y = 0;
-    }
-
-    max_x = FullWidth(scrollpane) - scrollpane->w;
-    max_y = FullHeight(scrollpane) - scrollpane->h;
-
-    if (scrollpane->x < 0)
-    {
-        scrollpane->x = 0;
-    }
-    else if (scrollpane->x > max_x)
-    {
-        scrollpane->x = max_x;
-    }
-
-    if (scrollpane->y < 0)
-    {
-        scrollpane->y = 0;
-    }
-    else if (scrollpane->y > max_y)
-    {
-        scrollpane->y = max_y;
-    }
-}
-
-static void TXT_ScrollPaneSizeCalc(TXT_UNCAST_ARG(scrollpane))
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-    int scrollbars;
-
-    if (scrollpane->child != NULL)
-    {
-        TXT_CalcWidgetSize(scrollpane->child);
-    }
-
-    // Expand as necessary (to ensure that no scrollbars are needed)?
-
-    if (scrollpane->expand_w)
-    {
-        scrollpane->w = FullWidth(scrollpane);
-    }
-    if (scrollpane->expand_h)
-    {
-        scrollpane->h = FullHeight(scrollpane);
-    }
-
-    scrollpane->widget.w = scrollpane->w;
-    scrollpane->widget.h = scrollpane->h;
-
-    // If we have scroll bars, we need to expand slightly to
-    // accomodate them. Eg. if we have a vertical scrollbar, we
-    // need to be an extra character wide.
-
-    scrollbars = NeedsScrollbars(scrollpane);
-
-    if (scrollbars & SCROLLBAR_HORIZONTAL)
-    {
-        ++scrollpane->widget.h;
-    }
-    if (scrollbars & SCROLLBAR_VERTICAL)
-    {
-        ++scrollpane->widget.w;
-    }
-
-    if (scrollpane->child != NULL)
-    {
-        if (scrollpane->child->w < scrollpane->w)
-        {
-            scrollpane->child->w = scrollpane->w;
-        }
-        if (scrollpane->child->h < scrollpane->h)
-        {
-            scrollpane->child->h = scrollpane->h;
-        }
-    }
-}
-
-static void TXT_ScrollPaneDrawer(TXT_UNCAST_ARG(scrollpane))
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-    int x1, y1, x2, y2;
-    int scrollbars;
-
-    // We set a clipping area of the scroll pane.
-
-    x1 = scrollpane->widget.x;
-    y1 = scrollpane->widget.y;
-    x2 = x1 + scrollpane->w;
-    y2 = y1 + scrollpane->h;
-
-    scrollbars = NeedsScrollbars(scrollpane);
-
-    if (scrollbars & SCROLLBAR_HORIZONTAL)
-    {
-        TXT_DrawHorizScrollbar(x1,
-                               y1 + scrollpane->h,
-                               scrollpane->w,
-                               scrollpane->x,
-                               FullWidth(scrollpane) - scrollpane->w);
-    }
-
-    if (scrollbars & SCROLLBAR_VERTICAL)
-    {
-        TXT_DrawVertScrollbar(x1 + scrollpane->w,
-                              y1,
-                              scrollpane->h,
-                              scrollpane->y,
-                              FullHeight(scrollpane) - scrollpane->h);
-    }
-
-    TXT_PushClipArea(x1, x2, y1, y2);
-
-    // Draw the child widget
-
-    if (scrollpane->child != NULL)
-    {
-        TXT_DrawWidget(scrollpane->child);
-    }
-
-    // Restore old clipping area.
-
-    TXT_PopClipArea();
-}
-
-static void TXT_ScrollPaneDestructor(TXT_UNCAST_ARG(scrollpane))
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-
-    if (scrollpane->child != NULL)
-    {
-        TXT_DestroyWidget(scrollpane->child);
-    }
-}
-
-static void TXT_ScrollPaneFocused(TXT_UNCAST_ARG(scrollpane), int focused)
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-
-    // Whether the child is focused depends only on whether the scroll pane
-    // itself is focused. Pass through focus to the child.
-
-    if (scrollpane->child != NULL)
-    {
-        TXT_SetWidgetFocus(scrollpane->child, focused);
-    }
-}
-
-// Hack for tables - when browsing a table inside a scroll pane,
-// automatically scroll the window to show the newly-selected
-// item.
-
-static void ShowSelectedWidget(txt_scrollpane_t *scrollpane)
-{
-    txt_widget_t *selected;
-
-    selected = TXT_GetSelectedWidget(scrollpane->child);
-
-    // Scroll up or down?
-
-    if (selected->y <= scrollpane->widget.y)
-    {
-        scrollpane->y -= scrollpane->widget.y - selected->y;
-    }
-    else if ((signed) (selected->y + selected->h) >
-             (signed) (scrollpane->widget.y + scrollpane->h))
-    {
-        scrollpane->y += (selected->y + selected->h)
-                       - (scrollpane->widget.y + scrollpane->h);
-    }
-
-    // Scroll left or right?
-
-    if (selected->x <= scrollpane->widget.x)
-    {
-        scrollpane->x -= scrollpane->widget.x - selected->x;
-    }
-    else if ((signed) (selected->x + selected->w) >
-             (signed) (scrollpane->widget.x + scrollpane->w))
-    {
-        scrollpane->x += (selected->x + selected->w)
-                       - (scrollpane->widget.x + scrollpane->w);
-    }
-}
-
-// Another hack for tables - when scrolling in 'pages', the normal key press
-// event does not provide children with enough information to know how far
-// to move their selection to reach a new page. This function does so.
-// Note that it *only* affects scrolling in pages, not with arrows!
-// A side-effect of this, rather than 'pulling' the selection to fit within
-// the new page, is that we will jump straight over ranges of unselectable
-// items longer than a page, but that is also true of arrow-key scrolling.
-// The other unfortunate effect of doing things this way is that page keys
-// have no effect on tables _not_ in scrollpanes: not even home/end.
-
-static int PageSelectedWidget(txt_scrollpane_t *scrollpane, int key)
-{
-    int pagex = 0; // No page left/right yet, but some keyboards have them
-    int pagey = 0;
-
-    // Subtract one from the absolute page distance as this is slightly more
-    // intuitive: a page down first jumps to the bottom of the current page,
-    // then proceeds to scroll onwards.
-
-    switch (key)
-    {
-        case KEY_PGUP:
-            pagey = 1 - scrollpane->h;
-            break;
-
-        case KEY_PGDN:
-            pagey = scrollpane->h - 1;
-            break;
-
-        default: // We shouldn't even be in this function
-            return 0;
-    }
-
-    if (scrollpane->child->widget_class == &txt_table_class)
-    {
-        return TXT_PageTable(scrollpane->child, pagex, pagey);
-    }
-
-    return 0;
-}
-
-// Interpret arrow key presses as scroll commands
-
-static int InterpretScrollKey(txt_scrollpane_t *scrollpane, int key)
-{
-    int maxy;
-
-    switch (key)
-    {
-        case KEY_UPARROW:
-            if (scrollpane->y > 0)
-            {
-                --scrollpane->y;
-                return 1;
-            }
-            break;
-
-        case KEY_DOWNARROW:
-            if (scrollpane->y < FullHeight(scrollpane) - scrollpane->h)
-            {
-                ++scrollpane->y;
-                return 1;
-            }
-            break;
-
-        case KEY_LEFTARROW:
-            if (scrollpane->x > 0)
-            {
-                --scrollpane->x;
-                return 1;
-            }
-            break;
-
-        case KEY_RIGHTARROW:
-            if (scrollpane->x < FullWidth(scrollpane) - scrollpane->w)
-            {
-                ++scrollpane->x;
-                return 1;
-            }
-            break;
-
-        case KEY_PGUP:
-            if (scrollpane->y > 0)
-            {
-                scrollpane->y -= scrollpane->h;
-                if (scrollpane->y < 0)
-                {
-                    scrollpane->y = 0;
-                }
-                return 1;
-            }
-            break;
-
-        case KEY_PGDN:
-            maxy = FullHeight(scrollpane) - scrollpane->h;
-            if (scrollpane->y < maxy)
-            {
-                scrollpane->y += scrollpane->h;
-                if (scrollpane->y > maxy)
-                {
-                    scrollpane->y = maxy;
-                }
-                return 1;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    return 0;
-}
-
-static int TXT_ScrollPaneKeyPress(TXT_UNCAST_ARG(scrollpane), int key)
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-    int result;
-
-    result = 0;
-
-    if (scrollpane->child != NULL)
-    {
-        result = TXT_WidgetKeyPress(scrollpane->child, key);
-
-        // Gross hack - if we're scrolling in a menu with the keyboard,
-        // automatically move the scroll pane to show the new
-        // selected item.
-
-        if ((key == KEY_UPARROW || key == KEY_DOWNARROW
-          || key == KEY_LEFTARROW || key == KEY_RIGHTARROW
-          || key == KEY_PGUP || key == KEY_PGDN
-          || key == KEY_TAB)
-         && scrollpane->child->widget_class == &txt_table_class)
-        {
-            if (PageSelectedWidget(scrollpane, key))
-            {
-                result = 1;
-            }
-
-            ShowSelectedWidget(scrollpane);
-        }
-
-        // If the child widget didn't use the keypress, we can see 
-        // if it can be interpreted as a scrolling command.
-
-        if (result == 0)
-        {
-            result = InterpretScrollKey(scrollpane, key);
-        }
-    }
-
-    return result;
-}
-
-static void TXT_ScrollPaneMousePress(TXT_UNCAST_ARG(scrollpane),
-                                     int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-    int scrollbars;
-    int rel_x, rel_y;
-
-    scrollbars = NeedsScrollbars(scrollpane);
-
-    if (b == TXT_MOUSE_SCROLLUP)
-    {
-        if (scrollbars & SCROLLBAR_VERTICAL)
-        {
-            scrollpane->y -= 3;
-        }
-        else if (scrollbars & SCROLLBAR_HORIZONTAL)
-        {
-            scrollpane->x -= 3;
-        }
-
-        return;
-    }
-    else if (b == TXT_MOUSE_SCROLLDOWN)
-    {
-        if (scrollbars & SCROLLBAR_VERTICAL)
-        {
-            scrollpane->y += 3;
-        }
-        else if (scrollbars & SCROLLBAR_HORIZONTAL)
-        {
-            scrollpane->x += 3;
-        }
-
-        return;
-    }
-
-    rel_x = x - scrollpane->widget.x;
-    rel_y = y - scrollpane->widget.y;
-
-    // Click on the horizontal scrollbar?
-    if ((scrollbars & SCROLLBAR_HORIZONTAL) && rel_y == scrollpane->h)
-    {
-        if (rel_x == 0)
-        {
-            --scrollpane->x;
-        }
-        else if (rel_x == scrollpane->w - 1)
-        {
-            ++scrollpane->x;
-        }
-        else
-        {
-            int range = FullWidth(scrollpane) - scrollpane->w;
-            int bar_max = scrollpane->w - 3;
-
-            scrollpane->x = ((rel_x - 1) * range + bar_max - 1) / bar_max;
-        }
-
-        return;
-    }
-
-    // Click on the vertical scrollbar?
-    if ((scrollbars & SCROLLBAR_VERTICAL) && rel_x == scrollpane->w)
-    {
-        if (rel_y == 0)
-        {
-            --scrollpane->y;
-        }
-        else if (rel_y == scrollpane->h - 1)
-        {
-            ++scrollpane->y;
-        }
-        else
-        {
-            int range = FullHeight(scrollpane) - scrollpane->h;
-            int bar_max = scrollpane->h - 3;
-
-            scrollpane->y = ((rel_y - 1) * range + bar_max - 1) / bar_max;
-        }
-
-        return;
-    }
-
-    if (scrollpane->child != NULL)
-    {
-        TXT_WidgetMousePress(scrollpane->child, x, y, b);
-    }
-}
-
-static void TXT_ScrollPaneLayout(TXT_UNCAST_ARG(scrollpane))
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-
-    SanityCheckScrollbars(scrollpane);
-
-    // The child widget takes the same position as the scroll pane
-    // itself, but is offset by the scroll position.
-
-    if (scrollpane->child != NULL)
-    {
-        scrollpane->child->x = scrollpane->widget.x - scrollpane->x;
-        scrollpane->child->y = scrollpane->widget.y - scrollpane->y;
-
-        TXT_LayoutWidget(scrollpane->child);
-    }
-}
-
-static int TXT_ScrollPaneSelectable(TXT_UNCAST_ARG(scrollpane))
-{
-    TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
-
-    // If scroll bars are displayed, the scroll pane must be selectable
-    // so that we can use the arrow keys to scroll around.
-
-    if (NeedsScrollbars(scrollpane))
-    {
-        return 1;
-    }
-
-    // Otherwise, whether this is selectable depends on the child widget.
-
-    return TXT_SelectableWidget(scrollpane->child);
-}
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int txt_scroll_pane_selectable(TXT_UNCAST_ARG(scrollpane));
+static void txt_scroll_pane_size_calc(TXT_UNCAST_ARG(scrollpane));
+static void txt_scroll_pane_drawer(TXT_UNCAST_ARG(scrollpane));
+static int txt_scroll_pane_keypress(TXT_UNCAST_ARG(scrollpane), int key);
+static void txt_scroll_pane_destructor(TXT_UNCAST_ARG(scrollpane));
+static void txt_scroll_pane_mousepress(TXT_UNCAST_ARG(scrollpane), int x,
+                                       int y, int b);
+static void txt_scroll_pane_layout(TXT_UNCAST_ARG(scrollpane));
+static void txt_scroll_pane_focus(TXT_UNCAST_ARG(scrollpane), int focused);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_scrollpane_class =
 {
-    TXT_ScrollPaneSelectable,
-    TXT_ScrollPaneSizeCalc,
-    TXT_ScrollPaneDrawer,
-    TXT_ScrollPaneKeyPress,
-    TXT_ScrollPaneDestructor,
-    TXT_ScrollPaneMousePress,
-    TXT_ScrollPaneLayout,
-    TXT_ScrollPaneFocused,
+  txt_scroll_pane_selectable, txt_scroll_pane_size_calc,
+  txt_scroll_pane_drawer,     txt_scroll_pane_keypress,
+  txt_scroll_pane_destructor, txt_scroll_pane_mousepress,
+  txt_scroll_pane_layout,     txt_scroll_pane_focus,
 };
 
-txt_scrollpane_t *TXT_NewScrollPane(int w, int h, TXT_UNCAST_ARG(target))
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int full_width(txt_scrollpane_t *scrollpane)
 {
-    TXT_CAST_ARG(txt_widget_t, target);
-    txt_scrollpane_t *scrollpane;
-
-    scrollpane = malloc(sizeof(txt_scrollpane_t));
-    TXT_InitWidget(scrollpane, &txt_scrollpane_class);
-    scrollpane->w = w;
-    scrollpane->h = h;
-    scrollpane->x = 0;
-    scrollpane->y = 0;
-    scrollpane->child = target;
-    scrollpane->expand_w = w <= 0;
-    scrollpane->expand_h = h <= 0;
-
-    // Set parent pointer for inner widget.
-
-    target->parent = &scrollpane->widget;
-
-    return scrollpane;
+  if (scrollpane->child != NULL)
+    {
+      return scrollpane->child->w;
+    }
+  else
+    {
+      return 0;
+    }
 }
 
+static int full_height(txt_scrollpane_t *scrollpane)
+{
+  if (scrollpane->child != NULL)
+    {
+      return scrollpane->child->h;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+/* Calculate which scroll bars the pane needs. */
+
+static int needs_scroll_bars(txt_scrollpane_t *scrollpane)
+{
+  int result;
+
+  result = 0;
+
+  if (full_width(scrollpane) > scrollpane->w)
+    {
+      result |= SCROLLBAR_HORIZONTAL;
+    }
+
+  if (full_height(scrollpane) > scrollpane->h)
+    {
+      result |= SCROLLBAR_VERTICAL;
+    }
+
+  return result;
+}
+
+/* If a scrollbar isn't needed, the scroll position is reset. */
+
+static void sanity_check_scrollbars(txt_scrollpane_t *scrollpane)
+{
+  int scrollbars;
+  int max_x;
+  int max_y;
+
+  scrollbars = needs_scroll_bars(scrollpane);
+
+  if ((scrollbars & SCROLLBAR_HORIZONTAL) == 0)
+    {
+      scrollpane->x = 0;
+    }
+
+  if ((scrollbars & SCROLLBAR_VERTICAL) == 0)
+    {
+      scrollpane->y = 0;
+    }
+
+  max_x = full_width(scrollpane) - scrollpane->w;
+  max_y = full_height(scrollpane) - scrollpane->h;
+
+  if (scrollpane->x < 0)
+    {
+      scrollpane->x = 0;
+    }
+  else if (scrollpane->x > max_x)
+    {
+      scrollpane->x = max_x;
+    }
+
+  if (scrollpane->y < 0)
+    {
+      scrollpane->y = 0;
+    }
+  else if (scrollpane->y > max_y)
+    {
+      scrollpane->y = max_y;
+    }
+}
+
+static void txt_scroll_pane_size_calc(TXT_UNCAST_ARG(scrollpane))
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+  int scrollbars;
+
+  if (scrollpane->child != NULL)
+    {
+      txt_calc_widget_size(scrollpane->child);
+    }
+
+  /* Expand as necessary (to ensure that no scrollbars are needed)? */
+
+  if (scrollpane->expand_w)
+    {
+      scrollpane->w = full_width(scrollpane);
+    }
+
+  if (scrollpane->expand_h)
+    {
+      scrollpane->h = full_height(scrollpane);
+    }
+
+  scrollpane->widget.w = scrollpane->w;
+  scrollpane->widget.h = scrollpane->h;
+
+  /* If we have scroll bars, we need to expand slightly to
+   * accommodate them. Eg. if we have a vertical scrollbar, we
+   * need to be an extra character wide.
+   */
+
+  scrollbars = needs_scroll_bars(scrollpane);
+
+  if (scrollbars & SCROLLBAR_HORIZONTAL)
+    {
+      ++scrollpane->widget.h;
+    }
+
+  if (scrollbars & SCROLLBAR_VERTICAL)
+    {
+      ++scrollpane->widget.w;
+    }
+
+  if (scrollpane->child != NULL)
+    {
+      if (scrollpane->child->w < scrollpane->w)
+        {
+          scrollpane->child->w = scrollpane->w;
+        }
+
+      if (scrollpane->child->h < scrollpane->h)
+        {
+          scrollpane->child->h = scrollpane->h;
+        }
+    }
+}
+
+static void txt_scroll_pane_drawer(TXT_UNCAST_ARG(scrollpane))
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+  int x1;
+  int y1;
+  int x2;
+  int y2;
+  int scrollbars;
+
+  /* We set a clipping area of the scroll pane. */
+
+  x1 = scrollpane->widget.x;
+  y1 = scrollpane->widget.y;
+  x2 = x1 + scrollpane->w;
+  y2 = y1 + scrollpane->h;
+
+  scrollbars = needs_scroll_bars(scrollpane);
+
+  if (scrollbars & SCROLLBAR_HORIZONTAL)
+    {
+      txt_draw_horiz_scrollbar(x1, y1 + scrollpane->h, scrollpane->w,
+                             scrollpane->x,
+                             full_width(scrollpane) - scrollpane->w);
+    }
+
+  if (scrollbars & SCROLLBAR_VERTICAL)
+    {
+      txt_draw_vert_scrollbar(x1 + scrollpane->w, y1, scrollpane->h,
+                            scrollpane->y,
+                            full_height(scrollpane) - scrollpane->h);
+    }
+
+  txt_push_clip_area(x1, x2, y1, y2);
+
+  /* Draw the child widget */
+
+  if (scrollpane->child != NULL)
+    {
+      txt_draw_widget(scrollpane->child);
+    }
+
+  /* Restore old clipping area. */
+
+  txt_pop_clip_area();
+}
+
+static void txt_scroll_pane_destructor(TXT_UNCAST_ARG(scrollpane))
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+  if (scrollpane->child != NULL)
+    {
+      txt_destroy_widget(scrollpane->child);
+    }
+}
+
+static void txt_scroll_pane_focus(TXT_UNCAST_ARG(scrollpane), int focused)
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+  /* Whether the child is focused depends only on whether the scroll pane
+   * itself is focused. Pass through focus to the child.
+   */
+
+  if (scrollpane->child != NULL)
+    {
+      txt_set_widget_focus(scrollpane->child, focused);
+    }
+}
+
+/* Hack for tables - when browsing a table inside a scroll pane,
+ * automatically scroll the window to show the newly-selected
+ * item.
+ */
+
+static void show_selected_widget(txt_scrollpane_t *scrollpane)
+{
+  txt_widget_t *selected;
+
+  selected = txt_get_selected_widget(scrollpane->child);
+
+  /* Scroll up or down? */
+
+  if (selected->y <= scrollpane->widget.y)
+    {
+      scrollpane->y -= scrollpane->widget.y - selected->y;
+    }
+  else if ((signed)(selected->y + selected->h) >
+           (signed)(scrollpane->widget.y + scrollpane->h))
+    {
+      scrollpane->y += (selected->y + selected->h) -
+                       (scrollpane->widget.y + scrollpane->h);
+    }
+
+  /* Scroll left or right? */
+
+  if (selected->x <= scrollpane->widget.x)
+    {
+      scrollpane->x -= scrollpane->widget.x - selected->x;
+    }
+  else if ((signed)(selected->x + selected->w) >
+           (signed)(scrollpane->widget.x + scrollpane->w))
+    {
+      scrollpane->x += (selected->x + selected->w) -
+                       (scrollpane->widget.x + scrollpane->w);
+    }
+}
+
+/* Another hack for tables - when scrolling in 'pages', the normal key press
+ * event does not provide children with enough information to know how far
+ * to move their selection to reach a new page. This function does so.
+ * Note that it *only* affects scrolling in pages, not with arrows!
+ * A side-effect of this, rather than 'pulling' the selection to fit within
+ * the new page, is that we will jump straight over ranges of unselectable
+ * items longer than a page, but that is also true of arrow-key scrolling.
+ * The other unfortunate effect of doing things this way is that page keys
+ * have no effect on tables _not_ in scrollpanes: not even home/end.
+ */
+
+static int page_selected_widget(txt_scrollpane_t *scrollpane, int key)
+{
+  int pagex = 0; /* No page left/right yet, but some keyboards have them */
+  int pagey = 0;
+
+  /* Subtract one from the absolute page distance as this is slightly more
+   * intuitive: a page down first jumps to the bottom of the current page,
+   * then proceeds to scroll onwards.
+   */
+
+  switch (key)
+    {
+    case KEY_PGUP:
+      pagey = 1 - scrollpane->h;
+      break;
+
+    case KEY_PGDN:
+      pagey = scrollpane->h - 1;
+      break;
+
+    default: /* We shouldn't even be in this function */
+      return 0;
+    }
+
+  if (scrollpane->child->widget_class == &txt_table_class)
+    {
+      return txt_page_table(scrollpane->child, pagex, pagey);
+    }
+
+  return 0;
+}
+
+/* Interpret arrow key presses as scroll commands */
+
+static int interpret_scroll_key(txt_scrollpane_t *scrollpane, int key)
+{
+  int maxy;
+
+  switch (key)
+    {
+    case KEY_UPARROW:
+      if (scrollpane->y > 0)
+        {
+          --scrollpane->y;
+          return 1;
+        }
+      break;
+
+    case KEY_DOWNARROW:
+      if (scrollpane->y < full_height(scrollpane) - scrollpane->h)
+        {
+          ++scrollpane->y;
+          return 1;
+        }
+      break;
+
+    case KEY_LEFTARROW:
+      if (scrollpane->x > 0)
+        {
+          --scrollpane->x;
+          return 1;
+        }
+      break;
+
+    case KEY_RIGHTARROW:
+      if (scrollpane->x < full_width(scrollpane) - scrollpane->w)
+        {
+          ++scrollpane->x;
+          return 1;
+        }
+      break;
+
+    case KEY_PGUP:
+      if (scrollpane->y > 0)
+        {
+          scrollpane->y -= scrollpane->h;
+          if (scrollpane->y < 0)
+            {
+              scrollpane->y = 0;
+            }
+
+          return 1;
+        }
+      break;
+
+    case KEY_PGDN:
+      maxy = full_height(scrollpane) - scrollpane->h;
+      if (scrollpane->y < maxy)
+        {
+          scrollpane->y += scrollpane->h;
+          if (scrollpane->y > maxy)
+            {
+              scrollpane->y = maxy;
+            }
+
+          return 1;
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+static int txt_scroll_pane_keypress(TXT_UNCAST_ARG(scrollpane), int key)
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+  int result;
+
+  result = 0;
+
+  if (scrollpane->child != NULL)
+    {
+      result = txt_widget_key_press(scrollpane->child, key);
+
+      /* Gross hack - if we're scrolling in a menu with the keyboard,
+       * automatically move the scroll pane to show the new
+       * selected item.
+       */
+
+      if ((key == KEY_UPARROW || key == KEY_DOWNARROW ||
+           key == KEY_LEFTARROW || key == KEY_RIGHTARROW ||
+           key == KEY_PGUP || key == KEY_PGDN || key == KEY_TAB) &&
+          scrollpane->child->widget_class == &txt_table_class)
+        {
+          if (page_selected_widget(scrollpane, key))
+            {
+              result = 1;
+            }
+
+          show_selected_widget(scrollpane);
+        }
+
+      /* If the child widget didn't use the keypress, we can see
+       * if it can be interpreted as a scrolling command.
+       */
+
+      if (result == 0)
+        {
+          result = interpret_scroll_key(scrollpane, key);
+        }
+    }
+
+  return result;
+}
+
+static void txt_scroll_pane_mousepress(TXT_UNCAST_ARG(scrollpane), int x,
+                                       int y, int b)
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+  int scrollbars;
+  int rel_x;
+  int rel_y;
+
+  scrollbars = needs_scroll_bars(scrollpane);
+
+  if (b == TXT_MOUSE_SCROLLUP)
+    {
+      if (scrollbars & SCROLLBAR_VERTICAL)
+        {
+          scrollpane->y -= 3;
+        }
+      else if (scrollbars & SCROLLBAR_HORIZONTAL)
+        {
+          scrollpane->x -= 3;
+        }
+
+      return;
+    }
+  else if (b == TXT_MOUSE_SCROLLDOWN)
+    {
+      if (scrollbars & SCROLLBAR_VERTICAL)
+        {
+          scrollpane->y += 3;
+        }
+      else if (scrollbars & SCROLLBAR_HORIZONTAL)
+        {
+          scrollpane->x += 3;
+        }
+
+      return;
+    }
+
+  rel_x = x - scrollpane->widget.x;
+  rel_y = y - scrollpane->widget.y;
+
+  /* Click on the horizontal scrollbar? */
+
+  if ((scrollbars & SCROLLBAR_HORIZONTAL) && rel_y == scrollpane->h)
+    {
+      if (rel_x == 0)
+        {
+          --scrollpane->x;
+        }
+      else if (rel_x == scrollpane->w - 1)
+        {
+          ++scrollpane->x;
+        }
+      else
+        {
+          int range = full_width(scrollpane) - scrollpane->w;
+          int bar_max = scrollpane->w - 3;
+
+          scrollpane->x = ((rel_x - 1) * range + bar_max - 1) / bar_max;
+        }
+
+      return;
+    }
+
+  /* Click on the vertical scrollbar? */
+
+  if ((scrollbars & SCROLLBAR_VERTICAL) && rel_x == scrollpane->w)
+    {
+      if (rel_y == 0)
+        {
+          --scrollpane->y;
+        }
+      else if (rel_y == scrollpane->h - 1)
+        {
+          ++scrollpane->y;
+        }
+      else
+        {
+          int range = full_height(scrollpane) - scrollpane->h;
+          int bar_max = scrollpane->h - 3;
+
+          scrollpane->y = ((rel_y - 1) * range + bar_max - 1) / bar_max;
+        }
+
+      return;
+    }
+
+  if (scrollpane->child != NULL)
+    {
+      txt_widget_mouse_press(scrollpane->child, x, y, b);
+    }
+}
+
+static void txt_scroll_pane_layout(TXT_UNCAST_ARG(scrollpane))
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+  sanity_check_scrollbars(scrollpane);
+
+  /* The child widget takes the same position as the scroll pane
+   * itself, but is offset by the scroll position.
+   */
+
+  if (scrollpane->child != NULL)
+    {
+      scrollpane->child->x = scrollpane->widget.x - scrollpane->x;
+      scrollpane->child->y = scrollpane->widget.y - scrollpane->y;
+
+      txt_layout_widget(scrollpane->child);
+    }
+}
+
+static int txt_scroll_pane_selectable(TXT_UNCAST_ARG(scrollpane))
+{
+  TXT_CAST_ARG(txt_scrollpane_t, scrollpane);
+
+  /* If scroll bars are displayed, the scroll pane must be selectable
+   * so that we can use the arrow keys to scroll around.
+   */
+
+  if (needs_scroll_bars(scrollpane))
+    {
+      return 1;
+    }
+
+  /* Otherwise, whether this is selectable depends on the child widget. */
+
+  return txt_selectable_widget(scrollpane->child);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_scrollpane_t *txt_new_scrollpane(int w, int h, TXT_UNCAST_ARG(target))
+{
+  TXT_CAST_ARG(txt_widget_t, target);
+  txt_scrollpane_t *scrollpane;
+
+  scrollpane = malloc(sizeof(txt_scrollpane_t));
+  txt_init_widget(scrollpane, &txt_scrollpane_class);
+  scrollpane->w = w;
+  scrollpane->h = h;
+  scrollpane->x = 0;
+  scrollpane->y = 0;
+  scrollpane->child = target;
+  scrollpane->expand_w = w <= 0;
+  scrollpane->expand_h = h <= 0;
+
+  /* Set parent pointer for inner widget. */
+
+  target->parent = &scrollpane->widget;
+
+  return scrollpane;
+}
diff --git a/games/NXDoom/textscreen/txt_scrollpane.h b/games/NXDoom/textscreen/txt_scrollpane.h
index 8ae95e47e..831a014d9 100644
--- a/games/NXDoom/textscreen/txt_scrollpane.h
+++ b/games/NXDoom/textscreen/txt_scrollpane.h
@@ -1,47 +1,59 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_scrollpane.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ ****************************************************************************/
 
 #ifndef TXT_SCROLLPANE_H
 #define TXT_SCROLLPANE_H
 
-/**
- * @file txt_scrollpane.h
- *
- * Scrollable pane widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Scrollable pane widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Scrollable pane widget.
  *
  * A scrollable pane widget is a widget that contains another widget
  * that is larger than it.  Scroll bars appear on the side to allow
  * different areas of the contained widget to be seen.
  */
 
-typedef struct txt_scrollpane_s txt_scrollpane_t;
-
-#include "txt_widget.h"
-
 struct txt_scrollpane_s
 {
-    txt_widget_t widget;
-    int w, h;
-    int x, y;
-    int expand_w, expand_h;
-    txt_widget_t *child;
+  txt_widget_t widget;
+  int w;
+  int h;
+  int x;
+  int y;
+  int expand_w;
+  int expand_h;
+  txt_widget_t *child;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new scroll pane widget.
  *
@@ -52,8 +64,6 @@ struct txt_scrollpane_s
  * @return                Pointer to the new scroll pane widget.
  */
 
-txt_scrollpane_t *TXT_NewScrollPane(int w, int h, TXT_UNCAST_ARG(target));
-
-#endif /* #ifndef TXT_SCROLLPANE_H */
-
+txt_scrollpane_t *txt_new_scrollpane(int w, int h, TXT_UNCAST_ARG(target));
 
+#endif /* TXT_SCROLLPANE_H */
diff --git a/games/NXDoom/textscreen/txt_sdl.c b/games/NXDoom/textscreen/txt_sdl.c
index 807a1954e..6041ab187 100644
--- a/games/NXDoom/textscreen/txt_sdl.c
+++ b/games/NXDoom/textscreen/txt_sdl.c
@@ -1,21 +1,28 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Text mode emulation in SDL
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_sdl.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ *
+ * Text mode emulation in SDL
+ *
+ ****************************************************************************/
 
-#include "SDL.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
 #include <stdio.h>
@@ -28,963 +35,228 @@
 #include "txt_sdl.h"
 #include "txt_utf8.h"
 
-#if defined(_MSC_VER) && !defined(__cplusplus)
-#define inline __inline
-#endif
+/* Fonts: */
 
-typedef struct
-{
-    const char *name;
-    const uint8_t *data;
-    unsigned int w;
-    unsigned int h;
-} txt_font_t;
-
-// Fonts:
-
-#include "fonts/small.h"
-#include "fonts/normal.h"
-#include "fonts/large.h"
+#include "txt_font.h"
 #include "fonts/codepage.h"
+#include "fonts/large.h"
+#include "fonts/normal.h"
+#include "fonts/small.h"
 
-// Time between character blinks in ms
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Time between character blinks in ms */
 
 #define BLINK_PERIOD 250
 
-SDL_Window *TXT_SDLWindow;
-static SDL_Surface *screenbuffer;
-static unsigned char *screendata;
-static SDL_Renderer *renderer;
+/* XXX: duplicate from doomtype.h */
 
-// Current input mode.
-static txt_input_mode_t input_mode = TXT_INPUT_NORMAL;
-
-// Dimensions of the screen image in screen coordinates (not pixels); this
-// is the value that was passed to SDL_CreateWindow().
-static int screen_image_w, screen_image_h;
-
-static TxtSDLEventCallbackFunc event_callback;
-static void *event_callback_data;
-
-// Font we are using:
-static const txt_font_t *font;
-
-// Dummy "font" that means to try highdpi rendering, or fallback to
-// normal_font otherwise.
-static const txt_font_t highdpi_font = { "normal-highdpi", NULL, 8, 16 };
-
-// Mapping from SDL keyboard scancode to internal key code.
-static const int scancode_translate_table[] = SCANCODE_TO_KEYS_ARRAY;
-
-// String names of keys. This is a fallback; we usually use the SDL API.
-static const struct {
-    int key;
-    const char *name;
-} key_names[] = KEY_NAMES_ARRAY;
-
-// Unicode key mapping; see codepage.h.
-static const short code_page_to_unicode[] = CODE_PAGE_TO_UNICODE;
-
-static const SDL_Color ega_colors[] =
-{
-    {0x00, 0x00, 0x00, 0xff},          // 0: Black
-    {0x00, 0x00, 0xaa, 0xff},          // 1: Blue
-    {0x00, 0xaa, 0x00, 0xff},          // 2: Green
-    {0x00, 0xaa, 0xaa, 0xff},          // 3: Cyan
-    {0xaa, 0x00, 0x00, 0xff},          // 4: Red
-    {0xaa, 0x00, 0xaa, 0xff},          // 5: Magenta
-    {0xaa, 0x55, 0x00, 0xff},          // 6: Brown
-    {0xaa, 0xaa, 0xaa, 0xff},          // 7: Grey
-    {0x55, 0x55, 0x55, 0xff},          // 8: Dark grey
-    {0x55, 0x55, 0xff, 0xff},          // 9: Bright blue
-    {0x55, 0xff, 0x55, 0xff},          // 10: Bright green
-    {0x55, 0xff, 0xff, 0xff},          // 11: Bright cyan
-    {0xff, 0x55, 0x55, 0xff},          // 12: Bright red
-    {0xff, 0x55, 0xff, 0xff},          // 13: Bright magenta
-    {0xff, 0xff, 0x55, 0xff},          // 14: Yellow
-    {0xff, 0xff, 0xff, 0xff},          // 15: Bright white
-};
-
-#ifdef _WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-// Examine system DPI settings to determine whether to use the large font.
-
-static int Win32_UseLargeFont(void)
-{
-    HDC hdc = GetDC(NULL);
-    int dpix;
-
-    if (!hdc)
-    {
-        return 0;
-    }
-
-    dpix = GetDeviceCaps(hdc, LOGPIXELSX);
-    ReleaseDC(NULL, hdc);
-
-    // 144 is the DPI when using "150%" scaling. If the user has this set
-    // then consider this an appropriate threshold for using the large font.
-
-    return dpix >= 144;
-}
-
-#endif
-
-static const txt_font_t *FontForName(const char *name)
-{
-    int i;
-    const txt_font_t *fonts[] =
-    {
-        &small_font,
-        &normal_font,
-        &large_font,
-        &highdpi_font,
-        NULL,
-    };
-
-    for (i = 0; fonts[i]->name != NULL; ++i)
-    {
-        if (!strcmp(fonts[i]->name, name))
-        {
-            return fonts[i];
-        }
-    }
-    return NULL;
-}
-
-//
-// Select the font to use, based on screen resolution
-//
-// If the highest screen resolution available is less than
-// 640x480, use the small font.
-//
-
-static void ChooseFont(void)
-{
-    SDL_DisplayMode desktop_info;
-    char *env;
-
-    // Allow normal selection to be overridden from an environment variable:
-    env = getenv("TEXTSCREEN_FONT");
-    if (env != NULL)
-    {
-        font = FontForName(env);
-
-        if (font != NULL)
-        {
-            return;
-        }
-    }
-
-    // Get desktop resolution.
-    // If in doubt and we can't get a list, always prefer to
-    // fall back to the normal font:
-    if (SDL_GetCurrentDisplayMode(0, &desktop_info))
-    {
-        font = &highdpi_font;
-        return;
-    }
-
-    // On tiny low-res screens (eg. palmtops) use the small font.
-    // If the screen resolution is at least 1920x1080, this is
-    // a modern high-resolution display, and we can use the
-    // large font.
-
-    if (desktop_info.w < 640 || desktop_info.h < 480)
-    {
-        font = &small_font;
-    }
-#ifdef _WIN32
-    // On Windows we can use the system DPI settings to make a
-    // more educated guess about whether to use the large font.
-
-    else if (Win32_UseLargeFont())
-    {
-        font = &large_font;
-    }
-#endif
-    // TODO: Detect high DPI on Linux by inquiring about Gtk+ scale
-    // settings. This looks like it should just be a case of shelling
-    // out to invoke the 'gsettings' command, eg.
-    //   gsettings get org.gnome.desktop.interface text-scaling-factor
-    // and using large_font if the result is >= 2.
-    else
-    {
-        // highdpi_font usually means normal_font (the normal resolution
-        // version), but actually means "set the HIGHDPI flag and try
-        // to use large_font if we initialize successfully".
-        font = &highdpi_font;
-    }
-}
-
-//
-// Initialize text mode screen
-//
-// Returns 1 if successful, 0 if an error occurred
-//
-
-int TXT_Init(void)
-{
-    int flags = 0;
-
-    if (SDL_Init(SDL_INIT_VIDEO) < 0)
-    {
-        return 0;
-    }
-
-    ChooseFont();
-
-    screen_image_w = TXT_SCREEN_W * font->w;
-    screen_image_h = TXT_SCREEN_H * font->h;
-
-    // If highdpi_font is selected, try to initialize high dpi rendering.
-    if (font == &highdpi_font)
-    {
-        flags |= SDL_WINDOW_ALLOW_HIGHDPI;
-    }
-
-    TXT_SDLWindow =
-        SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
-                         screen_image_w, screen_image_h, flags);
-
-    if (TXT_SDLWindow == NULL)
-        return 0;
-
-    renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_PRESENTVSYNC);
-
-    if (renderer == NULL)
-        renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_SOFTWARE);
-
-    if (renderer == NULL)
-        return 0;
-
-    // Special handling for OS X retina display. If we successfully set the
-    // highdpi flag, check the output size for the screen renderer. If we get
-    // the 2x doubled size we expect from a retina display, use the large font
-    // for drawing the screen.
-    if ((SDL_GetWindowFlags(TXT_SDLWindow) & SDL_WINDOW_ALLOW_HIGHDPI) != 0)
-    {
-        int render_w, render_h;
-
-        if (SDL_GetRendererOutputSize(renderer, &render_w, &render_h) == 0
-         && render_w >= TXT_SCREEN_W * large_font.w
-         && render_h >= TXT_SCREEN_H * large_font.h)
-        {
-            font = &large_font;
-            // Note that we deliberately do not update screen_image_{w,h}
-            // since these are the dimensions of textscreen image in screen
-            // coordinates, not pixels.
-        }
-    }
-
-    // Failed to initialize for high dpi (retina display) rendering? If so
-    // then use the normal resolution font instead.
-    if (font == &highdpi_font)
-    {
-        font = &normal_font;
-    }
-
-    // Instead, we draw everything into an intermediate 8-bit surface
-    // the same dimensions as the screen. SDL then takes care of all the
-    // 8->32 bit (or whatever depth) color conversions for us.
-    screenbuffer = SDL_CreateRGBSurface(0,
-                                        TXT_SCREEN_W * font->w,
-                                        TXT_SCREEN_H * font->h,
-                                        8, 0, 0, 0, 0);
-
-    SDL_LockSurface(screenbuffer);
-    SDL_SetPaletteColors(screenbuffer->format->palette, ega_colors, 0, 16);
-    SDL_UnlockSurface(screenbuffer);
-
-    screendata = malloc(TXT_SCREEN_W * TXT_SCREEN_H * 2);
-    memset(screendata, 0, TXT_SCREEN_W * TXT_SCREEN_H * 2);
-
-    return 1;
-}
-
-void TXT_Shutdown(void)
-{
-    free(screendata);
-    screendata = NULL;
-    SDL_FreeSurface(screenbuffer);
-    screenbuffer = NULL;
-    SDL_DestroyRenderer(renderer);
-    SDL_DestroyWindow(TXT_SDLWindow);
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
-
-void TXT_SetColor(txt_color_t color, int r, int g, int b)
-{
-    SDL_Color c = {r, g, b, 0xff};
-
-    SDL_LockSurface(screenbuffer);
-    SDL_SetPaletteColors(screenbuffer->format->palette, &c, color, 1);
-    SDL_UnlockSurface(screenbuffer);
-}
-
-unsigned char *TXT_GetScreenData(void)
-{
-    return screendata;
-}
-
-static inline void UpdateCharacter(int x, int y)
-{
-    unsigned char character;
-    const uint8_t *p;
-    unsigned char *s, *s1;
-    unsigned int bit;
-    int bg, fg;
-    unsigned int x1, y1;
-
-    p = &screendata[(y * TXT_SCREEN_W + x) * 2];
-    character = p[0];
-
-    fg = p[1] & 0xf;
-    bg = (p[1] >> 4) & 0xf;
-
-    if (bg & 0x8)
-    {
-        // blinking
-
-        bg &= ~0x8;
-
-        if (((SDL_GetTicks() / BLINK_PERIOD) % 2) == 0)
-        {
-            fg = bg;
-        }
-    }
-
-    // How many bytes per line?
-    p = &font->data[(character * font->w * font->h) / 8];
-    bit = 0;
-
-    s = ((unsigned char *) screenbuffer->pixels)
-      + (y * font->h * screenbuffer->pitch)
-      + (x * font->w);
-
-    for (y1=0; y1<font->h; ++y1)
-    {
-        s1 = s;
-
-        for (x1=0; x1<font->w; ++x1)
-        {
-            if (*p & (1 << bit))
-            {
-                *s1++ = fg;
-            }
-            else
-            {
-                *s1++ = bg;
-            }
-
-            ++bit;
-            if (bit == 8)
-            {
-                ++p;
-                bit = 0;
-            }
-        }
-
-        s += screenbuffer->pitch;
-    }
-}
-
-static int LimitToRange(int val, int min, int max)
-{
-    if (val < min)
-    {
-        return min;
-    }
-    else if (val > max)
-    {
-        return max;
-    }
-    else
-    {
-        return val;
-    }
-}
-
-static void GetDestRect(SDL_Rect *rect)
-{
-    int w, h;
-
-    SDL_GetRendererOutputSize(renderer, &w, &h);
-    rect->x = (w - screenbuffer->w) / 2;
-    rect->y = (h - screenbuffer->h) / 2;
-    rect->w = screenbuffer->w;
-    rect->h = screenbuffer->h;
-}
-
-void TXT_UpdateScreenArea(int x, int y, int w, int h)
-{
-    SDL_Texture *screentx;
-    SDL_Rect rect;
-    int x1, y1;
-    int x_end;
-    int y_end;
-
-    SDL_LockSurface(screenbuffer);
-
-    x_end = LimitToRange(x + w, 0, TXT_SCREEN_W);
-    y_end = LimitToRange(y + h, 0, TXT_SCREEN_H);
-    x = LimitToRange(x, 0, TXT_SCREEN_W);
-    y = LimitToRange(y, 0, TXT_SCREEN_H);
-
-    for (y1=y; y1<y_end; ++y1)
-    {
-        for (x1=x; x1<x_end; ++x1)
-        {
-            UpdateCharacter(x1, y1);
-        }
-    }
-
-    SDL_UnlockSurface(screenbuffer);
-
-    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
-
-    // TODO: This is currently creating a new texture every time we render
-    // the screen; find a more efficient way to do it.
-    screentx = SDL_CreateTextureFromSurface(renderer, screenbuffer);
-
-    SDL_RenderClear(renderer);
-    GetDestRect(&rect);
-    SDL_RenderCopy(renderer, screentx, NULL, &rect);
-    SDL_RenderPresent(renderer);
-
-    SDL_DestroyTexture(screentx);
-}
-
-void TXT_UpdateScreen(void)
-{
-    TXT_UpdateScreenArea(0, 0, TXT_SCREEN_W, TXT_SCREEN_H);
-}
-
-void TXT_GetMousePosition(int *x, int *y)
-{
-    int window_w, window_h;
-    int origin_x, origin_y;
-
-    SDL_GetMouseState(x, y);
-
-    // Translate mouse position from 'pixel' position into character position.
-    // We are working here in screen coordinates and not pixels, since this is
-    // what SDL_GetWindowSize() returns; we must calculate and subtract the
-    // origin position since we center the image within the window.
-    SDL_GetWindowSize(TXT_SDLWindow, &window_w, &window_h);
-    origin_x = (window_w - screen_image_w) / 2;
-    origin_y = (window_h - screen_image_h) / 2;
-    *x = ((*x - origin_x) * TXT_SCREEN_W) / screen_image_w;
-    *y = ((*y - origin_y) * TXT_SCREEN_H) / screen_image_h;
-
-    if (*x < 0)
-    {
-        *x = 0;
-    }
-    else if (*x >= TXT_SCREEN_W)
-    {
-        *x = TXT_SCREEN_W - 1;
-    }
-    if (*y < 0)
-    {
-        *y = 0;
-    }
-    else if (*y >= TXT_SCREEN_H)
-    {
-        *y = TXT_SCREEN_H - 1;
-    }
-}
-
-//
-// Translates the SDL key
-//
-
-// XXX: duplicate from doomtype.h
 #define arrlen(array) (sizeof(array) / sizeof(*array))
 
-static int TranslateScancode(SDL_Scancode scancode)
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static unsigned char *screendata;
+
+/* Unicode key mapping; see codepage.h. */
+
+static const short g_code_page_to_unicode[] = CODE_PAGE_TO_UNICODE;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Searches the desktop screen buffer to determine whether there are any
+ * blinking characters.
+ */
+
+static int txt_has_blinking_chars(void)
 {
-    switch (scancode)
+  int x;
+  int y;
+  unsigned char *p;
+
+  /* Check all characters in screen buffer */
+
+  for (y = 0; y < TXT_SCREEN_H; ++y)
     {
-        case SDL_SCANCODE_LCTRL:
-        case SDL_SCANCODE_RCTRL:
-            return KEY_RCTRL;
+      for (x = 0; x < TXT_SCREEN_W; ++x)
+        {
+          p = &screendata[(y * TXT_SCREEN_W + x) * 2];
 
-        case SDL_SCANCODE_LSHIFT:
-        case SDL_SCANCODE_RSHIFT:
-            return KEY_RSHIFT;
-
-        case SDL_SCANCODE_LALT:
-            return KEY_LALT;
-
-        case SDL_SCANCODE_RALT:
-            return KEY_RALT;
-
-        default:
-            if (scancode < arrlen(scancode_translate_table))
+          if (p[1] & 0x80)
             {
-                return scancode_translate_table[scancode];
-            }
-            else
-            {
-                return 0;
-            }
-    }
-}
-
-static int TranslateKeysym(const SDL_Keysym *sym)
-{
-    int translated;
-
-    // We cheat here and make use of TranslateScancode. The range of keys
-    // associated with printable characters is pretty contiguous, so if it's
-    // inside that range we want the localized version of the key instead.
-    translated = TranslateScancode(sym->scancode);
-
-    if (translated >= 0x20 && translated < 0x7f)
-    {
-        return sym->sym;
-    }
-    else
-    {
-        return translated;
-    }
-}
-
-// Convert an SDL button index to textscreen button index.
-//
-// Note special cases because 2 == mid in SDL, 3 == mid in textscreen/setup
-
-static int SDLButtonToTXTButton(int button)
-{
-    switch (button)
-    {
-        case SDL_BUTTON_LEFT:
-            return TXT_MOUSE_LEFT;
-        case SDL_BUTTON_RIGHT:
-            return TXT_MOUSE_RIGHT;
-        case SDL_BUTTON_MIDDLE:
-            return TXT_MOUSE_MIDDLE;
-        default:
-            return TXT_MOUSE_BASE + button + 1;
-    }
-}
-
-// Convert an SDL wheel motion to a textscreen button index.
-
-static int SDLWheelToTXTButton(const SDL_MouseWheelEvent *wheel)
-{
-    if (wheel->y <= 0)
-    {
-        return TXT_MOUSE_SCROLLDOWN;
-    }
-    else
-    {
-        return TXT_MOUSE_SCROLLUP;
-    }
-}
-
-static int MouseHasMoved(void)
-{
-    static int last_x = 0, last_y = 0;
-    int x, y;
-
-    TXT_GetMousePosition(&x, &y);
-
-    if (x != last_x || y != last_y)
-    {
-        last_x = x; last_y = y;
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-signed int TXT_GetChar(void)
-{
-    SDL_Event ev;
-
-    while (SDL_PollEvent(&ev))
-    {
-        // If there is an event callback, allow it to intercept this
-        // event.
-
-        if (event_callback != NULL)
-        {
-            if (event_callback(&ev, event_callback_data))
-            {
-                continue;
-            }
-        }
-
-        // Process the event.
-
-        switch (ev.type)
-        {
-            case SDL_MOUSEBUTTONDOWN:
-                if (ev.button.button < TXT_MAX_MOUSE_BUTTONS)
-                {
-                    return SDLButtonToTXTButton(ev.button.button);
-                }
-                break;
-
-            case SDL_MOUSEWHEEL:
-                return SDLWheelToTXTButton(&ev.wheel);
-
-            case SDL_KEYDOWN:
-                switch (input_mode)
-                {
-                    case TXT_INPUT_RAW:
-                        return TranslateScancode(ev.key.keysym.scancode);
-                    case TXT_INPUT_NORMAL:
-                        return TranslateKeysym(&ev.key.keysym);
-                    case TXT_INPUT_TEXT:
-                        // We ignore key inputs in this mode, except for a
-                        // few special cases needed during text input:
-                        if (ev.key.keysym.sym == SDLK_ESCAPE
-                         || ev.key.keysym.sym == SDLK_BACKSPACE
-                         || ev.key.keysym.sym == SDLK_RETURN)
-                        {
-                            return TranslateKeysym(&ev.key.keysym);
-                        }
-                        break;
-                }
-                break;
-
-            case SDL_TEXTINPUT:
-                if (input_mode == TXT_INPUT_TEXT)
-                {
-                    // TODO: Support input of more than just the first char?
-                    const char *p = ev.text.text;
-                    int result = TXT_DecodeUTF8(&p);
-                    // 0-127 is ASCII, but we map non-ASCII Unicode chars into
-                    // a higher range to avoid conflicts with special keys.
-                    return TXT_UNICODE_TO_KEY(result);
-                }
-                break;
-
-            case SDL_QUIT:
-                // Quit = escape
-                return 27;
-
-            case SDL_MOUSEMOTION:
-                if (MouseHasMoved())
-                {
-                    return 0;
-                }
-
-            default:
-                break;
-        }
-    }
-
-    return -1;
-}
-
-int TXT_GetModifierState(txt_modifier_t mod)
-{
-    SDL_Keymod state;
-
-    state = SDL_GetModState();
-
-    switch (mod)
-    {
-        case TXT_MOD_SHIFT:
-            return (state & KMOD_SHIFT) != 0;
-        case TXT_MOD_CTRL:
-            return (state & KMOD_CTRL) != 0;
-        case TXT_MOD_ALT:
-            return (state & KMOD_ALT) != 0;
-        default:
-            return 0;
-    }
-}
-
-int TXT_UnicodeCharacter(unsigned int c)
-{
-    unsigned int i;
-
-    // Check the code page mapping to see if this character maps
-    // to anything.
-
-    for (i = 0; i < arrlen(code_page_to_unicode); ++i)
-    {
-        if (code_page_to_unicode[i] == c)
-        {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-// Returns true if the given UTF8 key name is printable to the screen.
-static int PrintableName(const char *s)
-{
-    const char *p;
-    unsigned int c;
-
-    p = s;
-    while (*p != '\0')
-    {
-        c = TXT_DecodeUTF8(&p);
-        if (TXT_UnicodeCharacter(c) < 0)
-        {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-static const char *NameForKey(int key)
-{
-    const char *result;
-    int i;
-
-    // Overrides purely for aesthetical reasons, so that default
-    // window accelerator keys match those of setup.exe.
-    switch (key)
-    {
-        case KEY_ESCAPE: return "ESC";
-        case KEY_ENTER:  return "ENTER";
-        default:
-            break;
-    }
-
-    // This key presumably maps to a scan code that is listed in the
-    // translation table. Find which mapping and once we have a scancode,
-    // we can convert it into a virtual key, then a string via SDL.
-    for (i = 0; i < arrlen(scancode_translate_table); ++i)
-    {
-        if (scancode_translate_table[i] == key)
-        {
-            result = SDL_GetKeyName(SDL_GetKeyFromScancode(i));
-            if (TXT_UTF8_Strlen(result) > 6 || !PrintableName(result))
-            {
-                break;
-            }
-            return result;
-        }
-    }
-
-    // Use US English fallback names, if the localized name is too long,
-    // not found in the scancode table, or contains unprintable chars
-    // (non-extended ASCII character set):
-    for (i = 0; i < arrlen(key_names); ++i)
-    {
-        if (key_names[i].key == key)
-        {
-            return key_names[i].name;
-        }
-    }
-
-    return NULL;
-}
-
-void TXT_GetKeyDescription(int key, char *buf, size_t buf_len)
-{
-    const char *keyname;
-    int i;
-
-    keyname = NameForKey(key);
-
-    if (keyname != NULL)
-    {
-        TXT_StringCopy(buf, keyname, buf_len);
-
-        // Key description should be all-uppercase to match setup.exe.
-        for (i = 0; buf[i] != '\0'; ++i)
-        {
-            buf[i] = toupper(buf[i]);
-        }
-    }
-    else
-    {
-        TXT_snprintf(buf, buf_len, "??%i", key);
-    }
-}
-
-// Searches the desktop screen buffer to determine whether there are any
-// blinking characters.
-
-int TXT_ScreenHasBlinkingChars(void)
-{
-    int x, y;
-    unsigned char *p;
-
-    // Check all characters in screen buffer
-
-    for (y=0; y<TXT_SCREEN_H; ++y)
-    {
-        for (x=0; x<TXT_SCREEN_W; ++x) 
-        {
-            p = &screendata[(y * TXT_SCREEN_W + x) * 2];
-
-            if (p[1] & 0x80)
-            {
-                // This character is blinking
-
-                return 1;
+              return 1; /* This character is blinking */
             }
         }
     }
 
-    // None found
+  /* None found */
 
-    return 0;
+  return 0;
 }
 
-// Sleeps until an event is received, the screen needs to be redrawn, 
-// or until timeout expires (if timeout != 0)
-
-void TXT_Sleep(int timeout)
+static void txt_string_concat(char *dest, const char *src, size_t dest_len)
 {
-    unsigned int start_time;
+  size_t offset;
 
-    if (TXT_ScreenHasBlinkingChars())
+  offset = strlen(dest);
+  if (offset > dest_len)
     {
-        int time_to_next_blink;
+      offset = dest_len;
+    }
 
-        time_to_next_blink = BLINK_PERIOD - (SDL_GetTicks() % BLINK_PERIOD);
+  txt_string_copy(dest + offset, src, dest_len - offset);
+}
 
-        // There are blinking characters on the screen, so we 
-        // must time out after a while
-       
-        if (timeout == 0 || timeout > time_to_next_blink)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Initialize text mode screen
+ *
+ * Returns 1 if successful, 0 if an error occurred
+ */
+
+int txt_init(void)
+{
+  return 1;
+}
+
+void txt_shutdown(void)
+{
+}
+
+void txt_set_colour(txt_color_t color, int r, int g, int b)
+{
+}
+
+unsigned char *txt_get_screen_data(void)
+{
+  return screendata;
+}
+
+void txt_update_screen_area(int x, int y, int w, int h)
+{
+}
+
+void txt_update_screen(void)
+{
+  txt_update_screen_area(0, 0, TXT_SCREEN_W, TXT_SCREEN_H);
+}
+
+void txt_get_mouse_position(int *x, int *y)
+{
+}
+
+signed int txt_getchar(void)
+{
+  return -1;
+}
+
+int txt_get_modifier_state(txt_modifier_t mod)
+{
+  return 0;
+}
+
+int txt_unicode_character(unsigned int c)
+{
+  unsigned int i;
+
+  /* Check the code page mapping to see if this character maps
+   * to anything.
+   */
+
+  for (i = 0; i < arrlen(g_code_page_to_unicode); ++i)
+    {
+      if (g_code_page_to_unicode[i] == c)
         {
-            // Add one so it is always positive
-
-            timeout = time_to_next_blink + 1;
+          return i;
         }
     }
 
-    if (timeout == 0)
-    {
-        // We can just wait forever until an event occurs
-
-        SDL_WaitEvent(NULL);
-    }
-    else
-    {
-        // Sit in a busy loop until the timeout expires or we have to
-        // redraw the blinking screen
-
-        start_time = SDL_GetTicks();
-
-        while (SDL_GetTicks() < start_time + timeout)
-        {
-            if (SDL_PollEvent(NULL) != 0)
-            {
-                // Received an event, so stop waiting
-
-                break;
-            }
-
-            // Don't hog the CPU
-
-            SDL_Delay(1);
-        }
-    }
+  return -1;
 }
 
-void TXT_SetInputMode(txt_input_mode_t mode)
+void txt_get_key_description(int key, char *buf, size_t buf_len)
 {
-    if (mode == TXT_INPUT_TEXT && !SDL_IsTextInputActive())
+}
+
+/* Sleeps until an event is received, the screen needs to be redrawn,
+ * or until timeout expires (if timeout != 0)
+ */
+
+void txt_sleep(int timeout)
+{
+}
+
+void txt_set_input_mode(txt_input_mode_t mode)
+{
+}
+
+void txt_set_window_title(const char *title)
+{
+}
+
+void txt_sdl_set_event_callback(void *user_data)
+{
+}
+
+/* Safe string functions. */
+
+void txt_string_copy(char *dest, const char *src, size_t dest_len)
+{
+  if (dest_len < 1)
     {
-        SDL_StartTextInput();
-    }
-    else if (SDL_IsTextInputActive() && mode != TXT_INPUT_TEXT)
-    {
-        SDL_StopTextInput();
+      return;
     }
 
-    input_mode = mode;
+  dest[dest_len - 1] = '\0';
+  strncpy(dest, src, dest_len - 1);
 }
 
-void TXT_SetWindowTitle(const char *title)
-{
-    SDL_SetWindowTitle(TXT_SDLWindow, title);
-}
+/* Safe, portable vsnprintf(). */
 
-void TXT_SDL_SetEventCallback(TxtSDLEventCallbackFunc callback, void *user_data)
+int txt_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args)
 {
-    event_callback = callback;
-    event_callback_data = user_data;
-}
+  int result;
 
-// Safe string functions.
-
-void TXT_StringCopy(char *dest, const char *src, size_t dest_len)
-{
-    if (dest_len < 1)
+  if (buf_len < 1)
     {
-        return;
+      return 0;
     }
 
-    dest[dest_len - 1] = '\0';
-    strncpy(dest, src, dest_len - 1);
-}
+  /* Windows (and other OSes?) has a vsnprintf() that doesn't always
+   * append a trailing \0. So we must do it, and write into a buffer
+   * that is one byte shorter; otherwise this function is unsafe.
+   */
 
-void TXT_StringConcat(char *dest, const char *src, size_t dest_len)
-{
-    size_t offset;
+  result = vsnprintf(buf, buf_len, s, args);
 
-    offset = strlen(dest);
-    if (offset > dest_len)
+  /* If truncated, change the final char in the buffer to a \0.
+   * A negative result indicates a truncated buffer on Windows.
+   */
+
+  if (result < 0 || result >= buf_len)
     {
-        offset = dest_len;
+      buf[buf_len - 1] = '\0';
+      result = buf_len - 1;
     }
 
-    TXT_StringCopy(dest + offset, src, dest_len - offset);
+  return result;
 }
 
-// On Windows, vsnprintf() is _vsnprintf().
-#ifdef _WIN32
-#if _MSC_VER < 1400 /* not needed for Visual Studio 2008 */
-#define vsnprintf _vsnprintf
-#endif
-#endif
+/* Safe, portable snprintf(). */
 
-// Safe, portable vsnprintf().
-int TXT_vsnprintf(char *buf, size_t buf_len, const char *s, va_list args)
+int txt_snprintf(char *buf, size_t buf_len, const char *s, ...)
 {
-    int result;
-
-    if (buf_len < 1)
-    {
-        return 0;
-    }
-
-    // Windows (and other OSes?) has a vsnprintf() that doesn't always
-    // append a trailing \0. So we must do it, and write into a buffer
-    // that is one byte shorter; otherwise this function is unsafe.
-    result = vsnprintf(buf, buf_len, s, args);
-
-    // If truncated, change the final char in the buffer to a \0.
-    // A negative result indicates a truncated buffer on Windows.
-    if (result < 0 || result >= buf_len)
-    {
-        buf[buf_len - 1] = '\0';
-        result = buf_len - 1;
-    }
-
-    return result;
+  va_list args;
+  int result;
+  va_start(args, s);
+  result = txt_vsnprintf(buf, buf_len, s, args);
+  va_end(args);
+  return result;
 }
-
-// Safe, portable snprintf().
-int TXT_snprintf(char *buf, size_t buf_len, const char *s, ...)
-{
-    va_list args;
-    int result;
-    va_start(args, s);
-    result = TXT_vsnprintf(buf, buf_len, s, args);
-    va_end(args);
-    return result;
-}
-
diff --git a/games/NXDoom/textscreen/txt_sdl.h b/games/NXDoom/textscreen/txt_sdl.h
index 579905510..1de6af329 100644
--- a/games/NXDoom/textscreen/txt_sdl.h
+++ b/games/NXDoom/textscreen/txt_sdl.h
@@ -1,45 +1,41 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
-//
-// Text mode emulation in SDL
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_sdl.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * Text mode emulation in SDL
+ *
+ ****************************************************************************/
 
 #ifndef TXT_SDL_H
 #define TXT_SDL_H
 
-// The textscreen API itself doesn't need SDL; however, SDL needs its
-// headers included where main() is defined.
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-#include "SDL.h"
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-// Event callback function type: a function of this type can be used
-// to intercept events in the textscreen event processing loop.  
-// Returning 1 will cause the event to be eaten; the textscreen code
-// will not see it.
+/* Set a callback function to call in the SDL event loop.  Useful for
+ * intercepting events.  Pass callback=NULL to clear an existing
+ * callback function.
+ * user_data is a void pointer to be passed to the callback function.
+ */
 
-typedef int (*TxtSDLEventCallbackFunc)(SDL_Event *event, void *user_data);
-
-// Set a callback function to call in the SDL event loop.  Useful for
-// intercepting events.  Pass callback=NULL to clear an existing
-// callback function.
-// user_data is a void pointer to be passed to the callback function.
-
-void TXT_SDL_SetEventCallback(TxtSDLEventCallbackFunc callback, void *user_data);
-
-
-extern SDL_Window *TXT_SDLWindow;
-
-
-#endif /* #ifndef TXT_SDL_H */
+void txt_sdl_set_event_callback(void *user_data);
 
+#endif /* TXT_SDL_H */
diff --git a/games/NXDoom/textscreen/txt_separator.c b/games/NXDoom/textscreen/txt_separator.c
index 1f30fc648..fc0e1f6eb 100644
--- a/games/NXDoom/textscreen/txt_separator.c
+++ b/games/NXDoom/textscreen/txt_separator.c
@@ -1,114 +1,145 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_separator.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "txt_separator.h"
 #include "txt_gui.h"
 #include "txt_io.h"
 #include "txt_main.h"
+#include "txt_separator.h"
 #include "txt_utf8.h"
 #include "txt_window.h"
 
-static void TXT_SeparatorSizeCalc(TXT_UNCAST_ARG(separator))
-{
-    TXT_CAST_ARG(txt_separator_t, separator);
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    if (separator->label != NULL)
-    {
-        // Minimum width is the string length + two spaces for padding
+static void txt_separator_size_calc(TXT_UNCAST_ARG(separator));
+static void txt_separator_drawer(TXT_UNCAST_ARG(separator));
+static void txt_separator_destructor(TXT_UNCAST_ARG(separator));
 
-        separator->widget.w = TXT_UTF8_Strlen(separator->label) + 2;
-    }
-    else
-    {
-        separator->widget.w = 0;
-    }
-
-    separator->widget.h = 1;
-}
-
-static void TXT_SeparatorDrawer(TXT_UNCAST_ARG(separator))
-{
-    TXT_CAST_ARG(txt_separator_t, separator);
-    int x, y;
-    int w;
-
-    w = separator->widget.w;
-
-    TXT_GetXY(&x, &y);
-
-    // Draw separator.  Go back one character and draw two extra
-    // to overlap the window borders.
-
-    TXT_DrawSeparator(x-2, y, w + 4);
-
-    if (separator->label != NULL)
-    {
-        TXT_GotoXY(x, y);
-
-        TXT_FGColor(TXT_COLOR_BRIGHT_GREEN);
-        TXT_DrawString(" ");
-        TXT_DrawString(separator->label);
-        TXT_DrawString(" ");
-    }
-}
-
-static void TXT_SeparatorDestructor(TXT_UNCAST_ARG(separator))
-{
-    TXT_CAST_ARG(txt_separator_t, separator);
-
-    free(separator->label);
-}
-
-void TXT_SetSeparatorLabel(txt_separator_t *separator, const char *label)
-{
-    free(separator->label);
-
-    if (label != NULL)
-    {
-        separator->label = strdup(label);
-    }
-    else
-    {
-        separator->label = NULL;
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_separator_class =
 {
-    TXT_NeverSelectable,
-    TXT_SeparatorSizeCalc,
-    TXT_SeparatorDrawer,
-    NULL,
-    TXT_SeparatorDestructor,
-    NULL,
-    NULL,
+  txt_never_selectable,
+  txt_separator_size_calc,
+  txt_separator_drawer,
+  NULL,
+  txt_separator_destructor,
+  NULL,
+  NULL,
 };
 
-txt_separator_t *TXT_NewSeparator(const char *label)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_separator_size_calc(TXT_UNCAST_ARG(separator))
 {
-    txt_separator_t *separator;
+  TXT_CAST_ARG(txt_separator_t, separator);
 
-    separator = malloc(sizeof(txt_separator_t));
+  if (separator->label != NULL)
+    {
+      /* Minimum width is the string length + two spaces for padding */
 
-    TXT_InitWidget(separator, &txt_separator_class);
+      separator->widget.w = txt_utf8_strlen(separator->label) + 2;
+    }
+  else
+    {
+      separator->widget.w = 0;
+    }
 
-    separator->label = NULL;
-    TXT_SetSeparatorLabel(separator, label);
-
-    return separator;
+  separator->widget.h = 1;
 }
 
+static void txt_separator_drawer(TXT_UNCAST_ARG(separator))
+{
+  TXT_CAST_ARG(txt_separator_t, separator);
+  int x;
+  int y;
+  int w;
+
+  w = separator->widget.w;
+
+  txt_get_xy(&x, &y);
+
+  /* Draw separator.  Go back one character and draw two extra
+   * to overlap the window borders.
+   */
+
+  txt_draw_separator(x - 2, y, w + 4);
+
+  if (separator->label != NULL)
+    {
+      txt_goto_xy(x, y);
+
+      txt_fgcolour(TXT_COLOR_BRIGHT_GREEN);
+      txt_draw_string(" ");
+      txt_draw_string(separator->label);
+      txt_draw_string(" ");
+    }
+}
+
+static void txt_separator_destructor(TXT_UNCAST_ARG(separator))
+{
+  TXT_CAST_ARG(txt_separator_t, separator);
+
+  free(separator->label);
+}
+
+static void txt_set_separator_label(txt_separator_t *separator,
+                                    const char *label)
+{
+  free(separator->label);
+
+  if (label != NULL)
+    {
+      separator->label = strdup(label);
+    }
+  else
+    {
+      separator->label = NULL;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_separator_t *txt_new_separator(const char *label)
+{
+  txt_separator_t *separator;
+
+  separator = malloc(sizeof(txt_separator_t));
+
+  txt_init_widget(separator, &txt_separator_class);
+
+  separator->label = NULL;
+  txt_set_separator_label(separator, label);
+
+  return separator;
+}
diff --git a/games/NXDoom/textscreen/txt_separator.h b/games/NXDoom/textscreen/txt_separator.h
index 665c5a346..79be2f248 100644
--- a/games/NXDoom/textscreen/txt_separator.h
+++ b/games/NXDoom/textscreen/txt_separator.h
@@ -1,28 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_separator.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_SEPARATOR_H
 #define TXT_SEPARATOR_H
 
-/**
- * @file txt_separator.h
- *
- * Horizontal separator widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Horizontal separator.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Horizontal separator.
  *
  * A horizontal separator appears as a horizontal line divider across
  * the length of the window in which it is added.  An optional label
@@ -30,18 +38,22 @@
  * related controls.
  */
 
-typedef struct txt_separator_s txt_separator_t;
-
-#include "txt_widget.h"
-
 struct txt_separator_s
 {
-    txt_widget_t widget;
-    char *label;
+  txt_widget_t widget;
+  char *label;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern txt_widget_class_t txt_separator_class;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new horizontal separator widget.
  *
@@ -50,16 +62,6 @@ extern txt_widget_class_t txt_separator_class;
  * @return              The new separator widget.
  */
 
-txt_separator_t *TXT_NewSeparator(const char *label);
-
-/**
- * Change the label on a separator.
- *
- * @param separator     The separator.
- * @param label         The new label (UTF-8 format).
- */
-
-void TXT_SetSeparatorLabel(txt_separator_t *separator, const char *label);
-
-#endif /* #ifndef TXT_SEPARATOR_H */
+txt_separator_t *txt_new_separator(const char *label);
 
+#endif /* TXT_SEPARATOR_H */
diff --git a/games/NXDoom/textscreen/txt_spinctrl.c b/games/NXDoom/textscreen/txt_spinctrl.c
index 2a93e96ee..2838cb49b 100644
--- a/games/NXDoom/textscreen/txt_spinctrl.c
+++ b/games/NXDoom/textscreen/txt_spinctrl.c
@@ -1,426 +1,460 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_spinctrl.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include "doomkeys.h"
 
-#include "txt_spinctrl.h"
 #include "txt_gui.h"
 #include "txt_io.h"
 #include "txt_main.h"
+#include "txt_spinctrl.h"
 #include "txt_utf8.h"
 #include "txt_window.h"
 
-// Generate the format string to be used for displaying floats
-
-static void FloatFormatString(float step, char *buf, size_t buf_len)
-{
-    int precision;
-
-    precision = (int) ceil(-log(step) / log(10));
-
-    if (precision > 0)
-    {
-        TXT_snprintf(buf, buf_len, "%%.%if", precision);
-    }
-    else
-    {
-        TXT_StringCopy(buf, "%.1f", buf_len);
-    }
-}
-
-// Number of characters needed to represent a character 
-
-static unsigned int IntWidth(int val)
-{
-    char buf[25];
-
-    TXT_snprintf(buf, sizeof(buf), "%i", val);
-
-    return strlen(buf);
-}
-
-static unsigned int FloatWidth(float val, float step)
-{
-    unsigned int precision;
-    unsigned int result;
-
-    // Calculate the width of the int value
-
-    result = IntWidth((int) val);
-
-    // Add a decimal part if the precision specifies it
-
-    precision = (unsigned int) ceil(-log(step) / log(10));
-
-    if (precision > 0)
-    {
-        result += precision + 1;
-    }    
-
-    return result;
-}
-
-// Returns the minimum width of the input box
-
-static unsigned int SpinControlWidth(txt_spincontrol_t *spincontrol)
-{
-    unsigned int minw, maxw;
-
-    switch (spincontrol->type)
-    {
-        case TXT_SPINCONTROL_FLOAT:
-            minw = FloatWidth(spincontrol->min.f, spincontrol->step.f);
-            maxw = FloatWidth(spincontrol->max.f, spincontrol->step.f);
-            break;
-
-        default:
-        case TXT_SPINCONTROL_INT:
-            minw = IntWidth(spincontrol->min.i);
-            maxw = IntWidth(spincontrol->max.i);
-            break;
-
-    }
-    
-    // Choose the wider of the two values.  Add one so that there is always
-    // space for the cursor when editing.
-
-    if (minw > maxw)
-    {
-        return minw;
-    }
-    else
-    {
-        return maxw;
-    }
-}
-
-static void TXT_SpinControlSizeCalc(TXT_UNCAST_ARG(spincontrol))
-{
-    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
-
-    spincontrol->widget.w = SpinControlWidth(spincontrol) + 5;
-    spincontrol->widget.h = 1;
-}
-
-static void SetBuffer(txt_spincontrol_t *spincontrol)
-{
-    char format[25];
-
-    switch (spincontrol->type)
-    {
-        case TXT_SPINCONTROL_INT:
-            TXT_snprintf(spincontrol->buffer, spincontrol->buffer_len,
-                         "%i", spincontrol->value->i);
-            break;
-
-        case TXT_SPINCONTROL_FLOAT:
-            FloatFormatString(spincontrol->step.f, format, sizeof(format));
-            TXT_snprintf(spincontrol->buffer, spincontrol->buffer_len,
-                         format, spincontrol->value->f);
-            break;
-    }
-}
-
-static void TXT_SpinControlDrawer(TXT_UNCAST_ARG(spincontrol))
-{
-    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
-    unsigned int i;
-    unsigned int padding;
-    txt_saved_colors_t colors;
-    int bw;
-    int focused;
-
-    focused = spincontrol->widget.focused;
-
-    TXT_SaveColors(&colors);
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-    TXT_DrawCodePageString("\x1b ");
-
-    TXT_RestoreColors(&colors);
-
-    // Choose background color
-
-    if (focused && spincontrol->editing)
-    {
-        TXT_BGColor(TXT_COLOR_BLACK, 0);
-    }
-    else
-    {
-        TXT_SetWidgetBG(spincontrol);
-    }
-
-    if (!spincontrol->editing)
-    {
-        SetBuffer(spincontrol);
-    }
-
-    i = 0;
-
-    bw = TXT_UTF8_Strlen(spincontrol->buffer);
-    padding = spincontrol->widget.w - bw - 4;
-
-    while (i < padding)
-    {
-        TXT_DrawString(" ");
-        ++i;
-    }
-
-    TXT_DrawString(spincontrol->buffer);
-    i += bw;
-
-    while (i < spincontrol->widget.w - 4)
-    {
-        TXT_DrawString(" ");
-        ++i;
-    }
-
-    TXT_RestoreColors(&colors);
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-    TXT_DrawCodePageString(" \x1a");
-}
-
-static void TXT_SpinControlDestructor(TXT_UNCAST_ARG(spincontrol))
-{
-    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
-
-    free(spincontrol->buffer);
-}
-
-static void AddCharacter(txt_spincontrol_t *spincontrol, int key)
-{
-    if (TXT_UTF8_Strlen(spincontrol->buffer) < SpinControlWidth(spincontrol)
-     && strlen(spincontrol->buffer) < spincontrol->buffer_len - 2)
-    {
-        spincontrol->buffer[strlen(spincontrol->buffer) + 1] = '\0';
-        spincontrol->buffer[strlen(spincontrol->buffer)] = key;
-    }
-}
-
-static void Backspace(txt_spincontrol_t *spincontrol)
-{
-    if (TXT_UTF8_Strlen(spincontrol->buffer) > 0)
-    {
-        spincontrol->buffer[strlen(spincontrol->buffer) - 1] = '\0';
-    }
-}
-
-static void EnforceLimits(txt_spincontrol_t *spincontrol)
-{
-    switch (spincontrol->type)
-    {
-        case TXT_SPINCONTROL_INT:
-            if (spincontrol->value->i > spincontrol->max.i)
-                spincontrol->value->i = spincontrol->max.i;
-            else if (spincontrol->value->i < spincontrol->min.i)
-                spincontrol->value->i = spincontrol->min.i;
-            break;
-
-        case TXT_SPINCONTROL_FLOAT:
-            if (spincontrol->value->f > spincontrol->max.f)
-                spincontrol->value->f = spincontrol->max.f;
-            else if (spincontrol->value->f < spincontrol->min.f)
-                spincontrol->value->f = spincontrol->min.f;
-            break;
-    }
-}
-
-static void FinishEditing(txt_spincontrol_t *spincontrol)
-{
-    switch (spincontrol->type)
-    {
-        case TXT_SPINCONTROL_INT:
-            spincontrol->value->i = atoi(spincontrol->buffer);
-            break;
-
-        case TXT_SPINCONTROL_FLOAT:
-            spincontrol->value->f = (float) atof(spincontrol->buffer);
-            break;
-    }
-
-    spincontrol->editing = 0;
-    EnforceLimits(spincontrol);
-}
-
-static int TXT_SpinControlKeyPress(TXT_UNCAST_ARG(spincontrol), int key)
-{
-    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
-
-    // Enter to enter edit mode
-
-    if (spincontrol->editing)
-    {
-        if (key == KEY_ENTER)
-        {
-            FinishEditing(spincontrol);
-            return 1;
-        }
-
-        if (key == KEY_ESCAPE)
-        {
-            // Abort without saving value
-            spincontrol->editing = 0;
-            return 1;
-        }
-
-        if (isdigit(key) || key == '-' || key == '.')
-        {
-            AddCharacter(spincontrol, key);
-            return 1;
-        }
-
-        if (key == KEY_BACKSPACE)
-        {
-            Backspace(spincontrol);
-            return 1;
-        }
-    }
-    else
-    {
-        // Non-editing mode
-
-        if (key == KEY_ENTER)
-        {
-            spincontrol->editing = 1;
-            TXT_StringCopy(spincontrol->buffer, "", spincontrol->buffer_len);
-            return 1;
-        }
-        if (key == KEY_LEFTARROW)
-        {
-            switch (spincontrol->type)
-            {
-                case TXT_SPINCONTROL_INT:
-                    spincontrol->value->i -= spincontrol->step.i;
-                    break;
-
-                case TXT_SPINCONTROL_FLOAT:
-                    spincontrol->value->f -= spincontrol->step.f;
-                    break;
-            }
-
-            EnforceLimits(spincontrol);
-
-            return 1;
-        }
-        
-        if (key == KEY_RIGHTARROW)
-        {
-            switch (spincontrol->type)
-            {
-                case TXT_SPINCONTROL_INT:
-                    spincontrol->value->i += spincontrol->step.i;
-                    break;
-
-                case TXT_SPINCONTROL_FLOAT:
-                    spincontrol->value->f += spincontrol->step.f;
-                    break;
-            }
-
-            EnforceLimits(spincontrol);
-
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-static void TXT_SpinControlMousePress(TXT_UNCAST_ARG(spincontrol),
-                                   int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
-    unsigned int rel_x;
-
-    rel_x = x - spincontrol->widget.x;
-
-    if (rel_x < 2)
-    {
-        TXT_SpinControlKeyPress(spincontrol, KEY_LEFTARROW);
-    }
-    else if (rel_x >= spincontrol->widget.w - 2)
-    {
-        TXT_SpinControlKeyPress(spincontrol, KEY_RIGHTARROW);
-    }
-}
-
-static void TXT_SpinControlFocused(TXT_UNCAST_ARG(spincontrol), int focused)
-{
-    TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
-
-    FinishEditing(spincontrol);
-}
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void txt_spin_control_size_calc(TXT_UNCAST_ARG(spincontrol));
+static void txt_spin_control_drawer(TXT_UNCAST_ARG(spincontrol));
+static int txt_spincontrol_keypress(TXT_UNCAST_ARG(spincontrol), int key);
+static void txt_spin_control_destructor(TXT_UNCAST_ARG(spincontrol));
+static void txt_spincontrol_mousepress(TXT_UNCAST_ARG(spincontrol), int x,
+                                      int y, int b);
+static void txt_spincontrol_focused(TXT_UNCAST_ARG(spincontrol),
+                                    int focused);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_spincontrol_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_SpinControlSizeCalc,
-    TXT_SpinControlDrawer,
-    TXT_SpinControlKeyPress,
-    TXT_SpinControlDestructor,
-    TXT_SpinControlMousePress,
-    NULL,
-    TXT_SpinControlFocused,
+  txt_always_selectable,
+  txt_spin_control_size_calc,
+  txt_spin_control_drawer,
+  txt_spincontrol_keypress,
+  txt_spin_control_destructor,
+  txt_spincontrol_mousepress,
+  NULL,
+  txt_spincontrol_focused,
 };
 
-static txt_spincontrol_t *TXT_BaseSpinControl(void)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Generate the format string to be used for displaying floats */
+
+static void float_format_string(float step, char *buf, size_t buf_len)
 {
-    txt_spincontrol_t *spincontrol;
+  int precision;
 
-    spincontrol = malloc(sizeof(txt_spincontrol_t));
+  precision = (int)ceil(-log(step) / log(10));
 
-    TXT_InitWidget(spincontrol, &txt_spincontrol_class);
-    spincontrol->buffer_len = 25;
-    spincontrol->buffer = malloc(spincontrol->buffer_len);
-    TXT_StringCopy(spincontrol->buffer, "", spincontrol->buffer_len);
-    spincontrol->editing = 0;
-
-    return spincontrol;
+  if (precision > 0)
+    {
+      txt_snprintf(buf, buf_len, "%%.%if", precision);
+    }
+  else
+    {
+      txt_string_copy(buf, "%.1f", buf_len);
+    }
 }
 
-txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max)
+/* Number of characters needed to represent a character */
+
+static unsigned int int_width(int val)
 {
-    txt_spincontrol_t *spincontrol;
+  char buf[25];
 
-    spincontrol = TXT_BaseSpinControl();
-    spincontrol->type = TXT_SPINCONTROL_INT;
-    spincontrol->value = (void *) value;
-    spincontrol->min.i = min;
-    spincontrol->max.i = max;
-    spincontrol->step.i = 1;
-    SetBuffer(spincontrol);
+  txt_snprintf(buf, sizeof(buf), "%i", val);
 
-    return spincontrol;
+  return strlen(buf);
 }
 
-txt_spincontrol_t *TXT_NewFloatSpinControl(float *value, float min, float max)
+static unsigned int float_width(float val, float step)
 {
-    txt_spincontrol_t *spincontrol;
+  unsigned int precision;
+  unsigned int result;
 
-    spincontrol = TXT_BaseSpinControl();
-    spincontrol->type = TXT_SPINCONTROL_FLOAT;
-    spincontrol->value = (void *) value;
-    spincontrol->min.f = min;
-    spincontrol->max.f = max;
-    spincontrol->step.f = 0.1f;
-    SetBuffer(spincontrol);
+  /* Calculate the width of the int value */
 
-    return spincontrol;
+  result = int_width((int)val);
+
+  /* Add a decimal part if the precision specifies it */
+
+  precision = (unsigned int)ceil(-log(step) / log(10));
+
+  if (precision > 0)
+    {
+      result += precision + 1;
+    }
+
+  return result;
 }
 
+/* Returns the minimum width of the input box */
+
+static unsigned int spin_control_width(txt_spincontrol_t *spincontrol)
+{
+  unsigned int minw;
+  unsigned int maxw;
+
+  switch (spincontrol->type)
+    {
+    case TXT_SPINCONTROL_FLOAT:
+      minw = float_width(spincontrol->min.f, spincontrol->step.f);
+      maxw = float_width(spincontrol->max.f, spincontrol->step.f);
+      break;
+
+    default:
+    case TXT_SPINCONTROL_INT:
+      minw = int_width(spincontrol->min.i);
+      maxw = int_width(spincontrol->max.i);
+      break;
+    }
+
+  /* Choose the wider of the two values.  Add one so that there is always
+   * space for the cursor when editing.
+   */
+
+  if (minw > maxw)
+    {
+      return minw;
+    }
+  else
+    {
+      return maxw;
+    }
+}
+
+static void txt_spin_control_size_calc(TXT_UNCAST_ARG(spincontrol))
+{
+  TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+  spincontrol->widget.w = spin_control_width(spincontrol) + 5;
+  spincontrol->widget.h = 1;
+}
+
+static void set_buffer(txt_spincontrol_t *spincontrol)
+{
+  char format[25];
+
+  switch (spincontrol->type)
+    {
+    case TXT_SPINCONTROL_INT:
+      txt_snprintf(spincontrol->buffer, spincontrol->buffer_len, "%i",
+                   spincontrol->value->i);
+      break;
+
+    case TXT_SPINCONTROL_FLOAT:
+      float_format_string(spincontrol->step.f, format, sizeof(format));
+      txt_snprintf(spincontrol->buffer, spincontrol->buffer_len, format,
+                   spincontrol->value->f);
+      break;
+    }
+}
+
+static void txt_spin_control_drawer(TXT_UNCAST_ARG(spincontrol))
+{
+  TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+  unsigned int i;
+  unsigned int padding;
+  txt_saved_colors_t colors;
+  int bw;
+  int focused;
+
+  focused = spincontrol->widget.focused;
+
+  txt_save_colours(&colors);
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+  txt_draw_code_page_string("\x1b ");
+
+  txt_restore_colours(&colors);
+
+  /* Choose background color */
+
+  if (focused && spincontrol->editing)
+    {
+      txt_bgcolour(TXT_COLOR_BLACK, 0);
+    }
+  else
+    {
+      txt_set_widget_bg(spincontrol);
+    }
+
+  if (!spincontrol->editing)
+    {
+      set_buffer(spincontrol);
+    }
+
+  i = 0;
+
+  bw = txt_utf8_strlen(spincontrol->buffer);
+  padding = spincontrol->widget.w - bw - 4;
+
+  while (i < padding)
+    {
+      txt_draw_string(" ");
+      ++i;
+    }
+
+  txt_draw_string(spincontrol->buffer);
+  i += bw;
+
+  while (i < spincontrol->widget.w - 4)
+    {
+      txt_draw_string(" ");
+      ++i;
+    }
+
+  txt_restore_colours(&colors);
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+  txt_draw_code_page_string(" \x1a");
+}
+
+static void txt_spin_control_destructor(TXT_UNCAST_ARG(spincontrol))
+{
+  TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+  free(spincontrol->buffer);
+}
+
+static void add_character(txt_spincontrol_t *spincontrol, int key)
+{
+  if (txt_utf8_strlen(spincontrol->buffer) <
+          spin_control_width(spincontrol) &&
+      strlen(spincontrol->buffer) < spincontrol->buffer_len - 2)
+    {
+      spincontrol->buffer[strlen(spincontrol->buffer) + 1] = '\0';
+      spincontrol->buffer[strlen(spincontrol->buffer)] = key;
+    }
+}
+
+static void backspace(txt_spincontrol_t *spincontrol)
+{
+  if (txt_utf8_strlen(spincontrol->buffer) > 0)
+    {
+      spincontrol->buffer[strlen(spincontrol->buffer) - 1] = '\0';
+    }
+}
+
+static void enforce_limits(txt_spincontrol_t *spincontrol)
+{
+  switch (spincontrol->type)
+    {
+    case TXT_SPINCONTROL_INT:
+      if (spincontrol->value->i > spincontrol->max.i)
+        spincontrol->value->i = spincontrol->max.i;
+      else if (spincontrol->value->i < spincontrol->min.i)
+        spincontrol->value->i = spincontrol->min.i;
+      break;
+
+    case TXT_SPINCONTROL_FLOAT:
+      if (spincontrol->value->f > spincontrol->max.f)
+        spincontrol->value->f = spincontrol->max.f;
+      else if (spincontrol->value->f < spincontrol->min.f)
+        spincontrol->value->f = spincontrol->min.f;
+      break;
+    }
+}
+
+static void finish_editing(txt_spincontrol_t *spincontrol)
+{
+  switch (spincontrol->type)
+    {
+    case TXT_SPINCONTROL_INT:
+      spincontrol->value->i = atoi(spincontrol->buffer);
+      break;
+
+    case TXT_SPINCONTROL_FLOAT:
+      spincontrol->value->f = (float)atof(spincontrol->buffer);
+      break;
+    }
+
+  spincontrol->editing = 0;
+  enforce_limits(spincontrol);
+}
+
+static int txt_spincontrol_keypress(TXT_UNCAST_ARG(spincontrol), int key)
+{
+  TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+  /* Enter to enter edit mode */
+
+  if (spincontrol->editing)
+    {
+      if (key == KEY_ENTER)
+        {
+          finish_editing(spincontrol);
+          return 1;
+        }
+
+      if (key == KEY_ESCAPE)
+        {
+          /* Abort without saving value */
+
+          spincontrol->editing = 0;
+          return 1;
+        }
+
+      if (isdigit(key) || key == '-' || key == '.')
+        {
+          add_character(spincontrol, key);
+          return 1;
+        }
+
+      if (key == KEY_BACKSPACE)
+        {
+          backspace(spincontrol);
+          return 1;
+        }
+    }
+  else
+    {
+      /* Non-editing mode */
+
+      if (key == KEY_ENTER)
+        {
+          spincontrol->editing = 1;
+          txt_string_copy(spincontrol->buffer, "", spincontrol->buffer_len);
+          return 1;
+        }
+
+      if (key == KEY_LEFTARROW)
+        {
+          switch (spincontrol->type)
+            {
+            case TXT_SPINCONTROL_INT:
+              spincontrol->value->i -= spincontrol->step.i;
+              break;
+
+            case TXT_SPINCONTROL_FLOAT:
+              spincontrol->value->f -= spincontrol->step.f;
+              break;
+            }
+
+          enforce_limits(spincontrol);
+
+          return 1;
+        }
+
+      if (key == KEY_RIGHTARROW)
+        {
+          switch (spincontrol->type)
+            {
+            case TXT_SPINCONTROL_INT:
+              spincontrol->value->i += spincontrol->step.i;
+              break;
+
+            case TXT_SPINCONTROL_FLOAT:
+              spincontrol->value->f += spincontrol->step.f;
+              break;
+            }
+
+          enforce_limits(spincontrol);
+
+          return 1;
+        }
+    }
+
+  return 0;
+}
+
+static void txt_spincontrol_mousepress(TXT_UNCAST_ARG(spincontrol), int x,
+                                      int y, int b)
+{
+  TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+  unsigned int rel_x;
+
+  rel_x = x - spincontrol->widget.x;
+
+  if (rel_x < 2)
+    {
+      txt_spincontrol_keypress(spincontrol, KEY_LEFTARROW);
+    }
+  else if (rel_x >= spincontrol->widget.w - 2)
+    {
+      txt_spincontrol_keypress(spincontrol, KEY_RIGHTARROW);
+    }
+}
+
+static void txt_spincontrol_focused(TXT_UNCAST_ARG(spincontrol), int focused)
+{
+  TXT_CAST_ARG(txt_spincontrol_t, spincontrol);
+
+  finish_editing(spincontrol);
+}
+
+static txt_spincontrol_t *txt_base_spincontrol(void)
+{
+  txt_spincontrol_t *spincontrol;
+
+  spincontrol = malloc(sizeof(txt_spincontrol_t));
+
+  txt_init_widget(spincontrol, &txt_spincontrol_class);
+  spincontrol->buffer_len = 25;
+  spincontrol->buffer = malloc(spincontrol->buffer_len);
+  txt_string_copy(spincontrol->buffer, "", spincontrol->buffer_len);
+  spincontrol->editing = 0;
+
+  return spincontrol;
+}
+
+txt_spincontrol_t *txt_newspin_control(int *value, int min, int max)
+{
+  txt_spincontrol_t *spincontrol;
+
+  spincontrol = txt_base_spincontrol();
+  spincontrol->type = TXT_SPINCONTROL_INT;
+  spincontrol->value = (void *)value;
+  spincontrol->min.i = min;
+  spincontrol->max.i = max;
+  spincontrol->step.i = 1;
+  set_buffer(spincontrol);
+
+  return spincontrol;
+}
+
+txt_spincontrol_t *txt_new_float_spincontrol(float *value, float min,
+                                             float max)
+{
+  txt_spincontrol_t *spincontrol;
+
+  spincontrol = txt_base_spincontrol();
+  spincontrol->type = TXT_SPINCONTROL_FLOAT;
+  spincontrol->value = (void *)value;
+  spincontrol->min.f = min;
+  spincontrol->max.f = max;
+  spincontrol->step.f = 0.1f;
+  set_buffer(spincontrol);
+
+  return spincontrol;
+}
diff --git a/games/NXDoom/textscreen/txt_spinctrl.h b/games/NXDoom/textscreen/txt_spinctrl.h
index 855527bb5..d6f663ed0 100644
--- a/games/NXDoom/textscreen/txt_spinctrl.h
+++ b/games/NXDoom/textscreen/txt_spinctrl.h
@@ -1,54 +1,71 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_spinctrl.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_SPINCONTROL_H
 #define TXT_SPINCONTROL_H
 
-/**
- * @file txt_spinctrl.h
- *
- * Spin control widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Spin control widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+typedef enum
+{
+  TXT_SPINCONTROL_INT,
+  TXT_SPINCONTROL_FLOAT,
+} txt_spincontrol_type_t;
+
+union _float_n_int
+{
+  float f;
+  int i;
+};
+
+/* Spin control widget.
  *
  * A spin control widget works as an input box that can be used to
  * set numeric values, but also has buttons that allow its value
  * to be increased or decreased.
  */
 
-typedef struct txt_spincontrol_s txt_spincontrol_t;
-
-typedef enum
-{
-    TXT_SPINCONTROL_INT,
-    TXT_SPINCONTROL_FLOAT,
-} txt_spincontrol_type_t;
-
-#include "txt_widget.h"
-
 struct txt_spincontrol_s
 {
-    txt_widget_t widget;
-    txt_spincontrol_type_t type;
-    union { float f; int i; } min, max, *value, step; 
-    int editing;
-    char *buffer;
-    size_t buffer_len;
+  txt_widget_t widget;
+  txt_spincontrol_type_t type;
+  union _float_n_int min;
+  union _float_n_int max;
+  union _float_n_int *value;
+  union _float_n_int step;
+  int editing;
+  char *buffer;
+  size_t buffer_len;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new spin control widget tracking an integer value.
  *
@@ -59,7 +76,7 @@ struct txt_spincontrol_s
  * @return             Pointer to the new spin control widget.
  */
 
-txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max);
+txt_spincontrol_t *txt_newspin_control(int *value, int min, int max);
 
 /**
  * Create a new spin control widget tracking a float value.
@@ -71,8 +88,7 @@ txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max);
  * @return             Pointer to the new spin control widget.
  */
 
-txt_spincontrol_t *TXT_NewFloatSpinControl(float *value, float min, float max);
-
-#endif /* #ifndef TXT_SPINCONTROL_H */
-
+txt_spincontrol_t *txt_new_float_spincontrol(float *value, float min,
+                                           float max);
 
+#endif /* TXT_SPINCONTROL_H */
diff --git a/games/NXDoom/textscreen/txt_strut.c b/games/NXDoom/textscreen/txt_strut.c
index 4c0c76580..e1da6647e 100644
--- a/games/NXDoom/textscreen/txt_strut.c
+++ b/games/NXDoom/textscreen/txt_strut.c
@@ -1,72 +1,101 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_strut.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "doomkeys.h"
 
-#include "txt_strut.h"
 #include "txt_io.h"
 #include "txt_main.h"
+#include "txt_strut.h"
 #include "txt_window.h"
 
-static void TXT_StrutSizeCalc(TXT_UNCAST_ARG(strut))
-{
-    TXT_CAST_ARG(txt_strut_t, strut);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-    // Minimum width is the string length + two spaces for padding
+static void txt_strut_size_calc(TXT_UNCAST_ARG(strut));
+static void txt_strut_drawer(TXT_UNCAST_ARG(strut));
+static void txt_strut_destructor(TXT_UNCAST_ARG(strut));
+static int txt_strut_keypress(TXT_UNCAST_ARG(strut), int key);
 
-    strut->widget.w = strut->width;
-    strut->widget.h = strut->height;
-}
-
-static void TXT_StrutDrawer(TXT_UNCAST_ARG(strut))
-{
-    // Nothing is drawn for a strut.
-}
-
-static void TXT_StrutDestructor(TXT_UNCAST_ARG(strut))
-{
-}
-
-static int TXT_StrutKeyPress(TXT_UNCAST_ARG(strut), int key)
-{
-    return 0;
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_strut_class =
 {
-    TXT_NeverSelectable,
-    TXT_StrutSizeCalc,
-    TXT_StrutDrawer,
-    TXT_StrutKeyPress,
-    TXT_StrutDestructor,
-    NULL,
-    NULL,
+  txt_never_selectable,
+  txt_strut_size_calc,
+  txt_strut_drawer,
+  txt_strut_keypress,
+  txt_strut_destructor,
+  NULL,
+  NULL,
 };
 
-txt_strut_t *TXT_NewStrut(int width, int height)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_strut_size_calc(TXT_UNCAST_ARG(strut))
 {
-    txt_strut_t *strut;
+  TXT_CAST_ARG(txt_strut_t, strut);
 
-    strut = malloc(sizeof(txt_strut_t));
+  /* Minimum width is the string length + two spaces for padding */
 
-    TXT_InitWidget(strut, &txt_strut_class);
-    strut->width = width;
-    strut->height = height;
-
-    return strut;
+  strut->widget.w = strut->width;
+  strut->widget.h = strut->height;
 }
 
+static void txt_strut_drawer(TXT_UNCAST_ARG(strut))
+{
+  /* Nothing is drawn for a strut. */
+}
+
+static void txt_strut_destructor(TXT_UNCAST_ARG(strut))
+{
+}
+
+static int txt_strut_keypress(TXT_UNCAST_ARG(strut), int key)
+{
+  return 0;
+}
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+txt_strut_t *txt_new_strut(int width, int height)
+{
+  txt_strut_t *strut;
+
+  strut = malloc(sizeof(txt_strut_t));
+
+  txt_init_widget(strut, &txt_strut_class);
+  strut->width = width;
+  strut->height = height;
+
+  return strut;
+}
diff --git a/games/NXDoom/textscreen/txt_strut.h b/games/NXDoom/textscreen/txt_strut.h
index f93923552..7d988fb03 100644
--- a/games/NXDoom/textscreen/txt_strut.h
+++ b/games/NXDoom/textscreen/txt_strut.h
@@ -1,45 +1,53 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_strut.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_STRUT_H
 #define TXT_STRUT_H
 
-/**
- * @file txt_strut.h
- *
- * Strut widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * Strut widget.
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Strut widget.
  *
  * A strut is a widget that takes up a fixed amount of space.  It can
  * be visualised as a transparent box.  Struts are used to provide
  * spacing between widgets.
  */
 
-typedef struct txt_strut_s txt_strut_t;
-
-#include "txt_widget.h"
-
 struct txt_strut_s
 {
-    txt_widget_t widget;
-    int width;
-    int height;
+  txt_widget_t widget;
+  int width;
+  int height;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new strut.
  *
@@ -47,8 +55,6 @@ struct txt_strut_s
  * @param height     Height of the strut, in characters.
  */
 
-txt_strut_t *TXT_NewStrut(int width, int height);
-
-#endif /* #ifndef TXT_STRUT_H */
-
+txt_strut_t *txt_new_strut(int width, int height);
 
+#endif /* TXT_STRUT_H */
diff --git a/games/NXDoom/textscreen/txt_table.c b/games/NXDoom/textscreen/txt_table.c
index c14da47eb..3d77e3731 100644
--- a/games/NXDoom/textscreen/txt_table.c
+++ b/games/NXDoom/textscreen/txt_table.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_table.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -26,1219 +35,1296 @@
 #include "txt_strut.h"
 #include "txt_table.h"
 
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int txt_table_selectable(TXT_UNCAST_ARG(table));
+static void txt_calc_table_size(TXT_UNCAST_ARG(table));
+static void txt_table_drawer(TXT_UNCAST_ARG(table));
+static int txt_table_keypress(TXT_UNCAST_ARG(table), int key);
+static void txt_table_destructor(TXT_UNCAST_ARG(table));
+static void txt_table_mouse_press(TXT_UNCAST_ARG(table), int x,
+                                  int y, int b);
+static void txt_table_layout(TXT_UNCAST_ARG(table));
+static void txt_table_focused(TXT_UNCAST_ARG(table), int focused);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 txt_widget_t txt_table_overflow_right;
 txt_widget_t txt_table_overflow_down;
 txt_widget_t txt_table_eol;
 txt_widget_t txt_table_empty;
 
-// Returns true if the given widget in the table's widgets[] array refers
-// to an actual widget - not NULL, or one of the special overflow pointers.
-static int IsActualWidget(txt_widget_t *widget)
-{
-    return widget != NULL
-        && widget != &txt_table_overflow_right
-        && widget != &txt_table_overflow_down;
-}
-
-// Remove all entries from a table
-
-void TXT_ClearTable(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    int i;
-
-    // Free all widgets
-    // Skip over the first (num_columns) widgets in the array, as these
-    // are the column struts used to control column width
-
-    for (i=table->columns; i<table->num_widgets; ++i)
-    {
-        if (IsActualWidget(table->widgets[i]))
-        {
-            TXT_DestroyWidget(table->widgets[i]);
-        }
-    }
-
-    // Shrink the table to just the column strut widgets
-
-    table->num_widgets = table->columns;
-}
-
-static void TXT_TableDestructor(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-
-    TXT_ClearTable(table);
-}
-
-static int TableRows(txt_table_t *table)
-{
-    return (table->num_widgets + table->columns - 1) / table->columns;
-}
-
-// Most widgets occupy just one cell of a table, but if the special
-// overflow constants are used, they can occupy multiple cells.
-// This function figures out for a widget in a given cell, which
-// cells it should actually occupy (always a rectangle).
-static void CellOverflowedSize(txt_table_t *table, int x, int y,
-                               int *w, int *h)
-{
-    txt_widget_t *widget;
-    int x1, y1;
-
-    if (!IsActualWidget(table->widgets[y * table->columns + x]))
-    {
-        *w = 0; *h = 0;
-        return;
-    }
-
-    *w = table->columns - x;
-    *h = 0;
-    for (y1 = y; y1 < TableRows(table); ++y1)
-    {
-        // Every overflow cell must point to either (x, y) or another
-        // overflow cell. This means the first in every row must be
-        // txt_table_overflow_down.
-
-        if (y1 * table->columns + x >= table->num_widgets)
-        {
-            break;
-        }
-
-        widget = table->widgets[y1 * table->columns + x];
-
-        if (y1 != y && widget != &txt_table_overflow_down)
-        {
-            break;
-        }
-
-        for (x1 = x + 1; x1 < x + *w; ++x1)
-        {
-            if (y1 * table->columns + x1 >= table->num_widgets)
-            {
-                break;
-            }
-
-            // Can be either type of overflow, except on the first row.
-            // Otherwise we impose a limit on the width.
-            widget = table->widgets[y1 * table->columns + x1];
-            if (widget != &txt_table_overflow_right
-             && (widget != &txt_table_overflow_down || y1 == y))
-            {
-                *w = x1 - x;
-                break;
-            }
-        }
-
-        ++*h;
-    }
-}
-
-static int IsOverflowingCell(txt_table_t *table, int x, int y)
-{
-    int w, h;
-    CellOverflowedSize(table, x, y, &w, &h);
-    return w > 1 || h > 1;
-}
-
-// Using the given column/row size tables, calculate the size of the given
-// widget, storing the result in (w, h).
-static void CalculateWidgetDimensions(txt_table_t *table,
-                                      int x, int y,
-                                      unsigned int *column_widths,
-                                      unsigned int *row_heights,
-                                      unsigned int *w, unsigned int *h)
-{
-    int cell_w, cell_h;
-    int x1, y1;
-
-    // Find which cells this widget occupies.
-    CellOverflowedSize(table, x, y, &cell_w, &cell_h);
-
-    // Add up column / row widths / heights to get the actual dimensions.
-    *w = 0;
-    for (x1 = x; x1 < x + cell_w; ++x1)
-    {
-        *w += column_widths[x1];
-    }
-
-    *h = 0;
-    for (y1 = y; y1 < y + cell_h; ++y1)
-    {
-        *h += row_heights[y1];
-    }
-}
-
-static void CalcRowColSizes(txt_table_t *table,
-                            unsigned int *row_heights,
-                            unsigned int *col_widths)
-{
-    int x, y;
-    int rows;
-    txt_widget_t *widget;
-
-    rows = TableRows(table);
-
-    memset(col_widths, 0, sizeof(int) * table->columns);
-
-    for (y = 0; y < rows; ++y)
-    {
-        row_heights[y] = 0;
-
-        for (x = 0; x < table->columns; ++x)
-        {
-            if (y * table->columns + x >= table->num_widgets)
-                break;
-
-            widget = table->widgets[y * table->columns + x];
-
-            if (IsActualWidget(widget))
-            {
-                TXT_CalcWidgetSize(widget);
-            }
-
-            // In the first pass we ignore overflowing cells.
-            if (IsOverflowingCell(table, x, y))
-            {
-                continue;
-            }
-
-            // NULL represents an empty spacer
-            if (IsActualWidget(widget))
-            {
-                if (widget->h > row_heights[y])
-                    row_heights[y] = widget->h;
-                if (widget->w > col_widths[x])
-                    col_widths[x] = widget->w;
-            }
-        }
-    }
-
-    // In the second pass, we go through again and process overflowing
-    // widgets, to ensure that they will fit.
-    for (y = 0; y < rows; ++y)
-    {
-        for (x = 0; x < table->columns; ++x)
-        {
-            unsigned int w, h;
-
-            if (y * table->columns + x >= table->num_widgets)
-                break;
-
-            widget = table->widgets[y * table->columns + x];
-            if (!IsActualWidget(widget))
-            {
-                continue;
-            }
-
-            // Expand column width and row heights as needed.
-            CalculateWidgetDimensions(table, x, y, col_widths, row_heights,
-                                      &w, &h);
-            if (w < widget->w)
-            {
-                col_widths[x] += widget->w - w;
-            }
-            if (h < widget->h)
-            {
-                row_heights[y] += widget->h - h;
-            }
-        }
-    }
-}
-
-static void TXT_CalcTableSize(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    unsigned int *column_widths;
-    unsigned int *row_heights;
-    int x, y;
-    int rows;
-
-    rows = TableRows(table);
-
-    row_heights = malloc(sizeof(int) * rows);
-    column_widths = malloc(sizeof(int) * table->columns);
-
-    CalcRowColSizes(table, row_heights, column_widths);
-
-    table->widget.w = 0;
-
-    for (x=0; x<table->columns; ++x)
-    {
-        table->widget.w += column_widths[x];
-    }
-
-    table->widget.h = 0;
-
-    for (y=0; y<rows; ++y)
-    {
-        table->widget.h += row_heights[y];
-    }
-
-    free(row_heights);
-    free(column_widths);
-}
-
-static void FillRowToEnd(txt_table_t *table)
-{
-    while ((table->num_widgets % table->columns) != 0)
-    {
-        TXT_AddWidget(table, &txt_table_overflow_right);
-    }
-}
-
-void TXT_AddWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    TXT_CAST_ARG(txt_widget_t, widget);
-    int is_separator;
-    int i;
-
-    // Convenience alias for NULL:
-    if (widget == &txt_table_empty)
-    {
-        widget = NULL;
-    }
-    else if (widget == &txt_table_eol)
-    {
-        FillRowToEnd(table);
-        return;
-    }
-
-    // We have special handling for the separator widget:
-    is_separator = IsActualWidget(widget)
-                && widget->widget_class == &txt_separator_class;
-
-    // If we add two separators consecutively, the new separator replaces the
-    // first. This allows us to override the "implicit" separator that is
-    // added at the top of a window when it is created.
-    if (is_separator)
-    {
-        for (i = table->num_widgets - 1; i >= 0; --i)
-        {
-            txt_widget_t *last_widget;
-            last_widget = table->widgets[i];
-
-            if (IsActualWidget(last_widget)
-             && widget->widget_class == &txt_separator_class
-             && last_widget->widget_class == &txt_separator_class)
-            {
-                table->widgets[i] = widget;
-                TXT_DestroyWidget(last_widget);
-                return;
-            }
-            else if (last_widget != &txt_table_overflow_right)
-            {
-                break;
-            }
-        }
-    }
-
-    // Separators begin on a new line.
-    if (is_separator)
-    {
-        FillRowToEnd(table);
-    }
-
-    table->widgets = realloc(table->widgets,
-                             sizeof(txt_widget_t *) * (table->num_widgets + 1));
-    table->widgets[table->num_widgets] = widget;
-    ++table->num_widgets;
-
-    // Maintain parent pointer.
-    if (IsActualWidget(widget))
-    {
-        widget->parent = &table->widget;
-    }
-
-    // Separators always take up the entire line.
-    if (is_separator)
-    {
-        FillRowToEnd(table);
-    }
-}
-
-// Add multiple widgets to a table.
-
-void TXT_AddWidgets(TXT_UNCAST_ARG(table), ...)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    va_list args;
-    txt_widget_t *widget;
-
-    va_start(args, TXT_UNCAST_ARG_NAME(table));
-
-    // Keep adding widgets until a NULL is reached.
-   
-    for (;;) 
-    {
-        widget = va_arg(args, txt_widget_t *);
-
-        if (widget == NULL)
-        {
-            break;
-        }
-
-        TXT_AddWidget(table, widget);
-    }
-
-    va_end(args);
-}
-
-static int SelectableCell(txt_table_t *table, int x, int y)
-{
-    txt_widget_t *widget;
-    int i;
-
-    if (x < 0 || x >= table->columns)
-    {
-        return 0;
-    }
-
-    i = y * table->columns + x;
-
-    if (i >= 0 && i < table->num_widgets)
-    {
-        widget = table->widgets[i];
-        return IsActualWidget(widget)
-            && TXT_SelectableWidget(widget)
-            && widget->visible;
-    }
-
-    return 0;
-}
-
-// Tries to locate a selectable widget in the given row, returning
-// the column number of the first column available or -1 if none are 
-// available in the given row.
-//
-// Starts from start_col, then searches nearby columns.
-
-static int FindSelectableColumn(txt_table_t *table, int row, int start_col)
-{
-    int x;
-
-    for (x=0; x<table->columns; ++x)
-    {
-        // Search to the right
-
-        if (SelectableCell(table, start_col + x, row))
-        {
-            return start_col + x;
-        }
-
-        // Search to the left
-
-        if (SelectableCell(table, start_col - x, row))
-        {
-            return start_col - x;
-        }
-    }
-
-    // None available
-
-    return -1;
-}
-
-// Change the selected widget.
-
-static void ChangeSelection(txt_table_t *table, int x, int y)
-{
-    txt_widget_t *cur_widget;
-    txt_widget_t *new_widget;
-    int i;
-
-    // No change?
-
-    if (x == table->selected_x && y == table->selected_y)
-    {
-        return;
-    }
-
-    // Unfocus current widget:
-
-    i = table->selected_y * table->columns + table->selected_x;
-
-    if (i < table->num_widgets)
-    {
-        cur_widget = table->widgets[i];
-
-        if (table->widget.focused && IsActualWidget(cur_widget))
-        {
-            TXT_SetWidgetFocus(cur_widget, 0);
-        }
-    }
-
-    // Focus new widget.
-
-    new_widget = table->widgets[y * table->columns + x];
-
-    table->selected_x = x;
-    table->selected_y = y;
-
-    if (table->widget.focused && new_widget != NULL)
-    {
-        TXT_SetWidgetFocus(new_widget, 1);
-    }
-}
-
-static int TXT_TableKeyPress(TXT_UNCAST_ARG(table), int key)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    int selected;
-    int rows;
-
-    rows = TableRows(table);
-
-    // Send to the currently selected widget first
-
-    selected = table->selected_y * table->columns + table->selected_x;
-
-    if (selected >= 0 && selected < table->num_widgets)
-    {
-        if (IsActualWidget(table->widgets[selected])
-         && TXT_SelectableWidget(table->widgets[selected])
-         && TXT_WidgetKeyPress(table->widgets[selected], key))
-        {
-            return 1;
-        }
-    }
-
-    if (key == KEY_TAB)
-    {
-        int dir;
-        int i;
-
-        dir = TXT_GetModifierState(TXT_MOD_SHIFT) ? -1 : 1;
-
-        // Cycle through all widgets until we find one that can be selected.
-        for (i = table->selected_y * table->columns + table->selected_x + dir;
-             i >= 0 && i < table->num_widgets;
-             i += dir)
-        {
-            if (IsActualWidget(table->widgets[i])
-             && TXT_SelectableWidget(table->widgets[i]))
-            {
-                ChangeSelection(table, i % table->columns, i / table->columns);
-                return 1;
-            }
-        }
-
-        return 0;
-    }
-
-    if (key == KEY_DOWNARROW)
-    {
-        int new_x, new_y;
-
-        // Move cursor down to the next selectable widget
-
-        for (new_y = table->selected_y + 1; new_y < rows; ++new_y)
-        {
-            new_x = FindSelectableColumn(table, new_y, table->selected_x);
-
-            if (new_x >= 0)
-            {
-                // Found a selectable widget in this column!
-
-                ChangeSelection(table, new_x, new_y);
-
-                return 1;
-            }
-        }
-    }
-
-    if (key == KEY_UPARROW)
-    {
-        int new_x, new_y;
-
-        // Move cursor up to the next selectable widget
-
-        for (new_y = table->selected_y - 1; new_y >= 0; --new_y)
-        {
-            new_x = FindSelectableColumn(table, new_y, table->selected_x);
-
-            if (new_x >= 0)
-            {
-                // Found a selectable widget in this column!
-
-                ChangeSelection(table, new_x, new_y);
-
-                return 1;
-            }
-        }
-    }
-
-    if (key == KEY_LEFTARROW)
-    {
-        int new_x;
-
-        // Move cursor left
-
-        for (new_x = table->selected_x - 1; new_x >= 0; --new_x)
-        {
-            if (SelectableCell(table, new_x, table->selected_y))
-            {
-                // Found a selectable widget!
-
-                ChangeSelection(table, new_x, table->selected_y);
-
-                return 1;
-            }
-        }
-    }
-
-    if (key == KEY_RIGHTARROW)
-    {
-        int new_x;
-
-        // Move cursor left
-
-        for (new_x = table->selected_x + 1; new_x < table->columns; ++new_x)
-        {
-            if (SelectableCell(table, new_x, table->selected_y))
-            {
-                // Found a selectable widget!
-
-                ChangeSelection(table, new_x, table->selected_y);
-
-                return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-// Check the currently selected widget in the table is valid.
-
-static void CheckValidSelection(txt_table_t *table)
-{
-    int rows;
-    int new_x, new_y;
-
-    rows = TableRows(table);
-
-    for (new_y = table->selected_y; new_y < rows; ++new_y)
-    {
-        new_x = FindSelectableColumn(table, new_y, table->selected_x);
-
-        if (new_x >= 0)
-        {
-            // Found a selectable column.
-
-            ChangeSelection(table, new_x, new_y);
-
-            break;
-        }
-    }
-}
-
-static void LayoutCell(txt_table_t *table, int x, int y,
-                       int draw_x, int draw_y)
-{
-    txt_widget_t *widget;
-    int col_width;
-
-    widget = table->widgets[y * table->columns + x];
-
-    col_width = widget->w;
-
-    // Adjust x position based on alignment property
-
-    switch (widget->align)
-    {
-        case TXT_HORIZ_LEFT:
-            widget->w = col_width;
-            break;
-
-        case TXT_HORIZ_CENTER:
-            TXT_CalcWidgetSize(widget);
-
-            // Separators are always drawn left-aligned.
-
-            if (widget->widget_class != &txt_separator_class)
-            {
-                draw_x += (col_width - widget->w) / 2;
-            }
-
-            break;
-
-        case TXT_HORIZ_RIGHT:
-            TXT_CalcWidgetSize(widget);
-
-            if (widget->widget_class != &txt_separator_class)
-            {
-                draw_x += col_width - widget->w;
-            }
-            break;
-    }
-
-    // Set the position for this widget
-
-    widget->x = draw_x;
-    widget->y = draw_y;
-
-    // Recursively lay out any widgets contained in the widget
-
-    TXT_LayoutWidget(widget);
-}
-
-static void TXT_TableLayout(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    unsigned int *column_widths;
-    unsigned int *row_heights;
-    txt_widget_t *widget;
-    int draw_x, draw_y;
-    int x, y;
-    int i;
-    int rows;
-
-    // Work out the column widths and row heights
-
-    rows = TableRows(table);
-
-    column_widths = malloc(sizeof(int) * table->columns);
-    row_heights = malloc(sizeof(int) * rows);
-
-    CalcRowColSizes(table, row_heights, column_widths);
-
-    // If this table only has one column, expand column size to fit
-    // the display width.  Ensures that separators reach the window edges 
-    // when drawing windows.
-
-    if (table->columns == 1)
-    {
-        column_widths[0] = table->widget.w;
-    }
-
-    // Draw all cells
-
-    draw_y = table->widget.y;
-
-    for (y=0; y<rows; ++y)
-    {
-        draw_x = table->widget.x;
-
-        for (x=0; x<table->columns; ++x)
-        {
-            i = y * table->columns + x;
-
-            if (i >= table->num_widgets)
-                break;
-
-            widget = table->widgets[i];
-
-            if (IsActualWidget(widget))
-            {
-                CalculateWidgetDimensions(table, x, y,
-                                          column_widths, row_heights,
-                                          &widget->w, &widget->h);
-                LayoutCell(table, x, y, draw_x, draw_y);
-            }
-
-            draw_x += column_widths[x];
-        }
-
-        draw_y += row_heights[y];
-    }
-
-    free(row_heights);
-    free(column_widths);
-}
-
-static void TXT_TableDrawer(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_widget_t *widget;
-    int i;
-
-    // Check the table's current selection points at something valid before
-    // drawing.
-
-    CheckValidSelection(table);
-
-    // Draw all cells
-
-    for (i=0; i<table->num_widgets; ++i)
-    {
-        widget = table->widgets[i];
-
-        if (IsActualWidget(widget))
-        {
-            TXT_GotoXY(widget->x, widget->y);
-            TXT_DrawWidget(widget);
-        }
-    }
-}
-
-// Responds to mouse presses
-
-static void TXT_TableMousePress(TXT_UNCAST_ARG(table), int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_widget_t *widget;
-    int i;
-
-    for (i=0; i<table->num_widgets; ++i)
-    {
-        widget = table->widgets[i];
-
-        // NULL widgets are spacers
-
-        if (IsActualWidget(widget))
-        {
-            if (x >= widget->x && x < (signed) (widget->x + widget->w)
-             && y >= widget->y && y < (signed) (widget->y + widget->h))
-            {
-                // This is the widget that was clicked!
-
-                // Select the cell if the widget is selectable
-
-                if (TXT_SelectableWidget(widget))
-                {
-                    ChangeSelection(table, i % table->columns,
-                                           i / table->columns);
-                }
-
-                // Propagate click
-
-                TXT_WidgetMousePress(widget, x, y, b);
-
-                break;
-            }
-        }
-    }
-}
-
-// Determine whether the table is selectable.
-
-static int TXT_TableSelectable(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    int i;
-
-    // Is the currently-selected cell selectable?
-
-    if (SelectableCell(table, table->selected_x, table->selected_y))
-    {
-        return 1;
-    }
-
-    // Find the first selectable cell and set selected_x, selected_y.
-
-    for (i = 0; i < table->num_widgets; ++i)
-    {
-        if (IsActualWidget(table->widgets[i])
-         && TXT_SelectableWidget(table->widgets[i]))
-        {
-            ChangeSelection(table, i % table->columns, i / table->columns);
-            return 1;
-        }
-    }
-
-    // No selectable widgets exist within the table.
-
-    return 0;
-}
-
-// Need to pass through focus changes to the selected child widget.
-
-static void TXT_TableFocused(TXT_UNCAST_ARG(table), int focused)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    int i;
-
-    i = table->selected_y * table->columns + table->selected_x;
-
-    if (i < table->num_widgets)
-    {
-        if (IsActualWidget(table->widgets[i]))
-        {
-            TXT_SetWidgetFocus(table->widgets[i], focused);
-        }
-    }
-}
-
 txt_widget_class_t txt_table_class =
 {
-    TXT_TableSelectable,
-    TXT_CalcTableSize,
-    TXT_TableDrawer,
-    TXT_TableKeyPress,
-    TXT_TableDestructor,
-    TXT_TableMousePress,
-    TXT_TableLayout,
-    TXT_TableFocused,
+  txt_table_selectable, txt_calc_table_size,  txt_table_drawer,
+  txt_table_keypress,   txt_table_destructor, txt_table_mouse_press,
+  txt_table_layout,     txt_table_focused,
 };
 
-void TXT_InitTable(txt_table_t *table, int columns)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Returns true if the given widget in the table's widgets[] array refers
+ * to an actual widget - not NULL, or one of the special overflow pointers.
+ */
+
+static int is_actual_widget(txt_widget_t *widget)
 {
-    int i;
-
-    TXT_InitWidget(table, &txt_table_class);
-    table->columns = columns;
-    table->widgets = NULL;
-    table->num_widgets = 0;
-    table->selected_x = 0;
-    table->selected_y = 0;
-
-    // Add a strut for each column at the start of the table. 
-    // These are used by the TXT_SetColumnWidths function below:
-    // the struts are created with widths of 0 each, but this
-    // function changes them.
-
-    for (i=0; i<columns; ++i)
-    {
-        TXT_AddWidget(table, TXT_NewStrut(0, 0));
-    }
+  return widget != NULL && widget != &txt_table_overflow_right &&
+         widget != &txt_table_overflow_down;
 }
 
-txt_table_t *TXT_NewTable(int columns)
+static void txt_table_destructor(TXT_UNCAST_ARG(table))
 {
-    txt_table_t *table;
+  TXT_CAST_ARG(txt_table_t, table);
 
-    table = malloc(sizeof(txt_table_t));
-
-    TXT_InitTable(table, columns);
-
-    return table;
+  txt_clear_table(table);
 }
 
-// Alternative to TXT_NewTable() that allows a list of widgets to be
-// provided in its arguments.
-txt_table_t *TXT_MakeTable(int columns, ...)
+static int table_rows(txt_table_t *table)
 {
-    txt_table_t *table;
-    va_list args;
-
-    table = TXT_NewTable(columns);
-    va_start(args, columns);
-
-    for (;;)
-    {
-        txt_widget_t *widget;
-        widget = va_arg(args, txt_widget_t *);
-
-        if (widget == NULL)
-        {
-            break;
-        }
-
-        TXT_AddWidget(table, widget);
-    }
-
-    va_end(args);
-
-    return table;
+  return (table->num_widgets + table->columns - 1) / table->columns;
 }
 
-// Create a horizontal table from a list of widgets.
+/* Most widgets occupy just one cell of a table, but if the special
+ * overflow constants are used, they can occupy multiple cells.
+ * This function figures out for a widget in a given cell, which
+ * cells it should actually occupy (always a rectangle).
+ */
 
-txt_table_t *TXT_NewHorizBox(TXT_UNCAST_ARG(first_widget), ...)
+static void cell_overflowed_size(txt_table_t *table, int x, int y, int *w,
+                                 int *h)
 {
-    TXT_CAST_ARG(txt_widget_t, first_widget);
-    txt_table_t *result;
-    va_list args;
-    int num_args;
+  txt_widget_t *widget;
+  int x1;
+  int y1;
 
-    // First, find the number of arguments to determine the width of
-    // the box.
-
-    va_start(args, TXT_UNCAST_ARG_NAME(first_widget));
-
-    num_args = 1;
-
-    for (;;)
+  if (!is_actual_widget(table->widgets[y * table->columns + x]))
     {
-        txt_widget_t *widget;
-
-        widget = va_arg(args, txt_widget_t *);
-
-        if (widget == NULL)
-        {
-            // End of list
-
-            break;
-        }
-        else
-        {
-            ++num_args;
-        }
-    }
-    
-    va_end(args);
-
-    // Create the table.
-
-    result = TXT_NewTable(num_args);
-    TXT_AddWidget(result, first_widget);
-
-    // Go through the list again and add each widget.
-
-    va_start(args, TXT_UNCAST_ARG_NAME(first_widget));
-
-    for (;;)
-    {
-        txt_widget_t *widget;
-
-        widget = va_arg(args, txt_widget_t *);
-
-        if (widget == NULL)
-        {
-            // End of list
-
-            break;
-        }
-        else
-        {
-            TXT_AddWidget(result, widget);
-        }
-    }
-    
-    va_end(args);
-
-    return result;
-}
-
-// Get the currently-selected widget in a table, recursively searching
-// through sub-tables if necessary.
-
-txt_widget_t *TXT_GetSelectedWidget(TXT_UNCAST_ARG(table))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_widget_t *result;
-    int index;
-
-    index = table->selected_y * table->columns + table->selected_x;
-
-    result = NULL;
-
-    if (index >= 0 && index < table->num_widgets)
-    {
-        result = table->widgets[index];
-
-        if (!IsActualWidget(result))
-        {
-            result = NULL;
-        }
+      *w = 0;
+      *h = 0;
+      return;
     }
 
-    if (result != NULL && result->widget_class == &txt_table_class)
+  *w = table->columns - x;
+  *h = 0;
+  for (y1 = y; y1 < table_rows(table); ++y1)
     {
-        result = TXT_GetSelectedWidget(result);
-    }
+      /* Every overflow cell must point to either (x, y) or another
+       * overflow cell. This means the first in every row must be
+       * txt_table_overflow_down.
+       */
 
-    return result;
-}
-
-// Selects a given widget in a table, recursively searching any tables
-// within this table.  Returns 1 if successful, 0 if unsuccessful.
-
-int TXT_SelectWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget))
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    TXT_CAST_ARG(txt_widget_t, widget);
-    int i;
-
-    for (i=0; i<table->num_widgets; ++i)
-    {
-        if (!IsActualWidget(table->widgets[i]))
+      if (y1 * table->columns + x >= table->num_widgets)
         {
-            continue;
+          break;
         }
 
-        if (table->widgets[i] == widget)
+      widget = table->widgets[y1 * table->columns + x];
+
+      if (y1 != y && widget != &txt_table_overflow_down)
         {
-            // Found the item!  Select it and return.
-
-            ChangeSelection(table, i % table->columns, i / table->columns);
-
-            return 1;
+          break;
         }
 
-        if (table->widgets[i]->widget_class == &txt_table_class)
+      for (x1 = x + 1; x1 < x + *w; ++x1)
         {
-            // This item is a subtable.  Recursively search this table.
-
-            if (TXT_SelectWidget(table->widgets[i], widget))
+          if (y1 * table->columns + x1 >= table->num_widgets)
             {
-                // Found it in the subtable.  Select this subtable and return.
+              break;
+            }
 
-                ChangeSelection(table, i % table->columns, i / table->columns);
+          /* Can be either type of overflow, except on the first row.
+           * Otherwise we impose a limit on the width.
+           */
 
-                return 1;
+          widget = table->widgets[y1 * table->columns + x1];
+          if (widget != &txt_table_overflow_right &&
+              (widget != &txt_table_overflow_down || y1 == y))
+            {
+              *w = x1 - x;
+              break;
+            }
+        }
+
+      ++*h;
+    }
+}
+
+static int is_overflowing_cell(txt_table_t *table, int x, int y)
+{
+  int w;
+  int h;
+  cell_overflowed_size(table, x, y, &w, &h);
+  return w > 1 || h > 1;
+}
+
+/* Using the given column/row size tables, calculate the size of the given
+ * widget, storing the result in (w, h).
+ */
+
+static void calculate_widget_dimensions(txt_table_t *table, int x, int y,
+                                        unsigned int *column_widths,
+                                        unsigned int *row_heights,
+                                        unsigned int *w, unsigned int *h)
+{
+  int cell_w;
+  int cell_h;
+  int x1;
+  int y1;
+
+  /* Find which cells this widget occupies. */
+
+  cell_overflowed_size(table, x, y, &cell_w, &cell_h);
+
+  /* Add up column / row widths / heights to get the actual dimensions. */
+
+  *w = 0;
+  for (x1 = x; x1 < x + cell_w; ++x1)
+    {
+      *w += column_widths[x1];
+    }
+
+  *h = 0;
+  for (y1 = y; y1 < y + cell_h; ++y1)
+    {
+      *h += row_heights[y1];
+    }
+}
+
+static void calc_row_col_sizes(txt_table_t *table, unsigned int *row_heights,
+                               unsigned int *col_widths)
+{
+  int x;
+  int y;
+  int rows;
+  txt_widget_t *widget;
+
+  rows = table_rows(table);
+
+  memset(col_widths, 0, sizeof(int) * table->columns);
+
+  for (y = 0; y < rows; ++y)
+    {
+      row_heights[y] = 0;
+
+      for (x = 0; x < table->columns; ++x)
+        {
+          if (y * table->columns + x >= table->num_widgets) break;
+
+          widget = table->widgets[y * table->columns + x];
+
+          if (is_actual_widget(widget))
+            {
+              txt_calc_widget_size(widget);
+            }
+
+          /* In the first pass we ignore overflowing cells. */
+
+          if (is_overflowing_cell(table, x, y))
+            {
+              continue;
+            }
+
+          /* NULL represents an empty spacer */
+
+          if (is_actual_widget(widget))
+            {
+              if (widget->h > row_heights[y]) row_heights[y] = widget->h;
+              if (widget->w > col_widths[x]) col_widths[x] = widget->w;
             }
         }
     }
 
-    // Not found.
+  /* In the second pass, we go through again and process overflowing
+   * widgets, to ensure that they will fit.
+   */
 
-    return 0;
+  for (y = 0; y < rows; ++y)
+    {
+      for (x = 0; x < table->columns; ++x)
+        {
+          unsigned int w;
+          unsigned int h;
+
+          if (y * table->columns + x >= table->num_widgets) break;
+
+          widget = table->widgets[y * table->columns + x];
+          if (!is_actual_widget(widget))
+            {
+              continue;
+            }
+
+          /* Expand column width and row heights as needed. */
+
+          calculate_widget_dimensions(table, x, y, col_widths, row_heights,
+                                      &w, &h);
+          if (w < widget->w)
+            {
+              col_widths[x] += widget->w - w;
+            }
+
+          if (h < widget->h)
+            {
+              row_heights[y] += widget->h - h;
+            }
+        }
+    }
 }
 
-void TXT_SetTableColumns(TXT_UNCAST_ARG(table), int new_columns)
+static void txt_calc_table_size(TXT_UNCAST_ARG(table))
 {
-    TXT_CAST_ARG(txt_table_t, table);
-    txt_widget_t **new_widgets;
-    txt_widget_t *widget;
-    int new_num_widgets;
-    int i, j, x;
+  TXT_CAST_ARG(txt_table_t, table);
+  unsigned int *column_widths;
+  unsigned int *row_heights;
+  int x;
+  int y;
+  int rows;
 
-    // We need as many full rows as are in the current list, plus the
-    // remainder from the last row.
-    new_num_widgets = (table->num_widgets / table->columns) * new_columns
-                    + (table->num_widgets % table->columns);
-    new_widgets = calloc(new_num_widgets, sizeof(txt_widget_t *));
+  rows = table_rows(table);
 
-    // Reset and add one by one from the old table.
-    new_num_widgets = 0;
+  row_heights = malloc(sizeof(int) * rows);
+  column_widths = malloc(sizeof(int) * table->columns);
 
-    for (i = 0; i < table->num_widgets; ++i)
+  calc_row_col_sizes(table, row_heights, column_widths);
+
+  table->widget.w = 0;
+
+  for (x = 0; x < table->columns; ++x)
     {
-        widget = table->widgets[i];
-        x = i % table->columns;
+      table->widget.w += column_widths[x];
+    }
 
-        if (x < new_columns)
+  table->widget.h = 0;
+
+  for (y = 0; y < rows; ++y)
+    {
+      table->widget.h += row_heights[y];
+    }
+
+  free(row_heights);
+  free(column_widths);
+}
+
+static void fill_row_to_end(txt_table_t *table)
+{
+  while ((table->num_widgets % table->columns) != 0)
+    {
+      txt_add_widget(table, &txt_table_overflow_right);
+    }
+}
+
+static int selectable_cell(txt_table_t *table, int x, int y)
+{
+  txt_widget_t *widget;
+  int i;
+
+  if (x < 0 || x >= table->columns)
+    {
+      return 0;
+    }
+
+  i = y * table->columns + x;
+
+  if (i >= 0 && i < table->num_widgets)
+    {
+      widget = table->widgets[i];
+      return is_actual_widget(widget) && txt_selectable_widget(widget) &&
+             widget->visible;
+    }
+
+  return 0;
+}
+
+/* Tries to locate a selectable widget in the given row, returning
+ * the column number of the first column available or -1 if none are
+ * available in the given row.
+ *
+ * Starts from start_col, then searches nearby columns.
+ */
+
+static int find_selectable_column(txt_table_t *table, int row, int start_col)
+{
+  int x;
+
+  for (x = 0; x < table->columns; ++x)
+    {
+      /* Search to the right */
+
+      if (selectable_cell(table, start_col + x, row))
         {
-            new_widgets[new_num_widgets] = widget;
-            ++new_num_widgets;
-        }
-        else if (IsActualWidget(widget))
-        {
-            TXT_DestroyWidget(widget);
+          return start_col + x;
         }
 
-        // When we reach the last column of a row, we must pad it out with
-        // extra widgets to reach the next row.
-        if (x == table->columns - 1)
+      /* Search to the left */
+
+      if (selectable_cell(table, start_col - x, row))
         {
-            for (j = table->columns; j < new_columns; ++j)
+          return start_col - x;
+        }
+    }
+
+  /* None available */
+
+  return -1;
+}
+
+/* Change the selected widget. */
+
+static void change_selection(txt_table_t *table, int x, int y)
+{
+  txt_widget_t *cur_widget;
+  txt_widget_t *new_widget;
+  int i;
+
+  /* No change? */
+
+  if (x == table->selected_x && y == table->selected_y)
+    {
+      return;
+    }
+
+  /* Unfocus current widget: */
+
+  i = table->selected_y * table->columns + table->selected_x;
+
+  if (i < table->num_widgets)
+    {
+      cur_widget = table->widgets[i];
+
+      if (table->widget.focused && is_actual_widget(cur_widget))
+        {
+          txt_set_widget_focus(cur_widget, 0);
+        }
+    }
+
+  /* Focus new widget. */
+
+  new_widget = table->widgets[y * table->columns + x];
+
+  table->selected_x = x;
+  table->selected_y = y;
+
+  if (table->widget.focused && new_widget != NULL)
+    {
+      txt_set_widget_focus(new_widget, 1);
+    }
+}
+
+static int txt_table_keypress(TXT_UNCAST_ARG(table), int key)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  int selected;
+  int rows;
+
+  rows = table_rows(table);
+
+  /* Send to the currently selected widget first */
+
+  selected = table->selected_y * table->columns + table->selected_x;
+
+  if (selected >= 0 && selected < table->num_widgets)
+    {
+      if (is_actual_widget(table->widgets[selected]) &&
+          txt_selectable_widget(table->widgets[selected]) &&
+          txt_widget_key_press(table->widgets[selected], key))
+        {
+          return 1;
+        }
+    }
+
+  if (key == KEY_TAB)
+    {
+      int dir;
+      int i;
+
+      dir = txt_get_modifier_state(TXT_MOD_SHIFT) ? -1 : 1;
+
+      /* Cycle through all widgets until we find one that can be selected. */
+
+      for (i = table->selected_y * table->columns + table->selected_x + dir;
+           i >= 0 && i < table->num_widgets; i += dir)
+        {
+          if (is_actual_widget(table->widgets[i]) &&
+              txt_selectable_widget(table->widgets[i]))
             {
-                // First row? We need to add struts that are used to apply
-                // the column widths.
-                if (i < table->columns)
-                {
-                    widget = &TXT_NewStrut(0, 0)->widget;
-                }
-                else
-                {
-                    widget = &txt_table_overflow_right;
-                }
-                new_widgets[new_num_widgets] = widget;
-                ++new_num_widgets;
+              change_selection(table,
+                      i % table->columns, i / table->columns);
+              return 1;
+            }
+        }
+
+      return 0;
+    }
+
+  if (key == KEY_DOWNARROW)
+    {
+      int new_x;
+      int new_y;
+
+      /* Move cursor down to the next selectable widget */
+
+      for (new_y = table->selected_y + 1; new_y < rows; ++new_y)
+        {
+          new_x = find_selectable_column(table, new_y, table->selected_x);
+
+          if (new_x >= 0)
+            {
+              /* Found a selectable widget in this column! */
+
+              change_selection(table, new_x, new_y);
+
+              return 1;
             }
         }
     }
 
-    free(table->widgets);
-    table->widgets = new_widgets;
-    table->num_widgets = new_num_widgets;
-    table->columns = new_columns;
-}
-
-// Sets the widths of columns in a table.
-
-void TXT_SetColumnWidths(TXT_UNCAST_ARG(table), ...)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    va_list args;
-    txt_strut_t *strut;
-    int i;
-    int width;
-
-    va_start(args, TXT_UNCAST_ARG_NAME(table));
-
-    for (i=0; i<table->columns; ++i)
+  if (key == KEY_UPARROW)
     {
-        width = va_arg(args, int);
+      int new_x;
+      int new_y;
 
-        strut = (txt_strut_t *) table->widgets[i];
-        strut->width = width;
-    }
+      /* Move cursor up to the next selectable widget */
 
-    va_end(args);
-}
-
-// Moves the select by at least the given number of characters.
-// Currently quietly ignores pagex, as we don't use it.
-
-int TXT_PageTable(TXT_UNCAST_ARG(table), int pagex, int pagey)
-{
-    TXT_CAST_ARG(txt_table_t, table);
-    unsigned int *column_widths;
-    unsigned int *row_heights;
-    int rows;
-    int changed = 0;
-
-    rows = TableRows(table);
-
-    row_heights = malloc(sizeof(int) * rows);
-    column_widths = malloc(sizeof(int) * table->columns);
-
-    CalcRowColSizes(table, row_heights, column_widths);
-
-    if (pagex)
-    {
-        // @todo Jump selection to the left or right as needed
-    }
-
-    if (pagey)
-    {
-        int new_x, new_y;
-        int distance = 0;
-        int dir;
-
-        // What direction are we moving?
-
-        if (pagey > 0)
+      for (new_y = table->selected_y - 1; new_y >= 0; --new_y)
         {
-            dir = 1;
-        }
-        else
-        {
-            dir = -1;
-        }
+          new_x = find_selectable_column(table, new_y, table->selected_x);
 
-        // Move the cursor until the desired distance is reached.
-
-        new_y = table->selected_y;
-
-        while (new_y >= 0 && new_y < rows)
-        {
-            // We are about to travel a distance equal to the height of the row
-            // we are about to leave.
-
-            distance += row_heights[new_y];
-
-            // *Now* increment the loop.
-
-            new_y += dir;
-
-            new_x = FindSelectableColumn(table, new_y, table->selected_x);
-
-            if (new_x >= 0)
+          if (new_x >= 0)
             {
-                // Found a selectable widget in this column!
-                // Select it anyway in case we don't find something better.
+              /* Found a selectable widget in this column! */
 
-                ChangeSelection(table, new_x, new_y);
-                changed = 1;
+              change_selection(table, new_x, new_y);
 
-                // ...but is it far enough away?
+              return 1;
+            }
+        }
+    }
 
-                if (distance >= abs(pagey))
+  if (key == KEY_LEFTARROW)
+    {
+      int new_x;
+
+      /* Move cursor left */
+
+      for (new_x = table->selected_x - 1; new_x >= 0; --new_x)
+        {
+          if (selectable_cell(table, new_x, table->selected_y))
+            {
+              /* Found a selectable widget! */
+
+              change_selection(table, new_x, table->selected_y);
+
+              return 1;
+            }
+        }
+    }
+
+  if (key == KEY_RIGHTARROW)
+    {
+      int new_x;
+
+      /* Move cursor left */
+
+      for (new_x = table->selected_x + 1; new_x < table->columns; ++new_x)
+        {
+          if (selectable_cell(table, new_x, table->selected_y))
+            {
+              /* Found a selectable widget! */
+
+              change_selection(table, new_x, table->selected_y);
+
+              return 1;
+            }
+        }
+    }
+
+  return 0;
+}
+
+/* Check the currently selected widget in the table is valid. */
+
+static void check_valid_selection(txt_table_t *table)
+{
+  int rows;
+  int new_x;
+  int new_y;
+
+  rows = table_rows(table);
+
+  for (new_y = table->selected_y; new_y < rows; ++new_y)
+    {
+      new_x = find_selectable_column(table, new_y, table->selected_x);
+
+      if (new_x >= 0)
+        {
+          /* Found a selectable column. */
+
+          change_selection(table, new_x, new_y);
+
+          break;
+        }
+    }
+}
+
+static void layout_cell(txt_table_t *table, int x, int y, int draw_x,
+                        int draw_y)
+{
+  txt_widget_t *widget;
+  int col_width;
+
+  widget = table->widgets[y * table->columns + x];
+
+  col_width = widget->w;
+
+  /* Adjust x position based on alignment property */
+
+  switch (widget->align)
+    {
+    case TXT_HORIZ_LEFT:
+      widget->w = col_width;
+      break;
+
+    case TXT_HORIZ_CENTER:
+      txt_calc_widget_size(widget);
+
+      /* Separators are always drawn left-aligned. */
+
+      if (widget->widget_class != &txt_separator_class)
+        {
+          draw_x += (col_width - widget->w) / 2;
+        }
+
+      break;
+
+    case TXT_HORIZ_RIGHT:
+      txt_calc_widget_size(widget);
+
+      if (widget->widget_class != &txt_separator_class)
+        {
+          draw_x += col_width - widget->w;
+        }
+      break;
+    }
+
+  /* Set the position for this widget */
+
+  widget->x = draw_x;
+  widget->y = draw_y;
+
+  /* Recursively lay out any widgets contained in the widget */
+
+  txt_layout_widget(widget);
+}
+
+static void txt_table_layout(TXT_UNCAST_ARG(table))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  unsigned int *column_widths;
+  unsigned int *row_heights;
+  txt_widget_t *widget;
+  int draw_x;
+  int draw_y;
+  int x;
+  int y;
+  int i;
+  int rows;
+
+  /* Work out the column widths and row heights */
+
+  rows = table_rows(table);
+
+  column_widths = malloc(sizeof(int) * table->columns);
+  row_heights = malloc(sizeof(int) * rows);
+
+  calc_row_col_sizes(table, row_heights, column_widths);
+
+  /* If this table only has one column, expand column size to fit
+   * the display width.  Ensures that separators reach the window edges
+   * when drawing windows.
+   */
+
+  if (table->columns == 1)
+    {
+      column_widths[0] = table->widget.w;
+    }
+
+  /* Draw all cells */
+
+  draw_y = table->widget.y;
+
+  for (y = 0; y < rows; ++y)
+    {
+      draw_x = table->widget.x;
+
+      for (x = 0; x < table->columns; ++x)
+        {
+          i = y * table->columns + x;
+
+          if (i >= table->num_widgets) break;
+
+          widget = table->widgets[i];
+
+          if (is_actual_widget(widget))
+            {
+              calculate_widget_dimensions(table, x, y, column_widths,
+                                          row_heights, &widget->w,
+                                          &widget->h);
+              layout_cell(table, x, y, draw_x, draw_y);
+            }
+
+          draw_x += column_widths[x];
+        }
+
+      draw_y += row_heights[y];
+    }
+
+  free(row_heights);
+  free(column_widths);
+}
+
+static void txt_table_drawer(TXT_UNCAST_ARG(table))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  txt_widget_t *widget;
+  int i;
+
+  /* Check the table's current selection points at something valid before
+   * drawing.
+   */
+
+  check_valid_selection(table);
+
+  /* Draw all cells */
+
+  for (i = 0; i < table->num_widgets; ++i)
+    {
+      widget = table->widgets[i];
+
+      if (is_actual_widget(widget))
+        {
+          txt_goto_xy(widget->x, widget->y);
+          txt_draw_widget(widget);
+        }
+    }
+}
+
+/* Responds to mouse presses */
+
+static void txt_table_mouse_press(TXT_UNCAST_ARG(table), int x, int y, int b)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  txt_widget_t *widget;
+  int i;
+
+  for (i = 0; i < table->num_widgets; ++i)
+    {
+      widget = table->widgets[i];
+
+      /* NULL widgets are spacers */
+
+      if (is_actual_widget(widget))
+        {
+          if (x >= widget->x && x < (signed)(widget->x + widget->w) &&
+              y >= widget->y && y < (signed)(widget->y + widget->h))
+            {
+              /* This is the widget that was clicked!
+               *
+               * Select the cell if the widget is selectable
+               */
+
+              if (txt_selectable_widget(widget))
                 {
-                    break;
+                  change_selection(table, i % table->columns,
+                                   i / table->columns);
+                }
+
+              /* Propagate click */
+
+              txt_widget_mouse_press(widget, x, y, b);
+
+              break;
+            }
+        }
+    }
+}
+
+/* Determine whether the table is selectable. */
+
+static int txt_table_selectable(TXT_UNCAST_ARG(table))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  int i;
+
+  /* Is the currently-selected cell selectable? */
+
+  if (selectable_cell(table, table->selected_x, table->selected_y))
+    {
+      return 1;
+    }
+
+  /* Find the first selectable cell and set selected_x, selected_y. */
+
+  for (i = 0; i < table->num_widgets; ++i)
+    {
+      if (is_actual_widget(table->widgets[i]) &&
+          txt_selectable_widget(table->widgets[i]))
+        {
+          change_selection(table, i % table->columns, i / table->columns);
+          return 1;
+        }
+    }
+
+  /* No selectable widgets exist within the table. */
+
+  return 0;
+}
+
+/* Need to pass through focus changes to the selected child widget. */
+
+static void txt_table_focused(TXT_UNCAST_ARG(table), int focused)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  int i;
+
+  i = table->selected_y * table->columns + table->selected_x;
+
+  if (i < table->num_widgets)
+    {
+      if (is_actual_widget(table->widgets[i]))
+        {
+          txt_set_widget_focus(table->widgets[i], focused);
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* Remove all entries from a table */
+
+void txt_clear_table(TXT_UNCAST_ARG(table))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  int i;
+
+  /* Free all widgets
+   * Skip over the first (num_columns) widgets in the array, as these
+   * are the column struts used to control column width
+   */
+
+  for (i = table->columns; i < table->num_widgets; ++i)
+    {
+      if (is_actual_widget(table->widgets[i]))
+        {
+          txt_destroy_widget(table->widgets[i]);
+        }
+    }
+
+  /* Shrink the table to just the column strut widgets */
+
+  table->num_widgets = table->columns;
+}
+
+void txt_add_widget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  TXT_CAST_ARG(txt_widget_t, widget);
+  int is_separator;
+  int i;
+
+  /* Convenience alias for NULL: */
+
+  if (widget == &txt_table_empty)
+    {
+      widget = NULL;
+    }
+  else if (widget == &txt_table_eol)
+    {
+      fill_row_to_end(table);
+      return;
+    }
+
+  /* We have special handling for the separator widget: */
+
+  is_separator = is_actual_widget(widget) &&
+                 widget->widget_class == &txt_separator_class;
+
+  /* If we add two separators consecutively, the new separator replaces the
+   * first. This allows us to override the "implicit" separator that is
+   * added at the top of a window when it is created.
+   */
+
+  if (is_separator)
+    {
+      for (i = table->num_widgets - 1; i >= 0; --i)
+        {
+          txt_widget_t *last_widget;
+          last_widget = table->widgets[i];
+
+          if (is_actual_widget(last_widget) &&
+              widget->widget_class == &txt_separator_class &&
+              last_widget->widget_class == &txt_separator_class)
+            {
+              table->widgets[i] = widget;
+              txt_destroy_widget(last_widget);
+              return;
+            }
+          else if (last_widget != &txt_table_overflow_right)
+            {
+              break;
+            }
+        }
+    }
+
+  /* Separators begin on a new line. */
+
+  if (is_separator)
+    {
+      fill_row_to_end(table);
+    }
+
+  table->widgets = realloc(
+          table->widgets,
+          sizeof(txt_widget_t *) * (table->num_widgets + 1));
+  table->widgets[table->num_widgets] = widget;
+  ++table->num_widgets;
+
+  /* Maintain parent pointer. */
+
+  if (is_actual_widget(widget))
+    {
+      widget->parent = &table->widget;
+    }
+
+  /* Separators always take up the entire line. */
+
+  if (is_separator)
+    {
+      fill_row_to_end(table);
+    }
+}
+
+/* Add multiple widgets to a table. */
+
+void txt_add_widgets(TXT_UNCAST_ARG(table), ...)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  va_list args;
+  txt_widget_t *widget;
+
+  va_start(args, TXT_UNCAST_ARG_NAME(table));
+
+  /* Keep adding widgets until a NULL is reached. */
+
+  for (; ; )
+    {
+      widget = va_arg(args, txt_widget_t *);
+
+      if (widget == NULL)
+        {
+          break;
+        }
+
+      txt_add_widget(table, widget);
+    }
+
+  va_end(args);
+}
+
+void txt_init_table(txt_table_t *table, int columns)
+{
+  int i;
+
+  txt_init_widget(table, &txt_table_class);
+  table->columns = columns;
+  table->widgets = NULL;
+  table->num_widgets = 0;
+  table->selected_x = 0;
+  table->selected_y = 0;
+
+  /* Add a strut for each column at the start of the table.
+   * These are used by the txt_set_column_widths function below:
+   * the struts are created with widths of 0 each, but this
+   * function changes them.
+   */
+
+  for (i = 0; i < columns; ++i)
+    {
+      txt_add_widget(table, txt_new_strut(0, 0));
+    }
+}
+
+txt_table_t *txt_new_table(int columns)
+{
+  txt_table_t *table;
+
+  table = malloc(sizeof(txt_table_t));
+
+  txt_init_table(table, columns);
+
+  return table;
+}
+
+/* Alternative to txt_new_table() that allows a list of widgets to be
+ * provided in its arguments.
+ */
+
+txt_table_t *txt_make_table(int columns, ...)
+{
+  txt_table_t *table;
+  va_list args;
+
+  table = txt_new_table(columns);
+  va_start(args, columns);
+
+  for (; ; )
+    {
+      txt_widget_t *widget;
+      widget = va_arg(args, txt_widget_t *);
+
+      if (widget == NULL)
+        {
+          break;
+        }
+
+      txt_add_widget(table, widget);
+    }
+
+  va_end(args);
+
+  return table;
+}
+
+/* Create a horizontal table from a list of widgets. */
+
+txt_table_t *txt_new_horiz_box(TXT_UNCAST_ARG(first_widget), ...)
+{
+  TXT_CAST_ARG(txt_widget_t, first_widget);
+  txt_table_t *result;
+  va_list args;
+  int num_args;
+
+  /* First, find the number of arguments to determine the width of
+   * the box.
+   */
+
+  va_start(args, TXT_UNCAST_ARG_NAME(first_widget));
+
+  num_args = 1;
+
+  for (; ; )
+    {
+      txt_widget_t *widget;
+
+      widget = va_arg(args, txt_widget_t *);
+
+      if (widget == NULL)
+        {
+          /* End of list */
+
+          break;
+        }
+      else
+        {
+          ++num_args;
+        }
+    }
+
+  va_end(args);
+
+  /* Create the table. */
+
+  result = txt_new_table(num_args);
+  txt_add_widget(result, first_widget);
+
+  /* Go through the list again and add each widget. */
+
+  va_start(args, TXT_UNCAST_ARG_NAME(first_widget));
+
+  for (; ; )
+    {
+      txt_widget_t *widget;
+
+      widget = va_arg(args, txt_widget_t *);
+
+      if (widget == NULL)
+        {
+          /* End of list */
+
+          break;
+        }
+      else
+        {
+          txt_add_widget(result, widget);
+        }
+    }
+
+  va_end(args);
+
+  return result;
+}
+
+/* Get the currently-selected widget in a table, recursively searching
+ * through sub-tables if necessary.
+ */
+
+txt_widget_t *txt_get_selected_widget(TXT_UNCAST_ARG(table))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  txt_widget_t *result;
+  int index;
+
+  index = table->selected_y * table->columns + table->selected_x;
+
+  result = NULL;
+
+  if (index >= 0 && index < table->num_widgets)
+    {
+      result = table->widgets[index];
+
+      if (!is_actual_widget(result))
+        {
+          result = NULL;
+        }
+    }
+
+  if (result != NULL && result->widget_class == &txt_table_class)
+    {
+      result = txt_get_selected_widget(result);
+    }
+
+  return result;
+}
+
+/* Selects a given widget in a table, recursively searching any tables
+ * within this table.  Returns 1 if successful, 0 if unsuccessful.
+ */
+
+int txt_select_widget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget))
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  TXT_CAST_ARG(txt_widget_t, widget);
+  int i;
+
+  for (i = 0; i < table->num_widgets; ++i)
+    {
+      if (!is_actual_widget(table->widgets[i]))
+        {
+          continue;
+        }
+
+      if (table->widgets[i] == widget)
+        {
+          /* Found the item!  Select it and return. */
+
+          change_selection(table, i % table->columns, i / table->columns);
+
+          return 1;
+        }
+
+      if (table->widgets[i]->widget_class == &txt_table_class)
+        {
+          /* This item is a subtable.  Recursively search this table. */
+
+          if (txt_select_widget(table->widgets[i], widget))
+            {
+              /* Found it in the subtable.  Select this subtable and return.
+               */
+
+              change_selection(table, i % table->columns,
+                      i / table->columns);
+
+              return 1;
+            }
+        }
+    }
+
+  /* Not found. */
+
+  return 0;
+}
+
+void txt_set_table_columns(TXT_UNCAST_ARG(table), int new_columns)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  txt_widget_t **new_widgets;
+  txt_widget_t *widget;
+  int new_num_widgets;
+  int i;
+  int j;
+  int x;
+
+  /* We need as many full rows as are in the current list, plus the
+   * remainder from the last row.
+   */
+
+  new_num_widgets = (table->num_widgets / table->columns) * new_columns +
+                    (table->num_widgets % table->columns);
+  new_widgets = calloc(new_num_widgets, sizeof(txt_widget_t *));
+
+  /* Reset and add one by one from the old table. */
+
+  new_num_widgets = 0;
+
+  for (i = 0; i < table->num_widgets; ++i)
+    {
+      widget = table->widgets[i];
+      x = i % table->columns;
+
+      if (x < new_columns)
+        {
+          new_widgets[new_num_widgets] = widget;
+          ++new_num_widgets;
+        }
+      else if (is_actual_widget(widget))
+        {
+          txt_destroy_widget(widget);
+        }
+
+      /* When we reach the last column of a row, we must pad it out with
+       * extra widgets to reach the next row.
+       */
+
+      if (x == table->columns - 1)
+        {
+          for (j = table->columns; j < new_columns; ++j)
+            {
+              /* First row? We need to add struts that are used to apply
+               * the column widths.
+               */
+
+              if (i < table->columns)
+                {
+                  widget = &txt_new_strut(0, 0)->widget;
+                }
+              else
+                {
+                  widget = &txt_table_overflow_right;
+                }
+
+              new_widgets[new_num_widgets] = widget;
+              ++new_num_widgets;
+            }
+        }
+    }
+
+  free(table->widgets);
+  table->widgets = new_widgets;
+  table->num_widgets = new_num_widgets;
+  table->columns = new_columns;
+}
+
+/* Sets the widths of columns in a table. */
+
+void txt_set_column_widths(TXT_UNCAST_ARG(table), ...)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  va_list args;
+  txt_strut_t *strut;
+  int i;
+  int width;
+
+  va_start(args, TXT_UNCAST_ARG_NAME(table));
+
+  for (i = 0; i < table->columns; ++i)
+    {
+      width = va_arg(args, int);
+
+      strut = (txt_strut_t *)table->widgets[i];
+      strut->width = width;
+    }
+
+  va_end(args);
+}
+
+/* Moves the select by at least the given number of characters.
+ * Currently quietly ignores pagex, as we don't use it.
+ */
+
+int txt_page_table(TXT_UNCAST_ARG(table), int pagex, int pagey)
+{
+  TXT_CAST_ARG(txt_table_t, table);
+  unsigned int *column_widths;
+  unsigned int *row_heights;
+  int rows;
+  int changed = 0;
+
+  rows = table_rows(table);
+
+  row_heights = malloc(sizeof(int) * rows);
+  column_widths = malloc(sizeof(int) * table->columns);
+
+  calc_row_col_sizes(table, row_heights, column_widths);
+
+  if (pagex)
+    {
+      /* @todo Jump selection to the left or right as needed */
+    }
+
+  if (pagey)
+    {
+      int new_x;
+      int new_y;
+      int distance = 0;
+      int dir;
+
+      /* What direction are we moving? */
+
+      if (pagey > 0)
+        {
+          dir = 1;
+        }
+      else
+        {
+          dir = -1;
+        }
+
+      /* Move the cursor until the desired distance is reached. */
+
+      new_y = table->selected_y;
+
+      while (new_y >= 0 && new_y < rows)
+        {
+          /* We are about to travel a distance equal to the height of the row
+           * we are about to leave.
+           */
+
+          distance += row_heights[new_y];
+
+          /* *Now* increment the loop. */
+
+          new_y += dir;
+
+          new_x = find_selectable_column(table, new_y, table->selected_x);
+
+          if (new_x >= 0)
+            {
+              /* Found a selectable widget in this column!
+               * Select it anyway in case we don't find something better.
+               */
+
+              change_selection(table, new_x, new_y);
+              changed = 1;
+
+              /* ...but is it far enough away? */
+
+              if (distance >= abs(pagey))
+                {
+                  break;
                 }
             }
         }
     }
 
-    free(row_heights);
-    free(column_widths);
+  free(row_heights);
+  free(column_widths);
 
-    return changed;
+  return changed;
 }
-
diff --git a/games/NXDoom/textscreen/txt_table.h b/games/NXDoom/textscreen/txt_table.h
index ff7509bac..d1dffbeff 100644
--- a/games/NXDoom/textscreen/txt_table.h
+++ b/games/NXDoom/textscreen/txt_table.h
@@ -1,25 +1,34 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_table.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_TABLE_H
 #define TXT_TABLE_H
 
-/**
- * @file txt_table.h
- *
- * Table widget.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "txt_widget.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
 /**
  * Magic value that if used in a table, will indicate that the cell is
@@ -36,60 +45,73 @@
 #define TXT_TABLE_OVERFLOW_DOWN (&txt_table_overflow_down)
 
 /**
- * Magic value that if given to @ref TXT_AddWidget(), will pad out all
+ * Magic value that if given to @ref txt_add_widget(), will pad out all
  * columns until the end of line.
  */
+
 #define TXT_TABLE_EOL (&txt_table_eol)
 
 /**
- * Indicates an empty space to @ref TXT_AddWidgets(). Equivalent to
- * TXT_AddWidget(table, NULL), except that NULL is used by TXT_AddWidgets()
+ * Indicates an empty space to @ref txt_add_widgets(). Equivalent to
+ * txt_add_widget(table, NULL), except that NULL is used by txt_add_widgets()
  * to indicate the end of input.
  */
+
 #define TXT_TABLE_EMPTY (&txt_table_empty)
 
-/**
- * Table widget.
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Table widget.
  *
  * A table is a widget that contains other widgets.  It may have
  * multiple columns, in which case the child widgets are laid out
  * in a grid.  Columns automatically grow as necessary, although
- * minimum column widths can be set using @ref TXT_SetColumnWidths.
+ * minimum column widths can be set using @ref txt_set_column_widths.
  *
- * To create a new table, use @ref TXT_NewTable.  It is also
- * possible to use @ref TXT_NewHorizBox to create a table, specifying
+ * To create a new table, use @ref txt_new_table.  It is also
+ * possible to use @ref txt_new_horiz_box to create a table, specifying
  * widgets to place inside a horizontal list.  A vertical list is
  * possible simply by creating a table containing a single column.
  */
 
-typedef struct txt_table_s txt_table_t;
-
-#include "txt_widget.h"
-
 struct txt_table_s
 {
-    txt_widget_t widget;
+  txt_widget_t widget;
 
-    // Widgets in this table
-    // The widget at (x,y) in the table is widgets[columns * y + x]
-    txt_widget_t **widgets;
-    int num_widgets;
+  /* Widgets in this table
+   * The widget at (x,y) in the table is widgets[columns * y + x]
+   */
 
-    // Number of columns
-    int columns;
+  txt_widget_t **widgets;
+  int num_widgets;
 
-    // Currently selected:
-    int selected_x;
-    int selected_y;
+  /* Number of columns */
+
+  int columns;
+
+  /* Currently selected: */
+
+  int selected_x;
+  int selected_y;
 };
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 extern txt_widget_class_t txt_table_class;
 extern txt_widget_t txt_table_overflow_right;
 extern txt_widget_t txt_table_overflow_down;
 extern txt_widget_t txt_table_eol;
 extern txt_widget_t txt_table_empty;
 
-void TXT_InitTable(txt_table_t *table, int columns);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void txt_init_table(txt_table_t *table, int columns);
 
 /**
  * Create a new table.
@@ -98,7 +120,7 @@ void TXT_InitTable(txt_table_t *table, int columns);
  * @return              Pointer to the new table structure.
  */
 
-txt_table_t *TXT_NewTable(int columns);
+txt_table_t *txt_new_table(int columns);
 
 /**
  * Create a new table and populate it with provided widgets.
@@ -110,7 +132,7 @@ txt_table_t *TXT_NewTable(int columns);
  * @return              Pointer to the new table structure.
  */
 
-txt_table_t *TXT_MakeTable(int columns, ...);
+txt_table_t *txt_make_table(int columns, ...);
 
 /**
  * Create a table containing the specified widgets packed horizontally,
@@ -123,7 +145,7 @@ txt_table_t *TXT_MakeTable(int columns, ...);
  * @return             Pointer to the new table structure.
  */
 
-txt_table_t *TXT_NewHorizBox(TXT_UNCAST_ARG(first_widget), ...);
+txt_table_t *txt_new_horiz_box(TXT_UNCAST_ARG(first_widget), ...);
 
 /**
  * Get the currently selected widget within a table.
@@ -134,7 +156,7 @@ txt_table_t *TXT_NewHorizBox(TXT_UNCAST_ARG(first_widget), ...);
  * @return             Pointer to the widget that is currently selected.
  */
 
-txt_widget_t *TXT_GetSelectedWidget(TXT_UNCAST_ARG(table));
+txt_widget_t *txt_get_selected_widget(TXT_UNCAST_ARG(table));
 
 /**
  * Add a widget to a table.
@@ -147,26 +169,26 @@ txt_widget_t *TXT_GetSelectedWidget(TXT_UNCAST_ARG(table));
  * row.
  *
  * For adding many widgets, it may be easier to use
- * @ref TXT_AddWidgets.
+ * @ref txt_add_widgets.
  *
  * @param table        The table.
  * @param widget       The widget to add.
  */
 
-void TXT_AddWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
+void txt_add_widget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
 
 /**
  * Add multiple widgets to a table.
  *
  * Widgets are added as described in the documentation for the
- * @ref TXT_AddWidget function.  This function adds multiple
+ * @ref txt_add_widget function.  This function adds multiple
  * widgets.  The number of arguments is variable, and the argument
  * list must be terminated by a NULL pointer.
  *
  * @param table        The table.
  */
 
-void TXT_AddWidgets(TXT_UNCAST_ARG(table), ...);
+void txt_add_widgets(TXT_UNCAST_ARG(table), ...);
 
 /**
  * Select the given widget that is contained within the specified
@@ -182,7 +204,7 @@ void TXT_AddWidgets(TXT_UNCAST_ARG(table), ...);
  *                    this table.
  */
 
-int TXT_SelectWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
+int txt_select_widget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
 
 /**
  * Change the number of columns in the table.
@@ -198,7 +220,7 @@ int TXT_SelectWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
  * @param new_columns   The new number of columns.
  */
 
-void TXT_SetTableColumns(TXT_UNCAST_ARG(table), int new_columns);
+void txt_set_table_columns(TXT_UNCAST_ARG(table), int new_columns);
 
 /**
  * Set the widths of the columns of the table.
@@ -217,7 +239,7 @@ void TXT_SetTableColumns(TXT_UNCAST_ARG(table), int new_columns);
  * @param table     The table.
  */
 
-void TXT_SetColumnWidths(TXT_UNCAST_ARG(table), ...);
+void txt_set_column_widths(TXT_UNCAST_ARG(table), ...);
 
 /**
  * Remove all widgets from a table.
@@ -225,7 +247,7 @@ void TXT_SetColumnWidths(TXT_UNCAST_ARG(table), ...);
  * @param table    The table.
  */
 
-void TXT_ClearTable(TXT_UNCAST_ARG(table));
+void txt_clear_table(TXT_UNCAST_ARG(table));
 
 /**
  * Hack to move the selection in a table by a 'page', triggered by the
@@ -238,8 +260,6 @@ void TXT_ClearTable(TXT_UNCAST_ARG(table));
  * @return         Non-zero if the selection has been changed.
  */
 
-int TXT_PageTable(TXT_UNCAST_ARG(table), int pagex, int pagey);
+int txt_page_table(TXT_UNCAST_ARG(table), int pagex, int pagey);
 
 #endif /* #ifndef TXT_TABLE_T */
-
-
diff --git a/games/NXDoom/textscreen/txt_utf8.c b/games/NXDoom/textscreen/txt_utf8.c
index 4d5337b2f..086025994 100644
--- a/games/NXDoom/textscreen/txt_utf8.c
+++ b/games/NXDoom/textscreen/txt_utf8.c
@@ -1,16 +1,25 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_utf8.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,137 +27,133 @@
 
 #include "txt_utf8.h"
 
-// Encode a Unicode character as UTF-8, storing it in the buffer 'p'
-// and returning the new, incremented position.
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
-char *TXT_EncodeUTF8(char *p, unsigned int c)
+/* Encode a Unicode character as UTF-8, storing it in the buffer 'p'
+ * and returning the new, incremented position.
+ */
+
+char *txt_encode_utf8(char *p, unsigned int c)
 {
-    if (c < 0x80)                             // 1 character (ASCII):
+  if (c < 0x80) /* 1 character (ASCII): */
     {
-        p[0] = c;
-        return p + 1;
+      p[0] = c;
+      return p + 1;
     }
-    else if (c < 0x800)                       // 2 character:
+  else if (c < 0x800) /* 2 character: */
     {
-        p[0] = 0xc0 | (c >> 6);
-        p[1] = 0x80 | (c & 0x3f);
-        return p + 2;
+      p[0] = 0xc0 | (c >> 6);
+      p[1] = 0x80 | (c & 0x3f);
+      return p + 2;
     }
-    else if (c < 0x10000)                     // 3 chacater:
+  else if (c < 0x10000) /* 3 chacater: */
     {
-        p[0] = 0xe0 | (c >> 12);
-        p[1] = 0x80 | ((c >> 6) & 0x3f);
-        p[2] = 0x80 | (c & 0x3f);
-        return p + 3;
+      p[0] = 0xe0 | (c >> 12);
+      p[1] = 0x80 | ((c >> 6) & 0x3f);
+      p[2] = 0x80 | (c & 0x3f);
+      return p + 3;
     }
-    else if (c < 0x200000)                    // 4 character:
+  else if (c < 0x200000) /* 4 character: */
     {
-        p[0] = 0xf0 | (c >> 18);
-        p[1] = 0x80 | ((c >> 12) & 0x3f);
-        p[2] = 0x80 | ((c >> 6) & 0x3f);
-        p[3] = 0x80 | (c & 0x3f);
-        return p + 4;
+      p[0] = 0xf0 | (c >> 18);
+      p[1] = 0x80 | ((c >> 12) & 0x3f);
+      p[2] = 0x80 | ((c >> 6) & 0x3f);
+      p[3] = 0x80 | (c & 0x3f);
+      return p + 4;
     }
-    else
+  else
     {
-        // Too big!
-
-        return p;
+      return p; /* Too big! */
     }
 }
 
-// Decode UTF-8 character, incrementing *ptr over the decoded bytes.
+/* Decode UTF-8 character, incrementing *ptr over the decoded bytes. */
 
-unsigned int TXT_DecodeUTF8(const char **ptr)
+unsigned int txt_decode_utf8(const char **ptr)
 {
-    const char *p = *ptr;
-    unsigned int c;
+  const char *p = *ptr;
+  unsigned int c;
 
-    // UTF-8 decode.
+  /* UTF-8 decode. */
 
-    if ((*p & 0x80) == 0)                     // 1 character (ASCII):
+  if ((*p & 0x80) == 0) /* 1 character (ASCII): */
     {
-        c = *p;
-        *ptr += 1;
+      c = *p;
+      *ptr += 1;
     }
-    else if ((p[0] & 0xe0) == 0xc0            // 2 character:
-          && (p[1] & 0xc0) == 0x80)
+  else if ((p[0] & 0xe0) == 0xc0 /* 2 character: */
+           && (p[1] & 0xc0) == 0x80)
     {
-        c = ((p[0] & 0x1f) << 6)
-          |  (p[1] & 0x3f);
-        *ptr += 2;
+      c = ((p[0] & 0x1f) << 6) | (p[1] & 0x3f);
+      *ptr += 2;
     }
-    else if ((p[0] & 0xf0) == 0xe0            // 3 character:
-          && (p[1] & 0xc0) == 0x80
-          && (p[2] & 0xc0) == 0x80)
+  else if ((p[0] & 0xf0) == 0xe0 /* 3 character: */
+           && (p[1] & 0xc0) == 0x80 && (p[2] & 0xc0) == 0x80)
     {
-        c = ((p[0] & 0x0f) << 12)
-          | ((p[1] & 0x3f) << 6)
-          |  (p[2] & 0x3f);
-        *ptr += 3;
+      c = ((p[0] & 0x0f) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+      *ptr += 3;
     }
-    else if ((p[0] & 0xf8) == 0xf0            // 4 character:
-          && (p[1] & 0xc0) == 0x80
-          && (p[2] & 0xc0) == 0x80
-          && (p[3] & 0xc0) == 0x80)
+  else if ((p[0] & 0xf8) == 0xf0 /* 4 character: */
+           && (p[1] & 0xc0) == 0x80 && (p[2] & 0xc0) == 0x80 &&
+           (p[3] & 0xc0) == 0x80)
     {
-        c = ((p[0] & 0x07) << 18)
-          | ((p[1] & 0x3f) << 12)
-          | ((p[2] & 0x3f) << 6)
-          |  (p[3] & 0x3f);
-        *ptr += 4;
+      c = ((p[0] & 0x07) << 18) | ((p[1] & 0x3f) << 12) |
+          ((p[2] & 0x3f) << 6) | (p[3] & 0x3f);
+      *ptr += 4;
     }
-    else
+  else
     {
-        // Decode failure.
-        // Don't bother with 5/6 byte sequences.
+      /* Decode failure.
+       * Don't bother with 5/6 byte sequences.
+       */
 
-        c = 0;
+      c = 0;
     }
 
-    return c;
+  return c;
 }
 
-// Count the number of characters in a UTF-8 string.
+/* Count the number of characters in a UTF-8 string. */
 
-unsigned int TXT_UTF8_Strlen(const char *s)
+unsigned int txt_utf8_strlen(const char *s)
 {
-    const char *p;
-    unsigned int result = 0;
-    unsigned int c;
+  const char *p;
+  unsigned int result = 0;
+  unsigned int c;
 
-    for (p = s; *p != '\0';)
+  for (p = s; *p != '\0'; )
     {
-        c = TXT_DecodeUTF8(&p);
+      c = txt_decode_utf8(&p);
 
-        if (c == 0)
+      if (c == 0)
         {
-            break;
+          break;
         }
 
-        ++result;
+      ++result;
     }
 
-    return result;
+  return result;
 }
 
-// Skip past the first n characters in a UTF-8 string.
+/* Skip past the first n characters in a UTF-8 string. */
 
-char *TXT_UTF8_SkipChars(const char *s, unsigned int n)
+char *txt_utf8_skip_chars(const char *s, unsigned int n)
 {
-    unsigned int i;
-    const char *p;
+  unsigned int i;
+  const char *p;
 
-    p = s;
+  p = s;
 
-    for (i = 0; i < n; ++i)
+  for (i = 0; i < n; ++i)
     {
-        if (TXT_DecodeUTF8(&p) == 0)
+      if (txt_decode_utf8(&p) == 0)
         {
-            break;
+          break;
         }
     }
 
-    return (char *) p;
+  return (char *)p;
 }
-
diff --git a/games/NXDoom/textscreen/txt_utf8.h b/games/NXDoom/textscreen/txt_utf8.h
index a2ee96dc2..0d2f98ef3 100644
--- a/games/NXDoom/textscreen/txt_utf8.h
+++ b/games/NXDoom/textscreen/txt_utf8.h
@@ -1,26 +1,38 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_utf8.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_UTF8_H
 #define TXT_UTF8_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <stdarg.h>
 
-char *TXT_EncodeUTF8(char *p, unsigned int c);
-unsigned int TXT_DecodeUTF8(const char **ptr);
-unsigned int TXT_UTF8_Strlen(const char *s);
-char *TXT_UTF8_SkipChars(const char *s, unsigned int n);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#endif /* #ifndef TXT_UTF8_H */
+char *txt_encode_utf8(char *p, unsigned int c);
+unsigned int txt_decode_utf8(const char **ptr);
+unsigned int txt_utf8_strlen(const char *s);
+char *txt_utf8_skip_chars(const char *s, unsigned int n);
 
+#endif /* TXT_UTF8_H */
diff --git a/games/NXDoom/textscreen/txt_widget.c b/games/NXDoom/textscreen/txt_widget.c
index 24deda0ee..01c44643c 100644
--- a/games/NXDoom/textscreen/txt_widget.c
+++ b/games/NXDoom/textscreen/txt_widget.c
@@ -1,326 +1,350 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_widget.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "txt_desktop.h"
+#include "txt_gui.h"
 #include "txt_io.h"
 #include "txt_widget.h"
-#include "txt_gui.h"
-#include "txt_desktop.h"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
 
 typedef struct
 {
-    char *signal_name;
-    TxtWidgetSignalFunc func;
-    void *user_data;
+  char *signal_name;
+  txt_widget_signal_f func;
+  void *user_data;
 } txt_callback_t;
 
 struct txt_callback_table_s
 {
-    int refcount;
-    txt_callback_t *callbacks;
-    int num_callbacks;
+  int refcount;
+  txt_callback_t *callbacks;
+  int num_callbacks;
 };
 
-txt_callback_table_t *TXT_NewCallbackTable(void)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int txt_contains_widget(TXT_UNCAST_ARG(haystack),
+                               TXT_UNCAST_ARG(needle))
 {
-    txt_callback_table_t *table;
+  TXT_CAST_ARG(txt_widget_t, haystack);
+  TXT_CAST_ARG(txt_widget_t, needle);
 
-    table = malloc(sizeof(txt_callback_table_t));
-    table->callbacks = NULL;
-    table->num_callbacks = 0;
-    table->refcount = 1;
-
-    return table;
-}
-
-void TXT_RefCallbackTable(txt_callback_table_t *table)
-{
-    ++table->refcount;
-}
-
-void TXT_UnrefCallbackTable(txt_callback_table_t *table)
-{
-    int i;
-
-    --table->refcount;
-
-    if (table->refcount == 0)
+  while (needle != NULL)
     {
-        // No more references to this table
-
-        for (i=0; i<table->num_callbacks; ++i)
+      if (needle == haystack)
         {
-            free(table->callbacks[i].signal_name);
+          return 1;
         }
-    
-        free(table->callbacks);
-        free(table);
+
+      needle = needle->parent;
+    }
+
+  return 0;
+}
+
+static txt_callback_table_t *txt_new_callback_table(void)
+{
+  txt_callback_table_t *table;
+
+  table = malloc(sizeof(txt_callback_table_t));
+  table->callbacks = NULL;
+  table->num_callbacks = 0;
+  table->refcount = 1;
+
+  return table;
+}
+
+static void txt_ref_callback_table(txt_callback_table_t *table)
+{
+  ++table->refcount;
+}
+
+static void txt_unref_callback_table(txt_callback_table_t *table)
+{
+  int i;
+
+  --table->refcount;
+
+  if (table->refcount == 0)
+    {
+      /* No more references to this table */
+
+      for (i = 0; i < table->num_callbacks; ++i)
+        {
+          free(table->callbacks[i].signal_name);
+        }
+
+      free(table->callbacks);
+      free(table);
     }
 }
 
-void TXT_InitWidget(TXT_UNCAST_ARG(widget), txt_widget_class_t *widget_class)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void txt_init_widget(TXT_UNCAST_ARG(widget),
+        txt_widget_class_t *widget_class)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    widget->widget_class = widget_class;
-    widget->callback_table = TXT_NewCallbackTable();
-    widget->parent = NULL;
+  widget->widget_class = widget_class;
+  widget->callback_table = txt_new_callback_table();
+  widget->parent = NULL;
 
-    // Not focused until we hear otherwise.
+  /* Not focused until we hear otherwise. */
 
-    widget->focused = 0;
+  widget->focused = 0;
 
-    // Visible by default.
+  /* Visible by default. */
 
-    widget->visible = 1;
+  widget->visible = 1;
 
-    // Align left by default
+  /* Align left by default */
 
-    widget->align = TXT_HORIZ_LEFT;
+  widget->align = TXT_HORIZ_LEFT;
 }
 
-void TXT_SignalConnect(TXT_UNCAST_ARG(widget),
-                       const char *signal_name,
-                       TxtWidgetSignalFunc func, 
-                       void *user_data)
+void txt_signal_connect(TXT_UNCAST_ARG(widget), const char *signal_name,
+                        txt_widget_signal_f func, void *user_data)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
-    txt_callback_table_t *table;
-    txt_callback_t *callback;
+  TXT_CAST_ARG(txt_widget_t, widget);
+  txt_callback_table_t *table;
+  txt_callback_t *callback;
 
-    table = widget->callback_table;
+  table = widget->callback_table;
 
-    // Add a new callback to the table
+  /* Add a new callback to the table */
 
-    table->callbacks 
-            = realloc(table->callbacks,
-                      sizeof(txt_callback_t) * (table->num_callbacks + 1));
-    callback = &table->callbacks[table->num_callbacks];
-    ++table->num_callbacks;
+  table->callbacks = realloc(
+      table->callbacks, sizeof(txt_callback_t) * (table->num_callbacks + 1));
+  callback = &table->callbacks[table->num_callbacks];
+  ++table->num_callbacks;
 
-    callback->signal_name = strdup(signal_name);
-    callback->func = func;
-    callback->user_data = user_data;
+  callback->signal_name = strdup(signal_name);
+  callback->func = func;
+  callback->user_data = user_data;
 }
 
-void TXT_EmitSignal(TXT_UNCAST_ARG(widget), const char *signal_name)
+void txt_emit_signal(TXT_UNCAST_ARG(widget), const char *signal_name)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
-    txt_callback_table_t *table;
-    int i;
+  TXT_CAST_ARG(txt_widget_t, widget);
+  txt_callback_table_t *table;
+  int i;
 
-    table = widget->callback_table;
+  table = widget->callback_table;
 
-    // Don't destroy the table while we're searching through it
-    // (one of the callbacks may destroy this window)
+  /* Don't destroy the table while we're searching through it
+   * (one of the callbacks may destroy this window)
+   */
 
-    TXT_RefCallbackTable(table);
+  txt_ref_callback_table(table);
 
-    // Search the table for all callbacks with this name and invoke
-    // the functions.
+  /* Search the table for all callbacks with this name and invoke
+   * the functions.
+   */
 
-    for (i=0; i<table->num_callbacks; ++i)
+  for (i = 0; i < table->num_callbacks; ++i)
     {
-        if (!strcmp(table->callbacks[i].signal_name, signal_name))
+      if (!strcmp(table->callbacks[i].signal_name, signal_name))
         {
-            table->callbacks[i].func(widget, table->callbacks[i].user_data);
+          table->callbacks[i].func(widget, table->callbacks[i].user_data);
         }
     }
 
-    // Finished using the table
+  /* Finished using the table */
 
-    TXT_UnrefCallbackTable(table);
+  txt_unref_callback_table(table);
 }
 
-void TXT_CalcWidgetSize(TXT_UNCAST_ARG(widget))
+void txt_calc_widget_size(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    widget->widget_class->size_calc(widget);
+  widget->widget_class->size_calc(widget);
 }
 
-void TXT_DrawWidget(TXT_UNCAST_ARG(widget))
+void txt_draw_widget(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
-    txt_saved_colors_t colors;
+  TXT_CAST_ARG(txt_widget_t, widget);
+  txt_saved_colors_t colors;
 
-    // The drawing function might change the fg/bg colors,
-    // so make sure we restore them after it's done.
+  /* The drawing function might change the fg/bg colors,
+   * so make sure we restore them after it's done.
+   */
 
-    TXT_SaveColors(&colors);
+  txt_save_colours(&colors);
 
-    // For convenience...
+  /* For convenience... */
 
-    TXT_GotoXY(widget->x, widget->y);
+  txt_goto_xy(widget->x, widget->y);
 
-    // Call drawer method
+  /* Call drawer method */
 
-    widget->widget_class->drawer(widget);
+  widget->widget_class->drawer(widget);
 
-    TXT_RestoreColors(&colors);
+  txt_restore_colours(&colors);
 }
 
-void TXT_DestroyWidget(TXT_UNCAST_ARG(widget))
+void txt_destroy_widget(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    widget->widget_class->destructor(widget);
-    TXT_UnrefCallbackTable(widget->callback_table);
-    free(widget);
+  widget->widget_class->destructor(widget);
+  txt_unref_callback_table(widget->callback_table);
+  free(widget);
 }
 
-int TXT_WidgetKeyPress(TXT_UNCAST_ARG(widget), int key)
+int txt_widget_key_press(TXT_UNCAST_ARG(widget), int key)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    if (widget->widget_class->key_press != NULL)
+  if (widget->widget_class->key_press != NULL)
     {
-        return widget->widget_class->key_press(widget, key);
+      return widget->widget_class->key_press(widget, key);
     }
 
-    return 0;
+  return 0;
 }
 
-void TXT_SetWidgetFocus(TXT_UNCAST_ARG(widget), int focused)
+void txt_set_widget_focus(TXT_UNCAST_ARG(widget), int focused)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    if (widget == NULL)
+  if (widget == NULL)
     {
-        return;
+      return;
     }
 
-    if (widget->focused != focused)
+  if (widget->focused != focused)
     {
-        widget->focused = focused;
+      widget->focused = focused;
 
-        if (widget->widget_class->focus_change != NULL)
+      if (widget->widget_class->focus_change != NULL)
         {
-            widget->widget_class->focus_change(widget, focused);
+          widget->widget_class->focus_change(widget, focused);
         }
     }
 }
 
-void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align)
+void txt_set_widget_align(TXT_UNCAST_ARG(widget),
+                          txt_horiz_align_t horiz_align)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    widget->align = horiz_align;
+  widget->align = horiz_align;
 }
 
-void TXT_WidgetMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b)
+void txt_widget_mouse_press(TXT_UNCAST_ARG(widget), int x, int y, int b)
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    if (widget->widget_class->mouse_press != NULL)
+  if (widget->widget_class->mouse_press != NULL)
     {
-        widget->widget_class->mouse_press(widget, x, y, b);
+      widget->widget_class->mouse_press(widget, x, y, b);
     }
 }
 
-void TXT_LayoutWidget(TXT_UNCAST_ARG(widget))
+void txt_layout_widget(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    if (widget->widget_class->layout != NULL)
+  if (widget->widget_class->layout != NULL)
     {
-        widget->widget_class->layout(widget);
+      widget->widget_class->layout(widget);
     }
 }
 
-int TXT_AlwaysSelectable(TXT_UNCAST_ARG(widget))
+int txt_always_selectable(TXT_UNCAST_ARG(widget))
 {
-    return 1;
+  return 1;
 }
 
-int TXT_NeverSelectable(TXT_UNCAST_ARG(widget))
+int txt_never_selectable(TXT_UNCAST_ARG(widget))
 {
-    return 0;
+  return 0;
 }
 
-int TXT_SelectableWidget(TXT_UNCAST_ARG(widget))
+int txt_selectable_widget(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    if (widget->widget_class->selectable != NULL)
+  if (widget->widget_class->selectable != NULL)
     {
-        return widget->widget_class->selectable(widget);
+      return widget->widget_class->selectable(widget);
     }
-    else
+  else
     {
-        return 0;
+      return 0;
     }
 }
 
-int TXT_ContainsWidget(TXT_UNCAST_ARG(haystack), TXT_UNCAST_ARG(needle))
+int txt_hovering_over_widget(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, haystack);
-    TXT_CAST_ARG(txt_widget_t, needle);
+  TXT_CAST_ARG(txt_widget_t, widget);
+  txt_window_t *active_window;
+  int x;
+  int y;
 
-    while (needle != NULL)
+  /* We can only be hovering over widgets in the active window. */
+
+  active_window = txt_get_active_window();
+
+  if (active_window == NULL || !txt_contains_widget(active_window, widget))
     {
-        if (needle == haystack)
-        {
-            return 1;
-        }
-
-        needle = needle->parent;
+      return 0;
     }
 
-    return 0;
+  /* Is the mouse cursor within the bounds of the widget? */
+
+  txt_get_mouse_position(&x, &y);
+
+  return (x >= widget->x && x < widget->x + widget->w && y >= widget->y &&
+          y < widget->y + widget->h);
 }
 
-int TXT_HoveringOverWidget(TXT_UNCAST_ARG(widget))
+void txt_set_widget_bg(TXT_UNCAST_ARG(widget))
 {
-    TXT_CAST_ARG(txt_widget_t, widget);
-    txt_window_t *active_window;
-    int x, y;
+  TXT_CAST_ARG(txt_widget_t, widget);
 
-    // We can only be hovering over widgets in the active window.
-
-    active_window = TXT_GetActiveWindow();
-
-    if (active_window == NULL || !TXT_ContainsWidget(active_window, widget))
+  if (widget->focused)
     {
-        return 0;
+      txt_bgcolour(TXT_COLOR_GREY, 0);
     }
-
-    // Is the mouse cursor within the bounds of the widget?
-
-    TXT_GetMousePosition(&x, &y);
-
-    return (x >= widget->x && x < widget->x + widget->w
-         && y >= widget->y && y < widget->y + widget->h);
-}
-
-void TXT_SetWidgetBG(TXT_UNCAST_ARG(widget))
-{
-    TXT_CAST_ARG(txt_widget_t, widget);
-
-    if (widget->focused)
+  else if (txt_hovering_over_widget(widget))
     {
-        TXT_BGColor(TXT_COLOR_GREY, 0);
+      txt_bgcolour(TXT_HOVER_BACKGROUND, 0);
     }
-    else if (TXT_HoveringOverWidget(widget))
+  else
     {
-        TXT_BGColor(TXT_HOVER_BACKGROUND, 0);
-    }
-    else
-    {
-        // Use normal window background.
+      /* Use normal window background. */
     }
 }
-
diff --git a/games/NXDoom/textscreen/txt_widget.h b/games/NXDoom/textscreen/txt_widget.h
index 1857d7329..109be5e9c 100644
--- a/games/NXDoom/textscreen/txt_widget.h
+++ b/games/NXDoom/textscreen/txt_widget.h
@@ -1,61 +1,72 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_widget.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_WIDGET_H
 #define TXT_WIDGET_H
 
-/**
- * @file txt_widget.h
- *
- * Base "widget" GUI component class.
- */
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
 
-#ifndef DOXYGEN
+#define TXT_UNCAST_ARG_NAME(name) uncast_##name
+#define TXT_UNCAST_ARG(name) void *TXT_UNCAST_ARG_NAME(name)
+#define TXT_CAST_ARG(type, name) type *name = (type *)uncast_##name
 
-#define TXT_UNCAST_ARG_NAME(name) uncast_ ## name
-#define TXT_UNCAST_ARG(name)   void * TXT_UNCAST_ARG_NAME(name)
-#define TXT_CAST_ARG(type, name)  type *name = (type *) uncast_ ## name
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-#else
+/* Forward definitions */
 
-#define TXT_UNCAST_ARG(name) txt_widget_t *name
-
-#endif
+typedef struct txt_table_s txt_table_t;
+typedef struct txt_strut_s txt_strut_t;
+typedef struct txt_spincontrol_s txt_spincontrol_t;
+typedef struct txt_separator_s txt_separator_t;
+typedef struct txt_scrollpane_s txt_scrollpane_t;
+typedef struct txt_radiobutton_s txt_radiobutton_t;
+typedef struct txt_inputbox_s txt_inputbox_t;
+typedef struct txt_dropdown_list_s txt_dropdown_list_t;
+typedef struct txt_checkbox_s txt_checkbox_t;
+typedef struct txt_button_s txt_button_t;
 
 typedef enum
 {
-    TXT_VERT_TOP,
-    TXT_VERT_CENTER,
-    TXT_VERT_BOTTOM,
+  TXT_VERT_TOP,
+  TXT_VERT_CENTER,
+  TXT_VERT_BOTTOM,
 } txt_vert_align_t;
 
 typedef enum
 {
-    TXT_HORIZ_LEFT,
-    TXT_HORIZ_CENTER,
-    TXT_HORIZ_RIGHT,
+  TXT_HORIZ_LEFT,
+  TXT_HORIZ_CENTER,
+  TXT_HORIZ_RIGHT,
 } txt_horiz_align_t;
 
-/**
- * A GUI widget.
+/* A GUI widget.
  *
  * A widget is an individual component of a GUI.  Various different widget
  * types exist.
  *
  * Widgets may emit signals.  The types of signal emitted by a widget
  * depend on the type of the widget.  It is possible to be notified
- * when a signal occurs using the @ref TXT_SignalConnect function.
+ * when a signal occurs using the @ref txt_signal_connect function.
  */
 
 typedef struct txt_widget_s txt_widget_t;
@@ -63,58 +74,67 @@ typedef struct txt_widget_s txt_widget_t;
 typedef struct txt_widget_class_s txt_widget_class_t;
 typedef struct txt_callback_table_s txt_callback_table_t;
 
-typedef void (*TxtWidgetSizeCalc)(TXT_UNCAST_ARG(widget));
-typedef void (*TxtWidgetDrawer)(TXT_UNCAST_ARG(widget));
-typedef void (*TxtWidgetDestroy)(TXT_UNCAST_ARG(widget));
-typedef int (*TxtWidgetKeyPress)(TXT_UNCAST_ARG(widget), int key);
-typedef void (*TxtWidgetSignalFunc)(TXT_UNCAST_ARG(widget), void *user_data);
-typedef void (*TxtMousePressFunc)(TXT_UNCAST_ARG(widget), int x, int y, int b);
-typedef void (*TxtWidgetLayoutFunc)(TXT_UNCAST_ARG(widget));
-typedef int (*TxtWidgetSelectableFunc)(TXT_UNCAST_ARG(widget));
-typedef void (*TxtWidgetFocusFunc)(TXT_UNCAST_ARG(widget), int focused);
+typedef void (*txt_widget_size_calc_f)(TXT_UNCAST_ARG(widget));
+typedef void (*txt_widget_drawer_f)(TXT_UNCAST_ARG(widget));
+typedef void (*txt_widget_destroy_f)(TXT_UNCAST_ARG(widget));
+typedef int (*txt_widget_keypress_f)(TXT_UNCAST_ARG(widget), int key);
+typedef void (*txt_widget_signal_f)(TXT_UNCAST_ARG(widget), void *user_data);
+typedef void (*txt_mouse_press_f)(TXT_UNCAST_ARG(widget), int x, int y,
+                                  int b);
+typedef void (*txt_widget_layout_f)(TXT_UNCAST_ARG(widget));
+typedef int (*txt_widget_selectable_f)(TXT_UNCAST_ARG(widget));
+typedef void (*txt_widget_focus_f)(TXT_UNCAST_ARG(widget), int focused);
 
 struct txt_widget_class_s
 {
-    TxtWidgetSelectableFunc selectable;
-    TxtWidgetSizeCalc size_calc;
-    TxtWidgetDrawer drawer;
-    TxtWidgetKeyPress key_press;
-    TxtWidgetDestroy destructor;
-    TxtMousePressFunc mouse_press;
-    TxtWidgetLayoutFunc layout;
-    TxtWidgetFocusFunc focus_change;
+  txt_widget_selectable_f selectable;
+  txt_widget_size_calc_f size_calc;
+  txt_widget_drawer_f drawer;
+  txt_widget_keypress_f key_press;
+  txt_widget_destroy_f destructor;
+  txt_mouse_press_f mouse_press;
+  txt_widget_layout_f layout;
+  txt_widget_focus_f focus_change;
 };
 
 struct txt_widget_s
 {
-    txt_widget_class_t *widget_class;
-    txt_callback_table_t *callback_table;
-    int visible;
-    txt_horiz_align_t align;
-    int focused;
+  txt_widget_class_t *widget_class;
+  txt_callback_table_t *callback_table;
+  int visible;
+  txt_horiz_align_t align;
+  int focused;
 
-    // These are set automatically when the window is drawn and should
-    // not be set manually.
+  /* These are set automatically when the window is drawn and should
+   * not be set manually.
+   */
 
-    int x, y;
-    unsigned int w, h;
+  int x;
+  int y;
+  unsigned int w;
+  unsigned int h;
 
-    // Pointer up to parent widget that contains this widget.
+  /* Pointer up to parent widget that contains this widget. */
 
-    txt_widget_t *parent;
+  txt_widget_t *parent;
 };
 
-void TXT_InitWidget(TXT_UNCAST_ARG(widget), txt_widget_class_t *widget_class);
-void TXT_CalcWidgetSize(TXT_UNCAST_ARG(widget));
-void TXT_DrawWidget(TXT_UNCAST_ARG(widget));
-void TXT_EmitSignal(TXT_UNCAST_ARG(widget), const char *signal_name);
-int TXT_WidgetKeyPress(TXT_UNCAST_ARG(widget), int key);
-void TXT_WidgetMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b);
-void TXT_DestroyWidget(TXT_UNCAST_ARG(widget));
-void TXT_LayoutWidget(TXT_UNCAST_ARG(widget));
-int TXT_AlwaysSelectable(TXT_UNCAST_ARG(widget));
-int TXT_NeverSelectable(TXT_UNCAST_ARG(widget));
-void TXT_SetWidgetFocus(TXT_UNCAST_ARG(widget), int focused);
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+void txt_init_widget(TXT_UNCAST_ARG(widget),
+                     txt_widget_class_t *widget_class);
+void txt_calc_widget_size(TXT_UNCAST_ARG(widget));
+void txt_draw_widget(TXT_UNCAST_ARG(widget));
+void txt_emit_signal(TXT_UNCAST_ARG(widget), const char *signal_name);
+int txt_widget_key_press(TXT_UNCAST_ARG(widget), int key);
+void txt_widget_mouse_press(TXT_UNCAST_ARG(widget), int x, int y, int b);
+void txt_destroy_widget(TXT_UNCAST_ARG(widget));
+void txt_layout_widget(TXT_UNCAST_ARG(widget));
+int txt_always_selectable(TXT_UNCAST_ARG(widget));
+int txt_never_selectable(TXT_UNCAST_ARG(widget));
+void txt_set_widget_focus(TXT_UNCAST_ARG(widget), int focused);
 
 /**
  * Set a callback function to be invoked when a signal occurs.
@@ -122,11 +142,12 @@ void TXT_SetWidgetFocus(TXT_UNCAST_ARG(widget), int focused);
  * @param widget       The widget to watch.
  * @param signal_name  The signal to watch.
  * @param func         The callback function to invoke.
- * @param user_data    User-specified pointer to pass to the callback function.
+ * @param user_data    User-specified pointer to pass to the callback
+ * function.
  */
 
-void TXT_SignalConnect(TXT_UNCAST_ARG(widget), const char *signal_name,
-                       TxtWidgetSignalFunc func, void *user_data);
+void txt_signal_connect(TXT_UNCAST_ARG(widget), const char *signal_name,
+                        txt_widget_signal_f func, void *user_data);
 
 /**
  * Set the policy for how a widget should be aligned within a table.
@@ -136,7 +157,8 @@ void TXT_SignalConnect(TXT_UNCAST_ARG(widget), const char *signal_name,
  * @param horiz_align  The alignment to use.
  */
 
-void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align);
+void txt_set_widget_align(TXT_UNCAST_ARG(widget),
+                        txt_horiz_align_t horiz_align);
 
 /**
  * Query whether a widget is selectable with the cursor.
@@ -145,7 +167,7 @@ void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align);
  * @return             Non-zero if the widget is selectable.
  */
 
-int TXT_SelectableWidget(TXT_UNCAST_ARG(widget));
+int txt_selectable_widget(TXT_UNCAST_ARG(widget));
 
 /**
  * Query whether the mouse is hovering over the specified widget.
@@ -154,7 +176,7 @@ int TXT_SelectableWidget(TXT_UNCAST_ARG(widget));
  * @return             Non-zero if the mouse cursor is over the widget.
  */
 
-int TXT_HoveringOverWidget(TXT_UNCAST_ARG(widget));
+int txt_hovering_over_widget(TXT_UNCAST_ARG(widget));
 
 /**
  * Set the background to draw the specified widget, depending on
@@ -163,17 +185,6 @@ int TXT_HoveringOverWidget(TXT_UNCAST_ARG(widget));
  * @param widget       The widget.
  */
 
-void TXT_SetWidgetBG(TXT_UNCAST_ARG(widget));
-
-/**
- * Query whether the specified widget is contained within another
- * widget.
- *
- * @param haystack     The widget that might contain needle.
- * @param needle       The widget being queried.
- */
-
-int TXT_ContainsWidget(TXT_UNCAST_ARG(haystack), TXT_UNCAST_ARG(needle));
-
-#endif /* #ifndef TXT_WIDGET_H */
+void txt_set_widget_bg(TXT_UNCAST_ARG(widget));
 
+#endif /* TXT_WIDGET_H */
diff --git a/games/NXDoom/textscreen/txt_window.c b/games/NXDoom/textscreen/txt_window.c
index 141a44128..1f48eac5a 100644
--- a/games/NXDoom/textscreen/txt_window.c
+++ b/games/NXDoom/textscreen/txt_window.c
@@ -1,596 +1,609 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_window.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 
 #include "doomkeys.h"
 
-#include "txt_label.h"
 #include "txt_desktop.h"
 #include "txt_gui.h"
 #include "txt_io.h"
+#include "txt_label.h"
 #include "txt_main.h"
 #include "txt_separator.h"
 #include "txt_window.h"
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <shellapi.h>
-#endif
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
 
-void TXT_SetWindowAction(txt_window_t *window,
-                         txt_horiz_align_t position, 
-                         TXT_UNCAST_ARG(action))
+static void calc_window_position(txt_window_t *window)
 {
-    TXT_CAST_ARG(txt_widget_t, action);
-
-    if (window->actions[position] != NULL)
+  switch (window->horiz_align)
     {
-        TXT_DestroyWidget(window->actions[position]);
+    case TXT_HORIZ_LEFT:
+      window->window_x = window->x;
+      break;
+    case TXT_HORIZ_CENTER:
+      window->window_x = window->x - (window->window_w / 2);
+      break;
+    case TXT_HORIZ_RIGHT:
+      window->window_x = window->x - (window->window_w - 1);
+      break;
     }
 
-    window->actions[position] = action;
-
-    // Maintain parent pointer.
-
-    if (action != NULL)
+  switch (window->vert_align)
     {
-        action->parent = &window->table.widget;
+    case TXT_VERT_TOP:
+      window->window_y = window->y;
+      break;
+    case TXT_VERT_CENTER:
+      window->window_y = window->y - (window->window_h / 2);
+      break;
+    case TXT_VERT_BOTTOM:
+      window->window_y = window->y - (window->window_h - 1);
+      break;
     }
 }
 
-txt_window_t *TXT_NewWindow(const char *title)
+static void layout_action_area(txt_window_t *window)
 {
-    int i;
+  txt_widget_t *widget;
+  int space_available;
+  int space_left_offset;
 
-    txt_window_t *win;
+  /* We need to calculate the available horizontal space for the center
+   * action widget, so that we can center it within it.
+   * To start with, we have the entire action area available.
+   */
 
-    win = malloc(sizeof(txt_window_t));
+  space_available = window->window_w;
+  space_left_offset = 0;
 
-    TXT_InitTable(&win->table, 1);
+  /* Left action */
 
-    if (title == NULL)
+  if (window->actions[TXT_HORIZ_LEFT] != NULL)
     {
-        win->title = NULL;
-    }
-    else
-    {
-        win->title = strdup(title);
+      widget = window->actions[TXT_HORIZ_LEFT];
+
+      txt_calc_widget_size(widget);
+
+      widget->x = window->window_x + 1;
+      widget->y = window->window_y + window->window_h - widget->h - 1;
+
+      /* Adjust available space: */
+
+      space_available -= widget->w;
+      space_left_offset += widget->w;
+
+      txt_layout_widget(widget);
     }
 
-    win->x = TXT_SCREEN_W / 2;
-    win->y = TXT_SCREEN_H / 2;
-    win->horiz_align = TXT_HORIZ_CENTER;
-    win->vert_align = TXT_VERT_CENTER;
-    win->key_listener = NULL;
-    win->mouse_listener = NULL;
-    win->help_url = NULL;
+  /* Draw the right action */
 
-    TXT_AddWidget(win, TXT_NewSeparator(NULL));
-
-    for (i=0; i<3; ++i)
+  if (window->actions[TXT_HORIZ_RIGHT] != NULL)
     {
-        win->actions[i] = NULL;
+      widget = window->actions[TXT_HORIZ_RIGHT];
+
+      txt_calc_widget_size(widget);
+
+      widget->x = window->window_x + window->window_w - 1 - widget->w;
+      widget->y = window->window_y + window->window_h - widget->h - 1;
+
+      /* Adjust available space: */
+
+      space_available -= widget->w;
+
+      txt_layout_widget(widget);
     }
 
-    TXT_AddDesktopWindow(win);
+  /* Draw the center action */
 
-    // Default actions
+  if (window->actions[TXT_HORIZ_CENTER] != NULL)
+    {
+      widget = window->actions[TXT_HORIZ_CENTER];
 
-    TXT_SetWindowAction(win, TXT_HORIZ_LEFT, TXT_NewWindowEscapeAction(win));
-    TXT_SetWindowAction(win, TXT_HORIZ_RIGHT, TXT_NewWindowSelectAction(win));
+      txt_calc_widget_size(widget);
 
-    return win;
+      /* The left and right widgets have left a space sandwiched between
+       * them.  Center this widget within that space.
+       */
+
+      widget->x = window->window_x + space_left_offset +
+                  (space_available - widget->w) / 2;
+      widget->y = window->window_y + window->window_h - widget->h - 1;
+
+      txt_layout_widget(widget);
+    }
 }
 
-void TXT_CloseWindow(txt_window_t *window)
+static void draw_action_area(txt_window_t *window)
 {
-    int i;
+  int i;
 
-    TXT_EmitSignal(window, "closed");
-    TXT_RemoveDesktopWindow(window);
-
-    free(window->title);
-
-    // Destroy all actions
-
-    for (i=0; i<3; ++i)
+  for (i = 0; i < 3; ++i)
     {
-        if (window->actions[i] != NULL)
+      if (window->actions[i] != NULL)
         {
-            TXT_DestroyWidget(window->actions[i]);
-        }
-    }
-
-    // Destroy table and window
-
-    TXT_DestroyWidget(window);
-}
-
-static void CalcWindowPosition(txt_window_t *window)
-{
-    switch (window->horiz_align)
-    {
-        case TXT_HORIZ_LEFT:
-            window->window_x = window->x;
-            break;
-        case TXT_HORIZ_CENTER:
-            window->window_x = window->x - (window->window_w / 2);
-            break;
-        case TXT_HORIZ_RIGHT:
-            window->window_x = window->x - (window->window_w - 1);
-            break;
-    }
-
-    switch (window->vert_align)
-    {
-        case TXT_VERT_TOP:
-            window->window_y = window->y;
-            break;
-        case TXT_VERT_CENTER:
-            window->window_y = window->y - (window->window_h / 2);
-            break;
-        case TXT_VERT_BOTTOM:
-            window->window_y = window->y - (window->window_h - 1);
-            break;
-    }
-}
-
-static void LayoutActionArea(txt_window_t *window)
-{
-    txt_widget_t *widget;
-    int space_available;
-    int space_left_offset;
-
-    // We need to calculate the available horizontal space for the center
-    // action widget, so that we can center it within it.
-    // To start with, we have the entire action area available.
-
-    space_available = window->window_w;
-    space_left_offset = 0;
-
-    // Left action
-
-    if (window->actions[TXT_HORIZ_LEFT] != NULL)
-    {
-        widget = window->actions[TXT_HORIZ_LEFT];
-
-        TXT_CalcWidgetSize(widget);
-
-        widget->x = window->window_x + 1;
-        widget->y = window->window_y + window->window_h - widget->h - 1;
-
-        // Adjust available space:
-        space_available -= widget->w;
-        space_left_offset += widget->w;
-
-        TXT_LayoutWidget(widget);
-    }
-
-    // Draw the right action
-
-    if (window->actions[TXT_HORIZ_RIGHT] != NULL)
-    {
-        widget = window->actions[TXT_HORIZ_RIGHT];
-
-        TXT_CalcWidgetSize(widget);
-
-        widget->x = window->window_x + window->window_w - 1 - widget->w;
-        widget->y = window->window_y + window->window_h - widget->h - 1;
-
-        // Adjust available space:
-        space_available -= widget->w;
-
-        TXT_LayoutWidget(widget);
-    }
-
-    // Draw the center action
-
-    if (window->actions[TXT_HORIZ_CENTER] != NULL)
-    {
-        widget = window->actions[TXT_HORIZ_CENTER];
-
-        TXT_CalcWidgetSize(widget);
-
-        // The left and right widgets have left a space sandwiched between
-        // them.  Center this widget within that space.
-        widget->x = window->window_x
-                  + space_left_offset
-                  + (space_available - widget->w) / 2;
-        widget->y = window->window_y + window->window_h - widget->h - 1;
-
-        TXT_LayoutWidget(widget);
-    }
-}
-
-static void DrawActionArea(txt_window_t *window)
-{
-    int i;
-
-    for (i=0; i<3; ++i)
-    {
-        if (window->actions[i] != NULL)
-        {
-            TXT_DrawWidget(window->actions[i]);
+          txt_draw_widget(window->actions[i]);
         }
     }
 }
 
-static void CalcActionAreaSize(txt_window_t *window, 
-                               unsigned int *w, unsigned int *h)
+static void calc_action_area_size(txt_window_t *window, unsigned int *w,
+                                  unsigned int *h)
 {
-    txt_widget_t *widget;
-    int i;
+  txt_widget_t *widget;
+  int i;
 
-    *w = 0;
-    *h = 0;
+  *w = 0;
+  *h = 0;
 
-    // Calculate the width of all the action widgets and use this
-    // to create an overall min. width of the action area
+  /* Calculate the width of all the action widgets and use this
+   * to create an overall min. width of the action area
+   */
 
-    for (i=0; i<3; ++i)
+  for (i = 0; i < 3; ++i)
     {
-        widget = (txt_widget_t *) window->actions[i];
+      widget = (txt_widget_t *)window->actions[i];
 
-        if (widget != NULL)
+      if (widget != NULL)
         {
-            TXT_CalcWidgetSize(widget);
-            *w += widget->w;
+          txt_calc_widget_size(widget);
+          *w += widget->w;
 
-            if (widget->h > *h)
+          if (widget->h > *h)
             {
-                *h = widget->h;
+              *h = widget->h;
             }
         }
     }
 }
 
-// Sets size and position of all widgets in a window
+/* Sets size and position of all widgets in a window */
 
-void TXT_LayoutWindow(txt_window_t *window)
+static void txt_layout_window(txt_window_t *window)
 {
-    txt_widget_t *widgets = (txt_widget_t *) window;
-    unsigned int widgets_w;
-    unsigned int actionarea_w, actionarea_h;
+  txt_widget_t *widgets = (txt_widget_t *)window;
+  unsigned int widgets_w;
+  unsigned int actionarea_w;
+  unsigned int actionarea_h;
 
-    // Calculate size of table
-    
-    TXT_CalcWidgetSize(window);
+  /* Calculate size of table */
 
-    // Widgets area: add one character of padding on each side
-    widgets_w = widgets->w + 2;
+  txt_calc_widget_size(window);
 
-    // Calculate the size of the action area
-    // Make window wide enough to action area
-  
-    CalcActionAreaSize(window, &actionarea_w, &actionarea_h);
-    
-    if (actionarea_w > widgets_w)
-        widgets_w = actionarea_w;
+  /* Widgets area: add one character of padding on each side */
 
-    // Set the window size based on widgets_w
-   
-    window->window_w = widgets_w + 2;
-    window->window_h = widgets->h + 1;
+  widgets_w = widgets->w + 2;
 
-    // If the window has a title, add an extra two lines
+  /* Calculate the size of the action area
+   * Make window wide enough to action area
+   */
 
-    if (window->title != NULL)
+  calc_action_area_size(window, &actionarea_w, &actionarea_h);
+
+  if (actionarea_w > widgets_w) widgets_w = actionarea_w;
+
+  /* Set the window size based on widgets_w */
+
+  window->window_w = widgets_w + 2;
+  window->window_h = widgets->h + 1;
+
+  /* If the window has a title, add an extra two lines */
+
+  if (window->title != NULL)
     {
-        window->window_h += 2;
+      window->window_h += 2;
     }
 
-    // If the window has an action area, add extra lines
+  /* If the window has an action area, add extra lines */
 
-    if (actionarea_h > 0)
+  if (actionarea_h > 0)
     {
-        window->window_h += actionarea_h + 1;
+      window->window_h += actionarea_h + 1;
     }
 
-    // Use the x,y position as the centerpoint and find the location to 
-    // draw the window.
+  /* Use the x,y position as the centerpoint and find the location to
+   * draw the window.
+   */
 
-    CalcWindowPosition(window);
+  calc_window_position(window);
 
-    // Set the table size and position
+  /* Set the table size and position */
 
-    widgets->w = widgets_w - 2;
-    // widgets->h        (already set)
-    widgets->x = window->window_x + 2;
-    widgets->y = window->window_y;
+  widgets->w = widgets_w - 2;
 
-    if (window->title != NULL)
+  /* widgets->h        (already set) */
+
+  widgets->x = window->window_x + 2;
+  widgets->y = window->window_y;
+
+  if (window->title != NULL)
     {
-        widgets->y += 2;
+      widgets->y += 2;
     }
 
-    // Layout the table and action area
+  /* Layout the table and action area */
 
-    LayoutActionArea(window);
-    TXT_LayoutWidget(widgets);
+  layout_action_area(window);
+  txt_layout_widget(widgets);
 }
 
-void TXT_DrawWindow(txt_window_t *window)
+static void txt_open_url(const char *url)
 {
-    txt_widget_t *widgets;
+#if 0
+  char *cmd;
+  size_t cmd_len;
+  int retval;
 
-    TXT_LayoutWindow(window);
+  cmd_len = strlen(url) + 30;
+  cmd = malloc(cmd_len);
 
-    if (window->table.widget.focused)
+  /* The Unix situation sucks as usual, but the closest thing to a
+   * standard that exists is the xdg-utils package.
+   */
+
+  if (system("xdg-open --version 2>/dev/null") != 0)
     {
-        TXT_BGColor(TXT_ACTIVE_WINDOW_BACKGROUND, 0);
-    }
-    else
-    {
-        TXT_BGColor(TXT_INACTIVE_WINDOW_BACKGROUND, 0);
+      fprintf(stderr,
+              "xdg-utils is not installed. Can't open this URL:\n%s\n", url);
+      free(cmd);
+      return;
     }
 
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+  txt_snprintf(cmd, cmd_len, "xdg-open \"%s\"", url);
 
-    // Draw the window
-
-    TXT_DrawWindowFrame(window->title, 
-                        window->window_x, window->window_y,
-                        window->window_w, window->window_h);
-
-    // Draw all widgets
-
-    TXT_DrawWidget(window);
-
-    // Draw an action area, if we have one
-
-    widgets = (txt_widget_t *) window;
-
-    if (widgets->y + widgets->h < window->window_y + window->window_h - 1)
+  retval = system(cmd);
+  if (retval != 0)
     {
-        // Separator for action area
-
-        TXT_DrawSeparator(window->window_x, widgets->y + widgets->h, 
-                          window->window_w);
-
-        // Action area at the window bottom
-
-        DrawActionArea(window);
+      fprintf(stderr, "txt_open_url: error executing '%s'; return code %d\n",
+              cmd, retval);
     }
+
+  free(cmd);
+#endif
 }
 
-void TXT_SetWindowPosition(txt_window_t *window,
-                           txt_horiz_align_t horiz_align,
-                           txt_vert_align_t vert_align,
-                           int x, int y)
+static int mouse_button_press(txt_window_t *window, int b)
 {
-    window->vert_align = vert_align;
-    window->horiz_align = horiz_align;
-    window->x = x;
-    window->y = y;
-}
+  int x;
+  int y;
+  int i;
+  txt_widget_t *widgets;
+  txt_widget_t *widget;
 
-static int MouseButtonPress(txt_window_t *window, int b)
-{
-    int x, y;
-    int i;
-    txt_widget_t *widgets;
-    txt_widget_t *widget;
+  /* Lay out the window, set positions and sizes of all widgets */
 
-    // Lay out the window, set positions and sizes of all widgets
+  txt_layout_window(window);
 
-    TXT_LayoutWindow(window);
+  /* Get the current mouse position */
 
-    // Get the current mouse position
+  txt_get_mouse_position(&x, &y);
 
-    TXT_GetMousePosition(&x, &y);
+  /* Try the mouse button listener
+   * This happens whether it is in the window range or not
+   */
 
-    // Try the mouse button listener
-    // This happens whether it is in the window range or not
-
-    if (window->mouse_listener != NULL)
+  if (window->mouse_listener != NULL)
     {
-        // Mouse listener can eat button presses
+      /* Mouse listener can eat button presses */
 
-        if (window->mouse_listener(window, x, y, b, 
-                                   window->mouse_listener_data))
+      if (window->mouse_listener(window, x, y, b,
+                                 window->mouse_listener_data))
         {
-            return 1;
+          return 1;
         }
     }
 
-    // Is it within the table range?
+  /* Is it within the table range? */
 
-    widgets = (txt_widget_t *) window;
+  widgets = (txt_widget_t *)window;
 
-    if (x >= widgets->x && x < (signed) (widgets->x + widgets->w)
-     && y >= widgets->y && y < (signed) (widgets->y + widgets->h))
+  if (x >= widgets->x && x < (signed)(widgets->x + widgets->w) &&
+      y >= widgets->y && y < (signed)(widgets->y + widgets->h))
     {
-        TXT_WidgetMousePress(window, x, y, b);
-        return 1;
+      txt_widget_mouse_press(window, x, y, b);
+      return 1;
     }
 
-    // Was one of the action area buttons pressed?
+  /* Was one of the action area buttons pressed? */
 
-    for (i=0; i<3; ++i)
+  for (i = 0; i < 3; ++i)
     {
-        widget = window->actions[i];
+      widget = window->actions[i];
 
-        if (widget != NULL
-         && x >= widget->x && x < (signed) (widget->x + widget->w)
-         && y >= widget->y && y < (signed) (widget->y + widget->h))
+      if (widget != NULL && x >= widget->x &&
+          x < (signed)(widget->x + widget->w) && y >= widget->y &&
+          y < (signed)(widget->y + widget->h))
         {
-            int was_focused;
+          int was_focused;
 
-            // Main table temporarily loses focus when action area button
-            // is clicked. This way, any active input boxes that depend
-            // on having focus will save their values before the
-            // action is performed.
+          /* Main table temporarily loses focus when action area button
+           * is clicked. This way, any active input boxes that depend
+           * on having focus will save their values before the
+           * action is performed.
+           */
 
-            was_focused = window->table.widget.focused;
-            TXT_SetWidgetFocus(window, 0);
-            TXT_SetWidgetFocus(window, was_focused);
+          was_focused = window->table.widget.focused;
+          txt_set_widget_focus(window, 0);
+          txt_set_widget_focus(window, was_focused);
 
-            // Pass through mouse press.
+          /* Pass through mouse press. */
 
-            TXT_WidgetMousePress(widget, x, y, b);
-            return 1;
+          txt_widget_mouse_press(widget, x, y, b);
+          return 1;
         }
     }
 
-    return 0;
+  return 0;
 }
 
-int TXT_WindowKeyPress(txt_window_t *window, int c)
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void txt_set_window_action(txt_window_t *window, txt_horiz_align_t position,
+                           TXT_UNCAST_ARG(action))
 {
-    int i;
+  TXT_CAST_ARG(txt_widget_t, action);
 
-    // Is this a mouse button ?
-
-    if (c >= TXT_MOUSE_BASE && c < TXT_MOUSE_BASE + TXT_MAX_MOUSE_BUTTONS)
+  if (window->actions[position] != NULL)
     {
-        return MouseButtonPress(window, c);
+      txt_destroy_widget(window->actions[position]);
     }
 
-    // Try the window key spy
+  window->actions[position] = action;
 
-    if (window->key_listener != NULL)
+  /* Maintain parent pointer. */
+
+  if (action != NULL)
     {
-        // key listener can eat keys
-
-        if (window->key_listener(window, c, window->key_listener_data))
-        {
-            return 1;
-        }
+      action->parent = &window->table.widget;
     }
-
-    // Send to the currently selected widget:
-
-    if (TXT_WidgetKeyPress(window, c))
-    {
-        return 1;
-    }
-
-    // Try all of the action buttons
-
-    for (i=0; i<3; ++i)
-    {
-        if (window->actions[i] != NULL
-         && TXT_WidgetKeyPress(window->actions[i], c))
-        {
-            return 1;
-        }
-    }
-
-    return 0;
 }
 
-void TXT_SetKeyListener(txt_window_t *window, TxtWindowKeyPress key_listener, 
-                        void *user_data)
+txt_window_t *txt_new_window(const char *title)
 {
-    window->key_listener = key_listener;
-    window->key_listener_data = user_data;
+  int i;
+
+  txt_window_t *win;
+
+  win = malloc(sizeof(txt_window_t));
+
+  txt_init_table(&win->table, 1);
+
+  if (title == NULL)
+    {
+      win->title = NULL;
+    }
+  else
+    {
+      win->title = strdup(title);
+    }
+
+  win->x = TXT_SCREEN_W / 2;
+  win->y = TXT_SCREEN_H / 2;
+  win->horiz_align = TXT_HORIZ_CENTER;
+  win->vert_align = TXT_VERT_CENTER;
+  win->key_listener = NULL;
+  win->mouse_listener = NULL;
+  win->help_url = NULL;
+
+  txt_add_widget(win, txt_new_separator(NULL));
+
+  for (i = 0; i < 3; ++i)
+    {
+      win->actions[i] = NULL;
+    }
+
+  txt_add_desktop_window(win);
+
+  /* Default actions */
+
+  txt_set_window_action(win, TXT_HORIZ_LEFT,
+                        txt_new_window_escape_action(win));
+  txt_set_window_action(win, TXT_HORIZ_RIGHT,
+                        txt_new_window_select_action(win));
+
+  return win;
 }
 
-void TXT_SetMouseListener(txt_window_t *window, 
-                          TxtWindowMousePress mouse_listener,
+void txt_close_window(txt_window_t *window)
+{
+  int i;
+
+  txt_emit_signal(window, "closed");
+  txt_remove_desktop_window(window);
+
+  free(window->title);
+
+  /* Destroy all actions */
+
+  for (i = 0; i < 3; ++i)
+    {
+      if (window->actions[i] != NULL)
+        {
+          txt_destroy_widget(window->actions[i]);
+        }
+    }
+
+  /* Destroy table and window */
+
+  txt_destroy_widget(window);
+}
+
+void txt_draw_window(txt_window_t *window)
+{
+  txt_widget_t *widgets;
+
+  txt_layout_window(window);
+
+  if (window->table.widget.focused)
+    {
+      txt_bgcolour(TXT_ACTIVE_WINDOW_BACKGROUND, 0);
+    }
+  else
+    {
+      txt_bgcolour(TXT_INACTIVE_WINDOW_BACKGROUND, 0);
+    }
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_WHITE);
+
+  /* Draw the window */
+
+  txt_draw_window_frame(window->title, window->window_x, window->window_y,
+                      window->window_w, window->window_h);
+
+  /* Draw all widgets */
+
+  txt_draw_widget(window);
+
+  /* Draw an action area, if we have one */
+
+  widgets = (txt_widget_t *)window;
+
+  if (widgets->y + widgets->h < window->window_y + window->window_h - 1)
+    {
+      /* Separator for action area */
+
+      txt_draw_separator(window->window_x, widgets->y + widgets->h,
+                        window->window_w);
+
+      /* Action area at the window bottom */
+
+      draw_action_area(window);
+    }
+}
+
+void txt_set_window_position(txt_window_t *window,
+                             txt_horiz_align_t horiz_align,
+                             txt_vert_align_t vert_align, int x, int y)
+{
+  window->vert_align = vert_align;
+  window->horiz_align = horiz_align;
+  window->x = x;
+  window->y = y;
+}
+
+int txt_window_keypress(txt_window_t *window, int c)
+{
+  int i;
+
+  /* Is this a mouse button ? */
+
+  if (c >= TXT_MOUSE_BASE && c < TXT_MOUSE_BASE + TXT_MAX_MOUSE_BUTTONS)
+    {
+      return mouse_button_press(window, c);
+    }
+
+  /* Try the window key spy */
+
+  if (window->key_listener != NULL)
+    {
+      /* key listener can eat keys */
+
+      if (window->key_listener(window, c, window->key_listener_data))
+        {
+          return 1;
+        }
+    }
+
+  /* Send to the currently selected widget: */
+
+  if (txt_widget_key_press(window, c))
+    {
+      return 1;
+    }
+
+  /* Try all of the action buttons */
+
+  for (i = 0; i < 3; ++i)
+    {
+      if (window->actions[i] != NULL &&
+          txt_widget_key_press(window->actions[i], c))
+        {
+          return 1;
+        }
+    }
+
+  return 0;
+}
+
+void txt_set_key_listener(txt_window_t *window,
+                          txt_window_keypress_t key_listener,
                           void *user_data)
 {
-    window->mouse_listener = mouse_listener;
-    window->mouse_listener_data = user_data;
+  window->key_listener = key_listener;
+  window->key_listener_data = user_data;
 }
 
-void TXT_SetWindowFocus(txt_window_t *window, int focused)
+void txt_set_mouse_listener(txt_window_t *window,
+                            txt_window_mouse_press_t mouse_listener,
+                            void *user_data)
 {
-    TXT_SetWidgetFocus(window, focused);
+  window->mouse_listener = mouse_listener;
+  window->mouse_listener_data = user_data;
 }
 
-void TXT_SetWindowHelpURL(txt_window_t *window, const char *help_url)
+void txt_set_window_focus(txt_window_t *window, int focused)
 {
-    window->help_url = help_url;
+  txt_set_widget_focus(window, focused);
 }
 
-#ifdef _WIN32
-
-void TXT_OpenURL(const char *url)
+void txt_set_window_help_url(txt_window_t *window, const char *help_url)
 {
-    ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+  window->help_url = help_url;
 }
 
-#else
-
-void TXT_OpenURL(const char *url)
+void txt_open_window_help_url(txt_window_t *window)
 {
-    char *cmd;
-    size_t cmd_len;
-    int retval;
-
-    cmd_len = strlen(url) + 30;
-    cmd = malloc(cmd_len);
-
-#if defined(__MACOSX__)
-    TXT_snprintf(cmd, cmd_len, "open \"%s\"", url);
-#else
-    // The Unix situation sucks as usual, but the closest thing to a
-    // standard that exists is the xdg-utils package.
-    if (system("xdg-open --version 2>/dev/null") != 0)
+  if (window->help_url != NULL)
     {
-        fprintf(stderr,
-                "xdg-utils is not installed. Can't open this URL:\n%s\n", url);
-        free(cmd);
-        return;
-    }
-
-    TXT_snprintf(cmd, cmd_len, "xdg-open \"%s\"", url);
-#endif
-
-    retval = system(cmd);
-    if (retval != 0)
-    {
-        fprintf(stderr, "TXT_OpenURL: error executing '%s'; return code %d\n",
-            cmd, retval);
-    }
-    free(cmd);
-}
-
-#endif /* #ifndef _WIN32 */
-
-void TXT_OpenWindowHelpURL(txt_window_t *window)
-{
-    if (window->help_url != NULL)
-    {
-        TXT_OpenURL(window->help_url);
+      txt_open_url(window->help_url);
     }
 }
 
-txt_window_t *TXT_MessageBox(const char *title, const char *message, ...)
+txt_window_t *txt_message_box(const char *title, const char *message, ...)
 {
-    txt_window_t *window;
-    char buf[256];
-    va_list args;
+  txt_window_t *window;
+  char buf[256];
+  va_list args;
 
-    va_start(args, message);
-    TXT_vsnprintf(buf, sizeof(buf), message, args);
-    va_end(args);
+  va_start(args, message);
+  txt_vsnprintf(buf, sizeof(buf), message, args);
+  va_end(args);
 
-    window = TXT_NewWindow(title);
-    TXT_AddWidget(window, TXT_NewLabel(buf));
+  window = txt_new_window(title);
+  txt_add_widget(window, txt_new_label(buf));
 
-    TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
-    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, 
-                        TXT_NewWindowEscapeAction(window));
-    TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+  txt_set_window_action(window, TXT_HORIZ_LEFT, NULL);
+  txt_set_window_action(window, TXT_HORIZ_CENTER,
+                        txt_new_window_escape_action(window));
+  txt_set_window_action(window, TXT_HORIZ_RIGHT, NULL);
 
-    return window;
+  return window;
 }
-
diff --git a/games/NXDoom/textscreen/txt_window.h b/games/NXDoom/textscreen/txt_window.h
index edd0de689..b2803ce56 100644
--- a/games/NXDoom/textscreen/txt_window.h
+++ b/games/NXDoom/textscreen/txt_window.h
@@ -1,96 +1,91 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_window.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_WINDOW_H
 #define TXT_WINDOW_H
 
-/**
- * @file txt_window.h
- *
- * Windows.
- */
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
-/**
- * A window.
- *
- * A window contains widgets, and may also be treated as a table
- * (@ref txt_table_t) containing a single column.
- *
- * Windows can be created using @ref TXT_NewWindow and closed using
- * @ref TXT_CloseWindow.  When a window is closed, it emits the
- * "closed" signal.
- *
- * In addition to the widgets within a window, windows also have
- * a "tray" area at their bottom containing window action widgets.
- * These widgets allow keyboard shortcuts to trigger common actions.
- * Each window has three slots for keyboard shortcuts. By default,
- * the left slot contains an action to close the window when the
- * escape button is pressed, while the right slot contains an
- * action to activate the currently-selected widget.
- */
-
-typedef struct txt_window_s txt_window_t;
-
-#include "txt_widget.h"
 #include "txt_table.h"
+#include "txt_widget.h"
+
 #include "txt_window_action.h"
 
-// Callback function for window key presses
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
 
-typedef int (*TxtWindowKeyPress)(txt_window_t *window, int key,
+/* Callback function for window key presses */
+
+typedef int (*txt_window_keypress_t)(txt_window_t *window, int key,
                                  void *user_data);
-typedef int (*TxtWindowMousePress)(txt_window_t *window,
-                                   int x, int y, int b,
-                                   void *user_data);
+typedef int (*txt_window_mouse_press_t)(txt_window_t *window, int x, int y,
+                                        int b, void *user_data);
 
 struct txt_window_s
 {
-    // Base class: all windows are tables with one column.
+  /* Base class: all windows are tables with one column. */
 
-    txt_table_t table;
+  txt_table_t table;
 
-    // Window title
+  /* Window title */
 
-    char *title;
+  char *title;
 
-    // Screen coordinates of the window
+  /* Screen coordinates of the window */
 
-    txt_vert_align_t vert_align;
-    txt_horiz_align_t horiz_align;
-    int x, y;
+  txt_vert_align_t vert_align;
+  txt_horiz_align_t horiz_align;
+  int x;
+  int y;
 
-    // Actions that appear in the box at the bottom of the window
+  /* Actions that appear in the box at the bottom of the window */
 
-    txt_widget_t *actions[3];
+  txt_widget_t *actions[3];
 
-    // Callback functions to invoke when keys/mouse buttons are pressed
+  /* Callback functions to invoke when keys/mouse buttons are pressed */
 
-    TxtWindowKeyPress key_listener;
-    void *key_listener_data;
-    TxtWindowMousePress mouse_listener;
-    void *mouse_listener_data;
+  txt_window_keypress_t key_listener;
+  void *key_listener_data;
+  txt_window_mouse_press_t mouse_listener;
+  void *mouse_listener_data;
 
-    // These are set automatically when the window is drawn
+  /* These are set automatically when the window is drawn */
 
-    int window_x, window_y;
-    unsigned int window_w, window_h;
+  int window_x;
+  int window_y;
+  unsigned int window_w;
+  unsigned int window_h;
 
-    // URL of a webpage with help about this window. If set, a help key
-    // indicator is shown while this window is active.
-    const char *help_url;
+  /* URL of a webpage with help about this window. If set, a help key
+   * indicator is shown while this window is active.
+   */
+
+  const char *help_url;
 };
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Open a new window.
  *
@@ -100,7 +95,7 @@ struct txt_window_s
  *                     representing the new window.
  */
 
-txt_window_t *TXT_NewWindow(const char *title);
+txt_window_t *txt_new_window(const char *title);
 
 /**
  * Close a window.
@@ -108,7 +103,7 @@ txt_window_t *TXT_NewWindow(const char *title);
  * @param window       Tine window to close.
  */
 
-void TXT_CloseWindow(txt_window_t *window);
+void txt_close_window(txt_window_t *window);
 
 /**
  * Set the position of a window on the screen.
@@ -120,17 +115,17 @@ void TXT_CloseWindow(txt_window_t *window);
  * <code>
  *   // Centered on the screen:
  *
- *   TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_CENTER,
+ *   txt_set_window_position(window, TXT_HORIZ_CENTER, TXT_VERT_CENTER,
  *                                 TXT_SCREEN_W / 2, TXT_SCREEN_H / 2);
  *
  *   // Horizontally centered, with top of the window on line 6:
  *
- *   TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
+ *   txt_set_window_position(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
  *                                 TXT_SCREEN_W / 2, 6);
  *
  *   // Top-left of window at 20, 6:
  *
- *   TXT_SetWindowPosition(window, TXT_HORIZ_LEFT, TXT_VERT_TOP, 20, 6);
+ *   txt_set_window_position(window, TXT_HORIZ_LEFT, TXT_VERT_TOP, 20, 6);
  * </code>
  *
  * @param window       The window.
@@ -141,10 +136,9 @@ void TXT_CloseWindow(txt_window_t *window);
  * @param y            Y coordinate (vertical axis) for window position.
  */
 
-void TXT_SetWindowPosition(txt_window_t *window,
-                           txt_horiz_align_t horiz_align,
-                           txt_vert_align_t vert_align,
-                           int x, int y);
+void txt_set_window_position(txt_window_t *window,
+                             txt_horiz_align_t horiz_align,
+                             txt_vert_align_t vert_align, int x, int y);
 
 /**
  * Set a window action for a given window.
@@ -158,8 +152,8 @@ void TXT_SetWindowPosition(txt_window_t *window,
  *                    current window action in the given slot is removed.
  */
 
-void TXT_SetWindowAction(txt_window_t *window, txt_horiz_align_t position,
-                         TXT_UNCAST_ARG(action));
+void txt_set_window_action(txt_window_t *window, txt_horiz_align_t position,
+                           TXT_UNCAST_ARG(action));
 
 /**
  * Set a callback function to be invoked whenever a key is pressed within
@@ -171,9 +165,9 @@ void TXT_SetWindowAction(txt_window_t *window, txt_horiz_align_t position,
  *                      function.
  */
 
-void TXT_SetKeyListener(txt_window_t *window,
-                        TxtWindowKeyPress key_listener,
-                        void *user_data);
+void txt_set_key_listener(txt_window_t *window,
+                          txt_window_keypress_t key_listener,
+                          void *user_data);
 
 /**
  * Set a callback function to be invoked whenever a mouse button is pressed
@@ -185,19 +179,20 @@ void TXT_SetKeyListener(txt_window_t *window,
  *                        function.
  */
 
-void TXT_SetMouseListener(txt_window_t *window,
-                          TxtWindowMousePress mouse_listener,
-                          void *user_data);
+void txt_set_mouse_listener(txt_window_t *window,
+                            txt_window_mouse_press_t mouse_listener,
+                            void *user_data);
 
 /**
  * Open a window displaying a message.
  *
  * @param title           Title of the window (UTF-8 format).
- * @param message         The message to display in the window (UTF-8 format).
+ * @param message         The message to display in the window
+ *                        (UTF-8 format).
  * @return                The new window.
  */
 
-txt_window_t *TXT_MessageBox(const char *title, const char *message, ...);
+txt_window_t *txt_message_box(const char *title, const char *message, ...);
 
 /**
  * Set the help URL for the given window.
@@ -207,7 +202,7 @@ txt_window_t *TXT_MessageBox(const char *title, const char *message, ...);
  *                        window, or NULL to set no help for this window.
  */
 
-void TXT_SetWindowHelpURL(txt_window_t *window, const char *help_url);
+void txt_set_window_help_url(txt_window_t *window, const char *help_url);
 
 /**
  * Open the help URL for the given window, if one is set.
@@ -215,7 +210,6 @@ void TXT_SetWindowHelpURL(txt_window_t *window, const char *help_url);
  * @param window          The window.
  */
 
-void TXT_OpenWindowHelpURL(txt_window_t *window);
-
-#endif /* #ifndef TXT_WINDOW_H */
+void txt_open_window_help_url(txt_window_t *window);
 
+#endif /* TXT_WINDOW_H */
diff --git a/games/NXDoom/textscreen/txt_window_action.c b/games/NXDoom/textscreen/txt_window_action.c
index 80c3ced44..d14f41d66 100644
--- a/games/NXDoom/textscreen/txt_window_action.c
+++ b/games/NXDoom/textscreen/txt_window_action.c
@@ -1,169 +1,203 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_window_action.c
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "doomkeys.h"
 
-#include "txt_window_action.h"
 #include "txt_gui.h"
 #include "txt_io.h"
 #include "txt_main.h"
 #include "txt_utf8.h"
 #include "txt_window.h"
+#include "txt_window_action.h"
 
-static void TXT_WindowActionSizeCalc(TXT_UNCAST_ARG(action))
-{
-    TXT_CAST_ARG(txt_window_action_t, action);
-    char buf[10];
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
 
-    TXT_GetKeyDescription(action->key, buf, sizeof(buf));
+static void txt_window_action_size_calc(TXT_UNCAST_ARG(action));
+static void txt_window_action_drawer(TXT_UNCAST_ARG(action));
+static void txt_window_action_destructor(TXT_UNCAST_ARG(action));
+static int txt_window_action_key_press(TXT_UNCAST_ARG(action), int key);
+static void txt_window_action_mouse_press(TXT_UNCAST_ARG(action), int x,
+                                          int y, int b);
 
-    // Width is label length, plus key description length, plus '='
-    // and two surrounding spaces.
-
-    action->widget.w = TXT_UTF8_Strlen(action->label)
-                     + TXT_UTF8_Strlen(buf) + 3;
-    action->widget.h = 1;
-}
-
-static void TXT_WindowActionDrawer(TXT_UNCAST_ARG(action))
-{
-    TXT_CAST_ARG(txt_window_action_t, action);
-    int hovering;
-    char buf[10];
-
-    TXT_GetKeyDescription(action->key, buf, sizeof(buf));
-
-    hovering = TXT_HoveringOverWidget(action);
-    TXT_SetWidgetBG(action);
-
-    TXT_DrawString(" ");
-    TXT_FGColor(hovering ? TXT_COLOR_BRIGHT_WHITE : TXT_COLOR_BRIGHT_GREEN);
-    TXT_DrawString(buf);
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
-    TXT_DrawString("=");
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
-    TXT_DrawString(action->label);
-    TXT_DrawString(" ");
-}
-
-static void TXT_WindowActionDestructor(TXT_UNCAST_ARG(action))
-{
-    TXT_CAST_ARG(txt_window_action_t, action);
-
-    free(action->label);
-}
-
-static int TXT_WindowActionKeyPress(TXT_UNCAST_ARG(action), int key)
-{
-    TXT_CAST_ARG(txt_window_action_t, action);
-
-    if (tolower(key) == tolower(action->key))
-    {
-        TXT_EmitSignal(action, "pressed");
-        return 1;
-    }
-    
-    return 0;
-}
-
-static void TXT_WindowActionMousePress(TXT_UNCAST_ARG(action), 
-                                       int x, int y, int b)
-{
-    TXT_CAST_ARG(txt_window_action_t, action);
-
-    // Simulate a press of the key
-
-    if (b == TXT_MOUSE_LEFT)
-    {
-        TXT_WindowActionKeyPress(action, action->key);
-    }
-}
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
 
 txt_widget_class_t txt_window_action_class =
 {
-    TXT_AlwaysSelectable,
-    TXT_WindowActionSizeCalc,
-    TXT_WindowActionDrawer,
-    TXT_WindowActionKeyPress,
-    TXT_WindowActionDestructor,
-    TXT_WindowActionMousePress,
-    NULL,
+  txt_always_selectable,
+  txt_window_action_size_calc,
+  txt_window_action_drawer,
+  txt_window_action_key_press,
+  txt_window_action_destructor,
+  txt_window_action_mouse_press,
+  NULL,
 };
 
-txt_window_action_t *TXT_NewWindowAction(int key, const char *label)
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void txt_window_action_size_calc(TXT_UNCAST_ARG(action))
 {
-    txt_window_action_t *action;
+  TXT_CAST_ARG(txt_window_action_t, action);
+  char buf[10];
 
-    action = malloc(sizeof(txt_window_action_t));
+  txt_get_key_description(action->key, buf, sizeof(buf));
 
-    TXT_InitWidget(action, &txt_window_action_class);
-    action->key = key;
-    action->label = strdup(label);
+  /* Width is label length, plus key description length, plus '='
+   * and two surrounding spaces.
+   */
 
-    return action;
+  action->widget.w =
+      txt_utf8_strlen(action->label) + txt_utf8_strlen(buf) + 3;
+  action->widget.h = 1;
 }
 
-static void WindowCloseCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+static void txt_window_action_drawer(TXT_UNCAST_ARG(action))
 {
-    TXT_CAST_ARG(txt_window_t, window);
+  TXT_CAST_ARG(txt_window_action_t, action);
+  int hovering;
+  char buf[10];
 
-    TXT_CloseWindow(window);
+  txt_get_key_description(action->key, buf, sizeof(buf));
+
+  hovering = txt_hovering_over_widget(action);
+  txt_set_widget_bg(action);
+
+  txt_draw_string(" ");
+  txt_fgcolour(hovering ? TXT_COLOR_BRIGHT_WHITE : TXT_COLOR_BRIGHT_GREEN);
+  txt_draw_string(buf);
+  txt_fgcolour(TXT_COLOR_BRIGHT_CYAN);
+  txt_draw_string("=");
+
+  txt_fgcolour(TXT_COLOR_BRIGHT_WHITE);
+  txt_draw_string(action->label);
+  txt_draw_string(" ");
 }
 
-static void WindowSelectCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(window))
+static void txt_window_action_destructor(TXT_UNCAST_ARG(action))
 {
-    TXT_CAST_ARG(txt_window_t, window);
+  TXT_CAST_ARG(txt_window_action_t, action);
 
-    TXT_WidgetKeyPress(window, KEY_ENTER);
+  free(action->label);
 }
 
-// An action with the name "close" the closes the window
-
-txt_window_action_t *TXT_NewWindowEscapeAction(txt_window_t *window)
+static int txt_window_action_key_press(TXT_UNCAST_ARG(action), int key)
 {
-    txt_window_action_t *action;
+  TXT_CAST_ARG(txt_window_action_t, action);
 
-    action = TXT_NewWindowAction(KEY_ESCAPE, "Close");
-    TXT_SignalConnect(action, "pressed", WindowCloseCallback, window);
+  if (tolower(key) == tolower(action->key))
+    {
+      txt_emit_signal(action, "pressed");
+      return 1;
+    }
 
-    return action;
+  return 0;
 }
 
-// Exactly the same as the above, but the button is named "abort"
-
-txt_window_action_t *TXT_NewWindowAbortAction(txt_window_t *window)
+static void txt_window_action_mouse_press(TXT_UNCAST_ARG(action), int x,
+                                          int y, int b)
 {
-    txt_window_action_t *action;
+  TXT_CAST_ARG(txt_window_action_t, action);
 
-    action = TXT_NewWindowAction(KEY_ESCAPE, "Abort");
-    TXT_SignalConnect(action, "pressed", WindowCloseCallback, window);
+  /* Simulate a press of the key */
 
-    return action;
+  if (b == TXT_MOUSE_LEFT)
+    {
+      txt_window_action_key_press(action, action->key);
+    }
 }
 
-txt_window_action_t *TXT_NewWindowSelectAction(txt_window_t *window)
+static void window_close_callback(TXT_UNCAST_ARG(widget),
+                                  TXT_UNCAST_ARG(window))
 {
-    txt_window_action_t *action;
+  TXT_CAST_ARG(txt_window_t, window);
 
-    action = TXT_NewWindowAction(KEY_ENTER, "Select");
-    TXT_SignalConnect(action, "pressed", WindowSelectCallback, window);
-
-    return action;
+  txt_close_window(window);
 }
 
+static void window_select_callback(TXT_UNCAST_ARG(widget),
+                                   TXT_UNCAST_ARG(window))
+{
+  TXT_CAST_ARG(txt_window_t, window);
+
+  txt_widget_key_press(window, KEY_ENTER);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+txt_window_action_t *txt_new_window_action(int key, const char *label)
+{
+  txt_window_action_t *action;
+
+  action = malloc(sizeof(txt_window_action_t));
+
+  txt_init_widget(action, &txt_window_action_class);
+  action->key = key;
+  action->label = strdup(label);
+
+  return action;
+}
+
+/* An action with the name "close" the closes the window */
+
+txt_window_action_t *txt_new_window_escape_action(txt_window_t *window)
+{
+  txt_window_action_t *action;
+
+  action = txt_new_window_action(KEY_ESCAPE, "Close");
+  txt_signal_connect(action, "pressed", window_close_callback, window);
+
+  return action;
+}
+
+/* Exactly the same as the above, but the button is named "abort" */
+
+txt_window_action_t *txt_new_window_abort_action(txt_window_t *window)
+{
+  txt_window_action_t *action;
+
+  action = txt_new_window_action(KEY_ESCAPE, "Abort");
+  txt_signal_connect(action, "pressed", window_close_callback, window);
+
+  return action;
+}
+
+txt_window_action_t *txt_new_window_select_action(txt_window_t *window)
+{
+  txt_window_action_t *action;
+
+  action = txt_new_window_action(KEY_ENTER, "Select");
+  txt_signal_connect(action, "pressed", window_select_callback, window);
+
+  return action;
+}
diff --git a/games/NXDoom/textscreen/txt_window_action.h b/games/NXDoom/textscreen/txt_window_action.h
index 5a2f6b028..c76c6ecae 100644
--- a/games/NXDoom/textscreen/txt_window_action.h
+++ b/games/NXDoom/textscreen/txt_window_action.h
@@ -1,20 +1,36 @@
-//
-// Copyright(C) 2005-2014 Simon Howard
-//
-// 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.
-//
+/****************************************************************************
+ * apps/games/NXDoom/textscreen/txt_window_action.h
+ *
+ * SPDX-License-Identifer: GPLv2
+ *
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ ****************************************************************************/
 
 #ifndef TXT_WINDOW_ACTION_H
 #define TXT_WINDOW_ACTION_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "txt_widget.h"
+#include "txt_window.h"
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
 /**
  * @file txt_window_action.h
  *
@@ -33,16 +49,37 @@
 
 typedef struct txt_window_action_s txt_window_action_t;
 
-#include "txt_widget.h"
-#include "txt_window.h"
-
 struct txt_window_action_s
 {
-    txt_widget_t widget;
-    char *label;
-    int key;
+  txt_widget_t widget;
+  char *label;
+  int key;
 };
 
+/* A window.
+ *
+ * A window contains widgets, and may also be treated as a table
+ * (@ref txt_table_t) containing a single column.
+ *
+ * Windows can be created using @ref txt_new_window and closed using
+ * @ref txt_close_window.  When a window is closed, it emits the
+ * "closed" signal.
+ *
+ * In addition to the widgets within a window, windows also have
+ * a "tray" area at their bottom containing window action widgets.
+ * These widgets allow keyboard shortcuts to trigger common actions.
+ * Each window has three slots for keyboard shortcuts. By default,
+ * the left slot contains an action to close the window when the
+ * escape button is pressed, while the right slot contains an
+ * action to activate the currently-selected widget.
+ */
+
+typedef struct txt_window_s txt_window_t; /* Forward definition */
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 /**
  * Create a new window action.
  *
@@ -52,7 +89,7 @@ struct txt_window_action_s
  * @return              Pointer to the new window action widget.
  */
 
-txt_window_action_t *TXT_NewWindowAction(int key, const char *label);
+txt_window_action_t *txt_new_window_action(int key, const char *label);
 
 /**
  * Create a new window action that closes the window when the
@@ -62,7 +99,7 @@ txt_window_action_t *TXT_NewWindowAction(int key, const char *label);
  * @return              Pointer to the new window action widget.
  */
 
-txt_window_action_t *TXT_NewWindowEscapeAction(txt_window_t *window);
+txt_window_action_t *txt_new_window_escape_action(txt_window_t *window);
 
 /**
  * Create a new window action that closes the window when the
@@ -72,7 +109,7 @@ txt_window_action_t *TXT_NewWindowEscapeAction(txt_window_t *window);
  * @return              Pointer to the new window action widget.
  */
 
-txt_window_action_t *TXT_NewWindowAbortAction(txt_window_t *window);
+txt_window_action_t *txt_new_window_abort_action(txt_window_t *window);
 
 /**
  * Create a new "select" window action.  This does not really do
@@ -83,7 +120,6 @@ txt_window_action_t *TXT_NewWindowAbortAction(txt_window_t *window);
  * @return              Pointer to the new window action widget.
  */
 
-txt_window_action_t *TXT_NewWindowSelectAction(txt_window_t *window);
-
-#endif /* #ifndef TXT_WINDOW_ACTION_H */
+txt_window_action_t *txt_new_window_select_action(txt_window_t *window);
 
+#endif /* TXT_WINDOW_ACTION_H */
diff --git a/games/NXDoom/vcpkg.json b/games/NXDoom/vcpkg.json
deleted file mode 100644
index 05c856dd1..000000000
--- a/games/NXDoom/vcpkg.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "dependencies": [
-    "sdl2",
-    "sdl2-mixer",
-    "sdl2-net",
-    "libpng",
-    "libsamplerate",
-    "fluidsynth"
-  ]
-}
diff --git a/games/NXDoom/win32/win_opendir.c b/games/NXDoom/win32/win_opendir.c
deleted file mode 100644
index 3ec6227c8..000000000
--- a/games/NXDoom/win32/win_opendir.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
-MIT License
-Copyright (c) 2019 win32ports
-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.
-*/
-
-#ifdef _WIN32
-
-#include "win_opendir.h"
-
-#include <stdint.h>
-#include <errno.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <shlwapi.h>
-
-#ifdef _MSC_VER
-#pragma comment(lib, "Shlwapi.lib")
-#endif
-
-#ifndef NTFS_MAX_PATH
-#define NTFS_MAX_PATH 32768
-#endif /* NTFS_MAX_PATH */
-
-#ifndef FSCTL_GET_REPARSE_POINT
-#define FSCTL_GET_REPARSE_POINT 0x900a8
-#endif /* FSCTL_GET_REPARSE_POINT */
-
-#ifndef FILE_NAME_NORMALIZED
-#define FILE_NAME_NORMALIZED 0
-#endif /* FILE_NAME_NORMALIZED */
-
-struct __dir
-{
-    struct dirent *entries;
-    intptr_t fd;
-    long int count;
-    long int index;
-};
-
-int closedir(DIR *dirp)
-{
-    struct __dir *data = NULL;
-    if (!dirp)
-    {
-        errno = EBADF;
-        return -1;
-    }
-    data = (struct __dir *) dirp;
-    CloseHandle((HANDLE) data->fd);
-    free(data->entries);
-    free(data);
-    return 0;
-}
-
-static void __seterrno(int value)
-{
-#ifdef _MSC_VER
-    _set_errno(value);
-#else  /* _MSC_VER */
-    errno = value;
-#endif /* _MSC_VER */
-}
-
-static int __islink(const wchar_t *name, char *buffer)
-{
-    DWORD io_result = 0;
-    DWORD bytes_returned = 0;
-    HANDLE hFile = CreateFileW(
-        name, 0, 0, NULL, OPEN_EXISTING,
-        FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0);
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        return 0;
-    }
-
-    io_result = DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, NULL, 0, buffer,
-                                MAXIMUM_REPARSE_DATA_BUFFER_SIZE,
-                                &bytes_returned, NULL);
-
-    CloseHandle(hFile);
-
-    if (io_result == 0)
-    {
-        return 0;
-    }
-
-    return ((REPARSE_GUID_DATA_BUFFER *) buffer)->ReparseTag ==
-           IO_REPARSE_TAG_SYMLINK;
-}
-
-#pragma pack(push, 1)
-
-typedef struct dirent_FILE_ID_128
-{
-    BYTE Identifier[16];
-} dirent_FILE_ID_128;
-
-typedef struct _dirent_FILE_ID_INFO
-{
-    ULONGLONG VolumeSerialNumber;
-    dirent_FILE_ID_128 FileId;
-} dirent_FILE_ID_INFO;
-
-#pragma pack(pop)
-
-typedef enum dirent_FILE_INFO_BY_HANDLE_CLASS
-{
-    dirent_FileIdInfo = 18
-} dirent_FILE_INFO_BY_HANDLE_CLASS;
-
-static __ino_t __inode(const wchar_t *name)
-{
-    __ino_t value = {0};
-    BOOL result;
-    dirent_FILE_ID_INFO fileid;
-    BY_HANDLE_FILE_INFORMATION info;
-    typedef BOOL(__stdcall * pfnGetFileInformationByHandleEx)(
-        HANDLE hFile, dirent_FILE_INFO_BY_HANDLE_CLASS FileInformationClass,
-        LPVOID lpFileInformation, DWORD dwBufferSize);
-    pfnGetFileInformationByHandleEx fnGetFileInformationByHandleEx;
-    HANDLE hFile;
-
-    HANDLE hKernel32 = GetModuleHandleW(L"kernel32.dll");
-    if (!hKernel32)
-    {
-        return value;
-    }
-
-    fnGetFileInformationByHandleEx =
-        (pfnGetFileInformationByHandleEx) GetProcAddress(
-            hKernel32, "GetFileInformationByHandleEx");
-    if (!fnGetFileInformationByHandleEx)
-    {
-        return value;
-    }
-
-    hFile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL,
-                        OPEN_EXISTING, 0, 0);
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        return value;
-    }
-
-    result = fnGetFileInformationByHandleEx(hFile, dirent_FileIdInfo, &fileid,
-                                            sizeof(fileid));
-    if (result)
-    {
-        value.serial = fileid.VolumeSerialNumber;
-        memcpy(value.fileid, fileid.FileId.Identifier, 16);
-    }
-    else
-    {
-        result = GetFileInformationByHandle(hFile, &info);
-        if (result)
-        {
-            value.serial = info.dwVolumeSerialNumber;
-            memcpy(value.fileid + 8, &info.nFileIndexHigh, 4);
-            memcpy(value.fileid + 12, &info.nFileIndexLow, 4);
-        }
-    }
-    CloseHandle(hFile);
-    return value;
-}
-
-static DIR *__internal_opendir(wchar_t *wname, int size)
-{
-    struct __dir *data = NULL;
-    struct dirent *tmp_entries = NULL;
-    static wchar_t *suffix = L"\\*.*";
-    static int extra_prefix = 4; /* use prefix "\\?\" to handle long file names */
-    static int extra_suffix = 4; /* use suffix "\*.*" to find everything */
-    WIN32_FIND_DATAW w32fd = {0};
-    HANDLE hFindFile = INVALID_HANDLE_VALUE;
-    static int grow_factor = 2;
-    char *buffer = NULL;
-
-    BOOL relative = PathIsRelativeW(wname + extra_prefix);
-
-    memcpy(wname + size - 1, suffix, sizeof(wchar_t) * extra_suffix);
-    wname[size + extra_suffix - 1] = 0;
-
-    if (relative)
-    {
-        wname += extra_prefix;
-        size -= extra_prefix;
-    }
-    hFindFile = FindFirstFileW(wname, &w32fd);
-    if (INVALID_HANDLE_VALUE == hFindFile)
-    {
-        __seterrno(ENOENT);
-        return NULL;
-    }
-
-    data = (struct __dir *) malloc(sizeof(struct __dir));
-    if (!data)
-    {
-        goto out_of_memory;
-    }
-    wname[size - 1] = 0;
-    data->fd = (intptr_t) CreateFileW(wname, 0, 0, NULL, OPEN_EXISTING,
-                                      FILE_FLAG_BACKUP_SEMANTICS, 0);
-    wname[size - 1] = L'\\';
-    data->count = 16;
-    data->index = 0;
-    data->entries = (struct dirent *) malloc(sizeof(struct dirent) * data->count);
-    if (!data->entries)
-    {
-        goto out_of_memory;
-    }
-    buffer = malloc(MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
-    if (!buffer)
-    {
-        goto out_of_memory;
-    }
-
-    do
-    {
-        WideCharToMultiByte(CP_UTF8, 0, w32fd.cFileName, -1,
-                            data->entries[data->index].d_name, NAME_MAX,
-                            NULL, NULL);
-
-        memcpy(wname + size, w32fd.cFileName, sizeof(wchar_t) * NAME_MAX);
-
-        if (((w32fd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ==
-             FILE_ATTRIBUTE_REPARSE_POINT)
-            && __islink(wname, buffer))
-        {
-            data->entries[data->index].d_type = DT_LNK;
-        }
-        else if ((w32fd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE) ==
-                 FILE_ATTRIBUTE_DEVICE)
-        {
-            data->entries[data->index].d_type = DT_CHR;
-        }
-        else if ((w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ==
-                 FILE_ATTRIBUTE_DIRECTORY)
-        {
-            data->entries[data->index].d_type = DT_DIR;
-        }
-        else
-        {
-            data->entries[data->index].d_type = DT_REG;
-        }
-
-        data->entries[data->index].d_ino = __inode(wname);
-        data->entries[data->index].d_reclen = sizeof(struct dirent);
-        data->entries[data->index].d_namelen =
-            (unsigned char) wcslen(w32fd.cFileName);
-        data->entries[data->index].d_off = 0;
-
-        if (++data->index == data->count)
-        {
-            tmp_entries = (struct dirent *) realloc(
-                data->entries,
-                sizeof(struct dirent) * data->count * grow_factor);
-            if (!tmp_entries)
-            {
-                goto out_of_memory;
-            }
-            data->entries = tmp_entries;
-            data->count *= grow_factor;
-        }
-    } while (FindNextFileW(hFindFile, &w32fd) != 0);
-
-    free(buffer);
-    FindClose(hFindFile);
-
-    data->count = data->index;
-    data->index = 0;
-    return (DIR *) data;
-
-out_of_memory:
-    if (data)
-    {
-        if (INVALID_HANDLE_VALUE != (HANDLE) data->fd)
-        {
-            CloseHandle((HANDLE) data->fd);
-        }
-        free(data->entries);
-    }
-    free(buffer);
-    free(data);
-    if (INVALID_HANDLE_VALUE != hFindFile)
-    {
-        FindClose(hFindFile);
-    }
-    __seterrno(ENOMEM);
-    return NULL;
-}
-
-static wchar_t *__get_buffer()
-{
-    wchar_t *name = malloc(sizeof(wchar_t) * (NTFS_MAX_PATH + NAME_MAX + 8));
-    if (name)
-    {
-        memcpy(name, L"\\\\?\\", sizeof(wchar_t) * 4);
-    }
-    return name;
-}
-
-DIR *opendir(const char *name)
-{
-    DIR *dirp = NULL;
-    wchar_t *wname = __get_buffer();
-    int size = 0;
-    if (!wname)
-    {
-        errno = ENOMEM;
-        return NULL;
-    }
-    size = MultiByteToWideChar(CP_UTF8, 0, name, -1, wname + 4, NTFS_MAX_PATH);
-    if (0 == size)
-    {
-        free(wname);
-        return NULL;
-    }
-    /* Ensure path has no trailing backslash before __internal_opendir. */
-    /* Mind that size includes NULL, thus -2 for last character. */
-    if (wname[size+4-2] == L'\\')
-    {
-        wname[size+4-2] = 0;
-        size--;
-    }
-    dirp = __internal_opendir(wname, size + 4);
-    free(wname);
-    return dirp;
-}
-
-struct dirent *readdir(DIR *dirp)
-{
-    struct __dir *data = (struct __dir *) dirp;
-    if (!data)
-    {
-        errno = EBADF;
-        return NULL;
-    }
-    if (data->index < data->count)
-    {
-        return &data->entries[data->index++];
-    }
-    return NULL;
-}
-
-#endif /* _WIN32 */
diff --git a/games/NXDoom/win32/win_opendir.h b/games/NXDoom/win32/win_opendir.h
deleted file mode 100644
index bfc626224..000000000
--- a/games/NXDoom/win32/win_opendir.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-MIT License
-Copyright (c) 2019 win32ports
-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.
-*/
-
-#ifdef _WIN32
-
-#ifndef WIN_OPENDIR_H
-#define WIN_OPENDIR_H
-
-#include <sys/types.h>
-
-#ifndef NAME_MAX
-#define NAME_MAX 260
-#endif /* NAME_MAX */
-
-#ifndef DT_UNKNOWN
-#define DT_UNKNOWN 0
-#endif /* DT_UNKNOWN */
-
-#ifndef DT_FIFO
-#define DT_FIFO 1
-#endif /* DT_FIFO */
-
-#ifndef DT_CHR
-#define DT_CHR 2
-#endif /* DT_CHR */
-
-#ifndef DT_DIR
-#define DT_DIR 4
-#endif /* DT_DIR */
-
-#ifndef DT_BLK
-#define DT_BLK 6
-#endif /* DT_BLK */
-
-#ifndef DT_REG
-#define DT_REG 8
-#endif /* DT_REF */
-
-#ifndef DT_LNK
-#define DT_LNK 10
-#endif /* DT_LNK */
-
-#ifndef DT_SOCK
-#define DT_SOCK 12
-#endif /* DT_SOCK */
-
-#ifndef DT_WHT
-#define DT_WHT 14
-#endif /* DT_WHT */
-
-#ifndef _DIRENT_HAVE_D_NAMLEN
-#define _DIRENT_HAVE_D_NAMLEN 1
-#endif /* _DIRENT_HAVE_D_NAMLEN */
-
-#ifndef _DIRENT_HAVE_D_RECLEN
-#define _DIRENT_HAVE_D_RECLEN 1
-#endif /* _DIRENT_HAVE_D_RECLEN */
-
-#ifndef _DIRENT_HAVE_D_OFF
-#define _DIRENT_HAVE_D_OFF 1
-#endif /* _DIRENT_HAVE_D_OFF */
-
-#ifndef _DIRENT_HAVE_D_TYPE 
-#define _DIRENT_HAVE_D_TYPE 1
-#endif /* _DIRENT_HAVE_D_TYPE  */
-
-typedef void *DIR;
-
-typedef struct ino_t
-{
-    unsigned long long serial;
-    unsigned char fileid[16];
-} __ino_t;
-
-struct dirent
-{
-    __ino_t d_ino;
-    off_t d_off;
-    unsigned short d_reclen;
-    unsigned char d_namelen;
-    unsigned char d_type;
-    char d_name[NAME_MAX];
-};
-
-int closedir(DIR *dirp);
-
-DIR *opendir(const char *name);
-
-struct dirent *readdir(DIR *dirp);
-
-#endif /* WIN_OPENDIR_H */
-
-#endif /* _WIN32 */

From 53bc21feb820d533069469bff0db27618af384f8 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Mon, 29 Jun 2026 13:22:43 -0400
Subject: [PATCH 460/568] apps/games/NXDoom: Style ignores

Ignore some style/spelling errors in the DOOM port that cannot be fixed.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 .codespell-ignore-lines                    | 5 +++++
 .codespellrc                               | 2 ++
 games/NXDoom/textscreen/fonts/convert-font | 0
 3 files changed, 7 insertions(+)
 mode change 100755 => 100644 games/NXDoom/textscreen/fonts/convert-font

diff --git a/.codespell-ignore-lines b/.codespell-ignore-lines
index b001b6343..92f702a35 100644
--- a/.codespell-ignore-lines
+++ b/.codespell-ignore-lines
@@ -8,3 +8,8 @@
       auto certificate = Controlse::CCertificate(
  *  |---------- [-rw-r--r--        15]  afile.txt
   g_afile.name                 = "afile.txt";
+                            "*.deh", "*.hhe", "*.seh", NULL);
+  MUSIC("introa"), MUSIC("runnin"), MUSIC("stalks"), MUSIC("countd"),
+  MUSIC("betwee"), MUSIC("doom"),   MUSIC("the_da"), MUSIC("shawn"),
+  MUSIC("messag"), MUSIC("count2"), MUSIC("ddtbl3"), MUSIC("ampie"),
+  MUSIC("tense"),  MUSIC("shawn3"), MUSIC("openin"), MUSIC("evil"),
diff --git a/.codespellrc b/.codespellrc
index 651916c6a..743ab2a75 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -9,6 +9,8 @@ exclude-file = .codespell-ignore-lines
 skip =
   LICENSE,
   examples/webpanel/content/www/xterm.min.js,
+  **/games/NXDoom/src/doom/d_englsh.h,
+  **/games/NXDoom/src/doom/d_french.h
 
 # Ignore words list (FTP protocol commands and technical terms)
 ignore-words-list = ALLO, ARCHTYPE, parm, shiftIn
diff --git a/games/NXDoom/textscreen/fonts/convert-font b/games/NXDoom/textscreen/fonts/convert-font
old mode 100755
new mode 100644

From e3f7126a8f83068af354de37b33773ed4743213f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2026 22:22:23 +0000
Subject: [PATCH 461/568] build(deps): bump actions/cache from 5 to 6

Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22106e8bb..27795bf78 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -311,7 +311,7 @@ jobs:
 
       - name: Restore Tools Cache
         id: cache-tools
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         env:
           cache-name: ${{ runner.os }}-cache-tools
         with:

From e61f46536e5b55153202a2a1bb0143357f76b20e Mon Sep 17 00:00:00 2001
From: Frederick Blais <fred_blais5@hotmail.com>
Date: Wed, 1 Jul 2026 10:20:54 -0400
Subject: [PATCH 462/568] interpreters/berry: Fix Wshadow build errors

The pinned Berry source emits -Wshadow diagnostics in a couple of files. NuttX CI passes -Werror, so sim:berry fails when those third-party warnings are promoted to errors.\n\nAdd -Wno-shadow to Berry-specific compiler flags in both Make and CMake paths, keeping the local source patch limited to the NuttX port changes.

Signed-off-by: Frederick Blais <fred_blais5@hotmail.com>
---
 interpreters/berry/CMakeLists.txt | 2 +-
 interpreters/berry/Makefile       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/interpreters/berry/CMakeLists.txt b/interpreters/berry/CMakeLists.txt
index 42a37554b..d4749851b 100644
--- a/interpreters/berry/CMakeLists.txt
+++ b/interpreters/berry/CMakeLists.txt
@@ -54,7 +54,7 @@ if(CONFIG_INTERPRETERS_BERRY)
   set(BERRY_CONFIG ${BERRY_CONFIG_DIR}/berry_conf.h)
   set(BERRY_GENERATE ${BERRY_DIR}/generate)
   set(BERRY_GEN_STAMP ${BERRY_GENERATE}/.generated)
-  set(BERRY_FLAGS -Wno-unused-but-set-variable)
+  set(BERRY_FLAGS -Wno-unused-but-set-variable -Wno-shadow)
   set(BERRY_INCDIR ${BERRY_CONFIG_DIR} ${BERRY_DIR}/src ${BERRY_DIR}/default)
 
   set(BERRY_CSRCS
diff --git a/interpreters/berry/Makefile b/interpreters/berry/Makefile
index 6fd563162..510a5e86a 100644
--- a/interpreters/berry/Makefile
+++ b/interpreters/berry/Makefile
@@ -56,6 +56,7 @@ CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)interpreters$(DELIM)berry$(DELIM)incl
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)interpreters$(DELIM)berry$(DELIM)$(BERRY_UNPACK)$(DELIM)src
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)interpreters$(DELIM)berry$(DELIM)$(BERRY_UNPACK)$(DELIM)default
 CFLAGS += -Wno-unused-but-set-variable
+CFLAGS += -Wno-shadow
 
 PROGNAME  = $(CONFIG_INTERPRETERS_BERRY_PROGNAME)
 PRIORITY  = $(CONFIG_INTERPRETERS_BERRY_PRIORITY)

From c91abf2c8dbc50c31804fe0f509396267f334323 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Wed, 1 Jul 2026 09:41:09 -0400
Subject: [PATCH 463/568] games/NXDoom: Fix build warnings

This commit resolves all of the build warnings that were preventing
NXDoom from compiling in CI runs.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/src/doom/am_map.c           |   4 +
 games/NXDoom/src/doom/d_think.h          |   2 +-
 games/NXDoom/src/doom/g_game.c           |   6 +-
 games/NXDoom/src/doom/info.c             | 150 +++++++++++------------
 games/NXDoom/src/doom/info.h             |   6 +-
 games/NXDoom/src/doom/m_menu.c           |  39 +++---
 games/NXDoom/src/doom/p_pspr.c           |   2 +
 games/NXDoom/src/doom/r_main.c           |   2 +
 games/NXDoom/src/doom/st_stuff.c         |   2 +
 games/NXDoom/src/doom/wi_stuff.c         |   2 +-
 games/NXDoom/textscreen/txt_desktop.c    |   4 +
 games/NXDoom/textscreen/txt_fileselect.c |   2 +
 games/NXDoom/textscreen/txt_sdl.c        |   2 +
 13 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/games/NXDoom/src/doom/am_map.c b/games/NXDoom/src/doom/am_map.c
index 02d233df2..31daeb30b 100644
--- a/games/NXDoom/src/doom/am_map.c
+++ b/games/NXDoom/src/doom/am_map.c
@@ -607,6 +607,7 @@ static boolean stopped = true;
  *
  ****************************************************************************/
 
+#if 0 /* UNUSED */
 static void am_get_i_slope(mline_t *ml, islope_t *is)
 {
   int dx;
@@ -623,6 +624,7 @@ static void am_get_i_slope(mline_t *ml, islope_t *is)
   else
     is->slp = fixed_div(dy, dx);
 }
+#endif
 
 /****************************************************************************
  * Name: am_activate_new_scale
@@ -1004,6 +1006,7 @@ static void am_do_follow_player(void)
  * Name: am_update_light_lev
  ****************************************************************************/
 
+#if 0 /* UNUSED */
 static void am_update_light_lev(void)
 {
   static int nexttic = 0;
@@ -1026,6 +1029,7 @@ static void am_update_light_lev(void)
       nexttic = amclock + 6 - (amclock % 6);
     }
 }
+#endif
 
 /****************************************************************************
  * Name: am_clear_fb
diff --git a/games/NXDoom/src/doom/d_think.h b/games/NXDoom/src/doom/d_think.h
index 197422481..8ec8ada7f 100644
--- a/games/NXDoom/src/doom/d_think.h
+++ b/games/NXDoom/src/doom/d_think.h
@@ -35,7 +35,7 @@
  * various action functions cleanly.
  */
 
-typedef void (*actionf_v)();
+typedef void (*actionf_v)(void);
 typedef void (*actionf_p1)(void *);
 typedef void (*actionf_p2)(void *, void *);
 
diff --git a/games/NXDoom/src/doom/g_game.c b/games/NXDoom/src/doom/g_game.c
index 03589f06b..241ffcfa6 100644
--- a/games/NXDoom/src/doom/g_game.c
+++ b/games/NXDoom/src/doom/g_game.c
@@ -394,6 +394,7 @@ static int g_next_weapon(int direction)
   return weapon_order_table[i].weapon_num;
 }
 
+#if 0 /* UNUSED */
 static int g_cmd_checksum(ticcmd_t *cmd)
 {
   size_t i;
@@ -404,6 +405,7 @@ static int g_cmd_checksum(ticcmd_t *cmd)
 
   return sum;
 }
+#endif
 
 static void g_do_load_level(void)
 {
@@ -815,7 +817,7 @@ static void g_do_save_game(void)
 
 static const char *demo_version_description(int version)
 {
-  static char resultbuf[16];
+  static char resultbuf[24];
 
   switch (version)
     {
@@ -1281,12 +1283,14 @@ static void g_write_demo_ticcmd(ticcmd_t *cmd)
  * Called by the game initialization functions.
  */
 
+#if 0 /* UNUSED */
 static void g_init_player(int player)
 {
   /* clear everything else to defaults */
 
   g_player_reborn(player);
 }
+#endif
 
 /****************************************************************************
  * Public Functions
diff --git a/games/NXDoom/src/doom/info.c b/games/NXDoom/src/doom/info.c
index 24cc86937..e1d6e8ac8 100644
--- a/games/NXDoom/src/doom/info.c
+++ b/games/NXDoom/src/doom/info.c
@@ -63,7 +63,7 @@
       .sprite = (s),                                                         \
       .frame = (f),                                                          \
       .tics = (t),                                                           \
-      .action = {(a)},                                                       \
+      .action = {(void *)(a)},                                                       \
       .nextstate = (ns),                                                     \
   }
 #endif
@@ -98,80 +98,80 @@ const char *sprnames[] =
 
 /* Doesn't work with g++, needs actionf_p1 */
 
-void a_light0();
-void a_weapon_ready();
-void a_lower();
-void a_raise();
-void a_punch();
-void a_refire();
-void a_fire_pistol();
-void a_light1();
-void a_fire_shotgun();
-void a_light2();
-void a_fire_shotgun2();
-void a_check_reload();
-void a_open_shotgun2();
-void a_load_shotgun2();
-void a_close_shotgun2();
-void a_fire_cgun();
-void a_gun_flash();
-void a_fire_missile();
-void a_saw();
-void a_fire_plasma();
-void a_bfg_sound();
-void a_fire_bfg();
-void a_bfg_spray();
-void a_explode();
-void a_pain();
-void a_player_screm();
-void a_fall();
-void a_xscream();
-void a_look();
-void a_chase();
-void a_face_target();
-void a_pos_attack();
-void a_scream();
-void a_s_pos_attack();
-void a_vile_chase();
-void a_vile_start();
-void a_vile_target();
-void a_vile_attack();
-void a_start_fire();
-void a_fire();
-void a_fire_crackle();
-void a_tracer();
-void a_skel_woosh();
-void a_skel_fist();
-void a_skel_missile();
-void a_fat_raise();
-void a_fat_attack1();
-void a_fat_attack2();
-void a_fat_attack3();
-void a_boss_death();
-void a_c_pos_attack();
-void a_c_pos_refire();
-void a_troop_attack();
-void a_sarg_attack();
-void a_head_attack();
-void a_bruis_attack();
-void a_skull_attack();
-void a_metal();
-void a_spid_refire();
-void a_baby_metal();
-void a_bspi_attack();
-void a_hoof();
-void a_cyber_attack();
-void a_pain_attack();
-void a_pain_die();
-void a_keen_die();
-void a_brain_pain();
-void a_brain_scream();
-void a_brain_die();
-void a_brain_awake();
-void a_brain_split();
-void a_spawn_sound();
-void a_spawn_fly();
-void a_brain_explode();
+void a_light0(void *, void *);
+void a_weapon_ready(void *, void *);
+void a_lower(void *, void *);
+void a_raise(void *, void *);
+void a_punch(void *, void *);
+void a_refire(void *, void *);
+void a_fire_pistol(void *, void *);
+void a_light1(void *, void *);
+void a_fire_shotgun(void *, void *);
+void a_light2(void *, void *);
+void a_fire_shotgun2(void *, void *);
+void a_check_reload(void *, void *);
+void a_open_shotgun2(void *, void *);
+void a_load_shotgun2(void *, void *);
+void a_close_shotgun2(void *, void *);
+void a_fire_cgun(void *, void *);
+void a_gun_flash(void *, void *);
+void a_fire_missile(void *, void *);
+void a_saw(void *, void *);
+void a_fire_plasma(void *, void *);
+void a_bfg_sound(void *, void *);
+void a_fire_bfg(void *, void *);
+void a_bfg_spray(void *);
+void a_explode(void *);
+void a_pain(void *);
+void a_player_screm(void *);
+void a_fall(void *);
+void a_xscream(void *);
+void a_look(void *);
+void a_chase(void *);
+void a_face_target(void *);
+void a_pos_attack(void *);
+void a_scream(void *);
+void a_s_pos_attack(void *);
+void a_vile_chase(void *);
+void a_vile_start(void *);
+void a_vile_target(void *);
+void a_vile_attack(void *);
+void a_start_fire(void *);
+void a_fire(void *);
+void a_fire_crackle(void *);
+void a_tracer(void *);
+void a_skel_woosh(void *);
+void a_skel_fist(void *);
+void a_skel_missile(void *);
+void a_fat_raise(void *);
+void a_fat_attack1(void *);
+void a_fat_attack2(void *);
+void a_fat_attack3(void *);
+void a_boss_death(void *);
+void a_c_pos_attack(void *);
+void a_c_pos_refire(void *);
+void a_troop_attack(void *);
+void a_sarg_attack(void *);
+void a_head_attack(void *);
+void a_bruis_attack(void *);
+void a_skull_attack(void *);
+void a_metal(void *);
+void a_spid_refire(void *);
+void a_baby_metal(void *);
+void a_bspi_attack(void *);
+void a_hoof(void *);
+void a_cyber_attack(void *);
+void a_pain_attack(void *);
+void a_pain_die(void *);
+void a_keen_die(void *);
+void a_brain_pain(void *);
+void a_brain_scream(void *);
+void a_brain_die(void *);
+void a_brain_awake(void *);
+void a_brain_split(void *);
+void a_spawn_sound(void *);
+void a_spawn_fly(void *);
+void a_brain_explode(void *);
 
 /****************************************************************************
  * Public Data
diff --git a/games/NXDoom/src/doom/info.h b/games/NXDoom/src/doom/info.h
index 508475f9d..4cace8cdf 100644
--- a/games/NXDoom/src/doom/info.h
+++ b/games/NXDoom/src/doom/info.h
@@ -1154,9 +1154,7 @@ typedef enum
   NUMSTATES
 } statenum_t;
 
-/* Tightly packed to save space! */
-
-begin_packed_struct struct state_t
+struct state_t
 {
   actionf_t action; /* void (*action) (); */
   spritenum_t sprite;
@@ -1179,7 +1177,7 @@ begin_packed_struct struct state_t
   int misc1;
   int misc2;
 #endif
-} end_packed_struct;
+};
 
 typedef struct state_t state_t;
 
diff --git a/games/NXDoom/src/doom/m_menu.c b/games/NXDoom/src/doom/m_menu.c
index 55dd9589f..77e878f94 100644
--- a/games/NXDoom/src/doom/m_menu.c
+++ b/games/NXDoom/src/doom/m_menu.c
@@ -223,11 +223,9 @@ static void m_quit_doom(int choice);
 
 static void m_change_messages(int choice);
 static void m_change_sensitivity(int choice);
-static void m_sfx_vol(int choice);
-static void m_music_vol(int choice);
+static void m_sound(int choice);
 static void m_change_detail(int choice);
 static void m_size_display(int choice);
-static void m_sound(int choice);
 
 static void m_finish_read_this(int choice);
 static void m_load_select(int choice);
@@ -242,7 +240,6 @@ static void m_draw_read_this2(void);
 static void m_draw_new_game(void);
 static void m_draw_episode(void);
 static void m_draw_options(void);
-static void m_draw_sound(void);
 static void m_draw_load(void);
 static void m_draw_save(void);
 
@@ -256,6 +253,12 @@ static void m_start_message(const char *string,
         void *routine, boolean input);
 static void m_clear_menus(void);
 
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+static void m_sfx_vol(int choice);
+static void m_music_vol(int choice);
+static void m_draw_sound(void);
+#endif
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -282,8 +285,6 @@ boolean inhelpscreens;
 
 /* message x & y */
 
-static int g_messx;
-static int g_messy;
 static int g_message_last_menu_active;
 
 /* timed message = no input from user */
@@ -915,7 +916,7 @@ void m_quick_save(void)
   m_start_message(g_tempstring, m_quick_save_response, true);
 }
 
-void m_quick_load(void)
+static void m_quick_load(void)
 {
   if (netgame)
     {
@@ -938,7 +939,7 @@ void m_quick_load(void)
  * Had a "quick hack to fix romero bug"
  */
 
-void m_draw_read_this1(void)
+static void m_draw_read_this1(void)
 {
   inhelpscreens = true;
 
@@ -947,7 +948,7 @@ void m_draw_read_this1(void)
 
 /* Read This Menus - optional second page. */
 
-void m_draw_read_this2(void)
+static void m_draw_read_this2(void)
 {
   inhelpscreens = true;
 
@@ -960,11 +961,11 @@ void m_draw_read_this2(void)
 
 /* Change Sfx & Music volumes */
 
-void m_draw_sound(void)
+#ifdef CONFIG_GAMES_NXDOOM_SOUND
+static void m_draw_sound(void)
 {
   v_draw_patch_direct(60, 38, w_cache_lump_name(("M_SVOL"), PU_CACHE));
 
-#ifdef CONFIG_GAMES_NXDOOM_SOUND
   m_draw_thermo(g_sound_def.x,
                 g_sound_def.y + LINEHEIGHT * (SOUND_SFXVOL + 1), 16,
                 g_sfx_volume);
@@ -972,19 +973,19 @@ void m_draw_sound(void)
   m_draw_thermo(g_sound_def.x,
                 g_sound_def.y + LINEHEIGHT * (SOUND_MUSICVOL + 1), 16,
                 g_music_volume);
-#endif
 }
+#endif
 
-void m_sound(int choice)
+static void m_sound(int choice)
 {
 #ifdef CONFIG_GAMES_NXDOOM_SOUND
   m_setup_next_menu(&g_sound_def);
 #endif
 }
 
-void m_sfx_vol(int choice)
-{
 #ifdef CONFIG_GAMES_NXDOOM_SOUND
+static void m_sfx_vol(int choice)
+{
   switch (choice)
     {
     case 0:
@@ -996,12 +997,12 @@ void m_sfx_vol(int choice)
     }
 
   s_set_sfx_volume(g_sfx_volume * 8);
-#endif
 }
+#endif
 
-void m_music_vol(int choice)
-{
 #ifdef CONFIG_GAMES_NXDOOM_SOUND
+static void m_music_vol(int choice)
+{
   switch (choice)
     {
     case 0:
@@ -1013,8 +1014,8 @@ void m_music_vol(int choice)
     }
 
   s_set_music_volume(g_music_volume * 8);
-#endif
 }
+#endif
 
 void m_drawmain_menu(void)
 {
diff --git a/games/NXDoom/src/doom/p_pspr.c b/games/NXDoom/src/doom/p_pspr.c
index 9800b0e7c..42a58f23a 100644
--- a/games/NXDoom/src/doom/p_pspr.c
+++ b/games/NXDoom/src/doom/p_pspr.c
@@ -118,6 +118,7 @@ static void p_set_psprite(player_t *player, int position, statenum_t stnum)
   /* an initial state of 0 could cycle through */
 }
 
+#if 0 /* UNUSED */
 static void p_calc_swing(player_t *player)
 {
   fixed_t swing;
@@ -135,6 +136,7 @@ static void p_calc_swing(player_t *player)
   angle = (FINEANGLES / 70 * leveltime + FINEANGLES / 2) & FINEMASK;
   swingy = -fixed_mul(swingx, finesine[angle]);
 }
+#endif
 
 /* p_bringup_weapon
  * Starts bringing the pending weapon up from the bottom of the screen. Uses
diff --git a/games/NXDoom/src/doom/r_main.c b/games/NXDoom/src/doom/r_main.c
index 5eb1a4eee..b50cdc337 100644
--- a/games/NXDoom/src/doom/r_main.c
+++ b/games/NXDoom/src/doom/r_main.c
@@ -139,6 +139,7 @@ int setdetail;
  *
  ****************************************************************************/
 
+#if 0 /* UNUSED */
 static void r_add_point_to_box(int x, int y, fixed_t *box)
 {
   if (x < box[BOXLEFT]) box[BOXLEFT] = x;
@@ -146,6 +147,7 @@ static void r_add_point_to_box(int x, int y, fixed_t *box)
   if (y < box[BOXBOTTOM]) box[BOXBOTTOM] = y;
   if (y > box[BOXTOP]) box[BOXTOP] = y;
 }
+#endif
 
 /****************************************************************************
  * Name: r_setup_frame
diff --git a/games/NXDoom/src/doom/st_stuff.c b/games/NXDoom/src/doom/st_stuff.c
index 7a133b33c..c6e55ee67 100644
--- a/games/NXDoom/src/doom/st_stuff.c
+++ b/games/NXDoom/src/doom/st_stuff.c
@@ -958,6 +958,7 @@ static void st_load_data(void)
   st_load_graphics();
 }
 
+#if 0 /* UNUSED */
 static void st_unload_callback(const char *lumpname, patch_t **variable)
 {
   w_release_lump_name(lumpname);
@@ -968,6 +969,7 @@ static void st_unload_graphics(void)
 {
   st_load_unload_graphics(st_unload_callback);
 }
+#endif
 
 static void st_init_data(void)
 {
diff --git a/games/NXDoom/src/doom/wi_stuff.c b/games/NXDoom/src/doom/wi_stuff.c
index 724aa3320..fdb5964ad 100644
--- a/games/NXDoom/src/doom/wi_stuff.c
+++ b/games/NXDoom/src/doom/wi_stuff.c
@@ -479,7 +479,7 @@ static void wi_load_unload_data(load_callback_t callback)
 {
   int8_t i;
   int8_t j;
-  char name[9];
+  char name[23];
   anim_t *a;
 
   if (gamemode == commercial)
diff --git a/games/NXDoom/textscreen/txt_desktop.c b/games/NXDoom/textscreen/txt_desktop.c
index 06416a233..3b45a0eb5 100644
--- a/games/NXDoom/textscreen/txt_desktop.c
+++ b/games/NXDoom/textscreen/txt_desktop.c
@@ -63,6 +63,7 @@ static void txt_exit_mainloop(void)
   g_main_loop_running = 0;
 }
 
+#if 0 /* UNUSED */
 static int txt_raise_window(txt_window_t *window)
 {
   int i;
@@ -88,6 +89,7 @@ static int txt_raise_window(txt_window_t *window)
 
   return 0;
 }
+#endif
 
 static void draw_desktop_background(const char *title)
 {
@@ -201,6 +203,7 @@ static void desktop_input_event(int c)
     }
 }
 
+#if 0 /* UNUSED */
 static void txt_draw_ascii_table(void)
 {
   unsigned char *screendata;
@@ -232,6 +235,7 @@ static void txt_draw_ascii_table(void)
 
   txt_update_screen();
 }
+#endif
 
 /****************************************************************************
  * Public Functions
diff --git a/games/NXDoom/textscreen/txt_fileselect.c b/games/NXDoom/textscreen/txt_fileselect.c
index b1343efd6..b6b6067cd 100644
--- a/games/NXDoom/textscreen/txt_fileselect.c
+++ b/games/NXDoom/textscreen/txt_fileselect.c
@@ -104,6 +104,7 @@ txt_widget_class_t txt_fileselect_class =
  * Private Functions
  ****************************************************************************/
 
+#if 0 /* UNUSED */
 static char *exec_read_output(char **argv)
 {
   char *result;
@@ -261,6 +262,7 @@ static char *txt_select_file(const char *window_title,
 {
   return NULL;
 }
+#endif
 
 static void txt_file_select_size_calc(TXT_UNCAST_ARG(fileselect))
 {
diff --git a/games/NXDoom/textscreen/txt_sdl.c b/games/NXDoom/textscreen/txt_sdl.c
index 6041ab187..c531f6cbe 100644
--- a/games/NXDoom/textscreen/txt_sdl.c
+++ b/games/NXDoom/textscreen/txt_sdl.c
@@ -73,6 +73,7 @@ static const short g_code_page_to_unicode[] = CODE_PAGE_TO_UNICODE;
  * blinking characters.
  */
 
+#if 0 /* UNUSED */
 static int txt_has_blinking_chars(void)
 {
   int x;
@@ -111,6 +112,7 @@ static void txt_string_concat(char *dest, const char *src, size_t dest_len)
 
   txt_string_copy(dest + offset, src, dest_len - offset);
 }
+#endif
 
 /****************************************************************************
  * Public Functions

From 59d3a0d0ae74f7c2cc7e2877158c0ffa55129d09 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Thu, 2 Jul 2026 12:40:58 -0300
Subject: [PATCH 464/568] examples/lvglterm: support physical keyboard input

Refactor the LVGL terminal into a shared core (lvglterm.c) plus two
selectable input variants: the existing on-screen touch keyboard
(lvglterm_touch.c) and a new physical keyboard variant (lvglterm_kbd.c) that
reads key events from a /dev/kbdN device and streams them to the shell.

The input source is chosen with a Kconfig choice (touch by default, keeping
the previous behaviour).  The keyboard variant reads its device from
CONFIG_EXAMPLES_LVGLTERM_KBD_DEV (default /dev/kbd0), overridable by the first
command-line argument, and scrolls the output with the Fn cursor keys.  A font
choice (UNSCII 8 or 16) is added for low-resolution displays.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 examples/lvglterm/CMakeLists.txt   |   9 +-
 examples/lvglterm/Kconfig          |  50 +++
 examples/lvglterm/Makefile         |   9 +-
 examples/lvglterm/lvglterm.c       | 575 +++++++++++------------------
 examples/lvglterm/lvglterm.h       |  75 ++++
 examples/lvglterm/lvglterm_kbd.c   | 228 ++++++++++++
 examples/lvglterm/lvglterm_touch.c | 164 ++++++++
 7 files changed, 752 insertions(+), 358 deletions(-)
 create mode 100644 examples/lvglterm/lvglterm.h
 create mode 100644 examples/lvglterm/lvglterm_kbd.c
 create mode 100644 examples/lvglterm/lvglterm_touch.c

diff --git a/examples/lvglterm/CMakeLists.txt b/examples/lvglterm/CMakeLists.txt
index fe6d3c48c..22650f82f 100644
--- a/examples/lvglterm/CMakeLists.txt
+++ b/examples/lvglterm/CMakeLists.txt
@@ -21,6 +21,12 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_LVGLTERM)
+  if(CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD)
+    set(lvglterm_input lvglterm_kbd.c)
+  else()
+    set(lvglterm_input lvglterm_touch.c)
+  endif()
+
   nuttx_add_application(
     NAME
     lvglterm
@@ -31,5 +37,6 @@ if(CONFIG_EXAMPLES_LVGLTERM)
     MODULE
     ${CONFIG_EXAMPLES_LVGLTERM}
     SRCS
-    lvglterm.c)
+    lvglterm.c
+    ${lvglterm_input})
 endif()
diff --git a/examples/lvglterm/Kconfig b/examples/lvglterm/Kconfig
index dec9d9b24..718af98b6 100644
--- a/examples/lvglterm/Kconfig
+++ b/examples/lvglterm/Kconfig
@@ -12,6 +12,56 @@ menuconfig EXAMPLES_LVGLTERM
 
 if EXAMPLES_LVGLTERM
 
+choice
+	prompt "LVGL Terminal input source"
+	default EXAMPLES_LVGLTERM_INPUT_TOUCH
+	---help---
+		Select how the terminal receives keystrokes.  Only one input source
+		is built at a time.
+
+config EXAMPLES_LVGLTERM_INPUT_TOUCH
+	bool "On-screen keyboard (touch)"
+	---help---
+		Input comes from an on-screen LVGL keyboard operated by touch; a
+		command line is typed and submitted with Enter.  This is the default
+		and matches the original behaviour.
+
+config EXAMPLES_LVGLTERM_INPUT_KBD
+	bool "Physical keyboard (/dev/kbdN)"
+	depends on INPUT_KEYBOARD
+	---help---
+		Input comes from a physical keyboard registered as a /dev/kbdN
+		device; keystrokes are streamed to the shell and the output fills
+		the whole screen.
+
+endchoice
+
+config EXAMPLES_LVGLTERM_KBD_DEV
+	string "Keyboard device path"
+	default "/dev/kbd0"
+	depends on EXAMPLES_LVGLTERM_INPUT_KBD
+	---help---
+		Keyboard device the terminal reads key events from.  Can also be
+		overridden at run time by passing the path as the first command-line
+		argument (useful when more than one keyboard is present).
+
+choice
+	prompt "LVGL Terminal font"
+	default EXAMPLES_LVGLTERM_FONT_UNSCII_16
+	---help---
+		Monospaced font used to render the terminal.  Use the smaller UNSCII 8
+		on low-resolution displays where UNSCII 16 shows too few columns.
+
+config EXAMPLES_LVGLTERM_FONT_UNSCII_8
+	bool "UNSCII 8 (small)"
+	select LV_FONT_UNSCII_8
+
+config EXAMPLES_LVGLTERM_FONT_UNSCII_16
+	bool "UNSCII 16"
+	select LV_FONT_UNSCII_16
+
+endchoice
+
 config EXAMPLES_LVGLTERM_PRIORITY
 	int "lvglterm task priority"
 	default 100
diff --git a/examples/lvglterm/Makefile b/examples/lvglterm/Makefile
index 531d8c405..314351f9a 100644
--- a/examples/lvglterm/Makefile
+++ b/examples/lvglterm/Makefile
@@ -27,8 +27,15 @@ PRIORITY = $(CONFIG_EXAMPLES_LVGLTERM_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_LVGLTERM_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_LVGLTERM)
 
-# LVGL Terminal
+# LVGL Terminal.  lvglterm.c holds the shared core; the input source is
+# selected at build time (on-screen keyboard for touch, /dev/kbdN otherwise).
 
 MAINSRC = lvglterm.c
 
+ifeq ($(CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD),y)
+CSRCS = lvglterm_kbd.c
+else
+CSRCS = lvglterm_touch.c
+endif
+
 include $(APPDIR)/Application.mk
diff --git a/examples/lvglterm/lvglterm.c b/examples/lvglterm/lvglterm.c
index f1ef2259f..0814e9afe 100644
--- a/examples/lvglterm/lvglterm.c
+++ b/examples/lvglterm/lvglterm.c
@@ -23,6 +23,12 @@
 /* Reference:
  * "NuttX RTOS for PinePhone: LVGL Terminal for NSH Shell"
  * https://lupyuen.github.io/articles/terminal
+ *
+ * Code shared by both input variants: it starts the NSH shell with its
+ * standard streams redirected through pipes, renders the shell output in an
+ * LVGL text area, and delegates the input source to the selected variant
+ * (on-screen keyboard in lvglterm_touch.c, physical keyboard in
+ * lvglterm_kbd.c).
  */
 
 /****************************************************************************
@@ -35,12 +41,15 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
 #include <nuttx/debug.h>
 #include <poll.h>
 #include <spawn.h>
 #include <lvgl/lvgl.h>
 
+#include "lvglterm.h"
+
 /* NSH Task requires posix_spawn() */
 
 #ifndef CONFIG_LIBC_EXECFUNCS
@@ -53,10 +62,20 @@
 #  error FIFO and Named Pipe Drivers should be enabled in the configuration
 #endif
 
-/* NSH Output requires a Monospaced Font */
+/* NSH Output requires a Monospaced Font.  The size is selectable so that
+ * low-resolution displays can use the smaller UNSCII 8.
+ */
 
-#ifndef CONFIG_LV_FONT_UNSCII_16
-#  error LVGL Font UNSCII 16 should be enabled in the configuration
+#if defined(CONFIG_EXAMPLES_LVGLTERM_FONT_UNSCII_8)
+#  ifndef CONFIG_LV_FONT_UNSCII_8
+#    error LVGL Font UNSCII 8 should be enabled in the configuration
+#  endif
+#  define LVGLTERM_FONT lv_font_unscii_8
+#else
+#  ifndef CONFIG_LV_FONT_UNSCII_16
+#    error LVGL Font UNSCII 16 should be enabled in the configuration
+#  endif
+#  define LVGLTERM_FONT lv_font_unscii_16
 #endif
 
 /****************************************************************************
@@ -65,12 +84,12 @@
 
 /* How often to poll for output from NSH Shell (milliseconds) */
 
-#define TIMER_PERIOD_MS 100
+#define TIMER_PERIOD_MS 20
 
-/* Read and Write Pipes for NSH stdin, stdout and stderr */
+/* Trim the output text area once it grows past this many characters */
 
-#define READ_PIPE  0
-#define WRITE_PIPE 1
+#define TERM_MAXCHARS  4096
+#define TERM_KEEPCHARS 3072
 
 /* NSH Task to be started */
 
@@ -81,38 +100,34 @@
  ****************************************************************************/
 
 static int create_widgets(void);
-static void timer_callback(lv_timer_t * timer);
-static void input_callback(lv_event_t * e);
-static bool has_input(int fd);
-static void remove_escape_codes(char *buf, int len);
+static void timer_callback(lv_timer_t *timer);
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Pipe to NSH stdin, written by the selected input variant */
+
+int g_nsh_stdin[2];
+
+/* LVGL Column Container and NSH Output Text Area (shared with the variant) */
+
+lv_obj_t *g_col;
+lv_obj_t *g_output;
+
+/* LVGL Font Style for NSH Input and Output */
+
+lv_style_t g_terminal_style;
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
-/* Pipes for NSH Shell: stdin, stdout, stderr */
+/* Pipes for NSH stdout and stderr */
 
-static int g_nsh_stdin[2];
 static int g_nsh_stdout[2];
 static int g_nsh_stderr[2];
 
-/* LVGL Column Container for NSH Widgets */
-
-static lv_obj_t *g_col;
-
-/* LVGL Text Area Widgets for NSH Input and Output */
-
-static lv_obj_t *g_input;
-static lv_obj_t *g_output;
-
-/* LVGL Keyboard Widget for NSH Terminal */
-
-static lv_obj_t *g_kb;
-
-/* LVGL Font Style for NSH Input and Output */
-
-static lv_style_t g_terminal_style;
-
 /* LVGL Timer for polling NSH Output */
 
 static lv_timer_t *g_timer;
@@ -124,73 +139,188 @@ static char * const g_nsh_argv[] =
   NSH_TASK, NULL
 };
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lvglterm_has_input
+ *
+ * Description:
+ *   Return true if the file descriptor has data to be read.
+ *
+ ****************************************************************************/
+
+bool lvglterm_has_input(int fd)
+{
+  struct pollfd fdp;
+
+  fdp.fd     = fd;
+  fdp.events = POLLIN;
+  return poll(&fdp, 1, 0) > 0 && (fdp.revents & POLLIN) != 0;
+}
+
+/****************************************************************************
+ * Name: lvglterm_add_output
+ *
+ * Description:
+ *   Append text to the NSH output text area, dropping VT100 escape sequences
+ *   and carriage returns, honouring backspace, and trimming the buffer once
+ *   it grows too large.  Must run in the LVGL thread.
+ *
+ ****************************************************************************/
+
+void lvglterm_add_output(FAR const char *buf, int len)
+{
+  char clean[64];
+  int  ci = 0;
+  int  i;
+
+  for (i = 0; i < len; i++)
+    {
+      char c = buf[i];
+
+      if (c == 0x1b)                /* ESC: skip the escape sequence */
+        {
+          i++;
+          if (i < len && buf[i] == '[')
+            {
+              for (i++; i < len; i++)
+                {
+                  if ((buf[i] >= 'A' && buf[i] <= 'Z') ||
+                      (buf[i] >= 'a' && buf[i] <= 'z'))
+                    {
+                      break;
+                    }
+                }
+            }
+
+          continue;
+        }
+
+      if (c == '\r')                /* Drop carriage return */
+        {
+          continue;
+        }
+
+      if (c == 0x08 || c == 0x7f)   /* Backspace/DEL: erase last character */
+        {
+          if (ci > 0)
+            {
+              clean[ci] = '\0';
+              lv_textarea_add_text(g_output, clean);
+              ci = 0;
+            }
+
+          lv_textarea_delete_char(g_output);
+          continue;
+        }
+
+      if (c == '\n' || c == '\t' || (c >= 0x20 && c < 0x7f))
+        {
+          clean[ci++] = c;
+          if (ci >= (int)sizeof(clean) - 1)
+            {
+              clean[ci] = '\0';
+              lv_textarea_add_text(g_output, clean);
+              ci = 0;
+            }
+        }
+    }
+
+  if (ci > 0)
+    {
+      clean[ci] = '\0';
+      lv_textarea_add_text(g_output, clean);
+    }
+
+  /* Trim the text area if it has grown too large */
+
+  if ((int)strlen(lv_textarea_get_text(g_output)) > TERM_MAXCHARS)
+    {
+      FAR const char *txt = lv_textarea_get_text(g_output);
+      int total = strlen(txt);
+      lv_textarea_set_text(g_output, txt + (total - TERM_KEEPCHARS));
+      lv_textarea_set_cursor_pos(g_output, LV_TEXTAREA_CURSOR_LAST);
+    }
+}
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: create_widgets
+ *
+ * Description:
+ *   Create the shared LVGL widgets: a column container and the NSH output
+ *   text area.  The input source is added by the selected variant.
+ *
+ ****************************************************************************/
+
+static int create_widgets(void)
+{
+  /* Set the Font Style for NSH Input and Output to a Monospaced Font */
+
+  lv_style_init(&g_terminal_style);
+  lv_style_set_text_font(&g_terminal_style, &LVGLTERM_FONT);
+
+  /* Create an LVGL Container with Column Flex Direction */
+
+  g_col = lv_obj_create(lv_scr_act());
+  DEBUGASSERT(g_col != NULL);
+  lv_obj_set_size(g_col, LV_PCT(100), LV_PCT(100));
+  lv_obj_set_flex_flow(g_col, LV_FLEX_FLOW_COLUMN);
+  lv_obj_set_style_pad_all(g_col, 0, 0);
+
+  /* Create an LVGL Text Area Widget for NSH Output */
+
+  g_output = lv_textarea_create(g_col);
+  DEBUGASSERT(g_output != NULL);
+  lv_obj_add_style(g_output, &g_terminal_style, 0);
+  lv_obj_set_width(g_output, LV_PCT(100));
+  lv_obj_set_flex_grow(g_output, 1);
+
+  return OK;
+}
+
 /****************************************************************************
  * Name: create_terminal
  *
  * Description:
- *   Create the LVGL Terminal. Start the NSH Shell and redirect the NSH
- *   stdin, stdout and stderr to the LVGL Widgets.
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   Zero (OK) on success; a negated errno value is returned on any failure.
+ *   Start the NSH shell with its streams redirected to pipes, create the
+ *   shared widgets and the output-polling timer, and set up the input
+ *   variant.
  *
  ****************************************************************************/
 
-static int create_terminal(void)
+static int create_terminal(int argc, FAR char *argv[])
 {
   int ret;
   pid_t pid;
 
   /* Create the pipes for NSH Shell: stdin, stdout and stderr */
 
-  ret = pipe(g_nsh_stdin);
-  if (ret < 0)
+  if (pipe(g_nsh_stdin) < 0 || pipe(g_nsh_stdout) < 0 ||
+      pipe(g_nsh_stderr) < 0)
     {
-      _err("stdin pipe failed: %d\n", errno);
+      _err("pipe failed: %d\n", errno);
       return ERROR;
     }
 
-  ret = pipe(g_nsh_stdout);
-  if (ret < 0)
-    {
-      _err("stdout pipe failed: %d\n", errno);
-      return ERROR;
-    }
-
-  ret = pipe(g_nsh_stderr);
-  if (ret < 0)
-    {
-      _err("stderr pipe failed: %d\n", errno);
-      return ERROR;
-    }
-
-  /* Close default stdin, stdout and stderr */
+  /* Close default stdin, stdout and stderr and assign the new pipes */
 
   close(0);
   close(1);
   close(2);
 
-  /* Assign the new pipes as stdin, stdout and stderr */
-
   dup2(g_nsh_stdin[READ_PIPE], 0);
   dup2(g_nsh_stdout[WRITE_PIPE], 1);
   dup2(g_nsh_stderr[WRITE_PIPE], 2);
 
   /* Start the NSH Shell and inherit stdin, stdout and stderr */
 
-  ret = posix_spawn(&pid,        /* Returned Task ID */
-                    NSH_TASK,    /* NSH Path */
-                    NULL,        /* Inherit stdin, stdout and stderr */
-                    NULL,        /* Default spawn attributes */
-                    g_nsh_argv,  /* Arguments */
-                    NULL);       /* No environment */
+  ret = posix_spawn(&pid, NSH_TASK, NULL, NULL, g_nsh_argv, NULL);
   if (ret < 0)
     {
       int errcode = errno;
@@ -200,12 +330,10 @@ static int create_terminal(void)
 
   /* Create an LVGL Timer to poll for output from NSH Shell */
 
-  g_timer = lv_timer_create(timer_callback,  /* Callback Function */
-                            TIMER_PERIOD_MS, /* Timer Period (millisec) */
-                            NULL);           /* Callback Argument */
+  g_timer = lv_timer_create(timer_callback, TIMER_PERIOD_MS, NULL);
   DEBUGASSERT(g_timer != NULL);
 
-  /* Create the LVGL Terminal Widgets */
+  /* Create the shared widgets and the input source for the variant */
 
   ret = create_widgets();
   if (ret < 0)
@@ -213,67 +341,7 @@ static int create_terminal(void)
       return ret;
     }
 
-  return OK;
-}
-
-/****************************************************************************
- * Name: create_widgets
- *
- * Description:
- *   Create the LVGL Widgets for LVGL Terminal.
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   Zero (OK) on success; a negated errno value is returned on any failure.
- *
- ****************************************************************************/
-
-static int create_widgets(void)
-{
-  /* Set the Font Style for NSH Input and Output to a Monospaced Font */
-
-  lv_style_init(&g_terminal_style);
-  lv_style_set_text_font(&g_terminal_style, &lv_font_unscii_16);
-
-  /* Create an LVGL Container with Column Flex Direction */
-
-  g_col = lv_obj_create(lv_scr_act());
-  DEBUGASSERT(g_col != NULL);
-  lv_obj_set_size(g_col, LV_PCT(100), LV_PCT(100));
-  lv_obj_set_flex_flow(g_col, LV_FLEX_FLOW_COLUMN);
-  lv_obj_set_style_pad_all(g_col, 0, 0);  /* No padding */
-
-  /* Create an LVGL Text Area Widget for NSH Output */
-
-  g_output = lv_textarea_create(g_col);
-  DEBUGASSERT(g_output != NULL);
-  lv_obj_add_style(g_output, &g_terminal_style, 0);
-  lv_obj_set_width(g_output, LV_PCT(100));
-  lv_obj_set_flex_grow(g_output, 1);  /* Fill the column */
-
-  /* Create an LVGL Text Area Widget for NSH Input */
-
-  g_input = lv_textarea_create(g_col);
-  DEBUGASSERT(g_input != NULL);
-  lv_obj_add_style(g_input, &g_terminal_style, 0);
-  lv_obj_set_size(g_input, LV_PCT(100), LV_SIZE_CONTENT);
-
-  /* Create an LVGL Keyboard Widget */
-
-  g_kb = lv_keyboard_create(g_col);
-  DEBUGASSERT(g_kb != NULL);
-  lv_obj_set_style_pad_all(g_kb, 0, 0);  /* No padding */
-
-  /* Register the Callback Function for NSH Input */
-
-  lv_obj_add_event_cb(g_input, input_callback, LV_EVENT_ALL, NULL);
-
-  /* Set the Keyboard to populate the NSH Input Text Area */
-
-  lv_keyboard_set_textarea(g_kb, g_input);
-
+  lvglterm_input_create(argc, argv);
   return OK;
 }
 
@@ -281,224 +349,37 @@ static int create_widgets(void)
  * Name: timer_callback
  *
  * Description:
- *   Callback Function for LVGL Timer. Poll NSH stdout and stderr for output
- *   and display the output.
- *
- * Input Parameters:
- *   timer - LVGL Timer for the callback
- *
- * Returned Value:
- *   None
+ *   Poll NSH stdout and stderr for output and render it, then let the input
+ *   variant perform its periodic work.  Runs in the LVGL thread.
  *
  ****************************************************************************/
 
 static void timer_callback(lv_timer_t *timer)
 {
-  int ret;
   static char buf[64];
-
-  DEBUGASSERT(g_nsh_stdout[READ_PIPE] != 0);
-  DEBUGASSERT(g_nsh_stderr[READ_PIPE] != 0);
-
-  /* Poll NSH stdout to check if there's output to be processed */
-
-  if (has_input(g_nsh_stdout[READ_PIPE]))
-    {
-      /* Read the output from NSH stdout */
-
-      ret = read(g_nsh_stdout[READ_PIPE], buf, sizeof(buf) - 1);
-      if (ret > 0)
-        {
-          /* Add to NSH Output Text Area */
-
-          buf[ret] = 0;
-          remove_escape_codes(buf, ret);
-
-          DEBUGASSERT(g_output != NULL);
-          lv_textarea_add_text(g_output, buf);
-        }
-    }
-
-  /* Poll NSH stderr to check if there's output to be processed */
-
-  if (has_input(g_nsh_stderr[READ_PIPE]))
-    {
-      /* Read the output from NSH stderr */
-
-      ret = read(g_nsh_stderr[READ_PIPE], buf, sizeof(buf) - 1);
-      if (ret > 0)
-        {
-          /* Add to NSH Output Text Area */
-
-          buf[ret] = 0;
-          remove_escape_codes(buf, ret);
-
-          DEBUGASSERT(g_output != NULL);
-          lv_textarea_add_text(g_output, buf);
-        }
-    }
-}
-
-/****************************************************************************
- * Name: input_callback
- *
- * Description:
- *   Callback Function for NSH Input Text Area. If Enter Key was pressed,
- *   send the NSH Input Command to NSH stdin.
- *
- * Input Parameters:
- *   e - LVGL Event for the callback
- *
- * Returned Value:
- *   None
- *
- ****************************************************************************/
-
-static void input_callback(lv_event_t *e)
-{
   int ret;
 
-  /* Decode the LVGL Event */
+  /* Drain the input variant first (local echo, scroll) so that what the user
+   * typed is rendered before the resulting shell output.
+   */
 
-  const lv_event_code_t code = lv_event_get_code(e);
+  lvglterm_input_poll();
 
-  /* If NSH Input Text Area has changed, get the Key Pressed */
-
-  if (code == LV_EVENT_VALUE_CHANGED)
+  if (lvglterm_has_input(g_nsh_stdout[READ_PIPE]))
     {
-      /* Get the Button Index of the Keyboard Button Pressed */
-
-      const uint16_t id = lv_keyboard_get_selected_button(g_kb);
-
-      /* Get the Text of the Keyboard Button */
-
-      const char *key = lv_keyboard_get_button_text(g_kb, id);
-      if (key == NULL)
+      ret = read(g_nsh_stdout[READ_PIPE], buf, sizeof(buf));
+      if (ret > 0)
         {
-          return;
-        }
-
-      /* If Key Pressed is Enter, send the Command to NSH stdin */
-
-      if (key[0] == 0xef && key[1] == 0xa2 && key[2] == 0xa2)
-        {
-          /* Read the NSH Input */
-
-          const char *cmd;
-          DEBUGASSERT(g_input != NULL);
-          cmd = lv_textarea_get_text(g_input);
-          if (cmd == NULL || cmd[0] == 0)
-            {
-              return;
-            }
-
-          /* Send the Command to NSH stdin */
-
-          DEBUGASSERT(g_nsh_stdin[WRITE_PIPE] != 0);
-          ret = write(g_nsh_stdin[WRITE_PIPE], cmd, strlen(cmd));
-          DEBUGASSERT(ret == strlen(cmd));
-
-          /* Erase the NSH Input */
-
-          lv_textarea_set_text(g_input, "");
+          lvglterm_add_output(buf, ret);
         }
     }
-}
 
-/****************************************************************************
- * Name: has_input
- *
- * Description:
- *   Return true if the File Descriptor has data to be read.
- *
- * Input Parameters:
- *   fd - File Descriptor to be checked
- *
- * Returned Value:
- *   True if File Descriptor has data to be read; False otherwise
- *
- ****************************************************************************/
-
-static bool has_input(int fd)
-{
-  int ret;
-
-  /* Poll the File Descriptor for input */
-
-  struct pollfd fdp;
-  fdp.fd = fd;
-  fdp.events = POLLIN;
-  ret = poll(&fdp,  /* File Descriptors */
-             1,     /* Number of File Descriptors */
-             0);    /* Poll Timeout (Milliseconds) */
-
-  if (ret > 0)
+  if (lvglterm_has_input(g_nsh_stderr[READ_PIPE]))
     {
-      /* If poll is OK and there is input */
-
-      if ((fdp.revents & POLLIN) != 0)
+      ret = read(g_nsh_stderr[READ_PIPE], buf, sizeof(buf));
+      if (ret > 0)
         {
-          /* Report that there is input */
-
-          return true;
-        }
-
-      /* Else report no input */
-
-      return false;
-    }
-  else if (ret == 0)
-    {
-      /* If timeout, report no input */
-
-      return false;
-    }
-  else if (ret < 0)
-    {
-      /* Handle error */
-
-      _err("poll failed: %d, fd=%d\n", ret, fd);
-      return false;
-    }
-
-  /* Never comes here */
-
-  DEBUGPANIC();
-  return false;
-}
-
-/****************************************************************************
- * Name: remove_escape_codes
- *
- * Description:
- *   Remove ANSI Escape Codes from the string. Assumes that buf[len] is 0.
- *
- * Input Parameters:
- *   buf - String to be processed
- *   len - Length of string
- *
- * Returned Value:
- *   None
- *
- ****************************************************************************/
-
-static void remove_escape_codes(char *buf, int len)
-{
-  int i;
-  int j;
-
-  for (i = 0; i < len; i++)
-    {
-      /* Escape Code looks like 0x1b 0x5b 0x4b */
-
-      if (buf[i] == 0x1b)
-        {
-          /* Remove 3 bytes */
-
-          for (j = i; j + 2 < len; j++)
-            {
-              buf[j] = buf[j + 3];
-            }
+          lvglterm_add_output(buf, ret);
         }
     }
 }
@@ -511,15 +392,10 @@ static void remove_escape_codes(char *buf, int len)
  * Name: main or lvglterm_main
  *
  * Description:
- *   Start an LVGL Terminal that runs interactive commands with NSH Shell.
- *   NSH Commands are entered through an LVGL Keyboard. NSH Output is
- *   rendered in an LVGL Widget.
- *
- * Input Parameters:
- *   Standard argc and argv
- *
- * Returned Value:
- *   Zero on success; a positive, non-zero value on failure.
+ *   Start an LVGL Terminal that runs interactive commands with NSH.
+ *   NSH output is rendered in an LVGL text area; the input comes from an
+ *   on-screen keyboard (touch) or a physical keyboard, selected at build
+ *   time.
  *
  ****************************************************************************/
 
@@ -534,15 +410,10 @@ int main(int argc, FAR char *argv[])
 #endif
 
 #ifdef CONFIG_BOARDCTL_FINALINIT
-  /* Perform architecture-specific final-initialization (if configured) */
-
   boardctl(BOARDIOC_FINALINIT, 0);
 #endif
 
-  /* LVGL initialization */
-
   lv_init();
-
   lv_nuttx_dsc_init(&info);
 
 #ifdef CONFIG_LV_USE_NUTTX_LCD
@@ -550,23 +421,18 @@ int main(int argc, FAR char *argv[])
 #endif
 
   lv_nuttx_init(&info, &result);
-
   if (result.disp == NULL)
     {
-      LV_LOG_ERROR("lv_demos initialization failure!");
+      LV_LOG_ERROR("lv_nuttx_init failure!");
       return 1;
     }
 
-  /* Create the LVGL Widgets */
-
-  ret = create_terminal();
+  ret = create_terminal(argc, argv);
   if (ret < 0)
     {
       return EXIT_FAILURE;
     }
 
-  /* Handle LVGL tasks */
-
 #ifdef CONFIG_LV_USE_NUTTX_LIBUV
   lv_nuttx_uv_loop(&ui_loop, &result);
 #else
@@ -574,13 +440,10 @@ int main(int argc, FAR char *argv[])
     {
       uint32_t idle;
       idle = lv_timer_handler();
-
-      /* Minimum sleep of 1ms */
-
       idle = idle ? idle : 1;
       usleep(idle * 1000);
     }
-
 #endif
+
   return EXIT_SUCCESS;
 }
diff --git a/examples/lvglterm/lvglterm.h b/examples/lvglterm/lvglterm.h
new file mode 100644
index 000000000..627919cdd
--- /dev/null
+++ b/examples/lvglterm/lvglterm.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+ * apps/examples/lvglterm/lvglterm.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_LVGLTERM_LVGLTERM_H
+#define __APPS_EXAMPLES_LVGLTERM_LVGLTERM_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <stdbool.h>
+#include <lvgl/lvgl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Read and Write ends of the NSH pipes */
+
+#define READ_PIPE  0
+#define WRITE_PIPE 1
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* Shared state owned by the core (lvglterm.c).  The input variant writes the
+ * shell input to g_nsh_stdin, adds its widgets under g_col (styled with
+ * g_terminal_style) and may render into g_output.
+ */
+
+extern int g_nsh_stdin[2];          /* Input variant -> NSH stdin */
+extern lv_obj_t *g_col;             /* Column container (widget parent) */
+extern lv_obj_t *g_output;          /* NSH output text area */
+extern lv_style_t g_terminal_style; /* Monospaced font style */
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Shared helpers provided by the core */
+
+bool lvglterm_has_input(int fd);
+void lvglterm_add_output(FAR const char *buf, int len);
+
+/* Provided by the selected input variant (lvglterm_touch.c or
+ * lvglterm_kbd.c).  lvglterm_input_create() sets up the input source under
+ * g_col and wires it to g_nsh_stdin.  lvglterm_input_poll() runs on every
+ * LVGL timer tick (LVGL thread) for periodic work; it may be a no-op.
+ */
+
+void lvglterm_input_create(int argc, FAR char *argv[]);
+void lvglterm_input_poll(void);
+
+#endif /* __APPS_EXAMPLES_LVGLTERM_LVGLTERM_H */
diff --git a/examples/lvglterm/lvglterm_kbd.c b/examples/lvglterm/lvglterm_kbd.c
new file mode 100644
index 000000000..4c18aed7d
--- /dev/null
+++ b/examples/lvglterm/lvglterm_kbd.c
@@ -0,0 +1,228 @@
+/****************************************************************************
+ * apps/examples/lvglterm/lvglterm_kbd.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Physical-keyboard input variant of the LVGL terminal: a task reads key
+ * events from a /dev/kbdN keyboard device and streams them to NSH; the shell
+ * output fills the whole screen.  Works on any board with a keyboard driver;
+ * the device defaults to CONFIG_EXAMPLES_LVGLTERM_KBD_DEV and can be
+ * overridden by the first command-line argument.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/input/keyboard.h>
+
+#include <lvgl/lvgl.h>
+
+#include "lvglterm.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Out-of-band key codes for the Fn + navigation cluster (cursor keys),
+ * reported by keyboard drivers that follow this convention (for example the
+ * M5Stack Cardputer).  Up/Down scroll the terminal instead of going to the
+ * shell; drivers that do not emit these codes keep normal behaviour.
+ */
+
+#define KEY_UP         0x80
+#define KEY_DOWN       0x81
+#define KEY_LEFT       0x82
+#define KEY_RIGHT      0x83
+
+#define SCROLL_STEP    24          /* Pixels scrolled per Up/Down keypress */
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_echo[2];              /* Keyboard task -> screen (local echo) */
+static volatile int g_scroll;      /* Pending scroll (lines), applied by LVGL */
+static FAR const char *g_kbddev;   /* Keyboard device path (/dev/kbdN) */
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: kbd_task
+ *
+ * Description:
+ *   Read key presses from the keyboard device and forward them to NSH stdin
+ *   (and to the echo pipe so the user sees what is typed).  The Fn Up/Down
+ *   keys are handled locally as scroll requests.
+ *
+ ****************************************************************************/
+
+static int kbd_task(int argc, FAR char *argv[])
+{
+  struct keyboard_event_s evt;
+  ssize_t nread;
+  int  kfd;
+  char ch;
+
+  kfd = open(g_kbddev, O_RDONLY);
+  if (kfd < 0)
+    {
+      gerr("ERROR: open %s failed: %d\n", g_kbddev, errno);
+      return EXIT_FAILURE;
+    }
+
+  for (; ; )
+    {
+      nread = read(kfd, &evt, sizeof(evt));
+      if (nread != (ssize_t)sizeof(evt))
+        {
+          if (nread <= 0)
+            {
+              usleep(10000);
+            }
+
+          continue;
+        }
+
+      if (evt.type != KEYBOARD_PRESS)
+        {
+          continue;
+        }
+
+      /* Fn navigation keys are handled locally: Up/Down scroll the terminal
+       * (applied by the LVGL thread) and are not sent to the shell.
+       * Left/Right are reserved and simply swallowed for now.
+       */
+
+      if (evt.code >= KEY_UP && evt.code <= KEY_RIGHT)
+        {
+          if (evt.code == KEY_UP)
+            {
+              g_scroll -= 1;
+            }
+          else if (evt.code == KEY_DOWN)
+            {
+              g_scroll += 1;
+            }
+
+          continue;
+        }
+
+      ch = (char)evt.code;
+      if (ch == '\r')
+        {
+          ch = '\n';
+        }
+
+      /* Always feed the shell.  Echo only printable characters and newline
+       * locally; control keys such as backspace are echoed by the shell's
+       * own line editor (via its stdout) to avoid handling them twice.
+       */
+
+      write(g_nsh_stdin[WRITE_PIPE], &ch, 1);
+
+      if (ch == '\n' || ((uint8_t)ch >= 0x20 && (uint8_t)ch < 0x7f))
+        {
+          write(g_echo[WRITE_PIPE], &ch, 1);
+        }
+    }
+
+  close(kfd);
+  return EXIT_SUCCESS;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lvglterm_input_create
+ *
+ * Description:
+ *   Resolve the keyboard device (first command-line argument, else the
+ *   configured default) and start the task that streams key presses to NSH.
+ *
+ ****************************************************************************/
+
+void lvglterm_input_create(int argc, FAR char *argv[])
+{
+  g_kbddev = (argc > 1) ? argv[1] : CONFIG_EXAMPLES_LVGLTERM_KBD_DEV;
+
+  if (pipe(g_echo) < 0)
+    {
+      gerr("ERROR: echo pipe failed: %d\n", errno);
+      return;
+    }
+
+  /* The read end is polled by the LVGL timer and must not block */
+
+  fcntl(g_echo[READ_PIPE], F_SETFL,
+        fcntl(g_echo[READ_PIPE], F_GETFL) | O_NONBLOCK);
+
+  task_create("lvgltermkbd", SCHED_PRIORITY_DEFAULT, 2048, kbd_task, NULL);
+}
+
+/****************************************************************************
+ * Name: lvglterm_input_poll
+ *
+ * Description:
+ *   Apply any pending scroll and drain the local echo pipe onto the screen.
+ *   Runs in the LVGL thread.
+ *
+ ****************************************************************************/
+
+void lvglterm_input_poll(void)
+{
+  char buf[64];
+  int  n;
+  int  s;
+
+  /* Apply any pending scroll requested by the keyboard task (Up/Down).
+   * A negative value scrolls up (towards older output), positive scrolls
+   * down.  Consume only what we read so concurrent keypresses are not lost.
+   */
+
+  s = g_scroll;
+  if (s != 0)
+    {
+      g_scroll -= s;
+      lv_obj_scroll_by(g_output, 0, -s * SCROLL_STEP, LV_ANIM_OFF);
+    }
+
+  if (lvglterm_has_input(g_echo[READ_PIPE]))
+    {
+      n = read(g_echo[READ_PIPE], buf, sizeof(buf));
+      if (n > 0)
+        {
+          lvglterm_add_output(buf, n);
+        }
+    }
+}
diff --git a/examples/lvglterm/lvglterm_touch.c b/examples/lvglterm/lvglterm_touch.c
new file mode 100644
index 000000000..4285c97e6
--- /dev/null
+++ b/examples/lvglterm/lvglterm_touch.c
@@ -0,0 +1,164 @@
+/****************************************************************************
+ * apps/examples/lvglterm/lvglterm_touch.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Touch input variant of the LVGL terminal: an on-screen LVGL keyboard feeds
+ * an input text area; pressing Enter sends the line to NSH stdin.  This is
+ * the original PinePhone behaviour and suits touchscreen boards.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <unistd.h>
+#include <string.h>
+#include <nuttx/debug.h>
+#include <lvgl/lvgl.h>
+
+#include "lvglterm.h"
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void input_callback(lv_event_t *e);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* LVGL Text Area for NSH Input and the on-screen Keyboard Widget */
+
+static lv_obj_t *g_input;
+static lv_obj_t *g_kb;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: input_callback
+ *
+ * Description:
+ *   Callback for the NSH input text area.  When the on-screen keyboard Enter
+ *   key is pressed, send the input command to NSH stdin.
+ *
+ ****************************************************************************/
+
+static void input_callback(lv_event_t *e)
+{
+  int ret;
+  const lv_event_code_t code = lv_event_get_code(e);
+
+  if (code == LV_EVENT_VALUE_CHANGED)
+    {
+      const uint16_t id = lv_keyboard_get_selected_button(g_kb);
+      const char *key = lv_keyboard_get_button_text(g_kb, id);
+
+      if (key == NULL)
+        {
+          return;
+        }
+
+      /* If the key pressed is Enter, send the command to NSH stdin */
+
+      if (key[0] == 0xef && key[1] == 0xa2 && key[2] == 0xa2)
+        {
+          const char *cmd;
+          int len;
+
+          DEBUGASSERT(g_input != NULL);
+          cmd = lv_textarea_get_text(g_input);
+          if (cmd == NULL || cmd[0] == 0)
+            {
+              return;
+            }
+
+          /* Echo the command on the output so the prompt line reads
+           * "nsh> <command>", then send it to the shell.
+           */
+
+          len = strlen(cmd);
+          lvglterm_add_output(cmd, len);
+          if (cmd[len - 1] != '\n')
+            {
+              lvglterm_add_output("\n", 1);
+            }
+
+          DEBUGASSERT(g_nsh_stdin[WRITE_PIPE] != 0);
+          ret = write(g_nsh_stdin[WRITE_PIPE], cmd, len);
+          DEBUGASSERT(ret == len);
+
+          lv_textarea_set_text(g_input, "");
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lvglterm_input_create
+ *
+ * Description:
+ *   Create the on-screen keyboard and input text area under the shared
+ *   column container.
+ *
+ ****************************************************************************/
+
+void lvglterm_input_create(int argc, FAR char *argv[])
+{
+  UNUSED(argc);
+  UNUSED(argv);
+
+  /* Create an LVGL Text Area Widget for NSH Input */
+
+  g_input = lv_textarea_create(g_col);
+  DEBUGASSERT(g_input != NULL);
+  lv_obj_add_style(g_input, &g_terminal_style, 0);
+  lv_obj_set_size(g_input, LV_PCT(100), LV_SIZE_CONTENT);
+
+  /* Create an LVGL Keyboard Widget */
+
+  g_kb = lv_keyboard_create(g_col);
+  DEBUGASSERT(g_kb != NULL);
+  lv_obj_set_style_pad_all(g_kb, 0, 0);
+
+  /* Wire the keyboard to the input text area */
+
+  lv_obj_add_event_cb(g_input, input_callback, LV_EVENT_ALL, NULL);
+  lv_keyboard_set_textarea(g_kb, g_input);
+}
+
+/****************************************************************************
+ * Name: lvglterm_input_poll
+ *
+ * Description:
+ *   No periodic work is needed for the touch variant.
+ *
+ ****************************************************************************/
+
+void lvglterm_input_poll(void)
+{
+}

From 8e00b4d672f2eeeb4b8041401ced4eab86af4167 Mon Sep 17 00:00:00 2001
From: Tiago Medicci <tiago.medicci@espressif.com>
Date: Wed, 1 Jul 2026 15:59:06 -0300
Subject: [PATCH 465/568] interpreters/python: Disable `no-maybe-uninitialized`
 warning

This commit disables the `no-maybe-uninitialized` warning because
it's wrongly evaluated after increasing the optimization level of
the Python's library.

Signed-off-by: Tiago Medicci <tiago.medicci@espressif.com>
---
 interpreters/python/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index bda257932..c3acd5188 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -56,7 +56,7 @@ CFLAGS += -Wno-shadow -Wno-undef -Wno-format -Wno-builtin-macro-redefined
 CFLAGS += -Wno-type-limits -Wno-implicit-fallthrough -Wno-char-subscripts
 CFLAGS += -Wno-sign-compare -Wno-unused-const-variable -Wno-unused-function
 CFLAGS += -Wno-unused-variable -Wno-overflow -Wno-unused-but-set-variable
-CFLAGS += -Wno-strict-prototypes -nostdlib
+CFLAGS += -Wno-strict-prototypes -Wno-maybe-uninitialized -nostdlib
 
 DEPPATH += --dep-path $(CPYTHON_UNPACKNAME)$(DELIM)Programs
 VPATH   += :$(CPYTHON_UNPACKNAME)$(DELIM)Programs

From ec134a99a893abd42079e46b3abf426b24dcbf76 Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Sat, 4 Jul 2026 13:32:17 -0300
Subject: [PATCH 466/568] netutils/dropbear: add scp support via SSH exec
 requests

Add SCP support do the dropbear server.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 netutils/dropbear/CMakeLists.txt        |  55 +++++
 netutils/dropbear/Kconfig               |  20 ++
 netutils/dropbear/Makefile              |  26 +++
 netutils/dropbear/dropbear_nshsession.c | 259 ++++++++++++++++++++++--
 netutils/dropbear/port/nuttx_scp.c      |  49 +++++
 netutils/dropbear/port/nuttx_scp.h      |  39 ++++
 6 files changed, 430 insertions(+), 18 deletions(-)
 create mode 100644 netutils/dropbear/port/nuttx_scp.c
 create mode 100644 netutils/dropbear/port/nuttx_scp.h

diff --git a/netutils/dropbear/CMakeLists.txt b/netutils/dropbear/CMakeLists.txt
index c3187a32d..8ca691be0 100644
--- a/netutils/dropbear/CMakeLists.txt
+++ b/netutils/dropbear/CMakeLists.txt
@@ -137,6 +137,10 @@ if(CONFIG_NETUTILS_DROPBEAR)
   list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/prngs/sober128tab\\.c$")
   list(APPEND DROPBEAR_SRCS ${LIBTOMCRYPT_SRCS})
 
+  if(CONFIG_NETUTILS_DROPBEAR_SCP)
+    list(APPEND DROPBEAR_SRCS dropbear/src/scpmisc.c port/nuttx_scp.c)
+  endif()
+
   nuttx_add_application(
     NAME
     ${PROGNAME}
@@ -150,6 +154,20 @@ if(CONFIG_NETUTILS_DROPBEAR)
     DEPENDS
     ${DROPBEAR_UNPACKNAME})
 
+  if(CONFIG_NETUTILS_DROPBEAR_SCP)
+    nuttx_add_application(
+      NAME
+      scp
+      SRCS
+      dropbear/src/scp.c
+      STACKSIZE
+      ${CONFIG_NETUTILS_DROPBEAR_SCP_STACKSIZE}
+      PRIORITY
+      ${CONFIG_NETUTILS_DROPBEAR_SCP_PRIORITY}
+      DEPENDS
+      ${DROPBEAR_UNPACKNAME})
+  endif()
+
   target_include_directories(
     ${PROGNAME}
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -160,6 +178,14 @@ if(CONFIG_NETUTILS_DROPBEAR)
             ${CMAKE_CURRENT_SOURCE_DIR}/dropbear/libtommath
             ${CMAKE_CURRENT_SOURCE_DIR}/../../nshlib)
 
+  if(CONFIG_NETUTILS_DROPBEAR_SCP)
+    target_include_directories(
+      scp
+      PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/port
+              ${CMAKE_CURRENT_SOURCE_DIR}/dropbear
+              ${CMAKE_CURRENT_SOURCE_DIR}/dropbear/src)
+  endif()
+
   if(CONFIG_NETUTILS_DROPBEAR_COMPRESSION)
     target_include_directories(
       ${PROGNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../system/zlib/zlib)
@@ -169,17 +195,46 @@ if(CONFIG_NETUTILS_DROPBEAR)
     ${PROGNAME} PRIVATE LOCALOPTIONS_H_EXISTS=1 DROPBEAR_NUTTX=1
                         DROPBEAR_NUTTX_PASSWD=1)
 
+  if(CONFIG_NETUTILS_DROPBEAR_SCP)
+    target_compile_definitions(
+      scp PRIVATE LOCALOPTIONS_H_EXISTS=1 DROPBEAR_NUTTX=1
+                  DROPBEAR_NUTTX_PASSWD=1)
+  endif()
+
   set_source_files_properties(
     dropbear_nshsession.c
     PROPERTIES COMPILE_DEFINITIONS
                "Channel=dropbear_channel;ChanType=dropbear_chantype")
 
+  if(CONFIG_NETUTILS_DROPBEAR_SCP)
+    set_source_files_properties(
+      dropbear/src/scp.c
+      PROPERTIES
+        COMPILE_DEFINITIONS
+        "xmalloc=dropbear_scp_xmalloc;xrealloc=dropbear_scp_xrealloc;xfree=dropbear_scp_xfree;execvp=dropbear_scp_execvp"
+    )
+    set_source_files_properties(
+      dropbear/src/scpmisc.c
+      PROPERTIES
+        COMPILE_DEFINITIONS
+        "xmalloc=dropbear_scp_xmalloc;xrealloc=dropbear_scp_xrealloc;xfree=dropbear_scp_xfree"
+    )
+  endif()
+
   # LTC_SOURCE must be set only for libtomcrypt sources.
   set_source_files_properties(${LIBTOMCRYPT_SRCS} PROPERTIES COMPILE_DEFINITIONS
                                                              LTC_SOURCE=1)
 
   target_compile_options(${PROGNAME} PRIVATE -Wno-pointer-sign -Wno-format)
 
+  if(CONFIG_NETUTILS_DROPBEAR_SCP)
+    target_compile_options(
+      scp
+      PRIVATE -Wno-pointer-sign -Wno-format -include
+              ${CMAKE_CURRENT_SOURCE_DIR}/port/nuttx_scp.h
+              -Wno-strict-prototypes)
+  endif()
+
   target_sources(apps PRIVATE ${DROPBEAR_SRCS})
 
 endif()
diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
index 507c85068..94eee878c 100644
--- a/netutils/dropbear/Kconfig
+++ b/netutils/dropbear/Kconfig
@@ -70,6 +70,26 @@ config NETUTILS_DROPBEAR_SHELL_STACKSIZE
 	int "Dropbear NSH session task stack size"
 	default 8192
 
+config NETUTILS_DROPBEAR_SCP
+	bool "Enable scp remote copy helper"
+	default y
+	depends on PIPES
+	---help---
+		Build Dropbear's scp program and allow SSH exec requests so a host
+		scp client can copy files to and from NuttX using the legacy scp
+		protocol.  This does not build a full SSH client for initiating scp
+		transfers from the target.
+
+config NETUTILS_DROPBEAR_SCP_STACKSIZE
+	int "Dropbear scp stack size"
+	default 32768
+	depends on NETUTILS_DROPBEAR_SCP
+
+config NETUTILS_DROPBEAR_SCP_PRIORITY
+	int "Dropbear scp priority"
+	default 100
+	depends on NETUTILS_DROPBEAR_SCP
+
 config NETUTILS_DROPBEAR_PORT
 	int "Dropbear listen port"
 	default 2222
diff --git a/netutils/dropbear/Makefile b/netutils/dropbear/Makefile
index 039b0d0b3..53b1f2f72 100644
--- a/netutils/dropbear/Makefile
+++ b/netutils/dropbear/Makefile
@@ -40,6 +40,12 @@ PROGNAME = $(CONFIG_NETUTILS_DROPBEAR_PROGNAME)
 PRIORITY = $(CONFIG_NETUTILS_DROPBEAR_PRIORITY)
 STACKSIZE = $(CONFIG_NETUTILS_DROPBEAR_STACKSIZE)
 
+ifneq ($(CONFIG_NETUTILS_DROPBEAR_SCP),)
+PROGNAME += scp
+PRIORITY += $(CONFIG_NETUTILS_DROPBEAR_SCP_PRIORITY)
+STACKSIZE += $(CONFIG_NETUTILS_DROPBEAR_SCP_STACKSIZE)
+endif
+
 CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear"
 CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)port"
 CFLAGS += ${INCDIR_PREFIX}"$(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)dropbear"
@@ -116,11 +122,31 @@ TOMCRYPT_SRCS = $(shell if [ -d "$(DROPBEAR_UNPACKNAME)/libtomcrypt/src" ]; then
 CSRCS += $(TOMMATH_SRCS)
 CSRCS += $(TOMCRYPT_SRCS)
 
+ifneq ($(CONFIG_NETUTILS_DROPBEAR_SCP),)
+CSRCS += dropbear/src/scpmisc.c
+CSRCS += port/nuttx_scp.c
+endif
+
 # Match the ESP-IDF port behavior: LTC_SOURCE is only for libtomcrypt sources.
 $(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}LTC_SOURCE=1))
 
 MAINSRC = dropbear_main.c
 
+ifneq ($(CONFIG_NETUTILS_DROPBEAR_SCP),)
+MAINSRC += dropbear/src/scp.c
+
+dropbear/src/scp.c_CFLAGS += ${DEFINE_PREFIX}xmalloc=dropbear_scp_xmalloc
+dropbear/src/scp.c_CFLAGS += ${DEFINE_PREFIX}xrealloc=dropbear_scp_xrealloc
+dropbear/src/scp.c_CFLAGS += ${DEFINE_PREFIX}xfree=dropbear_scp_xfree
+dropbear/src/scp.c_CFLAGS += ${DEFINE_PREFIX}execvp=dropbear_scp_execvp
+dropbear/src/scp.c_CFLAGS += -include port/nuttx_scp.h
+dropbear/src/scp.c_CFLAGS += -Wno-strict-prototypes
+
+dropbear/src/scpmisc.c_CFLAGS += ${DEFINE_PREFIX}xmalloc=dropbear_scp_xmalloc
+dropbear/src/scpmisc.c_CFLAGS += ${DEFINE_PREFIX}xrealloc=dropbear_scp_xrealloc
+dropbear/src/scpmisc.c_CFLAGS += ${DEFINE_PREFIX}xfree=dropbear_scp_xfree
+endif
+
 $(DROPBEAR_ZIP):
 	@echo "Downloading: $(DROPBEAR_ZIP)"
 	$(Q) curl -L -o $(DROPBEAR_ZIP) $(DROPBEAR_URL)/$(DROPBEAR_ZIP)
diff --git a/netutils/dropbear/dropbear_nshsession.c b/netutils/dropbear/dropbear_nshsession.c
index 3b2e6cdbd..e1afc1e51 100644
--- a/netutils/dropbear/dropbear_nshsession.c
+++ b/netutils/dropbear/dropbear_nshsession.c
@@ -43,6 +43,7 @@ struct dropbear_nshsession_s
   pthread_t waiter;
   bool waiter_started;
   bool have_winsize;
+  bool has_pty;
   struct winsize win;
 };
 
@@ -80,17 +81,8 @@ static const struct dropbear_signal_name_s g_dropbear_signals[] =
 static int dropbear_nsh_main(int argc, FAR char *argv[])
 {
   FAR struct console_stdio_s *pstate;
-  FAR char *nsh_argv[] =
-  {
-    "nsh",
-    NULL
-  };
-
   int ret;
 
-  (void)argc;
-  (void)argv;
-
   pstate = nsh_newconsole(true);
   if (pstate == NULL)
     {
@@ -98,7 +90,7 @@ static int dropbear_nsh_main(int argc, FAR char *argv[])
       return -ENOMEM;
     }
 
-  ret = nsh_session(pstate, NSH_LOGIN_NONE, 1, nsh_argv);
+  ret = nsh_session(pstate, NSH_LOGIN_NONE, argc, argv);
   dropbear_log(LOG_INFO, "NSH session exited: %d", ret);
 
   nsh_exit(&pstate->cn_vtbl, ret);
@@ -208,6 +200,29 @@ dropbear_setup_spawn_stdio(FAR posix_spawn_file_actions_t *actions,
   return 0;
 }
 
+#ifdef CONFIG_NETUTILS_DROPBEAR_SCP
+static int
+dropbear_setup_spawn_stdio3(FAR posix_spawn_file_actions_t *actions,
+                            int stdinfd, int stdoutfd, int stderrfd)
+{
+  int rc;
+
+  rc = posix_spawn_file_actions_adddup2(actions, stdinfd, STDIN_FILENO);
+  if (rc != 0)
+    {
+      return rc;
+    }
+
+  rc = posix_spawn_file_actions_adddup2(actions, stdoutfd, STDOUT_FILENO);
+  if (rc != 0)
+    {
+      return rc;
+    }
+
+  return posix_spawn_file_actions_adddup2(actions, stderrfd, STDERR_FILENO);
+}
+#endif /* CONFIG_NETUTILS_DROPBEAR_SCP */
+
 static int
 dropbear_setup_spawn_close(FAR posix_spawn_file_actions_t *actions,
                            int fd)
@@ -220,18 +235,21 @@ dropbear_setup_spawn_close(FAR posix_spawn_file_actions_t *actions,
   return posix_spawn_file_actions_addclose(actions, fd);
 }
 
+static void dropbear_close_fd(FAR int *fd)
+{
+  if (*fd >= 0)
+    {
+      close(*fd);
+      *fd = -1;
+    }
+}
+
 static int dropbear_start_nsh(FAR struct dropbear_channel *channel,
                               FAR struct dropbear_nshsession_s *sess)
 {
   posix_spawn_file_actions_t actions;
   posix_spawnattr_t attr;
   FAR const char *errmsg;
-  FAR char * const argv[] =
-  {
-    "nsh",
-    NULL
-  };
-
   int masterfd;
   int slavefd;
   int writefd;
@@ -318,7 +336,7 @@ static int dropbear_start_nsh(FAR struct dropbear_channel *channel,
     }
 
   sess->nsh_pid = task_spawn("dropbear nsh", dropbear_nsh_main, &actions,
-                             &attr, argv, NULL);
+                             &attr, NULL, NULL);
   if (sess->nsh_pid < 0)
     {
       dropbear_log(LOG_WARNING, "failed to create NSH task: %s",
@@ -345,6 +363,7 @@ static int dropbear_start_nsh(FAR struct dropbear_channel *channel,
     }
 
   sess->waiter_started = true;
+  sess->has_pty = true;
   sess->pty_readfd = masterfd;
   sess->pty_writefd = writefd;
 
@@ -388,6 +407,201 @@ err_with_actions:
   return DROPBEAR_FAILURE;
 }
 
+#ifdef CONFIG_NETUTILS_DROPBEAR_SCP
+static int dropbear_start_exec(FAR struct dropbear_channel *channel,
+                               FAR struct dropbear_nshsession_s *sess,
+                               FAR char *cmd)
+{
+  posix_spawn_file_actions_t actions;
+  posix_spawnattr_t attr;
+  FAR const char *errmsg;
+  FAR char * const argv[] =
+  {
+    "-c",
+    cmd,
+    NULL
+  };
+
+  int inpipe[2] =
+  {
+    -1,
+    -1
+  };
+
+  int outpipe[2] =
+  {
+    -1,
+    -1
+  };
+
+  int errpipe[2] =
+  {
+    -1,
+    -1
+  };
+
+  int rc;
+
+  if (sess->nsh_pid >= 0)
+    {
+      dropbear_log(LOG_WARNING, "NSH exec already running");
+      return DROPBEAR_FAILURE;
+    }
+
+  if (pipe(inpipe) < 0 || pipe(outpipe) < 0 || pipe(errpipe) < 0)
+    {
+      dropbear_log(LOG_WARNING, "exec pipe setup failed: %s",
+                   strerror(errno));
+      goto err_with_pipes;
+    }
+
+  rc = posix_spawn_file_actions_init(&actions);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn actions init failed: %s",
+                   strerror(rc));
+      goto err_with_pipes;
+    }
+
+  rc = posix_spawnattr_init(&attr);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn attr init failed: %s", strerror(rc));
+      goto err_with_actions;
+    }
+
+  rc = dropbear_setup_spawn_attrs(&attr, &errmsg);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "%s failed: %s", errmsg, strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_stdio3(&actions, inpipe[0], outpipe[1],
+                                   errpipe[1]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stdio setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, inpipe[0]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stdin close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, inpipe[1]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stdin writer close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, outpipe[0]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stdout reader close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, outpipe[1]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stdout close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, errpipe[0]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stderr reader close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  rc = dropbear_setup_spawn_close(&actions, errpipe[1]);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "spawn stderr close setup failed: %s",
+                   strerror(rc));
+      goto err_with_attr;
+    }
+
+  sess->nsh_pid = task_spawn("dropbear exec", dropbear_nsh_main, &actions,
+                             &attr, argv, NULL);
+  if (sess->nsh_pid < 0)
+    {
+      dropbear_log(LOG_WARNING, "failed to create NSH exec task: %s",
+                   strerror(-sess->nsh_pid));
+      goto err_with_attr;
+    }
+
+  dropbear_close_fd(&inpipe[0]);
+  dropbear_close_fd(&outpipe[1]);
+  dropbear_close_fd(&errpipe[1]);
+
+  rc = pthread_create(&sess->waiter, NULL, dropbear_nsh_waiter, sess);
+  if (rc != 0)
+    {
+      dropbear_log(LOG_WARNING, "failed to create NSH exec waiter: %s",
+                   strerror(rc));
+      dropbear_close_fd(&inpipe[1]);
+      dropbear_close_fd(&outpipe[0]);
+      dropbear_close_fd(&errpipe[0]);
+      kill(sess->nsh_pid, SIGTERM);
+      waitpid(sess->nsh_pid, NULL, 0);
+      sess->nsh_pid = -1;
+      goto err_with_attr;
+    }
+
+  sess->waiter_started = true;
+  sess->has_pty = false;
+  sess->pty_readfd = -1;
+  sess->pty_writefd = -1;
+
+  channel->readfd = outpipe[0];
+  channel->writefd = inpipe[1];
+  channel->errfd = errpipe[0];
+  channel->bidir_fd = 0;
+
+  setnonblocking(channel->readfd);
+  setnonblocking(channel->writefd);
+  setnonblocking(channel->errfd);
+  ses.maxfd = MAX(ses.maxfd, channel->readfd);
+  ses.maxfd = MAX(ses.maxfd, channel->writefd);
+  ses.maxfd = MAX(ses.maxfd, channel->errfd);
+
+  posix_spawnattr_destroy(&attr);
+  posix_spawn_file_actions_destroy(&actions);
+
+  dropbear_log(LOG_INFO, "NSH exec started: %s", cmd);
+  return DROPBEAR_SUCCESS;
+
+err_with_attr:
+  posix_spawnattr_destroy(&attr);
+
+err_with_actions:
+  posix_spawn_file_actions_destroy(&actions);
+
+err_with_pipes:
+  dropbear_close_fd(&inpipe[0]);
+  dropbear_close_fd(&inpipe[1]);
+  dropbear_close_fd(&outpipe[0]);
+  dropbear_close_fd(&outpipe[1]);
+  dropbear_close_fd(&errpipe[0]);
+  dropbear_close_fd(&errpipe[1]);
+  sess->nsh_pid = -1;
+  return DROPBEAR_FAILURE;
+}
+#endif /* CONFIG_NETUTILS_DROPBEAR_SCP */
+
 static void dropbear_parse_winsize(FAR struct dropbear_nshsession_s *sess)
 {
   unsigned int cols = buf_getint(ses.payload);
@@ -445,7 +659,7 @@ static int dropbear_write_terminal_signal(
   unsigned char ch;
   ssize_t nwritten;
 
-  if (signo == SIGINT && sess->pty_writefd >= 0)
+  if (signo == SIGINT && sess->has_pty && sess->pty_writefd >= 0)
     {
       ch = CONFIG_TTY_SIGINT_CHAR;
       nwritten = write(sess->pty_writefd, &ch, sizeof(ch));
@@ -528,7 +742,16 @@ static void dropbear_chansessionrequest(FAR struct dropbear_channel *channel)
     }
   else if (strcmp(type, "exec") == 0)
     {
+#ifdef CONFIG_NETUTILS_DROPBEAR_SCP
+      unsigned int cmdlen;
+      FAR char *cmd;
+
+      cmd = buf_getstring(ses.payload, &cmdlen);
+      ret = dropbear_start_exec(channel, sess, cmd);
+      m_free(cmd);
+#else
       dropbear_log(LOG_WARNING, "SSH exec requests are not supported");
+#endif
     }
   else if (strcmp(type, "window-change") == 0)
     {
diff --git a/netutils/dropbear/port/nuttx_scp.c b/netutils/dropbear/port/nuttx_scp.c
new file mode 100644
index 000000000..6d7606abe
--- /dev/null
+++ b/netutils/dropbear/port/nuttx_scp.c
@@ -0,0 +1,49 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/nuttx_scp.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "nuttx_scp.h"
+
+#include <errno.h>
+#include <sys/types.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/* scp only runs in server mode (-t/-f) on NuttX; execvp would only be
+ * reached in client mode to spawn a local ssh, which is not supported.
+ */
+
+int dropbear_scp_execvp(FAR const char *file, FAR char * const argv[])
+{
+  (void)file;
+  (void)argv;
+
+  set_errno(ENOSYS);
+  return ERROR;
+}
diff --git a/netutils/dropbear/port/nuttx_scp.h b/netutils/dropbear/port/nuttx_scp.h
new file mode 100644
index 000000000..c5edf799a
--- /dev/null
+++ b/netutils/dropbear/port/nuttx_scp.h
@@ -0,0 +1,39 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/nuttx_scp.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_NETUTILS_DROPBEAR_PORT_NUTTX_SCP_H
+#define __APPS_NETUTILS_DROPBEAR_PORT_NUTTX_SCP_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int dropbear_scp_execvp(FAR const char *file, FAR char * const argv[]);
+
+#endif /* __APPS_NETUTILS_DROPBEAR_PORT_NUTTX_SCP_H */

From 4d5f60005c6d91c76e4a585fe3102aab50119ec6 Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Sat, 4 Jul 2026 14:32:28 -0300
Subject: [PATCH 467/568] netutils/dropbear: add scp support via SSH exec
 requests

Code Clean up - Remove unnecessary code.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 netutils/dropbear/dropbear_nshsession.c | 33 +++----------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/netutils/dropbear/dropbear_nshsession.c b/netutils/dropbear/dropbear_nshsession.c
index e1afc1e51..0af7e68ea 100644
--- a/netutils/dropbear/dropbear_nshsession.c
+++ b/netutils/dropbear/dropbear_nshsession.c
@@ -47,33 +47,6 @@ struct dropbear_nshsession_s
   struct winsize win;
 };
 
-struct dropbear_signal_name_s
-{
-  FAR const char *name;
-  int signo;
-};
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static const struct dropbear_signal_name_s g_dropbear_signals[] =
-{
-  { "ABRT", SIGABRT },
-  { "ALRM", SIGALRM },
-  { "FPE",  SIGFPE },
-  { "HUP",  SIGHUP },
-  { "ILL",  SIGILL },
-  { "INT",  SIGINT },
-  { "KILL", SIGKILL },
-  { "PIPE", SIGPIPE },
-  { "QUIT", SIGQUIT },
-  { "SEGV", SIGSEGV },
-  { "TERM", SIGTERM },
-  { "USR1", SIGUSR1 },
-  { "USR2", SIGUSR2 },
-};
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -640,11 +613,11 @@ static int dropbear_signal_from_name(FAR const char *name)
 {
   int i;
 
-  for (i = 0; i < nitems(g_dropbear_signals); i++)
+  for (i = 0; signames[i].name != NULL; i++)
     {
-      if (strcmp(name, g_dropbear_signals[i].name) == 0)
+      if (strcmp(name, signames[i].name) == 0)
         {
-          return g_dropbear_signals[i].signo;
+          return signames[i].signal;
         }
     }
 

From afe2a0eafc31bf2efbff13335119171b2aef4423 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 5 Jul 2026 10:09:18 +0200
Subject: [PATCH 468/568] canutils/lely: add dependencies for Kconfig options

some options depends on others and not selecting them can cause compilation errors.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 canutils/lely-canopen/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/canutils/lely-canopen/Kconfig b/canutils/lely-canopen/Kconfig
index 5718356e6..fe665a757 100644
--- a/canutils/lely-canopen/Kconfig
+++ b/canutils/lely-canopen/Kconfig
@@ -51,6 +51,7 @@ config CANUTILS_LELYCANOPEN_OBJUPLOAD
 config CANUTILS_LELYCANOPEN_SDEV
 	bool "Lely CANopen enable static device description support"
 	default n
+	depends on CANUTILS_LELYCANOPEN_OBJNAME
 
 config CANUTILS_LELYCANOPEN_CSDO
 	bool "Lely CANopen enable Client-SDO support"
@@ -67,6 +68,7 @@ config CANUTILS_LELYCANOPEN_TPDO
 config CANUTILS_LELYCANOPEN_MPDO
 	bool "Lely CANopen enable Multiplex PDO support"
 	default n
+	depends on CANUTILS_LELYCANOPEN_TPDO
 
 config CANUTILS_LELYCANOPEN_SYNC
 	bool "Lely CANopen enable SYNC support"
@@ -95,14 +97,17 @@ config CANUTILS_LELYCANOPEN_MASTER
 config CANUTILS_LELYCANOPEN_NG
 	bool "Lely CANopen enable node guardian support"
 	default n
+	depends on CANUTILS_LELYCANOPEN_EMCY
 
 config CANUTILS_LELYCANOPEN_NMTBOOT
 	bool "Lely CANopen enable NMT boot slave support"
 	default n
+	depends on CANUTILS_LELYCANOPEN_MASTER && CANUTILS_LELYCANOPEN_CSDO
 
 config CANUTILS_LELYCANOPEN_NMTCFG
 	bool "Lely CANopen enable NMT configuration request support"
 	default n
+	depends on CANUTILS_LELYCANOPEN_MASTER && CANUTILS_LELYCANOPEN_CSDO
 
 config CANUTILS_LELYCANOPEN_GW
 	bool "Lely CANopen enable gateway support"

From da3234f93695c7ee5ac5b7f2d5d3d09cb22c71f1 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Sun, 5 Jul 2026 20:00:52 +0000
Subject: [PATCH 469/568] !fsutils/passwd: remove insecure default TEA
 encryption keys

Use 0 as a Kconfig placeholder. The nuttx build rejects unset keys
and can generate random values when configured.

BREAKING CHANGE: CONFIG_FSUTILS_PASSWD_KEY1..4 no longer default to
0x12345678 / 0x9abcdef0. Configs that relied on those defaults must
set keys manually or enable BOARD_ETC_ROMFS_PASSWD_RANDOMIZE_KEYS in
nuttx. Fix: set keys in menuconfig or enable random key generation.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 fsutils/passwd/Kconfig | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/fsutils/passwd/Kconfig b/fsutils/passwd/Kconfig
index 4f40349fc..42a8301e2 100644
--- a/fsutils/passwd/Kconfig
+++ b/fsutils/passwd/Kconfig
@@ -25,18 +25,21 @@ config FSUTILS_PASSWD_IOBUFFER_SIZE
 
 config FSUTILS_PASSWD_KEY1
 	hex "Encryption key value 1"
-	default 0x12345678
+	default 0
+	---help---
+		Leave at 0 if random key generation is enabled under Board
+		Selection. Otherwise set all four keys to unique non-zero values.
 
 config FSUTILS_PASSWD_KEY2
 	hex "Encryption key value 2"
-	default 0x9abcdef0
+	default 0
 
 config FSUTILS_PASSWD_KEY3
 	hex "Encryption key value 3"
-	default 0x12345678
+	default 0
 
 config FSUTILS_PASSWD_KEY4
 	hex "Encryption key value 4"
-	default 0x9abcdef0
+	default 0
 
 endif # FSUTILS_PASSWD

From 6eead56aa9b164de7d362f009a9b1ed556ecc9fb Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Mon, 6 Jul 2026 06:45:39 +0800
Subject: [PATCH 470/568] system: resmonitor: check CPU load reads

Keep the default zero CPU value when the procfs load file cannot be read, and trim only the newline that was actually present. This avoids parsing uninitialized stack data in fillcpu and avoids writing before the showinfo CPU buffer when fgets returns no data.

Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 system/resmonitor/fillcpu.c  | 7 +++++--
 system/resmonitor/showinfo.c | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/system/resmonitor/fillcpu.c b/system/resmonitor/fillcpu.c
index f7101a5b7..b8e187ea8 100644
--- a/system/resmonitor/fillcpu.c
+++ b/system/resmonitor/fillcpu.c
@@ -97,8 +97,11 @@ static float get_cpu(int pid)
     }
 
   char buf[8];
-  fgets(buf, 8, fp);
-  sscanf(buf, "%f", &cpu);
+  if (fgets(buf, 8, fp) != NULL)
+    {
+      sscanf(buf, "%f", &cpu);
+    }
+
   fclose(fp);
   return cpu;
 }
diff --git a/system/resmonitor/showinfo.c b/system/resmonitor/showinfo.c
index 18713bc5f..774f8fd22 100644
--- a/system/resmonitor/showinfo.c
+++ b/system/resmonitor/showinfo.c
@@ -131,11 +131,16 @@ static void get_cpu(int pid, char *buf)
       return;
     }
 
-  fgets(buf, 8, fp);
+  if (fgets(buf, 8, fp) == NULL)
+    {
+      snprintf(buf, 8, "%.1f%%", 0.0);
+      fclose(fp);
+      return;
+    }
 
   /* sscanf(buf, "%f", &cpu); */
 
-  buf[strlen(buf) - 1] = '\0';
+  buf[strcspn(buf, "\n")] = '\0';
   fclose(fp);
 }
 

From c0228d7b57cbc2953f6def08479e41eacecaf29e Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Mon, 6 Jul 2026 01:18:22 +0800
Subject: [PATCH 471/568] tools: Fix bitmap converter print syntax

Use Python 3 print function syntax so bitmap_converter.py can be parsed by current Python interpreters while preserving the existing usage message and exit path.

Generated-by: OpenAI Codex
Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 tools/bitmap_converter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bitmap_converter.py b/tools/bitmap_converter.py
index 44579e35f..c0ee9e8dd 100755
--- a/tools/bitmap_converter.py
+++ b/tools/bitmap_converter.py
@@ -120,7 +120,7 @@ if __name__ == '__main__':
   import os.path
 
   if len(sys.argv) != 3:
-    print "Usage: bitmap_converter.py source.png output.cxx"
+    print("Usage: bitmap_converter.py source.png output.cxx")
     sys.exit(1)
 
   img = Image.open(sys.argv[1]).convert("RGB")

From f1d53c875d459baed3e4704f046a63e16aa27a46 Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Mon, 6 Jul 2026 09:54:10 +0800
Subject: [PATCH 472/568] tools: format bitmap converter

Run the bitmap converter through the Python formatter required by checkpatch so the Python 3 print syntax fix passes the project style checks.

Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 tools/bitmap_converter.py | 205 ++++++++++++++++++++------------------
 1 file changed, 109 insertions(+), 96 deletions(-)

diff --git a/tools/bitmap_converter.py b/tools/bitmap_converter.py
index c0ee9e8dd..5bdf1690e 100755
--- a/tools/bitmap_converter.py
+++ b/tools/bitmap_converter.py
@@ -1,134 +1,142 @@
 #!/usr/bin/env python
 
-'''This script converts from any image type supported by
+"""This script converts from any image type supported by
 Python imaging library to the RLE-encoded format used by
 NxWidgets.
-'''
+"""
 
 from PIL import Image
 
-def get_palette(img, maxcolors = 255):
-  '''Returns a list of colors. If there are too many colors in the image,
-  the least used are removed.
-  '''
-  img = img.convert("RGB")
-  colors = img.getcolors(65536)
-  colors.sort(key = lambda c: -c[0])
-  return [c[1] for c in colors[:maxcolors]]
+
+def get_palette(img, maxcolors=255):
+    """Returns a list of colors. If there are too many colors in the image,
+    the least used are removed.
+    """
+    img = img.convert("RGB")
+    colors = img.getcolors(65536)
+    colors.sort(key=lambda c: -c[0])
+    return [c[1] for c in colors[:maxcolors]]
+
 
 def write_palette(outfile, palette):
-  '''Write the palette (normal and highlight) to the output file.'''
+    """Write the palette (normal and highlight) to the output file."""
 
-  outfile.write('static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =\n')
-  outfile.write('{\n')
+    outfile.write(
+        "static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =\n"
+    )
+    outfile.write("{\n")
 
-  for i in range(0, len(palette), 4):
-    outfile.write('  ')
-    for r, g, b in palette[i:i+4]:
-      outfile.write('MKRGB(%3d,%3d,%3d), ' % (r, g, b))
-    outfile.write('\n')
+    for i in range(0, len(palette), 4):
+        outfile.write("  ")
+        for r, g, b in palette[i : i + 4]:
+            outfile.write("MKRGB(%3d,%3d,%3d), " % (r, g, b))
+        outfile.write("\n")
 
-  outfile.write('};\n\n')
+    outfile.write("};\n\n")
 
-  outfile.write('static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =\n')
-  outfile.write('{\n')
+    outfile.write(
+        "static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =\n"
+    )
+    outfile.write("{\n")
 
-  for i in range(0, len(palette), 4):
-    outfile.write('  ')
-    for r, g, b in palette[i:i+4]:
-      r = min(255, r + 50)
-      g = min(255, g + 50)
-      b = min(255, b + 50)
-      outfile.write('MKRGB(%3d,%3d,%3d), ' % (r, g, b))
-    outfile.write('\n')
+    for i in range(0, len(palette), 4):
+        outfile.write("  ")
+        for r, g, b in palette[i : i + 4]:
+            r = min(255, r + 50)
+            g = min(255, g + 50)
+            b = min(255, b + 50)
+            outfile.write("MKRGB(%3d,%3d,%3d), " % (r, g, b))
+        outfile.write("\n")
 
-  outfile.write('};\n\n')
+    outfile.write("};\n\n")
 
 
 def quantize(color, palette):
-  '''Return the color index to closest match in the palette.'''
-  try:
-    return palette.index(color)
-  except ValueError:
-    # No exact match, search for the closest
-    def distance(color2):
-      return sum([(a - b)**2 for a, b in zip(color, color2)])
+    """Return the color index to closest match in the palette."""
+    try:
+        return palette.index(color)
+    except ValueError:
+        # No exact match, search for the closest
+        def distance(color2):
+            return sum([(a - b) ** 2 for a, b in zip(color, color2)])
 
-    return palette.index(min(palette, key = distance))
+        return palette.index(min(palette, key=distance))
 
 
 def encode_row(img, palette, y):
-  '''RLE-encode one row of image data.'''
-  entries = []
-  color = None
-  repeats = 0
+    """RLE-encode one row of image data."""
+    entries = []
+    color = None
+    repeats = 0
 
-  for x in range(0, img.size[0]):
-    c = quantize(img.getpixel((x, y)), palette)
-    if c == color and repeats < 255:
-      repeats += 1
-    else:
-      if color is not None:
+    for x in range(0, img.size[0]):
+        c = quantize(img.getpixel((x, y)), palette)
+        if c == color and repeats < 255:
+            repeats += 1
+        else:
+            if color is not None:
+                entries.append((repeats, color))
+
+            repeats = 1
+            color = c
+
+    if color is not None:
         entries.append((repeats, color))
 
-      repeats = 1
-      color = c
+    return entries
 
-  if color is not None:
-    entries.append((repeats, color))
-
-  return entries
 
 def write_image(outfile, img, palette):
-  '''Write the image contents to the output file.'''
+    """Write the image contents to the output file."""
 
-  outfile.write('static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =\n')
-  outfile.write('{\n')
+    outfile.write("static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =\n")
+    outfile.write("{\n")
 
-  for y in range(0, img.size[1]):
-    entries = encode_row(img, palette, y)
-    row = ""
-    for r, c in entries:
-      if len(row) > 60:
-        outfile.write('  ' + row + '\n')
+    for y in range(0, img.size[1]):
+        entries = encode_row(img, palette, y)
         row = ""
+        for r, c in entries:
+            if len(row) > 60:
+                outfile.write("  " + row + "\n")
+                row = ""
 
-      row += '{%3d, %3d}, ' % (r, c)
+            row += "{%3d, %3d}, " % (r, c)
 
-    row += ' ' * (73 - len(row))
-    outfile.write('  ' + row + '/* Row %d */\n' % y)
+        row += " " * (73 - len(row))
+        outfile.write("  " + row + "/* Row %d */\n" % y)
 
-  outfile.write('};\n\n')
+    outfile.write("};\n\n")
 
 
 def write_descriptor(outfile, name):
-  '''Write the public descriptor structure for the image.'''
+    """Write the public descriptor structure for the image."""
 
-  outfile.write('extern const struct NXWidgets::SRlePaletteBitmap g_%s =\n' % name)
-  outfile.write('{\n')
-  outfile.write('  CONFIG_NXWIDGETS_BPP,\n')
-  outfile.write('  CONFIG_NXWIDGETS_FMT,\n')
-  outfile.write('  BITMAP_PALETTESIZE,\n')
-  outfile.write('  BITMAP_WIDTH,\n')
-  outfile.write('  BITMAP_HEIGHT,\n')
-  outfile.write('  {palette, hilight_palette},\n')
-  outfile.write('  bitmap\n')
-  outfile.write('};\n')
+    outfile.write("extern const struct NXWidgets::SRlePaletteBitmap g_%s =\n" % name)
+    outfile.write("{\n")
+    outfile.write("  CONFIG_NXWIDGETS_BPP,\n")
+    outfile.write("  CONFIG_NXWIDGETS_FMT,\n")
+    outfile.write("  BITMAP_PALETTESIZE,\n")
+    outfile.write("  BITMAP_WIDTH,\n")
+    outfile.write("  BITMAP_HEIGHT,\n")
+    outfile.write("  {palette, hilight_palette},\n")
+    outfile.write("  bitmap\n")
+    outfile.write("};\n")
 
-if __name__ == '__main__':
-  import sys
-  import os.path
 
-  if len(sys.argv) != 3:
-    print("Usage: bitmap_converter.py source.png output.cxx")
-    sys.exit(1)
+if __name__ == "__main__":
+    import os.path
+    import sys
 
-  img = Image.open(sys.argv[1]).convert("RGB")
-  outfile = open(sys.argv[2], 'w')
-  palette = get_palette(img)
+    if len(sys.argv) != 3:
+        print("Usage: bitmap_converter.py source.png output.cxx")
+        sys.exit(1)
 
-  outfile.write(
-'''
+    img = Image.open(sys.argv[1]).convert("RGB")
+    outfile = open(sys.argv[2], "w")
+    palette = get_palette(img)
+
+    outfile.write(
+        """
 /* Automatically NuttX bitmap file. */
 /* Generated from %(src)s by bitmap_converter.py. */
 
@@ -139,12 +147,17 @@ if __name__ == '__main__':
 #define BITMAP_HEIGHT %(height)s
 #define BITMAP_PALETTESIZE %(palettesize)s
 
-''' % {'src': sys.argv[1], 'width': img.size[0], 'height': img.size[1],
-       'palettesize': len(palette)}
-  )
+"""
+        % {
+            "src": sys.argv[1],
+            "width": img.size[0],
+            "height": img.size[1],
+            "palettesize": len(palette),
+        }
+    )
 
-  name = os.path.splitext(os.path.basename(sys.argv[1]))[0]
+    name = os.path.splitext(os.path.basename(sys.argv[1]))[0]
 
-  write_palette(outfile, palette)
-  write_image(outfile, img, palette)
-  write_descriptor(outfile, name)
+    write_palette(outfile, palette)
+    write_image(outfile, img, palette)
+    write_descriptor(outfile, name)

From e94e89113a39649bdd7d617c99c2302f5df6ecac Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Mon, 6 Jul 2026 05:45:03 +0800
Subject: [PATCH 473/568] examples: gps: bound NMEA line reads

The GPS example appends serial input to a fixed-size NMEA line buffer until CR or LF without checking the buffer limit. A malformed or overlong input line can write past the end of line[], and the code also uses ch even when read() does not return a byte.

Read bytes only after a successful read(), stop storing at MINMEA_MAX_LENGTH - 1, drain overlong lines until the line ending, and skip parsing truncated sentences.

Generated-by: OpenAI Codex
Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 examples/gps/gps_main.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/examples/gps/gps_main.c b/examples/gps/gps_main.c
index 68f6da66e..a308f5213 100644
--- a/examples/gps/gps_main.c
+++ b/examples/gps/gps_main.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <wchar.h>
@@ -52,9 +53,11 @@ int main(int argc, FAR char *argv[])
 {
   int fd;
   int cnt;
+  ssize_t nread;
   char ch;
   char line[MINMEA_MAX_LENGTH];
   char *port = "/dev/ttyS1";
+  bool truncated;
 
   /* Get the GPS serial port argument. If none specified, default to ttyS1 */
 
@@ -79,18 +82,38 @@ int main(int argc, FAR char *argv[])
       /* Read until we complete a line */
 
       cnt = 0;
-      do
+      truncated = false;
+
+      for (; ; )
         {
-          read(fd, &ch, 1);
-          if (ch != '\r' && ch != '\n')
+          nread = read(fd, &ch, 1);
+          if (nread <= 0)
+            {
+              continue;
+            }
+
+          if (ch == '\r' || ch == '\n')
+            {
+              break;
+            }
+
+          if (cnt < MINMEA_MAX_LENGTH - 1)
             {
               line[cnt++] = ch;
             }
+          else
+            {
+              truncated = true;
+            }
         }
-      while (ch != '\r' && ch != '\n');
 
       line[cnt] = '\0';
 
+      if (truncated)
+        {
+          continue;
+        }
+
       switch (minmea_sentence_id(line, false))
         {
           case MINMEA_SENTENCE_RMC:

From c706dd87a7bbf26b123176e8f7b7d8d58d850415 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 5 Jul 2026 11:11:39 +0200
Subject: [PATCH 474/568] canutils/lely: fix unreliable download/unpack/patch
 logic

Rebuild from a clean tree in one recipe so a stale state no longer breaks the build.

This commit also simplify some build logic.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 canutils/lely-canopen/Makefile | 47 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/canutils/lely-canopen/Makefile b/canutils/lely-canopen/Makefile
index 2304c1580..22c6a85d6 100644
--- a/canutils/lely-canopen/Makefile
+++ b/canutils/lely-canopen/Makefile
@@ -31,11 +31,16 @@ WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 LELYCANOPEN_VERSION = $(patsubst "%",%,$(strip $(CONFIG_CANUTILS_LELYCANOPEN_VERSION)))
 
 LELYCANOPEN_TARBALL = lely-core-$(LELYCANOPEN_VERSION).tar.gz
-LELYCANOPEN_UNPACKNAME = lely-core-master-$(LELYCANOPEN_VERSION)
 LELYCANOPEN_SRCNAME = lely-core
 UNPACK ?= tar -zxf
 LELYCANOPEN_SRCDIR = $(WD)/$(LELYCANOPEN_SRCNAME)
 
+# The GitLab "archive/master" tarball unpacks to a directory named
+# lely-core-master-<sha>, where <sha> is the current tip of master
+
+LELYCANOPEN_UNPACKGLOB = lely-core-master-*
+LELYCANOPEN_PATCHES = $(sort $(wildcard *.patch))
+
 # CAN network object
 
 CSRCS += $(LELYCANOPEN_SRCDIR)/src/can/buf.c
@@ -169,38 +174,34 @@ STACKSIZE  = $(CONFIG_CANUTILS_LELYCANOPEN_TOOLS_COCTL_STACKSIZE)
 MAINSRC    = $(LELYCANOPEN_SRCDIR)/tools/coctl.c
 endif
 
-# Download and unpack tarball if no git repo found
+# Download, unpack and patch the Lely CANopen sources.
+
 ifeq ($(wildcard $(LELYCANOPEN_SRCNAME)/.git),)
+
 $(LELYCANOPEN_TARBALL):
 	@echo "Downloading: $(LELYCANOPEN_TARBALL)"
-	$(Q) curl -L -O $(CONFIG_CANUTILS_LELYCANOPEN_URL)/$(LELYCANOPEN_TARBALL)
+	$(Q) curl -fL -o $@.tmp $(CONFIG_CANUTILS_LELYCANOPEN_URL)/$(LELYCANOPEN_TARBALL)
+	$(Q) mv $@.tmp $@
 
-$(LELYCANOPEN_SRCNAME): $(LELYCANOPEN_TARBALL)
-	@echo "Unpacking: $(LELYCANOPEN_TARBALL) -> $(LELYCANOPEN_UNPACKNAME)"
+$(LELYCANOPEN_SRCNAME)/.patched: $(LELYCANOPEN_TARBALL) $(LELYCANOPEN_PATCHES)
+	@echo "Unpacking: $(LELYCANOPEN_TARBALL) -> $(LELYCANOPEN_SRCNAME)"
+	$(Q) rm -rf $(LELYCANOPEN_SRCNAME) $(LELYCANOPEN_UNPACKGLOB)
 	$(Q) $(UNPACK) $(LELYCANOPEN_TARBALL)
-
-$(LELYCANOPEN_SRCNAME)/.patched : $(LELYCANOPEN_SRCNAME)
-	# Get the name of the directory created by the tar command
-	$(eval LELYCANOPEN_UNPACKNAME := $(shell ls -d lely-core-master*))
-	$(Q) mv $(LELYCANOPEN_UNPACKNAME) $(LELYCANOPEN_SRCNAME)
-	$(Q) cat 0001-tools-eliminate-multiple-definitions-of-poll-compile.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
-	$(Q) cat 0002-tools-coctl.c-fix-printf-issues.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
-	$(Q) cat 0003-src-co-nmt.c-fix-compilation.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
-	$(Q) cat 0004-tools-coctl.c-add-missing-mutex-init.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
-	$(Q) cat 0005-add-NuttX-support.patch | patch -s -N -d $(LELYCANOPEN_SRCNAME) -p1
+	$(Q) mv $(LELYCANOPEN_UNPACKGLOB) $(LELYCANOPEN_SRCNAME)
+	$(Q) for patch in $(LELYCANOPEN_PATCHES); do \
+	       echo "Patching: $$patch"; \
+	       patch -s -N -p1 -d $(LELYCANOPEN_SRCNAME) < $$patch || exit 1; \
+	     done
 	$(Q) touch $@
-	$(Q) echo "Patching $(LELYCANOPEN_SRCNAME)"
 
 context:: $(LELYCANOPEN_SRCNAME)/.patched
+
+distclean::
+	$(Q) rm -rf $(LELYCANOPEN_SRCNAME) $(LELYCANOPEN_UNPACKGLOB)
+	$(call DELFILE, $(LELYCANOPEN_TARBALL))
+
 else
 context:: $(LELYCANOPEN_SRCNAME)
 endif
 
-
-distclean::
-ifeq ($(wildcard $(LELYCANOPEN_SRCNAME)/.git),)
-	$(call DELDIR, $(LELYCANOPEN_SRCNAME))
-	$(call DELFILE, $(LELYCANOPEN_TARBALL))
-endif
-
 include $(APPDIR)/Application.mk

From caa7d7faa535aaa4ce114187211735cd006c9940 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Sun, 5 Jul 2026 09:56:53 -0300
Subject: [PATCH 475/568] apps/nsh: Don't disable error by default

NSH error shouldn't be disabled by default, even when in SMALL
Memory because it will make difficult to discover why things are
not working. It should be disabled manually by experienced dev.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 nshlib/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 01103ee29..1f78a50ae 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -456,7 +456,7 @@ config NSH_DISABLE_HELP
 
 config NSH_DISABLE_ERROR_PRINT
 	bool "Disable NSH Error Printing"
-	default DEFAULT_SMALL
+	default n
 
 config NSH_DISABLE_HEXDUMP
 	bool "Disable hexdump"

From 962d90bb6e248fd8c6cae13010ce5e2eb454338f Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 5 Jul 2026 09:52:09 +0200
Subject: [PATCH 476/568] examples: add Lely CANopen master example

add Lely CANopen master example

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/lely_master/CMakeLists.txt |  53 +++
 examples/lely_master/Kconfig        |  50 ++
 examples/lely_master/Make.defs      |  25 +
 examples/lely_master/Makefile       |  47 ++
 examples/lely_master/candev.h       |  44 ++
 examples/lely_master/candev_char.c  | 173 +++++++
 examples/lely_master/candev_sock.c  | 197 ++++++++
 examples/lely_master/master_main.c  | 358 ++++++++++++++
 examples/lely_master/sdev.h         |  41 ++
 examples/lely_master/sdev_master.c  | 714 ++++++++++++++++++++++++++++
 10 files changed, 1702 insertions(+)
 create mode 100644 examples/lely_master/CMakeLists.txt
 create mode 100644 examples/lely_master/Kconfig
 create mode 100644 examples/lely_master/Make.defs
 create mode 100644 examples/lely_master/Makefile
 create mode 100644 examples/lely_master/candev.h
 create mode 100644 examples/lely_master/candev_char.c
 create mode 100644 examples/lely_master/candev_sock.c
 create mode 100644 examples/lely_master/master_main.c
 create mode 100644 examples/lely_master/sdev.h
 create mode 100644 examples/lely_master/sdev_master.c

diff --git a/examples/lely_master/CMakeLists.txt b/examples/lely_master/CMakeLists.txt
new file mode 100644
index 000000000..003c3e9fb
--- /dev/null
+++ b/examples/lely_master/CMakeLists.txt
@@ -0,0 +1,53 @@
+# ##############################################################################
+# apps/examples/lely_master/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_LELYMASTER)
+
+  set(LELY_INCDIR ${NUTTX_APPS_DIR}/canutils/lely-canopen/lely-core/include)
+
+  set(SRCS master_main.c sdev_master.c)
+
+  if(CONFIG_EXAMPLES_LELYMASTER_CHARDEV)
+    list(APPEND SRCS candev_char.c)
+  endif()
+
+  if(CONFIG_EXAMPLES_LELYMASTER_SOCKET)
+    list(APPEND SRCS candev_sock.c)
+  endif()
+
+  nuttx_add_application(
+    NAME
+    comaster
+    PRIORITY
+    ${CONFIG_EXAMPLES_LELYMASTER_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_LELYMASTER_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_LELYMASTER}
+    COMPILE_FLAGS
+    -Wno-undef
+    INCLUDE_DIRECTORIES
+    ${LELY_INCDIR}
+    SRCS
+    ${SRCS})
+
+endif()
diff --git a/examples/lely_master/Kconfig b/examples/lely_master/Kconfig
new file mode 100644
index 000000000..b370ea1f9
--- /dev/null
+++ b/examples/lely_master/Kconfig
@@ -0,0 +1,50 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_LELYMASTER
+	tristate "Lely CANopen master example"
+	default n
+	depends on CANUTILS_LELYCANOPEN && CANUTILS_LELYCANOPEN_SDEV
+	depends on CANUTILS_LELYCANOPEN_TIME && CANUTILS_LELYCANOPEN_OBJUPLOAD
+	depends on CANUTILS_LELYCANOPEN_MASTER
+	---help---
+		Enable the Lely CANopen master (comaster) example application.
+
+if EXAMPLES_LELYMASTER
+
+choice
+	prompt "CAN backend"
+	default EXAMPLES_LELYMASTER_CHARDEV
+
+config EXAMPLES_LELYMASTER_CHARDEV
+	bool "CAN character driver"
+	depends on CAN
+
+config EXAMPLES_LELYMASTER_SOCKET
+	bool "SocketCAN"
+	depends on NET_CAN
+	select NETUTILS_NETLIB
+
+endchoice
+
+config EXAMPLES_LELYMASTER_DEVPATH
+	string "CAN character device path"
+	default "/dev/can0"
+	depends on EXAMPLES_LELYMASTER_CHARDEV
+
+config EXAMPLES_LELYMASTER_INTF
+	string "SocketCAN interface"
+	default "can0"
+	depends on EXAMPLES_LELYMASTER_SOCKET
+
+config EXAMPLES_LELYMASTER_PRIORITY
+	int "Task priority"
+	default 100
+
+config EXAMPLES_LELYMASTER_STACKSIZE
+	int "Stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/examples/lely_master/Make.defs b/examples/lely_master/Make.defs
new file mode 100644
index 000000000..d47806ad6
--- /dev/null
+++ b/examples/lely_master/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/lely_master/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_LELYMASTER),)
+CONFIGURED_APPS += $(APPDIR)/examples/lely_master
+endif
diff --git a/examples/lely_master/Makefile b/examples/lely_master/Makefile
new file mode 100644
index 000000000..68db84998
--- /dev/null
+++ b/examples/lely_master/Makefile
@@ -0,0 +1,47 @@
+############################################################################
+# apps/examples/lely_master/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = comaster
+PRIORITY  = $(CONFIG_EXAMPLES_LELYMASTER_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_LELYMASTER_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_LELYMASTER)
+
+CFLAGS += -DHAVE_CONFIG_H=1
+
+# Lely headers use bare "#if __cplusplus"; silence -Wundef like the library
+
+CFLAGS += -Wno-undef
+
+CSRCS = sdev_master.c
+
+ifeq ($(CONFIG_EXAMPLES_LELYMASTER_CHARDEV),y)
+CSRCS += candev_char.c
+endif
+ifeq ($(CONFIG_EXAMPLES_LELYMASTER_SOCKET),y)
+CSRCS += candev_sock.c
+endif
+
+MAINSRC = master_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/lely_master/candev.h b/examples/lely_master/candev.h
new file mode 100644
index 000000000..47a6fb8a9
--- /dev/null
+++ b/examples/lely_master/candev.h
@@ -0,0 +1,44 @@
+/****************************************************************************
+ * apps/examples/lely_master/candev.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_LELY_MASTER_CANDEV_H
+#define __APPS_EXAMPLES_LELY_MASTER_CANDEV_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <canutils/lely/config.h>
+
+#include <lely/can/msg.h>
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int comaster_candev_init(void);
+int comaster_candev_send(FAR const struct can_msg *msg);
+int comaster_candev_recv(FAR struct can_msg *msg);
+
+#endif  /* __APPS_EXAMPLES_LELY_MASTER_CANDEV_H */
diff --git a/examples/lely_master/candev_char.c b/examples/lely_master/candev_char.c
new file mode 100644
index 000000000..3506b75d9
--- /dev/null
+++ b/examples/lely_master/candev_char.c
@@ -0,0 +1,173 @@
+/****************************************************************************
+ * apps/examples/lely_master/candev_char.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <nuttx/can/can.h>
+
+#include "candev.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_candev_fd;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: comaster_candev_init
+ ****************************************************************************/
+
+int comaster_candev_init(void)
+{
+  struct canioc_bittiming_s bt;
+  int ret;
+
+  /* Non-blocking so the main loop keeps servicing the CANopen timers */
+
+  g_candev_fd = open(CONFIG_EXAMPLES_LELYMASTER_DEVPATH,
+                     O_RDWR | O_NONBLOCK);
+  if (g_candev_fd < 0)
+    {
+      ret = -errno;
+      printf("ERROR: open %s failed %d\n",
+             CONFIG_EXAMPLES_LELYMASTER_DEVPATH, errno);
+      return ret;
+    }
+
+  ret = ioctl(g_candev_fd, CANIOC_GET_BITTIMING, &bt);
+  if (ret < 0)
+    {
+      printf("Bit timing not available: %d\n", errno);
+    }
+  else
+    {
+      printf("Bit timing:\n");
+      printf("   Baud: %lu\n", (unsigned long)bt.bt_baud);
+      printf("  TSEG1: %u\n", bt.bt_tseg1);
+      printf("  TSEG2: %u\n", bt.bt_tseg2);
+      printf("    SJW: %u\n", bt.bt_sjw);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: comaster_candev_send
+ ****************************************************************************/
+
+int comaster_candev_send(FAR const struct can_msg *msg)
+{
+  struct can_msg_s txmsg;
+  ssize_t          nwritten;
+  int              i;
+
+  txmsg.cm_hdr.ch_id    = msg->id;
+  txmsg.cm_hdr.ch_rtr   = (msg->flags & CAN_FLAG_RTR) != 0;
+  txmsg.cm_hdr.ch_dlc   = msg->len;
+#ifdef CONFIG_CAN_EXTID
+  txmsg.cm_hdr.ch_extid = (msg->flags & CAN_FLAG_IDE) != 0;
+#endif
+#ifdef CONFIG_CAN_ERRORS
+  txmsg.cm_hdr.ch_error = 0;
+#endif
+  txmsg.cm_hdr.ch_tcf   = 0;
+
+  for (i = 0; i < msg->len; i++)
+    {
+      txmsg.cm_data[i] = msg->data[i];
+    }
+
+  nwritten = write(g_candev_fd, &txmsg, CAN_MSGLEN(txmsg.cm_hdr.ch_dlc));
+  if (nwritten != CAN_MSGLEN(txmsg.cm_hdr.ch_dlc))
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: comaster_candev_recv
+ ****************************************************************************/
+
+int comaster_candev_recv(FAR struct can_msg *msg)
+{
+  struct can_msg_s rxmsg;
+  ssize_t          nread;
+  int              i;
+
+  nread = read(g_candev_fd, &rxmsg, sizeof(struct can_msg_s));
+  if (nread < 0)
+    {
+      if (errno == EAGAIN || errno == EWOULDBLOCK)
+        {
+          return 0;
+        }
+
+      return -1;
+    }
+
+  if (nread < CAN_MSGLEN(0))
+    {
+      return 0;
+    }
+
+  msg->id    = rxmsg.cm_hdr.ch_id;
+  msg->flags = 0;
+
+#ifdef CONFIG_CAN_EXTID
+  if (rxmsg.cm_hdr.ch_extid)
+    {
+      msg->flags |= CAN_FLAG_IDE;
+    }
+#endif
+
+  if (rxmsg.cm_hdr.ch_rtr)
+    {
+      msg->flags |= CAN_FLAG_RTR;
+    }
+
+  msg->len = rxmsg.cm_hdr.ch_dlc;
+
+  for (i = 0; i < rxmsg.cm_hdr.ch_dlc; i++)
+    {
+      msg->data[i] = rxmsg.cm_data[i];
+    }
+
+  return 1;
+}
diff --git a/examples/lely_master/candev_sock.c b/examples/lely_master/candev_sock.c
new file mode 100644
index 000000000..46c30ddc6
--- /dev/null
+++ b/examples/lely_master/candev_sock.c
@@ -0,0 +1,197 @@
+/****************************************************************************
+ * apps/examples/lely_master/candev_sock.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <net/if.h>
+#include <sys/socket.h>
+
+#include <nuttx/can.h>
+
+#include "netutils/netlib.h"
+#include "candev.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_candev_sock;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: comaster_candev_init
+ ****************************************************************************/
+
+int comaster_candev_init(void)
+{
+  struct sockaddr_can addr;
+  struct ifreq ifr;
+  int on = 1;
+  int ret;
+
+  g_candev_sock = socket(PF_CAN, SOCK_RAW, CAN_RAW);
+  if (g_candev_sock < 0)
+    {
+      ret = -errno;
+      printf("ERROR: socket failed %d\n", errno);
+      return ret;
+    }
+
+  strlcpy(ifr.ifr_name, CONFIG_EXAMPLES_LELYMASTER_INTF, IFNAMSIZ);
+
+  /* SocketCAN silently drops traffic while the interface is down, so bring
+   * it up here.  This lets the example run without a separate "ifup" step.
+   */
+
+  if (netlib_ifup(ifr.ifr_name) < 0)
+    {
+      ret = -errno;
+      printf("ERROR: netlib_ifup %s failed %d\n", ifr.ifr_name, errno);
+      goto errout;
+    }
+
+  ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name);
+  if (ifr.ifr_ifindex == 0)
+    {
+      ret = -errno;
+      printf("ERROR: if_nametoindex %s failed %d\n", ifr.ifr_name, errno);
+      goto errout;
+    }
+
+  setsockopt(g_candev_sock, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
+             &on, sizeof(on));
+
+  memset(&addr, 0, sizeof(addr));
+  addr.can_family  = AF_CAN;
+  addr.can_ifindex = ifr.ifr_ifindex;
+
+  if (bind(g_candev_sock, (FAR struct sockaddr *)&addr, sizeof(addr)) < 0)
+    {
+      ret = -errno;
+      printf("ERROR: bind failed %d\n", errno);
+      goto errout;
+    }
+
+  ret = fcntl(g_candev_sock, F_SETFL, O_NONBLOCK);
+  if (ret < 0)
+    {
+      ret = -errno;
+      goto errout;
+    }
+
+  return OK;
+
+errout:
+  close(g_candev_sock);
+  g_candev_sock = -1;
+  return ret;
+}
+
+/****************************************************************************
+ * Name: comaster_candev_send
+ ****************************************************************************/
+
+int comaster_candev_send(FAR const struct can_msg *msg)
+{
+  struct can_frame frame;
+  ssize_t          nwritten;
+
+  memset(&frame, 0, sizeof(frame));
+
+  frame.can_id = msg->id;
+  if (msg->flags & CAN_FLAG_IDE)
+    {
+      frame.can_id |= CAN_EFF_FLAG;
+    }
+
+  if (msg->flags & CAN_FLAG_RTR)
+    {
+      frame.can_id |= CAN_RTR_FLAG;
+    }
+
+  frame.can_dlc = msg->len;
+  memcpy(frame.data, msg->data, msg->len);
+
+  nwritten = write(g_candev_sock, &frame, sizeof(frame));
+  if (nwritten != sizeof(frame))
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: comaster_candev_recv
+ ****************************************************************************/
+
+int comaster_candev_recv(FAR struct can_msg *msg)
+{
+  struct can_frame frame;
+  ssize_t          nread;
+
+  nread = read(g_candev_sock, &frame, sizeof(frame));
+  if (nread < 0)
+    {
+      if (errno == EAGAIN || errno == EWOULDBLOCK)
+        {
+          return 0;
+        }
+
+      return -1;
+    }
+
+  if (nread < sizeof(frame))
+    {
+      return 0;
+    }
+
+  msg->id    = frame.can_id & CAN_EFF_MASK;
+  msg->flags = 0;
+  if (frame.can_id & CAN_EFF_FLAG)
+    {
+      msg->flags |= CAN_FLAG_IDE;
+    }
+
+  if (frame.can_id & CAN_RTR_FLAG)
+    {
+      msg->flags |= CAN_FLAG_RTR;
+    }
+
+  msg->len = frame.can_dlc;
+  memcpy(msg->data, frame.data, frame.can_dlc);
+
+  return 1;
+}
diff --git a/examples/lely_master/master_main.c b/examples/lely_master/master_main.c
new file mode 100644
index 000000000..4148d0d1c
--- /dev/null
+++ b/examples/lely_master/master_main.c
@@ -0,0 +1,358 @@
+/****************************************************************************
+ * apps/examples/lely_master/master_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <canutils/lely/config.h>
+
+#include <lely/co/csdo.h>
+#include <lely/co/dev.h>
+#include <lely/co/nmt.h>
+#include <lely/co/sdev.h>
+#include <lely/co/sdo.h>
+#include <lely/co/time.h>
+
+#include "sdev.h"
+#include "candev.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SLAVE_ID    0x02
+#define OBJ_COUNTER 0x2100
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+enum master_phase_e
+{
+  PHASE_WAIT,   /* wait for the slave, then read its info via SDO */
+  PHASE_SDO,    /* SDO request in flight */
+  PHASE_RUN     /* network operational, streaming PDO data */
+};
+
+struct co_net_s
+{
+  can_net_t *net;
+  co_dev_t  *dev;
+  co_nmt_t  *nmt;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct co_net_s g_net;
+static bool g_sdo_done;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: elapsed_ms
+ ****************************************************************************/
+
+static long elapsed_ms(const struct timespec *a, const struct timespec *b)
+{
+  return (a->tv_sec - b->tv_sec) * 1000 +
+         (a->tv_nsec - b->tv_nsec) / 1000000;
+}
+
+/****************************************************************************
+ * Name: on_can_send
+ ****************************************************************************/
+
+static int on_can_send(const struct can_msg *msg, void *data)
+{
+  UNUSED(data);
+
+  return comaster_candev_send(msg);
+}
+
+/****************************************************************************
+ * Name: nmt_start_remote
+ ****************************************************************************/
+
+static void nmt_start_remote(co_unsigned8_t id)
+{
+  struct can_msg msg;
+
+  /* NMT command frame: COB-ID 0x000, {command specifier, node-ID} */
+
+  memset(&msg, 0, sizeof(msg));
+  msg.len     = 2;
+  msg.data[0] = CO_NMT_CS_START;
+  msg.data[1] = id;
+
+  comaster_candev_send(&msg);
+}
+
+/****************************************************************************
+ * Name: on_sdo_up
+ ****************************************************************************/
+
+static void on_sdo_up(co_csdo_t *sdo, co_unsigned16_t idx,
+                      co_unsigned8_t subidx, co_unsigned32_t ac,
+                      const void *ptr, size_t n, void *data)
+{
+  co_unsigned32_t val;
+
+  UNUSED(sdo);
+  UNUSED(idx);
+  UNUSED(subidx);
+  UNUSED(data);
+
+  if (ac == 0 && n >= sizeof(co_unsigned32_t))
+    {
+      memcpy(&val, ptr, sizeof(val));
+      printf("SDO: slave device type (0x1000) = 0x%08x\n", (unsigned)val);
+    }
+  else
+    {
+      printf("SDO: read failed, abort code 0x%08x\n", (unsigned)ac);
+    }
+
+  g_sdo_done = true;
+}
+
+/****************************************************************************
+ * Name: on_time
+ ****************************************************************************/
+
+static void on_time(co_time_t *time, const struct timespec *tp, void *data)
+{
+  UNUSED(time);
+  UNUSED(data);
+
+  /* Update the wall clock */
+
+  clock_settime(CLOCK_REALTIME, tp);
+}
+
+/****************************************************************************
+ * Name: on_nmt_cs
+ ****************************************************************************/
+
+static void on_nmt_cs(co_nmt_t *nmt, co_unsigned8_t cs, void *data)
+{
+  UNUSED(data);
+
+  switch (cs)
+    {
+      case CO_NMT_CS_START:
+      case CO_NMT_CS_ENTER_PREOP:
+        {
+          co_time_set_ind(co_nmt_get_time(nmt), &on_time, NULL);
+          break;
+        }
+
+      case CO_NMT_CS_RESET_NODE:
+        {
+          exit(0);
+          break;
+        }
+
+      case CO_NMT_CS_STOP:
+      case CO_NMT_CS_RESET_COMM:
+      default:
+        {
+          break;
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct timespec  now;
+  struct can_msg   msg;
+  struct timespec  t0;
+  co_unsigned32_t  last  = 0xffffffff;
+  int              phase = PHASE_WAIT;
+  int              ret;
+  co_csdo_t       *csdo;
+  co_unsigned32_t  v;
+
+  memset(&g_net, 0, sizeof(g_net));
+  g_sdo_done = false;
+  setvbuf(stdout, NULL, _IONBF, 0);
+
+  ret = comaster_candev_init();
+  if (ret < 0)
+    {
+      printf("ERROR: comaster_candev_init failed %d\n", ret);
+      goto errout;
+    }
+
+  g_net.net = can_net_create();
+  if (!g_net.net)
+    {
+      printf("ERROR: can_net_create failed\n");
+      goto errout;
+    }
+
+  can_net_set_send_func(g_net.net, &on_can_send, NULL);
+
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  can_net_set_time(g_net.net, &now);
+
+  /* Create dev from struct */
+
+  g_net.dev = co_dev_create_from_sdev(&g_sdev_master);
+  if (!g_net.dev)
+    {
+      printf("ERROR: co_dev_create_from_sdev failed\n");
+      goto errout;
+    }
+
+  g_net.nmt = co_nmt_create(g_net.net, g_net.dev);
+  if (!g_net.nmt)
+    {
+      printf("ERROR: co_nmt_create failed\n");
+      goto errout;
+    }
+
+  /* Start the NMT service by resetting the node */
+
+  co_nmt_cs_ind(g_net.nmt, CO_NMT_CS_RESET_NODE);
+
+  /* Set the NMT indication function after the initial reset */
+
+  co_nmt_set_cs_ind(g_net.nmt, &on_nmt_cs, NULL);
+
+  printf("lely CANopen master running (node 0x%02x)\n", g_sdev_master.id);
+
+  clock_gettime(CLOCK_MONOTONIC, &t0);
+
+  while (1)
+    {
+      clock_gettime(CLOCK_MONOTONIC, &now);
+      can_net_set_time(g_net.net, &now);
+
+      while (comaster_candev_recv(&msg) > 0)
+        {
+          can_net_recv(g_net.net, &msg);
+        }
+
+      switch (phase)
+        {
+          /* Give the slave time to boot, then read its device type with
+           * a Client-SDO transfer (works while both nodes are pre-op).
+           */
+
+          case PHASE_WAIT:
+            {
+              if (elapsed_ms(&now, &t0) >= 500)
+                {
+                  csdo = co_nmt_get_csdo(g_net.nmt, 1);
+                  if (csdo != NULL && co_csdo_up_req(
+                        csdo, 0x1000, 0x00, &on_sdo_up, NULL) == 0)
+                    {
+                      phase = PHASE_SDO;
+                    }
+                  else
+                    {
+                      t0 = now;
+                    }
+                }
+
+              break;
+            }
+
+          /* Once the SDO completes, bring the network to OPERATIONAL:
+           * the master itself and the slave (NMT start).  PDO/SYNC then
+           * flow.
+           */
+
+          case PHASE_SDO:
+            {
+              if (g_sdo_done)
+                {
+                  co_nmt_cs_ind(g_net.nmt, CO_NMT_CS_START);
+                  nmt_start_remote(SLAVE_ID);
+                  printf("NMT: master + slave 0x%02x OPERATIONAL\n",
+                         SLAVE_ID);
+                  phase = PHASE_RUN;
+                }
+
+              break;
+            }
+
+          /* The slave's synchronous TPDO lands in object 0x2100 via the
+           * RPDO mapping; print it whenever it changes.
+           */
+
+          case PHASE_RUN:
+            {
+              v = co_dev_get_val_u32(g_net.dev, OBJ_COUNTER, 0x00);
+              if (v != last)
+                {
+                  printf("PDO rx: counter = %u\n", (unsigned)v);
+                  last = v;
+                }
+
+              break;
+            }
+        }
+
+      usleep(1000);
+    }
+
+errout:
+  if (g_net.nmt)
+    {
+      co_nmt_destroy(g_net.nmt);
+    }
+
+  if (g_net.dev)
+    {
+      co_dev_destroy(g_net.dev);
+    }
+
+  if (g_net.net)
+    {
+      can_net_destroy(g_net.net);
+    }
+
+  return 0;
+}
diff --git a/examples/lely_master/sdev.h b/examples/lely_master/sdev.h
new file mode 100644
index 000000000..559b8468d
--- /dev/null
+++ b/examples/lely_master/sdev.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * apps/examples/lely_master/sdev.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_LELY_SDEV_H
+#define __APPS_EXAMPLES_LELY_SDEV_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <canutils/lely/config.h>
+#include <lely/co/sdev.h>
+
+/****************************************************************************
+ * Public data
+ ****************************************************************************/
+
+extern const struct co_sdev g_sdev_master;
+
+#endif  /* __APPS_EXAMPLES_LELY_SDEV_H */
diff --git a/examples/lely_master/sdev_master.c b/examples/lely_master/sdev_master.c
new file mode 100644
index 000000000..34d5c6620
--- /dev/null
+++ b/examples/lely_master/sdev_master.c
@@ -0,0 +1,714 @@
+/****************************************************************************
+ * apps/examples/lely_master/sdev_master.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "sdev.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CO_SDEV_STRING(s) s
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Object 0x1000 sub-objects */
+
+static const struct co_ssub g_1000_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Device type"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1001 sub-objects */
+
+static const struct co_ssub g_1001_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Error register"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = CO_UNSIGNED8_MIN,
+#endif
+    .val.u8 = CO_UNSIGNED8_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1005 sub-objects */
+
+static const struct co_ssub g_1005_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID SYNC message"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x40000080lu,
+#endif
+    .val.u32 = 0x40000080lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1006 sub-objects */
+
+static const struct co_ssub g_1006_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Communication cycle period"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x000186a0lu,
+#endif
+    .val.u32 = 0x000186a0lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1012 sub-objects */
+
+static const struct co_ssub g_1012_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID time stamp object"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x80000100lu,
+#endif
+    .val.u32 = 0x80000100lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1017 sub-objects */
+
+static const struct co_ssub g_1017_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Producer heartbeat time"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED16,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u16 = CO_UNSIGNED16_MIN,
+    .max.u16 = CO_UNSIGNED16_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u16 = 0x0032,
+#endif
+    .val.u16 = 0x0032,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1018 sub-objects */
+
+static const struct co_ssub g_1018_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Highest sub-index supported"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x04,
+#endif
+    .val.u8 = 0x04,
+    .access = CO_ACCESS_CONST,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Vendor-ID"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000360lu,
+#endif
+    .val.u32 = 0x00000360lu,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Product code"),
+#endif
+    .subidx = 0x02,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Revision number"),
+#endif
+    .subidx = 0x03,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Serial number"),
+#endif
+    .subidx = 0x04,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1280 sub-objects */
+
+static const struct co_ssub g_1280_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Highest sub-index supported"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x03,
+#endif
+    .val.u8 = 0x03,
+    .access = CO_ACCESS_CONST,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID client to server"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000602lu,
+#endif
+    .val.u32 = 0x00000602lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID server to client"),
+#endif
+    .subidx = 0x02,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000582lu,
+#endif
+    .val.u32 = 0x00000582lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Node-ID of the SDO server"),
+#endif
+    .subidx = 0x03,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x02,
+#endif
+    .val.u8 = 0x02,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1400 sub-objects */
+
+static const struct co_ssub g_1400_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Highest sub-index supported"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x02,
+#endif
+    .val.u8 = 0x02,
+    .access = CO_ACCESS_CONST,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000182lu,
+#endif
+    .val.u32 = 0x00000182lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Transmission type"),
+#endif
+    .subidx = 0x02,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x01,
+#endif
+    .val.u8 = 0x01,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1600 sub-objects */
+
+static const struct co_ssub g_1600_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Number of mapped objects"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x01,
+#endif
+    .val.u8 = 0x01,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Mapping 1"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x21000020lu,
+#endif
+    .val.u32 = 0x21000020lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1f80 sub-objects */
+
+static const struct co_ssub g_1f80_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("NMT startup"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = 0x00000000lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+      | CO_OBJ_FLAGS_PARAMETER_VALUE
+  }
+};
+
+/* Object 0x2000 sub-objects */
+
+static const struct co_ssub g_2000_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO download callback"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x2001 sub-objects */
+
+static const struct co_ssub g_2001_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO upload callback"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x2100 sub-objects */
+
+static const struct co_ssub g_2100_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Counter"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 1,
+    .flags = 0
+  }
+};
+
+/* Object dictionary */
+
+static const struct co_sobj g_g_sdev_master_objs[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Device type"),
+#endif
+    .idx = 0x1000,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1000_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Error register"),
+#endif
+    .idx = 0x1001,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1001_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID SYNC message"),
+#endif
+    .idx = 0x1005,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1005_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Communication cycle period"),
+#endif
+    .idx = 0x1006,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1006_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID time stamp object"),
+#endif
+    .idx = 0x1012,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1012_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Producer heartbeat time"),
+#endif
+    .idx = 0x1017,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1017_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Identity object"),
+#endif
+    .idx = 0x1018,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 5,
+    .subs = g_1018_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("SDO client parameter"),
+#endif
+    .idx = 0x1280,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 4,
+    .subs = g_1280_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("RPDO communication parameter"),
+#endif
+    .idx = 0x1400,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 3,
+    .subs = g_1400_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("RPDO mapping parameter"),
+#endif
+    .idx = 0x1600,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 2,
+    .subs = g_1600_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("NMT startup"),
+#endif
+    .idx = 0x1f80,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1f80_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO download callback"),
+#endif
+    .idx = 0x2000,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_2000_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO upload callback"),
+#endif
+    .idx = 0x2001,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_2001_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Counter"),
+#endif
+    .idx = 0x2100,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_2100_sub
+  }
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct co_sdev g_sdev_master =
+{
+  .id = 0x01,
+  .name = NULL,
+  .vendor_name = CO_SDEV_STRING("Apache NuttX RTOS"),
+  .vendor_id = 0x00000000,
+  .product_name = NULL,
+  .product_code = 0x00000000,
+  .revision = 0x00000000,
+  .order_code = NULL,
+  .baud = CO_BAUD_125,
+  .rate = 0,
+  .lss = 0,
+  .dummy = 0x000000fe,
+  .nobj = 14,
+  .objs = g_g_sdev_master_objs
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

From c785d40af7b354a5ee312ad41e174e07875866da Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sun, 5 Jul 2026 09:52:51 +0200
Subject: [PATCH 477/568] examples: add Lely CANopen slave example

add Lely CANopen slave example

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 examples/lely_slave/CMakeLists.txt |  55 +++
 examples/lely_slave/Kconfig        |  49 +++
 examples/lely_slave/Make.defs      |  25 ++
 examples/lely_slave/Makefile       |  47 +++
 examples/lely_slave/candev.h       |  44 +++
 examples/lely_slave/candev_char.c  | 173 +++++++++
 examples/lely_slave/candev_sock.c  | 197 ++++++++++
 examples/lely_slave/sdev.h         |  41 ++
 examples/lely_slave/sdev_slave.c   | 594 +++++++++++++++++++++++++++++
 examples/lely_slave/slave_main.c   | 242 ++++++++++++
 10 files changed, 1467 insertions(+)
 create mode 100644 examples/lely_slave/CMakeLists.txt
 create mode 100644 examples/lely_slave/Kconfig
 create mode 100644 examples/lely_slave/Make.defs
 create mode 100644 examples/lely_slave/Makefile
 create mode 100644 examples/lely_slave/candev.h
 create mode 100644 examples/lely_slave/candev_char.c
 create mode 100644 examples/lely_slave/candev_sock.c
 create mode 100644 examples/lely_slave/sdev.h
 create mode 100644 examples/lely_slave/sdev_slave.c
 create mode 100644 examples/lely_slave/slave_main.c

diff --git a/examples/lely_slave/CMakeLists.txt b/examples/lely_slave/CMakeLists.txt
new file mode 100644
index 000000000..4ffdb62ea
--- /dev/null
+++ b/examples/lely_slave/CMakeLists.txt
@@ -0,0 +1,55 @@
+# ##############################################################################
+# apps/examples/lely_slave/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_LELYSLAVE)
+
+  set(LELY_INCDIR ${NUTTX_APPS_DIR}/canutils/lely-canopen/lely-core/include)
+
+  # The main source must be first so it receives the main=coslave_main alias
+
+  set(SRCS slave_main.c sdev_slave.c)
+
+  if(CONFIG_EXAMPLES_LELYSLAVE_CHARDEV)
+    list(APPEND SRCS candev_char.c)
+  endif()
+
+  if(CONFIG_EXAMPLES_LELYSLAVE_SOCKET)
+    list(APPEND SRCS candev_sock.c)
+  endif()
+
+  nuttx_add_application(
+    NAME
+    coslave
+    PRIORITY
+    ${CONFIG_EXAMPLES_LELYSLAVE_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_LELYSLAVE_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_LELYSLAVE}
+    COMPILE_FLAGS
+    -Wno-undef
+    INCLUDE_DIRECTORIES
+    ${LELY_INCDIR}
+    SRCS
+    ${SRCS})
+
+endif()
diff --git a/examples/lely_slave/Kconfig b/examples/lely_slave/Kconfig
new file mode 100644
index 000000000..de8f9d30a
--- /dev/null
+++ b/examples/lely_slave/Kconfig
@@ -0,0 +1,49 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_LELYSLAVE
+	tristate "Lely CANopen slave example"
+	default n
+	depends on CANUTILS_LELYCANOPEN && CANUTILS_LELYCANOPEN_SDEV
+	depends on CANUTILS_LELYCANOPEN_TIME && CANUTILS_LELYCANOPEN_OBJUPLOAD
+	---help---
+		Enable the Lely CANopen slave (coslave) example application.
+
+if EXAMPLES_LELYSLAVE
+
+choice
+	prompt "CAN backend"
+	default EXAMPLES_LELYSLAVE_CHARDEV
+
+config EXAMPLES_LELYSLAVE_CHARDEV
+	bool "CAN character driver"
+	depends on CAN
+
+config EXAMPLES_LELYSLAVE_SOCKET
+	bool "SocketCAN"
+	depends on NET_CAN
+	select NETUTILS_NETLIB
+
+endchoice
+
+config EXAMPLES_LELYSLAVE_DEVPATH
+	string "CAN character device path"
+	default "/dev/can0"
+	depends on EXAMPLES_LELYSLAVE_CHARDEV
+
+config EXAMPLES_LELYSLAVE_INTF
+	string "SocketCAN interface"
+	default "can0"
+	depends on EXAMPLES_LELYSLAVE_SOCKET
+
+config EXAMPLES_LELYSLAVE_PRIORITY
+	int "Task priority"
+	default 100
+
+config EXAMPLES_LELYSLAVE_STACKSIZE
+	int "Stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/examples/lely_slave/Make.defs b/examples/lely_slave/Make.defs
new file mode 100644
index 000000000..20382554f
--- /dev/null
+++ b/examples/lely_slave/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/lely_slave/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_LELYSLAVE),)
+CONFIGURED_APPS += $(APPDIR)/examples/lely_slave
+endif
diff --git a/examples/lely_slave/Makefile b/examples/lely_slave/Makefile
new file mode 100644
index 000000000..dcc135012
--- /dev/null
+++ b/examples/lely_slave/Makefile
@@ -0,0 +1,47 @@
+############################################################################
+# apps/examples/lely_slave/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = coslave
+PRIORITY  = $(CONFIG_EXAMPLES_LELYSLAVE_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_LELYSLAVE_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_LELYSLAVE)
+
+CFLAGS += -DHAVE_CONFIG_H=1
+
+# Lely headers use bare "#if __cplusplus"; silence -Wundef like the library
+
+CFLAGS += -Wno-undef
+
+CSRCS = sdev_slave.c
+
+ifeq ($(CONFIG_EXAMPLES_LELYSLAVE_CHARDEV),y)
+CSRCS += candev_char.c
+endif
+ifeq ($(CONFIG_EXAMPLES_LELYSLAVE_SOCKET),y)
+CSRCS += candev_sock.c
+endif
+
+MAINSRC = slave_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/lely_slave/candev.h b/examples/lely_slave/candev.h
new file mode 100644
index 000000000..e044f8e89
--- /dev/null
+++ b/examples/lely_slave/candev.h
@@ -0,0 +1,44 @@
+/****************************************************************************
+ * apps/examples/lely_slave/candev.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_LELY_SLAVE_CANDEV_H
+#define __APPS_EXAMPLES_LELY_SLAVE_CANDEV_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <canutils/lely/config.h>
+
+#include <lely/can/msg.h>
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int coslave_candev_init(void);
+int coslave_candev_send(FAR const struct can_msg *msg);
+int coslave_candev_recv(FAR struct can_msg *msg);
+
+#endif  /* __APPS_EXAMPLES_LELY_SLAVE_CANDEV_H */
diff --git a/examples/lely_slave/candev_char.c b/examples/lely_slave/candev_char.c
new file mode 100644
index 000000000..71c2aed11
--- /dev/null
+++ b/examples/lely_slave/candev_char.c
@@ -0,0 +1,173 @@
+/****************************************************************************
+ * apps/examples/lely_slave/candev_char.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <nuttx/can/can.h>
+
+#include "candev.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_candev_fd;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: coslave_candev_init
+ ****************************************************************************/
+
+int coslave_candev_init(void)
+{
+  struct canioc_bittiming_s bt;
+  int ret;
+
+  /* Non-blocking so the main loop keeps servicing the CANopen timers */
+
+  g_candev_fd = open(CONFIG_EXAMPLES_LELYSLAVE_DEVPATH,
+                     O_RDWR | O_NONBLOCK);
+  if (g_candev_fd < 0)
+    {
+      ret = -errno;
+      printf("ERROR: open %s failed %d\n",
+             CONFIG_EXAMPLES_LELYSLAVE_DEVPATH, errno);
+      return ret;
+    }
+
+  ret = ioctl(g_candev_fd, CANIOC_GET_BITTIMING, &bt);
+  if (ret < 0)
+    {
+      printf("Bit timing not available: %d\n", errno);
+    }
+  else
+    {
+      printf("Bit timing:\n");
+      printf("   Baud: %lu\n", (unsigned long)bt.bt_baud);
+      printf("  TSEG1: %u\n", bt.bt_tseg1);
+      printf("  TSEG2: %u\n", bt.bt_tseg2);
+      printf("    SJW: %u\n", bt.bt_sjw);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: coslave_candev_send
+ ****************************************************************************/
+
+int coslave_candev_send(FAR const struct can_msg *msg)
+{
+  struct can_msg_s txmsg;
+  ssize_t          nwritten;
+  int              i;
+
+  txmsg.cm_hdr.ch_id    = msg->id;
+  txmsg.cm_hdr.ch_rtr   = (msg->flags & CAN_FLAG_RTR) != 0;
+  txmsg.cm_hdr.ch_dlc   = msg->len;
+#ifdef CONFIG_CAN_EXTID
+  txmsg.cm_hdr.ch_extid = (msg->flags & CAN_FLAG_IDE) != 0;
+#endif
+#ifdef CONFIG_CAN_ERRORS
+  txmsg.cm_hdr.ch_error = 0;
+#endif
+  txmsg.cm_hdr.ch_tcf   = 0;
+
+  for (i = 0; i < msg->len; i++)
+    {
+      txmsg.cm_data[i] = msg->data[i];
+    }
+
+  nwritten = write(g_candev_fd, &txmsg, CAN_MSGLEN(txmsg.cm_hdr.ch_dlc));
+  if (nwritten != CAN_MSGLEN(txmsg.cm_hdr.ch_dlc))
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: coslave_candev_recv
+ ****************************************************************************/
+
+int coslave_candev_recv(FAR struct can_msg *msg)
+{
+  struct can_msg_s rxmsg;
+  ssize_t          nread;
+  int              i;
+
+  nread = read(g_candev_fd, &rxmsg, sizeof(struct can_msg_s));
+  if (nread < 0)
+    {
+      if (errno == EAGAIN || errno == EWOULDBLOCK)
+        {
+          return 0;
+        }
+
+      return -1;
+    }
+
+  if (nread < CAN_MSGLEN(0))
+    {
+      return 0;
+    }
+
+  msg->id    = rxmsg.cm_hdr.ch_id;
+  msg->flags = 0;
+
+#ifdef CONFIG_CAN_EXTID
+  if (rxmsg.cm_hdr.ch_extid)
+    {
+      msg->flags |= CAN_FLAG_IDE;
+    }
+#endif
+
+  if (rxmsg.cm_hdr.ch_rtr)
+    {
+      msg->flags |= CAN_FLAG_RTR;
+    }
+
+  msg->len = rxmsg.cm_hdr.ch_dlc;
+
+  for (i = 0; i < rxmsg.cm_hdr.ch_dlc; i++)
+    {
+      msg->data[i] = rxmsg.cm_data[i];
+    }
+
+  return 1;
+}
diff --git a/examples/lely_slave/candev_sock.c b/examples/lely_slave/candev_sock.c
new file mode 100644
index 000000000..d52db0b97
--- /dev/null
+++ b/examples/lely_slave/candev_sock.c
@@ -0,0 +1,197 @@
+/****************************************************************************
+ * apps/examples/lely_slave/candev_sock.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <net/if.h>
+#include <sys/socket.h>
+
+#include <nuttx/can.h>
+
+#include "netutils/netlib.h"
+#include "candev.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_candev_sock;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: coslave_candev_init
+ ****************************************************************************/
+
+int coslave_candev_init(void)
+{
+  struct sockaddr_can addr;
+  struct ifreq ifr;
+  int on = 1;
+  int ret;
+
+  g_candev_sock = socket(PF_CAN, SOCK_RAW, CAN_RAW);
+  if (g_candev_sock < 0)
+    {
+      ret = -errno;
+      printf("ERROR: socket failed %d\n", errno);
+      return ret;
+    }
+
+  strlcpy(ifr.ifr_name, CONFIG_EXAMPLES_LELYSLAVE_INTF, IFNAMSIZ);
+
+  /* SocketCAN silently drops traffic while the interface is down, so bring
+   * it up here.  This lets the example run without a separate "ifup" step.
+   */
+
+  if (netlib_ifup(ifr.ifr_name) < 0)
+    {
+      ret = -errno;
+      printf("ERROR: netlib_ifup %s failed %d\n", ifr.ifr_name, errno);
+      goto errout;
+    }
+
+  ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name);
+  if (ifr.ifr_ifindex == 0)
+    {
+      ret = -errno;
+      printf("ERROR: if_nametoindex %s failed %d\n", ifr.ifr_name, errno);
+      goto errout;
+    }
+
+  setsockopt(g_candev_sock, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
+             &on, sizeof(on));
+
+  memset(&addr, 0, sizeof(addr));
+  addr.can_family  = AF_CAN;
+  addr.can_ifindex = ifr.ifr_ifindex;
+
+  if (bind(g_candev_sock, (FAR struct sockaddr *)&addr, sizeof(addr)) < 0)
+    {
+      ret = -errno;
+      printf("ERROR: bind failed %d\n", errno);
+      goto errout;
+    }
+
+  ret = fcntl(g_candev_sock, F_SETFL, O_NONBLOCK);
+  if (ret < 0)
+    {
+      ret = -errno;
+      goto errout;
+    }
+
+  return OK;
+
+errout:
+  close(g_candev_sock);
+  g_candev_sock = -1;
+  return ret;
+}
+
+/****************************************************************************
+ * Name: coslave_candev_send
+ ****************************************************************************/
+
+int coslave_candev_send(FAR const struct can_msg *msg)
+{
+  struct can_frame frame;
+  ssize_t          nwritten;
+
+  memset(&frame, 0, sizeof(frame));
+
+  frame.can_id = msg->id;
+  if (msg->flags & CAN_FLAG_IDE)
+    {
+      frame.can_id |= CAN_EFF_FLAG;
+    }
+
+  if (msg->flags & CAN_FLAG_RTR)
+    {
+      frame.can_id |= CAN_RTR_FLAG;
+    }
+
+  frame.can_dlc = msg->len;
+  memcpy(frame.data, msg->data, msg->len);
+
+  nwritten = write(g_candev_sock, &frame, sizeof(frame));
+  if (nwritten != sizeof(frame))
+    {
+      return -1;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: coslave_candev_recv
+ ****************************************************************************/
+
+int coslave_candev_recv(FAR struct can_msg *msg)
+{
+  struct can_frame frame;
+  ssize_t          nread;
+
+  nread = read(g_candev_sock, &frame, sizeof(frame));
+  if (nread < 0)
+    {
+      if (errno == EAGAIN || errno == EWOULDBLOCK)
+        {
+          return 0;
+        }
+
+      return -1;
+    }
+
+  if (nread < sizeof(frame))
+    {
+      return 0;
+    }
+
+  msg->id    = frame.can_id & CAN_EFF_MASK;
+  msg->flags = 0;
+  if (frame.can_id & CAN_EFF_FLAG)
+    {
+      msg->flags |= CAN_FLAG_IDE;
+    }
+
+  if (frame.can_id & CAN_RTR_FLAG)
+    {
+      msg->flags |= CAN_FLAG_RTR;
+    }
+
+  msg->len = frame.can_dlc;
+  memcpy(msg->data, frame.data, frame.can_dlc);
+
+  return 1;
+}
diff --git a/examples/lely_slave/sdev.h b/examples/lely_slave/sdev.h
new file mode 100644
index 000000000..ca13a532d
--- /dev/null
+++ b/examples/lely_slave/sdev.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * apps/examples/lely_slave/sdev.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_EXAMPLES_LELY_SDEV_H
+#define __APPS_EXAMPLES_LELY_SDEV_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <canutils/lely/config.h>
+#include <lely/co/sdev.h>
+
+/****************************************************************************
+ * Public data
+ ****************************************************************************/
+
+extern const struct co_sdev g_sdev_slave;
+
+#endif  /* __APPS_EXAMPLES_LELY_SDEV_H */
diff --git a/examples/lely_slave/sdev_slave.c b/examples/lely_slave/sdev_slave.c
new file mode 100644
index 000000000..8f71558f5
--- /dev/null
+++ b/examples/lely_slave/sdev_slave.c
@@ -0,0 +1,594 @@
+/****************************************************************************
+ * apps/examples/lely_slave/sdev_slave.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "sdev.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CO_SDEV_STRING(s) s
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Object 0x1000 sub-objects */
+
+static const struct co_ssub g_1000_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Device type"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1001 sub-objects */
+
+static const struct co_ssub g_1001_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Error register"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = CO_UNSIGNED8_MIN,
+#endif
+    .val.u8 = CO_UNSIGNED8_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1005 sub-objects */
+
+static const struct co_ssub g_1005_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID SYNC message"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000080lu,
+#endif
+    .val.u32 = 0x00000080lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1012 sub-objects */
+
+static const struct co_ssub g_1012_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID time stamp object"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x80000100lu,
+#endif
+    .val.u32 = 0x80000100lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1017 sub-objects */
+
+static const struct co_ssub g_1017_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Producer heartbeat time"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED16,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u16 = CO_UNSIGNED16_MIN,
+    .max.u16 = CO_UNSIGNED16_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u16 = 0x0032,
+#endif
+    .val.u16 = 0x0032,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1018 sub-objects */
+
+static const struct co_ssub g_1018_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Highest sub-index supported"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x04,
+#endif
+    .val.u8 = 0x04,
+    .access = CO_ACCESS_CONST,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Vendor-ID"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000360lu,
+#endif
+    .val.u32 = 0x00000360lu,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Product code"),
+#endif
+    .subidx = 0x02,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Revision number"),
+#endif
+    .subidx = 0x03,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Serial number"),
+#endif
+    .subidx = 0x04,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1800 sub-objects */
+
+static const struct co_ssub g_1800_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Highest sub-index supported"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x02,
+#endif
+    .val.u8 = 0x02,
+    .access = CO_ACCESS_CONST,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x00000182lu,
+#endif
+    .val.u32 = 0x00000182lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Transmission type"),
+#endif
+    .subidx = 0x02,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x01,
+#endif
+    .val.u8 = 0x01,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1a00 sub-objects */
+
+static const struct co_ssub g_1a00_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Number of mapped objects"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED8,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u8 = CO_UNSIGNED8_MIN,
+    .max.u8 = CO_UNSIGNED8_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u8 = 0x01,
+#endif
+    .val.u8 = 0x01,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Mapping 1"),
+#endif
+    .subidx = 0x01,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = 0x21000020lu,
+#endif
+    .val.u32 = 0x21000020lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x1f80 sub-objects */
+
+static const struct co_ssub g_1f80_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("NMT startup"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = 0x00000004lu,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+      | CO_OBJ_FLAGS_PARAMETER_VALUE
+  }
+};
+
+/* Object 0x2000 sub-objects */
+
+static const struct co_ssub g_2000_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO download callback"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x2001 sub-objects */
+
+static const struct co_ssub g_2001_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO upload callback"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RO,
+    .pdo_mapping = 0,
+    .flags = 0
+  }
+};
+
+/* Object 0x2100 sub-objects */
+
+static const struct co_ssub g_2100_sub[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Counter"),
+#endif
+    .subidx = 0x00,
+    .type = CO_DEFTYPE_UNSIGNED32,
+#if !LELY_NO_CO_OBJ_LIMITS
+    .min.u32 = CO_UNSIGNED32_MIN,
+    .max.u32 = CO_UNSIGNED32_MAX,
+#endif
+#if !LELY_NO_CO_OBJ_DEFAULT
+    .def.u32 = CO_UNSIGNED32_MIN,
+#endif
+    .val.u32 = CO_UNSIGNED32_MIN,
+    .access = CO_ACCESS_RW,
+    .pdo_mapping = 1,
+    .flags = 0
+  }
+};
+
+/* Object dictionary */
+
+static const struct co_sobj g_g_sdev_slave_objs[] =
+{
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Device type"),
+#endif
+    .idx = 0x1000,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1000_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Error register"),
+#endif
+    .idx = 0x1001,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1001_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID SYNC message"),
+#endif
+    .idx = 0x1005,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1005_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("COB-ID time stamp object"),
+#endif
+    .idx = 0x1012,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1012_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Producer heartbeat time"),
+#endif
+    .idx = 0x1017,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1017_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Identity object"),
+#endif
+    .idx = 0x1018,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 5,
+    .subs = g_1018_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("TPDO communication parameter"),
+#endif
+    .idx = 0x1800,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 3,
+    .subs = g_1800_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("TPDO mapping parameter"),
+#endif
+    .idx = 0x1a00,
+    .code = CO_OBJECT_RECORD,
+    .nsub = 2,
+    .subs = g_1a00_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("NMT startup"),
+#endif
+    .idx = 0x1f80,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_1f80_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO download callback"),
+#endif
+    .idx = 0x2000,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_2000_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Object with custom SDO upload callback"),
+#endif
+    .idx = 0x2001,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_2001_sub
+  },
+  {
+#if !LELY_NO_CO_OBJ_NAME
+    .name = CO_SDEV_STRING("Counter"),
+#endif
+    .idx = 0x2100,
+    .code = CO_OBJECT_VAR,
+    .nsub = 1,
+    .subs = g_2100_sub
+  }
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct co_sdev g_sdev_slave =
+{
+  .id = 0x02,
+  .name = NULL,
+  .vendor_name = CO_SDEV_STRING("Apache NuttX RTOS"),
+  .vendor_id = 0x00000000,
+  .product_name = NULL,
+  .product_code = 0x00000000,
+  .revision = 0x00000000,
+  .order_code = NULL,
+  .baud = CO_BAUD_125,
+  .rate = 0,
+  .lss = 0,
+  .dummy = 0x000000fe,
+  .nobj = 12,
+  .objs = g_g_sdev_slave_objs
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/examples/lely_slave/slave_main.c b/examples/lely_slave/slave_main.c
new file mode 100644
index 000000000..39cfa8af7
--- /dev/null
+++ b/examples/lely_slave/slave_main.c
@@ -0,0 +1,242 @@
+/****************************************************************************
+ * apps/examples/lely_slave/slave_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <canutils/lely/config.h>
+
+#include <lely/co/dev.h>
+#include <lely/co/nmt.h>
+#include <lely/co/sdev.h>
+#include <lely/co/sdo.h>
+#include <lely/co/time.h>
+
+#include "sdev.h"
+#include "candev.h"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct co_net_s
+{
+  can_net_t *net;
+  co_dev_t  *dev;
+  co_nmt_t  *nmt;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct co_net_s g_net;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: elapsed_ms
+ ****************************************************************************/
+
+static long elapsed_ms(const struct timespec *a, const struct timespec *b)
+{
+  return (a->tv_sec - b->tv_sec) * 1000 +
+         (a->tv_nsec - b->tv_nsec) / 1000000;
+}
+
+/****************************************************************************
+ * Name: on_can_send
+ ****************************************************************************/
+
+static int on_can_send(const struct can_msg *msg, void *data)
+{
+  UNUSED(data);
+
+  return coslave_candev_send(msg);
+}
+
+/****************************************************************************
+ * Name: on_time
+ ****************************************************************************/
+
+static void on_time(co_time_t *time, const struct timespec *tp, void *data)
+{
+  UNUSED(time);
+  UNUSED(data);
+
+  /* Update the wall clock */
+
+  clock_settime(CLOCK_REALTIME, tp);
+}
+
+/****************************************************************************
+ * Name: on_nmt_cs
+ ****************************************************************************/
+
+static void on_nmt_cs(co_nmt_t *nmt, co_unsigned8_t cs, void *data)
+{
+  UNUSED(data);
+
+  switch (cs)
+    {
+      case CO_NMT_CS_START:
+      case CO_NMT_CS_ENTER_PREOP:
+        {
+          co_time_set_ind(co_nmt_get_time(nmt), &on_time, NULL);
+          break;
+        }
+
+      case CO_NMT_CS_RESET_NODE:
+        {
+          exit(0);
+          break;
+        }
+
+      case CO_NMT_CS_STOP:
+      case CO_NMT_CS_RESET_COMM:
+      default:
+        {
+          break;
+        }
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct timespec now;
+  struct timespec t_last;
+  struct can_msg  msg;
+  co_unsigned32_t counter = 0;
+  int             ret;
+
+  memset(&g_net, 0, sizeof(g_net));
+  setvbuf(stdout, NULL, _IONBF, 0);
+
+  ret = coslave_candev_init();
+  if (ret < 0)
+    {
+      printf("ERROR: coslave_candev_init failed %d\n", ret);
+      goto errout;
+    }
+
+  g_net.net = can_net_create();
+  if (!g_net.net)
+    {
+      printf("ERROR: can_net_create failed\n");
+      goto errout;
+    }
+
+  can_net_set_send_func(g_net.net, &on_can_send, NULL);
+
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  can_net_set_time(g_net.net, &now);
+
+  /* Create dev from struct */
+
+  g_net.dev = co_dev_create_from_sdev(&g_sdev_slave);
+  if (!g_net.dev)
+    {
+      printf("ERROR: co_dev_create_from_sdev failed\n");
+      goto errout;
+    }
+
+  g_net.nmt = co_nmt_create(g_net.net, g_net.dev);
+  if (!g_net.nmt)
+    {
+      printf("ERROR: co_nmt_create failed\n");
+      goto errout;
+    }
+
+  /* Start the NMT service by resetting the node */
+
+  co_nmt_cs_ind(g_net.nmt, CO_NMT_CS_RESET_NODE);
+
+  /* Set the NMT indication function after the initial reset */
+
+  co_nmt_set_cs_ind(g_net.nmt, &on_nmt_cs, NULL);
+
+  printf("lely CANopen slave running (node 0x%02x)\n", g_sdev_slave.id);
+
+  clock_gettime(CLOCK_MONOTONIC, &t_last);
+
+  while (1)
+    {
+      clock_gettime(CLOCK_MONOTONIC, &now);
+      can_net_set_time(g_net.net, &now);
+
+      while (coslave_candev_recv(&msg) > 0)
+        {
+          can_net_recv(g_net.net, &msg);
+        }
+
+      /* Update the counter mapped into TPDO1 (0x2100) every 100 ms.
+       * When the master has brought us to OPERATIONAL, the synchronous TPDO
+       * sends the current value on each SYNC.
+       */
+
+      if (elapsed_ms(&now, &t_last) >= 100)
+        {
+          t_last = now;
+          counter++;
+          co_dev_set_val_u32(g_net.dev, 0x2100, 0x00, counter);
+        }
+
+      usleep(1000);
+    }
+
+errout:
+  if (g_net.nmt)
+    {
+      co_nmt_destroy(g_net.nmt);
+    }
+
+  if (g_net.dev)
+    {
+      co_dev_destroy(g_net.dev);
+    }
+
+  if (g_net.net)
+    {
+      can_net_destroy(g_net.net);
+    }
+
+  return 0;
+}

From 64f9e8a4b76880cba545ab2e55447c38c690899b Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Mon, 6 Jul 2026 09:30:13 +0800
Subject: [PATCH 478/568] system: nxinit: bound debug argv dump

Check the service argv array bound before reading the current entry in the debug dump loop. A full argument array may not have an in-array NULL terminator, so the old condition could read one entry past the array while CONFIG_SYSTEM_NXINIT_DEBUG is enabled.

Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 system/nxinit/service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/nxinit/service.c b/system/nxinit/service.c
index 7e840e7e7..8a92bb20b 100644
--- a/system/nxinit/service.c
+++ b/system/nxinit/service.c
@@ -677,7 +677,7 @@ void init_dump_service(FAR struct service_s *s)
 
   init_debug("  pid: %d", s->pid);
   init_debug("  arguments:");
-  for (i = 0; s->argv[i] && i < nitems(s->argv); i++)
+  for (i = 0; i < nitems(s->argv) && s->argv[i]; i++)
     {
       init_debug("      [%d] '%s'", i, s->argv[i]);
     }

From 5971d9c19fa6ccb3386a13ae962f57a809082696 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2026 22:22:25 +0000
Subject: [PATCH 479/568] build(deps): bump docker/login-action from 4.2.0 to
 4.4.0

Bumps [docker/login-action](https://github.com/docker/login-action) from 4.2.0 to 4.4.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/650006c6eb7dba73a995cc03b0b2d7f5ca915bee...af1e73f918a031802d376d3c8bbc3fe56130a9b0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27795bf78..9d0004718 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -163,7 +163,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee  # v4.2.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0  # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -251,7 +251,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee  # v4.2.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0  # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From dd24407c71b4de06a033b6529e3bcb07faa25e7e Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Mon, 6 Jul 2026 17:34:37 -0300
Subject: [PATCH 480/568] examples/lvglterm: add USB HID keyboard input with
 cursor scrolling

Rework the terminal input selection into an explicit three-way Kconfig
choice so the format each keyboard delivers is picked up front:

  - On-screen keyboard (touch) - default, unchanged behaviour.
  - Matrix / upper-half keyboard - reads struct keyboard_event_s events
    (for example the M5Stack Cardputer matrix on /dev/kbd0).
  - USB HID keyboard - reads a byte stream (for example /dev/kbda with
    CONFIG_USBHOST_HIDKBD).

The physical-keyboard variant now polls the device non-blocking from the
LVGL thread (no dedicated task), mirroring the touch variant.  The USB
path decodes the stream with the keyboard codec, so with a driver built
for CONFIG_HIDKBD_ENCODED the Up/Down cursor keys scroll the terminal;
a plain-ASCII stream still works as ordinary key presses.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 examples/lvglterm/CMakeLists.txt |   6 +-
 examples/lvglterm/Kconfig        |  34 +++--
 examples/lvglterm/Makefile       |   2 +-
 examples/lvglterm/lvglterm.c     |   4 +-
 examples/lvglterm/lvglterm_kbd.c | 242 +++++++++++++++++--------------
 5 files changed, 167 insertions(+), 121 deletions(-)

diff --git a/examples/lvglterm/CMakeLists.txt b/examples/lvglterm/CMakeLists.txt
index 22650f82f..c3f84b26e 100644
--- a/examples/lvglterm/CMakeLists.txt
+++ b/examples/lvglterm/CMakeLists.txt
@@ -21,10 +21,10 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_LVGLTERM)
-  if(CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD)
-    set(lvglterm_input lvglterm_kbd.c)
-  else()
+  if(CONFIG_EXAMPLES_LVGLTERM_INPUT_TOUCH)
     set(lvglterm_input lvglterm_touch.c)
+  else()
+    set(lvglterm_input lvglterm_kbd.c)
   endif()
 
   nuttx_add_application(
diff --git a/examples/lvglterm/Kconfig b/examples/lvglterm/Kconfig
index 718af98b6..ca393e845 100644
--- a/examples/lvglterm/Kconfig
+++ b/examples/lvglterm/Kconfig
@@ -17,7 +17,9 @@ choice
 	default EXAMPLES_LVGLTERM_INPUT_TOUCH
 	---help---
 		Select how the terminal receives keystrokes.  Only one input source
-		is built at a time.
+		is built at a time.  The physical-keyboard options differ in the data
+		the keyboard device delivers on read(), so pick the one that matches
+		the hardware.
 
 config EXAMPLES_LVGLTERM_INPUT_TOUCH
 	bool "On-screen keyboard (touch)"
@@ -26,24 +28,36 @@ config EXAMPLES_LVGLTERM_INPUT_TOUCH
 		command line is typed and submitted with Enter.  This is the default
 		and matches the original behaviour.
 
-config EXAMPLES_LVGLTERM_INPUT_KBD
-	bool "Physical keyboard (/dev/kbdN)"
+config EXAMPLES_LVGLTERM_INPUT_KBD_MATRIX
+	bool "Matrix / upper-half keyboard (keyboard events)"
 	depends on INPUT_KEYBOARD
 	---help---
-		Input comes from a physical keyboard registered as a /dev/kbdN
-		device; keystrokes are streamed to the shell and the output fills
-		the whole screen.
+		Physical keyboard registered through the INPUT_KEYBOARD upper half,
+		whose read() returns struct keyboard_event_s events (for example the
+		M5Stack Cardputer matrix keyboard on /dev/kbd0).  Fn Up/Down scroll
+		the terminal.
+
+config EXAMPLES_LVGLTERM_INPUT_KBD_USB
+	bool "USB HID keyboard (byte stream)"
+	depends on USBHOST_HIDKBD
+	select LIBC_KBDCODEC
+	---help---
+		USB HID keyboard (for example on /dev/kbda with CONFIG_USBHOST_HIDKBD).
+		read() returns a byte stream that is decoded with the keyboard codec:
+		normal keys go to the shell and, when the driver is built with
+		CONFIG_HIDKBD_ENCODED, the Up/Down cursor keys scroll the terminal.
 
 endchoice
 
 config EXAMPLES_LVGLTERM_KBD_DEV
 	string "Keyboard device path"
+	default "/dev/kbda" if EXAMPLES_LVGLTERM_INPUT_KBD_USB
 	default "/dev/kbd0"
-	depends on EXAMPLES_LVGLTERM_INPUT_KBD
+	depends on EXAMPLES_LVGLTERM_INPUT_KBD_MATRIX || EXAMPLES_LVGLTERM_INPUT_KBD_USB
 	---help---
-		Keyboard device the terminal reads key events from.  Can also be
-		overridden at run time by passing the path as the first command-line
-		argument (useful when more than one keyboard is present).
+		Keyboard device the terminal reads from.  Can also be overridden at
+		run time by passing the path as the first command-line argument
+		(useful when more than one keyboard is present).
 
 choice
 	prompt "LVGL Terminal font"
diff --git a/examples/lvglterm/Makefile b/examples/lvglterm/Makefile
index 314351f9a..0d4c5d0c2 100644
--- a/examples/lvglterm/Makefile
+++ b/examples/lvglterm/Makefile
@@ -32,7 +32,7 @@ MODULE = $(CONFIG_EXAMPLES_LVGLTERM)
 
 MAINSRC = lvglterm.c
 
-ifeq ($(CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD),y)
+ifneq ($(CONFIG_EXAMPLES_LVGLTERM_INPUT_TOUCH),y)
 CSRCS = lvglterm_kbd.c
 else
 CSRCS = lvglterm_touch.c
diff --git a/examples/lvglterm/lvglterm.c b/examples/lvglterm/lvglterm.c
index 0814e9afe..f2dcb1f10 100644
--- a/examples/lvglterm/lvglterm.c
+++ b/examples/lvglterm/lvglterm.c
@@ -304,7 +304,7 @@ static int create_terminal(int argc, FAR char *argv[])
   if (pipe(g_nsh_stdin) < 0 || pipe(g_nsh_stdout) < 0 ||
       pipe(g_nsh_stderr) < 0)
     {
-      _err("pipe failed: %d\n", errno);
+      fprintf(stderr, "pipe failed: %d\n", errno);
       return ERROR;
     }
 
@@ -324,7 +324,7 @@ static int create_terminal(int argc, FAR char *argv[])
   if (ret < 0)
     {
       int errcode = errno;
-      _err("posix_spawn failed: %d\n", errcode);
+      fprintf(stderr, "posix_spawn failed: %d\n", errcode);
       return -errcode;
     }
 
diff --git a/examples/lvglterm/lvglterm_kbd.c b/examples/lvglterm/lvglterm_kbd.c
index 4c18aed7d..08ae83612 100644
--- a/examples/lvglterm/lvglterm_kbd.c
+++ b/examples/lvglterm/lvglterm_kbd.c
@@ -20,11 +20,21 @@
  *
  ****************************************************************************/
 
-/* Physical-keyboard input variant of the LVGL terminal: a task reads key
- * events from a /dev/kbdN keyboard device and streams them to NSH; the shell
- * output fills the whole screen.  Works on any board with a keyboard driver;
- * the device defaults to CONFIG_EXAMPLES_LVGLTERM_KBD_DEV and can be
- * overridden by the first command-line argument.
+/* Physical-keyboard input variant of the LVGL terminal: the keyboard device
+ * is polled (non-blocking) from the LVGL thread and key presses are streamed
+ * to NSH; the shell output fills the whole screen.  Works on any board with
+ * a keyboard driver; the device defaults to CONFIG_EXAMPLES_LVGLTERM_KBD_DEV
+ * and can be overridden by the first command-line argument.
+ *
+ * Two device flavours are supported, selected at build time:
+ *
+ *   - Upper-half keyboards (INPUT_KEYBOARD, e.g. the M5Stack Cardputer
+ *     matrix on /dev/kbd0) deliver struct keyboard_event_s events; the Fn
+ *     Up/Down keys are handled locally as scroll requests.
+ *   - USB HID keyboards (EXAMPLES_LVGLTERM_INPUT_KBD_USB, e.g. /dev/kbda)
+ *     deliver a byte stream decoded with the NuttX keyboard codec: normal
+ *     keys are forwarded to the shell and, when the driver is built with
+ *     CONFIG_HIDKBD_ENCODED, the Up/Down cursor keys scroll the terminal.
  */
 
 /****************************************************************************
@@ -34,13 +44,20 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <stdint.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sched.h>
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/input/keyboard.h>
+#ifdef CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD_MATRIX
+#  include <nuttx/input/keyboard.h>
+#endif
+
+#ifdef CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD_USB
+#  include <nuttx/streams.h>
+#  include <nuttx/input/kbd_codec.h>
+#endif
 
 #include <lvgl/lvgl.h>
 
@@ -67,8 +84,7 @@
  * Private Data
  ****************************************************************************/
 
-static int g_echo[2];              /* Keyboard task -> screen (local echo) */
-static volatile int g_scroll;      /* Pending scroll (lines), applied by LVGL */
+static int g_kfd = -1;             /* Keyboard device fd (opened O_NONBLOCK) */
 static FAR const char *g_kbddev;   /* Keyboard device path (/dev/kbdN) */
 
 /****************************************************************************
@@ -76,87 +92,46 @@ static FAR const char *g_kbddev;   /* Keyboard device path (/dev/kbdN) */
  ****************************************************************************/
 
 /****************************************************************************
- * Name: kbd_task
+ * Name: feed_char
  *
  * Description:
- *   Read key presses from the keyboard device and forward them to NSH stdin
- *   (and to the echo pipe so the user sees what is typed).  The Fn Up/Down
- *   keys are handled locally as scroll requests.
+ *   Forward one character to NSH stdin and, for printable characters and
+ *   newline, echo it on screen.  Control keys such as backspace are echoed
+ *   by the shell's own line editor (via its stdout) to avoid handling them
+ *   twice.  Carriage return is normalised to newline.  Runs in the LVGL
+ *   thread, so it may touch the LVGL widgets directly.
  *
  ****************************************************************************/
 
-static int kbd_task(int argc, FAR char *argv[])
+static void feed_char(char ch)
 {
-  struct keyboard_event_s evt;
-  ssize_t nread;
-  int  kfd;
-  char ch;
-
-  kfd = open(g_kbddev, O_RDONLY);
-  if (kfd < 0)
+  if (ch == '\r')
     {
-      gerr("ERROR: open %s failed: %d\n", g_kbddev, errno);
-      return EXIT_FAILURE;
+      ch = '\n';
     }
 
-  for (; ; )
+  write(g_nsh_stdin[WRITE_PIPE], &ch, 1);
+
+  if (ch == '\n' || ((uint8_t)ch >= 0x20 && (uint8_t)ch < 0x7f))
     {
-      nread = read(kfd, &evt, sizeof(evt));
-      if (nread != (ssize_t)sizeof(evt))
-        {
-          if (nread <= 0)
-            {
-              usleep(10000);
-            }
-
-          continue;
-        }
-
-      if (evt.type != KEYBOARD_PRESS)
-        {
-          continue;
-        }
-
-      /* Fn navigation keys are handled locally: Up/Down scroll the terminal
-       * (applied by the LVGL thread) and are not sent to the shell.
-       * Left/Right are reserved and simply swallowed for now.
-       */
-
-      if (evt.code >= KEY_UP && evt.code <= KEY_RIGHT)
-        {
-          if (evt.code == KEY_UP)
-            {
-              g_scroll -= 1;
-            }
-          else if (evt.code == KEY_DOWN)
-            {
-              g_scroll += 1;
-            }
-
-          continue;
-        }
-
-      ch = (char)evt.code;
-      if (ch == '\r')
-        {
-          ch = '\n';
-        }
-
-      /* Always feed the shell.  Echo only printable characters and newline
-       * locally; control keys such as backspace are echoed by the shell's
-       * own line editor (via its stdout) to avoid handling them twice.
-       */
-
-      write(g_nsh_stdin[WRITE_PIPE], &ch, 1);
-
-      if (ch == '\n' || ((uint8_t)ch >= 0x20 && (uint8_t)ch < 0x7f))
-        {
-          write(g_echo[WRITE_PIPE], &ch, 1);
-        }
+      lvglterm_add_output(&ch, 1);
     }
+}
 
-  close(kfd);
-  return EXIT_SUCCESS;
+/****************************************************************************
+ * Name: scroll_terminal
+ *
+ * Description:
+ *   Scroll the output text area up (older output) or down by one step.  Runs
+ *   in the LVGL thread.
+ *
+ ****************************************************************************/
+
+static void scroll_terminal(bool up)
+{
+  int32_t dy = up ? SCROLL_STEP : -SCROLL_STEP;
+
+  lv_obj_scroll_by(g_output, 0, dy, LV_ANIM_OFF);
 }
 
 /****************************************************************************
@@ -168,7 +143,8 @@ static int kbd_task(int argc, FAR char *argv[])
  *
  * Description:
  *   Resolve the keyboard device (first command-line argument, else the
- *   configured default) and start the task that streams key presses to NSH.
+ *   configured default) and open it non-blocking so that it can be polled
+ *   from the LVGL thread.
  *
  ****************************************************************************/
 
@@ -176,53 +152,109 @@ void lvglterm_input_create(int argc, FAR char *argv[])
 {
   g_kbddev = (argc > 1) ? argv[1] : CONFIG_EXAMPLES_LVGLTERM_KBD_DEV;
 
-  if (pipe(g_echo) < 0)
+  g_kfd = open(g_kbddev, O_RDONLY | O_NONBLOCK);
+  if (g_kfd < 0)
     {
-      gerr("ERROR: echo pipe failed: %d\n", errno);
-      return;
+      gerr("ERROR: open %s failed: %d\n", g_kbddev, errno);
     }
-
-  /* The read end is polled by the LVGL timer and must not block */
-
-  fcntl(g_echo[READ_PIPE], F_SETFL,
-        fcntl(g_echo[READ_PIPE], F_GETFL) | O_NONBLOCK);
-
-  task_create("lvgltermkbd", SCHED_PRIORITY_DEFAULT, 2048, kbd_task, NULL);
 }
 
 /****************************************************************************
  * Name: lvglterm_input_poll
  *
  * Description:
- *   Apply any pending scroll and drain the local echo pipe onto the screen.
- *   Runs in the LVGL thread.
+ *   Drain any pending key presses from the keyboard device and forward them
+ *   to NSH (echoing what is typed on screen).  Runs in the LVGL thread from
+ *   the terminal's periodic timer, so the read must not block.
  *
  ****************************************************************************/
 
 void lvglterm_input_poll(void)
 {
-  char buf[64];
-  int  n;
-  int  s;
+  if (g_kfd < 0)
+    {
+      return;
+    }
 
-  /* Apply any pending scroll requested by the keyboard task (Up/Down).
-   * A negative value scrolls up (towards older output), positive scrolls
-   * down.  Consume only what we read so concurrent keypresses are not lost.
+#ifdef CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD_USB
+  /* USB HID keyboard: read() returns a byte stream that is decoded with the
+   * keyboard codec.  Normal keys are fed to the shell; the Up/Down cursor
+   * keys (only emitted when the driver is built with CONFIG_HIDKBD_ENCODED)
+   * scroll the terminal.  On a plain-ASCII stream every byte simply decodes
+   * to a normal key press, so this also works without encoding.
    */
 
-  s = g_scroll;
-  if (s != 0)
+  struct lib_meminstream_s stream;
+  struct kbd_getstate_s state;
+  char buf[64];
+  ssize_t nread;
+  uint8_t ch;
+  int ret;
+
+  nread = read(g_kfd, buf, sizeof(buf));
+  if (nread <= 0)
     {
-      g_scroll -= s;
-      lv_obj_scroll_by(g_output, 0, -s * SCROLL_STEP, LV_ANIM_OFF);
+      return;
     }
 
-  if (lvglterm_has_input(g_echo[READ_PIPE]))
+  memset(&state, 0, sizeof(state));
+  lib_meminstream(&stream, buf, nread);
+
+  for (; ; )
     {
-      n = read(g_echo[READ_PIPE], buf, sizeof(buf));
-      if (n > 0)
+      ret = kbd_decode((FAR struct lib_instream_s *)&stream, &state, &ch);
+      if (ret == KBD_ERROR)
         {
-          lvglterm_add_output(buf, n);
+          break;
+        }
+
+      if (ret == KBD_PRESS)
+        {
+          feed_char((char)ch);
+        }
+      else if (ret == KBD_SPECPRESS)
+        {
+          if (ch == KEYCODE_UP)
+            {
+              scroll_terminal(true);
+            }
+          else if (ch == KEYCODE_DOWN)
+            {
+              scroll_terminal(false);
+            }
         }
     }
+#else
+  /* Upper-half keyboard: read() returns keyboard_event_s events */
+
+  struct keyboard_event_s evt;
+
+  while (read(g_kfd, &evt, sizeof(evt)) == (ssize_t)sizeof(evt))
+    {
+      if (evt.type != KEYBOARD_PRESS)
+        {
+          continue;
+        }
+
+      /* Fn navigation keys are handled locally: Up/Down scroll the terminal;
+       * Left/Right are reserved and simply swallowed for now.
+       */
+
+      if (evt.code >= KEY_UP && evt.code <= KEY_RIGHT)
+        {
+          if (evt.code == KEY_UP)
+            {
+              scroll_terminal(true);
+            }
+          else if (evt.code == KEY_DOWN)
+            {
+              scroll_terminal(false);
+            }
+
+          continue;
+        }
+
+      feed_char((char)evt.code);
+    }
+#endif
 }

From 3f04a28cbd6c268e7574ca867e5e87a1e07de558 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 7 Jul 2026 15:59:34 -0400
Subject: [PATCH 481/568] games/NXDoom: Add LIBC_LOCALE dependency

The locale functions of libc are necessary for some parts of NXDoom.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games/NXDoom/Kconfig b/games/NXDoom/Kconfig
index a30b6d8e6..cbf47a97a 100644
--- a/games/NXDoom/Kconfig
+++ b/games/NXDoom/Kconfig
@@ -9,6 +9,7 @@ config GAMES_NXDOOM
 	depends on ALLOW_GPL_COMPONENTS
 	depends on VIDEO_FB
 	depends on CRYPTO
+	depends on LIBC_LOCALE
 	---help---
 		Play DOOM on NuttX!
 

From 26c5dd83052a18b415e351bae810b19f73a7f4c2 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 7 Jul 2026 16:00:05 -0400
Subject: [PATCH 482/568] games/NXDoom: Use dirent for glob implementation

NuttX has dirent, so the glob implementation can be used. This removes
the warning for no native glob implementation.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/src/i_glob.c | 40 +++------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/games/NXDoom/src/i_glob.c b/games/NXDoom/src/i_glob.c
index 6f2df49e0..c60158937 100644
--- a/games/NXDoom/src/i_glob.c
+++ b/games/NXDoom/src/i_glob.c
@@ -33,15 +33,10 @@
 #include "i_glob.h"
 #include "m_misc.h"
 
-#if defined(HAVE_DIRENT_H)
+#include <dirent.h>
+
 #include <dirent.h>
 #include <sys/stat.h>
-#elif defined(__WATCOMC__)
-/* Watcom has the same API in a different header. */
-#include <direct.h>
-#else
-#define NO_DIRENT_IMPLEMENTATION
-#endif
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -72,8 +67,6 @@ struct glob_s
  * Private Functions
  ****************************************************************************/
 
-#ifndef NO_DIRENT_IMPLEMENTATION
-
 /* Only the fields d_name and (as an XSI extension) d_ino are specified
  * in POSIX.1.  Other than Linux, the d_type field is available mainly
  * only on BSD systems.  The remaining fields are available on many, but
@@ -95,7 +88,7 @@ static boolean is_directory(char *dir, struct dirent *de)
       int result;
 
       filename = m_string_join(dir, DIR_SEPARATOR_S, de->d_name, NULL);
-      result = m_stat(filename, &sb);
+      result = stat(filename, &sb);
       free(filename);
 
       if (result != 0)
@@ -402,30 +395,3 @@ const char *i_next_glob(glob_t *glob)
   ++glob->next_index;
   return result;
 }
-
-#else /* #ifdef NO_DIRENT_IMPLEMENTATION */
-
-#warning "No native implementation of file globbing."
-
-glob_t *i_start_glob(const char *directory, const char *glob, int flags)
-{
-  return NULL;
-}
-
-void i_end_glob(glob_t *glob)
-{
-  return;
-}
-
-const char *i_next_glob(glob_t *glob)
-{
-  return "";
-}
-
-glob_t *i_start_multi_glob(const char *directory, int flags,
-        const char *glob, ...)
-{
-  return NULL;
-}
-
-#endif /* NO_DIRENT_IMPLEMENTATION */

From dd109a88dee42fe47378572dc2a906ce53117400 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Tue, 7 Jul 2026 09:57:15 +0200
Subject: [PATCH 483/568] inertial/madgwick: add CMake build support

add CMake build support for madgwick and update inertial/madgwick/.gitignore

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 CMakeLists.txt                   |  1 +
 inertial/CMakeLists.txt          |  4 ++-
 inertial/madgwick/.gitignore     |  2 ++
 inertial/madgwick/CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 inertial/madgwick/.gitignore
 create mode 100644 inertial/madgwick/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ebffdd94..55110defb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ add_subdirectory(fsutils)
 add_subdirectory(games)
 add_subdirectory(graphics)
 add_subdirectory(industry)
+add_subdirectory(inertial)
 add_subdirectory(interpreters)
 add_subdirectory(logging)
 add_subdirectory(lte)
diff --git a/inertial/CMakeLists.txt b/inertial/CMakeLists.txt
index 66cfc9e27..e3324c5cc 100644
--- a/inertial/CMakeLists.txt
+++ b/inertial/CMakeLists.txt
@@ -1,7 +1,7 @@
 # ##############################################################################
 # apps/inertial/CMakeLists.txt
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
@@ -20,4 +20,6 @@
 #
 # ##############################################################################
 
+nuttx_add_subdirectory()
+
 nuttx_generate_kconfig(MENUDESC "Inertial Libraries Support")
diff --git a/inertial/madgwick/.gitignore b/inertial/madgwick/.gitignore
new file mode 100644
index 000000000..53b249722
--- /dev/null
+++ b/inertial/madgwick/.gitignore
@@ -0,0 +1,2 @@
+/fusion
+/libmadgwick.tar.gz
diff --git a/inertial/madgwick/CMakeLists.txt b/inertial/madgwick/CMakeLists.txt
new file mode 100644
index 000000000..df20b7129
--- /dev/null
+++ b/inertial/madgwick/CMakeLists.txt
@@ -0,0 +1,58 @@
+# ##############################################################################
+# apps/inertial/madgwick/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_LIB_MADGWICK)
+
+  set(MADGWICK_DIR ${CMAKE_CURRENT_LIST_DIR}/fusion)
+
+  if(NOT EXISTS ${MADGWICK_DIR})
+    FetchContent_Declare(
+      madgwick_fetch
+      DOWNLOAD_NAME "libmadgwick.tar.gz"
+      DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
+      URL "https://github.com/xioTechnologies/Fusion/archive/refs/tags/v${CONFIG_LIB_MADGWICK_VER}.tar.gz"
+          SOURCE_DIR
+          ${MADGWICK_DIR}
+          BINARY_DIR
+          ${CMAKE_BINARY_DIR}/apps/inertial/madgwick/fusion
+      DOWNLOAD_NO_PROGRESS true
+      TIMEOUT 30)
+
+    FetchContent_GetProperties(madgwick_fetch)
+
+    if(NOT madgwick_fetch_POPULATED)
+      FetchContent_Populate(madgwick_fetch)
+    endif()
+  endif()
+
+  set(CSRCS
+      ${MADGWICK_DIR}/Fusion/FusionAhrs.c
+      ${MADGWICK_DIR}/Fusion/FusionCompass.c
+      ${MADGWICK_DIR}/Fusion/FusionOffset.c)
+
+  nuttx_add_library(madgwick STATIC)
+  target_sources(madgwick PRIVATE ${CSRCS})
+  target_include_directories(madgwick PUBLIC ${MADGWICK_DIR})
+  target_compile_options(madgwick PRIVATE -Wno-shadow -Wno-strict-prototypes
+                                          -Wno-unknown-pragmas)
+
+endif()

From cb7097a4e7f63f155ac09261dfd6d87a3cc7068e Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Wed, 8 Jul 2026 15:39:45 +0200
Subject: [PATCH 484/568] interial: fix SPDX License Identifier

licence is Apache-2.0, not BSD

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 inertial/Make.defs          | 2 +-
 inertial/Makefile           | 2 +-
 inertial/madgwick/Make.defs | 2 +-
 inertial/madgwick/Makefile  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inertial/Make.defs b/inertial/Make.defs
index d19af3397..d5c8f4ca5 100644
--- a/inertial/Make.defs
+++ b/inertial/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # apps/inertial/Make.defs
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/inertial/Makefile b/inertial/Makefile
index e12c1d623..1d48a1ae3 100644
--- a/inertial/Makefile
+++ b/inertial/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # apps/inertial/Makefile
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/inertial/madgwick/Make.defs b/inertial/madgwick/Make.defs
index e16d25d84..bb48895dc 100644
--- a/inertial/madgwick/Make.defs
+++ b/inertial/madgwick/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # apps/inertial/madgwick/Make.defs
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/inertial/madgwick/Makefile b/inertial/madgwick/Makefile
index 38dac5227..909d67b97 100644
--- a/inertial/madgwick/Makefile
+++ b/inertial/madgwick/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # apps/inertial/madgwick/Makefile
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

From 81accb08324485a0cc529a3777d2c2a099fe70fd Mon Sep 17 00:00:00 2001
From: hanzhijian <hanzhijian@zepp.com>
Date: Mon, 6 Jul 2026 10:11:19 +0800
Subject: [PATCH 485/568] apps: fix distclean for partial builds and residual
 .kconfig files

The current distclean implementation has two issues:

1. Application.mk does not remove .kconfig on distclean, so stale
   config fragments from earlier builds can pollute subsequent ones.

2. Several external-library Makefiles (lame, libshvc, libulut) run
   "make -C <subdir> distclean" without checking whether the
   subdirectory exists.  When the library was never downloaded (common
   in CI partial-build environments), distclean fails with "No such
   file or directory".

Fix:

- Application.mk: add $(call DELFILE, .kconfig) to the distclean
  target so that .kconfig is cleaned along with .built, .depend, etc.

- audioutils/lame/Makefile: guard the distclean recipe with
  "if [ -d $(DST_PATH) ]; then ...; fi" and use $(MAKE) instead
  of bare make.

- netutils/libshvc/Makefile, netutils/libulut/Makefile: same
  directory-existence guard for their distclean recipes.

- crypto/wolfssl/Makefile: change "distclean:" to "distclean::"
  (double-colon) so it does not override the distclean:: rule
  inherited from Application.mk.

Signed-off-by: hanzhijian <hanzhijian@zepp.com>
---
 Application.mk            | 1 +
 audioutils/lame/Makefile  | 2 +-
 crypto/wolfssl/Makefile   | 2 +-
 netutils/libshvc/Makefile | 2 +-
 netutils/libulut/Makefile | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Application.mk b/Application.mk
index e99300644..1b6eab63e 100644
--- a/Application.mk
+++ b/Application.mk
@@ -393,6 +393,7 @@ clean::
 	$(call CLEANAROBJS)
 	$(call CLEAN)
 distclean:: clean
+	$(call DELFILE, .kconfig)
 	$(call DELFILE, Make.dep)
 	$(call DELFILE, .depend)
 
diff --git a/audioutils/lame/Makefile b/audioutils/lame/Makefile
index 99526d63b..ccbe4cf21 100644
--- a/audioutils/lame/Makefile
+++ b/audioutils/lame/Makefile
@@ -102,6 +102,6 @@ ifneq ($(PREFIX),)
 endif
 
 distclean::
-	$(Q)cd $(DST_PATH) && make distclean
+	$(Q)if [ -d $(DST_PATH) ]; then cd $(DST_PATH) && $(MAKE) distclean; fi
 
 include $(APPDIR)/Application.mk
diff --git a/crypto/wolfssl/Makefile b/crypto/wolfssl/Makefile
index 77bc546a5..90b0f6390 100644
--- a/crypto/wolfssl/Makefile
+++ b/crypto/wolfssl/Makefile
@@ -168,7 +168,7 @@ distclean::
 	$(call DELDIR, $(WOLFSSL_UNPACKNAME))
 	$(call DELDIR, $(WOLFSSL_EXAMPLESNAME))
 else
-distclean:
+distclean::
 	$(call DELDIR, $(WOLFSSL_UNPACKNAME))
 endif
 
diff --git a/netutils/libshvc/Makefile b/netutils/libshvc/Makefile
index 3db2a49cb..af2669c88 100644
--- a/netutils/libshvc/Makefile
+++ b/netutils/libshvc/Makefile
@@ -82,7 +82,7 @@ ifeq ($(wildcard $(SHVDIR)/.git),)
 $(eval $(call RUN_OMK_MAKE, context, default-config include-pass))
 
 distclean::
-	make -C $(SHVDIR) distclean
+	if [ -d $(SHVDIR) ]; then make -C $(SHVDIR) distclean; fi
 	$(call DELDIR, $(SHVDIR))
 	$(call DELFILE, $(SHV_LIBS4C_TARGZ))
 endif
diff --git a/netutils/libulut/Makefile b/netutils/libulut/Makefile
index d3bdb498f..6582158f2 100644
--- a/netutils/libulut/Makefile
+++ b/netutils/libulut/Makefile
@@ -82,7 +82,7 @@ ifeq ($(wildcard $(ULUTDIR)/.git),)
 $(eval $(call RUN_OMK_MAKE, context, default-config include-pass))
 
 distclean::
-	make -C $(ULUTDIR) distclean
+	if [ -d $(ULUTDIR) ]; then make -C $(ULUTDIR) distclean; fi
 	$(call DELDIR, $(ULUTDIR))
 	$(call DELFILE, $(ULUT_TARGZ))
 endif

From 3dc9bd4598ffb48e1c0b2e06374a95f0e321b8ba Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 00:28:45 +0800
Subject: [PATCH 486/568] README: Fix application directory wording.

Fix two wording issues in the apps README.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dc179d7c9..204931977 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ NuttX directory. Like:
 
 If all of the above conditions are TRUE, then NuttX will be able to find the
 application directory. If your application directory has a different name or is
-location at a different position, then you will have to inform the NuttX build
+located at a different position, then you will have to inform the NuttX build
 system of that location. There are several ways to do that:
 
 1) You can define `CONFIG_APPS_DIR` to be the full path to your application
@@ -140,7 +140,7 @@ project. One must:
     main()
     ```
 
- 4. Set the requirements in the file: `Makefile`, specially the lines:
+ 4. Set the requirements in the file: `Makefile`, specifically the lines:
 
     ```makefile
     PROGNAME   = progname

From 50ffee7a85659a14ff6367191d560395beeae4ad Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 04:23:04 +0800
Subject: [PATCH 487/568] examples: Fix network echo receive terminators

The netloop and poll TCP echo examples receive up to IOBUFFER_SIZE bytes and then append a NUL terminator before logging the data. A full-size receive can therefore write one byte past the input buffer.

Reserve one extra byte in the buffers that are terminated after recv(). Keep the receive limit and echo length capped at IOBUFFER_SIZE so the data path is unchanged.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 examples/netloop/lo_listener.c | 2 +-
 examples/netloop/lo_main.c     | 2 +-
 examples/poll/host.c           | 2 +-
 examples/poll/net_listener.c   | 2 +-
 examples/poll/net_reader.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/netloop/lo_listener.c b/examples/netloop/lo_listener.c
index 20f72ad9c..57362cec8 100644
--- a/examples/netloop/lo_listener.c
+++ b/examples/netloop/lo_listener.c
@@ -64,7 +64,7 @@ struct net_listener_s
   struct sockaddr_in addr;
   fd_set          master;
   fd_set          working;
-  char            buffer[IOBUFFER_SIZE];
+  char            buffer[IOBUFFER_SIZE + 1];
   int             listensd;
   int             mxsd;
 };
diff --git a/examples/netloop/lo_main.c b/examples/netloop/lo_main.c
index 513278b08..3c6a0c72f 100644
--- a/examples/netloop/lo_main.c
+++ b/examples/netloop/lo_main.c
@@ -63,7 +63,7 @@ static int lo_client(void)
 {
   struct sockaddr_in myaddr;
   char outbuf[IOBUFFER_SIZE];
-  char inbuf[IOBUFFER_SIZE];
+  char inbuf[IOBUFFER_SIZE + 1];
   int sockfd;
   int len;
   int nbytessent;
diff --git a/examples/poll/host.c b/examples/poll/host.c
index 740bccb22..8d42dd997 100644
--- a/examples/poll/host.c
+++ b/examples/poll/host.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv, char **envp)
 {
   struct sockaddr_in myaddr;
   char outbuf[IOBUFFER_SIZE];
-  char inbuf[IOBUFFER_SIZE];
+  char inbuf[IOBUFFER_SIZE + 1];
   int sockfd;
   int len;
   int nbytessent;
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index e20306d6c..3c72e16e3 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -64,7 +64,7 @@ struct net_listener_s
   struct sockaddr_in addr;
   fd_set          master;
   fd_set          working;
-  char            buffer[IOBUFFER_SIZE];
+  char            buffer[IOBUFFER_SIZE + 1];
   int             listensd;
   int             mxsd;
 };
diff --git a/examples/poll/net_reader.c b/examples/poll/net_reader.c
index 288179763..191f39875 100644
--- a/examples/poll/net_reader.c
+++ b/examples/poll/net_reader.c
@@ -121,7 +121,7 @@ static void net_configure(void)
 static void net_receive(int sd)
 {
   struct timeval timeout;
-  char buffer[IOBUFFER_SIZE];
+  char buffer[IOBUFFER_SIZE + 1];
   char *ptr;
   fd_set readset;
   int nbytes;

From 662133eeca511f00d4051d79070192e8bb4f7a3c Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 04:32:20 +0800
Subject: [PATCH 488/568] testing: nettest: Fix TCP server terminator bounds

The TCP nettest server receives up to TEST_BUFFER_SIZE bytes and then appends a NUL terminator before checking for the exit command. A full-size receive can therefore write one byte past the receive buffer.

Reserve one extra byte for the terminator while keeping the recv() limit and echo length capped at TEST_BUFFER_SIZE.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 testing/nettest/utils/nettest_tcpserver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/nettest/utils/nettest_tcpserver.c b/testing/nettest/utils/nettest_tcpserver.c
index a11f41d92..85c4a458a 100644
--- a/testing/nettest/utils/nettest_tcpserver.c
+++ b/testing/nettest/utils/nettest_tcpserver.c
@@ -47,7 +47,7 @@ struct nettest_listener_s
 {
   fd_set master;
   fd_set working;
-  char   buffer[TEST_BUFFER_SIZE];
+  char   buffer[TEST_BUFFER_SIZE + 1];
   int    listensdv4;
   int    listensdv6;
   int    mxsd;

From 54905cd0ffcce1a9f0416b5a8cb98c5f55d7538c Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 05:34:20 +0800
Subject: [PATCH 489/568] examples: xmlrpc: bound header value copy

xmlrpc_handler() stores HTTP header values in a CONFIG_XMLRPC_STRINGSIZE + 1 byte buffer, but it passed CONFIG_EXAMPLES_XMLRPC_BUFFERSIZE to xmlrpc_getheader(). With the defaults, that allows a 1024 byte copy into a 65 byte destination.

Make xmlrpc_getheader() treat size as the destination capacity, reserve one byte for the terminator, and pass sizeof(value) from the caller.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 examples/xmlrpc/xmlrpc_main.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c
index 0d90626e5..f170d7fc5 100644
--- a/examples/xmlrpc/xmlrpc_main.c
+++ b/examples/xmlrpc/xmlrpc_main.c
@@ -134,6 +134,11 @@ static int xmlrpc_getheader(FAR char *buffer, FAR char *header,
   FAR char *temp;
   int i = 0;
 
+  if (size <= 0)
+    {
+      return -1;
+    }
+
   temp = strstr(buffer, header);
   if (temp)
     {
@@ -150,7 +155,7 @@ static int xmlrpc_getheader(FAR char *buffer, FAR char *header,
 
       /* Copy the rest to the value parameter */
 
-      while ((*temp != ' ') && (*temp != '\n') && (i < size))
+      while ((*temp != ' ') && (*temp != '\n') && (i < size - 1))
         {
           value[i++] = *temp++;
         }
@@ -213,7 +218,7 @@ static void xmlrpc_handler(int fd)
                   buffer[max] = 0;
 
                   ret = xmlrpc_getheader(buffer, "Content-Length:", value,
-                                         CONFIG_EXAMPLES_XMLRPC_BUFFERSIZE);
+                                         sizeof(value));
                   if (ret > 0)
                     loadlen = atoi(value);
                 }

From 5226be524c6fcfab97f0c2c65ac3a1b4fee3a7c5 Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 03:51:57 +0800
Subject: [PATCH 490/568] system/vncviewer: Drain truncated desktop names

The RFB ServerInit message carries the desktop name as a length-prefixed field. vncviewer caps the copied name to fit conn->name, but it must still consume the remaining bytes from the socket when the advertised name is longer than the local buffer.

Drain the unused suffix so the next RFB message is read from the correct boundary. Reuse the same discard helper for other skipped RFB payloads.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 system/vncviewer/rfb_protocol.c | 81 +++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/system/vncviewer/rfb_protocol.c b/system/vncviewer/rfb_protocol.c
index ef324af83..e2d384b49 100644
--- a/system/vncviewer/rfb_protocol.c
+++ b/system/vncviewer/rfb_protocol.c
@@ -410,6 +410,36 @@ static int rfb_recv_exact(int sockfd, void *buf, size_t len)
   return OK;
 }
 
+/****************************************************************************
+ * Name: rfb_discard_exact
+ *
+ * Description:
+ *   Receive and discard exactly 'len' bytes from socket.
+ *
+ ****************************************************************************/
+
+static int rfb_discard_exact(int sockfd, size_t len)
+{
+  uint8_t buf[256];
+  size_t chunk;
+  int ret;
+
+  while (len > 0)
+    {
+      chunk = len > sizeof(buf) ? sizeof(buf) : len;
+
+      ret = rfb_recv_exact(sockfd, buf, chunk);
+      if (ret < 0)
+        {
+          return ret;
+        }
+
+      len -= chunk;
+    }
+
+  return OK;
+}
+
 /****************************************************************************
  * Name: rfb_send_exact
  *
@@ -621,6 +651,7 @@ static int rfb_client_init(int sockfd, struct rfb_conn_s *conn)
   uint8_t shared = 1;  /* shared session */
   uint8_t buf[24];
   uint32_t name_len;
+  uint32_t copy_len;
   int ret;
 
   /* Send ClientInit */
@@ -645,21 +676,31 @@ static int rfb_client_init(int sockfd, struct rfb_conn_s *conn)
   /* bytes 4..19 = server pixel format (we'll override it) */
 
   name_len = ntohl(*(uint32_t *)&buf[20]);
-  if (name_len > sizeof(conn->name) - 1)
+  copy_len = name_len;
+  if (copy_len > sizeof(conn->name) - 1)
     {
-      name_len = sizeof(conn->name) - 1;
+      copy_len = sizeof(conn->name) - 1;
     }
 
-  if (name_len > 0)
+  if (copy_len > 0)
     {
-      ret = rfb_recv_exact(sockfd, conn->name, name_len);
+      ret = rfb_recv_exact(sockfd, conn->name, copy_len);
       if (ret < 0)
         {
           return ret;
         }
     }
 
-  conn->name[name_len] = '\0';
+  conn->name[copy_len] = '\0';
+
+  if (name_len > copy_len)
+    {
+      ret = rfb_discard_exact(sockfd, name_len - copy_len);
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
 
   printf("vncviewer: server desktop: \"%s\" %ux%u\n",
          conn->name, conn->fb_width, conn->fb_height);
@@ -987,19 +1028,10 @@ int rfb_recv_update(struct rfb_conn_s *conn, rfb_rect_cb_t rect_cb,
 
           /* Skip color entries: num_colors * 6 bytes (R+G+B each 2B) */
 
-          uint32_t skip = num_colors * 6;
-          uint8_t tmp[256];
-
-          while (skip > 0)
+          ret = rfb_discard_exact(conn->sockfd, (uint32_t)num_colors * 6);
+          if (ret < 0)
             {
-              uint32_t chunk = skip > sizeof(tmp) ? sizeof(tmp) : skip;
-              ret = rfb_recv_exact(conn->sockfd, tmp, chunk);
-              if (ret < 0)
-                {
-                  return ret;
-                }
-
-              skip -= chunk;
+              return ret;
             }
         }
         break;
@@ -1025,19 +1057,10 @@ int rfb_recv_update(struct rfb_conn_s *conn, rfb_rect_cb_t rect_cb,
 
           /* Skip text content */
 
-          uint8_t tmp[256];
-
-          while (text_len > 0)
+          ret = rfb_discard_exact(conn->sockfd, text_len);
+          if (ret < 0)
             {
-              uint32_t chunk = text_len > sizeof(tmp)
-                               ? sizeof(tmp) : text_len;
-              ret = rfb_recv_exact(conn->sockfd, tmp, chunk);
-              if (ret < 0)
-                {
-                  return ret;
-                }
-
-              text_len -= chunk;
+              return ret;
             }
         }
         break;

From 13f04f65b1bf444729c9a000846c176fdcdc4280 Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 04:01:21 +0800
Subject: [PATCH 491/568] examples: nrf24l01_btle: Fix RX terminator bounds

nrf24_read() reads up to the nRF24L01 maximum payload length and then appends a NUL terminator for the receive buffer. A full 32-byte payload can therefore write one byte past the local rbuf[32].

Reserve one extra byte for the terminator while keeping the read length capped at NRF24L01_MAX_PAYLOAD_LEN. Dump the number of bytes actually received in the debug path.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 examples/nrf24l01_btle/nrf24l01_btle.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/nrf24l01_btle/nrf24l01_btle.c b/examples/nrf24l01_btle/nrf24l01_btle.c
index 6e1490f45..d7f24ab3c 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.c
+++ b/examples/nrf24l01_btle/nrf24l01_btle.c
@@ -484,9 +484,9 @@ int nrf24_read(int wl_fd)
 {
   int ret;
   uint32_t pipeno;
-  uint8_t rbuf[32];
+  uint8_t rbuf[NRF24L01_MAX_PAYLOAD_LEN + 1];
 
-  ret = read(wl_fd, rbuf, sizeof(rbuf));
+  ret = read(wl_fd, rbuf, NRF24L01_MAX_PAYLOAD_LEN);
   if (ret < 0)
     {
       perror("Error reading packet\n");
@@ -512,7 +512,7 @@ int nrf24_read(int wl_fd)
 
 #ifdef CONFIG_DEBUG_WIRELESS
   syslog(LOG_INFO, "Message received : (on pipe %d)\n",  pipeno);
-  nrf24_dumpbuffer("Hex Dump", &rbuf[0], 32);
+  nrf24_dumpbuffer("Hex Dump", &rbuf[0], ret);
 #endif
   return 0;
 }

From fd525988f83efeb6433edee7855b86ac1982a7fc Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Wed, 8 Jul 2026 10:51:27 +0800
Subject: [PATCH 492/568] netutils: smtp: treat recv EOF as an error

recv() returns zero when the peer closes the TCP connection cleanly. The SMTP response path only treated negative returns as errors, so EOF could leave stale or empty response data to be checked as if a server reply had arrived.

Return ERROR on zero-length receives at each SMTP response point and keep the SPDX copyright header within the project line length limit.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 netutils/smtp/smtp.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/netutils/smtp/smtp.c b/netutils/smtp/smtp.c
index 2a8d23346..e04b65bc0 100644
--- a/netutils/smtp/smtp.c
+++ b/netutils/smtp/smtp.c
@@ -3,7 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2015, 2020 Gregory Nutt. All rights reserved.
- * SPDX-FileCopyrightText: 2007, 2009, 2011, Gregory Nutt. All rights reserved.
+ * SPDX-FileCopyrightText: 2007, 2009, Gregory Nutt. All rights reserved.
+ * SPDX-FileCopyrightText: 2011, Gregory Nutt. All rights reserved.
  * SPDX-FileCopyrightText: 2004, Adam Dunkels. All rights reserved.
  * SPDX-FileContributor: Gregory Nutt <gnutt@nuttx.org>
  * SPDX-FileContributor: Adam Dunkels <adam@dunkels.com>
@@ -116,7 +117,7 @@ static const char g_smtpto[]             = "To: ";
 
 static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
 {
-  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
     {
       return ERROR;
     }
@@ -133,7 +134,7 @@ static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
       return ERROR;
     }
 
-  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
     {
       return ERROR;
     }
@@ -150,7 +151,7 @@ static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
       return ERROR;
     }
 
-  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
     {
       return ERROR;
     }
@@ -167,7 +168,7 @@ static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
       return ERROR;
     }
 
-  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
     {
       return ERROR;
     }
@@ -186,7 +187,7 @@ static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
           return ERROR;
         }
 
-      if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+      if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
         {
           return ERROR;
         }
@@ -202,7 +203,7 @@ static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
       return ERROR;
     }
 
-  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
     {
       return ERROR;
     }
@@ -254,7 +255,7 @@ static inline int smtp_send_message(int sockfd, struct smtp_state *psmtp)
       return ERROR;
     }
 
-  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) < 0)
+  if (recv(sockfd, psmtp->buffer, SMTP_INPUT_BUFFER_SIZE, 0) <= 0)
     {
       return ERROR;
     }

From 7fa0767e30843634e37df2d10adb6b73b6292bbd Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 05:58:51 +0800
Subject: [PATCH 493/568] examples: nrf24l01_term: reserve RX terminator

read_pkt() terminates the received payload with buff[ret], but a full-size read can leave no room for that trailing NUL byte.

Limit the read length to one byte less than the buffer size so the received payload remains safely terminated before it is printed.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 examples/nrf24l01_term/nrf24l01_term.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c
index c120cafc1..e8c41e8c3 100644
--- a/examples/nrf24l01_term/nrf24l01_term.c
+++ b/examples/nrf24l01_term/nrf24l01_term.c
@@ -221,7 +221,7 @@ int read_pkt(int wl_fd)
   int ret;
   uint32_t pipeno;
 
-  ret = read(wl_fd, buff, sizeof(buff));
+  ret = read(wl_fd, buff, sizeof(buff) - 1);
   if (ret < 0)
     {
       perror("Error reading packet\n");

From 17b028e5929ff656401b195125d521da5cc70fa2 Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 06:20:55 +0800
Subject: [PATCH 494/568] examples: wgetjson: check allocations before use

Several malloc() results in the wgetjson example were used before checking for allocation failure, which could crash low-memory paths before cleanup ran.

Return or propagate allocation errors before using the allocated buffers. Use explicit NULL comparisons for the new pointer checks to match review feedback.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 examples/wgetjson/wgetjson_main.c | 51 +++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/examples/wgetjson/wgetjson_main.c b/examples/wgetjson/wgetjson_main.c
index 083d68e93..5e2679a6b 100644
--- a/examples/wgetjson/wgetjson_main.c
+++ b/examples/wgetjson/wgetjson_main.c
@@ -110,9 +110,14 @@ static int wgetjson_callback(FAR char **buffer, int offset, int datend,
       return 0;
     }
 
-  if (!g_json_buff)
+  if (g_json_buff == NULL)
     {
       g_json_buff = malloc(len + 1);
+      if (g_json_buff == NULL)
+        {
+          return -ENOMEM;
+        }
+
       memcpy(g_json_buff, &((*buffer)[offset]), len);
       g_json_buff[len] = 0;
       g_json_bufflen = len;
@@ -253,6 +258,11 @@ static void wgetjson_json_item_scan(cJSON *item, const char *prefix)
       const char *string = item->string ? item->string : "(null)";
       size_t len = strlen(prefix) + strlen(string) + 2;
       newprefix = malloc(len);
+      if (newprefix == NULL)
+        {
+          return;
+        }
+
       snprintf(newprefix, len, "%s/%s", prefix, string);
 
       dorecurse = wgetjson_json_item_callback(newprefix, item->type, item);
@@ -370,6 +380,11 @@ int main(int argc, FAR char *argv[])
     }
 
   buffer = malloc(buffer_len);
+  if (buffer == NULL)
+    {
+      return -ENOMEM;
+    }
+
   wgetjson_json_release();
 
   struct webclient_context ctx;
@@ -388,6 +403,12 @@ int main(int argc, FAR char *argv[])
                                            post_multi_values,
                                            MULTI_POST_NDATA);
           post_buff = malloc(post_buff_len);
+          if (post_buff == NULL)
+            {
+              ret = -ENOMEM;
+              goto out;
+            }
+
           web_posts_str(post_buff, &post_buff_len, post_multi_names,
                         post_multi_values, MULTI_POST_NDATA);
         }
@@ -396,21 +417,24 @@ int main(int argc, FAR char *argv[])
           post_buff_len = web_post_strlen(post_single_name,
                                           post_single_value);
           post_buff = malloc(post_buff_len);
+          if (post_buff == NULL)
+            {
+              ret = -ENOMEM;
+              goto out;
+            }
+
           web_post_str(post_buff, &post_buff_len, post_single_name,
                        post_single_value);
         }
 
-      if (post_buff)
-        {
-          const char *header = "Content-Type: "
-                               "application/x-www-form-urlencoded";
-          ctx.method = "POST";
-          ctx.url = url;
-          ctx.headers = &header;
-          ctx.nheaders = 1;
-          webclient_set_static_body(&ctx, post_buff, strlen(post_buff));
-          ret = webclient_perform(&ctx);
-        }
+      const char *header = "Content-Type: "
+                           "application/x-www-form-urlencoded";
+      ctx.method = "POST";
+      ctx.url = url;
+      ctx.headers = &header;
+      ctx.nheaders = 1;
+      webclient_set_static_body(&ctx, post_buff, strlen(post_buff));
+      ret = webclient_perform(&ctx);
     }
   else
     {
@@ -439,6 +463,7 @@ int main(int argc, FAR char *argv[])
       g_has_json = false;
     }
 
+out:
   wgetjson_json_release();
   free(buffer);
   if (post_buff)
@@ -446,5 +471,5 @@ int main(int argc, FAR char *argv[])
       free(post_buff);
     }
 
-  return 0;
+  return ret < 0 ? ret : 0;
 }

From 0566af556a9fa058ccd1632de3e97f4620279180 Mon Sep 17 00:00:00 2001
From: Old-Ding <ai.neo.ae86@gmail.com>
Date: Mon, 6 Jul 2026 03:24:38 +0800
Subject: [PATCH 495/568] examples: lp503x: Fix command argument handling

The lp503x shell command handlers receive the remaining input string as their argument. Treat empty colour arguments as the query case, document that query form in help text, and keep colour and brightness values signed until the existing range checks have run so invalid values are not silently truncated.

Guard the readline_stream() result before using it as a buffer index. readline_stream() returns EOF on end of file or failure, and writing buffer[len] before checking len can write before the stack buffer.

Use MAX_BRIGHTNESS consistently for brightness range checks.

Signed-off-by: Old-Ding <ai.neo.ae86@gmail.com>
---
 examples/lp503x/lp503x_main.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/examples/lp503x/lp503x_main.c b/examples/lp503x/lp503x_main.c
index 9cc99d3b7..fafb617e4 100644
--- a/examples/lp503x/lp503x_main.c
+++ b/examples/lp503x/lp503x_main.c
@@ -119,9 +119,9 @@ static struct lp503x_cmd_s g_lp503x_cmds[] =
   },
   {
     "c",
-    "hex",
+    "[hex]",
     lp503x_cmd_setcolour,
-    LP503X_HELP_TEXT("Hex RGB colour required")
+    LP503X_HELP_TEXT("show or set current RGB colour")
   },
   {
     "l",
@@ -350,7 +350,7 @@ static int lp503x_cmd_set_individual_mode(FAR char *parg)
 
 static int lp503x_cmd_set_banka_colour(FAR char *parg)
 {
-  uint8_t requested_colour;
+  int requested_colour;
 
   requested_colour = atoi(parg);
 
@@ -369,7 +369,7 @@ static int lp503x_cmd_set_banka_colour(FAR char *parg)
 
 static int lp503x_cmd_set_bankb_colour(FAR char *parg)
 {
-  uint8_t requested_colour;
+  int requested_colour;
 
   requested_colour = atoi(parg);
 
@@ -388,7 +388,7 @@ static int lp503x_cmd_set_bankb_colour(FAR char *parg)
 
 static int lp503x_cmd_set_bankc_colour(FAR char *parg)
 {
-  uint8_t requested_colour;
+  int requested_colour;
 
   requested_colour = atoi(parg);
 
@@ -417,8 +417,9 @@ static int lp503x_cmd_brightness(FAR char *parg)
   int lednum;
   int requested_brightness;
 
-  requested_brightness = ((int)strtol(parg, NULL, 0)) & 0xff;
-  if ((requested_brightness > 255) || (requested_brightness < 0))
+  requested_brightness = (int)strtol(parg, NULL, 0);
+  if ((requested_brightness > MAX_BRIGHTNESS) ||
+      (requested_brightness < 0))
     {
       printf("ERROR: brightness must be in range 0..255\n");
       ret = -EINVAL;
@@ -516,7 +517,7 @@ static int lp503x_cmd_pattern(FAR char *parg)
 static int lp503x_cmd_set_bank_brightness(FAR char *parg)
 {
   int bank_brightness;
-  if (parg != NULL || *parg != '\0')
+  if (parg != NULL && *parg != '\0')
     {
       bank_brightness = atoi(parg);
 
@@ -540,13 +541,14 @@ static int lp503x_cmd_set_bank_brightness(FAR char *parg)
 /****************************************************************************
  * Name:lp503x_setcolour
  *
+ *   shows the current RGB colour when no argument is provided, otherwise
  *   sets the current RGB colour to be used
  ****************************************************************************/
 
 static int lp503x_cmd_setcolour(FAR char *parg)
 {
   int colour;
-  if (parg == NULL || *parg != '\0')
+  if (parg == NULL || *parg == '\0')
     {
       printf("current colour is: 0x%06x\n", current_colour);
     }
@@ -650,9 +652,9 @@ int main(int argc, FAR char *argv[])
 
       len = readline_stream(buffer, sizeof(buffer),
                             stdin, stdout);
-      buffer[len] = '\0';
       if (len > 0)
         {
+          buffer[len] = '\0';
           if (strncmp(buffer, "!", 1) != 0)
             {
               /* a command */

From 707b24e5cbdc3b934c848d3decdb49f41b6cd4f1 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Tue, 7 Jul 2026 19:13:22 -0300
Subject: [PATCH 496/568] system/ping: Fix a segmentation fault when using ping

nsh> ping google.com
[   37.180000] dns_query_error: ERROR: IPv4 dns_recv_response fa: -84,
               server address: 8.8.8.8
Segmentation fault.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/ping/ping.c   | 2 ++
 system/ping6/ping6.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/system/ping/ping.c b/system/ping/ping.c
index 4588393ab..bc5e20ea8 100644
--- a/system/ping/ping.c
+++ b/system/ping/ping.c
@@ -345,6 +345,8 @@ int main(int argc, FAR char *argv[])
   int exitcode;
   int option;
 
+  memset(&info, 0, sizeof(info));
+
   info.count     = ICMP_NPINGS;
   info.datalen   = ICMP_PING_DATALEN;
   info.delay     = ICMP_POLL_DELAY;
diff --git a/system/ping6/ping6.c b/system/ping6/ping6.c
index 409f3db0e..e4644ede6 100644
--- a/system/ping6/ping6.c
+++ b/system/ping6/ping6.c
@@ -286,6 +286,8 @@ int main(int argc, FAR char *argv[])
   int exitcode;
   int option;
 
+  memset(&info, 0, sizeof(info));
+
   info.count     = ICMPv6_NPINGS;
   info.datalen   = ICMPv6_PING6_DATALEN;
   info.delay     = ICMPv6_POLL_DELAY;

From 33b528a0def22d77de906ccbe36e4913920e0b48 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Thu, 9 Jul 2026 09:47:58 +0200
Subject: [PATCH 497/568] lte/lapi: fix warnings

fix warnings lte/lapi on sim:

   warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 lte/lapi/src/lapi_lwm2m.c | 29 +++++++++++++++--------------
 lte/lapi/src/lapi_other.c |  4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lte/lapi/src/lapi_lwm2m.c b/lte/lapi/src/lapi_lwm2m.c
index 47a5d9f59..889e16018 100644
--- a/lte/lapi/src/lapi_lwm2m.c
+++ b/lte/lapi/src/lapi_lwm2m.c
@@ -95,7 +95,7 @@ int lte_m2m_connection(int cmd)
       return -EINVAL;
     }
 
-  return lapi_req(LTE_CMDID_LWM2M_CONNECT, (FAR void **)cmd,
+  return lapi_req(LTE_CMDID_LWM2M_CONNECT, (FAR void **)(uintptr_t)cmd,
                   1, NULL, 0, NULL);
 }
 
@@ -107,7 +107,8 @@ int lte_m2m_readresponse(int seq_no, FAR struct lwm2mstub_instance_s *inst,
                          int resp, FAR char *readvalue, int len)
 {
   FAR void *inarg[5] = {
-    (FAR void *)seq_no, (FAR void *)resp, inst, readvalue, (FAR void *)len
+    (FAR void *)(uintptr_t)seq_no, (FAR void *)(uintptr_t)resp, inst,
+    readvalue, (FAR void *)(uintptr_t)len
   };
 
   if (!inst || !readvalue || len <= 0 || check_instance(inst) != OK)
@@ -127,7 +128,7 @@ int lte_m2m_writeresponse(int seq_no, FAR struct lwm2mstub_instance_s *inst,
                           int resp)
 {
   FAR void *inarg[3] = {
-    (FAR void *)seq_no, (FAR void *)resp, inst
+    (FAR void *)(uintptr_t)seq_no, (FAR void *)(uintptr_t)resp, inst
   };
 
   if (!inst || check_instance(inst) != OK)
@@ -147,7 +148,7 @@ int lte_m2m_executeresp(int seq_no, FAR struct lwm2mstub_instance_s *inst,
                         int resp)
 {
   FAR void *inarg[3] = {
-    (FAR void *)seq_no, (FAR void *)resp, inst
+    (FAR void *)(uintptr_t)seq_no, (FAR void *)(uintptr_t)resp, inst
   };
 
   if (!inst || check_instance(inst) != OK)
@@ -166,7 +167,7 @@ int lte_m2m_executeresp(int seq_no, FAR struct lwm2mstub_instance_s *inst,
 int lte_m2m_observeresp(int seq_no, int resp)
 {
   FAR void *inarg[2] = {
-    (FAR void *)seq_no, (FAR void *)resp
+    (FAR void *)(uintptr_t)seq_no, (FAR void *)(uintptr_t)resp
   };
 
   return lapi_req(LTE_CMDID_LWM2M_OBSERVERESP,
@@ -182,7 +183,7 @@ int lte_m2m_observeupdate(FAR char *token,
                           FAR char *value, int len)
 {
   FAR void *inarg[4] = {
-    token, inst, value, (FAR void *)len
+    token, inst, value, (FAR void *)(uintptr_t)len
   };
 
   if (!token || !inst || !value || len <= 0)
@@ -211,7 +212,7 @@ int lte_setm2m_endpointname(FAR char *name)
 int lte_getm2m_endpointname(FAR char *name, int len)
 {
   FAR void *outarg[2] = {
-    name, (FAR void *)len
+    name, (FAR void *)(uintptr_t)len
   };
 
   if (!name || len <= 0)
@@ -241,7 +242,7 @@ int lte_getm2m_servernum(void)
 int lte_setm2m_serverinfo(FAR struct lwm2mstub_serverinfo_s *info, int id)
 {
   FAR void *inarg[2] = {
-    info, (FAR void *)id
+    info, (FAR void *)(uintptr_t)id
   };
 
   if (!info)
@@ -259,7 +260,7 @@ int lte_setm2m_serverinfo(FAR struct lwm2mstub_serverinfo_s *info, int id)
 int lte_getm2m_serverinfo(FAR struct lwm2mstub_serverinfo_s *info, int id)
 {
   FAR void *outarg[2] = {
-    info, (FAR void *)id
+    info, (FAR void *)(uintptr_t)id
   };
 
   if (!info)
@@ -288,7 +289,7 @@ int lte_getm2m_enabled_objectnum(void)
 int lte_getm2m_enabled_objects(FAR uint16_t *objids, int objnum)
 {
   FAR void *outarg[2] = {
-    objids, (FAR void *)objnum
+    objids, (FAR void *)(uintptr_t)objnum
   };
 
   if (!objids || objnum <= 0)
@@ -306,7 +307,7 @@ int lte_getm2m_enabled_objects(FAR uint16_t *objids, int objnum)
 int lte_enablem2m_objects(FAR uint16_t *objids, int objnum)
 {
   FAR void *inarg[2] = {
-    objids, (FAR void *)objnum
+    objids, (FAR void *)(uintptr_t)objnum
   };
 
   if (!objids || objnum <= 0)
@@ -338,7 +339,7 @@ int lte_getm2m_objresourceinfo(uint16_t objid, int res_num,
                                FAR struct lwm2mstub_resource_s *reses)
 {
   FAR void *outarg[2] = {
-    reses, (FAR void *)res_num
+    reses, (FAR void *)(uintptr_t)res_num
   };
 
   if (!reses || res_num <= 0)
@@ -391,7 +392,7 @@ int lte_setm2m_objectdefinition(uint16_t objids, int res_num,
                                 FAR struct lwm2mstub_resource_s *resucs)
 {
   FAR void *inarg[3] = {
-    (FAR void *)(uint32_t)objids, (FAR void *)res_num, resucs
+    (FAR void *)(uintptr_t)objids, (FAR void *)(uintptr_t)res_num, resucs
   };
 
   return lapi_req(LTE_CMDID_LWM2M_SETOBJRESOURCE, inarg, 3, NULL, 0, NULL);
@@ -487,5 +488,5 @@ bool lte_getm2m_qmode(void)
 int lte_setm2m_qmode(bool en)
 {
   return lapi_req(LTE_CMDID_LWM2M_SETQMODE,
-                  (FAR void **)(en ? 1 : 0), 1, NULL, 0, NULL);
+                  (FAR void **)(uintptr_t)(en ? 1 : 0), 1, NULL, 0, NULL);
 }
diff --git a/lte/lapi/src/lapi_other.c b/lte/lapi/src/lapi_other.c
index b7d6a2b64..14a0734ec 100644
--- a/lte/lapi/src/lapi_other.c
+++ b/lte/lapi/src/lapi_other.c
@@ -143,12 +143,12 @@ int lte_send_atcmd_sync(FAR const char *cmd, int cmdlen,
   int32_t ret;
   FAR void *inarg[] =
     {
-      (FAR void *)cmd, (FAR void *)cmdlen
+      (FAR void *)cmd, (FAR void *)(uintptr_t)cmdlen
     };
 
   FAR void *outarg[] =
     {
-      respbuff, (FAR void *)respbufflen, resplen
+      respbuff, (FAR void *)(uintptr_t)respbufflen, resplen
     };
 
   if (!cmd

From d071a0b585f7e292e4bc5e792cc0aaa21ea4266e Mon Sep 17 00:00:00 2001
From: orbisai0security <mediratta01.pally@gmail.com>
Date: Thu, 9 Jul 2026 00:50:36 +0000
Subject: [PATCH 498/568] fix: V-001 security vulnerability

Automated security fix generated by OrbisAI Security

Signed-off-by: OrbisAI Security <mediratta01.pally@gmail.com>
---
 nshlib/nsh_vars.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nshlib/nsh_vars.c b/nshlib/nsh_vars.c
index f940d64a3..401d90670 100644
--- a/nshlib/nsh_vars.c
+++ b/nshlib/nsh_vars.c
@@ -257,6 +257,11 @@ int nsh_setvar(FAR struct nsh_vtbl_s *vtbl, FAR const char *name,
 
   if (pstate->varp != NULL)
     {
+      if (varlen > INT_MAX - pstate->varsz)
+        {
+          return -ENOMEM;
+        }
+
       newsize = pstate->varsz + varlen;
       newvarp = (FAR char *)realloc(pstate->varp, newsize);
       if (newvarp == NULL)

From 27c466a4292b09557eda087811c32e75d5a347a8 Mon Sep 17 00:00:00 2001
From: Peter Barada <peter.barada@gmail.com>
Date: Thu, 9 Jul 2026 15:49:32 -0400
Subject: [PATCH 499/568] crypto: Fix CRC-32 test case 8

Normal Crypto API usage is to call ioctl(CGCGSESSION) to initialize
the session, then one (or more) calls to ioctl(CIOCCRYPT) with flag
bit COP_FLAG_UPDATE set to append to the hash/xform calculation, then
a call to ioctl(CIOCCRYPT) with flag bit COP_FLAG_UPDATE cleared to
extract the result, and finally ioctl(CIOCFSESSION) to finish the
session. This follows the classic init / update* / finish data
processing model.

However crc32.c test case 8 precedes ioctl(CIOCCRYPT) with
COP_FLAG_UPDATE set with ioctl(CIOCGSESSION) and follows it with
ioctl(CIOCCRYPT) with COP_FLAG_UPDATE cleared to extract the CRC, and
then ioctl(CIOCFSESSION) to finish the session, all _within_ the loop
to CRC eight segments.  This works with the software implementation
since the intermediate CRC-32 is carried forward out of one session to
seed the next session. Fix by moving the init and finish portions out
of the loop in test case 8.

Signed-off-by: Peter Barada <peter.barada@gmail.com>
---
 testing/drivers/crypto/crc32.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/testing/drivers/crypto/crc32.c b/testing/drivers/crypto/crc32.c
index f21fd8d28..89aa98cdc 100644
--- a/testing/drivers/crypto/crc32.c
+++ b/testing/drivers/crypto/crc32.c
@@ -258,15 +258,15 @@ int main(void)
 
   /* testcase 8: test segmented computing capabilities in crc32 mode */
 
+  ret = syscrc32_start(&crc32_ctx, &startval);
+  if (ret != 0)
+    {
+      printf("syscrc32 start failed\n");
+      goto err;
+    }
+
   for (i = 0; i < 8; i++)
     {
-      ret = syscrc32_start(&crc32_ctx, &startval);
-      if (ret != 0)
-        {
-          printf("syscrc32 start failed\n");
-          goto err;
-        }
-
       ret = syscrc32_update(&crc32_ctx, g_crc32_testcase[7].data,
                             g_crc32_testcase[7].datalen);
       if (ret)
@@ -274,13 +274,13 @@ int main(void)
           printf("syscrc32 update failed\n");
           goto err;
         }
+    }
 
-      ret = syscrc32_finish(&crc32_ctx, &startval);
-      if (ret)
-        {
-          printf("syscrc32 finish failed\n");
-          goto err;
-        }
+  ret = syscrc32_finish(&crc32_ctx, &startval);
+  if (ret)
+    {
+      printf("syscrc32 finish failed\n");
+      goto err;
     }
 
   ret = match(g_crc32_testcase[7].result, startval);

From 1d15c81f6913b638294eb24175a52105ad001105 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Fri, 10 Jul 2026 08:27:26 +0000
Subject: [PATCH 500/568] ci: supply sim/login ROMFS passwd credential in build
 jobs

NuttX master now requires CONFIG_BOARD_ETC_ROMFS_PASSWD_PASSWORD for
sim/login builds. The nuttx-apps workflow mirrors nuttx CI but never
exported NUTTX_ROMFS_PASSWD_PASSWORD, so Linux sim-02 and macOS sim
jobs failed inside the Docker build container.

Set the documented test credential at the job and step level and
export it explicitly before cibuild.sh runs.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 .github/workflows/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d0004718..31af5a49e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,6 +135,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: 1
+      # Documented sim/login CI test credential (not a production secret).
+      # Used when CONFIG_BOARD_ETC_ROMFS_PASSWD_ENABLE=y and defconfig omits
+      # the password.  See nuttx tools/update_romfs_password.sh.
+      NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1
 
     strategy:
       max-parallel: 12
@@ -179,8 +183,10 @@ jobs:
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
           BLOBDIR: /tools/blobs
+          NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1
         with:
           run: |
+            export NUTTX_ROMFS_PASSWD_PASSWORD=NuttXSimLogin1
             export ARTIFACTDIR=`pwd`/buildartifacts
 
             for i in 1 2 3; do
@@ -295,6 +301,8 @@ jobs:
     runs-on: macos-15-intel
     needs: macOS-Arch
     if: ${{ needs.macOS-Arch.outputs.skip_all_builds != '1' }}
+    env:
+      NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1
     strategy:
       max-parallel: 2
       matrix:
@@ -329,6 +337,7 @@ jobs:
       - name: Run Builds
         run: |
           echo "::add-matcher::sources/nuttx/.github/gcc.json"
+          export NUTTX_ROMFS_PASSWD_PASSWORD=NuttXSimLogin1
           export ARTIFACTDIR=`pwd`/buildartifacts
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat

From 2bcc6b96ead84735e2d65876f46e80655377b769 Mon Sep 17 00:00:00 2001
From: "liang.huang" <liang.huang@houmo.ai>
Date: Sat, 11 Jul 2026 12:06:14 +0800
Subject: [PATCH 501/568] testing/sched: fix off-by-one sample count in
 timerjitter

cur_cnt++ in the loop condition increments even when the loop body
doesn't run, so avg is divided by one more sample than was collected.

Signed-off-by: liang.huang <liang.huang@houmo.ai>
---
 testing/sched/timerjitter/timerjitter.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testing/sched/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
index 6811a3f19..2f7cea37f 100644
--- a/testing/sched/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -195,8 +195,10 @@ static FAR void *timerjitter(FAR void *arg)
   param->max = 0;
   param->min = (unsigned long)-1;
 
-  while (param->cur_cnt++ < param->max_cnt)
+  while (param->cur_cnt < param->max_cnt)
     {
+      param->cur_cnt++;
+
       /* Wait for SIGALRM */
 
       if (sigwait(&sigset, &sigs) < 0)

From 1d5f816874ece11120c478c9c56f2e8aacd4b1bf Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Sat, 11 Jul 2026 00:19:13 +0800
Subject: [PATCH 502/568] system: audio: parse command filenames with PATH_MAX

Parse command filename tokens into PATH_MAX-sized buffers before
reading optional raw audio parameters. This bounds nxplayer and
nxrecorder input without runtime-built scanf formats.

Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 system/nxplayer/nxplayer_main.c     | 17 ++++++++++++---
 system/nxrecorder/nxrecorder_main.c | 34 ++++++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/system/nxplayer/nxplayer_main.c b/system/nxplayer/nxplayer_main.c
index 5200c08f9..5ab707163 100644
--- a/system/nxplayer/nxplayer_main.c
+++ b/system/nxplayer/nxplayer_main.c
@@ -317,10 +317,21 @@ static int nxplayer_cmd_playraw(FAR struct nxplayer_s *pplayer, char *parg)
   int bpsamp = 0;
   int samprate = 0;
   int chmap = 0;
-  char filename[128];
+  size_t len;
+  char filename[PATH_MAX];
 
-  sscanf(parg, "%s %d %d %d %d", filename, &channels, &bpsamp,
-                                 &samprate, &chmap);
+  parg += strspn(parg, " \t\r\n");
+  len = strcspn(parg, " \t\r\n");
+  if (len >= sizeof(filename))
+    {
+      len = sizeof(filename) - 1;
+    }
+
+  memcpy(filename, parg, len);
+  filename[len] = '\0';
+
+  sscanf(parg + len, "%d %d %d %d", &channels, &bpsamp,
+         &samprate, &chmap);
 
   /* Try to play the file specified */
 
diff --git a/system/nxrecorder/nxrecorder_main.c b/system/nxrecorder/nxrecorder_main.c
index a8a4c63d6..485784a03 100644
--- a/system/nxrecorder/nxrecorder_main.c
+++ b/system/nxrecorder/nxrecorder_main.c
@@ -190,10 +190,21 @@ static int nxrecorder_cmd_recordraw(FAR struct nxrecorder_s *precorder,
   int bpsamp = 0;
   int samprate = 0;
   int chmap = 0;
-  char filename[128];
+  size_t len;
+  char filename[PATH_MAX];
 
-  sscanf(parg, "%s %d %d %d %d", filename, &channels, &bpsamp,
-                                 &samprate, &chmap);
+  parg += strspn(parg, " \t\r\n");
+  len = strcspn(parg, " \t\r\n");
+  if (len >= sizeof(filename))
+    {
+      len = sizeof(filename) - 1;
+    }
+
+  memcpy(filename, parg, len);
+  filename[len] = '\0';
+
+  sscanf(parg + len, "%d %d %d %d", &channels, &bpsamp,
+         &samprate, &chmap);
 
   /* Try to record the file specified */
 
@@ -259,10 +270,21 @@ static int nxrecorder_cmd_record(FAR struct nxrecorder_s *precorder,
   int bpsamp = 0;
   int samprate = 0;
   int chmap = 0;
-  char filename[128];
+  size_t len;
+  char filename[PATH_MAX];
 
-  sscanf(parg, "%s %d %d %d %d", filename, &channels, &bpsamp,
-                                 &samprate, &chmap);
+  parg += strspn(parg, " \t\r\n");
+  len = strcspn(parg, " \t\r\n");
+  if (len >= sizeof(filename))
+    {
+      len = sizeof(filename) - 1;
+    }
+
+  memcpy(filename, parg, len);
+  filename[len] = '\0';
+
+  sscanf(parg + len, "%d %d %d %d", &channels, &bpsamp,
+         &samprate, &chmap);
 
   /* Try to record the file specified */
 

From 62b7e955300b6dafa4f36d391474d3c8925b8106 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Fri, 10 Jul 2026 18:17:54 -0300
Subject: [PATCH 503/568] nshlib: top: add Linux-like summary and flicker-free
 refresh

Print a summary header before the task list in the style of the
Linux top command: uptime, task counts (total/running/sleeping),
CPU busy/idle and memory usage, all gathered via sysinfo().

Refresh the screen in place (cursor home + erase-line per row +
erase-below) instead of clearing the whole screen every cycle,
which removes the flicker.

Poll stdin during the update interval and exit on 'q', ESC or
Ctrl-C. Previously the only exit path was the SIGINT handler,
which requires both CONFIG_ENABLE_ALL_SIGNALS (handler) and
CONFIG_TTY_SIGINT (serial console converts Ctrl-C into SIGINT,
default n); on configurations missing either option top could
not be terminated at all.

Tested on linum-stm32h753bi:nsh.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 nshlib/nsh_proccmds.c | 124 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 120 insertions(+), 4 deletions(-)

diff --git a/nshlib/nsh_proccmds.c b/nshlib/nsh_proccmds.c
index 02a9869aa..8be9fe2d2 100644
--- a/nshlib/nsh_proccmds.c
+++ b/nshlib/nsh_proccmds.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/sched.h>
+#include <nuttx/vt100.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,6 +37,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <signal.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/sysinfo.h>
 #include <sys/param.h>
@@ -884,6 +886,107 @@ static void top_exit(int signo, FAR siginfo_t *siginfo, FAR void *context)
 }
 #endif /* CONFIG_ENABLE_ALL_SIGNALS */
 
+/****************************************************************************
+ * Name: top_state_is_running
+ ****************************************************************************/
+
+static bool top_state_is_running(FAR const char *state)
+{
+  return strncmp(state, "Running", 7) == 0 ||
+         strncmp(state, "Ready", 5) == 0 ||
+         strncmp(state, "Pending", 7) == 0;
+}
+
+/****************************************************************************
+ * Name: top_summary
+ *
+ * Description:
+ *   Print a Linux-top-like summary header: uptime, task counts, CPU
+ *   busy/idle and memory usage.  Lines end with an erase-to-eol so the
+ *   screen can be refreshed in place.
+ *
+ ****************************************************************************/
+
+static void top_summary(FAR struct nsh_vtbl_s *vtbl,
+                        FAR struct nsh_topstatus_s *topstatus)
+{
+  struct sysinfo info;
+  unsigned long uptime;
+  unsigned long busy;
+  size_t running = 0;
+  size_t i;
+
+  for (i = 0; i < topstatus->index; i++)
+    {
+      if (top_state_is_running(topstatus->status[i]->td_state))
+        {
+          running++;
+        }
+    }
+
+  sysinfo(&info);
+  uptime = info.uptime;
+
+  if (uptime >= 86400)
+    {
+      nsh_output(vtbl, VT100_STR_CLEAREOL
+                 "top - up %lud %02lu:%02lu:%02lu\n",
+                 uptime / 86400, (uptime % 86400) / 3600,
+                 (uptime % 3600) / 60, uptime % 60);
+    }
+  else
+    {
+      nsh_output(vtbl, VT100_STR_CLEAREOL "top - up %02lu:%02lu:%02lu\n",
+                 uptime / 3600, (uptime % 3600) / 60, uptime % 60);
+    }
+
+  nsh_output(vtbl, VT100_STR_CLEAREOL
+             "Tasks: %zu total, %zu running, %zu sleeping\n",
+             topstatus->index, running, topstatus->index - running);
+
+  busy = (info.loads[0] * 1000) >> SI_LOAD_SHIFT;
+  nsh_output(vtbl, VT100_STR_CLEAREOL
+             "%%Cpu(s): %2lu.%lu busy, %2lu.%lu idle\n",
+             busy / 10, busy % 10,
+             (1000 - busy) / 10, (1000 - busy) % 10);
+
+  nsh_output(vtbl, VT100_STR_CLEAREOL
+             "Mem : %8lu total, %8lu used, %8lu free\n",
+             info.totalram, info.totalram - info.freeram, info.freeram);
+
+  nsh_output(vtbl, VT100_STR_CLEAREOL "\n");
+}
+
+/****************************************************************************
+ * Name: top_wait_key
+ *
+ * Description:
+ *   Sleep for the update interval, returning true if the user asked to
+ *   quit (q, ESC or Ctrl-C read from stdin).
+ *
+ ****************************************************************************/
+
+static bool top_wait_key(int delay)
+{
+  struct pollfd fds;
+
+  fds.fd = STDIN_FILENO;
+  fds.events = POLLIN;
+
+  if (poll(&fds, 1, delay * 1000) > 0)
+    {
+      char c;
+
+      if (read(STDIN_FILENO, &c, 1) == 1 &&
+          (c == 'q' || c == 0x1b || c == 0x03))
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
 #endif
 
 /****************************************************************************
@@ -1417,11 +1520,12 @@ int cmd_top(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
       tc = nsh_ioctl(vtbl, TIOCSCTTY, getpid());
     }
 
+  nsh_output(vtbl, VT100_STR_CLEARSCREEN);
+
   while (!quit)
     {
       topstatus.index = 0;
-      nsh_output(vtbl, "\033[2J\033[1;1H");
-      ps_title(vtbl, topstatus.heap);
+      nsh_output(vtbl, VT100_STR_CURSORHOME);
 
       if (pidlist)
         {
@@ -1455,17 +1559,29 @@ int cmd_top(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
       qsort(topstatus.status, topstatus.index,
             sizeof(topstatus.status[0]), top_cmpcpuload);
 
+      top_summary(vtbl, &topstatus);
+
+      nsh_output(vtbl, VT100_STR_CLEAREOL VT100_STR_BOLD);
+      ps_title(vtbl, topstatus.heap);
+      nsh_output(vtbl, VT100_STR_MODESOFF);
+
       for (i = 0; i < MIN(topstatus.index, num); i++)
         {
+          nsh_output(vtbl, VT100_STR_CLEAREOL);
           ps_output(vtbl, topstatus.heap, topstatus.status[i]);
         }
 
       if (vtbl->isctty && tc == 0)
         {
-          nsh_output(vtbl, "use Ctrl+c' to quit\n");
+          nsh_output(vtbl, VT100_STR_CLEAREOL "use 'q' or Ctrl+c to quit\n");
         }
 
-      sleep(delay);
+      nsh_output(vtbl, VT100_STR_CLEAREOS);
+
+      if (top_wait_key(delay))
+        {
+          break;
+        }
     }
 
   if (topstatus.status != NULL)

From 9b540556a1ecfbae17598b8766918ed04d486d9d Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Sat, 11 Jul 2026 12:11:54 -0300
Subject: [PATCH 504/568] netutils/dropbear: don't require a hardware TRNG

Dropbear gathers its entropy from /dev/urandom (libtomcrypt's
rng_get_bytes tries /dev/urandom before /dev/random), so requiring
ARCH_HAVE_RNG and DEV_RANDOM shuts the port out of targets without a
hardware TRNG -- including the simulator, where a dropbear
configuration silently loses NETUTILS_DROPBEAR at configure time.
Keep only the DEV_URANDOM requirement.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 netutils/dropbear/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
index 94eee878c..8e7c0868e 100644
--- a/netutils/dropbear/Kconfig
+++ b/netutils/dropbear/Kconfig
@@ -14,8 +14,6 @@ menuconfig NETUTILS_DROPBEAR
 	depends on FSUTILS_PASSWD
 	depends on PSEUDOTERM
 	depends on SERIAL
-	depends on ARCH_HAVE_RNG
-	depends on DEV_RANDOM
 	depends on DEV_URANDOM
 	depends on LIBC_NETDB
 	depends on LIBC_GAISTRERROR

From 3762a64bc6ef6781fc76e05275df1de072d97f5f Mon Sep 17 00:00:00 2001
From: Mihai Pacuraru <mpacuraru@protonmail.com>
Date: Wed, 8 Jul 2026 14:30:00 +0300
Subject: [PATCH 505/568] examples/mqttc: add a subscriber client
 implementation example

    Implement the subscriber client that optionally integrates
    the TLS layer and can reconnect to the broker if the
    application is running in unstable network environments.

    The client is compliant with all 3 levels of QoS.

Signed-off-by: Mihai Pacuraru <mpacuraru@protonmail.com>
---
 examples/mqttc/CMakeLists.txt |  14 +-
 examples/mqttc/Kconfig        |  24 +
 examples/mqttc/Makefile       |  10 +
 examples/mqttc/cert.inc       |  30 ++
 examples/mqttc/mqttc_pub.c    |  32 +-
 examples/mqttc/mqttc_sub.c    | 820 ++++++++++++++++++++++++++++++++++
 6 files changed, 900 insertions(+), 30 deletions(-)
 create mode 100644 examples/mqttc/cert.inc
 create mode 100644 examples/mqttc/mqttc_sub.c

diff --git a/examples/mqttc/CMakeLists.txt b/examples/mqttc/CMakeLists.txt
index 567712558..6e4ee010a 100644
--- a/examples/mqttc/CMakeLists.txt
+++ b/examples/mqttc/CMakeLists.txt
@@ -23,11 +23,23 @@
 if(CONFIG_EXAMPLES_MQTTC)
   nuttx_add_application(
     NAME
-    ${CONFIG_EXAMPLES_MQTTC_PROGNAME}
+    ${CONFIG_EXAMPLES_MQTTC_PUB_PROGNAME}
     STACKSIZE
     ${CONFIG_EXAMPLES_MQTTC_STACKSIZE}
     MODULE
     ${CONFIG_EXAMPLES_MQTTC}
     SRCS
     mqttc_pub.c)
+
+  if(CONFIG_EXAMPLES_MQTTC_SUB)
+    nuttx_add_application(
+      NAME
+      ${CONFIG_EXAMPLES_MQTTC_SUB_PROGNAME}
+      STACKSIZE
+      ${CONFIG_EXAMPLES_MQTTC_STACKSIZE}
+      MODULE
+      ${CONFIG_EXAMPLES_MQTTC}
+      SRCS
+      mqttc_sub.c)
+  endif()
 endif()
diff --git a/examples/mqttc/Kconfig b/examples/mqttc/Kconfig
index adf91b726..61a2e6ba1 100644
--- a/examples/mqttc/Kconfig
+++ b/examples/mqttc/Kconfig
@@ -16,6 +16,17 @@ config EXAMPLES_MQTTC_PROGNAME
 	string "Program name"
 	default "mqttc_pub"
 
+config EXAMPLES_MQTTC_SUB
+	bool "Enable MQTT-C Subscriber Client"
+	default n
+	---help---
+		Enable a simple MQTT-C subscriber example alongside publisher
+
+config EXAMPLES_MQTTC_SUB_PROGNAME
+	string "Subscriber program name"
+	default "mqttc_sub"
+	depends on EXAMPLES_MQTTC_SUB
+
 config EXAMPLES_MQTTC_STACKSIZE
 	int "Task's stack size"
 	default 8192
@@ -28,6 +39,19 @@ config EXAMPLES_MQTTC_RXSIZE
 	int "RX Buffer size"
 	default 256
 
+config MQTT_USE_MBEDTLS
+	bool
+	default n
+
+config EXAMPLES_MQTTC_MBEDTLS
+	bool "Enable MQTT over TLS (mbedTLS)"
+	default n
+	depends on NETUTILS_MQTTC_WITH_MBEDTLS
+	select MQTT_USE_MBEDTLS
+	---help---
+		Enable TLS/SSL support for MQTT connections using mbedTLS.
+		Requires NETUTILS_MQTTC_WITH_MBEDTLS to be enabled.
+
 config EXAMPLES_MQTTC_ALLOW_UNVERIFIED_TLS
 	bool "Allow unverified TLS"
 	default n
diff --git a/examples/mqttc/Makefile b/examples/mqttc/Makefile
index 9aacf67f6..45a2d9f04 100644
--- a/examples/mqttc/Makefile
+++ b/examples/mqttc/Makefile
@@ -25,10 +25,20 @@ include $(APPDIR)/Make.defs
 PROGNAME = $(CONFIG_EXAMPLES_MQTTC_PROGNAME)
 PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_EXAMPLES_MQTTC_STACKSIZE)
+
+ifeq ($(CONFIG_EXAMPLES_MQTTC_SUB),y)
+    PROGNAME  += $(CONFIG_EXAMPLES_MQTTC_SUB_PROGNAME)
+    PRIORITY  += SCHED_PRIORITY_DEFAULT
+    STACKSIZE += $(CONFIG_EXAMPLES_MQTTC_STACKSIZE)
+endif
+
 MODULE = $(CONFIG_EXAMPLES_MQTTC)
 
 # MQTT-C example source code
 
 MAINSRC = mqttc_pub.c
+ifeq ($(CONFIG_EXAMPLES_MQTTC_SUB), y)
+    MAINSRC += mqttc_sub.c
+endif
 
 include $(APPDIR)/Application.mk
diff --git a/examples/mqttc/cert.inc b/examples/mqttc/cert.inc
new file mode 100644
index 000000000..542602db5
--- /dev/null
+++ b/examples/mqttc/cert.inc
@@ -0,0 +1,30 @@
+/* Broker CA certificate (PEM), embedded in the firmware so the subscriber
+ * can authenticate the broker without copying a certificate file onto the
+ * board.
+ * Replace the body below if the broker's CA changes; init_conn() parses
+ * it whenever no CA file is supplied on the command line via -c.
+ */
+
+#  define TEST_CA_CRT_RSA_SHA256_PEM                                       \
+    "-----BEGIN CERTIFICATE-----\r\n"                                      \
+    "MIIDYTCCAkmgAwIBAgIUAk1VwJ7il2775wUnEgBZSvW77dUwDQYJKoZIhvcNAQEL\r\n" \
+    "BQAwQDELMAkGA1UEBhMCUk8xEjAQBgNVBAgMCUJ1Y2hhcmVzdDEOMAwGA1UECgwF\r\n" \
+    "TXlPcmcxDTALBgNVBAMMBE15Q0EwHhcNMjYwNjA5MDA0MjExWhcNMzYwNjA2MDA0\r\n" \
+    "MjExWjBAMQswCQYDVQQGEwJSTzESMBAGA1UECAwJQnVjaGFyZXN0MQ4wDAYDVQQK\r\n" \
+    "DAVNeU9yZzENMAsGA1UEAwwETXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\r\n" \
+    "AQoCggEBAMGfLamBuio0mYqL8TDLqcxqCDhELmrmYxccz8/BAJ3xG0bbqAg0o2CM\r\n" \
+    "2nUcDWeDTTOFTEAOVKhqqbu7jzQA+/XRQaptYAzt13N0pMUFlKZQ0QVefAH11mph\r\n" \
+    "M2u0exWZObRQxUyfzzJG1UZQ4xGqXUekg+2LMSS09g/QAsCreu8O+xzAK9XUA6np\r\n" \
+    "8lebaIqxFHabrjlbHgan5qKP0+EncMRN/5Lb11MDzfjyIusoFWPZF8rF2x9D+UFv\r\n" \
+    "hZuL9Z40jz3cRlVUxuVtUq1tna2CCwWhwl5gwAQ/b0rkhe+5/b3cgSs3VbIdWHic\r\n" \
+    "nwM4Yq4K/nAetYiOxtjKY5zLIvRopd0CAwEAAaNTMFEwHQYDVR0OBBYEFFR43w+x\r\n" \
+    "ri1ssaAyJzQGDH/dP2e0MB8GA1UdIwQYMBaAFFR43w+xri1ssaAyJzQGDH/dP2e0\r\n" \
+    "MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADU/lBjTGb7RlgGq\r\n" \
+    "HYCktoWZBNkJFPVTPrC1mwzJX/vSaz9QUpRA5dpprSl84QKvWNxO5fPEMmwK2Wrw\r\n" \
+    "x6tdE2aWb5x+3W0302JnaUPNhDF26Z5+LK4CoRHjbT2J3FrDg2u6/3Si+RpNSHYh\r\n" \
+    "0OCdApzCyzqWdmvb7VD+u+isSh9CEUcaBOCq/72GNqdIjnSsgMGNHp9Ld6+ctwJO\r\n" \
+    "sQkj0M3MaciNSPZ3y0w/GqeWNQaK3Rk5pSaqrc9RQS42KtJuGOqMiBMG1Ib6b7D4\r\n" \
+    "bJSEDBzhO1M0o9vwr9xYaCUfbQzuuYJ3al4weRl0E4B63o2OFUjMOILIO3LeuuRD\r\n" \
+    "+HXdOE0=\r\n"                                                         \
+    "-----END CERTIFICATE-----\r\n"
+/* END FILE */
diff --git a/examples/mqttc/mqttc_pub.c b/examples/mqttc/mqttc_pub.c
index 306df6dcc..d979fb24a 100644
--- a/examples/mqttc/mqttc_pub.c
+++ b/examples/mqttc/mqttc_pub.c
@@ -24,6 +24,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/compiler.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -42,39 +43,12 @@
 #  include <mbedtls/net_sockets.h>
 #  include <mbedtls/ssl.h>
 
+#include "cert.inc"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* This is taken from mbedtls/tests/data_files/test-ca-sha256.crt. */
-
-/* BEGIN FILE string macro TEST_CA_CRT_RSA_SHA256_PEM
- * mbedtls/tests/data_files/test-ca-sha256.crt
- */
-
-#  define TEST_CA_CRT_RSA_SHA256_PEM                                       \
-    "-----BEGIN CERTIFICATE-----\r\n"                                      \
-    "MIIDQTCCAimgAwIBAgIBAzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n" \
-    "MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n" \
-    "MTkwMjEwMTQ0NDAwWhcNMjkwMjEwMTQ0NDAwWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n" \
-    "A1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n" \
-    "CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n" \
-    "mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n" \
-    "50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n" \
-    "YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n" \
-    "R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n" \
-    "KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n" \
-    "UDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFLRa5KWz3tJS9rnVppUP6z68x/3/\r\n" \
-    "MB8GA1UdIwQYMBaAFLRa5KWz3tJS9rnVppUP6z68x/3/MA0GCSqGSIb3DQEBCwUA\r\n" \
-    "A4IBAQA4qFSCth2q22uJIdE4KGHJsJjVEfw2/xn+MkTvCMfxVrvmRvqCtjE4tKDl\r\n" \
-    "oK4MxFOek07oDZwvtAT9ijn1hHftTNS7RH9zd/fxNpfcHnMZXVC4w4DNA1fSANtW\r\n" \
-    "5sY1JB5Je9jScrsLSS+mAjyv0Ow3Hb2Bix8wu7xNNrV5fIf7Ubm+wt6SqEBxu3Kb\r\n" \
-    "+EfObAT4huf3czznhH3C17ed6NSbXwoXfby7stWUDeRJv08RaFOykf/Aae7bY5PL\r\n" \
-    "yTVrkAnikMntJ9YI+hNNYt3inqq11A5cN0+rVTst8UKCxzQ4GpvroSwPKTFkbMw4\r\n" \
-    "/anT1dVxr/BtwJfiESoK3/4CeXR1\r\n"                                     \
-    "-----END CERTIFICATE-----\r\n"
-/* END FILE */
-
 #  define EXTRA_OPT "c:"
 #else
 #  define EXTRA_OPT ""
diff --git a/examples/mqttc/mqttc_sub.c b/examples/mqttc/mqttc_sub.c
new file mode 100644
index 000000000..d7ad1858a
--- /dev/null
+++ b/examples/mqttc/mqttc_sub.c
@@ -0,0 +1,820 @@
+/****************************************************************************
+ * apps/examples/mqttc/mqttc_sub.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <mqtt.h>
+#include <netutils/netlib.h>
+
+#ifdef MQTT_USE_MBEDTLS
+#  include <inttypes.h>
+
+#  include <mbedtls/error.h>
+#  include <mbedtls/entropy.h>
+#  include <mbedtls/ctr_drbg.h>
+#  include <mbedtls/net_sockets.h>
+#  include <mbedtls/ssl.h>
+
+#  include "cert.inc"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#  define EXTRA_OPT "c:"
+#else
+#  define EXTRA_OPT ""
+#endif
+
+/* Seconds to wait between failed connection attempts in the reconnect
+ * callback.
+ */
+
+#define MQTTC_RECONNECT_DELAY_S 2
+
+/* Network interface to wait on before the first connection attempt, and the
+ * polling parameters for that wait.  Change MQTTC_NETIF to match the board's
+ * network device (e.g. "eth0" for wired Ethernet).
+ */
+
+#define MQTTC_NETIF             "wlan0"
+#define MQTTC_NET_POLL_MS       200
+#define MQTTC_NET_WAIT_MS       30000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct mqttc_cfg_s
+{
+  FAR const char *host;
+  FAR const char *port;
+  FAR const char *topic;
+  FAR const char *msg;
+  FAR const char *id;
+  FAR const char *user;
+  FAR const char *pass;
+  #ifdef MQTT_USE_MBEDTLS
+    FAR const char *ca_file;
+  #endif
+  uint32_t tmo;
+  uint8_t flags;
+  uint8_t qos;
+};
+
+struct mqtt_conn_context_s
+{
+  struct mqtt_client client;
+  #ifdef MQTT_USE_MBEDTLS
+    mbedtls_net_context net_ctx;
+    mbedtls_ssl_context ssl_ctx;
+    mbedtls_ssl_config ssl_conf;
+    mbedtls_x509_crt ca_crt;
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+  #endif
+  uint8_t sendbuf[CONFIG_EXAMPLES_MQTTC_TXSIZE];
+  uint8_t recvbuf[CONFIG_EXAMPLES_MQTTC_RXSIZE];
+};
+
+/* State handed to the reconnect callback so it can rebuild the transport
+ * connection and reconfigure the MQTT session from scratch.
+ */
+
+struct mqttc_reconnect_s
+{
+  FAR const struct mqttc_cfg_s *cfg;
+  FAR struct mqtt_conn_context_s *conn;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static FAR void *client_refresher(FAR void *data);
+static void parsearg(int argc, FAR char *argv[],
+                    FAR struct mqttc_cfg_s *cfg);
+static int init_conn(FAR const struct mqttc_cfg_s *cfg,
+                     FAR struct mqtt_conn_context_s *ctx,
+                     FAR mqtt_pal_socket_handle *handle);
+static void close_conn(FAR struct mqtt_conn_context_s *ctx);
+static void reconnect_client(FAR struct mqtt_client *client,
+                             FAR void **state);
+static void wait_for_network(void);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef MQTT_USE_MBEDTLS
+
+/****************************************************************************
+ * Name: mqttc_net_recv
+ *
+ * Description:
+ *   mbedTLS BIO receive callback for non-blocking sockets.  The stock
+ *   mbedtls_net_recv() relies on fcntl(F_GETFL) reporting O_NONBLOCK to
+ *   classify EAGAIN as "would block".  On NuttX, F_SETFL applies the
+ *   non-blocking mode via FIONBIO but does not retain O_NONBLOCK in the
+ *   file status flags, so F_GETFL never reports it.  The stock callback
+ *   therefore turns a benign EAGAIN into MBEDTLS_ERR_NET_RECV_FAILED.  This
+ *   wrapper inspects errno directly and returns MBEDTLS_ERR_SSL_WANT_READ
+ *   so callers (e.g. MQTT-C's mqtt_sync) keep retrying instead of aborting.
+ *
+ ****************************************************************************/
+
+static int mqttc_net_recv(FAR void *ctx, FAR unsigned char *buf, size_t len)
+{
+  int fd = ((FAR mbedtls_net_context *)ctx)->fd;
+  int ret;
+
+  ret = recv(fd, buf, len, 0);
+  if (ret < 0)
+    {
+      if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+        {
+          return MBEDTLS_ERR_SSL_WANT_READ;
+        }
+
+      if (errno == EPIPE || errno == ECONNRESET)
+        {
+          return MBEDTLS_ERR_NET_CONN_RESET;
+        }
+
+      return MBEDTLS_ERR_NET_RECV_FAILED;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: mqttc_net_send
+ *
+ * Description:
+ *   mbedTLS BIO send callback, mirroring mqttc_net_recv() for the same
+ *   non-blocking/EAGAIN reason on the transmit side.
+ *
+ ****************************************************************************/
+
+static int mqttc_net_send(FAR void *ctx, FAR const unsigned char *buf,
+                          size_t len)
+{
+  int fd = ((FAR mbedtls_net_context *)ctx)->fd;
+  int ret;
+
+  ret = send(fd, buf, len, 0);
+  if (ret < 0)
+    {
+      if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+        {
+          return MBEDTLS_ERR_SSL_WANT_WRITE;
+        }
+
+      if (errno == EPIPE || errno == ECONNRESET)
+        {
+          return MBEDTLS_ERR_NET_CONN_RESET;
+        }
+
+      return MBEDTLS_ERR_NET_SEND_FAILED;
+    }
+
+  return ret;
+}
+
+#endif /* MQTT_USE_MBEDTLS */
+
+/****************************************************************************
+ * Name: client_refresher
+ *
+ * Description:
+ *   The client's refresher. This function triggers back-end routines to
+ *   handle ingress/egress traffic to the broker.
+ *
+ ****************************************************************************/
+
+static FAR void *client_refresher(FAR void *data)
+{
+  while (1)
+    {
+      mqtt_sync((FAR struct mqtt_client *)data);
+      usleep(100000U);
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: publish_callback
+ *
+ * Description:
+ *   Print received publish message.
+ *
+ ****************************************************************************/
+
+void publish_callback(void** unused, struct mqtt_response_publish *published)
+{
+  /* this is a byte stream, we have to convert it to C string */
+
+  char message[CONFIG_EXAMPLES_MQTTC_RXSIZE];
+
+  /* convert to C string (null terminated) */
+
+  size_t message_size = published->application_message_size;
+  if (message_size >= CONFIG_EXAMPLES_MQTTC_RXSIZE)
+    {
+      message_size = CONFIG_EXAMPLES_MQTTC_RXSIZE - 1;
+    }
+
+  memcpy(message, published->application_message, message_size);
+  message[message_size] = '\0';
+
+  printf("Received: %s\n", message);
+}
+
+/****************************************************************************
+ * Name: parsearg
+ *
+ * Description:
+ *   Parse command line arguments.
+ *
+ ****************************************************************************/
+
+static void parsearg(int argc, FAR char *argv[],
+                     FAR struct mqttc_cfg_s *cfg)
+{
+  int opt;
+
+  while ((opt = getopt(argc, argv, "h:p:t:q:" EXTRA_OPT)) != ERROR)
+    {
+      switch (opt)
+        {
+          case 'h':
+            cfg->host = optarg;
+            break;
+
+          case 'p':
+            cfg->port = optarg;
+            break;
+
+          case 't':
+            cfg->topic = optarg;
+            break;
+
+          case 'q':
+            switch (strtol(optarg, NULL, 10))
+              {
+                case 0L:
+                  cfg->qos = 0;
+                  break;
+                case 1L:
+                  cfg->qos = 1;
+                  break;
+                case 2L:
+                  cfg->qos = 2;
+                  break;
+                }
+            break;
+#ifdef MQTT_USE_MBEDTLS
+            case 'c':
+            cfg->ca_file = optarg;
+            break;
+#endif
+
+            default:
+            fprintf(stderr, "ERROR: Unrecognized option\n");
+            break;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: init_conn
+ *
+ * Description:
+ *   Resolve server's name and try to establish a connection.
+ *
+ ****************************************************************************/
+
+static int init_conn(FAR const struct mqttc_cfg_s *cfg,
+                     FAR struct mqtt_conn_context_s *conn,
+                     FAR mqtt_pal_socket_handle *socketfd)
+{
+#ifdef MQTT_USE_MBEDTLS
+  FAR mbedtls_net_context *net_ctx = &conn->net_ctx;
+  FAR mbedtls_ssl_context *ssl_ctx = &conn->ssl_ctx;
+  FAR mbedtls_ssl_config *ssl_conf = &conn->ssl_conf;
+  FAR mbedtls_x509_crt *ca_crt = &conn->ca_crt;
+  FAR mbedtls_entropy_context *entropy = &conn->entropy;
+  FAR mbedtls_ctr_drbg_context *ctr_drbg = &conn->ctr_drbg;
+  uint32_t result;
+
+  FAR const unsigned char *additional = (FAR const unsigned char *)"MQTT-C";
+  size_t additional_len = 6;
+#else
+  struct addrinfo hints;
+  FAR struct addrinfo *servinfo;
+  FAR struct addrinfo *itr;
+  int fd;
+#endif
+  int ret;
+
+  printf("Connecting to %s:%s...\n", cfg->host, cfg->port);
+
+#ifdef MQTT_USE_MBEDTLS
+  mbedtls_entropy_init(entropy);
+  mbedtls_ctr_drbg_init(ctr_drbg);
+  ret = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, entropy,
+                              additional, additional_len);
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_ctr_drbg_seed() failed: %d\n", ret);
+      goto err_with_ctr_drbg;
+    }
+
+  mbedtls_x509_crt_init(ca_crt);
+  if (cfg->ca_file != NULL)
+    {
+      ret = mbedtls_x509_crt_parse_file(ca_crt, cfg->ca_file);
+    }
+  else
+    {
+      ret = mbedtls_x509_crt_parse(ca_crt,
+        (FAR const unsigned char *)TEST_CA_CRT_RSA_SHA256_PEM,
+        sizeof(TEST_CA_CRT_RSA_SHA256_PEM));
+    }
+
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_x509_crt_parse_file() failed: %d\n", ret);
+      goto err_with_x509_crt;
+    }
+
+  mbedtls_ssl_config_init(ssl_conf);
+  ret = mbedtls_ssl_config_defaults(ssl_conf, MBEDTLS_SSL_IS_CLIENT,
+                                    MBEDTLS_SSL_TRANSPORT_STREAM,
+                                    MBEDTLS_SSL_PRESET_DEFAULT);
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_ssl_config_defaults() failed: %d\n", ret);
+      goto err_with_ssl_conf;
+    }
+
+  mbedtls_ssl_conf_ca_chain(ssl_conf, ca_crt, NULL);
+  mbedtls_ssl_conf_authmode(ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
+  mbedtls_ssl_conf_rng(ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
+
+  mbedtls_net_init(net_ctx);
+  ret = mbedtls_net_connect(net_ctx, cfg->host, cfg->port,
+                            MBEDTLS_NET_PROTO_TCP);
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_net_connect() failed: %d\n", ret);
+      goto err_with_net;
+    }
+
+  ret = mbedtls_net_set_nonblock(net_ctx);
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_net_set_nonblock() failed: %d\n", ret);
+      goto err_with_net;
+    }
+
+  mbedtls_ssl_init(ssl_ctx);
+  ret = mbedtls_ssl_setup(ssl_ctx, ssl_conf);
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_ssl_setup() failed: %d\n", ret);
+      goto err_with_ssl;
+    }
+
+  ret = mbedtls_ssl_set_hostname(ssl_ctx, cfg->host);
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_ssl_set_hostname() failed: %d\n", ret);
+      goto err_with_ssl;
+    }
+
+  mbedtls_ssl_set_bio(ssl_ctx, net_ctx,
+                      mqttc_net_send, mqttc_net_recv, NULL);
+
+  for (; ; )
+    {
+      uint32_t want = 0;
+      ret = mbedtls_ssl_handshake(ssl_ctx);
+      if (ret == MBEDTLS_ERR_SSL_WANT_READ)
+        {
+          want |= MBEDTLS_NET_POLL_READ;
+        }
+      else if (ret == MBEDTLS_ERR_SSL_WANT_WRITE)
+        {
+          want |= MBEDTLS_NET_POLL_WRITE;
+        }
+      else
+        {
+          break;
+        }
+
+      ret = mbedtls_net_poll(net_ctx, want, -1);
+      if (ret < 0)
+        {
+          printf("ERROR! mbedtls_net_poll() failed: %d\n", ret);
+          goto err_with_ssl;
+        }
+    }
+
+  if (ret != 0)
+    {
+      printf("ERROR! mbedtls_ssl_handshake() failed: %d\n", ret);
+      goto err_with_ssl;
+    }
+
+  result = mbedtls_ssl_get_verify_result(ssl_ctx);
+  if (result != 0)
+    {
+      if (result == 0xffffffff)
+        {
+          printf("ERROR! mbedtls_ssl_get_verify_result() failed\n");
+          goto err_with_ssl;
+        }
+      else
+        {
+#if defined(MBEDTLS_X509_REMOVE_INFO)
+          const char *buf = "";
+#else
+          char buf[512];
+          mbedtls_x509_crt_verify_info(buf, sizeof(buf), "\t", result);
+#endif
+          printf("Certificate verification failed (%0" PRIx32 ")\n%s\n",
+                 result, buf);
+
+#ifndef CONFIG_EXAMPLES_MQTTC_ALLOW_UNVERIFIED_TLS
+          goto err_with_ssl;
+#endif
+        }
+    }
+
+  *socketfd = ssl_ctx;
+
+  return 0;
+
+err_with_ssl:
+  mbedtls_ssl_free(ssl_ctx);
+err_with_net:
+  mbedtls_net_free(net_ctx);
+err_with_ssl_conf:
+  mbedtls_ssl_config_free(ssl_conf);
+err_with_x509_crt:
+  mbedtls_x509_crt_free(ca_crt);
+err_with_ctr_drbg:
+  mbedtls_ctr_drbg_free(ctr_drbg);
+  mbedtls_entropy_free(entropy);
+
+  return -1;
+#else
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family  = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+
+  ret = getaddrinfo(cfg->host, cfg->port, &hints, &servinfo);
+  if (ret != 0)
+    {
+      printf("ERROR! getaddrinfo() failed: %s\n", gai_strerror(ret));
+      return -1;
+    }
+
+  itr = servinfo;
+  do
+    {
+      fd = socket(itr->ai_family, itr->ai_socktype, itr->ai_protocol);
+      if (fd < 0)
+        {
+          continue;
+        }
+
+      ret = connect(fd, itr->ai_addr, itr->ai_addrlen);
+      if (ret == 0)
+        {
+          break;
+        }
+
+      close(fd);
+      fd = -1;
+    }
+  while ((itr = itr->ai_next) != NULL);
+
+  freeaddrinfo(servinfo);
+
+  if (fd < 0)
+    {
+      printf("ERROR! Couldn't create socket\n");
+      return -1;
+    }
+
+  ret = fcntl(fd, F_GETFL, 0);
+  if (ret < 0)
+    {
+      close(fd);
+      printf("ERROR! fcntl() F_GETFL failed, errno: %d\n", errno);
+      return -1;
+    }
+
+  ret = fcntl(fd, F_SETFL, ret | O_NONBLOCK);
+  if (ret < 0)
+    {
+      close(fd);
+      printf("ERROR! fcntl() F_SETFL failed, errno: %d\n", errno);
+      return -1;
+    }
+
+  *socketfd = fd;
+
+  return 0;
+#endif
+}
+
+/****************************************************************************
+ * Name: close_conn
+ *
+ * Description:
+ *   Shut down connection to server established by init_conn.
+ *
+ ****************************************************************************/
+
+static void close_conn(FAR struct mqtt_conn_context_s *conn)
+{
+#ifndef MQTT_USE_MBEDTLS
+  close(conn->client.socketfd);
+#else
+  mbedtls_net_free(&conn->net_ctx);
+  mbedtls_ssl_free(&conn->ssl_ctx);
+  mbedtls_ssl_config_free(&conn->ssl_conf);
+  mbedtls_x509_crt_free(&conn->ca_crt);
+  mbedtls_ctr_drbg_free(&conn->ctr_drbg);
+  mbedtls_entropy_free(&conn->entropy);
+#endif
+}
+
+/****************************************************************************
+ * Name: wait_for_network
+ *
+ * Description:
+ *   Block until the network interface has a usable IPv4 address (i.e. the
+ *   link is up and DHCP has completed) or a timeout elapses.  This avoids
+ *   the spurious first-attempt connect() failure that happens when the
+ *   example starts before Wi-Fi association/DHCP have finished.
+ *
+ ****************************************************************************/
+
+static void wait_for_network(void)
+{
+  struct in_addr addr;
+  int waited = 0;
+
+  for (; ; )
+    {
+      if (netlib_get_ipv4addr(MQTTC_NETIF, &addr) == 0 &&
+          addr.s_addr != INADDR_ANY &&
+          addr.s_addr != htonl(INADDR_LOOPBACK))
+        {
+          return;
+        }
+
+      if (waited >= MQTTC_NET_WAIT_MS)
+        {
+          return;
+        }
+
+      usleep(MQTTC_NET_POLL_MS * 1000);
+      waited += MQTTC_NET_POLL_MS;
+    }
+}
+
+/****************************************************************************
+ * Name: reconnect_client
+ *
+ * Description:
+ *   Reconnect callback registered with mqtt_init_reconnect().  MQTT-C calls
+ *   this whenever the client enters an error state, and once at start-up
+ *   (with client->error == MQTT_ERROR_INITIAL_RECONNECT) to set up the
+ *   initial session.  It tears down the previous connection, re-establishes
+ *   the transport (TCP + optional TLS), reinitializes the client and then
+ *   reconfigures the session (CONNECT + SUBSCRIBE).
+ *
+ ****************************************************************************/
+
+static void reconnect_client(FAR struct mqtt_client *client,
+                             FAR void **state)
+{
+  FAR struct mqttc_reconnect_s *rc =
+    *((FAR struct mqttc_reconnect_s **)state);
+  FAR const struct mqttc_cfg_s *cfg = rc->cfg;
+  FAR struct mqtt_conn_context_s *conn = rc->conn;
+  mqtt_pal_socket_handle socketfd;
+  enum MQTTErrors mqtterr;
+
+  /* Tear down the previous connection, unless this is the initial set-up
+   * call (in which case there is nothing to clean up yet).
+   */
+
+  if (client->error != MQTT_ERROR_INITIAL_RECONNECT)
+    {
+      printf("reconnect_client: reconnecting after error \"%s\"\n",
+             mqtt_error_str(client->error));
+      close_conn(conn);
+    }
+
+  /* (Re)establish the transport connection.
+   *
+   * mqtt_sync() unconditionally proceeds to recv/send on client->socketfd
+   * after this callback returns.  Until mqtt_reinit() runs, socketfd is the
+   * sentinel value -1 set by mqtt_init_reconnect(); in the mbedTLS build
+   * that is a pointer (0xffffffff) that mbedtls_ssl_read() would dereference
+   * and crash on.  We must therefore not return until a connection has
+   * actually been established, so retry with a short back-off on failure.
+   */
+
+  while (init_conn(cfg, conn, &socketfd) < 0)
+    {
+      printf("ERROR! init_conn() failed; retrying in %d s\n",
+             MQTTC_RECONNECT_DELAY_S);
+      sleep(MQTTC_RECONNECT_DELAY_S);
+    }
+
+  printf("Success: Connected to broker!\n");
+
+  /* Reinitialize the client with the fresh socket/SSL handle. */
+
+  mqtt_reinit(client, socketfd,
+              conn->sendbuf, sizeof(conn->sendbuf),
+              conn->recvbuf, sizeof(conn->recvbuf));
+
+  /* Send the connection request to the broker. */
+
+  mqtterr = mqtt_connect(client, cfg->id, NULL, NULL, 0, NULL, NULL,
+                         cfg->flags, cfg->tmo);
+  if (mqtterr != MQTT_OK)
+    {
+      printf("ERROR! mqtt_connect() failed: %s\n", mqtt_error_str(mqtterr));
+      return;
+    }
+
+  /* (Re)subscribe to the configured topic. */
+
+  mqtterr = mqtt_subscribe(client, cfg->topic, cfg->qos);
+  if (mqtterr != MQTT_OK)
+    {
+      printf("ERROR! mqtt_subscribe() failed: %s\n",
+             mqtt_error_str(mqtterr));
+    }
+}
+
+int main(int argc, FAR char * argv[])
+{
+  struct mqtt_conn_context_s mqtt_conn =
+    {
+      0
+    };
+
+  struct mqttc_reconnect_s reconnect_state;
+  int timeout = 100;
+  enum MQTTErrors mqtterr;
+  pthread_attr_t attr;
+  pthread_t thrdid;
+  struct mqttc_cfg_s mqtt_cfg =
+    {
+        .host = "broker.hivemq.com",
+    #ifndef MQTT_USE_MBEDTLS
+        .port = "1883",
+    #else
+        .port = "8883",
+    #endif
+        .topic = "test",
+        .msg = "NULL",
+        .flags = MQTT_CONNECT_CLEAN_SESSION,
+        .tmo = 400,
+        .id = NULL,
+        .user = NULL,
+        .pass = NULL,
+        .qos = MQTT_PUBLISH_QOS_0
+    };
+
+  parsearg(argc, argv, &mqtt_cfg);
+
+  /* Wait for the network to come up so the first connection attempt does not
+   * fail with ENETUNREACH
+   */
+
+  wait_for_network();
+
+  /* Bundle the configuration and connection context for the reconnect
+   * callback.  mqtt_init_reconnect() leaves the client in the
+   * MQTT_ERROR_INITIAL_RECONNECT state; the first mqtt_sync() (driven by the
+   * refresher thread) invokes reconnect_client(), which establishes the
+   * transport, calls mqtt_reinit() and then mqtt_connect()/mqtt_subscribe().
+   */
+
+  reconnect_state.cfg = &mqtt_cfg;
+  reconnect_state.conn = &mqtt_conn;
+
+  mqtt_init_reconnect(&mqtt_conn.client,
+                      reconnect_client, &reconnect_state,
+                      publish_callback);
+
+  /* Start a thread to refresh the client (handle egress and ingress client
+   * traffic)
+   */
+
+  if (pthread_attr_init(&attr) != 0)
+    {
+      printf("ERROR! pthread_attr_init() failed.\n");
+      goto err_with_conn;
+    }
+
+  pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_MQTTC_STACKSIZE);
+
+  if (pthread_create(&thrdid, &attr, client_refresher, &mqtt_conn.client))
+    {
+      printf("ERROR! pthread_create() failed.\n");
+      goto err_with_conn;
+    }
+
+  /* Wait for the initial MQTT connection to be acknowledged or time-out.
+   * On time-out we keep going anyway: the reconnect callback will continue
+   * retrying in the background.
+   */
+
+  while (!mqtt_conn.client.event_connect && --timeout > 0)
+    {
+      usleep(10000);
+    }
+
+  if (timeout == 0)
+    {
+      printf("WARNING! Initial connection timed out; "
+             "reconnect will keep retrying.\n");
+    }
+  else
+    {
+      printf("Success: Connected to broker!\n");
+    }
+
+  printf("Listening for %s.\nType q to exit.\n\n", mqtt_cfg.topic);
+
+  /* Wait for messages */
+
+  while (fgetc(stdin) != 'q');
+
+  /* Disconnect */
+
+  printf("\nDisconnecting from %s\n\n", mqtt_cfg.host);
+  mqtterr = mqtt_disconnect(&mqtt_conn.client);
+  if (mqtterr != MQTT_OK)
+    {
+      printf("ERROR! mqtt_disconnect() failed\n");
+    }
+
+  /* Force sending the DISCONNECT, the thread will be canceled before getting
+   * the chance to sync this last packet.
+   * Note however that close() would cleanly close the connection but only
+   * through TCP (i.e. no MQTT DISCONNECT packet).
+   */
+
+  mqtt_sync(&mqtt_conn.client);
+
+  pthread_cancel(thrdid);
+
+err_with_conn:
+  close_conn(&mqtt_conn);
+
+  return 0;
+}

From b39228cd41ed882bbaa0e62cdacccd4afea93790 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Sat, 11 Jul 2026 19:31:00 -0400
Subject: [PATCH 506/568] !examples/audio_rtttl: Implement example using RTTTL
 library

This commit fixes the audio_rtttl example (which was undocumented and
previously used kernel-level functions) such that now it uses the RTTTL
parsing library. Contributors can implement 'players' for different
types of audio sinks. Currently, PWM is supported.

BREAKING: The previous version of this example only supported a single
board (Spresense) and uses public interfaces from the kernel code. Now
it only uses user-space interfaces and supports any board implementing
those interfaces. Users who relied on the old behaviour should submit a
patch to add a new player to this application which uses the desired
audio sink for the Spresense through user-space interfaces.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 examples/audio_rttl/CMakeLists.txt    |   2 +-
 examples/audio_rttl/Kconfig           |  12 +-
 examples/audio_rttl/Makefile          |   2 +-
 examples/audio_rttl/audio_rttl.cxx    | 361 --------------------------
 examples/audio_rttl/audio_rttl.h      |  24 --
 examples/audio_rttl/audio_rttl_main.c | 305 ++++++++++++++++++++++
 include/.gitignore                    |   1 +
 7 files changed, 319 insertions(+), 388 deletions(-)
 delete mode 100644 examples/audio_rttl/audio_rttl.cxx
 delete mode 100644 examples/audio_rttl/audio_rttl.h
 create mode 100644 examples/audio_rttl/audio_rttl_main.c

diff --git a/examples/audio_rttl/CMakeLists.txt b/examples/audio_rttl/CMakeLists.txt
index ec7709bd3..3553cfec6 100644
--- a/examples/audio_rttl/CMakeLists.txt
+++ b/examples/audio_rttl/CMakeLists.txt
@@ -29,5 +29,5 @@ if(CONFIG_EXAMPLES_AUDIO_SOUND)
     STACKSIZE
     ${CONFIG_EXAMPLES_AUDIO_SOUND_STACKSIZE}
     SRCS
-    audio_rttl.cxx)
+    audio_rttl_main.c)
 endif()
diff --git a/examples/audio_rttl/Kconfig b/examples/audio_rttl/Kconfig
index 2dae260b0..3a594e867 100644
--- a/examples/audio_rttl/Kconfig
+++ b/examples/audio_rttl/Kconfig
@@ -5,9 +5,11 @@
 
 config EXAMPLES_AUDIO_SOUND
 	bool "Audio tone generator example (RTTL player)"
+	depends on AUDIO
+	depends on AUDIOUTILS_RTTTL_C
 	default n
 	---help---
-		Enable the audio RTTL player example
+		Enable the audio RTTL player example.
 
 if EXAMPLES_AUDIO_SOUND
 
@@ -23,4 +25,12 @@ config EXAMPLES_AUDIO_SOUND_STACKSIZE
 	int "Audio sound stack size"
 	default DEFAULT_TASK_STACKSIZE
 
+comment "Program options"
+
+config EXAMPLES_AUDIO_SOUND_MAXLEN
+	int "Maximum RTTL string length"
+	default 256
+	---help---
+		The maximum length of an RTTL string that can be read from a file.
+
 endif
diff --git a/examples/audio_rttl/Makefile b/examples/audio_rttl/Makefile
index 1816513a7..b2a4630b3 100644
--- a/examples/audio_rttl/Makefile
+++ b/examples/audio_rttl/Makefile
@@ -30,6 +30,6 @@ STACKSIZE = $(CONFIG_EXAMPLES_AUDIO_SOUND_STACKSIZE)
 
 # Audio Example
 
-MAINSRC = audio_rttl.cxx
+MAINSRC = audio_rttl_main.c
 
 include $(APPDIR)/Application.mk
diff --git a/examples/audio_rttl/audio_rttl.cxx b/examples/audio_rttl/audio_rttl.cxx
deleted file mode 100644
index 3533258c1..000000000
--- a/examples/audio_rttl/audio_rttl.cxx
+++ /dev/null
@@ -1,361 +0,0 @@
-/****************************************************************************
- * apps/examples/audio_rttl/audio_rttl.cxx
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <arch/board/board.h>
-#include <arch/chip/audio.h>
-
-#include "audio_rttl.h"
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/* Note - note freq on octave 1 */
-
-#define C 16.35
-#define CD 17.32
-#define D 18.35
-#define DE 19.45
-#define E 20.60
-#define F 21.83
-#define FG 23.12
-#define G 24.50
-#define A 27.50
-#define AB 29.14
-#define B 30.84
-
-/* Octave - base freq multiplier for the base freq */
-
-#define OCT2 4
-#define OCT3 8
-#define OCT4 16
-#define OCT5 32
-#define OCT6 64
-#define OCT7 128
-#define OCT8 256
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-extern "C" int main(int argc, FAR char *argv[])
-{
-  int freq;
-  float base_freq;
-  char temp_note;
-  int octave;
-  int duration;
-  int note_duration;
-  int base_duration;
-  int bpm;
-  int cnt;
-
-  /* Set I/O parameters for power on. */
-
-  if (!board_audio_power_control(true))
-    {
-      printf("Error: board_audio_power_control() failure.\n");
-      return 1;
-    }
-
-  printf("Start Audio RTTL player\n");
-
-  bpm = 0;
-  octave = 0;
-  base_duration = 0;
-  note_duration = 0;
-
-  while (*g_song != ':')
-    {
-      g_song++;
-    }
-
-  g_song++;
-
-  if (*g_song == 'd')
-    {
-      g_song = g_song + 2;
-      base_duration = *g_song - '0';
-      g_song++;
-      if ((*g_song >= '0') && (*g_song <= '9'))
-        {
-          base_duration = (base_duration * 10) + (*g_song - '0');
-          g_song++;
-        }
-
-      g_song++;
-    }
-
-  if (*g_song == 'o')
-    {
-      g_song = g_song + 2;
-      octave = *g_song - '0';
-      g_song = g_song + 2;
-    }
-
-  if (octave == 2)
-    {
-      octave = OCT2;
-    }
-  else if (octave == 3)
-    {
-      octave = OCT3;
-    }
-  else if (octave == 4)
-    {
-      octave = OCT4;
-    }
-  else if (octave == 5)
-    {
-      octave = OCT5;
-    }
-  else if (octave == 6)
-    {
-      octave = OCT6;
-    }
-  else if (octave == 7)
-    {
-      octave = OCT7;
-    }
-  else if (octave == 8)
-    {
-      octave = OCT8;
-    }
-
-  if (*g_song == 'b')
-    {
-      g_song = g_song + 2;
-      bpm = 0;
-      for (cnt = 1; cnt <= 3; cnt++)
-        {
-          if (*g_song != ':')
-            {
-              bpm = bpm * 10 + (*g_song - '0');
-              g_song++;
-            }
-
-        }
-
-      g_song++;
-    }
-
-  do
-    {
-      if ((*g_song >= '0') && (*g_song <= '9'))
-        {
-          note_duration = *g_song - '0';
-          g_song++;
-        }
-
-      if ((*g_song >= '0') && (*g_song <= '9'))
-        {
-          note_duration = (note_duration * 10) + (*g_song - '0');
-          g_song++;
-        }
-
-      if (note_duration > 0)
-        {
-          duration = ((60 * 1000L / bpm) * 4) / note_duration;
-        }
-      else
-        {
-          duration = ((60 * 1000L / bpm) * 4) / base_duration;
-        }
-
-      base_freq = 0;
-      temp_note = ' ';
-      switch (*g_song)
-        {
-        case 'c':
-          {
-            temp_note = 'c';
-            base_freq = C;
-            break;
-          }
-
-        case 'd':
-          {
-            temp_note = 'd';
-            base_freq = D;
-            break;
-          }
-
-        case 'e':
-          {
-            temp_note = 'e';
-            base_freq = E;
-            break;
-          }
-
-        case 'f':
-          {
-            temp_note = 'f';
-            base_freq = F;
-            break;
-          }
-
-        case 'g':
-          {
-            temp_note = 'g';
-            base_freq = G;
-            break;
-          }
-
-        case 'a':
-          {
-            temp_note = 'a';
-            base_freq = A;
-            break;
-          }
-
-        case 'b':
-          {
-            temp_note = 'b';
-            base_freq = B;
-            break;
-          }
-
-        case 'p':
-          {
-            temp_note = 'p';
-            break;
-          }
-
-        default:
-          break;
-        }
-
-      g_song++;
-
-      if (*g_song == '.')
-        {
-          duration += duration / 2;
-          g_song++;
-        }
-
-      if (*g_song == '#')
-        {
-          if (temp_note == 'c')
-            {
-              base_freq = CD;
-            }
-
-          if (temp_note == 'd')
-            {
-              base_freq = DE;
-            }
-
-          if (temp_note == 'f')
-            {
-              base_freq = FG;
-            }
-
-          if (temp_note == 'a')
-            {
-              base_freq = AB;
-            }
-
-          g_song++;
-        }
-
-      if ((*g_song - '0') == '2')
-        {
-          octave = OCT2;
-        }
-
-      if ((*g_song - '0') == '3')
-        {
-          octave = OCT3;
-        }
-
-      if ((*g_song - '0') == '4')
-        {
-          octave = OCT4;
-        }
-
-      if ((*g_song - '0') == '5')
-        {
-          octave = OCT5;
-        }
-
-      if ((*g_song - '0') == '6')
-        {
-          octave = OCT6;
-        }
-
-      if ((*g_song - '0') == '7')
-        {
-          octave = OCT7;
-        }
-
-      if ((*g_song - '0') == '8')
-        {
-          octave = OCT8;
-        }
-
-      g_song++;
-
-      if (*g_song == ',')
-        {
-          g_song++;
-        }
-
-      /* play the sound */
-
-      freq = ceil(base_freq * octave);
-
-      if (!board_audio_tone_generator(1, -40, freq))
-        {
-          break;
-        }
-
-      usleep(duration * 1000L);
-    }
-  while (*g_song);
-
-  /* Sound off. */
-
-  if (!board_audio_tone_generator(0, 0, 0))
-    {
-      printf("Error: board_audio_tone_generator() failure.\n");
-      return 1;
-    }
-
-  /* Set I/O parameters for power off. */
-
-  if (!board_audio_power_control(false))
-    {
-      printf("Error: board_audio_power_control() failure.\n");
-      return 1;
-    }
-
-  printf("Done.\n");
-
-  return 0;
-}
diff --git a/examples/audio_rttl/audio_rttl.h b/examples/audio_rttl/audio_rttl.h
deleted file mode 100644
index 41c5386d3..000000000
--- a/examples/audio_rttl/audio_rttl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * apps/examples/audio_rttl/audio_rttl.h
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-FAR char *g_song = (FAR char *)
-  "Test:d=4,o=6,b=90:c,c#,d,d#,e,f,f#,g,a,a#,b,p,b,a#,a,g,f#,f,e,d#,d,c#,c";
diff --git a/examples/audio_rttl/audio_rttl_main.c b/examples/audio_rttl/audio_rttl_main.c
new file mode 100644
index 000000000..5e9e7e960
--- /dev/null
+++ b/examples/audio_rttl/audio_rttl_main.c
@@ -0,0 +1,305 @@
+/****************************************************************************
+ * apps/examples/audio_rttl/audio_rttl_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <fcntl.h>
+#include <getopt.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+
+#ifdef CONFIG_PWM
+#include <nuttx/timers/pwm.h>
+#endif
+
+#include <audioutils/rtttl.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct player_s
+{
+  void (*play)(struct rtttl_tone); /* Play RTTTL sound function */
+  void (*teardown)(void);          /* Clean-up function */
+  void *arg;                       /* Private data for functions */
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Default song if none was passed. Otherwise, used as buffer for reading
+ * from a file.
+ */
+
+static char g_default_song[CONFIG_EXAMPLES_AUDIO_SOUND_MAXLEN] =
+    "Test:d=4,o=6,b=90:c,c#,d,d#,e,f,f#,g,a,a#,b,p,b,a#,a,g,"
+    "f#,f,e,d#,d,c#,c";
+
+/* The selected player is a global variable so it can be accessed from within
+ * the player functions properly.
+ */
+
+static struct player_s g_player;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: play_default
+ *
+ * Description:
+ *   The default player choice; prints an error and exits.
+ *
+ * Input Parameters:
+ *   sound - The sound to play
+ *
+ ****************************************************************************/
+
+static void play_default(struct rtttl_tone sound)
+{
+  fprintf(stderr, "No player selected!\n");
+  return;
+}
+
+/****************************************************************************
+ * Name: teardown_default
+ *
+ * Description:
+ *   Default tear-down function. Does nothing.
+ *
+ ****************************************************************************/
+
+static void teardown_default(void)
+{
+  /* No-op */
+
+  return;
+}
+
+#ifdef CONFIG_PWM
+
+/****************************************************************************
+ * Name: play_pwm
+ *
+ * Description:
+ *   RTTTL player for audio sinks using PWM devices
+ *
+ * Input Parameters:
+ *   sound - The sound to play
+ *
+ ****************************************************************************/
+
+static void play_pwm(struct rtttl_tone sound)
+{
+  int err;
+  int i;
+  struct pwm_info_s info;
+  int fd = *((int *)g_player.arg);
+
+  info.channels[0].channel = 1;
+  info.channels[0].duty = b16divi(uitoub16(50) - 1, 100); /* 50% duty cycle */
+  info.channels[0].cpol = PWM_CPOL_NDEF;                  /* Default */
+  info.channels[0].dcpol = PWM_DCPOL_NDEF;                /* Default */
+  info.frequency = sound.frequency_100hz / 100;
+
+  /* Copy settings to all channels */
+
+  for (i = 1; i < CONFIG_PWM_NCHANNELS; i++)
+    {
+      info.channels[i] = info.channels[0];
+      info.channels[i].channel = i + 1;
+    }
+
+  err = ioctl(fd, PWMIOC_SETCHARACTERISTICS, &info);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to set PWM characteristics: %d\n", errno);
+      return;
+    }
+
+  err = ioctl(fd, PWMIOC_START, 0);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to start PWM: %d\n", errno);
+      return;
+    }
+
+  usleep(sound.duration_us); /* Wait */
+
+  err = ioctl(fd, PWMIOC_STOP, 0);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to stop PWM: %d\n", errno);
+    }
+}
+
+/****************************************************************************
+ * Name: teardown_pwm
+ *
+ * Description:
+ *   Teardown function for PWM players
+ *
+ ****************************************************************************/
+
+static void teardown_pwm(void)
+{
+  int fd = *((int *)g_player.arg);
+  close(fd);
+}
+#endif /* CONFIG_PWM */
+
+/****************************************************************************
+ * Name: print_usage
+ *
+ * Description:
+ *   Prints out the usage information for the program.
+ *
+ * Input Parameters:
+ *   sink - The stream to output the usage information
+ *
+ ****************************************************************************/
+
+static void print_usage(FILE *sink)
+{
+  fprintf(sink, "USAGE: audio_rttl <device path> [-s string] [-f file]\n");
+  fprintf(sink, "Ex: audio_rttl /dev/tone0\n");
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  int err;
+  int fd;
+  int c;
+  FILE *fptr;
+  size_t bread;
+  const char *song = g_default_song;
+  const char *device = NULL;
+  const char *file = NULL;
+
+  g_player.play = play_default;
+  g_player.teardown = teardown_default;
+  g_player.arg = NULL;
+
+  while ((c = getopt(argc, argv, ":hs:f:")) != -1)
+    {
+      switch (c)
+        {
+        case 'h':
+          print_usage(stdout);
+          break;
+        case 's':
+          song = optarg;
+          break;
+        case 'f':
+          file = optarg;
+          break;
+        case '?':
+          fprintf(stderr, "Unknown option -%c\n", optopt);
+          print_usage(stderr);
+          return EXIT_FAILURE;
+        }
+    }
+
+  if (argc <= optind)
+    {
+      fprintf(stderr, "Missing argument for device path.\n");
+      return EXIT_FAILURE;
+    }
+
+  device = argv[optind++];
+
+  /* Based on the device path, we choose which player should be used and
+   * perform the setup.
+   */
+
+#ifdef CONFIG_PWM
+  if (strstr(device, "pwm"))
+    {
+      fd = open(device, O_RDWR);
+      if (fd < 0)
+        {
+          fprintf(stderr, "Failed to open %s: %d\n", device, errno);
+          return EXIT_FAILURE;
+        }
+      else
+        {
+          g_player.arg = &fd;
+        }
+
+      g_player.play = play_pwm;
+      g_player.teardown = teardown_pwm;
+    }
+#endif /* CONFIG_PWM */
+
+  /* If the user passed a file and a song string, use the string. Otherwise,
+   * read from the file
+   */
+
+  if (file != NULL && song == g_default_song)
+    {
+      fptr = fopen(file, "r");
+      if (fptr == NULL)
+        {
+          fprintf(stderr, "Couldn't open file '%s': %d", file, errno);
+          g_player.teardown();
+          return EXIT_FAILURE;
+        }
+
+      bread =
+          fread(g_default_song, sizeof(char), sizeof(g_default_song), fptr);
+
+      /* Ensure null termination of the string. */
+
+      if (bread <= sizeof(g_default_song))
+        {
+          g_default_song[bread - 1] = '\0';
+        }
+
+      fclose(fptr);
+    }
+
+  /* Play the song */
+
+  err = rtttl_play(song, g_player.play);
+  if (err != 0)
+    {
+      fprintf(stderr, "Failed to play song: %d\n", err);
+      return err;
+    }
+
+  /* Tear down the player and exit */
+
+  g_player.teardown();
+  return EXIT_SUCCESS;
+}
diff --git a/include/.gitignore b/include/.gitignore
index 9d6149edc..1c2896091 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,2 +1,3 @@
 /netutils/cJSON.h
 /netutils/cJSON_Utils.h
+/audioutils/rtttl.h

From 850f48134485e73eb7fd20173c107318b231ef66 Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Mon, 6 Jul 2026 05:25:10 +0800
Subject: [PATCH 507/568] examples: fix local socket address lengths

The configured path size already includes its NUL terminator. Adding
another byte made the maximum address length exceed sockaddr_un, while
ustream could write at sun_path[UNIX_PATH_MAX].

Use the existing bounded copy length directly as the path portion of
the socket address and rely on strlcpy for termination.

Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 examples/udgram/udgram_client.c   | 2 +-
 examples/udgram/udgram_server.c   | 2 +-
 examples/ustream/ustream_client.c | 3 +--
 examples/ustream/ustream_server.c | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/udgram/udgram_client.c b/examples/udgram/udgram_client.c
index f60abedf6..c0fd63a4f 100644
--- a/examples/udgram/udgram_client.c
+++ b/examples/udgram/udgram_client.c
@@ -100,7 +100,7 @@ int main(int argc, FAR char *argv[])
       server.sun_family = AF_LOCAL;
       strlcpy(server.sun_path, CONFIG_EXAMPLES_UDGRAM_ADDR, addrlen);
 
-      addrlen += sizeof(sa_family_t) + 1;
+      addrlen += sizeof(sa_family_t);
 
       /* Send the message */
 
diff --git a/examples/udgram/udgram_server.c b/examples/udgram/udgram_server.c
index 49674ff36..cd1cc928c 100644
--- a/examples/udgram/udgram_server.c
+++ b/examples/udgram/udgram_server.c
@@ -102,7 +102,7 @@ int main(int argc, FAR char *argv[])
   server.sun_family = AF_LOCAL;
   strlcpy(server.sun_path, CONFIG_EXAMPLES_UDGRAM_ADDR, addrlen);
 
-  addrlen += sizeof(sa_family_t) + 1;
+  addrlen += sizeof(sa_family_t);
 
   if (bind(sockfd, (struct sockaddr *)&server, addrlen) < 0)
     {
diff --git a/examples/ustream/ustream_client.c b/examples/ustream/ustream_client.c
index c7e69a56b..a80e185aa 100644
--- a/examples/ustream/ustream_client.c
+++ b/examples/ustream/ustream_client.c
@@ -88,10 +88,9 @@ int main(int argc, FAR char *argv[])
 
   myaddr.sun_family = AF_LOCAL;
   strlcpy(myaddr.sun_path, CONFIG_EXAMPLES_USTREAM_ADDR, addrlen);
-  myaddr.sun_path[addrlen] = '\0';
 
   printf("client: Connecting to %s...\n", CONFIG_EXAMPLES_USTREAM_ADDR);
-  addrlen += sizeof(sa_family_t) + 1;
+  addrlen += sizeof(sa_family_t);
   ret = connect(sockfd, (struct sockaddr *)&myaddr, addrlen);
   if (ret < 0)
     {
diff --git a/examples/ustream/ustream_server.c b/examples/ustream/ustream_server.c
index 8f6fffe40..a14c39574 100644
--- a/examples/ustream/ustream_server.c
+++ b/examples/ustream/ustream_server.c
@@ -88,9 +88,8 @@ int main(int argc, char *argv[])
 
   myaddr.sun_family = AF_LOCAL;
   strlcpy(myaddr.sun_path, CONFIG_EXAMPLES_USTREAM_ADDR, addrlen);
-  myaddr.sun_path[addrlen] = '\0';
 
-  addrlen += sizeof(sa_family_t) + 1;
+  addrlen += sizeof(sa_family_t);
   ret = bind(listensd, (struct sockaddr *)&myaddr, addrlen);
   if (ret < 0)
     {

From f5b2c354ca787cd9e4114b676cf8d3f01a6fb135 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sat, 11 Jul 2026 20:46:30 +0200
Subject: [PATCH 508/568] wireless/bluetooth/nimble: make transport ACL buffer
 count configurable

The controller<->host ACL pool was hardcoded to 10 buffers (~6 KiB with
the 251-byte ACL size). Expose NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT and
NIMBLE_TRANSPORT_ACL_FROM_HS_COUNT (default 10) so RAM-constrained
single-connection peripherals can lower it.

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 wireless/bluetooth/nimble/Kconfig                 | 12 ++++++++++++
 wireless/bluetooth/nimble/include/syscfg/syscfg.h |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/wireless/bluetooth/nimble/Kconfig b/wireless/bluetooth/nimble/Kconfig
index b679ec6bd..9be1030be 100644
--- a/wireless/bluetooth/nimble/Kconfig
+++ b/wireless/bluetooth/nimble/Kconfig
@@ -219,6 +219,18 @@ config NIMBLE_MSYS_2_BLOCK_SIZE
 	int "NimBLE MSYS_2 block size"
 	default 0
 
+config NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT
+	int "NimBLE transport ACL buffer count (controller to host)"
+	default 10
+	---help---
+		Number of ACL buffers in the transport pool.
+
+config NIMBLE_TRANSPORT_ACL_FROM_HS_COUNT
+	int "NimBLE transport ACL buffer count (host to controller)"
+	default 10
+	---help---
+		Number of ACL buffers in the transport pool.
+
 endmenu # "NimBLE memory configuration"
 
 config NIMBLE_PORTING_EXAMPLE
diff --git a/wireless/bluetooth/nimble/include/syscfg/syscfg.h b/wireless/bluetooth/nimble/include/syscfg/syscfg.h
index a10f5f3d3..22f93a5fa 100644
--- a/wireless/bluetooth/nimble/include/syscfg/syscfg.h
+++ b/wireless/bluetooth/nimble/include/syscfg/syscfg.h
@@ -57,8 +57,8 @@
 
 /* Transport configuration */
 
-#define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT     (10)
-#define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT     (10)
+#define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT     (CONFIG_NIMBLE_TRANSPORT_ACL_FROM_HS_COUNT)
+#define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT     (CONFIG_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT)
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE              (251)
 #define MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT             (4)
 #define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (16)

From eceb30e59cb038d15f90ebf4aac0990c6abd1e87 Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Tue, 14 Jul 2026 10:55:07 +0200
Subject: [PATCH 509/568] codespell: ignore ANS error

ignore ANS codespell error. ANS -> Alert Notification Service in bLE

Signed-off-by: raiden00pl <raiden00@railab.me>
---
 .codespell-ignore-lines | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codespell-ignore-lines b/.codespell-ignore-lines
index 92f702a35..5902decae 100644
--- a/.codespell-ignore-lines
+++ b/.codespell-ignore-lines
@@ -13,3 +13,4 @@
   MUSIC("betwee"), MUSIC("doom"),   MUSIC("the_da"), MUSIC("shawn"),
   MUSIC("messag"), MUSIC("count2"), MUSIC("ddtbl3"), MUSIC("ampie"),
   MUSIC("tense"),  MUSIC("shawn3"), MUSIC("openin"), MUSIC("evil"),
+/* ANS service */

From 62d04ed4846ec3346c001edd6965ee311499edde Mon Sep 17 00:00:00 2001
From: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
Date: Sat, 11 Jul 2026 12:59:27 +0800
Subject: [PATCH 510/568] system: fastboot: bound filedump path parsing

Parse the filedump path token into the existing PATH_MAX-sized buffer
before reading the optional offset and size arguments. This bounds the
write without constructing a scanf format string at runtime.

Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com>
---
 system/fastboot/fastboot.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/system/fastboot/fastboot.c b/system/fastboot/fastboot.c
index d443bb9c8..8c7448e3e 100644
--- a/system/fastboot/fastboot.c
+++ b/system/fastboot/fastboot.c
@@ -871,6 +871,7 @@ static void fastboot_filedump(FAR struct fastboot_ctx_s *ctx,
                               FAR const char *arg)
 {
   struct stat sb;
+  size_t len;
   int ret;
 
   if (!arg)
@@ -879,14 +880,30 @@ static void fastboot_filedump(FAR struct fastboot_ctx_s *ctx,
       return;
     }
 
-  ret = sscanf(arg, "%s %" PRIdOFF " %zu", ctx->upload_param.u.file.path,
-               &ctx->upload_param.u.file.offset, &ctx->upload_param.size);
-  if (ret != 1 && ret != 3)
+  arg += strspn(arg, " \t\r\n");
+  len = strcspn(arg, " \t\r\n");
+  if (len == 0)
     {
       fastboot_fail(ctx, "Failed to parse arguments");
       return;
     }
-  else if (ret == 1)
+
+  if (len >= sizeof(ctx->upload_param.u.file.path))
+    {
+      len = sizeof(ctx->upload_param.u.file.path) - 1;
+    }
+
+  memcpy(ctx->upload_param.u.file.path, arg, len);
+  ctx->upload_param.u.file.path[len] = '\0';
+
+  ret = sscanf(arg + len, "%" PRIdOFF " %zu",
+               &ctx->upload_param.u.file.offset, &ctx->upload_param.size);
+  if (ret != EOF && ret != 0 && ret != 2)
+    {
+      fastboot_fail(ctx, "Failed to parse arguments");
+      return;
+    }
+  else if (ret != 2)
     {
       ret = stat(ctx->upload_param.u.file.path, &sb);
       if (ret < 0)

From 09682dad05378607e537a92279883cdc6f8e4a38 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Wed, 15 Jul 2026 14:11:49 -0300
Subject: [PATCH 511/568] interpreters/python: support build without network

Adds options to support building when CONFIG_NET is not set.
This allows building Python for boards that do not have networking support.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 interpreters/python/Makefile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index c3acd5188..bac4013f8 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -119,6 +119,13 @@ ifeq ($(CONFIG_SYSTEM_SYSTEM),y)
 else
 	@echo "export ac_cv_func_system=\"no\"" >> $@
 endif
+ifeq ($(CONFIG_NET),y)
+	@echo "export ac_cv_func_getaddrinfo=\"yes\"" >> $@
+	@echo "export ac_cv_func_getnameinfo=\"yes\"" >> $@
+else
+	@echo "export ac_cv_func_getaddrinfo=\"no\"" >> $@
+	@echo "export ac_cv_func_getnameinfo=\"no\"" >> $@
+endif
 
 # The `Setup.local` file enables or disables Python modules.
 # Depending on the features enabled on NuttX, this file may need to be
@@ -134,6 +141,9 @@ endif
 ifneq ($(CONFIG_LIBC_DLFCN),y)
 	@echo "_ctypes" >> $@
 endif
+ifneq ($(CONFIG_NET),y)
+	@echo "_socket" >> $@
+endif
 
 # For the Python's `configure` script, please consider the following
 # when building for NuttX:
@@ -146,6 +156,12 @@ endif
 # Python/Modules/getpath.c (issue will be filed soon to track this
 # problem).
 
+ifneq ($(CONFIG_NET),y)
+PYTHON_CONFIGURE_EXTRAS = --disable-ipv6
+else
+PYTHON_CONFIGURE_EXTRAS =
+endif
+
 $(TARGETBUILD)/Makefile: $(HOSTPYTHON) $(CONFIG_SITE) $(SETUP_LOCAL)
 	$(Q) mkdir -p $(TARGETBUILD)/Modules
 	$(Q) mkdir -p $(TARGETMODULES)/python$(CPYTHON_VERSION_MINOR)
@@ -175,6 +191,7 @@ $(TARGETBUILD)/Makefile: $(HOSTPYTHON) $(CONFIG_SITE) $(SETUP_LOCAL)
 			 --without-pymalloc \
 			 --disable-test-modules \
 			 --with-ensurepip=no \
+			 $(PYTHON_CONFIGURE_EXTRAS) \
 		)
 	$(Q) sed -i 's/^#define HAVE_LIBB2 1/\/* #undef HAVE_LIBB2 *\//' $(TARGETBUILD)/pyconfig.h
 	$(Q) sed -i 's/-lb2//g' $(TARGETBUILD)/Makefile

From 5114ddd6c02d38d8bffa940edc2c2c7afb09b10c Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Mon, 22 Jun 2026 20:49:27 -0400
Subject: [PATCH 512/568] examples/baromonitor: New LVGL example which
 integrates with barometer

This example is an LVGL application which reads pressure and temperature
data from a barometer and displays it on gauges. It is intended to
provide an idea of what LVGL on NuttX can practically be used for in an
application.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 examples/baromonitor/CMakeLists.txt     |  35 ++
 examples/baromonitor/Kconfig            |  38 +++
 examples/baromonitor/Make.defs          |  25 ++
 examples/baromonitor/Makefile           |  36 ++
 examples/baromonitor/baromonitor_main.c | 419 ++++++++++++++++++++++++
 5 files changed, 553 insertions(+)
 create mode 100644 examples/baromonitor/CMakeLists.txt
 create mode 100644 examples/baromonitor/Kconfig
 create mode 100644 examples/baromonitor/Make.defs
 create mode 100644 examples/baromonitor/Makefile
 create mode 100644 examples/baromonitor/baromonitor_main.c

diff --git a/examples/baromonitor/CMakeLists.txt b/examples/baromonitor/CMakeLists.txt
new file mode 100644
index 000000000..e047922f8
--- /dev/null
+++ b/examples/baromonitor/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/examples/baromonitor/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_BAROMONITOR)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_BAROMONITOR_PROGNAME}
+    PRIORITY
+    ${CONFIG_EXAMPLES_BAROMONITOR_PRIORITY}
+    STACKSIZE
+    ${CONFIG_EXAMPLES_BAROMONITOR_STACKSIZE}
+    MODULE
+    ${CONFIG_EXAMPLES_BAROMONITOR}
+    SRCS
+    baromonitor_main.c)
+endif()
diff --git a/examples/baromonitor/Kconfig b/examples/baromonitor/Kconfig
new file mode 100644
index 000000000..7ef4f17bc
--- /dev/null
+++ b/examples/baromonitor/Kconfig
@@ -0,0 +1,38 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_BAROMONITOR
+	tristate "Barometer monitoring dashboard example"
+	default n
+	depends on UORB
+	depends on LIBC_FLOATINGPOINT
+	depends on GRAPHICS_LVGL
+	depends on LV_USE_NUTTX
+	depends on LV_FONT_MONTSERRAT_24
+	depends on LV_FONT_MONTSERRAT_32
+	---help---
+		Enable the barometer monitoring dashboard.
+
+if EXAMPLES_BAROMONITOR
+
+config EXAMPLES_BAROMONITOR_PROGNAME
+	string "Program name"
+	default "baromonitor"
+
+config EXAMPLES_BAROMONITOR_PRIORITY
+	int "Barometer monitor task priority"
+	default 100
+
+config EXAMPLES_BAROMONITOR_STACKSIZE
+	int "Baromonitor stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+config EXAMPLES_BAROMONITOR_SAMPLERATE
+	int "Sample rate (ms)"
+	default	50
+	---help---
+		Sample rate in milliseconds of barometer data.
+
+endif # EXAMPLES_BARO_DASHBOARD
diff --git a/examples/baromonitor/Make.defs b/examples/baromonitor/Make.defs
new file mode 100644
index 000000000..206ea679f
--- /dev/null
+++ b/examples/baromonitor/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/baromonitor/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_BAROMONITOR),)
+CONFIGURED_APPS += $(APPDIR)/examples/baromonitor
+endif
diff --git a/examples/baromonitor/Makefile b/examples/baromonitor/Makefile
new file mode 100644
index 000000000..8fe37e36f
--- /dev/null
+++ b/examples/baromonitor/Makefile
@@ -0,0 +1,36 @@
+############################################################################
+# apps/examples/baromonitor/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# BAROMONITOR Barometer sensor example built-in application info
+
+PROGNAME = $(CONFIG_EXAMPLES_BAROMONITOR_PROGNAME)
+PRIORITY = $(CONFIG_EXAMPLES_BAROMONITOR_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_BAROMONITOR_STACKSIZE)
+MODULE = $(CONFIG_EXAMPLES_BAROMONITOR)
+
+# BAROMONITOR Barometer sensor example
+
+MAINSRC = baromonitor_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/baromonitor/baromonitor_main.c b/examples/baromonitor/baromonitor_main.c
new file mode 100644
index 000000000..c3a93d6b9
--- /dev/null
+++ b/examples/baromonitor/baromonitor_main.c
@@ -0,0 +1,419 @@
+/****************************************************************************
+ * apps/examples/baromonitor/baromonitor_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <uORB/uORB.h>
+
+#include <lvgl/lvgl.h>
+
+#include <nuttx/sensors/sensor.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define PRESSURE_COLOUR 0xef4444
+#define TEMPERATURE_COLOUR 0x6366f1
+
+#define LINE_WIDTH (8)
+#define GAUGE_SIZE (600)
+
+/* Axis limits */
+
+#define PRESS_MIN (960)
+#define PRESS_MAX (1010)
+
+#define TEMP_MIN (-30)
+#define TEMP_MAX (60)
+#define TEMP_THRESH (TEMP_MAX - 10)
+
+#define PRESS_MAJOR_TICKS_EVERY (5)
+#define TEMP_MAJOR_TICKS_EVERY (5)
+
+#define NUM_TEMP_LABELS ((TEMP_MAX - TEMP_MIN) / TEMP_MAJOR_TICKS_EVERY)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const char *g_temp_labels[NUM_TEMP_LABELS + 1];
+static char g_label_buf[NUM_TEMP_LABELS][8];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_LV_USE_NUTTX_LIBUV
+static void lv_nuttx_uv_loop(uv_loop_t *loop, lv_nuttx_result_t *result)
+{
+  lv_nuttx_uv_t uv_info;
+  void *data;
+
+  uv_loop_init(loop);
+
+  lv_memset(&uv_info, 0, sizeof(uv_info));
+  uv_info.loop = loop;
+  uv_info.disp = result->disp;
+  uv_info.indev = result->indev;
+#ifdef CONFIG_UINPUT_TOUCH
+  uv_info.uindev = result->utouch_indev;
+#endif
+
+  data = lv_nuttx_uv_init(&uv_info);
+  uv_run(loop, UV_RUN_DEFAULT);
+  lv_nuttx_uv_deinit(&data);
+}
+#endif
+
+static void set_column_flex(lv_obj_t *obj)
+{
+  lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
+  lv_obj_set_style_flex_main_place(obj, LV_FLEX_ALIGN_CENTER, 0);
+  lv_obj_set_style_flex_cross_place(obj, LV_FLEX_ALIGN_CENTER, 0);
+  lv_obj_set_style_flex_track_place(obj, LV_FLEX_ALIGN_CENTER, 0);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * baromonitor_main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  lv_nuttx_dsc_t info;
+  lv_nuttx_result_t result;
+  lv_obj_t *screen;
+  lv_obj_t *gauge_cont;
+  lv_obj_t *press_gauge;
+  lv_obj_t *press_line;
+  lv_obj_t *press_cont;
+  lv_obj_t *press_label;
+  lv_obj_t *temp_gauge;
+  lv_obj_t *temp_line;
+  lv_obj_t *temp_cont;
+  lv_obj_t *temp_label;
+  lv_obj_t *title_cont;
+  lv_obj_t *title;
+  lv_scale_section_t *section;
+  lv_style_t indicator_style;
+  lv_style_t minor_ticks_style;
+  lv_style_t main_line_style;
+  lv_style_t section_label_style;
+  lv_style_t section_minor_ticks_style;
+  lv_style_t section_main_line_style;
+
+#ifdef CONFIG_LV_USE_NUTTX_LIBUV
+  uv_loop_t ui_loop;
+#endif
+
+  int err;
+  int fd;
+  bool got_data;
+  struct sensor_baro sensor_data;
+  unsigned instance = 0;
+  char topic[32];
+
+  if (argc == 2)
+    {
+      instance = atoi(argv[1]);
+    }
+
+  snprintf(topic, sizeof(topic), "sensor_baro%u", instance);
+
+  fd = orb_open("sensor_baro", instance, O_RDONLY | O_NONBLOCK);
+  if (fd < 0)
+    {
+      fprintf(stderr, "Could not open %s: %d\n", topic, errno);
+      return EXIT_FAILURE;
+    }
+
+  printf("Subscribed to %s\n", topic);
+
+  /* LVGL setup */
+
+#ifdef CONFIG_LV_USE_NUTTX_LIBUV
+  lv_memzero(&ui_loop, sizeof(ui_loop));
+#endif
+
+  if (!lv_is_initialized())
+    {
+      printf("Initializing LVGL...\n");
+      lv_init();
+      printf("LVGL initialized...\n");
+    }
+
+  lv_nuttx_dsc_init(&info);
+  lv_nuttx_init(&info, &result);
+
+  if (result.disp == NULL)
+    {
+      fprintf(stderr, "Failed to initialize LVGL.\n");
+      close(fd);
+      return EXIT_FAILURE;
+    }
+
+  /* Set up stuff to render */
+
+  screen = lv_screen_active();
+  set_column_flex(screen);
+
+  /* Create containers for layout. We want a spanning title, followed by two
+   * side-by-side containers for the gauges.
+   *
+   * Gauge container is therefore a ROW flex, while its inner containers are
+   * column flex (scale followed by a label below)
+   */
+
+  title_cont = lv_obj_create(screen);
+  lv_obj_set_size(title_cont, LV_PCT(100), LV_PCT(10));
+  lv_obj_align(title_cont, LV_ALIGN_CENTER, 0, 0);
+  title = lv_label_create(title_cont);
+  lv_label_set_text(title, "Barometer monitor");
+  lv_obj_set_style_text_font(title, &lv_font_montserrat_32, 0);
+  lv_obj_align(title, LV_ALIGN_CENTER, 0, 0);
+
+  gauge_cont = lv_obj_create(screen);
+  lv_obj_set_size(gauge_cont, LV_PCT(100), LV_PCT(90));
+  lv_obj_set_flex_flow(gauge_cont, LV_FLEX_FLOW_ROW);
+  lv_obj_set_style_flex_main_place(gauge_cont, LV_FLEX_ALIGN_CENTER, 0);
+  lv_obj_set_style_flex_cross_place(gauge_cont, LV_FLEX_ALIGN_CENTER, 0);
+  lv_obj_set_style_flex_track_place(gauge_cont, LV_FLEX_ALIGN_CENTER, 0);
+
+  press_cont = lv_obj_create(gauge_cont);
+  temp_cont = lv_obj_create(gauge_cont);
+  set_column_flex(press_cont);
+  set_column_flex(temp_cont);
+  lv_obj_set_size(press_cont, LV_PCT(50), LV_PCT(100));
+  lv_obj_set_size(temp_cont, LV_PCT(50), LV_PCT(100));
+
+  /* TODO: Get the text labels on the gauges to be padded better */
+
+  /* Pressure gauge */
+
+  press_gauge = lv_scale_create(press_cont);
+
+  lv_obj_set_size(press_gauge, GAUGE_SIZE, GAUGE_SIZE);
+  lv_scale_set_mode(press_gauge, LV_SCALE_MODE_ROUND_INNER);
+  lv_obj_set_style_bg_opa(press_gauge, LV_OPA_COVER, 0);
+  lv_obj_set_style_bg_color(press_gauge,
+                            lv_palette_lighten(LV_PALETTE_RED, 4), 0);
+  lv_obj_set_style_radius(press_gauge, LV_RADIUS_CIRCLE, 0);
+  lv_obj_set_style_clip_corner(press_gauge, true, 0);
+  lv_obj_set_style_text_font(press_gauge, &lv_font_montserrat_24, 0);
+  lv_obj_align(press_gauge, LV_ALIGN_LEFT_MID, LV_PCT(5), 0);
+
+  lv_scale_set_label_show(press_gauge, true);
+
+  lv_scale_set_total_tick_count(press_gauge, (PRESS_MAX - PRESS_MIN));
+  lv_scale_set_major_tick_every(press_gauge, PRESS_MAJOR_TICKS_EVERY);
+
+  lv_obj_set_style_length(press_gauge, 5, LV_PART_ITEMS);
+  lv_obj_set_style_length(press_gauge, 10, LV_PART_INDICATOR);
+  lv_scale_set_range(press_gauge, PRESS_MIN, PRESS_MAX);
+
+  lv_scale_set_angle_range(press_gauge, 270);
+  lv_scale_set_rotation(press_gauge, 135);
+
+  press_line = lv_line_create(press_gauge);
+
+  lv_obj_set_style_line_width(press_line, LINE_WIDTH, LV_PART_MAIN);
+  lv_obj_set_style_line_rounded(press_line, true, LV_PART_MAIN);
+  lv_obj_set_style_line_color(press_line, lv_color_black(), LV_PART_MAIN);
+  lv_obj_center(press_line);
+
+  /* Temperature gauge */
+
+  temp_gauge = lv_scale_create(temp_cont);
+  lv_obj_set_size(temp_gauge, GAUGE_SIZE, GAUGE_SIZE);
+  lv_scale_set_label_show(temp_gauge, true);
+  lv_scale_set_mode(temp_gauge, LV_SCALE_MODE_ROUND_OUTER);
+  lv_obj_align(temp_gauge, LV_ALIGN_RIGHT_MID, LV_PCT(-5), 0);
+
+  lv_scale_set_total_tick_count(temp_gauge, (TEMP_MAX - TEMP_MIN));
+  lv_scale_set_major_tick_every(temp_gauge, TEMP_MAJOR_TICKS_EVERY);
+  lv_obj_set_style_length(temp_gauge, 5, LV_PART_ITEMS);
+  lv_obj_set_style_length(temp_gauge, 10, LV_PART_INDICATOR);
+  lv_scale_set_range(temp_gauge, TEMP_MIN, TEMP_MAX);
+
+  lv_scale_set_angle_range(temp_gauge, 270);
+  lv_scale_set_rotation(temp_gauge, 135);
+
+  temp_line = lv_line_create(temp_gauge);
+
+  lv_obj_set_style_line_width(temp_line, LINE_WIDTH, LV_PART_MAIN);
+  lv_obj_set_style_line_rounded(temp_line, true, LV_PART_MAIN);
+  lv_obj_center(temp_line);
+
+  /* Generate labels */
+
+  for (unsigned i = 0; i < NUM_TEMP_LABELS; i++)
+    {
+      snprintf(g_label_buf[i], sizeof(g_label_buf[i]), "%d °C",
+               TEMP_MIN + i * (TEMP_MAX - TEMP_MIN) / NUM_TEMP_LABELS);
+      g_temp_labels[i] = (const char *)g_label_buf[i];
+    }
+
+  g_temp_labels[NUM_TEMP_LABELS] = NULL;
+
+  lv_scale_set_text_src(temp_gauge, g_temp_labels);
+
+  /* Temp gauge styles */
+
+  lv_style_init(&indicator_style);
+
+  lv_style_set_text_font(&indicator_style, &lv_font_montserrat_24);
+  lv_style_set_text_color(&indicator_style,
+                          lv_palette_darken(LV_PALETTE_BLUE, 3));
+
+  lv_style_set_line_color(&indicator_style,
+                          lv_palette_darken(LV_PALETTE_BLUE, 3));
+  lv_style_set_width(&indicator_style, 10U);     /* Tick length */
+  lv_style_set_line_width(&indicator_style, 2U); /* Tick width */
+  lv_obj_add_style(temp_gauge, &indicator_style, LV_PART_INDICATOR);
+
+  lv_style_init(&minor_ticks_style);
+  lv_style_set_line_color(&minor_ticks_style,
+                          lv_palette_lighten(LV_PALETTE_BLUE, 2));
+  lv_style_set_width(&minor_ticks_style, 5U);      /* Tick length */
+  lv_style_set_line_width(&minor_ticks_style, 2U); /* Tick width */
+  lv_obj_add_style(temp_gauge, &minor_ticks_style, LV_PART_ITEMS);
+
+  lv_style_init(&main_line_style);
+  lv_style_set_arc_color(&main_line_style,
+                         lv_palette_darken(LV_PALETTE_BLUE, 3));
+  lv_style_set_arc_width(&main_line_style, 2U); /* Tick width */
+
+  /* Section on temperature gauge */
+
+  lv_style_init(&section_label_style);
+  lv_style_init(&section_minor_ticks_style);
+  lv_style_init(&section_main_line_style);
+
+  lv_style_set_text_font(&section_label_style, &lv_font_montserrat_24);
+  lv_style_set_text_color(&section_label_style,
+                          lv_palette_darken(LV_PALETTE_RED, 3));
+
+  lv_style_set_line_color(&section_label_style,
+                          lv_palette_darken(LV_PALETTE_RED, 3));
+  lv_style_set_line_width(&section_label_style, 5U); /* Tick width */
+
+  lv_style_set_line_color(&section_minor_ticks_style,
+                          lv_palette_lighten(LV_PALETTE_RED, 2));
+  lv_style_set_line_width(&section_minor_ticks_style, 4U); /* Tick width */
+
+  lv_style_set_arc_color(&section_main_line_style,
+                         lv_palette_darken(LV_PALETTE_RED, 3));
+  lv_style_set_arc_width(&section_main_line_style, 4U); /* Tick width */
+
+  section = lv_scale_add_section(temp_gauge);
+  lv_scale_section_set_range(section, TEMP_THRESH, TEMP_MAX);
+  lv_scale_section_set_style(section, LV_PART_INDICATOR,
+                             &section_label_style);
+  lv_scale_section_set_style(section, LV_PART_ITEMS,
+                             &section_minor_ticks_style);
+  lv_scale_section_set_style(section, LV_PART_MAIN,
+                             &section_main_line_style);
+
+  /* Data labels */
+
+  press_label = lv_label_create(press_cont);
+  lv_obj_align(press_label, LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_text_font(press_label, &lv_font_montserrat_24, 0);
+  temp_label = lv_label_create(temp_cont);
+  lv_obj_align(temp_label, LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_text_font(temp_label, &lv_font_montserrat_24, 0);
+
+  /* Main loop */
+
+#ifdef CONFIG_LV_USE_NUTTX_LIBUV
+  lv_nuttx_uv_loop(&ui_loop, &result);
+#else
+  for (; ; )
+    {
+      err = read(fd, &sensor_data, sizeof(sensor_data));
+      if (err < 0)
+        {
+          fprintf(stderr, "Failed read data from %s: %d\n", topic, errno);
+        }
+      else if (err == 0)
+        {
+          fprintf(stderr, "No data from %s\n", topic);
+        }
+      else
+        {
+          got_data = true;
+        }
+
+      if (got_data)
+        {
+          /* Update display if we obtained it successfully */
+
+          lv_label_set_text_fmt(temp_label, "Temperature: %2.f °C",
+                                sensor_data.temperature);
+          lv_label_set_text_fmt(press_label, "Pressure: %2.f mbar",
+                                sensor_data.pressure);
+
+          lv_scale_set_line_needle_value(press_gauge, press_line, -10,
+                                         (int32_t)sensor_data.pressure);
+          lv_scale_set_line_needle_value(temp_gauge, temp_line, -10,
+                                         (int32_t)sensor_data.temperature);
+
+          if (sensor_data.temperature < TEMP_THRESH)
+            {
+              lv_obj_set_style_line_color(
+                  temp_line, lv_palette_darken(LV_PALETTE_BLUE, 3),
+                  LV_PART_MAIN);
+            }
+          else
+            {
+              lv_obj_set_style_line_color(
+                  temp_line, lv_palette_darken(LV_PALETTE_RED, 3),
+                  LV_PART_MAIN);
+            }
+
+          got_data = false; /* Reset for next loop */
+        }
+
+      lv_timer_handler();
+      usleep(CONFIG_EXAMPLES_BAROMONITOR_SAMPLERATE * 1000);
+
+      /* TODO: make this equivalent in LIBUV loop */
+    }
+#endif
+
+  orb_close(fd);
+  lv_nuttx_deinit(&result);
+  lv_deinit();
+  return EXIT_SUCCESS;
+}

From 7469e88bfa6cff5ce3dc90c0f01fde3c18b2e863 Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Sat, 18 Jul 2026 12:14:02 -0300
Subject: [PATCH 513/568] netutils/dropbear: retain child exit status for NSH
 PTY session

The per-session NSH task is reaped with waitpid() in
dropbear_nshsession.c.  Without CONFIG_SCHED_CHILD_STATUS the kernel does
not retain the child exit status, so waitpid() returns ECHILD right after
authentication and the interactive session never starts
("NSH session wait failed: Unknown error 10").

Depend on SCHED_HAVE_PARENT and SCHED_CHILD_STATUS (following the project's
depends-on-over-select convention) so the requirement is explicit; boards
enabling Dropbear must set these in their defconfig.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 netutils/dropbear/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
index 8e7c0868e..abf9f4574 100644
--- a/netutils/dropbear/Kconfig
+++ b/netutils/dropbear/Kconfig
@@ -10,6 +10,8 @@ menuconfig NETUTILS_DROPBEAR
 	depends on !DISABLE_PSEUDOFS_OPERATIONS
 	depends on !DISABLE_PTHREAD
 	depends on SCHED_WAITPID
+	depends on SCHED_HAVE_PARENT
+	depends on SCHED_CHILD_STATUS
 	depends on NSH_LIBRARY
 	depends on FSUTILS_PASSWD
 	depends on PSEUDOTERM

From 98f683dea826cd825c5cca6142dd0928f287d60f Mon Sep 17 00:00:00 2001
From: Ansh Rai <anshrai331@gmail.com>
Date: Thu, 16 Jul 2026 20:17:06 +0000
Subject: [PATCH 514/568] apps: Sanitize PROGNAME for _main symbol generation

Program names containing '-' (e.g. renaming hello to hello-world via
PROGNAME) previously generated an invalid identifier <PROGNAME>_main
when constructing internal entry-point symbols. This caused build
failures for C/C++ applications due to invalid identifiers in compiler
definitions and generated builtin_proto.h.

Introduce PROGSYM, a sanitized copy of PROGNAME with '-' replaced by
'_', and use it wherever an internal C/Zig identifier is constructed
(the -Dmain= defines, the Zig RENAMEMAIN rule, and the REGISTER
call's entry-point argument). Preserve the original PROGNAME for the
registered NSH command name and builtin registry entry, where hyphens
are valid and expected.

The Zig RENAMEMAIN path is also updated to use PROGSYM for consistency.
The current hello_zig and leds_zig examples do not exercise this path,
since neither uses a literal 'fn main' entry point, but the change
keeps symbol generation consistent for future Zig applications.

Testing (WSL2 Ubuntu, x86_64, sim:nsh):
- CONFIG_EXAMPLES_HELLO_PROGNAME="hello-world": clean build,
  'hello-world' runs and prints 'Hello, World!!'
- Reverted to default PROGNAME="hello": clean build, no regression
- Confirmed by inspection that RENAMEMAIN's sed substitution does not
  fire on either current .zig source (generated _tmp.zig is
  byte-identical to the source)

Fixes #19447

Signed-off-by: Ansh Rai <anshrai331@gmail.com>
---
 Application.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Application.mk b/Application.mk
index 1b6eab63e..5cba93f3d 100644
--- a/Application.mk
+++ b/Application.mk
@@ -122,6 +122,7 @@ ifneq ($(strip $(PROGNAME)),)
   NLIST := $(shell seq 1 $(words $(PROGNAME)))
   $(foreach i, $(NLIST), \
     $(eval PROGNAME_$(word $i,$(PROGOBJ)) := $(word $i,$(PROGNAME))) \
+    $(eval PROGSYM_$(word $i,$(PROGOBJ)) := $(subst -,_,$(word $i,$(PROGNAME)))) \
     $(eval PROGOBJ_$(word $i,$(PROGLIST)) := $(word $i,$(PROGOBJ))) \
     $(eval PRIORITY_$(word $i,$(REGLIST)) := \
         $(if $(word $i,$(PRIORITY)),$(word $i,$(PRIORITY)),$(lastword $(PRIORITY)))) \
@@ -223,7 +224,7 @@ endef
 # rename "main()" in $1 to "xxx_main()" and save to $2
 define RENAMEMAIN
 	$(ECHO_BEGIN)"Rename main() in $1 and save to $2"
-	$(Q) ${shell cat $1 | sed -e "s/fn[ ]\+main/fn $(addsuffix _main,$(PROGNAME_$@))/" > $2}
+	$(Q) ${shell cat $1 | sed -e "s/fn[ ]\+main/fn $(addsuffix _main,$(PROGSYM_$@))/" > $2}
 	$(ECHO_END)
 endef
 
@@ -319,14 +320,14 @@ install:: $(PROGLIST)
 else
 
 $(MAINCXXOBJ): $(PREFIX)%$(CXXEXT)$(SUFFIX)$(OBJEXT): %$(CXXEXT)
-	$(eval $<_CXXFLAGS += ${shell $(DEFINE) "$(CXX)" main=$(addsuffix _main,$(PROGNAME_$@))})
-	$(eval $<_CXXELFFLAGS += ${shell $(DEFINE) "$(CXX)" main=$(addsuffix _main,$(PROGNAME_$@))})
+	$(eval $<_CXXFLAGS += ${shell $(DEFINE) "$(CXX)" main=$(addsuffix _main,$(PROGSYM_$@))})
+	$(eval $<_CXXELFFLAGS += ${shell $(DEFINE) "$(CXX)" main=$(addsuffix _main,$(PROGSYM_$@))})
 	$(if $(and $(CONFIG_MODULES),$(MODCXXFLAGS)), \
 		$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))
 
 $(MAINCOBJ): $(PREFIX)%.c$(SUFFIX)$(OBJEXT): %.c
-	$(eval $<_CFLAGS += ${DEFINE_PREFIX}main=$(addsuffix _main,$(PROGNAME_$@)))
-	$(eval $<_CELFFLAGS += ${DEFINE_PREFIX}main=$(addsuffix _main,$(PROGNAME_$@)))
+	$(eval $<_CFLAGS += ${DEFINE_PREFIX}main=$(addsuffix _main,$(PROGSYM_$@)))
+	$(eval $<_CELFFLAGS += ${DEFINE_PREFIX}main=$(addsuffix _main,$(PROGSYM_$@)))
 	$(if $(and $(CONFIG_MODULES),$(MODCFLAGS)), \
 		$(call ELFCOMPILE, $<, $@), $(call COMPILE, $<, $@))
 
@@ -362,10 +363,11 @@ ifeq ($(DO_REGISTRATION),y)
 
 $(REGLIST): $(DEPCONFIG) Makefile
 	$(eval PROGNAME_$@ := $(basename $(notdir $@)))
+	$(eval PROGSYM_$@ := $(subst -,_,$(PROGNAME_$@)))
 ifeq ($(CONFIG_SCHED_USER_IDENTITY),y)
-	$(call REGISTER,$(PROGNAME_$@),$(PRIORITY_$@),$(STACKSIZE_$@),$(if $(BUILD_MODULE),,$(PROGNAME_$@)_main),$(UID_$@),$(GID_$@),$(MODE_$@))
+	$(call REGISTER,$(PROGNAME_$@),$(PRIORITY_$@),$(STACKSIZE_$@),$(if $(BUILD_MODULE),,$(PROGSYM_$@)_main),$(UID_$@),$(GID_$@),$(MODE_$@))
 else
-	$(call REGISTER,$(PROGNAME_$@),$(PRIORITY_$@),$(STACKSIZE_$@),$(if $(BUILD_MODULE),,$(PROGNAME_$@)_main))
+	$(call REGISTER,$(PROGNAME_$@),$(PRIORITY_$@),$(STACKSIZE_$@),$(if $(BUILD_MODULE),,$(PROGSYM_$@)_main))
 endif
 
 register:: $(REGLIST)

From 865393d419994015bb60e74c859eb1341f163b4f Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Sun, 19 Jul 2026 13:46:50 -0300
Subject: [PATCH 515/568] system/curl: add a small curl-like HTTP client
 command

Add the "curl" NSH command: a command-line HTTP client built on top of
the netutils webclient library. It implements a subset of the real curl
options: GET and POST (and other methods via -X), custom request headers
(-H), a raw request body (-d, including -d @file), multipart/form-data
file uploads (-F name=@file), saving the response body to a file (-o)
and verbose output (-v). HTTP only (no HTTPS).

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 system/curl/CMakeLists.txt |  33 ++
 system/curl/Kconfig        |  42 ++
 system/curl/Make.defs      |  25 ++
 system/curl/Makefile       |  36 ++
 system/curl/curl_main.c    | 860 +++++++++++++++++++++++++++++++++++++
 5 files changed, 996 insertions(+)
 create mode 100644 system/curl/CMakeLists.txt
 create mode 100644 system/curl/Kconfig
 create mode 100644 system/curl/Make.defs
 create mode 100644 system/curl/Makefile
 create mode 100644 system/curl/curl_main.c

diff --git a/system/curl/CMakeLists.txt b/system/curl/CMakeLists.txt
new file mode 100644
index 000000000..ff48d44a1
--- /dev/null
+++ b/system/curl/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/system/curl/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_CURL)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_SYSTEM_CURL_PROGNAME}
+    SRCS
+    curl_main.c
+    STACKSIZE
+    ${CONFIG_SYSTEM_CURL_STACKSIZE}
+    PRIORITY
+    ${CONFIG_SYSTEM_CURL_PRIORITY})
+endif()
diff --git a/system/curl/Kconfig b/system/curl/Kconfig
new file mode 100644
index 000000000..ca2963aff
--- /dev/null
+++ b/system/curl/Kconfig
@@ -0,0 +1,42 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_CURL
+	tristate "curl HTTP command"
+	default n
+	depends on NETUTILS_WEBCLIENT
+	---help---
+		Enable the "curl" command: a small command-line HTTP client
+		supporting GET and POST (and other methods via -X), custom
+		headers (-H), a raw request body (-d, including -d @file) and
+		multipart/form-data file uploads (-F name=@file), built on top
+		of the netutils webclient library. HTTP only (no HTTPS).
+
+if SYSTEM_CURL
+
+config SYSTEM_CURL_PROGNAME
+	string "Program name"
+	default "curl"
+	---help---
+		This is the name of the program that will be used when the
+		NSH ELF program is installed.
+
+config SYSTEM_CURL_PRIORITY
+	int "curl task priority"
+	default 100
+
+config SYSTEM_CURL_STACKSIZE
+	int "curl stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+config SYSTEM_CURL_BUFFERSIZE
+	int "curl transfer buffer size"
+	default 512
+	---help---
+		Size of the buffer used to hold the request/response headers and
+		to stream body data. It must be large enough to hold the whole
+		request header line and the whole response header.
+
+endif
diff --git a/system/curl/Make.defs b/system/curl/Make.defs
new file mode 100644
index 000000000..4003825c7
--- /dev/null
+++ b/system/curl/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/curl/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_CURL),)
+CONFIGURED_APPS += $(APPDIR)/system/curl
+endif
diff --git a/system/curl/Makefile b/system/curl/Makefile
new file mode 100644
index 000000000..70469e218
--- /dev/null
+++ b/system/curl/Makefile
@@ -0,0 +1,36 @@
+############################################################################
+# apps/system/curl/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# curl built-in application info
+
+PROGNAME  = $(CONFIG_SYSTEM_CURL_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_CURL_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_CURL_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_CURL)
+
+# curl command
+
+MAINSRC = curl_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/system/curl/curl_main.c b/system/curl/curl_main.c
new file mode 100644
index 000000000..11837c625
--- /dev/null
+++ b/system/curl/curl_main.c
@@ -0,0 +1,860 @@
+/****************************************************************************
+ * apps/system/curl/curl_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <libgen.h>
+
+#include "netutils/webclient.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_SYSTEM_CURL_BUFFERSIZE
+#  define CONFIG_SYSTEM_CURL_BUFFERSIZE 512
+#endif
+
+/* Limits for user-provided -H headers and -F form fields. */
+
+#define CURL_MAX_HEADERS 12
+#define CURL_MAX_FORMS   8
+
+/* Each form field expands to at most 3 body chunks (part header, content,
+ * trailing CRLF), plus one final closing-boundary chunk.
+ */
+
+#define CURL_MAX_CHUNKS (CURL_MAX_FORMS * 3 + 1)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* A single piece of the request body. It is either a block of memory
+ * (fd < 0, data in "mem") or the contents of an open file (fd >= 0).
+ */
+
+struct curl_chunk_s
+{
+  int        fd;   /* >= 0: read from this file; < 0: use "mem"         */
+  FAR char  *mem;  /* Heap buffer owned by this chunk (freed on cleanup) */
+  size_t     len;  /* Total number of bytes in this chunk               */
+  size_t     off;  /* Bytes already consumed                            */
+};
+
+/* The full request body, streamed chunk by chunk. */
+
+struct curl_body_s
+{
+  struct curl_chunk_s chunks[CURL_MAX_CHUNKS];
+  int nchunks;
+  int cur;
+};
+
+/* Destination for the response body. */
+
+struct curl_sink_s
+{
+  int fd;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: curl_guess_mime
+ *
+ * Description:
+ *   Very small extension-to-MIME map for the common cases. Anything else
+ *   defaults to application/octet-stream, exactly like curl's fallback.
+ *
+ ****************************************************************************/
+
+static FAR const char *curl_guess_mime(FAR const char *name)
+{
+  FAR const char *dot = strrchr(name, '.');
+
+  if (dot != NULL)
+    {
+      if (strcasecmp(dot, ".png") == 0)
+        {
+          return "image/png";
+        }
+
+      if (strcasecmp(dot, ".jpg") == 0 || strcasecmp(dot, ".jpeg") == 0)
+        {
+          return "image/jpeg";
+        }
+
+      if (strcasecmp(dot, ".gif") == 0)
+        {
+          return "image/gif";
+        }
+
+      if (strcasecmp(dot, ".json") == 0)
+        {
+          return "application/json";
+        }
+
+      if (strcasecmp(dot, ".txt") == 0)
+        {
+          return "text/plain";
+        }
+    }
+
+  return "application/octet-stream";
+}
+
+/****************************************************************************
+ * Name: curl_add_mem_chunk
+ *
+ * Description:
+ *   Append a memory chunk. Takes ownership of "mem" (heap allocated).
+ *
+ ****************************************************************************/
+
+static int curl_add_mem_chunk(FAR struct curl_body_s *body, FAR char *mem,
+                              size_t len)
+{
+  FAR struct curl_chunk_s *c;
+
+  if (body->nchunks >= CURL_MAX_CHUNKS)
+    {
+      return -ENOSPC;
+    }
+
+  c = &body->chunks[body->nchunks++];
+  c->fd  = -1;
+  c->mem = mem;
+  c->len = len;
+  c->off = 0;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: curl_add_file_chunk
+ *
+ * Description:
+ *   Append a file chunk. Takes ownership of the open descriptor "fd".
+ *
+ ****************************************************************************/
+
+static int curl_add_file_chunk(FAR struct curl_body_s *body, int fd,
+                               size_t len)
+{
+  FAR struct curl_chunk_s *c;
+
+  if (body->nchunks >= CURL_MAX_CHUNKS)
+    {
+      return -ENOSPC;
+    }
+
+  c = &body->chunks[body->nchunks++];
+  c->fd  = fd;
+  c->mem = NULL;
+  c->len = len;
+  c->off = 0;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: curl_add_str_chunk
+ *
+ * Description:
+ *   Convenience wrapper: duplicate a string and append it as a memory
+ *   chunk.
+ *
+ ****************************************************************************/
+
+static int curl_add_str_chunk(FAR struct curl_body_s *body,
+                              FAR const char *str, size_t len)
+{
+  FAR char *dup = strdup(str);
+  int ret;
+
+  if (dup == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  ret = curl_add_mem_chunk(body, dup, len);
+  if (ret < 0)
+    {
+      free(dup);
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: curl_body_cleanup
+ ****************************************************************************/
+
+static void curl_body_cleanup(FAR struct curl_body_s *body)
+{
+  int i;
+
+  for (i = 0; i < body->nchunks; i++)
+    {
+      FAR struct curl_chunk_s *c = &body->chunks[i];
+
+      if (c->fd >= 0)
+        {
+          close(c->fd);
+        }
+
+      free(c->mem);
+    }
+
+  body->nchunks = 0;
+}
+
+/****************************************************************************
+ * Name: curl_body_total
+ ****************************************************************************/
+
+static size_t curl_body_total(FAR const struct curl_body_s *body)
+{
+  size_t total = 0;
+  int i;
+
+  for (i = 0; i < body->nchunks; i++)
+    {
+      total += body->chunks[i].len;
+    }
+
+  return total;
+}
+
+/****************************************************************************
+ * Name: curl_body_callback
+ *
+ * Description:
+ *   webclient request-body provider. Fills "buffer" with up to *sizep bytes
+ *   pulled sequentially from the chunk list. Called repeatedly by webclient
+ *   until exactly bodylen bytes have been produced.
+ *
+ ****************************************************************************/
+
+static int curl_body_callback(FAR void *buffer, FAR size_t *sizep,
+                              FAR const void * FAR *datap, size_t reqsize,
+                              FAR void *arg)
+{
+  FAR struct curl_body_s *body = (FAR struct curl_body_s *)arg;
+  FAR char *out = (FAR char *)buffer;
+  size_t cap = *sizep;
+  size_t done = 0;
+
+  (void)reqsize;
+  (void)datap;
+
+  while (done < cap && body->cur < body->nchunks)
+    {
+      FAR struct curl_chunk_s *c = &body->chunks[body->cur];
+      size_t remain = c->len - c->off;
+      size_t want;
+
+      if (remain == 0)
+        {
+          body->cur++;
+          continue;
+        }
+
+      want = cap - done;
+      if (want > remain)
+        {
+          want = remain;
+        }
+
+      if (c->fd < 0)
+        {
+          memcpy(out + done, c->mem + c->off, want);
+          c->off += want;
+          done   += want;
+        }
+      else
+        {
+          ssize_t n = read(c->fd, out + done, want);
+          if (n < 0)
+            {
+              return -errno;
+            }
+
+          if (n == 0)
+            {
+              /* Short file: the pre-computed Content-Length can no longer
+               * be honoured, so fail rather than send a truncated body.
+               */
+
+              return -EIO;
+            }
+
+          c->off += n;
+          done   += n;
+        }
+    }
+
+  *sizep = done;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: curl_sink_callback
+ *
+ * Description:
+ *   webclient response-body consumer. Writes each chunk to the destination
+ *   file descriptor (stdout or the -o file).
+ *
+ ****************************************************************************/
+
+static int curl_sink_callback(FAR char **buffer, int offset, int datend,
+                              FAR int *buflen, FAR void *arg)
+{
+  FAR struct curl_sink_s *sink = (FAR struct curl_sink_s *)arg;
+  int len = datend - offset;
+
+  (void)buflen;
+
+  while (len > 0)
+    {
+      ssize_t n = write(sink->fd, *buffer + offset, len);
+      if (n < 0)
+        {
+          return -errno;
+        }
+
+      offset += n;
+      len    -= n;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: curl_header_callback
+ ****************************************************************************/
+
+static int curl_header_callback(FAR const char *line, bool truncated,
+                                FAR void *arg)
+{
+  (void)truncated;
+  (void)arg;
+
+  fprintf(stderr, "< %s\n", line);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: curl_add_form
+ *
+ * Description:
+ *   Parse a single -F "name=value" or -F "name=@path[;type=mime]" spec and
+ *   append the corresponding multipart chunks to the body.
+ *
+ ****************************************************************************/
+
+static int curl_add_form(FAR struct curl_body_s *body,
+                         FAR const char *boundary, FAR const char *spec)
+{
+  char hdr[256];
+  FAR const char *eq;
+  FAR const char *value;
+  FAR char name[64];
+  size_t namelen;
+  int len;
+  int ret;
+
+  eq = strchr(spec, '=');
+  if (eq == NULL)
+    {
+      fprintf(stderr, "curl: bad -F spec '%s' (want name=value)\n", spec);
+      return -EINVAL;
+    }
+
+  namelen = eq - spec;
+  if (namelen >= sizeof(name))
+    {
+      return -E2BIG;
+    }
+
+  memcpy(name, spec, namelen);
+  name[namelen] = '\0';
+  value = eq + 1;
+
+  if (value[0] == '@')
+    {
+      /* File upload: name=@path[;type=mime] */
+
+      FAR const char *path = value + 1;
+      FAR const char *mime;
+      FAR char *typesep;
+      char pathbuf[CONFIG_WEBCLIENT_MAXFILENAME];
+      struct stat st;
+      int fd;
+
+      strlcpy(pathbuf, path, sizeof(pathbuf));
+      typesep = strchr(pathbuf, ';');
+      if (typesep != NULL && strncmp(typesep, ";type=", 6) == 0)
+        {
+          *typesep = '\0';
+          mime = typesep + 6;
+        }
+      else
+        {
+          mime = curl_guess_mime(pathbuf);
+        }
+
+      fd = open(pathbuf, O_RDONLY | O_CLOEXEC);
+      if (fd < 0)
+        {
+          fprintf(stderr, "curl: cannot open '%s': %d\n", pathbuf, errno);
+          return -errno;
+        }
+
+      if (fstat(fd, &st) < 0)
+        {
+          fprintf(stderr, "curl: stat '%s' failed: %d\n", pathbuf, errno);
+          close(fd);
+          return -errno;
+        }
+
+      len = snprintf(hdr, sizeof(hdr),
+                     "--%s\r\n"
+                     "Content-Disposition: form-data; name=\"%s\"; "
+                     "filename=\"%s\"\r\n"
+                     "Content-Type: %s\r\n\r\n",
+                     boundary, name, basename(pathbuf), mime);
+      if (len < 0 || len >= sizeof(hdr))
+        {
+          close(fd);
+          return -E2BIG;
+        }
+
+      ret = curl_add_str_chunk(body, hdr, len);
+      if (ret < 0)
+        {
+          close(fd);
+          return ret;
+        }
+
+      ret = curl_add_file_chunk(body, fd, st.st_size);
+      if (ret < 0)
+        {
+          close(fd);
+          return ret;
+        }
+    }
+  else
+    {
+      /* Plain text field: name=value */
+
+      len = snprintf(hdr, sizeof(hdr),
+                     "--%s\r\n"
+                     "Content-Disposition: form-data; name=\"%s\"\r\n\r\n",
+                     boundary, name);
+      if (len < 0 || len >= sizeof(hdr))
+        {
+          return -E2BIG;
+        }
+
+      ret = curl_add_str_chunk(body, hdr, len);
+      if (ret < 0)
+        {
+          return ret;
+        }
+
+      ret = curl_add_str_chunk(body, value, strlen(value));
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
+
+  /* Trailing CRLF that terminates this part's content. */
+
+  return curl_add_str_chunk(body, "\r\n", 2);
+}
+
+/****************************************************************************
+ * Name: curl_usage
+ ****************************************************************************/
+
+static void curl_usage(FAR const char *progname)
+{
+  fprintf(stderr,
+    "Usage: %s [options] <url>\n"
+    "  -X <method>        HTTP method (default GET, or POST with -d/-F).\n"
+    "  -d <data>          Request body. Use -d @file to read from a file.\n"
+    "  --data-binary <d>  Like -d but never interprets @-less data.\n"
+    "  -F <name=content>  multipart/form-data field. Use name=@file to\n"
+    "                     upload a file. Repeatable. Implies POST.\n"
+    "  -H <header>        Add a request header. Repeatable.\n"
+    "  -o, --output <f>   Write response body to <f> instead of stdout.\n"
+    "  -v                 Verbose: print response headers to stderr.\n"
+    "  -h                 Show this help.\n"
+    "\n"
+    "Only http:// URLs are supported (no HTTPS). A scheme-less URL such\n"
+    "as host:port/path is treated as http://host:port/path.\n",
+    progname);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR const char *headers[CURL_MAX_HEADERS];
+  FAR const char *forms[CURL_MAX_FORMS];
+  FAR const char *method  = NULL;
+  FAR const char *data    = NULL;
+  FAR const char *rawurl  = NULL;
+  FAR const char *outfile = NULL;
+  struct webclient_context ctx;
+  struct curl_body_s body;
+  struct curl_sink_s sink;
+  char boundary[48];
+
+  /* Sized so the compiler can prove the Content-Type snprintf never
+   * truncates: the fixed prefix (including its NUL) plus the largest
+   * possible boundary string.
+   */
+
+  char ctype[sizeof("Content-Type: multipart/form-data; boundary=") +
+             sizeof(boundary)];
+  char urlbuf[CONFIG_WEBCLIENT_MAXHOSTNAME + CONFIG_WEBCLIENT_MAXFILENAME +
+              16];
+  FAR const char *url;
+  FAR char *buffer = NULL;
+  unsigned int nheaders = 0;
+  unsigned int nforms   = 0;
+  bool have_ctype = false;
+  bool verbose    = false;
+  int ret;
+  int opt;
+  unsigned int i;
+
+  struct option long_options[] =
+  {
+    {"data",        required_argument, NULL, 'd'},
+    {"data-binary", required_argument, NULL, 'B'},
+    {"form",        required_argument, NULL, 'F'},
+    {"header",      required_argument, NULL, 'H'},
+    {"request",     required_argument, NULL, 'X'},
+    {"output",      required_argument, NULL, 'o'},
+    {"verbose",     no_argument,       NULL, 'v'},
+    {"help",        no_argument,       NULL, 'h'},
+    {NULL,          0,                 NULL, 0}
+  };
+
+  body.nchunks = 0;
+  body.cur     = 0;
+
+  while ((opt = getopt_long(argc, argv, "X:d:F:H:o:vh",
+                            long_options, NULL)) != ERROR)
+    {
+      switch (opt)
+        {
+          case 'X':
+            method = optarg;
+            break;
+
+          case 'd':
+          case 'B':
+            data = optarg;
+            break;
+
+          case 'F':
+            if (nforms >= CURL_MAX_FORMS)
+              {
+                fprintf(stderr, "curl: too many -F fields (max %d)\n",
+                        CURL_MAX_FORMS);
+                return EXIT_FAILURE;
+              }
+
+            forms[nforms++] = optarg;
+            break;
+
+          case 'H':
+            if (nheaders >= CURL_MAX_HEADERS - 1)
+              {
+                fprintf(stderr, "curl: too many -H headers (max %d)\n",
+                        CURL_MAX_HEADERS - 1);
+                return EXIT_FAILURE;
+              }
+
+            if (strncasecmp(optarg, "Content-Type:", 13) == 0)
+              {
+                have_ctype = true;
+              }
+
+            headers[nheaders++] = optarg;
+            break;
+
+          case 'o':
+            outfile = optarg;
+            break;
+
+          case 'v':
+            verbose = true;
+            break;
+
+          case 'h':
+            curl_usage(argv[0]);
+            return EXIT_SUCCESS;
+
+          case '?':
+          default:
+            curl_usage(argv[0]);
+            return EXIT_FAILURE;
+        }
+    }
+
+  if (optind >= argc)
+    {
+      fprintf(stderr, "curl: missing URL\n");
+      curl_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  rawurl = argv[optind];
+
+  if (data != NULL && nforms > 0)
+    {
+      fprintf(stderr, "curl: -d and -F cannot be combined\n");
+      return EXIT_FAILURE;
+    }
+
+  /* Prepend a default http:// scheme when the URL has none. */
+
+  if (strstr(rawurl, "://") == NULL)
+    {
+      snprintf(urlbuf, sizeof(urlbuf), "http://%s", rawurl);
+      url = urlbuf;
+    }
+  else
+    {
+      url = rawurl;
+    }
+
+  /* Default method: POST when sending a body, GET otherwise. */
+
+  if (method == NULL)
+    {
+      method = (data != NULL || nforms > 0) ? "POST" : "GET";
+    }
+
+  /* Build the request body. */
+
+  if (nforms > 0)
+    {
+      /* multipart/form-data: derive a boundary and add the Content-Type
+       * header ourselves.
+       */
+
+      snprintf(boundary, sizeof(boundary), "----NuttXCurl%08x%08x",
+               getpid(), nforms);
+
+      for (i = 0; i < nforms; i++)
+        {
+          ret = curl_add_form(&body, boundary, forms[i]);
+          if (ret < 0)
+            {
+              goto errout_body;
+            }
+        }
+
+      /* Closing boundary. */
+
+      ret = curl_add_str_chunk(&body, "--", 2);
+      if (ret >= 0)
+        {
+          ret = curl_add_str_chunk(&body, boundary, strlen(boundary));
+        }
+
+      if (ret >= 0)
+        {
+          ret = curl_add_str_chunk(&body, "--\r\n", 4);
+        }
+
+      if (ret < 0)
+        {
+          goto errout_body;
+        }
+
+      if (nheaders < CURL_MAX_HEADERS && !have_ctype)
+        {
+          snprintf(ctype, sizeof(ctype),
+                   "Content-Type: multipart/form-data; boundary=%s",
+                   boundary);
+          headers[nheaders++] = ctype;
+          have_ctype = true;
+        }
+    }
+  else if (data != NULL && data[0] == '@')
+    {
+      /* -d @file : stream the file as the raw request body. */
+
+      struct stat st;
+      int fd = open(data + 1, O_RDONLY | O_CLOEXEC);
+
+      if (fd < 0)
+        {
+          fprintf(stderr, "curl: cannot open '%s': %d\n", data + 1, errno);
+          ret = -errno;
+          goto errout_body;
+        }
+
+      if (fstat(fd, &st) < 0)
+        {
+          fprintf(stderr, "curl: stat '%s' failed: %d\n", data + 1, errno);
+          ret = -errno;
+          close(fd);
+          goto errout_body;
+        }
+
+      ret = curl_add_file_chunk(&body, fd, st.st_size);
+      if (ret < 0)
+        {
+          close(fd);
+          goto errout_body;
+        }
+    }
+  else if (data != NULL)
+    {
+      /* -d 'literal' : the string itself is the body. */
+
+      ret = curl_add_str_chunk(&body, data, strlen(data));
+      if (ret < 0)
+        {
+          goto errout_body;
+        }
+    }
+
+  /* curl adds a form Content-Type by default for -d without an explicit
+   * one. JSON callers are expected to pass -H "Content-Type: ...".
+   */
+
+  if (data != NULL && !have_ctype && nheaders < CURL_MAX_HEADERS)
+    {
+      headers[nheaders++] =
+        "Content-Type: application/x-www-form-urlencoded";
+    }
+
+  buffer = malloc(CONFIG_SYSTEM_CURL_BUFFERSIZE);
+  if (buffer == NULL)
+    {
+      fprintf(stderr, "curl: out of memory\n");
+      ret = -ENOMEM;
+      goto errout_body;
+    }
+
+  /* Open the destination for the response body. */
+
+  if (outfile != NULL)
+    {
+      sink.fd = open(outfile,
+                     O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+      if (sink.fd < 0)
+        {
+          fprintf(stderr, "curl: cannot open '%s': %d\n", outfile, errno);
+          ret = -errno;
+          goto errout_buffer;
+        }
+    }
+  else
+    {
+      sink.fd = STDOUT_FILENO;
+    }
+
+  /* Assemble and run the request. */
+
+  webclient_set_defaults(&ctx);
+  ctx.method            = method;
+  ctx.url               = url;
+  ctx.buffer            = buffer;
+  ctx.buflen            = CONFIG_SYSTEM_CURL_BUFFERSIZE;
+  ctx.sink_callback     = curl_sink_callback;
+  ctx.sink_callback_arg = &sink;
+
+  if (nheaders > 0)
+    {
+      ctx.headers  = headers;
+      ctx.nheaders = nheaders;
+    }
+
+  if (verbose)
+    {
+      ctx.header_callback = curl_header_callback;
+
+      fprintf(stderr, "> %s %s\n", method, url);
+      for (i = 0; i < nheaders; i++)
+        {
+          fprintf(stderr, "> %s\n", headers[i]);
+        }
+    }
+
+  if (body.nchunks > 0)
+    {
+      ctx.body_callback     = curl_body_callback;
+      ctx.body_callback_arg = &body;
+      ctx.bodylen           = curl_body_total(&body);
+    }
+
+  ret = webclient_perform(&ctx);
+  if (ret < 0)
+    {
+      fprintf(stderr, "curl: request failed: %d\n", ret);
+    }
+  else
+    {
+      fprintf(stderr, "curl: HTTP %u\n", ctx.http_status);
+    }
+
+  if (sink.fd != STDOUT_FILENO)
+    {
+      close(sink.fd);
+    }
+
+errout_buffer:
+  free(buffer);
+
+errout_body:
+  curl_body_cleanup(&body);
+  return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}

From 1e490d3fbe941705d51d2d218080e8d1308985b1 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Sat, 18 Jul 2026 15:04:05 +0000
Subject: [PATCH 516/568] dropbear: rename libtomcrypt symbols to avoid NuttX
 collisions

Rename base64_encode, base64_decode, and ecc_make_key in bundled
libtomcrypt to avoid duplicate symbol link errors when dropbear is built
alongside netutils/codecs and NuttX crypto (e.g. sim:dropbear).

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 netutils/dropbear/CMakeLists.txt | 9 +++++++--
 netutils/dropbear/Makefile       | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/netutils/dropbear/CMakeLists.txt b/netutils/dropbear/CMakeLists.txt
index 8ca691be0..eb31d0012 100644
--- a/netutils/dropbear/CMakeLists.txt
+++ b/netutils/dropbear/CMakeLists.txt
@@ -192,8 +192,13 @@ if(CONFIG_NETUTILS_DROPBEAR)
   endif()
 
   target_compile_definitions(
-    ${PROGNAME} PRIVATE LOCALOPTIONS_H_EXISTS=1 DROPBEAR_NUTTX=1
-                        DROPBEAR_NUTTX_PASSWD=1)
+    ${PROGNAME}
+    PRIVATE LOCALOPTIONS_H_EXISTS=1
+            DROPBEAR_NUTTX=1
+            DROPBEAR_NUTTX_PASSWD=1
+            base64_encode=dropbear_ltc_base64_encode
+            base64_decode=dropbear_ltc_base64_decode
+            ecc_make_key=dropbear_ltc_ecc_make_key)
 
   if(CONFIG_NETUTILS_DROPBEAR_SCP)
     target_compile_definitions(
diff --git a/netutils/dropbear/Makefile b/netutils/dropbear/Makefile
index 53b1f2f72..17e5ec8db 100644
--- a/netutils/dropbear/Makefile
+++ b/netutils/dropbear/Makefile
@@ -130,6 +130,13 @@ endif
 # Match the ESP-IDF port behavior: LTC_SOURCE is only for libtomcrypt sources.
 $(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}LTC_SOURCE=1))
 
+# Avoid duplicate symbols when NuttX/apps also provide these APIs.
+# Apply to all dropbear sources so libtomcrypt definitions and dropbear
+# callers (e.g. signkey.c) use the same renamed symbols.
+CFLAGS += ${DEFINE_PREFIX}base64_encode=dropbear_ltc_base64_encode
+CFLAGS += ${DEFINE_PREFIX}base64_decode=dropbear_ltc_base64_decode
+CFLAGS += ${DEFINE_PREFIX}ecc_make_key=dropbear_ltc_ecc_make_key
+
 MAINSRC = dropbear_main.c
 
 ifneq ($(CONFIG_NETUTILS_DROPBEAR_SCP),)

From 4d3bb6e7c9b791d4f867ea401f2c414cf4395310 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Mon, 20 Jul 2026 18:27:22 -0400
Subject: [PATCH 517/568] audioutils/morsey: Add the Morsey library

This commit adds the Morsey library (Apache 2.0 licensed) to be
downloaded from an external repository so it can be used in NuttX
applications.

This library parses ASCII text into Morse code marks to be played by a
user-implemented 'transmit' function (i.e. over an LED, buzzer, audio
sink, etc.).

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 audioutils/morsey/.gitignore |  1 +
 audioutils/morsey/Kconfig    |  6 +++++
 audioutils/morsey/Make.defs  | 25 ++++++++++++++++++
 audioutils/morsey/Makefile   | 50 ++++++++++++++++++++++++++++++++++++
 include/.gitignore           |  1 +
 5 files changed, 83 insertions(+)
 create mode 100644 audioutils/morsey/.gitignore
 create mode 100644 audioutils/morsey/Kconfig
 create mode 100644 audioutils/morsey/Make.defs
 create mode 100644 audioutils/morsey/Makefile

diff --git a/audioutils/morsey/.gitignore b/audioutils/morsey/.gitignore
new file mode 100644
index 000000000..26b43c946
--- /dev/null
+++ b/audioutils/morsey/.gitignore
@@ -0,0 +1 @@
+morsey
diff --git a/audioutils/morsey/Kconfig b/audioutils/morsey/Kconfig
new file mode 100644
index 000000000..4f8b2f98d
--- /dev/null
+++ b/audioutils/morsey/Kconfig
@@ -0,0 +1,6 @@
+config AUDIOUTILS_MORSEY
+	bool "Morse code playing library"
+	default n
+	---help---
+		Simple library for parsing ASCII text into playable Morse code. Not
+		necessarily restricted to audio.
diff --git a/audioutils/morsey/Make.defs b/audioutils/morsey/Make.defs
new file mode 100644
index 000000000..9fab9a304
--- /dev/null
+++ b/audioutils/morsey/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/audioutils/morsey/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_AUDIOUTILS_MORSEY),)
+CONFIGURED_APPS += $(APPDIR)/audioutils/morsey
+endif
diff --git a/audioutils/morsey/Makefile b/audioutils/morsey/Makefile
new file mode 100644
index 000000000..599ae5700
--- /dev/null
+++ b/audioutils/morsey/Makefile
@@ -0,0 +1,50 @@
+############################################################################
+# apps/audioutils/morsey/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+CSRCS = $(MORSEY_DIR)/morsey.c
+
+MORSEY_DIR = morsey
+MORSEY_VERSION = v1.0.0
+MORSEY_MORSEY_H_SHA256 = 55f45e7b9a4d810f928ffe3ee9bea4cc318e28b1f49abf9512aee2638bd1dbfa
+MORSEY_MORSEY_C_SHA256 = f946c9845a90a4c1a459490906ae071d0ac5b41326b7a5ce971efb97792ef56a
+
+$(MORSEY_DIR):
+	$(Q) echo "Cloning Morsey repo..."
+	$(Q) git clone --depth=1 --branch=$(MORSEY_VERSION) https://github.com/linguini1/morsey.git
+	$(Q) touch $(MORSEY_DIR)
+	$(Q) echo "Checking Morsey hashes..."
+	$(Q) $(APPDIR)/tools/check-hash.sh sha256 $(MORSEY_MORSEY_H_SHA256) $@/morsey.h
+	$(Q) $(APPDIR)/tools/check-hash.sh sha256 $(MORSEY_MORSEY_C_SHA256) $@/morsey.c
+
+create_includes: $(MORSEY_DIR)/morsey.h
+	$(Q) cp $< $(APPDIR)/include/audioutils
+
+context:: $(MORSEY_DIR)
+	$(Q) $(MAKE) create_includes
+
+distclean::
+	$(call DELFILE, $(APPDIR)/include/audioutils/morsey.h)
+	$(call DELDIR, morsey)
+
+include $(APPDIR)/Application.mk
diff --git a/include/.gitignore b/include/.gitignore
index 1c2896091..b237d4f3c 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,3 +1,4 @@
 /netutils/cJSON.h
 /netutils/cJSON_Utils.h
 /audioutils/rtttl.h
+/audioutils/morsey.h

From c814059f6c4a36bd9e1992f443ff4039ad4cc2a5 Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Mon, 20 Jul 2026 20:11:38 -0400
Subject: [PATCH 518/568] examples/txmorse: Example application for
 transmitting Morse code

Adds an example application leveraging the Morsey library for
transmitting Morse code, either to the console (debug) or to GPIO
devices for now as the two supported sinks.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 examples/txmorse/CMakeLists.txt |  33 ++++
 examples/txmorse/Kconfig        |  30 ++++
 examples/txmorse/Make.defs      |  25 +++
 examples/txmorse/Makefile       |  34 ++++
 examples/txmorse/txmorse_main.c | 294 ++++++++++++++++++++++++++++++++
 5 files changed, 416 insertions(+)
 create mode 100644 examples/txmorse/CMakeLists.txt
 create mode 100644 examples/txmorse/Kconfig
 create mode 100644 examples/txmorse/Make.defs
 create mode 100644 examples/txmorse/Makefile
 create mode 100644 examples/txmorse/txmorse_main.c

diff --git a/examples/txmorse/CMakeLists.txt b/examples/txmorse/CMakeLists.txt
new file mode 100644
index 000000000..469455762
--- /dev/null
+++ b/examples/txmorse/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/examples/txmorse/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_TXMORSE)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_TXMORSE_PROGNAME}
+    SRCS
+    txmorse_main.c
+    STACKSIZE
+    ${CONFIG_EXAMPLES_TXMORSE_STACKSIZE}
+    PRIORITY
+    ${CONFIG_EXAMPLES_TXMORSE_PRIORITY})
+endif()
diff --git a/examples/txmorse/Kconfig b/examples/txmorse/Kconfig
new file mode 100644
index 000000000..3754a9ffe
--- /dev/null
+++ b/examples/txmorse/Kconfig
@@ -0,0 +1,30 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_TXMORSE
+	tristate "txmorse (Morse code transmitter)"
+	default n
+	depends on AUDIOUTILS_MORSEY
+	---help---
+		Enable the Morse code transmission example.
+
+if EXAMPLES_TXMORSE
+
+config EXAMPLES_TXMORSE_PROGNAME
+	string "Program name"
+	default "txmorse"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config EXAMPLES_TXMORSE_PRIORITY
+	int "txmorse task priority"
+	default 100
+
+config EXAMPLES_TXMORSE_STACKSIZE
+	int "txmorse stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/examples/txmorse/Make.defs b/examples/txmorse/Make.defs
new file mode 100644
index 000000000..0c52d4fb8
--- /dev/null
+++ b/examples/txmorse/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/txmorse/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_TXMORSE),)
+CONFIGURED_APPS += $(APPDIR)/examples/txmorse
+endif
diff --git a/examples/txmorse/Makefile b/examples/txmorse/Makefile
new file mode 100644
index 000000000..8d9bcefff
--- /dev/null
+++ b/examples/txmorse/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/examples/txmorse/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Application info
+
+PROGNAME  = $(CONFIG_EXAMPLES_TXMORSE_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_TXMORSE_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_TXMORSE_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_TXMORSE)
+
+MAINSRC = txmorse_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/examples/txmorse/txmorse_main.c b/examples/txmorse/txmorse_main.c
new file mode 100644
index 000000000..cc2a3f957
--- /dev/null
+++ b/examples/txmorse/txmorse_main.c
@@ -0,0 +1,294 @@
+/****************************************************************************
+ * apps/examples/txmorse/txmorse_main.c
+ *
+ * SPDX-License-Identifer: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#ifdef CONFIG_DEV_GPIO
+#include <nuttx/ioexpander/gpio.h>
+#endif
+
+#include <audioutils/morsey.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Default millisecond duration of dot (2.5WPM) */
+
+#define DEFAULT_DURATION (240)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: transmit_console
+ *
+ * Description:
+ *   Transmit Morse code as printed characters to the console.
+ ****************************************************************************/
+
+static void transmit_console(int on, unsigned duration_ms, void *arg)
+{
+  unsigned ms_per_unit = *((unsigned *)arg);
+
+  if (on)
+    {
+      /* We are printing a dot or a dash */
+
+      if (duration_ms == ms_per_unit * MORSEY_UNITS_DOT)
+        {
+          putchar('.');
+        }
+      else if (duration_ms == ms_per_unit * MORSEY_UNITS_DASH)
+        {
+          putchar('-');
+        }
+    }
+  else
+    {
+      /* We are indicating separation */
+
+      if (duration_ms == ms_per_unit * MORSEY_UNITS_INTERELEM)
+        {
+          return; /* Inter-element gap, do nothing */
+        }
+      else if (duration_ms == ms_per_unit * MORSEY_UNITS_INTERLET)
+        {
+          putchar(' '); /* Inter-letter gap, print a space */
+        }
+      else if (duration_ms == ms_per_unit * MORSEY_UNITS_INTERWORD)
+        {
+          putchar('/'); /* Inter-word gap, print / delimiter */
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: cleanup_console
+ *
+ * Description:
+ *   Default cleanup function; does nothing.
+ *
+ * Input Parameters:
+ *   arg - User argument.
+ *
+ ****************************************************************************/
+
+static void cleanup_console(void *arg)
+{
+  UNUSED(arg);
+  putchar('\n'); /* Newline character after message is done */
+}
+
+#ifdef CONFIG_DEV_GPIO
+
+/****************************************************************************
+ * Name: transmit_gpio
+ *
+ * Description:
+ *   Transmit Morse over a GPIO pin.
+ *
+ * Input Parameters:
+ *   arg - Pointer to file descriptor of GPIO device
+ *
+ ****************************************************************************/
+
+static void transmit_gpio(int on, unsigned duration_ms, void *arg)
+{
+  int err;
+  int fd = *((int *)arg);
+
+  if (on)
+    {
+      err = ioctl(fd, GPIOC_WRITE, 1);
+      if (err < 0)
+        {
+          fprintf(stderr, "Failed to turn on GPIO: %d\n", errno);
+          return;
+        }
+    }
+
+  usleep(duration_ms * 1000);
+
+  err = ioctl(fd, GPIOC_WRITE, 0);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to turn off GPIO: %d\n", errno);
+    }
+}
+
+/****************************************************************************
+ * Name: cleanup_gpio
+ *
+ * Description:
+ *   Clean up a GPIO Morse sink.
+ *
+ * Input Parameters:
+ *   arg - User argument (pointer to file descriptor)
+ *
+ ****************************************************************************/
+
+static void cleanup_gpio(void *arg)
+{
+  int fd = *((int *)arg);
+  close(fd);
+}
+
+#endif /* CONFIG_DEV_GPIO */
+
+/****************************************************************************
+ * Name: print_usage
+ *
+ * Description:
+ *   Prints out the usage information for the program.
+ *
+ * Input Parameters:
+ *   sink - The stream to output the usage information
+ *
+ ****************************************************************************/
+
+static void print_usage(FILE *sink)
+{
+  fprintf(sink, "USAGE: " CONFIG_EXAMPLES_TXMORSE_PROGNAME
+                " [-d dot_duration_ms] \"my text\" [path/to/device]\n");
+  fprintf(sink,
+          "Ex: " CONFIG_EXAMPLES_TXMORSE_PROGNAME " \"sos\" /dev/gpio1\n");
+  fprintf(sink, "Default dot duration is 240 ms\n");
+  fprintf(sink, "Default device is output to console\n");
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char **argv)
+{
+  int err;
+  int c;
+  int fd;
+  struct morsey_state_s state;
+
+  transmit_f txfunc = transmit_console;          /* Default transmit */
+  void (*cleanupfunc)(void *) = cleanup_console; /* Default cleanup */
+  void *arg = NULL;
+
+  unsigned duration = DEFAULT_DURATION;
+  char *devpath = NULL;
+  char *message = NULL;
+
+  arg = &duration; /* Default argument */
+
+  /* Parse command line arguments */
+
+  while ((c = getopt(argc, argv, ":hd:")) != -1)
+    {
+      switch (c)
+        {
+        case 'h':
+          print_usage(stdout);
+          return EXIT_SUCCESS;
+        case 'd':
+          duration = strtoul(optarg, NULL, 10);
+          break;
+        case '?':
+          fprintf(stderr, "Unknown option -%c\n", optopt);
+          print_usage(stderr);
+          return EXIT_FAILURE;
+        }
+    }
+
+  /* Get text to encode */
+
+  if (argc <= optind)
+    {
+      fprintf(stderr, "Missing text to encode!\n");
+      return EXIT_FAILURE;
+    }
+
+  message = argv[optind++];
+
+  /* Check for optional device path */
+
+  if (argc > optind)
+    {
+      devpath = argv[optind++];
+    }
+
+  /* Choose transmit function based on device path */
+
+  if (devpath == NULL)
+    {
+      txfunc = transmit_console;
+      cleanupfunc = cleanup_console;
+      arg = &duration;
+    }
+#ifdef CONFIG_DEV_GPIO
+  else if (strstr(devpath, "gpio"))
+    {
+      txfunc = transmit_gpio;
+      cleanupfunc = cleanup_gpio;
+      fd = open(devpath, O_WRONLY);
+      if (fd < 0)
+        {
+          fprintf(stderr, "Couldn't open '%s': %d\n", devpath, errno);
+          return EXIT_FAILURE;
+        }
+
+      arg = &fd;
+    }
+#endif
+  else
+    {
+      fprintf(stderr, "Unrecognized device '%s', defaulting to console.\n",
+              devpath);
+    }
+
+  /* Set up library to play */
+
+  morsey_init(&state, duration, 0);
+
+  /* Transmit the text as Morse code */
+
+  err = morsey_transmit(message, strlen(message), &state, txfunc, arg);
+  if (err == 0)
+    {
+      cleanupfunc(arg);
+      return 0;
+    }
+
+  fprintf(stderr, "Error transmitting: %d\n", err);
+  cleanupfunc(arg);
+  return err;
+}

From 593bfca04761f59b3c2eed1d02e5e64eeafc3215 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jul 2026 22:22:33 +0000
Subject: [PATCH 519/568] build(deps): bump actions/setup-python from 6 to 7

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31af5a49e..3a43138a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -331,7 +331,7 @@ jobs:
 
       # Released version of Cython has issues with Python 11. Set runner to use Python 3.10
       # https://github.com/cython/cython/issues/4500
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: '3.10'
       - name: Run Builds
@@ -449,7 +449,7 @@ jobs:
       - uses: actions/checkout@v7
       # Set up Python environment and install kconfiglib
       - name: Set up Python and install kconfiglib
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.10'
       - name: Install kconfiglib

From 067b0ccf2875357f0f6a6c4ffea503a468d9689b Mon Sep 17 00:00:00 2001
From: anjiahao <anjiahao@xiaomi.com>
Date: Wed, 15 Jul 2026 16:11:18 +0800
Subject: [PATCH 520/568] Application.mk:define application attribute in elf
 symbol

Emit --defsym for nx_stacksize, nx_priority (and nx_uid/nx_gid/nx_mode
under CONFIG_SCHED_USER_IDENTITY) into MODLDFLAGS so the ELF binary
loader can recover the application's configured attributes at load time.

Also skip builtin registration for separately-built module ELFs
(BUILD_MODULE instead of DYNLIB).

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
---
 Application.mk | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/Application.mk b/Application.mk
index 5cba93f3d..d950f698c 100644
--- a/Application.mk
+++ b/Application.mk
@@ -134,7 +134,32 @@ ifneq ($(strip $(PROGNAME)),)
         $(if $(word $i,$(GID)),$(word $i,$(GID)),$(lastword $(GID)))) \
     $(eval MODE_$(word $i,$(REGLIST)) := \
         $(if $(word $i,$(MODE)),$(word $i,$(MODE)),$(lastword $(MODE)))) \
+    $(eval STACKSIZE_$(word $i,$(PROGLIST)) := $(STACKSIZE_$(word $i,$(REGLIST)))) \
+    $(eval PRIORITY_$(word $i,$(PROGLIST)) := $(PRIORITY_$(word $i,$(REGLIST)))) \
+    $(eval UID_$(word $i,$(PROGLIST)) := $(UID_$(word $i,$(REGLIST)))) \
+    $(eval GID_$(word $i,$(PROGLIST)) := $(GID_$(word $i,$(REGLIST)))) \
+    $(eval MODE_$(word $i,$(PROGLIST)) := $(MODE_$(word $i,$(REGLIST)))) \
   )
+
+  # Emit the application's configured attributes as absolute ELF symbols
+  # (nx_stacksize, nx_priority, and nx_uid/nx_gid/nx_mode under
+  # CONFIG_SCHED_USER_IDENTITY) so the binary loader can recover them.
+  # Per-target so each PROGLIST entry picks up its own STACKSIZE_/PRIORITY_.
+
+  $(PROGLIST): SYM_PRIORITY = $(if $(filter SCHED_PRIORITY_DEFAULT,$(PRIORITY_$@)),0,$(PRIORITY_$@))
+  $(PROGLIST): MODLDFLAGS += \
+    $(if $(STACKSIZE_$@),--defsym nx_stacksize=$(STACKSIZE_$@)) \
+    $(if $(PRIORITY_$@),--defsym nx_priority=$(SYM_PRIORITY))
+ifeq ($(CONFIG_SCHED_USER_IDENTITY),y)
+  $(PROGLIST): MODLDFLAGS += \
+    $(if $(UID_$@),--defsym nx_uid=$(UID_$@)) \
+    $(if $(GID_$@),--defsym nx_gid=$(GID_$@)) \
+    $(if $(MODE_$@),--defsym nx_mode=$(MODE_$@))
+endif
+
+  # Keep the attribute symbols through --strip-unneeded so the binary loader
+  # can still read them from the stripped runtime image in bin/.
+  $(PROGLIST): NX_KEEP = $(if $(STACKSIZE_$@),-K nx_stacksize) $(if $(PRIORITY_$@),-K nx_priority) $(if $(UID_$@),-K nx_uid) $(if $(GID_$@),-K nx_gid) $(if $(MODE_$@),-K nx_mode)
 endif
 
 # Condition flags
@@ -149,7 +174,7 @@ ifeq ($(WASM_BUILD),y)
   DO_REGISTRATION = n
 endif
 
-ifeq ($(DYNLIB),y)
+ifeq ($(BUILD_MODULE),y)
   DO_REGISTRATION = n
 endif
 
@@ -311,7 +336,7 @@ $(PROGLIST): $(MAINCOBJ) $(MAINCXXOBJ) $(MAINRUSTOBJ) $(MAINZIGOBJ) $(MAINDOBJ)
 ifneq ($(CONFIG_DEBUG_SYMBOLS),)
 	$(Q) mkdir -p $(BINDIR_DEBUG)
 	$(Q) cp $@ $(BINDIR_DEBUG)
-	$(Q) $(MODULESTRIP) $@
+	$(Q) $(MODULESTRIP) $(NX_KEEP) $@
 endif
 
 install:: $(PROGLIST)

From 01c6a6058115f8bddce9afc8a6b7d48324500899 Mon Sep 17 00:00:00 2001
From: hanzhijian <hanzhijian@zepp.com>
Date: Mon, 20 Jul 2026 18:00:38 +0800
Subject: [PATCH 521/568] testing/drivers: add watchdog notifier cmocka
 coverage

Extend the watchdog drivertest with notifier ordering, duplicate registration, repeated delivery, unregister, NULL-data, and concurrent registration coverage.

Register the watchdog test when either reset-cause or timeout-notifier support is available. Keep hardware watchdog cases gated by reset-cause support and allow notifier-only simulator builds through both Make and CMake.

Keep test state in the watchdog fixture and notifier blocks so callbacks do not depend on shared notifier state.

Assisted-by: OpenAI Codex
Signed-off-by: hanzhijian <hanzhijian@zepp.com>
---
 testing/drivers/drivertest/CMakeLists.txt     |   3 +-
 testing/drivers/drivertest/Makefile           |   2 +-
 .../drivers/drivertest/drivertest_watchdog.c  | 256 +++++++++++++++++-
 3 files changed, 253 insertions(+), 8 deletions(-)

diff --git a/testing/drivers/drivertest/CMakeLists.txt b/testing/drivers/drivertest/CMakeLists.txt
index 249284230..ccf43d4ea 100644
--- a/testing/drivers/drivertest/CMakeLists.txt
+++ b/testing/drivers/drivertest/CMakeLists.txt
@@ -119,7 +119,8 @@ if(CONFIG_TESTING_DRIVER_TEST)
       drivertest_posix_timer.c)
   endif()
 
-  if(CONFIG_WATCHDOG AND CONFIG_BOARDCTL_RESET_CAUSE)
+  if(CONFIG_WATCHDOG AND (CONFIG_BOARDCTL_RESET_CAUSE
+                          OR CONFIG_WATCHDOG_TIMEOUT_NOTIFIER))
     nuttx_add_application(
       NAME
       cmocka_driver_watchdog
diff --git a/testing/drivers/drivertest/Makefile b/testing/drivers/drivertest/Makefile
index 470c91512..786d30d1d 100644
--- a/testing/drivers/drivertest/Makefile
+++ b/testing/drivers/drivertest/Makefile
@@ -62,7 +62,7 @@ endif
 endif
 
 ifneq ($(CONFIG_WATCHDOG),)
-ifneq ($(CONFIG_BOARDCTL_RESET_CAUSE),)
+ifneq ($(CONFIG_BOARDCTL_RESET_CAUSE)$(CONFIG_WATCHDOG_TIMEOUT_NOTIFIER),)
 MAINSRC  += drivertest_watchdog.c
 PROGNAME += cmocka_driver_watchdog
 endif
diff --git a/testing/drivers/drivertest/drivertest_watchdog.c b/testing/drivers/drivertest/drivertest_watchdog.c
index 72f5abe0e..0088627f7 100644
--- a/testing/drivers/drivertest/drivertest_watchdog.c
+++ b/testing/drivers/drivertest/drivertest_watchdog.c
@@ -43,8 +43,11 @@
 #include <stdint.h>
 #include <cmocka.h>
 #include <time.h>
+#include <pthread.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/notifier.h>
+#include <nuttx/nuttx.h>
 #include <nuttx/timers/watchdog.h>
 
 /****************************************************************************
@@ -88,18 +91,55 @@ struct wdg_state_s
   uint32_t deviation;
   int test_case;
   bool test_getstatus;
+#ifdef CONFIG_BOARDCTL_RESET_CAUSE
+  sem_t semaphore;
+#endif
+#ifdef CONFIG_WATCHDOG_TIMEOUT_NOTIFIER
+  unsigned int notifier_calls;
+  unsigned long notifier_action[8];
+  FAR void *notifier_data[8];
+  int notifier_id[8];
+#endif
 };
 
-static sem_t g_semaphore;
+#ifdef CONFIG_WATCHDOG_TIMEOUT_NOTIFIER
+
+struct watchdog_notifier_test_nb_s
+{
+  struct notifier_block nb;
+  FAR struct wdg_state_s *state;
+  int                   id;
+};
+
+struct watchdog_notifier_race_s
+{
+  struct notifier_block nb;
+  volatile bool stop;
+  volatile unsigned int callbacks;
+};
+
+#endif
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
+#ifdef CONFIG_BOARDCTL_RESET_CAUSE
+
+/* WDIOC_CAPTURE does not accept a caller-provided callback argument.  Keep
+ * the active test state while the capture handler is installed.
+ */
+
+static FAR struct wdg_state_s *g_capture_test_state;
+
+#endif
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+#ifdef CONFIG_BOARDCTL_RESET_CAUSE
+
 /****************************************************************************
  * Name: get_timestamp
  ****************************************************************************/
@@ -163,6 +203,8 @@ static int wdg_init(FAR struct wdg_state_s *state)
   return dev_fd;
 }
 
+#endif /* CONFIG_BOARDCTL_RESET_CAUSE */
+
 /****************************************************************************
  * Name: show_usage
  ****************************************************************************/
@@ -281,16 +323,206 @@ static void parse_commandline(FAR struct wdg_state_s *wdg_state, int argc,
     }
 }
 
+#ifdef CONFIG_BOARDCTL_RESET_CAUSE
+
 /****************************************************************************
  * Name: capture_callback
  ****************************************************************************/
 
 static int capture_callback(int irq, FAR void *context, FAR void *arg)
 {
-  sem_post(&g_semaphore);
+  DEBUGASSERT(g_capture_test_state != NULL);
+  sem_post(&g_capture_test_state->semaphore);
   return OK;
 }
 
+#endif /* CONFIG_BOARDCTL_RESET_CAUSE */
+
+#ifdef CONFIG_WATCHDOG_TIMEOUT_NOTIFIER
+
+static int watchdog_notifier_test_callback(FAR struct notifier_block *nb,
+                                            unsigned long action,
+                                            FAR void *data)
+{
+  FAR struct watchdog_notifier_test_nb_s *test_nb;
+  unsigned int index;
+
+  test_nb = container_of(nb, struct watchdog_notifier_test_nb_s, nb);
+  index = test_nb->state->notifier_calls;
+  if (index < 8)
+    {
+      test_nb->state->notifier_action[index] = action;
+      test_nb->state->notifier_data[index] = data;
+      test_nb->state->notifier_id[index] = test_nb->id;
+    }
+
+  test_nb->state->notifier_calls++;
+  return OK;
+}
+
+static unsigned long watchdog_notifier_test_expected_action(void)
+{
+#if defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_ONESHOT)
+  return WATCHDOG_KEEPALIVE_BY_ONESHOT;
+#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_TIMER)
+  return WATCHDOG_KEEPALIVE_BY_TIMER;
+#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WDOG)
+  return WATCHDOG_KEEPALIVE_BY_WDOG;
+#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER)
+  return WATCHDOG_KEEPALIVE_BY_WORKER;
+#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_CAPTURE)
+  return WATCHDOG_KEEPALIVE_BY_CAPTURE;
+#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_IDLE)
+  return WATCHDOG_KEEPALIVE_BY_IDLE;
+#else
+#  error "An automonitor source must be selected"
+#endif
+}
+
+static void drivertest_watchdog_notifier(FAR void **state)
+{
+  FAR struct wdg_state_s *wdg_state = *state;
+
+  struct watchdog_notifier_test_nb_s low =
+  {
+    .nb =
+      {
+        .notifier_call = watchdog_notifier_test_callback,
+        .priority = 10
+      },
+    .state = wdg_state,
+    .id = 1
+  };
+
+  struct watchdog_notifier_test_nb_s high =
+  {
+    .nb =
+      {
+        .notifier_call = watchdog_notifier_test_callback,
+        .priority = 20
+      },
+    .state = wdg_state,
+    .id = 2
+  };
+
+  unsigned long expected_action;
+
+  expected_action = watchdog_notifier_test_expected_action();
+  wdg_state->notifier_calls = 0;
+
+  /* Registration is priority ordered, and duplicate registration of the
+   * same notifier must not result in a duplicate callback.
+   */
+
+  watchdog_notifier_chain_register(&low.nb);
+  watchdog_notifier_chain_register(&low.nb);
+  watchdog_notifier_chain_register(&high.nb);
+
+  watchdog_automonitor_timeout();
+
+  assert_int_equal(wdg_state->notifier_calls, 2);
+  assert_int_equal(wdg_state->notifier_id[0], high.id);
+  assert_int_equal(wdg_state->notifier_id[1], low.id);
+  assert_int_equal(wdg_state->notifier_action[0], expected_action);
+  assert_int_equal(wdg_state->notifier_action[1], expected_action);
+  assert_null(wdg_state->notifier_data[0]);
+  assert_null(wdg_state->notifier_data[1]);
+
+  /* Every timeout notification is delivered to all currently registered
+   * callbacks.
+   */
+
+  watchdog_automonitor_timeout();
+  assert_int_equal(wdg_state->notifier_calls, 4);
+  assert_int_equal(wdg_state->notifier_id[2], high.id);
+  assert_int_equal(wdg_state->notifier_id[3], low.id);
+
+  /* Unregistering one callback removes only that callback. */
+
+  watchdog_notifier_chain_unregister(&high.nb);
+  watchdog_automonitor_timeout();
+  assert_int_equal(wdg_state->notifier_calls, 5);
+  assert_int_equal(wdg_state->notifier_id[4], low.id);
+
+  watchdog_notifier_chain_unregister(&low.nb);
+  watchdog_automonitor_timeout();
+  assert_int_equal(wdg_state->notifier_calls, 5);
+}
+
+static int watchdog_notifier_race_callback(FAR struct notifier_block *nb,
+                                            unsigned long action,
+                                            FAR void *data)
+{
+  FAR struct watchdog_notifier_race_s *race;
+
+  race = container_of(nb, struct watchdog_notifier_race_s, nb);
+  UNUSED(action);
+  UNUSED(data);
+  race->callbacks++;
+  return OK;
+}
+
+static FAR void *watchdog_notifier_race_worker(FAR void *arg)
+{
+  FAR struct watchdog_notifier_race_s *race = arg;
+  unsigned int count;
+
+  for (count = 0; count < 2000 && !race->stop; count++)
+    {
+      watchdog_notifier_chain_register(&race->nb);
+      watchdog_automonitor_timeout();
+      watchdog_notifier_chain_unregister(&race->nb);
+    }
+
+  return NULL;
+}
+
+static void drivertest_watchdog_notifier_race(FAR void **state)
+{
+  struct watchdog_notifier_race_s race =
+    {
+      .nb =
+        {
+          .notifier_call = watchdog_notifier_race_callback,
+          .priority = 10
+        }
+    };
+
+  pthread_t thread;
+  unsigned int count;
+  int ret;
+
+  UNUSED(state);
+  watchdog_notifier_chain_register(&race.nb);
+  ret = pthread_create(&thread, NULL, watchdog_notifier_race_worker, &race);
+  assert_int_equal(ret, 0);
+  usleep(1000);
+
+  /* Interleave timeout delivery with registration and unregistration from
+   * another task.  The test is successful if the notifier chain remains
+   * usable and continues to invoke the callback.
+   */
+
+  for (count = 0; count < 2000; count++)
+    {
+      watchdog_automonitor_timeout();
+      if ((count & 0x3f) == 0)
+        {
+          usleep(1000);
+        }
+    }
+
+  race.stop = true;
+  ret = pthread_join(thread, NULL);
+  assert_int_equal(ret, 0);
+  watchdog_notifier_chain_unregister(&race.nb);
+  assert_true(race.callbacks > 0);
+}
+
+#endif /* CONFIG_WATCHDOG_TIMEOUT_NOTIFIER */
+
+#ifdef CONFIG_BOARDCTL_RESET_CAUSE
+
 /****************************************************************************
  * Name: drivertest_watchdog_feeding
  *
@@ -493,9 +725,10 @@ static void drivertest_watchdog_api(FAR void **state)
 
   /* Test capture. */
 
-  ret = sem_init(&g_semaphore, 0, 0);
+  ret = sem_init(&wdg_state->semaphore, 0, 0);
   assert_return_code(ret, OK);
 
+  g_capture_test_state = wdg_state;
   watchdog_capture.newhandler = capture_callback;
   ret = ioctl(dev_fd, WDIOC_CAPTURE, &watchdog_capture);
   assert_return_code(ret, OK);
@@ -504,12 +737,14 @@ static void drivertest_watchdog_api(FAR void **state)
 
   up_udelay(2 * wdg_state->timeout * 1000);
 
-  sem_wait(&g_semaphore);
-  sem_destroy(&g_semaphore);
+  sem_wait(&wdg_state->semaphore);
 
   watchdog_capture.newhandler = watchdog_capture.oldhandler;
   ret = ioctl(dev_fd, WDIOC_CAPTURE, &watchdog_capture);
   assert_return_code(ret, OK);
+  g_capture_test_state = NULL;
+
+  sem_destroy(&wdg_state->semaphore);
 
   /* Then stop pinging */
 
@@ -520,6 +755,8 @@ static void drivertest_watchdog_api(FAR void **state)
   assert_return_code(ret, OK);
 }
 
+#endif /* CONFIG_BOARDCTL_RESET_CAUSE */
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -545,11 +782,18 @@ int main(int argc, FAR char *argv[])
 
   const struct CMUnitTest tests[] =
   {
+#ifdef CONFIG_BOARDCTL_RESET_CAUSE
     cmocka_unit_test_prestate(drivertest_watchdog_feeding, &wdg_state),
     cmocka_unit_test_prestate(drivertest_watchdog_interrupts, &wdg_state),
     cmocka_unit_test_prestate(drivertest_watchdog_loop, &wdg_state),
 #if !defined(CONFIG_ARCH_ARMV7A) || !defined(CONFIG_ARCH_HAVE_TRUSTZONE)
-    cmocka_unit_test_prestate(drivertest_watchdog_api, &wdg_state)
+    cmocka_unit_test_prestate(drivertest_watchdog_api, &wdg_state),
+#endif
+#endif
+
+#ifdef CONFIG_WATCHDOG_TIMEOUT_NOTIFIER
+    cmocka_unit_test_prestate(drivertest_watchdog_notifier, &wdg_state),
+    cmocka_unit_test_prestate(drivertest_watchdog_notifier_race, &wdg_state)
 #endif
   };
 

From 608f13fd4be86e8538e26ac855dedc5d4545cbd1 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Thu, 25 Jun 2026 16:55:03 +0000
Subject: [PATCH 522/568] !fsutils/passwd: Replace TEA with PBKDF2-HMAC-SHA256

Migrate passwd encrypt/verify to PBKDF2 modular crypt format using
kernel cryptodev (CRYPTO_PBKDF2_HMAC_SHA256 via /dev/crypto).  Add
passwd_pbkdf2 wrapper, base64url helpers, complexity validation, and
pbkdf2_test for RFC 6070 vector coverage.  FSUTILS_PASSWD selects
CRYPTO, ALLOW_BSD_COMPONENTS, and CRYPTO_CRYPTODEV so existing sim
defconfigs keep building.  Change NSH_LOGIN_USERNAME default to root and
remove fixed-login password defaults.

BREAKING CHANGE: TEA-encoded /etc/passwd entries no longer verify.
Regenerate each entry after upgrading.  Pair with the nuttx host mkpasswd
changes in apache/nuttx#19209.  Boards must enable the appropriate
software or hardware crypto backend for PBKDF2 at runtime.  When
CONFIG_NSH_LOGIN_FIXED=y, set CONFIG_NSH_LOGIN_PASSWORD in the board
defconfig or menuconfig; there is no default password.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 fsutils/passwd/CMakeLists.txt        |   3 +-
 fsutils/passwd/Kconfig               |  38 ++--
 fsutils/passwd/Makefile              |   1 +
 fsutils/passwd/passwd.h              |  26 +--
 fsutils/passwd/passwd_encrypt.c      | 289 ++++++++++++++-------------
 fsutils/passwd/passwd_pbkdf2.c       | 114 +++++++++++
 fsutils/passwd/passwd_pbkdf2.h       |  44 ++++
 fsutils/passwd/passwd_verify.c       | 128 +++++++++---
 include/fsutils/passwd.h             |  11 +-
 include/netutils/base64.h            |  26 ++-
 netutils/codecs/Kconfig              |   3 +-
 netutils/codecs/base64.c             | 147 ++++++++++++++
 netutils/dropbear/Kconfig            |   4 +-
 nshlib/Kconfig                       |  13 +-
 nshlib/nsh.h                         |  11 +-
 testing/crypto/CMakeLists.txt        |  24 +++
 testing/crypto/Make.defs             |  23 +++
 testing/crypto/passwd/CMakeLists.txt |  37 ++++
 testing/crypto/passwd/Kconfig        |  34 ++++
 testing/crypto/passwd/Make.defs      |  25 +++
 testing/crypto/passwd/Makefile       |  34 ++++
 testing/crypto/passwd/pbkdf2_test.c  | 287 ++++++++++++++++++++++++++
 22 files changed, 1096 insertions(+), 226 deletions(-)
 create mode 100644 fsutils/passwd/passwd_pbkdf2.c
 create mode 100644 fsutils/passwd/passwd_pbkdf2.h
 create mode 100644 testing/crypto/CMakeLists.txt
 create mode 100644 testing/crypto/Make.defs
 create mode 100644 testing/crypto/passwd/CMakeLists.txt
 create mode 100644 testing/crypto/passwd/Kconfig
 create mode 100644 testing/crypto/passwd/Make.defs
 create mode 100644 testing/crypto/passwd/Makefile
 create mode 100644 testing/crypto/passwd/pbkdf2_test.c

diff --git a/fsutils/passwd/CMakeLists.txt b/fsutils/passwd/CMakeLists.txt
index e2e0ebce4..16caf1258 100644
--- a/fsutils/passwd/CMakeLists.txt
+++ b/fsutils/passwd/CMakeLists.txt
@@ -23,7 +23,8 @@
 if(CONFIG_FSUTILS_PASSWD)
   set(CSRCS)
 
-  list(APPEND CSRCS passwd_verify.c passwd_find.c passwd_encrypt.c)
+  list(APPEND CSRCS passwd_verify.c passwd_find.c passwd_encrypt.c
+       passwd_pbkdf2.c)
 
   if(NOT CONFIG_FSUTILS_PASSWD_READONLY)
     list(
diff --git a/fsutils/passwd/Kconfig b/fsutils/passwd/Kconfig
index 42a8301e2..198bb2df0 100644
--- a/fsutils/passwd/Kconfig
+++ b/fsutils/passwd/Kconfig
@@ -6,8 +6,19 @@
 config FSUTILS_PASSWD
 	bool "Password file support"
 	default n
+	depends on CRYPTO_CRYPTODEV
+	depends on NETUTILS_CODECS
+	depends on CODECS_BASE64
 	---help---
-		Enables support for /etc/passwd file access routines
+		Enables support for /etc/passwd file access routines.
+
+		Requires CONFIG_CRYPTO=y, CRYPTO_CRYPTODEV (and
+		ALLOW_BSD_COMPONENTS), plus NETUTILS_CODECS/CODECS_BASE64 for
+		base64url hash encoding.
+
+		NOTE: Password hashes use PBKDF2-HMAC-SHA256 (modular crypt format).
+		Existing TEA-encrypted /etc/passwd entries are NOT compatible and
+		must be regenerated.
 
 if FSUTILS_PASSWD
 
@@ -23,23 +34,14 @@ config FSUTILS_PASSWD_IOBUFFER_SIZE
 	int "Allocated I/O buffer size"
 	default 512
 
-config FSUTILS_PASSWD_KEY1
-	hex "Encryption key value 1"
-	default 0
+config FSUTILS_PASSWD_PBKDF2_ITERATIONS
+	int "Default PBKDF2 iteration count for new passwords"
+	default 10000
+	range 1000 200000
 	---help---
-		Leave at 0 if random key generation is enabled under Board
-		Selection. Otherwise set all four keys to unique non-zero values.
-
-config FSUTILS_PASSWD_KEY2
-	hex "Encryption key value 2"
-	default 0
-
-config FSUTILS_PASSWD_KEY3
-	hex "Encryption key value 3"
-	default 0
-
-config FSUTILS_PASSWD_KEY4
-	hex "Encryption key value 4"
-	default 0
+		Number of PBKDF2-HMAC-SHA256 iterations applied when setting a new
+		password.  Higher values slow brute-force attacks but also increase
+		login latency on low-MHz MCUs.  The iteration count is stored in each
+		hash string, so changing this option only affects newly-set passwords.
 
 endif # FSUTILS_PASSWD
diff --git a/fsutils/passwd/Makefile b/fsutils/passwd/Makefile
index b11148ffd..d15b1c6db 100644
--- a/fsutils/passwd/Makefile
+++ b/fsutils/passwd/Makefile
@@ -26,6 +26,7 @@ include $(APPDIR)/Make.defs
 
 ifeq ($(CONFIG_FSUTILS_PASSWD),y)
 CSRCS += passwd_verify.c passwd_find.c passwd_encrypt.c
+CSRCS += passwd_pbkdf2.c
 ifneq ($(CONFIG_FSUTILS_PASSWD_READONLY),y)
 CSRCS += passwd_adduser.c passwd_deluser.c passwd_update.c passwd_append.c
 CSRCS += passwd_delete.c passwd_lock.c
diff --git a/fsutils/passwd/passwd.h b/fsutils/passwd/passwd.h
index 6dd1785e3..e617cef37 100644
--- a/fsutils/passwd/passwd.h
+++ b/fsutils/passwd/passwd.h
@@ -36,17 +36,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define MAX_ENCRYPTED 48         /* Maximum size of a password (encrypted, ASCII) */
-#define MAX_USERNAME  48         /* Maximum size of a username */
-#define MAX_RECORD    (MAX_USERNAME + MAX_ENCRYPTED + 1)
+/* MCF format: $pbkdf2-sha256$<iter>$<salt>$<hash> */
 
-/* The TEA incryption algorithm generates 8 bytes of encrypted data per
- * 8 bytes of unencrypted data.  The encrypted presentation is base64 which
- * is 8-bits of ASCII for each 6 bits of data.  That is a 3-to-4 expansion
- * ratio.  MAX_ENCRYPTED must be a multiple of 8 bytes.
- */
+#define PASSWD_MCF_PREFIX           "$pbkdf2-sha256$"
+#define PASSWD_SALT_BYTES           16
+#define PASSWD_HASH_BYTES           32
 
-#define MAX_PASSWORD  (3 * MAX_ENCRYPTED / 4)
+/* 15 + 6 + 1 + 22 + 1 + 43 = 88 bytes for default parameters */
+
+#define MAX_ENCRYPTED               96
+#define MAX_USERNAME                48
+#define MAX_RECORD                  (MAX_USERNAME + MAX_ENCRYPTED + 1)
+#define MAX_PASSWORD                256
 
 /****************************************************************************
  * Public Types
@@ -55,7 +56,7 @@
 struct passwd_s
 {
   off_t offset;                      /* File offset (start of record) */
-  char encrypted[MAX_ENCRYPTED + 1]; /* Encrtyped password in file */
+  char encrypted[MAX_ENCRYPTED + 1]; /* Password hash in file */
 };
 
 /****************************************************************************
@@ -94,10 +95,11 @@ void passwd_unlock(FAR sem_t *sem);
  * Name: passwd_encrypt
  *
  * Description:
- *   Encrypt a password.  Currently uses the Tiny Encryption Algorithm.
+ *   Hash a password with PBKDF2-HMAC-SHA256 and encode the result in modular
+ *   crypt format for storage in /etc/passwd.
  *
  * Input Parameters:
- *   password -- The password string to be encrypted
+ *   password -- The password string to be hashed
  *
  * Returned Value:
  *   Zero (OK) is returned on success; a negated errno value is returned on
diff --git a/fsutils/passwd/passwd_encrypt.c b/fsutils/passwd/passwd_encrypt.c
index 50e516f77..c1e8b941e 100644
--- a/fsutils/passwd/passwd_encrypt.c
+++ b/fsutils/passwd/passwd_encrypt.c
@@ -25,85 +25,145 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/debug.h>
 
-#include <stdint.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
+#include <sys/random.h>
+#include <unistd.h>
 
-#include <nuttx/crypto/tea.h>
+#include <netutils/base64.h>
 
 #include "passwd.h"
+#include "passwd_pbkdf2.h"
 
 /****************************************************************************
- * Private Data
+ * Pre-processor Definitions
  ****************************************************************************/
 
-/* This should be better protected */
+#ifndef CONFIG_FSUTILS_PASSWD_PBKDF2_ITERATIONS
+#  define CONFIG_FSUTILS_PASSWD_PBKDF2_ITERATIONS 10000
+#endif
 
-static uint32_t g_tea_key[4] =
-{
-  CONFIG_FSUTILS_PASSWD_KEY1,
-  CONFIG_FSUTILS_PASSWD_KEY2,
-  CONFIG_FSUTILS_PASSWD_KEY3,
-  CONFIG_FSUTILS_PASSWD_KEY4
-};
+#define PASSWD_MIN_LENGTH  8
+
+static const char g_password_specials[] =
+  "!@#$%^&*()_+-=[]{}|;:,.<>?";
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+static int validate_password_complexity(FAR const char *password)
+{
+  FAR const char *p;
+  size_t passlen;
+  int has_upper   = 0;
+  int has_lower   = 0;
+  int has_digit   = 0;
+  int has_special = 0;
+
+  passlen = strlen(password);
+  if (passlen < PASSWD_MIN_LENGTH)
+    {
+      _err("ERROR: password must be at least %d characters\n",
+           PASSWD_MIN_LENGTH);
+      return -EINVAL;
+    }
+
+  if (passlen > MAX_PASSWORD)
+    {
+      _err("ERROR: password must be at most %d characters\n", MAX_PASSWORD);
+      return -EINVAL;
+    }
+
+  for (p = password; *p != '\0'; p++)
+    {
+      if (isupper((unsigned char)*p))
+        {
+          has_upper = 1;
+        }
+      else if (islower((unsigned char)*p))
+        {
+          has_lower = 1;
+        }
+      else if (isdigit((unsigned char)*p))
+        {
+          has_digit = 1;
+        }
+      else if (strchr(g_password_specials, *p) != NULL)
+        {
+          has_special = 1;
+        }
+    }
+
+  if (!has_upper)
+    {
+      _err("ERROR: password must contain at least one uppercase "
+           "letter (A-Z)\n");
+      return -EINVAL;
+    }
+
+  if (!has_lower)
+    {
+      _err("ERROR: password must contain at least one lowercase "
+           "letter (a-z)\n");
+      return -EINVAL;
+    }
+
+  if (!has_digit)
+    {
+      _err("ERROR: password must contain at least one digit (0-9)\n");
+      return -EINVAL;
+    }
+
+  if (!has_special)
+    {
+      _err("ERROR: password must contain at least one special "
+           "character (!@#$%%^&*()_+-=[]{}|;:,.<>?)\n");
+      return -EINVAL;
+    }
+
+  return OK;
+}
+
 /****************************************************************************
- * Name: passwd_base64
+ * Name: passwd_fill_random
  *
  * Description:
- *   Encode a 5 bit value as a base64 character.
- *
- * Input Parameters:
- *   binary - 5 bit value
- *
- * Returned Value:
- *   The ASCII base64 character.  Must not return the field delimiter ':'
+ *   Fill a buffer with random bytes using getrandom() or /dev/urandom.
  *
  ****************************************************************************/
 
-static char passwd_base64(uint8_t binary)
+static int passwd_fill_random(FAR uint8_t *buf, size_t len)
 {
-  /* 0-26 -> 'A'-'Z' */
+  ssize_t nread;
+  int fd;
 
-  binary &= 63;
-  if (binary < 26)
+  nread = getrandom(buf, len, 0);
+  if (nread == (ssize_t)len)
     {
-      return 'A' + binary;
+      return OK;
     }
 
-  /* 26-51 -> 'a'-'z' */
-
-  binary -= 26;
-  if (binary < 26)
+  fd = open("/dev/urandom", O_RDONLY);
+  if (fd < 0)
     {
-      return 'a' + binary;
+      return -errno;
     }
 
-  /* 52->61 -> '0'-'9' */
+  nread = read(fd, buf, len);
+  close(fd);
 
-  binary -= 26;
-  if (binary < 10)
+  if (nread != (ssize_t)len)
     {
-      return '0' + binary;
+      return nread < 0 ? -errno : -EIO;
     }
 
-  /* 62 -> '+' */
-
-  binary -= 10;
-  if (binary == 0)
-    {
-      return '+';
-    }
-
-  /* 63 -> '/' */
-
-  return '/';
+  return OK;
 }
 
 /****************************************************************************
@@ -114,109 +174,66 @@ static char passwd_base64(uint8_t binary)
  * Name: passwd_encrypt
  *
  * Description:
- *   Encrypt a password.  Currently uses the Tiny Encryption Algorithm.
- *
- * Input Parameters:
- *   password -- The password string to be encrypted
- *
- * Returned Value:
- *   Zero (OK) is returned on success; a negated errno value is returned on
- *   failure.
+ *   Hash a password with PBKDF2-HMAC-SHA256 and encode as modular crypt
+ *   format: $pbkdf2-sha256$<iter>$<base64url-salt>$<base64url-hash>
  *
  ****************************************************************************/
 
 int passwd_encrypt(FAR const char *password,
                    char encrypted[MAX_ENCRYPTED + 1])
 {
-  union
-  {
-    char     b[8];
-    uint16_t h[4];
-    uint32_t l[2];
-  } value;
+  uint8_t salt[PASSWD_SALT_BYTES];
+  uint8_t hash[PASSWD_HASH_BYTES];
+  char salt_b64[32];
+  char hash_b64[48];
+  size_t passlen;
+  int ret;
 
-  FAR const char *src;
-  FAR char *bptr;
-  FAR char *dest;
-  uint32_t tmp;
-  uint8_t remainder;
-  int remaining;
-  int gulpsize;
-  int nbits;
-  int i;
+  ret = validate_password_complexity(password);
+  if (ret < 0)
+    {
+      return ret;
+    }
 
-  /* How long is the password? */
+  passlen = strlen(password);
 
-  remaining = strlen(password);
-  if (remaining > MAX_PASSWORD)
+  ret = passwd_fill_random(salt, sizeof(salt));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = passwd_pbkdf2_hmac_sha256((FAR const uint8_t *)password, passlen,
+                                  salt, sizeof(salt),
+                                  CONFIG_FSUTILS_PASSWD_PBKDF2_ITERATIONS,
+                                  hash, sizeof(hash));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = base64url_encode(salt, sizeof(salt), salt_b64,
+                                sizeof(salt_b64));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = base64url_encode(hash, sizeof(hash), hash_b64,
+                                sizeof(hash_b64));
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+  ret = snprintf(encrypted, MAX_ENCRYPTED + 1,
+                 PASSWD_MCF_PREFIX "%u$%s$%s",
+                 CONFIG_FSUTILS_PASSWD_PBKDF2_ITERATIONS,
+                 salt_b64, hash_b64);
+  if (ret < 0 || (size_t)ret > MAX_ENCRYPTED)
     {
       return -E2BIG;
     }
 
-  /* Convert the password in 8-byte TEA cycles */
-
-  src        = password;
-  dest       = encrypted;
-  *dest      = '\0';
-
-  remainder  = 0;
-  nbits      = 0;
-
-  for (; remaining > 0; remaining -= gulpsize)
-    {
-      /* Copy bytes */
-
-      gulpsize = sizeof(value.b);
-      if (gulpsize > remaining)
-        {
-          gulpsize = remaining;
-        }
-
-      bptr = value.b;
-      for (i = 0; i < gulpsize; i++)
-        {
-          *bptr++ = *src++;
-        }
-
-      /* Pad with spaces if necessary */
-
-      for (; i < sizeof(value.b); i++)
-        {
-          *bptr++ = ' ';
-        }
-
-      /* Perform the conversion for this cycle */
-
-      tea_encrypt(value.l, g_tea_key);
-
-      /* Generate the base64 output string from this cycle */
-
-      tmp = remainder;
-
-      for (i = 0; i < 4; i++)
-        {
-          tmp    = (uint32_t)value.h[i] << nbits | tmp;
-          nbits += 16;
-
-          while (nbits >= 6)
-            {
-              *dest++ = passwd_base64((uint8_t)(tmp & 0x3f));
-              tmp   >>= 6;
-              nbits  -= 6;
-            }
-        }
-
-      remainder = (uint8_t)tmp;
-      *dest     = '\0';
-    }
-
-  /* Handle any remainder */
-
-  if (nbits > 0)
-    {
-      *dest++ = passwd_base64(remainder);
-      *dest   = '\0';
-    }
-
   return OK;
 }
diff --git a/fsutils/passwd/passwd_pbkdf2.c b/fsutils/passwd/passwd_pbkdf2.c
new file mode 100644
index 000000000..e070387ab
--- /dev/null
+++ b/fsutils/passwd/passwd_pbkdf2.c
@@ -0,0 +1,114 @@
+/****************************************************************************
+ * apps/fsutils/passwd/passwd_pbkdf2.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <crypto/cryptodev.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include "passwd_pbkdf2.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int passwd_pbkdf2_hmac_sha256(FAR const uint8_t *pass, size_t passlen,
+                              FAR const uint8_t *salt, size_t saltlen,
+                              uint32_t iterations,
+                              FAR uint8_t *out, size_t outlen)
+{
+  struct session_op session;
+  struct crypt_op cryp;
+  int cryptodev_fd = -1;
+  int fd = -1;
+  int ret = 0;
+
+  if (pass == NULL || salt == NULL || out == NULL || passlen == 0 ||
+      saltlen == 0 || iterations == 0 || outlen == 0)
+    {
+      return -EINVAL;
+    }
+
+  fd = open("/dev/crypto", O_RDWR, 0);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  if (ioctl(fd, CRIOGET, &cryptodev_fd) < 0)
+    {
+      ret = -errno;
+      goto errout;
+    }
+
+  memset(&session, 0, sizeof(session));
+  session.cipher = 0;
+  session.mac = CRYPTO_PBKDF2_HMAC_SHA256;
+  session.mackey = (caddr_t)pass;
+  session.mackeylen = passlen;
+
+  if (ioctl(cryptodev_fd, CIOCGSESSION, &session) < 0)
+    {
+      ret = -errno;
+      goto errout;
+    }
+
+  memset(&cryp, 0, sizeof(cryp));
+  cryp.ses = session.ses;
+  cryp.op = COP_ENCRYPT;
+  cryp.src = (caddr_t)salt;
+  cryp.len = saltlen;
+  cryp.mac = (caddr_t)out;
+  cryp.iterations = iterations;
+  cryp.olen = outlen;
+
+  if (ioctl(cryptodev_fd, CIOCCRYPT, &cryp) < 0)
+    {
+      ret = -errno;
+      goto errout_with_session;
+    }
+
+errout_with_session:
+  ioctl(cryptodev_fd, CIOCFSESSION, &session.ses);
+
+errout:
+  if (cryptodev_fd >= 0)
+    {
+      close(cryptodev_fd);
+    }
+
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  return ret;
+}
diff --git a/fsutils/passwd/passwd_pbkdf2.h b/fsutils/passwd/passwd_pbkdf2.h
new file mode 100644
index 000000000..1a66109fa
--- /dev/null
+++ b/fsutils/passwd/passwd_pbkdf2.h
@@ -0,0 +1,44 @@
+/****************************************************************************
+ * apps/fsutils/passwd/passwd_pbkdf2.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_FSUTILS_PASSWD_PASSWD_PBKDF2_H
+#define __APPS_FSUTILS_PASSWD_PASSWD_PBKDF2_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/compiler.h>
+
+#include <sys/types.h>
+#include <stdint.h>
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int passwd_pbkdf2_hmac_sha256(FAR const uint8_t *pass, size_t passlen,
+                              FAR const uint8_t *salt, size_t saltlen,
+                              uint32_t iterations,
+                              FAR uint8_t *out, size_t outlen);
+
+#endif /* __APPS_FSUTILS_PASSWD_PASSWD_PBKDF2_H */
diff --git a/fsutils/passwd/passwd_verify.c b/fsutils/passwd/passwd_verify.c
index 2c63f3759..fef8da6df 100644
--- a/fsutils/passwd/passwd_verify.c
+++ b/fsutils/passwd/passwd_verify.c
@@ -24,11 +24,105 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
-#include <semaphore.h>
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <netutils/base64.h>
+#include <fsutils/passwd.h>
 
-#include "fsutils/passwd.h"
 #include "passwd.h"
+#include "passwd_pbkdf2.h"
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: passwd_verify_hash
+ *
+ * Description:
+ *   Verify a password against a stored PBKDF2-SHA256 modular crypt hash.
+ *   Rejects any hash not in $pbkdf2-sha256$ format.
+ *
+ * Returned Value:
+ *   0 on match, -1 on mismatch or parse error.
+ *
+ ****************************************************************************/
+
+static int passwd_verify_hash(FAR const char *stored,
+                              FAR const char *password)
+{
+  FAR const char *p;
+  FAR const char *salt_b64;
+  FAR const char *hash_b64;
+  char *endptr;
+  uint8_t salt[PASSWD_SALT_BYTES];
+  uint8_t expected[PASSWD_HASH_BYTES];
+  uint8_t actual[PASSWD_HASH_BYTES];
+  size_t saltlen;
+  size_t hashlen;
+  size_t passlen;
+  unsigned long iterations;
+  int ret;
+
+  if (strncmp(stored, PASSWD_MCF_PREFIX, strlen(PASSWD_MCF_PREFIX)) != 0)
+    {
+      return -1;
+    }
+
+  p = stored + strlen(PASSWD_MCF_PREFIX);
+  iterations = strtoul(p, &endptr, 10);
+  if (endptr == p || *endptr != '$' || iterations < 1 ||
+      iterations > 200000)
+    {
+      return -1;
+    }
+
+  salt_b64 = endptr + 1;
+  hash_b64 = strchr(salt_b64, '$');
+  if (hash_b64 == NULL)
+    {
+      return -1;
+    }
+
+  ret = base64url_decode(salt_b64, salt, sizeof(salt), &saltlen);
+  if (ret < 0 || saltlen == 0)
+    {
+      return -1;
+    }
+
+  ret = base64url_decode(hash_b64 + 1, expected, sizeof(expected),
+                                &hashlen);
+  if (ret < 0 || hashlen != PASSWD_HASH_BYTES)
+    {
+      return -1;
+    }
+
+  passlen = strlen(password);
+  if (passlen == 0 || passlen > MAX_PASSWORD)
+    {
+      return -1;
+    }
+
+  ret = passwd_pbkdf2_hmac_sha256((FAR const uint8_t *)password, passlen,
+                                  salt, saltlen, (uint32_t)iterations,
+                                  actual, sizeof(actual));
+  if (ret < 0)
+    {
+      return -1;
+    }
+
+  if (timingsafe_bcmp(actual, expected, sizeof(expected)) != 0)
+    {
+      return -1;
+    }
+
+  return 0;
+}
 
 /****************************************************************************
  * Public Functions
@@ -39,53 +133,33 @@
  *
  * Description:
  *   Return true if the username exists in the /etc/passwd file and if the
- *   password matches the user password in that failed.
- *
- * Input Parameters:
+ *   password matches the user password in that file.
  *
  * Returned Value:
- *   One (1) is returned on success match, Zero (OK) is returned on an
- *   unsuccessful match; a negated errno value is returned on any other
- *   failure.
+ *   Zero (0) is returned on a successful match, -1 on mismatch or invalid
+ *   hash format; a negated errno value is returned on other failures.
  *
  ****************************************************************************/
 
 int passwd_verify(FAR const char *username, FAR const char *password)
 {
   struct passwd_s passwd;
-  char encrypted[MAX_ENCRYPTED + 1];
   PASSWD_SEM_DECL(sem);
   int ret;
 
-  /* Get exclusive access to the /etc/passwd file */
-
   ret = passwd_lock(&sem);
   if (ret < 0)
     {
       return ret;
     }
 
-  /* Verify that the username exists in the /etc/passwd file */
-
   ret = passwd_find(username, &passwd);
   if (ret < 0)
     {
-      /* The username does not exist in the /etc/passwd file */
-
       goto errout_with_lock;
     }
 
-  /* Encrypt the provided password */
-
-  ret = passwd_encrypt(password, encrypted);
-  if (ret < 0)
-    {
-      goto errout_with_lock;
-    }
-
-  /* Compare the encrypted passwords */
-
-  ret = (strcmp(passwd.encrypted, encrypted) == 0) ? 1 : 0;
+  ret = passwd_verify_hash(passwd.encrypted, password);
 
 errout_with_lock:
   passwd_unlock(sem);
diff --git a/include/fsutils/passwd.h b/include/fsutils/passwd.h
index 996bcf509..93fed255d 100644
--- a/include/fsutils/passwd.h
+++ b/include/fsutils/passwd.h
@@ -36,9 +36,9 @@
 
 /* passwd_verify() return value tests */
 
-#define PASSWORD_VERIFY_MATCH(ret)   (ret == 1)
-#define PASSWORD_VERIFY_NOMATCH(ret) (ret == 0)
-#define PASSWORD_VERIFY_ERROR(ret)   (ret < 0)
+#define PASSWORD_VERIFY_MATCH(ret)   ((ret) == 0)
+#define PASSWORD_VERIFY_NOMATCH(ret) ((ret) == -1)
+#define PASSWORD_VERIFY_ERROR(ret)   ((ret) < -1)
 
 /****************************************************************************
  * Public Function Prototypes
@@ -115,9 +115,8 @@ int passwd_update(FAR const char *username, FAR const char *password);
  *   password - The password to be verified
  *
  * Returned Value:
- *   One (1) is returned on success match, Zero (OK) is returned on an
- *   unsuccessful match; a negated errno value is returned on any other
- *   failure.
+ *   Zero (0) is returned on a successful match, -1 on mismatch or invalid
+ *   hash format; a negated errno value is returned on other failures.
  *
  ****************************************************************************/
 
diff --git a/include/netutils/base64.h b/include/netutils/base64.h
index e5869d8ac..5f146d7e8 100644
--- a/include/netutils/base64.h
+++ b/include/netutils/base64.h
@@ -30,17 +30,17 @@
  *      may be used to endorse or promote products derived from this software
  *      without specific prior written permission.
  *
- *   THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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 SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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.
  *
  ****************************************************************************/
 
@@ -73,6 +73,10 @@ FAR void *base64w_encode(FAR const void *src, size_t len, FAR void *dst,
                          FAR size_t *out_len);
 FAR void *base64w_decode(FAR const void *src, size_t len, FAR void *dst,
                          FAR size_t *out_len);
+int base64url_encode(FAR const void *src, size_t len, FAR char *dst,
+                     size_t dstlen);
+int base64url_decode(FAR const char *src, FAR void *dst, size_t dstmax,
+                     FAR size_t *out_len);
 #endif /* CONFIG_CODECS_BASE64 */
 
 #ifdef __cplusplus
diff --git a/netutils/codecs/Kconfig b/netutils/codecs/Kconfig
index 4b22e1d3f..08f5ed816 100644
--- a/netutils/codecs/Kconfig
+++ b/netutils/codecs/Kconfig
@@ -16,7 +16,8 @@ config CODECS_BASE64
 	default n
 	---help---
 		Enables support for the following interfaces: base64_encode(),
-		base64_decode(), base64w_encode(), and base64w_decode(),
+		base64_decode(), base64w_encode(), base64w_decode(),
+		base64url_encode(), and base64url_decode(),
 
 		Contributed NuttX by Darcy Gong.
 
diff --git a/netutils/codecs/base64.c b/netutils/codecs/base64.c
index 36485b85a..731283857 100644
--- a/netutils/codecs/base64.c
+++ b/netutils/codecs/base64.c
@@ -55,6 +55,7 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
+#include <errno.h>
 #include <string.h>
 
 #include "netutils/base64.h"
@@ -317,4 +318,150 @@ FAR void *base64w_decode(FAR const void *src, size_t len, FAR void *dst,
   return _base64_decode(src, len, dst, out_len, true);
 }
 
+/****************************************************************************
+ * Name: base64url_val
+ ****************************************************************************/
+
+static int base64url_val(char c)
+{
+  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 == '-')
+    {
+      return 62;
+    }
+
+  if (c == '_')
+    {
+      return 63;
+    }
+
+  return -1;
+}
+
+/****************************************************************************
+ * Name: base64url_encode
+ *
+ * Description:
+ *   Encode binary data as unpadded base64url (RFC 4648 section 5).
+ *
+ ****************************************************************************/
+
+int base64url_encode(FAR const void *src, size_t len, FAR char *dst,
+                     size_t dstlen)
+{
+  FAR const uint8_t *in = src;
+  uint32_t acc = 0;
+  size_t i;
+  size_t o = 0;
+  int bits = 0;
+
+  static const char g_base64url[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+
+  for (i = 0; i < len; i++)
+    {
+      acc = (acc << 8) | in[i];
+      bits += 8;
+
+      while (bits >= 6)
+        {
+          if (o + 1 >= dstlen)
+            {
+              return -E2BIG;
+            }
+
+          bits -= 6;
+          dst[o++] = g_base64url[(acc >> bits) & 0x3f];
+        }
+    }
+
+  if (bits > 0)
+    {
+      if (o + 1 >= dstlen)
+        {
+          return -E2BIG;
+        }
+
+      dst[o++] = g_base64url[(acc << (6 - bits)) & 0x3f];
+    }
+
+  if (o >= dstlen)
+    {
+      return -E2BIG;
+    }
+
+  dst[o] = '\0';
+  return 0;
+}
+
+/****************************************************************************
+ * Name: base64url_decode
+ *
+ * Description:
+ *   Decode unpadded base64url (RFC 4648 section 5).
+ *
+ ****************************************************************************/
+
+int base64url_decode(FAR const char *src, FAR void *dst, size_t dstmax,
+                     FAR size_t *out_len)
+{
+  FAR uint8_t *out = dst;
+  uint32_t acc = 0;
+  size_t o = 0;
+  int bits = 0;
+  int v;
+
+  *out_len = 0;
+
+  while (*src != '\0')
+    {
+      if (*src == '$' || *src == ':')
+        {
+          break;
+        }
+
+      v = base64url_val(*src++);
+      if (v < 0)
+        {
+          return -EINVAL;
+        }
+
+      acc = (acc << 6) | (uint32_t)v;
+      bits += 6;
+
+      if (bits >= 8)
+        {
+          bits -= 8;
+          if (o >= dstmax)
+            {
+              return -E2BIG;
+            }
+
+          out[o++] = (uint8_t)((acc >> bits) & 0xff);
+        }
+    }
+
+  if (bits >= 6)
+    {
+      return -EINVAL;
+    }
+
+  *out_len = o;
+  return 0;
+}
+
 #endif /* CONFIG_CODECS_BASE64 */
diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
index abf9f4574..43a2c4a51 100644
--- a/netutils/dropbear/Kconfig
+++ b/netutils/dropbear/Kconfig
@@ -19,8 +19,8 @@ menuconfig NETUTILS_DROPBEAR
 	depends on DEV_URANDOM
 	depends on LIBC_NETDB
 	depends on LIBC_GAISTRERROR
-	select CRYPTO
-	select CRYPTO_RANDOM_POOL
+	depends on CRYPTO
+	depends on CRYPTO_RANDOM_POOL
 	---help---
 		Enable a minimal Dropbear SSH server port for NuttX.  This initial
 		port is based on the ESP-IDF MCU test port and provides a single
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 1f78a50ae..7a39d96b4 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -1287,17 +1287,20 @@ endchoice # Verification method
 
 config NSH_LOGIN_USERNAME
 	string "Login username"
-	default "admin"
+	default "root"
 	depends on !NSH_LOGIN_PASSWD
 	---help---
-		Login user name.  Default: "admin"
+		Login user name.  Default: "root"
 
 config NSH_LOGIN_PASSWORD
 	string "Login password"
-	default "Administrator"
-	depends on !NSH_LOGIN_PASSWD
+	depends on NSH_LOGIN_FIXED
 	---help---
-		Login password:  Default: "Administrator"
+		The plaintext login password used when fixed username/password
+		verification is selected (CONFIG_NSH_LOGIN_FIXED).  There is no
+		default; set CONFIG_NSH_LOGIN_PASSWORD in the board defconfig,
+		via menuconfig, or enter it when prompted during an interactive
+		build.
 
 config NSH_LOGIN_FAILDELAY
 	int "Login failure delay"
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 872c1e4af..5950c4fce 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -266,8 +266,9 @@
  * If CONFIG_NSH_TELNET_LOGIN is defined, then these additional
  * options may be specified:
  *
- * CONFIG_NSH_LOGIN_USERNAME - Login user name.  Default: "admin"
- * CONFIG_NSH_LOGIN_PASSWORD - Login password:  Default: "Administrator"
+ * CONFIG_NSH_LOGIN_USERNAME - Login user name.  Default: "root"
+ * CONFIG_NSH_LOGIN_PASSWORD - Login password (required when using fixed
+ *   credentials; no default is provided).
  * CONFIG_NSH_LOGIN_FAILCOUNT - Number of login retry attempts.
  *   Default 3.
  */
@@ -275,11 +276,7 @@
 #ifdef CONFIG_NSH_TELNET_LOGIN
 
 #  ifndef CONFIG_NSH_LOGIN_USERNAME
-#    define CONFIG_NSH_LOGIN_USERNAME  "admin"
-#  endif
-
-#  ifndef CONFIG_NSH_LOGIN_PASSWORD
-#    define CONFIG_NSH_LOGIN_PASSWORD  "nuttx"
+#    define CONFIG_NSH_LOGIN_USERNAME  "root"
 #  endif
 
 #  ifndef CONFIG_NSH_LOGIN_FAILCOUNT
diff --git a/testing/crypto/CMakeLists.txt b/testing/crypto/CMakeLists.txt
new file mode 100644
index 000000000..0b2030ebe
--- /dev/null
+++ b/testing/crypto/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ##############################################################################
+# apps/testing/crypto/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "crypto")
diff --git a/testing/crypto/Make.defs b/testing/crypto/Make.defs
new file mode 100644
index 000000000..12e81164e
--- /dev/null
+++ b/testing/crypto/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/testing/crypto/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+############################################################################
+
+include $(wildcard $(APPDIR)/testing/crypto/*/Make.defs)
diff --git a/testing/crypto/passwd/CMakeLists.txt b/testing/crypto/passwd/CMakeLists.txt
new file mode 100644
index 000000000..2a5c205c6
--- /dev/null
+++ b/testing/crypto/passwd/CMakeLists.txt
@@ -0,0 +1,37 @@
+# ##############################################################################
+# apps/testing/crypto/passwd/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_PBKDF2)
+  nuttx_add_application(
+    NAME
+    pbkdf2_test
+    PRIORITY
+    ${CONFIG_TESTING_PBKDF2_PRIORITY}
+    STACKSIZE
+    ${CONFIG_TESTING_PBKDF2_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_PBKDF2}
+    SRCS
+    pbkdf2_test.c
+    INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_LIST_DIR}/../../../fsutils/passwd)
+endif()
diff --git a/testing/crypto/passwd/Kconfig b/testing/crypto/passwd/Kconfig
new file mode 100644
index 000000000..b15276e64
--- /dev/null
+++ b/testing/crypto/passwd/Kconfig
@@ -0,0 +1,34 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_PBKDF2
+	tristate "PBKDF2 and passwd hash test"
+	default n
+	depends on FSUTILS_PASSWD
+	---help---
+		Enable the PBKDF2-HMAC-SHA256 unit test
+		(apps/testing/crypto/passwd).  Always runs RFC 6070 SHA-256
+		vectors.  The passwd_encrypt / passwd_verify round-trip runs only
+		when FSUTILS_PASSWD_READONLY is disabled and DEV_URANDOM is
+		enabled; otherwise it is skipped with an explanatory message.
+
+if TESTING_PBKDF2
+
+config TESTING_PBKDF2_PRIORITY
+	int "pbkdf2_test task priority"
+	default 100
+
+config TESTING_PBKDF2_STACKSIZE
+	int "pbkdf2_test stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+config TESTING_PBKDF2_SLOW_VECTOR
+	bool "Run RFC 6070 vector with 16777216 iterations"
+	default n
+	---help---
+		Include RFC 6070 test vector #4 (16,777,216 iterations).  This
+		takes a long time on embedded targets; enable only for manual runs.
+
+endif
diff --git a/testing/crypto/passwd/Make.defs b/testing/crypto/passwd/Make.defs
new file mode 100644
index 000000000..2e7cac968
--- /dev/null
+++ b/testing/crypto/passwd/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/crypto/passwd/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_PBKDF2),)
+CONFIGURED_APPS += $(APPDIR)/testing/crypto/passwd
+endif
diff --git a/testing/crypto/passwd/Makefile b/testing/crypto/passwd/Makefile
new file mode 100644
index 000000000..2b726cbd6
--- /dev/null
+++ b/testing/crypto/passwd/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/testing/crypto/passwd/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PRIORITY  = $(CONFIG_TESTING_PBKDF2_PRIORITY)
+STACKSIZE = $(CONFIG_TESTING_PBKDF2_STACKSIZE)
+MODULE    = $(CONFIG_TESTING_PBKDF2)
+
+MAINSRC   = pbkdf2_test.c
+PROGNAME  = pbkdf2_test
+
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/fsutils/passwd
+
+include $(APPDIR)/Application.mk
diff --git a/testing/crypto/passwd/pbkdf2_test.c b/testing/crypto/passwd/pbkdf2_test.c
new file mode 100644
index 000000000..d1f0e718d
--- /dev/null
+++ b/testing/crypto/passwd/pbkdf2_test.c
@@ -0,0 +1,287 @@
+/****************************************************************************
+ * apps/testing/crypto/passwd/pbkdf2_test.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <fsutils/passwd.h>
+
+#include "passwd.h"
+#include "passwd_pbkdf2.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define TEST_USERNAME  "testuser"
+#define TEST_PASSWORD  "MySecret1!"
+#define WRONG_PASSWORD "WrongPass"
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct pbkdf2_vector_s
+{
+  FAR const char *password;
+  size_t          passwordlen;
+  FAR const char *salt;
+  size_t          saltlen;
+  uint32_t        iterations;
+  size_t          dklen;
+  FAR const uint8_t *expected;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* PBKDF2-HMAC-SHA256 test vectors from RFC 6070 (appendix B). */
+
+static const uint8_t g_vector1[] =
+{
+  0x12, 0x0f, 0xb6, 0xcf, 0xfc, 0xf8, 0xb3, 0x2c,
+  0x43, 0xe7, 0x22, 0x52, 0x56, 0xc4, 0xf8, 0x37,
+  0xa8, 0x65, 0x48, 0xc9
+};
+
+static const uint8_t g_vector2[] =
+{
+  0xae, 0x4d, 0x0c, 0x95, 0xaf, 0x6b, 0x46, 0xd3,
+  0x2d, 0x0a, 0xdf, 0xf9, 0x28, 0xf0, 0x6d, 0xd0,
+  0x2a, 0x30, 0x3f, 0x8e
+};
+
+static const uint8_t g_vector3[] =
+{
+  0xc5, 0xe4, 0x78, 0xd5, 0x92, 0x88, 0xc8, 0x41,
+  0xaa, 0x53, 0x0d, 0xb6, 0x84, 0x5c, 0x4c, 0x8d,
+  0x96, 0x28, 0x93, 0xa0
+};
+
+static const uint8_t g_vector4[] =
+{
+  0xcf, 0x81, 0xc6, 0x6f, 0xe8, 0xcf, 0xc0, 0x4d,
+  0x1f, 0x31, 0xec, 0xb6, 0x5d, 0xab, 0x40, 0x89,
+  0xf7, 0xf1, 0x79, 0xe8
+};
+
+static const uint8_t g_vector5[] =
+{
+  0x34, 0x8c, 0x89, 0xdb, 0xcb, 0xd3, 0x2b, 0x2f,
+  0x32, 0xd8, 0x14, 0xb8, 0x11, 0x6e, 0x84, 0xcf,
+  0x2b, 0x17, 0x34, 0x7e, 0xbc, 0x18, 0x00, 0x18,
+  0x1c
+};
+
+static const uint8_t g_vector6[] =
+{
+  0x89, 0xb6, 0x9d, 0x05, 0x16, 0xf8, 0x29, 0x89,
+  0x3c, 0x69, 0x62, 0x26, 0x65, 0x0a, 0x86, 0x87
+};
+
+static const struct pbkdf2_vector_s g_vectors[] =
+{
+  {
+    "password", 8,
+    "salt", 4,
+    1, 20,
+    g_vector1
+  },
+  {
+    "password", 8,
+    "salt", 4,
+    2, 20,
+    g_vector2
+  },
+  {
+    "password", 8,
+    "salt", 4,
+    4096, 20,
+    g_vector3
+  },
+  {
+    "password", 8,
+    "salt", 4,
+    16777216, 20,
+    g_vector4
+  },
+  {
+    "passwordPASSWORDpassword", 24,
+    "saltSALTsaltSALTsaltSALTsaltSALTsalt", 36,
+    4096, 25,
+    g_vector5
+  },
+  {
+    "pass\0word", 9,
+    "sa\0lt", 5,
+    4096, 16,
+    g_vector6
+  },
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int test_pbkdf2_vectors(void)
+{
+  FAR const struct pbkdf2_vector_s *vec;
+  uint8_t output[32];
+  int failures = 0;
+  int i;
+  int ret;
+
+  for (i = 0; i < (int)(sizeof(g_vectors) / sizeof(g_vectors[0])); i++)
+    {
+      vec = &g_vectors[i];
+
+#ifndef CONFIG_TESTING_PBKDF2_SLOW_VECTOR
+      if (vec->iterations > 100000)
+        {
+          printf("pbkdf2_test: skipping slow vector %d (enable "
+                 "TESTING_PBKDF2_SLOW_VECTOR)\n", i);
+          continue;
+        }
+#endif
+
+      ret = passwd_pbkdf2_hmac_sha256((FAR const uint8_t *)vec->password,
+                                      vec->passwordlen,
+                                      (FAR const uint8_t *)vec->salt,
+                                      vec->saltlen,
+                                      vec->iterations,
+                                      output, vec->dklen);
+      if (ret != 0)
+        {
+          printf("pbkdf2_test: vector %d pbkdf2 failed: %d\n", i, ret);
+          failures++;
+          continue;
+        }
+
+      if (memcmp(output, vec->expected, vec->dklen) != 0)
+        {
+          printf("pbkdf2_test: vector %d output mismatch\n", i);
+          failures++;
+        }
+    }
+
+  if (failures == 0)
+    {
+      printf("pbkdf2_test: RFC 6070 SHA-256 vectors OK\n");
+    }
+
+  return failures;
+}
+
+static int test_passwd_roundtrip(void)
+{
+#if defined(CONFIG_FSUTILS_PASSWD_READONLY)
+  printf("pbkdf2_test: skipping passwd round-trip "
+         "(FSUTILS_PASSWD_READONLY)\n");
+  return 0;
+#elif !defined(CONFIG_DEV_URANDOM)
+  printf("pbkdf2_test: skipping passwd round-trip "
+         "(DEV_URANDOM)\n");
+  return 0;
+#else
+  FILE *stream;
+  char encrypted[MAX_ENCRYPTED + 1];
+  int ret;
+
+  unlink(CONFIG_FSUTILS_PASSWD_PATH);
+
+  ret = passwd_encrypt(TEST_PASSWORD, encrypted);
+  if (ret < 0)
+    {
+      printf("pbkdf2_test: passwd_encrypt failed: %d\n", ret);
+      return 1;
+    }
+
+  stream = fopen(CONFIG_FSUTILS_PASSWD_PATH, "w");
+  if (stream == NULL)
+    {
+      printf("pbkdf2_test: cannot write %s: %d\n",
+             CONFIG_FSUTILS_PASSWD_PATH, errno);
+      return 1;
+    }
+
+  if (fprintf(stream, "%s:%s:0:0:/\n", TEST_USERNAME, encrypted) < 0)
+    {
+      printf("pbkdf2_test: fprintf failed: %d\n", errno);
+      fclose(stream);
+      return 1;
+    }
+
+  fclose(stream);
+
+  ret = passwd_verify(TEST_USERNAME, TEST_PASSWORD);
+  if (ret != 0)
+    {
+      printf("pbkdf2_test: passwd_verify match failed: %d (expected 0)\n",
+             ret);
+      return 1;
+    }
+
+  ret = passwd_verify(TEST_USERNAME, WRONG_PASSWORD);
+  if (ret != -1)
+    {
+      printf("pbkdf2_test: passwd_verify mismatch failed: %d "
+             "(expected -1)\n", ret);
+      return 1;
+    }
+
+  printf("pbkdf2_test: passwd round-trip OK\n");
+  return 0;
+#endif
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  int failures = 0;
+
+  (void)argc;
+  (void)argv;
+
+  failures += test_pbkdf2_vectors();
+  failures += test_passwd_roundtrip();
+
+  if (failures != 0)
+    {
+      printf("pbkdf2_test: FAILED (%d)\n", failures);
+      return 1;
+    }
+
+  printf("pbkdf2_test: PASSED\n");
+  return 0;
+}

From c02683e2829644b1fc69d1335aee252e59f758fe Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Wed, 15 Jul 2026 15:40:21 +0000
Subject: [PATCH 523/568] !nshlib: Remove fixed login; require FSUTILS_PASSWD

Report password policy failures clearly from useradd and passwd when a
password does not meet complexity requirements.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 nshlib/Kconfig           | 30 +++++++++---------------------
 nshlib/nsh.h             |  2 --
 nshlib/nsh_identity.c    |  3 ---
 nshlib/nsh_login.c       |  3 ---
 nshlib/nsh_passwdcmds.c  | 30 ++++++++++++++++++++++++++----
 nshlib/nsh_telnetlogin.c |  3 ---
 6 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 7a39d96b4..165bcc8b3 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -1230,32 +1230,30 @@ config NSH_LOGIN
 config NSH_CONSOLE_LOGIN
 	bool "Console Login"
 	default n
+	depends on FSUTILS_PASSWD
 	select NSH_LOGIN
 	---help---
 		If defined, then the console user will be required to provide a
-		username and password to start the NSH shell.
+		username and password to start the NSH shell.  Requires
+		CONFIG_FSUTILS_PASSWD so credentials are verified against the
+		encrypted password file (for example ROMFS /etc/passwd).
 
 config NSH_TELNET_LOGIN
 	bool "Telnet Login"
 	default n
-	depends on NSH_TELNET
+	depends on NSH_TELNET && FSUTILS_PASSWD
 	select NSH_LOGIN
 	---help---
 		If defined, then the Telnet user will be required to provide a
-		username and password to start the NSH shell.
+		username and password to start the NSH shell.  Requires
+		CONFIG_FSUTILS_PASSWD so credentials are verified against the
+		encrypted password file (for example ROMFS /etc/passwd).
 
 if NSH_LOGIN
 
 choice
 	prompt "Verification method"
-	default NSH_LOGIN_PASSWD if FSUTILS_PASSWD
-	default NSH_LOGIN_FIXED if !FSUTILS_PASSWD
-
-config NSH_LOGIN_FIXED
-	bool "Fixed username/password"
-	---help---
-		Verify user credentials by matching to fixed username and password
-		strings
+	default NSH_LOGIN_PASSWD
 
 config NSH_LOGIN_PLATFORM
 	bool "Platform username/password"
@@ -1292,16 +1290,6 @@ config NSH_LOGIN_USERNAME
 	---help---
 		Login user name.  Default: "root"
 
-config NSH_LOGIN_PASSWORD
-	string "Login password"
-	depends on NSH_LOGIN_FIXED
-	---help---
-		The plaintext login password used when fixed username/password
-		verification is selected (CONFIG_NSH_LOGIN_FIXED).  There is no
-		default; set CONFIG_NSH_LOGIN_PASSWORD in the board defconfig,
-		via menuconfig, or enter it when prompted during an interactive
-		build.
-
 config NSH_LOGIN_FAILDELAY
 	int "Login failure delay"
 	default 0
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 5950c4fce..d2b7abc44 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -267,8 +267,6 @@
  * options may be specified:
  *
  * CONFIG_NSH_LOGIN_USERNAME - Login user name.  Default: "root"
- * CONFIG_NSH_LOGIN_PASSWORD - Login password (required when using fixed
- *   credentials; no default is provided).
  * CONFIG_NSH_LOGIN_FAILCOUNT - Number of login retry attempts.
  *   Default 3.
  */
diff --git a/nshlib/nsh_identity.c b/nshlib/nsh_identity.c
index e69fd92e2..7bcb9a4a0 100644
--- a/nshlib/nsh_identity.c
+++ b/nshlib/nsh_identity.c
@@ -165,9 +165,6 @@ static bool nsh_verify_credentials(FAR const char *username,
   return PASSWORD_VERIFY_MATCH(passwd_verify(username, password));
 #elif defined(CONFIG_NSH_LOGIN_PLATFORM)
   return PASSWORD_VERIFY_MATCH(platform_user_verify(username, password));
-#elif defined(CONFIG_NSH_LOGIN_FIXED)
-  return strcmp(password, CONFIG_NSH_LOGIN_PASSWORD) == 0 &&
-         strcmp(username, CONFIG_NSH_LOGIN_USERNAME) == 0;
 #else
   UNUSED(username);
   UNUSED(password);
diff --git a/nshlib/nsh_login.c b/nshlib/nsh_login.c
index 6630a1689..228a66397 100644
--- a/nshlib/nsh_login.c
+++ b/nshlib/nsh_login.c
@@ -243,9 +243,6 @@ int nsh_login(FAR struct console_stdio_s *pstate)
 #endif
           if (PASSWORD_VERIFY_MATCH(ret))
 
-#elif defined(CONFIG_NSH_LOGIN_FIXED)
-          if (strcmp(password, CONFIG_NSH_LOGIN_PASSWORD) == 0 &&
-              strcmp(username, CONFIG_NSH_LOGIN_USERNAME) == 0)
 #else
 #  error No user verification method selected
 #endif
diff --git a/nshlib/nsh_passwdcmds.c b/nshlib/nsh_passwdcmds.c
index 5c7f86ed2..f37cbaf2a 100644
--- a/nshlib/nsh_passwdcmds.c
+++ b/nshlib/nsh_passwdcmds.c
@@ -53,8 +53,19 @@ int cmd_useradd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   ret = passwd_adduser(argv[1], argv[2]);
   if (ret < 0)
     {
-      nsh_error(vtbl, g_fmtcmdfailed, argv[0], "passwd_adduser",
-                NSH_ERRNO_OF(-ret));
+      if (ret == -EINVAL)
+        {
+          nsh_error(vtbl,
+                    "%s: password does not meet security policy "
+                    "(min 8 chars, upper, lower, digit, special)\n",
+                    argv[0]);
+        }
+      else
+        {
+          nsh_error(vtbl, g_fmtcmdfailed, argv[0], "passwd_adduser",
+                    NSH_ERRNO_OF(-ret));
+        }
+
       return ERROR;
     }
 
@@ -99,8 +110,19 @@ int cmd_passwd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   ret = passwd_update(argv[1], argv[2]);
   if (ret < 0)
     {
-      nsh_error(vtbl, g_fmtcmdfailed, argv[0], "passwd_update",
-                 NSH_ERRNO_OF(-ret));
+      if (ret == -EINVAL)
+        {
+          nsh_error(vtbl,
+                    "%s: password does not meet security policy "
+                    "(min 8 chars, upper, lower, digit, special)\n",
+                    argv[0]);
+        }
+      else
+        {
+          nsh_error(vtbl, g_fmtcmdfailed, argv[0], "passwd_update",
+                    NSH_ERRNO_OF(-ret));
+        }
+
       return ERROR;
     }
 
diff --git a/nshlib/nsh_telnetlogin.c b/nshlib/nsh_telnetlogin.c
index c796b2a36..8007b2684 100644
--- a/nshlib/nsh_telnetlogin.c
+++ b/nshlib/nsh_telnetlogin.c
@@ -248,9 +248,6 @@ int nsh_telnetlogin(FAR struct console_stdio_s *pstate)
           if (PASSWORD_VERIFY_MATCH(platform_user_verify(username,
                                                          password)))
 #  endif
-#elif defined(CONFIG_NSH_LOGIN_FIXED)
-          if (strcmp(password, CONFIG_NSH_LOGIN_PASSWORD) == 0 &&
-              strcmp(username, CONFIG_NSH_LOGIN_USERNAME) == 0)
 #else
 #  error No user verification method selected
 #endif

From e751331ecb7ea28073bff41600d2e9c9ba90aa1a Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Wed, 22 Jul 2026 05:06:16 +0000
Subject: [PATCH 524/568] ci: fix sim/login ROMFS passwd credential for
 promptpasswd.sh

NUTTX_ROMFS_PASSWD_PASSWORD lacked a special character, so nuttx's
promptpasswd.sh rejects it and headless CI builds fail at etctmp.c when
sim/login is built.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a43138a6..4fa2107b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
       # Documented sim/login CI test credential (not a production secret).
       # Used when CONFIG_BOARD_ETC_ROMFS_PASSWD_ENABLE=y and defconfig omits
       # the password.  See nuttx tools/update_romfs_password.sh.
-      NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1
+      NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1!
 
     strategy:
       max-parallel: 12
@@ -183,10 +183,10 @@ jobs:
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
           BLOBDIR: /tools/blobs
-          NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1
+          NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1!
         with:
           run: |
-            export NUTTX_ROMFS_PASSWD_PASSWORD=NuttXSimLogin1
+            export NUTTX_ROMFS_PASSWD_PASSWORD=NuttXSimLogin1!
             export ARTIFACTDIR=`pwd`/buildartifacts
 
             for i in 1 2 3; do
@@ -302,7 +302,7 @@ jobs:
     needs: macOS-Arch
     if: ${{ needs.macOS-Arch.outputs.skip_all_builds != '1' }}
     env:
-      NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1
+      NUTTX_ROMFS_PASSWD_PASSWORD: NuttXSimLogin1!
     strategy:
       max-parallel: 2
       matrix:
@@ -337,7 +337,7 @@ jobs:
       - name: Run Builds
         run: |
           echo "::add-matcher::sources/nuttx/.github/gcc.json"
-          export NUTTX_ROMFS_PASSWD_PASSWORD=NuttXSimLogin1
+          export NUTTX_ROMFS_PASSWD_PASSWORD=NuttXSimLogin1!
           export ARTIFACTDIR=`pwd`/buildartifacts
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat

From d273af4834a5401b5f97e7fd5b72f4f3bc3ffb1c Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 21 Jul 2026 10:44:20 -0400
Subject: [PATCH 525/568] applications/audioutils/morsey: Update Morsey version

Use newer version without compile time warnings that prevent CI from
building.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 audioutils/morsey/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/audioutils/morsey/Makefile b/audioutils/morsey/Makefile
index 599ae5700..04f454e64 100644
--- a/audioutils/morsey/Makefile
+++ b/audioutils/morsey/Makefile
@@ -25,9 +25,9 @@ include $(APPDIR)/Make.defs
 CSRCS = $(MORSEY_DIR)/morsey.c
 
 MORSEY_DIR = morsey
-MORSEY_VERSION = v1.0.0
+MORSEY_VERSION = v1.0.1
 MORSEY_MORSEY_H_SHA256 = 55f45e7b9a4d810f928ffe3ee9bea4cc318e28b1f49abf9512aee2638bd1dbfa
-MORSEY_MORSEY_C_SHA256 = f946c9845a90a4c1a459490906ae071d0ac5b41326b7a5ce971efb97792ef56a
+MORSEY_MORSEY_C_SHA256 = 12babc90d3518e026c344c38dc3701287c41fd6b41a3ec96fb36c77907be78f8
 
 $(MORSEY_DIR):
 	$(Q) echo "Cloning Morsey repo..."

From 86afa6d1823def2783281fa88d2f278794f22c33 Mon Sep 17 00:00:00 2001
From: wangjianyu3 <wangjianyu3@xiaomi.com>
Date: Mon, 20 Jul 2026 18:43:12 +0800
Subject: [PATCH 526/568] netutils/rexecd: forward PRIORITY/STACKSIZE config in
 CMake build

The Makefile build already forwards both values via PRIORITY /
STACKSIZE.  Align the CMake build with the Makefile so that
CONFIG_NETUTILS_REXECD_PRIORITY and CONFIG_NETUTILS_REXECD_STACKSIZE
take effect under CMake as well.

Assisted-by: GitHubCopilot:claude-4.8-opus
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
---
 netutils/rexecd/CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/netutils/rexecd/CMakeLists.txt b/netutils/rexecd/CMakeLists.txt
index 0da40f5bd..4cde43028 100644
--- a/netutils/rexecd/CMakeLists.txt
+++ b/netutils/rexecd/CMakeLists.txt
@@ -21,5 +21,13 @@
 # ##############################################################################
 
 if(CONFIG_NETUTILS_REXECD)
-  nuttx_add_application(NAME rexecd SRCS rexecd.c)
+  nuttx_add_application(
+    NAME
+    rexecd
+    SRCS
+    rexecd.c
+    STACKSIZE
+    ${CONFIG_NETUTILS_REXECD_STACKSIZE}
+    PRIORITY
+    ${CONFIG_NETUTILS_REXECD_PRIORITY})
 endif()

From 094b988be3a39440a191464fca32b4972a9d5f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20de=20La=20Lama?=
 <csanchezdll@gmail.com>
Date: Thu, 16 Jul 2026 13:55:09 +0200
Subject: [PATCH 527/568] interpreters: add Tcl support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tcl is added using The Jim Interpreter. Jim is an opensource small-footprint
implementation of the Tcl programming language. It implements a large subset
of Tcl and adds new features like references with garbage collection,
closures, built-in Object Oriented Programming system, Functional Programming
commands, first-class arrays and UTF-8 support.

Signed-off-by: Carlos Sánchez de La Lama <csanchezdll@gmail.com>
---
 interpreters/jimtcl/CMakeLists.txt | 48 ++++++++++++++++++++++
 interpreters/jimtcl/Kconfig        | 12 ++++++
 interpreters/jimtcl/Make.defs      |  3 ++
 interpreters/jimtcl/Makefile       | 64 ++++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 interpreters/jimtcl/CMakeLists.txt
 create mode 100644 interpreters/jimtcl/Kconfig
 create mode 100644 interpreters/jimtcl/Make.defs
 create mode 100644 interpreters/jimtcl/Makefile

diff --git a/interpreters/jimtcl/CMakeLists.txt b/interpreters/jimtcl/CMakeLists.txt
new file mode 100644
index 000000000..ba3b64697
--- /dev/null
+++ b/interpreters/jimtcl/CMakeLists.txt
@@ -0,0 +1,48 @@
+if(CONFIG_INTERPRETERS_JIMTCL)
+  set(JIMTCL_VERSION 0.83)
+  set(JIMTCL_TARBALL ${JIMTCL_VERSION}.tar.gz)
+  set(JIMTCL_UNPACK jimtcl)
+  set(JIMTCL_URL_BASE https://github.com/msteveb/jimtcl/archive/refs/tags)
+  set(JIMTCL_URL ${JIMTCL_URL_BASE}/${JIMTCL_TARBALL})
+  set(JIMTCL_SRC ${CMAKE_CURRENT_BINARY_DIR}/${JIMTCL_UNPACK})
+
+  # We need the source available before declaring the application, because
+  # jimsh.c is added as an application source, so we can not integrate download
+  # into the external project.
+  FetchContent_Declare(jimtcl_fetch URL ${JIMTCL_URL} SOURCE_DIR
+                                        ${JIMTCL_UNPACK})
+
+  FetchContent_MakeAvailable(jimtcl_fetch)
+
+  ExternalProject_Add(
+    jimtcl_build
+    SOURCE_DIR ${JIMTCL_SRC}
+    PATCH_COMMAND sed -i -e "/^void Jim_SetEnviron/,/^/{s/^/\\/* /}" -e
+                  "/^void Jim_SetEnviron/,/^/{s/\$/ *\\//}" jim.c
+    CONFIGURE_COMMAND
+      ./configure --host=${CMAKE_C_COMPILER_TARGET}
+      "CFLAGS=$<JOIN:$<TARGET_PROPERTY:apps_jimsh,COMPILE_OPTIONS>, > -D$<JOIN:$<TARGET_PROPERTY:apps_jimsh,COMPILE_DEFINITIONS>, -D> -I$<JOIN:$<TARGET_PROPERTY:apps_jimsh,INCLUDE_DIRECTORIES>, -I> -isystem ${CMAKE_SOURCE_DIR}/include -isystem ${CMAKE_BINARY_DIR}/include"
+    BUILD_COMMAND make libjim.a initjimsh.o
+    INSTALL_COMMAND ""
+    BUILD_IN_SOURCE TRUE
+    BUILD_BYPRODUCTS ${JIMTCL_SRC}/libjim.a ${JIMTCL_SRC}/_initjimsh.c)
+
+  nuttx_add_application(
+    NAME
+    jimsh
+    PRIORITY
+    100
+    STACKSIZE
+    8192
+    INCLUDE_DIRECTORIES
+    ${JIMTCL_SRC}
+    DEPENDS
+    jimtcl_build
+    SRCS
+    ${JIMTCL_SRC}/jimsh.c
+    ${JIMTCL_SRC}/_initjimsh.c)
+
+  set_property(GLOBAL APPEND PROPERTY NUTTX_EXTRA_LIBRARIES
+                                      ${JIMTCL_SRC}/libjim.a)
+
+endif()
diff --git a/interpreters/jimtcl/Kconfig b/interpreters/jimtcl/Kconfig
new file mode 100644
index 000000000..16a70db70
--- /dev/null
+++ b/interpreters/jimtcl/Kconfig
@@ -0,0 +1,12 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config INTERPRETERS_JIMTCL
+	bool "The Jim (TCL) Interpreter"
+	default n
+	---help---
+		Enable support for The Jim interpreter.
+		Jim is an opensource small-footprint implementation of the
+		Tcl programming language.
\ No newline at end of file
diff --git a/interpreters/jimtcl/Make.defs b/interpreters/jimtcl/Make.defs
new file mode 100644
index 000000000..eb5a44b0c
--- /dev/null
+++ b/interpreters/jimtcl/Make.defs
@@ -0,0 +1,3 @@
+ifneq ($(CONFIG_INTERPRETERS_JIMTCL),)
+CONFIGURED_APPS += $(APPDIR)/interpreters/jimtcl
+endif
\ No newline at end of file
diff --git a/interpreters/jimtcl/Makefile b/interpreters/jimtcl/Makefile
new file mode 100644
index 000000000..f470167f2
--- /dev/null
+++ b/interpreters/jimtcl/Makefile
@@ -0,0 +1,64 @@
+include $(APPDIR)/Make.defs
+
+PROGNAME  = jimsh
+PRIORITY  = 100
+STACKSIZE = 8192
+
+JIMTCL_VERSION  = 0.83
+JIMTCL_TARBALL  = $(JIMTCL_VERSION).tar.gz
+JIMTCL_UNPACK   = jimtcl
+JIMTCL_URL_BASE = https://github.com/msteveb/jimtcl/archive/refs/tags
+JIMTCL_URL      = $(JIMTCL_URL_BASE)/$(JIMTCL_TARBALL)
+JIMTCL_SRC      = $(JIMTCL_UNPACK)
+
+MAINSRC = $(JIMTCL_SRC)$(DELIM)jimsh.c
+
+# Obtain object list from jimtcl Makefile
+JIMTCL_OBJS := $(shell test -f $(JIMTCL_SRC)$(DELIM)Makefile		\
+                       && ( cat $(JIMTCL_SRC)$(DELIM)Makefile;		\
+                            printf 'print-%%:\n\techo $$($$*)' )	\
+                       | $(MAKE) -f - -s print-OBJS) initjimsh.o
+
+EXTOBJS = $(addprefix $(JIMTCL_SRC)$(DELIM), $(JIMTCL_OBJS))
+
+CFLAGS += -I$(JIMTCL_SRC)
+
+$(JIMTCL_SRC)$(DELIM)%.o: $(JIMTCL_SRC)$(DELIM)Makefile
+	$(Q) $(MAKE) -C $(JIMTCL_SRC) $*.o
+
+$(JIMTCL_SRC)$(DELIM)jimsh.c: $(JIMTCL_SRC)$(DELIM)Makefile
+
+$(JIMTCL_SRC)$(DELIM)_initjimsh.c: $(JIMTCL_SRC)$(DELIM)Makefile
+	$(Q) $(MAKE) -C $(JIMTCL_SRC) $(notdir $@)
+
+$(JIMTCL_SRC)$(DELIM)Makefile:
+	$(Q) cd $(dir $@)					\
+	  && ./configure --host=$(patsubst %-,%,$(CROSSDEV))	\
+	                 CFLAGS="$(CFLAGS)"
+
+# Get the source code and apply a small patch because environ is
+# not settable in Nuttx. This is not required for basic jimtcl
+# but build would fail without commenting it out.
+$(JIMTCL_TARBALL):
+	$(Q) echo "Downloading $(JIMTCL_TARBALL)"
+	$(Q) curl -O -L $(JIMTCL_URL)
+	$(Q) echo "Unpacking $(JIMTCL_TARBALL) to $(JIMTCL_UNPACK)"
+	$(Q) tar -xvzf $(JIMTCL_TARBALL)
+	$(Q) mv jimtcl-$(JIMTCL_VERSION) $(JIMTCL_UNPACK)
+	$(Q) sed -i '/^void Jim_SetEnviron/,/^}/{s/^/\/* /;s/$$/ *\//}'	\
+	  $(JIMTCL_SRC)$(DELIM)jim.c
+
+# Download and unpack tarball if no git repo found
+ifeq ($(wildcard $(JIMTCL_UNPACK)/.git),)
+context:: $(JIMTCL_TARBALL)
+endif
+
+clean::
+	$(Q) test -f $(JIMTCL_SRC)$(DELIM)Makefile	\
+	  && $(MAKE) -C $(JIMTCL_SRC) clean
+
+distclean:: clean
+	$(call DELDIR, $(JIMTCL_UNPACK))
+	$(call DELFILE, $(JIMTCL_TARBALL))
+
+include $(APPDIR)/Application.mk

From 0304721c85146b611c8a3d068de85f147e4e5410 Mon Sep 17 00:00:00 2001
From: "Alan C. Assis" <acassis@gmail.com>
Date: Sun, 19 Jul 2026 20:06:51 +0000
Subject: [PATCH 528/568] readline: Don't assert on a zero-length RL_WRITE

Then readline_write() was called with buflen == 0 it was causing a
debug assertion. Now it returns early for instead of asserting.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/readline/readline_fd.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/readline/readline_fd.c b/system/readline/readline_fd.c
index 2a37d2335..39b7c7898 100644
--- a/system/readline/readline_fd.c
+++ b/system/readline/readline_fd.c
@@ -157,7 +157,21 @@ static void readline_write(FAR struct rl_common_s *vtbl,
                            FAR const char *buffer, size_t buflen)
 {
   FAR struct readline_s *priv = (FAR struct readline_s *)vtbl;
-  DEBUGASSERT(priv && buffer && buflen > 0);
+  DEBUGASSERT(priv && buffer);
+
+  /* Several full-line-redraw paths in readline_common.c (Home, End,
+   * Ctrl+A, Ctrl+U, Ctrl+Left/Right, ...) call RL_WRITE(vtbl, buf, nch)
+   * unconditionally after repositioning the cursor, and 'nch' -- the
+   * number of characters currently in the line -- can legitimately be
+   * 0 (e.g. pressing Home on an empty prompt, or Ctrl+U clearing the
+   * line back to empty).  Writing zero bytes is a valid no-op; it must
+   * not be treated as a caller error.
+   */
+
+  if (buflen == 0)
+    {
+      return;
+    }
 
   /* If outfd is a invalid fd, return directly. */
 

From 51bfd48e78a55b8b6eab53c5743bbadfe5de2a2a Mon Sep 17 00:00:00 2001
From: "Alan C. Assis" <acassis@gmail.com>
Date: Tue, 14 Jul 2026 21:39:39 -0300
Subject: [PATCH 529/568] system/readline: Add support for line movements and
 editing

This commit adds support to nsh> command line editing. This is one
of the most missing feature of the NuttShell. If you typed a long
command line and make a mistake you need to press Backspace and
remove everything until reach that typo. Only the basic editing
feature is enabled by default (left/right keys movement, Home/End
to move to the beginning or ending of the command line).

More advanced features are available when CONFIG_READLINE_EDIT_EMACS
is selected. It enables the Emacs-style control keys (Ctrl+A/B/D/E/F/K/U/W)
that allow more flexible line editing.

Other more advanced feature is enabled when CONFIG_READLINE_CMD_HISTORY
and CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH are enabled. It allows the
user to press Ctrl+R to do reverse search in the command line history.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
Assisted-by: Claude Code
---
 nshlib/nsh_session.c              |   6 +
 system/readline/Kconfig           |  30 +
 system/readline/readline_common.c | 951 ++++++++++++++++++++++++++++--
 3 files changed, 925 insertions(+), 62 deletions(-)

diff --git a/nshlib/nsh_session.c b/nshlib/nsh_session.c
index bb83b98fb..4dd316a9d 100644
--- a/nshlib/nsh_session.c
+++ b/nshlib/nsh_session.c
@@ -223,6 +223,12 @@ int nsh_session(FAR struct console_stdio_s *pstate,
 
       write(OUTFD(pstate), nsh_prompt(), strlen(nsh_prompt()));
 
+#ifdef CONFIG_READLINE_TABCOMPLETION
+      /* Set the prompt so readline can redraw it for editing features */
+
+      readline_prompt(nsh_prompt());
+#endif
+
       /* readline() normally returns the number of characters read, but
        * will return EOF on end of file or if an error occurs.  EOF
        * will cause the session to terminate.
diff --git a/system/readline/Kconfig b/system/readline/Kconfig
index f088fddee..1914fedaa 100644
--- a/system/readline/Kconfig
+++ b/system/readline/Kconfig
@@ -54,6 +54,25 @@ config READLINE_MAX_EXTCMDS
 
 endif # READLINE_TABCOMPLETION
 
+config READLINE_EDIT
+	bool "Command line editing"
+	default y if !DEFAULT_SMALL
+	---help---
+		Build in support for full command-line editing using cursor keys,
+		Home/End, Delete. Requires a VT100/ANSI-compatible terminal.
+
+if READLINE_EDIT
+
+config READLINE_EDIT_EMACS
+	bool "Emacs-style control keys"
+	default n
+	---help---
+		Enable emacs-style control key bindings:
+		Ctrl+A Home, Ctrl+E End, Ctrl+K kill-to-end,
+		Ctrl+U kill-to-start, Ctrl+Left/Right word movement.
+
+endif # READLINE_EDIT
+
 config READLINE_CMD_HISTORY
 	bool "Command line history"
 	default n
@@ -96,6 +115,17 @@ config READLINE_CMD_HISTORY_LEN
 		will be READLINE_CMD_HISTORY_LINELEN x READLINE_CMD_HISTORY_LEN.
 		Default: 16
 
+config READLINE_EDIT_EMACS_REVERSE_SEARCH
+	bool "Reverse incremental search (Ctrl+R)"
+	default y
+	depends on READLINE_EDIT_EMACS
+	---help---
+		Enable bash-style Ctrl+R reverse incremental search through the
+		command history.  Typing narrows the search to the most recent
+		matching command; Ctrl+R again searches further back; Enter
+		submits the match; Ctrl+G/Ctrl+C cancels back to the line being
+		edited before Ctrl+R was pressed.
+
 endif # READLINE_CMD_HISTORY
 endif # READLINE_ECHO
 endif # SYSTEM_READLINE
diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index 0fd3b9396..a5bd7b301 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -72,6 +72,27 @@ struct cmdhist_s
 #ifdef CONFIG_READLINE_ECHO
 static const char g_erasetoeol[] = VT100_CLEAREOL;
 #endif
+#ifdef CONFIG_READLINE_EDIT
+static const char g_curleft[]  = {ASCII_ESC, '[', 'D'};
+static const char g_curright[] = {ASCII_ESC, '[', 'C'};
+#endif
+
+#ifdef CONFIG_READLINE_EDIT_EMACS
+/* Emacs-style control key codes */
+
+#  define CTRL_A  1   /* ^A - Home */
+#  define CTRL_B  2   /* ^B - Left */
+#  define CTRL_D  4   /* ^D - Delete at cursor */
+#  define CTRL_E  5   /* ^E - End */
+#  define CTRL_F  6   /* ^F - Right */
+#  define CTRL_K  11  /* ^K - Kill to end of line */
+#  define CTRL_U  21  /* ^U - Kill to beginning of line */
+#  define CTRL_W  23  /* ^W - Kill word backward */
+#  ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+#    define CTRL_G  7   /* ^G - Cancel incremental search */
+#    define CTRL_R  18  /* ^R - Reverse incremental search */
+#  endif
+#endif
 
 #ifdef CONFIG_READLINE_TABCOMPLETION
 /* Prompt string to present at the beginning of the line */
@@ -150,12 +171,18 @@ static int count_builtin_matches(FAR char *buf, FAR int *matches,
  *   nch     - the number of characters.
  *
  * Returned Value:
- *   None.
+ *   True if the completion changed 'buf'/'*nch' and/or echoed anything
+ *   to the terminal (a single unambiguous match was appended, or the
+ *   multiple-match list was printed -- which always ends with a full
+ *   reprint of the prompt and buffer, even if the common prefix did
+ *   not grow).  False if nothing happened at all (no match, or an
+ *   exact single match with nothing left to add), in which case the
+ *   terminal's cursor never moved.
  *
  ****************************************************************************/
 
 #ifdef CONFIG_READLINE_TABCOMPLETION
-static void tab_completion(FAR struct rl_common_s *vtbl, char *buf,
+static bool tab_completion(FAR struct rl_common_s *vtbl, char *buf,
                            int buflen, int *nch)
 {
   FAR const char *name = NULL;
@@ -247,7 +274,10 @@ static void tab_completion(FAR struct rl_common_s *vtbl, char *buf,
           if (len < name_len)
             {
               *nch = name_len;
+              return true;
             }
+
+          return false;
         }
 
       /* Are there multiple matching names? */
@@ -359,15 +389,292 @@ static void tab_completion(FAR struct rl_common_s *vtbl, char *buf,
            * if any
            */
 
+          /* Don't remove extra characters after the completed word,
+           * if any
+           */
+
           if (len < name_len)
             {
               *nch = name_len;
             }
+
+          /* Whether or not the common prefix grew, the prompt and
+           * buffer were just reprinted from scratch above, so the
+           * terminal's cursor is now at the end of the line either
+           * way.
+           */
+
+          return true;
         }
     }
+
+  return false;
 }
 #endif
 
+#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+/****************************************************************************
+ * Name: isearch_find
+ *
+ * Description:
+ *   Used by Ctrl+R (reverse incremental search).  Search backward
+ *   through the command history, starting just before 'startoffset',
+ *   for the most recent entry containing 'search' as a substring (using
+ *   the same head/offset addressing as the up/down arrow history
+ *   recall code above).  If a match is found, it is copied into 'buf'
+ *   (updating '*nch'), and its offset is returned via '*foundoffset' so
+ *   that a subsequent call can continue the search further back in
+ *   history.  If no match is found, 'buf'/'*nch' are left unmodified.
+ *
+ * Returned Value:
+ *   True if a match was found, false otherwise.
+ *
+ ****************************************************************************/
+
+static bool isearch_find(FAR const char *search, int searchlen,
+                          int startoffset, FAR int *foundoffset,
+                          FAR char *buf, int buflen, FAR int *nch)
+{
+  int minoffset;
+  int offset;
+  int idx;
+  int len;
+  int i;
+  int j;
+  bool matched;
+
+  if (searchlen == 0 || g_cmdhist.len == 0)
+    {
+      return false;
+    }
+
+  minoffset = -(g_cmdhist.len - 1);
+
+  for (offset = startoffset - 1; offset >= minoffset; offset--)
+    {
+      idx = g_cmdhist.head + offset;
+
+      if (idx < 0)
+        {
+          idx += RL_CMDHIST_LEN;
+        }
+      else if (idx >= RL_CMDHIST_LEN)
+        {
+          idx -= RL_CMDHIST_LEN;
+        }
+
+      len = strlen(g_cmdhist.buf[idx]);
+
+      /* Does this history entry contain 'search' anywhere?  'search'
+       * is a raw character buffer that is never null-terminated (the
+       * caller only tracks its length in 'searchlen'), so this cannot
+       * use strstr() -- do a plain bounded substring search instead.
+       */
+
+      matched = false;
+
+      for (i = 0; i + searchlen <= len; i++)
+        {
+          for (j = 0; j < searchlen; j++)
+            {
+              if (g_cmdhist.buf[idx][i + j] != search[j])
+                {
+                  break;
+                }
+            }
+
+          if (j == searchlen)
+            {
+              matched = true;
+              break;
+            }
+        }
+
+      if (!matched)
+        {
+          continue;
+        }
+
+      if (len > buflen - 1)
+        {
+          len = buflen - 1;
+        }
+
+      for (i = 0; i < len; i++)
+        {
+          buf[i] = g_cmdhist.buf[idx][i];
+        }
+
+      buf[len]     = '\0';
+      *nch         = len;
+      *foundoffset = offset;
+      return true;
+    }
+
+  return false;
+}
+#endif
+
+#ifdef CONFIG_READLINE_ECHO
+#ifdef CONFIG_READLINE_EDIT
+/****************************************************************************
+ * Name: redraw_line
+ *
+ * Description:
+ *   Redraw the prompt and the line buffer from scratch: return to the
+ *   true start of the terminal line, erase to the end of line, reprint
+ *   the prompt (if any), reprint the buffer, then move the cursor left
+ *   as many times as needed to visually land on 'cursor'.  This does
+ *   not depend on where the terminal's cursor happened to be beforehand
+ *   -- unlike a backspace-based erase, it is correct no matter where
+ *   the cursor was left by whatever came before it.
+ *
+ *   This is the common tail end of every full-line redraw in this file
+ *   (Home, End, Ctrl+Left/Right, history recall, ...); consolidating it
+ *   here instead of repeating the same half-dozen lines at each call
+ *   site saves a fair amount of code space.
+ *
+ ****************************************************************************/
+
+static void redraw_line(FAR struct rl_common_s *vtbl, FAR const char *buf,
+                         int nch, int cursor)
+{
+  int i;
+
+  RL_PUTC(vtbl, '\r');
+  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+
+#ifdef CONFIG_READLINE_TABCOMPLETION
+  if (g_readline_prompt != NULL)
+    {
+      for (i = 0; g_readline_prompt[i] != '\0'; i++)
+        {
+          RL_PUTC(vtbl, g_readline_prompt[i]);
+        }
+    }
+#endif
+
+  if (nch > 0)
+    {
+      RL_WRITE(vtbl, buf, nch);
+    }
+
+  for (i = nch; i > cursor; i--)
+    {
+      RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+    }
+}
+#endif /* CONFIG_READLINE_EDIT */
+
+#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+/****************************************************************************
+ * Name: isearch_redraw
+ *
+ * Description:
+ *   Redraw the reverse-incremental-search prompt line:
+ *   "(reverse-i-search)`<search>': <match>", or
+ *   "(failed reverse-i-search)`<search>': <match>" if the current
+ *   search string has no match (in which case 'buf'/'nch' still hold
+ *   whatever the last successful match was, exactly as bash does).
+ *
+ ****************************************************************************/
+
+static void isearch_redraw(FAR struct rl_common_s *vtbl,
+                            FAR const char *search, int searchlen,
+                            FAR const char *buf, int nch, bool failed)
+{
+  static const char matchlabel[] = "(reverse-i-search)`";
+  static const char faillabel[]  = "(failed reverse-i-search)`";
+
+  RL_PUTC(vtbl, '\r');
+  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+
+  if (failed)
+    {
+      RL_WRITE(vtbl, faillabel, sizeof(faillabel) - 1);
+    }
+  else
+    {
+      RL_WRITE(vtbl, matchlabel, sizeof(matchlabel) - 1);
+    }
+
+  if (searchlen > 0)
+    {
+      RL_WRITE(vtbl, search, searchlen);
+    }
+
+  RL_PUTC(vtbl, '\'');
+  RL_PUTC(vtbl, ':');
+  RL_PUTC(vtbl, ' ');
+
+  if (nch > 0)
+    {
+      RL_WRITE(vtbl, buf, nch);
+    }
+}
+#endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
+#endif /* CONFIG_READLINE_ECHO */
+
+/****************************************************************************
+ * Name: submit_line
+ *
+ * Description:
+ *   Finish a line of input: record it in the command history (if
+ *   enabled and it isn't a duplicate of the most recent entry),
+ *   terminate 'buf' with '\n' and a null terminator, and return the
+ *   number of characters in 'buf' (including the trailing '\n').  This
+ *   is shared by the normal Enter key handling and by Ctrl+R
+ *   (reverse-i-search), which also submits the matched line directly
+ *   on Enter.
+ *
+ ****************************************************************************/
+
+static ssize_t submit_line(FAR char *buf, int nch)
+{
+#ifdef CONFIG_READLINE_CMD_HISTORY
+  int i;
+
+  /* Save history of command, only if there was something typed besides
+   * the return character.
+   */
+
+  if (nch >= 1)
+    {
+      /* If this command is the one at the top of the circular buffer,
+       * don't save it again.
+       */
+
+      if (strncmp(buf, g_cmdhist.buf[g_cmdhist.head], nch + 1) != 0)
+        {
+          g_cmdhist.head = (g_cmdhist.head + 1) % RL_CMDHIST_LEN;
+
+          for (i = 0; (i < nch) && i < (RL_CMDHIST_LINELEN - 1); i++)
+            {
+              g_cmdhist.buf[g_cmdhist.head][i] = buf[i];
+            }
+
+          g_cmdhist.buf[g_cmdhist.head][i] = '\0';
+
+          if (g_cmdhist.len < RL_CMDHIST_LEN)
+            {
+              g_cmdhist.len++;
+            }
+        }
+
+      g_cmdhist.offset = 1;
+    }
+#endif /* CONFIG_READLINE_CMD_HISTORY */
+
+  /* The newline is stored in the buffer along with the null
+   * terminator.
+   */
+
+  buf[nch++] = '\n';
+  buf[nch]   = '\0';
+
+  return nch;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -481,6 +788,18 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 #ifdef CONFIG_READLINE_CMD_HISTORY
   int i;
 #endif
+#ifdef CONFIG_READLINE_EDIT
+  volatile int cursor;
+#endif
+#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+  bool insearch;
+  char search[RL_CMDHIST_LINELEN];
+  int  searchlen;
+  int  searchoffset;
+  char savedbuf[RL_CMDHIST_LINELEN];
+  int  savednch;
+  int  savedcursor;
+#endif
 
   /* Sanity checks */
 
@@ -505,6 +824,13 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
   escape = 0;
   nch    = 0;
+#ifdef CONFIG_READLINE_EDIT
+  cursor  = 0;
+#endif
+#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+  insearch  = false;
+  searchlen = 0;
+#endif
 
   for (; ; )
     {
@@ -534,20 +860,255 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
           return EOF;
         }
 
+#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+      /* Are we in reverse incremental search mode (Ctrl+R)?  If so,
+       * every subsequent keystroke is interpreted as part of the
+       * search until it is accepted, submitted, or cancelled.
+       */
+
+      else if (insearch)
+        {
+          if (ch == CTRL_R)
+            {
+              /* Repeat: search further back for another match of the
+               * same search string.
+               */
+
+              bool found = isearch_find(search, searchlen, searchoffset,
+                                         &searchoffset, buf, buflen, &nch);
+#ifdef CONFIG_READLINE_ECHO
+              isearch_redraw(vtbl, search, searchlen, buf, nch, !found);
+#endif
+            }
+          else if (ch == ASCII_BS || ch == ASCII_DEL)
+            {
+              if (searchlen > 0)
+                {
+                  searchlen--;
+                  searchoffset = 1;
+
+                  if (searchlen > 0)
+                    {
+                      isearch_find(search, searchlen, searchoffset,
+                                    &searchoffset, buf, buflen, &nch);
+                    }
+                  else
+                    {
+                      nch = 0;
+                    }
+                }
+
+#ifdef CONFIG_READLINE_ECHO
+              isearch_redraw(vtbl, search, searchlen, buf, nch,
+                              searchlen > 0 && nch == 0);
+#endif
+            }
+          else if (ch == CTRL_G || ch == ASCII_ETX)  /* ^G or ^C: cancel */
+            {
+              /* Cancel: restore the line exactly as it was before
+               * Ctrl+R was pressed.
+               */
+
+              insearch = false;
+              nch      = savednch;
+              cursor   = savedcursor;
+
+              for (i = 0; i < nch; i++)
+                {
+                  buf[i] = savedbuf[i];
+                }
+
+              buf[nch] = '\0';
+
+#ifdef CONFIG_READLINE_ECHO
+              redraw_line(vtbl, buf, nch, cursor);
+#endif
+            }
+          else if (ch == '\n')
+            {
+              /* Accept the current match and submit it immediately,
+               * exactly as bash does.
+               */
+
+              insearch = false;
+              return submit_line(buf, nch);
+            }
+          else if (ch == ASCII_ESC)
+            {
+              /* Accept the current match into the line, then let the
+               * escape sequence that follows (if any) be processed
+               * normally against it on the next iteration(s).
+               */
+
+              insearch = false;
+              cursor   = nch;
+              escape   = 1;
+            }
+          else if (!iscntrl(ch & 0xff) && searchlen < RL_CMDHIST_LINELEN - 1)
+            {
+              search[searchlen++] = (char)ch;
+              searchoffset = 1;
+
+              bool found = isearch_find(search, searchlen, searchoffset,
+                                         &searchoffset, buf, buflen, &nch);
+#ifdef CONFIG_READLINE_ECHO
+              isearch_redraw(vtbl, search, searchlen, buf, nch, !found);
+#endif
+            }
+          else
+            {
+              /* Anything else (an unhandled control character) just
+               * accepts the current match and returns to normal
+               * editing.
+               */
+
+              insearch = false;
+              cursor   = nch;
+
+#ifdef CONFIG_READLINE_ECHO
+              redraw_line(vtbl, buf, nch, cursor);
+#endif
+            }
+
+          continue;
+        }
+#endif
+
       /* Are we processing a VT100 escape sequence */
 
       else if (escape)
         {
+#ifdef CONFIG_READLINE_EDIT
+          /* Delete key: ESC [ 3 ~ — waiting for '~' */
+
+          if (escape == 3)
+            {
+              escape = 0;
+              if (ch == '~' && cursor < nch)
+                {
+                  int k;
+                  for (k = cursor + 1; k < nch; k++)
+                    buf[k - 1] = buf[k];
+                  nch--;
+#  ifdef CONFIG_READLINE_ECHO
+                  /* Back up 1 — terminal echo of '~' advanced cursor */
+
+                  RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+                  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+                  if (cursor < nch)
+                    {
+                      RL_WRITE(vtbl, buf + cursor, nch - cursor);
+                      for (k = nch; k > cursor; k--)
+                        RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+                    }
+#  endif
+                }
+              continue;
+            }
+
+          if (escape == 4 || escape == 5)
+            {
+              if (ch == '~')
+                {
+                  /* Home (1~) or End (4~) */
+
+                  cursor = (escape == 4) ? 0 : nch;
+                  redraw_line(vtbl, buf, nch, cursor);
+                }
+
+              if (ch == ';')
+                {
+                  escape = 8;
+                  continue;
+                }
+
+              escape = 0;
+              continue;
+            }
+#endif
+
+#ifdef CONFIG_READLINE_EDIT
+          if (escape == 8)          /* CSI ; — waiting for modifier digit */
+            {
+              if (ch == '5')
+                {
+                  escape = 9;       /* Ready for final char */
+                  continue;
+                }
+
+              if (ch == ';')
+                {
+                  escape = 8;
+                  continue;
+                }
+
+              escape = 0;
+              continue;
+            }
+
+          if (escape == 9)          /* CSI ;5 — waiting for D or C */
+            {
+              escape = 0;
+
+              if (ch == 'D')        /* Ctrl+Left */
+                {
+                  while (cursor > 0 && buf[cursor - 1] == ' ')
+                    cursor--;
+                  while (cursor > 0 && buf[cursor - 1] != ' ')
+                    cursor--;
+
+                  redraw_line(vtbl, buf, nch, cursor);
+                }
+              else if (ch == 'C')   /* Ctrl+Right */
+                {
+                  while (cursor < nch && buf[cursor] != ' ')
+                    cursor++;
+                  while (cursor < nch && buf[cursor] == ' ')
+                    cursor++;
+
+                  redraw_line(vtbl, buf, nch, cursor);
+                }
+
+              continue;
+            }
+#endif /* CONFIG_READLINE_EDIT */
+
+          /* Some terminals (e.g. xterm) use the SS3 introducer "ESC O"
+           * rather than CSI "ESC [" for Home/End (and, in application
+           * cursor key mode, for the arrow keys too).  Recognize the
+           * "ESC O" prefix here and fall into exactly the same
+           * "terminator character" handling used for "ESC [ <x>" below,
+           * by advancing to a dedicated state (6) that is treated the
+           * same way state 2 (saw "ESC [") is treated once the final
+           * byte arrives.  Without this, the 'O' is silently dropped
+           * (falling through the unrecognized-sequence path below) and
+           * the *next* byte (e.g. 'F' for End, 'H' for Home) is left to
+           * be reprocessed as an ordinary printable character, which is
+           * what produced the stray inserted "OF"/"OH" text.
+           */
+
+          if (escape == 1 && ch == ASCII_O)
+            {
+              escape = 6;
+              continue;
+            }
+
           /* Yes, is it an <esc>[, 3 byte sequence */
 
-          if (ch != ASCII_LBRACKET || escape == 2)
+          if (ch != ASCII_LBRACKET || escape == 2 || escape == 6)
             {
               /* We are finished with the escape sequence */
 
 #ifdef CONFIG_READLINE_CMD_HISTORY
-              /* Intercept up and down arrow keys */
+              /* Intercept up and down arrow keys.  This must only run
+               * for the up/down arrow keys themselves -- previously the
+               * clear-and-reload logic below ran for *any* completed
+               * escape sequence (Left, Right, Home, End, Delete, ...)
+               * as long as some history existed, silently wiping
+               * whatever the user was currently typing.
+               */
 
-              if (g_cmdhist.len > 0)
+              if (g_cmdhist.len > 0 && (ch == 'A' || ch == 'B'))
                 {
                   if (ch == 'A') /* up arrow */
                     {
@@ -560,7 +1121,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                           g_cmdhist.offset = -(g_cmdhist.len - 1);
                         }
                     }
-                  else if (ch == 'B') /* down arrow */
+                  else /* down arrow */
                     {
                       /* Go to the recent command in history */
 
@@ -572,17 +1133,39 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                         }
                     }
 
-                  /* Clear out current command from the prompt */
+                  /* Clear out current command from the prompt.
+                   *
+                   * This cannot assume the terminal's cursor is
+                   * sitting at the end of the currently displayed
+                   * text (i.e. at column 'nch') and simply backspace
+                   * 'nch' times -- the cursor can be anywhere in the
+                   * line (e.g. the user pressed Left one or more
+                   * times before pressing Up/Down again), and
+                   * backspacing more times than the cursor's actual
+                   * distance from the end of the prompt walks back
+                   * into and erases part of the prompt itself.
+                   * Instead, return to the true start of the
+                   * terminal line and erase to the end of line, then
+                   * reprint the prompt -- this does not depend on
+                   * where the cursor happened to be.
+                   */
 
-                  while (nch > 0)
-                    {
-                      nch--;
+                  nch = 0;
 
 #ifdef CONFIG_READLINE_ECHO
-                      RL_PUTC(vtbl, ASCII_BS);
-                      RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-#endif
+                  RL_PUTC(vtbl, '\r');
+                  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+#ifdef CONFIG_READLINE_TABCOMPLETION
+                  if (g_readline_prompt != NULL)
+                    {
+                      int k;
+                      for (k = 0; g_readline_prompt[k] != '\0'; k++)
+                        {
+                          RL_PUTC(vtbl, g_readline_prompt[k]);
+                        }
                     }
+#endif
+#endif
 
                   if (g_cmdhist.offset != 1)
                     {
@@ -599,7 +1182,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                           idx = idx - RL_CMDHIST_LEN;
                         }
 
-                      for (i = 0; g_cmdhist.buf[idx][i] != '\0'; i++)
+                      for (i = 0;
+                           g_cmdhist.buf[idx][i] != '\0' &&
+                           nch + 1 < buflen;
+                           i++)
                         {
                           buf[nch++] = g_cmdhist.buf[idx][i];
                           RL_PUTC(vtbl, g_cmdhist.buf[idx][i]);
@@ -607,9 +1193,84 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
                       buf[nch] = '\0';
                     }
+
+                  /* The line was just wholesale replaced -- the cursor
+                   * must always end up in sync with the new length, or
+                   * later edits (insert/delete) will index into buf[]
+                   * using a stale, out-of-range cursor value.
+                   */
+
+#ifdef CONFIG_READLINE_EDIT
+                  cursor = nch;
+#endif
                 }
 #endif /* CONFIG_READLINE_CMD_HISTORY */
 
+#ifdef CONFIG_READLINE_EDIT
+              if (ch == '1')
+                {
+                  escape = 4;
+                  continue;
+                }
+
+              if (ch == ';')
+                {
+                  escape = 8;
+                  continue;
+                }
+
+              if (ch == '3')
+                {
+                  escape = 3;
+                  continue;
+                }
+
+              if (ch == '4')
+                {
+                  escape = 5;
+                  continue;
+                }
+
+              if (ch == 'F')
+                {
+                  escape = 0;
+                  cursor = nch;
+
+                  /* Redraw full line — cursor ends at end */
+
+                  redraw_line(vtbl, buf, nch, cursor);
+                  continue;
+                }
+
+              if (ch == 'D' && cursor > 0)
+                {
+                  cursor--;
+                  escape = 0;
+                  RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+                  continue;
+                }
+
+              if (ch == 'C' && cursor < nch)
+                {
+                  cursor++;
+                  escape = 0;
+                  RL_WRITE(vtbl, g_curright, sizeof(g_curright));
+                  continue;
+                }
+
+              if (ch == 'H')
+                {
+                  escape = 0;
+                  cursor = 0;
+
+                  /* Redraw full line from column 0 */
+
+                  redraw_line(vtbl, buf, nch, cursor);
+
+                  continue;
+                }
+#endif
+
               escape = 0;
               ch = 'a';
             }
@@ -636,22 +1297,41 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
       else if (ch == ASCII_BS || ch == ASCII_DEL)
         {
-          /* Eliminate that last character in the buffer. */
+#ifdef CONFIG_READLINE_EDIT
+          /* Delete character before cursor */
 
+          if (cursor > 0)
+            {
+              int k;
+              for (k = cursor; k < nch; k++)
+                buf[k - 1] = buf[k];
+              cursor--;
+              nch--;
+
+#  ifdef CONFIG_READLINE_ECHO
+              /* Redraw: backspace, clear EOL, redraw tail, restore cursor */
+
+              RL_PUTC(vtbl, ASCII_BS);
+              RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+              if (cursor < nch)
+                {
+                  RL_WRITE(vtbl, buf + cursor, nch - cursor);
+                  for (k = nch; k > cursor; k--)
+                    RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+                }
+#  endif
+            }
+#else
           if (nch > 0)
             {
               nch--;
 
-#ifdef CONFIG_READLINE_ECHO
-              /* Echo the backspace character on the console.  Always output
-               * the backspace character because the VT100 terminal doesn't
-               * understand DEL properly.
-               */
-
+#  ifdef CONFIG_READLINE_ECHO
               RL_PUTC(vtbl, ASCII_BS);
               RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-#endif
+#  endif
             }
+#endif
         }
 
       /* Check for the beginning of a VT100 escape sequence */
@@ -670,55 +1350,175 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
       else if (ch == '\n')
         {
-#ifdef CONFIG_READLINE_CMD_HISTORY
-          /* Save history of command, only if there was something
-           * typed besides return character.
-           */
-
-          if (nch >= 1)
-            {
-              /* If this command is the one at the top of the circular
-               * buffer, don't save it again.
-               */
-
-              if (strncmp(buf, g_cmdhist.buf[g_cmdhist.head], nch + 1) != 0)
-                {
-                  g_cmdhist.head = (g_cmdhist.head + 1) % RL_CMDHIST_LEN;
-
-                  for (i = 0; (i < nch) && i < (RL_CMDHIST_LINELEN - 1); i++)
-                    {
-                      g_cmdhist.buf[g_cmdhist.head][i] = buf[i];
-                    }
-
-                  g_cmdhist.buf[g_cmdhist.head][i] = '\0';
-
-                  if (g_cmdhist.len < RL_CMDHIST_LEN)
-                    {
-                      g_cmdhist.len++;
-                    }
-                }
-
-              g_cmdhist.offset = 1;
-            }
-#endif /* CONFIG_READLINE_CMD_HISTORY */
-
-          /* The newline is stored in the buffer along with the null
-           * terminator.
-           */
-
-          buf[nch++] = '\n';
-          buf[nch]   = '\0';
-
-          return nch;
+          return submit_line(buf, nch);
         }
 
+      /* Emacs-style control keys */
+
+#ifdef CONFIG_READLINE_EDIT_EMACS
+      else if (ch == CTRL_A)        /* Ctrl+A = Home */
+        {
+          cursor = 0;
+          redraw_line(vtbl, buf, nch, cursor);
+        }
+      else if (ch == CTRL_B)            /* Ctrl+B = Left */
+        {
+          if (cursor > 0)
+            {
+              cursor--;
+              RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+            }
+        }
+      else if (ch == CTRL_D)            /* Ctrl+D = Delete at cursor */
+        {
+          if (cursor < nch)
+            {
+              int k;
+              for (k = cursor + 1; k < nch; k++)
+                buf[k - 1] = buf[k];
+              nch--;
+              RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+              if (cursor < nch)
+                {
+                  RL_WRITE(vtbl, buf + cursor, nch - cursor);
+                  for (k = nch; k > cursor; k--)
+                    RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+                }
+            }
+        }
+      else if (ch == CTRL_E)            /* Ctrl+E = End */
+        {
+          while (cursor < nch)
+            {
+              cursor++;
+              RL_WRITE(vtbl, g_curright, sizeof(g_curright));
+            }
+        }
+      else if (ch == CTRL_F)            /* Ctrl+F = Right */
+        {
+          if (cursor < nch)
+            {
+              cursor++;
+              RL_WRITE(vtbl, g_curright, sizeof(g_curright));
+            }
+        }
+      else if (ch == CTRL_K)           /* Ctrl+K = Kill to EOL */
+        {
+          nch = cursor;
+          buf[nch] = '\0';
+          RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+        }
+      else if (ch == CTRL_U)           /* Ctrl+U = Kill to BOL */
+        {
+          int j;
+          for (j = cursor; j < nch; j++)
+            buf[j - cursor] = buf[j];
+          nch -= cursor;
+          cursor = 0;
+          buf[nch] = '\0';
+          redraw_line(vtbl, buf, nch, cursor);
+        }
+      else if (ch == CTRL_W)           /* Ctrl+W = Kill word backward (FIXME) */
+        {
+          int start, k;
+          start = cursor;
+          while (start > 0 && buf[start - 1] == ' ')
+            start--;
+          while (start > 0 && buf[start - 1] != ' ')
+            start--;
+          for (k = start; k < nch; k++)
+            buf[k - (cursor - start)] = buf[k];
+          nch -= (cursor - start);
+          cursor = start;
+          buf[nch] = '\0';
+          RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+          if (cursor < nch)
+            {
+              RL_WRITE(vtbl, buf + cursor, nch - cursor);
+              for (k = nch; k > cursor; k--)
+                RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+            }
+        }
+
+#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+      else if (ch == CTRL_R && g_cmdhist.len > 0)
+        {
+          /* Ctrl+R = start a reverse incremental search through the
+           * command history, bash-style.  Save the line currently
+           * being edited so it can be restored if the search is
+           * cancelled (Ctrl+G).
+           */
+
+          insearch     = true;
+          searchlen    = 0;
+          searchoffset = 1;
+
+          savednch = nch;
+          if (savednch > RL_CMDHIST_LINELEN - 1)
+            {
+              savednch = RL_CMDHIST_LINELEN - 1;
+            }
+
+          for (i = 0; i < savednch; i++)
+            {
+              savedbuf[i] = buf[i];
+            }
+
+          savedcursor = cursor;
+          nch         = 0;
+
+#ifdef CONFIG_READLINE_ECHO
+          isearch_redraw(vtbl, search, searchlen, buf, nch, false);
+#endif
+        }
+#endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
+#endif /* CONFIG_READLINE_EDIT_EMACS */
+
       /* Otherwise, put the character in the line buffer if the
        * character is not a control byte
        */
 
       else if (!iscntrl(ch & 0xff))
         {
+#ifdef CONFIG_READLINE_EDIT
+          /* Defensive check: 'cursor' must always satisfy
+           * 0 <= cursor <= nch.  It should never be able to get out of
+           * that range now, but clamp it rather than trust it blindly
+           * -- indexing buf[] with an out-of-range cursor is a
+           * memory-safety bug (a stale cursor previously let this
+           * write arbitrarily far past the end of the caller's
+           * buffer).
+           */
+
+          if (cursor < 0 || cursor > nch)
+            {
+              cursor = nch;
+            }
+
+          /* Only insert if there is room for the new character plus
+           * the line's null terminator.  Checking this before writing
+           * (rather than only after, as the non-editing path below
+           * does) is what actually prevents the out-of-bounds write.
+           */
+
+          if (nch + 1 < buflen)
+            {
+              int j;
+              for (j = nch; j > cursor; j--) buf[j] = buf[j - 1];
+              buf[cursor] = (char)ch; nch++; cursor++;
+#  ifdef CONFIG_READLINE_ECHO
+              if (cursor < nch)
+                {
+                  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+                  RL_WRITE(vtbl, buf + cursor, nch - cursor);
+                  for (j = nch; j > cursor; j--)
+                    RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+                }
+#  endif
+            }
+#else
           buf[nch++] = ch;
+#endif
 
           /* Check if there is room for another character and the line's
            * null terminator.  If not then we have to end the line now.
@@ -733,7 +1533,34 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 #ifdef CONFIG_READLINE_TABCOMPLETION
       else if (ch == '\t') /* TAB character */
         {
+          /* When tab_completion() finds a match (or lists several), it
+           * always leaves the terminal's real cursor at the end of the
+           * (possibly completed) line -- either by echoing the
+           * appended characters one at a time, or, when it lists
+           * multiple matches, by reprinting the prompt and the whole
+           * buffer from scratch.  'cursor' has to be resynced to
+           * match in that case, or the very next Left/Right/Home/End
+           * keypress will move the terminal's cursor from column
+           * 'nch' while still believing it is moving from wherever
+           * 'cursor' was left (typically the length of the word
+           * before completion) -- the two then stay out of sync for
+           * the rest of the line.
+           *
+           * But if there was no match at all, tab_completion() does
+           * not touch the terminal or the buffer, and 'cursor' must
+           * be left exactly where it was -- unconditionally resyncing
+           * it here would be just as wrong as never resyncing it,
+           * only in the opposite direction.
+           */
+
+#ifdef CONFIG_READLINE_EDIT
+          if (tab_completion(vtbl, buf, buflen, &nch))
+            {
+              cursor = nch;
+            }
+#else
           tab_completion(vtbl, buf, buflen, &nch);
+#endif
         }
 #endif
     }

From 893f0c31eed10adf58ca95b52fffed56f89e43c5 Mon Sep 17 00:00:00 2001
From: "Alan C. Assis" <acassis@gmail.com>
Date: Wed, 22 Jul 2026 07:54:54 +0000
Subject: [PATCH 530/568] readline: remove 5x duplicated in redraw code

The original readline_common.c file had some duplicated code that was
causing the nsh to be more than 1KB bigger. This clean up will allow
adding line editing without increasing the final firmware size too much.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
Assisted-by: Claude Code
---
 system/readline/readline_common.c | 209 +++++++++++++++---------------
 1 file changed, 107 insertions(+), 102 deletions(-)

diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index a5bd7b301..c1857cd48 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -158,6 +158,36 @@ static int count_builtin_matches(FAR char *buf, FAR int *matches,
 }
 #endif
 
+#if defined(CONFIG_READLINE_TABCOMPLETION) && \
+    (defined(CONFIG_BUILTIN) || defined(CONFIG_READLINE_HAVE_EXTMATCH))
+static void tab_print_match(FAR struct rl_common_s *vtbl,
+                             FAR const char *name, FAR char *tmp_name,
+                             size_t tmp_size)
+{
+  size_t j;
+
+  if (tmp_name[0] == '\0')
+    {
+      strlcpy(tmp_name, name, tmp_size);
+    }
+
+  RL_PUTC(vtbl, ' ');
+  RL_PUTC(vtbl, ' ');
+
+  for (j = 0; j < strlen(name); j++)
+    {
+      if (j < tmp_size && name[j] != tmp_name[j])
+        {
+          tmp_name[j] = '\0';
+        }
+
+      RL_PUTC(vtbl, name[j]);
+    }
+
+  RL_PUTC(vtbl, '\n');
+}
+#endif
+
 /****************************************************************************
  * Name: tab_completion
  *
@@ -303,32 +333,7 @@ static bool tab_completion(FAR struct rl_common_s *vtbl, char *buf,
           for (i = 0; i < nr_ext_matches; i++)
             {
               name = g_extmatch_vtbl->getname(ext_matches[i]);
-
-              /* Initialize temp */
-
-              if (tmp_name[0] == '\0')
-                {
-                  strlcpy(tmp_name, name, sizeof(tmp_name));
-                }
-
-              RL_PUTC(vtbl, ' ');
-              RL_PUTC(vtbl, ' ');
-
-              for (j = 0; j < (int)strlen(name); j++)
-                {
-                  /* Removing characters that aren't common to all the
-                   * matches.
-                   */
-
-                  if (j < (int)sizeof(tmp_name) && name[j] != tmp_name[j])
-                    {
-                      tmp_name[j] = '\0';
-                    }
-
-                  RL_PUTC(vtbl, name[j]);
-                }
-
-              RL_PUTC(vtbl, '\n');
+              tab_print_match(vtbl, name, tmp_name, sizeof(tmp_name));
             }
 #endif
 
@@ -338,32 +343,7 @@ static bool tab_completion(FAR struct rl_common_s *vtbl, char *buf,
           for (i = 0; i < nr_builtin_matches; i++)
             {
               name = builtin_getname(builtin_matches[i]);
-
-              /* Initialize temp */
-
-              if (tmp_name[0] == '\0')
-                {
-                  strlcpy(tmp_name, name, sizeof(tmp_name));
-                }
-
-              RL_PUTC(vtbl, ' ');
-              RL_PUTC(vtbl, ' ');
-
-              for (j = 0; j < strlen(name); j++)
-                {
-                  /* Removing characters that aren't common to all the
-                   * matches.
-                   */
-
-                  if (j < sizeof(tmp_name) && name[j] != tmp_name[j])
-                    {
-                      tmp_name[j] = '\0';
-                    }
-
-                  RL_PUTC(vtbl, name[j]);
-                }
-
-              RL_PUTC(vtbl, '\n');
+              tab_print_match(vtbl, name, tmp_name, sizeof(tmp_name));
             }
 
 #endif
@@ -515,6 +495,41 @@ static bool isearch_find(FAR const char *search, int searchlen,
 }
 #endif
 
+#ifdef CONFIG_READLINE_EDIT
+/****************************************************************************
+ * Name: word_skip
+ *
+ * Description:
+ *   Used by Ctrl+Left/Ctrl+Right.  Starting from 'cursor', skip over any
+ *   run of spaces then the following word (or, going backward, the
+ *   preceding word then any run of spaces before it), stopping at
+ *   'bound' (0 going backward, 'nch' going forward).  Returns the new
+ *   cursor position.
+ *
+ ****************************************************************************/
+
+static int word_skip(FAR const char *buf, int cursor, int bound,
+                      bool forward)
+{
+  if (forward)
+    {
+      while (cursor < bound && buf[cursor] != ' ')
+        cursor++;
+      while (cursor < bound && buf[cursor] == ' ')
+        cursor++;
+    }
+  else
+    {
+      while (cursor > bound && buf[cursor - 1] == ' ')
+        cursor--;
+      while (cursor > bound && buf[cursor - 1] != ' ')
+        cursor--;
+    }
+
+  return cursor;
+}
+#endif
+
 #ifdef CONFIG_READLINE_ECHO
 #ifdef CONFIG_READLINE_EDIT
 /****************************************************************************
@@ -564,6 +579,38 @@ static void redraw_line(FAR struct rl_common_s *vtbl, FAR const char *buf,
       RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
     }
 }
+
+/****************************************************************************
+ * Name: redraw_tail
+ *
+ * Description:
+ *   Redraw just the tail of the line, from 'cursor' to 'nch': erase to
+ *   the end of line, rewrite whatever remains after the cursor (if
+ *   any), then move the cursor back left to where it started.  This is
+ *   the shared tail end of every edit that only changes content at or
+ *   after the cursor without moving it (Delete, Backspace, Ctrl+D,
+ *   Ctrl+W, inserting a character) -- unlike redraw_line(), it does
+ *   not touch the prompt or anything before the cursor, since none of
+ *   those callers need to.
+ *
+ ****************************************************************************/
+
+static void redraw_tail(FAR struct rl_common_s *vtbl, FAR const char *buf,
+                         int nch, int cursor)
+{
+  int j;
+
+  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
+
+  if (cursor < nch)
+    {
+      RL_WRITE(vtbl, buf + cursor, nch - cursor);
+      for (j = nch; j > cursor; j--)
+        {
+          RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
+        }
+    }
+}
 #endif /* CONFIG_READLINE_EDIT */
 
 #ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
@@ -994,13 +1041,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                   /* Back up 1 — terminal echo of '~' advanced cursor */
 
                   RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-                  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-                  if (cursor < nch)
-                    {
-                      RL_WRITE(vtbl, buf + cursor, nch - cursor);
-                      for (k = nch; k > cursor; k--)
-                        RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-                    }
+                  redraw_tail(vtbl, buf, nch, cursor);
 #  endif
                 }
               continue;
@@ -1052,20 +1093,12 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
               if (ch == 'D')        /* Ctrl+Left */
                 {
-                  while (cursor > 0 && buf[cursor - 1] == ' ')
-                    cursor--;
-                  while (cursor > 0 && buf[cursor - 1] != ' ')
-                    cursor--;
-
+                  cursor = word_skip(buf, cursor, 0, false);
                   redraw_line(vtbl, buf, nch, cursor);
                 }
               else if (ch == 'C')   /* Ctrl+Right */
                 {
-                  while (cursor < nch && buf[cursor] != ' ')
-                    cursor++;
-                  while (cursor < nch && buf[cursor] == ' ')
-                    cursor++;
-
+                  cursor = word_skip(buf, cursor, nch, true);
                   redraw_line(vtbl, buf, nch, cursor);
                 }
 
@@ -1312,13 +1345,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
               /* Redraw: backspace, clear EOL, redraw tail, restore cursor */
 
               RL_PUTC(vtbl, ASCII_BS);
-              RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-              if (cursor < nch)
-                {
-                  RL_WRITE(vtbl, buf + cursor, nch - cursor);
-                  for (k = nch; k > cursor; k--)
-                    RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-                }
+              redraw_tail(vtbl, buf, nch, cursor);
 #  endif
             }
 #else
@@ -1377,13 +1404,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
               for (k = cursor + 1; k < nch; k++)
                 buf[k - 1] = buf[k];
               nch--;
-              RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-              if (cursor < nch)
-                {
-                  RL_WRITE(vtbl, buf + cursor, nch - cursor);
-                  for (k = nch; k > cursor; k--)
-                    RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-                }
+              redraw_tail(vtbl, buf, nch, cursor);
             }
         }
       else if (ch == CTRL_E)            /* Ctrl+E = End */
@@ -1421,23 +1442,13 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
       else if (ch == CTRL_W)           /* Ctrl+W = Kill word backward (FIXME) */
         {
           int start, k;
-          start = cursor;
-          while (start > 0 && buf[start - 1] == ' ')
-            start--;
-          while (start > 0 && buf[start - 1] != ' ')
-            start--;
+          start = word_skip(buf, cursor, 0, false);
           for (k = start; k < nch; k++)
             buf[k - (cursor - start)] = buf[k];
           nch -= (cursor - start);
           cursor = start;
           buf[nch] = '\0';
-          RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-          if (cursor < nch)
-            {
-              RL_WRITE(vtbl, buf + cursor, nch - cursor);
-              for (k = nch; k > cursor; k--)
-                RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-            }
+          redraw_tail(vtbl, buf, nch, cursor);
         }
 
 #ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
@@ -1507,13 +1518,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
               for (j = nch; j > cursor; j--) buf[j] = buf[j - 1];
               buf[cursor] = (char)ch; nch++; cursor++;
 #  ifdef CONFIG_READLINE_ECHO
-              if (cursor < nch)
-                {
-                  RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-                  RL_WRITE(vtbl, buf + cursor, nch - cursor);
-                  for (j = nch; j > cursor; j--)
-                    RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-                }
+              redraw_tail(vtbl, buf, nch, cursor);
 #  endif
             }
 #else

From 48eb95998b4b1b34e0d2989c640994b8ee0b0138 Mon Sep 17 00:00:00 2001
From: "Alan C. Assis" <acassi@gmail.com>
Date: Wed, 22 Jul 2026 09:26:32 +0000
Subject: [PATCH 531/568] readline: Make prompt-caching available

readline cached the current prompt only when TAB completion was enabled,
even though line-editing redraws also depend on that cached prompt.
With TAB completion disabled, full-line redraws erased the prompt and
repainted only the command buffer. Make the prompt cache available
whenever line editing is enabled.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 include/system/readline.h         |  7 ++++---
 nshlib/nsh_session.c              |  2 +-
 system/readline/readline_common.c | 35 ++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/include/system/readline.h b/include/system/readline.h
index 5ab963879..8f40c92c1 100644
--- a/include/system/readline.h
+++ b/include/system/readline.h
@@ -88,8 +88,9 @@ extern "C"
  *
  *   If a prompt string is used by the application, then the application
  *   must provide the prompt string to readline() by calling this function.
- *   This is needed only for tab completion in cases where is it necessary
- *   to reprint the prompt string.
+ *   This is needed for tab completion, and for line editing's full-line
+ *   redraws (Home, End, history recall, ...), in cases where it is
+ *   necessary to reprint the prompt string.
  *
  * Input Parameters:
  *   prompt    - The prompt string. This function may then be
@@ -108,7 +109,7 @@ extern "C"
  *
  ****************************************************************************/
 
-#ifdef CONFIG_READLINE_TABCOMPLETION
+#if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
 FAR const char *readline_prompt(FAR const char *prompt);
 #else
 #  define readline_prompt(p)
diff --git a/nshlib/nsh_session.c b/nshlib/nsh_session.c
index 4dd316a9d..acacb0f54 100644
--- a/nshlib/nsh_session.c
+++ b/nshlib/nsh_session.c
@@ -223,7 +223,7 @@ int nsh_session(FAR struct console_stdio_s *pstate,
 
       write(OUTFD(pstate), nsh_prompt(), strlen(nsh_prompt()));
 
-#ifdef CONFIG_READLINE_TABCOMPLETION
+#if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
       /* Set the prompt so readline can redraw it for editing features */
 
       readline_prompt(nsh_prompt());
diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index c1857cd48..3345a6624 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -73,8 +73,15 @@ struct cmdhist_s
 static const char g_erasetoeol[] = VT100_CLEAREOL;
 #endif
 #ifdef CONFIG_READLINE_EDIT
-static const char g_curleft[]  = {ASCII_ESC, '[', 'D'};
-static const char g_curright[] = {ASCII_ESC, '[', 'C'};
+static const char g_curleft[]  =
+                                  {
+                                    ASCII_ESC, '[', 'D'
+                                  };
+
+static const char g_curright[] =
+                                  {
+                                    ASCII_ESC, '[', 'C'
+                                  };
 #endif
 
 #ifdef CONFIG_READLINE_EDIT_EMACS
@@ -94,15 +101,20 @@ static const char g_curright[] = {ASCII_ESC, '[', 'C'};
 #  endif
 #endif
 
-#ifdef CONFIG_READLINE_TABCOMPLETION
-/* Prompt string to present at the beginning of the line */
+#if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
+/* Prompt string to present at the beginning of the line.  Needed by tab
+ * completion (to reprint the prompt after listing multiple matches) and
+ * by line editing's full-line redraws (Home, End, history recall, ...),
+ * so this is available whenever either feature is enabled, not just
+ * when both are.
+ */
 
 static FAR const char *g_readline_prompt = NULL;
+#endif
 
-#ifdef CONFIG_READLINE_HAVE_EXTMATCH
+#if defined(CONFIG_READLINE_TABCOMPLETION) && defined(CONFIG_READLINE_HAVE_EXTMATCH)
 static FAR const struct extmatch_vtable_s *g_extmatch_vtbl = NULL;
 #endif
-#endif /* CONFIG_READLINE_TABCOMPLETION */
 
 #ifdef CONFIG_READLINE_CMD_HISTORY
 static struct cmdhist_s g_cmdhist;
@@ -559,7 +571,6 @@ static void redraw_line(FAR struct rl_common_s *vtbl, FAR const char *buf,
   RL_PUTC(vtbl, '\r');
   RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
 
-#ifdef CONFIG_READLINE_TABCOMPLETION
   if (g_readline_prompt != NULL)
     {
       for (i = 0; g_readline_prompt[i] != '\0'; i++)
@@ -567,7 +578,6 @@ static void redraw_line(FAR struct rl_common_s *vtbl, FAR const char *buf,
           RL_PUTC(vtbl, g_readline_prompt[i]);
         }
     }
-#endif
 
   if (nch > 0)
     {
@@ -731,8 +741,9 @@ static ssize_t submit_line(FAR char *buf, int nch)
  *
  *   If a prompt string is used by the application, then the application
  *   must provide the prompt string to readline() by calling this function.
- *   This is needed only for tab completion in cases where is it necessary
- *   to reprint the prompt string.
+ *   This is needed for tab completion, and for line editing's full-line
+ *   redraws (Home, End, history recall, ...), in cases where it is
+ *   necessary to reprint the prompt string.
  *
  * Input Parameters:
  *   prompt    - The prompt string. This function may then be
@@ -751,7 +762,7 @@ static ssize_t submit_line(FAR char *buf, int nch)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_READLINE_TABCOMPLETION
+#if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
 FAR const char *readline_prompt(FAR const char *prompt)
 {
   FAR const char *ret = g_readline_prompt;
@@ -1188,7 +1199,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 #ifdef CONFIG_READLINE_ECHO
                   RL_PUTC(vtbl, '\r');
                   RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-#ifdef CONFIG_READLINE_TABCOMPLETION
+#if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
                   if (g_readline_prompt != NULL)
                     {
                       int k;

From ae237624ee1e57a8b799cadedf43b8818ee1571f Mon Sep 17 00:00:00 2001
From: "Alan C. Assis" <acassis@gmail.com>
Date: Thu, 23 Jul 2026 14:35:12 -0300
Subject: [PATCH 532/568] readline: Improve robustness of editing and
 escape-sequence handling

Replace fragile cursor compensation with full-line redraws where needed,
fix Ctrl+W buffer/screen corruption, properly consume unrecognized CSI
sequences, and always clean up leaked local-echo characters from buggy
serial drivers. These changes make line editing consistent across
terminals while preserving existing behavior.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
Assisted-by: Claude Code (Sonnet 5)
---
 system/readline/Kconfig           |   5 +-
 system/readline/readline_common.c | 179 ++++++++++++++++++++++--------
 2 files changed, 135 insertions(+), 49 deletions(-)

diff --git a/system/readline/Kconfig b/system/readline/Kconfig
index 1914fedaa..f4aa5612c 100644
--- a/system/readline/Kconfig
+++ b/system/readline/Kconfig
@@ -61,18 +61,15 @@ config READLINE_EDIT
 		Build in support for full command-line editing using cursor keys,
 		Home/End, Delete. Requires a VT100/ANSI-compatible terminal.
 
-if READLINE_EDIT
-
 config READLINE_EDIT_EMACS
 	bool "Emacs-style control keys"
 	default n
+	depends on READLINE_EDIT
 	---help---
 		Enable emacs-style control key bindings:
 		Ctrl+A Home, Ctrl+E End, Ctrl+K kill-to-end,
 		Ctrl+U kill-to-start, Ctrl+Left/Right word movement.
 
-endif # READLINE_EDIT
-
 config READLINE_CMD_HISTORY
 	bool "Command line history"
 	default n
diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index 3345a6624..b7981a307 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -543,7 +543,7 @@ static int word_skip(FAR const char *buf, int cursor, int bound,
 #endif
 
 #ifdef CONFIG_READLINE_ECHO
-#ifdef CONFIG_READLINE_EDIT
+#  ifdef CONFIG_READLINE_EDIT
 /****************************************************************************
  * Name: redraw_line
  *
@@ -621,9 +621,9 @@ static void redraw_tail(FAR struct rl_common_s *vtbl, FAR const char *buf,
         }
     }
 }
-#endif /* CONFIG_READLINE_EDIT */
+#  endif /* CONFIG_READLINE_EDIT */
 
-#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+#  ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
 /****************************************************************************
  * Name: isearch_redraw
  *
@@ -669,7 +669,7 @@ static void isearch_redraw(FAR struct rl_common_s *vtbl,
       RL_WRITE(vtbl, buf, nch);
     }
 }
-#endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
+#  endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
 #endif /* CONFIG_READLINE_ECHO */
 
 /****************************************************************************
@@ -799,13 +799,13 @@ FAR const char *readline_prompt(FAR const char *prompt)
 FAR const struct extmatch_vtable_s *
   readline_extmatch(FAR const struct extmatch_vtable_s *vtbl)
 {
-#if (CONFIG_READLINE_MAX_EXTCMDS > 0)
+#  if (CONFIG_READLINE_MAX_EXTCMDS > 0)
   FAR const struct extmatch_vtable_s *ret = g_extmatch_vtbl;
   g_extmatch_vtbl = vtbl;
   return ret;
-#else
+#  else
   return NULL;
-#endif
+#  endif
 }
 #endif
 
@@ -934,9 +934,9 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
               bool found = isearch_find(search, searchlen, searchoffset,
                                          &searchoffset, buf, buflen, &nch);
-#ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_ECHO
               isearch_redraw(vtbl, search, searchlen, buf, nch, !found);
-#endif
+#  endif
             }
           else if (ch == ASCII_BS || ch == ASCII_DEL)
             {
@@ -956,10 +956,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                     }
                 }
 
-#ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_ECHO
               isearch_redraw(vtbl, search, searchlen, buf, nch,
                               searchlen > 0 && nch == 0);
-#endif
+#  endif
             }
           else if (ch == CTRL_G || ch == ASCII_ETX)  /* ^G or ^C: cancel */
             {
@@ -978,9 +978,9 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
               buf[nch] = '\0';
 
-#ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_ECHO
               redraw_line(vtbl, buf, nch, cursor);
-#endif
+#  endif
             }
           else if (ch == '\n')
             {
@@ -1009,9 +1009,9 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
               bool found = isearch_find(search, searchlen, searchoffset,
                                          &searchoffset, buf, buflen, &nch);
-#ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_ECHO
               isearch_redraw(vtbl, search, searchlen, buf, nch, !found);
-#endif
+#  endif
             }
           else
             {
@@ -1023,14 +1023,14 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
               insearch = false;
               cursor   = nch;
 
-#ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_ECHO
               redraw_line(vtbl, buf, nch, cursor);
-#endif
+#  endif
             }
 
           continue;
         }
-#endif
+#endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
 
       /* Are we processing a VT100 escape sequence */
 
@@ -1042,19 +1042,44 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
           if (escape == 3)
             {
               escape = 0;
-              if (ch == '~' && cursor < nch)
+              if (ch == '~')
                 {
-                  int k;
-                  for (k = cursor + 1; k < nch; k++)
-                    buf[k - 1] = buf[k];
-                  nch--;
-#  ifdef CONFIG_READLINE_ECHO
-                  /* Back up 1 — terminal echo of '~' advanced cursor */
+                  if (cursor < nch)
+                    {
+                      int k;
+                      for (k = cursor + 1; k < nch; k++)
+                        buf[k - 1] = buf[k];
+                      nch--;
+                    }
 
-                  RL_WRITE(vtbl, g_curleft, sizeof(g_curleft));
-                  redraw_tail(vtbl, buf, nch, cursor);
+#  ifdef CONFIG_READLINE_ECHO
+                  /* Delete arrives as the 4-byte sequence "ESC [ 3 ~".
+                   * Some serial drivers only know how to suppress
+                   * local echo for fixed 3-byte "ESC [ x" sequences
+                   * and leak the trailing '~' as a literal character,
+                   * silently advancing the terminal's real cursor by
+                   * one column.  redraw_line() is immune to this (and
+                   * to any other such drift) because it always
+                   * returns to column 0 with '\r' first, rather than
+                   * assuming where the cursor currently is -- unlike
+                   * a plain erase-and-rewrite-the-tail redraw, which
+                   * only works relative to the cursor's last known
+                   * position and has no way to recover if that
+                   * assumption turns out to be wrong.
+                   *
+                   * This redraw is unconditional -- even when there
+                   * was nothing to delete (cursor already at the true
+                   * end, including an empty line) -- specifically so
+                   * it also cleans up a leaked '~' in that case; only
+                   * skipping the redraw when there is "nothing to do"
+                   * is exactly what left a stray '~' visible on
+                   * screen with an unpatched driver.
+                   */
+
+                  redraw_line(vtbl, buf, nch, cursor);
 #  endif
                 }
+
               continue;
             }
 
@@ -1117,6 +1142,35 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
             }
 #endif /* CONFIG_READLINE_EDIT */
 
+          if (escape == 10)    /* Unrecognized CSI -- consume to final byte */
+            {
+              if (ch >= 0x20 && ch <= 0x3f)
+                {
+                  continue;    /* still a parameter/intermediate byte */
+                }
+
+              /* ch is the final byte (0x40-0x7e), or something
+               * malformed -- either way the sequence is over now and
+               * is discarded; nothing was ever inserted into the
+               * buffer.  Still issue a corrective redraw: some serial
+               * drivers only know how to suppress local echo for
+               * fixed 3-byte "ESC [ x" sequences and leak bytes from
+               * any longer, unrecognized sequence as literal
+               * characters, the same class of issue Delete has for
+               * its own "ESC [ 3 ~".  redraw_line() cleans up any
+               * such leaked characters even though the buffer itself
+               * was never affected by them.
+               */
+
+              escape = 0;
+#  ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_EDIT
+              redraw_line(vtbl, buf, nch, cursor);
+#  endif
+#  endif
+              continue;
+            }
+
           /* Some terminals (e.g. xterm) use the SS3 introducer "ESC O"
            * rather than CSI "ESC [" for Home/End (and, in application
            * cursor key mode, for the arrow keys too).  Recognize the
@@ -1196,10 +1250,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
                   nch = 0;
 
-#ifdef CONFIG_READLINE_ECHO
+#  ifdef CONFIG_READLINE_ECHO
                   RL_PUTC(vtbl, '\r');
                   RL_WRITE(vtbl, g_erasetoeol, sizeof(g_erasetoeol));
-#if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
+#    if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
                   if (g_readline_prompt != NULL)
                     {
                       int k;
@@ -1208,8 +1262,8 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                           RL_PUTC(vtbl, g_readline_prompt[k]);
                         }
                     }
-#endif
-#endif
+#    endif
+#  endif
 
                   if (g_cmdhist.offset != 1)
                     {
@@ -1244,9 +1298,9 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                    * using a stale, out-of-range cursor value.
                    */
 
-#ifdef CONFIG_READLINE_EDIT
+#  ifdef CONFIG_READLINE_EDIT
                   cursor = nch;
-#endif
+#  endif
                 }
 #endif /* CONFIG_READLINE_CMD_HISTORY */
 
@@ -1315,6 +1369,22 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                 }
 #endif
 
+              /* Not one of the specific sequences recognized above.  If
+               * this still looks like a CSI parameter or intermediate
+               * byte (0x20-0x3f: digits, ';', and similar), this is
+               * some other CSI sequence this code doesn't specifically
+               * know about -- keep consuming bytes until the real final
+               * byte (0x40-0x7e) ends it, rather than treating this
+               * byte as the end of the sequence and leaking whatever
+               * comes after it as literal input.
+               */
+
+              if (ch >= 0x20 && ch <= 0x3f)
+                {
+                  escape = 10;
+                  continue;
+                }
+
               escape = 0;
               ch = 'a';
             }
@@ -1450,19 +1520,34 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
           buf[nch] = '\0';
           redraw_line(vtbl, buf, nch, cursor);
         }
-      else if (ch == CTRL_W)           /* Ctrl+W = Kill word backward (FIXME) */
+      else if (ch == CTRL_W)           /* Ctrl+W = Kill word backward */
         {
           int start, k;
           start = word_skip(buf, cursor, 0, false);
-          for (k = start; k < nch; k++)
+          for (k = cursor; k < nch; k++)
             buf[k - (cursor - start)] = buf[k];
           nch -= (cursor - start);
           cursor = start;
           buf[nch] = '\0';
-          redraw_tail(vtbl, buf, nch, cursor);
+
+          /* Unlike Ctrl+K (which never moves the cursor, so erasing
+           * from wherever it already is is correct) and Backspace
+           * (which moves it by exactly one column and compensates
+           * with a single explicit backspace byte), Ctrl+W can move
+           * the cursor back by any number of columns depending on how
+           * long the killed word was.  redraw_tail() has no way to
+           * express "also move left by N first"; it just erases from
+           * wherever the terminal's cursor already happens to be.
+           * Using redraw_line() instead sidesteps the whole problem
+           * the same way it does for Delete: it returns to column 0
+           * with '\r' first, so it is correct regardless of how far
+           * the cursor moved.
+           */
+
+          redraw_line(vtbl, buf, nch, cursor);
         }
 
-#ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+#  ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
       else if (ch == CTRL_R && g_cmdhist.len > 0)
         {
           /* Ctrl+R = start a reverse incremental search through the
@@ -1489,11 +1574,11 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
           savedcursor = cursor;
           nch         = 0;
 
-#ifdef CONFIG_READLINE_ECHO
+#    ifdef CONFIG_READLINE_ECHO
           isearch_redraw(vtbl, search, searchlen, buf, nch, false);
-#endif
+#    endif
         }
-#endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
+#  endif /* CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH */
 #endif /* CONFIG_READLINE_EDIT_EMACS */
 
       /* Otherwise, put the character in the line buffer if the
@@ -1526,7 +1611,11 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
           if (nch + 1 < buflen)
             {
               int j;
-              for (j = nch; j > cursor; j--) buf[j] = buf[j - 1];
+              for (j = nch; j > cursor; j--)
+                {
+                  buf[j] = buf[j - 1];
+                }
+
               buf[cursor] = (char)ch; nch++; cursor++;
 #  ifdef CONFIG_READLINE_ECHO
               redraw_tail(vtbl, buf, nch, cursor);
@@ -1534,7 +1623,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
             }
 #else
           buf[nch++] = ch;
-#endif
+#endif  /* CONFIG_READLINE_EDIT */
 
           /* Check if there is room for another character and the line's
            * null terminator.  If not then we have to end the line now.
@@ -1569,14 +1658,14 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
            * only in the opposite direction.
            */
 
-#ifdef CONFIG_READLINE_EDIT
+#  ifdef CONFIG_READLINE_EDIT
           if (tab_completion(vtbl, buf, buflen, &nch))
             {
               cursor = nch;
             }
-#else
+#  else
           tab_completion(vtbl, buf, buflen, &nch);
-#endif
+#  endif
         }
 #endif
     }

From 690ec808e54168459b127122bc0791044388118d Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Sat, 11 Jul 2026 20:14:39 -0300
Subject: [PATCH 533/568] netutils/dropbear: back hmac-sha2-256 with NuttX
 /dev/crypto

Replace the bundled libtomcrypt HMAC modules with an adapter that computes the hmac-sha2-256 packet MAC through the NuttX crypto device using CRYPTO_SHA2_256_HMAC sessions.

Require CRYPTO, CRYPTO_RANDOM_POOL, CRYPTO_CRYPTODEV and CRYPTO_CRYPTODEV_SOFTWARE_CRYPTO explicitly instead of selecting crypto support.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 netutils/dropbear/CMakeLists.txt              |   7 +
 netutils/dropbear/Kconfig                     |  11 +
 netutils/dropbear/Makefile                    |  10 +
 .../dropbear/port/dropbear_ltc_hmac_sha256.c  | 255 ++++++++++++++++++
 4 files changed, 283 insertions(+)
 create mode 100644 netutils/dropbear/port/dropbear_ltc_hmac_sha256.c

diff --git a/netutils/dropbear/CMakeLists.txt b/netutils/dropbear/CMakeLists.txt
index eb31d0012..96cbcc233 100644
--- a/netutils/dropbear/CMakeLists.txt
+++ b/netutils/dropbear/CMakeLists.txt
@@ -135,6 +135,13 @@ if(CONFIG_NETUTILS_DROPBEAR)
   file(GLOB_RECURSE LIBTOMCRYPT_SRCS CONFIGURE_DEPENDS
        "${CMAKE_CURRENT_SOURCE_DIR}/dropbear/libtomcrypt/src/*.c")
   list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/prngs/sober128tab\\.c$")
+
+  # Drop the bundled libtomcrypt HMAC modules replaced by the NuttX adapter.
+  list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/mac/hmac/hmac_init\\.c$")
+  list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/mac/hmac/hmac_process\\.c$")
+  list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/mac/hmac/hmac_done\\.c$")
+  list(APPEND DROPBEAR_SRCS port/dropbear_ltc_hmac_sha256.c)
+
   list(APPEND DROPBEAR_SRCS ${LIBTOMCRYPT_SRCS})
 
   if(CONFIG_NETUTILS_DROPBEAR_SCP)
diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
index 43a2c4a51..ae37135cb 100644
--- a/netutils/dropbear/Kconfig
+++ b/netutils/dropbear/Kconfig
@@ -21,11 +21,22 @@ menuconfig NETUTILS_DROPBEAR
 	depends on LIBC_GAISTRERROR
 	depends on CRYPTO
 	depends on CRYPTO_RANDOM_POOL
+	depends on ALLOW_BSD_COMPONENTS
+	depends on CRYPTO_CRYPTODEV
+	depends on CRYPTO_CRYPTODEV_SOFTWARE_CRYPTO
 	---help---
 		Enable a minimal Dropbear SSH server port for NuttX.  This initial
 		port is based on the ESP-IDF MCU test port and provides a single
 		foreground SSH server process with SSH sessions backed by NSH.
 
+		The port computes the hmac-sha2-256 packet MAC through the NuttX
+		crypto device (/dev/crypto, CRYPTO_SHA2_256_HMAC) instead of the
+		bundled libtomcrypt implementation, which is dropped from the
+		build.  The SHA-256 hash descriptor itself stays in the
+		application: Dropbear's key derivation clones partially-updated
+		hash states (hashkeys() in common-kex.c), which cannot be
+		represented by a kernel crypto session.
+
 if NETUTILS_DROPBEAR
 
 config NETUTILS_DROPBEAR_STACKSIZE
diff --git a/netutils/dropbear/Makefile b/netutils/dropbear/Makefile
index 17e5ec8db..145e5c5ae 100644
--- a/netutils/dropbear/Makefile
+++ b/netutils/dropbear/Makefile
@@ -119,6 +119,16 @@ CSRCS += \
 TOMMATH_SRCS = $(shell if [ -d "$(DROPBEAR_UNPACKNAME)/libtommath" ]; then find "$(DROPBEAR_UNPACKNAME)/libtommath" -name "*.c"; fi)
 TOMCRYPT_SRCS = $(shell if [ -d "$(DROPBEAR_UNPACKNAME)/libtomcrypt/src" ]; then find "$(DROPBEAR_UNPACKNAME)/libtomcrypt/src" -name "*.c" ! -name "sober128tab.c"; fi)
 
+# Drop the bundled libtomcrypt HMAC modules replaced by the NuttX adapter.
+
+TOMCRYPT_SRCS := $(filter-out \
+	%/mac/hmac/hmac_init.c \
+	%/mac/hmac/hmac_process.c \
+	%/mac/hmac/hmac_done.c, \
+	$(TOMCRYPT_SRCS))
+
+CSRCS += port/dropbear_ltc_hmac_sha256.c
+
 CSRCS += $(TOMMATH_SRCS)
 CSRCS += $(TOMCRYPT_SRCS)
 
diff --git a/netutils/dropbear/port/dropbear_ltc_hmac_sha256.c b/netutils/dropbear/port/dropbear_ltc_hmac_sha256.c
new file mode 100644
index 000000000..dda511d5f
--- /dev/null
+++ b/netutils/dropbear/port/dropbear_ltc_hmac_sha256.c
@@ -0,0 +1,255 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/dropbear_ltc_hmac_sha256.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* LibTomCrypt-compatible incremental HMAC API backed by a
+ * CRYPTO_SHA2_256_HMAC /dev/crypto session (hmac-sha2-256, the only MAC the
+ * NuttX Dropbear configuration enables): init opens the session, process
+ * feeds data with COP_FLAG_UPDATE, done reads the tag and frees the session.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "includes.h"
+
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <crypto/cryptodev.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define DROPBEAR_HMAC_SHA256_DIGESTLEN 32
+#define DROPBEAR_HMAC_SHA256_BLOCKLEN  64
+
+/* Stash the process-local /dev/crypto descriptor and session id in the
+ * unused md hash-state buffer so the upstream hmac_state needs no patch.
+ */
+
+static_assert(sizeof(int) + sizeof(uint32_t) <= sizeof(hash_state),
+              "cryptodev state does not fit in hmac_state.md");
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int dropbear_hmac_cryptodev_open(void)
+{
+  int fd;
+  int cfd;
+
+  fd = open("/dev/crypto", O_RDWR);
+  if (fd < 0)
+    {
+      return -1;
+    }
+
+  if (ioctl(fd, CRIOGET, &cfd) < 0)
+    {
+      close(fd);
+      return -1;
+    }
+
+  close(fd);
+
+  if (fcntl(cfd, F_SETFD, FD_CLOEXEC) < 0)
+    {
+      close(cfd);
+      return -1;
+    }
+
+  return cfd;
+}
+
+static int dropbear_hmac_hash_is_sha256(int hash)
+{
+  int ret;
+
+  ret = hash_is_valid(hash);
+  if (ret != CRYPT_OK)
+    {
+      return ret;
+    }
+
+  if (hash_descriptor[hash].hashsize != DROPBEAR_HMAC_SHA256_DIGESTLEN ||
+      hash_descriptor[hash].blocksize != DROPBEAR_HMAC_SHA256_BLOCKLEN)
+    {
+      return CRYPT_INVALID_HASH;
+    }
+
+  return CRYPT_OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int hmac_init(hmac_state *hmac, int hash, const unsigned char *key,
+              unsigned long keylen)
+{
+  struct session_op session;
+  int cfd;
+  int ret;
+
+  LTC_ARGCHK(hmac != NULL);
+  LTC_ARGCHK(key != NULL);
+
+  if (keylen == 0 || keylen > INT_MAX)
+    {
+      return CRYPT_INVALID_KEYSIZE;
+    }
+
+  ret = dropbear_hmac_hash_is_sha256(hash);
+  if (ret != CRYPT_OK)
+    {
+      return ret;
+    }
+
+  zeromem(hmac, sizeof(*hmac));
+  cfd = dropbear_hmac_cryptodev_open();
+  if (cfd < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  memset(&session, 0, sizeof(session));
+  session.mac = CRYPTO_SHA2_256_HMAC;
+  session.mackey = (caddr_t)key;
+  session.mackeylen = (int)keylen;
+  if (ioctl(cfd, CIOCGSESSION, &session) < 0)
+    {
+      close(cfd);
+      zeromem(hmac, sizeof(*hmac));
+      return CRYPT_ERROR;
+    }
+
+  memcpy(&hmac->md, &cfd, sizeof(cfd));
+  memcpy((FAR uint8_t *)&hmac->md + sizeof(cfd),
+         &session.ses, sizeof(session.ses));
+  hmac->hash = hash;
+  return CRYPT_OK;
+}
+
+int hmac_process(hmac_state *hmac, const unsigned char *in,
+                 unsigned long inlen)
+{
+  struct crypt_op cryp;
+  uint32_t ses;
+  int cfd;
+  int ret;
+
+  LTC_ARGCHK(hmac != NULL);
+  LTC_ARGCHK(in != NULL || inlen == 0);
+
+  ret = dropbear_hmac_hash_is_sha256(hmac->hash);
+  if (ret != CRYPT_OK)
+    {
+      return ret;
+    }
+
+  if (inlen > UINT_MAX)
+    {
+      return CRYPT_OVERFLOW;
+    }
+
+  memcpy(&cfd, &hmac->md, sizeof(cfd));
+  memcpy(&ses, (FAR uint8_t *)&hmac->md + sizeof(cfd), sizeof(ses));
+  if (cfd < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  memset(&cryp, 0, sizeof(cryp));
+  cryp.ses = ses;
+  cryp.op = COP_ENCRYPT;
+  cryp.flags = COP_FLAG_UPDATE;
+  cryp.len = (unsigned int)inlen;
+  cryp.src = (caddr_t)in;
+  if (ioctl(cfd, CIOCCRYPT, &cryp) < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  return CRYPT_OK;
+}
+
+int hmac_done(hmac_state *hmac, unsigned char *out, unsigned long *outlen)
+{
+  unsigned char digest[DROPBEAR_HMAC_SHA256_DIGESTLEN];
+  struct crypt_op cryp;
+  unsigned long copylen;
+  uint32_t ses;
+  int cfd;
+  int ret = CRYPT_ERROR;
+
+  LTC_ARGCHK(hmac != NULL);
+  LTC_ARGCHK(out != NULL);
+  LTC_ARGCHK(outlen != NULL);
+
+  memcpy(&cfd, &hmac->md, sizeof(cfd));
+  memcpy(&ses, (FAR uint8_t *)&hmac->md + sizeof(cfd), sizeof(ses));
+  if (cfd < 0)
+    {
+      goto out;
+    }
+
+  ret = dropbear_hmac_hash_is_sha256(hmac->hash);
+  if (ret != CRYPT_OK)
+    {
+      goto out;
+    }
+
+  memset(&cryp, 0, sizeof(cryp));
+  cryp.ses = ses;
+  cryp.op = COP_ENCRYPT;
+  cryp.len = 0;
+  cryp.src = (caddr_t)digest;
+  cryp.mac = (caddr_t)digest;
+  if (ioctl(cfd, CIOCCRYPT, &cryp) < 0)
+    {
+      ret = CRYPT_ERROR;
+      goto out;
+    }
+
+  copylen = MIN(*outlen, DROPBEAR_HMAC_SHA256_DIGESTLEN);
+  memcpy(out, digest, copylen);
+  *outlen = copylen;
+  ret = CRYPT_OK;
+
+out:
+  if (cfd >= 0)
+    {
+      ioctl(cfd, CIOCFSESSION, &ses);
+      close(cfd);
+    }
+
+  zeromem(digest, sizeof(digest));
+  zeromem(hmac, sizeof(*hmac));
+  return ret;
+}

From 6ca1272b99494686731c53d22f81224d7ab8117d Mon Sep 17 00:00:00 2001
From: aviralgarg05 <gargaviral99@gmail.com>
Date: Sat, 11 Jul 2026 21:58:05 +0530
Subject: [PATCH 534/568] examples/elf: extend nxpkg validation coverage.

Extend the examples/elf ROMFS path so nxpkg validation can use
generated package fixtures instead of hand-managed metadata.

Generate index.json, bad-index.json, pkgtest.nsh, and pkgfail.nsh
from the built hello ELF, recording the correct target arch/compat
metadata and SHA-256 digest for the valid fixture. Keep mismatched-
target and missing-artifact cases alongside the valid fixture so
nxpkg target selection and failure handling can be exercised from
the same example tree. Group the paired fixture outputs in one make
step so parallel builds do not re-enter the generator independently.

This keeps the fixture metadata tied to the actual built hello
artifact instead of relying on manually maintained hashes or ad hoc
shell setup, making follow-up review and later test reruns more
predictable. There is no intended loader or board-behavior change;
this is limited to fixture generation inside examples/elf.

Assisted-by: Claude:claude-sonnet-5
Assisted-by: OpenAI Codex:gpt-5.6-sol
Signed-off-by: aviralgarg05 <gargaviral99@gmail.com>
---
 examples/elf/main/CMakeLists.txt        | 110 +++++-
 examples/elf/main/Makefile              |  35 +-
 examples/elf/main/host/CMakeLists.txt   |  26 ++
 examples/elf/main/mk_pkg_fixture.c      | 463 ++++++++++++++++++++++++
 examples/elf/tests/CMakeLists.txt       |  23 ++
 examples/elf/tests/hello/CMakeLists.txt |  33 ++
 6 files changed, 687 insertions(+), 3 deletions(-)
 create mode 100644 examples/elf/main/host/CMakeLists.txt
 create mode 100644 examples/elf/main/mk_pkg_fixture.c
 create mode 100644 examples/elf/tests/CMakeLists.txt
 create mode 100644 examples/elf/tests/hello/CMakeLists.txt

diff --git a/examples/elf/main/CMakeLists.txt b/examples/elf/main/CMakeLists.txt
index 3ae5a347e..3b354fe21 100644
--- a/examples/elf/main/CMakeLists.txt
+++ b/examples/elf/main/CMakeLists.txt
@@ -19,7 +19,115 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_ELF)
-  nuttx_add_application(NAME elf SRCS elf_main.c)
+  set(ELF_SYMTAB ${CMAKE_CURRENT_BINARY_DIR}/test_symtab.c)
+  set(ELF_ROMFS_IMG ${CMAKE_CURRENT_BINARY_DIR}/elf_romfs.img)
+  set(ELF_ROMFS_SRC ${CMAKE_CURRENT_BINARY_DIR}/elf_romfs.c)
+
+  set(ELFNAME_BASE hello)
+
+  set(ELF_BINARY_FILES)
+  set(ELF_BINARY_TARGETS)
+  foreach(ELFNAME IN LISTS ELFNAME_BASE)
+    list(APPEND ELF_BINARY_FILES ${CMAKE_BINARY_DIR}/bin/${ELFNAME})
+
+    if(CMAKE_C_ELF_COMPILER)
+      list(APPEND ELF_BINARY_TARGETS ${ELFNAME})
+    else()
+      list(APPEND ELF_BINARY_TARGETS ELF_${ELFNAME})
+    endif()
+  endforeach()
+
+  add_custom_command(
+    OUTPUT ${ELF_SYMTAB}
+    COMMAND ${NUTTX_APPS_DIR}/tools/mksymtab.sh ${ELF_BINARY_FILES} g_elf >
+            ${ELF_SYMTAB}
+    DEPENDS ${ELF_BINARY_TARGETS})
+
+  set_source_files_properties(${ELF_SYMTAB} PROPERTIES GENERATED TRUE)
+
+  set(ELF_GENERATED_OUTPUTS ${ELF_SYMTAB})
+  set(ELF_SRCS elf_main.c ${ELF_SYMTAB})
+
+  if(CONFIG_EXAMPLES_ELF_ROMFS)
+    set(ELF_ROMFS_DEPS ${ELF_BINARY_TARGETS})
+
+    if(CONFIG_SYSTEM_NXPKG)
+      set(ELF_INDEX_JSON ${CMAKE_BINARY_DIR}/bin/index.json)
+      set(ELF_BAD_INDEX_JSON ${CMAKE_BINARY_DIR}/bin/bad-index.json)
+      set(ELF_PKGTEST ${CMAKE_BINARY_DIR}/bin/pkgtest.nsh)
+      set(ELF_PKGFAIL ${CMAKE_BINARY_DIR}/bin/pkgfail.nsh)
+      set(ELF_HELLO_BIN ${CMAKE_BINARY_DIR}/bin/hello)
+      set(ELF_FIXTURE_HOST_DIR ${CMAKE_CURRENT_BINARY_DIR}/host)
+      set(ELF_FIXTURE_HOST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/host/CMakeLists.txt)
+      set(ELF_FIXTURE_TOOL
+          ${ELF_FIXTURE_HOST_DIR}/mk_pkg_fixture${CMAKE_EXECUTABLE_SUFFIX})
+      set(ELF_HELLO_TARGET hello)
+
+      if(CONFIG_ARCH_BOARD)
+        set(ELF_FIXTURE_COMPAT ${CONFIG_ARCH_BOARD})
+      else()
+        set(ELF_FIXTURE_COMPAT ${CONFIG_ARCH_BOARD_CUSTOM_NAME})
+      endif()
+
+      if(NOT CMAKE_C_ELF_COMPILER)
+        set(ELF_HELLO_TARGET ELF_hello)
+      endif()
+
+      add_custom_command(
+        OUTPUT ${ELF_FIXTURE_TOOL}
+        COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/host -B
+                ${ELF_FIXTURE_HOST_DIR}
+        COMMAND ${CMAKE_COMMAND} --build ${ELF_FIXTURE_HOST_DIR} --target
+                mk_pkg_fixture
+        DEPENDS ${ELF_FIXTURE_HOST_SRC}
+                ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture.c
+        VERBATIM)
+
+      add_custom_command(
+        OUTPUT ${ELF_INDEX_JSON} ${ELF_BAD_INDEX_JSON} ${ELF_PKGTEST}
+               ${ELF_PKGFAIL}
+        COMMAND
+          ${ELF_FIXTURE_TOOL} ${ELF_HELLO_BIN} ${ELF_INDEX_JSON}
+          ${ELF_BAD_INDEX_JSON} ${ELF_PKGTEST} ${ELF_PKGFAIL} ${CONFIG_ARCH}
+          ${ELF_FIXTURE_COMPAT}
+        DEPENDS ${ELF_HELLO_TARGET} ${ELF_FIXTURE_TOOL}
+        VERBATIM)
+
+      list(APPEND ELF_ROMFS_DEPS ${ELF_INDEX_JSON} ${ELF_BAD_INDEX_JSON}
+           ${ELF_PKGTEST} ${ELF_PKGFAIL})
+    endif()
+
+    add_custom_command(
+      OUTPUT ${ELF_ROMFS_IMG}
+      COMMAND genromfs -f ${ELF_ROMFS_IMG} -d ${CMAKE_BINARY_DIR}/bin
+      DEPENDS ${ELF_ROMFS_DEPS}
+      VERBATIM)
+
+    get_filename_component(ELF_ROMFS_IMG_NAME ${ELF_ROMFS_IMG} NAME)
+
+    # xxd -i derives the generated array/length symbol names from the exact path
+    # it is given - elf_main.c declares them as plain
+    # "elf_romfs_img"/"elf_romfs_img_len", so xxd must be run against just the
+    # bare filename (via WORKING_DIRECTORY) rather than the absolute
+    # ${ELF_ROMFS_IMG} path, or every non-alphanumeric character in that path
+    # (e.g. every "/" in the build directory) gets folded into the symbol name
+    # instead, leaving the names elf_main.c expects undefined at link time.
+
+    add_custom_command(
+      OUTPUT ${ELF_ROMFS_SRC}
+      COMMAND xxd -i ${ELF_ROMFS_IMG_NAME} > ${ELF_ROMFS_SRC}
+      DEPENDS ${ELF_ROMFS_IMG}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+    set_source_files_properties(${ELF_ROMFS_SRC} PROPERTIES GENERATED TRUE)
+
+    list(APPEND ELF_GENERATED_OUTPUTS ${ELF_ROMFS_SRC})
+    list(APPEND ELF_SRCS ${ELF_ROMFS_SRC})
+  endif()
+
+  add_custom_target(elf_artifacts DEPENDS ${ELF_GENERATED_OUTPUTS})
+
+  nuttx_add_application(NAME elf SRCS ${ELF_SRCS} DEPENDS elf_artifacts)
 
   # TODO: tests
 
diff --git a/examples/elf/main/Makefile b/examples/elf/main/Makefile
index 76093ea5f..5cc8db511 100644
--- a/examples/elf/main/Makefile
+++ b/examples/elf/main/Makefile
@@ -69,8 +69,39 @@ ifeq ($(CONFIG_EXAMPLES_ELF_ROMFS),y)
 ROMFSIMG = elf_romfs.img
 ROMFSSRC = elf_romfs.c
 ROMFSOBJ = $(ROMFSSRC:.c=$(OBJEXT))
+ifdef CONFIG_SYSTEM_NXPKG
+HOSTOBJSEXT ?= hobj
+PKGINDEX = $(BINDIR)/index.json
+PKGBADINDEX = $(BINDIR)/bad-index.json
+PKGTEST  = $(BINDIR)/pkgtest.nsh
+PKGFAIL  = $(BINDIR)/pkgfail.nsh
+PKG_FIXTURE_GEN = mk_pkg_fixture$(HOSTEXEEXT)
+PKG_FIXTURE_SRCS = mk_pkg_fixture.c
+PKG_FIXTURE_OBJS = $(PKG_FIXTURE_SRCS:.c=.$(HOSTOBJSEXT))
+PKG_FIXTURE_OUTPUTS = $(PKGINDEX) $(PKGBADINDEX) $(PKGTEST) $(PKGFAIL)
+PKG_FIXTURE_INPUTS = $(BINDIR)/hello
+PKG_FIXTURE_STAMP = $(BINDIR)/.pkgtest.stamp
+PKG_FIXTURE_COMPAT = $(if $(CONFIG_ARCH_BOARD),$(CONFIG_ARCH_BOARD),$(CONFIG_ARCH_BOARD_CUSTOM_NAME))
+PKG_FIXTURE_ARGS = \
+	$(BINDIR)/hello $(PKGINDEX) $(PKGBADINDEX) $(PKGTEST) $(PKGFAIL) \
+	$(CONFIG_ARCH) $(PKG_FIXTURE_COMPAT)
 
-$(ROMFSIMG):
+$(PKG_FIXTURE_OBJS): %.$(HOSTOBJSEXT): %.c
+	@echo "CC:  $<"
+	$(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
+
+$(PKG_FIXTURE_GEN): $(PKG_FIXTURE_OBJS)
+	$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(PKG_FIXTURE_OBJS) -o $@
+
+$(PKG_FIXTURE_OUTPUTS): $(PKG_FIXTURE_STAMP)
+
+$(PKG_FIXTURE_STAMP): $(PKG_FIXTURE_INPUTS) $(PKG_FIXTURE_GEN)
+	$(Q) ./$(PKG_FIXTURE_GEN) \
+		$(PKG_FIXTURE_ARGS)
+	$(Q) touch $@
+endif
+
+$(ROMFSIMG): $(PKG_FIXTURE_OUTPUTS)
 	$(Q) genromfs -d $(BINDIR) -f $@
 
 $(ROMFSSRC): $(ROMFSIMG)
@@ -106,7 +137,7 @@ postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ)
 	$(call ARLOCK, $(call CONVERT_PATH,$(BIN)), $^)
 
 distclean::
-	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(MODLUE_NAME))
+	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(MODLUE_NAME) $(PKG_FIXTURE_GEN) $(PKG_FIXTURE_OBJS) $(PKG_FIXTURE_STAMP))
 
 
 include $(APPDIR)/Application.mk
diff --git a/examples/elf/main/host/CMakeLists.txt b/examples/elf/main/host/CMakeLists.txt
new file mode 100644
index 000000000..a2474cb7a
--- /dev/null
+++ b/examples/elf/main/host/CMakeLists.txt
@@ -0,0 +1,26 @@
+# ##############################################################################
+# apps/examples/elf/main/host/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+cmake_minimum_required(VERSION 3.16)
+project(elf_fixture_host LANGUAGES C)
+
+add_executable(mk_pkg_fixture ../mk_pkg_fixture.c)
diff --git a/examples/elf/main/mk_pkg_fixture.c b/examples/elf/main/mk_pkg_fixture.c
new file mode 100644
index 000000000..c3799b519
--- /dev/null
+++ b/examples/elf/main/mk_pkg_fixture.c
@@ -0,0 +1,463 @@
+/****************************************************************************
+ * apps/examples/elf/main/mk_pkg_fixture.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SHA256_BLOCK_SIZE 64
+#define SHA256_DIGEST_SIZE 32
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct sha256_state_s
+{
+  uint32_t state[8];
+  uint64_t bitcount;
+  uint8_t buffer[SHA256_BLOCK_SIZE];
+  size_t buffer_len;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const uint32_t g_sha256_init[8] =
+{
+  0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
+  0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+};
+
+static const uint32_t g_sha256_k[64] =
+{
+  0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+  0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+  0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+  0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+  0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+  0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+  0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+  0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+  0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+  0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+  0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+  0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+  0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+  0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+  0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+  0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static uint32_t sha256_rotr(uint32_t value, unsigned int bits)
+{
+  return (value >> bits) | (value << (32 - bits));
+}
+
+static uint32_t sha256_ch(uint32_t x, uint32_t y, uint32_t z)
+{
+  return (x & y) ^ (~x & z);
+}
+
+static uint32_t sha256_maj(uint32_t x, uint32_t y, uint32_t z)
+{
+  return (x & y) ^ (x & z) ^ (y & z);
+}
+
+static uint32_t sha256_bs0(uint32_t x)
+{
+  return sha256_rotr(x, 2) ^ sha256_rotr(x, 13) ^ sha256_rotr(x, 22);
+}
+
+static uint32_t sha256_bs1(uint32_t x)
+{
+  return sha256_rotr(x, 6) ^ sha256_rotr(x, 11) ^ sha256_rotr(x, 25);
+}
+
+static uint32_t sha256_ss0(uint32_t x)
+{
+  return sha256_rotr(x, 7) ^ sha256_rotr(x, 18) ^ (x >> 3);
+}
+
+static uint32_t sha256_ss1(uint32_t x)
+{
+  return sha256_rotr(x, 17) ^ sha256_rotr(x, 19) ^ (x >> 10);
+}
+
+static uint32_t sha256_load32(const uint8_t *src)
+{
+  return ((uint32_t)src[0] << 24) | ((uint32_t)src[1] << 16) |
+         ((uint32_t)src[2] << 8) | (uint32_t)src[3];
+}
+
+static void sha256_store32(uint8_t *dst, uint32_t value)
+{
+  dst[0] = (uint8_t)(value >> 24);
+  dst[1] = (uint8_t)(value >> 16);
+  dst[2] = (uint8_t)(value >> 8);
+  dst[3] = (uint8_t)value;
+}
+
+static void sha256_transform(struct sha256_state_s *ctx,
+                             const uint8_t block[SHA256_BLOCK_SIZE])
+{
+  uint32_t schedule[64];
+  uint32_t a;
+  uint32_t b;
+  uint32_t c;
+  uint32_t d;
+  uint32_t e;
+  uint32_t f;
+  uint32_t g;
+  uint32_t h;
+  int i;
+
+  for (i = 0; i < 16; i++)
+    {
+      schedule[i] = sha256_load32(block + i * 4);
+    }
+
+  for (; i < 64; i++)
+    {
+      schedule[i] = sha256_ss1(schedule[i - 2]) + schedule[i - 7] +
+                    sha256_ss0(schedule[i - 15]) + schedule[i - 16];
+    }
+
+  a = ctx->state[0];
+  b = ctx->state[1];
+  c = ctx->state[2];
+  d = ctx->state[3];
+  e = ctx->state[4];
+  f = ctx->state[5];
+  g = ctx->state[6];
+  h = ctx->state[7];
+
+  for (i = 0; i < 64; i++)
+    {
+      uint32_t t1 = h + sha256_bs1(e) + sha256_ch(e, f, g) + g_sha256_k[i] +
+                    schedule[i];
+      uint32_t t2 = sha256_bs0(a) + sha256_maj(a, b, c);
+
+      h = g;
+      g = f;
+      f = e;
+      e = d + t1;
+      d = c;
+      c = b;
+      b = a;
+      a = t1 + t2;
+    }
+
+  ctx->state[0] += a;
+  ctx->state[1] += b;
+  ctx->state[2] += c;
+  ctx->state[3] += d;
+  ctx->state[4] += e;
+  ctx->state[5] += f;
+  ctx->state[6] += g;
+  ctx->state[7] += h;
+}
+
+static void sha256_init(struct sha256_state_s *ctx)
+{
+  memcpy(ctx->state, g_sha256_init, sizeof(g_sha256_init));
+  ctx->bitcount = 0;
+  ctx->buffer_len = 0;
+}
+
+static void sha256_update(struct sha256_state_s *ctx, const uint8_t *data,
+                          size_t len)
+{
+  ctx->bitcount += (uint64_t)len * 8;
+
+  while (len > 0)
+    {
+      size_t space = SHA256_BLOCK_SIZE - ctx->buffer_len;
+      size_t chunk = len < space ? len : space;
+
+      memcpy(ctx->buffer + ctx->buffer_len, data, chunk);
+      ctx->buffer_len += chunk;
+      data += chunk;
+      len -= chunk;
+
+      if (ctx->buffer_len == SHA256_BLOCK_SIZE)
+        {
+          sha256_transform(ctx, ctx->buffer);
+          ctx->buffer_len = 0;
+        }
+    }
+}
+
+static void sha256_final(struct sha256_state_s *ctx,
+                         uint8_t digest[SHA256_DIGEST_SIZE])
+{
+  uint8_t length_bytes[8];
+  uint8_t padding[SHA256_BLOCK_SIZE] =
+  {
+    0x80
+  };
+
+  int i;
+
+  for (i = 0; i < 8; i++)
+    {
+      length_bytes[7 - i] = (uint8_t)(ctx->bitcount >> (i * 8));
+    }
+
+  if (ctx->buffer_len < 56)
+    {
+      sha256_update(ctx, padding, 56 - ctx->buffer_len);
+    }
+  else
+    {
+      sha256_update(ctx, padding, SHA256_BLOCK_SIZE - ctx->buffer_len);
+      sha256_update(ctx, padding + 1, 56);
+    }
+
+  sha256_update(ctx, length_bytes, sizeof(length_bytes));
+
+  for (i = 0; i < 8; i++)
+    {
+      sha256_store32(digest + i * 4, ctx->state[i]);
+    }
+}
+
+static int sha256_file(const char *path, char *digest_hex, size_t digest_len)
+{
+  struct sha256_state_s ctx;
+  uint8_t digest[SHA256_DIGEST_SIZE];
+  uint8_t buffer[4096];
+  static const char g_hex[] = "0123456789abcdef";
+  FILE *stream;
+  size_t nread;
+  int i;
+
+  if (digest_len < SHA256_DIGEST_SIZE * 2 + 1)
+    {
+      fprintf(stderr, "digest buffer is too small\n");
+      return -1;
+    }
+
+  stream = fopen(path, "rb");
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  sha256_init(&ctx);
+
+  while ((nread = fread(buffer, 1, sizeof(buffer), stream)) > 0)
+    {
+      sha256_update(&ctx, buffer, nread);
+    }
+
+  if (ferror(stream) != 0)
+    {
+      fprintf(stderr, "failed to read %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  fclose(stream);
+  sha256_final(&ctx, digest);
+
+  for (i = 0; i < SHA256_DIGEST_SIZE; i++)
+    {
+      digest_hex[i * 2] = g_hex[digest[i] >> 4];
+      digest_hex[i * 2 + 1] = g_hex[digest[i] & 0x0f];
+    }
+
+  digest_hex[SHA256_DIGEST_SIZE * 2] = '\0';
+  return 0;
+}
+
+static int write_text_file(const char *path, const char *content)
+{
+  FILE *stream = fopen(path, "w");
+
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  if (fputs(content, stream) == EOF)
+    {
+      fprintf(stderr, "failed to write %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  if (fclose(stream) != 0)
+    {
+      fprintf(stderr, "failed to close %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  return 0;
+}
+
+static int write_index_file(const char *path, const char *arch,
+                            const char *compat, const char *digest)
+{
+  const char *artifact = "hello";
+  FILE *stream = fopen(path, "w");
+
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  if (fprintf(stream,
+              "{\"_nxpkg_source\":\"/etc/nxpkg/index.json\","
+              "\"packages\":["
+              "{\"name\":\"hello\",\"version\":\"1.0.0\",\"arch\":\"%s\","
+              "\"compat\":\"%s\",\"artifact\":\"%s\",\"sha256\":\"%s\","
+              "\"type\":\"elf\"},"
+              "{\"name\":\"hello\",\"version\":\"9.9.9\",\"arch\":\"arm\","
+              "\"compat\":\"stm32f4discovery\",\"artifact\":\"%s\","
+              "\"sha256\":\"%s\",\"type\":\"elf\"}"
+              "]}\n",
+              arch, compat, artifact, digest, artifact, digest) < 0)
+    {
+      fprintf(stderr, "failed to write %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  if (fclose(stream) != 0)
+    {
+      fprintf(stderr, "failed to close %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  return 0;
+}
+
+static int write_bad_index_file(const char *path, const char *arch,
+                                const char *compat)
+{
+  FILE *stream = fopen(path, "w");
+
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  if (fprintf(stream,
+              "{\"_nxpkg_source\":\"/etc/nxpkg/index.json\","
+              "\"packages\":["
+              "{\"name\":\"hello-missing\",\"version\":\"1.0.0\","
+              "\"arch\":\"%s\",\"compat\":\"%s\","
+              "\"artifact\":\"hello-missing\","
+              "\"sha256\":\""
+              "00000000000000000000000000000000"
+              "00000000000000000000000000000000"
+              "\",\"type\":\"elf\"}"
+              "]}\n",
+              arch, compat) < 0)
+    {
+      fprintf(stderr, "failed to write %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  if (fclose(stream) != 0)
+    {
+      fprintf(stderr, "failed to close %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  return 0;
+}
+
+static void usage(const char *progname)
+{
+  fprintf(stderr,
+          "usage: %s <hello-bin> <index-json> <bad-index-json> "
+          "<pkgtest-nsh> <pkgfail-nsh> <arch> <compat>\n",
+          progname);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  char digest[SHA256_DIGEST_SIZE * 2 + 1];
+  static const char g_pkgtest[] =
+    "mount -t tmpfs /etc\n"
+    "mount -t tmpfs /var\n"
+    "mkdir /etc/nxpkg\n"
+    "cp /mnt/elf/romfs/index.json /etc/nxpkg/index.json\n"
+    "cp /mnt/elf/romfs/hello /etc/nxpkg/hello\n"
+    "mkdir /var/lib\n"
+    "mkdir /var/lib/nxpkg\n"
+    "cp /mnt/elf/romfs/index.json /var/lib/nxpkg/index.jsn\n"
+    "nxpkg install hello\n"
+    "nxpkg list\n";
+  static const char g_pkgfail[] =
+    "mount -t tmpfs /etc\n"
+    "mount -t tmpfs /var\n"
+    "mkdir /etc/nxpkg\n"
+    "cp /mnt/elf/romfs/bad-index.json /etc/nxpkg/index.json\n"
+    "mkdir /var/lib\n"
+    "mkdir /var/lib/nxpkg\n"
+    "cp /mnt/elf/romfs/bad-index.json /var/lib/nxpkg/index.jsn\n"
+    "nxpkg install hello-missing\n";
+
+  if (argc != 8)
+    {
+      usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  if (sha256_file(argv[1], digest, sizeof(digest)) < 0 ||
+      write_index_file(argv[2], argv[6], argv[7], digest) < 0 ||
+      write_bad_index_file(argv[3], argv[6], argv[7]) < 0 ||
+      write_text_file(argv[4], g_pkgtest) < 0 ||
+      write_text_file(argv[5], g_pkgfail) < 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;
+}
diff --git a/examples/elf/tests/CMakeLists.txt b/examples/elf/tests/CMakeLists.txt
new file mode 100644
index 000000000..952929788
--- /dev/null
+++ b/examples/elf/tests/CMakeLists.txt
@@ -0,0 +1,23 @@
+# ##############################################################################
+# apps/examples/elf/tests/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+nuttx_add_subdirectory()
diff --git a/examples/elf/tests/hello/CMakeLists.txt b/examples/elf/tests/hello/CMakeLists.txt
new file mode 100644
index 000000000..d3906bfcf
--- /dev/null
+++ b/examples/elf/tests/hello/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/examples/elf/tests/hello/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_ELF)
+  nuttx_add_application(
+    NAME
+    hello
+    SRCS
+    hello.c
+    STACKSIZE
+    ${CONFIG_ELF_STACKSIZE}
+    MODULE
+    m)
+endif()

From 101b713be6c42dd757e63c020af3aacbd14d257e Mon Sep 17 00:00:00 2001
From: Junbo Zheng <zhengjunbo1@xiaomi.com>
Date: Thu, 23 Jul 2026 19:47:13 +0800
Subject: [PATCH 535/568] nshlib: add du command support

Add a du command to NSH that recursively summarizes the size of each
path argument in 1K-blocks, or human-readable form with -h.

Supports -s (summary only), -a (all files), -d N (max-depth), and -h,
matching GNU du semantics.

Testing:

Built and ran on sim:nsh with:
```bash
  cmake -B out/nuttx_sim_nsh -S nuttx -DBOARD_CONFIG=sim:nsh -GNinja
  ninja -C out/nuttx_sim_nsh
  ./out/nuttx_sim_nsh/nuttx

  nsh> du
  397449  /data/test/elf
  71993   /data/test/coredump
  5       /data/test/log2
  3251    /data/test/log1
  472700  /data/test

  nsh> du -h
  388.1M  /data/test/elf
  70.3M   /data/test/coredump
  4.1K    /data/test/log2
  3.1M    /data/test/log1
  461.6M  /data/test
```

Host Ubuntu22.04 du on the same directory:
```bash
  $ du
  397456  ./elf
  72000   ./coredump
  8       ./log2
  3252    ./log1
  472720  .

  $ du -h
  389M  ./elf
  71M   ./coredump
  8.0K  ./log2
  3.2M  ./log1
  462M  .
```

Signed-off-by: Junbo Zheng <zhengjunbo1@xiaomi.com>
---
 nshlib/Kconfig       |   4 +
 nshlib/nsh.h         |  10 +-
 nshlib/nsh_command.c |   5 +
 nshlib/nsh_fscmds.c  | 233 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 249 insertions(+), 3 deletions(-)

diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 165bcc8b3..499f09345 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -413,6 +413,10 @@ config NSH_DISABLE_DMESG
 	bool "Disable dmesg"
 	default DEFAULT_SMALL
 
+config NSH_DISABLE_DU
+	bool "Disable du"
+	default DEFAULT_SMALL
+
 config NSH_DISABLE_ECHO
 	bool "Disable echo"
 	default DEFAULT_SMALL
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index d2b7abc44..a7ceb7c95 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -411,12 +411,13 @@
 
 #define NSH_HAVE_IOBUFFER 1
 
-/* The I/O buffer is needed for the ls, cp, and ps commands.  It is also
- * needed if the platform supplied MOTD is configured.
+/* The I/O buffer is needed for the ls, cp, du, and ps commands.  It is
+ * also needed if the platform supplied MOTD is configured.
  */
 
 #if defined(CONFIG_NSH_DISABLE_LS) && defined(CONFIG_NSH_DISABLE_CP) && \
-    defined(CONFIG_NSH_DISABLE_PS) && !defined(CONFIG_NSH_PLATFORM_MOTD) && \
+    defined(CONFIG_NSH_DISABLE_DU) && defined(CONFIG_NSH_DISABLE_PS) && \
+    !defined(CONFIG_NSH_PLATFORM_MOTD) && \
     defined(CONFIG_DISABLE_ENVIRON)
 #  undef NSH_HAVE_IOBUFFER
 #endif
@@ -996,6 +997,9 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #ifndef CONFIG_NSH_DISABLE_LS
   int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
+#ifndef CONFIG_NSH_DISABLE_DU
+  int cmd_du(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
+#endif
 #if defined(CONFIG_SYSLOG_DEVPATH) && !defined(CONFIG_NSH_DISABLE_DMESG)
   int cmd_dmesg(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index a50e223c9..098abaa76 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -354,6 +354,11 @@ static const struct cmdmap_s g_cmdmap[] =
   CMD_MAP("ls",       cmd_ls,       1, 5, "[-lRsh] <dir-path>"),
 #endif
 
+#ifndef CONFIG_NSH_DISABLE_DU
+  CMD_MAP("du",       cmd_du,       1, 7,
+    "[-h] [-s] [-a] [-d N] <path>..."),
+#endif
+
 #if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS)
 #  if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
   CMD_MAP("lsmod",    cmd_lsmod,    1, 1,  NULL),
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index a3423494c..0a6fd945f 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -1855,6 +1855,239 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 }
 #endif
 
+/****************************************************************************
+ * Name: du_print
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_DU
+#define DU_FLAG_HUMANREADABLE (1 << 0)  /* -h: human readable sizes */
+#define DU_FLAG_ALL           (1 << 1)  /* -a: list all files, not only dirs */
+
+static void du_print(FAR struct nsh_vtbl_s *vtbl, FAR const char *path,
+                     off_t bytes, unsigned int flags)
+{
+  off_t kblocks = (bytes + 1023) / 1024;
+
+  if ((flags & DU_FLAG_HUMANREADABLE) != 0)
+    {
+      off_t unit;
+      char suffix;
+
+      if (bytes >= GB)
+        {
+          unit = GB;
+          suffix = 'G';
+        }
+      else if (bytes >= MB)
+        {
+          unit = MB;
+          suffix = 'M';
+        }
+      else if (bytes >= KB)
+        {
+          unit = KB;
+          suffix = 'K';
+        }
+      else
+        {
+          nsh_output(vtbl, "%" PRIdOFF "B\t%s\n", bytes, path);
+          return;
+        }
+
+      /* Use integer arithmetic to avoid floating point */
+
+      nsh_output(vtbl, "%" PRIdOFF ".%" PRIdOFF "%c\t%s\n",
+                 bytes / unit, (bytes % unit) * 10 / unit, suffix, path);
+    }
+  else
+    {
+      nsh_output(vtbl, "%" PRIdOFF "\t%s\n", kblocks, path);
+    }
+}
+
+static off_t du_recursive(FAR struct nsh_vtbl_s *vtbl, FAR const char *path,
+                          unsigned int flags, int printlimit, int depth)
+{
+  FAR struct dirent *entry;
+  FAR char *child;
+  struct stat st;
+  off_t total;
+  DIR *dp;
+
+  if (lstat(path, &st) < 0)
+    {
+      nsh_error(vtbl, g_fmtcmdfailed, "du", "stat", NSH_ERRNO);
+      return 0;
+    }
+
+  /* st_size not st_blocks: units differ (NuttX FS=st_blksize, hostfs=512) */
+
+  total = st.st_size;
+
+  /* A file argument (depth 0) is always shown; nested files need -a. */
+
+  if (!S_ISDIR(st.st_mode))
+    {
+      if (depth == 0 ||
+          ((flags & DU_FLAG_ALL) != 0 && depth <= printlimit))
+        {
+          du_print(vtbl, path, total, flags);
+        }
+
+      return total;
+    }
+
+  dp = opendir(path);
+  if (dp == NULL)
+    {
+      nsh_error(vtbl, g_fmtcmdfailed, "du", "opendir", NSH_ERRNO);
+    }
+  else
+    {
+      while ((entry = readdir(dp)) != NULL)
+        {
+          if (strcmp(entry->d_name, ".") == 0 ||
+              strcmp(entry->d_name, "..") == 0)
+            {
+              continue;
+            }
+
+          child = nsh_getdirpath(vtbl, path, entry->d_name);
+          if (child == NULL)
+            {
+              nsh_error(vtbl, g_fmtcmdfailed, "du", "nsh_getdirpath",
+                        NSH_ERRNO);
+              continue;
+            }
+
+          total += du_recursive(vtbl, child, flags, printlimit, depth + 1);
+          free(child);
+        }
+
+      closedir(dp);
+    }
+
+  /* Print this directory's cumulative total unless suppressed by -s/-d. */
+
+  if (depth <= printlimit)
+    {
+      du_print(vtbl, path, total, flags);
+    }
+
+  return total;
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_du
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_DU
+int cmd_du(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
+{
+  unsigned int flags = 0;
+  int printlimit = INT_MAX;
+  bool summary = false;
+  bool badarg = false;
+  int option;
+  int i;
+  int ret = OK;
+
+  /* Get the du options */
+
+  while ((option = getopt(argc, argv, "hsad:")) != ERROR)
+    {
+      switch (option)
+        {
+          case 'h':
+            flags |= DU_FLAG_HUMANREADABLE;
+            break;
+
+          case 's':
+            summary = true;
+            break;
+
+          case 'a':
+            flags |= DU_FLAG_ALL;
+            break;
+
+          case 'd':
+            printlimit = atoi(optarg);
+            break;
+
+          case '?':
+          default:
+            nsh_error(vtbl, g_fmtarginvalid, argv[0]);
+            badarg = true;
+            break;
+        }
+    }
+
+  /* If a bad argument was encountered,
+   * then return without processing the command
+   */
+
+  if (badarg)
+    {
+      return ERROR;
+    }
+
+  /* -s reports only each argument's own total (depth 0); -d N overrides -s
+   * when both are given. -s also suppresses the -a file listing.
+   */
+
+  if (summary)
+    {
+      if (printlimit == INT_MAX)
+        {
+          printlimit = 0;
+        }
+
+      flags &= ~DU_FLAG_ALL;
+    }
+
+  /* Walk each path argument (default: current directory). */
+
+  if (optind >= argc)
+    {
+#ifndef CONFIG_DISABLE_ENVIRON
+      FAR char *fullpath = nsh_getfullpath(vtbl, nsh_getcwd(vtbl));
+
+      if (fullpath == NULL)
+        {
+          nsh_error(vtbl, g_fmtcmdoutofmemory, argv[0]);
+          return ERROR;
+        }
+
+      du_recursive(vtbl, fullpath, flags, printlimit, 0);
+      nsh_freefullpath(fullpath);
+#else
+      nsh_error(vtbl, g_fmtargrequired, argv[0]);
+      return ERROR;
+#endif
+    }
+  else
+    {
+      for (i = optind; i < argc; i++)
+        {
+          FAR char *fullpath = nsh_getfullpath(vtbl, argv[i]);
+
+          if (fullpath == NULL)
+            {
+              nsh_error(vtbl, g_fmtcmdoutofmemory, argv[0]);
+              ret = ERROR;
+              continue;
+            }
+
+          du_recursive(vtbl, fullpath, flags, printlimit, 0);
+          nsh_freefullpath(fullpath);
+        }
+    }
+
+  return ret;
+}
+#endif
+
 /****************************************************************************
  * Name: cmd_mkdir
  ****************************************************************************/

From 355d090d838906c61a4931923b7c540105e09c96 Mon Sep 17 00:00:00 2001
From: Felipe Moura <moura.fmo@gmail.com>
Date: Fri, 24 Jul 2026 20:18:38 -0300
Subject: [PATCH 536/568] netutils/dropbear: back chacha20-poly1305 with NuttX
 /dev/crypto

Replace the bundled libtomcrypt chacha20-poly1305 implementation with an
adapter that drives the NuttX crypto device: the SSH construction maps onto
CRYPTO_CHACHA20_DJB (the original 64-bit counter/nonce ChaCha20
parameterization used by chacha20-poly1305@openssh.com) for the packet
length and payload streams, and onto CRYPTO_POLY1305 for the authentication
tag (plain MACs are driven in two steps through /dev/crypto: COP_FLAG_UPDATE
feeds the data, a final call retrieves the tag).

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>
---
 netutils/dropbear/CMakeLists.txt             |   4 +
 netutils/dropbear/Kconfig                    |   6 +
 netutils/dropbear/Makefile                   |   5 +
 netutils/dropbear/port/dropbear_chachapoly.c | 389 +++++++++++++++++++
 4 files changed, 404 insertions(+)
 create mode 100644 netutils/dropbear/port/dropbear_chachapoly.c

diff --git a/netutils/dropbear/CMakeLists.txt b/netutils/dropbear/CMakeLists.txt
index 96cbcc233..c429a2a0d 100644
--- a/netutils/dropbear/CMakeLists.txt
+++ b/netutils/dropbear/CMakeLists.txt
@@ -142,6 +142,10 @@ if(CONFIG_NETUTILS_DROPBEAR)
   list(FILTER LIBTOMCRYPT_SRCS EXCLUDE REGEX ".*/mac/hmac/hmac_done\\.c$")
   list(APPEND DROPBEAR_SRCS port/dropbear_ltc_hmac_sha256.c)
 
+  # Replace the bundled chacha20-poly1305 with the /dev/crypto adapter.
+  list(REMOVE_ITEM DROPBEAR_SRCS dropbear/src/chachapoly.c)
+  list(APPEND DROPBEAR_SRCS port/dropbear_chachapoly.c)
+
   list(APPEND DROPBEAR_SRCS ${LIBTOMCRYPT_SRCS})
 
   if(CONFIG_NETUTILS_DROPBEAR_SCP)
diff --git a/netutils/dropbear/Kconfig b/netutils/dropbear/Kconfig
index ae37135cb..99066ee2e 100644
--- a/netutils/dropbear/Kconfig
+++ b/netutils/dropbear/Kconfig
@@ -37,6 +37,12 @@ menuconfig NETUTILS_DROPBEAR
 		hash states (hashkeys() in common-kex.c), which cannot be
 		represented by a kernel crypto session.
 
+		The port also implements the chacha20-poly1305@openssh.com cipher
+		through the NuttX crypto device (/dev/crypto), using the
+		CRYPTO_CHACHA20_DJB and CRYPTO_POLY1305 algorithms instead of
+		the bundled libtomcrypt implementation, which is dropped from
+		the build.
+
 if NETUTILS_DROPBEAR
 
 config NETUTILS_DROPBEAR_STACKSIZE
diff --git a/netutils/dropbear/Makefile b/netutils/dropbear/Makefile
index 145e5c5ae..f36398088 100644
--- a/netutils/dropbear/Makefile
+++ b/netutils/dropbear/Makefile
@@ -129,6 +129,11 @@ TOMCRYPT_SRCS := $(filter-out \
 
 CSRCS += port/dropbear_ltc_hmac_sha256.c
 
+# Replace the bundled chacha20-poly1305 with the /dev/crypto adapter.
+
+CSRCS := $(filter-out dropbear/src/chachapoly.c,$(CSRCS))
+CSRCS += port/dropbear_chachapoly.c
+
 CSRCS += $(TOMMATH_SRCS)
 CSRCS += $(TOMCRYPT_SRCS)
 
diff --git a/netutils/dropbear/port/dropbear_chachapoly.c b/netutils/dropbear/port/dropbear_chachapoly.c
new file mode 100644
index 000000000..f670d14ca
--- /dev/null
+++ b/netutils/dropbear/port/dropbear_chachapoly.c
@@ -0,0 +1,389 @@
+/****************************************************************************
+ * apps/netutils/dropbear/port/dropbear_chachapoly.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* chacha20-poly1305@openssh.com backed by the NuttX crypto device.
+ *
+ * The SSH construction (see OpenSSH PROTOCOL.chacha20poly1305) uses the
+ * original DJB ChaCha20 parameterization: a 64-bit block counter in state
+ * words 12..13 and a 64-bit nonce (the packet sequence number, big endian)
+ * in words 14..15.  This maps to the kernel CRYPTO_CHACHA20_DJB transform,
+ * whose 16-byte IV is loaded verbatim into words 12..15 as a 64-bit
+ * little-endian counter followed by the 64-bit nonce.  The Poly1305 tag is
+ * computed with the kernel CRYPTO_POLY1305 transform, keyed with the first
+ * keystream block (counter 0) of the main key, as the protocol requires.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "includes.h"
+
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <crypto/cryptodev.h>
+
+#include "algo.h"
+#include "dbutil.h"
+#include "chachapoly.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CHACHA20_KEY_LEN   32
+#define CHACHA20_BLOCKSIZE 8
+#define CHACHA20_IV_LEN    16
+#define POLY1305_KEY_LEN   32
+#define POLY1305_TAG_LEN   16
+
+/* The keystream comes from the NuttX crypto device, so each upstream
+ * chacha_state is unused and its input[] buffer just stores the 32-byte key,
+ * keeping the upstream header unpatched.
+ */
+
+#define KEY_MAIN(s)   ((FAR unsigned char *)(s)->chacha.input)
+#define KEY_HEADER(s) ((FAR unsigned char *)(s)->header.input)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct ltc_cipher_descriptor g_dropbear_chachapoly_dummy =
+{
+  .name = NULL
+};
+
+static const struct dropbear_hash g_dropbear_chachapoly_mac =
+{
+  NULL,
+  POLY1305_KEY_LEN,
+  POLY1305_TAG_LEN
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct dropbear_cipher dropbear_chachapoly =
+{
+  &g_dropbear_chachapoly_dummy,
+  CHACHA20_KEY_LEN * 2,
+  CHACHA20_BLOCKSIZE
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Open a fresh /dev/crypto session descriptor.  NuttX file descriptors are
+ * owned by the task group, so the fd is never cached across calls: each
+ * operation opens it in the task that uses it and closes it when done.
+ */
+
+static int dropbear_cryptodev_open(void)
+{
+  int fd;
+  int cfd;
+
+  fd = open("/dev/crypto", O_RDWR);
+  if (fd < 0)
+    {
+      return -1;
+    }
+
+  if (ioctl(fd, CRIOGET, &cfd) < 0)
+    {
+      close(fd);
+      return -1;
+    }
+
+  close(fd);
+
+  /* Keep the descriptor out of the NSH shells Dropbear forks and execs for
+   * each SSH session.
+   */
+
+  if (fcntl(cfd, F_SETFD, FD_CLOEXEC) < 0)
+    {
+      close(cfd);
+      return -1;
+    }
+
+  return cfd;
+}
+
+/* One ChaCha20 (DJB layout) pass: encrypt/decrypt len bytes with the given
+ * 64-bit block counter and the packet sequence number as nonce.
+ */
+
+static int dropbear_chacha(int cfd, FAR const unsigned char *key,
+                           unsigned int seq, uint64_t counter,
+                           FAR const unsigned char *in,
+                           FAR unsigned char *out, size_t len)
+{
+  struct session_op session;
+  struct crypt_op cryp;
+  unsigned char iv[CHACHA20_IV_LEN];
+  int ret = CRYPT_ERROR;
+  int i;
+
+  /* IV = 64-bit little-endian block counter || 64-bit nonce.  The nonce is
+   * the packet sequence number stored big endian, as OpenSSH does.
+   */
+
+  for (i = 0; i < 8; i++)
+    {
+      iv[i] = (unsigned char)(counter >> (8 * i));
+    }
+
+  STORE64H((uint64_t)seq, iv + 8);
+
+  memset(&session, 0, sizeof(session));
+  session.cipher = CRYPTO_CHACHA20_DJB;
+  session.key = (caddr_t)key;
+  session.keylen = CHACHA20_KEY_LEN;
+  if (ioctl(cfd, CIOCGSESSION, &session) < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  memset(&cryp, 0, sizeof(cryp));
+  cryp.ses = session.ses;
+  cryp.op = COP_ENCRYPT;
+  cryp.len = len;
+  cryp.src = (caddr_t)in;
+  cryp.dst = (caddr_t)out;
+  cryp.iv = (caddr_t)iv;
+  cryp.ivlen = sizeof(iv);
+  if (ioctl(cfd, CIOCCRYPT, &cryp) == 0)
+    {
+      ret = CRYPT_OK;
+    }
+
+  ioctl(cfd, CIOCFSESSION, &session.ses);
+  return ret;
+}
+
+static int dropbear_poly1305(int cfd, FAR const unsigned char *key,
+                             FAR const unsigned char *in, size_t len,
+                             FAR unsigned char *tag)
+{
+  struct session_op session;
+  struct crypt_op cryp;
+  int ret = CRYPT_ERROR;
+
+  memset(&session, 0, sizeof(session));
+  session.mac = CRYPTO_POLY1305;
+  session.mackey = (caddr_t)key;
+  session.mackeylen = POLY1305_KEY_LEN;
+  if (ioctl(cfd, CIOCGSESSION, &session) < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  /* Plain (non-HMAC) MACs are driven in two steps through /dev/crypto:
+   * COP_FLAG_UPDATE feeds the data, then a final call without the flag
+   * writes out the tag.
+   */
+
+  memset(&cryp, 0, sizeof(cryp));
+  cryp.ses = session.ses;
+  cryp.op = COP_ENCRYPT;
+  cryp.flags = COP_FLAG_UPDATE;
+  cryp.len = len;
+  cryp.src = (caddr_t)in;
+  if (ioctl(cfd, CIOCCRYPT, &cryp) == 0)
+    {
+      cryp.flags = 0;
+      cryp.len = 0;
+      cryp.src = NULL;
+      cryp.mac = (caddr_t)tag;
+      if (ioctl(cfd, CIOCCRYPT, &cryp) == 0)
+        {
+          ret = CRYPT_OK;
+        }
+    }
+
+  ioctl(cfd, CIOCFSESSION, &session.ses);
+  return ret;
+}
+
+static int dropbear_chachapoly_start(int cipher,
+                                     FAR const unsigned char *iv,
+                                     FAR const unsigned char *key,
+                                     int keylen, int num_rounds,
+                                     FAR void *cipher_state)
+{
+  FAR dropbear_chachapoly_state *state = cipher_state;
+  int cfd;
+
+  UNUSED(cipher);
+  UNUSED(iv);
+
+  if (keylen != CHACHA20_KEY_LEN * 2 || num_rounds != 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  /* Validate that the crypto device is reachable at cipher setup. */
+
+  cfd = dropbear_cryptodev_open();
+  if (cfd < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  close(cfd);
+
+  memcpy(KEY_MAIN(state), key, CHACHA20_KEY_LEN);
+  memcpy(KEY_HEADER(state), key + CHACHA20_KEY_LEN, CHACHA20_KEY_LEN);
+  return CRYPT_OK;
+}
+
+static int dropbear_chachapoly_crypt(unsigned int seq,
+                                     FAR const unsigned char *in,
+                                     FAR unsigned char *out,
+                                     unsigned long len, unsigned long taglen,
+                                     FAR void *cipher_state,
+                                     int direction)
+{
+  FAR dropbear_chachapoly_state *state = cipher_state;
+  unsigned char key[POLY1305_KEY_LEN];
+  unsigned char tag[POLY1305_TAG_LEN];
+  unsigned char zero[POLY1305_KEY_LEN];
+  int cfd;
+  int ret = CRYPT_ERROR;
+
+  if (len < 4 || taglen != POLY1305_TAG_LEN)
+    {
+      return CRYPT_ERROR;
+    }
+
+  cfd = dropbear_cryptodev_open();
+  if (cfd < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  /* Poly1305 key = first keystream block of the main key at counter 0 */
+
+  memset(zero, 0, sizeof(zero));
+  if (dropbear_chacha(cfd, KEY_MAIN(state), seq, 0, zero, key,
+                      sizeof(key)) != CRYPT_OK)
+    {
+      goto out;
+    }
+
+  if (direction == LTC_DECRYPT)
+    {
+      if (dropbear_poly1305(cfd, key, in, len, tag) != CRYPT_OK)
+        {
+          goto out;
+        }
+
+      if (constant_time_memcmp(in + len, tag, sizeof(tag)) != 0)
+        {
+          goto out;
+        }
+    }
+
+  /* Packet length: header key, counter 0.  Payload: main key, counter 1. */
+
+  if (dropbear_chacha(cfd, KEY_HEADER(state), seq, 0, in, out, 4) !=
+      CRYPT_OK)
+    {
+      goto out;
+    }
+
+  if (dropbear_chacha(cfd, KEY_MAIN(state), seq, 1, in + 4, out + 4,
+                      len - 4) != CRYPT_OK)
+    {
+      goto out;
+    }
+
+  if (direction == LTC_ENCRYPT)
+    {
+      if (dropbear_poly1305(cfd, key, out, len, out + len) != CRYPT_OK)
+        {
+          goto out;
+        }
+    }
+
+  ret = CRYPT_OK;
+
+out:
+  close(cfd);
+  zeromem(key, sizeof(key));
+  zeromem(tag, sizeof(tag));
+  return ret;
+}
+
+static int
+dropbear_chachapoly_getlength(unsigned int seq, FAR const unsigned char *in,
+                              FAR unsigned int *outlen, unsigned long len,
+                              FAR void *cipher_state)
+{
+  FAR dropbear_chachapoly_state *state = cipher_state;
+  unsigned char buf[4];
+  int cfd;
+  int ret;
+
+  if (len < sizeof(buf))
+    {
+      return CRYPT_ERROR;
+    }
+
+  cfd = dropbear_cryptodev_open();
+  if (cfd < 0)
+    {
+      return CRYPT_ERROR;
+    }
+
+  ret = dropbear_chacha(cfd, KEY_HEADER(state), seq, 0, in, buf,
+                        sizeof(buf));
+  close(cfd);
+  if (ret != CRYPT_OK)
+    {
+      return CRYPT_ERROR;
+    }
+
+  LOAD32H(*outlen, buf);
+  return CRYPT_OK;
+}
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const struct dropbear_cipher_mode dropbear_mode_chachapoly =
+{
+  dropbear_chachapoly_start,
+  NULL,
+  NULL,
+  dropbear_chachapoly_crypt,
+  dropbear_chachapoly_getlength,
+  &g_dropbear_chachapoly_mac
+};

From 3ecd036f8f81e89b7f1e5d595e5a961f164003ad Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Sun, 26 Jul 2026 09:48:20 +0200
Subject: [PATCH 537/568] audioutils/lame: Add CMake vector sources.

Add the SSE2 and AVX2 vector implementation files to the CMake libmp3lame target for x86 simulator hosts. LAME's enabled runtime dispatch paths call these functions, so omitting them leaves sim:alsa with unresolved symbols at link time.

Non-x86 simulator hosts continue to use LAME's scalar implementation.

Assisted-by: Zed:GPT-5.6 Terra
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 audioutils/lame/CMakeLists.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/audioutils/lame/CMakeLists.txt b/audioutils/lame/CMakeLists.txt
index 26899b986..a0e04a7d4 100644
--- a/audioutils/lame/CMakeLists.txt
+++ b/audioutils/lame/CMakeLists.txt
@@ -75,7 +75,6 @@ if(CONFIG_AUDIOUTILS_LAME)
       "${SRC_PATH}/libmp3lame/newmdct.c"
       "${SRC_PATH}/libmp3lame/psymodel.c"
       "${SRC_PATH}/libmp3lame/quantize.c"
-      "${SRC_PATH}/libmp3lame/vector/xmm_quantize_sub.c"
       "${SRC_PATH}/libmp3lame/quantize_pvt.c"
       "${SRC_PATH}/libmp3lame/set_get.c"
       "${SRC_PATH}/libmp3lame/vbrquantize.c"
@@ -87,6 +86,18 @@ if(CONFIG_AUDIOUTILS_LAME)
       "${SRC_PATH}/libmp3lame/version.c"
       "${SRC_PATH}/libmp3lame/presets.c")
 
+  if(CONFIG_HOST_X86 OR CONFIG_HOST_X86_64)
+    list(
+      APPEND
+      CSRCS
+      "${SRC_PATH}/libmp3lame/vector/xmm_quantize_sub.c"
+      "${SRC_PATH}/libmp3lame/vector/xmm_choose_table.c"
+      "${SRC_PATH}/libmp3lame/vector/xmm_quantize_lines.c"
+      "${SRC_PATH}/libmp3lame/vector/xmm_calc_sfb_noise.c"
+      "${SRC_PATH}/libmp3lame/vector/avx2_choose_table.c"
+      "${SRC_PATH}/libmp3lame/vector/avx2_quantize_lines.c")
+  endif()
+
   # Add custom target to generate config_h
   set(CONFIG_H_FILE "${CMAKE_CURRENT_SOURCE_DIR}/lame/configure")
   set(CONFIG_OPTIONS

From f2ceac78db76d54b4a2cf8fdc3275edd690d2e50 Mon Sep 17 00:00:00 2001
From: aviralgarg05 <gargaviral99@gmail.com>
Date: Sat, 11 Jul 2026 21:57:50 +0530
Subject: [PATCH 538/568] examples/sotest: support packaged shared library
 fixtures.

Extend the examples/sotest packaging path so the shared-library test
fixtures can also be prepared through nxpkg-style package artifacts.

Generate shared-index.json and pkgsotest.nsh from the built modprint
and sotest shared objects, recording the correct target arch/compat
metadata and SHA-256 digests for the packaged shared-library fixtures.
Allow sotest to run in either its existing builtin-ROMFS flow or from
explicit shared-library paths, with a --mount helper mode for
preparing the builtin test mount separately. Keep the paired fixture
outputs in one grouped make step so parallel builds do not re-enter
the generator independently.

This makes the sotest shared-library example usable as a
package-style fixture producer for the Dynamic ELF/nxpkg series,
useful for validating the shared-library side of the packaging flow
where the loader should consume installed artifacts rather than only
the default builtin test paths. The existing builtin-ROMFS path is
preserved with no regression to the normal sotest example flow.

Assisted-by: Claude:claude-sonnet-5
Assisted-by: OpenAI Codex:gpt-5.6-sol
Signed-off-by: aviralgarg05 <gargaviral99@gmail.com>
---
 examples/sotest/Make.defs                    |   9 +-
 examples/sotest/main/CMakeLists.txt          | 116 ++++-
 examples/sotest/main/Makefile                |  30 +-
 examples/sotest/main/host/CMakeLists.txt     |  26 ++
 examples/sotest/main/mk_pkg_fixture_shared.c | 433 +++++++++++++++++++
 examples/sotest/main/sotest_main.c           |  98 ++++-
 examples/sotest/modprint/CMakeLists.txt      |  25 ++
 examples/sotest/sotest/CMakeLists.txt        |  25 ++
 8 files changed, 730 insertions(+), 32 deletions(-)
 create mode 100644 examples/sotest/main/host/CMakeLists.txt
 create mode 100644 examples/sotest/main/mk_pkg_fixture_shared.c
 create mode 100644 examples/sotest/modprint/CMakeLists.txt
 create mode 100644 examples/sotest/sotest/CMakeLists.txt

diff --git a/examples/sotest/Make.defs b/examples/sotest/Make.defs
index c674e34e6..17afaca43 100644
--- a/examples/sotest/Make.defs
+++ b/examples/sotest/Make.defs
@@ -20,4 +20,11 @@
 #
 ############################################################################
 
-include $(wildcard $(APPDIR)/examples/sotest/*/Make.defs)
+ifeq ($(CONFIG_EXAMPLES_SOTEST),y)
+include $(APPDIR)/examples/sotest/main/Make.defs
+endif
+
+ifneq ($(CONFIG_EXAMPLES_SOTEST),n)
+include $(APPDIR)/examples/sotest/modprint/Make.defs
+include $(APPDIR)/examples/sotest/sotest/Make.defs
+endif
diff --git a/examples/sotest/main/CMakeLists.txt b/examples/sotest/main/CMakeLists.txt
index caca43d22..5c5cef5a6 100644
--- a/examples/sotest/main/CMakeLists.txt
+++ b/examples/sotest/main/CMakeLists.txt
@@ -21,27 +21,107 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_SOTEST)
+  set(SOTEST_SYMTAB ${CMAKE_CURRENT_BINARY_DIR}/sotest_symtab.c)
+  set(SOTEST_ROMFS_IMG ${CMAKE_CURRENT_BINARY_DIR}/sotest_romfs.img)
+  set(SOTEST_ROMFS_SRC ${CMAKE_CURRENT_BINARY_DIR}/sotest_romfs.c)
+  set(SOTEST_MODPRINT_ELF ${CMAKE_BINARY_DIR}/bin/modprint)
+  set(SOTEST_SHARED_ELF ${CMAKE_BINARY_DIR}/bin/sotest)
 
-  # FIXME: fix all empty a after the kernel build is implemented
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sotest_symtab.c
-    COMMAND
-      ${NUTTX_APPS_DIR}/tools/mksymtab.sh ${CMAKE_CURRENT_BINARY_DIR}/empty
-      g_sot > ${CMAKE_CURRENT_BINARY_DIR}/sotest_symtab.c)
-
-  add_custom_target(
-    sotest_romfs
-    COMMAND genromfs -f sotest_romfs.img -d empty
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  # Dynamic applications are wrapped in ELF_* helper targets when the build uses
+  # the non-ELF-capable compiler path.
+  if(CMAKE_C_ELF_COMPILER)
+    set(SOTEST_MODPRINT_TARGET modprint)
+    set(SOTEST_SHARED_TARGET sotest)
+  else()
+    set(SOTEST_MODPRINT_TARGET ELF_modprint)
+    set(SOTEST_SHARED_TARGET ELF_sotest)
+  endif()
 
   add_custom_command(
-    OUTPUT sotest_romfs.c
-    COMMAND xxd -i sotest_romfs.img > sotest_romfs.c
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS sotest_romfs)
+    OUTPUT ${SOTEST_SYMTAB}
+    COMMAND ${NUTTX_APPS_DIR}/tools/mksymtab.sh ${SOTEST_MODPRINT_ELF}
+            ${SOTEST_SHARED_ELF} g_sot > ${SOTEST_SYMTAB}
+    DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET})
 
-  nuttx_add_application(
-    NAME sotest SRCS sotest_main.c ${CMAKE_CURRENT_BINARY_DIR}/sotest_symtab.c
-    ${CMAKE_CURRENT_BINARY_DIR}/sotest_romfs.c)
+  set_source_files_properties(${SOTEST_SYMTAB} PROPERTIES GENERATED TRUE)
 
+  set(SOTEST_GENERATED_OUTPUTS ${SOTEST_SYMTAB})
+  set(SOTEST_SRCS sotest_main.c ${SOTEST_SYMTAB})
+
+  if(CONFIG_EXAMPLES_SOTEST_BUILTINFS)
+    set(SOTEST_ROMFS_DEPS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET})
+
+    if(CONFIG_SYSTEM_NXPKG)
+      set(SOTEST_SHARED_INDEX ${CMAKE_BINARY_DIR}/bin/shared-index.json)
+      set(SOTEST_SHARED_SCRIPT ${CMAKE_BINARY_DIR}/bin/pkgsotest.nsh)
+      set(SOTEST_FIXTURE_HOST_DIR ${CMAKE_CURRENT_BINARY_DIR}/host)
+      set(SOTEST_FIXTURE_HOST_SRC
+          ${CMAKE_CURRENT_SOURCE_DIR}/host/CMakeLists.txt)
+      set(SOTEST_FIXTURE_TOOL
+          ${SOTEST_FIXTURE_HOST_DIR}/mk_pkg_fixture_shared${CMAKE_EXECUTABLE_SUFFIX}
+      )
+
+      if(CONFIG_ARCH_BOARD)
+        set(SOTEST_FIXTURE_COMPAT ${CONFIG_ARCH_BOARD})
+      else()
+        set(SOTEST_FIXTURE_COMPAT ${CONFIG_ARCH_BOARD_CUSTOM_NAME})
+      endif()
+
+      add_custom_command(
+        OUTPUT ${SOTEST_FIXTURE_TOOL}
+        COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/host -B
+                ${SOTEST_FIXTURE_HOST_DIR}
+        COMMAND ${CMAKE_COMMAND} --build ${SOTEST_FIXTURE_HOST_DIR} --target
+                mk_pkg_fixture_shared
+        DEPENDS ${SOTEST_FIXTURE_HOST_SRC}
+                ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture_shared.c
+        VERBATIM)
+
+      add_custom_command(
+        OUTPUT ${SOTEST_SHARED_INDEX} ${SOTEST_SHARED_SCRIPT}
+        COMMAND
+          ${SOTEST_FIXTURE_TOOL} ${SOTEST_MODPRINT_ELF} ${SOTEST_SHARED_ELF}
+          ${SOTEST_SHARED_INDEX} ${SOTEST_SHARED_SCRIPT} ${CONFIG_ARCH}
+          ${SOTEST_FIXTURE_COMPAT}
+        DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET}
+                ${SOTEST_FIXTURE_TOOL}
+        VERBATIM)
+
+      list(APPEND SOTEST_ROMFS_DEPS ${SOTEST_SHARED_INDEX}
+           ${SOTEST_SHARED_SCRIPT})
+    endif()
+
+    add_custom_command(
+      OUTPUT ${SOTEST_ROMFS_IMG}
+      COMMAND genromfs -f ${SOTEST_ROMFS_IMG} -d ${CMAKE_BINARY_DIR}/bin
+      DEPENDS ${SOTEST_ROMFS_DEPS}
+      VERBATIM)
+
+    get_filename_component(SOTEST_ROMFS_IMG_NAME ${SOTEST_ROMFS_IMG} NAME)
+
+    # xxd -i derives the generated array/length symbol names from the exact path
+    # it is given - sotest_main.c declares them as plain
+    # "sotest_romfs_img"/"sotest_romfs_img_len", so xxd must be run against just
+    # the bare filename (via WORKING_DIRECTORY) rather than the absolute
+    # ${SOTEST_ROMFS_IMG} path, or every non- alphanumeric character in that
+    # path (e.g. every "/" in the build directory) gets folded into the symbol
+    # name instead, leaving the names sotest_main.c expects undefined at link
+    # time.
+
+    add_custom_command(
+      OUTPUT ${SOTEST_ROMFS_SRC}
+      COMMAND xxd -i ${SOTEST_ROMFS_IMG_NAME} > ${SOTEST_ROMFS_SRC}
+      DEPENDS ${SOTEST_ROMFS_IMG}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+    set_source_files_properties(${SOTEST_ROMFS_SRC} PROPERTIES GENERATED TRUE)
+
+    list(APPEND SOTEST_GENERATED_OUTPUTS ${SOTEST_ROMFS_SRC})
+    list(APPEND SOTEST_SRCS ${SOTEST_ROMFS_SRC})
+  endif()
+
+  add_custom_target(sotest_artifacts DEPENDS ${SOTEST_GENERATED_OUTPUTS})
+
+  nuttx_add_application(NAME sotest SRCS ${SOTEST_SRCS} DEPENDS
+                        sotest_artifacts)
 endif()
diff --git a/examples/sotest/main/Makefile b/examples/sotest/main/Makefile
index 064b0b434..327b60c9e 100644
--- a/examples/sotest/main/Makefile
+++ b/examples/sotest/main/Makefile
@@ -50,8 +50,34 @@ ifeq ($(CONFIG_EXAMPLES_SOTEST_BUILTINFS),y)
 ROMFSIMG = sotest_romfs.img
 ROMFSSRC = sotest_romfs.c
 ROMFSOBJ = $(ROMFSSRC:.c=$(OBJEXT))
+ifdef CONFIG_SYSTEM_NXPKG
+HOSTOBJSEXT ?= hobj
+PKGSHAREDINDEX = $(BINDIR)/shared-index.json
+PKGSHAREDTEST = $(BINDIR)/pkgsotest.nsh
+PKG_FIXTURE_GEN = mk_pkg_fixture_shared$(HOSTEXEEXT)
+PKG_FIXTURE_SRCS = mk_pkg_fixture_shared.c
+PKG_FIXTURE_OBJS = $(PKG_FIXTURE_SRCS:.c=.$(HOSTOBJSEXT))
+PKG_FIXTURE_OUTPUTS = $(PKGSHAREDINDEX) $(PKGSHAREDTEST)
+PKG_FIXTURE_STAMP = $(BINDIR)/.pkgsotest.stamp
+PKG_FIXTURE_COMPAT = $(if $(CONFIG_ARCH_BOARD),$(CONFIG_ARCH_BOARD),$(CONFIG_ARCH_BOARD_CUSTOM_NAME))
 
-$(ROMFSIMG):
+$(PKG_FIXTURE_OBJS): %.$(HOSTOBJSEXT): %.c
+	@echo "CC:  $<"
+	$(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
+
+$(PKG_FIXTURE_GEN): $(PKG_FIXTURE_OBJS)
+	$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(PKG_FIXTURE_OBJS) -o $@
+
+$(PKG_FIXTURE_OUTPUTS): $(PKG_FIXTURE_STAMP)
+
+$(PKG_FIXTURE_STAMP): $(BINDIR)/modprint $(BINDIR)/sotest $(PKG_FIXTURE_GEN)
+	$(Q) ./$(PKG_FIXTURE_GEN) $(BINDIR)/modprint $(BINDIR)/sotest \
+		$(PKGSHAREDINDEX) $(PKGSHAREDTEST) $(CONFIG_ARCH) \
+		$(PKG_FIXTURE_COMPAT)
+	$(Q) touch $@
+endif
+
+$(ROMFSIMG): $(PKG_FIXTURE_OUTPUTS)
 	$(Q) genromfs -d $(BINDIR) -f $@
 
 $(ROMFSSRC): $(ROMFSIMG)
@@ -67,6 +93,6 @@ postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ)
 	$(call ARLOCK, $(call CONVERT_PATH,$(BIN)), $^)
 
 distclean::
-	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ))
+	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(PKG_FIXTURE_GEN) $(PKG_FIXTURE_OBJS) $(PKG_FIXTURE_STAMP))
 
 include $(APPDIR)/Application.mk
diff --git a/examples/sotest/main/host/CMakeLists.txt b/examples/sotest/main/host/CMakeLists.txt
new file mode 100644
index 000000000..e83524d29
--- /dev/null
+++ b/examples/sotest/main/host/CMakeLists.txt
@@ -0,0 +1,26 @@
+# ##############################################################################
+# apps/examples/sotest/main/host/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+cmake_minimum_required(VERSION 3.16)
+project(sotest_fixture_host LANGUAGES C)
+
+add_executable(mk_pkg_fixture_shared ../mk_pkg_fixture_shared.c)
diff --git a/examples/sotest/main/mk_pkg_fixture_shared.c b/examples/sotest/main/mk_pkg_fixture_shared.c
new file mode 100644
index 000000000..713cd7115
--- /dev/null
+++ b/examples/sotest/main/mk_pkg_fixture_shared.c
@@ -0,0 +1,433 @@
+/****************************************************************************
+ * apps/examples/sotest/main/mk_pkg_fixture_shared.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define SHA256_BLOCK_SIZE 64
+#define SHA256_DIGEST_SIZE 32
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct sha256_state_s
+{
+  uint32_t state[8];
+  uint64_t bitcount;
+  uint8_t buffer[SHA256_BLOCK_SIZE];
+  size_t buffer_len;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const uint32_t g_sha256_init[8] =
+{
+  0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
+  0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+};
+
+static const uint32_t g_sha256_k[64] =
+{
+  0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+  0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+  0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+  0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+  0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+  0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+  0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+  0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+  0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+  0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+  0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+  0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+  0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+  0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+  0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+  0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static uint32_t sha256_rotr(uint32_t value, unsigned int bits)
+{
+  return (value >> bits) | (value << (32 - bits));
+}
+
+static uint32_t sha256_ch(uint32_t x, uint32_t y, uint32_t z)
+{
+  return (x & y) ^ (~x & z);
+}
+
+static uint32_t sha256_maj(uint32_t x, uint32_t y, uint32_t z)
+{
+  return (x & y) ^ (x & z) ^ (y & z);
+}
+
+static uint32_t sha256_bs0(uint32_t x)
+{
+  return sha256_rotr(x, 2) ^ sha256_rotr(x, 13) ^ sha256_rotr(x, 22);
+}
+
+static uint32_t sha256_bs1(uint32_t x)
+{
+  return sha256_rotr(x, 6) ^ sha256_rotr(x, 11) ^ sha256_rotr(x, 25);
+}
+
+static uint32_t sha256_ss0(uint32_t x)
+{
+  return sha256_rotr(x, 7) ^ sha256_rotr(x, 18) ^ (x >> 3);
+}
+
+static uint32_t sha256_ss1(uint32_t x)
+{
+  return sha256_rotr(x, 17) ^ sha256_rotr(x, 19) ^ (x >> 10);
+}
+
+static uint32_t sha256_load32(const uint8_t *src)
+{
+  return ((uint32_t)src[0] << 24) | ((uint32_t)src[1] << 16) |
+         ((uint32_t)src[2] << 8) | (uint32_t)src[3];
+}
+
+static void sha256_store32(uint8_t *dst, uint32_t value)
+{
+  dst[0] = (uint8_t)(value >> 24);
+  dst[1] = (uint8_t)(value >> 16);
+  dst[2] = (uint8_t)(value >> 8);
+  dst[3] = (uint8_t)value;
+}
+
+static void sha256_transform(struct sha256_state_s *ctx,
+                             const uint8_t block[SHA256_BLOCK_SIZE])
+{
+  uint32_t schedule[64];
+  uint32_t a;
+  uint32_t b;
+  uint32_t c;
+  uint32_t d;
+  uint32_t e;
+  uint32_t f;
+  uint32_t g;
+  uint32_t h;
+  int i;
+
+  for (i = 0; i < 16; i++)
+    {
+      schedule[i] = sha256_load32(block + i * 4);
+    }
+
+  for (; i < 64; i++)
+    {
+      schedule[i] = sha256_ss1(schedule[i - 2]) + schedule[i - 7] +
+                    sha256_ss0(schedule[i - 15]) + schedule[i - 16];
+    }
+
+  a = ctx->state[0];
+  b = ctx->state[1];
+  c = ctx->state[2];
+  d = ctx->state[3];
+  e = ctx->state[4];
+  f = ctx->state[5];
+  g = ctx->state[6];
+  h = ctx->state[7];
+
+  for (i = 0; i < 64; i++)
+    {
+      uint32_t t1 = h + sha256_bs1(e) + sha256_ch(e, f, g) + g_sha256_k[i] +
+                    schedule[i];
+      uint32_t t2 = sha256_bs0(a) + sha256_maj(a, b, c);
+
+      h = g;
+      g = f;
+      f = e;
+      e = d + t1;
+      d = c;
+      c = b;
+      b = a;
+      a = t1 + t2;
+    }
+
+  ctx->state[0] += a;
+  ctx->state[1] += b;
+  ctx->state[2] += c;
+  ctx->state[3] += d;
+  ctx->state[4] += e;
+  ctx->state[5] += f;
+  ctx->state[6] += g;
+  ctx->state[7] += h;
+}
+
+static void sha256_init(struct sha256_state_s *ctx)
+{
+  memcpy(ctx->state, g_sha256_init, sizeof(g_sha256_init));
+  ctx->bitcount = 0;
+  ctx->buffer_len = 0;
+}
+
+static void sha256_update(struct sha256_state_s *ctx, const uint8_t *data,
+                          size_t len)
+{
+  ctx->bitcount += (uint64_t)len * 8;
+
+  while (len > 0)
+    {
+      size_t space = SHA256_BLOCK_SIZE - ctx->buffer_len;
+      size_t chunk = len < space ? len : space;
+
+      memcpy(ctx->buffer + ctx->buffer_len, data, chunk);
+      ctx->buffer_len += chunk;
+      data += chunk;
+      len -= chunk;
+
+      if (ctx->buffer_len == SHA256_BLOCK_SIZE)
+        {
+          sha256_transform(ctx, ctx->buffer);
+          ctx->buffer_len = 0;
+        }
+    }
+}
+
+static void sha256_final(struct sha256_state_s *ctx,
+                         uint8_t digest[SHA256_DIGEST_SIZE])
+{
+  uint8_t length_bytes[8];
+  uint8_t padding[SHA256_BLOCK_SIZE] =
+  {
+    0x80
+  };
+
+  int i;
+
+  for (i = 0; i < 8; i++)
+    {
+      length_bytes[7 - i] = (uint8_t)(ctx->bitcount >> (i * 8));
+    }
+
+  if (ctx->buffer_len < 56)
+    {
+      sha256_update(ctx, padding, 56 - ctx->buffer_len);
+    }
+  else
+    {
+      sha256_update(ctx, padding, SHA256_BLOCK_SIZE - ctx->buffer_len);
+      sha256_update(ctx, padding + 1, 56);
+    }
+
+  sha256_update(ctx, length_bytes, sizeof(length_bytes));
+
+  for (i = 0; i < 8; i++)
+    {
+      sha256_store32(digest + i * 4, ctx->state[i]);
+    }
+}
+
+static int sha256_file(const char *path, char *digest_hex, size_t digest_len)
+{
+  struct sha256_state_s ctx;
+  uint8_t digest[SHA256_DIGEST_SIZE];
+  uint8_t buffer[4096];
+  static const char g_hex[] = "0123456789abcdef";
+  FILE *stream;
+  size_t nread;
+  int i;
+
+  if (digest_len < SHA256_DIGEST_SIZE * 2 + 1)
+    {
+      fprintf(stderr, "digest buffer is too small\n");
+      return -1;
+    }
+
+  stream = fopen(path, "rb");
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  sha256_init(&ctx);
+
+  while ((nread = fread(buffer, 1, sizeof(buffer), stream)) > 0)
+    {
+      sha256_update(&ctx, buffer, nread);
+    }
+
+  if (ferror(stream) != 0)
+    {
+      fprintf(stderr, "failed to read %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  fclose(stream);
+  sha256_final(&ctx, digest);
+
+  for (i = 0; i < SHA256_DIGEST_SIZE; i++)
+    {
+      digest_hex[i * 2] = g_hex[digest[i] >> 4];
+      digest_hex[i * 2 + 1] = g_hex[digest[i] & 0x0f];
+    }
+
+  digest_hex[SHA256_DIGEST_SIZE * 2] = '\0';
+  return 0;
+}
+
+static int write_text_file(const char *path, const char *content)
+{
+  FILE *stream = fopen(path, "w");
+
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  if (fputs(content, stream) == EOF)
+    {
+      fprintf(stderr, "failed to write %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  if (fclose(stream) != 0)
+    {
+      fprintf(stderr, "failed to close %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  return 0;
+}
+
+static int write_index_file(const char *path, const char *arch,
+                            const char *compat, const char *modprint_digest,
+                            const char *sotest_digest)
+{
+  FILE *stream = fopen(path, "w");
+
+  if (stream == NULL)
+    {
+      fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  if (fprintf(stream,
+              "{\"_nxpkg_source\":\"/etc/nxpkg/index.json\","
+              "\"packages\":["
+              "{\"name\":\"modprint\",\"version\":\"1.0.0\",\"arch\":\"%s\","
+              "\"compat\":\"%s\","
+              "\"artifact\":\"modprint\","
+              "\"sha256\":\"%s\",\"type\":\"shared-lib\"},"
+              "{\"name\":\"modprint\",\"version\":\"9.9.9\","
+              "\"arch\":\"arm\","
+              "\"compat\":\"stm32f4discovery\","
+              "\"artifact\":\"modprint\","
+              "\"sha256\":\"%s\",\"type\":\"shared-lib\"},"
+              "{\"name\":\"sotest\",\"version\":\"1.0.0\",\"arch\":\"%s\","
+              "\"compat\":\"%s\",\"artifact\":\"sotest\","
+              "\"sha256\":\"%s\",\"type\":\"shared-lib\"},"
+              "{\"name\":\"sotest\",\"version\":\"9.9.9\",\"arch\":\"arm\","
+              "\"compat\":\"stm32f4discovery\","
+              "\"artifact\":\"sotest\","
+              "\"sha256\":\"%s\",\"type\":\"shared-lib\"}"
+              "]}\n",
+              arch, compat, modprint_digest, modprint_digest, arch, compat,
+              sotest_digest, sotest_digest) < 0)
+    {
+      fprintf(stderr, "failed to write %s: %s\n", path, strerror(errno));
+      fclose(stream);
+      return -1;
+    }
+
+  if (fclose(stream) != 0)
+    {
+      fprintf(stderr, "failed to close %s: %s\n", path, strerror(errno));
+      return -1;
+    }
+
+  return 0;
+}
+
+static void usage(const char *progname)
+{
+  fprintf(stderr,
+          "usage: %s <modprint-bin> <sotest-bin> <shared-index-json> "
+          "<pkgsotest-nsh> <arch> <compat>\n",
+          progname);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  char modprint_digest[SHA256_DIGEST_SIZE * 2 + 1];
+  char sotest_digest[SHA256_DIGEST_SIZE * 2 + 1];
+  static const char g_pkgsotest[] =
+    "mount -t tmpfs /etc\n"
+    "mount -t tmpfs /var\n"
+    "mkdir /etc/nxpkg\n"
+    "cp /mnt/sotest/romfs/shared-index.json /etc/nxpkg/index.json\n"
+    "cp /mnt/sotest/romfs/modprint /etc/nxpkg/modprint\n"
+    "cp /mnt/sotest/romfs/sotest /etc/nxpkg/sotest\n"
+    "mkdir /var/lib\n"
+    "mkdir /var/lib/nxpkg\n"
+    "cp /mnt/sotest/romfs/shared-index.json /var/lib/nxpkg/index.jsn\n"
+    "nxpkg install modprint\n"
+    "nxpkg install sotest\n"
+    "cp /var/lib/nxpkg/pkgs/modprint/1.0.0/modprint /etc/m\n"
+    "cp /var/lib/nxpkg/pkgs/sotest/1.0.0/sotest /etc/s\n"
+    "sotest /etc/m /etc/s\n"
+    "nxpkg list\n";
+
+  if (argc != 7)
+    {
+      usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+
+  if (sha256_file(argv[1], modprint_digest, sizeof(modprint_digest)) < 0 ||
+      sha256_file(argv[2], sotest_digest, sizeof(sotest_digest)) < 0 ||
+      write_index_file(argv[3], argv[5], argv[6], modprint_digest,
+                       sotest_digest) < 0 ||
+      write_text_file(argv[4], g_pkgsotest) < 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;
+}
diff --git a/examples/sotest/main/sotest_main.c b/examples/sotest/main/sotest_main.c
index 0d399568f..6b2417ddb 100644
--- a/examples/sotest/main/sotest_main.c
+++ b/examples/sotest/main/sotest_main.c
@@ -82,6 +82,21 @@
 
 #define SOTEST_DEVPATH_FMT "/dev/ram%d"
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void sotest_show_usage(FAR const char *progname)
+{
+#if CONFIG_LIBC_ELF_MAXDEPEND > 0
+  fprintf(stderr,
+          "Usage: %s [--mount] [<modprint-path> <sotest-path>]\n",
+          progname);
+#else
+  fprintf(stderr, "Usage: %s [--mount] [<sotest-path>]\n", progname);
+#endif
+}
+
 /****************************************************************************
  * Symbols from Auto-Generated Code
  ****************************************************************************/
@@ -104,7 +119,11 @@ extern const int g_sot_nexports;
 
 int main(int argc, FAR char *argv[])
 {
+  FAR const char *modprint_path = NULL;
+  FAR const char *sotest_path = NULL;
+  bool mount_only = false;
 #ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS
+  bool mounted_builtinfs = false;
   char devname[32];
 #endif
 #if CONFIG_LIBC_ELF_MAXDEPEND > 0
@@ -117,6 +136,38 @@ int main(int argc, FAR char *argv[])
 #ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS
   struct boardioc_romdisk_s desc;
 #endif
+
+#if CONFIG_LIBC_ELF_MAXDEPEND > 0
+  if (argc == 2 && strcmp(argv[1], "--mount") == 0)
+    {
+      mount_only = true;
+    }
+  else if (argc == 3)
+    {
+      modprint_path = argv[1];
+      sotest_path = argv[2];
+    }
+  else if (argc != 1)
+    {
+      sotest_show_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+#else
+  if (argc == 2 && strcmp(argv[1], "--mount") == 0)
+    {
+      mount_only = true;
+    }
+  else if (argc == 2)
+    {
+      sotest_path = argv[1];
+    }
+  else if (argc != 1)
+    {
+      sotest_show_usage(argv[0]);
+      return EXIT_FAILURE;
+    }
+#endif
+
   /* Set the shared library symbol table */
 
   ret = dlsymtab((FAR struct symtab_s *)g_sot_exports, g_sot_nexports);
@@ -127,6 +178,8 @@ int main(int argc, FAR char *argv[])
     }
 
 #ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS
+  if (sotest_path == NULL || mount_only)
+    {
   /* Create a ROM disk for the ROMFS filesystem */
 
   desc.minor    = 0;                                   /* Minor device number of the ROM disk. */
@@ -168,28 +221,48 @@ int main(int argc, FAR char *argv[])
               devname, BINDIR, strerror(errno));
       exit(EXIT_FAILURE);
     }
+
+      mounted_builtinfs = true;
+    }
 #endif /* CONFIG_EXAMPLES_SOTEST_BUILTINFS */
 
+  if (mount_only)
+    {
+      return EXIT_SUCCESS;
+    }
+
+#if CONFIG_LIBC_ELF_MAXDEPEND > 0
+  if (modprint_path == NULL)
+    {
+      modprint_path = BINDIR "/modprint";
+    }
+#endif
+
+  if (sotest_path == NULL)
+    {
+      sotest_path = BINDIR "/sotest";
+    }
+
 #if CONFIG_LIBC_ELF_MAXDEPEND > 0
   /* Install the first test shared library.  The first shared library only
    * verifies that symbols exported by one shared library can be used to
    * resolve undefined symbols in a second shared library.
    */
 
-  handle1 = dlopen(BINDIR "/modprint", RTLD_NOW | RTLD_LOCAL);
+  handle1 = dlopen(modprint_path, RTLD_NOW | RTLD_LOCAL);
   if (handle1 == NULL)
     {
-      fprintf(stderr, "ERROR: dlopen(%s/modprint) failed\n", BINDIR);
+      fprintf(stderr, "ERROR: dlopen(%s) failed\n", modprint_path);
       exit(EXIT_FAILURE);
     }
 #endif
 
   /* Install the second test shared library  */
 
-  handle2 = dlopen(BINDIR "/sotest", RTLD_NOW | RTLD_LOCAL);
+  handle2 = dlopen(sotest_path, RTLD_NOW | RTLD_LOCAL);
   if (handle2 == NULL)
     {
-      fprintf(stderr, "ERROR: dlopen(%s/sotest) failed\n", BINDIR);
+      fprintf(stderr, "ERROR: dlopen(%s) failed\n", sotest_path);
       exit(EXIT_FAILURE);
     }
 
@@ -288,15 +361,18 @@ int main(int argc, FAR char *argv[])
 #endif
 
 #ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS
-  ret = umount(BINDIR);
-  if (ret < 0)
+  if (mounted_builtinfs)
     {
-      fprintf(stderr, "ERROR: umount(%s) failed: %d\n",
-              BINDIR, errno);
-      exit(EXIT_FAILURE);
-    }
+      ret = umount(BINDIR);
+      if (ret < 0)
+        {
+          fprintf(stderr, "ERROR: umount(%s) failed: %d\n",
+                  BINDIR, errno);
+          exit(EXIT_FAILURE);
+        }
 
-  unlink(devname);
+      unlink(devname);
+    }
 #endif /* CONFIG_EXAMPLES_SOTEST_BUILTINFS */
 
   return EXIT_SUCCESS;
diff --git a/examples/sotest/modprint/CMakeLists.txt b/examples/sotest/modprint/CMakeLists.txt
new file mode 100644
index 000000000..0fbeef868
--- /dev/null
+++ b/examples/sotest/modprint/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ##############################################################################
+# apps/examples/sotest/modprint/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_SOTEST)
+  nuttx_add_application(NAME modprint SRCS modprint.c DYNLIB y)
+endif()
diff --git a/examples/sotest/sotest/CMakeLists.txt b/examples/sotest/sotest/CMakeLists.txt
new file mode 100644
index 000000000..d4f30c1c5
--- /dev/null
+++ b/examples/sotest/sotest/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ##############################################################################
+# apps/examples/sotest/sotest/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_SOTEST)
+  nuttx_add_application(NAME sotest SRCS sotest.c DYNLIB y)
+endif()

From 8d5e9f3754128c2b9bca911af062ded9c7987d60 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Sun, 26 Jul 2026 13:35:43 -0300
Subject: [PATCH 539/568] system/readline: Fix small issues

This PR fixes some small issues raised by Xiang Xiao.

Signed-off-by: Alan C. Assis <acassis@gmail.com>
---
 system/readline/Kconfig           |   2 +-
 system/readline/readline_common.c | 192 ++++++++++++------------------
 2 files changed, 80 insertions(+), 114 deletions(-)

diff --git a/system/readline/Kconfig b/system/readline/Kconfig
index f4aa5612c..e4281ad8a 100644
--- a/system/readline/Kconfig
+++ b/system/readline/Kconfig
@@ -56,7 +56,7 @@ endif # READLINE_TABCOMPLETION
 
 config READLINE_EDIT
 	bool "Command line editing"
-	default y if !DEFAULT_SMALL
+	default !DEFAULT_SMALL
 	---help---
 		Build in support for full command-line editing using cursor keys,
 		Home/End, Delete. Requires a VT100/ANSI-compatible terminal.
diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index b7981a307..1642e035e 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -49,6 +49,23 @@
 #  define RL_CMDHIST_LINELEN    CONFIG_READLINE_CMD_HISTORY_LINELEN
 #endif
 
+#ifdef CONFIG_READLINE_EDIT_EMACS
+/* Emacs-style control key codes */
+
+#  define CTRL_A  1   /* ^A - Home */
+#  define CTRL_B  2   /* ^B - Left */
+#  define CTRL_D  4   /* ^D - Delete at cursor */
+#  define CTRL_E  5   /* ^E - End */
+#  define CTRL_F  6   /* ^F - Right */
+#  define CTRL_K  11  /* ^K - Kill to end of line */
+#  define CTRL_U  21  /* ^U - Kill to beginning of line */
+#  define CTRL_W  23  /* ^W - Kill word backward */
+#  ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
+#    define CTRL_G  7   /* ^G - Cancel incremental search */
+#    define CTRL_R  18  /* ^R - Reverse incremental search */
+#  endif
+#endif
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -84,23 +101,6 @@ static const char g_curright[] =
                                   };
 #endif
 
-#ifdef CONFIG_READLINE_EDIT_EMACS
-/* Emacs-style control key codes */
-
-#  define CTRL_A  1   /* ^A - Home */
-#  define CTRL_B  2   /* ^B - Left */
-#  define CTRL_D  4   /* ^D - Delete at cursor */
-#  define CTRL_E  5   /* ^E - End */
-#  define CTRL_F  6   /* ^F - Right */
-#  define CTRL_K  11  /* ^K - Kill to end of line */
-#  define CTRL_U  21  /* ^U - Kill to beginning of line */
-#  define CTRL_W  23  /* ^W - Kill word backward */
-#  ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
-#    define CTRL_G  7   /* ^G - Cancel incremental search */
-#    define CTRL_R  18  /* ^R - Reverse incremental search */
-#  endif
-#endif
-
 #if defined(CONFIG_READLINE_TABCOMPLETION) || defined(CONFIG_READLINE_EDIT)
 /* Prompt string to present at the beginning of the line.  Needed by tab
  * completion (to reprint the prompt after listing multiple matches) and
@@ -526,16 +526,26 @@ static int word_skip(FAR const char *buf, int cursor, int bound,
   if (forward)
     {
       while (cursor < bound && buf[cursor] != ' ')
-        cursor++;
+        {
+          cursor++;
+        }
+
       while (cursor < bound && buf[cursor] == ' ')
-        cursor++;
+        {
+          cursor++;
+        }
     }
   else
     {
       while (cursor > bound && buf[cursor - 1] == ' ')
-        cursor--;
+        {
+          cursor--;
+        }
+
       while (cursor > bound && buf[cursor - 1] != ' ')
-        cursor--;
+        {
+          cursor--;
+        }
     }
 
   return cursor;
@@ -637,8 +647,8 @@ static void redraw_tail(FAR struct rl_common_s *vtbl, FAR const char *buf,
  ****************************************************************************/
 
 static void isearch_redraw(FAR struct rl_common_s *vtbl,
-                            FAR const char *search, int searchlen,
-                            FAR const char *buf, int nch, bool failed)
+                           FAR const char *search, int searchlen,
+                           FAR const char *buf, int nch, bool failed)
 {
   static const char matchlabel[] = "(reverse-i-search)`";
   static const char faillabel[]  = "(failed reverse-i-search)`";
@@ -847,7 +857,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
   int i;
 #endif
 #ifdef CONFIG_READLINE_EDIT
-  volatile int cursor;
+  int cursor;
 #endif
 #ifdef CONFIG_READLINE_EDIT_EMACS_REVERSE_SEARCH
   bool insearch;
@@ -933,7 +943,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                */
 
               bool found = isearch_find(search, searchlen, searchoffset,
-                                         &searchoffset, buf, buflen, &nch);
+                                        &searchoffset, buf, buflen, &nch);
 #  ifdef CONFIG_READLINE_ECHO
               isearch_redraw(vtbl, search, searchlen, buf, nch, !found);
 #  endif
@@ -948,7 +958,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                   if (searchlen > 0)
                     {
                       isearch_find(search, searchlen, searchoffset,
-                                    &searchoffset, buf, buflen, &nch);
+                                   &searchoffset, buf, buflen, &nch);
                     }
                   else
                     {
@@ -958,7 +968,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 
 #  ifdef CONFIG_READLINE_ECHO
               isearch_redraw(vtbl, search, searchlen, buf, nch,
-                              searchlen > 0 && nch == 0);
+                             searchlen > 0 && nch == 0);
 #  endif
             }
           else if (ch == CTRL_G || ch == ASCII_ETX)  /* ^G or ^C: cancel */
@@ -1008,7 +1018,7 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
               searchoffset = 1;
 
               bool found = isearch_find(search, searchlen, searchoffset,
-                                         &searchoffset, buf, buflen, &nch);
+                                        &searchoffset, buf, buflen, &nch);
 #  ifdef CONFIG_READLINE_ECHO
               isearch_redraw(vtbl, search, searchlen, buf, nch, !found);
 #  endif
@@ -1053,27 +1063,11 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                     }
 
 #  ifdef CONFIG_READLINE_ECHO
-                  /* Delete arrives as the 4-byte sequence "ESC [ 3 ~".
-                   * Some serial drivers only know how to suppress
-                   * local echo for fixed 3-byte "ESC [ x" sequences
-                   * and leak the trailing '~' as a literal character,
-                   * silently advancing the terminal's real cursor by
-                   * one column.  redraw_line() is immune to this (and
-                   * to any other such drift) because it always
-                   * returns to column 0 with '\r' first, rather than
-                   * assuming where the cursor currently is -- unlike
-                   * a plain erase-and-rewrite-the-tail redraw, which
-                   * only works relative to the cursor's last known
-                   * position and has no way to recover if that
-                   * assumption turns out to be wrong.
-                   *
-                   * This redraw is unconditional -- even when there
-                   * was nothing to delete (cursor already at the true
-                   * end, including an empty line) -- specifically so
-                   * it also cleans up a leaked '~' in that case; only
-                   * skipping the redraw when there is "nothing to do"
-                   * is exactly what left a stray '~' visible on
-                   * screen with an unpatched driver.
+                  /* Delete ("ESC [ 3 ~") may leave a stray '~' on
+                   * terminals that do not fully suppress local echo.
+                   * Always use redraw_line(), even if nothing was
+                   * deleted, to resync the cursor and clear any leaked
+                   * characters.
                    */
 
                   redraw_line(vtbl, buf, nch, cursor);
@@ -1171,18 +1165,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
               continue;
             }
 
-          /* Some terminals (e.g. xterm) use the SS3 introducer "ESC O"
-           * rather than CSI "ESC [" for Home/End (and, in application
-           * cursor key mode, for the arrow keys too).  Recognize the
-           * "ESC O" prefix here and fall into exactly the same
-           * "terminator character" handling used for "ESC [ <x>" below,
-           * by advancing to a dedicated state (6) that is treated the
-           * same way state 2 (saw "ESC [") is treated once the final
-           * byte arrives.  Without this, the 'O' is silently dropped
-           * (falling through the unrecognized-sequence path below) and
-           * the *next* byte (e.g. 'F' for End, 'H' for Home) is left to
-           * be reprocessed as an ordinary printable character, which is
-           * what produced the stray inserted "OF"/"OH" text.
+          /* Recognize SS3 ("ESC O") escape sequences used by some
+           * terminals (e.g. xterm) for Home/End and application cursor
+           * keys, handling them the same as CSI ("ESC [") to avoid
+           * inserting stray "OH"/"OF" characters into the input.
            */
 
           if (escape == 1 && ch == ASCII_O)
@@ -1231,21 +1217,11 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
                         }
                     }
 
-                  /* Clear out current command from the prompt.
-                   *
-                   * This cannot assume the terminal's cursor is
-                   * sitting at the end of the currently displayed
-                   * text (i.e. at column 'nch') and simply backspace
-                   * 'nch' times -- the cursor can be anywhere in the
-                   * line (e.g. the user pressed Left one or more
-                   * times before pressing Up/Down again), and
-                   * backspacing more times than the cursor's actual
-                   * distance from the end of the prompt walks back
-                   * into and erases part of the prompt itself.
-                   * Instead, return to the true start of the
-                   * terminal line and erase to the end of line, then
-                   * reprint the prompt -- this does not depend on
-                   * where the cursor happened to be.
+                  /* Clear the current command safely regardless of the
+                   * cursor position. Move to the start of the line,
+                   * erase to end-of-line, and redraw the prompt,
+                   * avoiding accidental deletion of prompt characters
+                   * when the cursor is not at the command end.
                    */
 
                   nch = 0;
@@ -1418,7 +1394,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
             {
               int k;
               for (k = cursor; k < nch; k++)
-                buf[k - 1] = buf[k];
+                {
+                  buf[k - 1] = buf[k];
+                }
+
               cursor--;
               nch--;
 
@@ -1483,7 +1462,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
             {
               int k;
               for (k = cursor + 1; k < nch; k++)
-                buf[k - 1] = buf[k];
+                {
+                  buf[k - 1] = buf[k];
+                }
+
               nch--;
               redraw_tail(vtbl, buf, nch, cursor);
             }
@@ -1514,7 +1496,10 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
         {
           int j;
           for (j = cursor; j < nch; j++)
-            buf[j - cursor] = buf[j];
+            {
+              buf[j - cursor] = buf[j];
+            }
+
           nch -= cursor;
           cursor = 0;
           buf[nch] = '\0';
@@ -1525,23 +1510,18 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
           int start, k;
           start = word_skip(buf, cursor, 0, false);
           for (k = cursor; k < nch; k++)
-            buf[k - (cursor - start)] = buf[k];
+            {
+              buf[k - (cursor - start)] = buf[k];
+            }
+
           nch -= (cursor - start);
           cursor = start;
           buf[nch] = '\0';
 
-          /* Unlike Ctrl+K (which never moves the cursor, so erasing
-           * from wherever it already is is correct) and Backspace
-           * (which moves it by exactly one column and compensates
-           * with a single explicit backspace byte), Ctrl+W can move
-           * the cursor back by any number of columns depending on how
-           * long the killed word was.  redraw_tail() has no way to
-           * express "also move left by N first"; it just erases from
-           * wherever the terminal's cursor already happens to be.
-           * Using redraw_line() instead sidesteps the whole problem
-           * the same way it does for Delete: it returns to column 0
-           * with '\r' first, so it is correct regardless of how far
-           * the cursor moved.
+          /* Unlike Ctrl+K, Ctrl+W moves the cursor back by a variable
+           * number of columns. Use redraw_line() instead of
+           * redraw_tail() so the line is redrawn correctly regardless
+           * of the cursor position, matching Delete handling.
            */
 
           redraw_line(vtbl, buf, nch, cursor);
@@ -1638,34 +1618,20 @@ ssize_t readline_common(FAR struct rl_common_s *vtbl, FAR char *buf,
 #ifdef CONFIG_READLINE_TABCOMPLETION
       else if (ch == '\t') /* TAB character */
         {
-          /* When tab_completion() finds a match (or lists several), it
-           * always leaves the terminal's real cursor at the end of the
-           * (possibly completed) line -- either by echoing the
-           * appended characters one at a time, or, when it lists
-           * multiple matches, by reprinting the prompt and the whole
-           * buffer from scratch.  'cursor' has to be resynced to
-           * match in that case, or the very next Left/Right/Home/End
-           * keypress will move the terminal's cursor from column
-           * 'nch' while still believing it is moving from wherever
-           * 'cursor' was left (typically the length of the word
-           * before completion) -- the two then stay out of sync for
-           * the rest of the line.
-           *
-           * But if there was no match at all, tab_completion() does
-           * not touch the terminal or the buffer, and 'cursor' must
-           * be left exactly where it was -- unconditionally resyncing
-           * it here would be just as wrong as never resyncing it,
-           * only in the opposite direction.
+          /* tab_completion() leaves the terminal cursor at the end of
+           * the line whenever it modifies or redraws the input, so
+           * resync 'cursor' in that case. If no completion occurred,
+           * leave 'cursor' unchanged to preserve its current position.
            */
 
-#  ifdef CONFIG_READLINE_EDIT
           if (tab_completion(vtbl, buf, buflen, &nch))
+#  ifdef CONFIG_READLINE_EDIT
             {
               cursor = nch;
             }
-#  else
-          tab_completion(vtbl, buf, buflen, &nch);
+
 #  endif
+        ; /* keep this ';' to close the if() if no CONFIG_READLINE_EDIT */
         }
 #endif
     }

From fabafbc3615b3d22636bbf33f932578f491bef23 Mon Sep 17 00:00:00 2001
From: Junbo Zheng <zhengjunbo1@xiaomi.com>
Date: Fri, 24 Jul 2026 23:47:44 +0800
Subject: [PATCH 540/568] nshlib: add relative image path support in boot
 command

cmd_boot passed the image path straight to boardctl(), which resolves
it in a context that does not inherit the NSH shell cwd, so relative
paths failed and only absolute paths worked. Use nsh_getfullpath() to
resolve relative paths against the cwd before calling boardctl().

Signed-off-by: Junbo Zheng <zhengjunbo1@xiaomi.com>
---
 nshlib/nsh_syscmds.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nshlib/nsh_syscmds.c b/nshlib/nsh_syscmds.c
index 88db8c913..15ca82c46 100644
--- a/nshlib/nsh_syscmds.c
+++ b/nshlib/nsh_syscmds.c
@@ -405,6 +405,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 int cmd_boot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   struct boardioc_boot_info_s info;
+  FAR char *fullpath = NULL;
 
   memset(&info, 0, sizeof(info));
 
@@ -421,7 +422,8 @@ int cmd_boot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
         /* Go through */
 
       case 1:
-        info.path = argv[1];
+        fullpath = nsh_getfullpath(vtbl, argv[1]);
+        info.path = fullpath;
 
         /* Go through */
 
@@ -439,6 +441,7 @@ int cmd_boot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
    */
 
   nsh_error(vtbl, g_fmtcmdfailed, argv[0], "boardctl", NSH_ERRNO);
+  nsh_freefullpath(fullpath);
   return ERROR;
 }
 #endif

From 57e761f7242254e0a15d498972d87704c709b07e Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Sun, 26 Jul 2026 17:00:11 +0200
Subject: [PATCH 541/568] build: Omit default priority ELF symbol.

Do not define nx_priority for applications that use SCHED_PRIORITY_DEFAULT. The ELF loader already uses its scheduler default when the symbol is absent, avoiding the invalid priority-zero value previously encoded by Application.mk.

Keep emitting nx_priority, and retaining it through stripping, for explicit numeric priorities.

Assisted-by: Zed:GPT-5.6 Terra
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 Application.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Application.mk b/Application.mk
index d950f698c..bc83121a9 100644
--- a/Application.mk
+++ b/Application.mk
@@ -146,10 +146,9 @@ ifneq ($(strip $(PROGNAME)),)
   # CONFIG_SCHED_USER_IDENTITY) so the binary loader can recover them.
   # Per-target so each PROGLIST entry picks up its own STACKSIZE_/PRIORITY_.
 
-  $(PROGLIST): SYM_PRIORITY = $(if $(filter SCHED_PRIORITY_DEFAULT,$(PRIORITY_$@)),0,$(PRIORITY_$@))
   $(PROGLIST): MODLDFLAGS += \
     $(if $(STACKSIZE_$@),--defsym nx_stacksize=$(STACKSIZE_$@)) \
-    $(if $(PRIORITY_$@),--defsym nx_priority=$(SYM_PRIORITY))
+    $(if $(filter-out SCHED_PRIORITY_DEFAULT,$(PRIORITY_$@)),--defsym nx_priority=$(PRIORITY_$@))
 ifeq ($(CONFIG_SCHED_USER_IDENTITY),y)
   $(PROGLIST): MODLDFLAGS += \
     $(if $(UID_$@),--defsym nx_uid=$(UID_$@)) \
@@ -159,7 +158,7 @@ endif
 
   # Keep the attribute symbols through --strip-unneeded so the binary loader
   # can still read them from the stripped runtime image in bin/.
-  $(PROGLIST): NX_KEEP = $(if $(STACKSIZE_$@),-K nx_stacksize) $(if $(PRIORITY_$@),-K nx_priority) $(if $(UID_$@),-K nx_uid) $(if $(GID_$@),-K nx_gid) $(if $(MODE_$@),-K nx_mode)
+  $(PROGLIST): NX_KEEP = $(if $(STACKSIZE_$@),-K nx_stacksize) $(if $(filter-out SCHED_PRIORITY_DEFAULT,$(PRIORITY_$@)),-K nx_priority) $(if $(UID_$@),-K nx_uid) $(if $(GID_$@),-K nx_gid) $(if $(MODE_$@),-K nx_mode)
 endif
 
 # Condition flags

From a5c0e9c188cb1f4a4feb7e812651e8505904a1da Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Tue, 21 Jul 2026 13:04:04 -0400
Subject: [PATCH 542/568] apps/games/NXDoom: Add support for RTTTL DOOM theme

Implements and RTTTL player music module to play the DOOM theme song
over RTTTL.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/Kconfig             |  19 ++
 games/NXDoom/Makefile            |   6 +
 games/NXDoom/src/i_rtttl_music.c | 522 +++++++++++++++++++++++++++++++
 games/NXDoom/src/i_sound.c       |  22 +-
 games/NXDoom/src/i_sound.h       |   8 +-
 5 files changed, 567 insertions(+), 10 deletions(-)
 create mode 100644 games/NXDoom/src/i_rtttl_music.c

diff --git a/games/NXDoom/Kconfig b/games/NXDoom/Kconfig
index cbf47a97a..5b82b7633 100644
--- a/games/NXDoom/Kconfig
+++ b/games/NXDoom/Kconfig
@@ -107,6 +107,25 @@ config GAMES_NXDOOM_SOUND
 	---help---
 		Not ported! Will not work.
 
+if GAMES_NXDOOM_SOUND
+
+config GAMES_NXDOOM_RTTTL_MUSIC
+	bool "RTTTL music"
+	default n
+	depends on AUDIOUTILS_RTTTL_C
+	depends on !DISABLE_PTHREAD
+	---help---
+		Play music using RTTTL.
+
+config GAMES_NXDOOM_RTTTL_DEVICE
+	string "RTTTL device"
+	default "/dev/pwm0"
+	depends on GAMES_NXDOOM_RTTTL_MUSIC
+	---help---
+		Device for RTTTL output (only PWM currently supported).
+
+endif # GAMES_NXDOOM_SOUND
+
 comment "Graphics options"
 
 config GAMES_NXDOOM_FBPATH
diff --git a/games/NXDoom/Makefile b/games/NXDoom/Makefile
index 45df1a6de..b22390654 100644
--- a/games/NXDoom/Makefile
+++ b/games/NXDoom/Makefile
@@ -198,6 +198,12 @@ CSRCS += $(DOOMSRCDIR)/s_sound.c
 CSRCS += $(DOOMSRCDIR)/deh_sound.c
 endif
 
+# If we have chosen RTTTL music, then add that source
+
+ifeq ($(CONFIG_GAMES_NXDOOM_RTTTL_MUSIC),y)
+CSRCS += $(COMMONSRCDIR)/i_rtttl_music.c
+endif
+
 MAINSRC  = $(COMMONSRCDIR)/i_main.c
 
 include $(APPDIR)/Application.mk
diff --git a/games/NXDoom/src/i_rtttl_music.c b/games/NXDoom/src/i_rtttl_music.c
new file mode 100644
index 000000000..78dd7122c
--- /dev/null
+++ b/games/NXDoom/src/i_rtttl_music.c
@@ -0,0 +1,522 @@
+/****************************************************************************
+ * apps/games/NXDoom/src/i_rtttl_music.c
+ *
+ * SPDX-License-Identifier: GPLv2
+ *
+ * Copyright(C) 1993-1996 Id Software, Inc.
+ * Copyright(C) 2005-2014 Simon Howard
+ *
+ * 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.
+ *
+ * DESCRIPTION:
+ *  System interface for music.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include "i_glob.h"
+
+#include "config.h"
+#include "doomtype.h"
+#include "memio.h"
+#include "mus2mid.h"
+
+#include "deh_str.h"
+#include "gusconf.h"
+#include "i_sound.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "m_argv.h"
+#include "m_config.h"
+#include "m_misc.h"
+#include "sha1.h"
+#include "w_wad.h"
+#include "z_zone.h"
+
+#ifdef CONFIG_PWM
+#include <nuttx/timers/pwm.h>
+#endif
+
+#include <audioutils/rtttl.h>
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static boolean i_rtttl_init_music(void);
+static void i_rtttl_shutdown_music(void);
+static void i_rtttl_set_music_volume(int volume);
+static void i_rtttl_pause_song(void);
+static void i_rtttl_resume_song(void);
+static void *i_rtttl_register_song(void *data, int len);
+static void i_rtttl_unregister_song(void *handle);
+static void i_rtttl_play_song(void *handle, boolean looping);
+static void i_rtttl_stop_song(void);
+static boolean i_rtttl_musicisplaying(void);
+static void i_rtttl_pollmusic(void);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+const char g_doom_rtttl[] =
+  "Doom:d=32,o=5,b=56:f,f,f6,f,f,d#6,f,f,c#6,f,f,b,f,f,c6,c#6,f,f,f6,f,f,d#"
+  "6,f,f,c#6,f,f,8b.,f,f,f6,f,f,d#6,f,f,c#6,f,f,b,f,f,c6,c#6,f,f,f6,f,f,d#"
+  "6,f,f,c#6,f,f,8b.,a#,a#,a#6,a#,a#,g#6,a#,a#,f#6,a#,a#,e6,a#,a#,f6,f#6,a#"
+  ",a#,a#6,a#,a#,g#6,a#,a#,f#6,a#,a#,8e6";
+
+/* List of sound devices that this sound module is used for.
+ * It appears in i_sound.c that the default music device is 'SNDDEVICE_SB',
+ * so I have just put that here. In reality, we may either wish to add an
+ * additional sound device for RTTL, or put this as something else
+ * (PCSPEAKER?). I don't know what most of the snddevice_t enum options
+ * refer to.
+ */
+
+static const snddevice_t g_rtttl_sound_devices[] =
+{
+  SNDDEVICE_SB,
+};
+
+/* Player state */
+
+static void (*g_player)(struct rtttl_tone);
+static int g_fd = -1;
+static bool g_playing = false;
+static bool g_loop = true;
+
+/* Player thread state */
+
+static pthread_t g_thread;
+static pthread_mutex_t g_player_lock;
+static pthread_cond_t g_pausecond;
+static pthread_cond_t g_playingcond;
+static bool g_paused;
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const music_module_t g_rtttl_music_module =
+{
+  .sound_devices = g_rtttl_sound_devices,
+  .num_sound_devices = arrlen(g_rtttl_sound_devices),
+  .init = i_rtttl_init_music,
+  .shutdown = i_rtttl_shutdown_music,
+  .set_music_volume = i_rtttl_set_music_volume,
+  .pause_music = i_rtttl_pause_song,
+  .resume_music = i_rtttl_resume_song,
+  .register_song = i_rtttl_register_song,
+  .unregister_song = i_rtttl_unregister_song,
+  .play_song = i_rtttl_play_song,
+  .stop_song = i_rtttl_stop_song,
+  .music_is_playing = i_rtttl_musicisplaying,
+  .poll = i_rtttl_pollmusic,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: wait_while_paused
+ *
+ * Description:
+ *   Wait while the music is paused.
+ *
+ ****************************************************************************/
+
+static void wait_while_paused(void)
+{
+  pthread_mutex_lock(&g_player_lock);
+
+  while (g_paused)
+    {
+      pthread_cond_wait(&g_pausecond, &g_player_lock);
+    }
+
+  pthread_mutex_unlock(&g_player_lock);
+}
+
+/****************************************************************************
+ * Name: wait_while_stopped
+ *
+ * Description:
+ *   Wait until we are told that a song is started (i.e. while song stopped
+ *   and nothing is playing).
+ *
+ ****************************************************************************/
+
+static void wait_while_stopped(void)
+{
+  pthread_mutex_lock(&g_player_lock);
+
+  while (!g_playing)
+    {
+      pthread_cond_wait(&g_playingcond, &g_player_lock);
+    }
+
+  pthread_mutex_unlock(&g_player_lock);
+}
+
+/****************************************************************************
+ * Name: play_default
+ *
+ * Description:
+ *   Default player which does nothing.
+ *
+ * Input Parameters:
+ *   sound - The sound to play
+ *
+ ****************************************************************************/
+
+static void play_default(struct rtttl_tone sound)
+{
+  wait_while_paused();
+  return;
+}
+
+#ifdef CONFIG_PWM
+
+/****************************************************************************
+ * Name: play_pwm
+ *
+ * Description:
+ *   RTTTL player for audio sinks using PWM devices
+ *
+ * Input Parameters:
+ *   sound - The sound to play
+ *
+ ****************************************************************************/
+
+static void play_pwm(struct rtttl_tone sound)
+{
+  int err;
+  int i;
+  struct pwm_info_s info;
+
+  wait_while_paused(); /* Wait until unpaused */
+
+  /* If we are not meant to be playing (i.e. song was stopped), we should
+   * return from this function.
+   */
+
+  if (!g_playing)
+    {
+      return;
+    }
+
+  info.channels[0].channel = 1;
+  info.channels[0].duty = b16divi(uitoub16(50) - 1, 100); /* 50% duty cycle */
+  info.channels[0].cpol = PWM_CPOL_NDEF;                  /* Default */
+  info.channels[0].dcpol = PWM_DCPOL_NDEF;                /* Default */
+  info.frequency = sound.frequency_100hz / 100;
+
+  /* Copy settings to all channels */
+
+  for (i = 1; i < CONFIG_PWM_NCHANNELS; i++)
+    {
+      info.channels[i] = info.channels[0];
+      info.channels[i].channel = i + 1;
+    }
+
+  err = ioctl(g_fd, PWMIOC_SETCHARACTERISTICS, &info);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to set PWM characteristics: %d\n", errno);
+      return;
+    }
+
+  err = ioctl(g_fd, PWMIOC_START, 0);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to start PWM: %d\n", errno);
+      return;
+    }
+
+  usleep(sound.duration_us); /* Wait */
+
+  err = ioctl(g_fd, PWMIOC_STOP, 0);
+  if (err < 0)
+    {
+      fprintf(stderr, "Failed to stop PWM: %d\n", errno);
+    }
+}
+#endif
+
+static void *player_thread(void *arg)
+{
+  for (; ; )
+    {
+      /* If there is nothing playing (i.e. song stopped or done), block here
+       * until the main DOOM player logic tells us it wants to play a song.
+       */
+
+      wait_while_stopped();
+
+      rtttl_play(g_doom_rtttl, g_player);
+
+      /* If we are not meant to loop, then after one play we will indicate
+       * that we are 'not playing'. This will causes the thread to block.
+       * Otherwise, this will continue forever.
+       */
+
+      if (!g_loop)
+        {
+          pthread_mutex_lock(&g_player_lock);
+          g_playing = false;
+          g_paused = false;
+          pthread_mutex_unlock(&g_player_lock);
+        }
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: i_rtttl_init_music
+ *
+ * Description:
+ *   Choose the appropriate player implementation for RTTTl based on the
+ *   configured music device.
+ *
+ * Returned Value:
+ *   True on success, false otherwise.
+ *
+ ****************************************************************************/
+
+static boolean i_rtttl_init_music(void)
+{
+  int err;
+  g_player = play_default;
+#ifdef CONFIG_PWM
+  if (strstr(CONFIG_GAMES_NXDOOM_RTTTL_DEVICE, "pwm"))
+    {
+      g_player = play_pwm;
+    }
+#endif
+
+  /* Initialize thread state */
+
+  pthread_mutex_init(&g_player_lock, NULL);
+  pthread_cond_init(&g_pausecond, NULL);
+  pthread_cond_init(&g_playingcond, NULL);
+  g_paused = true;
+  g_loop = false;
+  g_playing = false;
+
+  /* Start the music playing thread */
+
+  err = pthread_create(&g_thread, NULL, player_thread, NULL);
+  if (err)
+    {
+      return false;
+    }
+
+  /* We only managed to match with the default player. */
+
+  if (g_player == play_default)
+    {
+      return true;
+    }
+
+  /* If we're not using the default player, we need to open a file
+   * descriptor.
+   */
+
+  g_fd = open(CONFIG_GAMES_NXDOOM_RTTTL_DEVICE, O_RDWR);
+  if (g_fd < 0)
+    {
+      fprintf(stderr,
+              "Couldn't open RTTL device '" CONFIG_GAMES_NXDOOM_RTTTL_DEVICE
+              "': %d",
+              errno);
+      return false;
+    }
+
+  return true;
+}
+
+/****************************************************************************
+ * Name: i_rtttl_shutdown_music
+ *
+ * Description:
+ *   Turns off the music and de-initializes the module.
+ *
+ ****************************************************************************/
+
+static void i_rtttl_shutdown_music(void)
+{
+  i_rtttl_stop_song();      /* Stop music */
+  pthread_cancel(g_thread); /* Kill thread */
+  close(g_fd);              /* Clean up device */
+}
+
+static void i_rtttl_set_music_volume(int volume)
+{
+  return; /* Currently not possible */
+}
+
+/****************************************************************************
+ * Name: i_rtttl_pause_song
+ *
+ * Description:
+ *   Pauses the currently playing song. Right now, this is implemented by
+ *   causing the RTTL `play` function to block on a condition variable.
+ *
+ ****************************************************************************/
+
+static void i_rtttl_pause_song(void)
+{
+  pthread_mutex_lock(&g_player_lock);
+  g_paused = true;
+  pthread_mutex_unlock(&g_player_lock);
+}
+
+/****************************************************************************
+ * Name: i_rtttl_resume_song
+ *
+ * Description:
+ *   Resume the currently paused song. Unblocks the RTTL `play` function by
+ *   signalling the condition variable.
+ *
+ ****************************************************************************/
+
+static void i_rtttl_resume_song(void)
+{
+  pthread_mutex_lock(&g_player_lock);
+  g_paused = false;
+  pthread_cond_signal(&g_pausecond);
+  pthread_mutex_unlock(&g_player_lock);
+}
+
+/****************************************************************************
+ * Name: i_rtttl_register_song
+ *
+ * Description:
+ *   Appears to be used to register song data from the DOOM lump. Right now,
+ *   we are using a statically stored RTTL string so we just ignore this. It
+ *   would be good to have RTTL data substituted for lump data in the future
+ *   so we can play the different songs provided by DOOM WADS.
+ *
+ * Input Parameters:
+ *   data - Song data
+ *   len - The length of the song data in bytes
+ *
+ * Returns: In theory, a handle representing the registered song. However, in
+ * practice, we return NULL to indicate this function isn't doing anything.
+ *
+ ****************************************************************************/
+
+static void *i_rtttl_register_song(void *data, int len)
+{
+  /* TODO: no idea what this would be for; right now we play only the theme */
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: i_rtttl_unregister_song
+ *
+ * Description:
+ *   Unregisters one of the registered songs from `i_rtttl_register_song`.
+ *   Currently unimplemented since we register nothing.
+ *
+ * Input Parameters:
+ *   handle - The returned handle to the registered song
+ *
+ ****************************************************************************/
+
+static void i_rtttl_unregister_song(void *handle)
+{
+  /* TODO: no idea what this would be for */
+
+  return;
+}
+
+/****************************************************************************
+ * Name: i_rtttl_play_song
+ *
+ * Description:
+ *   Plays a previously registered song via the RTTTL library.
+ *
+ * Input Parameters:
+ *   handle - The handle to a previously registered song
+ *   looping - True if the song should loop, false otherwise
+ *
+ ****************************************************************************/
+
+static void i_rtttl_play_song(void *handle, boolean looping)
+{
+  pthread_mutex_lock(&g_player_lock);
+  g_playing = true;
+  g_paused = false;
+  g_loop = looping;
+  pthread_cond_signal(&g_playingcond);
+  pthread_mutex_unlock(&g_player_lock);
+}
+
+/****************************************************************************
+ * Name: i_rtttl_stop_song
+ *
+ * Description:
+ *   Stops playing the currently playing song (fully, not paused).
+ *
+ ****************************************************************************/
+
+static void i_rtttl_stop_song(void)
+{
+  pthread_mutex_lock(&g_player_lock);
+  g_playing = false;
+
+  /* Song not paused, allows play function to return early by also unblocking
+   * it. Then control is returned to the thread's main loop instead of the
+   * loop inside the RTTL library thread, where the thread can then block
+   * until a new song is played.
+   */
+
+  if (g_paused)
+    {
+      g_paused = false;
+      pthread_cond_signal(&g_pausecond);
+    }
+
+  g_loop = false;
+  pthread_mutex_unlock(&g_player_lock);
+}
+
+static boolean i_rtttl_musicisplaying(void)
+{
+  return g_playing;
+}
+
+static void i_rtttl_pollmusic(void)
+{
+  /* Unsure what this function does */
+
+  return;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
diff --git a/games/NXDoom/src/i_sound.c b/games/NXDoom/src/i_sound.c
index e86a7e65b..8c8cafaed 100644
--- a/games/NXDoom/src/i_sound.c
+++ b/games/NXDoom/src/i_sound.c
@@ -118,10 +118,13 @@ static const sound_module_t *sound_modules[] =
 
 /* Compiled-in music modules: */
 
-static const music_module_t *music_modules[] =
+static const music_module_t *g_music_modules[] =
 {
 #if 0
     &music_opl_module,
+#endif
+#ifdef CONFIG_GAMES_NXDOOM_RTTTL_MUSIC
+    &g_rtttl_music_module,
 #endif
     NULL,
 };
@@ -186,21 +189,21 @@ static void init_music_module(void)
 
   music_module = NULL;
 
-  for (i = 0; music_modules[i] != NULL; ++i)
+  for (i = 0; g_music_modules[i] != NULL; ++i)
     {
       /* Is the music device in the list of devices supported
        * by this module?
        */
 
       if (snd_device_in_list(snd_musicdevice,
-                             music_modules[i]->sound_devices,
-                             music_modules[i]->num_sound_devices))
+                             g_music_modules[i]->sound_devices,
+                             g_music_modules[i]->num_sound_devices))
         {
           /* initialize the module */
 
-          if (music_modules[i]->init())
+          if (g_music_modules[i]->init())
             {
-              music_module = music_modules[i];
+              music_module = g_music_modules[i];
               return;
             }
         }
@@ -239,7 +242,10 @@ static void check_volume_separation(int *vol, int *sep)
 
 void i_init_sound(gamemission_t mission)
 {
-  boolean nosound, nosfx, nomusic, nomusicpacks;
+  boolean nosound;
+  boolean nosfx;
+  boolean nomusic;
+  boolean nomusicpacks;
 
   /* @vanilla
    *
@@ -401,6 +407,7 @@ void i_precache_sounds(sfxinfo_t *sounds, int num_sounds)
 
 void i_init_music(void)
 {
+    printf("i_init_music: Music initialized\n");
 }
 
 void i_shutdown_music(void)
@@ -479,6 +486,7 @@ void i_unregister_song(void *handle)
 
 void i_play_song(void *handle, boolean looping)
 {
+    printf("i_play_song: Playing on %p\n", active_music_module);
   if (active_music_module != NULL)
     {
       active_music_module->play_song(handle, looping);
diff --git a/games/NXDoom/src/i_sound.h b/games/NXDoom/src/i_sound.h
index d1ad8d8eb..6827df992 100644
--- a/games/NXDoom/src/i_sound.h
+++ b/games/NXDoom/src/i_sound.h
@@ -266,11 +266,13 @@ extern int snd_pitchshift;
 extern int use_libsamplerate;
 extern float libsamplerate_scale;
 
-extern const sound_module_t sound_sdl_module;
 extern const sound_module_t sound_pcsound_module;
-extern const music_module_t music_sdl_module;
+
 extern const music_module_t music_pack_module;
-extern const music_module_t music_fl_module;
+
+#ifdef CONFIG_GAMES_NXDOOM_RTTTL_MUSIC
+extern const music_module_t g_rtttl_music_module;
+#endif
 
 /* For native music module: */
 

From b42589e8e77a7bc7212daa52647a9b90a5b428ba Mon Sep 17 00:00:00 2001
From: Matteo Golin <matteo.golin@gmail.com>
Date: Fri, 24 Jul 2026 14:34:02 -0400
Subject: [PATCH 543/568] games/NXDoom: Fix warnings in i_pcsound module

This fixes all the warnings in the i_pcsound module caused when enabling
the sound feature Kconfig option. This warnings would prevent CI from
passing.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
---
 games/NXDoom/src/i_pcsound.c | 46 ++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/games/NXDoom/src/i_pcsound.c b/games/NXDoom/src/i_pcsound.c
index 2548fbe96..b6251c0e2 100644
--- a/games/NXDoom/src/i_pcsound.c
+++ b/games/NXDoom/src/i_pcsound.c
@@ -42,6 +42,20 @@
 
 #define TIMER_FREQ 1193181 /* Hz */
 
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int i_pcs_start_sound(sfxinfo_t *sfxinfo, int channel, int vol,
+                             int sep, int pitch);
+static void i_pcs_stop_sound(int handle);
+static int i_pcs_get_sfx_lumpnum(sfxinfo_t *sfx);
+static boolean i_pcs_sound_is_playing(int handle);
+static boolean i_pcs_init_sound(gamemission_t mission);
+static void i_pcs_shutdown_sound(void);
+static void i_pcs_update_sound(void);
+static void i_pcs_update_sound_params(int channel, int vol, int sep);
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -51,9 +65,12 @@ static boolean g_pcs_initialized = false;
 static gamemission_t g_gamemission;
 
 static uint8_t *g_current_sound_lump = NULL;
+#if 0  /* UNUSED */
 static uint8_t *g_current_sound_pos = NULL;
+#endif
 static unsigned int g_current_sound_remaining = 0;
 static int g_current_sound_handle = 0;
+#if 0  /* UNUSED */
 static int g_current_sound_lump_num = -1;
 
 static const uint16_t g_divisors[] =
@@ -70,6 +87,7 @@ static const uint16_t g_divisors[] =
   310,  302,  293,  285,  276,  269,  261,  253,  246,  239,  232,  226,
   219,  213,  207,  201,  195,  190,  184,  179,
 };
+#endif
 
 static const snddevice_t g_sound_pcsound_devices[] =
 {
@@ -82,24 +100,23 @@ static const snddevice_t g_sound_pcsound_devices[] =
 
 const sound_module_t sound_pcsound_module =
 {
-  g_sound_pcsound_devices,
-  arrlen(g_sound_pcsound_devices),
-#if 0
-  i_pcs_init_sound,
-  i_pcs_shutdown_sound,
-  i_pcs_get_sfx_lumpnum,
-  i_pcs_update_sound,
-  i_pcs_update_sound_params,
-  i_pcs_start_sound,
-  i_pcs_stop_sound,
-  i_pcs_sound_is_playing,
-#endif
+  .sound_devices = g_sound_pcsound_devices,
+  .num_sound_devices = arrlen(g_sound_pcsound_devices),
+  .init = i_pcs_init_sound,
+  .shutdown = i_pcs_shutdown_sound,
+  .get_sfx_lumpnum = i_pcs_get_sfx_lumpnum,
+  .update = i_pcs_update_sound,
+  .update_sound_params = i_pcs_update_sound_params,
+  .start_sound = i_pcs_start_sound,
+  .stop_sound = i_pcs_stop_sound,
+  .sound_is_playing = i_pcs_sound_is_playing,
 };
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
+#if 0  /* UNUSED */
 static void pcs_callback_func(int *duration, int *freq)
 {
 }
@@ -167,10 +184,12 @@ static boolean is_disabled_sound(sfxinfo_t *sfxinfo)
 
   return false;
 }
+#endif /* UNUSED */
 
 static int i_pcs_start_sound(sfxinfo_t *sfxinfo, int channel, int vol,
                              int sep, int pitch)
 {
+  return 0;
 }
 
 static void i_pcs_stop_sound(int handle)
@@ -181,7 +200,7 @@ static void i_pcs_stop_sound(int handle)
 
 static int i_pcs_get_sfx_lumpnum(sfxinfo_t *sfx)
 {
-  char namebuf[9];
+  char namebuf[16];
 
   if (g_gamemission == doom || g_gamemission == strife)
     {
@@ -219,6 +238,7 @@ static boolean i_pcs_sound_is_playing(int handle)
 
 static boolean i_pcs_init_sound(gamemission_t mission)
 {
+  return false;
 }
 
 static void i_pcs_shutdown_sound(void)

From 61161866f045adf7e9279ecb4f87a50a371d6dd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2026 22:22:27 +0000
Subject: [PATCH 544/568] build(deps): bump docker/login-action from 4.4.0 to
 4.5.1

Bumps [docker/login-action](https://github.com/docker/login-action) from 4.4.0 to 4.5.1.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/af1e73f918a031802d376d3c8bbc3fe56130a9b0...abd2ef45e78c5afb21d64d4ca52ee8550d9572c7)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.5.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fa2107b4..f9ac66a20 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,7 +167,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0  # v4.4.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7  # v4.5.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -257,7 +257,7 @@ jobs:
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0  # v4.4.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7  # v4.5.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 636047a4e09c6e3a9bacae1e7caae788212651c6 Mon Sep 17 00:00:00 2001
From: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
Date: Mon, 27 Jul 2026 13:57:40 -0300
Subject: [PATCH 545/568] examples/fb: add SMPTE color bar example

Add a -p option to select the pattern to draw. The existing expanding
rectangles animation remains the default, and a new "smpte" pattern
fills the display with seven equal vertical bars (white, yellow, cyan,
green, magenta, red and blue), which is useful to verify color ordering
and channel wiring of a framebuffer display.

To support more than one palette, the draw_rect() helpers now receive
the color value to write instead of an index into the per-format color
tables. Monochrome displays pick black or white per bar using a BT.601
luma threshold.

The FBIO_UPDATE ioctl is moved out of draw_rect() into a new
present_area() helper, so the SMPTE pattern can draw every bar and
then update the display only once.

Assisted-by: Cursor:claude-opus-5
Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
---
 examples/fb/fb_main.c | 223 +++++++++++++++++++++++++++++-------------
 1 file changed, 157 insertions(+), 66 deletions(-)

diff --git a/examples/fb/fb_main.c b/examples/fb/fb_main.c
index bd7d457e1..3d237df05 100644
--- a/examples/fb/fb_main.c
+++ b/examples/fb/fb_main.c
@@ -43,7 +43,11 @@
  * Preprocessor Definitions
  ****************************************************************************/
 
-#define NCOLORS 6
+#define NRECTCOLORS 6
+#define NSMPTECOLORS 7
+
+#define PATTERN_RECTANGLES 0
+#define PATTERN_SMPTE      1
 
 /****************************************************************************
  * Private Types
@@ -71,24 +75,51 @@ static const char g_default_fbdev[] = CONFIG_EXAMPLES_FB_DEFAULTFB;
 
 /* Violet-Blue-Green-Yellow-Orange-Red */
 
-static const uint32_t g_rgb24[NCOLORS] =
+static const uint32_t g_rgb24[NRECTCOLORS] =
 {
   RGB24_VIOLET, RGB24_BLUE, RGB24_GREEN,
   RGB24_YELLOW, RGB24_ORANGE, RGB24_RED
 };
 
-static const uint16_t g_rgb16[NCOLORS] =
+static const uint16_t g_rgb16[NRECTCOLORS] =
 {
   RGB16_VIOLET, RGB16_BLUE, RGB16_GREEN,
   RGB16_YELLOW, RGB16_ORANGE, RGB16_RED
 };
 
-static const uint8_t g_rgb8[NCOLORS] =
+static const uint8_t g_rgb8[NRECTCOLORS] =
 {
   RGB8_VIOLET, RGB8_BLUE, RGB8_GREEN,
   RGB8_YELLOW, RGB8_ORANGE, RGB8_RED
 };
 
+/* White-Yellow-Cyan-Green-Magenta-Red-Blue */
+
+static const uint32_t g_smpte_rgb24[NSMPTECOLORS] =
+{
+  RGB24_WHITE, RGB24_YELLOW, RGB24_CYAN, RGB24_GREEN,
+  RGB24_MAGENTA, RGB24_RED, RGB24_BLUE
+};
+
+static const uint16_t g_smpte_rgb16[NSMPTECOLORS] =
+{
+  RGB16_WHITE, RGB16_YELLOW, RGB16_CYAN, RGB16_GREEN,
+  RGB16_MAGENTA, RGB16_RED, RGB16_BLUE
+};
+
+static const uint8_t g_smpte_rgb8[NSMPTECOLORS] =
+{
+  RGB8_WHITE, RGB8_YELLOW, RGB8_CYAN, RGB8_GREEN,
+  RGB8_MAGENTA, RGB8_RED, RGB8_BLUE
+};
+
+/* Monochrome equivalents selected using BT.601 luma. */
+
+static const uint8_t g_smpte_mono[NSMPTECOLORS] =
+{
+  1, 1, 1, 1, 0, 0, 0
+};
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -270,7 +301,7 @@ static int fb_init_mem2(FAR struct fb_state_s *state)
  ****************************************************************************/
 
 static void draw_rect32(FAR struct fb_state_s *state,
-                        FAR struct fb_area_s *area, int color)
+                        FAR struct fb_area_s *area, uint32_t color)
 {
   FAR uint32_t *dest;
   FAR uint8_t *row;
@@ -283,7 +314,7 @@ static void draw_rect32(FAR struct fb_state_s *state,
       dest = ((FAR uint32_t *)row) + area->x;
       for (x = 0; x < area->w; x++)
         {
-          *dest++ = g_rgb24[color] | 0xff000000;
+          *dest++ = color | 0xff000000;
         }
 
       row += state->pinfo.stride;
@@ -291,7 +322,7 @@ static void draw_rect32(FAR struct fb_state_s *state,
 }
 
 static void draw_rect24(FAR struct fb_state_s *state,
-                        FAR struct fb_area_s *area, int color)
+                        FAR struct fb_area_s *area, uint32_t color)
 {
   FAR uint8_t *dest;
   FAR uint8_t *row;
@@ -304,9 +335,9 @@ static void draw_rect24(FAR struct fb_state_s *state,
       dest = ((FAR uint8_t *)row) + area->x * 3;
       for (x = 0; x < area->w; x++)
         {
-          *dest++ = g_rgb24[color] & 0xff;
-          *dest++ = (g_rgb24[color] >> 8) & 0xff;
-          *dest++ = (g_rgb24[color] >> 16) & 0xff;
+          *dest++ = color & 0xff;
+          *dest++ = (color >> 8) & 0xff;
+          *dest++ = (color >> 16) & 0xff;
         }
 
       row += state->pinfo.stride;
@@ -314,7 +345,7 @@ static void draw_rect24(FAR struct fb_state_s *state,
 }
 
 static void draw_rect16(FAR struct fb_state_s *state,
-                        FAR struct fb_area_s *area, int color)
+                        FAR struct fb_area_s *area, uint16_t color)
 {
   FAR uint16_t *dest;
   FAR uint8_t *row;
@@ -327,7 +358,7 @@ static void draw_rect16(FAR struct fb_state_s *state,
       dest = ((FAR uint16_t *)row) + area->x;
       for (x = 0; x < area->w; x++)
         {
-          *dest++ = g_rgb16[color];
+          *dest++ = color;
         }
 
       row += state->pinfo.stride;
@@ -335,7 +366,7 @@ static void draw_rect16(FAR struct fb_state_s *state,
 }
 
 static void draw_rect8(FAR struct fb_state_s *state,
-                       FAR struct fb_area_s *area, int color)
+                       FAR struct fb_area_s *area, uint8_t color)
 {
   FAR uint8_t *dest;
   FAR uint8_t *row;
@@ -348,7 +379,7 @@ static void draw_rect8(FAR struct fb_state_s *state,
       dest = row + area->x;
       for (x = 0; x < area->w; x++)
         {
-          *dest++ = g_rgb8[color];
+          *dest++ = color;
         }
 
       row += state->pinfo.stride;
@@ -356,11 +387,11 @@ static void draw_rect8(FAR struct fb_state_s *state,
 }
 
 static void draw_rect1(FAR struct fb_state_s *state,
-                       FAR struct fb_area_s *area, int color)
+                       FAR struct fb_area_s *area, uint8_t color)
 {
   FAR uint8_t *pixel;
   FAR uint8_t *row;
-  uint8_t color8 = (color & 1) == 0 ? 0 : 0xff;
+  uint8_t color8 = color == 0 ? 0 : 0xff;
 
   int start_full_x;
   int end_full_x;
@@ -437,43 +468,47 @@ static void draw_rect1(FAR struct fb_state_s *state,
 }
 
 static void draw_rect(FAR struct fb_state_s *state,
-                      FAR struct fb_area_s *area, int color)
+                      FAR struct fb_area_s *area, uint32_t color24,
+                      uint16_t color16, uint8_t color8, uint8_t mono)
 {
-#ifdef CONFIG_FB_UPDATE
-  int ret;
-#endif
-
   switch (state->pinfo.bpp)
     {
       case 32:
-        draw_rect32(state, area, color);
+        draw_rect32(state, area, color24);
         break;
 
       case 24:
-        draw_rect24(state, area, color);
+        draw_rect24(state, area, color24);
         break;
 
       case 16:
-        draw_rect16(state, area, color);
+        draw_rect16(state, area, color16);
         break;
 
       case 8:
       default:
-        draw_rect8(state, area, color);
+        draw_rect8(state, area, color8);
         break;
 
       case 1:
-        draw_rect1(state, area, color);
+        draw_rect1(state, area, mono);
         break;
     }
+}
 
+static void present_area(FAR struct fb_state_s *state,
+                         FAR const struct fb_area_s *area)
+{
 #ifdef CONFIG_FB_UPDATE
+  struct fb_area_s update = *area;
+  int ret;
+
   int yoffset = state->act_fbmem == state->fbmem ?
                 0 : state->mem2_yoffset;
-  area->y += yoffset;
+  update.y += yoffset;
 
   ret = ioctl(state->fd, FBIO_UPDATE,
-              (unsigned long)((uintptr_t)area));
+              (unsigned long)((uintptr_t)&update));
   if (ret < 0)
     {
       int errcode = errno;
@@ -499,6 +534,7 @@ static void draw_rect(FAR struct fb_state_s *state,
 int main(int argc, FAR char *argv[])
 {
   FAR const char *fbdev = g_default_fbdev;
+  int pattern = PATTERN_RECTANGLES;
   struct fb_state_s state;
   struct fb_area_s area;
   int nsteps;
@@ -510,20 +546,43 @@ int main(int argc, FAR char *argv[])
   int x;
   int y;
   int ret;
+  int opt;
 
-  /* There is a single required argument:  The path to the framebuffer
-   * driver.
-   */
-
-  if (argc == 2)
+  while ((opt = getopt(argc, argv, "p:")) != ERROR)
     {
-      fbdev = argv[1];
+      switch (opt)
+        {
+          case 'p':
+            if (strcmp(optarg, "rectangles") == 0)
+              {
+                pattern = PATTERN_RECTANGLES;
+              }
+            else if (strcmp(optarg, "smpte") == 0)
+              {
+                pattern = PATTERN_SMPTE;
+              }
+            else
+              {
+                fprintf(stderr, "ERROR: Unknown pattern: %s\n", optarg);
+                goto usage;
+              }
+
+            break;
+
+          default:
+            goto usage;
+        }
     }
-  else if (argc != 1)
+
+  if (optind < argc)
     {
-      fprintf(stderr, "ERROR: Single argument required\n");
-      fprintf(stderr, "USAGE: %s [<fb-driver-path>]\n", argv[0]);
-      return EXIT_FAILURE;
+      fbdev = argv[optind++];
+    }
+
+  if (optind < argc)
+    {
+      fprintf(stderr, "ERROR: Too many framebuffer paths\n");
+      goto usage;
     }
 
   /* Open the framebuffer driver */
@@ -652,38 +711,64 @@ int main(int argc, FAR char *argv[])
         }
     }
 
-  /* Draw some rectangles */
+  /* Draw the selected pattern */
 
   state.act_fbmem = state.fbmem;
-  nsteps = 2 * (NCOLORS - 1) + 1;
-  xstep  = state.vinfo.xres / nsteps;
-  ystep  = state.vinfo.yres / nsteps;
-  width  = state.vinfo.xres;
-  height = state.vinfo.yres;
-
-  for (x = 0, y = 0, color = 0;
-       color < NCOLORS;
-       x += xstep, y += ystep, color++)
+  if (pattern == PATTERN_SMPTE)
     {
-      area.x = x;
-      area.y = y;
-      area.w = width;
-      area.h = height;
-
-      printf("%2d: (%3d,%3d) (%3d,%3d)\n",
-             color, area.x, area.y, area.w, area.h);
-
-      draw_rect(&state, &area, color);
-      usleep(500 * 1000);
-
-      width  -= (2 * xstep);
-      height -= (2 * ystep);
-
-      /* double buffer mode */
-
-      if (state.pinfo.yres_virtual == (state.vinfo.yres * 2))
+      for (color = 0; color < NSMPTECOLORS; color++)
         {
-          sync_area(&state);
+          area.x = color * state.vinfo.xres / NSMPTECOLORS;
+          area.y = 0;
+          area.w = (color + 1) * state.vinfo.xres / NSMPTECOLORS -
+                   area.x;
+          area.h = state.vinfo.yres;
+
+          draw_rect(&state, &area, g_smpte_rgb24[color],
+                    g_smpte_rgb16[color], g_smpte_rgb8[color],
+                    g_smpte_mono[color]);
+        }
+
+      area.x = 0;
+      area.y = 0;
+      area.w = state.vinfo.xres;
+      area.h = state.vinfo.yres;
+      present_area(&state, &area);
+    }
+  else
+    {
+      nsteps = 2 * (NRECTCOLORS - 1) + 1;
+      xstep  = state.vinfo.xres / nsteps;
+      ystep  = state.vinfo.yres / nsteps;
+      width  = state.vinfo.xres;
+      height = state.vinfo.yres;
+
+      for (x = 0, y = 0, color = 0;
+           color < NRECTCOLORS;
+           x += xstep, y += ystep, color++)
+        {
+          area.x = x;
+          area.y = y;
+          area.w = width;
+          area.h = height;
+
+          printf("%2d: (%3d,%3d) (%3d,%3d)\n",
+                 color, area.x, area.y, area.w, area.h);
+
+          draw_rect(&state, &area, g_rgb24[color],
+                    g_rgb16[color], g_rgb8[color], color & 1);
+          present_area(&state, &area);
+          usleep(500 * 1000);
+
+          width  -= (2 * xstep);
+          height -= (2 * ystep);
+
+          /* double buffer mode */
+
+          if (state.pinfo.yres_virtual == (state.vinfo.yres * 2))
+            {
+              sync_area(&state);
+            }
         }
     }
 
@@ -693,4 +778,10 @@ out:
   munmap(state.fbmem, state.pinfo.fblen);
   close(state.fd);
   return ret;
+
+usage:
+  fprintf(stderr,
+          "USAGE: %s [-p rectangles|smpte] [<fb-driver-path>]\n",
+          argv[0]);
+  return EXIT_FAILURE;
 }

From ae601e28927efef64364f2cbe908e823bb73afcd Mon Sep 17 00:00:00 2001
From: Acfboy <AcfboyU@outlook.com>
Date: Mon, 27 Jul 2026 08:57:48 +0800
Subject: [PATCH 546/568] graphics/microwindows: introduce Microwindows
 graphics support to NuttX

This commit integrates the Microwindows core into the NuttX apps
build system:

- Downloads a pinned upstream commit during build and compiles the
  engine, drivers and precompiled bitmap fonts via Microwindows'
  Objects.rules files.
- Adds Kconfig options for framebuffer path, keyboard driver
  selection (event-mode, raw byte-stream, none, custom), and
  mouse/touchscreen driver selection (relative, touchscreen, none,
  custom).
- Uses the MWCONFIG_FILE mechanism to inject NuttX-specific
  configuration (mwconfig.nuttx) without modifying upstream headers.
- The NuttX screen, keyboard, mouse and touchscreen drivers are
  pulled from upstream Microwindows. Driver selection is controlled
  via ARCH=NUTTX and Kconfig-driven KEYBOARD/MOUSE variables in
  the Makefile.
- Depends on VIDEO_FB for the framebuffer device.
- Builds the mwin library (Win32 API layer) when MICROWINDOWS_MWIN
  is enabled.

Co-authored-by: Pavel Pisa <ppisa@pikron.com>
Signed-off-by: Pavel Pisa <ppisa@pikron.com>
Signed-off-by: Acfboy <AcfboyU@outlook.com>
---
 graphics/microwindows/.gitignore |   2 +
 graphics/microwindows/Kconfig    | 131 ++++++++++++++++++++++++++
 graphics/microwindows/Make.defs  |  33 +++++++
 graphics/microwindows/Makefile   | 154 +++++++++++++++++++++++++++++++
 4 files changed, 320 insertions(+)
 create mode 100644 graphics/microwindows/.gitignore
 create mode 100644 graphics/microwindows/Kconfig
 create mode 100644 graphics/microwindows/Make.defs
 create mode 100644 graphics/microwindows/Makefile

diff --git a/graphics/microwindows/.gitignore b/graphics/microwindows/.gitignore
new file mode 100644
index 000000000..0cb9c8404
--- /dev/null
+++ b/graphics/microwindows/.gitignore
@@ -0,0 +1,2 @@
+/microwindows
+/*.zip
diff --git a/graphics/microwindows/Kconfig b/graphics/microwindows/Kconfig
new file mode 100644
index 000000000..8463d791f
--- /dev/null
+++ b/graphics/microwindows/Kconfig
@@ -0,0 +1,131 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+menuconfig GRAPHICS_MICROWINDOWS
+	bool "Microwindows or the Nano-X Window System"
+	default n
+	depends on VIDEO_FB
+	---help---
+		Enable Microwindows or the Nano-X Window System
+
+if GRAPHICS_MICROWINDOWS
+
+config MICROWINDOWS_FB_PATH
+	string "Framebuffer device path"
+	default "/dev/fb0"
+	---help---
+		Path to the NuttX framebuffer device.
+
+choice
+	prompt "Keyboard driver"
+	default MICROWINDOWS_KBD_EVENT
+	---help---
+		Select the keyboard input driver for Microwindows.
+
+config MICROWINDOWS_KBD_EVENT
+	bool "Event-mode keyboard driver"
+	---help---
+		Reads keyboard_event_s events from a NuttX keyboard device
+		(e.g., /dev/kbd).  Supports key press/release tracking and
+		modifier keys (Shift, Ctrl, Alt).
+
+config MICROWINDOWS_KBD_RAW
+	bool "Raw-mode keyboard driver"
+	depends on LIBC_KBDCODEC
+	---help---
+		Reads raw byte stream from a character device (e.g., /dev/kbda)
+		and decodes escape sequences via the kbd_codec library.  Suitable
+		for USB HID keyboards on QEMU.
+
+config MICROWINDOWS_KBD_NONE
+	bool "No keyboard driver"
+	---help---
+		No keyboard driver is compiled.  Microwindows will use a null
+		keyboard driver that never produces input.  Suitable for
+		display-only applications.
+
+config MICROWINDOWS_KBD_CUSTOM
+	bool "Custom keyboard driver"
+	---help---
+		No built-in keyboard driver is compiled.  The application or BSP
+		must provide its own kbddev symbol and KBDDEVICE implementation,
+		and add the source file to the build (e.g., via CSRCS in its
+		Makefile).  See the Microwindows documentation for details.
+
+endchoice
+
+config MICROWINDOWS_KBD_EVENT_PATH
+	string "Event keyboard device path"
+	default "/dev/kbd"
+	depends on MICROWINDOWS_KBD_EVENT
+	---help---
+		Device path for the event-mode keyboard driver.
+
+config MICROWINDOWS_KBD_RAW_PATH
+	string "Raw keyboard device path"
+	default "/dev/kbda"
+	depends on MICROWINDOWS_KBD_RAW
+	---help---
+		Device path for the raw-mode keyboard driver.
+
+choice
+	prompt "Mouse/touchscreen driver"
+	default MICROWINDOWS_MOUSE_RELATIVE
+	---help---
+		Select the pointing device driver for Microwindows.
+
+config MICROWINDOWS_MOUSE_RELATIVE
+	bool "Relative mouse driver"
+	---help---
+		Reads mouse_report_s events from a NuttX mouse device
+		(e.g., /dev/mouse0).  Supports three buttons and scroll wheel.
+
+config MICROWINDOWS_MOUSE_TS
+	bool "Touchscreen driver"
+	---help---
+		Reads touch_sample_s events from a NuttX touchscreen device
+		(e.g., /dev/input0).  Supports absolute positioning.
+
+config MICROWINDOWS_MOUSE_NONE
+	bool "No mouse/touchscreen driver"
+	---help---
+		No pointing device driver is compiled.  Microwindows will use a
+		null mouse driver that never produces input and hides the cursor.
+		Suitable for display-only applications.
+
+config MICROWINDOWS_MOUSE_CUSTOM
+	bool "Custom mouse/touchscreen driver"
+	---help---
+		No built-in pointing device driver is compiled.  The application
+		or BSP must provide its own mousedev symbol and MOUSEDEVICE
+		implementation, and add the source file to the build (e.g., via
+		CSRCS in its Makefile).  See the Microwindows documentation for
+		details.
+
+endchoice
+
+config MICROWINDOWS_MOUSE_PATH
+	string "Mouse device path"
+	default "/dev/mouse0"
+	depends on MICROWINDOWS_MOUSE_RELATIVE
+	---help---
+		Device path for the relative mouse driver.
+
+config MICROWINDOWS_TS_PATH
+	string "Touchscreen device path"
+	default "/dev/input0"
+	depends on MICROWINDOWS_MOUSE_TS
+	---help---
+		Device path for the touchscreen driver.
+
+config MICROWINDOWS_MWIN
+	bool "Win32 API (mwin) support"
+	default n
+	---help---
+		Build the Microwindows Win32 (mwin) API library.  This provides
+		a high-level windowing API similar to the Microsoft Windows API
+		with window management, controls, and standard dialogs.
+
+endif # GRAPHICS_MICROWINDOWS
diff --git a/graphics/microwindows/Make.defs b/graphics/microwindows/Make.defs
new file mode 100644
index 000000000..935abf66b
--- /dev/null
+++ b/graphics/microwindows/Make.defs
@@ -0,0 +1,33 @@
+############################################################################
+# apps/graphics/microwindows/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_GRAPHICS_MICROWINDOWS),)
+CONFIGURED_APPS += $(APPDIR)/graphics/microwindows
+
+# It allows `microwindows/src/include` import.
+
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/microwindows/microwindows/src/include
+CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/microwindows/microwindows/src/include
+
+CFLAGS += -DMWCONFIG_FILE='"mwconfig.nuttx"'
+
+endif
diff --git a/graphics/microwindows/Makefile b/graphics/microwindows/Makefile
new file mode 100644
index 000000000..5dae89ac0
--- /dev/null
+++ b/graphics/microwindows/Makefile
@@ -0,0 +1,154 @@
+############################################################################
+# apps/graphics/microwindows/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Microwindows graphic library
+
+MICROWINDOWS_DIR = .
+MICROWINDOWS_DIR_NAME = microwindows
+
+# Set up build configuration and environment
+
+WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
+
+MICROWINDOWS_COMMIT_HASH := 1f269127b991d01dea5784eacee321a23e34d3d5
+
+CONFIG_GRAPH_MICROWINDOWS_URL ?= https://codeload.github.com/ghaerr/microwindows/zip/$(MICROWINDOWS_COMMIT_HASH)
+
+MICROWINDOWS_TARBALL := microwindows-$(MICROWINDOWS_COMMIT_HASH).zip
+
+MICROWINDOWS_UNPACKNAME = microwindows
+UNPACK ?= unzip -o $(if $(V),,-q)
+CURL ?= curl -L $(if $(V),,-Ss)
+
+MICROWINDOWS_UNPACKDIR =  $(WD)/$(MICROWINDOWS_UNPACKNAME)
+
+$(MICROWINDOWS_TARBALL):
+	$(ECHO_BEGIN)"Downloading: $(MICROWINDOWS_TARBALL)"
+	$(Q) $(CURL) -o $(MICROWINDOWS_TARBALL) $(CONFIG_GRAPH_MICROWINDOWS_URL)
+	$(ECHO_END)
+
+$(MICROWINDOWS_UNPACKNAME): $(MICROWINDOWS_TARBALL)
+	$(ECHO_BEGIN)"Unpacking: $(MICROWINDOWS_TARBALL) -> $(MICROWINDOWS_UNPACKNAME)"
+	$(Q) $(UNPACK) $(MICROWINDOWS_TARBALL)
+	$(Q) mv	microwindows-$(MICROWINDOWS_COMMIT_HASH) $(MICROWINDOWS_UNPACKNAME)
+	$(Q) touch $(MICROWINDOWS_UNPACKNAME)
+	$(ECHO_END)
+
+# Download and unpack tarball if no git repo found
+ifeq ($(wildcard $(MICROWINDOWS_UNPACKNAME)/.git),)
+context:: $(MICROWINDOWS_UNPACKNAME)
+
+distclean::
+	$(call DELDIR, $(MICROWINDOWS_UNPACKNAME))
+	$(call DELFILE, $(MICROWINDOWS_TARBALL))
+endif
+
+CFLAGS += -Wno-undef
+CFLAGS += -Wno-shadow
+
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/graphics/microwindows/microwindows/src/drivers
+
+CFLAGS += -DNUTTX_FB_PATH=\"$(CONFIG_MICROWINDOWS_FB_PATH)\"
+ifdef CONFIG_MICROWINDOWS_KBD_EVENT_PATH
+CFLAGS += -DNUTTX_KBD_EVENT_PATH=\"$(CONFIG_MICROWINDOWS_KBD_EVENT_PATH)\"
+endif
+ifdef CONFIG_MICROWINDOWS_KBD_RAW_PATH
+CFLAGS += -DNUTTX_KBD_RAW_PATH=\"$(CONFIG_MICROWINDOWS_KBD_RAW_PATH)\"
+endif
+ifdef CONFIG_MICROWINDOWS_MOUSE_PATH
+CFLAGS += -DNUTTX_MOUSE_PATH=\"$(CONFIG_MICROWINDOWS_MOUSE_PATH)\"
+endif
+ifdef CONFIG_MICROWINDOWS_TS_PATH
+CFLAGS += -DNUTTX_TOUCHSCREEN_PATH=\"$(CONFIG_MICROWINDOWS_TS_PATH)\"
+endif
+
+MW_DIR_OBJ = $(WD)/$(MICROWINDOWS_DIR_NAME)/src
+
+# Select NuttX drivers via Microwindows Objects.rules
+ARCH = NUTTX
+
+ifeq ($(CONFIG_MICROWINDOWS_KBD_EVENT),y)
+KEYBOARD = NUTTXKBD
+else ifeq ($(CONFIG_MICROWINDOWS_KBD_RAW),y)
+KEYBOARD = NUTTXRAWKBD
+else ifeq ($(CONFIG_MICROWINDOWS_KBD_NONE),y)
+KEYBOARD = NOKBD
+else ifeq ($(CONFIG_MICROWINDOWS_KBD_CUSTOM),y)
+KEYBOARD = CUSTOM
+endif
+
+ifeq ($(CONFIG_MICROWINDOWS_MOUSE_RELATIVE),y)
+MOUSE = NUTTXMOUSE
+else ifeq ($(CONFIG_MICROWINDOWS_MOUSE_TS),y)
+MOUSE = NUTTXTOUCH
+else ifeq ($(CONFIG_MICROWINDOWS_MOUSE_NONE),y)
+MOUSE = NOMOUSE
+else ifeq ($(CONFIG_MICROWINDOWS_MOUSE_CUSTOM),y)
+MOUSE = CUSTOM
+endif
+
+-include microwindows/src/engine/Objects.rules
+-include microwindows/src/drivers/Objects.rules
+-include microwindows/src/fonts/Objects.rules
+
+CSRCS += $(MW_CORE_OBJS:%.o=%.c)
+
+ifneq ($(CONFIG_MICROWINDOWS_MWIN),)
+
+# Win32 API
+MWIN_CORE_SRCS  = microwindows/src/mwin/winmain.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winuser.c
+MWIN_CORE_SRCS += microwindows/src/mwin/wingdi.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winexpos.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winclip.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winevent.c
+MWIN_CORE_SRCS += microwindows/src/mwin/windefw.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winrgn.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winfont.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winsbar.c
+MWIN_CORE_SRCS += microwindows/src/mwin/winres.c
+
+# mwin winlib
+WINLIB_SRCS  = microwindows/src/mwin/winlib/draw3d.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/fastfill.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/windlg.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/graph3d.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/caret.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/static.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/button.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/newedit.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/newlistbox.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/combobox.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/progbar.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/scrlbar.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/medit.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/ptinsid.c
+WINLIB_SRCS += microwindows/src/mwin/winlib/insetr.c
+
+CSRCS += $(MWIN_CORE_SRCS) $(WINLIB_SRCS)
+CFLAGS += -DNOGDI
+
+endif
+
+include $(APPDIR)/Application.mk

From ce49ac905326fa2a992a6fd4ade3e7768fad8ad9 Mon Sep 17 00:00:00 2001
From: Acfboy <AcfboyU@outlook.com>
Date: Mon, 27 Jul 2026 09:04:25 +0800
Subject: [PATCH 547/568] examples/microwindows: add mwdemo demo application

This ports mwdemo.c from Microwindows as a standalone NuttX example
application.  mwdemo is the primary Win32 API demo in the Microwindows
project, featuring 3D graphics, window controls, timer-driven
animation, and bitmap image rendering.

The demo runs on both qemu-intel64:mw and sim:mw configurations.

Signed-off-by: Acfboy <AcfboyU@outlook.com>

examples/microwindows: address review, clean up mwdemo.

- Replace minimal copyright notice with full Apache 2.0 license header
- Use angle brackets for system and microwindows includes
- Remove OS-specific dead code (DOS_TURBOC, RTEMS, EMSCRIPTEN/MULTIAPP)
- Drop unused demo-mode macros and their corresponding dead code paths
  (IMAGE, CLIENT3D, CLIPDEMO, ARCDEMO).  Keep a fixed GRAPH3D+CONTROLS
  configuration as the single NuttX demo.
- Add g_ prefix to global variable (image -> g_image)
- Move demoWndData typedef from mid-file to Private Types section
- Merge WinMain body into main() and remove the WinMain indirection
- Removed unused images.

Signed-off-by: Acfboy <AcfboyU@outlook.com>
---
 examples/microwindows/Kconfig       |  26 +++
 examples/microwindows/Make.defs     |  25 +++
 examples/microwindows/Makefile      |  55 +++++
 examples/microwindows/mwdemo.c      | 333 ++++++++++++++++++++++++++++
 examples/microwindows/mwdemo_main.c | 101 +++++++++
 5 files changed, 540 insertions(+)
 create mode 100644 examples/microwindows/Kconfig
 create mode 100644 examples/microwindows/Make.defs
 create mode 100644 examples/microwindows/Makefile
 create mode 100644 examples/microwindows/mwdemo.c
 create mode 100644 examples/microwindows/mwdemo_main.c

diff --git a/examples/microwindows/Kconfig b/examples/microwindows/Kconfig
new file mode 100644
index 000000000..6319ac587
--- /dev/null
+++ b/examples/microwindows/Kconfig
@@ -0,0 +1,26 @@
+config EXAMPLES_MICROWINDOWS
+	tristate "Microwindows example"
+	default n
+	depends on GRAPHICS_MICROWINDOWS
+	depends on MICROWINDOWS_MWIN
+	---help---
+		Enable the Microwindows example application
+
+if EXAMPLES_MICROWINDOWS
+
+config EXAMPLES_MICROWINDOWS_PROGNAME
+	string "Program name"
+	default "mwexample"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config EXAMPLES_MICROWINDOWS_PRIORITY
+	int "Microwindows task priority"
+	default 100
+
+config EXAMPLES_MICROWINDOWS_STACKSIZE
+	int "Microwindows stack size"
+	default 32768
+
+endif
diff --git a/examples/microwindows/Make.defs b/examples/microwindows/Make.defs
new file mode 100644
index 000000000..6c3595cc3
--- /dev/null
+++ b/examples/microwindows/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/microwindows/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_MICROWINDOWS),)
+CONFIGURED_APPS += $(APPDIR)/examples/microwindows
+endif
diff --git a/examples/microwindows/Makefile b/examples/microwindows/Makefile
new file mode 100644
index 000000000..c8c588abc
--- /dev/null
+++ b/examples/microwindows/Makefile
@@ -0,0 +1,55 @@
+############################################################################
+# apps/examples/microwindows/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_EXAMPLES_MICROWINDOWS_PROGNAME)
+PRIORITY  = $(CONFIG_EXAMPLES_MICROWINDOWS_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_MICROWINDOWS_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_MICROWINDOWS)
+
+MAINSRC = mwdemo_main.c
+CSRCS += mwdemo.c
+MW_IMAGES = penguin microwin
+CSRCS += $(MW_IMAGES:%=$(MW_IMGDIR)/%.c)
+
+# Generate image .c files from .bmp
+MW_SRC = $(APPDIR)/graphics/microwindows/microwindows/src
+MW_IMGDIR = images
+MW_CONVBMP = convbmp$(HOSTEXEEXT)
+
+$(MW_CONVBMP): $(MW_SRC)/images/tools/convbmp.c
+	$(HOSTCC) $(HOSTCFLAGS) -I$(MW_SRC)/include $< -o $@
+
+$(MW_IMGDIR)/%.c: $(MW_SRC)/images/demos/mwin/%.bmp $(MW_CONVBMP)
+	mkdir -p $(MW_IMGDIR)
+	$(CURDIR)/$(MW_CONVBMP) -o $@ $<
+
+clean::
+	$(call DELFILE, $(MW_IMAGES:%=$(MW_IMGDIR)/%.c))
+	$(Q) rmdir $(MW_IMGDIR) 2>/dev/null || true
+	$(call DELFILE, $(MW_CONVBMP))
+
+CFLAGS += -Wno-undef 
+CFLAGS += -DNOGDI
+
+include $(APPDIR)/Application.mk
diff --git a/examples/microwindows/mwdemo.c b/examples/microwindows/mwdemo.c
new file mode 100644
index 000000000..c672fd459
--- /dev/null
+++ b/examples/microwindows/mwdemo.c
@@ -0,0 +1,333 @@
+/****************************************************************************
+ * apps/examples/microwindows/mwdemo.c
+ *
+ * Copyright (c) 1999, 2000, 2001, 2010 Greg Haerr <greg@censoft.com>
+ * Portions Copyright (c) 2002 by Koninklijke Philips Electronics N.V.
+ *
+ * Demo program for Microwindows
+ *
+ *  GB: 10-14-2004: Modified to store degrees data on each window,
+ *                  for new Timers features.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <uni_std.h>
+#define MWINCLUDECOLORS
+#include <windows.h>
+#include <device.h>
+#include <graph3d.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef struct
+{
+  int startdegrees;
+  int enddegrees;
+} demoWndData;
+
+typedef demoWndData *pdemoWndData;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+extern MWIMAGEHDR image_penguin;
+PMWIMAGEHDR g_image = &image_penguin;
+
+#define APPCLASS    "test"
+#define APPCHILD    "test2"
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wp, LPARAM lp);
+
+LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT uMsg, WPARAM wp, LPARAM lp);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+int MwUserInit(int ac, char **av)
+{
+  /* test user init procedure - do nothing */
+
+  return 0;
+}
+
+int RegisterAppClass(HINSTANCE hInstance)
+{
+  WNDCLASS wc;
+
+  /* register builtin controls and dialog classes */
+
+  MwInitializeDialogs(hInstance);
+
+  wc.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW;
+  wc.lpfnWndProc = (WNDPROC) WndProc;
+  wc.cbClsExtra = 0;
+  wc.cbWndExtra = sizeof(LONG_PTR);
+  wc.hInstance = 0;
+  wc.hIcon = 0;                 /* LoadIcon(GetHInstance(), MAKEINTRESOURCE(
+                                 * 1)); */
+  wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+  wc.hbrBackground = (HBRUSH) GetStockObject(LTGRAY_BRUSH);
+  wc.lpszMenuName = NULL;
+  wc.lpszClassName = APPCLASS;
+  RegisterClass(&wc);
+
+  wc.lpfnWndProc = (WNDPROC) ChildWndProc;
+  wc.lpszClassName = APPCHILD;
+  return RegisterClass(&wc);
+}
+
+HWND CreateAppWindow(void)
+{
+  HWND hwnd;
+  static int nextid = 1;
+  int width;
+  int height;
+  RECT r;
+  GetWindowRect(GetDesktopWindow(), &r);
+  width = height = r.right / 2;
+
+  hwnd = CreateWindowEx(0L, APPCLASS,
+                        "Microwindows Application",
+                        WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+                        CW_USEDEFAULT, CW_USEDEFAULT,
+                        width, height,
+                        NULL, (HMENU)(LONG_PTR)nextid++, NULL, NULL);
+
+  if (hwnd && (nextid & 03) != 2)
+    {
+      CreateWindowEx(0L, APPCHILD,
+                     "",
+                     WS_BORDER | WS_CHILD | WS_VISIBLE,
+                     4, 4, width / 3 - 6, height / 3,
+                     hwnd, (HMENU)2, NULL, NULL);
+      CreateWindowEx(0L, APPCHILD,
+                     "",
+                     WS_BORDER | WS_CHILD | WS_VISIBLE,
+                     width / 3, height / 3,
+                     width / 3 - 6, height / 3,
+                     hwnd, (HMENU)3, NULL, NULL);
+      CreateWindowEx(0L, APPCHILD,
+                     "",
+                     WS_BORDER | WS_CHILD | WS_VISIBLE,
+                     width * 3 / 5, height * 3 / 5,
+                     width * 2 / 3, height * 2 / 3,
+                     hwnd, (HMENU)4, NULL, NULL);
+      CreateWindowEx(0L, "EDIT",
+                     "OK",
+                     WS_BORDER | WS_CHILD | WS_VISIBLE,
+                     width * 5 / 8, 10,
+                     100, 18,
+                     hwnd, (HMENU)5, NULL, NULL);
+      CreateWindowEx(0L, "PROGBAR",
+                     "OK",
+                     WS_BORDER | WS_CHILD | WS_VISIBLE,
+                     width * 5 / 8, 32,
+                     100, 18,
+                     hwnd, (HMENU)6, NULL, NULL);
+
+      HWND hlist = CreateWindowEx(0L, "LISTBOX",
+                                  "OK",
+                                  WS_HSCROLL | WS_VSCROLL |
+                                  WS_BORDER | WS_CHILD |
+                                  WS_VISIBLE,
+                                  width * 5 / 8, 54,
+                                  100, 48,
+                                  hwnd, (HMENU)7, NULL, NULL);
+      SendMessage(hlist, LB_ADDSTRING, 0,
+                  (LPARAM)(LPSTR)"Cherry");
+      SendMessage(hlist, LB_ADDSTRING, 0,
+                  (LPARAM)(LPSTR)"Apple");
+      SendMessage(hlist, LB_ADDSTRING, 0,
+                  (LPARAM)(LPSTR)"Orange");
+
+      CreateWindowEx(0L, "BUTTON",
+                     "Cancel",
+                     BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE,
+                     width * 5 / 8 + 50, 106,
+                     50, 14,
+                     hwnd, (HMENU)8, NULL, NULL);
+    }
+
+  return hwnd;
+}
+
+LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+  RECT rc;
+  PAINTSTRUCT ps;
+
+  switch (msg)
+    {
+    case WM_PAINT:
+      BeginPaint(hwnd, &ps);
+      GetClientRect(hwnd, &rc);
+
+      HDC hdcMem;
+      HBITMAP hbmp, hbmpOrg;
+
+      /* redirect painting to offscreen dc, then use blit function */
+
+      hdcMem = CreateCompatibleDC(ps.hdc);
+
+      /* Note: rc.right, rc.bottom happens to be smaller than image
+       * width/height.  We use the image size, so we can stretchblit
+       * from the whole image.
+       */
+
+      hbmp = CreateCompatibleBitmap(hdcMem, g_image->width,
+                                    g_image->height);
+      hbmpOrg = SelectObject(hdcMem, hbmp);
+
+      /* draw onto offscreen dc */
+
+      DrawDIB(hdcMem, 0, 0, g_image);
+
+      /* blit offscreen with physical screen */
+
+      StretchBlt(ps.hdc, 0, 0, rc.right * 4 / 5,
+                 rc.bottom * 4 / 5, hdcMem,
+                 0, 0, g_image->width, g_image->height, MWROP_COPY);
+      DeleteObject(SelectObject(hdcMem, hbmpOrg));
+      DeleteDC(hdcMem);
+      EndPaint(hwnd, &ps);
+      break;
+    default:
+      return DefWindowProc(hwnd, msg, wp, lp);
+    }
+
+  return 0;
+}
+
+LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+  PAINTSTRUCT ps;
+  HDC hdc;
+  RECT rc;
+  static int countup = 1;
+  int id;
+  static vec1 gx;
+  static vec1 gy;
+  static POINT mousept;
+  pdemoWndData pData;
+
+  switch (msg)
+    {
+    case WM_CREATE:
+      pData = (pdemoWndData) malloc(sizeof(demoWndData));
+      SetWindowLongPtr(hwnd, 0, (LONG_PTR) pData);
+      mousept.x = 60;
+      mousept.y = 20;
+      pData->startdegrees = 0;
+      pData->enddegrees = 30;
+      SetTimer(hwnd, 1, (50 + random() % 250), NULL);
+      break;
+
+    case WM_TIMER:
+      pData = (pdemoWndData)(LONG_PTR)GetWindowLongPtr(hwnd, 0);
+      GetClientRect(hwnd, &rc);
+      if (countup)
+        {
+          mousept.y += 20;
+          if (mousept.y >= rc.bottom)
+            {
+              mousept.y -= 20;
+              countup = 0;
+            }
+        }
+      else
+        {
+          mousept.y -= 20;
+          if (mousept.y < 20)
+            {
+              mousept.y += 20;
+              countup = 1;
+            }
+        }
+
+      SendMessage(hwnd, WM_MOUSEMOVE, 0,
+                  MAKELONG(mousept.x, mousept.y));
+      break;
+    case WM_DESTROY:
+      KillTimer(hwnd, 1);
+      pData = (pdemoWndData)(LONG_PTR)GetWindowLongPtr(hwnd, 0);
+      free(pData);
+      SetWindowLongPtr(hwnd, 0, (LONG_PTR)0);
+      break;
+    case WM_SIZE:
+      break;
+    case WM_MOVE:
+      break;
+
+    case WM_ERASEBKGND:
+      if ((GetWindowLong(hwnd, GWL_ID) & 03) == 1)
+        {
+          return 1;
+        }
+
+      return DefWindowProc(hwnd, msg, wp, lp);
+    case WM_PAINT:
+      hdc = BeginPaint(hwnd, &ps);
+      id = (int)GetWindowLong(hwnd, GWL_ID) & 03;
+      init3(hdc, id == 1 ? hwnd : NULL);
+      switch (id)
+        {
+        case 0:
+          rose(1.0, 7, 13);
+          break;
+        case 1:
+          look3(-2 * gx, -2 * gy, 1.2);
+          drawgrid(-8.0, 8.0, 10, -8.0, 8.0, 10);
+          break;
+        case 2:
+          setcolor3(BLACK);
+          circle3(1.0);
+          break;
+        case 3:
+          setcolor3(BLUE);
+          daisy(1.0, 20);
+          break;
+        }
+
+      paint3(hdc);
+      EndPaint(hwnd, &ps);
+      break;
+
+    case WM_MOUSEMOVE:
+      pData = (pdemoWndData)(LONG_PTR)GetWindowLongPtr(hwnd, 0);
+      if ((GetWindowLong(hwnd, GWL_ID) & 03) == 1)
+        {
+          POINT pt;
+
+          POINTSTOPOINT(pt, lp);
+          GetClientRect(hwnd, &rc);
+          gx = (vec1) pt.x / rc.right;
+          gy = (vec1) pt.y / rc.bottom;
+          InvalidateRect(hwnd, NULL, FALSE);
+          mousept.x = pt.x;
+          mousept.y = pt.y;
+        }
+      break;
+    case WM_LBUTTONDOWN:
+      break;
+    case WM_LBUTTONUP:
+      break;
+    case WM_RBUTTONDOWN:
+      break;
+    default:
+      return DefWindowProc(hwnd, msg, wp, lp);
+    }
+
+  return 0;
+}
diff --git a/examples/microwindows/mwdemo_main.c b/examples/microwindows/mwdemo_main.c
new file mode 100644
index 000000000..f8860074b
--- /dev/null
+++ b/examples/microwindows/mwdemo_main.c
@@ -0,0 +1,101 @@
+/****************************************************************************
+ * apps/examples/microwindows/mwdemo_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <time.h>
+#include <stdlib.h>
+#include <uni_std.h>
+#include <windows.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+extern MWIMAGEHDR image_microwin;
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+extern int RegisterAppClass(HINSTANCE hInstance);
+extern HWND CreateAppWindow(void);
+
+#define APPCLASS    "test"
+#define APPCHILD    "test2"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  MSG msg;
+  HWND hwnd;
+  RECT rc;
+
+  invoke_WinMain_Start(argc, argv);
+
+  srandom(time(NULL));
+  RegisterAppClass(0);
+  GetWindowRect(GetDesktopWindow(), &rc);
+
+  /* create penguin window */
+
+  CreateWindowEx(0L, APPCHILD, "",
+                 WS_BORDER | WS_VISIBLE,
+                 rc.right - 130 - 1, rc.bottom - 153 - 1,
+                 130, 153,
+                 GetDesktopWindow(), (HMENU)1000, NULL, NULL);
+
+  CreateAppWindow();
+  CreateAppWindow();
+  CreateAppWindow();
+  CreateAppWindow();
+  CreateAppWindow();
+  CreateAppWindow();
+  CreateAppWindow();
+  CreateAppWindow();
+
+  /* set background wallpaper */
+
+  MwSetDesktopWallpaper(&image_microwin);
+  hwnd = CreateAppWindow();
+  GetWindowRect(hwnd, &rc);
+  OffsetRect(&rc, 50, 50);
+  MoveWindow(hwnd, rc.left, rc.top,
+             rc.bottom - rc.top,
+             rc.right - rc.left, TRUE);
+
+  while (GetMessage(&msg, NULL, 0, 0))
+    {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    }
+
+  invoke_WinMain_End();
+
+  return 0;
+}

From b695ec057f1eb35b4e9ea75f14b371c1e796aa32 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Thu, 23 Jul 2026 18:40:26 +0200
Subject: [PATCH 548/568] system/xipfs: Add a command to compact a xipfs volume
 and report it.

xipfs has a defragmentation ioctl and no way to reach it from a shell.  The
only caller was a demo in examples/nxflatxip, which built its own block map
to show what compaction had done.

  xipfs [-n] [-t <ms>] [<mountpoint>]

-n surveys and reports without moving anything: where each file sits, a map
of the volume, and how much of the free space a single allocation can reach.
That last number is the one a caller facing -ENOSPC actually wants; at 0%
the largest possible file already fits however scattered the map looks.

The compaction is asked for through a descriptor for the mountpoint
directory, so no file inside the volume is open while it runs and a single
pass can reach every extent.

The walk descends into the directories xipfs synthesises from names, and
reports each file by its path relative to the mount, so a volume that uses
them is described in full rather than down to its first level.

Block totals come from statfs rather than XIPFSIOC_EXTENTINFO, because that
one does name a file and an empty volume has none, yet its geometry is still
worth reporting.

Assisted-by: Claude Code:claude-opus-4-8
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 system/xipfs/CMakeLists.txt |  35 +++
 system/xipfs/Kconfig        |  38 +++
 system/xipfs/Make.defs      |  25 ++
 system/xipfs/Makefile       |  34 ++
 system/xipfs/xipfs_main.c   | 610 ++++++++++++++++++++++++++++++++++++
 5 files changed, 742 insertions(+)
 create mode 100644 system/xipfs/CMakeLists.txt
 create mode 100644 system/xipfs/Kconfig
 create mode 100644 system/xipfs/Make.defs
 create mode 100644 system/xipfs/Makefile
 create mode 100644 system/xipfs/xipfs_main.c

diff --git a/system/xipfs/CMakeLists.txt b/system/xipfs/CMakeLists.txt
new file mode 100644
index 000000000..35a83b30b
--- /dev/null
+++ b/system/xipfs/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/system/xipfs/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_XIPFS)
+  nuttx_add_application(
+    MODULE
+    ${CONFIG_SYSTEM_XIPFS}
+    NAME
+    ${CONFIG_SYSTEM_XIPFS_PROGNAME}
+    STACKSIZE
+    ${CONFIG_SYSTEM_XIPFS_STACKSIZE}
+    PRIORITY
+    ${CONFIG_SYSTEM_XIPFS_PRIORITY}
+    SRCS
+    xipfs_main.c)
+endif()
diff --git a/system/xipfs/Kconfig b/system/xipfs/Kconfig
new file mode 100644
index 000000000..1b80296ab
--- /dev/null
+++ b/system/xipfs/Kconfig
@@ -0,0 +1,38 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_XIPFS
+	tristate "xipfs defragmentation command"
+	default n
+	depends on FS_XIPFS
+	---help---
+		Enable the 'xipfs' command, which compacts a xipfs volume and
+		reports how its erase blocks are laid out.  With -n it only
+		reports -- block usage, a map of the volume, and how much of the
+		free space a single allocation can reach -- and moves nothing.
+
+if SYSTEM_XIPFS
+
+config SYSTEM_XIPFS_PROGNAME
+	string "Program name"
+	default "xipfs"
+	---help---
+		The name of the command as it appears in NSH.
+
+config SYSTEM_XIPFS_MOUNTPOINT
+	string "Default mountpoint"
+	default "/mnt/xipfs"
+	---help---
+		The volume operated on when none is given on the command line.
+
+config SYSTEM_XIPFS_PRIORITY
+	int "Task priority"
+	default 100
+
+config SYSTEM_XIPFS_STACKSIZE
+	int "Stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif # SYSTEM_XIPFS
diff --git a/system/xipfs/Make.defs b/system/xipfs/Make.defs
new file mode 100644
index 000000000..ffea2b284
--- /dev/null
+++ b/system/xipfs/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/xipfs/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_XIPFS),)
+CONFIGURED_APPS += $(APPDIR)/system/xipfs
+endif
diff --git a/system/xipfs/Makefile b/system/xipfs/Makefile
new file mode 100644
index 000000000..25fff38b8
--- /dev/null
+++ b/system/xipfs/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/system/xipfs/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# xipfs defragmentation command
+
+PROGNAME = $(CONFIG_SYSTEM_XIPFS_PROGNAME)
+PRIORITY = $(CONFIG_SYSTEM_XIPFS_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_XIPFS_STACKSIZE)
+MODULE = $(CONFIG_SYSTEM_XIPFS)
+
+MAINSRC = xipfs_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/system/xipfs/xipfs_main.c b/system/xipfs/xipfs_main.c
new file mode 100644
index 000000000..0331fd0f2
--- /dev/null
+++ b/system/xipfs/xipfs_main.c
@@ -0,0 +1,610 @@
+/****************************************************************************
+ * apps/system/xipfs/xipfs_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/ioctl.h>
+#include <sys/statfs.h>
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nuttx/fs/ioctl.h>
+#include <nuttx/fs/xipfs.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MAP_COLS 50
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* One row of the file table, gathered before anything is printed so that a
+ * failure part way through does not leave half a report behind.
+ */
+
+struct xipfs_entry_s
+{
+  /* A path relative to the mountpoint, not one component, so that a file in
+   * a subdirectory is reported the way the volume names it.
+   */
+
+  char     name[XIPFS_PATH_MAX + 1];
+  uint32_t start;                    /* Relative to the data region */
+  uint32_t nblocks;
+  uint32_t size;
+  uint32_t pincount;
+};
+
+struct xipfs_survey_s
+{
+  FAR char *map;                     /* One char per erase block    */
+  FAR struct xipfs_entry_s *files;
+  int      nfiles;
+  uint32_t nblocks;                  /* Blocks in the data region   */
+  uint32_t blocksize;
+  uint32_t used;
+  uint32_t freeblocks;
+  uint32_t largestrun;
+  uint32_t nruns;                    /* Distinct free runs          */
+  uint32_t pinned;
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void show_usage(FAR const char *progname, int exitcode)
+{
+  fprintf(stderr, "USAGE: %s [-n] [-t <ms>] [<mountpoint>]\n", progname);
+  fprintf(stderr, "\nCompact a xipfs volume, or report what one looks "
+                  "like.\n");
+  fprintf(stderr, "\nWhere:\n");
+  fprintf(stderr, "\t-n: Dry run.  Report block usage and fragmentation "
+                  "and exit\n");
+  fprintf(stderr, "\t    without moving anything.\n");
+  fprintf(stderr, "\t-t <ms>: Time budget for the compaction pass.  "
+                  "0, the default,\n");
+  fprintf(stderr, "\t    means run to completion.\n");
+  fprintf(stderr, "\t<mountpoint>: Default: %s\n",
+          CONFIG_SYSTEM_XIPFS_MOUNTPOINT);
+  exit(exitcode);
+}
+
+/****************************************************************************
+ * Name: survey_free
+ ****************************************************************************/
+
+static void survey_free(FAR struct xipfs_survey_s *s)
+{
+  free(s->map);
+  free(s->files);
+  s->map   = NULL;
+  s->files = NULL;
+}
+
+/****************************************************************************
+ * Name: parse_max_ms
+ ****************************************************************************/
+
+static int parse_max_ms(FAR const char *arg, FAR uint32_t *max_ms)
+{
+  FAR char *endptr;
+  unsigned long value;
+
+  if (arg[0] == '-')
+    {
+      return -EINVAL;
+    }
+
+  errno = 0;
+  value = strtoul(arg, &endptr, 10);
+  if (arg == endptr || *endptr != '\0' || errno == ERANGE ||
+      value > UINT32_MAX)
+    {
+      return -EINVAL;
+    }
+
+  *max_ms = value;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: survey_walk
+ *
+ * Description:
+ *   Record where every file below 'dir' physically sits, descending into
+ *   the directories xipfs synthesises from the names.  'rel' is the path of
+ *   'dir' relative to the mount, which is what a file is recorded under so
+ *   that the table names it the way the volume does.
+ *
+ ****************************************************************************/
+
+static int survey_walk(FAR const char *dir, FAR const char *rel,
+                       FAR struct xipfs_survey_s *s, FAR int *capacity)
+{
+  struct xipfs_extent_info_s info;
+  FAR struct dirent *de;
+  FAR DIR *dirp;
+  uint32_t i;
+  int ret;
+
+  dirp = opendir(dir);
+  if (dirp == NULL)
+    {
+      fprintf(stderr, "ERROR: opendir %s failed: %d\n", dir, errno);
+      return -errno;
+    }
+
+  while ((de = readdir(dirp)) != NULL)
+    {
+      FAR struct xipfs_entry_s *e;
+      char path[PATH_MAX];
+      char sub[XIPFS_PATH_MAX + 1];
+      int fd;
+
+      snprintf(path, sizeof(path), "%s/%s", dir, de->d_name);
+
+      if (rel[0] == '\0')
+        {
+          strlcpy(sub, de->d_name, sizeof(sub));
+        }
+      else
+        {
+          snprintf(sub, sizeof(sub), "%s/%s", rel, de->d_name);
+        }
+
+      if (de->d_type == DTYPE_DIRECTORY)
+        {
+          ret = survey_walk(path, sub, s, capacity);
+          if (ret < 0)
+            {
+              closedir(dirp);
+              return ret;
+            }
+
+          continue;
+        }
+
+      fd = open(path, O_RDONLY | O_CLOEXEC);
+      if (fd < 0)
+        {
+          continue;
+        }
+
+      ret = ioctl(fd, XIPFSIOC_EXTENTINFO, (unsigned long)(uintptr_t)&info);
+      close(fd);
+
+      if (ret < 0)
+        {
+          continue;
+        }
+
+      if (s->nfiles == *capacity)
+        {
+          FAR void *tmp;
+
+          *capacity *= 2;
+          tmp = realloc(s->files, *capacity * sizeof(struct xipfs_entry_s));
+          if (tmp == NULL)
+            {
+              closedir(dirp);
+              return -ENOMEM;
+            }
+
+          s->files = tmp;
+        }
+
+      e = &s->files[s->nfiles++];
+      strlcpy(e->name, sub, sizeof(e->name));
+      e->start    = info.start_block - info.data_start;
+      e->nblocks  = info.nblocks;
+      e->size     = info.size;
+      e->pincount = info.pincount;
+
+      if (e->pincount > 0)
+        {
+          s->pinned += e->nblocks;
+        }
+
+      for (i = 0; i < e->nblocks; i++)
+        {
+          if (e->start + i < s->nblocks)
+            {
+              s->map[e->start + i] = e->pincount > 0 ? 'P' : '#';
+            }
+        }
+    }
+
+  closedir(dirp);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: survey_collect
+ *
+ * Description:
+ *   Walk the mount and record where every file physically sits.  The block
+ *   counts come from statfs so that an empty volume still reports its
+ *   geometry -- XIPFSIOC_EXTENTINFO can only be issued against a regular
+ *   file, so with no files there is nothing to ask.
+ *
+ ****************************************************************************/
+
+static int survey_collect(FAR const char *mount,
+                          FAR struct xipfs_survey_s *s)
+{
+  struct statfs sbuf;
+  uint32_t run = 0;
+  uint32_t i;
+  int capacity = 8;
+  int ret;
+
+  memset(s, 0, sizeof(*s));
+
+  if (statfs(mount, &sbuf) < 0)
+    {
+      fprintf(stderr, "ERROR: statfs %s failed: %d\n", mount, errno);
+      return -errno;
+    }
+
+  s->nblocks   = sbuf.f_blocks;
+  s->blocksize = sbuf.f_bsize;
+
+  if (s->nblocks == 0)
+    {
+      fprintf(stderr, "ERROR: %s reports no blocks; not a xipfs mount?\n",
+              mount);
+      return -EINVAL;
+    }
+
+  s->map = malloc(s->nblocks);
+  if (s->map == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  memset(s->map, '.', s->nblocks);
+
+  s->files = malloc(capacity * sizeof(struct xipfs_entry_s));
+  if (s->files == NULL)
+    {
+      survey_free(s);
+      return -ENOMEM;
+    }
+
+  ret = survey_walk(mount, "", s, &capacity);
+  if (ret < 0)
+    {
+      survey_free(s);
+      return ret;
+    }
+
+  /* Reduce the map to the numbers a caller actually decides on: how much is
+   * free, and how much of that is reachable by a single allocation.
+   */
+
+  for (i = 0; i < s->nblocks; i++)
+    {
+      if (s->map[i] == '.')
+        {
+          s->freeblocks++;
+          if (run == 0)
+            {
+              s->nruns++;
+            }
+
+          if (++run > s->largestrun)
+            {
+              s->largestrun = run;
+            }
+        }
+      else
+        {
+          s->used++;
+          run = 0;
+        }
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: survey_report
+ ****************************************************************************/
+
+static void survey_report(FAR const char *mount,
+                          FAR struct xipfs_survey_s *s)
+{
+  uint32_t frag;
+  uint32_t i;
+  int width;
+  int f;
+
+  printf("%s: %" PRIu32 " blocks of %" PRIu32 " bytes (%" PRIu64
+         " KB)\n", mount, s->nblocks, s->blocksize,
+         (uint64_t)s->nblocks * s->blocksize / 1024);
+
+  if (s->nfiles > 0)
+    {
+      /* A name here is a path relative to the mountpoint, so it can be
+       * longer than one component.  Widen the column to the longest one
+       * rather than let it push the rest of the row out of alignment.
+       */
+
+      width = XIPFS_NAME_MAX;
+      for (f = 0; f < s->nfiles; f++)
+        {
+          int len = (int)strlen(s->files[f].name);
+
+          if (len > width)
+            {
+              width = len;
+            }
+        }
+
+      printf("\n  %-*s %6s %7s %8s %4s\n", width, "file",
+             "start", "blocks", "bytes", "pin");
+
+      for (f = 0; f < s->nfiles; f++)
+        {
+          FAR struct xipfs_entry_s *e = &s->files[f];
+
+          printf("  %-*s %6" PRIu32 " %7" PRIu32 " %8" PRIu32
+                 " %4" PRIu32 "\n", width, e->name, e->start, e->nblocks,
+                 e->size, e->pincount);
+        }
+    }
+
+  printf("\n");
+
+  for (i = 0; i < s->nblocks; i += MAP_COLS)
+    {
+      uint32_t n = s->nblocks - i;
+      char row[MAP_COLS + 1];
+
+      if (n > MAP_COLS)
+        {
+          n = MAP_COLS;
+        }
+
+      memcpy(row, &s->map[i], n);
+      row[n] = '\0';
+      printf("  %4" PRIu32 " |%s|\n", i, row);
+    }
+
+  printf("\n  '.' free   '#' in use   'P' pinned by a live mapping\n");
+
+  /* The share of free space that a single allocation cannot reach.  This is
+   * the number that says whether compacting is worth doing: at 0% the
+   * largest possible file already fits, whatever the map looks like.
+   */
+
+  frag = 0;
+  if (s->freeblocks > 0)
+    {
+      frag = (uint32_t)(((uint64_t)(s->freeblocks - s->largestrun) * 100) /
+                        s->freeblocks);
+    }
+
+  printf("\n  used %" PRIu32 ", free %" PRIu32
+         ", largest free run %" PRIu32 " blocks (%" PRIu64 " KB)\n",
+         s->used, s->freeblocks, s->largestrun,
+         (uint64_t)s->largestrun * s->blocksize / 1024);
+  printf("  %" PRIu32 " free run%s, fragmentation %" PRIu32 "%%\n",
+         s->nruns, s->nruns == 1 ? "" : "s", frag);
+
+  if (s->pinned > 0)
+    {
+      printf("  %" PRIu32 " block%s pinned and cannot be relocated\n",
+             s->pinned, s->pinned == 1 ? "" : "s");
+    }
+
+  if (frag == 0)
+    {
+      printf("  nothing to gain: all free space is already contiguous\n");
+    }
+  else
+    {
+      printf("  compacting could raise the largest run to %" PRIu32
+             " blocks (%" PRIu64 " KB)\n", s->freeblocks,
+             (uint64_t)s->freeblocks * s->blocksize / 1024);
+    }
+}
+
+/****************************************************************************
+ * Name: reason_str
+ ****************************************************************************/
+
+static FAR const char *reason_str(int reason)
+{
+  switch (reason)
+    {
+      case XIPFS_DEFRAG_DONE:
+        return "done, nothing left to compact";
+      case XIPFS_DEFRAG_BLOCKED_PINS:
+        return "blocked by a live XIP mapping";
+      case XIPFS_DEFRAG_BLOCKED_RAM:
+        return "blocked by a transient resource shortage";
+      case XIPFS_DEFRAG_TIME_BUDGET:
+        return "ran out of the time budget";
+      case XIPFS_DEFRAG_ERROR:
+        return "stopped on a media error";
+      case XIPFS_DEFRAG_BLOCKED_OPEN:
+        return "blocked by an open file";
+      default:
+        return "unknown";
+    }
+}
+
+/****************************************************************************
+ * Name: run_defrag
+ *
+ * Description:
+ *   Compact the volume.  The ioctl goes through a descriptor for the
+ *   mountpoint directory rather than for a file inside the volume: no file
+ *   is open, so nothing is held immovable by the act of asking and one pass
+ *   can reach every extent.
+ *
+ ****************************************************************************/
+
+static int run_defrag(FAR const char *mount, FAR struct xipfs_survey_s *s,
+                      uint32_t max_ms)
+{
+  struct xipfs_defrag_arg_s arg;
+  int fd;
+  int ret;
+
+  if (s->nfiles == 0)
+    {
+      printf("\n%s is empty; nothing to compact\n", mount);
+      return OK;
+    }
+
+  memset(&arg, 0, sizeof(arg));
+  arg.max_ms = max_ms;
+
+  fd = open(mount, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      fprintf(stderr, "ERROR: open %s failed: %d\n", mount, errno);
+      return -errno;
+    }
+
+  printf("\ncompacting %s ...\n", mount);
+
+  ret = ioctl(fd, XIPFSIOC_DEFRAG, (unsigned long)(uintptr_t)&arg);
+  close(fd);
+
+  if (ret < 0)
+    {
+      fprintf(stderr, "ERROR: defrag failed: %d\n", errno);
+      return -errno;
+    }
+
+  printf("  %s: moved %" PRIu32 " extent%s, reclaimed %" PRIu32
+         " block%s, %" PRIu32 " pinned\n", reason_str(arg.result.reason),
+         arg.result.extents_moved,
+         arg.result.extents_moved == 1 ? "" : "s",
+         arg.result.blocks_reclaimed,
+         arg.result.blocks_reclaimed == 1 ? "" : "s",
+         arg.result.blocks_pinned);
+
+  printf("  largest free run now %zu bytes\n",
+         arg.result.largest_free_run);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR const char *mount = CONFIG_SYSTEM_XIPFS_MOUNTPOINT;
+  struct xipfs_survey_s survey;
+  bool dryrun = false;
+  uint32_t max_ms = 0;
+  int option;
+  int ret;
+
+  while ((option = getopt(argc, argv, "nt:h")) != ERROR)
+    {
+      switch (option)
+        {
+          case 'n':
+            dryrun = true;
+            break;
+
+          case 't':
+            ret = parse_max_ms(optarg, &max_ms);
+            if (ret < 0)
+              {
+                fprintf(stderr, "ERROR: invalid time budget: %s\n", optarg);
+                show_usage(argv[0], EXIT_FAILURE);
+              }
+            break;
+
+          case 'h':
+            show_usage(argv[0], EXIT_SUCCESS);
+            break;
+
+          default:
+            show_usage(argv[0], EXIT_FAILURE);
+            break;
+        }
+    }
+
+  if (optind < argc)
+    {
+      mount = argv[optind];
+    }
+
+  ret = survey_collect(mount, &survey);
+  if (ret < 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  survey_report(mount, &survey);
+
+  if (!dryrun)
+    {
+      ret = run_defrag(mount, &survey, max_ms);
+      survey_free(&survey);
+
+      if (ret < 0)
+        {
+          return EXIT_FAILURE;
+        }
+
+      /* Re-survey so the map shown last is the one on the media now. */
+
+      ret = survey_collect(mount, &survey);
+      if (ret < 0)
+        {
+          return EXIT_FAILURE;
+        }
+
+      printf("\nafter compaction:\n");
+      survey_report(mount, &survey);
+    }
+
+  survey_free(&survey);
+  return EXIT_SUCCESS;
+}

From 3a03552c6ad13d835d2dd62e358d9ffd82b161c5 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Sat, 25 Jul 2026 13:53:16 +0200
Subject: [PATCH 549/568] testing/fs/xipfs: Add a test suite for the xipfs file
 system.

Twelve sections, selected by name on the command line because the power loss
sweeps run for minutes while everything else runs in seconds.

The routine part covers the VFS paths, the write-once rules (reopen for
write, append, seek during write, truncate of a written file are all refused)
and both mmap variants: that a plain mapping lands inside the media window
with no heap growth, that MAP_XIP_STRICT fails with ENXIO rather than
copying, and that N mappings of one file produce N pins on one extent.

The rest is aimed at the two properties that are easy to get wrong and quiet
when they are:

Pin release.  A pin taken by one task and a task that dies with a mapping
still live both have to end with the extent movable again -- the second
without the task ever calling munmap, since a module that faults never will.
Both are checked by asking the defragmenter to move the extent afterwards.

Power-loss atomicity.  With CONFIG_FS_XIPFS_FAULT_INJECT the suite fails the
Nth flash operation, remounts, and checks the volume is consistent and every
file that had been committed is byte-for-byte intact.  It sweeps N across
create, unlink and defragmentation, and repeats the sweep with the failing
write torn -- a partial program rather than a clean refusal -- which is what
a real power loss mid-program leaves behind.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 testing/fs/xipfs/CMakeLists.txt |   33 +
 testing/fs/xipfs/Kconfig        |   38 +
 testing/fs/xipfs/Make.defs      |   25 +
 testing/fs/xipfs/Makefile       |   34 +
 testing/fs/xipfs/xipfs_main.c   | 2034 +++++++++++++++++++++++++++++++
 5 files changed, 2164 insertions(+)
 create mode 100644 testing/fs/xipfs/CMakeLists.txt
 create mode 100644 testing/fs/xipfs/Kconfig
 create mode 100644 testing/fs/xipfs/Make.defs
 create mode 100644 testing/fs/xipfs/Makefile
 create mode 100644 testing/fs/xipfs/xipfs_main.c

diff --git a/testing/fs/xipfs/CMakeLists.txt b/testing/fs/xipfs/CMakeLists.txt
new file mode 100644
index 000000000..720224f73
--- /dev/null
+++ b/testing/fs/xipfs/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ##############################################################################
+# apps/testing/fs/xipfs/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_FS_XIPFS)
+  nuttx_add_application(
+    NAME
+    xipfs_test
+    STACKSIZE
+    ${CONFIG_DEFAULT_TASK_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_FS_XIPFS}
+    SRCS
+    xipfs_main.c)
+endif()
diff --git a/testing/fs/xipfs/Kconfig b/testing/fs/xipfs/Kconfig
new file mode 100644
index 000000000..8d4350d9a
--- /dev/null
+++ b/testing/fs/xipfs/Kconfig
@@ -0,0 +1,38 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config TESTING_FS_XIPFS
+	tristate "XIPFS file system test"
+	depends on FS_XIPFS
+	default n
+	---help---
+		Exercise the XIPFS filesystem: the routine VFS paths, the
+		write-once rules, the in-place mmap and its strict variant, and
+		then the corners that actually carry risk -- power loss atomicity
+		of the metadata commit, and release of XIP pins when a task dies
+		without unmapping.
+
+		Takes an optional section name to run just one part, since the
+		power loss sweeps take minutes and everything else takes seconds:
+
+		  xipfs_test          everything
+		  xipfs_test xip      just the execute-in-place mapping tests
+
+		Sections: basic writeonce strict xip multimap crosstask teardown
+		dirs defrag powerloss powertorn unlink dirloss defraglos
+
+		The power loss sections need CONFIG_FS_XIPFS_FAULT_INJECT.
+
+if TESTING_FS_XIPFS
+
+config TESTING_FS_XIPFS_MOUNTPT
+	string "XIPFS mountpoint"
+	default "/mnt/xipfs"
+
+config TESTING_FS_XIPFS_MTD
+	string "MTD device backing the filesystem"
+	default "/dev/rammtd"
+
+endif # TESTING_FS_XIPFS
diff --git a/testing/fs/xipfs/Make.defs b/testing/fs/xipfs/Make.defs
new file mode 100644
index 000000000..7eeca601c
--- /dev/null
+++ b/testing/fs/xipfs/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/fs/xipfs/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_FS_XIPFS),)
+CONFIGURED_APPS += $(APPDIR)/testing/fs/xipfs
+endif
diff --git a/testing/fs/xipfs/Makefile b/testing/fs/xipfs/Makefile
new file mode 100644
index 000000000..45cdeb83d
--- /dev/null
+++ b/testing/fs/xipfs/Makefile
@@ -0,0 +1,34 @@
+############################################################################
+# apps/testing/fs/xipfs/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# XIPFS file system test
+
+PROGNAME = xipfs_test
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE = $(CONFIG_TESTING_FS_XIPFS)
+
+MAINSRC = xipfs_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/testing/fs/xipfs/xipfs_main.c b/testing/fs/xipfs/xipfs_main.c
new file mode 100644
index 000000000..6f2ad2612
--- /dev/null
+++ b/testing/fs/xipfs/xipfs_main.c
@@ -0,0 +1,2034 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/xipfs_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <malloc.h>
+#include <sched.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nuttx/fs/ioctl.h>
+#include <nuttx/fs/xipfs.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MOUNTPT   CONFIG_TESTING_FS_XIPFS_MOUNTPT
+#define MTDDEV    CONFIG_TESTING_FS_XIPFS_MTD
+
+#define PATH(name) MOUNTPT "/" name
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_passed;
+static int g_failed;
+static FAR uint8_t *g_buffer;
+static size_t g_bufsize = 16384;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void report(FAR const char *name, bool ok, FAR const char *detail)
+{
+  if (ok)
+    {
+      g_passed++;
+      printf("  PASS  %s\n", name);
+    }
+  else
+    {
+      g_failed++;
+      printf("  FAIL  %s: %s\n", name, detail ? detail : "");
+    }
+}
+
+#define CHECK(name, cond, detail) report((name), (cond), (detail))
+
+/****************************************************************************
+ * Name: remount
+ *
+ * Description:
+ *   Discard every scrap of in-RAM filesystem state and mount again from the
+ *   medium.  Because the rammtd buffer survives, this is exactly what a
+ *   reboot looks like to the filesystem, which is what makes the power loss
+ *   sweep below meaningful without restarting the simulator.
+ *
+ ****************************************************************************/
+
+static int remount(void)
+{
+  int ret;
+
+  ret = umount(MOUNTPT);
+  if (ret < 0 && errno != ENOENT && errno != EINVAL)
+    {
+      printf("    umount failed: %d\n", errno);
+      return -errno;
+    }
+
+  ret = mount(MTDDEV, MOUNTPT, "xipfs", 0, NULL);
+  if (ret < 0)
+    {
+      return -errno;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: fill_pattern
+ ****************************************************************************/
+
+static void fill_pattern(FAR uint8_t *buf, size_t len, uint8_t seed)
+{
+  size_t i;
+
+  for (i = 0; i < len; i++)
+    {
+      buf[i] = (uint8_t)(seed + (i * 7));
+    }
+}
+
+/****************************************************************************
+ * Name: create_file
+ *
+ * Description:
+ *   Create a file of a known size.  ftruncate is how the exact size is
+ *   declared up front, which is what lets the filesystem reserve the exact
+ *   contiguous extent rather than over-reserving and trimming.
+ *
+ ****************************************************************************/
+
+static int create_file(FAR const char *path, size_t len, uint8_t seed)
+{
+  ssize_t nwritten;
+  int fd;
+  int ret = 0;
+
+  fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  if (ftruncate(fd, len) < 0)
+    {
+      ret = -errno;
+      goto out;
+    }
+
+  fill_pattern(g_buffer, len, seed);
+
+  nwritten = write(fd, g_buffer, len);
+  if (nwritten != (ssize_t)len)
+    {
+      ret = nwritten < 0 ? -errno : -EIO;
+    }
+
+out:
+  if (close(fd) < 0 && ret == 0)
+    {
+      ret = -errno;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: verify_file
+ ****************************************************************************/
+
+static bool verify_file(FAR const char *path, size_t len, uint8_t seed)
+{
+  FAR uint8_t *expect;
+  ssize_t nread;
+  bool ok = false;
+  int fd;
+
+  expect = malloc(len);
+  if (expect == NULL)
+    {
+      return false;
+    }
+
+  fill_pattern(expect, len, seed);
+
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      free(expect);
+      return false;
+    }
+
+  nread = read(fd, g_buffer, len + 1);
+  if (nread == (ssize_t)len && memcmp(g_buffer, expect, len) == 0)
+    {
+      ok = true;
+    }
+
+  close(fd);
+  free(expect);
+  return ok;
+}
+
+/****************************************************************************
+ * Name: extent_info
+ ****************************************************************************/
+
+static int extent_info(FAR const char *path,
+                       FAR struct xipfs_extent_info_s *info)
+{
+  int fd;
+  int ret;
+
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ioctl(fd, XIPFSIOC_EXTENTINFO, (unsigned long)(uintptr_t)info);
+  if (ret < 0)
+    {
+      ret = -errno;
+    }
+
+  close(fd);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: run_defrag
+ ****************************************************************************/
+
+/* Defragmentation acts on the volume, so it is issued on a descriptor for
+ * the mountpoint directory rather than for a file inside it.  That matters
+ * beyond tidiness: a descriptor for a file inside the volume would hold
+ * that file open, and an open extent cannot be relocated, so the pass would
+ * be obstructed by the very act of asking for it.
+ */
+
+static int run_defrag(uint32_t max_ms,
+                      FAR struct xipfs_defrag_result_s *result)
+{
+  struct xipfs_defrag_arg_s arg;
+  int fd;
+  int ret;
+
+  memset(&arg, 0, sizeof(arg));
+  arg.max_ms = max_ms;
+
+  fd = open(MOUNTPT, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ioctl(fd, XIPFSIOC_DEFRAG, (unsigned long)(uintptr_t)&arg);
+  if (ret < 0)
+    {
+      ret = -errno;
+    }
+  else
+    {
+      *result = arg.result;
+    }
+
+  close(fd);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: arm_injector
+ *
+ * Description:
+ *   Arm the fault injector to fail the n'th flash write or erase from now
+ *   on, and every one after it.  'mode' chooses whether the failing
+ *   operation leaves the medium untouched (XIPFS_FAULT_CLEAN) or half-done,
+ *   the way a real cut does (XIPFS_FAULT_TORN).  It is a volume command, so
+ *   it goes through the mountpoint directory like run_defrag, which also
+ *   means it can be armed on a volume with no files in it.
+ *
+ ****************************************************************************/
+
+static int arm_injector(int countdown, uint8_t mode)
+{
+  struct xipfs_fault_s fault;
+  int fd;
+  int ret;
+
+  fault.count = countdown;
+  fault.mode  = mode;
+
+  fd = open(MOUNTPT, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ioctl(fd, XIPFSIOC_FAULTINJECT, (unsigned long)(uintptr_t)&fault);
+  if (ret < 0)
+    {
+      ret = -errno;
+    }
+
+  close(fd);
+  return ret;
+}
+
+/****************************************************************************
+ * Test: basic VFS operations and the contiguity invariant
+ ****************************************************************************/
+
+static void test_basic(void)
+{
+  struct xipfs_extent_info_s info;
+  struct stat st;
+  FAR DIR *dirp;
+  FAR struct dirent *de;
+  int found = 0;
+  int ret;
+
+  printf("\n-- basic VFS --\n");
+
+  ret = create_file(PATH("basic1.bin"), 100, 0x11);
+  CHECK("create small file", ret == 0, strerror(-ret));
+
+  ret = create_file(PATH("basic2.bin"), 9000, 0x22);
+  CHECK("create multi-block file", ret == 0, strerror(-ret));
+
+  CHECK("read back small", verify_file(PATH("basic1.bin"), 100, 0x11), "");
+  CHECK("read back multi-block",
+        verify_file(PATH("basic2.bin"), 9000, 0x22), "");
+
+  ret = stat(PATH("basic2.bin"), &st);
+  CHECK("stat size", ret == 0 && st.st_size == 9000, "wrong size");
+
+  /* The core invariant: one contiguous, erase-block aligned extent whose
+   * block count is exactly what the file size requires.
+   */
+
+  ret = extent_info(PATH("basic2.bin"), &info);
+  CHECK("extent is contiguous and exactly sized",
+        ret == 0 && info.nblocks ==
+        (info.size + info.erasesize - 1) / info.erasesize,
+        "extent size mismatch");
+
+  dirp = opendir(MOUNTPT);
+  if (dirp != NULL)
+    {
+      while ((de = readdir(dirp)) != NULL)
+        {
+          if (strcmp(de->d_name, "basic1.bin") == 0 ||
+              strcmp(de->d_name, "basic2.bin") == 0)
+            {
+              found++;
+            }
+        }
+
+      closedir(dirp);
+    }
+
+  CHECK("readdir lists both files", found == 2, "missing entries");
+
+  ret = unlink(PATH("basic1.bin"));
+  CHECK("unlink", ret == 0, strerror(errno));
+  CHECK("unlinked file is gone", stat(PATH("basic1.bin"), &st) < 0, "");
+
+  /* Survives a remount: the directory is on the medium, not in RAM */
+
+  ret = remount();
+  CHECK("remount", ret == 0, strerror(-ret));
+  CHECK("data survives remount",
+        verify_file(PATH("basic2.bin"), 9000, 0x22), "");
+  CHECK("delete survives remount",
+        stat(PATH("basic1.bin"), &st) < 0, "");
+
+  unlink(PATH("basic2.bin"));
+}
+
+/****************************************************************************
+ * Test: execute-in-place mapping
+ *
+ * This is the test that proves the entire premise.  A mapping must land
+ * inside the flash window and must not cost RAM proportional to the file.
+ ****************************************************************************/
+
+static void test_xip(void)
+{
+  struct xipfs_extent_info_s info;
+  struct mallinfo before;
+  struct mallinfo after;
+  const size_t len = 12288;
+  FAR void *addr;
+  FAR uint8_t *expect;
+  int fd;
+  int ret;
+
+  printf("\n-- XIP mapping --\n");
+
+  ret = create_file(PATH("xip.bin"), len, 0x33);
+  CHECK("create module image", ret == 0, strerror(-ret));
+
+  ret = extent_info(PATH("xip.bin"), &info);
+  CHECK("media is memory mapped", ret == 0 && info.xipaddr != 0,
+        "no XIP base");
+
+  if (info.xipaddr == 0)
+    {
+      return;
+    }
+
+  fd = open(PATH("xip.bin"), O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      CHECK("open for mapping", false, strerror(errno));
+      return;
+    }
+
+  before = mallinfo();
+  addr = mmap(NULL, len, PROT_READ | PROT_EXEC,
+              MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+  after = mallinfo();
+
+  CHECK("strict XIP mmap succeeds", addr != MAP_FAILED, strerror(errno));
+
+  if (addr != MAP_FAILED)
+    {
+      /* The returned pointer must BE the flash address, not a copy of it */
+
+      CHECK("mapping points into flash",
+            (uintptr_t)addr == info.xipaddr, "not the extent address");
+
+      expect = malloc(len);
+      if (expect != NULL)
+        {
+          fill_pattern(expect, len, 0x33);
+          CHECK("mapped bytes match file contents",
+                memcmp(addr, expect, len) == 0, "content mismatch");
+          free(expect);
+        }
+
+      /* A RAM copy would have cost at least the file size.  Allow slack
+       * for the mapping bookkeeping itself.
+       */
+
+      CHECK("mapping does not cost RAM proportional to the file",
+            (after.uordblks - before.uordblks) < (int)(len / 2),
+            "RAM grew by about the file size");
+
+      ret = extent_info(PATH("xip.bin"), &info);
+      CHECK("mapping takes a pin", ret == 0 && info.pincount == 1,
+            "pin not taken");
+
+      ret = munmap(addr, len);
+      CHECK("munmap", ret == 0, strerror(errno));
+
+      ret = extent_info(PATH("xip.bin"), &info);
+      CHECK("munmap drops the pin", ret == 0 && info.pincount == 0,
+            "pin not released");
+    }
+
+  close(fd);
+  unlink(PATH("xip.bin"));
+}
+
+/****************************************************************************
+ * Test: multiple concurrent mappings share one pin count
+ ****************************************************************************/
+
+static void test_multimap(void)
+{
+  struct xipfs_extent_info_s info;
+  const size_t len = 8192;
+  FAR void *addr[3];
+  int fd[3];
+  int i;
+  int ret;
+
+  printf("\n-- concurrent mappings --\n");
+
+  ret = create_file(PATH("multi.bin"), len, 0x44);
+  CHECK("create", ret == 0, strerror(-ret));
+
+  for (i = 0; i < 3; i++)
+    {
+      fd[i] = open(PATH("multi.bin"), O_RDONLY | O_CLOEXEC);
+      addr[i] = mmap(NULL, len, PROT_READ, MAP_SHARED | MAP_XIP_STRICT,
+                     fd[i], 0);
+    }
+
+  ret = extent_info(PATH("multi.bin"), &info);
+  CHECK("three mappings give a pin count of three",
+        ret == 0 && info.pincount == 3, "wrong pin count");
+
+  /* All three must resolve to the same flash address: they alias the same
+   * extent rather than each getting a private copy.
+   */
+
+  CHECK("mappings alias the same flash address",
+        addr[0] == addr[1] && addr[1] == addr[2], "addresses differ");
+
+  /* Within one task, all three mappings share an address, so a single
+   * munmap of that address releases all of them.  That is munmap's range
+   * semantics -- the VFS unmaps every mapping the range covers -- and it
+   * only arises because true XIP makes the addresses identical.  It is not
+   * the multi-instance case: separate module instances are separate tasks
+   * with separate mapping lists, which test_crosstask_pins covers.
+   */
+
+  munmap(addr[0], len);
+  ret = extent_info(PATH("multi.bin"), &info);
+  CHECK("unmapping an aliased address releases that task's mappings",
+        ret == 0 && info.pincount == 0, "pin leaked");
+
+  for (i = 0; i < 3; i++)
+    {
+      close(fd[i]);
+    }
+
+  unlink(PATH("multi.bin"));
+}
+
+/****************************************************************************
+ * Test: pins are refcounted across tasks
+ *
+ * This is the multi-instance case that matters: two tasks each holding a
+ * live XIP mapping of one module.  One of them dying must not release the
+ * other's pin, or the surviving instance would be executing out of blocks
+ * the defragmenter now considers movable.
+ ****************************************************************************/
+
+static int holder_task(int argc, FAR char *argv[])
+{
+  const size_t len = 8192;
+  FAR void *addr;
+  int fd;
+
+  fd = open(PATH("shared.bin"), O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  addr = mmap(NULL, len, PROT_READ, MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+  close(fd);
+
+  if (addr == MAP_FAILED)
+    {
+      return EXIT_FAILURE;
+    }
+
+  /* Exit holding the mapping */
+
+  return EXIT_SUCCESS;
+}
+
+static void test_crosstask_pins(void)
+{
+  struct xipfs_extent_info_s info;
+  const size_t len = 8192;
+  FAR void *addr;
+  int status;
+  pid_t pid;
+  int fd;
+  int ret;
+
+  printf("\n-- cross-task pin refcounting --\n");
+
+  ret = create_file(PATH("shared.bin"), len, 0xaa);
+  CHECK("create", ret == 0, strerror(-ret));
+
+  fd = open(PATH("shared.bin"), O_RDONLY | O_CLOEXEC);
+  addr = mmap(NULL, len, PROT_READ, MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+  CHECK("parent maps", addr != MAP_FAILED, strerror(errno));
+
+  pid = task_create("holder", SCHED_PRIORITY_DEFAULT, 4096, holder_task,
+                    NULL);
+  if (pid > 0)
+    {
+      waitpid(pid, &status, 0);
+      usleep(100000);
+
+      /* The child's teardown must have dropped exactly its own pin */
+
+      ret = extent_info(PATH("shared.bin"), &info);
+      CHECK("a dying task does not release another task's pin",
+            ret == 0 && info.pincount == 1, "wrong pin count");
+    }
+
+  if (addr != MAP_FAILED)
+    {
+      munmap(addr, len);
+    }
+
+  ret = extent_info(PATH("shared.bin"), &info);
+  CHECK("last holder releases the extent",
+        ret == 0 && info.pincount == 0, "pin leaked");
+
+  close(fd);
+  unlink(PATH("shared.bin"));
+}
+
+/****************************************************************************
+ * Test: a task that dies without unmapping must still release its pin
+ ****************************************************************************/
+
+static int leaky_mapper(int argc, FAR char *argv[])
+{
+  const size_t len = 8192;
+  FAR void *addr;
+  int fd;
+
+  fd = open(PATH("leak.bin"), O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  addr = mmap(NULL, len, PROT_READ, MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+  if (addr == MAP_FAILED)
+    {
+      close(fd);
+      return EXIT_FAILURE;
+    }
+
+  /* Deliberately exit with the mapping still live and no munmap call.  A
+   * module that faults or is killed does exactly this, and the pin has to
+   * come back anyway or the extent is immovable forever.
+   */
+
+  close(fd);
+  return EXIT_SUCCESS;
+}
+
+static void test_teardown_release(void)
+{
+  struct xipfs_extent_info_s info;
+  int status;
+  pid_t pid;
+  int ret;
+
+  printf("\n-- pin release on task exit --\n");
+
+  ret = create_file(PATH("leak.bin"), 8192, 0x55);
+  CHECK("create", ret == 0, strerror(-ret));
+
+  pid = task_create("leaky", SCHED_PRIORITY_DEFAULT, 4096, leaky_mapper,
+                    NULL);
+  CHECK("spawn mapper task", pid > 0, strerror(errno));
+
+  if (pid > 0)
+    {
+      waitpid(pid, &status, 0);
+
+      /* Give the exiting task's group teardown a chance to run */
+
+      usleep(100000);
+
+      ret = extent_info(PATH("leak.bin"), &info);
+      CHECK("pin released although the task never called munmap",
+            ret == 0 && info.pincount == 0, "pin leaked on task exit");
+    }
+
+  unlink(PATH("leak.bin"));
+}
+
+/****************************************************************************
+ * Test: directories
+ *
+ * Directories are records in the metadata generation, not names with
+ * separators in them, so what is checked is that they behave like a real
+ * tree: they can be empty, they survive a remount empty, rmdir refuses a
+ * directory that still holds something, and a path through a file or a
+ * missing directory fails the way POSIX says rather than springing into
+ * existence.
+ ****************************************************************************/
+
+static void test_dirs(void)
+{
+  struct stat st;
+  FAR struct dirent *de;
+  FAR DIR *dirp;
+  int binseen = 0;
+  int etcseen = 0;
+  bool sawtop = false;
+  bool sawhello = false;
+  bool sawworld = false;
+  bool badentry = false;
+  int fd;
+  int ret;
+
+  printf("\n-- directories --\n");
+
+  ret = mkdir(PATH("bin"), 0755);
+  CHECK("mkdir", ret == 0, strerror(errno));
+
+  ret = mkdir(PATH("bin"), 0755);
+  CHECK("mkdir of an existing directory is refused",
+        ret < 0 && errno == EEXIST, strerror(errno));
+
+  /* An empty directory is a real thing here, and it has to survive a
+   * remount with nothing inside it.  This is the whole difference from
+   * synthesising directories out of file names.
+   */
+
+  ret = stat(PATH("bin"), &st);
+  CHECK("an empty directory exists", ret == 0 && S_ISDIR(st.st_mode),
+        strerror(errno));
+
+  ret = remount();
+  CHECK("remount", ret == 0, strerror(-ret));
+
+  ret = stat(PATH("bin"), &st);
+  CHECK("an empty directory survives a remount",
+        ret == 0 && S_ISDIR(st.st_mode), strerror(errno));
+
+  /* Files below it, and a directory two levels down */
+
+  ret = create_file(PATH("bin/hello"), 100, 1);
+  CHECK("create a file in a directory", ret == 0, strerror(-ret));
+
+  ret = create_file(PATH("bin/world"), 100, 2);
+  CHECK("create a second one beside it", ret == 0, strerror(-ret));
+
+  ret = mkdir(PATH("etc"), 0755);
+  ret |= mkdir(PATH("etc/conf"), 0755);
+  CHECK("mkdir two levels down", ret == 0, strerror(errno));
+
+  ret = create_file(PATH("etc/conf/net"), 100, 3);
+  CHECK("create a file two levels down", ret == 0, strerror(-ret));
+
+  ret = create_file(PATH("top.bin"), 100, 4);
+  CHECK("create one at the root", ret == 0, strerror(-ret));
+
+  /* A path through a directory that does not exist is an error, not an
+   * invitation to create it.
+   */
+
+  fd = open(PATH("nodir/x"), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  CHECK("a path through a missing directory fails",
+        fd < 0 && errno == ENOENT, strerror(errno));
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  fd = open(PATH("top.bin/deeper"),
+            O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  CHECK("a path through a file fails", fd < 0 && errno == ENOTDIR,
+        strerror(errno));
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  /* Listing: the root holds two directories and a file, once each */
+
+  dirp = opendir(MOUNTPT);
+  while (dirp != NULL && (de = readdir(dirp)) != NULL)
+    {
+      if (strcmp(de->d_name, "bin") == 0 && de->d_type == DTYPE_DIRECTORY)
+        {
+          binseen++;
+        }
+      else if (strcmp(de->d_name, "etc") == 0 &&
+               de->d_type == DTYPE_DIRECTORY)
+        {
+          etcseen++;
+        }
+      else if (strcmp(de->d_name, "top.bin") == 0 &&
+               de->d_type == DTYPE_FILE)
+        {
+          sawtop = true;
+        }
+    }
+
+  if (dirp != NULL)
+    {
+      closedir(dirp);
+    }
+
+  CHECK("the root lists its directories and its files",
+        binseen == 1 && etcseen == 1 && sawtop, "missing entry");
+
+  dirp = opendir(PATH("bin"));
+  CHECK("opendir on a subdirectory", dirp != NULL, strerror(errno));
+
+  while (dirp != NULL && (de = readdir(dirp)) != NULL)
+    {
+      if (strchr(de->d_name, '/') != NULL || de->d_type != DTYPE_FILE)
+        {
+          badentry = true;
+        }
+      else if (strcmp(de->d_name, "hello") == 0)
+        {
+          sawhello = true;
+        }
+      else if (strcmp(de->d_name, "world") == 0)
+        {
+          sawworld = true;
+        }
+    }
+
+  if (dirp != NULL)
+    {
+      closedir(dirp);
+    }
+
+  CHECK("it lists its own entries, by name",
+        sawhello && sawworld && !badentry, "unexpected entries");
+
+  ret = stat(PATH("bin/hello"), &st);
+  CHECK("stat of a file in a directory",
+        ret == 0 && S_ISREG(st.st_mode) && st.st_size == 100,
+        strerror(errno));
+
+  /* The VFS passes a trailing separator through, and it names the same
+   * directory.
+   */
+
+  dirp = opendir(PATH("etc/conf/"));
+  ret = stat(PATH("etc/conf/"), &st);
+  CHECK("a trailing separator names the same directory",
+        dirp != NULL && ret == 0 && S_ISDIR(st.st_mode), strerror(errno));
+
+  if (dirp != NULL)
+    {
+      closedir(dirp);
+    }
+
+  /* "." and ".." are refused rather than interpreted, because an entry by
+   * either name could never be reached again.
+   */
+
+  ret = mkdir(PATH("etc/.."), 0755);
+  CHECK("a dot-dot component is refused", ret < 0 && errno == EINVAL,
+        strerror(errno));
+
+  /* The type rules, in both directions */
+
+  /* A read-only open of a directory is not an error: the VFS turns the
+   * EISDIR the file system answers into a directory descriptor, which is
+   * what makes fdopendir and the volume ioctls work.  Opening one for
+   * writing has nowhere to go, so that is where EISDIR surfaces.
+   */
+
+  fd = open(PATH("bin"), O_RDONLY | O_CLOEXEC);
+  ret = fd >= 0 ? fstat(fd, &st) : -1;
+  CHECK("a read-only open of a directory yields a directory",
+        fd >= 0 && ret == 0 && S_ISDIR(st.st_mode), strerror(errno));
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  fd = open(PATH("bin"), O_WRONLY | O_CREAT | O_CLOEXEC, 0644);
+  CHECK("opening a directory for writing is refused",
+        fd < 0 && errno == EISDIR, strerror(errno));
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  ret = unlink(PATH("bin"));
+  CHECK("unlinking a directory is refused", ret < 0 && errno == EISDIR,
+        strerror(errno));
+
+  ret = rmdir(PATH("top.bin"));
+  CHECK("rmdir of a file is refused", ret < 0 && errno == ENOTDIR,
+        strerror(errno));
+
+  ret = rmdir(PATH("bin"));
+  CHECK("rmdir of a directory with contents is refused",
+        ret < 0 && errno == ENOTEMPTY, strerror(errno));
+
+  /* Emptying it makes it removable, and removing it takes nothing else */
+
+  unlink(PATH("bin/hello"));
+  unlink(PATH("bin/world"));
+
+  ret = rmdir(PATH("bin"));
+  CHECK("rmdir of an emptied directory", ret == 0, strerror(errno));
+
+  ret = stat(PATH("bin"), &st);
+  CHECK("it is gone", ret < 0 && errno == ENOENT, strerror(errno));
+
+  ret = stat(PATH("etc/conf/net"), &st);
+  CHECK("removing one directory leaves the others alone",
+        ret == 0 && S_ISREG(st.st_mode), strerror(errno));
+
+  /* And the whole tree is durable */
+
+  ret = remount();
+  CHECK("remount after all of it", ret == 0, strerror(-ret));
+
+  ret = stat(PATH("etc/conf"), &st);
+  CHECK("the tree is the same after a remount",
+        ret == 0 && S_ISDIR(st.st_mode) &&
+        verify_file(PATH("etc/conf/net"), 100, 3), "tree changed");
+
+  unlink(PATH("etc/conf/net"));
+  rmdir(PATH("etc/conf"));
+  rmdir(PATH("etc"));
+  unlink(PATH("top.bin"));
+}
+
+/****************************************************************************
+ * Test: defragmentation
+ ****************************************************************************/
+
+static void test_defrag(void)
+{
+  struct xipfs_defrag_result_s result;
+  struct xipfs_extent_info_s info;
+  const size_t small = 4096;
+  size_t largest_before;
+  FAR void *addr;
+  int fd;
+  int ret;
+  int i;
+  char path[64];
+
+  printf("\n-- defragmentation --\n");
+
+  /* Lay down an alternating pattern, then punch out every other file.  The
+   * result is free space that is plentiful in total but useless in any
+   * single run, which is precisely the situation defrag exists for.
+   */
+
+  for (i = 0; i < 10; i++)
+    {
+      snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+      if (create_file(path, small, (uint8_t)i) < 0)
+        {
+          break;
+        }
+    }
+
+  for (i = 0; i < 10; i += 2)
+    {
+      snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+      unlink(path);
+    }
+
+  ret = run_defrag(0, &result);
+  CHECK("defrag runs", ret == 0, strerror(-ret));
+  largest_before = result.largest_free_run;
+
+  /* Nothing is open, because the pass was asked for through the mountpoint
+   * directory, so it should have run to completion rather than reporting an
+   * obstruction.
+   */
+
+  CHECK("defrag through the mountpoint directory completes",
+        result.reason == XIPFS_DEFRAG_DONE, "unexpected reason");
+
+  /* Surviving files must be byte-identical after being physically moved */
+
+  for (i = 1; i < 10; i += 2)
+    {
+      snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+      if (!verify_file(path, small, (uint8_t)i))
+        {
+          break;
+        }
+    }
+
+  CHECK("relocated files keep their contents", i >= 10, "content changed");
+
+  /* Everything must still be there after a remount: each relocation
+   * committed a new generation naming the new location.
+   */
+
+  ret = remount();
+  CHECK("remount after defrag", ret == 0, strerror(-ret));
+
+  for (i = 1; i < 10; i += 2)
+    {
+      snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+      if (!verify_file(path, small, (uint8_t)i))
+        {
+          break;
+        }
+    }
+
+  CHECK("relocations survive remount", i >= 10, "content lost");
+
+  /* An open file is still an obstruction, and must be reported as one.
+   * The pass only stops on it when the open extent is the only candidate
+   * for the hole it is trying to fill, because otherwise it just moves
+   * something else instead.  So arrange exactly that: punch out the
+   * second-highest file and hold open the highest, which is then the only
+   * extent above the hole.
+   */
+
+    {
+      uint32_t beststart = 0;
+      uint32_t nextstart = 0;
+      char lastpath[64];
+      char holepath[64];
+
+      lastpath[0] = '\0';
+      holepath[0] = '\0';
+
+      for (i = 1; i < 10; i += 2)
+        {
+          snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+          if (extent_info(path, &info) < 0)
+            {
+              continue;
+            }
+
+          if (lastpath[0] == '\0' || info.start_block > beststart)
+            {
+              nextstart = beststart;
+              strlcpy(holepath, lastpath, sizeof(holepath));
+              beststart = info.start_block;
+              strlcpy(lastpath, path, sizeof(lastpath));
+            }
+          else if (holepath[0] == '\0' || info.start_block > nextstart)
+            {
+              nextstart = info.start_block;
+              strlcpy(holepath, path, sizeof(holepath));
+            }
+        }
+
+      if (lastpath[0] != '\0' && holepath[0] != '\0')
+        {
+          unlink(holepath);
+
+          fd = open(lastpath, O_RDONLY | O_CLOEXEC);
+          if (fd >= 0)
+            {
+              ret = run_defrag(0, &result);
+              CHECK("an open file is reported as blocking, not as done",
+                    ret == 0 &&
+                    result.reason == XIPFS_DEFRAG_BLOCKED_OPEN,
+                    "unexpected reason");
+              close(fd);
+            }
+
+          /* Put it back so the pinned test below has the same layout to
+           * work with as before.
+           */
+
+          create_file(holepath, small, 1);
+        }
+    }
+
+  /* A pinned extent must be skipped, and defrag must say so rather than
+   * silently reporting success.
+   */
+
+  snprintf(path, sizeof(path), PATH("frag1.bin"));
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  addr = mmap(NULL, small, PROT_READ, MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+
+  if (addr != MAP_FAILED)
+    {
+      ret = extent_info(path, &info);
+
+      /* Fragment again below the pinned extent so defrag has a reason to
+       * want to move it.
+       */
+
+      for (i = 3; i < 10; i += 2)
+        {
+          snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+          unlink(path);
+        }
+
+      ret = run_defrag(0, &result);
+      CHECK("defrag with a pinned extent still returns cleanly", ret == 0,
+            strerror(-ret));
+
+      snprintf(path, sizeof(path), PATH("frag1.bin"));
+      ret = extent_info(path, &info);
+      CHECK("pinned extent was not relocated",
+            ret == 0 && (uintptr_t)addr == info.xipaddr,
+            "pinned extent moved under a live mapping");
+
+      munmap(addr, small);
+      close(fd);
+    }
+
+  /* After releasing the pin, a further pass should be able to do at least
+   * as well as before.
+   */
+
+  ret = run_defrag(0, &result);
+  CHECK("defrag after unpinning",
+        ret == 0 && result.largest_free_run >= largest_before,
+        "free space did not recover");
+
+  for (i = 0; i < 10; i++)
+    {
+      snprintf(path, sizeof(path), PATH("frag%d.bin"), i);
+      unlink(path);
+    }
+}
+
+/****************************************************************************
+ * Test: power loss at every step of a create
+ *
+ * The medium survives; only the filesystem's RAM state is discarded, which
+ * is exactly what a reboot does.  For every flash operation in turn, fail
+ * at that operation and assert that what comes back is a consistent
+ * filesystem -- never a torn directory and never a half written file.
+ *
+ * The sweep runs twice.  In XIPFS_FAULT_CLEAN the failing operation leaves
+ * the medium untouched.  In XIPFS_FAULT_TORN it leaves it half done -- half
+ * a page programmed, half a sector erased -- which is what a real cut leaves
+ * and what makes the mount-time CRC actually have to reject a half-formed
+ * generation rather than an obviously blank one.  Both must yield the same
+ * two invariants, because the commit writes the directory body before the
+ * header that validates it: a torn body is never reachable behind a written
+ * header.
+ ****************************************************************************/
+
+static void powerloss_create(uint8_t mode, FAR const char *modename)
+{
+  const int max_ops = 16;
+  struct stat st;
+  bool all_ok = true;
+  bool saw_failure = false;
+  char detail[80];
+  char name[80];
+  int ret;
+  int n;
+
+  printf("\n-- power loss during create (%s) --\n", modename);
+
+  for (n = 0; n < max_ops; n++)
+    {
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "remount failed before injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      /* A file that must survive every injected failure untouched */
+
+      unlink(PATH("keep.bin"));
+      unlink(PATH("victim.bin"));
+
+      if (create_file(PATH("keep.bin"), 2048, 0x66) < 0)
+        {
+          snprintf(detail, sizeof(detail), "baseline create failed at %d",
+                   n);
+          all_ok = false;
+          break;
+        }
+
+      /* Arm the injector: fail the n'th flash write or erase from now on */
+
+      if (arm_injector(n, mode) < 0)
+        {
+          all_ok = false;
+          strlcpy(detail, "cannot open to arm injector", sizeof(detail));
+          break;
+        }
+
+      /* This create will be cut short at some arbitrary point */
+
+      ret = create_file(PATH("victim.bin"), 5000, 0x77);
+      if (ret < 0)
+        {
+          saw_failure = true;
+        }
+
+      /* Now "reboot" */
+
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "mount failed after injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      /* Invariant 1: the pre-existing file is untouched.  A commit that
+       * tore would most likely take the whole directory with it.
+       */
+
+      if (!verify_file(PATH("keep.bin"), 2048, 0x66))
+        {
+          snprintf(detail, sizeof(detail),
+                   "pre-existing file corrupted by injection %d", n);
+          all_ok = false;
+          break;
+        }
+
+      /* Invariant 2: the interrupted file is either absent or complete.
+       * There is no valid state in between.
+       */
+
+      if (stat(PATH("victim.bin"), &st) == 0)
+        {
+          if (st.st_size != 5000 ||
+              !verify_file(PATH("victim.bin"), 5000, 0x77))
+            {
+              snprintf(detail, sizeof(detail),
+                       "partially written file visible after injection %d",
+                       n);
+              all_ok = false;
+              break;
+            }
+        }
+    }
+
+  snprintf(name, sizeof(name),
+           "filesystem stays consistent across every injection point (%s)",
+           modename);
+  CHECK(name, all_ok, detail);
+
+  snprintf(name, sizeof(name),
+           "injection actually interrupted some operations (%s)", modename);
+  CHECK(name, saw_failure,
+        "no operation was ever cut short; the sweep proved nothing");
+
+  remount();
+  unlink(PATH("keep.bin"));
+  unlink(PATH("victim.bin"));
+}
+
+static void test_powerloss(void)
+{
+  powerloss_create(XIPFS_FAULT_CLEAN, "clean");
+}
+
+static void test_powerloss_torn(void)
+{
+  powerloss_create(XIPFS_FAULT_TORN, "torn");
+}
+
+/****************************************************************************
+ * Test: power loss at every step of an unlink
+ *
+ * An unlink is a single metadata commit followed by returning the blocks to
+ * the allocator, so the file is either still there in full or entirely gone.
+ * What makes it worth sweeping is not the file being deleted but the two
+ * files either side of it: if a torn commit were to leave the directory
+ * naming an extent whose blocks the allocator has already handed back, the
+ * next create would be given live blocks and would quietly overwrite a
+ * neighbour.  That is why each iteration ends by allocating again and then
+ * re-checking the survivors.
+ ****************************************************************************/
+
+static void test_powerloss_unlink(void)
+{
+  const int max_ops = 16;
+  const size_t len = 3000;
+  struct stat st;
+  bool all_ok = true;
+  bool saw_failure = false;
+  bool saw_survival = false;
+  bool saw_deletion = false;
+  bool exhausted = false;
+  char detail[80];
+  int quiet = 0;
+  int ret;
+  int n;
+
+  printf("\n-- power loss during unlink --\n");
+  detail[0] = '\0';
+
+  for (n = 0; n < max_ops; n++)
+    {
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "remount failed before injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      unlink(PATH("ul_a.bin"));
+      unlink(PATH("ul_b.bin"));
+      unlink(PATH("ul_c.bin"));
+      unlink(PATH("ul_new.bin"));
+
+      if (create_file(PATH("ul_a.bin"), len, 0xa1) < 0 ||
+          create_file(PATH("ul_b.bin"), len, 0xb2) < 0 ||
+          create_file(PATH("ul_c.bin"), len, 0xc3) < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "baseline create failed at %d", n);
+          all_ok = false;
+          break;
+        }
+
+      if (arm_injector(n, XIPFS_FAULT_CLEAN) < 0)
+        {
+          strlcpy(detail, "cannot arm injector", sizeof(detail));
+          all_ok = false;
+          break;
+        }
+
+      /* Delete the middle file.  This is the operation being cut short. */
+
+      if (unlink(PATH("ul_b.bin")) < 0)
+        {
+          saw_failure = true;
+          quiet = 0;
+        }
+      else
+        {
+          /* The injector was armed further out than this operation reaches.
+           * Two of those in a row means the sweep has walked off the end of
+           * the unlink and later points would only be testing the creates
+           * that follow it.
+           */
+
+          if (++quiet >= 2)
+            {
+              exhausted = true;
+            }
+        }
+
+      /* Reboot */
+
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "mount failed after injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      /* Invariant 1: the neighbours are untouched.  They were never part of
+       * the operation, so nothing about a torn unlink may reach them.
+       */
+
+      if (!verify_file(PATH("ul_a.bin"), len, 0xa1) ||
+          !verify_file(PATH("ul_c.bin"), len, 0xc3))
+        {
+          snprintf(detail, sizeof(detail),
+                   "neighbour corrupted by injection %d", n);
+          all_ok = false;
+          break;
+        }
+
+      /* Invariant 2: the target is either wholly gone or wholly intact.
+       * A directory entry surviving with unreadable or truncated contents
+       * would mean the commit and the free happened in the wrong order.
+       */
+
+      if (stat(PATH("ul_b.bin"), &st) == 0)
+        {
+          saw_survival = true;
+
+          if (st.st_size != (off_t)len ||
+              !verify_file(PATH("ul_b.bin"), len, 0xb2))
+            {
+              snprintf(detail, sizeof(detail),
+                       "unlink left a damaged file at injection %d", n);
+              all_ok = false;
+              break;
+            }
+        }
+      else
+        {
+          saw_deletion = true;
+        }
+
+      /* Invariant 3: the recovered allocator agrees with the recovered
+       * directory.  Filling the volume and re-checking the survivors is what
+       * would catch blocks that were freed while still referenced -- the new
+       * file would be placed on top of a live extent.
+       */
+
+      if (create_file(PATH("ul_new.bin"), len, 0x5e) == 0 &&
+          !verify_file(PATH("ul_new.bin"), len, 0x5e))
+        {
+          snprintf(detail, sizeof(detail),
+                   "new file unreadable after injection %d", n);
+          all_ok = false;
+          break;
+        }
+
+      if (!verify_file(PATH("ul_a.bin"), len, 0xa1) ||
+          !verify_file(PATH("ul_c.bin"), len, 0xc3))
+        {
+          snprintf(detail, sizeof(detail),
+                   "allocator reissued live blocks after injection %d", n);
+          all_ok = false;
+          break;
+        }
+
+      if (stat(PATH("ul_b.bin"), &st) == 0 &&
+          !verify_file(PATH("ul_b.bin"), len, 0xb2))
+        {
+          snprintf(detail, sizeof(detail),
+                   "surviving target clobbered after injection %d", n);
+          all_ok = false;
+          break;
+        }
+
+      if (exhausted)
+        {
+          break;
+        }
+    }
+
+  CHECK("unlink stays consistent across every injection point", all_ok,
+        detail);
+  CHECK("unlink injection actually interrupted some operations", saw_failure,
+        "no unlink was ever cut short; the sweep proved nothing");
+
+  /* Both outcomes must be reachable.  If the sweep only ever saw one of
+   * them the commit point is not where it is documented to be, and the
+   * other half of the invariant went untested.
+   */
+
+  CHECK("both unlink outcomes observed across the sweep",
+        saw_survival && saw_deletion,
+        saw_survival ? "no injection ever completed the delete"
+                     : "no injection ever preserved the file");
+
+  /* Say plainly whether the sweep covered the whole operation or merely the
+   * first max_ops of it, so a green result is not mistaken for coverage it
+   * does not have on a medium with a different geometry.
+   */
+
+  printf("    swept %d injection points, %s\n", n,
+         exhausted ? "covering the whole unlink"
+                   : "stopping at the cap before the unlink ran out of ops");
+
+  remount();
+  unlink(PATH("ul_a.bin"));
+  unlink(PATH("ul_b.bin"));
+  unlink(PATH("ul_c.bin"));
+  unlink(PATH("ul_new.bin"));
+}
+
+/****************************************************************************
+ * Test: power loss at every step of a defragmentation pass
+ *
+ * This is the sweep that matters most, because defrag is the only operation
+ * that moves data a user already owns.  Everywhere else an interrupted
+ * operation can at worst discard something that was never complete; here a
+ * relocation that tore could destroy a file that was safe before the pass
+ * began.
+ *
+ * So the invariant is absolute rather than two-sided: defrag never creates
+ * or removes a file, so after a power loss at any point during it, every
+ * file must still be present and byte-identical.  There is no acceptable
+ * "or absent" case.
+ ****************************************************************************/
+
+static void test_powerloss_defrag(void)
+{
+  /* Each relocation is an erase of the destination, a page-at-a-time copy,
+   * a metadata commit and an erase of the vacated blocks.  How many flash
+   * operations that comes to depends entirely on the medium's page and
+   * erase geometry, so rather than guess, the sweep walks injection points
+   * until two in a row fail to reach the injector at all -- meaning it has
+   * walked off the end of the pass -- and reports whether it got that far
+   * before the cap.  On rammtd the whole pass is about fifty operations;
+   * a medium with smaller pages will take more, and the cap is what keeps
+   * the suite's runtime bounded there.
+   */
+
+  const int max_ops = 128;
+  const int nfiles = 10;
+  const size_t small = 4096;
+  struct xipfs_defrag_result_s result;
+  bool all_ok = true;
+  bool saw_failure = false;
+  bool saw_progress = false;
+  bool exhausted = false;
+  char detail[80];
+  char path[64];
+  int quiet = 0;
+  int ret;
+  int n;
+  int i;
+
+  printf("\n-- power loss during defrag --\n");
+  detail[0] = '\0';
+
+  for (n = 0; n < max_ops && all_ok; n++)
+    {
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "remount failed before injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      /* Rebuild the same fragmented layout every iteration so that a given
+       * injection point means the same thing each time round.
+       */
+
+      for (i = 0; i < nfiles; i++)
+        {
+          snprintf(path, sizeof(path), PATH("pd%d.bin"), i);
+          unlink(path);
+        }
+
+      for (i = 0; i < nfiles; i++)
+        {
+          snprintf(path, sizeof(path), PATH("pd%d.bin"), i);
+          if (create_file(path, small, (uint8_t)(0x40 + i)) < 0)
+            {
+              snprintf(detail, sizeof(detail),
+                       "baseline create %d failed at injection %d", i, n);
+              all_ok = false;
+              break;
+            }
+        }
+
+      if (!all_ok)
+        {
+          break;
+        }
+
+      /* Punch out every other file: plenty of free space in total, none of
+       * it in a single run.  This is what gives defrag work to do.
+       */
+
+      for (i = 0; i < nfiles; i += 2)
+        {
+          snprintf(path, sizeof(path), PATH("pd%d.bin"), i);
+          unlink(path);
+        }
+
+      if (arm_injector(n, XIPFS_FAULT_CLEAN) < 0)
+        {
+          strlcpy(detail, "cannot arm injector", sizeof(detail));
+          all_ok = false;
+          break;
+        }
+
+      /* Cut power partway through the pass.  Note that defrag reports a
+       * clean stop rather than an error when a relocation fails, so the
+       * media error surfaces in the reason code, not the return value.
+       */
+
+      ret = run_defrag(0, &result);
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "defrag returned an error at injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      if (result.reason == XIPFS_DEFRAG_ERROR)
+        {
+          saw_failure = true;
+          quiet = 0;
+        }
+      else if (++quiet >= 2)
+        {
+          /* The pass ran to completion without ever tripping the injector,
+           * twice over: every operation in it has now been swept.
+           */
+
+          exhausted = true;
+        }
+
+      if (result.extents_moved > 0)
+        {
+          saw_progress = true;
+        }
+
+      /* Rebuilding a ten file layout against real flash takes a couple of
+       * seconds per injection point, and the sweep is over a hundred of
+       * them.  Without a heartbeat the suite looks wedged for minutes on
+       * hardware, so a silent run cannot be told from a hung one.
+       */
+
+      putchar('.');
+      fflush(stdout);
+
+      /* Reboot */
+
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "mount failed after injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      /* The invariant: every survivor is still there, still whole.  Whether
+       * it was relocated, half relocated or never touched must be
+       * indistinguishable from the outside.
+       */
+
+      for (i = 1; i < nfiles; i += 2)
+        {
+          snprintf(path, sizeof(path), PATH("pd%d.bin"), i);
+          if (!verify_file(path, small, (uint8_t)(0x40 + i)))
+            {
+              snprintf(detail, sizeof(detail),
+                       "file %d lost or corrupted by injection %d", i, n);
+              all_ok = false;
+              break;
+            }
+        }
+
+      if (!all_ok)
+        {
+          break;
+        }
+
+      /* And the recovered allocator must not believe the blocks under a
+       * survivor are free.  A relocation that committed but was interrupted
+       * before erasing its source leaves stale copies behind; those blocks
+       * are unreferenced and reusable, but the blocks under the new location
+       * are not, and a mount that confused the two would hand them out here.
+       */
+
+      unlink(PATH("pd_new.bin"));
+      if (create_file(PATH("pd_new.bin"), small, 0x5f) == 0)
+        {
+          if (!verify_file(PATH("pd_new.bin"), small, 0x5f))
+            {
+              snprintf(detail, sizeof(detail),
+                       "new file unreadable after injection %d", n);
+              all_ok = false;
+              break;
+            }
+
+          for (i = 1; i < nfiles; i += 2)
+            {
+              snprintf(path, sizeof(path), PATH("pd%d.bin"), i);
+              if (!verify_file(path, small, (uint8_t)(0x40 + i)))
+                {
+                  snprintf(detail, sizeof(detail),
+                           "allocator reissued live blocks after "
+                           "injection %d", n);
+                  all_ok = false;
+                  break;
+                }
+            }
+        }
+
+      if (exhausted)
+        {
+          break;
+        }
+    }
+
+  putchar('\n');
+
+  CHECK("no file is ever lost to a power loss during defrag", all_ok,
+        detail);
+  CHECK("defrag injection actually interrupted some relocations",
+        saw_failure, "no relocation was ever cut short; the sweep "
+                     "proved nothing");
+  CHECK("defrag made real progress at some injection points", saw_progress,
+        "no extent was ever relocated; the sweep never reached a move");
+
+  printf("    swept %d injection points, %s\n", n,
+         exhausted ? "covering every operation of the whole pass"
+                   : "stopping at the cap partway through the pass");
+
+  remount();
+  for (i = 0; i < nfiles; i++)
+    {
+      snprintf(path, sizeof(path), PATH("pd%d.bin"), i);
+      unlink(path);
+    }
+
+  unlink(PATH("pd_new.bin"));
+}
+
+/****************************************************************************
+ * Test: strict versus permissive mapping
+ ****************************************************************************/
+
+static void test_strict(void)
+{
+  const size_t len = 4096;
+  FAR void *addr;
+  int fd;
+  int ret;
+
+  printf("\n-- strict mapping semantics --\n");
+
+  ret = create_file(PATH("strict.bin"), len, 0x88);
+  CHECK("create", ret == 0, strerror(-ret));
+
+  fd = open(PATH("strict.bin"), O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      CHECK("open", false, strerror(errno));
+      return;
+    }
+
+  /* Beyond the end of the file: strict must refuse rather than quietly
+   * hand back something that is not what was asked for.
+   */
+
+  addr = mmap(NULL, len * 4, PROT_READ, MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+  CHECK("strict mapping past end of file is refused", addr == MAP_FAILED,
+        "oversized mapping accepted");
+
+  addr = mmap(NULL, len, PROT_READ, MAP_SHARED | MAP_XIP_STRICT, fd, 0);
+  CHECK("strict mapping of a valid range succeeds", addr != MAP_FAILED,
+        strerror(errno));
+
+  if (addr != MAP_FAILED)
+    {
+      munmap(addr, len);
+    }
+
+  close(fd);
+  unlink(PATH("strict.bin"));
+}
+
+/****************************************************************************
+ * Test: the write-once model is enforced rather than half-implemented
+ ****************************************************************************/
+
+static void test_writeonce(void)
+{
+  const size_t len = 1024;
+  ssize_t nwritten;
+  int fd;
+  int ret;
+
+  printf("\n-- write-once enforcement --\n");
+
+  ret = create_file(PATH("once.bin"), len, 0x99);
+  CHECK("create", ret == 0, strerror(-ret));
+
+  fd = open(PATH("once.bin"), O_WRONLY | O_CLOEXEC);
+  CHECK("reopening a closed file for writing is refused", fd < 0,
+        "file was writable after close");
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  fd = open(PATH("once.bin"), O_WRONLY | O_APPEND | O_CLOEXEC);
+  CHECK("append is refused", fd < 0, "file was appendable");
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  /* A seek away from the append point during a create would leave a hole,
+   * which an exactly sized extent cannot represent.
+   */
+
+  fd = open(PATH("hole.bin"),
+            O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  if (fd >= 0)
+    {
+      ftruncate(fd, len);
+      ret = lseek(fd, 512, SEEK_SET);
+      CHECK("seeking while creating is refused", ret < 0, "seek allowed");
+
+      nwritten = write(fd, g_buffer, 16);
+      CHECK("sequential write after a rejected seek still works",
+            nwritten == 16, "write failed");
+      close(fd);
+    }
+
+  unlink(PATH("once.bin"));
+  unlink(PATH("hole.bin"));
+}
+
+/****************************************************************************
+ * Test: power loss during mkdir and rmdir
+ *
+ * A directory is a record in the metadata generation, so creating or
+ * removing one is the same single-generation commit that create and unlink
+ * are.  That is the claim; this sweeps it.  For every flash operation in
+ * turn, fail at that one and assert the volume comes back as a tree with the
+ * directory either wholly there or wholly absent -- never a record whose
+ * parent has gone, which is what a partially applied change would look like
+ * and what mount would then have to reject.
+ ****************************************************************************/
+
+static void test_powerloss_dirs(void)
+{
+  const int max_ops = 12;
+  const size_t len = 2000;
+  struct stat st;
+  bool all_ok = true;
+  bool saw_failure = false;
+  bool saw_created = false;
+  bool saw_absent = false;
+  char detail[80];
+  int quiet = 0;
+  int ret;
+  int n;
+
+  printf("\n-- power loss during mkdir and rmdir --\n");
+  detail[0] = '\0';
+
+  for (n = 0; n < max_ops; n++)
+    {
+      /* Baseline: a directory holding a file, plus a file beside it, so a
+       * torn commit has neighbours to damage and a child to orphan.
+       */
+
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "remount failed before injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      unlink(PATH("d_keep/inner.bin"));
+      rmdir(PATH("d_keep"));
+      rmdir(PATH("d_new"));
+      unlink(PATH("d_file.bin"));
+
+      if (mkdir(PATH("d_keep"), 0755) < 0 ||
+          create_file(PATH("d_keep/inner.bin"), len, 0xd1) < 0 ||
+          create_file(PATH("d_file.bin"), len, 0xd2) < 0)
+        {
+          snprintf(detail, sizeof(detail), "baseline failed at %d", n);
+          all_ok = false;
+          break;
+        }
+
+      if (arm_injector(n, XIPFS_FAULT_TORN) < 0)
+        {
+          strlcpy(detail, "cannot arm injector", sizeof(detail));
+          all_ok = false;
+          break;
+        }
+
+      /* The operation being cut short */
+
+      if (mkdir(PATH("d_new"), 0755) < 0)
+        {
+          saw_failure = true;
+          quiet = 0;
+        }
+      else if (++quiet >= 2)
+        {
+          break;    /* Walked off the end of the mkdir */
+        }
+
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "mount failed after injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      /* The new directory is either there or not, and either way the tree
+       * that was already committed is untouched and still walkable.
+       */
+
+      if (stat(PATH("d_new"), &st) == 0)
+        {
+          saw_created = true;
+
+          if (!S_ISDIR(st.st_mode))
+            {
+              snprintf(detail, sizeof(detail),
+                       "mkdir left a non-directory at injection %d", n);
+              all_ok = false;
+              break;
+            }
+        }
+      else
+        {
+          saw_absent = true;
+        }
+
+      if (stat(PATH("d_keep"), &st) != 0 || !S_ISDIR(st.st_mode) ||
+          !verify_file(PATH("d_keep/inner.bin"), len, 0xd1) ||
+          !verify_file(PATH("d_file.bin"), len, 0xd2))
+        {
+          snprintf(detail, sizeof(detail),
+                   "committed tree damaged by injection %d", n);
+          all_ok = false;
+          break;
+        }
+
+      /* And the same for a removal cut short.  The directory must not come
+       * back empty-but-present while its child is gone, nor vice versa.
+       */
+
+      if (arm_injector(n, XIPFS_FAULT_TORN) < 0)
+        {
+          strlcpy(detail, "cannot arm injector", sizeof(detail));
+          all_ok = false;
+          break;
+        }
+
+      rmdir(PATH("d_new"));
+
+      ret = remount();
+      if (ret < 0)
+        {
+          snprintf(detail, sizeof(detail),
+                   "mount failed after rmdir injection %d: %d", n, ret);
+          all_ok = false;
+          break;
+        }
+
+      if (stat(PATH("d_keep"), &st) != 0 ||
+          !verify_file(PATH("d_keep/inner.bin"), len, 0xd1))
+        {
+          snprintf(detail, sizeof(detail),
+                   "rmdir injection %d damaged another directory", n);
+          all_ok = false;
+          break;
+        }
+    }
+
+  arm_injector(-1, XIPFS_FAULT_CLEAN);
+
+  CHECK("mkdir and rmdir stay consistent across every injection point",
+        all_ok, detail);
+  CHECK("injection actually interrupted some directory operations",
+        saw_failure, "nothing was ever cut short");
+  CHECK("both outcomes observed across the sweep",
+        saw_created && saw_absent, "only one outcome seen");
+
+  unlink(PATH("d_keep/inner.bin"));
+  rmdir(PATH("d_keep"));
+  rmdir(PATH("d_new"));
+  unlink(PATH("d_file.bin"));
+}
+
+/****************************************************************************
+ * Name: want
+ *
+ * Description:
+ *   Whether a named section should run.  With no argument everything does.
+ *
+ *   The selector exists because the power loss sweeps dominate the runtime
+ *   -- they are minutes, everything else is seconds -- so iterating on any
+ *   other section means waiting for work that is not being changed.
+ *
+ ****************************************************************************/
+
+static bool want(FAR const char *name, int argc, FAR char *argv[])
+{
+  return argc < 2 || strcmp(argv[1], name) == 0;
+}
+
+#define SECTION(name, fn)             \
+  do                                  \
+    {                                 \
+      if (want((name), argc, argv))   \
+        {                             \
+          fn();                       \
+        }                             \
+    }                                 \
+  while (0)
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  printf("XIPFS test suite on %s (%s)\n", MOUNTPT, MTDDEV);
+
+  /* In a flat build the counters keep their values from the previous run,
+   * so a second invocation would report the first one's results too.
+   */
+
+  g_passed = 0;
+  g_failed = 0;
+
+  g_buffer = malloc(g_bufsize);
+  if (g_buffer == NULL)
+    {
+      printf("ERROR: out of memory\n");
+      return EXIT_FAILURE;
+    }
+
+  if (remount() < 0)
+    {
+      printf("ERROR: cannot mount %s; is the board bringup configured?\n",
+             MOUNTPT);
+      free(g_buffer);
+      return EXIT_FAILURE;
+    }
+
+  SECTION("basic",     test_basic);
+  SECTION("writeonce", test_writeonce);
+  SECTION("strict",    test_strict);
+  SECTION("xip",       test_xip);
+  SECTION("multimap",  test_multimap);
+  SECTION("crosstask", test_crosstask_pins);
+  SECTION("teardown",  test_teardown_release);
+  SECTION("dirs",      test_dirs);
+  SECTION("defrag",    test_defrag);
+  SECTION("powerloss", test_powerloss);
+  SECTION("powertorn", test_powerloss_torn);
+  SECTION("unlink",    test_powerloss_unlink);
+  SECTION("dirloss",   test_powerloss_dirs);
+  SECTION("defraglos", test_powerloss_defrag);
+
+  if (g_passed == 0 && g_failed == 0)
+    {
+      printf("\nno section matched '%s'\n", argv[1]);
+      free(g_buffer);
+      return EXIT_FAILURE;
+    }
+
+  printf("\n==== %d passed, %d failed ====\n", g_passed, g_failed);
+
+  free(g_buffer);
+  return g_failed == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 2492317f15bcf69787249060a6b16915170cc3a3 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Sat, 25 Jul 2026 13:53:16 +0200
Subject: [PATCH 550/568] examples/nxflatxip: Run an NXFLAT module in place out
 of xipfs.

The point of a writable execute-in-place file system is that a module can
arrive after the firmware was built and still run without being copied into
RAM.  This demonstrates exactly that, end to end: it writes an NXFLAT module
into xipfs the way a download would, declaring the size up front so the
extent is exact, checks the file system can hand out a real flash pointer
for it, and runs two instances concurrently.

Both instances report the address of their own text and of their stack.  The
text address is the same in both and is inside the flash window -- it is the
address the file occupies on the media -- while the stacks differ.  While
they run, the extent carries one pin per instance, which is what stops the
defragmenter relocating code that is executing.

Two subcommands cover the file system rather than the module.  bench times a
bulk read out of the mapped flash before and after a write, which on the
RP2350 is the cost of whichever path the driver used to restore XIP.  defrag
fills the volume, deletes every other file until an allocation genuinely
cannot be satisfied, compacts, retries the same allocation, then verifies
every relocated file byte for byte and again after a remount, printing a
block map at each step.

The module has neither static data nor string constants, and reports through
a callback into the firmware instead of formatting its own output.  That is
not stylistic: the ldnxflat in circulation resolves the GOT entries for .bss
objects into the import table, and drops the addend when it resolves the
PC-relative references to .rodata, so a module using either quietly computes
wrong addresses.  The comment in module/xipmod.c records both.  The callback
also exercises the other direction of the interface, firmware code entered
with the module's data base still live in r10.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 examples/nxflatxip/.gitignore        |   2 +
 examples/nxflatxip/CMakeLists.txt    |  29 +
 examples/nxflatxip/Kconfig           |  38 ++
 examples/nxflatxip/Make.defs         |  25 +
 examples/nxflatxip/Makefile          |  54 ++
 examples/nxflatxip/module/.gitignore |   4 +
 examples/nxflatxip/module/Makefile   |  94 +++
 examples/nxflatxip/module/xipmod.c   | 116 ++++
 examples/nxflatxip/nxflatxip_main.c  | 895 +++++++++++++++++++++++++++
 9 files changed, 1257 insertions(+)
 create mode 100644 examples/nxflatxip/.gitignore
 create mode 100644 examples/nxflatxip/CMakeLists.txt
 create mode 100644 examples/nxflatxip/Kconfig
 create mode 100644 examples/nxflatxip/Make.defs
 create mode 100644 examples/nxflatxip/Makefile
 create mode 100644 examples/nxflatxip/module/.gitignore
 create mode 100644 examples/nxflatxip/module/Makefile
 create mode 100644 examples/nxflatxip/module/xipmod.c
 create mode 100644 examples/nxflatxip/nxflatxip_main.c

diff --git a/examples/nxflatxip/.gitignore b/examples/nxflatxip/.gitignore
new file mode 100644
index 000000000..c04a5d03c
--- /dev/null
+++ b/examples/nxflatxip/.gitignore
@@ -0,0 +1,2 @@
+/symtab.c
+/xipmod_bin.h
diff --git a/examples/nxflatxip/CMakeLists.txt b/examples/nxflatxip/CMakeLists.txt
new file mode 100644
index 000000000..dc5dd064e
--- /dev/null
+++ b/examples/nxflatxip/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ##############################################################################
+# apps/examples/nxflatxip/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+# The module and the symbol table it needs are built by module/Makefile, which
+# the CMake build does not drive.  As with apps/examples/nxflat, use the make
+# build for this example.
+
+if(CONFIG_EXAMPLES_NXFLATXIP)
+  nuttx_add_application(NAME nxflatxip SRCS nxflatxip_main.c symtab.c)
+endif()
diff --git a/examples/nxflatxip/Kconfig b/examples/nxflatxip/Kconfig
new file mode 100644
index 000000000..8a798d503
--- /dev/null
+++ b/examples/nxflatxip/Kconfig
@@ -0,0 +1,38 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_NXFLATXIP
+	tristate "NXFLAT execute-in-place from xipfs demo"
+	depends on FS_XIPFS && NXFLAT && LIBC_EXECFUNCS
+	default n
+	---help---
+		Write an NXFLAT module into xipfs at run time, the way a download
+		would, then run two instances of it concurrently.  The module's
+		text is executed directly out of flash and shared between the
+		instances, while each instance gets its own data.
+
+		Subcommands:
+
+		  bench   XIP read throughput before and after a flash write
+		  defrag  fragment the volume, compact it, with a block map
+
+		Building the module needs the mknxflat and ldnxflat host tools
+		from the NuttX toolchain, and the board's Make.defs must name
+		them, exactly as apps/examples/nxflat requires.
+
+if EXAMPLES_NXFLATXIP
+
+config EXAMPLES_NXFLATXIP_MOUNTPT
+	string "xipfs mountpoint"
+	default "/mnt/xipfs"
+
+config EXAMPLES_NXFLATXIP_MTD
+	string "MTD device backing the volume"
+	default "/dev/rpflash"
+	---help---
+		Used only by the defrag subcommand, which remounts the volume to
+		show that what it did survives.
+
+endif # EXAMPLES_NXFLATXIP
diff --git a/examples/nxflatxip/Make.defs b/examples/nxflatxip/Make.defs
new file mode 100644
index 000000000..2290cf00c
--- /dev/null
+++ b/examples/nxflatxip/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/nxflatxip/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_NXFLATXIP),)
+CONFIGURED_APPS += $(APPDIR)/examples/nxflatxip
+endif
diff --git a/examples/nxflatxip/Makefile b/examples/nxflatxip/Makefile
new file mode 100644
index 000000000..e74981c17
--- /dev/null
+++ b/examples/nxflatxip/Makefile
@@ -0,0 +1,54 @@
+############################################################################
+# apps/examples/nxflatxip/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# NXFLAT execute-in-place from xipfs
+
+CSRCS     = symtab.c
+MAINSRC   = nxflatxip_main.c
+
+# The generated symbol table declares every imported symbol as void *, which
+# the compiler objects to for the ones it knows as builtins.
+
+symtab.c_CFLAGS = -fno-builtin
+
+PROGNAME  = nxflatxip
+PRIORITY  = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_NXFLATXIP)
+
+# Both are generated by the module build below
+
+symtab.c: build
+xipmod_bin.h: build
+
+$(MAINSRC): xipmod_bin.h
+
+.PHONY: build
+build:
+	+$(Q) $(MAKE) -C module TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
+
+clean::
+	+$(Q) $(MAKE) -C module TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean
+
+include $(APPDIR)/Application.mk
diff --git a/examples/nxflatxip/module/.gitignore b/examples/nxflatxip/module/.gitignore
new file mode 100644
index 000000000..111804b12
--- /dev/null
+++ b/examples/nxflatxip/module/.gitignore
@@ -0,0 +1,4 @@
+/xipmod
+/xipmod-thunk.S
+/*.r1
+/*.r2
diff --git a/examples/nxflatxip/module/Makefile b/examples/nxflatxip/module/Makefile
new file mode 100644
index 000000000..89ad64866
--- /dev/null
+++ b/examples/nxflatxip/module/Makefile
@@ -0,0 +1,94 @@
+############################################################################
+# apps/examples/nxflatxip/module/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# The NXFLAT module the demo downloads into xipfs.  Built exactly the way
+# apps/examples/nxflat builds its test programs, so it needs the same two
+# host tools from the NuttX toolchain: mknxflat and ldnxflat.
+
+BIN       = xipmod
+
+R1SRCS    = $(BIN).c
+R1OBJS    = $(R1SRCS:.c=.o)
+
+R2SRC     = $(BIN)-thunk.S
+R2OBJ     = $(R2SRC:.S=.o)
+
+EXAMPLDIR = $(APPDIR)$(DELIM)examples$(DELIM)nxflatxip
+BINHDR    = $(EXAMPLDIR)$(DELIM)$(BIN)_bin.h
+SYMTAB    = $(EXAMPLDIR)$(DELIM)symtab.c
+
+all: $(BINHDR) $(SYMTAB)
+.PHONY: all clean
+
+$(R1OBJS): %.o: %.c
+	@echo "CC: $<"
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
+
+$(R2OBJ): %.o: %.S
+	@echo "AS: $<"
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
+
+$(BIN).r1: $(R1OBJS)
+	@echo "LD: $<"
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
+
+$(R2SRC): $(BIN).r1
+	@echo "MK: $<"
+	$(Q) $(MKNXFLAT) -o $@ $^
+
+$(BIN).r2: $(R2OBJ)
+	@echo "LD: $<"
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+
+$(BIN): $(BIN).r2
+	@echo "LD: $<"
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+
+# Embed the module in the demo.  It is not the demo's own text, it is a
+# payload the demo writes into the filesystem, so a plain byte array is what
+# is wanted.
+
+$(BINHDR): $(BIN)
+	@echo "GEN: $@"
+	$(Q) xxd -i -n g_xipmod $(BIN) | \
+		sed -e "s/^unsigned char/static const unsigned char/" \
+		    -e "s/^unsigned int/static const unsigned int/" >$@.tmp
+	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
+
+# The symbols the module imports from the firmware.  mknxflat left the list
+# in the thunk file it generated, so that is what is scanned.
+
+$(SYMTAB): $(R2SRC)
+	@echo "GEN: $@"
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh . g_nxflat >$@.tmp
+	$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
+
+clean:
+	$(call DELFILE, $(BIN))
+	$(call DELFILE, $(R2SRC))
+	$(call DELFILE, *.r1)
+	$(call DELFILE, *.r2)
+	$(call DELFILE, $(BINHDR))
+	$(call DELFILE, $(SYMTAB))
+	$(call CLEAN)
diff --git a/examples/nxflatxip/module/xipmod.c b/examples/nxflatxip/module/xipmod.c
new file mode 100644
index 000000000..1c721acbd
--- /dev/null
+++ b/examples/nxflatxip/module/xipmod.c
@@ -0,0 +1,116 @@
+/****************************************************************************
+ * apps/examples/nxflatxip/module/xipmod.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * The module the demo downloads into xipfs and runs.
+ *
+ * Given a seed on the command line it fills an array derived from it,
+ * sleeps long enough for a second instance to do the same with a different
+ * seed, checks its own values are untouched, and hands the result to the
+ * firmware.  It reports the address of its own text, which is the point of
+ * the exercise: that address is inside the memory mapped flash window, it
+ * is the same in both instances, and the module is executing from it rather
+ * than from a copy in RAM.
+ *
+ * Two things this module deliberately does not have, both because of what
+ * the ldnxflat in circulation does with them:
+ *
+ *   - No global or static variables.  Those are reached through the GOT,
+ *     and the GOT entries come out pointing into the import table rather
+ *     than into .bss, so the module overwrites the addresses of the
+ *     functions it imports and jumps into nothing on its next call out.
+ *   - No string constants.  With this linker script .rodata lives in the
+ *     text segment and is reached PC-relatively, and the addend already
+ *     in the instruction is dropped when that relocation is resolved, so
+ *     the pointer lands somewhere in the middle of the code.
+ *
+ * Hence the reporting callback: the module passes numbers to the firmware
+ * and the firmware, which has a working printf and a format string, does
+ * the printing.  It also exercises the other direction of the interface --
+ * firmware code entered with the module's data base still in r10.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define NVALUES  64
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Exported by the demo in the firmware and imported by this module */
+
+void xipmod_report(int seed, const void *text, const void *stack,
+                   long sum, int errors);
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  int values[NVALUES];
+  int errors = 0;
+  int seed = 1;
+  long sum = 0;
+  int i;
+
+  if (argc > 1)
+    {
+      seed = atoi(argv[1]);
+    }
+
+  for (i = 0; i < NVALUES; i++)
+    {
+      values[i] = seed * (i + 1);
+    }
+
+  /* Long enough that the other instance has certainly filled its own copy
+   * by the time this one checks.
+   */
+
+  usleep(200000);
+
+  for (i = 0; i < NVALUES; i++)
+    {
+      if (values[i] != seed * (i + 1))
+        {
+          errors++;
+        }
+
+      sum += values[i];
+    }
+
+  xipmod_report(seed, (const void *)main, (const void *)values, sum, errors);
+
+  return errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/nxflatxip/nxflatxip_main.c b/examples/nxflatxip/nxflatxip_main.c
new file mode 100644
index 000000000..946e2b649
--- /dev/null
+++ b/examples/nxflatxip/nxflatxip_main.c
@@ -0,0 +1,895 @@
+/****************************************************************************
+ * apps/examples/nxflatxip/nxflatxip_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * End to end demonstration of what a writable execute-in-place file system
+ * is for:
+ *
+ *   1. write an NXFLAT module into xipfs at run time, the way a download
+ *      would,
+ *   2. confirm the file system can hand out a direct flash pointer for it,
+ *   3. run two instances of it concurrently,
+ *   4. confirm both ran correctly, that their data did not interfere, and
+ *      that the shared text was pinned in place while they ran.
+ *
+ * The same module in a ROMFS image would give the same execute-in-place
+ * behaviour; what it could not do is arrive after the firmware was built.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/ioctl.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <nuttx/binfmt/binfmt.h>
+#include <nuttx/fs/ioctl.h>
+#include <nuttx/fs/xipfs.h>
+#include <nuttx/symtab.h>
+
+#include "xipmod_bin.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MOUNTPT    CONFIG_EXAMPLES_NXFLATXIP_MOUNTPT
+#define MTDDEV     CONFIG_EXAMPLES_NXFLATXIP_MTD
+#define MODPATH    MOUNTPT "/xipmod"
+#define BENCH_PATH MOUNTPT "/big"
+#define BENCH_SIZE (256 * 1024)
+#define DF_FILES   55
+#define DF_MAPCOLS 50
+
+/****************************************************************************
+ * External Symbols
+ ****************************************************************************/
+
+/* Generated by module/Makefile from the import list mknxflat left in the
+ * module's thunk file.  The NXFLAT loader has no other way to resolve the
+ * functions the module calls.
+ */
+
+extern const struct symtab_s g_nxflat_exports[];
+extern const int g_nxflat_nexports;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static char g_map[512];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: xipmod_report
+ *
+ * Description:
+ *   Called by the module, running in place from flash, to report what it
+ *   found.  It passes numbers rather than formatting its own output; see
+ *   module/xipmod.c for why.
+ *
+ *   This is also the direction of the interface that needs r10 to survive:
+ *   the module reaches its own data through that register, and this
+ *   function runs with the module's data base still in it.  That is what
+ *   the --fixed-r10 the ARM toolchain adds under CONFIG_PIC is for.
+ *
+ ****************************************************************************/
+
+void xipmod_report(int seed, FAR const void *text, FAR const void *stack,
+                   long sum, int errors)
+{
+  syslog(LOG_INFO, "  instance seed %d: text %p, stack %p, sum %ld -- %s\n",
+         seed, text, stack, sum,
+         errors == 0 ? "data private and intact" : "DATA CORRUPTED");
+}
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stage_module
+ *
+ * Description:
+ *   Write the module into the file system exactly as a download would:
+ *   declare the size up front so xipfs reserves an exactly sized
+ *   contiguous extent, then write it once.
+ *
+ ****************************************************************************/
+
+static int stage_module(void)
+{
+  ssize_t nwritten;
+  int fd;
+
+  unlink(MODPATH);
+
+  fd = open(MODPATH, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0755);
+  if (fd < 0)
+    {
+      syslog(LOG_INFO, "ERROR: open %s failed: %d\n", MODPATH, errno);
+      return -errno;
+    }
+
+  if (ftruncate(fd, g_xipmod_len) < 0)
+    {
+      syslog(LOG_INFO, "ERROR: ftruncate failed: %d\n", errno);
+      close(fd);
+      return -errno;
+    }
+
+  nwritten = write(fd, g_xipmod, g_xipmod_len);
+  close(fd);
+
+  if (nwritten != (ssize_t)g_xipmod_len)
+    {
+      syslog(LOG_INFO, "ERROR: short write: %zd of %u\n", nwritten,
+             g_xipmod_len);
+      return -EIO;
+    }
+
+  syslog(LOG_INFO, "staged %u bytes to %s\n", g_xipmod_len, MODPATH);
+  return 0;
+}
+
+/****************************************************************************
+ * Name: extent_info_path
+ *
+ * Description:
+ *   Where a file physically lies: its extent, its flash address, and how
+ *   many live mappings are pinning it in place.
+ *
+ ****************************************************************************/
+
+static int extent_info_path(FAR const char *path,
+                            FAR struct xipfs_extent_info_s *info)
+{
+  int fd;
+  int ret;
+
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ioctl(fd, XIPFSIOC_EXTENTINFO, (unsigned long)(uintptr_t)info);
+  close(fd);
+
+  return ret < 0 ? -errno : 0;
+}
+
+/****************************************************************************
+ * Name: bench_read
+ *
+ * Description:
+ *   Time a bulk read straight out of the memory mapped flash, big enough to
+ *   miss the XIP cache.  Run once on a freshly booted system, where the
+ *   bootrom's fast read mode is still in effect, and again after a flash
+ *   write has forced the driver to restore XIP itself.  The difference is
+ *   the cost of whichever restore path the driver used.
+ *
+ ****************************************************************************/
+
+static long bench_read(void)
+{
+  struct timespec t0;
+  struct timespec t1;
+  FAR uint8_t *buf;
+  ssize_t n;
+  long total = 0;
+  int fd;
+
+  buf = malloc(4096);
+  if (buf == NULL)
+    {
+      return -1;
+    }
+
+  fd = open(BENCH_PATH, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      free(buf);
+      return -1;
+    }
+
+  clock_gettime(CLOCK_MONOTONIC, &t0);
+
+  while ((n = read(fd, buf, 4096)) > 0)
+    {
+      total += n;
+    }
+
+  clock_gettime(CLOCK_MONOTONIC, &t1);
+
+  close(fd);
+  free(buf);
+
+  if (total <= 0)
+    {
+      return -1;
+    }
+
+  return (t1.tv_sec - t0.tv_sec) * 1000 +
+         (t1.tv_nsec - t0.tv_nsec) / 1000000;
+}
+
+static int bench_main(void)
+{
+  long before;
+  long after;
+  int fd;
+
+  syslog(LOG_INFO, "\nXIP read benchmark (%d KB)\n", BENCH_SIZE / 1024);
+
+  before = bench_read();
+  if (before < 0)
+    {
+      syslog(LOG_INFO, "  create %s first: "
+             "dd if=/dev/zero of=%s bs=512 count=512\n",
+             BENCH_PATH, BENCH_PATH);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "  before any flash write : %ld ms\n", before);
+
+  /* Any write forces the driver to tear XIP down and put it back */
+
+  fd = open(MOUNTPT "/benchw",
+            O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  if (fd >= 0)
+    {
+      write(fd, "x", 1);
+      close(fd);
+    }
+
+  after = bench_read();
+  syslog(LOG_INFO, "  after  a flash write   : %ld ms\n", after);
+
+  if (before > 0)
+    {
+      syslog(LOG_INFO, "  ratio                  : %ld.%02ldx\n",
+             after / before, ((after * 100) / before) % 100);
+    }
+
+  unlink(MOUNTPT "/benchw");
+  return EXIT_SUCCESS;
+}
+
+static int remount(void)
+{
+  int ret;
+
+  ret = umount(MOUNTPT);
+  if (ret < 0 && errno != ENOENT && errno != EINVAL)
+    {
+      return -errno;
+    }
+
+  ret = mount(MTDDEV, MOUNTPT, "xipfs", 0, NULL);
+  return ret < 0 ? -errno : 0;
+}
+
+static void fill_pattern(FAR uint8_t *buf, size_t len, uint8_t seed)
+{
+  size_t i;
+
+  for (i = 0; i < len; i++)
+    {
+      buf[i] = (uint8_t)(seed + (i * 7));
+    }
+}
+
+static int create_file(FAR const char *path, size_t len, uint8_t seed)
+{
+  FAR uint8_t *buf;
+  ssize_t nw;
+  int fd;
+  int ret = 0;
+
+  buf = malloc(len);
+  if (buf == NULL)
+    {
+      return -ENOMEM;
+    }
+
+  fill_pattern(buf, len, seed);
+
+  fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  if (fd < 0)
+    {
+      free(buf);
+      return -errno;
+    }
+
+  if (ftruncate(fd, len) < 0)
+    {
+      ret = -errno;
+    }
+  else
+    {
+      nw = write(fd, buf, len);
+      if (nw != (ssize_t)len)
+        {
+          ret = nw < 0 ? -errno : -EIO;
+        }
+    }
+
+  close(fd);
+  free(buf);
+  return ret;
+}
+
+static bool verify_file(FAR const char *path, size_t len, uint8_t seed)
+{
+  FAR uint8_t *got;
+  FAR uint8_t *want;
+  bool ok = false;
+  ssize_t n;
+  int fd;
+
+  got  = malloc(len);
+  want = malloc(len);
+  if (got == NULL || want == NULL)
+    {
+      free(got);
+      free(want);
+      return false;
+    }
+
+  fill_pattern(want, len, seed);
+
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  if (fd >= 0)
+    {
+      n = read(fd, got, len);
+      ok = (n == (ssize_t)len) && (memcmp(got, want, len) == 0);
+      close(fd);
+    }
+
+  free(got);
+  free(want);
+  return ok;
+}
+
+/****************************************************************************
+ * Name: run_defrag
+ *
+ * Description:
+ *   Compact the volume.  The command acts on the volume, so it goes through
+ *   a descriptor for the mountpoint directory: a descriptor for a file
+ *   inside it would hold that file open, and an open extent cannot be
+ *   relocated.
+ *
+ ****************************************************************************/
+
+static int run_defrag(uint32_t max_ms,
+                      FAR struct xipfs_defrag_result_s *result)
+{
+  struct xipfs_defrag_arg_s arg;
+  int fd;
+  int ret;
+
+  memset(&arg, 0, sizeof(arg));
+  arg.max_ms = max_ms;
+
+  fd = open(MOUNTPT, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ioctl(fd, XIPFSIOC_DEFRAG, (unsigned long)(uintptr_t)&arg);
+  close(fd);
+
+  if (ret < 0)
+    {
+      return -errno;
+    }
+
+  *result = arg.result;
+  return 0;
+}
+
+/****************************************************************************
+ * Defragmentation showcase
+ *
+ * Fragments the volume until an allocation genuinely cannot be satisfied --
+ * plenty of free space, but none of it contiguous -- then compacts and
+ * retries the same allocation.  On a real board everything below runs
+ * against real NOR: each move is a page-at-a-time copy, a metadata commit,
+ * and an erase of the vacated blocks.
+ ****************************************************************************/
+
+static int df_mapfill(FAR uint32_t *dstart, FAR uint32_t *dblocks)
+{
+  struct xipfs_extent_info_s info;
+  FAR struct dirent *de;
+  FAR DIR *dirp;
+  char path[80];
+  int files = 0;
+  uint32_t i;
+
+  memset(g_map, '.', sizeof(g_map));
+  *dstart = 0;
+  *dblocks = 0;
+
+  dirp = opendir(MOUNTPT);
+  if (dirp == NULL)
+    {
+      return -1;
+    }
+
+  while ((de = readdir(dirp)) != NULL)
+    {
+      snprintf(path, sizeof(path), "%s/%s", MOUNTPT, de->d_name);
+      if (extent_info_path(path, &info) < 0)
+        {
+          continue;
+        }
+
+      *dstart  = info.data_start;
+      *dblocks = info.data_nblocks;
+      files++;
+
+      for (i = 0; i < info.nblocks; i++)
+        {
+          uint32_t idx = info.start_block - info.data_start + i;
+          if (idx < sizeof(g_map))
+            {
+              g_map[idx] = '#';
+            }
+        }
+    }
+
+  closedir(dirp);
+  return files;
+}
+
+static void df_showmap(FAR const char *title, uint32_t dblocks,
+                       FAR uint32_t *freeout, FAR uint32_t *largestout)
+{
+  uint32_t largest = 0;
+  uint32_t run = 0;
+  uint32_t free = 0;
+  uint32_t i;
+  char row[DF_MAPCOLS + 1];
+
+  syslog(LOG_INFO, "\n  %s\n", title);
+
+  for (i = 0; i < dblocks; i++)
+    {
+      if (g_map[i] == '.')
+        {
+          free++;
+          if (++run > largest)
+            {
+              largest = run;
+            }
+        }
+      else
+        {
+          run = 0;
+        }
+    }
+
+  for (i = 0; i < dblocks; i += DF_MAPCOLS)
+    {
+      uint32_t n = dblocks - i;
+      if (n > DF_MAPCOLS)
+        {
+          n = DF_MAPCOLS;
+        }
+
+      memcpy(row, &g_map[i], n);
+      row[n] = '\0';
+      syslog(LOG_INFO, "    %3" PRIu32 " |%s|\n", i, row);
+    }
+
+  syslog(LOG_INFO, "    free %" PRIu32
+         " blocks, largest contiguous run %" PRIu32 "\n", free, largest);
+
+  if (freeout != NULL)
+    {
+      *freeout = free;
+    }
+
+  if (largestout != NULL)
+    {
+      *largestout = largest;
+    }
+}
+
+static int df_try_alloc(uint32_t nblocks, uint32_t erasesize)
+{
+  int fd;
+  int ret;
+
+  unlink(MOUNTPT "/bigalloc");
+
+  fd = open(MOUNTPT "/bigalloc",
+            O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ftruncate(fd, (off_t)nblocks * erasesize);
+  close(fd);
+
+  if (ret < 0)
+    {
+      ret = -errno;
+      unlink(MOUNTPT "/bigalloc");
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: empty_dir
+ *
+ * Description:
+ *   Delete everything below 'dir', descending into subdirectories.
+ *
+ *   One entry is taken per pass rather than a listing being collected up
+ *   front, because this recurses and the task stack is the default 2 KB: an
+ *   array of names big enough to be useful costs more than a kilobyte a
+ *   frame, and two levels of that overflows and returns through a smashed
+ *   frame.  A pass costs an opendir instead, which no one is timing.
+ *
+ *   The directory is closed before anything is removed, since unlinking
+ *   while iterating skips entries.
+ *
+ ****************************************************************************/
+
+static void empty_dir(FAR const char *dir)
+{
+  char path[80];
+  bool more = true;
+
+  while (more)
+    {
+      FAR struct dirent *de;
+      FAR DIR *dirp;
+      bool isdir;
+
+      dirp = opendir(dir);
+      if (dirp == NULL)
+        {
+          return;
+        }
+
+      de = readdir(dirp);
+      if (de == NULL)
+        {
+          closedir(dirp);
+          return;
+        }
+
+      isdir = (de->d_type == DTYPE_DIRECTORY);
+      snprintf(path, sizeof(path), "%s/%s", dir, de->d_name);
+      closedir(dirp);
+
+      if (isdir)
+        {
+          empty_dir(path);
+          more = rmdir(path) == 0;
+        }
+      else
+        {
+          more = unlink(path) == 0;
+        }
+    }
+}
+
+static int defrag_main(void)
+{
+  struct xipfs_defrag_result_s res;
+  struct xipfs_extent_info_s info;
+  struct timespec t0;
+  struct timespec t1;
+  uint32_t dstart;
+  uint32_t dblocks;
+  uint32_t erasesize = 4096;
+  uint32_t want;
+  uint32_t freeblk = 0;
+  uint32_t largest = 0;
+  char path[80];
+  long ms;
+  int i;
+  int ret;
+
+  memset(&res, 0, sizeof(res));
+
+  syslog(LOG_INFO, "\n=== xipfs defragmentation ===\n");
+
+  /* Clean slate, so the map below accounts for every used block */
+
+  empty_dir(MOUNTPT);
+
+  syslog(LOG_INFO, "\n[1] writing %d files...\n", DF_FILES);
+
+  for (i = 0; i < DF_FILES; i++)
+    {
+      snprintf(path, sizeof(path), MOUNTPT "/m%02d", i);
+      if (create_file(path, 2000, (uint8_t)(i + 1)) < 0)
+        {
+          syslog(LOG_INFO, "    stopped at %d (volume full)\n", i);
+          break;
+        }
+    }
+
+  if (extent_info_path(MOUNTPT "/m00", &info) == 0)
+    {
+      erasesize = info.erasesize;
+    }
+
+  df_mapfill(&dstart, &dblocks);
+  df_showmap("map, all files present:", dblocks, NULL, NULL);
+
+  syslog(LOG_INFO, "\n[2] deleting every other file to fragment it...\n");
+
+  for (i = 0; i < DF_FILES; i += 2)
+    {
+      snprintf(path, sizeof(path), MOUNTPT "/m%02d", i);
+      unlink(path);
+    }
+
+  df_mapfill(&dstart, &dblocks);
+  df_showmap("map, fragmented (# used, . free):", dblocks,
+             &freeblk, &largest);
+
+  /* Bigger than any single hole, but comfortably inside the total free
+   * space -- so it can only be satisfied once the holes are coalesced.
+   */
+
+  want = largest + (freeblk - largest) / 2;
+
+  syslog(LOG_INFO, "\n[3] requesting a %" PRIu32
+         "-block (%" PRIu32 " KB) contiguous file\n", want,
+         want * erasesize / 1024);
+
+  ret = df_try_alloc(want, erasesize);
+  syslog(LOG_INFO, "    result: %s\n",
+         ret < 0 ? "FAILED -ENOSPC (free space is not contiguous)" : "ok");
+
+  syslog(LOG_INFO, "\n[4] compacting...\n");
+
+  clock_gettime(CLOCK_MONOTONIC, &t0);
+  ret = run_defrag(0, &res);
+  clock_gettime(CLOCK_MONOTONIC, &t1);
+
+  ms = (t1.tv_sec - t0.tv_sec) * 1000 + (t1.tv_nsec - t0.tv_nsec) / 1000000;
+
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "    defrag failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "    elapsed          : %ld ms\n", ms);
+  syslog(LOG_INFO, "    extents relocated: %" PRIu32 "\n",
+         res.extents_moved);
+  syslog(LOG_INFO, "    blocks reclaimed : %" PRIu32 "\n",
+         res.blocks_reclaimed);
+  syslog(LOG_INFO, "    largest free run : %zu bytes (%zu blocks)\n",
+         res.largest_free_run, res.largest_free_run / erasesize);
+  syslog(LOG_INFO, "    stop reason      : %d (%s)\n", res.reason,
+         res.reason == XIPFS_DEFRAG_DONE         ? "done" :
+         res.reason == XIPFS_DEFRAG_BLOCKED_OPEN ? "blocked by an open "
+                                                   "file" :
+         res.reason == XIPFS_DEFRAG_BLOCKED_PINS ? "blocked by a live "
+                                                   "XIP mapping" :
+                                                   "other");
+
+  df_mapfill(&dstart, &dblocks);
+  df_showmap("map after defrag:", dblocks, NULL, NULL);
+
+  want = res.largest_free_run / erasesize;
+
+  syslog(LOG_INFO, "\n[5] retrying, sized to the reported largest run"
+         " (%" PRIu32 " blocks)\n", want);
+  ret = df_try_alloc(want, erasesize);
+  syslog(LOG_INFO, "    result: %s\n",
+         ret < 0 ? "still failed" : "OK -- allocation now fits");
+  unlink(MOUNTPT "/bigalloc");
+
+  syslog(LOG_INFO, "\n[6] verifying every relocated file byte-for-byte\n");
+
+  ret = 0;
+  for (i = 1; i < DF_FILES; i += 2)
+    {
+      snprintf(path, sizeof(path), MOUNTPT "/m%02d", i);
+      if (!verify_file(path, 2000, (uint8_t)(i + 1)))
+        {
+          syslog(LOG_INFO, "    MISMATCH in %s\n", path);
+          ret = -1;
+        }
+    }
+
+  syslog(LOG_INFO, "    %s\n", ret == 0 ? "all survivors intact" : "FAILED");
+
+  syslog(LOG_INFO, "\n[7] remounting to prove it is durable\n");
+  if (remount() < 0)
+    {
+      syslog(LOG_INFO, "    remount FAILED\n");
+      return EXIT_FAILURE;
+    }
+
+  ret = 0;
+  for (i = 1; i < DF_FILES; i += 2)
+    {
+      snprintf(path, sizeof(path), MOUNTPT "/m%02d", i);
+      if (!verify_file(path, 2000, (uint8_t)(i + 1)))
+        {
+          ret = -1;
+        }
+    }
+
+  syslog(LOG_INFO, "    %s\n",
+         ret == 0 ? "all files intact after remount" : "FAILED");
+
+  syslog(LOG_INFO, "\n=== defrag complete ===\n");
+  return EXIT_SUCCESS;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  struct xipfs_extent_info_s info;
+  FAR char *args[3];
+  char seed[2][8];
+  pid_t pid[2];
+  int status;
+  int ret;
+  int i;
+
+  if (argc > 1 && strcmp(argv[1], "bench") == 0)
+    {
+      return bench_main();
+    }
+
+  if (argc > 1 && strcmp(argv[1], "defrag") == 0)
+    {
+      return defrag_main();
+    }
+
+  syslog(LOG_INFO,
+         "\n=== NXFLAT module executed in place from xipfs ===\n\n");
+
+  ret = stage_module();
+  if (ret < 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  ret = extent_info_path(MODPATH, &info);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "ERROR: cannot query extent: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "extent: block %" PRIu32 " x%" PRIu32 ", size %" PRIu32
+         ", flash addr 0x%08" PRIxPTR "\n",
+         info.start_block, info.nblocks, info.size, info.xipaddr);
+
+  if (info.xipaddr == 0)
+    {
+      syslog(LOG_INFO,
+             "ERROR: the file system cannot expose a flash pointer, so the "
+             "module would have to be copied to RAM.  Does the MTD driver "
+             "answer BIOC_XIPBASE?\n");
+      return EXIT_FAILURE;
+    }
+
+  /* Launch two instances.  They overlap deliberately: each fills its array,
+   * sleeps, then checks it.  Shared data would show up as a mismatch.
+   */
+
+  syslog(LOG_INFO, "\nrunning two concurrent instances...\n\n");
+
+  for (i = 0; i < 2; i++)
+    {
+      snprintf(seed[i], sizeof(seed[i]), "%d", i + 1);
+
+      args[0] = (FAR char *)"xipmod";
+      args[1] = seed[i];
+      args[2] = NULL;
+
+      /* exec() rather than posix_spawn() because the symbol table the
+       * module links against is the demo's, not one the OS holds.
+       */
+
+      pid[i] = exec(MODPATH, args, NULL, g_nxflat_exports,
+                    g_nxflat_nexports);
+      if (pid[i] < 0)
+        {
+          syslog(LOG_INFO, "ERROR: exec of instance %d failed: %d\n", i + 1,
+                 pid[i]);
+          return EXIT_FAILURE;
+        }
+    }
+
+  /* While both are alive the shared text must be pinned once per instance,
+   * which is what stops the defragmenter relocating code that is executing.
+   */
+
+  usleep(100000);
+
+  if (extent_info_path(MODPATH, &info) == 0)
+    {
+      syslog(LOG_INFO,
+             "\n[while running] pin count on the shared text = %" PRIu32
+             "\n\n", info.pincount);
+    }
+
+  for (i = 0; i < 2; i++)
+    {
+      if (waitpid(pid[i], &status, 0) >= 0 &&
+          (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS))
+        {
+          syslog(LOG_INFO, "instance %d did not exit cleanly\n", i + 1);
+          ret = -1;
+        }
+    }
+
+  /* The pins outlive the instances.  binfmt maps the text in the context of
+   * whoever called exec(), so the mappings belong to this task's address
+   * space, not to the tasks that ran, and they are released when this task
+   * exits.  Run "xipfs -n" after this demo returns to see the count back at
+   * zero and the extent movable again.
+   */
+
+  if (extent_info_path(MODPATH, &info) == 0)
+    {
+      syslog(LOG_INFO,
+             "[after exit]    pin count on the shared text = %" PRIu32
+             " (released when this task exits)\n", info.pincount);
+    }
+
+  syslog(LOG_INFO, "\n=== %s ===\n", ret == 0 ? "done" : "FAILED");
+  return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 68701867076ff1e28b16899818335ad7cdea6152 Mon Sep 17 00:00:00 2001
From: Acfboy <AcfboyU@outlook.com>
Date: Wed, 29 Jul 2026 23:51:31 +0800
Subject: [PATCH 551/568] graphics/microwindows: fix missing HAVE_FNT_SUPPORT
 in Makefile

Without this Make variable, Objects.rules does not add font_fnt.o
to the build, causing undefined reference to fnt_createfont at link time.

Signed-off-by: Acfboy <AcfboyU@outlook.com>
---
 graphics/microwindows/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/graphics/microwindows/Makefile b/graphics/microwindows/Makefile
index 5dae89ac0..2ea7e4c1a 100644
--- a/graphics/microwindows/Makefile
+++ b/graphics/microwindows/Makefile
@@ -108,6 +108,8 @@ else ifeq ($(CONFIG_MICROWINDOWS_MOUSE_CUSTOM),y)
 MOUSE = CUSTOM
 endif
 
+HAVE_FNT_SUPPORT = Y
+
 -include microwindows/src/engine/Objects.rules
 -include microwindows/src/drivers/Objects.rules
 -include microwindows/src/fonts/Objects.rules

From 07c123437217de9db4c5c0865127c14c53a9ff22 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Wed, 29 Jul 2026 22:52:02 -0300
Subject: [PATCH 552/568] games/NXDoom: draw in the pixel format of the frame
 buffer

The blit assumed a 32-bit frame buffer:  it wrote a uint32_t per pixel
and converted the palette with ARGBTO32 as it went, so the image came
out wrong anywhere else.  It also drew at the origin, leaving the image
in a corner of a display it does not fill, and indexed the source by the
output column, which costs a division for every pixel of every frame.

Convert the palette once per palette change into the format the frame
buffer actually uses, map output columns to source columns through a
table built at startup, and centre the result.  Output rows that come
from the same source row are copied rather than converted again.

Four options are added, all off by default, so that a board can trade
memory for speed where it pays:

  GAMES_NXDOOM_FB_CMAP blits palette indices and lets a frame buffer
  that has a colour map do the conversion in hardware.

  GAMES_NXDOOM_FILLSCREEN stretches the image over the whole display
  rather than scaling it by a whole number.

  GAMES_NXDOOM_ROWSTAGE builds each row in a staging buffer so that the
  frame buffer only sees burst-friendly copies.

  GAMES_NXDOOM_STATIC_SCRNBUF places the render target in .bss, which
  keeps it out of external memory on a board whose heap is mostly that.

On an STM32H753 driving a 1024x600 panel from SDRAM, the last two are
worth 2.7x together.

Also open the frame buffer with O_CLOEXEC.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 games/NXDoom/Kconfig       |  55 +++++++
 games/NXDoom/src/i_video.c | 289 ++++++++++++++++++++++++++++++++++---
 2 files changed, 322 insertions(+), 22 deletions(-)

diff --git a/games/NXDoom/Kconfig b/games/NXDoom/Kconfig
index 5b82b7633..d2bd2080f 100644
--- a/games/NXDoom/Kconfig
+++ b/games/NXDoom/Kconfig
@@ -157,6 +157,61 @@ config GAMES_NXDOOM_KBDPATH
 
 endif # GAMES_NXDOOM_KEYBOARD
 
+config GAMES_NXDOOM_FB_CMAP
+	bool "Draw through the frame buffer colour map"
+	default n
+	---help---
+		DOOM draws into an 8-bit palettised buffer and normally converts
+		every pixel to the pixel format of the frame buffer as it blits.
+		A frame buffer that has a colour map of its own can do that
+		conversion in hardware while it scans the display out, so enable
+		this to load the DOOM palette into the colour map and blit the
+		palette indices unconverted.
+
+		This needs a frame buffer that is 8 bits per pixel and supports
+		FBIOPUT_CMAP, such as an STM32 LTDC layer configured for L8.  It
+		both removes the conversion and halves the amount of data written
+		per frame, which matters most when the frame buffer is external
+		memory.
+
+config GAMES_NXDOOM_FILLSCREEN
+	bool "Stretch the image to the whole display"
+	default n
+	---help---
+		By default the 320x200 image is scaled by the largest whole number
+		that fits, which leaves a border on a display whose size is not an
+		exact multiple of it.  Enable this to stretch the image over the
+		entire frame buffer instead, which fills the display at the cost of
+		a scale factor that is not uniform across the image.
+
+config GAMES_NXDOOM_ROWSTAGE
+	bool "Build each output row in a staging buffer"
+	default n
+	---help---
+		Expand each row into a staging buffer and copy it to the frame
+		buffer, rather than writing the frame buffer a pixel at a time.
+		Every frame buffer access then becomes a burst-friendly copy, which
+		is worth a lot when the frame buffer is external memory and the
+		data cache is in write-through mode, and little otherwise.
+
+		Costs a few kilobytes of .bss for the buffer.  A row that does not
+		fit is written directly, as if this were disabled.
+
+config GAMES_NXDOOM_STATIC_SCRNBUF
+	bool "Place the render target in .bss"
+	default n
+	---help---
+		DOOM renders into a 320x200 buffer that is normally taken from the
+		heap.  On a board whose heap is mostly slow external memory the
+		allocation lands there, which is close to the worst case:  the
+		renderer draws in vertical columns, so consecutive writes are one
+		screen width apart and none of them coalesce.
+
+		Enable this to make the buffer a static object instead, so the
+		linker places it in internal RAM along with the rest of .bss.  It
+		costs 64000 bytes of RAM whether DOOM runs or not, so it is only
+		worth it when internal RAM is plentiful and the heap is not.
+
 comment "Optimizations"
 
 config GAMES_NXDOOM_MAXVISPLANES
diff --git a/games/NXDoom/src/i_video.c b/games/NXDoom/src/i_video.c
index 0d3b41af3..cf3c83780 100644
--- a/games/NXDoom/src/i_video.c
+++ b/games/NXDoom/src/i_video.c
@@ -92,6 +92,26 @@ struct graphics_state_s
 
   uint8_t scale;
 
+  /* Byte offset into the frame buffer of the top left corner of the scaled
+   * image, so that it is centred on displays it does not fill.
+   */
+
+  size_t origin;
+
+  /* Size of the scaled image in pixels.  This is an integer multiple of the
+   * DOOM resolution unless the image is stretched to fill the display.
+   */
+
+  unsigned outw;
+  unsigned outh;
+
+  /* Maps an output column onto the source column it is drawn from, so that
+   * the inner loop needs neither a division nor a separate case for
+   * fractional scaling.
+   */
+
+  FAR uint16_t *colmap;
+
   bool inited; /* Track initialization */
 };
 
@@ -106,6 +126,27 @@ static struct graphics_state_s g_graphics_state =
   0
 };
 
+#ifdef CONFIG_GAMES_NXDOOM_STATIC_SCRNBUF
+/* The buffer DOOM renders into.  Keeping it in .bss rather than on the heap
+ * puts it in internal RAM on boards whose heap is mostly external memory.
+ */
+
+static pixel_t g_scrnbuf[SCREENWIDTH * SCREENHEIGHT];
+#endif
+
+#ifdef CONFIG_GAMES_NXDOOM_ROWSTAGE
+/* Staging area for one output row.  Expanding a row here and then copying it
+ * out keeps the per-pixel writes in internal RAM and turns every frame
+ * buffer access into a burst-friendly copy, which is what an external frame
+ * buffer wants.  Declared as uint32_t for alignment; it holds one row at the
+ * largest scale and pixel size it can serve.
+ */
+
+#define BLIT_MAX_STAGED_SCALE 4
+
+static uint32_t g_rowbuf[SCREENWIDTH * BLIT_MAX_STAGED_SCALE];
+#endif
+
 /* Window title */
 
 static const char *g_window_title = "";
@@ -114,6 +155,13 @@ static const char *g_window_title = "";
 
 static struct argbcolor_s g_palette[256];
 
+/* The same palette, pre-converted to the pixel format of the frame buffer.
+ * Doing the conversion once per palette change instead of once per pixel
+ * keeps blit_screen() down to a lookup and a store.
+ */
+
+static uint32_t g_palette_native[256];
+
 static boolean palette_to_set;
 
 /* disable mouse? */
@@ -248,41 +296,196 @@ unsigned int joywait = 0;
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: update_native_palette
+ *
+ * Description:
+ *   Convert the ARGB palette into the pixel format of the frame buffer so
+ *   that blitting is a plain table lookup.
+ *
+ ****************************************************************************/
+
+static void update_native_palette(void)
+{
+  int i;
+
+#ifdef CONFIG_GAMES_NXDOOM_FB_CMAP
+  uint8_t red[256];
+  uint8_t green[256];
+  uint8_t blue[256];
+#ifdef CONFIG_FB_TRANSPARENCY
+  uint8_t transp[256];
+#endif
+  struct fb_cmap_s cmap;
+
+  /* Hand the palette to the display and leave the lookup an identity, so
+   * that blitting writes the palette index and the hardware converts it
+   * while it scans the display out.
+   */
+
+  for (i = 0; i < 256; i++)
+    {
+      red[i]              = g_palette[i].r;
+      green[i]            = g_palette[i].g;
+      blue[i]             = g_palette[i].b;
+#ifdef CONFIG_FB_TRANSPARENCY
+      transp[i]           = 0xff;
+#endif
+      g_palette_native[i] = i;
+    }
+
+  cmap.first = 0;
+  cmap.len   = 256;
+  cmap.red   = red;
+  cmap.green = green;
+  cmap.blue  = blue;
+#ifdef CONFIG_FB_TRANSPARENCY
+  cmap.transp = transp;
+#endif
+
+  if (ioctl(g_graphics_state.fd, FBIOPUT_CMAP,
+            (unsigned long)((uintptr_t)&cmap)) < 0)
+    {
+      i_error("ioctl(FBIOPUT_CMAP) failed: %d\n", errno);
+    }
+#else
+  for (i = 0; i < 256; i++)
+    {
+      switch (g_graphics_state.pinfo.bpp)
+        {
+          case 8:
+            g_palette_native[i] = RGBTO8(g_palette[i].r, g_palette[i].g,
+                                         g_palette[i].b);
+            break;
+
+          case 16:
+            g_palette_native[i] = RGBTO16(g_palette[i].r, g_palette[i].g,
+                                          g_palette[i].b);
+            break;
+
+          case 24:
+            g_palette_native[i] = RGBTO24(g_palette[i].r, g_palette[i].g,
+                                          g_palette[i].b);
+            break;
+
+          default:
+            g_palette_native[i] = ARGBTO32(g_palette[i].a, g_palette[i].r,
+                                           g_palette[i].g, g_palette[i].b);
+            break;
+        }
+    }
+#endif
+}
+
 /****************************************************************************
  * Name: blit_screen
  *
  * Description:
- *   Blit the 8-bit depth buffer that DOOM renders to onto the frame buffer
- *   in a higher colour depth.
+ *   Blit the 8-bit depth buffer that DOOM renders to onto the frame buffer,
+ *   converting to the pixel format of the frame buffer and scaling up by an
+ *   integer factor.
  *
  ****************************************************************************/
 
 static void blit_screen(void)
 {
-  uint8_t p_idx;
-  void *fbptr;
+  FAR uint8_t *fbbase = (FAR uint8_t *)g_graphics_state.fbmem +
+                        g_graphics_state.origin;
+  FAR const uint16_t *colmap = g_graphics_state.colmap;
+  unsigned stride = g_graphics_state.pinfo.stride;
+  unsigned pixlen = g_graphics_state.pinfo.bpp >> 3;
+  unsigned outw = g_graphics_state.outw;
+  unsigned outh = g_graphics_state.outh;
+  unsigned rowbytes = outw * pixlen;
+#ifdef CONFIG_GAMES_NXDOOM_ROWSTAGE
+  bool staged = rowbytes <= sizeof(g_rowbuf);
+#else
+  const bool staged = false;
+#endif
+  FAR uint8_t *prevrow = NULL;
+  unsigned prevsy = SCREENHEIGHT;
+  unsigned x;
+  unsigned oy;
+  unsigned sy;
 
-  /* TODO: It would be best to do this more efficiently/with less memory.
-   * It also would be good if we could handle the palette translation here
-   * such that DOOM can be played on frame buffers with differing bit depths
-   * and pixel formats.
-   */
-
-  fbptr = g_graphics_state.fbmem;
-  for (unsigned y = 0; y < SCREENHEIGHT * g_graphics_state.scale; y++)
+  for (oy = 0; oy < outh; oy++)
     {
-      for (unsigned x = 0; x < SCREENWIDTH * g_graphics_state.scale; x++)
-        {
-          p_idx = g_graphics_state
-                      .scrnbuf[(y / g_graphics_state.scale) * SCREENWIDTH +
-                               (x / g_graphics_state.scale)];
+      FAR uint8_t *dst = fbbase + oy * stride;
+#ifdef CONFIG_GAMES_NXDOOM_ROWSTAGE
+      FAR uint8_t *out = staged ? (FAR uint8_t *)g_rowbuf : dst;
+#else
+      FAR uint8_t *out = dst;
+#endif
+      FAR const pixel_t *src;
+      FAR uint8_t *dest8 = out;
+      FAR uint16_t *dest16 = (FAR uint16_t *)out;
+      FAR uint32_t *dest32 = (FAR uint32_t *)out;
+      uint32_t pixel;
 
-          ((uint32_t *)(fbptr))[x] =
-              ARGBTO32(g_palette[p_idx].a, g_palette[p_idx].r,
-                       g_palette[p_idx].g, g_palette[p_idx].b);
+      /* Which source row this output row comes from.  Several output rows
+       * map to the same source row whenever the image is scaled up.
+       */
+
+      sy = oy * SCREENHEIGHT / outh;
+      if (sy == prevsy)
+        {
+          /* Identical to the row just built, so copy it rather than
+           * converting the same pixels again.
+           */
+
+          memcpy(dst, prevrow, rowbytes);
+          continue;
         }
 
-      fbptr += g_graphics_state.pinfo.stride;
+      /* Expand one source row.  The column map turns this into a lookup per
+       * output pixel, with no division and no special case for a scale
+       * factor that is not a whole number.
+       */
+
+      src = &g_graphics_state.scrnbuf[sy * SCREENWIDTH];
+
+      switch (g_graphics_state.pinfo.bpp)
+        {
+          case 8:
+            for (x = 0; x < outw; x++)
+              {
+                *dest8++ = g_palette_native[src[colmap[x]]];
+              }
+            break;
+
+          case 16:
+            for (x = 0; x < outw; x++)
+              {
+                *dest16++ = g_palette_native[src[colmap[x]]];
+              }
+            break;
+
+          case 24:
+            for (x = 0; x < outw; x++)
+              {
+                pixel = g_palette_native[src[colmap[x]]];
+
+                *dest8++ = pixel;
+                *dest8++ = pixel >> 8;
+                *dest8++ = pixel >> 16;
+              }
+            break;
+
+          default:
+            for (x = 0; x < outw; x++)
+              {
+                *dest32++ = g_palette_native[src[colmap[x]]];
+              }
+            break;
+        }
+
+      if (staged)
+        {
+          memcpy(dst, out, rowbytes);
+        }
+
+      prevsy = sy;
+      prevrow = out;
     }
 }
 
@@ -344,7 +547,10 @@ void i_shutdown_graphics(void)
 
   close(g_graphics_state.fd);
   munmap(g_graphics_state.fbmem, g_graphics_state.pinfo.fblen);
+#ifndef CONFIG_GAMES_NXDOOM_STATIC_SCRNBUF
   free(g_graphics_state.scrnbuf);
+#endif
+  free(g_graphics_state.colmap);
   g_graphics_state.inited = false;
 }
 
@@ -414,6 +620,7 @@ void i_finish_update(void)
   if (palette_to_set)
     {
       palette_to_set = false;
+      update_native_palette();
     }
 
   blit_screen();
@@ -680,12 +887,13 @@ void i_init_graphics(void)
 {
   uint8_t xscale;
   uint8_t yscale;
+  unsigned i;
   int err;
   byte *doompal;
 
   /* Open frame buffer */
 
-  g_graphics_state.fd = open(CONFIG_GAMES_NXDOOM_FBPATH, O_RDWR);
+  g_graphics_state.fd = open(CONFIG_GAMES_NXDOOM_FBPATH, O_RDWR | O_CLOEXEC);
   if (g_graphics_state.fd < 0)
     {
       i_error("Failed to open frame buffer: %d", errno);
@@ -724,6 +932,39 @@ void i_init_graphics(void)
   yscale = g_graphics_state.vinfo.yres / SCREENHEIGHT;
   g_graphics_state.scale = xscale > yscale ? yscale : xscale;
 
+#ifdef CONFIG_GAMES_NXDOOM_FILLSCREEN
+  /* Stretch to the whole display.  The scale factor is then generally not an
+   * integer, which the column map below takes care of.
+   */
+
+  g_graphics_state.outw = g_graphics_state.vinfo.xres;
+  g_graphics_state.outh = g_graphics_state.vinfo.yres;
+#else
+  g_graphics_state.outw = SCREENWIDTH * g_graphics_state.scale;
+  g_graphics_state.outh = SCREENHEIGHT * g_graphics_state.scale;
+#endif
+
+  /* Centre the scaled image in the frame buffer */
+
+  g_graphics_state.origin =
+      (g_graphics_state.vinfo.yres - g_graphics_state.outh) / 2 *
+      g_graphics_state.pinfo.stride +
+      (g_graphics_state.vinfo.xres - g_graphics_state.outw) / 2 *
+      (g_graphics_state.pinfo.bpp >> 3);
+
+  /* Build the output column to source column map once */
+
+  g_graphics_state.colmap = malloc(g_graphics_state.outw * sizeof(uint16_t));
+  if (g_graphics_state.colmap == NULL)
+    {
+      i_error("Couldn't allocate column map: %d\n", errno);
+    }
+
+  for (i = 0; i < g_graphics_state.outw; i++)
+    {
+      g_graphics_state.colmap[i] = i * SCREENWIDTH / g_graphics_state.outw;
+    }
+
   /* Get frame buffer plane info */
 
   if (ioctl(g_graphics_state.fd, FBIOGET_PLANEINFO,
@@ -744,7 +985,11 @@ void i_init_graphics(void)
 
   /* Create an 8-bit depth screen buffer for DOOM to render to */
 
+#ifdef CONFIG_GAMES_NXDOOM_STATIC_SCRNBUF
+  g_graphics_state.scrnbuf = g_scrnbuf;
+#else
   g_graphics_state.scrnbuf = malloc(SCREENWIDTH * SCREENHEIGHT);
+#endif
   if (g_graphics_state.scrnbuf == NULL)
     {
       i_error("Couldn't allocate screen buffer: %d\n", errno);

From 92c3b6446d6cb8c99002cc3d376e040f9cb93fde Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Thu, 16 Jul 2026 18:55:50 +0000
Subject: [PATCH 553/568] nsh: show real, effective, and saved IDs in id
 command

Use getresuid() and getresgid() for Linux-style id output with name
resolution and a groups= list based on the effective GID.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 nshlib/nsh_identity.c | 213 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 207 insertions(+), 6 deletions(-)

diff --git a/nshlib/nsh_identity.c b/nshlib/nsh_identity.c
index 7bcb9a4a0..6d9e6160f 100644
--- a/nshlib/nsh_identity.c
+++ b/nshlib/nsh_identity.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <errno.h>
+#include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -381,28 +382,228 @@ int cmd_su(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 }
 #endif
 
+#ifndef CONFIG_NSH_DISABLE_ID
+
+/****************************************************************************
+ * Name: nsh_id_format_uid
+ *
+ * Description:
+ *   Format a UID token in Linux id(1) style, e.g. "uid=0(root)".
+ *
+ ****************************************************************************/
+
+static void nsh_id_format_uid(FAR char *buf, size_t buflen,
+                              FAR const char *tag, uid_t uid)
+{
+#ifdef CONFIG_LIBC_PASSWD_FILE
+  FAR struct passwd *pwd = getpwuid(uid);
+
+  if (pwd != NULL && pwd->pw_name != NULL)
+    {
+      snprintf(buf, buflen, "%s=%d(%s)", tag, uid, pwd->pw_name);
+      return;
+    }
+#endif
+
+  if (uid == 0)
+    {
+      snprintf(buf, buflen, "%s=%d(root)", tag, uid);
+    }
+  else
+    {
+      snprintf(buf, buflen, "%s=%d", tag, uid);
+    }
+}
+
+/****************************************************************************
+ * Name: nsh_id_format_gid
+ *
+ * Description:
+ *   Format a GID token in Linux id(1) style, e.g. "gid=0(root)".
+ *
+ ****************************************************************************/
+
+static void nsh_id_format_gid(FAR char *buf, size_t buflen,
+                              FAR const char *tag, gid_t gid)
+{
+#ifdef CONFIG_LIBC_GROUP_FILE
+  FAR struct group *grp = getgrgid(gid);
+
+  if (grp != NULL && grp->gr_name != NULL)
+    {
+      snprintf(buf, buflen, "%s=%d(%s)", tag, gid, grp->gr_name);
+      return;
+    }
+#endif
+
+  if (gid == 0)
+    {
+      snprintf(buf, buflen, "%s=%d(root)", tag, gid);
+    }
+  else
+    {
+      snprintf(buf, buflen, "%s=%d", tag, gid);
+    }
+}
+
+static void nsh_id_append(FAR char *line, size_t linelen,
+                          FAR const char *token)
+{
+  size_t len = strlen(line);
+
+  if (len > 0)
+    {
+      strlcat(line, " ", linelen);
+    }
+
+  strlcat(line, token, linelen);
+}
+
+#ifdef CONFIG_LIBC_PASSWD_FILE
+/****************************************************************************
+ * Name: nsh_id_format_group_value
+ *
+ * Description:
+ *   Format a bare group value for a groups= list, e.g. "0(root)".
+ *
+ ****************************************************************************/
+
+static void nsh_id_format_group_value(FAR char *buf, size_t buflen,
+                                      gid_t gid)
+{
+#ifdef CONFIG_LIBC_GROUP_FILE
+  FAR struct group *grp = getgrgid(gid);
+
+  if (grp != NULL && grp->gr_name != NULL)
+    {
+      snprintf(buf, buflen, "%d(%s)", gid, grp->gr_name);
+      return;
+    }
+#endif
+
+  if (gid == 0)
+    {
+      snprintf(buf, buflen, "0(root)");
+    }
+  else
+    {
+      snprintf(buf, buflen, "%d", gid);
+    }
+}
+
+/****************************************************************************
+ * Name: nsh_id_append_groups
+ *
+ * Description:
+ *   Append a Linux-style groups= list to the id output line.
+ *
+ ****************************************************************************/
+
+static void nsh_id_append_groups(FAR char *line, size_t linelen)
+{
+  gid_t grouplist[8];
+  char token[48];
+  int ngroups;
+  int i;
+
+  ngroups = getgroups(sizeof(grouplist) / sizeof(grouplist[0]), grouplist);
+  if (ngroups <= 0)
+    {
+      return;
+    }
+
+  strlcat(line, " groups=", linelen);
+
+  for (i = 0; i < ngroups; i++)
+    {
+      if (i > 0)
+        {
+          strlcat(line, ",", linelen);
+        }
+
+      nsh_id_format_group_value(token, sizeof(token), grouplist[i]);
+      strlcat(line, token, linelen);
+    }
+}
+#endif /* CONFIG_LIBC_PASSWD_FILE */
+
 /****************************************************************************
  * Name: cmd_id
  *
  * Description:
- *   Print real and effective UID/GID for the current session.
+ *   Print real, effective, and saved-set UID/GID for the current session in
+ *   Linux id(1) style with optional user and group names.
  *
  ****************************************************************************/
 
-#ifndef CONFIG_NSH_DISABLE_ID
 int cmd_id(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
+  uid_t ruid;
+  uid_t euid;
+  uid_t suid;
+  gid_t rgid;
+  gid_t egid;
+  gid_t sgid;
+  char line[256];
+  char token[48];
+
   if (argc != 1)
     {
       nsh_error(vtbl, g_fmtarginvalid, argv[0]);
       return ERROR;
     }
 
-  nsh_output(vtbl, "uid=%d euid=%d gid=%d egid=%d\n",
-             getuid(), geteuid(), getgid(), getegid());
+  if (getresuid(&ruid, &euid, &suid) != 0)
+    {
+      nsh_error(vtbl, "id: getresuid() failed: %d\n", errno);
+      return ERROR;
+    }
+
+  if (getresgid(&rgid, &egid, &sgid) != 0)
+    {
+      nsh_error(vtbl, "id: getresgid() failed: %d\n", errno);
+      return ERROR;
+    }
+
+  line[0] = '\0';
+
+  nsh_id_format_uid(token, sizeof(token), "uid", ruid);
+  nsh_id_append(line, sizeof(line), token);
+
+  if (euid != ruid)
+    {
+      nsh_id_format_uid(token, sizeof(token), "euid", euid);
+      nsh_id_append(line, sizeof(line), token);
+    }
+
+  if (suid != ruid && suid != euid)
+    {
+      nsh_id_format_uid(token, sizeof(token), "suid", suid);
+      nsh_id_append(line, sizeof(line), token);
+    }
+
+  nsh_id_format_gid(token, sizeof(token), "gid", rgid);
+  nsh_id_append(line, sizeof(line), token);
+
+  if (egid != rgid)
+    {
+      nsh_id_format_gid(token, sizeof(token), "egid", egid);
+      nsh_id_append(line, sizeof(line), token);
+    }
+
+  if (sgid != rgid && sgid != egid)
+    {
+      nsh_id_format_gid(token, sizeof(token), "sgid", sgid);
+      nsh_id_append(line, sizeof(line), token);
+    }
+
+#ifdef CONFIG_LIBC_PASSWD_FILE
+  nsh_id_append_groups(line, sizeof(line));
+#endif
+  nsh_output(vtbl, "%s\n", line);
   return OK;
 }
-#endif
+#endif /* CONFIG_NSH_DISABLE_ID */
 
 /****************************************************************************
  * Name: cmd_whoami
@@ -442,7 +643,7 @@ int cmd_whoami(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
     }
   else
     {
-      nsh_output(vtbl, "%d\n", (int)euid);
+      nsh_output(vtbl, "%d\n", euid);
     }
 
   return OK;

From 484474bbbe357cbdc5f2c457b6f95fbaa5fe93eb Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Thu, 16 Jul 2026 18:55:50 +0000
Subject: [PATCH 554/568] testing/ostest: extend multiuser credential and IPC
 tests

Add getresuid/setreuid coverage plus ownership and permission checks
for message queues, named semaphores, shared memory, and FIFOs.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 testing/ostest/multiuser.c | 528 +++++++++++++++++++++++++++++++++++--
 1 file changed, 500 insertions(+), 28 deletions(-)

diff --git a/testing/ostest/multiuser.c b/testing/ostest/multiuser.c
index eb2c45f98..8d9d34b23 100644
--- a/testing/ostest/multiuser.c
+++ b/testing/ostest/multiuser.c
@@ -37,6 +37,18 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#if !defined(CONFIG_DISABLE_MQUEUE)
+#  include <mqueue.h>
+#endif
+
+#if defined(CONFIG_FS_NAMED_SEMAPHORES)
+#  include <semaphore.h>
+#endif
+
+#if defined(CONFIG_FS_SHMFS)
+#  include <sys/mman.h>
+#endif
+
 #include "ostest.h"
 
 /****************************************************************************
@@ -239,6 +251,26 @@ static int mu_verify_owner(FAR struct mu_ctx_s *ctx, FAR const char *path,
   return 0;
 }
 
+static void mu_verify_mode(FAR struct mu_ctx_s *ctx, FAR const char *path,
+                           mode_t mode)
+{
+  struct stat st;
+
+  if (stat(path, &st) != 0)
+    {
+      mu_fail(ctx, "stat(%s) after create errno=%d", path, errno);
+    }
+  else if ((st.st_mode & 0777) != mode)
+    {
+      mu_fail(ctx, "%s mode expected %04o got %04o", path,
+              (unsigned int)mode, (unsigned int)(st.st_mode & 0777));
+    }
+  else
+    {
+      mu_pass("%s mode %04o", path, (unsigned int)mode);
+    }
+}
+
 #if defined(CONFIG_SCHED_USER_IDENTITY)
 
 static int multiuser_effective_test(FAR struct mu_ctx_s *ctx)
@@ -291,8 +323,180 @@ static int multiuser_effective_test(FAR struct mu_ctx_s *ctx)
   return ctx->failures;
 }
 
+static int multiuser_resuid_test(FAR struct mu_ctx_s *ctx)
+{
+  uid_t ruid;
+  uid_t euid;
+  uid_t suid;
+  gid_t rgid;
+  gid_t egid;
+  gid_t sgid;
+  int ret;
+
+  printf("multiuser: getresuid/getresgid and setreuid/setregid\n");
+
+  ret = getresuid(&ruid, &euid, &suid);
+  if (mu_expect_ok(ctx, "getresuid(initial)", ret) != 0)
+    {
+      return ctx->failures;
+    }
+
+  mu_check_eq(ctx, "initial real uid", ruid, 0);
+  mu_check_eq(ctx, "initial eff uid", euid, 0);
+  mu_check_eq(ctx, "initial saved uid", suid, 0);
+
+  ret = getresgid(&rgid, &egid, &sgid);
+  if (mu_expect_ok(ctx, "getresgid(initial)", ret) != 0)
+    {
+      return ctx->failures;
+    }
+
+  mu_check_eq(ctx, "initial real gid", rgid, 0);
+  mu_check_eq(ctx, "initial eff gid", egid, 0);
+  mu_check_eq(ctx, "initial saved gid", sgid, 0);
+
+  ret = setreuid((uid_t)-1, MU_UID1);
+  if (mu_expect_ok(ctx, "root setreuid(-1,1000)", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  ret = getresuid(&ruid, &euid, &suid);
+  mu_check_eq(ctx, "real uid after setreuid(-1,1000)", ruid, 0);
+  mu_check_eq(ctx, "eff uid after setreuid(-1,1000)", euid, MU_UID1);
+  mu_check_eq(ctx, "saved uid after setreuid(-1,1000)", suid, MU_UID1);
+
+  ret = setreuid(MU_UID2, (uid_t)-1);
+  mu_expect_denied(ctx, "non-root setreuid(2000,-1)", ret);
+
+  ret = setreuid((uid_t)-1, 0);
+  if (mu_expect_ok(ctx, "setreuid(-1,0) drop effective", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  ret = setreuid(0, (uid_t)-1);
+  if (mu_expect_ok(ctx, "root setreuid(0,-1) restore", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  ret = getresuid(&ruid, &euid, &suid);
+  mu_check_eq(ctx, "real uid restored", ruid, 0);
+  mu_check_eq(ctx, "eff uid restored", euid, 0);
+  mu_check_eq(ctx, "saved uid restored", suid, 0);
+
+  ret = setregid((gid_t)-1, MU_GID1);
+  if (mu_expect_ok(ctx, "root setregid(-1,1000)", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  ret = getresgid(&rgid, &egid, &sgid);
+  mu_check_eq(ctx, "real gid after setregid(-1,1000)", rgid, 0);
+  mu_check_eq(ctx, "eff gid after setregid(-1,1000)", egid, MU_GID1);
+  mu_check_eq(ctx, "saved gid after setregid(-1,1000)", sgid, MU_GID1);
+
+  ret = setregid(MU_GID2, (gid_t)-1);
+  mu_expect_denied(ctx, "non-root setregid(2000,-1)", ret);
+
+  ret = setregid((gid_t)-1, 0);
+  if (mu_expect_ok(ctx, "setregid(-1,0) drop effective", ret) != 0)
+    {
+      mu_restore_root(ctx);
+      return ctx->failures;
+    }
+
+  ret = setregid(0, (gid_t)-1);
+  mu_expect_ok(ctx, "root setregid(0,-1) restore", ret);
+
+  mu_restore_root(ctx);
+  return ctx->failures;
+}
+
 #if defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_BUILD_KERNEL)
 
+static int mu_run_child(FAR struct mu_ctx_s *ctx, FAR const char *name,
+                        main_t entry)
+{
+  pid_t pid;
+  int status;
+
+  pid = task_create(name, MU_CHILD_PRIORITY, STACKSIZE, entry, NULL);
+  if (pid < 0)
+    {
+      mu_fail(ctx, "task_create(%s) failed", name);
+      return ctx->failures;
+    }
+
+  if (waitpid(pid, &status, 0) != pid)
+    {
+      mu_fail(ctx, "waitpid(%s) failed errno=%d", name, errno);
+      return ctx->failures;
+    }
+
+  if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
+    {
+      mu_fail(ctx, "%s child exited with status=%d", name, status);
+    }
+  else
+    {
+      mu_pass("%s child completed successfully", name);
+    }
+
+  return ctx->failures;
+}
+
+static int multiuser_resuid_child(int argc, FAR char *argv[])
+{
+  struct mu_ctx_s ctx =
+  {
+    0
+  };
+
+  uid_t ruid;
+  uid_t euid;
+  uid_t suid;
+  int ret;
+
+  (void)argc;
+  (void)argv;
+
+  ret = setreuid(MU_UID1, MU_UID1);
+  if (mu_expect_ok(&ctx, "root setreuid(1000,1000)", ret) != 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  ret = getresuid(&ruid, &euid, &suid);
+  if (mu_expect_ok(&ctx, "getresuid(after setreuid)", ret) != 0)
+    {
+      return EXIT_FAILURE;
+    }
+
+  mu_check_eq(&ctx, "real uid after setreuid", ruid, MU_UID1);
+  mu_check_eq(&ctx, "eff uid after setreuid", euid, MU_UID1);
+  mu_check_eq(&ctx, "saved uid after setreuid", suid, MU_UID1);
+
+  printf("multiuser_resuid_child: %d failure(s)\n", ctx.failures);
+  return ctx.failures == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static int multiuser_resuid_child_test(FAR struct mu_ctx_s *ctx)
+{
+  printf("multiuser: setreuid(1000,1000) full assignment (child task)\n");
+
+  mu_run_child(ctx, "mu_resuid", multiuser_resuid_child);
+  mu_check_eq(ctx, "parent euid after resuid child", geteuid(), 0);
+  mu_check_eq(ctx, "parent egid after resuid child", getegid(), 0);
+
+  return ctx->failures;
+}
+
 static int multiuser_suid_child(int argc, FAR char *argv[])
 {
   struct mu_ctx_s ctx =
@@ -347,34 +551,9 @@ static int multiuser_suid_child(int argc, FAR char *argv[])
 
 static int multiuser_suid_test(FAR struct mu_ctx_s *ctx)
 {
-  pid_t pid;
-  int status;
-
   printf("multiuser: saved set-UID/GID semantics (child task)\n");
 
-  pid = task_create("mu_suid", MU_CHILD_PRIORITY, STACKSIZE,
-                    multiuser_suid_child, NULL);
-  if (pid < 0)
-    {
-      mu_fail(ctx, "task_create(mu_suid) failed");
-      return ctx->failures;
-    }
-
-  if (waitpid(pid, &status, 0) != pid)
-    {
-      mu_fail(ctx, "waitpid(mu_suid) failed errno=%d", errno);
-      return ctx->failures;
-    }
-
-  if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
-    {
-      mu_fail(ctx, "mu_suid child exited with status=%d", status);
-    }
-  else
-    {
-      mu_pass("mu_suid child completed successfully");
-    }
-
+  mu_run_child(ctx, "mu_suid", multiuser_suid_child);
   mu_check_eq(ctx, "parent euid after child", geteuid(), 0);
   mu_check_eq(ctx, "parent egid after child", getegid(), 0);
 
@@ -383,8 +562,7 @@ static int multiuser_suid_test(FAR struct mu_ctx_s *ctx)
 
 #endif /* CONFIG_SCHED_WAITPID && !CONFIG_BUILD_KERNEL */
 
-#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_PSEUDOFS_ATTRIBUTES) && \
-    defined(CONFIG_PSEUDOFS_FILE)
+#if defined(CONFIG_FS_PERMISSION)
 
 static int multiuser_open_secret(FAR struct mu_ctx_s *ctx,
                                  FAR const char *path, int expect_ok)
@@ -423,6 +601,11 @@ static int multiuser_open_secret(FAR struct mu_ctx_s *ctx,
   return 0;
 }
 
+#endif /* CONFIG_FS_PERMISSION */
+
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_PSEUDOFS_ATTRIBUTES) && \
+    defined(CONFIG_PSEUDOFS_FILE)
+
 static int multiuser_pseudofs_test(FAR struct mu_ctx_s *ctx)
 {
   int fd;
@@ -581,6 +764,286 @@ out:
 
 #endif /* CONFIG_FS_PERMISSION && CONFIG_FS_TMPFS */
 
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_PSEUDOFS_ATTRIBUTES)
+
+#if !defined(CONFIG_DISABLE_MQUEUE)
+#  define MU_MQ_NAME   "ostest_mu_mq"
+#  define MU_MQ_PATH   CONFIG_FS_MQUEUE_VFS_PATH "/" MU_MQ_NAME
+#endif
+
+#if defined(CONFIG_FS_NAMED_SEMAPHORES)
+#  define MU_SEM_NAME  "ostest_mu_sem"
+#  define MU_SEM_PATH  CONFIG_FS_NAMED_SEMAPHORES_VFS_PATH "/" MU_SEM_NAME
+#endif
+
+#if defined(CONFIG_FS_SHMFS)
+#  define MU_SHM_NAME  "ostest_mu_shm"
+#  define MU_SHM_PATH  CONFIG_FS_SHMFS_VFS_PATH "/" MU_SHM_NAME
+#endif
+
+#if defined(CONFIG_PIPES)
+#  define MU_FIFO_PATH "/ostest_mu_fifo"
+#endif
+
+#if !defined(CONFIG_DISABLE_MQUEUE)
+
+static int multiuser_mqueue_test(FAR struct mu_ctx_s *ctx)
+{
+  mqd_t mq;
+  struct mq_attr attr;
+
+  printf("multiuser: message queue ownership and permissions\n");
+
+  mu_restore_root(ctx);
+  mq_unlink(MU_MQ_NAME);
+
+  memset(&attr, 0, sizeof(attr));
+  attr.mq_maxmsg  = 4;
+  attr.mq_msgsize = 64;
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  mq = mq_open(MU_MQ_NAME, O_CREAT | O_RDWR | O_EXCL, 0600, &attr);
+  if (mq == (mqd_t)-1)
+    {
+      mu_fail(ctx, "mq_open(create) errno=%d", errno);
+      goto out;
+    }
+
+  mq_close(mq);
+  mu_verify_owner(ctx, MU_MQ_PATH, MU_UID1, MU_GID1);
+  mu_verify_mode(ctx, MU_MQ_PATH, 0600);
+
+  if (mu_set_effective(ctx, MU_UID2, MU_GID2) != 0)
+    {
+      goto out;
+    }
+
+  mq = mq_open(MU_MQ_NAME, O_RDWR);
+  mu_expect_denied(ctx, "mq_open(other user)", mq == (mqd_t)-1 ? -1 : 0);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  mq = mq_open(MU_MQ_NAME, O_RDWR);
+  if (mq == (mqd_t)-1)
+    {
+      mu_fail(ctx, "mq_open(owner) errno=%d", errno);
+    }
+  else
+    {
+      mu_pass("mq_open(owner)");
+      mq_close(mq);
+    }
+
+out:
+  mu_restore_root(ctx);
+  mq_unlink(MU_MQ_NAME);
+  return ctx->failures;
+}
+
+#endif /* !CONFIG_DISABLE_MQUEUE */
+
+#if defined(CONFIG_FS_NAMED_SEMAPHORES)
+
+static int multiuser_sem_test(FAR struct mu_ctx_s *ctx)
+{
+  sem_t *sem;
+
+  printf("multiuser: named semaphore ownership and permissions\n");
+
+  mu_restore_root(ctx);
+  sem_unlink(MU_SEM_NAME);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  sem = sem_open(MU_SEM_NAME, O_CREAT | O_EXCL, 0600, 1);
+  if (sem == SEM_FAILED)
+    {
+      mu_fail(ctx, "sem_open(create) errno=%d", errno);
+      goto out;
+    }
+
+  sem_close(sem);
+  mu_verify_owner(ctx, MU_SEM_PATH, MU_UID1, MU_GID1);
+
+  if (mu_set_effective(ctx, MU_UID2, MU_GID2) != 0)
+    {
+      goto out;
+    }
+
+  sem = sem_open(MU_SEM_NAME, 0);
+  mu_expect_denied(ctx, "sem_open(other user)", sem == SEM_FAILED ? -1 : 0);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  sem = sem_open(MU_SEM_NAME, 0);
+  if (sem == SEM_FAILED)
+    {
+      mu_fail(ctx, "sem_open(owner) errno=%d", errno);
+    }
+  else
+    {
+      mu_pass("sem_open(owner)");
+      sem_close(sem);
+    }
+
+out:
+  mu_restore_root(ctx);
+  sem_unlink(MU_SEM_NAME);
+  return ctx->failures;
+}
+
+#endif /* CONFIG_FS_NAMED_SEMAPHORES */
+
+#if defined(CONFIG_FS_SHMFS)
+
+static int multiuser_shm_test(FAR struct mu_ctx_s *ctx)
+{
+  int fd;
+
+  printf("multiuser: shared memory ownership and permissions\n");
+
+  mu_restore_root(ctx);
+  shm_unlink(MU_SHM_NAME);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  fd = shm_open(MU_SHM_NAME, O_CREAT | O_EXCL | O_RDWR, 0600);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "shm_open(create) errno=%d", errno);
+      goto out;
+    }
+
+  close(fd);
+  mu_verify_owner(ctx, MU_SHM_PATH, MU_UID1, MU_GID1);
+
+  if (mu_set_effective(ctx, MU_UID2, MU_GID2) != 0)
+    {
+      goto out;
+    }
+
+  fd = shm_open(MU_SHM_NAME, O_RDWR, 0);
+  mu_expect_denied(ctx, "shm_open(other user)", fd < 0 ? -1 : 0);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  fd = shm_open(MU_SHM_NAME, O_RDWR, 0);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "shm_open(owner) errno=%d", errno);
+    }
+  else
+    {
+      mu_pass("shm_open(owner)");
+      close(fd);
+    }
+
+out:
+  mu_restore_root(ctx);
+  shm_unlink(MU_SHM_NAME);
+  return ctx->failures;
+}
+
+#endif /* CONFIG_FS_SHMFS */
+
+#if defined(CONFIG_PIPES)
+
+static int multiuser_fifo_test(FAR struct mu_ctx_s *ctx)
+{
+  int fd;
+
+  printf("multiuser: FIFO ownership and permissions\n");
+
+  mu_restore_root(ctx);
+  unlink(MU_FIFO_PATH);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  if (mkfifo(MU_FIFO_PATH, 0600) != 0)
+    {
+      mu_fail(ctx, "mkfifo errno=%d", errno);
+      goto out;
+    }
+
+  mu_verify_owner(ctx, MU_FIFO_PATH, MU_UID1, MU_GID1);
+
+  if (mu_set_effective(ctx, MU_UID2, MU_GID2) != 0)
+    {
+      goto out;
+    }
+
+  fd = open(MU_FIFO_PATH, O_RDONLY | O_NONBLOCK);
+  mu_expect_denied(ctx, "open fifo (other user)", fd < 0 ? -1 : 0);
+
+  if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
+    {
+      goto out;
+    }
+
+  fd = open(MU_FIFO_PATH, O_RDONLY | O_NONBLOCK);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "open fifo (owner) errno=%d", errno);
+    }
+  else
+    {
+      mu_pass("open fifo (owner)");
+      close(fd);
+    }
+
+out:
+  mu_restore_root(ctx);
+  unlink(MU_FIFO_PATH);
+  return ctx->failures;
+}
+
+#endif /* CONFIG_PIPES */
+
+static int multiuser_ipc_test(FAR struct mu_ctx_s *ctx)
+{
+#if !defined(CONFIG_DISABLE_MQUEUE)
+  multiuser_mqueue_test(ctx);
+#endif
+
+#if defined(CONFIG_FS_NAMED_SEMAPHORES)
+  multiuser_sem_test(ctx);
+#endif
+
+#if defined(CONFIG_FS_SHMFS)
+  multiuser_shm_test(ctx);
+#endif
+
+#if defined(CONFIG_PIPES)
+  multiuser_fifo_test(ctx);
+#endif
+
+  return ctx->failures;
+}
+
+#endif /* CONFIG_FS_PERMISSION && CONFIG_PSEUDOFS_ATTRIBUTES */
+
 #if defined(CONFIG_LIBC_PASSWD_FILE)
 
 static int multiuser_passwd_test(FAR struct mu_ctx_s *ctx)
@@ -644,8 +1107,10 @@ int multiuser_test(void)
   printf("multiuser_test: start\n");
 
   multiuser_effective_test(&ctx);
+  multiuser_resuid_test(&ctx);
 
 #if defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_BUILD_KERNEL)
+  multiuser_resuid_child_test(&ctx);
   multiuser_suid_test(&ctx);
 #else
   printf("multiuser: skipping saved set-UID/GID child test "
@@ -667,6 +1132,13 @@ int multiuser_test(void)
          "(need FS_PERMISSION and FS_TMPFS)\n");
 #endif
 
+#if defined(CONFIG_FS_PERMISSION) && defined(CONFIG_PSEUDOFS_ATTRIBUTES)
+  multiuser_ipc_test(&ctx);
+#else
+  printf("multiuser: skipping IPC/FIFO permission tests "
+         "(need FS_PERMISSION and PSEUDOFS_ATTRIBUTES)\n");
+#endif
+
 #if defined(CONFIG_LIBC_PASSWD_FILE)
   multiuser_passwd_test(&ctx);
 #else

From 917e2e860b5618ba53971dac9ff44033ef0caf53 Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Wed, 29 Jul 2026 13:51:15 +0000
Subject: [PATCH 555/568] testing/ostest: create temp passwd file for multiuser
 test

Install a minimal passwd file at CONFIG_LIBC_PASSWD_FILEPATH before
getpwnam() checks so sim:ostest does not require a pre-built /etc/passwd.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 testing/ostest/Kconfig     |  5 +++
 testing/ostest/multiuser.c | 69 +++++++++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/testing/ostest/Kconfig b/testing/ostest/Kconfig
index aabffab40..aa4425edc 100644
--- a/testing/ostest/Kconfig
+++ b/testing/ostest/Kconfig
@@ -124,12 +124,17 @@ config TESTING_OSTEST_MULTIUSER
 	bool "Multi-user identity and permission tests"
 	default n
 	depends on SCHED_USER_IDENTITY
+	depends on LIBC_PASSWD_FILE
 	---help---
 		Enable regression tests for UID/GID identity switching and file
 		permission enforcement.  Individual sub-tests run only when the
 		corresponding kernel options are enabled (for example pseudoFS
 		permission checks require FS_PERMISSION and PSEUDOFS_FILE).
 
+		The passwd lookup sub-test creates a temporary passwd file at
+		CONFIG_LIBC_PASSWD_FILEPATH (default /tmp/ostest_passwd when this
+		option is enabled).
+
 config TEST_LOOP_SCALE
 	int "Loop scale of spinlock test (N x 10,000)"
 	default 100
diff --git a/testing/ostest/multiuser.c b/testing/ostest/multiuser.c
index 8d9d34b23..6bd93a06f 100644
--- a/testing/ostest/multiuser.c
+++ b/testing/ostest/multiuser.c
@@ -170,17 +170,17 @@ static int mu_set_effective(FAR struct mu_ctx_s *ctx, uid_t uid, gid_t gid)
 
   if (seteuid(uid) != 0)
     {
-      mu_fail(ctx, "seteuid(%u) errno=%d", (unsigned int)uid, errno);
+      mu_fail(ctx, "seteuid(%u) errno=%d", uid, errno);
       return -1;
     }
 
   if (setegid(gid) != 0)
     {
-      mu_fail(ctx, "setegid(%u) errno=%d", (unsigned int)gid, errno);
+      mu_fail(ctx, "setegid(%u) errno=%d", gid, errno);
       return -1;
     }
 
-  if (geteuid() != (int)uid || getegid() != (int)gid)
+  if (geteuid() != uid || getegid() != gid)
     {
       mu_fail(ctx, "effective credential switch failed "
               "(have euid=%d egid=%d)", geteuid(), getegid());
@@ -242,12 +242,11 @@ static int mu_verify_owner(FAR struct mu_ctx_s *ctx, FAR const char *path,
   if (st.st_uid != uid || st.st_gid != gid)
     {
       mu_fail(ctx, "%s owner expected %u:%u got %u:%u",
-              path, (unsigned int)uid, (unsigned int)gid,
-              (unsigned int)st.st_uid, (unsigned int)st.st_gid);
+              path, uid, gid, st.st_uid, st.st_gid);
       return -1;
     }
 
-  mu_pass("%s owner %u:%u", path, (unsigned int)uid, (unsigned int)gid);
+  mu_pass("%s owner %u:%u", path, uid, gid);
   return 0;
 }
 
@@ -263,11 +262,11 @@ static void mu_verify_mode(FAR struct mu_ctx_s *ctx, FAR const char *path,
   else if ((st.st_mode & 0777) != mode)
     {
       mu_fail(ctx, "%s mode expected %04o got %04o", path,
-              (unsigned int)mode, (unsigned int)(st.st_mode & 0777));
+              mode, st.st_mode & 0777);
     }
   else
     {
-      mu_pass("%s mode %04o", path, (unsigned int)mode);
+      mu_pass("%s mode %04o", path, mode);
     }
 }
 
@@ -1044,7 +1043,40 @@ static int multiuser_ipc_test(FAR struct mu_ctx_s *ctx)
 
 #endif /* CONFIG_FS_PERMISSION && CONFIG_PSEUDOFS_ATTRIBUTES */
 
-#if defined(CONFIG_LIBC_PASSWD_FILE)
+#if defined(CONFIG_LIBC_PASSWD_FILE) && defined(CONFIG_TESTING_OSTEST_MULTIUSER)
+
+static int multiuser_passwd_install(FAR struct mu_ctx_s *ctx)
+{
+  int fd;
+  ssize_t nwritten;
+  static const char content[] =
+    "root:x:0:0:/\n"
+    "testuser:x:1000:1000:/home/testuser\n";
+
+  fd = open(CONFIG_LIBC_PASSWD_FILEPATH, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+  if (fd < 0)
+    {
+      mu_fail(ctx, "create %s errno=%d", CONFIG_LIBC_PASSWD_FILEPATH, errno);
+      return -1;
+    }
+
+  nwritten = write(fd, content, sizeof(content) - 1);
+  close(fd);
+  if (nwritten != (ssize_t)(sizeof(content) - 1))
+    {
+      mu_fail(ctx, "write %s errno=%d", CONFIG_LIBC_PASSWD_FILEPATH, errno);
+      unlink(CONFIG_LIBC_PASSWD_FILEPATH);
+      return -1;
+    }
+
+  mu_pass("installed %s", CONFIG_LIBC_PASSWD_FILEPATH);
+  return 0;
+}
+
+static void multiuser_passwd_remove(void)
+{
+  unlink(CONFIG_LIBC_PASSWD_FILEPATH);
+}
 
 static int multiuser_passwd_test(FAR struct mu_ctx_s *ctx)
 {
@@ -1052,8 +1084,14 @@ static int multiuser_passwd_test(FAR struct mu_ctx_s *ctx)
 
   printf("multiuser: passwd lookup after credential drop\n");
 
+  if (multiuser_passwd_install(ctx) != 0)
+    {
+      return ctx->failures;
+    }
+
   if (mu_set_effective(ctx, MU_UID1, MU_GID1) != 0)
     {
+      multiuser_passwd_remove();
       return ctx->failures;
     }
 
@@ -1065,7 +1103,7 @@ static int multiuser_passwd_test(FAR struct mu_ctx_s *ctx)
     }
   else
     {
-      mu_pass("getpwnam(root) uid=%u", (unsigned int)pwd->pw_uid);
+      mu_pass("getpwnam(root) uid=%u", pwd->pw_uid);
     }
 
   pwd = getpwnam("testuser");
@@ -1076,18 +1114,19 @@ static int multiuser_passwd_test(FAR struct mu_ctx_s *ctx)
   else if (pwd->pw_uid != MU_UID1)
     {
       mu_fail(ctx, "getpwnam(testuser) uid=%u (expected %u)",
-              (unsigned int)pwd->pw_uid, (unsigned int)MU_UID1);
+              pwd->pw_uid, MU_UID1);
     }
   else
     {
-      mu_pass("getpwnam(testuser) uid=%u", (unsigned int)pwd->pw_uid);
+      mu_pass("getpwnam(testuser) uid=%u", pwd->pw_uid);
     }
 
   mu_restore_root(ctx);
+  multiuser_passwd_remove();
   return ctx->failures;
 }
 
-#endif /* CONFIG_LIBC_PASSWD_FILE */
+#endif /* CONFIG_LIBC_PASSWD_FILE && CONFIG_TESTING_OSTEST_MULTIUSER */
 
 #endif /* CONFIG_SCHED_USER_IDENTITY */
 
@@ -1139,11 +1178,11 @@ int multiuser_test(void)
          "(need FS_PERMISSION and PSEUDOFS_ATTRIBUTES)\n");
 #endif
 
-#if defined(CONFIG_LIBC_PASSWD_FILE)
+#if defined(CONFIG_LIBC_PASSWD_FILE) && defined(CONFIG_TESTING_OSTEST_MULTIUSER)
   multiuser_passwd_test(&ctx);
 #else
   printf("multiuser: skipping passwd lookup test "
-         "(need LIBC_PASSWD_FILE)\n");
+         "(need LIBC_PASSWD_FILE and TESTING_OSTEST_MULTIUSER)\n");
 #endif
 
   mu_restore_root(&ctx);

From fc14d02ae092b990ce68a6faad36449f4ecb4e0c Mon Sep 17 00:00:00 2001
From: Abhishek Mishra <mishra.abhishek2808@gmail.com>
Date: Wed, 29 Jul 2026 16:18:51 +0000
Subject: [PATCH 556/568] nshlib,fsutils: add Kconfig deps for NSH console
 login with PBKDF2

Require a cryptodev backend for FSUTILS_PASSWD and tie NSH console/telnet
login to ROMFS passwd generation when ETC_ROMFS is enabled.

Fixes #19573

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
---
 fsutils/passwd/Kconfig |  7 +++++--
 nshlib/Kconfig         | 20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/fsutils/passwd/Kconfig b/fsutils/passwd/Kconfig
index 198bb2df0..9d6ba3944 100644
--- a/fsutils/passwd/Kconfig
+++ b/fsutils/passwd/Kconfig
@@ -7,14 +7,17 @@ config FSUTILS_PASSWD
 	bool "Password file support"
 	default n
 	depends on CRYPTO_CRYPTODEV
+	depends on CRYPTO_CRYPTODEV_SOFTWARE_CRYPTO || CRYPTO_CRYPTODEV_HARDWARE
 	depends on NETUTILS_CODECS
 	depends on CODECS_BASE64
 	---help---
 		Enables support for /etc/passwd file access routines.
 
 		Requires CONFIG_CRYPTO=y, CRYPTO_CRYPTODEV (and
-		ALLOW_BSD_COMPONENTS), plus NETUTILS_CODECS/CODECS_BASE64 for
-		base64url hash encoding.
+		ALLOW_BSD_COMPONENTS), a cryptodev backend
+		(CONFIG_CRYPTO_CRYPTODEV_SOFTWARE_CRYPTO or
+		CONFIG_CRYPTO_CRYPTODEV_HARDWARE), plus NETUTILS_CODECS/CODECS_BASE64
+		for base64url hash encoding.
 
 		NOTE: Password hashes use PBKDF2-HMAC-SHA256 (modular crypt format).
 		Existing TEA-encrypted /etc/passwd entries are NOT compatible and
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 499f09345..8f0cd36ee 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -1235,23 +1235,35 @@ config NSH_CONSOLE_LOGIN
 	bool "Console Login"
 	default n
 	depends on FSUTILS_PASSWD
+	depends on !ETC_ROMFS || BOARD_ETC_ROMFS_PASSWD_ENABLE
 	select NSH_LOGIN
 	---help---
 		If defined, then the console user will be required to provide a
 		username and password to start the NSH shell.  Requires
-		CONFIG_FSUTILS_PASSWD so credentials are verified against the
-		encrypted password file (for example ROMFS /etc/passwd).
+		CONFIG_FSUTILS_PASSWD (PBKDF2-HMAC-SHA256) so credentials are
+		verified against the encrypted password file.
+
+		When CONFIG_ETC_ROMFS is enabled, also enable
+		CONFIG_BOARD_ETC_ROMFS_PASSWD_ENABLE so /etc/passwd is generated
+		at build time (or provide the passwd file by other means and leave
+		ETC_ROMFS disabled).
 
 config NSH_TELNET_LOGIN
 	bool "Telnet Login"
 	default n
 	depends on NSH_TELNET && FSUTILS_PASSWD
+	depends on !ETC_ROMFS || BOARD_ETC_ROMFS_PASSWD_ENABLE
 	select NSH_LOGIN
 	---help---
 		If defined, then the Telnet user will be required to provide a
 		username and password to start the NSH shell.  Requires
-		CONFIG_FSUTILS_PASSWD so credentials are verified against the
-		encrypted password file (for example ROMFS /etc/passwd).
+		CONFIG_FSUTILS_PASSWD (PBKDF2-HMAC-SHA256) so credentials are
+		verified against the encrypted password file.
+
+		When CONFIG_ETC_ROMFS is enabled, also enable
+		CONFIG_BOARD_ETC_ROMFS_PASSWD_ENABLE so /etc/passwd is generated
+		at build time (or provide the passwd file by other means and leave
+		ETC_ROMFS disabled).
 
 if NSH_LOGIN
 

From be43888aa53d646e9919c08c57a50184be35d016 Mon Sep 17 00:00:00 2001
From: Ricard Rosson <ricard@groundbits.com>
Date: Sat, 11 Jul 2026 06:17:53 +0100
Subject: [PATCH 557/568] netutils/mdns: raise responder stack size default to
 8KiB

CONFIG_NETUTILS_MDNS_STACKSIZE defaulted to DEFAULT_TASK_STACKSIZE,
which resolves to as little as 2KiB on some targets.  The bundled
mjansson responder uses a deeper stack than that (DNS record parsing
with name decompression, plus the send/receive buffers) and overflows
on startup, taking the board down with a hardfault before it answers a
single query.

Default to 8KiB, the value that reliably runs the responder, and
correct the help text, which previously claimed a 4KiB default that did
not match DEFAULT_TASK_STACKSIZE.

Assisted-by: Claude (Anthropic Claude Code)
Signed-off-by: Ricard Rosson <ricard@groundbits.com>
---
 netutils/mdns/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/netutils/mdns/Kconfig b/netutils/mdns/Kconfig
index bd2003bdb..58f25acd2 100644
--- a/netutils/mdns/Kconfig
+++ b/netutils/mdns/Kconfig
@@ -51,11 +51,11 @@ config NETUTILS_MDNS_PRIORITY
 
 config NETUTILS_MDNS_STACKSIZE
 	int "mDNS stack size"
-	default DEFAULT_TASK_STACKSIZE
+	default 8192
 	---help---
-		The default (4KiB) is adequate for simple networks but this will
-		most likely need to be increased if there are many network devices
-		attached that could send queries.
+		Stack size for the mDNS responder task.  8KiB is adequate for
+		typical networks; increase it if many network devices send
+		queries.
 
 config NETUTILS_MDNS_VERBOSE
 	bool "Enable verbose printf output from built-in mdns demo"

From 2631d3e59add05e4099ff1df7e6b0f20d0b4a979 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Wed, 29 Jul 2026 14:04:14 +0200
Subject: [PATCH 558/568] testing/ostest: build the perf test only where it can
 link

perf_gettime() and perf_getfreq() are kernel functions, defined in
sched/clock/clock_perf.c.  Neither appears in syscall.csv, and libc supplies
only perf_gettime(), under CONFIG_ARCH_HAVE_PERF_EVENTS_USER_ACCESS.  So a
protected or kernel build cannot resolve either of them from user space:

  ostest/perf_gettime.c:91:  undefined reference to `perf_gettime'
  ostest/perf_gettime.c:184: undefined reference to `perf_getfreq'
  make[1]: *** [nuttx_user.elf] Error 1

The call in user_main() is guarded by CONFIG_ARCH_PERF_EVENTS &&
!CONFIG_ARCH_PERF_EVENTS_USER_ACCESS -- which is exactly the case where the
symbols are kernel-only -- so every such configuration fails to link.
mps3-an547:knsh is one: it sets CONFIG_SCHED_IRQMONITOR, which makes
ARCH_PERF_EVENTS default y.  mps2-an521:knsh escapes only because it sets
neither monitor, leaving ARCH_PERF_EVENTS off, so the call compiles out and
the archive member is never pulled in.

Require CONFIG_BUILD_FLAT, where ostest links against the kernel's own copy.
No configuration that runs the test today stops running it.

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Assisted-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 testing/ostest/CMakeLists.txt | 5 ++++-
 testing/ostest/Makefile       | 5 +++++
 testing/ostest/ostest.h       | 2 +-
 testing/ostest/ostest_main.c  | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 74103db41..180d7090a 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -161,7 +161,10 @@ if(CONFIG_TESTING_OSTEST)
     list(APPEND SRCS nxevent.c)
   endif()
 
-  if(CONFIG_ARCH_HAVE_PERF_EVENTS)
+  # perf_gettime() and perf_getfreq() live in the kernel and are not system
+  # calls, so only a flat build can reach them from here.
+
+  if(CONFIG_ARCH_HAVE_PERF_EVENTS AND CONFIG_BUILD_FLAT)
     list(APPEND SRCS perf_gettime.c)
   endif()
 
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index f443ecb0b..4919a6204 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -164,9 +164,14 @@ CSRCS += nxevent.c
 endif
 endif
 
+# perf_gettime() and perf_getfreq() live in the kernel and are not system
+# calls, so only a flat build can reach them from here.
+
 ifeq ($(CONFIG_ARCH_HAVE_PERF_EVENTS),y)
+ifeq ($(CONFIG_BUILD_FLAT),y)
 CSRCS += perf_gettime.c
 endif
+endif
 
 ifeq ($(CONFIG_BUILD_FLAT),y)
 CSRCS += wdog.c spinlock.c
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index 5e01626c0..2be54de5a 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -304,7 +304,7 @@ void spinlock_test(void);
 
 /* perf_gettime.c ***********************************************************/
 
-#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
+#if defined(CONFIG_ARCH_HAVE_PERF_EVENTS) && defined(CONFIG_BUILD_FLAT)
 void perf_gettime_test(void);
 #endif
 
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 92224701f..964771d90 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -656,7 +656,8 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
-#if defined(CONFIG_ARCH_PERF_EVENTS) && !defined(CONFIG_ARCH_PERF_EVENTS_USER_ACCESS)
+#if defined(CONFIG_ARCH_PERF_EVENTS) && \
+    !defined(CONFIG_ARCH_PERF_EVENTS_USER_ACCESS) && defined(CONFIG_BUILD_FLAT)
       /* Verify performance event time counter */
 
       printf("\nuser_main: performance event time counter test\n");

From 5f286fc924995e4fe320f85ebd67073d42c6c399 Mon Sep 17 00:00:00 2001
From: tuansuper <144403817+tuansuper@users.noreply.github.com>
Date: Thu, 30 Jul 2026 23:22:42 +0800
Subject: [PATCH 559/568] flashtool: Fix compile error due to missing statement
 after default label

In flashtool_main.c, the 'default:' label in a switch statement was
followed directly by '}', which is invalid in C.
This commit adds a 'break;' statement after the default label to
resolve the error.

Signed-off-by: tuansuper <tunainnet@tutanota.com>
---
 fsutils/flashtool/flashtool_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fsutils/flashtool/flashtool_main.c b/fsutils/flashtool/flashtool_main.c
index b1f7f29a4..bbb07a6d2 100644
--- a/fsutils/flashtool/flashtool_main.c
+++ b/fsutils/flashtool/flashtool_main.c
@@ -365,6 +365,7 @@ int main(int argc, FAR char *argv[])
         ret = check_bad_block(fd, &geo);
         break;
       default:
+        break;
     }
 
 oops:

From 859c014d4dffa55295974651619e3619bfe8ed40 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Thu, 30 Jul 2026 13:40:04 +0200
Subject: [PATCH 560/568] examples/fdpicxip: Demonstrate FDPIC modules executed
 in place.

The FDPIC counterpart of examples/nxflatxip, kept separate from it: that
example is about NXFLAT, and mixing the two module formats into one program
would leave neither demonstrating anything clearly.

Four subcommands, each showing one property of the loader.  'qsort' is the
simplest case it has -- one self-contained module, two concurrent instances,
one shared copy of the text in flash and a private copy of the data each,
with the pin count showing the extent held in place while they run and
released after.  'solib' adds a shared library, so two objects are mapped
and each instance still gets its own copy of both objects' data.  'cxx' is
the same in C++, which additionally requires global constructors to have run
in dependency order before main.  'jmprel' is a module whose imports are all
in DT_JMPREL rather than DT_REL.

The modules are embedded as headers rather than built as part of the app:
linking one needs arm-uclinuxfdpiceabi binutils, which the tree does not
require, so the headers are committed and both this example and
testing/fs/xipfs build with a plain toolchain.

Their sources are in modules/, with a makefile that rebuilds every header
from them on an explicit 'make regen NUTTX_DIR=...' and is never invoked by
the application build.  It drives nuttx/tools/fdpic and writes the headers
this example needs alongside the ones testing/fs/xipfs needs, so one source
tree serves both and the two cannot drift apart.  CPU is cortex-m3 there
deliberately: a v7-M module runs on the v8-M targets too, so one set of blobs
serves both the RP2350 and mps2-an500, while a cortex-m33 build produces
blobs the Cortex-M7 cannot execute at all.

This demonstrates; it does not assert.  The assertions are in the fdpic and
reject sections of apps/testing/fs/xipfs.

Verified on a Pimoroni Pico Plus 2: all four subcommands, and nxflatxip
unaffected alongside them.  Also verified on mps2-an500 under QEMU, which is
a Cortex-M7 -- a different core generation from the RP2350's Cortex-M33.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 examples/fdpicxip/CMakeLists.txt       |  25 ++
 examples/fdpicxip/Kconfig              |  39 ++
 examples/fdpicxip/Make.defs            |  25 ++
 examples/fdpicxip/Makefile             |  37 ++
 examples/fdpicxip/cxxuser_bin.h        | 400 ++++++++++++++++++
 examples/fdpicxip/fdpicxip_main.c      | 538 +++++++++++++++++++++++++
 examples/fdpicxip/lazymod_bin.h        | 220 ++++++++++
 examples/fdpicxip/libcounter_bin.h     | 208 ++++++++++
 examples/fdpicxip/libshape_bin.h       | 389 ++++++++++++++++++
 examples/fdpicxip/modules/.gitignore   |   5 +
 examples/fdpicxip/modules/Makefile     | 205 ++++++++++
 examples/fdpicxip/modules/callback.c   | 517 ++++++++++++++++++++++++
 examples/fdpicxip/modules/cxxuser.cpp  | 210 ++++++++++
 examples/fdpicxip/modules/funcdesc.c   | 156 +++++++
 examples/fdpicxip/modules/lazymod.c    |  45 +++
 examples/fdpicxip/modules/libcounter.c |  58 +++
 examples/fdpicxip/modules/libshape.cpp | 160 ++++++++
 examples/fdpicxip/modules/missingsym.c |  40 ++
 examples/fdpicxip/modules/qsorter.c    |  89 ++++
 examples/fdpicxip/modules/user.c       |  68 ++++
 examples/fdpicxip/qsorter_bin.h        | 268 ++++++++++++
 examples/fdpicxip/user_bin.h           | 265 ++++++++++++
 22 files changed, 3967 insertions(+)
 create mode 100644 examples/fdpicxip/CMakeLists.txt
 create mode 100644 examples/fdpicxip/Kconfig
 create mode 100644 examples/fdpicxip/Make.defs
 create mode 100644 examples/fdpicxip/Makefile
 create mode 100644 examples/fdpicxip/cxxuser_bin.h
 create mode 100644 examples/fdpicxip/fdpicxip_main.c
 create mode 100644 examples/fdpicxip/lazymod_bin.h
 create mode 100644 examples/fdpicxip/libcounter_bin.h
 create mode 100644 examples/fdpicxip/libshape_bin.h
 create mode 100644 examples/fdpicxip/modules/.gitignore
 create mode 100644 examples/fdpicxip/modules/Makefile
 create mode 100644 examples/fdpicxip/modules/callback.c
 create mode 100644 examples/fdpicxip/modules/cxxuser.cpp
 create mode 100644 examples/fdpicxip/modules/funcdesc.c
 create mode 100644 examples/fdpicxip/modules/lazymod.c
 create mode 100644 examples/fdpicxip/modules/libcounter.c
 create mode 100644 examples/fdpicxip/modules/libshape.cpp
 create mode 100644 examples/fdpicxip/modules/missingsym.c
 create mode 100644 examples/fdpicxip/modules/qsorter.c
 create mode 100644 examples/fdpicxip/modules/user.c
 create mode 100644 examples/fdpicxip/qsorter_bin.h
 create mode 100644 examples/fdpicxip/user_bin.h

diff --git a/examples/fdpicxip/CMakeLists.txt b/examples/fdpicxip/CMakeLists.txt
new file mode 100644
index 000000000..2af0fc4a8
--- /dev/null
+++ b/examples/fdpicxip/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ##############################################################################
+# apps/examples/fdpicxip/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_EXAMPLES_FDPICXIP)
+  nuttx_add_application(NAME fdpicxip SRCS fdpicxip_main.c)
+endif()
diff --git a/examples/fdpicxip/Kconfig b/examples/fdpicxip/Kconfig
new file mode 100644
index 000000000..6de10e005
--- /dev/null
+++ b/examples/fdpicxip/Kconfig
@@ -0,0 +1,39 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config EXAMPLES_FDPICXIP
+	tristate "FDPIC modules executed in place from xipfs demo"
+	depends on FS_XIPFS && FDPIC && LIBC_EXECFUNCS
+	default n
+	---help---
+		Write FDPIC modules into xipfs at run time, the way a download
+		would, then run them.  Their text is executed directly out of
+		flash and shared between concurrent instances, while each
+		instance gets its own data.
+
+		Subcommands:
+
+		  qsort   one self-contained module, two instances
+		  solib   a shared library across two instances
+		  cxx     the same in C++, checking global constructors ran
+		  jmprel  a module whose imports are all in DT_JMPREL
+
+		With no subcommand, qsort runs.
+
+		The modules are embedded in the image as C headers.  Their
+		sources are in modules/, which rebuilds the headers on an
+		explicit 'make regen': linking one needs arm-uclinuxfdpiceabi
+		binutils, which this build does not.
+
+		This demonstrates; it does not assert.  For the assertions see
+		the fdpic and reject sections of CONFIG_TESTING_FS_XIPFS.
+
+if EXAMPLES_FDPICXIP
+
+config EXAMPLES_FDPICXIP_MOUNTPT
+	string "xipfs mountpoint"
+	default "/mnt/xipfs"
+
+endif # EXAMPLES_FDPICXIP
diff --git a/examples/fdpicxip/Make.defs b/examples/fdpicxip/Make.defs
new file mode 100644
index 000000000..88acd75f8
--- /dev/null
+++ b/examples/fdpicxip/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/examples/fdpicxip/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_EXAMPLES_FDPICXIP),)
+CONFIGURED_APPS += $(APPDIR)/examples/fdpicxip
+endif
diff --git a/examples/fdpicxip/Makefile b/examples/fdpicxip/Makefile
new file mode 100644
index 000000000..05f90116c
--- /dev/null
+++ b/examples/fdpicxip/Makefile
@@ -0,0 +1,37 @@
+############################################################################
+# apps/examples/fdpicxip/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# FDPIC modules executed in place from xipfs.  The modules are embedded as
+# headers, built from the sources in modules/ by an explicit 'make regen'
+# there: linking one needs arm-uclinuxfdpiceabi binutils, which this build
+# does not.
+
+MAINSRC   = fdpicxip_main.c
+
+PROGNAME  = fdpicxip
+PRIORITY  = SCHED_PRIORITY_DEFAULT
+STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_FDPICXIP)
+
+include $(APPDIR)/Application.mk
diff --git a/examples/fdpicxip/cxxuser_bin.h b/examples/fdpicxip/cxxuser_bin.h
new file mode 100644
index 000000000..8baafab00
--- /dev/null
+++ b/examples/fdpicxip/cxxuser_bin.h
@@ -0,0 +1,400 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/cxxuser_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from cxxuser.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_cxxuser[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x81, 0x04, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x30, 0x0e, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x12, 0x00, 0x11, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x06, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xf0, 0x06, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00,
+  0xf0, 0x16, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf4, 0x06, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00,
+  0xa0, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x94, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0c, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x8f, 0x00, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x81, 0x04, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x2a, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x74,
+  0x6f, 0x69, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x72,
+  0x6b, 0x65, 0x72, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x63, 0x6f,
+  0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x65, 0x64, 0x00, 0x73, 0x79,
+  0x73, 0x6c, 0x6f, 0x67, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x61,
+  0x64, 0x64, 0x00, 0x75, 0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x73, 0x68,
+  0x61, 0x70, 0x65, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x6e,
+  0x70, 0x72, 0x69, 0x6e, 0x74, 0x66, 0x00, 0x6f, 0x70, 0x65, 0x6e, 0x00,
+  0x66, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65, 0x00, 0x77, 0x72,
+  0x69, 0x74, 0x65, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x6c, 0x69,
+  0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x2e, 0x73, 0x6f, 0x00, 0x5f, 0x5f,
+  0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54,
+  0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xa0, 0x17, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0xa8, 0x17, 0x00, 0x00,
+  0xa4, 0x08, 0x00, 0x00, 0xb0, 0x17, 0x00, 0x00, 0xa4, 0x09, 0x00, 0x00,
+  0xb8, 0x17, 0x00, 0x00, 0xa4, 0x0a, 0x00, 0x00, 0xc0, 0x17, 0x00, 0x00,
+  0xa4, 0x0b, 0x00, 0x00, 0xc8, 0x17, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00,
+  0xd0, 0x17, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0xd8, 0x17, 0x00, 0x00,
+  0xa4, 0x11, 0x00, 0x00, 0xe0, 0x17, 0x00, 0x00, 0xa4, 0x12, 0x00, 0x00,
+  0xe8, 0x17, 0x00, 0x00, 0xa4, 0x13, 0x00, 0x00, 0xf0, 0x17, 0x00, 0x00,
+  0xa4, 0x14, 0x00, 0x00, 0xf8, 0x17, 0x00, 0x00, 0xa4, 0x15, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x2c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x34, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x44, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x4c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x54, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x5c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x64, 0x00, 0x00, 0x00,
+  0x2d, 0xe9, 0xf0, 0x45, 0x01, 0x28, 0x4c, 0x46, 0x80, 0x46, 0x0f, 0x46,
+  0x89, 0xb0, 0x40, 0xf3, 0x8e, 0x80, 0x48, 0x68, 0xff, 0xf7, 0xcc, 0xff,
+  0xb8, 0xf1, 0x02, 0x0f, 0xa1, 0x46, 0x06, 0x46, 0x03, 0xd0, 0xb8, 0x68,
+  0xff, 0xf7, 0xd8, 0xff, 0xa1, 0x46, 0x52, 0x4b, 0x4f, 0x4d, 0x59, 0xf8,
+  0x03, 0x30, 0x1b, 0x68, 0xab, 0x42, 0x7c, 0xd1, 0xdf, 0xf8, 0x3c, 0xa1,
+  0xfa, 0x44, 0xff, 0xf7, 0x8f, 0xff, 0xa1, 0x46, 0x00, 0x28, 0x78, 0xd0,
+  0x4c, 0x4b, 0x7b, 0x44, 0x49, 0x4a, 0x59, 0xf8, 0x02, 0x20, 0x12, 0x79,
+  0x00, 0x2a, 0x73, 0xd0, 0x49, 0x4a, 0x7a, 0x44, 0x49, 0x49, 0xcd, 0xe9,
+  0x00, 0x32, 0x06, 0x20, 0x53, 0x46, 0x32, 0x46, 0x79, 0x44, 0xff, 0xf7,
+  0x97, 0xff, 0xa1, 0x46, 0x40, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x1b, 0x68,
+  0x5d, 0x1b, 0x18, 0xbf, 0x01, 0x25, 0xff, 0xf7, 0x6f, 0xff, 0xa1, 0x46,
+  0x08, 0xb9, 0x45, 0xf0, 0x02, 0x05, 0x3a, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x1b, 0x79, 0x0b, 0xb9, 0x45, 0xf0, 0x04, 0x05, 0x4f, 0xf0, 0x03, 0x0a,
+  0x34, 0x4b, 0x03, 0x93, 0x30, 0x46, 0xff, 0xf7, 0x35, 0xff, 0x03, 0x98,
+  0xa1, 0x46, 0xff, 0xf7, 0x45, 0xff, 0xba, 0xf1, 0x01, 0x0a, 0xa1, 0x46,
+  0xf4, 0xd1, 0xff, 0xf7, 0x49, 0xff, 0x06, 0xeb, 0x46, 0x0a, 0xa1, 0x46,
+  0x50, 0x45, 0x18, 0xbf, 0x45, 0xf0, 0x08, 0x05, 0xff, 0xf7, 0x40, 0xff,
+  0xa1, 0x46, 0x03, 0x46, 0x00, 0x2d, 0x38, 0xd1, 0x2c, 0x4a, 0x7a, 0x44,
+  0x2c, 0x49, 0xcd, 0xe9, 0x00, 0xa2, 0x06, 0x20, 0x32, 0x46, 0x79, 0x44,
+  0xff, 0xf7, 0x5a, 0xff, 0xb8, 0xf1, 0x03, 0x0f, 0xa1, 0x46, 0x1a, 0xdd,
+  0xff, 0x68, 0xc7, 0xb1, 0x26, 0x4a, 0x2b, 0x46, 0x10, 0x21, 0x7a, 0x44,
+  0x04, 0xa8, 0xff, 0xf7, 0x11, 0xff, 0x4f, 0xf4, 0xd2, 0x72, 0xa1, 0x46,
+  0x82, 0x46, 0x40, 0xf2, 0x41, 0x21, 0x38, 0x46, 0xff, 0xf7, 0x58, 0xff,
+  0x06, 0x1e, 0xa1, 0x46, 0x18, 0xda, 0x1e, 0x49, 0x3a, 0x46, 0x06, 0x20,
+  0x79, 0x44, 0xff, 0xf7, 0x3b, 0xff, 0x28, 0x46, 0x09, 0xb0, 0xbd, 0xe8,
+  0xf0, 0x85, 0x01, 0x26, 0x7b, 0xe7, 0xdf, 0xf8, 0x64, 0xa0, 0xfa, 0x44,
+  0x81, 0xe7, 0x18, 0x4b, 0x7b, 0x44, 0x85, 0xe7, 0x17, 0x4a, 0x7a, 0x44,
+  0x8a, 0xe7, 0x17, 0x4a, 0x7a, 0x44, 0xc5, 0xe7, 0x51, 0x46, 0xff, 0xf7,
+  0x11, 0xff, 0x00, 0x28, 0xa1, 0x46, 0x05, 0xdb, 0x52, 0x46, 0x30, 0x46,
+  0x04, 0xa9, 0xff, 0xf7, 0x13, 0xff, 0xa1, 0x46, 0x30, 0x46, 0xff, 0xf7,
+  0x41, 0xff, 0xdc, 0xe7, 0x55, 0x1a, 0x0c, 0x00, 0xa0, 0x86, 0x01, 0x00,
+  0x6c, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00, 0x76, 0x01, 0x00, 0x00,
+  0x66, 0x01, 0x00, 0x00, 0x69, 0x01, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00,
+  0x34, 0x01, 0x00, 0x00, 0x4e, 0x01, 0x00, 0x00, 0x2b, 0x01, 0x00, 0x00,
+  0x8e, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00,
+  0x84, 0x00, 0x00, 0x00, 0x38, 0xb5, 0x05, 0x4b, 0x59, 0xf8, 0x03, 0x40,
+  0x02, 0x4b, 0x23, 0x60, 0xff, 0xf7, 0xd4, 0xfe, 0x20, 0x71, 0x38, 0xbd,
+  0x55, 0x1a, 0x0c, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x79, 0x65, 0x73, 0x00,
+  0x4e, 0x4f, 0x00, 0x50, 0x41, 0x53, 0x53, 0x00, 0x46, 0x41, 0x49, 0x4c,
+  0x00, 0x5b, 0x75, 0x73, 0x65, 0x72, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x6f,
+  0x77, 0x6e, 0x20, 0x63, 0x74, 0x6f, 0x72, 0x20, 0x72, 0x61, 0x6e, 0x3a,
+  0x20, 0x25, 0x73, 0x2c, 0x20, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79,
+  0x20, 0x63, 0x74, 0x6f, 0x72, 0x20, 0x72, 0x61, 0x6e, 0x3a, 0x20, 0x25,
+  0x73, 0x2c, 0x20, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x20, 0x66,
+  0x69, 0x72, 0x73, 0x74, 0x3a, 0x20, 0x25, 0x73, 0x0a, 0x00, 0x5b, 0x75,
+  0x73, 0x65, 0x72, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x6c, 0x69, 0x62, 0x72,
+  0x61, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x20, 0x3d, 0x20,
+  0x25, 0x64, 0x20, 0x28, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64,
+  0x20, 0x25, 0x64, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x25, 0x73, 0x0a, 0x00,
+  0x25, 0x64, 0x00, 0x5b, 0x75, 0x73, 0x65, 0x72, 0x5d, 0x20, 0x63, 0x61,
+  0x6e, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x20,
+  0x74, 0x6f, 0x20, 0x25, 0x73, 0x0a, 0x00, 0x00, 0x94, 0x17, 0x00, 0x00,
+  0x29, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x20, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x94, 0x17, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x17, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0e, 0x00, 0x16, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x01, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0xec, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x28, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x29, 0x06, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3c, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xf0, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0c, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x2c, 0x00, 0x00, 0x00,
+  0x04, 0x18, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x37, 0x00, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff, 0x40, 0x00, 0x00, 0x00,
+  0x94, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xa0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xc8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xcc, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xdc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xf4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x18, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x1c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x2c, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x44, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x54, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x58, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x6c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x7c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x8e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0xae, 0x00, 0x00, 0x00, 0x81, 0x04, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0xb3, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0xc4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xcb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xd5, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0xe2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x74, 0x00, 0x24, 0x64, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x5f, 0x73, 0x75, 0x62, 0x5f,
+  0x49, 0x5f, 0x63, 0x78, 0x78, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x63, 0x70,
+  0x70, 0x00, 0x2e, 0x4c, 0x41, 0x4e, 0x43, 0x48, 0x4f, 0x52, 0x30, 0x00,
+  0x5f, 0x5a, 0x4c, 0x36, 0x67, 0x5f, 0x73, 0x65, 0x6c, 0x66, 0x00, 0x5f,
+  0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f,
+  0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54,
+  0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f,
+  0x61, 0x64, 0x64, 0x00, 0x73, 0x6e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x66,
+  0x00, 0x75, 0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x73, 0x68, 0x61, 0x70,
+  0x65, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x68, 0x61, 0x70,
+  0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x65,
+  0x64, 0x00, 0x66, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65, 0x00,
+  0x77, 0x72, 0x69, 0x74, 0x65, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49,
+  0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d, 0x61,
+  0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x73, 0x79, 0x73, 0x6c,
+  0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x6f, 0x70, 0x65, 0x6e,
+  0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x65,
+  0x72, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x00, 0x2e, 0x73, 0x79,
+  0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62,
+  0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e,
+  0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d,
+  0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72, 0x65,
+  0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00, 0x2e,
+  0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74, 0x61,
+  0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e, 0x69,
+  0x6e, 0x69, 0x74, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x00, 0x2e, 0x64,
+  0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00,
+  0x2e, 0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
+  0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69,
+  0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
+  0x60, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x20, 0x03, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+  0x44, 0x06, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0xa7, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x62, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xf4, 0x16, 0x00, 0x00, 0xf4, 0x06, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x94, 0x17, 0x00, 0x00, 0x94, 0x07, 0x00, 0x00,
+  0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00,
+  0x04, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x75, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x08, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x78, 0x08, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x35, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb8, 0x0c, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0d, 0x00, 0x00,
+  0x8e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_cxxuser_len = 4352;
diff --git a/examples/fdpicxip/fdpicxip_main.c b/examples/fdpicxip/fdpicxip_main.c
new file mode 100644
index 000000000..5c89f2ae0
--- /dev/null
+++ b/examples/fdpicxip/fdpicxip_main.c
@@ -0,0 +1,538 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/fdpicxip_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * End to end demonstration of the FDPIC module loader over a writable
+ * execute-in-place file system:
+ *
+ *   1. write a module into xipfs at run time, the way a download would,
+ *   2. confirm the file system can hand out a direct flash pointer for it,
+ *   3. run it, in some cases as two concurrent instances,
+ *   4. confirm the shared text was pinned in place while they ran and
+ *      released afterwards.
+ *
+ * The point of FDPIC here is that text stays in flash and only the writable
+ * segment is copied, once per running instance -- so a second instance, or
+ * a second module sharing a library, costs data and no code.
+ *
+ * This demonstrates; it does not assert.  The assertions live in the fdpic
+ * and reject sections of apps/testing/fs/xipfs.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <elf.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <spawn.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#include <nuttx/fs/ioctl.h>
+#include <nuttx/fs/xipfs.h>
+
+#include "qsorter_bin.h"
+#include "libcounter_bin.h"
+#include "user_bin.h"
+#include "libshape_bin.h"
+#include "cxxuser_bin.h"
+#include "lazymod_bin.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MOUNTPT  CONFIG_EXAMPLES_FDPICXIP_MOUNTPT
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: extent_info_path
+ *
+ * Description:
+ *   Where a file physically lies: its extent, its flash address, and how
+ *   many live mappings are pinning it in place.
+ *
+ ****************************************************************************/
+
+static int extent_info_path(FAR const char *path,
+                            FAR struct xipfs_extent_info_s *info)
+{
+  int fd;
+  int ret;
+
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  ret = ioctl(fd, XIPFSIOC_EXTENTINFO, (unsigned long)(uintptr_t)info);
+  close(fd);
+
+  return ret < 0 ? -errno : 0;
+}
+
+/****************************************************************************
+ * Shared library demonstration
+ *
+ * Stages a library and a module that needs it, then runs two instances.
+ * Both share one mapped copy of each object's code, executed in place from
+ * flash, while each instance gets private copies of both the module's data
+ * and the library's.  If the library's state were shared, the two totals
+ * would interleave instead of each reaching seed*3.
+ ****************************************************************************/
+
+static int stage_blob(FAR const char *path, FAR const unsigned char *data,
+                      unsigned int len)
+{
+  ssize_t n;
+  int fd;
+
+  unlink(path);
+
+  fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0755);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  if (ftruncate(fd, len) < 0)
+    {
+      close(fd);
+      return -errno;
+    }
+
+  n = write(fd, data, len);
+  close(fd);
+
+  return (n == (ssize_t)len) ? 0 : -EIO;
+}
+
+/****************************************************************************
+ * Name: qsorter_main
+ *
+ * Description:
+ *   The simplest case the loader has: one self-contained FDPIC module, no
+ *   library behind it, run as two concurrent instances.  It is the FDPIC
+ *   counterpart of what this demo does by default with NXFLAT, and the
+ *   only subcommand that exercises a module with no second object -- solib
+ *   and cxx both bring a library, jmprel is about how imports are bound.
+ *
+ *   The two instances overlap deliberately: each fills its array, sleeps,
+ *   then sorts.  One shared copy of the text, a private copy of the data
+ *   per instance -- shared data would show up as corrupted output, and the
+ *   pin count while both are alive is what stops the defragmenter
+ *   relocating code that is executing.
+ *
+ ****************************************************************************/
+
+static int qsorter_main(void)
+{
+  struct xipfs_extent_info_s info;
+  FAR char *args[3];
+  pid_t pid[2];
+  char seed[8];
+  int status;
+  int ret;
+  int i;
+
+  syslog(LOG_INFO,
+         "\n=== FDPIC module executed in place from xipfs ===\n\n");
+
+  ret = stage_blob(MOUNTPT "/qsorter", g_qsorter_nxf, g_qsorter_nxf_len);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "staging the module failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "staged qsorter (%u bytes)\n", g_qsorter_nxf_len);
+
+  if (extent_info_path(MOUNTPT "/qsorter", &info) == 0)
+    {
+      syslog(LOG_INFO, "extent: block %" PRIu32 " x%" PRIu32 ", size %"
+             PRIu32 ", flash addr 0x%08lx\n",
+             info.start_block, info.nblocks, info.size,
+             (unsigned long)info.xipaddr);
+
+      if (info.xipaddr == 0)
+        {
+          syslog(LOG_INFO,
+                 "ERROR: filesystem cannot expose a flash pointer; the "
+                 "module would have to be copied to RAM\n");
+          return EXIT_FAILURE;
+        }
+    }
+
+  syslog(LOG_INFO, "\nspawning two concurrent instances...\n\n");
+
+  for (i = 0; i < 2; i++)
+    {
+      snprintf(seed, sizeof(seed), "%d", i + 1);
+      args[0] = (FAR char *)"qsorter";
+      args[1] = seed;
+      args[2] = NULL;
+
+      ret = posix_spawn(&pid[i], MOUNTPT "/qsorter", NULL, NULL, args, NULL);
+      if (ret != 0)
+        {
+          syslog(LOG_INFO, "spawn %d failed: %d\n", i + 1, ret);
+          return EXIT_FAILURE;
+        }
+    }
+
+  usleep(150000);
+
+  if (extent_info_path(MOUNTPT "/qsorter", &info) == 0)
+    {
+      syslog(LOG_INFO, "[while running] pins on the shared text = %lu\n\n",
+             (unsigned long)info.pincount);
+    }
+
+  for (i = 0; i < 2; i++)
+    {
+      waitpid(pid[i], &status, 0);
+    }
+
+  usleep(100000);
+
+  if (extent_info_path(MOUNTPT "/qsorter", &info) == 0)
+    {
+      syslog(LOG_INFO, "\n[after exit]    pins on the shared text = %lu\n",
+             (unsigned long)info.pincount);
+    }
+
+  syslog(LOG_INFO, "\n=== done ===\n");
+  return EXIT_SUCCESS;
+}
+
+static int solib_main(void)
+{
+  struct xipfs_extent_info_s li;
+  struct xipfs_extent_info_s ui;
+  FAR char *args[3];
+  pid_t pid[2];
+  char seed[8];
+  int status;
+  int ret;
+  int i;
+
+  syslog(LOG_INFO, "\n=== FDPIC shared library, executed in place ===\n\n");
+
+  ret = stage_blob(MOUNTPT "/libcounter.so", g_libcounter, g_libcounter_len);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "staging the library failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = stage_blob(MOUNTPT "/user", g_user, g_user_len);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "staging the module failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "staged libcounter.so (%u bytes) and user (%u bytes)\n",
+         g_libcounter_len, g_user_len);
+
+  if (extent_info_path(MOUNTPT "/libcounter.so", &li) == 0 &&
+      extent_info_path(MOUNTPT "/user", &ui) == 0)
+    {
+      syslog(LOG_INFO, "  libcounter.so text at 0x%08lx\n",
+             (unsigned long)li.xipaddr);
+      syslog(LOG_INFO, "  user          text at 0x%08lx\n",
+             (unsigned long)ui.xipaddr);
+    }
+
+  syslog(LOG_INFO, "\nspawning two instances, each bumping by its own"
+         " seed...\n\n");
+
+  for (i = 0; i < 2; i++)
+    {
+      snprintf(seed, sizeof(seed), "%d", i + 1);
+      args[0] = (FAR char *)"user";
+      args[1] = seed;
+      args[2] = NULL;
+
+      ret = posix_spawn(&pid[i], MOUNTPT "/user", NULL, NULL, args, NULL);
+      if (ret != 0)
+        {
+          syslog(LOG_INFO, "spawn %d failed: %d\n", i + 1, ret);
+          return EXIT_FAILURE;
+        }
+    }
+
+  usleep(150000);
+
+  if (extent_info_path(MOUNTPT "/libcounter.so", &li) == 0)
+    {
+      syslog(LOG_INFO, "[while running] pins on the library's shared text"
+             " = %lu\n\n", (unsigned long)li.pincount);
+    }
+
+  for (i = 0; i < 2; i++)
+    {
+      waitpid(pid[i], &status, 0);
+    }
+
+  usleep(100000);
+
+  if (extent_info_path(MOUNTPT "/libcounter.so", &li) == 0)
+    {
+      syslog(LOG_INFO, "\n[after exit]    pins on the library's shared text"
+             " = %lu\n", (unsigned long)li.pincount);
+    }
+
+  syslog(LOG_INFO, "\n=== done ===\n");
+  return EXIT_SUCCESS;
+}
+
+/****************************************************************************
+ * Name: cxx_main
+ *
+ * Description:
+ *   The same shape as solib_main(), in C++, and with one thing extra to
+ *   prove: that global constructors ran.
+ *
+ *   That is worth a demo of its own because of how it fails.  A loader that
+ *   ignores DT_INIT_ARRAY still loads a C++ module, still resolves every
+ *   symbol, and still runs it -- the globals are simply left as .bss and
+ *   every field reads zero.  Nothing faults and nothing is logged; the
+ *   module just answers wrong.  So both objects here carry a magic number
+ *   that only a constructor writes, and the module reports whether it found
+ *   them.
+ *
+ *   The ordering is checked too.  The module's constructor samples whether
+ *   the library was already constructed when it ran, which is the only
+ *   moment the answer is still interesting -- by the time main() is entered
+ *   both have run either way.
+ *
+ ****************************************************************************/
+
+static int cxx_main(void)
+{
+  struct xipfs_extent_info_s li;
+  struct xipfs_extent_info_s ui;
+  FAR char *args[3];
+  pid_t pid[2];
+  char seed[8];
+  int status;
+  int ret;
+  int i;
+
+  syslog(LOG_INFO, "\n=== C++ module and shared library, executed in"
+         " place ===\n\n");
+
+  ret = stage_blob(MOUNTPT "/libshape.so", g_libshape, g_libshape_len);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "staging the library failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  ret = stage_blob(MOUNTPT "/cxxuser", g_cxxuser, g_cxxuser_len);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "staging the module failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "staged libshape.so (%u bytes) and cxxuser (%u bytes)\n",
+         g_libshape_len, g_cxxuser_len);
+
+  if (extent_info_path(MOUNTPT "/libshape.so", &li) == 0 &&
+      extent_info_path(MOUNTPT "/cxxuser", &ui) == 0)
+    {
+      syslog(LOG_INFO, "  libshape.so text at 0x%08lx\n",
+             (unsigned long)li.xipaddr);
+      syslog(LOG_INFO, "  cxxuser     text at 0x%08lx\n",
+             (unsigned long)ui.xipaddr);
+    }
+
+  syslog(LOG_INFO, "\nspawning two instances, each adding its own seed...\n"
+         "(each instance's constructors run at load time, before main)\n\n");
+
+  for (i = 0; i < 2; i++)
+    {
+      snprintf(seed, sizeof(seed), "%d", i + 1);
+      args[0] = (FAR char *)"cxxuser";
+      args[1] = seed;
+      args[2] = NULL;
+
+      ret = posix_spawn(&pid[i], MOUNTPT "/cxxuser", NULL, NULL, args, NULL);
+      if (ret != 0)
+        {
+          syslog(LOG_INFO, "spawn %d failed: %d\n", i + 1, ret);
+          return EXIT_FAILURE;
+        }
+    }
+
+  usleep(150000);
+
+  if (extent_info_path(MOUNTPT "/libshape.so", &li) == 0)
+    {
+      syslog(LOG_INFO, "[while running] pins on the library's shared text"
+             " = %lu\n\n", (unsigned long)li.pincount);
+    }
+
+  /* Only a barrier.  The exit status is deliberately not read: waitpid()
+   * retains it for an already-exited child only under
+   * CONFIG_SCHED_CHILD_STATUS, and both instances run for the same time, so
+   * the second is always gone by the time the first wait returns.  Checking
+   * `status` after a failed wait reads whatever the previous iteration left
+   * there, which looks like a pass.  The suite in apps/testing/fs/xipfs
+   * asserts the real result via files; this demo reports through the log.
+   */
+
+  ret = EXIT_SUCCESS;
+
+  for (i = 0; i < 2; i++)
+    {
+      waitpid(pid[i], &status, 0);
+    }
+
+  /* The destructors run on unload, which happens as each task is reaped --
+   * after waitpid() has returned, so give them a moment to be logged.
+   */
+
+  usleep(100000);
+
+  if (extent_info_path(MOUNTPT "/libshape.so", &li) == 0)
+    {
+      syslog(LOG_INFO, "\n[after exit]    pins on the library's shared text"
+             " = %lu\n", (unsigned long)li.pincount);
+    }
+
+  syslog(LOG_INFO, "\n=== %s ===\n",
+         ret == EXIT_SUCCESS ? "done" : "FAILED");
+  return ret;
+}
+
+/****************************************************************************
+ * Name: jmprel_main
+ *
+ * Description:
+ *   Load a module whose imports the linker put in DT_JMPREL.
+ *
+ *   Every other module here is linked with -z now, which leaves the imported
+ *   descriptors in DT_REL.  This one empties BINDNOW in modules/Makefile, so
+ *   it has no DT_REL at all -- both of its imports are in the PLT relocation
+ *   table.
+ *
+ *   There is no lazy resolver in the loader, so a DT_JMPREL table that went
+ *   unwalked was not deferred work: the descriptors stayed unrelocated and
+ *   the module's first call into the firmware branched to whatever the
+ *   unrelocated word held.  It loaded cleanly and printed nothing, then
+ *   took an INVSTATE UsageFault that escalated to a HardFault -- no
+ *   console, no crash dump.  If this demo prints its line, both tables are
+ *   being bound.
+ *
+ ****************************************************************************/
+
+static int jmprel_main(void)
+{
+  FAR char *args[3];
+  pid_t pid;
+  int status;
+  int ret;
+
+  syslog(LOG_INFO, "\n=== FDPIC module bound through DT_JMPREL ===\n\n");
+
+  ret = stage_blob(MOUNTPT "/lazymod", g_lazymod, g_lazymod_len);
+  if (ret < 0)
+    {
+      syslog(LOG_INFO, "staging the module failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "staged lazymod (%u bytes), all imports in DT_JMPREL\n\n",
+         g_lazymod_len);
+
+  args[0] = (FAR char *)"lazymod";
+  args[1] = (FAR char *)"42";
+  args[2] = NULL;
+
+  ret = posix_spawn(&pid, MOUNTPT "/lazymod", NULL, NULL, args, NULL);
+  if (ret != 0)
+    {
+      syslog(LOG_INFO, "spawn failed: %d\n", ret);
+      return EXIT_FAILURE;
+    }
+
+  waitpid(pid, &status, 0);
+
+  if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
+    {
+      syslog(LOG_INFO, "\n=== FAILED: module did not exit cleanly ===\n");
+      return EXIT_FAILURE;
+    }
+
+  syslog(LOG_INFO, "\n=== done: the module reached the firmware and came"
+         " back ===\n");
+  return EXIT_SUCCESS;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  if (argc > 1 && strcmp(argv[1], "solib") == 0)
+    {
+      return solib_main();
+    }
+
+  if (argc > 1 && strcmp(argv[1], "cxx") == 0)
+    {
+      return cxx_main();
+    }
+
+  if (argc > 1 && strcmp(argv[1], "jmprel") == 0)
+    {
+      return jmprel_main();
+    }
+
+  if (argc > 1 && strcmp(argv[1], "qsort") != 0)
+    {
+      fprintf(stderr, "usage: fdpicxip [qsort|solib|cxx|jmprel]\n");
+      return EXIT_FAILURE;
+    }
+
+  return qsorter_main();
+}
diff --git a/examples/fdpicxip/lazymod_bin.h b/examples/fdpicxip/lazymod_bin.h
new file mode 100644
index 000000000..b2d514312
--- /dev/null
+++ b/examples/fdpicxip/lazymod_bin.h
@@ -0,0 +1,220 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/lazymod_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from lazymod.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_lazymod[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd5, 0x01, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x10, 0x06, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x10, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x3c, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x3c, 0x12, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x3c, 0x02, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x78, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x23, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0xd5, 0x01, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69,
+  0x6e, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x73, 0x79, 0x73, 0x6c, 0x6f,
+  0x67, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f,
+  0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x00,
+  0xc0, 0x12, 0x00, 0x00, 0xa4, 0x04, 0x00, 0x00, 0xc8, 0x12, 0x00, 0x00,
+  0xa4, 0x05, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x5f, 0xf8, 0x08, 0xc0, 0x4d, 0xf8, 0x04, 0xcd,
+  0xd9, 0xf8, 0x04, 0xc0, 0xd9, 0xf8, 0x00, 0xf0, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5f, 0xf8, 0x08, 0xc0,
+  0x4d, 0xf8, 0x04, 0xcd, 0xd9, 0xf8, 0x04, 0xc0, 0xd9, 0xf8, 0x00, 0xf0,
+  0x01, 0x28, 0x10, 0xb5, 0x4c, 0x46, 0x0b, 0xdd, 0x48, 0x68, 0xff, 0xf7,
+  0xe5, 0xff, 0xa1, 0x46, 0x02, 0x46, 0x04, 0x49, 0x06, 0x20, 0x79, 0x44,
+  0xff, 0xf7, 0xca, 0xff, 0x00, 0x20, 0x10, 0xbd, 0x01, 0x22, 0xf6, 0xe7,
+  0x0e, 0x00, 0x00, 0x00, 0x5b, 0x6c, 0x61, 0x7a, 0x79, 0x6d, 0x6f, 0x64,
+  0x5d, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x68, 0x72,
+  0x6f, 0x75, 0x67, 0x68, 0x20, 0x61, 0x20, 0x44, 0x54, 0x5f, 0x4a, 0x4d,
+  0x50, 0x52, 0x45, 0x4c, 0x20, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+  0x74, 0x6f, 0x72, 0x2c, 0x20, 0x73, 0x65, 0x65, 0x64, 0x20, 0x25, 0x64,
+  0x0a, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x33, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x74, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0xc4, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x74, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3c, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x0b, 0x00, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x11, 0x00, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff, 0x1a, 0x00, 0x00, 0x00,
+  0xb4, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x07, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0xac, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xbc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0xd5, 0x01, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x5d, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x6c, 0x61, 0x7a, 0x79, 0x6d, 0x6f, 0x64, 0x2e, 0x63, 0x00, 0x24,
+  0x74, 0x00, 0x24, 0x64, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49,
+  0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46,
+  0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00,
+  0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e,
+  0x44, 0x5f, 0x5f, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52,
+  0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f,
+  0x5f, 0x00, 0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f,
+  0x69, 0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e,
+  0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74,
+  0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e,
+  0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73,
+  0x74, 0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x70, 0x6c, 0x74, 0x00,
+  0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74,
+  0x61, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e,
+  0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74,
+  0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41,
+  0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xe0, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+  0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x74, 0x01, 0x00, 0x00,
+  0x74, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x35, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x84, 0x01, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00,
+  0xfc, 0x01, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x38, 0x02, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x78, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00,
+  0xb4, 0x02, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x5f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x03, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x44, 0x03, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x1a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x34, 0x05, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x05, 0x00, 0x00,
+  0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_lazymod_len = 2192;
diff --git a/examples/fdpicxip/libcounter_bin.h b/examples/fdpicxip/libcounter_bin.h
new file mode 100644
index 000000000..9ef92cae7
--- /dev/null
+++ b/examples/fdpicxip/libcounter_bin.h
@@ -0,0 +1,208 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/libcounter_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from libcounter.so -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_libcounter[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xac, 0x05, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x0f, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00,
+  0xf8, 0x11, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0xd1, 0x01, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xe5, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x05, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x06, 0x00, 0x1c, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x06, 0x00, 0x00, 0x63, 0x6f, 0x75,
+  0x6e, 0x74, 0x65, 0x72, 0x5f, 0x62, 0x75, 0x6d, 0x70, 0x00, 0x63, 0x6f,
+  0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00,
+  0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49,
+  0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58,
+  0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6c, 0x69, 0x62,
+  0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x73, 0x6f, 0x00, 0x00,
+  0x8c, 0x12, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x03, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0x1a, 0x68, 0x10, 0x44, 0x18, 0x60, 0x70, 0x47, 0x00, 0xbf,
+  0x0c, 0x00, 0x00, 0x00, 0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x18, 0x68,
+  0x70, 0x47, 0x00, 0xbf, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x4b, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xff, 0x6f,
+  0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a,
+  0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f,
+  0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32,
+  0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64,
+  0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29,
+  0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35,
+  0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65,
+  0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d,
+  0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01,
+  0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04,
+  0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x0e, 0x00, 0x00, 0x00,
+  0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xe4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x09, 0x00, 0x14, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x1e, 0x00, 0x00, 0x00,
+  0x90, 0x12, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x26, 0x00, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff, 0x2f, 0x00, 0x00, 0x00,
+  0x80, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0xd1, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x05, 0x00, 0x52, 0x00, 0x00, 0x00, 0xe5, 0x01, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x05, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x06, 0x00,
+  0x70, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x06, 0x00, 0x00, 0x6c, 0x69, 0x62, 0x63, 0x6f, 0x75, 0x6e,
+  0x74, 0x65, 0x72, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x24, 0x64, 0x00,
+  0x2e, 0x4c, 0x41, 0x4e, 0x43, 0x48, 0x4f, 0x52, 0x30, 0x00, 0x67, 0x5f,
+  0x63, 0x61, 0x6c, 0x6c, 0x73, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d,
+  0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f,
+  0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f,
+  0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x62, 0x75, 0x6d,
+  0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x6f,
+  0x74, 0x61, 0x6c, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f,
+  0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f,
+  0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73,
+  0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72,
+  0x74, 0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64,
+  0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74,
+  0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e,
+  0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75,
+  0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e,
+  0x67, 0x6f, 0x74, 0x00, 0x2e, 0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f,
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61,
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x38, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00,
+  0xec, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x7c, 0x01, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00,
+  0xd0, 0x01, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf4, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x57, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x90, 0x12, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd5, 0x02, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
+  0x0d, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x04, 0x00, 0x00,
+  0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x35, 0x05, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_libcounter_len = 2052;
diff --git a/examples/fdpicxip/libshape_bin.h b/examples/fdpicxip/libshape_bin.h
new file mode 100644
index 000000000..178153308
--- /dev/null
+++ b/examples/fdpicxip/libshape_bin.h
@@ -0,0 +1,389 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/libshape_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from libshape.so -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_libshape[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x88, 0x0d, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x13, 0x00, 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00,
+  0xbc, 0x05, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00,
+  0xbc, 0x15, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xc4, 0x05, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00,
+  0xb0, 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x30, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x4c, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x74, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0d, 0x00, 0x3d, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0x4e, 0x00, 0x00, 0x00,
+  0x6d, 0x04, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0x6d, 0x00, 0x00, 0x00,
+  0x99, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x79, 0x00, 0x00, 0x00, 0xa9, 0x04, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x8b, 0x00, 0x00, 0x00,
+  0xb8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+  0x85, 0x04, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67,
+  0x69, 0x73, 0x74, 0x72, 0x79, 0x44, 0x32, 0x45, 0x76, 0x00, 0x73, 0x79,
+  0x73, 0x6c, 0x6f, 0x67, 0x00, 0x73, 0x6e, 0x70, 0x72, 0x69, 0x6e, 0x74,
+  0x66, 0x00, 0x6f, 0x70, 0x65, 0x6e, 0x00, 0x66, 0x74, 0x72, 0x75, 0x6e,
+  0x63, 0x61, 0x74, 0x65, 0x00, 0x77, 0x72, 0x69, 0x74, 0x65, 0x00, 0x63,
+  0x6c, 0x6f, 0x73, 0x65, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67,
+  0x69, 0x73, 0x74, 0x72, 0x79, 0x44, 0x31, 0x45, 0x76, 0x00, 0x73, 0x68,
+  0x61, 0x70, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x73, 0x68, 0x61, 0x70,
+  0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, 0x00, 0x73, 0x74, 0x72,
+  0x6c, 0x63, 0x70, 0x79, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x74,
+  0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x63,
+  0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x65, 0x64, 0x00, 0x5f,
+  0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53,
+  0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6c, 0x69, 0x62, 0x73,
+  0x68, 0x61, 0x70, 0x65, 0x2e, 0x73, 0x6f, 0x00, 0xbc, 0x15, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xc0, 0x16, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x80, 0x16, 0x00, 0x00,
+  0xa4, 0x07, 0x00, 0x00, 0x88, 0x16, 0x00, 0x00, 0xa4, 0x09, 0x00, 0x00,
+  0x90, 0x16, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0x98, 0x16, 0x00, 0x00,
+  0xa4, 0x0e, 0x00, 0x00, 0xa0, 0x16, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x00,
+  0xa8, 0x16, 0x00, 0x00, 0xa4, 0x12, 0x00, 0x00, 0xb0, 0x16, 0x00, 0x00,
+  0xa4, 0x13, 0x00, 0x00, 0xb8, 0x16, 0x00, 0x00, 0xa4, 0x15, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x2c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x34, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x44, 0x00, 0x00, 0x00, 0x10, 0xb5, 0x03, 0x4b, 0x59, 0xf8, 0x03, 0x00,
+  0xff, 0xf7, 0xaa, 0xff, 0x10, 0xbd, 0x00, 0xbf, 0x4c, 0x00, 0x00, 0x00,
+  0x00, 0x22, 0x07, 0x4b, 0x05, 0x49, 0x59, 0xf8, 0x03, 0x30, 0x06, 0x20,
+  0xc3, 0xe9, 0x00, 0x12, 0x04, 0x49, 0x9a, 0x60, 0x79, 0x44, 0x1a, 0x73,
+  0xff, 0xf7, 0xca, 0xbf, 0xe0, 0xa9, 0x5b, 0x00, 0x4c, 0x00, 0x00, 0x00,
+  0x3e, 0x01, 0x00, 0x00, 0x04, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x9a, 0x68,
+  0x01, 0x32, 0x9a, 0x60, 0x5a, 0x68, 0x10, 0x44, 0x58, 0x60, 0x70, 0x47,
+  0x4c, 0x00, 0x00, 0x00, 0x03, 0x4b, 0x01, 0x46, 0x59, 0xf8, 0x03, 0x00,
+  0x40, 0x22, 0x0c, 0x30, 0xff, 0xf7, 0xa6, 0xbf, 0x4c, 0x00, 0x00, 0x00,
+  0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x58, 0x68, 0x70, 0x47, 0x00, 0xbf,
+  0x4c, 0x00, 0x00, 0x00, 0x05, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x18, 0x68,
+  0x02, 0x4b, 0xc3, 0x1a, 0x58, 0x42, 0x58, 0x41, 0x70, 0x47, 0x00, 0xbf,
+  0xe0, 0xa9, 0x5b, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x2d, 0xe9, 0xf0, 0x45,
+  0x1d, 0x49, 0x05, 0x46, 0x82, 0x68, 0x85, 0xb0, 0x06, 0x20, 0x79, 0x44,
+  0x4c, 0x46, 0xff, 0xf7, 0x8d, 0xff, 0x2b, 0x7b, 0xa1, 0x46, 0x1b, 0xb3,
+  0x18, 0x4a, 0x10, 0x21, 0x6b, 0x68, 0x7a, 0x44, 0x68, 0x46, 0xff, 0xf7,
+  0x5b, 0xff, 0x05, 0xf1, 0x0c, 0x07, 0xa1, 0x46, 0x82, 0x46, 0x4f, 0xf4,
+  0xd2, 0x72, 0x40, 0xf2, 0x41, 0x21, 0x38, 0x46, 0xff, 0xf7, 0x82, 0xff,
+  0x06, 0x1e, 0xa1, 0x46, 0x12, 0xdb, 0x51, 0x46, 0xff, 0xf7, 0x54, 0xff,
+  0x00, 0x28, 0xa1, 0x46, 0x05, 0xdb, 0x52, 0x46, 0x69, 0x46, 0x30, 0x46,
+  0xff, 0xf7, 0x56, 0xff, 0xa1, 0x46, 0x30, 0x46, 0xff, 0xf7, 0x7a, 0xff,
+  0x28, 0x46, 0x05, 0xb0, 0xbd, 0xe8, 0xf0, 0x85, 0x05, 0x49, 0x3a, 0x46,
+  0x06, 0x20, 0x79, 0x44, 0xff, 0xf7, 0x5c, 0xff, 0xf4, 0xe7, 0x00, 0xbf,
+  0x76, 0x00, 0x00, 0x00, 0x8e, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00,
+  0x20, 0x20, 0x5b, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5d,
+  0x20, 0x7e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x28, 0x29,
+  0x20, 0x72, 0x61, 0x6e, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x25,
+  0x64, 0x20, 0x61, 0x64, 0x64, 0x73, 0x0a, 0x00, 0x25, 0x64, 0x00, 0x20,
+  0x20, 0x5b, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5d, 0x20,
+  0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, 0x20, 0x25, 0x73, 0x20, 0x66, 0x61,
+  0x69, 0x6c, 0x65, 0x64, 0x0a, 0x00, 0x20, 0x20, 0x5b, 0x6c, 0x69, 0x62,
+  0x73, 0x68, 0x61, 0x70, 0x65, 0x5d, 0x20, 0x52, 0x65, 0x67, 0x69, 0x73,
+  0x74, 0x72, 0x79, 0x28, 0x29, 0x20, 0x72, 0x61, 0x6e, 0x0a, 0x00, 0x00,
+  0x74, 0x16, 0x00, 0x00, 0x45, 0x04, 0x00, 0x00, 0x31, 0x04, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00,
+  0xbc, 0x15, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x1a, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x20, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x74, 0x16, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc4, 0x16, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72,
+  0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68,
+  0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c,
+  0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d,
+  0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e,
+  0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33,
+  0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00,
+  0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a,
+  0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03,
+  0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xb8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc4, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x74, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0e, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0f, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x01, 0x00, 0x00, 0x00,
+  0xc4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x6c, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x84, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0x94, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x98, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xa4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xbc, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x44, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x07, 0x00, 0x00, 0x00, 0x45, 0x04, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x23, 0x00, 0x00, 0x00,
+  0x31, 0x04, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xc4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
+  0x3f, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0d, 0x00, 0x49, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00,
+  0x4c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x59, 0x00, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0xf1, 0xff, 0x62, 0x00, 0x00, 0x00, 0x74, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0c, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x4c, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa0, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xa4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xb4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xb8, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xc8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xcc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xdc, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xe0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf4, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x1c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x2c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x78, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0x89, 0x00, 0x00, 0x00,
+  0x6d, 0x04, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0xad, 0x00, 0x00, 0x00,
+  0x99, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0xb9, 0x00, 0x00, 0x00, 0xa9, 0x04, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0xcb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xd5, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xe3, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0xf3, 0x00, 0x00, 0x00,
+  0xb8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00,
+  0x85, 0x04, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x1d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x74, 0x00, 0x24, 0x64, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x5f, 0x73, 0x75, 0x62, 0x5f,
+  0x49, 0x5f, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x2e, 0x63,
+  0x70, 0x70, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x5f,
+  0x73, 0x75, 0x62, 0x5f, 0x44, 0x5f, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x2e, 0x63, 0x70, 0x70, 0x00, 0x2e, 0x4c, 0x41, 0x4e, 0x43,
+  0x48, 0x4f, 0x52, 0x30, 0x00, 0x5f, 0x5a, 0x4c, 0x31, 0x30, 0x67, 0x5f,
+  0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x00, 0x5f, 0x44, 0x59,
+  0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41,
+  0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42,
+  0x4c, 0x45, 0x5f, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67, 0x69,
+  0x73, 0x74, 0x72, 0x79, 0x44, 0x31, 0x45, 0x76, 0x00, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x73, 0x6e, 0x70, 0x72, 0x69,
+  0x6e, 0x74, 0x66, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67, 0x69,
+  0x73, 0x74, 0x72, 0x79, 0x44, 0x32, 0x45, 0x76, 0x00, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
+  0x65, 0x64, 0x00, 0x66, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65,
+  0x00, 0x77, 0x72, 0x69, 0x74, 0x65, 0x00, 0x73, 0x74, 0x72, 0x6c, 0x63,
+  0x70, 0x79, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00,
+  0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x6f, 0x70, 0x65, 0x6e, 0x00,
+  0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72,
+  0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d,
+  0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00,
+  0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x68,
+  0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00,
+  0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c,
+  0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00, 0x2e, 0x74,
+  0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x00,
+  0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e, 0x69, 0x6e,
+  0x69, 0x74, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x00, 0x2e, 0x66, 0x69,
+  0x6e, 0x69, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x00, 0x2e, 0x64, 0x79,
+  0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00, 0x2e,
+  0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74,
+  0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62,
+  0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
+  0x60, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x38, 0x03, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00,
+  0x30, 0x04, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+  0x4c, 0x05, 0x00, 0x00, 0x4c, 0x05, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00,
+  0xbc, 0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x62, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xc0, 0x15, 0x00, 0x00, 0xc0, 0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00, 0xc4, 0x05, 0x00, 0x00,
+  0xb0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x74, 0x16, 0x00, 0x00,
+  0x74, 0x06, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x7c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xc4, 0x16, 0x00, 0x00, 0xc4, 0x06, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x06, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x07, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0x00, 0x00, 0x90, 0x04, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x0b, 0x00, 0x00,
+  0x23, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xeb, 0x0c, 0x00, 0x00, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_libshape_len = 4224;
diff --git a/examples/fdpicxip/modules/.gitignore b/examples/fdpicxip/modules/.gitignore
new file mode 100644
index 000000000..8c3555579
--- /dev/null
+++ b/examples/fdpicxip/modules/.gitignore
@@ -0,0 +1,5 @@
+/*.fdpic
+/*.so
+/.nuttx-exports
+/manyneeded.c
+/need*.c
diff --git a/examples/fdpicxip/modules/Makefile b/examples/fdpicxip/modules/Makefile
new file mode 100644
index 000000000..56dfd7ebb
--- /dev/null
+++ b/examples/fdpicxip/modules/Makefile
@@ -0,0 +1,205 @@
+############################################################################
+# apps/examples/fdpicxip/modules/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+# The FDPIC modules that examples/fdpicxip and testing/fs/xipfs carry inside
+# their images, and the sources they are built from.
+#
+# This is NOT part of the application build.  Nothing here runs unless it is
+# asked for: the *_bin.h headers are committed, so both apps build with a
+# plain toolchain and CI covers them, while the link needs
+# arm-uclinuxfdpiceabi binutils, which the tree does not require.  See
+# nuttx/tools/fdpic/README.md and Documentation/components/fdpic.rst.
+#
+# To rebuild the headers from these sources:
+#
+#   make -C apps/examples/fdpicxip/modules regen NUTTX_DIR=/path/to/nuttx
+#
+# NUTTX_DIR must be a configured, built tree with CONFIG_FDPIC and a system
+# symbol table: the compile needs its headers and the verify step needs
+# libs/libc/exec_symtab.c.
+#
+# CPU is cortex-m3 rather than the toolchain default, deliberately.  A v7-M
+# module runs on both the v7-M and v8-M targets, so one set of blobs serves
+# the RP2350 (Cortex-M33) and mps2-an500 (Cortex-M7) alike.  Building for
+# cortex-m33 produces blobs the M7 cannot execute at all.
+
+CPU ?= cortex-m3
+
+FDPICDIR  = $(NUTTX_DIR)/tools/fdpic
+MODULE_MK = $(FDPICDIR)/nuttx-fdpic.mk
+EMBED     = $(FDPICDIR)/fdpic-embed
+
+# Where each generated header goes, and its path from the repository root --
+# fdpic-embed puts that on line 2, which is what nxstyle wants.
+
+DEMODIR = ..
+DEMOREL = apps/examples/fdpicxip
+TESTDIR = ../../../testing/fs/xipfs
+TESTREL = apps/testing/fs/xipfs
+
+BUILD = $(MAKE) -f $(MODULE_MK) NUTTX_DIR=$(NUTTX_DIR) CPU=$(CPU)
+
+# manyneeded needs one library per DT_NEEDED entry, one more than the loader
+# will follow.  They exist only to make the linker record nine entries; the
+# module is refused while its dynamic section is parsed, before any of them
+# would be loaded, so none of them is embedded.
+
+NEEDLIBS := $(foreach n,0 1 2 3 4 5 6 7 8,need$(n).so)
+
+DEMO_HDRS = $(DEMODIR)/qsorter_bin.h    $(DEMODIR)/libcounter_bin.h \
+            $(DEMODIR)/user_bin.h       $(DEMODIR)/libshape_bin.h \
+            $(DEMODIR)/cxxuser_bin.h    $(DEMODIR)/lazymod_bin.h
+
+TEST_HDRS = $(TESTDIR)/callback_bin.h   $(TESTDIR)/counteruser_bin.h \
+            $(TESTDIR)/cxxuser_bin.h    $(TESTDIR)/funcdesc_bin.h \
+            $(TESTDIR)/lazymod_bin.h    $(TESTDIR)/libcounter_bin.h \
+            $(TESTDIR)/libshape_bin.h   $(TESTDIR)/manyneeded_bin.h \
+            $(TESTDIR)/missingsym_bin.h
+
+.PHONY: all regen check-nuttx-dir clean
+
+all:
+	@echo "Nothing to do: the *_bin.h headers are committed."
+	@echo "To rebuild them:  make regen NUTTX_DIR=/path/to/nuttx"
+
+regen: check-nuttx-dir $(DEMO_HDRS) $(TEST_HDRS)
+	@echo "Regenerated the embedded modules for $(DEMOREL) and $(TESTREL)."
+
+check-nuttx-dir:
+ifeq ($(NUTTX_DIR),)
+	$(error Set NUTTX_DIR to a configured, built NuttX tree)
+endif
+
+# The modules.  Libraries have no entry point and are named by their SONAME,
+# which is what a consumer records in DT_NEEDED and what the loader searches
+# for at run time.
+
+qsorter.fdpic: qsorter.c
+	$(BUILD) MODULE=qsorter SRCS=qsorter.c
+
+callback.fdpic: callback.c
+	$(BUILD) MODULE=callback SRCS=callback.c
+
+funcdesc.fdpic: funcdesc.c
+	$(BUILD) MODULE=funcdesc SRCS=funcdesc.c
+
+libcounter.so: libcounter.c
+	$(BUILD) MODULE=libcounter SRCS=libcounter.c ENTRY=0 \
+	    EXTRA_LDFLAGS="-soname libcounter.so"
+	mv libcounter.fdpic libcounter.so
+
+user.fdpic: user.c libcounter.so
+	$(BUILD) MODULE=user SRCS=user.c LIBS=libcounter.so
+
+# C++ compiles with the stock arm-none-eabi-g++; only the link is FDPIC.
+
+libshape.so: libshape.cpp
+	$(BUILD) MODULE=libshape CXXSRCS=libshape.cpp ENTRY=0 \
+	    EXTRA_LDFLAGS="-soname libshape.so"
+	mv libshape.fdpic libshape.so
+
+cxxuser.fdpic: cxxuser.cpp libshape.so
+	$(BUILD) MODULE=cxxuser CXXSRCS=cxxuser.cpp LIBS=libshape.so
+
+# BINDNOW is emptied so the imported descriptors stay in the lazy binding
+# table, which is the case this module exists to cover.
+
+lazymod.fdpic: lazymod.c
+	$(BUILD) MODULE=lazymod SRCS=lazymod.c BINDNOW=
+
+# missingsym is linked with the bare .fdpic target rather than the default
+# 'verify' one, because it is exactly what fdpic-verify is meant to catch.
+
+missingsym.fdpic: missingsym.c
+	$(BUILD) MODULE=missingsym SRCS=missingsym.c missingsym.fdpic
+
+need%.so:
+	echo "int need_leaf_$*(void){return $*;}" > need$*.c
+	$(BUILD) MODULE=need$* SRCS=need$*.c ENTRY=0 \
+	    EXTRA_LDFLAGS="-soname need$*.so"
+	mv need$*.fdpic need$*.so
+
+manyneeded.c: $(NEEDLIBS)
+	{ for n in 0 1 2 3 4 5 6 7 8; do \
+	    echo "extern int need_leaf_$$n(void);"; done; \
+	  echo "int main(int argc, char *argv[]) {"; \
+	  echo "  return need_leaf_0() + need_leaf_1() + need_leaf_2() +"; \
+	  echo "         need_leaf_3() + need_leaf_4() + need_leaf_5() +"; \
+	  echo "         need_leaf_6() + need_leaf_7() + need_leaf_8();"; \
+	  echo "}"; } > manyneeded.c
+
+manyneeded.fdpic: manyneeded.c $(NEEDLIBS)
+	$(BUILD) MODULE=manyneeded SRCS=manyneeded.c LIBS="$(NEEDLIBS)" \
+	    manyneeded.fdpic
+
+# The headers.  One artifact can be embedded under more than one name: the
+# demo's user_bin.h and the suite's counteruser_bin.h are the same module.
+
+$(DEMODIR)/qsorter_bin.h: qsorter.fdpic
+	$(EMBED) $< g_qsorter_nxf $(DEMOREL)/$(@F) > $@
+
+$(DEMODIR)/libcounter_bin.h: libcounter.so
+	$(EMBED) $< g_libcounter $(DEMOREL)/$(@F) > $@
+
+$(DEMODIR)/user_bin.h: user.fdpic
+	$(EMBED) $< g_user $(DEMOREL)/$(@F) > $@
+
+$(DEMODIR)/libshape_bin.h: libshape.so
+	$(EMBED) $< g_libshape $(DEMOREL)/$(@F) > $@
+
+$(DEMODIR)/cxxuser_bin.h: cxxuser.fdpic
+	$(EMBED) $< g_cxxuser $(DEMOREL)/$(@F) > $@
+
+$(DEMODIR)/lazymod_bin.h: lazymod.fdpic
+	$(EMBED) $< g_lazymod $(DEMOREL)/$(@F) > $@
+
+$(TESTDIR)/callback_bin.h: callback.fdpic
+	$(EMBED) $< g_callback $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/counteruser_bin.h: user.fdpic
+	$(EMBED) $< g_counteruser $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/cxxuser_bin.h: cxxuser.fdpic
+	$(EMBED) $< g_cxxuser $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/funcdesc_bin.h: funcdesc.fdpic
+	$(EMBED) $< g_funcdesc $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/lazymod_bin.h: lazymod.fdpic
+	$(EMBED) $< g_lazymod $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/libcounter_bin.h: libcounter.so
+	$(EMBED) $< g_libcounter $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/libshape_bin.h: libshape.so
+	$(EMBED) $< g_libshape $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/manyneeded_bin.h: manyneeded.fdpic
+	$(EMBED) $< g_manyneeded $(TESTREL)/$(@F) > $@
+
+$(TESTDIR)/missingsym_bin.h: missingsym.fdpic
+	$(EMBED) $< g_missingsym $(TESTREL)/$(@F) > $@
+
+# No NUTTX_DIR needed to clean.
+
+clean:
+	$(Q) rm -f *.o *.fdpic *.so .nuttx-exports need*.c manyneeded.c
diff --git a/examples/fdpicxip/modules/callback.c b/examples/fdpicxip/modules/callback.c
new file mode 100644
index 000000000..1a1b33325
--- /dev/null
+++ b/examples/fdpicxip/modules/callback.c
@@ -0,0 +1,517 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/callback.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Hands a module function to the firmware every way the firmware will
+ * accept one.
+ *
+ * In FDPIC a function pointer is the address of a two-word descriptor, not
+ * a code address, and that descriptor lives in the module's writable
+ * segment in RAM.  Firmware that stores such a pointer and later branches to
+ * it therefore jumps into the module's *data* and faults -- unless the entry
+ * point it came through resolved the descriptor first.
+ *
+ * qsort and bsearch have always done that.  pthread_create, signal and
+ * task_create did not, which made them look usable and then take the board
+ * down; pthread_once, task_spawn, scandir's filter and sigaction followed
+ * later.  This module is what keeps all of them honest.
+ *
+ * scandir is one worth noting: its filter is called by scandir itself and
+ * must be resolved there, while its comparison function is handed to qsort,
+ * which resolves it.  Resolving both would be a bug, so both are passed here
+ * at once.
+ *
+ * mq_notify and timer_create with SIGEV_THREAD are the interesting ones:
+ * their callback runs on a work-queue worker that carries no module data
+ * base.  The base is captured at registration and installed around the call,
+ * so the callback still reaches the module's own globals.  Each is checked
+ * by having the callback write a distinctive value into a module global.
+ *
+ * Everything is checked by observing a side effect the callback itself
+ * produces, because a callback that never runs is the failure being tested
+ * for -- and on this target the alternative failure is a HardFault, which
+ * reports nothing at all.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <mqueue.h>
+#include <pthread.h>
+#include <sched.h>
+#include <signal.h>
+#include <spawn.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define FAIL_QSORT    0x01
+#define FAIL_PTHREAD  0x02
+#define FAIL_SIGNAL   0x04
+#define FAIL_TASK     0x08
+#define FAIL_ONCE     0x10
+#define FAIL_SPAWN    0x20
+#define FAIL_SCANDIR  0x40
+#define FAIL_SIGACTION 0x80
+
+/* The mq checks run under "callback mq" and report in their own byte, so the
+ * exit status -- only eight bits survive waitpid -- never has to hold more
+ * than eight flags at once.
+ */
+
+#define FAIL_MQ_THREAD    0x01
+#define FAIL_MQ_SIGNAL    0x02
+#define FAIL_TIMER_THREAD 0x04
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* Written by the callbacks, read by main.  These live in the module's
+ * writable segment, which is what the callback can only reach if it was
+ * entered with this module's data base in the FDPIC register.
+ */
+
+static volatile int g_qsort_calls;
+static volatile int g_thread_ran;
+static volatile int g_signal_ran;
+static volatile int g_task_ran;
+static volatile int g_once_ran;
+static volatile int g_spawn_ran;
+static volatile int g_filter_calls;
+static volatile int g_compar_calls;
+static volatile int g_sigaction_ran;
+static volatile int g_mq_signal_ran;
+static volatile int g_mq_thread_ran;
+static volatile int g_timer_thread_ran;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int cmp_int(const void *a, const void *b)
+{
+  g_qsort_calls++;
+  return *(const int *)a - *(const int *)b;
+}
+
+static void *thread_main(void *arg)
+{
+  g_thread_ran = (int)(intptr_t)arg;
+  return NULL;
+}
+
+static void sig_handler(int signo)
+{
+  g_signal_ran = signo;
+}
+
+static void sigaction_handler(int signo, siginfo_t *info, void *context)
+{
+  g_sigaction_ran = signo;
+}
+
+static void mq_signal_handler(int signo, siginfo_t *info, void *context)
+{
+  g_mq_signal_ran = signo;
+}
+
+static void mq_thread_notify(union sigval value)
+{
+  /* Runs on a work-queue worker, which carries no module data base of its
+   * own.  Writing this module global proves the base was installed around
+   * the call -- without it this store would fault or land nowhere.
+   */
+
+  g_mq_thread_ran = value.sival_int;
+}
+
+static void timer_thread_notify(union sigval value)
+{
+  g_timer_thread_ran = value.sival_int;
+}
+
+static int task_main(int argc, char *argv[])
+{
+  g_task_ran = 1;
+  return 0;
+}
+
+static void once_routine(void)
+{
+  g_once_ran++;
+}
+
+static int spawn_main(int argc, char *argv[])
+{
+  g_spawn_ran = 1;
+  return 0;
+}
+
+static int dir_filter(const struct dirent *entry)
+{
+  g_filter_calls++;
+  return 1;
+}
+
+static int dir_compar(const struct dirent **a, const struct dirent **b)
+{
+  g_compar_calls++;
+  return strcmp((*a)->d_name, (*b)->d_name);
+}
+
+/* The message-queue checks run as a second invocation, "callback mq", so
+ * their two flags report in a byte of their own rather than overflowing the
+ * eight-bit exit status the other checks already fill.
+ */
+
+static int run_mq(void)
+{
+  struct mq_attr attr;
+  struct sigaction sa;
+  struct sigevent ev;
+  struct itimerspec its;
+  timer_t timer;
+  mqd_t mqd;
+  int fails = 0;
+  int i;
+
+  attr.mq_maxmsg = 1;
+  attr.mq_msgsize = 1;
+  attr.mq_flags = 0;
+
+  mqd = mq_open("/cbmq", O_CREAT | O_RDWR, 0644, &attr);
+  if (mqd == (mqd_t)-1)
+    {
+      return FAIL_MQ_THREAD | FAIL_MQ_SIGNAL | FAIL_TIMER_THREAD;
+    }
+
+  /* mq_notify with SIGEV_THREAD.  The callback runs on a work-queue worker
+   * that carries no module data base of its own; the base captured at
+   * registration is installed around the call, so the callback reaches this
+   * module's globals.  A distinctive sival marks that the right callback
+   * ran with the right argument.
+   */
+
+  memset(&ev, 0, sizeof(ev));
+  ev.sigev_notify = SIGEV_THREAD;
+  ev.sigev_notify_function = mq_thread_notify;
+  ev.sigev_value.sival_int = 0x5a;
+
+  if (mq_notify(mqd, &ev) < 0)
+    {
+      fails |= FAIL_MQ_THREAD;
+    }
+  else
+    {
+      char buf[1];
+
+      /* The notification fires on a send to an empty queue; drain the
+       * message afterwards so the queue is empty for the next test and the
+       * next send does not block on a full queue.
+       */
+
+      mq_send(mqd, "x", 1, 0);
+
+      for (i = 0; i < 50 && g_mq_thread_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      mq_receive(mqd, buf, sizeof(buf), NULL);
+
+      if (g_mq_thread_ran != 0x5a)
+        {
+          fails |= FAIL_MQ_THREAD;
+        }
+    }
+
+  /* mq_notify with SIGEV_SIGNAL, delivered to this task and caught by a
+   * handler installed through sigaction.
+   */
+
+  memset(&sa, 0, sizeof(sa));
+  sa.sa_sigaction = mq_signal_handler;
+  sa.sa_flags = SA_SIGINFO;
+  sigaction(SIGUSR1, &sa, NULL);
+
+  memset(&ev, 0, sizeof(ev));
+  ev.sigev_notify = SIGEV_SIGNAL;
+  ev.sigev_signo = SIGUSR1;
+
+  if (mq_notify(mqd, &ev) < 0)
+    {
+      fails |= FAIL_MQ_SIGNAL;
+    }
+  else
+    {
+      char buf[1];
+
+      mq_send(mqd, "x", 1, 0);
+
+      for (i = 0; i < 50 && g_mq_signal_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      mq_receive(mqd, buf, sizeof(buf), NULL);
+
+      if (g_mq_signal_ran != SIGUSR1)
+        {
+          fails |= FAIL_MQ_SIGNAL;
+        }
+    }
+
+  mq_close(mqd);
+  mq_unlink("/cbmq");
+
+  /* timer_create with SIGEV_THREAD reaches the module the same way: the
+   * expiry callback runs on the worker with the module's base installed.
+   */
+
+  memset(&ev, 0, sizeof(ev));
+  ev.sigev_notify = SIGEV_THREAD;
+  ev.sigev_notify_function = timer_thread_notify;
+  ev.sigev_value.sival_int = 0xa5;
+
+  if (timer_create(CLOCK_MONOTONIC, &ev, &timer) < 0)
+    {
+      fails |= FAIL_TIMER_THREAD;
+    }
+  else
+    {
+      its.it_value.tv_sec = 0;
+      its.it_value.tv_nsec = 20 * 1000 * 1000;
+      its.it_interval.tv_sec = 0;
+      its.it_interval.tv_nsec = 0;
+      timer_settime(timer, 0, &its, NULL);
+
+      for (i = 0; i < 50 && g_timer_thread_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      if (g_timer_thread_ran != 0xa5)
+        {
+          fails |= FAIL_TIMER_THREAD;
+        }
+
+      timer_delete(timer);
+    }
+
+  syslog(LOG_INFO,
+         "[callback] mq_thread=%#x mq_signal=%d timer_thread=%#x -- %s\n",
+         g_mq_thread_ran, g_mq_signal_ran, g_timer_thread_ran,
+         fails == 0 ? "PASS" : "FAIL");
+
+  return fails;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  int v[5] =
+  {
+    5, 3, 1, 4, 2
+  };
+
+  struct dirent **namelist;
+  pthread_once_t once = PTHREAD_ONCE_INIT;
+  struct sigaction sa;
+  pthread_t tid;
+  int fails = 0;
+  int n;
+  int i;
+
+  if (argc > 1 && strcmp(argv[1], "mq") == 0)
+    {
+      return run_mq();
+    }
+
+  /* qsort -- the path that always worked */
+
+  qsort(v, 5, sizeof(int), cmp_int);
+  if (g_qsort_calls == 0 || v[0] != 1 || v[4] != 5)
+    {
+      fails |= FAIL_QSORT;
+    }
+
+  /* pthread_create.  The thread inherits this module's D-Space, so it can
+   * reach g_thread_ran only if it was entered at the right address.
+   */
+
+  if (pthread_create(&tid, NULL, thread_main, (void *)(intptr_t)7) != 0)
+    {
+      fails |= FAIL_PTHREAD;
+    }
+  else
+    {
+      pthread_join(tid, NULL);
+      if (g_thread_ran != 7)
+        {
+          fails |= FAIL_PTHREAD;
+        }
+    }
+
+  /* signal, delivered to this task */
+
+  if (signal(SIGUSR1, sig_handler) == SIG_ERR)
+    {
+      fails |= FAIL_SIGNAL;
+    }
+  else
+    {
+      /* raise() rather than kill(getpid(), ...): getpid is not in the
+       * firmware's export list, and raise targets the calling thread, which
+       * is exactly what this is checking.
+       */
+
+      raise(SIGUSR1);
+
+      for (i = 0; i < 50 && g_signal_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      if (g_signal_ran != SIGUSR1)
+        {
+          fails |= FAIL_SIGNAL;
+        }
+    }
+
+  /* task_create.  A separate task, but the same D-Space. */
+
+  if (task_create("cbtask", SCHED_PRIORITY_DEFAULT, 2048, task_main,
+                  NULL) < 0)
+    {
+      fails |= FAIL_TASK;
+    }
+  else
+    {
+      for (i = 0; i < 50 && g_task_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      if (g_task_ran == 0)
+        {
+          fails |= FAIL_TASK;
+        }
+    }
+
+  /* sigaction, delivered to this task.  signal() above resolves the handler
+   * before calling sigaction; this reaches sigaction directly, which is the
+   * path signal() does not cover.
+   */
+
+  memset(&sa, 0, sizeof(sa));
+  sa.sa_sigaction = sigaction_handler;
+  sa.sa_flags = SA_SIGINFO;
+
+  if (sigaction(SIGUSR2, &sa, NULL) < 0)
+    {
+      fails |= FAIL_SIGACTION;
+    }
+  else
+    {
+      raise(SIGUSR2);
+
+      for (i = 0; i < 50 && g_sigaction_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      if (g_sigaction_ran != SIGUSR2)
+        {
+          fails |= FAIL_SIGACTION;
+        }
+    }
+
+  /* pthread_once.  Runs on this thread, so only the code address matters. */
+
+  if (pthread_once(&once, once_routine) != 0 || g_once_ran != 1)
+    {
+      fails |= FAIL_ONCE;
+    }
+
+  /* task_spawn.  Like task_create, a separate task with the same D-Space. */
+
+  if (task_spawn("cbspawn", spawn_main, NULL, NULL, NULL, NULL) < 0)
+    {
+      fails |= FAIL_SPAWN;
+    }
+  else
+    {
+      for (i = 0; i < 50 && g_spawn_ran == 0; i++)
+        {
+          usleep(10000);
+        }
+
+      if (g_spawn_ran == 0)
+        {
+          fails |= FAIL_SPAWN;
+        }
+    }
+
+  /* scandir takes two callbacks that reach the module by different routes:
+   * the filter is called by scandir itself, while the comparison function is
+   * handed to qsort.  Passing both at once is the point -- it is what would
+   * catch the comparison function being resolved twice.
+   */
+
+  namelist = NULL;
+  n = scandir("/mnt/xipfs", &namelist, dir_filter, dir_compar);
+  if (n < 0 || g_filter_calls == 0)
+    {
+      fails |= FAIL_SCANDIR;
+    }
+
+  if (namelist != NULL)
+    {
+      while (n-- > 0)
+        {
+          free(namelist[n]);
+        }
+
+      free(namelist);
+    }
+
+  syslog(LOG_INFO,
+         "[callback] qsort=%d pthread=%d signal=%d task=%d sigaction=%d "
+         "once=%d spawn=%d filter=%d compar=%d -- %s\n",
+         g_qsort_calls, g_thread_ran, g_signal_ran, g_task_ran,
+         g_sigaction_ran, g_once_ran, g_spawn_ran, g_filter_calls,
+         g_compar_calls, fails == 0 ? "PASS" : "FAIL");
+
+  return fails;
+}
diff --git a/examples/fdpicxip/modules/cxxuser.cpp b/examples/fdpicxip/modules/cxxuser.cpp
new file mode 100644
index 000000000..5c27cf575
--- /dev/null
+++ b/examples/fdpicxip/modules/cxxuser.cpp
@@ -0,0 +1,210 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/cxxuser.cpp
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* A C++ module using a C++ shared library.
+ *
+ * Two instances of this run at once in the demo.  Between them they show
+ * the three things that have to hold:
+ *
+ *   - constructors ran, in both objects.  Neither magic can be right by
+ *     accident: an unconstructed global is zero.
+ *   - the library's constructors ran before this module's, which is the
+ *     ordering DT_NEEDED implies and the loader has to honour.
+ *   - the library's data is private per instance.  One copy of its code
+ *     sits in flash; the totals do not interleave.
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <unistd.h>
+
+extern "C"
+{
+  int  shape_add(int by);
+  int  shape_total(void);
+  bool shape_constructed(void);
+  void shape_marker(const char *path);
+}
+
+#define USER_MAGIC 0x0c1a55
+
+class Instance
+{
+public:
+  Instance() : m_magic(USER_MAGIC), m_libwasready(shape_constructed())
+  {
+  }
+
+  bool constructed() const
+  {
+    return m_magic == USER_MAGIC;
+  }
+
+  /* Whether the library was already constructed when this object's own
+   * constructor ran.  Sampling it here is the only way to observe the
+   * ordering: by the time main() runs, both have been constructed either
+   * way.
+   */
+
+  bool libwasready() const
+  {
+    return m_libwasready;
+  }
+
+private:
+  int  m_magic;
+  bool m_libwasready;
+};
+
+static Instance g_self;
+
+/* Exit status is a bitmask of what failed, so one run reports on all four
+ * properties independently.  Kept in step with the reader in
+ * apps/testing/fs/xipfs/.
+ */
+
+#define USER_FAIL_OWN_CTOR  0x01
+#define USER_FAIL_LIB_CTOR  0x02
+#define USER_FAIL_ORDER     0x04
+#define USER_FAIL_PRIVATE   0x08
+
+/****************************************************************************
+ * Name: record
+ *
+ * Description:
+ *   Write a number to a file, for a caller that cannot rely on this task's
+ *   exit status.
+ *
+ *   It cannot, in general.  waitpid() only retains the status of a child
+ *   that has already exited when CONFIG_SCHED_CHILD_STATUS is set, and that
+ *   depends on CONFIG_SCHED_HAVE_PARENT.  With two instances running for
+ *   the same length of time, the second has always exited by the time the
+ *   first waitpid() returns, so its status is simply gone.  A file survives
+ *   the task, and survives the module being unloaded.
+ *
+ ****************************************************************************/
+
+static void record(const char *path, int value)
+{
+  char text[16];
+  int  len;
+  int  fd;
+
+  if (path == NULL)
+    {
+      return;
+    }
+
+  len = snprintf(text, sizeof(text), "%d", value);
+
+  fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+  if (fd < 0)
+    {
+      syslog(LOG_INFO, "[user] cannot record to %s\n", path);
+      return;
+    }
+
+  /* xipfs wants the size declared up front so it can reserve one
+   * contiguous extent.
+   */
+
+  if (ftruncate(fd, len) >= 0)
+    {
+      write(fd, text, len);
+    }
+
+  close(fd);
+}
+
+extern "C" int main(int argc, char *argv[])
+{
+  int seed = (argc > 1) ? atoi(argv[1]) : 1;
+  int fails = 0;
+  int i;
+
+  /* Optional second argument: a path for the library's destructor to record
+   * its final total in.  A destructor runs at unload, after this task is
+   * gone, so leaving a file behind is the only way a test can observe that
+   * it ran at all.  The demo omits it and reads the log instead.
+   */
+
+  if (argc > 2)
+    {
+      shape_marker(argv[2]);
+    }
+
+  syslog(LOG_INFO, "[user %d] own ctor ran: %s, library ctor ran: %s, "
+         "library first: %s\n",
+         seed,
+         g_self.constructed()    ? "yes" : "NO",
+         shape_constructed()     ? "yes" : "NO",
+         g_self.libwasready()    ? "yes" : "NO");
+
+  /* Every check runs and contributes a bit, rather than the first failure
+   * returning early.  A caller that reports these individually can then say
+   * which property broke instead of just that something did -- and none of
+   * its assertions pass merely because an earlier one stopped the run.
+   */
+
+  if (!g_self.constructed())
+    {
+      fails |= USER_FAIL_OWN_CTOR;
+    }
+
+  if (!shape_constructed())
+    {
+      fails |= USER_FAIL_LIB_CTOR;
+    }
+
+  if (!g_self.libwasready())
+    {
+      fails |= USER_FAIL_ORDER;
+    }
+
+  for (i = 0; i < 3; i++)
+    {
+      shape_add(seed);
+      usleep(100000);
+    }
+
+  if (shape_total() != seed * 3)
+    {
+      fails |= USER_FAIL_PRIVATE;
+    }
+
+  syslog(LOG_INFO, "[user %d] library total = %d (expected %d) -- %s\n",
+         seed, shape_total(), seed * 3,
+         fails == 0 ? "PASS" : "FAIL");
+
+  /* Optional third argument: where to record the bitmask, for a caller that
+   * cannot rely on the exit status surviving.  See record() above.
+   */
+
+  if (argc > 3)
+    {
+      record(argv[3], fails);
+    }
+
+  return fails;
+}
diff --git a/examples/fdpicxip/modules/funcdesc.c b/examples/fdpicxip/modules/funcdesc.c
new file mode 100644
index 000000000..850715474
--- /dev/null
+++ b/examples/fdpicxip/modules/funcdesc.c
@@ -0,0 +1,156 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/funcdesc.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Exercises R_ARM_FUNCDESC -- the relocation that asks the loader to
+ * manufacture a function descriptor and hand back its address.
+ *
+ * It is emitted for an *address-taken imported* function, which is a
+ * different thing from a called one.  A call gets a PLT entry and an
+ * R_ARM_FUNCDESC_VALUE relocation on a descriptor the linker already laid
+ * out; taking the address instead needs a pointer to a descriptor that does
+ * not exist yet, so the loader carves one out of the pool it reserves
+ * behind the writable segment.  No other module here emits one, which is
+ * why this exists.
+ *
+ * Every pointer here is called *through*, not merely printed: a descriptor
+ * with the wrong entry or the wrong GOT half only shows up when it is
+ * branched through.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef int   (*atoifn)(const char *);
+typedef void *(*memcpyfn)(void *, const void *, size_t);
+typedef int   (*strcmpfn)(const char *, const char *);
+typedef void  (*qsortfn)(void *, size_t, size_t,
+                         int (*)(const void *, const void *));
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* volatile is load bearing, and the reason is worth knowing before anyone
+ * tidies it away.
+ *
+ * Without it these are static pointers that are never written, so GCC
+ * constant-propagates them, turns every indirect call back into a direct
+ * one, and deletes the variables.  The descriptor address then never has to
+ * materialise, the linker emits R_ARM_FUNCDESC_VALUE for the direct calls
+ * instead, and not one R_ARM_FUNCDESC survives -- the module still builds,
+ * still runs, still passes, and tests nothing it claims to.
+ *
+ * volatile forces each pointer to be loaded from memory at the point of
+ * call, which is what makes the slot genuinely hold the address of a
+ * descriptor the loader has to supply.
+ */
+
+static atoifn   volatile g_atoi   = atoi;
+static memcpyfn volatile g_memcpy = memcpy;
+static strcmpfn volatile g_strcmp = strcmp;
+static qsortfn  volatile g_qsort  = qsort;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* A local function's address is R_ARM_FUNCDESC_VALUE, not FUNCDESC -- the
+ * linker can lay that descriptor out itself.  Kept here so the module
+ * exercises both kinds side by side.
+ */
+
+static int cmp_int(const void *a, const void *b)
+{
+  return *(const int *)a - *(const int *)b;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  int  v[5] =
+  {
+    5, 3, 1, 4, 2
+  };
+
+  int  copy[5];
+  char buf[8];
+  int  seed;
+  int  fails = 0;
+  int  i;
+
+  seed = g_atoi((argc > 1) ? argv[1] : "7");
+  if (seed != 7 && seed != 1 && seed != 2)
+    {
+      syslog(LOG_INFO, "[funcdesc] FAIL atoi through a descriptor: %d\n",
+             seed);
+      fails++;
+    }
+
+  g_memcpy(copy, v, sizeof(v));
+  for (i = 0; i < 5; i++)
+    {
+      if (copy[i] != v[i])
+        {
+          syslog(LOG_INFO, "[funcdesc] FAIL memcpy through a descriptor\n");
+          fails++;
+          break;
+        }
+    }
+
+  g_memcpy(buf, "abcdef", 7);
+  if (g_strcmp(buf, "abcdef") != 0)
+    {
+      syslog(LOG_INFO, "[funcdesc] FAIL strcmp through a descriptor\n");
+      fails++;
+    }
+
+  /* A manufactured descriptor for qsort, called with a descriptor for a
+   * function of our own -- so the firmware calls back into module code
+   * that has to arrive with this module's data base in the FDPIC register.
+   */
+
+  g_qsort(copy, 5, sizeof(int), cmp_int);
+  for (i = 0; i < 5; i++)
+    {
+      if (copy[i] != i + 1)
+        {
+          syslog(LOG_INFO, "[funcdesc] FAIL qsort through a descriptor\n");
+          fails++;
+          break;
+        }
+    }
+
+  syslog(LOG_INFO, "[funcdesc] seed %d, %d failures\n", seed, fails);
+  return fails == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/fdpicxip/modules/lazymod.c b/examples/fdpicxip/modules/lazymod.c
new file mode 100644
index 000000000..40a21d6fc
--- /dev/null
+++ b/examples/fdpicxip/modules/lazymod.c
@@ -0,0 +1,45 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/lazymod.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Linked without -z now (BINDNOW= in the makefile), so its imported function
+ * descriptors land in DT_JMPREL instead of DT_REL.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <syslog.h>
+#include <stdlib.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  int seed = (argc > 1) ? atoi(argv[1]) : 1;
+
+  syslog(LOG_INFO, "[lazymod] called through a DT_JMPREL descriptor, "
+         "seed %d\n", seed);
+  return 0;
+}
diff --git a/examples/fdpicxip/modules/libcounter.c b/examples/fdpicxip/modules/libcounter.c
new file mode 100644
index 000000000..7d4c16677
--- /dev/null
+++ b/examples/fdpicxip/modules/libcounter.c
@@ -0,0 +1,58 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/libcounter.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* A shared library with its own state.
+ *
+ * g_calls is the interesting part: it lives in the library's writable
+ * segment, and each task that loads the library gets a private copy.  The
+ * library's code, meanwhile, is mapped once and executed in place.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <syslog.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_calls;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int counter_bump(int by);
+int counter_total(void);
+
+int counter_bump(int by)
+{
+  g_calls += by;
+  return g_calls;
+}
+
+int counter_total(void)
+{
+  return g_calls;
+}
diff --git a/examples/fdpicxip/modules/libshape.cpp b/examples/fdpicxip/modules/libshape.cpp
new file mode 100644
index 000000000..1cab840ef
--- /dev/null
+++ b/examples/fdpicxip/modules/libshape.cpp
@@ -0,0 +1,160 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/libshape.cpp
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* A C++ shared library, executed in place out of flash.
+ *
+ * The point of this file is g_registry.  It is a global object with a real
+ * constructor, and the constructor is the only thing that ever writes
+ * m_magic.  If the loader does not walk DT_INIT_ARRAY, the object simply
+ * stays in .bss and every field reads back zero -- the library still loads,
+ * still links, and still runs, and quietly answers wrong.  That is why the
+ * demo checks for a magic rather than just printing a total: the failure
+ * this is here to catch does not announce itself.
+ *
+ * m_total is the second half: it lives in the library's writable segment,
+ * which is copied once per running instance, so two tasks sharing this
+ * library's flash-resident code still count independently.
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#define SHAPE_MAGIC 0x5ba9e0
+
+class Registry
+{
+public:
+  Registry() : m_magic(SHAPE_MAGIC), m_total(0), m_adds(0)
+  {
+    m_marker[0] = '\0';
+    syslog(LOG_INFO, "  [libshape] Registry() ran\n");
+  }
+
+  /* Runs last of the two objects, because destruction mirrors construction
+   * and this library was constructed first.  So a marker written here is
+   * evidence that the whole DT_FINI_ARRAY chain ran, not just the module's
+   * half -- which is why the marker is written from the library rather than
+   * from the module that knows the path.
+   */
+
+  ~Registry()
+  {
+    syslog(LOG_INFO, "  [libshape] ~Registry() ran after %d adds\n", m_adds);
+
+    if (m_marker[0] != '\0')
+      {
+        char text[16];
+        int  len;
+        int  fd;
+
+        len = snprintf(text, sizeof(text), "%d", m_total);
+
+        fd = open(m_marker, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+        if (fd >= 0)
+          {
+            /* xipfs wants the size declared up front so it can reserve one
+             * contiguous extent.
+             */
+
+            if (ftruncate(fd, len) >= 0)
+              {
+                write(fd, text, len);
+              }
+
+            close(fd);
+          }
+        else
+          {
+            syslog(LOG_INFO, "  [libshape] marker %s failed\n", m_marker);
+          }
+      }
+  }
+
+  /* Where ~Registry() should record its final total.  Optional: the demo
+   * does not set one and simply logs instead.
+   */
+
+  void marker(const char *path)
+  {
+    strlcpy(m_marker, path, sizeof(m_marker));
+  }
+
+  bool constructed() const
+  {
+    return m_magic == SHAPE_MAGIC;
+  }
+
+  int add(int by)
+  {
+    m_adds++;
+    m_total += by;
+    return m_total;
+  }
+
+  int total() const
+  {
+    return m_total;
+  }
+
+private:
+  int  m_magic;
+  int  m_total;
+  int  m_adds;
+  char m_marker[64];
+};
+
+static Registry g_registry;
+
+/* C linkage, because the module imports these by name and the loader
+ * matches dynamic symbols as plain strings.
+ */
+
+extern "C"
+{
+  int  shape_add(int by);
+  int  shape_total(void);
+  bool shape_constructed(void);
+  void shape_marker(const char *path);
+}
+
+int shape_add(int by)
+{
+  return g_registry.add(by);
+}
+
+void shape_marker(const char *path)
+{
+  g_registry.marker(path);
+}
+
+int shape_total(void)
+{
+  return g_registry.total();
+}
+
+bool shape_constructed(void)
+{
+  return g_registry.constructed();
+}
diff --git a/examples/fdpicxip/modules/missingsym.c b/examples/fdpicxip/modules/missingsym.c
new file mode 100644
index 000000000..184675dde
--- /dev/null
+++ b/examples/fdpicxip/modules/missingsym.c
@@ -0,0 +1,40 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/missingsym.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* A module that imports a firmware symbol which does not exist.  It links
+ * cleanly -- the symbol simply becomes an undefined import resolved at load
+ * -- so the loader is the only thing that can catch it, when resolution
+ * fails rather than at link time.  This is why the build runs fdpic-verify
+ * by default; this module is the one that deliberately does not pass it, so
+ * it is linked without that check.
+ */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+extern int __xipfs_test_nonexistent(int value);
+
+int main(int argc, char *argv[])
+{
+  return __xipfs_test_nonexistent(argc);
+}
diff --git a/examples/fdpicxip/modules/qsorter.c b/examples/fdpicxip/modules/qsorter.c
new file mode 100644
index 000000000..3dead3f03
--- /dev/null
+++ b/examples/fdpicxip/modules/qsorter.c
@@ -0,0 +1,89 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/qsorter.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Demonstrates the two things worth knowing about NuttX FDPIC modules.
+ *
+ * 1. qsort() runs in the firmware and calls back into compare(), which
+ *    lives here.  That works because the firmware reserves the FDPIC
+ *    register, so this module's data base survives the call in, and
+ *    because libc resolves the callback descriptor on the way back out.
+ *
+ * 2. g_data is module data.  Every running instance gets a private copy,
+ *    while the code itself is shared and executed in place from flash.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <syslog.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define N 8
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static int g_data[N];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static int compare(const void *a, const void *b)
+{
+  return *(const int *)a - *(const int *)b;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  int seed = (argc > 1) ? atoi(argv[1]) : 0;
+  int i;
+
+  for (i = 0; i < N; i++)
+    {
+      g_data[i] = (N - i) * 10 + seed;
+    }
+
+  /* Overlap with any other instance, so shared data would show up as
+   * corruption rather than passing by luck.
+   */
+
+  usleep(300000);
+
+  qsort(g_data, N, sizeof(int), compare);
+
+  syslog(LOG_INFO, "[inst %d] %d %d %d %d %d %d %d %d\n", seed,
+         g_data[0], g_data[1], g_data[2], g_data[3],
+         g_data[4], g_data[5], g_data[6], g_data[7]);
+  return 0;
+}
diff --git a/examples/fdpicxip/modules/user.c b/examples/fdpicxip/modules/user.c
new file mode 100644
index 000000000..bd82dbf31
--- /dev/null
+++ b/examples/fdpicxip/modules/user.c
@@ -0,0 +1,68 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/modules/user.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Uses libcounter.so.  Two instances run concurrently: if the library's
+ * data were shared between them the totals would interleave.
+ *
+ * libcounter is also a *leaf* library -- it calls nothing outside itself,
+ * so it has no PLT and therefore no DT_PLTGOT.  The loader has to fall back
+ * to PT_DYNAMIC vaddr + memsz to find its GOT.  If that fallback is wrong
+ * the library cannot reach its own globals, which is exactly what the total
+ * below would expose.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdlib.h>
+#include <syslog.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+extern int counter_bump(int by);
+extern int counter_total(void);
+
+int main(int argc, char *argv[])
+{
+  int seed = (argc > 1) ? atoi(argv[1]) : 0;
+  int i;
+
+  for (i = 0; i < 3; i++)
+    {
+      counter_bump(seed);
+      usleep(100000);
+    }
+
+  syslog(LOG_INFO, "[user %d] library total = %d (expected %d) -- %s\n",
+         seed, counter_total(), seed * 3,
+         counter_total() == seed * 3 ? "PASS" : "FAIL");
+
+  /* Reported through the exit status as well as the log, so a test can
+   * assert on it rather than a human reading the console.
+   */
+
+  return counter_total() == seed * 3 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/fdpicxip/qsorter_bin.h b/examples/fdpicxip/qsorter_bin.h
new file mode 100644
index 000000000..6e1f39c00
--- /dev/null
+++ b/examples/fdpicxip/qsorter_bin.h
@@ -0,0 +1,268 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/qsorter_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from qsorter.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_qsorter_nxf[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xa1, 0x02, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x11, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00,
+  0x58, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00, 0x58, 0x13, 0x00, 0x00,
+  0x58, 0x13, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x58, 0x03, 0x00, 0x00, 0x58, 0x13, 0x00, 0x00, 0x58, 0x13, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x50, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x14, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xa1, 0x02, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x1f, 0x00, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x75,
+  0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x71, 0x73, 0x6f, 0x72, 0x74, 0x00,
+  0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00,
+  0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e,
+  0x44, 0x5f, 0x5f, 0x00, 0x14, 0x14, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xec, 0x13, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0xf4, 0x13, 0x00, 0x00,
+  0xa4, 0x08, 0x00, 0x00, 0xfc, 0x13, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00,
+  0x04, 0x14, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0x0c, 0x14, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x1c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00,
+  0x70, 0xb5, 0x01, 0x28, 0x4e, 0x46, 0x88, 0xb0, 0x34, 0xdd, 0x48, 0x68,
+  0xff, 0xf7, 0xee, 0xff, 0xb1, 0x46, 0x1a, 0x4b, 0x00, 0xf1, 0x50, 0x05,
+  0x59, 0xf8, 0x03, 0x30, 0x43, 0xf8, 0x04, 0x5b, 0x0a, 0x3d, 0x85, 0x42,
+  0xfa, 0xd1, 0x14, 0x48, 0xff, 0xf7, 0xc2, 0xff, 0xb1, 0x46, 0x13, 0x4b,
+  0x04, 0x22, 0x59, 0xf8, 0x03, 0x40, 0x12, 0x4b, 0x20, 0x46, 0x4b, 0x44,
+  0x08, 0x21, 0xff, 0xf7, 0xc1, 0xff, 0xe3, 0x69, 0x0f, 0x49, 0x06, 0x93,
+  0xa3, 0x69, 0xb1, 0x46, 0x05, 0x93, 0x63, 0x69, 0x2a, 0x46, 0x04, 0x93,
+  0x23, 0x69, 0x06, 0x20, 0x03, 0x93, 0xe3, 0x68, 0x79, 0x44, 0x02, 0x93,
+  0xa3, 0x68, 0x01, 0x93, 0x63, 0x68, 0x00, 0x93, 0x23, 0x68, 0xff, 0xf7,
+  0xb5, 0xff, 0x00, 0x20, 0x08, 0xb0, 0x70, 0xbd, 0x00, 0x20, 0xcc, 0xe7,
+  0xe0, 0x93, 0x04, 0x00, 0x34, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x68, 0x0b, 0x68, 0xc0, 0x1a, 0x70, 0x47,
+  0x5b, 0x69, 0x6e, 0x73, 0x74, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x25, 0x64,
+  0x20, 0x25, 0x64, 0x20, 0x25, 0x64, 0x20, 0x25, 0x64, 0x20, 0x25, 0x64,
+  0x20, 0x25, 0x64, 0x20, 0x25, 0x64, 0x20, 0x25, 0x64, 0x0a, 0x00, 0x00,
+  0xe0, 0x13, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x00, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xe0, 0x13, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x13, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x18, 0x14, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72,
+  0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68,
+  0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c,
+  0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d,
+  0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e,
+  0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33,
+  0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00,
+  0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a,
+  0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03,
+  0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x50, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x58, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x13, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x0b, 0x00, 0x00, 0x00, 0x28, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x29, 0x03, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0xa0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x16, 0x00, 0x00, 0x00, 0x18, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x16, 0x00, 0x00, 0x00, 0x18, 0x14, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x19, 0x00, 0x00, 0x00,
+  0x18, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00,
+  0x23, 0x00, 0x00, 0x00, 0x18, 0x14, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x2a, 0x00, 0x00, 0x00,
+  0x58, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff,
+  0x33, 0x00, 0x00, 0x00, 0xe0, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0a, 0x00, 0x16, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x50, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x16, 0x00, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x64, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x16, 0x00, 0x00, 0x00,
+  0x74, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x78, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x16, 0x00, 0x00, 0x00, 0x88, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x8c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x16, 0x00, 0x00, 0x00, 0x9c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x56, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x66, 0x00, 0x00, 0x00, 0xa1, 0x02, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00, 0x6b, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x73, 0x6f,
+  0x72, 0x74, 0x65, 0x72, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x63, 0x6f,
+  0x6d, 0x70, 0x61, 0x72, 0x65, 0x00, 0x24, 0x64, 0x00, 0x2e, 0x4c, 0x41,
+  0x4e, 0x43, 0x48, 0x4f, 0x52, 0x30, 0x00, 0x67, 0x5f, 0x64, 0x61, 0x74,
+  0x61, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45,
+  0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00, 0x75, 0x73, 0x6c,
+  0x65, 0x65, 0x70, 0x00, 0x71, 0x73, 0x6f, 0x72, 0x74, 0x00, 0x5f, 0x5f,
+  0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f,
+  0x5f, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00,
+  0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00,
+  0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74,
+  0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74,
+  0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79,
+  0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72,
+  0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70,
+  0x6c, 0x74, 0x00, 0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f,
+  0x64, 0x61, 0x74, 0x61, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75,
+  0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e,
+  0x67, 0x6f, 0x74, 0x00, 0x2e, 0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f,
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61,
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x4c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+  0x00, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x50, 0x02, 0x00, 0x00,
+  0x50, 0x02, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x3f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0xa0, 0x02, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x32, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00,
+  0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x56, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x58, 0x13, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x5f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xe0, 0x13, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00,
+  0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x18, 0x14, 0x00, 0x00,
+  0x18, 0x04, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x69, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0x04, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x8c, 0x04, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
+  0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1c, 0x07, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00,
+  0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_qsorter_nxf_len = 2768;
diff --git a/examples/fdpicxip/user_bin.h b/examples/fdpicxip/user_bin.h
new file mode 100644
index 000000000..fd417418c
--- /dev/null
+++ b/examples/fdpicxip/user_bin.h
@@ -0,0 +1,265 @@
+/****************************************************************************
+ * apps/examples/fdpicxip/user_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from user.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_user[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd1, 0x02, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x2c, 0x08, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x10, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x94, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00,
+  0x94, 0x13, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x94, 0x03, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00,
+  0x90, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x6c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd1, 0x02, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x42, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x63,
+  0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x62, 0x75, 0x6d, 0x70, 0x00,
+  0x75, 0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+  0x65, 0x72, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x79, 0x73,
+  0x6c, 0x6f, 0x67, 0x00, 0x6c, 0x69, 0x62, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+  0x65, 0x72, 0x2e, 0x73, 0x6f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49,
+  0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f,
+  0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44,
+  0x5f, 0x5f, 0x00, 0x00, 0x30, 0x14, 0x00, 0x00, 0xa4, 0x06, 0x00, 0x00,
+  0x38, 0x14, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0x40, 0x14, 0x00, 0x00,
+  0xa4, 0x08, 0x00, 0x00, 0x48, 0x14, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00,
+  0x50, 0x14, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x14, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x2c, 0x00, 0x00, 0x00,
+  0xf0, 0xb5, 0x01, 0x28, 0x4c, 0x46, 0x85, 0xb0, 0x2f, 0xdd, 0x48, 0x68,
+  0xff, 0xf7, 0xee, 0xff, 0xa1, 0x46, 0x05, 0x46, 0x03, 0x26, 0x17, 0x4b,
+  0x03, 0x93, 0x28, 0x46, 0xff, 0xf7, 0xc8, 0xff, 0x03, 0x98, 0xa1, 0x46,
+  0xff, 0xf7, 0xba, 0xff, 0x01, 0x3e, 0xa1, 0x46, 0xf5, 0xd1, 0xff, 0xf7,
+  0xc9, 0xff, 0xa1, 0x46, 0x07, 0x46, 0xff, 0xf7, 0xc5, 0xff, 0x05, 0xeb,
+  0x45, 0x06, 0x86, 0x42, 0xa1, 0x46, 0x14, 0xd1, 0x0c, 0x4a, 0x7a, 0x44,
+  0x0c, 0x49, 0x3b, 0x46, 0xcd, 0xe9, 0x00, 0x62, 0x79, 0x44, 0x2a, 0x46,
+  0x06, 0x20, 0xff, 0xf7, 0xbf, 0xff, 0xa1, 0x46, 0xff, 0xf7, 0xb2, 0xff,
+  0x30, 0x1a, 0x18, 0xbf, 0x01, 0x20, 0x05, 0xb0, 0xf0, 0xbd, 0x00, 0x25,
+  0xd2, 0xe7, 0x04, 0x4a, 0x7a, 0x44, 0xe9, 0xe7, 0xa0, 0x86, 0x01, 0x00,
+  0x3a, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x50, 0x41, 0x53, 0x53, 0x00, 0x46, 0x41, 0x49, 0x4c, 0x00, 0x5b, 0x75,
+  0x73, 0x65, 0x72, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x6c, 0x69, 0x62, 0x72,
+  0x61, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x20, 0x3d, 0x20,
+  0x25, 0x64, 0x20, 0x28, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64,
+  0x20, 0x25, 0x64, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x25, 0x73, 0x0a, 0x00,
+  0x24, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xff, 0x6f,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a,
+  0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f,
+  0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32,
+  0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64,
+  0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29,
+  0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35,
+  0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65,
+  0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d,
+  0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01,
+  0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04,
+  0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x44, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x08, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x44, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x0e, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0xf1, 0xff, 0x17, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00, 0x94, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0xb8, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0xbc, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x5f, 0x00, 0x00, 0x00,
+  0xd1, 0x02, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x64, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x24,
+  0x64, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45,
+  0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00, 0x75, 0x73, 0x6c,
+  0x65, 0x65, 0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f,
+  0x62, 0x75, 0x6d, 0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72,
+  0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d,
+  0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x73, 0x79, 0x73,
+  0x6c, 0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x00, 0x2e, 0x73,
+  0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61,
+  0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00,
+  0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79,
+  0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72,
+  0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00,
+  0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74,
+  0x61, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e,
+  0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74,
+  0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41,
+  0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00,
+  0x44, 0x02, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x6c, 0x02, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00,
+  0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x90, 0x03, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00,
+  0x24, 0x04, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x64, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x58, 0x04, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x04, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xcc, 0x04, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x1e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x2c, 0x07, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x07, 0x00, 0x00,
+  0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_user_len = 2732;

From 20dc5e5167fa8f4b4d31ea4f1fdf2e3f40c99a09 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Thu, 30 Jul 2026 13:40:17 +0200
Subject: [PATCH 561/568] testing/fs/xipfs: Cover the FDPIC module loader.

Adds two sections to the xipfs suite, guarded by CONFIG_FDPIC so a build
without the loader is unaffected.  They belong here rather than in their own
test because what they exercise is modules loaded *out of the filesystem* --
the pin, the in-place mapping and the loader are one path.

'fdpic' asserts on the loader properties that otherwise fail *quietly*: a
loader that skips DT_INIT_ARRAY runs a C++ module happily with every global
left zero, one that skips DT_JMPREL loads a module that hard-faults only
once it calls out, and one that mis-sizes the descriptor pool corrupts the
heap.  None of those announce themselves.  The module exit status is the
channel -- each module checks its own invariants and reports a bitmask.  It
also covers shared libraries across concurrent instances, per-instance data,
the leaf-library GOT fallback, the R_ARM_FUNCDESC descriptor pool, and every
firmware entry point that has to resolve a module callback, including
mq_notify and timer_create with SIGEV_THREAD.

'reject' mutates a known-good module byte by byte and asserts the loader
refuses it rather than loading something broken: a missing import, and more
DT_NEEDED entries than the walk will follow.

The modules are embedded as headers, for the same reason as in
examples/fdpicxip, and built for cortex-m3 for the same reason: one set of
blobs then runs on both the v7-M and v8-M targets.  Their sources and the
makefile that regenerates these headers live in
apps/examples/fdpicxip/modules, so the copies the two apps carry are built
from the same sources in the same way.

Verified on a Pimoroni Pico Plus 2: fdpic 33/33, reject 7/7, and the whole
suite 130/130 with them included.  The same three numbers on mps2-an500 under
QEMU, which is a Cortex-M7 rather than the RP2350's Cortex-M33.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
---
 testing/fs/xipfs/Kconfig           |   9 +-
 testing/fs/xipfs/callback_bin.h    | 748 +++++++++++++++++++++++++++++
 testing/fs/xipfs/counteruser_bin.h | 265 ++++++++++
 testing/fs/xipfs/cxxuser_bin.h     | 400 +++++++++++++++
 testing/fs/xipfs/funcdesc_bin.h    | 304 ++++++++++++
 testing/fs/xipfs/lazymod_bin.h     | 220 +++++++++
 testing/fs/xipfs/libcounter_bin.h  | 208 ++++++++
 testing/fs/xipfs/libshape_bin.h    | 389 +++++++++++++++
 testing/fs/xipfs/manyneeded_bin.h  | 302 ++++++++++++
 testing/fs/xipfs/missingsym_bin.h  | 200 ++++++++
 testing/fs/xipfs/xipfs_main.c      | 714 +++++++++++++++++++++++++++
 11 files changed, 3758 insertions(+), 1 deletion(-)
 create mode 100644 testing/fs/xipfs/callback_bin.h
 create mode 100644 testing/fs/xipfs/counteruser_bin.h
 create mode 100644 testing/fs/xipfs/cxxuser_bin.h
 create mode 100644 testing/fs/xipfs/funcdesc_bin.h
 create mode 100644 testing/fs/xipfs/lazymod_bin.h
 create mode 100644 testing/fs/xipfs/libcounter_bin.h
 create mode 100644 testing/fs/xipfs/libshape_bin.h
 create mode 100644 testing/fs/xipfs/manyneeded_bin.h
 create mode 100644 testing/fs/xipfs/missingsym_bin.h

diff --git a/testing/fs/xipfs/Kconfig b/testing/fs/xipfs/Kconfig
index 8d4350d9a..bccc6c4bc 100644
--- a/testing/fs/xipfs/Kconfig
+++ b/testing/fs/xipfs/Kconfig
@@ -14,14 +14,21 @@ config TESTING_FS_XIPFS
 		of the metadata commit, and release of XIP pins when a task dies
 		without unmapping.
 
+		With CONFIG_FDPIC it also loads modules out of the filesystem and
+		checks the loader properties that otherwise fail silently: global
+		constructors running in dependency order, per-instance data, and
+		the relocation paths nothing else reaches.
+
 		Takes an optional section name to run just one part, since the
 		power loss sweeps take minutes and everything else takes seconds:
 
 		  xipfs_test          everything
 		  xipfs_test xip      just the execute-in-place mapping tests
+		  xipfs_test fdpic    just the module loading tests
 
 		Sections: basic writeonce strict xip multimap crosstask teardown
-		dirs defrag powerloss powertorn unlink dirloss defraglos
+		fdpic reject dirs defrag powerloss powertorn unlink dirloss
+		defraglos
 
 		The power loss sections need CONFIG_FS_XIPFS_FAULT_INJECT.
 
diff --git a/testing/fs/xipfs/callback_bin.h b/testing/fs/xipfs/callback_bin.h
new file mode 100644
index 000000000..a54d625ef
--- /dev/null
+++ b/testing/fs/xipfs/callback_bin.h
@@ -0,0 +1,748 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/callback_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from callback.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_callback[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xc9, 0x07, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xac, 0x1e, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x11, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0x0e, 0x00, 0x00,
+  0xac, 0x0e, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x00, 0x10, 0x00, 0x00, 0xbc, 0x01, 0x00, 0x00, 0xec, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
+  0x1f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00,
+  0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xa4, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xa8, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xbc, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x5d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xae, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xfd, 0x00, 0x00, 0x00, 0xac, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0xc9, 0x07, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0xec, 0x00, 0x00, 0x00, 0xa8, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xa1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x73, 0x74, 0x72, 0x63, 0x6d, 0x70, 0x00, 0x6d, 0x61, 0x69, 0x6e,
+  0x00, 0x6d, 0x71, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x00, 0x6d, 0x65, 0x6d,
+  0x73, 0x65, 0x74, 0x00, 0x6d, 0x71, 0x5f, 0x6e, 0x6f, 0x74, 0x69, 0x66,
+  0x79, 0x00, 0x6d, 0x71, 0x5f, 0x73, 0x65, 0x6e, 0x64, 0x00, 0x75, 0x73,
+  0x6c, 0x65, 0x65, 0x70, 0x00, 0x6d, 0x71, 0x5f, 0x72, 0x65, 0x63, 0x65,
+  0x69, 0x76, 0x65, 0x00, 0x73, 0x69, 0x67, 0x61, 0x63, 0x74, 0x69, 0x6f,
+  0x6e, 0x00, 0x6d, 0x71, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x6d,
+  0x71, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x00, 0x74, 0x69, 0x6d,
+  0x65, 0x72, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x73, 0x79,
+  0x73, 0x6c, 0x6f, 0x67, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x5f, 0x73,
+  0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x72,
+  0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x00, 0x71, 0x73, 0x6f, 0x72,
+  0x74, 0x00, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x72,
+  0x65, 0x61, 0x74, 0x65, 0x00, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64,
+  0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x00, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c,
+  0x00, 0x72, 0x61, 0x69, 0x73, 0x65, 0x00, 0x74, 0x61, 0x73, 0x6b, 0x5f,
+  0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x70, 0x74, 0x68, 0x72, 0x65,
+  0x61, 0x64, 0x5f, 0x6f, 0x6e, 0x63, 0x65, 0x00, 0x74, 0x61, 0x73, 0x6b,
+  0x5f, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x00, 0x73, 0x63, 0x61, 0x6e, 0x64,
+  0x69, 0x72, 0x00, 0x66, 0x72, 0x65, 0x65, 0x00, 0x5f, 0x5f, 0x52, 0x4f,
+  0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f,
+  0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45,
+  0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x11, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xb8, 0x11, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x94, 0x10, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0x9c, 0x10, 0x00, 0x00,
+  0xa4, 0x08, 0x00, 0x00, 0xa4, 0x10, 0x00, 0x00, 0xa4, 0x09, 0x00, 0x00,
+  0xac, 0x10, 0x00, 0x00, 0xa4, 0x0a, 0x00, 0x00, 0xb4, 0x10, 0x00, 0x00,
+  0xa4, 0x0b, 0x00, 0x00, 0xbc, 0x10, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00,
+  0xc4, 0x10, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0xcc, 0x10, 0x00, 0x00,
+  0xa4, 0x0e, 0x00, 0x00, 0xd4, 0x10, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x00,
+  0xdc, 0x10, 0x00, 0x00, 0xa4, 0x10, 0x00, 0x00, 0xe4, 0x10, 0x00, 0x00,
+  0xa4, 0x11, 0x00, 0x00, 0xec, 0x10, 0x00, 0x00, 0xa4, 0x12, 0x00, 0x00,
+  0xf4, 0x10, 0x00, 0x00, 0xa4, 0x13, 0x00, 0x00, 0xfc, 0x10, 0x00, 0x00,
+  0xa4, 0x14, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00, 0xa4, 0x15, 0x00, 0x00,
+  0x0c, 0x11, 0x00, 0x00, 0xa4, 0x17, 0x00, 0x00, 0x14, 0x11, 0x00, 0x00,
+  0xa4, 0x1a, 0x00, 0x00, 0x1c, 0x11, 0x00, 0x00, 0xa4, 0x1b, 0x00, 0x00,
+  0x24, 0x11, 0x00, 0x00, 0xa4, 0x1c, 0x00, 0x00, 0x2c, 0x11, 0x00, 0x00,
+  0xa4, 0x1d, 0x00, 0x00, 0x34, 0x11, 0x00, 0x00, 0xa4, 0x1e, 0x00, 0x00,
+  0x3c, 0x11, 0x00, 0x00, 0xa4, 0x1f, 0x00, 0x00, 0x44, 0x11, 0x00, 0x00,
+  0xa4, 0x20, 0x00, 0x00, 0x4c, 0x11, 0x00, 0x00, 0xa4, 0x21, 0x00, 0x00,
+  0x54, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, 0x5c, 0x11, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0x64, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00,
+  0x6c, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, 0x74, 0x11, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0x7c, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00,
+  0x84, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, 0x8c, 0x11, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0x94, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00,
+  0x9c, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, 0xa4, 0x11, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0xac, 0x11, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x2c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x34, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x44, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x4c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x54, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x5c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x64, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x6c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x74, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x7c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x84, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x8c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x94, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x9c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0xa4, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0xac, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0xb4, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0xbc, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0xc4, 0x00, 0x00, 0x00,
+  0x2d, 0xe9, 0xf0, 0x4d, 0xdf, 0xf8, 0x78, 0x34, 0xac, 0xb0, 0x59, 0xf8,
+  0x03, 0x50, 0x0e, 0xae, 0x2f, 0x46, 0x8c, 0x46, 0x01, 0x28, 0x0f, 0xcf,
+  0x0f, 0xc6, 0x3b, 0x68, 0x05, 0xf1, 0x14, 0x05, 0x33, 0x60, 0x1d, 0xae,
+  0x0f, 0xcd, 0x0f, 0xc6, 0x95, 0xe8, 0x07, 0x00, 0x4c, 0x46, 0x86, 0xe8,
+  0x07, 0x00, 0x40, 0xf3, 0x03, 0x81, 0xdf, 0xf8, 0x4c, 0x14, 0xdc, 0xf8,
+  0x04, 0x00, 0x79, 0x44, 0xff, 0xf7, 0x98, 0xff, 0xa1, 0x46, 0x07, 0x46,
+  0x00, 0x28, 0x40, 0xf0, 0xf7, 0x80, 0x01, 0x25, 0x0c, 0x90, 0xdf, 0xf8,
+  0x34, 0x04, 0x0a, 0xab, 0x4f, 0xf4, 0xd2, 0x72, 0x42, 0x21, 0x78, 0x44,
+  0xcd, 0xe9, 0x0a, 0x55, 0xff, 0xf7, 0xa4, 0xff, 0x43, 0x1c, 0xa1, 0x46,
+  0x06, 0x46, 0x00, 0xf0, 0xe3, 0x80, 0x10, 0x22, 0x39, 0x46, 0x19, 0xa8,
+  0xff, 0xf7, 0x68, 0xff, 0x02, 0x23, 0xa1, 0x46, 0x18, 0x93, 0xdf, 0xf8,
+  0x08, 0x34, 0x0d, 0xf1, 0x60, 0x08, 0x4b, 0x44, 0x1b, 0x93, 0x5a, 0x23,
+  0x41, 0x46, 0x30, 0x46, 0x1a, 0x93, 0xff, 0xf7, 0x95, 0xff, 0xb8, 0x42,
+  0xa1, 0x46, 0x22, 0xdb, 0xfb, 0x49, 0x2a, 0x46, 0x3b, 0x46, 0x30, 0x46,
+  0x79, 0x44, 0xff, 0xf7, 0xff, 0xfe, 0x32, 0x25, 0xa1, 0x46, 0xf8, 0x4b,
+  0x59, 0xf8, 0x03, 0x30, 0x5b, 0x69, 0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70,
+  0xff, 0xf7, 0xcc, 0xfe, 0x01, 0x3d, 0xa1, 0x46, 0xf3, 0xd1, 0x00, 0x23,
+  0x01, 0x22, 0x30, 0x46, 0x24, 0xa9, 0xff, 0xf7, 0xd7, 0xfe, 0xa1, 0x46,
+  0xee, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x5d, 0x69, 0x5a, 0x3d, 0x18, 0xbf,
+  0x01, 0x25, 0x10, 0x22, 0x00, 0x21, 0x14, 0xa8, 0xff, 0xf7, 0x2e, 0xff,
+  0xa1, 0x46, 0xe9, 0x4b, 0x00, 0x22, 0x4b, 0x44, 0x13, 0x93, 0x02, 0x23,
+  0x13, 0xa9, 0x0a, 0x20, 0x16, 0x93, 0xff, 0xf7, 0x19, 0xff, 0x00, 0x27,
+  0x0a, 0x23, 0x4f, 0xf0, 0x01, 0x0b, 0xa1, 0x46, 0x41, 0x46, 0x30, 0x46,
+  0xcd, 0xe9, 0x1a, 0x77, 0xcd, 0xe9, 0x18, 0xb3, 0x1c, 0x97, 0xff, 0xf7,
+  0x51, 0xff, 0xb8, 0x42, 0xa1, 0x46, 0x02, 0xda, 0x45, 0xf0, 0x02, 0x05,
+  0x21, 0xe0, 0xdb, 0x49, 0x3b, 0x46, 0x5a, 0x46, 0x30, 0x46, 0x79, 0x44,
+  0xff, 0xf7, 0xb8, 0xfe, 0x32, 0x27, 0xa1, 0x46, 0xd4, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0x1b, 0x69, 0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70, 0xff, 0xf7,
+  0x85, 0xfe, 0x01, 0x3f, 0xa1, 0x46, 0xf3, 0xd1, 0x00, 0x23, 0x01, 0x22,
+  0x30, 0x46, 0x24, 0xa9, 0xff, 0xf7, 0x90, 0xfe, 0xa1, 0x46, 0xcb, 0x4b,
+  0x59, 0xf8, 0x03, 0x30, 0x1b, 0x69, 0x0a, 0x2b, 0xda, 0xd1, 0x30, 0x46,
+  0xff, 0xf7, 0x68, 0xfe, 0xc9, 0x48, 0xa1, 0x46, 0x78, 0x44, 0xff, 0xf7,
+  0xc7, 0xfe, 0x10, 0x22, 0xa1, 0x46, 0x00, 0x21, 0x19, 0xa8, 0xff, 0xf7,
+  0xdf, 0xfe, 0x02, 0x23, 0xa1, 0x46, 0x18, 0x93, 0xc3, 0x4b, 0x41, 0x46,
+  0x4b, 0x44, 0x1b, 0x93, 0xa5, 0x23, 0x01, 0x20, 0x09, 0xaa, 0x1a, 0x93,
+  0xff, 0xf7, 0x46, 0xfe, 0x00, 0x28, 0xa1, 0x46, 0x16, 0xda, 0x45, 0xf0,
+  0x04, 0x05, 0xb8, 0x4b, 0x59, 0xf8, 0x03, 0x10, 0x4a, 0x69, 0x0b, 0x69,
+  0x88, 0x69, 0x00, 0x2d, 0x37, 0xd1, 0xb9, 0x49, 0x79, 0x44, 0xcd, 0xe9,
+  0x00, 0x01, 0xb8, 0x49, 0x06, 0x20, 0x79, 0x44, 0xff, 0xf7, 0xc6, 0xfe,
+  0x28, 0x46, 0x2c, 0xb0, 0xbd, 0xe8, 0xf0, 0x8d, 0x00, 0x22, 0x00, 0x23,
+  0xcd, 0xe9, 0x28, 0x23, 0xcd, 0xe9, 0x24, 0x23, 0x00, 0x23, 0xa4, 0x49,
+  0x09, 0x98, 0x2a, 0x91, 0x24, 0xaa, 0x19, 0x46, 0x26, 0x93, 0xff, 0xf7,
+  0xd1, 0xfe, 0x32, 0x26, 0xa1, 0x46, 0xa5, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x9b, 0x69, 0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70, 0xff, 0xf7, 0x26, 0xfe,
+  0x01, 0x3e, 0xa1, 0x46, 0xf3, 0xd1, 0x9f, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x9b, 0x69, 0xa5, 0x2b, 0x04, 0xd1, 0x09, 0x98, 0xff, 0xf7, 0x38, 0xfe,
+  0xa1, 0x46, 0xc2, 0xe7, 0x45, 0xf0, 0x04, 0x05, 0xf7, 0xe7, 0x9f, 0x49,
+  0x79, 0x44, 0xc6, 0xe7, 0x07, 0x25, 0xcb, 0xe7, 0x9d, 0x4b, 0x04, 0x22,
+  0x4b, 0x44, 0x05, 0x21, 0x0e, 0xa8, 0xff, 0xf7, 0x13, 0xfe, 0xa1, 0x46,
+  0x91, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x1b, 0x68, 0x00, 0x2b, 0x00, 0xf0,
+  0xf6, 0x80, 0x0e, 0x9b, 0x01, 0x2b, 0x40, 0xf0, 0xf2, 0x80, 0x12, 0x9d,
+  0x05, 0x3d, 0x18, 0xbf, 0x01, 0x25, 0x93, 0x4a, 0x00, 0x21, 0x4a, 0x44,
+  0x07, 0x23, 0x18, 0xa8, 0xff, 0xf7, 0xd4, 0xfd, 0xa1, 0x46, 0x01, 0x46,
+  0x48, 0xb9, 0x18, 0x98, 0xff, 0xf7, 0x82, 0xfe, 0xa1, 0x46, 0x83, 0x4b,
+  0x59, 0xf8, 0x03, 0x30, 0x5b, 0x68, 0x07, 0x2b, 0x01, 0xd0, 0x45, 0xf0,
+  0x02, 0x05, 0x89, 0x49, 0x0a, 0x20, 0x49, 0x44, 0xff, 0xf7, 0x2e, 0xfe,
+  0x01, 0x30, 0xa1, 0x46, 0x00, 0xf0, 0xd1, 0x80, 0x0a, 0x20, 0xff, 0xf7,
+  0x95, 0xfe, 0x32, 0x26, 0xa1, 0x46, 0x78, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x9b, 0x68, 0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70, 0xff, 0xf7, 0xcc, 0xfd,
+  0x01, 0x3e, 0xa1, 0x46, 0xf3, 0xd1, 0x72, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x9b, 0x68, 0x0a, 0x2b, 0x40, 0xf0, 0xb9, 0x80, 0x00, 0x23, 0x79, 0x48,
+  0x00, 0x93, 0x79, 0x4b, 0x4f, 0xf4, 0x00, 0x62, 0x4b, 0x44, 0x64, 0x21,
+  0x78, 0x44, 0xff, 0xf7, 0x1b, 0xfe, 0x00, 0x28, 0xa1, 0x46, 0xc0, 0xf2,
+  0xad, 0x80, 0x32, 0x26, 0x66, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0xdb, 0x69,
+  0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70, 0xff, 0xf7, 0xa9, 0xfd, 0x01, 0x3e,
+  0xa1, 0x46, 0xf3, 0xd1, 0x60, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0xdb, 0x69,
+  0x00, 0x2b, 0x00, 0xf0, 0x99, 0x80, 0x10, 0x22, 0x00, 0x21, 0x25, 0xa8,
+  0xff, 0xf7, 0x12, 0xfe, 0xa1, 0x46, 0x67, 0x4b, 0x00, 0x22, 0x4b, 0x44,
+  0x24, 0x93, 0x02, 0x23, 0x0c, 0x20, 0x24, 0xa9, 0x27, 0x93, 0xff, 0xf7,
+  0xfd, 0xfd, 0x00, 0x28, 0xa1, 0x46, 0xc0, 0xf2, 0x88, 0x80, 0x0c, 0x20,
+  0xff, 0xf7, 0x46, 0xfe, 0x32, 0x26, 0xa1, 0x46, 0x50, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0xdb, 0x68, 0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70, 0xff, 0xf7,
+  0x7d, 0xfd, 0x01, 0x3e, 0xa1, 0x46, 0xf3, 0xd1, 0x4a, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0xdb, 0x68, 0x0c, 0x2b, 0x70, 0xd1, 0x55, 0x49, 0x1d, 0xa8,
+  0x49, 0x44, 0xff, 0xf7, 0xab, 0xfd, 0xa1, 0x46, 0x28, 0xb9, 0x44, 0x4b,
+  0x59, 0xf8, 0x03, 0x30, 0x1b, 0x6a, 0x01, 0x2b, 0x01, 0xd0, 0x45, 0xf0,
+  0x10, 0x05, 0x00, 0x23, 0x4e, 0x49, 0x4f, 0x48, 0x49, 0x44, 0x1a, 0x46,
+  0xcd, 0xe9, 0x00, 0x33, 0x78, 0x44, 0xff, 0xf7, 0x8d, 0xfd, 0x00, 0x28,
+  0xa1, 0x46, 0x57, 0xdb, 0x32, 0x26, 0x39, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x5b, 0x6a, 0x33, 0xb9, 0x42, 0xf2, 0x10, 0x70, 0xff, 0xf7, 0x4e, 0xfd,
+  0x01, 0x3e, 0xa1, 0x46, 0xf3, 0xd1, 0x33, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x5b, 0x6a, 0x00, 0x2b, 0x44, 0xd0, 0x00, 0x23, 0x40, 0x4a, 0x13, 0x93,
+  0x40, 0x48, 0x41, 0x4b, 0x4a, 0x44, 0x4b, 0x44, 0x13, 0xa9, 0x78, 0x44,
+  0xff, 0xf7, 0x80, 0xfd, 0x06, 0x1e, 0xa1, 0x46, 0x04, 0xdb, 0x29, 0x4b,
+  0x59, 0xf8, 0x03, 0x30, 0x9b, 0x6a, 0x0b, 0xb9, 0x45, 0xf0, 0x40, 0x05,
+  0x13, 0x9b, 0x00, 0x2b, 0x35, 0xd1, 0x24, 0x4b, 0x59, 0xf8, 0x03, 0x10,
+  0x0a, 0x68, 0x4b, 0x68, 0x88, 0x68, 0xce, 0x69, 0xcf, 0x68, 0xd1, 0xf8,
+  0x20, 0xc0, 0xd1, 0xf8, 0x24, 0xe0, 0xd1, 0xf8, 0x28, 0x80, 0xd1, 0xf8,
+  0x2c, 0xa0, 0x00, 0x2d, 0x62, 0xd1, 0x2f, 0x49, 0x79, 0x44, 0xcd, 0xe9,
+  0x06, 0xa1, 0x2e, 0x49, 0xcd, 0xe9, 0x00, 0x06, 0xcd, 0xe9, 0x04, 0xe8,
+  0x06, 0x20, 0xcd, 0xe9, 0x02, 0x7c, 0x79, 0x44, 0xff, 0xf7, 0x8e, 0xfd,
+  0xc6, 0xe6, 0x01, 0x25, 0x0f, 0xe7, 0x45, 0xf0, 0x04, 0x05, 0x43, 0xe7,
+  0x45, 0xf0, 0x08, 0x05, 0x63, 0xe7, 0x45, 0xf0, 0x80, 0x05, 0x8b, 0xe7,
+  0x45, 0xf0, 0x20, 0x05, 0xb7, 0xe7, 0x01, 0x3e, 0x50, 0xf8, 0x26, 0x00,
+  0xff, 0xf7, 0xc0, 0xfd, 0xa1, 0x46, 0x00, 0x2e, 0x13, 0x98, 0xf6, 0xdc,
+  0xff, 0xf7, 0xba, 0xfd, 0xa1, 0x46, 0xc2, 0xe7, 0x00, 0x2d, 0x31, 0x01,
+  0x2c, 0x01, 0x00, 0x00, 0xa7, 0x05, 0x00, 0x00, 0x84, 0x05, 0x00, 0x00,
+  0xf4, 0x00, 0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00,
+  0xec, 0x00, 0x00, 0x00, 0xb2, 0x04, 0x00, 0x00, 0x66, 0x04, 0x00, 0x00,
+  0xfc, 0x00, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00, 0x1c, 0x04, 0x00, 0x00,
+  0xa9, 0x03, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00,
+  0xdc, 0x00, 0x00, 0x00, 0x40, 0x03, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00,
+  0xe4, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00,
+  0x8f, 0x02, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00, 0x55, 0x02, 0x00, 0x00,
+  0x24, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00,
+  0x01, 0x49, 0x79, 0x44, 0x9b, 0xe7, 0x00, 0xbf, 0xef, 0x00, 0x00, 0x00,
+  0x04, 0x4b, 0x00, 0x68, 0x59, 0xf8, 0x03, 0x20, 0x13, 0x68, 0x01, 0x33,
+  0x13, 0x60, 0x0b, 0x68, 0xc0, 0x1a, 0x70, 0x47, 0x30, 0x01, 0x00, 0x00,
+  0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x58, 0x60, 0x00, 0x20, 0x70, 0x47,
+  0x30, 0x01, 0x00, 0x00, 0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x98, 0x60,
+  0x70, 0x47, 0x00, 0xbf, 0x30, 0x01, 0x00, 0x00, 0x02, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0xd8, 0x60, 0x70, 0x47, 0x00, 0xbf, 0x30, 0x01, 0x00, 0x00,
+  0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x18, 0x61, 0x70, 0x47, 0x00, 0xbf,
+  0x30, 0x01, 0x00, 0x00, 0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x58, 0x61,
+  0x70, 0x47, 0x00, 0xbf, 0x30, 0x01, 0x00, 0x00, 0x02, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0x98, 0x61, 0x70, 0x47, 0x00, 0xbf, 0x30, 0x01, 0x00, 0x00,
+  0x01, 0x22, 0x03, 0x4b, 0x00, 0x20, 0x59, 0xf8, 0x03, 0x30, 0xda, 0x61,
+  0x70, 0x47, 0x00, 0xbf, 0x30, 0x01, 0x00, 0x00, 0x03, 0x4b, 0x59, 0xf8,
+  0x03, 0x20, 0x13, 0x6a, 0x01, 0x33, 0x13, 0x62, 0x70, 0x47, 0x00, 0xbf,
+  0x30, 0x01, 0x00, 0x00, 0x01, 0x22, 0x03, 0x4b, 0x00, 0x20, 0x59, 0xf8,
+  0x03, 0x30, 0x5a, 0x62, 0x70, 0x47, 0x00, 0xbf, 0x30, 0x01, 0x00, 0x00,
+  0x03, 0x4b, 0x01, 0x20, 0x59, 0xf8, 0x03, 0x20, 0x93, 0x6a, 0x01, 0x33,
+  0x93, 0x62, 0x70, 0x47, 0x30, 0x01, 0x00, 0x00, 0x05, 0x4b, 0x09, 0x68,
+  0x59, 0xf8, 0x03, 0x20, 0x00, 0x68, 0xd3, 0x6a, 0x05, 0x31, 0x01, 0x33,
+  0x05, 0x30, 0xd3, 0x62, 0xff, 0xf7, 0xce, 0xbc, 0x30, 0x01, 0x00, 0x00,
+  0x50, 0x41, 0x53, 0x53, 0x00, 0x46, 0x41, 0x49, 0x4c, 0x00, 0x2f, 0x63,
+  0x62, 0x6d, 0x71, 0x00, 0x78, 0x00, 0x5b, 0x63, 0x61, 0x6c, 0x6c, 0x62,
+  0x61, 0x63, 0x6b, 0x5d, 0x20, 0x6d, 0x71, 0x5f, 0x74, 0x68, 0x72, 0x65,
+  0x61, 0x64, 0x3d, 0x25, 0x23, 0x78, 0x20, 0x6d, 0x71, 0x5f, 0x73, 0x69,
+  0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x25, 0x64, 0x20, 0x74, 0x69, 0x6d, 0x65,
+  0x72, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x3d, 0x25, 0x23, 0x78,
+  0x20, 0x2d, 0x2d, 0x20, 0x25, 0x73, 0x0a, 0x00, 0x63, 0x62, 0x74, 0x61,
+  0x73, 0x6b, 0x00, 0x63, 0x62, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x00, 0x2f,
+  0x6d, 0x6e, 0x74, 0x2f, 0x78, 0x69, 0x70, 0x66, 0x73, 0x00, 0x5b, 0x63,
+  0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5d, 0x20, 0x71, 0x73, 0x6f,
+  0x72, 0x74, 0x3d, 0x25, 0x64, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61,
+  0x64, 0x3d, 0x25, 0x64, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d,
+  0x25, 0x64, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x3d, 0x25, 0x64, 0x20, 0x73,
+  0x69, 0x67, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x25, 0x64, 0x20,
+  0x6f, 0x6e, 0x63, 0x65, 0x3d, 0x25, 0x64, 0x20, 0x73, 0x70, 0x61, 0x77,
+  0x6e, 0x3d, 0x25, 0x64, 0x20, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x3d,
+  0x25, 0x64, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x3d, 0x25, 0x64,
+  0x20, 0x2d, 0x2d, 0x20, 0x25, 0x73, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0xa8, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x88, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x01, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x88, 0x10, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0xb8, 0x04, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x04, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0x11, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x21, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x31, 0x05, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0x41, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x51, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x61, 0x05, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0x71, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x85, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x99, 0x05, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0xad, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0xc1, 0x05, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x0e, 0x00, 0x00,
+  0xbc, 0x11, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72,
+  0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68,
+  0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c,
+  0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d,
+  0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e,
+  0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33,
+  0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00,
+  0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a,
+  0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03,
+  0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x88, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xa8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xa8, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xbc, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x0c, 0x00, 0x00, 0x00, 0xc0, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xc1, 0x0c, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xd4, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0xd8, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x1a, 0x00, 0x00, 0x00, 0xd9, 0x0c, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xe4, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0xe8, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x26, 0x00, 0x00, 0x00, 0xe9, 0x0c, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xf4, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0xf8, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x32, 0x00, 0x00, 0x00, 0xf9, 0x0c, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x04, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x08, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x44, 0x00, 0x00, 0x00, 0x09, 0x0d, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x14, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x18, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x56, 0x00, 0x00, 0x00, 0x19, 0x0d, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x24, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x28, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x67, 0x00, 0x00, 0x00, 0x29, 0x0d, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x34, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x38, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x39, 0x0d, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x48, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x4c, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x85, 0x00, 0x00, 0x00, 0x4d, 0x0d, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x5c, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x60, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x92, 0x00, 0x00, 0x00, 0x61, 0x0d, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x70, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x74, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x9d, 0x00, 0x00, 0x00, 0x75, 0x0d, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x84, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x88, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x89, 0x0d, 0x00, 0x00,
+  0x1c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xa0, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0xc8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00, 0x44, 0x0c, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0xb4, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xbc, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00, 0x78, 0x0e, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0xb3, 0x00, 0x00, 0x00,
+  0x78, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xbc, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0b, 0x00, 0xbd, 0x00, 0x00, 0x00, 0xbc, 0x11, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0xc7, 0x00, 0x00, 0x00,
+  0xbc, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0xd5, 0x00, 0x00, 0x00, 0xc0, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0b, 0x00, 0xe2, 0x00, 0x00, 0x00, 0xc4, 0x11, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0xef, 0x00, 0x00, 0x00,
+  0xc8, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0xff, 0x00, 0x00, 0x00, 0xcc, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0b, 0x00, 0x0f, 0x01, 0x00, 0x00, 0xd0, 0x11, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x1f, 0x01, 0x00, 0x00,
+  0xd4, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0x32, 0x01, 0x00, 0x00, 0xd8, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0b, 0x00, 0x3d, 0x01, 0x00, 0x00, 0xdc, 0x11, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x48, 0x01, 0x00, 0x00,
+  0xe0, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0x54, 0x01, 0x00, 0x00, 0xe4, 0x11, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0b, 0x00, 0x63, 0x01, 0x00, 0x00, 0xe8, 0x11, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x72, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0xf1, 0xff, 0x7b, 0x01, 0x00, 0x00, 0x88, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xa4, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0xf8, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0xfc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x20, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x24, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0x34, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x38, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x48, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x5c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0x70, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x74, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x84, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x88, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x98, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x9c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0xac, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0xb0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xc0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xc4, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xd4, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0xd8, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0xe8, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0xec, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x10, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x14, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0x24, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x28, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x38, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x3c, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x4c, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x50, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0x60, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x64, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x74, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x78, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x88, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x8c, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0x9c, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0xa0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xb0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xb4, 0x07, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xc4, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xad, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xb6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xbd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xce, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xdb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xe3, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xee, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xfb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x0a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x2a, 0x02, 0x00, 0x00, 0xac, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x3a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
+  0xc9, 0x07, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x41, 0x02, 0x00, 0x00, 0xa8, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x59, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x60, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x6d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x7b, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x83, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x8d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x93, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x2e, 0x63, 0x00,
+  0x24, 0x74, 0x00, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x00, 0x24,
+  0x64, 0x00, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x61, 0x69,
+  0x6e, 0x00, 0x73, 0x69, 0x67, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65,
+  0x72, 0x00, 0x73, 0x69, 0x67, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x00, 0x6d, 0x71, 0x5f, 0x73,
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65,
+  0x72, 0x00, 0x6d, 0x71, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f,
+  0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x72,
+  0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6e, 0x6f, 0x74, 0x69,
+  0x66, 0x79, 0x00, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6d, 0x61, 0x69, 0x6e,
+  0x00, 0x6f, 0x6e, 0x63, 0x65, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e,
+  0x65, 0x00, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x5f, 0x6d, 0x61, 0x69, 0x6e,
+  0x00, 0x64, 0x69, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x00,
+  0x64, 0x69, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x00, 0x2e,
+  0x4c, 0x41, 0x4e, 0x43, 0x48, 0x4f, 0x52, 0x31, 0x00, 0x2e, 0x4c, 0x41,
+  0x4e, 0x43, 0x48, 0x4f, 0x52, 0x30, 0x00, 0x67, 0x5f, 0x71, 0x73, 0x6f,
+  0x72, 0x74, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x00, 0x67, 0x5f, 0x74,
+  0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x00, 0x67, 0x5f,
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x61, 0x6e, 0x00, 0x67,
+  0x5f, 0x73, 0x69, 0x67, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72,
+  0x61, 0x6e, 0x00, 0x67, 0x5f, 0x6d, 0x71, 0x5f, 0x73, 0x69, 0x67, 0x6e,
+  0x61, 0x6c, 0x5f, 0x72, 0x61, 0x6e, 0x00, 0x67, 0x5f, 0x6d, 0x71, 0x5f,
+  0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x00, 0x67,
+  0x5f, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61,
+  0x64, 0x5f, 0x72, 0x61, 0x6e, 0x00, 0x67, 0x5f, 0x74, 0x61, 0x73, 0x6b,
+  0x5f, 0x72, 0x61, 0x6e, 0x00, 0x67, 0x5f, 0x6f, 0x6e, 0x63, 0x65, 0x5f,
+  0x72, 0x61, 0x6e, 0x00, 0x67, 0x5f, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x5f,
+  0x72, 0x61, 0x6e, 0x00, 0x67, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+  0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x00, 0x67, 0x5f, 0x63, 0x6f, 0x6d,
+  0x70, 0x61, 0x72, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x00, 0x5f, 0x44,
+  0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42,
+  0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41,
+  0x42, 0x4c, 0x45, 0x5f, 0x00, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64,
+  0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x74, 0x69, 0x6d, 0x65,
+  0x72, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x6d, 0x71, 0x5f,
+  0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x75, 0x73, 0x6c, 0x65, 0x65, 0x70,
+  0x00, 0x71, 0x73, 0x6f, 0x72, 0x74, 0x00, 0x6d, 0x71, 0x5f, 0x72, 0x65,
+  0x63, 0x65, 0x69, 0x76, 0x65, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x5f,
+  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x00, 0x6d, 0x71, 0x5f, 0x73, 0x65,
+  0x6e, 0x64, 0x00, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x73, 0x70, 0x61, 0x77,
+  0x6e, 0x00, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6f, 0x6e,
+  0x63, 0x65, 0x00, 0x73, 0x63, 0x61, 0x6e, 0x64, 0x69, 0x72, 0x00, 0x73,
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x00, 0x6d, 0x71, 0x5f, 0x75, 0x6e, 0x6c,
+  0x69, 0x6e, 0x6b, 0x00, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x63, 0x72, 0x65,
+  0x61, 0x74, 0x65, 0x00, 0x73, 0x69, 0x67, 0x61, 0x63, 0x74, 0x69, 0x6f,
+  0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f,
+  0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d, 0x65, 0x6d, 0x73, 0x65, 0x74,
+  0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c,
+  0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67,
+  0x00, 0x73, 0x74, 0x72, 0x63, 0x6d, 0x70, 0x00, 0x70, 0x74, 0x68, 0x72,
+  0x65, 0x61, 0x64, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x00, 0x74, 0x69, 0x6d,
+  0x65, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x00, 0x6d,
+  0x71, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x00, 0x6d, 0x71, 0x5f, 0x6e, 0x6f,
+  0x74, 0x69, 0x66, 0x79, 0x00, 0x72, 0x61, 0x69, 0x73, 0x65, 0x00, 0x66,
+  0x72, 0x65, 0x65, 0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62,
+  0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68,
+  0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68,
+  0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79,
+  0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x64, 0x79,
+  0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00, 0x2e, 0x74, 0x65, 0x78, 0x74,
+  0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x00, 0x2e, 0x72, 0x6f,
+  0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d,
+  0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00, 0x2e, 0x62, 0x73, 0x73,
+  0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41,
+  0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x88, 0x01, 0x00, 0x00, 0x88, 0x01, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xa8, 0x03, 0x00, 0x00, 0xa8, 0x03, 0x00, 0x00,
+  0x0d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb8, 0x04, 0x00, 0x00,
+  0xb8, 0x04, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0xe8, 0x05, 0x00, 0x00, 0xe8, 0x05, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xc8, 0x07, 0x00, 0x00, 0xc8, 0x07, 0x00, 0x00,
+  0xdc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00,
+  0xa4, 0x0d, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xa8, 0x0e, 0x00, 0x00, 0xa8, 0x0e, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x10, 0x00, 0x00,
+  0x88, 0x10, 0x00, 0x00, 0x34, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x64, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xbc, 0x11, 0x00, 0x00, 0xbc, 0x11, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x11, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x12, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x30, 0x12, 0x00, 0x00, 0x60, 0x09, 0x00, 0x00,
+  0x0f, 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1b, 0x00, 0x00,
+  0x98, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x28, 0x1e, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_callback_len = 8532;
diff --git a/testing/fs/xipfs/counteruser_bin.h b/testing/fs/xipfs/counteruser_bin.h
new file mode 100644
index 000000000..86fb4aa9a
--- /dev/null
+++ b/testing/fs/xipfs/counteruser_bin.h
@@ -0,0 +1,265 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/counteruser_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from user.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_counteruser[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd1, 0x02, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x2c, 0x08, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x10, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x94, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00,
+  0x94, 0x13, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x94, 0x03, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00,
+  0x90, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x6c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd1, 0x02, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x42, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x63,
+  0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x62, 0x75, 0x6d, 0x70, 0x00,
+  0x75, 0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+  0x65, 0x72, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x79, 0x73,
+  0x6c, 0x6f, 0x67, 0x00, 0x6c, 0x69, 0x62, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+  0x65, 0x72, 0x2e, 0x73, 0x6f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49,
+  0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f,
+  0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44,
+  0x5f, 0x5f, 0x00, 0x00, 0x30, 0x14, 0x00, 0x00, 0xa4, 0x06, 0x00, 0x00,
+  0x38, 0x14, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0x40, 0x14, 0x00, 0x00,
+  0xa4, 0x08, 0x00, 0x00, 0x48, 0x14, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00,
+  0x50, 0x14, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x14, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x2c, 0x00, 0x00, 0x00,
+  0xf0, 0xb5, 0x01, 0x28, 0x4c, 0x46, 0x85, 0xb0, 0x2f, 0xdd, 0x48, 0x68,
+  0xff, 0xf7, 0xee, 0xff, 0xa1, 0x46, 0x05, 0x46, 0x03, 0x26, 0x17, 0x4b,
+  0x03, 0x93, 0x28, 0x46, 0xff, 0xf7, 0xc8, 0xff, 0x03, 0x98, 0xa1, 0x46,
+  0xff, 0xf7, 0xba, 0xff, 0x01, 0x3e, 0xa1, 0x46, 0xf5, 0xd1, 0xff, 0xf7,
+  0xc9, 0xff, 0xa1, 0x46, 0x07, 0x46, 0xff, 0xf7, 0xc5, 0xff, 0x05, 0xeb,
+  0x45, 0x06, 0x86, 0x42, 0xa1, 0x46, 0x14, 0xd1, 0x0c, 0x4a, 0x7a, 0x44,
+  0x0c, 0x49, 0x3b, 0x46, 0xcd, 0xe9, 0x00, 0x62, 0x79, 0x44, 0x2a, 0x46,
+  0x06, 0x20, 0xff, 0xf7, 0xbf, 0xff, 0xa1, 0x46, 0xff, 0xf7, 0xb2, 0xff,
+  0x30, 0x1a, 0x18, 0xbf, 0x01, 0x20, 0x05, 0xb0, 0xf0, 0xbd, 0x00, 0x25,
+  0xd2, 0xe7, 0x04, 0x4a, 0x7a, 0x44, 0xe9, 0xe7, 0xa0, 0x86, 0x01, 0x00,
+  0x3a, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x50, 0x41, 0x53, 0x53, 0x00, 0x46, 0x41, 0x49, 0x4c, 0x00, 0x5b, 0x75,
+  0x73, 0x65, 0x72, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x6c, 0x69, 0x62, 0x72,
+  0x61, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x20, 0x3d, 0x20,
+  0x25, 0x64, 0x20, 0x28, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64,
+  0x20, 0x25, 0x64, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x25, 0x73, 0x0a, 0x00,
+  0x24, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xff, 0x6f,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a,
+  0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f,
+  0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32,
+  0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64,
+  0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29,
+  0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35,
+  0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65,
+  0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d,
+  0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01,
+  0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04,
+  0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x44, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x08, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x44, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x0e, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0xf1, 0xff, 0x17, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00, 0x94, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0xb8, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0xbc, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x5f, 0x00, 0x00, 0x00,
+  0xd1, 0x02, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x64, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x24,
+  0x64, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45,
+  0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00, 0x75, 0x73, 0x6c,
+  0x65, 0x65, 0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f,
+  0x62, 0x75, 0x6d, 0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72,
+  0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d,
+  0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x73, 0x79, 0x73,
+  0x6c, 0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x00, 0x2e, 0x73,
+  0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61,
+  0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00,
+  0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79,
+  0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72,
+  0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00,
+  0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74,
+  0x61, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e,
+  0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74,
+  0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41,
+  0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00,
+  0x44, 0x02, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x6c, 0x02, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00,
+  0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00,
+  0x54, 0x03, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x90, 0x03, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x94, 0x13, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00,
+  0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x24, 0x14, 0x00, 0x00,
+  0x24, 0x04, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x64, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x58, 0x04, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x04, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xcc, 0x04, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x1e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x2c, 0x07, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x07, 0x00, 0x00,
+  0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_counteruser_len = 2732;
diff --git a/testing/fs/xipfs/cxxuser_bin.h b/testing/fs/xipfs/cxxuser_bin.h
new file mode 100644
index 000000000..0bc750592
--- /dev/null
+++ b/testing/fs/xipfs/cxxuser_bin.h
@@ -0,0 +1,400 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/cxxuser_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from cxxuser.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_cxxuser[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x81, 0x04, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x30, 0x0e, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x12, 0x00, 0x11, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x06, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xf0, 0x06, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00,
+  0xf0, 0x16, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf4, 0x06, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00,
+  0xa0, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x94, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0c, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x8f, 0x00, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x81, 0x04, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x2a, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x74,
+  0x6f, 0x69, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x72,
+  0x6b, 0x65, 0x72, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x63, 0x6f,
+  0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x65, 0x64, 0x00, 0x73, 0x79,
+  0x73, 0x6c, 0x6f, 0x67, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x61,
+  0x64, 0x64, 0x00, 0x75, 0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x73, 0x68,
+  0x61, 0x70, 0x65, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x6e,
+  0x70, 0x72, 0x69, 0x6e, 0x74, 0x66, 0x00, 0x6f, 0x70, 0x65, 0x6e, 0x00,
+  0x66, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65, 0x00, 0x77, 0x72,
+  0x69, 0x74, 0x65, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x6c, 0x69,
+  0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x2e, 0x73, 0x6f, 0x00, 0x5f, 0x5f,
+  0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54,
+  0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xa0, 0x17, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00, 0xa8, 0x17, 0x00, 0x00,
+  0xa4, 0x08, 0x00, 0x00, 0xb0, 0x17, 0x00, 0x00, 0xa4, 0x09, 0x00, 0x00,
+  0xb8, 0x17, 0x00, 0x00, 0xa4, 0x0a, 0x00, 0x00, 0xc0, 0x17, 0x00, 0x00,
+  0xa4, 0x0b, 0x00, 0x00, 0xc8, 0x17, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00,
+  0xd0, 0x17, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0xd8, 0x17, 0x00, 0x00,
+  0xa4, 0x11, 0x00, 0x00, 0xe0, 0x17, 0x00, 0x00, 0xa4, 0x12, 0x00, 0x00,
+  0xe8, 0x17, 0x00, 0x00, 0xa4, 0x13, 0x00, 0x00, 0xf0, 0x17, 0x00, 0x00,
+  0xa4, 0x14, 0x00, 0x00, 0xf8, 0x17, 0x00, 0x00, 0xa4, 0x15, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x2c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x34, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x44, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x4c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x54, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x5c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x64, 0x00, 0x00, 0x00,
+  0x2d, 0xe9, 0xf0, 0x45, 0x01, 0x28, 0x4c, 0x46, 0x80, 0x46, 0x0f, 0x46,
+  0x89, 0xb0, 0x40, 0xf3, 0x8e, 0x80, 0x48, 0x68, 0xff, 0xf7, 0xcc, 0xff,
+  0xb8, 0xf1, 0x02, 0x0f, 0xa1, 0x46, 0x06, 0x46, 0x03, 0xd0, 0xb8, 0x68,
+  0xff, 0xf7, 0xd8, 0xff, 0xa1, 0x46, 0x52, 0x4b, 0x4f, 0x4d, 0x59, 0xf8,
+  0x03, 0x30, 0x1b, 0x68, 0xab, 0x42, 0x7c, 0xd1, 0xdf, 0xf8, 0x3c, 0xa1,
+  0xfa, 0x44, 0xff, 0xf7, 0x8f, 0xff, 0xa1, 0x46, 0x00, 0x28, 0x78, 0xd0,
+  0x4c, 0x4b, 0x7b, 0x44, 0x49, 0x4a, 0x59, 0xf8, 0x02, 0x20, 0x12, 0x79,
+  0x00, 0x2a, 0x73, 0xd0, 0x49, 0x4a, 0x7a, 0x44, 0x49, 0x49, 0xcd, 0xe9,
+  0x00, 0x32, 0x06, 0x20, 0x53, 0x46, 0x32, 0x46, 0x79, 0x44, 0xff, 0xf7,
+  0x97, 0xff, 0xa1, 0x46, 0x40, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x1b, 0x68,
+  0x5d, 0x1b, 0x18, 0xbf, 0x01, 0x25, 0xff, 0xf7, 0x6f, 0xff, 0xa1, 0x46,
+  0x08, 0xb9, 0x45, 0xf0, 0x02, 0x05, 0x3a, 0x4b, 0x59, 0xf8, 0x03, 0x30,
+  0x1b, 0x79, 0x0b, 0xb9, 0x45, 0xf0, 0x04, 0x05, 0x4f, 0xf0, 0x03, 0x0a,
+  0x34, 0x4b, 0x03, 0x93, 0x30, 0x46, 0xff, 0xf7, 0x35, 0xff, 0x03, 0x98,
+  0xa1, 0x46, 0xff, 0xf7, 0x45, 0xff, 0xba, 0xf1, 0x01, 0x0a, 0xa1, 0x46,
+  0xf4, 0xd1, 0xff, 0xf7, 0x49, 0xff, 0x06, 0xeb, 0x46, 0x0a, 0xa1, 0x46,
+  0x50, 0x45, 0x18, 0xbf, 0x45, 0xf0, 0x08, 0x05, 0xff, 0xf7, 0x40, 0xff,
+  0xa1, 0x46, 0x03, 0x46, 0x00, 0x2d, 0x38, 0xd1, 0x2c, 0x4a, 0x7a, 0x44,
+  0x2c, 0x49, 0xcd, 0xe9, 0x00, 0xa2, 0x06, 0x20, 0x32, 0x46, 0x79, 0x44,
+  0xff, 0xf7, 0x5a, 0xff, 0xb8, 0xf1, 0x03, 0x0f, 0xa1, 0x46, 0x1a, 0xdd,
+  0xff, 0x68, 0xc7, 0xb1, 0x26, 0x4a, 0x2b, 0x46, 0x10, 0x21, 0x7a, 0x44,
+  0x04, 0xa8, 0xff, 0xf7, 0x11, 0xff, 0x4f, 0xf4, 0xd2, 0x72, 0xa1, 0x46,
+  0x82, 0x46, 0x40, 0xf2, 0x41, 0x21, 0x38, 0x46, 0xff, 0xf7, 0x58, 0xff,
+  0x06, 0x1e, 0xa1, 0x46, 0x18, 0xda, 0x1e, 0x49, 0x3a, 0x46, 0x06, 0x20,
+  0x79, 0x44, 0xff, 0xf7, 0x3b, 0xff, 0x28, 0x46, 0x09, 0xb0, 0xbd, 0xe8,
+  0xf0, 0x85, 0x01, 0x26, 0x7b, 0xe7, 0xdf, 0xf8, 0x64, 0xa0, 0xfa, 0x44,
+  0x81, 0xe7, 0x18, 0x4b, 0x7b, 0x44, 0x85, 0xe7, 0x17, 0x4a, 0x7a, 0x44,
+  0x8a, 0xe7, 0x17, 0x4a, 0x7a, 0x44, 0xc5, 0xe7, 0x51, 0x46, 0xff, 0xf7,
+  0x11, 0xff, 0x00, 0x28, 0xa1, 0x46, 0x05, 0xdb, 0x52, 0x46, 0x30, 0x46,
+  0x04, 0xa9, 0xff, 0xf7, 0x13, 0xff, 0xa1, 0x46, 0x30, 0x46, 0xff, 0xf7,
+  0x41, 0xff, 0xdc, 0xe7, 0x55, 0x1a, 0x0c, 0x00, 0xa0, 0x86, 0x01, 0x00,
+  0x6c, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00, 0x76, 0x01, 0x00, 0x00,
+  0x66, 0x01, 0x00, 0x00, 0x69, 0x01, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00,
+  0x34, 0x01, 0x00, 0x00, 0x4e, 0x01, 0x00, 0x00, 0x2b, 0x01, 0x00, 0x00,
+  0x8e, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00,
+  0x84, 0x00, 0x00, 0x00, 0x38, 0xb5, 0x05, 0x4b, 0x59, 0xf8, 0x03, 0x40,
+  0x02, 0x4b, 0x23, 0x60, 0xff, 0xf7, 0xd4, 0xfe, 0x20, 0x71, 0x38, 0xbd,
+  0x55, 0x1a, 0x0c, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x79, 0x65, 0x73, 0x00,
+  0x4e, 0x4f, 0x00, 0x50, 0x41, 0x53, 0x53, 0x00, 0x46, 0x41, 0x49, 0x4c,
+  0x00, 0x5b, 0x75, 0x73, 0x65, 0x72, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x6f,
+  0x77, 0x6e, 0x20, 0x63, 0x74, 0x6f, 0x72, 0x20, 0x72, 0x61, 0x6e, 0x3a,
+  0x20, 0x25, 0x73, 0x2c, 0x20, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79,
+  0x20, 0x63, 0x74, 0x6f, 0x72, 0x20, 0x72, 0x61, 0x6e, 0x3a, 0x20, 0x25,
+  0x73, 0x2c, 0x20, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x20, 0x66,
+  0x69, 0x72, 0x73, 0x74, 0x3a, 0x20, 0x25, 0x73, 0x0a, 0x00, 0x5b, 0x75,
+  0x73, 0x65, 0x72, 0x20, 0x25, 0x64, 0x5d, 0x20, 0x6c, 0x69, 0x62, 0x72,
+  0x61, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x20, 0x3d, 0x20,
+  0x25, 0x64, 0x20, 0x28, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64,
+  0x20, 0x25, 0x64, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x25, 0x73, 0x0a, 0x00,
+  0x25, 0x64, 0x00, 0x5b, 0x75, 0x73, 0x65, 0x72, 0x5d, 0x20, 0x63, 0x61,
+  0x6e, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x20,
+  0x74, 0x6f, 0x20, 0x25, 0x73, 0x0a, 0x00, 0x00, 0x94, 0x17, 0x00, 0x00,
+  0x29, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x20, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x94, 0x17, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x17, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0e, 0x00, 0x16, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x01, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0xec, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x28, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x29, 0x06, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3c, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xf0, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0c, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x2c, 0x00, 0x00, 0x00,
+  0x04, 0x18, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x37, 0x00, 0x00, 0x00, 0xf4, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff, 0x40, 0x00, 0x00, 0x00,
+  0x94, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xa0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xa4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xc8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xcc, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xdc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xf4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x18, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x1c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x2c, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x44, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x54, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x58, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x6c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x7c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x8e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0xae, 0x00, 0x00, 0x00, 0x81, 0x04, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0xb3, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0xc4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xcb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xd5, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0xe2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x74, 0x00, 0x24, 0x64, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x5f, 0x73, 0x75, 0x62, 0x5f,
+  0x49, 0x5f, 0x63, 0x78, 0x78, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x63, 0x70,
+  0x70, 0x00, 0x2e, 0x4c, 0x41, 0x4e, 0x43, 0x48, 0x4f, 0x52, 0x30, 0x00,
+  0x5f, 0x5a, 0x4c, 0x36, 0x67, 0x5f, 0x73, 0x65, 0x6c, 0x66, 0x00, 0x5f,
+  0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f,
+  0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54,
+  0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f,
+  0x61, 0x64, 0x64, 0x00, 0x73, 0x6e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x66,
+  0x00, 0x75, 0x73, 0x6c, 0x65, 0x65, 0x70, 0x00, 0x73, 0x68, 0x61, 0x70,
+  0x65, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x68, 0x61, 0x70,
+  0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x65,
+  0x64, 0x00, 0x66, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65, 0x00,
+  0x77, 0x72, 0x69, 0x74, 0x65, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49,
+  0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d, 0x61,
+  0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x73, 0x79, 0x73, 0x6c,
+  0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x6f, 0x70, 0x65, 0x6e,
+  0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x65,
+  0x72, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x00, 0x2e, 0x73, 0x79,
+  0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62,
+  0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e,
+  0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d,
+  0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72, 0x65,
+  0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00, 0x2e,
+  0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74, 0x61,
+  0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e, 0x69,
+  0x6e, 0x69, 0x74, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x00, 0x2e, 0x64,
+  0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00,
+  0x2e, 0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
+  0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69,
+  0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
+  0x60, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x20, 0x03, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+  0x44, 0x06, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0xa7, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00, 0xec, 0x06, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf0, 0x16, 0x00, 0x00,
+  0xf0, 0x06, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x62, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xf4, 0x16, 0x00, 0x00, 0xf4, 0x06, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x94, 0x17, 0x00, 0x00, 0x94, 0x07, 0x00, 0x00,
+  0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00,
+  0x04, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x75, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x08, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x78, 0x08, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x35, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb8, 0x0c, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0d, 0x00, 0x00,
+  0x8e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_cxxuser_len = 4352;
diff --git a/testing/fs/xipfs/funcdesc_bin.h b/testing/fs/xipfs/funcdesc_bin.h
new file mode 100644
index 000000000..57ef2b15e
--- /dev/null
+++ b/testing/fs/xipfs/funcdesc_bin.h
@@ -0,0 +1,304 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/funcdesc_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from funcdesc.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_funcdesc[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x91, 0x02, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xdc, 0x09, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x11, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x04, 0x00, 0x00,
+  0xfc, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xfc, 0x04, 0x00, 0x00, 0xfc, 0x14, 0x00, 0x00,
+  0xfc, 0x14, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xfc, 0x04, 0x00, 0x00, 0xfc, 0x14, 0x00, 0x00, 0xfc, 0x14, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xa8, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00,
+  0xfc, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x91, 0x02, 0x00, 0x00, 0x6c, 0x01, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0x26, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69,
+  0x6e, 0x00, 0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f,
+  0x69, 0x00, 0x6d, 0x65, 0x6d, 0x63, 0x70, 0x79, 0x00, 0x73, 0x74, 0x72,
+  0x63, 0x6d, 0x70, 0x00, 0x71, 0x73, 0x6f, 0x72, 0x74, 0x00, 0x5f, 0x5f,
+  0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54,
+  0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x00, 0xa0, 0x15, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xa4, 0x15, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x90, 0x15, 0x00, 0x00, 0xa4, 0x0c, 0x00, 0x00, 0x98, 0x15, 0x00, 0x00,
+  0xa4, 0x02, 0x00, 0x00, 0xa8, 0x15, 0x00, 0x00, 0xa3, 0x0e, 0x00, 0x00,
+  0xac, 0x15, 0x00, 0x00, 0xa3, 0x08, 0x00, 0x00, 0xb0, 0x15, 0x00, 0x00,
+  0xa3, 0x0d, 0x00, 0x00, 0xb4, 0x15, 0x00, 0x00, 0xa3, 0x07, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0x2d, 0xe9, 0xf0, 0x4d,
+  0x4f, 0x4b, 0x8e, 0xb0, 0x59, 0xf8, 0x03, 0x60, 0x04, 0xac, 0x0f, 0x46,
+  0x01, 0x28, 0x0f, 0xce, 0x0f, 0xc4, 0x33, 0x68, 0x4d, 0x46, 0x23, 0x60,
+  0x4a, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x1b, 0x68, 0x79, 0xdd, 0x78, 0x68,
+  0xd3, 0xf8, 0x04, 0x90, 0x1a, 0x68, 0x90, 0x47, 0x02, 0x28, 0xa9, 0x46,
+  0x07, 0x46, 0x73, 0xdc, 0x00, 0x28, 0x73, 0xdc, 0x43, 0x49, 0x3a, 0x46,
+  0x06, 0x20, 0x79, 0x44, 0xff, 0xf7, 0xd2, 0xff, 0x01, 0x24, 0xa9, 0x46,
+  0x3e, 0x4b, 0x04, 0xa9, 0x59, 0xf8, 0x03, 0x30, 0x14, 0x22, 0x5b, 0x68,
+  0x09, 0xa8, 0xd3, 0xf8, 0x04, 0x90, 0xd3, 0xf8, 0x00, 0x80, 0xc0, 0x47,
+  0x00, 0x23, 0xa9, 0x46, 0x0d, 0xf1, 0x24, 0x08, 0x04, 0xa9, 0x09, 0xae,
+  0x30, 0x68, 0x0a, 0x68, 0x90, 0x42, 0x57, 0xd0, 0x35, 0x49, 0x06, 0x20,
+  0x79, 0x44, 0xff, 0xf7, 0xb5, 0xff, 0xa9, 0x46, 0x01, 0x34, 0x30, 0x4b,
+  0x32, 0x49, 0x59, 0xf8, 0x03, 0xb0, 0x79, 0x44, 0xdb, 0xf8, 0x04, 0xc0,
+  0x01, 0x91, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0x30, 0x07, 0x22,
+  0x02, 0xa8, 0x98, 0x47, 0xa9, 0x46, 0xdb, 0xf8, 0x08, 0x30, 0x01, 0x99,
+  0xd3, 0xf8, 0x04, 0x90, 0x1a, 0x68, 0x02, 0xa8, 0x90, 0x47, 0xa9, 0x46,
+  0x30, 0xb1, 0x27, 0x49, 0x06, 0x20, 0x79, 0x44, 0xff, 0xf7, 0x94, 0xff,
+  0xa9, 0x46, 0x01, 0x34, 0x1f, 0x4b, 0x04, 0x22, 0x59, 0xf8, 0x03, 0x30,
+  0x05, 0x21, 0xde, 0x68, 0x21, 0x4b, 0xd6, 0xf8, 0x00, 0xa0, 0x4b, 0x44,
+  0x09, 0xa8, 0xd6, 0xf8, 0x04, 0x90, 0xd0, 0x47, 0x00, 0x23, 0xa9, 0x46,
+  0xd8, 0xf8, 0x00, 0x20, 0x01, 0x33, 0x9a, 0x42, 0x22, 0xd0, 0x1b, 0x49,
+  0x06, 0x20, 0x79, 0x44, 0xff, 0xf7, 0x78, 0xff, 0xa9, 0x46, 0x01, 0x34,
+  0x18, 0x49, 0x23, 0x46, 0x3a, 0x46, 0x06, 0x20, 0x79, 0x44, 0xff, 0xf7,
+  0x6f, 0xff, 0x20, 0x1e, 0x18, 0xbf, 0x01, 0x20, 0x0e, 0xb0, 0xbd, 0xe8,
+  0xf0, 0x8d, 0x13, 0x48, 0x78, 0x44, 0x83, 0xe7, 0x07, 0x28, 0x8b, 0xd1,
+  0x00, 0x24, 0x91, 0xe7, 0x01, 0x33, 0x05, 0x2b, 0x06, 0xf1, 0x04, 0x06,
+  0x01, 0xf1, 0x04, 0x01, 0x9c, 0xd1, 0xa6, 0xe7, 0x05, 0x2b, 0x08, 0xf1,
+  0x04, 0x08, 0xd3, 0xd1, 0xde, 0xe7, 0x00, 0xbf, 0x1c, 0x00, 0x00, 0x00,
+  0x20, 0x00, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00, 0x25, 0x01, 0x00, 0x00,
+  0x40, 0x01, 0x00, 0x00, 0x17, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x0c, 0x01, 0x00, 0x00, 0x26, 0x01, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00,
+  0x00, 0x68, 0x0b, 0x68, 0xc0, 0x1a, 0x70, 0x47, 0x37, 0x00, 0x5b, 0x66,
+  0x75, 0x6e, 0x63, 0x64, 0x65, 0x73, 0x63, 0x5d, 0x20, 0x46, 0x41, 0x49,
+  0x4c, 0x20, 0x61, 0x74, 0x6f, 0x69, 0x20, 0x74, 0x68, 0x72, 0x6f, 0x75,
+  0x67, 0x68, 0x20, 0x61, 0x20, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+  0x74, 0x6f, 0x72, 0x3a, 0x20, 0x25, 0x64, 0x0a, 0x00, 0x5b, 0x66, 0x75,
+  0x6e, 0x63, 0x64, 0x65, 0x73, 0x63, 0x5d, 0x20, 0x46, 0x41, 0x49, 0x4c,
+  0x20, 0x6d, 0x65, 0x6d, 0x63, 0x70, 0x79, 0x20, 0x74, 0x68, 0x72, 0x6f,
+  0x75, 0x67, 0x68, 0x20, 0x61, 0x20, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+  0x70, 0x74, 0x6f, 0x72, 0x0a, 0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+  0x00, 0x5b, 0x66, 0x75, 0x6e, 0x63, 0x64, 0x65, 0x73, 0x63, 0x5d, 0x20,
+  0x46, 0x41, 0x49, 0x4c, 0x20, 0x73, 0x74, 0x72, 0x63, 0x6d, 0x70, 0x20,
+  0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x20, 0x61, 0x20, 0x64, 0x65,
+  0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x0a, 0x00, 0x5b, 0x66,
+  0x75, 0x6e, 0x63, 0x64, 0x65, 0x73, 0x63, 0x5d, 0x20, 0x46, 0x41, 0x49,
+  0x4c, 0x20, 0x71, 0x73, 0x6f, 0x72, 0x74, 0x20, 0x74, 0x68, 0x72, 0x6f,
+  0x75, 0x67, 0x68, 0x20, 0x61, 0x20, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+  0x70, 0x74, 0x6f, 0x72, 0x0a, 0x00, 0x5b, 0x66, 0x75, 0x6e, 0x63, 0x64,
+  0x65, 0x73, 0x63, 0x5d, 0x20, 0x73, 0x65, 0x65, 0x64, 0x20, 0x25, 0x64,
+  0x2c, 0x20, 0x25, 0x64, 0x20, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65,
+  0x73, 0x0a, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x84, 0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x84, 0x15, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x14, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x6d, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0xe4, 0x04, 0x00, 0x00, 0xa8, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x90, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x84, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x0c, 0x00, 0x00, 0x00,
+  0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x0f, 0x00, 0x00, 0x00, 0xfd, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x06, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xd4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xe4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x07, 0x00, 0x1a, 0x00, 0x00, 0x00, 0xe4, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xa8, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00,
+  0x24, 0x00, 0x00, 0x00, 0xa8, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0b, 0x00, 0x2e, 0x00, 0x00, 0x00, 0xa8, 0x15, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x35, 0x00, 0x00, 0x00,
+  0xac, 0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00,
+  0x3e, 0x00, 0x00, 0x00, 0xb0, 0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0b, 0x00, 0x47, 0x00, 0x00, 0x00, 0xb4, 0x15, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x4f, 0x00, 0x00, 0x00, 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0xf1, 0xff, 0x58, 0x00, 0x00, 0x00, 0x84, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x17, 0x00, 0x00, 0x00, 0x8c, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x49, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0xfc, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x7e, 0x00, 0x00, 0x00,
+  0x91, 0x02, 0x00, 0x00, 0x6c, 0x01, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x83, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x66, 0x75, 0x6e, 0x63, 0x64, 0x65, 0x73,
+  0x63, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x63, 0x6d, 0x70, 0x5f, 0x69,
+  0x6e, 0x74, 0x00, 0x24, 0x64, 0x00, 0x2e, 0x4c, 0x41, 0x4e, 0x43, 0x48,
+  0x4f, 0x52, 0x30, 0x00, 0x2e, 0x4c, 0x41, 0x4e, 0x43, 0x48, 0x4f, 0x52,
+  0x31, 0x00, 0x67, 0x5f, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x67, 0x5f, 0x6d,
+  0x65, 0x6d, 0x63, 0x70, 0x79, 0x00, 0x67, 0x5f, 0x73, 0x74, 0x72, 0x63,
+  0x6d, 0x70, 0x00, 0x67, 0x5f, 0x71, 0x73, 0x6f, 0x72, 0x74, 0x00, 0x5f,
+  0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f,
+  0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54,
+  0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49,
+  0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d, 0x61,
+  0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x73, 0x79, 0x73, 0x6c,
+  0x6f, 0x67, 0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00,
+  0x2e, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73,
+  0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00,
+  0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e,
+  0x73, 0x74, 0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e,
+  0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00, 0x2e, 0x74, 0x65, 0x78, 0x74, 0x00,
+  0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x00, 0x2e, 0x72, 0x6f, 0x66,
+  0x69, 0x78, 0x75, 0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69,
+  0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00, 0x2e, 0x64, 0x61, 0x74, 0x61,
+  0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41,
+  0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x04, 0x01, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x3c, 0x02, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x7c, 0x02, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00,
+  0x74, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
+  0x04, 0x04, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf8, 0x04, 0x00, 0x00, 0xf8, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xfc, 0x14, 0x00, 0x00, 0xfc, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x84, 0x15, 0x00, 0x00,
+  0x84, 0x05, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x64, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xa8, 0x15, 0x00, 0x00, 0xa8, 0x05, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfd, 0x05, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00,
+  0x0f, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x08, 0x00, 0x00,
+  0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x57, 0x09, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_funcdesc_len = 3204;
diff --git a/testing/fs/xipfs/lazymod_bin.h b/testing/fs/xipfs/lazymod_bin.h
new file mode 100644
index 000000000..f45037a50
--- /dev/null
+++ b/testing/fs/xipfs/lazymod_bin.h
@@ -0,0 +1,220 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/lazymod_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from lazymod.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_lazymod[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd5, 0x01, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x10, 0x06, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x10, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x3c, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x3c, 0x12, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x3c, 0x02, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x78, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x23, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0xd5, 0x01, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69,
+  0x6e, 0x00, 0x61, 0x74, 0x6f, 0x69, 0x00, 0x73, 0x79, 0x73, 0x6c, 0x6f,
+  0x67, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f,
+  0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x00,
+  0xc0, 0x12, 0x00, 0x00, 0xa4, 0x04, 0x00, 0x00, 0xc8, 0x12, 0x00, 0x00,
+  0xa4, 0x05, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x5f, 0xf8, 0x08, 0xc0, 0x4d, 0xf8, 0x04, 0xcd,
+  0xd9, 0xf8, 0x04, 0xc0, 0xd9, 0xf8, 0x00, 0xf0, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5f, 0xf8, 0x08, 0xc0,
+  0x4d, 0xf8, 0x04, 0xcd, 0xd9, 0xf8, 0x04, 0xc0, 0xd9, 0xf8, 0x00, 0xf0,
+  0x01, 0x28, 0x10, 0xb5, 0x4c, 0x46, 0x0b, 0xdd, 0x48, 0x68, 0xff, 0xf7,
+  0xe5, 0xff, 0xa1, 0x46, 0x02, 0x46, 0x04, 0x49, 0x06, 0x20, 0x79, 0x44,
+  0xff, 0xf7, 0xca, 0xff, 0x00, 0x20, 0x10, 0xbd, 0x01, 0x22, 0xf6, 0xe7,
+  0x0e, 0x00, 0x00, 0x00, 0x5b, 0x6c, 0x61, 0x7a, 0x79, 0x6d, 0x6f, 0x64,
+  0x5d, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x68, 0x72,
+  0x6f, 0x75, 0x67, 0x68, 0x20, 0x61, 0x20, 0x44, 0x54, 0x5f, 0x4a, 0x4d,
+  0x50, 0x52, 0x45, 0x4c, 0x20, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+  0x74, 0x6f, 0x72, 0x2c, 0x20, 0x73, 0x65, 0x65, 0x64, 0x20, 0x25, 0x64,
+  0x0a, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x33, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0x74, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0xff, 0xc4, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x74, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3c, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x0b, 0x00, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x11, 0x00, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff, 0x1a, 0x00, 0x00, 0x00,
+  0xb4, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x07, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00, 0xac, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xbc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0xd5, 0x01, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x08, 0x00, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x5d, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x6c, 0x61, 0x7a, 0x79, 0x6d, 0x6f, 0x64, 0x2e, 0x63, 0x00, 0x24,
+  0x74, 0x00, 0x24, 0x64, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d, 0x49,
+  0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f, 0x46,
+  0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x00,
+  0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e,
+  0x44, 0x5f, 0x5f, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52,
+  0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f,
+  0x5f, 0x00, 0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x61, 0x74, 0x6f,
+  0x69, 0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e,
+  0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74,
+  0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e,
+  0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73,
+  0x74, 0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x70, 0x6c, 0x74, 0x00,
+  0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74,
+  0x61, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e,
+  0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74,
+  0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41,
+  0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xe0, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+  0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x74, 0x01, 0x00, 0x00,
+  0x74, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x35, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x84, 0x01, 0x00, 0x00, 0x84, 0x01, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00,
+  0xfc, 0x01, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x38, 0x02, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x3c, 0x12, 0x00, 0x00, 0x3c, 0x02, 0x00, 0x00,
+  0x78, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb4, 0x12, 0x00, 0x00,
+  0xb4, 0x02, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x5f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x02, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x03, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x44, 0x03, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x1a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x34, 0x05, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x05, 0x00, 0x00,
+  0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_lazymod_len = 2192;
diff --git a/testing/fs/xipfs/libcounter_bin.h b/testing/fs/xipfs/libcounter_bin.h
new file mode 100644
index 000000000..de4db93eb
--- /dev/null
+++ b/testing/fs/xipfs/libcounter_bin.h
@@ -0,0 +1,208 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/libcounter_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from libcounter.so -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_libcounter[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xac, 0x05, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x0f, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00,
+  0xf8, 0x11, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0xd1, 0x01, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xe5, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x05, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x06, 0x00, 0x1c, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x06, 0x00, 0x00, 0x63, 0x6f, 0x75,
+  0x6e, 0x74, 0x65, 0x72, 0x5f, 0x62, 0x75, 0x6d, 0x70, 0x00, 0x63, 0x6f,
+  0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00,
+  0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49,
+  0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58,
+  0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6c, 0x69, 0x62,
+  0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x73, 0x6f, 0x00, 0x00,
+  0x8c, 0x12, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x03, 0x4b, 0x59, 0xf8,
+  0x03, 0x30, 0x1a, 0x68, 0x10, 0x44, 0x18, 0x60, 0x70, 0x47, 0x00, 0xbf,
+  0x0c, 0x00, 0x00, 0x00, 0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x18, 0x68,
+  0x70, 0x47, 0x00, 0xbf, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x4b, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xff, 0x6f,
+  0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a,
+  0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f,
+  0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32,
+  0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64,
+  0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29,
+  0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35,
+  0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65,
+  0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d,
+  0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01,
+  0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04,
+  0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf8, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x0e, 0x00, 0x00, 0x00,
+  0xd0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xe4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x09, 0x00, 0x14, 0x00, 0x00, 0x00, 0x90, 0x12, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x1e, 0x00, 0x00, 0x00,
+  0x90, 0x12, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0xf1, 0xff, 0x26, 0x00, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff, 0x2f, 0x00, 0x00, 0x00,
+  0x80, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0xd1, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x05, 0x00, 0x52, 0x00, 0x00, 0x00, 0xe5, 0x01, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x05, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x06, 0x00,
+  0x70, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x06, 0x00, 0x00, 0x6c, 0x69, 0x62, 0x63, 0x6f, 0x75, 0x6e,
+  0x74, 0x65, 0x72, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x24, 0x64, 0x00,
+  0x2e, 0x4c, 0x41, 0x4e, 0x43, 0x48, 0x4f, 0x52, 0x30, 0x00, 0x67, 0x5f,
+  0x63, 0x61, 0x6c, 0x6c, 0x73, 0x00, 0x5f, 0x44, 0x59, 0x4e, 0x41, 0x4d,
+  0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x4f,
+  0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f,
+  0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x62, 0x75, 0x6d,
+  0x70, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x6f,
+  0x74, 0x61, 0x6c, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f,
+  0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f,
+  0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73,
+  0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72,
+  0x74, 0x61, 0x62, 0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64,
+  0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74,
+  0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e,
+  0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75,
+  0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e,
+  0x67, 0x6f, 0x74, 0x00, 0x2e, 0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f,
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61,
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x38, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00,
+  0xec, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x29, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x7c, 0x01, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x00,
+  0xd0, 0x01, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xf4, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xf8, 0x11, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x57, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x90, 0x12, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd5, 0x02, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
+  0x0d, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x04, 0x00, 0x00,
+  0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x35, 0x05, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_libcounter_len = 2052;
diff --git a/testing/fs/xipfs/libshape_bin.h b/testing/fs/xipfs/libshape_bin.h
new file mode 100644
index 000000000..1c945fd9a
--- /dev/null
+++ b/testing/fs/xipfs/libshape_bin.h
@@ -0,0 +1,389 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/libshape_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from libshape.so -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_libshape[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x88, 0x0d, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x13, 0x00, 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00,
+  0xbc, 0x05, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00,
+  0xbc, 0x15, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xc4, 0x05, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00,
+  0xb0, 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x30, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x4c, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x74, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0c, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0d, 0x00, 0x3d, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0x4e, 0x00, 0x00, 0x00,
+  0x6d, 0x04, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0x6d, 0x00, 0x00, 0x00,
+  0x99, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x79, 0x00, 0x00, 0x00, 0xa9, 0x04, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0x8b, 0x00, 0x00, 0x00,
+  0xb8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+  0x85, 0x04, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67,
+  0x69, 0x73, 0x74, 0x72, 0x79, 0x44, 0x32, 0x45, 0x76, 0x00, 0x73, 0x79,
+  0x73, 0x6c, 0x6f, 0x67, 0x00, 0x73, 0x6e, 0x70, 0x72, 0x69, 0x6e, 0x74,
+  0x66, 0x00, 0x6f, 0x70, 0x65, 0x6e, 0x00, 0x66, 0x74, 0x72, 0x75, 0x6e,
+  0x63, 0x61, 0x74, 0x65, 0x00, 0x77, 0x72, 0x69, 0x74, 0x65, 0x00, 0x63,
+  0x6c, 0x6f, 0x73, 0x65, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67,
+  0x69, 0x73, 0x74, 0x72, 0x79, 0x44, 0x31, 0x45, 0x76, 0x00, 0x73, 0x68,
+  0x61, 0x70, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x73, 0x68, 0x61, 0x70,
+  0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, 0x00, 0x73, 0x74, 0x72,
+  0x6c, 0x63, 0x70, 0x79, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x74,
+  0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x63,
+  0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x65, 0x64, 0x00, 0x5f,
+  0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53,
+  0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6c, 0x69, 0x62, 0x73,
+  0x68, 0x61, 0x70, 0x65, 0x2e, 0x73, 0x6f, 0x00, 0xbc, 0x15, 0x00, 0x00,
+  0x17, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0xc0, 0x16, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x80, 0x16, 0x00, 0x00,
+  0xa4, 0x07, 0x00, 0x00, 0x88, 0x16, 0x00, 0x00, 0xa4, 0x09, 0x00, 0x00,
+  0x90, 0x16, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00, 0x98, 0x16, 0x00, 0x00,
+  0xa4, 0x0e, 0x00, 0x00, 0xa0, 0x16, 0x00, 0x00, 0xa4, 0x0f, 0x00, 0x00,
+  0xa8, 0x16, 0x00, 0x00, 0xa4, 0x12, 0x00, 0x00, 0xb0, 0x16, 0x00, 0x00,
+  0xa4, 0x13, 0x00, 0x00, 0xb8, 0x16, 0x00, 0x00, 0xa4, 0x15, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x2c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x34, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x44, 0x00, 0x00, 0x00, 0x10, 0xb5, 0x03, 0x4b, 0x59, 0xf8, 0x03, 0x00,
+  0xff, 0xf7, 0xaa, 0xff, 0x10, 0xbd, 0x00, 0xbf, 0x4c, 0x00, 0x00, 0x00,
+  0x00, 0x22, 0x07, 0x4b, 0x05, 0x49, 0x59, 0xf8, 0x03, 0x30, 0x06, 0x20,
+  0xc3, 0xe9, 0x00, 0x12, 0x04, 0x49, 0x9a, 0x60, 0x79, 0x44, 0x1a, 0x73,
+  0xff, 0xf7, 0xca, 0xbf, 0xe0, 0xa9, 0x5b, 0x00, 0x4c, 0x00, 0x00, 0x00,
+  0x3e, 0x01, 0x00, 0x00, 0x04, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x9a, 0x68,
+  0x01, 0x32, 0x9a, 0x60, 0x5a, 0x68, 0x10, 0x44, 0x58, 0x60, 0x70, 0x47,
+  0x4c, 0x00, 0x00, 0x00, 0x03, 0x4b, 0x01, 0x46, 0x59, 0xf8, 0x03, 0x00,
+  0x40, 0x22, 0x0c, 0x30, 0xff, 0xf7, 0xa6, 0xbf, 0x4c, 0x00, 0x00, 0x00,
+  0x02, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x58, 0x68, 0x70, 0x47, 0x00, 0xbf,
+  0x4c, 0x00, 0x00, 0x00, 0x05, 0x4b, 0x59, 0xf8, 0x03, 0x30, 0x18, 0x68,
+  0x02, 0x4b, 0xc3, 0x1a, 0x58, 0x42, 0x58, 0x41, 0x70, 0x47, 0x00, 0xbf,
+  0xe0, 0xa9, 0x5b, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x2d, 0xe9, 0xf0, 0x45,
+  0x1d, 0x49, 0x05, 0x46, 0x82, 0x68, 0x85, 0xb0, 0x06, 0x20, 0x79, 0x44,
+  0x4c, 0x46, 0xff, 0xf7, 0x8d, 0xff, 0x2b, 0x7b, 0xa1, 0x46, 0x1b, 0xb3,
+  0x18, 0x4a, 0x10, 0x21, 0x6b, 0x68, 0x7a, 0x44, 0x68, 0x46, 0xff, 0xf7,
+  0x5b, 0xff, 0x05, 0xf1, 0x0c, 0x07, 0xa1, 0x46, 0x82, 0x46, 0x4f, 0xf4,
+  0xd2, 0x72, 0x40, 0xf2, 0x41, 0x21, 0x38, 0x46, 0xff, 0xf7, 0x82, 0xff,
+  0x06, 0x1e, 0xa1, 0x46, 0x12, 0xdb, 0x51, 0x46, 0xff, 0xf7, 0x54, 0xff,
+  0x00, 0x28, 0xa1, 0x46, 0x05, 0xdb, 0x52, 0x46, 0x69, 0x46, 0x30, 0x46,
+  0xff, 0xf7, 0x56, 0xff, 0xa1, 0x46, 0x30, 0x46, 0xff, 0xf7, 0x7a, 0xff,
+  0x28, 0x46, 0x05, 0xb0, 0xbd, 0xe8, 0xf0, 0x85, 0x05, 0x49, 0x3a, 0x46,
+  0x06, 0x20, 0x79, 0x44, 0xff, 0xf7, 0x5c, 0xff, 0xf4, 0xe7, 0x00, 0xbf,
+  0x76, 0x00, 0x00, 0x00, 0x8e, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00,
+  0x20, 0x20, 0x5b, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5d,
+  0x20, 0x7e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x28, 0x29,
+  0x20, 0x72, 0x61, 0x6e, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x25,
+  0x64, 0x20, 0x61, 0x64, 0x64, 0x73, 0x0a, 0x00, 0x25, 0x64, 0x00, 0x20,
+  0x20, 0x5b, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5d, 0x20,
+  0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, 0x20, 0x25, 0x73, 0x20, 0x66, 0x61,
+  0x69, 0x6c, 0x65, 0x64, 0x0a, 0x00, 0x20, 0x20, 0x5b, 0x6c, 0x69, 0x62,
+  0x73, 0x68, 0x61, 0x70, 0x65, 0x5d, 0x20, 0x52, 0x65, 0x67, 0x69, 0x73,
+  0x74, 0x72, 0x79, 0x28, 0x29, 0x20, 0x72, 0x61, 0x6e, 0x0a, 0x00, 0x00,
+  0x74, 0x16, 0x00, 0x00, 0x45, 0x04, 0x00, 0x00, 0x31, 0x04, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00,
+  0xbc, 0x15, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x1a, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x20, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x74, 0x16, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0x6f,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc4, 0x16, 0x00, 0x00, 0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72,
+  0x6d, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68,
+  0x61, 0x69, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c,
+  0x31, 0x20, 0x28, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d,
+  0x2d, 0x31, 0x35, 0x2e, 0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e,
+  0x32, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33,
+  0x00, 0x41, 0x2c, 0x00, 0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00,
+  0x01, 0x22, 0x00, 0x00, 0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a,
+  0x07, 0x4d, 0x09, 0x02, 0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03,
+  0x18, 0x01, 0x19, 0x01, 0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xb8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc4, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x74, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0e, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0f, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x01, 0x00, 0x00, 0x00,
+  0xc4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x6c, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x84, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0x94, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x98, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xa4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0xa8, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xbc, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x44, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x07, 0x00, 0x00, 0x00, 0x45, 0x04, 0x00, 0x00,
+  0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x23, 0x00, 0x00, 0x00,
+  0x31, 0x04, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0xc0, 0x15, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xc4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
+  0x3f, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0d, 0x00, 0x49, 0x00, 0x00, 0x00, 0xc4, 0x16, 0x00, 0x00,
+  0x4c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x59, 0x00, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0xf1, 0xff, 0x62, 0x00, 0x00, 0x00, 0x74, 0x16, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0c, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x4c, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa0, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xa4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xb4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xb8, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xc8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xcc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0xdc, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xe0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf4, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x1c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x2c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x78, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0x89, 0x00, 0x00, 0x00,
+  0x6d, 0x04, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, 0x00, 0xad, 0x00, 0x00, 0x00,
+  0x99, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0xb9, 0x00, 0x00, 0x00, 0xa9, 0x04, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0xcb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xd5, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0xe3, 0x00, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00, 0xf3, 0x00, 0x00, 0x00,
+  0xb8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x00,
+  0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00,
+  0x85, 0x04, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x1d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x74, 0x00, 0x24, 0x64, 0x00, 0x5f,
+  0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x5f, 0x73, 0x75, 0x62, 0x5f,
+  0x49, 0x5f, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61, 0x70, 0x65, 0x2e, 0x63,
+  0x70, 0x70, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41, 0x4c, 0x5f, 0x5f,
+  0x73, 0x75, 0x62, 0x5f, 0x44, 0x5f, 0x6c, 0x69, 0x62, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x2e, 0x63, 0x70, 0x70, 0x00, 0x2e, 0x4c, 0x41, 0x4e, 0x43,
+  0x48, 0x4f, 0x52, 0x30, 0x00, 0x5f, 0x5a, 0x4c, 0x31, 0x30, 0x67, 0x5f,
+  0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x00, 0x5f, 0x44, 0x59,
+  0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41,
+  0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42,
+  0x4c, 0x45, 0x5f, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67, 0x69,
+  0x73, 0x74, 0x72, 0x79, 0x44, 0x31, 0x45, 0x76, 0x00, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x00, 0x73, 0x6e, 0x70, 0x72, 0x69,
+  0x6e, 0x74, 0x66, 0x00, 0x5f, 0x5a, 0x4e, 0x38, 0x52, 0x65, 0x67, 0x69,
+  0x73, 0x74, 0x72, 0x79, 0x44, 0x32, 0x45, 0x76, 0x00, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x5f, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x00, 0x73, 0x68, 0x61,
+  0x70, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
+  0x65, 0x64, 0x00, 0x66, 0x74, 0x72, 0x75, 0x6e, 0x63, 0x61, 0x74, 0x65,
+  0x00, 0x77, 0x72, 0x69, 0x74, 0x65, 0x00, 0x73, 0x74, 0x72, 0x6c, 0x63,
+  0x70, 0x79, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00,
+  0x73, 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x00, 0x6f, 0x70, 0x65, 0x6e, 0x00,
+  0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72,
+  0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x00, 0x00, 0x2e, 0x73, 0x79, 0x6d,
+  0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00,
+  0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x68,
+  0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79, 0x6d, 0x00,
+  0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72, 0x65, 0x6c,
+  0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00, 0x2e, 0x74,
+  0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x64, 0x61, 0x74, 0x61, 0x00,
+  0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78, 0x75, 0x70, 0x00, 0x2e, 0x69, 0x6e,
+  0x69, 0x74, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x00, 0x2e, 0x66, 0x69,
+  0x6e, 0x69, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x00, 0x2e, 0x64, 0x79,
+  0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00, 0x2e,
+  0x62, 0x73, 0x73, 0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74,
+  0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62,
+  0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
+  0x60, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00,
+  0x80, 0x02, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x38, 0x03, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00, 0x90, 0x03, 0x00, 0x00,
+  0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00,
+  0x30, 0x04, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+  0x4c, 0x05, 0x00, 0x00, 0x4c, 0x05, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00, 0xb8, 0x05, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xbc, 0x15, 0x00, 0x00,
+  0xbc, 0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x62, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xc0, 0x15, 0x00, 0x00, 0xc0, 0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xc4, 0x15, 0x00, 0x00, 0xc4, 0x05, 0x00, 0x00,
+  0xb0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x74, 0x16, 0x00, 0x00,
+  0x74, 0x06, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x7c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xc4, 0x16, 0x00, 0x00, 0xc4, 0x06, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x06, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x07, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0x00, 0x00, 0x90, 0x04, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x0b, 0x00, 0x00,
+  0x23, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xeb, 0x0c, 0x00, 0x00, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_libshape_len = 4224;
diff --git a/testing/fs/xipfs/manyneeded_bin.h b/testing/fs/xipfs/manyneeded_bin.h
new file mode 100644
index 000000000..c899dc662
--- /dev/null
+++ b/testing/fs/xipfs/manyneeded_bin.h
@@ -0,0 +1,302 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/manyneeded_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from manyneeded.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_manyneeded[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xfd, 0x03, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x10, 0x0a, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x0f, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x04, 0x00, 0x00,
+  0x4c, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x4c, 0x04, 0x00, 0x00, 0x4c, 0x14, 0x00, 0x00,
+  0x4c, 0x14, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x4c, 0x04, 0x00, 0x00, 0x4c, 0x14, 0x00, 0x00, 0x4c, 0x14, 0x00, 0x00,
+  0xd0, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x0d, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x48, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1c, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00, 0x4c, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x07, 0x00, 0x4e, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xfd, 0x03, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x06, 0x00, 0xc3, 0x00, 0x00, 0x00, 0x48, 0x04, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x07, 0x00, 0x66, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x30, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x31, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x32, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x33, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x34, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x35, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x36, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x37, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f, 0x6c,
+  0x65, 0x61, 0x66, 0x5f, 0x38, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x30, 0x2e,
+  0x73, 0x6f, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x31, 0x2e, 0x73, 0x6f, 0x00,
+  0x6e, 0x65, 0x65, 0x64, 0x32, 0x2e, 0x73, 0x6f, 0x00, 0x6e, 0x65, 0x65,
+  0x64, 0x33, 0x2e, 0x73, 0x6f, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x34, 0x2e,
+  0x73, 0x6f, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x35, 0x2e, 0x73, 0x6f, 0x00,
+  0x6e, 0x65, 0x65, 0x64, 0x36, 0x2e, 0x73, 0x6f, 0x00, 0x6e, 0x65, 0x65,
+  0x64, 0x37, 0x2e, 0x73, 0x6f, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x38, 0x2e,
+  0x73, 0x6f, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f,
+  0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00,
+  0x28, 0x15, 0x00, 0x00, 0xa4, 0x05, 0x00, 0x00, 0x30, 0x15, 0x00, 0x00,
+  0xa4, 0x06, 0x00, 0x00, 0x38, 0x15, 0x00, 0x00, 0xa4, 0x07, 0x00, 0x00,
+  0x40, 0x15, 0x00, 0x00, 0xa4, 0x08, 0x00, 0x00, 0x48, 0x15, 0x00, 0x00,
+  0xa4, 0x0a, 0x00, 0x00, 0x50, 0x15, 0x00, 0x00, 0xa4, 0x0d, 0x00, 0x00,
+  0x58, 0x15, 0x00, 0x00, 0xa4, 0x0e, 0x00, 0x00, 0x60, 0x15, 0x00, 0x00,
+  0xa4, 0x0f, 0x00, 0x00, 0x68, 0x15, 0x00, 0x00, 0xa4, 0x10, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x0c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x14, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x24, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x2c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x34, 0x00, 0x00, 0x00,
+  0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90,
+  0xdc, 0xf8, 0x00, 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x44, 0x00, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0, 0x0c, 0xeb, 0x09, 0x0c,
+  0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0, 0x4c, 0x00, 0x00, 0x00,
+  0x38, 0xb5, 0x4d, 0x46, 0xff, 0xf7, 0xac, 0xff, 0xa9, 0x46, 0x04, 0x46,
+  0xff, 0xf7, 0xee, 0xff, 0xa9, 0x46, 0x04, 0x44, 0xff, 0xf7, 0xb8, 0xff,
+  0xa9, 0x46, 0x04, 0x44, 0xff, 0xf7, 0xdc, 0xff, 0xa9, 0x46, 0x04, 0x44,
+  0xff, 0xf7, 0xce, 0xff, 0xa9, 0x46, 0x04, 0x44, 0xff, 0xf7, 0xa2, 0xff,
+  0xa9, 0x46, 0x04, 0x44, 0xff, 0xf7, 0xb2, 0xff, 0xa9, 0x46, 0x04, 0x44,
+  0xff, 0xf7, 0x86, 0xff, 0xa9, 0x46, 0x04, 0x44, 0xff, 0xf7, 0xb4, 0xff,
+  0x20, 0x44, 0x38, 0xbd, 0x1c, 0x15, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x72, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x8d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xa8, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xb1, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xba, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1c, 0x02, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0xe4, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x1c, 0x15, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x00, 0x03, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
+  0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xff, 0x6f, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x4c, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x48, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x14, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1c, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x0e, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x11, 0x00, 0x00, 0x00,
+  0x4c, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff,
+  0x1a, 0x00, 0x00, 0x00, 0x1c, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x09, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x58, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x5c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00, 0x6c, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x70, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x84, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x94, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x98, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00, 0xa8, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xac, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0xbc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0xd0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0xd4, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00, 0xe4, 0x03, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0xe8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x05, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x4b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00,
+  0x4c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x07, 0x00,
+  0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xfd, 0x03, 0x00, 0x00,
+  0x4c, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00, 0x84, 0x00, 0x00, 0x00,
+  0x48, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x07, 0x00,
+  0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0xa1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0xb9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6e, 0x79, 0x6e, 0x65, 0x65,
+  0x64, 0x65, 0x64, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x5f, 0x44, 0x59,
+  0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41,
+  0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42,
+  0x4c, 0x45, 0x5f, 0x00, 0x24, 0x64, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f,
+  0x6c, 0x65, 0x61, 0x66, 0x5f, 0x37, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f,
+  0x6c, 0x65, 0x61, 0x66, 0x5f, 0x30, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f,
+  0x6c, 0x65, 0x61, 0x66, 0x5f, 0x35, 0x00, 0x6e, 0x65, 0x65, 0x64, 0x5f,
+  0x6c, 0x65, 0x61, 0x66, 0x5f, 0x32, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6e,
+  0x65, 0x65, 0x64, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x36, 0x00, 0x6d,
+  0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x6e, 0x65, 0x65,
+  0x64, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x38, 0x00, 0x6e, 0x65, 0x65,
+  0x64, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x34, 0x00, 0x6e, 0x65, 0x65,
+  0x64, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x33, 0x00, 0x6e, 0x65, 0x65,
+  0x64, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x31, 0x00, 0x00, 0x2e, 0x73,
+  0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74, 0x61,
+  0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62, 0x00,
+  0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x79,
+  0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e, 0x72,
+  0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74, 0x00,
+  0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69, 0x78,
+  0x75, 0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x00,
+  0x2e, 0x67, 0x6f, 0x74, 0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
+  0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72, 0x69,
+  0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00,
+  0x10, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1c, 0x02, 0x00, 0x00,
+  0x1c, 0x02, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00,
+  0xfc, 0x03, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x48, 0x04, 0x00, 0x00, 0x48, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x4c, 0x14, 0x00, 0x00, 0x4c, 0x04, 0x00, 0x00,
+  0xd0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x15, 0x00, 0x00,
+  0x1c, 0x05, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x5c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x70, 0x05, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x05, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xe4, 0x05, 0x00, 0x00, 0xf0, 0x02, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x23, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xd4, 0x08, 0x00, 0x00, 0xc5, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x09, 0x00, 0x00,
+  0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_manyneeded_len = 3176;
diff --git a/testing/fs/xipfs/missingsym_bin.h b/testing/fs/xipfs/missingsym_bin.h
new file mode 100644
index 000000000..5971ffe99
--- /dev/null
+++ b/testing/fs/xipfs/missingsym_bin.h
@@ -0,0 +1,200 @@
+/****************************************************************************
+ * apps/testing/fs/xipfs/missingsym_bin.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Generated from missingsym.fdpic -- do not edit.
+ *
+ * An FDPIC module, embedded so the demo has something to load without
+ * needing a filesystem populated from the host first.
+ */
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const unsigned char g_missingsym[] =
+{
+  0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x41, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd9, 0x01, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x48, 0x05, 0x00, 0x00,
+  0x00, 0x02, 0x00, 0x05, 0x34, 0x00, 0x20, 0x00, 0x04, 0x00, 0x28, 0x00,
+  0x0f, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0xe0, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xe0, 0x11, 0x00, 0x00,
+  0xe0, 0x11, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xe0, 0x01, 0x00, 0x00, 0xe0, 0x11, 0x00, 0x00, 0xe0, 0x11, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x51, 0xe5, 0x74, 0x64, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x80, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x68, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x09, 0x00, 0x30, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0xd9, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00,
+  0x1f, 0x00, 0x00, 0x00, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x07, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69,
+  0x6e, 0x00, 0x5f, 0x5f, 0x78, 0x69, 0x70, 0x66, 0x73, 0x5f, 0x74, 0x65,
+  0x73, 0x74, 0x5f, 0x6e, 0x6f, 0x6e, 0x65, 0x78, 0x69, 0x73, 0x74, 0x65,
+  0x6e, 0x74, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55, 0x50,
+  0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x52, 0x4f,
+  0x46, 0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00,
+  0x74, 0x12, 0x00, 0x00, 0xa4, 0x08, 0x00, 0x00, 0xdf, 0xf8, 0x0c, 0xc0,
+  0x0c, 0xeb, 0x09, 0x0c, 0xdc, 0xf8, 0x04, 0x90, 0xdc, 0xf8, 0x00, 0xf0,
+  0x0c, 0x00, 0x00, 0x00, 0xff, 0xf7, 0xf4, 0xbf, 0x68, 0x12, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x7c, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x68, 0x12, 0x00, 0x00,
+  0x11, 0x00, 0x00, 0x00, 0xbc, 0x01, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xff, 0x6f,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x43, 0x43, 0x3a, 0x20, 0x28, 0x41, 0x72, 0x6d, 0x20, 0x47, 0x4e,
+  0x55, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20,
+  0x31, 0x35, 0x2e, 0x32, 0x2e, 0x52, 0x65, 0x6c, 0x31, 0x20, 0x28, 0x42,
+  0x75, 0x69, 0x6c, 0x64, 0x20, 0x61, 0x72, 0x6d, 0x2d, 0x31, 0x35, 0x2e,
+  0x38, 0x36, 0x29, 0x29, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x2e, 0x31, 0x20,
+  0x32, 0x30, 0x32, 0x35, 0x31, 0x32, 0x30, 0x33, 0x00, 0x41, 0x2c, 0x00,
+  0x00, 0x00, 0x61, 0x65, 0x61, 0x62, 0x69, 0x00, 0x01, 0x22, 0x00, 0x00,
+  0x00, 0x05, 0x37, 0x2d, 0x4d, 0x00, 0x06, 0x0a, 0x07, 0x4d, 0x09, 0x02,
+  0x12, 0x04, 0x14, 0x01, 0x15, 0x01, 0x17, 0x03, 0x18, 0x01, 0x19, 0x01,
+  0x1a, 0x01, 0x1e, 0x04, 0x22, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x7c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xbc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x11, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x68, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x09, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff,
+  0x0e, 0x00, 0x00, 0x00, 0xd8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xf1, 0xff, 0x11, 0x00, 0x00, 0x00,
+  0xe0, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xf1, 0xff,
+  0x1a, 0x00, 0x00, 0x00, 0x68, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x09, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0xd4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+  0x33, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x07, 0x00, 0x43, 0x00, 0x00, 0x00, 0xd9, 0x01, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x12, 0x00, 0x06, 0x00, 0x48, 0x00, 0x00, 0x00,
+  0xdc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x07, 0x00,
+  0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67,
+  0x73, 0x79, 0x6d, 0x2e, 0x63, 0x00, 0x24, 0x74, 0x00, 0x5f, 0x44, 0x59,
+  0x4e, 0x41, 0x4d, 0x49, 0x43, 0x00, 0x5f, 0x47, 0x4c, 0x4f, 0x42, 0x41,
+  0x4c, 0x5f, 0x4f, 0x46, 0x46, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x42,
+  0x4c, 0x45, 0x5f, 0x00, 0x24, 0x64, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46,
+  0x49, 0x58, 0x55, 0x50, 0x5f, 0x45, 0x4e, 0x44, 0x5f, 0x5f, 0x00, 0x6d,
+  0x61, 0x69, 0x6e, 0x00, 0x5f, 0x5f, 0x52, 0x4f, 0x46, 0x49, 0x58, 0x55,
+  0x50, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x78,
+  0x69, 0x70, 0x66, 0x73, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6e, 0x6f,
+  0x6e, 0x65, 0x78, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x2e,
+  0x73, 0x79, 0x6d, 0x74, 0x61, 0x62, 0x00, 0x2e, 0x73, 0x74, 0x72, 0x74,
+  0x61, 0x62, 0x00, 0x2e, 0x73, 0x68, 0x73, 0x74, 0x72, 0x74, 0x61, 0x62,
+  0x00, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73,
+  0x79, 0x6d, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x73, 0x74, 0x72, 0x00, 0x2e,
+  0x72, 0x65, 0x6c, 0x2e, 0x64, 0x79, 0x6e, 0x00, 0x2e, 0x70, 0x6c, 0x74,
+  0x00, 0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x2e, 0x72, 0x6f, 0x66, 0x69,
+  0x78, 0x75, 0x70, 0x00, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
+  0x00, 0x2e, 0x67, 0x6f, 0x74, 0x00, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65,
+  0x6e, 0x74, 0x00, 0x2e, 0x41, 0x52, 0x4d, 0x2e, 0x61, 0x74, 0x74, 0x72,
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xb4, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00,
+  0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x00, 0x00,
+  0x7c, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x31, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xbc, 0x01, 0x00, 0x00, 0xbc, 0x01, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xd8, 0x01, 0x00, 0x00,
+  0xd8, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x45, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xdc, 0x01, 0x00, 0x00, 0xdc, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0xe0, 0x11, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00,
+  0x88, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x68, 0x12, 0x00, 0x00,
+  0x68, 0x02, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x5c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x7c, 0x02, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x02, 0x00, 0x00,
+  0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf0, 0x02, 0x00, 0x00, 0x70, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+  0x13, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x60, 0x04, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd2, 0x04, 0x00, 0x00,
+  0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const unsigned int g_missingsym_len = 1952;
diff --git a/testing/fs/xipfs/xipfs_main.c b/testing/fs/xipfs/xipfs_main.c
index 6f2ad2612..8bc3f4047 100644
--- a/testing/fs/xipfs/xipfs_main.c
+++ b/testing/fs/xipfs/xipfs_main.c
@@ -46,6 +46,21 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/fs/xipfs.h>
 
+#ifdef CONFIG_FDPIC
+#  include <elf.h>
+#  include <spawn.h>
+
+#  include "libshape_bin.h"
+#  include "cxxuser_bin.h"
+#  include "funcdesc_bin.h"
+#  include "lazymod_bin.h"
+#  include "libcounter_bin.h"
+#  include "counteruser_bin.h"
+#  include "callback_bin.h"
+#  include "missingsym_bin.h"
+#  include "manyneeded_bin.h"
+#endif
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -1948,6 +1963,701 @@ static void test_powerloss_dirs(void)
   unlink(PATH("d_file.bin"));
 }
 
+#ifdef CONFIG_FDPIC
+
+/****************************************************************************
+ * Test: FDPIC modules loaded out of the filesystem
+ *
+ * These are here rather than in the demo because the properties they check
+ * are the ones that fail *quietly*.  A loader that skips DT_INIT_ARRAY runs
+ * a C++ module perfectly happily with every global left as zero; one that
+ * skips DT_JMPREL loads a module that hard-faults only once it calls out;
+ * one that mis-sizes the descriptor pool corrupts the heap. None of those
+ * announce themselves, so they need something that asserts.
+ *
+ * The module exit status is the channel: each module checks its own
+ * invariants, and the C++ one returns a bitmask so that all four of its
+ * properties are evaluated on every run instead of the first failure hiding
+ * the rest.
+ ****************************************************************************/
+
+/* Kept in step with ../../../examples/fdpicxip/modules/cxxuser.cpp */
+
+#define USER_FAIL_OWN_CTOR  0x01
+#define USER_FAIL_LIB_CTOR  0x02
+#define USER_FAIL_ORDER     0x04
+#define USER_FAIL_PRIVATE   0x08
+
+/* Kept in step with ../../../examples/fdpicxip/modules/callback.c */
+
+#define CB_FAIL_QSORT       0x01
+#define CB_FAIL_PTHREAD     0x02
+#define CB_FAIL_SIGNAL      0x04
+#define CB_FAIL_TASK        0x08
+#define CB_FAIL_ONCE        0x10
+#define CB_FAIL_SPAWN       0x20
+#define CB_FAIL_SCANDIR     0x40
+#define CB_FAIL_SIGACTION   0x80
+
+/* The mq checks run as a second invocation ("callback mq") and report in
+ * their own byte, because waitpid only preserves the low eight bits of an
+ * exit status and the checks above already fill them.
+ */
+
+#define CB_FAIL_MQ_THREAD    0x01
+#define CB_FAIL_MQ_SIGNAL    0x02
+#define CB_FAIL_TIMER_THREAD 0x04
+
+static int stage_blob(FAR const char *path, FAR const unsigned char *data,
+                      unsigned int len)
+{
+  ssize_t nwritten;
+  int fd;
+
+  unlink(path);
+
+  fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644);
+  if (fd < 0)
+    {
+      return -errno;
+    }
+
+  /* Declare the size up front so the extent is reserved exactly */
+
+  if (ftruncate(fd, len) < 0)
+    {
+      close(fd);
+      return -errno;
+    }
+
+  nwritten = write(fd, data, len);
+  close(fd);
+
+  return (nwritten == (ssize_t)len) ? 0 : -EIO;
+}
+
+/****************************************************************************
+ * Name: run_module
+ *
+ * Description:
+ *   Spawn a module and return its exit status, or a negative errno if it
+ *   never got as far as exiting.
+ *
+ *   Note that binfmt reports a loader failure as -ENOENT, because at the
+ *   dispatch layer "the loader refused it" and "not my format" are the same
+ *   answer.  A spawn failure here therefore says nothing about *why*; the
+ *   reason only reaches the syslog.
+ *
+ ****************************************************************************/
+
+static int run_module(FAR const char *path, FAR char *const argv[])
+{
+  int status;
+  pid_t pid;
+  int ret;
+
+  ret = posix_spawn(&pid, path, NULL, NULL, argv, NULL);
+  if (ret != 0)
+    {
+      return -ret;
+    }
+
+  if (waitpid(pid, &status, 0) < 0)
+    {
+      return -errno;
+    }
+
+  if (!WIFEXITED(status))
+    {
+      return -ECHILD;
+    }
+
+  return WEXITSTATUS(status);
+}
+
+/****************************************************************************
+ * Name: read_marker
+ *
+ * Description:
+ *   Read back the integer a module's destructor left behind, or -1.
+ *
+ ****************************************************************************/
+
+static int read_marker(FAR const char *path)
+{
+  char buf[16];
+  ssize_t nread;
+  int fd;
+
+  fd = open(path, O_RDONLY | O_CLOEXEC);
+  if (fd < 0)
+    {
+      return -1;
+    }
+
+  nread = read(fd, buf, sizeof(buf) - 1);
+  close(fd);
+
+  if (nread <= 0)
+    {
+      return -1;
+    }
+
+  buf[nread] = '\0';
+  return atoi(buf);
+}
+
+static void test_fdpic(void)
+{
+  struct xipfs_extent_info_s info;
+  FAR unsigned char *corrupt;
+  char marker[2][64];
+  char result[2][64];
+  char seed[2][8];
+  FAR char *args[5];
+  pid_t pid[2];
+  int fails;
+  bool ok;
+  int ret;
+  int i;
+
+  printf("\n-- FDPIC modules --\n");
+
+  /* A module whose imported function pointers are R_ARM_FUNCDESC: the
+   * loader has to manufacture a descriptor for each out of the pool behind
+   * the writable segment.  Nothing else in the tree emits one.  It calls
+   * through every one of them, because a descriptor with the wrong entry or
+   * the wrong GOT half is invisible until it is branched through.
+   */
+
+  ret = stage_blob(PATH("funcdesc"), g_funcdesc, g_funcdesc_len);
+  CHECK("stage the FUNCDESC module", ret == 0, strerror(-ret));
+
+  args[0] = (FAR char *)"funcdesc";
+  args[1] = (FAR char *)"7";
+  args[2] = NULL;
+
+  ret = run_module(PATH("funcdesc"), args);
+  CHECK("descriptors manufactured by the loader are callable",
+        ret == 0, ret < 0 ? strerror(-ret) : "module reported failure");
+
+  unlink(PATH("funcdesc"));
+
+  /* A module linked without -z now, so every import is in DT_JMPREL and
+   * there is no DT_REL at all.  Before the loader walked that table this
+   * loaded cleanly and then hard-faulted on its first call out.
+   */
+
+  ret = stage_blob(PATH("lazymod"), g_lazymod, g_lazymod_len);
+  CHECK("stage the DT_JMPREL module", ret == 0, strerror(-ret));
+
+  args[0] = (FAR char *)"lazymod";
+  args[1] = (FAR char *)"42";
+  args[2] = NULL;
+
+  ret = run_module(PATH("lazymod"), args);
+  CHECK("a module bound entirely through DT_JMPREL runs",
+        ret == 0, ret < 0 ? strerror(-ret) : "module reported failure");
+
+  unlink(PATH("lazymod"));
+
+  /* Function pointers handed the other way: from the module into firmware
+   * that will branch to them later.
+   *
+   * In FDPIC such a pointer is the address of a descriptor sitting in the
+   * module's writable segment, so firmware that treats it as a code address
+   * jumps into RAM data.  Only entry points that resolve the descriptor can
+   * accept one.  qsort and bsearch always did; pthread_create, signal and
+   * task_create looked usable and took the board down instead.
+   *
+   * The module reports a bitmask, so all four are evaluated per run.
+   */
+
+  ret = stage_blob(PATH("callback"), g_callback, g_callback_len);
+  CHECK("stage the callback module", ret == 0, strerror(-ret));
+
+  args[0] = (FAR char *)"callback";
+  args[1] = NULL;
+
+  fails = run_module(PATH("callback"), args);
+
+  CHECK("the callback module runs at all", fails >= 0,
+        fails < 0 ? strerror(-fails) : "");
+
+  if (fails < 0)
+    {
+      fails = CB_FAIL_QSORT | CB_FAIL_PTHREAD | CB_FAIL_SIGNAL |
+              CB_FAIL_TASK | CB_FAIL_ONCE | CB_FAIL_SPAWN |
+              CB_FAIL_SCANDIR | CB_FAIL_SIGACTION;
+    }
+
+  CHECK("qsort() calls back into a module comparison function",
+        (fails & CB_FAIL_QSORT) == 0, "callback did not run");
+  CHECK("pthread_create() accepts a module start routine",
+        (fails & CB_FAIL_PTHREAD) == 0, "thread did not reach module code");
+  CHECK("signal() accepts a module handler",
+        (fails & CB_FAIL_SIGNAL) == 0, "handler did not run");
+  CHECK("task_create() accepts a module entry point",
+        (fails & CB_FAIL_TASK) == 0, "task did not reach module code");
+  CHECK("sigaction() accepts a module handler",
+        (fails & CB_FAIL_SIGACTION) == 0, "handler did not run");
+  CHECK("pthread_once() accepts a module init routine",
+        (fails & CB_FAIL_ONCE) == 0, "init routine did not run");
+  CHECK("task_spawn() accepts a module entry point",
+        (fails & CB_FAIL_SPAWN) == 0, "task did not reach module code");
+
+  /* scandir passes its comparison function on to qsort, which resolves it
+   * too.  Exercising filter and comparison together is what would catch the
+   * comparison function being resolved twice.
+   */
+
+  CHECK("scandir() accepts a module filter and comparison function",
+        (fails & CB_FAIL_SCANDIR) == 0, "filter did not run");
+
+  /* mq_notify runs as a second invocation: its two outcomes report in their
+   * own byte, since the checks above already fill the eight bits waitpid
+   * preserves.  Both SIGEV_THREAD callbacks run on a work-queue worker with
+   * the module's data base installed around the call, so they reach the
+   * module's own globals; SIGEV_SIGNAL is caught by a sigaction handler.
+   */
+
+  args[1] = (FAR char *)"mq";
+  args[2] = NULL;
+  fails = run_module(PATH("callback"), args);
+
+  if (fails < 0)
+    {
+      fails = CB_FAIL_MQ_THREAD | CB_FAIL_MQ_SIGNAL | CB_FAIL_TIMER_THREAD;
+    }
+
+  CHECK("mq_notify(SIGEV_THREAD) reaches a module callback on the worker",
+        (fails & CB_FAIL_MQ_THREAD) == 0, "callback did not reach module");
+  CHECK("mq_notify(SIGEV_SIGNAL) reaches a module sigaction handler",
+        (fails & CB_FAIL_MQ_SIGNAL) == 0, "handler did not run");
+  CHECK("timer_create(SIGEV_THREAD) reaches a module callback on the worker",
+        (fails & CB_FAIL_TIMER_THREAD) == 0, "callback did not reach");
+
+  unlink(PATH("callback"));
+
+  /* A module the loader must refuse.
+   *
+   * The OS/ABI byte is the FDPIC marker, and it is the only thing that
+   * distinguishes a module from any other ELF shared object.  Clearing it
+   * should make the loader decline rather than march on and try to relocate
+   * something that is not a module -- and a loader that accepts anything is
+   * a loader whose acceptance means nothing, so this is worth asserting.
+   *
+   * Built by corrupting a module that is known to load, so nothing but the
+   * marker differs.
+   */
+
+  corrupt = malloc(g_funcdesc_len);
+  if (corrupt != NULL)
+    {
+      /* xipfs is write-once, so the edit happens on the way in.  EI_OSABI
+       * is byte 7; clearing it to ELFOSABI_NONE leaves a file that is a
+       * perfectly valid ELF shared object and simply not a module.
+       */
+
+      memcpy(corrupt, g_funcdesc, g_funcdesc_len);
+      corrupt[EI_OSABI] = ELFOSABI_NONE;
+
+      ret = stage_blob(PATH("corrupt"), corrupt, g_funcdesc_len);
+      free(corrupt);
+    }
+  else
+    {
+      ret = -ENOMEM;
+    }
+
+  CHECK("stage a module with the FDPIC marker cleared", ret == 0,
+        strerror(-ret));
+
+  if (ret == 0)
+    {
+      args[0] = (FAR char *)"corrupt";
+      args[1] = NULL;
+
+      CHECK("a module without the FDPIC marker is refused",
+            run_module(PATH("corrupt"), args) < 0, "it loaded anyway");
+    }
+
+  unlink(PATH("corrupt"));
+
+  /* A leaf library -- one that calls nothing outside itself.
+   *
+   * With no external calls there is no PLT and so no DT_PLTGOT, and the
+   * loader has to fall back to PT_DYNAMIC vaddr + memsz to find the GOT.
+   * That fallback is inferred from the linker's layout rather than from the
+   * ABI document, which makes it the least certain thing in the loader.
+   * libshape below does not exercise it -- it calls syslog, so it has a
+   * PLT.  If the fallback were wrong the library could not reach its own
+   * globals, and the total would come back wrong.
+   */
+
+  ret = stage_blob(PATH("libcounter.so"), g_libcounter, g_libcounter_len);
+  CHECK("stage the leaf library", ret == 0, strerror(-ret));
+
+  ret = stage_blob(PATH("counteruser"), g_counteruser, g_counteruser_len);
+  CHECK("stage its consumer", ret == 0, strerror(-ret));
+
+  args[0] = (FAR char *)"counteruser";
+  args[1] = (FAR char *)"2";
+  args[2] = NULL;
+
+  ret = run_module(PATH("counteruser"), args);
+  CHECK("a leaf library with no DT_PLTGOT reaches its own data",
+        ret == 0, ret < 0 ? strerror(-ret) : "wrong total");
+
+  unlink(PATH("counteruser"));
+  unlink(PATH("libcounter.so"));
+
+  /* C++: a shared library and a module, both with global objects.  Two
+   * instances run concurrently, because private-per-instance library state
+   * is only observable while they overlap.
+   */
+
+  ret = stage_blob(PATH("libshape.so"), g_libshape, g_libshape_len);
+  CHECK("stage the C++ shared library", ret == 0, strerror(-ret));
+
+  ret = stage_blob(PATH("cxxuser"), g_cxxuser, g_cxxuser_len);
+  CHECK("stage the C++ module", ret == 0, strerror(-ret));
+
+  for (i = 0; i < 2; i++)
+    {
+      snprintf(seed[i], sizeof(seed[i]), "%d", i + 1);
+      snprintf(marker[i], sizeof(marker[i]), PATH("dtor%d"), i + 1);
+      snprintf(result[i], sizeof(result[i]), PATH("res%d"), i + 1);
+      unlink(marker[i]);
+      unlink(result[i]);
+
+      args[0] = (FAR char *)"cxxuser";
+      args[1] = seed[i];
+      args[2] = marker[i];
+      args[3] = result[i];
+      args[4] = NULL;
+
+      if (posix_spawn(&pid[i], PATH("cxxuser"), NULL, NULL, args, NULL) != 0)
+        {
+          pid[i] = -1;
+        }
+    }
+
+  CHECK("two C++ instances spawn", pid[0] > 0 && pid[1] > 0,
+        "posix_spawn failed");
+
+  usleep(150000);
+
+  ret = extent_info(PATH("libshape.so"), &info);
+  CHECK("one flash copy of the library, pinned once per instance",
+        ret == 0 && info.pincount == 2, "wrong pin count");
+
+  /* Wait for both, but do not read the exit status from waitpid().
+   *
+   * waitpid() only keeps the status of an already-exited child when
+   * CONFIG_SCHED_CHILD_STATUS is set, which needs CONFIG_SCHED_HAVE_PARENT
+   * -- neither of which this test should require.  Both instances run for
+   * the same 300ms, so the second has always exited by the time the first
+   * waitpid() returns, and its status is simply gone.  Each instance
+   * therefore records its own result in a file, which survives both the
+   * task and the unload.  waitpid() here is only a barrier, and may fail.
+   */
+
+  for (i = 0; i < 2; i++)
+    {
+      int status;
+
+      if (pid[i] > 0)
+        {
+          waitpid(pid[i], &status, 0);
+        }
+    }
+
+  fails = 0;
+  ok    = true;
+
+  for (i = 0; i < 2; i++)
+    {
+      ret = read_marker(result[i]);
+      if (ret < 0)
+        {
+          ok = false;
+        }
+      else
+        {
+          fails |= ret;
+        }
+    }
+
+  CHECK("both C++ instances ran to completion", ok,
+        "an instance left no result");
+
+  CHECK("the module's own global constructor ran",
+        (fails & USER_FAIL_OWN_CTOR) == 0, "global left as .bss");
+  CHECK("the library's global constructor ran",
+        (fails & USER_FAIL_LIB_CTOR) == 0, "global left as .bss");
+  CHECK("the library was constructed before the module needing it",
+        (fails & USER_FAIL_ORDER) == 0, "wrong DT_NEEDED order");
+  CHECK("each instance has its own copy of the library's data",
+        (fails & USER_FAIL_PRIVATE) == 0, "library state was shared");
+
+  /* Destructors run on unload, which happens as each task is reaped --
+   * after waitpid() has already returned.
+   */
+
+  usleep(200000);
+
+  ok = true;
+  for (i = 0; i < 2; i++)
+    {
+      if (read_marker(marker[i]) != (i + 1) * 3)
+        {
+          ok = false;
+        }
+    }
+
+  CHECK("destructors ran on unload, each with its instance's own state",
+        ok, "marker missing or wrong");
+
+  ret = extent_info(PATH("libshape.so"), &info);
+  CHECK("the library's pins return to zero once both instances are gone",
+        ret == 0 && info.pincount == 0, "pin leaked");
+
+  for (i = 0; i < 2; i++)
+    {
+      unlink(marker[i]);
+      unlink(result[i]);
+    }
+
+  unlink(PATH("cxxuser"));
+  unlink(PATH("libshape.so"));
+}
+
+/****************************************************************************
+ * Name: dup_blob
+ *
+ * Description:
+ *   A private, writable copy of an embedded module image, for mutating into
+ *   a malformed one.  The original is const .rodata and must not be touched.
+ *
+ ****************************************************************************/
+
+static FAR unsigned char *dup_blob(FAR const unsigned char *src,
+                                   unsigned int len)
+{
+  FAR unsigned char *copy = malloc(len);
+
+  if (copy != NULL)
+    {
+      memcpy(copy, src, len);
+    }
+
+  return copy;
+}
+
+/****************************************************************************
+ * Name: corrupt_dyn
+ *
+ * Description:
+ *   Rewrite the value of one PT_DYNAMIC tag in place.  Returns true if the
+ *   tag was present.  This reaches the dynamic array straight through the
+ *   program header's file offset, so it needs no vaddr-to-file mapping.
+ *
+ ****************************************************************************/
+
+static bool corrupt_dyn(FAR unsigned char *buf, unsigned int len,
+                        int32_t tag, uint32_t newval)
+{
+  FAR const Elf32_Ehdr *eh = (FAR const Elf32_Ehdr *)buf;
+  FAR const Elf32_Phdr *ph;
+  unsigned int i;
+
+  if (len < sizeof(Elf32_Ehdr) ||
+      eh->e_phoff + (uint32_t)eh->e_phnum * sizeof(Elf32_Phdr) > len)
+    {
+      return false;
+    }
+
+  ph = (FAR const Elf32_Phdr *)(buf + eh->e_phoff);
+  for (i = 0; i < eh->e_phnum; i++)
+    {
+      if (ph[i].p_type == PT_DYNAMIC &&
+          ph[i].p_offset + ph[i].p_filesz <= len)
+        {
+          FAR Elf32_Dyn *dyn = (FAR Elf32_Dyn *)(buf + ph[i].p_offset);
+          unsigned int n = ph[i].p_filesz / sizeof(Elf32_Dyn);
+          unsigned int j;
+
+          for (j = 0; j < n && dyn[j].d_tag != DT_NULL; j++)
+            {
+              if (dyn[j].d_tag == tag)
+                {
+                  dyn[j].d_un.d_val = newval;
+                  return true;
+                }
+            }
+        }
+    }
+
+  return false;
+}
+
+/****************************************************************************
+ * Name: expect_refused
+ *
+ * Description:
+ *   Stage an image and assert the loader declines it.  A refusal is any
+ *   negative return: binfmt collapses "the loader rejected it" and "not my
+ *   format" into one answer (see run_module), which is all this needs to
+ *   know -- the point is that a malformed image never loads and runs.
+ *
+ ****************************************************************************/
+
+static void expect_refused(FAR const char *what,
+                           FAR const unsigned char *img, unsigned int len)
+{
+  FAR char *args[2];
+  int ret;
+
+  ret = stage_blob(PATH("reject"), img, len);
+  if (ret < 0)
+    {
+      CHECK(what, false, "could not stage the mutant");
+      return;
+    }
+
+  args[0] = (FAR char *)"reject";
+  args[1] = NULL;
+
+  CHECK(what, run_module(PATH("reject"), args) < 0, "it loaded anyway");
+  unlink(PATH("reject"));
+}
+
+/****************************************************************************
+ * Test: the loader refuses malformed modules
+ *
+ * A loader that accepts anything is a loader whose acceptance means nothing.
+ * The paths above are what the loader does when it succeeds; these are its
+ * rejections.  Each is synthesised by mutating a module that is known to
+ * load, so nothing but the defect under test differs, and each must come
+ * back *refused* rather than loaded-and-then-faulting -- the latter is the
+ * failure mode that takes the board down instead of printing FAIL.
+ ****************************************************************************/
+
+static void test_fdpic_reject(void)
+{
+  FAR unsigned char *img;
+  int ret;
+
+  printf("\n-- FDPIC loader rejections --\n");
+
+  /* A 64-bit class byte: the loader is 32-bit only. */
+
+  img = dup_blob(g_funcdesc, g_funcdesc_len);
+  if (img != NULL)
+    {
+      img[EI_CLASS] = ELFCLASS64;
+      expect_refused("a non-32-bit ELF class is refused", img,
+                     g_funcdesc_len);
+      free(img);
+    }
+
+  /* Not a shared object.  An FDPIC module is ET_DYN; anything else is not a
+   * module even with the FDPIC marker set.
+   */
+
+  img = dup_blob(g_funcdesc, g_funcdesc_len);
+  if (img != NULL)
+    {
+      ((FAR Elf32_Ehdr *)img)->e_type = ET_EXEC;
+      expect_refused("a non-ET_DYN object is refused", img, g_funcdesc_len);
+      free(img);
+    }
+
+  /* Wrong machine.  A module built for another architecture must be turned
+   * away before any of its relocations are applied.
+   */
+
+  img = dup_blob(g_funcdesc, g_funcdesc_len);
+  if (img != NULL)
+    {
+      ((FAR Elf32_Ehdr *)img)->e_machine = EM_X86_64;
+      expect_refused("a module for the wrong machine is refused", img,
+                     g_funcdesc_len);
+      free(img);
+    }
+
+  /* RELA PLT relocations.  Nothing in the loader reads RELA; an object
+   * claiming that layout for its PLT must be refused, not walked as REL --
+   * the entries are 12 bytes rather than 8, so misreading them would apply
+   * garbage.  lazymod carries its imports in DT_JMPREL, so it has the
+   * DT_PLTREL tag to flip.
+   */
+
+  img = dup_blob(g_lazymod, g_lazymod_len);
+  if (img != NULL)
+    {
+      if (corrupt_dyn(img, g_lazymod_len, DT_PLTREL, DT_RELA))
+        {
+          expect_refused("a module with RELA PLT relocations is refused",
+                         img, g_lazymod_len);
+        }
+      else
+        {
+          CHECK("a module with RELA PLT relocations is refused", false,
+                "lazymod has no DT_PLTREL to corrupt");
+        }
+
+      free(img);
+    }
+
+  /* A named dependency that is not there.  counteruser needs libcounter.so;
+   * with the library absent the loader must fail the whole load rather than
+   * leave the module's imports dangling.
+   */
+
+  ret = stage_blob(PATH("counteruser"), g_counteruser, g_counteruser_len);
+  if (ret == 0)
+    {
+      FAR char *args[3];
+
+      unlink(PATH("libcounter.so"));
+
+      args[0] = (FAR char *)"counteruser";
+      args[1] = (FAR char *)"2";
+      args[2] = NULL;
+
+      CHECK("a module whose needed library is absent is refused",
+            run_module(PATH("counteruser"), args) < 0, "it loaded anyway");
+
+      unlink(PATH("counteruser"));
+    }
+  else
+    {
+      CHECK("a module whose needed library is absent is refused", false,
+            "could not stage counteruser");
+    }
+
+  /* An import the firmware does not export.  The module links cleanly -- the
+   * symbol is just an undefined import -- so the loader is the only thing
+   * that can catch it, when resolution fails rather than at link time.  This
+   * is a different path from the absent-library case above: the dependency
+   * resolves, the symbol inside it does not.
+   */
+
+  expect_refused("a module importing an unexported symbol is refused",
+                 g_missingsym, g_missingsym_len);
+
+  /* More than FDPIC_MAX_NEEDED (8) DT_NEEDED entries.  The module is refused
+   * while its dynamic section is parsed, before any dependency is loaded, so
+   * the nine libraries it was linked against need not be present.
+   */
+
+  expect_refused("a module with too many DT_NEEDED entries is refused",
+                 g_manyneeded, g_manyneeded_len);
+}
+#endif /* CONFIG_FDPIC */
+
 /****************************************************************************
  * Name: want
  *
@@ -2012,6 +2722,10 @@ int main(int argc, FAR char *argv[])
   SECTION("multimap",  test_multimap);
   SECTION("crosstask", test_crosstask_pins);
   SECTION("teardown",  test_teardown_release);
+#ifdef CONFIG_FDPIC
+  SECTION("fdpic",     test_fdpic);
+  SECTION("reject",    test_fdpic_reject);
+#endif
   SECTION("dirs",      test_dirs);
   SECTION("defrag",    test_defrag);
   SECTION("powerloss", test_powerloss);

From 37a1f0e068dfc9d5d995d0d515f6dd34ac84b4e2 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Fri, 31 Jul 2026 15:23:04 +0200
Subject: [PATCH 562/568] audioutils/lame: pin the checkout and build its
 AVX-512 sources

The bundled encoder was checked out from lame's trunk with no revision, so
every build took whatever trunk happened to be at that moment.  lame's trunk
grows vector tiers over time, and each one adds sources that the two build
files have to name:  r6655 offered AVX2 to the vector routines on 2026-07-25,
and r6718 and r6720 added an AVX-512 tier on 2026-07-30.  The AVX-512 sources
were never listed, so sim:alsa stopped linking on x86 hosts:

  takehiro.c:332:    undefined reference to `quantize_lines_xrpow_avx512'
  takehiro.c:533:    undefined reference to `ix_max_avx512'
  takehiro.c:569:    undefined reference to `count_bit_esc_avx512'
  vbrquantize.c:261: undefined reference to `calc_sfb_noise_x34_avx512'

Pin the checkout to r6720 through a LAME_VERSION variable, as the rest of
apps/ pins its third-party sources, and list the three AVX-512 files that
revision provides.  The pin is what keeps the two in step:  the source list is
maintained by hand, so it can only be correct for a known revision.

The checkout is also only performed when lame/configure is absent and is never
updated afterwards, so before this an unpinned tree was frozen at whatever
trunk was on the day it was first built.  Anyone who checked out before
2026-07-30 still links and cannot reproduce the failure, which is why this
surfaced only in CI.

Makefile named just vector/xmm_quantize_sub.c and none of the other vector
sources, so a Make build on an x86 host fails the same way with a longer list
of symbols, from SSE2 upwards.  CI builds sim:alsa through CMake only, so that
half was latent rather than visible.  Both files now list the same nine
sources under the same host condition.

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Assisted-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 audioutils/lame/CMakeLists.txt | 18 +++++++++++++++---
 audioutils/lame/Makefile       | 29 +++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/audioutils/lame/CMakeLists.txt b/audioutils/lame/CMakeLists.txt
index a0e04a7d4..f963cbf3d 100644
--- a/audioutils/lame/CMakeLists.txt
+++ b/audioutils/lame/CMakeLists.txt
@@ -36,11 +36,20 @@ if(CONFIG_AUDIOUTILS_LAME)
     list(APPEND CFG_CMDS "--cross-prefix=${CROSSDEV}")
   endif()
 
+  # The revision to check out.  See the comment in Makefile: an unpinned
+  # checkout stops linking on the day lame's trunk grows its next vector tier.
+  # Raise this deliberately, together with the vector source list below.
+
+  if(NOT DEFINED LAME_VERSION)
+    set(LAME_VERSION 6720)
+  endif()
+
   # # Download lame if no lame/configure found
   if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lame/configure")
     execute_process(
-      COMMAND "svn" "checkout" "https://svn.code.sf.net/p/lame/svn/trunk/lame"
-              "lame" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+      COMMAND "svn" "checkout" "-r" "${LAME_VERSION}"
+              "https://svn.code.sf.net/p/lame/svn/trunk/lame" "lame"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
   endif()
 
   # Set source path
@@ -95,7 +104,10 @@ if(CONFIG_AUDIOUTILS_LAME)
       "${SRC_PATH}/libmp3lame/vector/xmm_quantize_lines.c"
       "${SRC_PATH}/libmp3lame/vector/xmm_calc_sfb_noise.c"
       "${SRC_PATH}/libmp3lame/vector/avx2_choose_table.c"
-      "${SRC_PATH}/libmp3lame/vector/avx2_quantize_lines.c")
+      "${SRC_PATH}/libmp3lame/vector/avx2_quantize_lines.c"
+      "${SRC_PATH}/libmp3lame/vector/avx512_choose_table.c"
+      "${SRC_PATH}/libmp3lame/vector/avx512_quantize_lines.c"
+      "${SRC_PATH}/libmp3lame/vector/avx512_calc_sfb_noise.c")
   endif()
 
   # Add custom target to generate config_h
diff --git a/audioutils/lame/Makefile b/audioutils/lame/Makefile
index ccbe4cf21..cf2daf24e 100644
--- a/audioutils/lame/Makefile
+++ b/audioutils/lame/Makefile
@@ -20,10 +20,19 @@
 #
 ############################################################################
 
+# The revision to check out.  lame's trunk grows vector tiers over time --
+# SSE2, then AVX2, then AVX-512 -- and each one adds sources that this file
+# and CMakeLists.txt have to name, so an unpinned checkout stops linking on
+# the day upstream adds the next one.  Raise this deliberately, together with
+# the vector source list below.
+
+LAME_VERSION ?= 6720
+
 # Download lame if no lame/configure found
 lame-svn:
 	$(Q) echo "svn checkout lame ..."
-	$(Q) svn checkout https://svn.code.sf.net/p/lame/svn/trunk/lame lame
+	$(Q) svn checkout -r $(LAME_VERSION) \
+		https://svn.code.sf.net/p/lame/svn/trunk/lame lame
 
 ifeq ($(wildcard lame/configure),)
 context:: lame-svn
@@ -72,7 +81,6 @@ CSRCS += $(SRC_PATH)/libmp3lame/bitstream.c \
          $(SRC_PATH)/libmp3lame/newmdct.c \
          $(SRC_PATH)/libmp3lame/psymodel.c \
          $(SRC_PATH)/libmp3lame/quantize.c \
-         $(SRC_PATH)/libmp3lame/vector/xmm_quantize_sub.c \
          $(SRC_PATH)/libmp3lame/quantize_pvt.c \
          $(SRC_PATH)/libmp3lame/set_get.c \
          $(SRC_PATH)/libmp3lame/vbrquantize.c \
@@ -84,6 +92,23 @@ CSRCS += $(SRC_PATH)/libmp3lame/bitstream.c \
          $(SRC_PATH)/libmp3lame/version.c \
          $(SRC_PATH)/libmp3lame/presets.c
 
+# lame's configure enables the SSE2, AVX2 and AVX-512 dispatch paths whenever
+# the host compiler accepts their per-function target attributes, and the
+# scalar code then calls into them, so the whole group has to be built on an
+# x86 host.  Other hosts keep lame's scalar implementation.
+
+ifneq ($(CONFIG_HOST_X86)$(CONFIG_HOST_X86_64),)
+CSRCS += $(SRC_PATH)/libmp3lame/vector/xmm_quantize_sub.c \
+         $(SRC_PATH)/libmp3lame/vector/xmm_choose_table.c \
+         $(SRC_PATH)/libmp3lame/vector/xmm_quantize_lines.c \
+         $(SRC_PATH)/libmp3lame/vector/xmm_calc_sfb_noise.c \
+         $(SRC_PATH)/libmp3lame/vector/avx2_choose_table.c \
+         $(SRC_PATH)/libmp3lame/vector/avx2_quantize_lines.c \
+         $(SRC_PATH)/libmp3lame/vector/avx512_choose_table.c \
+         $(SRC_PATH)/libmp3lame/vector/avx512_quantize_lines.c \
+         $(SRC_PATH)/libmp3lame/vector/avx512_calc_sfb_noise.c
+endif
+
 LAME_CONFIG_SCRIPT := $(CURDIR)$(DELIM)lame$(DELIM)configure
 
 $(DST_PATH)/config.h:

From a8e6021c6eff256ec19e638f93b4eba8ee4cdbb3 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Thu, 30 Jul 2026 15:15:54 -0300
Subject: [PATCH 563/568] system/kbd: add a keyboard dump that reads any
 keyboard

The hidkbd and keyboard examples do the same thing for one kind of
keyboard each:  hidkbd reads a USB HID keyboard as a byte stream, and
keyboard reads an upper half keyboard as events.  Neither works with the
other, so bringing up a new keyboard means picking the right example
first, and there is no answer for somebody whose keyboard is neither.

Every keyboard registered with keyboard_register() is read the same way,
so one tool covers them all:  USB HID, matrix, simulator, virtio, VNC.

The payload follows INPUT_KEYBOARD_BYTESTREAM rather than a switch of
its own.  An application has no business knowing what hardware is behind
the device, and a build cannot mix the two formats anyway.

The two examples stay for now.  They are what the in-tree configurations
still name, and removing them has to wait until those configurations
have been moved over.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 system/kbd/CMakeLists.txt |  35 +++++
 system/kbd/Kconfig        |  38 ++++++
 system/kbd/Make.defs      |  25 ++++
 system/kbd/Makefile       |  32 +++++
 system/kbd/kbd_main.c     | 265 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 395 insertions(+)
 create mode 100644 system/kbd/CMakeLists.txt
 create mode 100644 system/kbd/Kconfig
 create mode 100644 system/kbd/Make.defs
 create mode 100644 system/kbd/Makefile
 create mode 100644 system/kbd/kbd_main.c

diff --git a/system/kbd/CMakeLists.txt b/system/kbd/CMakeLists.txt
new file mode 100644
index 000000000..8ee13e65b
--- /dev/null
+++ b/system/kbd/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ##############################################################################
+# apps/system/kbd/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_SYSTEM_KBD)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_SYSTEM_KBD_PROGNAME}
+    PRIORITY
+    ${CONFIG_SYSTEM_KBD_PRIORITY}
+    STACKSIZE
+    ${CONFIG_SYSTEM_KBD_STACKSIZE}
+    MODULE
+    ${CONFIG_SYSTEM_KBD}
+    SRCS
+    kbd_main.c)
+endif()
diff --git a/system/kbd/Kconfig b/system/kbd/Kconfig
new file mode 100644
index 000000000..d1030ab09
--- /dev/null
+++ b/system/kbd/Kconfig
@@ -0,0 +1,38 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SYSTEM_KBD
+	tristate "Keyboard dump"
+	default n
+	depends on INPUT_KEYBOARD
+	---help---
+		Dump what a keyboard reports.  This reads any keyboard registered
+		with keyboard_register(), whatever the hardware behind it is, so it
+		is the tool to reach for when bringing up a new keyboard.
+
+		Replaces the hidkbd and keyboard examples, which did the same thing
+		for one kind of keyboard each.
+
+if SYSTEM_KBD
+
+config SYSTEM_KBD_PROGNAME
+	string "Program name"
+	default "kbd"
+
+config SYSTEM_KBD_PRIORITY
+	int "Task priority"
+	default 100
+
+config SYSTEM_KBD_STACKSIZE
+	int "Task stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+config SYSTEM_KBD_DEVPATH
+	string "Keyboard device path"
+	default "/dev/kbd0"
+	---help---
+		The keyboard to read when none is named on the command line.
+
+endif
diff --git a/system/kbd/Make.defs b/system/kbd/Make.defs
new file mode 100644
index 000000000..f80780936
--- /dev/null
+++ b/system/kbd/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/system/kbd/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SYSTEM_KBD),)
+CONFIGURED_APPS += $(APPDIR)/system/kbd
+endif
diff --git a/system/kbd/Makefile b/system/kbd/Makefile
new file mode 100644
index 000000000..97c5dad19
--- /dev/null
+++ b/system/kbd/Makefile
@@ -0,0 +1,32 @@
+############################################################################
+# apps/system/kbd/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+PROGNAME  = $(CONFIG_SYSTEM_KBD_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_KBD_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_KBD_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_KBD)
+
+MAINSRC = kbd_main.c
+
+include $(APPDIR)/Application.mk
diff --git a/system/kbd/kbd_main.c b/system/kbd/kbd_main.c
new file mode 100644
index 000000000..a736dd85c
--- /dev/null
+++ b/system/kbd/kbd_main.c
@@ -0,0 +1,265 @@
+/****************************************************************************
+ * apps/system/kbd/kbd_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/* Dump what a keyboard reports.
+ *
+ * Every keyboard registered with keyboard_register() is read the same way,
+ * whatever the hardware behind it is:  a USB HID keyboard, a matrix, the
+ * simulator, virtio.  So this works with all of them, and it is the place
+ * to look when bringing up a new one.
+ *
+ * The device delivers struct keyboard_event_s events unless the kernel was
+ * built with INPUT_KEYBOARD_BYTESTREAM, in which case it delivers the byte
+ * stream that the keyboard codec defines.  This follows that setting rather
+ * than having a switch of its own.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nuttx/input/keyboard.h>
+
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
+#  include <nuttx/streams.h>
+#  include <nuttx/input/kbd_codec.h>
+#endif
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define KBD_READ_SIZE 64
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: kbd_typename
+ ****************************************************************************/
+
+static FAR const char *kbd_typename(uint32_t type)
+{
+  switch (type)
+    {
+      case KEYBOARD_PRESS:
+        return "press";
+
+      case KEYBOARD_RELEASE:
+        return "release";
+
+      case KEYBOARD_SPECPRESS:
+        return "specpress";
+
+      case KEYBOARD_SPECREL:
+        return "specrel";
+
+      default:
+        return "unknown";
+    }
+}
+
+/****************************************************************************
+ * Name: kbd_show
+ *
+ * Description:
+ *   Print one key.  A normal key carries a character, a special key carries
+ *   a value from enum kbd_keycode_e, and the type is what says which.
+ *
+ ****************************************************************************/
+
+static void kbd_show(uint32_t code, uint32_t type)
+{
+  if (type == KEYBOARD_PRESS || type == KEYBOARD_RELEASE)
+    {
+      printf("%-9s code %3" PRIu32 " '%c'\n", kbd_typename(type), code,
+             isprint(code) ? (int)code : '.');
+    }
+  else
+    {
+      printf("%-9s keycode %" PRIu32 "\n", kbd_typename(type), code);
+    }
+
+  fflush(stdout);
+}
+
+/****************************************************************************
+ * Name: kbd_dump
+ *
+ * Description:
+ *   Print everything in one read.
+ *
+ * Returned Value:
+ *   The number of keys printed.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
+static size_t kbd_dump(FAR char *buffer, size_t nbytes)
+{
+  struct lib_meminstream_s stream;
+  struct kbd_getstate_s state;
+  uint8_t ch;
+  size_t nkeys = 0;
+  int ret;
+
+  lib_meminstream(&stream, buffer, nbytes);
+  memset(&state, 0, sizeof(state));
+
+  for (; ; )
+    {
+      ret = kbd_decode(&stream.common, &state, &ch);
+      if (ret == KBD_ERROR)
+        {
+          break;
+        }
+
+      kbd_show(ch, ret);
+      nkeys++;
+    }
+
+  return nkeys;
+}
+#else
+static size_t kbd_dump(FAR char *buffer, size_t nbytes)
+{
+  FAR struct keyboard_event_s *key = (FAR struct keyboard_event_s *)buffer;
+  size_t nkeys = 0;
+
+  if ((nbytes % sizeof(struct keyboard_event_s)) != 0)
+    {
+      fprintf(stderr, "kbd: short read of %zu bytes, ignoring\n", nbytes);
+      return 0;
+    }
+
+  while (nbytes >= sizeof(struct keyboard_event_s))
+    {
+      kbd_show(key->code, key->type);
+
+      nbytes -= sizeof(struct keyboard_event_s);
+      key++;
+      nkeys++;
+    }
+
+  return nkeys;
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: main
+ ****************************************************************************/
+
+int main(int argc, FAR char *argv[])
+{
+  FAR const char *devpath = CONFIG_SYSTEM_KBD_DEVPATH;
+  char buffer[KBD_READ_SIZE];
+  size_t nkeys = 0;
+  size_t limit = 0;
+  ssize_t nbytes;
+  int fd;
+
+  if (argc > 1)
+    {
+      devpath = argv[1];
+    }
+
+  if (argc > 2)
+    {
+      limit = strtoul(argv[2], NULL, 10);
+    }
+
+  /* Wait for the device.  A USB keyboard appears when it is plugged in, so
+   * this is the normal way to start rather than an error path.
+   */
+
+  for (; ; )
+    {
+      fd = open(devpath, O_RDONLY);
+      if (fd >= 0)
+        {
+          break;
+        }
+
+      printf("kbd: waiting for %s: %d\n", devpath, errno);
+      fflush(stdout);
+      sleep(3);
+    }
+
+  printf("kbd: reading %s, %s\n", devpath,
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
+         "byte stream"
+#else
+         "keyboard events"
+#endif
+        );
+  fflush(stdout);
+
+  for (; ; )
+    {
+      nbytes = read(fd, buffer, sizeof(buffer));
+      if (nbytes < 0)
+        {
+          if (errno == EINTR)
+            {
+              continue;
+            }
+
+          fprintf(stderr, "kbd: read %s failed: %d\n", devpath, errno);
+          break;
+        }
+      else if (nbytes == 0)
+        {
+          /* The keyboard is gone */
+
+          break;
+        }
+
+      nkeys += kbd_dump(buffer, nbytes);
+
+      if (limit > 0 && nkeys >= limit)
+        {
+          break;
+        }
+    }
+
+  close(fd);
+  printf("kbd: %zu keys\n", nkeys);
+  return EXIT_SUCCESS;
+}

From f52bc61adb592f9f4bec14b3d3006ebd8f59433a Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Thu, 30 Jul 2026 15:15:54 -0300
Subject: [PATCH 564/568] games/NXDoom: handle the special key events

i_get_event() handled KEYBOARD_PRESS and KEYBOARD_RELEASE and dropped
everything else, so every key reported as KEYBOARD_SPECPRESS went
nowhere.  On the simulator that is already every arrow key, since
sim_keyboard reports them that way:  the game is unplayable and says
nothing about why.

Handle all four types.  A special key carries a value from enum
kbd_keycode_e rather than a character, so it gets its own translation
into doomkeys.h and contributes no printable character to the event.

The map covers what the game binds by default, which now includes Ctrl,
Shift and Alt.  Fire, run and strafe are on the modifiers, so a keyboard
that reports them is the difference between playing and walking around.

Enter needed folding onto KEY_ENTER as well.  A driver reports it as the
character that it produces, which is the line feed, so it never arrived
as KEYCODE_ENTER and never matched the carriage return that the game
binds the menu to.  Confirmed on hardware with a USB keyboard.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 games/NXDoom/src/i_input.c | 160 ++++++++++++++++++++++++++++++++-----
 games/NXDoom/src/i_video.c |  16 +---
 2 files changed, 144 insertions(+), 32 deletions(-)

diff --git a/games/NXDoom/src/i_input.c b/games/NXDoom/src/i_input.c
index 8cb3a8630..a7e61b8f8 100644
--- a/games/NXDoom/src/i_input.c
+++ b/games/NXDoom/src/i_input.c
@@ -192,6 +192,38 @@ static int init_kbd_dev(struct keyboard_dev *dev)
  ****************************************************************************/
 
 static int translate_key(uint32_t keycode)
+{
+  /* A keyboard driver reports Enter as the character that it produces, so
+   * it never arrives as KEYCODE_ENTER.  The game binds the menu to
+   * KEY_ENTER, which is the carriage return, so the line feed that a
+   * driver actually sends has to be folded onto it.
+   */
+
+  if (keycode == '\n')
+    {
+      return KEY_ENTER;
+    }
+
+  return keycode;
+}
+
+/****************************************************************************
+ * Name: translate_speckey
+ *
+ * Description:
+ *   Translates a value from enum kbd_keycode_e into one from doomkeys.h.
+ *
+ *   A special key arrives with a KEYBOARD_SPECPRESS or KEYBOARD_SPECREL
+ *   event rather than as a character:  the keycodes overlap the character
+ *   range, so the event type is what tells an arrow key from the character
+ *   that shares its value.
+ *
+ * Return:
+ *   The translated key code, or zero if the key has no meaning to the game.
+ *
+ ****************************************************************************/
+
+static int translate_speckey(uint32_t keycode)
 {
   switch (keycode)
     {
@@ -203,10 +235,76 @@ static int translate_key(uint32_t keycode)
       return KEY_UPARROW;
     case KEYCODE_DOWN:
       return KEY_DOWNARROW;
+
+    /* Drivers disagree on Enter:  a USB HID keyboard reports the line feed
+     * that the key produces, while the simulator reports KEYCODE_ENTER.
+     * Both have to land on KEY_ENTER, so both are handled, here and in
+     * translate_key().
+     */
+
     case KEYCODE_ENTER:
       return KEY_ENTER;
+
+    case KEYCODE_BACKDEL:
+      return KEY_BACKSPACE;
+    case KEYCODE_FWDDEL:
+      return KEY_DEL;
+    case KEYCODE_INSERT:
+      return KEY_INS;
+    case KEYCODE_HOME:
+      return KEY_HOME;
+    case KEYCODE_END:
+      return KEY_END;
+    case KEYCODE_PAGEUP:
+      return KEY_PGUP;
+    case KEYCODE_PAGEDOWN:
+      return KEY_PGDN;
+    case KEYCODE_PAUSE:
+      return KEY_PAUSE;
+    case KEYCODE_CAPSLOCK:
+      return KEY_CAPSLOCK;
+
+    /* Fire, run and strafe.  The game binds these by default, so a
+     * keyboard that does not report its modifiers cannot play it.
+     */
+
+    case KEYCODE_LCTRL:
+    case KEYCODE_RCTRL:
+      return KEY_RCTRL;
+    case KEYCODE_LSHIFT:
+    case KEYCODE_RSHIFT:
+      return KEY_RSHIFT;
+    case KEYCODE_LALT:
+    case KEYCODE_RALT:
+      return KEY_RALT;
+
+    case KEYCODE_F1:
+      return KEY_F1;
+    case KEYCODE_F2:
+      return KEY_F2;
+    case KEYCODE_F3:
+      return KEY_F3;
+    case KEYCODE_F4:
+      return KEY_F4;
+    case KEYCODE_F5:
+      return KEY_F5;
+    case KEYCODE_F6:
+      return KEY_F6;
+    case KEYCODE_F7:
+      return KEY_F7;
+    case KEYCODE_F8:
+      return KEY_F8;
+    case KEYCODE_F9:
+      return KEY_F9;
+    case KEYCODE_F10:
+      return KEY_F10;
+    case KEYCODE_F11:
+      return KEY_F11;
+    case KEYCODE_F12:
+      return KEY_F12;
+
     default:
-      return keycode;
+      return 0;
     }
 }
 
@@ -319,24 +417,53 @@ void i_handle_keyboard_event(struct keyboard_event_s *kevent)
    */
 
   event_t event;
+  bool press;
 
   switch (kevent->type)
     {
     case KEYBOARD_PRESS:
-      event.type = ev_keydown;
+    case KEYBOARD_RELEASE:
+      press = (kevent->type == KEYBOARD_PRESS);
       event.data1 = translate_key(kevent->code);
-      event.data2 = get_localized_key(kevent->code);
-      event.data3 = get_typed_char(kevent->code);
-
-      if (event.data1 != 0)
-        {
-          d_post_event(&event);
-        }
       break;
 
-    case KEYBOARD_RELEASE:
+    case KEYBOARD_SPECPRESS:
+    case KEYBOARD_SPECREL:
+      press = (kevent->type == KEYBOARD_SPECPRESS);
+      event.data1 = translate_speckey(kevent->code);
+      break;
+
+    default:
+      return;
+    }
+
+  if (event.data1 == 0)
+    {
+      return;
+    }
+
+  if (press)
+    {
+      event.type = ev_keydown;
+
+      /* A special key has no printable character, so it contributes
+       * nothing to data2 and data3.
+       */
+
+      if (kevent->type == KEYBOARD_PRESS)
+        {
+          event.data2 = get_localized_key(kevent->code);
+          event.data3 = get_typed_char(kevent->code);
+        }
+      else
+        {
+          event.data2 = 0;
+          event.data3 = 0;
+        }
+    }
+  else
+    {
       event.type = ev_keyup;
-      event.data1 = translate_key(kevent->code);
 
       /* data2/data3 are initialized to zero for ev_keyup.
        * For ev_keydown it's the shifted Unicode character
@@ -347,16 +474,9 @@ void i_handle_keyboard_event(struct keyboard_event_s *kevent)
 
       event.data2 = 0;
       event.data3 = 0;
-
-      if (event.data1 != 0)
-        {
-          d_post_event(&event);
-        }
-      break;
-
-    default:
-      break;
     }
+
+  d_post_event(&event);
 }
 
 void i_start_text_input(int x1, int y1, int x2, int y2)
diff --git a/games/NXDoom/src/i_video.c b/games/NXDoom/src/i_video.c
index cf3c83780..d9a76a651 100644
--- a/games/NXDoom/src/i_video.c
+++ b/games/NXDoom/src/i_video.c
@@ -505,19 +505,11 @@ static void i_get_event(void)
 
   while ((err = get_kbd_event(&kbdevent)) == 0)
     {
-      switch (kbdevent.type)
-        {
-        case KEYBOARD_PRESS:
+      /* All four event types are handled:  dropping the special ones here
+       * would silently lose the arrow keys.
+       */
 
-          /* deliberate fall-though */
-
-        case KEYBOARD_RELEASE:
-          i_handle_keyboard_event(&kbdevent);
-          break;
-
-        default:
-          break;
-        }
+      i_handle_keyboard_event(&kbdevent);
     }
 #endif
 }

From 47b3f92f9d054954f7523345cce69b73e0b5b9b8 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Thu, 30 Jul 2026 16:55:35 -0300
Subject: [PATCH 565/568] examples/lvglterm: read any keyboard through one
 input path

The terminal had three input sources to choose from, and its own help
text explained why:  the physical keyboard options "differ in the data
the keyboard device delivers on read(), so pick the one that matches the
hardware".  That is the abstraction leaking.  A user had to know that
the keyboard was USB rather than a matrix in order to compile the
terminal, and swapping one for the other meant rebuilding.

There are two sources now, touch and physical, and the physical one
reads any keyboard registered with keyboard_register().  Which format
arrives is decided by INPUT_KEYBOARD_BYTESTREAM, a property of the build
rather than of the hardware, so the terminal no longer asks.

Cursor keys reported as special events scroll the terminal, which is
what a driver following the current contract sends.  The out of band
codes that the M5Stack Cardputer reports as ordinary presses are still
honoured, so that board keeps working until its driver is converted.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 examples/lvglterm/Kconfig        |  32 +++----
 examples/lvglterm/lvglterm_kbd.c | 141 +++++++++++++++----------------
 2 files changed, 79 insertions(+), 94 deletions(-)

diff --git a/examples/lvglterm/Kconfig b/examples/lvglterm/Kconfig
index ca393e845..7c4a70683 100644
--- a/examples/lvglterm/Kconfig
+++ b/examples/lvglterm/Kconfig
@@ -17,9 +17,7 @@ choice
 	default EXAMPLES_LVGLTERM_INPUT_TOUCH
 	---help---
 		Select how the terminal receives keystrokes.  Only one input source
-		is built at a time.  The physical-keyboard options differ in the data
-		the keyboard device delivers on read(), so pick the one that matches
-		the hardware.
+		is built at a time.
 
 config EXAMPLES_LVGLTERM_INPUT_TOUCH
 	bool "On-screen keyboard (touch)"
@@ -28,37 +26,29 @@ config EXAMPLES_LVGLTERM_INPUT_TOUCH
 		command line is typed and submitted with Enter.  This is the default
 		and matches the original behaviour.
 
-config EXAMPLES_LVGLTERM_INPUT_KBD_MATRIX
-	bool "Matrix / upper-half keyboard (keyboard events)"
+config EXAMPLES_LVGLTERM_INPUT_KBD
+	bool "Physical keyboard"
 	depends on INPUT_KEYBOARD
 	---help---
-		Physical keyboard registered through the INPUT_KEYBOARD upper half,
-		whose read() returns struct keyboard_event_s events (for example the
-		M5Stack Cardputer matrix keyboard on /dev/kbd0).  Fn Up/Down scroll
-		the terminal.
-
-config EXAMPLES_LVGLTERM_INPUT_KBD_USB
-	bool "USB HID keyboard (byte stream)"
-	depends on USBHOST_HIDKBD
-	select LIBC_KBDCODEC
-	---help---
-		USB HID keyboard (for example on /dev/kbda with CONFIG_USBHOST_HIDKBD).
-		read() returns a byte stream that is decoded with the keyboard codec:
-		normal keys go to the shell and, when the driver is built with
-		CONFIG_HIDKBD_ENCODED, the Up/Down cursor keys scroll the terminal.
+		Any keyboard registered with keyboard_register():  USB HID, a matrix,
+		the simulator, virtio.  The terminal does not need to know which one
+		it is.  Cursor Up and Down scroll the terminal, everything else goes
+		to the shell.
 
 endchoice
 
 config EXAMPLES_LVGLTERM_KBD_DEV
 	string "Keyboard device path"
-	default "/dev/kbda" if EXAMPLES_LVGLTERM_INPUT_KBD_USB
 	default "/dev/kbd0"
-	depends on EXAMPLES_LVGLTERM_INPUT_KBD_MATRIX || EXAMPLES_LVGLTERM_INPUT_KBD_USB
+	depends on EXAMPLES_LVGLTERM_INPUT_KBD
 	---help---
 		Keyboard device the terminal reads from.  Can also be overridden at
 		run time by passing the path as the first command-line argument
 		(useful when more than one keyboard is present).
 
+		Note that the USB HID driver names its devices /dev/kbda onwards,
+		since they come and go as keyboards are plugged in.
+
 choice
 	prompt "LVGL Terminal font"
 	default EXAMPLES_LVGLTERM_FONT_UNSCII_16
diff --git a/examples/lvglterm/lvglterm_kbd.c b/examples/lvglterm/lvglterm_kbd.c
index 08ae83612..daea4c50b 100644
--- a/examples/lvglterm/lvglterm_kbd.c
+++ b/examples/lvglterm/lvglterm_kbd.c
@@ -26,15 +26,13 @@
  * a keyboard driver; the device defaults to CONFIG_EXAMPLES_LVGLTERM_KBD_DEV
  * and can be overridden by the first command-line argument.
  *
- * Two device flavours are supported, selected at build time:
+ * Any keyboard registered with keyboard_register() works:  USB HID, a
+ * matrix, the simulator, virtio.  Which one it is makes no difference here.
  *
- *   - Upper-half keyboards (INPUT_KEYBOARD, e.g. the M5Stack Cardputer
- *     matrix on /dev/kbd0) deliver struct keyboard_event_s events; the Fn
- *     Up/Down keys are handled locally as scroll requests.
- *   - USB HID keyboards (EXAMPLES_LVGLTERM_INPUT_KBD_USB, e.g. /dev/kbda)
- *     deliver a byte stream decoded with the NuttX keyboard codec: normal
- *     keys are forwarded to the shell and, when the driver is built with
- *     CONFIG_HIDKBD_ENCODED, the Up/Down cursor keys scroll the terminal.
+ * The device delivers struct keyboard_event_s events unless the kernel was
+ * built with INPUT_KEYBOARD_BYTESTREAM, in which case it delivers the byte
+ * stream that the keyboard codec defines.  That is a property of the build
+ * rather than of the hardware, so it is what selects the reader below.
  */
 
 /****************************************************************************
@@ -50,11 +48,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#ifdef CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD_MATRIX
-#  include <nuttx/input/keyboard.h>
-#endif
+#include <nuttx/input/keyboard.h>
 
-#ifdef CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD_USB
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
 #  include <nuttx/streams.h>
 #  include <nuttx/input/kbd_codec.h>
 #endif
@@ -67,17 +63,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Out-of-band key codes for the Fn + navigation cluster (cursor keys),
- * reported by keyboard drivers that follow this convention (for example the
- * M5Stack Cardputer).  Up/Down scroll the terminal instead of going to the
- * shell; drivers that do not emit these codes keep normal behaviour.
- */
-
-#define KEY_UP         0x80
-#define KEY_DOWN       0x81
-#define KEY_LEFT       0x82
-#define KEY_RIGHT      0x83
-
 #define SCROLL_STEP    24          /* Pixels scrolled per Up/Down keypress */
 
 /****************************************************************************
@@ -134,6 +119,41 @@ static void scroll_terminal(bool up)
   lv_obj_scroll_by(g_output, 0, dy, LV_ANIM_OFF);
 }
 
+/****************************************************************************
+ * Name: handle_key
+ *
+ * Description:
+ *   Act on one key press.  Cursor Up and Down scroll the terminal, anything
+ *   else goes to the shell.
+ *
+ * Input Parameters:
+ *   code    - The character, or a value from enum kbd_keycode_e
+ *   special - True if the code is a keycode rather than a character.  The
+ *             two ranges overlap, so this is what tells them apart.
+ *
+ ****************************************************************************/
+
+static void handle_key(uint32_t code, bool special)
+{
+  if (special)
+    {
+      if (code == KEYCODE_UP)
+        {
+          scroll_terminal(true);
+        }
+      else if (code == KEYCODE_DOWN)
+        {
+          scroll_terminal(false);
+        }
+
+      /* Any other special key has no meaning to a terminal */
+
+      return;
+    }
+
+  feed_char(code);
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -171,38 +191,35 @@ void lvglterm_input_create(int argc, FAR char *argv[])
 
 void lvglterm_input_poll(void)
 {
+  char buf[64];
+  ssize_t nread;
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
+  struct lib_meminstream_s stream;
+  struct kbd_getstate_s state;
+  uint8_t ch;
+  int ret;
+#else
+  FAR struct keyboard_event_s *evt;
+#endif
+
   if (g_kfd < 0)
     {
       return;
     }
 
-#ifdef CONFIG_EXAMPLES_LVGLTERM_INPUT_KBD_USB
-  /* USB HID keyboard: read() returns a byte stream that is decoded with the
-   * keyboard codec.  Normal keys are fed to the shell; the Up/Down cursor
-   * keys (only emitted when the driver is built with CONFIG_HIDKBD_ENCODED)
-   * scroll the terminal.  On a plain-ASCII stream every byte simply decodes
-   * to a normal key press, so this also works without encoding.
-   */
-
-  struct lib_meminstream_s stream;
-  struct kbd_getstate_s state;
-  char buf[64];
-  ssize_t nread;
-  uint8_t ch;
-  int ret;
-
   nread = read(g_kfd, buf, sizeof(buf));
   if (nread <= 0)
     {
       return;
     }
 
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
   memset(&state, 0, sizeof(state));
   lib_meminstream(&stream, buf, nread);
 
   for (; ; )
     {
-      ret = kbd_decode((FAR struct lib_instream_s *)&stream, &state, &ch);
+      ret = kbd_decode(&stream.common, &state, &ch);
       if (ret == KBD_ERROR)
         {
           break;
@@ -210,51 +227,29 @@ void lvglterm_input_poll(void)
 
       if (ret == KBD_PRESS)
         {
-          feed_char((char)ch);
+          handle_key(ch, false);
         }
       else if (ret == KBD_SPECPRESS)
         {
-          if (ch == KEYCODE_UP)
-            {
-              scroll_terminal(true);
-            }
-          else if (ch == KEYCODE_DOWN)
-            {
-              scroll_terminal(false);
-            }
+          handle_key(ch, true);
         }
     }
 #else
-  /* Upper-half keyboard: read() returns keyboard_event_s events */
+  evt = (FAR struct keyboard_event_s *)buf;
 
-  struct keyboard_event_s evt;
-
-  while (read(g_kfd, &evt, sizeof(evt)) == (ssize_t)sizeof(evt))
+  while (nread >= (ssize_t)sizeof(struct keyboard_event_s))
     {
-      if (evt.type != KEYBOARD_PRESS)
+      if (evt->type == KEYBOARD_PRESS)
         {
-          continue;
+          handle_key(evt->code, false);
+        }
+      else if (evt->type == KEYBOARD_SPECPRESS)
+        {
+          handle_key(evt->code, true);
         }
 
-      /* Fn navigation keys are handled locally: Up/Down scroll the terminal;
-       * Left/Right are reserved and simply swallowed for now.
-       */
-
-      if (evt.code >= KEY_UP && evt.code <= KEY_RIGHT)
-        {
-          if (evt.code == KEY_UP)
-            {
-              scroll_terminal(true);
-            }
-          else if (evt.code == KEY_DOWN)
-            {
-              scroll_terminal(false);
-            }
-
-          continue;
-        }
-
-      feed_char((char)evt.code);
+      nread -= sizeof(struct keyboard_event_s);
+      evt++;
     }
 #endif
 }

From b62cec9eb1d698004c1bd191202d3e7d49254baf Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Thu, 30 Jul 2026 18:46:11 -0300
Subject: [PATCH 566/568] system/kbd: inject keys into a uinput keyboard

Somebody porting a board has to work on the application side before the
keyboard driver exists, and somebody reviewing that work often does not
have the board at hand at all.

With -i the tool goes the other way and writes into a uinput keyboard,
either what it reads from its own stdin or every key of another keyboard.
So an application reading /dev/ukeyboard is driven from the serial
console, or from whatever is on the far end of it, and a real keyboard
and an injected one can drive it at the same time, which neither can do
on its own since an application opens a single device.

Nothing in the application changes:  it is reading a keyboard like any
other, which is the point.

Validated on a Linum STM32H753BI, forwarding a USB HID keyboard and the
serial console into the same virtual keyboard, with the LVGL terminal
reading it.  24 press and release pairs survived the crossing with no
duplicate, no orphan and three keys held at once.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 system/kbd/kbd_main.c | 221 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 216 insertions(+), 5 deletions(-)

diff --git a/system/kbd/kbd_main.c b/system/kbd/kbd_main.c
index a736dd85c..20851077b 100644
--- a/system/kbd/kbd_main.c
+++ b/system/kbd/kbd_main.c
@@ -31,6 +31,13 @@
  * built with INPUT_KEYBOARD_BYTESTREAM, in which case it delivers the byte
  * stream that the keyboard codec defines.  This follows that setting rather
  * than having a switch of its own.
+ *
+ * With -i it goes the other way and injects into a uinput keyboard, either
+ * what it reads from its own stdin or every key of another keyboard.  So an
+ * application can be driven from a serial console with no keyboard hardware
+ * at all, and a real keyboard and an injected one can drive it at the same
+ * time, which neither can do on its own since an application opens a single
+ * device.
  */
 
 /****************************************************************************
@@ -45,6 +52,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -178,6 +186,157 @@ static size_t kbd_dump(FAR char *buffer, size_t nbytes)
 }
 #endif
 
+/****************************************************************************
+ * Name: kbd_inject
+ *
+ * Description:
+ *   Turn each byte read from stdin into a key press and release on the
+ *   given device.  The device has to be a uinput keyboard:  a real one has
+ *   nothing to inject into.
+ *
+ *   Note that this always writes struct keyboard_event_s.  Injection goes
+ *   through the lower half write method, which is not affected by
+ *   INPUT_KEYBOARD_BYTESTREAM.
+ *
+ * Returned Value:
+ *   The number of keys injected.
+ *
+ ****************************************************************************/
+
+static bool kbd_emit(int fd, uint32_t code, uint32_t type)
+{
+  struct keyboard_event_s key;
+
+  key.code = code;
+  key.type = type;
+
+  if (write(fd, &key, sizeof(key)) != (ssize_t)sizeof(key))
+    {
+      fprintf(stderr, "kbd: inject failed: %d\n", errno);
+      return false;
+    }
+
+  return true;
+}
+
+static size_t kbd_inject(int fd)
+{
+  unsigned char buf[KBD_READ_SIZE];
+  uint32_t code;
+  ssize_t nread;
+  ssize_t i;
+  size_t nkeys = 0;
+
+  for (; ; )
+    {
+      nread = read(STDIN_FILENO, buf, sizeof(buf));
+      if (nread <= 0)
+        {
+          break;
+        }
+
+      for (i = 0; i < nread; i++)
+        {
+          /* A terminal sends a carriage return where a keyboard would
+           * send a line feed.
+           */
+
+          code = (buf[i] == '\r') ? '\n' : buf[i];
+
+          if (!kbd_emit(fd, code, KEYBOARD_PRESS))
+            {
+              return nkeys;
+            }
+
+          kbd_emit(fd, code, KEYBOARD_RELEASE);
+          nkeys++;
+        }
+    }
+
+  return nkeys;
+}
+
+/****************************************************************************
+ * Name: kbd_forward
+ *
+ * Description:
+ *   Copy every key from one keyboard onto another.  Pointing an
+ *   application at the destination lets a real keyboard and an injected one
+ *   drive it at the same time, which neither can do on its own since an
+ *   application opens a single device.
+ *
+ * Returned Value:
+ *   The number of keys forwarded.
+ *
+ ****************************************************************************/
+
+static size_t kbd_forward(int fd, int srcfd)
+{
+  char buf[KBD_READ_SIZE];
+  ssize_t nread;
+  size_t nkeys = 0;
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
+  struct lib_meminstream_s stream;
+  struct kbd_getstate_s state;
+  uint8_t ch;
+  int ret;
+#else
+  FAR struct keyboard_event_s *key;
+#endif
+
+  for (; ; )
+    {
+      nread = read(srcfd, buf, sizeof(buf));
+      if (nread <= 0)
+        {
+          break;
+        }
+
+#ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
+
+      /* The source speaks the byte stream and the destination only takes
+       * events, so this decodes rather than copies.  The decoder returns
+       * the event type directly.
+       */
+
+      memset(&state, 0, sizeof(state));
+      lib_meminstream(&stream, buf, nread);
+
+      for (; ; )
+        {
+          ret = kbd_decode(&stream.common, &state, &ch);
+          if (ret == KBD_ERROR)
+            {
+              break;
+            }
+
+          if (!kbd_emit(fd, ch, ret))
+            {
+              return nkeys;
+            }
+
+          nkeys++;
+        }
+#else
+      key = (FAR struct keyboard_event_s *)buf;
+
+      while (nread >= (ssize_t)sizeof(struct keyboard_event_s))
+        {
+          if (!kbd_emit(fd, key->code, key->type))
+            {
+              return nkeys;
+            }
+
+          nread -= sizeof(struct keyboard_event_s);
+          key++;
+          nkeys++;
+        }
+#endif
+    }
+
+  return nkeys;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -189,20 +348,41 @@ static size_t kbd_dump(FAR char *buffer, size_t nbytes)
 int main(int argc, FAR char *argv[])
 {
   FAR const char *devpath = CONFIG_SYSTEM_KBD_DEVPATH;
+  FAR const char *srcpath = NULL;
   char buffer[KBD_READ_SIZE];
+  bool inject = false;
   size_t nkeys = 0;
   size_t limit = 0;
   ssize_t nbytes;
+  int argi = 1;
+  int srcfd;
   int fd;
 
-  if (argc > 1)
+  if (argi < argc && strcmp(argv[argi], "-i") == 0)
     {
-      devpath = argv[1];
+      inject = true;
+      argi++;
     }
 
-  if (argc > 2)
+  if (argi < argc)
     {
-      limit = strtoul(argv[2], NULL, 10);
+      devpath = argv[argi++];
+    }
+
+  if (argi < argc)
+    {
+      /* When injecting, the extra argument is the keyboard to forward from
+       * rather than a count:  there is nothing to count.
+       */
+
+      if (inject)
+        {
+          srcpath = argv[argi];
+        }
+      else
+        {
+          limit = strtoul(argv[argi], NULL, 10);
+        }
     }
 
   /* Wait for the device.  A USB keyboard appears when it is plugged in, so
@@ -211,7 +391,7 @@ int main(int argc, FAR char *argv[])
 
   for (; ; )
     {
-      fd = open(devpath, O_RDONLY);
+      fd = open(devpath, (inject ? O_WRONLY : O_RDONLY) | O_CLOEXEC);
       if (fd >= 0)
         {
           break;
@@ -222,6 +402,36 @@ int main(int argc, FAR char *argv[])
       sleep(3);
     }
 
+  if (inject)
+    {
+      if (srcpath == NULL)
+        {
+          printf("kbd: injecting into %s, type to send, Ctrl-D to stop\n",
+                 devpath);
+          fflush(stdout);
+
+          nkeys = kbd_inject(fd);
+        }
+      else
+        {
+          srcfd = open(srcpath, O_RDONLY | O_CLOEXEC);
+          if (srcfd < 0)
+            {
+              fprintf(stderr, "kbd: open %s failed: %d\n", srcpath, errno);
+              close(fd);
+              return EXIT_FAILURE;
+            }
+
+          printf("kbd: forwarding %s into %s\n", srcpath, devpath);
+          fflush(stdout);
+
+          nkeys = kbd_forward(fd, srcfd);
+          close(srcfd);
+        }
+
+      goto done;
+    }
+
   printf("kbd: reading %s, %s\n", devpath,
 #ifdef CONFIG_INPUT_KEYBOARD_BYTESTREAM
          "byte stream"
@@ -259,6 +469,7 @@ int main(int argc, FAR char *argv[])
         }
     }
 
+done:
   close(fd);
   printf("kbd: %zu keys\n", nkeys);
   return EXIT_SUCCESS;

From ece6221edb972cf20322ce7e21fbad340d4ceb90 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Thu, 30 Jul 2026 18:10:21 -0300
Subject: [PATCH 567/568] examples/hidkbd: follow the byte stream option rename

The example gated its decoding on HIDKBD_ENCODED, which no longer
exists: the USB HID keyboard driver reports through the keyboard upper
half now, and what produces the byte stream is
INPUT_KEYBOARD_BYTESTREAM.

Left as it was, the option could never be satisfied and the example
would quietly stop decoding special keys.

Reaching the option again brings hidkbd_decode() back into the build
after a spell of being unreachable, and it uses isprint() without
including ctype.h. That is an error rather than a warning under the
-Werror the CI builds with, in the nine configurations that enable
EXAMPLES_HIDKBD, so add the include here rather than in a later commit.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 examples/hidkbd/Kconfig       | 2 +-
 examples/hidkbd/hidkbd_main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/hidkbd/Kconfig b/examples/hidkbd/Kconfig
index c80d40943..8b938de37 100644
--- a/examples/hidkbd/Kconfig
+++ b/examples/hidkbd/Kconfig
@@ -36,7 +36,7 @@ config EXAMPLES_HIDKBD_DEVNAME
 config EXAMPLES_HIDKBD_ENCODED
 	bool "Encode Special Keys"
 	default y
-	depends on HIDKBD_ENCODED && LIBC_KBDCODEC
+	depends on INPUT_KEYBOARD_BYTESTREAM
 	---help---
 		Decode special key press events in the user buffer.  In this case,
 		the example coded will use the interfaces defined in
diff --git a/examples/hidkbd/hidkbd_main.c b/examples/hidkbd/hidkbd_main.c
index 1515d6526..d26082136 100644
--- a/examples/hidkbd/hidkbd_main.c
+++ b/examples/hidkbd/hidkbd_main.c
@@ -35,6 +35,8 @@
 #include <nuttx/usb/usbhost.h>
 
 #ifdef CONFIG_EXAMPLES_HIDKBD_ENCODED
+#  include <ctype.h>
+
 #  include <nuttx/streams.h>
 #  include <nuttx/input/kbd_codec.h>
 #endif
@@ -55,7 +57,8 @@
 #  define CONFIG_EXAMPLES_HIDKBD_DEVNAME "/dev/kbda"
 #endif
 
-#if !defined(CONFIG_HIDKBD_ENCODED) || !defined(CONFIG_LIBC_KBDCODEC)
+#if !defined(CONFIG_INPUT_KEYBOARD_BYTESTREAM) || \
+    !defined(CONFIG_LIBC_KBDCODEC)
 #  undef CONFIG_EXAMPLES_HIDKBD_ENCODED
 #endif
 

From e59fee53afe8d7bea65d9f86dd72d1c5865c8483 Mon Sep 17 00:00:00 2001
From: Jorge Guzman <jorge.gzm@gmail.com>
Date: Fri, 31 Jul 2026 00:17:44 -0300
Subject: [PATCH 568/568] nshlib, graphics/microwindows: require the keyboard
 byte stream

Both read a keyboard as a stream of characters:  NSH uses a USB HID
keyboard for stdin, and the raw mode of the Microwindows keyboard driver
decodes the stream with the codec.  That stream now comes from
INPUT_KEYBOARD_BYTESTREAM rather than from the USB HID driver itself.

Say so, so that Kconfig refuses a combination that cannot work instead of
letting the application read events and treat them as text.  No in-tree
configuration selects either option.

Signed-off-by: Jorge Guzman <jorge.gzm@gmail.com>
---
 graphics/microwindows/Kconfig | 2 +-
 nshlib/Kconfig                | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphics/microwindows/Kconfig b/graphics/microwindows/Kconfig
index 8463d791f..9d5f0cb8c 100644
--- a/graphics/microwindows/Kconfig
+++ b/graphics/microwindows/Kconfig
@@ -33,7 +33,7 @@ config MICROWINDOWS_KBD_EVENT
 
 config MICROWINDOWS_KBD_RAW
 	bool "Raw-mode keyboard driver"
-	depends on LIBC_KBDCODEC
+	depends on INPUT_KEYBOARD_BYTESTREAM
 	---help---
 		Reads raw byte stream from a character device (e.g., /dev/kbda)
 		and decodes escape sequences via the kbd_codec library.  Suitable
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 8f0cd36ee..fbbb08d3b 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -1090,6 +1090,7 @@ config NSH_USBKBD
 	bool "Use USB keyboard input"
 	default n
 	depends on NSH_CONSOLE && USBHOST_HIDKBD && !NSH_USBCONSOLE
+	depends on INPUT_KEYBOARD_BYTESTREAM
 	---help---
 		Normally NSH uses the same device for stdin, stdout, and stderr.  By
 		default, that device is /dev/console.  If this option is selected,
@@ -1098,6 +1099,9 @@ config NSH_USBKBD
 		interface) and the data from the keyboard will drive NSH.  NSH
 		output (stdout and stderr) will still go to /dev/console.
 
+		NSH reads the keyboard as a stream of characters, which is what
+		INPUT_KEYBOARD_BYTESTREAM makes a keyboard device deliver.
+
 if NSH_USBKBD
 
 config NSH_USBKBD_DEVNAME